diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2839ac5ee9d32..dae954a0970b7 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,34 +1,34 @@
 # Contributing to Magento 2 code
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
-This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
+This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
-Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
+Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
 
-The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
+The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.
 
 
 ## Contribution requirements
 
-1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
-2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
-3. Commits must be accompanied by meaningful commit messages.
-4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
+2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
+3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
+4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
-* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
-4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
-5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
+* Unit/integration test coverage
+* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
 
 ## Contribution process
 
-If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
+If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
 
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
-5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
+5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3ac68076d4353..2b1720ccaabae 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,24 +1,36 @@
-<!--- Provide a general summary of the issue in the Title above -->
-<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Information on your environment,
+     - Steps to reproduce,
+     - Expected and actual results,
+    Fields marked with (*) are required. Please don't remove the template.
 
-### Preconditions
-<!--- Provide a more detailed information of environment you use -->
-<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
+    Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
+
+### Preconditions (*)
+<!---
+    Please provide as detailed information about your environment as possible.
+    For example Magento version, tag, HEAD, PHP & MySQL version, etc..
+-->
 1. 
 2. 
 
-### Steps to reproduce
-<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant  -->
+### Steps to reproduce (*)
+<!---
+    It is important to provide a set of clear steps to reproduce this bug.
+    If relevant please include code samples
+-->
 1. 
 2. 
 3. 
 
-### Expected result
+### Expected result (*)
 <!--- Tell us what should happen -->
-1. 
+1. [Screenshots, logs or description]
 
-### Actual result
+### Actual result (*)
 <!--- Tell us what happens instead -->
-1. [Screenshot, logs]
-
-<!--- (This may be platform independent comment) -->
+1. [Screenshots, logs or description]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000000..33a6ef02ace11
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Technical issue with the Magento 2 core components
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
+-->
+
+### Preconditions (*)
+<!---
+Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
+-->
+1.
+2.
+
+### Steps to reproduce (*)
+<!---
+Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
+-->
+1.
+2.
+
+### Expected result (*)
+<!--- Tell us what do you expect to happen. -->
+1. [Screenshots, logs or description]
+2.
+
+### Actual result (*)
+<!--- Tell us what happened instead. Include error messages and issues. -->
+1. [Screenshots, logs or description]
+2.
diff --git a/.github/ISSUE_TEMPLATE/developer-experience-issue.md b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
new file mode 100644
index 0000000000000..423d4818fb31c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
@@ -0,0 +1,19 @@
+---
+name: Developer experience issue
+about: Issues related to customization, extensibility, modularity
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
+-->
+
+### Summary (*)
+<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
+
+### Examples (*)
+<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
+
+### Proposed solution
+<!--- Suggest your potential solutions for this issue. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000000..f64185773cab4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Please consider reporting directly to https://github.com/magento/community-features
+
+---
+
+<!---
+Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
+-->
+
+### Description (*)
+<!--- Describe the feature you would like to add. -->
+
+### Expected behavior (*)
+<!--- What is the expected behavior of this feature? How is it going to work? -->
+
+### Benefits
+<!--- How do you think this feature would improve Magento? -->
+
+### Additional information
+<!--- What other information can you provide about the desired feature? -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d1f01ba9f2640..f191bd9aaba67 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,37 @@
-<!--- Provide a general summary of the Pull Request in the Title above -->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this pull request we recommend that you add the following information:
+     - Summary of the pull request,
+     - Issue(s) related to the changes made,
+     - Manual testing scenarios
+    Fields marked with (*) are required. Please don't remove the template.
+-->
 
-### Description
-<!--- Provide a description of the changes proposed in the pull request -->
+<!--- Please provide a general summary of the Pull Request in the Title above -->
+
+### Description (*)
+<!---
+    Please provide a description of the changes proposed in the pull request.
+    Letting us know what has changed and why it needed changing will help us validate this pull request.
+-->
 
 ### Fixed Issues (if relevant)
-<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant  -->
+<!---
+    If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
+    There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
+-->
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
-### Manual testing scenarios
-<!--- Provide a set of unambiguous steps to test the proposed code change -->
+### Manual testing scenarios (*)
+<!---
+    Please provide a set of unambiguous steps to test the proposed code change.
+    Giving us manual testing scenarios will help with the processing and validation process.
+-->
 1. ...
 2. ...
 
-### Contribution checklist
+### Contribution checklist (*)
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
diff --git a/.gitignore b/.gitignore
index 8831ad0a17c39..68d38d9ca7817 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ atlassian*
 /.php_cs
 /.php_cs.cache
 /grunt-config.json
-/dev/tools/grunt/configs/local-themes.js
 /pub/media/*.*
 !/pub/media/.htaccess
 /pub/media/attribute/*
diff --git a/.htaccess b/.htaccess
index 6247830fa8d14..d22b5a1395cae 100644
--- a/.htaccess
+++ b/.htaccess
@@ -355,6 +355,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php
diff --git a/.htaccess.sample b/.htaccess.sample
index 8e6e702ced716..c9ddff2cca4cf 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -111,7 +111,8 @@
 ############################################
 ## enable rewrites
 
-    Options +FollowSymLinks
+    # The following line has better security but add some performance overhead - see https://httpd.apache.org/docs/2.4/en/misc/perf-tuning.html
+    Options -FollowSymLinks +SymLinksIfOwnerMatch
     RewriteEngine on
 
 ############################################
@@ -331,6 +332,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php
diff --git a/.php_cs.dist b/.php_cs.dist
index 0f254c63283bd..84a5f88bf4355 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -5,9 +5,9 @@
  */
 
 /**
- * Pre-commit hook installation:
- * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
+ * PHP Coding Standards fixer configuration
  */
+
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
     ->exclude('dev/tests/functional/generated')
diff --git a/.travis.yml b/.travis.yml
index dcd00f39bb810..d29aa241b15b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,18 @@ addons:
   firefox: "46.0"
   hosts:
       - magento2.travis
+services:
+  - rabbitmq
+  - elasticsearch
 language: php
 php:
-  - 7.0
   - 7.1
+  - 7.2
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
-    - NODE_JS_VERSION=6
+    - NODE_JS_VERSION=8
     - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit
@@ -30,16 +33,19 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
     - TEST_SUITE=functional
+    - TEST_SUITE=graphql-api-functional
 matrix:
   exclude:
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=static
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=js GRUNT_COMMAND=spec
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=js GRUNT_COMMAND=static
-    - php: 7.0
+    - php: 7.1
       env: TEST_SUITE=functional
+    - php: 7.1
+      env: TEST_SUITE=graphql-api-functional
 cache:
   apt: true
   directories:
@@ -47,7 +53,9 @@ cache:
     - $HOME/.nvm
     - $HOME/node_modules
     - $HOME/yarn.lock
-before_install: ./dev/travis/before_install.sh
+before_install:
+  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
+  - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh
 script:
@@ -56,5 +64,6 @@ script:
 
   # The scripts for grunt/phpunit type tests
   - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
   - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
+  - if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef841ec0337f2..b86c7b79a0cbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.3.0
+=============
+To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
+
 2.1.0
 =============
 To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
@@ -153,7 +157,7 @@ To get detailed information about changes in Magento 2.1.0, please visit [Magent
     * Updated styles 
 * Sample Data:
     * Improved sample data installation UX
-    * Updated sample data with Product Heros, color swatches, MAP and rule based product relations
+    * Updated sample data with Product Heroes, color swatches, MAP and rule based product relations
     * Improved sample data upgrade flow
     * Added the ability to log errors and set the error flag during sample data installation
 * Various improvements:
@@ -1977,7 +1981,7 @@ Tests:
     * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
     * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
     * [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
-    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
 * Service Contracts:
     * Refactored usage of new API of the Customer module
     * Implemented Service Contracts for the Sales module
@@ -2280,7 +2284,7 @@ Tests:
   * Fixed an issue where no results were found for Coupons reports
   * Fixed an issue with incremental Qty setting
   * Fixed an issue with allowing importing of negative weight values
-  * Fixed an issue with Inventory - Only X left Treshold being not dependent on Qty for Item's Status to Become Out of Stock
+  * Fixed an issue with Inventory - Only X left Threshold being not dependent on Qty for Item's Status to Become Out of Stock
   * Fixed an issue where the "Catalog Search Index index was rebuilt." message was displayed when reindexing the Catalog Search index
  * Search module:
   * Integrated the Search library to the advanced search functionality
@@ -2702,7 +2706,7 @@ Tests:
    * Ability to support extensible service data objects
    * No Code Duplication in Root Templates
  * Fixed bugs:
-   * Persistance session application. Loggin out the customer
+   * Persistence session application. Logging out the customer
    * Placing the order with two terms and conditions
    * Saving of custom option by service catalogProductCustomOptionsWriteServiceV1
    * Placing the order on frontend if enter in the street address line 1 and 2 255 symbols
@@ -2961,7 +2965,7 @@ Tests:
   * Fixed an issue with incorrect items label for the cases when there are more than one item in the category
   * Fixed an issue when configurable product was out of stock in Google Shopping while being in stock in the Magento backend
   * Fixed an issue when swipe gesture in menu widget was not supported on mobile
-  * Fixed an issue when it was impossible to enter alpha-numeric zip code on the stage of  estimating shipping and tax rates
+  * Fixed an issue when it was impossible to enter alphanumeric zip code on the stage of  estimating shipping and tax rates
   * Fixed an issue when custom price was not applied when editing an order
   * Fixed an issue when items were not returned to stock after unsuccessful order was placed
   * Fixed an issue when error message appeared "Cannot save the credit memo” while creating credit memo
diff --git a/COPYING.txt b/COPYING.txt
index d2cbcd01539dd..040bdd5f3ce72 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -1,4 +1,4 @@
-Copyright © 2013-2017 Magento, Inc.
+Copyright © 2013-present Magento, Inc.
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
 
diff --git a/README.md b/README.md
index 9b1aa1b7b3e28..e73da84d66f46 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,16 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
+[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
+[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
-Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
+Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
+[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
 
 ## Install Magento
-To install Magento, see either:
 
-*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
-*	[Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
+*	[Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -22,38 +21,51 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#report>
+[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
+[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
-[4]: <http://devdocs.magento.com>
+[4]: <https://devdocs.magento.com>
 
-<h3>Labels applied by the Magento team</h3>
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
 
-| Label        | Description           | 
-| ------------- |-------------|
-| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
-| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
-| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
-| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
-| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
-| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
-| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
-| ![acknowledged](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
-| ![acknowledged](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
 
-<h2>Reporting security issues</h2>
+<h3>Top Contributors</h3>
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
 
-To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:security@magento.com">security@magento.com</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
+### Labels applied by the Magento team
+We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
+Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
 
-Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
+## Reporting security issues
 
-<h2>License</h2>
+To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
 
-Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
+Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
 
-http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
+## License
+
+Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
+
+[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
+Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
 
 Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
+Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
+
+## Community Engineering Slack
+
+To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-slack).
+
+
+We have channels for each project. These channels are recommended for new members:
 
+- [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
+- [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
+- [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
diff --git a/app/autoload.php b/app/autoload.php
index 54087d0255495..d6407083dc0b3 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -28,6 +28,9 @@
 /* 'composer install' validation */
 if (file_exists($vendorAutoload)) {
     $composerAutoloader = include $vendorAutoload;
+} else if (file_exists("{$vendorDir}/autoload.php")) {
+	$vendorAutoload = "{$vendorDir}/autoload.php";
+	$composerAutoloader = include $vendorAutoload;
 } else {
     throw new \Exception(
         'Vendor autoload is not found. Please run \'composer install\' under application root directory.'
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 6701a9f4dd51e..0b13d12cece58 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -11,15 +11,15 @@
 #ini_set('display_errors', 1);
 
 /* PHP version validation */
-if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) {
     if (PHP_SAPI == 'cli') {
-        echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
-            'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
+        echo 'Magento supports PHP 7.1.3 or later. ' .
+            'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
-    <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
+    <p>Magento supports PHP 7.1.3 or later. Please read
+    <a target="_blank" href="https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html">
     Magento System Requirements</a>.
 </div>
 HTML;
@@ -31,8 +31,6 @@
 // Sets default autoload mappings, may be overridden in Bootstrap::create
 \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
 
-require_once BP . '/app/functions.php';
-
 /* Custom umask value may be provided in optional mage_umask file in root */
 $umaskFile = BP . '/magento_umask';
 $mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
@@ -49,12 +47,21 @@
     unset($_SERVER['ORIG_PATH_INFO']);
 }
 
-if (!empty($_SERVER['MAGE_PROFILER'])
+if (
+    (!empty($_SERVER['MAGE_PROFILER']) || file_exists(BP . '/var/profiler.flag'))
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
 ) {
-    \Magento\Framework\Profiler::applyConfig(
-        $_SERVER['MAGE_PROFILER'],
+    $profilerConfig = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
+        ? $_SERVER['MAGE_PROFILER']
+        : trim(file_get_contents(BP . '/var/profiler.flag'));
+
+    if ($profilerConfig) {
+        $profilerConfig = json_decode($profilerConfig, true) ?: $profilerConfig;
+    }
+
+    Magento\Framework\Profiler::applyConfig(
+        $profilerConfig,
         BP,
         !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
     );
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/app/code/Magento/AdminNotification/Block/System/Messages.php
index e95d68663bf04..b950f5583e599 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages.php
@@ -16,24 +16,34 @@ class Messages extends \Magento\Backend\Block\Template
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
+     * @deprecated
      */
     protected $jsonHelper;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->jsonHelper = $jsonHelper;
         parent::__construct($context, $data);
         $this->_messages = $messages;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -117,7 +127,7 @@ protected function _getMessagesUrl()
      */
     public function getSystemMessageDialogJson()
     {
-        return $this->jsonHelper->jsonEncode(
+        return $this->serializer->serialize(
             [
                 'systemMessageDialog' => [
                     'buttons' => [],
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
index 7ea0062581467..2d4c7f279f707 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
@@ -77,9 +77,8 @@ public function getPopupTitle()
         $messageCount = count($this->_messages->getUnread());
         if ($messageCount > 1) {
             return __('You have %1 new system messages', $messageCount);
-        } else {
-            return __('You have %1 new system message', $messageCount);
         }
+        return __('You have %1 new system message', $messageCount);
     }
 
     /**
diff --git a/app/code/Magento/AdminNotification/Block/Window.php b/app/code/Magento/AdminNotification/Block/Window.php
index b80e12a8674db..e9b4bfa44893d 100644
--- a/app/code/Magento/AdminNotification/Block/Window.php
+++ b/app/code/Magento/AdminNotification/Block/Window.php
@@ -8,6 +8,8 @@
 namespace Magento\AdminNotification\Block;
 
 /**
+ * Admin notification window block
+ *
  * @api
  * @since 100.0.2
  */
@@ -40,7 +42,7 @@ class Window extends \Magento\Backend\Block\Template
     protected $_criticalCollection;
 
     /**
-     * @var \Magento\Adminnotification\Model\Inbox
+     * @var \Magento\AdminNotification\Model\Inbox
      */
     protected $_latestItem;
 
@@ -92,16 +94,15 @@ protected function _toHtml()
     /**
      * Retrieve latest critical item
      *
-     * @return bool|\Magento\Adminnotification\Model\Inbox
+     * @return bool|\Magento\AdminNotification\Model\Inbox
      */
     protected function _getLatestItem()
     {
         if ($this->_latestItem == null) {
             $items = array_values($this->_criticalCollection->getItems());
+            $this->_latestItem = false;
             if (count($items)) {
                 $this->_latestItem = $items[0];
-            } else {
-                $this->_latestItem = false;
             }
         }
         return $this->_latestItem;
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
index 125dba405b108..22eb3b30722f4 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
-class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
index 79f69ab5da88d..6b5e0681139cf 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 9e61b8ff4b83c..9ae4a7cdac0b9 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 6c0dfd1db7d16..06659b8452cab 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,13 +32,16 @@ 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->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        $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 17f911339cb61..f0724a9587c50 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/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
index c332440276083..d58a7ec31f77d 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\System\Message;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
     /**
@@ -15,6 +17,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
+     * @deprecated
      */
     protected $jsonHelper;
 
@@ -41,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()
     {
@@ -59,10 +62,15 @@ public function execute()
         if (empty($result)) {
             $result[] = [
                 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
-                'text' => 'You have viewed and resolved all recent system notices. '
-                    . 'Please refresh the web page to clear the notice alert.',
+                'text' => __(
+                    'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.'
+                )
             ];
         }
-        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setData($result);
+        return $resultJson;
     }
 }
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index 1766425fb19b1..d3b0b8501c864 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -214,9 +214,6 @@ public function getFeedData()
         );
         $curl->write(\Zend_Http_Client::GET, $this->getFeedUrl(), '1.0');
         $data = $curl->read();
-        if ($data === false) {
-            return false;
-        }
         $data = preg_split('/^\r?$/m', $data, 2);
         $data = trim($data[1]);
         $curl->close();
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
index a92eebfaec510..40b089d947136 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
@@ -6,6 +6,8 @@
 namespace Magento\AdminNotification\Model\ResourceModel;
 
 /**
+ * Inbox resource model
+ *
  * @api
  * @since 100.0.2
  */
@@ -77,8 +79,7 @@ public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
             'is_read=?',
             0
         );
-        $return = $connection->fetchPairs($select);
-        return $return;
+        return $connection->fetchPairs($select);
     }
 
     /**
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
index c7e9d348f3aca..9d830274b004e 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
@@ -12,7 +12,7 @@
 class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
-     * Flag that notifies whether Primary key of table is auto-incremeted
+     * Flag that notifies whether Primary key of table is auto-incremented
      *
      * @var bool
      */
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
index 38477c015cad3..c08b13373aa8d 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -7,6 +7,8 @@
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
 /**
+ * Media synchronization error message class.
+ *
  * @api
  * @since 100.0.2
  */
@@ -27,7 +29,7 @@ class Error extends \Magento\AdminNotification\Model\System\Message\Media\Abstra
     protected function _shouldBeDisplayed()
     {
         $data = $this->_syncFlag->getFlagData();
-        return isset($data['has_errors']) && true == $data['has_errors'];
+        return !empty($data['has_errors']);
     }
 
     /**
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
index 81bea14099e9e..ed882a0776734 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
@@ -6,6 +6,8 @@
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
 /**
+ * Media synchronization success message class.
+ *
  * @api
  * @since 100.0.2
  */
@@ -27,8 +29,8 @@ protected function _shouldBeDisplayed()
     {
         $state = $this->_syncFlag->getState();
         $data = $this->_syncFlag->getFlagData();
-        $hasErrors = isset($data['has_errors']) && true == $data['has_errors'] ? true : false;
-        return false == $hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
+        $hasErrors = !empty($data['has_errors']);
+        return !$hasErrors && \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED == $state;
     }
 
     /**
diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 3275de2a82fb7..24ef712c0f61f 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -37,7 +37,7 @@ public function __construct(
     }
 
     /**
-     * Predispath admin action controller
+     * Predispatch admin action controller
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
diff --git a/app/code/Magento/AdminNotification/Setup/InstallSchema.php b/app/code/Magento/AdminNotification/Setup/InstallSchema.php
deleted file mode 100644
index 081be974dc809..0000000000000
--- a/app/code/Magento/AdminNotification/Setup/InstallSchema.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\AdminNotification\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-        /**
-         * Create table 'adminnotification_inbox'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('adminnotification_inbox')
-        )->addColumn(
-            'notification_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Notification id'
-        )->addColumn(
-            'severity',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Problem type'
-        )->addColumn(
-            'date_added',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Create date'
-        )->addColumn(
-            'title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Title'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'url',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Url'
-        )->addColumn(
-            'is_read',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Flag if notification read'
-        )->addColumn(
-            'is_remove',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Flag if notification might be removed'
-        )->addIndex(
-            $installer->getIdxName('adminnotification_inbox', ['severity']),
-            ['severity']
-        )->addIndex(
-            $installer->getIdxName('adminnotification_inbox', ['is_read']),
-            ['is_read']
-        )->addIndex(
-            $installer->getIdxName('adminnotification_inbox', ['is_remove']),
-            ['is_remove']
-        )->setComment(
-            'Adminnotification Inbox'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'admin_system_messages'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('admin_system_messages')
-        )->addColumn(
-            'identity',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            ['nullable' => false, 'primary' => true],
-            'Message id'
-        )->addColumn(
-            'severity',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Problem type'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Create date'
-        )->setComment(
-            'Admin System Messages'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/LICENSE.txt b/app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/LICENSE.txt
rename to app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt
diff --git a/app/design/frontend/Magento/rush/LICENSE_AFL.txt b/app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from app/design/frontend/Magento/rush/LICENSE_AFL.txt
rename to app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/README.md b/app/code/Magento/AdminNotification/Test/Mftf/README.md
new file mode 100644
index 0000000000000..33f88ba74200a
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Admin Notification Functional Tests
+
+The Functional Test Module for **Magento Admin Notification** module.
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
index 2fbfc43aa8775..f49911c3e7a93 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
@@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
 
+    /**
+     * @return array
+     */
     public function getIdentityDataProvider()
     {
         $cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
@@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         $cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
index 2c259db868851..b490efd8e9683 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
@@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
         $this->assertEquals($expectedFirstRun, $model->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
index 1e71570a5e30b..c6f61fee862ba 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
@@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
         $this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index b8dba6f899645..e5cf487908cd7 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml b/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
index fbed5c0960b73..04d700b9f90ce 100644
--- a/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
+++ b/app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_AdminNotification::system_adminnotification"      title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
+        <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
     </menu>
 </config>
diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml
new file mode 100644
index 0000000000000..29d928ced2084
--- /dev/null
+++ b/app/code/Magento/AdminNotification/etc/db_schema.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
+        <column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Notification id"/>
+        <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Problem type"/>
+        <column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Create date"/>
+        <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="varchar" name="url" nullable="true" length="255" comment="Url"/>
+        <column xsi:type="smallint" name="is_read" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Flag if notification read"/>
+        <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Flag if notification might be removed"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="notification_id"/>
+        </constraint>
+        <index referenceId="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
+            <column name="severity"/>
+        </index>
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
+            <column name="is_read"/>
+        </index>
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
+            <column name="is_remove"/>
+        </index>
+    </table>
+    <table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
+        <column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
+        <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Problem type"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Create date"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="identity"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json b/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b068ffffe9219
--- /dev/null
+++ b/app/code/Magento/AdminNotification/etc/db_schema_whitelist.json
@@ -0,0 +1,32 @@
+{
+    "adminnotification_inbox": {
+        "column": {
+            "notification_id": true,
+            "severity": true,
+            "date_added": true,
+            "title": true,
+            "description": true,
+            "url": true,
+            "is_read": true,
+            "is_remove": true
+        },
+        "index": {
+            "ADMINNOTIFICATION_INBOX_SEVERITY": true,
+            "ADMINNOTIFICATION_INBOX_IS_READ": true,
+            "ADMINNOTIFICATION_INBOX_IS_REMOVE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "admin_system_messages": {
+        "column": {
+            "identity": true,
+            "severity": true,
+            "created_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/AdminNotification/etc/module.xml b/app/code/Magento/AdminNotification/etc/module.xml
index 8a792ee8453ce..607ecbde10a26 100644
--- a/app/code/Magento/AdminNotification/etc/module.xml
+++ b/app/code/Magento/AdminNotification/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_AdminNotification" setup_version="2.0.0">
+    <module name="Magento_AdminNotification" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/AdminNotification/i18n/en_US.csv b/app/code/Magento/AdminNotification/i18n/en_US.csv
index 16c5abb9db0d2..db5a4c9254814 100644
--- a/app/code/Magento/AdminNotification/i18n/en_US.csv
+++ b/app/code/Magento/AdminNotification/i18n/en_US.csv
@@ -48,3 +48,4 @@ Severity,Severity
 "Date Added","Date Added"
 Message,Message
 Actions,Actions
+"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index a97293547e132..0448daaf17644 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -19,20 +19,12 @@
     </ul>
 </div>
 
-<script>
-require([
-    "jquery",
-    "Magento_Ui/js/modal/modal"
-], function($){
-    if (this.modal) {
-        this.modal.html($('[data-role="system_messages_list"]').html());
-    } else {
-        this.modal = $('[data-role="system_messages_list"]').modal({
-            modalClass: 'modal-system-messages ui-popup-message',
-            type: 'popup',
-            buttons: []
-        });
+<script type="text/x-magento-init">
+    {
+        "[data-role=system_messages_list]": {
+            "Magento_AdminNotification/js/system/messages/popup": {
+                "class":"modal-system-messages ui-popup-message"
+            }
+        }
     }
-    this.modal.modal('openModal');
-});
-</script>
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js b/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
new file mode 100644
index 0000000000000..39c61d6e07d29
--- /dev/null
+++ b/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal'
+], function ($, modal) {
+    'use strict';
+
+    return function (data, element) {
+
+        if (modal.modal) {
+            modal.modal.html($(element).html());
+        } else {
+            modal.modal = $(element).modal({
+                modalClass: data.class,
+                type: 'popup',
+                buttons: []
+            });
+        }
+
+        modal.modal.modal('openModal');
+    };
+});
diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
index 02413a1899cd7..d78266ab75311 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
 use Magento\Catalog\Model\Product as CatalogProduct;
 
-class GetFilter extends ExportController
+class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Get grid-filter of entity attributes action.
@@ -37,10 +39,10 @@ public function execute()
                 );
                 return $resultLayout;
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         } else {
-            $this->messageManager->addError(__('Please correct the data sent.'));
+            $this->messageManager->addErrorMessage(__('Please correct the data sent.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 7ddd5e3bb2a36..fda6ae9530135 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
@@ -98,7 +104,6 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      * @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
      * @param ImportProduct\StoreResolver $storeResolver
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
-     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -187,6 +192,7 @@ protected function initTypeModels()
      * Export process
      *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function export()
     {
@@ -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,41 +583,52 @@ protected function getTierPrices(array $listSku, $table)
     }
 
     /**
-     * Get Website code
+     * Get Website code.
      *
      * @param int $websiteId
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    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 $customerGroupId
-     * @param null $allGroups
+     * @param int $groupId
+     * @param int $allGroups
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    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/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 23829d3725119..2e17e734b1e60 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -8,7 +8,6 @@
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\Framework\App\ResourceConnection;
 
 /**
  * Class AdvancedPricing
@@ -394,7 +393,7 @@ protected function saveAndReplaceAdvancedPrices()
                             ? $rowData[self::COL_TIER_PRICE] : 0,
                         'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT
                             ? $rowData[self::COL_TIER_PRICE] : null,
-                        'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
+                        'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
                     ];
                 }
             }
@@ -482,9 +481,8 @@ protected function deleteProductTierPrices(array $listSku, $table)
                 $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, 0);
                 return false;
             }
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**
@@ -619,6 +617,7 @@ protected function processCountNewPrices(array $tierPrices)
      * Get product entity link field
      *
      * @return string
+     * @throws \Exception
      */
     private function getProductEntityLinkField()
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
index 25a9fc244fe51..d939a3f7c392e 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
@@ -28,6 +28,7 @@ public function __construct($validators = [])
      *
      * @param array $value
      * @return bool
+     * @throws \Zend_Validate_Exception
      */
     public function isValid($value)
     {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE.txt b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE.txt
rename to app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/LICENSE_AFL.txt b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/LICENSE_AFL.txt
rename to app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..7b4d0f3f0b12b
--- /dev/null
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Advanced Pricing Import Export Functional Tests
+
+The Functional Test Module for **Magento Advanced Pricing Import Export** module.
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php
index 48b4c58918740..57ceb7f5af275 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php
@@ -151,10 +151,13 @@ protected function setUp()
             ]
         );
         $this->exportConfig = $this->createMock(\Magento\ImportExport\Model\Export\Config::class);
-        $this->productFactory = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\ProductFactory::class, [
+        $this->productFactory = $this->createPartialMock(
+            \Magento\Catalog\Model\ResourceModel\ProductFactory::class,
+            [
                 'create',
                 'getTypeId',
-            ]);
+            ]
+        );
         $this->attrSetColFactory = $this->createPartialMock(
             \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class,
             [
@@ -185,11 +188,14 @@ protected function setUp()
             \Magento\CatalogImportExport\Model\Import\Product\StoreResolver::class
         );
         $this->groupRepository = $this->createMock(\Magento\Customer\Api\GroupRepositoryInterface::class);
-        $this->writer = $this->createPartialMock(\Magento\ImportExport\Model\Export\Adapter\AbstractAdapter::class, [
-                'setHeaderCols',
-                'writeRow',
-                'getContents',
-            ]);
+        $this->writer = $this->createPartialMock(
+            \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter::class,
+            [
+            'setHeaderCols',
+            'writeRow',
+            'getContents',
+            ]
+        );
         $constructorMethods = [
             'initTypeModels',
             'initAttributes',
@@ -213,7 +219,7 @@ protected function setUp()
             '_getCustomerGroupById',
             'correctExportData'
         ]);
-        $this->advancedPricing = $this->getMockbuilder(
+        $this->advancedPricing = $this->getMockBuilder(
             \Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing::class
         )
             ->setMethods($mockMethods)
@@ -347,6 +353,7 @@ protected function tearDown()
      * @param $object
      * @param $property
      * @return mixed
+     * @throws \ReflectionException
      */
     protected function getPropertyValue($object, $property)
     {
@@ -362,6 +369,8 @@ protected function getPropertyValue($object, $property)
      * @param $object
      * @param $property
      * @param $value
+     * @return mixed
+     * @throws \ReflectionException
      */
     protected function setPropertyValue(&$object, $property, $value)
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php
index bb64acb558320..2c930237da831 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php
@@ -181,6 +181,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
         $this->tierPrice->isValid($value);
     }
 
+    /**
+     * @return array
+     */
     public function isValidResultFalseDataProvider()
     {
         return [
@@ -286,6 +289,9 @@ public function isValidResultFalseDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function isValidAddMessagesCallDataProvider()
     {
         return [
@@ -340,6 +346,7 @@ public function isValidAddMessagesCallDataProvider()
      * @param object $object
      * @param string $property
      * @return mixed
+     * @throws \ReflectionException
      */
     protected function getPropertyValue($object, $property)
     {
@@ -357,6 +364,7 @@ protected function getPropertyValue($object, $property)
      * @param string $property
      * @param mixed $value
      * @return object
+     * @throws \ReflectionException
      */
     protected function setPropertyValue(&$object, $property, $value)
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
index 5111b4932d7a8..d78c4f5e61af3 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
@@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class)
+        $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class)
             ->setMethods(['getBaseCurrency'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -103,17 +103,20 @@ public function testGetAllWebsitesValue()
         $this->webSiteModel->expects($this->once())->method('getBaseCurrency')->willReturn($currency);
 
         $expectedResult = AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $currencyCode . ']';
-        $this->websiteString = $this->getMockBuilder(
+        $websiteString = $this->getMockBuilder(
             \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website::class
         )
             ->setMethods(['_clearMessages', '_addMessages'])
             ->setConstructorArgs([$this->storeResolver, $this->webSiteModel])
             ->getMock();
-        $result = $this->websiteString->getAllWebsitesValue();
+        $result = $websiteString->getAllWebsitesValue();
 
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public function isValidReturnDataProvider()
     {
         return [
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php
index d9fce98826105..5ca534284a48d 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php
@@ -77,6 +77,9 @@ public function testInit()
         $this->validator->init(null);
     }
 
+    /**
+     * @return array
+     */
     public function isValidDataProvider()
     {
         return [
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
index 6d130d93ee6a5..340e81746f029 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
@@ -209,6 +209,10 @@ public function testGetEntityTypeCode()
      * Test method validateRow against its result.
      *
      * @dataProvider validateRowResultDataProvider
+     * @param array $rowData
+     * @param string|null $behavior
+     * @param bool $expectedResult
+     * @throws \ReflectionException
      */
     public function testValidateRowResult($rowData, $behavior, $expectedResult)
     {
@@ -234,6 +238,10 @@ public function testValidateRowResult($rowData, $behavior, $expectedResult)
      * Test method validateRow whether AddRowError is called.
      *
      * @dataProvider validateRowAddRowErrorCallDataProvider
+     * @param array $rowData
+     * @param string|null $behavior
+     * @param string $error
+     * @throws \ReflectionException
      */
     public function testValidateRowAddRowErrorCall($rowData, $behavior, $error)
     {
@@ -324,6 +332,13 @@ public function testSaveAdvancedPricing()
      * Take into consideration different data and check relative internal calls.
      *
      * @dataProvider saveAndReplaceAdvancedPricesAppendBehaviourDataProvider
+     * @param array $data
+     * @param string $tierCustomerGroupId
+     * @param string $groupCustomerGroupId
+     * @param string $tierWebsiteId
+     * @param string $groupWebsiteId
+     * @param array $expectedTierPrices
+     * @throws \ReflectionException
      */
     public function testSaveAndReplaceAdvancedPricesAppendBehaviourDataAndCalls(
         $data,
@@ -768,6 +783,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
         $this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
     }
 
+    /**
+     * @return array
+     */
     public function saveProductPricesDataProvider()
     {
         return [
@@ -839,6 +857,9 @@ public function testDeleteProductTierPrices(
         );
     }
 
+    /**
+     * @return array
+     */
     public function deleteProductTierPricesDataProvider()
     {
         return [
@@ -921,6 +942,9 @@ public function testProcessCountExistingPrices(
         $this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
     }
 
+    /**
+     * @return array
+     */
     public function processCountExistingPricesDataProvider()
     {
         return [
@@ -947,6 +971,7 @@ public function processCountExistingPricesDataProvider()
      * @param $object
      * @param $property
      * @return mixed
+     * @throws \ReflectionException
      */
     protected function getPropertyValue($object, $property)
     {
@@ -963,6 +988,8 @@ protected function getPropertyValue($object, $property)
      * @param $object
      * @param $property
      * @param $value
+     * @return mixed
+     * @throws \ReflectionException
      */
     protected function setPropertyValue(&$object, $property, $value)
     {
@@ -980,8 +1007,8 @@ protected function setPropertyValue(&$object, $property, $value)
      * @param object $object
      * @param string $method
      * @param array $args
-     *
-     * @return mixed the method result.
+     * @return mixed
+     * @throws \ReflectionException
      */
     private function invokeMethod($object, $method, $args = [])
     {
@@ -998,6 +1025,7 @@ private function invokeMethod($object, $method, $args = [])
      * @param array $methods
      *
      * @return \PHPUnit_Framework_MockObject_MockObject
+     * @throws \ReflectionException
      */
     private function getAdvancedPricingMock($methods = [])
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index 1660104953504..12e1d9938f4bd 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/AdvancedPricingImportExport/etc/module.xml b/app/code/Magento/AdvancedPricingImportExport/etc/module.xml
index ac4b8dafd0183..230fb17ae5544 100644
--- a/app/code/Magento/AdvancedPricingImportExport/etc/module.xml
+++ b/app/code/Magento/AdvancedPricingImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_AdvancedPricingImportExport" setup_version="2.0.0">
+    <module name="Magento_AdvancedPricingImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
new file mode 100644
index 0000000000000..403a4d12cc17b
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block\Adminhtml\Search;
+
+/**
+ * Search queries relations grid container
+ *
+ * @api
+ * @author     Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
+ */
+class Edit extends \Magento\Backend\Block\Widget\Grid\Container
+{
+    /**
+     * Enable grid container
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_blockGroup = 'Magento_AdvancedSearch';
+        $this->_controller = 'adminhtml_search';
+        $this->_headerText = __('Related Search Terms');
+        $this->_addButtonLabel = __('Add New Search Term');
+        parent::_construct();
+        $this->buttonList->remove('add');
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
new file mode 100644
index 0000000000000..6bdfd3b0dd143
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block\Adminhtml\Search;
+
+/**
+ * Search query relations edit grid
+ *
+ * @api
+ * @author     Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
+ */
+class Grid extends \Magento\Backend\Block\Widget\Grid
+{
+    /**
+     * @var \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options
+     */
+    protected $_options;
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $_registryManager;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Backend\Helper\Data $backendHelper
+     * @param \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options $options
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Helper\Data $backendHelper,
+        \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options $options,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        array $data = []
+    ) {
+        $this->jsonHelper = $jsonHelper;
+        parent::__construct($context, $backendHelper, $data);
+        $this->_options = $options;
+        $this->_registryManager = $registry;
+        $this->setDefaultFilter(['query_id_selected' => 1]);
+    }
+
+    /**
+     *  Retrieve a value from registry by a key
+     *
+     * @return mixed
+     */
+    public function getQuery()
+    {
+        return $this->_registryManager->registry('current_catalog_search');
+    }
+
+    /**
+     * Add column filter to collection
+     *
+     * @param \Magento\Backend\Block\Widget\Grid\Column $column
+     * @return $this
+     */
+    protected function _addColumnFilterToCollection($column)
+    {
+        // Set custom filter for query selected flag
+        if ($column->getId() == 'query_id_selected' && $this->getQuery()->getId()) {
+            $selectedIds = $this->getSelectedQueries();
+            if (empty($selectedIds)) {
+                $selectedIds = 0;
+            }
+            if ($column->getFilter()->getValue()) {
+                $this->getCollection()->addFieldToFilter('query_id', ['in' => $selectedIds]);
+            } elseif (!empty($selectedIds)) {
+                $this->getCollection()->addFieldToFilter('query_id', ['nin' => $selectedIds]);
+            }
+        } else {
+            parent::_addColumnFilterToCollection($column);
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve selected related queries from grid
+     *
+     * @return array
+     */
+    public function getSelectedQueries()
+    {
+        return $this->_options->toOptionArray();
+    }
+
+    /**
+     * Get queries json
+     *
+     * @return string
+     */
+    public function getQueriesJson()
+    {
+        $queries = array_flip($this->getSelectedQueries());
+        if (!empty($queries)) {
+            return $this->jsonHelper->jsonEncode($queries);
+        }
+        return '{}';
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/System/Config/TestConnection.php
new file mode 100644
index 0000000000000..a546cfb126ba7
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/System/Config/TestConnection.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block\Adminhtml\System\Config;
+
+/**
+ * Search engine test connection block
+ * @api
+ * @since 100.1.0
+ */
+class TestConnection extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Set template to itself
+     *
+     * @return $this
+     * @since 100.1.0
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        $this->setTemplate('Magento_AdvancedSearch::system/config/testconnection.phtml');
+        return $this;
+    }
+
+    /**
+     * Unset some non-related element parameters
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     * @since 100.1.0
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $element = clone $element;
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    /**
+     * Get the button and scripts contents
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     * @since 100.1.0
+     */
+    protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $originalData = $element->getOriginalData();
+        $this->addData(
+            [
+                'button_label' => __($originalData['button_label']),
+                'html_id' => $element->getHtmlId(),
+                'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config/testconnection'),
+                'field_mapping' => str_replace('"', '\\"', json_encode($this->_getFieldMapping()))
+            ]
+        );
+
+        return $this->_toHtml();
+    }
+
+    /**
+     * Returns configuration fields required to perform the ping request
+     *
+     * @return array
+     * @since 100.1.0
+     */
+    protected function _getFieldMapping()
+    {
+        return ['engine' => 'catalog_search_engine'];
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Block/Recommendations.php b/app/code/Magento/AdvancedSearch/Block/Recommendations.php
new file mode 100644
index 0000000000000..1a23ea554bd91
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/Recommendations.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block;
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+class Recommendations extends SearchData
+{
+}
diff --git a/app/code/Magento/AdvancedSearch/Block/SearchData.php b/app/code/Magento/AdvancedSearch/Block/SearchData.php
new file mode 100644
index 0000000000000..105a1c1c4fc46
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/SearchData.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Search\Model\QueryFactoryInterface;
+use Magento\Search\Model\QueryInterface;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+
+abstract class SearchData extends Template implements SearchDataInterface
+{
+    /**
+     * @var QueryInterface
+     */
+    private $query;
+
+    /**
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * @var SuggestedQueriesInterface
+     */
+    private $searchDataProvider;
+
+    /**
+     * @var string
+     */
+    protected $_template = 'Magento_AdvancedSearch::search_data.phtml';
+
+    /**
+     * @param Template\Context $context
+     * @param SuggestedQueriesInterface $searchDataProvider
+     * @param QueryFactoryInterface $queryFactory
+     * @param string $title
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        SuggestedQueriesInterface $searchDataProvider,
+        QueryFactoryInterface $queryFactory,
+        $title,
+        array $data = []
+    ) {
+        $this->searchDataProvider = $searchDataProvider;
+        $this->query = $queryFactory->get();
+        $this->title = $title;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItems()
+    {
+        return $this->searchDataProvider->getItems($this->query);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isShowResultsCount()
+    {
+        return $this->searchDataProvider->isResultsCountEnabled();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getLink($queryText)
+    {
+        return $this->getUrl('*/*/') . '?q=' . urlencode($queryText);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTitle()
+    {
+        return __($this->title);
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php b/app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php
new file mode 100644
index 0000000000000..299e68e558ad5
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block;
+
+/**
+ * Interface \Magento\AdvancedSearch\Block\SearchDataInterface
+ *
+ */
+interface SearchDataInterface
+{
+    /**
+     * Retrieve search suggestions
+     *
+     * @return array
+     */
+    public function getItems();
+
+    /**
+     * @return bool
+     */
+    public function isShowResultsCount();
+
+    /**
+     * @param string $queryText
+     * @return string
+     */
+    public function getLink($queryText);
+
+    /**
+     * @return string
+     */
+    public function getTitle();
+}
diff --git a/app/code/Magento/AdvancedSearch/Block/Suggestions.php b/app/code/Magento/AdvancedSearch/Block/Suggestions.php
new file mode 100644
index 0000000000000..1f7b54d68dab4
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Block/Suggestions.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block;
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+class Suggestions extends SearchData
+{
+}
diff --git a/app/code/Magento/AdvancedSearch/Controller/Adminhtml/Search/System/Config/TestConnection.php b/app/code/Magento/AdvancedSearch/Controller/Adminhtml/Search/System/Config/TestConnection.php
new file mode 100644
index 0000000000000..be72d0a82822d
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Controller/Adminhtml/Search/System/Config/TestConnection.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Filter\StripTags;
+
+class TestConnection extends Action
+{
+    /**
+     * Authorization level of a basic admin session.
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_CatalogSearch::config_catalog_search';
+
+    /**
+     * @var ClientResolver
+     */
+    private $clientResolver;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var StripTags
+     */
+    private $tagFilter;
+
+    /**
+     * @param Context           $context
+     * @param ClientResolver    $clientResolver
+     * @param JsonFactory       $resultJsonFactory
+     * @param StripTags         $tagFilter
+     */
+    public function __construct(
+        Context $context,
+        ClientResolver $clientResolver,
+        JsonFactory $resultJsonFactory,
+        StripTags $tagFilter
+    ) {
+        parent::__construct($context);
+        $this->clientResolver = $clientResolver;
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->tagFilter = $tagFilter;
+    }
+
+    /**
+     * Check for connection to server
+     *
+     * @return \Magento\Framework\Controller\Result\Json
+     */
+    public function execute()
+    {
+        $result = [
+            'success' => false,
+            'errorMessage' => '',
+        ];
+        $options = $this->getRequest()->getParams();
+
+        try {
+            if (empty($options['engine'])) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Missing search engine parameter.')
+                );
+            }
+            $response = $this->clientResolver->create($options['engine'], $options)->testConnection();
+            if ($response) {
+                $result['success'] = true;
+            }
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $result['errorMessage'] = $e->getMessage();
+        } catch (\Exception $e) {
+            $message = __($e->getMessage());
+            $result['errorMessage'] = $this->tagFilter->filter($message);
+        }
+
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData($result);
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt b/app/code/Magento/AdvancedSearch/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt
rename to app/code/Magento/AdvancedSearch/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt b/app/code/Magento/AdvancedSearch/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt
rename to app/code/Magento/AdvancedSearch/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProvider.php b/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProvider.php
new file mode 100644
index 0000000000000..ef1f9890e02d1
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProvider.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Adapter\DataMapper;
+
+/**
+ * Provide additional fields for data mapper during search indexer
+ * Must return array with the following format: [[product id] => [field name1 => value1, ...], ...]
+ */
+class AdditionalFieldsProvider implements AdditionalFieldsProviderInterface
+{
+    /**
+     * @var AdditionalFieldsProviderInterface[]
+     */
+    private $fieldsProviders;
+
+    /**
+     * @param AdditionalFieldsProviderInterface[] $fieldsProviders
+     */
+    public function __construct(array $fieldsProviders)
+    {
+        $this->fieldsProviders = $fieldsProviders;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFields(array $productIds, $storeId)
+    {
+        $fields = [];
+        foreach ($this->fieldsProviders as $fieldsProvider) {
+            $fields[] = $fieldsProvider->getFields($productIds, $storeId);
+        }
+
+        return array_replace_recursive(...$fields);
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php b/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php
new file mode 100644
index 0000000000000..d7151236c6170
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Adapter\DataMapper;
+
+/**
+ * Provide additional fields for data mapper during search indexer
+ * Must return array with the following format: [[product id] => [field name1 => value1, ...], ...]
+ * @api
+ * @since 100.2.0
+ */
+interface AdditionalFieldsProviderInterface
+{
+    /**
+     * Get additional fields for data mapper during search indexer based on product ids and store id.
+     *
+     * @param array $productIds
+     * @param int $storeId
+     * @return array
+     * @since 100.2.0
+     */
+    public function getFields(array $productIds, $storeId);
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php b/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php
new file mode 100644
index 0000000000000..b139689dbc234
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Options for Query Id column
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Adminhtml\Search\Grid;
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+class Options implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    protected $_request;
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $_registryManager;
+
+    /**
+     * @var \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $_searchResourceModel
+     */
+    protected $_searchResourceModel;
+
+    /**
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $searchResourceModel
+     */
+    public function __construct(
+        \Magento\Framework\App\RequestInterface $request,
+        \Magento\Framework\Registry $registry,
+        \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $searchResourceModel
+    ) {
+        $this->_request = $request;
+        $this->_registryManager = $registry;
+        $this->_searchResourceModel = $searchResourceModel;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        $queries = $this->_request->getPost('selected_queries');
+
+        $currentQueryId = $this->_registryManager->registry('current_catalog_search')->getId();
+        $queryIds = [];
+        if ($queries === null && !empty($currentQueryId)) {
+            $queryIds = $this->_searchResourceModel->getRelatedQueries($currentQueryId);
+        }
+        return $queryIds;
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php
new file mode 100644
index 0000000000000..05eb513d68399
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Client;
+
+use Magento\Framework\ObjectManagerInterface;
+
+class ClientFactory implements ClientFactoryInterface
+{
+    /**
+     * Object manager
+     *
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var string
+     */
+    private $clientClass;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param string $clientClass
+     */
+    public function __construct(ObjectManagerInterface $objectManager, $clientClass)
+    {
+        $this->objectManager = $objectManager;
+        $this->clientClass = $clientClass;
+    }
+
+    /**
+     * Return search client
+     *
+     * @param array $options
+     * @return ClientInterface
+     */
+    public function create(array $options = [])
+    {
+        return $this->objectManager->create(
+            $this->clientClass,
+            ['options' => $options]
+        );
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Client/ClientFactoryInterface.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientFactoryInterface.php
new file mode 100644
index 0000000000000..acacbb1c093fa
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Client/ClientFactoryInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Client;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface ClientFactoryInterface
+{
+    /**
+     * Return search client
+     *
+     * @param array $options
+     * @return ClientInterface
+     * @since 100.1.0
+     */
+    public function create(array $options = []);
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Client/ClientInterface.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientInterface.php
new file mode 100644
index 0000000000000..3bbd62813f188
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Client/ClientInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Client;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface ClientInterface
+{
+    /**
+     * Validate connection params for search engine
+     *
+     * @return bool
+     * @since 100.1.0
+     */
+    public function testConnection();
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Client/ClientOptionsInterface.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientOptionsInterface.php
new file mode 100644
index 0000000000000..8b25829666b61
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Client/ClientOptionsInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Client;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface ClientOptionsInterface
+{
+    /**
+     * Return search client options
+     *
+     * @param array $options
+     * @return array
+     * @since 100.1.0
+     */
+    public function prepareClientOptions($options = []);
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php
new file mode 100644
index 0000000000000..fbcaf412e3562
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Client;
+
+use \Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class ClientResolver
+{
+    /**
+     * Scope configuration
+     *
+     * @var ScopeConfigInterface
+     * @since 100.1.0
+     * @deprecated since it is not used anymore
+     */
+    protected $scopeConfig;
+
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     * @since 100.1.0
+     */
+    protected $objectManager;
+
+    /**
+     * Pool of existing client factories
+     *
+     * @var array
+     */
+    private $clientFactoryPool;
+
+    /**
+     * Pool of client option classes
+     *
+     * @var array
+     */
+    private $clientOptionsPool;
+
+    /**
+     * @var EngineResolver
+     */
+    private $engineResolver;
+
+    /**
+     * Config path
+     *
+     * @var string
+     * @since 100.1.0
+     * @deprecated since it is not used anymore
+     */
+    protected $path;
+
+    /**
+     * Config Scope
+     * @since 100.1.0
+     * @deprecated since it is not used anymore
+     */
+    protected $scope;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param array $clientFactories
+     * @param array $clientOptions
+     * @param EngineResolverInterface $engineResolver
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $clientFactories,
+        array $clientOptions,
+        EngineResolverInterface $engineResolver
+    ) {
+        $this->objectManager = $objectManager;
+        $this->clientFactoryPool = $clientFactories;
+        $this->clientOptionsPool = $clientOptions;
+        $this->engineResolver = $engineResolver;
+    }
+
+    /**
+     * Returns configured search engine
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    public function getCurrentEngine()
+    {
+        return $this->engineResolver->getCurrentSearchEngine();
+    }
+
+    /**
+     * Create client instance
+     *
+     * @param string $engine
+     * @param array $data
+     * @return ClientInterface
+     * @since 100.1.0
+     */
+    public function create($engine = '', array $data = [])
+    {
+        $engine = $engine ?: $this->getCurrentEngine();
+
+        if (!isset($this->clientFactoryPool[$engine])) {
+            throw new \LogicException(
+                'There is no such client factory: ' . $engine
+            );
+        }
+        $factoryClass = $this->clientFactoryPool[$engine];
+        $factory = $this->objectManager->create($factoryClass);
+        if (!($factory instanceof ClientFactoryInterface)) {
+            throw new \InvalidArgumentException(
+                'Client factory must implement \Magento\AdvancedSearch\Model\Client\ClientFactoryInterface'
+            );
+        }
+
+        $optionsClass = $this->clientOptionsPool[$engine];
+        $clientOptions = $this->objectManager->create($optionsClass);
+        if (!($clientOptions instanceof ClientOptionsInterface)) {
+            throw new \InvalidArgumentException(
+                'Client options must implement \Magento\AdvancedSearch\Model\Client\ClientInterface'
+            );
+        }
+
+        $client = $factory->create($clientOptions->prepareClientOptions($data));
+
+        return $client;
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/DataProvider/Suggestions.php b/app/code/Magento/AdvancedSearch/Model/DataProvider/Suggestions.php
new file mode 100644
index 0000000000000..c76811c854514
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/DataProvider/Suggestions.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\DataProvider;
+
+use Magento\Search\Model\QueryInterface;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+
+class Suggestions implements SuggestedQueriesInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isResultsCountEnabled()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItems(QueryInterface $query)
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php b/app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php
new file mode 100644
index 0000000000000..421c309d3ed06
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin;
+
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Customer\Model\ResourceModel\Group;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\EngineResolver;
+
+class CustomerGroup extends AbstractPlugin
+{
+    /**
+     * @var ClientOptionsInterface
+     */
+    protected $clientOptions;
+
+    /**
+     * @var EngineResolverInterface
+     */
+    protected $engineResolver;
+
+    /**
+     * @param IndexerRegistry $indexerRegistry
+     * @param ClientOptionsInterface $clientOptions
+     * @param EngineResolverInterface $engineResolver
+     */
+    public function __construct(
+        IndexerRegistry $indexerRegistry,
+        ClientOptionsInterface $clientOptions,
+        EngineResolverInterface $engineResolver
+    ) {
+        parent::__construct($indexerRegistry);
+        $this->clientOptions = $clientOptions;
+        $this->engineResolver = $engineResolver;
+    }
+
+    /**
+     * Invalidate indexer on customer group save
+     *
+     * @param Group $subject
+     * @param \Closure $proceed
+     * @param AbstractModel $group
+     * @return Attribute
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundSave(
+        Group $subject,
+        \Closure $proceed,
+        AbstractModel $group
+    ) {
+        $needInvalidation =
+            ($this->engineResolver->getCurrentSearchEngine() != EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE)
+            && ($group->isObjectNew() || $group->dataHasChangedFor('tax_class_id'));
+        $result = $proceed($group);
+        if ($needInvalidation) {
+            $this->indexerRegistry->get(Fulltext::INDEXER_ID)->invalidate();
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php b/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php
new file mode 100644
index 0000000000000..c0c224766eb3c
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Recommendations;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Search\Model\QueryInterface;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+
+/**
+ * Class DataProvider
+ */
+class DataProvider implements SuggestedQueriesInterface
+{
+    /**
+     * @deprecated
+     * @see SuggestedQueriesInterface::SEARCH_RECOMMENDATIONS_ENABLED
+     */
+    const CONFIG_IS_ENABLED = 'catalog/search/search_recommendations_enabled';
+
+    /**
+     * @deprecated
+     * @see SuggestedQueriesInterface::SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED
+     */
+    const CONFIG_RESULTS_COUNT_ENABLED = 'catalog/search/search_recommendations_count_results_enabled';
+
+    /**
+     * @deprecated
+     * @see SuggestedQueriesInterface::SEARCH_RECOMMENDATIONS_COUNT
+     */
+    const CONFIG_RESULTS_COUNT = 'catalog/search/search_recommendations_count';
+
+    /**
+     * @var \Magento\Search\Model\QueryResultFactory
+     */
+    private $queryResultFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\Layer
+     */
+    protected $searchLayer;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory
+     */
+    private $recommendationsFactory;
+
+    /**
+     * DataProvider constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
+     * @param \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory
+     * @param \Magento\Search\Model\QueryResultFactory $queryResultFactory
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
+        \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory,
+        \Magento\Search\Model\QueryResultFactory $queryResultFactory
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->searchLayer = $layerResolver->get();
+        $this->recommendationsFactory = $recommendationsFactory;
+        $this->queryResultFactory = $queryResultFactory;
+    }
+
+    /**
+     * Is Results Count Enabled
+     *
+     * @return bool
+     */
+    public function isResultsCountEnabled()
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::CONFIG_RESULTS_COUNT_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems(QueryInterface $query)
+    {
+        $recommendations = [];
+
+        if (!$this->isSearchRecommendationsEnabled()) {
+            return [];
+        }
+
+        foreach ($this->getSearchRecommendations($query) as $recommendation) {
+            $recommendations[] = $this->queryResultFactory->create(
+                [
+                    'queryText' => $recommendation['query_text'],
+                    'resultsCount' => $recommendation['num_results'],
+                ]
+            );
+        }
+        return $recommendations;
+    }
+
+    /**
+     * Return Search Recommendations
+     *
+     * @param QueryInterface $query
+     * @return array
+     */
+    private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $query)
+    {
+        $recommendations = [];
+
+        if ($this->isSearchRecommendationsEnabled()) {
+            $productCollection = $this->searchLayer->getProductCollection();
+            $params = ['store_id' => $productCollection->getStoreId()];
+
+            /** @var \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $recommendationsResource */
+            $recommendationsResource = $this->recommendationsFactory->create();
+            $recommendations = $recommendationsResource->getRecommendationsByQuery(
+                $query->getQueryText(),
+                $params,
+                $this->getSearchRecommendationsCount()
+            );
+        }
+
+        return $recommendations;
+    }
+
+    /**
+     * Is Search Recommendations Enabled
+     *
+     * @return bool
+     */
+    private function isSearchRecommendationsEnabled()
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::CONFIG_IS_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Return Search Recommendations Count
+     *
+     * @return int
+     */
+    private function getSearchRecommendationsCount()
+    {
+        return (int)$this->scopeConfig->getValue(
+            self::CONFIG_RESULTS_COUNT,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/Recommendations/SaveSearchQueryRelationsObserver.php b/app/code/Magento/AdvancedSearch/Model/Recommendations/SaveSearchQueryRelationsObserver.php
new file mode 100644
index 0000000000000..5f5d4122d97a5
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/Recommendations/SaveSearchQueryRelationsObserver.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\Recommendations;
+
+use Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory;
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
+
+class SaveSearchQueryRelationsObserver implements ObserverInterface
+{
+
+    /**
+     * @var RecommendationsFactory
+     */
+    private $recommendationsFactory;
+
+    /**
+     * @param RecommendationsFactory $recommendationsFactory
+     */
+    public function __construct(RecommendationsFactory $recommendationsFactory)
+    {
+        $this->recommendationsFactory = $recommendationsFactory;
+    }
+
+    /**
+     * Save search query relations after save search query
+     *
+     * @param EventObserver $observer
+     * @return void
+     */
+    public function execute(EventObserver $observer)
+    {
+        $searchQueryModel = $observer->getEvent()->getDataObject();
+        $queryId = $searchQueryModel->getId();
+        $relatedQueries = $searchQueryModel->getSelectedQueriesGrid();
+
+        if (strlen($relatedQueries) == 0) {
+            $relatedQueries = [];
+        } else {
+            $relatedQueries = explode('&', $relatedQueries);
+        }
+
+        $this->recommendationsFactory->create()->saveRelatedQueries($queryId, $relatedQueries);
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
new file mode 100644
index 0000000000000..b20872da2f8e7
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
+/**
+ * @api
+ * @since 100.1.0
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Index extends AbstractDb
+{
+    /**
+     * @var StoreManagerInterface
+     * @since 100.1.0
+     */
+    protected $storeManager;
+
+    /**
+     * @var MetadataPool
+     * @since 100.1.0
+     */
+    protected $metadataPool;
+
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @var DimensionCollectionFactory|null
+     */
+    private $dimensionCollectionFactory;
+
+    /**
+     * @var int|null
+     */
+    private $websiteId;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param StoreManagerInterface $storeManager
+     * @param MetadataPool $metadataPool
+     * @param string|null $connectionName
+     * @param TableResolver|null $tableResolver
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
+     */
+    public function __construct(
+        Context $context,
+        StoreManagerInterface $storeManager,
+        MetadataPool $metadataPool,
+        $connectionName = null,
+        TableResolver $tableResolver = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null
+    ) {
+        parent::__construct($context, $connectionName);
+        $this->storeManager = $storeManager;
+        $this->metadataPool = $metadataPool;
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+        $this->dimensionCollectionFactory = $dimensionCollectionFactory
+            ?: ObjectManager::getInstance()->get(DimensionCollectionFactory::class);
+    }
+
+    /**
+     * Implementation of abstract construct
+     * @return void
+     * @since 100.1.0
+     */
+    protected function _construct()
+    {
+    }
+
+    /**
+     * Return array of price data per customer and website by products
+     *
+     * @param null|array $productIds
+     * @return array
+     * @since 100.1.0
+     */
+    protected function _getCatalogProductPriceData($productIds = null)
+    {
+        $connection = $this->getConnection();
+        $catalogProductIndexPriceSelect = [];
+
+        foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+            if (!isset($dimensions[WebsiteDimensionProvider::DIMENSION_NAME]) ||
+                $this->websiteId === null ||
+                $dimensions[WebsiteDimensionProvider::DIMENSION_NAME]->getValue() === $this->websiteId) {
+                $select = $connection->select()->from(
+                    $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
+                    ['entity_id', 'customer_group_id', 'website_id', 'min_price']
+                );
+                if ($productIds) {
+                    $select->where('entity_id IN (?)', $productIds);
+                }
+                $catalogProductIndexPriceSelect[] = $select;
+            }
+        }
+
+        $catalogProductIndexPriceUnionSelect = $connection->select()->union($catalogProductIndexPriceSelect);
+
+        $result = [];
+        foreach ($connection->fetchAll($catalogProductIndexPriceUnionSelect) as $row) {
+            $result[$row['website_id']][$row['entity_id']][$row['customer_group_id']] = round($row['min_price'], 2);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Retrieve price data for product
+     *
+     * @param null|array $productIds
+     * @param int $storeId
+     * @return array
+     * @since 100.1.0
+     */
+    public function getPriceIndexData($productIds, $storeId)
+    {
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+
+        $this->websiteId = $websiteId;
+        $priceProductsIndexData = $this->_getCatalogProductPriceData($productIds);
+        $this->websiteId = null;
+
+        if (!isset($priceProductsIndexData[$websiteId])) {
+            return [];
+        }
+
+        return $priceProductsIndexData[$websiteId];
+    }
+
+    /**
+     * Prepare system index data for products.
+     *
+     * @param int $storeId
+     * @param null|array $productIds
+     * @return array
+     * @since 100.1.0
+     */
+    public function getCategoryProductIndexData($storeId = null, $productIds = null)
+    {
+        $connection = $this->getConnection();
+
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+
+        $catalogCategoryProductTableName = $this->tableResolver->resolve(
+            AbstractAction::MAIN_INDEX_TABLE,
+            [
+                $catalogCategoryProductDimension
+            ]
+        );
+
+        $select = $connection->select()->from(
+            [$catalogCategoryProductTableName],
+            ['category_id', 'product_id', 'position', 'store_id']
+        )->where(
+            'store_id = ?',
+            $storeId
+        );
+
+        if ($productIds) {
+            $select->where('product_id IN (?)', $productIds);
+        }
+
+        $result = [];
+        foreach ($connection->fetchAll($select) as $row) {
+            $result[$row['product_id']][$row['category_id']] = $row['position'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Retrieve moved categories product ids
+     *
+     * @param int $categoryId
+     * @return array
+     * @since 100.1.0
+     */
+    public function getMovedCategoryProductIds($categoryId)
+    {
+        $connection = $this->getConnection();
+
+        $identifierField = $this->metadataPool->getMetadata(CategoryInterface::class)->getIdentifierField();
+
+        $select = $connection->select()->distinct()->from(
+            ['c_p' => $this->getTable('catalog_category_product')],
+            ['product_id']
+        )->join(
+            ['c_e' => $this->getTable('catalog_category_entity')],
+            'c_p.category_id = c_e.' . $identifierField,
+            []
+        )->where(
+            $connection->quoteInto('c_e.path LIKE ?', '%/' . $categoryId . '/%')
+        )->orWhere(
+            'c_p.category_id = ?',
+            $categoryId
+        );
+
+        return $connection->fetchCol($select);
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
new file mode 100644
index 0000000000000..c19c1d67d81f7
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\ResourceModel;
+
+/**
+ * Catalog search recommendations resource model
+ *
+ * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
+ * @since 100.0.2
+ */
+class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+
+    /**
+     * Search query model
+     *
+     * @var \Magento\Search\Model\Query
+     */
+    protected $_searchQueryModel;
+
+    /**
+     * Construct
+     *
+     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
+     * @param \Magento\Search\Model\QueryFactory $queryFactory
+     * @param string $connectionName
+     */
+    public function __construct(
+        \Magento\Framework\Model\ResourceModel\Db\Context $context,
+        \Magento\Search\Model\QueryFactory $queryFactory,
+        $connectionName = null
+    ) {
+        parent::__construct($context, $connectionName);
+        $this->_searchQueryModel = $queryFactory->create();
+    }
+
+    /**
+     * Init main table
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('catalogsearch_recommendations', 'id');
+    }
+
+    /**
+     * Save search relations
+     *
+     * @param int $queryId
+     * @param array $relatedQueries
+     * @return $this
+     */
+    public function saveRelatedQueries($queryId, $relatedQueries = [])
+    {
+        $connection = $this->getConnection();
+        $whereOr = [];
+        if (count($relatedQueries) > 0) {
+            $whereOr[] = implode(
+                ' AND ',
+                [
+                    $connection->quoteInto('query_id=?', $queryId),
+                    $connection->quoteInto('relation_id NOT IN(?)', $relatedQueries)
+                ]
+            );
+            $whereOr[] = implode(
+                ' AND ',
+                [
+                    $connection->quoteInto('relation_id = ?', $queryId),
+                    $connection->quoteInto('query_id NOT IN(?)', $relatedQueries)
+                ]
+            );
+        } else {
+            $whereOr[] = $connection->quoteInto('query_id = ?', $queryId);
+            $whereOr[] = $connection->quoteInto('relation_id = ?', $queryId);
+        }
+        $whereCond = '(' . implode(') OR (', $whereOr) . ')';
+        $connection->delete($this->getMainTable(), $whereCond);
+
+        $existsRelatedQueries = $this->getRelatedQueries($queryId);
+        $neededRelatedQueries = array_diff($relatedQueries, $existsRelatedQueries);
+        foreach ($neededRelatedQueries as $relationId) {
+            $connection->insert($this->getMainTable(), ["query_id" => $queryId, "relation_id" => $relationId]);
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve related search queries
+     *
+     * @param int|array $queryId
+     * @param bool $limit
+     * @param bool $order
+     * @return array
+     */
+    public function getRelatedQueries($queryId, $limit = false, $order = false)
+    {
+        $collection = $this->_searchQueryModel->getResourceCollection();
+        $connection = $this->getConnection();
+
+        $queryIdCond = $connection->quoteInto('main_table.query_id IN (?)', $queryId);
+
+        $collection->getSelect()->join(
+            ['sr' => $collection->getTable('catalogsearch_recommendations')],
+            '(sr.query_id=main_table.query_id OR sr.relation_id=main_table.query_id) AND ' . $queryIdCond
+        )->reset(
+            \Magento\Framework\DB\Select::COLUMNS
+        )->columns(
+            [
+                'rel_id' => $connection->getCheckSql(
+                    'main_table.query_id=sr.query_id',
+                    'sr.relation_id',
+                    'sr.query_id'
+                ),
+            ]
+        );
+        if (!empty($limit)) {
+            $collection->getSelect()->limit($limit);
+        }
+        if (!empty($order)) {
+            $collection->getSelect()->order($order);
+        }
+
+        $queryIds = $connection->fetchCol($collection->getSelect());
+        return $queryIds;
+    }
+
+    /**
+     * Retrieve related search queries by single query
+     *
+     * @param string $query
+     * @param array $params
+     * @param int $searchRecommendationsCount
+     * @return array
+     */
+    public function getRecommendationsByQuery($query, $params, $searchRecommendationsCount)
+    {
+        $this->_searchQueryModel->loadByQueryText($query);
+
+        if (isset($params['store_id'])) {
+            $this->_searchQueryModel->setStoreId($params['store_id']);
+        }
+        $relatedQueriesIds = $this->loadByQuery($query, $searchRecommendationsCount);
+        $relatedQueries = [];
+        if (count($relatedQueriesIds)) {
+            $connection = $this->getConnection();
+            $mainTable = $this->_searchQueryModel->getResourceCollection()->getMainTable();
+            $select = $connection->select()->from(
+                ['main_table' => $mainTable],
+                ['query_text', 'num_results']
+            )->where(
+                'query_id IN(?)',
+                $relatedQueriesIds
+            )->where(
+                'num_results > 0'
+            );
+            $relatedQueries = $connection->fetchAll($select);
+        }
+
+        return $relatedQueries;
+    }
+
+    /**
+     * Retrieve search terms which are started with $queryWords
+     *
+     * @param string $query
+     * @param int $searchRecommendationsCount
+     * @return array
+     */
+    protected function loadByQuery($query, $searchRecommendationsCount)
+    {
+        $connection = $this->getConnection();
+        $queryId = $this->_searchQueryModel->getId();
+        $relatedQueries = $this->getRelatedQueries($queryId, $searchRecommendationsCount, 'num_results DESC');
+        if ($searchRecommendationsCount - count($relatedQueries) < 1) {
+            return $relatedQueries;
+        }
+
+        $queryWords = [$query];
+        if (strpos($query, ' ') !== false) {
+            $queryWords = array_unique(array_merge($queryWords, explode(' ', $query)));
+            foreach ($queryWords as $key => $word) {
+                $queryWords[$key] = trim($word);
+                if (strlen($word) < 3) {
+                    unset($queryWords[$key]);
+                }
+            }
+        }
+
+        $likeCondition = [];
+        foreach ($queryWords as $word) {
+            $likeCondition[] = $connection->quoteInto('query_text LIKE ?', $word . '%');
+        }
+        $likeCondition = implode(' OR ', $likeCondition);
+
+        $select = $connection->select()->from(
+            $this->_searchQueryModel->getResource()->getMainTable(),
+            ['query_id']
+        )->where(
+            new \Zend_Db_Expr($likeCondition)
+        )->where(
+            'store_id=?',
+            $this->_searchQueryModel->getStoreId()
+        )->order(
+            'num_results DESC'
+        )->limit(
+            $searchRecommendationsCount + 1
+        );
+        $ids = $connection->fetchCol($select);
+
+        if (!is_array($ids)) {
+            $ids = [];
+        }
+
+        $key = array_search($queryId, $ids);
+        if ($key !== false) {
+            unset($ids[$key]);
+        }
+        $ids = array_unique(array_merge($relatedQueries, $ids));
+        $ids = array_slice($ids, 0, $searchRecommendationsCount);
+        return $ids;
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php
new file mode 100644
index 0000000000000..59263f308117c
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\ResourceModel\Search\Grid;
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection
+{
+    /**
+     * Registry manager
+     *
+     * @var \Magento\Framework\Registry
+     */
+    protected $_registryManager;
+
+    /**
+     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\DB\Helper $resourceHelper
+     * @param \Magento\Framework\Registry $registry
+     * @param mixed $connection
+     * @param mixed $resource
+     */
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\DB\Helper $resourceHelper,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        $resource = null
+    ) {
+        $this->_registryManager = $registry;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $storeManager,
+            $resourceHelper,
+            $connection,
+            $resource
+        );
+    }
+
+    /**
+     * Initialize select
+     *
+     * @return $this
+     */
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+        $queryId = $this->getQuery()->getId();
+        if ($queryId) {
+            $this->addFieldToFilter('query_id', ['nin' => $queryId]);
+        }
+        return $this;
+    }
+
+    /**
+     *  Retrieve a value from registry by a key
+     *
+     * @return \Magento\Search\Model\Query
+     */
+    public function getQuery()
+    {
+        return $this->_registryManager->registry('current_catalog_search');
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/SuggestedQueries.php b/app/code/Magento/AdvancedSearch/Model/SuggestedQueries.php
new file mode 100644
index 0000000000000..60f76682fc164
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/SuggestedQueries.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\QueryInterface;
+
+class SuggestedQueries implements SuggestedQueriesInterface
+{
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Array of SuggestedQueriesInterface class names.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * @var SuggestedQueriesInterface
+     */
+    private $dataProvider;
+
+    /**
+     * SuggestedQueries constructor.
+     *
+     * @param EngineResolverInterface $engineResolver
+     * @param ObjectManagerInterface $objectManager
+     * @param array $data
+     */
+    public function __construct(
+        EngineResolverInterface $engineResolver,
+        ObjectManagerInterface $objectManager,
+        array $data
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->objectManager = $objectManager;
+        $this->data = $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isResultsCountEnabled()
+    {
+        return $this->getDataProvider()->isResultsCountEnabled();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItems(QueryInterface $query)
+    {
+        return $this->getDataProvider()->getItems($query);
+    }
+
+    /**
+     * Returns DataProvider for SuggestedQueries
+     *
+     * @return SuggestedQueriesInterface|SuggestedQueriesInterface[]
+     * @throws \Exception
+     */
+    private function getDataProvider()
+    {
+        if (empty($this->dataProvider)) {
+            $currentEngine = $this->engineResolver->getCurrentSearchEngine();
+            $this->dataProvider = $this->objectManager->create($this->data[$currentEngine]);
+            if (!$this->dataProvider instanceof SuggestedQueriesInterface) {
+                throw new \InvalidArgumentException(
+                    'Data provider must implement \Magento\AdvancedSearch\Model\SuggestedQueriesInterface'
+                );
+            }
+        }
+        return $this->dataProvider;
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Model/SuggestedQueriesInterface.php b/app/code/Magento/AdvancedSearch/Model/SuggestedQueriesInterface.php
new file mode 100644
index 0000000000000..64ab45ceb145e
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Model/SuggestedQueriesInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model;
+
+use Magento\Search\Model\QueryInterface;
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+interface SuggestedQueriesInterface
+{
+    /**#@+
+     * Recommendations settings config paths
+     */
+    const SEARCH_RECOMMENDATIONS_ENABLED = 'catalog/search/search_recommendations_enabled';
+    const SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED = 'catalog/search/search_recommendations_count_results_enabled';
+    const SEARCH_RECOMMENDATIONS_COUNT = 'catalog/search/search_recommendations_count';
+    /**#@-*/
+
+    /**#@+
+     * Suggestions settings config paths
+     */
+    const SEARCH_SUGGESTION_COUNT = 'catalog/search/search_suggestion_count';
+    const SEARCH_SUGGESTION_COUNT_RESULTS_ENABLED = 'catalog/search/search_suggestion_count_results_enabled';
+    const SEARCH_SUGGESTION_ENABLED = 'catalog/search/search_suggestion_enabled';
+    /**#@-*/
+
+    /**
+     * @param QueryInterface $query
+     * @return \Magento\Search\Model\QueryResult[]
+     */
+    public function getItems(QueryInterface $query);
+
+    /**
+     * @return bool
+     */
+    public function isResultsCountEnabled();
+}
diff --git a/app/code/Magento/AdvancedSearch/README.md b/app/code/Magento/AdvancedSearch/README.md
new file mode 100644
index 0000000000000..763d1917a8546
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/README.md
@@ -0,0 +1 @@
+AdvancedSearch module introduces advanced search functionality and provides interfaces that allow to implement this functionality by 3rd party search engines
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE.txt b/app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE.txt
rename to app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE_AFL.txt b/app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE_AFL.txt
rename to app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdvancedSearch/Test/Mftf/README.md b/app/code/Magento/AdvancedSearch/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8b4af0e626eb0
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Advanced Search Functional Tests
+
+The Functional Test Module for **Magento Advanced Search** module.
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Block/SearchDataTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Block/SearchDataTest.php
new file mode 100644
index 0000000000000..14065ef2a9a18
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Block/SearchDataTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdvancedSearch\Test\Unit\Block;
+
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class SearchDataTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var  \Magento\Framework\View\Element\Template\Context|MockObject */
+    private $context;
+
+    /**
+     * @var \Magento\Search\Model\QueryFactoryInterface|MockObject
+     */
+    private $queryFactory;
+
+    /**
+     * @var \Magento\Search\Model\Query|MockObject
+     */
+    private $searchQuery;
+
+    /**
+     * @var \Magento\AdvancedSearch\Model\SuggestedQueriesInterface|MockObject
+     */
+    private $dataProvider;
+
+    /**
+     * @var \Magento\AdvancedSearch\Block\SearchData
+     */
+    private $block;
+
+    protected function setUp()
+    {
+        $this->dataProvider = $this->getMockBuilder(\Magento\AdvancedSearch\Model\SuggestedQueriesInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getItems', 'isResultsCountEnabled'])
+            ->getMockForAbstractClass();
+
+        $this->searchQuery = $this->getMockBuilder(\Magento\Search\Model\QueryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQueryText'])
+            ->getMockForAbstractClass();
+        $this->queryFactory = $this->getMockBuilder(\Magento\Search\Model\QueryFactoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMockForAbstractClass();
+        $this->queryFactory->expects($this->once())
+            ->method('get')
+            ->will($this->returnValue($this->searchQuery));
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->block = $this->getMockBuilder(\Magento\AdvancedSearch\Block\SearchData::class)->setConstructorArgs(
+            [
+                $this->context,
+                $this->dataProvider,
+                $this->queryFactory,
+                'Test Title',
+                [],
+            ]
+        )
+            ->setMethods(['getUrl'])
+            ->getMockForAbstractClass();
+    }
+
+    public function testGetSuggestions()
+    {
+        $value = [1, 2, 3, 100500];
+
+        $this->dataProvider->expects($this->once())
+            ->method('getItems')
+            ->with($this->searchQuery)
+            ->will($this->returnValue($value));
+        $actualValue = $this->block->getItems();
+        $this->assertEquals($value, $actualValue);
+    }
+
+    public function testGetLink()
+    {
+        $searchQuery = 'Some test search query';
+        $expectedResult = '?q=Some+test+search+query';
+        $actualResult = $this->block->getLink($searchQuery);
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    public function testIsShowResultsCount()
+    {
+        $value = 'qwertyasdfzxcv';
+        $this->dataProvider->expects($this->once())
+            ->method('isResultsCountEnabled')
+            ->will($this->returnValue($value));
+        $this->assertEquals($value, $this->block->isShowResultsCount());
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php
new file mode 100644
index 0000000000000..6215d79fc41ee
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Test\Unit\Controller\Adminhtml\Search\System\Config;
+
+use Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection;
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\AdvancedSearch\Model\Client\ClientInterface;
+
+/**
+ * Class TestConnectionTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class TestConnectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    /**
+     * @var ClientResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $clientResolverMock;
+
+    /**
+     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $clientMock;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJson;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var \Magento\Framework\Filter\StripTags|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tagFilterMock;
+
+    /**
+     * @var TestConnection
+     */
+    private $controller;
+
+    /**
+     * Setup test function
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->requestMock = $this->createPartialMock(\Magento\Framework\App\Request\Http::class, ['getParams']);
+        $responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
+
+        $context = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
+            ->setMethods(['getRequest', 'getResponse', 'getMessageManager', 'getSession'])
+            ->setConstructorArgs(
+                $helper->getConstructArguments(
+                    \Magento\Backend\App\Action\Context::class,
+                    [
+                        'request' => $this->requestMock
+                    ]
+                )
+            )
+            ->getMock();
+        $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->requestMock));
+        $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock));
+
+        $this->clientResolverMock = $this->getMockBuilder(\Magento\AdvancedSearch\Model\Client\ClientResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->clientMock = $this->createMock(\Magento\AdvancedSearch\Model\Client\ClientInterface::class);
+
+        $this->resultJson = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->tagFilterMock = $this->getMockBuilder(\Magento\Framework\Filter\StripTags::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['filter'])
+            ->getMock();
+
+        $this->controller = new TestConnection(
+            $context,
+            $this->clientResolverMock,
+            $this->resultJsonFactory,
+            $this->tagFilterMock
+        );
+    }
+
+    public function testExecuteEmptyEngine()
+    {
+        $this->requestMock->expects($this->once())->method('getParams')
+            ->will($this->returnValue(['engine' => '']));
+
+        $this->resultJsonFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->resultJson));
+
+        $result = ['success' => false, 'errorMessage' => 'Missing search engine parameter.'];
+
+        $this->resultJson->expects($this->once())->method('setData')
+            ->with($this->equalTo($result));
+
+        $this->controller->execute();
+    }
+
+    public function testExecute()
+    {
+        $this->requestMock->expects($this->once())->method('getParams')
+            ->will($this->returnValue(['engine' => 'engineName']));
+
+        $this->clientResolverMock->expects($this->once())->method('create')
+            ->with($this->equalTo('engineName'))
+            ->will($this->returnValue($this->clientMock));
+
+        $this->clientMock->expects($this->once())->method('testConnection')
+            ->will($this->returnValue(true));
+
+        $this->resultJsonFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->resultJson));
+
+        $result = ['success' => true, 'errorMessage' => ''];
+
+        $this->resultJson->expects($this->once())->method('setData')
+            ->with($this->equalTo($result));
+
+        $this->controller->execute();
+    }
+
+    public function testExecutePingFailed()
+    {
+        $this->requestMock->expects($this->once())->method('getParams')
+            ->will($this->returnValue(['engine' => 'engineName']));
+
+        $this->clientResolverMock->expects($this->once())->method('create')
+            ->with($this->equalTo('engineName'))
+            ->will($this->returnValue($this->clientMock));
+
+        $this->clientMock->expects($this->once())->method('testConnection')
+            ->will($this->returnValue(false));
+
+        $this->resultJsonFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->resultJson));
+
+        $result = ['success' => false, 'errorMessage' => ''];
+
+        $this->resultJson->expects($this->once())->method('setData')
+            ->with($this->equalTo($result));
+
+        $this->controller->execute();
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php
new file mode 100644
index 0000000000000..0cad0a2e8301c
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdvancedSearch\Test\Unit\Model\Client;
+
+use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface;
+use Magento\AdvancedSearch\Model\Client\ClientInterface;
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+class ClientResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ClientResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManager;
+
+    /**
+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $engineResolverMock;
+
+    protected function setUp()
+    {
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->objectManager = $this->createMock(ObjectManagerInterface::class);
+
+        $this->model = new ClientResolver(
+            $this->objectManager,
+            ['engineName' => 'engineFactoryClass'],
+            ['engineName' => 'engineOptionClass'],
+            $this->engineResolverMock
+        );
+    }
+
+    public function testCreate()
+    {
+        $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine')
+            ->will($this->returnValue('engineName'));
+
+        $factoryMock = $this->createMock(ClientFactoryInterface::class);
+
+        $clientMock = $this->createMock(ClientInterface::class);
+
+        $clientOptionsMock = $this->createMock(ClientOptionsInterface::class);
+
+        $this->objectManager->expects($this->exactly(2))->method('create')
+            ->withConsecutive(
+                [$this->equalTo('engineFactoryClass')],
+                [$this->equalTo('engineOptionClass')]
+            )
+            ->willReturnOnConsecutiveCalls(
+                $factoryMock,
+                $clientOptionsMock
+            );
+
+        $clientOptionsMock->expects($this->once())->method('prepareClientOptions')
+            ->with([])
+            ->will($this->returnValue(['parameters']));
+
+        $factoryMock->expects($this->once())->method('create')
+            ->with($this->equalTo(['parameters']))
+            ->will($this->returnValue($clientMock));
+
+        $result = $this->model->create();
+        $this->assertInstanceOf(ClientInterface::class, $result);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testCreateExceptionThrown()
+    {
+        $this->objectManager->expects($this->once())->method('create')
+            ->with($this->equalTo('engineFactoryClass'))
+            ->will($this->returnValue('t'));
+
+        $this->model->create('engineName');
+    }
+
+    /**
+     * @expectedException LogicException
+     */
+    public function testCreateLogicException()
+    {
+        $this->model->create('input');
+    }
+
+    public function testGetCurrentEngine()
+    {
+        $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine')
+            ->will($this->returnValue('engineName'));
+
+        $this->assertEquals('engineName', $this->model->getCurrentEngine());
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php
new file mode 100644
index 0000000000000..e6de135aab473
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdvancedSearch\Test\Unit\Model\Indexer\Fulltext\Plugin;
+
+use Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup;
+use Magento\Framework\Search\EngineResolverInterface;
+
+class CustomerGroupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Indexer\IndexerInterface
+     */
+    protected $indexerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Model\ResourceModel\Group
+     */
+    protected $subjectMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\AdvancedSearch\Model\Client\ClientOptionsInterface
+     */
+    protected $customerOptionsMock;
+
+    /**
+     * @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $indexerRegistryMock;
+
+    /**
+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $engineResolverMock;
+
+    /**
+     * @var CustomerGroup
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->subjectMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group::class);
+        $this->customerOptionsMock = $this->createMock(
+            \Magento\AdvancedSearch\Model\Client\ClientOptionsInterface::class
+        );
+        $this->indexerMock = $this->getMockForAbstractClass(
+            \Magento\Framework\Indexer\IndexerInterface::class,
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getId', 'getState', '__wakeup']
+        );
+        $this->indexerRegistryMock = $this->createPartialMock(
+            \Magento\Framework\Indexer\IndexerRegistry::class,
+            ['get']
+        );
+        $this->engineResolverMock = $this->createPartialMock(
+            \Magento\Search\Model\EngineResolver::class,
+            ['getCurrentSearchEngine']
+        );
+        $this->model = new CustomerGroup(
+            $this->indexerRegistryMock,
+            $this->customerOptionsMock,
+            $this->engineResolverMock
+        );
+    }
+
+    /**
+     * @param string $searchEngine
+     * @param bool $isObjectNew
+     * @param bool $isTaxClassIdChanged
+     * @param int $invalidateCounter
+     * @return void
+     * @dataProvider aroundSaveDataProvider
+     */
+    public function testAroundSave($searchEngine, $isObjectNew, $isTaxClassIdChanged, $invalidateCounter)
+    {
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->will($this->returnValue($searchEngine));
+
+        $groupMock = $this->createPartialMock(
+            \Magento\Customer\Model\Group::class,
+            ['dataHasChangedFor', 'isObjectNew', '__wakeup']
+        );
+        $groupMock->expects($this->any())->method('isObjectNew')->will($this->returnValue($isObjectNew));
+        $groupMock->expects($this->any())
+            ->method('dataHasChangedFor')
+            ->with('tax_class_id')
+            ->will($this->returnValue($isTaxClassIdChanged));
+
+        $closureMock = function (\Magento\Customer\Model\Group $object) use ($groupMock) {
+            $this->assertEquals($object, $groupMock);
+            return $this->subjectMock;
+        };
+
+        $this->indexerMock->expects($this->exactly($invalidateCounter))->method('invalidate');
+        $this->indexerRegistryMock->expects($this->exactly($invalidateCounter))
+            ->method('get')
+            ->with(\Magento\CatalogSearch\Model\Indexer\Fulltext::INDEXER_ID)
+            ->will($this->returnValue($this->indexerMock));
+
+        $this->assertEquals(
+            $this->subjectMock,
+            $this->model->aroundSave($this->subjectMock, $closureMock, $groupMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function aroundSaveDataProvider()
+    {
+        return [
+            ['mysql', false, false, 0],
+            ['mysql', false, true, 0],
+            ['mysql', true, false, 0],
+            ['mysql', true, true, 0],
+            ['custom', false, false, 0],
+            ['custom', false, true, 1],
+            ['custom', true, false, 1],
+            ['custom', true, true, 1],
+        ];
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php
new file mode 100644
index 0000000000000..1f37e40842f54
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdvancedSearch\Test\Unit\Model\ResourceModel;
+
+use Magento\AdvancedSearch\Model\ResourceModel\Index;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Index
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceContextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+        $this->resourceContextMock = $this->createMock(Context::class);
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->resourceContextMock->expects($this->any())
+            ->method('getResources')
+            ->willReturn($this->resourceConnectionMock);
+        $this->adapterMock = $this->createMock(AdapterInterface::class);
+        $this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($this->adapterMock);
+        $this->metadataPoolMock = $this->createMock(MetadataPool::class);
+
+        $indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class
+        );
+        $traversableMock = $this->createMock(\Traversable::class);
+        $dimensionsMock = $this->createMock(\Magento\Framework\Indexer\MultiDimensionProvider::class);
+        $dimensionsMock->method('getIterator')->willReturn($traversableMock);
+        $dimensionFactoryMock = $this->createMock(
+            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+        );
+        $dimensionFactoryMock->method('create')->willReturn($dimensionsMock);
+
+        $this->model = new Index(
+            $this->resourceContextMock,
+            $this->storeManagerMock,
+            $this->metadataPoolMock,
+            'connectionName',
+            $indexScopeResolverMock,
+            $dimensionFactoryMock
+        );
+    }
+
+    public function testGetPriceIndexDataUsesFrontendPriceIndexerTable()
+    {
+        $storeId = 1;
+        $storeMock = $this->createMock(StoreInterface::class);
+        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
+        $storeMock->method('getWebsiteId')->willReturn(1);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->with($storeId)->willReturn($storeMock);
+
+        $selectMock = $this->createMock(Select::class);
+        $selectMock->expects($this->any())->method('from')->willReturnSelf();
+        $selectMock->expects($this->any())->method('where')->willReturnSelf();
+        $selectMock->expects($this->any())->method('union')->willReturnSelf();
+        $this->adapterMock->expects($this->once())->method('select')->willReturn($selectMock);
+        $this->adapterMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn([]);
+
+        $this->assertEmpty($this->model->getPriceIndexData([1], $storeId));
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Model/SuggestedQueriesTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/SuggestedQueriesTest.php
new file mode 100644
index 0000000000000..d349ed3e3ce93
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Model/SuggestedQueriesTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Test\Unit\Model;
+
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\ObjectManagerInterface;
+
+class SuggestedQueriesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AdvancedSearch\Model\SuggestedQueries;
+     */
+    protected $model;
+
+    /**
+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $engineResolverMock;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->engineResolverMock = $this->getMockBuilder(\Magento\Search\Model\EngineResolver::class)
+            ->setMethods(['getCurrentSearchEngine'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->engineResolverMock->expects($this->any())
+            ->method('getCurrentSearchEngine')
+            ->willReturn('my_engine');
+
+        /**
+         * @var \Magento\AdvancedSearch\Model\SuggestedQueriesInterface|
+         *     \PHPUnit_Framework_MockObject_MockObject
+         */
+        $suggestedQueriesMock = $this->createMock(\Magento\AdvancedSearch\Model\SuggestedQueriesInterface::class);
+        $suggestedQueriesMock->expects($this->any())
+            ->method('isResultsCountEnabled')
+            ->willReturn(true);
+        $suggestedQueriesMock->expects($this->any())
+            ->method('getItems')
+            ->willReturn([]);
+
+        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerMock->expects($this->any())
+            ->method('create')
+            ->with('search_engine')
+            ->willReturn($suggestedQueriesMock);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\AdvancedSearch\Model\SuggestedQueries::class,
+            [
+                'engineResolver' => $this->engineResolverMock,
+                'objectManager' => $this->objectManagerMock,
+                'data' => ['my_engine' => 'search_engine']
+            ]
+        );
+    }
+
+    /**
+     * Test isResultsCountEnabled method.
+     *
+     * @return void
+     */
+    public function testIsResultsCountEnabled()
+    {
+        $result = $this->model->isResultsCountEnabled();
+        $this->assertTrue($result);
+    }
+
+    /**
+     * Test isResultsCountEnabled() method failure.
+     * @expectedException \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function testIsResultsCountEnabledException()
+    {
+        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn(null);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        /* @var $model \Magento\AdvancedSearch\Model\SuggestedQueries */
+        $model = $objectManagerHelper->getObject(
+            \Magento\AdvancedSearch\Model\SuggestedQueries::class,
+            [
+                'engineResolver' => $this->engineResolverMock,
+                'objectManager' => $objectManagerMock,
+                'data' => ['my_engine' => 'search_engine']
+            ]
+        );
+        $model->isResultsCountEnabled();
+    }
+
+    /**
+     * Test testGetItems() method.
+     *
+     * @return void
+     */
+    public function testGetItems()
+    {
+        /** @var $queryInterfaceMock \Magento\Search\Model\QueryInterface */
+        $queryInterfaceMock = $this->createMock(\Magento\Search\Model\QueryInterface::class);
+        $result = $this->model->getItems($queryInterfaceMock);
+        $this->assertEquals([], $result);
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
new file mode 100644
index 0000000000000..c6a5af07e60a7
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "magento/module-advanced-search",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\AdvancedSearch\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/etc/adminhtml/events.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/events.xml
new file mode 100644
index 0000000000000..b4d0f63a2bab4
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/adminhtml/events.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="catalogsearch_query_save_after">
+        <observer name="magento_advancedsearch_recommendations"
+                  instance="Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver"
+                 />
+    </event>
+</config>
diff --git a/app/code/Magento/AdvancedSearch/etc/adminhtml/routes.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..286d1537d40cc
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="catalog">
+            <module name="Magento_AdvancedSearch" before="Magento_Catalog" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..fa7774f5cec1d
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="catalog">
+            <group id="search">
+                <field id="search_recommendations_enabled"
+                       translate="label comment"
+                       type="select"
+                       sortOrder="80"
+                       showInDefault="1"
+                       showInWebsite="1"
+                       showInStore="1">
+                    <label>Enable Search Recommendations</label>
+                    <comment>When you enable this option your site may slow down.</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="search_recommendations_count"
+                       translate="label"
+                       type="text"
+                       sortOrder="81"
+                       showInDefault="1"
+                       showInWebsite="1"
+                       showInStore="1">
+                    <label>Search Recommendations Count</label>
+                    <validate>validate-digits</validate>
+                    <depends>
+                        <field id="search_recommendations_enabled">1</field>
+                    </depends>
+                </field>
+                <field id="search_recommendations_count_results_enabled"
+                       translate="label"
+                       type="select"
+                       sortOrder="82"
+                       showInDefault="1"
+                       showInWebsite="1"
+                       showInStore="1">
+                    <label>Show Results Count for Each Recommendation</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="search_recommendations_enabled">1</field>
+                    </depends>
+                </field>
+                <!--<group id="suggestions">-->
+                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Enable Search Suggestions</label>
+                        <comment>When you enable this option your site may slow down.</comment>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="71" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Search Suggestions Count</label>
+                        <depends>
+                            <field id="search_suggestion_enabled">1</field>
+                        </depends>
+                    </field>
+                    <field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="72" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Show Results Count for Each Suggestion</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <comment>When you enable this option your site may slow down.</comment>
+                        <depends>
+                            <field id="search_suggestion_enabled">1</field>
+                        </depends>
+                    </field>
+                <!--</group>-->
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/AdvancedSearch/etc/config.xml b/app/code/Magento/AdvancedSearch/etc/config.xml
new file mode 100644
index 0000000000000..a4affbccdbc4e
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <catalog>
+            <search>
+                <search_suggestion_enabled>1</search_suggestion_enabled>
+                <search_suggestion_count>2</search_suggestion_count>
+                <search_suggestion_count_results_enabled>0</search_suggestion_count_results_enabled>
+                <search_recommendations_enabled>1</search_recommendations_enabled>
+                <search_recommendations_count>5</search_recommendations_count>
+                <search_recommendations_count_results_enabled>0</search_recommendations_count_results_enabled>
+            </search>
+        </catalog>
+    </default>
+</config>
diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema.xml b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
new file mode 100644
index 0000000000000..2dd8c68e2d5fd
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalogsearch_recommendations" resource="default" engine="innodb"
+           comment="Advanced Search Recommendations">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Query Id"/>
+        <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Relation Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
+                    table="catalogsearch_recommendations" column="query_id" referenceTable="search_query"
+                    referenceColumn="query_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
+                    table="catalogsearch_recommendations" column="relation_id" referenceTable="search_query"
+                    referenceColumn="query_id" onDelete="CASCADE"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json b/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8addf187744fd
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json
@@ -0,0 +1,14 @@
+{
+    "catalogsearch_recommendations": {
+        "column": {
+            "id": true,
+            "query_id": true,
+            "relation_id": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
+            "CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/AdvancedSearch/etc/di.xml b/app/code/Magento/AdvancedSearch/etc/di.xml
new file mode 100644
index 0000000000000..21e19fd58825b
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/di.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?><!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\AdvancedSearch\Model\Client\ClientFactoryInterface" type="Magento\AdvancedSearch\Model\Client\ClientFactory" />
+    <type name="Magento\AdvancedSearch\Block\Recommendations">
+        <arguments>
+            <argument name="searchDataProvider" xsi:type="object">Magento\AdvancedSearch\Model\Recommendations\DataProvider</argument>
+            <argument name="title" xsi:type="string" translatable="true">Related search terms</argument>
+        </arguments>
+    </type>
+    <type name="Magento\AdvancedSearch\Block\Suggestions">
+        <arguments>
+            <argument name="searchDataProvider" xsi:type="object">Magento\AdvancedSearch\Model\SuggestedQueries</argument>
+            <argument name="title" xsi:type="string" translatable="true">Did you mean</argument>
+        </arguments>
+    </type>
+    <type name="Magento\AdvancedSearch\Model\Client\ClientResolver">
+        <arguments>
+            <argument name="path" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
+            <argument name="scopeType" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
+        </arguments>
+    </type>
+    <type name="Magento\AdvancedSearch\Model\SuggestedQueries">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="mysql" xsi:type="string">Magento\AdvancedSearch\Model\DataProvider\Suggestions</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\AdvancedSearch\Model\ResourceModel\Index">
+        <arguments>
+            <argument name="tableResolver" xsi:type="object">
+                Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider" />
+</config>
diff --git a/app/code/Magento/AdvancedSearch/etc/module.xml b/app/code/Magento/AdvancedSearch/etc/module.xml
new file mode 100644
index 0000000000000..cc0c97f43d542
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_AdvancedSearch" >
+        <sequence>
+            <module name="Magento_Search"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/AdvancedSearch/i18n/en_US.csv b/app/code/Magento/AdvancedSearch/i18n/en_US.csv
new file mode 100644
index 0000000000000..f8210d58888ce
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/i18n/en_US.csv
@@ -0,0 +1,26 @@
+"Related Search Terms","Related Search Terms"
+"Add New Search Term","Add New Search Term"
+button_label,button_label
+"Missing search engine parameter.","Missing search engine parameter."
+"Successful! Test again?","Successful! Test again?"
+"Connection failed! Test again?","Connection failed! Test again?"
+"Enable Search Recommendations","Enable Search Recommendations"
+"When you enable this option your site may slow down.","When you enable this option your site may slow down."
+"Search Recommendations Count","Search Recommendations Count"
+"Show Results Count for Each Recommendation","Show Results Count for Each Recommendation"
+"Enable Search Suggestions","Enable Search Suggestions"
+"Search Suggestions Count","Search Suggestions Count"
+"Show Results Count for Each Suggestion","Show Results Count for Each Suggestion"
+"Related search terms","Related search terms"
+"Did you mean","Did you mean"
+ID,ID
+"Search Query","Search Query"
+Store,Store
+Results,Results
+Uses,Uses
+"Redirect URL","Redirect URL"
+"Suggested Term","Suggested Term"
+Yes,Yes
+No,No
+Action,Action
+Edit,Edit
diff --git a/app/code/Magento/AdvancedSearch/registration.php b/app/code/Magento/AdvancedSearch/registration.php
new file mode 100644
index 0000000000000..c82ffa8e7e4d6
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdvancedSearch', __DIR__);
diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml
new file mode 100644
index 0000000000000..b6ef596281e51
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml
@@ -0,0 +1,125 @@
+<?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="related_grid_edit">
+            <block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Grid" name="search.edit.grid" as="grid">
+                <arguments>
+                    <argument name="id" xsi:type="string">catalog_search_grid</argument>
+                    <argument name="dataSource" xsi:type="object">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
+                    <argument name="default_sort" xsi:type="string">name</argument>
+                    <argument name="default_dir" xsi:type="string">ASC</argument>
+                    <argument name="save_parameters_in_session" xsi:type="string">1</argument>
+                    <argument name="use_ajax" xsi:type="string">1</argument>
+                    <argument name="grid_url" xsi:type="url" path="*/*/relatedGrid">
+                        <param name="_current">1</param>
+                    </argument>
+                </arguments>
+                <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="search.edit.grid.columnSet" as="grid.columnSet">
+                    <arguments>
+                        <argument name="rowUrl" xsi:type="array">
+                            <item name="path" xsi:type="string">*/*/edit</item>
+                            <item name="extraParamsTemplate" xsi:type="array">
+                                <item name="id" xsi:type="string">getId</item>
+                            </item>
+                        </argument>
+                    </arguments>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet." as="query_id_selected">
+                        <arguments>
+                            <argument name="index" xsi:type="string">query_id</argument>
+                            <argument name="id" xsi:type="string">query_id_selected</argument>
+                            <argument name="type" xsi:type="string">checkbox</argument>
+                            <argument name="name" xsi:type="string">query_id_selected</argument>
+                            <argument name="values" xsi:type="options" model="Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options"/>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.query_id" as="query_id">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">ID</argument>
+                            <argument name="index" xsi:type="string">query_id</argument>
+                            <argument name="column_css_class" xsi:type="string">col-id</argument>
+                            <argument name="header_css_class" xsi:type="string">col-id</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.search_query" as="search_query">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Search Query</argument>
+                            <argument name="index" xsi:type="string">query_text</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column\Multistore" name="search.edit.grid.columnSet.store_id" as="store_id">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Store</argument>
+                            <argument name="index" xsi:type="string">store_id</argument>
+                            <argument name="type" xsi:type="string">store</argument>
+                            <argument name="store_view" xsi:type="string">1</argument>
+                            <argument name="sortable" xsi:type="string">0</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.num_results" as="num_results">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Results</argument>
+                            <argument name="index" xsi:type="string">num_results</argument>
+                            <argument name="type" xsi:type="string">number</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.popularity" as="popularity">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Uses</argument>
+                            <argument name="index" xsi:type="string">popularity</argument>
+                            <argument name="type" xsi:type="string">number</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.redirect" as="redirect">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Redirect URL</argument>
+                            <argument name="index" xsi:type="string">redirect</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.display_in_terms" as="display_in_terms">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Suggested Term</argument>
+                            <argument name="sortable" xsi:type="string">1</argument>
+                            <argument name="index" xsi:type="string">display_in_terms</argument>
+                            <argument name="type" xsi:type="string">options</argument>
+                            <argument name="options" xsi:type="array">
+                                <item name="yes" xsi:type="array">
+                                    <item name="value" xsi:type="string">1</item>
+                                    <item name="label" xsi:type="string" translate="true">Yes</item>
+                                </item>
+                                <item name="no" xsi:type="array">
+                                    <item name="value" xsi:type="string">0</item>
+                                    <item name="label" xsi:type="string" translate="true">No</item>
+                                </item>
+                            </argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="search.edit.grid.columnSet.action" as="action">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Action</argument>
+                            <argument name="index" xsi:type="string">catalog</argument>
+                            <argument name="type" xsi:type="string">action</argument>
+                            <argument name="getter" xsi:type="string">getId</argument>
+                            <argument name="filter" xsi:type="string">0</argument>
+                            <argument name="sortable" xsi:type="string">0</argument>
+                            <argument name="actions" xsi:type="array">
+                                <item name="edit_action" xsi:type="array">
+                                    <item name="caption" xsi:type="string" translate="true">Edit</item>
+                                    <item name="url" xsi:type="array">
+                                        <item name="base" xsi:type="string">*/*/edit</item>
+                                    </item>
+                                    <item name="field" xsi:type="string">id</item>
+                                </item>
+                            </argument>
+                        </arguments>
+                    </block>
+                </block>
+            </block>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_edit.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_edit.xml
new file mode 100644
index 0000000000000..5e6774b1b5c6b
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_edit.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="catalog_search_block"/>
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Edit" name="related_grid_edit"/>
+            <block class="Magento\Backend\Block\Widget\Grid\Serializer" name="related_grid_serializer">
+                <arguments>
+                    <argument name="grid_block" xsi:type="string">search.edit.grid</argument>
+                    <argument name="callback" xsi:type="string">getSelectedQueries</argument>
+                    <argument name="input_element_name" xsi:type="string">selected_queries_grid</argument>
+                    <argument name="reload_param_name" xsi:type="string">selected_queries_grid</argument>
+                </arguments>
+                <referenceBlock name="related_grid_serializer">
+                    <action method="setFormId">
+                        <argument name="value" xsi:type="string">edit_form</argument>
+                    </action>
+                </referenceBlock>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_relatedgrid.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_relatedgrid.xml
new file mode 100644
index 0000000000000..4187ba9127369
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_relatedgrid.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
+    <update handle="catalog_search_block"/>
+    <container name="root">
+        <block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Edit" name="related_grid_edit"/>
+    </container>
+</layout>
diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/requirejs-config.js b/app/code/Magento/AdvancedSearch/view/adminhtml/requirejs-config.js
new file mode 100644
index 0000000000000..80369c99b8995
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/requirejs-config.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            testConnection: 'Magento_AdvancedSearch/js/testconnection'
+        }
+    }
+};
diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml b/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml
new file mode 100644
index 0000000000000..ae202cbfaf442
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+?>
+<button class="scalable" type="button" id="<?= $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
+    "url": "<?= /* @escapeNotVerified */ $block->getAjaxUrl() ?>",
+    "elementId": "<?= $block->getHtmlId() ?>",
+    "successText": "<?= /* @escapeNotVerified */ __('Successful! Test again?') ?>",
+    "failedText": "<?= /* @escapeNotVerified */ __('Connection failed! Test again?') ?>",
+    "fieldMapping": "<?= /* @escapeNotVerified */ $block->getFieldMapping() ?>"}, "validation": {}}'>
+    <span><span><span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
+</button>
diff --git a/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js b/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js
new file mode 100644
index 0000000000000..e28f1b4d07d94
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js
@@ -0,0 +1,73 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'jquery',
+    'Magento_Ui/js/modal/alert',
+    'jquery/ui'
+], function ($, alert) {
+    'use strict';
+
+    $.widget('mage.testConnection', {
+        options: {
+            url: '',
+            elementId: '',
+            successText: '',
+            failedText: '',
+            fieldMapping: ''
+        },
+
+        /**
+         * Bind handlers to events
+         */
+        _create: function () {
+            this._on({
+                'click': $.proxy(this._connect, this)
+            });
+        },
+
+        /**
+         * Method triggers an AJAX request to check search engine connection
+         * @private
+         */
+        _connect: function () {
+            var result = this.options.failedText,
+                element =  $('#' + this.options.elementId),
+                self = this,
+                params = {},
+                msg = '';
+
+            element.removeClass('success').addClass('fail');
+            $.each($.parseJSON(this.options.fieldMapping), function (key, el) {
+                params[key] = $('#' + el).val();
+            });
+            $.ajax({
+                url: this.options.url,
+                showLoader: true,
+                data: params
+            }).done(function (response) {
+                if (response.success) {
+                    element.removeClass('fail').addClass('success');
+                    result = self.options.successText;
+                } else {
+                    msg = response.errorMessage;
+
+                    if (msg) {
+                        alert({
+                            content: msg
+                        });
+                    }
+                }
+            }).always(function () {
+                $('#' + self.options.elementId + '_result').text(result);
+            });
+        }
+    });
+
+    return $.mage.testConnection;
+});
diff --git a/app/code/Magento/AdvancedSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/AdvancedSearch/view/frontend/layout/catalogsearch_result_index.xml
new file mode 100644
index 0000000000000..bf27fe73711e3
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/frontend/layout/catalogsearch_result_index.xml
@@ -0,0 +1,20 @@
+<?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="search_result_list">
+            <container name="additional" label="Additional Info" after="product_list_toolbar">
+                <block class="Magento\AdvancedSearch\Block\Suggestions"
+                       name="search_suggestions"/>
+                <block class="Magento\AdvancedSearch\Block\Recommendations"
+                       name="search_recommendations"/>
+            </container>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml b/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml
new file mode 100644
index 0000000000000..6e660555053a1
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/**
+ * @var \Magento\AdvancedSearch\Block\SearchData $block
+ */
+?>
+<?php
+/** @var \Magento\Search\Model\QueryResult[] $data */
+$data = $block->getItems();
+if (count($data)):?>
+    <dl class="block">
+        <dt class="title"><?= /* @escapeNotVerified */ __($block->getTitle()) ?></dt>
+        <?php foreach ($data as $additionalInfo) : ?>
+            <dd class="item">
+                <a href="<?= /* @escapeNotVerified */ $block->getLink($additionalInfo->getQueryText()) ?>"
+                    ><?= $block->escapeHtml($additionalInfo->getQueryText()) ?></a>
+                <?php if ($block->isShowResultsCount()): ?>
+                    <span class="count"><?= /* @escapeNotVerified */ $additionalInfo->getResultsCount() ?></span>
+                <?php endif; ?>
+            </dd>
+        <?php endforeach; ?>
+    </dl>
+<?php endif; ?>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE.txt b/app/code/Magento/Amqp/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE.txt
rename to app/code/Magento/Amqp/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE_AFL.txt b/app/code/Magento/Amqp/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE_AFL.txt
rename to app/code/Magento/Amqp/LICENSE_AFL.txt
diff --git a/app/code/Magento/Amqp/Model/Config.php b/app/code/Magento/Amqp/Model/Config.php
new file mode 100644
index 0000000000000..9ec9780317a9f
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Config.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Config extends \Magento\Framework\Amqp\Config
+{
+
+}
diff --git a/app/code/Magento/Amqp/Model/Exchange.php b/app/code/Magento/Amqp/Model/Exchange.php
new file mode 100644
index 0000000000000..d7ad09e7260c8
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Exchange.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Exchange extends \Magento\Framework\Amqp\Exchange
+{
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param QueueConfig $queueConfig
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param int $rpcConnectionTimeout
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Config $amqpConfig,
+        QueueConfig $queueConfig,
+        CommunicationConfigInterface $communicationConfig,
+        $rpcConnectionTimeout = self::RPC_CONNECTION_TIMEOUT
+    ) {
+        parent::__construct(
+            $amqpConfig,
+            $this->getPublisherConfig(),
+            $this->getResponseQueueNameBuilder(),
+            $communicationConfig,
+            $rpcConnectionTimeout
+        );
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        return \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+    }
+
+    /**
+     * Get response queue name builder.
+     *
+     * @return ResponseQueueNameBuilder
+     *
+     * @deprecated 100.2.0
+     */
+    private function getResponseQueueNameBuilder()
+    {
+        return \Magento\Framework\App\ObjectManager::getInstance()->get(ResponseQueueNameBuilder::class);
+    }
+}
diff --git a/app/code/Magento/Amqp/Model/Queue.php b/app/code/Magento/Amqp/Model/Queue.php
new file mode 100644
index 0000000000000..ffef398352bc7
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Queue.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Queue extends \Magento\Framework\Amqp\Queue
+{
+
+}
diff --git a/app/code/Magento/Amqp/Model/Topology.php b/app/code/Magento/Amqp/Model/Topology.php
new file mode 100644
index 0000000000000..fa22cb1633a7a
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Topology.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface as TopologyConfig;
+use Magento\Framework\Amqp\ConfigPool;
+use Magento\Framework\Amqp\ConnectionTypeResolver;
+use Magento\Framework\Amqp\TopologyInstaller;
+
+/**
+ * Class Topology creates topology for Amqp messaging
+ *
+ * @deprecated 100.2.0
+ */
+class Topology extends TopologyInstaller
+{
+    /**
+     * Type of exchange
+     *
+     * @deprecated
+     */
+    const TOPIC_EXCHANGE = 'topic';
+
+    /**
+     * Amqp connection
+     */
+    const AMQP_CONNECTION = 'amqp';
+
+    /**
+     * Durability for exchange and queue
+     *
+     * @deprecated
+     */
+    const IS_DURABLE = true;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param Config $amqpConfig
+     * @param QueueConfig $queueConfig
+     * @param CommunicationConfig $communicationConfig
+     * @param \Psr\Log\LoggerInterface $logger
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Config $amqpConfig,
+        QueueConfig $queueConfig,
+        CommunicationConfig $communicationConfig,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        parent::__construct(
+            \Magento\Framework\App\ObjectManager::getInstance()->get(TopologyConfig::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ExchangeInstaller::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigPool::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(QueueInstaller::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ConnectionTypeResolver::class),
+            $logger
+        );
+    }
+}
diff --git a/app/code/Magento/Amqp/README.md b/app/code/Magento/Amqp/README.md
new file mode 100644
index 0000000000000..a21624031d619
--- /dev/null
+++ b/app/code/Magento/Amqp/README.md
@@ -0,0 +1,3 @@
+# Amqp
+
+**Amqp** provides functionality to publish/consume messages with Amqp.
diff --git a/app/code/Magento/Amqp/Setup/ConfigOptionsList.php b/app/code/Magento/Amqp/Setup/ConfigOptionsList.php
new file mode 100644
index 0000000000000..7b857dc2bcc2d
--- /dev/null
+++ b/app/code/Magento/Amqp/Setup/ConfigOptionsList.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Setup;
+
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Deployment configuration options needed for Setup application
+ */
+class ConfigOptionsList implements ConfigOptionsListInterface
+{
+    /**
+     * Input key for the options
+     */
+    const INPUT_KEY_QUEUE_AMQP_HOST = 'amqp-host';
+    const INPUT_KEY_QUEUE_AMQP_PORT = 'amqp-port';
+    const INPUT_KEY_QUEUE_AMQP_USER = 'amqp-user';
+    const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
+    const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
+    const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
+    const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
+
+    /**
+     * Path to the values in the deployment config
+     */
+    const CONFIG_PATH_QUEUE_AMQP_HOST = 'queue/amqp/host';
+    const CONFIG_PATH_QUEUE_AMQP_PORT = 'queue/amqp/port';
+    const CONFIG_PATH_QUEUE_AMQP_USER = 'queue/amqp/user';
+    const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
+    const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
+    const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
+    const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options';
+
+    /**
+     * Default values
+     */
+    const DEFAULT_AMQP_HOST = '';
+    const DEFAULT_AMQP_PORT = '5672';
+    const DEFAULT_AMQP_USER = '';
+    const DEFAULT_AMQP_PASSWORD = '';
+    const DEFAULT_AMQP_VIRTUAL_HOST = '/';
+    const DEFAULT_AMQP_SSL = '';
+
+    /**
+     * @var ConnectionValidator
+     */
+    private $connectionValidator;
+
+    /**
+     * Constructor
+     *
+     * @param ConnectionValidator $connectionValidator
+     */
+    public function __construct(ConnectionValidator $connectionValidator)
+    {
+        $this->connectionValidator = $connectionValidator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOptions()
+    {
+        return [
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_HOST,
+                'Amqp server host',
+                self::DEFAULT_AMQP_HOST
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_PORT,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_PORT,
+                'Amqp server port',
+                self::DEFAULT_AMQP_PORT
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_USER,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_USER,
+                'Amqp server username',
+                self::DEFAULT_AMQP_USER
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_PASSWORD,
+                'Amqp server password',
+                self::DEFAULT_AMQP_PASSWORD
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST,
+                'Amqp virtualhost',
+                self::DEFAULT_AMQP_VIRTUAL_HOST
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_SSL,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_SSL,
+                'Amqp SSL',
+                self::DEFAULT_AMQP_SSL
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS,
+                TextConfigOption::FRONTEND_WIZARD_TEXTAREA,
+                self::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS,
+                'Amqp SSL Options (JSON)',
+                self::DEFAULT_AMQP_SSL
+            ),
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function createConfig(array $data, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+
+        if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_HOST)) {
+            $configData->set(self::CONFIG_PATH_QUEUE_AMQP_HOST, $data[self::INPUT_KEY_QUEUE_AMQP_HOST]);
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_PORT)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_PORT, $data[self::INPUT_KEY_QUEUE_AMQP_PORT]);
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_USER)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_USER, $data[self::INPUT_KEY_QUEUE_AMQP_USER]);
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_PASSWORD)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_PASSWORD, $data[self::INPUT_KEY_QUEUE_AMQP_PASSWORD]);
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST)) {
+                $configData->set(
+                    self::CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST,
+                    $data[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST]
+                );
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_SSL)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_SSL, $data[self::INPUT_KEY_QUEUE_AMQP_SSL]);
+            }
+            if (!$this->isDataEmpty(
+                $data,
+                self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS
+            )) {
+                $options = json_decode(
+                    $data[self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS],
+                    true
+                );
+                if ($options !== null) {
+                    $configData->set(
+                        self::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS,
+                        $options
+                    );
+                }
+            }
+        }
+
+        return [$configData];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $errors = [];
+
+        if (isset($options[self::INPUT_KEY_QUEUE_AMQP_HOST])
+            && $options[self::INPUT_KEY_QUEUE_AMQP_HOST] !== '') {
+            if (!$this->isDataEmpty(
+                $options,
+                self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS
+            )) {
+                $sslOptions = json_decode(
+                    $options[self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS],
+                    true
+                );
+            } else {
+                $sslOptions = null;
+            }
+            $isSslEnabled = !empty($options[self::INPUT_KEY_QUEUE_AMQP_SSL])
+                && $options[self::INPUT_KEY_QUEUE_AMQP_SSL] !== 'false';
+
+            $result = $this->connectionValidator->isConnectionValid(
+                $options[self::INPUT_KEY_QUEUE_AMQP_HOST],
+                $options[self::INPUT_KEY_QUEUE_AMQP_PORT],
+                $options[self::INPUT_KEY_QUEUE_AMQP_USER],
+                $options[self::INPUT_KEY_QUEUE_AMQP_PASSWORD],
+                $options[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST],
+                $isSslEnabled,
+                $sslOptions
+            );
+
+            if (!$result) {
+                $errors[] = "Could not connect to the Amqp Server.";
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Check if data ($data) with key ($key) is empty
+     *
+     * @param array $data
+     * @param string $key
+     * @return bool
+     */
+    private function isDataEmpty(array $data, $key)
+    {
+        if (isset($data[$key]) && $data[$key] !== '') {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Amqp/Setup/ConnectionValidator.php b/app/code/Magento/Amqp/Setup/ConnectionValidator.php
new file mode 100644
index 0000000000000..55a11286c7c43
--- /dev/null
+++ b/app/code/Magento/Amqp/Setup/ConnectionValidator.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Setup;
+
+use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
+use Magento\Framework\Amqp\Connection\FactoryOptions;
+
+/**
+ * Class ConnectionValidator - validates Amqp related settings
+ */
+class ConnectionValidator
+{
+    /**
+     * @var ConnectionFactory
+     */
+    private $connectionFactory;
+
+    /**
+     * @param ConnectionFactory $connectionFactory
+     */
+    public function __construct(ConnectionFactory $connectionFactory)
+    {
+        $this->connectionFactory = $connectionFactory;
+    }
+
+    /**
+     * Checks Amqp Connection
+     *
+     * @param string $host
+     * @param string $port
+     * @param string $user
+     * @param string $password
+     * @param string $virtualHost
+     * @param bool $ssl
+     * @param string[]|null $sslOptions
+     * @return bool true if the connection succeeded, false otherwise
+     */
+    public function isConnectionValid(
+        $host,
+        $port,
+        $user,
+        $password = '',
+        $virtualHost = '',
+        bool $ssl = false,
+        array $sslOptions = null
+    ) {
+        try {
+            $options = new FactoryOptions();
+            $options->setHost($host);
+            $options->setPort($port);
+            $options->setUsername($user);
+            $options->setPassword($password);
+            $options->setVirtualHost($virtualHost);
+            $options->setSslEnabled($ssl);
+
+            if ($sslOptions) {
+                $options->setSslOptions($sslOptions);
+            }
+
+            $connection = $this->connectionFactory->create($options);
+
+            $connection->close();
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Amqp/Setup/Recurring.php b/app/code/Magento/Amqp/Setup/Recurring.php
new file mode 100644
index 0000000000000..cc1951d84e3d0
--- /dev/null
+++ b/app/code/Magento/Amqp/Setup/Recurring.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Setup;
+
+use Magento\Framework\Amqp\TopologyInstaller;
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Class Recurring
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var TopologyInstaller
+     */
+    protected $topologyInstaller;
+
+    /**
+     * @param TopologyInstaller $topologyInstaller
+     */
+    public function __construct(TopologyInstaller $topologyInstaller)
+    {
+        $this->topologyInstaller = $topologyInstaller;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $this->topologyInstaller->install();
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE.txt b/app/code/Magento/Amqp/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE.txt
rename to app/code/Magento/Amqp/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE_AFL.txt b/app/code/Magento/Amqp/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE_AFL.txt
rename to app/code/Magento/Amqp/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Amqp/Test/Mftf/README.md b/app/code/Magento/Amqp/Test/Mftf/README.md
new file mode 100644
index 0000000000000..12d1bbc3a4890
--- /dev/null
+++ b/app/code/Magento/Amqp/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Amqp Functional Tests
+
+The Functional Test Module for **Magento Amqp** module.
diff --git a/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php
new file mode 100644
index 0000000000000..5b19ba055d059
--- /dev/null
+++ b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Amqp\Test\Unit\Setup;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Amqp\Setup\ConfigOptionsList;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use Magento\Framework\App\DeploymentConfig;
+
+class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ConfigOptionsList
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Amqp\Setup\ConnectionValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionValidatorMock;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var array
+     */
+    private $options;
+
+    protected function setUp()
+    {
+        $this->options = [
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => 'port',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => 'user',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}',
+        ];
+
+        $this->objectManager = new ObjectManager($this);
+        $this->connectionValidatorMock = $this->getMockBuilder(\Magento\Amqp\Setup\ConnectionValidator::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            \Magento\Amqp\Setup\ConfigOptionsList::class,
+            [
+                'connectionValidator' => $this->connectionValidatorMock,
+            ]
+        );
+    }
+
+    public function testGetOptions()
+    {
+        $expectedOptions = [
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_HOST,
+                'Amqp server host',
+                ConfigOptionsList::DEFAULT_AMQP_HOST
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_PORT,
+                'Amqp server port',
+                ConfigOptionsList::DEFAULT_AMQP_PORT
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_USER,
+                'Amqp server username',
+                ConfigOptionsList::DEFAULT_AMQP_USER
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_PASSWORD,
+                'Amqp server password',
+                ConfigOptionsList::DEFAULT_AMQP_PASSWORD
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST,
+                'Amqp virtualhost',
+                ConfigOptionsList::DEFAULT_AMQP_VIRTUAL_HOST
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL,
+                'Amqp SSL',
+                ConfigOptionsList::DEFAULT_AMQP_SSL
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS,
+                TextConfigOption::FRONTEND_WIZARD_TEXTAREA,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS,
+                'Amqp SSL Options (JSON)',
+                ConfigOptionsList::DEFAULT_AMQP_SSL
+            ),
+        ];
+        $this->assertEquals($expectedOptions, $this->model->getOptions());
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedConfigData
+     * @dataProvider getCreateConfigDataProvider
+     */
+    public function testCreateConfig($options, $expectedConfigData)
+    {
+        $result = $this->model->createConfig($options, $this->deploymentConfigMock);
+        $this->assertInternalType('array', $result);
+        $this->assertNotEmpty($result);
+        /** @var \Magento\Framework\Config\Data\ConfigData $configData */
+        $configData = $result[0];
+        $this->assertInstanceOf(\Magento\Framework\Config\Data\ConfigData::class, $configData);
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    public function testValidateInvalidConnection()
+    {
+        $expectedResult = ['Could not connect to the Amqp Server.'];
+        $this->connectionValidatorMock->expects($this->once())->method('isConnectionValid')->willReturn(false);
+        $this->assertEquals($expectedResult, $this->model->validate($this->options, $this->deploymentConfigMock));
+    }
+
+    public function testValidateValidConnection()
+    {
+        $expectedResult = [];
+        $this->connectionValidatorMock->expects($this->once())->method('isConnectionValid')->willReturn(true);
+        $this->assertEquals($expectedResult, $this->model->validate($this->options, $this->deploymentConfigMock));
+    }
+
+    public function testValidateNoOptions()
+    {
+        $expectedResult = [];
+        $options = [];
+        $this->connectionValidatorMock->expects($this->never())->method('isConnectionValid');
+        $this->assertEquals($expectedResult, $this->model->validate($options, $this->deploymentConfigMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function getCreateConfigDataProvider()
+    {
+        return [
+            [
+                [
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => 'port',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => 'user',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}',
+                ],
+                ['queue' =>
+                    ['amqp' =>
+                        [
+                            'host' => 'host',
+                            'port' => 'port',
+                            'user' => 'user',
+                            'password' => 'password',
+                            'virtualhost' => 'virtual host',
+                            'ssl' => 'ssl',
+                            'ssl_options' => ['ssl_option' => 'test'],
+                         ]
+                    ]
+                ],
+            ],
+            [
+                [
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => ConfigOptionsList::DEFAULT_AMQP_PORT,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => 'user',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}',
+                ],
+                ['queue' =>
+                    ['amqp' =>
+                        [
+                            'host' => 'host',
+                            'port' => ConfigOptionsList::DEFAULT_AMQP_PORT,
+                            'user' => 'user',
+                            'password' => 'password',
+                            'virtualhost' => 'virtual host',
+                            'ssl' => 'ssl',
+                            'ssl_options' => ['ssl_option' => 'test'],
+                         ]
+                    ]
+                ],
+            ],
+            [
+                [
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => ConfigOptionsList::DEFAULT_AMQP_HOST,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => ConfigOptionsList::DEFAULT_AMQP_PORT,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => ConfigOptionsList::DEFAULT_AMQP_USER,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => ConfigOptionsList::DEFAULT_AMQP_PASSWORD,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST =>
+                        ConfigOptionsList::DEFAULT_AMQP_VIRTUAL_HOST,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => ConfigOptionsList::DEFAULT_AMQP_SSL,
+                ],
+                [],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
new file mode 100644
index 0000000000000..b50e951b46f81
--- /dev/null
+++ b/app/code/Magento/Amqp/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-amqp",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "magento/framework-amqp": "*",
+        "magento/framework-message-queue": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\Amqp\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/Amqp/etc/di.xml b/app/code/Magento/Amqp/etc/di.xml
new file mode 100644
index 0000000000000..920bb72261ef9
--- /dev/null
+++ b/app/code/Magento/Amqp/etc/di.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader">
+        <plugin name="queueConfigPlugin" type="Magento\Framework\MessageQueue\Config\Consumer\ConfigReaderPlugin" />
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
+        <plugin name="queueConfigPlugin" type="Magento\Framework\MessageQueue\Config\Publisher\ConfigReaderPlugin" />
+    </type>
+    <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeReader">
+        <plugin name="queueConfigPlugin" type="Magento\Framework\MessageQueue\Config\Topology\ConfigReaderPlugin" />
+    </type>
+    <type name="Magento\Framework\MessageQueue\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Publisher</item>
+                </item>
+                <item name="sync" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Rpc\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Bulk\Publisher</item>
+                </item>
+                <item name="sync" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Bulk\Rpc\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ConnectionTypeResolver">
+        <arguments>
+            <argument name="resolvers" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\ConnectionTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\Bulk\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\QueueFactory">
+        <arguments>
+            <argument name="queueFactories" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\QueueFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\Amqp\Bulk\ExchangeFactory" type="Magento\Framework\Amqp\ExchangeFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\Framework\Amqp\Bulk\Exchange</argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/Amqp/etc/module.xml b/app/code/Magento/Amqp/etc/module.xml
new file mode 100644
index 0000000000000..1768a9b121c81
--- /dev/null
+++ b/app/code/Magento/Amqp/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_Amqp" />
+</config>
diff --git a/app/code/Magento/Amqp/registration.php b/app/code/Magento/Amqp/registration.php
new file mode 100644
index 0000000000000..17d8382c698e8
--- /dev/null
+++ b/app/code/Magento/Amqp/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Amqp', __DIR__);
diff --git a/app/code/Magento/Analytics/Api/Data/LinkInterface.php b/app/code/Magento/Analytics/Api/Data/LinkInterface.php
new file mode 100644
index 0000000000000..81d0c279a62c3
--- /dev/null
+++ b/app/code/Magento/Analytics/Api/Data/LinkInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Api\Data;
+
+/**
+ * Represents link with collected data and initialized vector for decryption.
+ */
+interface LinkInterface
+{
+    /**
+     * @return string
+     */
+    public function getUrl();
+
+    /**
+     * @return string
+     */
+    public function getInitializationVector();
+}
diff --git a/app/code/Magento/Analytics/Api/LinkProviderInterface.php b/app/code/Magento/Analytics/Api/LinkProviderInterface.php
new file mode 100644
index 0000000000000..6ee43a423337e
--- /dev/null
+++ b/app/code/Magento/Analytics/Api/LinkProviderInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Api;
+
+/**
+ * Provides link to file with collected report data.
+ */
+interface LinkProviderInterface
+{
+    /**
+     * @return \Magento\Analytics\Api\Data\LinkInterface
+     */
+    public function get();
+}
diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php
new file mode 100644
index 0000000000000..c66996d839c09
--- /dev/null
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+/**
+ * Provides field with additional information
+ */
+class AdditionalComment extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $html = '<div class="config-additional-comment-title">' . $element->getLabel() . '</div>';
+        $html .= '<div class="config-additional-comment-content">' . $element->getComment() . '</div>';
+        return $this->decorateRowHtml($element, $html);
+    }
+
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param string $html
+     * @return string
+     */
+    private function decorateRowHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element, $html)
+    {
+        return sprintf(
+            '<tr id="row_%s"><td colspan="3"><div class="config-additional-comment">%s</div></td></tr>',
+            $element->getHtmlId(),
+            $html
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
new file mode 100644
index 0000000000000..34f2b7d53d9be
--- /dev/null
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Provides label with default Time Zone
+ */
+class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param array $data
+     * @param \Magento\Framework\Locale\ResolverInterface|null $localeResolver
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        \Magento\Framework\Locale\ResolverInterface $localeResolver = null
+    ) {
+        $this->localeResolver = $localeResolver ?:
+            ObjectManager::getInstance()->get(\Magento\Framework\Locale\ResolverInterface::class);
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Add current time zone to comment, properly translated according to locale
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $timeZoneCode = $this->_localeDate->getConfigTimezone();
+        $locale = $this->localeResolver->getLocale();
+        $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)
+            ->getDisplayName(false, \IntlTimeZone::DISPLAY_LONG, $locale);
+        $element->setData(
+            'comment',
+            sprintf("%s (%s)", $getLongTimeZoneName, $timeZoneCode)
+        );
+        return parent::render($element);
+    }
+}
diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php
new file mode 100644
index 0000000000000..2b306003b0642
--- /dev/null
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Backend\Block\Template\Context;
+
+/**
+ * Provides labels for subscription status
+ * Status can be reviewed in System Configuration
+ */
+class SubscriptionStatusLabel extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @var SubscriptionStatusProvider
+     */
+    private $subscriptionStatusProvider;
+
+    /**
+     * @param Context $context
+     * @param SubscriptionStatusProvider $labelStatusProvider
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        SubscriptionStatusProvider $labelStatusProvider,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->subscriptionStatusProvider = $labelStatusProvider;
+    }
+
+    /**
+     * Add Subscription status to comment
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $element->setData(
+            'comment',
+            $this->prepareLabelValue()
+        );
+        return parent::render($element);
+    }
+
+    /**
+     * Prepare label for subscription status
+     *
+     * @return string
+     */
+    private function prepareLabelValue()
+    {
+        return __('Subscription status') . ': ' . $this->subscriptionStatusProvider->getStatus();
+    }
+}
diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/Vertical.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/Vertical.php
new file mode 100644
index 0000000000000..99606e10f99d9
--- /dev/null
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/Vertical.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+/**
+ * Provides vertical select with additional information and style customization
+ */
+class Vertical extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @inheritdoc
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $html = '<div class="config-vertical-title">' . $element->getHint() . '</div>';
+        $html .= '<div class="config-vertical-comment">' . $element->getComment() . '</div>';
+        return $this->decorateRowHtml($element, $html);
+    }
+
+    /**
+     * Decorates row HTML for custom element style
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param string $html
+     * @return string
+     */
+    private function decorateRowHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element, $html)
+    {
+        $rowHtml = sprintf('<tr><td colspan="4">%s</td></tr>', $html);
+        $rowHtml .= sprintf(
+            '<tr id="row_%s"><td class="label config-vertical-label">%s</td><td class="value">%s</td></tr>',
+            $element->getHtmlId(),
+            $element->getLabelHtml($element->getHtmlId(), "[WEBSITE]"),
+            $element->getElementHtml()
+        );
+        return $rowHtml;
+    }
+}
diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php b/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php
new file mode 100644
index 0000000000000..87666cb880e54
--- /dev/null
+++ b/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Controller\Adminhtml\BIEssentials;
+
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Provides link to BI Essentials signup
+ */
+class SignUp extends Action implements HttpGetActionInterface
+{
+    /**
+     * Path to config value with URL to BI Essentials sign-up page.
+     *
+     * @var string
+     */
+    private $urlBIEssentialsConfigPath = 'analytics/url/bi_essentials';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @inheritdoc
+     */
+    const ADMIN_RESOURCE = 'Magento_Analytics::bi_essentials';
+
+    /**
+     * @param Context $context
+     * @param ScopeConfigInterface $config
+     */
+    public function __construct(
+        Context $context,
+        ScopeConfigInterface $config
+    ) {
+        $this->config = $config;
+        parent::__construct($context);
+    }
+
+    /**
+     * Provides link to BI Essentials signup
+     *
+     * @return \Magento\Framework\Controller\AbstractResult
+     */
+    public function execute()
+    {
+        return $this->resultRedirectFactory->create()->setUrl(
+            $this->config->getValue($this->urlBIEssentialsConfigPath)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
new file mode 100644
index 0000000000000..9068654fa944f
--- /dev/null
+++ b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Controller\Adminhtml\Reports;
+
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
+use Magento\Analytics\Model\ReportUrlProvider;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Provide redirect to resource with reports.
+ */
+class Show extends Action implements HttpGetActionInterface
+{
+    /**
+     * @var ReportUrlProvider
+     */
+    private $reportUrlProvider;
+
+    /**
+     * @inheritdoc
+     */
+    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+
+    /**
+     * @param Context $context
+     * @param ReportUrlProvider $reportUrlProvider
+     */
+    public function __construct(
+        Context $context,
+        ReportUrlProvider $reportUrlProvider
+    ) {
+        $this->reportUrlProvider = $reportUrlProvider;
+        parent::__construct($context);
+    }
+
+    /**
+     * Redirect to resource with reports.
+     *
+     * @return Redirect $resultRedirect
+     */
+    public function execute()
+    {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        try {
+            $resultRedirect->setUrl($this->reportUrlProvider->getUrl());
+        } catch (SubscriptionUpdateException $e) {
+            $this->getMessageManager()->addNoticeMessage($e->getMessage());
+            $resultRedirect->setPath('adminhtml');
+        } catch (LocalizedException $e) {
+            $this->getMessageManager()->addExceptionMessage($e, $e->getMessage());
+            $resultRedirect->setPath('adminhtml');
+        } catch (\Exception $e) {
+            $this->getMessageManager()->addExceptionMessage(
+                $e,
+                __('Sorry, there has been an error processing your request. Please try again later.')
+            );
+            $resultRedirect->setPath('adminhtml');
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php
new file mode 100644
index 0000000000000..4466c2065ee86
--- /dev/null
+++ b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Controller\Adminhtml\Subscription;
+
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Retry subscription to Magento BI Advanced Reporting.
+ */
+class Retry extends Action
+{
+    /**
+     * Resource for managing subscription to Magento Analytics.
+     *
+     * @var SubscriptionHandler
+     */
+    private $subscriptionHandler;
+
+    /**
+     * @inheritdoc
+     */
+    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+
+    /**
+     * @param Context $context
+     * @param SubscriptionHandler $subscriptionHandler
+     */
+    public function __construct(
+        Context $context,
+        SubscriptionHandler $subscriptionHandler
+    ) {
+        $this->subscriptionHandler = $subscriptionHandler;
+        parent::__construct($context);
+    }
+
+    /**
+     * Retry process of subscription.
+     *
+     * @return Redirect
+     */
+    public function execute()
+    {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        try {
+            $resultRedirect->setPath('adminhtml');
+            $this->subscriptionHandler->processEnabled();
+        } catch (LocalizedException $e) {
+            $this->getMessageManager()->addExceptionMessage($e, $e->getMessage());
+        } catch (\Exception $e) {
+            $this->getMessageManager()->addExceptionMessage(
+                $e,
+                __('Sorry, there has been an error processing your request. Please try again later.')
+            );
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/app/code/Magento/Analytics/Cron/CollectData.php b/app/code/Magento/Analytics/Cron/CollectData.php
new file mode 100644
index 0000000000000..ff0b3e4f67638
--- /dev/null
+++ b/app/code/Magento/Analytics/Cron/CollectData.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Cron;
+
+use Magento\Analytics\Model\ExportDataHandlerInterface;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+
+/**
+ * Cron for data collection by a schedule for MBI.
+ */
+class CollectData
+{
+    /**
+     * Resource for the handling of a new data collection.
+     *
+     * @var ExportDataHandlerInterface
+     */
+    private $exportDataHandler;
+
+    /**
+     * Resource which provides a status of subscription.
+     *
+     * @var SubscriptionStatusProvider
+     */
+    private $subscriptionStatus;
+
+    /**
+     * @param ExportDataHandlerInterface $exportDataHandler
+     * @param SubscriptionStatusProvider $subscriptionStatus
+     */
+    public function __construct(
+        ExportDataHandlerInterface $exportDataHandler,
+        SubscriptionStatusProvider $subscriptionStatus
+    ) {
+        $this->exportDataHandler = $exportDataHandler;
+        $this->subscriptionStatus = $subscriptionStatus;
+    }
+
+    /**
+     * @return bool
+     */
+    public function execute()
+    {
+        if ($this->subscriptionStatus->getStatus() === SubscriptionStatusProvider::ENABLED) {
+            $this->exportDataHandler->prepareExportData();
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Cron/SignUp.php b/app/code/Magento/Analytics/Cron/SignUp.php
new file mode 100644
index 0000000000000..8f97b839ec8ee
--- /dev/null
+++ b/app/code/Magento/Analytics/Cron/SignUp.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Cron;
+
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Analytics\Model\Connector;
+use Magento\Framework\FlagManager;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+
+/**
+ * Cron class for the Advanced Reporting signup process
+ */
+class SignUp
+{
+    /**
+     * @var Connector
+     */
+    private $connector;
+
+    /**
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * Reinitable Config Model.
+     *
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
+    /**
+     * @param Connector $connector
+     * @param WriterInterface $configWriter
+     * @param FlagManager $flagManager
+     * @param ReinitableConfigInterface $reinitableConfig
+     */
+    public function __construct(
+        Connector $connector,
+        WriterInterface $configWriter,
+        FlagManager $flagManager,
+        ReinitableConfigInterface $reinitableConfig
+    ) {
+        $this->connector = $connector;
+        $this->configWriter = $configWriter;
+        $this->flagManager = $flagManager;
+        $this->reinitableConfig = $reinitableConfig;
+    }
+
+    /**
+     * Execute scheduled subscription operation
+     * In case of failure writes message to notifications inbox
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        $attemptsCount = $this->flagManager->getFlagData(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+
+        if (($attemptsCount === null) || ($attemptsCount <= 0)) {
+            $this->deleteAnalyticsCronExpr();
+            $this->flagManager->deleteFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+            return false;
+        }
+
+        $attemptsCount -= 1;
+        $this->flagManager->saveFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);
+        $signUpResult = $this->connector->execute('signUp');
+        if ($signUpResult === false) {
+            return false;
+        }
+
+        $this->deleteAnalyticsCronExpr();
+        $this->flagManager->deleteFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+        return true;
+    }
+
+    /**
+     * Delete cron schedule setting into config.
+     *
+     * Delete cron schedule setting for subscription handler into config and
+     * re-initialize config cache to avoid auto-generate new schedule items.
+     *
+     * @return bool
+     */
+    private function deleteAnalyticsCronExpr()
+    {
+        $this->configWriter->delete(SubscriptionHandler::CRON_STRING_PATH);
+        $this->reinitableConfig->reinit();
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Cron/Update.php b/app/code/Magento/Analytics/Cron/Update.php
new file mode 100644
index 0000000000000..9062a7bac7551
--- /dev/null
+++ b/app/code/Magento/Analytics/Cron/Update.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Cron;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector;
+use Magento\Framework\FlagManager;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+
+/**
+ * Executes by cron schedule in case base url was changed
+ */
+class Update
+{
+    /**
+     * @var Connector
+     */
+    private $connector;
+
+    /**
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @param Connector $connector
+     * @param WriterInterface $configWriter
+     * @param ReinitableConfigInterface $reinitableConfig
+     * @param FlagManager $flagManager
+     * @param AnalyticsToken $analyticsToken
+     */
+    public function __construct(
+        Connector $connector,
+        WriterInterface $configWriter,
+        ReinitableConfigInterface $reinitableConfig,
+        FlagManager $flagManager,
+        AnalyticsToken $analyticsToken
+    ) {
+        $this->connector = $connector;
+        $this->configWriter = $configWriter;
+        $this->reinitableConfig = $reinitableConfig;
+        $this->flagManager = $flagManager;
+        $this->analyticsToken = $analyticsToken;
+    }
+
+    /**
+     * Execute scheduled update operation
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        $result = false;
+        $attemptsCount = $this->flagManager
+            ->getFlagData(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
+
+        if ($attemptsCount) {
+            $attemptsCount -= 1;
+            $result = $this->connector->execute('update');
+        }
+
+        if ($result || ($attemptsCount <= 0) || (!$this->analyticsToken->isTokenExist())) {
+            $this->flagManager
+                ->deleteFlag(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
+            $this->flagManager->deleteFlag(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE);
+            $this->configWriter->delete(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH);
+            $this->reinitableConfig->reinit();
+        }
+
+        return $result;
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE.txt b/app/code/Magento/Analytics/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE.txt
rename to app/code/Magento/Analytics/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE_AFL.txt b/app/code/Magento/Analytics/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE_AFL.txt
rename to app/code/Magento/Analytics/LICENSE_AFL.txt
diff --git a/app/code/Magento/Analytics/Model/AnalyticsToken.php b/app/code/Magento/Analytics/Model/AnalyticsToken.php
new file mode 100644
index 0000000000000..ccec4d1bbe958
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/AnalyticsToken.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+
+/**
+ * Model for handling Magento BI token value into config.
+ */
+class AnalyticsToken
+{
+    /**
+     * Path to value of Magento BI token into config.
+     */
+    private $tokenPath = 'analytics/general/token';
+
+    /**
+     * Reinitable Config Model.
+     *
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
+    /**
+     * Scope config model.
+     *
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * Service which allows to write values into config.
+     *
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @param ReinitableConfigInterface $reinitableConfig
+     * @param ScopeConfigInterface $config
+     * @param WriterInterface $configWriter
+     */
+    public function __construct(
+        ReinitableConfigInterface $reinitableConfig,
+        ScopeConfigInterface $config,
+        WriterInterface $configWriter
+    ) {
+        $this->reinitableConfig = $reinitableConfig;
+        $this->config = $config;
+        $this->configWriter = $configWriter;
+    }
+
+    /**
+     * Get Magento BI token value.
+     *
+     * @return string|null
+     */
+    public function getToken()
+    {
+        return $this->config->getValue($this->tokenPath);
+    }
+
+    /**
+     * Stores Magento BI token value.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    public function storeToken($value)
+    {
+        $this->configWriter->save($this->tokenPath, $value);
+        $this->reinitableConfig->reinit();
+
+        return true;
+    }
+
+    /**
+     * Check Magento BI token value exist.
+     *
+     * @return bool
+     */
+    public function isTokenExist()
+    {
+        return (bool)$this->getToken();
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config.php b/app/code/Magento/Analytics/Model/Config.php
new file mode 100644
index 0000000000000..ba508187b4b9f
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\Config\DataInterface;
+
+/**
+ * Config of Analytics.
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @var DataInterface
+     */
+    private $data;
+
+    /**
+     * @param DataInterface $data
+     */
+    public function __construct(DataInterface $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Get config value by key.
+     *
+     * @param string|null $key
+     * @param string|null $default
+     * @return array
+     */
+    public function get($key = null, $default = null)
+    {
+        return $this->data->get($key, $default);
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php b/app/code/Magento/Analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php
new file mode 100644
index 0000000000000..6e6f008d49f7e
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model\Config\Backend\Baseurl;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
+
+/**
+ * Class for processing of change of Base URL.
+ */
+class SubscriptionUpdateHandler
+{
+    /**
+     * Flag code for a reserve counter to update subscription.
+     */
+    const SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE = 'analytics_link_subscription_update_reverse_counter';
+
+    /**
+     * Config path for schedule setting of update handler.
+     */
+    const UPDATE_CRON_STRING_PATH = "crontab/default/jobs/analytics_update/schedule/cron_expr";
+
+    /**
+     * Flag code for the previous Base URL.
+     */
+    const PREVIOUS_BASE_URL_FLAG_CODE = 'analytics_previous_base_url';
+
+    /**
+     * Max value for a reserve counter to update subscription.
+     *
+     * @var int
+     */
+    private $attemptsInitValue = 48;
+
+    /**
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * Cron expression for a update handler.
+     *
+     * @var string
+     */
+    private $cronExpression = '0 * * * *';
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     * @param FlagManager $flagManager
+     * @param ReinitableConfigInterface $reinitableConfig
+     * @param WriterInterface $configWriter
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        FlagManager $flagManager,
+        ReinitableConfigInterface $reinitableConfig,
+        WriterInterface $configWriter
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->flagManager = $flagManager;
+        $this->reinitableConfig = $reinitableConfig;
+        $this->configWriter = $configWriter;
+    }
+
+    /**
+     * Activate process of subscription update handling.
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function processUrlUpdate(string $url)
+    {
+        if ($this->analyticsToken->isTokenExist()) {
+            if (!$this->flagManager->getFlagData(self::PREVIOUS_BASE_URL_FLAG_CODE)) {
+                $this->flagManager->saveFlag(self::PREVIOUS_BASE_URL_FLAG_CODE, $url);
+            }
+
+            $this->flagManager
+                ->saveFlag(self::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE, $this->attemptsInitValue);
+            $this->configWriter->save(self::UPDATE_CRON_STRING_PATH, $this->cronExpression);
+            $this->reinitableConfig->reinit();
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php b/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php
new file mode 100644
index 0000000000000..524062eec35c6
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Config\Backend;
+
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+
+/**
+ * Config value backend model.
+ */
+class CollectionTime extends Value
+{
+    /**
+     * The path to config setting of schedule of collection data cron.
+     */
+    const CRON_SCHEDULE_PATH = 'crontab/default/jobs/analytics_collect_data/schedule/cron_expr';
+
+    /**
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param ScopeConfigInterface $config
+     * @param TypeListInterface $cacheTypeList
+     * @param WriterInterface $configWriter
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        ScopeConfigInterface $config,
+        TypeListInterface $cacheTypeList,
+        WriterInterface $configWriter,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        $this->configWriter = $configWriter;
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * {@inheritdoc}. Set schedule setting for cron.
+     *
+     * @return Value
+     */
+    public function afterSave()
+    {
+        $result = preg_match('#(?<hour>\d{2}),(?<min>\d{2}),(?<sec>\d{2})#', $this->getValue(), $time);
+
+        if (!$result) {
+            throw new LocalizedException(
+                __('The time value is using an unsupported format. Enter a supported format and try again.')
+            );
+        }
+
+        $cronExprArray = [
+            $time['min'],           # Minute
+            $time['hour'],          # Hour
+            '*',                    # Day of the Month
+            '*',                    # Month of the Year
+            '*',                    # Day of the Week
+        ];
+
+        $cronExprString = join(' ', $cronExprArray);
+
+        try {
+            $this->configWriter->save(self::CRON_SCHEDULE_PATH, $cronExprString);
+        } catch (\Exception $e) {
+            $this->_logger->error($e->getMessage());
+            throw new LocalizedException(__('Cron settings can\'t be saved'));
+        }
+
+        return parent::afterSave();
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/Enabled.php b/app/code/Magento/Analytics/Model/Config/Backend/Enabled.php
new file mode 100644
index 0000000000000..a5d885c80c3fc
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Backend/Enabled.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Config\Backend;
+
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+
+/**
+ * Config value backend model.
+ */
+class Enabled extends Value
+{
+    /**
+     * Path to field subscription enabled into config structure.
+     */
+    const XML_ENABLED_CONFIG_STRUCTURE_PATH = 'analytics/general/enabled';
+
+    /**
+     * Service for processing of activation/deactivation MBI subscription.
+     *
+     * @var SubscriptionHandler
+     */
+    private $subscriptionHandler;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param ScopeConfigInterface $config
+     * @param TypeListInterface $cacheTypeList
+     * @param SubscriptionHandler $subscriptionHandler
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        ScopeConfigInterface $config,
+        TypeListInterface $cacheTypeList,
+        SubscriptionHandler $subscriptionHandler,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        $this->subscriptionHandler = $subscriptionHandler;
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+    }
+
+    /**
+     * Add additional handling after config value was saved.
+     *
+     * @return Value
+     * @throws LocalizedException
+     */
+    public function afterSave()
+    {
+        try {
+            if ($this->isValueChanged()) {
+                $enabled = $this->getData('value');
+                $enabled ? $this->subscriptionHandler->processEnabled() : $this->subscriptionHandler->processDisabled();
+            }
+        } catch (\Exception $e) {
+            $this->_logger->error($e->getMessage());
+            throw new LocalizedException(__('There was an error save new configuration value.'));
+        }
+
+        return parent::afterSave();
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php b/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php
new file mode 100644
index 0000000000000..4b125949948c6
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Config\Backend\Enabled;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\CollectionTime;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
+
+/**
+ * Class for processing of activation/deactivation MBI subscription.
+ */
+class SubscriptionHandler
+{
+    /**
+     * Flag code for reserve counter of attempts to subscribe.
+     */
+    const ATTEMPTS_REVERSE_COUNTER_FLAG_CODE = 'analytics_link_attempts_reverse_counter';
+
+    /**
+     * Config path for schedule setting of subscription handler.
+     */
+    const CRON_STRING_PATH = 'crontab/default/jobs/analytics_subscribe/schedule/cron_expr';
+
+    /**
+     * Config value for schedule setting of subscription handler.
+     */
+    const CRON_EXPR_ARRAY = [
+        '0',                    # Minute
+        '*',                    # Hour
+        '*',                    # Day of the Month
+        '*',                    # Month of the Year
+        '*',                    # Day of the Week
+    ];
+
+    /**
+     * Max value for reserve counter of attempts to subscribe.
+     *
+     * @var int
+     */
+    private $attemptsInitValue = 24;
+
+    /**
+     * Service which allows to write values into config.
+     *
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * Flag Manager.
+     *
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * Model for handling Magento BI token value.
+     *
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
+    /**
+     * @param WriterInterface $configWriter
+     * @param FlagManager $flagManager
+     * @param AnalyticsToken $analyticsToken
+     * @param ReinitableConfigInterface $reinitableConfig
+     */
+    public function __construct(
+        WriterInterface $configWriter,
+        FlagManager $flagManager,
+        AnalyticsToken $analyticsToken,
+        ReinitableConfigInterface $reinitableConfig
+    ) {
+        $this->configWriter = $configWriter;
+        $this->flagManager = $flagManager;
+        $this->analyticsToken = $analyticsToken;
+        $this->reinitableConfig = $reinitableConfig;
+    }
+
+    /**
+     * Processing of activation MBI subscription.
+     *
+     * Activate process of subscription handling if Analytics token is not received.
+     *
+     * @return bool
+     */
+    public function processEnabled()
+    {
+        if (!$this->analyticsToken->isTokenExist()) {
+            $this->setCronSchedule();
+            $this->setAttemptsFlag();
+            $this->reinitableConfig->reinit();
+        }
+
+        return true;
+    }
+
+    /**
+     * Set cron schedule setting into config for activation of subscription process.
+     *
+     * @return bool
+     */
+    private function setCronSchedule()
+    {
+        $this->configWriter->save(self::CRON_STRING_PATH, join(' ', self::CRON_EXPR_ARRAY));
+        return true;
+    }
+
+    /**
+     * Set flag as reserve counter of attempts subscription operation.
+     *
+     * @return bool
+     */
+    private function setAttemptsFlag()
+    {
+        return $this->flagManager
+            ->saveFlag(self::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $this->attemptsInitValue);
+    }
+
+    /**
+     * Processing of deactivation MBI subscription.
+     *
+     * Disable data collection
+     * and interrupt subscription handling if Analytics token is not received.
+     *
+     * @return bool
+     */
+    public function processDisabled()
+    {
+        $this->disableCollectionData();
+
+        if (!$this->analyticsToken->isTokenExist()) {
+            $this->unsetAttemptsFlag();
+        }
+
+        return true;
+    }
+
+    /**
+     * Unset flag of attempts subscription operation.
+     *
+     * @return bool
+     */
+    private function unsetAttemptsFlag()
+    {
+        return $this->flagManager
+            ->deleteFlag(self::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+    }
+
+    /**
+     * Unset schedule of collection data cron.
+     *
+     * @return bool
+     */
+    private function disableCollectionData()
+    {
+        $this->configWriter->delete(CollectionTime::CRON_SCHEDULE_PATH);
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/Vertical.php b/app/code/Magento/Analytics/Model/Config/Backend/Vertical.php
new file mode 100644
index 0000000000000..2c46222216d5a
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Backend/Vertical.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Config\Backend;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * A backend model for verticals configuration.
+ */
+class Vertical extends \Magento\Framework\App\Config\Value
+{
+    /**
+     * Handles the value of the selected vertical before saving.
+     *
+     * Note that the selected vertical should not be empty since
+     * it will cause distortion of the analytics reports.
+     *
+     * @return $this
+     * @throws LocalizedException if the value of the selected vertical is empty.
+     */
+    public function beforeSave()
+    {
+        if (empty($this->getValue())) {
+            throw new LocalizedException(__('Please select an industry.'));
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Mapper.php b/app/code/Magento/Analytics/Model/Config/Mapper.php
new file mode 100644
index 0000000000000..504690b8e4763
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Mapper.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model\Config;
+
+/**
+ * Transforms Analytics configuration data.
+ */
+class Mapper
+{
+    /**
+     * Transforms Analytics configuration data.
+     *
+     * @param array $configData
+     * @return array $files
+     * $files = [
+     *    'file_name' => [
+     *        'name' => 'file_name',
+     *        'providers' => [
+     *            'reportProvider' => [
+     *                'name' => 'report_provider_name',
+     *                'class' => 'Magento\Analytics\ReportXml\ReportProvider',
+     *                'parameters' =>[
+     *                    'name' => 'report_name',
+     *                ],
+     *            ],
+     *            'customProvider' => [
+     *                'name' => 'custom_provider_name',
+     *                'class' => 'Magento\Analytics\Model\CustomProvider',
+     *            ],
+     *        ],
+     *    ]
+     * ];
+     */
+    public function execute($configData)
+    {
+        if (!isset($configData['config'][0]['file'])) {
+            return [];
+        }
+
+        $files = [];
+        foreach ($configData['config'][0]['file'] as $fileData) {
+            /** just one set of providers is allowed by xsd */
+            $providers = reset($fileData['providers']);
+            foreach ($providers as $providerType => $providerDataSet) {
+                /** just one set of provider data is allowed by xsd */
+                $providerData = reset($providerDataSet);
+                /** just one set of parameters is allowed by xsd */
+                $providerData['parameters'] = !empty($providerData['parameters'])
+                    ? reset($providerData['parameters'])
+                    : [];
+                $providerData['parameters'] = array_map(
+                    'reset',
+                    $providerData['parameters']
+                );
+                $providers[$providerType] = $providerData;
+            }
+            $files[$fileData['name']] = $fileData;
+            $files[$fileData['name']]['providers'] = $providers;
+        }
+        return $files;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Reader.php b/app/code/Magento/Analytics/Model/Config/Reader.php
new file mode 100644
index 0000000000000..8980e31627717
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Reader.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Config;
+
+use Magento\Framework\Config\ReaderInterface;
+
+/**
+ * Composite reader for config.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @var Mapper
+     */
+    private $mapper;
+
+    /**
+     * @param Mapper $mapper
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(
+        Mapper $mapper,
+        $readers = []
+    ) {
+        $this->mapper = $mapper;
+        $this->readers = $readers;
+    }
+
+    /**
+     * Read configuration scope.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $data = [];
+        foreach ($this->readers as $reader) {
+            $data = array_merge_recursive($data, $reader->read($scope));
+        }
+
+        return $this->mapper->execute($data);
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Config/Source/Vertical.php b/app/code/Magento/Analytics/Model/Config/Source/Vertical.php
new file mode 100644
index 0000000000000..c9d9582ea7c7a
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Config/Source/Vertical.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Config\Source;
+
+/**
+ * A source model for verticals configuration.
+ *
+ * Prepares and provides options for a selector of verticals which is located
+ * in the corresponding configuration menu of the Admin area.
+ */
+class Vertical implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * The list of possible verticals.
+     *
+     * This list is configured via di.xml and may be extended or changed
+     * in any module if it is needed.
+     *
+     * It is supposed that the list may be changed in each Magento release.
+     *
+     * @var array
+     */
+    private $verticals;
+
+    /**
+     * @param array $verticals
+     */
+    public function __construct(array $verticals)
+    {
+        $this->verticals = $verticals;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        $result = [
+            ['value' => '', 'label' => __('--Please Select--')]
+        ];
+
+        foreach ($this->verticals as $vertical) {
+            $result[] = ['value' => $vertical, 'label' => __($vertical)];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/ConfigInterface.php b/app/code/Magento/Analytics/Model/ConfigInterface.php
new file mode 100644
index 0000000000000..caaa2e100c1c7
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ConfigInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model;
+
+/**
+ * Interface for Analytics Config.
+ */
+interface ConfigInterface
+{
+    /**
+     * Get config value by key.
+     *
+     * @param string|null $key
+     * @param string|null $default
+     * @return array
+     */
+    public function get($key = null, $default = null);
+}
diff --git a/app/code/Magento/Analytics/Model/Connector.php b/app/code/Magento/Analytics/Model/Connector.php
new file mode 100644
index 0000000000000..23b0ffa213b6e
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * A connector to external services.
+ *
+ * Aggregates and executes commands which perform requests to external services.
+ */
+class Connector
+{
+    /**
+     * A list of possible commands.
+     *
+     * An associative array in format: 'command_name' => 'command_class_name'.
+     *
+     * The list may be configured in each module via '/etc/di.xml'.
+     *
+     * @var string[]
+     */
+    private $commands;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param array $commands
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        array $commands,
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->commands = $commands;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Executes a command in accordance with the given name.
+     *
+     * @param string $commandName
+     * @return bool
+     * @throws NotFoundException if the command is not found.
+     */
+    public function execute($commandName)
+    {
+        if (!array_key_exists($commandName, $this->commands)) {
+            throw new NotFoundException(__('Command was not found.'));
+        }
+
+        /** @var \Magento\Analytics\Model\Connector\CommandInterface $command */
+        $command = $this->objectManager->create($this->commands[$commandName]);
+
+        return $command->execute();
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/CommandInterface.php b/app/code/Magento/Analytics/Model/Connector/CommandInterface.php
new file mode 100644
index 0000000000000..7a8774fe3dba9
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/CommandInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector;
+
+/**
+ * Introduces family of integration calls.
+ * Each implementation represents call to external service.
+ */
+interface CommandInterface
+{
+    /**
+     * Execute call to external service
+     * Information about destination and arguments appears from config
+     *
+     * @return bool
+     */
+    public function execute();
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php
new file mode 100644
index 0000000000000..f81cb065aa2ad
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\Http\Client;
+
+use Magento\Analytics\Model\Connector\Http\ConverterInterface;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\HTTP\Adapter\CurlFactory;
+use Magento\Framework\HTTP\ResponseFactory;
+
+/**
+ * A CURL HTTP client.
+ *
+ * Sends requests via a CURL adapter.
+ */
+class Curl implements \Magento\Analytics\Model\Connector\Http\ClientInterface
+{
+    /**
+     * @var CurlFactory
+     */
+    private $curlFactory;
+
+    /**
+     * @var ResponseFactory
+     */
+    private $responseFactory;
+
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param CurlFactory $curlFactory
+     * @param ResponseFactory $responseFactory
+     * @param ConverterInterface $converter
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        CurlFactory $curlFactory,
+        ResponseFactory $responseFactory,
+        ConverterInterface $converter,
+        LoggerInterface $logger
+    ) {
+        $this->curlFactory = $curlFactory;
+        $this->responseFactory = $responseFactory;
+        $this->converter = $converter;
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function request($method, $url, array $body = [], array $headers = [], $version = '1.1')
+    {
+        $response = new \Zend_Http_Response(0, []);
+
+        try {
+            $curl = $this->curlFactory->create();
+            $headers = $this->applyContentTypeHeaderFromConverter($headers);
+
+            $curl->write($method, $url, $version, $headers, $this->converter->toBody($body));
+
+            $result = $curl->read();
+
+            if ($curl->getErrno()) {
+                $this->logger->critical(
+                    new \Exception(
+                        sprintf(
+                            'MBI service CURL connection error #%s: %s',
+                            $curl->getErrno(),
+                            $curl->getError()
+                        )
+                    )
+                );
+
+                return $response;
+            }
+
+            $response = $this->responseFactory->create($result);
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param array $headers
+     *
+     * @return array
+     */
+    private function applyContentTypeHeaderFromConverter(array $headers)
+    {
+        $contentTypeHeaderKey = array_search($this->converter->getContentTypeHeader(), $headers);
+        if ($contentTypeHeaderKey === false) {
+            $headers[] = $this->converter->getContentTypeHeader();
+        }
+
+        return $headers;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/ClientInterface.php b/app/code/Magento/Analytics/Model/Connector/Http/ClientInterface.php
new file mode 100644
index 0000000000000..a1e1f057684f6
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/Http/ClientInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\Http;
+
+/**
+ * An interface for an HTTP client.
+ *
+ * Sends requests via a proper adapter.
+ */
+interface ClientInterface
+{
+    /**
+     * Sends a request using given parameters.
+     *
+     * Returns an HTTP response object or FALSE in case of failure.
+     *
+     * @param string $method
+     * @param string $url
+     * @param array $body
+     * @param array $headers
+     * @param string $version
+     *
+     * @return \Zend_Http_Response
+     */
+    public function request($method, $url, array $body = [], array $headers = [], $version = '1.1');
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php b/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php
new file mode 100644
index 0000000000000..ddd9fcba21109
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\Http;
+
+/**
+ * Represents converter interface for http request and response body.
+ *
+ * @api
+ */
+interface ConverterInterface
+{
+    /**
+     * @param string $body
+     *
+     * @return array
+     */
+    public function fromBody($body);
+
+    /**
+     * @param array $data
+     *
+     * @return string
+     */
+    public function toBody(array $data);
+
+    /**
+     * @return string
+     */
+    public function getContentTypeHeader();
+
+    /**
+     * @return string
+     */
+    public function getContentMediaType(): string;
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php b/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php
new file mode 100644
index 0000000000000..059dab554bd92
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Analytics\Model\Connector\Http;
+
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Represents JSON converter for http request and response body.
+ */
+class JsonConverter implements ConverterInterface
+{
+    /**
+     * Content-Type HTTP header for json.
+     * @deprecated
+     * @see CONTENT_MEDIA_TYPE
+     */
+    const CONTENT_TYPE_HEADER = 'Content-Type: application/json';
+
+    /**
+     * Media-Type corresponding to this converter.
+     */
+    const CONTENT_MEDIA_TYPE = 'application/json';
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @param Json $serializer
+     */
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @param string $body
+     *
+     * @return array
+     */
+    public function fromBody($body)
+    {
+        $decodedBody = $this->serializer->unserialize($body);
+        return $decodedBody === null ? [$body] : $decodedBody;
+    }
+
+    /**c
+     * @param array $data
+     *
+     * @return string
+     */
+    public function toBody(array $data)
+    {
+        return $this->serializer->serialize($data);
+    }
+
+    /**
+     * @return string
+     */
+    public function getContentTypeHeader()
+    {
+        return sprintf('Content-Type: %s', self::CONTENT_MEDIA_TYPE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getContentMediaType(): string
+    {
+        return self::CONTENT_MEDIA_TYPE;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/ResponseHandlerInterface.php b/app/code/Magento/Analytics/Model/Connector/Http/ResponseHandlerInterface.php
new file mode 100644
index 0000000000000..4a6633f08da55
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/Http/ResponseHandlerInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\Http;
+
+/**
+ * Represents an interface for response handler which process response body.
+ */
+interface ResponseHandlerInterface
+{
+    /**
+     * @param array $responseBody
+     * @return bool|string
+     */
+    public function handleResponse(array $responseBody);
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php b/app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php
new file mode 100644
index 0000000000000..57b61c1b5562a
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\Http;
+
+/**
+ * Extract result from http response. Call response handler by status.
+ */
+class ResponseResolver
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * @var array
+     */
+    private $responseHandlers;
+
+    /**
+     * @param ConverterInterface $converter
+     * @param ResponseHandlerInterface[] $responseHandlers
+     */
+    public function __construct(ConverterInterface $converter, array $responseHandlers = [])
+    {
+        $this->converter = $converter;
+        $this->responseHandlers = $responseHandlers;
+    }
+
+    /**
+     * @param \Zend_Http_Response $response
+     *
+     * @return bool|string
+     */
+    public function getResult(\Zend_Http_Response $response)
+    {
+        $result = false;
+        $converterMediaType = $this->converter->getContentMediaType();
+
+        /** Content-Type header may not only contain media-type declaration */
+        if ($response->getBody() && is_int(strripos($response->getHeader('Content-Type'), $converterMediaType))) {
+            $responseBody = $this->converter->fromBody($response->getBody());
+        } else {
+            $responseBody = [];
+        }
+
+        if (array_key_exists($response->getStatus(), $this->responseHandlers)) {
+            $result = $this->responseHandlers[$response->getStatus()]->handleResponse($responseBody);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php b/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php
new file mode 100644
index 0000000000000..f1a8ea6460f9d
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\HTTP\ZendClient;
+use Psr\Log\LoggerInterface;
+use Magento\Store\Model\Store;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+
+/**
+ * Command notifies MBI about that data collection was finished.
+ */
+class NotifyDataChangedCommand implements CommandInterface
+{
+    /**
+     * @var string
+     */
+    private $notifyDataChangedUrlPath = 'analytics/url/notify_data_changed';
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var Http\ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $responseResolver;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * NotifyDataChangedCommand constructor.
+     * @param AnalyticsToken $analyticsToken
+     * @param Http\ClientInterface $httpClient
+     * @param ScopeConfigInterface $config
+     * @param ResponseResolver $responseResolver
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        Http\ClientInterface $httpClient,
+        ScopeConfigInterface $config,
+        ResponseResolver $responseResolver,
+        LoggerInterface $logger
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->httpClient = $httpClient;
+        $this->config = $config;
+        $this->responseResolver = $responseResolver;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Notify MBI about that data collection was finished
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        $result = false;
+        if ($this->analyticsToken->isTokenExist()) {
+            $response = $this->httpClient->request(
+                ZendClient::POST,
+                $this->config->getValue($this->notifyDataChangedUrlPath),
+                [
+                    "access-token" => $this->analyticsToken->getToken(),
+                    "url" => $this->config->getValue(Store::XML_PATH_SECURE_BASE_URL),
+                ]
+            );
+            $result = $this->responseResolver->getResult($response);
+        }
+        return (bool)$result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/OTPRequest.php b/app/code/Magento/Analytics/Model/Connector/OTPRequest.php
new file mode 100644
index 0000000000000..c05357400d075
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/OTPRequest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Representation of an 'OTP' request.
+ *
+ * The request is responsible for obtaining of an OTP from the MBI service.
+ *
+ * OTP (One-Time Password) is a password that is valid for short period of time
+ * and may be used only for one login session.
+ */
+class OTPRequest
+{
+    /**
+     * Resource for handling MBI token value.
+     *
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var Http\ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $responseResolver;
+
+    /**
+     * Path to the configuration value which contains
+     * an URL that provides an OTP.
+     *
+     * @var string
+     */
+    private $otpUrlConfigPath = 'analytics/url/otp';
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     * @param Http\ClientInterface $httpClient
+     * @param ScopeConfigInterface $config
+     * @param ResponseResolver $responseResolver
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        Http\ClientInterface $httpClient,
+        ScopeConfigInterface $config,
+        ResponseResolver $responseResolver,
+        LoggerInterface $logger
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->httpClient = $httpClient;
+        $this->config = $config;
+        $this->responseResolver = $responseResolver;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Performs obtaining of an OTP from the MBI service.
+     *
+     * Returns received OTP or FALSE in case of failure.
+     *
+     * @return string|false
+     */
+    public function call()
+    {
+        $result = false;
+
+        if ($this->analyticsToken->isTokenExist()) {
+            $response = $this->httpClient->request(
+                ZendClient::POST,
+                $this->config->getValue($this->otpUrlConfigPath),
+                [
+                    "access-token" => $this->analyticsToken->getToken(),
+                    "url" => $this->config->getValue(Store::XML_PATH_SECURE_BASE_URL),
+                ]
+            );
+
+            $result = $this->responseResolver->getResult($response);
+            if (!$result) {
+                $this->logger->warning(
+                    sprintf(
+                        'Obtaining of an OTP from the MBI service has been failed: %s. Content-Type: %s',
+                        !empty($response->getBody()) ? $response->getBody() : 'Response body is empty',
+                        $response->getHeader('Content-Type')
+                    )
+                );
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/OTP.php b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/OTP.php
new file mode 100644
index 0000000000000..d9a672e81f43d
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/OTP.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
+
+/**
+ * Fetches OTP from body.
+ */
+class OTP implements ResponseHandlerInterface
+{
+    /**
+     * @param array $responseBody
+     *
+     * @return bool|string
+     */
+    public function handleResponse(array $responseBody)
+    {
+        return !empty($responseBody['otp']) ? $responseBody['otp'] : false;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php
new file mode 100644
index 0000000000000..c79630d6414d8
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+
+/**
+ * Removes stored token and triggers subscription process.
+ */
+class ReSignUp implements ResponseHandlerInterface
+{
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+    
+    /**
+     * @var SubscriptionHandler
+     */
+    private $subscriptionHandler;
+
+    /**
+     * @var SubscriptionStatusProvider
+     */
+    private $subscriptionStatusProvider;
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     * @param SubscriptionHandler $subscriptionHandler
+     * @param SubscriptionStatusProvider $subscriptionStatusProvider
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        SubscriptionHandler $subscriptionHandler,
+        SubscriptionStatusProvider $subscriptionStatusProvider
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->subscriptionHandler = $subscriptionHandler;
+        $this->subscriptionStatusProvider = $subscriptionStatusProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function handleResponse(array $responseBody)
+    {
+        if ($this->subscriptionStatusProvider->getStatus() === SubscriptionStatusProvider::ENABLED) {
+            $this->analyticsToken->storeToken(null);
+            $this->subscriptionHandler->processEnabled();
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/SignUp.php b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/SignUp.php
new file mode 100644
index 0000000000000..db5f7be47cad7
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/SignUp.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
+
+/**
+ * Stores access token to MBI that received in body.
+ */
+class SignUp implements ResponseHandlerInterface
+{
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken
+    ) {
+        $this->analyticsToken = $analyticsToken;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function handleResponse(array $body)
+    {
+        if (isset($body['access-token']) && !empty($body['access-token'])) {
+            $this->analyticsToken->storeToken($body['access-token']);
+            return $body['access-token'];
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/Update.php b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/Update.php
new file mode 100644
index 0000000000000..73fc575ae2821
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/Update.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
+
+/**
+ * Return positive answer that request was finished successfully.
+ */
+class Update implements ResponseHandlerInterface
+{
+    /**
+     * @param array $responseBody
+     *
+     * @return bool|string
+     */
+    public function handleResponse(array $responseBody)
+    {
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php b/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php
new file mode 100644
index 0000000000000..e35c9bb42bc43
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Analytics\Model\IntegrationManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Store\Model\Store;
+
+/**
+ * SignUp merchant for Free Tier project
+ */
+class SignUpCommand implements CommandInterface
+{
+    /**
+     * @var string
+     */
+    private $signUpUrlPath = 'analytics/url/signup';
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var IntegrationManager
+     */
+    private $integrationManager;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var Http\ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $responseResolver;
+
+    /**
+     * SignUpCommand constructor.
+     *
+     * @param AnalyticsToken $analyticsToken
+     * @param IntegrationManager $integrationManager
+     * @param ScopeConfigInterface $config
+     * @param Http\ClientInterface $httpClient
+     * @param LoggerInterface $logger
+     * @param ResponseResolver $responseResolver
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        IntegrationManager $integrationManager,
+        ScopeConfigInterface $config,
+        Http\ClientInterface $httpClient,
+        LoggerInterface $logger,
+        ResponseResolver $responseResolver
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->integrationManager = $integrationManager;
+        $this->config = $config;
+        $this->httpClient = $httpClient;
+        $this->logger = $logger;
+        $this->responseResolver = $responseResolver;
+    }
+
+    /**
+     * Executes signUp command
+     *
+     * During this call Magento generates or retrieves access token for the integration user
+     * In case successful generation Magento activates user and sends access token to MA
+     * As the response, Magento receives a token to MA
+     * Magento stores this token in System Configuration
+     *
+     * This method returns true in case of success
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        $result = false;
+        $integrationToken = $this->integrationManager->generateToken();
+        if ($integrationToken) {
+            $this->integrationManager->activateIntegration();
+            $response = $this->httpClient->request(
+                ZendClient::POST,
+                $this->config->getValue($this->signUpUrlPath),
+                [
+                    "token" => $integrationToken->getData('token'),
+                    "url" => $this->config->getValue(Store::XML_PATH_SECURE_BASE_URL),
+                ]
+            );
+
+            $result = $this->responseResolver->getResult($response);
+            if (!$result) {
+                $this->logger->warning(
+                    sprintf(
+                        'Subscription for MBI service has been failed. An error occurred during token exchange: %s.'
+                        . ' Content-Type: %s',
+                        !empty($response->getBody()) ? $response->getBody() : 'Response body is empty',
+                        $response->getHeader('Content-Type')
+                    )
+                );
+            }
+        }
+
+        return (bool)$result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php b/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php
new file mode 100644
index 0000000000000..59878ff9c0814
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Command executes in case change store url
+ */
+class UpdateCommand implements CommandInterface
+{
+    /**
+     * @var string
+     */
+    private $updateUrlPath = 'analytics/url/update';
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var Http\ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $responseResolver;
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     * @param Http\ClientInterface $httpClient
+     * @param ScopeConfigInterface $config
+     * @param LoggerInterface $logger
+     * @param FlagManager $flagManager
+     * @param ResponseResolver $responseResolver
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        Http\ClientInterface $httpClient,
+        ScopeConfigInterface $config,
+        LoggerInterface $logger,
+        FlagManager $flagManager,
+        ResponseResolver $responseResolver
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->httpClient = $httpClient;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->flagManager = $flagManager;
+        $this->responseResolver = $responseResolver;
+    }
+
+    /**
+     * Executes update request to MBI api in case store url was changed
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        $result = false;
+        if ($this->analyticsToken->isTokenExist()) {
+            $response = $this->httpClient->request(
+                ZendClient::PUT,
+                $this->config->getValue($this->updateUrlPath),
+                [
+                    "url" => $this->flagManager
+                        ->getFlagData(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE),
+                    "new-url" => $this->config->getValue(Store::XML_PATH_SECURE_BASE_URL),
+                    "access-token" => $this->analyticsToken->getToken(),
+                ]
+            );
+            $result = $this->responseResolver->getResult($response);
+            if (!$result) {
+                $this->logger->warning(
+                    sprintf(
+                        'Update of the subscription for MBI service has been failed: %s. Content-Type: %s',
+                        !empty($response->getBody()) ? $response->getBody() : 'Response body is empty',
+                        $response->getHeader('Content-Type')
+                    )
+                );
+            }
+        }
+
+        return (bool)$result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Cryptographer.php b/app/code/Magento/Analytics/Model/Cryptographer.php
new file mode 100644
index 0000000000000..efddcb501aabb
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Cryptographer.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class for encrypting data.
+ */
+class Cryptographer
+{
+    /**
+     * Resource for handling MBI token value.
+     *
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * Cipher method for encryption.
+     *
+     * @var string
+     */
+    private $cipherMethod = 'AES-256-CBC';
+
+    /**
+     * @var EncodedContextFactory
+     */
+    private $encodedContextFactory;
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     * @param EncodedContextFactory $encodedContextFactory
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        EncodedContextFactory $encodedContextFactory
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->encodedContextFactory = $encodedContextFactory;
+    }
+
+    /**
+     * Encrypt input data.
+     *
+     * @param string $source
+     * @return EncodedContext
+     * @throws LocalizedException
+     */
+    public function encode($source)
+    {
+        if (!is_string($source)) {
+            try {
+                $source = (string)$source;
+            } catch (\Exception $e) {
+                throw new LocalizedException(
+                    __(
+                        'The data is invalid. '
+                        . 'Enter the data as a string or data that can be converted into a string and try again.'
+                    )
+                );
+            }
+        } elseif (!$source) {
+            throw new LocalizedException(__('The data is invalid. Enter the data as a string and try again.'));
+        }
+        if (!$this->validateCipherMethod($this->cipherMethod)) {
+            throw new LocalizedException(__('The data is invalid. Use a valid cipher method and try again.'));
+        }
+        $initializationVector = $this->getInitializationVector();
+
+        $encodedContext = $this->encodedContextFactory->create([
+            'content' => openssl_encrypt(
+                $source,
+                $this->cipherMethod,
+                $this->getKey(),
+                OPENSSL_RAW_DATA,
+                $initializationVector
+            ),
+            'initializationVector' => $initializationVector,
+        ]);
+
+        return $encodedContext;
+    }
+
+    /**
+     * Return key for encryption.
+     *
+     * @return string
+     * @throws LocalizedException
+     */
+    private function getKey()
+    {
+        $token = $this->analyticsToken->getToken();
+        if (!$token) {
+            throw new LocalizedException(__('Enter the encryption key and try again.'));
+        }
+        return hash('sha256', $token);
+    }
+
+    /**
+     * Return established cipher method.
+     *
+     * @return string
+     */
+    private function getCipherMethod()
+    {
+        return $this->cipherMethod;
+    }
+
+    /**
+     * Return each time generated random initialization vector which depends on the cipher method.
+     *
+     * @return string
+     */
+    private function getInitializationVector()
+    {
+        $ivSize = openssl_cipher_iv_length($this->getCipherMethod());
+        return openssl_random_pseudo_bytes($ivSize);
+    }
+
+    /**
+     * Check that cipher method is allowed for encryption.
+     *
+     * @param string $cipherMethod
+     * @return bool
+     */
+    private function validateCipherMethod($cipherMethod)
+    {
+        $methods = array_map(
+            'strtolower',
+            openssl_get_cipher_methods()
+        );
+        $cipherMethod = strtolower($cipherMethod);
+
+        return (false !== array_search($cipherMethod, $methods));
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/EncodedContext.php b/app/code/Magento/Analytics/Model/EncodedContext.php
new file mode 100644
index 0000000000000..5fb2d0c15aef7
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/EncodedContext.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+/**
+ * Contain information about encrypted data.
+ */
+class EncodedContext
+{
+    /**
+     * Encrypted string.
+     *
+     * @var string
+     */
+    private $content;
+
+    /**
+     * Initialization vector that was used for encryption.
+     *
+     * @var string
+     */
+    private $initializationVector;
+
+    /**
+     * @param string $content
+     * @param string $initializationVector
+     */
+    public function __construct($content, $initializationVector = '')
+    {
+        $this->content = $content;
+        $this->initializationVector = $initializationVector;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInitializationVector()
+    {
+        return $this->initializationVector;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php b/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php
new file mode 100644
index 0000000000000..5d127037afea9
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model\Exception\State;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Analytics is in update subscription mode.
+ */
+class SubscriptionUpdateException extends LocalizedException
+{
+
+}
diff --git a/app/code/Magento/Analytics/Model/ExportDataHandler.php b/app/code/Magento/Analytics/Model/ExportDataHandler.php
new file mode 100644
index 0000000000000..dc17a548763eb
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ExportDataHandler.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Archive;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Class for the handling of a new data collection for MBI.
+ */
+class ExportDataHandler implements ExportDataHandlerInterface
+{
+    /**
+     * Subdirectory path for all temporary files.
+     *
+     * @var string
+     */
+    private $subdirectoryPath = 'analytics/';
+
+    /**
+     * Filename of archive with collected data.
+     *
+     * @var string
+     */
+    private $archiveName = 'data.tgz';
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var Archive
+     */
+    private $archive;
+
+    /**
+     * Resource for write data of reports into separate files.
+     *
+     * @var ReportWriterInterface
+     */
+    private $reportWriter;
+
+    /**
+     * Resource for encrypting data.
+     *
+     * @var Cryptographer
+     */
+    private $cryptographer;
+
+    /**
+     * Resource for registration a new file.
+     *
+     * @var FileRecorder
+     */
+    private $fileRecorder;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param Archive $archive
+     * @param ReportWriterInterface $reportWriter
+     * @param Cryptographer $cryptographer
+     * @param FileRecorder $fileRecorder
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        Archive $archive,
+        ReportWriterInterface $reportWriter,
+        Cryptographer $cryptographer,
+        FileRecorder $fileRecorder
+    ) {
+        $this->filesystem = $filesystem;
+        $this->archive = $archive;
+        $this->reportWriter = $reportWriter;
+        $this->cryptographer = $cryptographer;
+        $this->fileRecorder = $fileRecorder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepareExportData()
+    {
+        try {
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+
+            $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
+            $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());
+
+            $tmpFilesDirectoryAbsolutePath = $this->validateSource($tmpDirectory, $this->getTmpFilesDirRelativePath());
+            $archiveAbsolutePath = $this->prepareFileDirectory($tmpDirectory, $this->getArchiveRelativePath());
+            $this->pack(
+                $tmpFilesDirectoryAbsolutePath,
+                $archiveAbsolutePath
+            );
+
+            $this->validateSource($tmpDirectory, $this->getArchiveRelativePath());
+            $this->fileRecorder->recordNewFile(
+                $this->cryptographer->encode($tmpDirectory->readFile($this->getArchiveRelativePath()))
+            );
+        } finally {
+            $tmpDirectory->delete($this->getTmpFilesDirRelativePath());
+            $tmpDirectory->delete($this->getArchiveRelativePath());
+        }
+
+        return true;
+    }
+
+    /**
+     * Return relative path to a directory for temporary files with reports data.
+     *
+     * @return string
+     */
+    private function getTmpFilesDirRelativePath()
+    {
+        return $this->subdirectoryPath . 'tmp/';
+    }
+
+    /**
+     * Return relative path to a directory for an archive.
+     *
+     * @return string
+     */
+    private function getArchiveRelativePath()
+    {
+        return $this->subdirectoryPath . $this->archiveName;
+    }
+
+    /**
+     * Clean up a directory.
+     *
+     * @param WriteInterface $directory
+     * @param string $path
+     * @return string
+     */
+    private function prepareDirectory(WriteInterface $directory, $path)
+    {
+        $directory->delete($path);
+
+        return $directory->getAbsolutePath($path);
+    }
+
+    /**
+     * Remove a file and a create parent directory a file.
+     *
+     * @param WriteInterface $directory
+     * @param string $path
+     * @return string
+     */
+    private function prepareFileDirectory(WriteInterface $directory, $path)
+    {
+        $directory->delete($path);
+        if (dirname($path) !== '.') {
+            $directory->create(dirname($path));
+        }
+
+        return $directory->getAbsolutePath($path);
+    }
+
+    /**
+     * Packing data into an archive.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return bool
+     */
+    private function pack($source, $destination)
+    {
+        $this->archive->pack(
+            $source,
+            $destination,
+            is_dir($source) ?: false
+        );
+
+        return true;
+    }
+
+    /**
+     * Validate that data source exist.
+     *
+     * Return absolute path in a validated data source.
+     *
+     * @param WriteInterface $directory
+     * @param string $path
+     * @return string
+     * @throws LocalizedException If source is not exist.
+     */
+    private function validateSource(WriteInterface $directory, $path)
+    {
+        if (!$directory->isExist($path)) {
+            throw new LocalizedException(__('The "%1" source doesn\'t exist.', $directory->getAbsolutePath($path)));
+        }
+
+        return $directory->getAbsolutePath($path);
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php b/app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php
new file mode 100644
index 0000000000000..65efb33659c89
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+/**
+ * The interface represents the type of classes that handling of a new data collection for MBI.
+ */
+interface ExportDataHandlerInterface
+{
+    /**
+     * Execute collecting new data for MBI.
+     *
+     * @return bool
+     */
+    public function prepareExportData();
+}
diff --git a/app/code/Magento/Analytics/Model/ExportDataHandlerNotification.php b/app/code/Magento/Analytics/Model/ExportDataHandlerNotification.php
new file mode 100644
index 0000000000000..2405f39f46185
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ExportDataHandlerNotification.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+/**
+ * Class which add notification behaviour to classes that handling of a new data collection for MBI.
+ */
+class ExportDataHandlerNotification implements ExportDataHandlerInterface
+{
+    /**
+     * @var ExportDataHandler
+     */
+    private $exportDataHandler;
+
+    /**
+     * @var Connector
+     */
+    private $analyticsConnector;
+
+    /**
+     * @param ExportDataHandlerInterface $exportDataHandler
+     * @param Connector $connector
+     */
+    public function __construct(ExportDataHandler $exportDataHandler, Connector $connector)
+    {
+        $this->exportDataHandler = $exportDataHandler;
+        $this->analyticsConnector = $connector;
+    }
+
+    /**
+     * {@inheritdoc}
+     * Execute notification command.
+     *
+     * @return bool
+     */
+    public function prepareExportData()
+    {
+        $result = $this->exportDataHandler->prepareExportData();
+        $this->analyticsConnector->execute('notifyDataChanged');
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/FileInfo.php b/app/code/Magento/Analytics/Model/FileInfo.php
new file mode 100644
index 0000000000000..19bdaf21b2a20
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/FileInfo.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+/**
+ * Contain information about encrypted file.
+ */
+class FileInfo
+{
+    /**
+     * Initialization vector that was used for encryption.
+     *
+     * @var string
+     */
+    private $initializationVector;
+
+    /**
+     * Relative path to an encrypted file.
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * @param string $path
+     * @param string $initializationVector
+     */
+    public function __construct($path = '', $initializationVector = '')
+    {
+        $this->path = $path;
+        $this->initializationVector = $initializationVector;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInitializationVector()
+    {
+        return $this->initializationVector;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/FileInfoManager.php b/app/code/Magento/Analytics/Model/FileInfoManager.php
new file mode 100644
index 0000000000000..e37700e665420
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/FileInfoManager.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\FlagManager;
+
+/**
+ * Manage saving and loading FileInfo object.
+ */
+class FileInfoManager
+{
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @var FileInfoFactory
+     */
+    private $fileInfoFactory;
+
+    /**
+     * Flag code for a stored FileInfo object.
+     *
+     * @var string
+     */
+    private $flagCode = 'analytics_file_info';
+
+    /**
+     * Parameters which have to be saved into encoded form.
+     *
+     * @var array
+     */
+    private $encodedParameters = [
+        'initializationVector'
+    ];
+
+    /**
+     * @param FlagManager $flagManager
+     * @param FileInfoFactory $fileInfoFactory
+     */
+    public function __construct(
+        FlagManager $flagManager,
+        FileInfoFactory $fileInfoFactory
+    ) {
+        $this->flagManager = $flagManager;
+        $this->fileInfoFactory = $fileInfoFactory;
+    }
+
+    /**
+     * Save FileInfo object.
+     *
+     * @param FileInfo $fileInfo
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function save(FileInfo $fileInfo)
+    {
+        $parameters = [];
+        $parameters['initializationVector'] = $fileInfo->getInitializationVector();
+        $parameters['path'] = $fileInfo->getPath();
+
+        $emptyParameters = array_diff($parameters, array_filter($parameters));
+        if ($emptyParameters) {
+            throw new LocalizedException(
+                __('These arguments can\'t be empty "%1"', implode(', ', array_keys($emptyParameters)))
+            );
+        }
+
+        foreach ($this->encodedParameters as $encodedParameter) {
+            $parameters[$encodedParameter] = $this->encodeValue($parameters[$encodedParameter]);
+        }
+
+        $this->flagManager->saveFlag($this->flagCode, $parameters);
+
+        return true;
+    }
+
+    /**
+     * Load FileInfo object.
+     *
+     * @return FileInfo
+     */
+    public function load()
+    {
+        $parameters = $this->flagManager->getFlagData($this->flagCode) ?: [];
+
+        $encodedParameters = array_intersect($this->encodedParameters, array_keys($parameters));
+        foreach ($encodedParameters as $encodedParameter) {
+            $parameters[$encodedParameter] = $this->decodeValue($parameters[$encodedParameter]);
+        }
+
+        $fileInfo = $this->fileInfoFactory->create($parameters);
+
+        return $fileInfo;
+    }
+
+    /**
+     * Encode value.
+     *
+     * @param string $value
+     * @return string
+     */
+    private function encodeValue($value)
+    {
+        return base64_encode($value);
+    }
+
+    /**
+     * Decode value.
+     *
+     * @param string $value
+     * @return string
+     */
+    private function decodeValue($value)
+    {
+        return base64_decode($value);
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/FileRecorder.php b/app/code/Magento/Analytics/Model/FileRecorder.php
new file mode 100644
index 0000000000000..70438a98d56f1
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/FileRecorder.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Class for the handling of registration a new file for MBI.
+ */
+class FileRecorder
+{
+    /**
+     * Resource for managing FileInfo object.
+     *
+     * @var FileInfoManager
+     */
+    private $fileInfoManager;
+
+    /**
+     * @var FileInfoFactory
+     */
+    private $fileInfoFactory;
+
+    /**
+     * Subdirectory path for an encoded file.
+     *
+     * @var string
+     */
+    private $fileSubdirectoryPath = 'analytics/';
+
+    /**
+     * File name of an encoded file.
+     *
+     * @var string
+     */
+    private $encodedFileName = 'data.tgz';
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param FileInfoManager $fileInfoManager
+     * @param FileInfoFactory $fileInfoFactory
+     * @param Filesystem $filesystem
+     */
+    public function __construct(
+        FileInfoManager $fileInfoManager,
+        FileInfoFactory $fileInfoFactory,
+        Filesystem $filesystem
+    ) {
+        $this->fileInfoManager = $fileInfoManager;
+        $this->fileInfoFactory = $fileInfoFactory;
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Save new encrypted file, register it and remove old registered file.
+     *
+     * @param EncodedContext $encodedContext
+     * @return bool
+     */
+    public function recordNewFile(EncodedContext $encodedContext)
+    {
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+
+        $fileRelativePath = $this->getFileRelativePath();
+        $directory->writeFile($fileRelativePath, $encodedContext->getContent());
+
+        $fileInfo = $this->fileInfoManager->load();
+        $this->registerFile($encodedContext, $fileRelativePath);
+        $this->removeOldFile($fileInfo, $directory);
+
+        return true;
+    }
+
+    /**
+     * Return relative path to encoded file.
+     *
+     * @return string
+     */
+    private function getFileRelativePath()
+    {
+        return $this->fileSubdirectoryPath . hash('sha256', time())
+            . '/' . $this->encodedFileName;
+    }
+
+    /**
+     * Register encoded file.
+     *
+     * @param EncodedContext $encodedContext
+     * @param string $fileRelativePath
+     * @return bool
+     */
+    private function registerFile(EncodedContext $encodedContext, $fileRelativePath)
+    {
+        $newFileInfo = $this->fileInfoFactory->create(
+            [
+                'path' => $fileRelativePath,
+                'initializationVector' => $encodedContext->getInitializationVector(),
+            ]
+        );
+        $this->fileInfoManager->save($newFileInfo);
+
+        return true;
+    }
+
+    /**
+     * Remove previously registered file.
+     *
+     * @param FileInfo $fileInfo
+     * @param WriteInterface $directory
+     * @return bool
+     */
+    private function removeOldFile(FileInfo $fileInfo, WriteInterface $directory)
+    {
+        if (!$fileInfo->getPath()) {
+            return true;
+        }
+
+        $directory->delete($fileInfo->getPath());
+
+        $directoryName = dirname($fileInfo->getPath());
+        if ($directoryName !== '.') {
+            $directory->delete($directoryName);
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/IntegrationManager.php b/app/code/Magento/Analytics/Model/IntegrationManager.php
new file mode 100644
index 0000000000000..f0d7fe9994232
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/IntegrationManager.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Integration\Api\IntegrationServiceInterface;
+use Magento\Config\Model\Config as SystemConfig;
+use Magento\Integration\Model\Integration;
+use Magento\Integration\Api\OauthServiceInterface;
+
+/**
+ * Manages the integration user at magento side.
+ * User name stored in config.
+ * User roles
+ */
+class IntegrationManager
+{
+    /**
+     * @var SystemConfig
+     */
+    private $config;
+
+    /**
+     * @var IntegrationServiceInterface
+     */
+    private $integrationService;
+
+    /**
+     * @var OauthServiceInterface
+     */
+    private $oauthService;
+
+    /**
+     * IntegrationManager constructor
+     *
+     * @param SystemConfig $config
+     * @param IntegrationServiceInterface $integrationService
+     * @param OauthServiceInterface $oauthService
+     */
+    public function __construct(
+        SystemConfig $config,
+        IntegrationServiceInterface $integrationService,
+        OauthServiceInterface $oauthService
+    ) {
+        $this->integrationService = $integrationService;
+        $this->config = $config;
+        $this->oauthService = $oauthService;
+    }
+
+    /**
+     * Activate predefined integration user
+     *
+     * @return bool
+     * @throws NoSuchEntityException
+     */
+    public function activateIntegration()
+    {
+        $integration = $this->integrationService->findByName(
+            $this->config->getConfigDataValue('analytics/integration_name')
+        );
+        if (!$integration->getId()) {
+            throw new NoSuchEntityException(__('Cannot find predefined integration user!'));
+        }
+        $integrationData = $this->getIntegrationData(Integration::STATUS_ACTIVE);
+        $integrationData['integration_id'] = $integration->getId();
+        $this->integrationService->update($integrationData);
+        return true;
+    }
+
+    /**
+     * This method execute Generate Token command and enable integration
+     *
+     * @return bool|\Magento\Integration\Model\Oauth\Token
+     */
+    public function generateToken()
+    {
+        $consumerId = $this->generateIntegration()->getConsumerId();
+        $accessToken = $this->oauthService->getAccessToken($consumerId);
+        if (!$accessToken && $this->oauthService->createAccessToken($consumerId, true)) {
+            $accessToken = $this->oauthService->getAccessToken($consumerId);
+        }
+        return $accessToken;
+    }
+
+    /**
+     * Returns consumer Id for MA integration user
+     *
+     * @return \Magento\Integration\Model\Integration
+     */
+    private function generateIntegration()
+    {
+        $integration = $this->integrationService->findByName(
+            $this->config->getConfigDataValue('analytics/integration_name')
+        );
+        if (!$integration->getId()) {
+            $integration = $this->integrationService->create($this->getIntegrationData());
+        }
+        return $integration;
+    }
+
+    /**
+     * Returns default attributes for MA integration user
+     *
+     * @param int $status
+     * @return array
+     */
+    private function getIntegrationData($status = Integration::STATUS_INACTIVE)
+    {
+        $integrationData = [
+            'name' => $this->config->getConfigDataValue('analytics/integration_name'),
+            'status' => $status,
+            'all_resources' => false,
+            'resource' => [
+                'Magento_Analytics::analytics',
+                'Magento_Analytics::analytics_api'
+            ],
+        ];
+        return $integrationData;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Link.php b/app/code/Magento/Analytics/Model/Link.php
new file mode 100644
index 0000000000000..7bb11eda2cc8b
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Link.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Analytics\Api\Data\LinkInterface;
+
+/**
+ * Represents link with collected data and initialized vector for decryption.
+ */
+class Link implements LinkInterface
+{
+    /**
+     * @var string
+     */
+    private $url;
+
+    /**
+     * @var string
+     */
+    private $initializationVector;
+
+    /**
+     * @param string $url
+     * @param string $initializationVector
+     */
+    public function __construct($url, $initializationVector)
+    {
+        $this->url = $url;
+        $this->initializationVector = $initializationVector;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInitializationVector()
+    {
+        return $this->initializationVector;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/LinkProvider.php b/app/code/Magento/Analytics/Model/LinkProvider.php
new file mode 100644
index 0000000000000..2474653f4916c
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/LinkProvider.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Analytics\Api\Data\LinkInterfaceFactory;
+use Magento\Analytics\Api\LinkProviderInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provides link to file with collected report data.
+ */
+class LinkProvider implements LinkProviderInterface
+{
+    /**
+     * @var LinkInterfaceFactory
+     */
+    private $linkFactory;
+
+    /**
+     * @var FileInfoManager
+     */
+    private $fileInfoManager;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param LinkInterfaceFactory $linkInterfaceFactory
+     * @param FileInfoManager $fileInfoManager
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        LinkInterfaceFactory $linkFactory,
+        FileInfoManager $fileInfoManager,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->linkFactory = $linkFactory;
+        $this->fileInfoManager = $fileInfoManager;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Returns base url to file according to store configuration
+     *
+     * @param FileInfo $fileInfo
+     * @return string
+     */
+    private function getBaseUrl(FileInfo $fileInfo)
+    {
+        return $this->storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $fileInfo->getPath();
+    }
+
+    /**
+     * Verify is requested file ready
+     *
+     * @param FileInfo $fileInfo
+     * @return bool
+     */
+    private function isFileReady(FileInfo $fileInfo)
+    {
+        return $fileInfo->getPath() && $fileInfo->getInitializationVector();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get()
+    {
+        $fileInfo = $this->fileInfoManager->load();
+        if (!$this->isFileReady($fileInfo)) {
+            throw new NoSuchEntityException(__('File is not ready yet.'));
+        }
+        return $this->linkFactory->create(
+            [
+                'url' => $this->getBaseUrl($fileInfo),
+                'initializationVector' => base64_encode($fileInfo->getInitializationVector())
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/Plugin/BaseUrlConfigPlugin.php b/app/code/Magento/Analytics/Model/Plugin/BaseUrlConfigPlugin.php
new file mode 100644
index 0000000000000..174272614fb19
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/Plugin/BaseUrlConfigPlugin.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Plugin;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Store\Model\Store;
+
+/**
+ * Plugin on Base URL config value AfterSave method.
+ */
+class BaseUrlConfigPlugin
+{
+    /**
+     * @var SubscriptionUpdateHandler
+     */
+    private $subscriptionUpdateHandler;
+
+    /**
+     * @param SubscriptionUpdateHandler $subscriptionUpdateHandler
+     */
+    public function __construct(
+        SubscriptionUpdateHandler $subscriptionUpdateHandler
+    ) {
+        $this->subscriptionUpdateHandler = $subscriptionUpdateHandler;
+    }
+
+    /**
+     * Add additional handling after config value was saved.
+     *
+     * @param Value $subject
+     * @param Value $result
+     * @return Value
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterAfterSave(
+        Value $subject,
+        Value $result
+    ) {
+        if ($this->isPluginApplicable($result)) {
+            $this->subscriptionUpdateHandler->processUrlUpdate($result->getOldValue());
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Value $result
+     * @return bool
+     */
+    private function isPluginApplicable(Value $result)
+    {
+        return $result->isValueChanged()
+            && ($result->getPath() === Store::XML_PATH_SECURE_BASE_URL)
+            && ($result->getScope() === ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/ProviderFactory.php b/app/code/Magento/Analytics/Model/ProviderFactory.php
new file mode 100644
index 0000000000000..421b67ea2b2a2
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ProviderFactory.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for report providers
+ */
+class ProviderFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param string $providerName
+     * @return object
+     */
+    public function create($providerName)
+    {
+        return $this->objectManager->get($providerName);
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/ReportUrlProvider.php b/app/code/Magento/Analytics/Model/ReportUrlProvider.php
new file mode 100644
index 0000000000000..e7fdf6f9e8132
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ReportUrlProvider.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector\OTPRequest;
+use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+
+/**
+ * Provide URL on resource with reports.
+ */
+class ReportUrlProvider
+{
+    /**
+     * Resource for handling MBI token value.
+     *
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * Resource which provide OTP.
+     *
+     * @var OTPRequest
+     */
+    private $otpRequest;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * Path to config value with URL which provide reports.
+     *
+     * @var string
+     */
+    private $urlReportConfigPath = 'analytics/url/report';
+
+    /**
+     * @param AnalyticsToken $analyticsToken
+     * @param OTPRequest $otpRequest
+     * @param ScopeConfigInterface $config
+     * @param FlagManager $flagManager
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        OTPRequest $otpRequest,
+        ScopeConfigInterface $config,
+        FlagManager $flagManager
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->otpRequest = $otpRequest;
+        $this->config = $config;
+        $this->flagManager = $flagManager;
+    }
+
+    /**
+     * Provide URL on resource with reports.
+     *
+     * @return string
+     * @throws SubscriptionUpdateException
+     */
+    public function getUrl()
+    {
+        if ($this->flagManager->getFlagData(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)) {
+            throw new SubscriptionUpdateException(__(
+                'Your Base URL has been changed and your reports are being updated. '
+                . 'Advanced Reporting will be available once this change has been processed. Please try again later.'
+            ));
+        }
+
+        $url = $this->config->getValue($this->urlReportConfigPath);
+        if ($this->analyticsToken->isTokenExist()) {
+            $otp = $this->otpRequest->call();
+            if ($otp) {
+                $query = http_build_query(['otp' => $otp], '', '&');
+                $url .= '?' . $query;
+            }
+        }
+
+        return $url;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/ReportWriter.php b/app/code/Magento/Analytics/Model/ReportWriter.php
new file mode 100644
index 0000000000000..7128658947908
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ReportWriter.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Analytics\ReportXml\DB\ReportValidator;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Writes reports in files in csv format
+ * @inheritdoc
+ */
+class ReportWriter implements ReportWriterInterface
+{
+    /**
+     * File name for error reporting file in archive
+     *
+     * @var string
+     */
+    private $errorsFileName = 'errors.csv';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var ProviderFactory
+     */
+    private $providerFactory;
+
+    /**
+     * @var ReportValidator
+     */
+    private $reportValidator;
+
+    /**
+     * ReportWriter constructor.
+     *
+     * @param ConfigInterface $config
+     * @param ReportValidator $reportValidator
+     * @param ProviderFactory $providerFactory
+     */
+    public function __construct(
+        ConfigInterface $config,
+        ReportValidator $reportValidator,
+        ProviderFactory $providerFactory
+    ) {
+        $this->config = $config;
+        $this->reportValidator = $reportValidator;
+        $this->providerFactory = $providerFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write(WriteInterface $directory, $path)
+    {
+        $errorsList = [];
+        foreach ($this->config->get() as $file) {
+            $provider = reset($file['providers']);
+            if (isset($provider['parameters']['name'])) {
+                $error = $this->reportValidator->validate($provider['parameters']['name']);
+                if ($error) {
+                    $errorsList[] = $error;
+                    continue;
+                }
+            }
+            /** @var  $providerObject */
+            $providerObject = $this->providerFactory->create($provider['class']);
+            $fileName = $provider['parameters'] ? $provider['parameters']['name'] : $provider['name'];
+            $fileFullPath = $path . $fileName . '.csv';
+            $fileData = $providerObject->getReport(...array_values($provider['parameters']));
+            $stream = $directory->openFile($fileFullPath, 'w+');
+            $stream->lock();
+            $headers = [];
+            foreach ($fileData as $row) {
+                if (!$headers) {
+                    $headers = array_keys($row);
+                    $stream->writeCsv($headers);
+                }
+                $stream->writeCsv($row);
+            }
+            $stream->unlock();
+            $stream->close();
+        }
+        if ($errorsList) {
+            $errorStream = $directory->openFile($path . $this->errorsFileName, 'w+');
+            foreach ($errorsList as $error) {
+                $errorStream->lock();
+                $errorStream->writeCsv($error);
+                $errorStream->unlock();
+            }
+            $errorStream->close();
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/ReportWriterInterface.php b/app/code/Magento/Analytics/Model/ReportWriterInterface.php
new file mode 100644
index 0000000000000..a611095a47ae4
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ReportWriterInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Interface ReportWriterInterface
+ *
+ * Writes report files
+ * Executes export of collected data
+ * Iterates registered providers @see etc/analytics.xml
+ * Collects data (to TMP folder)
+ */
+interface ReportWriterInterface
+{
+    /**
+     * Writes report files to provided path
+     *
+     * @param WriteInterface $directory
+     * @param string $path
+     * @return void
+     */
+    public function write(WriteInterface $directory, $path);
+}
diff --git a/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
new file mode 100644
index 0000000000000..fecbf2033c1ba
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\ReportXml;
+
+use Magento\Framework\Module\Manager as ModuleManager;
+
+/**
+ * Iterator for ReportXml modules
+ */
+class ModuleIterator extends \IteratorIterator
+{
+    /**
+     * @var ModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @param ModuleManager $moduleManager
+     * @param \Traversable $iterator
+     */
+    public function __construct(
+        ModuleManager $moduleManager,
+        \Traversable $iterator
+    ) {
+        parent::__construct($iterator);
+        $this->moduleManager = $moduleManager;
+    }
+
+    /**
+     * Returns module with module status
+     *
+     * @return array
+     */
+    public function current()
+    {
+        $current = parent::current();
+        if (is_array($current) && isset($current['module_name'])) {
+            $current['status'] =
+                $this->moduleManager->isEnabled($current['module_name']) == 1 ? 'Enabled' : "Disabled";
+        }
+        return $current;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php b/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php
new file mode 100644
index 0000000000000..d010aeb19106d
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provides config data report
+ */
+class StoreConfigurationProvider
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var string[]
+     */
+    private $configPaths;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param string[] $configPaths
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        array $configPaths
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->configPaths = $configPaths;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Generates report using config paths from di.xml
+     * For each website and store
+     * @return \IteratorIterator
+     */
+    public function getReport()
+    {
+        $configReport = $this->generateReportForScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, 0);
+
+        /** @var WebsiteInterface $website */
+        foreach ($this->storeManager->getWebsites() as $website) {
+            $configReport = array_merge(
+                $this->generateReportForScope(ScopeInterface::SCOPE_WEBSITES, $website->getId()),
+                $configReport
+            );
+        }
+
+        /** @var StoreInterface $store */
+        foreach ($this->storeManager->getStores() as $store) {
+            $configReport = array_merge(
+                $this->generateReportForScope(ScopeInterface::SCOPE_STORES, $store->getId()),
+                $configReport
+            );
+        }
+        return new \IteratorIterator(new \ArrayIterator($configReport));
+    }
+
+    /**
+     * Creates report from config for scope type and scope id.
+     *
+     * @param string $scope
+     * @param int $scopeId
+     * @return array
+     */
+    private function generateReportForScope($scope, $scopeId)
+    {
+        $report = [];
+        foreach ($this->configPaths as $configPath) {
+            $report[] = [
+                "config_path" => $configPath,
+                "scope" => $scope,
+                "scope_id" => $scopeId,
+                "value" => $this->scopeConfig->getValue(
+                    $configPath,
+                    $scope,
+                    $scopeId
+                )
+            ];
+        }
+        return $report;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/SubscriptionStatusProvider.php b/app/code/Magento/Analytics/Model/SubscriptionStatusProvider.php
new file mode 100644
index 0000000000000..1dd831a672faa
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/SubscriptionStatusProvider.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+
+/**
+ * Provider of subscription status.
+ */
+class SubscriptionStatusProvider
+{
+    /**
+     * Represents an enabled subscription state.
+     */
+    const ENABLED = "Enabled";
+
+    /**
+     * Represents a failed subscription state.
+     */
+    const FAILED = "Failed";
+
+    /**
+     * Represents a pending subscription state.
+     */
+    const PENDING = "Pending";
+
+    /**
+     * Represents a disabled subscription state.
+     */
+    const DISABLED = "Disabled";
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param AnalyticsToken $analyticsToken
+     * @param FlagManager $flagManager
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        AnalyticsToken $analyticsToken,
+        FlagManager $flagManager
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->analyticsToken = $analyticsToken;
+        $this->flagManager = $flagManager;
+    }
+
+    /**
+     * Retrieve subscription status to Magento BI Advanced Reporting.
+     *
+     * Statuses:
+     * Enabled - if subscription is enabled and MA token was received;
+     * Pending - if subscription is enabled and MA token was not received;
+     * Disabled - if subscription is not enabled.
+     * Failed - if subscription is enabled and token was not received after attempts ended.
+     *
+     * @return string
+     */
+    public function getStatus()
+    {
+        $isSubscriptionEnabledInConfig = $this->scopeConfig->getValue('analytics/subscription/enabled');
+        if ($isSubscriptionEnabledInConfig) {
+            return $this->getStatusForEnabledSubscription();
+        }
+
+        return $this->getStatusForDisabledSubscription();
+    }
+
+    /**
+     * Retrieve status for subscription that enabled in config.
+     *
+     * @return string
+     */
+    public function getStatusForEnabledSubscription()
+    {
+        $status = static::ENABLED;
+        if ($this->flagManager->getFlagData(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)) {
+            $status = self::PENDING;
+        }
+
+        if (!$this->analyticsToken->isTokenExist()) {
+            $status = static::PENDING;
+            if ($this->flagManager->getFlagData(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE) === null) {
+                $status = static::FAILED;
+            }
+        }
+
+        return $status;
+    }
+
+    /**
+     * Retrieve status for subscription that disabled in config.
+     *
+     * @return string
+     */
+    public function getStatusForDisabledSubscription()
+    {
+        return static::DISABLED;
+    }
+}
diff --git a/app/code/Magento/Analytics/Model/System/Message/NotificationAboutFailedSubscription.php b/app/code/Magento/Analytics/Model/System/Message/NotificationAboutFailedSubscription.php
new file mode 100644
index 0000000000000..a30168202cac7
--- /dev/null
+++ b/app/code/Magento/Analytics/Model/System/Message/NotificationAboutFailedSubscription.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\System\Message;
+
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Framework\Notification\MessageInterface;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Represents an analytics notification about failed subscription.
+ */
+class NotificationAboutFailedSubscription implements MessageInterface
+{
+    /**
+     * @var SubscriptionStatusProvider
+     */
+    private $subscriptionStatusProvider;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param SubscriptionStatusProvider $subscriptionStatusProvider
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(SubscriptionStatusProvider $subscriptionStatusProvider, UrlInterface $urlBuilder)
+    {
+        $this->subscriptionStatusProvider = $subscriptionStatusProvider;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @codeCoverageIgnore
+     */
+    public function getIdentity()
+    {
+        return hash('sha256', 'ANALYTICS_NOTIFICATION');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisplayed()
+    {
+        return $this->subscriptionStatusProvider->getStatus() === SubscriptionStatusProvider::FAILED;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getText()
+    {
+        $messageDetails = '';
+
+        $messageDetails .= __('Failed to synchronize data to the Magento Business Intelligence service. ');
+        $messageDetails .= '<a href="' . $this->urlBuilder->getUrl('analytics/subscription/retry') . '">'
+            . __('Retry Synchronization') . '</a>';
+
+        return $messageDetails;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @codeCoverageIgnore
+     */
+    public function getSeverity()
+    {
+        return self::SEVERITY_MAJOR;
+    }
+}
diff --git a/app/code/Magento/Analytics/README.md b/app/code/Magento/Analytics/README.md
new file mode 100644
index 0000000000000..7ec64abcd9b86
--- /dev/null
+++ b/app/code/Magento/Analytics/README.md
@@ -0,0 +1,41 @@
+# Magento_Analytics Module
+
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
+
+The module implements the following functionality:
+
+* enabling subscription to the MBI and automatic re-subscription
+* changing the base URL with the same MBI account remained
+* declaring the configuration schemas for report data collection
+* collecting the Magento instance data as reports for the MBI
+* introducing API that provides the collected data
+* extending Magento configuration with the module parameters:
+    * subscription status (enabled/disabled)
+    * industry (a business area in which the instance website works)
+    * time of data collection (time of the day when the module collects data)
+
+## Structure
+
+Beyond the [usual module file structure](http://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
+[Report XML](http://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
+The language declares SQL queries using XML declaration.
+
+## Subscription Process
+
+The subscription to the MBI service is enabled during the installation process of the Analytics module. Each administrator will be notified of these new features upon their initial login to the Admin Panel.
+
+## Analytics Settings
+
+Configuration settings for the Analytics module can be modified in the Admin Panel on the Stores > Configuration page under the General > Advanced Reporting tab.
+
+The following options can be adjusted:
+* Advanced Reporting Service (Enabled/Disabled)
+    * Alters the status of the Advanced Reporting subscription
+* Time of day to send data (Hour/Minute/Second in the store's time zone)
+    * Defines when the data collection process for the Advanced Reporting service occurs
+* Industry
+    * Defines the industry of the store in order to create a personalized Advanced Reporting experience
+
+## Extensibility
+
+We do not recommend to extend the Magento_Analytics module. It introduces an API that is purposed to transfer the collected data. Note that the API cannot be used for other needs.
diff --git a/app/code/Magento/Analytics/ReportXml/Config.php b/app/code/Magento/Analytics/ReportXml/Config.php
new file mode 100644
index 0000000000000..1edf4ef6e212e
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/Config.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Framework\Config\DataInterface;
+
+/**
+ * Config of ReportXml
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @var DataInterface
+     */
+    private $data;
+
+    /**
+     * Config constructor.
+     *
+     * @param DataInterface $data
+     */
+    public function __construct(
+        DataInterface $data
+    ) {
+        $this->data = $data;
+    }
+
+    /**
+     * Returns config value by name
+     *
+     * @param string $queryName
+     * @return array
+     */
+    public function get($queryName)
+    {
+        return $this->data->get($queryName);
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/Config/Converter/Xml.php b/app/code/Magento/Analytics/ReportXml/Config/Converter/Xml.php
new file mode 100644
index 0000000000000..9e0b20a6ad414
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/Config/Converter/Xml.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\Config\Converter;
+
+use Magento\Framework\Config\ConverterInterface;
+
+/**
+ * A converter of reports configuration.
+ *
+ * Converts configuration data stored in XML format into corresponding PHP array.
+ */
+class Xml implements ConverterInterface
+{
+    /**
+     * Converts XML node into corresponding array.
+     *
+     * @param \DOMNode $source
+     * @return array|string
+     */
+    private function convertNode(\DOMNode $source)
+    {
+        $result = [];
+        if ($source->hasAttributes()) {
+            $attrs = $source->attributes;
+            foreach ($attrs as $attr) {
+                $result[$attr->name] = $attr->value;
+            }
+        }
+        if ($source->hasChildNodes()) {
+            $children = $source->childNodes;
+            if ($children->length == 1) {
+                $child = $children->item(0);
+                if ($child->nodeType == XML_TEXT_NODE) {
+                    $result['_value'] = $child->nodeValue;
+                    return count($result) == 1 ? $result['_value'] : $result;
+                }
+            }
+            foreach ($children as $child) {
+                if ($child instanceof \DOMCharacterData) {
+                    continue;
+                }
+                $result[$child->nodeName][] = $this->convertNode($child);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Converts XML document into corresponding array.
+     *
+     * @param \DOMDocument $source
+     * @return array
+     */
+    public function convert($source)
+    {
+        return $this->convertNode($source);
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/Config/Mapper.php b/app/code/Magento/Analytics/ReportXml/Config/Mapper.php
new file mode 100644
index 0000000000000..4dda8f3c733a6
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/Config/Mapper.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\Config;
+
+/**
+ * A reports configuration mapper.
+ *
+ * Transforms configuration data to improve its usability.
+ *
+ * @see usage examples in \Magento\Analytics\ReportXml\Config\Reader
+ */
+class Mapper
+{
+    /**
+     * Transforms configuration data.
+     *
+     * @param array $configData
+     * @return array
+     */
+    public function execute($configData)
+    {
+        if (!isset($configData['config'][0]['report'])) {
+            return [];
+        }
+
+        $queries = [];
+        foreach ($configData['config'][0]['report'] as $queryData) {
+            $entityData = array_shift($queryData['source']);
+            $queries[$queryData['name']] = $queryData;
+            $queries[$queryData['name']]['source'] = $entityData;
+        }
+        return $queries;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/Config/Reader.php b/app/code/Magento/Analytics/ReportXml/Config/Reader.php
new file mode 100644
index 0000000000000..3e0bc3cb5c796
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/Config/Reader.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\Config;
+
+use Magento\Framework\Config\ReaderInterface;
+
+/**
+ * A composite reader of reports configuration.
+ *
+ * Reads configuration data using declared readers.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * A list of declared readers.
+     *
+     * The list may be configured in each module via '/etc/di.xml'.
+     *
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @var Mapper
+     */
+    private $mapper;
+
+    /**
+     * @param Mapper $mapper
+     * @param array $readers
+     */
+    public function __construct(
+        Mapper $mapper,
+        $readers = []
+    ) {
+        $this->readers = $readers;
+        $this->mapper = $mapper;
+    }
+
+    /**
+     * Reads configuration according to the given scope.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $data = [];
+        foreach ($this->readers as $reader) {
+            $data = array_merge_recursive($data, $reader->read($scope));
+        }
+        return $this->mapper->execute($data);
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/ConfigInterface.php b/app/code/Magento/Analytics/ReportXml/ConfigInterface.php
new file mode 100644
index 0000000000000..ec03ddf429c06
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/ConfigInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml;
+
+/**
+ * Interface ConfigInterface
+ *
+ * Interface for ReportXml Config
+ */
+interface ConfigInterface
+{
+    /**
+     * Config of ReportXml
+     *
+     * @param string $queryName
+     * @return array
+     */
+    public function get($queryName);
+}
diff --git a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
new file mode 100644
index 0000000000000..432d011e593ec
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Creates connection instance for export according to existing one
+ * This connection does not use buffered statement, also this connection is not persistent
+ */
+class ConnectionFactory
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Creates one-time connection for export
+     *
+     * @param string $connectionName
+     * @return AdapterInterface
+     */
+    public function getConnection($connectionName)
+    {
+        $connection = $this->resourceConnection->getConnection($connectionName);
+        $connectionClassName = get_class($connection);
+        $configData = $connection->getConfig();
+        $configData['use_buffered_query'] = false;
+        unset($configData['persistent']);
+        return $this->objectManager->create(
+            $connectionClassName,
+            [
+                'config' => $configData
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/AssemblerInterface.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/AssemblerInterface.php
new file mode 100644
index 0000000000000..083b4843c185a
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/AssemblerInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\DB\Assembler;
+
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+
+/**
+ * Interface AssemblerInterface
+ *
+ * Introduces family of SQL assemblers
+ * Each assembler populates SelectBuilder with config information
+ * @see usage examples at \Magento\Analytics\ReportXml\QueryFactory
+ */
+interface AssemblerInterface
+{
+    /**
+     * Assemble SQL statement
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param array $queryConfig
+     * @return SelectBuilder
+     */
+    public function assemble(SelectBuilder $selectBuilder, $queryConfig);
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php
new file mode 100644
index 0000000000000..aa399bf8425e1
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml\DB\Assembler;
+
+use Magento\Analytics\ReportXml\DB\NameResolver;
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Analytics\ReportXml\DB\ConditionResolver;
+
+/**
+ * Assembles WHERE conditions
+ */
+class FilterAssembler implements AssemblerInterface
+{
+    /**
+     * @var ConditionResolver
+     */
+    private $conditionResolver;
+
+    /**
+     * @var NameResolver
+     */
+    private $nameResolver;
+
+    /**
+     * FilterAssembler constructor.
+     *
+     * @param ConditionResolver $conditionResolver
+     * @param NameResolver $nameResolver
+     */
+    public function __construct(
+        ConditionResolver $conditionResolver,
+        NameResolver $nameResolver
+    ) {
+        $this->conditionResolver = $conditionResolver;
+        $this->nameResolver = $nameResolver;
+    }
+
+    /**
+     * Assembles WHERE conditions
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param array $queryConfig
+     * @return SelectBuilder
+     */
+    public function assemble(SelectBuilder $selectBuilder, $queryConfig)
+    {
+        if (!isset($queryConfig['source']['filter'])) {
+            return $selectBuilder;
+        }
+        $filters = $this->conditionResolver->getFilter(
+            $selectBuilder,
+            $queryConfig['source']['filter'],
+            $this->nameResolver->getAlias($queryConfig['source'])
+        );
+        $selectBuilder->setFilters(array_merge_recursive($selectBuilder->getFilters(), [$filters]));
+        return $selectBuilder;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php
new file mode 100644
index 0000000000000..811119ace221b
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml\DB\Assembler;
+
+use Magento\Analytics\ReportXml\DB\ColumnsResolver;
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Analytics\ReportXml\DB\NameResolver;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Assembles FROM condition
+ */
+class FromAssembler implements AssemblerInterface
+{
+    /**
+     * @var NameResolver
+     */
+    private $nameResolver;
+
+    /**
+     * @var ColumnsResolver
+     */
+    private $columnsResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param NameResolver $nameResolver
+     * @param ColumnsResolver $columnsResolver
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        NameResolver $nameResolver,
+        ColumnsResolver $columnsResolver,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->nameResolver = $nameResolver;
+        $this->columnsResolver = $columnsResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Assembles FROM condition
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param array $queryConfig
+     * @return SelectBuilder
+     */
+    public function assemble(SelectBuilder $selectBuilder, $queryConfig)
+    {
+        $selectBuilder->setFrom(
+            [
+                $this->nameResolver->getAlias($queryConfig['source']) =>
+                    $this->resourceConnection
+                        ->getTableName($this->nameResolver->getName($queryConfig['source'])),
+            ]
+        );
+        $columns = $this->columnsResolver->getColumns($selectBuilder, $queryConfig['source']);
+        $selectBuilder->setColumns(array_merge($selectBuilder->getColumns(), $columns));
+        return $selectBuilder;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php
new file mode 100644
index 0000000000000..82a06f824d468
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml\DB\Assembler;
+
+use Magento\Analytics\ReportXml\DB\NameResolver;
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Analytics\ReportXml\DB\ConditionResolver;
+use Magento\Analytics\ReportXml\DB\ColumnsResolver;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Assembles JOIN conditions
+ */
+class JoinAssembler implements AssemblerInterface
+{
+    /**
+     * @var ConditionResolver
+     */
+    private $conditionResolver;
+
+    /**
+     * @var NameResolver
+     */
+    private $nameResolver;
+
+    /**
+     * @var ColumnsResolver
+     */
+    private $columnsResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ConditionResolver $conditionResolver
+     * @param ColumnsResolver $columnsResolver
+     * @param NameResolver $nameResolver
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ConditionResolver $conditionResolver,
+        ColumnsResolver $columnsResolver,
+        NameResolver $nameResolver,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->conditionResolver = $conditionResolver;
+        $this->nameResolver = $nameResolver;
+        $this->columnsResolver = $columnsResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Assembles JOIN conditions
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param array $queryConfig
+     * @return SelectBuilder
+     */
+    public function assemble(SelectBuilder $selectBuilder, $queryConfig)
+    {
+        if (!isset($queryConfig['source']['link-source'])) {
+            return $selectBuilder;
+        }
+        $joins = [];
+        $filters = $selectBuilder->getFilters();
+
+        $sourceAlias = $this->nameResolver->getAlias($queryConfig['source']);
+
+        foreach ($queryConfig['source']['link-source'] as $join) {
+            $joinAlias = $this->nameResolver->getAlias($join);
+
+            $joins[$joinAlias]  = [
+                'link-type' => isset($join['link-type']) ? $join['link-type'] : 'left',
+                'table' => [
+                    $joinAlias => $this->resourceConnection
+                        ->getTableName($this->nameResolver->getName($join)),
+                ],
+                'condition' => $this->conditionResolver->getFilter(
+                    $selectBuilder,
+                    $join['using'],
+                    $joinAlias,
+                    $sourceAlias
+                )
+            ];
+            if (isset($join['filter'])) {
+                $filters = array_merge(
+                    $filters,
+                    [
+                        $this->conditionResolver->getFilter(
+                            $selectBuilder,
+                            $join['filter'],
+                            $joinAlias,
+                            $sourceAlias
+                        )
+                    ]
+                );
+            }
+            $columns = $this->columnsResolver->getColumns($selectBuilder, isset($join['attribute']) ? $join : []);
+            $selectBuilder->setColumns(array_merge($selectBuilder->getColumns(), $columns));
+        }
+        $selectBuilder->setFilters($filters);
+        $selectBuilder->setJoins(array_merge($selectBuilder->getJoins(), $joins));
+        return $selectBuilder;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
new file mode 100644
index 0000000000000..3af168886a447
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml\DB;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Sql\ColumnValueExpression;
+
+/**
+ * Resolves columns names
+ */
+class ColumnsResolver
+{
+    /**
+     * @var NameResolver
+     */
+    private $nameResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * ColumnsResolver constructor.
+     *
+     * @param NameResolver $nameResolver
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        NameResolver $nameResolver,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->nameResolver = $nameResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Returns connection
+     *
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (!$this->connection) {
+            $this->connection = $this->resourceConnection->getConnection();
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Set columns list to SelectBuilder
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param array $entityConfig
+     * @return array
+     */
+    public function getColumns(SelectBuilder $selectBuilder, $entityConfig)
+    {
+        if (!isset($entityConfig['attribute'])) {
+            return [];
+        }
+        $group = [];
+        $columns = $selectBuilder->getColumns();
+        foreach ($entityConfig['attribute'] as $attributeData) {
+            $columnAlias = $this->nameResolver->getAlias($attributeData);
+            $tableAlias = $this->nameResolver->getAlias($entityConfig);
+            $columnName = $this->nameResolver->getName($attributeData);
+            if (isset($attributeData['function'])) {
+                $prefix = '';
+                if (!empty($attributeData['distinct'])) {
+                    $prefix = ' DISTINCT ';
+                }
+                $expression = new ColumnValueExpression(
+                    strtoupper($attributeData['function']) . '(' . $prefix
+                    . $this->getConnection()->quoteIdentifier($tableAlias . '.' . $columnName)
+                    . ')'
+                );
+            } else {
+                $expression = $tableAlias . '.' . $columnName;
+            }
+            $columns[$columnAlias] = $expression;
+            if (isset($attributeData['group'])) {
+                $group[$columnAlias] = $expression;
+            }
+        }
+        $selectBuilder->setGroup(array_merge($selectBuilder->getGroup(), $group));
+        return $columns;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php b/app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php
new file mode 100644
index 0000000000000..8ead9ba8ae326
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml\DB;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Sql\Expression;
+
+/**
+ * Mapper for WHERE conditions
+ */
+class ConditionResolver
+{
+    /**
+     * @var array
+     */
+    private $conditionMap = [
+        'eq' => '%1$s = %2$s',
+        'neq' => '%1$s != %2$s',
+        'like' => '%1$s LIKE %2$s',
+        'nlike' => '%1$s NOT LIKE %2$s',
+        'in' => '%1$s IN(%2$s)',
+        'nin' => '%1$s NOT IN(%2$s)',
+        'notnull' => '%1$s IS NOT NULL',
+        'null' => '%1$s IS NULL',
+        'gt' => '%1$s > %2$s',
+        'lt' => '%1$s < %2$s',
+        'gteq' => '%1$s >= %2$s',
+        'lteq' => '%1$s <= %2$s',
+        'finset' => 'FIND_IN_SET(%2$s, %1$s)'
+    ];
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * ConditionResolver constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Returns connection
+     *
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (!$this->connection) {
+            $this->connection = $this->resourceConnection->getConnection();
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Returns value for condition
+     *
+     * @param string $condition
+     * @param string $referencedEntity
+     * @return mixed|null|string|\Zend_Db_Expr
+     */
+    private function getValue($condition, $referencedEntity)
+    {
+        $value = null;
+        $argument = isset($condition['_value']) ? $condition['_value'] : null;
+        if (!isset($condition['type'])) {
+            $condition['type'] = 'value';
+        }
+
+        switch ($condition['type']) {
+            case "value":
+                $value = $this->getConnection()->quote($argument);
+                break;
+            case "variable":
+                $value = new Expression($argument);
+                break;
+            case "identifier":
+                $value = $this->getConnection()->quoteIdentifier(
+                    $referencedEntity ? $referencedEntity . '.' . $argument : $argument
+                );
+                break;
+        }
+        return $value;
+    }
+
+    /**
+     * Returns condition for WHERE
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param string $tableName
+     * @param array $condition
+     * @param null|string $referencedEntity
+     * @return string
+     */
+    private function getCondition(SelectBuilder $selectBuilder, $tableName, $condition, $referencedEntity = null)
+    {
+        $columns = $selectBuilder->getColumns();
+        if (isset($columns[$condition['attribute']])
+            && $columns[$condition['attribute']] instanceof Expression
+        ) {
+            $expression = $columns[$condition['attribute']];
+        } else {
+            $expression = $this->getConnection()->quoteIdentifier($tableName . '.' . $condition['attribute']);
+        }
+        return sprintf(
+            $this->conditionMap[$condition['operator']],
+            $expression,
+            $this->getValue($condition, $referencedEntity)
+        );
+    }
+
+    /**
+     * Build WHERE condition
+     *
+     * @param SelectBuilder $selectBuilder
+     * @param array $filterConfig
+     * @param string $aliasName
+     * @param null|string $referencedAlias
+     * @return array
+     */
+    public function getFilter(SelectBuilder $selectBuilder, $filterConfig, $aliasName, $referencedAlias = null)
+    {
+        $filtersParts = [];
+        foreach ($filterConfig as $filter) {
+            $glue = $filter['glue'];
+            $parts = [];
+            foreach ($filter['condition'] as $condition) {
+                if (isset($condition['type']) && $condition['type'] == 'variable') {
+                    $selectBuilder->setParams(array_merge($selectBuilder->getParams(), [$condition['_value']]));
+                }
+                $parts[] = $this->getCondition(
+                    $selectBuilder,
+                    $aliasName,
+                    $condition,
+                    $referencedAlias
+                );
+            }
+            if (isset($filter['filter'])) {
+                $parts[] = '(' . $this->getFilter(
+                    $selectBuilder,
+                    $filter['filter'],
+                    $aliasName,
+                    $referencedAlias
+                ) . ')';
+            }
+            $filtersParts[] = '(' . implode(' ' . strtoupper($glue) . ' ', $parts) . ')';
+        }
+        return implode(' OR ', $filtersParts);
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/NameResolver.php b/app/code/Magento/Analytics/ReportXml/DB/NameResolver.php
new file mode 100644
index 0000000000000..dc09391b69b31
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/NameResolver.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\DB;
+
+/**
+ * Resolver for source names
+ */
+class NameResolver
+{
+    /**
+     * Returns element for name
+     *
+     * @param array $elementConfig
+     * @return string
+     */
+    public function getName($elementConfig)
+    {
+        return $elementConfig['name'];
+    }
+
+    /**
+     * Returns alias
+     *
+     * @param array $elementConfig
+     * @return string
+     */
+    public function getAlias($elementConfig)
+    {
+        $alias = $this->getName($elementConfig);
+        if (isset($elementConfig['alias'])) {
+            $alias = $elementConfig['alias'];
+        }
+        return $alias;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/ReportValidator.php b/app/code/Magento/Analytics/ReportXml/DB/ReportValidator.php
new file mode 100644
index 0000000000000..4c8b9fa3c2e83
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/ReportValidator.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\DB;
+
+use Magento\Analytics\ReportXml\ConnectionFactory;
+use Magento\Analytics\ReportXml\QueryFactory;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Validates report definitions by doing query to storage with limit 0
+ */
+class ReportValidator
+{
+    /**
+     * @var ConnectionFactory
+     */
+    private $connectionFactory;
+
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * ReportValidator constructor.
+     *
+     * Needs connection and query factory for do a query
+     *
+     * @param ConnectionFactory $connectionFactory
+     * @param QueryFactory $queryFactory
+     */
+    public function __construct(ConnectionFactory $connectionFactory, QueryFactory $queryFactory)
+    {
+        $this->connectionFactory = $connectionFactory;
+        $this->queryFactory = $queryFactory;
+    }
+
+    /**
+     * Tries to do query for provided report with limit 0 and return error information if it failed
+     *
+     * @param string $name
+     * @param SearchCriteriaInterface $criteria
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function validate($name, SearchCriteriaInterface $criteria = null)
+    {
+        $query = $this->queryFactory->create($name);
+        $connection = $this->connectionFactory->getConnection($query->getConnectionName());
+        $query->getSelect()->limit(0);
+        try {
+            $connection->query($query->getSelect());
+        } catch (\Zend_Db_Statement_Exception $e) {
+            return [$name, $e->getMessage()];
+        }
+
+        return [];
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php b/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php
new file mode 100644
index 0000000000000..b4b7adebf7459
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml\DB;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+
+/**
+ * Responsible for Select object creation, works as a builder. Returns Select as result;
+ *
+ * Used in SQL assemblers.
+ */
+class SelectBuilder
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var array
+     */
+    private $from;
+
+    /**
+     * @var array
+     */
+    private $group = [];
+
+    /**
+     * @var array
+     */
+    private $columns = [];
+
+    /**
+     * @var array
+     */
+    private $filters = [];
+
+    /**
+     * @var array
+     */
+    private $joins = [];
+
+    /**
+     * @var array
+     */
+    private $params = [];
+
+    /**
+     * @var array
+     */
+    private $having = [];
+
+    /**
+     * SelectBuilder constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Get join condition
+     *
+     * @return array
+     */
+    public function getJoins()
+    {
+        return $this->joins;
+    }
+
+    /**
+     * Set joins conditions
+     *
+     * @param array $joins
+     * @return $this
+     */
+    public function setJoins($joins)
+    {
+        $this->joins = $joins;
+
+        return $this;
+    }
+
+    /**
+     * Get connection name
+     *
+     * @return string
+     */
+    public function getConnectionName()
+    {
+        return $this->connectionName;
+    }
+
+    /**
+     * Set connection name
+     *
+     * @param string $connectionName
+     * @return $this
+     */
+    public function setConnectionName($connectionName)
+    {
+        $this->connectionName = $connectionName;
+
+        return $this;
+    }
+
+    /**
+     * Get columns
+     *
+     * @return array
+     */
+    public function getColumns()
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Set columns
+     *
+     * @param array $columns
+     * @return $this
+     */
+    public function setColumns($columns)
+    {
+        $this->columns = $columns;
+
+        return $this;
+    }
+
+    /**
+     * Get filters
+     *
+     * @return array
+     */
+    public function getFilters()
+    {
+        return $this->filters;
+    }
+
+    /**
+     * Set filters
+     *
+     * @param array $filters
+     * @return $this
+     */
+    public function setFilters($filters)
+    {
+        $this->filters = $filters;
+
+        return $this;
+    }
+
+    /**
+     * Get from condition
+     *
+     * @return array
+     */
+    public function getFrom()
+    {
+        return $this->from;
+    }
+
+    /**
+     * Set from condition
+     *
+     * @param array $from
+     * @return $this
+     */
+    public function setFrom($from)
+    {
+        $this->from = $from;
+
+        return $this;
+    }
+
+    /**
+     * Process JOIN conditions
+     *
+     * @param Select $select
+     * @param array $joinConfig
+     * @return Select
+     */
+    private function processJoin(Select $select, $joinConfig)
+    {
+        switch ($joinConfig['link-type']) {
+            case 'left':
+                $select->joinLeft($joinConfig['table'], $joinConfig['condition'], []);
+                break;
+            case 'inner':
+                $select->joinInner($joinConfig['table'], $joinConfig['condition'], []);
+                break;
+            case 'right':
+                $select->joinRight($joinConfig['table'], $joinConfig['condition'], []);
+                break;
+        }
+        return $select;
+    }
+
+    /**
+     * Creates Select object
+     *
+     * @return Select
+     */
+    public function create()
+    {
+        $connection = $this->resourceConnection->getConnection($this->getConnectionName());
+        $select = $connection->select();
+        $select->from($this->getFrom(), []);
+        $select->columns($this->getColumns());
+        foreach ($this->getFilters() as $filter) {
+            $select->where($filter);
+        }
+        foreach ($this->getJoins() as $joinConfig) {
+            $select = $this->processJoin($select, $joinConfig);
+        }
+        if (!empty($this->getGroup())) {
+            $select->group(implode(', ', $this->getGroup()));
+        }
+        return $select;
+    }
+
+    /**
+     * Returns group
+     *
+     * @return array
+     */
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
+    /**
+     * Set group
+     *
+     * @param array $group
+     * @return $this
+     */
+    public function setGroup($group)
+    {
+        $this->group = $group;
+
+        return $this;
+    }
+
+    /**
+     * Get parameters
+     *
+     * @return array
+     */
+    public function getParams()
+    {
+        return $this->params;
+    }
+
+    /**
+     * Set parameters
+     *
+     * @param array $params
+     * @return $this
+     */
+    public function setParams($params)
+    {
+        $this->params = $params;
+
+        return $this;
+    }
+
+    /**
+     * Get having condition
+     *
+     * @return array
+     */
+    public function getHaving()
+    {
+        return $this->having;
+    }
+
+    /**
+     * Set having condition
+     *
+     * @param array $having
+     * @return $this
+     */
+    public function setHaving($having)
+    {
+        $this->having = $having;
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/DB/SelectBuilderFactory.php b/app/code/Magento/Analytics/ReportXml/DB/SelectBuilderFactory.php
new file mode 100644
index 0000000000000..1d88d4618efc5
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/DB/SelectBuilderFactory.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml\DB;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory class for @see \Magento\Analytics\ReportXml\DB\SelectBuilder
+ */
+class SelectBuilderFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * SelectBuilderFactory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return SelectBuilder
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create(SelectBuilder::class, $data);
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/IteratorFactory.php b/app/code/Magento/Analytics/ReportXml/IteratorFactory.php
new file mode 100644
index 0000000000000..0556cf4569dc4
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/IteratorFactory.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory to create a result iterator
+ */
+class IteratorFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $defaultIteratorName;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param string $defaultIteratorName
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $defaultIteratorName = \IteratorIterator::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->defaultIteratorName = $defaultIteratorName;
+    }
+
+    /**
+     * Creates instance of the result iterator with the query result as an input
+     * Result iterator can be changed through report configuration
+     * <report name="reportName" iterator="Iterator\Class\Name">
+     *     < ...
+     * </report>
+     * Uses IteratorIterator by default
+     *
+     * @param \Traversable $result
+     * @param string|null $iteratorName
+     * @return \IteratorIterator
+     */
+    public function create(\Traversable $result, $iteratorName = null)
+    {
+        return $this->objectManager->create(
+            $iteratorName ?: $this->defaultIteratorName,
+            [
+                'iterator' => $result
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/Query.php b/app/code/Magento/Analytics/ReportXml/Query.php
new file mode 100644
index 0000000000000..edf5ed08ee55f
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/Query.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Framework\DB\Select;
+
+/**
+ * Query object, contains SQL statement, information about connection, query arguments
+ */
+class Query implements \JsonSerializable
+{
+    /**
+     * @var Select
+     */
+    private $select;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\SelectHydrator
+     */
+    private $selectHydrator;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var array
+     */
+    private $config;
+
+    /**
+     * Query constructor.
+     *
+     * @param Select $select
+     * @param SelectHydrator $selectHydrator
+     * @param string $connectionName
+     * @param array $config
+     */
+    public function __construct(
+        Select $select,
+        SelectHydrator $selectHydrator,
+        $connectionName,
+        $config
+    ) {
+        $this->select = $select;
+        $this->connectionName = $connectionName;
+        $this->selectHydrator = $selectHydrator;
+        $this->config = $config;
+    }
+
+    /**
+     * @return Select
+     */
+    public function getSelect()
+    {
+        return $this->select;
+    }
+
+    /**
+     * @return string
+     */
+    public function getConnectionName()
+    {
+        return $this->connectionName;
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    public function jsonSerialize()
+    {
+        return [
+            'connectionName' => $this->getConnectionName(),
+            'select_parts' => $this->selectHydrator->extract($this->getSelect()),
+            'config' => $this->getConfig()
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/QueryFactory.php b/app/code/Magento/Analytics/ReportXml/QueryFactory.php
new file mode 100644
index 0000000000000..5da7adf794215
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/QueryFactory.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Analytics\ReportXml\DB\SelectBuilderFactory;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Creates Query object according to configuration
+ * Factory for @see \Magento\Analytics\ReportXml\Query
+ */
+class QueryFactory
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var SelectBuilderFactory
+     */
+    private $selectBuilderFactory;
+
+    /**
+     * @var DB\Assembler\AssemblerInterface[]
+     */
+    private $assemblers;
+
+    /**
+     * @var CacheInterface
+     */
+    private $queryCache;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var SelectHydrator
+     */
+    private $selectHydrator;
+
+    /**
+     * QueryFactory constructor.
+     *
+     * @param CacheInterface $queryCache
+     * @param SelectHydrator $selectHydrator
+     * @param ObjectManagerInterface $objectManager
+     * @param SelectBuilderFactory $selectBuilderFactory
+     * @param Config $config
+     * @param array $assemblers
+     */
+    public function __construct(
+        CacheInterface $queryCache,
+        SelectHydrator $selectHydrator,
+        ObjectManagerInterface $objectManager,
+        SelectBuilderFactory $selectBuilderFactory,
+        Config $config,
+        array $assemblers
+    ) {
+        $this->config = $config;
+        $this->selectBuilderFactory = $selectBuilderFactory;
+        $this->assemblers = $assemblers;
+        $this->queryCache = $queryCache;
+        $this->objectManager = $objectManager;
+        $this->selectHydrator = $selectHydrator;
+    }
+
+    /**
+     * Returns query connection name according to configuration
+     *
+     * @param string $queryConfig
+     * @return string
+     */
+    private function getQueryConnectionName($queryConfig)
+    {
+        $connectionName = 'default';
+        if (isset($queryConfig['connection'])) {
+            $connectionName = $queryConfig['connection'];
+        }
+        return $connectionName;
+    }
+
+    /**
+     * Create query according to configuration settings
+     *
+     * @param string $queryName
+     * @return Query
+     */
+    private function constructQuery($queryName)
+    {
+        $queryConfig = $this->config->get($queryName);
+        $selectBuilder = $this->selectBuilderFactory->create();
+        $selectBuilder->setConnectionName($this->getQueryConnectionName($queryConfig));
+        foreach ($this->assemblers as $assembler) {
+            $selectBuilder = $assembler->assemble($selectBuilder, $queryConfig);
+        }
+        $select = $selectBuilder->create();
+        return $this->objectManager->create(
+            Query::class,
+            [
+                'select' => $select,
+                'selectHydrator' => $this->selectHydrator,
+                'connectionName' => $selectBuilder->getConnectionName(),
+                'config' => $queryConfig
+            ]
+        );
+    }
+
+    /**
+     * Creates query by name
+     *
+     * @param string $queryName
+     * @return Query
+     */
+    public function create($queryName)
+    {
+        $cached = $this->queryCache->load($queryName);
+        if ($cached) {
+            $queryData = json_decode($cached, true);
+            return $this->objectManager->create(
+                Query::class,
+                [
+                    'select' => $this->selectHydrator->recreate($queryData['select_parts']),
+                    'selectHydrator' => $this->selectHydrator,
+                    'connectionName' => $queryData['connectionName'],
+                    'config' => $queryData['config']
+                ]
+            );
+        }
+        $query = $this->constructQuery($queryName);
+        $this->queryCache->save(json_encode($query), $queryName);
+        return $query;
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
new file mode 100644
index 0000000000000..8966d018dc6b9
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Framework\Api\SearchCriteria;
+
+/**
+ * Providers for reports data
+ */
+class ReportProvider
+{
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @var ConnectionFactory
+     */
+    private $connectionFactory;
+
+    /**
+     * @var IteratorFactory
+     */
+    private $iteratorFactory;
+
+    /**
+     * ReportProvider constructor.
+     *
+     * @param QueryFactory $queryFactory
+     * @param ConnectionFactory $connectionFactory
+     * @param IteratorFactory $iteratorFactory
+     */
+    public function __construct(
+        QueryFactory $queryFactory,
+        ConnectionFactory $connectionFactory,
+        IteratorFactory $iteratorFactory
+    ) {
+        $this->queryFactory = $queryFactory;
+        $this->connectionFactory = $connectionFactory;
+        $this->iteratorFactory = $iteratorFactory;
+    }
+
+    /**
+     * Returns custom iterator name for report
+     * Null for default
+     *
+     * @param Query $query
+     * @return string|null
+     */
+    private function getIteratorName(Query $query)
+    {
+        $config = $query->getConfig();
+        return $config['iterator'] ?? null;
+    }
+
+    /**
+     * Returns report data by name and criteria
+     *
+     * @param string $name
+     * @return \IteratorIterator
+     */
+    public function getReport($name)
+    {
+        $query = $this->queryFactory->create($name);
+        $connection = $this->connectionFactory->getConnection($query->getConnectionName());
+        $statement = $connection->query($query->getSelect());
+        return $this->iteratorFactory->create($statement, $this->getIteratorName($query));
+    }
+}
diff --git a/app/code/Magento/Analytics/ReportXml/SelectHydrator.php b/app/code/Magento/Analytics/ReportXml/SelectHydrator.php
new file mode 100644
index 0000000000000..6dca7e0481e76
--- /dev/null
+++ b/app/code/Magento/Analytics/ReportXml/SelectHydrator.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\ReportXml;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Hydrator for report select parts
+ */
+class SelectHydrator
+{
+    /**
+     * Array of supported Select parts
+     *
+     * @var array
+     */
+    private $predefinedSelectParts =
+        [
+            Select::DISTINCT,
+            Select::COLUMNS,
+            Select::UNION,
+            Select::FROM,
+            Select::WHERE,
+            Select::GROUP,
+            Select::HAVING,
+            Select::ORDER,
+            Select::LIMIT_COUNT,
+            Select::LIMIT_OFFSET,
+            Select::FOR_UPDATE
+        ];
+
+    /**
+     * @var array
+     */
+    private $selectParts;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param ObjectManagerInterface $objectManager
+     * @param array $selectParts
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        ObjectManagerInterface $objectManager,
+        $selectParts = []
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->objectManager = $objectManager;
+        $this->selectParts = $selectParts;
+    }
+
+    /**
+     * @return array
+     */
+    private function getSelectParts()
+    {
+        return array_merge($this->predefinedSelectParts, $this->selectParts);
+    }
+
+    /**
+     * Extracts Select metadata parts
+     *
+     * @param Select $select
+     * @return array
+     * @throws \Zend_Db_Select_Exception
+     */
+    public function extract(Select $select)
+    {
+        $parts = [];
+        foreach ($this->getSelectParts() as $partName) {
+            $parts[$partName] = $select->getPart($partName);
+        }
+        return $parts;
+    }
+
+    /**
+     * @param array $selectParts
+     * @return Select
+     */
+    public function recreate(array $selectParts)
+    {
+        $select = $this->resourceConnection->getConnection()->select();
+
+        $select = $this->processColumns($select, $selectParts);
+
+        foreach ($selectParts as $partName => $partValue) {
+            $select->setPart($partName, $partValue);
+        }
+
+        return $select;
+    }
+
+    /**
+     * Process COLUMNS part values and add this part into select.
+     *
+     * If each column contains information about select expression
+     * an object with the type of this expression going to be created and assigned to this column.
+     *
+     * @param Select $select
+     * @param array $selectParts
+     * @return Select
+     */
+    private function processColumns(Select $select, array &$selectParts)
+    {
+        if (!empty($selectParts[Select::COLUMNS]) && is_array($selectParts[Select::COLUMNS])) {
+            $part = [];
+
+            foreach ($selectParts[Select::COLUMNS] as $columnEntry) {
+                list($correlationName, $column, $alias) = $columnEntry;
+                if (is_array($column) && !empty($column['class'])) {
+                    $expression = $this->objectManager->create(
+                        $column['class'],
+                        isset($column['arguments']) ? $column['arguments'] : []
+                    );
+                    $part[] = [$correlationName, $expression, $alias];
+                } else {
+                    $part[] = $columnEntry;
+                }
+            }
+
+            $select->setPart(Select::COLUMNS, $part);
+            unset($selectParts[Select::COLUMNS]);
+        }
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php b/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php
new file mode 100644
index 0000000000000..a352854a8b77b
--- /dev/null
+++ b/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Setup\Patch\Data;
+
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Initial patch.
+ *
+ * @package Magento\Analytics\Setup\Patch
+ */
+class PrepareInitialConfig implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PrepareInitialConfig constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->insertMultiple(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            [
+                [
+                    'scope' => 'default',
+                    'scope_id' => 0,
+                    'path' => 'analytics/subscription/enabled',
+                    'value' => 1
+                ],
+                [
+                    'scope' => 'default',
+                    'scope_id' => 0,
+                    'path' => SubscriptionHandler::CRON_STRING_PATH,
+                    'value' => join(' ', SubscriptionHandler::CRON_EXPR_ARRAY)
+                ]
+            ]
+        );
+
+        $this->moduleDataSetup->getConnection()->insert(
+            $this->moduleDataSetup->getTable('flag'),
+            [
+                'flag_code' => SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE,
+                'state' => 0,
+                'flag_data' => 24,
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
new file mode 100644
index 0000000000000..83f27def4b4e8
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="adminNoReport" type="user">
+        <data key="username" unique="suffix">noreport</data>
+        <data key="firstname">No</data>
+        <data key="lastname">Report</data>
+        <data key="email" unique="prefix">noreport@example.com</data>
+        <data key="password">123123q</data>
+        <data key="password_confirmation">123123q</data>
+        <data key="interface_local">en_US</data>
+        <data key="is_active">true</data>
+        <data key="current_password">123123q</data>
+    </entity>
+    <entity name="restrictedWebUser" type="user">
+        <data key="username" unique="suffix">restrictedWebUser</data>
+        <data key="firstname">restricted</data>
+        <data key="lastname">webUser</data>
+        <data key="email" unique="prefix">restrictedWebUser@example.com</data>
+        <data key="password">123123q</data>
+        <data key="password_confirmation">123123q</data>
+        <data key="interface_local">en_US</data>
+        <data key="is_active">true</data>
+        <data key="current_password">123123q</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
new file mode 100644
index 0000000000000..099cc71321b84
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="adminNoReportRole" type="user_role">
+        <data key="rolename" unique="suffix">noreport</data>
+        <data key="current_password">123123q</data>
+        <array key="resource">
+            <item>Magento_Backend::dashboard</item>
+            <item>Magento_Sales::sales</item>
+            <item>Magento_Sales::sales_operation</item>
+            <item>Magento_Sales::sales_order</item>
+            <item>Magento_Sales::actions</item>
+            <item>Magento_Sales::create</item>
+            <item>Magento_Sales::actions_view</item>
+            <item>Magento_Sales::email</item>
+            <item>Magento_Sales::reorder</item>
+            <item>Magento_Sales::actions_edit</item>
+            <item>Magento_Sales::cancel</item>
+            <item>Magento_Sales::review_payment</item>
+            <item>Magento_Sales::capture</item>
+            <item>Magento_Sales::invoice</item>
+            <item>Magento_Sales::creditmemo</item>
+            <item>Magento_Sales::hold</item>
+            <item>Magento_Sales::unhold</item>
+            <item>Magento_Sales::ship</item>
+            <item>Magento_Sales::comment</item>
+            <item>Magento_Sales::emails</item>
+            <item>Magento_Sales::sales_invoice</item>
+            <item>Magento_Sales::shipment</item>
+            <item>Magento_Sales::sales_creditmemo</item>
+            <item>Magento_Paypal::billing_agreement</item>
+            <item>Magento_Paypal::billing_agreement_actions</item>
+            <item>Magento_Paypal::billing_agreement_actions_view</item>
+            <item>Magento_Paypal::actions_manage</item>
+            <item>Magento_Paypal::use</item>
+            <item>Magento_Sales::transactions</item>
+            <item>Magento_Sales::transactions_fetch</item>
+            <item>Magento_Catalog::catalog</item>
+            <item>Magento_Catalog::catalog_inventory</item>
+            <item>Magento_Catalog::products</item>
+            <item>Magento_Catalog::categories</item>
+            <item>Magento_Customer::customer</item>
+            <item>Magento_Customer::manage</item>
+            <item>Magento_Customer::online</item>
+            <item>Magento_Cart::cart</item>
+            <item>Magento_Cart::manage</item>
+            <item>Magento_Backend::myaccount</item>
+            <item>Magento_Backend::marketing</item>
+            <item>Magento_CatalogRule::promo</item>
+            <item>Magento_CatalogRule::promo_catalog</item>
+            <item>Magento_SalesRule::quote</item>
+            <item>Magento_Backend::marketing_communications</item>
+            <item>Magento_Email::template</item>
+            <item>Magento_Newsletter::template</item>
+            <item>Magento_Newsletter::queue</item>
+            <item>Magento_Newsletter::subscriber</item>
+            <item>Magento_Backend::marketing_seo</item>
+            <item>Magento_Search::search</item>
+            <item>Magento_Search::synonyms</item>
+            <item>Magento_UrlRewrite::urlrewrite</item>
+            <item>Magento_Sitemap::sitemap</item>
+            <item>Magento_Backend::marketing_user_content</item>
+            <item>Magento_Review::reviews_all</item>
+            <item>Magento_Review::pending</item>
+            <item>Magento_Backend::content</item>
+            <item>Magento_Backend::content_elements</item>
+            <item>Magento_Cms::page</item>
+            <item>Magento_Cms::save</item>
+            <item>Magento_Cms::page_delete</item>
+            <item>Magento_Cms::block</item>
+            <item>Magento_Widget::widget_instance</item>
+            <item>Magento_Cms::media_gallery</item>
+            <item>Magento_Backend::design</item>
+            <item>Magento_Theme::theme</item>
+            <item>Magento_Backend::schedule</item>
+            <item>Magento_Backend::content_translation</item>
+            <item>Magento_Backend::stores</item>
+            <item>Magento_Backend::stores_settings</item>
+            <item>Magento_Backend::store</item>
+            <item>Magento_Config::config</item>
+            <item>Magento_Payment::payment</item>
+            <item>Magento_Cms::config_cms</item>
+            <item>Magento_GoogleAnalytics::google</item>
+            <item>Magento_Downloadable::downloadable</item>
+            <item>Magento_Contact::contact</item>
+            <item>Magento_CatalogInventory::cataloginventory</item>
+            <item>Magento_Payment::payment_services</item>
+            <item>Magento_Newsletter::newsletter</item>
+            <item>Magento_Catalog::config_catalog</item>
+            <item>Magento_CatalogSearch::config_catalog_search</item>
+            <item>Magento_Shipping::config_shipping</item>
+            <item>Magento_Shipping::shipping_policy</item>
+            <item>Magento_Shipping::carriers</item>
+            <item>Magento_Multishipping::config_multishipping</item>
+            <item>Magento_Config::config_general</item>
+            <item>Magento_Config::web</item>
+            <item>Magento_Config::config_design</item>
+            <item>Magento_Paypal::paypal</item>
+            <item>Magento_Customer::config_customer</item>
+            <item>Magento_Tax::config_tax</item>
+            <item>Magento_Checkout::checkout</item>
+            <item>Magento_Persistent::persistent</item>
+            <item>Magento_Sales::config_sales</item>
+            <item>Magento_Sales::sales_email</item>
+            <item>Magento_Sales::sales_pdf</item>
+            <item>Magento_Reports::reports</item>
+            <item>Magento_Sitemap::config_sitemap</item>
+            <item>Magento_Wishlist::config_wishlist</item>
+            <item>Magento_Config::config_system</item>
+            <item>Magento_SalesRule::config_promo</item>
+            <item>Magento_Config::advanced</item>
+            <item>Magento_Config::config_admin</item>
+            <item>Magento_Config::trans_email</item>
+            <item>Magento_Config::dev</item>
+            <item>Magento_Config::currency</item>
+            <item>Magento_Rss::rss</item>
+            <item>Magento_Config::sendfriend</item>
+            <item>Magento_NewRelicReporting::config_newrelicreporting</item>
+            <item>Magento_CheckoutAgreements::checkoutagreement</item>
+            <item>Magento_Sales::order_statuses</item>
+            <item>Magento_Tax::manage_tax</item>
+            <item>Magento_CurrencySymbol::system_currency</item>
+            <item>Magento_CurrencySymbol::currency_rates</item>
+            <item>Magento_CurrencySymbol::symbols</item>
+            <item>Magento_Backend::stores_attributes</item>
+            <item>Magento_Catalog::attributes_attributes</item>
+            <item>Magento_Catalog::update_attributes</item>
+            <item>Magento_Catalog::sets</item>
+            <item>Magento_Review::ratings</item>
+            <item>Magento_Swatches::iframe</item>
+            <item>Magento_Backend::stores_other_settings</item>
+            <item>Magento_Customer::group</item>
+            <item>Magento_Backend::system</item>
+            <item>Magento_Backend::convert</item>
+            <item>Magento_ImportExport::import</item>
+            <item>Magento_ImportExport::export</item>
+            <item>Magento_TaxImportExport::import_export</item>
+            <item>Magento_ImportExport::history</item>
+            <item>Magento_Backend::extensions</item>
+            <item>Magento_Backend::local</item>
+            <item>Magento_Backend::custom</item>
+            <item>Magento_Backend::tools</item>
+            <item>Magento_Backend::cache</item>
+            <item>Magento_Backend::setup_wizard</item>
+            <item>Magento_Backup::backup</item>
+            <item>Magento_Backup::rollback</item>
+            <item>Magento_Indexer::index</item>
+            <item>Magento_Indexer::changeMode</item>
+            <item>Magento_User::acl</item>
+            <item>Magento_User::acl_users</item>
+            <item>Magento_User::locks</item>
+            <item>Magento_User::acl_roles</item>
+            <item>Magento_Backend::system_other_settings</item>
+            <item>Magento_AdminNotification::adminnotification</item>
+            <item>Magento_AdminNotification::show_toolbar</item>
+            <item>Magento_AdminNotification::show_list</item>
+            <item>Magento_AdminNotification::mark_as_read</item>
+            <item>Magento_AdminNotification::adminnotification_remove</item>
+            <item>Magento_Variable::variable</item>
+            <item>Magento_EncryptionKey::crypt_key</item>
+            <item>Magento_Backend::global_search</item>
+        </array>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE.txt b/app/code/Magento/Analytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE.txt
rename to app/code/Magento/Analytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE_AFL.txt b/app/code/Magento/Analytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE_AFL.txt
rename to app/code/Magento/Analytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml
new file mode 100644
index 0000000000000..c4ced12e67e07
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigGeneralAnalyticsPage" url="admin/system_config/edit/section/analytics/" area="admin" module="Magento_Config">
+        <section name="AdminConfigAdvancedReportingSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Analytics/Test/Mftf/README.md b/app/code/Magento/Analytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..cdeb48941e6a4
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Analytics Functional Tests
+
+The Functional Test Module for **Magento Analytics** module.
diff --git a/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml b/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml
new file mode 100644
index 0000000000000..2e5f2b762a7b1
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminConfigAdvancedReportingSection">
+        <element name="advancedReportingMenuItem" type="text" selector="//*[@class='admin__page-nav-link item-nav']//span[text()='Advanced Reporting']"/>
+        <element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
+        <element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
+        <element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
+        <element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
+        <element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
+        <element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
+        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
+        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+        <element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
new file mode 100644
index 0000000000000..914cb59b64e4e
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurationBlankIndustryTest">
+        <annotations>
+            <features value="Analytics"/>
+            <stories value="Try to save empty Magento Advanced Reporting vertical"/>
+            <title value="Try to save empty Magento Advanced Reporting vertical"/>
+            <description value="An admin user cannot save a blank industry setting on the Advanced Reporting configuration page."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-63981"/>
+            <group value="analytics"/>
+        </annotations>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="--Please Select--" stepKey="selectAdvancedReportingIndustry"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingBlankIndustryError}}" userInput="Please select an industry." stepKey="seeBlankIndustryErrorMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
new file mode 100644
index 0000000000000..1c1a3b27b06af
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurationEnableDisableAnalyticsTest">
+        <annotations>
+            <features value="Analytics"/>
+            <stories value="Enable/disable Advanced Reporting"/>
+            <title value="Enable Disable Advanced Reporting"/>
+            <description value="An admin user can enable/disable Advanced Reporting."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-66465"/>
+            <group value="analytics"/>
+        </annotations>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton1"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="seeAdvancedReportingServiceEnabled"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending" stepKey="seeAdvancedReportingServiceStatusEnabled"/>
+        <!--Disable Advanced Reporting-->
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelDisabled"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Disable" stepKey="selectAdvancedReportingServiceDisabled"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton2"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess2"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Disable" stepKey="seeAdvancedReportingServiceDisabled"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled" stepKey="seeAdvancedReportingServiceStatusDisabled"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
new file mode 100644
index 0000000000000..bb682c4468012
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurationIndustryTest">
+        <annotations>
+            <features value="Analytics"/>
+            <stories value="Set Magento Advanced reporting industry"/>
+            <title value="Set Magento Advanced reporting industry"/>
+            <description value="An admin user can change the industry setting on the Advanced Reporting configuration page."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-63898"/>
+            <group value="analytics"/>
+        </annotations>
+
+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
+        <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
new file mode 100644
index 0000000000000..58e809ec45c4a
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurationPermissionTest">
+        <annotations>
+            <features value="Analytics"/>
+            <stories value="Advanced Reporting configuration permission"/>
+            <title value="Advanced Reporting configuration permission"/>
+            <description value="An admin user without Analytics permissions should not be able to see the Advanced Reporting configuration page."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-82648"/>
+            <group value="analytics"/>
+        </annotations>
+        <before>
+            <createData entity="adminNoReportRole" stepKey="noReportUserRole"/>
+            <createData entity="adminNoReport" stepKey="noReportUser"/>
+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameSearch"/>
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad time="10" stepKey="wait1"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="$$noReportUser.username$$" stepKey="seeFoundUsername"/>
+        <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
+        <waitForPageLoad time="30" stepKey="wait2"/>
+        <seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
+        <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>
+
+        <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="$$noReportUserRole.rolename$$" stepKey="fillRoleNameSearch"/>
+        <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearchButtonUserRole"/>
+        <waitForPageLoad time="10" stepKey="wait3"/>
+        <see selector="{{AdminEditUserSection.roleNameInFirstRow}}" userInput="$$noReportUserRole.rolename$$" stepKey="seeFoundRoleName"/>
+        <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="clickFoundRoleName"/>
+        <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad time="10" stepKey="wait4"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the user." stepKey="seeSuccess"/>
+
+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="amOnAdminConfig"/>
+        <conditionalClick selector="{{AdminConfigSection.generalTab}}" dependentSelector="{{AdminConfigSection.generalTabOpened}}" visible="false" stepKey="openGeneralTabIfClosed"/>
+        <scrollTo selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="scrollToMenuItem"/>
+        <!--<see stepKey="seeAdvancedReportingConfigMenuItem" selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>-->
+        <seeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="seeAdvancedReportingConfigMenuItem"/>
+        <actionGroup ref="logout" stepKey="logoutOfAdmin2"/>
+
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameNoReport"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="$$noReportUser.password$$" stepKey="fillPasswordNoReport"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn2"/>
+        <waitForPageLoad time="10" stepKey="wait5"/>
+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="amOnAdminConfig2"/>
+        <conditionalClick selector="{{AdminConfigSection.generalTab}}" dependentSelector="{{AdminConfigSection.generalTabOpened}}" visible="false" stepKey="openGeneralTabIfClosed2"/>
+        <dontSeeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="dontSeeAdvancedReportingConfigMenuItem"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
new file mode 100644
index 0000000000000..58e62500b8203
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurationTimeToSendDataTest">
+        <annotations>
+            <features value="Analytics"/>
+            <stories value="Time of the day to collect data"/>
+            <title value="Time of the day to collect data"/>
+            <description value="An admin user can change the time of the day to collect data setting on the Advanced Reporting configuration page."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-66464"/>
+            <group value="analytics"/>
+        </annotations>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="11" stepKey="selectAdvancedReportingHour"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="11" stepKey="selectAdvancedReportingMinute"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="00" stepKey="selectAdvancedReportingSeconds"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
new file mode 100644
index 0000000000000..407e323aeaae6
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
+
+use Magento\Analytics\Block\Adminhtml\System\Config\AdditionalComment;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class AdditionalCommentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AdditionalComment
+     */
+    private $additionalComment;
+
+    /**
+     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $abstractElementMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Form|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formMock;
+
+    protected function setUp()
+    {
+        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
+            ->setMethods(['getComment', 'getLabel'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->formMock = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $this->additionalComment = $objectManager->getObject(
+            AdditionalComment::class,
+            [
+                'context' => $this->contextMock
+            ]
+        );
+    }
+
+    public function testRender()
+    {
+        $this->abstractElementMock->setForm($this->formMock);
+        $this->abstractElementMock->expects($this->any())
+            ->method('getComment')
+            ->willReturn('New comment');
+        $this->abstractElementMock->expects($this->any())
+            ->method('getLabel')
+            ->willReturn('Comment label');
+        $html = $this->additionalComment->render($this->abstractElementMock);
+        $this->assertRegExp(
+            "/New comment/",
+            $html
+        );
+        $this->assertRegExp(
+            "/Comment label/",
+            $html
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
new file mode 100644
index 0000000000000..d567d65882350
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
+
+use Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CollectionTimeLabel
+     */
+    private $collectionTimeLabel;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $timeZoneMock;
+
+    /**
+     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $abstractElementMock;
+
+    /**
+     * @var ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeResolver;
+
+    protected function setUp()
+    {
+        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
+            ->setMethods(['getComment'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->setMethods(['getLocaleDate'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->formMock = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->timeZoneMock = $this->getMockBuilder(TimezoneInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock->expects($this->any())
+            ->method('getLocaleDate')
+            ->willReturn($this->timeZoneMock);
+        $this->localeResolver = $this->getMockBuilder(ResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLocale'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManager($this);
+        $this->collectionTimeLabel = $objectManager->getObject(
+            CollectionTimeLabel::class,
+            [
+                'context' => $this->contextMock,
+                'localeResolver' => $this->localeResolver
+            ]
+        );
+    }
+
+    public function testRender()
+    {
+        $timeZone = "America/New_York";
+        $this->abstractElementMock->setForm($this->formMock);
+        $this->timeZoneMock->expects($this->once())
+            ->method('getConfigTimezone')
+            ->willReturn($timeZone);
+        $this->abstractElementMock->expects($this->any())
+            ->method('getComment')
+            ->willReturn('Eastern Standard Time (America/New_York)');
+        $this->localeResolver->expects($this->once())
+            ->method('getLocale')
+            ->willReturn('en_US');
+        $this->assertRegExp(
+            "/Eastern Standard Time \(America\/New_York\)/",
+            $this->collectionTimeLabel->render($this->abstractElementMock)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
new file mode 100644
index 0000000000000..78ff581f3de9d
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
+
+use Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class SubscriptionStatusLabelTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SubscriptionStatusLabel
+     */
+    private $subscriptionStatusLabel;
+
+    /**
+     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $abstractElementMock;
+
+    /**
+     * @var SubscriptionStatusProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriptionStatusProviderMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Form|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formMock;
+
+    protected function setUp()
+    {
+        $this->subscriptionStatusProviderMock = $this->getMockBuilder(SubscriptionStatusProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
+            ->setMethods(['getComment'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->formMock = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $this->subscriptionStatusLabel = $objectManager->getObject(
+            SubscriptionStatusLabel::class,
+            [
+                'context' => $this->contextMock,
+                'subscriptionStatusProvider' => $this->subscriptionStatusProviderMock
+            ]
+        );
+    }
+
+    public function testRender()
+    {
+        $this->abstractElementMock->setForm($this->formMock);
+        $this->subscriptionStatusProviderMock->expects($this->once())
+            ->method('getStatus')
+            ->willReturn('Enabled');
+        $this->abstractElementMock->expects($this->any())
+            ->method('getComment')
+            ->willReturn('Subscription status: Enabled');
+        $this->assertRegExp(
+            "/Subscription status: Enabled/",
+            $this->subscriptionStatusLabel->render($this->abstractElementMock)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
new file mode 100644
index 0000000000000..6a0cecc781062
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
+
+use Magento\Analytics\Block\Adminhtml\System\Config\Vertical;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class VerticalTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Vertical
+     */
+    private $vertical;
+
+    /**
+     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $abstractElementMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Form|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formMock;
+
+    protected function setUp()
+    {
+        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
+            ->setMethods(['getComment', 'getLabel', 'getHint'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->formMock = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $this->vertical = $objectManager->getObject(
+            Vertical::class,
+            [
+                'context' => $this->contextMock
+            ]
+        );
+    }
+
+    public function testRender()
+    {
+        $this->abstractElementMock->setForm($this->formMock);
+        $this->abstractElementMock->expects($this->any())
+            ->method('getComment')
+            ->willReturn('New comment');
+        $this->abstractElementMock->expects($this->any())
+            ->method('getHint')
+            ->willReturn('New hint');
+        $html = $this->vertical->render($this->abstractElementMock);
+        $this->assertRegExp(
+            "/New comment/",
+            $html
+        );
+        $this->assertRegExp(
+            "/New hint/",
+            $html
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BIEssentials/SignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BIEssentials/SignUpTest.php
new file mode 100644
index 0000000000000..4e79ca43327bf
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BIEssentials/SignUpTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Controller\Adminhtml\BIEssentials;
+
+use Magento\Analytics\Controller\Adminhtml\BIEssentials\SignUp;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SignUpTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var SignUp
+     */
+    private $signUpController;
+
+    /**
+     * @var RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @var Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultRedirectFactoryMock = $this->getMockBuilder(RedirectFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->redirectMock = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->signUpController = $this->objectManagerHelper->getObject(
+            SignUp::class,
+            [
+                'config' => $this->configMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute()
+    {
+        $urlBIEssentialsConfigPath = 'analytics/url/bi_essentials';
+        $this->configMock->expects($this->once())
+            ->method('getValue')
+            ->with($urlBIEssentialsConfigPath)
+            ->willReturn('value');
+        $this->resultRedirectFactoryMock->expects($this->once())->method('create')->willReturn($this->redirectMock);
+        $this->redirectMock->expects($this->once())->method('setUrl')->with('value')->willReturnSelf();
+        $this->assertEquals($this->redirectMock, $this->signUpController->execute());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php
new file mode 100644
index 0000000000000..4f54ce5059965
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Controller\Adminhtml\Reports;
+
+use Magento\Analytics\Controller\Adminhtml\Reports\Show;
+use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
+use Magento\Analytics\Model\ReportUrlProvider;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ShowTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ReportUrlProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reportUrlProviderMock;
+
+    /**
+     * @var Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    /**
+     * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageManagerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Show
+     */
+    private $showController;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->reportUrlProviderMock = $this->getMockBuilder(ReportUrlProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->redirectMock = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->showController = $this->objectManagerHelper->getObject(
+            Show::class,
+            [
+                'reportUrlProvider' => $this->reportUrlProviderMock,
+                'resultFactory' => $this->resultFactoryMock,
+                'messageManager' => $this->messageManagerMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute()
+    {
+        $otpUrl = 'http://example.com?otp=15vbjcfdvd15645';
+
+        $this->resultFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_REDIRECT)
+            ->willReturn($this->redirectMock);
+        $this->reportUrlProviderMock
+            ->expects($this->once())
+            ->method('getUrl')
+            ->with()
+            ->willReturn($otpUrl);
+        $this->redirectMock
+            ->expects($this->once())
+            ->method('setUrl')
+            ->with($otpUrl)
+            ->willReturnSelf();
+        $this->assertSame($this->redirectMock, $this->showController->execute());
+    }
+
+    /**
+     * @dataProvider executeWithExceptionDataProvider
+     *
+     * @param \Exception $exception
+     */
+    public function testExecuteWithException(\Exception $exception)
+    {
+
+        $this->resultFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_REDIRECT)
+            ->willReturn($this->redirectMock);
+        $this->reportUrlProviderMock
+            ->expects($this->once())
+            ->method('getUrl')
+            ->with()
+            ->willThrowException($exception);
+        if ($exception instanceof LocalizedException) {
+            $message = $exception->getMessage();
+        } else {
+            $message = __('Sorry, there has been an error processing your request. Please try again later.');
+        }
+        $this->messageManagerMock
+            ->expects($this->once())
+            ->method('addExceptionMessage')
+            ->with($exception, $message)
+            ->willReturnSelf();
+        $this->redirectMock
+            ->expects($this->once())
+            ->method('setPath')
+            ->with('adminhtml')
+            ->willReturnSelf();
+        $this->assertSame($this->redirectMock, $this->showController->execute());
+    }
+
+    /**
+     * @return array
+     */
+    public function executeWithExceptionDataProvider()
+    {
+        return [
+            'ExecuteWithLocalizedException' => [new LocalizedException(__('TestMessage'))],
+            'ExecuteWithException' => [new \Exception('TestMessage')],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithSubscriptionUpdateException()
+    {
+        $exception = new SubscriptionUpdateException(__('TestMessage'));
+        $this->resultFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_REDIRECT)
+            ->willReturn($this->redirectMock);
+        $this->reportUrlProviderMock
+            ->expects($this->once())
+            ->method('getUrl')
+            ->with()
+            ->willThrowException($exception);
+        $this->messageManagerMock
+            ->expects($this->once())
+            ->method('addNoticeMessage')
+            ->with($exception->getMessage())
+            ->willReturnSelf();
+        $this->redirectMock
+            ->expects($this->once())
+            ->method('setPath')
+            ->with('adminhtml')
+            ->willReturnSelf();
+        $this->assertSame($this->redirectMock, $this->showController->execute());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/RetryTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/RetryTest.php
new file mode 100644
index 0000000000000..89107b8999ecd
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/RetryTest.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Controller\Adminhtml\Subscription;
+
+use Magento\Analytics\Controller\Adminhtml\Subscription\Retry;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class RetryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectMock;
+
+    /**
+     * @var SubscriptionHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriptionHandlerMock;
+
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageManagerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Retry
+     */
+    private $retryController;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultRedirectMock = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->subscriptionHandlerMock = $this->getMockBuilder(SubscriptionHandler::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->retryController = $this->objectManagerHelper->getObject(
+            Retry::class,
+            [
+                'resultFactory' => $this->resultFactoryMock,
+                'subscriptionHandler'  => $this->subscriptionHandlerMock,
+                'messageManager' => $this->messageManagerMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute()
+    {
+        $this->resultFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_REDIRECT)
+            ->willReturn($this->resultRedirectMock);
+        $this->resultRedirectMock
+            ->expects($this->once())
+            ->method('setPath')
+            ->with('adminhtml')
+            ->willReturnSelf();
+        $this->subscriptionHandlerMock
+            ->expects($this->once())
+            ->method('processEnabled')
+            ->with()
+            ->willReturn(true);
+        $this->assertSame(
+            $this->resultRedirectMock,
+            $this->retryController->execute()
+        );
+    }
+
+    /**
+     * @dataProvider executeExceptionsDataProvider
+     *
+     * @param \Exception $exception
+     * @param Phrase $message
+     */
+    public function testExecuteWithException(\Exception $exception, Phrase $message)
+    {
+        $this->resultFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_REDIRECT)
+            ->willReturn($this->resultRedirectMock);
+        $this->resultRedirectMock
+            ->expects($this->once())
+            ->method('setPath')
+            ->with('adminhtml')
+            ->willReturnSelf();
+        $this->subscriptionHandlerMock
+            ->expects($this->once())
+            ->method('processEnabled')
+            ->with()
+            ->willThrowException($exception);
+        $this->messageManagerMock
+            ->expects($this->once())
+            ->method('addExceptionMessage')
+            ->with($exception, $message);
+
+        $this->assertSame(
+            $this->resultRedirectMock,
+            $this->retryController->execute()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function executeExceptionsDataProvider()
+    {
+        return [
+            [new LocalizedException(__('TestMessage')), __('TestMessage')],
+            [
+                new \Exception('TestMessage'),
+                __('Sorry, there has been an error processing your request. Please try again later.')
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Cron/CollectDataTest.php b/app/code/Magento/Analytics/Test/Unit/Cron/CollectDataTest.php
new file mode 100644
index 0000000000000..66d1715de0321
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Cron/CollectDataTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Cron;
+
+use Magento\Analytics\Cron\CollectData;
+use Magento\Analytics\Model\ExportDataHandlerInterface;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CollectDataTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ExportDataHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exportDataHandlerMock;
+
+    /**
+     * @var SubscriptionStatusProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriptionStatusMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CollectData
+     */
+    private $collectData;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exportDataHandlerMock = $this->getMockBuilder(ExportDataHandlerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->subscriptionStatusMock = $this->getMockBuilder(SubscriptionStatusProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->collectData = $this->objectManagerHelper->getObject(
+            CollectData::class,
+            [
+                'exportDataHandler' => $this->exportDataHandlerMock,
+                'subscriptionStatus' => $this->subscriptionStatusMock,
+            ]
+        );
+    }
+
+    /**
+     * @param string $status
+     * @return void
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute($status)
+    {
+        $this->subscriptionStatusMock
+            ->expects($this->once())
+            ->method('getStatus')
+            ->with()
+            ->willReturn($status);
+        $this->exportDataHandlerMock
+            ->expects(($status === SubscriptionStatusProvider::ENABLED) ? $this->once() : $this->never())
+            ->method('prepareExportData')
+            ->with();
+
+        $this->assertTrue($this->collectData->execute());
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            'Subscription is enabled' => [SubscriptionStatusProvider::ENABLED],
+            'Subscription is disabled' => [SubscriptionStatusProvider::DISABLED],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php
new file mode 100644
index 0000000000000..959a11f9e1058
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Cron;
+
+use Magento\Analytics\Cron\SignUp;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Analytics\Model\Connector;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SignUpTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Connector|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectorMock;
+
+    /**
+     * @var WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configWriterMock;
+
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reinitableConfigMock;
+
+    /**
+     * @var SignUp
+     */
+    private $signUp;
+
+    protected function setUp()
+    {
+        $this->connectorMock =  $this->getMockBuilder(Connector::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configWriterMock =  $this->getMockBuilder(WriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->flagManagerMock =  $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->reinitableConfigMock = $this->getMockBuilder(ReinitableConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->signUp = new SignUp(
+            $this->connectorMock,
+            $this->configWriterMock,
+            $this->flagManagerMock,
+            $this->reinitableConfigMock
+        );
+    }
+
+    public function testExecute()
+    {
+        $attemptsCount = 10;
+
+        $this->flagManagerMock->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn($attemptsCount);
+
+        $attemptsCount -= 1;
+        $this->flagManagerMock->expects($this->once())
+            ->method('saveFlag')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);
+        $this->connectorMock->expects($this->once())
+            ->method('execute')
+            ->with('signUp')
+            ->willReturn(true);
+        $this->addDeleteAnalyticsCronExprAsserts();
+        $this->flagManagerMock->expects($this->once())
+            ->method('deleteFlag')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+        $this->assertTrue($this->signUp->execute());
+    }
+
+    public function testExecuteFlagNotExist()
+    {
+        $this->flagManagerMock->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn(null);
+        $this->addDeleteAnalyticsCronExprAsserts();
+        $this->assertFalse($this->signUp->execute());
+    }
+
+    public function testExecuteZeroAttempts()
+    {
+        $attemptsCount = 0;
+        $this->flagManagerMock->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn($attemptsCount);
+        $this->addDeleteAnalyticsCronExprAsserts();
+        $this->flagManagerMock->expects($this->once())
+            ->method('deleteFlag')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+        $this->assertFalse($this->signUp->execute());
+    }
+
+    /**
+     * Add assertions for method deleteAnalyticsCronExpr.
+     *
+     * @return void
+     */
+    private function addDeleteAnalyticsCronExprAsserts()
+    {
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('delete')
+            ->with(SubscriptionHandler::CRON_STRING_PATH)
+            ->willReturn(true);
+        $this->reinitableConfigMock
+            ->expects($this->once())
+            ->method('reinit')
+            ->willReturnSelf();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php b/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php
new file mode 100644
index 0000000000000..aa3011ffc94f6
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Cron;
+
+use Magento\Analytics\Cron\Update;
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
+
+class UpdateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Connector|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectorMock;
+
+    /**
+     * @var WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configWriterMock;
+
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reinitableConfigMock;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var Update
+     */
+    private $update;
+
+    protected function setUp()
+    {
+        $this->connectorMock =  $this->getMockBuilder(Connector::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configWriterMock =  $this->getMockBuilder(WriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->flagManagerMock =  $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->reinitableConfigMock = $this->getMockBuilder(ReinitableConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->update = new Update(
+            $this->connectorMock,
+            $this->configWriterMock,
+            $this->reinitableConfigMock,
+            $this->flagManagerMock,
+            $this->analyticsTokenMock
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithoutToken()
+    {
+        $this->flagManagerMock
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn(10);
+        $this->connectorMock
+            ->expects($this->once())
+            ->method('execute')
+            ->with('update')
+            ->willReturn(false);
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+        $this->addFinalOutputAsserts();
+        $this->assertFalse($this->update->execute());
+    }
+
+    /**
+     * @param bool $isExecuted
+     */
+    private function addFinalOutputAsserts(bool $isExecuted = true)
+    {
+        $this->flagManagerMock
+            ->expects($this->exactly(2 * $isExecuted))
+            ->method('deleteFlag')
+            ->withConsecutive(
+                [SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE],
+                [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE]
+            );
+        $this->configWriterMock
+            ->expects($this->exactly((int)$isExecuted))
+            ->method('delete')
+            ->with(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH);
+        $this->reinitableConfigMock
+            ->expects($this->exactly((int)$isExecuted))
+            ->method('reinit')
+            ->with();
+    }
+
+    /**
+     * @param $counterData
+     * @return void
+     * @dataProvider executeWithEmptyReverseCounterDataProvider
+     */
+    public function testExecuteWithEmptyReverseCounter($counterData)
+    {
+        $this->flagManagerMock
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn($counterData);
+        $this->connectorMock
+            ->expects($this->never())
+            ->method('execute')
+            ->with('update')
+            ->willReturn(false);
+        $this->analyticsTokenMock
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->addFinalOutputAsserts();
+        $this->assertFalse($this->update->execute());
+    }
+
+    /**
+     * Provides empty states of the reverse counter.
+     *
+     * @return array
+     */
+    public function executeWithEmptyReverseCounterDataProvider()
+    {
+        return [
+            [null],
+            [0]
+        ];
+    }
+
+    /**
+     * @param int $reverseCount
+     * @param bool $commandResult
+     * @param bool $finalConditionsIsExpected
+     * @param bool $functionResult
+     * @return void
+     * @dataProvider executeRegularScenarioDataProvider
+     */
+    public function testExecuteRegularScenario(
+        int $reverseCount,
+        bool $commandResult,
+        bool $finalConditionsIsExpected,
+        bool $functionResult
+    ) {
+        $this->flagManagerMock
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn($reverseCount);
+        $this->connectorMock
+            ->expects($this->once())
+            ->method('execute')
+            ->with('update')
+            ->willReturn($commandResult);
+        $this->analyticsTokenMock
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->addFinalOutputAsserts($finalConditionsIsExpected);
+        $this->assertSame($functionResult, $this->update->execute());
+    }
+
+    /**
+     * @return array
+     */
+    public function executeRegularScenarioDataProvider()
+    {
+        return [
+            'The last attempt with command execution result False' => [
+                'Reverse count' => 1,
+                'Command result' => false,
+                'Executed final output conditions' => true,
+                'Function result' => false,
+            ],
+            'Not the last attempt with command execution result False' => [
+                'Reverse count' => 10,
+                'Command result' => false,
+                'Executed final output conditions' => false,
+                'Function result' => false,
+            ],
+            'Command execution result True' => [
+                'Reverse count' => 10,
+                'Command result' => true,
+                'Executed final output conditions' => true,
+                'Function result' => true,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/AnalyticsTokenTest.php b/app/code/Magento/Analytics/Test/Unit/Model/AnalyticsTokenTest.php
new file mode 100644
index 0000000000000..f4d17b3069229
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/AnalyticsTokenTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class AnalyticsTokenTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reinitableConfigMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configWriterMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $tokenModel;
+
+    /**
+     * @var string
+     */
+    private $tokenPath = 'analytics/general/token';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->reinitableConfigMock = $this->getMockBuilder(ReinitableConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configWriterMock = $this->getMockBuilder(WriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->tokenModel = $this->objectManagerHelper->getObject(
+            AnalyticsToken::class,
+            [
+                'reinitableConfig' => $this->reinitableConfigMock,
+                'config' => $this->configMock,
+                'configWriter' => $this->configWriterMock,
+                'tokenPath' => $this->tokenPath,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testStoreToken()
+    {
+        $value = 'jjjj0000';
+
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('save')
+            ->with($this->tokenPath, $value);
+
+        $this->reinitableConfigMock
+            ->expects($this->once())
+            ->method('reinit')
+            ->willReturnSelf();
+
+        $this->assertTrue($this->tokenModel->storeToken($value));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetToken()
+    {
+        $value = 'jjjj0000';
+
+        $this->configMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with($this->tokenPath)
+            ->willReturn($value);
+
+        $this->assertSame($value, $this->tokenModel->getToken());
+    }
+
+    /**
+     * @return void
+     */
+    public function testIsTokenExist()
+    {
+        $this->assertFalse($this->tokenModel->isTokenExist());
+
+        $this->configMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with($this->tokenPath)
+            ->willReturn('0000');
+        $this->assertTrue($this->tokenModel->isTokenExist());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php
new file mode 100644
index 0000000000000..f5f721c038c57
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Model\Config\Backend\Baseurl;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SubscriptionUpdateHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reinitableConfigMock;
+
+    /**
+     * @var WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configWriterMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var SubscriptionUpdateHandler
+     */
+    private $subscriptionUpdateHandler;
+
+    /**
+     * @var int
+     */
+    private $attemptsInitValue = 48;
+
+    /**
+     * @var string
+     */
+    private $cronExpression = '0 * * * *';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->reinitableConfigMock = $this->getMockBuilder(ReinitableConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        
+        $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configWriterMock = $this->getMockBuilder(WriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->subscriptionUpdateHandler = $this->objectManagerHelper->getObject(
+            SubscriptionUpdateHandler::class,
+            [
+                'reinitableConfig' => $this->reinitableConfigMock,
+                'analyticsToken' => $this->analyticsTokenMock,
+                'flagManager' => $this->flagManagerMock,
+                'configWriter' => $this->configWriterMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testTokenDoesNotExist()
+    {
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->with()
+            ->willReturn(false);
+        $this->flagManagerMock
+            ->expects($this->never())
+            ->method('saveFlag');
+        $this->configWriterMock
+            ->expects($this->never())
+            ->method('save');
+        $this->assertTrue($this->subscriptionUpdateHandler->processUrlUpdate('http://store.com'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testTokenAndPreviousBaseUrlExist()
+    {
+        $url = 'https://store.com';
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->with()
+            ->willReturn(true);
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
+            ->willReturn(true);
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('saveFlag')
+            ->withConsecutive(
+                [SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE, $this->attemptsInitValue],
+                [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, $url]
+            );
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('save')
+            ->with(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH, $this->cronExpression);
+        $this->reinitableConfigMock
+            ->expects($this->once())
+            ->method('reinit')
+            ->with();
+        $this->assertTrue($this->subscriptionUpdateHandler->processUrlUpdate($url));
+    }
+
+    /**
+     * @return void
+     */
+    public function testTokenExistAndWithoutPreviousBaseUrl()
+    {
+        $url = 'https://store.com';
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->with()
+            ->willReturn(true);
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
+            ->willReturn(false);
+        $this->flagManagerMock
+            ->expects($this->exactly(2))
+            ->method('saveFlag')
+            ->withConsecutive(
+                [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, $url],
+                [SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE, $this->attemptsInitValue]
+            );
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('save')
+            ->with(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH, $this->cronExpression);
+        $this->reinitableConfigMock
+            ->expects($this->once())
+            ->method('reinit')
+            ->with();
+        $this->assertTrue($this->subscriptionUpdateHandler->processUrlUpdate($url));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php
new file mode 100644
index 0000000000000..25f4008f9a6e4
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Config\Backend;
+
+use Magento\Analytics\Model\Config\Backend\CollectionTime;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Psr\Log\LoggerInterface;
+
+class CollectionTimeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configWriterMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CollectionTime
+     */
+    private $collectionTime;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configWriterMock = $this->getMockBuilder(WriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->collectionTime = $this->objectManagerHelper->getObject(
+            CollectionTime::class,
+            [
+                'configWriter' => $this->configWriterMock,
+                '_logger' => $this->loggerMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterSave()
+    {
+        $this->collectionTime->setData('value', '05,04,03');
+
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('save')
+            ->with(CollectionTime::CRON_SCHEDULE_PATH, join(' ', ['04', '05', '*', '*', '*']));
+
+        $this->assertInstanceOf(
+            Value::class,
+            $this->collectionTime->afterSave()
+        );
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testAfterSaveWrongValue()
+    {
+        $this->collectionTime->setData('value', '00,01');
+        $this->collectionTime->afterSave();
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testAfterSaveWithLocalizedException()
+    {
+        $exception = new \Exception('Test message');
+        $this->collectionTime->setData('value', '05,04,03');
+
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('save')
+            ->with(CollectionTime::CRON_SCHEDULE_PATH, join(' ', ['04', '05', '*', '*', '*']))
+            ->willThrowException($exception);
+        $this->loggerMock
+            ->expects($this->once())
+            ->method('error')
+            ->with($exception->getMessage());
+        $this->collectionTime->afterSave();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Enabled/SubscriptionHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Enabled/SubscriptionHandlerTest.php
new file mode 100644
index 0000000000000..cf3e37ad89a31
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Enabled/SubscriptionHandlerTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Model\Config\Backend\Enabled;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\CollectionTime;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SubscriptionHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configWriterMock;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tokenMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var int
+     */
+    private $attemptsInitValue = 10;
+
+    /**
+     * @var SubscriptionHandler
+     */
+    private $subscriptionHandler;
+
+    protected function setUp()
+    {
+        $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configWriterMock = $this->getMockBuilder(WriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->tokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->subscriptionHandler = $this->objectManagerHelper->getObject(
+            SubscriptionHandler::class,
+            [
+                'flagManager' => $this->flagManagerMock,
+                'configWriter' => $this->configWriterMock,
+                'attemptsInitValue' => $this->attemptsInitValue,
+                'analyticsToken' => $this->tokenMock,
+            ]
+        );
+    }
+
+    public function testProcessEnabledTokenExist()
+    {
+        $this->tokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->configWriterMock
+            ->expects($this->never())
+            ->method('save');
+        $this->flagManagerMock
+            ->expects($this->never())
+            ->method('saveFlag');
+        $this->assertTrue(
+            $this->subscriptionHandler->processEnabled()
+        );
+    }
+
+    public function testProcessEnabledTokenDoesNotExist()
+    {
+        $this->tokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('save')
+            ->with(SubscriptionHandler::CRON_STRING_PATH, "0 * * * *");
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('saveFlag')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $this->attemptsInitValue)
+            ->willReturn(true);
+        $this->assertTrue(
+            $this->subscriptionHandler->processEnabled()
+        );
+    }
+
+    public function testProcessDisabledTokenDoesNotExist()
+    {
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('delete')
+            ->with(CollectionTime::CRON_SCHEDULE_PATH);
+        $this->tokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('deleteFlag')
+            ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE)
+            ->willReturn(true);
+        $this->assertTrue(
+            $this->subscriptionHandler->processDisabled()
+        );
+    }
+
+    public function testProcessDisabledTokenExists()
+    {
+        $this->configWriterMock
+            ->expects($this->once())
+            ->method('delete')
+            ->with(CollectionTime::CRON_SCHEDULE_PATH);
+        $this->tokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->flagManagerMock
+            ->expects($this->never())
+            ->method('deleteFlag');
+        $this->assertTrue(
+            $this->subscriptionHandler->processDisabled()
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/EnabledTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/EnabledTest.php
new file mode 100644
index 0000000000000..587f3599282f0
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/EnabledTest.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Model\Config\Backend;
+
+use Magento\Analytics\Model\Config\Backend\Enabled;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Psr\Log\LoggerInterface;
+
+class EnabledTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SubscriptionHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriptionHandlerMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var Value|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Enabled
+     */
+    private $enabledModel;
+
+    /**
+     * @var int
+     */
+    private $valueEnabled = 1;
+
+    /**
+     * @var int
+     */
+    private $valueDisabled = 0;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->subscriptionHandlerMock = $this->getMockBuilder(SubscriptionHandler::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->enabledModel = $this->objectManagerHelper->getObject(
+            Enabled::class,
+            [
+                'subscriptionHandler' => $this->subscriptionHandlerMock,
+                '_logger' => $this->loggerMock,
+                'config' => $this->configMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterSaveSuccessEnabled()
+    {
+        $this->enabledModel->setData('value', $this->valueEnabled);
+
+        $this->configMock
+            ->expects($this->any())
+            ->method('getValue')
+            ->willReturn(!$this->valueEnabled);
+
+        $this->subscriptionHandlerMock
+            ->expects($this->once())
+            ->method('processEnabled')
+            ->with()
+            ->willReturn(true);
+
+        $this->assertInstanceOf(
+            Value::class,
+            $this->enabledModel->afterSave()
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterSaveSuccessDisabled()
+    {
+        $this->enabledModel->setData('value', $this->valueDisabled);
+
+        $this->configMock
+            ->expects($this->any())
+            ->method('getValue')
+            ->willReturn(!$this->valueDisabled);
+
+        $this->subscriptionHandlerMock
+            ->expects($this->once())
+            ->method('processDisabled')
+            ->with()
+            ->willReturn(true);
+
+        $this->assertInstanceOf(
+            Value::class,
+            $this->enabledModel->afterSave()
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterSaveSuccessValueNotChanged()
+    {
+        $this->enabledModel->setData('value', null);
+
+        $this->configMock
+            ->expects($this->any())
+            ->method('getValue')
+            ->willReturn(null);
+
+        $this->subscriptionHandlerMock
+            ->expects($this->never())
+            ->method('processEnabled')
+            ->with()
+            ->willReturn(true);
+        $this->subscriptionHandlerMock
+            ->expects($this->never())
+            ->method('processDisabled')
+            ->with()
+            ->willReturn(true);
+
+        $this->assertInstanceOf(
+            Value::class,
+            $this->enabledModel->afterSave()
+        );
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecuteAfterSaveFailedWithLocalizedException()
+    {
+        $exception = new \Exception('Message');
+        $this->enabledModel->setData('value', $this->valueEnabled);
+
+        $this->subscriptionHandlerMock
+            ->expects($this->once())
+            ->method('processEnabled')
+            ->with()
+            ->willThrowException($exception);
+
+        $this->loggerMock
+            ->expects($this->once())
+            ->method('error')
+            ->with($exception->getMessage());
+
+        $this->enabledModel->afterSave();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/VerticalTest.php
new file mode 100644
index 0000000000000..6fe7d0aa93998
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/VerticalTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Config\Backend;
+
+/**
+ * A unit test for testing of the backend model for verticals configuration.
+ */
+class VerticalTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\Model\Config\Backend\Vertical
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\Model\Config\Backend\Vertical::class
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testBeforeSaveSuccess()
+    {
+        $this->subject->setValue('Apps and Games');
+
+        $this->assertInstanceOf(
+            \Magento\Analytics\Model\Config\Backend\Vertical::class,
+            $this->subject->beforeSave()
+        );
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testBeforeSaveFailedWithLocalizedException()
+    {
+        $this->subject->setValue('');
+
+        $this->subject->beforeSave();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/MapperTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/MapperTest.php
new file mode 100644
index 0000000000000..0b7f4870dbac8
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/MapperTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Config;
+
+use Magento\Analytics\Model\Config\Mapper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Mapper
+     */
+    private $mapper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->mapper = $this->objectManagerHelper->getObject(Mapper::class);
+    }
+
+    /**
+     * @param array $configData
+     * @param array $resultData
+     * @return void
+     *
+     * @dataProvider executingDataProvider
+     */
+    public function testExecution($configData, $resultData)
+    {
+        $this->assertSame($resultData, $this->mapper->execute($configData));
+    }
+
+    /**
+     * @return array
+     */
+    public function executingDataProvider()
+    {
+        return [
+            'wrongConfig' => [
+                ['config' => ['files']],
+                []
+            ],
+            'validConfigWithFileNodes' => [
+                [
+                    'config' => [
+                        0 => [
+                            'file' => [
+                                0 => [
+                                    'name' => 'fileName',
+                                    'providers' => [[]]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    'fileName' => [
+                        'name' => 'fileName',
+                        'providers' => []
+                    ]
+                ],
+            ],
+            'validConfigWithProvidersNode' => [
+                [
+                    'config' => [
+                        0 => [
+                            'file' => [
+                                0 => [
+                                    'name' => 'fileName',
+                                    'providers' => [
+                                        0 => [
+                                            'reportProvider' => [0 => []]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    'fileName' => [
+                        'name' => 'fileName',
+                        'providers' => [
+                            'reportProvider' => ['parameters' => []]
+                        ]
+                    ]
+                ],
+            ],
+            'validConfigWithParametersNode' => [
+                [
+                    'config' => [
+                        0 => [
+                            'file' => [
+                                0 => [
+                                    'name' => 'fileName',
+                                    'providers' => [
+                                        0 => [
+                                            'reportProvider' => [
+                                                0 => [
+                                                    'parameters' => [
+                                                        0 => ['name' => ['reportName']]
+                                                    ]
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    'fileName' => [
+                        'name' => 'fileName',
+                        'providers' => [
+                            'reportProvider' => [
+                                'parameters' => [
+                                    'name' => 'reportName'
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/ReaderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/ReaderTest.php
new file mode 100644
index 0000000000000..6aa9c7ef3106c
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/ReaderTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Config;
+
+use Magento\Analytics\Model\Config\Mapper;
+use Magento\Analytics\Model\Config\Reader;
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Mapper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mapperMock;
+
+    /**
+     * @var ReaderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerXmlMock;
+
+    /**
+     * @var ReaderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerDbMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->mapperMock = $this->getMockBuilder(Mapper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->readerXmlMock = $this->getMockBuilder(ReaderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->readerDbMock = $this->getMockBuilder(ReaderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->reader = $this->objectManagerHelper->getObject(
+            Reader::class,
+            [
+                'mapper' => $this->mapperMock,
+                'readers' => [
+                    $this->readerXmlMock,
+                    $this->readerDbMock,
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testRead()
+    {
+        $scope = 'store';
+        $xmlReaderResult = [
+            'config' => ['node1' => ['node2' => 'node4']]
+        ];
+        $dbReaderResult = [
+            'config' => ['node1' => ['node2' => 'node3']]
+        ];
+        $mapperResult = ['node2' => ['node3', 'node4']];
+
+        $this->readerXmlMock
+            ->expects($this->once())
+            ->method('read')
+            ->with($scope)
+            ->willReturn($xmlReaderResult);
+
+        $this->readerDbMock
+            ->expects($this->once())
+            ->method('read')
+            ->with($scope)
+            ->willReturn($dbReaderResult);
+
+        $this->mapperMock
+            ->expects($this->once())
+            ->method('execute')
+            ->with(array_merge_recursive($xmlReaderResult, $dbReaderResult))
+            ->willReturn($mapperResult);
+
+        $this->assertSame($mapperResult, $this->reader->read($scope));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Source/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Source/VerticalTest.php
new file mode 100644
index 0000000000000..c13205d34f25b
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Source/VerticalTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Config\Source;
+
+/**
+ * A unit test for testing of the source model for verticals configuration.
+ */
+class VerticalTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\Model\Config\Source\Vertical
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\Model\Config\Source\Vertical::class,
+            [
+                'verticals' => [
+                    'Apps and Games',
+                    'Athletic/Sporting Goods',
+                    'Art and Design'
+                ]
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testToOptionArray()
+    {
+        $expectedOptionsArray = [
+            ['value' => '', 'label' => __('--Please Select--')],
+            ['value' => 'Apps and Games', 'label' => __('Apps and Games')],
+            ['value' => 'Athletic/Sporting Goods', 'label' => __('Athletic/Sporting Goods')],
+            ['value' => 'Art and Design', 'label' => __('Art and Design')]
+        ];
+
+        $this->assertEquals(
+            $expectedOptionsArray,
+            $this->subject->toOptionArray()
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ConfigTest.php
new file mode 100644
index 0000000000000..8739219ebdf09
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ConfigTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\Config;
+use Magento\Framework\Config\DataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataInterfaceMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->dataInterfaceMock = $this->getMockBuilder(DataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->config = $this->objectManagerHelper->getObject(
+            Config::class,
+            [
+                'data' => $this->dataInterfaceMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGet()
+    {
+        $key = 'configKey';
+        $defaultValue = 'mock';
+        $configValue = 'emptyString';
+
+        $this->dataInterfaceMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($key, $defaultValue)
+            ->willReturn($configValue);
+
+        $this->assertSame($configValue, $this->config->get($key, $defaultValue));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/Client/CurlTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/Client/CurlTest.php
new file mode 100644
index 0000000000000..92f79c2bf6dee
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/Client/CurlTest.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector\Http\Client;
+
+use Magento\Analytics\Model\Connector\Http\ConverterInterface;
+use Magento\Analytics\Model\Connector\Http\JsonConverter;
+use Magento\Framework\HTTP\Adapter\CurlFactory;
+use Magento\Framework\HTTP\ResponseFactory;
+
+/**
+ * A unit test for testing of the CURL HTTP client.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CurlTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\Model\Connector\Http\Client\Curl
+     */
+    private $curl;
+
+    /**
+     * @var \Magento\Framework\HTTP\Adapter\Curl|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $curlAdapterMock;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var ResponseFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseFactoryMock;
+
+    /**
+     * @var ConverterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->curlAdapterMock = $this->getMockBuilder(
+            \Magento\Framework\HTTP\Adapter\Curl::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->loggerMock = $this->getMockBuilder(
+            \Psr\Log\LoggerInterface::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $curlFactoryMock = $this->getMockBuilder(CurlFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $curlFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->curlAdapterMock);
+
+        $this->responseFactoryMock = $this->getMockBuilder(
+            ResponseFactory::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->converterMock = $this->createJsonConverter();
+
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->curl = $objectManagerHelper->getObject(
+            \Magento\Analytics\Model\Connector\Http\Client\Curl::class,
+            [
+                'curlFactory' => $curlFactoryMock,
+                'responseFactory' => $this->responseFactoryMock,
+                'converter' => $this->converterMock,
+                'logger' => $this->loggerMock,
+            ]
+        );
+    }
+
+    /**
+     * Returns test parameters for request.
+     *
+     * @return array
+     */
+    public function getTestData()
+    {
+        return [
+            [
+                'data' => [
+                    'version' => '1.1',
+                    'body'=> ['name' => 'value'],
+                    'url' => 'http://www.mystore.com',
+                    'method' => \Magento\Framework\HTTP\ZendClient::POST,
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     * @throws \Zend_Http_Exception
+     * @dataProvider getTestData
+     */
+    public function testRequestSuccess(array $data)
+    {
+        $responseString = 'This is response.';
+        $response = new  \Zend_Http_Response(201, [], $responseString);
+        $this->curlAdapterMock->expects($this->once())
+            ->method('write')
+            ->with(
+                $data['method'],
+                $data['url'],
+                $data['version'],
+                [$this->converterMock->getContentTypeHeader()],
+                json_encode($data['body'])
+            );
+        $this->curlAdapterMock->expects($this->once())
+            ->method('read')
+            ->willReturn($responseString);
+        $this->curlAdapterMock->expects($this->any())
+            ->method('getErrno')
+            ->willReturn(0);
+
+        $this->responseFactoryMock->expects($this->any())
+            ->method('create')
+            ->with($responseString)
+            ->willReturn($response);
+
+        $this->assertEquals(
+            $response,
+            $this->curl->request(
+                $data['method'],
+                $data['url'],
+                $data['body'],
+                [$this->converterMock->getContentTypeHeader()],
+                $data['version']
+            )
+        );
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     * @throws \Zend_Http_Exception
+     * @dataProvider getTestData
+     */
+    public function testRequestError(array $data)
+    {
+        $response = new  \Zend_Http_Response(0, []);
+        $this->curlAdapterMock->expects($this->once())
+            ->method('write')
+            ->with(
+                $data['method'],
+                $data['url'],
+                $data['version'],
+                [$this->converterMock->getContentTypeHeader()],
+                json_encode($data['body'])
+            );
+        $this->curlAdapterMock->expects($this->once())
+            ->method('read');
+        $this->curlAdapterMock->expects($this->atLeastOnce())
+            ->method('getErrno')
+            ->willReturn(1);
+        $this->curlAdapterMock->expects($this->atLeastOnce())
+            ->method('getError')
+            ->willReturn('CURL error.');
+
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->with(
+                new \Exception(
+                    'MBI service CURL connection error #1: CURL error.'
+                )
+            );
+
+        $this->assertEquals(
+            $response,
+            $this->curl->request(
+                $data['method'],
+                $data['url'],
+                $data['body'],
+                [$this->converterMock->getContentTypeHeader()],
+                $data['version']
+            )
+        );
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createJsonConverter()
+    {
+        $converterMock = $this->getMockBuilder(JsonConverter::class)
+            ->setMethodsExcept(['getContentTypeHeader'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $converterMock->expects($this->any())->method('toBody')->willReturnCallback(function ($value) {
+            return json_encode($value);
+        });
+        return $converterMock;
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/JsonConverterTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/JsonConverterTest.php
new file mode 100644
index 0000000000000..d3258c8ae9caa
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/JsonConverterTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector\Http;
+
+use Magento\Analytics\Model\Connector\Http\JsonConverter;
+use Magento\Framework\Serialize\Serializer\Json;
+
+class JsonConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * @var JsonConverter
+     */
+    private $converter;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->serializerMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->converter = $this->objectManagerHelper->getObject(
+            JsonConverter::class,
+            ['serializer' => $this->serializerMock]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testConverterContainsHeader()
+    {
+        $this->assertEquals(
+            'Content-Type: ' . JsonConverter::CONTENT_MEDIA_TYPE,
+            $this->converter->getContentTypeHeader()
+        );
+    }
+
+    /**
+     * @param array|null $unserializedResult
+     * @param array $expected
+     * @dataProvider convertBodyDataProvider
+     */
+    public function testConvertBody($unserializedResult, $expected)
+    {
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn($unserializedResult);
+        $this->assertEquals($expected, $this->converter->fromBody('body'));
+    }
+
+    /**
+     * @return array
+     */
+    public function convertBodyDataProvider()
+    {
+        return [
+            [null, ['body']],
+            [['unserializedBody'], ['unserializedBody']]
+        ];
+    }
+
+    /**
+     *  return void
+     */
+    public function testConvertData()
+    {
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->willReturn('serializedResult');
+        $this->assertEquals('serializedResult', $this->converter->toBody(["token" => "secret-token"]));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/ResponseResolverTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/ResponseResolverTest.php
new file mode 100644
index 0000000000000..2564240c4fa11
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/ResponseResolverTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Analytics\Test\Unit\Model\Connector\Http;
+
+use Magento\Analytics\Model\Connector\Http\ConverterInterface;
+use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ResponseResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConverterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterMock;
+
+    /**
+     * @var ResponseHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $successResponseHandlerMock;
+
+    /**
+     * @var ResponseHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notFoundResponseHandlerMock;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $responseResolver;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->converterMock = $this->getMockBuilder(ConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->successResponseHandlerMock = $this->getMockBuilder(ResponseHandlerInterface::class)
+            ->getMockForAbstractClass();
+        $this->notFoundResponseHandlerMock = $this->getMockBuilder(ResponseHandlerInterface::class)
+            ->getMockForAbstractClass();
+        $this->responseResolver = $this->objectManagerHelper->getObject(
+            ResponseResolver::class,
+            [
+                'converter' => $this->converterMock,
+                'responseHandlers' => [
+                    201 => $this->successResponseHandlerMock,
+                    404 => $this->notFoundResponseHandlerMock,
+                ]
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     * @throws \Zend_Http_Exception
+     */
+    public function testGetResultHandleResponseSuccess()
+    {
+        $expectedBody = ['test' => 'testValue'];
+        $response = new \Zend_Http_Response(201, ['Content-Type' => 'application/json'], json_encode($expectedBody));
+        $this->converterMock
+            ->method('getContentMediaType')
+            ->willReturn('application/json');
+
+        $this->successResponseHandlerMock
+            ->expects($this->once())
+            ->method('handleResponse')
+            ->with($expectedBody)
+            ->willReturn(true);
+        $this->notFoundResponseHandlerMock
+            ->expects($this->never())
+            ->method('handleResponse');
+        $this->converterMock
+            ->method('fromBody')
+            ->willReturn($expectedBody);
+        $this->assertTrue($this->responseResolver->getResult($response));
+    }
+
+    /**
+     * @return void
+     * @throws \Zend_Http_Exception
+     */
+    public function testGetResultHandleResponseUnexpectedContentType()
+    {
+        $expectedBody = 'testString';
+        $response = new \Zend_Http_Response(201, ['Content-Type' => 'plain/text'], $expectedBody);
+        $this->converterMock
+            ->method('getContentMediaType')
+            ->willReturn('application/json');
+        $this->converterMock
+            ->expects($this->never())
+            ->method('fromBody');
+        $this->successResponseHandlerMock
+            ->expects($this->once())
+            ->method('handleResponse')
+            ->with([])
+            ->willReturn(false);
+        $this->notFoundResponseHandlerMock
+            ->expects($this->never())
+            ->method('handleResponse');
+        $this->assertFalse($this->responseResolver->getResult($response));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php
new file mode 100644
index 0000000000000..c2b6c72e868c1
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\JsonConverter;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Psr\Log\LoggerInterface;
+use Magento\Analytics\Model\Connector\NotifyDataChangedCommand;
+use Magento\Analytics\Model\Connector\Http\ClientInterface;
+
+class NotifyDataChangedCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var NotifyDataChangedCommand
+     */
+    private $notifyDataChangedCommand;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $httpClientMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    public $configMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    protected function setUp()
+    {
+        $this->analyticsTokenMock =  $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->httpClientMock =  $this->getMockBuilder(ClientInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configMock =  $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->loggerMock =  $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $successHandler = $this->getMockBuilder(\Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface::class)
+            ->getMockForAbstractClass();
+        $successHandler->method('handleResponse')
+            ->willReturn(true);
+        $serializerMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $serializerMock->expects($this->any())
+            ->method('unserialize')
+            ->willReturn(['unserialized data']);
+        $objectManager = new ObjectManager($this);
+        $this->notifyDataChangedCommand = $objectManager->getObject(
+            NotifyDataChangedCommand::class,
+            [
+                'analyticsToken' => $this->analyticsTokenMock,
+                'httpClient' => $this->httpClientMock,
+                'config' => $this->configMock,
+                'responseResolver' => $objectManager->getObject(
+                    ResponseResolver::class,
+                    [
+                        'converter' => $objectManager->getObject(
+                            JsonConverter::class,
+                            ['serializer' => $serializerMock]
+                        ),
+                        'responseHandlers' => [201 => $successHandler]
+                    ]
+                ),
+                'logger' => $this->loggerMock
+            ]
+        );
+    }
+
+    public function testExecuteSuccess()
+    {
+        $configVal = "Config val";
+        $token = "Secret token!";
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->configMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($configVal);
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('getToken')
+            ->willReturn($token);
+        $this->httpClientMock->expects($this->once())
+            ->method('request')
+            ->with(
+                ZendClient::POST,
+                $configVal,
+                ['access-token' => $token, 'url' => $configVal]
+            )->willReturn(new \Zend_Http_Response(201, []));
+        $this->assertTrue($this->notifyDataChangedCommand->execute());
+    }
+
+    public function testExecuteWithoutToken()
+    {
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+        $this->httpClientMock->expects($this->never())
+            ->method('request');
+        $this->assertFalse($this->notifyDataChangedCommand->execute());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php
new file mode 100644
index 0000000000000..8a3f4efb15cf4
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\ClientInterface;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Analytics\Model\Connector\OTPRequest;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * A unit test for testing of the representation of a 'OTP' request.
+ */
+class OTPRequestTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var OTPRequest
+     */
+    private $subject;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $httpClientMock;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var ResponseResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseResolverMock;
+
+    /**
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->httpClientMock = $this->getMockBuilder(ClientInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->responseResolverMock = $this->getMockBuilder(ResponseResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        
+        $this->subject = new OTPRequest(
+            $this->analyticsTokenMock,
+            $this->httpClientMock,
+            $this->configMock,
+            $this->responseResolverMock,
+            $this->loggerMock
+        );
+    }
+
+    /**
+     * Returns test parameters for request.
+     *
+     * @return array
+     */
+    private function getTestData()
+    {
+        return [
+            'otp' => 'thisisotp',
+            'url' => 'http://www.mystore.com',
+            'access-token' => 'thisisaccesstoken',
+            'method' => \Magento\Framework\HTTP\ZendClient::POST,
+            'body'=> ['access-token' => 'thisisaccesstoken','url' => 'http://www.mystore.com'],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testCallSuccess()
+    {
+        $data = $this->getTestData();
+
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('getToken')
+            ->willReturn($data['access-token']);
+
+        $this->configMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($data['url']);
+
+        $this->httpClientMock->expects($this->once())
+            ->method('request')
+            ->with(
+                $data['method'],
+                $data['url'],
+                $data['body']
+            )
+            ->willReturn(new \Zend_Http_Response(201, []));
+        $this->responseResolverMock->expects($this->once())
+            ->method('getResult')
+            ->willReturn($data['otp']);
+
+        $this->assertEquals(
+            $data['otp'],
+            $this->subject->call()
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testCallNoAccessToken()
+    {
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+
+        $this->httpClientMock->expects($this->never())
+            ->method('request');
+
+        $this->assertFalse($this->subject->call());
+    }
+
+    /**
+     * @return void
+     */
+    public function testCallNoOtp()
+    {
+        $data = $this->getTestData();
+
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('getToken')
+            ->willReturn($data['access-token']);
+
+        $this->configMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($data['url']);
+
+        $this->httpClientMock->expects($this->once())
+            ->method('request')
+            ->with(
+                $data['method'],
+                $data['url'],
+                $data['body']
+            )
+            ->willReturn(new \Zend_Http_Response(0, []));
+
+        $this->responseResolverMock->expects($this->once())
+            ->method('getResult')
+            ->willReturn(false);
+
+        $this->loggerMock->expects($this->once())
+            ->method('warning');
+
+        $this->assertFalse($this->subject->call());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/OTPTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/OTPTest.php
new file mode 100644
index 0000000000000..4f3101e87ab9a
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/OTPTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\Connector\ResponseHandler\OTP;
+
+class OTPTest extends \PHPUnit\Framework\TestCase
+{
+    public function testHandleResult()
+    {
+        $OTPHandler = new OTP();
+        $this->assertFalse($OTPHandler->handleResponse([]));
+        $expectedOtp = 123;
+        $this->assertEquals($expectedOtp, $OTPHandler->handleResponse(['otp' => $expectedOtp]));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/ReSignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/ReSignUpTest.php
new file mode 100644
index 0000000000000..928883ca7bad4
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/ReSignUpTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Analytics\Model\Connector\ResponseHandler\ReSignUp;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+
+class ReSignUpTest extends \PHPUnit\Framework\TestCase
+{
+    public function testHandleResult()
+    {
+        $analyticsToken = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $analyticsToken->expects($this->once())
+            ->method('storeToken')
+            ->with(null);
+        $subscriptionHandler = $this->getMockBuilder(SubscriptionHandler::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subscriptionStatusProvider = $this->getMockBuilder(SubscriptionStatusProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subscriptionStatusProvider->method('getStatus')->willReturn(SubscriptionStatusProvider::ENABLED);
+        $reSignUpHandler = new ReSignUp($analyticsToken, $subscriptionHandler, $subscriptionStatusProvider);
+        $this->assertFalse($reSignUpHandler->handleResponse([]));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/SignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/SignUpTest.php
new file mode 100644
index 0000000000000..15f9884428d2e
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/SignUpTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\ResponseHandler\SignUp;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class SignUpTest extends \PHPUnit\Framework\TestCase
+{
+    public function testHandleResult()
+    {
+        $accessToken = 'access-token-123';
+        $analyticsToken = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $analyticsToken->expects($this->once())
+            ->method('storeToken')
+            ->with($accessToken);
+        $objectManager = new ObjectManager($this);
+        $signUpHandler = $objectManager->getObject(
+            SignUp::class,
+            ['analyticsToken' => $analyticsToken]
+        );
+        $this->assertFalse($signUpHandler->handleResponse([]));
+        $this->assertEquals($accessToken, $signUpHandler->handleResponse(['access-token' => $accessToken]));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/UpdateTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/UpdateTest.php
new file mode 100644
index 0000000000000..9a3093535afbf
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/UpdateTest.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector\ResponseHandler;
+
+use Magento\Analytics\Model\Connector\ResponseHandler\Update;
+
+class UpdateTest extends \PHPUnit\Framework\TestCase
+{
+    public function testHandleResult()
+    {
+        $updateHandler = new Update();
+        $this->assertTrue($updateHandler->handleResponse([]));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php
new file mode 100644
index 0000000000000..c113b2dc275dd
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector;
+
+use Magento\Analytics\Model\Connector\Http\ClientInterface;
+use Magento\Analytics\Model\Connector\Http\JsonConverter;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Analytics\Model\Connector\SignUpCommand;
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\IntegrationManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Integration\Model\Oauth\Token as IntegrationToken;
+use Psr\Log\LoggerInterface;
+
+class SignUpCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SignUpCommand
+     */
+    private $signUpCommand;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var IntegrationManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $integrationManagerMock;
+
+    /**
+     * @var IntegrationToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $integrationToken;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $httpClientMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var ResponseResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseResolverMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->analyticsTokenMock =  $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->integrationManagerMock = $this->getMockBuilder(IntegrationManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->integrationToken = $this->getMockBuilder(IntegrationToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->httpClientMock = $this->getMockBuilder(ClientInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->responseResolverMock = $this->getMockBuilder(ResponseResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->signUpCommand = new SignUpCommand(
+            $this->analyticsTokenMock,
+            $this->integrationManagerMock,
+            $this->configMock,
+            $this->httpClientMock,
+            $this->loggerMock,
+            $this->responseResolverMock
+        );
+    }
+
+    /**
+     * @throws \Zend_Http_Exception
+     * @return void
+     */
+    public function testExecuteSuccess()
+    {
+        $this->integrationManagerMock->expects($this->once())
+            ->method('generateToken')
+            ->willReturn($this->integrationToken);
+        $this->integrationManagerMock->expects($this->once())
+            ->method('activateIntegration')
+            ->willReturn(true);
+        $data = $this->getTestData();
+
+        $this->configMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($data['url']);
+        $this->integrationToken->expects($this->any())
+            ->method('getData')
+            ->with('token')
+            ->willReturn($data['integration-token']);
+        $httpResponse = new \Zend_Http_Response(201, [], '{"access-token": "' . $data['access-token'] . '"}');
+        $this->httpClientMock->expects($this->once())
+            ->method('request')
+            ->with(
+                $data['method'],
+                $data['url'],
+                $data['body']
+            )
+            ->willReturn($httpResponse);
+        $this->responseResolverMock->expects($this->any())
+            ->method('getResult')
+            ->with($httpResponse)
+            ->willReturn(true);
+        $this->assertTrue($this->signUpCommand->execute());
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteFailureCannotGenerateToken()
+    {
+        $this->integrationManagerMock->expects($this->once())
+            ->method('generateToken')
+            ->willReturn(false);
+        $this->integrationManagerMock->expects($this->never())
+            ->method('activateIntegration');
+        $this->assertFalse($this->signUpCommand->execute());
+    }
+
+    /**
+     * @throws \Zend_Http_Exception
+     * @return void
+     */
+    public function testExecuteFailureResponseIsEmpty()
+    {
+        $this->integrationManagerMock->expects($this->once())
+            ->method('generateToken')
+            ->willReturn($this->integrationToken);
+        $this->integrationManagerMock->expects($this->once())
+            ->method('activateIntegration')
+            ->willReturn(true);
+        $httpResponse = new \Zend_Http_Response(0, []);
+        $this->httpClientMock->expects($this->once())
+            ->method('request')
+            ->willReturn($httpResponse);
+        $this->responseResolverMock->expects($this->any())
+            ->method('getResult')
+            ->willReturn(false);
+        $this->assertFalse($this->signUpCommand->execute());
+    }
+
+    /**
+     * Returns test parameters for request.
+     *
+     * @return array
+     */
+    private function getTestData()
+    {
+        return [
+            'url' => 'http://www.mystore.com',
+            'access-token' => 'thisisaccesstoken',
+            'integration-token' => 'thisisintegrationtoken',
+            'method' => \Magento\Framework\HTTP\ZendClient::POST,
+            'body'=> ['token' => 'thisisintegrationtoken','url' => 'http://www.mystore.com'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php
new file mode 100644
index 0000000000000..bf3c79e22fc52
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\HTTP\ZendClient;
+use Psr\Log\LoggerInterface;
+use Magento\Analytics\Model\Connector\UpdateCommand;
+use Magento\Analytics\Model\Connector\Http\ClientInterface;
+
+class UpdateCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UpdateCommand
+     */
+    private $updateCommand;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $httpClientMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    public $configMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var ResponseResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseResolverMock;
+
+    protected function setUp()
+    {
+        $this->analyticsTokenMock =  $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->httpClientMock =  $this->getMockBuilder(ClientInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configMock =  $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->loggerMock =  $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->flagManagerMock =  $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->responseResolverMock = $this->getMockBuilder(ResponseResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->updateCommand = new UpdateCommand(
+            $this->analyticsTokenMock,
+            $this->httpClientMock,
+            $this->configMock,
+            $this->loggerMock,
+            $this->flagManagerMock,
+            $this->responseResolverMock
+        );
+    }
+
+    public function testExecuteSuccess()
+    {
+        $url = "old.localhost.com";
+        $configVal = "Config val";
+        $token = "Secret token!";
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+
+        $this->configMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($configVal);
+
+        $this->flagManagerMock->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
+            ->willReturn($url);
+
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('getToken')
+            ->willReturn($token);
+
+        $this->httpClientMock->expects($this->once())
+            ->method('request')
+            ->with(
+                ZendClient::PUT,
+                $configVal,
+                [
+                    'url' => $url,
+                    'new-url' => $configVal,
+                    'access-token' => $token
+                ]
+            )->willReturn(new \Zend_Http_Response(200, []));
+
+        $this->responseResolverMock->expects($this->once())
+            ->method('getResult')
+            ->willReturn(true);
+
+        $this->assertTrue($this->updateCommand->execute());
+    }
+
+    public function testExecuteWithoutToken()
+    {
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+
+        $this->assertFalse($this->updateCommand->execute());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php
new file mode 100644
index 0000000000000..714d0daf5c419
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\Connector;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Analytics\Model\Connector\SignUpCommand;
+
+class ConnectorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var Connector
+     */
+    private $connector;
+
+    /**
+     * @var SignUpCommand|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $signUpCommandMock;
+
+    /**
+     * @var array
+     */
+    private $commands;
+
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->signUpCommandMock = $this->getMockBuilder(SignUpCommand::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commands = ['signUp' => SignUpCommand::class];
+        $this->connector = new Connector($this->commands, $this->objectManagerMock);
+    }
+
+    public function testExecute()
+    {
+        $commandName = 'signUp';
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($this->commands[$commandName])
+            ->willReturn($this->signUpCommandMock);
+        $this->signUpCommandMock->expects($this->once())
+            ->method('execute')
+            ->willReturn(true);
+        $this->assertTrue($this->connector->execute($commandName));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteCommandNotFound()
+    {
+        $commandName = 'register';
+        $this->connector->execute($commandName);
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/CryptographerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/CryptographerTest.php
new file mode 100644
index 0000000000000..6ccf81cb94bad
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/CryptographerTest.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Cryptographer;
+use Magento\Analytics\Model\EncodedContext;
+use Magento\Analytics\Model\EncodedContextFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CryptographerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var EncodedContextFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $encodedContextFactoryMock;
+
+    /**
+     * @var EncodedContext|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $encodedContextMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Cryptographer
+     */
+    private $cryptographer;
+
+    /**
+     * @var string
+     */
+    private $key;
+
+    /**
+     * @var array
+     */
+    private $initializationVectors;
+
+    /**
+     * @var
+     */
+    private $source;
+
+    /**
+     * @var string
+     */
+    private $cipherMethod = 'AES-256-CBC';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->encodedContextFactoryMock = $this->getMockBuilder(EncodedContextFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->encodedContextMock = $this->getMockBuilder(EncodedContext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->key = '';
+        $this->source = '';
+        $this->initializationVectors = [];
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->cryptographer = $this->objectManagerHelper->getObject(
+            Cryptographer::class,
+            [
+                'analyticsToken' => $this->analyticsTokenMock,
+                'encodedContextFactory' => $this->encodedContextFactoryMock,
+                'cipherMethod' => $this->cipherMethod,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testEncode()
+    {
+        $token = 'some-token-value';
+        $this->source = 'Some text';
+        $this->key = hash('sha256', $token);
+
+        $checkEncodedContext = function ($parameters) {
+            $emptyRequiredParameters =
+                array_diff(['content', 'initializationVector'], array_keys(array_filter($parameters)));
+            if ($emptyRequiredParameters) {
+                return false;
+            }
+
+            $encryptedData = openssl_encrypt(
+                $this->source,
+                $this->cipherMethod,
+                $this->key,
+                OPENSSL_RAW_DATA,
+                $parameters['initializationVector']
+            );
+
+            return ($encryptedData === $parameters['content']);
+        };
+
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('getToken')
+            ->with()
+            ->willReturn($token);
+
+        $this->encodedContextFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with($this->callback($checkEncodedContext))
+            ->willReturn($this->encodedContextMock);
+
+        $this->assertSame($this->encodedContextMock, $this->cryptographer->encode($this->source));
+    }
+
+    /**
+     * @return void
+     */
+    public function testEncodeUniqueInitializationVector()
+    {
+        $this->source = 'Some text';
+        $token = 'some-token-value';
+
+        $registerInitializationVector = function ($parameters) {
+            if (empty($parameters['initializationVector'])) {
+                return false;
+            }
+
+            $this->initializationVectors[] = $parameters['initializationVector'];
+
+            return true;
+        };
+
+        $this->analyticsTokenMock
+            ->expects($this->exactly(2))
+            ->method('getToken')
+            ->with()
+            ->willReturn($token);
+
+        $this->encodedContextFactoryMock
+            ->expects($this->exactly(2))
+            ->method('create')
+            ->with($this->callback($registerInitializationVector))
+            ->willReturn($this->encodedContextMock);
+
+        $this->assertSame($this->encodedContextMock, $this->cryptographer->encode($this->source));
+        $this->assertSame($this->encodedContextMock, $this->cryptographer->encode($this->source));
+        $this->assertCount(2, array_unique($this->initializationVectors));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @dataProvider encodeNotValidSourceDataProvider
+     */
+    public function testEncodeNotValidSource($source)
+    {
+        $this->cryptographer->encode($source);
+    }
+
+    /**
+     * @return array
+     */
+    public function encodeNotValidSourceDataProvider()
+    {
+        return [
+            'Array' => [[]],
+            'Empty string' => [''],
+        ];
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testEncodeNotValidCipherMethod()
+    {
+        $source = 'Some string';
+        $cryptographer = $this->objectManagerHelper->getObject(
+            Cryptographer::class,
+            [
+                'cipherMethod' => 'Wrong-method',
+            ]
+        );
+
+        $cryptographer->encode($source);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testEncodeTokenNotValid()
+    {
+        $source = 'Some string';
+
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('getToken')
+            ->with()
+            ->willReturn(null);
+
+        $this->cryptographer->encode($source);
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/EncodedContextTest.php b/app/code/Magento/Analytics/Test/Unit/Model/EncodedContextTest.php
new file mode 100644
index 0000000000000..e85dde90657ff
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/EncodedContextTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\EncodedContext;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class EncodedContextTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+    }
+
+    /**
+     * @param string $content
+     * @param string|null $initializationVector
+     * @return void
+     * @dataProvider constructDataProvider
+     */
+    public function testConstruct($content, $initializationVector)
+    {
+        $constructorArguments = [
+            'content' => $content,
+            'initializationVector' => $initializationVector,
+        ];
+        /** @var EncodedContext $encodedContext */
+        $encodedContext = $this->objectManagerHelper->getObject(
+            EncodedContext::class,
+            array_filter($constructorArguments)
+        );
+
+        $this->assertSame($content, $encodedContext->getContent());
+        $this->assertSame($initializationVector ?: '', $encodedContext->getInitializationVector());
+    }
+
+    /**
+     * @return array
+     */
+    public function constructDataProvider()
+    {
+        return [
+            'Without Initialization Vector' => ['content text', null],
+            'With Initialization Vector' => ['content text', 'c51sd3c4sd68c5sd'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerNotificationTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerNotificationTest.php
new file mode 100644
index 0000000000000..d1cf2ce48a04e
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerNotificationTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\Connector;
+use Magento\Analytics\Model\ExportDataHandler;
+use Magento\Analytics\Model\ExportDataHandlerNotification;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ExportDataHandlerNotificationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+    }
+
+    /**
+     * @return void
+     */
+    public function testThatNotifyExecuted()
+    {
+        $expectedResult = true;
+        $notifyCommandName = 'notifyDataChanged';
+        $exportDataHandlerMockObject = $this->createExportDataHandlerMock();
+        $analyticsConnectorMockObject = $this->createAnalyticsConnectorMock();
+        /**
+         * @var $exportDataHandlerNotification ExportDataHandlerNotification
+         */
+        $exportDataHandlerNotification = $this->objectManagerHelper->getObject(
+            ExportDataHandlerNotification::class,
+            [
+                'exportDataHandler' => $exportDataHandlerMockObject,
+                'connector' => $analyticsConnectorMockObject,
+            ]
+        );
+        $exportDataHandlerMockObject->expects($this->once())
+            ->method('prepareExportData')
+            ->willReturn($expectedResult);
+        $analyticsConnectorMockObject->expects($this->once())
+            ->method('execute')
+            ->with($notifyCommandName);
+        $this->assertEquals($expectedResult, $exportDataHandlerNotification->prepareExportData());
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createExportDataHandlerMock()
+    {
+        return $this->getMockBuilder(ExportDataHandler::class)->disableOriginalConstructor()->getMock();
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createAnalyticsConnectorMock()
+    {
+        return $this->getMockBuilder(Connector::class)->disableOriginalConstructor()->getMock();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
new file mode 100644
index 0000000000000..cf00556cfe590
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\Cryptographer;
+use Magento\Analytics\Model\EncodedContext;
+use Magento\Analytics\Model\ExportDataHandler;
+use Magento\Analytics\Model\FileRecorder;
+use Magento\Analytics\Model\ReportWriterInterface;
+use Magento\Framework\Archive;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var Archive|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $archiveMock;
+
+    /**
+     * @var ReportWriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reportWriterMock;
+
+    /**
+     * @var Cryptographer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cryptographerMock;
+
+    /**
+     * @var FileRecorder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileRecorderMock;
+
+    /**
+     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryMock;
+
+    /**
+     * @var EncodedContext|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $encodedContextMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ExportDataHandler
+     */
+    private $exportDataHandler;
+
+    /**
+     * @var string
+     */
+    private $subdirectoryPath = 'analytics/';
+
+    /**
+     * @var string
+     */
+    private $archiveName = 'data.tgz';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->filesystemMock = $this->getMockBuilder(Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->archiveMock = $this->getMockBuilder(Archive::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->reportWriterMock = $this->getMockBuilder(ReportWriterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cryptographerMock = $this->getMockBuilder(Cryptographer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fileRecorderMock = $this->getMockBuilder(FileRecorder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->directoryMock = $this->getMockBuilder(WriteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->encodedContextMock = $this->getMockBuilder(EncodedContext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->exportDataHandler = $this->objectManagerHelper->getObject(
+            ExportDataHandler::class,
+            [
+                'filesystem' => $this->filesystemMock,
+                'archive' => $this->archiveMock,
+                'reportWriter' => $this->reportWriterMock,
+                'cryptographer' => $this->cryptographerMock,
+                'fileRecorder' => $this->fileRecorderMock,
+                'subdirectoryPath' => $this->subdirectoryPath,
+                'archiveName' => $this->archiveName,
+            ]
+        );
+    }
+
+    /**
+     * @param bool $isArchiveSourceDirectory
+     * @dataProvider prepareExportDataDataProvider
+     */
+    public function testPrepareExportData($isArchiveSourceDirectory)
+    {
+        $tmpFilesDirectoryPath = $this->subdirectoryPath . 'tmp/';
+        $archiveRelativePath = $this->subdirectoryPath . $this->archiveName;
+
+        $archiveSource = $isArchiveSourceDirectory ? (__DIR__) : '/tmp/' . $tmpFilesDirectoryPath;
+        $archiveAbsolutePath = '/tmp/' . $archiveRelativePath;
+
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::SYS_TMP)
+            ->willReturn($this->directoryMock);
+        $this->directoryMock
+            ->expects($this->exactly(4))
+            ->method('delete')
+            ->withConsecutive(
+                [$tmpFilesDirectoryPath],
+                [$archiveRelativePath]
+            );
+
+        $this->directoryMock
+            ->expects($this->exactly(4))
+            ->method('getAbsolutePath')
+            ->withConsecutive(
+                [$tmpFilesDirectoryPath],
+                [$tmpFilesDirectoryPath],
+                [$archiveRelativePath],
+                [$archiveRelativePath]
+            )
+            ->willReturnOnConsecutiveCalls(
+                $archiveSource,
+                $archiveSource,
+                $archiveAbsolutePath,
+                $archiveAbsolutePath
+            );
+
+        $this->reportWriterMock
+            ->expects($this->once())
+            ->method('write')
+            ->with($this->directoryMock, $tmpFilesDirectoryPath);
+
+        $this->directoryMock
+            ->expects($this->exactly(2))
+            ->method('isExist')
+            ->withConsecutive(
+                [$tmpFilesDirectoryPath],
+                [$archiveRelativePath]
+            )
+            ->willReturnOnConsecutiveCalls(
+                true,
+                true
+            );
+
+        $this->directoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(dirname($archiveRelativePath));
+
+        $this->archiveMock
+            ->expects($this->once())
+            ->method('pack')
+            ->with(
+                $archiveSource,
+                $archiveAbsolutePath,
+                $isArchiveSourceDirectory
+            );
+
+        $fileContent = 'Some text';
+        $this->directoryMock
+            ->expects($this->once())
+            ->method('readFile')
+            ->with($archiveRelativePath)
+            ->willReturn($fileContent);
+
+        $this->cryptographerMock
+            ->expects($this->once())
+            ->method('encode')
+            ->with($fileContent)
+            ->willReturn($this->encodedContextMock);
+
+        $this->fileRecorderMock
+            ->expects($this->once())
+            ->method('recordNewFile')
+            ->with($this->encodedContextMock);
+
+        $this->assertTrue($this->exportDataHandler->prepareExportData());
+    }
+
+    /**
+     * @return array
+     */
+    public function prepareExportDataDataProvider()
+    {
+        return [
+            'Data source for archive is directory' => [true],
+            'Data source for archive isn\'t directory' => [false],
+        ];
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testPrepareExportDataWithLocalizedException()
+    {
+        $tmpFilesDirectoryPath = $this->subdirectoryPath . 'tmp/';
+        $archivePath = $this->subdirectoryPath . $this->archiveName;
+
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::SYS_TMP)
+            ->willReturn($this->directoryMock);
+        $this->reportWriterMock
+            ->expects($this->once())
+            ->method('write')
+            ->with($this->directoryMock, $tmpFilesDirectoryPath);
+        $this->directoryMock
+            ->expects($this->exactly(3))
+            ->method('delete')
+            ->withConsecutive(
+                [$tmpFilesDirectoryPath],
+                [$tmpFilesDirectoryPath],
+                [$archivePath]
+            );
+        $this->directoryMock
+            ->expects($this->exactly(2))
+            ->method('getAbsolutePath')
+            ->with($tmpFilesDirectoryPath);
+        $this->directoryMock
+            ->expects($this->once())
+            ->method('isExist')
+            ->with($tmpFilesDirectoryPath)
+            ->willReturn(false);
+
+        $this->assertNull($this->exportDataHandler->prepareExportData());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/FileInfoManagerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/FileInfoManagerTest.php
new file mode 100644
index 0000000000000..e49c942161cf2
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/FileInfoManagerTest.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\FileInfo;
+use Magento\Analytics\Model\FileInfoFactory;
+use Magento\Analytics\Model\FileInfoManager;
+use Magento\Framework\FlagManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FileInfoManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var FileInfoFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoFactoryMock;
+
+    /**
+     * @var FileInfo|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var FileInfoManager
+     */
+    private $fileInfoManager;
+
+    /**
+     * @var string
+     */
+    private $flagCode = 'analytics_file_info';
+
+    /**
+     * @var array
+     */
+    private $encodedParameters = [
+        'initializationVector'
+    ];
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fileInfoFactoryMock = $this->getMockBuilder(FileInfoFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fileInfoMock = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->fileInfoManager = $this->objectManagerHelper->getObject(
+            FileInfoManager::class,
+            [
+                'flagManager' => $this->flagManagerMock,
+                'fileInfoFactory' => $this->fileInfoFactoryMock,
+                'flagCode' => $this->flagCode,
+                'encodedParameters' => $this->encodedParameters,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSave()
+    {
+        $path = 'path/to/file';
+        $initializationVector = openssl_random_pseudo_bytes(16);
+        $parameters = [
+            'path' => $path,
+            'initializationVector' => $initializationVector,
+        ];
+
+        $this->fileInfoMock
+            ->expects($this->once())
+            ->method('getPath')
+            ->with()
+            ->willReturn($path);
+        $this->fileInfoMock
+            ->expects($this->once())
+            ->method('getInitializationVector')
+            ->with()
+            ->willReturn($initializationVector);
+
+        foreach ($this->encodedParameters as $encodedParameter) {
+            $parameters[$encodedParameter] = base64_encode($parameters[$encodedParameter]);
+        }
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('saveFlag')
+            ->with($this->flagCode, $parameters);
+
+        $this->assertTrue($this->fileInfoManager->save($this->fileInfoMock));
+    }
+
+    /**
+     * @param string|null $path
+     * @param string|null $initializationVector
+     * @dataProvider saveWithLocalizedExceptionDataProvider
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testSaveWithLocalizedException($path, $initializationVector)
+    {
+        $this->fileInfoMock
+            ->expects($this->once())
+            ->method('getPath')
+            ->with()
+            ->willReturn($path);
+        $this->fileInfoMock
+            ->expects($this->once())
+            ->method('getInitializationVector')
+            ->with()
+            ->willReturn($initializationVector);
+
+        $this->fileInfoManager->save($this->fileInfoMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function saveWithLocalizedExceptionDataProvider()
+    {
+        return [
+            'Empty FileInfo' => [null, null],
+            'FileInfo without IV' => ['path/to/file', null],
+        ];
+    }
+
+    /**
+     * @dataProvider loadDataProvider
+     * @param array|null $parameters
+     */
+    public function testLoad($parameters)
+    {
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('getFlagData')
+            ->with($this->flagCode)
+            ->willReturn($parameters);
+
+        $processedParameters = $parameters ?: [];
+        $encodedParameters = array_intersect($this->encodedParameters, array_keys($processedParameters));
+        foreach ($encodedParameters as $encodedParameter) {
+            $processedParameters[$encodedParameter] = base64_decode($processedParameters[$encodedParameter]);
+        }
+
+        $this->fileInfoFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with($processedParameters)
+            ->willReturn($this->fileInfoMock);
+
+        $this->assertSame($this->fileInfoMock, $this->fileInfoManager->load());
+    }
+
+    /**
+     * @return array
+     */
+    public function loadDataProvider()
+    {
+        return [
+            'Empty flag data' => [null],
+            'Correct flag data' => [[
+                'path' => 'path/to/file',
+                'initializationVector' => 'xUJjl54MVke+FvMFSBpRSA==',
+            ]],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php b/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php
new file mode 100644
index 0000000000000..2a3588c8032fc
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/FileInfoTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\FileInfo;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FileInfoTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+    }
+
+    /**
+     * @param string|null $path
+     * @param string|null $initializationVector
+     * @return void
+     * @dataProvider constructDataProvider
+     */
+    public function testConstruct($path, $initializationVector)
+    {
+        $constructorArguments = [
+            'path' => $path,
+            'initializationVector' => $initializationVector,
+        ];
+        /** @var FileInfo $fileInfo */
+        $fileInfo = $this->objectManagerHelper->getObject(
+            FileInfo::class,
+            array_filter($constructorArguments)
+        );
+
+        $this->assertSame($path ?: '', $fileInfo->getPath());
+        $this->assertSame($initializationVector ?: '', $fileInfo->getInitializationVector());
+    }
+
+    /**
+     * @return array
+     */
+    public function constructDataProvider()
+    {
+        return [
+            'Degenerate object' => [null, null],
+            'Without Initialization Vector' => ['content text', null],
+            'With Initialization Vector' => ['content text', 'c51sd3c4sd68c5sd'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php
new file mode 100644
index 0000000000000..bf5795111230b
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\EncodedContext;
+use Magento\Analytics\Model\FileInfo;
+use Magento\Analytics\Model\FileInfoFactory;
+use Magento\Analytics\Model\FileInfoManager;
+use Magento\Analytics\Model\FileRecorder;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FileRecorderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FileInfoManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoManagerMock;
+
+    /**
+     * @var FileInfoFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoFactoryMock;
+
+    /**
+     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var FileInfo|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoMock;
+
+    /**
+     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryMock;
+
+    /**
+     * @var EncodedContext|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $encodedContextMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var FileRecorder
+     */
+    private $fileRecorder;
+
+    /**
+     * @var string
+     */
+    private $fileSubdirectoryPath = 'analytics_subdir/';
+
+    /**
+     * @var string
+     */
+    private $encodedFileName = 'filename.tgz';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fileInfoManagerMock = $this->getMockBuilder(FileInfoManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fileInfoFactoryMock = $this->getMockBuilder(FileInfoFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filesystemMock = $this->getMockBuilder(Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fileInfoMock = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->directoryMock = $this->getMockBuilder(WriteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->encodedContextMock = $this->getMockBuilder(EncodedContext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->fileRecorder = $this->objectManagerHelper->getObject(
+            FileRecorder::class,
+            [
+                'fileInfoManager' => $this->fileInfoManagerMock,
+                'fileInfoFactory' => $this->fileInfoFactoryMock,
+                'filesystem' => $this->filesystemMock,
+                'fileSubdirectoryPath' => $this->fileSubdirectoryPath,
+                'encodedFileName' => $this->encodedFileName,
+            ]
+        );
+    }
+
+    /**
+     * @param string $pathToExistingFile
+     * @dataProvider recordNewFileDataProvider
+     */
+    public function testRecordNewFile($pathToExistingFile)
+    {
+        $content = openssl_random_pseudo_bytes(200);
+
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::MEDIA)
+            ->willReturn($this->directoryMock);
+
+        $this->encodedContextMock
+            ->expects($this->once())
+            ->method('getContent')
+            ->with()
+            ->willReturn($content);
+
+        $hashLength = 64;
+        $fileRelativePathPattern = '#' . preg_quote($this->fileSubdirectoryPath, '#')
+            . '.{' . $hashLength . '}/' . preg_quote($this->encodedFileName, '#') . '#';
+        $this->directoryMock
+            ->expects($this->once())
+            ->method('writeFile')
+            ->with($this->matchesRegularExpression($fileRelativePathPattern), $content)
+            ->willReturn($this->directoryMock);
+
+        $this->fileInfoManagerMock
+            ->expects($this->once())
+            ->method('load')
+            ->with()
+            ->willReturn($this->fileInfoMock);
+
+        $this->encodedContextMock
+            ->expects($this->once())
+            ->method('getInitializationVector')
+            ->with()
+            ->willReturn('init_vector***');
+
+        /** register file */
+        $this->fileInfoFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with($this->callback(
+                function ($parameters) {
+                    return !empty($parameters['path']) && ('init_vector***' === $parameters['initializationVector']);
+                }
+            ))
+            ->willReturn($this->fileInfoMock);
+        $this->fileInfoManagerMock
+            ->expects($this->once())
+            ->method('save')
+            ->with($this->fileInfoMock);
+
+        /** remove old file */
+        $this->fileInfoMock
+            ->expects($this->exactly($pathToExistingFile ? 3 : 1))
+            ->method('getPath')
+            ->with()
+            ->willReturn($pathToExistingFile);
+        $directoryName = dirname($pathToExistingFile);
+        if ($directoryName === '.') {
+            $this->directoryMock
+                ->expects($this->once())
+                ->method('delete')
+                ->with($pathToExistingFile);
+        } elseif ($directoryName) {
+            $this->directoryMock
+                ->expects($this->exactly(2))
+                ->method('delete')
+                ->withConsecutive(
+                    [$pathToExistingFile],
+                    [$directoryName]
+                );
+        }
+
+        $this->assertTrue($this->fileRecorder->recordNewFile($this->encodedContextMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function recordNewFileDataProvider()
+    {
+        return [
+            'File doesn\'t exist' => [''],
+            'Existing file into subdirectory' => ['dir_name/file.txt'],
+            'Existing file doesn\'t into subdirectory' => ['file.txt'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php
new file mode 100644
index 0000000000000..568047a4521f8
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Integration\Api\IntegrationServiceInterface;
+use Magento\Config\Model\Config;
+use Magento\Integration\Model\Integration;
+use Magento\Analytics\Model\IntegrationManager;
+use Magento\Integration\Api\OauthServiceInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class IntegrationManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IntegrationServiceInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $integrationServiceMock;
+
+    /**
+     * @var OauthServiceInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $oauthServiceMock;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var Integration|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $integrationMock;
+
+    /**
+     * @var IntegrationManager
+     */
+    private $integrationManager;
+
+    public function setUp()
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->integrationServiceMock = $this->getMockBuilder(IntegrationServiceInterface::class)
+            ->getMock();
+        $this->configMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->oauthServiceMock = $this->getMockBuilder(OauthServiceInterface::class)
+            ->getMock();
+        $this->integrationMock = $this->getMockBuilder(Integration::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getId',
+                'getConsumerId'
+            ])
+            ->getMock();
+        $this->integrationManager = $objectManagerHelper->getObject(
+            IntegrationManager::class,
+            [
+                'integrationService' => $this->integrationServiceMock,
+                'oauthService' => $this->oauthServiceMock,
+                'config' => $this->configMock
+            ]
+        );
+    }
+
+    /**
+     * @param string $status
+     *
+     * @return array
+     */
+    private function getIntegrationUserData($status)
+    {
+        return [
+            'name' => 'ma-integration-user',
+            'status' => $status,
+            'all_resources' => false,
+            'resource' => [
+                'Magento_Analytics::analytics',
+                'Magento_Analytics::analytics_api'
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testActivateIntegrationSuccess()
+    {
+        $this->integrationServiceMock->expects($this->once())
+            ->method('findByName')
+            ->with('ma-integration-user')
+            ->willReturn($this->integrationMock);
+        $this->integrationMock->expects($this->exactly(2))
+            ->method('getId')
+            ->willReturn(100500);
+        $integrationData = $this->getIntegrationUserData(Integration::STATUS_ACTIVE);
+        $integrationData['integration_id'] = 100500;
+        $this->configMock->expects($this->exactly(2))
+            ->method('getConfigDataValue')
+            ->with('analytics/integration_name', null, null)
+            ->willReturn('ma-integration-user');
+        $this->integrationServiceMock->expects($this->once())
+            ->method('update')
+            ->with($integrationData);
+        $this->assertTrue($this->integrationManager->activateIntegration());
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testActivateIntegrationFailureNoSuchEntity()
+    {
+        $this->integrationServiceMock->expects($this->once())
+            ->method('findByName')
+            ->with('ma-integration-user')
+            ->willReturn($this->integrationMock);
+        $this->integrationMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(null);
+        $this->configMock->expects($this->once())
+            ->method('getConfigDataValue')
+            ->with('analytics/integration_name', null, null)
+            ->willReturn('ma-integration-user');
+        $this->integrationServiceMock->expects($this->never())
+            ->method('update');
+        $this->integrationManager->activateIntegration();
+    }
+
+    /**
+     * @dataProvider integrationIdDataProvider
+     *
+     * @param int|null $integrationId If null integration is absent.
+     * @return void
+     */
+    public function testGetTokenNewIntegration($integrationId)
+    {
+        $this->configMock->expects($this->atLeastOnce())
+            ->method('getConfigDataValue')
+            ->with('analytics/integration_name', null, null)
+            ->willReturn('ma-integration-user');
+        $this->integrationServiceMock->expects($this->once())
+            ->method('findByName')
+            ->with('ma-integration-user')
+            ->willReturn($this->integrationMock);
+        $this->integrationMock->expects($this->once())
+            ->method('getConsumerId')
+            ->willReturn(100500);
+        $this->integrationMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($integrationId);
+        if (!$integrationId) {
+            $this->integrationServiceMock
+                ->expects($this->once())
+                ->method('create')
+                ->with($this->getIntegrationUserData(Integration::STATUS_INACTIVE))
+                ->willReturn($this->integrationMock);
+        }
+        $this->oauthServiceMock->expects($this->at(0))
+            ->method('getAccessToken')
+            ->with(100500)
+            ->willReturn(false);
+        $this->oauthServiceMock->expects($this->at(2))
+            ->method('getAccessToken')
+            ->with(100500)
+            ->willReturn('IntegrationToken');
+        $this->oauthServiceMock->expects($this->once())
+            ->method('createAccessToken')
+            ->with(100500, true)
+            ->willReturn(true);
+        $this->assertEquals('IntegrationToken', $this->integrationManager->generateToken());
+    }
+
+    /**
+     * @dataProvider integrationIdDataProvider
+     *
+     * @param int|null $integrationId If null integration is absent.
+     * @return void
+     */
+    public function testGetTokenExistingIntegration($integrationId)
+    {
+        $this->configMock->expects($this->atLeastOnce())
+            ->method('getConfigDataValue')
+            ->with('analytics/integration_name', null, null)
+            ->willReturn('ma-integration-user');
+        $this->integrationServiceMock->expects($this->once())
+            ->method('findByName')
+            ->with('ma-integration-user')
+            ->willReturn($this->integrationMock);
+        $this->integrationMock->expects($this->once())
+            ->method('getConsumerId')
+            ->willReturn(100500);
+        $this->integrationMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($integrationId);
+        if (!$integrationId) {
+            $this->integrationServiceMock
+                ->expects($this->once())
+                ->method('create')
+                ->with($this->getIntegrationUserData(Integration::STATUS_INACTIVE))
+                ->willReturn($this->integrationMock);
+        }
+        $this->oauthServiceMock->expects($this->once())
+            ->method('getAccessToken')
+            ->with(100500)
+            ->willReturn('IntegrationToken');
+        $this->oauthServiceMock->expects($this->never())
+            ->method('createAccessToken');
+        $this->assertEquals('IntegrationToken', $this->integrationManager->generateToken());
+    }
+
+    /**
+     * @return array
+     */
+    public function integrationIdDataProvider()
+    {
+        return [
+            [1],
+            [null],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php
new file mode 100644
index 0000000000000..2053187e641ae
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/LinkProviderTest.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Api\Data\LinkInterface;
+use Magento\Analytics\Api\Data\LinkInterfaceFactory;
+use Magento\Analytics\Model\FileInfo;
+use Magento\Analytics\Model\FileInfoManager;
+use Magento\Analytics\Model\LinkProvider;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+class LinkProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var LinkInterfaceFactory | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $linkInterfaceFactoryMock;
+
+    /**
+     * @var FileInfoManager | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoManagerMock;
+
+    /**
+     * @var StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerInterfaceMock;
+
+    /**
+     * @var LinkInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $linkInterfaceMock;
+
+    /**
+     * @var FileInfo | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileInfoMock;
+
+    /**
+     * @var Store | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var LinkProvider
+     */
+    private $linkProvider;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->linkInterfaceFactoryMock = $this->getMockBuilder(LinkInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->fileInfoManagerMock = $this->getMockBuilder(FileInfoManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManagerInterfaceMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->linkInterfaceMock = $this->getMockBuilder(LinkInterface::class)
+            ->getMockForAbstractClass();
+        $this->fileInfoMock = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->linkProvider = $this->objectManagerHelper->getObject(
+            LinkProvider::class,
+            [
+                'linkFactory' => $this->linkInterfaceFactoryMock,
+                'fileInfoManager' => $this->fileInfoManagerMock,
+                'storeManager' => $this->storeManagerInterfaceMock
+            ]
+        );
+    }
+
+    public function testGet()
+    {
+        $baseUrl = 'http://magento.local/pub/media/';
+        $fileInfoPath = 'analytics/data.tgz';
+        $fileInitializationVector = 'er312esq23eqq';
+        $this->fileInfoManagerMock->expects($this->once())
+            ->method('load')
+            ->willReturn($this->fileInfoMock);
+        $this->linkInterfaceFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(
+                [
+                    'initializationVector' => base64_encode($fileInitializationVector),
+                    'url' => $baseUrl . $fileInfoPath
+                ]
+            )
+            ->willReturn($this->linkInterfaceMock);
+        $this->storeManagerInterfaceMock->expects($this->once())
+            ->method('getStore')->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())
+            ->method('getBaseUrl')
+            ->with(
+                UrlInterface::URL_TYPE_MEDIA
+            )
+            ->willReturn($baseUrl);
+        $this->fileInfoMock->expects($this->atLeastOnce())
+            ->method('getPath')
+            ->willReturn($fileInfoPath);
+        $this->fileInfoMock->expects($this->atLeastOnce())
+            ->method('getInitializationVector')
+            ->willReturn($fileInitializationVector);
+        $this->assertEquals($this->linkInterfaceMock, $this->linkProvider->get());
+    }
+
+    /**
+     * @param string|null $fileInfoPath
+     * @param string|null $fileInitializationVector
+     *
+     * @dataProvider fileNotReadyDataProvider
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage File is not ready yet.
+     */
+    public function testFileNotReady($fileInfoPath, $fileInitializationVector)
+    {
+        $this->fileInfoManagerMock->expects($this->once())
+            ->method('load')
+            ->willReturn($this->fileInfoMock);
+        $this->fileInfoMock->expects($this->once())
+            ->method('getPath')
+            ->willReturn($fileInfoPath);
+        $this->fileInfoMock->expects($this->any())
+            ->method('getInitializationVector')
+            ->willReturn($fileInitializationVector);
+        $this->linkProvider->get();
+    }
+
+    /**
+     * @return array
+     */
+    public function fileNotReadyDataProvider()
+    {
+        return [
+            [null, 'initVector'],
+            ['path', null],
+            ['', 'initVector'],
+            ['path', ''],
+            ['', ''],
+            [null, null]
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php
new file mode 100644
index 0000000000000..cdcd726f3e8fa
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\Plugin;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+
+class BaseUrlConfigPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SubscriptionUpdateHandler | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriptionUpdateHandlerMock;
+
+    /**
+     * @var Value | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configValueMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var BaseUrlConfigPlugin
+     */
+    private $plugin;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->subscriptionUpdateHandlerMock = $this->getMockBuilder(SubscriptionUpdateHandler::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configValueMock = $this->getMockBuilder(Value::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isValueChanged', 'getPath', 'getScope', 'getOldValue'])
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            BaseUrlConfigPlugin::class,
+            [
+                'subscriptionUpdateHandler' => $this->subscriptionUpdateHandlerMock,
+            ]
+        );
+    }
+
+    /**
+     * @param array $configValueData
+     * @return void
+     * @dataProvider afterSavePluginIsNotApplicableDataProvider
+     */
+    public function testAfterSavePluginIsNotApplicable(
+        array $configValueData
+    ) {
+        $this->configValueMock
+            ->method('isValueChanged')
+            ->willReturn($configValueData['isValueChanged']);
+        $this->configValueMock
+            ->method('getPath')
+            ->willReturn($configValueData['path']);
+        $this->configValueMock
+            ->method('getScope')
+            ->willReturn($configValueData['scope']);
+        $this->subscriptionUpdateHandlerMock
+            ->expects($this->never())
+            ->method('processUrlUpdate');
+
+        $this->assertEquals(
+            $this->configValueMock,
+            $this->plugin->afterAfterSave($this->configValueMock, $this->configValueMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function afterSavePluginIsNotApplicableDataProvider()
+    {
+        return [
+            'Value has not been changed' => [
+                'Config Value Data' => [
+                    'isValueChanged' => false,
+                    'path' => Store::XML_PATH_SECURE_BASE_URL,
+                    'scope' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+                ],
+            ],
+            'Unsecure URL has been changed' => [
+                'Config Value Data' => [
+                    'isValueChanged' => true,
+                    'path' => Store::XML_PATH_UNSECURE_BASE_URL,
+                    'scope' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+                ],
+            ],
+            'Secure URL has been changed not in the Default scope' => [
+                'Config Value Data' => [
+                    'isValueChanged' => true,
+                    'path' => Store::XML_PATH_SECURE_BASE_URL,
+                    'scope' => ScopeInterface::SCOPE_STORES
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterSavePluginIsApplicable()
+    {
+        $this->configValueMock
+            ->method('isValueChanged')
+            ->willReturn(true);
+        $this->configValueMock
+            ->method('getPath')
+            ->willReturn(Store::XML_PATH_SECURE_BASE_URL);
+        $this->configValueMock
+            ->method('getScope')
+            ->willReturn(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        $this->configValueMock
+            ->method('getOldValue')
+            ->willReturn('http://store.com');
+        $this->subscriptionUpdateHandlerMock
+            ->expects($this->once())
+            ->method('processUrlUpdate')
+            ->with('http://store.com');
+
+        $this->assertEquals(
+            $this->configValueMock,
+            $this->plugin->afterAfterSave($this->configValueMock, $this->configValueMock)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php
new file mode 100644
index 0000000000000..0607a977e5b68
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector\OTPRequest;
+use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
+use Magento\Analytics\Model\ReportUrlProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ReportUrlProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var OTPRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $otpRequestMock;
+
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ReportUrlProvider
+     */
+    private $reportUrlProvider;
+
+    /**
+     * @var string
+     */
+    private $urlReportConfigPath = 'path/url/report';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->otpRequestMock = $this->getMockBuilder(OTPRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->reportUrlProvider = $this->objectManagerHelper->getObject(
+            ReportUrlProvider::class,
+            [
+                'config' => $this->configMock,
+                'analyticsToken' => $this->analyticsTokenMock,
+                'otpRequest' => $this->otpRequestMock,
+                'flagManager' => $this->flagManagerMock,
+                'urlReportConfigPath' => $this->urlReportConfigPath,
+            ]
+        );
+    }
+
+    /**
+     * @param bool $isTokenExist
+     * @param string|null $otp If null OTP was not received.
+     *
+     * @dataProvider getUrlDataProvider
+     */
+    public function testGetUrl($isTokenExist, $otp)
+    {
+        $reportUrl = 'https://example.com/report';
+        $url = '';
+
+        $this->configMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with($this->urlReportConfigPath)
+            ->willReturn($reportUrl);
+        $this->analyticsTokenMock
+            ->expects($this->once())
+            ->method('isTokenExist')
+            ->with()
+            ->willReturn($isTokenExist);
+        $this->otpRequestMock
+            ->expects($isTokenExist ? $this->once() : $this->never())
+            ->method('call')
+            ->with()
+            ->willReturn($otp);
+        if ($isTokenExist && $otp) {
+            $url = $reportUrl . '?' . http_build_query(['otp' => $otp], '', '&');
+        }
+        $this->assertSame($url ?: $reportUrl, $this->reportUrlProvider->getUrl());
+    }
+
+    /**
+     * @return array
+     */
+    public function getUrlDataProvider()
+    {
+        return [
+            'TokenDoesNotExist' => [false, null],
+            'TokenExistAndOtpEmpty' => [true, null],
+            'TokenExistAndOtpValid' => [true, '249e6b658877bde2a77bc4ab'],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetUrlWhenSubscriptionUpdateRunning()
+    {
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
+            ->willReturn('http://store.com');
+        $this->expectException(SubscriptionUpdateException::class);
+        $this->reportUrlProvider->getUrl();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
new file mode 100644
index 0000000000000..d9b030b84d639
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\ConfigInterface;
+use Magento\Analytics\Model\ProviderFactory;
+use Magento\Analytics\Model\ReportWriter;
+use Magento\Analytics\ReportXml\DB\ReportValidator;
+use Magento\Analytics\ReportXml\ReportProvider;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ReportWriterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configInterfaceMock;
+
+    /**
+     * @var ReportValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reportValidatorMock;
+
+    /**
+     * @var ProviderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $providerFactoryMock;
+
+    /**
+     * @var ReportProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reportProviderMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryMock;
+
+    /**
+     * @var ReportWriter
+     */
+    private $reportWriter;
+
+    /**
+     * @var string
+     */
+    private $reportName = 'testReport';
+
+    /**
+     * @var string
+     */
+    private $providerName = 'testProvider';
+
+    /**
+     * @var string
+     */
+    private $providerClass = 'Magento\Analytics\Provider';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configInterfaceMock = $this->getMockBuilder(ConfigInterface::class)->getMockForAbstractClass();
+        $this->reportValidatorMock = $this->getMockBuilder(ReportValidator::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->providerFactoryMock = $this->getMockBuilder(ProviderFactory::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->reportProviderMock = $this->getMockBuilder(ReportProvider::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->directoryMock = $this->getMockBuilder(WriteInterface::class)->getMockForAbstractClass();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->reportWriter = $this->objectManagerHelper->getObject(
+            ReportWriter::class,
+            [
+                'config' => $this->configInterfaceMock,
+                'reportValidator' => $this->reportValidatorMock,
+                'providerFactory' => $this->providerFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @param array $configData
+     * @return void
+     *
+     * @dataProvider configDataProvider
+     */
+    public function testWrite(array $configData)
+    {
+        $errors = [];
+        $fileData = [
+            ['number' => 1, 'type' => 'Shoes Usual']
+        ];
+        $this->configInterfaceMock
+            ->expects($this->once())
+            ->method('get')
+            ->with()
+            ->willReturn([$configData]);
+        $this->providerFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with($this->providerClass)
+            ->willReturn($this->reportProviderMock);
+        $parameterName = isset(reset($configData)[0]['parameters']['name'])
+            ? reset($configData)[0]['parameters']['name']
+            : '';
+        $this->reportProviderMock->expects($this->once())
+            ->method('getReport')
+            ->with($parameterName ?: null)
+            ->willReturn($fileData);
+        $errorStreamMock = $this->getMockBuilder(
+            \Magento\Framework\Filesystem\File\WriteInterface::class
+        )->getMockForAbstractClass();
+        $errorStreamMock
+            ->expects($this->once())
+            ->method('lock')
+            ->with();
+        $errorStreamMock
+            ->expects($this->exactly(2))
+            ->method('writeCsv')
+            ->withConsecutive(
+                [array_keys($fileData[0])],
+                [$fileData[0]]
+            );
+        $errorStreamMock->expects($this->once())->method('unlock');
+        $errorStreamMock->expects($this->once())->method('close');
+        if ($parameterName) {
+            $this->reportValidatorMock
+                ->expects($this->once())
+                ->method('validate')
+                ->with($parameterName)
+                ->willReturn($errors);
+        }
+        $this->directoryMock
+            ->expects($this->once())
+            ->method('openFile')
+            ->with(
+                $this->stringContains('/var/tmp' . $parameterName ?: $this->reportName),
+                'w+'
+            )->willReturn($errorStreamMock);
+        $this->assertTrue($this->reportWriter->write($this->directoryMock, '/var/tmp'));
+    }
+
+    /**
+     * @param array $configData
+     * @return void
+     *
+     * @dataProvider configDataProvider
+     */
+    public function testWriteErrorFile($configData)
+    {
+        $errors = ['orders', 'SQL Error: test'];
+        $this->configInterfaceMock->expects($this->once())->method('get')->willReturn([$configData]);
+        $errorStreamMock = $this->getMockBuilder(
+            \Magento\Framework\Filesystem\File\WriteInterface::class
+        )->getMockForAbstractClass();
+        $errorStreamMock->expects($this->once())->method('lock');
+        $errorStreamMock->expects($this->once())->method('writeCsv')->with($errors);
+        $errorStreamMock->expects($this->once())->method('unlock');
+        $errorStreamMock->expects($this->once())->method('close');
+        $this->reportValidatorMock->expects($this->once())->method('validate')->willReturn($errors);
+        $this->directoryMock->expects($this->once())->method('openFile')->with('/var/tmp' . 'errors.csv', 'w+')
+            ->willReturn($errorStreamMock);
+        $this->assertTrue($this->reportWriter->write($this->directoryMock, '/var/tmp'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testWriteEmptyReports()
+    {
+        $this->configInterfaceMock->expects($this->once())->method('get')->willReturn([]);
+        $this->reportValidatorMock->expects($this->never())->method('validate');
+        $this->directoryMock->expects($this->never())->method('openFile');
+        $this->assertTrue($this->reportWriter->write($this->directoryMock, '/var/tmp'));
+    }
+
+    /**
+     * @return array
+     */
+    public function configDataProvider()
+    {
+        return [
+            'reportProvider' => [
+                [
+                    'providers' => [
+                        [
+                            'name' => $this->providerName,
+                            'class' => $this->providerClass,
+                            'parameters' => [
+                                'name' => $this->reportName
+                            ],
+                        ]
+                    ]
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
new file mode 100644
index 0000000000000..f314d77f32b41
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Model\ReportXml;
+
+use Magento\Analytics\Model\ReportXml\ModuleIterator;
+use Magento\Framework\Module\Manager as ModuleManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ModuleIteratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ModuleManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleManagerMock;
+
+    /**
+     * @var ModuleIterator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleIterator;
+
+    public function setUp()
+    {
+        $this->moduleManagerMock = $this->getMockBuilder(ModuleManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->moduleIterator = $objectManagerHelper->getObject(
+            ModuleIterator::class,
+            [
+                'moduleManager' => $this->moduleManagerMock,
+                'iterator' => new \ArrayIterator([0 => ['module_name' => 'Coco_Module']])
+            ]
+        );
+    }
+
+    public function testCurrent()
+    {
+        $this->moduleManagerMock->expects($this->once())
+            ->method('isEnabled')
+            ->with('Coco_Module')
+            ->willReturn(true);
+        foreach ($this->moduleIterator as $item) {
+            $this->assertEquals(['module_name' => 'Coco_Module', 'status' => 'Enabled'], $item);
+        }
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/StoreConfigurationProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/StoreConfigurationProviderTest.php
new file mode 100644
index 0000000000000..cc46d175543ad
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/StoreConfigurationProviderTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\StoreConfigurationProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+class StoreConfigurationProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var string[]
+     */
+    private $configPaths;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var WebsiteInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $websiteMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var StoreConfigurationProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeConfigurationProvider;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock =  $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->websiteMock =  $this->getMockBuilder(WebsiteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeMock =  $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configPaths = [
+            'web/unsecure/base_url',
+            'currency/options/base',
+            'general/locale/timezone'
+        ];
+
+        $this->storeConfigurationProvider = new StoreConfigurationProvider(
+            $this->scopeConfigMock,
+            $this->storeManagerMock,
+            $this->configPaths
+        );
+    }
+
+    public function testGetReport()
+    {
+        $map = [
+            ['web/unsecure/base_url', 'default', 0, '127.0.0.1'],
+            ['currency/options/base', 'default', 0, 'USD'],
+            ['general/locale/timezone', 'default', 0, 'America/Dawson'],
+            ['web/unsecure/base_url', 'websites', 1, '127.0.0.2'],
+            ['currency/options/base', 'websites', 1, 'USD'],
+            ['general/locale/timezone', 'websites', 1, 'America/Belem'],
+            ['web/unsecure/base_url', 'stores', 2, '127.0.0.3'],
+            ['currency/options/base', 'stores', 2, 'USD'],
+            ['general/locale/timezone', 'stores', 2, 'America/Phoenix'],
+        ];
+
+        $this->scopeConfigMock
+            ->method('getValue')
+            ->will($this->returnValueMap($map));
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsites')
+            ->willReturn([$this->websiteMock]);
+
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStores')
+            ->willReturn([$this->storeMock]);
+
+        $this->websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(2);
+        $result = iterator_to_array($this->storeConfigurationProvider->getReport());
+        $resultValues = [];
+        foreach ($result as $item) {
+            $resultValues[] = array_values($item);
+        }
+        array_multisort($resultValues);
+        array_multisort($map);
+        $this->assertEquals($resultValues, $map);
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/SubscriptionStatusProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/SubscriptionStatusProviderTest.php
new file mode 100644
index 0000000000000..373bb73d999f8
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/SubscriptionStatusProviderTest.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SubscriptionStatusProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var AnalyticsToken|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $analyticsTokenMock;
+
+    /**
+     * @var FlagManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flagManagerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var SubscriptionStatusProvider
+     */
+    private $statusProvider;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->statusProvider = $this->objectManagerHelper->getObject(
+            SubscriptionStatusProvider::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock,
+                'analyticsToken' => $this->analyticsTokenMock,
+                'flagManager' => $this->flagManagerMock,
+            ]
+        );
+    }
+
+    /**
+     * @param array $flagManagerData
+     * @dataProvider getStatusShouldBeFailedDataProvider
+     */
+    public function testGetStatusShouldBeFailed(array $flagManagerData)
+    {
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(false);
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('analytics/subscription/enabled')
+            ->willReturn(true);
+
+        $this->expectFlagManagerReturn($flagManagerData);
+        $this->assertEquals(SubscriptionStatusProvider::FAILED, $this->statusProvider->getStatus());
+    }
+
+    /**
+     * @return array
+     */
+    public function getStatusShouldBeFailedDataProvider()
+    {
+        return [
+            'Subscription update doesn\'t active' => [
+                'Flag Manager data mapping' => [
+                    [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, null],
+                    [SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, null]
+                ],
+            ],
+            'Subscription update is active' => [
+                'Flag Manager data mapping' => [
+                    [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, 'http://store.com'],
+                    [SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, null]
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $flagManagerData
+     * @param bool $isTokenExist
+     * @dataProvider getStatusShouldBePendingDataProvider
+     */
+    public function testGetStatusShouldBePending(array $flagManagerData, bool $isTokenExist)
+    {
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn($isTokenExist);
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('analytics/subscription/enabled')
+            ->willReturn(true);
+
+        $this->expectFlagManagerReturn($flagManagerData);
+        $this->assertEquals(SubscriptionStatusProvider::PENDING, $this->statusProvider->getStatus());
+    }
+
+    /**
+     * @return array
+     */
+    public function getStatusShouldBePendingDataProvider()
+    {
+        return [
+            'Subscription update doesn\'t active and the token does not exist' => [
+                'Flag Manager data mapping' => [
+                    [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, null],
+                    [SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, 45]
+                ],
+                'isTokenExist' => false,
+            ],
+            'Subscription update is active and the token does not exist' => [
+                'Flag Manager data mapping' => [
+                    [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, 'http://store.com'],
+                    [SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, 45]
+                ],
+                'isTokenExist' => false,
+            ],
+            'Subscription update is active and token exist' => [
+                'Flag Manager data mapping' => [
+                    [SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE, 'http://store.com'],
+                    [SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, null]
+                ],
+                'isTokenExist' => true,
+            ],
+        ];
+    }
+
+    public function testGetStatusShouldBeEnabled()
+    {
+        $this->flagManagerMock
+            ->method('getFlagData')
+            ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
+            ->willReturn(null);
+        $this->analyticsTokenMock->expects($this->once())
+            ->method('isTokenExist')
+            ->willReturn(true);
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('analytics/subscription/enabled')
+            ->willReturn(true);
+        $this->assertEquals(SubscriptionStatusProvider::ENABLED, $this->statusProvider->getStatus());
+    }
+
+    public function testGetStatusShouldBeDisabled()
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('analytics/subscription/enabled')
+            ->willReturn(false);
+        $this->assertEquals(SubscriptionStatusProvider::DISABLED, $this->statusProvider->getStatus());
+    }
+
+    /**
+     * @param array $mapping
+     */
+    private function expectFlagManagerReturn(array $mapping)
+    {
+        $this->flagManagerMock
+            ->method('getFlagData')
+            ->willReturnMap($mapping);
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/System/Message/NotificationAboutFailedSubscriptionTest.php b/app/code/Magento/Analytics/Test/Unit/Model/System/Message/NotificationAboutFailedSubscriptionTest.php
new file mode 100644
index 0000000000000..8c515afa32dd6
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/Model/System/Message/NotificationAboutFailedSubscriptionTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\Model\System\Message;
+
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Analytics\Model\System\Message\NotificationAboutFailedSubscription;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+
+class NotificationAboutFailedSubscriptionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|SubscriptionStatusProvider
+     */
+    private $subscriptionStatusMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|UrlInterface
+     */
+    private $urlBuilderMock;
+
+    /**
+     * @var NotificationAboutFailedSubscription
+     */
+    private $notification;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->subscriptionStatusMock = $this->getMockBuilder(SubscriptionStatusProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlBuilderMock = $this->getMockBuilder(UrlInterface::class)
+            ->getMockForAbstractClass();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->notification = $this->objectManagerHelper->getObject(
+            NotificationAboutFailedSubscription::class,
+            [
+                'subscriptionStatusProvider' => $this->subscriptionStatusMock,
+                'urlBuilder' => $this->urlBuilderMock
+            ]
+        );
+    }
+
+    public function testIsDisplayedWhenMessageShouldBeDisplayed()
+    {
+        $this->subscriptionStatusMock->expects($this->once())
+            ->method('getStatus')
+            ->willReturn(
+                SubscriptionStatusProvider::FAILED
+            );
+        $this->assertTrue($this->notification->isDisplayed());
+    }
+
+    /**
+     * @dataProvider notDisplayedNotificationStatuses
+     *
+     * @param $status
+     */
+    public function testIsDisplayedWhenMessageShouldNotBeDisplayed($status)
+    {
+        $this->subscriptionStatusMock->expects($this->once())
+            ->method('getStatus')
+            ->willReturn($status);
+        $this->assertFalse($this->notification->isDisplayed());
+    }
+
+    public function testGetTextShouldBuildMessage()
+    {
+        $retryUrl = 'http://magento.dev/retryUrl';
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('analytics/subscription/retry')
+            ->willReturn($retryUrl);
+        $messageDetails = 'Failed to synchronize data to the Magento Business Intelligence service. ';
+        $messageDetails .= sprintf('<a href="%s">Retry Synchronization</a>', $retryUrl);
+        $this->assertEquals($messageDetails, $this->notification->getText());
+    }
+
+    /**
+     * Provide statuses according to which message should not be displayed.
+     *
+     * @return array
+     */
+    public function notDisplayedNotificationStatuses()
+    {
+        return [
+            [SubscriptionStatusProvider::PENDING],
+            [SubscriptionStatusProvider::DISABLED],
+            [SubscriptionStatusProvider::ENABLED],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/Converter/XmlTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/Converter/XmlTest.php
new file mode 100644
index 0000000000000..3f1ed9a5cf4c0
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/Converter/XmlTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\Config\Converter;
+
+/**
+ * A unit test for testing of the reports configuration converter (XML to PHP array).
+ */
+class XmlTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\ReportXml\Config\Converter\Xml
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\ReportXml\Config\Converter\Xml::class
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testConvertNoElements()
+    {
+        $this->assertEmpty(
+            $this->subject->convert(new \DOMDocument())
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testConvert()
+    {
+        $dom = new \DOMDocument();
+
+        $expectedArray = [
+            'config' => [
+                [
+                    'noNamespaceSchemaLocation' => 'urn:magento:module:Magento_Analytics:etc/reports.xsd',
+                    'report' => [
+                        [
+                            'name' => 'test_report_1',
+                            'connection' => 'sales',
+                            'source' => [
+                                [
+                                    'name' => 'sales_order',
+                                    'alias' => 'orders',
+                                    'attribute' => [
+                                        [
+                                            'name' => 'entity_id',
+                                            'alias' => 'identifier',
+                                        ]
+                                    ],
+                                    'filter' => [
+                                        [
+                                            'glue' => 'and',
+                                            'condition' => [
+                                                [
+                                                    'attribute' => 'entity_id',
+                                                    'operator' => 'gt',
+                                                    '_value' => '10'
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ],
+                        [
+                            'name' => 'test_report_2',
+                            'connection' => 'default',
+                            'source' => [
+                                [
+                                    'name' => 'customer_entity',
+                                    'alias' => 'customers',
+                                    'attribute' => [
+                                        [
+                                            'name' => 'email'
+                                        ]
+                                    ],
+                                    'filter' => [
+                                        [
+                                            'glue' => 'and',
+                                            'condition' => [
+                                                [
+                                                    'attribute' => 'dob',
+                                                    'operator' => 'null'
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        $dom->loadXML(file_get_contents(__DIR__ . '/../_files/valid_reports.xml'));
+
+        $this->assertEquals($expectedArray, $this->subject->convert($dom));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/MapperTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/MapperTest.php
new file mode 100644
index 0000000000000..e764add9ba2f0
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/MapperTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\Config;
+
+use Magento\Analytics\ReportXml\Config\Mapper;
+
+class MapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Mapper
+     */
+    private $mapper;
+
+    protected function setUp()
+    {
+        $this->mapper = new Mapper();
+    }
+
+    public function testExecute()
+    {
+        $configData['config'][0]['report'] = [
+            [
+                'source' => ['product'],
+                'name' => 'Product',
+            ]
+        ];
+        $expectedResult = [
+          'Product' => [
+              'source' => 'product',
+              'name' => 'Product',
+          ]
+        ];
+        $this->assertEquals($this->mapper->execute($configData), $expectedResult);
+    }
+
+    public function testExecuteWithoutReports()
+    {
+        $configData = [];
+        $this->assertEquals($this->mapper->execute($configData), []);
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/_files/valid_reports.xml b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/_files/valid_reports.xml
new file mode 100644
index 0000000000000..e04ee96163797
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/Config/_files/valid_reports.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="test_report_1" connection="sales">
+        <source name="sales_order" alias="orders">
+            <attribute name="entity_id" alias="identifier" />
+            <filter glue="and">
+                <condition attribute="entity_id" operator="gt">10</condition>
+            </filter>
+        </source>
+    </report>
+    <report name="test_report_2" connection="default">
+        <source name="customer_entity" alias="customers">
+            <attribute name="email" />
+            <filter glue="and">
+                <condition attribute="dob" operator="null" />
+            </filter>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConfigTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConfigTest.php
new file mode 100644
index 0000000000000..7e6866d5a1e60
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConfigTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+use Magento\Analytics\ReportXml\Config;
+use Magento\Framework\Config\DataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->dataMock = $this->getMockBuilder(DataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->config = $this->objectManagerHelper->getObject(
+            Config::class,
+            [
+                'data' => $this->dataMock,
+            ]
+        );
+    }
+
+    public function testGet()
+    {
+        $queryName = 'query string';
+        $queryResult = [ 'query' => 1 ];
+
+        $this->dataMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($queryName)
+            ->willReturn($queryResult);
+
+        $this->assertSame($queryResult, $this->config->get($queryName));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
new file mode 100644
index 0000000000000..1d40919ecfc4a
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+use Magento\Analytics\ReportXml\ConnectionFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\Pdo\Mysql as MysqlPdoAdapter;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ConnectionFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var ConnectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionNewMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConnectionFactory
+     */
+    private $connectionFactory;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(MysqlPdoAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionNewMock = $this->getMockBuilder(MysqlPdoAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->connectionFactory = $this->objectManagerHelper->getObject(
+            ConnectionFactory::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock,
+                'objectManager' => $this->objectManagerMock,
+            ]
+        );
+    }
+
+    public function testGetConnection()
+    {
+        $connectionName = 'read';
+
+        $this->resourceConnectionMock
+            ->expects($this->once())
+            ->method('getConnection')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock
+            ->expects($this->once())
+            ->method('getConfig')
+            ->with()
+            ->willReturn(['persistent' => 1]);
+
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(get_class($this->connectionMock), ['config' => ['use_buffered_query' => false]])
+            ->willReturn($this->connectionNewMock);
+
+        $this->assertSame($this->connectionNewMock, $this->connectionFactory->getConnection($connectionName));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/FilterAssemblerTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/FilterAssemblerTest.php
new file mode 100644
index 0000000000000..3b01105a8873b
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/FilterAssemblerTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB\Assembler;
+
+/**
+ * A unit test for testing of the 'filter' assembler.
+ */
+class FilterAssemblerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\Assembler\FilterAssembler
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\NameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nameResolverMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectBuilderMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\ConditionResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $conditionResolverMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->nameResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\NameResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->selectBuilderMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\SelectBuilder::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->selectBuilderMock->expects($this->any())
+            ->method('getFilters')
+            ->willReturn([]);
+
+        $this->conditionResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\ConditionResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\ReportXml\DB\Assembler\FilterAssembler::class,
+            [
+                'conditionResolver' => $this->conditionResolverMock,
+                'nameResolver' => $this->nameResolverMock
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAssembleEmpty()
+    {
+        $queryConfigMock = [
+            'source' => [
+                'name' => 'sales_order',
+                'alias' => 'sales'
+            ]
+        ];
+
+        $this->selectBuilderMock->expects($this->never())
+            ->method('setFilters');
+
+        $this->assertEquals(
+            $this->selectBuilderMock,
+            $this->subject->assemble($this->selectBuilderMock, $queryConfigMock)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAssembleNotEmpty()
+    {
+        $queryConfigMock = [
+            'source' => [
+                'name' => 'sales_order',
+                'alias' => 'sales',
+                'filter' => [
+                    [
+                        'glue' => 'and',
+                        'condition' => [
+                            [
+                                'attribute' => 'entity_id',
+                                'operator' => 'null'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        $this->nameResolverMock->expects($this->any())
+            ->method('getAlias')
+            ->with($queryConfigMock['source'])
+            ->willReturn($queryConfigMock['source']['alias']);
+
+        $this->conditionResolverMock->expects($this->once())
+            ->method('getFilter')
+            ->with(
+                $this->selectBuilderMock,
+                $queryConfigMock['source']['filter'],
+                $queryConfigMock['source']['alias']
+            )
+            ->willReturn('(sales.entity_id IS NULL)');
+
+        $this->selectBuilderMock->expects($this->once())
+            ->method('setFilters')
+            ->with(['(sales.entity_id IS NULL)']);
+
+        $this->assertEquals(
+            $this->selectBuilderMock,
+            $this->subject->assemble($this->selectBuilderMock, $queryConfigMock)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/FromAssemblerTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/FromAssemblerTest.php
new file mode 100644
index 0000000000000..575db94a7b7e1
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/FromAssemblerTest.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB\Assembler;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * A unit test for testing of the 'from' assembler.
+ */
+class FromAssemblerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\Assembler\FromAssembler
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\NameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nameResolverMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectBuilderMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\ColumnsResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $columnsResolverMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->nameResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\NameResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->selectBuilderMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\SelectBuilder::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->selectBuilderMock->expects($this->any())
+            ->method('getColumns')
+            ->willReturn([]);
+
+        $this->columnsResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\ColumnsResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->resourceConnection = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\ReportXml\DB\Assembler\FromAssembler::class,
+            [
+                'nameResolver' => $this->nameResolverMock,
+                'columnsResolver' => $this->columnsResolverMock,
+                'resourceConnection' => $this->resourceConnection,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider assembleDataProvider
+     * @param array $queryConfig
+     * @param string $tableName
+     * @return void
+     */
+    public function testAssemble(array $queryConfig, $tableName)
+    {
+        $this->nameResolverMock->expects($this->any())
+            ->method('getAlias')
+            ->with($queryConfig['source'])
+            ->willReturn($queryConfig['source']['alias']);
+
+        $this->nameResolverMock->expects($this->once())
+            ->method('getName')
+            ->with($queryConfig['source'])
+            ->willReturn($queryConfig['source']['name']);
+
+        $this->resourceConnection
+            ->expects($this->once())
+            ->method('getTableName')
+            ->with($queryConfig['source']['name'])
+            ->willReturn($tableName);
+
+        $this->selectBuilderMock->expects($this->once())
+            ->method('setFrom')
+            ->with([$queryConfig['source']['alias'] => $tableName]);
+
+        $this->columnsResolverMock->expects($this->once())
+            ->method('getColumns')
+            ->with($this->selectBuilderMock, $queryConfig['source'])
+            ->willReturn(['entity_id' => 'sales.entity_id']);
+
+        $this->selectBuilderMock->expects($this->once())
+            ->method('setColumns')
+            ->with(['entity_id' => 'sales.entity_id']);
+
+        $this->assertEquals(
+            $this->selectBuilderMock,
+            $this->subject->assemble($this->selectBuilderMock, $queryConfig)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function assembleDataProvider()
+    {
+        return [
+            'Tables without prefixes' => [
+                [
+                    'source' => [
+                        'name' => 'sales_order',
+                        'alias' => 'sales',
+                        'attribute' => [
+                            [
+                                'name' => 'entity_id'
+                            ]
+                        ],
+                    ],
+                ],
+                'sales_order',
+            ],
+            'Tables with prefixes' => [
+                [
+                    'source' => [
+                        'name' => 'sales_order',
+                        'alias' => 'sales',
+                        'attribute' => [
+                            [
+                                'name' => 'entity_id'
+                            ]
+                        ],
+                    ],
+                ],
+                'pref_sales_order',
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/JoinAssemblerTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/JoinAssemblerTest.php
new file mode 100644
index 0000000000000..aaafd731552a0
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/Assembler/JoinAssemblerTest.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB\Assembler;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * A unit test for testing of the 'join' assembler.
+ */
+class JoinAssemblerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\Assembler\JoinAssembler
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\NameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nameResolverMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectBuilderMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\ColumnsResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $columnsResolverMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\ConditionResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $conditionResolverMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->nameResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\NameResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->selectBuilderMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\SelectBuilder::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->selectBuilderMock->expects($this->any())
+            ->method('getFilters')
+            ->willReturn([]);
+        $this->selectBuilderMock->expects($this->any())
+            ->method('getColumns')
+            ->willReturn([]);
+        $this->selectBuilderMock->expects($this->any())
+            ->method('getJoins')
+            ->willReturn([]);
+
+        $this->columnsResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\ColumnsResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->conditionResolverMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\ConditionResolver::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->resourceConnection = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\ReportXml\DB\Assembler\JoinAssembler::class,
+            [
+                'conditionResolver' => $this->conditionResolverMock,
+                'nameResolver' => $this->nameResolverMock,
+                'columnsResolver' => $this->columnsResolverMock,
+                'resourceConnection' => $this->resourceConnection,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAssembleEmpty()
+    {
+        $queryConfigMock = [
+            'source' => [
+                'name' => 'sales_order',
+                'alias' => 'sales'
+            ]
+        ];
+
+        $this->selectBuilderMock->expects($this->never())
+            ->method('setColumns');
+        $this->selectBuilderMock->expects($this->never())
+            ->method('setFilters');
+        $this->selectBuilderMock->expects($this->never())
+            ->method('setJoins');
+
+        $this->assertEquals(
+            $this->selectBuilderMock,
+            $this->subject->assemble($this->selectBuilderMock, $queryConfigMock)
+        );
+    }
+
+    /**
+     * @param array $queryConfigMock
+     * @param array $joinsMock
+     * @param array $tablesMapping
+     * @return void
+     * @dataProvider assembleNotEmptyDataProvider
+     */
+    public function testAssembleNotEmpty(array $queryConfigMock, array $joinsMock, array $tablesMapping)
+    {
+        $filtersMock = [];
+
+        $this->nameResolverMock->expects($this->at(0))
+            ->method('getAlias')
+            ->with($queryConfigMock['source'])
+            ->willReturn($queryConfigMock['source']['alias']);
+        $this->nameResolverMock->expects($this->at(1))
+            ->method('getAlias')
+            ->with($queryConfigMock['source']['link-source'][0])
+            ->willReturn($queryConfigMock['source']['link-source'][0]['alias']);
+        $this->nameResolverMock->expects($this->once())
+            ->method('getName')
+            ->with($queryConfigMock['source']['link-source'][0])
+            ->willReturn($queryConfigMock['source']['link-source'][0]['name']);
+
+        $this->resourceConnection
+            ->expects($this->any())
+            ->method('getTableName')
+            ->willReturnOnConsecutiveCalls(...array_values($tablesMapping));
+
+        $this->conditionResolverMock->expects($this->at(0))
+            ->method('getFilter')
+            ->with(
+                $this->selectBuilderMock,
+                $queryConfigMock['source']['link-source'][0]['using'],
+                $queryConfigMock['source']['link-source'][0]['alias'],
+                $queryConfigMock['source']['alias']
+            )
+            ->willReturn('(billing.parent_id = `sales`.`entity_id`)');
+
+        if (isset($queryConfigMock['source']['link-source'][0]['filter'])) {
+            $filtersMock = ['(sales.entity_id IS NULL)'];
+
+            $this->conditionResolverMock->expects($this->at(1))
+                ->method('getFilter')
+                ->with(
+                    $this->selectBuilderMock,
+                    $queryConfigMock['source']['link-source'][0]['filter'],
+                    $queryConfigMock['source']['link-source'][0]['alias'],
+                    $queryConfigMock['source']['alias']
+                )
+                ->willReturn($filtersMock[0]);
+
+            $this->columnsResolverMock->expects($this->once())
+                ->method('getColumns')
+                ->with($this->selectBuilderMock, $queryConfigMock['source']['link-source'][0])
+                ->willReturn(
+                    [
+                        'entity_id' => 'sales.entity_id',
+                        'billing_address_id' => 'billing.entity_id'
+                    ]
+                );
+
+            $this->selectBuilderMock->expects($this->once())
+                ->method('setColumns')
+                ->with(
+                    [
+                        'entity_id' => 'sales.entity_id',
+                        'billing_address_id' => 'billing.entity_id'
+                    ]
+                );
+        }
+
+        $this->selectBuilderMock->expects($this->once())
+            ->method('setFilters')
+            ->with($filtersMock);
+        $this->selectBuilderMock->expects($this->once())
+            ->method('setJoins')
+            ->with($joinsMock);
+
+        $this->assertEquals(
+            $this->selectBuilderMock,
+            $this->subject->assemble($this->selectBuilderMock, $queryConfigMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function assembleNotEmptyDataProvider()
+    {
+        return [
+            [
+                [
+                    'source' => [
+                        'name' => 'sales_order',
+                        'alias' => 'sales',
+                        'link-source' => [
+                            [
+                                'name' => 'sales_order_address',
+                                'alias' => 'billing',
+                                'link-type' => 'left',
+                                'attribute' => [
+                                    [
+                                        'alias' => 'billing_address_id',
+                                        'name' => 'entity_id'
+                                    ]
+                                ],
+                                'using' => [
+                                    [
+                                        'glue' => 'and',
+                                        'condition' => [
+                                            [
+                                                'attribute' => 'parent_id',
+                                                'operator' => 'eq',
+                                                'type' => 'identifier',
+                                                '_value' => 'entity_id'
+                                            ]
+                                        ]
+                                    ]
+                                ],
+                                'filter' => [
+                                    [
+                                        'glue' => 'and',
+                                        'condition' => [
+                                            [
+                                                'attribute' => 'entity_id',
+                                                'operator' => 'null'
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    'billing' => [
+                        'link-type' => 'left',
+                        'table' => [
+                            'billing' => 'pref_sales_order_address'
+                        ],
+                        'condition' => '(billing.parent_id = `sales`.`entity_id`)'
+                    ]
+                ],
+                ['sales_order_address' => 'pref_sales_order_address']
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php
new file mode 100644
index 0000000000000..6f881fc4ae96a
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB;
+
+use Magento\Analytics\ReportXml\DB\ColumnsResolver;
+use Magento\Analytics\ReportXml\DB\NameResolver;
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Framework\DB\Sql\ColumnValueExpression;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ColumnsResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectBuilderMock;
+
+    /**
+     * @var ColumnsResolver
+     */
+    private $columnsResolver;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->selectBuilderMock = $this->getMockBuilder(SelectBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->columnsResolver = $objectManager->getObject(
+            ColumnsResolver::class,
+            [
+                'nameResolver' => new NameResolver(),
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    public function testGetColumnsWithoutAttributes()
+    {
+        $this->assertEquals($this->columnsResolver->getColumns($this->selectBuilderMock, []), []);
+    }
+
+    /**
+     * @dataProvider getColumnsDataProvider
+     */
+    public function testGetColumnsWithFunction($expectedColumns, $expectedGroup, $entityConfig)
+    {
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->any())
+            ->method('quoteIdentifier')
+            ->with('cpe.name')
+            ->willReturn('`cpe`.`name`');
+        $this->selectBuilderMock->expects($this->once())
+            ->method('getColumns')
+            ->willReturn([]);
+        $this->selectBuilderMock->expects($this->once())
+            ->method('getGroup')
+            ->willReturn([]);
+        $this->selectBuilderMock->expects($this->once())
+            ->method('setGroup')
+            ->with($expectedGroup);
+        $this->assertEquals(
+            $expectedColumns,
+            $this->columnsResolver->getColumns(
+                $this->selectBuilderMock,
+                $entityConfig
+            )
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getColumnsDataProvider()
+    {
+        return [
+            'COUNT( DISTINCT `cpe`.`name`) AS name' => [
+                    'expectedColumns' => [
+                        'name' => new ColumnValueExpression('COUNT( DISTINCT `cpe`.`name`)')
+                    ],
+                    'expectedGroup' => [
+                        'name' => new ColumnValueExpression('COUNT( DISTINCT `cpe`.`name`)')
+                    ],
+                    'entityConfig' =>
+                        [
+                            'name' => 'catalog_product_entity',
+                            'alias' => 'cpe',
+                            'attribute' => [
+                                [
+                                    'name' => 'name',
+                                    'function' => 'COUNT',
+                                    'distinct' => true,
+                                    'group' => true
+                                ]
+                            ],
+                        ],
+                    ],
+            'AVG(`cpe`.`name`) AS avg_name' => [
+                'expectedColumns' => [
+                    'avg_name' => new ColumnValueExpression('AVG(`cpe`.`name`)')
+                ],
+                'expectedGroup' => [],
+                'entityConfig' =>
+                    [
+                        'name' => 'catalog_product_entity',
+                        'alias' => 'cpe',
+                        'attribute' => [
+                            [
+                                'name' => 'name',
+                                'alias' => 'avg_name',
+                                'function' => 'AVG',
+                            ]
+                        ],
+                    ],
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php
new file mode 100644
index 0000000000000..8fa9d3b538e71
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ConditionResolverTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB;
+
+use Magento\Analytics\ReportXml\DB\ConditionResolver;
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Sql\Expression;
+
+class ConditionResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var ConditionResolver
+     */
+    private $conditionResolver;
+
+    /**
+     * @var SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectBuilderMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->selectBuilderMock = $this->getMockBuilder(SelectBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->conditionResolver = new ConditionResolver($this->resourceConnectionMock);
+    }
+
+    public function testGetFilter()
+    {
+        $condition = ["type" => "variable", "_value" => "1", "attribute" => "id", "operator" => "neq"];
+        $valueCondition = ["type" => "value", "_value" => "2", "attribute" => "first_name", "operator" => "eq"];
+        $identifierCondition = [
+            "type" => "identifier",
+            "_value" => "other_field",
+            "attribute" => "last_name",
+            "operator" => "eq"];
+        $filter = [["glue" => "AND", "condition" => [$valueCondition]]];
+        $filterConfig = [
+            ["glue" => "OR", "condition" => [$condition], 'filter' => $filter],
+            ["glue" => "OR", "condition" => [$identifierCondition]],
+        ];
+        $aliasName = 'n';
+        $this->selectBuilderMock->expects($this->any())
+            ->method('setParams')
+            ->with(array_merge([], [$condition['_value']]));
+
+        $this->selectBuilderMock->expects($this->once())
+            ->method('getParams')
+            ->willReturn([]);
+
+        $this->selectBuilderMock->expects($this->any())
+            ->method('getColumns')
+            ->willReturn(['price' => new Expression("(n.price = 400)")]);
+
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->any())
+            ->method('quote')
+            ->willReturn("'John'");
+        $this->connectionMock->expects($this->exactly(4))
+            ->method('quoteIdentifier')
+            ->willReturnMap([
+                ['n.id', false, '`n`.`id`'],
+                ['n.first_name', false, '`n`.`first_name`'],
+                ['n.last_name', false, '`n`.`last_name`'],
+                ['other_field', false, '`other_field`'],
+            ]);
+
+        $result = "(`n`.`id` != 1 OR ((`n`.`first_name` = 'John'))) OR (`n`.`last_name` = `other_field`)";
+        $this->assertEquals(
+            $result,
+            $this->conditionResolver->getFilter($this->selectBuilderMock, $filterConfig, $aliasName)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/NameResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/NameResolverTest.php
new file mode 100644
index 0000000000000..8109e6f9e8631
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/NameResolverTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB;
+
+use Magento\Analytics\ReportXml\DB\NameResolver;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class NameResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var NameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nameResolverMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var NameResolver
+     */
+    private $nameResolver;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->nameResolverMock = $this->getMockBuilder(NameResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName'])
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->nameResolver = $this->objectManagerHelper->getObject(NameResolver::class);
+    }
+
+    public function testGetName()
+    {
+        $elementConfigMock = [
+            'name' => 'sales_order',
+            'alias' => 'sales',
+        ];
+
+        $this->assertSame('sales_order', $this->nameResolver->getName($elementConfigMock));
+    }
+
+    /**
+     * @param array $elementConfig
+     * @param string|null $elementAlias
+     *
+     * @dataProvider getAliasDataProvider
+     */
+    public function testGetAlias($elementConfig, $elementAlias)
+    {
+        $elementName = 'elementName';
+
+        $this->nameResolverMock
+            ->expects($this->once())
+            ->method('getName')
+            ->with($elementConfig)
+            ->willReturn($elementName);
+
+        $this->assertSame($elementAlias ?: $elementName, $this->nameResolverMock->getAlias($elementConfig));
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliasDataProvider()
+    {
+        return [
+            'ElementConfigWithAliases' => [
+                ['alias' => 'sales', 'name' => 'sales_order'],
+                'sales',
+            ],
+            'ElementConfigWithoutAliases' => [
+                ['name' => 'sales_order'],
+                null,
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php
new file mode 100644
index 0000000000000..ac141fae4be66
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB;
+
+use Magento\Analytics\ReportXml\ConnectionFactory;
+use Magento\Analytics\ReportXml\DB\ReportValidator;
+use Magento\Analytics\ReportXml\Query;
+use Magento\Analytics\ReportXml\QueryFactory;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ReportValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConnectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionFactoryMock;
+
+    /**
+     * @var QueryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryFactoryMock;
+
+    /**
+     * @var Query|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ReportValidator
+     */
+    private $reportValidator;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->connectionFactoryMock = $this->getMockBuilder(ConnectionFactory::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queryFactoryMock = $this->getMockBuilder(QueryFactory::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queryMock = $this->getMockBuilder(Query::class)->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        $this->selectMock = $this->getMockBuilder(Select::class)->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->reportValidator = $this->objectManagerHelper->getObject(
+            ReportValidator::class,
+            [
+                'connectionFactory' => $this->connectionFactoryMock,
+                'queryFactory' => $this->queryFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider errorDataProvider
+     * @param string $reportName
+     * @param array $result
+     * @param \PHPUnit\Framework\MockObject\Stub $queryReturnStub
+     */
+    public function testValidate($reportName, $result, \PHPUnit\Framework\MockObject\Stub $queryReturnStub)
+    {
+        $connectionName = 'testConnection';
+        $this->queryFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->queryMock);
+        $this->queryMock->expects($this->once())->method('getConnectionName')->willReturn($connectionName);
+        $this->connectionFactoryMock->expects($this->once())->method('getConnection')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+        $this->queryMock->expects($this->atLeastOnce())->method('getSelect')->willReturn($this->selectMock);
+        $this->selectMock->expects($this->once())->method('limit')->with(0);
+        $this->connectionMock->expects($this->once())->method('query')->with($this->selectMock)->will($queryReturnStub);
+        $this->assertEquals($result, $this->reportValidator->validate($reportName));
+    }
+
+    /**
+     * Provide variations of the error returning
+     *
+     * @return array
+     */
+    public function errorDataProvider()
+    {
+        $reportName = 'test';
+        $errorMessage = 'SQL Error 42';
+        return [
+            [
+                $reportName,
+                'expectedResult' => [],
+                'queryReturnStub' => $this->returnValue(null)
+            ],
+            [
+                $reportName,
+                'expectedResult' => [$reportName, $errorMessage],
+                'queryReturnStub' => $this->throwException(new \Zend_Db_Statement_Exception($errorMessage))
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php
new file mode 100644
index 0000000000000..a4362d583dfbc
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml\DB;
+
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+
+class SelectBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SelectBuilder
+     */
+    private $selectBuilder;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->selectBuilder = new SelectBuilder($this->resourceConnectionMock);
+    }
+
+    public function testCreate()
+    {
+        $connectionName = 'MySql';
+        $from = ['customer c'];
+        $columns = ['id', 'name', 'price'];
+        $filter = 'filter';
+        $joins = [
+            ['link-type' => 'left', 'table' => 'customer', 'condition' => 'in'],
+            ['link-type' => 'inner', 'table' => 'price', 'condition' => 'eq'],
+            ['link-type' => 'right', 'table' => 'attribute', 'condition' => 'neq'],
+        ];
+        $groups = ['id', 'name'];
+        $this->selectBuilder->setConnectionName($connectionName)
+            ->setFrom($from)
+            ->setColumns($columns)
+            ->setFilters([$filter])
+            ->setJoins($joins)
+            ->setGroup($groups);
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->selectMock);
+        $this->selectMock->expects($this->once())
+            ->method('from')
+            ->with($from, []);
+        $this->selectMock->expects($this->once())
+            ->method('columns')
+            ->with($columns);
+        $this->selectMock->expects($this->once())
+            ->method('where')
+            ->with($filter);
+        $this->selectMock->expects($this->once())
+            ->method('joinLeft')
+            ->with($joins[0]['table'], $joins[0]['condition'], []);
+        $this->selectMock->expects($this->once())
+            ->method('joinInner')
+            ->with($joins[1]['table'], $joins[1]['condition'], []);
+        $this->selectMock->expects($this->once())
+            ->method('joinRight')
+            ->with($joins[2]['table'], $joins[2]['condition'], []);
+        $this->selectBuilder->create();
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/IteratorFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/IteratorFactoryTest.php
new file mode 100644
index 0000000000000..bc20a62dcb366
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/IteratorFactoryTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+use Magento\Analytics\ReportXml\IteratorFactory;
+use Magento\Framework\ObjectManagerInterface;
+
+class IteratorFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var \IteratorIterator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $iteratorIteratorMock;
+
+    /**
+     * @var IteratorFactory
+     */
+    private $iteratorFactory;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->iteratorIteratorMock = $this->getMockBuilder(\IteratorIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->iteratorFactory = new IteratorFactory(
+            $this->objectManagerMock
+        );
+    }
+
+    public function testCreate()
+    {
+        $arrayObject = new \ArrayIterator([1, 2, 3, 4, 5]);
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(\IteratorIterator::class, ['iterator' => $arrayObject])
+            ->willReturn($this->iteratorIteratorMock);
+
+        $this->assertEquals($this->iteratorFactory->create($arrayObject), $this->iteratorIteratorMock);
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/QueryFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/QueryFactoryTest.php
new file mode 100644
index 0000000000000..9a3805a50f167
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/QueryFactoryTest.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+/**
+ * A unit test for testing of the query factory.
+ */
+class QueryFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\ReportXml\QueryFactory
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\Query|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\Assembler\AssemblerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $assemblerMock;
+
+    /**
+     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryCacheMock;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\SelectHydrator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectHydratorMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\DB\SelectBuilderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectBuilderFactoryMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->queryMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\Query::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->configMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\Config::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->selectMock = $this->getMockBuilder(
+            \Magento\Framework\DB\Select::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->assemblerMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\Assembler\AssemblerInterface::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->queryCacheMock = $this->getMockBuilder(
+            \Magento\Framework\App\CacheInterface::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->objectManagerMock = $this->getMockBuilder(
+            \Magento\Framework\ObjectManagerInterface::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->selectHydratorMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\SelectHydrator::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->selectBuilderFactoryMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\SelectBuilderFactory::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\ReportXml\QueryFactory::class,
+            [
+                'config' => $this->configMock,
+                'selectBuilderFactory' => $this->selectBuilderFactoryMock,
+                'assemblers' => [$this->assemblerMock],
+                'queryCache' => $this->queryCacheMock,
+                'objectManager' => $this->objectManagerMock,
+                'selectHydrator' => $this->selectHydratorMock
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testCreateCached()
+    {
+        $queryName = 'test_query';
+
+        $this->queryCacheMock->expects($this->any())
+            ->method('load')
+            ->with($queryName)
+            ->willReturn('{"connectionName":"sales","config":{},"select_parts":{}}');
+
+        $this->selectHydratorMock->expects($this->any())
+            ->method('recreate')
+            ->with([])
+            ->willReturn($this->selectMock);
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(
+                \Magento\Analytics\ReportXml\Query::class,
+                [
+                    'select' => $this->selectMock,
+                    'selectHydrator' => $this->selectHydratorMock,
+                    'connectionName' => 'sales',
+                    'config' => []
+                ]
+            )
+            ->willReturn($this->queryMock);
+
+        $this->queryCacheMock->expects($this->never())
+            ->method('save');
+
+        $this->assertEquals(
+            $this->queryMock,
+            $this->subject->create($queryName)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testCreateNotCached()
+    {
+        $queryName = 'test_query';
+
+        $queryConfigMock = [
+            'name' => 'test_query',
+            'connection' => 'sales'
+        ];
+
+        $selectBuilderMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\DB\SelectBuilder::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $selectBuilderMock->expects($this->once())
+            ->method('setConnectionName')
+            ->with($queryConfigMock['connection']);
+        $selectBuilderMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->selectMock);
+        $selectBuilderMock->expects($this->any())
+            ->method('getConnectionName')
+            ->willReturn($queryConfigMock['connection']);
+
+        $this->queryCacheMock->expects($this->any())
+            ->method('load')
+            ->with($queryName)
+            ->willReturn(null);
+
+        $this->configMock->expects($this->any())
+            ->method('get')
+            ->with($queryName)
+            ->willReturn($queryConfigMock);
+
+        $this->selectBuilderFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($selectBuilderMock);
+
+        $this->assemblerMock->expects($this->once())
+            ->method('assemble')
+            ->with($selectBuilderMock, $queryConfigMock)
+            ->willReturn($selectBuilderMock);
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(
+                \Magento\Analytics\ReportXml\Query::class,
+                [
+                    'select' => $this->selectMock,
+                    'selectHydrator' => $this->selectHydratorMock,
+                    'connectionName' => $queryConfigMock['connection'],
+                    'config' => $queryConfigMock
+                ]
+            )
+            ->willReturn($this->queryMock);
+
+        $this->queryCacheMock->expects($this->once())
+            ->method('save')
+            ->with(json_encode($this->queryMock), $queryName);
+
+        $this->assertEquals(
+            $this->queryMock,
+            $this->subject->create($queryName)
+        );
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/QueryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/QueryTest.php
new file mode 100644
index 0000000000000..947e07b569e04
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/QueryTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+use Magento\Analytics\ReportXml\Query;
+use Magento\Analytics\ReportXml\SelectHydrator as selectHydrator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class QueryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var selectHydrator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectHydratorMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Query
+     */
+    private $query;
+
+    /**
+     * @var string
+     */
+    private $connectionName = 'test_connection';
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->selectHydratorMock = $this->getMockBuilder(selectHydrator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->query = $this->objectManagerHelper->getObject(
+            Query::class,
+            [
+                'select' => $this->selectMock,
+                'connectionName' => $this->connectionName,
+                'selectHydrator' => $this->selectHydratorMock,
+                'config' => []
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testJsonSerialize()
+    {
+        $selectParts = ['part' => 1];
+
+        $this->selectHydratorMock
+            ->expects($this->once())
+            ->method('extract')
+            ->with($this->selectMock)
+            ->willReturn($selectParts);
+
+        $expectedResult = [
+            'connectionName' => $this->connectionName,
+            'select_parts' => $selectParts,
+            'config' => []
+        ];
+
+        $this->assertSame($expectedResult, $this->query->jsonSerialize());
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ReportProviderTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ReportProviderTest.php
new file mode 100644
index 0000000000000..5f329993dd291
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ReportProviderTest.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+/**
+ * A unit test for testing of the reports provider.
+ */
+class ReportProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Analytics\ReportXml\ReportProvider
+     */
+    private $subject;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\Query|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var \IteratorIterator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $iteratorMock;
+
+    /**
+     * @var \Magento\Framework\DB\Statement\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementMock;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\QueryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryFactoryMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\ConnectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionFactoryMock;
+
+    /**
+     * @var \Magento\Analytics\ReportXml\IteratorFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $iteratorFactoryMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->selectMock = $this->getMockBuilder(
+            \Magento\Framework\DB\Select::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->queryMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\Query::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->queryMock->expects($this->any())
+            ->method('getSelect')
+            ->willReturn($this->selectMock);
+
+        $this->iteratorMock = $this->getMockBuilder(
+            \IteratorIterator::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->statementMock = $this->getMockBuilder(
+            \Magento\Framework\DB\Statement\Pdo\Mysql::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->statementMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn($this->iteratorMock);
+
+        $this->connectionMock = $this->getMockBuilder(
+            \Magento\Framework\DB\Adapter\AdapterInterface::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->queryFactoryMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\QueryFactory::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->iteratorFactoryMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\IteratorFactory::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->iteratorMock = $this->getMockBuilder(
+            \IteratorIterator::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+        $this->objectManagerHelper =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->connectionFactoryMock = $this->getMockBuilder(
+            \Magento\Analytics\ReportXml\ConnectionFactory::class
+        )
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->subject = $this->objectManagerHelper->getObject(
+            \Magento\Analytics\ReportXml\ReportProvider::class,
+            [
+                'queryFactory' => $this->queryFactoryMock,
+                'connectionFactory' => $this->connectionFactoryMock,
+                'iteratorFactory' => $this->iteratorFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetReport()
+    {
+        $reportName = 'test_report';
+        $connectionName = 'sales';
+
+        $this->queryFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($reportName)
+            ->willReturn($this->queryMock);
+
+        $this->connectionFactoryMock->expects($this->once())
+            ->method('getConnection')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+
+        $this->queryMock->expects($this->once())
+            ->method('getConnectionName')
+            ->willReturn($connectionName);
+
+        $this->queryMock->expects($this->once())
+            ->method('getConfig')
+            ->willReturn(
+                [
+                    'connection' => $connectionName
+                ]
+            );
+
+        $this->connectionMock->expects($this->once())
+            ->method('query')
+            ->with($this->selectMock)
+            ->willReturn($this->statementMock);
+
+        $this->iteratorFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->statementMock, null)
+            ->willReturn($this->iteratorMock);
+        $this->assertEquals($this->iteratorMock, $this->subject->getReport($reportName));
+    }
+}
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php
new file mode 100644
index 0000000000000..058c74f341eb8
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Unit\ReportXml;
+
+use Magento\Analytics\ReportXml\SelectHydrator;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\JsonSerializableExpression;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SelectHydratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SelectHydrator
+     */
+    private $selectHydrator;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->selectHydrator = $this->objectManagerHelper->getObject(
+            SelectHydrator::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock,
+                'objectManager' => $this->objectManagerMock,
+            ]
+        );
+    }
+
+    public function testExtract()
+    {
+        $selectParts =
+            [
+                Select::DISTINCT,
+                Select::COLUMNS,
+                Select::UNION,
+                Select::FROM,
+                Select::WHERE,
+                Select::GROUP,
+                Select::HAVING,
+                Select::ORDER,
+                Select::LIMIT_COUNT,
+                Select::LIMIT_OFFSET,
+                Select::FOR_UPDATE
+            ];
+
+        $result = [];
+        foreach ($selectParts as $part) {
+            $result[$part] = "Part";
+        }
+        $this->selectMock->expects($this->any())
+            ->method('getPart')
+            ->willReturn("Part");
+        $this->assertEquals($this->selectHydrator->extract($this->selectMock), $result);
+    }
+
+    /**
+     * @dataProvider recreateWithoutExpressionDataProvider
+     * @param array $selectParts
+     * @param array $parts
+     * @param array $partValues
+     */
+    public function testRecreateWithoutExpression($selectParts, $parts, $partValues)
+    {
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->selectMock);
+        foreach ($parts as $key => $part) {
+            $this->selectMock->expects($this->at($key))
+                ->method('setPart')
+                ->with($part, $partValues[$key]);
+        }
+
+        $this->assertSame($this->selectMock, $this->selectHydrator->recreate($selectParts));
+    }
+
+    /**
+     * @return array
+     */
+    public function recreateWithoutExpressionDataProvider()
+    {
+        return [
+            'Select without expressions' => [
+                [
+                    Select::COLUMNS => [
+                        [
+                            'table_name',
+                            'field_name',
+                            'alias',
+                        ],
+                        [
+                            'table_name',
+                            'field_name_2',
+                            'alias_2',
+                        ],
+                    ]
+                ],
+                [Select::COLUMNS],
+                [[
+                    [
+                        'table_name',
+                        'field_name',
+                        'alias',
+                    ],
+                    [
+                        'table_name',
+                        'field_name_2',
+                        'alias_2',
+                    ],
+                ]],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider recreateWithExpressionDataProvider
+     * @param array $selectParts
+     * @param array $expectedParts
+     * @param \PHPUnit_Framework_MockObject_MockObject[] $expressionMocks
+     */
+    public function testRecreateWithExpression(
+        array $selectParts,
+        array $expectedParts,
+        array $expressionMocks
+    ) {
+        $this->objectManagerMock
+            ->expects($this->exactly(count($expressionMocks)))
+            ->method('create')
+            ->with($this->isType('string'), $this->isType('array'))
+            ->willReturnOnConsecutiveCalls(...$expressionMocks);
+        $this->resourceConnectionMock
+            ->expects($this->once())
+            ->method('getConnection')
+            ->with()
+            ->willReturn($this->connectionMock);
+        $this->connectionMock
+            ->expects($this->once())
+            ->method('select')
+            ->with()
+            ->willReturn($this->selectMock);
+        foreach (array_keys($selectParts) as $key => $partName) {
+            $this->selectMock
+                ->expects($this->at($key))
+                ->method('setPart')
+                ->with($partName, $expectedParts[$partName]);
+        }
+
+        $this->assertSame($this->selectMock, $this->selectHydrator->recreate($selectParts));
+    }
+
+    /**
+     * @return array
+     */
+    public function recreateWithExpressionDataProvider()
+    {
+        $expressionMock = $this->getMockBuilder(JsonSerializableExpression::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        return [
+            'Select without expressions' => [
+                'Parts' => [
+                    Select::COLUMNS => [
+                        [
+                            'table_name',
+                            'field_name',
+                            'alias',
+                        ],
+                        [
+                            'table_name',
+                            [
+                                'class' => 'Some_class',
+                                'arguments' => [
+                                    'expression' => ['some(expression)']
+                                ]
+                            ],
+                            'alias_2',
+                        ],
+                    ]
+                ],
+                'expectedParts' => [
+                    Select::COLUMNS => [
+                        [
+                            'table_name',
+                            'field_name',
+                            'alias',
+                        ],
+                        [
+                            'table_name',
+                            $expressionMock,
+                            'alias_2',
+                        ],
+                    ]
+                ],
+                'expectedExpressions' => [
+                    $expressionMock
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
new file mode 100644
index 0000000000000..88127f3c62a92
--- /dev/null
+++ b/app/code/Magento/Analytics/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-integration": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\Analytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/Analytics/etc/acl.xml b/app/code/Magento/Analytics/etc/acl.xml
new file mode 100644
index 0000000000000..bf2251895f929
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/acl.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Analytics::analytics" title="Analytics" translate="title" sortOrder="10">
+                    <resource id="Magento_Analytics::analytics_api" title="API" translate="title" sortOrder="10"/>
+                </resource>
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config" title="Configuration" translate="title" sortOrder="20">
+                            <resource id="Magento_Analytics::analytics_settings" title="Analytics" translate="title" sortOrder="150" />
+                        </resource>
+                    </resource>
+                </resource>
+                <resource id="Magento_Reports::report">
+                    <resource id="Magento_Analytics::business_intelligence" title="Business Intelligence" translate="title" sortOrder="90">
+                        <resource id="Magento_Analytics::advanced_reporting" title="Advanced Reporting" translate="title" sortOrder="10" />
+                        <resource id="Magento_Analytics::bi_essentials" title="BI Essentials" translate="title" sortOrder="20" />
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/Analytics/etc/adminhtml/di.xml b/app/code/Magento/Analytics/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..5e305e70e5ad3
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/adminhtml/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\Notification\MessageList">
+        <arguments>
+            <argument name="messages" xsi:type="array">
+                <item name="analytics" xsi:type="string">Magento\Analytics\Model\System\Message\NotificationAboutFailedSubscription</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Analytics/etc/adminhtml/menu.xml b/app/code/Magento/Analytics/etc/adminhtml/menu.xml
new file mode 100644
index 0000000000000..915211c4bb85e
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/adminhtml/menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Magento_Analytics::business_intelligence" title="Business Intelligence" translate="title" module="Magento_Analytics"
+             sortOrder="90" parent="Magento_Reports::report" resource="Magento_Analytics::business_intelligence" />
+        <add id="Magento_Analytics::advanced_reporting" title="Advanced Reporting" translate="title" module="Magento_Analytics"
+             sortOrder="10" parent="Magento_Analytics::business_intelligence" action="analytics/reports/show"
+             target="_blank" resource="Magento_Analytics::advanced_reporting" />
+        <add id="Magento_Analytics::bi_essentials" title="BI Essentials" translate="title" module="Magento_Analytics"
+             sortOrder="20" parent="Magento_Analytics::business_intelligence" action="analytics/biessentials/signup"
+             target="_blank" resource="Magento_Analytics::bi_essentials" />
+    </menu>
+</config>
diff --git a/app/code/Magento/Analytics/etc/adminhtml/routes.xml b/app/code/Magento/Analytics/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..0ae2762dacc5f
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="analytics" frontName="analytics">
+            <module name="Magento_Analytics" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..c7da840b7e665
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="analytics" translate="label" type="text" sortOrder="1150" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Advanced Reporting</label>
+            <tab>general</tab>
+            <resource>Magento_Analytics::analytics_settings</resource>
+            <group id="general" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+                <label>Advanced Reporting</label>
+                <comment><![CDATA[This service provides a dynamic suite of reports with rich insights about your business.
+                Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
+                "Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
+                terms and conditions</a>.]]></comment>
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Advanced Reporting Service</label>
+                    <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
+                    <backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
+                    <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
+                    <config_path>analytics/subscription/enabled</config_path>
+                </field>
+                <field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Time of day to send data</label>
+                    <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
+                    <backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>
+                </field>
+                <field id="vertical" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <hint>Industry Data</hint>
+                    <label>Industry</label>
+                    <comment>In order to personalize your Advanced Reporting experience, please select your industry.</comment>
+                    <source_model>Magento\Analytics\Model\Config\Source\Vertical</source_model>
+                    <backend_model>Magento\Analytics\Model\Config\Backend\Vertical</backend_model>
+                    <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\Vertical</frontend_model>
+					<depends>
+						<field id="analytics/general/enabled">1</field>
+					</depends>
+                </field>
+                <field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label><![CDATA[<strong>Get more insights from Magento Business Intelligence</strong>]]></label>
+                    <comment><![CDATA[Magento Business Intelligence provides you with a simple and clear path to
+                    becoming more data driven.</br> Learn more about <a target="_blank"
+                    href="https://dashboard.rjmetrics.com/v2/magento/signup/">Magento BI Essentials and BI Pro</a> tiers.]]></comment>
+                    <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\AdditionalComment</frontend_model>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/Analytics/etc/analytics.xml b/app/code/Magento/Analytics/etc/analytics.xml
new file mode 100644
index 0000000000000..77ebe751a31cf
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/analytics.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="modules">
+        <providers>
+            <reportProvider name="modules" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>modules</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="store_config">
+        <providers>
+            <customProvider name="store_config" class="Magento\Analytics\Model\StoreConfigurationProvider"/>
+        </providers>
+    </file>
+    <file name="stores">
+        <providers>
+            <reportProvider name="stores" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>stores</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="websites">
+        <providers>
+            <reportProvider name="websites" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>websites</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="groups">
+        <providers>
+            <reportProvider name="groups" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>groups</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/Analytics/etc/analytics.xsd b/app/code/Magento/Analytics/etc/analytics.xsd
new file mode 100644
index 0000000000000..2506e3d6a6a9a
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/analytics.xsd
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="file" type="fileDeclaration" minOccurs="0" maxOccurs="unbounded" />
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="uniqueFileName">
+            <xs:selector xpath="file" />
+            <xs:field xpath="@name" />
+        </xs:unique>
+    </xs:element>
+    <xs:complexType name="fileDeclaration">
+        <xs:sequence>
+            <xs:element name="providers" type="providers" minOccurs="1" />
+        </xs:sequence>
+        <xs:attribute name="name" type="fileName" use="required" />
+        <xs:attribute name="prefix" type="xs:string" />
+    </xs:complexType>
+    <xs:complexType name="providers">
+        <xs:choice>
+            <xs:sequence>
+                <xs:element name="reportProvider" type="reportProvider" />
+                <xs:element name="customProvider" type="customProvider" minOccurs="0" />
+            </xs:sequence>
+            <xs:element name="customProvider" type="customProvider" />
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="provider" abstract="true">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="class" type="xs:string" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="reportProvider">
+        <xs:complexContent>
+            <xs:extension base="provider">
+                <xs:all>
+                    <xs:element name="parameters">
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element name="name" type="notEmptyString" maxOccurs="1" />
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:all>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="customProvider">
+        <xs:complexContent>
+            <xs:extension base="provider" />
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:simpleType name="fileName">
+        <xs:annotation>
+            <xs:documentation>
+                File name attribute can has only [a-zA-Z0-9/_].
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z0-9/_]+" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="notEmptyString">
+        <xs:annotation>
+            <xs:documentation>
+                Value is required.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/app/code/Magento/Analytics/etc/config.xml b/app/code/Magento/Analytics/etc/config.xml
new file mode 100644
index 0000000000000..b6194ba12993f
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <analytics>
+            <url>
+                <signup>https://advancedreporting.rjmetrics.com/signup</signup>
+                <update>https://advancedreporting.rjmetrics.com/update</update>
+                <bi_essentials>https://dashboard.rjmetrics.com/v2/magento/signup</bi_essentials>
+                <otp>https://advancedreporting.rjmetrics.com/otp</otp>
+                <report>https://advancedreporting.rjmetrics.com/report</report>
+                <notify_data_changed>https://advancedreporting.rjmetrics.com/report</notify_data_changed>
+            </url>
+            <integration_name>Magento Analytics user</integration_name>
+            <general>
+                <collection_time>02,00,00</collection_time>
+            </general>
+        </analytics>
+    </default>
+</config>
diff --git a/app/code/Magento/Analytics/etc/crontab.xml b/app/code/Magento/Analytics/etc/crontab.xml
new file mode 100644
index 0000000000000..a4beef0359540
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/crontab.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="analytics_subscribe" instance="Magento\Analytics\Cron\SignUp" method="execute" />
+        <job name="analytics_update" instance="Magento\Analytics\Cron\Update" method="execute" />
+        <job name="analytics_collect_data" instance="Magento\Analytics\Cron\CollectData" method="execute" />
+    </group>
+</config>
diff --git a/app/code/Magento/Analytics/etc/di.xml b/app/code/Magento/Analytics/etc/di.xml
new file mode 100644
index 0000000000000..b9bb9cc9ff00c
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/di.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Analytics\ReportXML\ConfigInterface" type="Magento\Analytics\ReportXML\Config" />
+    <preference for="Magento\Analytics\Model\ConfigInterface" type="Magento\Analytics\Model\Config" />
+    <preference for="Magento\Analytics\Model\ReportWriterInterface" type="Magento\Analytics\Model\ReportWriter" />
+    <preference for="Magento\Analytics\Api\LinkProviderInterface" type="Magento\Analytics\Model\LinkProvider" />
+    <preference for="Magento\Analytics\Api\Data\LinkInterface" type="Magento\Analytics\Model\Link" />
+    <preference for="Magento\Analytics\Model\Connector\Http\ClientInterface" type="Magento\Analytics\Model\Connector\Http\Client\Curl" />
+    <preference for="Magento\Analytics\Model\ExportDataHandlerInterface" type="Magento\Analytics\Model\ExportDataHandlerNotification" />
+    <preference for="Magento\Analytics\Model\Connector\Http\ConverterInterface" type="Magento\Analytics\Model\Connector\Http\JsonConverter" />
+    <type name="Magento\Analytics\Model\Connector">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="signUp" xsi:type="string">Magento\Analytics\Model\Connector\SignUpCommand</item>
+                <item name="update" xsi:type="string">Magento\Analytics\Model\Connector\UpdateCommand</item>
+                <item name="notifyDataChanged" xsi:type="string">Magento\Analytics\Model\Connector\NotifyDataChangedCommand</item>
+            </argument>
+        </arguments>
+    </type>
+    <!--Configuration for \Magento\Analytics\ReportXml\Config-->
+    <type name="Magento\Analytics\ReportXml\Config">
+        <arguments>
+            <argument name="data" xsi:type="object">Magento\Analytics\ReportXml\Config\Data</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Analytics\ReportXml\Config\Data" type="Magento\Framework\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Analytics\ReportXml\Config\Reader</argument>
+            <argument name="cacheId" xsi:type="string">Magento_Analytics_ReportXml_CacheId</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Analytics\ReportXml\Config\SchemaLocator" type="Magento\Framework\Config\SchemaLocator">
+        <arguments>
+            <argument name="realPath" xsi:type="string">urn:magento:module:Magento_Analytics:etc/reports.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Analytics\ReportXml\Config\Reader\Xml" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Analytics\ReportXml\Config\Converter\Xml</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Analytics\ReportXml\Config\SchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">reports.xml</argument>
+            <argument name="idAttributes" xsi:type="array">
+                <item name="/config/report" xsi:type="string">name</item>
+                <item name="/config/report/source/link-source" xsi:type="array">
+                    <item name="name" xsi:type="string">name</item>
+                    <item name="alias" xsi:type="string">alias</item>
+                </item>
+                <item name="/config/report/source/attribute" xsi:type="string">name</item>
+                <item name="/config/report/source/link-source/attribute" xsi:type="string">name</item>
+                <!-- filter conditions for main source-->
+                <item name="/config/report/source(/filter)+" xsi:type="string">glue</item>
+                <item name="/config/report/source(/filter)+/condition" xsi:type="array">
+                    <item name="attribute" xsi:type="string">attribute</item>
+                    <item name="operator" xsi:type="string">operator</item>
+                </item>
+                <!-- filter conditions for joined source-->
+                <item name="/config/report/source/link-source(/filter)+" xsi:type="string">glue</item>
+                <item name="/config/report/source/link-source(/filter)+/condition" xsi:type="array">
+                    <item name="attribute" xsi:type="string">attribute</item>
+                    <item name="operator" xsi:type="string">operator</item>
+                </item>
+                <!-- join conditions for joined source-->
+                <item name="/config/report/source/link-source/using" xsi:type="string">glue</item>
+                <item name="/config/report/source/link-source/using/condition" xsi:type="array">
+                    <item name="attribute" xsi:type="string">attribute</item>
+                    <item name="operator" xsi:type="string">operator</item>
+                </item>
+                <item name="/config/report/source/link-source/using(/filter)+" xsi:type="string">glue</item>
+                <item name="/config/report/source/link-source/using(/filter)+/condition" xsi:type="array">
+                    <item name="attribute" xsi:type="string">attribute</item>
+                    <item name="operator" xsi:type="string">operator</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Analytics\ReportXml\Config\Reader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xml" xsi:type="object">Magento\Analytics\ReportXml\Config\Reader\Xml</item>
+            </argument>
+        </arguments>
+    </type>
+    <!--Configuration for \Magento\Analytics\Model\Config-->
+    <type name="Magento\Analytics\Model\Config">
+        <arguments>
+            <argument name="data" xsi:type="object">Magento\Analytics\Model\Config\Data</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Analytics\Model\Config\Data" type="Magento\Framework\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Analytics\Model\Config\Reader</argument>
+            <argument name="cacheId" xsi:type="string">Magento_Analytics_CacheId</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Analytics\Model\Config\SchemaLocator" type="Magento\Framework\Config\SchemaLocator">
+        <arguments>
+            <argument name="realPath" xsi:type="string">urn:magento:module:Magento_Analytics:etc/analytics.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Analytics\Model\Config\Reader\Xml" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Analytics\ReportXml\Config\Converter\Xml</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Analytics\Model\Config\SchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">analytics.xml</argument>
+            <argument name="idAttributes" xsi:type="array">
+                <item name="/config/file" xsi:type="string">name</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- -->
+    <type name="Magento\Analytics\ReportXml\QueryFactory">
+        <arguments>
+            <argument name="assemblers" xsi:type="array">
+                <item name="from" xsi:type="object">Magento\Analytics\ReportXml\DB\Assembler\FromAssembler</item>
+                <item name="filter" xsi:type="object">Magento\Analytics\ReportXml\DB\Assembler\FilterAssembler</item>
+                <item name="join" xsi:type="object">Magento\Analytics\ReportXml\DB\Assembler\JoinAssembler</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Model\Config\Reader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xml" xsi:type="object">Magento\Analytics\Model\Config\Reader\Xml</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Model\StoreConfigurationProvider">
+        <arguments>
+            <argument name="configPaths" xsi:type="array">
+                <item name="0" xsi:type="string">web/unsecure/base_url</item>
+                <item name="1" xsi:type="string">currency/options/base</item>
+                <item name="2" xsi:type="string">general/locale/timezone</item>
+                <item name="3" xsi:type="string">general/country/default</item>
+                <item name="4" xsi:type="string">carriers/dhl/title</item>
+                <item name="5" xsi:type="string">carriers/dhl/active</item>
+                <item name="6" xsi:type="string">carriers/fedex/title</item>
+                <item name="7" xsi:type="string">carriers/fedex/active</item>
+                <item name="8" xsi:type="string">carriers/flatrate/title</item>
+                <item name="9" xsi:type="string">carriers/flatrate/active</item>
+                <item name="10" xsi:type="string">carriers/tablerate/title</item>
+                <item name="11" xsi:type="string">carriers/tablerate/active</item>
+                <item name="12" xsi:type="string">carriers/freeshipping/title</item>
+                <item name="13" xsi:type="string">carriers/freeshipping/active</item>
+                <item name="14" xsi:type="string">carriers/ups/title</item>
+                <item name="15" xsi:type="string">carriers/ups/active</item>
+                <item name="16" xsi:type="string">carriers/usps/title</item>
+                <item name="17" xsi:type="string">carriers/usps/active</item>
+                <item name="18" xsi:type="string">payment/free/title</item>
+                <item name="19" xsi:type="string">payment/free/active</item>
+                <item name="20" xsi:type="string">payment/checkmo/title</item>
+                <item name="21" xsi:type="string">payment/checkmo/active</item>
+                <item name="22" xsi:type="string">payment/purchaseorder/title</item>
+                <item name="23" xsi:type="string">payment/purchaseorder/active</item>
+                <item name="24" xsi:type="string">payment/banktransfer/title</item>
+                <item name="25" xsi:type="string">payment/banktransfer/active</item>
+                <item name="26" xsi:type="string">payment/cashondelivery/title</item>
+                <item name="27" xsi:type="string">payment/cashondelivery/active</item>
+                <item name="28" xsi:type="string">payment/authorizenet_directpost/title</item>
+                <item name="29" xsi:type="string">payment/authorizenet_directpost/active</item>
+                <item name="30" xsi:type="string">payment/paypal_billing_agreement/title</item>
+                <item name="31" xsi:type="string">payment/paypal_billing_agreement/active</item>
+                <item name="32" xsi:type="string">payment/braintree/title</item>
+                <item name="33" xsi:type="string">payment/braintree/active</item>
+                <item name="34" xsi:type="string">payment/braintree_paypal/title</item>
+                <item name="35" xsi:type="string">payment/braintree_paypal/active</item>
+                <item name="36" xsi:type="string">analytics/general/vertical</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Model\Config\Source\Vertical">
+        <arguments>
+            <argument name="verticals" xsi:type="array">
+                <item name="0" xsi:type="string" translatable="true">Apps and Games</item>
+                <item name="1" xsi:type="string" translatable="true">Athletic/Sporting Goods</item>
+                <item name="2" xsi:type="string" translatable="true">Art and Design</item>
+                <item name="3" xsi:type="string" translatable="true">Auto Parts</item>
+                <item name="4" xsi:type="string" translatable="true">Baby/Children’s Apparel, Gear and Toys</item>
+                <item name="5" xsi:type="string" translatable="true">Beauty and Cosmetics</item>
+                <item name="6" xsi:type="string" translatable="true">Books, Music and Magazines</item>
+                <item name="7" xsi:type="string" translatable="true">Crafts and Stationery</item>
+                <item name="8" xsi:type="string" translatable="true">Consumer Electronics</item>
+                <item name="9" xsi:type="string" translatable="true">Deal Site</item>
+                <item name="10" xsi:type="string" translatable="true">Fashion Apparel and Accessories</item>
+                <item name="11" xsi:type="string" translatable="true">Food, Beverage and Grocery</item>
+                <item name="12" xsi:type="string" translatable="true">Home Goods and Furniture</item>
+                <item name="13" xsi:type="string" translatable="true">Home Improvement</item>
+                <item name="14" xsi:type="string" translatable="true">Jewelry and Watches</item>
+                <item name="15" xsi:type="string" translatable="true">Mass Merchant</item>
+                <item name="16" xsi:type="string" translatable="true">Office Supplies</item>
+                <item name="17" xsi:type="string" translatable="true">Outdoor and Camping Gear</item>
+                <item name="18" xsi:type="string" translatable="true">Pet Goods</item>
+                <item name="19" xsi:type="string" translatable="true">Pharma and Medical Devices</item>
+                <item name="20" xsi:type="string" translatable="true">Technology B2B</item>
+                <item name="21" xsi:type="string" translatable="true">Other</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Model\Config\Backend\Baseurl">
+        <plugin name="updateAnalyticsSubscription" type="Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin" />
+    </type>
+    <virtualType name="SignUpResponseResolver" type="Magento\Analytics\Model\Connector\Http\ResponseResolver">
+        <arguments>
+            <argument name="responseHandlers" xsi:type="array">
+                <item name="201" xsi:type="object">\Magento\Analytics\Model\Connector\ResponseHandler\SignUp</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="UpdateResponseResolver" type="Magento\Analytics\Model\Connector\Http\ResponseResolver">
+        <arguments>
+            <argument name="responseHandlers" xsi:type="array">
+                <item name="201" xsi:type="object">Magento\Analytics\Model\Connector\ResponseHandler\Update</item>
+                <item name="401" xsi:type="object">Magento\Analytics\Model\Connector\ResponseHandler\ReSignUp</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="OtpResponseResolver" type="Magento\Analytics\Model\Connector\Http\ResponseResolver">
+        <arguments>
+            <argument name="responseHandlers" xsi:type="array">
+                <item name="201" xsi:type="object">Magento\Analytics\Model\Connector\ResponseHandler\OTP</item>
+                <item name="401" xsi:type="object">Magento\Analytics\Model\Connector\ResponseHandler\ReSignUp</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NotifyDataChangedResponseResolver" type="Magento\Analytics\Model\Connector\Http\ResponseResolver">
+        <arguments>
+            <argument name="responseHandlers" xsi:type="array">
+                <item name="401" xsi:type="object">Magento\Analytics\Model\Connector\ResponseHandler\ReSignUp</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Analytics\Model\Connector\SignUpCommand">
+        <arguments>
+            <argument name="responseResolver" xsi:type="object">SignUpResponseResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Model\Connector\UpdateCommand">
+        <arguments>
+            <argument name="responseResolver" xsi:type="object">UpdateResponseResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Model\Connector\OTPRequest">
+        <arguments>
+            <argument name="responseResolver" xsi:type="object">OtpResponseResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Model\Connector\NotifyDataChangedCommand">
+        <arguments>
+            <argument name="responseResolver" xsi:type="object">NotifyDataChangedResponseResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Model\Config\TypePool">
+        <arguments>
+            <argument name="sensitive" xsi:type="array">
+                <item name="analytics/url/signup" xsi:type="string">1</item>
+                <item name="analytics/url/update" xsi:type="string">1</item>
+                <item name="analytics/url/bi_essentials" xsi:type="string">1</item>
+                <item name="analytics/url/otp" xsi:type="string">1</item>
+                <item name="analytics/url/report" xsi:type="string">1</item>
+                <item name="analytics/url/notify_data_changed" xsi:type="string">1</item>
+                <item name="analytics/general/token" xsi:type="string">1</item>
+            </argument>
+            <argument name="environment" xsi:type="array">
+                <item name="crontab/default/jobs/analytics_collect_data/schedule/cron_expr" xsi:type="string">1</item>
+                <item name="crontab/default/jobs/analytics_update/schedule/cron_expr" xsi:type="string">1</item>
+                <item name="crontab/default/jobs/analytics_subscribe/schedule/cron_expr" xsi:type="string">1</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Analytics/etc/module.xml b/app/code/Magento/Analytics/etc/module.xml
new file mode 100644
index 0000000000000..24c2fbc81446e
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_Analytics" >
+        <sequence>
+            <module name="Magento_Integration"/>
+            <module name="Magento_Backend"/>
+            <module name="Magento_Store"/>
+            <module name="Magento_Config"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/Analytics/etc/reports.xml b/app/code/Magento/Analytics/etc/reports.xml
new file mode 100644
index 0000000000000..8a43658670293
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/reports.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="modules" connection="default" iterator="Magento\Analytics\Model\ReportXml\ModuleIterator">
+        <source name="setup_module">
+            <attribute name="module" alias="module_name"/>
+            <attribute name="schema_version"/>
+            <attribute name="data_version"/>
+        </source>
+    </report>
+    <report name="config_data" connection="default">
+        <source name="core_config_data">
+            <attribute name="path"/>
+            <attribute name="value"/>
+        </source>
+    </report>
+    <report name="stores" connection="default">
+        <source name="store">
+            <attribute name="store_id"/>
+            <attribute name="code"/>
+            <attribute name="group_id"/>
+            <attribute name="name"/>
+            <attribute name="is_active"/>
+        </source>
+    </report>
+    <report name="websites" connection="default">
+        <source name="store_website">
+            <attribute name="website_id"/>
+            <attribute name="code"/>
+            <attribute name="name"/>
+            <attribute name="default_group_id"/>
+            <attribute name="is_default"/>
+        </source>
+    </report>
+    <report name="groups" connection="default">
+        <source name="store_group">
+            <attribute name="group_id"/>
+            <attribute name="website_id"/>
+            <attribute name="name"/>
+            <attribute name="default_store_id"/>
+        </source>
+    </report>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Analytics/etc/reports.xsd b/app/code/Magento/Analytics/etc/reports.xsd
new file mode 100644
index 0000000000000..d0ba4068244fe
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/reports.xsd
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="report" type="reportDeclaration" minOccurs="0" maxOccurs="unbounded" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:complexType name="reportDeclaration">
+        <xs:sequence>
+            <xs:element name="source" type="sourceDeclaration" minOccurs="1" maxOccurs="1" />
+            <xs:any minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="connection" type="xs:string"/>
+        <xs:attribute name="iterator" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="sourceDeclaration">
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="attribute" type="attributeDeclaration" minOccurs="1" maxOccurs="unbounded" />
+            <xs:element name="link-source" type="linkSourceDeclaration" minOccurs="0" maxOccurs="61" />
+            <xs:element name="filter" type="filterDeclaration" minOccurs="0" maxOccurs="unbounded" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="alias" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="linkSourceDeclaration">
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="attribute" type="attributeDeclaration" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="filter" type="filterDeclaration" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="using" type="filterDeclaration" minOccurs="1" maxOccurs="unbounded" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="alias" type="xs:string"/>
+        <xs:attribute name="link-type" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="attributeDeclaration">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="alias" type="xs:string"/>
+        <xs:attribute name="function" type="functionDeclaration"/>
+        <xs:attribute name="group" type="xs:boolean" default="false"/>
+        <xs:attribute name="distinct" type="xs:boolean" default="false"/>
+    </xs:complexType>
+    <xs:complexType name="filterDeclaration">
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="filter" type="filterDeclaration"  minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="condition" type="conditionDeclaration" minOccurs="1" maxOccurs="unbounded" />
+        </xs:choice>
+        <xs:attribute name="glue" type="glueType" default="and" />
+    </xs:complexType>
+    <xs:complexType name="conditionDeclaration" mixed="true">
+        <xs:attribute name="attribute" type="xs:string" use="required" />
+        <xs:attribute name="operator" type="xs:string" use="required" />
+        <xs:attribute name="type" type="valueType" default="value" />
+    </xs:complexType>
+    <xs:simpleType name="valueType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="value" />
+            <xs:enumeration value="variable" />
+            <xs:enumeration value="identifier" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="functionDeclaration">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="count" />
+            <xs:enumeration value="lower" />
+            <xs:enumeration value="date" />
+            <xs:enumeration value="sum" />
+            <xs:enumeration value="max" />
+            <xs:enumeration value="avg" />
+            <xs:enumeration value="min" />
+            <xs:enumeration value="sha1" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="glueType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="and" />
+            <xs:enumeration value="or" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/app/code/Magento/Analytics/etc/webapi.xml b/app/code/Magento/Analytics/etc/webapi.xml
new file mode 100644
index 0000000000000..8252d039f1d03
--- /dev/null
+++ b/app/code/Magento/Analytics/etc/webapi.xml
@@ -0,0 +1,16 @@
+<?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/analytics/link" method="GET" secure="true">
+        <service class="Magento\Analytics\Api\LinkProviderInterface" method="get"/>
+        <resources>
+            <resource ref="Magento_Analytics::analytics_api" />
+        </resources>
+    </route>
+</routes>
diff --git a/app/code/Magento/Analytics/i18n/en_US.csv b/app/code/Magento/Analytics/i18n/en_US.csv
new file mode 100644
index 0000000000000..4faa48fb73709
--- /dev/null
+++ b/app/code/Magento/Analytics/i18n/en_US.csv
@@ -0,0 +1,84 @@
+"Subscription status","Subscription status"
+"Sorry, there has been an error processing your request. Please try again later.","Sorry, there has been an error processing your request. Please try again later."
+"Sorry, there was an error processing your registration request to Magento Analytics. Please try again later.","Sorry, there was an error processing your registration request to Magento Analytics. Please try again later."
+"Error occurred during postponement notification","Error occurred during postponement notification"
+"Time value has an unsupported format","Time value has an unsupported format"
+"Cron settings can't be saved","Cron settings can't be saved"
+"There was an error save new configuration value.","There was an error save new configuration value."
+"Please select an industry.","Please select an industry."
+"--Please Select--","--Please Select--"
+"Command was not found.","Command was not found."
+"Input data must be string or convertible into string.","Input data must be string or convertible into string."
+"Input data must be non-empty string.","Input data must be non-empty string."
+"Not valid cipher method.","Not valid cipher method."
+"Encryption key can't be empty.","Encryption key can't be empty."
+"Source ""%1"" is not exist","Source ""%1"" is not exist"
+"These arguments can't be empty ""%1""","These arguments can't be empty ""%1"""
+"Cannot find predefined integration user!","Cannot find predefined integration user!"
+"File is not ready yet.","File is not ready yet."
+"Your Base URL has been changed and your reports are being updated. Advanced Reporting will be available once this change has been processed. Please try again later.","Your Base URL has been changed and your reports are being updated. Advanced Reporting will be available once this change has been processed. Please try again later."
+"Failed to synchronize data to the Magento Business Intelligence service. ","Failed to synchronize data to the Magento Business Intelligence service. "
+"Retry Synchronization","Retry Synchronization"
+TestMessage,TestMessage
+"Error message","Error message"
+"Apps and Games","Apps and Games"
+"Athletic/Sporting Goods","Athletic/Sporting Goods"
+"Art and Design","Art and Design"
+"Advanced Reporting","Advanced Reporting"
+"Gain new insights and take command of your business' performance, using our dynamic product, order, and customer reports tailored to your customer data.","Gain new insights and take command of your business' performance, using our dynamic product, order, and customer reports tailored to your customer data."
+"View details","View details"
+"Go to Advanced Reporting","Go to Advanced Reporting"
+"An error occurred while subscription process.","An error occurred while subscription process."
+Analytics,Analytics
+API,API
+Configuration,Configuration
+"Business Intelligence","Business Intelligence"
+"BI Essentials","BI Essentials"
+"This service provides a dynamic suite of reports with rich insights about your business.
+                Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
+                ""Go to Advanced Reporting"" link. </br> For more information, see our
+                <a href=""https://magento.com/legal/terms/privacy"">terms and conditions</a>.
+                ","This service provides a dynamic suite of reports with rich insights about your business.
+                Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
+                ""Go to Advanced Reporting"" link. </br> For more information, see our
+                <a href=""https://magento.com/legal/terms/privacy"">terms and conditions</a>."
+"Advanced Reporting Service","Advanced Reporting Service"
+Industry,Industry
+"Time of day to send data","Time of day to send data"
+"<strong>Get more insights from Magento Business Intelligence</strong>","<strong>Get more insights from Magento Business Intelligence</strong>"
+"Magento Business Intelligence provides you with a simple and clear path to
+                    becoming more data driven.</br> Learn more about <a target=""_blank""
+                    href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier.","Magento Business Intelligence provides you with a simple and clear path to
+                    becoming more data driven.</br> Learn more about <a target=""_blank""
+                    href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier."
+"Auto Parts","Auto Parts"
+"Baby/Children’s Apparel, Gear and Toys","Baby/Children’s Apparel, Gear and Toys"
+"Beauty and Cosmetics","Beauty and Cosmetics"
+"Books, Music and Magazines","Books, Music and Magazines"
+"Crafts and Stationery","Crafts and Stationery"
+"Consumer Electronics","Consumer Electronics"
+"Deal Site","Deal Site"
+"Fashion Apparel and Accessories","Fashion Apparel and Accessories"
+"Food, Beverage and Grocery","Food, Beverage and Grocery"
+"Home Goods and Furniture","Home Goods and Furniture"
+"Home Improvement","Home Improvement"
+"Jewelry and Watches","Jewelry and Watches"
+"Mass Merchant","Mass Merchant"
+"Office Supplies","Office Supplies"
+"Outdoor and Camping Gear","Outdoor and Camping Gear"
+"Pet Goods","Pet Goods"
+"Pharma and Medical Devices","Pharma and Medical Devices"
+"Technology B2B","Technology B2B"
+"Analytics Subscription","Analytics Subscription"
+"powered by Magento Business Intelligence","powered by Magento Business Intelligence"
+"Are you sure you want to opt out?","Are you sure you want to opt out?"
+Cancel,Cancel
+"Opt out","Opt out"
+"<p>Advanced Reporting in included,
+                    free of charge, in your Magento software. When you opt out, we collect no product, order, and
+                    customer data to generate our dynamic reports.</p><p>To opt in later: You can always turn on Advanced
+                    Reporting in you Admin Panel.</p>","<p>Advanced Reporting in included,
+                    free of charge, in your Magento software. When you opt out, we collect no product, order, and
+                    customer data to generate our dynamic reports.</p><p>To opt in later: You can always turn on Advanced
+                    Reporting in you Admin Panel.</p>"
+"In order to personalize your Advanced Reporting experience, please select your industry.","In order to personalize your Advanced Reporting experience, please select your industry."
diff --git a/app/code/Magento/Analytics/registration.php b/app/code/Magento/Analytics/registration.php
new file mode 100644
index 0000000000000..58d3688b7491d
--- /dev/null
+++ b/app/code/Magento/Analytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_Analytics',
+    __DIR__
+);
diff --git a/app/code/Magento/Analytics/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Analytics/view/adminhtml/layout/adminhtml_dashboard_index.xml
new file mode 100644
index 0000000000000..545098de52dcc
--- /dev/null
+++ b/app/code/Magento/Analytics/view/adminhtml/layout/adminhtml_dashboard_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>
+        <referenceContainer name="content">
+            <block template="Magento_Analytics::dashboard/section.phtml"
+                   class="Magento\Backend\Block\Template"
+                   name="analytics_service_external_link"
+                   before="-"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
new file mode 100644
index 0000000000000..a22c603b2a8b3
--- /dev/null
+++ b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+?>
+
+<section class="dashboard-advanced-reports" data-index="dashboard-advanced-reports">
+    <div class="dashboard-advanced-reports-description">
+        <header class="dashboard-advanced-reports-title">
+            <?= $block->escapeHtml(__('Advanced Reporting')) ?>
+        </header>
+        <div class="dashboard-advanced-reports-content">
+            <?= $block->escapeHtml(__('Gain new insights and take command of your business\' performance,' .
+                ' using our dynamic product, order, and customer reports tailored to your customer data.')) ?>
+        </div>
+    </div>
+    <div class="dashboard-advanced-reports-actions">
+        <a href="<?= $block->escapeUrl($block->getUrl('analytics/reports/show')) ?>"
+           target="_blank"
+           class="action action-advanced-reports"
+           data-index="analytics-service-link"
+           title="<?= $block->escapeHtmlAttr(__('Go to Advanced Reporting')) ?>">
+            <span><?= $block->escapeHtml(__('Go to Advanced Reporting')) ?></span>
+        </a>
+    </div>
+</section>
diff --git a/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php
new file mode 100644
index 0000000000000..76410794900e2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.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;
+
+/**
+ * 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 0000000000000..c7edd5c8ff9cd
--- /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 0000000000000..f8b7e389d387d
--- /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/BulkSummaryInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
new file mode 100644
index 0000000000000..a433ec0953a83
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Interface BulkSummaryInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkSummaryInterface extends \Magento\Framework\Bulk\BulkSummaryInterface
+{
+    const USER_TYPE = 'user_type';
+
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface|null
+     * @since 100.2.0
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+    );
+
+    /**
+     * Get user type
+     *
+     * @return int
+     */
+    public function getUserType();
+
+    /**
+     * Set user type
+     *
+     * @param int $userType
+     * @return $this
+     */
+    public function setUserType($userType);
+}
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 0000000000000..6e39177630857
--- /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\OperationInterface[]
+     */
+    public function getOperationsList();
+
+    /**
+     * Set operations list.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operationStatusList
+     * @return $this
+     */
+    public function setOperationsList($operationStatusList);
+}
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 0000000000000..3294078c2c1ea
--- /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/OperationInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationInterface.php
new file mode 100644
index 0000000000000..95366a96a87b2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/OperationInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Class OperationInterface
+ * @api
+ * @since 100.2.0
+ */
+interface OperationInterface extends \Magento\Framework\Bulk\OperationInterface
+{
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface|null
+     * @since 100.2.0
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+    );
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/OperationListInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationListInterface.php
new file mode 100644
index 0000000000000..474ca6b94885d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/OperationListInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * List of bulk operations. Used for mass save of operations via entity manager.
+ * @api
+ * @since 100.2.0
+ */
+interface OperationListInterface
+{
+    /**
+     * Get list of operations.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
+     * @since 100.2.0
+     */
+    public function getItems();
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
new file mode 100644
index 0000000000000..c3d221b7ef4f8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Bulk operation search result interface.
+ *
+ * An bulk is a group of queue messages. An bulk operation item is a queue message.
+ * @api
+ */
+interface OperationSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
+{
+    /**
+     * Get list of operations.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
+     */
+    public function getItems();
+
+    /**
+     * Set list of operations.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items);
+}
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 0000000000000..3b9f53b34162a
--- /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/Api/OperationRepositoryInterface.php b/app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php
new file mode 100644
index 0000000000000..17547321b827f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api;
+
+/**
+ * Bulk operation item repository interface.
+ *
+ * An bulk is a group of queue messages. An bulk operation item is a queue message.
+ * @api
+ */
+interface OperationRepositoryInterface
+{
+    /**
+     * Lists the bulk operation items that match specified search criteria.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/BackButton.php b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/BackButton.php
new file mode 100644
index 0000000000000..c2591987da012
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/BackButton.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Back button configuration provider
+ */
+class BackButton implements ButtonProviderInterface
+{
+    /**
+     * URL builder
+     *
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(
+        UrlInterface $urlBuilder
+    ) {
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Retrieve button data
+     *
+     * @return array button configuration
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $this->urlBuilder->getUrl('*/')),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/DoneButton.php b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/DoneButton.php
new file mode 100644
index 0000000000000..5e30c20fd2fbf
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/DoneButton.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Back button configuration provider
+ */
+class DoneButton implements ButtonProviderInterface
+{
+    /**
+     * @var \Magento\Framework\Bulk\BulkStatusInterface
+     */
+    private $bulkStatus;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+     * @param \Magento\Framework\App\RequestInterface $request
+     */
+    public function __construct(
+        \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus,
+        \Magento\Framework\App\RequestInterface $request
+    ) {
+        $this->bulkStatus = $bulkStatus;
+        $this->request = $request;
+    }
+
+    /**
+     * Retrieve button data
+     *
+     * @return array button configuration
+     */
+    public function getButtonData()
+    {
+        $uuid = $this->request->getParam('uuid');
+        $operationsCount = $this->bulkStatus->getOperationsCountByBulkIdAndStatus(
+            $uuid,
+            OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+        );
+        $button = [];
+
+        if ($this->request->getParam('buttons') && $operationsCount === 0) {
+            $button = [
+                'label' => __('Done'),
+                'class' => 'primary',
+                'sort_order' => 10,
+                'on_click' => '',
+                'data_attribute' => [
+                    'mage-init' => [
+                        'Magento_Ui/js/form/button-adapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'notification_area.notification_area.modalContainer.modal',
+                                    'actionName' => 'closeModal'
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ];
+        }
+
+        return $button;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/RetryButton.php b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/RetryButton.php
new file mode 100644
index 0000000000000..9051f1ab9d428
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/RetryButton.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Retry button configuration provider
+ */
+class RetryButton implements ButtonProviderInterface
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $details;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var string
+     */
+    private $targetName;
+
+    /**
+     * RetryButton constructor.
+     *
+     * @param \Magento\AsynchronousOperations\Model\Operation\Details $details
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param string $targetName
+     */
+    public function __construct(
+        \Magento\AsynchronousOperations\Model\Operation\Details $details,
+        \Magento\Framework\App\RequestInterface $request,
+        $targetName = 'bulk_details_form.bulk_details_form'
+    ) {
+        $this->details = $details;
+        $this->request = $request;
+        $this->targetName = $targetName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonData()
+    {
+        $uuid = $this->request->getParam('uuid');
+        $details = $this->details->getDetails($uuid);
+        if ($details['failed_retriable'] === 0) {
+            return [];
+        }
+        return [
+            'label' => __('Retry'),
+            'class' => 'retry primary',
+            'data_attribute' => [
+                'mage-init' => ['button' => ['event' => 'save']],
+                'form-role' => 'save',
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
new file mode 100644
index 0000000000000..a450187dd094b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
+
+/**
+ * Class View Operation Details Controller
+ */
+class Details extends \Magento\Backend\App\Action implements \Magento\Framework\App\Action\HttpGetActionInterface
+{
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    private $resultPageFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\AccessValidator
+     */
+    private $accessValidator;
+
+    /**
+     * @var string
+     */
+    private $menuId;
+
+    /**
+     * Details constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\AsynchronousOperations\Model\AccessValidator $accessValidator
+     * @param string $menuId
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\AsynchronousOperations\Model\AccessValidator $accessValidator,
+        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
+    ) {
+        $this->resultPageFactory = $resultPageFactory;
+        $this->accessValidator = $accessValidator;
+        $this->menuId = $menuId;
+        parent::__construct($context);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations')
+            && $this->accessValidator->isAllowed($this->getRequest()->getParam('uuid'));
+    }
+    
+    /**
+     * Bulk details action
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    public function execute()
+    {
+        $bulkId = $this->getRequest()->getParam('uuid');
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->initLayout();
+        $this->_setActiveMenu($this->menuId);
+        $resultPage->getConfig()->getTitle()->prepend(__('Action Details - #' . $bulkId));
+
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php
new file mode 100644
index 0000000000000..62e6b9ba4551b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
+
+use Magento\AsynchronousOperations\Model\BulkManagement;
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\App\Action;
+use Magento\AsynchronousOperations\Model\AccessValidator;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * Class Bulk Retry Controller
+ */
+class Retry extends Action
+{
+    /**
+     * @var BulkManagement
+     */
+    private $bulkManagement;
+
+    /**
+     * @var BulkNotificationManagement
+     */
+    private $notificationManagement;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\AccessValidator
+     */
+    private $accessValidator;
+
+    /**
+     * Retry constructor.
+     * @param Context $context
+     * @param BulkManagement $bulkManagement
+     * @param BulkNotificationManagement $notificationManagement
+     * @param AccessValidator $accessValidator
+     */
+    public function __construct(
+        Context $context,
+        BulkManagement $bulkManagement,
+        BulkNotificationManagement $notificationManagement,
+        AccessValidator $accessValidator
+    ) {
+        parent::__construct($context);
+        $this->bulkManagement = $bulkManagement;
+        $this->notificationManagement = $notificationManagement;
+        $this->accessValidator = $accessValidator;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations')
+            && $this->accessValidator->isAllowed($this->getRequest()->getParam('uuid'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        $bulkUuid = $this->getRequest()->getParam('uuid');
+        $isAjax = $this->getRequest()->getParam('isAjax');
+        $operationsToRetry = (array)$this->getRequest()->getParam('operations_to_retry', []);
+        $errorCodes = [];
+        foreach ($operationsToRetry as $operationData) {
+            if (isset($operationData['error_code'])) {
+                $errorCodes[] = (int)$operationData['error_code'];
+            }
+        }
+
+        $affectedOperations = $this->bulkManagement->retryBulk($bulkUuid, $errorCodes);
+        $this->notificationManagement->ignoreBulks([$bulkUuid]);
+        if (!$isAjax) {
+            $this->messageManager->addSuccessMessage(
+                __('%1 item(s) have been scheduled for update."', $affectedOperations)
+            );
+            /** @var Redirect $result */
+            $result = $this->resultRedirectFactory->create();
+            $result->setPath('bulk/index');
+        } else {
+            /** @var \Magento\Framework\Controller\Result\Json $result */
+            $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+            $result->setHttpResponseCode(200);
+            $response = new \Magento\Framework\DataObject();
+            $response->setError(0);
+
+            $result->setData($response);
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php
new file mode 100644
index 0000000000000..5a2b9c0a34e64
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index;
+
+class Index extends \Magento\Backend\App\Action
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
+
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    private $resultPageFactory;
+
+    /**
+     * @var string
+     */
+    private $menuId;
+
+    /**
+     * Details constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param string $menuId
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
+    ) {
+        $this->resultPageFactory = $resultPageFactory;
+        $this->menuId = $menuId;
+        parent::__construct($context);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return parent::_isAllowed();
+    }
+
+    /**
+     * Bulk list action
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    public function execute()
+    {
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->initLayout();
+        $this->_setActiveMenu($this->menuId);
+        $resultPage->getConfig()->getTitle()->prepend(__('Bulk Actions Log'));
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php
new file mode 100644
index 0000000000000..0a71c130fb20a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Notification;
+
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\App\Action;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * Class Bulk Notification Dismiss Controller
+ */
+class Dismiss extends Action
+{
+    /**
+     * @var BulkNotificationManagement
+     */
+    private $notificationManagement;
+
+    /**
+     * Class constructor.
+     *
+     * @param Context $context
+     * @param BulkNotificationManagement $notificationManagement
+     */
+    public function __construct(
+        Context $context,
+        BulkNotificationManagement $notificationManagement
+    ) {
+        parent::__construct($context);
+        $this->notificationManagement = $notificationManagement;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        $bulkUuids = [];
+        foreach ((array)$this->getRequest()->getParam('uuid', []) as $bulkUuid) {
+            $bulkUuids[] = (string)$bulkUuid;
+        }
+
+        $isAcknowledged = $this->notificationManagement->acknowledgeBulks($bulkUuids);
+
+        /** @var \Magento\Framework\Controller\Result\Json $result */
+        $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        if (!$isAcknowledged) {
+            $result->setHttpResponseCode(400);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Cron/BulkCleanup.php b/app/code/Magento/AsynchronousOperations/Cron/BulkCleanup.php
new file mode 100644
index 0000000000000..7c8da3c1c4236
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Cron/BulkCleanup.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Cron;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class BulkCleanup
+{
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $date;
+
+    /**
+     * BulkCleanup constructor.
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param DateTime $dateTime
+     * @param ScopeConfigInterface $scopeConfig
+     * @param DateTime\DateTime $time
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        DateTime $dateTime,
+        ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Stdlib\DateTime\DateTime $time
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->dateTime = $dateTime;
+        $this->scopeConfig = $scopeConfig;
+        $this->date = $time;
+    }
+
+    /**
+     * Remove all expired bulks and corresponding operations
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        $bulkLifetime = 3600 * 24 * (int)$this->scopeConfig->getValue('system/bulk/lifetime');
+        $maxBulkStartTime = $this->dateTime->formatDate($this->date->gmtTimestamp() - $bulkLifetime);
+        $connection->delete($metadata->getEntityTable(), ['start_time <= ?' => $maxBulkStartTime]);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/AccessValidator.php b/app/code/Magento/AsynchronousOperations/Model/AccessValidator.php
new file mode 100644
index 0000000000000..a14ec254cf897
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/AccessValidator.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+/**
+ * Class AccessValidator
+ */
+class AccessValidator
+{
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var \Magento\Framework\EntityManager\EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     */
+    private $bulkSummaryFactory;
+
+    /**
+     * AccessValidator constructor.
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param \Magento\Framework\EntityManager\EntityManager $entityManager
+     * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory $bulkSummaryFactory
+     */
+    public function __construct(
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        \Magento\Framework\EntityManager\EntityManager $entityManager,
+        \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory $bulkSummaryFactory
+    ) {
+        $this->userContext = $userContext;
+        $this->entityManager = $entityManager;
+        $this->bulkSummaryFactory = $bulkSummaryFactory;
+    }
+
+    /**
+     * Check if content allowed for current user
+     *
+     * @param int $bulkUuid
+     * @return bool
+     */
+    public function isAllowed($bulkUuid)
+    {
+        /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulkSummary */
+        $bulkSummary = $this->entityManager->load(
+            $this->bulkSummaryFactory->create(),
+            $bulkUuid
+        );
+        return $bulkSummary->getUserId() === $this->userContext->getUserId();
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/AsyncResponse.php b/app/code/Magento/AsynchronousOperations/Model/AsyncResponse.php
new file mode 100644
index 0000000000000..02a2e8de1fa64
--- /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/BulkDescription/Options.php b/app/code/Magento/AsynchronousOperations/Model/BulkDescription/Options.php
new file mode 100644
index 0000000000000..08e1a863b259d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkDescription/Options.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\BulkDescription;
+
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class for grid options
+ */
+class Options implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * Options constructor.
+     * @param \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     */
+    public function __construct(
+        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection,
+        \Magento\Authorization\Model\UserContextInterface $userContext
+    ) {
+        $this->bulkCollectionFactory = $bulkCollection;
+        $this->userContext = $userContext;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection $collection */
+        $collection = $this->bulkCollectionFactory->create();
+
+        /** @var \Magento\Framework\DB\Select $select */
+        $select = $collection->getSelect();
+        $select->reset();
+        $select->distinct(true);
+        $select->from($collection->getMainTable(), ['description']);
+        $select->where('user_id = ?', $this->userContext->getUserId());
+
+        $options = [];
+
+        /** @var BulkSummaryInterface $item */
+        foreach ($collection->getItems() as $item) {
+            $options[] = [
+                'value' => $item->getDescription(),
+                'label' => $item->getDescription()
+            ];
+        }
+        return $options;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
new file mode 100644
index 0000000000000..faf01921e5737
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\MessageQueue\BulkPublisherInterface;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Class BulkManagement
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var BulkSummaryInterfaceFactory
+     */
+    private $bulkSummaryFactory;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var BulkPublisherInterface
+     */
+    private $publisher;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * BulkManagement constructor.
+     * @param EntityManager $entityManager
+     * @param BulkSummaryInterfaceFactory $bulkSummaryFactory
+     * @param CollectionFactory $operationCollectionFactory
+     * @param BulkPublisherInterface $publisher
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param UserContextInterface $userContext
+     */
+    public function __construct(
+        EntityManager $entityManager,
+        BulkSummaryInterfaceFactory $bulkSummaryFactory,
+        CollectionFactory $operationCollectionFactory,
+        BulkPublisherInterface $publisher,
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        \Psr\Log\LoggerInterface $logger,
+        UserContextInterface $userContext = null
+    ) {
+        $this->entityManager = $entityManager;
+        $this->bulkSummaryFactory= $bulkSummaryFactory;
+        $this->operationCollectionFactory = $operationCollectionFactory;
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->publisher = $publisher;
+        $this->logger = $logger;
+        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+        // save bulk summary and related operations
+        $connection->beginTransaction();
+        $userType = $this->userContext->getUserType();
+        if ($userType === null) {
+            $userType = UserContextInterface::USER_TYPE_ADMIN;
+        }
+        try {
+            /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulkSummary */
+            $bulkSummary = $this->bulkSummaryFactory->create();
+            $this->entityManager->load($bulkSummary, $bulkUuid);
+            $bulkSummary->setBulkId($bulkUuid);
+            $bulkSummary->setDescription($description);
+            $bulkSummary->setUserId($userId);
+            $bulkSummary->setUserType($userType);
+            $bulkSummary->setOperationCount((int)$bulkSummary->getOperationCount() + count($operations));
+
+            $this->entityManager->save($bulkSummary);
+
+            $connection->commit();
+        } catch (\Exception $exception) {
+            $connection->rollBack();
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        $this->publishOperations($operations);
+
+        return true;
+    }
+
+    /**
+     * Retry bulk operations that failed due to given errors.
+     *
+     * @param string $bulkUuid target bulk UUID
+     * @param array $errorCodes list of corresponding error codes
+     * @return int number of affected bulk operations
+     */
+    public function retryBulk($bulkUuid, array $errorCodes)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation[] $retriablyFailedOperations */
+        $retriablyFailedOperations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('error_code', ['in' => $errorCodes])
+            ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
+            ->getItems();
+
+        // remove corresponding operations from database (i.e. move them to 'open' status)
+        $connection->beginTransaction();
+        try {
+            $operationIds = [];
+            $currentBatchSize = 0;
+            $maxBatchSize = 10000;
+            /** @var OperationInterface $operation */
+            foreach ($retriablyFailedOperations as $operation) {
+                if ($currentBatchSize === $maxBatchSize) {
+                    $connection->delete(
+                        $this->resourceConnection->getTableName('magento_operation'),
+                        $connection->quoteInto('id IN (?)', $operationIds)
+                    );
+                    $operationIds = [];
+                    $currentBatchSize = 0;
+                }
+                $currentBatchSize++;
+                $operationIds[] = $operation->getId();
+                // Rescheduled operations must be put in queue in 'open' state (i.e. without ID)
+                $operation->setId(null);
+            }
+            // remove operations from the last batch
+            if (!empty($operationIds)) {
+                $connection->delete(
+                    $this->resourceConnection->getTableName('magento_operation'),
+                    $connection->quoteInto('id IN (?)', $operationIds)
+                );
+            }
+
+            $connection->commit();
+        } catch (\Exception $exception) {
+            $connection->rollBack();
+            $this->logger->critical($exception->getMessage());
+            return 0;
+        }
+        $this->publishOperations($retriablyFailedOperations);
+
+        return count($retriablyFailedOperations);
+    }
+
+    /**
+     * Publish list of operations to the corresponding message queues.
+     *
+     * @param array $operations
+     * @return void
+     */
+    private function publishOperations(array $operations)
+    {
+        $operationsByTopics = [];
+        foreach ($operations as $operation) {
+            $operationsByTopics[$operation->getTopicName()][] = $operation;
+        }
+        foreach ($operationsByTopics as $topicName => $operations) {
+            $this->publisher->publish($topicName, $operations);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function deleteBulk($bulkId)
+    {
+        return $this->entityManager->delete(
+            $this->entityManager->load(
+                $this->bulkSummaryFactory->create(),
+                $bulkId
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php b/app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php
new file mode 100644
index 0000000000000..2ba7f7fe5e3ee
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory as BulkCollectionFactory;
+use Magento\Framework\Data\Collection;
+
+/**
+ * Class for bulk notification manager
+ */
+class BulkNotificationManagement
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var BulkCollectionFactory
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * BulkManagement constructor.
+     *
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param BulkCollectionFactory $bulkCollectionFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        BulkCollectionFactory $bulkCollectionFactory,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->bulkCollectionFactory = $bulkCollectionFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Mark given bulks as acknowledged.
+     * Notifications related to these bulks will not appear in notification area.
+     *
+     * @param array $bulkUuids
+     * @return bool true on success or false on failure
+     */
+    public function acknowledgeBulks(array $bulkUuids)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        try {
+            $connection->insertArray(
+                $this->resourceConnection->getTableName('magento_acknowledged_bulk'),
+                ['bulk_uuid'],
+                $bulkUuids
+            );
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Remove given bulks from acknowledged list.
+     * Notifications related to these bulks will appear again in notification area.
+     *
+     * @param array $bulkUuids
+     * @return bool true on success or false on failure
+     */
+    public function ignoreBulks(array $bulkUuids)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        try {
+            $connection->delete(
+                $this->resourceConnection->getTableName('magento_acknowledged_bulk'),
+                ['bulk_uuid IN(?)' => $bulkUuids]
+            );
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Retrieve all bulks that were acknowledged by given user.
+     *
+     * @param int $userId
+     * @return BulkSummaryInterface[]
+     */
+    public function getAcknowledgedBulksByUser($userId)
+    {
+        $bulks = $this->bulkCollectionFactory->create()
+            ->join(
+                ['acknowledged_bulk' => $this->resourceConnection->getTableName('magento_acknowledged_bulk')],
+                'main_table.uuid = acknowledged_bulk.bulk_uuid',
+                []
+            )->addFieldToFilter('user_id', $userId)
+            ->addOrder('start_time', Collection::SORT_ORDER_DESC)
+            ->getItems();
+
+        return $bulks;
+    }
+
+    /**
+     * Retrieve all bulks that were not acknowledged by given user.
+     *
+     * @param int $userId
+     * @return BulkSummaryInterface[]
+     */
+    public function getIgnoredBulksByUser($userId)
+    {
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection $bulkCollection */
+        $bulkCollection = $this->bulkCollectionFactory->create();
+        $bulkCollection->getSelect()->joinLeft(
+            ['acknowledged_bulk' => $this->resourceConnection->getTableName('magento_acknowledged_bulk')],
+            'main_table.uuid = acknowledged_bulk.bulk_uuid',
+            ['acknowledged_bulk.bulk_uuid']
+        );
+        $bulks = $bulkCollection->addFieldToFilter('user_id', $userId)
+            ->addFieldToFilter('acknowledged_bulk.bulk_uuid', ['null' => true])
+            ->addOrder('start_time', Collection::SORT_ORDER_DESC)
+            ->getItems();
+
+        return $bulks;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkOperationsStatus.php b/app/code/Magento/AsynchronousOperations/Model/BulkOperationsStatus.php
new file mode 100644
index 0000000000000..5fc164ec833d8
--- /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.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
new file mode 100644
index 0000000000000..c37ae0d23dd25
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * Class BulkStatus
+ */
+class BulkStatus implements \Magento\Framework\Bulk\BulkStatusInterface
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var CalculatedStatusSql
+     */
+    private $calculatedStatusSql;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * BulkStatus constructor.
+     * @param ResourceModel\Bulk\CollectionFactory $bulkCollection
+     * @param ResourceModel\Operation\CollectionFactory $operationCollection
+     * @param ResourceConnection $resourceConnection
+     * @param CalculatedStatusSql $calculatedStatusSql
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection,
+        \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory $operationCollection,
+        ResourceConnection $resourceConnection,
+        CalculatedStatusSql $calculatedStatusSql,
+        MetadataPool $metadataPool
+    ) {
+        $this->operationCollectionFactory = $operationCollection;
+        $this->bulkCollectionFactory = $bulkCollection;
+        $this->resourceConnection = $resourceConnection;
+        $this->calculatedStatusSql = $calculatedStatusSql;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
+    {
+        $failureCodes = $failureType
+            ? [$failureType]
+            : [
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED
+            ];
+        $operations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->addFieldToFilter('status', $failureCodes)
+            ->getItems();
+        return $operations;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
+    {
+        if ($status === OperationInterface::STATUS_TYPE_OPEN) {
+            /**
+             * Total number of operations that has been scheduled within the given bulk
+             */
+            $allOperationsQty = $this->getOperationCount($bulkUuid);
+
+            /**
+             * Number of operations that has been processed (i.e. operations with any status but 'open')
+             */
+            $allProcessedOperationsQty = (int)$this->operationCollectionFactory->create()
+                ->addFieldToFilter('bulk_uuid', $bulkUuid)
+                ->getSize();
+
+            return $allOperationsQty - $allProcessedOperationsQty;
+        }
+
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
+        $collection = $this->operationCollectionFactory->create();
+        return $collection->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->addFieldToFilter('status', $status)
+            ->getSize();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulksByUser($userId)
+    {
+        /** @var ResourceModel\Bulk\Collection $collection */
+        $collection = $this->bulkCollectionFactory->create();
+        $operationTableName = $this->resourceConnection->getTableName('magento_operation');
+        $statusesArray = [
+            OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+            OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+            BulkSummaryInterface::NOT_STARTED,
+            OperationInterface::STATUS_TYPE_OPEN,
+            OperationInterface::STATUS_TYPE_COMPLETE
+        ];
+        $select = $collection->getSelect();
+        $select->columns(['status' => $this->calculatedStatusSql->get($operationTableName)])
+            ->order(new \Zend_Db_Expr('FIELD(status, ' . implode(',', $statusesArray) . ')'));
+        $collection->addFieldToFilter('user_id', $userId)
+            ->addOrder('start_time');
+
+        return $collection->getItems();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkStatus($bulkUuid)
+    {
+        /**
+         * Number of operations that has been processed (i.e. operations with any status but 'open')
+         */
+        $allProcessedOperationsQty = (int)$this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->getSize();
+
+        if ($allProcessedOperationsQty == 0) {
+            return BulkSummaryInterface::NOT_STARTED;
+        }
+
+        /**
+         * Total number of operations that has been scheduled within the given bulk
+         */
+        $allOperationsQty = $this->getOperationCount($bulkUuid);
+
+        /**
+         * Number of operations that has not been started yet (i.e. operations with status 'open')
+         */
+        $allOpenOperationsQty = $allOperationsQty - $allProcessedOperationsQty;
+
+        /**
+         * Number of operations that has been completed successfully
+         */
+        $allCompleteOperationsQty = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)->addFieldToFilter(
+                'status',
+                OperationInterface::STATUS_TYPE_COMPLETE
+            )->getSize();
+
+        if ($allCompleteOperationsQty == $allOperationsQty) {
+            return BulkSummaryInterface::FINISHED_SUCCESSFULLY;
+        }
+
+        if ($allOpenOperationsQty > 0 && $allOpenOperationsQty !== $allOperationsQty) {
+            return BulkSummaryInterface::IN_PROGRESS;
+        }
+
+        return BulkSummaryInterface::FINISHED_WITH_FAILURE;
+    }
+
+    /**
+     * Get total number of operations that has been scheduled within the given bulk.
+     *
+     * @param string $bulkUuid
+     * @return int
+     */
+    private function getOperationCount($bulkUuid)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        return (int)$connection->fetchOne(
+            $connection->select()
+                ->from($metadata->getEntityTable(), 'operation_count')
+                ->where('uuid = ?', $bulkUuid)
+        );
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
new file mode 100644
index 0000000000000..7bdf8a5b7d400
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model\BulkStatus;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+class CalculatedStatusSql
+{
+    /**
+     * Get sql to calculate bulk status
+     *
+     * @param string $operationTableName
+     * @return \Zend_Db_Expr
+     */
+    public function get($operationTableName)
+    {
+        return new \Zend_Db_Expr(
+            '(IF(
+                (SELECT count(*)
+                    FROM ' . $operationTableName . '
+                    WHERE bulk_uuid = main_table.uuid
+                ) = 0,
+                ' . BulkSummaryInterface::NOT_STARTED . ',
+                (SELECT MAX(status) FROM ' . $operationTableName . ' WHERE bulk_uuid = main_table.uuid)
+            ))'
+        );
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Detailed.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Detailed.php
new file mode 100644
index 0000000000000..334abb33fd106
--- /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/Options.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Options.php
new file mode 100644
index 0000000000000..47c317138ec64
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Options.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\BulkStatus;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+/**
+ * Class Options
+ */
+class Options implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => BulkSummaryInterface::NOT_STARTED,
+                'label' => 'Not Started'
+            ],
+            [
+                'value' => BulkSummaryInterface::IN_PROGRESS,
+                'label' => 'In Progress'
+            ],
+            [
+                'value' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+                'label' => 'Finished Successfully'
+            ],
+            [
+                'value' => BulkSummaryInterface::FINISHED_WITH_FAILURE,
+                'label' => 'Finished with Failure'
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Short.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Short.php
new file mode 100644
index 0000000000000..c6aa99e67202b
--- /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/BulkSummary.php b/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
new file mode 100644
index 0000000000000..1d834ad10b2e7
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\DataObject;
+
+/**
+ * Class BulkSummary
+ */
+class BulkSummary extends DataObject implements BulkSummaryInterface, \Magento\Framework\Api\ExtensibleDataInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getBulkId()
+    {
+        return $this->getData(self::BULK_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBulkId($bulkUuid)
+    {
+        return $this->setData(self::BULK_ID, $bulkUuid);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDescription()
+    {
+        return $this->getData(self::DESCRIPTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setDescription($description)
+    {
+        return $this->setData(self::DESCRIPTION, $description);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStartTime()
+    {
+        return $this->getData(self::START_TIME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setStartTime($timestamp)
+    {
+        return $this->setData(self::START_TIME, $timestamp);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserId()
+    {
+        return $this->getData(self::USER_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUserId($userId)
+    {
+        return $this->setData(self::USER_ID, $userId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserType()
+    {
+        return $this->getData(self::USER_TYPE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUserType($userType)
+    {
+        return $this->setData(self::USER_TYPE, $userType);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationCount()
+    {
+        return $this->getData(self::OPERATION_COUNT);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setOperationCount($operationCount)
+    {
+        return $this->setData(self::OPERATION_COUNT, $operationCount);
+    }
+
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->getData(self::EXTENSION_ATTRIBUTES_KEY);
+    }
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+    ) {
+        return $this->setData(self::EXTENSION_ATTRIBUTES_KEY, $extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php b/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php
new file mode 100644
index 0000000000000..de0f89a71650a
--- /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
new file mode 100644
index 0000000000000..4abbde4c3602b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\Entity;
+
+use Magento\Framework\EntityManager\MapperInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * @deprecated 100.2.0
+ */
+class BulkSummaryMapper implements MapperInterface
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function entityToDatabase($entityType, $data)
+    {
+        // workaround for delete/update operations that are currently using only primary key as identifier
+        if (!empty($data['uuid'])) {
+            $metadata = $this->metadataPool->getMetadata($entityType);
+            $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+            $select = $connection->select()->from($metadata->getEntityTable(), 'id')->where("uuid = ?", $data['uuid']);
+            $identifier = $connection->fetchOne($select);
+            if ($identifier !== false) {
+                $data['id'] = $identifier;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function databaseToEntity($entityType, $data)
+    {
+        return $data;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ItemStatus.php b/app/code/Magento/AsynchronousOperations/Model/ItemStatus.php
new file mode 100644
index 0000000000000..b493e0bb663d3
--- /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 0000000000000..28bc8141a8e99
--- /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 0000000000000..5f0f8e28f9fe6
--- /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 0000000000000..eae92e1663fc8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -0,0 +1,171 @@
+<?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\ObjectManager;
+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;
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) Suppressed without refactoring to not introduce BiC
+ */
+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;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param IdentityGeneratorInterface $identityService
+     * @param ItemStatusInterfaceFactory $itemStatusInterfaceFactory
+     * @param AsyncResponseInterfaceFactory $asyncResponseFactory
+     * @param BulkManagementInterface $bulkManagement
+     * @param LoggerInterface $logger
+     * @param OperationRepository $operationRepository
+     * @param UserContextInterface $userContext
+     */
+    public function __construct(
+        IdentityGeneratorInterface $identityService,
+        ItemStatusInterfaceFactory $itemStatusInterfaceFactory,
+        AsyncResponseInterfaceFactory $asyncResponseFactory,
+        BulkManagementInterface $bulkManagement,
+        LoggerInterface $logger,
+        OperationRepository $operationRepository,
+        UserContextInterface $userContext = null
+    ) {
+        $this->identityService = $identityService;
+        $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
+        $this->asyncResponseFactory = $asyncResponseFactory;
+        $this->bulkManagement = $bulkManagement;
+        $this->logger = $logger;
+        $this->operationRepository = $operationRepository;
+        $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+    }
+
+    /**
+     * Schedule new bulk operation based on the list of entities
+     *
+     * @param string $topicName
+     * @param array $entitiesArray
+     * @param string $groupId
+     * @param string $userId
+     * @return AsyncResponseInterface
+     * @throws BulkException
+     * @throws LocalizedException
+     */
+    public function publishMass($topicName, array $entitiesArray, $groupId = null, $userId = null)
+    {
+        $bulkDescription = __('Topic %1', $topicName);
+
+        if ($userId == null) {
+            $userId = $this->userContext->getUserId();
+        }
+
+        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\AsynchronousOperations\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
new file mode 100644
index 0000000000000..dbe6ecc1b6b1f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\DataObject;
+
+/**
+ * Class Operation
+ */
+class Operation extends DataObject implements OperationInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getId()
+    {
+        return $this->getData(self::ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setId($id)
+    {
+        return $this->setData(self::ID, $id);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkUuid()
+    {
+        return $this->getData(self::BULK_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBulkUuid($bulkId)
+    {
+        return $this->setData(self::BULK_ID, $bulkId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTopicName()
+    {
+        return $this->getData(self::TOPIC_NAME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setTopicName($topic)
+    {
+        return $this->setData(self::TOPIC_NAME, $topic);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSerializedData()
+    {
+        return $this->getData(self::SERIALIZED_DATA);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setSerializedData($serializedData)
+    {
+        return $this->setData(self::SERIALIZED_DATA, $serializedData);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getResultSerializedData()
+    {
+        return $this->getData(self::RESULT_SERIALIZED_DATA);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setResultSerializedData($resultSerializedData)
+    {
+        return $this->setData(self::RESULT_SERIALIZED_DATA, $resultSerializedData);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStatus()
+    {
+        return $this->getData(self::STATUS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setStatus($status)
+    {
+        return $this->setData(self::STATUS, $status);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getResultMessage()
+    {
+        return $this->getData(self::RESULT_MESSAGE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setResultMessage($resultMessage)
+    {
+        return $this->setData(self::RESULT_MESSAGE, $resultMessage);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getErrorCode()
+    {
+        return $this->getData(self::ERROR_CODE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setErrorCode($errorCode)
+    {
+        return $this->setData(self::ERROR_CODE, $errorCode);
+    }
+
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->getData(self::EXTENSION_ATTRIBUTES_KEY);
+    }
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+    ) {
+        return $this->setData(self::EXTENSION_ATTRIBUTES_KEY, $extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php b/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
new file mode 100644
index 0000000000000..d248f9c3e9276
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * 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
+{
+    /**
+     * @var array
+     */
+    private $operationCache = [];
+
+    /**
+     * @var \Magento\Framework\Bulk\BulkStatusInterface
+     */
+    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_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(
+        BulkStatusInterface $bulkStatus,
+        $bulkUuid = null
+    ) {
+        $this->bulkStatus = $bulkStatus;
+        $this->bulkUuid = $bulkUuid;
+    }
+
+    /**
+     * Collect operations statistics for the bulk
+     *
+     * @param string $bulkUuid
+     * @return array
+     */
+    public function getDetails($bulkUuid)
+    {
+        $details = [
+            'operations_total'      => 0,
+            'operations_successful' => 0,
+            'operations_failed'     => 0,
+            'failed_retriable'      => 0,
+            'failed_not_retriable'  => 0,
+            'rejected'              => 0,
+        ];
+
+        if (array_key_exists($bulkUuid, $this->operationCache)) {
+            return $this->operationCache[$bulkUuid];
+        }
+
+        foreach ($this->statusMap as $statusCode => $readableKey) {
+            $details[$readableKey] = $this->bulkStatus->getOperationsCountByBulkIdAndStatus(
+                $bulkUuid,
+                $statusCode
+            );
+        }
+
+        $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/OperationList.php b/app/code/Magento/AsynchronousOperations/Model/OperationList.php
new file mode 100644
index 0000000000000..7de62107415b0
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationList.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+/**
+ * List of bulk operations.
+ */
+class OperationList implements \Magento\AsynchronousOperations\Api\Data\OperationListInterface
+{
+    /**
+     * @var array
+     */
+    private $items;
+
+    /**
+     * @param array $items [optional]
+     */
+    public function __construct(array $items = [])
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems()
+    {
+        return $this->items;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
new file mode 100644
index 0000000000000..f204f63ed032b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\Framework\EntityManager\EntityManager;
+
+/**
+ * Class OperationManagement
+ */
+class OperationManagement implements \Magento\Framework\Bulk\OperationManagementInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var OperationInterfaceFactory
+     */
+    private $operationFactory;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * OperationManagement constructor.
+     *
+     * @param EntityManager $entityManager
+     * @param OperationInterfaceFactory $operationFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        EntityManager $entityManager,
+        OperationInterfaceFactory $operationFactory,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->entityManager = $entityManager;
+        $this->operationFactory = $operationFactory;
+        $this->logger = $logger;
+    }
+    
+    /**
+     * @inheritDoc
+     */
+    public function changeOperationStatus(
+        $operationId,
+        $status,
+        $errorCode = null,
+        $message = null,
+        $data = null,
+        $resultData = null
+    ) {
+        try {
+            $operationEntity = $this->operationFactory->create();
+            $this->entityManager->load($operationEntity, $operationId);
+            $operationEntity->setErrorCode($errorCode);
+            $operationEntity->setStatus($status);
+            $operationEntity->setResultMessage($message);
+            $operationEntity->setSerializedData($data);
+            $operationEntity->setResultSerializedData($resultData);
+            $this->entityManager->save($operationEntity);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php b/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php
new file mode 100644
index 0000000000000..6826c34fd35f0
--- /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/OperationRepository.php b/app/code/Magento/AsynchronousOperations/Model/OperationRepository.php
new file mode 100644
index 0000000000000..ec76ff6519757
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationRepository.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterfaceFactory as SearchResultFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationExtensionInterfaceFactory;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Repository class for @see \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
+ */
+class OperationRepository implements \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var JoinProcessorInterface
+     */
+    private $joinProcessor;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterfaceFactory
+     */
+    private $operationExtensionFactory;
+
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * OperationRepository constructor.
+     *
+     * @param EntityManager $entityManager
+     * @param CollectionFactory $collectionFactory
+     * @param SearchResultFactory $searchResultFactory
+     * @param JoinProcessorInterface $joinProcessor
+     * @param OperationExtensionInterfaceFactory $operationExtension
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        EntityManager $entityManager,
+        CollectionFactory $collectionFactory,
+        SearchResultFactory $searchResultFactory,
+        JoinProcessorInterface $joinProcessor,
+        OperationExtensionInterfaceFactory $operationExtension,
+        CollectionProcessorInterface $collectionProcessor,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->entityManager = $entityManager;
+        $this->collectionFactory = $collectionFactory;
+        $this->searchResultFactory = $searchResultFactory;
+        $this->joinProcessor = $joinProcessor;
+        $this->operationExtensionFactory = $operationExtension;
+        $this->collectionProcessor = $collectionProcessor;
+        $this->logger = $logger;
+        $this->collectionProcessor = $collectionProcessor;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        /** @var \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface $searchResult */
+        $searchResult = $this->searchResultFactory->create();
+
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
+        $collection = $this->collectionFactory->create();
+        $this->joinProcessor->process($collection, \Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->collectionProcessor->process($searchCriteria, $collection);
+        $searchResult->setSearchCriteria($searchCriteria);
+        $searchResult->setTotalCount($collection->getSize());
+        $searchResult->setItems($collection->getItems());
+
+        return $searchResult;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationStatus.php b/app/code/Magento/AsynchronousOperations/Model/OperationStatus.php
new file mode 100644
index 0000000000000..5c975bd1a9a45
--- /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/Bulk.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk.php
new file mode 100644
index 0000000000000..d56d54359ee9a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model\ResourceModel;
+
+/**
+ * Class Bulk
+ */
+class Bulk extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize banner sales rule resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('magento_bulk', 'uuid');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk/Collection.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk/Collection.php
new file mode 100644
index 0000000000000..6dd997c5333ff
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk/Collection.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Bulk;
+
+/**
+ * Class Collection
+ * @codeCoverageIgnore
+ */
+class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Define collection item type and corresponding table
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Magento\AsynchronousOperations\Model\BulkSummary::class,
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk::class
+        );
+        $this->setMainTable('magento_bulk');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
new file mode 100644
index 0000000000000..061d0917e7ab0
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model\ResourceModel;
+
+/**
+ * Class Operation
+ */
+class Operation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize banner sales rule resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('magento_operation', 'id');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/CheckIfExists.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/CheckIfExists.php
new file mode 100644
index 0000000000000..46c4e4bc1c2bc
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/CheckIfExists.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+use Magento\Framework\EntityManager\Operation\CheckIfExistsInterface;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * CheckIfExists operation for list of bulk operations.
+ */
+class CheckIfExists implements CheckIfExistsInterface
+{
+    /**
+     * Always returns false because all operations will be saved using insertOnDuplicate query.
+     *
+     * @param object $entity
+     * @param array $arguments
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute($entity, $arguments = [])
+    {
+        return false;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php
new file mode 100644
index 0000000000000..18c5f09794c77
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+/**
+ * Class Collection
+ * @codeCoverageIgnore
+ */
+class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Define collection item type and corresponding table
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Magento\AsynchronousOperations\Model\Operation::class,
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation::class
+        );
+        $this->setMainTable('magento_operation');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Create.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Create.php
new file mode 100644
index 0000000000000..ce2357c6b2b4f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Create.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\TypeResolver;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Phrase;
+
+/**
+ * Create operation for list of bulk operations.
+ */
+class Create implements \Magento\Framework\EntityManager\Operation\CreateInterface
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var TypeResolver
+     */
+    private $typeResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param MetadataPool $metadataPool
+     * @param TypeResolver $typeResolver
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        TypeResolver $typeResolver,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->typeResolver = $typeResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Save all operations from the list in one query.
+     *
+     * @param object $entity
+     * @param array $arguments
+     * @return object
+     * @throws \Exception
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute($entity, $arguments = [])
+    {
+        $entityType = $this->typeResolver->resolve($entity);
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $connection = $this->resourceConnection->getConnection($metadata->getEntityConnectionName());
+        try {
+            $connection->beginTransaction();
+            $data = [];
+            foreach ($entity->getItems() as $operation) {
+                $data[] = $operation->getData();
+            }
+            $connection->insertOnDuplicate(
+                $metadata->getEntityTable(),
+                $data,
+                [
+                    'status',
+                    'error_code',
+                    'result_message',
+                ]
+            );
+            $connection->commit();
+        } catch (\Exception $e) {
+            $connection->rollBack();
+            throw $e;
+        }
+        return $entity;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
new file mode 100644
index 0000000000000..54e65cc3470dd
--- /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
new file mode 100644
index 0000000000000..8457a641ed9a9
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Collection\Synchronized;
+
+/**
+ * Class Plugin to add bulks related notification messages to Synchronized Collection
+ */
+class Plugin
+{
+    /**
+     * @var \Magento\AdminNotification\Model\System\MessageFactory
+     */
+    private $messageFactory;
+
+    /**
+     * @var \Magento\Framework\Bulk\BulkStatusInterface
+     */
+    private $bulkStatus;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $operationDetails;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkNotificationManagement
+     */
+    private $bulkNotificationManagement;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\StatusMapper
+     */
+    private $statusMapper;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param \Magento\AdminNotification\Model\System\MessageFactory $messageFactory
+     * @param \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+     * @param \Magento\AsynchronousOperations\Model\BulkNotificationManagement $bulkNotificationManagement
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails
+     * @param \Magento\Framework\AuthorizationInterface $authorization
+     * @param \Magento\AsynchronousOperations\Model\StatusMapper $statusMapper
+     */
+    public function __construct(
+        \Magento\AdminNotification\Model\System\MessageFactory $messageFactory,
+        \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus,
+        \Magento\AsynchronousOperations\Model\BulkNotificationManagement $bulkNotificationManagement,
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails,
+        \Magento\Framework\AuthorizationInterface $authorization,
+        \Magento\AsynchronousOperations\Model\StatusMapper $statusMapper
+    ) {
+        $this->messageFactory = $messageFactory;
+        $this->bulkStatus = $bulkStatus;
+        $this->userContext = $userContext;
+        $this->operationDetails = $operationDetails;
+        $this->bulkNotificationManagement = $bulkNotificationManagement;
+        $this->authorization = $authorization;
+        $this->statusMapper = $statusMapper;
+    }
+
+    /**
+     * Adding bulk related messages to notification area
+     *
+     * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $collection
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterToArray(
+        \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $collection,
+        $result
+    ) {
+        if (!$this->authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations')) {
+            return $result;
+        }
+        $userId = $this->userContext->getUserId();
+        $userBulks = $this->bulkStatus->getBulksByUser($userId);
+        $acknowledgedBulks = $this->getAcknowledgedBulksUuid(
+            $this->bulkNotificationManagement->getAcknowledgedBulksByUser($userId)
+        );
+        $bulkMessages = [];
+        foreach ($userBulks as $bulk) {
+            $bulkUuid = $bulk->getBulkId();
+            if (!in_array($bulkUuid, $acknowledgedBulks)) {
+                $details = $this->operationDetails->getDetails($bulkUuid);
+                $text = $this->getText($details);
+                $bulkStatus = $this->statusMapper->operationStatusToBulkSummaryStatus($bulk->getStatus());
+                if ($bulkStatus === \Magento\Framework\Bulk\BulkSummaryInterface::IN_PROGRESS) {
+                    $text = __('%1 item(s) are currently being updated.', $details['operations_total']) . $text;
+                }
+                $data = [
+                    'data' => [
+                        'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
+                        'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
+                        'identity' => md5('bulk' . $bulkUuid),
+                        'uuid' => $bulkUuid,
+                        'status' => $bulkStatus,
+                        'created_at' => $bulk->getStartTime()
+                    ]
+                ];
+                $bulkMessages[] = $this->messageFactory->create($data)->toArray();
+            }
+        }
+
+        if (!empty($bulkMessages)) {
+            $result['totalRecords'] += count($bulkMessages);
+            $bulkMessages = array_slice($bulkMessages, 0, 5);
+            $result['items'] = array_merge($bulkMessages, $result['items']);
+        }
+        return $result;
+    }
+
+    /**
+     * Get Bulk notification message
+     *
+     * @param array $operationDetails
+     * @return \Magento\Framework\Phrase|string
+     */
+    private function getText($operationDetails)
+    {
+        if (0 == $operationDetails['operations_successful'] && 0 == $operationDetails['operations_failed']) {
+            return __('%1 item(s) have been scheduled for update.', $operationDetails['operations_total']);
+        }
+
+        $summaryReport = '';
+        if ($operationDetails['operations_successful'] > 0) {
+            $summaryReport .= __(
+                '%1 item(s) have been successfully updated.',
+                $operationDetails['operations_successful']
+            );
+        }
+
+        if ($operationDetails['operations_failed'] > 0) {
+            $summaryReport .= '<strong>'
+                . __('%1 item(s) failed to update', $operationDetails['operations_failed'])
+                . '</strong>';
+        }
+        return $summaryReport;
+    }
+
+    /**
+     * Get array with acknowledgedBulksUuid
+     *
+     * @param array $acknowledgedBulks
+     * @return array
+     */
+    private function getAcknowledgedBulksUuid($acknowledgedBulks)
+    {
+        $acknowledgedBulksArray = [];
+        foreach ($acknowledgedBulks as $bulk) {
+            $acknowledgedBulksArray[] = $bulk->getBulkId();
+        }
+        return $acknowledgedBulksArray;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php b/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
new file mode 100644
index 0000000000000..e5aee6d2f59fa
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class StatusMapper
+ */
+class StatusMapper
+{
+    /**
+     * Map operation status to bulk summary status
+     *
+     * @param int $operationStatus
+     * @return null|int
+     */
+    public function operationStatusToBulkSummaryStatus($operationStatus)
+    {
+        $statusMapping = [
+            OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED => BulkSummaryInterface::FINISHED_WITH_FAILURE,
+            OperationInterface::STATUS_TYPE_RETRIABLY_FAILED => BulkSummaryInterface::FINISHED_WITH_FAILURE,
+            OperationInterface::STATUS_TYPE_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
+        ];
+
+        if (isset($statusMapping[$operationStatus])) {
+            return $statusMapping[$operationStatus];
+        }
+        return null;
+    }
+
+    /**
+     * Map bulk summary status to operation status
+     *
+     * @param int $bulkStatus
+     * @return int|null
+     */
+    public function bulkSummaryStatusToOperationStatus($bulkStatus)
+    {
+        $statusMapping = [
+            BulkSummaryInterface::FINISHED_WITH_FAILURE => [
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_REJECTED
+            ],
+            BulkSummaryInterface::FINISHED_SUCCESSFULLY => OperationInterface::STATUS_TYPE_COMPLETE,
+            BulkSummaryInterface::IN_PROGRESS => OperationInterface::STATUS_TYPE_OPEN,
+            BulkSummaryInterface::NOT_STARTED => BulkSummaryInterface::NOT_STARTED
+        ];
+
+        if (isset($statusMapping[$bulkStatus])) {
+            return $statusMapping[$bulkStatus];
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/README.md b/app/code/Magento/AsynchronousOperations/README.md
new file mode 100644
index 0000000000000..fb7d53df1b81c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/README.md
@@ -0,0 +1 @@
+ This component is designed  to provide response for client who launched the bulk operation as soon as possible and postpone handling of operations moving them to background handler.
\ No newline at end of file
diff --git a/app/code/Magento/AsynchronousOperations/Test/Mftf/README.md b/app/code/Magento/AsynchronousOperations/Test/Mftf/README.md
new file mode 100644
index 0000000000000..2f73e44149f2c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Asynchronous Operations Functional Tests
+
+The Functional Test Module for **Magento Asynchronous Operations** module.
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php
new file mode 100644
index 0000000000000..d6d4c5e7479f9
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Block\Adminhtml\Bulk\Details;
+
+class BackButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\BackButton
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlBuilderMock;
+
+    protected function setUp()
+    {
+        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->getMock();
+        $this->block = new \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\BackButton(
+            $this->urlBuilderMock
+        );
+    }
+
+    public function testGetButtonData()
+    {
+        $backUrl = 'back url';
+        $expectedResult = [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $backUrl),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('*/')
+            ->willReturn($backUrl);
+
+        $this->assertEquals($expectedResult, $this->block->getButtonData());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php
new file mode 100644
index 0000000000000..10c9d898aa526
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\Bulk\OperationInterface;
+
+class DoneButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\DoneButton
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $bulkStatusMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    protected function setUp()
+    {
+        $this->bulkStatusMock = $this->createMock(\Magento\Framework\Bulk\BulkStatusInterface::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->getMock();
+        $this->block = new \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\DoneButton(
+            $this->bulkStatusMock,
+            $this->requestMock
+        );
+    }
+
+    /**
+     * @param int $failedCount
+     * @param int $buttonsParam
+     * @param array $expectedResult
+     * @dataProvider getButtonDataProvider
+     */
+    public function testGetButtonData($failedCount, $buttonsParam, $expectedResult)
+    {
+        $uuid = 'some standard uuid string';
+        $this->requestMock->expects($this->exactly(2))
+            ->method('getParam')
+            ->withConsecutive(['uuid'], ['buttons'])
+            ->willReturnOnConsecutiveCalls($uuid, $buttonsParam);
+        $this->bulkStatusMock->expects($this->once())
+            ->method('getOperationsCountByBulkIdAndStatus')
+            ->with($uuid, OperationInterface::STATUS_TYPE_RETRIABLY_FAILED)
+            ->willReturn($failedCount);
+
+        $this->assertEquals($expectedResult, $this->block->getButtonData());
+    }
+
+    /**
+     * @return array
+     */
+    public function getButtonDataProvider()
+    {
+        return [
+            [1, 0, []],
+            [0, 0, []],
+            [
+                0,
+                1,
+                [
+                    'label' => __('Done'),
+                    'class' => 'primary',
+                    'sort_order' => 10,
+                    'on_click' => '',
+                    'data_attribute' => [
+                        'mage-init' => [
+                            'Magento_Ui/js/form/button-adapter' => [
+                                'actions' => [
+                                    [
+                                        'targetName' => 'notification_area.notification_area.modalContainer.modal',
+                                        'actionName' => 'closeModal'
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php
new file mode 100644
index 0000000000000..b7c154be09d89
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Block\Adminhtml\Bulk\Details;
+
+class RetryButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $detailsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    protected function setUp()
+    {
+        $this->detailsMock = $this->getMockBuilder(\Magento\AsynchronousOperations\Model\Operation\Details::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->getMock();
+        $this->block = new \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton(
+            $this->detailsMock,
+            $this->requestMock
+        );
+    }
+
+    /**
+     * @param int $failedCount
+     * @param array $expectedResult
+     * @dataProvider getButtonDataProvider
+     */
+    public function testGetButtonData($failedCount, $expectedResult)
+    {
+        $details = ['failed_retriable' => $failedCount];
+        $uuid = 'some standard uuid string';
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->with('uuid')
+            ->willReturn($uuid);
+        $this->detailsMock->expects($this->once())
+            ->method('getDetails')
+            ->with($uuid)
+            ->willReturn($details);
+
+        $this->assertEquals($expectedResult, $this->block->getButtonData());
+    }
+
+    /**
+     * @return array
+     */
+    public function getButtonDataProvider()
+    {
+        return [
+            [0, []],
+            [
+                20,
+                [
+                    'label' => __('Retry'),
+                    'class' => 'retry primary',
+                    'data_attribute' => [
+                        'mage-init' => ['button' => ['event' => 'save']],
+                        'form-role' => 'save',
+                    ],
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php
new file mode 100644
index 0000000000000..ecd33d355c223
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Bulk;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DetailsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewMock;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    protected function setUp()
+    {
+        $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->resultFactoryMock = $this->createMock(\Magento\Framework\View\Result\PageFactory::class);
+        $this->model = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details::class,
+            [
+                'request' => $this->requestMock,
+                'resultPageFactory' => $this->resultFactoryMock,
+                'view' => $this->viewMock,
+
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $id = '42';
+        $parameterName = 'uuid';
+        $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
+        $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
+
+        $blockMock = $this->createPartialMock(
+            \Magento\Framework\View\Element\BlockInterface::class,
+            ['setActive', 'getMenuModel', 'toHtml']
+        );
+        $menuModelMock = $this->createMock(\Magento\Backend\Model\Menu::class);
+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
+        $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);
+        $blockMock->expects($this->once())->method('setActive')->with($itemId);
+        $blockMock->expects($this->once())->method('getMenuModel')->willReturn($menuModelMock);
+        $menuModelMock->expects($this->once())->method('getParentItems')->willReturn([]);
+        $pageMock = $this->createMock(\Magento\Framework\View\Result\Page::class);
+        $pageConfigMock = $this->createMock(\Magento\Framework\View\Page\Config::class);
+        $titleMock = $this->createMock(\Magento\Framework\View\Page\Title::class);
+        $this->resultFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
+        $this->requestMock->expects($this->once())->method('getParam')->with($parameterName)->willReturn($id);
+        $pageMock->expects($this->once())->method('getConfig')->willReturn($pageConfigMock);
+        $pageConfigMock->expects($this->once())->method('getTitle')->willReturn($titleMock);
+        $titleMock->expects($this->once())->method('prepend')->with($this->stringContains($id));
+        $pageMock->expects($this->once())->method('initLayout');
+        $this->assertEquals($pageMock, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php
new file mode 100644
index 0000000000000..ab5e117b0225f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Bulk;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Retry;
+use Magento\AsynchronousOperations\Model\BulkManagement;
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\Result\Json;
+
+class RetryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Retry
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notificationManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $jsonResultMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->bulkManagementMock = $this->createMock(BulkManagement::class);
+        $this->notificationManagementMock = $this->createMock(BulkNotificationManagement::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->resultFactoryMock = $this->createPartialMock(ResultFactory::class, ['create']);
+        $this->jsonResultMock = $this->createMock(Json::class);
+
+        $this->resultRedirectFactoryMock = $this->createPartialMock(RedirectFactory::class, ['create']);
+        $this->resultRedirectMock = $this->createMock(Redirect::class);
+
+        $this->model = $objectManager->getObject(
+            Retry::class,
+            [
+                'bulkManagement' => $this->bulkManagementMock,
+                'notificationManagement' => $this->notificationManagementMock,
+                'request' => $this->requestMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
+                'resultFactory' => $this->resultFactoryMock,
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $bulkUuid = '49da7406-1ec3-4100-95ae-9654c83a6801';
+        $operationsToRetry = [
+            [
+                'key' => 'value',
+                'error_code' => 1111,
+            ],
+            [
+                'error_code' => 2222,
+            ],
+            [
+                'error_code' => '3333',
+            ],
+        ];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['uuid', null, $bulkUuid],
+                ['operations_to_retry', [], $operationsToRetry],
+                ['isAjax', null, false],
+            ]);
+
+        $this->bulkManagementMock->expects($this->once())
+            ->method('retryBulk')
+            ->with($bulkUuid, [1111, 2222, 3333]);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('ignoreBulks')
+            ->with([$bulkUuid])
+            ->willReturn(true);
+
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('bulk/index');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteReturnsJsonResultWhenRequestIsSentViaAjax()
+    {
+        $bulkUuid = '49da7406-1ec3-4100-95ae-9654c83a6801';
+        $operationsToRetry = [
+            [
+                'key' => 'value',
+                'error_code' => 1111,
+            ],
+        ];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['uuid', null, $bulkUuid],
+                ['operations_to_retry', [], $operationsToRetry],
+                ['isAjax', null, true],
+            ]);
+
+        $this->bulkManagementMock->expects($this->once())
+            ->method('retryBulk')
+            ->with($bulkUuid, [1111]);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('ignoreBulks')
+            ->with([$bulkUuid])
+            ->willReturn(true);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->jsonResultMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(200);
+
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php
new file mode 100644
index 0000000000000..98d51d8b0fd46
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Index;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Controller\Adminhtml\Index\Index
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    protected function setUp()
+    {
+        $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->resultFactoryMock = $this->createMock(\Magento\Framework\View\Result\PageFactory::class);
+
+        $this->model = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Controller\Adminhtml\Index\Index::class,
+            [
+                'request' => $this->requestMock,
+                'view' => $this->viewMock,
+                'resultPageFactory' => $this->resultFactoryMock
+
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
+        $prependText = 'Bulk Actions Log';
+        $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
+        $menuModelMock = $this->createMock(\Magento\Backend\Model\Menu::class);
+        $pageMock = $this->createMock(\Magento\Framework\View\Result\Page::class);
+        $pageConfigMock = $this->createMock(\Magento\Framework\View\Page\Config::class);
+        $titleMock = $this->createMock(\Magento\Framework\View\Page\Title::class);
+        $this->resultFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
+
+        $blockMock = $this->createPartialMock(
+            \Magento\Framework\View\Element\BlockInterface::class,
+            ['setActive', 'getMenuModel', 'toHtml']
+        );
+
+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
+        $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);
+        $blockMock->expects($this->once())->method('setActive')->with($itemId);
+        $blockMock->expects($this->once())->method('getMenuModel')->willReturn($menuModelMock);
+        $menuModelMock->expects($this->once())->method('getParentItems')->willReturn([]);
+
+        $pageMock->expects($this->once())->method('getConfig')->willReturn($pageConfigMock);
+        $pageConfigMock->expects($this->once())->method('getTitle')->willReturn($titleMock);
+        $titleMock->expects($this->once())->method('prepend')->with($prependText);
+        $pageMock->expects($this->once())->method('initLayout');
+        $this->model->execute();
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php
new file mode 100644
index 0000000000000..8ec1ec4609aa9
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Notification;
+
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\AsynchronousOperations\Controller\Adminhtml\Notification\Dismiss;
+use Magento\Framework\Controller\Result\Json;
+
+class DismissTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Dismiss
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notificationManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $jsonResultMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->notificationManagementMock = $this->createMock(BulkNotificationManagement::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->resultFactoryMock = $this->createPartialMock(ResultFactory::class, ['create']);
+
+        $this->jsonResultMock = $this->createMock(Json::class);
+
+        $this->model = $objectManager->getObject(
+            Dismiss::class,
+            [
+                'notificationManagement' => $this->notificationManagementMock,
+                'request' => $this->requestMock,
+                'resultFactory' => $this->resultFactoryMock,
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $bulkUuids = ['49da7406-1ec3-4100-95ae-9654c83a6801'];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->with('uuid', [])
+            ->willReturn($bulkUuids);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('acknowledgeBulks')
+            ->with($bulkUuids)
+            ->willReturn(true);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+    }
+
+    public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedCorrectly()
+    {
+        $bulkUuids = ['49da7406-1ec3-4100-95ae-9654c83a6801'];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->with('uuid', [])
+            ->willReturn($bulkUuids);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('acknowledgeBulks')
+            ->with($bulkUuids)
+            ->willReturn(false);
+
+        $this->jsonResultMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(400);
+
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php
new file mode 100644
index 0000000000000..be38e9181734a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Cron;
+
+class BulkCleanupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Cron\BulkCleanup
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $timeMock;
+
+    protected function setUp()
+    {
+        $this->dateTimeMock = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->resourceConnectionMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->timeMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\DateTime::class);
+        $this->model = new \Magento\AsynchronousOperations\Cron\BulkCleanup(
+            $this->metadataPoolMock,
+            $this->resourceConnectionMock,
+            $this->dateTimeMock,
+            $this->scopeConfigMock,
+            $this->timeMock
+        );
+    }
+
+    public function testExecute()
+    {
+        $entityType = 'BulkSummaryInterface';
+        $connectionName = 'Connection';
+        $bulkLifetimeMultiplier = 10;
+        $bulkLifetime = 3600 * 24 * $bulkLifetimeMultiplier;
+
+        $adapterMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $entityMetadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
+
+        $this->metadataPoolMock->expects($this->once())->method('getMetadata')->with($this->stringContains($entityType))
+            ->willReturn($entityMetadataMock);
+        $entityMetadataMock->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $this->resourceConnectionMock->expects($this->once())->method('getConnectionByName')->with($connectionName)
+            ->willReturn($adapterMock);
+        $this->scopeConfigMock->expects($this->once())->method('getValue')->with($this->stringContains('bulk/lifetime'))
+            ->willReturn($bulkLifetimeMultiplier);
+        $this->timeMock->expects($this->once())->method('gmtTimestamp')->willReturn($bulkLifetime*10);
+        $this->dateTimeMock->expects($this->once())->method('formatDate')->with($bulkLifetime*9);
+        $adapterMock->expects($this->once())->method('delete');
+
+        $this->model->execute();
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessValidatorTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessValidatorTest.php
new file mode 100644
index 0000000000000..8eb8778a384b0
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessValidatorTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+class AccessValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\AccessValidator
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userContextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkSummaryFactoryMock;
+
+    protected function setUp()
+    {
+        $this->userContextMock = $this->createMock(\Magento\Authorization\Model\UserContextInterface::class);
+        $this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
+        $this->bulkSummaryFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory::class,
+            ['create']
+        );
+
+        $this->model = new \Magento\AsynchronousOperations\Model\AccessValidator(
+            $this->userContextMock,
+            $this->entityManagerMock,
+            $this->bulkSummaryFactoryMock
+        );
+    }
+
+    /**
+     * @dataProvider summaryDataProvider
+     * @param string $bulkUserId
+     * @param bool $expectedResult
+     */
+    public function testIsAllowed($bulkUserId, $expectedResult)
+    {
+        $adminId = 1;
+        $uuid = 'test-001';
+        $bulkSummaryMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class);
+
+        $this->bulkSummaryFactoryMock->expects($this->once())->method('create')->willReturn($bulkSummaryMock);
+        $this->entityManagerMock->expects($this->once())
+            ->method('load')
+            ->with($bulkSummaryMock, $uuid)
+            ->willReturn($bulkSummaryMock);
+
+        $bulkSummaryMock->expects($this->once())->method('getUserId')->willReturn($bulkUserId);
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($adminId);
+
+        $this->assertEquals($this->model->isAllowed($uuid), $expectedResult);
+    }
+
+    /**
+     * @return array
+     */
+    public static function summaryDataProvider()
+    {
+        return [
+            [2, false],
+            [1, true]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkDescription/OptionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkDescription/OptionsTest.php
new file mode 100644
index 0000000000000..d5835f7856dff
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkDescription/OptionsTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\BulkDescription;
+
+class OptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkDescription\Options
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userContextMock;
+
+    protected function setUp()
+    {
+        $this->bulkCollectionFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory::class,
+            ['create']
+        );
+        $this->userContextMock = $this->createMock(\Magento\Authorization\Model\UserContextInterface::class);
+        $this->model = new \Magento\AsynchronousOperations\Model\BulkDescription\Options(
+            $this->bulkCollectionFactoryMock,
+            $this->userContextMock
+        );
+    }
+
+    public function testToOptionsArray()
+    {
+        $userId = 100;
+        $collectionMock = $this->createMock(\Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection::class);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->bulkCollectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
+
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($userId);
+
+        $collectionMock->expects($this->once())->method('getMainTable')->willReturn('table');
+
+        $selectMock->expects($this->once())->method('reset')->willReturnSelf();
+        $selectMock->expects($this->once())->method('distinct')->with(true)->willReturnSelf();
+        $selectMock->expects($this->once())->method('from')->with('table', ['description'])->willReturnSelf();
+        $selectMock->expects($this->once())->method('where')->with('user_id = ?', $userId)->willReturnSelf();
+
+        $itemMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\BulkSummary::class,
+            ['getDescription']
+        );
+        $itemMock->expects($this->exactly(2))->method('getDescription')->willReturn('description');
+
+        $collectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
+        $collectionMock->expects($this->once())->method('getItems')->willReturn([$itemMock]);
+
+        $expectedResult = [
+            [
+                'value' => 'description',
+                'label' => 'description'
+            ]
+        ];
+
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
new file mode 100644
index 0000000000000..e5951fb129e7e
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+/**
+ * Unit test for BulkManagement model.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\EntityManager\EntityManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManager;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     *      |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkSummaryFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory
+     *      |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\BulkPublisherInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisher;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkManagement
+     */
+    private $bulkManagement;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->entityManager = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityManager::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->operationCollectionFactory = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->publisher = $this->getMockBuilder(\Magento\Framework\MessageQueue\BulkPublisherInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->bulkManagement = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Model\BulkManagement::class,
+            [
+                'entityManager' => $this->entityManager,
+                'bulkSummaryFactory' => $this->bulkSummaryFactory,
+                'operationCollectionFactory' => $this->operationCollectionFactory,
+                'publisher' => $this->publisher,
+                'metadataPool' => $this->metadataPool,
+                'resourceConnection' => $this->resourceConnection,
+                'logger' => $this->logger,
+            ]
+        );
+    }
+
+    /**
+     * Test for scheduleBulk method.
+     *
+     * @return void
+     */
+    public function testScheduleBulk()
+    {
+        $bulkUuid = 'bulk-001';
+        $description = 'Bulk summary description...';
+        $userId = 1;
+        $userType = \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN;
+        $connectionName = 'default';
+        $topicNames = ['topic.name.0', 'topic.name.1'];
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $bulkSummary = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory->expects($this->once())->method('create')->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())
+            ->method('load')->with($bulkSummary, $bulkUuid)->willReturn($bulkSummary);
+        $bulkSummary->expects($this->once())->method('setBulkId')->with($bulkUuid)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('setDescription')->with($description)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('setUserId')->with($userId)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('setUserType')->with($userType)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('getOperationCount')->willReturn(1);
+        $bulkSummary->expects($this->once())->method('setOperationCount')->with(3)->willReturnSelf();
+        $this->entityManager->expects($this->once())->method('save')->with($bulkSummary)->willReturn($bulkSummary);
+        $connection->expects($this->once())->method('commit')->willReturnSelf();
+        $operation->expects($this->exactly(2))->method('getTopicName')
+            ->willReturnOnConsecutiveCalls($topicNames[0], $topicNames[1]);
+        $this->publisher->expects($this->exactly(2))->method('publish')
+            ->withConsecutive([$topicNames[0], [$operation]], [$topicNames[1], [$operation]])->willReturn(null);
+        $this->assertTrue(
+            $this->bulkManagement->scheduleBulk($bulkUuid, [$operation, $operation], $description, $userId)
+        );
+    }
+
+    /**
+     * Test for scheduleBulk method with exception.
+     *
+     * @return void
+     */
+    public function testScheduleBulkWithException()
+    {
+        $bulkUuid = 'bulk-001';
+        $description = 'Bulk summary description...';
+        $userId = 1;
+        $connectionName = 'default';
+        $exceptionMessage = 'Exception message';
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $bulkSummary = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory->expects($this->once())->method('create')->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())->method('load')
+            ->with($bulkSummary, $bulkUuid)->willThrowException(new \LogicException($exceptionMessage));
+        $connection->expects($this->once())->method('rollBack')->willReturnSelf();
+        $this->logger->expects($this->once())->method('critical')->with($exceptionMessage);
+        $this->publisher->expects($this->never())->method('publish');
+        $this->assertFalse($this->bulkManagement->scheduleBulk($bulkUuid, [$operation], $description, $userId));
+    }
+
+    /**
+     * Test for retryBulk method.
+     *
+     * @return void
+     */
+    public function testRetryBulk()
+    {
+        $bulkUuid = 'bulk-001';
+        $errorCodes = ['errorCode'];
+        $connectionName = 'default';
+        $operationId = 1;
+        $operationTable = 'magento_operation';
+        $topicName = 'topic.name';
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $operationCollection = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection->expects($this->exactly(2))->method('addFieldToFilter')
+            ->withConsecutive(['error_code', ['in' => $errorCodes]], ['bulk_uuid', ['eq' => $bulkUuid]])
+            ->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation->expects($this->once())->method('getId')->willReturn($operationId);
+        $operation->expects($this->once())->method('setId')->with(null)->willReturnSelf();
+        $this->resourceConnection->expects($this->once())
+            ->method('getTableName')->with($operationTable)->willReturn($operationTable);
+        $connection->expects($this->once())
+            ->method('quoteInto')->with('id IN (?)', [$operationId])->willReturn('id IN (' . $operationId .')');
+        $connection->expects($this->once())
+            ->method('delete')->with($operationTable, 'id IN (' . $operationId .')')->willReturn(1);
+        $connection->expects($this->once())->method('commit')->willReturnSelf();
+        $operation->expects($this->once())->method('getTopicName')->willReturn($topicName);
+        $this->publisher->expects($this->once())->method('publish')->with($topicName, [$operation])->willReturn(null);
+        $this->assertEquals(1, $this->bulkManagement->retryBulk($bulkUuid, $errorCodes));
+    }
+
+    /**
+     * Test for retryBulk method with exception.
+     *
+     * @return void
+     */
+    public function testRetryBulkWithException()
+    {
+        $bulkUuid = 'bulk-001';
+        $errorCodes = ['errorCode'];
+        $connectionName = 'default';
+        $operationId = 1;
+        $operationTable = 'magento_operation';
+        $exceptionMessage = 'Exception message';
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $operationCollection = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection->expects($this->exactly(2))->method('addFieldToFilter')
+            ->withConsecutive(['error_code', ['in' => $errorCodes]], ['bulk_uuid', ['eq' => $bulkUuid]])
+            ->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation->expects($this->once())->method('getId')->willReturn($operationId);
+        $operation->expects($this->once())->method('setId')->with(null)->willReturnSelf();
+        $this->resourceConnection->expects($this->once())
+            ->method('getTableName')->with($operationTable)->willReturn($operationTable);
+        $connection->expects($this->once())
+            ->method('quoteInto')->with('id IN (?)', [$operationId])->willReturn('id IN (' . $operationId .')');
+        $connection->expects($this->once())
+            ->method('delete')->with($operationTable, 'id IN (' . $operationId .')')
+            ->willThrowException(new \Exception($exceptionMessage));
+        $connection->expects($this->once())->method('rollBack')->willReturnSelf();
+        $this->logger->expects($this->once())->method('critical')->with($exceptionMessage);
+        $this->publisher->expects($this->never())->method('publish');
+        $this->assertEquals(0, $this->bulkManagement->retryBulk($bulkUuid, $errorCodes));
+    }
+
+    /**
+     * Test for deleteBulk method.
+     *
+     * @return void
+     */
+    public function testDeleteBulk()
+    {
+        $bulkUuid = 'bulk-001';
+        $bulkSummary = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory->expects($this->once())->method('create')->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())
+            ->method('load')->with($bulkSummary, $bulkUuid)->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())->method('delete')->with($bulkSummary)->willReturn(true);
+        $this->assertTrue($this->bulkManagement->deleteBulk($bulkUuid));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
new file mode 100644
index 0000000000000..a5a75736d2441
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkStatusTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkStatus
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $calculatedStatusSqlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $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
+     */
+    private $connectionMock;
+
+    protected function setUp()
+    {
+        $this->bulkCollectionFactory = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory::class,
+            ['create']
+        );
+        $this->operationCollectionFactory = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory::class,
+            ['create']
+        );
+        $this->operationMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->bulkMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class);
+        $this->resourceConnectionMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->calculatedStatusSqlMock = $this->createMock(
+            \Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql::class
+        );
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->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);
+
+        $this->model = new \Magento\AsynchronousOperations\Model\BulkStatus(
+            $this->bulkCollectionFactory,
+            $this->operationCollectionFactory,
+            $this->resourceConnectionMock,
+            $this->calculatedStatusSqlMock,
+            $this->metadataPoolMock,
+            $this->bulkDetailedFactory,
+            $this->bulkShortFactory,
+            $this->entityManager
+        );
+    }
+
+    /**
+     * @param int|null $failureType
+     * @param array $failureCodes
+     * @dataProvider getFailedOperationsByBulkIdDataProvider
+     */
+    public function testGetFailedOperationsByBulkId($failureType, $failureCodes)
+    {
+        $bulkUuid = 'bulk-1';
+        $operationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection
+            ->expects($this->at(0))
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $operationCollection
+            ->expects($this->at(1))
+            ->method('addFieldToFilter')
+            ->with('status', $failureCodes)
+            ->willReturnSelf();
+        $operationCollection->expects($this->once())->method('getItems')->willReturn([$this->operationMock]);
+        $this->assertEquals([$this->operationMock], $this->model->getFailedOperationsByBulkId($bulkUuid, $failureType));
+    }
+
+    public function testGetOperationsCountByBulkIdAndStatus()
+    {
+        $bulkUuid = 'bulk-1';
+        $status = 1354;
+        $size = 32;
+
+        $operationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection
+            ->expects($this->at(0))
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $operationCollection
+            ->expects($this->at(1))
+            ->method('addFieldToFilter')
+            ->with('status', $status)
+            ->willReturnSelf();
+        $operationCollection
+            ->expects($this->once())
+            ->method('getSize')
+            ->willReturn($size);
+        $this->assertEquals($size, $this->model->getOperationsCountByBulkIdAndStatus($bulkUuid, $status));
+    }
+
+    /**
+     * @return array
+     */
+    public function getFailedOperationsByBulkIdDataProvider()
+    {
+        return [
+            [1, [1]],
+            [
+                null,
+                [
+                    OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                    OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                ],
+            ],
+        ];
+    }
+
+    public function testGetBulksByUser()
+    {
+        $userId = 1;
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $bulkCollection = $this->createMock(\Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection::class);
+        $bulkCollection->expects($this->once())->method('getSelect')->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('columns')->willReturnSelf();
+        $selectMock->expects($this->once())->method('order')->willReturnSelf();
+        $this->bulkCollectionFactory->expects($this->once())->method('create')->willReturn($bulkCollection);
+        $bulkCollection->expects($this->once())->method('addFieldToFilter')->with('user_id', $userId)->willReturnSelf();
+        $bulkCollection->expects($this->once())->method('getItems')->willReturn([$this->bulkMock]);
+        $this->assertEquals([$this->bulkMock], $this->model->getBulksByUser($userId));
+    }
+
+    public function testGetBulksStatus()
+    {
+        $bulkUuid = 'bulk-1';
+        $allProcessedOperationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+
+        $completeOperationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+
+        $connectionName = 'connection_name';
+        $entityType = \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class;
+        $this->metadataPoolMock
+            ->expects($this->once())
+            ->method('getMetadata')
+            ->with($entityType)
+            ->willReturn($this->entityMetadataMock);
+        $this->entityMetadataMock
+            ->expects($this->once())
+            ->method('getEntityConnectionName')
+            ->willReturn($connectionName);
+        $this->resourceConnectionMock
+            ->expects($this->once())
+            ->method('getConnectionByName')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $selectMock->expects($this->once())->method('from')->willReturnSelf();
+        $selectMock->expects($this->once())->method('where')->with('uuid = ?', $bulkUuid)->willReturnSelf();
+        $this->connectionMock->expects($this->once())->method('select')->willReturn($selectMock);
+        $this->connectionMock->expects($this->once())->method('fetchOne')->with($selectMock)->willReturn(10);
+
+        $this->operationCollectionFactory
+            ->expects($this->at(0))
+            ->method('create')
+            ->willReturn($allProcessedOperationCollection);
+        $this->operationCollectionFactory
+            ->expects($this->at(1))
+            ->method('create')
+            ->willReturn($completeOperationCollection);
+        $allProcessedOperationCollection
+            ->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $allProcessedOperationCollection->expects($this->once())->method('getSize')->willReturn(5);
+
+        $completeOperationCollection
+            ->expects($this->at(0))
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $completeOperationCollection
+            ->expects($this->at(1))
+            ->method('addFieldToFilter')
+            ->with('status', OperationInterface::STATUS_TYPE_COMPLETE)
+            ->willReturnSelf();
+        $completeOperationCollection->expects($this->any())->method('getSize')->willReturn(5);
+        $this->assertEquals(BulkSummaryInterface::IN_PROGRESS, $this->model->getBulkStatus($bulkUuid));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php
new file mode 100644
index 0000000000000..9543911c037d8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\Entity;
+
+use Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper;
+
+/**
+ * Class BulkSummaryMapperTest
+ */
+class BulkSummaryMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMetadataMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    protected function setUp()
+    {
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->resourceConnectionMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->entityMetadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
+        $this->connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $this->selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->model = new BulkSummaryMapper(
+            $this->metadataPoolMock,
+            $this->resourceConnectionMock
+        );
+    }
+
+    /**
+     * @param int $identifier
+     * @param array|false $result
+     * @dataProvider entityToDatabaseDataProvider
+     */
+    public function testEntityToDatabase($identifier, $result)
+    {
+        $entityType = 'entityType';
+        $data = ['uuid' => 'bulk-1'];
+        $connectionName = 'connection_name';
+        $entityTable = 'table_name';
+        $this->metadataPoolMock
+            ->expects($this->once())
+            ->method('getMetadata')
+            ->with($entityType)
+            ->willReturn($this->entityMetadataMock);
+        $this->entityMetadataMock
+            ->expects($this->once())
+            ->method('getEntityConnectionName')
+            ->willReturn($connectionName);
+
+        $this->resourceConnectionMock
+            ->expects($this->once())
+            ->method('getConnectionByName')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())->method('select')->willReturn($this->selectMock);
+        $this->entityMetadataMock->expects($this->once())->method('getEntityTable')->willReturn($entityTable);
+        $this->selectMock->expects($this->once())->method('from')->with($entityTable, 'id')->willReturnSelf();
+        $this->selectMock->expects($this->once())->method('where')->with("uuid = ?", 'bulk-1')->willReturnSelf();
+        $this->connectionMock
+            ->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->selectMock)
+            ->willReturn($identifier);
+        
+        $this->assertEquals($result, $this->model->entityToDatabase($entityType, $data));
+    }
+
+    /**
+     * @return array
+     */
+    public function entityToDatabaseDataProvider()
+    {
+        return [
+            [1, ['uuid' => 'bulk-1', 'id' => 1]],
+            [false, ['uuid' => 'bulk-1']]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
new file mode 100644
index 0000000000000..f62e2b7f9d5ea
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\Operation;
+
+use Magento\Framework\Bulk\OperationInterface;
+
+class DetailsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkStatusMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->bulkStatusMock = $this->getMockBuilder(\Magento\Framework\Bulk\BulkStatusInterface::class)
+            ->getMock();
+        $this->model = new \Magento\AsynchronousOperations\Model\Operation\Details($this->bulkStatusMock);
+    }
+
+    public function testGetDetails()
+    {
+        $uuid = 'some_uuid_string';
+        $completed = 100;
+        $failedRetriable = 23;
+        $failedNotRetriable = 45;
+        $open = 303;
+        $rejected = 0;
+
+        $expectedResult = [
+            'operations_total' => $completed + $failedRetriable + $failedNotRetriable + $open,
+            'operations_successful' => $completed,
+            'operations_failed' => $failedRetriable + $failedNotRetriable,
+            'failed_retriable' => $failedRetriable,
+            'failed_not_retriable' => $failedNotRetriable,
+            'rejected' => $rejected,
+            'open' => $open,
+        ];
+
+        $this->bulkStatusMock->method('getOperationsCountByBulkIdAndStatus')
+            ->willReturnMap([
+                [$uuid, OperationInterface::STATUS_TYPE_COMPLETE, $completed],
+                [$uuid, OperationInterface::STATUS_TYPE_RETRIABLY_FAILED, $failedRetriable],
+                [$uuid, OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED, $failedNotRetriable],
+                [$uuid, OperationInterface::STATUS_TYPE_OPEN, $open],
+                [$uuid, OperationInterface::STATUS_TYPE_REJECTED, $rejected],
+            ]);
+
+        $result = $this->model->getDetails($uuid);
+        $this->assertEquals($expectedResult, $result);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
new file mode 100644
index 0000000000000..4c3e240da2a8a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+/**
+ * Class OperationManagementTest
+ */
+class OperationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\OperationManagement
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+    
+    protected function setUp()
+    {
+        $this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->operationFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory::class,
+            ['create']
+        );
+        $this->operationMock =
+            $this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->model = new \Magento\AsynchronousOperations\Model\OperationManagement(
+            $this->entityManagerMock,
+            $this->operationFactoryMock,
+            $this->loggerMock
+        );
+    }
+
+    public function testChangeOperationStatus()
+    {
+        $operationId = 1;
+        $status = 1;
+        $message = 'Message';
+        $data = 'data';
+        $errorCode = 101;
+        $this->operationFactoryMock->expects($this->once())->method('create')->willReturn($this->operationMock);
+        $this->entityManagerMock->expects($this->once())->method('load')->with($this->operationMock, $operationId);
+        $this->operationMock->expects($this->once())->method('setStatus')->with($status)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setResultMessage')->with($message)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setSerializedData')->with($data)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setErrorCode')->with($errorCode)->willReturnSelf();
+        $this->entityManagerMock->expects($this->once())->method('save')->with($this->operationMock);
+        $this->assertTrue($this->model->changeOperationStatus($operationId, $status, $errorCode, $message, $data));
+    }
+
+    public function testChangeOperationStatusIfExceptionWasThrown()
+    {
+        $operationId = 1;
+        $status = 1;
+        $message = 'Message';
+        $data = 'data';
+        $errorCode = 101;
+        $this->operationFactoryMock->expects($this->once())->method('create')->willReturn($this->operationMock);
+        $this->entityManagerMock->expects($this->once())->method('load')->with($this->operationMock, $operationId);
+        $this->operationMock->expects($this->once())->method('setStatus')->with($status)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setResultMessage')->with($message)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setSerializedData')->with($data)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setErrorCode')->with($errorCode)->willReturnSelf();
+        $this->entityManagerMock->expects($this->once())->method('save')->willThrowException(new \Exception());
+        $this->loggerMock->expects($this->once())->method('critical');
+        $this->assertFalse($this->model->changeOperationStatus($operationId, $status, $errorCode, $message, $data));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php
new file mode 100644
index 0000000000000..2f0fc8ceba46f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\ResourceModel\Operation;
+
+/**
+ * Unit test for Create operation.
+ */
+class CreateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\EntityManager\TypeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $typeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Create
+     */
+    private $create;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->typeResolver = $this->getMockBuilder(\Magento\Framework\EntityManager\TypeResolver::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->create = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Create::class,
+            [
+                'metadataPool' => $this->metadataPool,
+                'typeResolver' => $this->typeResolver,
+                'resourceConnection' => $this->resourceConnection,
+            ]
+        );
+    }
+
+    /**
+     * Test for execute method.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $connectionName = 'default';
+        $operationData = ['key1' => 'value1'];
+        $operationTable = 'magento_operation';
+        $operationList = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->typeResolver->expects($this->once())->method('resolve')->with($operationList)
+            ->willReturn(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class);
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnection')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->setMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $operationList->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $operation->expects($this->once())->method('getData')->willReturn($operationData);
+        $metadata->expects($this->once())->method('getEntityTable')->willReturn($operationTable);
+        $connection->expects($this->once())->method('insertOnDuplicate')
+            ->with($operationTable, [$operationData], ['status', 'error_code', 'result_message'])->willReturn(1);
+        $connection->expects($this->once())->method('commit')->willReturnSelf();
+        $this->assertEquals($operationList, $this->create->execute($operationList));
+    }
+
+    /**
+     * Test for execute method with exception.
+     *
+     * @return void
+     * @expectedException \Exception
+     */
+    public function testExecuteWithException()
+    {
+        $connectionName = 'default';
+        $operationData = ['key1' => 'value1'];
+        $operationTable = 'magento_operation';
+        $operationList = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->typeResolver->expects($this->once())->method('resolve')->with($operationList)
+            ->willReturn(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class);
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnection')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->setMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $operationList->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $operation->expects($this->once())->method('getData')->willReturn($operationData);
+        $metadata->expects($this->once())->method('getEntityTable')->willReturn($operationTable);
+        $connection->expects($this->once())->method('insertOnDuplicate')
+            ->with($operationTable, [$operationData], ['status', 'error_code', 'result_message'])
+            ->willThrowException(new \Exception());
+        $connection->expects($this->once())->method('rollBack')->willReturnSelf();
+        $this->create->execute($operationList);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php
new file mode 100644
index 0000000000000..6a51258b34afc
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Model\ResourceModel\System\Message\Collection\Synchronized;
+
+use Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Collection\Synchronized\Plugin;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Bulk\BulkStatusInterface;
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\AsynchronousOperations\Model\Operation\Details;
+use Magento\Framework\AuthorizationInterface;
+use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized;
+
+/**
+ * Class PluginTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Plugin
+     */
+    private $plugin;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messagefactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkStatusMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkNotificationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userContextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationsDetailsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statusMapper;
+
+    /**
+     * @var string
+     */
+    private $resourceName = 'Magento_Logging::system_magento_logging_bulk_operations';
+
+    protected function setUp()
+    {
+        $this->messagefactoryMock = $this->createPartialMock(
+            \Magento\AdminNotification\Model\System\MessageFactory::class,
+            ['create']
+        );
+        $this->bulkStatusMock = $this->createMock(BulkStatusInterface::class);
+
+        $this->userContextMock = $this->createMock(UserContextInterface::class);
+        $this->operationsDetailsMock = $this->createMock(Details::class);
+        $this->authorizationMock = $this->createMock(AuthorizationInterface::class);
+        $this->messageMock = $this->createMock(\Magento\AdminNotification\Model\System\Message::class);
+        $this->collectionMock = $this->createMock(Synchronized::class);
+        $this->bulkNotificationMock = $this->createMock(BulkNotificationManagement::class);
+        $this->statusMapper = $this->createMock(\Magento\AsynchronousOperations\Model\StatusMapper::class);
+        $this->plugin = new Plugin(
+            $this->messagefactoryMock,
+            $this->bulkStatusMock,
+            $this->bulkNotificationMock,
+            $this->userContextMock,
+            $this->operationsDetailsMock,
+            $this->authorizationMock,
+            $this->statusMapper
+        );
+    }
+
+    public function testAfterToArrayIfNotAllowed()
+    {
+        $result = [];
+        $this->authorizationMock
+            ->expects($this->once())
+            ->method('isAllowed')
+            ->with($this->resourceName)
+            ->willReturn(false);
+        $this->assertEquals($result, $this->plugin->afterToArray($this->collectionMock, $result));
+    }
+
+    /**
+     * @param array $operationDetails
+     * @dataProvider afterToDataProvider
+     */
+    public function testAfterTo($operationDetails)
+    {
+        $methods = ['getBulkId', 'getDescription', 'getStatus', 'getStartTime'];
+        $bulkMock = $this->createPartialMock(\Magento\AsynchronousOperations\Model\BulkSummary::class, $methods);
+        $result = ['items' =>[], 'totalRecords' => 1];
+        $userBulks = [$bulkMock];
+        $userId = 1;
+        $bulkUuid = 2;
+        $bulkArray = [
+            'status' => \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::NOT_STARTED
+        ];
+        $bulkMock->expects($this->once())->method('getBulkId')->willReturn($bulkUuid);
+        $this->operationsDetailsMock
+            ->expects($this->once())
+            ->method('getDetails')
+            ->with($bulkUuid)
+            ->willReturn($operationDetails);
+        $bulkMock->expects($this->once())->method('getDescription')->willReturn('Bulk Description');
+        $this->messagefactoryMock->expects($this->once())->method('create')->willReturn($this->messageMock);
+        $this->messageMock->expects($this->once())->method('toArray')->willReturn($bulkArray);
+        $this->authorizationMock
+            ->expects($this->once())
+            ->method('isAllowed')
+            ->with($this->resourceName)
+            ->willReturn(true);
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($userId);
+        $this->bulkNotificationMock
+            ->expects($this->once())
+            ->method('getAcknowledgedBulksByUser')
+            ->with($userId)
+            ->willReturn([]);
+        $this->statusMapper->expects($this->once())->method('operationStatusToBulkSummaryStatus');
+        $this->bulkStatusMock->expects($this->once())->method('getBulksByUser')->willReturn($userBulks);
+        $result2 = $this->plugin->afterToArray($this->collectionMock, $result);
+        $this->assertEquals(2, $result2['totalRecords']);
+    }
+
+    /**
+     * @return array
+     */
+    public function afterToDataProvider()
+    {
+        return [
+            ['operations_successful' => 0,
+                'operations_failed' => 0,
+                'operations_total' => 10
+            ],
+            ['operations_successful' => 1,
+                'operations_failed' => 2,
+                'operations_total' => 10
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
new file mode 100644
index 0000000000000..89fa80de36378
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class StatusMapperTest
+ */
+class StatusMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\StatusMapper
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\AsynchronousOperations\Model\StatusMapper();
+    }
+
+    public function testOperationStatusToBulkSummaryStatus()
+    {
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED),
+            BulkSummaryInterface::FINISHED_WITH_FAILURE
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_RETRIABLY_FAILED),
+            BulkSummaryInterface::FINISHED_WITH_FAILURE
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_COMPLETE),
+            BulkSummaryInterface::FINISHED_SUCCESSFULLY
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_OPEN),
+            BulkSummaryInterface::IN_PROGRESS
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(0),
+            BulkSummaryInterface::NOT_STARTED
+        );
+    }
+
+    public function testOperationStatusToBulkSummaryStatusWithUnknownStatus()
+    {
+        $this->assertNull($this->model->operationStatusToBulkSummaryStatus('unknown_status'));
+    }
+
+    public function testBulkSummaryStatusToOperationStatus()
+    {
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::FINISHED_SUCCESSFULLY),
+            OperationInterface::STATUS_TYPE_COMPLETE
+        );
+
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::IN_PROGRESS),
+            OperationInterface::STATUS_TYPE_OPEN
+        );
+
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::FINISHED_WITH_FAILURE),
+            [
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_REJECTED
+            ]
+        );
+
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::NOT_STARTED),
+            0
+        );
+    }
+
+    public function testBulkSummaryStatusToOperationStatusWithUnknownStatus()
+    {
+        $this->assertNull($this->model->bulkSummaryStatusToOperationStatus('unknown_status'));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php
new file mode 100644
index 0000000000000..cc0b3a3da38a7
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\AdminNotification;
+
+use Magento\Framework\AuthorizationInterface;
+
+class PluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin
+     */
+    private $plugin;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    protected function setUp()
+    {
+        $this->authorizationMock = $this->createMock(AuthorizationInterface::class);
+        $this->plugin = new \Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin(
+            $this->authorizationMock
+        );
+    }
+
+    public function testAfterGetMeta()
+    {
+        $result = [];
+        $expectedResult = [
+            'columns' => [
+                'arguments' => [
+                    'data' => [
+                        'config' => [
+                            'isAllowed' => true
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $dataProviderMock = $this->createMock(\Magento\AdminNotification\Ui\Component\DataProvider\DataProvider::class);
+        $this->authorizationMock->expects($this->once())->method('isAllowed')->willReturn(true);
+        $this->assertEquals($expectedResult, $this->plugin->afterGetMeta($dataProviderMock, $result));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
new file mode 100644
index 0000000000000..f5cce7af943a1
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\AsynchronousOperations\Model\BulkSummary;
+
+class ActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions
+     */
+    private $actionColumn;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $processor = $this->createPartialMock(
+            \Magento\Framework\View\Element\UiComponent\Processor::class,
+            ['getProcessor']
+        );
+        $this->context->expects($this->never())->method('getProcessor')->will($this->returnValue($processor));
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->actionColumn = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions::class,
+            [
+                'context' => $this->context,
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'components' => [],
+                'data' => ['name' => 'Edit'],
+                'editUrl' => ''
+            ]
+        );
+    }
+
+    /**
+     * Test for method prepareDataSource
+     */
+    public function testPrepareDataSource()
+    {
+        $href = 'bulk/bulk/details/id/bulk-1';
+        $this->context->expects($this->once())->method('getUrl')->with(
+            'bulk/bulk/details',
+            ['uuid' => 'bulk-1']
+        )->willReturn($href);
+        $dataSource['data']['items']['item'] = [BulkSummary::BULK_ID => 'bulk-1'];
+        $actionColumn['data']['items']['item'] = [
+            'Edit' => [
+                'edit' => [
+                    'href' => $href,
+                    'label' => __('Details'),
+                    'hidden' => false
+                ]
+            ]
+        ];
+        $expectedResult = array_merge_recursive($dataSource, $actionColumn);
+        $this->assertEquals($expectedResult, $this->actionColumn->prepareDataSource($dataSource));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationActionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationActionsTest.php
new file mode 100644
index 0000000000000..a35fd82774148
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationActionsTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\AsynchronousOperations\Model\BulkSummary;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+class NotificationActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationActions
+     */
+    private $actionColumn;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $processor = $this->createPartialMock(
+            \Magento\Framework\View\Element\UiComponent\Processor::class,
+            ['getProcessor']
+        );
+        $this->context->expects($this->never())->method('getProcessor')->will($this->returnValue($processor));
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->actionColumn = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationActions::class,
+            [
+                'context' => $this->context,
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'components' => [],
+                'data' => ['name' => 'actions']
+            ]
+        );
+    }
+
+    public function testPrepareDataSource()
+    {
+        $testData['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-2',
+            ],
+        ];
+        $expectedResult['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+                'actions' => [
+                    'details' => [
+                        'href' => '#',
+                        'label' => __('View Details'),
+                        'callback' => [
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'destroyInserted',
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'updateData',
+                                'params' => [
+                                    BulkSummary::BULK_ID => 'uuid-1',
+                                ],
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal',
+                                'target' => 'openModal',
+                            ],
+                            [
+                                'provider' => 'ns = notification_area, index = columns',
+                                'target' => 'dismiss',
+                                'params' => ['uuid-1'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-2',
+                'actions' => [
+                    'details' => [
+                        'href' => '#',
+                        'label' => __('View Details'),
+                        'callback' => [
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'destroyInserted',
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'updateData',
+                                'params' => [
+                                    BulkSummary::BULK_ID => 'uuid-2',
+                                ],
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal',
+                                'target' => 'openModal',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedResult, $this->actionColumn->prepareDataSource($testData));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationDismissActionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationDismissActionsTest.php
new file mode 100644
index 0000000000000..cf1f0db58dfdf
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationDismissActionsTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\AsynchronousOperations\Model\BulkSummary;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+class NotificationDismissActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationDismissActions
+     */
+    private $actionColumn;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $processor = $this->createPartialMock(
+            \Magento\Framework\View\Element\UiComponent\Processor::class,
+            ['getProcessor']
+        );
+        $this->context->expects($this->never())->method('getProcessor')->will($this->returnValue($processor));
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->actionColumn = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationDismissActions::class,
+            [
+                'context' => $this->context,
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'components' => [],
+                'data' => ['name' => 'actions']
+            ]
+        );
+    }
+
+    public function testPrepareDataSource()
+    {
+        $testData['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+            ],
+            [
+                'status' => BulkSummaryInterface::IN_PROGRESS,
+            ],
+        ];
+        $expectedResult['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+                'actions' => [
+                    'dismiss' => [
+                        'href' => '#',
+                        'label' => __('Dismiss'),
+                        'callback' => [
+                            [
+                                'provider' => 'ns = notification_area, index = columns',
+                                'target' => 'dismiss',
+                                'params' => [
+                                    0 => 'uuid-1',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'status' => BulkSummaryInterface::IN_PROGRESS,
+            ],
+        ];
+        $this->assertEquals($expectedResult, $this->actionColumn->prepareDataSource($testData));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Operation/DataProviderTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Operation/DataProviderTest.php
new file mode 100644
index 0000000000000..bc1e4bcd7e3e2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Operation/DataProviderTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Operation;
+
+use Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class DataProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationDetailsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkMock;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $helper = new ObjectManager($this);
+
+        $this->bulkCollectionFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory::class,
+            ['create']
+        );
+        $this->bulkCollectionMock = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection::class
+        );
+        $this->operationDetailsMock = $this->createMock(\Magento\AsynchronousOperations\Model\Operation\Details::class);
+        $this->bulkMock = $this->createMock(\Magento\AsynchronousOperations\Model\BulkSummary::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+
+        $this->bulkCollectionFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->bulkCollectionMock);
+
+        $this->dataProvider = $helper->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider::class,
+            [
+                'name' => 'test-name',
+                'bulkCollectionFactory' => $this->bulkCollectionFactoryMock,
+                'operationDetails' => $this->operationDetailsMock,
+                'request' => $this->requestMock
+            ]
+        );
+    }
+
+    public function testGetData()
+    {
+        $testData = [
+            'id' => '1',
+            'uuid' => 'bulk-uuid1',
+            'user_id' => '2',
+            'description' => 'Description'
+        ];
+        $testOperationData = [
+            'operations_total' => 2,
+            'operations_successful' => 1,
+            'operations_failed' => 2
+        ];
+        $testSummaryData = [
+            'summary' => '2 items selected for mass update, 1 successfully updated, 2 failed to update'
+        ];
+        $resultData[$testData['id']] = array_merge($testData, $testOperationData, $testSummaryData);
+
+        $this->bulkCollectionMock
+            ->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$this->bulkMock]);
+        $this->bulkMock
+            ->expects($this->once())
+            ->method('getData')
+            ->willReturn($testData);
+        $this->operationDetailsMock
+            ->expects($this->once())
+            ->method('getDetails')
+            ->with($testData['uuid'])
+            ->willReturn($testOperationData);
+        $this->bulkMock
+            ->expects($this->once())
+            ->method('getBulkId')
+            ->willReturn($testData['id']);
+
+        $expectedResult = $this->dataProvider->getData();
+        $this->assertEquals($resultData, $expectedResult);
+    }
+
+    public function testPrepareMeta()
+    {
+        $resultData['retriable_operations']['arguments']['data']['disabled'] = true;
+        $resultData['failed_operations']['arguments']['data']['disabled'] = true;
+        $testData = [
+            'uuid' => 'bulk-uuid1',
+            'failed_retriable' => 0,
+            'failed_not_retriable' => 0
+        ];
+
+        $this->requestMock
+            ->expects($this->once())
+            ->method('getParam')
+            ->willReturn($testData['uuid']);
+        $this->operationDetailsMock
+            ->expects($this->once())
+            ->method('getDetails')
+            ->with($testData['uuid'])
+            ->willReturn($testData);
+
+        $expectedResult = $this->dataProvider->prepareMeta([]);
+        $this->assertEquals($resultData, $expectedResult);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php b/app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php
new file mode 100644
index 0000000000000..b5670639dce09
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Ui\Component\AdminNotification;
+
+/**
+ * Class Plugin to eliminate Bulk related links in the notification area
+ */
+class Plugin
+{
+    /**
+     * @var \Magento\Framework\AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var bool
+     */
+    private $isAllowed;
+
+    /**
+     * Plugin constructor.
+     * @param \Magento\Framework\AuthorizationInterface $authorization
+     */
+    public function __construct(
+        \Magento\Framework\AuthorizationInterface $authorization
+    ) {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * Prepares Meta
+     *
+     * @param \Magento\AdminNotification\Ui\Component\DataProvider\DataProvider $dataProvider
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetMeta(
+        \Magento\AdminNotification\Ui\Component\DataProvider\DataProvider $dataProvider,
+        $result
+    ) {
+        if (!isset($this->isAllowed)) {
+            $this->isAllowed = $this->authorization->isAllowed(
+                'Magento_Logging::system_magento_logging_bulk_operations'
+            );
+        }
+        $result['columns']['arguments']['data']['config']['isAllowed'] = $this->isAllowed;
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Bulk/IdentifierResolver.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Bulk/IdentifierResolver.php
new file mode 100644
index 0000000000000..b5b7da1318001
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Bulk/IdentifierResolver.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Bulk;
+
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Class IdentifierResolver
+ */
+class IdentifierResolver
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     */
+    public function __construct(
+        RequestInterface $request
+    ) {
+        $this->request = $request;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function execute()
+    {
+        return $this->request->getParam('uuid');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResult.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResult.php
new file mode 100644
index 0000000000000..aba7554c26d1d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResult.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\AsynchronousOperations\Ui\Component\DataProvider\Bulk\IdentifierResolver;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Class SearchResult
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * @var IdentifierResolver
+     */
+    private $identifierResolver;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * SearchResult constructor.
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param IdentifierResolver $identifierResolver
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param string $mainTable
+     * @param null $resourceModel
+     * @param string $identifierName identifier field name for collection items
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        IdentifierResolver $identifierResolver,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        $mainTable = 'magento_operation',
+        $resourceModel = null,
+        $identifierName = 'id'
+    ) {
+        $this->jsonHelper = $jsonHelper;
+        $this->identifierResolver = $identifierResolver;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _initSelect()
+    {
+        $bulkUuid = $this->identifierResolver->execute();
+        $this->getSelect()->from(['main_table' => $this->getMainTable()], ['id', 'result_message', 'serialized_data'])
+            ->where('bulk_uuid=?', $bulkUuid)
+            ->where('status=?', OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _afterLoad()
+    {
+        parent::_afterLoad();
+        foreach ($this->_items as $key => $item) {
+            try {
+                $unserializedData = $this->jsonHelper->jsonDecode($item['serialized_data']);
+            } catch (\Exception $e) {
+                $this->_logger->error($e->getMessage());
+                $unserializedData = [];
+            }
+            $this->_items[$key]->setData('meta_information', $this->provideMetaInfo($unserializedData));
+            $this->_items[$key]->setData('link', $this->getLink($unserializedData));
+            $this->_items[$key]->setData('entity_id', $this->getEntityId($unserializedData));
+        }
+        return $this;
+    }
+
+    /**
+     * Provide meta info by serialized data
+     *
+     * @param array $item
+     * @return string
+     */
+    private function provideMetaInfo($item)
+    {
+        $metaInfo = '';
+        if (isset($item['meta_information'])) {
+            $metaInfo = $item['meta_information'];
+        }
+        return $metaInfo;
+    }
+
+    /**
+     * Get link from serialized data
+     *
+     * @param array $item
+     * @return string
+     */
+    private function getLink($item)
+    {
+        $entityLink = '';
+        if (isset($item['entity_link'])) {
+            $entityLink = $item['entity_link'];
+        }
+        return $entityLink;
+    }
+
+    /**
+     * Get entity id from serialized data
+     *
+     * @param array $item
+     * @return string
+     */
+    private function getEntityId($item)
+    {
+        $entityLink = '';
+        if (isset($item['entity_id'])) {
+            $entityLink = $item['entity_id'];
+        }
+        return $entityLink;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResult.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResult.php
new file mode 100644
index 0000000000000..9641bd1333f9f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResult.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\AsynchronousOperations\Ui\Component\DataProvider\Bulk\IdentifierResolver;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Class SearchResult
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * @var IdentifierResolver
+     */
+    private $identifierResolver;
+
+    /**
+     * SearchResult constructor.
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param IdentifierResolver $identifierResolver
+     * @param string $mainTable
+     * @param null $resourceModel
+     * @param string $identifierName
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        IdentifierResolver $identifierResolver,
+        $mainTable = 'magento_operation',
+        $resourceModel = null,
+        $identifierName = 'id'
+    ) {
+        $this->identifierResolver = $identifierResolver;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _initSelect()
+    {
+        $bulkUuid = $this->identifierResolver->execute();
+        $this->getSelect()->from(['main_table' => $this->getMainTable()], ['id', 'result_message', 'error_code'])
+            ->where('bulk_uuid=?', $bulkUuid)
+            ->where('status=?', OperationInterface::STATUS_TYPE_RETRIABLY_FAILED)
+            ->group('error_code')
+            ->columns(['records_qty' => new \Zend_Db_Expr('COUNT(id)')]);
+        return $this;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php
new file mode 100644
index 0000000000000..5f2fbd9ea8b11
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+use Magento\AsynchronousOperations\Model\StatusMapper;
+use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
+
+/**
+ * Class SearchResult
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var StatusMapper
+     */
+    private $statusMapper;
+
+    /**
+     * @var array|int
+     */
+    private $operationStatus;
+
+    /**
+     * @var CalculatedStatusSql
+     */
+    private $calculatedStatusSql;
+
+    /**
+     * SearchResult constructor.
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param UserContextInterface $userContextInterface
+     * @param StatusMapper $statusMapper
+     * @param CalculatedStatusSql $calculatedStatusSql
+     * @param string $mainTable
+     * @param null $resourceModel
+     * @param string $identifierName
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        UserContextInterface $userContextInterface,
+        StatusMapper $statusMapper,
+        CalculatedStatusSql $calculatedStatusSql,
+        $mainTable = 'magento_bulk',
+        $resourceModel = null,
+        $identifierName = 'uuid'
+    ) {
+        $this->userContext = $userContextInterface;
+        $this->statusMapper = $statusMapper;
+        $this->calculatedStatusSql = $calculatedStatusSql;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _initSelect()
+    {
+        $this->getSelect()->from(
+            ['main_table' => $this->getMainTable()],
+            [
+                '*',
+                'status' => $this->calculatedStatusSql->get($this->getTable('magento_operation'))
+            ]
+        )->where(
+            'user_id=?',
+            $this->userContext->getUserId()
+        );
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _afterLoad()
+    {
+        /** @var BulkSummaryInterface $item */
+        foreach ($this->getItems() as $item) {
+            $item->setStatus($this->statusMapper->operationStatusToBulkSummaryStatus($item->getStatus()));
+        }
+        return parent::_afterLoad();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field == 'status') {
+            if (is_array($condition)) {
+                foreach ($condition as $value) {
+                    $this->operationStatus = $this->statusMapper->bulkSummaryStatusToOperationStatus($value);
+                    if (is_array($this->operationStatus)) {
+                        foreach ($this->operationStatus as $statusValue) {
+                            $this->getSelect()->orHaving('status = ?', $statusValue);
+                        }
+                        continue;
+                    }
+                    $this->getSelect()->having('status = ?', $this->operationStatus);
+                }
+            }
+            return $this;
+        }
+        return parent::addFieldToFilter($field, $condition);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSelectCountSql()
+    {
+        $select = parent::getSelectCountSql();
+        $select->columns(['status' => $this->calculatedStatusSql->get($this->getTable('magento_operation'))]);
+        //add grouping by status if filtering by status was executed
+        if (isset($this->operationStatus)) {
+            $select->group('status');
+        }
+        return $select;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/Actions.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/Actions.php
new file mode 100644
index 0000000000000..232f8ca1356be
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/Actions.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Ui\Component\Listing\Column;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class Actions
+ */
+class Actions extends Column
+{
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        $dataSource = parent::prepareDataSource($dataSource);
+
+        if (empty($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        foreach ($dataSource['data']['items'] as &$item) {
+            $item[$this->getData('name')]['edit'] = [
+                'href' => $this->context->getUrl(
+                    'bulk/bulk/details',
+                    ['uuid' => $item['uuid']]
+                ),
+                'label' => __('Details'),
+                'hidden' => false,
+            ];
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationActions.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationActions.php
new file mode 100644
index 0000000000000..1886bbf430bc7
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationActions.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\Listing\Column;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class Actions
+ */
+class NotificationActions extends Column
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        $dataSource = parent::prepareDataSource($dataSource);
+
+        if (empty($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        foreach ($dataSource['data']['items'] as &$item) {
+            if (isset($item['uuid'])) {
+                $item[$this->getData('name')]['details'] = [
+                    'callback' => [
+                        [
+                            'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                            'target' => 'destroyInserted',
+                        ],
+                        [
+                            'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                            'target' => 'updateData',
+                            'params' => [
+                                'uuid' => $item['uuid'],
+                            ],
+                        ],
+                        [
+                            'provider' => 'notification_area.notification_area.modalContainer.modal',
+                            'target' => 'openModal',
+                        ],
+                    ],
+                    'href' => '#',
+                    'label' => __('View Details'),
+                ];
+
+                if (isset($item['status'])
+                    && ($item['status'] === BulkSummaryInterface::FINISHED_SUCCESSFULLY
+                    || $item['status'] === BulkSummaryInterface::FINISHED_WITH_FAILURE)
+                ) {
+                    $item[$this->getData('name')]['details']['callback'][] = [
+                        'provider' => 'ns = notification_area, index = columns',
+                        'target' => 'dismiss',
+                        'params' => [
+                            0 => $item['uuid'],
+                        ],
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationDismissActions.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationDismissActions.php
new file mode 100644
index 0000000000000..cae2524f92600
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationDismissActions.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\Listing\Column;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class NotificationDismissActions
+ */
+class NotificationDismissActions extends Column
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        $dataSource = parent::prepareDataSource($dataSource);
+
+        if (empty($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        foreach ($dataSource['data']['items'] as &$item) {
+            if (isset($item['status'])
+                && ($item['status'] === BulkSummaryInterface::FINISHED_SUCCESSFULLY
+                || $item['status'] === BulkSummaryInterface::FINISHED_WITH_FAILURE)
+            ) {
+                $item[$this->getData('name')]['dismiss'] = [
+                    'callback' => [
+                        [
+                            'provider' => 'ns = notification_area, index = columns',
+                            'target' => 'dismiss',
+                            'params' => [
+                                0 => $item['uuid'],
+                            ],
+                        ],
+                    ],
+                    'href' => '#',
+                    'label' => __('Dismiss'),
+                ];
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Operation/DataProvider.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Operation/DataProvider.php
new file mode 100644
index 0000000000000..89aae531fec4e
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Operation/DataProvider.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Ui\Component\Operation;
+
+/**
+ * Class DataProvider
+ */
+class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection
+     */
+    protected $collection;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $operationDetails;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface $request,
+     */
+    private $request;
+
+    /**
+     * DataProvider constructor.
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollectionFactory
+     * @param \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollectionFactory,
+        \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails,
+        \Magento\Framework\App\RequestInterface $request,
+        array $meta = [],
+        array $data = []
+    ) {
+        $this->collection = $bulkCollectionFactory->create();
+        $this->operationDetails = $operationDetails;
+        $this->request = $request;
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->meta = $this->prepareMeta($this->meta);
+    }
+
+    /**
+     * Human readable summary for bulk
+     *
+     * @param array $operationDetails structure is implied as getOperationDetails() result
+     * @return string
+     */
+    private function getSummaryReport($operationDetails)
+    {
+        if (0 == $operationDetails['operations_successful'] && 0 == $operationDetails['operations_failed']) {
+            return __('Pending, in queue...');
+        }
+
+        $summaryReport = __('%1 items selected for mass update', $operationDetails['operations_total'])->__toString();
+        if ($operationDetails['operations_successful'] > 0) {
+            $summaryReport .= __(', %1 successfully updated', $operationDetails['operations_successful']);
+        }
+
+        if ($operationDetails['operations_failed'] > 0) {
+            $summaryReport .= __(', %1 failed to update', $operationDetails['operations_failed']);
+        }
+
+        return $summaryReport;
+    }
+
+    /**
+     * Bulk summary with operation statistics
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        $data = [];
+        $items = $this->collection->getItems();
+        if (count($items) == 0) {
+            return $data;
+        }
+        $bulk = array_shift($items);
+        /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulk */
+        $data = $bulk->getData();
+        $operationDetails = $this->operationDetails->getDetails($data['uuid']);
+        $data['summary'] = $this->getSummaryReport($operationDetails);
+        $data = array_merge($data, $operationDetails);
+
+        return [$bulk->getBulkId() => $data];
+    }
+
+    /**
+     * Prepares Meta
+     *
+     * @param array $meta
+     * @return array
+     */
+    public function prepareMeta($meta)
+    {
+        $requestId = $this->request->getParam($this->requestFieldName);
+        $operationDetails = $this->operationDetails->getDetails($requestId);
+
+        if (isset($operationDetails['failed_retriable']) && !$operationDetails['failed_retriable']) {
+            $meta['retriable_operations']['arguments']['data']['disabled'] = true;
+        }
+
+        if (isset($operationDetails['failed_not_retriable']) && !$operationDetails['failed_not_retriable']) {
+            $meta['failed_operations']['arguments']['data']['disabled'] = true;
+        }
+
+        return $meta;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
new file mode 100644
index 0000000000000..18927b5f4ecca
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "magento/module-asynchronous-operations",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "magento/framework-bulk": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-ui": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "suggest": {
+        "magento/module-admin-notification": "*",
+        "magento/module-logging": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\AsynchronousOperations\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/etc/acl.xml b/app/code/Magento/AsynchronousOperations/etc/acl.xml
new file mode 100644
index 0000000000000..42521ad40ff63
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/acl.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Logging::magento_logging" title="Action Log" translate="title" sortOrder="70">
+                        <resource id="Magento_Logging::magento_logging_events" title="Report" translate="title" sortOrder="10"/>
+                        <resource id="Magento_Logging::system_magento_logging_bulk_operations" title="Bulk Actions" translate="title" sortOrder="15"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/di.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..26dd6a39473a6
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized">
+        <plugin name="afterToArray" type="Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Collection\Synchronized\Plugin" />
+    </type>
+    <type name="Magento\AdminNotification\Ui\Component\DataProvider\DataProvider">
+        <plugin name="afterGetMeta" type="Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin" />
+    </type>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/menu.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/menu.xml
new file mode 100644
index 0000000000000..2e9fe34c45cec
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/menu.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Magento_AsynchronousOperations::system_magento_logging"
+             title="Action Logs"
+             translate="title"
+             module="Magento_AsynchronousOperations"
+             sortOrder="70" parent="Magento_Backend::system"
+             dependsOnModule="Magento_AsynchronousOperations"
+             resource="Magento_Logging::magento_logging"/>
+        <add id="Magento_AsynchronousOperations::system_magento_logging_bulk_operations"
+             title="Bulk Actions"
+             translate="title"
+             module="Magento_AsynchronousOperations"
+             sortOrder="25"
+             parent="Magento_AsynchronousOperations::system_magento_logging"
+             action="bulk/index/"
+             resource="Magento_Logging::system_magento_logging_bulk_operations"/>
+    </menu>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/routes.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..a255af90eac8a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="bulk" frontName="bulk">
+            <module name="Magento_AsynchronousOperations" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..7190b80750357
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="system">
+            <tab>advanced</tab>
+            <group id="bulk" translate="label" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="600">
+                <label>Bulk Actions</label>
+                <field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Days Saved in Log</label>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/config.xml b/app/code/Magento/AsynchronousOperations/etc/config.xml
new file mode 100644
index 0000000000000..e30c1005d0dd0
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <bulk>
+                <lifetime>60</lifetime>
+            </bulk>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/crontab.xml b/app/code/Magento/AsynchronousOperations/etc/crontab.xml
new file mode 100644
index 0000000000000..c55b0a886ac79
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/crontab.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="bulk_cleanup" instance="Magento\AsynchronousOperations\Cron\BulkCleanup" method="execute">
+            <schedule>* * * * *</schedule>
+        </job>
+    </group>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
new file mode 100644
index 0000000000000..5cd55408838fe
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="magento_bulk" resource="default" engine="innodb"
+           comment="Bulk entity that represents set of related asynchronous operations">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Bulk Internal ID (must not be exposed)"/>
+        <column xsi:type="varbinary" name="uuid" nullable="true" length="39"
+                comment="Bulk UUID (can be exposed to reference bulk entity)"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="ID of the WebAPI user that performed an action"/>
+        <column xsi:type="int" name="user_type" nullable="true" comment="Which type of user"/>
+        <column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
+        <column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Total number of operations scheduled within this bulk"/>
+        <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Bulk start time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="MAGENTO_BULK_UUID">
+            <column name="uuid"/>
+        </constraint>
+        <index referenceId="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
+            <column name="user_id"/>
+        </index>
+    </table>
+    <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Operation ID"/>
+        <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
+        <column xsi:type="varchar" name="topic_name" nullable="true" length="255"
+                comment="Name of the related message queue topic"/>
+        <column xsi:type="blob" name="serialized_data" nullable="true"
+                comment="Data (serialized) required to perform an operation"/>
+        <column xsi:type="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"
+                comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
+        <column xsi:type="varchar" name="result_message" nullable="true" length="255"
+                comment="Operation result message"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
+                    column="bulk_uuid" referenceTable="magento_bulk" referenceColumn="uuid" onDelete="CASCADE"/>
+        <index referenceId="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
+            <column name="bulk_uuid"/>
+            <column name="error_code"/>
+        </index>
+    </table>
+    <table name="magento_acknowledged_bulk" resource="default" engine="innodb"
+           comment="Bulk that was viewed by user from notification area">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Internal ID"/>
+        <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
+                    table="magento_acknowledged_bulk" column="bulk_uuid" referenceTable="magento_bulk"
+                    referenceColumn="uuid" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
+            <column name="bulk_uuid"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..9b6c0709e1916
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -0,0 +1,52 @@
+{
+    "magento_bulk": {
+        "column": {
+            "id": true,
+            "uuid": true,
+            "user_id": true,
+            "user_type": true,
+            "description": true,
+            "operation_count": true,
+            "start_time": true
+        },
+        "index": {
+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
+            "MAGENTO_BULK_USER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "MAGENTO_BULK_UUID": true,
+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
+        }
+    },
+    "magento_operation": {
+        "column": {
+            "id": true,
+            "bulk_uuid": true,
+            "topic_name": true,
+            "serialized_data": true,
+            "result_serialized_data": true,
+            "status": true,
+            "error_code": true,
+            "result_message": true
+        },
+        "index": {
+            "MAGENTO_OPERATION_BULK_UUID_ERROR_CODE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
+        }
+    },
+    "magento_acknowledged_bulk": {
+        "column": {
+            "id": true,
+            "bulk_uuid": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID": true,
+            "MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/AsynchronousOperations/etc/di.xml b/app/code/Magento/AsynchronousOperations/etc/di.xml
new file mode 100644
index 0000000000000..42b62ff8ea374
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/di.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" type="Magento\AsynchronousOperations\Model\BulkSummary" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationInterface" type="Magento\AsynchronousOperations\Model\Operation" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationListInterface" type="Magento\AsynchronousOperations\Model\OperationList" />
+    <preference for="Magento\Framework\Bulk\BulkManagementInterface" type="Magento\AsynchronousOperations\Model\BulkManagement" />
+    <preference for="Magento\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" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\OperationRepository" />
+    <type name="Magento\Framework\EntityManager\MetadataPool">
+        <arguments>
+            <argument name="metadata" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">magento_operation</item>
+                    <item name="identifierField" xsi:type="string">id</item>
+                </item>
+                <item name="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">magento_bulk</item>
+                    <item name="identifierField" xsi:type="string">uuid</item>
+                </item>
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationListInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">magento_operation</item>
+                    <item name="identifierField" xsi:type="string">id</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\EntityManager\Mapper">
+        <arguments>
+            <argument name="config" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" xsi:type="array">
+                    <item name="uuid" xsi:type="string">bulk_id</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="bulkSummaryMapper" type="Magento\Framework\EntityManager\CompositeMapper">
+        <arguments>
+            <argument name="mappers" xsi:type="array">
+                <item name="identifierMapper" xsi:type="object">Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\EntityManager\MapperPool">
+        <arguments>
+            <argument name="mappers" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" xsi:type="string">bulkSummaryMapper</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
+        <arguments>
+            <argument name="collections" xsi:type="array">
+                <item name="bulk_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult</item>
+                <item name="failed_operation_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed\SearchResult</item>
+                <item name="retriable_operation_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult</item>
+                <item name="failed_operation_modal_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed\SearchResult</item>
+                <item name="retriable_operation_modal_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\EntityManager\OperationPool">
+        <arguments>
+            <argument name="operations" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationListInterface" xsi:type="array">
+                    <item name="checkIfExists" xsi:type="string">Magento\AsynchronousOperations\Model\ResourceModel\Operation\CheckIfExists</item>
+                    <item name="create" xsi:type="string">Magento\AsynchronousOperations\Model\ResourceModel\Operation\Create</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType
+            name="Magento\AsynchronousOperations\Ui\Component\DataProvider"
+            type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"/>
+    <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/extension_attributes.xml b/app/code/Magento/AsynchronousOperations/etc/extension_attributes.xml
new file mode 100644
index 0000000000000..6eeda62373f06
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/extension_attributes.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:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\AsynchronousOperations\Api\Data\OperationInterface">
+        <attribute code="start_time" type="string">
+            <resources>
+                <resource ref="Magento_Logging::system_magento_logging_bulk_operations"/>
+            </resources>
+            <join reference_table="magento_bulk" join_on_field="bulk_uuid" reference_field="uuid">
+                <field column="start_time">start_time</field>
+            </join>
+        </attribute>
+    </extension_attributes>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/module.xml b/app/code/Magento/AsynchronousOperations/etc/module.xml
new file mode 100644
index 0000000000000..8f7a9e144462b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_AsynchronousOperations" >
+        <sequence>
+            <module name="Magento_User"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/webapi.xml b/app/code/Magento/AsynchronousOperations/etc/webapi.xml
new file mode 100644
index 0000000000000..4c10a5756c8d6
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/webapi.xml
@@ -0,0 +1,39 @@
+<?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>
+
+    <route url="/V1/bulk" method="GET">
+        <service class="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" method="getList"/>
+        <resources>
+            <resource ref="Magento_Logging::system_magento_logging_bulk_operations" />
+        </resources>
+    </route>
+
+</routes>
diff --git a/app/code/Magento/AsynchronousOperations/i18n/en_US.csv b/app/code/Magento/AsynchronousOperations/i18n/en_US.csv
new file mode 100644
index 0000000000000..44cc0a0ab7754
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/i18n/en_US.csv
@@ -0,0 +1,35 @@
+Back,Back
+Done,Done
+Retry,Retry
+"'Action Details - #' .","'Action Details - #' ."
+"%1 item(s) have been scheduled for update.""","%1 item(s) have been scheduled for update."""
+"Bulk Actions Log","Bulk Actions Log"
+"%1 item(s) are currently being updated.","%1 item(s) are currently being updated."
+"Task ""%1"": ","Task ""%1"": "
+"%1 item(s) have been scheduled for update.","%1 item(s) have been scheduled for update."
+"%1 item(s) have been successfully updated.","%1 item(s) have been successfully updated."
+"%1 item(s) failed to update","%1 item(s) failed to update"
+Details,Details
+"View Details","View Details"
+Dismiss,Dismiss
+"Pending, in queue...","Pending, in queue..."
+"%1 items selected for mass update","%1 items selected for mass update"
+", %1 successfully updated",", %1 successfully updated"
+", %1 failed to update",", %1 failed to update"
+"Something went wrong.","Something went wrong."
+"Action Log","Action Log"
+"Bulk Actions","Bulk Actions"
+"Days Saved in Log","Days Saved in Log"
+"Description of Operation","Description of Operation"
+Summary,Summary
+"Start Time","Start Time"
+"Items to Retry","Items to Retry"
+"To retry, select the items and click “Retry”.","To retry, select the items and click “Retry”."
+"Items That Can’t Be Updated.","Items That Can’t Be Updated."
+ID,ID
+Status,Status
+"Meta Information","Meta Information"
+Error,Error
+"Dismiss All Completed Tasks","Dismiss All Completed Tasks"
+"Action Details - #","Action Details - #"
+"Number of Records Affected","Number of Records Affected"
diff --git a/app/code/Magento/AsynchronousOperations/registration.php b/app/code/Magento/AsynchronousOperations/registration.php
new file mode 100644
index 0000000000000..d384df583fb5a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AsynchronousOperations', __DIR__);
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details.xml
new file mode 100644
index 0000000000000..a250eed51c781
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="formkey"/>
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="bulk_details_form"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details_modal.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details_modal.xml
new file mode 100644
index 0000000000000..946cf0a898585
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details_modal.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="formkey"/>
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="bulk_details_form_modal"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_index_index.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_index_index.xml
new file mode 100644
index 0000000000000..d8686887bbc59
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_index_index.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="formkey"/>
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="bulk_listing"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form.xml
new file mode 100644
index 0000000000000..19793ac82ba39
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">bulk_details_form.bulk_details_form_data_source</item>
+        </item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="save" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton"/>
+            <button name="back" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\BackButton"/>
+        </buttons>
+        <namespace>bulk_details_form</namespace>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>bulk_details_form.bulk_details_form_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="bulk_details_form_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="bulk/bulk/retry"/>
+        </settings>
+        <dataProvider class="Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider" name="bulk_details_form_data_source">
+            <settings>
+                <requestFieldName>uuid</requestFieldName>
+                <primaryFieldName>uuid</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <fieldset name="general" sortOrder="10">
+        <settings>
+            <label/>
+        </settings>
+        <field name="description" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Description of Operation</label>
+            </settings>
+        </field>
+        <field name="summary" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Summary</label>
+            </settings>
+        </field>
+        <field name="start_time" formElement="date">
+            <settings>
+                <elementTmpl>ui/form/element/textDate</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Start Time</label>
+            </settings>
+            <formElements>
+                <date>
+                    <settings>
+                        <options>
+                            <option name="showsTime" xsi:type="boolean">true</option>
+                            <option name="dateFormat" xsi:type="string">MMM d, YYYY</option>
+                            <option name="timeFormat" xsi:type="string">h:mm:ss A</option>
+                        </options>
+                    </settings>
+                </date>
+            </formElements>
+        </field>
+    </fieldset>
+    <fieldset name="retriable_operations" sortOrder="20">
+        <settings>
+            <label translate="true">Items to Retry</label>
+        </settings>
+        <container name="retriable_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                    <item name="text" xsi:type="string" translate="true">To retry, select the items and click “Retry”.</item>
+                </item>
+            </argument>
+        </container>
+        <field name="retriable_operation_validation" component="Magento_AsynchronousOperations/js/form/error" template="Magento_AsynchronousOperations/form/field" formElement="input">
+            <settings>
+                <additionalClasses>
+                    <class name="message message-warning">true</class>
+                </additionalClasses>
+                <validation>
+                    <rule name="required-entry" xsi:type="array">
+                        <item name="validate" xsi:type="boolean">true</item>
+                        <item name="message" xsi:type="string">An item needs to be selected. Select and try again.</item>
+                    </rule>
+                </validation>
+                <elementTmpl/>
+                <dataType>text</dataType>
+                <dataScope>operations_to_retry</dataScope>
+            </settings>
+        </field>
+        <insertListing name="retriable_operation">
+            <settings>
+                <externalProvider>${ $.ns }.retriable_operation_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <selectionsProvider>${ $.ns }.${ $.ns }.retriable_operation_listing_columns.ids</selectionsProvider>
+                <autoRender>true</autoRender>
+                <dataScope>operations_to_retry</dataScope>
+                <ns>retriable_operation_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+    <fieldset name="failed_operations" sortOrder="30">
+        <settings>
+            <label translate="true">Items That Can’t Be Updated.</label>
+        </settings>
+        <container name="failed_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                </item>
+            </argument>
+        </container>
+        <insertListing name="failed_operation">
+            <settings>
+                <externalProvider>failed_operation_listing.failed_operation_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <autoRender>true</autoRender>
+                <ns>failed_operation_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+</form>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form_modal.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form_modal.xml
new file mode 100644
index 0000000000000..a7d4ad03a0adf
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form_modal.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">bulk_details_form_modal.bulk_details_form_modal_data_source</item>
+        </item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="save" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton"/>
+            <button name="done" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\DoneButton"/>
+        </buttons>
+        <namespace>bulk_details_form_modal</namespace>
+        <ajaxSave>true</ajaxSave>
+        <ajaxSaveType>simple</ajaxSaveType>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>bulk_details_form_modal.bulk_details_form_modal_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="bulk_details_form_modal_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="bulk/bulk/retry"/>
+        </settings>
+        <dataProvider class="Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider" name="bulk_details_form_modal_data_source">
+            <settings>
+                <requestFieldName>uuid</requestFieldName>
+                <primaryFieldName>uuid</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <fieldset name="general" sortOrder="10">
+        <settings>
+            <label/>
+        </settings>
+        <field name="description" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Description of Operation</label>
+            </settings>
+        </field>
+        <field name="summary" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Summary</label>
+            </settings>
+        </field>
+        <field name="start_time" formElement="date">
+            <settings>
+                <elementTmpl>ui/form/element/textDate</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Start Time</label>
+            </settings>
+            <formElements>
+                <date>
+                    <settings>
+                        <options>
+                            <option name="timeFormat" xsi:type="string">h:mm:ss A</option>
+                            <option name="dateFormat" xsi:type="string">MMM d, YYYY</option>
+                            <option name="showsTime" xsi:type="boolean">true</option>
+                        </options>
+                    </settings>
+                </date>
+            </formElements>
+        </field>
+    </fieldset>
+    <fieldset name="retriable_operations" sortOrder="20">
+        <settings>
+            <label translate="true">Items to Retry</label>
+        </settings>
+        <container name="retriable_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                    <item name="text" xsi:type="string" translate="true">To retry, select the items and click “Retry”.</item>
+                </item>
+            </argument>
+        </container>
+        <field name="retriable_operation_validation" component="Magento_AsynchronousOperations/js/form/error" template="Magento_AsynchronousOperations/form/field" formElement="input">
+            <settings>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+                <elementTmpl/>
+                <dataType>text</dataType>
+                <dataScope>operations_to_retry</dataScope>
+            </settings>
+        </field>
+        <insertListing name="retriable_operation">
+            <settings>
+                <externalProvider>${ $.ns }.retriable_operation_modal_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <selectionsProvider>${ $.ns }.${ $.ns }.retriable_operation_modal_listing_columns.ids</selectionsProvider>
+                <autoRender>true</autoRender>
+                <dataScope>operations_to_retry</dataScope>
+                <ns>retriable_operation_modal_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+    <fieldset name="failed_operations" sortOrder="30">
+        <settings>
+            <label translate="true">Items That Can’t Be Updated.</label>
+        </settings>
+        <container name="failed_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                </item>
+            </argument>
+        </container>
+        <insertListing name="failed_operation">
+            <settings>
+                <externalProvider>failed_operation_modal_listing.failed_operation_modal_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <autoRender>true</autoRender>
+                <ns>failed_operation_modal_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+</form>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
new file mode 100644
index 0000000000000..512b08d6a8de2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">bulk_listing.bulk_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>bulk_columns</spinner>
+        <deps>
+            <dep>bulk_listing.bulk_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="bulk_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\AsynchronousOperations\Ui\Component\DataProvider" name="bulk_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <exportButton name="export_button"/>
+        <filters name="listing_filters">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="params" xsi:type="array">
+                        <item name="filters_modifier" xsi:type="array"/>
+                    </item>
+                    <item name="observers" xsi:type="array"/>
+                </item>
+            </argument>
+            <settings>
+                <statefull>
+                    <property name="applied" xsi:type="boolean">false</property>
+                </statefull>
+            </settings>
+        </filters>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="bulk_columns">
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>uuid</indexField>
+                <visible>false</visible>
+            </settings>
+        </selectionsColumn>
+        <column name="uuid" sortOrder="20">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">ID</label>
+            </settings>
+        </column>
+        <column name="start_time" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date" sortOrder="40">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Start Time</label>
+            </settings>
+        </column>
+        <column name="description" sortOrder="50">
+            <settings>
+                <filter>select</filter>
+                <options class="Magento\AsynchronousOperations\Model\BulkDescription\Options"/>
+                <dataType>select</dataType>
+                <label translate="true">Description of Operation</label>
+            </settings>
+        </column>
+        <column name="status" component="Magento_Ui/js/grid/columns/select" sortOrder="60">
+            <settings>
+                <filter>select</filter>
+                <options class="Magento\AsynchronousOperations\Model\BulkStatus\Options"/>
+                <dataType>select</dataType>
+                <label translate="true">Status</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="\Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions">
+            <settings>
+                <indexField>id</indexField>
+                <label>Action</label>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_listing.xml
new file mode 100644
index 0000000000000..2ac762e398521
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_listing.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">failed_operation_listing.failed_operation_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>failed_operation_listing_columns</spinner>
+        <deps>
+            <dep>failed_operation_listing.failed_operation_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="failed_operation_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="failed_operation_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" name="uuid">${ $.provider}:params.uuid</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
+    </listingToolbar>
+    <columns name="failed_operation_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids">
+            <settings>
+                <indexField>id</indexField>
+                <visible>false</visible>
+            </settings>
+        </selectionsColumn>
+        <column name="id" component="Magento_Ui/js/grid/columns/link" sortOrder="10">
+            <settings>
+                <label translate="true">ID</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="meta_information" sortOrder="20">
+            <settings>
+                <label translate="true">Meta Information</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="result_message" sortOrder="30">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_modal_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_modal_listing.xml
new file mode 100644
index 0000000000000..62a4935da8ba7
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_modal_listing.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">failed_operation_modal_listing.failed_operation_modal_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>failed_operation_modal_listing_columns</spinner>
+        <deps>
+            <dep>failed_operation_modal_listing.failed_operation_modal_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="failed_operation_modal_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="failed_operation_modal_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" name="uuid">${ $.provider}:params.uuid</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
+    </listingToolbar>
+    <columns name="failed_operation_modal_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids">
+            <settings>
+                <indexField>id</indexField>
+                <visible>false</visible>
+            </settings>
+        </selectionsColumn>
+        <column name="id" component="Magento_Ui/js/grid/columns/link" sortOrder="10">
+            <settings>
+                <label translate="true">ID</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="meta_information" sortOrder="20">
+            <settings>
+                <label translate="true">Meta Information</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="result_message" sortOrder="30">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/notification_area.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/notification_area.xml
new file mode 100644
index 0000000000000..b43a7e6f4c358
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/notification_area.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <columns name="columns" component="Magento_AsynchronousOperations/js/grid/listing" template="Magento_AsynchronousOperations/grid/listing">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="link" xsi:type="url" path="bulk/index"/>
+                <item name="linkText" xsi:type="string" translate="true">Bulk Actions Log</item>
+                <item name="dismissAllText" xsi:type="string" translate="true">Dismiss All Completed Tasks</item>
+                <item name="dismissUrl" xsi:type="url" path="bulk/notification/dismiss"/>
+            </item>
+        </argument>
+        <actionsColumn name="actions" class="Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationActions" sortOrder="20">
+            <settings>
+                <indexField>identity</indexField>
+            </settings>
+        </actionsColumn>
+        <actionsColumn name="dismiss" class="Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationDismissActions" sortOrder="10">
+            <settings>
+                <indexField>identity</indexField>
+                <bodyTmpl>Magento_AsynchronousOperations/grid/cells/actions</bodyTmpl>
+            </settings>
+        </actionsColumn>
+    </columns>
+    <container name="modalContainer">
+        <modal name="modal">
+            <insertForm name="insertBulk" component="Magento_AsynchronousOperations/js/insert-form">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="titlePrefix" xsi:type="string" translate="true">Action Details - #</item>
+                        <item name="modalTitleProvider" xsi:type="string">${ $.externalProvider }:data.uuid</item>
+                    </item>
+                </argument>
+                <settings>
+                    <formSubmitType>ajax</formSubmitType>
+                    <columnsProvider>ns = notification_area, index = columns</columnsProvider>
+                    <renderUrl path="mui/index/render_handle">
+                        <param name="handle">bulk_bulk_details_modal</param>
+                        <param name="buttons">1</param>
+                    </renderUrl>
+                    <loading>false</loading>
+                    <toolbarContainer>${ $.parentName }</toolbarContainer>
+                    <externalProvider>${ $.ns }.bulk_details_form_modal_data_source</externalProvider>
+                    <ns>bulk_details_form_modal</ns>
+                </settings>
+            </insertForm>
+        </modal>
+    </container>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_listing.xml
new file mode 100644
index 0000000000000..3618e10ee77d8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_listing.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">retriable_operation_listing.retriable_operation_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>retriable_operation_listing_columns</spinner>
+        <deps>
+            <dep>retriable_operation_listing.retriable_operation_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="retriable_operation_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="retriable_operation_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="retriable_operation_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>error_code</indexField>
+            </settings>
+        </selectionsColumn>
+        <column name="result_message" sortOrder="20">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+        <column name="records_qty" sortOrder="30">
+            <settings>
+                <label translate="true">Number of Records Affected</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_modal_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_modal_listing.xml
new file mode 100644
index 0000000000000..97e3e897c2533
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_modal_listing.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">retriable_operation_modal_listing.retriable_operation_modal_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>retriable_operation_modal_listing_columns</spinner>
+        <deps>
+            <dep>retriable_operation_modal_listing.retriable_operation_modal_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="retriable_operation_modal_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="retriable_operation_modal_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="retriable_operation_modal_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>error_code</indexField>
+            </settings>
+        </selectionsColumn>
+        <column name="result_message" sortOrder="20">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+        <column name="records_qty" sortOrder="30">
+            <settings>
+                <label translate="true">Number of Records Affected</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/form/error.js b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/form/error.js
new file mode 100644
index 0000000000000..bc41946657df1
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/form/error.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/abstract'
+], function (Abstract) {
+    'use strict';
+
+    return Abstract.extend({
+        /** @inheritdoc */
+        onUpdate: function () {
+            this.bubble('update', this.hasChanged());
+        }
+    });
+});
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/grid/listing.js b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/grid/listing.js
new file mode 100644
index 0000000000000..104ac0ae1ec10
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/grid/listing.js
@@ -0,0 +1,88 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_AdminNotification/js/grid/listing',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate',
+    'underscore',
+    'jquery'
+], function (Listing, uiAlert, $t, _, $) {
+    'use strict';
+
+    return Listing.extend({
+        defaults: {
+            isAllowed: true,
+            ajaxSettings: {
+                method: 'POST',
+                data: {},
+                url: '${ $.dismissUrl }'
+            }
+        },
+
+        /** @inheritdoc */
+        initialize: function () {
+            _.bindAll(this, 'reload', 'onError');
+
+            return this._super();
+        },
+
+        /**
+         * Dismiss all items.
+         */
+        dismissAll: function () {
+            var toDismiss = [];
+
+            _.each(this.rows, function (row) {
+                if (row.dismiss) {
+                    toDismiss.push(row.uuid);
+                }
+            });
+            toDismiss.length && this.dismiss(toDismiss);
+        },
+
+        /**
+         * Dismiss action.
+         *
+         * @param {Array} items
+         */
+        dismiss: function (items) {
+            var config = _.extend({}, this.ajaxSettings);
+
+            config.data.uuid = items;
+            this.showLoader();
+
+            $.ajax(config)
+                .done(this.reload)
+                .fail(this.onError);
+        },
+
+        /**
+         * Success callback for dismiss request.
+         */
+        reload: function () {
+            this.source.reload({
+                refresh: true
+            });
+        },
+
+        /**
+         * Error callback for dismiss request.
+         *
+         * @param {Object} xhr
+         */
+        onError: function (xhr) {
+            this.hideLoader();
+
+            if (xhr.statusText === 'abort') {
+                return;
+            }
+
+            uiAlert({
+                content: $t('Something went wrong.')
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/insert-form.js b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/insert-form.js
new file mode 100644
index 0000000000000..5c39534ea5e9a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/insert-form.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/components/insert-form',
+    'uiRegistry'
+], function (Insert, registry) {
+    'use strict';
+
+    return Insert.extend({
+        defaults: {
+            modalProvider: '${ $.parentName }',
+            titlePrefix: '',
+            imports: {
+                changeModalTitle: '${ $.modalProvider }:state'
+            },
+            listens: {
+                responseData: 'afterRetry'
+            },
+            modules: {
+                modal: '${ $.modalProvider }',
+                notificationListing: '${ $.columnsProvider }'
+            }
+        },
+
+        /** @inheritdoc */
+        initConfig: function () {
+            var modalTitleProvider;
+
+            this._super();
+            modalTitleProvider = this.modalTitleProvider.split(':');
+            this.modalTitleTarget = modalTitleProvider[0];
+            this.modalTitlePath = modalTitleProvider[1];
+        },
+
+        /**
+         * Change modal title.
+         *
+         * @param {Boolean} change
+         */
+        changeModalTitle: function (change) {
+            if (change) {
+                registry.get(this.modalTitleTarget, function (target) {
+                    this.modal().setTitle(this.titlePrefix + target.get(this.modalTitlePath));
+                }.bind(this));
+            } else {
+                this.modal().setTitle('');
+            }
+        },
+
+        /**
+         * Action after retry operation.
+         *
+         * @param {Object} data
+         */
+        afterRetry: function (data) {
+            if (!data.error) {
+                this.modal().closeModal();
+                this.notificationListing().reload();
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html
new file mode 100644
index 0000000000000..6cff5e3ca9732
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div css="$data.additionalClasses"
+     if="error"
+     text="error"/>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html
new file mode 100644
index 0000000000000..17144a22cd32c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="action-menu-item action-close-wrapper">
+    <button class="action-close"
+            repeat="foreach: $col.getVisibleActions($row()._rowIndex), item: '$action'"
+            click="$col.getActionHandler($action())"
+            attr="{
+                title: $action().label
+            }"
+    />
+</div>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
new file mode 100644
index 0000000000000..e6559a6ede37c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
@@ -0,0 +1,43 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div id="system_messages" class="message-system" collapsible visible="totalRecords">
+    <div class="message-system-inner" outerClick="fixLoaderHeight.bind($data, true)">
+        <div class="message-system-short">
+            <button class="message-system-action-dropdown" toggleCollapsible>
+                <span>
+                    <translate args="'System Messages'"/>:
+                    <text args="totalRecords"/>
+                </span>
+            </button>
+            <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
+                <fastForEach args="data: getVisible(), as: '$col'" >
+                    <render args="$col.getBody()"/>
+                </fastForEach>
+            </div>
+        </div>
+        <div class="message-system-collapsible">
+            <ul class="message-system-list">
+                <li repeat="foreach: rows, item: '$row'">
+                    <fastForEach args="data: getVisible(), as: '$col'" >
+                        <render args="$col.getBody()"/>
+                    </fastForEach>
+                </li>
+            </ul>
+            <div class="message-system-summary" if="isAllowed">
+                <a class="action__message-log"
+                   href="#"
+                   click="dismissAll"
+                   text="dismissAllText"/>
+                <a class="action__message-log"
+                    attr="{
+                        href: link
+                    }"
+                    text="linkText"/>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
index f22cbaf46332b..904c8d0ea7794 100644
--- a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
+++ b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
@@ -84,7 +84,7 @@ public function getAllowedResourcesByUser($userType, $userId)
             $role = $this->_getUserRole($userType, $userId);
             if (!$role) {
                 throw new AuthorizationException(
-                    __('We can\'t find the role for the user you wanted.')
+                    __("The role wasn't found for the user. Verify the role and try again.")
                 );
             }
             $allowedResources = $this->getAllowedResourcesByRole($role->getId());
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Role.php b/app/code/Magento/Authorization/Model/ResourceModel/Role.php
index 633ae741b44a1..48fe65e7f8b92 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Role.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Role.php
@@ -68,6 +68,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
         }
 
         if (!$role->getTreeLevel()) {
+            $treeLevel = 0;
             if ($role->getPid() > 0) {
                 $select = $this->getConnection()->select()->from(
                     $this->getMainTable(),
@@ -79,8 +80,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
                 $binds = ['pid' => (int)$role->getPid()];
 
                 $treeLevel = $this->getConnection()->fetchOne($select, $binds);
-            } else {
-                $treeLevel = 0;
             }
 
             $role->setTreeLevel($treeLevel + 1);
diff --git a/app/code/Magento/Authorization/Setup/InstallData.php b/app/code/Magento/Authorization/Setup/InstallData.php
deleted file mode 100644
index b8b18706722a5..0000000000000
--- a/app/code/Magento/Authorization/Setup/InstallData.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Authorization\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
-use Magento\Authorization\Model\UserContextInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Authorization factory
-     *
-     * @var AuthorizationFactory
-     */
-    private $authFactory;
-
-    /**
-     * Init
-     *
-     * @param AuthorizationFactory $authFactory
-     */
-    public function __construct(AuthorizationFactory $authFactory)
-    {
-        $this->authFactory = $authFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $roleCollection = $this->authFactory->createRoleCollection()
-            ->addFieldToFilter('parent_id', 0)
-            ->addFieldToFilter('tree_level', 1)
-            ->addFieldToFilter('role_type', RoleGroup::ROLE_TYPE)
-            ->addFieldToFilter('user_id', 0)
-            ->addFieldToFilter('user_type', UserContextInterface::USER_TYPE_ADMIN)
-            ->addFieldToFilter('role_name', 'Administrators');
-
-        if ($roleCollection->count() == 0) {
-            $admGroupRole = $this->authFactory->createRole()->setData(
-                [
-                    'parent_id' => 0,
-                    'tree_level' => 1,
-                    'sort_order' => 1,
-                    'role_type' => RoleGroup::ROLE_TYPE,
-                    'user_id' => 0,
-                    'user_type' => UserContextInterface::USER_TYPE_ADMIN,
-                    'role_name' => 'Administrators',
-                ]
-            )->save();
-        } else {
-            foreach ($roleCollection as $item) {
-                $admGroupRole = $item;
-                break;
-            }
-        }
-
-        $rulesCollection = $this->authFactory->createRulesCollection()
-            ->addFieldToFilter('role_id', $admGroupRole->getId())
-            ->addFieldToFilter('resource_id', 'all');
-
-        if ($rulesCollection->count() == 0) {
-            $this->authFactory->createRules()->setData(
-                [
-                    'role_id' => $admGroupRole->getId(),
-                    'resource_id' => 'Magento_Backend::all',
-                    'privileges' => null,
-                    'permission' => 'allow',
-                ]
-            )->save();
-        } else {
-            /** @var \Magento\Authorization\Model\Rules $rule */
-            foreach ($rulesCollection as $rule) {
-                $rule->setData('resource_id', 'Magento_Backend::all')->save();
-            }
-        }
-
-        /**
-         * Delete rows by condition from authorization_rule
-         */
-        $setup->startSetup();
-
-        $tableName = $setup->getTable('authorization_rule');
-        if ($tableName) {
-            $setup->getConnection()->delete($tableName, ['resource_id = ?' => 'admin/system/tools/compiler']);
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Authorization/Setup/InstallSchema.php b/app/code/Magento/Authorization/Setup/InstallSchema.php
deleted file mode 100644
index 9471b448ea3b4..0000000000000
--- a/app/code/Magento/Authorization/Setup/InstallSchema.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Authorization\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
-            /**
-             * Create table 'authorization_role'
-             */
-            $table = $installer->getConnection()->newTable(
-                $installer->getTable('authorization_role')
-            )->addColumn(
-                'role_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Role ID'
-            )->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Parent Role ID'
-            )->addColumn(
-                'tree_level',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Role Tree Level'
-            )->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Role Sort Order'
-            )->addColumn(
-                'role_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                1,
-                ['nullable' => false, 'default' => '0'],
-                'Role Type'
-            )->addColumn(
-                'user_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'User ID'
-            )->addColumn(
-                'user_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                16,
-                ['nullable' => true, 'default' => null],
-                'User Type'
-            )->addColumn(
-                'role_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                ['nullable' => true, 'default' => null],
-                'Role Name'
-            )->addIndex(
-                $installer->getIdxName('authorization_role', ['parent_id', 'sort_order']),
-                ['parent_id', 'sort_order']
-            )->addIndex(
-                $installer->getIdxName('authorization_role', ['tree_level']),
-                ['tree_level']
-            )->setComment(
-                'Admin Role Table'
-            );
-            $installer->getConnection()->createTable($table);
-        }
-
-        if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
-            /**
-             * Create table 'authorization_rule'
-             */
-            $table = $installer->getConnection()->newTable(
-                $installer->getTable('authorization_rule')
-            )->addColumn(
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rule ID'
-            )->addColumn(
-                'role_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Role ID'
-            )->addColumn(
-                'resource_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true, 'default' => null],
-                'Resource ID'
-            )->addColumn(
-                'privileges',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                20,
-                ['nullable' => true],
-                'Privileges'
-            )->addColumn(
-                'permission',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                10,
-                [],
-                'Permission'
-            )->addIndex(
-                $installer->getIdxName('authorization_rule', ['resource_id', 'role_id']),
-                ['resource_id', 'role_id']
-            )->addIndex(
-                $installer->getIdxName('authorization_rule', ['role_id', 'resource_id']),
-                ['role_id', 'resource_id']
-            )->addForeignKey(
-                $installer->getFkName('authorization_rule', 'role_id', 'authorization_role', 'role_id'),
-                'role_id',
-                $installer->getTable('authorization_role'),
-                'role_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )->setComment(
-                'Admin Rule Table'
-            );
-            $installer->getConnection()->createTable($table);
-        }
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
new file mode 100644
index 0000000000000..84992badf65db
--- /dev/null
+++ b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Authorization\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Class InitializeAuthRoles
+ * @package Magento\Authorization\Setup\Patch
+ */
+class InitializeAuthRoles implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Authorization\Setup\AuthorizationFactory
+     */
+    private $authFactory;
+
+    /**
+     * InitializeAuthRoles constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Authorization\Setup\AuthorizationFactory $authorizationFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Authorization\Setup\AuthorizationFactory $authorizationFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->authFactory = $authorizationFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $roleCollection = $this->authFactory->createRoleCollection()
+            ->addFieldToFilter('parent_id', 0)
+            ->addFieldToFilter('tree_level', 1)
+            ->addFieldToFilter('role_type', RoleGroup::ROLE_TYPE)
+            ->addFieldToFilter('user_id', 0)
+            ->addFieldToFilter('user_type', UserContextInterface::USER_TYPE_ADMIN)
+            ->addFieldToFilter('role_name', 'Administrators');
+
+        if ($roleCollection->count() == 0) {
+            $admGroupRole = $this->authFactory->createRole()->setData(
+                [
+                    'parent_id' => 0,
+                    'tree_level' => 1,
+                    'sort_order' => 1,
+                    'role_type' => RoleGroup::ROLE_TYPE,
+                    'user_id' => 0,
+                    'user_type' => UserContextInterface::USER_TYPE_ADMIN,
+                    'role_name' => 'Administrators',
+                ]
+            )->save();
+        } else {
+            /** @var \Magento\Authorization\Model\ResourceModel\Role $item */
+            foreach ($roleCollection as $item) {
+                $admGroupRole = $item;
+                break;
+            }
+        }
+
+        $rulesCollection = $this->authFactory->createRulesCollection()
+            ->addFieldToFilter('role_id', $admGroupRole->getId())
+            ->addFieldToFilter('resource_id', 'all');
+
+        if ($rulesCollection->count() == 0) {
+            $this->authFactory->createRules()->setData(
+                [
+                    'role_id' => $admGroupRole->getId(),
+                    'resource_id' => 'Magento_Backend::all',
+                    'privileges' => null,
+                    'permission' => 'allow',
+                ]
+            )->save();
+        } else {
+            /** @var \Magento\Authorization\Model\Rules $rule */
+            foreach ($rulesCollection as $rule) {
+                $rule->setData('resource_id', 'Magento_Backend::all')->save();
+            }
+        }
+
+        /**
+         * Delete rows by condition from authorization_rule
+         */
+        $tableName = $this->moduleDataSetup->getTable('authorization_rule');
+        if ($tableName) {
+            $this->moduleDataSetup->getConnection()->delete(
+                $tableName,
+                ['resource_id = ?' => 'admin/system/tools/compiler']
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE.txt b/app/code/Magento/Authorization/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE.txt
rename to app/code/Magento/Authorization/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE_AFL.txt b/app/code/Magento/Authorization/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE_AFL.txt
rename to app/code/Magento/Authorization/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Authorization/Test/Mftf/README.md b/app/code/Magento/Authorization/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1d44ab2e73052
--- /dev/null
+++ b/app/code/Magento/Authorization/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Authorization Functional Tests
+
+The Functional Test Module for **Magento Authorization** module.
diff --git a/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php b/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
index bd1a3616a746e..cd51c0f9bc4b8 100644
--- a/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
+++ b/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
@@ -60,7 +60,7 @@ public function testGetAllowedResourcesByUserTypeCustomer()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthorizationException
-     * @expectedExceptionMessage We can't find the role for the user you wanted.
+     * @expectedExceptionMessage The role wasn't found for the user. Verify the role and try again.
      */
     public function testGetAllowedResourcesByUserRoleNotFound()
     {
@@ -78,6 +78,9 @@ public function testGetAllowedResourcesByUser()
         );
     }
 
+    /**
+     * @return AclRetriever
+     */
     protected function createAclRetriever()
     {
         $this->roleMock = $this->createPartialMock(\Magento\Authorization\Model\Role::class, ['getId', '__wakeup']);
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 65e0d2a57e36d..5f5e7c62ef83b 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/app/code/Magento/Authorization/etc/db_schema.xml
new file mode 100644
index 0000000000000..a38828eb6efca
--- /dev/null
+++ b/app/code/Magento/Authorization/etc/db_schema.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="authorization_role" resource="default" engine="innodb" comment="Admin Role Table">
+        <column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Role ID"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Parent Role ID"/>
+        <column xsi:type="smallint" name="tree_level" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Role Tree Level"/>
+        <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Role Sort Order"/>
+        <column xsi:type="varchar" name="role_type" nullable="false" length="1" default="0" comment="Role Type"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="User ID"/>
+        <column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
+        <column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="role_id"/>
+        </constraint>
+        <index referenceId="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
+            <column name="parent_id"/>
+            <column name="sort_order"/>
+        </index>
+        <index referenceId="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
+            <column name="tree_level"/>
+        </index>
+    </table>
+    <table name="authorization_rule" resource="default" engine="innodb" comment="Admin Rule Table">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Role ID"/>
+        <column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
+        <column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>
+        <column xsi:type="varchar" name="permission" nullable="true" length="10" comment="Permission"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
+                    table="authorization_rule" column="role_id" referenceTable="authorization_role"
+                    referenceColumn="role_id" onDelete="CASCADE"/>
+        <index referenceId="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
+            <column name="resource_id"/>
+            <column name="role_id"/>
+        </index>
+        <index referenceId="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
+            <column name="role_id"/>
+            <column name="resource_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Authorization/etc/db_schema_whitelist.json b/app/code/Magento/Authorization/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8c416d2a8b42c
--- /dev/null
+++ b/app/code/Magento/Authorization/etc/db_schema_whitelist.json
@@ -0,0 +1,38 @@
+{
+    "authorization_role": {
+        "column": {
+            "role_id": true,
+            "parent_id": true,
+            "tree_level": true,
+            "sort_order": true,
+            "role_type": true,
+            "user_id": true,
+            "user_type": true,
+            "role_name": true
+        },
+        "index": {
+            "AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER": true,
+            "AUTHORIZATION_ROLE_TREE_LEVEL": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "authorization_rule": {
+        "column": {
+            "rule_id": true,
+            "role_id": true,
+            "resource_id": true,
+            "privileges": true,
+            "permission": true
+        },
+        "index": {
+            "AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID": true,
+            "AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Authorization/etc/module.xml b/app/code/Magento/Authorization/etc/module.xml
index 357e36d937e50..145b1ba10d0f8 100644
--- a/app/code/Magento/Authorization/etc/module.xml
+++ b/app/code/Magento/Authorization/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Authorization" setup_version="2.0.0">
+    <module name="Magento_Authorization" >
         <sequence>
             <module name="Magento_Backend"/>
         </sequence>
diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
new file mode 100644
index 0000000000000..fb9c74d2f0ab1
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;
+
+use Magento\Framework\Phrase;
+use Magento\Payment\Block\ConfigurableInfo;
+
+/**
+ * Payment information block for Authorize.net payment method
+ */
+class PaymentDetails extends ConfigurableInfo
+{
+    /**
+     * Returns localized label for payment info block
+     *
+     * @param string $field
+     * @return string | Phrase
+     */
+    protected function getLabel($field)
+    {
+        return __($field);
+    }
+}
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
index 3ad9f470909bf..70565ea8ac65f 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php
@@ -10,12 +10,15 @@
 use Magento\Authorizenet\Model\Directpost;
 use Magento\Authorizenet\Model\DirectpostFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Psr\Log\LoggerInterface;
 
-class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment
+class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment implements CsrfAwareActionInterface
 {
     /**
      * @var LoggerInterface
@@ -48,6 +51,23 @@ public function __construct(
         $this->logger = $logger ?: $this->_objectManager->get(LoggerInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * Response action.
      * Action for Authorize.net SIM Relay Request.
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
index bdd0c4a424e99..3c1cb90e0c0a5 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Authorizenet\Controller\Directpost\Payment;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Authorizenet\Controller\Directpost\Payment;
 use Magento\Authorizenet\Helper\DataFactory;
 use Magento\Checkout\Model\Type\Onepage;
@@ -24,7 +26,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Place extends Payment
+class Place extends Payment implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Quote\Api\CartManagementInterface
@@ -122,7 +124,7 @@ public function execute()
     /**
      * Place order for checkout flow
      *
-     * @return string
+     * @return void
      */
     protected function placeCheckoutOrder()
     {
@@ -147,7 +149,7 @@ protected function placeCheckoutOrder()
             $result->setData('error', true);
             $result->setData(
                 'error_messages',
-                __('An error occurred on the server. Please try to place the order again.')
+                __('A server error stopped your order from being placed. Please try to place your order again.')
             );
         }
         if ($response instanceof Http) {
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
index d88e77d6c4e28..d562df9fb24a9 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php
@@ -6,8 +6,29 @@
  */
 namespace Magento\Authorizenet\Controller\Directpost\Payment;
 
-class Response extends \Magento\Authorizenet\Controller\Directpost\Payment
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+class Response extends \Magento\Authorizenet\Controller\Directpost\Payment implements CsrfAwareActionInterface
 {
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * Response action.
      * Action for Authorize.net SIM Relay Request.
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 0f10fd633cb5b..aeaa0cd9a3ad1 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Authorizenet\Model;
 
-use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\Method\TransparentInterface;
-use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 
 /**
  * Authorize.net DirectPost payment method model.
@@ -28,7 +27,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
     /**
      * @var string
      */
-    protected $_infoBlockType = \Magento\Payment\Block\Info::class;
+    protected $_infoBlockType = \Magento\Authorizenet\Block\Adminhtml\Order\View\Info\PaymentDetails::class;
 
     /**
      * Payment Method feature
@@ -102,7 +101,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
     protected $response;
 
     /**
-     * @var OrderSender
+     * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender
      */
     protected $orderSender;
 
@@ -123,6 +122,16 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      */
     private $psrLogger;
 
+    /**
+     * @var \Magento\Sales\Api\PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
+    /**
+     * @var \Magento\Sales\Model\Order
+     */
+    private $order;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -134,18 +143,19 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Authorizenet\Helper\Data $dataHelper
-     * @param Directpost\Request\Factory $requestFactory
-     * @param Directpost\Response\Factory $responseFactory
+     * @param \Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory
+     * @param \Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory
      * @param \Magento\Authorizenet\Model\TransactionService $transactionService
      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
-     * @param OrderSender $orderSender
+     * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender
      * @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -161,8 +171,8 @@ public function __construct(
         \Magento\Authorizenet\Helper\Data $dataHelper,
         \Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory,
         \Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory,
-        TransactionService $transactionService,
-        ZendClientFactory $httpClientFactory,
+        \Magento\Authorizenet\Model\TransactionService $transactionService,
+        \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
         \Magento\Sales\Model\OrderFactory $orderFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -170,7 +180,8 @@ public function __construct(
         \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
     ) {
         $this->orderFactory = $orderFactory;
         $this->storeManager = $storeManager;
@@ -179,6 +190,8 @@ public function __construct(
         $this->orderSender = $orderSender;
         $this->transactionRepository = $transactionRepository;
         $this->_code = static::METHOD_CODE;
+        $this->paymentFailures = $paymentFailures ? : ObjectManager::getInstance()
+            ->get(\Magento\Sales\Api\PaymentFailuresInterface::class);
 
         parent::__construct(
             $context,
@@ -358,8 +371,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
     }
 
     /**
-     * Refund the amount
-     * Need to decode last 4 digits for request.
+     * Refund the amount need to decode last 4 digits for request.
      *
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @param float $amount
@@ -561,13 +573,10 @@ public function process(array $responseData)
         $this->validateResponse();
 
         $response = $this->getResponse();
-        //operate with order
-        $orderIncrementId = $response->getXInvoiceNum();
         $responseText = $this->dataHelper->wrapGatewayError($response->getXResponseReasonText());
         $isError = false;
-        if ($orderIncrementId) {
-            /* @var $order \Magento\Sales\Model\Order */
-            $order = $this->orderFactory->create()->loadByIncrementId($orderIncrementId);
+        if ($this->getOrderIncrementId()) {
+            $order = $this->getOrderFromResponse();
             //check payment method
             $payment = $order->getPayment();
             if (!$payment || $payment->getMethod() != $this->getCode()) {
@@ -616,6 +625,14 @@ protected function fillPaymentByResponse(\Magento\Framework\DataObject $payment)
             $payment->setIsTransactionPending(true)
                 ->setIsFraudDetected(true);
         }
+
+        $additionalInformationKeys = explode(',', $this->getValue('paymentInfoKeys'));
+        foreach ($additionalInformationKeys as $paymentInfoKey) {
+            $paymentInfoValue = $response->getDataByKey($paymentInfoKey);
+            if ($paymentInfoValue !== null) {
+                $payment->setAdditionalInformation($paymentInfoKey, $paymentInfoValue);
+            }
+        }
     }
 
     /**
@@ -632,9 +649,10 @@ public function checkResponseCode()
                 return true;
             case self::RESPONSE_CODE_DECLINED:
             case self::RESPONSE_CODE_ERROR:
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText())
-                );
+                $errorMessage = $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText());
+                $order = $this->getOrderFromResponse();
+                $this->paymentFailures->handle((int)$order->getQuoteId(), $errorMessage);
+                throw new \Magento\Framework\Exception\LocalizedException($errorMessage);
             default:
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('There was a payment authorization error.')
@@ -671,6 +689,7 @@ protected function matchAmount($amount)
 
     /**
      * Operate with order using information from Authorize.net.
+     *
      * Authorize order or authorize and capture it.
      *
      * @param \Magento\Sales\Model\Order $order
@@ -688,6 +707,7 @@ protected function processOrder(\Magento\Sales\Model\Order $order)
             //decline the order (in case of wrong response code) but don't return money to customer.
             $message = $e->getMessage();
             $this->declineOrder($order, $message, false);
+
             throw $e;
         }
 
@@ -758,7 +778,7 @@ protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment
     }
 
     /**
-     * Add status comment
+     * Add status comment to history
      *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @return $this
@@ -803,12 +823,17 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
     {
         try {
             $response = $this->getResponse();
-            if ($voidPayment && $response->getXTransId() && strtoupper($response->getXType())
-                == self::REQUEST_TYPE_AUTH_ONLY
+            if ($voidPayment
+                && $response->getXTransId()
+                && strtoupper($response->getXType()) == self::REQUEST_TYPE_AUTH_ONLY
             ) {
-                $order->getPayment()->setTransactionId(null)->setParentTransactionId($response->getXTransId())->void();
+                $order->getPayment()
+                      ->setTransactionId(null)
+                      ->setParentTransactionId($response->getXTransId())
+                      ->void($response);
             }
             $order->registerCancellation($message)->save();
+            $this->_eventManager->dispatch('order_cancel_after', ['order' => $order ]);
         } catch (\Exception $e) {
             //quiet decline
             $this->getPsrLogger()->critical($e);
@@ -843,7 +868,7 @@ public function getConfigInterface()
      * Getter for specified value according to set payment method code
      *
      * @param mixed $key
-     * @param null $storeId
+     * @param mixed $storeId
      * @return mixed
      */
     public function getValue($key, $storeId = null)
@@ -903,10 +928,12 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
             $payment->setIsTransactionDenied(true);
         }
         $this->addStatusCommentOnUpdate($payment, $response, $transactionId);
-        return [];
+        return $response->getData();
     }
 
     /**
+     * Add status comment on update
+     *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @param \Magento\Framework\DataObject $response
      * @param string $transactionId
@@ -981,21 +1008,52 @@ protected function getTransactionResponse($transactionId)
     }
 
     /**
-     * @return \Psr\Log\LoggerInterface
+     * Get psr logger.
      *
+     * @return \Psr\Log\LoggerInterface
      * @deprecated 100.1.0
      */
     private function getPsrLogger()
     {
         if (null === $this->psrLogger) {
-            $this->psrLogger = \Magento\Framework\App\ObjectManager::getInstance()
+            $this->psrLogger = ObjectManager::getInstance()
                 ->get(\Psr\Log\LoggerInterface::class);
         }
         return $this->psrLogger;
     }
 
     /**
-     * Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal,
+     * Fetch order by increment id from response.
+     *
+     * @return \Magento\Sales\Model\Order
+     */
+    private function getOrderFromResponse(): \Magento\Sales\Model\Order
+    {
+        if (!$this->order) {
+            $this->order = $this->orderFactory->create();
+
+            if ($incrementId = $this->getOrderIncrementId()) {
+                $this->order = $this->order->loadByIncrementId($incrementId);
+            }
+        }
+
+        return $this->order;
+    }
+
+    /**
+     * Fetch order increment id from response.
+     *
+     * @return string
+     */
+    private function getOrderIncrementId(): string
+    {
+        return $this->getResponse()->getXInvoiceNum();
+    }
+
+    /**
+     * Checks if filter action is Report Only.
+     *
+     * Transactions that trigger this filter are processed as normal,
      * but are also reported in the Merchant Interface as triggering this filter.
      *
      * @param string $fdsFilterAction
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index d9a403e5c991e..fc78d836b6080 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -112,50 +112,50 @@ public function setDataFromOrder(
             sprintf('%.2F', $order->getBaseShippingAmount())
         );
 
-        //need to use strval() because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
+        //need to use (string) because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
         //but we need "" for null values.
         $billing = $order->getBillingAddress();
         if (!empty($billing)) {
-            $this->setXFirstName(strval($billing->getFirstname()))
-                ->setXLastName(strval($billing->getLastname()))
-                ->setXCompany(strval($billing->getCompany()))
-                ->setXAddress(strval($billing->getStreetLine(1)))
-                ->setXCity(strval($billing->getCity()))
-                ->setXState(strval($billing->getRegion()))
-                ->setXZip(strval($billing->getPostcode()))
-                ->setXCountry(strval($billing->getCountryId()))
-                ->setXPhone(strval($billing->getTelephone()))
-                ->setXFax(strval($billing->getFax()))
-                ->setXCustId(strval($billing->getCustomerId()))
-                ->setXCustomerIp(strval($order->getRemoteIp()))
-                ->setXCustomerTaxId(strval($billing->getTaxId()))
-                ->setXEmail(strval($order->getCustomerEmail()))
-                ->setXEmailCustomer(strval($paymentMethod->getConfigData('email_customer')))
-                ->setXMerchantEmail(strval($paymentMethod->getConfigData('merchant_email')));
+            $this->setXFirstName((string)$billing->getFirstname())
+                ->setXLastName((string)$billing->getLastname())
+                ->setXCompany((string)$billing->getCompany())
+                ->setXAddress((string)$billing->getStreetLine(1))
+                ->setXCity((string)$billing->getCity())
+                ->setXState((string)$billing->getRegion())
+                ->setXZip((string)$billing->getPostcode())
+                ->setXCountry((string)$billing->getCountryId())
+                ->setXPhone((string)$billing->getTelephone())
+                ->setXFax((string)$billing->getFax())
+                ->setXCustId((string)$billing->getCustomerId())
+                ->setXCustomerIp((string)$order->getRemoteIp())
+                ->setXCustomerTaxId((string)$billing->getTaxId())
+                ->setXEmail((string)$order->getCustomerEmail())
+                ->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer'))
+                ->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email'));
         }
 
         $shipping = $order->getShippingAddress();
         if (!empty($shipping)) {
             $this->setXShipToFirstName(
-                strval($shipping->getFirstname())
+                (string)$shipping->getFirstname()
             )->setXShipToLastName(
-                strval($shipping->getLastname())
+                (string)$shipping->getLastname()
             )->setXShipToCompany(
-                strval($shipping->getCompany())
+                (string)$shipping->getCompany()
             )->setXShipToAddress(
-                strval($shipping->getStreetLine(1))
+                (string)$shipping->getStreetLine(1)
             )->setXShipToCity(
-                strval($shipping->getCity())
+                (string)$shipping->getCity()
             )->setXShipToState(
-                strval($shipping->getRegion())
+                (string)$shipping->getRegion()
             )->setXShipToZip(
-                strval($shipping->getPostcode())
+                (string)$shipping->getPostcode()
             )->setXShipToCountry(
-                strval($shipping->getCountryId())
+                (string)$shipping->getCountryId()
             );
         }
 
-        $this->setXPoNum(strval($payment->getPoNumber()));
+        $this->setXPoNum((string)$payment->getPoNumber());
 
         return $this;
     }
diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php
index fef22d6c913c0..693a5b890faba 100644
--- a/app/code/Magento/Authorizenet/Model/TransactionService.php
+++ b/app/code/Magento/Authorizenet/Model/TransactionService.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Authorizenet\Model;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -124,7 +125,7 @@ protected function loadTransactionDetails(Authorizenet $context, $transactionId)
             $responseXmlDocument = new Element($responseBody);
             libxml_use_internal_errors(false);
         } catch (\Exception $e) {
-            throw new LocalizedException(__('Unable to get transaction details. Try again later.'));
+            throw new LocalizedException(__('The transaction details are unavailable. Please try again later.'));
         } finally {
             $context->debugData($debugData);
         }
@@ -132,7 +133,7 @@ protected function loadTransactionDetails(Authorizenet $context, $transactionId)
         if (!isset($responseXmlDocument->messages->resultCode)
             || $responseXmlDocument->messages->resultCode != static::PAYMENT_UPDATE_STATUS_CODE_SUCCESS
         ) {
-            throw new LocalizedException(__('Unable to get transaction details. Try again later.'));
+            throw new LocalizedException(__('The transaction details are unavailable. Please try again later.'));
         }
 
         $this->transactionDetails[$transactionId] = $responseXmlDocument;
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE.txt b/app/code/Magento/Authorizenet/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE.txt
rename to app/code/Magento/Authorizenet/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE_AFL.txt b/app/code/Magento/Authorizenet/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE_AFL.txt
rename to app/code/Magento/Authorizenet/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Authorizenet/Test/Mftf/README.md b/app/code/Magento/Authorizenet/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9391126a85c94
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Authorizenet Functional Tests
+
+The Functional Test Module for **Magento Authorizenet** module.
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
index 95ceed1ee11e7..c0a50e66759ba 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Authorizenet\Test\Unit\Controller\Directpost\Payment;
 
 use Magento\Authorizenet\Controller\Directpost\Payment\Place;
@@ -297,7 +298,9 @@ public function textExecuteFailedPlaceOrderDataProvider()
         $objectFailed1 = new \Magento\Framework\DataObject(
             [
                 'error' => true,
-                'error_messages' => __('An error occurred on the server. Please try to place the order again.')
+                'error_messages' => __(
+                    'A server error stopped your order from being placed. Please try to place your order again.'
+                )
             ]
         );
         $generalException = new \Exception('Exception logging will save the world!');
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
index 6e5d55e52675e..15c7eecb09a69 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
@@ -37,6 +37,9 @@ public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amou
         );
     }
 
+    /**
+     * @return array
+     */
     public function generateHashDataProvider()
     {
         return [
@@ -57,6 +60,13 @@ public function generateHashDataProvider()
         ];
     }
 
+    /**
+     * @param $merchantMd5
+     * @param $merchantApiLogin
+     * @param $amount
+     * @param $transactionId
+     * @return string
+     */
     protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
index dbb6ac8333c14..95c67f67852da 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Authorizenet\Test\Unit\Model;
 
+use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Framework\Simplexml\Element;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Authorizenet\Model\Directpost;
@@ -74,6 +75,14 @@ class DirectpostTest extends \PHPUnit\Framework\TestCase
      */
     protected $requestFactory;
 
+    /**
+     * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentFailures;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
@@ -104,6 +113,12 @@ protected function setUp()
             ->setMethods(['getTransactionDetails'])
             ->getMock();
 
+        $this->paymentFailures = $this->getMockBuilder(
+            PaymentFailuresInterface::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->requestFactory = $this->getRequestFactoryMock();
         $httpClientFactoryMock = $this->getHttpClientFactoryMock();
 
@@ -117,7 +132,8 @@ protected function setUp()
                 'responseFactory' => $this->responseFactoryMock,
                 'transactionRepository' => $this->transactionRepositoryMock,
                 'transactionService' => $this->transactionServiceMock,
-                'httpClientFactory' => $httpClientFactoryMock
+                'httpClientFactory' => $httpClientFactoryMock,
+                'paymentFailures' => $this->paymentFailures,
             ]
         );
     }
@@ -313,12 +329,16 @@ public function checkResponseCodeSuccessDataProvider()
     }
 
     /**
-     * @param bool $responseCode
+     * Checks response failures behaviour.
+     *
+     * @param int $responseCode
+     * @param int $failuresHandlerCalls
+     * @return void
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @dataProvider checkResponseCodeFailureDataProvider
      */
-    public function testCheckResponseCodeFailure($responseCode)
+    public function testCheckResponseCodeFailure(int $responseCode, int $failuresHandlerCalls): void
     {
         $reasonText = 'reason text';
 
@@ -333,18 +353,35 @@ public function testCheckResponseCodeFailure($responseCode)
             ->with($reasonText)
             ->willReturn(__('Gateway error: %1', $reasonText));
 
+        $orderMock = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderMock->expects($this->exactly($failuresHandlerCalls))
+            ->method('getQuoteId')
+            ->willReturn(1);
+
+        $this->paymentFailures->expects($this->exactly($failuresHandlerCalls))
+            ->method('handle')
+            ->with(1);
+
+        $reflection = new \ReflectionClass($this->directpost);
+        $order = $reflection->getProperty('order');
+        $order->setAccessible(true);
+        $order->setValue($this->directpost, $orderMock);
+
         $this->directpost->checkResponseCode();
     }
 
     /**
      * @return array
      */
-    public function checkResponseCodeFailureDataProvider()
+    public function checkResponseCodeFailureDataProvider(): array
     {
         return [
-            ['responseCode' => Directpost::RESPONSE_CODE_DECLINED],
-            ['responseCode' => Directpost::RESPONSE_CODE_ERROR],
-            ['responseCode' => 999999]
+            ['responseCode' => Directpost::RESPONSE_CODE_DECLINED, 1],
+            ['responseCode' => Directpost::RESPONSE_CODE_ERROR, 1],
+            ['responseCode' => 999999, 0],
         ];
     }
 
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index 89d3ba8045a40..4e646004d9a6d 100644
--- a/app/code/Magento/Authorizenet/composer.json
+++ b/app/code/Magento/Authorizenet/composer.json
@@ -5,23 +5,23 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
index eacf77cda1e77..3a192646b6f7e 100644
--- a/app/code/Magento/Authorizenet/etc/config.xml
+++ b/app/code/Magento/Authorizenet/etc/config.xml
@@ -32,6 +32,7 @@
                 <cgi_url>https://secure.authorize.net/gateway/transact.dll</cgi_url>
                 <cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
                 <cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
+                <paymentInfoKeys>x_card_type,x_account_number,x_avs_code,x_auth_code,x_response_reason_text,x_cvv2_resp_code</paymentInfoKeys>
             </authorizenet_directpost>
         </payment>
     </default>
diff --git a/app/code/Magento/Authorizenet/etc/di.xml b/app/code/Magento/Authorizenet/etc/di.xml
index 4beb2456be110..69d24019f2fb7 100644
--- a/app/code/Magento/Authorizenet/etc/di.xml
+++ b/app/code/Magento/Authorizenet/etc/di.xml
@@ -35,4 +35,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Authorizenet\Block\Adminhtml\Order\View\Info\PaymentDetails">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\Authorizenet\Model\Directpost</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Authorizenet/etc/module.xml b/app/code/Magento/Authorizenet/etc/module.xml
index 6d05f14d21318..a30fd34927746 100644
--- a/app/code/Magento/Authorizenet/etc/module.xml
+++ b/app/code/Magento/Authorizenet/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Authorizenet" setup_version="2.0.0">
+    <module name="Magento_Authorizenet" >
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>
diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
index bb59afffff2c6..6228d5102b13c 100644
--- a/app/code/Magento/Authorizenet/i18n/en_US.csv
+++ b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -67,3 +67,9 @@ Debug,Debug
 "Minimum Order Total","Minimum Order Total"
 "Maximum Order Total","Maximum Order Total"
 "Sort Order","Sort Order"
+"x_card_type","Credit Card Type"
+"x_account_number", "Credit Card Number"
+"x_avs_code","AVS Response Code"
+"x_auth_code","Processor Authentication Code"
+"x_response_reason_text","Processor Response Text"
+"x_cvv2_resp_code","CVV2 Response Code"
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
index 60fec263352fe..ac91fa30bfbe0 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
@@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['fraud_filters'])): ?>
-                <b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
-                </b></br>
+                <strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
+                </strong></br>
                 <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
                     <?= $block->escapeHtml($filter['name']) ?>:
                     <?= $block->escapeHtml($filter['action']) ?>
diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
index 8edc38dce6f60..8c4c90bf111de 100644
--- a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 99ee86b2b6407..fb2daa283f111 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -205,10 +205,6 @@ private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractB
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
-        if (!$this->_processUrlKeys()) {
-            return parent::dispatch($request);
-        }
-
         if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
             $this->_response->setStatusHeader(403, '1.1', 'Forbidden');
             if (!$this->_auth->isLoggedIn()) {
@@ -217,6 +213,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
             $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
             $this->_view->renderLayout();
             $this->_request->setDispatched(true);
+
             return $this->_response;
         }
 
@@ -226,6 +223,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
 
         $this->_processLocaleSettings();
 
+        // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
+        if ($this->_auth->isLoggedIn()) {
+            $this->_auth->getAuthStorage()->isFirstPageAfterLogin();
+        }
+
         return parent::dispatch($request);
     }
 
@@ -246,6 +248,9 @@ protected function _isUrlChecked()
      * Check url keys. If non valid - redirect
      *
      * @return bool
+     *
+     * @see \Magento\Backend\App\Request\BackendValidator for default
+     * request validation.
      */
     public function _processUrlKeys()
     {
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
index 68506a521c1cf..4b25e9921e404 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
+++ b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
@@ -160,7 +160,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
             } else {
                 $this->_actionFlag->set('', \Magento\Framework\App\ActionInterface::FLAG_NO_DISPATCH, true);
                 $this->_response->setRedirect($this->_url->getCurrentUrl());
-                $this->messageManager->addError(__('Invalid Form Key. Please refresh the page.'));
+                $this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
                 $isRedirectNeeded = true;
             }
         }
@@ -205,7 +205,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
             $this->_auth->login($username, $password);
         } catch (AuthenticationException $e) {
             if (!$request->getParam('messageSent')) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $request->setParam('messageSent', true);
                 $outputValue = false;
             }
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index df8b718389741..b790a2edc3fab 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -42,6 +42,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }
diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
new file mode 100644
index 0000000000000..4d04d2fed8eb2
--- /dev/null
+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backend\App\Request;
+
+use Magento\Backend\App\AbstractAction;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\Request\ValidatorInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Backend\Model\Auth;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Controller\Result\Raw as RawResult;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\Backend\Model\UrlInterface as BackendUrl;
+use Magento\Framework\Phrase;
+
+/**
+ * Do backend validations.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BackendValidator implements ValidatorInterface
+{
+    /**
+     * @var Auth
+     */
+    private $auth;
+
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @var BackendUrl
+     */
+    private $backendUrl;
+
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactory;
+
+    /**
+     * @var RawFactory
+     */
+    private $rawResultFactory;
+
+    /**
+     * @param Auth $auth
+     * @param FormKeyValidator $formKeyValidator
+     * @param BackendUrl $backendUrl
+     * @param RedirectFactory $redirectFactory
+     * @param RawFactory $rawResultFactory
+     */
+    public function __construct(
+        Auth $auth,
+        FormKeyValidator $formKeyValidator,
+        BackendUrl $backendUrl,
+        RedirectFactory $redirectFactory,
+        RawFactory $rawResultFactory
+    ) {
+        $this->auth = $auth;
+        $this->formKeyValidator = $formKeyValidator;
+        $this->backendUrl = $backendUrl;
+        $this->redirectFactory = $redirectFactory;
+        $this->rawResultFactory = $rawResultFactory;
+    }
+
+    /**
+     * Validate request
+     *
+     * @param RequestInterface $request
+     * @param ActionInterface $action
+     *
+     * @return bool
+     */
+    private function validateRequest(
+        RequestInterface $request,
+        ActionInterface $action
+    ): bool {
+        /** @var bool|null $valid */
+        $valid = null;
+
+        if ($action instanceof CsrfAwareActionInterface) {
+            $valid = $action->validateForCsrf($request);
+        }
+
+        if ($valid === null) {
+            $validFormKey = true;
+            $validSecretKey = true;
+            if ($request instanceof HttpRequest && $request->isPost()) {
+                $validFormKey = $this->formKeyValidator->validate($request);
+            } elseif ($this->auth->isLoggedIn()
+                && $this->backendUrl->useSecretKey()
+            ) {
+                $secretKeyValue = (string)$request->getParam(
+                    BackendUrl::SECRET_KEY_PARAM_NAME,
+                    null
+                );
+                $secretKey = $this->backendUrl->getSecretKey();
+                $validSecretKey = ($secretKeyValue === $secretKey);
+            }
+            $valid = $validFormKey && $validSecretKey;
+        }
+
+        return $valid;
+    }
+
+    /**
+     * Create exception
+     *
+     * @param RequestInterface $request
+     * @param ActionInterface $action
+     *
+     * @return InvalidRequestException
+     */
+    private function createException(
+        RequestInterface $request,
+        ActionInterface $action
+    ): InvalidRequestException {
+        /** @var InvalidRequestException|null $exception */
+        $exception = null;
+
+        if ($action instanceof CsrfAwareActionInterface) {
+            $exception = $action->createCsrfValidationException($request);
+        }
+
+        if ($exception === null) {
+            if ($request instanceof HttpRequest && $request->isAjax()) {
+                //Sending empty response for AJAX request since we don't know
+                //the expected response format and it's pointless to redirect.
+                /** @var RawResult $response */
+                $response = $this->rawResultFactory->create();
+                $response->setHttpResponseCode(401);
+                $response->setContents('');
+                $exception = new InvalidRequestException($response);
+            } else {
+                //For regular requests.
+                $response = $this->redirectFactory->create()
+                    ->setUrl($this->backendUrl->getStartupPageUrl());
+                $exception = new InvalidRequestException(
+                    $response,
+                    [
+                        new Phrase(
+                            'Invalid security or form key. Please refresh the page.'
+                        )
+                    ]
+                );
+            }
+        }
+
+        return $exception;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void {
+        if ($action instanceof AbstractAction) {
+            //Abstract Action has built-in validation.
+            if (!$action->_processUrlKeys()) {
+                throw new InvalidRequestException($action->getResponse());
+            }
+        } else {
+            //Fallback validation.
+            if (!$this->validateRequest($request, $action)) {
+                throw $this->createException($request, $action);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
index e14358396aa70..82c36bf3a1fe4 100644
--- a/app/code/Magento/Backend/Block/Cache.php
+++ b/app/code/Magento/Backend/Block/Cache.php
@@ -22,24 +22,29 @@ protected function _construct()
         $this->_headerText = __('Cache Storage Management');
         parent::_construct();
         $this->buttonList->remove('add');
-        $this->buttonList->add(
-            'flush_magento',
-            [
-                'label' => __('Flush Magento Cache'),
-                'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')',
-                'class' => 'primary flush-cache-magento'
-            ]
-        );
 
-        $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
-        $this->buttonList->add(
-            'flush_system',
-            [
-                'label' => __('Flush Cache Storage'),
-                'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')',
-                'class' => 'flush-cache-storage'
-            ]
-        );
+        if ($this->_authorization->isAllowed('Magento_Backend::flush_magento_cache')) {
+            $this->buttonList->add(
+                'flush_magento',
+                [
+                    'label' => __('Flush Magento Cache'),
+                    'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')',
+                    'class' => 'primary flush-cache-magento'
+                ]
+            );
+        }
+
+        if ($this->_authorization->isAllowed('Magento_Backend::flush_cache_storage')) {
+            $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
+            $this->buttonList->add(
+                'flush_system',
+                [
+                    'label' => __('Flush Cache Storage'),
+                    'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')',
+                    'class' => 'flush-cache-storage'
+                ]
+            );
+        }
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Cache/Permissions.php b/app/code/Magento/Backend/Block/Cache/Permissions.php
new file mode 100644
index 0000000000000..272a603145f09
--- /dev/null
+++ b/app/code/Magento/Backend/Block/Cache/Permissions.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Block\Cache;
+
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Class Permissions
+ */
+class Permissions implements ArgumentInterface
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * Permissions constructor.
+     *
+     * @param AuthorizationInterface $authorization
+     */
+    public function __construct(AuthorizationInterface $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasAccessToFlushCatalogImages()
+    {
+        return $this->authorization->isAllowed('Magento_Backend::flush_catalog_images');
+    }
+    /**
+     * @return bool
+     */
+    public function hasAccessToFlushJsCss()
+    {
+        return $this->authorization->isAllowed('Magento_Backend::flush_js_css');
+    }
+    /**
+     * @return bool
+     */
+    public function hasAccessToFlushStaticFiles()
+    {
+        return $this->authorization->isAllowed('Magento_Backend::flush_static_files');
+    }
+    /**
+     * @return bool
+     */
+    public function hasAccessToAdditionalActions()
+    {
+        return ($this->hasAccessToFlushCatalogImages()
+                || $this->hasAccessToFlushJsCss()
+                || $this->hasAccessToFlushStaticFiles());
+    }
+}
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index 8d0a061621fe3..e1e87d8d4c5a3 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -20,7 +20,7 @@ class Dashboard extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'dashboard/index.phtml';
+    protected $_template = 'Magento_Backend::dashboard/index.phtml';
 
     /**
      * @return void
diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php
index 29557f12c1093..7ccb2d51ccd1b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Bar.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php
@@ -38,14 +38,6 @@ public function getTotals()
      */
     public function addTotal($label, $value, $isQuantity = false)
     {
-        /*if (!$isQuantity) {
-          $value = $this->format($value);
-          $decimals = substr($value, -2);
-          $value = substr($value, 0, -2);
-          } else {
-          $value = ($value != '')?$value:0;
-          $decimals = '';
-          }*/
         if (!$isQuantity) {
             $value = $this->format($value);
         }
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index 301dffbdc4987..8e238ccab44cb 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * @var string
      */
-    protected $_template = 'dashboard/graph.phtml';
+    protected $_template = 'Magento_Backend::dashboard/graph.phtml';
 
     /**
      * Adminhtml dashboard data
diff --git a/app/code/Magento/Backend/Block/Dashboard/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Grid.php
index 602b5e414d538..f7f9a79f17eb0 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Grid.php
@@ -17,7 +17,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     /**
      * @var string
      */
-    protected $_template = 'dashboard/grid.phtml';
+    protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
     /**
      * Setting default for every grid on dashboard
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index 9d9409fba093b..50279786c0a5b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -92,7 +92,7 @@ protected function _prepareCollection()
     protected function _afterLoadCollection()
     {
         foreach ($this->getCollection() as $item) {
-            $item->getCustomer() ?: $item->setCustomer('Guest');
+            $item->getCustomer() ?: $item->setCustomer($item->getBillingAddress()->getName());
         }
         return $this;
     }
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index d0f056230bcd1..6d7a4d6458a8e 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -15,7 +15,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/salebar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index 96ae6dd636380..4dcda3677584c 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -16,7 +16,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/totalbar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php b/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php
new file mode 100644
index 0000000000000..9c17b0e5538f4
--- /dev/null
+++ b/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Block\DataProviders;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Backend\Model\Image\UploadResizeConfigInterface;
+
+/**
+ * Provides additional data for image uploader
+ */
+class ImageUploadConfig implements ArgumentInterface
+{
+    /**
+     * @var UploadResizeConfigInterface
+     */
+    private $imageUploadConfig;
+
+    /**
+     * @param UploadResizeConfigInterface $imageUploadConfig
+     */
+    public function __construct(UploadResizeConfigInterface $imageUploadConfig)
+    {
+        $this->imageUploadConfig = $imageUploadConfig;
+    }
+
+    /**
+     * Get image resize configuration
+     *
+     * @return int
+     */
+    public function getIsResizeEnabled(): int
+    {
+        return (int)$this->imageUploadConfig->isResizeEnabled();
+    }
+}
diff --git a/app/code/Magento/Backend/Block/GlobalSearch.php b/app/code/Magento/Backend/Block/GlobalSearch.php
index f4a46283808f4..3cea12fea205c 100644
--- a/app/code/Magento/Backend/Block/GlobalSearch.php
+++ b/app/code/Magento/Backend/Block/GlobalSearch.php
@@ -31,6 +31,7 @@ public function getWidgetInitOptions()
                 'filterProperty' => 'name',
                 'preventClickPropagation' => false,
                 'minLength' => 2,
+                'submitInputOnEnter' => false,
             ]
         ];
     }
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
index 5bad74d8a8be5..84fa487281ac8 100644
--- a/app/code/Magento/Backend/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\Media;
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Image\Adapter\UploadConfigInterface;
+use Magento\Backend\Model\Image\UploadResizeConfigInterface;
 
 /**
  * Adminhtml media library uploader
@@ -35,24 +39,46 @@ class Uploader extends \Magento\Backend\Block\Widget
      */
     private $jsonEncoder;
 
+    /**
+     * @var UploadResizeConfigInterface
+     */
+    private $imageUploadConfig;
+
+    /**
+     * @var UploadConfigInterface
+     * @deprecated
+     * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface
+     */
+    private $imageConfig;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\File\Size $fileSize
      * @param array $data
      * @param Json $jsonEncoder
+     * @param UploadConfigInterface $imageConfig
+     * @param UploadResizeConfigInterface $imageUploadConfig
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\File\Size $fileSize,
         array $data = [],
-        Json $jsonEncoder = null
+        Json $jsonEncoder = null,
+        UploadConfigInterface $imageConfig = null,
+        UploadResizeConfigInterface $imageUploadConfig = null
     ) {
         $this->_fileSizeService = $fileSize;
         $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
+        $this->imageConfig = $imageConfig
+            ?: ObjectManager::getInstance()->get(UploadConfigInterface::class);
+        $this->imageUploadConfig = $imageUploadConfig
+            ?: ObjectManager::getInstance()->get(UploadResizeConfigInterface::class);
         parent::__construct($context, $data);
     }
 
     /**
+     * Initialize block.
+     *
      * @return void
      */
     protected function _construct()
@@ -90,6 +116,26 @@ public function getFileSizeService()
         return $this->_fileSizeService;
     }
 
+    /**
+     * Get Image Upload Maximum Width Config.
+     *
+     * @return int
+     */
+    public function getImageUploadMaxWidth()
+    {
+        return $this->imageUploadConfig->getMaxWidth();
+    }
+
+    /**
+     * Get Image Upload Maximum Height Config.
+     *
+     * @return int
+     */
+    public function getImageUploadMaxHeight()
+    {
+        return $this->imageUploadConfig->getMaxHeight();
+    }
+
     /**
      * Prepares layout and set element renderer
      *
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index d6bdeb4ea8968..1e2561e2efe05 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -9,12 +9,12 @@
 /**
  * Backend menu block
  *
- * @api
- * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
+ * @method $this setAdditionalCacheKeyInfo(array $cacheKeyInfo)
  * @method array getAdditionalCacheKeyInfo()
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Menu extends \Magento\Backend\Block\Template
 {
@@ -75,7 +75,12 @@ class Menu extends \Magento\Backend\Block\Template
     private $anchorRenderer;
 
     /**
-     * @param Template\Context $context
+     * @var \Magento\Framework\App\Route\ConfigInterface
+     */
+    private $routeConfig;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Model\UrlInterface $url
      * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
@@ -84,6 +89,9 @@ class Menu extends \Magento\Backend\Block\Template
      * @param array $data
      * @param MenuItemChecker|null $menuItemChecker
      * @param AnchorRenderer|null $anchorRenderer
+     * @param \Magento\Framework\App\Route\ConfigInterface|null $routeConfig
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -94,7 +102,8 @@ public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = [],
         MenuItemChecker $menuItemChecker = null,
-        AnchorRenderer $anchorRenderer = null
+        AnchorRenderer $anchorRenderer = null,
+        \Magento\Framework\App\Route\ConfigInterface $routeConfig = null
     ) {
         $this->_url = $url;
         $this->_iteratorFactory = $iteratorFactory;
@@ -103,6 +112,9 @@ public function __construct(
         $this->_localeResolver = $localeResolver;
         $this->menuItemChecker =  $menuItemChecker;
         $this->anchorRenderer = $anchorRenderer;
+        $this->routeConfig = $routeConfig ?:
+            \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\App\Route\ConfigInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -130,6 +142,7 @@ protected function _getAnchorLabel($menuItem)
 
     /**
      * Render menu item mouse events
+     *
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @return string
      */
@@ -203,8 +216,9 @@ protected function _afterToHtml($html)
      */
     protected function _callbackSecretKey($match)
     {
+        $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
         return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
-            $match[1],
+            $routeId ?: $match[1],
             $match[2],
             $match[3]
         );
@@ -342,7 +356,7 @@ protected function _columnBrake($items, $limit)
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @param int $level
      * @param int $limit
-     * @param $id int
+     * @param int|null $id
      * @return string HTML code
      */
     protected function _addSubMenu($menuItem, $level, $limit, $id = null)
@@ -352,7 +366,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 +401,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 +419,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/Page/Copyright.php b/app/code/Magento/Backend/Block/Page/Copyright.php
index 062497d6a8304..a1b61352930b5 100644
--- a/app/code/Magento/Backend/Block/Page/Copyright.php
+++ b/app/code/Magento/Backend/Block/Page/Copyright.php
@@ -18,5 +18,5 @@ class Copyright extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'page/copyright.phtml';
+    protected $_template = 'Magento_Backend::page/copyright.phtml';
 }
diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
index 368869b79e15c..e0c173a4cbfec 100644
--- a/app/code/Magento/Backend/Block/Page/Footer.php
+++ b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -17,7 +17,7 @@ class Footer extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/footer.phtml';
+    protected $_template = 'Magento_Backend::page/footer.phtml';
 
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface
@@ -40,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -57,4 +57,12 @@ public function getMagentoVersion()
     {
         return $this->productMetadata->getVersion();
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getCacheLifetime()
+    {
+        return 3600 * 24 * 10;
+    }
 }
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index b7ed05ce58e95..c2c5f7472b370 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/header.phtml';
+    protected $_template = 'Magento_Backend::page/header.phtml';
 
     /**
      * Backend data
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
index 2f9b73f0ae037..6fe8416784c2e 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -25,7 +25,7 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset.phtml';
 
     /**
      * Retrieve an element
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
index ddd1f1a9178cd..71d4db6849bd2 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
@@ -23,7 +23,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset/element.phtml';
 
     /**
      * Retrieve an element
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
index e479e8f560dae..47a156c16ce3e 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Block\System\Store\Delete;
 
+use Magento\Backup\Helper\Data as BackupHelper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml cms block edit form
  *
@@ -12,6 +15,25 @@
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
+    /**
+     * @var BackupHelper
+     */
+    private $backup;
+
+    /**
+     * @inheritDoc
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        array $data = [],
+        ?BackupHelper $backup = null
+    ) {
+        parent::__construct($context, $registry, $formFactory, $data);
+        $this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class);
+    }
+
     /**
      * Init form
      *
@@ -25,7 +47,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function _prepareForm()
     {
@@ -45,6 +67,12 @@ protected function _prepareForm()
 
         $fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);
 
+        $backupOptions = ['0' => __('No')];
+        $backupSelected = '0';
+        if ($this->backup->isEnabled()) {
+            $backupOptions['1'] = __('Yes');
+            $backupSelected = '1';
+        }
         $fieldset->addField(
             'create_backup',
             'select',
@@ -52,8 +80,8 @@ protected function _prepareForm()
                 'label' => __('Create DB Backup'),
                 'title' => __('Create DB Backup'),
                 'name' => 'create_backup',
-                'options' => ['1' => __('Yes'), '0' => __('No')],
-                'value' => '1'
+                'options' => $backupOptions,
+                'value' => $backupSelected
             ]
         );
 
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
index ae80b56066a6d..e95f3bbf9f8c1 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
@@ -19,7 +19,7 @@ protected function _prepareLayout()
     {
         $itemId = $this->getRequest()->getParam('group_id');
 
-        $this->setTemplate('system/store/delete_group.phtml');
+        $this->setTemplate('Magento_Backend::system/store/delete_group.phtml');
         $this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', ['group_id' => $itemId]));
         $this->addChild(
             'confirm_deletion_button',
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
index da28a471130cc..82cbb780137b8 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
@@ -19,7 +19,7 @@ protected function _prepareLayout()
     {
         $itemId = $this->getRequest()->getParam('website_id');
 
-        $this->setTemplate('system/store/delete_website.phtml');
+        $this->setTemplate('Magento_Backend::system/store/delete_website.phtml');
         $this->setAction($this->getUrl('adminhtml/*/deleteWebsitePost', ['website_id' => $itemId]));
         $this->addChild(
             'confirm_deletion_button',
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
index f19799d2e4939..034887c67d1ee 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
@@ -37,7 +37,7 @@ protected function _prepareForm()
             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
         );
 
-        $this->_prepareStoreFieldSet($form);
+        $this->_prepareStoreFieldset($form);
 
         $form->addField(
             'store_type',
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 59657f38465d7..3d7154eb20f92 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 23b2de683a958..9cfc8bfc52691 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 913e2c903d20c..487eb4f8acfda 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/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index d0f39b54c1492..3ae4451a2592f 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block;
 
 /**
@@ -17,10 +20,12 @@
  * Example:
  * <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
  *      <arguments>
- *          <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
+ *          <argument name="view_model" xsi:type="object">My\Module\ViewModel\Custom</argument>
  *      </arguments>
  * </block>
  *
+ * Your class object can then be accessed by doing $block->getViewModel()
+ *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
index 94af9a1d7578f..5a792ddb39132 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
@@ -7,6 +7,8 @@
 namespace Magento\Backend\Block\Widget\Button;
 
 /**
+ * Button list widget
+ *
  * @api
  * @since 100.0.2
  */
@@ -127,12 +129,6 @@ public function getItems()
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
-        $sortOrderA = intval($itemA->getSortOrder());
-        $sortOrderB = intval($itemB->getSortOrder());
-
-        if ($sortOrderA == $sortOrderB) {
-            return 0;
-        }
-        return ($sortOrderA < $sortOrderB) ? -1 : 1;
+        return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php
index 30221618edbed..38d5d90a22d15 100644
--- a/app/code/Magento/Backend/Block/Widget/Form.php
+++ b/app/code/Magento/Backend/Block/Widget/Form.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backend form widget
  *
@@ -27,13 +30,23 @@ class Form extends \Magento\Backend\Block\Widget
      */
     protected $_template = 'Magento_Backend::widget/form.phtml';
 
+    /** @var Form\Element\ElementCreator */
+    private $creator;
+
     /**
+     * Constructs form
+     *
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
+     * @param Form\Element\ElementCreator|null $creator
      */
-    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
-    {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        Form\Element\ElementCreator $creator = null
+    ) {
         parent::__construct($context, $data);
+        $this->creator = $creator ?: ObjectManager::getInstance()->get(Form\Element\ElementCreator::class);
     }
 
     /**
@@ -46,7 +59,6 @@ protected function _construct()
         parent::_construct();
 
         $this->setDestElementId('edit_form');
-        $this->setShowGlobalIcon(false);
     }
 
     /**
@@ -148,6 +160,7 @@ protected function _beforeToHtml()
 
     /**
      * Initialize form fields values
+     *
      * Method will be called after prepareForm and can be used for field values initialization
      *
      * @return $this
@@ -173,32 +186,11 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
             if (!$this->_isAttributeVisible($attribute)) {
                 continue;
             }
-            if (($inputType = $attribute->getFrontend()->getInputType()) && !in_array(
-                $attribute->getAttributeCode(),
-                $exclude
-            ) && ('media_image' != $inputType || $attribute->getAttributeCode() == 'image')
+            if (($inputType = $attribute->getFrontend()->getInputType())
+                && !in_array($attribute->getAttributeCode(), $exclude)
+                && ('media_image' !== $inputType || $attribute->getAttributeCode() == 'image')
             ) {
-                $fieldType = $inputType;
-                $rendererClass = $attribute->getFrontend()->getInputRendererClass();
-                if (!empty($rendererClass)) {
-                    $fieldType = $inputType . '_' . $attribute->getAttributeCode();
-                    $fieldset->addType($fieldType, $rendererClass);
-                }
-
-                $element = $fieldset->addField(
-                    $attribute->getAttributeCode(),
-                    $fieldType,
-                    [
-                        'name' => $attribute->getAttributeCode(),
-                        'label' => $attribute->getFrontend()->getLocalizedLabel(),
-                        'class' => $attribute->getFrontend()->getClass(),
-                        'required' => $attribute->getIsRequired(),
-                        'note' => $attribute->getNote()
-                    ]
-                )->setEntityAttribute(
-                    $attribute
-                );
-
+                $element = $this->creator->create($fieldset, $attribute);
                 $element->setAfterElementHtml($this->_getAdditionalElementHtml($element));
 
                 $this->_applyTypeSpecificConfig($inputType, $element, $attribute);
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index 8b7babc1bb9b6..97116de6db79b 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -93,7 +93,7 @@ protected function _construct()
                     'class' => 'delete',
                     'onclick' => 'deleteConfirm(\'' . __(
                         'Are you sure you want to do this?'
-                    ) . '\', \'' . $this->getDeleteUrl() . '\')'
+                    ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})'
                 ]
             );
         }
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index 723deab1e9f7e..d599d5fbad5e0 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -4,14 +4,13 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Backend\Block\Widget\Form\Element;
+
 /**
  * Form element dependencies mapper
  * Assumes that one element may depend on other element values.
  * Will toggle as "enabled" only if all elements it depends from toggle as true.
- */
-namespace Magento\Backend\Block\Widget\Form\Element;
-
-/**
+ *
  * @api
  * @since 100.0.2
  */
@@ -117,6 +116,7 @@ public function addConfigOptions(array $options)
 
     /**
      * HTML output getter
+     *
      * @return string
      */
     protected function _toHtml()
@@ -124,18 +124,23 @@ protected function _toHtml()
         if (!$this->_depends) {
             return '';
         }
-        return '<script>
-            require(["mage/adminhtml/form"], function(){
-        new FormElementDependenceController(' .
-            $this->_getDependsJson() .
-            ($this->_configOptions ? ', ' .
-            $this->_jsonEncoder->encode(
-                $this->_configOptions
-            ) : '') . '); });</script>';
+
+        $params = $this->_getDependsJson();
+
+        if ($this->_configOptions) {
+            $params .= ', ' .  $this->_jsonEncoder->encode($this->_configOptions);
+        }
+
+        return "<script>
+require(['mage/adminhtml/form'], function(){
+    new FormElementDependenceController({$params});
+});
+</script>";
     }
 
     /**
-     * Field dependences JSON map generator
+     * Field dependencies JSON map generator
+     *
      * @return string
      */
     protected function _getDependsJson()
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
new file mode 100644
index 0000000000000..b9cdd259796d0
--- /dev/null
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Block\Widget\Form\Element;
+
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+
+/**
+ * Class ElementCreator
+ *
+ * @deprecated 100.3.0 in favour of UI component implementation
+ * @package Magento\Backend\Block\Widget\Form\Element
+ */
+class ElementCreator
+{
+    /**
+     * @var array
+     */
+    private $modifiers;
+
+    /**
+     * ElementCreator constructor.
+     *
+     * @param array $modifiers
+     */
+    public function __construct(array $modifiers = [])
+    {
+        $this->modifiers = $modifiers;
+    }
+
+    /**
+     * Creates element
+     *
+     * @param Fieldset $fieldset
+     * @param Attribute $attribute
+     *
+     * @return AbstractElement
+     */
+    public function create(Fieldset $fieldset, Attribute $attribute): AbstractElement
+    {
+        $config = $this->getElementConfig($attribute);
+
+        if (!empty($config['rendererClass'])) {
+            $fieldType = $config['inputType'] . '_' . $attribute->getAttributeCode();
+            $fieldset->addType($fieldType, $config['rendererClass']);
+        }
+
+        return $fieldset
+            ->addField($config['attribute_code'], $config['inputType'], $config)
+            ->setEntityAttribute($attribute);
+    }
+
+    /**
+     * Returns element config
+     *
+     * @param Attribute $attribute
+     * @return array
+     */
+    private function getElementConfig(Attribute $attribute): array
+    {
+        $defaultConfig = $this->createDefaultConfig($attribute);
+        $config = $this->modifyConfig($defaultConfig);
+
+        $config['label'] = __($config['label']);
+
+        return $config;
+    }
+
+    /**
+     * Returns default config
+     *
+     * @param Attribute $attribute
+     * @return array
+     */
+    private function createDefaultConfig(Attribute $attribute): array
+    {
+        return [
+            'inputType' => $attribute->getFrontend()->getInputType(),
+            'rendererClass' => $attribute->getFrontend()->getInputRendererClass(),
+            'attribute_code' => $attribute->getAttributeCode(),
+            'name' => $attribute->getAttributeCode(),
+            'label' => $attribute->getFrontend()->getLabel(),
+            'class' => $attribute->getFrontend()->getClass(),
+            'required' => $attribute->getIsRequired(),
+            'note' => $attribute->getNote(),
+        ];
+    }
+
+    /**
+     *  Modify config
+     *
+     * @param array $config
+     * @return array
+     */
+    private function modifyConfig(array $config): array
+    {
+        if ($this->isModified($config['attribute_code'])) {
+            return $this->applyModifier($config);
+        }
+        return $config;
+    }
+
+    /**
+     * Returns bool if attribute need to modify
+     *
+     * @param string $attribute_code
+     * @return bool
+     */
+    private function isModified($attribute_code): bool
+    {
+        return isset($this->modifiers[$attribute_code]);
+    }
+
+    /**
+     * Apply modifier to config
+     *
+     * @param array $config
+     * @return array
+     */
+    private function applyModifier(array $config): array
+    {
+        $modifiedConfig = $this->modifiers[$config['attribute_code']];
+        foreach (array_keys($config) as $key) {
+            if (isset($modifiedConfig[$key])) {
+                $config[$key] = $modifiedConfig[$key];
+            }
+        }
+        return $config;
+    }
+}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 72ab5a265d808..66298d23389fb 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -12,7 +12,7 @@
  * @api
  * @deprecated 100.2.0 in favour of UI component implementation
  * @method string getRowClickCallback() getRowClickCallback()
- * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback() setRowClickCallback(string $value)
+ * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback(string $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 100.0.2
  */
@@ -150,7 +150,10 @@ public function __construct(
     }
 
     /**
+     * Internal constructor, that is called from real constructor
+     *
      * @return void
+     *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _construct()
@@ -709,6 +712,7 @@ public function getGridUrl()
 
     /**
      * Grid url getter
+     *
      * Version of getGridUrl() but with parameters
      *
      * @param array $params url parameters
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 40a5d92c56b6f..632603d389d21 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -127,7 +127,7 @@ public function getHtml()
 
     /**
      * @param string|null $index
-     * @return string
+     * @return array|string|int|float|null
      */
     public function getEscapedValue($index = null)
     {
@@ -138,6 +138,11 @@ public function getEscapedValue($index = null)
                 $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)
             );
         }
+
+        if (is_string($value)) {
+            return $this->escapeHtml($value);
+        }
+
         return $value;
     }
 
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 96b3471db845e..1d8d658267020 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -26,7 +26,6 @@ public function getValue($index = null)
     {
         if ($index) {
             if ($data = $this->getData('value', 'orig_' . $index)) {
-                // date('Y-m-d', strtotime($data));
                 return $data;
             }
             return null;
@@ -140,8 +139,8 @@ public function getHtml()
     /**
      * Return escaped value for calendar
      *
-     * @param string $index
-     * @return string
+     * @param string|null $index
+     * @return array|string|int|float|null
      */
     public function getEscapedValue($index = null)
     {
@@ -150,6 +149,11 @@ public function getEscapedValue($index = null)
             if ($value instanceof \DateTimeInterface) {
                 return $this->_localeDate->formatDateTime($value);
             }
+
+            if (is_string($value)) {
+                return $this->escapeHtml($value);
+            }
+
             return $value;
         }
 
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
index 2cbe264c5f396..479a2b6b20293 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
@@ -31,8 +31,7 @@ public function getCondition()
     {
         if ($this->getValue()) {
             return $this->getColumn()->getValue();
-        } else {
-            return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
         }
+        return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index d49ad2941146b..a0907726ccc46 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
 
+/**
+ * Theme grid filter
+ */
 class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     /**
@@ -54,7 +57,8 @@ public function getHtml()
     }
 
     /**
-     * Retrieve options setted in column.
+     * Retrieve options set in column.
+     *
      * Or load if options was not set.
      *
      * @return array
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index ff0399e4f507f..03566bce3fc34 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -68,10 +68,7 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
-            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-            'default'
-        );
+        $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
         $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 
@@ -85,7 +82,7 @@ public function render(\Magento\Framework\DataObject $row)
     {
         if ($data = (string)$this->_getValue($row)) {
             $currency_code = $this->_getCurrencyCode($row);
-            $data = floatval($data) * $this->_getRate($row);
+            $data = (float)$data * $this->_getRate($row);
             $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -121,10 +118,10 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return floatval($rate);
+            return (float)$rate;
         }
         if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return floatval($rate);
+            return (float)$rate;
         }
         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
index 320713f8b57c4..a611e91f32f00 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function _getCheckboxHtml($value, $checked)
     {
-        $id = 'id_' . rand(0, 999);
+        $id = 'id_' . random_int(0, 999);
         $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
         $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
         $html .= 'id="' . $id . '" data-role="select-row"';
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
index e4300c63485f5..9da23af83f036 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
                 return $data;
             }
 
-            $data = floatval($data) * $this->_getRate($row);
+            $data = (float)$data * $this->_getRate($row);
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
             return $data;
@@ -94,10 +94,10 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return floatval($rate);
+            return (float)$rate;
         }
         if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return floatval($rate);
+            return (float)$rate;
         }
         return 1;
     }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 1a6f937f1171d..9443ffefbc0df 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -258,7 +258,8 @@ public function getRowUrl($item)
      */
     public function getMultipleRows($item)
     {
-        return $item->getChildren();
+        $children = $item->getChildren();
+        return $children ?: [];
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
index d9b00d2ba2503..662cbedaed8db 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
@@ -3,8 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget\Grid;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Json\EncoderInterface;
+
 /**
  * Grid widget massaction default block
  *
@@ -14,4 +21,72 @@
  */
 class Massaction extends \Magento\Backend\Block\Widget\Grid\Massaction\AbstractMassaction
 {
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * Map bind item id to a particular acl type
+     * itemId => acl
+     *
+     * @var array
+     */
+    private $restrictions = [
+        'enable'  => 'Magento_Backend::toggling_cache_type',
+        'disable' => 'Magento_Backend::toggling_cache_type',
+        'refresh' => 'Magento_Backend::refresh_cache_type',
+    ];
+
+    /**
+     * Massaction constructor.
+     *
+     * @param Context $context
+     * @param EncoderInterface $jsonEncoder
+     * @param array $data
+     * @param AuthorizationInterface $authorization
+     */
+    public function __construct(
+        Context $context,
+        EncoderInterface $jsonEncoder,
+        array $data = [],
+        AuthorizationInterface $authorization = null
+    ) {
+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
+
+        parent::__construct($context, $jsonEncoder, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string $itemId
+     * @param array|DataObject $item
+     *
+     * @return $this
+     */
+    public function addItem($itemId, $item)
+    {
+        if (!$this->isRestricted($itemId)) {
+            parent::addItem($itemId, $item);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check if access to action restricted
+     *
+     * @param string $itemId
+     *
+     * @return bool
+     */
+    private function isRestricted(string $itemId): bool
+    {
+        if (!key_exists($itemId, $this->restrictions)) {
+            return false;
+        }
+
+        return !$this->authorization->isAllowed($this->restrictions[$itemId]);
+    }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 8252ed1a1e2f8..9890a10a4ceb0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget\Grid\Massaction;
 
 use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
+use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\DataObject;
 
 /**
@@ -51,13 +53,13 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
         parent::_construct();
 
-        $this->setErrorText($this->escapeHtml(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('An item needs to be selected. Select and try again.')));
 
         if (null !== $this->getOptions()) {
             foreach ($this->getOptions() as $optionId => $option) {
@@ -216,30 +218,30 @@ public function getGridJsObjectName()
      * Retrieve JSON string of selected checkboxes
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSelectedJson()
     {
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
      * Retrieve array of selected checkboxes
      *
      * @return string[]
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSelected()
     {
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**
@@ -253,6 +255,8 @@ public function getApplyButtonHtml()
     }
 
     /**
+     * Get mass action javascript code.
+     *
      * @return string
      */
     public function getJavaScript()
@@ -269,6 +273,8 @@ public function getJavaScript()
     }
 
     /**
+     * Get grid ids in JSON format.
+     *
      * @return string
      */
     public function getGridIdsJson()
@@ -278,13 +284,18 @@ public function getGridIdsJson()
         }
         /** @var \Magento\Framework\Data\Collection $allIdsCollection */
         $allIdsCollection = clone $this->getParentBlock()->getCollection();
-        
+
         if ($this->getMassactionIdField()) {
             $massActionIdField = $this->getMassactionIdField();
         } else {
             $massActionIdField = $this->getParentBlock()->getMassactionIdField();
         }
-        
+
+        if ($allIdsCollection instanceof AbstractDb) {
+            $allIdsCollection->getSelect()->limit();
+            $allIdsCollection->clear();
+        }
+
         $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
         if (!empty($gridIds)) {
             return join(",", $gridIds);
@@ -293,6 +304,8 @@ public function getGridIdsJson()
     }
 
     /**
+     * Get Html id.
+     *
      * @return string
      */
     public function getHtmlId()
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
index 42f5e61bf5fa8..8e0fce2b16cc9 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget\Grid\Massaction;
 
 /**
@@ -69,7 +70,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setErrorText($this->escapeHtml(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('An item needs to be selected. Select and try again.')));
     }
 
     /**
@@ -218,9 +219,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -233,9 +233,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**
@@ -275,13 +274,13 @@ public function getGridIdsJson()
 
         /** @var \Magento\Framework\Data\Collection $allIdsCollection */
         $allIdsCollection = clone $this->getParentBlock()->getCollection();
-        
+
         if ($this->getMassactionIdField()) {
             $massActionIdField = $this->getMassactionIdField();
         } else {
             $massActionIdField = $this->getParentBlock()->getMassactionIdField();
         }
-        
+
         $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
 
         if (!empty($gridIds)) {
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 7f146e19e8c6e..c7c1f93e8ca73 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -8,6 +8,8 @@
 use Magento\Backend\Block\Widget\Tab\TabInterface;
 
 /**
+ * Tabs widget
+ *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
@@ -117,6 +119,7 @@ public function addTab($tabId, $tab)
         if (empty($tabId)) {
             throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
         }
+
         if (is_array($tab)) {
             $this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);
         } elseif ($tab instanceof \Magento\Framework\DataObject) {
@@ -126,6 +129,7 @@ public function addTab($tabId, $tab)
             }
         } elseif (is_string($tab)) {
             $this->_addTabByName($tab, $tabId);
+            
             if (!$this->_tabs[$tabId] instanceof TabInterface) {
                 unset($this->_tabs[$tabId]);
                 return $this;
@@ -133,6 +137,7 @@ public function addTab($tabId, $tab)
         } else {
             throw new \Exception(__('Please correct the tab configuration and try again.'));
         }
+        
         if ($this->_tabs[$tabId]->getUrl() === null) {
             $this->_tabs[$tabId]->setUrl('#');
         }
@@ -143,10 +148,7 @@ public function addTab($tabId, $tab)
 
         $this->_tabs[$tabId]->setId($tabId);
         $this->_tabs[$tabId]->setTabId($tabId);
-
-        if ($this->_activeTab === null) {
-            $this->_activeTab = $tabId;
-        }
+        
         if (true === $this->_tabs[$tabId]->getActive()) {
             $this->setActiveTab($tabId);
         }
@@ -178,6 +180,8 @@ protected function _addTabByName($tab, $tabId)
     }
 
     /**
+     * Get active tab id
+     *
      * @return string
      */
     public function getActiveTabId()
@@ -187,6 +191,7 @@ public function getActiveTabId()
 
     /**
      * Set Active Tab
+     *
      * Tab has to be not hidden and can show
      *
      * @param string $tabId
@@ -231,38 +236,117 @@ protected function _setActiveTab($tabId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
+        $this->_tabs = $this->reorderTabs();
+        
         if ($activeTab = $this->getRequest()->getParam('active_tab')) {
             $this->setActiveTab($activeTab);
         } elseif ($activeTabId = $this->_authSession->getActiveTabId()) {
             $this->_setActiveTab($activeTabId);
         }
 
-        $_new = [];
+        if ($this->_activeTab === null && !empty($this->_tabs)) {
+            /** @var TabInterface $tab */
+            $this->_activeTab = (reset($this->_tabs))->getId();
+        }
+        
+        $this->assign('tabs', $this->_tabs);
+        return parent::_beforeToHtml();
+    }
+    
+    /**
+     * Reorder the tabs.
+     *
+     * @return array
+     */
+    private function reorderTabs()
+    {
+        $orderByIdentity = [];
+        $orderByPosition = [];
+        $position        = 100;
+    
+        /**
+         * Set the initial positions for each tab.
+         *
+         * @var string       $key
+         * @var TabInterface $tab
+         */
         foreach ($this->_tabs as $key => $tab) {
-            foreach ($this->_tabs as $k => $t) {
-                if ($t->getAfter() == $key) {
-                    $_new[$key] = $tab;
-                    $_new[$k] = $t;
-                } else {
-                    if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($this->_tabs))) {
-                        $_new[$key] = $tab;
-                    }
-                }
-            }
+            $tab->setPosition($position);
+    
+            $orderByIdentity[$key]      = $tab;
+            $orderByPosition[$position] = $tab;
+            
+            $position += 100;
         }
 
-        $this->_tabs = $_new;
-        unset($_new);
+        return $this->applyTabsCorrectOrder($orderByPosition, $orderByIdentity);
+    }
 
-        $this->assign('tabs', $this->_tabs);
-        return parent::_beforeToHtml();
+    /**
+     * Apply tabs order
+     *
+     * @param array $orderByPosition
+     * @param array $orderByIdentity
+     *
+     * @return array
+     */
+    private function applyTabsCorrectOrder(array $orderByPosition, array $orderByIdentity)
+    {
+        $positionFactor = 1;
+
+        /**
+         * Rearrange the positions by using the after tag for each tab.
+         *
+         * @var int $position
+         * @var TabInterface $tab
+         */
+        foreach ($orderByPosition as $position => $tab) {
+            if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($orderByIdentity))) {
+                $positionFactor = 1;
+                continue;
+            }
+
+            $grandPosition = $orderByIdentity[$tab->getAfter()]->getPosition();
+            $newPosition   = $grandPosition + $positionFactor;
+
+            unset($orderByPosition[$position]);
+            $orderByPosition[$newPosition] = $tab;
+            $tab->setPosition($newPosition);
+
+            $positionFactor++;
+        }
+
+        return $this->finalTabsSortOrder($orderByPosition);
     }
 
     /**
+     * Apply the last sort order to tabs.
+     *
+     * @param array $orderByPosition
+     *
+     * @return array
+     */
+    private function finalTabsSortOrder(array $orderByPosition)
+    {
+        ksort($orderByPosition);
+
+        $ordered = [];
+
+        /** @var TabInterface $tab */
+        foreach ($orderByPosition as $tab) {
+            $ordered[$tab->getId()] = $tab;
+        }
+
+        return $ordered;
+    }
+    
+    /**
+     * Get js object name
+     *
      * @return string
      */
     public function getJsObjectName()
@@ -271,6 +355,8 @@ public function getJsObjectName()
     }
 
     /**
+     * Get tabs ids
+     *
      * @return string[]
      */
     public function getTabsIds()
@@ -283,6 +369,8 @@ public function getTabsIds()
     }
 
     /**
+     * Get tab id
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @param bool $withPrefix
      * @return string
@@ -296,6 +384,8 @@ public function getTabId($tab, $withPrefix = true)
     }
 
     /**
+     * CVan show tab
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return bool
      */
@@ -308,6 +398,8 @@ public function canShowTab($tab)
     }
 
     /**
+     * Get tab is hidden
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
@@ -321,6 +413,8 @@ public function getTabIsHidden($tab)
     }
 
     /**
+     * Get tab url
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -339,6 +433,8 @@ public function getTabUrl($tab)
     }
 
     /**
+     * Get tab title
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -351,6 +447,8 @@ public function getTabTitle($tab)
     }
 
     /**
+     * Get tab class
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -366,6 +464,8 @@ public function getTabClass($tab)
     }
 
     /**
+     * Get tab label
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -378,6 +478,8 @@ public function getTabLabel($tab)
     }
 
     /**
+     * Get tab content
+     *
      * @param \Magento\Framework\DataObject|TabInterface $tab
      * @return string
      */
@@ -393,7 +495,8 @@ public function getTabContent($tab)
     }
 
     /**
-     * Mark tabs as dependant of each other
+     * Mark tabs as dependent of each other
+     *
      * Arbitrary number of tabs can be specified, but at least two
      *
      * @param string $tabOneId
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
index 70b01046f6afe..11da740c46606 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
@@ -11,13 +11,15 @@
 use Symfony\Component\Console\Input\InputOption;
 
 /**
+ * Abstract cache command
+ *
  * @api
  * @since 100.0.2
  */
 abstract class AbstractCacheCommand extends Command
 {
     /**
-     * Input option bootsrap
+     * Input option bootstrap
      */
     const INPUT_KEY_BOOTSTRAP = 'bootstrap';
 
@@ -40,7 +42,7 @@ public function __construct(Manager $cacheManager)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
index ad4546097768a..23731e29f0df4 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Auth;
 
-class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
index b34e4d9c84939..1de77c810f316 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
@@ -6,11 +6,14 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Auth;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
+
 /**
  * @api
  * @since 100.0.2
  */
-class Login extends \Magento\Backend\Controller\Adminhtml\Auth
+class Login extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
@@ -50,9 +53,8 @@ public function execute()
         // redirect according to rewrite rule
         if ($requestUrl != $backendUrl) {
             return $this->getRedirect($backendUrl);
-        } else {
-            return $this->resultPageFactory->create();
         }
+        return $this->resultPageFactory->create();
     }
 
     /**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
index 41e32c929287a..d7ad080395e29 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
@@ -6,7 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Auth;
 
-class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
+
+class Logout extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost
 {
     /**
      * Administrator logout action
@@ -16,7 +19,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
     public function execute()
     {
         $this->_auth->logout();
-        $this->messageManager->addSuccess(__('You have logged out.'));
+        $this->messageManager->addSuccessMessage(__('You have logged out.'));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
index daaa2a9aaeced..4fcd5993fb504 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
@@ -73,7 +74,7 @@ protected function _validateTypes(array $types)
         $allTypes = array_keys($this->_cacheTypeList->getTypes());
         $invalidTypes = array_diff($types, $allTypes);
         if (count($invalidTypes) > 0) {
-            throw new LocalizedException(__('Specified cache type(s) don\'t exist: %1', join(', ', $invalidTypes)));
+            throw new LocalizedException(__('These cache type(s) don\'t exist: %1', join(', ', $invalidTypes)));
         }
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
index 1895bd08c464f..79bc19256d270 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
@@ -6,11 +6,19 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
 
-class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
+class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::flush_catalog_images';
+
     /**
      * Clean JS/css files cache
      *
@@ -21,11 +29,11 @@ public function execute()
         try {
             $this->_objectManager->create(\Magento\Catalog\Model\Product\Image::class)->clearCache();
             $this->_eventManager->dispatch('clean_catalog_images_cache_after');
-            $this->messageManager->addSuccess(__('The image cache was cleaned.'));
+            $this->messageManager->addSuccessMessage(__('The image cache was cleaned.'));
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the image cache.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
index 521cb9806a135..36aca1afcc480 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
@@ -6,11 +6,19 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
 
-class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
+class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::flush_js_css';
+
     /**
      * Clean JS/css files cache
      *
@@ -21,11 +29,12 @@ public function execute()
         try {
             $this->_objectManager->get(\Magento\Framework\View\Asset\MergeService::class)->cleanMergedJsCss();
             $this->_eventManager->dispatch('clean_media_cache_after');
-            $this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
+            $this->messageManager->addSuccessMessage(__('The JavaScript/CSS cache has been cleaned.'));
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
+            $this->messageManager
+                ->addExceptionMessage($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
index adfbf7cfe63c8..a3a26c5cf6242 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
@@ -6,10 +6,18 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache
+class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::flush_static_files';
+
     /**
      * Clean static files cache
      *
@@ -19,7 +27,7 @@ public function execute()
     {
         $this->_objectManager->get(\Magento\Framework\App\State\CleanupFiles::class)->clearMaterializedViewFiles();
         $this->_eventManager->dispatch('clean_static_files_cache_after');
-        $this->messageManager->addSuccess(__('The static files cache has been cleaned.'));
+        $this->messageManager->addSuccessMessage(__('The static files cache has been cleaned.'));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
index 2f9dc9ad6a7a5..daf424d14c55b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
@@ -6,8 +6,17 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::flush_cache_storage';
+
     /**
      * Flush cache storage
      *
@@ -20,7 +29,7 @@ public function execute()
         foreach ($this->_cacheFrontendPool as $cacheFrontend) {
             $cacheFrontend->getBackend()->clean();
         }
-        $this->messageManager->addSuccess(__("You flushed the cache storage."));
+        $this->messageManager->addSuccessMessage(__("You flushed the cache storage."));
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         return $resultRedirect->setPath('adminhtml/*');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
index 0f55a59353d65..f3474bf43872b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
@@ -6,8 +6,17 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::flush_magento_cache';
+
     /**
      * Flush all magento cache
      *
@@ -20,7 +29,7 @@ public function execute()
             $cacheFrontend->clean();
         }
         $this->_eventManager->dispatch('adminhtml_cache_flush_system');
-        $this->messageManager->addSuccess(__("The Magento cache storage has been flushed."));
+        $this->messageManager->addSuccessMessage(__("The Magento cache storage has been flushed."));
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         return $resultRedirect->setPath('adminhtml/*');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
index 05bd309ca620e..f1e908bb842ee 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-class Index extends \Magento\Backend\Controller\Adminhtml\Cache
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
 {
     /**
      * Display cache management grid
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
index 204105852b9f1..03b88ca1d3f47 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
@@ -16,6 +16,13 @@
  */
 class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::toggling_cache_type';
+
     /**
      * @var State
      */
@@ -60,12 +67,12 @@ private function disableCache()
             }
             if ($updatedTypes > 0) {
                 $this->_cacheState->persist();
-                $this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) disabled.", $updatedTypes));
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while disabling cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while disabling cache.'));
         }
     }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
index 32acf47887c44..1b98a00d4bf35 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
@@ -16,6 +16,13 @@
  */
 class MassEnable extends \Magento\Backend\Controller\Adminhtml\Cache
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::toggling_cache_type';
+
     /**
      * @var State
      */
@@ -59,12 +66,12 @@ private function enableCache()
             }
             if ($updatedTypes > 0) {
                 $this->_cacheState->persist();
-                $this->messageManager->addSuccess(__("%1 cache type(s) enabled.", $updatedTypes));
+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) enabled.", $updatedTypes));
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while enabling cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while enabling cache.'));
         }
     }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
index e18aa1555e11b..bde211debcf72 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
@@ -11,6 +11,13 @@
 
 class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::refresh_cache_type';
+
     /**
      * Mass action for cache refresh
      *
@@ -30,12 +37,12 @@ public function execute()
                 $updatedTypes++;
             }
             if ($updatedTypes > 0) {
-                $this->messageManager->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) refreshed.", $updatedTypes));
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while refreshing cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while refreshing cache.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
index d8c52f6c50bba..decca6837fa00 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
-class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard
+use Magento\Backend\Controller\Adminhtml\Dashboard as DashboardAction;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Index extends DashboardAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index f831fa67f4bb0..c10d1a77997b7 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -34,9 +34,9 @@ public function execute()
             foreach ($collectionsNames as $collectionName) {
                 $this->_objectManager->create($collectionName)->aggregate();
             }
-            $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
+            $this->messageManager->addSuccessMessage(__('We updated lifetime statistic.'));
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
+            $this->messageManager->addErrorMessage(__('We can\'t refresh lifetime statistics.'));
             $this->logger->critical($e);
         }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
index 9ca4021d08356..37f3064aeaa38 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
@@ -6,11 +6,15 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Index;
 
+use Magento\Backend\Controller\Adminhtml\Index as IndexAction;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
 /**
  * @api
  * @since 100.0.2
  */
-class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
+class GlobalSearch extends IndexAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
index a5c71fb2dbc5c..afb1b4573271d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
@@ -6,7 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Index;
 
-class Index extends \Magento\Backend\Controller\Adminhtml\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\Index implements HttpGet, HttpPost
 {
     /**
      * Admin area entry point
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
index e8251b5be6030..e84987d8e1d70 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
@@ -6,6 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Noroute;
 
+/**
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Index extends \Magento\Backend\App\Action
 {
     /**
@@ -34,7 +37,7 @@ public function execute()
     {
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $resultPage->setStatusHeader(404, '1.1', 'Forbidden');
+        $resultPage->setStatusHeader(404, '1.1', 'Not Found');
         $resultPage->setHeader('Status', '404 File not found');
         $resultPage->addHandle('adminhtml_noroute');
         return $resultPage;
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
index 54771bfdc1a7d..648f1be86f56c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Account;
 
-class Index extends \Magento\Backend\Controller\Adminhtml\System\Account
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\System\Account implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index c9bce1cbf3888..d95b0541c2c76 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -32,9 +32,8 @@ private function getSecurityCookie()
     {
         if (!($this->securityCookie instanceof SecurityCookie)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
-        } else {
-            return $this->securityCookie;
         }
+        return $this->securityCookie;
     }
 
     /**
@@ -54,9 +53,9 @@ public function execute()
         $user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId);
 
         $user->setId($userId)
-            ->setUsername($this->getRequest()->getParam('username', false))
-            ->setFirstname($this->getRequest()->getParam('firstname', false))
-            ->setLastname($this->getRequest()->getParam('lastname', false))
+            ->setUserName($this->getRequest()->getParam('username', false))
+            ->setFirstName($this->getRequest()->getParam('firstname', false))
+            ->setLastName($this->getRequest()->getParam('lastname', false))
             ->setEmail(strtolower($this->getRequest()->getParam('email', false)));
 
         if ($this->_objectManager->get(\Magento\Framework\Validator\Locale::class)->isValid($interfaceLocale)) {
@@ -77,12 +76,12 @@ public function execute()
             $errors = $user->validate();
             if ($errors !== true && !empty($errors)) {
                 foreach ($errors as $error) {
-                    $this->messageManager->addError($error);
+                    $this->messageManager->addErrorMessage($error);
                 }
             } else {
                 $user->save();
                 $user->sendNotificationEmailsIfRequired();
-                $this->messageManager->addSuccess(__('You saved the account.'));
+                $this->messageManager->addSuccessMessage(__('You saved the account.'));
             }
         } catch (UserLockedException $e) {
             $this->_auth->logout();
@@ -92,12 +91,12 @@ public function execute()
         } catch (ValidatorException $e) {
             $this->messageManager->addMessages($e->getMessages());
             if ($e->getMessage()) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('An error occurred while saving account.'));
+            $this->messageManager->addErrorMessage(__('An error occurred while saving account.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
index 76402169f269e..21f28188cf874 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
@@ -19,11 +19,11 @@ public function execute()
 
             try {
                 $design->delete();
-                $this->messageManager->addSuccess(__('You deleted the design change.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the design change.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("You can't delete the design change."));
+                $this->messageManager->addExceptionMessage($e, __("You can't delete the design change."));
             }
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
index 30b26f2294193..c6a05b5a71d0c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Design;
 
-class Index extends \Magento\Backend\Controller\Adminhtml\System\Design
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
index 1f478604ced7d..0228b48f7f11e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
@@ -50,9 +50,9 @@ public function execute()
             try {
                 $design->save();
                 $this->_eventManager->dispatch('theme_save_after');
-                $this->messageManager->addSuccess(__('You saved the design change.'));
+                $this->messageManager->addSuccessMessage(__('You saved the design change.'));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
                 return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
             }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 4fbae6abb423a..a9be14b77b29c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -14,6 +14,7 @@
  * Store controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 abstract class Store extends Action
 {
@@ -86,6 +87,8 @@ protected function createPage()
      * Backup database
      *
      * @return bool
+     *
+     * @deprecated Backup module is to be removed.
      */
     protected function _backupDatabase()
     {
@@ -103,12 +106,12 @@ protected function _backupDatabase()
                 ->setType('db')
                 ->setPath($filesystem->getDirectoryRead(DirectoryList::VAR_DIR)->getAbsolutePath('backups'));
             $backupDb->createBackup($backup);
-            $this->messageManager->addSuccess(__('The database was backed up.'));
+            $this->messageManager->addSuccessMessage(__('The database was backed up.'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             return false;
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('We can\'t create a backup right now. Please try again later.')
             );
@@ -125,7 +128,7 @@ protected function _backupDatabase()
      */
     protected function _addDeletionNotice($typeTitle)
     {
-        $this->messageManager->addNotice(
+        $this->messageManager->addNoticeMessage(
             __(
                 'Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.)'
                 . ', but the %1 will not be able to be restored. It is suggested that you create a database backup '
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
index 925ae4c69ee8e..4e323be709ae1 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
@@ -15,13 +15,13 @@ public function execute()
     {
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
index b6fbd88c7669c..49c327060dae5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
@@ -1,16 +1,20 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete store.
+ */
+class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
+     * @inheritDoc
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -21,11 +25,11 @@ public function execute()
         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
             return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $model->getId()]);
         }
 
@@ -35,12 +39,12 @@ public function execute()
 
         try {
             $model->delete();
-            $this->messageManager->addSuccess(__('You deleted the store.'));
+            $this->messageManager->addSuccessMessage(__('You deleted the store.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete the store. Please try again later.'));
+            $this->messageManager->addExceptionMessage($e, __('Unable to delete the store. Please try again later.'));
         }
         return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
index b31de6cacc5ff..c340b1ec53aa5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -15,13 +15,13 @@ public function execute()
     {
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Store::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store view cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store view cannot be deleted.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
index ac470238e588f..7999012b43594 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
@@ -1,14 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete store view.
+ */
+class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
      * Delete store view post action
@@ -22,11 +25,11 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Store::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store view cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store view cannot be deleted.'));
             return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $model->getId()]);
         }
 
@@ -37,14 +40,13 @@ public function execute()
         try {
             $model->delete();
 
-            $this->_eventManager->dispatch('store_delete', ['store' => $model]);
-
-            $this->messageManager->addSuccess(__('You deleted the store view.'));
+            $this->messageManager->addSuccessMessage(__('You deleted the store view.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete the store view. Please try again later.'));
+            $this->messageManager
+                ->addExceptionMessage($e, __('Unable to delete the store view. Please try again later.'));
         }
         return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
index 1f2ec4b2ba4b1..9e8664b8ecd11 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
-class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
@@ -15,13 +17,13 @@ public function execute()
     {
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Website::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This website cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This website cannot be deleted.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/editWebsite', ['website_id' => $itemId]);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
index c2d24b8c41a8c..3fee1a25c9fe4 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
@@ -6,11 +6,16 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete website.
+ */
+class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
+     * @inheritDoc
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -23,11 +28,11 @@ public function execute()
         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
         if (!$model) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This website cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This website cannot be deleted.'));
             return $redirectResult->setPath('adminhtml/*/editWebsite', ['website_id' => $model->getId()]);
         }
 
@@ -37,12 +42,12 @@ public function execute()
 
         try {
             $model->delete();
-            $this->messageManager->addSuccess(__('You deleted the website.'));
+            $this->messageManager->addSuccessMessage(__('You deleted the website.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete the website. Please try again later.'));
+            $this->messageManager->addExceptionMessage($e, __('Unable to delete the website. Please try again later.'));
         }
         return $redirectResult->setPath('*/*/editWebsite', ['website_id' => $itemId]);
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
index cbc068a480865..e5cd43b521fd1 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
-class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
@@ -57,7 +59,7 @@ public function execute()
         if ($model->getId() || $this->_coreRegistry->registry('store_action') == 'add') {
             $this->_coreRegistry->register('store_data', $model);
             if ($this->_coreRegistry->registry('store_action') == 'edit' && $codeBase && !$model->isReadOnly()) {
-                $this->messageManager->addNotice($codeBase);
+                $this->messageManager->addNoticeMessage($codeBase);
             }
             $resultPage = $this->createPage();
             if ($this->_coreRegistry->registry('store_action') == 'add') {
@@ -71,7 +73,7 @@ public function execute()
             ));
             return $resultPage;
         } else {
-            $this->messageManager->addError($notExists);
+            $this->messageManager->addErrorMessage($notExists);
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
             return $resultRedirect->setPath('adminhtml/*/');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
index bfdf7cdbeb8fb..74ed7951e6214 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
-class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
index b104704f41bdb..54da065c4af91 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php
@@ -6,12 +6,13 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Index returns Stores page
  */
-class Index extends \Magento\Backend\Controller\Adminhtml\System\Store
+class Index extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface
 {
     /**
      * Returns Stores page
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
index 1d6862a6ff845..b67f1f23f16ba 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
@@ -6,12 +6,14 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
 /**
  * Class Save
  *
  * Save controller for system entities such as: Store, StoreGroup, Website
  */
-class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
+class Save extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
      * Process Website model save
@@ -32,7 +34,7 @@ private function processWebsiteSave($postData)
         }
 
         $websiteModel->save();
-        $this->messageManager->addSuccess(__('You saved the website.'));
+        $this->messageManager->addSuccessMessage(__('You saved the website.'));
 
         return $postData;
     }
@@ -46,7 +48,6 @@ private function processWebsiteSave($postData)
      */
     private function processStoreSave($postData)
     {
-        $eventName = 'store_edit';
         /** @var \Magento\Store\Model\Store $storeModel */
         $storeModel = $this->_objectManager->create(\Magento\Store\Model\Store::class);
         $postData['store']['name'] = $this->filterManager->removeTags($postData['store']['name']);
@@ -56,7 +57,6 @@ private function processStoreSave($postData)
         $storeModel->setData($postData['store']);
         if ($postData['store']['store_id'] == '') {
             $storeModel->setId(null);
-            $eventName = 'store_add';
         }
         $groupModel = $this->_objectManager->create(
             \Magento\Store\Model\Group::class
@@ -70,9 +70,7 @@ private function processStoreSave($postData)
             );
         }
         $storeModel->save();
-        $this->_objectManager->get(\Magento\Store\Model\StoreManager::class)->reinitStores();
-        $this->_eventManager->dispatch($eventName, ['store' => $storeModel]);
-        $this->messageManager->addSuccess(__('You saved the store view.'));
+        $this->messageManager->addSuccessMessage(__('You saved the store view.'));
 
         return $postData;
     }
@@ -102,8 +100,7 @@ private function processGroupSave($postData)
             );
         }
         $groupModel->save();
-        $this->_eventManager->dispatch('store_group_save', ['group' => $groupModel]);
-        $this->messageManager->addSuccess(__('You saved the store.'));
+        $this->messageManager->addSuccessMessage(__('You saved the store.'));
 
         return $postData;
     }
@@ -139,10 +136,10 @@ public function execute()
                 $redirectResult->setPath('adminhtml/*/');
                 return $redirectResult;
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_getSession()->setPostData($postData);
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('Something went wrong while saving. Please review the error log.')
                 );
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
index 9fc2c2cdb4e6f..c19c28b6e33eb 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -13,7 +13,7 @@
  * @api
  * @since 100.0.2
  */
-class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
+class Order extends AbstractDashboard
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Order\Collection
@@ -29,32 +29,25 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
+        \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         $this->_orderCollection = $orderCollection;
-        parent::__construct($context);
-    }
+        $this->_storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
 
-    /**
-     * The getter function to get the new StoreManager dependency
-     *
-     * @return \Magento\Store\Model\StoreManagerInterface
-     *
-     * @deprecated 100.1.0
-     */
-    private function getStoreManager()
-    {
-        if ($this->_storeManager === null) {
-            $this->_storeManager = ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
-        }
-        return $this->_storeManager;
+        parent::__construct($context);
     }
 
     /**
      * @return void
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _initCollection()
     {
@@ -65,15 +58,15 @@ protected function _initCollection()
         if ($this->getParam('store')) {
             $this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
         } elseif ($this->getParam('website')) {
-            $storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
+            $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif ($this->getParam('group')) {
-            $storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
+            $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif (!$this->_collection->isLive()) {
             $this->_collection->addFieldToFilter(
                 'store_id',
-                ['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
+                ['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
             );
         }
         $this->_collection->load();
diff --git a/app/code/Magento/Backend/Model/AdminPathConfig.php b/app/code/Magento/Backend/Model/AdminPathConfig.php
index e7338adca4a2a..0e77835a5134c 100644
--- a/app/code/Magento/Backend/Model/AdminPathConfig.php
+++ b/app/code/Magento/Backend/Model/AdminPathConfig.php
@@ -48,10 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @return string
+     * @inheritdoc
      */
     public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request)
     {
@@ -59,28 +56,29 @@ public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $req
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param string $path
-     * @return bool
+     * @inheritdoc
      */
     public function shouldBeSecure($path)
     {
-        return parse_url(
-            (string)$this->coreConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default'),
-            PHP_URL_SCHEME
-        ) === 'https'
-        || $this->backendConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
-        && parse_url(
-            (string)$this->coreConfig->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default'),
-            PHP_URL_SCHEME
-        ) === 'https';
+        $baseUrl = (string)$this->coreConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        if (parse_url($baseUrl, PHP_URL_SCHEME) === 'https') {
+            return true;
+        }
+
+        if ($this->backendConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)) {
+            if ($this->backendConfig->isSetFlag('admin/url/use_custom')) {
+                $adminBaseUrl = (string)$this->coreConfig->getValue('admin/url/custom', 'default');
+            } else {
+                $adminBaseUrl = (string)$this->coreConfig->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
+            }
+            return parse_url($adminBaseUrl, PHP_URL_SCHEME) === 'https';
+        }
+
+        return false;
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @return string
+     * @inheritdoc
      */
     public function getDefaultPath()
     {
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
index 08921d1615f87..02bf64fef07ed 100644
--- a/app/code/Magento/Backend/Model/Auth.php
+++ b/app/code/Magento/Backend/Model/Auth.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Model;
 
 use Magento\Framework\Exception\AuthenticationException;
@@ -148,7 +149,12 @@ public function getCredentialStorage()
     public function login($username, $password)
     {
         if (empty($username) || empty($password)) {
-            self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
+            self::throwException(
+                __(
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                )
+            );
         }
 
         try {
@@ -165,7 +171,12 @@ public function login($username, $password)
             }
 
             if (!$this->getAuthStorage()->getUser()) {
-                self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
+                self::throwException(
+                    __(
+                        'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                    )
+                );
             }
         } catch (PluginAuthenticationException $e) {
             $this->_eventManager->dispatch(
@@ -179,7 +190,10 @@ public function login($username, $password)
                 ['user_name' => $username, 'exception' => $e]
             );
             self::throwException(
-                __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
+                __(
+                    $e->getMessage()? : 'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                )
             );
         }
     }
@@ -215,7 +229,7 @@ public function isLoggedIn()
     public static function throwException(Phrase $msg = null)
     {
         if ($msg === null) {
-            $msg = __('Authentication error occurred.');
+            $msg = __('An authentication error occurred. Verify and try again.');
         }
         throw new AuthenticationException($msg);
     }
diff --git a/app/code/Magento/Backend/Model/Auth/StorageInterface.php b/app/code/Magento/Backend/Model/Auth/StorageInterface.php
index 52b2b089c71e1..e643165a93317 100644
--- a/app/code/Magento/Backend/Model/Auth/StorageInterface.php
+++ b/app/code/Magento/Backend/Model/Auth/StorageInterface.php
@@ -23,7 +23,7 @@ interface StorageInterface
     public function processLogin();
 
     /**
-     * Perform login specific actions
+     * Perform logout specific actions
      *
      * @return $this
      * @abstract
diff --git a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
index 09f33abd0d44d..f6d08883d7a6f 100644
--- a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
+++ b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Model\Config\SessionLifetime;
 
 use Magento\Framework\App\Config\Value;
@@ -15,25 +16,31 @@
  */
 class BackendModel extends Value
 {
-    /** Maximum dmin session lifetime; 1 year*/
+    /** Maximum admin session lifetime; 1 year*/
     const MAX_LIFETIME = 31536000;
 
     /** Minimum admin session lifetime */
     const MIN_LIFETIME = 60;
 
     /**
+     * Processing object before save data
+     *
      * @since 100.1.0
+     * @throws LocalizedException
      */
     public function beforeSave()
     {
-        $value = (int) $this->getValue();
+        $value = (int)$this->getValue();
         if ($value > self::MAX_LIFETIME) {
             throw new LocalizedException(
-                __('Admin session lifetime must be less than or equal to 31536000 seconds (one year)')
+                __(
+                    'The Admin session lifetime is invalid. '
+                    . 'Set the lifetime to 31536000 seconds (one year) or shorter and try again.'
+                )
             );
         } elseif ($value < self::MIN_LIFETIME) {
             throw new LocalizedException(
-                __('Admin session lifetime must be greater than or equal to 60 seconds')
+                __('The Admin session lifetime is invalid. Set the lifetime to 60 seconds or longer and try again.')
             );
         }
         return parent::beforeSave();
diff --git a/app/code/Magento/Backend/Model/Image/UploadResizeConfig.php b/app/code/Magento/Backend/Model/Image/UploadResizeConfig.php
new file mode 100644
index 0000000000000..8155aa5e2fe2d
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Image/UploadResizeConfig.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Image;
+
+/**
+ * Image uploader config provider.
+ */
+class UploadResizeConfig implements UploadResizeConfigInterface
+{
+    /**
+     * Config path for the maximal image width value
+     */
+    const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width';
+
+    /**
+     * Config path for the maximal image height value
+     */
+    const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height';
+
+    /**
+     * Config path for the maximal image height value
+     */
+    const XML_PATH_ENABLE_RESIZE = 'system/upload_configuration/enable_resize';
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+     */
+    public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Get maximal width value for resized image
+     *
+     * @return int
+     */
+    public function getMaxWidth(): int
+    {
+        return (int)$this->config->getValue(self::XML_PATH_MAX_WIDTH_IMAGE);
+    }
+
+    /**
+     * Get maximal height value for resized image
+     *
+     * @return int
+     */
+    public function getMaxHeight(): int
+    {
+        return (int)$this->config->getValue(self::XML_PATH_MAX_HEIGHT_IMAGE);
+    }
+
+    /**
+     * Get config value for frontend resize
+     *
+     * @return bool
+     */
+    public function isResizeEnabled(): bool
+    {
+        return (bool)$this->config->getValue(self::XML_PATH_ENABLE_RESIZE);
+    }
+}
diff --git a/app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php b/app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php
new file mode 100644
index 0000000000000..50582dfafbcd1
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Image/UploadResizeConfigInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Image;
+
+/**
+ * Interface UploadResizeConfigInterface
+ *
+ * Used to retrieve configuration for frontend image uploader
+ */
+interface UploadResizeConfigInterface
+{
+    /**
+     * Get maximal width value for resized image
+     *
+     * @return int
+     */
+    public function getMaxWidth(): int;
+
+    /**
+     * Get maximal height value for resized image
+     *
+     * @return int
+     */
+    public function getMaxHeight(): int;
+
+    /**
+     * Get config value for frontend resize
+     *
+     * @return bool
+     */
+    public function isResizeEnabled(): bool;
+}
diff --git a/app/code/Magento/Backend/Model/Menu.php b/app/code/Magento/Backend/Model/Menu.php
index 22110cf52de2b..0246346ec4d97 100644
--- a/app/code/Magento/Backend/Model/Menu.php
+++ b/app/code/Magento/Backend/Model/Menu.php
@@ -83,7 +83,7 @@ public function add(Item $item, $parentId = null, $index = null)
             }
             $parentItem->getChildren()->add($item, null, $index);
         } else {
-            $index = intval($index);
+            $index = (int) $index;
             if (!isset($this[$index])) {
                 $this->offsetSet($index, $item);
                 $this->_logger->info(
diff --git a/app/code/Magento/Backend/Model/Menu/Builder.php b/app/code/Magento/Backend/Model/Menu/Builder.php
index ae572deab53d9..1c6e900bc5cfc 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder.php
@@ -102,6 +102,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)
      */
     protected function _getParam($params, $paramName, $defaultValue = null)
     {
-        return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;
+        return $params[$paramName] ?? $defaultValue;
     }
 }
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index 42febe94d0abf..67c6216cbbc06 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -503,12 +503,11 @@ public function populateFromArray(array $data)
         $this->_tooltip = $this->_getArgument($data, 'toolTip');
         $this->_title = $this->_getArgument($data, 'title');
         $this->target = $this->_getArgument($data, 'target');
+        $this->_submenu = null;
         if (isset($data['sub_menu'])) {
             $menu = $this->_menuFactory->create();
             $menu->populateFromArray($data['sub_menu']);
             $this->_submenu = $menu;
-        } else {
-            $this->_submenu = null;
         }
     }
 }
diff --git a/app/code/Magento/Backend/Model/Menu/Item/Validator.php b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
index d79752b296e5f..7b72b355f551d 100644
--- a/app/code/Magento/Backend/Model/Menu/Item/Validator.php
+++ b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
@@ -74,34 +74,86 @@ public function __construct()
      * @throws \BadMethodCallException
      */
     public function validate($data)
+    {
+        if ($this->checkMenuItemIsRemoved($data)) {
+            return;
+        }
+
+        $this->assertContainsRequiredParameters($data);
+        $this->assertIdentifierIsNotUsed($data['id']);
+
+        foreach ($data as $param => $value) {
+            $this->validateMenuItemParameter($param, $value);
+        }
+        $this->_ids[] = $data['id'];
+    }
+
+    /**
+     * Check that menu item is not deleted
+     *
+     * @param array $data
+     * @return bool
+     */
+    private function checkMenuItemIsRemoved($data)
+    {
+        return isset($data['id'], $data['removed']) && $data['removed'] === true;
+    }
+
+    /**
+     * Check that menu item contains all required data
+     * @param array $data
+     *
+     * @throws \BadMethodCallException
+     */
+    private function assertContainsRequiredParameters($data)
     {
         foreach ($this->_required as $param) {
             if (!isset($data[$param])) {
                 throw new \BadMethodCallException('Missing required param ' . $param);
             }
         }
+    }
 
-        if (array_search($data['id'], $this->_ids) !== false) {
-            throw new \InvalidArgumentException('Item with id ' . $data['id'] . ' already exists');
+    /**
+     * Check that menu item id is not used
+     *
+     * @param string $id
+     * @throws \InvalidArgumentException
+     */
+    private function assertIdentifierIsNotUsed($id)
+    {
+        if (array_search($id, $this->_ids) !== false) {
+            throw new \InvalidArgumentException('Item with id ' . $id . ' already exists');
         }
+    }
 
-        foreach ($data as $param => $value) {
-            if ($data[$param] !== null
-            && isset(
-                $this->_validators[$param]
-            ) && !$this->_validators[$param]->isValid(
-                $value
-            )
-            ) {
-                throw new \InvalidArgumentException(
-                    "Param " . $param . " doesn't pass validation: " . implode(
-                        '; ',
-                        $this->_validators[$param]->getMessages()
-                    )
-                );
-            }
+    /**
+     * Validate menu item parameter value
+     *
+     * @param string $param
+     * @param mixed $value
+     * @throws \InvalidArgumentException
+     */
+    private function validateMenuItemParameter($param, $value)
+    {
+        if ($value === null) {
+            return;
         }
-        $this->_ids[] = $data['id'];
+        if (!isset($this->_validators[$param])) {
+            return;
+        }
+
+        $validator = $this->_validators[$param];
+        if ($validator->isValid($value)) {
+            return;
+        }
+
+        throw new \InvalidArgumentException(
+            "Param " . $param . " doesn't pass validation: " . implode(
+                '; ',
+                $validator->getMessages()
+            )
+        );
     }
 
     /**
diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
index 35a7359ce9980..e76a1b77ab2d6 100644
--- a/app/code/Magento/Backend/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -89,7 +89,7 @@ public function load()
 
         $this->searchCriteriaBuilder->setCurrentPage($this->getStart());
         $this->searchCriteriaBuilder->setPageSize($this->getLimit());
-        $searchFields = ['firstname', 'lastname', 'company'];
+        $searchFields = ['firstname', 'lastname', 'billing_company'];
         $filters = [];
         foreach ($searchFields as $field) {
             $filters[] = $this->filterBuilder
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index 48b443fe7ffd3..f199fd0fe7bf1 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -202,7 +202,7 @@ public function getUrl($routePath = null, $routeParams = null)
         }
 
         $cacheSecretKey = false;
-        if (is_array($routeParams) && isset($routeParams['_cache_secret_key'])) {
+        if (isset($routeParams['_cache_secret_key'])) {
             unset($routeParams['_cache_secret_key']);
             $cacheSecretKey = true;
         }
@@ -210,25 +210,28 @@ public function getUrl($routePath = null, $routeParams = null)
         if (!$this->useSecretKey()) {
             return $result;
         }
+
+        $this->getRouteParamsResolver()->unsetData('route_params');
         $this->_setRoutePath($routePath);
+        $extraParams = $this->getRouteParamsResolver()->getRouteParams();
         $routeName = $this->_getRouteName('*');
         $controllerName = $this->_getControllerName(self::DEFAULT_CONTROLLER_NAME);
         $actionName = $this->_getActionName(self::DEFAULT_ACTION_NAME);
-        if ($cacheSecretKey) {
-            $secret = [self::SECRET_KEY_PARAM_NAME => "\${$routeName}/{$controllerName}/{$actionName}\$"];
-        } else {
-            $secret = [
-                self::SECRET_KEY_PARAM_NAME => $this->getSecretKey($routeName, $controllerName, $actionName),
-            ];
-        }
-        if (is_array($routeParams)) {
-            $routeParams = array_merge($secret, $routeParams);
-        } else {
-            $routeParams = $secret;
+
+        if (!isset($routeParams[self::SECRET_KEY_PARAM_NAME])) {
+            if (!is_array($routeParams)) {
+                $routeParams = [];
+            }
+            $secretKey = $cacheSecretKey
+                ? "\${$routeName}/{$controllerName}/{$actionName}\$"
+                : $this->getSecretKey($routeName, $controllerName, $actionName);
+            $routeParams[self::SECRET_KEY_PARAM_NAME] = $secretKey;
         }
-        if (is_array($this->_getRouteParams())) {
-            $routeParams = array_merge($this->_getRouteParams(), $routeParams);
+
+        if (!empty($extraParams)) {
+            $routeParams = array_merge($extraParams, $routeParams);
         }
+
         return parent::getUrl("{$routeName}/{$controllerName}/{$actionName}", $routeParams);
     }
 
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Parser.php b/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
index e2b77fb471acd..fbed7149aa565 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
@@ -30,8 +30,9 @@ public function parseExpression($expression)
         $expression = trim($expression);
         foreach ($this->_operations as $operation) {
             $splittedExpr = preg_split('/\\' . $operation . '/', $expression, -1, PREG_SPLIT_DELIM_CAPTURE);
-            if (count($splittedExpr) > 1) {
-                for ($i = 0; $i < count($splittedExpr); $i++) {
+            $count = count($splittedExpr);
+            if ($count > 1) {
+                for ($i = 0; $i < $count; $i++) {
                     $stack = array_merge($stack, $this->parseExpression($splittedExpr[$i]));
                     if ($i > 0) {
                         $stack[] = $operation;
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
new file mode 100644
index 0000000000000..9ba4430bafe35
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="LoginActionGroup">
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
+        <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
+        <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
new file mode 100644
index 0000000000000..1070bc409962a
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="LoginAsAdmin">
+        <arguments>
+            <argument name="adminUser" defaultValue="_ENV"/>
+        </arguments>
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+        <closeAdminNotification stepKey="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
new file mode 100644
index 0000000000000..a4d922086df34
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="logout">
+        <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
new file mode 100644
index 0000000000000..6f27b03e4df30
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Action group to delete an item given that items name -->
+    <!-- Must already be on the admin page containing the grid -->
+    <actionGroup name="deleteEntitySecondaryGrid">
+        <arguments>
+            <argument name="name" type="string"/>
+            <argument name="searchInput" type="string"/>
+        </arguments>
+
+        <!-- search for the name -->
+        <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
+        <fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
+        <click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>
+        <click stepKey="clickResult" selector="{{AdminSecondaryGridSection.firstRow}}"/>
+        <waitForPageLoad stepKey="waitForTaxRateLoad"/>
+
+        <!-- delete the rule -->
+        <click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
+        <click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="deleted"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
new file mode 100644
index 0000000000000..fd353964bae9a
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SortByIdDescendingActionGroup">
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
+        <!-- Conditional Click again in case it goes from default state to ascending on first click -->
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml b/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
new file mode 100644
index 0000000000000..016e936977cd0
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="backendDataOne" type="backend">
+        <data key="backendConfigName">data</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE.txt b/app/code/Magento/Backend/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE.txt
rename to app/code/Magento/Backend/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE_AFL.txt b/app/code/Magento/Backend/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE_AFL.txt
rename to app/code/Magento/Backend/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
new file mode 100644
index 0000000000000..8afc2c5bbb32f
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
+        <section name="WYSIWYGOptionsSection"/>
+    </page>
+    <page name="WebConfigurationPage" url="admin/system_config/edit/section/web/" area="admin" module="Backend">
+        <section name="WYSIWYGOptionsSection"/>
+    </page>
+    <page name="GeneralConfigurationPage" url="admin/system_config/edit/section/general/" area="admin" module="Backend">
+        <section name="LocaleOptionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
new file mode 100644
index 0000000000000..8c258accdf06c
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
+        <section name="AdminMenuSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
new file mode 100644
index 0000000000000..b68b9914186f6
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminLoginPage" url="admin" area="admin" module="Magento_Backend">
+        <section name="AdminLoginFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
new file mode 100644
index 0000000000000..713199771e824
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminLogoutPage" url="admin/auth/logout/" area="admin" module="Magento_Backend"/>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/README.md b/app/code/Magento/Backend/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ed8a3a3bc2c49
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Backend Functional Tests
+
+The Functional Test Module for **Magento Backend** module.
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
new file mode 100644
index 0000000000000..2ec25da461908
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminConfirmationModalSection">
+        <element name="title" type="text" selector="aside.confirm .modal-title"/>
+        <element name="message" type="text" selector="aside.confirm .modal-content"/>
+        <element name="cancel" type="button" selector="aside.confirm .modal-footer button.action-dismiss" timeout="30"/>
+        <element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
new file mode 100644
index 0000000000000..cc92e530cf3d4
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminGridTableSection">
+        <element name="row" type="text" selector="table.data-grid tbody tr[data-role=row]:nth-of-type({{row}})" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
new file mode 100644
index 0000000000000..441ce886f117b
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminHeaderSection">
+        <element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
new file mode 100644
index 0000000000000..3b10fac7bb9dc
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminLoginFormSection">
+        <element name="username" type="input" selector="#username"/>
+        <element name="password" type="input" selector="#login"/>
+        <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
new file mode 100644
index 0000000000000..bc576559e7a13
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMainActionsSection">
+        <element name="save" type="button" selector="#save" timeout="30"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
new file mode 100644
index 0000000000000..9e4a6d9219526
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMenuSection">
+        <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
+        <element name="catalogProducts" type="button" selector="#nav li[data-ui-id='menu-magento-catalog-catalog-products']"/>
+        <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
+        <element name="content" type="button" selector="#menu-magento-backend-content"/>
+        <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
+        <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
+        <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
new file mode 100644
index 0000000000000..b1350d5dcc1d7
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMessagesSection">
+        <element name="success" type="text" selector="#messages div.message-success"/>
+        <element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
+        <element name="error" type="text" selector="#messages div.message-error"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
new file mode 100644
index 0000000000000..9051eb747a7a6
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSecondaryGridSection">
+        <element name="resetFilters" type="button" selector="[title='Reset Filter']"/>
+        <element name="taxIdentifierSearch" type="input" selector=".col-code .admin__control-text"/>
+        <element name="catalogRuleIdentifierSearch" type="input" selector=".col-name .admin__control-text"/>
+        <element name="searchButton" type="input" selector=".admin__filter-actions [title='Search']"/>
+        <element name="firstRow" type="block" selector="tr[data-role='row']"/>
+    </section>
+</sections>
+
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
new file mode 100644
index 0000000000000..a2645c9cbf96d
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSlideOutDialogSection">
+        <element name="closeButton" type="button" selector=".modal-slide._show [data-role='closeBtn']" timeout="30"/>
+        <element name="cancelButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']" timeout="30"/>
+        <element name="doneButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']" timeout="30"/>
+        <element name="saveButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
new file mode 100644
index 0000000000000..c50bf0664f9cb
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LocaleOptionsSection">
+        <element name="sectionHeader" type="text" selector="#general_locale-head"/>
+        <element name="timezone" type="select" selector="#general_locale_timezone"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
new file mode 100644
index 0000000000000..7f0194b7dc347
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminLoginTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Login on the Admin Login page"/>
+            <title value="Admin should be able to log into the Magento Admin backend"/>
+            <description value="Admin should be able to log into the Magento Admin backend"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-71572"/>
+            <group value="example"/>
+            <group value="login"/>
+        </annotations>
+
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
+        <closeAdminNotification stepKey="closeAdminNotification"/>
+        <seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
new file mode 100644
index 0000000000000..c9a3b8089cc1d
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMenuNavigationWithSecretKeysTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin should be able to navigate between menu options with secret url keys enabled"/>
+            <description value="Admin should be able to navigate between menu options with secret url keys enabled"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-95349"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
+        <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
+        <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
+
+        <click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
+        <click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
+        <waitForPageLoad stepKey="waitForProductsPageLoad"/>
+        <seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
+
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
+        <waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
+        <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
index 7e4c426de9452..88b994a6b93b7 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
@@ -146,6 +146,9 @@ public function testProcessNotLoggedInUser($isIFrameParam, $isAjaxParam, $isForw
         $this->assertEquals($expectedResult, $this->plugin->aroundDispatch($subject, $proceed, $request));
     }
 
+    /**
+     * @return array
+     */
     public function processNotLoggedInUserDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
index 2f808eaf2d1b8..d793a80cdeacf 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
@@ -74,6 +74,9 @@ public function testBeforeDispatchWhenMassactionPrepareKeyRequestExists($postDat
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 
+    /**
+     * @return array
+     */
     public function beforeDispatchDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php b/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php
index 4eff6218961af..2d60bef3f3e8c 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php
@@ -8,6 +8,9 @@
 
 class ActionStub extends \Magento\Backend\App\Action
 {
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
+     */
     public function execute()
     {
         // Empty method stub for test
diff --git a/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php b/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php
index bc7dce6f20bac..642c6283decae 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php
@@ -118,6 +118,9 @@ public function testIsHostBackend($url, $host, $useCustomAdminUrl, $customAdminU
         $this->assertEquals($this->model->isHostBackend(), $expectedValue);
     }
 
+    /**
+     * @return array
+     */
     public function hostsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php b/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php
index 114c57867badf..53640a81e722f 100644
--- a/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php
@@ -70,6 +70,9 @@ public function testIsSetFlag($configPath, $configValue, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->isSetFlag($configPath));
     }
 
+    /**
+     * @return array
+     */
     public function isSetFlagDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php b/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php
index f52f4ab337712..eccb08e788a95 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php
@@ -141,6 +141,9 @@ public function testRenderAnchorLevelIsNotOne($hasTarget)
         );
     }
 
+    /**
+     * @return array
+     */
     public function targetDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php b/app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php
index 160cfe609f85f..915b3fe21eaa8 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php
@@ -11,7 +11,7 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Backend\Block\Cache\Additional
      */
-    private $additonalBlock;
+    private $additionalBlock;
 
     /**
      * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -39,7 +39,7 @@ protected function setUp()
             ]
         );
 
-        $this->additonalBlock = $objectHelper->getObject(
+        $this->additionalBlock = $objectHelper->getObject(
             \Magento\Backend\Block\Cache\Additional::class,
             ['context' => $context]
         );
@@ -52,7 +52,7 @@ public function testGetCleanImagesUrl()
             ->method('getUrl')
             ->with('*/*/cleanImages')
             ->will($this->returnValue($expectedUrl));
-        $this->assertEquals($expectedUrl, $this->additonalBlock->getCleanImagesUrl());
+        $this->assertEquals($expectedUrl, $this->additionalBlock->getCleanImagesUrl());
     }
 
     public function testGetCleanMediaUrl()
@@ -62,7 +62,7 @@ public function testGetCleanMediaUrl()
             ->method('getUrl')
             ->with('*/*/cleanMedia')
             ->will($this->returnValue($expectedUrl));
-        $this->assertEquals($expectedUrl, $this->additonalBlock->getCleanMediaUrl());
+        $this->assertEquals($expectedUrl, $this->additionalBlock->getCleanMediaUrl());
     }
 
     public function testGetCleanStaticFiles()
@@ -72,7 +72,7 @@ public function testGetCleanStaticFiles()
             ->method('getUrl')
             ->with('*/*/cleanStaticFiles')
             ->will($this->returnValue($expectedUrl));
-        $this->assertEquals($expectedUrl, $this->additonalBlock->getCleanStaticFilesUrl());
+        $this->assertEquals($expectedUrl, $this->additionalBlock->getCleanStaticFilesUrl());
     }
 
     /**
@@ -85,9 +85,12 @@ public function testIsInProductionMode($mode, $expected)
         $this->appStateMock->expects($this->once())
             ->method('getMode')
             ->willReturn($mode);
-        $this->assertEquals($expected, $this->additonalBlock->isInProductionMode());
+        $this->assertEquals($expected, $this->additionalBlock->isInProductionMode());
     }
 
+    /**
+     * @return array
+     */
     public function isInProductionModeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php b/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php
new file mode 100644
index 0000000000000..6975b8ac092ad
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Unit\Block\Cache;
+
+use Magento\Backend\Block\Cache\Permissions;
+use Magento\Framework\Authorization;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class PermissionsTest
+ */
+class PermissionsTest extends TestCase
+{
+    /**
+     * @var Permissions
+     */
+    private $permissions;
+
+    /**
+     * @var AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mockAuthorization;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    public function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->mockAuthorization = $this->getMockBuilder(Authorization::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAllowed'])
+            ->getMock();
+
+        $this->permissions = new Permissions($this->mockAuthorization);
+    }
+
+    public function testHasAccessToFlushCatalogImages()
+    {
+        $this->mockAuthorization->expects($this->atLeastOnce())
+            ->method('isAllowed')
+            ->with('Magento_Backend::flush_catalog_images')
+            ->willReturn(true);
+
+        $this->assertTrue($this->permissions->hasAccessToFlushCatalogImages());
+    }
+
+    public function testHasAccessToFlushJsCss()
+    {
+        $this->mockAuthorization->expects($this->atLeastOnce())
+            ->method('isAllowed')
+            ->with('Magento_Backend::flush_js_css')
+            ->willReturn(true);
+
+        $this->assertTrue($this->permissions->hasAccessToFlushJsCss());
+    }
+
+    public function testHasAccessToFlushStaticFiles()
+    {
+        $this->mockAuthorization->expects($this->atLeastOnce())
+            ->method('isAllowed')
+            ->with('Magento_Backend::flush_static_files')
+            ->willReturn(true);
+
+        $this->assertTrue($this->permissions->hasAccessToFlushStaticFiles());
+    }
+}
diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php
index a79050faeb84a..aca719b2e65e9 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php
@@ -74,6 +74,9 @@ public function testIsItemActiveLevelNotZero()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
index bcf5d1adbc12b..e64d1a97af4ae 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
@@ -61,6 +61,9 @@ public function testGetAttributesHtml($data, $expect)
         $this->assertRegExp($expect, $attributes);
     }
 
+    /**
+     * @return array
+     */
     public function getAttributesHtmlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php
index 355d11b561317..2848c9b23d2b7 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php
@@ -30,6 +30,12 @@ class DateTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $localeDateMock;
 
+    /** @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
+    private $escaperMock;
+
+    /** @var \Magento\Backend\Block\Context|\PHPUnit_Framework_MockObject_MockObject */
+    private $contextMock;
+
     protected function setUp()
     {
         $this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
@@ -58,6 +64,17 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->contextMock->expects($this->once())->method('getLocaleDate')->willReturn($this->localeDateMock);
+
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\Backend\Block\Widget\Grid\Column\Filter\Date::class,
@@ -65,7 +82,8 @@ protected function setUp()
                 'mathRandom' => $this->mathRandomMock,
                 'localeResolver' => $this->localeResolverMock,
                 'dateTimeFormatter' => $this->dateTimeFormatterMock,
-                'localeDate' => $this->localeDateMock
+                'localeDate' => $this->localeDateMock,
+                'context' => $this->contextMock,
             ]
         );
         $this->model->setColumn($this->columnMock);
@@ -98,4 +116,16 @@ public function testGetHtmlSuccessfulTimestamp()
         $this->assertContains('id="' . $uniqueHash . '_from" value="' . $yesterday->getTimestamp(), $output);
         $this->assertContains('id="' . $uniqueHash . '_to" value="' . $tomorrow->getTimestamp(), $output);
     }
+
+    public function testGetEscapedValueEscapeString()
+    {
+        $value = "\"><img src=x onerror=alert(2) />";
+        $array = [
+            'orig_from' => $value,
+            'from' => $value,
+        ];
+        $this->model->setValue($array);
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($value);
+        $this->model->getEscapedValue('from');
+    }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php
index 1e692f890a94e..cdb88b6735f15 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php
@@ -30,6 +30,12 @@ class DatetimeTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $localeDateMock;
 
+    /** @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
+    private $escaperMock;
+
+    /** @var \Magento\Backend\Block\Context|\PHPUnit_Framework_MockObject_MockObject */
+    private $contextMock;
+
     protected function setUp()
     {
         $this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
@@ -50,7 +56,7 @@ protected function setUp()
 
         $this->columnMock = $this->getMockBuilder(\Magento\Backend\Block\Widget\Grid\Column::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getTimezone', 'getHtmlId', 'getId'])
+            ->setMethods(['getTimezone', 'getHtmlId', 'getId', 'getFilterTime'])
             ->getMock();
 
         $this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
@@ -58,6 +64,17 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->contextMock->expects($this->once())->method('getLocaleDate')->willReturn($this->localeDateMock);
+
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\Backend\Block\Widget\Grid\Column\Filter\Datetime::class,
@@ -65,7 +82,8 @@ protected function setUp()
                 'mathRandom' => $this->mathRandomMock,
                 'localeResolver' => $this->localeResolverMock,
                 'dateTimeFormatter' => $this->dateTimeFormatterMock,
-                'localeDate' => $this->localeDateMock
+                'localeDate' => $this->localeDateMock,
+                'context' => $this->contextMock,
             ]
         );
         $this->model->setColumn($this->columnMock);
@@ -98,4 +116,17 @@ public function testGetHtmlSuccessfulTimestamp()
         $this->assertContains('id="' . $uniqueHash . '_from" value="' . $yesterday->getTimestamp(), $output);
         $this->assertContains('id="' . $uniqueHash . '_to" value="' . $tomorrow->getTimestamp(), $output);
     }
+
+    public function testGetEscapedValueEscapeString()
+    {
+        $value = "\"><img src=x onerror=alert(2) />";
+        $array = [
+            'orig_from' => $value,
+            'from' => $value,
+        ];
+        $this->model->setValue($array);
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($value);
+        $this->columnMock->expects($this->once())->method('getFilterTime')->willReturn(true);
+        $this->model->getEscapedValue('from');
+    }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/Radio/ExtendedTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/Radio/ExtendedTest.php
index 35e21d7d194aa..81f104dbb636b 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/Radio/ExtendedTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/Radio/ExtendedTest.php
@@ -54,6 +54,9 @@ public function testRender(array $rowData, $expectedResult)
         $this->assertEquals($expectedResult, $this->_object->render(new \Magento\Framework\DataObject($rowData)));
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/RadioTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/RadioTest.php
index 67ead0ddd8f35..6f838634c6bed 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/RadioTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/RadioTest.php
@@ -63,6 +63,9 @@ public function testRender(array $rowData, $expectedResult)
         $this->assertEquals($expectedResult, $this->_object->render(new \Magento\Framework\DataObject($rowData)));
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
index be171a8ed40bf..df242a4cf6129 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
@@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns()
 
     public function testGetRowUrlIfUrlPathNotSet()
     {
-        $this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));
+        $this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));
     }
 
     public function testGetRowUrl()
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
index da13af87b71ea..2e6bed4783e7f 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
@@ -86,6 +86,9 @@ public function testGetSortable($value)
         $this->assertFalse($this->_block->getSortable());
     }
 
+    /**
+     * @return array
+     */
     public function getSortableDataProvider()
     {
         return ['zero' => ['0'], 'false' => [false], 'null' => [null]];
@@ -351,7 +354,7 @@ public function testSetGetGrid()
 
         $this->_block->setFilter('StdClass');
 
-        $grid = new \StdClass();
+        $grid = new \stdClass();
         $this->_block->setGrid($grid);
         $this->assertEquals($grid, $this->_block->getGrid());
     }
@@ -374,6 +377,9 @@ public function testColumnIsGrouped($groupedData, $expected)
         $this->assertEquals($expected, $block->isGrouped());
     }
 
+    /**
+     * @return array
+     */
     public function columnGroupedDataProvider()
     {
         return [[[], false], [['grouped' => 0], false], [['grouped' => 1], true]];
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php
index 4525de1fee542..f81928c4540ba 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php
@@ -152,6 +152,9 @@ public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
         $this->assertEquals($result, $this->_block->getGridIdsJson());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetGridIdsJsonWithUseSelectAll()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
index bb389a996e1ed..e8143b5f6b43a 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
@@ -10,6 +10,7 @@
 namespace Magento\Backend\Test\Unit\Block\Widget\Grid;
 
 use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
+use Magento\Framework\Authorization;
 
 class MassactionTest extends \PHPUnit\Framework\TestCase
 {
@@ -43,6 +44,11 @@ class MassactionTest extends \PHPUnit\Framework\TestCase
      */
     protected $_requestMock;
 
+    /**
+     * @var Authorization|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_authorizationMock;
+
     /**
      * @var VisibilityChecker|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -86,11 +92,17 @@ protected function setUp()
         $this->visibilityCheckerMock = $this->getMockBuilder(VisibilityChecker::class)
             ->getMockForAbstractClass();
 
+        $this->_authorizationMock = $this->getMockBuilder(Authorization::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAllowed'])
+            ->getMock();
+
         $arguments = [
             'layout' => $this->_layoutMock,
             'request' => $this->_requestMock,
             'urlBuilder' => $this->_urlModelMock,
-            'data' => ['massaction_id_field' => 'test_id', 'massaction_id_filter' => 'test_id']
+            'data' => ['massaction_id_field' => 'test_id', 'massaction_id_filter' => 'test_id'],
+            'authorization' => $this->_authorizationMock,
         ];
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -145,6 +157,10 @@ public function testItemsProcessing($itemId, $item, $expectedItem)
             ->method('getUrl')
             ->willReturnMap($urlReturnValueMap);
 
+        $this->_authorizationMock->expects($this->any())
+            ->method('isAllowed')
+            ->willReturn(true);
+
         $this->_block->addItem($itemId, $item);
         $this->assertEquals(1, $this->_block->getCount());
 
@@ -184,6 +200,28 @@ public function itemsProcessingDataProvider()
                         "id" => 'test_id2',
                     ]
                 )
+            ],
+            [
+                'enabled',
+                new \Magento\Framework\DataObject(["label" => "Test Item Enabled", "url" => "*/*/test2"]),
+                new \Magento\Framework\DataObject(
+                    [
+                        "label" => "Test Item Enabled",
+                        "url" => "http://localhost/index.php/backend/admin/test/test2",
+                        "id" => 'enabled',
+                    ]
+                )
+            ],
+            [
+                'refresh',
+                new \Magento\Framework\DataObject(["label" => "Test Item Refresh", "url" => "*/*/test2"]),
+                new \Magento\Framework\DataObject(
+                    [
+                        "label" => "Test Item Refresh",
+                        "url" => "http://localhost/index.php/backend/admin/test/test2",
+                        "id" => 'refresh',
+                    ]
+                )
             ]
         ];
     }
@@ -205,6 +243,9 @@ public function testSelected($param, $expectedJson, $expected)
         $this->assertEquals($expected, $this->_block->getSelected());
     }
 
+    /**
+     * @return array
+     */
     public function selectedDataProvider()
     {
         return [
@@ -237,7 +278,7 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
     public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
     {
         $this->_block->setUseSelectAll(true);
-        
+
         if ($this->_block->getMassactionIdField()) {
             $massActionIdField = $this->_block->getMassactionIdField();
         } else {
@@ -290,14 +331,20 @@ public function dataProviderGetGridIdsJsonWithUseSelectAll()
      * @param int $count
      * @param bool $withVisibilityChecker
      * @param bool $isVisible
+     * @param bool $isAllowed
+     *
      * @dataProvider addItemDataProvider
      */
-    public function testAddItem($itemId, $item, $count, $withVisibilityChecker, $isVisible)
+    public function testAddItem($itemId, $item, $count, $withVisibilityChecker, $isVisible, $isAllowed)
     {
         $this->visibilityCheckerMock->expects($this->any())
             ->method('isVisible')
             ->willReturn($isVisible);
 
+        $this->_authorizationMock->expects($this->any())
+            ->method('isAllowed')
+            ->willReturn($isAllowed);
+
         if ($withVisibilityChecker) {
             $item['visible'] = $this->visibilityCheckerMock;
         }
@@ -311,7 +358,7 @@ public function testAddItem($itemId, $item, $count, $withVisibilityChecker, $isV
             ->willReturnMap($urlReturnValueMap);
 
         $this->_block->addItem($itemId, $item);
-        $this->assertEquals($count, $this->_block->getCount());
+        $this->assertEquals($count, $this->_block->getCount(), $itemId);
     }
 
     /**
@@ -325,7 +372,8 @@ public function addItemDataProvider()
                 'item' => ['label' => 'Test 1', 'url' => '*/*/test1'],
                 'count' => 1,
                 'withVisibilityChecker' => false,
-                '$isVisible' => false,
+                'isVisible' => false,
+                'isAllowed' => true,
             ],
             [
                 'itemId' => 'test2',
@@ -333,21 +381,56 @@ public function addItemDataProvider()
                 'count' => 1,
                 'withVisibilityChecker' => false,
                 'isVisible' => true,
+                'isAllowed' => true,
             ],
             [
-                'itemId' => 'test1',
-                'item' => ['label' => 'Test 1. Hide', 'url' => '*/*/test1'],
+                'itemId' => 'test3',
+                'item' => ['label' => 'Test 3. Hide', 'url' => '*/*/test3'],
                 'count' => 0,
                 'withVisibilityChecker' => true,
                 'isVisible' => false,
+                'isAllowed' => true,
             ],
             [
-                'itemId' => 'test2',
-                'item' => ['label' => 'Test 2. Does not hide', 'url' => '*/*/test2'],
+                'itemId' => 'test4',
+                'item' => ['label' => 'Test 4. Does not hide', 'url' => '*/*/test4'],
                 'count' => 1,
                 'withVisibilityChecker' => true,
                 'isVisible' => true,
-            ]
+                'isAllowed' => true,
+            ],
+            [
+                'itemId' => 'enable',
+                'item' => ['label' => 'Test 5. Not restricted', 'url' => '*/*/test5'],
+                'count' => 1,
+                'withVisibilityChecker' => true,
+                'isVisible' => true,
+                'isAllowed' => true,
+            ],
+            [
+                'itemId' => 'enable',
+                'item' => ['label' => 'Test 5. restricted', 'url' => '*/*/test5'],
+                'count' => 0,
+                'withVisibilityChecker' => true,
+                'isVisible' => true,
+                'isAllowed' => false,
+            ],
+            [
+                'itemId' => 'refresh',
+                'item' => ['label' => 'Test 6. Not Restricted', 'url' => '*/*/test6'],
+                'count' => 1,
+                'withVisibilityChecker' => true,
+                'isVisible' => true,
+                'isAllowed' => true,
+            ],
+            [
+                'itemId' => 'refresh',
+                'item' => ['label' => 'Test 6. Restricted', 'url' => '*/*/test6'],
+                'count' => 0,
+                'withVisibilityChecker' => true,
+                'isVisible' => true,
+                'isAllowed' => false,
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/TabTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/TabTest.php
index 1670233324f8e..ad7c6fa99afd2 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/TabTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/TabTest.php
@@ -34,6 +34,9 @@ public function testGetters($method, $field, $value, $expected)
         $this->assertEquals($expected, $object->{$method}());
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
index b1911da024227..ac0f4a2f467c8 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
@@ -38,7 +38,7 @@ public function testExecute()
         $messageManagerParams = $helper->getConstructArguments(\Magento\Framework\Message\Manager::class);
         $messageManagerParams['exceptionMessageFactory'] = $exceptionMessageFactory;
         $messageManager = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
-            ->setMethods(['addSuccess'])
+            ->setMethods(['addSuccessMessage'])
             ->setConstructorArgs($messageManagerParams)
             ->getMock();
 
@@ -86,7 +86,7 @@ public function testExecute()
         $mergeService->expects($this->once())->method('cleanMergedJsCss');
 
         $messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The JavaScript/CSS cache has been cleaned.');
 
         $valueMap = [
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
index 40d9ca1aa8996..fc457cd9681e6 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
@@ -76,7 +76,7 @@ public function testExecute()
             ->with('clean_static_files_cache_after');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The static files cache has been cleaned.');
 
         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
index 556db311748bd..a8b248c611e07 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache;
 
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -155,8 +156,8 @@ public function testExecuteInvalidTypeCache()
             ->willReturn(['someCache']);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('Specified cache type(s) don\'t exist: someCache')
+            ->method('addErrorMessage')
+            ->with('These cache type(s) don\'t exist: someCache')
             ->willReturnSelf();
 
         $this->assertSame($this->redirectMock, $this->controller->execute());
@@ -175,7 +176,7 @@ public function testExecuteWithException()
             ->willThrowException($exception);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, 'An error occurred while disabling cache.')
             ->willReturnSelf();
 
@@ -215,7 +216,7 @@ public function testExecuteSuccess()
             ->method('persist');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('1 cache type(s) disabled.')
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
index ad622ca69757a..6eac44a564f6d 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache;
 
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -155,8 +156,8 @@ public function testExecuteInvalidTypeCache()
             ->willReturn(['someCache']);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('Specified cache type(s) don\'t exist: someCache')
+            ->method('addErrorMessage')
+            ->with('These cache type(s) don\'t exist: someCache')
             ->willReturnSelf();
 
         $this->assertSame($this->redirectMock, $this->controller->execute());
@@ -175,7 +176,7 @@ public function testExecuteWithException()
             ->willThrowException($exception);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, 'An error occurred while enabling cache.')
             ->willReturnSelf();
 
@@ -215,7 +216,7 @@ public function testExecuteSuccess()
             ->method('persist');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('1 cache type(s) enabled.')
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
index e8dcc00345fc6..a985681919f0b 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
@@ -107,7 +107,7 @@ public function testExecute()
         $this->resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirect);
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('We updated lifetime statistic.'));
 
         $this->objectManager->expects($this->any())
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
index 844a821df1c20..a8490d6ba2e58 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
@@ -71,7 +71,7 @@ protected function setUp()
             ->getMock();
         $this->_messagesMock = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess'])
+            ->setMethods(['addSuccessMessage'])
             ->getMockForAbstractClass();
 
         $this->_authSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
@@ -221,7 +221,7 @@ public function testSaveAction()
 
         $this->_requestMock->setParams($requestParams);
 
-        $this->_messagesMock->expects($this->once())->method('addSuccess')->with($this->equalTo($testedMessage));
+        $this->_messagesMock->expects($this->once())->method('addSuccessMessage')->with($this->equalTo($testedMessage));
 
         $this->_controller->execute();
     }
diff --git a/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php b/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php
index b7a33ab883b69..50c3a8571b48f 100644
--- a/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php
@@ -60,6 +60,9 @@ public function testPrepareFilterStringValues(array $inputString, array $expecte
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function getPrepareFilterStringValuesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
index 4911dc1e9968e..b373459b7864d 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
@@ -76,17 +76,35 @@ public function testGetCurrentSecureUrl()
      * @param $unsecureBaseUrl
      * @param $useSecureInAdmin
      * @param $secureBaseUrl
+     * @param $useCustomUrl
+     * @param $customUrl
      * @param $expected
      * @dataProvider shouldBeSecureDataProvider
      */
-    public function testShouldBeSecure($unsecureBaseUrl, $useSecureInAdmin, $secureBaseUrl, $expected)
-    {
-        $coreConfigValueMap = [
+    public function testShouldBeSecure(
+        $unsecureBaseUrl,
+        $useSecureInAdmin,
+        $secureBaseUrl,
+        $useCustomUrl,
+        $customUrl,
+        $expected
+    ) {
+        $coreConfigValueMap = $this->returnValueMap([
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default', null, $unsecureBaseUrl],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default', null, $secureBaseUrl],
-        ];
-        $this->coreConfig->expects($this->any())->method('getValue')->will($this->returnValueMap($coreConfigValueMap));
-        $this->backendConfig->expects($this->any())->method('isSetFlag')->willReturn($useSecureInAdmin);
+            ['admin/url/custom', 'default', null, $customUrl],
+        ]);
+        $backendConfigFlagsMap = $this->returnValueMap([
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_IN_ADMINHTML, $useSecureInAdmin],
+            ['admin/url/use_custom', $useCustomUrl],
+        ]);
+        $this->coreConfig->expects($this->atLeast(1))->method('getValue')
+            ->will($coreConfigValueMap);
+        $this->coreConfig->expects($this->atMost(2))->method('getValue')
+            ->will($coreConfigValueMap);
+
+        $this->backendConfig->expects($this->atMost(2))->method('isSetFlag')
+            ->will($backendConfigFlagsMap);
         $this->assertEquals($expected, $this->adminPathConfig->shouldBeSecure(''));
     }
 
@@ -96,13 +114,13 @@ public function testShouldBeSecure($unsecureBaseUrl, $useSecureInAdmin, $secureB
     public function shouldBeSecureDataProvider()
     {
         return [
-            ['http://localhost/', false, 'default', false],
-            ['http://localhost/', true, 'default', false],
-            ['https://localhost/', false, 'default', true],
-            ['https://localhost/', true, 'default', true],
-            ['http://localhost/', false, 'https://localhost/', false],
-            ['http://localhost/', true, 'https://localhost/', true],
-            ['https://localhost/', true, 'https://localhost/', true],
+            ['http://localhost/', false, 'default', false, '', false],
+            ['http://localhost/', true, 'default', false, '', false],
+            ['https://localhost/', false, 'default', false, '', true],
+            ['https://localhost/', true, 'default', false, '', true],
+            ['http://localhost/', false, 'https://localhost/', false, '', false],
+            ['http://localhost/', true, 'https://localhost/', false, '', true],
+            ['https://localhost/', true, 'https://localhost/', false, '', true],
         ];
     }
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php b/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
index 391deac5a1f4e..f1a4bc355b08e 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
@@ -120,6 +120,9 @@ public function testRefreshAcl($isUserPassedViaParams)
         $this->assertSame($aclMock, $this->session->getAcl());
     }
 
+    /**
+     * @return array
+     */
     public function refreshAclDataProvider()
     {
         return [
@@ -234,6 +237,9 @@ public function testIsAllowed($isUserDefined, $isAclDefined, $isAllowed, $expect
         $this->assertEquals($expectedResult, $this->session->isAllowed('resource'));
     }
 
+    /**
+     * @return array
+     */
     public function isAllowedDataProvider()
     {
         return [
@@ -254,6 +260,9 @@ public function testFirstPageAfterLogin($isFirstPageAfterLogin)
         $this->assertEquals($isFirstPageAfterLogin, $this->session->isFirstPageAfterLogin());
     }
 
+    /**
+     * @return array
+     */
     public function firstPageAfterLoginDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php b/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php
index 4b79d504dad91..4af060b157ed4 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php
@@ -54,7 +54,6 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testLoginFailed()
     {
@@ -64,7 +63,10 @@ public function testLoginFailed()
             ->with(\Magento\Backend\Model\Auth\Credential\StorageInterface::class)
             ->will($this->returnValue($this->_credentialStorage));
         $exceptionMock = new \Magento\Framework\Exception\LocalizedException(
-            __('You did not sign in correctly or your account is temporarily disabled.')
+            __(
+                'The account sign-in was incorrect or your account is disabled temporarily. '
+                . 'Please wait and try again later.'
+            )
         );
         $this->_credentialStorage
             ->expects($this->once())
@@ -74,5 +76,10 @@ public function testLoginFailed()
         $this->_credentialStorage->expects($this->never())->method('getId');
         $this->_eventManagerMock->expects($this->once())->method('dispatch')->with('backend_auth_user_login_failed');
         $this->_model->login('username', 'password');
+
+        $this->expectExceptionMessage(
+            'The account sign-in was incorrect or your account is disabled temporarily. '
+            . 'Please wait and try again later.'
+        );
     }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
index 31a13191750a3..cce83c33a2aaa 100755
--- a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Unit\Model\Config\SessionLifetime;
 
 use Magento\Backend\Model\Config\SessionLifetime\BackendModel;
@@ -20,23 +21,28 @@ public function testBeforeSave($value, $errorMessage = null)
             \Magento\Backend\Model\Config\SessionLifetime\BackendModel::class
         );
         if ($errorMessage !== null) {
-            $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $errorMessage);
+            $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+            $this->expectExceptionMessage($errorMessage);
         }
         $model->setValue($value);
         $object = $model->beforeSave();
         $this->assertEquals($model, $object);
     }
 
+    /**
+     * @return array
+     */
     public function adminSessionLifetimeDataProvider()
     {
         return [
             [
                 BackendModel::MIN_LIFETIME - 1,
-                'Admin session lifetime must be greater than or equal to 60 seconds'
+                'The Admin session lifetime is invalid. Set the lifetime to 60 seconds or longer and try again.'
             ],
             [
                 BackendModel::MAX_LIFETIME + 1,
-                'Admin session lifetime must be less than or equal to 31536000 seconds (one year)'
+                'The Admin session lifetime is invalid. '
+                . 'Set the lifetime to 31536000 seconds (one year) or shorter and try again.'
             ],
             [
                 900
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
index bc18bd44f4be4..2b5f644e35977 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
@@ -96,7 +96,7 @@ public function testGetMenuWithCachedObjectReturnsUnserializedObject()
         $this->assertEquals($this->menuMock, $this->model->getMenu());
     }
 
-    public function testGetMenuWithNotCachedObjectBuidlsObject()
+    public function testGetMenuWithNotCachedObjectBuildsObject()
     {
         $this->cacheInstanceMock->expects(
             $this->at(0)
@@ -140,6 +140,9 @@ public function testGetMenuExceptionLogged($expectedException)
         $this->model->getMenu();
     }
 
+    /**
+     * @return array
+     */
     public function getMenuExceptionLoggedDataProvider()
     {
         return [
@@ -165,6 +168,6 @@ public function testGetMenuGenericExceptionIsNotLogged()
         } catch (\Exception $e) {
             return;
         }
-        $this->fail("Generic \Exception was not throwed");
+        $this->fail("Generic \Exception was not thrown");
     }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/Item/ValidatorTest.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/Item/ValidatorTest.php
index 3c1f1e43900be..dec85f4b98e3d 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Menu/Item/ValidatorTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Menu/Item/ValidatorTest.php
@@ -79,6 +79,9 @@ public function testValidateWithMissingRequiredParamThrowsException($requiredPar
         }
     }
 
+    /**
+     * @return array
+     */
     public function requiredParamsProvider()
     {
         return [['id'], ['title'], ['resource']];
@@ -102,6 +105,9 @@ public function testValidateWithNonValidPrimitivesThrowsException($param, $inval
         }
     }
 
+    /**
+     * @return array
+     */
     public function invalidParamsProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
index 23d1ed5da1425..5d026a2b1fc32 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
@@ -35,6 +35,9 @@ public function testAfterGetResult($isPub, $times)
         );
     }
 
+    /**
+     * @return array
+     */
     public function afterGetResultDataProvider()
     {
         return [[true, 1], [false, 0],];
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php
index 49fcdf4fc8770..00ae8c2f44a69 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php
@@ -136,6 +136,9 @@ public function testSetSessionSettingsByConstructor($secureRequest)
         $this->assertSame($secureRequest, $adminConfig->getCookieSecure());
     }
 
+    /**
+     * @return array
+     */
     public function requestSecureDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Widget/Grid/ParserTest.php b/app/code/Magento/Backend/Test/Unit/Model/Widget/Grid/ParserTest.php
index 569c5ffc16c9c..98f1965477b2c 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Widget/Grid/ParserTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Widget/Grid/ParserTest.php
@@ -58,6 +58,9 @@ public function testIsOperation($operation, $expected)
         $this->assertEquals($expected, $this->_model->isOperation($operation));
     }
 
+    /**
+     * @return array
+     */
     public function isOperationDataProvider()
     {
         return [
diff --git a/app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php b/app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php
new file mode 100644
index 0000000000000..c7ff1d95617b6
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Service/V1/ModuleServiceTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Service\V1;
+
+use Magento\Backend\Service\V1\ModuleService;
+use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Module List Service Test
+ *
+ * Covers \Magento\Sales\Model\ValidatorResultMerger
+ */
+class ModuleServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ModuleService
+     */
+    private $moduleService;
+
+    /**
+     * @var ModuleListInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleListMock;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->moduleListMock = $this->createMock(ModuleListInterface::class);
+        $this->objectManager = new ObjectManager($this);
+        $this->moduleService = $this->objectManager->getObject(
+            ModuleService::class,
+            [
+                'moduleList' => $this->moduleListMock,
+            ]
+        );
+    }
+
+    /**
+     * Test getModules method
+     *
+     * @return void
+     */
+    public function testGetModules()
+    {
+        $moduleNames = ['Magento_Backend', 'Magento_Catalog', 'Magento_Customer'];
+        $this->moduleListMock->expects($this->once())->method('getNames')->willReturn($moduleNames);
+
+        $expected = $moduleNames;
+        $actual = $this->moduleService->getModules();
+        $this->assertEquals($expected, $actual);
+    }
+}
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 0000000000000..3f4f3669ab75b
--- /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/composer.json b/app/code/Magento/Backend/composer.json
index fbbecb25efa50..f9408768136bb 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -5,30 +5,29 @@
         "sort-packages": true
     },
     "require": {
-      "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-      "magento/framework": "100.3.*",
-      "magento/module-backup": "100.3.*",
-      "magento/module-catalog": "101.2.*",
-      "magento/module-config": "100.3.*",
-      "magento/module-customer": "100.3.*",
-      "magento/module-developer": "100.3.*",
-      "magento/module-directory": "100.3.*",
-      "magento/module-eav": "100.3.*",
-      "magento/module-quote": "100.3.*",
-      "magento/module-reports": "100.3.*",
-      "magento/module-require-js": "100.3.*",
-      "magento/module-sales": "100.3.*",
-      "magento/module-security": "100.3.*",
-      "magento/module-store": "100.3.*",
-      "magento/module-translation": "100.3.*",
-      "magento/module-ui": "100.3.*",
-      "magento/module-user": "100.3.*"
+      "php": "~7.1.3||~7.2.0",
+      "magento/framework": "*",
+      "magento/module-backup": "*",
+      "magento/module-catalog": "*",
+      "magento/module-config": "*",
+      "magento/module-customer": "*",
+      "magento/module-developer": "*",
+      "magento/module-directory": "*",
+      "magento/module-eav": "*",
+      "magento/module-quote": "*",
+      "magento/module-reports": "*",
+      "magento/module-require-js": "*",
+      "magento/module-sales": "*",
+      "magento/module-security": "*",
+      "magento/module-store": "*",
+      "magento/module-translation": "*",
+      "magento/module-ui": "*",
+      "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-theme": "100.3.*"
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backend/etc/acl.xml b/app/code/Magento/Backend/etc/acl.xml
index af4ab5856e94c..cf9471e75bed9 100644
--- a/app/code/Magento/Backend/etc/acl.xml
+++ b/app/code/Magento/Backend/etc/acl.xml
@@ -38,7 +38,21 @@
                         <resource id="Magento_Backend::custom" title="Package Extensions" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::tools" title="Tools" translate="title" sortOrder="50">
-                        <resource id="Magento_Backend::cache" title="Cache Management" translate="title"  sortOrder="10" />
+                        <resource id="Magento_Backend::cache" title="Cache Management" translate="title"  sortOrder="10">
+                            <resource id="Magento_Backend::main_actions" title="Clean Cache Actions" translate="title" sortOrder="10">
+                                <resource id="Magento_Backend::flush_cache_storage" title="Flush Cache Storage" translate="title" sortOrder="10" />
+                                <resource id="Magento_Backend::flush_magento_cache" title="Flush Magento Cache" translate="title" sortOrder="20" />
+                            </resource>
+                            <resource id="Magento_Backend::mass_actions" title="Cache Types Management" translate="title" sortOrder="20">
+                                <resource id="Magento_Backend::toggling_cache_type" title="Toggle Cache Type" translate="title" sortOrder="10" />
+                                <resource id="Magento_Backend::refresh_cache_type" title="Refresh Cache Type" translate="title" sortOrder="20" />
+                            </resource>
+                            <resource id="Magento_Backend::additional_cache_management" title="Additional Cache Management" translate="title" sortOrder="30">
+                                <resource id="Magento_Backend::flush_catalog_images" title="Catalog Images Cache" translate="title" sortOrder="10" />
+                                <resource id="Magento_Backend::flush_js_css" title="Flush Js/Css" translate="title" sortOrder="20" />
+                                <resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
+                            </resource>
+                        </resource>
                         <resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title"  sortOrder="80" />
diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
index 050115087c26e..4abea272c5495 100644
--- a/app/code/Magento/Backend/etc/adminhtml/di.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -139,10 +139,16 @@
     <type name="Magento\Backend\Model\Menu\Builder">
         <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
     </type>
-    <type name="Magento\Config\Model\Config\Structure\ConcealInProductionConfigList">
+    <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
         <arguments>
             <argument name="configs" xsi:type="array">
                 <item name="dev" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProductionWithoutScdOnDemand">
+        <arguments>
+            <argument name="configs" xsi:type="array">
                 <item name="general/locale/code" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED</item>
             </argument>
         </arguments>
@@ -156,4 +162,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\Layout\Generator\Block">
+        <arguments>
+            <argument name="defaultClass" xsi:type="string">Magento\Backend\Block\Template</argument>
+        </arguments>
+    </type>
+    <preference for="CsrfRequestValidator" type="Magento\Backend\App\Request\BackendValidator" />
+    <preference for="Magento\Backend\Model\Image\UploadResizeConfigInterface" type="Magento\Backend\Model\Image\UploadResizeConfig" />
 </config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 92df39bd65ee4..0fb7d89f924de 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -129,14 +129,14 @@
                         <field id="*/*/template_hints_storefront">1</field>
                         <field id="*/*/template_hints_storefront_show_with_parameter">1</field>
                     </depends>
-                    <comment>Add the following paramater to the URL to show template hints ?templatehints=[parameter_value]</comment>
+                    <comment>Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]</comment>
                 </field>
                 <field id="template_hints_admin" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enabled Template Path Hints for Admin</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Add Block Names to Hints</label>
+                    <label>Add Block Class Type to Hints</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
@@ -197,7 +197,7 @@
             </group>
             <group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Image Processing Settings</label>
-                <field id="default_adapter" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="default_adapter" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Image Adapter</label>
                     <source_model>Magento\Config\Model\Config\Source\Image\Adapter</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Image\Adapter</backend_model>
@@ -231,9 +231,10 @@
                     <label>European Union Countries</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                 </field>
-                <field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Top destinations</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <can_be_empty>1</can_be_empty>
                 </field>
             </group>
             <group id="locale" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -314,11 +315,11 @@
                     <label>Disable Email Communications</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="host" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="host" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Host</label>
                     <comment>For Windows server only.</comment>
                 </field>
-                <field id="port" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="port" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Port (25)</label>
                     <comment>For Windows server only.</comment>
                 </field>
@@ -335,6 +336,30 @@
                     </depends>
                 </field>
             </group>
+            <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Images Upload Configuration</label>
+                <field id="enable_resize" translate="label" type="select" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Enable Frontend Resize</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Resize performed via javascript before file upload.</comment>
+                </field>
+                <field id="max_width" translate="label comment" type="text" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Maximum Width</label>
+                    <validate>validate-greater-than-zero validate-number required-entry</validate>
+                    <comment>Maximum allowed width for uploaded image.</comment>
+                    <depends>
+                        <field id="enable_resize">1</field>
+                    </depends>
+                </field>
+                <field id="max_height" translate="label comment" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Maximum Height</label>
+                    <validate>validate-greater-than-zero validate-number required-entry</validate>
+                    <comment>Maximum allowed height for uploaded image.</comment>
+                    <depends>
+                        <field id="enable_resize">1</field>
+                    </depends>
+                </field>
+            </group>
         </section>
         <section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
             <label>Admin</label>
@@ -425,17 +450,17 @@
             <label>Web</label>
             <tab>general</tab>
             <resource>Magento_Config::web</resource>
-            <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Url Options</label>
                 <field id="use_store" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Add Store Code to Urls</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Store</backend_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).]]>
+                        <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
                     </comment>
                 </field>
-                <field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Auto-redirect to Base URL</label>
                     <source_model>Magento\Config\Model\Config\Source\Web\Redirect</source_model>
                     <comment>I.e. redirect from http://example.com/store/ to http://www.example.com/store/</comment>
@@ -448,7 +473,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
-            <group id="unsecure" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="unsecure" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Base URLs</label>
                 <comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/</comment>
                 <field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -456,7 +481,7 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>Specify URL or {{base_url}} placeholder.</comment>
                 </field>
-                <field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Base Link URL</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>May start with {{unsecure_base_url}} placeholder.</comment>
@@ -466,13 +491,13 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
                 </field>
-                <field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Base URL for User Media Files</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
                 </field>
             </group>
-            <group id="secure" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Base URLs (Secure)</label>
                 <comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/</comment>
                 <field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -480,7 +505,7 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
                 </field>
-                <field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Secure Base Link URL</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
@@ -490,24 +515,24 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
                 </field>
-                <field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Secure Base URL for User Media Files</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
                     <comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
                 </field>
-                <field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Use Secure URLs on Storefront</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
                     <comment>Enter https protocol to use Secure URLs on Storefront.</comment>
                 </field>
-                <field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="use_in_adminhtml" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Use Secure URLs in Admin</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
                     <comment>Enter https protocol to use Secure URLs in Admin.</comment>
                 </field>
-                <field id="enable_hsts" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_hsts" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable HTTP Strict Transport Security (HSTS)</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
@@ -517,7 +542,7 @@
                         <field id="use_in_adminhtml">1</field>
                     </depends>
                 </field>
-                <field id="enable_upgrade_insecure" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_upgrade_insecure" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Upgrade Insecure Requests</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml
index b7aaf8bf20dba..8283fa18dd370 100644
--- a/app/code/Magento/Backend/etc/config.xml
+++ b/app/code/Magento/Backend/etc/config.xml
@@ -28,6 +28,11 @@
             <dashboard>
                 <enable_charts>1</enable_charts>
             </dashboard>
+            <upload_configuration>
+                <enable_resize>1</enable_resize>
+                <max_width>1920</max_width>
+                <max_height>1200</max_height>
+            </upload_configuration>
         </system>
         <general>
             <validator_data>
diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
index 57e00489391f2..3a5cd8226753d 100644
--- a/app/code/Magento/Backend/etc/module.xml
+++ b/app/code/Magento/Backend/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Backend" setup_version="2.0.0">
+    <module name="Magento_Backend">
         <sequence>
             <module name="Magento_Directory"/>
         </sequence>
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index 36db734d44cd4..bfedd56b14313 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -214,10 +214,13 @@ YTD,YTD
 "Admin session lifetime must be greater than or equal to 60 seconds","Admin session lifetime must be greater than or equal to 60 seconds"
 Order,Order
 "Order #%1","Order #%1"
-"Access denied","Access denied"
-"Please try to sign out and sign in again.","Please try to sign out and sign in again."
-"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
 "You need more permissions to access this.","You need more permissions to access this."
+"Sorry, you need permissions to view this content.","Sorry, you need permissions to view this content."
+"Next steps","Next steps"
+"If you think this is an error, try signing out and signing in again.","If you think this is an error, try signing out and signing in again."
+"Contact a system administrator or store owner to gain permissions.","Contact a system administrator or store owner to gain permissions."
+"Return to","Return to"
+"previous page","previous page"
 "Welcome, please sign in","Welcome, please sign in"
 Username,Username
 "user name","user name"
@@ -402,9 +405,9 @@ Web,Web
 "Url Options","Url Options"
 "Add Store Code to Urls","Add Store Code to Urls"
 "
-                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
                     ","
-                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
                     "
 "Auto-redirect to Base URL","Auto-redirect to Base URL"
 "Search Engine Optimization","Search Engine Optimization"
@@ -444,7 +447,7 @@ Tags,Tags
 "<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
 "Community Edition","Community Edition"
 "Default Theme","Default Theme"
-"If no value is specified, the system default is used. The system default may be modified by third party extensions.","If no value is specified, the system default is used. The system default may be modified by third party extensions."
+"If no value is specified, the system default is used. The system default may be modified by third-party extensions.","If no value is specified, the system default is used. The system default may be modified by third-party extensions."
 "Applied Theme","Applied Theme"
 "Design Rule","Design Rule"
 "User Agent Rules","User Agent Rules"
@@ -458,4 +461,3 @@ Pagination,Pagination
 "Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used.","Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used."
 "Anchor Text for Next","Anchor Text for Next"
 "Theme Name","Theme Name"
-"Config","Config"
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
index ab5ddc414b51f..4bbe70b6cdb92 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
@@ -11,7 +11,11 @@
     <body>
         <referenceContainer name="content">
             <block class="Magento\Backend\Block\Cache" name="adminhtml.cache.container"/>
-            <block class="Magento\Backend\Block\Cache\Additional" name="cache.additional" template="Magento_Backend::system/cache/additional.phtml"/>
+            <block class="Magento\Backend\Block\Cache\Additional" name="cache.additional" template="Magento_Backend::system/cache/additional.phtml">
+                <arguments>
+                    <argument name="permissions" xsi:type="object">Magento\Backend\Block\Cache\Permissions</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
index 852ecd5a07962..843328fbf17d7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
@@ -12,12 +12,23 @@
  * @see \Magento\Backend\Block\Denied
  */
 ?>
-<h1 class="page-heading"><?= /* @escapeNotVerified */ __('Access denied') ?></h1>
-<?php if (!$block->hasAvailableResources()): ?>
-<p>
-<?= /* @escapeNotVerified */ __('Please try to sign out and sign in again.') ?><br/>
-<?= /* @escapeNotVerified */ __('If you continue to receive this message, please contact the store owner.') ?>
-</p>
-<?php else: ?>
-<p><?= /* @escapeNotVerified */ __('You need more permissions to access this.') ?></p>
-<?php endif?>
+<hr class="access-denied-hr"/>
+<div class="access-denied-page">
+    <h2 class="page-heading"><?= $block->escapeHtml(__('Sorry, you need permissions to view this content.')) ?></h2>
+    <strong><?= $block->escapeHtml(__('Next steps')) ?></strong>
+    <ul>
+        <li><span><?= $block->escapeHtml(__('If you think this is an error, try signing out and signing in again.'))  ?></span></li>
+        <li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
+        <li>
+            <span><?= $block->escapeHtml(__('Return to ')) ?>
+                <?php if(isset($_SERVER['HTTP_REFERER'])): ?>
+                    <a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
+                        <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
+                <?php else: ?>
+                    <a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
+                        <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
+                <?php endif ?>
+            </span>
+        </li>
+    </ul>
+</div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
index 805e9783f3f18..52d5dd6d114ee 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -43,7 +43,7 @@
                        data-validate="{required:true}"
                        value=""
                        placeholder="<?= /* @escapeNotVerified */ __('password') ?>"
-                       autocomplete="new-password"
+                       autocomplete="off"
                     />
             </div>
         </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
index 1e14dd837634a..4d9ba6a8c4bad 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
@@ -13,8 +13,9 @@
     data-mage-init='{
         "Magento_Backend/js/media-uploader" : {
             "maxFileSize": <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?>,
-            "maxWidth":<?= /* @escapeNotVerified */ \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
-            "maxHeight": <?= /* @escapeNotVerified */ \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
+            "maxWidth": <?= /* @escapeNotVerified */ $block->getImageUploadMaxWidth() ?>,
+            "maxHeight": <?= /* @escapeNotVerified */ $block->getImageUploadMaxHeight() ?>,
+            "isResizeEnabled": <?= /* @noEscape */ $block->getImageUploadConfigData()->getIsResizeEnabled() ?>
         }
     }'
 >
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 40b7173f47417..f952001f5e2ff 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -17,7 +17,7 @@
             <?= /* @escapeNotVerified */ $edition ?>
             class="logo">
             <img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
-            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
+            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
         </a>
     <?php break; ?>
     <?php case 'user': ?>
@@ -29,7 +29,7 @@
                 data-mage-init='{"dropdown":{}}'
                 data-toggle="dropdown">
                 <span class="admin__action-dropdown-text">
-                    <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>
+                    <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
                 </span>
             </a>
             <ul class="admin__action-dropdown-menu">
@@ -39,7 +39,7 @@
                         href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
                         <?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
                         title="<?= $block->escapeHtml(__('Account Setting')) ?>">
-                        <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>)
+                        <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
                     </a>
                 </li>
                 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
index 3a3dbd99bfba9..4ef6d378cc4a4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
@@ -8,5 +8,7 @@
 
 ?>
 <?php if ($block->getBugreportUrl()): ?>
-    <a class="link-report" href="<?= /* @escapeNotVerified */ $block->getBugreportUrl() ?>" id="footer_bug_tracking"><?= /* @escapeNotVerified */ __('Report an Issue') ?></a>
+    <a class="link-report" href="<?= /* @escapeNotVerified */ $block->getBugreportUrl() ?>" id="footer_bug_tracking" target="_blank">
+        <?= /* @escapeNotVerified */ __('Report an Issue') ?>
+    </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
index 84bbc4ea601ef..b4bc42b95d0aa 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -5,34 +5,39 @@
  */
 
 // @codingStandardsIgnoreFile
+
+/** @var \Magento\Backend\Block\Cache\Permissions|null $permissions */
+$permissions = $block->getData('permissions');
 ?>
-<div class="additional-cache-management">
-    <h2>
-        <span><?= /* @escapeNotVerified */ __('Additional Cache Management') ?></span>
-    </h2>
-    <p>
-        <button onclick="setLocation('<?= /* @escapeNotVerified */ $block->getCleanImagesUrl() ?>')" type="button">
-            <?= /* @escapeNotVerified */ __('Flush Catalog Images Cache') ?>
-        </button>
-        <span><?= /* @escapeNotVerified */ __('Pregenerated product images files') ?></span>
-    </p>
-    <p>
-        <button onclick="setLocation('<?= /* @escapeNotVerified */ $block->getCleanMediaUrl() ?>')" type="button">
-            <?= /* @escapeNotVerified */ __('Flush JavaScript/CSS Cache') ?>
-        </button>
-        <span><?= /* @escapeNotVerified */ __('Themes JavaScript and CSS files combined to one file') ?></span>
-    </p>
-    <?php
-    if (!$block->isInProductionMode()):
-        ?>
-        <p>
-            <button onclick="setLocation('<?= /* @escapeNotVerified */ $block->getCleanStaticFilesUrl() ?>')" type="button">
-                <?= /* @escapeNotVerified */ __('Flush Static Files Cache') ?>
-            </button>
-            <span><?= /* @escapeNotVerified */ __('Preprocessed view files and static files') ?></span>
-        </p>
-    <?php
-    endif;
-    ?>
-    <?= $block->getChildHtml() ?>
-</div>
+<?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
+    <div class="additional-cache-management">
+        <h2>
+            <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
+        </h2>
+        <?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
+            <p>
+                <button onclick="setLocation('<?= $block->escapeJs($block->getCleanImagesUrl()); ?>')" type="button">
+                    <?= $block->escapeHtml(__('Flush Catalog Images Cache')); ?>
+                </button>
+                <span><?= $block->escapeHtml(__('Pregenerated product images files')); ?></span>
+            </p>
+        <?php endif; ?>
+        <?php if ($permissions->hasAccessToFlushJsCss()): ?>
+            <p>
+                <button onclick="setLocation('<?= $block->escapeJs($block->getCleanMediaUrl()); ?>')" type="button">
+                    <?= $block->escapeHtml(__('Flush JavaScript/CSS Cache')); ?>
+                </button>
+                <span><?= $block->escapeHtml(__('Themes JavaScript and CSS files combined to one file')) ?></span>
+            </p>
+        <?php endif; ?>
+        <?php if (!$block->isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()): ?>
+            <p>
+                <button onclick="setLocation('<?= $block->escapeJs($block->getCleanStaticFilesUrl()); ?>')" type="button">
+                    <?= $block->escapeHtml(__('Flush Static Files Cache')); ?>
+                </button>
+                <span><?= $block->escapeHtml(__('Preprocessed view files and static files')); ?></span>
+            </p>
+        <?php endif; ?>
+        <?= $block->getChildHtml() ?>
+    </div>
+<?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
index a528133b2bc3a..af369800287c1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
@@ -28,21 +28,21 @@
     <script data-template="search-suggest" type="text/x-magento-template">
         <ul class="search-global-menu">
         <li class="item">
-            <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getURL('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+            <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
         </li>
         <li class="item">
-            <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getURL('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+            <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
         </li>
         <li class="item">
-            <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getURL('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+            <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
         </li>
         <li class="item">
-            <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getURL('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+            <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getUrl('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
         </li>
             <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>
             <li class="item"
-                <%- data.optionData(value) %>
+                <%= data.optionData(value) %>
                 >
                 <a href="<%- value.url %>" class="title"><%- value.name %></a>
                 <span class="type"><%- value.type %></span>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
index 27127e54e5be2..a115777624e91 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -41,11 +41,11 @@
     <?php endif; ?>
 </div>
 
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
 </script>
+
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 06f77839ae466..720bc1e58259d 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>
@@ -62,7 +59,7 @@
       <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
         <script>
         require([
-            'tinymceDeprecated'
+            "wysiwygAdapter"
         ], function(tinyMCE){
 
             tinyMCE.init({
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index 4f8d9a56a38a3..e11c0efc123ff 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -34,7 +34,7 @@
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
             <a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
-            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" title="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
             <input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
         <?php endforeach; ?>
         <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index c99759a60d1bf..fad8f5968009f 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()): ?>
 
@@ -107,7 +107,7 @@ $numColumns = sizeof($block->getColumns());
                                 <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                             </label>
                             <?php if ($_curPage < $_lastPage): ?>
-                                <button title="<?= /* @escapeNotVerified */ __('Next page') ?>"
+                                <button type="button" title="<?= /* @escapeNotVerified */ __('Next page') ?>"
                                         class="action-next"
                                         onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage + 1) ?>');return false;">
                                     <span><?= /* @escapeNotVerified */ __('Next page') ?></span>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index a31bf4d23abaa..f97db4ad993b1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -72,7 +72,7 @@ $numColumns = sizeof($block->getColumns());
             <?php if ($block->getPagerVisibility()): ?>
                 <div class="admin__data-grid-pager-wrap">
                     <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
-                            id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+                            id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
                             onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
                             class="admin__control-select">
                         <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
@@ -91,7 +91,7 @@ $numColumns = sizeof($block->getColumns());
                             selected="selected"<?php endif; ?>>200
                         </option>
                     </select>
-                    <label for="<?= $block->escapeHTML($block->getHtmlId()) ?><?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+                    <label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
                         class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
 
                     <div class="admin__data-grid-pager">
@@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns());
                             <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
                         <?php endif; ?>
                         <input type="text"
-                               id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current"
+                               id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
                                name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
                                value="<?= /* @escapeNotVerified */ $_curPage ?>"
                                class="admin__control-text"
                                onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
-                        <label class="admin__control-support-text" for="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current">
+                        <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
                             <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                         </label>
                         <?php if ($_curPage < $_lastPage): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
index 19a4ab1388006..79c987383299f 100644
--- a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
@@ -12,7 +12,7 @@
         </settings>
         <field name="theme_theme_id" sortOrder="10" formElement="select">
             <settings>
-                <notice translate="true">If no value is specified, the system default is used. The system default may be modified by third party extensions.</notice>
+                <notice translate="true">If no value is specified, the system default is used. The system default may be modified by third-party extensions.</notice>
                 <dataType>text</dataType>
                 <label translate="true">Applied Theme</label>
                 <dataScope>theme_theme_id</dataScope>
@@ -92,7 +92,7 @@
                         </select>
                     </formElements>
                 </field>
-                <actionDelete template="Magento_Backend/dynamic-rows/cells/action-delete" sortOrder="50">
+                <actionDelete template="Magento_Backend/dynamic-rows/cells/action-delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">false</item>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
index 03403a4ec4a04..119e7a35747cb 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
@@ -13,11 +13,19 @@ define([
     'jquery',
     'mage/template',
     'Magento_Ui/js/modal/alert',
+    'Magento_Ui/js/form/element/file-uploader',
     'mage/translate',
     'jquery/file-uploader'
-], function ($, mageTemplate, alert) {
+], function ($, mageTemplate, alert, FileUploader) {
     'use strict';
 
+    var fileUploader = new FileUploader({
+        dataScope: '',
+        isMultipleFiles: true
+    });
+
+    fileUploader.initUploader();
+
     $.widget('mage.mediaUploader', {
 
         /**
@@ -25,9 +33,20 @@ define([
          * @private
          */
         _create: function () {
-            var
-                self = this,
-                progressTmpl = mageTemplate('[data-template="uploader"]');
+            var self = this,
+                progressTmpl = mageTemplate('[data-template="uploader"]'),
+                isResizeEnabled = this.options.isResizeEnabled,
+                resizeConfiguration = {
+                    action: 'resize',
+                    maxWidth: this.options.maxWidth,
+                    maxHeight: this.options.maxHeight
+                };
+
+            if (!isResizeEnabled) {
+                resizeConfiguration = {
+                    action: 'resize'
+                };
+            }
 
             this.element.find('input[type=file]').fileupload({
                 dataType: 'json',
@@ -44,8 +63,7 @@ define([
                  * @param {Object} data
                  */
                 add: function (e, data) {
-                    var
-                        fileSize,
+                    var fileSize,
                         tmpl;
 
                     $.each(data.files, function (index, file) {
@@ -79,10 +97,9 @@ define([
                     if (data.result && !data.result.error) {
                         self.element.trigger('addItem', data.result);
                     } else {
-                        alert({
-                            content: $.mage.__('We don\'t recognize or support this file extension type.')
-                        });
+                        fileUploader.aggregateError(data.files[0].name, data.result.error);
                     }
+
                     self.element.find('#' + data.fileId).remove();
                 },
 
@@ -108,18 +125,18 @@ define([
                         .delay(2000)
                         .hide('highlight')
                         .remove();
-                }
+                },
+
+                stop: fileUploader.uploaderConfig.stop
             });
 
             this.element.find('input[type=file]').fileupload('option', {
                 process: [{
                     action: 'load',
                     fileTypes: /^image\/(gif|jpeg|png)$/
-                }, {
-                    action: 'resize',
-                    maxWidth: this.options.maxWidth,
-                    maxHeight: this.options.maxHeight
-                }, {
+                },
+                resizeConfiguration,
+                {
                     action: 'save'
                 }]
             });
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js b/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
index 0a692a9b868cc..c2a0d4dab1fb3 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
@@ -67,6 +67,7 @@ define([
                              * 'Confirm' action handler.
                              */
                             confirm: function () {
+                                $('body').trigger('processStart');
                                 dataPost().postData(requestData);
                             }
                         }
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 74621806fa5fb..fe30ca7e83f19 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">
@@ -85,7 +85,7 @@
 <div class="messages">
     <div class="message message-notice notice">
         <span
-            translate="'Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered.'"></span>
+            translate="'Search strings are either normal strings or regular expressions (PCRE). They are matched in the same order as entered.'"></span>
         <br>
         <span
             translate="'Examples'"></span>:
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
index dcafbc7370d2d..0edeb5565f288 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -5,21 +5,27 @@
  */
 namespace Magento\Backup\Controller\Adminhtml;
 
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Backup\Helper\Data as Helper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backup admin controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
-abstract class Index extends \Magento\Backend\App\Action
+abstract class Index extends Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Backend::backup';
+    const ADMIN_RESOURCE = 'Magento_Backup::backup';
 
     /**
      * Core registry
@@ -48,6 +54,11 @@ abstract class Index extends \Magento\Backend\App\Action
      */
     protected $maintenanceMode;
 
+    /**
+     * @var Helper
+     */
+    private $helper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
@@ -55,6 +66,7 @@ abstract class Index extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
+     * @param Helper|null $helper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -62,13 +74,27 @@ public function __construct(
         \Magento\Framework\Backup\Factory $backupFactory,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Backup\Model\BackupFactory $backupModelFactory,
-        \Magento\Framework\App\MaintenanceMode $maintenanceMode
+        \Magento\Framework\App\MaintenanceMode $maintenanceMode,
+        ?Helper $helper = null
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_backupFactory = $backupFactory;
         $this->_fileFactory = $fileFactory;
         $this->_backupModelFactory = $backupModelFactory;
         $this->maintenanceMode = $maintenanceMode;
+        $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
         parent::__construct($context);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function dispatch(\Magento\Framework\App\RequestInterface $request)
+    {
+        if (!$this->helper->isEnabled()) {
+            return $this->_redirect('*/*/disabled');
+        }
+
+        return parent::dispatch($request);
+    }
 }
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
index ee0370c8ecb29..53f45aff50cbc 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
@@ -12,14 +12,14 @@
 class Create extends \Magento\Backup\Controller\Adminhtml\Index
 {
     /**
-     * Create backup action
+     * Create backup action.
      *
      * @return void|\Magento\Backend\App\Action
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
-        if (!$this->getRequest()->isAjax()) {
+        if (!$this->isRequestAllowed()) {
             return $this->_redirect('*/*/index');
         }
 
@@ -82,7 +82,7 @@ public function execute()
 
             $backupManager->create();
 
-            $this->messageManager->addSuccess($successMessage);
+            $this->messageManager->addSuccessMessage($successMessage);
 
             $response->setRedirectUrl($this->getUrl('*/*/index'));
         } catch (\Magento\Framework\Backup\Exception\NotEnoughFreeSpace $e) {
@@ -106,4 +106,14 @@ public function execute()
 
         $this->getResponse()->representJson($response->toJson());
     }
+
+    /**
+     * Check if request is allowed.
+     *
+     * @return bool
+     */
+    private function isRequestAllowed()
+    {
+        return $this->getRequest()->isAjax() && $this->getRequest()->isPost();
+    }
 }
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
new file mode 100644
index 0000000000000..f6fe430ae0838
--- /dev/null
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backup\Controller\Adminhtml\Index;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\View\Result\PageFactory;
+
+/**
+ * Inform that backup is disabled.
+ */
+class Disabled extends Action implements HttpGetActionInterface
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::backup';
+
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * @param Context $context
+     * @param PageFactory $pageFactory
+     */
+    public function __construct(Context $context, PageFactory $pageFactory)
+    {
+        parent::__construct($context);
+        $this->pageFactory = $pageFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        return $this->pageFactory->create();
+    }
+}
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
index 3bbda65cb4cf6..271e3713034d0 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Backup\Controller\Adminhtml\Index;
 
-class Index extends \Magento\Backup\Controller\Adminhtml\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backup\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * Backup list action
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
index 04292d2759093..90657fc2490ba 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
@@ -49,13 +49,13 @@ public function execute()
 
             $resultData->setIsSuccess(true);
             if ($allBackupsDeleted) {
-                $this->messageManager->addSuccess(__('You deleted the selected backup(s).'));
+                $this->messageManager->addSuccessMessage(__('You deleted the selected backup(s).'));
             } else {
                 throw new \Exception($deleteFailMessage);
             }
         } catch (\Exception $e) {
             $resultData->setIsSuccess(false);
-            $this->messageManager->addError($deleteFailMessage);
+            $this->messageManager->addErrorMessage($deleteFailMessage);
         }
 
         return $this->_redirect('backup/*/index');
diff --git a/app/code/Magento/Backup/Cron/SystemBackup.php b/app/code/Magento/Backup/Cron/SystemBackup.php
index 750262ab1c14a..9502377a39d06 100644
--- a/app/code/Magento/Backup/Cron/SystemBackup.php
+++ b/app/code/Magento/Backup/Cron/SystemBackup.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Performs scheduled backup.
+ */
 class SystemBackup
 {
     const XML_PATH_BACKUP_ENABLED = 'system/backup/enabled';
@@ -101,6 +104,10 @@ public function __construct(
      */
     public function execute()
     {
+        if (!$this->_backupData->isEnabled()) {
+            return $this;
+        }
+
         if (!$this->_scopeConfig->isSetFlag(self::XML_PATH_BACKUP_ENABLED, ScopeInterface::SCOPE_STORE)) {
             return $this;
         }
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index 3d60bf9d9c9cf..c6df6a7366852 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backup\Helper;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -110,7 +113,7 @@ public function getBackupsDir()
     public function getExtensionByType($type)
     {
         $extensions = $this->getExtensions();
-        return isset($extensions[$type]) ? $extensions[$type] : '';
+        return $extensions[$type] ?? '';
     }
 
     /**
@@ -285,4 +288,14 @@ public function extractDataFromFilename($filename)
 
         return $result;
     }
+
+    /**
+     * Is backup functionality enabled.
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag('system/backup/functionality_enabled');
+    }
 }
diff --git a/app/code/Magento/Backup/Model/BackupFactory.php b/app/code/Magento/Backup/Model/BackupFactory.php
index 28b0a7baf43cb..f88b410a2371b 100644
--- a/app/code/Magento/Backup/Model/BackupFactory.php
+++ b/app/code/Magento/Backup/Model/BackupFactory.php
@@ -39,8 +39,8 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      */
     public function create($timestamp, $type)
     {
-        $fsCollection = $this->_objectManager->get(\Magento\Backup\Model\Fs\Collection::class);
-        $backupInstance = $this->_objectManager->get(\Magento\Backup\Model\Backup::class);
+        $fsCollection = $this->_objectManager->create(\Magento\Backup\Model\Fs\Collection::class);
+        $backupInstance = $this->_objectManager->create(\Magento\Backup\Model\Backup::class);
 
         foreach ($fsCollection as $backup) {
             if ($backup->getTime() === (int) $timestamp && $backup->getType() === $type) {
diff --git a/app/code/Magento/Backup/Model/Config/Backend/Cron.php b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
index 4855ef1129502..2f0e4069f0499 100644
--- a/app/code/Magento/Backup/Model/Config/Backend/Cron.php
+++ b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
@@ -76,8 +76,8 @@ public function afterSave()
 
         if ($enabled) {
             $cronExprArray = [
-                intval($time[1]),                                 # Minute
-                intval($time[0]),                                 # Hour
+                (int) $time[1],                                 # Minute
+                (int) $time[0],                                 # Hour
                 $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
                 '*',                                              # Month of the Year
                 $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week
diff --git a/app/code/Magento/Backup/Model/Db.php b/app/code/Magento/Backup/Model/Db.php
index 776141249f92b..bc458a0a8e4bf 100644
--- a/app/code/Magento/Backup/Model/Db.php
+++ b/app/code/Magento/Backup/Model/Db.php
@@ -5,11 +5,16 @@
  */
 namespace Magento\Backup\Model;
 
+use Magento\Backup\Helper\Data as Helper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\RuntimeException;
+
 /**
  * Database backup model
  *
  * @api
  * @since 100.0.2
+ * @deprecated Backup module is to be removed.
  */
 class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
 {
@@ -33,16 +38,24 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
      */
     protected $_resource = null;
 
+    /**
+     * @var Helper
+     */
+    private $helper;
+
     /**
      * @param \Magento\Backup\Model\ResourceModel\Db $resourceDb
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param Helper|null $helper
      */
     public function __construct(
         \Magento\Backup\Model\ResourceModel\Db $resourceDb,
-        \Magento\Framework\App\ResourceConnection $resource
+        \Magento\Framework\App\ResourceConnection $resource,
+        ?Helper $helper = null
     ) {
         $this->_resourceDb = $resourceDb;
         $this->_resource = $resource;
+        $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
     }
 
     /**
@@ -63,6 +76,8 @@ public function getResource()
     }
 
     /**
+     * Tables list.
+     *
      * @return array
      */
     public function getTables()
@@ -71,6 +86,8 @@ public function getTables()
     }
 
     /**
+     * Command to recreate given table.
+     *
      * @param string $tableName
      * @param bool $addDropIfExists
      * @return string
@@ -81,6 +98,8 @@ public function getTableCreateScript($tableName, $addDropIfExists = false)
     }
 
     /**
+     * Generate table's data dump.
+     *
      * @param string $tableName
      * @return string
      */
@@ -90,6 +109,8 @@ public function getTableDataDump($tableName)
     }
 
     /**
+     * Header for dumps.
+     *
      * @return string
      */
     public function getHeader()
@@ -98,6 +119,8 @@ public function getHeader()
     }
 
     /**
+     * Footer for dumps.
+     *
      * @return string
      */
     public function getFooter()
@@ -106,6 +129,8 @@ public function getFooter()
     }
 
     /**
+     * Get backup SQL.
+     *
      * @return string
      */
     public function renderSql()
@@ -124,13 +149,14 @@ public function renderSql()
     }
 
     /**
-     * Create backup and stream write to adapter
-     *
-     * @param \Magento\Framework\Backup\Db\BackupInterface $backup
-     * @return $this
+     * @inheritDoc
      */
     public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backup)
     {
+        if (!$this->helper->isEnabled()) {
+            throw new RuntimeException(__('Backup functionality is disabled'));
+        }
+
         $backup->open(true);
 
         $this->getResource()->beginTransaction();
@@ -154,7 +180,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
 
                 if ($tableStatus->getDataLength() > self::BUFFER_LENGTH) {
                     if ($tableStatus->getAvgRowLength() < self::BUFFER_LENGTH) {
-                        $limit = floor(self::BUFFER_LENGTH / $tableStatus->getAvgRowLength());
+                        $limit = floor(self::BUFFER_LENGTH / max($tableStatus->getAvgRowLength(), 1));
                         $multiRowsLength = ceil($tableStatus->getRows() / $limit);
                     } else {
                         $limit = 1;
@@ -173,13 +199,12 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
             }
         }
         $backup->write($this->getResource()->getTableForeignKeysSql());
+        $backup->write($this->getResource()->getTableTriggersSql());
         $backup->write($this->getResource()->getFooter());
 
         $this->getResource()->commitTransaction();
 
         $backup->close();
-
-        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Backup/Model/Fs/Collection.php b/app/code/Magento/Backup/Model/Fs/Collection.php
index 2d08ac04528ac..b17c17f7074fb 100644
--- a/app/code/Magento/Backup/Model/Fs/Collection.php
+++ b/app/code/Magento/Backup/Model/Fs/Collection.php
@@ -115,7 +115,8 @@ protected function _generateRow($filename)
         if (isset($row['display_name']) && $row['display_name'] == '') {
             $row['display_name'] = 'WebSetupWizard';
         }
-        $row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');
+        $row['id'] = $row['time'] . '_' . $row['type']
+            . (isset($row['display_name']) ? '_' . $row['display_name'] : '');
         return $row;
     }
 }
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Db.php b/app/code/Magento/Backup/Model/ResourceModel/Db.php
index 3fbaf44ebb063..6e7d6f9863f33 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Db.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Db.php
@@ -114,6 +114,31 @@ public function getTableForeignKeysSql($tableName = null)
         return $fkScript;
     }
 
+    /**
+     * Return triggers for table(s).
+     *
+     * @param string|null $tableName
+     * @param bool $addDropIfExists
+     * @return string
+     */
+    public function getTableTriggersSql($tableName = null, $addDropIfExists = true)
+    {
+        $triggerScript = '';
+        if (!$tableName) {
+            $tables = $this->getTables();
+            foreach ($tables as $table) {
+                $tableTriggerScript = $this->_resourceHelper->getTableTriggersSql($table, $addDropIfExists);
+                if (!empty($tableTriggerScript)) {
+                    $triggerScript .= "\n" . $tableTriggerScript;
+                }
+            }
+        } else {
+            $triggerScript = $this->getTableTriggersSql($tableName, $addDropIfExists);
+        }
+
+        return $triggerScript;
+    }
+
     /**
      * Retrieve table status
      *
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Helper.php b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
index b5418865339c3..dace56fd60688 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
@@ -337,4 +337,40 @@ public function restoreTransactionIsolationLevel()
     {
         $this->getConnection()->query('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
     }
+
+    /**
+     * Get create script for triggers.
+     *
+     * @param string $tableName
+     * @param boolean $addDropIfExists
+     * @param boolean $stripDefiner
+     * @return string
+     */
+    public function getTableTriggersSql($tableName, $addDropIfExists = false, $stripDefiner = true)
+    {
+        $script = "--\n-- Triggers structure for table `{$tableName}`\n--\n";
+        $triggers = $this->getConnection()->query('SHOW TRIGGERS LIKE \''. $tableName . '\'')->fetchAll();
+
+        if (!$triggers) {
+            return '';
+        }
+        foreach ($triggers as $trigger) {
+            if ($addDropIfExists) {
+                $script .= 'DROP TRIGGER IF EXISTS ' . $trigger['Trigger'] . ";\n";
+            }
+            $script .= "delimiter ;;\n";
+
+            $triggerData = $this->getConnection()->query('SHOW CREATE TRIGGER '. $trigger['Trigger'])->fetch();
+            if ($stripDefiner) {
+                $cleanedScript = preg_replace('/DEFINER=[^\s]*/', '', $triggerData['SQL Original Statement']);
+                $script .= $cleanedScript . "\n";
+            } else {
+                $script .= $triggerData['SQL Original Statement'] . "\n";
+            }
+            $script .= ";;\n";
+            $script .= "delimiter ;\n";
+        }
+
+        return $script;
+    }
 }
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
new file mode 100644
index 0000000000000..89381112e6c66
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="createSystemBackup">
+        <arguments>
+            <argument name="backup" defaultValue="SystemBackup"/>
+        </arguments>
+        <click selector="{{AdminMainActionsSection.systemBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForElementNotVisible selector=".loading-mask" time="300" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the system backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+
+    <actionGroup name="createMediaBackup">
+        <arguments>
+            <argument name="backup" defaultValue="MediaBackup"/>
+        </arguments>
+        <click selector="{{AdminMainActionsSection.mediaBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database and media backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+
+    <actionGroup name="createDatabaseBackup">
+        <arguments>
+            <argument name="backup" defaultValue="DatabaseBackup"/>
+        </arguments>
+        <click selector="{{AdminMainActionsSection.databaseBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
new file mode 100644
index 0000000000000..4f34f24c3a806
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="deleteBackup">
+        <arguments>
+            <argument name="backup"/>
+        </arguments>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <click selector="{{AdminGridTableSection.backupRowCheckbox(backup.name)}}" stepKey="selectBackupRow"/>
+        <selectOption selector="{{AdminGridActionSection.actionSelect}}" userInput="Delete" stepKey="selectDeleteAction"/>
+        <click selector="{{AdminGridActionSection.submitButton}}" stepKey="clickSubmit"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to delete the selected backup(s)?" stepKey="seeConfirmationModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkConfirmDelete"/>
+        <dontSee selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="dontSeeBackupInGrid"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
new file mode 100644
index 0000000000000..ae97351cafcaf
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SystemBackup" type="backup">
+        <data key="name" unique="suffix">systemBackup</data>
+        <data key="type">System</data>
+    </entity>
+    <entity name="MediaBackup" type="backup">
+        <data key="name" unique="suffix">mediaBackup</data>
+        <data key="type">Database and Media</data>
+    </entity>
+    <entity name="DatabaseBackup" type="backup">
+        <data key="name" unique="suffix">databaseBackup</data>
+        <data key="type">Database</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE.txt b/app/code/Magento/Backup/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE.txt
rename to app/code/Magento/Backup/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE_AFL.txt b/app/code/Magento/Backup/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE_AFL.txt
rename to app/code/Magento/Backup/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml b/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml
new file mode 100644
index 0000000000000..aad29e6e6d566
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
+        <section name="AdminMainActionsSection"/>
+        <section name="AdminGridTableSection"/>
+        <section name="AdminCreateBackupFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backup/Test/Mftf/README.md b/app/code/Magento/Backup/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6951acdf41400
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Backup Functional Tests
+
+The Functional Test Module for **Magento Backup** module.
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml
new file mode 100644
index 0000000000000..af88146bcfb4b
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminCreateBackupFormSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreateBackupFormSection">
+        <element name="backupNameField" type="input" selector="input[name='backup_name']"/>
+        <element name="maintenanceModeCheckbox" type="checkbox" selector="input[name='maintenance_mode']"/>
+        <element name="excludeMediaCheckbox" type="checkbox" selector="input[name='exclude_media']"/>
+        <element name="ok" type="button" selector=".modal-header button.primary"/>
+        <element name="cancel" type="button" selector=".modal-header button.cancel"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml
new file mode 100644
index 0000000000000..cca6b428a2820
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridActionSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminGridActionSection">
+        <element name="actionSelect" type="select" selector="#backupsGrid_massaction-select"/>
+        <element name="submitButton" type="button" selector="#backupsGrid_massaction button[title='Submit']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml
new file mode 100644
index 0000000000000..72fb51684931f
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminGridTableSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminGridTableSection">
+        <element name="backupNameColumn" type="text" selector="table.data-grid td[data-column='display_name']"/>
+        <element name="backupTypeByName" type="text" selector="//table//td[contains(., '{{name}}')]/parent::tr/td[@data-column='type']" parameterized="true"/>
+        <element name="backupRowCheckbox" type="checkbox" selector="//table//td[contains(., '{{name}}')]/parent::tr/td[@data-column='massaction']//input" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml
new file mode 100644
index 0000000000000..11ba79f32b5db
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMainActionsSection">
+        <element name="systemBackup" type="button" selector="button[data-ui-id*='createsnapshotbutton']"/>
+        <element name="mediaBackup" type="button" selector="button[data-ui-id*='createmediabackupbutton']"/>
+        <element name="databaseBackup" type="button" selector="button.database-backup[data-ui-id*='createbutton']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
new file mode 100644
index 0000000000000..26f8817c0a1bb
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateAndDeleteBackupsTest">
+        <annotations>
+            <features value="Backup"/>
+            <stories value="Create and delete backups"/>
+            <title value="Create and delete backups"/>
+            <description value="An admin user can create a backup of each type and delete each backup."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94176"/>
+            <group value="backup"/>
+            <skip>
+                <issueId value="MC-5807"/>
+            </skip>
+        </annotations>
+
+        <!--Login to admin area-->
+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+
+        <!--Go to backup index page-->
+        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
+        <waitForPageLoad stepKey="waitForBackupPage"/>
+
+        <!--Create system backup-->
+        <actionGroup ref="createSystemBackup" stepKey="createSystemBackup"/>
+
+        <!--Create database/media backup-->
+        <actionGroup ref="createMediaBackup" stepKey="createMediaBackup"/>
+
+        <!--Create database backup-->
+        <actionGroup ref="createDatabaseBackup" stepKey="createDatabaseBackup"/>
+
+        <!--Delete system backup-->
+        <actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">
+            <argument name="backup" value="SystemBackup"/>
+        </actionGroup>
+
+        <!--Delete database/media backup-->
+        <actionGroup ref="deleteBackup" stepKey="deleteMediaBackup">
+            <argument name="backup" value="MediaBackup"/>
+        </actionGroup>
+
+        <!--Delete database backup-->
+        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
+            <argument name="backup" value="DatabaseBackup"/>
+        </actionGroup>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/CreateTest.php b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/CreateTest.php
new file mode 100644
index 0000000000000..80477d9f6f9e4
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/CreateTest.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backup\Test\Unit\Controller\Adminhtml\Index;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Tests \Magento\Backup\Controller\Adminhtml\Index\Create class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Backend\App\Action\Context
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var \Magento\Backup\Model\Backup|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $backupModelMock;
+
+    /**
+     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataBackendHelperMock;
+
+    /**
+     * @var \Magento\Backup\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataBackupHelperMock;
+
+    /**
+     * @var \Magento\Framework\App\Response\Http\FileFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionMock;
+
+    /**
+     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $maintenanceModeMock;
+
+    /**
+     * @var \Magento\Framework\Backup\Factory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $backupFactoryMock;
+
+    /**
+     * @var \Magento\Backup\Controller\Adminhtml\Index\Create
+     */
+    private $createController;
+
+    public function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAjax', 'isPost', 'getParam'])
+            ->getMock();
+        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['representJson', 'setRedirect'])
+            ->getMock();
+        $this->sessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->backupFactoryMock = $this->getMockBuilder(\Magento\Framework\Backup\Factory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->backupModelMock = $this->getMockBuilder(\Magento\Backup\Model\Backup::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setBackupExtension', 'setTime', 'setBackupsDir', 'setName', 'create'])
+            ->getMock();
+        $this->dataBackendHelperMock = $this->getMockBuilder(\Magento\Backend\Helper\Data::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
+        $this->dataBackupHelperMock = $this->getMockBuilder(\Magento\Backup\Helper\Data::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getExtensionByType', 'getBackupsDir'])
+            ->getMock();
+        $this->maintenanceModeMock = $this->getMockBuilder(\Magento\Framework\App\MaintenanceMode::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['set'])
+            ->getMock();
+        $this->fileFactoryMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager = new ObjectManager($this);
+        $this->context = $this->objectManager->getObject(
+            \Magento\Backend\App\Action\Context::class,
+            [
+                'objectManager' => $this->objectManagerMock,
+                'request' => $this->requestMock,
+                'response' => $this->responseMock,
+                'session' => $this->sessionMock,
+                'helper' => $this->dataBackendHelperMock,
+                'maintenanceMode' => $this->maintenanceModeMock,
+            ]
+        );
+        $this->createController = $this->objectManager->getObject(
+            \Magento\Backup\Controller\Adminhtml\Index\Create::class,
+            [
+                'context' => $this->context,
+                'backupFactory' => $this->backupFactoryMock,
+                'fileFactory' => $this->fileFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * @covers \Magento\Backup\Controller\Adminhtml\Index\Create::execute
+     * @return void
+     */
+    public function testExecuteNotPost()
+    {
+        $redirectUrl = '*/*/index';
+        $redirectUrlBackup = 'backup/index/index';
+
+        $this->requestMock->expects($this->any())
+            ->method('isAjax')
+            ->willReturn(true);
+        $this->requestMock->expects($this->any())
+            ->method('isPost')
+            ->willReturn(false);
+        $this->dataBackendHelperMock->expects($this->any())
+            ->method('getUrl')
+            ->with($redirectUrl, [])
+            ->willReturn($redirectUrlBackup);
+        $this->responseMock->expects($this->any())
+            ->method('setRedirect')
+            ->with($redirectUrlBackup)
+            ->willReturnSelf();
+
+        $this->assertSame($this->responseMock, $this->createController->execute());
+    }
+
+    /**
+     * @covers \Magento\Backup\Controller\Adminhtml\Index\Create::execute
+     * @return void
+     */
+    public function testExecutePermission()
+    {
+        $redirectUrl = '*/*/index';
+        $redirectUrlBackup = 'backup/index/index';
+        $backupType = 'db';
+        $backupName = 'backup1';
+        $response = '{"redirect_url":"backup\/index\/index"}';
+
+        $this->requestMock->expects($this->any())
+            ->method('isAjax')
+            ->willReturn(true);
+        $this->requestMock->expects($this->any())
+            ->method('isPost')
+            ->willReturn(true);
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['type', null, $backupType],
+                ['backup_name', null, $backupName],
+            ]);
+        $this->dataBackendHelperMock->expects($this->any())
+            ->method('getUrl')
+            ->with($redirectUrl, [])
+            ->willReturn($redirectUrlBackup);
+        $this->responseMock->expects($this->any())
+            ->method('representJson')
+            ->with($response)
+            ->willReturnSelf();
+        $this->maintenanceModeMock->expects($this->any())
+            ->method('set')
+            ->with(true)
+            ->willReturn(false);
+        $this->backupFactoryMock->expects($this->any())
+            ->method('create')
+            ->with($backupType)
+            ->willReturn($this->backupModelMock);
+        $this->backupModelMock->expects($this->any())
+            ->method('setBackupExtension')
+            ->with($backupType)
+            ->willReturnSelf();
+        $this->backupModelMock->expects($this->any())
+            ->method('setBackupsDir')
+            ->willReturnSelf();
+        $this->backupModelMock->expects($this->any())
+            ->method('setTime')
+            ->willReturnSelf();
+        $this->backupModelMock->expects($this->any())
+            ->method('setName')
+            ->with($backupName)
+            ->willReturnSelf();
+        $this->backupModelMock->expects($this->once())
+            ->method('create')
+            ->willReturnSelf();
+        $this->objectManagerMock->expects($this->any())
+            ->method('get')
+            ->with(\Magento\Backup\Helper\Data::class)
+            ->willReturn($this->dataBackupHelperMock);
+        $this->dataBackupHelperMock->expects($this->any())
+            ->method('getExtensionByType')
+            ->with($backupType)
+            ->willReturn($backupType);
+        $this->dataBackupHelperMock->expects($this->any())
+            ->method('getBackupsDir')
+            ->willReturn('dir');
+
+        $this->assertNull($this->createController->execute());
+    }
+}
diff --git a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
index b7dfb30c0a1b3..56a7ef42a0bc2 100644
--- a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
@@ -3,134 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backup\Test\Unit\Cron;
 
+use Magento\Backup\Cron\SystemBackup;
+use PHPUnit\Framework\TestCase;
+use Magento\Backup\Helper\Data as Helper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
-class SystemBackupTest extends \PHPUnit\Framework\TestCase
+class SystemBackupTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var \Magento\Backup\Cron\SystemBackup
-     */
-    private $systemBackup;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $scopeConfigMock;
-
-    /**
-     * @var \Magento\Backup\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $backupDataMock;
-
-    /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $registryMock;
-
-    /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Helper|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $loggerMock;
+    private $helperMock;
 
     /**
-     * Filesystem facade
-     *
-     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     * @var SystemBackup
      */
-    private $filesystemMock;
+    private $cron;
 
     /**
-     * @var \Magento\Framework\Backup\Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @inheritDoc
      */
-    private $backupFactoryMock;
-
-    /**
-     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $maintenanceModeMock;
-
-    /**
-     * @var \Magento\Framework\Backup\Db|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $backupDbMock;
-
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $objectManagerMock;
-
     protected function setUp()
     {
-        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-            ->getMock();
-        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->getMock();
-        $this->backupDataMock = $this->getMockBuilder(\Magento\Backup\Helper\Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
-            ->getMock();
-        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->backupFactoryMock = $this->getMockBuilder(\Magento\Framework\Backup\Factory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->maintenanceModeMock = $this->getMockBuilder(\Magento\Framework\App\MaintenanceMode::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->backupDbMock = $this->getMockBuilder(\Magento\Framework\Backup\Db::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->backupDbMock->expects($this->any())->method('setBackupExtension')->willReturnSelf();
-        $this->backupDbMock->expects($this->any())->method('setTime')->willReturnSelf();
-        $this->backupDbMock->expects($this->any())->method('setBackupsDir')->willReturnSelf();
-
-        $this->objectManager = new ObjectManager($this);
-        $this->systemBackup = $this->objectManager->getObject(
-            \Magento\Backup\Cron\SystemBackup::class,
-            [
-                'backupData' => $this->backupDataMock,
-                'coreRegistry' => $this->registryMock,
-                'logger' => $this->loggerMock,
-                'scopeConfig' => $this->scopeConfigMock,
-                'filesystem' => $this->filesystemMock,
-                'backupFactory' => $this->backupFactoryMock,
-                'maintenanceMode' => $this->maintenanceModeMock,
-            ]
-        );
+        $objectManager = new ObjectManager($this);
+        $this->helperMock = $this->getMockBuilder(Helper::class)->disableOriginalConstructor()->getMock();
+        $this->cron = $objectManager->getObject(SystemBackup::class, ['backupData' => $this->helperMock]);
     }
 
     /**
-     * @expectedException \Exception
+     * Test that cron doesn't do anything if backups are disabled.
      */
-    public function testExecuteThrowsException()
+    public function testDisabled()
     {
-        $type = 'db';
-        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(true);
-
-        $this->scopeConfigMock->expects($this->once())->method('getValue')
-            ->with('system/backup/type', 'store')
-            ->willReturn($type);
-
-        $this->backupFactoryMock->expects($this->once())->method('create')->willReturn($this->backupDbMock);
-
-        $this->backupDbMock->expects($this->once())->method('create')->willThrowException(new \Exception);
-
-        $this->backupDataMock->expects($this->never())->method('getCreateSuccessMessageByType')->with($type);
-        $this->loggerMock->expects($this->never())->method('info');
-
-        $this->systemBackup->execute();
+        $this->helperMock->expects($this->any())->method('isEnabled')->willReturn(false);
+        $this->cron->execute();
     }
 }
diff --git a/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php b/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
index 629028bfd6f15..abf5e63276afa 100644
--- a/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php
@@ -56,7 +56,7 @@ protected function setUp()
         $this->_objectManager->expects(
             $this->at(0)
         )->method(
-            'get'
+            'create'
         )->with(
             \Magento\Backup\Model\Fs\Collection::class
         )->will(
@@ -65,7 +65,7 @@ protected function setUp()
         $this->_objectManager->expects(
             $this->at(1)
         )->method(
-            'get'
+            'create'
         )->with(
             \Magento\Backup\Model\Backup::class
         )->will(
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 5ae2ad06b7d01..81225430b0fc8 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-cron": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cron": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backup/etc/adminhtml/system.xml b/app/code/Magento/Backup/etc/adminhtml/system.xml
index 4028452d04439..90f6fa861b40f 100644
--- a/app/code/Magento/Backup/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/system.xml
@@ -9,13 +9,21 @@
     <system>
         <section id="system">
             <group id="backup" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Scheduled Backup Settings</label>
+                <label>Backup Settings</label>
+                <field id="functionality_enabled" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Backup</label>
+                    <comment>Disabled by default for security reasons</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enable Scheduled Backup</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="functionality_enabled">1</field>
+                    </depends>
                 </field>
                 <field id="type" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Backup Type</label>
+                    <label>Scheduled Backup Type</label>
                     <depends>
                         <field id="enabled">1</field>
                     </depends>
diff --git a/app/code/Magento/Backup/etc/config.xml b/app/code/Magento/Backup/etc/config.xml
new file mode 100644
index 0000000000000..fb0808983b9c8
--- /dev/null
+++ b/app/code/Magento/Backup/etc/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <backup>
+                <functionality_enabled>0</functionality_enabled>
+            </backup>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/Backup/etc/module.xml b/app/code/Magento/Backup/etc/module.xml
index 667ec9d8a7461..3e9906a5ecd74 100644
--- a/app/code/Magento/Backup/etc/module.xml
+++ b/app/code/Magento/Backup/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Backup" setup_version="2.0.0">
+    <module name="Magento_Backup" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml
new file mode 100644
index 0000000000000..3470f528e5ceb
--- /dev/null
+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Backup functionality is disabled</title>
+    </head>
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Backend\Block\Template" name="adminhtml.system.backup.disabled" template="Magento_Backup::backup/disabled.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml
new file mode 100644
index 0000000000000..a5308dce5cc52
--- /dev/null
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<h2>Backup functionality is currently disabled. Please use other means for backups</h2>
diff --git a/app/code/Magento/Braintree/Block/Form.php b/app/code/Magento/Braintree/Block/Form.php
index f6cf62f5a2131..8a727ae87262f 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 8e05856d9b57a..1ba2f862e2fe5 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 0000000000000..4b9721a693f08
--- /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 aecde869ca196..f8b152ded1556 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/Controller/Paypal/AbstractAction.php b/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
index d6a81eefc6fdb..e0ed996019576 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Controller\Paypal;
 
 use Magento\Checkout\Model\Session;
@@ -73,7 +74,7 @@ public function dispatch(RequestInterface $request)
     protected function validateQuote($quote)
     {
         if (!$quote || !$quote->getItemsCount()) {
-            throw new \InvalidArgumentException(__('We can\'t initialize checkout.'));
+            throw new \InvalidArgumentException(__('Checkout failed to initialize. Verify and try again.'));
         }
     }
 }
diff --git a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
index 1acd16708ff42..418cb93900610 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
@@ -9,6 +9,7 @@
 use Magento\Braintree\Model\Paypal\Helper;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
@@ -17,7 +18,7 @@
 /**
  * Class PlaceOrder
  */
-class PlaceOrder extends AbstractAction
+class PlaceOrder extends AbstractAction implements HttpPostActionInterface
 {
     /**
      * @var Helper\OrderPlace
@@ -54,6 +55,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     *
      * @throws LocalizedException
      */
     public function execute()
@@ -71,7 +73,10 @@ public function execute()
             return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            $this->messageManager->addExceptionMessage($e, $e->getMessage());
+            $this->messageManager->addExceptionMessage(
+                $e,
+                'The order #' . $quote->getReservedOrderId() . ' cannot be processed.'
+            );
         }
 
         return $resultRedirect->setPath('checkout/cart', ['_secure' => true]);
diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
index 4576e3b033df8..14ec829d98024 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Controller\Paypal;
 
 use Magento\Checkout\Model\Session;
@@ -11,11 +12,12 @@
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Class Review
  */
-class Review extends AbstractAction
+class Review extends AbstractAction implements HttpPostActionInterface
 {
     /**
      * @var QuoteUpdater
@@ -59,14 +61,14 @@ public function execute()
         try {
             $this->validateQuote($quote);
 
-            if ($this->validateRequestData($requestData)) {
+            if ($requestData && $this->validateRequestData($requestData)) {
                 $this->quoteUpdater->execute(
                     $requestData['nonce'],
                     $requestData['details'],
                     $quote
                 );
             } elseif (!$quote->getPayment()->getAdditionalInformation(self::$paymentMethodNonce)) {
-                throw new LocalizedException(__('We can\'t initialize checkout.'));
+                throw new LocalizedException(__('Checkout failed to initialize. Verify and try again.'));
             }
 
             /** @var \Magento\Framework\View\Result\Page $resultPage */
@@ -90,6 +92,8 @@ public function execute()
     }
 
     /**
+     * Validate request data
+     *
      * @param array $requestData
      * @return boolean
      */
diff --git a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
index f972eecf9f92d..de439aad2defd 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 91c9f6c14bb5d..672aa02a0db6d 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 available payment tokens');
+            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 9dd52dc91afb9..0466216bdb7d2 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 7badd2b87ac34..2089a9646ae94 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 caeaaa7fe45a2..ef35152bf7e95 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 180344ab7263f..6d43929db7675 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
@@ -16,9 +16,9 @@ class TransactionRefund extends AbstractTransaction
      */
     protected function process(array $data)
     {
-        return $this->adapter->refund(
-            $data['transaction_id'],
-            $data[PaymentDataBuilder::AMOUNT]
-        );
+        $storeId = $data['store_id'] ?? null;
+
+        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 81c79e522907d..0e4481a43bc89 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 0df5799b54b83..6760e724fd3a6 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
@@ -18,9 +18,9 @@ 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;
+
+        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 a774065365b47..0a940839fc154 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
@@ -14,6 +14,8 @@ class TransactionVoid extends AbstractTransaction
      */
     protected function process(array $data)
     {
-        return $this->adapter->void($data['transaction_id']);
+        $storeId = $data['store_id'] ?? null;
+
+        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 9ff65149894f8..f7d3aae823e56 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 c6588cfaca05f..6f3a262d7efb4 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 6b03f418c2545..6b3403bcd15c1 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 3794058c2be8c..aac603bfb621a 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 7eebbca1d4290..8538667778504 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/MerchantAccountDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
new file mode 100644
index 0000000000000..6dc40e76322df
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Request;
+
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+
+/**
+ * Adds Merchant Account ID to the request if it was specified in the configuration.
+ */
+class MerchantAccountDataBuilder implements BuilderInterface
+{
+    /**
+     * The merchant account ID used to create a transaction.
+     * Currency is also determined by merchant account ID.
+     * If no merchant account ID is specified, Braintree will use your default merchant account.
+     */
+    private static $merchantAccountId = 'merchantAccountId';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * Constructor
+     *
+     * @param Config $config
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(Config $config, SubjectReader $subjectReader)
+    {
+        $this->config = $config;
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject): array
+    {
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+        $order = $paymentDO->getOrder();
+
+        $result = [];
+        $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
+        if (!empty($merchantAccountId)) {
+            $result[self::$merchantAccountId] = $merchantAccountId;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
index cea0f8f1291bb..7d0d9dad0db06 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 6f76c3415c31a..4d63ee4125b74 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;
 
@@ -49,6 +49,8 @@ public function build(array $buildSubject)
 
         $payment = $paymentDO->getPayment();
         $data = $payment->getAdditionalInformation();
+        // the payment token could be stored only if a customer checks the Vault flow on storefront
+        // see https://developers.braintreepayments.com/guides/paypal/vault/javascript/v2#invoking-the-vault-flow
         if (!empty($data[VaultConfigProvider::IS_ACTIVE_CODE])) {
             $result[self::$optionsKey] = [
                 self::$storeInVaultOnSuccess => true
diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
index a3341c3fc1873..fe75ce86cca2f 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
@@ -36,9 +36,8 @@ class PaymentDataBuilder implements BuilderInterface
     const PAYMENT_METHOD_NONCE = 'paymentMethodNonce';
 
     /**
-     * The merchant account ID used to create a transaction.
-     * Currency is also determined by merchant account ID.
-     * If no merchant account ID is specified, Braintree will use your default merchant account.
+     * @deprecated
+     * @see \Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
      */
     const MERCHANT_ACCOUNT_ID = 'merchantAccountId';
 
@@ -47,25 +46,18 @@ class PaymentDataBuilder implements BuilderInterface
      */
     const ORDER_ID = 'orderId';
 
-    /**
-     * @var Config
-     */
-    private $config;
-
     /**
      * @var SubjectReader
      */
     private $subjectReader;
 
     /**
-     * Constructor
-     *
      * @param Config $config
      * @param SubjectReader $subjectReader
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(Config $config, SubjectReader $subjectReader)
     {
-        $this->config = $config;
         $this->subjectReader = $subjectReader;
     }
 
@@ -87,11 +79,6 @@ public function build(array $buildSubject)
             self::ORDER_ID => $order->getOrderIncrementId()
         ];
 
-        $merchantAccountId = $this->config->getMerchantAccountId();
-        if (!empty($merchantAccountId)) {
-            $result[self::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
-        }
-
         return $result;
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Request/RefundDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/RefundDataBuilder.php
index 82de8e84cbfea..1c25646311160 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 0000000000000..014df33690fa0
--- /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 c366a67701521..520aa58457753 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 7182f87e082d1..950634ba2d9e2 100644
--- a/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Gateway\Command\CommandException;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
@@ -41,6 +43,9 @@ public function build(array $buildSubject)
         $payment = $paymentDO->getPayment();
         $extensionAttributes = $payment->getExtensionAttributes();
         $paymentToken = $extensionAttributes->getVaultPaymentToken();
+        if ($paymentToken === null) {
+            throw new CommandException(__('The Payment Token is not available to perform the request.'));
+        }
         return [
             'amount' => $this->formatPrice($this->subjectReader->readAmount($buildSubject)),
             'paymentMethodToken' => $paymentToken->getGatewayToken()
diff --git a/app/code/Magento/Braintree/Gateway/Request/VoidDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VoidDataBuilder.php
index 2328ea10f78c7..0bbda28cd344b 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/CancelDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/CancelDetailsHandler.php
new file mode 100644
index 0000000000000..3d6ed025791bf
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Response/CancelDetailsHandler.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Response;
+
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Response\HandlerInterface;
+use Magento\Sales\Model\Order\Payment;
+
+/**
+ * Handles response details for order cancellation request.
+ */
+class CancelDetailsHandler implements HandlerInterface
+{
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(SubjectReader $subjectReader)
+    {
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function handle(array $handlingSubject, array $response)
+    {
+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
+        /** @var Payment $orderPayment */
+        $orderPayment = $paymentDO->getPayment();
+        $orderPayment->setIsTransactionClosed(true);
+        $orderPayment->setShouldCloseParentTransaction(true);
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php
index 2715da5d3c419..32abeac4c8ffb 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;
@@ -85,7 +85,7 @@ public function handle(array $handlingSubject, array $response)
     private function getCreditCardType($type)
     {
         $replaced = str_replace(' ', '-', strtolower($type));
-        $mapper = $this->config->getCctypesMapper();
+        $mapper = $this->config->getCcTypesMapper();
 
         return $mapper[$replaced];
     }
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
index 766b385851ab8..7d38c2bf7d2ed 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
@@ -6,14 +6,14 @@
 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;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
 
 /**
  * Vault Details Handler
@@ -21,7 +21,7 @@
 class VaultDetailsHandler implements HandlerInterface
 {
     /**
-     * @var PaymentTokenInterfaceFactory
+     * @var PaymentTokenFactoryInterface
      */
     private $paymentTokenFactory;
 
@@ -41,15 +41,13 @@ class VaultDetailsHandler implements HandlerInterface
     private $dateTimeFactory;
 
     /**
-     * Constructor
-     *
-     * @param PaymentTokenInterfaceFactory $paymentTokenFactory
+     * @param PaymentTokenFactoryInterface $paymentTokenFactory
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
      * @param SubjectReader $subjectReader
      * @param DateTimeFactory $dateTimeFactory
      */
     public function __construct(
-        PaymentTokenInterfaceFactory $paymentTokenFactory,
+        PaymentTokenFactoryInterface $paymentTokenFactory,
         OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
         SubjectReader $subjectReader,
         DateTimeFactory $dateTimeFactory
@@ -92,7 +90,7 @@ private function getVaultPaymentToken(Transaction $transaction)
         }
 
         /** @var PaymentTokenInterface $paymentToken */
-        $paymentToken = $this->paymentTokenFactory->create();
+        $paymentToken = $this->paymentTokenFactory->create(PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT);
         $paymentToken->setGatewayToken($token);
         $paymentToken->setExpiresAt($this->getExpirationDate());
         $details = json_encode([
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
index 83d7e44a6b612..97bb312af4bd4 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 3941640aaeeb1..a95ea76c2e633 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 95660e10b394c..d4976ff18e0ee 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 93f37cb561feb..8d61660f03ce5 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 7dd79143736e5..18888bdcf3d4a 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 a8332b9409f78..8880f9c1b1a3e 100644
--- a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
@@ -7,13 +7,15 @@
 
 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;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
 
 /**
  * Vault Details Handler
@@ -22,7 +24,7 @@
 class VaultDetailsHandler implements HandlerInterface
 {
     /**
-     * @var PaymentTokenInterfaceFactory
+     * @var PaymentTokenFactoryInterface
      */
     protected $paymentTokenFactory;
 
@@ -42,33 +44,32 @@ class VaultDetailsHandler implements HandlerInterface
     protected $config;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var Json
      */
     private $serializer;
 
     /**
      * VaultDetailsHandler constructor.
      *
-     * @param PaymentTokenInterfaceFactory $paymentTokenFactory
+     * @param PaymentTokenFactoryInterface $paymentTokenFactory
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
      * @param Config $config
      * @param SubjectReader $subjectReader
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param Json|null $serializer
      * @throws \RuntimeException
      */
     public function __construct(
-        PaymentTokenInterfaceFactory $paymentTokenFactory,
+        PaymentTokenFactoryInterface $paymentTokenFactory,
         OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
         Config $config,
         SubjectReader $subjectReader,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        Json $serializer = null
     ) {
         $this->paymentTokenFactory = $paymentTokenFactory;
         $this->paymentExtensionFactory = $paymentExtensionFactory;
         $this->config = $config;
         $this->subjectReader = $subjectReader;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -103,7 +104,7 @@ protected function getVaultPaymentToken(Transaction $transaction)
         }
 
         /** @var PaymentTokenInterface $paymentToken */
-        $paymentToken = $this->paymentTokenFactory->create();
+        $paymentToken = $this->paymentTokenFactory->create(PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD);
         $paymentToken->setGatewayToken($token);
         $paymentToken->setExpiresAt($this->getExpirationDate($transaction));
 
@@ -156,7 +157,7 @@ private function convertDetailsToJSON($details)
     private function getCreditCardType($type)
     {
         $replaced = str_replace(' ', '-', strtolower($type));
-        $mapper = $this->config->getCctypesMapper();
+        $mapper = $this->config->getCcTypesMapper();
 
         return $mapper[$replaced];
     }
diff --git a/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php b/app/code/Magento/Braintree/Gateway/SubjectReader.php
similarity index 85%
rename from app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php
rename to app/code/Magento/Braintree/Gateway/SubjectReader.php
index e98597655190f..7cf00233e7f8f 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
@@ -44,19 +43,20 @@ public function readPayment(array $subject)
     }
 
     /**
-     * Reads transaction from subject
+     * Reads transaction from the subject.
      *
      * @param array $subject
-     * @return \Braintree\Transaction
+     * @return Transaction
+     * @throws \InvalidArgumentException if the subject doesn't contain transaction details.
      */
     public function readTransaction(array $subject)
     {
         if (!isset($subject['object']) || !is_object($subject['object'])) {
-            throw new \InvalidArgumentException('Response object does not exist');
+            throw new \InvalidArgumentException('Response object does not exist.');
         }
 
         if (!isset($subject['object']->transaction)
-            && !$subject['object']->transaction instanceof Transaction
+            || !$subject['object']->transaction instanceof Transaction
         ) {
             throw new \InvalidArgumentException('The object is not a class \Braintree\Transaction.');
         }
@@ -119,4 +119,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/CancelResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/CancelResponseValidator.php
new file mode 100644
index 0000000000000..5e31547e9503c
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Validator/CancelResponseValidator.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Validator;
+
+use Braintree\Error\ErrorCollection;
+use Braintree\Error\Validation;
+use Magento\Payment\Gateway\Validator\AbstractValidator;
+use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
+use Magento\Braintree\Gateway\SubjectReader;
+
+/**
+ * Decorates the general response validator to handle specific cases.
+ *
+ * This validator decorates the general response validator to handle specific cases like
+ * an expired or already voided on Braintree side authorization transaction.
+ */
+class CancelResponseValidator extends AbstractValidator
+{
+    /**
+     * @var int
+     */
+    private static $acceptableTransactionCode = 91504;
+
+    /**
+     * @var GeneralResponseValidator
+     */
+    private $generalResponseValidator;
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * @param ResultInterfaceFactory $resultFactory
+     * @param GeneralResponseValidator $generalResponseValidator
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(
+        ResultInterfaceFactory $resultFactory,
+        GeneralResponseValidator $generalResponseValidator,
+        SubjectReader $subjectReader
+    ) {
+        parent::__construct($resultFactory);
+        $this->generalResponseValidator = $generalResponseValidator;
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(array $validationSubject): ResultInterface
+    {
+        $result = $this->generalResponseValidator->validate($validationSubject);
+        if (!$result->isValid()) {
+            $response = $this->subjectReader->readResponseObject($validationSubject);
+            if ($this->isErrorAcceptable($response->errors)) {
+                $result = $this->createResult(true, [__('Transaction is cancelled offline.')]);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Checks if error collection has an acceptable error code.
+     *
+     * @param ErrorCollection $errorCollection
+     * @return bool
+     */
+    private function isErrorAcceptable(ErrorCollection $errorCollection): bool
+    {
+        $errors = $errorCollection->deepAll();
+        // there is should be only one acceptable error
+        if (count($errors) > 1) {
+            return false;
+        }
+
+        /** @var Validation $error */
+        $error = array_pop($errors);
+
+        return (int)$error->code === self::$acceptableTransactionCode;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php b/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
new file mode 100644
index 0000000000000..167fcb1569cbf
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Validator;
+
+use Braintree\Error\ErrorCollection;
+use Braintree\Error\Validation;
+use Braintree\Result\Error;
+use Braintree\Result\Successful;
+
+/**
+ * Processes errors codes from Braintree response.
+ */
+class ErrorCodeProvider
+{
+    /**
+     * Retrieves list of error codes from Braintree response.
+     *
+     * @param Successful|Error $response
+     * @return array
+     */
+    public function getErrorCodes($response): array
+    {
+        $result = [];
+        if (!$response instanceof Error) {
+            return $result;
+        }
+
+        /** @var ErrorCollection $collection */
+        $collection = $response->errors;
+
+        /** @var Validation $error */
+        foreach ($collection->deepAll() as $error) {
+            $result[] = $error->code;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
index a70bc2d02e0e5..6aac588c38374 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
@@ -18,16 +18,26 @@ class GeneralResponseValidator extends AbstractValidator
      */
     protected $subjectReader;
 
+    /**
+     * @var ErrorCodeProvider
+     */
+    private $errorCodeProvider;
+
     /**
      * Constructor
      *
      * @param ResultInterfaceFactory $resultFactory
      * @param SubjectReader $subjectReader
+     * @param ErrorCodeProvider $errorCodeProvider
      */
-    public function __construct(ResultInterfaceFactory $resultFactory, SubjectReader $subjectReader)
-    {
+    public function __construct(
+        ResultInterfaceFactory $resultFactory,
+        SubjectReader $subjectReader,
+        ErrorCodeProvider $errorCodeProvider
+    ) {
         parent::__construct($resultFactory);
         $this->subjectReader = $subjectReader;
+        $this->errorCodeProvider = $errorCodeProvider;
     }
 
     /**
@@ -49,8 +59,9 @@ public function validate(array $validationSubject)
                 $errorMessages = array_merge($errorMessages, $validationResult[1]);
             }
         }
+        $errorCodes = $this->errorCodeProvider->getErrorCodes($response);
 
-        return $this->createResult($isValid, $errorMessages);
+        return $this->createResult($isValid, $errorMessages, $errorCodes);
     }
 
     /**
@@ -62,7 +73,7 @@ protected function getResponseValidators()
             function ($response) {
                 return [
                     property_exists($response, 'success') && $response->success === true,
-                    [__('Braintree error response.')]
+                    [$response->message ?? __('Braintree error response.')]
                 ];
             }
         ];
diff --git a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
index 71f3828ebe9d4..fd1fe81b5eba8 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 0000000000000..2c3f137eb1686
--- /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/Adminhtml/Source/PaymentAction.php b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php
index e0d684a7aa976..595d8b4792a62 100644
--- a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php
+++ b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Model\Adminhtml\Source;
 
 use Magento\Framework\Option\ArrayInterface;
-use Magento\Payment\Model\Method\AbstractMethod;
+use Magento\Payment\Model\MethodInterface;
 
 /**
  * Class PaymentAction
@@ -22,11 +22,11 @@ public function toOptionArray()
     {
         return [
             [
-                'value' => AbstractMethod::ACTION_AUTHORIZE,
+                'value' => MethodInterface::ACTION_AUTHORIZE,
                 'label' => __('Authorize'),
             ],
             [
-                'value' => AbstractMethod::ACTION_AUTHORIZE_CAPTURE,
+                'value' => MethodInterface::ACTION_AUTHORIZE_CAPTURE,
                 'label' => __('Authorize and Capture'),
             ]
         ];
diff --git a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
index f68b7eca047f5..2a9923a333cef 100644
--- a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
+++ b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
@@ -66,6 +66,13 @@ public function __construct(
     public function beforeSave()
     {
         $value = $this->getValue();
+        if (!is_array($value)) {
+            try {
+                $value = $this->serializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $value = [];
+            }
+        }
         $result = [];
         foreach ($value as $data) {
             if (empty($data['country_id']) || empty($data['cc_types'])) {
diff --git a/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php b/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php
index 1d5057d83d6cf..f9fae8a469b1d 100644
--- a/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php
+++ b/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php
@@ -24,7 +24,7 @@ class AvsEmsCodeMapper implements PaymentVerificationInterface
      *
      * @var string
      */
-    private static $unavailableCode = 'U';
+    private static $unavailableCode = '';
 
     /**
      * List of mapping AVS codes
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
index b833798eabf90..314404c79939c 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
@@ -3,16 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Model\Paypal\Helper;
 
-use Magento\Quote\Model\Quote;
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
+use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Checkout\Helper\Data;
+use Magento\Checkout\Model\Type\Onepage;
 use Magento\Customer\Model\Group;
 use Magento\Customer\Model\Session;
-use Magento\Checkout\Model\Type\Onepage;
-use Magento\Quote\Api\CartManagementInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Api\AgreementsValidatorInterface;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class OrderPlace
@@ -41,23 +43,29 @@ class OrderPlace extends AbstractHelper
     private $checkoutHelper;
 
     /**
-     * Constructor
-     *
+     * @var OrderCancellationService
+     */
+    private $orderCancellationService;
+
+    /**
      * @param CartManagementInterface $cartManagement
      * @param AgreementsValidatorInterface $agreementsValidator
      * @param Session $customerSession
      * @param Data $checkoutHelper
+     * @param OrderCancellationService $orderCancellationService
      */
     public function __construct(
         CartManagementInterface $cartManagement,
         AgreementsValidatorInterface $agreementsValidator,
         Session $customerSession,
-        Data $checkoutHelper
+        Data $checkoutHelper,
+        OrderCancellationService $orderCancellationService
     ) {
         $this->cartManagement = $cartManagement;
         $this->agreementsValidator = $agreementsValidator;
         $this->customerSession = $customerSession;
         $this->checkoutHelper = $checkoutHelper;
+        $this->orderCancellationService = $orderCancellationService;
     }
 
     /**
@@ -66,12 +74,14 @@ public function __construct(
      * @param Quote $quote
      * @param array $agreement
      * @return void
-     * @throws LocalizedException
+     * @throws \Exception
      */
     public function execute(Quote $quote, array $agreement)
     {
         if (!$this->agreementsValidator->isValid($agreement)) {
-            throw new LocalizedException(__('Please agree to all the terms and conditions before placing the order.'));
+            throw new LocalizedException(__(
+                "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
+            ));
         }
 
         if ($this->getCheckoutMethod($quote) === Onepage::METHOD_GUEST) {
@@ -81,7 +91,12 @@ public function execute(Quote $quote, array $agreement)
         $this->disabledQuoteAddressValidation($quote);
 
         $quote->collectTotals();
-        $this->cartManagement->placeOrder($quote->getId());
+        try {
+            $this->cartManagement->placeOrder($quote->getId());
+        } catch (\Exception $e) {
+            $this->orderCancellationService->execute($quote->getReservedOrderId());
+            throw $e;
+        }
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
index fe5895541543d..aa23fa767d1ed 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
@@ -148,7 +148,7 @@ private function updateBillingAddress(Quote $quote, array $details)
     {
         $billingAddress = $quote->getBillingAddress();
 
-        if ($this->config->isRequiredBillingAddress()) {
+        if ($this->config->isRequiredBillingAddress() && !empty($details['billingAddress'])) {
             $this->updateAddressData($billingAddress, $details['billingAddress']);
         } else {
             $this->updateAddressData($billingAddress, $details['shippingAddress']);
diff --git a/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
new file mode 100644
index 0000000000000..29757e35ea6f4
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model\Paypal;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * The service to cancel an order and void authorization transaction.
+ */
+class OrderCancellationService
+{
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        OrderRepositoryInterface $orderRepository
+    ) {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * Cancels an order and authorization transaction.
+     *
+     * @param string $incrementId
+     * @return bool
+     */
+    public function execute(string $incrementId): bool
+    {
+        $order = $this->getOrder($incrementId);
+        if ($order === null) {
+            return false;
+        }
+
+        // `\Magento\Sales\Model\Service\OrderService::cancel` cannot be used for cancellation as the service uses
+        // the order repository with outdated payment method instance (ex. contains Vault instead of Braintree)
+        $order->cancel();
+        $this->orderRepository->save($order);
+        return true;
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface|null
+     */
+    private function getOrder(string $incrementId)
+    {
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, $incrementId)
+            ->create();
+
+        $items = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php b/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
index edac6e3533849..a237b64bf58ee 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 c420195446270..928769498a035 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(),
+                    '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/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
index e06b913db8ef4..e6c5ee22c62b4 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver)
      */
     public function getConfig()
     {
+        $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+        
         return [
             'payment' => [
                 self::PAYPAL_CODE => [
@@ -60,6 +62,8 @@ public function getConfig()
                     'vaultCode' => self::PAYPAL_VAULT_CODE,
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
+                    'isRequiredBillingAddress' =>
+                        (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll
                 ]
             ]
         ];
diff --git a/app/code/Magento/Braintree/Plugin/OrderCancellation.php b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
new file mode 100644
index 0000000000000..90c72839d9777
--- /dev/null
+++ b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Plugin;
+
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+
+/**
+ * Cancels an order and an authorization transaction.
+ */
+class OrderCancellation
+{
+    /**
+     * @var OrderCancellationService
+     */
+    private $orderCancellationService;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @param OrderCancellationService $orderCancellationService
+     * @param CartRepositoryInterface $quoteRepository
+     */
+    public function __construct(
+        OrderCancellationService $orderCancellationService,
+        CartRepositoryInterface $quoteRepository
+    ) {
+        $this->orderCancellationService = $orderCancellationService;
+        $this->quoteRepository = $quoteRepository;
+    }
+
+    /**
+     * Cancels an order if an exception occurs during the order creation.
+     *
+     * @param CartManagementInterface $subject
+     * @param \Closure $proceed
+     * @param int $cartId
+     * @param PaymentInterface $payment
+     * @return int
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundPlaceOrder(
+        CartManagementInterface $subject,
+        \Closure $proceed,
+        $cartId,
+        PaymentInterface $payment = null
+    ) {
+        try {
+            return $proceed($cartId, $payment);
+        } catch (\Exception $e) {
+            $quote = $this->quoteRepository->get((int) $cartId);
+            $payment = $quote->getPayment();
+            $paymentCodes = [
+                ConfigProvider::CODE,
+                ConfigProvider::CC_VAULT_CODE,
+                PayPalConfigProvider::PAYPAL_CODE,
+                PayPalConfigProvider::PAYPAL_VAULT_CODE
+            ];
+            if (in_array($payment->getMethod(), $paymentCodes)) {
+                $incrementId = $quote->getReservedOrderId();
+                $this->orderCancellationService->execute($incrementId);
+            }
+
+            throw $e;
+        }
+    }
+}
diff --git a/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..d08bf62da8e4f
--- /dev/null
+++ b/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Convert data from php native serialized data to JSON.
+ */
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Framework\DB\FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * @var \Magento\Framework\DB\Select\QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * ConvertSerializedDataToJson constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Framework\DB\FieldDataConverterFactory $fieldDataConverterFactory
+     * @param \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Framework\DB\FieldDataConverterFactory $fieldDataConverterFactory,
+        \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+        $this->queryModifierFactory = $queryModifierFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->convertSerializedDataToJson();
+    }
+
+    /**
+     * Upgrade data to version 2.0.1, converts row data in the core_config_data table that uses the path
+     * payment/braintree/countrycreditcard from serialized to JSON
+     *
+     * @return void
+     */
+    private function convertSerializedDataToJson()
+    {
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(
+            \Magento\Framework\DB\DataConverter\SerializedToJson::class
+        );
+
+        $queryModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'path' => ['payment/braintree/countrycreditcard']
+                ]
+            ]
+        );
+
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'config_id',
+            'value',
+            $queryModifier
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Braintree/Setup/UpgradeData.php b/app/code/Magento/Braintree/Setup/UpgradeData.php
deleted file mode 100644
index a7b39f12273e2..0000000000000
--- a/app/code/Magento/Braintree/Setup/UpgradeData.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Braintree\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var \Magento\Framework\DB\FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * @var \Magento\Framework\DB\Select\QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * UpgradeData constructor.
-     *
-     * @param \Magento\Framework\DB\FieldDataConverterFactory $fieldDataConverterFactory
-     * @param \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
-     */
-    public function __construct(
-        \Magento\Framework\DB\FieldDataConverterFactory $fieldDataConverterFactory,
-        \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
-    ) {
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-        $this->queryModifierFactory = $queryModifierFactory;
-    }
-
-    /**
-     * Upgrades data for Braintree module
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->convertSerializedDataToJson($setup);
-        }
-    }
-
-    /**
-     * Upgrade data to version 2.0.1, converts row data in the core_config_data table that uses the path
-     * payment/braintree/countrycreditcard from serialized to JSON
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function convertSerializedDataToJson(ModuleDataSetupInterface $setup)
-    {
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(
-            \Magento\Framework\DB\DataConverter\SerializedToJson::class
-        );
-
-        $queryModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'path' => ['payment/braintree/countrycreditcard']
-                ]
-            ]
-        );
-
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('core_config_data'),
-            'config_id',
-            'value',
-            $queryModifier
-        );
-    }
-}
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
new file mode 100644
index 0000000000000..412513c59c63c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="AdminOrderBraintreeFillActionGroup">
+        <!--Select Braintree Payment method on Admin Order Create Page-->
+        <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
+        <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
+        <waitForPageLoad stepKey="waitForCardTypes"/>
+        <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
+        <waitForPageLoad stepKey="waitForCardSelected"/>
+
+        <!--Choose Master Card from drop-down list-->
+        <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
+        <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
+        <waitForPageLoad stepKey="waitForFillCardNumber"/>
+        <switchToIFrame stepKey="switchBackFromCard"/>
+
+        <!--Fill expire date-->
+        <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
+        <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
+        <waitForPageLoad stepKey="waitForFillMonth"/>
+        <switchToIFrame stepKey="switchBackFromMonth"/>
+        <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
+        <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
+        <waitForPageLoad stepKey="waitForFillYear"/>
+        <switchToIFrame stepKey="switchBackFromYear"/>
+
+        <!--Fill CVW code-->
+        <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
+        <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
+        <wait stepKey="waitForFillCVV" time="1"/>
+        <switchToIFrame stepKey="switchBackFromCVV"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
new file mode 100644
index 0000000000000..9eaae8b33e73f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="ConfigureBraintree">
+        <!-- GoTo ConfigureBraintree fields -->
+        <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
+        <waitForPageLoad stepKey="waitForConfiguration" time="2"/>
+        <click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
+        <waitForPageLoad stepKey="waitForSales" time="2"/>
+        <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
+        <waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>
+        <click stepKey="clickOnPaymentMethods" selector="{{ConfigurationListSection.salesPaymentMethods}}" />
+        <waitForPageLoad stepKey="waitForConfigureButton" time="2"/>
+        <click stepKey="clickOnConfigureButtonForBraintree" selector="{{ConfigurationPaymentSection.configureButton}}" />
+        <waitForPageLoad stepKey="BraintreeSettings" time="2"/>
+
+        <!-- Fill Braintree fields -->
+        <fillField stepKey="fillTitleForBraintreeSettings" selector="{{BraintreeConfiguraionSection.titleForBraintreeSettings}}" userInput="{{BraintreeConfigurationData.title}}"/>
+        <click stepKey="openEnvironmentSelect" selector="{{BraintreeConfiguraionSection.environment}}"/>
+        <click stepKey="chooseEnvironment" selector="{{BraintreeConfiguraionSection.sandbox}}"/>
+        <click stepKey="openPaymentActionSelect" selector="{{BraintreeConfiguraionSection.paymentActionSelect}}"/>
+        <click stepKey="choosePaymentAction" selector="{{BraintreeConfiguraionSection.paymentAction}}"/>
+        <fillField stepKey="fillMerchantID" selector="{{BraintreeConfiguraionSection.merchantID}}" userInput="{{BraintreeConfigurationData.merchantID}}"/>
+        <fillField stepKey="fillPublicKey" selector="{{BraintreeConfiguraionSection.publicKey}}" userInput="{{BraintreeConfigurationData.publicKey}}"/>
+        <fillField stepKey="fillPrivateKey" selector="{{BraintreeConfiguraionSection.privateKey}}" userInput="{{BraintreeConfigurationData.privateKey}}"/>
+        <click stepKey="expandEnableThisSolution" selector="{{BraintreeConfiguraionSection.enableThisSolution}}"/>
+        <click stepKey="chooseYesForEnableThisSolution" selector="{{BraintreeConfiguraionSection.yesForEnable}}"/>
+        <click stepKey="expandEnablePayPalThroughBraintree" selector="{{BraintreeConfiguraionSection.payPalThroughBraintree}}"/>
+        <click stepKey="chooseYesForEnablePayPalThroughBraintree" selector="{{BraintreeConfiguraionSection.yesForPayPalThroughBraintree}}"/>
+        <click stepKey="expandAdvancedBraintreeSettings" selector="{{BraintreeConfiguraionSection.advancedBraintreeSettings}}"/>
+        <fillField stepKey="fillMerchantAccountID" selector="{{BraintreeConfiguraionSection.merchantAccountID}}" userInput="{{BraintreeConfigurationData.merchantAccountID}}"/>
+        <click stepKey="expandCVVVerification" selector="{{BraintreeConfiguraionSection.CVVVerification}}"/>
+        <click stepKey="chooseYes" selector="{{BraintreeConfiguraionSection.yesForCVV}}"/>
+        <click stepKey="expandPayPalThroughBraintree" selector="{{BraintreeConfiguraionSection.payPalThroughBraintreeSelector}}"/>
+        <fillField stepKey="fillTitleForPayPalThroughBraintree" selector="{{BraintreeConfiguraionSection.titleForPayPalThroughBraintree}}" userInput="{{BraintreeConfigurationData.titleForPayPalThroughBraintree}}"/>
+        <click stepKey="expandPaymentAction" selector="{{BraintreeConfiguraionSection.paymentActionInPayPal}}"/>
+        <click stepKey="chooseAuthorize" selector="{{BraintreeConfiguraionSection.actionAuthorize}}"/>
+        <click stepKey="save" selector="{{BraintreeConfiguraionSection.save}}"/>
+        <waitForElementVisible selector="{{BraintreeConfiguraionSection.successfulMessage}}" stepKey="waitForSuccessfullyConfigured" time="10"/>
+    </actionGroup>
+
+    <actionGroup name="DisableBrainTree">
+        <magentoCLI stepKey="disableBrainTree" command="config:set payment/braintree/active 0"/>
+        <magentoCLI stepKey="disableBrainTreePaypal" command="config:set payment/braintree_paypal/active 0"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
new file mode 100644
index 0000000000000..a68042127ec48
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateCustomerActionGroup">
+        <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
+        <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
+        <click stepKey="clickOnAllCustomers" selector="{{CustomersSubmenuSection.allCustomers}}"/>
+        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
+        <click stepKey="addNewCustomer" selector="{{CustomersPageSection.addNewCustomerButton}}"/>
+        <waitForPageLoad stepKey="waitForNewProductPage" time="10"/>
+        <click stepKey="AssociateToWebsite" selector="{{NewCustomerPageSection.associateToWebsite}}"/>
+        <click stepKey="Group" selector="{{NewCustomerPageSection.group}}"/>
+        <fillField stepKey="FillFirstName" selector="{{NewCustomerPageSection.firstName}}" userInput="{{NewCustomerData.FirstName}}"/>
+        <fillField stepKey="FillLastName" selector="{{NewCustomerPageSection.lastName}}" userInput="{{NewCustomerData.LastName}}"/>
+        <fillField stepKey="FillEmail" selector="{{NewCustomerPageSection.email}}" userInput="{{NewCustomerData.Email}}"/>
+        <scrollToTopOfPage stepKey="scrollToAddresses"/>
+        <click stepKey="goToAddresses" selector="{{NewCustomerPageSection.addresses}}"/>
+        <waitForAjaxLoad stepKey="waitForAddresses" time="5"/>
+        <click stepKey="AddNewAddress" selector="{{NewCustomerPageSection.addNewAddress}}"/>
+        <waitForPageLoad stepKey="waitForAddressFields" time="5"/>
+        <click stepKey="thickBillingAddress" selector="{{NewCustomerPageSection.defaultBillingAddress}}"/>
+        <click stepKey="thickShippingAddress" selector="{{NewCustomerPageSection.defaultShippingAddress}}"/>
+        <fillField stepKey="fillFirstNameForAddress" selector="{{NewCustomerPageSection.firstNameForAddress}}" userInput="{{NewCustomerData.AddressFirstName}}"/>
+        <fillField stepKey="fillLastNameForAddress" selector="{{NewCustomerPageSection.lastNameForAddress}}" userInput="{{NewCustomerData.AddressLastName}}"/>
+        <fillField stepKey="fillStreetAddress" selector="{{NewCustomerPageSection.streetAddress}}" userInput="{{NewCustomerData.StreetAddress}}"/>
+        <fillField stepKey="fillCity" selector="{{NewCustomerPageSection.city}}" userInput="{{NewCustomerData.City}}"/>
+        <click stepKey="openCountry" selector="{{NewCustomerPageSection.country}}"/>
+        <waitForAjaxLoad stepKey="waitForCountryList" time="5"/>
+        <click stepKey="chooseCountry" selector="{{NewCustomerPageSection.countryArmenia}}"/>
+        <fillField stepKey="fillZip" selector="{{NewCustomerPageSection.zip}}" userInput="{{NewCustomerData.Zip}}"/>
+        <fillField stepKey="fillPhoneNumber" selector="{{NewCustomerPageSection.phoneNumber}}" userInput="{{NewCustomerData.PhoneNumber}}"/>
+        <waitForPageLoad stepKey="wait" time="10"/>
+        <click stepKey="save" selector="{{NewCustomerPageSection.saveCustomer}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage" time="10"/>
+        <waitForElementVisible selector="{{NewCustomerPageSection.createdSuccessMessage}}" stepKey="waitForSuccessfullyCreatedMessage" time="20"/>
+
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
new file mode 100644
index 0000000000000..17d634c009b3e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="useBraintreeForMasterCard">
+        <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
+        <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
+        <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
+        <waitForPageLoad stepKey="waitForCardTypes" time="3"/>
+        <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
+        <waitForPageLoad stepKey="waitForCardSelected" time="3"/>
+
+        <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
+        <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
+        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
+        <switchToIFrame stepKey="switchBackFromCard"/>
+
+        <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
+        <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
+        <waitForPageLoad stepKey="waitForFillMonth" time="1"/>
+        <switchToIFrame stepKey="switchBackFromMonth"/>
+
+        <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
+        <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
+        <waitForPageLoad stepKey="waitForFillYear" time="1"/>
+        <switchToIFrame stepKey="switchBackFromYear"/>
+
+        <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
+        <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
+        <wait stepKey="waitForFillCVV" time="1"/>
+        <switchToIFrame stepKey="switchBackFromCVV"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
new file mode 100644
index 0000000000000..19de3e859ae9a
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateNewProductActionGroup">
+
+        <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
+        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
+        <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
+        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
+        <click stepKey="addProduct" selector="{{ProductsPageSection.addProductButton}}"/>
+        <waitForPageLoad stepKey="waitForNewProductPage" time="10"/>
+        <fillField stepKey="FillProductName" selector="{{NewProductPageSection.productName}}" userInput="{{NewProductData.ProductName}}"/>
+        <fillField stepKey="FillPrice" selector="{{NewProductPageSection.price}}" userInput="{{NewProductData.Price}}"/>
+        <fillField stepKey="FillQuantity" selector="{{NewProductPageSection.quantity}}" userInput="{{NewProductData.Quantity}}"/>
+        <click stepKey="Save" selector="{{NewProductPageSection.saveButton}}"/>
+        <waitForElementVisible stepKey="waitForSuccessfullyCreatedMessage" selector="{{NewProductPageSection.createdSuccessMessage}}" time="10"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
new file mode 100644
index 0000000000000..4d531214db150
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteCustomerActionGroup">
+        <arguments>
+            <argument name="lastName" defaultValue=""/>
+        </arguments>
+        <!--Clear filter if exist-->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingCustomerFilters"/>
+
+        <click stepKey="chooseCustomer" selector="{{CustomersPageSection.customerCheckbox(lastName)}}"/>
+        <waitForAjaxLoad stepKey="waitForThick" time="2"/>
+        <click stepKey="OpenActions" selector="{{CustomersPageSection.actions}}"/>
+        <waitForAjaxLoad stepKey="waitForDelete" time="5"/>
+        <click stepKey="ChooseDelete" selector="{{CustomersPageSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForDeleteItemPopup" time="10"/>
+        <click stepKey="clickOnOk" selector="{{CustomersPageSection.ok}}"/>
+        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{CustomersPageSection.deletedSuccessMessage}}" time="10"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
new file mode 100644
index 0000000000000..724c6d92846c4
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteProductActionGroup">
+        <arguments>
+            <argument name="productName" defaultValue=""/>
+        </arguments>
+        <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
+        <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
+        <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
+        <waitForPageLoad stepKey="waitForProductsPage" time="10"/>
+        <click stepKey="TickCheckbox" selector="{{ProductsPageSection.checkboxForProduct(productName)}}"/>
+        <click stepKey="OpenActions" selector="{{ProductsPageSection.actions}}"/>
+        <waitForAjaxLoad stepKey="waitForDelete" time="5"/>
+        <click stepKey="ChooseDelete" selector="{{ProductsPageSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForDeleteItemPopup" time="10"/>
+        <click stepKey="clickOnOk" selector="{{ProductsPageSection.ok}}"/>
+        <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{ProductsPageSection.deletedSuccessMessage}}" time="10"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
new file mode 100644
index 0000000000000..bc6d6c2b46dc9
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <actionGroup name="StorefrontFillCartDataActionGroup">
+        <arguments>
+            <argument name="cartData" defaultValue="PaymentAndShippingInfo"/>
+        </arguments>
+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.cartFrame}}" stepKey="switchToIframe"/>
+        <fillField selector="{{BraintreeConfigurationPaymentSection.cartCode}}" userInput="{{cartData.cardNumber}}" stepKey="setCartCode"/>
+        <switchToIFrame stepKey="switchBack"/>
+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.monthFrame}}" stepKey="switchToIframe1"/>
+        <fillField selector="{{BraintreeConfigurationPaymentSection.month}}" userInput="{{cartData.month}}" stepKey="setMonth"/>
+        <switchToIFrame stepKey="switchBack1"/>
+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.yearFrame}}" stepKey="switchToIframe2"/>
+        <fillField selector="{{BraintreeConfigurationPaymentSection.year}}" userInput="{{cartData.year}}" stepKey="setYear"/>
+        <switchToIFrame stepKey="switchBack2"/>
+        <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.codeFrame}}" stepKey="switchToIframe3"/>
+        <fillField selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" userInput="{{cartData.cvv}}" stepKey="setVerificationNumber"/>
+        <switchToIFrame stepKey="SwitchBackToWindow"/>
+
+    </actionGroup>
+
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
new file mode 100644
index 0000000000000..7c774a634b369
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <!--Sign out-->
+    <actionGroup name="SignOut">
+        <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
+        <click selector="{{SignOutSection.logout}}" stepKey="clickToLogOut"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <see userInput="You have logged out." stepKey="seeSuccessMessage" />
+        <waitForElementVisible selector="//*[@data-ui-id='messages-message-success']" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
+    </actionGroup>
+
+    <!--Login New User-->
+    <actionGroup name="LoginNewUser">
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
+        <fillField userInput="{{NewAdmin.username}}" selector="{{LoginFormSection.username}}" stepKey="fillUsername"/>
+        <fillField userInput="{{NewAdmin.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
+        <click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
+    </actionGroup>
+
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
new file mode 100644
index 0000000000000..f00e3fa286b08
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SampleBraintreeConfig" type="braintree_config_state">
+        <requiredEntity type="title">SampleTitle</requiredEntity>
+        <requiredEntity type="payment_action">SamplePaymentAction</requiredEntity>
+        <requiredEntity type="environment">SampleEnvironment</requiredEntity>
+        <requiredEntity type="merchant_id">SampleMerchantId</requiredEntity>
+        <requiredEntity type="public_key">SamplePublicKey</requiredEntity>
+        <requiredEntity type="private_key">SamplePrivateKey</requiredEntity>
+    </entity>
+    <entity name="SampleTitle" type="title">
+        <data key="value">Sample Braintree Config</data>
+    </entity>
+    <entity name="SamplePaymentAction" type="payment_action">
+        <data key="value">authorize</data>
+    </entity>
+    <entity name="SampleEnvironment" type="environment">
+        <data key="value">sandbox</data>
+    </entity>
+    <entity name="SampleMerchantId" type="merchant_id">
+        <data key="value">someMerchantId</data>
+    </entity>
+    <entity name="SamplePublicKey" type="public_key">
+        <data key="value">somePublicKey</data>
+    </entity>
+    <entity name="SamplePrivateKey" type="private_key">
+        <data key="value">somePrivateKey</data>
+    </entity>
+
+    <entity name="BraintreeConfig" type="braintree_config_state">
+        <requiredEntity type="title">BraintreeTitle</requiredEntity>
+        <requiredEntity type="payment_action">PaymentAction</requiredEntity>
+        <requiredEntity type="environment">Environment</requiredEntity>
+        <requiredEntity type="merchant_id">MerchantId</requiredEntity>
+        <requiredEntity type="public_key">PublicKey</requiredEntity>
+        <requiredEntity type="private_key">PrivateKey</requiredEntity>
+        <requiredEntity type="active">Status</requiredEntity>
+    </entity>
+    <entity name="BraintreeTitle" type="title">
+        <data key="value">Credit Card (Braintree)</data>
+    </entity>
+    <entity name="PaymentAction" type="payment_action">
+        <data key="value">authorize</data>
+    </entity>
+    <entity name="Environment" type="environment">
+        <data key="value">sandbox</data>
+    </entity>
+    <entity name="MerchantId" type="merchant_id">
+        <data key="value">d4pdjhxgjfrsmzbf</data>
+    </entity>
+    <entity name="PublicKey" type="public_key">
+        <data key="value">m7q4wmh43xrgyrst</data>
+    </entity>
+    <entity name="PrivateKey" type="private_key">
+        <data key="value">67de364080b1b4e2492d7a3de413a572</data>
+    </entity>
+
+    <!-- default configuration used to restore Magento config -->
+    <entity name="DefaultBraintreeConfig" type="braintree_config_state">
+        <requiredEntity type="title">DefaultTitle</requiredEntity>
+        <requiredEntity type="payment_action">DefaultPaymentAction</requiredEntity>
+        <requiredEntity type="environment">DefaultEnvironment</requiredEntity>
+        <requiredEntity type="merchant_id">DefaultMerchantId</requiredEntity>
+        <requiredEntity type="public_key">DefaultPublicKey</requiredEntity>
+        <requiredEntity type="private_key">DefaultPrivateKey</requiredEntity>
+    </entity>
+    <entity name="DefaultTitle" type="title">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultPaymentAction" type="payment_action">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultEnvironment" type="environment">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultMerchantId" type="merchant_id">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultPublicKey" type="public_key">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultPrivateKey" type="private_key">
+        <data key="value"/>
+    </entity>
+
+    <entity name="CustomBraintreeConfigurationData" type="custom_braintree_config_state">
+        <requiredEntity type="braintree_cc_vault_active">BraintreeValuteActive</requiredEntity>
+        <requiredEntity type="active">EnableSolution</requiredEntity>
+    </entity>
+    <entity name="BraintreeValuteActive" type="braintree_cc_vault_active">
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableSolution" type="active">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="RollBackCustomBraintreeConfigurationData" type="custom_braintree_config_state">
+        <requiredEntity type="braintree_cc_vault_active">DefaultBraintreeValuteActive</requiredEntity>
+        <requiredEntity type="active">DefaultEnableSolution</requiredEntity>
+    </entity>
+    <entity name="DefaultBraintreeValuteActive" type="braintree_cc_vault_active">
+        <data key="value">0</data>
+    </entity>
+    <entity name="DefaultEnableSolution" type="active">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="testData" type="data">
+        <data key="websiteName" unique="suffix">Website</data>
+        <data key="websiteCode" unique="suffix">new_website</data>
+        <data key="name" unique="suffix">Store</data>
+        <data key="storeCode" unique="suffix">new_store</data>
+        <data key="block" unique="suffix">Block</data>
+    </entity>
+
+    <entity name="role" type="data">
+        <data key="name" unique="suffix">Role</data>
+    </entity>
+    <entity name="NewAdmin" type="user">
+        <data key="username" unique="suffix">admin</data>
+        <data key="firstName">John</data>
+        <data key="lastName">Smith</data>
+        <data key="password">admin123</data>
+        <data key="email" unique="prefix">mail@mail.com</data>
+    </entity>
+
+    <entity name="PaymentAndShippingInfo" type="data">
+        <data key="cardNumber">5105105105105100</data>
+        <data key="month">12</data>
+        <data key="year">20</data>
+        <data key="cvv">113</data>
+    </entity>
+
+    <entity name="BraintreeConfigurationData" type="data">
+        <data key="title">Credit Card (Braintree)</data>
+        <data key="merchantID">d4pdjhxgjfrsmzbf</data>
+        <data key="publicKey">m7q4wmh43xrgyrst</data>
+        <data key="privateKey">67de364080b1b4e2492d7a3de413a572</data>
+        <data key="merchantAccountID">Magneto</data>
+        <data key="titleForPayPalThroughBraintree">PayPal (Braintree)</data>
+    </entity>
+
+</entities>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
new file mode 100644
index 0000000000000..30345ec31bacd
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="NewCustomerData" type="braintree_config_state">
+        <data key="FirstName">Abgar</data>
+        <data key="LastName">Abgaryan</data>
+        <data key="Email">m@m.com</data>
+        <data key="AddressFirstName">Abgar</data>
+        <data key="AddressLastName">Abgaryan</data>
+        <data key="StreetAddress">Street</data>
+        <data key="City">Yerevan</data>
+        <data key="Zip">9999</data>
+        <data key="PhoneNumber">9999</data>
+        <data key="Country">Armenia</data>
+    </entity>
+
+</entities>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
new file mode 100644
index 0000000000000..72661ae94076f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="NewProductData" type="braintree_config_state">
+        <data key="ProductName">ProductTest</data>
+        <data key="Price">100</data>
+        <data key="Quantity">100</data>
+    </entity>
+
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE.txt b/app/code/Magento/Braintree/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE.txt
rename to app/code/Magento/Braintree/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE_AFL.txt b/app/code/Magento/Braintree/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE_AFL.txt
rename to app/code/Magento/Braintree/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
new file mode 100644
index 0000000000000..5e3b870d65c67
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
+        <object key="groups" dataType="braintree_config_state">
+            <object key="braintree_section" dataType="braintree_config_state">
+                <object key="groups" dataType="braintree_config_state">
+                    <object key="braintree" dataType="braintree_config_state">
+                        <object key="groups" dataType="braintree_config_state">
+                            <object key="braintree_required" dataType="braintree_config_state">
+                                <object key="fields" dataType="braintree_config_state">
+                                    <object key="title" dataType="title">
+                                        <field key="value">string</field>
+                                    </object>
+                                    <object key="environment" dataType="environment">
+                                        <field key="value">string</field>
+                                    </object>
+                                    <object key="payment_action" dataType="payment_action">
+                                        <field key="value">string</field>
+                                    </object>
+                                    <object key="merchant_id" dataType="merchant_id">
+                                        <field key="value">string</field>
+                                    </object>
+                                    <object key="public_key" dataType="public_key">
+                                        <field key="value">string</field>
+                                    </object>
+                                    <object key="private_key" dataType="private_key">
+                                        <field key="value">string</field>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="CustomBraintreeConfigState" dataType="custom_braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
+        <object key="groups" dataType="custom_braintree_config_state">
+            <object key="braintree_section" dataType="custom_braintree_config_state">
+                <object key="groups" dataType="custom_braintree_config_state">
+                    <object key="braintree" dataType="custom_braintree_config_state">
+                        <object key="fields" dataType="custom_braintree_config_state">
+                            <object key="braintree_cc_vault_active" dataType="braintree_cc_vault_active">
+                                <field key="value">integer</field>
+                            </object>
+                            <object key="active" dataType="active">
+                                <field key="value">string</field>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Braintree/Test/Mftf/README.md b/app/code/Magento/Braintree/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6ee177a9cdcd2
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Braintree Functional Tests
+
+The Functional Test Module for **Magento Braintree** module.
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
new file mode 100644
index 0000000000000..1158f471d51f0
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCreateRoleSection">
+        <element name="create" type="button" selector="#add"/>
+        <element name="name" type="button" selector="#role_name"/>
+        <element name="password" type="input" selector="#current_password"/>
+        <element name="roleResources" type="button" selector="#role_info_tabs_account"/>
+        <element name="roleResource" type="button" selector="#gws_is_all"/>
+        <element name="resourceValue" type="button" selector="//*[text()='{{arg1}}']" parameterized="true"/>
+        <element name="roleScope" type="button" selector="#all"/>
+        <element name="scopeValue" type="button" selector="//select[@id='all']/*[text()='{{arg2}}']" parameterized="true"/>
+        <element name="website" type="checkbox" selector="//*[contains(text(), '{{arg3}}')]" parameterized="true"/>
+        <element name="save" type="button" selector="//button[@title='Save Role']"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
new file mode 100644
index 0000000000000..98d748b5a30ea
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCreateUserSection">
+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
+        <element name="create" type="input" selector="#add"/>
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
+        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
+        <element name="emailTextField" type="input" selector="#user_email"/>
+        <element name="passwordTextField" type="input" selector="#user_password"/>
+        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
+        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
+        <element name="saveButton" type="button" selector="#save"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
new file mode 100644
index 0000000000000..220c9a444b02f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminDeleteRoleSection">
+        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
+        <element name="current_pass" type="button" selector="#current_password"/>
+        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
new file mode 100644
index 0000000000000..bf2e2b44eb602
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminDeleteUserSection">
+        <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
+        <element name="password" selector="#user_current_password" type="input"/>
+        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
new file mode 100644
index 0000000000000..e37ce8f4738b3
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminEditRoleInfoSection">
+        <element name="roleName" type="input" selector="#role_name"/>
+        <element name="password" type="input" selector="#current_password"/>
+        <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
+        <element name="backButton" type="button" selector="button[title='Back']"/>
+        <element name="resetButton" type="button" selector="button[title='Reset']"/>
+        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
+        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
+        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
new file mode 100644
index 0000000000000..e999413c96d74
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminEditUserRoleSection">
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
new file mode 100644
index 0000000000000..2e5fcfb7b5c8d
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminEditUserSection">
+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
+        <element name="create" type="input" selector="#add"/>
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
+        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
+        <element name="emailTextField" type="input" selector="#user_email"/>
+        <element name="passwordTextField" type="input" selector="#user_password"/>
+        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
+        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+        <element name="saveButton" type="button" selector="#save"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
new file mode 100644
index 0000000000000..eb7a9ce2c376e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminMenuSection">
+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
+        <element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
+        <element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
+        <element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
+        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
+        <element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
new file mode 100644
index 0000000000000..63cbadc71d3d3
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminRoleGridSection">
+        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
+        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
new file mode 100644
index 0000000000000..9564bc61f799c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminUserGridSection">
+        <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="usernameInFirstRow" type="text" selector=".col-username"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+        <element name="successMessage" type="text" selector=".message-success"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
new file mode 100644
index 0000000000000..016af2e102744
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="BraintreeConfiguraionSection">
+        <element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
+        <element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
+        <element name="sandbox" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']/option[text()='Sandbox']"/>
+        <element name="paymentActionSelect" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_payment_action']"/>
+        <element name="paymentAction" type="button" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_payment_action']/option[text()='Authorize']"/>
+        <element name="merchantID" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_merchant_id']"/>
+        <element name="publicKey" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_public_key']"/>
+        <element name="privateKey" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_private_key']"/>
+        <element name="enableThisSolution" type="select" selector="//select[@id='payment_us_braintree_section_braintree_active']"/>
+        <element name="yesForEnable" type="button" selector="//select[@id='payment_us_braintree_section_braintree_active']/option[text()='Yes']"/>
+        <element name="payPalThroughBraintree" type="select" selector="//select[@id='payment_us_braintree_section_braintree_active_braintree_paypal']"/>
+        <element name="yesForPayPalThroughBraintree" type="input" selector="//select[@id='payment_us_braintree_section_braintree_active_braintree_paypal']/option[text()='Yes']"/>
+        <element name="advancedBraintreeSettings" type="button" selector="//a[@id='payment_us_braintree_section_braintree_braintree_advanced-head']"/>
+        <element name="merchantAccountID" type="text" selector="//input[@id='payment_us_braintree_section_braintree_braintree_advanced_merchant_account_id']"/>
+        <element name="CVVVerification" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_advanced_useccv']"/>
+        <element name="yesForCVV" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_advanced_useccv']/option[text()='Yes']"/>
+        <element name="payPalThroughBraintreeSelector" type="text" selector="//a[@id='payment_us_braintree_section_braintree_braintree_paypal-head']"/>
+        <element name="titleForPayPalThroughBraintree" type="text" selector="//input[@id='payment_us_braintree_section_braintree_braintree_paypal_title']"/>
+        <element name="paymentActionInPayPal" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_paypal_payment_action']"/>
+        <element name="actionAuthorize" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_paypal_payment_action']/option[text()='Authorize']"/>
+        <element name="save" type="button" selector="//span[text()='Save Config']"/>
+        <element name="successfulMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
+
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
new file mode 100644
index 0000000000000..d9f2b14a40e2f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <section name="BraintreeConfigurationPaymentSection">
+        <element name="creditCart" type="radio" selector="#braintree"/>
+        <element name="paymentMethodContainer" type="block" selector=".payment-method-braintree"/>
+        <element name="paymentMethod" type="radio" selector="//div[@class='payment-group']//input[contains(@id, 'braintree_cc_vault_')]"/>
+        <element name="cartFrame" type="iframe" selector="braintree-hosted-field-number"/>
+        <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>
+        <element name="yearFrame" type="iframe" selector="braintree-hosted-field-expirationYear"/>
+        <element name="codeFrame" type="iframe" selector="braintree-hosted-field-cvv"/>
+        <element name="cartCode" type="input" selector="#credit-card-number"/>
+        <element name="month" type="input" selector="#expiration-month"/>
+        <element name="year" type="input" selector="#expiration-year"/>
+        <element name="verificationNumber" type="input" selector="#cvv"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
new file mode 100644
index 0000000000000..32f02a69f817e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CatalogSubmenuSection">
+        <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
new file mode 100644
index 0000000000000..100407438eaae
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="ConfigurationListSection">
+        <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
+        <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
new file mode 100644
index 0000000000000..885a45be721f1
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="ConfigurationPaymentSection">
+        <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
new file mode 100644
index 0000000000000..e4a75b1b6a842
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CustomersPageSection">
+        <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
+        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
+        <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
+        <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
new file mode 100644
index 0000000000000..937afb83da96f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CustomersSubmenuSection">
+        <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
new file mode 100644
index 0000000000000..d302f9c7d0cba
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="NewCustomerPageSection">
+        <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
+        <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
+        <element name="firstName" type="input" selector="//input[@name='customer[firstname]']"/>
+        <element name="lastName" type="input" selector="//input[@name='customer[lastname]']"/>
+        <element name="email" type="input" selector="//input[@name='customer[email]']"/>
+        <element name="addresses" type="button" selector="//a[@id='tab_address']"/>
+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Addresses']"/>
+        <element name="defaultBillingAddress" type="button" selector="//label[text()='Default Billing Address']"/>
+        <element name="defaultShippingAddress" type="button" selector="//label[text()='Default Shipping Address']"/>
+        <element name="firstNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'firstname')]"/>
+        <element name="lastNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'lastname')]"/>
+        <element name="streetAddress" type="button" selector="//input[contains(@name, 'street')]"/>
+        <element name="city" type="input" selector="//input[contains(@name, 'city')]"/>
+        <element name="country" type="select" selector="//select[contains(@name, 'country_id')]"/>
+        <element name="countryArmenia" type="select" selector="//select[contains(@name, 'country_id')]//option[@data-title='Armenia']"/>
+        <element name="zip" type="input" selector="//input[contains(@name, 'postcode')]"/>
+        <element name="phoneNumber" type="input" selector="//input[contains(@name, 'telephone')]"/>
+        <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
+        <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
+
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
new file mode 100644
index 0000000000000..13f59ad2cf18e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="NewOrderSection">
+        <element name="createNewOrder" type="button" selector="#add"/>
+        <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
+        <element name="addProducts" type="button" selector="#add_products"/>
+        <element name="chooseProduct" type="button" selector="//td[contains(text(),'ProductTest')]"/>
+        <element name="addSelectedProduct" type="button" selector="//button[@title='Add Selected Product(s) to Order']"/>
+        <element name="openAddresses" type="button" selector="#order-billing_address_customer_address_id"/>
+        <element name="chooseAddress" type="button" selector="//select[@id='order-billing_address_customer_address_id']//option[contains(text(), 'Abgar')]"/>
+        <element name="state" type="button" selector="#order-billing_address_region"/>
+        <element name="openShippingMethods" type="button" selector="//a[@class='action-default']"/>
+        <element name="shippingMethod" type="button" selector="//label[@class='admin__field-label' and @for='s_method_flatrate_flatrate']"/>
+        <element name="creditCardBraintree" type="button" selector="#p_method_braintree"/>
+        <element name="openCardTypes" type="button" selector="#braintree_cc_type"/>
+        <element name="masterCard" type="button" selector="//option[contains(text(), 'MasterCard')]"/>
+        <element name="cardFrame" type="iframe" selector="braintree-hosted-field-number"/>
+        <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>
+        <element name="yearFrame" type="iframe" selector="braintree-hosted-field-expirationYear"/>
+        <element name="cvvFrame" type="iframe" selector="braintree-hosted-field-cvv"/>
+        <element name="creditCardNumber" type="input" selector="#credit-card-number"/>
+        <element name="expirationMonth" type="input" selector="#expiration-month"/>
+        <element name="expirationYear" type="input" selector="#expiration-year"/>
+        <element name="cvv" type="input" selector="#cvv"/>
+        <element name="submitOrder" type="input" selector="#submit_order_top_button"/>
+        <element name="successMessage" type="input" selector="#messages"/>
+
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
new file mode 100644
index 0000000000000..42e451940c91b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="NewProductPageSection">
+        <element name="productName" type="input" selector="//input[@name='product[name]']"/>
+        <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
+        <element name="price" type="input" selector="//input[@name='product[price]']"/>
+        <element name="quantity" type="input" selector="//input[@name='product[quantity_and_stock_status][qty]']"/>
+        <element name="saveButton" type="button" selector="//button[@id='save-button']"/>
+        <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
new file mode 100644
index 0000000000000..267efdf3d0e5e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="ProductsPageSection">
+        <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
+        <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
+        <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
+        <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
+
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
new file mode 100644
index 0000000000000..f094baa9f3446
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StoresSubmenuSection">
+        <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
new file mode 100644
index 0000000000000..3a07cbc6dd145
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+    <section name="LoginFormSection">
+        <element name="username" type="input" selector="#username"/>
+        <element name="password" type="input" selector="#login"/>
+        <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
+    </section>
+
+    <section name="SignOutSection">
+        <element name="admin" type="button" selector=".admin__action-dropdown-text"/>
+        <element name="logout" type="button" selector="//*[contains(text(), 'Sign Out')]"/>
+    </section>
+
+</sections>
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
new file mode 100644
index 0000000000000..f27477ce8a672
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="BraintreeCreditCardOnCheckoutTest">
+        <annotations>
+            <features value="Braintree"/>
+            <stories value="MAGETWO-91624 - Braintree saved cards use billing address the same as shipping"/>
+            <title value="Use saved for Braintree credit card on checkout with selecting billing address"/>
+            <description value="Use saved for Braintree credit card on checkout with selecting billing address"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93767"/>
+            <group value="braintree"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <createData entity="BraintreeConfig" stepKey="BraintreeConfigurationData"/>
+            <createData entity="CustomBraintreeConfigurationData" stepKey="CustomBraintreeConfigurationData"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="product" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <createData entity="DefaultBraintreeConfig" stepKey="DefaultBraintreeConfig"/>
+            <createData entity="RollBackCustomBraintreeConfigurationData" stepKey="RollBackCustomBraintreeConfigurationData"/>
+            <actionGroup ref="StorefrontSignOutActionGroup" stepKey="StorefrontSignOutActionGroup"/>
+        </after>
+        <!--Go to storefront-->
+        <amOnPage url="" stepKey="DoToStorefront"/>
+        <!--Create account-->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUserFromStorefrontActionGroup">
+            <argument name="Customer" value="Simple_US_Customer"/>
+        </actionGroup>
+
+        <!--Add product to cart-->
+        <amOnPage url="$$product.sku$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!--Proceed to checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
+
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="LoggedInCheckoutFillNewBillingAddressActionGroup">
+            <argument name="Address" value="US_Address_CA"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <!--Fill cart data-->
+        <click selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="SelectBraintreePaymentMethod"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <scrollTo selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="ScrollToCreditCardSection"/>
+        <actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <!--Place order-->
+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}}{{CheckoutPaymentSection.placeOrder}}"
+               stepKey="PlaceOrder"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+
+        <!--Add product to cart again-->
+        <amOnPage url="$$product.sku$$.html" stepKey="goToProductPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <!--Proceed to checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup1"/>
+        <click selector="{{CheckoutPaymentSection.addressAction('New Address')}}" stepKey="clickOnNewAddress"/>
+        <waitForPageLoad stepKey="waitForPageLoad8"/>
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="LoggedInCheckoutFillNewBillingAddressActionGroup1">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+        <click selector="{{CheckoutPaymentSection.addressAction('Save Address')}}" stepKey="SaveAddress"/>
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
+        <waitForPageLoad stepKey="waitForPageLoad10"/>
+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
+        <waitForPageLoad stepKey="waitForPageLoad11"/>
+        <click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="UncheckCheckBox"/>
+
+        <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickToUpdate"/>
+        <waitForPageLoad stepKey="waitForPageLoad12"/>
+        <!--Place order-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder1"/>
+        <waitForPageLoad stepKey="waitForPageLoad13"/>
+
+        <click selector="{{CheckoutOrderSummarySection.orderNumber}}" stepKey="ClickOnOrderNumber"/>
+        <waitForPageLoad stepKey="waitForPageLoad14"/>
+        <!--Check billing and shipping addresses also additional Address info-->
+        <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
+        <grabTextFrom selector="{{CheckoutOrderSummarySection.shippingAddress}}" stepKey="shippingAddr"/>
+        <grabTextFrom selector="{{CheckoutOrderSummarySection.billingAddress}}" stepKey="billingAddr"/>
+        <grabTextFrom selector="{{CheckoutOrderSummarySection.additionalAddress}}" stepKey="additionalAddress"/>
+        <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
+        <see userInput="Billing Address" stepKey="seeBillingAddress"/>
+        <assertEquals stepKey="assertValuesAreEqual" actual="$billingAddr" expected="$shippingAddr"/>
+        <assertNotEquals stepKey="assertValuesAreNotEqual" actual="$billingAddr" expected="$additionalAddress"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
new file mode 100644
index 0000000000000..2ddefa40b536c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Creation an admin order using Braintree payment"/>
+            <title value="Create order using Braintree payment"/>
+            <description value="Admin should be able to create order using Braintree payment"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-93677"/>
+            <group value="braintree"/>
+        </annotations>
+
+
+        <before>
+            <!--Login As Admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--CreateNewProduct-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!--Create New Customer-->
+            <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
+        </before>
+
+
+        <!--Configure Braintree-->
+        <actionGroup ref="ConfigureBraintree" stepKey="configureBraintree"/>
+
+        <!--Create New Role-->
+        <actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
+        <actionGroup ref="AdminCreateRole" stepKey="AdminCreateNewRole"/>
+
+        <!--Create New User With Specific Role-->
+        <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
+        <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
+
+        <!--SignOut-->
+        <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
+
+        <!--SignIn New User-->
+        <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
+        <waitForPageLoad stepKey="waitForLogin" time="3"/>
+
+        <!--Create New Order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrder">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProduct">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+
+        <waitForPageLoad stepKey="waitForShippingToFinish"/>
+
+        <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
+
+        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
+        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
+
+        <after>
+            <!-- Disable BrainTree -->
+            <actionGroup ref="DisableBrainTree" stepKey="disableBrainTree"/>
+
+            <!--SignOut-->
+            <actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Delete Product-->
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+
+            <!--Delete Customer-->
+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
+
+            <!--Delete User -->
+            <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
+
+            <!--Delete Role-->
+            <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
+            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="AdminDeleteRoleActionGroup"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
new file mode 100644
index 0000000000000..cf51f29db79f9
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscount">
+        <annotations>
+            <features value="Braintree"/>
+            <stories value="Get access to a New Credit Memo Page from Invoice for Order payed with online payment via Admin"/>
+            <title value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
+            <description value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94472"/>
+            <group value="braintree"/>
+        </annotations>
+
+        <before>
+            <!--Create Default Category-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!--Create Simple product-->
+            <createData entity="_defaultProduct" stepKey="simpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!--Create Tax Rule is based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+
+            <!--Configure Braintree Payment method-->
+            <createData entity="BraintreeConfig" stepKey="BraintreeConfigurationData"/>
+            <createData entity="CustomBraintreeConfigurationData" stepKey="enableBraintree"/>
+
+            <!--Create Retailer Customer with US_CA address-->
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer">
+                <field key="group_id">3</field>
+            </createData>
+
+            <!--Login as Admin User-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!--Delete Cart Price Rule-->
+            <actionGroup ref="AdminDeleteCartPriceRuleForRetailerActionGroup" stepKey="deleteSalesRule"/>
+
+            <!--Set to default configuration Tax Shipping Class-->
+            <actionGroup ref="setDefaultShippingTaxClass" stepKey="setdefaultClass"/>
+
+            <!--Delete Simple Sub Category-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!--Delete Simple Product-->
+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Delete Tax Rule -->
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+
+            <!-- Rollback Braintree to Default -->
+            <createData entity="RollBackCustomBraintreeConfigurationData" stepKey="rollbackBraintreeConfig"/>
+
+            <!--Delete Customer-->
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create a cart price rule with 10% discount for whole cart -->
+        <click selector="{{AdminMenuSection.marketing}}" stepKey="clickOnMarketing" />
+        <waitForPageLoad stepKey="waitForMarketing"/>
+        <click selector="{{CartPriceRulesSubmenuSection.cartPriceRules}}" stepKey="clickOnCartPriceRules"/>
+        <waitForPageLoad stepKey="waitForCartPriceRules"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectRetailerCustomerGroup" stepKey="selectRetailerCustomerGroup"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCartRuleLoad"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!--Set Taxable Goods for Shipping Tax Class-->
+        <actionGroup ref="changeShippingTaxClass" stepKey="changeShippingTaxClass"/>
+
+        <!--Adding Special price to product-->
+        <amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="openAdminProductEditPage"/>
+        <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPrice"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+        <!--Create New Order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+
+        <!--Add a product to order-->
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
+            <argument name="product" value="$$simpleProduct$$"/>
+        </actionGroup>
+
+        <!--Select FlatRate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+
+        <!--Select Braintree online Payment method -->
+        <actionGroup ref="AdminOrderBraintreeFillActionGroup" stepKey="selectCreditCardPayment"/>
+
+        <!--Submit Order-->
+        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
+        <waitForPageLoad stepKey="waitForSubmitOrder"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeOrderSuccessMessage" after="waitForSubmitOrder"/>
+
+        <!-- Create New invoice-->
+        <actionGroup ref="adminFastCreateInvoice" stepKey="createInvoice"/>
+
+        <!--Get access to Credit Memo page from Invoice page-->
+        <click selector="{{AdminInvoiceMainActionsSection.openNewCreditMemoFromInvoice}}" stepKey="clickCreateNewCreditMemo"/>
+        <waitForPageLoad stepKey="waitForLoadNewCreditMemoPage"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeNewCreditMemo"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php b/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
index 5b28e6d8aedcd..fa5512ca2db9f 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 0000000000000..95ea2a07d4368
--- /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 e78e54f011d44..4af63a9c87151 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/Controller/Paypal/PlaceOrderTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
index 5a10b4abb3fbc..9c25846e56da0 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
 use Magento\Braintree\Controller\Paypal\PlaceOrder;
@@ -15,6 +17,8 @@
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Quote\Model\Quote;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class PlaceOrderTest
@@ -26,34 +30,34 @@
 class PlaceOrderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var OrderPlace|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderPlace|MockObject
      */
-    private $orderPlaceMock;
+    private $orderPlace;
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
-    private $configMock;
+    private $config;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $checkoutSessionMock;
+    private $checkoutSession;
 
     /**
-     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|MockObject
      */
-    private $requestMock;
+    private $request;
 
     /**
-     * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultFactory|MockObject
      */
-    private $resultFactoryMock;
+    private $resultFactory;
 
     /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
-    protected $messageManagerMock;
+    private $messageManager;
 
     /**
      * @var PlaceOrder
@@ -61,139 +65,143 @@ class PlaceOrderTest extends \PHPUnit\Framework\TestCase
     private $placeOrder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
-    private $loggerMock;
+    private $logger;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
-        $contextMock = $this->getMockBuilder(Context::class)
+        /** @var Context|MockObject $context */
+        $context = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+        $this->request = $this->getMockBuilder(RequestInterface::class)
             ->setMethods(['getPostValue'])
             ->getMockForAbstractClass();
-        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+        $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->checkoutSessionMock = $this->getMockBuilder(Session::class)
+        $this->checkoutSession = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->configMock = $this->getMockBuilder(Config::class)
+        $this->config = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->orderPlaceMock = $this->getMockBuilder(OrderPlace::class)
+        $this->orderPlace = $this->getMockBuilder(OrderPlace::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
 
-        $contextMock->expects(self::once())
-            ->method('getRequest')
-            ->willReturn($this->requestMock);
-        $contextMock->expects(self::once())
-            ->method('getResultFactory')
-            ->willReturn($this->resultFactoryMock);
-        $contextMock->expects(self::once())
-            ->method('getMessageManager')
-            ->willReturn($this->messageManagerMock);
-
-        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+        $context->method('getRequest')
+            ->willReturn($this->request);
+        $context->method('getResultFactory')
+            ->willReturn($this->resultFactory);
+        $context->method('getMessageManager')
+            ->willReturn($this->messageManager);
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->placeOrder = new PlaceOrder(
-            $contextMock,
-            $this->configMock,
-            $this->checkoutSessionMock,
-            $this->orderPlaceMock,
-            $this->loggerMock
+            $context,
+            $this->config,
+            $this->checkoutSession,
+            $this->orderPlace,
+            $this->logger
         );
     }
 
+    /**
+     * Checks if an order is placed successfully.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
     public function testExecute()
     {
         $agreement = ['test-data'];
 
         $quoteMock = $this->getQuoteMock();
-        $quoteMock->expects(self::once())
-            ->method('getItemsCount')
+        $quoteMock->method('getItemsCount')
             ->willReturn(1);
 
         $resultMock = $this->getResultMock();
-        $resultMock->expects(self::once())
-            ->method('setPath')
+        $resultMock->method('setPath')
             ->with('checkout/onepage/success')
             ->willReturnSelf();
 
-        $this->resultFactoryMock->expects(self::once())
-            ->method('create')
+        $this->resultFactory->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($resultMock);
 
-        $this->requestMock->expects(self::once())
-            ->method('getPostValue')
+        $this->request->method('getPostValue')
             ->with('agreement', [])
             ->willReturn($agreement);
 
-        $this->checkoutSessionMock->expects(self::once())
-            ->method('getQuote')
+        $this->checkoutSession->method('getQuote')
             ->willReturn($quoteMock);
 
-        $this->orderPlaceMock->expects(self::once())
-            ->method('execute')
+        $this->orderPlace->method('execute')
             ->with($quoteMock, [0]);
 
-        $this->messageManagerMock->expects(self::never())
+        $this->messageManager->expects(self::never())
             ->method('addExceptionMessage');
 
         self::assertEquals($this->placeOrder->execute(), $resultMock);
     }
 
+    /**
+     * Checks a negative scenario during place order action.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
     public function testExecuteException()
     {
         $agreement = ['test-data'];
 
         $quote = $this->getQuoteMock();
-        $quote->expects(self::once())
-            ->method('getItemsCount')
+        $quote->method('getItemsCount')
             ->willReturn(0);
+        $quote->method('getReservedOrderId')
+            ->willReturn('000000111');
 
         $resultMock = $this->getResultMock();
-        $resultMock->expects(self::once())
-            ->method('setPath')
+        $resultMock->method('setPath')
             ->with('checkout/cart')
             ->willReturnSelf();
 
-        $this->resultFactoryMock->expects(self::once())
-            ->method('create')
+        $this->resultFactory->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($resultMock);
 
-        $this->requestMock->expects(self::once())
-            ->method('getPostValue')
+        $this->request->method('getPostValue')
             ->with('agreement', [])
             ->willReturn($agreement);
 
-        $this->checkoutSessionMock->expects(self::once())
-            ->method('getQuote')
+        $this->checkoutSession->method('getQuote')
             ->willReturn($quote);
 
-        $this->orderPlaceMock->expects(self::never())
+        $this->orderPlace->expects(self::never())
             ->method('execute');
 
-        $this->messageManagerMock->expects(self::once())
-            ->method('addExceptionMessage')
+        $this->messageManager->method('addExceptionMessage')
             ->with(
                 self::isInstanceOf('\InvalidArgumentException'),
-                'We can\'t initialize checkout.'
+                'The order #000000111 cannot be processed.'
             );
 
         self::assertEquals($this->placeOrder->execute(), $resultMock);
     }
 
     /**
-     * @return ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     * Gets mock object for a result.
+     *
+     * @return ResultInterface|MockObject
      */
     private function getResultMock()
     {
@@ -203,7 +211,9 @@ private function getResultMock()
     }
 
     /**
-     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+     * Gets mock object for a quote.
+     *
+     * @return Quote|MockObject
      */
     private function getQuoteMock()
     {
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
index cb911a8396b36..609b7f21dbf87 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
 use Magento\Quote\Model\Quote;
@@ -188,7 +189,7 @@ public function testExecuteException()
             ->method('addExceptionMessage')
             ->with(
                 self::isInstanceOf('\InvalidArgumentException'),
-                'We can\'t initialize checkout.'
+                'Checkout failed to initialize. Verify and try again.'
             );
 
         $this->resultFactoryMock->expects(self::once())
@@ -235,7 +236,7 @@ public function testExecuteExceptionPaymentWithoutNonce()
             ->method('addExceptionMessage')
             ->with(
                 self::isInstanceOf(\Magento\Framework\Exception\LocalizedException::class),
-                'We can\'t initialize checkout.'
+                'Checkout failed to initialize. Verify and try again.'
             );
 
         $this->resultFactoryMock->expects(self::once())
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
index 5be5df0e33c49..32ed698189fa7 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
 use Magento\Quote\Model\Quote;
@@ -225,7 +226,10 @@ public function testExecuteAjaxException()
 
         $this->messageManagerMock->expects(self::once())
             ->method('addExceptionMessage')
-            ->with(self::isInstanceOf('\InvalidArgumentException'), 'We can\'t initialize checkout.');
+            ->with(
+                self::isInstanceOf('\InvalidArgumentException'),
+                'Checkout failed to initialize. Verify and try again.'
+            );
 
         $this->urlMock->expects(self::once())
             ->method('getUrl')
@@ -265,7 +269,10 @@ public function testExecuteException()
 
         $this->messageManagerMock->expects(self::once())
             ->method('addExceptionMessage')
-            ->with(self::isInstanceOf('\InvalidArgumentException'), 'We can\'t initialize checkout.');
+            ->with(
+                self::isInstanceOf('\InvalidArgumentException'),
+                'Checkout failed to initialize. Verify and try again.'
+            );
 
         $this->urlMock->expects(self::once())
             ->method('getUrl')
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 56ea1f97fa165..845a02930d709 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 333f29eb29136..23167af02a97b 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php
@@ -6,15 +6,16 @@
 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
@@ -29,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)
-            ->setMethods(['isValid', 'getFailsDescription'])
+        $this->validationResultMock = $this->getMockBuilder(ResultInterface::class)
+            ->setMethods(['isValid', 'getFailsDescription', 'getErrorCodes'])
             ->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
         );
     }
 
@@ -117,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([]);
@@ -136,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]);
@@ -161,20 +169,20 @@ 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 available payment tokens');
-        $this->tokenManagement->expects(static::once())
+        $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]);
@@ -191,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]);
@@ -244,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);
 
@@ -265,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)
@@ -289,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 793700ab1971f..031e53690451f 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;
@@ -39,7 +39,7 @@ public function testHandleNotOrderPayment()
         static::assertFalse($voidHandler->handle($subject));
     }
 
-    public function testHandleSomeAmoutWasPaid()
+    public function testHandleSomeAmountWasPaid()
     {
         $paymentDO = $this->createMock(PaymentDataObjectInterface::class);
         $subject = [
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
index 7b9d59a5bc482..36ea3aea465dd 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
@@ -142,7 +142,7 @@ public function testGetCcTypesMapper($value, $expected)
 
         static::assertEquals(
             $expected,
-            $this->model->getCctypesMapper()
+            $this->model->getCcTypesMapper()
         );
     }
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Helper/SubjectReaderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Helper/SubjectReaderTest.php
deleted file mode 100644
index b2207563b8b0f..0000000000000
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Helper/SubjectReaderTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Braintree\Test\Unit\Gateway\Helper;
-
-use Braintree\Transaction;
-use InvalidArgumentException;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
-
-/**
- * Class SubjectReaderTest
- */
-class SubjectReaderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var SubjectReader
-     */
-    private $subjectReader;
-
-    protected function setUp()
-    {
-        $this->subjectReader = new SubjectReader();
-    }
-
-    /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readCustomerId
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage The "customerId" field does not exists
-     */
-    public function testReadCustomerIdWithException()
-    {
-        $this->subjectReader->readCustomerId([]);
-    }
-
-    /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readCustomerId
-     */
-    public function testReadCustomerId()
-    {
-        $customerId = 1;
-        static::assertEquals($customerId, $this->subjectReader->readCustomerId(['customer_id' => $customerId]));
-    }
-
-    /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPublicHash
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage The "public_hash" field does not exists
-     */
-    public function testReadPublicHashWithException()
-    {
-        $this->subjectReader->readPublicHash([]);
-    }
-
-    /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPublicHash
-     */
-    public function testReadPublicHash()
-    {
-        $hash = 'fj23djf2o1fd';
-        static::assertEquals($hash, $this->subjectReader->readPublicHash(['public_hash' => $hash]));
-    }
-
-    /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPayPal
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Transaction has't paypal attribute
-     */
-    public function testReadPayPalWithException()
-    {
-        $transaction = Transaction::factory([
-            'id' => 'u38rf8kg6vn'
-        ]);
-        $this->subjectReader->readPayPal($transaction);
-    }
-
-    /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPayPal
-     */
-    public function testReadPayPal()
-    {
-        $paypal = [
-            'paymentId' => '3ek7dk7fn0vi1',
-            'payerEmail' => 'payer@example.com'
-        ];
-        $transaction = Transaction::factory([
-            'id' => '4yr95vb',
-            'paypal' => $paypal
-        ]);
-
-        static::assertEquals($paypal, $this->subjectReader->readPayPal($transaction));
-    }
-}
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 0000000000000..c871dc69a5370
--- /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 0837ecaea7a13..1317deeddb7fe 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 86113c34ba218..2e77824817942 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 0000000000000..17f63d0659b93
--- /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 3f05aed45da60..e1bbf29c63645 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 9799b6f18c639..84558be0dab0f 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 0f25b26fd2fa3..b19715cf92010 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 761d88b636ed7..1a87e5254bc50 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 ee0907a1ddbbb..6a4aeacba4faf 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 fba65354d6095..c618ab66b95bc 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 8e83254727bf7..5595d5172b194 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 12c613b8f216b..5620e8ffa92b8 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -5,23 +5,21 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 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;
+use Magento\Braintree\Gateway\Config\Config;
 
 /**
- * Class PaymentDataBuilderTest
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Tests \Magento\Braintree\Gateway\Request\PaymentDataBuilder.
  */
 class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     const PAYMENT_METHOD_NONCE = 'nonce';
-    const MERCHANT_ACCOUNT_ID = '245345';
 
     /**
      * @var PaymentDataBuilder
@@ -29,36 +27,31 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_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;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $this->configMock = $this->getMockBuilder(Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
         $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -67,13 +60,19 @@ protected function setUp()
             ->getMock();
         $this->orderMock = $this->createMock(OrderAdapterInterface::class);
 
-        $this->builder = new PaymentDataBuilder($this->configMock, $this->subjectReaderMock);
+        /** @var Config $config */
+        $config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->builder = new PaymentDataBuilder($config, $this->subjectReaderMock);
     }
 
     /**
+     * @return void
      * @expectedException \InvalidArgumentException
      */
-    public function testBuildReadPaymentException()
+    public function testBuildReadPaymentException(): void
     {
         $buildSubject = [];
 
@@ -86,19 +85,20 @@ public function testBuildReadPaymentException()
     }
 
     /**
+     * @return void
      * @expectedException \InvalidArgumentException
      */
-    public function testBuildReadAmountException()
+    public function testBuildReadAmountException(): void
     {
         $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)
@@ -107,57 +107,55 @@ public function testBuildReadAmountException()
         $this->builder->build($buildSubject);
     }
 
-    public function testBuild()
+    /**
+     * @return void
+     */
+    public function testBuild(): void
     {
         $additionalData = [
             [
                 DataAssignObserver::PAYMENT_METHOD_NONCE,
-                self::PAYMENT_METHOD_NONCE
-            ]
+                self::PAYMENT_METHOD_NONCE,
+            ],
         ];
 
         $expectedResult = [
             PaymentDataBuilder::AMOUNT  => 10.00,
             PaymentDataBuilder::PAYMENT_METHOD_NONCE  => self::PAYMENT_METHOD_NONCE,
-            PaymentDataBuilder::ORDER_ID => '000000101',
-            PaymentDataBuilder::MERCHANT_ACCOUNT_ID  => self::MERCHANT_ACCOUNT_ID,
+            PaymentDataBuilder::ORDER_ID => '000000101'
         ];
 
         $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())
-            ->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 5aa383d095a1e..dffe293c5a32f 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 c28ac0c3ac372..f12d1365d0b34 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 df11938ddba70..d4e1f2745e3f3 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
@@ -3,15 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 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,28 +26,30 @@ class VaultCaptureDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
     private $paymentDO;
 
     /**
-     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
     private $payment;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
     private $subjectReader;
 
-    public function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
         $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
         $this->payment = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentDO->expects(static::once())
-            ->method('getPayment')
+        $this->paymentDO->method('getPayment')
             ->willReturn($this->payment);
 
         $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
@@ -52,52 +60,84 @@ public function setUp()
     }
 
     /**
-     * \Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder::build
+     * Checks the result after builder execution.
      */
-    public function testBuild()
+    public function testBuild(): void
     {
         $amount = 30.00;
         $token = '5tfm4c';
         $buildSubject = [
             'payment' => $this->paymentDO,
-            'amount' => $amount
+            'amount' => $amount,
         ];
 
         $expected = [
             'amount' => $amount,
-            'paymentMethodToken' => $token
+            'paymentMethodToken' => $token,
         ];
 
-        $this->subjectReader->expects(self::once())
-            ->method('readPayment')
+        $this->subjectReader->method('readPayment')
             ->with($buildSubject)
             ->willReturn($this->paymentDO);
-        $this->subjectReader->expects(self::once())
-            ->method('readAmount')
+        $this->subjectReader->method('readAmount')
             ->with($buildSubject)
             ->willReturn($amount);
 
+        /** @var OrderPaymentExtension|MockObject $paymentExtension */
         $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
             ->setMethods(['getVaultPaymentToken'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        /** @var PaymentToken|MockObject $paymentToken */
         $paymentToken = $this->getMockBuilder(PaymentToken::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $paymentExtension->expects(static::once())
-            ->method('getVaultPaymentToken')
+        $paymentExtension->method('getVaultPaymentToken')
             ->willReturn($paymentToken);
-        $this->payment->expects(static::once())
-            ->method('getExtensionAttributes')
+        $this->payment->method('getExtensionAttributes')
             ->willReturn($paymentExtension);
 
-        $paymentToken->expects(static::once())
-            ->method('getGatewayToken')
+        $paymentToken->method('getGatewayToken')
             ->willReturn($token);
 
         $result = $this->builder->build($buildSubject);
-        static::assertEquals($expected, $result);
+        self::assertEquals($expected, $result);
+    }
+
+    /**
+     * Checks a builder execution if Payment Token doesn't exist.
+     *
+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
+     * @expectedExceptionMessage The Payment Token is not available to perform the request.
+     */
+    public function testBuildWithoutPaymentToken(): void
+    {
+        $amount = 30.00;
+        $buildSubject = [
+            'payment' => $this->paymentDO,
+            'amount' => $amount,
+        ];
+
+        $this->subjectReader->method('readPayment')
+            ->with($buildSubject)
+            ->willReturn($this->paymentDO);
+        $this->subjectReader->method('readAmount')
+            ->with($buildSubject)
+            ->willReturn($amount);
+
+        /** @var OrderPaymentExtension|MockObject $paymentExtension */
+        $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
+            ->setMethods(['getVaultPaymentToken'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->payment->method('getExtensionAttributes')
+            ->willReturn($paymentExtension);
+        $paymentExtension->method('getVaultPaymentToken')
+            ->willReturn(null);
+
+        $this->builder->build($buildSubject);
     }
 }
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 0000000000000..88713885b5c7d
--- /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/CancelDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CancelDetailsHandlerTest.php
new file mode 100644
index 0000000000000..2fa3d2ea65836
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CancelDetailsHandlerTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Gateway\Response;
+
+use Magento\Braintree\Gateway\Response\CancelDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Sales\Model\Order\Payment;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests \Magento\Braintree\Gateway\Response\CancelDetailsHandler.
+ */
+class CancelDetailsHandlerTest extends TestCase
+{
+    /**
+     * @var CancelDetailsHandler
+     */
+    private $handler;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->handler = new CancelDetailsHandler(new SubjectReader());
+    }
+
+    /**
+     * Checks a case when cancel handler closes the current and parent transactions.
+     *
+     * @return void
+     */
+    public function testHandle(): void
+    {
+        /** @var OrderAdapterInterface|MockObject $order */
+        $order = $this->getMockForAbstractClass(OrderAdapterInterface::class);
+        /** @var Payment|MockObject $payment */
+        $payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setOrder'])
+            ->getMock();
+
+        $paymentDO = new PaymentDataObject($order, $payment);
+        $response = [
+            'payment' => $paymentDO,
+        ];
+
+        $this->handler->handle($response, []);
+
+        self::assertTrue($payment->getIsTransactionClosed(), 'The current transaction should be closed.');
+        self::assertTrue($payment->getShouldCloseParentTransaction(), 'The parent transaction should be closed.');
+    }
+}
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 87e8e4e413c1b..a70993e14e50c 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 fdf3dc941bd77..b3a7f8b9ee76a 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
@@ -5,9 +5,10 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response\PayPal;
 
+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;
@@ -15,54 +16,54 @@
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Model\Order\Payment;
+use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
-use Magento\Vault\Model\AccountPaymentTokenFactory;
 use Magento\Vault\Model\PaymentToken;
+use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class VaultDetailsHandlerTest
+ * Tests \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class VaultDetailsHandlerTest extends \PHPUnit\Framework\TestCase
+class VaultDetailsHandlerTest extends TestCase
 {
     private static $transactionId = '1n2suy';
 
-    /**
-     * @var SubjectReader|MockObject
-     */
-    private $subjectReader;
+    private static $token = 'rc39al';
+
+    private static $payerEmail = 'john.doe@example.com';
 
     /**
      * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDataObject;
+    private $paymentDataObjectMock;
 
     /**
      * @var Payment|MockObject
      */
-    private $paymentInfo;
+    private $paymentInfoMock;
 
     /**
-     * @var AccountPaymentTokenFactory|MockObject
+     * @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 \PHPUnit\Framework\TestCase
     /**
      * @var DateTimeFactory|MockObject
      */
-    private $dateTimeFactory;
+    private $dateTimeFactoryMock;
 
     /**
      * @var array
@@ -83,146 +84,119 @@ 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'])
+            ->setMethods(['__wakeup', 'getExtensionAttributes'])
             ->getMock();
 
-        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+        $this->paymentTokenMock = $objectManager->getObject(PaymentToken::class);
 
-        $this->paymentTokenFactory = $this->getMockBuilder(AccountPaymentTokenFactory::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->paymentInfoMock->expects(self::any())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->paymentExtensionMock);
+
         $this->subject = [
-            'payment' => $this->paymentDataObject,
+            'payment' => $this->paymentDataObjectMock,
         ];
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['readPayment', 'readTransaction'])
-            ->getMock();
-        $this->subjectReader->expects(static::once())
-            ->method('readPayment')
-            ->with($this->subject)
-            ->willReturn($this->paymentDataObject);
 
-        $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->subjectReader,
-            $this->dateTimeFactory
+            $this->paymentTokenFactoryMock,
+            $this->paymentExtensionFactoryMock,
+            new SubjectReader(),
+            $this->dateTimeFactoryMock
         );
     }
 
-    /**
-     * @covers \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler::handle
-     */
     public function testHandle()
     {
-        /** @var Transaction $transaction */
         $transaction = $this->getTransaction();
         $response = [
             'object' => $transaction
         ];
 
-        $this->paymentExtension->expects(static::once())
-            ->method('setVaultPaymentToken')
-            ->with($this->paymentToken);
-        $this->paymentExtension->expects(static::once())
-            ->method('getVaultPaymentToken')
-            ->willReturn($this->paymentToken);
-
-        $this->subjectReader->expects(static::once())
-            ->method('readTransaction')
-            ->with($response)
-            ->willReturn($transaction);
+        $this->paymentExtensionMock->method('setVaultPaymentToken')
+            ->with($this->paymentTokenMock);
+        $this->paymentExtensionMock->method('getVaultPaymentToken')
+            ->willReturn($this->paymentTokenMock);
         
-        $this->paymentDataObject->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($this->paymentInfo);
+        $this->paymentDataObjectMock->method('getPayment')
+            ->willReturn($this->paymentInfoMock);
 
-        $this->paymentTokenFactory->expects(static::once())
-            ->method('create')
-            ->willReturn($this->paymentToken);
+        $this->paymentTokenFactoryMock->method('create')
+            ->with(PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT)
+            ->willReturn($this->paymentTokenMock);
 
-        $this->paymentExtensionFactory->expects(static::once())
-            ->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->expects(static::once())
-            ->method('create')
+        $this->dateTimeFactoryMock->method('create')
             ->willReturn($dateTime);
         
         $this->handler->handle($this->subject, $response);
 
-        $extensionAttributes = $this->paymentInfo->getExtensionAttributes();
-        /** @var PaymentTokenInterface $paymentToken */
+        $extensionAttributes = $this->paymentInfoMock->getExtensionAttributes();
         $paymentToken = $extensionAttributes->getVaultPaymentToken();
-        static::assertNotNull($paymentToken);
+        self::assertNotNull($paymentToken);
 
         $tokenDetails = json_decode($paymentToken->getTokenDetails(), true);
 
-        static::assertSame($this->paymentToken, $paymentToken);
-        static::assertEquals($transaction->paypalDetails->token, $paymentToken->getGatewayToken());
-        static::assertEquals($transaction->paypalDetails->payerEmail, $tokenDetails['payerEmail']);
-        static::assertEquals($expirationDate, $paymentToken->getExpiresAt());
+        self::assertSame($this->paymentTokenMock, $paymentToken);
+        self::assertEquals(self::$token, $paymentToken->getGatewayToken());
+        self::assertEquals(self::$payerEmail, $tokenDetails['payerEmail']);
+        self::assertEquals($expirationDate, $paymentToken->getExpiresAt());
     }
 
-    /**
-     * @covers \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler::handle
-     */
     public function testHandleWithoutToken()
     {
         $transaction = $this->getTransaction();
-        $transaction->paypalDetails->token = null;
+        $transaction->transaction->paypalDetails->token = null;
 
         $response = [
             'object' => $transaction
         ];
 
-        $this->subjectReader->expects(static::once())
-            ->method('readTransaction')
-            ->with($response)
-            ->willReturn($transaction);
-
-        $this->paymentDataObject->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($this->paymentInfo);
+        $this->paymentDataObjectMock->method('getPayment')
+            ->willReturn($this->paymentInfoMock);
 
-        $this->paymentTokenFactory->expects(static::never())
+        $this->paymentTokenFactoryMock->expects(self::never())
             ->method('create');
 
-        $this->dateTimeFactory->expects(static::never())
+        $this->dateTimeFactoryMock->expects(self::never())
             ->method('create');
 
         $this->handler->handle($this->subject, $response);
-        static::assertNull($this->paymentInfo->getExtensionAttributes());
+        self::assertNotNull($this->paymentInfoMock->getExtensionAttributes());
     }
 
     /**
-     * Create Braintree transaction
-     * @return Transaction
+     * Creates Braintree transaction.
+     *
+     * @return Successful
      */
-    private function getTransaction()
+    private function getTransaction(): Successful
     {
         $attributes = [
             'id' => self::$transactionId,
@@ -230,19 +204,21 @@ private function getTransaction()
         ];
 
         $transaction = Transaction::factory($attributes);
+        $result = new Successful(['transaction' => $transaction]);
 
-        return $transaction;
+        return $result;
     }
 
     /**
-     * Get PayPal transaction details
+     * Gets PayPal transaction details.
+     *
      * @return PayPalDetails
      */
-    private function getPayPalDetails()
+    private function getPayPalDetails(): PayPalDetails
     {
         $attributes = [
-            'token' => 'rc39al',
-            'payerEmail' => 'john.doe@example.com'
+            'token' => self::$token,
+            'payerEmail' => self::$payerEmail
         ];
 
         $details = new PayPalDetails($attributes);
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 f1420ee895e5b..1b2c8c6bb4ad1 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 d90caa84b447b..69beab38f001b 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 2365c396c2f4a..b86952ebf07a5 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 9ca9ca6aa07ae..e97eefc8a3444 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 3a2d2f7073573..6cbca707242f1 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 fb8f507bf1214..c8ec52560be29 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
@@ -5,19 +5,23 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
+use Braintree\Result\Successful;
 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\DataObject;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Sales\Api\Data\OrderPaymentExtension;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Model\CreditCardTokenFactory;
+use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
+use Magento\Vault\Model\PaymentToken;
+use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -25,193 +29,143 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class VaultDetailsHandlerTest extends \PHPUnit\Framework\TestCase
+class VaultDetailsHandlerTest extends TestCase
 {
-    const TRANSACTION_ID = '432erwwe';
+    private static $transactionId = '432erwwe';
+
+    private static $token = 'rh3gd4';
 
     /**
-     * @var \Magento\Braintree\Gateway\Response\PaymentDetailsHandler
+     * @var PaymentDetailsHandler
      */
     private $paymentHandler;
 
     /**
-     * @var \Magento\Sales\Model\Order\Payment|MockObject
+     * @var Payment|MockObject
      */
     private $payment;
 
     /**
-     * @var CreditCardTokenFactory|MockObject
+     * @var PaymentTokenFactoryInterface|MockObject
      */
     private $paymentTokenFactory;
 
     /**
-     * @var PaymentTokenInterface|MockObject
-     */
-    protected $paymentToken;
-
-    /**
-     * @var \Magento\Sales\Api\Data\OrderPaymentExtension|MockObject
+     * @var OrderPaymentExtension|MockObject
      */
     private $paymentExtension;
 
     /**
-     * @var \Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory|MockObject
+     * @var OrderPaymentExtensionInterfaceFactory|MockObject
      */
     private $paymentExtensionFactory;
 
-    /**
-     * @var SubjectReader|MockObject
-     */
-    private $subjectReader;
-
-    /**
-     * @var Config|MockObject
-     */
-    private $config;
-
     protected function setUp()
     {
-        $this->paymentToken = $this->createMock(PaymentTokenInterface::class);
-        $this->paymentTokenFactory = $this->getMockBuilder(CreditCardTokenFactory::class)
+        $objectManager = new ObjectManager($this);
+        $paymentToken = $objectManager->getObject(PaymentToken::class);
+        $this->paymentTokenFactory = $this->getMockBuilder(PaymentTokenFactoryInterface::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentTokenFactory->expects(self::once())
-            ->method('create')
-            ->willReturn($this->paymentToken);
+        $this->paymentTokenFactory->method('create')
+            ->with(PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD)
+            ->willReturn($paymentToken);
 
-        $this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
-            ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->paymentExtensionFactory = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->paymentExtensionFactory->expects(self::once())
-            ->method('create')
-            ->willReturn($this->paymentExtension);
+        $this->initPaymentExtensionAttributesMock();
+        $this->paymentExtension->method('setVaultPaymentToken')
+            ->with($paymentToken);
+        $this->paymentExtension->method('getVaultPaymentToken')
+            ->willReturn($paymentToken);
 
         $this->payment = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
-            ->setMethods(['__wakeup'])
-            ->getMock();
-
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $mapperArray = [
-            "american-express" => "AE",
-            "discover" => "DI",
-            "jcb" => "JCB",
-            "mastercard" => "MC",
-            "master-card" => "MC",
-            "visa" => "VI",
-            "maestro" => "MI",
-            "diners-club" => "DN",
-            "unionpay" => "CUP"
-        ];
-
-        $this->config = $this->getMockBuilder(Config::class)
-            ->setMethods(['getCctypesMapper'])
-            ->disableOriginalConstructor()
+            ->setMethods(['__wakeup', 'getExtensionAttributes'])
             ->getMock();
 
-        $this->config->expects(self::once())
-            ->method('getCctypesMapper')
-            ->willReturn($mapperArray);
+        $this->payment->expects(self::any())->method('getExtensionAttributes')->willReturn($this->paymentExtension);
 
-        $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+        $config = $this->getConfigMock();
 
         $this->paymentHandler = new VaultDetailsHandler(
             $this->paymentTokenFactory,
             $this->paymentExtensionFactory,
-            $this->config,
-            $this->subjectReader,
-            $this->serializer
+            $config,
+            new SubjectReader(),
+            new Json()
         );
     }
 
-    /**
-     * @covers \Magento\Braintree\Gateway\Response\VaultDetailsHandler::handle
-     */
     public function testHandle()
     {
-        $this->paymentExtension->expects(self::once())
-            ->method('setVaultPaymentToken')
-            ->with($this->paymentToken);
-        $this->paymentExtension->expects(self::once())
-            ->method('getVaultPaymentToken')
-            ->willReturn($this->paymentToken);
-
         $paymentData = $this->getPaymentDataObjectMock();
-        $transaction = $this->getBraintreeTransaction();
 
         $subject = ['payment' => $paymentData];
-        $response = ['object' => $transaction];
-
-        $this->subjectReader->expects(self::once())
-            ->method('readPayment')
-            ->with($subject)
-            ->willReturn($paymentData);
-        $this->subjectReader->expects(self::once())
-            ->method('readTransaction')
-            ->with($response)
-            ->willReturn($transaction);
-        $this->paymentToken->expects(static::once())
-            ->method('setGatewayToken')
-            ->with('rh3gd4');
-        $this->paymentToken->expects(static::once())
-            ->method('setExpiresAt')
-            ->with('2022-01-01 00:00:00');
+        $response = ['object' => $this->getBraintreeTransaction()];
 
         $this->paymentHandler->handle($subject, $response);
-        $this->assertSame($this->paymentToken, $this->payment->getExtensionAttributes()->getVaultPaymentToken());
+        $paymentToken = $this->payment->getExtensionAttributes()
+            ->getVaultPaymentToken();
+
+        self::assertEquals(self::$token, $paymentToken->getGatewayToken());
+        self::assertEquals('2022-01-01 00:00:00', $paymentToken->getExpiresAt());
+
+        $details = json_decode($paymentToken->getTokenDetails(), true);
+        self::assertEquals(
+            [
+                'type' => 'AE',
+                'maskedCC' => 1231,
+                'expirationDate' => '12/2021'
+            ],
+            $details
+        );
     }
 
     /**
-     * Create mock for payment data object and order payment
-     * @return MockObject
+     * Creates mock for payment data object and order payment.
+     *
+     * @return PaymentDataObject|MockObject
      */
-    private function getPaymentDataObjectMock()
+    private function getPaymentDataObjectMock(): PaymentDataObject
     {
         $mock = $this->getMockBuilder(PaymentDataObject::class)
             ->setMethods(['getPayment'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $mock->expects($this->once())
-            ->method('getPayment')
+        $mock->method('getPayment')
             ->willReturn($this->payment);
 
         return $mock;
     }
 
     /**
-     * Create Braintree transaction
-     * @return MockObject
+     * Creates Braintree transaction.
+     *
+     * @return Successful
      */
     private function getBraintreeTransaction()
     {
         $attributes = [
-            'id' => self::TRANSACTION_ID,
+            'id' => self::$transactionId,
             'creditCardDetails' => $this->getCreditCardDetails()
         ];
 
         $transaction = Transaction::factory($attributes);
+        $result = new Successful(['transaction' => $transaction]);
 
-        return $transaction;
+        return $result;
     }
 
     /**
-     * Create Braintree transaction
-     * @return \Braintree\Transaction\CreditCardDetails
+     * Creates Braintree transaction.
+     *
+     * @return CreditCardDetails
      */
-    private function getCreditCardDetails()
+    private function getCreditCardDetails(): CreditCardDetails
     {
         $attributes = [
-            'token' => 'rh3gd4',
+            'token' => self::$token,
             'bin' => '5421',
             'cardType' => 'American Express',
             'expirationMonth' => 12,
@@ -223,4 +177,54 @@ private function getCreditCardDetails()
 
         return $creditCardDetails;
     }
+
+    /**
+     * Creates mock of config class.
+     *
+     * @return Config|MockObject
+     */
+    private function getConfigMock(): Config
+    {
+        $mapperArray = [
+            'american-express' => 'AE',
+            'discover' => 'DI',
+            'jcb' => 'JCB',
+            'mastercard' => 'MC',
+            'master-card' => 'MC',
+            'visa' => 'VI',
+            'maestro' => 'MI',
+            'diners-club' => 'DN',
+            'unionpay' => 'CUP'
+        ];
+
+        $config = $this->getMockBuilder(Config::class)
+            ->setMethods(['getCctypesMapper'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $config->method('getCctypesMapper')
+            ->willReturn($mapperArray);
+
+        return $config;
+    }
+
+    /**
+     * Initializes payment extension attributes mocks.
+     *
+     * @return void
+     */
+    private function initPaymentExtensionAttributesMock()
+    {
+        $this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
+            ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->paymentExtensionFactory = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->paymentExtensionFactory->method('create')
+            ->willReturn($this->paymentExtension);
+    }
 }
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 398349a9692b7..a541b0115fe63 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/SubjectReaderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php
new file mode 100644
index 0000000000000..fd524a10ba531
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Gateway\SubjectReader;
+
+/**
+ * Class SubjectReaderTest
+ */
+class SubjectReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->subjectReader = new SubjectReader();
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readCustomerId
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The "customerId" field does not exists
+     * @return void
+     */
+    public function testReadCustomerIdWithException(): void
+    {
+        $this->subjectReader->readCustomerId([]);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readCustomerId
+     * @return void
+     */
+    public function testReadCustomerId(): void
+    {
+        $customerId = 1;
+        $this->assertEquals($customerId, $this->subjectReader->readCustomerId(['customer_id' => $customerId]));
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPublicHash
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The "public_hash" field does not exists
+     * @return void
+     */
+    public function testReadPublicHashWithException(): void
+    {
+        $this->subjectReader->readPublicHash([]);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPublicHash
+     * @return void
+     */
+    public function testReadPublicHash(): void
+    {
+        $hash = 'fj23djf2o1fd';
+        $this->assertEquals($hash, $this->subjectReader->readPublicHash(['public_hash' => $hash]));
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPayPal
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Transaction has't paypal attribute
+     * @return void
+     */
+    public function testReadPayPalWithException(): void
+    {
+        $transaction = Transaction::factory([
+            'id' => 'u38rf8kg6vn',
+        ]);
+        $this->subjectReader->readPayPal($transaction);
+    }
+
+    /**
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPayPal
+     * @return void
+     */
+    public function testReadPayPal(): void
+    {
+        $paypal = [
+            'paymentId' => '3ek7dk7fn0vi1',
+            'payerEmail' => 'payer@example.com',
+        ];
+        $transaction = Transaction::factory([
+            'id' => '4yr95vb',
+            'paypal' => $paypal,
+        ]);
+
+        $this->assertEquals($paypal, $this->subjectReader->readPayPal($transaction));
+    }
+
+    /**
+     * Checks a case when subject reader retrieves successful Braintree transaction.
+     *
+     * @return void
+     */
+    public function testReadTransaction(): void
+    {
+        $transaction = Transaction::factory(['id' => 1]);
+        $response = [
+            'object' => new Successful($transaction, 'transaction'),
+        ];
+        $actual = $this->subjectReader->readTransaction($response);
+
+        $this->assertSame($transaction, $actual);
+    }
+
+    /**
+     * Checks a case when subject reader retrieves invalid data instead transaction details.
+     *
+     * @param array $response
+     * @param string $expectedMessage
+     * @dataProvider invalidTransactionResponseDataProvider
+     * @expectedException \InvalidArgumentException
+     * @return void
+     */
+    public function testReadTransactionWithInvalidResponse(array $response, string $expectedMessage): void
+    {
+        $this->expectExceptionMessage($expectedMessage);
+        $this->subjectReader->readTransaction($response);
+    }
+
+    /**
+     * Gets list of variations with invalid subject data.
+     *
+     * @return array
+     */
+    public function invalidTransactionResponseDataProvider(): array
+    {
+        $transaction = new \stdClass();
+        $response = new \stdClass();
+        $response->transaction = $transaction;
+
+        return [
+            [
+                'response' => [
+                    'object' => [],
+                ],
+                'expectedMessage' => 'Response object does not exist.',
+            ],
+            [
+                'response' => [
+                    'object' => new \stdClass(),
+                ],
+                'expectedMessage' => 'The object is not a class \Braintree\Transaction.',
+            ],
+            [
+                'response' => [
+                    'object' => $response,
+                ],
+                'expectedMessage' => 'The object is not a class \Braintree\Transaction.',
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php
new file mode 100644
index 0000000000000..65386272fe511
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Gateway\Validator;
+
+use Braintree\Result\Error;
+use Magento\Braintree\Gateway\Validator\CancelResponseValidator;
+use PHPUnit\Framework\TestCase;
+use Magento\Braintree\Gateway\Validator\GeneralResponseValidator;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests \Magento\Braintree\Gateway\Validator\CancelResponseValidator class.
+ */
+class CancelResponseValidatorTest extends TestCase
+{
+    /**
+     * @var CancelResponseValidator
+     */
+    private $validator;
+
+    /**
+     * @var GeneralResponseValidator|MockObject
+     */
+    private $generalValidator;
+
+    /**
+     * @var ResultInterfaceFactory|MockObject
+     */
+    private $resultFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->generalValidator = $this->getMockBuilder(GeneralResponseValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultFactory = $this->getMockBuilder(ResultInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->validator = new CancelResponseValidator(
+            $this->resultFactory,
+            $this->generalValidator,
+            new SubjectReader()
+        );
+    }
+
+    /**
+     * Checks a case when response is successful and additional validation doesn't needed.
+     *
+     * @return void
+     */
+    public function testValidateSuccessfulTransaction(): void
+    {
+        /** @var ResultInterface|MockObject $result */
+        $result = $this->getMockForAbstractClass(ResultInterface::class);
+        $result->method('isValid')->willReturn(true);
+        $this->generalValidator->method('validate')->willReturn($result);
+        $actual = $this->validator->validate([]);
+
+        $this->assertSame($result, $actual);
+    }
+
+    /**
+     * Checks a case when response contains error related to expired authorization transaction and
+     * validator should return positive result.
+     *
+     * @return void
+     */
+    public function testValidateExpiredTransaction(): void
+    {
+        /** @var ResultInterface|MockObject $result */
+        $result = $this->getMockForAbstractClass(ResultInterface::class);
+        $result->method('isValid')->willReturn(false);
+        $this->generalValidator->method('validate')->willReturn($result);
+
+        $expected = $this->getMockForAbstractClass(ResultInterface::class);
+        $expected->method('isValid')->willReturn(true);
+        $this->resultFactory->method('create')
+            ->with(
+                [
+                    'isValid' => true,
+                    'failsDescription' => ['Transaction is cancelled offline.'],
+                    'errorCodes' => []
+                ]
+            )->willReturn($expected);
+
+        $errors = [
+            'errors' => [
+                [
+                    'code' => 91504,
+                    'message' => 'Transaction can only be voided if status is authorized.',
+                ],
+            ],
+        ];
+        $buildSubject = [
+            'response' => [
+                'object' => new Error(['errors' => $errors]),
+            ],
+        ];
+
+        $actual = $this->validator->validate($buildSubject);
+
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
+     * Checks a case when response contains multiple errors and validator should return negative result.
+     *
+     * @param array $responseErrors
+     * @return void
+     * @dataProvider getErrorsDataProvider
+     */
+    public function testValidateWithMultipleErrors(array $responseErrors): void
+    {
+        /** @var ResultInterface|MockObject $result */
+        $result = $this->getMockForAbstractClass(ResultInterface::class);
+        $result->method('isValid')->willReturn(false);
+
+        $this->generalValidator->method('validate')->willReturn($result);
+
+        $this->resultFactory->expects($this->never())->method('create');
+
+        $errors = [
+            'errors' => $responseErrors,
+        ];
+        $buildSubject = [
+            'response' => [
+                'object' => new Error(['errors' => $errors]),
+            ]
+        ];
+
+        $actual = $this->validator->validate($buildSubject);
+
+        $this->assertSame($result, $actual);
+    }
+
+    /**
+     * Gets list of errors variations.
+     *
+     * @return array
+     */
+    public function getErrorsDataProvider(): array
+    {
+        return [
+            [
+                'errors' => [
+                    [
+                        'code' => 91734,
+                        'message' => 'Credit card type is not accepted by this merchant account.',
+                    ],
+                    [
+                        'code' => 91504,
+                        'message' => 'Transaction can only be voided if status is authorized.',
+                    ],
+                ],
+            ],
+            [
+                'errors' => [
+                    [
+                        'code' => 91734,
+                        'message' => 'Credit card type is not accepted by this merchant account.',
+                    ],
+                ],
+            ],
+        ];
+    }
+}
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 1a9e547e90636..4741a3ea38c6f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Validator;
 
-use Braintree\Transaction;
+use Braintree\Result\Error;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Gateway\Validator\ErrorCodeProvider;
+use Magento\Braintree\Gateway\Validator\GeneralResponseValidator;
 use Magento\Framework\Phrase;
-use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\Result;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-use Magento\Braintree\Gateway\Validator\GeneralResponseValidator;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
 {
@@ -20,14 +22,9 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
     private $responseValidator;
 
     /**
-     * @var ResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultInterfaceFactory|MockObject
      */
-    private $resultInterfaceFactoryMock;
-
-    /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $subjectReaderMock;
+    private $resultInterfaceFactory;
 
     /**
      * Set up
@@ -36,85 +33,105 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->resultInterfaceFactoryMock = $this->getMockBuilder(
-            \Magento\Payment\Gateway\Validator\ResultInterfaceFactory::class
-        )->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+        $this->resultInterfaceFactory = $this->getMockBuilder(ResultInterfaceFactory::class)
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
 
         $this->responseValidator = new GeneralResponseValidator(
-            $this->resultInterfaceFactoryMock,
-            $this->subjectReaderMock
+            $this->resultInterfaceFactory,
+            new SubjectReader(),
+            new ErrorCodeProvider()
         );
     }
 
     /**
-     * Run test for validate method
+     * Checks a case when the validator processes successful and failed transactions.
      *
      * @param array $validationSubject
      * @param bool $isValid
      * @param Phrase[] $messages
+     * @param array $errorCodes
      * @return void
      *
      * @dataProvider dataProviderTestValidate
      */
-    public function testValidate(array $validationSubject, $isValid, $messages)
+    public function testValidate(array $validationSubject, bool $isValid, $messages, array $errorCodes)
     {
-        /** @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject $resultMock */
-        $resultMock = $this->createMock(ResultInterface::class);
-
-        $this->subjectReaderMock->expects(self::once())
-            ->method('readResponseObject')
-            ->with($validationSubject)
-            ->willReturn($validationSubject['response']['object']);
+        $result = new Result($isValid, $messages);
 
-        $this->resultInterfaceFactoryMock->expects(self::once())
-            ->method('create')
+        $this->resultInterfaceFactory->method('create')
             ->with([
                 'isValid' => $isValid,
-                'failsDescription' => $messages
+                'failsDescription' => $messages,
+                'errorCodes' => $errorCodes
             ])
-            ->willReturn($resultMock);
+            ->willReturn($result);
 
-        $actualMock = $this->responseValidator->validate($validationSubject);
+        $actual = $this->responseValidator->validate($validationSubject);
 
-        self::assertEquals($resultMock, $actualMock);
+        self::assertEquals($result, $actual);
     }
 
     /**
+     * Gets variations for different type of response.
+     *
      * @return array
      */
     public function dataProviderTestValidate()
     {
-        $successTrue = new \stdClass();
-        $successTrue->success = true;
+        $successTransaction = new \stdClass();
+        $successTransaction->success = true;
 
-        $successFalse = new \stdClass();
-        $successFalse->success = false;
+        $failureTransaction = new \stdClass();
+        $failureTransaction->success = false;
+        $failureTransaction->message = 'Transaction was failed.';
+
+        $errors = [
+            'errors' => [
+                [
+                    'code' => 81804,
+                    'attribute' => 'base',
+                    'message' => 'Cannot process transaction.'
+                ]
+            ]
+        ];
+        $errorTransaction = new Error(['errors' => $errors]);
 
         return [
             [
                 'validationSubject' => [
                     'response' => [
-                        'object' => $successTrue
+                        'object' => $successTransaction
                     ],
                 ],
                 'isValid' => true,
-                []
+                [],
+                'errorCodes' => []
             ],
             [
                 'validationSubject' => [
                     'response' => [
-                        'object' => $successFalse
+                        'object' => $failureTransaction
+                    ]
+                ],
+                'isValid' => false,
+                [
+                    __('Transaction was failed.')
+                ],
+                'errorCodes' => []
+            ],
+            [
+                'validationSubject' => [
+                    'response' => [
+                        'object' => $errorTransaction
                     ]
                 ],
                 'isValid' => false,
                 [
                     __('Braintree error response.')
-                ]
+                ],
+                'errorCodes' => ['81804']
             ]
         ];
     }
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 294226b1656ec..530945c974ceb 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php
@@ -5,15 +5,13 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Validator;
 
-use Braintree\Transaction;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Gateway\Validator\ErrorCodeProvider;
 use Magento\Braintree\Gateway\Validator\PaymentNonceResponseValidator;
-use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\Result;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-/**
- * Class PaymentNonceResponseValidatorTest
- */
 class PaymentNonceResponseValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -22,35 +20,24 @@ class PaymentNonceResponseValidatorTest extends \PHPUnit\Framework\TestCase
     private $validator;
 
     /**
-     * @var ResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultInterfaceFactory|MockObject
      */
     private $resultInterfaceFactory;
 
-    /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $subjectReader;
-
     protected function setUp()
     {
         $this->resultInterfaceFactory = $this->getMockBuilder(ResultInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['readResponseObject'])
-            ->getMock();
 
         $this->validator = new PaymentNonceResponseValidator(
             $this->resultInterfaceFactory,
-            $this->subjectReader
+            new SubjectReader(),
+            new ErrorCodeProvider()
         );
     }
 
-    /**
-     * @covers \Magento\Braintree\Gateway\Validator\PaymentNonceResponseValidator::validate
-     */
     public function testFailedValidate()
     {
         $obj = new \stdClass();
@@ -61,23 +48,12 @@ public function testFailedValidate()
             ]
         ];
 
-        $this->subjectReader->expects(static::once())
-            ->method('readResponseObject')
-            ->willReturn($obj);
-
-        $result = $this->createMock(ResultInterface::class);
-        $this->resultInterfaceFactory->expects(self::once())
-            ->method('create')
-            ->with([
-                'isValid' => false,
-                'failsDescription' => [
-                    __('Payment method nonce can\'t be retrieved.')
-                ]
-            ])
+        $result = new Result(false, [__('Payment method nonce can\'t be retrieved.')]);
+        $this->resultInterfaceFactory->method('create')
             ->willReturn($result);
 
         $actual = $this->validator->validate($subject);
-        static::assertEquals($result, $actual);
+        self::assertEquals($result, $actual);
     }
 
     public function testValidateSuccess()
@@ -93,20 +69,11 @@ public function testValidateSuccess()
             ]
         ];
 
-        $this->subjectReader->expects(static::once())
-            ->method('readResponseObject')
-            ->willReturn($obj);
-
-        $result = $this->createMock(ResultInterface::class);
-        $this->resultInterfaceFactory->expects(self::once())
-            ->method('create')
-            ->with([
-                'isValid' => true,
-                'failsDescription' => []
-            ])
+        $result = new Result(true);
+        $this->resultInterfaceFactory->method('create')
             ->willReturn($result);
 
         $actual = $this->validator->validate($subject);
-        static::assertEquals($result, $actual);
+        self::assertEquals($result, $actual);
     }
 }
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 aeb9b4a83077c..360e1ff0525b6 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
@@ -5,15 +5,16 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Validator;
 
+use Braintree\Result\Successful;
 use Braintree\Transaction;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Gateway\Validator\ErrorCodeProvider;
+use Magento\Braintree\Gateway\Validator\ResponseValidator;
 use Magento\Framework\Phrase;
+use Magento\Payment\Gateway\Validator\Result;
 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 PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Braintree\Result\Error;
-use Braintree\Result\Successful;
 
 /**
  * Class ResponseValidatorTest
@@ -30,11 +31,6 @@ class ResponseValidatorTest extends \PHPUnit\Framework\TestCase
      */
     private $resultInterfaceFactory;
 
-    /**
-     * @var SubjectReader|MockObject
-     */
-    private $subjectReader;
-
     /**
      * Set up
      *
@@ -46,13 +42,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->responseValidator = new ResponseValidator(
             $this->resultInterfaceFactory,
-            $this->subjectReader
+            new SubjectReader(),
+            new ErrorCodeProvider()
         );
     }
 
@@ -65,11 +59,6 @@ public function testValidateReadResponseException()
             'response' => null
         ];
 
-        $this->subjectReader->expects(self::once())
-            ->method('readResponseObject')
-            ->with($validationSubject)
-            ->willThrowException(new \InvalidArgumentException());
-
         $this->responseValidator->validate($validationSubject);
     }
 
@@ -82,11 +71,6 @@ public function testValidateReadResponseObjectException()
             'response' => ['object' => null]
         ];
 
-        $this->subjectReader->expects(self::once())
-            ->method('readResponseObject')
-            ->with($validationSubject)
-            ->willThrowException(new \InvalidArgumentException());
-
         $this->responseValidator->validate($validationSubject);
     }
 
@@ -103,19 +87,9 @@ public function testValidateReadResponseObjectException()
     public function testValidate(array $validationSubject, $isValid, $messages)
     {
         /** @var ResultInterface|MockObject $result */
-        $result = $this->createMock(ResultInterface::class);
-
-        $this->subjectReader->expects(self::once())
-            ->method('readResponseObject')
-            ->with($validationSubject)
-            ->willReturn($validationSubject['response']['object']);
-
-        $this->resultInterfaceFactory->expects(self::once())
-            ->method('create')
-            ->with([
-                'isValid' => $isValid,
-                'failsDescription' => $messages
-            ])
+        $result = new Result($isValid, $messages);
+
+        $this->resultInterfaceFactory->method('create')
             ->willReturn($result);
 
         $actual = $this->responseValidator->validate($validationSubject);
@@ -141,8 +115,6 @@ public function dataProviderTestValidate()
         $transactionDeclined->transaction = new \stdClass();
         $transactionDeclined->transaction->status = Transaction::SETTLEMENT_DECLINED;
 
-        $errorResult = new Error(['errors' => []]);
-
         return [
             [
                 'validationSubject' => [
@@ -175,18 +147,6 @@ public function dataProviderTestValidate()
                 [
                     __('Wrong transaction status')
                 ]
-            ],
-            [
-                'validationSubject' => [
-                    'response' => [
-                        'object' => $errorResult,
-                    ]
-                ],
-                'isValid' => false,
-                [
-                    __('Braintree error response.'),
-                    __('Wrong transaction status')
-                ]
             ]
         ];
     }
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php b/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php
index 9b80a2237a8fb..c82634d36db31 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php
@@ -84,11 +84,11 @@ public function testGetCodeWithException()
     public function getCodeDataProvider()
     {
         return [
-            ['avsZip' => null, 'avsStreet' => null, 'expected' => 'U'],
-            ['avsZip' => null, 'avsStreet' => 'M', 'expected' => 'U'],
-            ['avsZip' => 'M', 'avsStreet' => null, 'expected' => 'U'],
-            ['avsZip' => 'M', 'avsStreet' => 'Unknown', 'expected' => 'U'],
-            ['avsZip' => 'I', 'avsStreet' => 'A', 'expected' => 'U'],
+            ['avsZip' => null, 'avsStreet' => null, 'expected' => ''],
+            ['avsZip' => null, 'avsStreet' => 'M', 'expected' => ''],
+            ['avsZip' => 'M', 'avsStreet' => null, 'expected' => ''],
+            ['avsZip' => 'M', 'avsStreet' => 'Unknown', 'expected' => ''],
+            ['avsZip' => 'I', 'avsStreet' => 'A', 'expected' => ''],
             ['avsZip' => 'M', 'avsStreet' => 'M', 'expected' => 'Y'],
             ['avsZip' => 'N', 'avsStreet' => 'M', 'expected' => 'A'],
             ['avsZip' => 'M', 'avsStreet' => 'N', 'expected' => 'Z'],
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php
new file mode 100644
index 0000000000000..2248aab1aad2e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Model\InstantPurchase\CreditCard;
+
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker;
+
+/**
+ * @covers \Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker
+ */
+class AvailabilityCheckerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var AvailabilityChecker
+     */
+    private $availabilityChecker;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->createMock(Config::class);
+        $this->availabilityChecker = new AvailabilityChecker($this->configMock);
+    }
+
+    /**
+     * Test isAvailable method
+     *
+     * @dataProvider isAvailableDataProvider
+     *
+     * @param bool $isVerify3DSecure
+     * @param bool $expected
+     *
+     * @return void
+     */
+    public function testIsAvailable(bool $isVerify3DSecure, bool $expected)
+    {
+        $this->configMock->expects($this->once())->method('isVerify3DSecure')->willReturn($isVerify3DSecure);
+        $actual = $this->availabilityChecker->isAvailable();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Data provider for isAvailable method test
+     *
+     * @return array
+     */
+    public function isAvailableDataProvider()
+    {
+        return [
+            [true, false],
+            [false, true],
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php
new file mode 100644
index 0000000000000..a5c7cd743d85f
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Model\InstantPurchase\CreditCard;
+
+use Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter as CreditCardTokenFormatter;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
+class TokenFormatterTest extends TestCase
+{
+    /**
+     * @var PaymentTokenInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentTokenMock;
+
+    /**
+     * @var CreditCardTokenFormatter
+     */
+    private $creditCardTokenFormatter;
+
+    /**
+     * @var array
+     */
+    private $tokenDetails = [
+        'type' => 'visa',
+        'maskedCC' => '1111************9999',
+        'expirationDate' => '01-01-2020'
+    ];
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->paymentTokenMock = $this->getMockBuilder(PaymentTokenInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->creditCardTokenFormatter = new CreditCardTokenFormatter();
+    }
+
+    /**
+     * Testing the payment format with a known credit card type
+     *
+     * @return void
+     */
+    public function testFormatPaymentTokenWithKnownCardType()
+    {
+        $this->tokenDetails['type'] = key(CreditCardTokenFormatter::$baseCardTypes);
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+
+        $formattedString = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            reset(CreditCardTokenFormatter::$baseCardTypes),
+            __('ending'),
+            $this->tokenDetails['maskedCC'],
+            __('expires'),
+            $this->tokenDetails['expirationDate']
+        );
+
+        self::assertEquals(
+            $formattedString,
+            $this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock)
+        );
+    }
+
+    /**
+     * Testing the payment format with a unknown credit card type
+     *
+     * @return void
+     */
+    public function testFormatPaymentTokenWithUnknownCardType()
+    {
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+
+        $formattedString = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            $this->tokenDetails['type'],
+            __('ending'),
+            $this->tokenDetails['maskedCC'],
+            __('expires'),
+            $this->tokenDetails['expirationDate']
+        );
+
+        self::assertEquals(
+            $formattedString,
+            $this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock)
+        );
+    }
+
+    /**
+     * Testing the payment format with wrong card data
+     *
+     * @return void
+     */
+    public function testFormatPaymentTokenWithWrongData()
+    {
+        unset($this->tokenDetails['type']);
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+        self::expectException('\InvalidArgumentException');
+
+        $this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock);
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php
new file mode 100644
index 0000000000000..e4cd8fd58043b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Model\InstantPurchase\PayPal;
+
+use Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter as PaypalTokenFormatter;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+class TokenFormatterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PaymentTokenInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentTokenMock;
+
+    /**
+     * @var PaypalTokenFormatter
+     */
+    private $paypalTokenFormatter;
+
+    /**
+     * @var array
+     */
+    private $tokenDetails = [
+        'type' => 'visa',
+        'maskedCC' => '4444************9999',
+        'expirationDate' => '07-07-2025'
+    ];
+
+    /**
+     * Test setup
+     */
+    protected function setUp()
+    {
+        $this->paymentTokenMock = $this->getMockBuilder(PaymentTokenInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->paypalTokenFormatter = new PaypalTokenFormatter();
+    }
+
+    /**
+     * testFormatPaymentTokenWithKnownCardType
+     */
+    public function testFormatPaymentTokenWithKnownCardType()
+    {
+        $this->tokenDetails['type'] = key(PaypalTokenFormatter::$baseCardTypes);
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+
+        $formattedString = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            reset(PaypalTokenFormatter::$baseCardTypes),
+            __('ending'),
+            $this->tokenDetails['maskedCC'],
+            __('expires'),
+            $this->tokenDetails['expirationDate']
+        );
+
+        self::assertEquals($formattedString, $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock));
+    }
+
+    /**
+     * testFormatPaymentTokenWithUnknownCardType
+     */
+    public function testFormatPaymentTokenWithUnknownCardType()
+    {
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+
+        $formattedString = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            $this->tokenDetails['type'],
+            __('ending'),
+            $this->tokenDetails['maskedCC'],
+            __('expires'),
+            $this->tokenDetails['expirationDate']
+        );
+
+        self::assertEquals($formattedString, $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock));
+    }
+
+    /**
+     * testFormatPaymentTokenWithWrongData
+     */
+    public function testFormatPaymentTokenWithWrongData()
+    {
+        unset($this->tokenDetails['type']);
+
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+        self::expectException('\InvalidArgumentException');
+
+        $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock);
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php
new file mode 100644
index 0000000000000..2631fcbe5f5b5
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Model\InstantPurchase;
+
+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider;
+use Magento\Payment\Gateway\Command\Result\ArrayResult;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/**
+ * @covers \Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider
+ */
+class PaymentAdditionalInformationProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var PaymentAdditionalInformationProvider
+     */
+    private $paymentAdditionalInformationProvider;
+
+    /**
+     * @var GetPaymentNonceCommand|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $getPaymentNonceCommandMock;
+
+    /**
+     * @var PaymentTokenInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentTokenMock;
+
+    /**
+     * @var ArrayResult|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $arrayResultMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->getPaymentNonceCommandMock = $this->createMock(GetPaymentNonceCommand::class);
+        $this->paymentTokenMock = $this->createMock(PaymentTokenInterface::class);
+        $this->arrayResultMock = $this->createMock(ArrayResult::class);
+        $this->paymentAdditionalInformationProvider = new PaymentAdditionalInformationProvider(
+            $this->getPaymentNonceCommandMock
+        );
+    }
+
+    /**
+     * Test getAdditionalInformation method
+     *
+     * @return void
+     */
+    public function testGetAdditionalInformation()
+    {
+        $customerId = 15;
+        $publicHash = '3n4b7sn48g';
+        $paymentMethodNonce = 'test';
+
+        $this->paymentTokenMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->paymentTokenMock->expects($this->once())->method('getPublicHash')->willReturn($publicHash);
+        $this->getPaymentNonceCommandMock->expects($this->once())->method('execute')->with([
+            PaymentTokenInterface::CUSTOMER_ID => $customerId,
+            PaymentTokenInterface::PUBLIC_HASH => $publicHash,
+        ])->willReturn($this->arrayResultMock);
+        $this->arrayResultMock->expects($this->once())->method('get')
+            ->willReturn(['paymentMethodNonce' => $paymentMethodNonce]);
+
+        $expected = [
+            'payment_method_nonce' => $paymentMethodNonce,
+        ];
+        $actual = $this->paymentAdditionalInformationProvider->getAdditionalInformation($this->paymentTokenMock);
+        self::assertEquals($expected, $actual);
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php b/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
new file mode 100644
index 0000000000000..b6ef534c55c29
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Model;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\LocaleResolver;
+use Magento\Framework\Locale\ResolverInterface;
+
+/**
+ * @covers \Magento\Braintree\Model\LocaleResolver
+ */
+class LocaleResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var LocaleResolver
+     */
+    private $localeResolver;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resolverMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->createMock(Config::class);
+        $this->resolverMock = $this->createMock(ResolverInterface::class);
+        $this->localeResolver = new LocaleResolver($this->resolverMock, $this->configMock);
+    }
+
+    /**
+     * Test getDefaultLocalePath method
+     *
+     * @return void
+     */
+    public function testGetDefaultLocalePath()
+    {
+        $expected = 'general/locale/code';
+        $this->resolverMock->expects($this->once())->method('getDefaultLocalePath')->willReturn($expected);
+        $actual = $this->localeResolver->getDefaultLocalePath();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setDefaultLocale method
+     *
+     * @return void
+     */
+    public function testSetDefaultLocale()
+    {
+        $defaultLocale = 'en_US';
+        $this->resolverMock->expects($this->once())->method('setDefaultLocale')->with($defaultLocale);
+        $this->localeResolver->setDefaultLocale($defaultLocale);
+    }
+
+    /**
+     * Test getDefaultLocale method
+     *
+     * @return void
+     */
+    public function testGetDefaultLocale()
+    {
+        $expected = 'fr_FR';
+        $this->resolverMock->expects($this->once())->method('getDefaultLocale')->willReturn($expected);
+        $actual = $this->localeResolver->getDefaultLocale();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setLocale method
+     *
+     * @return void
+     */
+    public function testSetLocale()
+    {
+        $locale = 'en_GB';
+        $this->resolverMock->expects($this->once())->method('setLocale')->with($locale);
+        $this->localeResolver->setLocale($locale);
+    }
+
+    /**
+     * Test getLocale method
+     *
+     * @return void
+     */
+    public function testGetLocale()
+    {
+        $locale = 'en_TEST';
+        $allowedLocales = 'en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL';
+        $this->resolverMock->expects($this->once())->method('getLocale')->willReturn($locale);
+        $this->configMock->expects($this->once())->method('getValue')->with('supported_locales')
+            ->willReturn($allowedLocales);
+
+        $expected = 'en_US';
+        $actual = $this->localeResolver->getLocale();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test emulate method
+     *
+     * @return void
+     */
+    public function testEmulate()
+    {
+        $scopeId = 12;
+        $this->resolverMock->expects($this->once())->method('emulate')->with($scopeId);
+        $this->localeResolver->emulate($scopeId);
+    }
+
+    /**
+     * Test revert method
+     *
+     * @return void
+     */
+    public function testRevert()
+    {
+        $this->resolverMock->expects($this->once())->method('revert');
+        $this->localeResolver->revert();
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
index 1aecba91b9afc..c8524017274a4 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
 
 use Magento\Braintree\Model\Paypal\Helper\OrderPlace;
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
 use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Checkout\Helper\Data;
 use Magento\Checkout\Model\Type\Onepage;
@@ -14,6 +17,7 @@
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class OrderPlaceTest
@@ -27,62 +31,80 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
     const TEST_EMAIL = 'test@test.loc';
 
     /**
-     * @var CartManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartManagementInterface|MockObject
      */
-    private $cartManagementMock;
+    private $cartManagement;
 
     /**
-     * @var AgreementsValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AgreementsValidatorInterface|MockObject
      */
-    private $agreementsValidatorMock;
+    private $agreementsValidator;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $customerSessionMock;
+    private $customerSession;
 
     /**
-     * @var Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    private $checkoutHelperMock;
+    private $checkoutHelper;
 
     /**
-     * @var Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var Address|MockObject
      */
-    private $billingAddressMock;
+    private $billingAddress;
 
     /**
      * @var OrderPlace
      */
     private $orderPlace;
 
+    /**
+     * @var OrderCancellationService|MockObject
+     */
+    private $orderCancellation;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->cartManagementMock = $this->getMockBuilder(CartManagementInterface::class)
+        $this->cartManagement = $this->getMockBuilder(CartManagementInterface::class)
             ->getMockForAbstractClass();
-        $this->agreementsValidatorMock = $this->getMockBuilder(AgreementsValidatorInterface::class)
+        $this->agreementsValidator = $this->getMockBuilder(AgreementsValidatorInterface::class)
             ->getMockForAbstractClass();
-        $this->customerSessionMock = $this->getMockBuilder(Session::class)
+        $this->customerSession = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->checkoutHelper = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->checkoutHelperMock = $this->getMockBuilder(Data::class)
+
+        $this->orderCancellation = $this->getMockBuilder(OrderCancellationService::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->orderPlace = new OrderPlace(
-            $this->cartManagementMock,
-            $this->agreementsValidatorMock,
-            $this->customerSessionMock,
-            $this->checkoutHelperMock
+            $this->cartManagement,
+            $this->agreementsValidator,
+            $this->customerSession,
+            $this->checkoutHelper,
+            $this->orderCancellation
         );
     }
 
+    /**
+     * Checks a scenario for a guest customer.
+     *
+     * @throws \Exception
+     */
     public function testExecuteGuest()
     {
         $agreement = ['test', 'test'];
         $quoteMock = $this->getQuoteMock();
 
-        $this->agreementsValidatorMock->expects(self::once())
+        $this->agreementsValidator->expects(self::once())
             ->method('isValid')
             ->willReturn(true);
 
@@ -97,7 +119,7 @@ public function testExecuteGuest()
             ->method('getId')
             ->willReturn(10);
 
-        $this->cartManagementMock->expects(self::once())
+        $this->cartManagement->expects(self::once())
             ->method('placeOrder')
             ->with(10);
 
@@ -105,9 +127,11 @@ public function testExecuteGuest()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Disables address validation.
+     *
+     * @param MockObject $quoteMock
      */
-    private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function disabledQuoteAddressValidationStep(MockObject $quoteMock)
     {
         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
         $shippingAddressMock = $this->getMockBuilder(Address::class)
@@ -115,26 +139,21 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
             ->disableOriginalConstructor()
             ->getMock();
 
-        $quoteMock->expects(self::once())
-            ->method('getShippingAddress')
+        $quoteMock->method('getShippingAddress')
             ->willReturn($shippingAddressMock);
 
-        $billingAddressMock->expects(self::once())
-            ->method('setShouldIgnoreValidation')
+        $billingAddressMock->method('setShouldIgnoreValidation')
             ->with(true)
             ->willReturnSelf();
 
-        $quoteMock->expects(self::once())
-            ->method('getIsVirtual')
+        $quoteMock->method('getIsVirtual')
             ->willReturn(false);
 
-        $shippingAddressMock->expects(self::once())
-            ->method('setShouldIgnoreValidation')
+        $shippingAddressMock->method('setShouldIgnoreValidation')
             ->with(true)
             ->willReturnSelf();
 
-        $billingAddressMock->expects(self::any())
-            ->method('getEmail')
+        $billingAddressMock->method('getEmail')
             ->willReturn(self::TEST_EMAIL);
 
         $billingAddressMock->expects(self::never())
@@ -142,25 +161,24 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Prepares checkout step.
+     *
+     * @param MockObject $quoteMock
      */
-    private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function getCheckoutMethodStep(MockObject $quoteMock)
     {
-        $this->customerSessionMock->expects(self::once())
-            ->method('isLoggedIn')
+        $this->customerSession->method('isLoggedIn')
             ->willReturn(false);
 
         $quoteMock->expects(self::at(1))
             ->method('getCheckoutMethod')
             ->willReturn(null);
 
-        $this->checkoutHelperMock->expects(self::once())
-            ->method('isAllowedGuestCheckout')
+        $this->checkoutHelper->method('isAllowedGuestCheckout')
             ->with($quoteMock)
             ->willReturn(true);
 
-        $quoteMock->expects(self::once())
-            ->method('setCheckoutMethod')
+        $quoteMock->method('setCheckoutMethod')
             ->with(Onepage::METHOD_GUEST);
 
         $quoteMock->expects(self::at(2))
@@ -169,9 +187,11 @@ private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Prepares quote.
+     *
+     * @param MockObject $quoteMock
      */
-    private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function prepareGuestQuoteStep(MockObject $quoteMock)
     {
         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
 
@@ -184,44 +204,44 @@ private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject
             ->method('getEmail')
             ->willReturn(self::TEST_EMAIL);
 
-        $quoteMock->expects(self::once())
-            ->method('setCustomerEmail')
+        $quoteMock->method('setCustomerEmail')
             ->with(self::TEST_EMAIL)
             ->willReturnSelf();
 
-        $quoteMock->expects(self::once())
-            ->method('setCustomerIsGuest')
+        $quoteMock->method('setCustomerIsGuest')
             ->with(true)
             ->willReturnSelf();
 
-        $quoteMock->expects(self::once())
-            ->method('setCustomerGroupId')
+        $quoteMock->method('setCustomerGroupId')
             ->with(Group::NOT_LOGGED_IN_ID)
             ->willReturnSelf();
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-     * @return Address|\PHPUnit_Framework_MockObject_MockObject
+     * Gets a mock object for a billing address entity.
+     *
+     * @param MockObject $quoteMock
+     * @return Address|MockObject
      */
-    private function getBillingAddressMock(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function getBillingAddressMock(MockObject $quoteMock)
     {
-        if (!isset($this->billingAddressMock)) {
-            $this->billingAddressMock = $this->getMockBuilder(Address::class)
+        if (!isset($this->billingAddress)) {
+            $this->billingAddress = $this->getMockBuilder(Address::class)
                 ->setMethods(['setShouldIgnoreValidation', 'getEmail', 'setSameAsBilling'])
                 ->disableOriginalConstructor()
                 ->getMock();
         }
 
-        $quoteMock->expects(self::any())
-            ->method('getBillingAddress')
-            ->willReturn($this->billingAddressMock);
+        $quoteMock->method('getBillingAddress')
+            ->willReturn($this->billingAddress);
 
-        return $this->billingAddressMock;
+        return $this->billingAddress;
     }
 
     /**
-     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+     * Gets a mock object for a quote.
+     *
+     * @return Quote|MockObject
      */
     private function getQuoteMock()
     {
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
index 39863e6561c43..a2b5380d2884b 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
@@ -3,22 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
 
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartExtensionInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Payment;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
-use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
-use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class QuoteUpdaterTest
  *
- * @see \Magento\Braintree\Model\Paypal\Helper\QuoteUpdater
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
@@ -26,39 +28,42 @@ class QuoteUpdaterTest extends \PHPUnit\Framework\TestCase
     const TEST_NONCE = '3ede7045-2aea-463e-9754-cd658ffeeb48';
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
-    private $configMock;
+    private $config;
 
     /**
-     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartRepositoryInterface|MockObject
      */
-    private $quoteRepositoryMock;
+    private $quoteRepository;
 
     /**
-     * @var Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var Address|MockObject
      */
-    private $billingAddressMock;
+    private $billingAddress;
 
     /**
-     * @var Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var Address|MockObject
      */
-    private $shippingAddressMock;
+    private $shippingAddress;
 
     /**
      * @var QuoteUpdater
      */
     private $quoteUpdater;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->configMock = $this->getMockBuilder(Config::class)
+        $this->config = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->quoteRepositoryMock = $this->getMockBuilder(CartRepositoryInterface::class)
+        $this->quoteRepository = $this->getMockBuilder(CartRepositoryInterface::class)
             ->getMockForAbstractClass();
 
-        $this->billingAddressMock = $this->getMockBuilder(Address::class)
+        $this->billingAddress = $this->getMockBuilder(Address::class)
             ->setMethods(
                 [
                     'setLastname',
@@ -73,9 +78,10 @@ protected function setUp()
                     'setShouldIgnoreValidation',
                     'getEmail'
                 ]
-            )->disableOriginalConstructor()
+            )
+            ->disableOriginalConstructor()
             ->getMock();
-        $this->shippingAddressMock = $this->getMockBuilder(Address::class)
+        $this->shippingAddress = $this->getMockBuilder(Address::class)
             ->setMethods(
                 [
                     'setLastname',
@@ -89,54 +95,61 @@ protected function setUp()
                     'setPostcode',
                     'setShouldIgnoreValidation'
                 ]
-            )->disableOriginalConstructor()
+            )
+            ->disableOriginalConstructor()
             ->getMock();
 
         $this->quoteUpdater = new QuoteUpdater(
-            $this->configMock,
-            $this->quoteRepositoryMock
+            $this->config,
+            $this->quoteRepository
         );
     }
 
-    public function testExecute()
+    /**
+     * Checks if quote details can be update by the response from Braintree.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecute(): void
     {
         $details = $this->getDetails();
-        $quoteMock = $this->getQuoteMock();
-        $paymentMock = $this->getPaymentMock();
+        $quote = $this->getQuoteMock();
+        $payment = $this->getPaymentMock();
 
-        $quoteMock->expects(self::once())
-            ->method('getPayment')
-            ->willReturn($paymentMock);
+        $quote->method('getPayment')
+            ->willReturn($payment);
 
-        $paymentMock->expects(self::once())
-            ->method('setMethod')
+        $payment->method('setMethod')
             ->with(ConfigProvider::PAYPAL_CODE);
-        $paymentMock->expects(self::once())
-            ->method('setAdditionalInformation')
+        $payment->method('setAdditionalInformation')
             ->with(DataAssignObserver::PAYMENT_METHOD_NONCE, self::TEST_NONCE);
 
-        $this->updateQuoteStep($quoteMock, $details);
+        $this->updateQuoteStep($quote, $details);
 
-        $this->quoteUpdater->execute(self::TEST_NONCE, $details, $quoteMock);
+        $this->quoteUpdater->execute(self::TEST_NONCE, $details, $quote);
     }
 
-    private function disabledQuoteAddressValidationStep()
+    /**
+     * Disables quote's addresses validation.
+     *
+     * @return void
+     */
+    private function disabledQuoteAddressValidationStep(): void
     {
-        $this->billingAddressMock->expects(self::once())
-            ->method('setShouldIgnoreValidation')
+        $this->billingAddress->method('setShouldIgnoreValidation')
             ->with(true);
-        $this->shippingAddressMock->expects(self::once())
-            ->method('setShouldIgnoreValidation')
+        $this->shippingAddress->method('setShouldIgnoreValidation')
             ->with(true);
-        $this->billingAddressMock->expects(self::once())
-            ->method('getEmail')
+        $this->billingAddress->method('getEmail')
             ->willReturn('bt_buyer_us@paypal.com');
     }
 
     /**
+     * Gets quote's details.
+     *
      * @return array
      */
-    private function getDetails()
+    private function getDetails(): array
     {
         return [
             'email' => 'bt_buyer_us@paypal.com',
@@ -166,54 +179,51 @@ private function getDetails()
     }
 
     /**
+     * Updates shipping address details.
+     *
      * @param array $details
      */
-    private function updateShippingAddressStep(array $details)
+    private function updateShippingAddressStep(array $details): void
     {
-        $this->shippingAddressMock->expects(self::once())
-            ->method('setLastname')
+        $this->shippingAddress->method('setLastname')
             ->with($details['lastName']);
-        $this->shippingAddressMock->expects(self::once())
-            ->method('setFirstname')
+        $this->shippingAddress->method('setFirstname')
             ->with($details['firstName']);
-        $this->shippingAddressMock->expects(self::once())
-            ->method('setEmail')
+        $this->shippingAddress->method('setEmail')
             ->with($details['email']);
-        $this->shippingAddressMock->expects(self::once())
-            ->method('setCollectShippingRates')
+        $this->shippingAddress->method('setCollectShippingRates')
             ->with(true);
 
-        $this->updateAddressDataStep($this->shippingAddressMock, $details['shippingAddress']);
+        $this->updateAddressDataStep($this->shippingAddress, $details['shippingAddress']);
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $addressMock
+     * Updates address details.
+     *
+     * @param MockObject $address
      * @param array $addressData
      */
-    private function updateAddressDataStep(\PHPUnit_Framework_MockObject_MockObject $addressMock, array $addressData)
+    private function updateAddressDataStep(MockObject $address, array $addressData): void
     {
-        $addressMock->expects(self::once())
-            ->method('setStreet')
+        $address->method('setStreet')
             ->with([$addressData['streetAddress'], $addressData['extendedAddress']]);
-        $addressMock->expects(self::once())
-            ->method('setCity')
+        $address->method('setCity')
             ->with($addressData['locality']);
-        $addressMock->expects(self::once())
-            ->method('setRegionCode')
+        $address->method('setRegionCode')
             ->with($addressData['region']);
-        $addressMock->expects(self::once())
-            ->method('setCountryId')
+        $address->method('setCountryId')
             ->with($addressData['countryCodeAlpha2']);
-        $addressMock->expects(self::once())
-            ->method('setPostcode')
+        $address->method('setPostcode')
             ->with($addressData['postalCode']);
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Updates quote's address details.
+     *
+     * @param MockObject $quoteMock
      * @param array $details
      */
-    private function updateQuoteAddressStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock, array $details)
+    private function updateQuoteAddressStep(MockObject $quoteMock, array $details): void
     {
         $quoteMock->expects(self::exactly(2))
             ->method('getIsVirtual')
@@ -224,64 +234,61 @@ private function updateQuoteAddressStep(\PHPUnit_Framework_MockObject_MockObject
     }
 
     /**
+     * Updates billing address details.
+     *
      * @param array $details
      */
-    private function updateBillingAddressStep(array $details)
+    private function updateBillingAddressStep(array $details): void
     {
-        $this->configMock->expects(self::once())
-            ->method('isRequiredBillingAddress')
+        $this->config->method('isRequiredBillingAddress')
             ->willReturn(true);
 
-        $this->updateAddressDataStep($this->billingAddressMock, $details['billingAddress']);
+        $this->updateAddressDataStep($this->billingAddress, $details['billingAddress']);
 
-        $this->billingAddressMock->expects(self::once())
-            ->method('setLastname')
+        $this->billingAddress->method('setLastname')
             ->with($details['lastName']);
-        $this->billingAddressMock->expects(self::once())
-            ->method('setFirstname')
+        $this->billingAddress->method('setFirstname')
             ->with($details['firstName']);
-        $this->billingAddressMock->expects(self::once())
-            ->method('setEmail')
+        $this->billingAddress->method('setEmail')
             ->with($details['email']);
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Updates quote details.
+     *
+     * @param MockObject $quote
      * @param array $details
      */
-    private function updateQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock, array $details)
+    private function updateQuoteStep(MockObject $quote, array $details): void
     {
-        $quoteMock->expects(self::once())
-            ->method('setMayEditShippingAddress')
+        $quote->method('setMayEditShippingAddress')
             ->with(false);
-        $quoteMock->expects(self::once())
-            ->method('setMayEditShippingMethod')
+        $quote->method('setMayEditShippingMethod')
             ->with(true);
 
-        $quoteMock->expects(self::exactly(2))
-            ->method('getShippingAddress')
-            ->willReturn($this->shippingAddressMock);
-        $quoteMock->expects(self::exactly(2))
+        $quote->method('getShippingAddress')
+            ->willReturn($this->shippingAddress);
+        $quote->expects(self::exactly(2))
             ->method('getBillingAddress')
-            ->willReturn($this->billingAddressMock);
+            ->willReturn($this->billingAddress);
 
-        $this->updateQuoteAddressStep($quoteMock, $details);
+        $this->updateQuoteAddressStep($quote, $details);
         $this->disabledQuoteAddressValidationStep();
 
-        $quoteMock->expects(self::once())
-            ->method('collectTotals');
+        $quote->method('collectTotals');
 
-        $this->quoteRepositoryMock->expects(self::once())
-            ->method('save')
-            ->with($quoteMock);
+        $this->quoteRepository->method('save')
+            ->with($quote);
     }
 
     /**
-     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+     * Creates a mock for Quote object.
+     *
+     * @return Quote|MockObject
      */
-    private function getQuoteMock()
+    private function getQuoteMock(): MockObject
     {
-        return $this->getMockBuilder(Quote::class)
+        $quote = $this->getMockBuilder(Quote::class)
             ->setMethods(
                 [
                     'getIsVirtual',
@@ -291,15 +298,29 @@ private function getQuoteMock()
                     'collectTotals',
                     'getShippingAddress',
                     'getBillingAddress',
+                    'getExtensionAttributes'
                 ]
-            )->disableOriginalConstructor()
+            )
+            ->disableOriginalConstructor()
             ->getMock();
+
+        $cartExtension = $this->getMockBuilder(CartExtensionInterface::class)
+            ->setMethods(['setShippingAssignments'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $quote->method('getExtensionAttributes')
+            ->willReturn($cartExtension);
+
+        return $quote;
     }
 
     /**
-     * @return Payment|\PHPUnit_Framework_MockObject_MockObject
+     * Creates a mock for Payment object.
+     *
+     * @return Payment|MockObject
      */
-    private function getPaymentMock()
+    private function getPaymentMock(): MockObject
     {
         return $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
index 5c28b94ac9811..372415d3530c0 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php
@@ -34,10 +34,9 @@ public function __get($name)
     {
         if (array_key_exists($name, $this->_attributes)) {
             return $this->_attributes[$name];
-        } else {
-            trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
-            return null;
         }
+        trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
+        return null;
     }
 
     /**
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 e43e67c18744f..f33af81b19746 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
         );
 
@@ -125,7 +137,7 @@ public function testGetItemsEmptyCollection()
      */
     public function testGetItemsWithLimit()
     {
-        $transations = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
+        $transactions = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
 
         $this->filterMapperMock->expects($this->once())
             ->method('getFilter')
@@ -133,7 +145,7 @@ public function testGetItemsWithLimit()
 
         $this->braintreeAdapterMock->expects($this->once())
             ->method('search')
-            ->willReturn($transations);
+            ->willReturn($transactions);
 
         $this->entityFactoryMock->expects($this->exactly(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT))
             ->method('create')
@@ -141,7 +153,7 @@ public function testGetItemsWithLimit()
 
         $collection = new TransactionsCollection(
             $this->entityFactoryMock,
-            $this->braintreeAdapterMock,
+            $this->adapterFactoryMock,
             $this->filterMapperMock
         );
         $collection->setPageSize(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT);
@@ -157,7 +169,7 @@ public function testGetItemsWithLimit()
      */
     public function testGetItemsWithNullLimit()
     {
-        $transations = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
+        $transactions = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
 
         $this->filterMapperMock->expects($this->once())
             ->method('getFilter')
@@ -165,7 +177,7 @@ public function testGetItemsWithNullLimit()
 
         $this->braintreeAdapterMock->expects($this->once())
             ->method('search')
-            ->willReturn($transations);
+            ->willReturn($transactions);
 
         $this->entityFactoryMock->expects($this->exactly(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT))
             ->method('create')
@@ -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 6c85ae68eb7af..24bc4eae960be 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/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
index 22f7f46bd98f1..42469fe0faf45 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
@@ -77,6 +77,9 @@ public function testGetConfig($expected)
                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
             ]);
 
+        $this->config->method('isRequiredBillingAddress')
+            ->willReturn(1);
+
         self::assertEquals($expected, $this->configProvider->getConfig());
     }
 
@@ -101,7 +104,8 @@ public function getConfigDataProvider()
                             'skipOrderReview' => false,
                             'paymentIcon' => [
                                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
-                            ]
+                            ],
+                            'isRequiredBillingAddress' => true
                         ]
                     ]
                 ]
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index c14addf550dfb..5af56a2afd3fe 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -5,32 +5,32 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "braintree/braintree_php": "3.22.0",
-        "magento/framework": "100.3.*",
+        "php": "~7.1.3||~7.2.0",
+        "braintree/braintree_php": "3.35.0",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-instant-purchase": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-paypal": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-vault": "100.3.*"
+        "magento/module-catalog": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-instant-purchase": "*",
+        "magento/module-payment": "*",
+        "magento/module-paypal": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-ui": "*",
+        "magento/module-vault": "*"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "100.3.*",
-        "magento/module-theme": "100.3.*"
+        "magento/module-checkout-agreements": "*",
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Braintree/etc/acl.xml b/app/code/Magento/Braintree/etc/acl.xml
index a188586cc0a26..066ccc818d4e6 100644
--- a/app/code/Magento/Braintree/etc/acl.xml
+++ b/app/code/Magento/Braintree/etc/acl.xml
@@ -11,7 +11,16 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Reports::report">
                     <resource id="Magento_Reports::salesroot">
-                        <resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" sortOrder="80" />
+                        <resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" translate="title" sortOrder="80" />
+                    </resource>
+                </resource>
+                <resource id="Magento_Sales::sales">
+                    <resource id="Magento_Sales::sales_operation">
+                        <resource id="Magento_Sales::sales_order">
+                            <resource id="Magento_Sales::actions">
+                                <resource id="Magento_Braintree::get_client_token" title="Get Client Token Braintree" sortOrder="170" />
+                            </resource>
+                        </resource>
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/Braintree/etc/adminhtml/braintree_error_mapping.xml b/app/code/Magento/Braintree/etc/adminhtml/braintree_error_mapping.xml
new file mode 100644
index 0000000000000..611f9372518fc
--- /dev/null
+++ b/app/code/Magento/Braintree/etc/adminhtml/braintree_error_mapping.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/error_mapping.xsd">
+    <message_list>
+        <message code="81509" translate="true">Credit card type is not accepted by this merchant account.</message>
+        <message code="91504" translate="true">Transaction can only be voided if status is authorized, submitted_for_settlement, or - for PayPal - settlement_pending.</message>
+        <message code="91505" translate="true">Credit transactions cannot be refunded.</message>
+        <message code="91506" translate="true">Cannot refund a transaction unless it is settled.</message>
+        <message code="91507" translate="true">Cannot submit for settlement unless status is authorized.</message>
+        <message code="91511" translate="true">Customer does not have any credit cards.</message>
+        <message code="91512" translate="true">Transaction has already been completely refunded.</message>
+        <message code="91517" translate="true">Payment instrument type is not accepted by this merchant account.</message>
+        <message code="91519" translate="true">Processor authorization code cannot be set unless for a voice authorization.</message>
+        <message code="91521" translate="true">Refund amount is too large.</message>
+        <message code="91522" translate="true">Settlement amount is too large.</message>
+        <message code="91530" translate="true">Cannot provide a billing address unless also providing a credit card.</message>
+        <message code="91538" translate="true">Cannot refund a transaction with a suspended merchant account.</message>
+        <message code="91547" translate="true">Merchant account does not support refunds.</message>
+        <message code="91574" translate="true">Cannot refund a transaction transaction in settling status on this merchant account. Try again after the transaction has settled.</message>
+        <message code="91576" translate="true">PayPal is not enabled for your merchant account.</message>
+        <message code="915102" translate="true">Partial settlements are not supported by this processor.</message>
+        <message code="915103" translate="true">Cannot submit for partial settlement.</message>
+        <message code="915148" translate="true">Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.</message>
+        <message code="915149" translate="true">Too many concurrent attempts to refund this transaction. Try again later.</message>
+        <message code="915151" translate="true">Too many concurrent attempts to void this transaction. Try again later.</message>
+    </message_list>
+</mapping>
diff --git a/app/code/Magento/Braintree/etc/adminhtml/di.xml b/app/code/Magento/Braintree/etc/adminhtml/di.xml
index d0469ded83b67..9de1ad48d2261 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/di.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/di.xml
@@ -28,6 +28,8 @@
                 <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -39,10 +41,25 @@
                 <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
 
+    <!-- Braintree commands -->
+    <type name="BraintreeVoidCommand">
+        <arguments>
+            <argument name="errorMessageMapper" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
+        </arguments>
+    </type>
+    <type name="BraintreeRefundCommand">
+        <arguments>
+            <argument name="errorMessageMapper" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
+        </arguments>
+    </type>
+    <!-- END Braintree commands -->
+
     <type name="Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider">
         <arguments>
             <argument name="tokenUiComponentProviders" xsi:type="array">
diff --git a/app/code/Magento/Braintree/etc/adminhtml/menu.xml b/app/code/Magento/Braintree/etc/adminhtml/menu.xml
index 590d5b3dce008..ce4dd4844f3bc 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/menu.xml
@@ -10,6 +10,7 @@
         <add
                 id="Magento_Braintree::settlement_report"
                 title="Braintree Settlement"
+                translate="title"
                 module="Magento_Braintree"
                 sortOrder="80"
                 parent="Magento_Reports::report_salesroot"
diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index f46da366b64a3..5215dbc00b7ef 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -44,7 +44,7 @@
                         <comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
                     </group>
-                    <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
+                    <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">
                         <label>Basic Braintree Settings</label>
                         <attribute type="expanded">1</attribute>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
@@ -77,25 +77,25 @@
                             <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
                     </group>
-                    <group id="braintree_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <group id="braintree_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="20">
                         <label>Advanced Braintree Settings</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="braintree_cc_vault_title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Vault Title</label>
                             <config_path>payment/braintree_cc_vault/title</config_path>
                         </field>
-                        <field id="merchant_account_id" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="merchant_account_id" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Merchant Account ID</label>
                             <comment>If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.</comment>
                             <config_path>payment/braintree/merchant_account_id</config_path>
                         </field>
-                        <field id="fraudprotection" translate="label" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="fraudprotection" translate="label comment" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Advanced Fraud Protection</label>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <comment>Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section</comment>
                             <config_path>payment/braintree/fraudprotection</config_path>
                         </field>
-                        <field id="kount_id" translate="label" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="kount_id" translate="label comment" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Kount Merchant ID</label>
                             <comment><![CDATA[Used for direct fraud tool integration. Make sure you also contact <a href="mailto:accounts@braintreepayments.com">accounts@braintreepayments.com</a> to setup your Kount account.]]></comment>
                             <depends>
@@ -108,7 +108,7 @@
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <config_path>payment/braintree/debug</config_path>
                         </field>
-                        <field id="useccv" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="useccv" translate="label comment" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>CVV Verification</label>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <comment>Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.</comment>
@@ -125,7 +125,7 @@
                             <config_path>payment/braintree/sort_order</config_path>
                         </field>
                     </group>
-                    <group id="braintree_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <group id="braintree_country_specific" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="30">
                         <label>Country Specific Settings</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="allowspecific" translate="label" type="allowspecific" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -146,10 +146,10 @@
                             <config_path>payment/braintree/countrycreditcard</config_path>
                         </field>
                     </group>
-                    <group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                         <label>PayPal through Braintree</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-                        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="title" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Title</label>
                             <config_path>payment/braintree_paypal/title</config_path>
                             <comment>It is recommended to set this value to "PayPal" per store views.</comment>
@@ -187,7 +187,7 @@
                             <can_be_empty>1</can_be_empty>
                             <config_path>payment/braintree_paypal/specificcountry</config_path>
                         </field>
-                        <field id="require_billing_address" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="require_billing_address" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Require Customer's Billing Address</label>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <config_path>payment/braintree_paypal/require_billing_address</config_path>
@@ -203,7 +203,7 @@
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <config_path>payment/braintree_paypal/debug</config_path>
                         </field>
-                        <field id="display_on_shopping_cart" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="display_on_shopping_cart" translate="label comment" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Display on Shopping Cart</label>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <config_path>payment/braintree_paypal/display_on_shopping_cart</config_path>
@@ -215,7 +215,7 @@
                             <config_path>payment/braintree_paypal/skip_order_review</config_path>
                         </field>
                     </group>
-                    <group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" sortOrder="41">
+                    <group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="41">
                         <label>3D Secure Verification Settings</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="verify_3dsecure" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -239,14 +239,14 @@
                             <config_path>payment/braintree/verify_specific_countries</config_path>
                         </field>
                     </group>
-                    <group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <group id="braintree_dynamic_descriptor" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                         <label>Dynamic Descriptors</label>
                         <comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
                             The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.
                             Dynamic descriptors are not enabled on all accounts by default. If you receive a validation error of 92203 or if your dynamic descriptors are not displaying as expected,
                             please <a href="mailto:support@getbraintree.com">Braintree Support</a>.]]></comment>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-                        <field id="name" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="name" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Name</label>
                             <config_path>payment/braintree/descriptor_name</config_path>
                             <comment>
@@ -254,14 +254,14 @@
                                 and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
                             </comment>
                         </field>
-                        <field id="phone" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="phone" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Phone</label>
                             <config_path>payment/braintree/descriptor_phone</config_path>
                             <comment>
                                 The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
                             </comment>
                         </field>
-                        <field id="url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="url" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>URL</label>
                             <config_path>payment/braintree/descriptor_url</config_path>
                             <comment>
diff --git a/app/code/Magento/Braintree/etc/braintree_error_mapping.xml b/app/code/Magento/Braintree/etc/braintree_error_mapping.xml
new file mode 100644
index 0000000000000..81da0a252e567
--- /dev/null
+++ b/app/code/Magento/Braintree/etc/braintree_error_mapping.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/error_mapping.xsd">
+    <message_list>
+        <message code="81703" translate="true">Credit card type is not accepted by this merchant account.</message>
+        <message code="81706" translate="true">CVV is required.</message>
+        <message code="81707" translate="true">CVV must be 4 digits for American Express and 3 digits for other card types.</message>
+        <message code="81709" translate="true">Expiration date is required.</message>
+        <message code="81710" translate="true">Expiration date is invalid.</message>
+        <message code="81711" translate="true">Expiration year is invalid. It must be between 1975 and 2201.</message>
+        <message code="81712" translate="true">Expiration month is invalid.</message>
+        <message code="81713" translate="true">Expiration year is invalid.</message>
+        <message code="81714" translate="true">Credit card number is required.</message>
+        <message code="81715" translate="true">Credit card number is invalid.</message>
+        <message code="81716" translate="true">Credit card number must be 12-19 digits.</message>
+        <message code="81723" translate="true">Cardholder name is too long.</message>
+        <message code="81736" translate="true">CVV verification failed.</message>
+        <message code="81737" translate="true">Postal code verification failed.</message>
+        <message code="81750" translate="true">Credit card number is prohibited.</message>
+        <message code="81801" translate="true">Addresses must have at least one field filled in.</message>
+        <message code="81802" translate="true">Company is too long.</message>
+        <message code="81804" translate="true">Extended address is too long.</message>
+        <message code="81805" translate="true">First name is too long.</message>
+        <message code="81806" translate="true">Last name is too long.</message>
+        <message code="81807" translate="true">Locality is too long.</message>
+        <message code="81808" translate="true">Postal code is required.</message>
+        <message code="81809" translate="true">Postal code may contain no more than 9 letter or number characters.</message>
+        <message code="81810" translate="true">Region is too long.</message>
+        <message code="81811" translate="true">Street address is required.</message>
+        <message code="81812" translate="true">Street address is too long.</message>
+        <message code="81813" translate="true">Postal code can only contain letters, numbers, spaces, and hyphens.</message>
+        <message code="81827" translate="true">US state codes must be two characters to meet PayPal Seller Protection requirements.</message>
+        <message code="82901" translate="true">Incomplete PayPal account information.</message>
+        <message code="82903" translate="true">Invalid PayPal account information.</message>
+        <message code="82904" translate="true">PayPal Accounts are not accepted by this merchant account.</message>
+        <message code="91726" translate="true">Credit card type is not accepted by this merchant account.</message>
+        <message code="91734" translate="true">Credit card type is not accepted by this merchant account.</message>
+        <message code="91744" translate="true">Billing address format is invalid.</message>
+        <message code="91803" translate="true">Country name is not an accepted country.</message>
+        <message code="91814" translate="true">Country code is not accepted. Please contact the store administrator.</message>
+        <message code="91815" translate="true">Provided country information is inconsistent.</message>
+        <message code="91816" translate="true">Country code is not accepted. Please contact the store administrator.</message>
+        <message code="91817" translate="true">Country code is not accepted. Please contact the store administrator.</message>
+        <message code="91818" translate="true">Customer has already reached the maximum of 50 addresses.</message>
+        <message code="91819" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91820" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91821" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91822" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91823" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91824" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91825" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91826" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="91828" translate="true">Address is invalid. Please contact the store administrator.</message>
+        <message code="92910" translate="true">Error communicating with PayPal.</message>
+        <message code="92911" translate="true">PayPal authentication expired.</message>
+        <message code="92916" translate="true">Error executing PayPal order.</message>
+        <message code="92917" translate="true">Error executing PayPal billing agreement.</message>
+    </message_list>
+</mapping>
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index 6bc2fb1735b52..a830c29368755 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -82,8 +82,7 @@
                 <title>Stored Accounts (Braintree PayPal)</title>
                 <can_use_internal>1</can_use_internal>
                 <instant_purchase>
-                    <available>Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker</available>
-                    <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
+                    <tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
             </braintree_paypal_vault>
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index 2a451e132eab0..b81513caf17a2 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -133,8 +133,8 @@
                 <item name="vault_capture" xsi:type="string">BraintreeVaultCaptureCommand</item>
                 <item name="void" xsi:type="string">BraintreeVoidCommand</item>
                 <item name="refund" xsi:type="string">BraintreeRefundCommand</item>
-                <item name="cancel" xsi:type="string">BraintreeVoidCommand</item>
-                <item name="deny_payment" xsi:type="string">BraintreeVoidCommand</item>
+                <item name="cancel" xsi:type="string">Magento\Braintree\Gateway\CancelCommand</item>
+                <item name="deny_payment" xsi:type="string">Magento\Braintree\Gateway\CancelCommand</item>
             </argument>
         </arguments>
     </virtualType>
@@ -150,7 +150,7 @@
                 <item name="vault_capture" xsi:type="string">BraintreeVaultCaptureCommand</item>
                 <item name="void" xsi:type="string">BraintreeVoidCommand</item>
                 <item name="refund" xsi:type="string">BraintreeRefundCommand</item>
-                <item name="cancel" xsi:type="string">BraintreeVoidCommand</item>
+                <item name="cancel" xsi:type="string">Magento\Braintree\Gateway\CancelCommand</item>
             </argument>
         </arguments>
     </virtualType>
@@ -193,6 +193,23 @@
         </arguments>
     </type>
 
+    <virtualType name="Magento\Braintree\Gateway\ErrorMapper\VirtualConfigReader" type="Magento\Payment\Gateway\ErrorMapper\VirtualConfigReader">
+        <arguments>
+            <argument name="fileName" xsi:type="string">braintree_error_mapping.xml</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Braintree\Gateway\ErrorMapper\VirtualMappingData" type="Magento\Payment\Gateway\ErrorMapper\MappingData">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualConfigReader</argument>
+            <argument name="cacheId" xsi:type="string">braintree_error_mapper</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper" type="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper">
+        <arguments>
+            <argument name="messageMapping" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualMappingData</argument>
+        </arguments>
+    </virtualType>
+
     <!-- Braintree commands  -->
     <virtualType name="BraintreeAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
@@ -201,6 +218,7 @@
             <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSale</argument>
             <argument name="handler" xsi:type="object">BraintreeAuthorizationHandler</argument>
             <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+            <argument name="errorMessageMapper" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
         </arguments>
     </virtualType>
     <virtualType name="BraintreeAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
@@ -214,6 +232,8 @@
                 <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -239,12 +259,14 @@
             <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement</argument>
             <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\TransactionIdHandler</argument>
             <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+            <argument name="errorMessageMapper" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
         </arguments>
     </virtualType>
     <virtualType name="BraintreeCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <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>
@@ -256,6 +278,7 @@
             <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSale</argument>
             <argument name="handler" xsi:type="object">BraintreeVaultResponseHandler</argument>
             <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+            <argument name="errorMessageMapper" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
         </arguments>
     </virtualType>
     <virtualType name="BraintreeVaultAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
@@ -268,6 +291,8 @@
                 <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -293,6 +318,7 @@
             <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionSale</argument>
             <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\TransactionIdHandler</argument>
             <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\ResponseValidator</argument>
+            <argument name="errorMessageMapper" xsi:type="object">Magento\Braintree\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
         </arguments>
     </virtualType>
     <virtualType name="BraintreeVaultCaptureRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
@@ -300,6 +326,8 @@
             <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -321,6 +349,8 @@
                 <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -353,6 +383,8 @@
                 <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>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -375,7 +407,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">
@@ -420,7 +452,7 @@
     <!-- PayPal value handlers infrastructure -->
     <type name="Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler">
         <arguments>
-            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\AccountPaymentTokenFactory</argument>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Api\Data\PaymentTokenFactoryInterface</argument>
         </arguments>
     </type>
     <virtualType name="BraintreePayPalValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
@@ -463,23 +495,49 @@
     <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 -->
+    <!-- Cancel Command -->
+    <virtualType name="Magento\Braintree\Gateway\CancelCommand" type="BraintreeVoidCommand">
+        <arguments>
+            <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\CancelDetailsHandler</argument>
+            <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\CancelResponseValidator</argument>
+        </arguments>
+    </virtualType>
+    <!-- END Cancel 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 +552,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <!-- Braintree validators infrastructure -->
+    <!-- END Braintree validators infrastructure -->
 
     <!-- Braintree PayPal validators -->
     <virtualType name="BraintreePayPalCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
@@ -566,4 +624,8 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Quote\Api\CartManagementInterface">
+        <plugin name="order_cancellation" type="Magento\Braintree\Plugin\OrderCancellation"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Braintree/etc/module.xml b/app/code/Magento/Braintree/etc/module.xml
index e3415c4935ff6..8be79268e7b58 100644
--- a/app/code/Magento/Braintree/etc/module.xml
+++ b/app/code/Magento/Braintree/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Braintree" setup_version="2.0.1">
+    <module name="Magento_Braintree" >
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Payment"/>
diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv
index 116f459a1c1c8..e9145b35b56ef 100644
--- a/app/code/Magento/Braintree/i18n/en_US.csv
+++ b/app/code/Magento/Braintree/i18n/en_US.csv
@@ -129,3 +129,68 @@ Amount,Amount
 "Refund Ids","Refund Ids"
 "Settlement Batch ID","Settlement Batch ID"
 Currency,Currency
+"Addresses must have at least one field filled in.","Addresses must have at least one field filled in."
+"Company is too long.","Company is too long."
+"Extended address is too long.","Extended address is too long."
+"First name is too long.","First name is too long."
+"Last name is too long.","Last name is too long."
+"Locality is too long.","Locality is too long."
+"Postal code can only contain letters, numbers, spaces, and hyphens.","Postal code can only contain letters, numbers, spaces, and hyphens."
+"Postal code is required.","Postal code is required."
+"Postal code may contain no more than 9 letter or number characters.","Postal code may contain no more than 9 letter or number characters."
+"Region is too long.","Region is too long."
+"Street address is required.","Street address is required."
+"Street address is too long.","Street address is too long."
+"US state codes must be two characters to meet PayPal Seller Protection requirements.","US state codes must be two characters to meet PayPal Seller Protection requirements."
+"Country name is not an accepted country.","Country name is not an accepted country."
+"Provided country information is inconsistent.","Provided country information is inconsistent."
+"Country code is not accepted. Please contact the store administrator.","Country code is not accepted. Please contact the store administrator."
+"Customer has already reached the maximum of 50 addresses.","Customer has already reached the maximum of 50 addresses."
+"Address is invalid. Please contact the store administrator.","Address is invalid. Please contact the store administrator."
+"Address is invalid.","Address is invalid."
+"Billing address format is invalid.","Billing address format is invalid."
+"Cardholder name is too long.","Cardholder name is too long."
+"Credit card type is not accepted by this merchant account.","Credit card type is not accepted by this merchant account."
+"CVV is required.","CVV is required."
+"CVV must be 4 digits for American Express and 3 digits for other card types.","CVV must be 4 digits for American Express and 3 digits for other card types."
+"Expiration date is required.","Expiration date is required."
+"Expiration date is invalid.","Expiration date is invalid."
+"Expiration year is invalid. It must be between 1975 and 2201.","Expiration year is invalid. It must be between 1975 and 2201."
+"Expiration month is invalid.","Expiration month is invalid."
+"Expiration year is invalid.","Expiration year is invalid."
+"Credit card number is required.","Credit card number is required."
+"Credit card number is invalid.","Credit card number is invalid."
+"Credit card number must be 12-19 digits.","Credit card number must be 12-19 digits."
+"CVV verification failed.","CVV verification failed."
+"Postal code verification failed.","Postal code verification failed."
+"Credit card number is prohibited.","Credit card number is prohibited."
+"Incomplete PayPal account information.","Incomplete PayPal account information."
+"Invalid PayPal account information.","Invalid PayPal account information."
+"PayPal Accounts are not accepted by this merchant account.","PayPal Accounts are not accepted by this merchant account."
+"Error communicating with PayPal.","Error communicating with PayPal."
+"PayPal authentication expired.","PayPal authentication expired."
+"Error executing PayPal order.","Error executing PayPal order."
+"Error executing PayPal billing agreement.","Error executing PayPal billing agreement."
+"Cannot provide a billing address unless also providing a credit card.","Cannot provide a billing address unless also providing a credit card."
+"Transaction can only be voided if status is authorized, submitted_for_settlement, or - for PayPal - settlement_pending.","Transaction can only be voided if status is authorized, submitted_for_settlement, or - for PayPal - settlement_pending."
+"Credit transactions cannot be refunded.","Credit transactions cannot be refunded."
+"Cannot refund a transaction unless it is settled.","Cannot refund a transaction unless it is settled."
+"Cannot submit for settlement unless status is authorized.","Cannot submit for settlement unless status is authorized."
+"Customer does not have any credit cards.","Customer does not have any credit cards."
+"Transaction has already been completely refunded.","Transaction has already been completely refunded."
+"Payment instrument type is not accepted by this merchant account.","Payment instrument type is not accepted by this merchant account."
+"Processor authorization code cannot be set unless for a voice authorization.","Processor authorization code cannot be set unless for a voice authorization."
+"Refund amount is too large.","Refund amount is too large."
+"Settlement amount is too large.","Settlement amount is too large."
+"Cannot refund a transaction with a suspended merchant account.","Cannot refund a transaction with a suspended merchant account."
+"Merchant account does not support refunds.","Merchant account does not support refunds."
+"PayPal is not enabled for your merchant account.","PayPal is not enabled for your merchant account."
+"Cannot refund a transaction transaction in settling status on this merchant account. Try again after the transaction has settled.","Cannot refund a transaction transaction in settling status on this merchant account. Try again after the transaction has settled."
+"Cannot submit for partial settlement.","Cannot submit for partial settlement."
+"Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
+"Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.","Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending."
+"Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
+"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
+"Braintree Settlement","Braintree Settlement"
+"The Payment Token is not available to perform the request.","The Payment Token is not available to perform the request."
+"The order #%1 cannot be processed.","The order #%1 cannot be processed."
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index 13249cd8e0e80..535a5a852fe70 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
-                <span><?= $block->escapeHtml('Save for later use.') ?></span>
+                <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>
     <?php endif; ?>
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 c8aaa65cebb71..ab01565d7f1e5 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -24,6 +24,7 @@ define([
             scriptLoaded: false,
             braintree: null,
             selectedCardType: null,
+            checkout: null,
             imports: {
                 onActiveChange: 'active'
             }
@@ -116,7 +117,7 @@ define([
         },
 
         /**
-         * Setup Braintree SDK
+         * Retrieves client token and setup Braintree SDK
          */
         initBraintree: function () {
             var self = this;
@@ -124,35 +125,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 +140,54 @@ define([
             }
         },
 
+        /**
+         * Setup Braintree SDK
+         */
+        _initBraintree: function () {
+            var self = this;
+
+            this.disableEventListeners();
+
+            if (self.checkout) {
+                self.checkout.teardown(function () {
+                    self.checkout = null;
+                });
+            }
+
+            self.braintree.setup(self.clientToken, 'custom', {
+                id: self.selector,
+                hostedFields: self.getHostedFields(),
+
+                /**
+                 * Triggered when sdk was loaded
+                 */
+                onReady: function (checkout) {
+                    self.checkout = checkout;
+                    $('body').trigger('processStop');
+                    self.enableEventListeners();
+                },
+
+                /**
+                 * 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 +239,7 @@ define([
             }
 
             if (event.type !== 'fieldStateChange') {
+
                 return false;
             }
 
diff --git a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
index ab294f8e797b7..c4152e1c3ebf9 100644
--- a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
@@ -35,6 +35,9 @@
                                                                         <item name="braintree_paypal" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
                                                                         </item>
+                                                                        <item name="braintree_cc_vault" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                     </item>
                                                                 </item>
                                                             </item>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
index 1d60d19458a28..c1ef461ecae7c 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
@@ -29,6 +29,7 @@ $config = [
        class="action-braintree-paypal-logo" disabled>
         <img class="braintree-paypal-button-hidden"
              src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
-             alt="Pay with PayPal"/>
+             alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
+             title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
     </button>
 </div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
index 2834c0a683979..39bdf582c8cd7 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
@@ -79,6 +79,7 @@ define(
                      */
                     onError: function (response) {
                         braintree.showError($t('Payment ' + this.getTitle() + ' can\'t be initialized'));
+                        this.isPlaceOrderActionAllowed(true);
                         throw response.message;
                     },
 
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
index d2faac6ed792f..05c09abdb7b2e 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
@@ -61,7 +61,7 @@ define([
         },
 
         /**
-         * @returns {Bool}
+         * @returns {Boolean}
          */
         isVaultEnabled: function () {
             return this.vaultEnabler.isVaultEnabled();
@@ -142,11 +142,20 @@ define([
             return true;
         },
 
+        /**
+         * Returns state of place order button
+         * @returns {Boolean}
+         */
+        isButtonActive: function () {
+            return this.isActive() && this.isPlaceOrderActionAllowed();
+        },
+
         /**
          * Trigger order placing
          */
         placeOrderClick: function () {
             if (this.validateCardType()) {
+                this.isPlaceOrderActionAllowed(false);
                 $(this.getSelector('submit')).trigger('click');
             }
         },
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
index ca9d3686958b4..eaebd8492b0a1 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -103,6 +103,12 @@ define([
                 }
             });
 
+            quote.shippingAddress.subscribe(function () {
+                if (self.isActive()) {
+                    self.reInitPayPal();
+                }
+            });
+
             // for each component initialization need update property
             this.isReviewRequired(false);
             this.initClientConfig();
@@ -204,7 +210,9 @@ define([
         beforePlaceOrder: function (data) {
             this.setPaymentMethodNonce(data.nonce);
 
-            if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
+            if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
+                typeof data.details.billingAddress !== 'undefined'
+            ) {
                 this.setBillingAddress(data.details, data.details.billingAddress);
             }
 
@@ -228,6 +236,7 @@ define([
 
             this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
+            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
 
             Braintree.setConfig(this.clientConfig);
             Braintree.setup();
@@ -249,6 +258,14 @@ define([
             return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
         },
 
+        /**
+         * Is billing address required from PayPal side
+         * @returns {Boolean}
+         */
+        isRequiredBillingAddress: function () {
+            return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
+        },
+
         /**
          * Get configuration for PayPal
          * @returns {Object}
@@ -403,14 +420,16 @@ define([
          * Triggers when customer click "Continue to PayPal" button
          */
         payWithPayPal: function () {
-            if (additionalValidators.validate()) {
-                try {
-                    Braintree.checkout.paypal.initAuthFlow();
-                } catch (e) {
-                    this.messageContainer.addErrorMessage({
-                        message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
-                    });
-                }
+            if (!additionalValidators.validate()) {
+                return;
+            }
+
+            try {
+                Braintree.checkout.paypal.initAuthFlow();
+            } catch (e) {
+                this.messageContainer.addErrorMessage({
+                    message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
+                });
             }
         },
 
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
index d30186c8fb309..819b06ca75788 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/form.html
@@ -141,8 +141,7 @@
                         data-bind="
                             click: placeOrderClick,
                             attr: {title: $t('Place Order')},
-                            css: {disabled: !isPlaceOrderActionAllowed()},
-                            enable: isActive()
+                            enable: isButtonActive()
                         "
                         disabled>
                     <span data-bind="i18n: 'Place Order'"></span>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
index f5c8c15c8f3ba..e1f6a1b4c25ce 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label class="label" data-bind="attr: {'for': getCode()}">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}"
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
             <span text="getTitle()"></span>
@@ -45,7 +45,7 @@
                             </span>
                 <div class="field-tooltip-content"
                      data-target="dropdown"
-                     translate="'We store you payment information securely on Braintree servers via SSL.'"></div>
+                     translate="'We store your payment information securely on Braintree servers via SSL.'"></div>
             </div>
         </div>
         <!-- /ko -->
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index 0b3a938255de1..46db8a9907341 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -17,12 +17,10 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/checkbox.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
             '\';
             </script>';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSelectionPrice($selection)
+    {
+        $price = parent::getSelectionPrice($selection);
+        $qty = $selection->getSelectionQty();
+
+        return $price * $qty;
+    }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index 304b3a5cf34ed..629f08dc75106 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -17,12 +17,10 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/multi.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
             '\';
             </script>';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSelectionPrice($selection)
+    {
+        $price = parent::getSelectionPrice($selection);
+        $qty = $selection->getSelectionQty();
+
+        return $price * $qty;
+    }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
index e011ab36e8029..1519b3a67ac97 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
@@ -17,7 +17,7 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/radio.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/radio.phtml';
 
     /**
      * @param  string $elementId
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
index f1206db359b5c..502dfa32044a3 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -17,7 +17,7 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/select.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/select.phtml';
 
     /**
      * @param  string $elementId
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index f124740a766ab..8be512a3e6348 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -20,7 +20,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 13c5dcc81afb3..19da6bc6244e5 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -26,7 +26,7 @@ class Option extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index 5b73c22b5781a..cf4814d3cd778 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -15,7 +15,7 @@ class Search extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option/search.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option/search.phtml';
 
     /**
      * @return void
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 353808dc66a72..cf88f9b93d32f 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -15,7 +15,7 @@ class Selection extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option/selection.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option/selection.phtml';
 
     /**
      * Catalog data
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index 4cb087df0e1a6..23fc2026ab111 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -95,9 +95,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -219,9 +218,8 @@ public function getOrderItem()
     {
         if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
             return $this->getItem();
-        } else {
-            return $this->getItem()->getOrderItem();
         }
+        return $this->getItem()->getOrderItem();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 6cb103fc86789..fa488b073f515 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -7,6 +7,7 @@
 
 use Magento\Bundle\Model\Option;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\DataObject;
 
 /**
  * Catalog bundle product info block
@@ -56,6 +57,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $catalogRuleProcessor;
 
+    /**
+     * @var array
+     */
+    private $optionsPosition = [];
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -86,6 +92,8 @@ public function __construct(
     }
 
     /**
+     * Return catalog rule processor or creates processor if it does not exist
+     *
      * @deprecated 100.2.0
      * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
      */
@@ -101,6 +109,7 @@ private function getCatalogRuleProcessor()
 
     /**
      * Returns the bundle product options
+     *
      * Will return cached options data if the product options are already initialized
      * In a case when $stripSelection parameter is true will reload stored bundle selections collection from DB
      *
@@ -135,6 +144,8 @@ public function getOptions($stripSelection = false)
     }
 
     /**
+     * Return true if product has options
+     *
      * @return bool
      */
     public function hasOptions()
@@ -150,7 +161,6 @@ public function hasOptions()
      * Returns JSON encoded config to be used in JS scripts
      *
      * @return string
-     *
      */
     public function getJsonConfig()
     {
@@ -161,7 +171,7 @@ public function getJsonConfig()
 
         $defaultValues = [];
         $preConfiguredFlag = $currentProduct->hasPreconfiguredValues();
-        /** @var \Magento\Framework\DataObject|null $preConfiguredValues */
+        /** @var DataObject|null $preConfiguredValues */
         $preConfiguredValues = $preConfiguredFlag ? $currentProduct->getPreconfiguredValues() : null;
 
         $position = 0;
@@ -172,19 +182,25 @@ public function getJsonConfig()
             }
             $optionId = $optionItem->getId();
             $options[$optionId] = $this->getOptionItemData($optionItem, $currentProduct, $position);
+            $this->optionsPosition[$position] = $optionId;
 
             // Add attribute default value (if set)
             if ($preConfiguredFlag) {
                 $configValue = $preConfiguredValues->getData('bundle_option/' . $optionId);
                 if ($configValue) {
                     $defaultValues[$optionId] = $configValue;
+                    $configQty = $preConfiguredValues->getData('bundle_option_qty/' . $optionId);
+                    if ($configQty) {
+                        $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
+                    }
                 }
+                $options = $this->processOptions($optionId, $options, $preConfiguredValues);
             }
             $position++;
         }
         $config = $this->getConfigData($currentProduct, $options);
 
-        $configObj = new \Magento\Framework\DataObject(
+        $configObj = new DataObject(
             [
                 'config' => $config,
             ]
@@ -217,10 +233,11 @@ public function getOptionHtml(Option $option)
     }
 
     /**
-     * Get formed data from option selection item
+     * Get formed data from option selection item.
      *
      * @param Product $product
      * @param Product $selection
+     *
      * @return array
      */
     private function getSelectionItemData(Product $product, Product $selection)
@@ -228,31 +245,37 @@ private function getSelectionItemData(Product $product, Product $selection)
         $qty = ($selection->getSelectionQty() * 1) ?: '1';
 
         $optionPriceAmount = $product->getPriceInfo()
-            ->getPrice('bundle_option')
+            ->getPrice(\Magento\Bundle\Pricing\Price\BundleOptionPrice::PRICE_CODE)
             ->getOptionSelectionAmount($selection);
         $finalPrice = $optionPriceAmount->getValue();
         $basePrice = $optionPriceAmount->getBaseAmount();
 
+        $oldPrice = $product->getPriceInfo()
+            ->getPrice(\Magento\Bundle\Pricing\Price\BundleOptionRegularPrice::PRICE_CODE)
+            ->getOptionSelectionAmount($selection)
+            ->getValue();
+
         $selection = [
             'qty' => $qty,
             'customQty' => $selection->getSelectionCanChangeQty(),
             'optionId' => $selection->getId(),
             'prices' => [
                 'oldPrice' => [
-                    'amount' => $basePrice
+                    'amount' => $oldPrice,
                 ],
                 'basePrice' => [
-                    'amount' => $basePrice
+                    'amount' => $basePrice,
                 ],
                 'finalPrice' => [
-                    'amount' => $finalPrice
-                ]
+                    'amount' => $finalPrice,
+                ],
             ],
             'priceType' => $selection->getSelectionPriceType(),
             'tierPrice' => $this->getTierPrices($product, $selection),
             'name' => $selection->getName(),
-            'canApplyMsrp' => false
+            'canApplyMsrp' => false,
         ];
+
         return $selection;
     }
 
@@ -363,6 +386,7 @@ private function getConfigData(Product $product, array $options)
         $config = [
             'options' => $options,
             'selected' => $this->selectedOptions,
+            'positions' => $this->optionsPosition,
             'bundleId' => $product->getId(),
             'priceFormat' => $this->localeFormat->getPriceFormat(),
             'prices' => [
@@ -381,4 +405,30 @@ private function getConfigData(Product $product, array $options)
         ];
         return $config;
     }
+
+    /**
+     * Set preconfigured quantities and selections to options.
+     *
+     * @param string $optionId
+     * @param array $options
+     * @param DataObject $preConfiguredValues
+     * @return array
+     */
+    private function processOptions(string $optionId, array $options, DataObject $preConfiguredValues)
+    {
+        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
+        $selections = $options[$optionId]['selections'];
+        array_walk($selections, function (&$selection, $selectionId) use ($preConfiguredQtys) {
+            if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
+                $selection['qty'] = $preConfiguredQtys[$selectionId];
+            } else {
+                if ((int)$preConfiguredQtys > 0) {
+                    $selection['qty'] = $preConfiguredQtys;
+                }
+            }
+        });
+        $options[$optionId]['selections'] = $selections;
+
+        return $options;
+    }
 }
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 14778e0f184de..7c63af0bd0e2e 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -167,7 +167,9 @@ protected function _getSelectedOptions()
      */
     protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
     {
-        if ($selectionId && $option->getSelectionById($selectionId)) {
+        if (is_array($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } else if ($selectionId && $option->getSelectionById($selectionId)) {
             $this->_selectedOptions = $selectionId;
         } elseif (!$option->getRequired()) {
             $this->_selectedOptions = 'None';
@@ -189,9 +191,8 @@ public function isSelected($selection)
             return in_array($selection->getSelectionId(), $selectedOptions);
         } elseif ($selectedOptions == 'None') {
             return false;
-        } else {
-            return $selection->getIsDefault() && $selection->isSaleable();
         }
+        return $selection->getIsDefault() && $selection->isSaleable();
     }
 
     /**
@@ -229,6 +230,8 @@ public function getProduct()
     }
 
     /**
+     * Get bundle option price title.
+     *
      * @param \Magento\Catalog\Model\Product $selection
      * @param bool $includeContainer
      * @return string
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
index 8ca0cf8a5159e..83730d4eae2bd 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
@@ -16,5 +16,5 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/checkbox.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/checkbox.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
index 3319db8cff1d5..79e94a18a789e 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
@@ -16,7 +16,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/multi.phtml';
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
index 84a619dafab52..07c113bd8e4bb 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
@@ -16,5 +16,5 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/radio.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/radio.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
index d7f1cf41057a8..63f0d35bda0f0 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
@@ -16,5 +16,5 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/select.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/select.phtml';
 }
diff --git a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
index a29c93fc4e139..003ddba86ad75 100644
--- a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
@@ -142,9 +142,8 @@ public function getValueHtml($item)
         if ($attributes = $this->getSelectionAttributes($item)) {
             return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " "
                 . $this->getOrder()->formatPrice($attributes['price']);
-        } else {
-            return $this->escapeHtml($item->getName());
         }
+        return $this->escapeHtml($item->getName());
     }
 
     /**
@@ -179,9 +178,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
index ba7b9b5fcb593..08fac66c4a4fe 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrossel;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends CatalogCrossel implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
index 87550d768ca8e..b301d6ee2fea9 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
index 58f464fba3afe..7534cfddcaadf 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends CatalogRelated implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
index a27efe8bc2b68..e0fc9226663f4 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
index d0a6343569ee8..239b13970e696 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends CatalogUpsell implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
index 74c87be5b7108..ed3312d3b0734 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php
@@ -6,6 +6,13 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
+/**
+ * Class UpsellGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
 class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
 {
 }
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
index 6688648a3c4fd..3c9eac68eb9e4 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
@@ -105,8 +105,13 @@ public function afterInitialize(
             if ($result['bundle_options'] && !$compositeReadonly) {
                 $product->setBundleOptionsData($result['bundle_options']);
             }
+
             $this->processBundleOptionsData($product);
             $this->processDynamicOptionsData($product);
+        } elseif (!$compositeReadonly) {
+            $extension = $product->getExtensionAttributes();
+            $extension->setBundleProductOptions([]);
+            $product->setExtensionAttributes($extension);
         }
 
         $affectProductSelections = (bool)$this->request->getPost('affect_bundle_product_selections');
@@ -127,7 +132,7 @@ protected function processBundleOptionsData(\Magento\Catalog\Model\Product $prod
         }
         $options = [];
         foreach ($bundleOptionsData as $key => $optionData) {
-            if ((bool)$optionData['delete']) {
+            if (!empty($optionData['delete'])) {
                 continue;
             }
 
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 1a533f5d24990..8c85c06c7342d 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Bundle\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -87,7 +88,7 @@ public function getChildren($productSku, $optionId = null)
     {
         $product = $this->productRepository->get($productSku, true);
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-            throw new InputException(__('Only implemented for bundle product'));
+            throw new InputException(__('This is implemented for bundle products only.'));
         }
 
         $childrenList = [];
@@ -125,25 +126,30 @@ public function saveChild(
         $product = $this->productRepository->get($sku, true);
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
             throw new InputException(
-                __('Product with specified sku: "%1" is not a bundle product', [$product->getSku()])
+                __('The product with the "%1" SKU isn\'t a bundle product.', [$product->getSku()])
             );
         }
 
         /** @var \Magento\Catalog\Model\Product $linkProductModel */
         $linkProductModel = $this->productRepository->get($linkedProduct->getSku());
         if ($linkProductModel->isComposite()) {
-            throw new InputException(__('Bundle product could not contain another composite product'));
+            throw new InputException(__('The bundle product can\'t contain another composite product.'));
         }
 
         if (!$linkedProduct->getId()) {
-            throw new InputException(__('Id field of product link is required'));
+            throw new InputException(__('The product link needs an ID field entered. Enter and try again.'));
         }
 
         /** @var \Magento\Bundle\Model\Selection $selectionModel */
         $selectionModel = $this->bundleSelection->create();
         $selectionModel->load($linkedProduct->getId());
         if (!$selectionModel->getId()) {
-            throw new InputException(__('Can not find product link with id "%1"', [$linkedProduct->getId()]));
+            throw new InputException(
+                __(
+                    'The product link with the "%1" ID field wasn\'t found. Verify the ID and try again.',
+                    [$linkedProduct->getId()]
+                )
+            );
         }
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         $selectionModel = $this->mapProductLinkToSelectionModel(
@@ -218,7 +224,7 @@ public function addChild(
     ) {
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
             throw new InputException(
-                __('Product with specified sku: "%1" is not a bundle product', $product->getSku())
+                __('The product with the "%1" SKU isn\'t a bundle product.', $product->getSku())
             );
         }
 
@@ -246,7 +252,7 @@ public function addChild(
         /** @var \Magento\Catalog\Model\Product $linkProductModel */
         $linkProductModel = $this->productRepository->get($linkedProduct->getSku());
         if ($linkProductModel->isComposite()) {
-            throw new InputException(__('Bundle product could not contain another composite product'));
+            throw new InputException(__('The bundle product can\'t contain another composite product.'));
         }
 
         if ($selections) {
@@ -295,7 +301,7 @@ public function removeChild($sku, $optionId, $childSku)
         $product = $this->productRepository->get($sku, true);
 
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-            throw new InputException(__('Product with specified sku: %1 is not a bundle product', $sku));
+            throw new InputException(__('The product with the "%1" SKU isn\'t a bundle product.', $sku));
         }
 
         $excludeSelectionIds = [];
@@ -314,7 +320,7 @@ public function removeChild($sku, $optionId, $childSku)
         }
         if (empty($removeSelectionIds)) {
             throw new \Magento\Framework\Exception\NoSuchEntityException(
-                __('Requested bundle option product doesn\'t exist')
+                __("The bundle product doesn't exist. Review your request and try again.")
             );
         }
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
diff --git a/app/code/Magento/Bundle/Model/Option/SaveAction.php b/app/code/Magento/Bundle/Model/Option/SaveAction.php
new file mode 100644
index 0000000000000..00c5b05d532f5
--- /dev/null
+++ b/app/code/Magento/Bundle/Model/Option/SaveAction.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Option;
+
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Model\ResourceModel\Option;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Bundle\Api\ProductLinkManagementInterface;
+
+/**
+ * Encapsulates logic for saving a bundle option, including coalescing the parent product's data.
+ */
+class SaveAction
+{
+    /**
+     * @var Option
+     */
+    private $optionResource;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @var ProductLinkManagementInterface
+     */
+    private $linkManagement;
+
+    /**
+     * @param Option $optionResource
+     * @param MetadataPool $metadataPool
+     * @param Type $type
+     * @param ProductLinkManagementInterface $linkManagement
+     */
+    public function __construct(
+        Option $optionResource,
+        MetadataPool $metadataPool,
+        Type $type,
+        ProductLinkManagementInterface $linkManagement
+    ) {
+        $this->optionResource = $optionResource;
+        $this->metadataPool = $metadataPool;
+        $this->type = $type;
+        $this->linkManagement = $linkManagement;
+    }
+
+    /**
+     * Manage the logic of saving a bundle option, including the coalescence of its parent product data.
+     *
+     * @param ProductInterface $bundleProduct
+     * @param OptionInterface $option
+     * @return OptionInterface
+     * @throws CouldNotSaveException
+     * @throws \Exception
+     */
+    public function save(ProductInterface $bundleProduct, OptionInterface $option)
+    {
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+
+        $option->setStoreId($bundleProduct->getStoreId());
+        $parentId = $bundleProduct->getData($metadata->getLinkField());
+        $option->setParentId($parentId);
+
+        $optionId = $option->getOptionId();
+        $linksToAdd = [];
+        $optionCollection = $this->type->getOptionsCollection($bundleProduct);
+        $optionCollection->setIdFilter($option->getOptionId());
+        $optionCollection->setProductLinkFilter($parentId);
+
+        /** @var \Magento\Bundle\Model\Option $existingOption */
+        $existingOption = $optionCollection->getFirstItem();
+        if (!$optionId || $existingOption->getParentId() != $parentId) {
+            //If option ID is empty or existing option's parent ID is different
+            //we'd need a new ID for the option.
+            $option->setOptionId(null);
+            $option->setDefaultTitle($option->getTitle());
+            if (is_array($option->getProductLinks())) {
+                $linksToAdd = $option->getProductLinks();
+            }
+        } else {
+            if (!$existingOption->getOptionId()) {
+                throw new NoSuchEntityException(
+                    __("The option that was requested doesn't exist. Verify the entity and try again.")
+                );
+            }
+
+            $option->setData(array_merge($existingOption->getData(), $option->getData()));
+            $this->updateOptionSelection($bundleProduct, $option);
+        }
+
+        try {
+            $this->optionResource->save($option);
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__("The option couldn't be saved."), $e);
+        }
+
+        /** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($bundleProduct, $option->getOptionId(), $linkedProduct);
+        }
+
+        $bundleProduct->setIsRelationsChanged(true);
+
+        return $option;
+    }
+
+    /**
+     * Update option selections
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param \Magento\Bundle\Api\Data\OptionInterface $option
+     * @return void
+     */
+    private function updateOptionSelection(ProductInterface $product, OptionInterface $option)
+    {
+        $optionId = $option->getOptionId();
+        $existingLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
+        $linksToAdd = [];
+        $linksToUpdate = [];
+        $linksToDelete = [];
+        if (is_array($option->getProductLinks())) {
+            $productLinks = $option->getProductLinks();
+            foreach ($productLinks as $productLink) {
+                if (!$productLink->getId() && !$productLink->getSelectionId()) {
+                    $linksToAdd[] = $productLink;
+                } else {
+                    $linksToUpdate[] = $productLink;
+                }
+            }
+            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
+            $linksToDelete = $this->compareLinks($existingLinks, $linksToUpdate);
+        }
+        foreach ($linksToUpdate as $linkedProduct) {
+            $this->linkManagement->saveChild($product->getSku(), $linkedProduct);
+        }
+        foreach ($linksToDelete as $linkedProduct) {
+            $this->linkManagement->removeChild(
+                $product->getSku(),
+                $option->getOptionId(),
+                $linkedProduct->getSku()
+            );
+        }
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
+        }
+    }
+
+    /**
+     * Compute the difference between given arrays.
+     *
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $firstArray
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $secondArray
+     *
+     * @return array
+     */
+    private function compareLinks(array $firstArray, array $secondArray)
+    {
+        $result = [];
+
+        $firstArrayIds = [];
+        $firstArrayMap = [];
+
+        $secondArrayIds = [];
+
+        foreach ($firstArray as $item) {
+            $firstArrayIds[] = $item->getId();
+
+            $firstArrayMap[$item->getId()] = $item;
+        }
+
+        foreach ($secondArray as $item) {
+            $secondArrayIds[] = $item->getId();
+        }
+
+        foreach (array_diff($firstArrayIds, $secondArrayIds) as $id) {
+            $result[] = $firstArrayMap[$id];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Bundle/Model/Option/Validator.php b/app/code/Magento/Bundle/Model/Option/Validator.php
index 1a82e27114924..3eb574c1751f7 100644
--- a/app/code/Magento/Bundle/Model/Option/Validator.php
+++ b/app/code/Magento/Bundle/Model/Option/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Bundle\Model\Option;
 
 use Magento\Framework\Validator\NotEmpty;
@@ -51,7 +52,8 @@ protected function validateRequiredFields($value)
         ];
         foreach ($requiredFields as $requiredField => $requiredValue) {
             if (!$this->notEmpty->isValid(trim($requiredValue))) {
-                $messages[$requiredField] = __('%fieldName is a required field.', ['fieldName' => $requiredField]);
+                $messages[$requiredField] =
+                    __('"%fieldName" is required. Enter and try again.', ['fieldName' => $requiredField]);
             }
         }
         $this->_addMessages($messages);
diff --git a/app/code/Magento/Bundle/Model/OptionManagement.php b/app/code/Magento/Bundle/Model/OptionManagement.php
index dd20487b7f78f..3e8efcc7bbb7b 100644
--- a/app/code/Magento/Bundle/Model/OptionManagement.php
+++ b/app/code/Magento/Bundle/Model/OptionManagement.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Bundle\Model;
 
 use Magento\Framework\Exception\InputException;
@@ -39,7 +40,7 @@ public function save(\Magento\Bundle\Api\Data\OptionInterface $option)
     {
         $product = $this->productRepository->get($option->getSku(), true);
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-            throw new InputException(__('Only implemented for bundle product'));
+            throw new InputException(__('This is implemented for bundle products only.'));
         }
         return $this->optionRepository->save($product, $option);
     }
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index 9940344b5b61c..0b96ea8d5b789 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -4,16 +4,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Bundle\Model;
 
+use Magento\Bundle\Model\Option\SaveAction;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
+ * Repository for performing CRUD operations for a bundle product's options.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInterface
@@ -38,11 +39,6 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
      */
     protected $optionResource;
 
-    /**
-     * @var \Magento\Store\Model\StoreManager
-     */
-    protected $storeManager;
-
     /**
      * @var \Magento\Bundle\Api\ProductLinkManagementInterface
      */
@@ -53,57 +49,48 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
      */
     protected $productOptionList;
 
-    /**
-     * @var Product\LinksList
-     */
-    protected $linkList;
-
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
      */
     protected $dataObjectHelper;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var SaveAction
      */
-    private $metadataPool;
+    private $optionSave;
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param Product\Type $type
      * @param \Magento\Bundle\Api\Data\OptionInterfaceFactory $optionFactory
      * @param \Magento\Bundle\Model\ResourceModel\Option $optionResource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement
      * @param Product\OptionList $productOptionList
-     * @param Product\LinksList $linkList
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param SaveAction $optionSave
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Bundle\Model\Product\Type $type,
         \Magento\Bundle\Api\Data\OptionInterfaceFactory $optionFactory,
         \Magento\Bundle\Model\ResourceModel\Option $optionResource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement,
         \Magento\Bundle\Model\Product\OptionList $productOptionList,
-        \Magento\Bundle\Model\Product\LinksList $linkList,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        SaveAction $optionSave
     ) {
         $this->productRepository = $productRepository;
         $this->type = $type;
         $this->optionFactory = $optionFactory;
         $this->optionResource = $optionResource;
-        $this->storeManager = $storeManager;
         $this->linkManagement = $linkManagement;
         $this->productOptionList = $productOptionList;
-        $this->linkList = $linkList;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->optionSave = $optionSave;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($sku, $optionId)
     {
@@ -112,28 +99,31 @@ public function get($sku, $optionId)
         /** @var \Magento\Bundle\Model\Option $option */
         $option = $this->type->getOptionsCollection($product)->getItemById($optionId);
         if (!$option || !$option->getId()) {
-            throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
+            throw new NoSuchEntityException(
+                __("The option that was requested doesn't exist. Verify the entity and try again.")
+            );
         }
 
-        $productLinks = $this->linkList->getItems($product, $optionId);
+        $productLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
 
-        /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
+        /** @var \Magento\Bundle\Api\Data\OptionInterface $optionDataObject */
         $optionDataObject = $this->optionFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $optionDataObject,
             $option->getData(),
             \Magento\Bundle\Api\Data\OptionInterface::class
         );
-        $optionDataObject->setOptionId($option->getId())
-            ->setTitle($option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle())
-            ->setSku($product->getSku())
-            ->setProductLinks($productLinks);
+
+        $optionDataObject->setOptionId($option->getId());
+        $optionDataObject->setTitle($option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle());
+        $optionDataObject->setSku($product->getSku());
+        $optionDataObject->setProductLinks($productLinks);
 
         return $optionDataObject;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku)
     {
@@ -142,6 +132,8 @@ public function getList($sku)
     }
 
     /**
+     * Return list of product options
+     *
      * @param ProductInterface $product
      * @return \Magento\Bundle\Api\Data\OptionInterface[]
      */
@@ -151,7 +143,7 @@ public function getListByProduct(ProductInterface $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
     {
@@ -159,7 +151,7 @@ public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
             $this->optionResource->delete($option);
         } catch (\Exception $exception) {
             throw new \Magento\Framework\Exception\StateException(
-                __('Cannot delete option with id %1', $option->getOptionId()),
+                __('The option with "%1" ID can\'t be deleted.', $option->getOptionId()),
                 $exception
             );
         }
@@ -167,66 +159,30 @@ public function delete(\Magento\Bundle\Api\Data\OptionInterface $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($sku, $optionId)
     {
-        $product = $this->getProduct($sku);
-        $optionCollection = $this->type->getOptionsCollection($product);
-        $optionCollection->setIdFilter($optionId);
-        return $this->delete($optionCollection->getFirstItem());
+        /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
+        $option = $this->get($sku, $optionId);
+        $hasBeenDeleted = $this->delete($option);
+
+        return $hasBeenDeleted;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(
         \Magento\Catalog\Api\Data\ProductInterface $product,
         \Magento\Bundle\Api\Data\OptionInterface $option
     ) {
-        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-
-        $option->setStoreId($product->getStoreId());
-        $parentId = $product->getData($metadata->getLinkField());
-        $option->setParentId($parentId);
-
-        $optionId = $option->getOptionId();
-        $linksToAdd = [];
-        $optionCollection = $this->type->getOptionsCollection($product);
-        $optionCollection->setIdFilter($option->getOptionId());
-        $optionCollection->setProductLinkFilter($parentId);
-
-        /** @var \Magento\Bundle\Model\Option $existingOption */
-        $existingOption = $optionCollection->getFirstItem();
-        if (!$optionId) {
-            $option->setOptionId(null);
-        }
-        if (!$optionId || $existingOption->getParentId() != $parentId) {
-            $option->setDefaultTitle($option->getTitle());
-            if (is_array($option->getProductLinks())) {
-                $linksToAdd = $option->getProductLinks();
-            }
-        } else {
-            if (!$existingOption->getOptionId()) {
-                throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
-            }
+        $savedOption = $this->optionSave->save($product, $option);
 
-            $option->setData(array_merge($existingOption->getData(), $option->getData()));
-            $this->updateOptionSelection($product, $option);
-        }
+        $productToSave = $this->productRepository->get($product->getSku());
+        $this->productRepository->save($productToSave);
 
-        try {
-            $this->optionResource->save($option);
-        } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save option'), $e);
-        }
-
-        /** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
-        foreach ($linksToAdd as $linkedProduct) {
-            $this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
-        }
-        $product->setIsRelationsChanged(true);
-        return $option->getOptionId();
+        return $savedOption->getOptionId();
     }
 
     /**
@@ -235,6 +191,9 @@ public function save(
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
      * @return $this
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     protected function updateOptionSelection(
         \Magento\Catalog\Api\Data\ProductInterface $product,
@@ -274,15 +233,18 @@ protected function updateOptionSelection(
     }
 
     /**
+     * Retrieve product by SKU
+     *
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductInterface
-     * @throws \Magento\Framework\Exception\InputException
+     * @throws InputException
+     * @throws NoSuchEntityException
      */
     private function getProduct($sku)
     {
-        $product = $this->productRepository->get($sku, true);
+        $product = $this->productRepository->get($sku, true, null, true);
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-            throw new InputException(__('Only implemented for bundle product'));
+            throw new InputException(__('This is implemented for bundle products only.'));
         }
         return $product;
     }
@@ -320,16 +282,4 @@ private function compareLinks(array $firstArray, array $secondArray)
 
         return $result;
     }
-
-    /**
-     * Get MetadataPool instance
-     * @return MetadataPool
-     */
-    private function getMetadataPool()
-    {
-        if (!$this->metadataPool) {
-            $this->metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
-        }
-        return $this->metadataPool;
-    }
 }
diff --git a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
index f3c0548f76e5d..1914d5b5146c3 100644
--- a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
+++ b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php
@@ -29,8 +29,7 @@ public function aroundValidate(
             && $object->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
         ) {
             return true;
-        } else {
-            return $proceed($object);
         }
+        return $proceed($object);
     }
 }
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index de11df62cbb05..99e8188146bbb 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Bundle\Model\Product;
 
+use Magento\Bundle\Model\Option\SaveAction;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
 use Magento\Bundle\Api\ProductLinkManagementInterface;
@@ -32,69 +33,73 @@ class SaveHandler implements ExtensionInterface
      */
     private $metadataPool;
 
+    /**
+     * @var SaveAction
+     */
+    private $optionSave;
+
     /**
      * @param OptionRepository $optionRepository
      * @param ProductLinkManagementInterface $productLinkManagement
+     * @param SaveAction $optionSave
      * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         OptionRepository $optionRepository,
         ProductLinkManagementInterface $productLinkManagement,
+        SaveAction $optionSave,
         MetadataPool $metadataPool = null
     ) {
         $this->optionRepository = $optionRepository;
         $this->productLinkManagement = $productLinkManagement;
-
+        $this->optionSave = $optionSave;
         $this->metadataPool = $metadataPool
             ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
+     * Perform action on Bundle product relation/extension attribute
+     *
      * @param object $entity
      * @param array $arguments
-     * @return \Magento\Catalog\Api\Data\ProductInterface|object
+     *
+     * @return ProductInterface|object
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var \Magento\Bundle\Api\Data\OptionInterface[] $options */
-        $options = $entity->getExtensionAttributes()->getBundleProductOptions() ?: [];
-
-        if ($entity->getTypeId() !== 'bundle' || empty($options)) {
+        /** @var \Magento\Bundle\Api\Data\OptionInterface[] $bundleProductOptions */
+        $bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions() ?: [];
+        //Only processing bundle products.
+        if ($entity->getTypeId() !== Type::TYPE_CODE || empty($bundleProductOptions)) {
             return $entity;
         }
 
-        if (!$entity->getCopyFromView()) {
-            $updatedOptions = [];
-            $oldOptions = $this->optionRepository->getList($entity->getSku());
-
-            $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
-
-            $productId = $entity->getData($metadata->getLinkField());
-
-            foreach ($options as $option) {
-                $updatedOptions[$option->getOptionId()][$productId] = (bool)$option->getOptionId();
-            }
-
-            foreach ($oldOptions as $option) {
-                if (!isset($updatedOptions[$option->getOptionId()][$productId])) {
-                    $option->setParentId($productId);
-                    $this->removeOptionLinks($entity->getSku(), $option);
-                    $this->optionRepository->delete($option);
-                }
-            }
-        }
+        $existingBundleProductOptions = $this->optionRepository->getList($entity->getSku());
+        $existingOptionsIds = !empty($existingBundleProductOptions)
+            ? $this->getOptionIds($existingBundleProductOptions)
+            : [];
+        $optionIds = !empty($bundleProductOptions)
+            ? $this->getOptionIds($bundleProductOptions)
+            : [];
 
-        foreach ($options as $option) {
-            $this->optionRepository->save($entity, $option);
+        if (!$entity->getCopyFromView()) {
+            $this->processRemovedOptions($entity, $existingOptionsIds, $optionIds);
+            $newOptionsIds = array_diff($optionIds, $existingOptionsIds);
+            $this->saveOptions($entity, $bundleProductOptions, $newOptionsIds);
+        } else {
+            //save only labels and not selections + product links
+            $this->saveOptions($entity, $bundleProductOptions);
+            $entity->setCopyFromView(false);
         }
 
-        $entity->setCopyFromView(false);
-
         return $entity;
     }
 
     /**
+     * Remove option product links
+     *
      * @param string $entitySku
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
      * @return void
@@ -108,4 +113,65 @@ protected function removeOptionLinks($entitySku, $option)
             }
         }
     }
+
+    /**
+     * Perform save for all options entities.
+     *
+     * @param object $entity
+     * @param array $options
+     * @param array $newOptionsIds
+     * @return void
+     */
+    private function saveOptions($entity, array $options, array $newOptionsIds = []): void
+    {
+        foreach ($options as $option) {
+            if (in_array($option->getOptionId(), $newOptionsIds, true)) {
+                $option->setOptionId(null);
+            }
+
+            $this->optionSave->save($entity, $option);
+        }
+    }
+
+    /**
+     * Get options ids from array of the options entities.
+     *
+     * @param array $options
+     * @return array
+     */
+    private function getOptionIds(array $options): array
+    {
+        $optionIds = [];
+
+        if (!empty($options)) {
+            /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
+            foreach ($options as $option) {
+                if ($option->getOptionId()) {
+                    $optionIds[] = $option->getOptionId();
+                }
+            }
+        }
+
+        return $optionIds;
+    }
+
+    /**
+     * Removes old options that no longer exists.
+     *
+     * @param ProductInterface $entity
+     * @param array $existingOptionsIds
+     * @param array $optionIds
+     * @return void
+     */
+    private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds): void
+    {
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $parentId = $entity->getData($metadata->getLinkField());
+        foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
+            $option = $this->optionRepository->get($entity->getSku(), $optionId);
+            $option->setParentId($parentId);
+            $this->removeOptionLinks($entity->getSku(), $option);
+            $this->optionRepository->delete($option);
+        }
+    }
 }
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index b4071096992c1..641f4490874da 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -6,12 +6,13 @@
 
 namespace Magento\Bundle\Model\Product;
 
-use Magento\Framework\App\ObjectManager;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 
 /**
  * Bundle Type Model
@@ -307,8 +308,11 @@ public function getSku($product)
                 $selectionIds = $this->serializer->unserialize($customOption->getValue());
                 if (!empty($selectionIds)) {
                     $selections = $this->getSelectionsByIds($selectionIds, $product);
-                    foreach ($selections->getItems() as $selection) {
-                        $skuParts[] = $selection->getSku();
+                    foreach ($selectionIds as $selectionId) {
+                        $entity = $selections->getItemByColumnValue('selection_id', $selectionId);
+                        if (isset($entity) && $entity->getEntityId()) {
+                            $skuParts[] = $entity->getSku();
+                        }
                     }
                 }
             }
@@ -484,7 +488,9 @@ public function getSelectionsCollection($optionIds, $product)
             \Magento\Catalog\Api\Data\ProductInterface::class
         );
 
-        $selectionsCollection = $this->_bundleCollection->create()
+        /** @var Selections $selectionsCollection */
+        $selectionsCollection = $this->_bundleCollection->create();
+        $selectionsCollection
             ->addAttributeToSelect($this->_config->getProductAttributes())
             ->addAttributeToSelect('tax_class_id') //used for calculation item taxes in Bundle with Dynamic Price
             ->setFlag('product_children', true)
@@ -531,12 +537,12 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
 
         foreach ($selections as $selection) {
             if ($selection->getProductId() == $optionProduct->getId()) {
-                foreach ($options as &$option) {
-                    if ($option->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
+                foreach ($options as $quoteItemOption) {
+                    if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) {
                         if ($optionUpdateFlag) {
-                            $option->setValue(intval($option->getValue()));
+                            $quoteItemOption->setValue((int) $quoteItemOption->getValue());
                         } else {
-                            $option->setValue($value);
+                            $quoteItemOption->setValue($value);
                         }
                     }
                 }
@@ -556,7 +562,7 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option,
      */
     public function prepareQuoteItemQty($qty, $product)
     {
-        return intval($qty);
+        return (int) $qty;
     }
 
     /**
@@ -622,6 +628,7 @@ public function isSalable($product)
 
     /**
      * Prepare product and its configuration to be added to some products list.
+     *
      * Perform standard preparation process and then prepare of bundle selections options.
      *
      * @param \Magento\Framework\DataObject $buyRequest
@@ -706,7 +713,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
 
                 $selections = $this->mergeSelectionsWithOptions($options, $selections);
             }
-            if (count($selections) > 0 || !$isStrictProcessMode) {
+            if ((is_array($selections) && count($selections) > 0) || !$isStrictProcessMode) {
                 $uniqueKey = [$product->getId()];
                 $selectionIds = [];
                 $qtys = $buyRequest->getBundleOptionQty();
@@ -730,9 +737,9 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                      * for selection (not for all bundle)
                      */
                     $price = $product->getPriceModel()
-                        ->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
+                        ->getSelectionFinalTotalPrice($product, $selection, 0, 1);
                     $attributes = [
-                        'price' => $this->priceCurrency->convert($price),
+                        'price' => $price,
                         'qty' => $qty,
                         'option_label' => $selection->getOption()
                             ->getTitle(),
@@ -787,6 +794,8 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
     }
 
     /**
+     * Cast array values to int
+     *
      * @param array $array
      * @return int[]|int[][]
      */
@@ -806,17 +815,19 @@ private function recursiveIntval(array $array)
     }
 
     /**
+     * Convert multi dimensional array to flat
+     *
      * @param array $array
      * @return int[]
      */
     private function multiToFlatArray(array $array)
     {
         $flatArray = [];
-        foreach ($array as $key => $value) {
+        foreach ($array as $value) {
             if (is_array($value)) {
                 $flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
             } else {
-                $flatArray[$key] = $value;
+                $flatArray[] = $value;
             }
         }
 
@@ -853,8 +864,9 @@ public function getSelectionsByIds($selectionIds, $product)
 
         if (!$usedSelections || $usedSelectionsIds !== $selectionIds) {
             $storeId = $product->getStoreId();
-            $usedSelections = $this->_bundleCollection
-                ->create()
+            /** @var Selections $usedSelections */
+            $usedSelections = $this->_bundleCollection->create();
+            $usedSelections
                 ->addAttributeToSelect('*')
                 ->setFlag('product_children', true)
                 ->addStoreFilter($this->getStoreFilter($product))
@@ -916,8 +928,7 @@ public function getOptionsByIds($optionIds, $product)
     }
 
     /**
-     * Prepare additional options/information for order item which will be
-     * created from this product
+     * Prepare additional options/information for order item which will be created from this product
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
@@ -983,6 +994,7 @@ public function getOrderOptions($product)
 
     /**
      * Sort selections method for usort function
+     *
      * Sort selections by option position, selection position and selection id
      *
      * @param  \Magento\Catalog\Model\Product $firstItem
@@ -1005,11 +1017,8 @@ public function shakeSelections($firstItem, $secondItem)
             $secondItem->getPosition(),
             $secondItem->getSelectionId(),
         ];
-        if ($aPosition == $bPosition) {
-            return 0;
-        } else {
-            return $aPosition < $bPosition ? -1 : 1;
-        }
+
+        return $aPosition <=> $bPosition;
     }
 
     /**
@@ -1047,6 +1056,7 @@ public function getForceChildItemQtyChanges($product)
 
     /**
      * Retrieve additional searchable data from type instance
+     *
      * Using based on product id and store_id data
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -1115,6 +1125,7 @@ public function checkProductBuyState($product)
 
     /**
      * Retrieve products divided into groups required to purchase
+     *
      * At least one product in each group has to be purchased
      *
      * @param  \Magento\Catalog\Model\Product $product
@@ -1211,6 +1222,8 @@ public function getIdentities(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * Returns selection qty
+     *
      * @param \Magento\Framework\DataObject $selection
      * @param int[] $qtys
      * @param int $selectionOptionId
@@ -1229,6 +1242,8 @@ protected function getQty($selection, $qtys, $selectionOptionId)
     }
 
     /**
+     * Returns qty
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param \Magento\Framework\DataObject $selection
      * @return float|int
@@ -1246,6 +1261,8 @@ protected function getBeforeQty($product, $selection)
     }
 
     /**
+     * Validate required options
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param bool $isStrictProcessMode
      * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
@@ -1267,6 +1284,8 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
     }
 
     /**
+     * Check if selection is salable
+     *
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selections
      * @param bool $skipSaleableCheck
      * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
@@ -1297,6 +1316,8 @@ protected function checkSelectionsIsSale($selections, $skipSaleableCheck, $optio
     }
 
     /**
+     * Validate result
+     *
      * @param array $_result
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -1315,6 +1336,8 @@ protected function checkIsResult($_result)
     }
 
     /**
+     * Merge selections with options
+     *
      * @param \Magento\Catalog\Model\Product\Option[] $options
      * @param \Magento\Framework\DataObject[] $selections
      * @return \Magento\Framework\DataObject[]
@@ -1322,8 +1345,9 @@ protected function checkIsResult($_result)
     protected function mergeSelectionsWithOptions($options, $selections)
     {
         foreach ($options as $option) {
-            if ($option->getRequired() && count($option->getSelections()) == 1) {
-                $selections = array_merge($selections, $option->getSelections());
+            $optionSelections = $option->getSelections();
+            if ($option->getRequired() && is_array($optionSelections) && count($optionSelections) == 1) {
+                $selections = array_merge($selections, $optionSelections);
             } else {
                 $selections = [];
                 break;
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
index 401374db86fef..b5dfd312cd0c4 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
@@ -6,20 +6,171 @@
 namespace Magento\Bundle\Model\ResourceModel\Indexer;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\JoinAttributeProcessor;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Bundle products Price indexer resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
+class Price implements DimensionalIndexerInterface
 {
     /**
-     * @inheritdoc
+     * @var IndexTableStructureFactory
      */
-    protected function reindex($entityIds = null)
+    private $indexTableStructureFactory;
+
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var bool
+     */
+    private $fullReindexAction;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * Mapping between dimensions and field in database
+     *
+     * @var array
+     */
+    private $dimensionToFieldMapper = [
+        WebsiteDimensionProvider::DIMENSION_NAME => 'pw.website_id',
+        CustomerGroupDimensionProvider::DIMENSION_NAME => 'cg.customer_group_id',
+    ];
+
+    /**
+     * @var BasePriceModifier
+     */
+    private $basePriceModifier;
+
+    /**
+     * @var JoinAttributeProcessor
+     */
+    private $joinAttributeProcessor;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * @var \Magento\Framework\Module\Manager
+     */
+    private $moduleManager;
+
+    /**
+     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param TableMaintainer $tableMaintainer
+     * @param MetadataPool $metadataPool
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param BasePriceModifier $basePriceModifier
+     * @param JoinAttributeProcessor $joinAttributeProcessor
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param bool $fullReindexAction
+     * @param string $connectionName
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        IndexTableStructureFactory $indexTableStructureFactory,
+        TableMaintainer $tableMaintainer,
+        MetadataPool $metadataPool,
+        \Magento\Framework\App\ResourceConnection $resource,
+        BasePriceModifier $basePriceModifier,
+        JoinAttributeProcessor $joinAttributeProcessor,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Framework\Module\Manager $moduleManager,
+        $fullReindexAction = false,
+        $connectionName = 'indexer'
+    ) {
+        $this->indexTableStructureFactory = $indexTableStructureFactory;
+        $this->tableMaintainer = $tableMaintainer;
+        $this->connectionName = $connectionName;
+        $this->metadataPool = $metadataPool;
+        $this->resource = $resource;
+        $this->fullReindexAction = $fullReindexAction;
+        $this->basePriceModifier = $basePriceModifier;
+        $this->joinAttributeProcessor = $joinAttributeProcessor;
+        $this->eventManager = $eventManager;
+        $this->moduleManager = $moduleManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @param array $dimensions
+     * @param \Traversable $entityIds
+     * @throws \Exception
+     */
+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
     {
-        $this->_prepareBundlePrice($entityIds);
+        $this->tableMaintainer->createMainTmpTable($dimensions);
+
+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+            'entityField' => 'entity_id',
+            'customerGroupField' => 'customer_group_id',
+            'websiteField' => 'website_id',
+            'taxClassField' => 'tax_class_id',
+            'originalPriceField' => 'price',
+            'finalPriceField' => 'final_price',
+            'minPriceField' => 'min_price',
+            'maxPriceField' => 'max_price',
+            'tierPriceField' => 'tier_price',
+        ]);
+
+        $entityIds = iterator_to_array($entityIds);
+
+        $this->prepareTierPriceIndex($dimensions, $entityIds);
+
+        $this->prepareBundlePriceTable();
+
+        $this->prepareBundlePriceByType(
+            \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED,
+            $dimensions,
+            $entityIds
+        );
+
+        $this->prepareBundlePriceByType(
+            \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC,
+            $dimensions,
+            $entityIds
+        );
+
+        $this->calculateBundleOptionPrice($temporaryPriceTable, $dimensions);
+
+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, $entityIds);
     }
 
     /**
@@ -27,9 +178,9 @@ protected function reindex($entityIds = null)
      *
      * @return string
      */
-    protected function _getBundlePriceTable()
+    private function getBundlePriceTable()
     {
-        return $this->tableStrategy->getTableName('catalog_product_index_price_bundle');
+        return $this->getTable('catalog_product_index_price_bundle_tmp');
     }
 
     /**
@@ -37,9 +188,9 @@ protected function _getBundlePriceTable()
      *
      * @return string
      */
-    protected function _getBundleSelectionTable()
+    private function getBundleSelectionTable()
     {
-        return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_sel');
+        return $this->getTable('catalog_product_index_price_bundle_sel_tmp');
     }
 
     /**
@@ -47,9 +198,9 @@ protected function _getBundleSelectionTable()
      *
      * @return string
      */
-    protected function _getBundleOptionTable()
+    private function getBundleOptionTable()
     {
-        return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_opt');
+        return $this->getTable('catalog_product_index_price_bundle_opt_tmp');
     }
 
     /**
@@ -57,9 +208,9 @@ protected function _getBundleOptionTable()
      *
      * @return $this
      */
-    protected function _prepareBundlePriceTable()
+    private function prepareBundlePriceTable()
     {
-        $this->getConnection()->delete($this->_getBundlePriceTable());
+        $this->getConnection()->delete($this->getBundlePriceTable());
         return $this;
     }
 
@@ -68,9 +219,9 @@ protected function _prepareBundlePriceTable()
      *
      * @return $this
      */
-    protected function _prepareBundleSelectionTable()
+    private function prepareBundleSelectionTable()
     {
-        $this->getConnection()->delete($this->_getBundleSelectionTable());
+        $this->getConnection()->delete($this->getBundleSelectionTable());
         return $this;
     }
 
@@ -79,9 +230,9 @@ protected function _prepareBundleSelectionTable()
      *
      * @return $this
      */
-    protected function _prepareBundleOptionTable()
+    private function prepareBundleOptionTable()
     {
-        $this->getConnection()->delete($this->_getBundleOptionTable());
+        $this->getConnection()->delete($this->getBundleOptionTable());
         return $this;
     }
 
@@ -89,51 +240,58 @@ protected function _prepareBundleOptionTable()
      * Prepare temporary price index data for bundle products by price type
      *
      * @param int $priceType
+     * @param array $dimensions
      * @param int|array $entityIds the entity ids limitation
-     * @return $this
+     * @return void
+     * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function _prepareBundlePriceByType($priceType, $entityIds = null)
+    private function prepareBundlePriceByType($priceType, array $dimensions, $entityIds = null)
     {
         $connection = $this->getConnection();
-        $table = $this->_getBundlePriceTable();
-
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],
             ['entity_id']
-        )->join(
+        )->joinInner(
             ['cg' => $this->getTable('customer_group')],
-            '',
+            array_key_exists(CustomerGroupDimensionProvider::DIMENSION_NAME, $dimensions)
+                ? sprintf(
+                    '%s = %s',
+                    $this->dimensionToFieldMapper[CustomerGroupDimensionProvider::DIMENSION_NAME],
+                    $dimensions[CustomerGroupDimensionProvider::DIMENSION_NAME]->getValue()
+                ) : '',
             ['customer_group_id']
-        );
-        $this->_addWebsiteJoinToSelect($select, true);
-        $this->_addProductWebsiteJoinToSelect($select, 'cw.website_id', "e.entity_id");
-        $select->columns(
-            'website_id',
-            'cw'
-        )->join(
-            ['cwd' => $this->_getWebsiteDateTable()],
-            'cw.website_id = cwd.website_id',
+        )->joinInner(
+            ['pw' => $this->getTable('catalog_product_website')],
+            'pw.product_id = e.entity_id',
+            ['pw.website_id']
+        )->joinInner(
+            ['cwd' => $this->getTable('catalog_product_index_website')],
+            'pw.website_id = cwd.website_id',
             []
-        )->joinLeft(
-            ['tp' => $this->_getTierPriceIndexTable()],
-            'tp.entity_id = e.entity_id AND tp.website_id = cw.website_id' .
+        );
+        $select->joinLeft(
+            ['tp' => $this->getTable('catalog_product_index_tier_price')],
+            'tp.entity_id = e.entity_id AND tp.website_id = pw.website_id' .
             ' AND tp.customer_group_id = cg.customer_group_id',
             []
         )->where(
             'e.type_id=?',
-            $this->getTypeId()
+            \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
         );
 
-        // add enable products limitation
-        $statusCond = $connection->quoteInto(
-            '=?',
-            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
-        );
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-        $this->_addAttributeToSelect($select, 'status', "e.$linkField", 'cs.store_id', $statusCond, true);
+        foreach ($dimensions as $dimension) {
+            if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
+                throw new \LogicException(
+                    'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
+                );
+            }
+            $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
+        }
+
+        $this->joinAttributeProcessor->process($select, 'status', Status::STATUS_ENABLED);
         if ($this->moduleManager->isEnabled('Magento_Tax')) {
-            $taxClassId = $this->_addAttributeToSelect($select, 'tax_class_id', "e.$linkField", 'cs.store_id');
+            $taxClassId = $this->joinAttributeProcessor->process($select, 'tax_class_id');
         } else {
             $taxClassId = new \Zend_Db_Expr('0');
         }
@@ -146,59 +304,49 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
             );
         }
 
-        $priceTypeCond = $connection->quoteInto('=?', $priceType);
-        $this->_addAttributeToSelect($select, 'price_type', "e.$linkField", 'cs.store_id', $priceTypeCond);
-
-        $price = $this->_addAttributeToSelect($select, 'price', "e.$linkField", 'cs.store_id');
-        $specialPrice = $this->_addAttributeToSelect($select, 'special_price', "e.$linkField", 'cs.store_id');
-        $specialFrom = $this->_addAttributeToSelect($select, 'special_from_date', "e.$linkField", 'cs.store_id');
-        $specialTo = $this->_addAttributeToSelect($select, 'special_to_date', "e.$linkField", 'cs.store_id');
-        $curentDate = new \Zend_Db_Expr('cwd.website_date');
-
-        $specialExpr = $connection->getCheckSql(
-            $connection->getCheckSql(
-                $specialFrom . ' IS NULL',
-                '1',
-                $connection->getCheckSql($specialFrom . ' <= ' . $curentDate, '1', '0')
-            ) . " > 0 AND " . $connection->getCheckSql(
-                $specialTo . ' IS NULL',
-                '1',
-                $connection->getCheckSql($specialTo . ' >= ' . $curentDate, '1', '0')
-            ) . " > 0 AND {$specialPrice} > 0 AND {$specialPrice} < 100 ",
-            $specialPrice,
-            '0'
-        );
+        $this->joinAttributeProcessor->process($select, 'price_type', $priceType);
+
+        $price = $this->joinAttributeProcessor->process($select, 'price');
+        $specialPrice = $this->joinAttributeProcessor->process($select, 'special_price');
+        $specialFrom = $this->joinAttributeProcessor->process($select, 'special_from_date');
+        $specialTo = $this->joinAttributeProcessor->process($select, 'special_to_date');
+        $currentDate = new \Zend_Db_Expr('cwd.website_date');
 
-        $tierExpr = new \Zend_Db_Expr("tp.min_price");
+        $specialFromDate = $connection->getDatePartSql($specialFrom);
+        $specialToDate = $connection->getDatePartSql($specialTo);
+        $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
+        $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
+        $specialExpr = "{$specialPrice} IS NOT NULL AND {$specialPrice} > 0 AND {$specialPrice} < 100"
+            . " AND {$specialFromExpr} AND {$specialToExpr}";
+        $tierExpr = new \Zend_Db_Expr('tp.min_price');
 
         if ($priceType == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED) {
-            $finalPrice = $connection->getCheckSql(
-                $specialExpr . ' > 0',
-                'ROUND(' . $price . ' * (' . $specialExpr . '  / 100), 4)',
-                $price
+            $specialPriceExpr = $connection->getCheckSql(
+                $specialExpr,
+                'ROUND(' . $price . ' * (' . $specialPrice . '  / 100), 4)',
+                'NULL'
             );
             $tierPrice = $connection->getCheckSql(
                 $tierExpr . ' IS NOT NULL',
-                'ROUND(' . $price . ' - ' . '(' . $price . ' * (' . $tierExpr . ' / 100)), 4)',
+                'ROUND((1 - ' . $tierExpr . ' / 100) * ' . $price . ', 4)',
                 'NULL'
             );
-
-            $finalPrice = $connection->getCheckSql(
-                "{$tierPrice} < {$finalPrice}",
-                $tierPrice,
-                $finalPrice
-            );
+            $finalPrice = $connection->getLeastSql([
+                $price,
+                $connection->getIfNullSql($specialPriceExpr, $price),
+                $connection->getIfNullSql($tierPrice, $price),
+            ]);
         } else {
-            $finalPrice = new \Zend_Db_Expr("0");
+            $finalPrice = new \Zend_Db_Expr('0');
             $tierPrice = $connection->getCheckSql($tierExpr . ' IS NOT NULL', '0', 'NULL');
         }
 
         $select->columns(
             [
                 'price_type' => new \Zend_Db_Expr($priceType),
-                'special_price' => $specialExpr,
+                'special_price' => $connection->getCheckSql($specialExpr, $specialPrice, '0'),
                 'tier_percent' => $tierExpr,
-                'orig_price' => $connection->getCheckSql($price . ' IS NULL', '0', $price),
+                'orig_price' => $connection->getIfNullSql($price, '0'),
                 'price' => $finalPrice,
                 'min_price' => $finalPrice,
                 'max_price' => $finalPrice,
@@ -214,107 +362,75 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
         /**
          * Add additional external limitation
          */
-        $this->_eventManager->dispatch(
+        $this->eventManager->dispatch(
             'catalog_product_prepare_index_select',
             [
                 'select' => $select,
                 'entity_field' => new \Zend_Db_Expr('e.entity_id'),
-                'website_field' => new \Zend_Db_Expr('cw.website_id'),
-                'store_field' => new \Zend_Db_Expr('cs.store_id')
+                'website_field' => new \Zend_Db_Expr('pw.website_id'),
+                'store_field' => new \Zend_Db_Expr('cwd.default_store_id')
             ]
         );
 
-        $query = $select->insertFromSelect($table);
+        $query = $select->insertFromSelect($this->getBundlePriceTable());
         $connection->query($query);
-
-        return $this;
     }
 
     /**
      * Calculate fixed bundle product selections price
      *
-     * @return $this
+     * @param IndexTableStructure $priceTable
+     * @param array $dimensions
+     *
+     * @return void
+     * @throws \Exception
      */
-    protected function _calculateBundleOptionPrice()
+    private function calculateBundleOptionPrice($priceTable, $dimensions)
     {
         $connection = $this->getConnection();
 
-        $this->_prepareBundleSelectionTable();
-        $this->_calculateBundleSelectionPrice(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
-        $this->_calculateBundleSelectionPrice(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
+        $this->prepareBundleSelectionTable();
+        $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
+        $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
 
-        $this->_prepareBundleOptionTable();
+        $this->prepareBundleOptionTable();
 
         $select = $connection->select()->from(
-            ['i' => $this->_getBundleSelectionTable()],
+            $this->getBundleSelectionTable(),
             ['entity_id', 'customer_group_id', 'website_id', 'option_id']
         )->group(
-            ['entity_id', 'customer_group_id', 'website_id', 'option_id', 'is_required', 'group_type']
-        )->columns(
-            [
-                'min_price' => $connection->getCheckSql('i.is_required = 1', 'MIN(i.price)', '0'),
-                'alt_price' => $connection->getCheckSql('i.is_required = 0', 'MIN(i.price)', '0'),
-                'max_price' => $connection->getCheckSql('i.group_type = 1', 'SUM(i.price)', 'MAX(i.price)'),
-                'tier_price' => $connection->getCheckSql('i.is_required = 1', 'MIN(i.tier_price)', '0'),
-                'alt_tier_price' => $connection->getCheckSql('i.is_required = 0', 'MIN(i.tier_price)', '0'),
-            ]
-        );
-
-        $query = $select->insertFromSelect($this->_getBundleOptionTable());
-        $connection->query($query);
-
-        $this->_prepareDefaultFinalPriceTable();
-
-        $minPrice = new \Zend_Db_Expr(
-            $connection->getCheckSql('SUM(io.min_price) = 0', 'MIN(io.alt_price)', 'SUM(io.min_price)') . ' + i.price'
-        );
-        $maxPrice = new \Zend_Db_Expr("SUM(io.max_price) + i.price");
-        $tierPrice = $connection->getCheckSql(
-            'MIN(i.tier_percent) IS NOT NULL',
-            $connection->getCheckSql(
-                'SUM(io.tier_price) = 0',
-                'SUM(io.alt_tier_price)',
-                'SUM(io.tier_price)'
-            ) . ' + MIN(i.tier_price)',
-            'NULL'
+            ['entity_id', 'customer_group_id', 'website_id', 'option_id']
         );
-
-        $select = $connection->select()->from(
-            ['io' => $this->_getBundleOptionTable()],
-            ['entity_id', 'customer_group_id', 'website_id']
-        )->join(
-            ['i' => $this->_getBundlePriceTable()],
-            'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
-            ' AND i.website_id = io.website_id',
-            []
-        )->group(
-            ['io.entity_id', 'io.customer_group_id', 'io.website_id', 'i.tax_class_id', 'i.orig_price', 'i.price']
-        )->columns(
+        $minPrice = $connection->getCheckSql('is_required = 1', 'price', 'NULL');
+        $tierPrice = $connection->getCheckSql('is_required = 1', 'tier_price', 'NULL');
+        $select->columns(
             [
-                'i.tax_class_id',
-                'orig_price' => 'i.orig_price',
-                'price' => 'i.price',
-                'min_price' => $minPrice,
-                'max_price' => $maxPrice,
-                'tier_price' => $tierPrice,
-                'base_tier' => 'MIN(i.base_tier)',
+                'min_price' => new \Zend_Db_Expr('MIN(' . $minPrice . ')'),
+                'alt_price' => new \Zend_Db_Expr('MIN(price)'),
+                'max_price' => $connection->getCheckSql('group_type = 0', 'MAX(price)', 'SUM(price)'),
+                'tier_price' => new \Zend_Db_Expr('MIN(' . $tierPrice . ')'),
+                'alt_tier_price' => new \Zend_Db_Expr('MIN(tier_price)'),
             ]
         );
 
-        $query = $select->insertFromSelect($this->_getDefaultFinalPriceTable());
+        $query = $select->insertFromSelect($this->getBundleOptionTable());
         $connection->query($query);
 
-        return $this;
+        $this->getConnection()->delete($priceTable->getTableName());
+        $this->applyBundlePrice($priceTable);
+        $this->applyBundleOptionPrice($priceTable);
     }
 
     /**
      * Calculate bundle product selections price by product type
      *
+     * @param array $dimensions
      * @param int $priceType
-     * @return $this
+     * @return void
+     * @throws \Exception
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function _calculateBundleSelectionPrice($priceType)
+    private function calculateBundleSelectionPrice($dimensions, $priceType)
     {
         $connection = $this->getConnection();
 
@@ -348,38 +464,39 @@ protected function _calculateBundleSelectionPrice($priceType)
                     'ROUND(i.base_tier - (i.base_tier * (' . $selectionPriceValue . ' / 100)),4)',
                     $connection->getCheckSql(
                         'i.tier_percent > 0',
-                        'ROUND(' .
-                        $selectionPriceValue .
-                        ' - (' .
-                        $selectionPriceValue .
-                        ' * (i.tier_percent / 100)),4)',
+                        'ROUND((1 - i.tier_percent / 100) * ' . $selectionPriceValue . ',4)',
                         $selectionPriceValue
                     )
                 ) . ' * bs.selection_qty',
                 'NULL'
             );
 
-            $priceExpr = new \Zend_Db_Expr(
-                $connection->getCheckSql("{$tierExpr} < {$priceExpr}", $tierExpr, $priceExpr)
-            );
+            $priceExpr = $connection->getLeastSql([
+                $priceExpr,
+                $connection->getIfNullSql($tierExpr, $priceExpr),
+            ]);
         } else {
-            $priceExpr = new \Zend_Db_Expr(
-                $connection->getCheckSql(
-                    'i.special_price > 0 AND i.special_price < 100',
-                    'ROUND(idx.min_price * (i.special_price / 100), 4)',
-                    'idx.min_price'
-                ) . ' * bs.selection_qty'
+            $price = 'idx.min_price * bs.selection_qty';
+            $specialExpr = $connection->getCheckSql(
+                'i.special_price > 0 AND i.special_price < 100',
+                'ROUND(' . $price . ' * (i.special_price / 100), 4)',
+                $price
             );
             $tierExpr = $connection->getCheckSql(
-                'i.base_tier IS NOT NULL',
-                'ROUND(idx.min_price * (i.base_tier / 100), 4)* bs.selection_qty',
+                'i.tier_percent IS NOT NULL',
+                'ROUND((1 - i.tier_percent / 100) * ' . $price . ', 4)',
                 'NULL'
             );
+            $priceExpr = $connection->getLeastSql([
+                $specialExpr,
+                $connection->getIfNullSql($tierExpr, $price),
+            ]);
         }
 
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
         $select = $connection->select()->from(
-            ['i' => $this->_getBundlePriceTable()],
+            ['i' => $this->getBundlePriceTable()],
             ['entity_id', 'customer_group_id', 'website_id']
         )->join(
             ['parent_product' => $this->getTable('catalog_product_entity')],
@@ -398,7 +515,7 @@ protected function _calculateBundleSelectionPrice($priceType)
             'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
             ['']
         )->join(
-            ['idx' => $this->getIdxTable()],
+            ['idx' => $this->getMainTable($dimensions)],
             'bs.product_id = idx.entity_id AND i.customer_group_id = idx.customer_group_id' .
             ' AND i.website_id = idx.website_id',
             []
@@ -418,49 +535,26 @@ protected function _calculateBundleSelectionPrice($priceType)
             ]
         );
 
-        $query = $select->insertFromSelect($this->_getBundleSelectionTable());
+        $query = $select->insertFromSelect($this->getBundleSelectionTable());
         $connection->query($query);
-
-        return $this;
-    }
-
-    /**
-     * Prepare temporary index price for bundle products
-     *
-     * @param int|array $entityIds  the entity ids limitation
-     * @return $this
-     */
-    protected function _prepareBundlePrice($entityIds = null)
-    {
-        if (!$this->hasEntity() && empty($entityIds)) {
-            return $this;
-        }
-        $this->_prepareTierPriceIndex($entityIds);
-        $this->_prepareBundlePriceTable();
-        $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED, $entityIds);
-        $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC, $entityIds);
-
-        $this->_calculateBundleOptionPrice();
-        $this->_applyCustomOption();
-
-        $this->_movePriceDataToIndexTable();
-
-        return $this;
     }
 
     /**
      * Prepare percentage tier price for bundle products
      *
-     * @param int|array $entityIds
-     * @return $this
+     * @param array $dimensions
+     * @param array $entityIds
+     * @return void
+     * @throws \Exception
      */
-    protected function _prepareTierPriceIndex($entityIds = null)
+    private function prepareTierPriceIndex($dimensions, $entityIds)
     {
         $connection = $this->getConnection();
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
         // remove index by bundle products
         $select = $connection->select()->from(
-            ['i' => $this->_getTierPriceIndexTable()],
+            ['i' => $this->getTable('catalog_product_index_tier_price')],
             null
         )->join(
             ['e' => $this->getTable('catalog_product_entity')],
@@ -468,7 +562,7 @@ protected function _prepareTierPriceIndex($entityIds = null)
             []
         )->where(
             'e.type_id=?',
-            $this->getTypeId()
+            \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
         );
         $query = $select->deleteFromSelect('i');
         $connection->query($query);
@@ -485,27 +579,146 @@ protected function _prepareTierPriceIndex($entityIds = null)
             'tp.all_groups = 1 OR (tp.all_groups = 0 AND tp.customer_group_id = cg.customer_group_id)',
             ['customer_group_id']
         )->join(
-            ['cw' => $this->getTable('store_website')],
-            'tp.website_id = 0 OR tp.website_id = cw.website_id',
+            ['pw' => $this->getTable('store_website')],
+            'tp.website_id = 0 OR tp.website_id = pw.website_id',
             ['website_id']
         )->where(
-            'cw.website_id != 0'
+            'pw.website_id != 0'
         )->where(
             'e.type_id=?',
-            $this->getTypeId()
+            \Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice::PRODUCT_TYPE
         )->columns(
             new \Zend_Db_Expr('MIN(tp.value)')
         )->group(
-            ['e.entity_id', 'cg.customer_group_id', 'cw.website_id']
+            ['e.entity_id', 'cg.customer_group_id', 'pw.website_id']
         );
 
         if (!empty($entityIds)) {
             $select->where('e.entity_id IN(?)', $entityIds);
         }
+        foreach ($dimensions as $dimension) {
+            if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
+                throw new \LogicException(
+                    'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
+                );
+            }
+            $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
+        }
 
-        $query = $select->insertFromSelect($this->_getTierPriceIndexTable());
+        $query = $select->insertFromSelect($this->getTable('catalog_product_index_tier_price'));
         $connection->query($query);
+    }
 
-        return $this;
+    /**
+     * Create bundle price.
+     *
+     * @param IndexTableStructure $priceTable
+     * @return  void
+     */
+    private function applyBundlePrice($priceTable): void
+    {
+        $select = $this->getConnection()->select();
+        $select->from(
+            $this->getBundlePriceTable(),
+            [
+                'entity_id',
+                'customer_group_id',
+                'website_id',
+                'tax_class_id',
+                'orig_price',
+                'price',
+                'min_price',
+                'max_price',
+                'tier_price',
+            ]
+        );
+
+        $query = $select->insertFromSelect($priceTable->getTableName());
+        $this->getConnection()->query($query);
+    }
+
+    /**
+     * Make insert/update bundle option price.
+     *
+     * @return void
+     * @param IndexTableStructure $priceTable
+     */
+    private function applyBundleOptionPrice($priceTable): void
+    {
+        $connection = $this->getConnection();
+
+        $subSelect = $connection->select()->from(
+            $this->getBundleOptionTable(),
+            [
+                'entity_id',
+                'customer_group_id',
+                'website_id',
+                'min_price' => new \Zend_Db_Expr('SUM(min_price)'),
+                'alt_price' => new \Zend_Db_Expr('MIN(alt_price)'),
+                'max_price' => new \Zend_Db_Expr('SUM(max_price)'),
+                'tier_price' => new \Zend_Db_Expr('SUM(tier_price)'),
+                'alt_tier_price' => new \Zend_Db_Expr('MIN(alt_tier_price)'),
+            ]
+        )->group(
+            ['entity_id', 'customer_group_id', 'website_id']
+        );
+
+        $minPrice = 'i.min_price + ' . $connection->getIfNullSql('io.min_price', '0');
+        $tierPrice = 'i.tier_price + ' . $connection->getIfNullSql('io.tier_price', '0');
+        $select = $connection->select()->join(
+            ['io' => $subSelect],
+            'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
+                ' AND i.website_id = io.website_id',
+            []
+        )->columns(
+            [
+                'min_price' => $connection->getCheckSql("{$minPrice} = 0", 'io.alt_price', $minPrice),
+                'max_price' => new \Zend_Db_Expr('io.max_price + i.max_price'),
+                'tier_price' => $connection->getCheckSql("{$tierPrice} = 0", 'io.alt_tier_price', $tierPrice),
+            ]
+        );
+
+        $query = $select->crossUpdateFromSelect(['i' => $priceTable->getTableName()]);
+        $connection->query($query);
+    }
+
+    /**
+     * Get main table
+     *
+     * @param array $dimensions
+     * @return string
+     */
+    private function getMainTable($dimensions)
+    {
+        if ($this->fullReindexAction) {
+            return $this->tableMaintainer->getMainReplicaTable($dimensions);
+        }
+        return $this->tableMaintainer->getMainTable($dimensions);
+    }
+
+    /**
+     * Get connection
+     *
+     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @throws \DomainException
+     */
+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+    {
+        if ($this->connection === null) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Get table
+     *
+     * @param string $tableName
+     * @return string
+     */
+    private function getTable($tableName)
+    {
+        return $this->resource->getTableName($tableName, $this->connectionName);
     }
 }
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option.php b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
index 2ad7e57f522d6..7babd0b349f02 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Option.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
@@ -99,12 +99,10 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
         $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData());
 
         /**
-         * also saving default value if this store view scope
+         * also saving default fallback value
          */
-
-        if ($object->getStoreId()) {
-            $data->setStoreId(0);
-            $data->setTitle($object->getDefaultTitle());
+        if (0 !== (int)$object->getStoreId()) {
+            $data->setStoreId(0)->setTitle($object->getDefaultTitle());
             $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData());
         }
 
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 0216812199b50..5b88288ff72ca 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Bundle\Model\ResourceModel\Selection;
 
-use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Select;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\Framework\App\ObjectManager;
 
@@ -45,6 +43,95 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $websiteScopePriceJoined = false;
 
+    /**
+     * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\Item
+     */
+    private $stockItem;
+
+    /**
+     * Collection constructor.
+     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
+     * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Url $catalogUrl
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\Stdlib\DateTime $dateTime
+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
+     * @param ProductLimitationFactory|null $productLimitationFactory
+     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
+     * @param \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer|null $tableMaintainer
+     * @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item|null $stockItem
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Eav\Model\EntityFactory $eavEntityFactory,
+        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
+        \Magento\Framework\Validator\UniversalFactory $universalFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Module\Manager $moduleManager,
+        \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
+        \Magento\Catalog\Model\ResourceModel\Url $catalogUrl,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\Stdlib\DateTime $dateTime,
+        \Magento\Customer\Api\GroupManagementInterface $groupManagement,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        ProductLimitationFactory $productLimitationFactory = null,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
+        \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer $tableMaintainer = null,
+        \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $stockItem = null
+    ) {
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $eavConfig,
+            $resource,
+            $eavEntityFactory,
+            $resourceHelper,
+            $universalFactory,
+            $storeManager,
+            $moduleManager,
+            $catalogProductFlatState,
+            $scopeConfig,
+            $productOptionFactory,
+            $catalogUrl,
+            $localeDate,
+            $customerSession,
+            $dateTime,
+            $groupManagement,
+            $connection,
+            $productLimitationFactory,
+            $metadataPool,
+            $tableMaintainer
+        );
+
+        $this->stockItem = $stockItem
+            ?? ObjectManager::getInstance()->get(\Magento\CatalogInventory\Model\ResourceModel\Stock\Item::class);
+    }
+
     /**
      * Initialize collection
      *
@@ -64,13 +151,7 @@ protected function _construct()
      */
     public function _afterLoad()
     {
-        parent::_afterLoad();
-        if ($this->getStoreId() && $this->_items) {
-            foreach ($this->_items as $item) {
-                $item->setStoreId($this->getStoreId());
-            }
-        }
-        return $this;
+        return parent::_afterLoad();
     }
 
     /**
@@ -163,22 +244,38 @@ public function setPositionOrder()
     }
 
     /**
-     * Add filtering of product then havent enoght stock
+     * Add filtering of products that have 0 items left.
      *
      * @return $this
      * @since 100.2.0
      */
     public function addQuantityFilter()
     {
+        $manageStockExpr = $this->stockItem->getManageStockExpr('stock_item');
+        $backordersExpr = $this->stockItem->getBackordersExpr('stock_item');
+        $minQtyExpr = $this->getConnection()->getCheckSql(
+            'selection.selection_can_change_qty',
+            $this->stockItem->getMinSaleQtyExpr('stock_item'),
+            'selection.selection_qty'
+        );
+
+        $where = $manageStockExpr . ' = 0';
+        $where .= ' OR ('
+            . 'stock_item.is_in_stock = ' . \Magento\CatalogInventory\Model\Stock::STOCK_IN_STOCK
+            . ' AND ('
+                . $backordersExpr . ' != ' . \Magento\CatalogInventory\Model\Stock::BACKORDERS_NO
+                . ' OR '
+                . $minQtyExpr . ' <= stock_item.qty'
+            . ')'
+        . ')';
+
         $this->getSelect()
             ->joinInner(
-                ['stock' => $this->getTable('cataloginventory_stock_status')],
-                'selection.product_id = stock.product_id',
+                ['stock_item' => $this->stockItem->getMainTable()],
+                'selection.product_id = stock_item.product_id',
                 []
-            )
-            ->where(
-                '(selection.selection_can_change_qty or selection.selection_qty <= stock.qty) and stock.stock_status'
-            );
+            )->where($where);
+
         return $this;
     }
 
@@ -253,7 +350,10 @@ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
     }
 
     /**
+     * Get Catalog Rule Processor.
+     *
      * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+     *
      * @deprecated 100.2.0
      */
     private function getCatalogRuleProcessor()
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 2f81308f67f50..30e37e54a21db 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -92,9 +92,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -244,9 +243,8 @@ public function getOrderItem()
     {
         if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
             return $this->getItem();
-        } else {
-            return $this->getItem()->getOrderItem();
         }
+        return $this->getItem()->getOrderItem();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php b/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php
new file mode 100644
index 0000000000000..d5aafb8ad2b61
--- /dev/null
+++ b/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Plugin;
+
+use Magento\Quote\Model\Quote\Item as OrigQuoteItem;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Update prices stored in quote item options after calculating quote item's totals
+ */
+class UpdatePriceInQuoteItemOptions
+{
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(SerializerInterface $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Update price on quote item options level
+     *
+     * @param OrigQuoteItem $subject
+     * @param AbstractItem $result
+     * @return AbstractItem
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterCalcRowTotal(OrigQuoteItem $subject, AbstractItem $result)
+    {
+        $bundleAttributes = $result->getProduct()->getCustomOption('bundle_selection_attributes');
+        if ($bundleAttributes !== null) {
+            $actualPrice = $result->getPrice();
+            $parsedValue = $this->serializer->unserialize($bundleAttributes->getValue());
+            if (is_array($parsedValue) && array_key_exists('price', $parsedValue)) {
+                $parsedValue['price'] = $actualPrice;
+            }
+            $bundleAttributes->setValue($this->serializer->serialize($parsedValue));
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index 9d035aece57bc..04a6ee0bd459b 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -198,6 +198,8 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
     }
 
     /**
+     * Get selection price list provider.
+     *
      * @return SelectionPriceListProviderInterface
      * @deprecated 100.2.0
      */
@@ -271,9 +273,8 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
     {
         if ($bundleProduct->getPriceType() == Price::PRICE_TYPE_FIXED) {
             return $this->calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
-        } else {
-            return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
         }
+        return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
     }
 
     /**
@@ -282,7 +283,7 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
      * @param float $basePriceValue
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
-     * @param null|bool|string|arrayy $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
index 56c403ad9960c..297c4659cb877 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
@@ -61,8 +61,8 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric
 
             if (!$useRegularPrice) {
                 $selectionsCollection->addAttributeToSelect('special_price');
-                $selectionsCollection->addAttributeToSelect('special_price_from');
-                $selectionsCollection->addAttributeToSelect('special_price_to');
+                $selectionsCollection->addAttributeToSelect('special_from_date');
+                $selectionsCollection->addAttributeToSelect('special_to_date');
                 $selectionsCollection->addAttributeToSelect('tax_class_id');
             }
 
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
index 995572636e759..1c724caaa28d8 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
@@ -8,9 +8,10 @@
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\App\ObjectManager;
 
 /**
- * Bundle option price model
+ * Bundle option price model with final price.
  */
 class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterface
 {
@@ -26,6 +27,7 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
 
     /**
      * @var BundleSelectionFactory
+     * @deprecated
      */
     protected $selectionFactory;
 
@@ -34,23 +36,31 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
      */
     protected $maximalPrice;
 
+    /**
+     * @var BundleOptions
+     */
+    private $bundleOptions;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param BundleCalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param BundleSelectionFactory $bundleSelectionFactory
+     * @param BundleOptions|null $bundleOptions
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         BundleCalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        BundleSelectionFactory $bundleSelectionFactory
+        BundleSelectionFactory $bundleSelectionFactory,
+        BundleOptions $bundleOptions = null
     ) {
         $this->selectionFactory = $bundleSelectionFactory;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->product->setQty($this->quantity);
+        $this->bundleOptions = $bundleOptions ?: ObjectManager::getInstance()->get(BundleOptions::class);
     }
 
     /**
@@ -59,94 +69,61 @@ public function __construct(
     public function getValue()
     {
         if (null === $this->value) {
-            $this->value = $this->calculateOptions();
+            $this->value = $this->bundleOptions->calculateOptions($this->product);
         }
+
         return $this->value;
     }
 
     /**
-     * Getter for maximal price of options
+     * Getter for maximal price of options.
      *
      * @return bool|float
+     * @deprecated
      */
     public function getMaxValue()
     {
         if (null === $this->maximalPrice) {
-            $this->maximalPrice = $this->calculateOptions(false);
+            $this->maximalPrice = $this->bundleOptions->calculateOptions($this->product, false);
         }
+
         return $this->maximalPrice;
     }
 
     /**
-     * Get Options with attached Selections collection
+     * Get Options with attached Selections collection.
      *
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      */
     public function getOptions()
     {
-        $bundleProduct = $this->product;
-        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
-        $typeInstance = $bundleProduct->getTypeInstance();
-        $typeInstance->setStoreFilter($bundleProduct->getStoreId(), $bundleProduct);
-
-        /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionCollection */
-        $optionCollection = $typeInstance->getOptionsCollection($bundleProduct);
-
-        $selectionCollection = $typeInstance->getSelectionsCollection(
-            $typeInstance->getOptionsIds($bundleProduct),
-            $bundleProduct
-        );
-
-        $priceOptions = $optionCollection->appendSelections($selectionCollection, true, false);
-        return $priceOptions;
+        return $this->bundleOptions->getOptions($this->product);
     }
 
     /**
-     * Get selection amount
+     * Get selection amount.
      *
      * @param \Magento\Bundle\Model\Selection $selection
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getOptionSelectionAmount($selection)
     {
-        $cacheKey = implode(
-            '_',
-            [
-                $this->product->getId(),
-                $selection->getOptionId(),
-                $selection->getSelectionId()
-            ]
+        return $this->bundleOptions->getOptionSelectionAmount(
+            $this->product,
+            $selection,
+            false
         );
-
-        if (!isset($this->optionSelecionAmountCache[$cacheKey])) {
-            $selectionPrice = $this->selectionFactory
-                ->create($this->product, $selection, $selection->getSelectionQty());
-            $this->optionSelecionAmountCache[$cacheKey] =  $selectionPrice->getAmount();
-        }
-
-        return $this->optionSelecionAmountCache[$cacheKey];
     }
 
     /**
-     * Calculate maximal or minimal options value
+     * Calculate maximal or minimal options value.
      *
      * @param bool $searchMin
      * @return bool|float
      */
     protected function calculateOptions($searchMin = true)
     {
-        $priceList = [];
-        /* @var $option \Magento\Bundle\Model\Option */
-        foreach ($this->getOptions() as $option) {
-            if ($searchMin && !$option->getRequired()) {
-                continue;
-            }
-            $selectionPriceList = $this->calculator->createSelectionPriceList($option, $this->product);
-            $selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);
-            $priceList = array_merge($priceList, $selectionPriceList);
-        }
-        $amount = $this->calculator->calculateBundleAmount(0., $this->product, $priceList);
-        return $amount->getValue();
+        return $this->bundleOptions->calculateOptions($this->product, $searchMin);
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptionRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleOptionRegularPrice.php
new file mode 100644
index 0000000000000..20262e99281de
--- /dev/null
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleOptionRegularPrice.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Pricing\Price;
+
+use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Bundle option price model with final price.
+ */
+class BundleOptionRegularPrice extends AbstractPrice implements BundleOptionPriceInterface
+{
+    /**
+     * Price model code.
+     */
+    const PRICE_CODE = 'bundle_option_regular_price';
+
+    /**
+     * @var BundleCalculatorInterface
+     */
+    protected $calculator;
+
+    /**
+     * @var BundleOptions
+     */
+    private $bundleOptions;
+
+    /**
+     * @param Product $saleableItem
+     * @param float $quantity
+     * @param BundleCalculatorInterface $calculator
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param BundleOptions $bundleOptions
+     */
+    public function __construct(
+        Product $saleableItem,
+        $quantity,
+        BundleCalculatorInterface $calculator,
+        PriceCurrencyInterface $priceCurrency,
+        BundleOptions $bundleOptions
+    ) {
+        parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
+        $this->product->setQty($this->quantity);
+        $this->bundleOptions = $bundleOptions;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getValue()
+    {
+        if (null === $this->value) {
+            $this->value = $this->bundleOptions->calculateOptions($this->product);
+        }
+
+        return $this->value;
+    }
+
+    /**
+     * Get Options with attached Selections collection.
+     *
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+     */
+    public function getOptions() : \Magento\Bundle\Model\ResourceModel\Option\Collection
+    {
+        return $this->bundleOptions->getOptions($this->product);
+    }
+
+    /**
+     * Get selection amount.
+     *
+     * @param \Magento\Bundle\Model\Selection $selection
+     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     */
+    public function getOptionSelectionAmount($selection) : \Magento\Framework\Pricing\Amount\AmountInterface
+    {
+        return $this->bundleOptions->getOptionSelectionAmount(
+            $this->product,
+            $selection,
+            true
+        );
+    }
+
+    /**
+     * Get minimal amount of bundle price with options.
+     *
+     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     */
+    public function getAmount() : \Magento\Framework\Pricing\Amount\AmountInterface
+    {
+        return $this->calculator->getOptionsAmount($this->product);
+    }
+}
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptions.php b/app/code/Magento/Bundle/Pricing/Price/BundleOptions.php
new file mode 100644
index 0000000000000..e4951cc311737
--- /dev/null
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleOptions.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Pricing\Price;
+
+use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ * Bundle option price calculation model.
+ */
+class BundleOptions
+{
+    /**
+     * @var BundleCalculatorInterface
+     */
+    private $calculator;
+
+    /**
+     * @var BundleSelectionFactory
+     */
+    private $selectionFactory;
+
+    /**
+     * @var AmountInterface[]
+     */
+    private $optionSelectionAmountCache = [];
+
+    /**
+     * @param BundleCalculatorInterface $calculator
+     * @param BundleSelectionFactory $bundleSelectionFactory
+     */
+    public function __construct(
+        BundleCalculatorInterface $calculator,
+        BundleSelectionFactory $bundleSelectionFactory
+    ) {
+        $this->calculator = $calculator;
+        $this->selectionFactory = $bundleSelectionFactory;
+    }
+
+    /**
+     * Get Options with attached Selections collection.
+     *
+     * @param SaleableInterface $bundleProduct
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection|array
+     */
+    public function getOptions(SaleableInterface $bundleProduct)
+    {
+        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+        $typeInstance = $bundleProduct->getTypeInstance();
+        $typeInstance->setStoreFilter($bundleProduct->getStoreId(), $bundleProduct);
+
+        /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionCollection */
+        $optionCollection = $typeInstance->getOptionsCollection($bundleProduct);
+
+        /** @var \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionCollection */
+        $selectionCollection = $typeInstance->getSelectionsCollection(
+            $typeInstance->getOptionsIds($bundleProduct),
+            $bundleProduct
+        );
+
+        $priceOptions = $optionCollection->appendSelections($selectionCollection, true, false);
+
+        return $priceOptions;
+    }
+
+    /**
+     * Calculate maximal or minimal options value.
+     *
+     * @param SaleableInterface $bundleProduct
+     * @param bool $searchMin
+     *
+     * @return float
+     */
+    public function calculateOptions(
+        SaleableInterface $bundleProduct,
+        bool $searchMin = true
+    ) : float {
+        $priceList = [];
+        /* @var \Magento\Bundle\Model\Option $option */
+        foreach ($this->getOptions($bundleProduct) as $option) {
+            if ($searchMin && !$option->getRequired()) {
+                continue;
+            }
+            /** @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice $selectionPriceList */
+            $selectionPriceList = $this->calculator->createSelectionPriceList($option, $bundleProduct);
+            $selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);
+            $priceList = array_merge($priceList, $selectionPriceList);
+        }
+        $amount = $this->calculator->calculateBundleAmount(0., $bundleProduct, $priceList);
+
+        return $amount->getValue();
+    }
+
+    /**
+     * Get selection amount.
+     *
+     * @param Product $bundleProduct
+     * @param \Magento\Bundle\Model\Selection|Product $selection
+     * @param bool $useRegularPrice
+     *
+     * @return AmountInterface
+     */
+    public function getOptionSelectionAmount(
+        Product $bundleProduct,
+        $selection,
+        bool $useRegularPrice = false
+    ) : AmountInterface {
+        $cacheKey = implode(
+            '_',
+            [
+                $bundleProduct->getId(),
+                $selection->getOptionId(),
+                $selection->getSelectionId(),
+                $useRegularPrice ? 1 : 0,
+            ]
+        );
+
+        if (!isset($this->optionSelectionAmountCache[$cacheKey])) {
+            $selectionPrice = $this->selectionFactory
+                ->create(
+                    $bundleProduct,
+                    $selection,
+                    $selection->getSelectionQty(),
+                    ['useRegularPrice' => $useRegularPrice]
+                );
+            $this->optionSelectionAmountCache[$cacheKey] =  $selectionPrice->getAmount();
+        }
+
+        return $this->optionSelectionAmountCache[$cacheKey];
+    }
+}
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
index 034b735764011..184f8b1e85eaa 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
@@ -52,7 +52,7 @@ public function getAmount()
             if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) {
                 /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
                 $customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE);
-                $price += $customOptionPrice->getCustomOptionRange(true);
+                $price += $customOptionPrice->getCustomOptionRange(true, $this->getPriceCode());
             }
             $this->amount[$this->getValue()] = $this->calculator->getMinRegularAmount($price, $this->product);
         }
@@ -71,7 +71,7 @@ public function getMaximalPrice()
             if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) {
                 /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
                 $customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE);
-                $price += $customOptionPrice->getCustomOptionRange(false);
+                $price += $customOptionPrice->getCustomOptionRange(false, $this->getPriceCode());
             }
             $this->maximalPrice = $this->calculator->getMaxRegularAmount($price, $this->product);
         }
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
index 927b8fbff8d85..a28d721cc9a4e 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
@@ -54,7 +54,7 @@ public function create(
     ) {
         $arguments['bundleProduct'] = $bundleProduct;
         $arguments['saleableItem'] = $selection;
-        $arguments['quantity'] = $quantity ? floatval($quantity) : 1.;
+        $arguments['quantity'] = $quantity ? (float)$quantity : 1.;
 
         return $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
     }
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index 71c1b5c5e98cb..db2b9547e635f 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -93,7 +93,7 @@ public function __construct(
     }
 
     /**
-     * Get the price value for one of selection product
+     * Get the price value for one of selection product.
      *
      * @return bool|float
      */
@@ -103,7 +103,10 @@ public function getValue()
             return $this->value;
         }
         $product = $this->selection;
-        $bundleSelectionKey = 'bundle-selection-value-' . $product->getSelectionId();
+        $bundleSelectionKey = 'bundle-selection-'
+            . ($this->useRegularPrice ? 'regular-' : '')
+            . 'value-'
+            . $product->getSelectionId();
         if ($product->hasData($bundleSelectionKey)) {
             return $product->getData($bundleSelectionKey);
         }
@@ -128,7 +131,8 @@ public function getValue()
                     'catalog_product_get_final_price',
                     ['product' => $product, 'qty' => $this->bundleProduct->getQty()]
                 );
-                $value = $product->getData('final_price') * ($selectionPriceValue / 100);
+                $price = $this->useRegularPrice ? $product->getData('price') : $product->getData('final_price');
+                $value = $price * ($selectionPriceValue / 100);
             } else {
                 // calculate price for selection type fixed
                 $value = $this->priceCurrency->convert($selectionPriceValue);
@@ -139,6 +143,7 @@ public function getValue()
         }
         $this->value = $this->priceCurrency->round($value);
         $product->setData($bundleSelectionKey, $this->value);
+
         return $this->value;
     }
 
@@ -150,7 +155,10 @@ public function getValue()
     public function getAmount()
     {
         $product = $this->selection;
-        $bundleSelectionKey = 'bundle-selection-amount-' . $product->getSelectionId();
+        $bundleSelectionKey = 'bundle-selection'
+            . ($this->useRegularPrice ? 'regular-' : '')
+            . '-amount-'
+            . $product->getSelectionId();
         if ($product->hasData($bundleSelectionKey)) {
             return $product->getData($bundleSelectionKey);
         }
@@ -167,6 +175,7 @@ public function getAmount()
             );
             $product->setData($bundleSelectionKey, $this->amount[$value]);
         }
+
         return $this->amount[$value];
     }
 
@@ -177,8 +186,7 @@ public function getProduct()
     {
         if ($this->bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC) {
             return parent::getProduct();
-        } else {
-            return $this->bundleProduct;
         }
+        return $this->bundleProduct;
     }
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
index 274ea95474120..11f7e2f3d1f15 100644
--- a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
@@ -11,11 +11,13 @@
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Pricing\Price as CatalogPrice;
 use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+use Magento\Catalog\Pricing\Price\ConfiguredPriceSelection;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 
 /**
  * Configured price model
  * @api
- * @since 100.0.2
  */
 class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPriceInterface
 {
@@ -37,29 +39,39 @@ class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPrice
     /**
      * Serializer interface instance.
      *
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var JsonSerializer
      */
     private $serializer;
 
+    /**
+     * @var ConfiguredPriceSelection
+     */
+    private $configuredPriceSelection;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param BundleCalculatorInterface $calculator
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param PriceCurrencyInterface $priceCurrency
      * @param ItemInterface $item
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param JsonSerializer|null $serializer
+     * @param ConfiguredPriceSelection|null $configuredPriceSelection
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         BundleCalculatorInterface $calculator,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        PriceCurrencyInterface $priceCurrency,
         ItemInterface $item = null,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        JsonSerializer $serializer = null,
+        ConfiguredPriceSelection $configuredPriceSelection = null
     ) {
         $this->item = $item;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+            ->get(JsonSerializer::class);
+        $this->configuredPriceSelection = $configuredPriceSelection
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ConfiguredPriceSelection::class);
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
     }
 
@@ -74,7 +86,7 @@ public function setItem(ItemInterface $item)
     }
 
     /**
-     * Get Options with attached Selections collection
+     * Get Options with attached Selections collection.
      *
      * @return array|\Magento\Bundle\Model\ResourceModel\Option\Collection
      */
@@ -84,13 +96,14 @@ public function getOptions()
         $bundleOptions = [];
         /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
         $typeInstance = $bundleProduct->getTypeInstance();
-
-        // get bundle options
-        $optionsQuoteItemOption = $this->item->getOptionByCode('bundle_option_ids');
-        $bundleOptionsIds = $optionsQuoteItemOption
-            ? $this->serializer->unserialize($optionsQuoteItemOption->getValue())
-            : [];
-
+        $bundleOptionsIds = [];
+        if ($this->item !== null) {
+            // get bundle options
+            $optionsQuoteItemOption = $this->item->getOptionByCode('bundle_option_ids');
+            if ($optionsQuoteItemOption && $optionsQuoteItemOption->getValue()) {
+                $bundleOptionsIds = $this->serializer->unserialize($optionsQuoteItemOption->getValue());
+            }
+        }
         if ($bundleOptionsIds) {
             /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
             $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $bundleProduct);
@@ -102,24 +115,20 @@ public function getOptions()
                 $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
             }
         }
+
         return $bundleOptions;
     }
 
     /**
-     * Option amount calculation for bundle product
+     * Option amount calculation for bundle product.
      *
      * @param float $baseValue
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getConfiguredAmount($baseValue = 0.)
     {
-        $selectionPriceList = [];
-        foreach ($this->getOptions() as $option) {
-            $selectionPriceList = array_merge(
-                $selectionPriceList,
-                $this->calculator->createSelectionPriceList($option, $this->product)
-            );
-        }
+        $selectionPriceList = $this->configuredPriceSelection->getSelectionPriceList($this);
+
         return $this->calculator->calculateBundleAmount(
             $baseValue,
             $this->product,
@@ -140,9 +149,8 @@ public function getValue()
                 $this->priceInfo
                     ->getPrice(BundleDiscountPrice::PRICE_CODE)
                     ->calculateDiscount($configuredOptionsAmount);
-        } else {
-            return parent::getValue();
         }
+        return parent::getValue();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredRegularPrice.php
new file mode 100644
index 0000000000000..7eaee6d0fae6b
--- /dev/null
+++ b/app/code/Magento/Bundle/Pricing/Price/ConfiguredRegularPrice.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Pricing\Price;
+
+/**
+ * Configured regular price model.
+ */
+class ConfiguredRegularPrice extends ConfiguredPrice
+{
+    /**
+     * Price type configured.
+     */
+    const PRICE_CODE = 'configured_regular_price';
+
+    /**
+     * Create Selection Price List.
+     *
+     * @param \Magento\Bundle\Model\Option $option
+     * @return BundleSelectionPrice[]
+     */
+    protected function createSelectionPriceList(\Magento\Bundle\Model\Option $option): array
+    {
+        return $this->calculator->createSelectionPriceList($option, $this->product, true);
+    }
+}
diff --git a/app/code/Magento/Bundle/Setup/InstallData.php b/app/code/Magento/Bundle/Setup/InstallData.php
deleted file mode 100644
index 6a3ff08c4d781..0000000000000
--- a/app/code/Magento/Bundle/Setup/InstallData.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Bundle\Setup;
-
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        $fieldList = [
-            'price',
-            'special_price',
-            'special_from_date',
-            'special_to_date',
-            'minimal_price',
-            'cost',
-            'tier_price',
-            'weight',
-        ];
-        foreach ($fieldList as $field) {
-            $applyTo = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field, 'apply_to')
-            );
-            if (!in_array('bundle', $applyTo)) {
-                $applyTo[] = 'bundle';
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    $field,
-                    'apply_to',
-                    implode(',', $applyTo)
-                );
-            }
-        }
-
-        $applyTo = explode(',', $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'cost', 'apply_to'));
-        unset($applyTo[array_search('bundle', $applyTo)]);
-        $eavSetup->updateAttribute(\Magento\Catalog\Model\Product::ENTITY, 'cost', 'apply_to', implode(',', $applyTo));
-
-        /**
-         * Add attributes to the eav/attribute
-         */
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'price_type',
-            [
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => '',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                'visible' => true,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'used_in_product_listing' => true,
-                'unique' => false,
-                'apply_to' => 'bundle'
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'sku_type',
-            [
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => '',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                'visible' => false,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'unique' => false,
-                'apply_to' => 'bundle'
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'weight_type',
-            [
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => '',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                'visible' => false,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'used_in_product_listing' => true,
-                'unique' => false,
-                'apply_to' => 'bundle'
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'price_view',
-            [
-                'group' => 'Advanced Pricing',
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => 'Price View',
-                'input' => 'select',
-                'class' => '',
-                'source' => \Magento\Bundle\Model\Product\Attribute\Source\Price\View::class,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                'visible' => true,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'used_in_product_listing' => true,
-                'unique' => false,
-                'apply_to' => 'bundle'
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'shipment_type',
-            [
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => 'Shipment',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                'visible' => false,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'used_in_product_listing' => true,
-                'unique' => false,
-                'apply_to' => 'bundle'
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/Bundle/Setup/InstallSchema.php b/app/code/Magento/Bundle/Setup/InstallSchema.php
deleted file mode 100644
index 662938034976e..0000000000000
--- a/app/code/Magento/Bundle/Setup/InstallSchema.php
+++ /dev/null
@@ -1,960 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Bundle\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-        $customerGroupTable = $setup->getConnection()->describeTable($setup->getTable('customer_group'));
-        $customerGroupIdType = $customerGroupTable['customer_group_id']['DATA_TYPE'] == 'int'
-            ? \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER : $customerGroupTable['customer_group_id']['DATA_TYPE'];
-        /**
-         * Create table 'catalog_product_bundle_option'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_bundle_option'))
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option Id'
-            )
-            ->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Parent Id'
-            )
-            ->addColumn(
-                'required',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Required'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addColumn(
-                'type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Type'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_bundle_option', ['parent_id']),
-                ['parent_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_option',
-                    'parent_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'parent_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Bundle Option');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_bundle_option_value'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_bundle_option_value'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Option Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Store Id'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Title'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_bundle_option_value',
-                    ['option_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['option_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_option_value',
-                    'option_id',
-                    'catalog_product_bundle_option',
-                    'option_id'
-                ),
-                'option_id',
-                $installer->getTable('catalog_product_bundle_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Bundle Option Value');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_bundle_selection'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_bundle_selection'))
-            ->addColumn(
-                'selection_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Selection Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Option Id'
-            )
-            ->addColumn(
-                'parent_product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Parent Product Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Product Id'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addColumn(
-                'is_default',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Default'
-            )
-            ->addColumn(
-                'selection_price_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Selection Price Type'
-            )
-            ->addColumn(
-                'selection_price_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Selection Price Value'
-            )
-            ->addColumn(
-                'selection_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Selection Qty'
-            )
-            ->addColumn(
-                'selection_can_change_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Selection Can Change Qty'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_bundle_selection', ['option_id']),
-                ['option_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_bundle_selection', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_selection',
-                    'option_id',
-                    'catalog_product_bundle_option',
-                    'option_id'
-                ),
-                'option_id',
-                $installer->getTable('catalog_product_bundle_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_selection',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Bundle Selection');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_bundle_selection_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_bundle_selection_price'))
-            ->addColumn(
-                'selection_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Selection Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'selection_price_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Selection Price Type'
-            )
-            ->addColumn(
-                'selection_price_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Selection Price Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_bundle_selection_price', ['website_id']),
-                ['website_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_selection_price',
-                    'website_id',
-                    'store_website',
-                    'website_id'
-                ),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_selection_price',
-                    'selection_id',
-                    'catalog_product_bundle_selection',
-                    'selection_id'
-                ),
-                'selection_id',
-                $installer->getTable('catalog_product_bundle_selection'),
-                'selection_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Bundle Selection Price');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_bundle_price_index'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_bundle_price_index'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                $customerGroupIdType,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false],
-                'Max Price'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_bundle_price_index', ['website_id']),
-                ['website_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_bundle_price_index', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_price_index',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                ),
-                'customer_group_id',
-                $installer->getTable('customer_group'),
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_price_index',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_bundle_price_index',
-                    'website_id',
-                    'store_website',
-                    'website_id'
-                ),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Bundle Price Index');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_bundle_stock_index'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_bundle_stock_index')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Stock Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option Id'
-            )
-            ->addColumn(
-                'stock_status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['default' => '0'],
-                'Stock Status'
-            )
-            ->setComment('Catalog Product Bundle Stock Index');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_bundle_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_bundle_idx'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class Id'
-            )
-            ->addColumn(
-                'price_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Price Type'
-            )
-            ->addColumn(
-                'special_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Special Price'
-            )
-            ->addColumn(
-                'tier_percent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Percent'
-            )
-            ->addColumn(
-                'orig_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Orig Price'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addColumn(
-                'base_tier',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Base Tier'
-            )
-            ->setComment('Catalog Product Index Price Bundle Idx');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_bundle_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_bundle_tmp'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class Id'
-            )
-            ->addColumn(
-                'price_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Price Type'
-            )
-            ->addColumn(
-                'special_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Special Price'
-            )
-            ->addColumn(
-                'tier_percent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Percent'
-            )
-            ->addColumn(
-                'orig_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Orig Price'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addColumn(
-                'base_tier',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Base Tier'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment('Catalog Product Index Price Bundle Tmp');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_bundle_sel_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_bundle_sel_idx'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option Id'
-            )
-            ->addColumn(
-                'selection_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Selection Id'
-            )
-            ->addColumn(
-                'group_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Group Type'
-            )
-            ->addColumn(
-                'is_required',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Is Required'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setComment('Catalog Product Index Price Bundle Sel Idx');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_bundle_sel_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_bundle_sel_tmp'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option Id'
-            )
-            ->addColumn(
-                'selection_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Selection Id'
-            )
-            ->addColumn(
-                'group_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Group Type'
-            )
-            ->addColumn(
-                'is_required',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Is Required'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment('Catalog Product Index Price Bundle Sel Tmp');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_bundle_opt_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_bundle_opt_idx'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option Id'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'alt_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Alt Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addColumn(
-                'alt_tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Alt Tier Price'
-            )
-            ->setComment('Catalog Product Index Price Bundle Opt Idx');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_bundle_opt_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_bundle_opt_tmp'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option Id'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'alt_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Alt Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addColumn(
-                'alt_tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Alt Tier Price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment('Catalog Product Index Price Bundle Opt Tmp');
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php b/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php
new file mode 100644
index 0000000000000..d8ad1757ab2e6
--- /dev/null
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+
+/**
+ * Class ApplyAttributesUpdate
+ * @package Magento\Bundle\Setup\Patch
+ */
+class ApplyAttributesUpdate implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * ApplyAttributesUpdate constructor.
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $fieldList = [
+            'price',
+            'special_price',
+            'special_from_date',
+            'special_to_date',
+            'minimal_price',
+            'cost',
+            'tier_price',
+            'weight',
+        ];
+        foreach ($fieldList as $field) {
+            $applyTo = explode(
+                ',',
+                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field, 'apply_to')
+            );
+            if (!in_array('bundle', $applyTo)) {
+                $applyTo[] = 'bundle';
+                $eavSetup->updateAttribute(
+                    \Magento\Catalog\Model\Product::ENTITY,
+                    $field,
+                    'apply_to',
+                    implode(',', $applyTo)
+                );
+            }
+        }
+
+        $applyTo = explode(',', $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'cost', 'apply_to'));
+        unset($applyTo[array_search('bundle', $applyTo)]);
+        $eavSetup->updateAttribute(\Magento\Catalog\Model\Product::ENTITY, 'cost', 'apply_to', implode(',', $applyTo));
+
+        /**
+         * Add attributes to the eav/attribute
+         */
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'price_type',
+            [
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => '',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'visible' => true,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'used_in_product_listing' => true,
+                'unique' => false,
+                'apply_to' => 'bundle'
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'sku_type',
+            [
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => '',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'visible' => false,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'unique' => false,
+                'apply_to' => 'bundle'
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'weight_type',
+            [
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => '',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'visible' => false,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'used_in_product_listing' => true,
+                'unique' => false,
+                'apply_to' => 'bundle'
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'price_view',
+            [
+                'group' => 'Advanced Pricing',
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => 'Price View',
+                'input' => 'select',
+                'class' => '',
+                'source' => \Magento\Bundle\Model\Product\Attribute\Source\Price\View::class,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'visible' => true,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'used_in_product_listing' => true,
+                'unique' => false,
+                'apply_to' => 'bundle'
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'shipment_type',
+            [
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => 'Shipment',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'visible' => false,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'used_in_product_listing' => true,
+                'unique' => false,
+                'apply_to' => 'bundle'
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
new file mode 100644
index 0000000000000..44647ea76a1c2
--- /dev/null
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Setup\EavSetup;
+
+/**
+ * Class UpdateBundleRelatedEntityTytpes
+ * @package Magento\Bundle\Setup\Patch
+ */
+class UpdateBundleRelatedEntityTytpes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * UpdateBundleRelatedEntityTytpes constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+        $eavSetup->addAttributeGroup(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            $attributeSetId,
+            'Bundle Items',
+            16
+        );
+        $this->upgradePriceType($eavSetup);
+        $this->upgradeSkuType($eavSetup);
+        $this->upgradeWeightType($eavSetup);
+        $this->upgradeShipmentType($eavSetup);
+    }
+
+    /**
+     * Upgrade Dynamic Price attribute
+     *
+     * @param EavSetup $eavSetup
+     * @return void
+     */
+    private function upgradePriceType(EavSetup $eavSetup)
+    {
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'price_type',
+            'frontend_input',
+            'boolean',
+            31
+        );
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'price_type',
+            'frontend_label',
+            'Dynamic Price'
+        );
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'price_type', 'default_value', 0);
+    }
+
+    /**
+     * Upgrade Dynamic Sku attribute
+     *
+     * @param EavSetup $eavSetup
+     * @return void
+     */
+    private function upgradeSkuType(EavSetup $eavSetup)
+    {
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'sku_type',
+            'frontend_input',
+            'boolean',
+            21
+        );
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'sku_type',
+            'frontend_label',
+            'Dynamic SKU'
+        );
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'default_value', 0);
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'is_visible', 1);
+    }
+
+    /**
+     * Upgrade Dynamic Weight attribute
+     *
+     * @param EavSetup $eavSetup
+     * @return void
+     */
+    private function upgradeWeightType(EavSetup $eavSetup)
+    {
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'weight_type',
+            'frontend_input',
+            'boolean',
+            71
+        );
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'weight_type',
+            'frontend_label',
+            'Dynamic Weight'
+        );
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'default_value', 0);
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'is_visible', 1);
+    }
+
+    /**
+     * Upgrade Ship Bundle Items attribute
+     *
+     * @param EavSetup $eavSetup
+     * @return void
+     */
+    private function upgradeShipmentType(EavSetup $eavSetup)
+    {
+        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+        $eavSetup->addAttributeToGroup(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            $attributeSetId,
+            'Bundle Items',
+            'shipment_type',
+            1
+        );
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'shipment_type',
+            'frontend_input',
+            'select'
+        );
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'shipment_type',
+            'frontend_label',
+            'Ship Bundle Items'
+        );
+        $eavSetup->updateAttribute(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            'shipment_type',
+            'source_model',
+            \Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type::class
+        );
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'default_value', 0);
+        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'is_visible', 1);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            ApplyAttributesUpdate::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php b/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php
new file mode 100644
index 0000000000000..94bf1d11fb4aa
--- /dev/null
+++ b/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Setup\Patch\Schema;
+
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+
+/**
+ * Class UpdateBundleRelatedSchema
+ *
+ * @package Magento\Bundle\Setup\Patch
+ */
+class UpdateBundleRelatedSchema implements SchemaPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var SchemaSetupInterface
+     */
+    private $schemaSetup;
+
+    /**
+     * UpdateBundleRelatedSchema constructor.
+     * @param SchemaSetupInterface $schemaSetup
+     */
+    public function __construct(
+        SchemaSetupInterface $schemaSetup
+    ) {
+        $this->schemaSetup = $schemaSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->schemaSetup->startSetup();
+        // Updating data of the 'catalog_product_bundle_option_value' table.
+        $tableName = $this->schemaSetup->getTable('catalog_product_bundle_option_value');
+
+        $select = $this->schemaSetup->getConnection()->select()
+            ->from(
+                ['values' => $tableName],
+                ['value_id']
+            )->joinLeft(
+                [
+                    'options' => $this->schemaSetup->getTable(
+                        'catalog_product_bundle_option'
+                    )
+                ],
+                'values.option_id = options.option_id',
+                ['parent_product_id' => 'parent_id']
+            );
+
+        $this->schemaSetup->getConnection()->query(
+            $this->schemaSetup->getConnection()->insertFromSelect(
+                $select,
+                $tableName,
+                ['value_id', 'parent_product_id'],
+                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+            )
+        );
+
+        // Updating data of the 'catalog_product_bundle_selection_price' table.
+        $tableName = $this->schemaSetup->getTable(
+            'catalog_product_bundle_selection_price'
+        );
+        $tmpTableName = $this->schemaSetup->getTable(
+            'catalog_product_bundle_selection_price_tmp'
+        );
+
+        $existingForeignKeys = $this->schemaSetup->getConnection()->getForeignKeys($tableName);
+
+        foreach ($existingForeignKeys as $key) {
+            $this->schemaSetup->getConnection()->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
+        }
+
+        $this->schemaSetup->getConnection()->createTable(
+            $this->schemaSetup->getConnection()->createTableByDdl($tableName, $tmpTableName)
+        );
+
+        foreach ($existingForeignKeys as $key) {
+            $this->schemaSetup->getConnection()->addForeignKey(
+                $key['FK_NAME'],
+                $key['TABLE_NAME'],
+                $key['COLUMN_NAME'],
+                $key['REF_TABLE_NAME'],
+                $key['REF_COLUMN_NAME'],
+                $key['ON_DELETE']
+            );
+        }
+
+        $this->schemaSetup->getConnection()->query(
+            $this->schemaSetup->getConnection()->insertFromSelect(
+                $this->schemaSetup->getConnection()->select()->from($tableName),
+                $tmpTableName
+            )
+        );
+
+        $this->schemaSetup->getConnection()->truncateTable($tableName);
+
+        $columnsToSelect = [];
+
+        foreach ($this->schemaSetup->getConnection()->describeTable($tmpTableName) as $column) {
+            $alias = $column['COLUMN_NAME'] == 'parent_product_id' ? 'selections.' : 'prices.';
+
+            $columnsToSelect[] = $alias . $column['COLUMN_NAME'];
+        }
+
+        $select = $this->schemaSetup->getConnection()->select()
+            ->from(
+                ['prices' => $tmpTableName],
+                []
+            )->joinLeft(
+                [
+                    'selections' => $this->schemaSetup->getTable(
+                        'catalog_product_bundle_selection'
+                    )
+                ],
+                'prices.selection_id = selections.selection_id',
+                []
+            )->columns($columnsToSelect);
+
+        $this->schemaSetup->getConnection()->query(
+            $this->schemaSetup->getConnection()->insertFromSelect($select, $tableName)
+        );
+
+        $this->schemaSetup->getConnection()->dropTable($tmpTableName);
+
+        $this->schemaSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Bundle/Setup/UpgradeData.php b/app/code/Magento/Bundle/Setup/UpgradeData.php
deleted file mode 100644
index 750bc79d84801..0000000000000
--- a/app/code/Magento/Bundle/Setup/UpgradeData.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Bundle\Setup;
-
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Eav\Setup\EavSetup;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var EavSetupFactory
-     */
-    protected $eavSetupFactory;
-
-    /**
-     * UpgradeData constructor
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
-            $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-
-            $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
-            $eavSetup->addAttributeGroup(
-                ProductAttributeInterface::ENTITY_TYPE_CODE,
-                $attributeSetId,
-                'Bundle Items',
-                16
-            );
-
-            $this->upgradePriceType($eavSetup);
-            $this->upgradeSkuType($eavSetup);
-            $this->upgradeWeightType($eavSetup);
-            $this->upgradeShipmentType($eavSetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.4', '<')) {
-            // Updating data of the 'catalog_product_bundle_option_value' table.
-            $tableName = $setup->getTable('catalog_product_bundle_option_value');
-
-            $select = $setup->getConnection()->select()
-                ->from(
-                    ['values' => $tableName],
-                    ['value_id']
-                )->joinLeft(
-                    ['options' => $setup->getTable('catalog_product_bundle_option')],
-                    'values.option_id = options.option_id',
-                    ['parent_product_id' => 'parent_id']
-                );
-
-            $setup->getConnection()->query(
-                $setup->getConnection()->insertFromSelect(
-                    $select,
-                    $tableName,
-                    ['value_id', 'parent_product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
-                )
-            );
-
-            // Updating data of the 'catalog_product_bundle_selection_price' table.
-            $tableName = $setup->getTable('catalog_product_bundle_selection_price');
-            $tmpTableName = $setup->getTable('catalog_product_bundle_selection_price_tmp');
-
-            $existingForeignKeys = $setup->getConnection()->getForeignKeys($tableName);
-
-            foreach ($existingForeignKeys as $key) {
-                $setup->getConnection()->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
-            }
-
-            $setup->getConnection()->createTable(
-                $setup->getConnection()->createTableByDdl($tableName, $tmpTableName)
-            );
-
-            foreach ($existingForeignKeys as $key) {
-                $setup->getConnection()->addForeignKey(
-                    $key['FK_NAME'],
-                    $key['TABLE_NAME'],
-                    $key['COLUMN_NAME'],
-                    $key['REF_TABLE_NAME'],
-                    $key['REF_COLUMN_NAME'],
-                    $key['ON_DELETE']
-                );
-            }
-
-            $setup->getConnection()->query(
-                $setup->getConnection()->insertFromSelect(
-                    $setup->getConnection()->select()->from($tableName),
-                    $tmpTableName
-                )
-            );
-
-            $setup->getConnection()->truncateTable($tableName);
-
-            $columnsToSelect = [];
-
-            foreach ($setup->getConnection()->describeTable($tmpTableName) as $column) {
-                $alias = $column['COLUMN_NAME'] == 'parent_product_id' ? 'selections.' : 'prices.';
-
-                $columnsToSelect[] = $alias . $column['COLUMN_NAME'];
-            }
-
-            $select = $setup->getConnection()->select()
-                ->from(
-                    ['prices' => $tmpTableName],
-                    []
-                )->joinLeft(
-                    ['selections' => $setup->getTable('catalog_product_bundle_selection')],
-                    'prices.selection_id = selections.selection_id',
-                    []
-                )->columns($columnsToSelect);
-
-            $setup->getConnection()->query(
-                $setup->getConnection()->insertFromSelect($select, $tableName)
-            );
-
-            $setup->getConnection()->dropTable($tmpTableName);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Upgrade Dynamic Price attribute
-     *
-     * @param EavSetup $eavSetup
-     * @return void
-     */
-    private function upgradePriceType(EavSetup $eavSetup)
-    {
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'price_type',
-            'frontend_input',
-            'boolean',
-            31
-        );
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'price_type',
-            'frontend_label',
-            'Dynamic Price'
-        );
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'price_type', 'default_value', 0);
-    }
-
-    /**
-     * Upgrade Dynamic Sku attribute
-     *
-     * @param EavSetup $eavSetup
-     * @return void
-     */
-    private function upgradeSkuType(EavSetup $eavSetup)
-    {
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'sku_type',
-            'frontend_input',
-            'boolean',
-            21
-        );
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'sku_type',
-            'frontend_label',
-            'Dynamic SKU'
-        );
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'default_value', 0);
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'sku_type', 'is_visible', 1);
-    }
-
-    /**
-     * Upgrade Dynamic Weight attribute
-     *
-     * @param EavSetup $eavSetup
-     * @return void
-     */
-    private function upgradeWeightType(EavSetup $eavSetup)
-    {
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'weight_type',
-            'frontend_input',
-            'boolean',
-            71
-        );
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'weight_type',
-            'frontend_label',
-            'Dynamic Weight'
-        );
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'default_value', 0);
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'weight_type', 'is_visible', 1);
-    }
-
-    /**
-     * Upgrade Ship Bundle Items attribute
-     *
-     * @param EavSetup $eavSetup
-     * @return void
-     */
-    private function upgradeShipmentType(EavSetup $eavSetup)
-    {
-        $attributeSetId = $eavSetup->getDefaultAttributeSetId(ProductAttributeInterface::ENTITY_TYPE_CODE);
-        $eavSetup->addAttributeToGroup(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            $attributeSetId,
-            'Bundle Items',
-            'shipment_type',
-            1
-        );
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'shipment_type',
-            'frontend_input',
-            'select'
-        );
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'shipment_type',
-            'frontend_label',
-            'Ship Bundle Items'
-        );
-        $eavSetup->updateAttribute(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            'shipment_type',
-            'source_model',
-            \Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type::class
-        );
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'default_value', 0);
-        $eavSetup->updateAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'shipment_type', 'is_visible', 1);
-    }
-}
diff --git a/app/code/Magento/Bundle/Setup/UpgradeSchema.php b/app/code/Magento/Bundle/Setup/UpgradeSchema.php
deleted file mode 100755
index 00ecd8c20728f..0000000000000
--- a/app/code/Magento/Bundle/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Bundle\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        $connection = $setup->getConnection();
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $fields = [
-                ['table' => 'catalog_product_index_price_bundle_opt_idx', 'column' => 'alt_group_price'],
-                ['table' => 'catalog_product_index_price_bundle_opt_tmp', 'column' => 'alt_group_price'],
-                ['table' => 'catalog_product_index_price_bundle_idx', 'column' => 'base_group_price'],
-                ['table' => 'catalog_product_index_price_bundle_tmp', 'column' => 'base_group_price'],
-                ['table' => 'catalog_product_index_price_bundle_idx', 'column' => 'group_price'],
-                ['table' => 'catalog_product_index_price_bundle_opt_idx', 'column' => 'group_price'],
-                ['table' => 'catalog_product_index_price_bundle_opt_tmp', 'column' => 'group_price'],
-                ['table' => 'catalog_product_index_price_bundle_sel_idx', 'column' => 'group_price'],
-                ['table' => 'catalog_product_index_price_bundle_sel_tmp', 'column' => 'group_price'],
-                ['table' => 'catalog_product_index_price_bundle_tmp', 'column' => 'group_price'],
-                ['table' => 'catalog_product_index_price_bundle_idx', 'column' => 'group_price_percent'],
-                ['table' => 'catalog_product_index_price_bundle_tmp', 'column' => 'group_price_percent'],
-            ];
-
-            foreach ($fields as $filedInfo) {
-                $connection->dropColumn($setup->getTable($filedInfo['table']), $filedInfo['column']);
-            }
-        }
-
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $tables = [
-                'catalog_product_index_price_bundle_idx',
-                'catalog_product_index_price_bundle_opt_idx',
-                'catalog_product_index_price_bundle_opt_tmp',
-                'catalog_product_index_price_bundle_sel_idx',
-                'catalog_product_index_price_bundle_sel_tmp',
-                'catalog_product_index_price_bundle_tmp',
-            ];
-            foreach ($tables as $table) {
-                $setup->getConnection()->modifyColumn(
-                    $setup->getTable($table),
-                    'customer_group_id',
-                    ['type' => 'integer', 'nullable' => false]
-                );
-            }
-        }
-
-        if (version_compare($context->getVersion(), '2.0.4', '<')) {
-            // Updating the 'catalog_product_bundle_option_value' table.
-            $connection->addColumn(
-                $setup->getTable('catalog_product_bundle_option_value'),
-                'parent_product_id',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'comment' => 'Parent Product Id',
-                    'after' => 'option_id'
-                ]
-            );
-
-            $existingForeignKeys = $connection->getForeignKeys(
-                $setup->getTable('catalog_product_bundle_option_value')
-            );
-
-            foreach ($existingForeignKeys as $key) {
-                $connection->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
-            }
-
-            $connection->dropIndex(
-                $setup->getTable('catalog_product_bundle_option_value'),
-                $setup->getIdxName(
-                    $setup->getTable('catalog_product_bundle_option_value'),
-                    ['option_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                )
-            );
-
-            $connection->addIndex(
-                $setup->getTable('catalog_product_bundle_option_value'),
-                $setup->getIdxName(
-                    $setup->getTable('catalog_product_bundle_option_value'),
-                    ['option_id', 'parent_product_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['option_id', 'parent_product_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            );
-
-            foreach ($existingForeignKeys as $key) {
-                $connection->addForeignKey(
-                    $key['FK_NAME'],
-                    $key['TABLE_NAME'],
-                    $key['COLUMN_NAME'],
-                    $key['REF_TABLE_NAME'],
-                    $key['REF_COLUMN_NAME'],
-                    $key['ON_DELETE']
-                );
-            }
-
-            // Updating the 'catalog_product_bundle_selection_price' table.
-            $connection->addColumn(
-                $setup->getTable('catalog_product_bundle_selection_price'),
-                'parent_product_id',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'comment' => 'Parent Product Id',
-                    'after' => 'selection_id'
-                ]
-            );
-
-            $existingForeignKeys = $connection->getForeignKeys(
-                $setup->getTable('catalog_product_bundle_selection_price')
-            );
-
-            foreach ($existingForeignKeys as $key) {
-                $connection->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
-            }
-
-            $connection->dropIndex(
-                $setup->getTable('catalog_product_bundle_selection_price'),
-                $connection->getPrimaryKeyName(
-                    $setup->getTable('catalog_product_bundle_selection_price')
-                )
-            );
-
-            $connection->addIndex(
-                $setup->getTable('catalog_product_bundle_selection_price'),
-                $connection->getPrimaryKeyName(
-                    $setup->getTable('catalog_product_bundle_selection_price')
-                ),
-                ['selection_id', 'parent_product_id', 'website_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY
-            );
-
-            foreach ($existingForeignKeys as $key) {
-                $connection->addForeignKey(
-                    $key['FK_NAME'],
-                    $key['TABLE_NAME'],
-                    $key['COLUMN_NAME'],
-                    $key['REF_TABLE_NAME'],
-                    $key['REF_COLUMN_NAME'],
-                    $key['ON_DELETE']
-                );
-            }
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
new file mode 100644
index 0000000000000..836826734f02d
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Fill main fields in create product form-->
+    <actionGroup name="fillMainBundleProductForm">
+        <arguments>
+            <argument name="product" defaultValue="BundleProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductName"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+    </actionGroup>
+
+    <!--Check that required fields are actually required-->
+    <actionGroup name="checkRequiredFieldsInBundleProductForm">
+        <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
+        <clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductName"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeStillOnEditPage"/>
+        <see selector="{{AdminProductFormSection.fieldError('name')}}" userInput="This is a required field." stepKey="seeNameRequired"/>
+        <see selector="{{AdminProductFormSection.fieldError('sku')}}" userInput="This is a required field." stepKey="seeSkuRequired"/>
+    </actionGroup>
+
+    <!--Filter product grid and see expected product-->
+    <actionGroup name="viewBundleProductInAdminGrid">
+        <arguments>
+            <argument name="product" defaultValue="BundleProduct"/>
+            <argument name="thumbnail" defaultValue="ProductPlaceholderImage"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{product.type_id}}" stepKey="selectionProductType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.name}}"  stepKey="seeProductNameInGrid"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
new file mode 100755
index 0000000000000..b3ac72d3f416e
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminClearFiltersActionGroup">
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
new file mode 100644
index 0000000000000..ad9a8253e910c
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateApiDynamicBundleProductActionGroup">
+        <arguments>
+            <argument name="productName" defaultValue="Api Dynamic Bundle Product" type="string"/>
+        </arguments>
+        <!--Create 4 simple products-->
+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+            <field key="price">4.99</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <field key="price">2.89</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct3">
+            <field key="price">7.33</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct4">
+            <field key="price">18.25</field>
+        </createData>
+        <!-- Create the bundle product based -->
+        <createData entity="ApiBundleProduct" stepKey="createBundleProduct">
+            <field key="name">{{productName}}</field>
+        </createData>
+        <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="required">false</field>
+        </createData>
+        <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_1"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_1"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_2"/>
+            <requiredEntity createDataKey="simpleProduct3"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_2"/>
+            <requiredEntity createDataKey="simpleProduct4"/>
+        </createData>
+    </actionGroup>
+    <actionGroup name="AdminCreateApiFixedBundleProductActionGroup">
+        <arguments>
+            <argument name="productName" defaultValue="Api Fixed Bundle Product" type="string"/>
+        </arguments>
+        <!--Create 4 simple products-->
+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+            <field key="price">4.99</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <field key="price">2.89</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct3">
+            <field key="price">7.33</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct4">
+            <field key="price">18.25</field>
+        </createData>
+        <!-- Create the bundle product based -->
+        <createData entity="ApiFixedBundleProduct" stepKey="createBundleProduct">
+            <field key="name">{{productName}}</field>
+        </createData>
+        <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="required">false</field>
+        </createData>
+        <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_1"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_1"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_2"/>
+            <requiredEntity createDataKey="simpleProduct3"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleOption1_2"/>
+            <requiredEntity createDataKey="simpleProduct4"/>
+        </createData>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
new file mode 100644
index 0000000000000..177f9203ed146
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="BundleProductFilter">
+        <!--Setting filter-->
+        <!--Prereq: go to admin product catalog page-->
+        <click selector="{{AdminProductFiltersSection.filter}}" stepKey="ClickOnFilter"/>
+        <click selector="{{AdminProductFiltersSection.typeDropDown}}" stepKey="ClickOnTypeDropDown"/>
+        <click selector="{{AdminProductFiltersSection.bundleOption}}" stepKey="ClickOnBundleOption"/>
+        <click selector="{{AdminProductFiltersSection.applyFilters}}" stepKey="ClickOnApplyFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
new file mode 100644
index 0000000000000..72e729111948f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateBasicBundleProduct">
+        <!--Prereq: Go to bundle product creation page-->
+        <!--Product name and SKU-->
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
+
+        <!--Trigger SEO drop down-->
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSeoDropDown"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
+        <waitForPageLoad stepKey="waitForDropDownSEO"/>
+
+        <!--Fill URL input-->
+        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="fillsInSeoLinkExtension"/>
+    </actionGroup>
+
+    <actionGroup name="addBundleOptionWithTwoProducts">
+        <arguments>
+            <argument name="x" type="string"/>
+            <argument name="n" type="string"/>
+            <argument name="prodOneSku" type="string"/>
+            <argument name="prodTwoSku" type="string"/>
+            <argument name="optionTitle" type="string"/>
+            <argument name="inputType" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" stepKey="scrollUpABit"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle(x)}}" stepKey="waitForOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle(x)}}" userInput="{{optionTitle}}" stepKey="fillTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType(x)}}" userInput="{{inputType}}" stepKey="selectType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.nthAddProductsToOption(n)}}" stepKey="waitForAddBtn"/>
+        <click selector="{{AdminProductFormBundleSection.nthAddProductsToOption(n)}}" stepKey="clickAdd"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters1"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters1"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodOneSku}}" stepKey="fillProductSkuFilter1"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters1"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad1" time="30"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters2"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters2"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodTwoSku}}" stepKey="fillProductSkuFilter2"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters2"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad2" time="30"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddButton1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="50" stepKey="fillQuantity1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="50" stepKey="fillQuantity2"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
new file mode 100644
index 0000000000000..e3ac6483bc7bd
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AncillaryPrepBundleProduct">
+        <!--Prereq: go to bundle product creation page-->
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
+
+        <!--Trigger SEO drop down-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
+        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
+
+        <!--Fill URL input-->
+        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
+    </actionGroup>
+
+    <!--Edit existing product by searching in product catalog-->
+    <actionGroup name="FindProductToEdit">
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+        <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <fillField userInput="{{BundleProduct.name}}" selector="#fulltext" stepKey="EnterProductNameInSearch"/>
+        <click stepKey="ClickSearch" selector="{{AdminProductFormBundleSection.searchButton}}"/>
+        <click stepKey="ClickOnProduct" selector="{{AdminProductFormBundleSection.firstCatalogProduct}}"/>
+        <waitForPageLoad stepKey="WaitForProductEditPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/SetBundleProductAttributesActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/SetBundleProductAttributesActionGroup.xml
new file mode 100644
index 0000000000000..50af5993af5bc
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/SetBundleProductAttributesActionGroup.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetBundleProductAttributes">
+        <arguments>
+            <argument name="attributeSet" defaultValue="Default" type="string"/>
+            <argument name="bundleProductName" defaultValue="defaultBundleProductNameAndSku" type="string"/>
+            <argument name="bundleProductSku" defaultValue="defaultBundleProductNameAndSku" type="string"/>
+            <argument name="price" defaultValue="10" type="string"/>
+            <argument name="stock" defaultValue="In Stock" type="string"/>
+            <argument name="weight" defaultValue="10" type="string"/>
+            <argument name="visibility" defaultValue="Catalog, Search" type="string"/>
+            <argument name="fromDate" defaultValue="10/10/2018" type="string"/>
+            <argument name="toDate" defaultValue="10/10/2018" type="string"/>
+            <argument name="country" defaultValue="Italy" type="string"/>
+        </arguments>
+
+        <!--
+        Pre-Reqs:
+        1) Go to bundle product creation page
+        2) Will not Enable/Disable
+        -->
+
+        <!--Apply Attribute Set-->
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{attributeSet}}" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
+
+        <!--Product name and SKU-->
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{bundleProductName}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{bundleProductSku}}" stepKey="fillProductSku"/>
+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectField"/>
+
+        <!--Dynamic SKU Toggle-->
+        <checkOption selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="clickOnToggle"/>
+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectFieldAgain"/>
+
+        <!--Dynamic Price Toggle-->
+        <checkOption selector="{{AdminProductFormBundleSection.dynamicPriceToggle}}" stepKey="clickOnDynamicPriceToggle"/>
+
+        <!--Tax Class-->
+        <selectOption selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="taxClassDropDown"/>
+
+        <!--Fill out price-->
+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="{{price}}" stepKey="fillOutPrice"/>
+
+        <!--Stock status-->
+        <selectOption selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="{{stock}}" stepKey="stockStatus"/>
+
+        <!--Dynamic weight-->
+        <checkOption selector="{{AdminProductFormBundleSection.dynamicWeightToggle}}" stepKey="dynamicWeight"/>
+
+        <!--Weight-->
+        <fillField selector="{{AdminProductFormBundleSection.weightField}}" userInput="{{weight}}" stepKey="fillIn"/>
+
+        <!--Visibilty-->
+        <selectOption selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="{{visibility}}" stepKey="openVisibility"/>
+
+        <!--Categories-->
+        <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="clickOnCategoriesDropDown"/>
+        <click selector="{{AdminProductFormBundleSection.defaultCategory}}" stepKey="selectDefaultCategory"/>
+        <click selector="{{AdminProductFormBundleSection.categoryDone}}" stepKey="clickOnCategoriesDoneToCloseOptions"/>
+
+        <!--New from - to-->
+        <fillField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="{{fromDate}}" stepKey="fillInFirstDate"/>
+        <fillField selector="{{AdminProductFormBundleSection.toDate}}" userInput="{{toDate}}" stepKey="fillInSecondDate"/>
+
+        <!--Country of manufacture-->
+        <selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="{{country}}" stepKey="countryOfManufactureDropDown"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
new file mode 100644
index 0000000000000..441303e8f1b84
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="currency" type="string" defaultValue="US Dollar"/>
+        </arguments>
+        <click selector="{{StorefrontBundledSection.currencyTrigger}}" stepKey="openCurrencyTrigger"/>
+        <click selector="{{StorefrontBundledSection.currency(currency)}}" stepKey="chooseCurrency"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+        <waitForPageLoad stepKey="waitForBundleOpen"/>
+        <checkOption selector="{{StorefrontBundledSection.productInBundle(product.name)}}" stepKey="chooseProduct"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="addToCartProduct"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
new file mode 100644
index 0000000000000..e36730a87b41a
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add Bundle Product to Cart from the category page with specified quantity to cart -->
+    <actionGroup name="StorefrontAddCategoryBundleProductToCartActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="quantity" defaultValue="1" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickCustomizeAndAddToCart"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+        <fillField selector="{{StorefrontBundleProductActionSection.quantityField}}" userInput="{{quantity}}" stepKey="fillBundleProductQuantity"/>
+        <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickAddBundleProductToCart"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
+        <waitForText userInput="{{quantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Add Bundle Product to Cart from the category page -->
+    <actionGroup name="StorefrontAddBundleProductFromCategoryToCartActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="moveMouseOverProduct"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="openProductPage"/>
+        <waitForPageLoad time="30" stepKey="waitForBundleProductPageLoad"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomizeAndAddToCart"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddBundleProductToCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitProductCount"/>
+        <see userInput="You added {{productName}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
new file mode 100644
index 0000000000000..60d11345731c1
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ApiBundleLink" type="bundle_link">
+        <var key="option_id" entityKey="return" entityType="bundle_option"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+        <data key="qty">1</data>
+        <data key="is_default">0</data>
+        <data key="price">1.11</data>
+        <data key="price_type">1</data>
+        <data key="can_change_quantity">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
new file mode 100644
index 0000000000000..a53ae9be4b75b
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DropDownBundleOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-dropdown</data>
+        <data key="required">true</data>
+        <data key="type">select</data>
+        <data key="position">0</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="RadioButtonsOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-radio</data>
+        <data key="required">true</data>
+        <data key="type">radio</data>
+        <data key="position">1</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="CheckboxOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-checkbox</data>
+        <data key="required">true</data>
+        <data key="type">checkbox</data>
+        <data key="position">3</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="MultipleSelectOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-multipleselect</data>
+        <data key="required">true</data>
+        <data key="type">multi</data>
+        <data key="position">4</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="AllBundleOptions" type="bundle_options">
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
new file mode 100644
index 0000000000000..e6866ae74a7e1
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomAttributeDynamicPrice" type="custom_attribute">
+        <data key="attribute_code">price_type</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="CustomAttributeFixPrice" type="custom_attribute">
+        <data key="attribute_code">price_type</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CustomAttributePriceView" type="custom_attribute">
+        <data key="attribute_code">price_view</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CustomAttributePriceViewRange" type="custom_attribute">
+        <data key="attribute_code">price_view</data>
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
new file mode 100644
index 0000000000000..9dc30e73228d3
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="BundleProduct" type="product">
+        <data key="name" unique="suffix">BundleProduct</data>
+        <data key="name2" unique="suffix">BundleProduct2</data>
+        <data key="sku" unique="suffix">bundleproduct</data>
+        <data key="sku2" unique="suffix">bundleproduct2</data>
+        <data key="type_id">bundle</data>
+        <data key="attribute_set_id">4</data>
+        <data key="optionTitle1">BundleOption</data>
+        <data key="optionInputType1">checkbox</data>
+        <data key="defaultQuantity">10</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">bundleproduct</data>
+        <data key="urlKey2" unique="suffix">bundleproduct2</data>
+        <data key="default_quantity1">10</data>
+        <data key="default_quantity2">20</data>
+        <data key="quantity">30</data>
+        <data key="set">4</data>
+        <data key="type">bundle</data>
+        <data key="price">10</data>
+        <data key="fixedPrice">10</data>
+        <data key="fixedPriceFormatted">$10.00</data>
+        <data key="defaultAttribute">Default</data>
+    </entity>
+    <entity name="ApiBundleProduct" type="product2">
+        <data key="name" unique="suffix">Api Bundle Product</data>
+        <data key="sku" unique="suffix">api-bundle-product</data>
+        <data key="type_id">bundle</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">api-bundle-product</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
+    </entity>
+    <entity name="ApiBundleProductPriceViewRange" type="product2">
+        <data key="name" unique="suffix">Api Bundle Product</data>
+        <data key="sku" unique="suffix">api-bundle-product</data>
+        <data key="type_id">bundle</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">api-bundle-product</data>
+        <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributePriceViewRange</requiredEntity>
+    </entity>
+    <entity name="ApiFixedBundleProduct" type="product2">
+        <data key="name" unique="suffix">Api Fixed Bundle Product</data>
+        <data key="sku" unique="suffix">api-fixed-bundle-product</data>
+        <data key="type_id">bundle</data>
+        <data key="attribute_set_id">4</data>
+        <data key="price">1.23</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">api-fixed-bundle-product</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeFixPrice</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE.txt b/app/code/Magento/Bundle/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE.txt
rename to app/code/Magento/Bundle/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE_AFL.txt b/app/code/Magento/Bundle/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE_AFL.txt
rename to app/code/Magento/Bundle/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
new file mode 100644
index 0000000000000..254f542316d10
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateBundleLink" dataType="bundle_link" type="create" auth="adminOauth" url="/V1/bundle-products/{sku}/links/{return}" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="bundle_link" key="linkedProduct">
+            <field key="sku">string</field>
+            <field key="option_id">integer</field>
+            <field key="qty">integer</field>
+            <field key="position">integer</field>
+            <field key="is_default">boolean</field>
+            <field key="price">number</field>
+            <field key="price_type">integer</field>
+            <field key="can_change_quantity">integer</field>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
new file mode 100644
index 0000000000000..4e1dc7ac9cb50
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateBundleOption" dataType="bundle_option" type="create" auth="adminOauth" url="/V1/bundle-products/options/add" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="bundle_option" key="option">
+            <field key="title">string</field>
+            <field key="required">boolean</field>
+            <field key="type">string</field>
+            <field key="position">integer</field>
+            <field key="sku">string</field>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
new file mode 100644
index 0000000000000..df931c74191f9
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="GetAllBundleOptions" dataType="bundle_options" type="get" auth="adminOauth" url="/V1/bundle-products/{sku}/options/all" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
new file mode 100644
index 0000000000000..782c97aab1a29
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCatalogProductPage" url="catalog/product/" area="admin" module="Magento_Bundle">
+        <section name="AdminCatalogProductSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..562ded6c8e40f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  /**
+   * Copyright © Magento, Inc. All rights reserved.
+   * See COPYING.txt for license details.
+   */
+ -->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminProductFormBundleSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Bundle/Test/Mftf/README.md b/app/code/Magento/Bundle/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8e8da0c15fa56
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Bundle Functional Tests
+
+The Functional Test Module for **Magento Bundle** module.
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
new file mode 100644
index 0000000000000..814d03c52f4be
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormBundleSection">
+        <element name="bundleItemsToggle" type="button" selector="//span[text()='Bundle Items']"/>
+        <element name="shipmentType" type="select" selector=".admin__control-select[name='product[shipment_type]']"/>
+        <element name="addOption" type="button" selector="button[data-index='add_button']"/>
+        <element name="firstOptionTitle" type="input" selector="[name='bundle_options[bundle_options][0][title]']"/>
+        <element name="firstInputType" type="select" selector="[name='bundle_options[bundle_options][0][type]']"/>
+        <element name="firstRequired" type="checkbox" selector="[name='bundle_options[bundle_options][0][required]']"/>
+        <element name="firstProductQuantity" type="input" selector="[name='bundle_options[bundle_options][0][bundle_selections][0][selection_qty]']"/>
+        <element name="bundleOptionXTitle" type="input" selector="[name='bundle_options[bundle_options][{{x}}][title]']" parameterized="true"/>
+        <element name="bundleOptionXInputType" type="select" selector="[name='bundle_options[bundle_options][{{x}}][type]']" parameterized="true"/>
+        <element name="bundleOptionXRequired" type="checkbox" selector="[name='bundle_options[bundle_options][{{x}}][required]']" parameterized="true"/>
+        <element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
+        <element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
+        <element name="nthAddProductsToOption" type="button" selector="//tr[{{var}}]//button[@data-index='modal_set']" timeout="30" parameterized="true"/>
+        <!--Select"url Key"InputForm-->
+        <element name="urlKey" type="input" selector="//input[@name='product[url_key]']" timeout="30"/>
+        <!--AddSelectedProducts-->
+        <element name="addSelectedProducts" type="button" selector="//span[contains(text(),'Add Selected Products')]/ancestor::button" timeout="30"/>
+        <!--DefaultQuantities-->
+        <element name="defaultQuantity1" type="input" selector="//input[@name='bundle_options[bundle_options][0][bundle_selections][0][selection_qty]']" timeout="30"/>
+        <element name="defaultQuantity2" type="input" selector="//input[@name='bundle_options[bundle_options][0][bundle_selections][1][selection_qty]']" timeout="30"/>
+        <element name="productName" type="input" selector="//*[@name='product[name]']"/>
+        <element name="productSku" type="input" selector="//*[@name='product[sku]']"/>
+        <!--TestingForLocationOfOptions-->
+        <element name="bundleOptionSelector" type="button" selector="//*[@id='bundle-slide']/span"/>
+        <element name="bundleOptionSelection" type="button" selector="//div[@class='nested options-list']/div[2]/label[@class='label']"/>
+        <!--SelectorsForDescriptionCreationOnBundleProduct-->
+        <element name="contentDropDown" type="button" selector="div[data-index='content']" timeout="30"/>
+        <element name="contentDropDownIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
+        <element name="longDescription" type="input" selector="#product_form_description"/>
+        <element name="shortDescription" type="input" selector="#product_form_short_description"/>
+        <!--BundleOptinsDropDown-->
+        <element name="bundleOptionsDropDown" type="button" selector="div[data-index='bundle-items']" timeout="30"/>
+        <!--AddingAnOption-->
+        <element name="addOptions" type="button" selector="//tr[@data-repeat-index='0']//td[4]" timeout="30"/>
+        <!--SEODropdownTab-->
+        <element name="seoDropdown" type="button" selector="//div[@data-index='search-engine-optimization']"/>
+        <element name="seoDependent" type="button" selector="//div[@data-index='search-engine-optimization']//div[contains(@class, '_show')]"/>
+        <!--NameOfProductOnProductPage-->
+        <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
+        <!--EnableDisableToggle-->
+        <element name="enableDisableToggle" type="checkbox" selector="//*[@id='container']//input[@name='product[status]']/.." timeout="30"/>
+        <element name="enableDisableToggleOn" type="checkbox" selector="//*[@id='container']//input[@name='product[status]' and @value='1']/.."/>
+        <element name="enableDisableToggleOff" type="checkbox" selector="//*[@id='container']//input[@name='product[status]' and @value='2']/.."/>
+        <!--SearchButton-->
+        <element name="searchButton" type="button" selector="//div[@class='data-grid-search-control-wrap']//*[@type='button']" timeout="30"/>
+        <!--ClickOnFirstProductInCatalog-->
+        <element name="firstCatalogProduct" type="button" selector="//table[@class='data-grid data-grid-draggable']/tbody/tr[@class='data-row']/td[4]"/>
+        <element name="bundledItems" type="block" selector="[data-index=bundle-items]"/>
+        <element name="dynamicPrice" type="button" selector="//div[@data-index='price_type']//div[@data-role='switcher']" timeout="30"/>
+        <element name="priceField" type="input" selector="//div[@data-index='price']//input"/>
+        <element name="listedBundleItem" type="text" selector="//tr[@data-repeat-index='0']//div"/>
+        <element name="listedBundleItem2" type="text" selector="//tr[@data-repeat-index='2']//div"/>
+        <!--FirstProductOption-->
+        <element name="firstProductOption" type="checkbox" selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']"/>
+        <element name="dynamicSkuToggle" type="checkbox" selector="div[data-index='sku_type'] .admin__actions-switch-label" timeout="30"/>
+        <element name="dynamicPriceToggle" type="checkbox" selector="//div[@data-index='price_type']//div[@data-role='switcher']"/>
+        <element name="taxClassDropDown" type="select" selector="//select[@name='product[tax_class_id]']" timeout="30"/>
+        <element name="taxableGoodsOption" type="text" selector="//select[@name='product[tax_class_id]']//option[@data-title='Taxable Goods']"/>
+        <element name="stockStatusField" type="select" selector="//select[@name='product[quantity_and_stock_status][is_in_stock]']"/>
+        <element name="inStockOption" type="text" selector="//select[@name='product[quantity_and_stock_status][is_in_stock]']//option[@data-title='{{stock}}']" parameterized="true" timeout="30"/>
+        <element name="dynamicWeightToggle" type="checkbox" selector="//div[@data-index='weight_type']//div[@data-role='switcher']" timeout="30"/>
+        <element name="weightField" type="input" selector="//div[@data-index='weight']//input"/>
+        <element name="categoriesDropDown" type="block" selector="//div[@data-index='category_ids']//div[@class='admin__field-control']" timeout="30"/>
+        <element name="defaultCategory" type="text" selector="//div[@data-index='category_ids']//span[contains(text(), 'Default Category')]"/>
+        <element name="visibilityDropDown" type="select" selector="//select[@name='product[visibility]']"/>
+        <element name="catalogOption1" type="text" selector="//select[@name='product[visibility]']//option[1]"/>
+        <element name="catalogOption2" type="text" selector="//select[@name='product[visibility]']//option[2]"/>
+        <element name="fromDate" type="input" selector="//div[@data-index='news_from_date']//input"/>
+        <element name="toDate" type="input" selector="//div[@data-index='news_to_date']//input"/>
+        <element name="countryOfManufactureDropDown" type="select" selector="//select[@name='product[country_of_manufacture]']"/>
+        <element name="selectCountryOfManufacture" type="text" selector="//select[@name='product[country_of_manufacture]']//option[@data-title='{{country}}']" parameterized="true"/>
+        <element name="dynamicSkuToggleOn" type="checkbox" selector="//div[@data-index='sku_type']//div[@data-role='switcher']//input[@value='0']"/>
+        <element name="dynamicSkuToggleOff" type="checkbox" selector="//div[@data-index='sku_type']//div[@data-role='switcher']//input[@value='1']"/>
+        <element name="dynamicWeightToggleOn" type="checkbox" selector="//div[@data-index='weight_type']//div[@data-role='switcher']//input[@value='0']"/>
+        <element name="dynamicWeightToggleOff" type="checkbox" selector="//div[@data-index='weight_type']//div[@data-role='switcher']//input[@value='1']"/>
+        <element name="categoryFieldName" type="text" selector="//fieldset[@data-index='container_category_ids']//label//span" timeout="30"/>
+        <element name="categoryDone" type="button" selector=".admin__action-multiselect-actions-wrap [type='button'] span" timeout="30"/>
+        <element name="dynamicPriceToggleOff" type="checkbox" selector="//div[@data-index='price_type']//div[@data-role='switcher']//input[@value='1']"/>
+        <!--Category Selection-->
+        <element name="categoryByName" type="multiselect" selector="//div[@data-index='category_ids']//span[contains(text(), '{{category}}')]" parameterized="true"/>
+        <element name="searchForCategory" type="input" selector="div.action-menu._active > div.admin__action-multiselect-search-wrap input" timeout="30"/>
+        <element name="selectCategory" type="multiselect" selector="//div[@class='action-menu _active']//label[@class='admin__action-multiselect-label']"/>
+        <element name="categoriesLabel" type="text" selector="//div[@class='action-menu _active']//button[@data-action='close-advanced-select']"/>
+        <element name="userDefinedQuantity" type="checkbox" selector="[name='bundle_options[bundle_options][{{option}}][bundle_selections][{{product}}][selection_can_change_qty]'][type='checkbox']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
new file mode 100644
index 0000000000000..7a188fd58e1af
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="BundleStorefrontSection">
+        <!--TestingForLocationOfOptions-->
+        <element name="bundleOptionSelector" type="checkbox" selector="//*[@id='bundle-slide']/span" timeout="30"/>
+        <element name="bundleOptionSelection" type="checkbox" selector="//div[@class='nested options-list']/div[{{optionNumber}}]/label[@class='label']" parameterized="true"/>
+        <!--Description-->
+        <!--CE exclusively-->
+        <element name="longDescriptionText" type="text" selector="//*[@id='description']/div/div" timeout="30"/>
+        <element name="shortDescriptionText" type="text" selector="//div[@class='product attribute overview']" timeout="30"/>
+        <!--NameOfProductOnProductPage-->
+        <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
+        <!--PageNotFoundErrorMessage-->
+        <element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
new file mode 100644
index 0000000000000..946992f1efe04
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontBundledSection">
+        <element name="nthBundledOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
+        <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>
+        <element name="addToCartConfigured" type="button" selector="#product-addtocart-button" timeout="30"/>
+        <element name="updateCart" type="button" selector="#product-updatecart-button" timeout="30"/>
+        <element name="configuredPrice" type="block" selector=".price-configured_price .price"/>
+        <element name="fixedPricing" type="text" selector="//div[@class='price-box price-final_price']//span[@id]//..//span[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="customizeProduct" type="button" selector="//*[@id='bundle-slide']"/>
+        <element name="customizableBundleItemOption" type="text" selector="//div[@class='field choice'][1]//input[@type='checkbox']"/>
+        <element name="customizableBundleItemOption2" type="text" selector="//div[@class='field choice'][2]//input[@type='checkbox']"/>
+        <element name="nthOptionDiv" type="block" selector="#product-options-wrapper div.field.option:nth-of-type({{var}})" parameterized="true"/>
+        <element name="nthItemOptionsTitle" type="text" selector="dl.item-options dt:nth-of-type({{var}})" parameterized="true"/>
+        <element name="nthItemOptionsValue" type="text" selector="dl.item-options dd:nth-of-type({{var}})" parameterized="true"/>
+        <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
+        <element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
+        <element name="dropDownOptionOneProducts" type="select" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//select" parameterized="true"/>
+        <element name="productInBundle" type="select" selector="//label//span[contains(text(), '{{productName}}')]" parameterized="true"/>
+        <element name="dropDownOptionOneQuantity" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input" parameterized="true"/>
+        <element name="radioButtonOptionTwoProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
+        <element name="radioButtonOptionTwoQuantity" type="input" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field qty qty-holder']//input" parameterized="true"/>
+        <element name="checkboxOptionThreeProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
+        <element name="multiselectOptionFourProducts" type="multiselect" selector="//label//span[contains(text(), '{{productName}}')]/../..//select[@multiple='multiple']" parameterized="true"/>
+        <element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
+        <element name="currency" type="select" selector="//a[text()='{{arg}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 0000000000000..3d5dc61d88a87
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="priceToByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-to" parameterized="true"/>
+        <element name="priceFromByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-from" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml
new file mode 100644
index 0000000000000..9dc4aed26bef0
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductActionSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontBundleProductActionSection">
+        <element name="customizeAndAddToCartButton" type="button" selector="#bundle-slide"/>
+        <element name="quantityField" type="input" selector="#qty"/>
+        <element name="addToCartButton" type="button" selector="#product-addtocart-button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..fae1ec331b667
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="priceFrom" type="text" selector=".product-info-price .price-from"/>
+        <element name="priceTo" type="text" selector=".product-info-price .price-to"/>
+        <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
+        <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
+        <element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
new file mode 100644
index 0000000000000..401d360a34c64
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddBundleItemsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to add/edit bundle items when creating/editing a bundle product"/>
+            <description value="Admin should be able to add/edit bundle items when creating/editing a bundle product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-223"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Creating data-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct0"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
+            <!--Admin login-->
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+        </before>
+        <after>
+            <!--Deleting data-->
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <!--Logging out-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct0$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Fill out ancillary data on bundle product-->
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts">
+            <argument name="bundleProduct" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Checking on admin side-->
+        <scrollToTopOfPage stepKey="scroll"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems2"/>
+        <seeElement stepKey="LookingForBundleItemPresence" selector="{{AdminProductFormBundleSection.listedBundleItem}}"/>
+
+        <!--Checking on customer side-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductPageToLoad"/>
+        <seeElement selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="LookingForAbilityToAddOptions"/>
+        <click selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="clickButtonToCustomize"/>
+        <waitForPageLoad stepKey="waitCustomizationDropDown"/>
+        <seeElement selector="{{StorefrontBundledSection.customizableBundleItemOption}}" stepKey="seeBundleItem"/>
+
+        <!--Add another bundle option with 2 items-->
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+        <waitForPageLoad stepKey="WaitForClear"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormBundleSection.addOptions}}" stepKey="clickOnBundleProductToEdit"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItemsToEdit"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" stepKey="waitForBundleOptionsToAppear"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillNewestOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('1')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectNewInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToNewBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToNewOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterNewBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterNewBundleProductOptions">
+                <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']" stepKey="selectNewFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterNewBundleProductOptions2">
+                <argument name="product" value="$$simpleProduct3$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminProductFormBundleSection.firstProductOption}}" stepKey="selectNewFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddNewSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '2')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '3')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty2"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
+        <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
+
+        <!--Checking on admin side-->
+        <scrollToTopOfPage stepKey="scrollAgain"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenNewSectionBundleItems2"/>
+        <seeElement selector="{{AdminProductFormBundleSection.listedBundleItem2}}" stepKey="LookingForNewBundleItemPresence"/>
+
+        <!--Checking on customer side-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
+        <waitForPageLoad stepKey="waitForBundleProductPageToLoadAgain"/>
+        <seeElement selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="LookingForAbilityToAddBothOptions"/>
+        <click selector="{{StorefrontBundledSection.customizeProduct}}" stepKey="clickButtonAgainToCustomize"/>
+        <waitForPageLoad stepKey="waitForBothCustomizationDropDown"/>
+        <seeElement selector="{{StorefrontBundledSection.customizableBundleItemOption2}}" stepKey="seeBundleItems"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
new file mode 100644
index 0000000000000..21e6be98b3169
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultImageBundleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default images for a Bundle Product"/>
+            <description value="Admin should be able to add default images for a Bundle Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-115"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <!-- scrollTo before click to fix flaky failure -->
+        <scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOption"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!--Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
new file mode 100644
index 0000000000000..3c00344697699
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultVideoBundleProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default video for a Bundle Product"/>
+            <description value="Admin should be able to add default video for a Bundle Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-110"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillMainProductForm">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <scrollTo selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="openBundleSection" after="scrollToSection"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption" after="openBundleSection"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleTitle" after="clickAddOption"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillBundleTitle" after="waitForBundleTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectOptionBundleTitle" after="fillBundleTitle"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProducts" after="selectOptionBundleTitle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProducts" after="waitForAddProducts"/>
+        <waitForPageLoad stepKey="waitForPageLoad" after="clickAddProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForPageLoad">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="addProducts" after="checkOption2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty1" after="addProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty2" before="saveProductForm"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
new file mode 100644
index 0000000000000..1d2f21b7d15f9
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAttributeSetSelectionTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to select/edit the “Attributes Set” when creating/editing a bundle product"/>
+            <description value="Admin should be able to select/edit the “Attributes Set” when creating/editing a bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-221"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Create a new attribute set -->
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{AdminProductAttributeSetGridSection.addAttributeSetBtn}}" stepKey="clickAddAttributeSet"/>
+        <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillName"/>
+        <selectOption selector="{{AdminProductAttributeSetSection.basedOn}}" userInput="Default" stepKey="selectDefaultSet"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('meta_keyword')}}" selector2="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" stepKey="unassign1"/>
+        <click selector="{{AdminProductAttributeSetSection.addNewGroupBtn}}" stepKey="clickAddNewGroup"/>
+        <fillField selector="{{AdminProductAttributeSetSection.newGroupName}}" userInput="TestGroupName" stepKey="fillNewGroupName"/>
+        <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="clickOkInModal"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" selector2="{{AdminProductAttributeSetSection.attribute('TestGroupName')}}" stepKey="assignManufacturer"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave2"/>
+
+        <!-- Go to new product page and see a default attribute -->
+        <!-- Switch from default attribute set to new attribute set -->
+        <amOnPage url="{{AdminProductCreatePage.url('4', 'bundle')}}" stepKey="goToNewProductPage"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
+
+        <!--save the product/published by default-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Testing that price appears correctly in admin catalog-->
+        <!--Set filter to product name-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <seeElement selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeSet"/>
+
+        <!--Editing Attribute set-->
+        <click selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="clickAttributeSet2"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet2"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{BundleProduct.defaultAttribute}}" stepKey="searchForAttrSet2"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet2"/>
+
+        <!--save the product/published by default-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
+
+        <!--Testing that price appears correctly in admin catalog-->
+        <!--Set filter to product name-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage2"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad2"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName2">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <seeElement selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(BundleProduct.defaultAttribute)}}" stepKey="seeAttributeSet2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
new file mode 100644
index 0000000000000..c6a07f7ed95c3
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminBasicBundleProductAttributesTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to set/edit all the basic product attributes when creating/editing a bundle product"/>
+            <description value="Admin should be able to set/edit all the basic product attributes when creating/editing a bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-222"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+        <!--Create attribute set-->
+        <actionGroup ref="CreateDefaultAttributeSet" stepKey="createDefaultAttributeSet">
+            <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
+        </actionGroup>
+
+        <!--Go to product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
+
+        <!--Enable/Disable Toggle-->
+        <checkOption selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="clickOnEnableDisableToggle"/>
+
+        <!--Fill out product attributes-->
+        <actionGroup ref="SetBundleProductAttributes" stepKey="fillOutAllAttributes">
+            <!--primarily uses default values-->
+            <argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>
+            <argument name="bundleProductName" value="{{BundleProduct.name}}"/>
+            <argument name="bundleProductSku" value="{{BundleProduct.sku}}"/>
+            <argument name="visibilty" value="catalog"/>
+        </actionGroup>
+
+        <!--Verify form was filled out correctly-->
+
+        <!--Enable/Disable Toggle check-->
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="seeToggleIsOff"/>
+
+        <!--Apply Attribute Set-->
+        <seeOptionIsSelected selector="{{AdminProductFormSection.attributeSet}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeSet"/>
+
+        <!--Product name and SKU-->
+        <seeInField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="seeProductSku"/>
+
+        <!--Dynamic SKU Toggle-->
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="seeDynamicSkuToggleOff"/>
+
+        <!--Dynamic Price Toggle-->
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.dynamicPriceToggle}}" stepKey="seeDynamicPriceToggleOff"/>
+
+        <!--Tax Class-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass"/>
+
+        <!--Fill out price-->
+        <seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="10" stepKey="seePrice"/>
+
+        <!--Stock status-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="In Stock" stepKey="seeStockStatus"/>
+
+        <!--Dynamic weight-->
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormBundleSection.dynamicWeightToggle}}" stepKey="seeDynamicWeightOff"/>
+
+        <!--Weight-->
+        <seeInField selector="{{AdminProductFormBundleSection.weightField}}" userInput="10" stepKey="seeWeight"/>
+
+        <!--Visibilty-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Catalog" stepKey="seeVisibility"/>
+
+        <!--Categories-->
+        <seeElement selector="{{AdminProductFormBundleSection.defaultCategory}}" stepKey="seeDefaultCategory"/>
+
+        <!--New from - to-->
+        <seeInField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="10/10/2018" stepKey="seeFirstDate"/>
+        <seeInField selector="{{AdminProductFormBundleSection.toDate}}" userInput="10/10/2018" stepKey="seeSecondDate"/>
+
+        <!--Country of manufacture-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="Italy" stepKey="seeCountryOfManufacture"/>
+
+        <!--Create second attribute set for edit-->
+        <actionGroup ref="CreateDefaultAttributeSet" stepKey="createSecondAttributeSet">
+            <argument name="label" value="{{ProductAttributeFrontendLabelTwo.label}}"/>
+        </actionGroup>
+
+        <!--Filter catalog-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <click selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="clickAttributeSet2"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+
+        <!--Edit fields-->
+
+        <!--Enable/Disable Toggle-->
+        <checkOption selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="clickOnEnableDisableToggleAgain"/>
+
+        <!--Apply Attribute Set-->
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{ProductAttributeFrontendLabelTwo.label}}" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResultByName(ProductAttributeFrontendLabelTwo.label)}}" stepKey="selectAttrSet"/>
+
+        <!--Product name and SKU-->
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name2}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku"/>
+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectField"/>
+
+        <!--Dynamic SKU Toggle-->
+        <checkOption selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="clickOnToggle"/>
+        <click selector="{{AdminProductFormBundleSection.productName}}" stepKey="clickUnselectFieldAgain"/>
+
+        <!--Fill out price-->
+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20" stepKey="fillOutPrice"/>
+
+        <!--Stock status-->
+        <selectOption selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="Out of Stock" stepKey="stockStatus"/>
+
+        <!--Dynamic weight-->
+        <checkOption selector="{{AdminProductFormBundleSection.dynamicWeightToggle}}" stepKey="dynamicWeight"/>
+
+        <!--Visibilty-->
+        <selectOption selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Not Visible Individually" stepKey="openVisibility"/>
+
+        <!--New from - to-->
+        <fillField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="10/20/2018" stepKey="fillInFirstDate"/>
+        <fillField selector="{{AdminProductFormBundleSection.toDate}}" userInput="10/20/2018" stepKey="fillInSecondDate"/>
+
+        <!--Country of manufacture-->
+        <selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="countryOfManufactureDropDown"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Verify form was filled out correctly after edit-->
+
+        <!--Enable/Disable Toggle-->
+        <seeElement selector="{{AdminProductFormBundleSection.enableDisableToggleOn}}" stepKey="seeToggleIsOn2"/>
+
+        <!--Attribute Set-->
+        <seeOptionIsSelected selector="{{AdminProductFormSection.attributeSet}}" userInput="{{ProductAttributeFrontendLabelTwo.label}}" stepKey="seeAttributeSet2"/>
+
+        <!--Product name and SKU-->
+        <seeInField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name2}}" stepKey="seeProductName2"/>
+        <seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="seeProductSku2"/>
+
+        <!--Dynamic SKU Toggle-->
+        <seeElement selector="{{AdminProductFormBundleSection.dynamicSkuToggleOn}}" stepKey="seeDynamicSkuToggleOn2"/>
+
+        <!--Tax Class-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass2"/>
+
+        <!--Price-->
+        <seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20" stepKey="seePrice2"/>
+
+        <!--Stock status-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="Out of Stock" stepKey="seeStockStatus2"/>
+
+        <!--Dynamic weight-->
+        <seeElement selector="{{AdminProductFormBundleSection.dynamicWeightToggleOn}}" stepKey="seeDynamicWeightOn2"/>
+
+        <!--Visibilty-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.visibilityDropDown}}" userInput="Not Visible Individually" stepKey="seeVisibility2"/>
+
+        <!--Categories-->
+        <seeElement selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="seeDefaultCategory2"/>
+
+        <!--New from - to-->
+        <seeInField selector="{{AdminProductFormBundleSection.fromDate}}" userInput="10/20/2018" stepKey="seeFirstDate2"/>
+        <seeInField selector="{{AdminProductFormBundleSection.toDate}}" userInput="10/20/2018" stepKey="seeSecondDate2"/>
+
+        <!--Country of manufacture-->
+        <seeOptionIsSelected selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="seeCountryOfManufacture2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..65733a5bcc037
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBundleProductSetEditContentTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminBundleProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to set/edit product Content when editing a bundle product"/>
+            <description value="Admin should be able to set/edit product Content when editing a bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3343"/>
+            <group value="Bundle"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <after>
+            <!-- Delete bundle product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--Checking content storefront-->
+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
new file mode 100644
index 0000000000000..86db6f372b5f8
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteABundleProduct">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Admin list bundle products"/>
+            <title value="Admin should be able to delete a bundle product"/>
+            <description value="Admin should be able to delete a bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-216"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!--Create bundle product-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Fill out ancillary data on bundle product-->
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Go to catalog deletion page-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogPage"/>
+        <waitForPageLoad stepKey="Loading"/>
+
+        <!--Apply Name Filter-->
+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="SelectAllOnly1"/>
+        <waitForPageLoad stepKey="loading2"/>
+
+        <!--Delete-->
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
+        <click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
+        <waitForPageLoad stepKey="loading3"/>
+
+        <!--Locating delete message-->
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="deleteMessage"/>
+
+        <!--Testing deletion of product-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
+        <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
+        <dontSeeElement selector="{{StorefrontBundledSection.bundleProductName}}" stepKey="LookingForNameOfProductTwo"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
new file mode 100644
index 0000000000000..08faa9d2444df
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEditRelatedBundleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to set/edit Related Products information when editing a bundle product"/>
+            <description value="Admin should be able to set/edit Related Products information when editing a bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3342"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Admin login-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct0"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+        </before>
+        <after>
+            <!-- Delete the bundled product -->
+            <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+            <!--Logging out-->
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct0">
+            <argument name="sku" value="$$simpleProduct0.sku$$"/>
+        </actionGroup>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+
+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct1">
+            <argument name="sku" value="$$simpleProduct1.sku$$"/>
+        </actionGroup>
+
+        <!--Remove previous related product-->
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
+
+        <!--See related product in admin-->
+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" stepKey="scrollTo"/>
+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
+
+        <!--See related product in storefront-->
+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <see userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProductInStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
new file mode 100644
index 0000000000000..40a6e1b75c60a
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminFilterProductListByBundleProduct">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Admin list bundle products"/>
+            <title value="Admin should be able to filter product list by type = Bundle Product"/>
+            <description value="Admin should be able to filter product list by type = Bundle Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-214"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!--Create bundle product-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductCreationPage"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Fill out ancillary data on bundle product-->
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Apply Bundle Product Filter-->
+        <!--Clear Filters-->
+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFilters"/>
+
+        <!--Setting filter-->
+        <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
+
+        <!--Testing application of filter-->
+        <see selector="{{AdminProductFiltersSection.productType('0')}}" userInput="Bundle Product" stepKey="correcType0"/>
+        <dontSeeElement selector="{{AdminProductFiltersSection.AllProductsNotOfBundleType}}" stepKey="checkingRowsForIncorrectType"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
new file mode 100644
index 0000000000000..c0edbf14e894b
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassDeleteBundleProductsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Admin list bundle products"/>
+            <title value="Admin should be able to mass delete bundle products"/>
+            <description value="Admin should be able to mass delete bundle products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-218"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
+        </before>
+        <after>
+            <!--Clear Filters-->
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+        </after>
+
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!--Create bundle product-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Fill out ancillary data on bundle product-->
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts">
+            <argument name="bundleProduct" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Creating Second bundle product-->
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage2" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad2"/>
+
+        <!--Create bundle product 2-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems2"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption32"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle2"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType2"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle2"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption2"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptionsx2">
+            <argument name="product" value="$$simpleProduct3$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRowx2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions22">
+            <argument name="product" value="$$simpleProduct4$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow22"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty12"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty22"/>
+
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name2}}" stepKey="fillProductName2"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
+
+        <!--Trigger SEO drop down-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
+        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
+
+        <!--Fill URL input-->
+        <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
+
+        <!--Mass delete bundle products-->
+        <!--Clear Filters-->
+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFilters"/>
+
+        <!--Setting filter-->
+        <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
+
+        <!--Delete-->
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="SelectAllOnly1"/>
+        <waitForPageLoad stepKey="loading"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
+        <click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
+        <waitForPageLoad stepKey="loading3"/>
+
+        <!--Locating delete message-->
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="deleteMessage"/>
+
+        <!--Clear Cache - resets products according to enabled/disabled view-->
+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="ClearPageCaches"/>
+
+        <!--Testing deletion of products-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
+        <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
+        <dontSeeElement stepKey="LookingForNameOfProduct" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+        <seeElement stepKey="LookingForPageNotFoundMessage" selector="{{StorefrontBundledSection.pageNotFound}}"/>
+        <amOnPage url="{{BundleProduct.urlKey2}}.html" stepKey="GoToProductPageAgain2"/>
+        <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement2"/>
+        <dontSeeElement stepKey="LookingForNameOfProduct2" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+        <seeElement stepKey="LookingForPageNotFoundMessage2" selector="{{StorefrontBundledSection.pageNotFound}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
new file mode 100644
index 0000000000000..f87897bd579a3
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminProductBundleCreationTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to save and publish a bundle product"/>
+            <description value="Admin should be able to save and publish a bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-225"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Creating Data-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+
+            <!-- Admin Login-->
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Create a bundle product with ancillary data-->
+        <actionGroup ref="CreateBasicBundleProduct" stepKey="createBundledProduct">
+            <argument name="bundleProduct" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--save the product/published by default-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!-- go to page-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPage"/>
+
+        <!--Test Assertion - on correct page/page has been published-->
+        <waitForPageLoad stepKey="waitForBundleProductPageToLoad"/>
+        <seeElement stepKey="LookingForNameOfProduct" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
new file mode 100644
index 0000000000000..1438958b92b61
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultImageBundleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default images from a Bundle Product"/>
+            <description value="Admin should be able to remove default images from a Bundle Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-200"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <!-- scrollTo before click to fix flaky failure -->
+        <scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOption"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!--Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Remove image from product -->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
new file mode 100644
index 0000000000000..e3cb68b6664e2
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultVideoBundleProductTest"  extends="AdminRemoveDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default video from a Bundle Product"/>
+            <description value="Admin should be able to remove default video from a Bundle Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-205"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillMainProductForm">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <scrollTo selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="openBundleSection" after="scrollToSection"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption" after="openBundleSection"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleTitle" after="clickAddOption"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillBundleTitle" after="waitForBundleTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectOptionBundleTitle" after="fillBundleTitle"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProducts" after="selectOptionBundleTitle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProducts" after="waitForAddProducts"/>
+        <waitForPageLoad stepKey="waitForPageLoad" after="clickAddProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForPageLoad">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="addProducts" after="checkOption2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty1" after="addProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillQty2" before="saveProductForm"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
new file mode 100644
index 0000000000000..0b220efaad49f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
@@ -0,0 +1,195 @@
+<?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="AdvanceCatalogSearchBundleByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Bundle product with product name"/>
+            <description value="Guest customer should be able to advance search Bundle product with product name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-139"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchBundleBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Bundle product with product sku"/>
+            <description value="Guest customer should be able to advance search Bundle product with product sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-143"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Bundle product with product description"/>
+            <description value="Guest customer should be able to advance search Bundle product with product description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-242"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Bundle product with product short description"/>
+            <description value="Guest customer should be able to advance search Bundle product with product short description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-250"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Bundle product with product price"/>
+            <description value="Guest customer should be able to advance search Bundle product with product price"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-251"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+            </createData>
+            <getData entity="GetProduct" stepKey="arg1">
+                <requiredEntity createDataKey="product"/>
+            </getData>
+            <getData entity="GetProduct" stepKey="arg2">
+                <requiredEntity createDataKey="simple1"/>
+            </getData>
+            <getData entity="GetProduct" stepKey="arg3">
+                <requiredEntity createDataKey="simple2"/>
+            </getData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
new file mode 100644
index 0000000000000..574c0dccdb07f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="BundleProductFixedPricingTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle Product Pricing"/>
+            <title value="Admin should be able to apply fixed pricing for Bundled Product"/>
+            <description value="Admin should be able to apply fixed pricing for Bundled Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-186"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Creating data-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+
+            <!--Admin login-->
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Fill out ancillary data on bundle product-->
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts">
+            <argument name="bundleProduct" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--Disable dynamic pricing and enter fixed price of product-->
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="clickDynamicPriceSwitcher"/>
+        <fillField userInput="{{BundleProduct.fixedPrice}}" selector="{{AdminProductFormBundleSection.priceField}}" stepKey="fillPrice"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Testing that price appears correctly in admin catalog-->
+        <!--Set filter to product name-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+        <waitForPageLoad stepKey="WaitForClear"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <seeElement selector="{{AdminProductFiltersSection.priceOfFirstRow(BundleProduct.fixedPrice)}}" stepKey="seePrice"/>
+        <!--Storefront-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
+        <seeElement selector="{{StorefrontBundledSection.fixedPricing(BundleProduct.fixedPrice)}}" stepKey="checkingForFixedPrice"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
new file mode 100644
index 0000000000000..ded8bb3c83337
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+        <test name="CurrencyChangingBundleProductInCartTest">
+            <annotations>
+                <features value="Bundle"/>
+                <stories value="Check that after changing currency price of cart is correct when the bundle product added to the cart"/>
+                <title value="User should be able change the currency and get right price in cart when the bundle product added to the cart"/>
+                <description value="User should be able change the currency and add one more product in cart and get right price in previous currency"/>
+                <severity value="MAJOR"/>
+                <testCaseId value="MAGETWO-94467"/>
+                <group value="Bundle"/>
+            </annotations>
+            <before>
+                <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+                <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+                <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            </before>
+            <after>
+                <!-- Delete the bundled product -->
+                <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+                    <argument name="product" value="BundleProduct"/>
+                </actionGroup>
+                <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
+                <waitForPageLoad stepKey="waitForClearFilter"/>
+                <!--Clear Configs-->
+                <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+                <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
+                <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
+                <waitForPageLoad stepKey="waitForConfigCurrencySetupPageForUnselectEuroCurrency"/>
+                <unselectOption selector="{{CurrencySetupSection.allowCurrencies}}" userInput="Euro" stepKey="unselectEuro"/>
+                <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+                <click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="closeOptions"/>
+                <waitForPageLoad stepKey="waitForCloseOptions"/>
+                <click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
+                <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+                <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+                <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            </after>
+            <!--Go to bundle product creation page-->
+            <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+            <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+            <actionGroup ref="fillMainBundleProductForm" stepKey="fillMainFieldsForBundle"/>
+            <!-- Add Option, a "Radio Buttons" type option -->
+            <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts2">
+                <argument name="x" value="0"/>
+                <argument name="n" value="1"/>
+                <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+                <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+                <argument name="optionTitle" value="Option"/>
+                <argument name="inputType" value="radio"/>
+            </actionGroup>
+            <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '0')}}" stepKey="userDefinedQuantitiyOptionProduct0"/>
+            <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '1')}}" stepKey="userDefinedQuantitiyOptionProduct1"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
+            <waitForPageLoad stepKey="waitForConfigCurrencySetupPage"/>
+            <conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.allowCurrencies}}" visible="false" stepKey="openOptions"/>
+            <waitForPageLoad stepKey="waitForOptions"/>
+            <selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
+            <click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>
+            <!-- Go to storefront BundleProduct -->
+            <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+            <waitForPageLoad stepKey="waitForStorefront"/>
+            <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct1ToCartAndChangeCurrencyToEuro">
+                <argument name="product" value="$$simpleProduct1$$"/>
+                <argument name="currency" value="EUR - Euro"/>
+            </actionGroup>
+            <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct2ToCartAndChangeCurrencyToUSD">
+                <argument name="product" value="$$simpleProduct2$$"/>
+                <argument name="currency" value="USD - US Dollar"/>
+            </actionGroup>
+            <click stepKey="openMiniCart" selector="{{StorefrontMinicartSection.showCart}}"/>
+            <waitForPageLoad stepKey="waitForMiniCart"/>
+            <see stepKey="seeCartSubtotal" userInput="$12,300.00"/>
+        </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
new file mode 100644
index 0000000000000..0cfd1f99a8ce0
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EnableDisableBundleProductStatusTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Admin list bundle products"/>
+            <title value="Admin should be able to change a bundle product status to Enabled/Disabled"/>
+            <description value="Admin should be able to change a bundle product status to Enabled/Disabled"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-215"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Creating data-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+
+            <!--Admin login-->
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Fill out ancillary data on bundle product-->
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts">
+            <argument name="bundleProduct" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Testing enabled view-->
+        <!--Product enabled by default-->
+        <!--Go to page-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductPageToLoad"/>
+        <seeElement stepKey="LookingForNameOfProduct" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+
+        <!--Testing disabled view-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="GoToProductCatalog"/>
+        <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="FindProductEditPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="ClickProductInGrid"/>
+        <click stepKey="ClickOnEnableDisableToggle" selector="{{AdminProductFormBundleSection.enableDisableToggle}}"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
+        <waitForPageLoad stepKey="PauseForSave"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
+        <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
+        <dontSeeElement stepKey="LookingForNameOfProductTwo" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..9040d675be34f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+        <test name="EndToEndB2CAdminTest">
+            <!--Create Bundle Product-->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle" after="seeSimpleProductInGrid"/>
+            <waitForPageLoad stepKey="waitForProductPageLoadBundle" after="visitAdminProductPageBundle"/>
+            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct" after="waitForProductPageLoadBundle">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+
+            <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillBundleName" after="goToCreateBundleProduct"/>
+            <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillBundleSku" after="fillBundleName"/>
+            <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3" after="fillBundleSku"/>
+            <waitForElementVisible selector="{{AdminProductFormBundleSection.firstOptionTitle}}" stepKey="waitForBundleOptions" after="clickAddOption3"/>
+            <fillField selector="{{AdminProductFormBundleSection.firstOptionTitle}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle" after="waitForBundleOptions"/>
+            <selectOption selector="{{AdminProductFormBundleSection.firstInputType}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType" after="fillOptionTitle"/>
+            <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle" after="selectInputType"/>
+            <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption" after="waitForAddProductsToBundle"/>
+            <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts" after="clickAddProductsToOption"/>
+            <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions" after="waitForPageLoadAfterBundleProducts">
+                <argument name="product" value="SimpleProduct"/>
+            </actionGroup>
+            <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow" after="filterBundleProductOptions"/>
+            <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts" after="selectFirstGridRow"/>
+            <fillField selector="{{AdminProductFormBundleSection.firstProductQuantity}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty" after="clickAddSelectedBundleProducts"/>
+            <actionGroup ref="saveProductForm" stepKey="saveBundleProduct" after="fillProductDefaultQty"/>
+            <actionGroup ref="viewBundleProductInAdminGrid" stepKey="viewBundleProductInGrid" after="saveBundleProduct">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+
+            <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+            <comment userInput="Clean up bundle product" stepKey="cleanUpBundleProduct" after="deleteSimpleProduct"/>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProduct" after="cleanUpBundleProduct">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+        </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
new file mode 100644
index 0000000000000..5b2b771434b73
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="MassEnableDisableBundleProductsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Admin list bundle products"/>
+            <title value="Admin should be able to mass change bundle products status to Enabled/Disabled"/>
+            <description value="Admin should be able to mass change bundle products status to Enabled/Disabled"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-217"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
+        </before>
+        <after>
+            <!--Clear Filters-->
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+        </after>
+
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!--Create bundle product-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
+
+        <!--Trigger SEO drop down-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
+        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
+
+        <!--Fill URL input-->
+        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Creating Second bundle product-->
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage2" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad2"/>
+
+        <!--Create bundle product 2-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems2"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption32"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle2"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType2"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle2"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption2"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptionsx2">
+            <argument name="product" value="$$simpleProduct3$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRowx2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions22">
+            <argument name="product" value="$$simpleProduct4$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow22"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty12"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty22"/>
+
+        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name2}}" stepKey="fillProductName2"/>
+        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
+
+        <!--Trigger SEO drop down-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
+        <waitForPageLoad stepKey="WaitForDropDownSEO2"/>
+
+        <!--Fill URL input-->
+        <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
+
+        <!--Clear Filters-->
+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFilters"/>
+
+        <!--Setting filter-->
+        <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
+
+        <!--Disabling bundle products-->
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBox"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActions"/>
+        <click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatus"/>
+        <click selector="{{AdminProductFiltersSection.disable}}" stepKey="ClickOnDisable"/>
+        <waitForPageLoad stepKey="waitForPageloadToExecute"/>
+
+        <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
+
+        <!--Confirm bundle products have been disabled-->
+        <amOnPage url="{{BundleProduct.urlKey2}}.html" stepKey="GoToProductPage"/>
+        <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
+        <dontSeeElement stepKey="LookingForNameOfProductDisabled" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+
+        <!--Enabling bundle products-->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
+        <waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>
+        <click selector="{{AdminProductFiltersSection.enable}}" stepKey="ClickOnEnable"/>
+
+        <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex2"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache2"/>
+
+        <!--Confirm bundle products have been enabled-->
+        <amOnPage url="{{BundleProduct.urlKey2}}.html" stepKey="GoToProductPageEnabled"/>
+        <waitForPageLoad stepKey="waitForBundleProductPageToLoad"/>
+        <seeElement stepKey="LookingForNameOfProduct" selector="{{StorefrontBundledSection.bundleProductName}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
new file mode 100644
index 0000000000000..e0a6a9afd648e
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewBundleProductSelectionTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Create/Edit bundle product in Admin"/>
+            <title value="Admin should be able to select a “Bundle Product” product type when adding a new product"/>
+            <description value="Admin should be able to select a “Bundle Product” product type when adding a new product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-220"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <!--Selecting new bundle product-->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <!--Testing if on the bundle product creation page-->
+        <seeElement selector="{{AdminProductFormBundleSection.bundleOptionsDropDown}}" stepKey="CheckForPresenceOfBundleProductFeatures"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
new file mode 100644
index 0000000000000..8efe32a7d84c0
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetBundleProductTest" extends="NewProductsListWidgetTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set Bundle Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set Bundle Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-123"/>
+            <group value="Bundle"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
+
+        <!-- Create a product to appear in the widget, fill in basic info first -->
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <click selector="{{AdminProductGridActionSection.addBundleProduct}}" stepKey="clickAddBundleProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
+
+        <!-- and then configure bundled items for this product -->
+
+        <scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOptionButton"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForPageLoad stepKey="waitForOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="MFTF Test Bundle 1" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="checkbox" stepKey="selectInputType"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="1" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="1" stepKey="fillProductDefaultQty2"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
+
+        <!-- Check for product on the CMS page with the New Products widget -->
+
+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPage"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
new file mode 100644
index 0000000000000..33181d6e920eb
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAddBundleProductWithZeroPriceToShoppingCartTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Add Bundle product with zero price to shopping cart"/>
+            <title value="Add Bundle product with zero price to shopping cart"/>
+            <description value="Add Bundle product with zero price to shopping cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-95167"/>
+            <group value="bundle"/>
+        </annotations>
+        <before>
+            <!--Enable freeShipping-->
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
+            <!--Create simple with zero price product-->
+            <createData entity="ApiProductWithDescription" stepKey="apiSimple">
+                <field key="price">0</field>
+            </createData>
+            <!--Create Bundle product-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="apiBundleProduct">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <!--Create Attribute-->
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="apiBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink">
+                <requiredEntity createDataKey="apiBundleProduct"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="apiSimple"/>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        </before>
+        <after>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
+            <deleteData createDataKey="apiSimple" stepKey="deleteSimple"/>
+            <deleteData createDataKey="apiBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Open category page-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSubCategory.custom_attributes[url_key]$$)}}" stepKey="amOnCategoryPage"/>
+        <!--Add bundle product to cart-->
+        <actionGroup ref="StorefrontAddBundleProductFromCategoryToCartActionGroup" stepKey="addBundleProductToCart">
+            <argument name="productName" value="$$apiBundleProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+
+        <!--Place order-->
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
+            <argument name="shippingMethod" value="Free Shipping"/>
+        </actionGroup>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <!--Check subtotal in created order-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForAdminOrderPageLoad"/>
+        <scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
+        <see selector="{{AdminOrderTotalSection.subTotal}}"  userInput="$0.00" stepKey="checkSubtotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
new file mode 100644
index 0000000000000..40132ea956584
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdminEditDataTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle products list on Storefront"/>
+            <title value="Customer should be able to see chosen options for Bundle Product in Shopping Cart when Option Title is edited in Admin"/>
+            <description value="Customer should be able to see chosen options for Bundle Product in Shopping Cart when Option Title is edited in Admin"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-291"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <scrollTo stepKey="scrollToBundleItems" selector="{{AdminProductFormBundleSection.bundledItems}}"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
+
+        <!-- Go to the storefront bundled product page -->
+        <amOnPage url="/{{BundleProduct.urlKey}}.html" stepKey="visitStoreFrontBundle"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click stepKey="customizeAndAddToCart" selector="{{StorefrontBundledSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitCustomizableOptionsPopUp"/>
+
+        <!-- add one product to the shopping cart -->
+        <click stepKey="selectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
+        <waitForPageLoad stepKey="waitForPriceUpdate"/>
+        <see stepKey="seeSinglePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
+        <click stepKey="addFirstItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded"/>
+
+        <!-- Go to the shopping cart page and grab the value of the option title -->
+        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
+
+        <!-- Find the product that we just created using the product grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductFilterLoad"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Change the product option title -->
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="BundleOption2" stepKey="fillOptionTitle2"/>
+        <click stepKey="saveProductAttribute2" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
+
+        <!-- Go to the shopping cart page and make sure the title has changed -->
+        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart1"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad1"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
+        <assertNotEquals expected="{$grabTotalBefore}" expectedType="string" actual="{$grabTotalAfter}" actualType="string"  stepKey="assertNotEquals"/>
+
+        <!-- Delete the bundled product -->
+        <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
new file mode 100644
index 0000000000000..695c3a8bf7dbb
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontBundleCartTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle product details page"/>
+            <title value="Customer should not be able to add a Bundle Product to the cart without selecting options"/>
+            <description value="Customer should not be able to add a Bundle Product to the cart without selecting options"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-233"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Start creating a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add Option One, a "Drop-down" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts1">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option One"/>
+            <argument name="inputType" value="select"/>
+        </actionGroup>
+
+        <!-- Add Option Two, a "Radio Buttons" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts2">
+            <argument name="x" value="1"/>
+            <argument name="n" value="2"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Two"/>
+            <argument name="inputType" value="radio"/>
+        </actionGroup>
+
+        <!-- Add Option Three, a "Checkbox" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts3">
+            <argument name="x" value="2"/>
+            <argument name="n" value="3"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Three"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+
+        <!-- Add Option Four, a "Multi Select" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts4">
+            <argument name="x" value="3"/>
+            <argument name="n" value="4"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Four"/>
+            <argument name="inputType" value="multi"/>
+        </actionGroup>
+
+        <!-- Save product and go to storefront -->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!-- See validation errors for all 4 options -->
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart1"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('1')}}" userInput="This is a required field." stepKey="error1"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('2')}}" userInput="Please select one of the options." stepKey="error2"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('3')}}" userInput="Please select one of the options." stepKey="error3"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('4')}}" userInput="This is a required field." stepKey="error4"/>
+
+        <!-- Fill option 1, see validation errors for 3 other options -->
+        <selectOption selector="select.bundle-option-select" userInput="$$simpleProduct1.name$$ +$123.00" stepKey="selectOption1"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart2"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('1')}}" userInput="This is a required field." stepKey="error5"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('2')}}" userInput="Please select one of the options." stepKey="error6"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('3')}}" userInput="Please select one of the options." stepKey="error7"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('4')}}" userInput="This is a required field." stepKey="error8"/>
+
+        <!-- Fill option 2, see validation errors for 2 other options -->
+        <click selector="input[type='radio']:nth-of-type(1)" stepKey="selectOption2"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart3"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('1')}}" userInput="This is a required field." stepKey="error9"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('2')}}" userInput="Please select one of the options." stepKey="error10"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('3')}}" userInput="Please select one of the options." stepKey="error11"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('4')}}" userInput="This is a required field." stepKey="error12"/>
+
+        <!-- Fill option 3, see validation errors for 1 other options -->
+        <checkOption selector="input[type='checkbox']:nth-of-type(1)" stepKey="selectOption3"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart4"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('1')}}" userInput="This is a required field." stepKey="error13"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('2')}}" userInput="Please select one of the options." stepKey="error14"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('3')}}" userInput="Please select one of the options." stepKey="error15"/>
+        <see selector="{{StorefrontBundledSection.nthOptionDiv('4')}}" userInput="This is a required field." stepKey="error16"/>
+
+        <!-- Fill option 4, dont see any validation errors -->
+        <selectOption selector="select[multiple='multiple']" userInput="$$simpleProduct1.name$$ +$123.00" stepKey="selectOption4"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart5"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('1')}}" userInput="This is a required field." stepKey="error17"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('2')}}" userInput="Please select one of the options." stepKey="error18"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('3')}}" userInput="Please select one of the options." stepKey="error19"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('4')}}" userInput="This is a required field." stepKey="error20"/>
+    </test>
+
+    <test name="StorefrontBundleAddToCartSuccessTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle product details page"/>
+            <title value="Customer should be able to add the bundle product to the cart"/>
+            <description value="Customer should be able to add the bundle product to the cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-232"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Start creating a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add Option One, a "Drop-down" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts1">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option One"/>
+            <argument name="inputType" value="select"/>
+        </actionGroup>
+
+        <!-- Add Option Two, a "Radio Buttons" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts2">
+            <argument name="x" value="1"/>
+            <argument name="n" value="2"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Two"/>
+            <argument name="inputType" value="radio"/>
+        </actionGroup>
+
+        <!-- Add Option Three, a "Checkbox" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts3">
+            <argument name="x" value="2"/>
+            <argument name="n" value="3"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Three"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+
+        <!-- Add Option Four, a "Multi Select" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts4">
+            <argument name="x" value="3"/>
+            <argument name="n" value="4"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Four"/>
+            <argument name="inputType" value="multi"/>
+        </actionGroup>
+
+        <!-- Save product and go to storefront -->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!-- Select all applicable options -->
+        <selectOption selector="select.bundle-option-select" userInput="$$simpleProduct1.name$$ +$123.00" stepKey="selectOption1"/>
+        <click selector="input[type='radio']:nth-of-type(1)" stepKey="selectOption2"/>
+        <checkOption selector="input[type='checkbox']:nth-of-type(1)" stepKey="selectOption3"/>
+        <selectOption selector="select[multiple='multiple']" userInput="$$simpleProduct1.name$$ +$123.00" stepKey="selectOption4"/>
+
+        <!-- Customize and add the bundle product to our cart -->
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart1"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('1')}}" userInput="This is a required field." stepKey="validForm1"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('2')}}" userInput="Please select one of the options." stepKey="validForm2"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('3')}}" userInput="Please select one of the options." stepKey="validForm3"/>
+        <dontSee selector="{{StorefrontBundledSection.nthOptionDiv('4')}}" userInput="This is a required field." stepKey="validForm4"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{BundleProduct.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
+
+        <!-- Verify cart contents -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsTitle('1')}}" userInput="Option One" stepKey="seeOption1"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsTitle('2')}}" userInput="Option Two" stepKey="seeOption2"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsTitle('3')}}" userInput="Option Three" stepKey="seeOption3"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsTitle('4')}}" userInput="Option Four" stepKey="seeOption4"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="50 x $$simpleProduct1.name$$ $123.00" stepKey="seeOptionValue1"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="50 x $$simpleProduct1.name$$ $123.00" stepKey="seeOptionValue2"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsValue('3')}}" userInput="50 x $$simpleProduct1.name$$ $123.00" stepKey="seeOptionValue3"/>
+        <see selector="{{StorefrontBundledSection.nthItemOptionsValue('4')}}" userInput="50 x $$simpleProduct1.name$$ $123.00" stepKey="seeOptionValue4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
new file mode 100644
index 0000000000000..285503465a011
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontBundleProductDetailsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle product details page"/>
+            <title value="Customer should be able to see basic bundle product details"/>
+            <description value="Customer should be able to see basic bundle product details"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-230"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Creating Data-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+
+            <!-- Admin Login-->
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!--Add description-->
+        <click selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="openDescriptionDropDown"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToError"/>
+        <fillField selector="{{AdminProductFormBundleSection.longDescription}}" userInput="This is the long description" stepKey="fillLongDescription"/>
+        <fillField selector="{{AdminProductFormBundleSection.shortDescription}}" userInput="This is the short description" stepKey="fillShortDescription"/>
+
+        <!-- Add options -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!--Create a basic bundle product-->
+        <actionGroup ref="CreateBasicBundleProduct" stepKey="createBundledProductForTwoSimpleProducts">
+            <argument name="bundleProduct" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
+        <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
+
+        <!--Checking details-->
+        <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
+        <see selector="{{BundleStorefrontSection.shortDescriptionText}}" userInput="This is the short description" stepKey="seeShortDescription"/>
+        <see selector="{{BundleStorefrontSection.longDescriptionText}}" userInput="This is the long description" stepKey="seeLongDescription"/>
+        <click selector="{{BundleStorefrontSection.bundleOptionSelector}}" stepKey="clickOnCustomizationOption"/>
+        <see selector="{{BundleStorefrontSection.bundleOptionSelection('1')}}" userInput="{{BundleProduct.defaultQuantity}} x $$simpleProduct1.name$$" stepKey="seeOption1"/>
+        <see selector="{{BundleStorefrontSection.bundleOptionSelection('2')}}" userInput="{{BundleProduct.defaultQuantity}} x $$simpleProduct2.name$$" stepKey="seeOption2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
new file mode 100644
index 0000000000000..9ad4b6828d6e4
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontBundleProductShownInCategoryListAndGrid">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle products list on Storefront"/>
+            <title value="Customer should be able to see bundle products in the category products list and grid views"/>
+            <description value="Customer should be able to see bundle products in the category products list and grid views"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-226"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <!--Admin login-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
+        </before>
+        <after>
+            <!--Logging out-->
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+        </after>
+        <!--Make category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="CreateCategory" stepKey="createASubcategory">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!--Categories-->
+        <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>
+        <fillField selector="{{AdminProductFormBundleSection.searchForCategory}}" userInput="{{SimpleSubCategory.name}}" stepKey="searchForCategory"/>
+        <click selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="selectCategory"/>
+        <click selector="{{AdminProductFormBundleSection.categoriesLabel}}" stepKey="clickOnCategoriesLabelToCloseOptions"/>
+
+        <!--Create bundle product-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Go to category page-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageToload"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="cartClickCategory"/>
+
+        <!--Check in grid view-->
+        <seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{SimpleSubCategory.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.listedProduct('1')}}" stepKey="assertBundleProductPresence"/>
+        <see userInput="{{BundleProduct.name}}" selector="{{StorefrontCategoryProductSection.ProductTitleByNumber('1')}}" stepKey="checkTitle"/>
+        <see userInput="$1,230.00" selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" stepKey="checkPrice"/>
+
+        <!--Check in list view-->
+        <click selector="{{StorefrontCategoryProductSection.categoryListView}}" stepKey="switchToListView"/>
+        <seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertCategoryNameInTitleAgain"/>
+        <see userInput="{{SimpleSubCategory.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryNamAgain"/>
+        <see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCountAgain"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.listedProduct('1')}}" stepKey="assertBundleProductPresenceAgain"/>
+        <see userInput="{{BundleProduct.name}}" selector="{{StorefrontCategoryProductSection.ProductTitleByNumber('1')}}" stepKey="checkTitleAgain"/>
+        <see userInput="$1,230.00" selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" stepKey="checkPriceAgain"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
new file mode 100644
index 0000000000000..5e6e891541420
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCustomerSelectAndSetBundleOptionsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle product details page"/>
+            <title value="Customer should be able to select customisable bundle product options and set quantity for them"/>
+            <description value="Customer should be able to select customisable bundle product options and set quantity for them"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-231"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <!-- Delete the bundled product -->
+            <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Start creating a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add Option One, a "Drop-down" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts1">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option One"/>
+            <argument name="inputType" value="select"/>
+        </actionGroup>
+        <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '0')}}" stepKey="userDefinedQuantitiyOption0Product0"/>
+        <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '1')}}" stepKey="userDefinedQuantitiyOption0Product1"/>
+
+        <!-- Add Option Two, a "Radio Buttons" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts2">
+            <argument name="x" value="1"/>
+            <argument name="n" value="2"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Two"/>
+            <argument name="inputType" value="radio"/>
+        </actionGroup>
+        <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('1', '0')}}" stepKey="userDefinedQuantitiyOption1Product0"/>
+        <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('1', '1')}}" stepKey="userDefinedQuantitiyOption1Product1"/>
+
+        <!-- Add Option Three, a "Checkbox" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts3">
+            <argument name="x" value="2"/>
+            <argument name="n" value="3"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Three"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+
+        <!-- Add Option Four, a "Multi Select" type option -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts4">
+            <argument name="x" value="3"/>
+            <argument name="n" value="4"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="optionTitle" value="Option Four"/>
+            <argument name="inputType" value="multi"/>
+        </actionGroup>
+
+        <!-- Save product and go to storefront -->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!--Select options - set quantities-->
+
+        <!--"Drop-down" type option-->
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="selectOption0Product0"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="checkOption0Product0"/>
+        <fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity00"/>
+        <seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity00"/>
+
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectOption0Product1"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkOption0Product1"/>
+        <fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity01"/>
+        <seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity01"/>
+
+        <!--"Radio Buttons" type option-->
+        <checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="selectOption1Product0"/>
+        <seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="checkOption1Product0"/>
+        <fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity10"/>
+        <seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity10"/>
+
+        <checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="selectOption1Product1"/>
+        <seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="checkOption1Product1"/>
+        <fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity11"/>
+        <seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity11"/>
+
+        <!--"Checkbox" type option-->
+        <!--This option does not support user defined quantities-->
+        <checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts('Option Three', '1')}}" stepKey="selectOption2Product0"/>
+        <seeCheckboxIsChecked selector="{{StorefrontBundledSection.checkboxOptionThreeProducts('Option Three', '1')}}" stepKey="checkOption2Product0"/>
+
+        <checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts('Option Three', '2')}}" stepKey="selectOption2Product1"/>
+        <seeCheckboxIsChecked selector="{{StorefrontBundledSection.checkboxOptionThreeProducts('Option Three', '2')}}" stepKey="checkOption2Product1"/>
+
+        <!--"Multi Select" type option-->
+        <!--This option does not support user defined quantities-->
+        <selectOption selector="{{StorefrontBundledSection.multiselectOptionFourProducts('Option Four')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="selectOption3Product0"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.multiselectOptionFourProducts('Option Four')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="checkOption3Product0"/>
+
+        <selectOption selector="{{StorefrontBundledSection.multiselectOptionFourProducts('Option Four')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectOption3Product1"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.multiselectOptionFourProducts('Option Four')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkOption3Product1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
new file mode 100644
index 0000000000000..58806126aee30
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontEditBundleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle products list on Storefront"/>
+            <title value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
+            <description value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-290"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <scrollTo stepKey="scrollToBundleItems" selector="{{AdminProductFormBundleSection.bundledItems}}"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
+
+        <!-- Go to the storefront bundled product page -->
+        <amOnPage url="/{{BundleProduct.urlKey}}.html" stepKey="visitStoreFrontBundle"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click stepKey="customizeAndAddToCart" selector="{{StorefrontBundledSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitCustomizableOptionsPopUp"/>
+
+        <!-- add two products to the shopping cart, each with one different option -->
+        <click stepKey="selectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
+        <waitForPageLoad stepKey="waitForPriceUpdate"/>
+        <see stepKey="seeSinglePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
+        <click stepKey="addFirstItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded"/>
+
+        <click stepKey="unselectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
+        <click stepKey="selectSecondBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
+        <waitForPageLoad stepKey="waitForPriceUpdate2"/>
+        <see stepKey="seeSinglePrice2" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
+        <click stepKey="addSecondItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded2"/>
+
+        <!-- Go to the shopping cart page and edit the first product -->
+        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad3"/>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalBefore"/>
+        <click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
+        <waitForPageLoad stepKey="waitForStorefront2"/>
+
+        <!-- Check second one option to choose both of the options on the storefront -->
+        <click selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}" stepKey="selectSecondBundleOption2"/>
+
+        <waitForPageLoad stepKey="waitForPriceUpdate3"/>
+        <see stepKey="seeDoublePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="2,460.00"/>
+
+        <click stepKey="addFirstItemToCart2" selector="{{StorefrontBundledSection.updateCart}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded3"/>
+
+        <!-- Go to the shopping cart page -->
+        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart2"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad2"/>
+
+        <!-- Assert that the options are both there and the proce no longer matches -->
+        <see stepKey="assertBothOptions" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct1.sku$$"/>
+        <see stepKey="assertBothOptions2" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct2.sku$$"/>
+        <waitForElementVisible stepKey="waitForInfoDropdown2" selector="{{CheckoutCartSummarySection.total}}"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad4"/>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalAfter"/>
+        <assertNotEquals expected="{$grabTotalBefore}" expectedType="string" actual="{$grabTotalAfter}" actualType="string"  stepKey="assertNotEquals"/>
+
+        <!-- Delete the bundled product -->
+        <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
new file mode 100644
index 0000000000000..ccd6a58223b3c
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontGoToDetailsPageWhenAddingToCart">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle products list on Storefront"/>
+            <title value="Customer should be taken to bundle product details page when clicking “Add to Cart” button"/>
+            <description value="Customer should be taken to bundle product details page when clicking “Add to Cart” button"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-229"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+        <!--Go to bundle product creation page-->
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage" />
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+
+        <!--Categories-->
+        <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>
+        <fillField selector="{{AdminProductFormBundleSection.searchForCategory}}" userInput="$$createCategory.name$$" stepKey="searchForCategory"/>
+        <click selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="selectCategory"/>
+        <click selector="{{AdminProductFormBundleSection.categoriesLabel}}" stepKey="clickOnCategoriesLabelToCloseOptions"/>
+
+        <!--Create bundle product-->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Go to category page-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageToload"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory"/>
+
+        <!--Click add to cart-->
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+
+        <!--Check for details page-->
+        <seeInCurrentUrl url="{{BundleProduct.sku}}" stepKey="seeBundleProductDetailsPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
new file mode 100644
index 0000000000000..31a5f9bab7758
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="View bundle products"/>
+            <title value="Verify dynamic bundle product prices for combination of options"/>
+            <description value="Verify prices for various configurations of Dynamic Bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-43619"/>
+            <group value="bundle"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
+
+            <!--Create 5 simple product-->
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">4.99</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">2.89</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
+                <field key="price">7.33</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
+                <field key="price">18.25</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
+                <field key="price">10.00</field>
+            </createData>
+
+            <!--Add special price to simple product-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct5.id$$)}}" stepKey="openAdminEditPage"/>
+            <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPrice"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+            <!--Create Bundle product-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="required">false</field>
+            </createData>
+            <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_2"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+            </createData>
+
+            <!--Create Bundle product 2-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct2">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption2_1">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+            </createData>
+            <createData entity="RadioButtonsOption" stepKey="createBundleOption2_2">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct5">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+                <field key="qty">2</field>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct6">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct7">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct8">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_2"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+                <field key="qty">5</field>
+            </createData>
+
+            <!--Create Bundle product 3-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct3">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="MultipleSelectOption" stepKey="createBundleOption3_1">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption3_2">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <field key="required">false</field>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct9">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_1"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct10">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_1"/>
+                <requiredEntity createDataKey="simpleProduct5"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct11">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_2"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct12">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+
+            <!-- navigate to the tax configuration page -->
+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
+            <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationSettingsOpened}}" visible="false" stepKey="openCalculationSettingsTab"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithmDisabled}}" visible="true" stepKey="clickCalculationMethodBasedCheckBox"/>
+            <selectOption userInput="Total" selector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" stepKey="fillCalculationMethodBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationBasedDisabled}}" visible="true" stepKey="clickTaxCalculationBasedCheckBox"/>
+            <selectOption userInput="Shipping Origin" selector="{{AdminConfigureTaxSection.taxCalculationBased}}" stepKey="fillTaxCalculationBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationPricesDisabled}}" visible="true" stepKey="clickCalculationPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationPrices}}" stepKey="clickCalculationPrices"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" dependentSelector="{{AdminConfigureTaxSection.taxPriceDisplaySettingsOpened}}" visible="false" stepKey="openPriceDisplaySettings"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxDisplayProductPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxDisplayProductPricesDisabled}}" visible="true" stepKey="clickDisplayProductPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxDisplayProductPrices}}" stepKey="clickDisplayProductPrices"/>
+
+            <!-- Save the settings -->
+            <scrollToTopOfPage stepKey="scrollToTop"/>
+            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
+            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        </before>
+        <after>
+            <!-- navigate to the tax configuration page -->
+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
+            <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationSettingsOpened}}" visible="false" stepKey="openCalculationSettingsTab"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithmDisabled}}" visible="true" stepKey="clickCalculationMethodBasedCheckBox"/>
+            <selectOption userInput="Total" selector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" stepKey="fillCalculationMethodBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationBasedDisabled}}" visible="true" stepKey="clickTaxCalculationBasedCheckBox"/>
+            <selectOption userInput="Shipping Address" selector="{{AdminConfigureTaxSection.taxCalculationBased}}" stepKey="fillTaxCalculationBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationPricesDisabled}}" visible="true" stepKey="clickCalculationPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationPrices}}" stepKey="clickCalculationPrices"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" dependentSelector="{{AdminConfigureTaxSection.taxPriceDisplaySettingsOpened}}" visible="false" stepKey="openPriceDisplaySettings"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxDisplayProductPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxDisplayProductPricesDisabled}}" visible="true" stepKey="clickDisplayProductPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxDisplayProductPrices}}" stepKey="clickDisplayProductPrices"/>
+
+            <!-- Save the settings -->
+            <scrollToTopOfPage stepKey="scrollToTop"/>
+            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
+            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory1"/>
+
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
+
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="createBundleProduct2" stepKey="deleteBundleProduct2"/>
+            <deleteData createDataKey="createBundleProduct3" stepKey="deleteBundleProduct3"/>
+        </after>
+
+        <!-- Go to storefront category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSubCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+
+        <see userInput="From $7.33" selector="{{StorefrontCategoryProductSection.priceFromByProductId($$createBundleProduct.id$$)}}" stepKey="seePriceFromInCategoryBundle1"/>
+        <see userInput="To $33.46" selector="{{StorefrontCategoryProductSection.priceToByProductId($$createBundleProduct.id$$)}}" stepKey="seePriceToInCategoryBundle1"/>
+
+        <see userInput="From $10.22" selector="{{StorefrontCategoryProductSection.priceFromByProductId($$createBundleProduct2.id$$)}}" stepKey="seePriceFromInCategoryBundle2"/>
+        <see userInput="To $101.23" selector="{{StorefrontCategoryProductSection.priceToByProductId($$createBundleProduct2.id$$)}}" stepKey="seePriceToInCategoryBundle2"/>
+
+        <see userInput="From $8.00 Regular Price $10.00" selector="{{StorefrontCategoryProductSection.priceFromByProductId($$createBundleProduct3.id$$)}}" stepKey="seePriceFromInCategoryBundle3"/>
+        <see userInput="To $33.58 Regular Price $35.58" selector="{{StorefrontCategoryProductSection.priceToByProductId($$createBundleProduct3.id$$)}}" stepKey="seePriceToInCategoryBundle3"/>
+
+        <!-- Go to storefront product pages -->
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="onPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="From $7.33" selector="{{StorefrontProductInfoMainSection.priceFrom}}" stepKey="seePriceFromBundle1"/>
+        <see userInput="To $33.46" selector="{{StorefrontProductInfoMainSection.priceTo}}" stepKey="seePriceToBundle1"/>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct2.custom_attributes[url_key]$$)}}" stepKey="onPageBundle2"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <see userInput="From $10.22" selector="{{StorefrontProductInfoMainSection.priceFrom}}" stepKey="seePriceFromBundle2"/>
+        <see userInput="To $101.23" selector="{{StorefrontProductInfoMainSection.priceTo}}" stepKey="seePriceToBundle2"/>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct3.custom_attributes[url_key]$$)}}" stepKey="onPageBundle3"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="From $8.00 Regular Price $10.00" selector="{{StorefrontProductInfoMainSection.priceFrom}}" stepKey="seePriceFromBundle3"/>
+        <see userInput="To $33.58 Regular Price $35.58" selector="{{StorefrontProductInfoMainSection.priceTo}}" stepKey="seePriceToBundle3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
index 414b460a1b81d..473fbbd035b00 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
@@ -46,6 +46,9 @@ public function testGetChildrenEmptyItems($class, $method, $returnClass)
         $this->assertSame(null, $this->model->getChildren($item));
     }
 
+    /**
+     * @return array
+     */
     public function getChildrenEmptyItemsDataProvider()
     {
         return [
@@ -97,6 +100,9 @@ public function testGetChildren($parentItem)
         $this->assertSame([2 => $this->orderItem], $this->model->getChildren($item));
     }
 
+    /**
+     * @return array
+     */
     public function getChildrenDataProvider()
     {
         return [
@@ -116,6 +122,9 @@ public function testIsShipmentSeparatelyWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isShipmentSeparately());
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithoutItemDataProvider()
     {
         return [
@@ -145,6 +154,9 @@ public function testIsShipmentSeparatelyWithItem($productOptions, $result, $pare
         $this->assertSame($result, $this->model->isShipmentSeparately($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithItemDataProvider()
     {
         return [
@@ -166,6 +178,9 @@ public function testIsChildCalculatedWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isChildCalculated());
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithoutItemDataProvider()
     {
         return [
@@ -195,6 +210,9 @@ public function testIsChildCalculatedWithItem($productOptions, $result, $parentI
         $this->assertSame($result, $this->model->isChildCalculated($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithItemDataProvider()
     {
         return [
@@ -257,6 +275,9 @@ public function testCanShowPriceInfo($parentItem, $productOptions, $result)
         $this->assertSame($result, $this->model->canShowPriceInfo($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function canShowPriceInfoDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/View/Items/RendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/View/Items/RendererTest.php
index 95dcb48f84be1..5d8cabdd8c1b9 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/View/Items/RendererTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/View/Items/RendererTest.php
@@ -41,6 +41,9 @@ public function testIsShipmentSeparatelyWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isShipmentSeparately());
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithoutItemDataProvider()
     {
         return [
@@ -70,6 +73,9 @@ public function testIsShipmentSeparatelyWithItem($productOptions, $result, $pare
         $this->assertSame($result, $this->model->isShipmentSeparately($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithItemDataProvider()
     {
         return [
@@ -91,6 +97,9 @@ public function testIsChildCalculatedWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isChildCalculated());
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithoutItemDataProvider()
     {
         return [
@@ -120,6 +129,9 @@ public function testIsChildCalculatedWithItem($productOptions, $result, $parentI
         $this->assertSame($result, $this->model->isChildCalculated($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithItemDataProvider()
     {
         return [
@@ -151,6 +163,9 @@ public function testGetSelectionAttributesWithBundle()
         $this->assertEquals($unserializedResult, $this->model->getSelectionAttributes($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function getSelectionAttributesDataProvider()
     {
         return [
@@ -184,6 +199,9 @@ public function testCanShowPriceInfo($parentItem, $productOptions, $result)
         $this->assertSame($result, $this->model->canShowPriceInfo($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function canShowPriceInfoDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
index 97e8098b8181e..07d2e1b995cd1 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
@@ -198,7 +198,7 @@ public function testGetJsonConfigFixedPriceBundle()
                 [
                     ['price' => new \Magento\Framework\DataObject(
                         ['base_amount' => $baseAmount, 'value' => $basePriceValue]
-                    )]
+                    )],
                 ],
                 true,
                 true
@@ -244,12 +244,14 @@ public function testGetJsonConfigFixedPriceBundle()
                 ),
             ]
         );
+        $bundleOptionPriceMock = $this->getAmountPriceMock(
+            $baseAmount,
+            $regularPriceMock,
+            [['item' => $selections[0], 'value' => $basePriceValue, 'base_amount' => 321321]]
+        );
         $prices = [
-            'bundle_option' => $this->getAmountPriceMock(
-                $baseAmount,
-                $regularPriceMock,
-                [['item' => $selections[0], 'value' => $basePriceValue, 'base_amount' => 321321]]
-            ),
+            'bundle_option' => $bundleOptionPriceMock,
+            'bundle_option_regular_price' => $bundleOptionPriceMock,
             \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE => $finalPriceMock,
             \Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE => $regularPriceMock,
         ];
@@ -261,8 +263,8 @@ public function testGetJsonConfigFixedPriceBundle()
         $preconfiguredValues = new \Magento\Framework\DataObject(
             [
                 'bundle_option' => [
-                    1 => 123123111
-                ]
+                    1 => 123123111,
+                ],
             ]
         );
         $this->product->expects($this->once())
@@ -278,6 +280,7 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->assertEquals(110, $jsonConfig['prices']['oldPrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['basePrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['finalPrice']['amount']);
+        $this->assertEquals([1], $jsonConfig['positions']);
     }
 
     /**
@@ -328,6 +331,10 @@ private function updateBundleBlock($options, $priceInfo, $priceType)
             ->will($this->returnArgument(0));
     }
 
+    /**
+     * @param $price
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getPriceInfoMock($price)
     {
         $priceInfoMock = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfo\Base::class)
@@ -352,6 +359,10 @@ private function getPriceInfoMock($price)
         return $priceInfoMock;
     }
 
+    /**
+     * @param $prices
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getPriceMock($prices)
     {
         $methods = [];
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php
index d79afdddfb7ae..2f5dcef391063 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php
@@ -47,6 +47,9 @@ public function testGetChildrenEmptyItems($class, $method, $returnClass)
         $this->assertSame(null, $this->model->getChildren($item));
     }
 
+    /**
+     * @return array
+     */
     public function getChildrenEmptyItemsDataProvider()
     {
         return [
@@ -96,6 +99,9 @@ public function testGetChildren($parentItem)
         $this->assertSame([2 => $this->orderItem], $this->model->getChildren($item));
     }
 
+    /**
+     * @return array
+     */
     public function getChildrenDataProvider()
     {
         return [
@@ -115,6 +121,9 @@ public function testIsShipmentSeparatelyWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isShipmentSeparately());
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithoutItemDataProvider()
     {
         return [
@@ -144,6 +153,9 @@ public function testIsShipmentSeparatelyWithItem($productOptions, $result, $pare
         $this->assertSame($result, $this->model->isShipmentSeparately($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithItemDataProvider()
     {
         return [
@@ -165,6 +177,9 @@ public function testIsChildCalculatedWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isChildCalculated());
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithoutItemDataProvider()
     {
         return [
@@ -194,6 +209,9 @@ public function testIsChildCalculatedWithItem($productOptions, $result, $parentI
         $this->assertSame($result, $this->model->isChildCalculated($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithItemDataProvider()
     {
         return [
@@ -238,6 +256,9 @@ public function testCanShowPriceInfo($parentItem, $productOptions, $result)
         $this->assertSame($result, $this->model->canShowPriceInfo($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function canShowPriceInfoDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
index 1de5db9d25a23..1fa7f186786ae 100644
--- a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
@@ -57,7 +57,10 @@ protected function setUp()
             'setOptions',
             'setCanSaveBundleSelections',
             '__wakeup',
-            'getOptionsReadonly'
+            'getOptionsReadonly',
+            'getBundleOptionsData',
+            'getExtensionAttributes',
+            'setExtensionAttributes',
         ];
         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, $methods);
         $optionInterfaceFactory = $this->getMockBuilder(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
@@ -127,6 +130,17 @@ public function testAfterInitializeIfBundleAnsCustomOptionsAndBundleSelectionsEx
         );
         $this->productMock->expects($this->once())->method('setOptions')->with(null);
         $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(true);
+        $this->productMock->expects($this->once())
+            ->method('getBundleOptionsData')
+            ->willReturn(['option_1' => ['delete' => 1]]);
+        $extentionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setBundleProductOptions'])
+            ->getMockForAbstractClass();
+        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
     }
 
@@ -149,4 +163,27 @@ public function testAfterInitializeIfBundleSelectionsAndCustomOptionsExist()
         $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false);
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
     }
+
+    /**
+     * @return void
+     */
+    public function testAfterInitializeIfBundleOptionsNotExist(): void
+    {
+        $valueMap = [
+            ['bundle_options', null, null],
+            ['affect_bundle_product_selections', null, false],
+        ];
+        $this->requestMock->expects($this->any())->method('getPost')->will($this->returnValueMap($valueMap));
+        $extentionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setBundleProductOptions'])
+            ->getMockForAbstractClass();
+        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $this->productMock->expects($this->any())->method('getCompositeReadonly')->will($this->returnValue(false));
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+        $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false);
+
+        $this->model->afterInitialize($this->subjectMock, $this->productMock);
+    }
 }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
index d1292146f6662..ccc8c52d5022f 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -339,7 +339,7 @@ public function testAddChildNonExistingOption()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Bundle product could not contain another composite product
+     * @expectedExceptionMessage The bundle product can't contain another composite product.
      */
     public function testAddChildLinkedProductIsComposite()
     {
@@ -797,7 +797,7 @@ public function testSaveChildWithoutId()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Can not find product link with id "12345"
+     * @expectedExceptionMessage The product link with the "12345" ID field wasn't found. Verify the ID and try again.
      */
     public function testSaveChildWithInvalidId()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php
index f47c978190a2c..791126a9c1742 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Bundle\Test\Unit\Model\Option;
 
 use Magento\Framework\Validator\NotEmpty;
@@ -71,9 +72,17 @@ public function providerIsValid()
     {
         return [
             ['title', 'select', true, []],
-            ['title', null, false, ['type' => 'type is a required field.']],
-            [null, 'select', false, ['title' => 'title is a required field.']],
-            [null, null, false, ['type' => 'type is a required field.', 'title' => 'title is a required field.']]
+            ['title', null, false, ['type' => '"type" is required. Enter and try again.']],
+            [null, 'select', false, ['title' => '"title" is required. Enter and try again.']],
+            [
+                null,
+                null,
+                false,
+                [
+                    'type' => '"type" is required. Enter and try again.',
+                    'title' => '"title" is required. Enter and try again.'
+                ]
+            ]
         ];
     }
 }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php
index f0a69bd4fb28b..8e309e48872c7 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php
@@ -67,7 +67,7 @@ public function testSave()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Only implemented for bundle product
+     * @expectedExceptionMessage This is implemented for bundle products only.
      */
     public function testSaveWithException()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
index d438dc2e9b216..2450f63c38933 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
@@ -8,17 +8,13 @@
 namespace Magento\Bundle\Test\Unit\Model;
 
 use Magento\Bundle\Model\OptionRepository;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $metadataPoolMock;
-
     /**
      * @var \Magento\Bundle\Model\OptionRepository
      */
@@ -67,12 +63,12 @@ class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $linkListMock;
+    protected $dataObjectHelperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Bundle\Model\Option\SaveAction|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $dataObjectHelperMock;
+    private $optionSaveActionMock;
 
     protected function setUp()
     {
@@ -89,34 +85,28 @@ protected function setUp()
             ->getMock();
         $this->optionResourceMock = $this->createPartialMock(
             \Magento\Bundle\Model\ResourceModel\Option::class,
-            ['delete', '__wakeup', 'save', 'removeOptionSelections']
+            ['get', 'delete', '__wakeup', 'save', 'removeOptionSelections']
         );
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->linkManagementMock = $this->createMock(\Magento\Bundle\Api\ProductLinkManagementInterface::class);
         $this->optionListMock = $this->createMock(\Magento\Bundle\Model\Product\OptionList::class);
-        $this->linkListMock = $this->createMock(\Magento\Bundle\Model\Product\LinksList::class);
-        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->optionSaveActionMock = $this->createMock(\Magento\Bundle\Model\Option\SaveAction::class);
 
         $this->model = new OptionRepository(
             $this->productRepositoryMock,
             $this->typeMock,
             $this->optionFactoryMock,
             $this->optionResourceMock,
-            $this->storeManagerMock,
             $this->linkManagementMock,
             $this->optionListMock,
-            $this->linkListMock,
-            $this->dataObjectHelperMock
+            $this->dataObjectHelperMock,
+            $this->optionSaveActionMock
         );
-        $refClass = new \ReflectionClass(OptionRepository::class);
-        $refProperty = $refClass->getProperty('metadataPool');
-        $refProperty->setAccessible(true);
-        $refProperty->setValue($this->model, $this->metadataPoolMock);
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Only implemented for bundle product
+     * @expectedExceptionMessage This is implemented for bundle products only.
      */
     public function testGetThrowsExceptionIfProductIsSimple()
     {
@@ -134,7 +124,7 @@ public function testGetThrowsExceptionIfProductIsSimple()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested option doesn't exist
+     * @expectedExceptionMessage The option that was requested doesn't exist. Verify the entity and try again.
      */
     public function testGetThrowsExceptionIfOptionDoesNotExist()
     {
@@ -174,7 +164,7 @@ public function testGet()
         $productMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
-        $productMock->expects($this->once())->method('getSku')->willReturn($productSku);
+        $productMock->expects($this->exactly(2))->method('getSku')->willReturn($productSku);
 
         $this->productRepositoryMock->expects($this->once())
             ->method('get')
@@ -194,7 +184,6 @@ public function testGet()
         $optionMock->expects($this->once())->method('getData')->willReturn($optionData);
 
         $linkMock = ['item'];
-        $this->linkListMock->expects($this->once())->method('getItems')->with($productMock, 100)->willReturn($linkMock);
 
         $newOptionMock = $this->createMock(\Magento\Bundle\Api\Data\OptionInterface::class);
         $this->dataObjectHelperMock->expects($this->once())
@@ -207,10 +196,10 @@ public function testGet()
             ->with($optionData['title'])
             ->willReturnSelf();
         $newOptionMock->expects($this->once())->method('setSku')->with()->willReturnSelf();
-        $newOptionMock->expects($this->once())
-            ->method('setProductLinks')
-            ->with($linkMock)
-            ->willReturnSelf();
+        $this->linkManagementMock->expects($this->once())
+            ->method('getChildren')
+            ->with($productSku, $optionId)
+            ->willReturn($linkMock);
 
         $this->optionFactoryMock->expects($this->once())->method('create')->willReturn($newOptionMock);
 
@@ -226,7 +215,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot delete option with id 1
+     * @expectedExceptionMessage The option with "1" ID can't be deleted.
      */
     public function testDeleteThrowsExceptionIfCannotDelete()
     {
@@ -239,205 +228,160 @@ public function testDeleteThrowsExceptionIfCannotDelete()
         $this->model->delete($optionMock);
     }
 
+    /**
+     * Test successful delete action for given $optionId
+     */
     public function testDeleteById()
     {
         $productSku = 'sku';
         $optionId = 100;
-        $productMock = $this->createMock(\Magento\Catalog\Api\Data\ProductInterface::class);
+
+        $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
+        $optionMock->expects($this->exactly(2))
+            ->method('getId')
+            ->willReturn($optionId);
+
+        $optionMock->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'title' => 'Option title',
+                'option_id' => $optionId
+            ]);
+
+        $this->optionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($optionMock);
+
+        $productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
+        );
         $productMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
-        $this->productRepositoryMock->expects($this->once())
+        $productMock->expects($this->exactly(2))->method('getSku')->willReturn($productSku);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
             ->method('get')
             ->with($productSku)
             ->willReturn($productMock);
 
-        $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
-
         $optCollectionMock = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
+        $optCollectionMock->expects($this->once())->method('getItemById')->with($optionId)->willReturn($optionMock);
         $this->typeMock->expects($this->once())
             ->method('getOptionsCollection')
             ->with($productMock)
             ->willReturn($optCollectionMock);
 
-        $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
-
-        $this->optionResourceMock->expects($this->once())->method('delete')->with($optionMock)->willReturnSelf();
         $this->assertTrue($this->model->deleteById($productSku, $optionId));
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * Tests if NoSuchEntityException thrown when provided $optionId not found
      */
-    public function testSaveExistingOption()
+    public function testDeleteByIdException()
     {
-        $productId = 1;
-
-        $storeId = 2;
-        $optionId = 5;
-        $existingLinkToUpdateId = '23';
+        $productSku = 'sku';
+        $optionId = null;
 
-        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productMock->expects($this->once())->method('getData')->willReturn($productId);
-        $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->typeMock->expects($this->once())
-            ->method('getOptionsCollection')
-            ->with($productMock)
-            ->willReturn($optionCollectionMock);
-        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+        $optionMock = $this->createMock(\Magento\Bundle\Model\Option::class);
+        $optionMock->expects($this->exactly(1))
+            ->method('getId')
+            ->willReturn($optionId);
 
-        $optionMock = $this->createPartialMock(
-            \Magento\Bundle\Model\Option::class,
-            ['setStoreId', 'setParentId', 'getProductLinks', 'getOptionId', 'getResource']
+        $productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getTypeId', 'getTypeInstance', 'getStoreId', 'getPriceType', '__wakeup', 'getSku']
         );
-        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
+        $productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
 
-        $metadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadata::class);
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($productMock);
 
-        $this->metadataPoolMock->expects($this->once())->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
-        $optionMock->expects($this->atLeastOnce())->method('getOptionId')->willReturn($optionId);
+        $optCollectionMock = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
+        $optCollectionMock->expects($this->once())->method('getItemById')->with($optionId)->willReturn($optionMock);
+        $this->typeMock->expects($this->once())
+            ->method('getOptionsCollection')
+            ->with($productMock)
+            ->willReturn($optCollectionMock);
 
-        $productLinkUpdate = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLinkUpdate->expects($this->any())->method('getId')->willReturn($existingLinkToUpdateId);
-        $productLinkNew = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLinkNew->expects($this->any())->method('getId')->willReturn(null);
-        $optionMock->expects($this->exactly(2))
-            ->method('getProductLinks')
-            ->willReturn([$productLinkUpdate, $productLinkNew]);
+        $this->expectException(NoSuchEntityException::class);
 
-        $this->linkManagementMock->expects($this->exactly(2))
-            ->method('addChild')
-            ->with($productMock);
-        $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
+        $this->model->deleteById($productSku, $optionId);
     }
 
-    public function testSaveNewOption()
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function testSaveExistingOption()
     {
-        $productId = 1;
-        $productSku = 'bundle_sku';
-        $storeId = 2;
         $optionId = 5;
 
-        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productMock->expects($this->once())->method('getData')->willReturn($productId);
-        $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $productSku = 'sku';
 
-        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->typeMock->expects($this->once())
-            ->method('getOptionsCollection')
-            ->with($productMock)
-            ->willReturn($optionCollectionMock);
-        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $productMock->expects($this->once())->method('getSku')->willReturn($productSku);
 
         $optionMock = $this->createPartialMock(
             \Magento\Bundle\Model\Option::class,
-            [
-                'setStoreId',
-                'setParentId',
-                'getProductLinks',
-                'getOptionId',
-                'setOptionId',
-                'setDefaultTitle',
-                'getTitle',
-                'getResource'
-            ]
-        );
-        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
-        $metadataMock = $this->createMock(
-            \Magento\Framework\EntityManager\EntityMetadata::class
+            ['setStoreId', 'setParentId', 'getProductLinks', 'getOptionId', 'getResource']
         );
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
 
-        $this->metadataPoolMock->expects($this->once())->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
-        $optionMock->method('getOptionId')
-            ->willReturn($optionId);
+        $optionMock->expects($this->atLeastOnce())->method('getOptionId')->willReturn($optionId);
+
+        $this->optionSaveActionMock->expects($this->once())->method('save')->with($productMock, $optionMock)
+            ->willReturn($optionMock);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($productMock);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('save')
+            ->with($productMock);
 
-        $productLink1 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLink2 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $optionMock->expects($this->exactly(2))
-            ->method('getProductLinks')
-            ->willReturn([$productLink1, $productLink2]);
-
-        $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)->willReturnSelf();
-        $this->linkManagementMock->expects($this->at(0))
-            ->method('addChild')
-            ->with($productMock, $optionId, $productLink1);
-        $this->linkManagementMock->expects($this->at(1))
-            ->method('addChild')
-            ->with($productMock, $optionId, $productLink2);
         $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not save option
-     */
-    public function testSaveCanNotSave()
+    public function testSaveNewOption()
     {
-        $productId = 1;
-        $productSku = 'bundle_sku';
-        $storeId = 2;
         $optionId = 5;
 
-        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productMock->expects($this->once())->method('getData')->willReturn($productId);
-        $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $productSku = 'sku';
 
-        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->typeMock->expects($this->once())
-            ->method('getOptionsCollection')
-            ->with($productMock)
-            ->willReturn($optionCollectionMock);
-        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $productMock->expects($this->once())->method('getSku')->willReturn($productSku);
 
         $optionMock = $this->createPartialMock(
             \Magento\Bundle\Model\Option::class,
-            [
-                'setStoreId',
-                'setParentId',
-                'getProductLinks',
-                'getOptionId',
-                'setOptionId',
-                'setDefaultTitle',
-                'getTitle',
-                'getResource'
-            ]
-        );
-        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
-        $metadataMock = $this->createMock(
-            \Magento\Framework\EntityManager\EntityMetadata::class
+            ['setStoreId', 'setParentId', 'getProductLinks', 'getOptionId', 'getResource']
         );
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
 
-        $this->metadataPoolMock->expects($this->once())->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
-        $optionMock->method('getOptionId')->willReturn($optionId);
+        $optionMock->expects($this->atLeastOnce())->method('getOptionId')->willReturn($optionId);
 
-        $productLink1 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLink2 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $optionMock->expects($this->exactly(2))
-            ->method('getProductLinks')
-            ->willReturn([$productLink1, $productLink2]);
+        $this->optionSaveActionMock->expects($this->once())->method('save')->with($productMock, $optionMock)
+            ->willReturn($optionMock);
 
-        $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)
-            ->willThrowException($this->createMock(\Exception::class));
-        $this->model->save($productMock, $optionMock);
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($productMock);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('save')
+            ->with($productMock);
+        $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
     }
 
     public function testGetList()
@@ -456,7 +400,7 @@ public function testGetList()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Only implemented for bundle product
+     * @expectedExceptionMessage This is implemented for bundle products only.
      */
     public function testGetListException()
     {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index d5a11e0310d35..59f7f008ed3ee 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -513,10 +513,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('getSelectionId')
             ->willReturn(314);
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals([$product, $productType], $result);
     }
@@ -737,10 +733,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('prepareForCart')
             ->willReturn([]);
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('We can\'t add this item to your shopping cart right now.', $result);
     }
@@ -961,10 +953,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('prepareForCart')
             ->willReturn('string');
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('string', $result);
     }
@@ -1365,7 +1353,7 @@ public function testPrepareForCartAdvancedParentClassReturnString()
     /**
      * @return void
      */
-    public function testPrepareForCartAdvancedAllrequiredOption()
+    public function testPrepareForCartAdvancedAllRequiredOption()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|DefaultType $group */
         $group = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Type\DefaultType::class)
@@ -1595,7 +1583,7 @@ public function testGetSkuWithoutType()
             ->disableOriginalConstructor()
             ->getMock();
         $selectionItemMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->setMethods(['getSku', '__wakeup'])
+            ->setMethods(['getSku', 'getEntityId', '__wakeup'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -1623,9 +1611,12 @@ public function testGetSkuWithoutType()
             ->will($this->returnValue($serializeIds));
         $selectionMock = $this->getSelectionsByIdsMock($selectionIds, $productMock, 5, 6);
         $selectionMock->expects(($this->any()))
-            ->method('getItems')
-            ->will($this->returnValue([$selectionItemMock]));
-        $selectionItemMock->expects($this->any())
+            ->method('getItemByColumnValue')
+            ->will($this->returnValue($selectionItemMock));
+        $selectionItemMock->expects($this->at(0))
+            ->method('getEntityId')
+            ->will($this->returnValue(1));
+        $selectionItemMock->expects($this->once())
             ->method('getSku')
             ->will($this->returnValue($itemSku));
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php b/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
deleted file mode 100644
index cbe34639e8267..0000000000000
--- a/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Bundle\Test\Unit\Model\ResourceModel\Selection;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Validator\UniversalFactory;
-use Magento\Eav\Model\Entity\AbstractEntity;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-use Magento\Framework\DB\Select;
-
-/**
- * Class CollectionTest.
- */
-class CollectionTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManager;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $store;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $universalFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $entity;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $adapter;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $select;
-
-    /**
-     * @var \Magento\Bundle\Model\ResourceModel\Selection\Collection
-     */
-    private $model;
-
-    protected function setUp()
-    {
-        $objectManager = new ObjectManager($this);
-        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->store = $this->getMockBuilder(StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->universalFactory = $this->getMockBuilder(UniversalFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->entity = $this->getMockBuilder(AbstractEntity::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->adapter = $this->getMockBuilder(AdapterInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->select = $this->getMockBuilder(Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $factory = $this->getMockBuilder(ProductLimitationFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->storeManager->expects($this->any())
-            ->method('getStore')
-            ->willReturn($this->store);
-        $this->store->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-        $this->universalFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->entity);
-        $this->entity->expects($this->any())
-            ->method('getConnection')
-            ->willReturn($this->adapter);
-        $this->entity->expects($this->any())
-            ->method('getDefaultAttributes')
-            ->willReturn([]);
-        $this->adapter->expects($this->any())
-            ->method('select')
-            ->willReturn($this->select);
-
-        $this->model = $objectManager->getObject(
-            \Magento\Bundle\Model\ResourceModel\Selection\Collection::class,
-            [
-                'storeManager' => $this->storeManager,
-                'universalFactory' => $this->universalFactory,
-                'productLimitationFactory' => $factory
-            ]
-        );
-    }
-
-    public function testAddQuantityFilter()
-    {
-        $tableName = 'cataloginventory_stock_status';
-        $this->entity->expects($this->once())
-            ->method('getTable')
-            ->willReturn($tableName);
-        $this->select->expects($this->once())
-            ->method('joinInner')
-            ->with(
-                ['stock' => $tableName],
-                'selection.product_id = stock.product_id',
-                []
-            )->willReturnSelf();
-        $this->assertEquals($this->model, $this->model->addQuantityFilter());
-    }
-}
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php
index ecce34363819e..3e9aeaed5c5b4 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php
@@ -49,6 +49,9 @@ public function testGetChildrenEmptyItems($class, $method, $returnClass)
         $this->assertSame(null, $this->model->getChildren($item));
     }
 
+    /**
+     * @return array
+     */
     public function getChildrenEmptyItemsDataProvider()
     {
         return [
@@ -97,6 +100,9 @@ public function testGetChildren($parentItem)
         $this->assertSame([2 => $this->orderItem], $this->model->getChildren($item));
     }
 
+    /**
+     * @return array
+     */
     public function getChildrenDataProvider()
     {
         return [
@@ -116,6 +122,9 @@ public function testIsShipmentSeparatelyWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isShipmentSeparately());
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithoutItemDataProvider()
     {
         return [
@@ -146,6 +155,9 @@ public function testIsShipmentSeparatelyWithItem($productOptions, $result, $pare
         $this->assertSame($result, $this->model->isShipmentSeparately($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isShipmentSeparatelyWithItemDataProvider()
     {
         return [
@@ -167,6 +179,9 @@ public function testIsChildCalculatedWithoutItem($productOptions, $result)
         $this->assertSame($result, $this->model->isChildCalculated());
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithoutItemDataProvider()
     {
         return [
@@ -197,6 +212,9 @@ public function testIsChildCalculatedWithItem($productOptions, $result, $parentI
         $this->assertSame($result, $this->model->isChildCalculated($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function isChildCalculatedWithItemDataProvider()
     {
         return [
@@ -217,6 +235,9 @@ public function testGetBundleOptions($productOptions, $result)
         $this->assertSame($result, $this->model->getBundleOptions());
     }
 
+    /**
+     * @return array
+     */
     public function getBundleOptionsDataProvider()
     {
         return [
@@ -277,6 +298,9 @@ public function testCanShowPriceInfo($parentItem, $productOptions, $result)
         $this->assertSame($result, $this->model->canShowPriceInfo($this->orderItem));
     }
 
+    /**
+     * @return array
+     */
     public function canShowPriceInfoDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
index 845d735e0d801..423155661f1ef 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
@@ -585,6 +585,9 @@ public function testGetOptionsAmount($searchMin, $useRegularPrice)
         $this->assertEquals($expectedResult, $result, 'Incorrect result');
     }
 
+    /**
+     * @return array
+     */
     public function getOptionsAmountDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionPriceTest.php
index b6485d0e441e9..91755cb24178a 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionPriceTest.php
@@ -7,96 +7,48 @@
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Bundle\Pricing\Price\BundleOptions;
+use Magento\Bundle\Pricing\Adjustment\Calculator;
+use \Magento\Bundle\Model\Selection;
 
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
 class BundleOptionPriceTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Bundle\Pricing\Price\BundleOptionPrice
      */
-    protected $bundleOptionPrice;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $baseCalculator;
+    private $bundleOptionPrice;
 
     /**
      * @var ObjectManagerHelper
      */
-    protected $objectManagerHelper;
+    private $objectManagerHelper;
 
     /**
      * @var \Magento\Framework\Pricing\SaleableInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $saleableItemMock;
+    private $saleableItemMock;
 
     /**
      * @var \Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $bundleCalculatorMock;
+    private $bundleCalculatorMock;
 
     /**
-     * @var \Magento\Bundle\Pricing\Price\BundleSelectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var BundleOptions|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $selectionFactoryMock;
+    private $bundleOptionsMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @inheritdoc
      */
-    protected $amountFactory;
-
-    /**
-     * @var \Magento\Framework\Pricing\PriceInfo\Base|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $priceInfoMock;
-
     protected function setUp()
     {
-        $this->priceInfoMock = $this->createMock(\Magento\Framework\Pricing\PriceInfo\Base::class);
-        $this->saleableItemMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)->getMock();
-        $this->saleableItemMock->expects($this->once())
-            ->method('getPriceInfo')
-            ->will($this->returnValue($this->priceInfoMock));
+        $this->bundleOptionsMock = $this->createMock(BundleOptions::class);
+        $this->saleableItemMock = $this->createMock(Product::class);
+        $this->bundleCalculatorMock = $this->createMock(Calculator::class);
 
-        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $priceCurrency->expects($this->any())->method('round')->will($this->returnArgument(0));
-
-        $this->saleableItemMock->expects($this->once())
-            ->method('setQty')
-            ->will($this->returnSelf());
-
-        $this->saleableItemMock->expects($this->any())
-            ->method('getStore')
-            ->will($this->returnValue($store));
-
-        $this->selectionFactoryMock = $this->getMockBuilder(\Magento\Bundle\Pricing\Price\BundleSelectionFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->amountFactory = $this->createMock(\Magento\Framework\Pricing\Amount\AmountFactory::class);
-        $factoryCallback = $this->returnCallback(
-            function ($fullAmount, $adjustments) {
-                return $this->createAmountMock(['amount' => $fullAmount, 'adjustmentAmounts' => $adjustments]);
-            }
-        );
-        $this->amountFactory->expects($this->any())->method('create')->will($factoryCallback);
-        $this->baseCalculator = $this->createMock(\Magento\Framework\Pricing\Adjustment\Calculator::class);
-
-        $taxData = $this->getMockBuilder(\Magento\Tax\Helper\Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->bundleCalculatorMock = $this->getMockBuilder(\Magento\Bundle\Pricing\Adjustment\Calculator::class)
-            ->setConstructorArgs(
-                [$this->baseCalculator, $this->amountFactory, $this->selectionFactoryMock, $taxData, $priceCurrency]
-            )
-            ->setMethods(['getOptionsAmount'])
-            ->getMock();
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->bundleOptionPrice = $this->objectManagerHelper->getObject(
             \Magento\Bundle\Pricing\Price\BundleOptionPrice::class,
@@ -104,107 +56,50 @@ function ($fullAmount, $adjustments) {
                 'saleableItem' => $this->saleableItemMock,
                 'quantity' => 1.,
                 'calculator' => $this->bundleCalculatorMock,
-                'bundleSelectionFactory' => $this->selectionFactoryMock
+                'bundleOptions' => $this->bundleOptionsMock,
             ]
         );
     }
 
     /**
-     * @dataProvider getOptionsDataProvider
-     */
-    public function testGetOptions($selectionCollection)
-    {
-        $this->prepareOptionMocks($selectionCollection);
-        $this->assertSame($selectionCollection, $this->bundleOptionPrice->getOptions());
-        $this->assertSame($selectionCollection, $this->bundleOptionPrice->getOptions());
-    }
-
-    /**
-     * @param array $selectionCollection
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionPrice::getOptions
+     *
      * @return void
      */
-    protected function prepareOptionMocks($selectionCollection)
+    public function testGetOptions()
     {
-        $this->saleableItemMock->expects($this->atLeastOnce())
-            ->method('getStoreId')
-            ->will($this->returnValue(1));
-
-        $priceTypeMock = $this->createMock(\Magento\Bundle\Model\Product\Type::class);
-        $priceTypeMock->expects($this->atLeastOnce())
-            ->method('setStoreFilter')
-            ->with($this->equalTo(1), $this->equalTo($this->saleableItemMock))
-            ->will($this->returnSelf());
-
-        $optionIds = ['41', '55'];
-        $priceTypeMock->expects($this->atLeastOnce())
-            ->method('getOptionsIds')
-            ->with($this->equalTo($this->saleableItemMock))
-            ->will($this->returnValue($optionIds));
-
-        $priceTypeMock->expects($this->atLeastOnce())
-            ->method('getSelectionsCollection')
-            ->with($this->equalTo($optionIds), $this->equalTo($this->saleableItemMock))
-            ->will($this->returnValue($selectionCollection));
-
         $collection = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
-        $collection->expects($this->atLeastOnce())
-            ->method('appendSelections')
-            ->with($this->equalTo($selectionCollection), $this->equalTo(true), $this->equalTo(false))
-            ->will($this->returnValue($selectionCollection));
-
-        $priceTypeMock->expects($this->atLeastOnce())
-            ->method('getOptionsCollection')
-            ->with($this->equalTo($this->saleableItemMock))
+        $this->bundleOptionsMock->expects($this->any())
+            ->method('getOptions')
             ->will($this->returnValue($collection));
-
-        $this->saleableItemMock->expects($this->atLeastOnce())
-            ->method('getTypeInstance')
-            ->will($this->returnValue($priceTypeMock));
-    }
-
-    public function getOptionsDataProvider()
-    {
-        return [
-            ['1', '2']
-        ];
+        $this->assertEquals($collection, $this->bundleOptionPrice->getOptions());
     }
 
     /**
-     * @param float $selectionQty
-     * @param float|bool $selectionAmount
-     * @dataProvider selectionAmountDataProvider
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionPrice::getOptionSelectionAmount
+     *
+     * @return void
      */
-    public function testGetOptionSelectionAmount($selectionQty, $selectionAmount)
+    public function testGetOptionSelectionAmount()
     {
-        $selection = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getSelectionQty', '__wakeup']);
-        $selection->expects($this->once())
-            ->method('getSelectionQty')
-            ->will($this->returnValue($selectionQty));
-        $priceMock = $this->createMock(\Magento\Bundle\Pricing\Price\BundleSelectionPrice::class);
-        $priceMock->expects($this->once())
-            ->method('getAmount')
-            ->will($this->returnValue($selectionAmount));
-        $this->selectionFactoryMock->expects($this->once())
-            ->method('create')
-            ->with($this->equalTo($this->saleableItemMock), $this->equalTo($selection), $this->equalTo($selectionQty))
-            ->will($this->returnValue($priceMock));
-        $this->assertSame($selectionAmount, $this->bundleOptionPrice->getOptionSelectionAmount($selection));
+        $selectionAmount = $this->createMock(AmountInterface::class);
+        $product = $this->createMock(Product::class);
+        $selection = $this->createMock(Selection::class);
+        $this->bundleOptionsMock->expects($this->any())
+            ->method('getOptionSelectionAmount')
+            ->will($this->returnValue($selectionAmount))
+            ->with($product, $selection, false);
+        $this->assertEquals($selectionAmount, $this->bundleOptionPrice->getOptionSelectionAmount($selection));
     }
 
     /**
-     * @return array
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionPrice::getAmount
+     *
+     * @return void
      */
-    public function selectionAmountDataProvider()
-    {
-        return [
-            [1., 50.5],
-            [2.2, false]
-        ];
-    }
-
     public function testGetAmount()
     {
-        $amountMock = $this->createMock(\Magento\Framework\Pricing\Amount\AmountInterface::class);
+        $amountMock = $this->createMock(AmountInterface::class);
         $this->bundleCalculatorMock->expects($this->once())
             ->method('getOptionsAmount')
             ->with($this->equalTo($this->saleableItemMock))
@@ -213,204 +108,14 @@ public function testGetAmount()
     }
 
     /**
-     * Create amount mock
-     *
-     * @param array $amountData
-     * @return \Magento\Framework\Pricing\Amount\Base|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function createAmountMock($amountData)
-    {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Pricing\Amount\Base $amount */
-        $amount = $this->createMock(\Magento\Framework\Pricing\Amount\Base::class);
-        $amount->expects($this->any())->method('getAdjustmentAmounts')->will(
-            $this->returnValue(isset($amountData['adjustmentAmounts']) ? $amountData['adjustmentAmounts'] : [])
-        );
-        $amount->expects($this->any())->method('getValue')->will($this->returnValue($amountData['amount']));
-        return $amount;
-    }
-
-    /**
-     * Create option mock
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionPrice::getValue
      *
-     * @param array $optionData
-     * @return \Magento\Bundle\Model\Option|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function createOptionMock($optionData)
-    {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Bundle\Model\Option $option */
-        $option = $this->createPartialMock(\Magento\Bundle\Model\Option::class, ['isMultiSelection', '__wakeup']);
-        $option->expects($this->any())->method('isMultiSelection')
-            ->will($this->returnValue($optionData['isMultiSelection']));
-        $selections = [];
-        foreach ($optionData['selections'] as $selectionData) {
-            $selections[] = $this->createSelectionMock($selectionData);
-        }
-        foreach ($optionData['data'] as $key => $value) {
-            $option->setData($key, $value);
-        }
-        $option->setData('selections', $selections);
-        return $option;
-    }
-
-    /**
-     * Create selection product mock
-     *
-     * @param array $selectionData
-     * @return \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function createSelectionMock($selectionData)
-    {
-        $selection = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->setMethods(['isSalable', 'getAmount', 'getQuantity', 'getProduct', '__wakeup'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        // All items are saleable
-        $selection->expects($this->any())->method('isSalable')->will($this->returnValue(true));
-        foreach ($selectionData['data'] as $key => $value) {
-            $selection->setData($key, $value);
-        }
-        $amountMock = $this->createAmountMock($selectionData['amount']);
-        $selection->expects($this->any())->method('getAmount')->will($this->returnValue($amountMock));
-        $selection->expects($this->any())->method('getQuantity')->will($this->returnValue(1));
-
-        $innerProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->setMethods(['getSelectionCanChangeQty', '__wakeup'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $innerProduct->expects($this->any())->method('getSelectionCanChangeQty')->will($this->returnValue(true));
-        $selection->expects($this->any())->method('getProduct')->will($this->returnValue($innerProduct));
-
-        return $selection;
-    }
-
-    /**
-     * @dataProvider getTestDataForCalculation
-     */
-    public function testCalculation($optionList, $expected)
-    {
-        $storeId = 1;
-        $this->saleableItemMock->expects($this->any())->method('getStoreId')->will($this->returnValue($storeId));
-        $this->selectionFactoryMock->expects($this->any())->method('create')->will($this->returnArgument(1));
-
-        $this->baseCalculator->expects($this->atLeastOnce())->method('getAmount')
-            ->will($this->returnValue($this->createAmountMock(['amount' => 0.])));
-
-        $options = [];
-        foreach ($optionList as $optionData) {
-            $options[] = $this->createOptionMock($optionData);
-        }
-        /** @var \PHPUnit_Framework_MockObject_MockObject $optionsCollection */
-        $optionsCollection = $this->createMock(\Magento\Bundle\Model\ResourceModel\Option\Collection::class);
-        $optionsCollection->expects($this->atLeastOnce())->method('appendSelections')->will($this->returnSelf());
-        $optionsCollection->expects($this->atLeastOnce())->method('getIterator')
-            ->will($this->returnValue(new \ArrayIterator($options)));
-
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product\Type\AbstractType $typeMock */
-        $typeMock = $this->createMock(\Magento\Bundle\Model\Product\Type::class);
-        $typeMock->expects($this->any())->method('setStoreFilter')->with($storeId, $this->saleableItemMock);
-        $typeMock->expects($this->any())->method('getOptionsCollection')->with($this->saleableItemMock)
-            ->will($this->returnValue($optionsCollection));
-        $this->saleableItemMock->expects($this->any())->method('getTypeInstance')->will($this->returnValue($typeMock));
-
-        $this->assertEquals($expected['min'], $this->bundleOptionPrice->getValue());
-        $this->assertEquals($expected['max'], $this->bundleOptionPrice->getMaxValue());
-    }
-
-    /**
-     * @return array
+     * @return void
      */
-    public function getTestDataForCalculation()
+    public function testGetValue()
     {
-        return [
-            'first case' => [
-                'optionList' => [
-                    // first option with single choice of product
-                    [
-                        'isMultiSelection' => false,
-                        'data' => [
-                            'title' => 'test option 1',
-                            'default_title' => 'test option 1',
-                            'type' => 'select',
-                            'option_id' => '1',
-                            'position' => '0',
-                            'required' => '1',
-                        ],
-                        'selections' => [
-                            [
-                                'data' => ['price' => 70.],
-                                'amount' => ['amount' => 70],
-                            ],
-                            [
-                                'data' => ['price' => 80.],
-                                'amount' => ['amount' => 80]
-                            ],
-                            [
-                                'data' => ['price' => 50.],
-                                'amount' => ['amount' => 50]
-                            ],
-                        ]
-                    ],
-                    // second not required option
-                    [
-                        'isMultiSelection' => false,
-                        'data' => [
-                            'title' => 'test option 2',
-                            'default_title' => 'test option 2',
-                            'type' => 'select',
-                            'option_id' => '2',
-                            'position' => '1',
-                            'required' => '0',
-                        ],
-                        'selections' => [
-                            [
-                                'data' => ['value' => 20.],
-                                'amount' => ['amount' => 20],
-                            ],
-                        ]
-                    ],
-                    // third with multi-selection
-                    [
-                        'isMultiSelection' => true,
-                        'data' => [
-                            'title' => 'test option 3',
-                            'default_title' => 'test option 3',
-                            'type' => 'select',
-                            'option_id' => '3',
-                            'position' => '2',
-                            'required' => '1',
-                        ],
-                        'selections' => [
-                            [
-                                'data' => ['price' => 40.],
-                                'amount' => ['amount' => 40],
-                            ],
-                            [
-                                'data' => ['price' => 20.],
-                                'amount' => ['amount' => 20]
-                            ],
-                            [
-                                'data' => ['price' => 60.],
-                                'amount' => ['amount' => 60]
-                            ],
-                        ]
-                    ],
-                    // fourth without selections
-                    [
-                        'isMultiSelection' => true,
-                        'data' => [
-                            'title' => 'test option 3',
-                            'default_title' => 'test option 3',
-                            'type' => 'select',
-                            'option_id' => '4',
-                            'position' => '3',
-                            'required' => '1',
-                        ],
-                        'selections' => []
-                    ],
-                ],
-                'expected' => ['min' => 70, 'max' => 220],
-            ]
-        ];
+        $value = 1;
+        $this->bundleOptionsMock->expects($this->any())->method('calculateOptions')->will($this->returnValue($value));
+        $this->assertEquals($value, $this->bundleOptionPrice->getValue());
     }
 }
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionRegularPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionRegularPriceTest.php
new file mode 100644
index 0000000000000..33ccc2cfb8af4
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionRegularPriceTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Test\Unit\Pricing\Price;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Bundle\Pricing\Price\BundleOptionRegularPrice;
+use Magento\Catalog\Model\Product;
+use Magento\Bundle\Pricing\Adjustment\Calculator;
+use Magento\Bundle\Pricing\Price\BundleOptions;
+use Magento\Bundle\Model\ResourceModel\Option\Collection;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Bundle\Model\Selection;
+
+/**
+ * Test for Magento\Bundle\Pricing\Price\BundleRegularPrice
+ */
+class BundleOptionRegularPriceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var BundleOptionRegularPrice
+     */
+    private $bundleOptionRegularPrice;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $saleableItemMock;
+
+    /**
+     * @var Calculator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bundleCalculatorMock;
+
+    /**
+     * @var BundleOptions|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bundleOptionsMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->bundleOptionsMock = $this->createMock(BundleOptions::class);
+        $this->saleableItemMock = $this->createMock(Product::class);
+        $this->bundleCalculatorMock = $this->createMock(Calculator::class);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->bundleOptionRegularPrice = $this->objectManagerHelper->getObject(
+            BundleOptionRegularPrice::class,
+            [
+                'saleableItem' => $this->saleableItemMock,
+                'quantity' => 1.,
+                'calculator' => $this->bundleCalculatorMock,
+                'bundleOptions' => $this->bundleOptionsMock,
+            ]
+        );
+    }
+
+    /**
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionRegularPrice::getOptions
+     *
+     * @return void
+     */
+    public function testGetOptions()
+    {
+        $collection = $this->createMock(Collection::class);
+        $this->bundleOptionsMock->expects($this->any())
+            ->method('getOptions')
+            ->will($this->returnValue($collection));
+        $this->assertEquals($collection, $this->bundleOptionRegularPrice->getOptions());
+    }
+
+    /**
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionRegularPrice::getOptionSelectionAmount
+     *
+     * @return void
+     */
+    public function testGetOptionSelectionAmount()
+    {
+        $selectionAmount = $this->createMock(AmountInterface::class);
+        $product = $this->createMock(Product::class);
+        $selection = $this->createMock(Selection::class);
+        $this->bundleOptionsMock->expects($this->any())
+            ->method('getOptionSelectionAmount')
+            ->will($this->returnValue($selectionAmount))
+            ->with($product, $selection, true);
+        $this->assertEquals($selectionAmount, $this->bundleOptionRegularPrice->getOptionSelectionAmount($selection));
+    }
+
+    /**
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionRegularPrice::getAmount
+     *
+     * @return void
+     */
+    public function testGetAmount()
+    {
+        $amountMock = $this->createMock(AmountInterface::class);
+        $this->bundleCalculatorMock->expects($this->once())
+            ->method('getOptionsAmount')
+            ->with($this->equalTo($this->saleableItemMock))
+            ->will($this->returnValue($amountMock));
+        $this->assertSame($amountMock, $this->bundleOptionRegularPrice->getAmount());
+    }
+
+    /**
+     * Test method \Magento\Bundle\Pricing\Price\BundleOptionRegularPrice::getValue
+     *
+     * @return void
+     */
+    public function testGetValue()
+    {
+        $value = 1;
+        $this->bundleOptionsMock->expects($this->any())->method('calculateOptions')->will($this->returnValue($value));
+        $this->assertEquals($value, $this->bundleOptionRegularPrice->getValue());
+    }
+}
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionsTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionsTest.php
new file mode 100644
index 0000000000000..37973b9b8ae28
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleOptionsTest.php
@@ -0,0 +1,449 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Test\Unit\Pricing\Price;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\Pricing\Amount\AmountFactory;
+use Magento\Framework\Pricing\Adjustment\Calculator as AdjustmentCalculator;
+use Magento\Framework\Pricing\PriceInfo\Base as BasePriceInfo;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Amount\Base as BaseAmount;
+use Magento\Bundle\Pricing\Price\BundleOptions;
+use Magento\Bundle\Pricing\Price\BundleSelectionPrice;
+use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
+use Magento\Bundle\Pricing\Adjustment\Calculator as BundleAdjustmentCalculator;
+use Magento\Bundle\Model\Option as BundleOption;
+use Magento\Bundle\Model\Product\Type as BundleProductType;
+use Magento\Bundle\Model\ResourceModel\Option\Collection as BundleOptionCollection;
+use Magento\Catalog\Model\Product;
+use Magento\Tax\Helper\Data as TaxHelperData;
+
+/**
+ * Test for Magento\Bundle\Pricing\Price\BundleOptions
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BundleOptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var BundleOptions
+     */
+    private $bundleOptions;
+
+    /**
+     * @var AdjustmentCalculator|MockObject
+     */
+    private $baseCalculator;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Product|MockObject
+     */
+    private $saleableItemMock;
+
+    /**
+     * @var BundleAdjustmentCalculator|MockObject
+     */
+    private $bundleCalculatorMock;
+
+    /**
+     * @var BundleSelectionFactory|MockObject
+     */
+    private $selectionFactoryMock;
+
+    /**
+     * @var AmountFactory|MockObject
+     */
+    private $amountFactory;
+
+    /**
+     * @var BasePriceInfo|MockObject
+     */
+    private $priceInfoMock;
+
+    protected function setUp()
+    {
+        $this->priceInfoMock = $this->getMockBuilder(BasePriceInfo::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->saleableItemMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)->getMock();
+        $priceCurrency->expects($this->any())->method('round')->willReturnArgument(0);
+
+        $this->selectionFactoryMock = $this->getMockBuilder(BundleSelectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->amountFactory = $this->getMockBuilder(AmountFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $factoryCallback = $this->returnCallback(
+            function ($fullAmount, $adjustments) {
+                return $this->createAmountMock(['amount' => $fullAmount, 'adjustmentAmounts' => $adjustments]);
+            }
+        );
+        $this->amountFactory->expects($this->any())->method('create')->will($factoryCallback);
+        $this->baseCalculator = $this->getMockBuilder(AdjustmentCalculator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $taxData = $this->getMockBuilder(TaxHelperData::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->bundleCalculatorMock = $this->getMockBuilder(BundleAdjustmentCalculator::class)
+            ->setConstructorArgs(
+                [$this->baseCalculator, $this->amountFactory, $this->selectionFactoryMock, $taxData, $priceCurrency]
+            )
+            ->setMethods(['getOptionsAmount'])
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->bundleOptions = $this->objectManagerHelper->getObject(
+            BundleOptions::class,
+            [
+                'calculator' => $this->bundleCalculatorMock,
+                'bundleSelectionFactory' => $this->selectionFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getOptionsDataProvider
+     * @param array $selectionCollection
+     *
+     * @return void
+     */
+    public function testGetOptions(array $selectionCollection)
+    {
+        $this->prepareOptionMocks($selectionCollection);
+        $this->bundleOptions->getOptions($this->saleableItemMock);
+        $this->assertSame($selectionCollection, $this->bundleOptions->getOptions($this->saleableItemMock));
+    }
+
+    /**
+     * @param array $selectionCollection
+     *
+     * @return void
+     */
+    private function prepareOptionMocks(array $selectionCollection)
+    {
+        $this->saleableItemMock->expects($this->atLeastOnce())
+            ->method('getStoreId')
+            ->willReturn(1);
+        $priceTypeMock = $this->getMockBuilder(BundleProductType::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $priceTypeMock->expects($this->atLeastOnce())
+            ->method('setStoreFilter')
+            ->with(1, $this->saleableItemMock)
+            ->willReturnSelf();
+        $optionIds = ['41', '55'];
+        $priceTypeMock->expects($this->atLeastOnce())
+            ->method('getOptionsIds')
+            ->with($this->saleableItemMock)
+            ->willReturn($optionIds);
+        $priceTypeMock->expects($this->atLeastOnce())
+            ->method('getSelectionsCollection')
+            ->with($optionIds, $this->saleableItemMock)
+            ->willReturn($selectionCollection);
+        $collection = $this->getMockBuilder(BundleOptionCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collection->expects($this->atLeastOnce())
+            ->method('appendSelections')
+            ->with($selectionCollection, true, false)
+            ->willReturn($selectionCollection);
+        $priceTypeMock->expects($this->atLeastOnce())
+            ->method('getOptionsCollection')
+            ->with($this->saleableItemMock)
+            ->willReturn($collection);
+        $this->saleableItemMock->expects($this->atLeastOnce())
+            ->method('getTypeInstance')
+            ->willReturn($priceTypeMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function getOptionsDataProvider() : array
+    {
+        return [
+            [
+                ['1', '2'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider selectionAmountDataProvider
+     *
+     * @param float $selectionQty
+     * @param float|bool $selectionAmount
+     * @param bool $useRegularPrice
+     *
+     * @return void
+     */
+    public function testGetOptionSelectionAmount(float $selectionQty, $selectionAmount, bool $useRegularPrice)
+    {
+        $selection = $this->createPartialMock(Product::class, ['getSelectionQty', '__wakeup']);
+        $amountInterfaceMock = $this->getMockBuilder(AmountInterface::class)
+            ->getMockForAbstractClass();
+        $amountInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($selectionAmount);
+        $selection->expects($this->once())
+            ->method('getSelectionQty')
+            ->willReturn($selectionQty);
+        $priceMock = $this->getMockBuilder(BundleSelectionPrice::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $priceMock->expects($this->once())
+            ->method('getAmount')
+            ->willReturn($amountInterfaceMock);
+        $this->selectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->saleableItemMock, $selection, $selectionQty)
+            ->willReturn($priceMock);
+        $optionSelectionAmount = $this->bundleOptions->getOptionSelectionAmount(
+            $this->saleableItemMock,
+            $selection,
+            $useRegularPrice
+        );
+        $this->assertSame($selectionAmount, $optionSelectionAmount->getValue());
+    }
+
+    /**
+     * @return array
+     */
+    public function selectionAmountDataProvider(): array
+    {
+        return [
+            [1., 50.5, false],
+            [2.2, false, true],
+        ];
+    }
+
+    /**
+     * Create amount mock.
+     *
+     * @param array $amountData
+     * @return BaseAmount|MockObject
+     */
+    private function createAmountMock(array $amountData)
+    {
+        /** @var BaseAmount|MockObject $amount */
+        $amount = $this->getMockBuilder(BaseAmount::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $amount->expects($this->any())->method('getAdjustmentAmounts')
+            ->willReturn($amountData['adjustmentAmounts'] ?? []);
+        $amount->expects($this->any())->method('getValue')->willReturn($amountData['amount']);
+
+        return $amount;
+    }
+
+    /**
+     * Create option mock.
+     *
+     * @param array $optionData
+     * @return BundleOption|MockObject
+     */
+    private function createOptionMock(array $optionData)
+    {
+        /** @var BundleOption|MockObject $option */
+        $option = $this->createPartialMock(BundleOption::class, ['isMultiSelection', '__wakeup']);
+        $option->expects($this->any())->method('isMultiSelection')
+            ->willReturn($optionData['isMultiSelection']);
+        $selections = [];
+        foreach ($optionData['selections'] as $selectionData) {
+            $selections[] = $this->createSelectionMock($selectionData);
+        }
+        foreach ($optionData['data'] as $key => $value) {
+            $option->setData($key, $value);
+        }
+        $option->setData('selections', $selections);
+
+        return $option;
+    }
+
+    /**
+     * Create selection product mock.
+     *
+     * @param array $selectionData
+     * @return Product|MockObject
+     */
+    private function createSelectionMock(array $selectionData)
+    {
+        $selection = $this->getMockBuilder(Product::class)
+            ->setMethods(['isSalable', 'getAmount', 'getQuantity', 'getProduct', '__wakeup'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // All items are saleable
+        $selection->expects($this->any())->method('isSalable')->willReturn(true);
+        foreach ($selectionData['data'] as $key => $value) {
+            $selection->setData($key, $value);
+        }
+        $amountMock = $this->createAmountMock($selectionData['amount']);
+        $selection->expects($this->any())->method('getAmount')->willReturn($amountMock);
+        $selection->expects($this->any())->method('getQuantity')->willReturn(1);
+
+        $innerProduct = $this->getMockBuilder(Product::class)
+            ->setMethods(['getSelectionCanChangeQty', '__wakeup'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $innerProduct->expects($this->any())->method('getSelectionCanChangeQty')->willReturn(true);
+        $selection->expects($this->any())->method('getProduct')->willReturn($innerProduct);
+
+        return $selection;
+    }
+
+    /**
+     * @dataProvider getTestDataForCalculation
+     * @param array $optionList
+     * @param array $expected
+     *
+     * @return void
+     */
+    public function testCalculation(array $optionList, array $expected)
+    {
+        $storeId = 1;
+        $this->saleableItemMock->expects($this->any())->method('getStoreId')->willReturn($storeId);
+        $this->selectionFactoryMock->expects($this->any())->method('create')->willReturnArgument(1);
+
+        $this->baseCalculator->expects($this->atLeastOnce())->method('getAmount')
+            ->willReturn($this->createAmountMock(['amount' => 0.]));
+
+        $options = [];
+        foreach ($optionList as $optionData) {
+            $options[] = $this->createOptionMock($optionData);
+        }
+        /** @var BundleOptionCollection|MockObject $optionsCollection */
+        $optionsCollection = $this->getMockBuilder(BundleOptionCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $optionsCollection->expects($this->atLeastOnce())->method('appendSelections')->willReturn($options);
+
+        /** @var \Magento\Catalog\Model\Product\Type\AbstractType|MockObject $typeMock */
+        $typeMock = $this->getMockBuilder(BundleProductType::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $typeMock->expects($this->any())->method('setStoreFilter')
+            ->with($storeId, $this->saleableItemMock);
+        $typeMock->expects($this->any())->method('getOptionsCollection')
+            ->with($this->saleableItemMock)
+            ->willReturn($optionsCollection);
+        $this->saleableItemMock->expects($this->any())->method('getTypeInstance')->willReturn($typeMock);
+
+        $this->assertEquals($expected['min'], $this->bundleOptions->calculateOptions($this->saleableItemMock));
+        $this->assertEquals($expected['max'], $this->bundleOptions->calculateOptions($this->saleableItemMock, false));
+    }
+
+    /**
+     * @return array
+     */
+    public function getTestDataForCalculation(): array
+    {
+        return [
+            'first case' => [
+                'optionList' => [
+                    // first option with single choice of product
+                    [
+                        'isMultiSelection' => false,
+                        'data' => [
+                            'title' => 'test option 1',
+                            'default_title' => 'test option 1',
+                            'type' => 'select',
+                            'option_id' => '1',
+                            'position' => '0',
+                            'required' => '1',
+                        ],
+                        'selections' => [
+                            [
+                                'data' => ['price' => 70.],
+                                'amount' => ['amount' => 70],
+                            ],
+                            [
+                                'data' => ['price' => 80.],
+                                'amount' => ['amount' => 80],
+                            ],
+                            [
+                                'data' => ['price' => 50.],
+                                'amount' => ['amount' => 50],
+                            ],
+                        ],
+                    ],
+                    // second not required option
+                    [
+                        'isMultiSelection' => false,
+                        'data' => [
+                            'title' => 'test option 2',
+                            'default_title' => 'test option 2',
+                            'type' => 'select',
+                            'option_id' => '2',
+                            'position' => '1',
+                            'required' => '0',
+                        ],
+                        'selections' => [
+                            [
+                                'data' => ['value' => 20.],
+                                'amount' => ['amount' => 20],
+                            ],
+                        ],
+                    ],
+                    // third with multi-selection
+                    [
+                        'isMultiSelection' => true,
+                        'data' => [
+                            'title' => 'test option 3',
+                            'default_title' => 'test option 3',
+                            'type' => 'select',
+                            'option_id' => '3',
+                            'position' => '2',
+                            'required' => '1',
+                        ],
+                        'selections' => [
+                            [
+                                'data' => ['price' => 40.],
+                                'amount' => ['amount' => 40],
+                            ],
+                            [
+                                'data' => ['price' => 20.],
+                                'amount' => ['amount' => 20],
+                            ],
+                            [
+                                'data' => ['price' => 60.],
+                                'amount' => ['amount' => 60],
+                            ],
+                        ],
+                    ],
+                    // fourth without selections
+                    [
+                        'isMultiSelection' => true,
+                        'data' => [
+                            'title' => 'test option 3',
+                            'default_title' => 'test option 3',
+                            'type' => 'select',
+                            'option_id' => '4',
+                            'position' => '3',
+                            'required' => '1',
+                        ],
+                        'selections' => [],
+                    ],
+                ],
+                'expected' => ['min' => 70, 'max' => 220],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
index 64140ef920cbe..9f35251b3f926 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
@@ -103,6 +103,9 @@ protected function setUp()
         $this->setupSelectionPrice();
     }
 
+    /**
+     * @param bool $useRegularPrice
+     */
     protected function setupSelectionPrice($useRegularPrice = false)
     {
         $this->selectionPrice = new \Magento\Bundle\Pricing\Price\BundleSelectionPrice(
@@ -118,7 +121,7 @@ protected function setupSelectionPrice($useRegularPrice = false)
     }
 
     /**
-     *  test fro method getValue with dynamic productType
+     *  Test for method getValue with dynamic productType
      *
      * @param bool $useRegularPrice
      * @dataProvider useRegularPriceDataProvider
@@ -163,12 +166,14 @@ public function testGetValueTypeDynamic($useRegularPrice)
     }
 
     /**
-     * test for method getValue with type Fixed and selectionPriceType not null
+     * Test for method getValue with type Fixed and selectionPriceType not null.
      *
      * @param bool $useRegularPrice
      * @dataProvider useRegularPriceDataProvider
+     *
+     * @return void
      */
-    public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
+    public function testGetValueTypeFixedWithSelectionPriceType(bool $useRegularPrice)
     {
         $this->setupSelectionPrice($useRegularPrice);
         $regularPrice = 100.125;
@@ -178,53 +183,49 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
 
         $this->bundleMock->expects($this->once())
             ->method('getPriceType')
-            ->will($this->returnValue(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED));
+            ->willReturn(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
         $this->bundleMock->expects($this->atLeastOnce())
             ->method('getPriceInfo')
-            ->will($this->returnValue($this->priceInfoMock));
+            ->willReturn($this->priceInfoMock);
         $this->priceInfoMock->expects($this->once())
             ->method('getPrice')
-            ->with($this->equalTo(RegularPrice::PRICE_CODE))
-            ->will($this->returnValue($this->regularPriceMock));
+            ->with(RegularPrice::PRICE_CODE)
+            ->willReturn($this->regularPriceMock);
         $this->regularPriceMock->expects($this->once())
             ->method('getValue')
-            ->will($this->returnValue($actualPrice));
+            ->willReturn($actualPrice);
         $this->bundleMock->expects($this->once())
             ->method('setFinalPrice')
-            ->will($this->returnSelf());
+            ->willReturnSelf();
         $this->eventManagerMock->expects($this->once())
             ->method('dispatch');
         $this->bundleMock->expects($this->exactly(2))
             ->method('getData')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        ['qty', null, 1],
-                        ['final_price', null, 100],
-                    ]
-                )
+            ->willReturnMap(
+                [
+                    ['qty', null, 1],
+                    ['final_price', null, 100],
+                    ['price', null, 100],
+                ]
             );
         $this->productMock->expects($this->once())
             ->method('getSelectionPriceType')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
         $this->productMock->expects($this->any())
             ->method('getSelectionPriceValue')
-            ->will($this->returnValue($actualPrice));
+            ->willReturn($actualPrice);
 
         if (!$useRegularPrice) {
             $this->discountCalculatorMock->expects($this->once())
                 ->method('calculateDiscount')
-                ->with(
-                    $this->equalTo($this->bundleMock),
-                    $this->equalTo($actualPrice)
-                )
-                ->will($this->returnValue($discountedPrice));
+                ->with($this->bundleMock, $actualPrice)
+                ->willReturn($discountedPrice);
         }
 
         $this->priceCurrencyMock->expects($this->once())
             ->method('round')
             ->with($actualPrice)
-            ->will($this->returnValue($expectedPrice));
+            ->willReturn($expectedPrice);
 
         $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
     }
@@ -338,6 +339,9 @@ public function testFixedPriceWithMultipleQty($useRegularPrice)
         $this->assertEquals($expectedPrice, $selectionPrice->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function useRegularPriceDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php
index 7b4d42568f686..1c3cf33cbf73b 100644
--- a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php
@@ -76,6 +76,9 @@ protected function setUp()
             ->getMock();
     }
 
+    /**
+     * @return object
+     */
     protected function getModel()
     {
         return $this->objectManager->getObject(BundleDataProvider::class, [
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
index c0624be8e7a97..98fd96c52ccd9 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -314,7 +314,8 @@ protected function getBundleOptions()
                         'template' => 'ui/dynamic-rows/templates/collapsible',
                         'additionalClasses' => 'admin__field-wide',
                         'dataScope' => 'data.bundle_options',
-                        'bundleSelectionsName' => 'product_bundle_container.bundle_selections'
+                        'isDefaultFieldScope' => 'is_default',
+                        'bundleSelectionsName' => 'product_bundle_container.bundle_selections',
                     ],
                 ],
             ],
@@ -378,7 +379,10 @@ protected function getBundleOptions()
                                                     'selection_qty' => '',
                                                 ],
                                                 'links' => ['insertData' => '${ $.provider }:${ $.dataProvider }'],
-                                                'source' => 'product'
+                                                'imports' => [
+                                                    'inputType' => '${$.provider}:${$.dataScope}.type',
+                                                ],
+                                                'source' => 'product',
                                             ],
                                         ],
                                     ],
@@ -594,11 +598,14 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'component' => 'Magento_Ui/js/dynamic-rows/record',
                         'is_collection' => true,
                         'imports' => [
-                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
-                        ]
+                            'inputType' => '${$.parentName}:inputType',
+                        ],
+                        'exports' => [
+                            'isDefaultValue' => '${$.parentName}:isDefaultValue.${$.index}',
+                        ],
                     ],
                 ],
             ],
@@ -691,11 +698,15 @@ protected function getBundleSelections()
                                 'componentType' => Form\Field::NAME,
                                 'formElement' => Form\Element\Checkbox::NAME,
                                 'dataType' => Form\Element\DataType\Price::NAME,
+                                'component' => 'Magento_Bundle/js/components/bundle-user-defined-checkbox',
                                 'label' => __('User Defined'),
                                 'dataScope' => 'selection_can_change_qty',
                                 'value' => '1',
                                 'valueMap' => ['true' => '1', 'false' => '0'],
                                 'sortOrder' => 110,
+                                'imports' => [
+                                    'inputType' => '${$.parentName}:inputType',
+                                ],
                             ],
                         ],
                     ],
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index b31cc38562740..84c9a97698b71 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -5,30 +5,30 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-catalog-rule": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-gift-message": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.3.*",
-        "magento/module-bundle-sample-data": "Sample Data version:100.3.*"
+        "magento/module-webapi": "*",
+        "magento/module-bundle-sample-data": "*",
+        "magento/module-sales-rule": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Bundle/etc/config.xml b/app/code/Magento/Bundle/etc/config.xml
deleted file mode 100644
index 152f04e251c35..0000000000000
--- a/app/code/Magento/Bundle/etc/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
-</config>
diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
new file mode 100644
index 0000000000000..33738cd252d61
--- /dev/null
+++ b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_product_bundle_option" resource="default" engine="innodb"
+           comment="Catalog Product Bundle Option">
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="smallint" name="required" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Required"/>
+        <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_bundle_option" column="parent_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_bundle_option_value" resource="default" engine="innodb"
+           comment="Catalog Product Bundle Option Value">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Option Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Product Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
+                    table="catalog_product_bundle_option_value" column="option_id"
+                    referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
+            <column name="option_id"/>
+            <column name="parent_product_id"/>
+            <column name="store_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_bundle_selection" resource="default" engine="innodb"
+           comment="Catalog Product Bundle Selection">
+        <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Selection Id"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Option Id"/>
+        <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Product Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Default"/>
+        <column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Selection Price Type"/>
+        <column xsi:type="decimal" name="selection_price_value" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Selection Price Value"/>
+        <column xsi:type="decimal" name="selection_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Selection Qty"/>
+        <column xsi:type="smallint" name="selection_can_change_qty" padding="6" unsigned="false" nullable="false"
+                identity="false" default="0" comment="Selection Can Change Qty"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="selection_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
+                    table="catalog_product_bundle_selection" column="option_id"
+                    referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_bundle_selection" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
+            <column name="option_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_bundle_selection_price" resource="default" engine="innodb"
+           comment="Catalog Product Bundle Selection Price">
+        <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Selection Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Selection Price Type"/>
+        <column xsi:type="decimal" name="selection_price_value" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Selection Price Value"/>
+        <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Product Id"/>
+        <constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
+            <column name="selection_id"/>
+            <column name="parent_product_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
+                    table="catalog_product_bundle_selection_price" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_DCF37523AA05D770A70AA4ED7C2616E4"
+                    table="catalog_product_bundle_selection_price" column="selection_id"
+                    referenceTable="catalog_product_bundle_selection" referenceColumn="selection_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_bundle_price_index" resource="default" engine="innodb"
+           comment="Catalog Product Bundle Price Index">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Max Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+                    table="catalog_product_bundle_price_index" column="customer_group_id"
+                    referenceTable="customer_group" referenceColumn="customer_group_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_bundle_price_index" column="entity_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
+                    table="catalog_product_bundle_price_index" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_bundle_stock_index" resource="default" engine="innodb"
+           comment="Catalog Product Bundle Stock Index">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Id"/>
+        <column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
+                default="0" comment="Stock Status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="website_id"/>
+            <column name="stock_id"/>
+            <column name="option_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_bundle_idx" resource="default" engine="innodb"
+           comment="Catalog Product Index Price Bundle Idx">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Price Type"/>
+        <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Special Price"/>
+        <column xsi:type="decimal" name="tier_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Percent"/>
+        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Orig Price"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tier"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
+           comment="Catalog Product Index Price Bundle Tmp">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Price Type"/>
+        <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Special Price"/>
+        <column xsi:type="decimal" name="tier_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Percent"/>
+        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Orig Price"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tier"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_bundle_sel_idx" resource="default" engine="innodb"
+           comment="Catalog Product Index Price Bundle Sel Idx">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Id"/>
+        <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Selection Id"/>
+        <column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Group Type"/>
+        <column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Is Required"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+            <column name="option_id"/>
+            <column name="selection_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
+           comment="Catalog Product Index Price Bundle Sel Tmp">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Id"/>
+        <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Selection Id"/>
+        <column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Group Type"/>
+        <column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Is Required"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+            <column name="option_id"/>
+            <column name="selection_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_bundle_opt_idx" resource="default" engine="innodb"
+           comment="Catalog Product Index Price Bundle Opt Idx">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Id"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="alt_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Alt Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Alt Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+            <column name="option_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
+           comment="Catalog Product Index Price Bundle Opt Tmp">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Id"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="alt_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Alt Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Alt Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+            <column name="option_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Bundle/etc/db_schema_whitelist.json b/app/code/Magento/Bundle/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..2834d707cae0f
--- /dev/null
+++ b/app/code/Magento/Bundle/etc/db_schema_whitelist.json
@@ -0,0 +1,212 @@
+{
+    "catalog_product_bundle_option": {
+        "column": {
+            "option_id": true,
+            "parent_id": true,
+            "required": true,
+            "position": true,
+            "type": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID": true
+        }
+    },
+    "catalog_product_bundle_option_value": {
+        "column": {
+            "value_id": true,
+            "option_id": true,
+            "store_id": true,
+            "title": true,
+            "parent_product_id": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID": true,
+            "CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID": true,
+            "CATALOG_PRODUCT_BUNDLE_OPTION_VALUE_OPTION_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_bundle_selection": {
+        "column": {
+            "selection_id": true,
+            "option_id": true,
+            "parent_product_id": true,
+            "product_id": true,
+            "position": true,
+            "is_default": true,
+            "selection_price_type": true,
+            "selection_price_value": true,
+            "selection_qty": true,
+            "selection_can_change_qty": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID": true,
+            "CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID": true,
+            "CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_BNDL_SELECTION_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    },
+    "catalog_product_bundle_selection_price": {
+        "column": {
+            "selection_id": true,
+            "website_id": true,
+            "selection_price_type": true,
+            "selection_price_value": true,
+            "parent_product_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE": true,
+            "CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID": true,
+            "FK_DCF37523AA05D770A70AA4ED7C2616E4": true,
+            "DCF37523AA05D770A70AA4ED7C2616E4": true
+        }
+    },
+    "catalog_product_bundle_price_index": {
+        "column": {
+            "entity_id": true,
+            "website_id": true,
+            "customer_group_id": true,
+            "min_price": true,
+            "max_price": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID": true,
+            "CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true,
+            "CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID": true,
+            "CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    },
+    "catalog_product_bundle_stock_index": {
+        "column": {
+            "entity_id": true,
+            "website_id": true,
+            "stock_id": true,
+            "option_id": true,
+            "stock_status": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_bundle_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "price_type": true,
+            "special_price": true,
+            "tier_percent": true,
+            "orig_price": true,
+            "price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true,
+            "base_tier": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_bundle_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "price_type": true,
+            "special_price": true,
+            "tier_percent": true,
+            "orig_price": true,
+            "price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true,
+            "base_tier": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_bundle_sel_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "option_id": true,
+            "selection_id": true,
+            "group_type": true,
+            "is_required": true,
+            "price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_bundle_sel_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "option_id": true,
+            "selection_id": true,
+            "group_type": true,
+            "is_required": true,
+            "price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_bundle_opt_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "option_id": true,
+            "min_price": true,
+            "alt_price": true,
+            "max_price": true,
+            "tier_price": true,
+            "alt_tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_bundle_opt_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "option_id": true,
+            "min_price": true,
+            "alt_price": true,
+            "max_price": true,
+            "tier_price": true,
+            "alt_tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml
index 287a6c8bfdbc0..72155d922a25f 100644
--- a/app/code/Magento/Bundle/etc/di.xml
+++ b/app/code/Magento/Bundle/etc/di.xml
@@ -50,7 +50,9 @@
                 <item name="custom_option_price" xsi:type="string">Magento\Catalog\Pricing\Price\CustomOptionPrice</item>
                 <item name="base_price" xsi:type="string">Magento\Catalog\Pricing\Price\BasePrice</item>
                 <item name="configured_price" xsi:type="string">Magento\Bundle\Pricing\Price\ConfiguredPrice</item>
+                <item name="configured_regular_price" xsi:type="string">Magento\Bundle\Pricing\Price\ConfiguredRegularPrice</item>
                 <item name="bundle_option" xsi:type="string">Magento\Bundle\Pricing\Price\BundleOptionPrice</item>
+                <item name="bundle_option_regular_price" xsi:type="string">Magento\Bundle\Pricing\Price\BundleOptionRegularPrice</item>
                 <item name="catalog_rule_price" xsi:type="string">Magento\CatalogRule\Pricing\Price\CatalogRulePrice</item>
             </argument>
         </arguments>
@@ -75,6 +77,11 @@
             <argument name="calculator" xsi:type="object">Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Pricing\Price\ConfiguredPriceSelection">
+        <arguments>
+            <argument name="calculator" xsi:type="object">Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface</argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Product\Attribute\Backend\Price">
         <plugin name="bundle" type="Magento\Bundle\Model\Plugin\PriceBackend" sortOrder="100" />
     </type>
@@ -116,6 +123,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item">
+        <plugin name="update_price_for_bundle_in_quote_item_option" type="Magento\Bundle\Plugin\UpdatePriceInQuoteItemOptions"/>
+    </type>
     <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
         <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
     </type>
@@ -133,6 +143,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Order\ProductOption">
+        <arguments>
+            <argument name="processorPool" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\Bundle\Model\ProductOptionProcessor</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice">
         <arguments>
             <argument name="excludeAdjustments" xsi:type="array">
@@ -200,4 +217,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesRule\Model\Quote\ChildrenValidationLocator">
+        <arguments>
+            <argument name="productTypeChildrenValidationMap" xsi:type="array">
+                <item name="bundle" xsi:type="boolean">false</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Bundle/etc/module.xml b/app/code/Magento/Bundle/etc/module.xml
index 8027f3c67c927..9e4e2a166a7b8 100644
--- a/app/code/Magento/Bundle/etc/module.xml
+++ b/app/code/Magento/Bundle/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Bundle" setup_version="2.0.4">
+    <module name="Magento_Bundle" >
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 62f61a725097e..783d71beb1646 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -299,7 +299,7 @@ function togglePriceType() {
 jQuery('#bundle_product_container').bundleProduct();
 jQuery('#product_bundle_container .collapse').collapse('hide');
 
-jQuery(window).load(function() {
+jQuery(window).on('load', function() {
     togglePriceType();
     Event.observe('price_type', 'change', togglePriceType);
 });
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js
index b608cff85b067..09331d37bb3b6 100644
--- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js
+++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js
@@ -14,7 +14,10 @@ define([
             clearing: false,
             parentContainer: '',
             parentSelections: '',
-            changer: ''
+            changer: '',
+            exports: {
+                value: '${$.parentName}:isDefaultValue'
+            }
         },
 
         /**
@@ -58,10 +61,6 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
-
-            if (this.prefer === 'radio' && this.checked()) {
-                this.clearValues();
-            }
         },
 
         /**
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js
index 428361f459544..a6fc84765cc65 100644
--- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js
+++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js
@@ -14,7 +14,57 @@ define([
             label: '',
             columnsHeader: false,
             columnsHeaderAfterRender: true,
-            addButton: false
+            addButton: false,
+            isDefaultFieldScope: 'is_default',
+            defaultRecords: {
+                use: [],
+                moreThanOne: false,
+                state: {}
+            },
+            listens: {
+                inputType: 'onInputTypeChange',
+                isDefaultValue: 'onIsDefaultValue'
+            }
+        },
+
+        /**
+         * Handler for type select.
+         *
+         * @param {String} inputType - changed.
+         */
+        onInputTypeChange: function (inputType) {
+            if (this.defaultRecords.moreThanOne && (inputType === 'radio' || inputType === 'select')) {
+                _.each(this.defaultRecords.use, function (index, counter) {
+                    this.source.set(
+                        this.dataScope + '.bundle_selections.' + index + '.' + this.isDefaultFieldScope,
+                        counter ? '0' : '1'
+                    );
+                }.bind(this));
+            }
+        },
+
+        /**
+         * Handler for is_default field.
+         *
+         * @param {Object} data - changed data.
+         */
+        onIsDefaultValue: function (data) {
+            var cb,
+                use = 0;
+
+            this.defaultRecords.use = [];
+
+            cb = function (elem, key) {
+
+                if (~~elem) {
+                    this.defaultRecords.use.push(key);
+                    use++;
+                }
+
+                this.defaultRecords.moreThanOne = use > 1;
+            }.bind(this);
+
+            _.each(data, cb);
         },
 
         /**
@@ -29,7 +79,6 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
-            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-user-defined-checkbox.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-user-defined-checkbox.js
new file mode 100644
index 0000000000000..a7ceded02d0c3
--- /dev/null
+++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-user-defined-checkbox.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            listens: {
+                inputType: 'onInputTypeChange'
+            }
+        },
+
+        /**
+         * Handler for "inputType" property
+         *
+         * @param {String} data
+         */
+        onInputTypeChange: function (data) {
+            data === 'checkbox' || data === 'multi' ?
+                this.clear()
+                    .visible(false) :
+                this.visible(true);
+        }
+    });
+});
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
index b4c2c00e5ac43..b9d075966c5d1 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
@@ -12,7 +12,6 @@
 
 <?php $items = $block->getChildren($parentItem) ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
index f3866d7b1b682..e18d75ce77b9c 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
@@ -12,7 +12,6 @@
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
 
 <?php $items = $block->getChildren($parentItem) ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
index 84cbd54d3bdcc..063d66edb9e70 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
@@ -10,7 +10,6 @@
 ?>
 <?php $parentItem = $block->getItem() ?>
 <?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
index bd99afc59a8c0..0cd39156b2513 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
@@ -12,7 +12,6 @@
 <?php $parentItem = $block->getItem() ?>
 <?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
 <?php $shipItems = $block->getChildren($parentItem) ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
diff --git a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
index d8d4cb1e99b7f..1e7fe6b6673d6 100644
--- a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
+++ b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
@@ -56,8 +56,9 @@ define([
 
             // Clear Summary box
             this.element.html('');
-
-            $.each(this.cache.currentElement.selected, $.proxy(this._renderOption, this));
+            this.cache.currentElement.positions.forEach(function (optionId) {
+                this._renderOption(optionId, this.cache.currentElement.selected[optionId]);
+            }, this);
             this.element
                 .parents(this.options.bundleSummaryContainer)
                 .toggleClass('empty', !this.cache.currentElementCount); // Zero elements equal '.empty' container
diff --git a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
new file mode 100644
index 0000000000000..b904d3f62a748
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class BundleProductTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['type_id']) && $data['type_id'] == 'bundle') {
+            return 'BundleProduct';
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php
new file mode 100644
index 0000000000000..184f7177a995c
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class BundleItemLinks implements ResolverInterface
+{
+    /**
+     * @var Collection
+     */
+    private $linkCollection;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @param Collection $linkCollection
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        Collection $linkCollection,
+        ValueFactory $valueFactory
+    ) {
+        $this->linkCollection = $linkCollection;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['option_id']) || !isset($value['parent_id'])) {
+            throw new LocalizedException(__('"option_id" and "parent_id" values should be specified'));
+        }
+
+        $this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
+        $result = function () use ($value) {
+            return $this->linkCollection->getLinksForOptionId((int)$value['option_id']);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
new file mode 100644
index 0000000000000..b67bd69ecf924
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type;
+use Magento\BundleGraphQl\Model\Resolver\Options\Collection;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class BundleItems implements ResolverInterface
+{
+    /**
+     * @var Collection
+     */
+    private $bundleOptionCollection;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param Collection $bundleOptionCollection
+     * @param ValueFactory $valueFactory
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        Collection $bundleOptionCollection,
+        ValueFactory $valueFactory,
+        MetadataPool $metadataPool
+    ) {
+        $this->bundleOptionCollection = $bundleOptionCollection;
+        $this->valueFactory = $valueFactory;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Fetch and format bundle option items.
+     *
+     * {@inheritDoc}
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        if ($value['type_id'] !== Type::TYPE_CODE
+            || !isset($value[$linkField])
+            || !isset($value[ProductInterface::SKU])
+        ) {
+            $result = function () {
+                return null;
+            };
+            return $this->valueFactory->create($result);
+        }
+
+        $this->bundleOptionCollection->addParentFilterData(
+            (int)$value[$linkField],
+            (int)$value['entity_id'],
+            $value[ProductInterface::SKU]
+        );
+
+        $result = function () use ($value, $linkField) {
+            return $this->bundleOptionCollection->getOptionsByParentId((int)$value[$linkField]);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
new file mode 100644
index 0000000000000..ee695c319501d
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Links;
+
+use Magento\Bundle\Model\Selection;
+use Magento\Bundle\Model\ResourceModel\Selection\CollectionFactory;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection as LinkCollection;
+use Magento\Framework\GraphQl\Query\EnumLookup;
+
+/**
+ * Collection to fetch link data at resolution time.
+ */
+class Collection
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $linkCollectionFactory;
+
+    /**
+     * @var EnumLookup
+     */
+    private $enumLookup;
+
+    /**
+     * @var int[]
+     */
+    private $optionIds = [];
+
+    /**
+     * @var int[]
+     */
+    private $parentIds = [];
+
+    /**
+     * @var array
+     */
+    private $links = [];
+
+    /**
+     * @param CollectionFactory $linkCollectionFactory
+     * @param EnumLookup $enumLookup
+     */
+    public function __construct(CollectionFactory $linkCollectionFactory, EnumLookup $enumLookup)
+    {
+        $this->linkCollectionFactory = $linkCollectionFactory;
+        $this->enumLookup = $enumLookup;
+    }
+
+    /**
+     * Add option and id filter pair to filter for fetch.
+     *
+     * @param int $optionId
+     * @param int $parentId
+     * @return void
+     */
+    public function addIdFilters(int $optionId, int $parentId) : void
+    {
+        if (!in_array($optionId, $this->optionIds)) {
+            $this->optionIds[] = $optionId;
+        }
+        if (!in_array($parentId, $this->parentIds)) {
+            $this->parentIds[] = $parentId;
+        }
+    }
+
+    /**
+     * Retrieve links for passed in option id.
+     *
+     * @param int $optionId
+     * @return array
+     */
+    public function getLinksForOptionId(int $optionId) : array
+    {
+        $linksList = $this->fetch();
+
+        if (!isset($linksList[$optionId])) {
+            return [];
+        }
+
+        return $linksList[$optionId];
+    }
+
+    /**
+     * Fetch link data and return in array format. Keys for links will be their option Ids.
+     *
+     * @return array
+     */
+    private function fetch() : array
+    {
+        if (empty($this->optionIds) || empty($this->parentIds) || !empty($this->links)) {
+            return $this->links;
+        }
+
+        /** @var LinkCollection $linkCollection */
+        $linkCollection = $this->linkCollectionFactory->create();
+        $linkCollection->setOptionIdsFilter($this->optionIds);
+        $field = 'parent_product_id';
+        foreach ($linkCollection->getSelect()->getPart('from') as $tableAlias => $data) {
+            if ($data['tableName'] == $linkCollection->getTable('catalog_product_bundle_selection')) {
+                $field = $tableAlias . '.' . $field;
+            }
+        }
+
+        $linkCollection->getSelect()
+            ->where($field . ' IN (?)', $this->parentIds);
+
+        /** @var Selection $link */
+        foreach ($linkCollection as $link) {
+            $data = $link->getData();
+            $formattedLink = [
+                'price' => $link->getSelectionPriceValue(),
+                'position' => $link->getPosition(),
+                'id' => $link->getSelectionId(),
+                'qty' => (int)$link->getSelectionQty(),
+                'is_default' => (bool)$link->getIsDefault(),
+                'price_type' => $this->enumLookup->getEnumValueFromField(
+                    'PriceTypeEnum',
+                    (string)$link->getSelectionPriceType()
+                ) ?: 'DYNAMIC',
+                'can_change_quantity' => $link->getSelectionCanChangeQty(),
+            ];
+            $data = array_replace($data, $formattedLink);
+            if (!isset($this->links[$link->getOptionId()])) {
+                $this->links[$link->getOptionId()] = [];
+            }
+            $this->links[$link->getOptionId()][] = $data;
+        }
+
+        return $this->links;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
new file mode 100644
index 0000000000000..149155c86275a
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+namespace Magento\BundleGraphQl\Model\Resolver\Options;
+
+use Magento\Bundle\Model\OptionFactory;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Collection to fetch bundle option data at resolution time.
+ */
+class Collection
+{
+    /**
+     * @var OptionFactory
+     */
+    private $bundleOptionFactory;
+
+    /**
+     * @var JoinProcessorInterface
+     */
+    private $extensionAttributesJoinProcessor;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var string[]
+     */
+    private $skuMap = [];
+
+    /**
+     * @var array
+     */
+    private $optionMap = [];
+
+    /**
+     * @param OptionFactory $bundleOptionFactory
+     * @param JoinProcessorInterface $extensionAttributesJoinProcessor
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        OptionFactory $bundleOptionFactory,
+        JoinProcessorInterface $extensionAttributesJoinProcessor,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->bundleOptionFactory = $bundleOptionFactory;
+        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Add parent id/sku pair to use for option filter at fetch time.
+     *
+     * @param int $parentId
+     * @param string $sku
+     */
+    public function addParentFilterData(int $parentId, int $parentEntityId, string $sku) : void
+    {
+        $this->skuMap[$parentId] = ['sku' => $sku, 'entity_id' => $parentEntityId];
+    }
+
+    /**
+     * Fetch data for bundle options and return the options for the given parent id.
+     *
+     * @param int $parentId
+     * @return array
+     */
+    public function getOptionsByParentId(int $parentId) : array
+    {
+        $options = $this->fetch();
+        if (!isset($options[$parentId])) {
+            return [];
+        }
+
+        return $options[$parentId];
+    }
+
+    /**
+     * Fetch bundle option data and return in array format. Keys for bundle options will be their parent product ids.
+     *
+     * @return array
+     */
+    private function fetch() : array
+    {
+        if (empty($this->skuMap) || !empty($this->optionMap)) {
+            return $this->optionMap;
+        }
+
+        /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
+        $optionsCollection = $this->bundleOptionFactory->create()->getResourceCollection();
+        // All products in collection will have same store id.
+        $optionsCollection->joinValues($this->storeManager->getStore()->getId());
+
+        $productTable = $optionsCollection->getTable('catalog_product_entity');
+        $linkField = $optionsCollection->getConnection()->getAutoIncrementField($productTable);
+        $optionsCollection->getSelect()->join(
+            ['cpe' => $productTable],
+            'cpe.'.$linkField.' = main_table.parent_id',
+            []
+        )->where(
+            "cpe.entity_id IN (?)",
+            $this->skuMap
+        );
+        $optionsCollection->setPositionOrder();
+
+        $this->extensionAttributesJoinProcessor->process($optionsCollection);
+        if (empty($optionsCollection->getData())) {
+            return null;
+        }
+
+        /** @var \Magento\Bundle\Model\Option $option */
+        foreach ($optionsCollection as $option) {
+            if (!isset($this->optionMap[$option->getParentId()])) {
+                $this->optionMap[$option->getParentId()] = [];
+            }
+            $this->optionMap[$option->getParentId()][$option->getId()] = $option->getData();
+            $this->optionMap[$option->getParentId()][$option->getId()]['title']
+                = $option->getTitle() === null ? $option->getDefaultTitle() : $option->getTitle();
+            $this->optionMap[$option->getParentId()][$option->getId()]['sku']
+                = $this->skuMap[$option->getParentId()]['sku'];
+        }
+
+        return $this->optionMap;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php
new file mode 100644
index 0000000000000..de72b18982c12
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Options;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Class Label
+ */
+class Label implements ResolverInterface
+{
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var ProductDataProvider
+     */
+    private $product;
+
+    /**
+     * @param ValueFactory $valueFactory
+     * @param ProductDataProvider $product
+     */
+    public function __construct(ValueFactory $valueFactory, ProductDataProvider $product)
+    {
+        $this->valueFactory = $valueFactory;
+        $this->product = $product;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['sku'])) {
+            throw new LocalizedException(__('"sku" value should be specified'));
+        }
+
+        $this->product->addProductSku($value['sku']);
+        $this->product->addEavAttributes(['name']);
+
+        $result = function () use ($value) {
+            $productData = $this->product->getProductBySku($value['sku']);
+            /** @var \Magento\Catalog\Model\Product $productModel */
+            $productModel = isset($productData['model']) ? $productData['model'] : null;
+            return $productModel ? $productModel->getName() : null;
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php
new file mode 100644
index 0000000000000..978e1c455fc0a
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type as Bundle;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class DynamicPrice implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $result = null;
+        if ($value['type_id'] === Bundle::TYPE_CODE) {
+            $result = isset($value['price_type']) ? !$value['price_type'] : null;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php
new file mode 100644
index 0000000000000..73f84c278a634
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type as Bundle;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class DynamicSku implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $result = null;
+        if ($value['type_id'] === Bundle::TYPE_CODE) {
+            $result = isset($value['sku_type']) ? !$value['sku_type'] : null;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php
new file mode 100644
index 0000000000000..a4bb8ef64fc98
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type as Bundle;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class DynamicWeight implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $result = null;
+        if ($value['type_id'] === Bundle::TYPE_CODE) {
+            $result = isset($value['weight_type']) ? !$value['weight_type'] : null;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php
new file mode 100644
index 0000000000000..b7351b09d437e
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type as Bundle;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\EnumLookup;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class PriceView implements ResolverInterface
+{
+    /**
+     * @var EnumLookup
+     */
+    private $enumLookup;
+
+    /**
+     * @param EnumLookup $enumLookup
+     */
+    public function __construct(EnumLookup $enumLookup)
+    {
+        $this->enumLookup = $enumLookup;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $result = null;
+        if ($value['type_id'] === Bundle::TYPE_CODE) {
+            $result = isset($value['price_view'])
+                ? $this->enumLookup->getEnumValueFromField('PriceViewEnum', $value['price_view']) : null;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php
new file mode 100644
index 0000000000000..6babf6520e10e
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type as Bundle;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\EnumLookup;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class ShipBundleItems implements ResolverInterface
+{
+    /**
+     * @var EnumLookup
+     */
+    private $enumLookup;
+
+    /**
+     * @param EnumLookup $enumLookup
+     */
+    public function __construct(EnumLookup $enumLookup)
+    {
+        $this->enumLookup = $enumLookup;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $result = isset($value['shipment_type']) && $value['type_id'] === Bundle::TYPE_CODE
+            ? $this->enumLookup->getEnumValueFromField('ShipBundleItemsEnum', $value['shipment_type']) : null;
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/README.md b/app/code/Magento/BundleGraphQl/README.md
new file mode 100644
index 0000000000000..d74b0160aa599
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/README.md
@@ -0,0 +1,4 @@
+# BundleGraphQl
+
+**BundleGraphQl** provides type and resolver information for the GraphQl module
+to generate bundle product information.
diff --git a/app/code/Magento/BundleGraphQl/Test/Mftf/README.md b/app/code/Magento/BundleGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6c7176cbb77f9
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Bundle Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Bundle Graph Ql** module.
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
new file mode 100644
index 0000000000000..aea55cb5c644c
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-bundle-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-catalog": "*",
+        "magento/module-bundle": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\BundleGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/etc/di.xml b/app/code/Magento/BundleGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..4f41f3cb8dc80
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\GraphQl\Query\FieldTranslator">
+        <arguments>
+            <argument name="translationMap" xsi:type="array">
+                <item name="ship_bundle_items" xsi:type="string">shipment_type</item>
+                <item name="dynamic_price" xsi:type="string">price_type</item>
+                <item name="dynamic_sku" xsi:type="string">sku_type</item>
+                <item name="dynamic_weight" xsi:type="string">weight_type</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..50a2e32b8c9d5
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\CatalogGraphQl\Model\ProductInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="productTypeNameResolvers" xsi:type="array">
+                <item name="bundle_product_type_resolver" xsi:type="object">Magento\BundleGraphQl\Model\BundleProductTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Enum\DefaultDataMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="ShipBundleItemsEnum" xsi:type="array">
+                    <item name="together" xsi:type="string">0</item>
+                    <item name="separately" xsi:type="string">1</item>
+                </item>
+                <item name="PriceViewEnum" xsi:type="array">
+                    <item name="price_range" xsi:type="string">0</item>
+                    <item name="as_low_as" xsi:type="string">1</item>
+                </item>
+                <item name="PriceTypeEnum" xsi:type="array">
+                    <item name="fixed" xsi:type="string">0</item>
+                    <item name="percent" xsi:type="string">1</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="bundle" xsi:type="string">BundleProduct</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/BundleGraphQl/etc/module.xml b/app/code/Magento/BundleGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..352a46d7c171e
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/etc/module.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_BundleGraphQl" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_BundleProduct"/>
+            <module name="Magento_Store"/>
+            <module name="Magento_GraphQl"/>
+            <module name="Magento_CatalogGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..edde6079dfb2f
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -0,0 +1,43 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type BundleItem @doc(description: "BundleItem defines an individual item in a bundle product") {
+    option_id: Int @doc(description: "An ID assigned to each type of item in a bundle product")
+    title: String @doc(description: "The display name of the item")
+    required: Boolean @doc(description: "Indicates whether the item must be included in the bundle")
+    type: String @doc(description: "The input type that the customer uses to select the item. Examples include radio button and checkbox")
+    position: Int @doc(description: "he relative position of this item compared to the other bundle items")
+    sku: String @doc(description: "The SKU of the bundle product")
+    options: [BundleItemOption] @doc(description: "An array of additional options for this bundle item") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItemLinks")
+}
+
+type BundleItemOption @doc(description: "BundleItemOption defines characteristics and options for a specific bundle item") {
+    id: Int @doc(description: "The ID assigned to the bundled item option")
+    label: String @doc(description: "The text that identifies the bundled item option") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Label")
+    qty: Float @doc(description: "Indicates the quantity of this specific bundle item")
+    position: Int @doc(description: "When a bundle item contains multiple options, the relative position of this option compared to the other options")
+    is_default: Boolean @doc(description: "Indicates whether this option is the default option")
+    price: Float @doc(description: "The price of the selected option")
+    price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC")
+    can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option")
+    product: ProductInterface @doc(description: "Contains details about this product option") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
+}
+
+type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems") {
+    price_view: PriceViewEnum @doc(description: "One of PRICE_RANGE or AS_LOW_AS") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\PriceView")
+    dynamic_price: Boolean @doc(description: "Indicates whether the bundle product has a dynamic price") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicPrice")
+    dynamic_sku: Boolean @doc(description: "Indicates whether the bundle product has a dynamic SK") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicSku")
+    ship_bundle_items: ShipBundleItemsEnum @doc(description: "Indicates whether to ship bundle items together or individually") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\ShipBundleItems")
+    dynamic_weight: Boolean @doc(description: "Indicates whether the bundle product has a dynamically calculated weight") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicWeight")
+    items: [BundleItem] @doc(description: "An array containing information about individual bundle items") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItems")
+}
+
+enum PriceViewEnum @doc(description: "This enumeration defines whether a bundle product's price is displayed as the lowest possible value or as a range.") {
+    PRICE_RANGE
+    AS_LOW_AS
+}
+
+enum ShipBundleItemsEnum @doc(description: "This enumeration defines whether bundle items must be shipped together.") {
+    TOGETHER
+    SEPARATELY
+}
diff --git a/app/code/Magento/BundleGraphQl/registration.php b/app/code/Magento/BundleGraphQl/registration.php
new file mode 100644
index 0000000000000..dc835577c922b
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_BundleGraphQl', __DIR__);
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
index 9b8518a41ffff..2cefc60a42976 100644
--- a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -9,9 +9,9 @@
 use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProductModel;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
-use Magento\ImportExport\Controller\Adminhtml\Import;
 use Magento\ImportExport\Model\Import as ImportModel;
-use \Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class RowCustomizer
@@ -105,6 +105,34 @@ class RowCustomizer implements RowCustomizerInterface
         AbstractType::SHIPMENT_SEPARATELY => 'separately',
     ];
 
+    /**
+     * @var \Magento\Bundle\Model\ResourceModel\Option\Collection[]
+     */
+    private $optionCollections = [];
+
+    /**
+     * @var array
+     */
+    private $storeIdToCode = [];
+
+    /**
+     * @var string
+     */
+    private $optionCollectionCacheKey = '_cache_instance_options_collection';
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * Retrieve list of bundle specific columns
      * @return array
@@ -205,17 +233,15 @@ protected function populateBundleData($collection)
      * @param \Magento\Catalog\Model\Product $product
      * @return string
      */
-    protected function getFormattedBundleOptionValues($product)
+    protected function getFormattedBundleOptionValues(\Magento\Catalog\Model\Product $product): string
     {
-        /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
-        $optionsCollection = $product->getTypeInstance()
-            ->getOptionsCollection($product)
-            ->setOrder('position', Collection::SORT_ORDER_ASC);
-
+        $optionCollections = $this->getProductOptionCollection($product);
         $bundleData = '';
-        foreach ($optionsCollection as $option) {
+        $optionTitles = $this->getBundleOptionTitles($product);
+        foreach ($optionCollections->getItems() as $option) {
+            $optionValues = $this->getFormattedOptionValues($option, $optionTitles);
             $bundleData .= $this->getFormattedBundleSelections(
-                $this->getFormattedOptionValues($option),
+                $optionValues,
                 $product->getTypeInstance()
                     ->getSelectionsCollection([$option->getId()], $product)
                     ->setOrder('position', Collection::SORT_ORDER_ASC)
@@ -242,7 +268,8 @@ protected function getFormattedBundleSelections($optionValues, SelectionCollecti
                 'price' => $selection->getSelectionPriceValue(),
                 'default' => $selection->getIsDefault(),
                 'default_qty' => $selection->getSelectionQty(),
-                'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType())
+                'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType()),
+                'can_change_qty' => $selection->getSelectionCanChangeQty(),
             ];
             $bundleData .= $optionValues
                 . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
@@ -266,16 +293,25 @@ function ($value, $key) {
      * Retrieve option value of bundle product
      *
      * @param \Magento\Bundle\Model\Option $option
+     * @param string[] $optionTitles
      * @return string
      */
-    protected function getFormattedOptionValues($option)
-    {
-        return 'name' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
-        . $option->getTitle() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
-        . 'type' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
-        . $option->getType() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
-        . 'required' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
-        . $option->getRequired();
+    protected function getFormattedOptionValues(
+        \Magento\Bundle\Model\Option $option,
+        array $optionTitles = []
+    ): string {
+        $names = implode(ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, array_map(
+            function ($title, $storeName) {
+                return $storeName . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR . $title;
+            },
+            $optionTitles[$option->getOptionId()],
+            array_keys($optionTitles[$option->getOptionId()])
+        ));
+        return $names . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+            . 'type' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
+            . $option->getType() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+            . 'required' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
+            . $option->getRequired();
     }
 
     /**
@@ -286,7 +322,7 @@ protected function getFormattedOptionValues($option)
      */
     protected function getTypeValue($type)
     {
-        return isset($this->typeMapping[$type]) ? $this->typeMapping[$type] : self::VALUE_DYNAMIC;
+        return $this->typeMapping[$type] ?? self::VALUE_DYNAMIC;
     }
 
     /**
@@ -297,7 +333,7 @@ protected function getTypeValue($type)
      */
     protected function getPriceViewValue($type)
     {
-        return isset($this->priceViewMapping[$type]) ? $this->priceViewMapping[$type] : self::VALUE_PRICE_RANGE;
+        return $this->priceViewMapping[$type] ?? self::VALUE_PRICE_RANGE;
     }
 
     /**
@@ -308,7 +344,7 @@ protected function getPriceViewValue($type)
      */
     protected function getPriceTypeValue($type)
     {
-        return isset($this->priceTypeMapping[$type]) ? $this->priceTypeMapping[$type] : null;
+        return $this->priceTypeMapping[$type] ?? null;
     }
 
     /**
@@ -319,7 +355,7 @@ protected function getPriceTypeValue($type)
      */
     private function getShipmentTypeValue($type)
     {
-        return isset($this->shipmentTypeMapping[$type]) ? $this->shipmentTypeMapping[$type] : null;
+        return $this->shipmentTypeMapping[$type] ?? null;
     }
 
     /**
@@ -380,4 +416,83 @@ private function parseAdditionalAttributes($additionalAttributes)
         }
         return $preparedAttributes;
     }
+
+    /**
+     * Get product options titles.
+     *
+     * Values for all store views (default) should be specified with 'name' key.
+     * If user want to specify value or change existing for non default store views it should be specified with
+     * 'name_' prefix and needed store view suffix.
+     *
+     * For example:
+     *  - 'name=All store views name' for all store views
+     *  - 'name_specific_store=Specific store name' for store view with 'specific_store' store code
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return array
+     */
+    private function getBundleOptionTitles(\Magento\Catalog\Model\Product $product): array
+    {
+        $optionCollections = $this->getProductOptionCollection($product);
+        $optionsTitles = [];
+        /** @var \Magento\Bundle\Model\Option $option */
+        foreach ($optionCollections->getItems() as $option) {
+            $optionsTitles[$option->getId()]['name'] = $option->getTitle();
+        }
+        $storeIds = $product->getStoreIds();
+        if (count($storeIds) > 1) {
+            foreach ($storeIds as $storeId) {
+                $optionCollections = $this->getProductOptionCollection($product, (int)$storeId);
+                /** @var \Magento\Bundle\Model\Option $option */
+                foreach ($optionCollections->getItems() as $option) {
+                    $optionTitle = $option->getTitle();
+                    if ($optionsTitles[$option->getId()]['name'] != $optionTitle) {
+                        $optionsTitles[$option->getId()]['name_' . $this->getStoreCodeById((int)$storeId)] =
+                            $optionTitle;
+                    }
+                }
+            }
+        }
+        return $optionsTitles;
+    }
+
+    /**
+     * Get product options collection by provided product model.
+     *
+     * Set given store id to the product if it was defined (default store id will be set if was not).
+     *
+     * @param \Magento\Catalog\Model\Product $product $product
+     * @param int $storeId
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+     */
+    private function getProductOptionCollection(
+        \Magento\Catalog\Model\Product $product,
+        int $storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID
+    ): \Magento\Bundle\Model\ResourceModel\Option\Collection {
+        $productSku = $product->getSku();
+        if (!isset($this->optionCollections[$productSku][$storeId])) {
+            $product->unsetData($this->optionCollectionCacheKey);
+            $product->setStoreId($storeId);
+            $this->optionCollections[$productSku][$storeId] = $product->getTypeInstance()
+                ->getOptionsCollection($product)
+                ->setOrder('position', Collection::SORT_ORDER_ASC);
+        }
+        return $this->optionCollections[$productSku][$storeId];
+    }
+
+    /**
+     * Retrieve store code by it's ID.
+     *
+     * Collect store id in $storeIdToCode[] private variable if it was not initialized earlier.
+     *
+     * @param int $storeId
+     * @return string
+     */
+    private function getStoreCodeById(int $storeId): string
+    {
+        if (!isset($this->storeIdToCode[$storeId])) {
+            $this->storeIdToCode[$storeId] = $this->storeManager->getStore($storeId)->getCode();
+        }
+        return $this->storeIdToCode[$storeId];
+    }
 }
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
index f273ee0b1c0ef..81a47d72602b7 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -8,13 +8,19 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
-use \Magento\Framework\App\ObjectManager;
-use \Magento\Bundle\Model\Product\Price as BundlePrice;
-use \Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Bundle\Model\Product\Price as BundlePrice;
+use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Bundle
+ *
  * @package Magento\BundleImportExport\Model\Import\Product\Type
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -137,25 +143,39 @@ class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abst
     private $relationsDataSaver;
 
     /**
-     * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $prodAttrColFac
-     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var array
+     */
+    private $storeCodeToId = [];
+
+    /**
+     * @param AttributeSetCollectionFactory $attrSetColFac
+     * @param AttributeCollectionFactory $prodAttrColFac
+     * @param ResourceConnection $resource
      * @param array $params
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
+     * @param MetadataPool|null $metadataPool
      * @param Bundle\RelationsDataSaver|null $relationsDataSaver
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
-        \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFac,
-        \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $prodAttrColFac,
-        \Magento\Framework\App\ResourceConnection $resource,
+        AttributeSetCollectionFactory $attrSetColFac,
+        AttributeCollectionFactory $prodAttrColFac,
+        ResourceConnection $resource,
         array $params,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        Bundle\RelationsDataSaver $relationsDataSaver = null
+        MetadataPool $metadataPool = null,
+        Bundle\RelationsDataSaver $relationsDataSaver = null,
+        StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($attrSetColFac, $prodAttrColFac, $resource, $params, $metadataPool);
 
         $this->relationsDataSaver = $relationsDataSaver
             ?: ObjectManager::getInstance()->get(Bundle\RelationsDataSaver::class);
+        $this->storeManager = $storeManager
+            ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -262,20 +282,29 @@ protected function populateOptionTemplate($option, $entityId, $index = null)
      * @param array $option
      * @param int $optionId
      * @param int $storeId
-     *
-     * @return array|bool
+     * @return array
      */
-    protected function populateOptionValueTemplate($option, $optionId, $storeId = 0)
+    protected function populateOptionValueTemplate(array $option, int $optionId, int $storeId = 0): array
     {
-        if (!isset($option['name']) || !isset($option['parent_id']) || !$optionId) {
-            return false;
+        $optionValues = [];
+        if (isset($option['name'], $option['parent_id']) && $optionId) {
+            $pattern = '/^name[_]?(.*)/';
+            $keys = array_keys($option);
+            $optionNames = preg_grep($pattern, $keys);
+            foreach ($optionNames as $optionName) {
+                preg_match($pattern, $optionName, $storeCodes);
+                $storeCode = array_pop($storeCodes);
+                $storeId = $storeCode ? $this->getStoreIdByCode($storeCode) : $storeId;
+                $optionValues[] = [
+                    'option_id' => $optionId,
+                    'parent_product_id' => $option['parent_id'],
+                    'store_id' => $storeId,
+                    'title' => $option[$optionName],
+                ];
+            }
         }
-        return [
-            'option_id' => $optionId,
-            'parent_product_id' => $option['parent_id'],
-            'store_id' => $storeId,
-            'title' => $option['name'],
-        ];
+
+        return $optionValues;
     }
 
     /**
@@ -285,7 +314,7 @@ protected function populateOptionValueTemplate($option, $optionId, $storeId = 0)
      * @param int $optionId
      * @param int $parentId
      * @param int $index
-     * @return array
+     * @return array|bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -299,6 +328,7 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
         } else {
             $productId = $selection['product_id'];
         }
+
         $populatedSelection = [
             'selection_id' => null,
             'option_id' => (int)$optionId,
@@ -310,7 +340,8 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
                 ? self::SELECTION_PRICE_TYPE_FIXED : self::SELECTION_PRICE_TYPE_PERCENT,
             'selection_price_value' => (isset($selection['price'])) ? (float)$selection['price'] : 0.0,
             'selection_qty' => (isset($selection['default_qty'])) ? (float)$selection['default_qty'] : 1.0,
-            'selection_can_change_qty' => 1,
+            'selection_can_change_qty' => isset($selection['can_change_qty'])
+                ? ($selection['can_change_qty'] ? 1 : 0) : 1,
         ];
         if (isset($selection['selection_id'])) {
             $populatedSelection['selection_id'] = $selection['selection_id'];
@@ -318,12 +349,23 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
         return $populatedSelection;
     }
 
+    /**
+     * Deprecated method for retrieving mapping between skus and products.
+     *
+     * @deprecated Misspelled method
+     * @see retrieveProductsByCachedSkus
+     */
+    protected function retrieveProducsByCachedSkus()
+    {
+        return $this->retrieveProductsByCachedSkus();
+    }
+
     /**
      * Retrieve mapping between skus and products.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
      */
-    protected function retrieveProducsByCachedSkus()
+    protected function retrieveProductsByCachedSkus()
     {
         $this->_cachedSkuToProducts = $this->connection->fetchPairs(
             $this->connection->select()->from(
@@ -368,10 +410,11 @@ public function saveData()
                     $this->parseSelections($rowData, $productData[$this->getProductEntityLinkField()]);
                 }
                 if (!empty($this->_cachedOptions)) {
-                    $this->retrieveProducsByCachedSkus();
+                    $this->retrieveProductsByCachedSkus();
                     $this->populateExistingOptions();
                     $this->insertOptions();
                     $this->insertSelections();
+                    $this->insertParentChildRelations();
                     $this->clear();
                 }
             }
@@ -560,26 +603,31 @@ protected function insertOptions()
 
     /**
      * Populate array for insert option values
+     *
      * @param array $optionIds
      * @return array
      */
-    protected function populateInsertOptionValues($optionIds)
+    protected function populateInsertOptionValues(array $optionIds): array
     {
-        $insertValues = [];
+        $optionValues = [];
         foreach ($this->_cachedOptions as $entityId => $options) {
             foreach ($options as $key => $option) {
                 foreach ($optionIds as $optionId => $assoc) {
                     if ($assoc['position'] == $this->_cachedOptions[$entityId][$key]['index']
                         && $assoc['parent_id'] == $entityId) {
                         $option['parent_id'] = $entityId;
-                        $insertValues[] = $this->populateOptionValueTemplate($option, $optionId);
+                        $optionValues = array_merge(
+                            $optionValues,
+                            $this->populateOptionValueTemplate($option, $optionId)
+                        );
                         $this->_cachedOptions[$entityId][$key]['option_id'] = $optionId;
                         break;
                     }
                 }
             }
         }
-        return $insertValues;
+
+        return $optionValues;
     }
 
     /**
@@ -616,6 +664,32 @@ protected function insertSelections()
         return $this;
     }
 
+    /**
+     * Insert parent/child product relations
+     *
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
+     */
+    private function insertParentChildRelations()
+    {
+        foreach ($this->_cachedOptions as $productId => $options) {
+            $childIds = [];
+            foreach ($options as $option) {
+                foreach ($option['selections'] as $selection) {
+                    if (!isset($selection['parent_product_id'])) {
+                        if (!isset($this->_cachedSkuToProducts[$selection['sku']])) {
+                            continue;
+                        }
+                        $childIds[] = $this->_cachedSkuToProducts[$selection['sku']];
+                    }
+                }
+
+                $this->relationsDataSaver->saveProductRelations($productId, $childIds);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Initialize attributes parameters for all attributes' sets.
      *
@@ -700,4 +774,22 @@ protected function clear()
         $this->_cachedSkuToProducts = [];
         return $this;
     }
+
+    /**
+     * Get store id by store code.
+     *
+     * @param string $storeCode
+     * @return int
+     */
+    private function getStoreIdByCode(string $storeCode): int
+    {
+        if (!isset($this->storeCodeToId[$storeCode])) {
+            /** @var $store \Magento\Store\Model\Store */
+            foreach ($this->storeManager->getStores() as $store) {
+                $this->storeCodeToId[$store->getCode()] = $store->getId();
+            }
+        }
+
+        return $this->storeCodeToId[$storeCode];
+    }
 }
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle/RelationsDataSaver.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle/RelationsDataSaver.php
index a58195f823bf1..5409d12ac56d3 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle/RelationsDataSaver.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle/RelationsDataSaver.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type\Bundle;
 
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * A bundle product relations (options, selections, etc.) data saver.
  *
@@ -17,13 +20,22 @@ class RelationsDataSaver
      */
     private $resource;
 
+    /**
+     * @var Relation
+     */
+    private $productRelation;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param Relation                                  $productRelation
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource
+        \Magento\Framework\App\ResourceConnection $resource,
+        Relation $productRelation = null
     ) {
-        $this->resource = $resource;
+        $this->resource        = $resource;
+        $this->productRelation = $productRelation
+            ?: ObjectManager::getInstance()->get(Relation::class);
     }
 
     /**
@@ -92,4 +104,17 @@ public function saveSelections(array $selections)
             );
         }
     }
+
+    /**
+     * Saves given parent/child relations.
+     *
+     * @param int $parentId
+     * @param array $childIds
+     *
+     * @return void
+     */
+    public function saveProductRelations($parentId, $childIds)
+    {
+        $this->productRelation->processRelations($parentId, $childIds);
+    }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE.txt b/app/code/Magento/BundleImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE.txt
rename to app/code/Magento/BundleImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE_AFL.txt b/app/code/Magento/BundleImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE_AFL.txt
rename to app/code/Magento/BundleImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/BundleImportExport/Test/Mftf/README.md b/app/code/Magento/BundleImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e4c6855132d05
--- /dev/null
+++ b/app/code/Magento/BundleImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Bundle Import Export Functional Tests
+
+The Functional Test Module for **Magento Bundle Import Export** module.
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
index e76e9e1ba565f..10e8a3443f5f9 100644
--- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
@@ -52,14 +52,24 @@ class RowCustomizerTest extends \PHPUnit\Framework\TestCase
      */
     protected $selection;
 
+    /** @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $scopeResolver;
+
     /**
      * Set up
      */
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->scopeResolver = $this->getMockBuilder(\Magento\Framework\App\ScopeResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getScope'])
+            ->getMockForAbstractClass();
         $this->rowCustomizerMock = $this->objectManagerHelper->getObject(
-            \Magento\BundleImportExport\Model\Export\RowCustomizer::class
+            \Magento\BundleImportExport\Model\Export\RowCustomizer::class,
+            [
+                'scopeResolver' => $this->scopeResolver,
+            ]
         );
         $this->productResourceCollection = $this->createPartialMock(
             \Magento\Catalog\Model\ResourceModel\Product\Collection::class,
@@ -72,6 +82,8 @@ protected function setUp()
                 'getPriceType',
                 'getShipmentType',
                 'getSkuType',
+                'getSku',
+                'getStoreIds',
                 'getPriceView',
                 'getWeightType',
                 'getTypeInstance',
@@ -79,6 +91,7 @@ protected function setUp()
                 'getSelectionsCollection'
             ]
         );
+        $this->product->expects($this->any())->method('getStoreIds')->willReturn([1]);
         $this->product->expects($this->any())->method('getEntityId')->willReturn(1);
         $this->product->expects($this->any())->method('getPriceType')->willReturn(1);
         $this->product->expects($this->any())->method('getShipmentType')->willReturn(1);
@@ -88,29 +101,38 @@ protected function setUp()
         $this->product->expects($this->any())->method('getTypeInstance')->willReturnSelf();
         $this->optionsCollection = $this->createPartialMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
-            ['setOrder', 'getIterator']
+            ['setOrder', 'getItems']
         );
         $this->product->expects($this->any())->method('getOptionsCollection')->willReturn($this->optionsCollection);
         $this->optionsCollection->expects($this->any())->method('setOrder')->willReturnSelf();
         $this->option = $this->createPartialMock(
             \Magento\Bundle\Model\Option::class,
-            ['getId', 'getTitle', 'getType', 'getRequired']
+            ['getId', 'getOptionId', 'getTitle', 'getType', 'getRequired']
         );
         $this->option->expects($this->any())->method('getId')->willReturn(1);
+        $this->option->expects($this->any())->method('getOptionId')->willReturn(1);
         $this->option->expects($this->any())->method('getTitle')->willReturn('title');
         $this->option->expects($this->any())->method('getType')->willReturn(1);
         $this->option->expects($this->any())->method('getRequired')->willReturn(1);
-        $this->optionsCollection->expects($this->any())->method('getIterator')->will(
+        $this->optionsCollection->expects($this->any())->method('getItems')->will(
             $this->returnValue(new \ArrayIterator([$this->option]))
         );
         $this->selection = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
-            ['getSku', 'getSelectionPriceValue', 'getIsDefault', 'getSelectionQty', 'getSelectionPriceType']
+            [
+                'getSku',
+                'getSelectionPriceValue',
+                'getIsDefault',
+                'getSelectionQty',
+                'getSelectionPriceType',
+                'getSelectionCanChangeQty'
+            ]
         );
         $this->selection->expects($this->any())->method('getSku')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionPriceValue')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionQty')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionPriceType')->willReturn(1);
+        $this->selection->expects($this->any())->method('getSelectionCanChangeQty')->willReturn(1);
         $this->selectionsCollection = $this->createPartialMock(
             \Magento\Bundle\Model\ResourceModel\Selection\Collection::class,
             ['getIterator', 'addAttributeToSort']
@@ -122,6 +144,7 @@ protected function setUp()
         $this->product->expects($this->any())->method('getSelectionsCollection')->willReturn(
             $this->selectionsCollection
         );
+        $this->product->expects($this->any())->method('getSku')->willReturn(1);
         $this->productResourceCollection->expects($this->any())->method('addAttributeToFilter')->willReturnSelf();
         $this->productResourceCollection->expects($this->any())->method('getIterator')->will(
             $this->returnValue(new \ArrayIterator([$this->product]))
@@ -133,6 +156,8 @@ protected function setUp()
      */
     public function testPrepareData()
     {
+        $scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)->getMockForAbstractClass();
+        $this->scopeResolver->expects($this->any())->method('getScope')->willReturn($scope);
         $result = $this->rowCustomizerMock->prepareData($this->productResourceCollection, [1]);
         $this->assertNotNull($result);
     }
@@ -160,6 +185,8 @@ public function testAddHeaderColumns()
      */
     public function testAddData()
     {
+        $scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)->getMockForAbstractClass();
+        $this->scopeResolver->expects($this->any())->method('getScope')->willReturn($scope);
         $preparedData = $this->rowCustomizerMock->prepareData($this->productResourceCollection, [1]);
         $attributes = 'attribute=1,sku_type=1,attribute2="Text",price_type=1,price_view=1,weight_type=1,'
             . 'values=values,shipment_type=1,attribute3=One,Two,Three';
@@ -168,6 +195,19 @@ public function testAddData()
             'additional_attributes' => $attributes
         ];
         $preparedRow = $preparedData->addData($dataRow, 1);
+
+        $bundleValues = [
+            'name=title',
+            'type=1',
+            'required=1',
+            'sku=1',
+            'price=1',
+            'default=',
+            'default_qty=1',
+            'price_type=percent',
+            'can_change_qty=1',
+        ];
+
         $expected = [
             'sku' => 'sku1',
             'additional_attributes' => 'attribute=1,attribute2="Text",attribute3=One,Two,Three',
@@ -176,7 +216,7 @@ public function testAddData()
             'bundle_sku_type' => 'fixed',
             'bundle_price_view' => 'As low as',
             'bundle_weight_type' => 'fixed',
-            'bundle_values' => 'name=title,type=1,required=1,sku=1,price=1,default=,default_qty=1,price_type=percent'
+            'bundle_values' => implode(',', $bundleValues)
         ];
         $this->assertEquals($expected, $preparedRow);
     }
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/Bundle/RelationsDataSaverTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/Bundle/RelationsDataSaverTest.php
index 42d508cdfb195..d50243b3656f3 100644
--- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/Bundle/RelationsDataSaverTest.php
+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/Bundle/RelationsDataSaverTest.php
@@ -7,6 +7,7 @@
 namespace Magento\BundleImportExport\Test\Unit\Model\Import\Product\Type\Bundle;
 
 use Magento\BundleImportExport\Model\Import\Product\Type\Bundle\RelationsDataSaver;
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
@@ -30,6 +31,11 @@ class RelationsDataSaverTest extends \PHPUnit\Framework\TestCase
      */
     private $connectionMock;
 
+    /**
+     * @var Relation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRelationMock;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -39,12 +45,16 @@ protected function setUp()
         $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
+
+        $this->productRelationMock = $this->getMockBuilder(Relation::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->relationsDataSaver = $helper->getObject(
             RelationsDataSaver::class,
             [
-                'resource' => $this->resourceMock
+                'resource' => $this->resourceMock,
+                'productRelation' => $this->productRelationMock
             ]
         );
     }
@@ -53,7 +63,7 @@ public function testSaveOptions()
     {
         $options = [1, 2];
         $table_name= 'catalog_product_bundle_option';
-
+        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->expects($this->once())
             ->method('getTableName')
             ->with('catalog_product_bundle_option')
@@ -78,6 +88,7 @@ public function testSaveOptionValues()
         $optionsValues = [1, 2];
         $table_name= 'catalog_product_bundle_option_value';
 
+        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->expects($this->once())
             ->method('getTableName')
             ->with('catalog_product_bundle_option_value')
@@ -98,6 +109,7 @@ public function testSaveSelections()
         $selections = [1, 2];
         $table_name= 'catalog_product_bundle_selection';
 
+        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->expects($this->once())
             ->method('getTableName')
             ->with('catalog_product_bundle_selection')
@@ -121,4 +133,16 @@ public function testSaveSelections()
 
         $this->relationsDataSaver->saveSelections($selections);
     }
+
+    public function testSaveProductRelations()
+    {
+        $parentId = 1;
+        $children = [2, 3];
+
+        $this->productRelationMock->expects($this->once())
+            ->method('processRelations')
+            ->with($parentId, $children);
+
+        $this->relationsDataSaver->saveProductRelations($parentId, $children);
+    }
 }
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
index 8e1243b5eb3af..a8650a4e6e9e3 100644
--- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
@@ -58,6 +58,9 @@ class BundleTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
      */
     protected $setCollection;
 
+    /** @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $scopeResolver;
+
     /**
      *
      * @return void
@@ -170,14 +173,18 @@ protected function setUp()
             0 => $this->entityModel,
             1 => 'bundle'
         ];
-
+        $this->scopeResolver = $this->getMockBuilder(\Magento\Framework\App\ScopeResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getScope'])
+            ->getMockForAbstractClass();
         $this->bundle = $this->objectManagerHelper->getObject(
             \Magento\BundleImportExport\Model\Import\Product\Type\Bundle::class,
             [
                 'attrSetColFac' => $this->attrSetColFac,
                 'prodAttrColFac' => $this->prodAttrColFac,
                 'resource' => $this->resource,
-                'params' => $this->params
+                'params' => $this->params,
+                'scopeResolver' => $this->scopeResolver,
             ]
         );
 
@@ -214,7 +221,8 @@ public function testSaveData($skus, $bunch, $allowImport)
         $this->entityModel->expects($this->any())->method('isRowAllowedToImport')->will($this->returnValue(
             $allowImport
         ));
-
+        $scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)->getMockForAbstractClass();
+        $this->scopeResolver->expects($this->any())->method('getScope')->willReturn($scope);
         $this->connection->expects($this->any())->method('fetchAssoc')->with($this->select)->will($this->returnValue([
             '1' => [
                 'option_id' => '1',
@@ -234,7 +242,7 @@ public function testSaveData($skus, $bunch, $allowImport)
                         'price_type' => 'fixed',
                         'shipment_type' => '1',
                         'default_qty' => '1',
-                        'is_defaul' => '1',
+                        'is_default' => '1',
                         'position' => '1',
                         'option_id' => '1']
                 ]
@@ -256,7 +264,7 @@ public function testSaveData($skus, $bunch, $allowImport)
                         'price_type' => 'percent',
                         'shipment_type' => 0,
                         'default_qty' => '2',
-                        'is_defaul' => '1',
+                        'is_default' => '1',
                         'position' => '6',
                         'option_id' => '6']
                 ]
@@ -316,7 +324,7 @@ public function saveDataProvider()
                          . 'price_type=fixed,'
                          . 'shipment_type=separately,'
                          . 'default_qty=1,'
-                         . 'is_defaul=1,'
+                         . 'is_default=1,'
                          . 'position=1,'
                          . 'option_id=1 | name=Bundle2,'
                          . 'type=dropdown,'
@@ -325,7 +333,7 @@ public function saveDataProvider()
                          . 'price=10,'
                          . 'price_type=fixed,'
                          . 'default_qty=1,'
-                         . 'is_defaul=1,'
+                         . 'is_default=1,'
                          . 'position=2,'
                          . 'option_id=2'
                 ],
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index 19aef21135d90..42d9dc558d31e 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -5,16 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-bundle": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-bundle": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/BundleImportExport/etc/module.xml b/app/code/Magento/BundleImportExport/etc/module.xml
index e324145cabcca..44b09e4c5fb88 100644
--- a/app/code/Magento/BundleImportExport/etc/module.xml
+++ b/app/code/Magento/BundleImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_BundleImportExport" setup_version="2.0.0">
+    <module name="Magento_BundleImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 8acf170d43cfb..727e18280d76f 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Cache\InvalidateLogger;
 
+/**
+ * Class PurgeCache
+ */
 class PurgeCache
 {
     const HEADER_X_MAGENTO_TAGS_PATTERN = 'X-Magento-Tags-Pattern';
@@ -26,6 +29,18 @@ class PurgeCache
      */
     private $logger;
 
+    /**
+     * Batch size of the purge request.
+     *
+     * Based on default Varnish 4 http_req_hdr_len size minus a 512 bytes margin for method,
+     * header name, line feeds etc.
+     *
+     * @see https://varnish-cache.org/docs/4.1/reference/varnishd.html
+     *
+     * @var int
+     */
+    private $requestSize = 7680;
+
     /**
      * Constructor
      *
@@ -44,18 +59,65 @@ public function __construct(
     }
 
     /**
-     * Send curl purge request
-     * to invalidate cache by tags pattern
+     * Send curl purge request to invalidate cache by tags pattern
      *
      * @param string $tagsPattern
      * @return bool Return true if successful; otherwise return false
      */
     public function sendPurgeRequest($tagsPattern)
     {
+        $successful = true;
         $socketAdapter = $this->socketAdapterFactory->create();
         $servers = $this->cacheServer->getUris();
-        $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $tagsPattern];
         $socketAdapter->setOptions(['timeout' => 10]);
+
+        $formattedTagsChunks = $this->splitTags($tagsPattern);
+        foreach ($formattedTagsChunks as $formattedTagsChunk) {
+            if (!$this->sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)) {
+                $successful = false;
+            }
+        }
+
+        return $successful;
+    }
+
+    /**
+     * Split tags by batches
+     *
+     * @param string $tagsPattern
+     * @return \Generator
+     */
+    private function splitTags($tagsPattern)
+    {
+        $tagsBatchSize = 0;
+        $formattedTagsChunk = [];
+        $formattedTags = explode('|', $tagsPattern);
+        foreach ($formattedTags as $formattedTag) {
+            if ($tagsBatchSize + strlen($formattedTag) > $this->requestSize - count($formattedTagsChunk) - 1) {
+                yield implode('|', array_unique($formattedTagsChunk));
+                $formattedTagsChunk = [];
+                $tagsBatchSize = 0;
+            }
+
+            $tagsBatchSize += strlen($formattedTag);
+            $formattedTagsChunk[] = $formattedTag;
+        }
+        if (!empty($formattedTagsChunk)) {
+            yield implode('|', array_unique($formattedTagsChunk));
+        }
+    }
+
+    /**
+     * Send curl purge request to servers to invalidate cache by tags pattern
+     *
+     * @param \Zend\Http\Client\Adapter\Socket $socketAdapter
+     * @param \Zend\Uri\Uri[] $servers
+     * @param string $formattedTagsChunk
+     * @return bool Return true if successful; otherwise return false
+     */
+    private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)
+    {
+        $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk];
         foreach ($servers as $server) {
             $headers['Host'] = $server->getHost();
             try {
@@ -69,12 +131,11 @@ public function sendPurgeRequest($tagsPattern)
                 $socketAdapter->read();
                 $socketAdapter->close();
             } catch (\Exception $e) {
-                $this->logger->critical($e->getMessage(), compact('server', 'tagsPattern'));
+                $this->logger->critical($e->getMessage(), compact('server', 'formattedTagsChunk'));
                 return false;
             }
         }
-
-        $this->logger->execute(compact('servers', 'tagsPattern'));
+        $this->logger->execute(compact('servers', 'formattedTagsChunk'));
         return true;
     }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE.txt b/app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE.txt
rename to app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE_AFL.txt b/app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CacheInvalidate/Test/Mftf/README.md b/app/code/Magento/CacheInvalidate/Test/Mftf/README.md
new file mode 100644
index 0000000000000..403a6f15d089d
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cache Invalidate Functional Tests
+
+The Functional Test Module for **Magento Cache Invalidate** module.
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
index 013ec3a467104..c66e27ea41025 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -84,6 +84,9 @@ public function testSendPurgeRequest($hosts)
         $this->assertTrue($this->model->sendPurgeRequest('tags'));
     }
 
+    /**
+     * @return array
+     */
     public function sendPurgeRequestDataProvider()
     {
         return [
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 61a4d8831f117..01ac4d30d844d 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-page-cache": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-page-cache": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CacheInvalidate/etc/module.xml b/app/code/Magento/CacheInvalidate/etc/module.xml
index dda90ba8b38ab..789b74480b44e 100644
--- a/app/code/Magento/CacheInvalidate/etc/module.xml
+++ b/app/code/Magento/CacheInvalidate/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CacheInvalidate" setup_version="2.0.0">
+    <module name="Magento_CacheInvalidate" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
index c0a091ca2d0d9..027c9a9085b47 100644
--- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
+++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
@@ -13,7 +13,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'default.phtml';
+    protected $_template = 'Magento_Captcha::default.phtml';
 
     /**
      * @var string
diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php
index e89a80646ed8e..e401e03e9551f 100644
--- a/app/code/Magento/Captcha/Controller/Refresh/Index.php
+++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php
@@ -8,9 +8,10 @@
  */
 namespace Magento\Captcha\Controller\Refresh;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\Action\Context;
 
-class Index extends \Magento\Framework\App\Action\Action
+class Index extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Captcha\Helper\Data
diff --git a/app/code/Magento/Captcha/CustomerData/Captcha.php b/app/code/Magento/Captcha/CustomerData/Captcha.php
new file mode 100644
index 0000000000000..a744daacdc673
--- /dev/null
+++ b/app/code/Magento/Captcha/CustomerData/Captcha.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\CustomerData;
+
+use Magento\Customer\CustomerData\SectionSourceInterface;
+
+/**
+ * Captcha section
+ */
+class Captcha extends \Magento\Framework\DataObject implements SectionSourceInterface
+{
+    /**
+     * @var array
+     */
+    private $formIds;
+
+    /**
+     * @var \Magento\Captcha\Helper\Data
+     */
+    private $helper;
+
+    /**
+     * @param \Magento\Captcha\Helper\Data $helper
+     * @param array $formIds
+     * @param array $data
+     * @codeCoverageIgnore
+     */
+    public function __construct(
+        \Magento\Captcha\Helper\Data $helper,
+        array $formIds,
+        array $data = []
+    ) {
+        parent::__construct($data);
+        $this->helper = $helper;
+        $this->formIds = $formIds;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSectionData() :array
+    {
+        $data = [];
+
+        foreach ($this->formIds as $formId) {
+            $captchaModel = $this->helper->getCaptcha($formId);
+            $data[$formId] = [
+                'isRequired' => $captchaModel->isRequired(),
+                'timestamp' => time()
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
index ef5f5a8edce71..34ee62044ff57 100644
--- a/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Captcha\Model\Checkout;
 
+/**
+ * Configuration provider for Captcha rendering.
+ */
 class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
 {
     /**
@@ -38,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
@@ -49,7 +52,8 @@ public function getConfig()
                 'imageHeight' => $this->getImageHeight($formId),
                 'imageSrc' => $this->getImageSrc($formId),
                 'refreshUrl' => $this->getRefreshUrl(),
-                'isRequired' => $this->isRequired($formId)
+                'isRequired' => $this->isRequired($formId),
+                'timestamp' => time()
             ];
         }
         return $config;
diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
index e496c36f4de75..84ac71046c343 100644
--- a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
+++ b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Captcha\Model\Customer\Plugin;
 
 use Magento\Captcha\Helper\Data as CaptchaHelper;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 
+/**
+ * Around plugin for login action.
+ */
 class AjaxLogin
 {
     /**
@@ -60,6 +64,8 @@ public function __construct(
     }
 
     /**
+     * Check captcha data on login action.
+     *
      * @param \Magento\Customer\Controller\Ajax\Login $subject
      * @param \Closure $proceed
      * @return $this
@@ -81,27 +87,39 @@ public function aroundExecute(
         if ($content) {
             $loginParams = $this->serializer->unserialize($content);
         }
-        $username = isset($loginParams['username']) ? $loginParams['username'] : null;
-        $captchaString = isset($loginParams[$captchaInputName]) ? $loginParams[$captchaInputName] : null;
-        $loginFormId = isset($loginParams[$captchaFormIdField]) ? $loginParams[$captchaFormIdField] : null;
+        $username = $loginParams['username'] ?? null;
+        $captchaString = $loginParams[$captchaInputName] ?? null;
+        $loginFormId = $loginParams[$captchaFormIdField] ?? null;
 
-        foreach ($this->formIds as $formId) {
-            $captchaModel = $this->helper->getCaptcha($formId);
-            if ($captchaModel->isRequired($username) && !in_array($loginFormId, $this->formIds)) {
-                $resultJson = $this->resultJsonFactory->create();
-                return $resultJson->setData(['errors' => true, 'message' => __('Provided form does not exist')]);
-            }
+        if (!in_array($loginFormId, $this->formIds) && $this->helper->getCaptcha($loginFormId)->isRequired($username)) {
+            return $this->returnJsonError(__('Provided form does not exist'));
+        }
 
-            if ($formId == $loginFormId) {
-                $captchaModel->logAttempt($username);
-                if (!$captchaModel->isCorrect($captchaString)) {
-                    $this->sessionManager->setUsername($username);
-                    /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-                    $resultJson = $this->resultJsonFactory->create();
-                    return $resultJson->setData(['errors' => true, 'message' => __('Incorrect CAPTCHA')]);
+        foreach ($this->formIds as $formId) {
+            if ($formId === $loginFormId) {
+                $captchaModel = $this->helper->getCaptcha($formId);
+                if ($captchaModel->isRequired($username)) {
+                    if (!$captchaModel->isCorrect($captchaString)) {
+                        $this->sessionManager->setUsername($username);
+                        $captchaModel->logAttempt($username);
+                        return $this->returnJsonError(__('Incorrect CAPTCHA'));
+                    }
                 }
+                $captchaModel->logAttempt($username);
             }
         }
         return $proceed();
     }
+
+    /**
+     * Format JSON response.
+     *
+     * @param \Magento\Framework\Phrase $phrase
+     * @return \Magento\Framework\Controller\Result\Json
+     */
+    private function returnJsonError(\Magento\Framework\Phrase $phrase): \Magento\Framework\Controller\Result\Json
+    {
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData(['errors' => true, 'message' => $phrase]);
+    }
 }
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
index e5c72ba1ae82e..483f9c3fb4d20 100644
--- a/app/code/Magento/Captcha/Model/DefaultModel.php
+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Captcha\Model;
 
+use Magento\Captcha\Helper\Data;
+
 /**
  * Implementation of \Zend\Captcha\Image
  *
@@ -29,7 +31,7 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
     const DEFAULT_WORD_LENGTH_TO = 5;
 
     /**
-     * @var \Magento\Captcha\Helper\Data
+     * @var Data
      * @since 100.2.0
      */
     protected $captchaData;
@@ -76,6 +78,11 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
      */
     protected $session;
 
+    /**
+     * @var string
+     */
+    private $words;
+
     /**
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Captcha\Helper\Data $captchaData
@@ -125,8 +132,8 @@ public function getBlockName()
      */
     public function isRequired($login = null)
     {
-        if ($this->isUserAuth()
-            && !$this->isShownToLoggedInUser()
+        if (($this->isUserAuth()
+                && !$this->isShownToLoggedInUser())
             || !$this->isEnabled()
             || !in_array(
                 $this->formId,
@@ -309,18 +316,18 @@ public function getImgUrl()
      */
     public function isCorrect($word)
     {
-        $storedWord = $this->getWord();
+        $storedWords = $this->getWords();
         $this->clearWord();
 
-        if (!$word || !$storedWord) {
+        if (!$word || !$storedWords) {
             return false;
         }
 
         if (!$this->isCaseSensitive()) {
-            $storedWord = strtolower($storedWord);
+            $storedWords = strtolower($storedWords);
             $word = strtolower($word);
         }
-        return $word === $storedWord;
+        return in_array($word, explode(',', $storedWords));
     }
 
     /**
@@ -431,12 +438,14 @@ public function getWordLen()
      */
     private function isShowAlways()
     {
-        if ((string)$this->captchaData->getConfig('mode') == \Magento\Captcha\Helper\Data::MODE_ALWAYS) {
+        $captchaMode = (string)$this->captchaData->getConfig('mode');
+
+        if ($captchaMode === Data::MODE_ALWAYS) {
             return true;
         }
 
-        if ((string)$this->captchaData->getConfig('mode') == \Magento\Captcha\Helper\Data::MODE_AFTER_FAIL
-            && $this->getAllowedAttemptsForSameLogin() == 0
+        if ($captchaMode === Data::MODE_AFTER_FAIL
+            && $this->getAllowedAttemptsForSameLogin() === 0
         ) {
             return true;
         }
@@ -477,7 +486,7 @@ private function getTargetForms()
     /**
      * Get captcha word
      *
-     * @return string
+     * @return string|null
      */
     public function getWord()
     {
@@ -485,6 +494,17 @@ public function getWord()
         return time() < $sessionData['expires'] ? $sessionData['data'] : null;
     }
 
+    /**
+     * Get captcha words
+     *
+     * @return string|null
+     */
+    private function getWords()
+    {
+        $sessionData = $this->session->getData($this->getFormIdKey(self::SESSION_WORD));
+        return time() < $sessionData['expires'] ? $sessionData['words'] : null;
+    }
+
     /**
      * Set captcha word
      *
@@ -494,9 +514,10 @@ public function getWord()
      */
     protected function setWord($word)
     {
+        $this->words = $this->words ? $this->words . ',' . $word : $word;
         $this->session->setData(
             $this->getFormIdKey(self::SESSION_WORD),
-            ['data' => $word, 'expires' => time() + $this->getTimeout()]
+            ['data' => $word, 'words' => $this->words, 'expires' => time() + $this->getTimeout()]
         );
         $this->word = $word;
         return $this;
diff --git a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
index 9b97225e60de9..39579616fa928 100644
--- a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
+++ b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
@@ -18,6 +18,6 @@ public function resolve(\Magento\Framework\App\RequestInterface $request, $formI
     {
         $captchaParams = $request->getPost(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
 
-        return isset($captchaParams[$formId]) ? $captchaParams[$formId] : '';
+        return $captchaParams[$formId] ?? '';
     }
 }
diff --git a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
deleted file mode 100644
index 40c215ec218a1..0000000000000
--- a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Captcha\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-class CheckGuestCheckoutObserver implements ObserverInterface
-{
-    /**
-     * @var \Magento\Captcha\Helper\Data
-     */
-    protected $_helper;
-
-    /**
-     * @var \Magento\Framework\App\ActionFlag
-     */
-    protected $_actionFlag;
-
-    /**
-     * @var CaptchaStringResolver
-     */
-    protected $captchaStringResolver;
-
-    /**
-     * @var \Magento\Checkout\Model\Type\Onepage
-     */
-    protected $_typeOnepage;
-
-    /**
-     * @var \Magento\Framework\Json\Helper\Data
-     */
-    protected $jsonHelper;
-
-    /**
-     * @param \Magento\Captcha\Helper\Data $helper
-     * @param \Magento\Framework\App\ActionFlag $actionFlag
-     * @param CaptchaStringResolver $captchaStringResolver
-     * @param \Magento\Checkout\Model\Type\Onepage $typeOnepage
-     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     */
-    public function __construct(
-        \Magento\Captcha\Helper\Data $helper,
-        \Magento\Framework\App\ActionFlag $actionFlag,
-        CaptchaStringResolver $captchaStringResolver,
-        \Magento\Checkout\Model\Type\Onepage $typeOnepage,
-        \Magento\Framework\Json\Helper\Data $jsonHelper
-    ) {
-        $this->_helper = $helper;
-        $this->_actionFlag = $actionFlag;
-        $this->captchaStringResolver = $captchaStringResolver;
-        $this->_typeOnepage = $typeOnepage;
-        $this->jsonHelper = $jsonHelper;
-    }
-
-    /**
-     * Check Captcha On Checkout as Guest Page
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        $formId = 'guest_checkout';
-        $captchaModel = $this->_helper->getCaptcha($formId);
-        $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
-        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST) {
-            if ($captchaModel->isRequired()) {
-                $controller = $observer->getControllerAction();
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
-                    $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
-                }
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
deleted file mode 100644
index 3bf2ac38debee..0000000000000
--- a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Captcha\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-class CheckRegisterCheckoutObserver implements ObserverInterface
-{
-    /**
-     * @var \Magento\Captcha\Helper\Data
-     */
-    protected $_helper;
-
-    /**
-     * @var \Magento\Framework\App\ActionFlag
-     */
-    protected $_actionFlag;
-
-    /**
-     * @var CaptchaStringResolver
-     */
-    protected $captchaStringResolver;
-
-    /**
-     * @var \Magento\Checkout\Model\Type\Onepage
-     */
-    protected $_typeOnepage;
-
-    /**
-     * @var \Magento\Framework\Json\Helper\Data
-     */
-    protected $jsonHelper;
-
-    /**
-     * @param \Magento\Captcha\Helper\Data $helper
-     * @param \Magento\Framework\App\ActionFlag $actionFlag
-     * @param CaptchaStringResolver $captchaStringResolver
-     * @param \Magento\Checkout\Model\Type\Onepage $typeOnepage
-     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     */
-    public function __construct(
-        \Magento\Captcha\Helper\Data $helper,
-        \Magento\Framework\App\ActionFlag $actionFlag,
-        CaptchaStringResolver $captchaStringResolver,
-        \Magento\Checkout\Model\Type\Onepage $typeOnepage,
-        \Magento\Framework\Json\Helper\Data $jsonHelper
-    ) {
-        $this->_helper = $helper;
-        $this->_actionFlag = $actionFlag;
-        $this->captchaStringResolver = $captchaStringResolver;
-        $this->_typeOnepage = $typeOnepage;
-        $this->jsonHelper = $jsonHelper;
-    }
-
-    /**
-     * Check Captcha On Checkout Register Page
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        $formId = 'register_during_checkout';
-        $captchaModel = $this->_helper->getCaptcha($formId);
-        $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
-        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER) {
-            if ($captchaModel->isRequired()) {
-                $controller = $observer->getControllerAction();
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
-                    $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
-                }
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
index 402fc028c5ad0..2de93dcf6b59b 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
@@ -69,18 +69,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $controller = $observer->getControllerAction();
         $email = (string)$observer->getControllerAction()->getRequest()->getParam('email');
         $params = $observer->getControllerAction()->getRequest()->getParams();
-        if (!empty($email) && !empty($params)) {
-            if ($captchaModel->isRequired()) {
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $this->messageManager->addError(__('Incorrect CAPTCHA'));
-                    $controller->getResponse()->setRedirect(
-                        $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
-                    );
-                }
-            }
+        if (!empty($email)
+            && !empty($params)
+            && $captchaModel->isRequired()
+            && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+        ) {
+            $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
+            $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+            $this->messageManager->addError(__('Incorrect CAPTCHA'));
+            $controller->getResponse()->setRedirect(
+                $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
+            );
         }
 
         return $this;
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
index 8cc907d7bd12b..924514cd48c5d 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
@@ -52,11 +52,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'backend_login';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $login = $observer->getEvent()->getUsername();
-        if ($captchaModel->isRequired($login)) {
-            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->_request, $formId))) {
-                $captchaModel->logAttempt($login);
-                throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
-            }
+        if ($captchaModel->isRequired($login)
+            && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->_request, $formId))
+        ) {
+            $captchaModel->logAttempt($login);
+            throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
         }
         $captchaModel->logAttempt($login);
 
diff --git a/app/code/Magento/Captcha/Setup/InstallSchema.php b/app/code/Magento/Captcha/Setup/InstallSchema.php
deleted file mode 100644
index 23452d0e37ddc..0000000000000
--- a/app/code/Magento/Captcha/Setup/InstallSchema.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Captcha\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('captcha_log')
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => true],
-            'Type'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'unsigned' => true, 'primary' => true],
-            'Value'
-        )->addColumn(
-            'count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Count'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Update Time'
-        )->setComment(
-            'Count Login Attempts'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
new file mode 100644
index 0000000000000..beb2c2bffa135
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CaptchaFormsDisplayingActionGroup">
+        <click selector="{{CaptchaFormsDisplayingSection.store}}" stepKey="ClickToGoStores"/>
+        <waitForPageLoad stepKey="waitForStoresLoaded"/>
+        <click selector="{{CaptchaFormsDisplayingSection.config}}" stepKey="ClickToGoConfiguration"/>
+        <waitForPageLoad stepKey="waitForConfigurationsLoaded"/>
+        <scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" x="0" y="-80" stepKey="ScrollToCustomers"/>
+        <click selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ClickToCustomers"/>
+        <waitForPageLoad stepKey="waitForCustomerConfigurationsLoaded"/>
+        <click selector="{{CaptchaFormsDisplayingSection.customerConfig}}" stepKey="ClickToGoCustomerConfiguration"/>
+        <scrollTo selector="{{CaptchaFormsDisplayingSection.captcha}}" stepKey="scrollToCaptcha"/>
+        <conditionalClick selector="{{CaptchaFormsDisplayingSection.captcha}}" dependentSelector="{{CaptchaFormsDisplayingSection.dependent}}" visible="false" stepKey="ClickToOpenCaptcha"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
new file mode 100644
index 0000000000000..9db8110c0f64b
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+   <entity name="CaptchaData">
+       <data key="createUser">Create user</data>
+       <data key="login">Login</data>
+       <data key="passwd">Forgot password</data>
+       <data key="contactUs">Contact Us</data>
+       <data key="changePasswd">Change password</data>
+       <data key="register">Register during Checkout</data>
+       <data key="checkoutAsGuest">Check Out as Guest</data>
+   </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE.txt b/app/code/Magento/Captcha/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE.txt
rename to app/code/Magento/Captcha/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE_AFL.txt b/app/code/Magento/Captcha/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE_AFL.txt
rename to app/code/Magento/Captcha/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Captcha/Test/Mftf/README.md b/app/code/Magento/Captcha/Test/Mftf/README.md
new file mode 100644
index 0000000000000..48be768712f2f
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Captcha Functional Tests
+
+The Functional Test Module for **Magento Captcha** module.
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
new file mode 100644
index 0000000000000..4c974e6fced05
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CaptchaFormsDisplayingSection">
+        <element name="store" type="button" selector="#menu-magento-backend-stores"/>
+        <element name="config" type="button" selector="//li[@data-ui-id='menu-magento-config-system-config']//span"/>
+        <element name="customer" type="button" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='Customers']"/>
+        <element name="customerConfig" type="text" selector="//span[text()='Customer Configuration']"/>
+        <element name="captcha" type="button" selector="#customer_captcha-head"/>
+        <element name="dependent" type="button" selector="//a[@id='customer_captcha-head' and @class='open']"/>
+        <element name="forms" type="multiselect" selector="#customer_captcha_forms"/>
+        <element name="createUser" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_create']"/>
+        <element name="forgotpassword" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_forgotpassword']"/>
+        <element name="userLogin" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_login']"/>
+        <element name="guestCheckout" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='guest_checkout']"/>
+        <element name="register" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='register_during_checkout']"/>
+        <element name="userEdit" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='user_edit']"/>
+        <element name="contactUs" type="multiselect" selector="//select[@id='customer_captcha_forms']/option[@value='contact_us']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
new file mode 100644
index 0000000000000..7a0557c4a2744
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerSignInPopupFormSection">
+        <element name="captchaField" type="input" selector="#captcha_user_login"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
new file mode 100644
index 0000000000000..a088266f760a5
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
@@ -0,0 +1,115 @@
+<?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="CaptchaFormsDisplayingTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="MAGETWO-91552 - [github] CAPTCHA doesn't show when check out as guest"/>
+            <title value="Captcha forms displaying"/>
+            <description value="Captcha forms displaying"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93941"/>
+            <group value="captcha"/>
+        </annotations>
+
+        <!--Login as admin-->
+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        <!--Go to Captcha-->
+        <actionGroup ref="CaptchaFormsDisplayingActionGroup" stepKey="CaptchaFormsDisplayingActionGroup"/>
+        <waitForPageLoad stepKey="WaitForPageLoaded"/>
+        <!--Verify fields removed-->
+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.forms}}" stepKey="formItems"/>
+        <assertNotContains stepKey="checkoutAsGuest">
+            <expectedResult type="string">{{CaptchaData.checkoutAsGuest}}</expectedResult>
+            <actualResult type="variable">$formItems</actualResult>
+        </assertNotContains>
+        <assertNotContains stepKey="register">
+            <expectedResult type="string">{{CaptchaData.register}}</expectedResult>
+            <actualResult type="variable">$formItems</actualResult>
+        </assertNotContains>
+        <!--Verify fields existence-->
+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.createUser}}" stepKey="createUser"/>
+        <assertEquals stepKey="CreateUserFieldIsPresent">
+            <expectedResult type="string">{{CaptchaData.createUser}}</expectedResult>
+            <actualResult type="variable">$createUser</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.userLogin}}" stepKey="login"/>
+        <assertEquals stepKey="LoginFieldIsPresent">
+            <expectedResult type="string">{{CaptchaData.login}}</expectedResult>
+            <actualResult type="variable">login</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.forgotpassword}}" stepKey="forgotpassword"/>
+        <assertEquals stepKey="PasswordFieldIsPresent">
+            <expectedResult type="string">{{CaptchaData.passwd}}</expectedResult>
+            <actualResult type="variable">$forgotpassword</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.contactUs}}" stepKey="contactUs"/>
+        <assertEquals stepKey="contactUsFieldIsPresent">
+            <expectedResult type="string">{{CaptchaData.contactUs}}</expectedResult>
+            <actualResult type="variable">$contactUs</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CaptchaFormsDisplayingSection.userEdit}}" stepKey="userEdit"/>
+        <assertEquals stepKey="userEditFieldIsPresent">
+            <expectedResult type="string">{{CaptchaData.changePasswd}}</expectedResult>
+            <actualResult type="variable">$userEdit</actualResult>
+        </assertEquals>
+
+        <!--Roll back configuration-->
+        <scrollToTopOfPage stepKey="ScrollToTop"/>
+        <click selector="{{CaptchaFormsDisplayingSection.captcha}}" stepKey="ClickToCloseCaptcha"/>
+    </test>
+    <test name="CaptchaWithDisabledGuestCheckout">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="MC-5602 - CAPTCHA doesn't appear in login popup after refreshing page."/>
+            <title value="Captcha is displaying on login form with disabled guest checkout"/>
+            <description value="Captcha is displaying on login form with disabled guest checkout"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96691"/>
+            <group value="captcha"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set checkout/options/guest_checkout 0" stepKey="disableGuestCheckout"/>
+            <magentoCLI command="config:set customer/captcha/failed_attempts_login 1" stepKey="decreaseLoginAttempt"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <magentoCLI command="config:set checkout/options/guest_checkout 1" stepKey="enableGuestCheckout"/>
+            <magentoCLI command="config:set customer/captcha/failed_attempts_login 3" stepKey="increaseLoginAttempt"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
+        </after>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.sku$$)}}" stepKey="openProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart" />
+        <waitForText userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="waitForText"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible"/>
+        <fillField selector="{{StorefrontCustomerSignInPopupFormSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
+        <fillField selector="{{StorefrontCustomerSignInPopupFormSection.password}}" userInput="incorrectPassword" stepKey="fillIncorrectCustomerPassword"/>
+        <click selector="{{StorefrontCustomerSignInPopupFormSection.signIn}}" stepKey="clickSignIn"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.errorMessage}}" stepKey="seeErrorMessage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart2"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php b/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php
index bc2f8d02e2544..2890f10a2ae12 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php
@@ -54,12 +54,9 @@ public function testCreateNegative()
             $this->returnValue($defaultCaptchaMock)
         );
 
-        $this->expectException(
-            'InvalidArgumentException',
-            'Magento\Captcha\Model\\' . ucfirst(
-                $captchaType
-            ) . ' does not implement \Magento\Captcha\Model\CaptchaInterface'
-        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Magento\Captcha\Model\\' . ucfirst($captchaType) .
+            ' does not implement \Magento\Captcha\Model\CaptchaInterface');
 
         $this->assertEquals($defaultCaptchaMock, $this->_model->create($captchaType, 'form_id'));
     }
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
index 655fcd6118e25..8764dbd4cec11 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
@@ -77,6 +77,7 @@ public function testGetConfig($isRequired, $captchaGenerations, $expectedConfig)
             ->will($this->returnValue('https://magento.com/captcha'));
 
         $config = $this->model->getConfig();
+        unset($config['captcha'][$this->formId]['timestamp']);
         $this->assertEquals($config, $expectedConfig);
     }
 
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
index be9574fff2cfa..ec2a49f3fc566 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
@@ -3,22 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Captcha\Test\Unit\Model\Customer\Plugin;
 
 class AjaxLoginTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\Model\Session
      */
     protected $sessionManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Captcha\Helper\Data
      */
     protected $captchaHelperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Controller\Result\JsonFactory
      */
     protected $jsonFactoryMock;
 
@@ -38,12 +39,12 @@ class AjaxLoginTest extends \PHPUnit\Framework\TestCase
     protected $requestMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Controller\Ajax\Login
      */
     protected $loginControllerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Serialize\Serializer\Json
      */
     protected $serializerMock;
 
@@ -57,6 +58,9 @@ class AjaxLoginTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->sessionManagerMock = $this->createPartialMock(\Magento\Checkout\Model\Session::class, ['setUsername']);
@@ -72,8 +76,12 @@ protected function setUp()
 
         $this->loginControllerMock->expects($this->any())->method('getRequest')
             ->will($this->returnValue($this->requestMock));
-        $this->captchaHelperMock->expects($this->once())->method('getCaptcha')
-            ->with('user_login')->will($this->returnValue($this->captchaMock));
+
+        $this->captchaHelperMock
+            ->expects($this->exactly(1))
+            ->method('getCaptcha')
+            ->will($this->returnValue($this->captchaMock));
+
         $this->formIds = ['user_login'];
         $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
 
@@ -86,6 +94,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test aroundExecute.
+     */
     public function testAroundExecute()
     {
         $username = 'name';
@@ -103,14 +114,24 @@ public function testAroundExecute()
         $this->captchaMock->expects($this->once())->method('logAttempt')->with($username);
         $this->captchaMock->expects($this->once())->method('isCorrect')->with($captchaString)
             ->will($this->returnValue(true));
-        $this->serializerMock->expects(($this->once()))->method('unserialize')->will($this->returnValue($requestData));
+        $this->serializerMock->expects($this->once())->method('unserialize')->will($this->returnValue($requestData));
 
         $closure = function () {
             return 'result';
         };
+
+        $this->captchaHelperMock
+            ->expects($this->exactly(1))
+            ->method('getCaptcha')
+            ->with('user_login')
+            ->will($this->returnValue($this->captchaMock));
+
         $this->assertEquals('result', $this->model->aroundExecute($this->loginControllerMock, $closure));
     }
 
+    /**
+     * Test aroundExecuteIncorrectCaptcha.
+     */
     public function testAroundExecuteIncorrectCaptcha()
     {
         $username = 'name';
@@ -128,18 +149,21 @@ public function testAroundExecuteIncorrectCaptcha()
         $this->captchaMock->expects($this->once())->method('logAttempt')->with($username);
         $this->captchaMock->expects($this->once())->method('isCorrect')
             ->with($captchaString)->will($this->returnValue(false));
-        $this->serializerMock->expects(($this->once()))->method('unserialize')->will($this->returnValue($requestData));
+        $this->serializerMock->expects($this->once())->method('unserialize')->will($this->returnValue($requestData));
 
         $this->sessionManagerMock->expects($this->once())->method('setUsername')->with($username);
         $this->jsonFactoryMock->expects($this->once())->method('create')
             ->will($this->returnValue($this->resultJsonMock));
 
-        $this->resultJsonMock->expects($this->once())->method('setData')
-            ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])->will($this->returnValue('response'));
+        $this->resultJsonMock
+            ->expects($this->once())
+            ->method('setData')
+            ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])
+            ->will($this->returnSelf());
 
         $closure = function () {
         };
-        $this->assertEquals('response', $this->model->aroundExecute($this->loginControllerMock, $closure));
+        $this->assertEquals($this->resultJsonMock, $this->model->aroundExecute($this->loginControllerMock, $closure));
     }
 
     /**
@@ -151,7 +175,7 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
     {
         $this->requestMock->expects($this->once())->method('getContent')
             ->will($this->returnValue(json_encode($requestContent)));
-        $this->serializerMock->expects(($this->once()))->method('unserialize')
+        $this->serializerMock->expects($this->once())->method('unserialize')
             ->will($this->returnValue($requestContent));
 
         $this->captchaMock->expects($this->once())->method('isRequired')->with($username)
@@ -168,16 +192,39 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
     /**
      * @return array
      */
-    public function aroundExecuteCaptchaIsNotRequired()
+    public function aroundExecuteCaptchaIsNotRequired(): array
     {
         return [
             [
                 'username' => 'name',
                 'requestData' => ['username' => 'name', 'captcha_string' => 'string'],
             ],
+            [
+                'username' => 'name',
+                'requestData' =>
+                    [
+                        'username' => 'name',
+                        'captcha_string' => 'string',
+                        'captcha_form_id' => $this->formIds[0]
+                    ],
+            ],
             [
                 'username' => null,
-                'requestData' => ['captcha_string' => 'string'],
+                'requestData' =>
+                    [
+                        'username' => null,
+                        'captcha_string' => 'string',
+                        'captcha_form_id' => $this->formIds[0]
+                    ],
+            ],
+            [
+                'username' => 'name',
+                'requestData' =>
+                    [
+                        'username' => 'name',
+                        'captcha_string' => 'string',
+                        'captcha_form_id' => null
+                    ],
             ],
         ];
     }
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
index 429c13e802a87..eef75d2c01ec7 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -24,7 +24,7 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
         'enable' => '1',
         'font' => 'linlibertine',
         'mode' => 'after_fail',
-        'forms' => 'user_forgotpassword,user_create,guest_checkout,register_during_checkout',
+        'forms' => 'user_forgotpassword,user_create',
         'failed_attempts_login' => '3',
         'failed_attempts_ip' => '1000',
         'timeout' => '7',
@@ -35,8 +35,6 @@ class DefaultTest extends \PHPUnit\Framework\TestCase
         'always_for' => [
             'user_create',
             'user_forgotpassword',
-            'guest_checkout',
-            'register_during_checkout',
             'contact_us',
         ],
     ];
@@ -185,7 +183,13 @@ public function testIsCorrect()
     {
         self::$_defaultConfig['case_sensitive'] = '1';
         $this->assertFalse($this->_object->isCorrect('abcdef5'));
-        $sessionData = ['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() + self::EXPIRE_FRAME]];
+        $sessionData = [
+            'user_create_word' => [
+                'data' => 'AbCdEf5',
+                'words' => 'AbCdEf5',
+                'expires' => time() + self::EXPIRE_FRAME
+            ]
+        ];
         $this->_object->getSession()->setData($sessionData);
         self::$_defaultConfig['case_sensitive'] = '0';
         $this->assertTrue($this->_object->isCorrect('abcdef5'));
@@ -226,7 +230,7 @@ public function testGetWord()
     {
         $this->assertEquals($this->_object->getWord(), 'AbCdEf5');
         $this->_object->getSession()->setData(
-            ['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() - 360]]
+            ['user_create_word' => ['data' => 'AbCdEf5', 'words' => 'AbCdEf5','expires' => time() - 360]]
         );
         $this->assertNull($this->_object->getWord());
     }
@@ -249,7 +253,13 @@ protected function _getSessionStub()
             ->getMock();
         $session->expects($this->any())->method('isLoggedIn')->will($this->returnValue(false));
 
-        $session->setData(['user_create_word' => ['data' => 'AbCdEf5', 'expires' => time() + self::EXPIRE_FRAME]]);
+        $session->setData([
+            'user_create_word' => [
+                'data' => 'AbCdEf5',
+                'words' => 'AbCdEf5',
+                'expires' => time() + self::EXPIRE_FRAME
+            ]
+        ]);
         return $session;
     }
 
@@ -354,13 +364,15 @@ public function testIsShownToLoggedInUser($expectedResult, $formId)
         $this->assertEquals($expectedResult, $captcha->isShownToLoggedInUser());
     }
 
+    /**
+     * @return array
+     */
     public function isShownToLoggedInUserDataProvider()
     {
         return [
             [true, 'contact_us'],
             [false, 'user_create'],
-            [false, 'user_forgotpassword'],
-            [false, 'guest_checkout']
+            [false, 'user_forgotpassword']
         ];
     }
 }
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CaptchaStringResolverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CaptchaStringResolverTest.php
new file mode 100644
index 0000000000000..2bd8ac6f16986
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Observer/CaptchaStringResolverTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Observer;
+
+use Magento\Captcha\Helper\Data as CaptchaDataHelper;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class CaptchaStringResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var HttpRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManager($this);
+        $this->requestMock = $this->createMock(HttpRequest::class);
+        $this->captchaStringResolver = $this->objectManagerHelper->getObject(CaptchaStringResolver::class);
+    }
+
+    public function testResolveWithFormIdSet()
+    {
+        $formId = 'contact_us';
+        $captchaValue = 'some-value';
+
+        $this->requestMock->expects($this->once())
+            ->method('getPost')
+            ->with(CaptchaDataHelper::INPUT_NAME_FIELD_VALUE)
+            ->willReturn([$formId => $captchaValue]);
+
+        self::assertEquals(
+            $this->captchaStringResolver->resolve($this->requestMock, $formId),
+            $captchaValue
+        );
+    }
+
+    public function testResolveWithNoFormIdInRequest()
+    {
+        $formId = 'contact_us';
+
+        $this->requestMock->expects($this->once())
+            ->method('getPost')
+            ->with(CaptchaDataHelper::INPUT_NAME_FIELD_VALUE)
+            ->willReturn([]);
+
+        self::assertEquals(
+            $this->captchaStringResolver->resolve($this->requestMock, $formId),
+            ''
+        );
+    }
+}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginBackendObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginBackendObserverTest.php
new file mode 100644
index 0000000000000..415f022a7364d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserLoginBackendObserverTest.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Observer;
+
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Captcha\Observer\CheckUserLoginBackendObserver;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Message\ManagerInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class CheckUserLoginBackendObserverTest
+ */
+class CheckUserLoginBackendObserverTest extends TestCase
+{
+    /**
+     * @var CheckUserLoginBackendObserver
+     */
+    private $observer;
+
+    /**
+     * @var ManagerInterface|MockObject
+     */
+    private $messageManagerMock;
+
+    /**
+     * @var CaptchaStringResolver|MockObject
+     */
+    private $captchaStringResolverMock;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var Data|MockObject
+     */
+    private $helperMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->helperMock = $this->createMock(Data::class);
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+        $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
+
+        $this->observer = new CheckUserLoginBackendObserver(
+            $this->helperMock,
+            $this->captchaStringResolverMock,
+            $this->requestMock
+        );
+    }
+
+    /**
+     * Test check user login in backend with correct captcha
+     *
+     * @dataProvider requiredCaptchaDataProvider
+     * @param bool $isRequired
+     * @return void
+     */
+    public function testCheckOnBackendLoginWithCorrectCaptcha(bool $isRequired): void
+    {
+        $formId = 'backend_login';
+        $login = 'admin';
+        $captchaValue = 'captcha-value';
+
+        /** @var Observer|MockObject $observerMock */
+        $observerMock = $this->createPartialMock(Observer::class, ['getEvent']);
+        $eventMock = $this->createPartialMock(Event::class, ['getUsername']);
+        $captcha = $this->createMock(DefaultModel::class);
+
+        $eventMock->method('getUsername')->willReturn('admin');
+        $observerMock->method('getEvent')->willReturn($eventMock);
+        $captcha->method('isRequired')->with($login)->willReturn($isRequired);
+        $captcha->method('isCorrect')->with($captchaValue)->willReturn(true);
+        $this->helperMock->method('getCaptcha')->with($formId)->willReturn($captcha);
+        $this->captchaStringResolverMock->method('resolve')->with($this->requestMock, $formId)
+            ->willReturn($captchaValue);
+
+        $this->observer->execute($observerMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function requiredCaptchaDataProvider(): array
+    {
+        return [
+            [true],
+            [false]
+        ];
+    }
+
+    /**
+     * Test check user login in backend with wrong captcha
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\Plugin\AuthenticationException
+     */
+    public function testCheckOnBackendLoginWithWrongCaptcha(): void
+    {
+        $formId = 'backend_login';
+        $login = 'admin';
+        $captchaValue = 'captcha-value';
+
+        /** @var Observer|MockObject $observerMock */
+        $observerMock = $this->createPartialMock(Observer::class, ['getEvent']);
+        $eventMock = $this->createPartialMock(Event::class, ['getUsername']);
+        $captcha = $this->createMock(DefaultModel::class);
+
+        $eventMock->method('getUsername')->willReturn($login);
+        $observerMock->method('getEvent')->willReturn($eventMock);
+        $captcha->method('isRequired')->with($login)->willReturn(true);
+        $captcha->method('isCorrect')->with($captchaValue)->willReturn(false);
+        $this->helperMock->method('getCaptcha')->with($formId)->willReturn($captcha);
+        $this->captchaStringResolverMock->method('resolve')->with($this->requestMock, $formId)
+            ->willReturn($captchaValue);
+
+        $this->observer->execute($observerMock);
+    }
+}
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 98a0d442c659d..62f586ba82ae0 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-store": "100.3.*",
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*",
         "zendframework/zend-captcha": "^2.7.1",
         "zendframework/zend-db": "^2.8.2",
         "zendframework/zend-session": "^2.7.3"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Captcha/etc/config.xml b/app/code/Magento/Captcha/etc/config.xml
index 71c474de90ff4..dd748dd05ccda 100644
--- a/app/code/Magento/Captcha/etc/config.xml
+++ b/app/code/Magento/Captcha/etc/config.xml
@@ -53,8 +53,6 @@
                 <always_for>
                     <user_create>1</user_create>
                     <user_forgotpassword>1</user_forgotpassword>
-                    <guest_checkout>1</guest_checkout>
-                    <register_during_checkout>1</register_during_checkout>
                     <contact_us>1</contact_us>
                 </always_for>
             </captcha>
@@ -77,12 +75,6 @@
                     <user_forgotpassword>
                         <label>Forgot password</label>
                     </user_forgotpassword>
-                    <guest_checkout>
-                        <label>Check Out as Guest</label>
-                    </guest_checkout>
-                    <register_during_checkout>
-                        <label>Register during Checkout</label>
-                    </register_during_checkout>
                     <contact_us>
                         <label>Contact Us</label>
                     </contact_us>
diff --git a/app/code/Magento/Captcha/etc/db_schema.xml b/app/code/Magento/Captcha/etc/db_schema.xml
new file mode 100644
index 0000000000000..158e2f43b9f5d
--- /dev/null
+++ b/app/code/Magento/Captcha/etc/db_schema.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="captcha_log" resource="default" engine="innodb" comment="Count Login Attempts">
+        <column xsi:type="varchar" name="type" nullable="false" length="32" comment="Type"/>
+        <column xsi:type="varchar" name="value" nullable="false" length="255" comment="Value"/>
+        <column xsi:type="int" name="count" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Count"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Update Time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="type"/>
+            <column name="value"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Captcha/etc/db_schema_whitelist.json b/app/code/Magento/Captcha/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..1f5b1b624e48b
--- /dev/null
+++ b/app/code/Magento/Captcha/etc/db_schema_whitelist.json
@@ -0,0 +1,13 @@
+{
+    "captcha_log": {
+        "column": {
+            "type": true,
+            "value": true,
+            "count": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Captcha/etc/di.xml b/app/code/Magento/Captcha/etc/di.xml
index 955896eb12744..83c4e8aa1e2c1 100644
--- a/app/code/Magento/Captcha/etc/di.xml
+++ b/app/code/Magento/Captcha/etc/di.xml
@@ -27,13 +27,12 @@
         </arguments>
     </type>
     <type name="Magento\Customer\Controller\Ajax\Login">
-        <plugin name="configurable_product" type="Magento\Captcha\Model\Customer\Plugin\AjaxLogin" sortOrder="50" />
+        <plugin name="captcha_validation" type="Magento\Captcha\Model\Customer\Plugin\AjaxLogin" sortOrder="50" />
     </type>
     <type name="Magento\Captcha\Model\Customer\Plugin\AjaxLogin">
         <arguments>
             <argument name="formIds" xsi:type="array">
                 <item name="user_login" xsi:type="string">user_login</item>
-                <item name="guest_checkout" xsi:type="string">guest_checkout</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Captcha/etc/events.xml b/app/code/Magento/Captcha/etc/events.xml
index e3ddd19de2d12..970c0d077260c 100644
--- a/app/code/Magento/Captcha/etc/events.xml
+++ b/app/code/Magento/Captcha/etc/events.xml
@@ -18,10 +18,6 @@
     <event name="admin_user_authenticate_before">
         <observer name="captcha" instance="Magento\Captcha\Observer\CheckUserLoginBackendObserver" />
     </event>
-    <event name="controller_action_predispatch_checkout_onepage_saveBilling">
-        <observer name="captcha_guest" instance="Magento\Captcha\Observer\CheckGuestCheckoutObserver" />
-        <observer name="captcha_register" instance="Magento\Captcha\Observer\CheckRegisterCheckoutObserver" />
-    </event>
     <event name="customer_customer_authenticated">
         <observer name="captcha_reset_attempt" instance="Magento\Captcha\Observer\ResetAttemptForFrontendObserver" />
     </event>
diff --git a/app/code/Magento/Captcha/etc/frontend/di.xml b/app/code/Magento/Captcha/etc/frontend/di.xml
index 225e62c8e8203..490f1eab85196 100644
--- a/app/code/Magento/Captcha/etc/frontend/di.xml
+++ b/app/code/Magento/Captcha/etc/frontend/di.xml
@@ -17,7 +17,20 @@
         <arguments>
             <argument name="formIds" xsi:type="array">
                 <item name="user_login" xsi:type="string">user_login</item>
-                <item name="guest_checkout" xsi:type="string">guest_checkout</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Captcha\CustomerData\Captcha">
+        <arguments>
+            <argument name="formIds" xsi:type="array">
+                <item name="user_login" xsi:type="string">user_login</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
+        <arguments>
+            <argument name="sectionSourceMap" xsi:type="array">
+                <item name="captcha" xsi:type="string">Magento\Captcha\CustomerData\Captcha</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Captcha/etc/frontend/sections.xml b/app/code/Magento/Captcha/etc/frontend/sections.xml
new file mode 100644
index 0000000000000..7f2070e10c8a9
--- /dev/null
+++ b/app/code/Magento/Captcha/etc/frontend/sections.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:module:Magento_Customer:etc/sections.xsd">
+    <action name="customer/ajax/login">
+        <section name="captcha"/>
+    </action>
+</config>
diff --git a/app/code/Magento/Captcha/etc/module.xml b/app/code/Magento/Captcha/etc/module.xml
index 03ab6dbee3991..36a44a6543066 100644
--- a/app/code/Magento/Captcha/etc/module.xml
+++ b/app/code/Magento/Captcha/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Captcha" setup_version="2.0.0">
+    <module name="Magento_Captcha" >
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Checkout"/>
diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv
index 2de4ab5345c88..480107df8adfe 100644
--- a/app/code/Magento/Captcha/i18n/en_US.csv
+++ b/app/code/Magento/Captcha/i18n/en_US.csv
@@ -4,10 +4,10 @@ Always,Always
 "Incorrect CAPTCHA","Incorrect CAPTCHA"
 "Incorrect CAPTCHA.","Incorrect CAPTCHA."
 "The account is locked. Please wait and try again or contact %1.","The account is locked. Please wait and try again or contact %1."
-"Please enter the letters from the image","Please enter the letters from the image"
+"Please enter the letters and numbers from the image","Please enter the letters and numbers from the image"
 "<strong>Attention</strong>: Captcha is case sensitive.","<strong>Attention</strong>: Captcha is case sensitive."
 "Reload captcha","Reload captcha"
-"Please type the letters below","Please type the letters below"
+"Please type the letters and numbers below","Please type the letters and numbers below"
 "Attention: Captcha is case sensitive.","Attention: Captcha is case sensitive."
 CAPTCHA,CAPTCHA
 "Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
@@ -20,11 +20,7 @@ Forms,Forms
 "Number of Symbols","Number of Symbols"
 "Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
 "Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
-"
-                        Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
-                    ","
-                        Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
-                    "
+"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer."
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."
diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
index b8dcd6c654c8e..1be4bd19cd4ba 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -13,7 +13,7 @@ $captcha = $block->getCaptchaModel();
 ?>
 <div class="admin__field _required">
     <label for="captcha" class="admin__field-label">
-        <span><?= $block->escapeHtml(__('Please enter the letters from the image')) ?></span>
+        <span><?= $block->escapeHtml(__('Please enter the letters and numbers from the image')) ?></span>
     </label>
     <div class="admin__field-control">
         <input
diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
index 4ed56fd56cc3a..7180372f004e5 100644
--- a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
@@ -36,29 +36,7 @@
                                                                         <item name="captcha" xsi:type="array">
                                                                             <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
                                                                             <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
-                                                                            <item name="formId" xsi:type="string">guest_checkout</item>
-                                                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
-                                                                        </item>
-                                                                    </item>
-                                                                </item>
-                                                            </item>
-                                                        </item>
-                                                    </item>
-                                                </item>
-                                            </item>
-                                        </item>
-                                        <item name="billing-step" xsi:type="array">
-                                            <item name="children" xsi:type="array">
-                                                <item name="payment" xsi:type="array">
-                                                    <item name="children" xsi:type="array">
-                                                        <item name="customer-email" xsi:type="array">
-                                                            <item name="children" xsi:type="array">
-                                                                <item name="additional-login-form-fields" xsi:type="array">
-                                                                    <item name="children" xsi:type="array">
-                                                                        <item name="captcha" xsi:type="array">
-                                                                            <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
-                                                                            <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
-                                                                            <item name="formId" xsi:type="string">guest_checkout</item>
+                                                                            <item name="formId" xsi:type="string">user_login</item>
                                                                             <item name="configSource" xsi:type="string">checkoutConfig</item>
                                                                         </item>
                                                                     </item>
diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
index 3b322711f8b1f..42c80632d3e92 100644
--- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            captcha: 'Magento_Captcha/captcha'
+            captcha: 'Magento_Captcha/js/captcha',
+            'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
         }
     }
 };
diff --git a/app/code/Magento/Captcha/view/frontend/templates/default.phtml b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
index 9851b1cd8bd7d..6c9a5fe85f596 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
@@ -12,9 +12,9 @@
 $captcha = $block->getCaptchaModel();
 ?>
 <div class="field captcha required" role="<?= $block->escapeHtmlAttr($block->getFormId()) ?>">
-    <label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?= $block->escapeHtml(__('Please type the letters below')) ?></span></label>
+    <label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?= $block->escapeHtml(__('Please type the letters and numbers below')) ?></span></label>
     <div class="control captcha">
-        <input name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" />
+        <input name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" autocomplete="off"/>
         <div class="nested">
             <div class="field captcha no-label"
                  data-captcha="<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
@@ -23,7 +23,7 @@ $captcha = $block->getCaptchaModel();
                                             "imageLoader": "<?= $block->escapeUrl($block->getViewFileUrl('images/loader-2.gif')) ?>",
                                              "type": "<?= $block->escapeHtmlAttr($block->getFormId()) ?>"}}'>
                 <div class="control captcha-image">
-                    <img alt="<?= $block->escapeHtmlAttr(__('Please type the letters below')) ?>" class="captcha-img" height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>" src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>"/>
+                    <img alt="<?= $block->escapeHtmlAttr(__('Please type the letters and numbers below')) ?>" class="captcha-img" height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>" src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>"/>
                     <button type="button" class="action reload captcha-reload" title="<?= $block->escapeHtmlAttr(__('Reload captcha')) ?>"><span><?= $block->escapeHtml(__('Reload captcha')) ?></span></button>
                 </div>
             </div>
diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/captcha.js
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/web/captcha.js
rename to app/code/Magento/Captcha/view/frontend/web/js/captcha.js
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
index 3a235df73a916..e79cfb35ee08d 100644
--- a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
+++ b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
@@ -17,11 +17,12 @@ define([
             imageSource: ko.observable(captchaData.imageSrc),
             visibility: ko.observable(false),
             captchaValue: ko.observable(null),
-            isRequired: captchaData.isRequired,
+            isRequired: ko.observable(captchaData.isRequired),
             isCaseSensitive: captchaData.isCaseSensitive,
             imageHeight: captchaData.imageHeight,
             refreshUrl: captchaData.refreshUrl,
             isLoading: ko.observable(false),
+            timestamp: null,
 
             /**
              * @return {String}
@@ -41,7 +42,7 @@ define([
              * @return {Boolean}
              */
             getIsVisible: function () {
-                return this.visibility;
+                return this.visibility();
             },
 
             /**
@@ -55,14 +56,14 @@ define([
              * @return {Boolean}
              */
             getIsRequired: function () {
-                return this.isRequired;
+                return this.isRequired();
             },
 
             /**
              * @param {Boolean} flag
              */
             setIsRequired: function (flag) {
-                this.isRequired = flag;
+                this.isRequired(flag);
             },
 
             /**
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
index f80b2ab163ffd..d79c42a711565 100644
--- a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
+++ b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
@@ -7,8 +7,10 @@ define([
     'jquery',
     'uiComponent',
     'Magento_Captcha/js/model/captcha',
-    'Magento_Captcha/js/model/captchaList'
-], function ($, Component, Captcha, captchaList) {
+    'Magento_Captcha/js/model/captchaList',
+    'Magento_Customer/js/customer-data',
+    'underscore'
+], function ($, Component, Captcha, captchaList, customerData, _) {
     'use strict';
 
     var captchaConfig;
@@ -34,12 +36,49 @@ define([
             if (window[this.configSource] && window[this.configSource].captcha) {
                 captchaConfig = window[this.configSource].captcha;
                 $.each(captchaConfig, function (formId, captchaData) {
+                    var captcha;
+
                     captchaData.formId = formId;
-                    captchaList.add(Captcha(captchaData));
-                });
+                    captcha = Captcha(captchaData);
+                    this.checkCustomerData(formId, customerData.get('captcha')(), captcha);
+                    this.subscribeCustomerData(formId, captcha);
+                    captchaList.add(captcha);
+                }.bind(this));
             }
         },
 
+        /**
+         * Check customer data for captcha configuration.
+         *
+         * @param {String} formId
+         * @param {Object} captchaData
+         * @param {Object} captcha
+         */
+        checkCustomerData: function (formId, captchaData, captcha) {
+            if (!_.isEmpty(captchaData) &&
+                !_.isEmpty(captchaData)[formId] &&
+                captchaData[formId].timestamp > captcha.timestamp
+            ) {
+                if (!captcha.isRequired() && captchaData[formId].isRequired) {
+                    captcha.refresh();
+                }
+                captcha.isRequired(captchaData[formId].isRequired);
+                captcha.timestamp = captchaData[formId].timestamp;
+            }
+        },
+
+        /**
+         * Subscribe for customer data updates.
+         *
+         * @param {String} formId
+         * @param {Object} captcha
+         */
+        subscribeCustomerData: function (formId, captcha) {
+            customerData.get('captcha').subscribe(function (captchaData) {
+                this.checkCustomerData(formId, captchaData, captcha);
+            }.bind(this));
+        },
+
         /**
          * @return {Boolean}
          */
@@ -89,6 +128,15 @@ define([
             return this.currentCaptcha !== null ? this.currentCaptcha.getIsRequired() : false;
         },
 
+        /**
+         * Set isRequired on current captcha model.
+         *
+         * @param {Boolean} flag
+         */
+        setIsRequired: function (flag) {
+            this.currentCaptcha.setIsRequired(flag);
+        },
+
         /**
          * @return {Boolean}
          */
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
index 7709febea60a3..49528f6ce8501 100644
--- a/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
+++ b/app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js
@@ -6,9 +6,10 @@
 define([
     'Magento_Captcha/js/view/checkout/defaultCaptcha',
     'Magento_Captcha/js/model/captchaList',
-    'Magento_Customer/js/action/login'
+    'Magento_Customer/js/action/login',
+    'underscore'
 ],
-function (defaultCaptcha, captchaList, loginAction) {
+function (defaultCaptcha, captchaList, loginAction, _) {
     'use strict';
 
     return defaultCaptcha.extend({
@@ -26,9 +27,10 @@ function (defaultCaptcha, captchaList, loginAction) {
 
                 loginAction.registerLoginCallback(function (loginData) {
                     if (loginData['captcha_form_id'] &&
-                        loginData['captcha_form_id'] == self.formId //eslint-disable-line eqeqeq
+                        loginData['captcha_form_id'] === self.formId &&
+                        self.isRequired()
                     ) {
-                        self.refresh();
+                        _.defer(self.refresh.bind(self));
                     }
                 });
             }
diff --git a/app/code/Magento/Captcha/view/frontend/web/onepage.js b/app/code/Magento/Captcha/view/frontend/web/onepage.js
deleted file mode 100644
index 7f5f11d20572b..0000000000000
--- a/app/code/Magento/Captcha/view/frontend/web/onepage.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * @deprecated since version 2.2.0
- */
-define(['jquery'], function ($) {
-    'use strict';
-
-    $(document).on('login', function () {
-        var type;
-
-        $('[data-captcha="guest_checkout"], [data-captcha="register_during_checkout"]').hide();
-        $('[role="guest_checkout"], [role="register_during_checkout"]').hide();
-        type = $('#login\\:guest').is(':checked') ? 'guest_checkout' : 'register_during_checkout';
-        $('[role="' + type + '"], [data-captcha="' + type + '"]').show();
-    }).on('billingSave', function () {
-            $('.captcha-reload:visible').trigger('click');
-        });
-});
diff --git a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
index 6767a121d849d..3f48ec330c0a4 100644
--- a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
+++ b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
@@ -4,17 +4,18 @@
  * See COPYING.txt for license details.
  */
 -->
+<input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
-    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters below'"></span></label>
+    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters and numbers below'"></span></label>
     <div class="control captcha">
-        <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
-        <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
+        <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" autocomplete="off"/>
         <div class="nested">
             <div class="field captcha no-label">
                 <div class="control captcha-image">
                     <img data-bind="attr: {
-                                        alt: $t('Please type the letters below'),
+                                        alt: $t('Please type the letters and numbers below'),
+                                        title: $t('Please type the letters and numbers below'),
                                         height: imageHeight(),
                                         src: getImageSource(),
                                         }"
diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 30ac06107ba1d..34656d522a72c 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -32,18 +32,20 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
 
     /**
      * Remove the product assignment from the category by category id and sku
      *
-     * @param string $sku
+     * @param string $categoryId
      * @param string $sku
      * @return bool will returned True if products successfully deleted
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function deleteByIds($categoryId, $sku);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
index b65cdafbe26f4..b9a23e9d08ec3 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
@@ -14,6 +14,37 @@
  */
 interface CategoryInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
+    /**#@+
+     * Constants defined for keys of  data array
+     */
+    const KEY_PARENT_ID = 'parent_id';
+    const KEY_NAME = 'name';
+    const KEY_IS_ACTIVE = 'is_active';
+    const KEY_POSITION = 'position';
+    const KEY_LEVEL = 'level';
+    const KEY_UPDATED_AT = 'updated_at';
+    const KEY_CREATED_AT = 'created_at';
+    const KEY_PATH = 'path';
+    const KEY_AVAILABLE_SORT_BY = 'available_sort_by';
+    const KEY_INCLUDE_IN_MENU = 'include_in_menu';
+    const KEY_PRODUCT_COUNT = 'product_count';
+    const KEY_CHILDREN_DATA = 'children_data';
+
+    const ATTRIBUTES = [
+        'id',
+        self::KEY_PARENT_ID,
+        self::KEY_NAME,
+        self::KEY_IS_ACTIVE,
+        self::KEY_POSITION,
+        self::KEY_LEVEL,
+        self::KEY_UPDATED_AT,
+        self::KEY_CREATED_AT,
+        self::KEY_AVAILABLE_SORT_BY,
+        self::KEY_INCLUDE_IN_MENU,
+        self::KEY_CHILDREN_DATA,
+    ];
+    /**#@-*/
+
     /**
      * @return int|null
      */
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
index 12adf5b08938f..590c23a0aa0b1 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
@@ -32,4 +32,9 @@ interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttribu
     const CODE_TIER_PRICE_FIELD_VALUE_TYPE = 'value_type';
     const CODE_SEO_FIELD_META_DESCRIPTION = 'meta_description';
     const CODE_WEIGHT = 'weight';
+
+    /**
+     * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
+     */
+    public function getExtensionAttributes();
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductInterface.php b/app/code/Magento/Catalog/Api/Data/ProductInterface.php
index a79c76fd8e2b6..4968f49fd20dc 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductInterface.php
@@ -36,6 +36,24 @@ interface ProductInterface extends \Magento\Framework\Api\CustomAttributesDataIn
 
     const UPDATED_AT = 'updated_at';
 
+    const MEDIA_GALLERY = 'media_gallery';
+
+    const TIER_PRICE = 'tier_price';
+
+    const ATTRIBUTES = [
+        self::SKU,
+        self::NAME,
+        self::PRICE,
+        self::WEIGHT,
+        self::STATUS,
+        self::VISIBILITY,
+        self::ATTRIBUTE_SET_ID,
+        self::TYPE_ID,
+        self::CREATED_AT,
+        self::UPDATED_AT,
+        self::MEDIA_GALLERY,
+        self::TIER_PRICE,
+    ];
     /**#@-*/
 
     /**
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
index fb3f4fd1e8366..2ef4d068317dd 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
@@ -51,7 +51,7 @@ public function setMaxPrice($maxPrice);
 
     /**
      * Set max regular price
-     * Max regular price is the same, as maximum price, except of excluding calculating special price and catalogules
+     * Max regular price is the same, as maximum price, except of excluding calculating special price and catalog rules
      * in it
      *
      * @param float $maxRegularPrice
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
index 07b7d591c3fd7..3f255d93f96b0 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
@@ -29,7 +29,7 @@ public function getItems($attributeCode);
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return bool
+     * @return string
      */
     public function add($attributeCode, $option);
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
index 69618f04eb2af..c718563d7576e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
@@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'catalog/category/edit/assign_products.phtml';
+    protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml';
 
     /**
      * @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
index ad1ccea6f2c5a..1e0015d2be2c6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -30,7 +30,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('catalog/category/checkboxes/tree.phtml');
+        $this->setTemplate('Magento_Catalog::catalog/category/checkboxes/tree.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
index 20411a4c4d767..2eef1188e3910 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
@@ -27,7 +27,8 @@ public function getButtonData()
             return [
                 'id' => 'delete',
                 'label' => __('Delete'),
-                'on_click' => "categoryDelete('" . $this->getDeleteUrl() . "')",
+                'on_click' => "deleteConfirm('" .__('Are you sure you want to delete this category?') ."', '"
+                    . $this->getDeleteUrl() . "', {data: {}})",
                 'class' => 'delete',
                 'sort_order' => 10
             ];
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 df5894bf4cbd1..20bd1b379beef 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/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 4b0d233d3e77b..a67f55235b6df 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -27,7 +27,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
     /**
      * @var string
      */
-    protected $_template = 'catalog/category/tree.phtml';
+    protected $_template = 'Magento_Catalog::catalog/category/tree.phtml';
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
@@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
      *
      * @param Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
index 5e98313f95f0f..9c83d4aea61c7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -24,7 +24,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
      *
      * @var string
      */
-    protected $_template = 'catalog/category/widget/tree.phtml';
+    protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
 
     /**
      * @return void
@@ -144,7 +144,7 @@ function (node, e) {
      *
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      */
     protected function _getNodeJson($node, $level = 0)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index 0026e52e039ef..cd6c5021f0cc9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -32,10 +32,9 @@ protected function _getElementHtml(AbstractElement $element)
 
         $from = $element->setValue(isset($values[0]) ? $values[0] : null)->getElementHtml();
         $to = $element->setValue(isset($values[1]) ? $values[1] : null)->getElementHtml();
-        return __(
-            '<label class="label"><span>from</span></label>'
-        ) . $from . __(
-            '<label class="label"><span>to</span></label>'
-        ) . $to;
+        return '<label class="label"><span>' . __('from') . '</span></label>'
+        . $from .
+        '<label class="label"><span>' . __('to') . '</span></label>'
+        . $to;
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
index 10214fc1d16fd..ad6df27b89334 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * Retrieve data object related with form
      *
-     * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category
      */
     public function getDataObject()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index ce802e04509ef..a0ca53dce4f50 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -125,17 +125,6 @@ protected function _prepareForm()
             ]
         );
 
-        $fieldset->addField(
-            'is_wysiwyg_enabled',
-            'select',
-            [
-                'name' => 'is_wysiwyg_enabled',
-                'label' => __('Enable WYSIWYG'),
-                'title' => __('Enable WYSIWYG'),
-                'values' => $yesnoSource,
-            ]
-        );
-
         $fieldset->addField(
             'is_html_allowed_on_front',
             'select',
@@ -195,33 +184,19 @@ protected function _prepareForm()
             'form_after',
             $this->getLayout()->createBlock(
                 \Magento\Backend\Block\Widget\Form\Element\Dependence::class
-            )->addFieldMap(
-                "is_wysiwyg_enabled",
-                'wysiwyg_enabled'
             )->addFieldMap(
                 "is_html_allowed_on_front",
                 'html_allowed_on_front'
             )->addFieldMap(
                 "frontend_input",
                 'frontend_input_type'
-            )->addFieldDependence(
-                'wysiwyg_enabled',
-                'frontend_input_type',
-                'textarea'
-            )->addFieldDependence(
-                'html_allowed_on_front',
-                'wysiwyg_enabled',
-                '0'
-            )
-            ->addFieldMap(
+            )->addFieldMap(
                 "is_searchable",
                 'searchable'
-            )
-            ->addFieldMap(
+            )->addFieldMap(
                 "is_visible_in_advanced_search",
                 'advanced_search'
-            )
-            ->addFieldDependence(
+            )->addFieldDependence(
                 'advanced_search',
                 'searchable',
                 '1'
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index 86f231fd59ce0..85cf37a1214b5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -35,15 +35,15 @@ protected function _prepareForm()
         $form = $this->getForm();
         /* @var $fieldset \Magento\Framework\Data\Form\Element\Fieldset */
         $fieldset = $form->getElement('base_fieldset');
-        $fiedsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
+        $fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
 
         foreach ($fieldset->getElements() as $element) {
             /** @var \Magento\Framework\Data\Form\AbstractForm $element  */
             if (substr($element->getId(), 0, strlen('default_value')) == 'default_value') {
-                $fiedsToRemove[] = $element->getId();
+                $fieldsToRemove[] = $element->getId();
             }
         }
-        foreach ($fiedsToRemove as $id) {
+        foreach ($fieldsToRemove as $id) {
             $fieldset->removeField($id);
         }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
index ab5026b1e69b9..66e04ef03f771 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
@@ -101,8 +101,7 @@ protected function _prepareColumns()
                 'type' => 'options',
                 'options' => ['1' => __('Yes'), '0' => __('No')],
                 'align' => 'center'
-            ],
-            'is_user_defined'
+            ]
         );
 
         $this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index c6e48c02805a6..3b9036c1fbbc0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -6,13 +6,13 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set;
 
 /**
- * Adminhtml Catalog Attribute Set Main Block
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 use Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface;
 
 /**
+ * Adminhtml Catalog Attribute Set Main Block.
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -22,7 +22,7 @@ class Main extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/main.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml';
 
     /**
      * Core registry
@@ -140,7 +140,7 @@ protected function _prepareLayout()
                     ) . '\', \'' . $this->getUrl(
                         'catalog/*/delete',
                         ['id' => $setId]
-                    ) . '\')',
+                    ) . '\',{data: {}})',
                     'class' => 'delete'
                 ]
             );
@@ -233,7 +233,7 @@ public function getGroupTreeJson()
         /* @var $node \Magento\Eav\Model\Entity\Attribute\Group */
         foreach ($groups as $node) {
             $item = [];
-            $item['text'] = $node->getAttributeGroupName();
+            $item['text'] = $this->escapeHtml($node->getAttributeGroupName());
             $item['id'] = $node->getAttributeGroupId();
             $item['cls'] = 'folder';
             $item['allowDrop'] = true;
@@ -280,7 +280,7 @@ public function getAttributeTreeJson()
 
         foreach ($attributes as $child) {
             $attr = [
-                'text' => $child->getAttributeCode(),
+                'text' => $this->escapeHtml($child->getAttributeCode()),
                 'id' => $child->getAttributeId(),
                 'cls' => 'leaf',
                 'allowDrop' => false,
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
index ee92fd7c19b80..26ffc6e0df3d9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
@@ -11,6 +11,9 @@
 
 use Magento\Backend\Block\Widget\Form;
 
+/**
+ * Form group for attribute set
+ */
 class Formgroup extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -37,6 +40,8 @@ public function __construct(
     }
 
     /**
+     * Prepare form elements
+     *
      * @return void
      */
     protected function _prepareForm()
@@ -77,13 +82,15 @@ protected function _prepareForm()
     }
 
     /**
+     * Returns set id
+     *
      * @return int
      */
     protected function _getSetId()
     {
-        return intval(
+        return (int)(
             $this->getRequest()->getParam('id')
-        ) > 0 ? intval(
+        ) > 0 ? (int)(
             $this->getRequest()->getParam('id')
         ) : $this->_typeFactory->create()->load(
             $this->_coreRegistry->registry('entityType')
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
index f5e3f94418687..cb0a739b56e4e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
@@ -14,5 +14,5 @@ class Attribute extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/attribute.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
index cf8de44c3d9df..93c2dcc76263c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
@@ -14,5 +14,5 @@ class Group extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/group.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 329afa968307c..f69e58985bfc5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -18,7 +18,7 @@ class Add extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml';
 
     /**
      * @return AbstractBlock
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index f707c5c340b68..e29ab26065dc3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -20,7 +20,7 @@ class Main extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml';
 
     /**
      * @return $this
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
index 9270c1ac38ba3..98280d8d31237 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
@@ -22,7 +22,7 @@ class Configure extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/composite/configure.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/composite/configure.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index c18106fe567d0..285caa974fd17 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -17,7 +17,7 @@ class Edit extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 4310f61c5716e..2df0ff0b6cd7c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -9,13 +9,18 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
 /**
+ * Attributes tab block
+ *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
@@ -31,6 +36,9 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
      */
     protected $_attributeAction;
 
+    /** @var array */
+    private $excludeFields;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -38,6 +46,7 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeAction
      * @param array $data
+     * @param array|null $excludeFields
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,37 +54,25 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeAction,
-        array $data = []
+        array $data = [],
+        array $excludeFields = null
     ) {
         $this->_attributeAction = $attributeAction;
         $this->_productFactory = $productFactory;
-        parent::__construct($context, $registry, $formFactory, $data);
-    }
+        $this->excludeFields = $excludeFields ?: [];
 
-    /**
-     * @return void
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->setShowGlobalIcon(true);
+        parent::__construct($context, $registry, $formFactory, $data);
     }
 
     /**
+     * Prepares form
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _prepareForm()
+    protected function _prepareForm(): void
     {
-        $this->setFormExcludedFieldList(
-            [
-                'category_ids',
-                'gallery',
-                'image',
-                'media_gallery',
-                'quantity_and_stock_status',
-                'tier_price',
-            ]
-        );
+        $this->setFormExcludedFieldList($this->getExcludedFields());
         $this->_eventManager->dispatch(
             'adminhtml_catalog_product_form_prepare_excluded_field_list',
             ['object' => $this]
@@ -149,12 +146,14 @@ protected function _getAdditionalElementHtml($element)
     weightHandle.hideWeightSwitcher();
 });</script>
 HTML;
-        // @codingStandardsIgnoreEnd
+            // @codingStandardsIgnoreEnd
         }
         return $html;
     }
 
     /**
+     * Returns tab label
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
@@ -163,6 +162,8 @@ public function getTabLabel()
     }
 
     /**
+     * Return Tab title
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
@@ -171,6 +172,8 @@ public function getTabTitle()
     }
 
     /**
+     * Can show tab in tabs
+     *
      * @return bool
      */
     public function canShowTab()
@@ -179,10 +182,22 @@ public function canShowTab()
     }
 
     /**
+     * Tab not hidden
+     *
      * @return bool
      */
     public function isHidden()
     {
         return false;
     }
+
+    /**
+     * Returns excluded fields
+     *
+     * @return array
+     */
+    private function getExcludedFields(): array
+    {
+        return $this->excludeFields;
+    }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 750bf6f8a0216..4aa01b467d451 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -74,7 +74,7 @@ public function getFieldSuffix()
     public function getStoreId()
     {
         $storeId = $this->getRequest()->getParam('store');
-        return intval($storeId);
+        return (int) $storeId;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index 3d0613dc378cc..9712c0e03d609 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -80,7 +80,7 @@ public function getProduct()
     }
 
     /**
-     * Get store object of curently edited product
+     * Get store object of currently edited product
      *
      * @return \Magento\Store\Model\Store
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
index a7129f509316b..3d131a6e08810 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
@@ -41,7 +41,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('catalog/product/edit/serializer.phtml');
+        $this->setTemplate('Magento_Catalog::catalog/product/edit/serializer.phtml');
         return $this;
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 62b9341a95414..be9c84ee5edd1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -16,7 +16,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/tab/alert.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/tab/alert.phtml';
 
     /**
      * @return $this
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index d5f66231f1d82..e1b97f996c769 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -81,7 +81,7 @@ public function getSelectorOptions()
      *
      * @param string $labelPart
      * @param int $templateId
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+     * @return array
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index e4f700e5790a2..e5ce59c550af1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -10,9 +10,13 @@
 use Magento\Catalog\Model\Product;
 
 /**
+ * Crossel product edit tab
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
  */
 class Crosssell extends Extended
 {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
index e52c1d3aa4985..20e12889cae0d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
@@ -15,7 +15,7 @@ class Inventory extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/tab/inventory.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/tab/inventory.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
index a7a919e53f56e..2c79f5a6fa718 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -16,7 +16,7 @@ class Options extends Widget
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/options.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/options.phtml';
 
     /**
      * @return Widget
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index f3460dfa28c29..49caddd1a1018 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -36,7 +36,7 @@ class Option extends Widget
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/options/option.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/options/option.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
index babfc1b072bd2..a0bbc4ad033de 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
@@ -16,5 +16,5 @@ class Date extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/options/type/date.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/date.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
index 322aa02f97731..d3d5f08fa9eae 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
@@ -16,5 +16,5 @@ class File extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/options/type/file.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/file.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
index 24de84958ef4a..f6ab5134ae6bd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
@@ -16,7 +16,7 @@ class Select extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\T
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/options/type/select.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/select.phtml';
 
     /**
      * Class constructor
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
index 7241128fac3b4..e6f78dc3ed169 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
@@ -16,5 +16,5 @@ class Text extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/options/type/text.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/text.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index a80ddd8c122a1..7cb1c2c9e4263 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -13,7 +13,7 @@ class Tier extends Group\AbstractGroup
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/price/tier.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/price/tier.phtml';
 
     /**
      * Retrieve list of initial customer groups
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 0c59a7402dac1..c8153df41430e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -9,8 +9,12 @@
 use Magento\Backend\Block\Widget\Grid\Extended;
 
 /**
+ * Related product edit tab
+ *
  * @api
  * @since 100.0.2
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\RelatedDataProvider
  */
 class Related extends Extended
 {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 0dc3ef07929cf..41ad72ca39e53 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -6,8 +6,12 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
 
 /**
+ * Upsell product edit tab
+ *
  * @api
  * @since 100.0.2
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
  */
 class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -104,7 +108,7 @@ protected function _construct()
     }
 
     /**
-     * Retirve currently edited product model
+     * Retrieve currently edited product model
      *
      * @return \Magento\Catalog\Model\Product
      */
@@ -315,7 +319,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * Rerieve grid URL
+     * Retrieve grid URL
      *
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
index 6a3347b44512f..6189a97dbe761 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
@@ -21,7 +21,7 @@ class Websites extends \Magento\Backend\Block\Store\Switcher
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/websites.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/edit/websites.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index f30b37877b78f..36740f5853d74 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -11,11 +11,16 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Registry;
 use Magento\Catalog\Model\Product;
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Catalog\Api\Data\ProductInterface;
 
+/**
+ * Adminhtml gallery block
+ */
 class Gallery extends \Magento\Framework\View\Element\AbstractBlock
 {
     /**
@@ -66,27 +71,37 @@ class Gallery extends \Magento\Framework\View\Element\AbstractBlock
      */
     protected $registry;
 
+    /**
+     * @var DataPersistorInterface
+     */
+    private $dataPersistor;
+
     /**
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Registry $registry
      * @param \Magento\Framework\Data\Form $form
      * @param array $data
+     * @param DataPersistorInterface|null $dataPersistor
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         Registry $registry,
         \Magento\Framework\Data\Form $form,
-        $data = []
+        $data = [],
+        DataPersistorInterface $dataPersistor = null
     ) {
         $this->storeManager = $storeManager;
         $this->registry = $registry;
         $this->form = $form;
+        $this->dataPersistor = $dataPersistor ?: ObjectManager::getInstance()->get(DataPersistorInterface::class);
         parent::__construct($context, $data);
     }
 
     /**
+     * Returns element html.
+     *
      * @return string
      */
     public function getElementHtml()
@@ -102,7 +117,24 @@ public function getElementHtml()
      */
     public function getImages()
     {
-        return $this->registry->registry('current_product')->getData('media_gallery') ?: null;
+        $images = $this->getDataObject()->getData('media_gallery') ?: null;
+        if ($images === null) {
+            $images = ((array)$this->dataPersistor->get('catalog_product'))['product']['media_gallery'] ?? null;
+        }
+
+        return $images;
+    }
+
+    /**
+     * Get value for given type.
+     *
+     * @param string $type
+     * @return string|null
+     */
+    public function getImageValue(string $type)
+    {
+        $product = (array)$this->dataPersistor->get('catalog_product');
+        return $product['product'][$type] ?? null;
     }
 
     /**
@@ -117,11 +149,13 @@ public function getContentHtml()
         $content->setId($this->getHtmlId() . '_content')->setElement($this);
         $content->setFormName($this->formName);
         $galleryJs = $content->getJsObjectName();
-        $content->getUploader()->getConfig()->setMegiaGallery($galleryJs);
+        $content->getUploader()->getConfig()->setMediaGallery($galleryJs);
         return $content->toHtml();
     }
 
     /**
+     * Returns html id
+     *
      * @return string
      */
     protected function getHtmlId()
@@ -130,6 +164,8 @@ protected function getHtmlId()
     }
 
     /**
+     * Returns name
+     *
      * @return string
      */
     public function getName()
@@ -138,6 +174,8 @@ public function getName()
     }
 
     /**
+     * Returns suffix for field name
+     *
      * @return string
      */
     public function getFieldNameSuffix()
@@ -146,6 +184,8 @@ public function getFieldNameSuffix()
     }
 
     /**
+     * Returns data scope html id
+     *
      * @return string
      */
     public function getDataScopeHtmlId()
@@ -230,7 +270,6 @@ public function getDataObject()
     /**
      * Retrieve attribute field name
      *
-     *
      * @param Attribute $attribute
      * @return string
      */
@@ -244,6 +283,8 @@ public function getAttributeFieldName($attribute)
     }
 
     /**
+     * Returns html content of the block
+     *
      * @return string
      */
     public function toHtml()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 5188bf365e5e9..063503682f4db 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -13,17 +13,22 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Backend\Block\Media\Uploader;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Backend\Block\DataProviders\ImageUploadConfig as ImageUploadConfigDataProvider;
 
+/**
+ * Block for gallery content.
+ */
 class Content extends \Magento\Backend\Block\Widget
 {
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/helper/gallery.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/helper/gallery.phtml';
 
     /**
      * @var \Magento\Catalog\Model\Product\Media\Config
@@ -40,29 +45,44 @@ class Content extends \Magento\Backend\Block\Widget
      */
     private $imageHelper;
 
+    /**
+     * @var ImageUploadConfigDataProvider
+     */
+    private $imageUploadConfigDataProvider;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
      * @param array $data
+     * @param ImageUploadConfigDataProvider $imageUploadConfigDataProvider
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
-        array $data = []
+        array $data = [],
+        ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_mediaConfig = $mediaConfig;
         parent::__construct($context, $data);
+        $this->imageUploadConfigDataProvider = $imageUploadConfigDataProvider
+            ?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
     }
 
     /**
+     * Prepare layout.
+     *
      * @return AbstractBlock
      */
     protected function _prepareLayout()
     {
-        $this->addChild('uploader', \Magento\Backend\Block\Media\Uploader::class);
+        $this->addChild(
+            'uploader',
+            \Magento\Backend\Block\Media\Uploader::class,
+            ['image_upload_config_data' => $this->imageUploadConfigDataProvider]
+        );
 
         $this->getUploader()->getConfig()->setUrl(
             $this->_urlBuilder->addSessionParam()->getUrl('catalog/product_gallery/upload')
@@ -103,6 +123,8 @@ public function getUploaderHtml()
     }
 
     /**
+     * Returns js object name
+     *
      * @return string
      */
     public function getJsObjectName()
@@ -111,6 +133,8 @@ public function getJsObjectName()
     }
 
     /**
+     * Returns buttons for add image action.
+     *
      * @return string
      */
     public function getAddImagesButton()
@@ -124,6 +148,8 @@ public function getAddImagesButton()
     }
 
     /**
+     * Returns image json
+     *
      * @return string
      */
     public function getImagesJson()
@@ -169,6 +195,8 @@ private function sortImagesByPosition($images)
     }
 
     /**
+     * Returns image values json
+     *
      * @return string
      */
     public function getImagesValuesJson()
@@ -193,9 +221,11 @@ public function getImageTypes()
         $imageTypes = [];
         foreach ($this->getMediaAttributes() as $attribute) {
             /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+            $value = $this->getElement()->getDataObject()->getData($attribute->getAttributeCode())
+                ?: $this->getElement()->getImageValue($attribute->getAttributeCode());
             $imageTypes[$attribute->getAttributeCode()] = [
                 'code' => $attribute->getAttributeCode(),
-                'value' => $this->getElement()->getDataObject()->getData($attribute->getAttributeCode()),
+                'value' => $value,
                 'label' => $attribute->getFrontend()->getLabel(),
                 'scope' => __($this->getElement()->getScopeLabel($attribute)),
                 'name' => $this->getElement()->getAttributeFieldName($attribute),
@@ -241,6 +271,8 @@ public function getImageTypesJson()
     }
 
     /**
+     * Returns image helper object.
+     *
      * @return \Magento\Catalog\Helper\Image
      * @deprecated 101.0.3
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
index 19c1574d6e9a5..b8967f1f30e55 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
@@ -18,5 +18,5 @@ class Container extends Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/widget/chooser/container.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/widget/chooser/container.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
index dbeff93683bc0..a9ec80c5f0232 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -13,7 +13,7 @@ class Link extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'rss/grid/link.phtml';
+    protected $_template = 'Magento_Catalog::rss/grid/link.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
@@ -69,7 +69,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php b/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
index 03932151358ab..99399110505b7 100644
--- a/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
+++ b/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
@@ -71,7 +71,7 @@ public function afterGetCacheKey(PriceBox $subject, $result)
             '-',
             [
                 $result,
-                $this->priceCurrency->getCurrencySymbol(),
+                $this->priceCurrency->getCurrency()->getCode(),
                 $this->dateTime->scopeDate($this->scopeResolver->getScope()->getId())->format('Ymd'),
                 $this->scopeResolver->getScope()->getId(),
                 $this->customerSession->getCustomerGroupId(),
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
index 0599d5f4b989c..e40b81200574c 100644
--- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php
+++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -62,7 +62,7 @@ public function getLabel()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index 782ba561614d4..1d4ad5a03619e 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -195,7 +195,7 @@ public function getCurrentChildCategories()
     }
 
     /**
-     * Checkin activity of category
+     * Check activity of category
      *
      * @param   \Magento\Framework\DataObject $category
      * @return  bool
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
index d4af775ad20da..c8da0f70f73b6 100644
--- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -125,6 +125,7 @@ public function __construct(\Magento\Catalog\Block\Product\Context $context, arr
 
     /**
      * Retrieve url for add product to cart
+     *
      * Will return product view page URL if product has required options
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -195,7 +196,7 @@ public function getAddToCompareUrl()
      * Gets minimal sales quantity
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return int|null
+     * @return float|null
      */
     public function getMinimalQty($product)
     {
@@ -473,7 +474,9 @@ public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product)
     }
 
     /**
-     * @param null $type
+     * Get the renderer that will be used to render the details block
+     *
+     * @param string|null $type
      * @return bool|\Magento\Framework\View\Element\AbstractBlock
      */
     public function getDetailsRenderer($type = null)
@@ -489,6 +492,8 @@ public function getDetailsRenderer($type = null)
     }
 
     /**
+     * Return the list of details
+     *
      * @return \Magento\Framework\View\Element\RendererList
      */
     protected function getDetailsRendererList()
@@ -510,9 +515,6 @@ protected function getDetailsRendererList()
      */
     public function getImage($product, $imageId, $attributes = [])
     {
-        return $this->imageBuilder->setProduct($product)
-            ->setImageId($imageId)
-            ->setAttributes($attributes)
-            ->create();
+        return $this->imageBuilder->create($product, $imageId, $attributes);
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index c561913dee4d3..76f5dbd1bea88 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -122,12 +122,7 @@ public function __construct(
      */
     public function getAddToWishlistParams($product)
     {
-        $continueUrl = $this->urlEncoder->encode($this->getUrl('customer/account'));
-        $urlParamName = Action::PARAM_NAME_URL_ENCODED;
-
-        $continueUrlParams = [$urlParamName => $continueUrl];
-
-        return $this->_wishlistHelper->getAddParams($product, $continueUrlParams);
+        return $this->_wishlistHelper->getAddParams($product);
     }
 
     /**
@@ -213,6 +208,22 @@ public function getProductAttributeValue($product, $attribute)
         return (string)$value == '' ? __('No') : $value;
     }
 
+    /**
+     * Check if any of the products has a value set for the attribute
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
+     * @return bool
+     */
+    public function hasAttributeValueForProducts($attribute)
+    {
+        foreach ($this->getItems() as $item) {
+            if ($item->hasData($attribute->getAttributeCode())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Retrieve Print URL
      *
diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php
index a1fcdf43f6eb0..7a7f9c0affc7d 100644
--- a/app/code/Magento/Catalog/Block/Product/Image.php
+++ b/app/code/Magento/Catalog/Block/Product/Image.php
@@ -6,30 +6,34 @@
 namespace Magento\Catalog\Block\Product;
 
 /**
+ * Product image block
+ *
  * @api
  * @method string getImageUrl()
  * @method string getWidth()
  * @method string getHeight()
  * @method string getLabel()
- * @method mixed getResizedImageWidth()
- * @method mixed getResizedImageHeight()
  * @method float getRatio()
  * @method string getCustomAttributes()
+ * @method string getClass()
  * @since 100.0.2
  */
 class Image extends \Magento\Framework\View\Element\Template
 {
     /**
+     * @deprecated Property isn't used
      * @var \Magento\Catalog\Helper\Image
      */
     protected $imageHelper;
 
     /**
+     * @deprecated Property isn't used
      * @var \Magento\Catalog\Model\Product
      */
     protected $product;
 
     /**
+     * @deprecated Property isn't used
      * @var array
      */
     protected $attributes = [];
diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
index 04d30270cbb62..06d4fb39109d8 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -3,11 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product;
 
 use Magento\Catalog\Helper\ImageFactory as HelperFactory;
-use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
+use Magento\Catalog\Model\Product;
 
+/**
+ * @deprecated
+ * @see ImageFactory
+ */
 class ImageBuilder
 {
     /**
@@ -21,7 +27,7 @@ class ImageBuilder
     protected $helperFactory;
 
     /**
-     * @var \Magento\Catalog\Model\Product
+     * @var Product
      */
     protected $product;
 
@@ -50,10 +56,10 @@ public function __construct(
     /**
      * Set product
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return $this
      */
-    public function setProduct(\Magento\Catalog\Model\Product $product)
+    public function setProduct(Product $product)
     {
         $this->product = $product;
         return $this;
@@ -79,9 +85,7 @@ public function setImageId($imageId)
      */
     public function setAttributes(array $attributes)
     {
-        if ($attributes) {
-            $this->attributes = $attributes;
-        }
+        $this->attributes = $attributes;
         return $this;
     }
 
@@ -118,38 +122,16 @@ protected function getRatio(\Magento\Catalog\Helper\Image $helper)
     /**
      * Create image block
      *
-     * @return \Magento\Catalog\Block\Product\Image
+     * @param Product|null $product
+     * @param string|null $imageId
+     * @param array|null $attributes
+     * @return Image
      */
-    public function create()
+    public function create(Product $product = null, string $imageId = null, array $attributes = null)
     {
-        /** @var \Magento\Catalog\Helper\Image $helper */
-        $helper = $this->helperFactory->create()
-            ->init($this->product, $this->imageId);
-
-        $template = $helper->getFrame()
-            ? 'Magento_Catalog::product/image.phtml'
-            : 'Magento_Catalog::product/image_with_borders.phtml';
-
-        try {
-            $imagesize = $helper->getResizedImageInfo();
-        } catch (NotLoadInfoImageException $exception) {
-            $imagesize = [$helper->getWidth(), $helper->getHeight()];
-        }
-
-        $data = [
-            'data' => [
-                'template' => $template,
-                'image_url' => $helper->getUrl(),
-                'width' => $helper->getWidth(),
-                'height' => $helper->getHeight(),
-                'label' => $helper->getLabel(),
-                'ratio' =>  $this->getRatio($helper),
-                'custom_attributes' => $this->getCustomAttributes(),
-                'resized_image_width' => $imagesize[0],
-                'resized_image_height' => $imagesize[1],
-            ],
-        ];
-
-        return $this->imageFactory->create($data);
+        $product = $product ?? $this->product;
+        $imageId = $imageId ?? $this->imageId;
+        $attributes = $attributes ?? $this->attributes;
+        return $this->imageFactory->create($product, $imageId, $attributes);
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/ImageFactory.php b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
new file mode 100644
index 0000000000000..aa303af656a5b
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Product;
+
+use Magento\Catalog\Block\Product\Image as ImageBlock;
+use Magento\Catalog\Model\View\Asset\ImageFactory as AssetImageFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
+use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Catalog\Helper\Image as ImageHelper;
+
+/**
+ * Create imageBlock from product and view.xml
+ */
+class ImageFactory
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $presentationConfig;
+
+    /**
+     * @var AssetImageFactory
+     */
+    private $viewAssetImageFactory;
+
+    /**
+     * @var ParamsBuilder
+     */
+    private $imageParamsBuilder;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var PlaceholderFactory
+     */
+    private $viewAssetPlaceholderFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param ConfigInterface $presentationConfig
+     * @param AssetImageFactory $viewAssetImageFactory
+     * @param PlaceholderFactory $viewAssetPlaceholderFactory
+     * @param ParamsBuilder $imageParamsBuilder
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ConfigInterface $presentationConfig,
+        AssetImageFactory $viewAssetImageFactory,
+        PlaceholderFactory $viewAssetPlaceholderFactory,
+        ParamsBuilder $imageParamsBuilder
+    ) {
+        $this->objectManager = $objectManager;
+        $this->presentationConfig = $presentationConfig;
+        $this->viewAssetPlaceholderFactory = $viewAssetPlaceholderFactory;
+        $this->viewAssetImageFactory = $viewAssetImageFactory;
+        $this->imageParamsBuilder = $imageParamsBuilder;
+    }
+
+    /**
+     * Retrieve image custom attributes for HTML element
+     *
+     * @param array $attributes
+     * @return string
+     */
+    private function getStringCustomAttributes(array $attributes): string
+    {
+        $result = [];
+        foreach ($attributes as $name => $value) {
+            if ($name != 'class') {
+                $result[] = $name . '="' . $value . '"';
+            }
+        }
+        return !empty($result) ? implode(' ', $result) : '';
+    }
+
+    /**
+     * Retrieve image class for HTML element
+     *
+     * @param array $attributes
+     * @return string
+     */
+    private function getClass(array $attributes): string
+    {
+        return $attributes['class'] ?? 'product-image-photo';
+    }
+
+    /**
+     * Calculate image ratio
+     *
+     * @param int $width
+     * @param int $height
+     * @return float
+     */
+    private function getRatio(int $width, int $height): float
+    {
+        if ($width && $height) {
+            return $height / $width;
+        }
+        return 1.0;
+    }
+
+    /**
+     * Get image label
+     *
+     * @param Product $product
+     * @param string $imageType
+     * @return string
+     */
+    private function getLabel(Product $product, string $imageType): string
+    {
+        $label = $product->getData($imageType . '_' . 'label');
+        if (empty($label)) {
+            $label = $product->getName();
+        }
+        return (string) $label;
+    }
+
+    /**
+     * Create image block from product
+     *
+     * @param Product $product
+     * @param string $imageId
+     * @param array|null $attributes
+     * @return ImageBlock
+     */
+    public function create(Product $product, string $imageId, array $attributes = null): ImageBlock
+    {
+        $viewImageConfig = $this->presentationConfig->getViewConfig()->getMediaAttributes(
+            'Magento_Catalog',
+            ImageHelper::MEDIA_TYPE_CONFIG_NODE,
+            $imageId
+        );
+
+        $imageMiscParams = $this->imageParamsBuilder->build($viewImageConfig);
+        $originalFilePath = $product->getData($imageMiscParams['image_type']);
+
+        if ($originalFilePath === null || $originalFilePath === 'no_selection') {
+            $imageAsset = $this->viewAssetPlaceholderFactory->create(
+                [
+                    'type' => $imageMiscParams['image_type']
+                ]
+            );
+        } else {
+            $imageAsset = $this->viewAssetImageFactory->create(
+                [
+                    'miscParams' => $imageMiscParams,
+                    'filePath' => $originalFilePath,
+                ]
+            );
+        }
+
+        $data = [
+            'data' => [
+                'template' => 'Magento_Catalog::product/image_with_borders.phtml',
+                'image_url' => $imageAsset->getUrl(),
+                'width' => $imageMiscParams['image_width'],
+                'height' => $imageMiscParams['image_height'],
+                'label' => $this->getLabel($product, $imageMiscParams['image_type']),
+                'ratio' => $this->getRatio($imageMiscParams['image_width'], $imageMiscParams['image_height']),
+                'custom_attributes' => $this->getStringCustomAttributes($attributes),
+                'class' => $this->getClass($attributes),
+                'product_id' => $product->getId()
+            ],
+        ];
+
+        return $this->objectManager->create(ImageBlock::class, $data);
+    }
+}
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 4a7d28c383d8b..c1b255c762dbb 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -9,11 +9,20 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Block\Product\ProductList\Toolbar;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Layer;
+use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Config\Element;
+use Magento\Framework\Data\Helper\PostHelper;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\Url\Helper\Data;
 
 /**
  * Product list
@@ -40,17 +49,17 @@ class ListProduct extends AbstractProduct implements IdentityInterface
     /**
      * Catalog layer
      *
-     * @var \Magento\Catalog\Model\Layer
+     * @var Layer
      */
     protected $_catalogLayer;
 
     /**
-     * @var \Magento\Framework\Data\Helper\PostHelper
+     * @var PostHelper
      */
     protected $_postDataHelper;
 
     /**
-     * @var \Magento\Framework\Url\Helper\Data
+     * @var Data
      */
     protected $urlHelper;
 
@@ -61,18 +70,18 @@ class ListProduct extends AbstractProduct implements IdentityInterface
 
     /**
      * @param Context $context
-     * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
-     * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
+     * @param PostHelper $postDataHelper
+     * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
-     * @param \Magento\Framework\Url\Helper\Data $urlHelper
+     * @param Data $urlHelper
      * @param array $data
      */
     public function __construct(
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
+        Context $context,
+        PostHelper $postDataHelper,
+        Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
+        Data $urlHelper,
         array $data = []
     ) {
         $this->_catalogLayer = $layerResolver->get();
@@ -113,7 +122,7 @@ protected function _getProductCollection()
     /**
      * Get catalog layer model
      *
-     * @return \Magento\Catalog\Model\Layer
+     * @return Layer
      */
     public function getLayer()
     {
@@ -137,7 +146,35 @@ public function getLoadedProductCollection()
      */
     public function getMode()
     {
-        return $this->getChildBlock('toolbar')->getCurrentMode();
+        if ($this->getChildBlock('toolbar')) {
+            return $this->getChildBlock('toolbar')->getCurrentMode();
+        }
+
+        return $this->getDefaultListingMode();
+    }
+
+    /**
+     * Get listing mode for products if toolbar is removed from layout.
+     * Use the general configuration for product list mode from config path catalog/frontend/list_mode as default value
+     * or mode data from block declaration from layout.
+     *
+     * @return string
+     */
+    private function getDefaultListingMode()
+    {
+        // default Toolbar when the toolbar layout is not used
+        $defaultToolbar = $this->getToolbarBlock();
+        $availableModes = $defaultToolbar->getModes();
+
+        // layout config mode
+        $mode = $this->getData('mode');
+
+        if (!$mode || !isset($availableModes[$mode])) {
+            // default config mode
+            $mode = $defaultToolbar->getCurrentMode();
+        }
+
+        return $mode;
     }
 
     /**
@@ -148,28 +185,60 @@ public function getMode()
     protected function _beforeToHtml()
     {
         $collection = $this->_getProductCollection();
-        $this->configureToolbar($this->getToolbarBlock(), $collection);
+
+        $this->addToolbarBlock($collection);
+
         $collection->load();
 
         return parent::_beforeToHtml();
     }
 
     /**
-     * Retrieve Toolbar block
+     * Add toolbar block from product listing layout
+     *
+     * @param Collection $collection
+     */
+    private function addToolbarBlock(Collection $collection)
+    {
+        $toolbarLayout = $this->getToolbarFromLayout();
+
+        if ($toolbarLayout) {
+            $this->configureToolbar($toolbarLayout, $collection);
+        }
+    }
+
+    /**
+     * Retrieve Toolbar block from layout or a default Toolbar
      *
      * @return Toolbar
      */
     public function getToolbarBlock()
+    {
+        $block = $this->getToolbarFromLayout();
+
+        if (!$block) {
+            $block = $this->getLayout()->createBlock($this->_defaultToolbarBlock, uniqid(microtime()));
+        }
+
+        return $block;
+    }
+
+    /**
+     * Get toolbar block from layout
+     *
+     * @return bool|Toolbar
+     */
+    private function getToolbarFromLayout()
     {
         $blockName = $this->getToolbarBlockName();
+
+        $toolbarLayout = false;
+
         if ($blockName) {
-            $block = $this->getLayout()->getBlock($blockName);
-            if ($block) {
-                return $block;
-            }
+            $toolbarLayout = $this->getLayout()->getBlock($blockName);
         }
-        $block = $this->getLayout()->createBlock($this->_defaultToolbarBlock, uniqid(microtime()));
-        return $block;
+
+        return $toolbarLayout;
     }
 
     /**
@@ -203,7 +272,7 @@ public function setCollection($collection)
     }
 
     /**
-     * @param array|string|integer|\Magento\Framework\App\Config\Element $code
+     * @param array|string|integer| Element $code
      * @return $this
      */
     public function addAttribute($code)
@@ -223,7 +292,7 @@ public function getPriceBlockTemplate()
     /**
      * Retrieve Catalog Config object
      *
-     * @return \Magento\Catalog\Model\Config
+     * @return Config
      */
     protected function _getConfig()
     {
@@ -233,8 +302,8 @@ protected function _getConfig()
     /**
      * Prepare Sort By fields from Category Data
      *
-     * @param \Magento\Catalog\Model\Category $category
-     * @return \Magento\Catalog\Block\Product\ListProduct
+     * @param Category $category
+     * @return $this
      */
     public function prepareSortableFieldsByCategory($category)
     {
@@ -286,38 +355,38 @@ public function getIdentities()
     /**
      * Get post parameters
      *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
+     * @param Product $product
+     * @return array
      */
-    public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
+    public function getAddToCartPostParams(Product $product)
     {
         $url = $this->getAddToCartUrl($product);
         return [
             'action' => $url,
             'data' => [
                 'product' => $product->getEntityId(),
-                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
             ]
         ];
     }
 
     /**
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return string
      */
-    public function getProductPrice(\Magento\Catalog\Model\Product $product)
+    public function getProductPrice(Product $product)
     {
         $priceRender = $this->getPriceRender();
 
         $price = '';
         if ($priceRender) {
             $price = $priceRender->render(
-                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                FinalPrice::PRICE_CODE,
                 $product,
                 [
                     'include_container' => true,
                     'display_minimal_price' => true,
-                    'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                    'zone' => Render::ZONE_ITEM_LIST,
                     'list_category_page' => true
                 ]
             );
@@ -330,7 +399,7 @@ public function getProductPrice(\Magento\Catalog\Model\Product $product)
      * Specifies that price rendering should be done for the list of products
      * i.e. rendering happens in the scope of product list, but not single product
      *
-     * @return \Magento\Framework\Pricing\Render
+     * @return Render
      */
     protected function getPriceRender()
     {
@@ -356,7 +425,7 @@ protected function getPriceRender()
     private function initializeProductCollection()
     {
         $layer = $this->getLayer();
-        /* @var $layer \Magento\Catalog\Model\Layer */
+        /* @var $layer Layer */
         if ($this->getShowRootCategory()) {
             $this->setCategoryId($this->_storeManager->getStore()->getRootCategoryId());
         }
@@ -395,8 +464,7 @@ private function initializeProductCollection()
             $layer->setCurrentCategory($origCategory);
         }
 
-        $toolbar = $this->getToolbarBlock();
-        $this->configureToolbar($toolbar, $collection);
+        $this->addToolbarBlock($collection);
 
         $this->_eventManager->dispatch(
             'catalog_block_product_list_collection',
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
index 0c547f81c85d6..596cd7cc5bdce 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Crosssell.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Catalog\Block\Product\ProductList;
 
+/**
+ * Crosssell block for product
+ */
 class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
 {
     /**
@@ -25,7 +28,7 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
      */
     protected function _prepareData()
     {
-        $product = $this->_coreRegistry->registry('product');
+        $product = $this->getProduct();
         /* @var $product \Magento\Catalog\Model\Product */
 
         $this->_itemCollection = $product->getCrossSellProductCollection()->addAttributeToSelect(
@@ -43,6 +46,7 @@ protected function _prepareData()
 
     /**
      * Before rendering html process
+     *
      * Prepare items collection
      *
      * @return \Magento\Catalog\Block\Product\ProductList\Crosssell
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 219922f9e46d5..6de70bb971367 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -77,11 +77,13 @@ public function __construct(
     }
 
     /**
+     * Prepare data
+     *
      * @return $this
      */
     protected function _prepareData()
     {
-        $product = $this->_coreRegistry->registry('product');
+        $product = $this->getProduct();
         /* @var $product \Magento\Catalog\Model\Product */
 
         $this->_itemCollection = $product->getRelatedProductCollection()->addAttributeToSelect(
@@ -103,6 +105,8 @@ protected function _prepareData()
     }
 
     /**
+     * Before to html handler
+     *
      * @return $this
      */
     protected function _beforeToHtml()
@@ -112,6 +116,8 @@ protected function _beforeToHtml()
     }
 
     /**
+     * Get collection items
+     *
      * @return Collection
      */
     public function getItems()
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 46080ab5c3330..c530ba4785ad9 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -7,6 +7,8 @@
 
 use Magento\Catalog\Helper\Product\ProductList;
 use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Product list toolbar
@@ -77,13 +79,14 @@ class Toolbar extends \Magento\Framework\View\Element\Template
 
     /**
      * @var bool $_paramsMemorizeAllowed
+     * @deprecated
      */
     protected $_paramsMemorizeAllowed = true;
 
     /**
      * @var string
      */
-    protected $_template = 'product/list/toolbar.phtml';
+    protected $_template = 'Magento_Catalog::product/list/toolbar.phtml';
 
     /**
      * Catalog config
@@ -96,6 +99,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
+     * @deprecated
      */
     protected $_catalogSession;
 
@@ -104,6 +108,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     protected $_toolbarModel;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * @var ProductList
      */
@@ -119,6 +128,16 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     protected $_postDataHelper;
 
+    /**
+     * @var \Magento\Framework\App\Http\Context
+     */
+    private $httpContext;
+
+    /**
+     * @var \Magento\Framework\Data\Form\FormKey
+     */
+    private $formKey;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Model\Session $catalogSession
@@ -128,6 +147,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param ProductList $productListHelper
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
+     * @param ToolbarMemorizer|null $toolbarMemorizer
+     * @param \Magento\Framework\App\Http\Context|null $httpContext
+     * @param \Magento\Framework\Data\Form\FormKey|null $formKey
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -137,7 +161,10 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         ProductList $productListHelper,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        array $data = []
+        array $data = [],
+        ToolbarMemorizer $toolbarMemorizer = null,
+        \Magento\Framework\App\Http\Context $httpContext = null,
+        \Magento\Framework\Data\Form\FormKey $formKey = null
     ) {
         $this->_catalogSession = $catalogSession;
         $this->_catalogConfig = $catalogConfig;
@@ -145,6 +172,15 @@ public function __construct(
         $this->urlEncoder = $urlEncoder;
         $this->_productListHelper = $productListHelper;
         $this->_postDataHelper = $postDataHelper;
+        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()->get(
+            ToolbarMemorizer::class
+        );
+        $this->httpContext = $httpContext ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\App\Http\Context::class
+        );
+        $this->formKey = $formKey ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\Data\Form\FormKey::class
+        );
         parent::__construct($context, $data);
     }
 
@@ -152,6 +188,7 @@ public function __construct(
      * Disable list state params memorizing
      *
      * @return $this
+     * @deprecated
      */
     public function disableParamsMemorizing()
     {
@@ -165,6 +202,7 @@ public function disableParamsMemorizing()
      * @param string $param parameter name
      * @param mixed $value parameter value
      * @return $this
+     * @deprecated
      */
     protected function _memorizeParam($param, $value)
     {
@@ -196,7 +234,7 @@ public function setCollection($collection)
                 $this->_collection->addAttributeToSort(
                     $this->getCurrentOrder(),
                     $this->getCurrentDirection()
-                )->addAttributeToSort('entity_id', $this->getCurrentDirection());
+                );
             } else {
                 $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection());
             }
@@ -244,13 +282,13 @@ public function getCurrentOrder()
             $defaultOrder = $keys[0];
         }
 
-        $order = $this->_toolbarModel->getOrder();
+        $order = $this->toolbarMemorizer->getOrder();
         if (!$order || !isset($orders[$order])) {
             $order = $defaultOrder;
         }
 
-        if ($order != $defaultOrder) {
-            $this->_memorizeParam('sort_order', $order);
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, $defaultOrder);
         }
 
         $this->setData('_current_grid_order', $order);
@@ -270,13 +308,13 @@ public function getCurrentDirection()
         }
 
         $directions = ['asc', 'desc'];
-        $dir = strtolower($this->_toolbarModel->getDirection());
+        $dir = strtolower($this->toolbarMemorizer->getDirection());
         if (!$dir || !in_array($dir, $directions)) {
             $dir = $this->_direction;
         }
 
-        if ($dir != $this->_direction) {
-            $this->_memorizeParam('sort_direction', $dir);
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $dir, $this->_direction);
         }
 
         $this->setData('_current_grid_direction', $dir);
@@ -392,6 +430,8 @@ public function getPagerUrl($params = [])
     }
 
     /**
+     * Get pager encoded url.
+     *
      * @param array $params
      * @return string
      */
@@ -412,11 +452,15 @@ public function getCurrentMode()
             return $mode;
         }
         $defaultMode = $this->_productListHelper->getDefaultViewMode($this->getModes());
-        $mode = $this->_toolbarModel->getMode();
+        $mode = $this->toolbarMemorizer->getMode();
         if (!$mode || !isset($this->_availableMode[$mode])) {
             $mode = $defaultMode;
         }
 
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, $defaultMode);
+        }
+
         $this->setData('_current_grid_mode', $mode);
         return $mode;
     }
@@ -568,13 +612,13 @@ public function getLimit()
             $defaultLimit = $keys[0];
         }
 
-        $limit = $this->_toolbarModel->getLimit();
+        $limit = $this->toolbarMemorizer->getLimit();
         if (!$limit || !isset($limits[$limit])) {
             $limit = $defaultLimit;
         }
 
-        if ($limit != $defaultLimit) {
-            $this->_memorizeParam('limit_page', $limit);
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, $defaultLimit);
         }
 
         $this->setData('_current_limit', $limit);
@@ -582,6 +626,8 @@ public function getLimit()
     }
 
     /**
+     * Check if limit is current used in toolbar.
+     *
      * @param int $limit
      * @return bool
      */
@@ -591,6 +637,8 @@ public function isLimitCurrent($limit)
     }
 
     /**
+     * Pager number of items from which products started on current page.
+     *
      * @return int
      */
     public function getFirstNum()
@@ -600,6 +648,8 @@ public function getFirstNum()
     }
 
     /**
+     * Pager number of items products finished on current page.
+     *
      * @return int
      */
     public function getLastNum()
@@ -609,6 +659,8 @@ public function getLastNum()
     }
 
     /**
+     * Total number of products in current category.
+     *
      * @return int
      */
     public function getTotalNum()
@@ -617,6 +669,8 @@ public function getTotalNum()
     }
 
     /**
+     * Check if current page is the first.
+     *
      * @return bool
      */
     public function isFirstPage()
@@ -625,6 +679,8 @@ public function isFirstPage()
     }
 
     /**
+     * Return last page number.
+     *
      * @return int
      */
     public function getLastPageNum()
@@ -689,9 +745,11 @@ public function getWidgetOptionsJson(array $customOptions = [])
             'limit' => ToolbarModel::LIMIT_PARAM_NAME,
             'modeDefault' => $defaultMode,
             'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
-            'orderDefault' => $this->_productListHelper->getDefaultSortField(),
+            'orderDefault' => $this->getOrderField(),
             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
+            'formKey' => $this->formKey->getFormKey(),
+            'post' => $this->toolbarMemorizer->isMemorizingAllowed() ? true : false
         ];
         $options = array_replace_recursive($options, $customOptions);
         return json_encode(['productListToolbarForm' => $options]);
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index 10aebf270579d..24822447ae915 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Block\Product\ProductList;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Framework\View\Element\AbstractBlock;
 
 /**
  * Catalog product upsell items block
@@ -92,11 +91,13 @@ public function __construct(
     }
 
     /**
+     * Prepare data
+     *
      * @return $this
      */
     protected function _prepareData()
     {
-        $product = $this->_coreRegistry->registry('product');
+        $product = $this->getProduct();
         /* @var $product \Magento\Catalog\Model\Product */
         $this->_itemCollection = $product->getUpSellProductCollection()->setPositionOrder()->addStoreFilter();
         if ($this->moduleManager->isEnabled('Magento_Checkout')) {
@@ -122,6 +123,8 @@ protected function _prepareData()
     }
 
     /**
+     * Before to html handler
+     *
      * @return $this
      */
     protected function _beforeToHtml()
@@ -131,6 +134,8 @@ protected function _beforeToHtml()
     }
 
     /**
+     * Get items collection
+     *
      * @return Collection
      */
     public function getItemCollection()
@@ -146,6 +151,8 @@ public function getItemCollection()
     }
 
     /**
+     * Get collection items
+     *
      * @return \Magento\Framework\DataObject[]
      */
     public function getItems()
@@ -157,6 +164,8 @@ public function getItems()
     }
 
     /**
+     * Get row count
+     *
      * @return float
      */
     public function getRowCount()
@@ -165,18 +174,22 @@ public function getRowCount()
     }
 
     /**
+     * Set column count
+     *
      * @param string $columns
      * @return $this
      */
     public function setColumnCount($columns)
     {
-        if (intval($columns) > 0) {
-            $this->_columnCount = intval($columns);
+        if ((int) $columns > 0) {
+            $this->_columnCount = (int) $columns;
         }
         return $this;
     }
 
     /**
+     * Get column count
+     *
      * @return int
      */
     public function getColumnCount()
@@ -185,6 +198,8 @@ public function getColumnCount()
     }
 
     /**
+     * Reset items iterator
+     *
      * @return void
      */
     public function resetItemsIterator()
@@ -194,6 +209,8 @@ public function resetItemsIterator()
     }
 
     /**
+     * Get iterable item
+     *
      * @return mixed
      */
     public function getIterableItem()
@@ -205,6 +222,7 @@ public function getIterableItem()
 
     /**
      * Set how many items we need to show in upsell block
+     *
      * Notice: this parameter will be also applied
      *
      * @param string $type
@@ -213,13 +231,15 @@ public function getIterableItem()
      */
     public function setItemLimit($type, $limit)
     {
-        if (intval($limit) > 0) {
-            $this->_itemLimits[$type] = intval($limit);
+        if ((int) $limit > 0) {
+            $this->_itemLimits[$type] = (int) $limit;
         }
         return $this;
     }
 
     /**
+     * Get item limit
+     *
      * @param string $type
      * @return array|int
      */
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index b3b5dea9602f6..8055d17a64a84 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -120,51 +120,6 @@ public function getWishlistOptions()
         return ['productType' => $this->getProduct()->getTypeId()];
     }
 
-    /**
-     * Add meta information from product to head block
-     *
-     * @return \Magento\Catalog\Block\Product\View
-     */
-    protected function _prepareLayout()
-    {
-        $this->getLayout()->createBlock(\Magento\Catalog\Block\Breadcrumbs::class);
-        $product = $this->getProduct();
-        if (!$product) {
-            return parent::_prepareLayout();
-        }
-
-        $title = $product->getMetaTitle();
-        if ($title) {
-            $this->pageConfig->getTitle()->set($title);
-        }
-        $keyword = $product->getMetaKeyword();
-        $currentCategory = $this->_coreRegistry->registry('current_category');
-        if ($keyword) {
-            $this->pageConfig->setKeywords($keyword);
-        } elseif ($currentCategory) {
-            $this->pageConfig->setKeywords($product->getName());
-        }
-        $description = $product->getMetaDescription();
-        if ($description) {
-            $this->pageConfig->setDescription($description);
-        } else {
-            $this->pageConfig->setDescription($this->string->substr($product->getDescription(), 0, 255));
-        }
-        if ($this->_productHelper->canUseCanonicalTag()) {
-            $this->pageConfig->addRemotePageAsset(
-                $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]),
-                'canonical',
-                ['attributes' => ['rel' => 'canonical']]
-            );
-        }
-
-        $pageMainTitle = $this->getLayout()->getBlock('page.main.title');
-        if ($pageMainTitle) {
-            $pageMainTitle->setPageTitle($product->getName());
-        }
-        return parent::_prepareLayout();
-    }
-
     /**
      * Retrieve current product model
      *
diff --git a/app/code/Magento/Catalog/Block/Product/View/Additional.php b/app/code/Magento/Catalog/Block/Product/View/Additional.php
index 37c82c2bc84c8..66527985e41fd 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Additional.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Additional.php
@@ -25,7 +25,7 @@ class Additional extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'product/view/additional.phtml';
+    protected $_template = 'Magento_Catalog::product/view/additional.phtml';
 
     /**
      * @return array
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
index b353e477a056c..cb59d86a74512 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -67,12 +67,11 @@ public function getProduct()
     }
 
     /**
-     * $excludeAttr is optional array of attribute codes to
-     * exclude them from additional data array
+     * $excludeAttr is optional array of attribute codes to exclude them from additional data array
      *
      * @param array $excludeAttr
      * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAdditionalData(array $excludeAttr = [])
     {
@@ -80,7 +79,7 @@ public function getAdditionalData(array $excludeAttr = [])
         $product = $this->getProduct();
         $attributes = $product->getAttributes();
         foreach ($attributes as $attribute) {
-            if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) {
+            if ($this->isVisibleOnFrontend($attribute, $excludeAttr)) {
                 $value = $attribute->getFrontend()->getValue($product);
 
                 if ($value instanceof Phrase) {
@@ -100,4 +99,18 @@ public function getAdditionalData(array $excludeAttr = [])
         }
         return $data;
     }
+
+    /**
+     * Determine if we should display the attribute on the front-end
+     *
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
+     * @param array $excludeAttr
+     * @return bool
+     */
+    protected function isVisibleOnFrontend(
+        \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
+        array $excludeAttr
+    ) {
+        return ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr));
+    }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index 90e89acfba77a..706d9b83b9711 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -15,6 +15,7 @@
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface;
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\Framework\Data\Collection;
 use Magento\Framework\DataObject;
 use Magento\Framework\App\ObjectManager;
@@ -22,6 +23,8 @@
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
+ * Product gallery block
+ *
  * @api
  * @since 100.0.2
  */
@@ -47,13 +50,19 @@ class Gallery extends AbstractView
      */
     private $galleryImagesConfigFactory;
 
+    /**
+     * @var UrlBuilder
+     */
+    private $imageUrlBuilder;
+
     /**
      * @param Context $context
      * @param ArrayUtils $arrayUtils
      * @param EncoderInterface $jsonEncoder
      * @param array $data
-     * @param ImagesConfigFactoryInterface $imagesConfigFactory
+     * @param ImagesConfigFactoryInterface|null $imagesConfigFactory
      * @param array $galleryImagesConfig
+     * @param UrlBuilder|null $urlBuilder
      */
     public function __construct(
         Context $context,
@@ -61,13 +70,15 @@ public function __construct(
         EncoderInterface $jsonEncoder,
         array $data = [],
         ImagesConfigFactoryInterface $imagesConfigFactory = null,
-        array $galleryImagesConfig = []
+        array $galleryImagesConfig = [],
+        UrlBuilder $urlBuilder = null
     ) {
         parent::__construct($context, $arrayUtils, $data);
         $this->jsonEncoder = $jsonEncoder;
         $this->galleryImagesConfigFactory = $imagesConfigFactory ?: ObjectManager::getInstance()
             ->get(ImagesConfigFactoryInterface::class);
         $this->galleryImagesConfig = $galleryImagesConfig;
+        $this->imageUrlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
     }
 
     /**
@@ -88,9 +99,7 @@ public function getGalleryImages()
             foreach ($galleryImagesConfig as $imageConfig) {
                 $image->setData(
                     $imageConfig->getData('data_object_key'),
-                    $this->_imageHelper->init($product, $imageConfig['image_id'])
-                        ->setImageFile($image->getData('file'))
-                        ->getUrl()
+                    $this->imageUrlBuilder->getUrl($image->getFile(), $imageConfig['image_id'])
                 );
             }
         }
@@ -132,7 +141,7 @@ public function getGalleryImagesJson()
                 'thumb' => $image->getData('small_image_url'),
                 'img' => $image->getData('medium_image_url'),
                 'full' => $image->getData('large_image_url'),
-                'caption'  => $image->getData('label'),
+                'caption' => ($image->getLabel() ?: $this->getProduct()->getName()),
                 'position' => $image->getData('position'),
                 'isMain'   => $this->isMainImage($image),
                 'type' => str_replace('external-', '', $image->getMediaType()),
@@ -189,6 +198,8 @@ public function isMainImage($image)
     }
 
     /**
+     * Returns image attribute
+     *
      * @param string $imageId
      * @param string $attributeName
      * @param string $default
@@ -198,7 +209,7 @@ public function getImageAttribute($imageId, $attributeName, $default = null)
     {
         $attributes =
             $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
-        return isset($attributes[$attributeName]) ? $attributes[$attributeName] : $default;
+        return $attributes[$attributeName] ?? $default;
     }
 
     /**
@@ -215,6 +226,8 @@ private function getConfigView()
     }
 
     /**
+     * Returns image gallery config object
+     *
      * @return Collection
      */
     private function getGalleryImagesConfig()
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 66bf5eafb156e..181211a0fc4a2 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -105,9 +105,11 @@ public function getOption()
     }
 
     /**
+     * Retrieve formatted price
+     *
      * @return string
      */
-    public function getFormatedPrice()
+    public function getFormattedPrice()
     {
         if ($option = $this->getOption()) {
             return $this->_formatPrice(
@@ -120,6 +122,17 @@ public function getFormatedPrice()
         return '';
     }
 
+    /**
+     * @return string
+     *
+     * @deprecated
+     * @see getFormattedPrice()
+     */
+    public function getFormatedPrice()
+    {
+        return $this->getFormattedPrice();
+    }
+
     /**
      * Return formated price
      *
@@ -178,7 +191,7 @@ public function getPrice($price, $includingTax = null)
      * Returns price converted to current currency rate
      *
      * @param float $price
-     * @return float
+     * @return float|string
      */
     public function getCurrencyPrice($price)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index d546ef483132b..7df9b972e1501 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -44,9 +44,9 @@ public function getValuesHtml()
                 ]
             );
             if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
-                $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
+                $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
             } else {
-                $select->setName('options[' . $_option->getid() . '][]');
+                $select->setName('options[' . $_option->getId() . '][]');
                 $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
             }
             foreach ($_option->getValues() as $_value) {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Price.php b/app/code/Magento/Catalog/Block/Product/View/Price.php
index c38625247b533..37598dfb1a8da 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Price.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Price.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\Catalog\Block\Product\View;
 
+use Magento\Catalog\Model\Product;
+
 class Price extends \Magento\Framework\View\Element\Template
 {
     /**
@@ -37,7 +39,8 @@ public function __construct(
      */
     public function getPrice()
     {
+        /** @var Product $product */
         $product = $this->_coreRegistry->registry('product');
-        return $product->getFormatedPrice();
+        return $product->getFormattedPrice();
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
index 704271b58f483..b4c24231a7415 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
@@ -139,7 +139,7 @@ public function getCacheKeyInfo()
             [
                 $this->getDisplayType(),
                 $this->getProductsPerPage(),
-                intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
+                (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
                 $this->serializer->serialize($this->getRequest()->getParams())
             ]
         );
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index c61bee4417cbc..a9107f14cc5e4 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -107,7 +107,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getRssData()
     {
diff --git a/app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php b/app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php
index 1f0d6728561f0..7f337e3d924ba 100644
--- a/app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php
+++ b/app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php
@@ -8,7 +8,7 @@
 use Magento\Ui\Block\Wrapper;
 
 /**
- * Dynamicly creates recently compared widget ui component, using information
+ * Dynamically creates recently compared widget ui component, using information
  * from widget instance and Catalog/widget.xml
  */
 class RecentlyCompared extends Wrapper implements \Magento\Widget\Block\BlockInterface
diff --git a/app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php b/app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php
index 57cce42470ebe..ee78e73456376 100644
--- a/app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php
+++ b/app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php
@@ -8,7 +8,7 @@
 use Magento\Ui\Block\Wrapper;
 
 /**
- * Dynamicly creates recently viewed widget ui component, using information
+ * Dynamically creates recently viewed widget ui component, using information
  * from widget instance and Catalog/widget.xml
  */
 class RecentlyViewed extends Wrapper implements \Magento\Widget\Block\BlockInterface
diff --git a/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php b/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php
deleted file mode 100644
index 49f82562f33db..0000000000000
--- a/app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Console\Command;
-
-class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
-{
-    /**
-     * @var \Magento\Framework\App\State
-     */
-    protected $appState;
-
-    /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     */
-    protected $productCollectionFactory;
-
-    /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     */
-    protected $productRepository;
-
-    /**
-     * @var \Magento\Catalog\Model\Product\Image\CacheFactory
-     */
-    protected $imageCacheFactory;
-
-    /**
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @param \Magento\Catalog\Model\Product\Image\CacheFactory $imageCacheFactory
-     */
-    public function __construct(
-        \Magento\Framework\App\State $appState,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-        \Magento\Catalog\Model\Product\Image\CacheFactory $imageCacheFactory
-    ) {
-        $this->appState = $appState;
-        $this->productCollectionFactory = $productCollectionFactory;
-        $this->productRepository = $productRepository;
-        $this->imageCacheFactory = $imageCacheFactory;
-        parent::__construct();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this->setName('catalog:images:resize')
-            ->setDescription('Creates resized product images');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(
-        \Symfony\Component\Console\Input\InputInterface $input,
-        \Symfony\Component\Console\Output\OutputInterface $output
-    ) {
-        $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_GLOBAL);
-
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
-        $productCollection = $this->productCollectionFactory->create();
-        $productIds = $productCollection->getAllIds();
-        if (!count($productIds)) {
-            $output->writeln("<info>No product images to resize</info>");
-            // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-        }
-
-        try {
-            foreach ($productIds as $productId) {
-                try {
-                    /** @var \Magento\Catalog\Model\Product $product */
-                    $product = $this->productRepository->getById($productId);
-                } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-                    continue;
-                }
-
-                /** @var \Magento\Catalog\Model\Product\Image\Cache $imageCache */
-                $imageCache = $this->imageCacheFactory->create();
-                $imageCache->generate($product);
-
-                $output->write(".");
-            }
-        } catch (\Exception $e) {
-            $output->writeln("<error>{$e->getMessage()}</error>");
-            // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-        }
-
-        $output->write("\n");
-        $output->writeln("<info>Product images resized successfully</info>");
-    }
-}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index 13c4353e65204..1e0cb9f197a51 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Store\Model\Store;
+
 /**
  * Catalog category controller
  */
@@ -44,7 +48,7 @@ public function __construct(
     protected function _initCategory($getRootInstead = false)
     {
         $categoryId = $this->resolveCategoryId();
-        $storeId = (int)$this->getRequest()->getParam('store');
+        $storeId = $this->resolveStoreId();
         $category = $this->_objectManager->create(\Magento\Catalog\Model\Category::class);
         $category->setStoreId($storeId);
 
@@ -70,7 +74,7 @@ protected function _initCategory($getRootInstead = false)
         $this->_objectManager->get(\Magento\Framework\Registry::class)->register('category', $category);
         $this->_objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
         $this->_objectManager->get(\Magento\Cms\Model\Wysiwyg\Config::class)
-            ->setStoreId($this->getRequest()->getParam('store'));
+            ->setStoreId($storeId);
         return $category;
     }
 
@@ -79,13 +83,28 @@ protected function _initCategory($getRootInstead = false)
      *
      * @return int
      */
-    private function resolveCategoryId()
+    private function resolveCategoryId() : int
     {
         $categoryId = (int)$this->getRequest()->getParam('id', false);
 
         return $categoryId ?: (int)$this->getRequest()->getParam('entity_id', false);
     }
 
+    /**
+     * Resolve store id
+     *
+     * Tries to take store id from store HTTP parameter
+     * @see Store
+     *
+     * @return int
+     */
+    private function resolveStoreId() : int
+    {
+        $storeId = (int)$this->getRequest()->getParam('store', false);
+
+        return $storeId ?: (int)$this->getRequest()->getParam('store_id', Store::DEFAULT_STORE_ID);
+    }
+
     /**
      * Build response for ajax request
      *
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
index 6456b6d578bbb..733e270174e4c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
@@ -6,12 +6,14 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
 /**
  * Class Add Category
  *
  * @package Magento\Catalog\Controller\Adminhtml\Category
  */
-class Add extends \Magento\Catalog\Controller\Adminhtml\Category
+class Add extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
      * Forward factory for result
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
index b8865f2de8d1e..752257f5b9009 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
-class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
index 8f570e35989cb..39122d139c90b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
-class Delete extends \Magento\Catalog\Controller\Adminhtml\Category
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
@@ -44,12 +46,12 @@ public function execute()
                 $this->_eventManager->dispatch('catalog_controller_category_delete', ['category' => $category]);
                 $this->_auth->getAuthStorage()->setDeletedPath($category->getPath());
                 $this->categoryRepository->delete($category);
-                $this->messageManager->addSuccess(__('You deleted the category.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the category.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while trying to delete the category.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while trying to delete the category.'));
                 return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
             }
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index 6ff478e49a30c..0450ff1607a09 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
-class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php
index 4cc0f2d89d179..d1efa0014d42d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category\Image;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Upload
  */
-class Upload extends \Magento\Backend\App\Action
+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Image uploader
@@ -54,14 +55,6 @@ public function execute()
 
         try {
             $result = $this->imageUploader->saveFileToTmpDir($imageId);
-
-            $result['cookie'] = [
-                'name' => $this->_getSession()->getName(),
-                'value' => $this->_getSession()->getSessionId(),
-                'lifetime' => $this->_getSession()->getCookieLifetime(),
-                'path' => $this->_getSession()->getCookiePath(),
-                'domain' => $this->_getSession()->getCookieDomain(),
-            ];
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
index 902d71775a3d8..a5be6223bee75 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php
@@ -6,7 +6,12 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
-class Index extends \Magento\Catalog\Controller\Adminhtml\Category
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+/**
+ * Controller for category listing
+ */
+class Index extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index df2c80eda141c..ba6bfddca9c6c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
-class Move extends \Magento\Catalog\Controller\Adminhtml\Category
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
@@ -26,7 +28,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory,
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
index 962cd52d39338..046ebbb119e5b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
-class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
@@ -38,7 +40,11 @@ public function execute()
 
             /** @var \Magento\Framework\Controller\Result\Json $resultJson */
             $resultJson = $this->resultJsonFactory->create();
-            return $resultJson->setData(['id' => $categoryId, 'path' => $category->getPath()]);
+            return $resultJson->setData([
+                'id' => $categoryId,
+                'path' => $category->getPath(),
+                'parentId' => $category->getParentId(),
+            ]);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index d1ec3be1a8895..11c0a73a73708 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Catalog\Api\Data\CategoryAttributeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -13,7 +15,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Catalog\Controller\Adminhtml\Category
+class Save extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
@@ -126,8 +128,7 @@ public function execute()
             return $resultRedirect->setPath('catalog/*/', ['_current' => true, 'id' => null]);
         }
 
-        $data['general'] = $this->getRequest()->getPostValue();
-        $categoryPostData = $data['general'];
+        $categoryPostData = $this->getRequest()->getPostValue();
 
         $isNewCategory = !isset($categoryPostData['entity_id']);
         $categoryPostData = $this->stringToBoolConverting($categoryPostData);
@@ -139,6 +140,9 @@ public function execute()
         $parentId = isset($categoryPostData['parent']) ? $categoryPostData['parent'] : null;
         if ($categoryPostData) {
             $category->addData($categoryPostData);
+            if ($parentId) {
+                $category->setParentId($parentId);
+            }
             if ($isNewCategory) {
                 $parentCategory = $this->getParentCategory($parentId, $storeId);
                 $category->setPath($parentCategory->getPath());
@@ -202,7 +206,7 @@ public function execute()
                         if ($error === true) {
                             $attribute = $categoryResource->getAttribute($code)->getFrontend()->getLabel();
                             throw new \Magento\Framework\Exception\LocalizedException(
-                                __('Attribute "%1" is required.', $attribute)
+                                __('The "%1" attribute is required. Enter and try again.', $attribute)
                             );
                         } else {
                             throw new \Exception($error);
@@ -277,7 +281,7 @@ public function imagePreprocessing($data)
                 continue;
             }
 
-            $data[$attributeCode] = false;
+            $data[$attributeCode] = '';
         }
 
         return $data;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
index 4eda49068ac3a..66a5fb1008a78 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
@@ -5,10 +5,14 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Catalog\Controller\Adminhtml\Category as CategoryAction;
+
 /**
  * Catalog category validate
  */
-class Validate extends \Magento\Catalog\Controller\Adminhtml\Category
+class Validate extends CategoryAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index 775097c5eba1d..ca7652ebb43b5 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -54,7 +54,7 @@ protected function _validateProducts()
         }
 
         if ($error) {
-            $this->messageManager->addError($error);
+            $this->messageManager->addErrorMessage($error);
         }
 
         return !$error;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
index 7eb391dedf81c..3cba09b1e8e9a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
@@ -6,10 +6,18 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction;
 
-class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
+/**
+ * Form for mass updatings products' attributes.
+ * Can be accessed by GET since it's a form,
+ * can be accessed by POST since it's used as a processor of a mass-action button.
+ */
+class Edit extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 82496446aef9f..0730e7a7c5dc1 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,13 +6,14 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
 /**
  * Class Save
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
+class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
@@ -192,7 +193,7 @@ public function execute()
                 $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
             }
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
             );
 
@@ -205,9 +206,9 @@ public function execute()
                 $this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('Something went wrong while updating the product(s) attributes.')
             );
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
index bb18436be6102..30a6629dd1c29 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
-class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction;
+
+class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
@@ -68,7 +72,7 @@ public function execute()
             $response->setError(true);
             $response->setMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('Something went wrong while updating the product(s) attributes.')
             );
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
index 174f06c2ea030..09eacbbf0731c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Api\AttributeSetRepositoryInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Eav\Api\AttributeGroupRepositoryInterface;
 use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Eav\Api\AttributeRepositoryInterface;
@@ -15,8 +18,14 @@
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Api\Data\AttributeSetInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 
 /**
@@ -24,10 +33,10 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Product
+class AddAttributeToTemplate extends Product implements HttpPostActionInterface
 {
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var JsonFactory
      */
     protected $resultJsonFactory;
 
@@ -74,33 +83,34 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
     /**
      * Constructor
      *
-     * @param \Magento\Backend\App\Action\Context $context
+     * @param Context $context
      * @param Builder $productBuilder
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory|null $attributeGroupFactory
+     * @param JsonFactory $resultJsonFactory
+     * @param AttributeGroupInterfaceFactory|null $attributeGroupFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.LongVariable)
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory $attributeGroupFactory = null
+        Context $context,
+        Builder $productBuilder,
+        JsonFactory $resultJsonFactory,
+        AttributeGroupInterfaceFactory $attributeGroupFactory = null
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultJsonFactory = $resultJsonFactory;
-        $this->attributeGroupFactory = $attributeGroupFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Eav\Api\Data\AttributeGroupInterfaceFactory::class);
+        $this->attributeGroupFactory = $attributeGroupFactory ?: ObjectManager::getInstance()
+            ->get(AttributeGroupInterfaceFactory::class);
     }
 
     /**
      * Add attribute to attribute set
      *
-     * @return \Magento\Framework\Controller\Result\Json
+     * @return Json
      */
     public function execute()
     {
         $request = $this->getRequest();
-        $response = new \Magento\Framework\DataObject();
+        $response = new DataObject();
         $response->setError(false);
 
         try {
@@ -123,12 +133,12 @@ public function execute()
                     ->getItems();
 
                 if (!$attributeGroupItems) {
-                    throw new \Magento\Framework\Exception\NoSuchEntityException;
+                    throw new NoSuchEntityException;
                 }
 
                 /** @var AttributeGroupInterface $attributeGroup */
                 $attributeGroup = reset($attributeGroupItems);
-            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            } catch (NoSuchEntityException $e) {
                 /** @var AttributeGroupInterface $attributeGroup */
                 $attributeGroup = $this->attributeGroupFactory->create();
             }
@@ -175,101 +185,114 @@ public function execute()
      * Adding basic filters
      *
      * @return SearchCriteriaBuilder
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function getBasicAttributeSearchCriteriaBuilder()
     {
-        $attributeIds = (array)$this->getRequest()->getParam('attributeIds', []);
+        $attributeIds = (array) $this->getRequest()->getParam('attributeIds', []);
 
         if (empty($attributeIds['selected'])) {
-            throw new LocalizedException(__('Please, specify attributes'));
+            throw new LocalizedException(__('Attributes were missing and must be specified.'));
         }
 
         return $this->getSearchCriteriaBuilder()
-            ->addFilter('attribute_set_id', new \Zend_Db_Expr('null'), 'is')
             ->addFilter('attribute_id', [$attributeIds['selected']], 'in');
     }
 
     /**
+     * Get AttributeRepositoryInterface
+     *
      * @return AttributeRepositoryInterface
      */
     private function getAttributeRepository()
     {
         if (null === $this->attributeRepository) {
-            $this->attributeRepository = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+            $this->attributeRepository = ObjectManager::getInstance()
+                ->get(AttributeRepositoryInterface::class);
         }
         return $this->attributeRepository;
     }
 
     /**
+     * Get AttributeSetRepositoryInterface
+     *
      * @return AttributeSetRepositoryInterface
      */
     private function getAttributeSetRepository()
     {
         if (null === $this->attributeSetRepository) {
-            $this->attributeSetRepository = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Api\AttributeSetRepositoryInterface::class);
+            $this->attributeSetRepository = ObjectManager::getInstance()
+                ->get(AttributeSetRepositoryInterface::class);
         }
         return $this->attributeSetRepository;
     }
 
     /**
+     * Get AttributeGroupInterface
+     *
      * @return AttributeGroupRepositoryInterface
      */
     private function getAttributeGroupRepository()
     {
         if (null === $this->attributeGroupRepository) {
-            $this->attributeGroupRepository = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Eav\Api\AttributeGroupRepositoryInterface::class);
+            $this->attributeGroupRepository = ObjectManager::getInstance()
+                ->get(AttributeGroupRepositoryInterface::class);
         }
         return $this->attributeGroupRepository;
     }
 
     /**
+     * Get SearchCriteriaBuilder
+     *
      * @return SearchCriteriaBuilder
      */
     private function getSearchCriteriaBuilder()
     {
         if (null === $this->searchCriteriaBuilder) {
-            $this->searchCriteriaBuilder = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+            $this->searchCriteriaBuilder = ObjectManager::getInstance()
+                ->get(SearchCriteriaBuilder::class);
         }
         return $this->searchCriteriaBuilder;
     }
 
     /**
+     * Get AttributeManagementInterface
+     *
      * @return AttributeManagementInterface
      */
     private function getAttributeManagement()
     {
         if (null === $this->attributeManagement) {
-            $this->attributeManagement = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Eav\Api\AttributeManagementInterface::class);
+            $this->attributeManagement = ObjectManager::getInstance()
+                ->get(AttributeManagementInterface::class);
         }
         return $this->attributeManagement;
     }
 
     /**
+     * Get LoggerInterface
+     *
      * @return LoggerInterface
      */
     private function getLogger()
     {
         if (null === $this->logger) {
-            $this->logger = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Psr\Log\LoggerInterface::class);
+            $this->logger = ObjectManager::getInstance()
+                ->get(LoggerInterface::class);
         }
         return $this->logger;
     }
 
     /**
+     * Get ExtensionAttributesFactory.
+     *
      * @return ExtensionAttributesFactory
      */
     private function getExtensionAttributesFactory()
     {
         if (null === $this->extensionAttributesFactory) {
-            $this->extensionAttributesFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Api\ExtensionAttributesFactory::class);
+            $this->extensionAttributesFactory = ObjectManager::getInstance()
+                ->get(ExtensionAttributesFactory::class);
         }
         return $this->extensionAttributesFactory;
     }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
index cc5a658a9296d..faa9e4ddf49b4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
-class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
@@ -21,23 +23,23 @@ public function execute()
             // entity type check
             $model->load($id);
             if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                $this->messageManager->addError(__('We can\'t delete the attribute.'));
+                $this->messageManager->addErrorMessage(__('We can\'t delete the attribute.'));
                 return $resultRedirect->setPath('catalog/*/');
             }
 
             try {
                 $model->delete();
-                $this->messageManager->addSuccess(__('You deleted the product attribute.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the product attribute.'));
                 return $resultRedirect->setPath('catalog/*/');
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 return $resultRedirect->setPath(
                     'catalog/*/edit',
                     ['attribute_id' => $this->getRequest()->getParam('attribute_id')]
                 );
             }
         }
-        $this->messageManager->addError(__('We can\'t find an attribute to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find an attribute to delete.'));
         return $resultRedirect->setPath('catalog/*/');
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
index 5a9f244a2bbe1..a41cd71aea463 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
-class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
@@ -25,14 +27,14 @@ public function execute()
             $model->load($id);
 
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This attribute no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('catalog/*/');
             }
 
             // entity type check
             if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                $this->messageManager->addError(__('This attribute cannot be edited.'));
+                $this->messageManager->addErrorMessage(__('This attribute cannot be edited.'));
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('catalog/*/');
             }
@@ -40,9 +42,13 @@ public function execute()
 
         // set entered data if was error when we do save
         $data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAttributeData(true);
+        $presentation = $this->_objectManager->get(
+            \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class
+        );
         if (!empty($data)) {
             $model->addData($data);
         }
+        $model->setFrontendInput($presentation->getPresentationInputType($model));
         $attributeData = $this->getRequest()->getParam('attribute');
         if (!empty($attributeData) && $id === null) {
             $model->addData($attributeData);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
index 9bdc54b289c20..34267121f9b8b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
-class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
index e954d9730591c..fdfde7e806096 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
-class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 30f681dcc643d..39ed11b1806cd 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -7,17 +7,21 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 use Magento\Catalog\Helper\Product;
+use Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation;
+use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
 use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
@@ -29,9 +33,11 @@
 use Magento\Framework\View\Result\PageFactory;
 
 /**
+ * Product attribute save controller.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends Attribute
+class Save extends Attribute implements HttpPostActionInterface
 {
     /**
      * @var BuildFactory
@@ -68,18 +74,30 @@ class Save extends Attribute
      */
     private $layoutFactory;
 
+    /**
+     * @var Presentation
+     */
+    private $presentation;
+
+    /**
+     * @var FormData|null
+     */
+    private $formDataSerializer;
+
     /**
      * @param Context $context
      * @param FrontendInterface $attributeLabelCache
      * @param Registry $coreRegistry
-     * @param BuildFactory $buildFactory
      * @param PageFactory $resultPageFactory
+     * @param BuildFactory $buildFactory
      * @param AttributeFactory $attributeFactory
      * @param ValidatorFactory $validatorFactory
      * @param CollectionFactory $groupCollectionFactory
      * @param FilterManager $filterManager
      * @param Product $productHelper
      * @param LayoutFactory $layoutFactory
+     * @param Presentation|null $presentation
+     * @param FormData|null $formDataSerializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -93,7 +111,9 @@ public function __construct(
         CollectionFactory $groupCollectionFactory,
         FilterManager $filterManager,
         Product $productHelper,
-        LayoutFactory $layoutFactory
+        LayoutFactory $layoutFactory,
+        Presentation $presentation = null,
+        FormData $formDataSerializer = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->buildFactory = $buildFactory;
@@ -103,17 +123,38 @@ public function __construct(
         $this->validatorFactory = $validatorFactory;
         $this->groupCollectionFactory = $groupCollectionFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->presentation = $presentation ?: ObjectManager::getInstance()->get(Presentation::class);
+        $this->formDataSerializer = $formDataSerializer
+            ?: ObjectManager::getInstance()->get(FormData::class);
     }
 
     /**
+     * @inheritdoc
+     *
      * @return Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Zend_Validate_Exception
      */
     public function execute()
     {
+        try {
+            $optionData = $this->formDataSerializer
+                ->unserialize($this->getRequest()->getParam('serialized_options', '[]'));
+        } catch (\InvalidArgumentException $e) {
+            $message = __("The attribute couldn't be saved due to an error. Verify your information and try again. "
+                . "If the error persists, please try again later.");
+            $this->messageManager->addErrorMessage($message);
+            return $this->returnResult('catalog/*/edit', ['_current' => true], ['error' => true]);
+        }
+
         $data = $this->getRequest()->getPostValue();
+        $data = array_replace_recursive(
+            $data,
+            $optionData
+        );
+
         if ($data) {
             $setId = $this->getRequest()->getParam('set');
 
@@ -123,7 +164,7 @@ public function execute()
                 $name = trim($name);
 
                 try {
-                    /** @var $attributeSet Set */
+                    /** @var Set $attributeSet */
                     $attributeSet = $this->buildFactory->create()
                         ->setEntityTypeId($this->_entityTypeId)
                         ->setSkeletonId($setId)
@@ -145,7 +186,7 @@ public function execute()
 
             $attributeId = $this->getRequest()->getParam('attribute_id');
 
-            /** @var $model ProductAttributeInterface */
+            /** @var ProductAttributeInterface $model */
             $model = $this->attributeFactory->create();
             if ($attributeId) {
                 $model->load($attributeId);
@@ -156,12 +197,12 @@ public function execute()
             $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
             if (strlen($attributeCode) > 0) {
                 $validatorAttrCode = new \Zend_Validate_Regex(
-                    ['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']
+                    ['pattern' => '/^[a-zA-Z\x{600}-\x{6FF}][a-zA-Z\x{600}-\x{6FF}_0-9]{0,30}$/u']
                 );
                 if (!$validatorAttrCode->isValid($attributeCode)) {
                     $this->messageManager->addErrorMessage(
                         __(
-                            'Attribute code "%1" is invalid. Please use only letters (a-z), ' .
+                            'Attribute code "%1" is invalid. Please use only letters (a-z or A-Z), ' .
                             'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
                             $attributeCode
                         )
@@ -177,7 +218,7 @@ public function execute()
 
             //validate frontend_input
             if (isset($data['frontend_input'])) {
-                /** @var $inputType Validator */
+                /** @var Validator $inputType */
                 $inputType = $this->validatorFactory->create();
                 if (!$inputType->isValid($data['frontend_input'])) {
                     foreach ($inputType->getMessages() as $message) {
@@ -191,6 +232,8 @@ public function execute()
                 }
             }
 
+            $data = $this->presentation->convertPresentationDataToInputType($data);
+
             if ($attributeId) {
                 if (!$model->getId()) {
                     $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
@@ -205,7 +248,7 @@ public function execute()
 
                 $data['attribute_code'] = $model->getAttributeCode();
                 $data['is_user_defined'] = $model->getIsUserDefined();
-                $data['frontend_input'] = $model->getFrontendInput();
+                $data['frontend_input'] = $data['frontend_input'] ?? $model->getFrontendInput();
             } else {
                 /**
                  * @todo add to helper and specify all relations for properties
@@ -216,14 +259,14 @@ public function execute()
                 $data['backend_model'] = $this->productHelper->getAttributeBackendModelByInputType(
                     $data['frontend_input']
                 );
+
+                if ($model->getIsUserDefined() === null) {
+                    $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
+                }
             }
 
             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
 
-            if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {
-                $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
-            }
-
             $defaultValueField = $model->getDefaultValueByInput($data['frontend_input']);
             if ($defaultValueField) {
                 $data['default_value'] = $this->getRequest()->getParam($defaultValueField);
@@ -303,6 +346,8 @@ public function execute()
     }
 
     /**
+     * Provides an initialized Result object.
+     *
      * @param string $path
      * @param array $params
      * @param array $response
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 4dd406a5d14db..381ca5d08d82a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -4,11 +4,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Framework\Serialize\Serializer\FormData;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
 
-class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
+/**
+ * Product attribute validate controller.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     const DEFAULT_MESSAGE_KEY = 'message';
 
@@ -27,6 +38,11 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      */
     private $multipleAttributeList;
 
+    /**
+     * @var FormData|null
+     */
+    private $formDataSerializer;
+
     /**
      * Constructor
      *
@@ -37,6 +53,7 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param array $multipleAttributeList
+     * @param FormData|null $formDataSerializer
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,15 +62,20 @@ public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
-        array $multipleAttributeList = []
+        array $multipleAttributeList = [],
+        FormData $formDataSerializer = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
         $this->multipleAttributeList = $multipleAttributeList;
+        $this->formDataSerializer = $formDataSerializer ?: ObjectManager::getInstance()
+            ->get(FormData::class);
     }
 
     /**
+     * @inheritdoc
+     *
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -62,6 +84,15 @@ public function execute()
     {
         $response = new DataObject();
         $response->setError(false);
+        try {
+            $optionsData = $this->formDataSerializer
+                ->unserialize($this->getRequest()->getParam('serialized_options', '[]'));
+        } catch (\InvalidArgumentException $e) {
+            $message = __("The attribute couldn't be validated due to an error. Verify your information and try again. "
+                . "If the error persists, please try again later.");
+            $this->setMessageToResponse($response, [$message]);
+            $response->setError(true);
+        }
 
         $attributeCode = $this->getRequest()->getParam('attribute_code');
         $frontendLabel = $this->getRequest()->getParam('frontend_label');
@@ -74,7 +105,7 @@ public function execute()
             $attributeCode
         );
 
-        if ($attribute->getId() && !$attributeId) {
+        if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type') {
             $message = strlen($this->getRequest()->getParam('attribute_code'))
                 ? __('An attribute with this code already exists.')
                 : __('An attribute with the same code (%1) already exists.', $attributeCode);
@@ -91,7 +122,7 @@ public function execute()
             $attributeSet->setEntityTypeId($this->_entityTypeId)->load($setName, 'attribute_set_name');
             if ($attributeSet->getId()) {
                 $setName = $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($setName);
-                $this->messageManager->addError(__('An attribute set named \'%1\' already exists.', $setName));
+                $this->messageManager->addErrorMessage(__('An attribute set named \'%1\' already exists.', $setName));
 
                 $layout = $this->layoutFactory->create();
                 $layout->initMessages();
@@ -101,15 +132,20 @@ public function execute()
         }
 
         $multipleOption = $this->getRequest()->getParam("frontend_input");
-        $multipleOption = null == $multipleOption ? 'select' : $multipleOption;
+        $multipleOption = (null === $multipleOption) ? 'select' : $multipleOption;
 
-        if (isset($this->multipleAttributeList[$multipleOption]) && !(null == ($multipleOption))) {
-            $options = $this->getRequest()->getParam($this->multipleAttributeList[$multipleOption]);
+        if (isset($this->multipleAttributeList[$multipleOption])) {
+            $options = $optionsData[$this->multipleAttributeList[$multipleOption]] ?? null;
             $this->checkUniqueOption(
                 $response,
                 $options
             );
             $valueOptions = (isset($options['value']) && is_array($options['value'])) ? $options['value'] : [];
+            foreach (array_keys($valueOptions) as $key) {
+                if (!empty($options['delete'][$key])) {
+                    unset($valueOptions[$key]);
+                }
+            }
             $this->checkEmptyOption($response, $valueOptions);
         }
 
@@ -117,7 +153,8 @@ public function execute()
     }
 
     /**
-     * Throws Exception if not unique values into options
+     * Throws Exception if not unique values into options.
+     *
      * @param array $optionsValues
      * @param array $deletedOptions
      * @return bool
@@ -151,6 +188,8 @@ private function setMessageToResponse($response, $messages)
     }
 
     /**
+     * Performs checking the uniqueness of the attribute options.
+     *
      * @param DataObject $response
      * @param array|null $options
      * @return $this
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 4fa61b2b372c2..125406061aed7 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -11,6 +11,9 @@
 use Magento\Store\Model\StoreFactory;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type as ProductTypes;
 
 class Builder
 {
@@ -39,6 +42,11 @@ class Builder
      */
     protected $storeFactory;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * Constructor
      *
@@ -47,13 +55,15 @@ class Builder
      * @param Registry $registry
      * @param WysiwygModel\Config $wysiwygConfig
      * @param StoreFactory|null $storeFactory
+     * @param ProductRepositoryInterface|null $productRepository
      */
     public function __construct(
         ProductFactory $productFactory,
         Logger $logger,
         Registry $registry,
         WysiwygModel\Config $wysiwygConfig,
-        StoreFactory $storeFactory = null
+        StoreFactory $storeFactory = null,
+        ProductRepositoryInterface $productRepository = null
     ) {
         $this->productFactory = $productFactory;
         $this->logger = $logger;
@@ -61,6 +71,8 @@ public function __construct(
         $this->wysiwygConfig = $wysiwygConfig;
         $this->storeFactory = $storeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Store\Model\StoreFactory::class);
+        $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -68,40 +80,62 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return \Magento\Catalog\Model\Product
+     * @throws \RuntimeException
      */
     public function build(RequestInterface $request)
     {
-        $productId = (int)$request->getParam('id');
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = $this->productFactory->create();
-        $product->setStoreId($request->getParam('store', 0));
-        $store = $this->storeFactory->create();
-        $store->load($request->getParam('store', 0));
-
+        $productId = (int) $request->getParam('id');
+        $storeId = $request->getParam('store', 0);
+        $attributeSetId = (int) $request->getParam('set');
         $typeId = $request->getParam('type');
-        if (!$productId && $typeId) {
-            $product->setTypeId($typeId);
-        }
 
-        $product->setData('_edit_mode', true);
         if ($productId) {
             try {
-                $product->load($productId);
+                $product = $this->productRepository->getById($productId, true, $storeId);
             } catch (\Exception $e) {
-                $product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE);
+                $product = $this->createEmptyProduct(ProductTypes::DEFAULT_TYPE, $attributeSetId, $storeId);
                 $this->logger->critical($e);
             }
+        } else {
+            $product = $this->createEmptyProduct($typeId, $attributeSetId, $storeId);
         }
 
-        $setId = (int)$request->getParam('set');
-        if ($setId) {
-            $product->setAttributeSetId($setId);
-        }
+        $store = $this->storeFactory->create();
+        $store->load($storeId);
 
         $this->registry->register('product', $product);
         $this->registry->register('current_product', $product);
         $this->registry->register('current_store', $store);
-        $this->wysiwygConfig->setStoreId($request->getParam('store'));
+
+        $this->wysiwygConfig->setStoreId($storeId);
+
+        return $product;
+    }
+
+    /**
+     * @param int $typeId
+     * @param int $attributeSetId
+     * @param int $storeId
+     * @return \Magento\Catalog\Model\Product
+     */
+    private function createEmptyProduct($typeId, $attributeSetId, $storeId): Product
+    {
+        /** @var $product \Magento\Catalog\Model\Product */
+        $product = $this->productFactory->create();
+        $product->setData('_edit_mode', true);
+
+        if ($typeId !== null) {
+            $product->setTypeId($typeId);
+        }
+
+        if ($storeId !== null) {
+            $product->setStoreId($storeId);
+        }
+
+        if ($attributeSetId) {
+            $product->setAttributeSetId($attributeSetId);
+        }
+
         return $product;
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
index fa94a2fb7be2c..e51d3ffe94ae2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php
@@ -6,7 +6,17 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
index daaf2c21ee2b9..5039d0c052b5d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php
@@ -6,7 +6,17 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
index 7e8b03a66f603..63e52eead064c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
@@ -43,11 +43,11 @@ public function execute()
         $product = $this->productBuilder->build($this->getRequest());
         try {
             $newProduct = $this->productCopier->copy($product);
-            $this->messageManager->addSuccess(__('You duplicated the product.'));
+            $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
             $resultRedirect->setPath('catalog/*/edit', ['_current' => true, 'id' => $newProduct->getId()]);
         } catch (\Exception $e) {
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
         }
         return $resultRedirect;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index 838bce7272250..c31ceabcda655 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
 {
     /**
      * Array of actions which can be processed without secret key validation
@@ -52,12 +54,12 @@ public function execute()
         if (($productId && !$product->getEntityId())) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
-            $this->messageManager->addError(__('This product doesn\'t exist.'));
+            $this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));
             return $resultRedirect->setPath('catalog/*/');
         } elseif ($productId === 0) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
-            $this->messageManager->addError(__('Invalid product id. Should be numeric value greater than 0'));
+            $this->messageManager->addErrorMessage(__('Invalid product id. Should be numeric value greater than 0'));
             return $resultRedirect->setPath('catalog/*/');
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
index b5660ea87934c..ff7311e931755 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Gallery;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class Upload extends \Magento\Backend\App\Action
+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
new file mode 100644
index 0000000000000..841715180a229
--- /dev/null
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/** Returns information about selected product by product id. Returns empty array if product don't exist */
+class GetSelected extends \Magento\Backend\App\Action
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * Search constructor.
+     * @param \Magento\Framework\Controller\Result\JsonFactory $jsonFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\Backend\App\Action\Context $context
+     */
+    public function __construct(
+        \Magento\Framework\Controller\Result\JsonFactory $jsonFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
+        \Magento\Backend\App\Action\Context $context
+    ) {
+        $this->resultJsonFactory = $jsonFactory;
+        $this->productCollectionFactory = $productCollectionFactory;
+        parent::__construct($context);
+    }
+
+    /**
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function execute() : \Magento\Framework\Controller\ResultInterface
+    {
+        $productId = $this->getRequest()->getParam('productId');
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addAttributeToSelect(ProductInterface::NAME);
+        $productCollection->addIdFilter($productId);
+        $option = [];
+        /** @var ProductInterface $product */
+        if (!empty($productCollection->getFirstItem()->getData())) {
+            $product = $productCollection->getFirstItem();
+            $option = [
+                'value' => $productId,
+                'label' => $product->getName(),
+                'is_active' => $product->getStatus(),
+                'path' => $product->getSku(),
+            ];
+        }
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData($option);
+    }
+}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
index 4909e22775e55..8a5f375f2b706 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
@@ -29,12 +29,12 @@ public function execute()
         );
 
         if ($model->itemExists()) {
-            $this->messageManager->addError(__('A group with the same name already exists.'));
+            $this->messageManager->addErrorMessage(__('A group with the same name already exists.'));
         } else {
             try {
                 $model->save();
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while saving this group.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while saving this group.'));
             }
         }
     }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
index ea66ecf6b1622..7755a512eb9b4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class Index extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index beb6f2b13bcfe..f11d16755ef0d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -3,18 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory as CustomOptionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory as ProductLinkFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface\Proxy as ProductRepository;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeDefaultValueFilter;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks;
 use Magento\Catalog\Model\Product\Link\Resolver as LinkResolver;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 
 /**
+ * Product helper
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -81,7 +87,7 @@ class Helper
     private $dateTimeFilter;
 
     /**
-     * @var \Magento\Catalog\Model\Product\LinkTypeProvider
+     * @var LinkTypeProvider
      */
     private $linkTypeProvider;
 
@@ -99,10 +105,10 @@ class Helper
      * @param ProductLinks $productLinks
      * @param \Magento\Backend\Helper\Js $jsHelper
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-     * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory|null $customOptionFactory
-     * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory|null $productLinkFactory
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface|null $productRepository
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider|null $linkTypeProvider
+     * @param CustomOptionFactory|null $customOptionFactory
+     * @param ProductLinkFactory|null $productLinkFactory
+     * @param ProductRepositoryInterface|null $productRepository
+     * @param LinkTypeProvider|null $linkTypeProvider
      * @param AttributeFilter|null $attributeFilter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -113,10 +119,10 @@ public function __construct(
         \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
         \Magento\Backend\Helper\Js $jsHelper,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
-        \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory = null,
-        \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory $productLinkFactory = null,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository = null,
-        \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider = null,
+        CustomOptionFactory $customOptionFactory = null,
+        ProductLinkFactory $productLinkFactory = null,
+        ProductRepositoryInterface $productRepository = null,
+        LinkTypeProvider $linkTypeProvider = null,
         AttributeFilter $attributeFilter = null
     ) {
         $this->request = $request;
@@ -125,16 +131,13 @@ public function __construct(
         $this->productLinks = $productLinks;
         $this->jsHelper = $jsHelper;
         $this->dateFilter = $dateFilter;
-        $this->customOptionFactory = $customOptionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
-        $this->productLinkFactory = $productLinkFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
-        $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $this->linkTypeProvider = $linkTypeProvider ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Model\Product\LinkTypeProvider::class);
-        $this->attributeFilter = $attributeFilter ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(AttributeFilter::class);
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->customOptionFactory = $customOptionFactory ?: $objectManager->get(CustomOptionFactory::class);
+        $this->productLinkFactory = $productLinkFactory ?: $objectManager->get(ProductLinkFactory::class);
+        $this->productRepository = $productRepository ?: $objectManager->get(ProductRepositoryInterface::class);
+        $this->linkTypeProvider = $linkTypeProvider ?: $objectManager->get(LinkTypeProvider::class);
+        $this->attributeFilter = $attributeFilter ?: $objectManager->get(AttributeFilter::class);
     }
 
     /**
@@ -150,8 +153,7 @@ public function __construct(
      */
     public function initializeFromData(\Magento\Catalog\Model\Product $product, array $productData)
     {
-        unset($productData['custom_attributes']);
-        unset($productData['extension_attributes']);
+        unset($productData['custom_attributes'], $productData['extension_attributes']);
 
         if ($productData) {
             $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : [];
@@ -159,6 +161,7 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         }
 
         $productData = $this->normalize($productData);
+        $productData = $this->convertSpecialFromDateStringToObject($productData);
 
         if (!empty($productData['is_downloadable'])) {
             $productData['product_has_weight'] = 0;
@@ -199,28 +202,13 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         $productData['tier_price'] = isset($productData['tier_price']) ? $productData['tier_price'] : [];
 
         $useDefaults = (array)$this->request->getPost('use_default', []);
-
         $productData = $this->attributeFilter->prepareProductAttributes($product, $productData, $useDefaults);
-
         $product->addData($productData);
 
         if ($wasLockedMedia) {
             $product->lockAttribute('media');
         }
 
-        /**
-         * Check "Use Default Value" checkboxes values
-         */
-        foreach ($useDefaults as $attributeCode => $useDefaultState) {
-            if ($useDefaultState) {
-                $product->setData($attributeCode, null);
-                // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false
-                if ($product->hasData('use_config_' . $attributeCode)) {
-                    $product->setData('use_config_' . $attributeCode, false);
-                }
-            }
-        }
-
         $product = $this->setProductLinks($product);
         $product = $this->fillProductOptions($product, $productOptions);
 
@@ -379,6 +367,8 @@ private function overwriteValue($optionId, $option, $overwriteOptions)
     }
 
     /**
+     * Get link resolver instance
+     *
      * @return LinkResolver
      * @deprecated 101.0.0
      */
@@ -391,6 +381,8 @@ private function getLinkResolver()
     }
 
     /**
+     * Get DateTimeFilter instance
+     *
      * @return \Magento\Framework\Stdlib\DateTime\Filter\DateTime
      * @deprecated 101.0.0
      */
@@ -405,6 +397,7 @@ private function getDateTimeFilter()
 
     /**
      * Remove ids of non selected websites from $websiteIds array and return filtered data
+     *
      * $websiteIds parameter expects array with website ids as keys and 1 (selected) or 0 (non selected) as values
      * Only one id (default website ID) will be set to $websiteIds array when the single store mode is turned on
      *
@@ -467,4 +460,20 @@ private function fillProductOptions(Product $product, array $productOptions)
 
         return $product->setOptions($customOptions);
     }
+
+    /**
+     * Convert string date presentation into object
+     *
+     * @param array $productData
+     * @return array
+     */
+    private function convertSpecialFromDateStringToObject($productData)
+    {
+        if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
+            $productData['special_from_date'] = $this->getDateTimeFilter()->filter($productData['special_from_date']);
+            $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
+        }
+
+        return $productData;
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 237168282afae..188b0b22f33bf 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
 
 use \Magento\Catalog\Model\Product;
@@ -25,17 +28,74 @@ class AttributeFilter
      * @param array $useDefaults
      * @return array
      */
-    public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
+    public function prepareProductAttributes(Product $product, array $productData, array $useDefaults): array
     {
-        foreach ($productData as $attribute => $value) {
-            $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
-            if ($value === '' && $considerUseDefaultsAttribute) {
-                /** @var $product Product */
-                if ((bool)$product->getData($attribute) === (bool)$value) {
-                    unset($productData[$attribute]);
-                }
+        $attributeList = $product->getAttributes();
+        foreach ($productData as $attributeCode => $attributeValue) {
+            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attributeCode, $attributeValue)) {
+                unset($productData[$attributeCode]);
             }
+
+            if (isset($useDefaults[$attributeCode]) && $useDefaults[$attributeCode] === '1') {
+                $productData = $this->prepareDefaultData($attributeList, $attributeCode, $productData);
+                $productData = $this->prepareConfigData($product, $attributeCode, $productData);
+            }
+        }
+
+        return $productData;
+    }
+
+    /**
+     * @param Product $product
+     * @param string $attributeCode
+     * @param array $productData
+     * @return array
+     */
+    private function prepareConfigData(Product $product, string $attributeCode, array $productData): array
+    {
+        // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false
+        if ($product->hasData('use_config_' . $attributeCode)) {
+            $productData['use_config_' . $attributeCode] = false;
         }
+
         return $productData;
     }
+
+    /**
+     * @param array $attributeList
+     * @param string $attributeCode
+     * @param array $productData
+     * @return array
+     */
+    private function prepareDefaultData(array $attributeList, string $attributeCode, array $productData): array
+    {
+        if (isset($attributeList[$attributeCode])) {
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+            $attribute = $attributeList[$attributeCode];
+            $attributeType = $attribute->getBackendType();
+            // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db
+            if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
+                $attribute->setIsRequired(false);
+                $productData[$attributeCode] = false;
+            } else {
+                $productData[$attributeCode] = null;
+            }
+        }
+
+        return $productData;
+    }
+
+    /**
+     * @param Product $product
+     * @param array $useDefaults
+     * @param string $attribute
+     * @param mixed $value
+     * @return bool
+     */
+    private function isAttributeShouldNotBeUpdated(Product $product, array $useDefaults, $attribute, $value): bool
+    {
+        $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === '1';
+
+        return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
index 2402fb213cda0..8fceba3c45e2c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
@@ -6,13 +6,14 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 
-class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
+class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
 {
     /**
      * Massactions filter
@@ -64,9 +65,12 @@ public function execute()
             $this->productRepository->delete($product);
             $productDeleted++;
         }
-        $this->messageManager->addSuccess(
-            __('A total of %1 record(s) have been deleted.', $productDeleted)
-        );
+
+        if ($productDeleted) {
+            $this->messageManager->addSuccessMessage(
+                __('A total of %1 record(s) have been deleted.', $productDeleted)
+            );
+        }
 
         return $this->resultFactory->create(ResultFactory::TYPE_REDIRECT)->setPath('catalog/*/index');
     }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
index e3623aabfa1a3..9d7273fb3f23c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Framework\Controller\ResultFactory;
@@ -13,9 +14,10 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
+ * Updates status for a batch of products.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
+class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
@@ -86,7 +88,7 @@ public function execute()
         $filterRequest = $this->getRequest()->getParam('filters', null);
         $status = (int) $this->getRequest()->getParam('status');
 
-        if (null !== $storeId && null !== $filterRequest) {
+        if (null === $storeId && null !== $filterRequest) {
             $storeId = (isset($filterRequest['store_id'])) ? (int) $filterRequest['store_id'] : 0;
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
index 0b027105cd7d4..0b1ef98c386c4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Framework\App\ObjectManager;
 
-class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
+class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
 {
     /**
      * @var Initialization\StockDataFilter
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
index 4bc15d14a29b1..f54f8d469c3e8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php
@@ -7,7 +7,17 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
@@ -29,6 +39,8 @@ public function __construct(
     }
 
     /**
+     * Execute
+     *
      * @return \Magento\Framework\View\Result\Layout
      */
     public function execute()
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
index b2fc7ebe1eb31..b1092bba0d369 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php
@@ -7,6 +7,15 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class RelatedGrid extends Related
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends Related implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php
index ff87e7f57413f..a0963e60d888d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Backend reload of product create/edit form
  */
-class Reload extends \Magento\Catalog\Controller\Adminhtml\Product
+class Reload extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
 {
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index d34f4bedd80e4..e84d9ff12906e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -4,9 +4,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Request\DataPersistorInterface;
@@ -15,7 +18,7 @@
  * Class Save
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Catalog\Controller\Adminhtml\Product
+class Save extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
 {
     /**
      * @var Initialization\Helper
@@ -52,6 +55,16 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     private $storeManager;
 
+    /**
+     * @var \Magento\Framework\Escaper|null
+     */
+    private $escaper;
+
+    /**
+     * @var null|\Psr\Log\LoggerInterface
+     */
+    private $logger;
+
     /**
      * Save constructor.
      *
@@ -61,6 +74,8 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      * @param \Magento\Catalog\Model\Product\Copier $productCopier
      * @param \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param \Magento\Framework\Escaper|null $escaper
+     * @param \Psr\Log\LoggerInterface|null $logger
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -68,13 +83,17 @@ public function __construct(
         Initialization\Helper $initializationHelper,
         \Magento\Catalog\Model\Product\Copier $productCopier,
         \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+        \Magento\Framework\Escaper $escaper = null,
+        \Psr\Log\LoggerInterface $logger = null
     ) {
         $this->initializationHelper = $initializationHelper;
         $this->productCopier = $productCopier;
         $this->productTypeManager = $productTypeManager;
         $this->productRepository = $productRepository;
         parent::__construct($context, $productBuilder);
+        $this->escaper = $escaper ?? $this->_objectManager->get(\Magento\Framework\Escaper::class);
+        $this->logger = $logger ?? $this->_objectManager->get(\Psr\Log\LoggerInterface::class);
     }
 
     /**
@@ -101,12 +120,14 @@ public function execute()
                     $this->productBuilder->build($this->getRequest())
                 );
                 $this->productTypeManager->processProduct($product);
-
                 if (isset($data['product'][$product->getIdFieldName()])) {
-                    throw new \Magento\Framework\Exception\LocalizedException(__('Unable to save product'));
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('The product was unable to be saved. Please try again.')
+                    );
                 }
 
                 $originalSku = $product->getSku();
+                $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
                 $this->handleImageRemoveError($data, $product->getId());
                 $this->getCategoryLinkManagement()->assignProductToCategories(
@@ -116,21 +137,17 @@ public function execute()
                 $productId = $product->getEntityId();
                 $productAttributeSetId = $product->getAttributeSetId();
                 $productTypeId = $product->getTypeId();
-
-                $this->copyToStores($data, $productId);
-
+                $extendedData = $data;
+                $extendedData['can_save_custom_options'] = $canSaveCustomOptions;
+                $this->copyToStores($extendedData, $productId);
                 $this->messageManager->addSuccessMessage(__('You saved the product.'));
                 $this->getDataPersistor()->clear('catalog_product');
                 if ($product->getSku() != $originalSku) {
                     $this->messageManager->addNoticeMessage(
                         __(
                             'SKU for product %1 has been changed to %2.',
-                            $this->_objectManager->get(
-                                \Magento\Framework\Escaper::class
-                            )->escapeHtml($product->getName()),
-                            $this->_objectManager->get(
-                                \Magento\Framework\Escaper::class
-                            )->escapeHtml($product->getSku())
+                            $this->escaper->escapeHtml($product->getName()),
+                            $this->escaper->escapeHtml($product->getSku())
                         )
                     );
                 }
@@ -140,17 +157,20 @@ public function execute()
                 );
 
                 if ($redirectBack === 'duplicate') {
+                    $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->logger->critical($e);
                 $this->messageManager->addExceptionMessage($e);
+                $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             } catch (\Exception $e) {
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->logger->critical($e);
                 $this->messageManager->addErrorMessage($e->getMessage());
+                $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             }
@@ -183,6 +203,7 @@ public function execute()
 
     /**
      * Notify customer when image was not deleted in specific case.
+     *
      * TODO: temporary workaround must be eliminated in MAGETWO-45306
      *
      * @param array $postData
@@ -201,7 +222,8 @@ private function handleImageRemoveError($postData, $productId)
             if ($removedImagesAmount) {
                 $expectedImagesAmount = count($postData['product']['media_gallery']['images']) - $removedImagesAmount;
                 $product = $this->productRepository->getById($productId);
-                if ($expectedImagesAmount != count($product->getMediaGallery('images'))) {
+                $images = $product->getMediaGallery('images');
+                if (is_array($images) && $expectedImagesAmount != count($images)) {
                     $this->messageManager->addNoticeMessage(
                         __('The image cannot be removed as it has been assigned to the other image role')
                     );
@@ -213,6 +235,9 @@ private function handleImageRemoveError($postData, $productId)
     /**
      * Do copying data to stores
      *
+     * If the 'copy_from' field is not specified in the input data,
+     * the store fallback mechanism will automatically take the admin store's default value.
+     *
      * @param array $data
      * @param int $productId
      * @return void
@@ -224,15 +249,18 @@ protected function copyToStores($data, $productId)
                 if (isset($data['product']['website_ids'][$websiteId])
                     && (bool)$data['product']['website_ids'][$websiteId]) {
                     foreach ($group as $store) {
-                        $copyFrom = (isset($store['copy_from'])) ? $store['copy_from'] : 0;
-                        $copyTo = (isset($store['copy_to'])) ? $store['copy_to'] : 0;
-                        if ($copyTo) {
-                            $this->_objectManager->create(\Magento\Catalog\Model\Product::class)
-                                ->setStoreId($copyFrom)
-                                ->load($productId)
-                                ->setStoreId($copyTo)
-                                ->setCopyFromView(true)
-                                ->save();
+                        if (isset($store['copy_from'])) {
+                            $copyFrom = $store['copy_from'];
+                            $copyTo = (isset($store['copy_to'])) ? $store['copy_to'] : 0;
+                            if ($copyTo) {
+                                $this->_objectManager->create(\Magento\Catalog\Model\Product::class)
+                                    ->setStoreId($copyFrom)
+                                    ->load($productId)
+                                    ->setStoreId($copyTo)
+                                    ->setCanSaveCustomOptions($data['can_save_custom_options'])
+                                    ->setCopyFromView(true)
+                                    ->save();
+                            }
                         }
                     }
                 }
@@ -241,6 +269,8 @@ protected function copyToStores($data, $productId)
     }
 
     /**
+     * Get categoryLinkManagement in a backward compatible way.
+     *
      * @return \Magento\Catalog\Api\CategoryLinkManagementInterface
      */
     private function getCategoryLinkManagement()
@@ -253,6 +283,8 @@ private function getCategoryLinkManagement()
     }
 
     /**
+     * Get storeManager in a backward compatible way.
+     *
      * @return StoreManagerInterface
      * @deprecated 101.0.0
      */
@@ -279,4 +311,36 @@ protected function getDataPersistor()
 
         return $this->dataPersistor;
     }
+
+    /**
+     * Persist media gallery on error, in order to show already saved images on next run.
+     *
+     * @param ProductInterface $product
+     * @param array $data
+     * @return array
+     */
+    private function persistMediaData(ProductInterface $product, array $data)
+    {
+        $mediaGallery = $product->getData('media_gallery');
+        if (!empty($mediaGallery['images'])) {
+            foreach ($mediaGallery['images'] as $key => $image) {
+                if (!isset($image['new_file'])) {
+                    //Remove duplicates.
+                    unset($mediaGallery['images'][$key]);
+                }
+            }
+            $data['product']['media_gallery'] = $mediaGallery;
+            $fields = [
+                'image',
+                'small_image',
+                'thumbnail',
+                'swatch_image',
+            ];
+            foreach ($fields as $field) {
+                $data['product'][$field] = $product->getData($field);
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php
new file mode 100644
index 0000000000000..c7c71b2f56026
--- /dev/null
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Controller to search product for ui-select component
+ */
+class Search extends \Magento\Backend\App\Action
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\ProductLink\Search
+     */
+    private $productSearch;
+
+    /**
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultFactory
+     * @param \Magento\Catalog\Model\ProductLink\Search $productSearch
+     * @param \Magento\Backend\App\Action\Context $context
+     */
+    public function __construct(
+        \Magento\Framework\Controller\Result\JsonFactory $resultFactory,
+        \Magento\Catalog\Model\ProductLink\Search $productSearch,
+        \Magento\Backend\App\Action\Context $context
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->productSearch = $productSearch;
+        parent::__construct($context);
+    }
+
+    /**
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function execute() : \Magento\Framework\Controller\ResultInterface
+    {
+        $searchKey = $this->getRequest()->getParam('searchKey');
+        $pageNum = (int)$this->getRequest()->getParam('page');
+        $limit = (int)$this->getRequest()->getParam('limit');
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+        $productCollection = $this->productSearch->prepareCollection($searchKey, $pageNum, $limit);
+        $totalValues = $productCollection->getSize();
+        $productById = [];
+        /** @var  ProductInterface $product */
+        foreach ($productCollection as $product) {
+            $productId = $product->getId();
+            $productById[$productId] = [
+                'value' => $productId,
+                'label' => $product->getName(),
+                'is_active' => $product->getStatus(),
+                'path' => $product->getSku(),
+                'optgroup' => false
+            ];
+        }
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData([
+            'options' => $productById,
+            'total' => empty($productById) ? 0 : $totalValues
+        ]);
+    }
+}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
index 480c30322a073..bfe474abba1b8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
index b49a4dabe223c..771cc83f79e80 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Eav\Api\AttributeSetRepositoryInterface
@@ -36,10 +38,10 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         try {
             $this->attributeSetRepository->deleteById($setId);
-            $this->messageManager->addSuccess(__('The attribute set has been removed.'));
+            $this->messageManager->addSuccessMessage(__('The attribute set has been removed.'));
             $resultRedirect->setPath('catalog/*/');
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t delete this set right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t delete this set right now.'));
             $resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
         return $resultRedirect;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
index ec540180b0345..6f6870cb0849f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
index 29f7dff4f0d47..aadf724f6006e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
index 00a836309e58e..83620de25b012 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
@@ -6,7 +6,13 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
@@ -17,22 +23,49 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @var \Magento\Framework\Controller\Result\JsonFactory
      */
     protected $resultJsonFactory;
-
+    
+    /*
+     * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
+     */
+    private $attributeSetFactory;
+    
+    /*
+     * @var \Magento\Framework\Filter\FilterManager
+     */
+    private $filterManager;
+    
+    /*
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+    
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
+     * @param \Magento\Framework\Filter\FilterManager $filterManager
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory = null,
+        \Magento\Framework\Filter\FilterManager $filterManager = null,
+        \Magento\Framework\Json\Helper\Data $jsonHelper = null
     ) {
         parent::__construct($context, $coreRegistry);
         $this->layoutFactory = $layoutFactory;
         $this->resultJsonFactory = $resultJsonFactory;
+        $this->attributeSetFactory =  $attributeSetFactory ?: ObjectManager::getInstance()
+            ->get(\Magento\Eav\Model\Entity\Attribute\SetFactory::class);
+        $this->filterManager =  $filterManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Filter\FilterManager::class);
+        $this->jsonHelper =  $jsonHelper ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Json\Helper\Data::class);
     }
 
     /**
@@ -65,16 +98,12 @@ public function execute()
         $isNewSet = $this->getRequest()->getParam('gotoEdit', false) == '1';
 
         /* @var $model \Magento\Eav\Model\Entity\Attribute\Set */
-        $model = $this->_objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
-            ->setEntityTypeId($entityTypeId);
-
-        /** @var $filterManager \Magento\Framework\Filter\FilterManager */
-        $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class);
+        $model = $this->attributeSetFactory->create()->setEntityTypeId($entityTypeId);
 
         try {
             if ($isNewSet) {
                 //filter html tags
-                $name = $filterManager->stripTags($this->getRequest()->getParam('attribute_set_name'));
+                $name = $this->filterManager->stripTags($this->getRequest()->getParam('attribute_set_name'));
                 $model->setAttributeSetName(trim($name));
             } else {
                 if ($attributeSetId) {
@@ -85,11 +114,10 @@ public function execute()
                         __('This attribute set no longer exists.')
                     );
                 }
-                $data = $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)
-                    ->jsonDecode($this->getRequest()->getPost('data'));
+                $data = $this->jsonHelper->jsonDecode($this->getRequest()->getPost('data'));
 
                 //filter html tags
-                $data['attribute_set_name'] = $filterManager->stripTags($data['attribute_set_name']);
+                $data['attribute_set_name'] = $this->filterManager->stripTags($data['attribute_set_name']);
 
                 $model->organizeData($data);
             }
@@ -100,15 +128,15 @@ public function execute()
                 $model->initFromSkeleton($this->getRequest()->getParam('skeleton_set'));
             }
             $model->save();
-            $this->messageManager->addSuccess(__('You saved the attribute set.'));
+            $this->messageManager->addSuccessMessage(__('You saved the attribute set.'));
         } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
             $hasError = true;
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $hasError = true;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong while saving the attribute set.'));
+            $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the attribute set.'));
             $hasError = true;
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
index 614bddd0ebc87..1cec8e8678797 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php
@@ -6,7 +6,17 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
index 50beb588b15df..581531e7c93fb 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php
@@ -6,7 +6,17 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class UpsellGrid
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class UpsellGrid extends Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
index 63f46fd32e6f7..77c9cfcd40f05 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Framework\App\ObjectManager;
@@ -16,7 +18,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
+class Validate extends Product implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
@@ -137,7 +139,7 @@ public function execute()
             $response->setError(true);
             $response->setMessages([$e->getMessage()]);
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $layout = $this->layoutFactory->create();
             $layout->initMessages();
             $response->setError(true);
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index a72f764a5f1f6..2088bb5ea77cd 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -6,15 +6,21 @@
  */
 namespace Magento\Catalog\Controller\Category;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\App\Action\Action;
 
 /**
+ * View a category on storefront. Needs to be accessible by POST because of the store switching.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class View extends \Magento\Framework\App\Action\Action
+class View extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Core registry
@@ -69,6 +75,11 @@ class View extends \Magento\Framework\App\Action\Action
      */
     protected $categoryRepository;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * Constructor
      *
@@ -82,6 +93,7 @@ class View extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param ToolbarMemorizer|null $toolbarMemorizer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -94,7 +106,8 @@ public function __construct(
         PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
         Resolver $layerResolver,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ToolbarMemorizer $toolbarMemorizer = null
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
@@ -106,12 +119,13 @@ public function __construct(
         $this->resultForwardFactory = $resultForwardFactory;
         $this->layerResolver = $layerResolver;
         $this->categoryRepository = $categoryRepository;
+        $this->toolbarMemorizer = $toolbarMemorizer ?: $context->getObjectManager()->get(ToolbarMemorizer::class);
     }
 
     /**
      * Initialize requested category object
      *
-     * @return \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Category|bool
      */
     protected function _initCategory()
     {
@@ -130,6 +144,7 @@ protected function _initCategory()
         }
         $this->_catalogSession->setLastVisitedCategoryId($category->getId());
         $this->_coreRegistry->register('current_category', $category);
+        $this->toolbarMemorizer->memorizeParams();
         try {
             $this->_eventManager->dispatch(
                 'catalog_controller_category_init_after',
@@ -193,7 +208,7 @@ public function execute()
             if ($layoutUpdates && is_array($layoutUpdates)) {
                 foreach ($layoutUpdates as $layoutUpdate) {
                     $page->addUpdate($layoutUpdate);
-                    $page->addPageLayoutHandles(['layout_update' => md5($layoutUpdate)], null, false);
+                    $page->addPageLayoutHandles(['layout_update' => sha1($layoutUpdate)], null, false);
                 }
             }
 
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index 1ee146e5aaa70..084a82f87d645 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Controller\Product;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\View\Result\PageFactory;
 
@@ -15,7 +16,7 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-abstract class Compare extends \Magento\Framework\App\Action\Action
+abstract class Compare extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
      * Customer id
@@ -139,4 +140,15 @@ public function setCustomerId($customerId)
         $this->_customerId = $customerId;
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('catalog/product_compare');
+
+        return $resultRedirect;
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
index 89eb6c9be929f..d99901c915a10 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-class Add extends \Magento\Catalog\Controller\Product\Compare
+class Add extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
 {
     /**
      * Add item to compare list
@@ -36,7 +37,14 @@ public function execute()
                 $productName = $this->_objectManager->get(
                     \Magento\Framework\Escaper::class
                 )->escapeHtml($product->getName());
-                $this->messageManager->addSuccess(__('You added product %1 to the comparison list.', $productName));
+                $this->messageManager->addComplexSuccessMessage(
+                    'addCompareSuccessMessage',
+                    [
+                        'product_name' => $productName,
+                        'compare_list_url' => $this->_url->getUrl('catalog/product_compare')
+                    ]
+                );
+
                 $this->_eventManager->dispatch('catalog_product_compare_add_product', ['product' => $product]);
             }
 
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
index 30470d13f002d..2703e9869bd47 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Clear extends \Magento\Catalog\Controller\Product\Compare
+class Clear extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
 {
     /**
      * Remove all items from comparison list
@@ -30,12 +31,12 @@ public function execute()
 
         try {
             $items->clear();
-            $this->messageManager->addSuccess(__('You cleared the comparison list.'));
+            $this->messageManager->addSuccessMessage(__('You cleared the comparison list.'));
             $this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class)->calculate();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong  clearing the comparison list.'));
+            $this->messageManager->addExceptionMessage($e, __('Something went wrong  clearing the comparison list.'));
         }
 
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index 3eba058318a7d..c0aa32a56ed17 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\View\Result\PageFactory;
@@ -13,7 +14,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Index extends \Magento\Catalog\Controller\Product\Compare
+class Index extends \Magento\Catalog\Controller\Product\Compare implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Url\DecoderInterface
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
index fadb94761a236..eac0ddf94af20 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-class Remove extends \Magento\Catalog\Controller\Product\Compare
+class Remove extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
 {
     /**
      * Remove item from compare list
@@ -44,7 +45,7 @@ public function execute()
                     $item->delete();
                     $productName = $this->_objectManager->get(\Magento\Framework\Escaper::class)
                         ->escapeHtml($product->getName());
-                    $this->messageManager->addSuccess(
+                    $this->messageManager->addSuccessMessage(
                         __('You removed product %1 from the comparison list.', $productName)
                     );
                     $this->_eventManager->dispatch(
diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php
index 4c577eb897589..024123e15150d 100644
--- a/app/code/Magento/Catalog/Controller/Product/View.php
+++ b/app/code/Magento/Catalog/Controller/Product/View.php
@@ -6,10 +6,16 @@
  */
 namespace Magento\Catalog\Controller\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Catalog\Controller\Product as ProductAction;
 
-class View extends \Magento\Catalog\Controller\Product
+/**
+ * View a product on storefront. Needs to be accessible by POST because of the store switching.
+ */
+class View extends ProductAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Helper\Product\View
@@ -78,13 +84,16 @@ public function execute()
 
         if ($this->getRequest()->isPost() && $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED)) {
             $product = $this->_initProduct();
+            
             if (!$product) {
                 return $this->noProductRedirect();
             }
+            
             if ($specifyOptions) {
                 $notice = $product->getTypeInstance()->getSpecifyOptionMessage();
-                $this->messageManager->addNotice($notice);
+                $this->messageManager->addNoticeMessage($notice);
             }
+            
             if ($this->getRequest()->isAjax()) {
                 $this->getResponse()->representJson(
                     $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
diff --git a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
index de8b6f06afbea..25f6d0c323687 100644
--- a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
+++ b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
@@ -12,8 +12,10 @@
 use Magento\Store\Model\Store;
 
 /**
+ * Cron job for removing outdated prices.
+ *
  * Cron operation is responsible for deleting all product prices on WEBSITE level
- * in case 'Catalog Price Scope' configuratoin parameter is set to GLOBAL.
+ * in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
  */
 class DeleteOutdatedPriceValues
 {
@@ -48,27 +50,46 @@ public function __construct(
     }
 
     /**
-     * Delete all price values for non-admin stores if PRICE_SCOPE is global
+     * Delete all price values for non-admin stores if PRICE_SCOPE is set to global.
      *
      * @return void
      */
     public function execute()
     {
-        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
-        if ($priceScope == Store::PRICE_SCOPE_GLOBAL) {
-            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
-            $priceAttribute = $this->attributeRepository
-                ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
-            $connection = $this->resource->getConnection();
-            $conditions = [
-                $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
-                $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
-            ];
+        if (!$this->isPriceScopeSetToGlobal()) {
+            return;
+        }
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
+        $priceAttribute = $this->attributeRepository
+            ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
+        $connection = $this->resource->getConnection();
+        $conditions = [
+            $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
+            $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
+        ];
 
-            $connection->delete(
-                $priceAttribute->getBackend()->getTable(),
-                $conditions
-            );
+        $connection->delete(
+            $priceAttribute->getBackend()->getTable(),
+            $conditions
+        );
+    }
+
+    /**
+     * Checks if price scope config option explicitly equal to global value.
+     *
+     * Such strict comparison is required to prevent price deleting when
+     * price scope config option is null for some reason.
+     *
+     * @return bool
+     */
+    private function isPriceScopeSetToGlobal()
+    {
+        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
+        if ($priceScope === null) {
+            return false;
         }
+
+        return (int)$priceScope === Store::PRICE_SCOPE_GLOBAL;
     }
 }
diff --git a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
index 6e7699abb4776..99e9898eab3c0 100644
--- a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
+++ b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
@@ -57,8 +57,7 @@ private function getLifeTimeByNamespace($namespace)
             ];
         }
 
-        return isset($configuration['lifetime']) ?
-            (int) $configuration['lifetime'] : FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
+        return (int)$configuration['lifetime'] ?? FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/CustomerData/CompareProducts.php b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
index 0e688042c615a..afbeab8c9070e 100644
--- a/app/code/Magento/Catalog/CustomerData/CompareProducts.php
+++ b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
@@ -19,6 +19,11 @@ class CompareProducts implements SectionSourceInterface
      */
     protected $productUrl;
 
+    /**
+     * @var \Magento\Catalog\Helper\Output
+     */
+    private $outputHelper;
+
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
@@ -54,6 +59,7 @@ public function getSectionData()
     protected function getItems()
     {
         $items = [];
+        /** @var \Magento\Catalog\Model\Product $item */
         foreach ($this->helper->getItemCollection() as $item) {
             $items[] = [
                 'id' => $item->getId(),
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 9eebcdb2df34f..3e96763632830 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -32,6 +33,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     const CONFIG_USE_STATIC_URLS = 'cms/wysiwyg/use_static_urls_in_catalog';
 
+    /**
+     * @deprecated
+     * @see \Magento\Catalog\Helper\Output::isDirectivesExists
+     */
     const CONFIG_PARSE_URL_DIRECTIVES = 'catalog/frontend/parse_url_directives';
 
     const XML_PATH_DISPLAY_PRODUCT_COUNT = 'catalog/layered_navigation/display_product_count';
@@ -269,7 +274,8 @@ public function setStoreId($store)
 
     /**
      * Return current category path or get it from current category
-     * and creating array of categories|product paths for breadcrumbs
+     *
+     * Creating array of categories|product paths for breadcrumbs
      *
      * @return array
      */
@@ -378,6 +384,7 @@ public function getLastViewedUrl()
 
     /**
      * Split SKU of an item by dashes and spaces
+     *
      * Words will not be broken, unless this length is greater than $length
      *
      * @param string $sku
@@ -406,14 +413,15 @@ public function getAttributeHiddenFields()
     /**
      * Retrieve Catalog Price Scope
      *
-     * @return int
+     * @return int|null
      */
-    public function getPriceScope()
+    public function getPriceScope(): ?int
     {
-        return $this->scopeConfig->getValue(
+        $priceScope = $this->scopeConfig->getValue(
             self::XML_PATH_PRICE_SCOPE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
+        return isset($priceScope) ? (int)$priceScope : null;
     }
 
     /**
@@ -435,7 +443,7 @@ public function isUsingStaticUrlsAllowed()
     {
         return $this->scopeConfig->isSetFlag(
             self::CONFIG_USE_STATIC_URLS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -443,12 +451,14 @@ public function isUsingStaticUrlsAllowed()
      * Check if the parsing of URL directives is allowed for the catalog
      *
      * @return bool
+     * @deprecated
+     * @see \Magento\Catalog\Helper\Output::isDirectivesExists
      */
     public function isUrlDirectivesParsingAllowed()
     {
         return $this->scopeConfig->isSetFlag(
             self::CONFIG_PARSE_URL_DIRECTIVES,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
@@ -457,6 +467,7 @@ public function isUrlDirectivesParsingAllowed()
      * Retrieve template processor for catalog content
      *
      * @return \Magento\Framework\Filter\Template
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getPageTemplateProcessor()
     {
@@ -465,6 +476,7 @@ public function getPageTemplateProcessor()
 
     /**
      * Whether to display items count for each filter option
+     *
      * @param int $storeId Store view ID
      * @return bool
      */
@@ -472,12 +484,14 @@ public function shouldDisplayProductCountOnLayer($storeId = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_COUNT,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
 
     /**
+     * Convert tax address array to address data object with country id and postcode
+     *
      * @param array $taxAddress
      * @return \Magento\Customer\Api\Data\AddressInterface|null
      */
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 380fd0298c2d7..170f1209ad9e6 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -298,6 +298,7 @@ public function resize($width, $height = null)
      *
      * @param int $quality
      * @return $this
+     * @deprecated
      */
     public function setQuality($quality)
     {
@@ -406,7 +407,8 @@ public function rotate($angle)
 
     /**
      * Add watermark to image
-     * size param in format 100x200
+     *
+     * Size param in format 100x200
      *
      * @param string $fileName
      * @param string $position
@@ -533,6 +535,8 @@ public function getUrl()
     }
 
     /**
+     * Save changes
+     *
      * @return $this
      */
     public function save()
@@ -553,6 +557,8 @@ public function getResizedImageInfo()
     }
 
     /**
+     * Getter for placeholder url
+     *
      * @param null|string $placeholder
      * @return string
      */
@@ -655,7 +661,8 @@ protected function getWatermarkPosition()
 
     /**
      * Set watermark size
-     * param size in format 100x200
+     *
+     * Param size in format 100x200
      *
      * @param string $size
      * @return $this
@@ -845,10 +852,10 @@ public function getHeight()
     public function getFrame()
     {
         $frame = $this->getAttribute('frame');
-        if (empty($frame)) {
+        if ($frame === null) {
             $frame = $this->getConfigView()->getVarValue('Magento_Catalog', 'product_image_white_borders');
         }
-        return $frame;
+        return (bool)$frame;
     }
 
     /**
@@ -859,7 +866,7 @@ public function getFrame()
      */
     protected function getAttribute($name)
     {
-        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+        return $this->attributes[$name] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
index facd5351f269a..33e261dc353b4 100644
--- a/app/code/Magento/Catalog/Helper/Output.php
+++ b/app/code/Magento/Catalog/Helper/Output.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Helper;
 
 use Magento\Catalog\Model\Category as ModelCategory;
@@ -45,20 +47,29 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_escaper;
 
     /**
+     * @var array
+     */
+    private $directivePatterns;
+
+    /**
+     * Output constructor.
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param Data $catalogData
      * @param \Magento\Framework\Escaper $escaper
+     * @param array $directivePatterns
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Eav\Model\Config $eavConfig,
         Data $catalogData,
-        \Magento\Framework\Escaper $escaper
+        \Magento\Framework\Escaper $escaper,
+        $directivePatterns = []
     ) {
         $this->_eavConfig = $eavConfig;
         $this->_catalogData = $catalogData;
         $this->_escaper = $escaper;
+        $this->directivePatterns = $directivePatterns;
         parent::__construct($context);
     }
 
@@ -105,7 +116,7 @@ public function addHandler($method, $handler)
     public function getHandlers($method)
     {
         $method = strtolower($method);
-        return isset($this->_handlers[$method]) ? $this->_handlers[$method] : [];
+        return $this->_handlers[$method] ?? [];
     }
 
     /**
@@ -134,6 +145,7 @@ public function process($method, $result, $params)
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function productAttribute($product, $attributeHtml, $attributeName)
     {
@@ -151,10 +163,12 @@ public function productAttribute($product, $attributeHtml, $attributeName)
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
-        if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {
-            if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {
-                $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
-            }
+        if ($attributeHtml !== null
+            && $attribute->getIsHtmlAllowedOnFront()
+            && $attribute->getIsWysiwygEnabled()
+            && $this->isDirectivesExists($attributeHtml)
+        ) {
+            $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
         }
 
         $attributeHtml = $this->process(
@@ -173,6 +187,7 @@ public function productAttribute($product, $attributeHtml, $attributeName)
      * @param string $attributeHtml
      * @param string $attributeName
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function categoryAttribute($category, $attributeHtml, $attributeName)
     {
@@ -185,10 +200,13 @@ public function categoryAttribute($category, $attributeHtml, $attributeName)
         ) {
             $attributeHtml = $this->_escaper->escapeHtml($attributeHtml);
         }
-        if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {
-            if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {
-                $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
-            }
+        if ($attributeHtml !== null
+            && $attribute->getIsHtmlAllowedOnFront()
+            && $attribute->getIsWysiwygEnabled()
+            && $this->isDirectivesExists($attributeHtml)
+
+        ) {
+            $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
         }
         $attributeHtml = $this->process(
             'categoryAttribute',
@@ -197,4 +215,22 @@ public function categoryAttribute($category, $attributeHtml, $attributeName)
         );
         return $attributeHtml;
     }
+
+    /**
+     * Check if string has directives
+     *
+     * @param string $attributeHtml
+     * @return bool
+     */
+    public function isDirectivesExists($attributeHtml)
+    {
+        $matches = false;
+        foreach ($this->directivePatterns as $pattern) {
+            if (preg_match($pattern, $attributeHtml)) {
+                $matches = true;
+                break;
+            }
+        }
+        return $matches;
+    }
 }
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index 90d98874e00cb..d6d35c5c76dd8 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -166,7 +166,15 @@ public function getListUrl()
      */
     public function getPostDataParams($product)
     {
-        return $this->postHelper->getPostData($this->getAddUrl(), ['product' => $product->getId()]);
+        $params = ['product' => $product->getId()];
+        $requestingPageUrl = $this->_getRequest()->getParam('requesting_page_url');
+
+        if (!empty($requestingPageUrl)) {
+            $encodedUrl = $this->urlEncoder->encode($requestingPageUrl);
+            $params[\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED] = $encodedUrl;
+        }
+
+        return $this->postHelper->getPostData($this->getAddUrl(), $params);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index f732f9a4371cc..9b47e29900992 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Helper\Product;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface;
 use Magento\Framework\App\Helper\AbstractHelper;
@@ -43,6 +44,11 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      */
     private $serializer;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
@@ -55,12 +61,14 @@ public function __construct(
         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
         \Magento\Framework\Filter\FilterManager $filter,
         \Magento\Framework\Stdlib\StringUtils $string,
-        Json $serializer = null
+        Json $serializer = null,
+        Escaper $escaper = null
     ) {
         $this->_productOptionFactory = $productOptionFactory;
         $this->filter = $filter;
         $this->string = $string;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
         parent::__construct($context);
     }
 
@@ -175,7 +183,7 @@ public function getFormattedOptionValue($optionValue, $params = null)
             if (isset($optionValue['option_id'])) {
                 $optionInfo = $optionValue;
                 if (isset($optionInfo['value'])) {
-                    $optionValue = $optionInfo['value'];
+                    $optionValue = $this->escaper->escapeHtml($optionInfo['value']);
                 }
             } elseif (isset($optionValue['value'])) {
                 $optionValue = $optionValue['value'];
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 45ffb3625a69f..1509e489aee3b 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -59,6 +59,11 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $categoryUrlPathGenerator;
 
+    /**
+     * @var \Magento\Framework\Stdlib\StringUtils
+     */
+    private $string;
+
     /**
      * Constructor
      *
@@ -70,6 +75,7 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param array $messageGroups
+     * @param \Magento\Framework\Stdlib\StringUtils|null $string
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -79,7 +85,8 @@ public function __construct(
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
-        array $messageGroups = []
+        array $messageGroups = [],
+        \Magento\Framework\Stdlib\StringUtils $string = null
     ) {
         $this->_catalogSession = $catalogSession;
         $this->_catalogDesign = $catalogDesign;
@@ -88,9 +95,58 @@ public function __construct(
         $this->messageGroups = $messageGroups;
         $this->messageManager = $messageManager;
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
+        $this->string = $string ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Stdlib\StringUtils::class);
         parent::__construct($context);
     }
 
+    /**
+     * Add meta information from product to layout
+     *
+     * @param \Magento\Framework\View\Result\Page $resultPage
+     * @param \Magento\Catalog\Model\Product $product
+     * @return \Magento\Framework\View\Result\Page
+     */
+    private function preparePageMetadata(ResultPage $resultPage, $product)
+    {
+        $pageLayout = $resultPage->getLayout();
+        $pageConfig = $resultPage->getConfig();
+
+        $metaTitle = $product->getMetaTitle();
+        $pageConfig->setMetaTitle($metaTitle);
+        $pageConfig->getTitle()->set($metaTitle ?: $product->getName());
+
+        $keyword = $product->getMetaKeyword();
+        $currentCategory = $this->_coreRegistry->registry('current_category');
+        if ($keyword) {
+            $pageConfig->setKeywords($keyword);
+        } elseif ($currentCategory) {
+            $pageConfig->setKeywords($product->getName());
+        }
+
+        $description = $product->getMetaDescription();
+        if ($description) {
+            $pageConfig->setDescription($description);
+        } else {
+            $pageConfig->setDescription($this->string->substr(strip_tags($product->getDescription()), 0, 255));
+        }
+
+        if ($this->_catalogProduct->canUseCanonicalTag()) {
+            $pageConfig->addRemotePageAsset(
+                $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]),
+                'canonical',
+                ['attributes' => ['rel' => 'canonical']]
+            );
+        }
+
+        $pageMainTitle = $pageLayout->getBlock('page.main.title');
+        if ($pageMainTitle) {
+            $pageMainTitle->setPageTitle($product->getName());
+        }
+
+        return $this;
+    }
+
     /**
      * Init layout for viewing product page
      *
@@ -120,18 +176,18 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
         // Load default page handles and page configurations
         if ($params && $params->getBeforeHandles()) {
             foreach ($params->getBeforeHandles() as $handle) {
-                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
-
-        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
+    
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
+        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 
         if ($params && $params->getAfterHandles()) {
             foreach ($params->getAfterHandles() as $handle) {
-                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
 
@@ -225,6 +281,7 @@ public function prepareAndRender(ResultPage $resultPage, $productId, $controller
         }
 
         $this->initProductLayout($resultPage, $product, $params);
+        $this->preparePageMetadata($resultPage, $product);
         return $this;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 007635b124331..78a49cd1e8b14 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -179,7 +179,7 @@ public function isLockedAttribute($attributeCode)
      *
      * @param string|array $key
      * @param mixed $value
-     * @return \Magento\Framework\DataObject
+     * @return $this
      */
     public function setData($key, $value = null)
     {
@@ -282,9 +282,9 @@ public function getWebsiteStoreIds()
      *
      * Default value existing is flag for using store value in data
      *
-     * @param   string $attributeCode
-     * @param   mixed  $value
-     * @return  $this
+     * @param string $attributeCode
+     * @param mixed $value
+     * @return $this
      *
      * @deprecated 101.0.0
      */
@@ -332,11 +332,10 @@ public function getAttributeDefaultValue($attributeCode)
     }
 
     /**
-     * Set attribute code flag if attribute has value in current store and does not use
-     * value of default store as value
+     * Set attribute code flag if attribute has value in current store and does not use value of default store as value
      *
-     * @param   string $attributeCode
-     * @return  $this
+     * @param string $attributeCode
+     * @return $this
      *
      * @deprecated 101.0.0
      */
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
new file mode 100644
index 0000000000000..d3c84e69c9540
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+/**
+ * Based on Magento\Framework\Api\Filter builds condition
+ * that can be applied to Catalog\Model\ResourceModel\Product\Collection
+ * to filter products that has specific value for EAV attribute
+ */
+class EavAttributeCondition implements CustomConditionInterface
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
+    /**
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Framework\App\ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Framework\App\ResourceConnection $resourceConnection
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Build condition to filter product collection by EAV attribute
+     *
+     * @param Filter $filter
+     * @return string
+     * @throws \DomainException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function build(Filter $filter): string
+    {
+        $attribute = $this->getAttributeByCode($filter->getField());
+        $tableAlias = 'ca_' . $attribute->getAttributeCode();
+
+        $conditionType = $this->mapConditionType($filter->getConditionType());
+        $conditionValue = $this->mapConditionValue($conditionType, $filter->getValue());
+
+        // NOTE: store scope was ignored intentionally to perform search across all stores
+        $attributeSelect = $this->resourceConnection->getConnection()
+            ->select()
+            ->from(
+                [$tableAlias => $attribute->getBackendTable()],
+                $tableAlias . '.' . $attribute->getEntityIdField()
+            )->where(
+                $this->resourceConnection->getConnection()->prepareSqlCondition(
+                    $tableAlias . '.' . $attribute->getIdFieldName(),
+                    ['eq' => $attribute->getAttributeId()]
+                )
+            )->where(
+                $this->resourceConnection->getConnection()->prepareSqlCondition(
+                    $tableAlias . '.value',
+                    [$conditionType => $conditionValue]
+                )
+            );
+
+        return $this->resourceConnection
+            ->getConnection()
+            ->prepareSqlCondition(
+                Collection::MAIN_TABLE_ALIAS . '.' . $attribute->getEntityIdField(),
+                [
+                    'in' => $attributeSelect
+                ]
+            );
+    }
+
+    /**
+     * @param string $field
+     * @return Attribute
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAttributeByCode(string $field): Attribute
+    {
+        return $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field);
+    }
+
+    /**
+     * Map equal and not equal conditions to in and not in
+     *
+     * @param string $conditionType
+     * @return mixed
+     */
+    private function mapConditionType(string $conditionType): string
+    {
+        $conditionsMap = [
+            'eq' => 'in',
+            'neq' => 'nin'
+        ];
+
+        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+    }
+
+    /**
+     * Wraps value with '%' if condition type is 'like' or 'not like'
+     *
+     * @param string $conditionType
+     * @param string $conditionValue
+     * @return string
+     */
+    private function mapConditionValue(string $conditionType, string $conditionValue): string
+    {
+        $conditionsMap = ['like', 'nlike'];
+
+        if (in_array($conditionType, $conditionsMap)) {
+            $conditionValue = '%' . $conditionValue . '%';
+        }
+
+        return $conditionValue;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/Factory.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/Factory.php
new file mode 100644
index 0000000000000..66ddd0b8c0ad8
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/Factory.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+/**
+ * Creates appropriate condition builder based on filter field
+ * - native attribute condition builder if filter field is native attribute in product
+ * - eav condition builder if filter field is eav attribute
+ */
+class Factory
+{
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product
+     */
+    private $productResource;
+
+    /**
+     * @var CustomConditionInterface
+     */
+    private $eavAttributeConditionBuilder;
+
+    /**
+     * @var CustomConditionInterface
+     */
+    private $nativeAttributeConditionBuilder;
+
+    /**
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
+     * @param CustomConditionInterface $eavAttributeConditionBuilder
+     * @param CustomConditionInterface $nativeAttributeConditionBuilder
+     */
+    public function __construct(
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Catalog\Model\ResourceModel\Product $productResource,
+        CustomConditionInterface $eavAttributeConditionBuilder,
+        CustomConditionInterface $nativeAttributeConditionBuilder
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->productResource = $productResource;
+        $this->eavAttributeConditionBuilder = $eavAttributeConditionBuilder;
+        $this->nativeAttributeConditionBuilder = $nativeAttributeConditionBuilder;
+    }
+
+    /**
+     * Decides which condition builder should be used for passed filter
+     * can be either EAV attribute builder or native attribute builder
+     * "native" attribute means attribute that is in catalog_product_entity table
+     *
+     * @param Filter $filter
+     * @return CustomConditionInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function createByFilter(Filter $filter): CustomConditionInterface
+    {
+        $attribute = $this->getAttributeByCode($filter->getField());
+
+        if ($attribute->getBackendTable() === $this->productResource->getEntityTable()) {
+            return $this->nativeAttributeConditionBuilder;
+        }
+
+        return $this->eavAttributeConditionBuilder;
+    }
+
+    /**
+     * @param string $field
+     * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAttributeByCode(string $field): Attribute
+    {
+        return $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
new file mode 100644
index 0000000000000..71b9a9c470374
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+
+/**
+ * Based on Magento\Framework\Api\Filter builds condition
+ * that can be applied to Catalog\Model\ResourceModel\Product\Collection
+ * to filter products that has specific value for their native attribute
+ */
+class NativeAttributeCondition implements CustomConditionInterface
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param \Magento\Framework\App\ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Build condition to filter product collection by product native attribute
+     * "native" attribute means attribute that is in catalog_product_entity table
+     *
+     * @param Filter $filter
+     * @return string
+     * @throws \DomainException
+     */
+    public function build(Filter $filter): string
+    {
+        $conditionType = $this->mapConditionType($filter->getConditionType(), $filter->getField());
+        $conditionValue = $this->mapConditionValue($conditionType, $filter->getValue());
+
+        return $this->resourceConnection
+            ->getConnection()
+            ->prepareSqlCondition(
+                Collection::MAIN_TABLE_ALIAS . '.' . $filter->getField(),
+                [
+                    $conditionType => $conditionValue
+                ]
+            );
+    }
+
+    /**
+     * Map equal and not equal conditions to in and not in
+     *
+     * @param string $conditionType
+     * @param string $field
+     * @return mixed
+     */
+    private function mapConditionType(string $conditionType, string $field): string
+    {
+        if (strtolower($field) === ProductInterface::SKU) {
+            $conditionsMap = [
+                'eq' => 'like',
+                'neq' => 'nlike'
+            ];
+        } else {
+            $conditionsMap = [
+                'eq' => 'in',
+                'neq' => 'nin'
+            ];
+        }
+
+        return $conditionsMap[$conditionType] ?? $conditionType;
+    }
+
+    /**
+     * Wraps value with '%' if condition type is 'like' or 'not like'
+     *
+     * @param string $conditionType
+     * @param string $conditionValue
+     * @return string
+     */
+    private function mapConditionValue(string $conditionType, string $conditionValue): string
+    {
+        $conditionsMap = ['like', 'nlike'];
+
+        if (in_array($conditionType, $conditionsMap)) {
+            $conditionValue = '%' . $conditionValue . '%';
+        }
+
+        return $conditionValue;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/DefaultCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/DefaultCondition.php
new file mode 100644
index 0000000000000..14685d87762c2
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/DefaultCondition.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder\Factory;
+
+/**
+ * Default condition builder for Catalog\Model\ResourceModel\Product\Collection
+ */
+class DefaultCondition implements CustomConditionInterface
+{
+    /**
+     * @var Factory
+     */
+    private $conditionBuilderFactory;
+
+    /**
+     * @param Factory $conditionBuilderFactory
+     */
+    public function __construct(
+        Factory $conditionBuilderFactory
+    ) {
+        $this->conditionBuilderFactory = $conditionBuilderFactory;
+    }
+
+    /**
+     * Builds condition to filter product collection either by EAV or by native attribute
+     *
+     * @param Filter $filter
+     * @return string
+     */
+    public function build(Filter $filter): string
+    {
+        $filterBuilder = $this->conditionBuilderFactory->createByFilter($filter);
+
+        return $filterBuilder->build($filter);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php
new file mode 100644
index 0000000000000..66a9132ae44b8
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\NoSuchEntityException as CategoryDoesNotExistException;
+
+/**
+ * Based on Magento\Framework\Api\Filter builds condition
+ * that can be applied to Catalog\Model\ResourceModel\Product\Collection
+ * to filter products by specific categories
+ */
+class ProductCategoryCondition implements CustomConditionInterface
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\Catalog\Model\CategoryRepository
+     */
+    private $categoryRepository;
+
+    /**
+     * Level that has store root categories
+     * @var int
+     */
+    private $rootCategoryLevel = 1;
+
+    /**
+     * @param \Magento\Framework\App\ResourceConnection $resourceConnection
+     * @param \Magento\Catalog\Model\CategoryRepository $categoryRepository
+     */
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resourceConnection,
+        \Magento\Catalog\Model\CategoryRepository $categoryRepository
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    /**
+     * Builds condition to filter product collection by categories
+     *
+     * @param Filter $filter
+     * @return string
+     */
+    public function build(Filter $filter): string
+    {
+        $categorySelect = $this->resourceConnection->getConnection()->select()
+            ->from(
+                ['cat' => $this->resourceConnection->getTableName('catalog_category_product')],
+                'cat.product_id'
+            )->where(
+                $this->resourceConnection->getConnection()->prepareSqlCondition(
+                    'cat.category_id',
+                    [$this->mapConditionType($filter->getConditionType()) => $this->getCategoryIds($filter)]
+                )
+            );
+
+        $selectCondition = [
+            'in' => $categorySelect
+        ];
+
+        return $this->resourceConnection->getConnection()
+            ->prepareSqlCondition(Collection::MAIN_TABLE_ALIAS . '.entity_id', $selectCondition);
+    }
+
+    /**
+     * Extracts required category ids from Filter
+     * If category is anchor all children categories will be included too
+     * If category is root all children categories will be included too
+     *
+     * @param Filter $filter
+     * @return array
+     */
+    private function getCategoryIds(Filter $filter): array
+    {
+        $categoryIds = explode(',', $filter->getValue());
+        $childCategoryIds = [];
+
+        foreach ($categoryIds as $categoryId) {
+            try {
+                $category = $this->categoryRepository->get($categoryId);
+            } catch (CategoryDoesNotExistException $exception) {
+                continue;
+            }
+
+            if ($category->getIsAnchor()) {
+                $childCategoryIds[] = $category->getAllChildren(true);
+            }
+
+            // This is the simplest way to check if category is root
+            if ((int)$category->getLevel() === $this->rootCategoryLevel) {
+                $childCategoryIds[] = $category->getAllChildren(true);
+            }
+        }
+
+        return array_map('intval', array_unique(array_merge($categoryIds, ...$childCategoryIds)));
+    }
+
+    /**
+     * Map equal and not equal conditions to in and not in
+     *
+     * @param string $conditionType
+     * @return string
+     */
+    private function mapConditionType(string $conditionType): string
+    {
+        $conditionsMap = [
+            'eq' => 'in',
+            'neq' => 'nin',
+            'like' => 'in',
+            'nlike' => 'nin',
+        ];
+        return $conditionsMap[$conditionType] ?? $conditionType;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
index e0fbc16421f55..8de708dd467c8 100644
--- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
@@ -21,8 +21,13 @@ class ProductCategoryFilter implements CustomFilterInterface
      */
     public function apply(Filter $filter, AbstractDb $collection)
     {
-        $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
-        $categoryFilter = [$conditionType => [$filter->getValue()]];
+        $value = $filter->getValue();
+        $conditionType = $filter->getConditionType() ?: 'in';
+        $filterValue = [$value];
+        if (($conditionType === 'in' || $conditionType === 'nin') && is_string($value)) {
+            $filterValue = explode(',', $value);
+        }
+        $categoryFilter = [$conditionType => $filterValue];
 
         /** @var Collection $collection */
         $collection->addCategoriesFilter($categoryFilter);
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductPriceFilter.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductPriceFilter.php
new file mode 100644
index 0000000000000..859ad7cec16dc
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductPriceFilter.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+
+/**
+ * This filter is using indexers for prices and will not work without indexers
+ */
+class ProductPriceFilter implements CustomFilterInterface
+{
+    /**
+     * Apply prices Filter to Product Collection
+     *
+     * @param Filter $filter
+     * @param Collection $collection
+     * @return bool Whether the filter is applied
+     */
+    public function apply(Filter $filter, AbstractDb $collection) : bool
+    {
+        $collection->addFinalPrice();
+        $collection->addMinimalPrice();
+        $collection->addPriceData();
+        $collection->addTaxPercents();
+
+        $conditionType = $filter->getConditionType();
+        $sqlCondition = $collection
+            ->getConnection()
+            ->prepareSqlCondition(
+                Collection::INDEX_TABLE_ALIAS . '.' . $filter->getField(),
+                [$conditionType => $filter->getValue()]
+            );
+        $collection->getSelect()->where($sqlCondition);
+        return true;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php b/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php
index bea230da17c83..1d763fad1432f 100644
--- a/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php
+++ b/app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Attribure lock state validator
+ * Attribute lock state validator
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php b/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
index d259a4dcb3987..bb63281bd4895 100644
--- a/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
+++ b/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Attribure lock state validator interface
+ * Attribute lock state validator interface
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index c4d6742a02dd3..29fb0d282a87c 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Model;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Convert\ConvertArray;
@@ -28,6 +29,8 @@
  * @method Category setUrlPath(string $urlPath)
  * @method Category getSkipDeleteChildren()
  * @method Category setSkipDeleteChildren(boolean $value)
+ * @method Category setChangedProductIds(array $categoryIds) Set products ids that inserted or deleted for category
+ * @method array getChangedProductIds() Get products ids that inserted or deleted for category
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
@@ -69,22 +72,10 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
 
     const CACHE_TAG = 'cat_c';
 
-    /**#@+
-     * Constants
-     */
-    const KEY_PARENT_ID = 'parent_id';
-    const KEY_NAME = 'name';
-    const KEY_IS_ACTIVE = 'is_active';
-    const KEY_POSITION = 'position';
-    const KEY_LEVEL = 'level';
-    const KEY_UPDATED_AT = 'updated_at';
-    const KEY_CREATED_AT = 'created_at';
-    const KEY_PATH = 'path';
-    const KEY_AVAILABLE_SORT_BY = 'available_sort_by';
-    const KEY_INCLUDE_IN_MENU = 'include_in_menu';
-    const KEY_PRODUCT_COUNT = 'product_count';
-    const KEY_CHILDREN_DATA = 'children_data';
-    /**#@-*/
+    /**
+     * Category Store Id
+     */
+    const STORE_ID = 'store_id';
 
     /**#@-*/
     protected $_eventPrefix = 'catalog_category';
@@ -110,6 +101,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_url;
 
+    /**
+     * @var ResourceModel\Category
+     */
+    protected $_resource;
+
     /**
      * URL rewrite model
      *
@@ -142,21 +138,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
     /**
      * Attributes are that part of interface
      *
+     * @deprecated
+     * @see CategoryInterface::ATTRIBUTES
      * @var array
      */
-    protected $interfaceAttributes = [
-        'id',
-        self::KEY_PARENT_ID,
-        self::KEY_NAME,
-        self::KEY_IS_ACTIVE,
-        self::KEY_POSITION,
-        self::KEY_LEVEL,
-        self::KEY_UPDATED_AT,
-        self::KEY_CREATED_AT,
-        self::KEY_AVAILABLE_SORT_BY,
-        self::KEY_INCLUDE_IN_MENU,
-        self::KEY_CHILDREN_DATA,
-    ];
+    protected $interfaceAttributes = CategoryInterface::ATTRIBUTES;
 
     /**
      * Category tree model
@@ -319,17 +305,29 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getCustomAttributesCodes()
     {
         if ($this->customAttributesCodes === null) {
             $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
-            $this->customAttributesCodes = array_diff($this->customAttributesCodes, $this->interfaceAttributes);
+            $this->customAttributesCodes = array_diff($this->customAttributesCodes, CategoryInterface::ATTRIBUTES);
         }
         return $this->customAttributesCodes;
     }
 
+    /**
+     * Returns model resource
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Category
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * Get flat resource model flag
      *
@@ -571,12 +569,12 @@ public function getStoreIds()
      *
      * If store id is underfined for category return current active store id
      *
-     * @return integer
+     * @return int
      */
     public function getStoreId()
     {
-        if ($this->hasData('store_id')) {
-            return (int)$this->_getData('store_id');
+        if ($this->hasData(self::STORE_ID)) {
+            return (int)$this->_getData(self::STORE_ID);
         }
         return (int)$this->_storeManager->getStore()->getId();
     }
@@ -592,7 +590,7 @@ public function setStoreId($storeId)
         if (!is_numeric($storeId)) {
             $storeId = $this->_storeManager->getStore($storeId)->getId();
         }
-        $this->setData('store_id', $storeId);
+        $this->setData(self::STORE_ID, $storeId);
         $this->getResource()->setStoreId($storeId);
         return $this;
     }
@@ -657,6 +655,8 @@ public function formatUrlKey($str)
     }
 
     /**
+     * Returns image url
+     *
      * @param string $attributeCode
      * @return bool|string
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -667,9 +667,22 @@ public function getImageUrl($attributeCode = 'image')
         $image = $this->getData($attributeCode);
         if ($image) {
             if (is_string($image)) {
-                $url = $this->_storeManager->getStore()->getBaseUrl(
+                $store = $this->_storeManager->getStore();
+
+                $isRelativeUrl = substr($image, 0, 1) === '/';
+
+                $mediaBaseUrl = $store->getBaseUrl(
                     \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-                ) . 'catalog/category/' . $image;
+                );
+
+                if ($isRelativeUrl) {
+                    $url = $image;
+                } else {
+                    $url = $mediaBaseUrl
+                        . ltrim(\Magento\Catalog\Model\Category\FileInfo::ENTITY_MEDIA_PATH, '/')
+                        . '/'
+                        . $image;
+                }
             } else {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Something went wrong while getting the image url.')
@@ -704,7 +717,7 @@ public function getParentId()
             return $parentId;
         }
         $parentIds = $this->getParentIds();
-        return intval(array_pop($parentIds));
+        return (int) array_pop($parentIds);
     }
 
     /**
@@ -780,15 +793,19 @@ public function getAllChildren($asArray = false)
     /**
      * Retrieve children ids comma separated
      *
+     * @param boolean $recursive
+     * @param boolean $isActive
+     * @param boolean $sortByPosition
      * @return string
      */
-    public function getChildren()
+    public function getChildren($recursive = false, $isActive = true, $sortByPosition = false)
     {
-        return implode(',', $this->getResource()->getChildren($this, false));
+        return implode(',', $this->getResource()->getChildren($this, $recursive, $isActive, $sortByPosition));
     }
 
     /**
      * Retrieve Stores where isset category Path
+     *
      * Return comma separated string
      *
      * @return string
@@ -819,6 +836,7 @@ public function checkId($id)
 
     /**
      * Get array categories ids which are part of category path
+     *
      * Result array contain id of current category because it is part of the path
      *
      * @return array
@@ -938,8 +956,11 @@ public function getAnchorsAbove()
      */
     public function getProductCount()
     {
-        $count = $this->_getResource()->getProductCount($this);
-        $this->setData(self::KEY_PRODUCT_COUNT, $count);
+        if (!$this->hasData(self::KEY_PRODUCT_COUNT)) {
+            $count = $this->_getResource()->getProductCount($this);
+            $this->setData(self::KEY_PRODUCT_COUNT, $count);
+        }
+
         return $this->getData(self::KEY_PRODUCT_COUNT);
     }
 
@@ -1019,7 +1040,8 @@ public function getAvailableSortBy()
 
     /**
      * Retrieve Available Product Listing  Sort By
-     * code as key, value - name
+     *
+     * Code as key, value - name
      *
      * @return array
      */
@@ -1140,6 +1162,8 @@ public function getIdentities()
     }
 
     /**
+     * Returns path
+     *
      * @codeCoverageIgnoreStart
      * @return string|null
      */
@@ -1149,6 +1173,8 @@ public function getPath()
     }
 
     /**
+     * Returns position
+     *
      * @return int|null
      */
     public function getPosition()
@@ -1157,6 +1183,8 @@ public function getPosition()
     }
 
     /**
+     * Returns children count
+     *
      * @return int
      */
     public function getChildrenCount()
@@ -1165,6 +1193,8 @@ public function getChildrenCount()
     }
 
     /**
+     * Returns created at
+     *
      * @return string|null
      */
     public function getCreatedAt()
@@ -1173,6 +1203,8 @@ public function getCreatedAt()
     }
 
     /**
+     * Returns updated at
+     *
      * @return string|null
      */
     public function getUpdatedAt()
@@ -1181,6 +1213,8 @@ public function getUpdatedAt()
     }
 
     /**
+     * Returns is active
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -1190,6 +1224,8 @@ public function getIsActive()
     }
 
     /**
+     * Returns category id
+     *
      * @return int|null
      */
     public function getCategoryId()
@@ -1198,6 +1234,8 @@ public function getCategoryId()
     }
 
     /**
+     * Returns display mode
+     *
      * @return string|null
      */
     public function getDisplayMode()
@@ -1206,6 +1244,8 @@ public function getDisplayMode()
     }
 
     /**
+     * Returns is include in menu
+     *
      * @return bool|null
      */
     public function getIncludeInMenu()
@@ -1214,6 +1254,8 @@ public function getIncludeInMenu()
     }
 
     /**
+     * Returns url key
+     *
      * @return string|null
      */
     public function getUrlKey()
@@ -1222,6 +1264,8 @@ public function getUrlKey()
     }
 
     /**
+     * Returns children data
+     *
      * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|null
      */
     public function getChildrenData()
@@ -1337,6 +1381,8 @@ public function setLevel($level)
     }
 
     /**
+     * Set updated at
+     *
      * @param string $updatedAt
      * @return $this
      */
@@ -1346,6 +1392,8 @@ public function setUpdatedAt($updatedAt)
     }
 
     /**
+     * Set created at
+     *
      * @param string $createdAt
      * @return $this
      */
@@ -1355,6 +1403,8 @@ public function setCreatedAt($createdAt)
     }
 
     /**
+     * Set path
+     *
      * @param string $path
      * @return $this
      */
@@ -1364,6 +1414,8 @@ public function setPath($path)
     }
 
     /**
+     * Set available sort by
+     *
      * @param string[]|string $availableSortBy
      * @return $this
      */
@@ -1373,6 +1425,8 @@ public function setAvailableSortBy($availableSortBy)
     }
 
     /**
+     * Set include in menu
+     *
      * @param bool $includeInMenu
      * @return $this
      */
@@ -1393,6 +1447,8 @@ public function setProductCount($productCount)
     }
 
     /**
+     * Set children data
+     *
      * @param \Magento\Catalog\Api\Data\CategoryTreeInterface[] $childrenData
      * @return $this
      */
@@ -1402,7 +1458,7 @@ public function setChildrenData(array $childrenData = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Catalog\Api\Data\CategoryExtensionInterface|null
      */
@@ -1412,7 +1468,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute.php b/app/code/Magento/Catalog/Model/Category/Attribute.php
index 968db224c01f5..b1803a0db947e 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute.php
@@ -29,14 +29,15 @@ class Attribute extends \Magento\Catalog\Model\Entity\Attribute implements
      */
     public function getApplyTo()
     {
-        if ($this->getData(self::APPLY_TO)) {
-            if (is_array($this->getData(self::APPLY_TO))) {
-                return $this->getData(self::APPLY_TO);
+        $applyTo = $this->_getData(self::APPLY_TO);
+        if ($applyTo) {
+            if (is_array($applyTo)) {
+                return $applyTo;
             }
-            return explode(',', $this->getData(self::APPLY_TO));
-        } else {
-            return [];
+            return explode(',', $applyTo);
         }
+
+        return [];
     }
 
     /**
@@ -59,7 +60,7 @@ public function setApplyTo($applyTo)
      */
     public function getIsWysiwygEnabled()
     {
-        return $this->getData(self::IS_WYSIWYG_ENABLED);
+        return $this->_getData(self::IS_WYSIWYG_ENABLED);
     }
 
     /**
@@ -70,7 +71,7 @@ public function getIsWysiwygEnabled()
      */
     public function setIsWysiwygEnabled($isWysiwygEnabled)
     {
-        return $this->getData(self::IS_WYSIWYG_ENABLED, $isWysiwygEnabled);
+        return $this->setData(self::IS_WYSIWYG_ENABLED, $isWysiwygEnabled);
     }
 
     /**
@@ -78,7 +79,7 @@ public function setIsWysiwygEnabled($isWysiwygEnabled)
      */
     public function getIsHtmlAllowedOnFront()
     {
-        return $this->getData(self::IS_HTML_ALLOWED_ON_FRONT);
+        return $this->_getData(self::IS_HTML_ALLOWED_ON_FRONT);
     }
 
     /**
@@ -97,7 +98,7 @@ public function setIsHtmlAllowedOnFront($isHtmlAllowedOnFront)
      */
     public function getUsedForSortBy()
     {
-        return $this->getData(self::USED_FOR_SORT_BY);
+        return $this->_getData(self::USED_FOR_SORT_BY);
     }
 
     /**
@@ -116,7 +117,7 @@ public function setUsedForSortBy($usedForSortBy)
      */
     public function getIsFilterable()
     {
-        return $this->getData(self::IS_FILTERABLE);
+        return $this->_getData(self::IS_FILTERABLE);
     }
 
     /**
@@ -135,7 +136,7 @@ public function setIsFilterable($isFilterable)
      */
     public function getIsFilterableInSearch()
     {
-        return $this->getData(self::IS_FILTERABLE_IN_SEARCH);
+        return $this->_getData(self::IS_FILTERABLE_IN_SEARCH);
     }
 
     /**
@@ -143,7 +144,7 @@ public function getIsFilterableInSearch()
      */
     public function getIsUsedInGrid()
     {
-        return (bool)$this->getData(self::IS_USED_IN_GRID);
+        return (bool)$this->_getData(self::IS_USED_IN_GRID);
     }
 
     /**
@@ -151,7 +152,7 @@ public function getIsUsedInGrid()
      */
     public function getIsVisibleInGrid()
     {
-        return (bool)$this->getData(self::IS_VISIBLE_IN_GRID);
+        return (bool)$this->_getData(self::IS_VISIBLE_IN_GRID);
     }
 
     /**
@@ -159,7 +160,7 @@ public function getIsVisibleInGrid()
      */
     public function getIsFilterableInGrid()
     {
-        return (bool)$this->getData(self::IS_FILTERABLE_IN_GRID);
+        return (bool)$this->_getData(self::IS_FILTERABLE_IN_GRID);
     }
 
     /**
@@ -170,7 +171,7 @@ public function getIsFilterableInGrid()
      */
     public function setIsFilterableInSearch($isFilterableInSearch)
     {
-        return $this->getData(self::IS_FILTERABLE_IN_SEARCH, $isFilterableInSearch);
+        return $this->setData(self::IS_FILTERABLE_IN_SEARCH, $isFilterableInSearch);
     }
 
     /**
@@ -178,7 +179,7 @@ public function setIsFilterableInSearch($isFilterableInSearch)
      */
     public function getPosition()
     {
-        return $this->getData(self::POSITION);
+        return $this->_getData(self::POSITION);
     }
 
     /**
@@ -197,7 +198,7 @@ public function setPosition($position)
      */
     public function getIsSearchable()
     {
-        return $this->getData(self::IS_SEARCHABLE);
+        return $this->_getData(self::IS_SEARCHABLE);
     }
 
     /**
@@ -216,7 +217,7 @@ public function setIsSearchable($isSearchable)
      */
     public function getIsVisibleInAdvancedSearch()
     {
-        return $this->getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
+        return $this->_getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
     }
 
     /**
@@ -235,7 +236,7 @@ public function setIsVisibleInAdvancedSearch($isVisibleInAdvancedSearch)
      */
     public function getIsComparable()
     {
-        return $this->getData(self::IS_COMPARABLE);
+        return $this->_getData(self::IS_COMPARABLE);
     }
 
     /**
@@ -254,7 +255,7 @@ public function setIsComparable($isComparable)
      */
     public function getIsUsedForPromoRules()
     {
-        return $this->getData(self::IS_USED_FOR_PROMO_RULES);
+        return $this->_getData(self::IS_USED_FOR_PROMO_RULES);
     }
 
     /**
@@ -273,7 +274,7 @@ public function setIsUsedForPromoRules($isUsedForPromoRules)
      */
     public function getIsVisibleOnFront()
     {
-        return $this->getData(self::IS_VISIBLE_ON_FRONT);
+        return $this->_getData(self::IS_VISIBLE_ON_FRONT);
     }
 
     /**
@@ -292,7 +293,7 @@ public function setIsVisibleOnFront($isVisibleOnFront)
      */
     public function getUsedInProductListing()
     {
-        return $this->getData(self::USED_IN_PRODUCT_LISTING);
+        return $this->_getData(self::USED_IN_PRODUCT_LISTING);
     }
 
     /**
@@ -311,7 +312,7 @@ public function setUsedInProductListing($usedInProductListing)
      */
     public function getIsVisible()
     {
-        return $this->getData(self::IS_VISIBLE);
+        return $this->_getData(self::IS_VISIBLE);
     }
 
     /**
@@ -332,7 +333,7 @@ public function setIsVisible($isVisible)
      */
     public function getScope()
     {
-        $scope = $this->getData(self::KEY_IS_GLOBAL);
+        $scope = $this->_getData(self::KEY_IS_GLOBAL);
         if ($scope == self::SCOPE_GLOBAL) {
             return self::SCOPE_GLOBAL_TEXT;
         } elseif ($scope == self::SCOPE_WEBSITE) {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
index 19587ce56f592..cd450e26cd832 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\Category\Attribute\Backend;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 /**
  * Catalog category image attribute backend model
  *
@@ -95,11 +97,16 @@ public function beforeSave($object)
         $attributeName = $this->getAttribute()->getName();
         $value = $object->getData($attributeName);
 
+        if ($this->fileResidesOutsideCategoryDir($value)) {
+            // use relative path for image attribute so we know it's outside of category dir when we fetch it
+            $value[0]['name'] = $value[0]['url'];
+        }
+
         if ($imageName = $this->getUploadedImageName($value)) {
             $object->setData($this->additionalData . $attributeName, $value);
             $object->setData($attributeName, $imageName);
         } elseif (!is_string($value)) {
-            $object->setData($attributeName, '');
+            $object->setData($attributeName, null);
         }
 
         return parent::beforeSave($object);
@@ -131,6 +138,26 @@ private function isTmpFileAvailable($value)
         return is_array($value) && isset($value[0]['tmp_name']);
     }
 
+    /**
+     * Check for file path resides outside of category media dir. The URL will be a path including pub/media if true
+     *
+     * @param array|null $value
+     * @return bool
+     */
+    private function fileResidesOutsideCategoryDir($value)
+    {
+        if (!is_array($value) || !isset($value[0]['url'])) {
+            return false;
+        }
+
+        $fileUrl = ltrim($value[0]['url'], '/');
+        $baseMediaDir = $this->_filesystem->getUri(DirectoryList::MEDIA);
+
+        $usingPathRelativeToBase = strpos($fileUrl, $baseMediaDir) === 0;
+
+        return $usingPathRelativeToBase;
+    }
+
     /**
      * Save uploaded file and set its name to category
      *
@@ -148,6 +175,7 @@ public function afterSave($object)
                 $this->_logger->critical($e);
             }
         }
+
         return $this;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index b6653b73aee8d..057933c55e6de 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Category\Attribute\Backend;
 
 /**
@@ -58,7 +59,7 @@ public function validate($object)
             if (!$this->getAttribute()->getEntity()->checkAttributeUniqueValue($this->getAttribute(), $object)) {
                 $label = $this->getAttribute()->getFrontend()->getLabel();
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('The value of attribute "%1" must be unique.', $label)
+                    __('The value of the "%1" attribute isn\'t unique. Set a unique value and try again.', $label)
                 );
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index 803c89a2504fb..a4127c9a97ffd 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -492,12 +492,20 @@ private function convertValues($category, $categoryData)
                 unset($categoryData[$attributeCode]);
 
                 $fileName = $category->getData($attributeCode);
-                if ($this->getFileInfo()->isExist($fileName)) {
-                    $stat = $this->getFileInfo()->getStat($fileName);
-                    $mime = $this->getFileInfo()->getMimeType($fileName);
+                $fileInfo = $this->getFileInfo();
+
+                if ($fileInfo->isExist($fileName)) {
+                    $stat = $fileInfo->getStat($fileName);
+                    $mime = $fileInfo->getMimeType($fileName);
+
+                    $categoryData[$attributeCode][0]['name'] = basename($fileName);
+
+                    if ($fileInfo->isBeginsWithMediaDirectoryPath($fileName)) {
+                        $categoryData[$attributeCode][0]['url'] = $fileName;
+                    } else {
+                        $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
+                    }
 
-                    $categoryData[$attributeCode][0]['name'] = $fileName;
-                    $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
                     $categoryData[$attributeCode][0]['size'] = isset($stat) ? $stat['size'] : 0;
                     $categoryData[$attributeCode][0]['type'] = $mime;
                 }
diff --git a/app/code/Magento/Catalog/Model/Category/FileInfo.php b/app/code/Magento/Catalog/Model/Category/FileInfo.php
index b26036ff9832c..9715bb2b1616e 100644
--- a/app/code/Magento/Catalog/Model/Category/FileInfo.php
+++ b/app/code/Magento/Catalog/Model/Category/FileInfo.php
@@ -9,6 +9,7 @@
 use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 
 /**
  * Class FileInfo
@@ -37,6 +38,11 @@ class FileInfo
      */
     private $mediaDirectory;
 
+    /**
+     * @var ReadInterface
+     */
+    private $baseDirectory;
+
     /**
      * @param Filesystem $filesystem
      * @param Mime $mime
@@ -62,6 +68,20 @@ private function getMediaDirectory()
         return $this->mediaDirectory;
     }
 
+    /**
+     * Get Base Directory read instance
+     *
+     * @return ReadInterface
+     */
+    private function getBaseDirectory()
+    {
+        if (!isset($this->baseDirectory)) {
+            $this->baseDirectory = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
+        }
+
+        return $this->baseDirectory;
+    }
+
     /**
      * Retrieve MIME type of requested file
      *
@@ -70,7 +90,7 @@ private function getMediaDirectory()
      */
     public function getMimeType($fileName)
     {
-        $filePath = self::ENTITY_MEDIA_PATH . '/' . ltrim($fileName, '/');
+        $filePath = $this->getFilePath($fileName);
         $absoluteFilePath = $this->getMediaDirectory()->getAbsolutePath($filePath);
 
         $result = $this->mime->getMimeType($absoluteFilePath);
@@ -85,7 +105,7 @@ public function getMimeType($fileName)
      */
     public function getStat($fileName)
     {
-        $filePath = self::ENTITY_MEDIA_PATH . '/' . ltrim($fileName, '/');
+        $filePath = $this->getFilePath($fileName);
 
         $result = $this->getMediaDirectory()->stat($filePath);
         return $result;
@@ -99,9 +119,65 @@ public function getStat($fileName)
      */
     public function isExist($fileName)
     {
-        $filePath = self::ENTITY_MEDIA_PATH . '/' . ltrim($fileName, '/');
+        $filePath = $this->getFilePath($fileName);
 
         $result = $this->getMediaDirectory()->isExist($filePath);
         return $result;
     }
+
+    /**
+     * Construct and return file subpath based on filename relative to media directory
+     *
+     * @param string $fileName
+     * @return string
+     */
+    private function getFilePath($fileName)
+    {
+        $filePath = ltrim($fileName, '/');
+
+        $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath();
+        $isFileNameBeginsWithMediaDirectoryPath = $this->isBeginsWithMediaDirectoryPath($fileName);
+
+        // if the file is not using a relative path, it resides in the catalog/category media directory
+        $fileIsInCategoryMediaDir = !$isFileNameBeginsWithMediaDirectoryPath;
+
+        if ($fileIsInCategoryMediaDir) {
+            $filePath = self::ENTITY_MEDIA_PATH . '/' . $filePath;
+        } else {
+            $filePath = substr($filePath, strlen($mediaDirectoryRelativeSubpath));
+        }
+
+        return $filePath;
+    }
+
+    /**
+     * Checks for whether $fileName string begins with media directory path
+     *
+     * @param string $fileName
+     * @return bool
+     */
+    public function isBeginsWithMediaDirectoryPath($fileName)
+    {
+        $filePath = ltrim($fileName, '/');
+
+        $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath();
+        $isFileNameBeginsWithMediaDirectoryPath = strpos($filePath, $mediaDirectoryRelativeSubpath) === 0;
+
+        return $isFileNameBeginsWithMediaDirectoryPath;
+    }
+
+    /**
+     * Get media directory subpath relative to base directory path
+     *
+     * @return string
+     */
+    private function getMediaDirectoryPathRelativeToBaseDirectoryPath()
+    {
+        $baseDirectoryPath = $this->getBaseDirectory()->getAbsolutePath();
+        $mediaDirectoryPath = $this->getMediaDirectory()->getAbsolutePath();
+
+        $mediaDirectoryRelativeSubpath = substr($mediaDirectoryPath, strlen($baseDirectoryPath));
+
+        return $mediaDirectoryRelativeSubpath;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
index 29a1ef60a43de..4ea06d4e34d71 100644
--- a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Model\Category\Link;
 
 use Magento\Catalog\Api\Data\CategoryLinkInterface;
-use Magento\Catalog\Model\Indexer\Product\Category;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
@@ -40,6 +39,8 @@ public function __construct(
     }
 
     /**
+     * Execute
+     *
      * @param object $entity
      * @param array $arguments
      * @return object
@@ -78,6 +79,8 @@ public function execute($entity, $arguments = [])
     }
 
     /**
+     * Get category links positions
+     *
      * @param object $entity
      * @return array
      */
@@ -106,25 +109,19 @@ private function getCategoryLinksPositions($entity)
      */
     private function mergeCategoryLinks($newCategoryPositions, $oldCategoryPositions)
     {
-        $result = [];
         if (empty($newCategoryPositions)) {
-            return $result;
+            return [];
         }
 
+        $categoryPositions = array_combine(array_column($oldCategoryPositions, 'category_id'), $oldCategoryPositions);
         foreach ($newCategoryPositions as $newCategoryPosition) {
-            $key = array_search(
-                $newCategoryPosition['category_id'],
-                array_column($oldCategoryPositions, 'category_id')
-            );
-
-            if ($key === false) {
-                $result[] = $newCategoryPosition;
-            } elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
-                $result[] = $newCategoryPositions[$key];
-                unset($oldCategoryPositions[$key]);
+            $categoryId = $newCategoryPosition['category_id'];
+            if (!isset($categoryPositions[$categoryId])) {
+                $categoryPositions[$categoryId] = ['category_id' => $categoryId];
             }
+            $categoryPositions[$categoryId]['position'] = $newCategoryPosition['position'];
         }
-        $result = array_merge($result, $oldCategoryPositions);
+        $result = array_values($categoryPositions);
 
         return $result;
     }
diff --git a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
new file mode 100644
index 0000000000000..44bf153f83697
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Category\Product;
+
+/**
+ * Resolver to get product positions by ids assigned to specific category
+ */
+class PositionResolver extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('catalog_product_entity', 'entity_id');
+    }
+
+    /**
+     * Get category product positions
+     *
+     * @param int $categoryId
+     * @return array
+     */
+    public function getPositions(int $categoryId): array
+    {
+        $connection = $this->getConnection();
+
+        $select = $connection->select()->from(
+            ['cpe' => $this->getTable('catalog_product_entity')],
+            'entity_id'
+        )->joinLeft(
+            ['ccp' => $this->getTable('catalog_category_product')],
+            'ccp.product_id=cpe.entity_id'
+        )->where(
+            'ccp.category_id = ?',
+            $categoryId
+        )->order(
+            'ccp.position ' . \Magento\Framework\DB\Select::SQL_ASC
+        )->order(
+            'ccp.product_id ' . \Magento\Framework\DB\Select::SQL_DESC
+        );
+
+        return array_flip($connection->fetchCol($select));
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
index 6c3d84d5f5eb4..fb0ea680569a8 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
@@ -78,7 +78,7 @@ public function deleteByIds($categoryId, $sku)
 
         $productID = $product->getId();
         if (!isset($productPositions[$productID])) {
-            throw new InputException(__('Category does not contain specified product'));
+            throw new InputException(__("The category doesn't contain the specified product."));
         }
         $backupPosition = $productPositions[$productID];
         unset($productPositions[$productID]);
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index 505c729ac1001..7485d9f6cb247 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -129,7 +129,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
      */
     public function get($categoryId, $storeId = null)
     {
-        $cacheKey = null !== $storeId ? $storeId : 'all';
+        $cacheKey = $storeId ?? 'all';
         if (!isset($this->instances[$categoryId][$cacheKey])) {
             /** @var Category $category */
             $category = $this->categoryFactory->create();
@@ -197,7 +197,7 @@ protected function validateCategory(Category $category)
                 if ($error === true) {
                     $attribute = $this->categoryResource->getAttribute($code)->getFrontend()->getLabel();
                     throw new \Magento\Framework\Exception\LocalizedException(
-                        __('Attribute "%1" is required.', $attribute)
+                        __('The "%1" attribute is required. Enter and try again.', $attribute)
                     );
                 } else {
                     throw new \Magento\Framework\Exception\LocalizedException(__($error));
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index d2ffd6f440041..5dce940308a4f 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -381,7 +381,7 @@ public function getProductTypeName($id)
 
         $this->loadProductTypes();
 
-        return isset($this->_productTypesById[$id]) ? $this->_productTypesById[$id] : false;
+        return $this->_productTypesById[$id] ?? false;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php b/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php
new file mode 100644
index 0000000000000..f7b7d6b9e48b9
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Config\Source;
+
+use Magento\Catalog\Model\Product\Attribute\Source\Layout;
+
+/**
+ * Returns layout list for Web>Default Layouts>Default Product Layout/Default Category Layout
+ */
+class LayoutList implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Attribute\Source\Layout
+     */
+    private $layoutSource;
+
+    /**
+     * @param Layout $layoutSource
+     */
+    public function __construct(
+        Layout $layoutSource
+    ) {
+        $this->layoutSource = $layoutSource;
+    }
+
+    /**
+     * To option array
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        if (!$this->options) {
+            $this->options = $this->layoutSource->getAllOptions();
+        }
+        return $this->options;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
index bd7cdabb40856..853bbeac8eb38 100644
--- a/app/code/Magento/Catalog/Model/Design.php
+++ b/app/code/Magento/Catalog/Model/Design.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model;
 
+use \Magento\Framework\TranslateInterface;
+
 /**
  * Catalog Custom Category design Model
  *
@@ -31,14 +33,20 @@ class Design extends \Magento\Framework\Model\AbstractModel
      */
     protected $_localeDate;
 
+    /**
+     * @var TranslateInterface
+     */
+    private $translator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\View\DesignInterface $design
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param TranslateInterface|null $translator
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -47,10 +55,13 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        TranslateInterface $translator = null
     ) {
         $this->_localeDate = $localeDate;
         $this->_design = $design;
+        $this->translator = $translator ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -63,6 +74,7 @@ public function __construct(
     public function applyCustomDesign($design)
     {
         $this->_design->setDesignTheme($design);
+        $this->translator->loadData(null, true);
         return $this;
     }
 
diff --git a/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php b/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
new file mode 100644
index 0000000000000..497ed2fd49953
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+/**
+ * Filter custom attributes for product using the blacklist
+ */
+class FilterProductCustomAttribute
+{
+    /**
+     * @var array
+     */
+    private $blackList;
+
+    /**
+     * @param array $blackList
+     */
+    public function __construct(array $blackList = [])
+    {
+        $this->blackList = $blackList;
+    }
+
+    /**
+     * Delete custom attribute
+     *
+     * @param array $attributes set objects attributes @example ['attribute_code'=>'attribute_object']
+     * @return array
+     */
+    public function execute(array $attributes): array
+    {
+        return array_diff_key($attributes, array_flip($this->blackList));
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php b/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php
index 14fa9e8935535..dac9e03e0b753 100644
--- a/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php
+++ b/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * @api
- * Storage, which provide information for frontend storages, as priduct-storage, ids-storag
+ * Storage, which provide information for frontend storages, as product-storage, ids-storage
  * @since 101.1.0
  */
 interface FrontendStorageConfigurationInterface
diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php
index 7888d8de1c2ff..dcc70cbcd2a1a 100644
--- a/app/code/Magento/Catalog/Model/ImageExtractor.php
+++ b/app/code/Magento/Catalog/Model/ImageExtractor.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
 use Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface;
 
+/**
+ * Image extractor from xml configuration
+ */
 class ImageExtractor implements TypeDataExtractorInterface
 {
     /**
@@ -32,12 +35,16 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
                     continue;
                 }
                 $attributeTagName = $attribute->tagName;
-                if ($attributeTagName === 'background') {
-                    $nodeValue = $this->processImageBackground($attribute->nodeValue);
-                } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
-                    $nodeValue = intval($attribute->nodeValue);
+                if ((bool)$attribute->getAttribute('xsi:nil') !== true) {
+                    if ($attributeTagName === 'background') {
+                        $nodeValue = $this->processImageBackground($attribute->nodeValue);
+                    } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
+                        $nodeValue = (int) $attribute->nodeValue;
+                    } else {
+                        $nodeValue = $attribute->nodeValue;
+                    }
                 } else {
-                    $nodeValue = $attribute->nodeValue;
+                    $nodeValue = null;
                 }
                 $result[$mediaParentTag][$moduleNameImage][Image::MEDIA_TYPE_CONFIG_NODE][$imageId][$attribute->tagName]
                     = $nodeValue;
diff --git a/app/code/Magento/Catalog/Model/ImageUploader.php b/app/code/Magento/Catalog/Model/ImageUploader.php
index 6aa76ca8c1e43..b5ca0895d6d1a 100644
--- a/app/code/Magento/Catalog/Model/ImageUploader.php
+++ b/app/code/Magento/Catalog/Model/ImageUploader.php
@@ -64,6 +64,13 @@ class ImageUploader
      */
     protected $allowedExtensions;
 
+    /**
+     * List of allowed image mime types
+     *
+     * @var string[]
+     */
+    private $allowedMimeTypes;
+
     /**
      * ImageUploader constructor
      *
@@ -75,6 +82,7 @@ class ImageUploader
      * @param string $baseTmpPath
      * @param string $basePath
      * @param string[] $allowedExtensions
+     * @param string[] $allowedMimeTypes
      */
     public function __construct(
         \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDatabase,
@@ -84,7 +92,8 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         $baseTmpPath,
         $basePath,
-        $allowedExtensions
+        $allowedExtensions,
+        $allowedMimeTypes = []
     ) {
         $this->coreFileStorageDatabase = $coreFileStorageDatabase;
         $this->mediaDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
@@ -94,6 +103,7 @@ public function __construct(
         $this->baseTmpPath = $baseTmpPath;
         $this->basePath = $basePath;
         $this->allowedExtensions = $allowedExtensions;
+        $this->allowedMimeTypes = $allowedMimeTypes;
     }
 
     /**
@@ -153,7 +163,7 @@ public function getBasePath()
     }
 
     /**
-     * Retrieve base path
+     * Retrieve allowed extensions
      *
      * @return string[]
      */
@@ -227,7 +237,9 @@ public function saveFileToTmpDir($fileId)
         $uploader = $this->uploaderFactory->create(['fileId' => $fileId]);
         $uploader->setAllowedExtensions($this->getAllowedExtensions());
         $uploader->setAllowRenameFiles(true);
-
+        if (!$uploader->checkMimeType($this->allowedMimeTypes)) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('File validation failed.'));
+        }
         $result = $uploader->save($this->mediaDirectory->getAbsolutePath($baseTmpPath));
         unset($result['path']);
 
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 4b16a4810c0ae..8b952ca844bb9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Model\Indexer\Category\Flat;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\EntityManager\MetadataPool;
 
 class AbstractAction
 {
@@ -111,7 +110,7 @@ public function getColumns()
     public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
     {
         if (is_string($storeId)) {
-            $storeId = intval($storeId);
+            $storeId = (int) $storeId;
         }
 
         $suffix = sprintf('store_%d', $storeId);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
index 64a8f930d83ee..a62e3d8f83b85 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Action;
 
+/**
+ * Class for full reindex flat categories
+ */
 class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
 {
     /**
@@ -92,6 +95,7 @@ protected function populateFlatTables(array $stores)
 
     /**
      * Create table and add attributes as fields for specified store.
+     *
      * This routine assumes that DDL operations are allowed
      *
      * @param int $store
@@ -109,6 +113,7 @@ protected function createTable($store)
 
     /**
      * Create category flat tables and add attributes as fields.
+     *
      * Tables are created only if DDL operations are allowed
      *
      * @param \Magento\Store\Model\Store[] $stores if empty, create tables for all stores of the application
@@ -167,6 +172,44 @@ protected function switchTables(array $stores = [])
         return $this;
     }
 
+    /**
+     * Retrieve all actual Catalog Product Flat Table names
+     *
+     * @return string[]
+     */
+    private function getActualStoreTablesForCategoryFlat(): array
+    {
+        $actualStoreTables = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $actualStoreTables[] = sprintf(
+                '%s_store_%s',
+                $this->connection->getTableName('catalog_category_flat'),
+                $store->getId()
+            );
+        }
+
+        return $actualStoreTables;
+    }
+
+    /**
+     * Delete all category flat tables for not existing stores
+     *
+     * @return void
+     */
+    private function deleteAbandonedStoreCategoryFlatTables(): void
+    {
+        $existentTables = $this->connection->getTables(
+            $this->connection->getTableName('catalog_category_flat_store_%')
+        );
+        $actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
+
+        $tablesToDelete = array_diff($existentTables, $actualStoreTables);
+
+        foreach ($tablesToDelete as $table) {
+            $this->connection->dropTable($table);
+        }
+    }
+
     /**
      * Transactional rebuild flat data from eav
      *
@@ -182,7 +225,7 @@ public function reindexAll()
         $stores = $this->storeManager->getStores();
         $this->populateFlatTables($stores);
         $this->switchTables($stores);
-
+        $this->deleteAbandonedStoreCategoryFlatTables();
         $this->allowTableChanges = true;
 
         return $this;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 9f074c013480c..178f4172ce6fa 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -6,9 +6,14 @@
 
 namespace Magento\Catalog\Model\Indexer\Category\Product;
 
-use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
 
 /**
  * Class AbstractAction
@@ -37,27 +42,28 @@ abstract class AbstractAction
 
     /**
      * Suffix for table to show it is temporary
+     * @deprecated
      */
     const TEMPORARY_TABLE_SUFFIX = '_tmp';
 
     /**
      * Cached non anchor categories select by store id
      *
-     * @var \Magento\Framework\DB\Select[]
+     * @var Select[]
      */
     protected $nonAnchorSelects = [];
 
     /**
      * Cached anchor categories select by store id
      *
-     * @var \Magento\Framework\DB\Select[]
+     * @var Select[]
      */
     protected $anchorSelects = [];
 
     /**
      * Cached all product select by store id
      *
-     * @var \Magento\Framework\DB\Select[]
+     * @var Select[]
      */
     protected $productsSelects = [];
 
@@ -101,6 +107,11 @@ abstract class AbstractAction
      */
     protected $metadataPool;
 
+    /**
+     * @var TableMaintainer
+     */
+    protected $tableMaintainer;
+
     /**
      * @var string
      * @since 101.0.0
@@ -112,24 +123,34 @@ abstract class AbstractAction
      */
     private $queryGenerator;
 
+    /**
+     * @var int
+     */
+    private $currentStoreId = 0;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
      * @param QueryGenerator $queryGenerator
+     * @param MetadataPool|null $metadataPool
+     * @param TableMaintainer|null $tableMaintainer
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Config $config,
-        QueryGenerator $queryGenerator = null
+        QueryGenerator $queryGenerator = null,
+        MetadataPool $metadataPool = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->storeManager = $storeManager;
         $this->config = $config;
-        $this->queryGenerator = $queryGenerator ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(QueryGenerator::class);
+        $this->queryGenerator = $queryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class);
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -148,6 +169,7 @@ protected function reindex()
     {
         foreach ($this->storeManager->getStores() as $store) {
             if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+                $this->currentStoreId = $store->getId();
                 $this->reindexRootCategory($store);
                 $this->reindexAnchorCategories($store);
                 $this->reindexNonAnchorCategories($store);
@@ -173,6 +195,7 @@ protected function getTable($table)
      * The name is switched between 'catalog_category_product_index' and 'catalog_category_product_index_replica'
      *
      * @return string
+     * @deprecated
      */
     protected function getMainTable()
     {
@@ -183,12 +206,26 @@ protected function getMainTable()
      * Return temporary index table name
      *
      * @return string
+     * @deprecated
      */
     protected function getMainTmpTable()
     {
-        return $this->useTempTable ? $this->getTable(
-            self::MAIN_INDEX_TABLE . self::TEMPORARY_TABLE_SUFFIX
-        ) : $this->getMainTable();
+        return $this->useTempTable
+            ? $this->getTable(self::MAIN_INDEX_TABLE . self::TEMPORARY_TABLE_SUFFIX)
+            : $this->getMainTable();
+    }
+
+    /**
+     * Return index table name
+     *
+     * @param int $storeId
+     * @return string
+     */
+    protected function getIndexTable($storeId)
+    {
+        return $this->useTempTable
+            ? $this->tableMaintainer->getMainReplicaTable($storeId)
+            : $this->tableMaintainer->getMainTable($storeId);
     }
 
     /**
@@ -216,24 +253,25 @@ protected function getPathFromCategoryId($categoryId)
     /**
      * Retrieve select for reindex products of non anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
-     * @return \Magento\Framework\DB\Select
+     * @param Store $store
+     * @return Select
+     * @throws \Exception when metadata not found for ProductInterface
      */
-    protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
+    protected function getNonAnchorCategoriesSelect(Store $store)
     {
         if (!isset($this->nonAnchorSelects[$store->getId()])) {
             $statusAttributeId = $this->config->getAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
+                Product::ENTITY,
                 'status'
             )->getId();
             $visibilityAttributeId = $this->config->getAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
+                Product::ENTITY,
                 'visibility'
             )->getId();
 
             $rootPath = $this->getPathFromCategoryId($store->getRootCategoryId());
 
-            $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+            $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
             $linkField = $metadata->getLinkField();
             $select = $this->connection->select()->from(
                 ['cc' => $this->getTable('catalog_category_entity')],
@@ -302,12 +340,65 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor
                 ]
             );
 
+            $this->addFilteringByChildProductsToSelect($select, $store);
+
             $this->nonAnchorSelects[$store->getId()] = $select;
         }
 
         return $this->nonAnchorSelects[$store->getId()];
     }
 
+    /**
+     * Add filtering by child products to select
+     *
+     * It's used for correct handling of composite products.
+     * This method makes assumption that select already joins `catalog_product_entity` as `cpe`.
+     *
+     * @param Select $select
+     * @param Store $store
+     * @return void
+     * @throws \Exception when metadata not found for ProductInterface
+     */
+    private function addFilteringByChildProductsToSelect(Select $select, Store $store)
+    {
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
+
+        $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId();
+
+        $select->joinLeft(
+            ['relation' => $this->getTable('catalog_product_relation')],
+            'cpe.' . $linkField . ' = relation.parent_id',
+            []
+        )->joinLeft(
+            ['relation_product_entity' => $this->getTable('catalog_product_entity')],
+            'relation.child_id = relation_product_entity.entity_id',
+            []
+        )->joinLeft(
+            ['child_cpsd' => $this->getTable('catalog_product_entity_int')],
+            'child_cpsd.' . $linkField . ' = '. 'relation_product_entity.' . $linkField
+            . ' AND child_cpsd.store_id = 0'
+            . ' AND child_cpsd.attribute_id = ' . $statusAttributeId,
+            []
+        )->joinLeft(
+            ['child_cpss' => $this->getTable('catalog_product_entity_int')],
+            'child_cpss.' . $linkField . ' = '. 'relation_product_entity.' . $linkField . ''
+            . ' AND child_cpss.attribute_id = child_cpsd.attribute_id'
+            . ' AND child_cpss.store_id = ' . $store->getId(),
+            []
+        )->where(
+            'relation.child_id IS NULL OR '
+            . $this->connection->getIfNullSql('child_cpss.value', 'child_cpsd.value') . ' = ?',
+            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+        )->group(
+            [
+                'cc.entity_id',
+                'ccp.product_id',
+                'visibility',
+            ]
+        );
+    }
+
     /**
      * Check whether select ranging is needed
      *
@@ -321,15 +412,15 @@ protected function isRangingNeeded()
     /**
      * Return selects cut by min and max
      *
-     * @param \Magento\Framework\DB\Select $select
+     * @param Select $select
      * @param string $field
      * @param int $range
-     * @return \Magento\Framework\DB\Select[]
+     * @return Select[]
      */
     protected function prepareSelectsByRange(
-        \Magento\Framework\DB\Select $select,
-        $field,
-        $range = self::RANGE_CATEGORY_STEP
+        Select $select,
+        string $field,
+        int $range = self::RANGE_CATEGORY_STEP
     ) {
         if ($this->isRangingNeeded()) {
             $iterator = $this->queryGenerator->generate(
@@ -351,17 +442,17 @@ protected function prepareSelectsByRange(
     /**
      * Reindex products of non anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
+    protected function reindexNonAnchorCategories(Store $store)
     {
         $selects = $this->prepareSelectsByRange($this->getNonAnchorCategoriesSelect($store), 'entity_id');
         foreach ($selects as $select) {
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $select,
-                    $this->getMainTmpTable(),
+                    $this->getIndexTable($store->getId()),
                     ['category_id', 'product_id', 'position', 'is_parent', 'store_id', 'visibility'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                 )
@@ -372,10 +463,10 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
     /**
      * Check if anchor select isset
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return bool
      */
-    protected function hasAnchorSelect(\Magento\Store\Model\Store $store)
+    protected function hasAnchorSelect(Store $store)
     {
         return isset($this->anchorSelects[$store->getId()]);
     }
@@ -383,32 +474,30 @@ protected function hasAnchorSelect(\Magento\Store\Model\Store $store)
     /**
      * Create anchor select
      *
-     * @param \Magento\Store\Model\Store $store
-     * @return \Magento\Framework\DB\Select
+     * @param Store $store
+     * @return Select
+     * @throws \Exception when metadata not found for ProductInterface or CategoryInterface
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function createAnchorSelect(\Magento\Store\Model\Store $store)
+    protected function createAnchorSelect(Store $store)
     {
         $isAnchorAttributeId = $this->config->getAttribute(
             \Magento\Catalog\Model\Category::ENTITY,
             'is_anchor'
         )->getId();
-        $statusAttributeId = $this->config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'status')->getId();
-        $visibilityAttributeId = $this->config->getAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'visibility'
-        )->getId();
+        $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId();
+        $visibilityAttributeId = $this->config->getAttribute(Product::ENTITY, 'visibility')->getId();
         $rootCatIds = explode('/', $this->getPathFromCategoryId($store->getRootCategoryId()));
         array_pop($rootCatIds);
 
         $temporaryTreeTable = $this->makeTempCategoryTreeIndex();
 
-        $productMetadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $categoryMetadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
+        $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
         $productLinkField = $productMetadata->getLinkField();
         $categoryLinkField = $categoryMetadata->getLinkField();
 
-        return $this->connection->select()->from(
+        $select = $this->connection->select()->from(
             ['cc' => $this->getTable('catalog_category_entity')],
             []
         )->joinInner(
@@ -496,9 +585,15 @@ protected function createAnchorSelect(\Magento\Store\Model\Store $store)
                 'visibility' => new \Zend_Db_Expr($this->connection->getIfNullSql('cpvs.value', 'cpvd.value')),
             ]
         );
+
+        $this->addFilteringByChildProductsToSelect($select, $store);
+
+        return $select;
     }
 
     /**
+     * Get temporary table name
+     *
      * Get temporary table name for concurrent indexing in persistent connection
      * Temp table name is NOT shared between action instances and each action has it's own temp tree index
      *
@@ -510,7 +605,7 @@ protected function getTemporaryTreeIndexTableName()
         if (empty($this->tempTreeIndexTableName)) {
             $this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
                 . '_'
-                . substr(md5(time() . rand(0, 999999999)), 0, 8);
+                . substr(sha1(time() . random_int(0, 999999999)), 0, 8);
         }
 
         return $this->tempTreeIndexTableName;
@@ -549,6 +644,11 @@ protected function makeTempCategoryTreeIndex()
             ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY]
         );
 
+        $temporaryTable->addIndex(
+            'child_id',
+            ['child_id'],
+            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
+        );
         // Drop the temporary table in case it already exists on this (persistent?) connection.
         $this->connection->dropTemporaryTable($temporaryName);
         $this->connection->createTemporaryTable($temporaryTable);
@@ -566,34 +666,59 @@ protected function makeTempCategoryTreeIndex()
      */
     protected function fillTempCategoryTreeIndex($temporaryName)
     {
-        // This finds all children (cc2) that descend from a parent (cc) by path.
-        // For example, cc.path may be '1/2', and cc2.path may be '1/2/3/4/5'.
-        $temporarySelect = $this->connection->select()->from(
-            ['cc' => $this->getTable('catalog_category_entity')],
-            ['parent_id' => 'entity_id']
-        )->joinInner(
-            ['cc2' => $this->getTable('catalog_category_entity')],
-            'cc2.path LIKE ' . $this->connection->getConcatSql(
-                [$this->connection->quoteIdentifier('cc.path'), $this->connection->quote('/%')]
-            ),
-            ['child_id' => 'entity_id']
+        $isActiveAttributeId = $this->config->getAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'is_active'
+        )->getId();
+        $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
+        $categoryLinkField = $categoryMetadata->getLinkField();
+        $selects = $this->prepareSelectsByRange(
+            $this->connection->select()
+                ->from(
+                    ['c' => $this->getTable('catalog_category_entity')],
+                    ['entity_id', 'path']
+                )->joinInner(
+                    ['ccacd' => $this->getTable('catalog_category_entity_int')],
+                    'ccacd.' . $categoryLinkField . ' = c.' . $categoryLinkField . ' AND ccacd.store_id = 0' .
+                    ' AND ccacd.attribute_id = ' . $isActiveAttributeId,
+                    []
+                )->joinLeft(
+                    ['ccacs' => $this->getTable('catalog_category_entity_int')],
+                    'ccacs.' . $categoryLinkField . ' = c.' . $categoryLinkField
+                    . ' AND ccacs.attribute_id = ccacd.attribute_id AND ccacs.store_id = ' .
+                    $this->currentStoreId,
+                    []
+                )->where(
+                    $this->connection->getIfNullSql('ccacs.value', 'ccacd.value') . ' = ?',
+                    1
+                ),
+            'entity_id'
         );
 
-        $this->connection->query(
-            $temporarySelect->insertFromSelect(
-                $temporaryName,
-                ['parent_id', 'child_id']
-            )
-        );
+        foreach ($selects as $select) {
+            $values = [];
+
+            foreach ($this->connection->fetchAll($select) as $category) {
+                foreach (explode('/', $category['path']) as $parentId) {
+                    if ($parentId !== $category['entity_id']) {
+                        $values[] = [$parentId, $category['entity_id']];
+                    }
+                }
+            }
+
+            if (count($values) > 0) {
+                $this->connection->insertArray($temporaryName, ['parent_id', 'child_id'], $values);
+            }
+        }
     }
 
     /**
      * Retrieve select for reindex products of non anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
-     * @return \Magento\Framework\DB\Select
+     * @param Store $store
+     * @return Select
      */
-    protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
+    protected function getAnchorCategoriesSelect(Store $store)
     {
         if (!$this->hasAnchorSelect($store)) {
             $this->anchorSelects[$store->getId()] = $this->createAnchorSelect($store);
@@ -604,10 +729,10 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     /**
      * Reindex products of anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
+    protected function reindexAnchorCategories(Store $store)
     {
         $selects = $this->prepareSelectsByRange($this->getAnchorCategoriesSelect($store), 'entity_id');
 
@@ -615,7 +740,7 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $select,
-                    $this->getMainTmpTable(),
+                    $this->getIndexTable($store->getId()),
                     ['category_id', 'product_id', 'position', 'is_parent', 'store_id', 'visibility'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                 )
@@ -626,22 +751,17 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
     /**
      * Get select for all products
      *
-     * @param \Magento\Store\Model\Store $store
-     * @return \Magento\Framework\DB\Select
+     * @param Store $store
+     * @return Select
+     * @throws \Exception when metadata not found for ProductInterface
      */
-    protected function getAllProducts(\Magento\Store\Model\Store $store)
+    protected function getAllProducts(Store $store)
     {
         if (!isset($this->productsSelects[$store->getId()])) {
-            $statusAttributeId = $this->config->getAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'status'
-            )->getId();
-            $visibilityAttributeId = $this->config->getAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'visibility'
-            )->getId();
+            $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId();
+            $visibilityAttributeId = $this->config->getAttribute(Product::ENTITY, 'visibility')->getId();
 
-            $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+            $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
             $linkField = $metadata->getLinkField();
 
             $select = $this->connection->select()->from(
@@ -730,10 +850,10 @@ protected function isIndexRootCategoryNeeded()
     /**
      * Reindex all products to root category
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexRootCategory(\Magento\Store\Model\Store $store)
+    protected function reindexRootCategory(Store $store)
     {
         if ($this->isIndexRootCategoryNeeded()) {
             $selects = $this->prepareSelectsByRange(
@@ -746,7 +866,7 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store)
                 $this->connection->query(
                     $this->connection->insertFromSelect(
                         $select,
-                        $this->getMainTmpTable(),
+                        $this->getIndexTable($store->getId()),
                         ['category_id', 'product_id', 'position', 'is_parent', 'store_id', 'visibility'],
                         \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                     )
@@ -754,16 +874,4 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store)
             }
         }
     }
-
-    /**
-     * @return \Magento\Framework\EntityManager\MetadataPool
-     */
-    private function getMetadataPool()
-    {
-        if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
-        }
-        return $this->metadataPool;
-    }
 }
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 ae0c3554c0d32..f8121b55dbf99 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Indexer\Model\ProcessManager;
 
 /**
  * Class Full reindex action
@@ -44,6 +45,11 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var ProcessManager
+     */
+    private $processManager;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -52,9 +58,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
      * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
      * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
      * @param int|null $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
+     * @param ProcessManager $processManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -65,7 +72,8 @@ public function __construct(
         \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
         $batchRowsCount = null,
-        ActiveTableSwitcher $activeTableSwitcher = null
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        ProcessManager $processManager = null
     ) {
         parent::__construct(
             $resource,
@@ -85,6 +93,39 @@ public function __construct(
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
+        $this->processManager = $processManager ?: $objectManager->get(ProcessManager::class);
+    }
+
+    /**
+     * @return void
+     */
+    private function createTables()
+    {
+        foreach ($this->storeManager->getStores() as $store) {
+            $this->tableMaintainer->createTablesForStore($store->getId());
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function clearReplicaTables()
+    {
+        foreach ($this->storeManager->getStores() as $store) {
+            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable($store->getId()));
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function switchTables()
+    {
+        $tablesToSwitch = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $tablesToSwitch[] = $this->tableMaintainer->getMainTable($store->getId());
+        }
+        $this->activeTableSwitcher->switchTable($this->connection, $tablesToSwitch);
     }
 
     /**
@@ -94,57 +135,58 @@ public function __construct(
      */
     public function execute()
     {
+        $this->createTables();
+        $this->clearReplicaTables();
         $this->reindex();
-        $this->activeTableSwitcher->switchTable($this->connection, [$this->getMainTable()]);
+        $this->switchTables();
         return $this;
     }
 
     /**
-     * Return select for remove unnecessary data
+     * Run reindexation
      *
-     * @return \Magento\Framework\DB\Select
+     * @return void
      */
-    protected function getSelectUnnecessaryData()
+    protected function reindex()
     {
-        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'
-        );
+        $userFunctions = [];
+
+        foreach ($this->storeManager->getStores() as $store) {
+            if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+                $userFunctions[$store->getId()] = function () use ($store) {
+                    return $this->reindexStore($store);
+                };
+            }
+        }
+
+        $this->processManager->execute($userFunctions);
     }
 
     /**
-     * Remove unnecessary data
+     * Execute indexation by store
      *
-     * @return void
+     * @param \Magento\Store\Model\Store $store
      */
-    protected function removeUnnecessaryData()
+    private function reindexStore($store)
     {
-        $this->connection->query(
-            $this->connection->deleteFromSelect($this->getSelectUnnecessaryData(), $this->getMainTable())
-        );
+        $this->reindexRootCategory($store);
+        $this->reindexAnchorCategories($store);
+        $this->reindexNonAnchorCategories($store);
     }
 
     /**
-     * Publish data from tmp to index
+     * Publish data from tmp to replica table
      *
+     * @param \Magento\Store\Model\Store $store
      * @return void
      */
-    protected function publishData()
+    private function publishData($store)
     {
-        $select = $this->connection->select()->from($this->getMainTmpTable());
-        $columns = array_keys($this->connection->describeTable($this->getMainTable()));
-        $tableName = $this->activeTableSwitcher->getAdditionalTableName($this->getMainTable());
+        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable($store->getId()));
+        $columns = array_keys(
+            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable($store->getId()))
+        );
+        $tableName = $this->tableMaintainer->getMainReplicaTable($store->getId());
 
         $this->connection->query(
             $this->connection->insertFromSelect(
@@ -156,23 +198,13 @@ protected function publishData()
         );
     }
 
-    /**
-     * Clear all index data
-     *
-     * @return void
-     */
-    protected function clearTmpData()
-    {
-        $this->connection->delete($this->getMainTmpTable());
-    }
-
     /**
      * {@inheritdoc}
      */
     protected function reindexRootCategory(\Magento\Store\Model\Store $store)
     {
         if ($this->isIndexRootCategoryNeeded()) {
-            $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)');
+            $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)', $store);
         }
     }
 
@@ -184,7 +216,7 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store)
      */
     protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
     {
-        $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)');
+        $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
 
     /**
@@ -195,7 +227,7 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
      */
     protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
     {
-        $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)');
+        $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
 
     /**
@@ -203,12 +235,17 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
      *
      * @param \Magento\Framework\DB\Select $basicSelect
      * @param string $whereCondition
+     * @param \Magento\Store\Model\Store $store
      * @return void
      */
-    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition)
+    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition, $store)
     {
+        $this->tableMaintainer->createMainTmpTable($store->getId());
+
         $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $columns = array_keys($this->connection->describeTable($this->getMainTmpTable()));
+        $columns = array_keys(
+            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable($store->getId()))
+        );
         $this->batchSizeManagement->ensureBatchSize($this->connection, $this->batchRowsCount);
         $batches = $this->batchProvider->getBatches(
             $this->connection,
@@ -217,7 +254,7 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
             $this->batchRowsCount
         );
         foreach ($batches as $batch) {
-            $this->clearTmpData();
+            $this->connection->delete($this->tableMaintainer->getMainTmpTable($store->getId()));
             $resultSelect = clone $basicSelect;
             $select = $this->connection->select();
             $select->distinct(true);
@@ -227,13 +264,12 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $resultSelect,
-                    $this->getMainTmpTable(),
+                    $this->tableMaintainer->getMainTmpTable($store->getId()),
                     $columns,
                     \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                 )
             );
-            $this->publishData();
-            $this->removeUnnecessaryData();
+            $this->publishData($store);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
index 248ec970d2250..3bd4910767587 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
@@ -36,17 +36,16 @@ public function execute(array $entityIds = [], $useTempTable = false)
     /**
      * Return array of all category root IDs + tree root ID
      *
-     * @return int[]
+     * @param \Magento\Store\Model\Store $store
+     * @return int
      */
-    protected function getRootCategoryIds()
+    private function getRootCategoryId($store)
     {
-        $rootIds = [\Magento\Catalog\Model\Category::TREE_ROOT_ID];
-        foreach ($this->storeManager->getStores() as $store) {
-            if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
-                $rootIds[] = $store->getRootCategoryId();
-            }
+        $rootId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+            $rootId = $store->getRootCategoryId();
         }
-        return $rootIds;
+        return $rootId;
     }
 
     /**
@@ -54,10 +53,15 @@ protected function getRootCategoryIds()
      *
      * @return void
      */
-    protected function removeEntries()
+    private function removeEntries()
     {
-        $removalCategoryIds = array_diff($this->limitationByCategories, $this->getRootCategoryIds());
-        $this->connection->delete($this->getMainTable(), ['category_id IN (?)' => $removalCategoryIds]);
+        foreach ($this->storeManager->getStores() as $store) {
+            $removalCategoryIds = array_diff($this->limitationByCategories, [$this->getRootCategoryId($store)]);
+            $this->connection->delete(
+                $this->getIndexTable($store->getId()),
+                ['category_id IN (?)' => $removalCategoryIds]
+            );
+        }
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
index 2ee46b3a6096b..005936a75e6d6 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\Indexer\Category\Product;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 class StoreGroup
 {
@@ -22,12 +23,21 @@ class StoreGroup
      */
     protected $indexerRegistry;
 
+    /**
+     * @var TableMaintainer
+     */
+    protected $tableMaintainer;
+
     /**
      * @param IndexerRegistry $indexerRegistry
+     * @param TableMaintainer $tableMaintainer
      */
-    public function __construct(IndexerRegistry $indexerRegistry)
-    {
+    public function __construct(
+        IndexerRegistry $indexerRegistry,
+        TableMaintainer $tableMaintainer
+    ) {
         $this->indexerRegistry = $indexerRegistry;
+        $this->tableMaintainer = $tableMaintainer;
     }
 
     /**
@@ -73,4 +83,22 @@ protected function validate(AbstractModel $group)
         return ($group->dataHasChangedFor('website_id') || $group->dataHasChangedFor('root_category_id'))
                && !$group->isObjectNew();
     }
+
+    /**
+     * Delete catalog_category_product indexer tables for deleted store group
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $storeGroup
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $storeGroup)
+    {
+        foreach ($storeGroup->getStores() as $store) {
+            $this->tableMaintainer->dropTablesForStore((int)$store->getId());
+        }
+        return $objectResource;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
index f49b685ba6f7f..b6f9e6adf4a1c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
 
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\AbstractModel;
+
 class StoreView extends StoreGroup
 {
     /**
@@ -17,4 +20,38 @@ protected function validate(\Magento\Framework\Model\AbstractModel $store)
     {
         return $store->isObjectNew() || $store->dataHasChangedFor('group_id');
     }
+
+    /**
+     * Invalidate catalog_category_product indexer
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $store
+     *
+     * @return AbstractDb
+     */
+    public function afterSave(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $store = null)
+    {
+        if ($store->isObjectNew()) {
+            $this->tableMaintainer->createTablesForStore($store->getId());
+        }
+
+        return parent::afterSave($subject, $objectResource);
+    }
+
+    /**
+     * Delete catalog_category_product indexer table for deleted store
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $store
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $store)
+    {
+        $this->tableMaintainer->dropTablesForStore((int)$store->getId());
+        return $objectResource;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
new file mode 100644
index 0000000000000..936e6163cbcc5
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Search\Request\Dimension;
+
+/**
+ * Class that replace catalog_category_product_index table name on the table name segmented per store
+ */
+class TableResolver
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var IndexScopeResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param IndexScopeResolver $tableResolver
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        IndexScopeResolver $tableResolver
+    ) {
+        $this->storeManager = $storeManager;
+        $this->tableResolver = $tableResolver;
+    }
+
+    /**
+     * Replacing catalog_category_product_index table name on the table name segmented per store
+     *
+     * @param ResourceConnection $subject
+     * @param string $result
+     * @param string|string[] $modelEntity
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
+     * @return string
+     */
+    public function afterGetTableName(
+        \Magento\Framework\App\ResourceConnection $subject,
+        string $result,
+        $modelEntity
+    ) {
+        if (!is_array($modelEntity) && $modelEntity === AbstractAction::MAIN_INDEX_TABLE) {
+            $catalogCategoryProductDimension = new Dimension(
+                \Magento\Store\Model\Store::ENTITY,
+                $this->storeManager->getStore()->getId()
+            );
+
+            $tableName = $this->tableResolver->resolve(
+                AbstractAction::MAIN_INDEX_TABLE,
+                [
+                    $catalogCategoryProductDimension
+                ]
+            );
+            return $tableName;
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/Website.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/Website.php
new file mode 100644
index 0000000000000..50700e672237e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/Website.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+
+class Website
+{
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @param TableMaintainer $tableMaintainer
+     */
+    public function __construct(
+        TableMaintainer $tableMaintainer
+    ) {
+        $this->tableMaintainer = $tableMaintainer;
+    }
+
+    /**
+     * Delete catalog_category_product indexer tables for deleted website
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $website
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $website)
+    {
+        foreach ($website->getStoreIds() as $storeId) {
+            $this->tableMaintainer->dropTablesForStore((int)$storeId);
+        }
+        return $objectResource;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
new file mode 100644
index 0000000000000..3c2629bc570f2
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Category\Product;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+
+/**
+ * Class encapsulate logic of work with tables per store in Category Product indexer
+ */
+class TableMaintainer
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * Catalog tmp category index table name
+     */
+    private $tmpTableSuffix = '_tmp';
+
+    /**
+     * Catalog tmp category index table name
+     */
+    private $additionalTableSuffix = '_replica';
+
+    /**
+     * @var string[]
+     */
+    private $mainTmpTable;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param TableResolver $tableResolver
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        TableResolver $tableResolver
+    ) {
+        $this->resource = $resource;
+        $this->tableResolver = $tableResolver;
+    }
+
+    /**
+     * Get connection
+     *
+     * @return AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (!isset($this->connection)) {
+            $this->connection = $this->resource->getConnection();
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Return validated table name
+     *
+     * @param string|string[] $table
+     * @return string
+     */
+    private function getTable($table)
+    {
+        return $this->resource->getTableName($table);
+    }
+
+    /**
+     * Create table based on main table
+     *
+     * @param string $mainTableName
+     * @param string $newTableName
+     *
+     * @return void
+     *
+     * @throws \Zend_Db_Exception
+     */
+    private function createTable($mainTableName, $newTableName)
+    {
+        if (!$this->getConnection()->isTableExists($newTableName)) {
+            $this->getConnection()->createTable(
+                $this->getConnection()->createTableByDdl($mainTableName, $newTableName)
+            );
+        }
+    }
+
+    /**
+     * Drop table
+     *
+     * @param string $tableName
+     *
+     * @return void
+     */
+    private function dropTable($tableName)
+    {
+        if ($this->getConnection()->isTableExists($tableName)) {
+            $this->getConnection()->dropTable($tableName);
+        }
+    }
+
+    /**
+     * Return main index table name
+     *
+     * @param $storeId
+     *
+     * @return string
+     */
+    public function getMainTable(int $storeId)
+    {
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+
+        return $this->tableResolver->resolve(AbstractAction::MAIN_INDEX_TABLE, [$catalogCategoryProductDimension]);
+    }
+
+    /**
+     * Create main and replica index tables for store
+     *
+     * @param $storeId
+     *
+     * @return void
+     *
+     * @throws \Zend_Db_Exception
+     */
+    public function createTablesForStore(int $storeId)
+    {
+        $mainTableName = $this->getMainTable($storeId);
+        //Create index table for store based on main replica table
+        //Using main replica table is necessary for backward capability and TableResolver plugin work
+        $this->createTable(
+            $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
+            $mainTableName
+        );
+
+        $mainReplicaTableName = $this->getMainTable($storeId) . $this->additionalTableSuffix;
+        //Create replica table for store based on main replica table
+        $this->createTable(
+            $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
+            $mainReplicaTableName
+        );
+    }
+
+    /**
+     * Drop main and replica index tables for store
+     *
+     * @param $storeId
+     *
+     * @return void
+     */
+    public function dropTablesForStore(int $storeId)
+    {
+        $mainTableName = $this->getMainTable($storeId);
+        $this->dropTable($mainTableName);
+
+        $mainReplicaTableName = $this->getMainTable($storeId) . $this->additionalTableSuffix;
+        $this->dropTable($mainReplicaTableName);
+    }
+
+    /**
+     * Return replica index table name
+     *
+     * @param $storeId
+     *
+     * @return string
+     */
+    public function getMainReplicaTable(int $storeId)
+    {
+        return $this->getMainTable($storeId) . $this->additionalTableSuffix;
+    }
+
+    /**
+     * Create temporary index table for store
+     *
+     * @param $storeId
+     *
+     * @return void
+     */
+    public function createMainTmpTable(int $storeId)
+    {
+        if (!isset($this->mainTmpTable[$storeId])) {
+            $originTableName = $this->getMainTable($storeId);
+            $temporaryTableName = $this->getMainTable($storeId) . $this->tmpTableSuffix;
+            $this->getConnection()->createTemporaryTableLike($temporaryTableName, $originTableName, true);
+            $this->mainTmpTable[$storeId] = $temporaryTableName;
+        }
+    }
+
+    /**
+     * Return temporary index table name
+     *
+     * @param $storeId
+     *
+     * @return string
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getMainTmpTable(int $storeId)
+    {
+        if (!isset($this->mainTmpTable[$storeId])) {
+            throw new \Magento\Framework\Exception\NoSuchEntityException('Temporary table does not exist');
+        }
+        return $this->mainTmpTable[$storeId];
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index 1b988534328e9..a218266c25034 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -6,9 +6,19 @@
 namespace Magento\Catalog\Model\Indexer\Product\Category\Action;
 
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Config;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\Indexer\CacheContext;
+use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
     /**
@@ -19,32 +29,102 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
     protected $limitationByProducts;
 
     /**
-     * @var \Magento\Framework\Indexer\CacheContext
+     * @var CacheContext
      */
     private $cacheContext;
 
+    /**
+     * @var EventManagerInterface|null
+     */
+    private $eventManager;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param StoreManagerInterface $storeManager
+     * @param Config $config
+     * @param QueryGenerator|null $queryGenerator
+     * @param MetadataPool|null $metadataPool
+     * @param CacheContext|null $cacheContext
+     * @param EventManagerInterface|null $eventManager
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        StoreManagerInterface $storeManager,
+        Config $config,
+        QueryGenerator $queryGenerator = null,
+        MetadataPool $metadataPool = null,
+        CacheContext $cacheContext = null,
+        EventManagerInterface $eventManager = null
+    ) {
+        parent::__construct($resource, $storeManager, $config, $queryGenerator, $metadataPool);
+        $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(EventManagerInterface::class);
+    }
+
     /**
      * Refresh entities index
      *
      * @param int[] $entityIds
      * @param bool $useTempTable
      * @return $this
+     * @throws \Exception if metadataPool doesn't contain metadata for ProductInterface
+     * @throws \DomainException
      */
     public function execute(array $entityIds = [], $useTempTable = false)
     {
-        $this->limitationByProducts = $entityIds;
+        $idsToBeReIndexed = $this->getProductIdsWithParents($entityIds);
+
+        $this->limitationByProducts = $idsToBeReIndexed;
         $this->useTempTable = $useTempTable;
 
+        $affectedCategories = $this->getCategoryIdsFromIndex($idsToBeReIndexed);
+
         $this->removeEntries();
 
         $this->reindex();
 
-        $this->registerProducts($entityIds);
-        $this->registerCategories($entityIds);
+        $affectedCategories = array_merge($affectedCategories, $this->getCategoryIdsFromIndex($idsToBeReIndexed));
+
+        $this->registerProducts($idsToBeReIndexed);
+        $this->registerCategories($affectedCategories);
+        $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
 
         return $this;
     }
 
+    /**
+     * Get IDs of parent products by their child IDs.
+     *
+     * Returns identifiers of parent product from the catalog_product_relation.
+     * Please note that returned ids don't contain ids of passed child products.
+     *
+     * @param int[] $childProductIds
+     * @return int[]
+     * @throws \Exception if metadataPool doesn't contain metadata for ProductInterface
+     * @throws \DomainException
+     */
+    private function getProductIdsWithParents(array $childProductIds)
+    {
+        /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $fieldForParent = $metadata->getLinkField();
+
+        $select = $this->connection
+            ->select()
+            ->from(['relation' => $this->getTable('catalog_product_relation')], [])
+            ->distinct(true)
+            ->where('child_id IN (?)', $childProductIds)
+            ->join(
+                ['cpe' => $this->getTable('catalog_product_entity')],
+                'relation.parent_id = cpe.' . $fieldForParent,
+                ['cpe.entity_id']
+            );
+
+        $parentProductIds = $this->connection->fetchCol($select);
+
+        return array_unique(array_merge($childProductIds, $parentProductIds));
+    }
+
     /**
      * Register affected products
      *
@@ -53,26 +133,19 @@ public function execute(array $entityIds = [], $useTempTable = false)
      */
     private function registerProducts($entityIds)
     {
-        $this->getCacheContext()->registerEntities(Product::CACHE_TAG, $entityIds);
+        $this->cacheContext->registerEntities(Product::CACHE_TAG, $entityIds);
     }
 
     /**
      * Register categories assigned to products
      *
-     * @param array $entityIds
+     * @param array $categoryIds
      * @return void
      */
-    private function registerCategories($entityIds)
+    private function registerCategories(array $categoryIds)
     {
-        $categories = $this->connection->fetchCol(
-            $this->connection->select()
-                ->from($this->getMainTable(), ['category_id'])
-                ->where('product_id IN (?)', $entityIds)
-                ->distinct()
-        );
-
-        if ($categories) {
-            $this->getCacheContext()->registerEntities(Category::CACHE_TAG, $categories);
+        if ($categoryIds) {
+            $this->cacheContext->registerEntities(Category::CACHE_TAG, $categoryIds);
         }
     }
 
@@ -83,10 +156,12 @@ private function registerCategories($entityIds)
      */
     protected function removeEntries()
     {
-        $this->connection->delete(
-            $this->getMainTable(),
-            ['product_id IN (?)' => $this->limitationByProducts]
-        );
+        foreach ($this->storeManager->getStores() as $store) {
+            $this->connection->delete(
+                $this->getIndexTable($store->getId()),
+                ['product_id IN (?)' => $this->limitationByProducts]
+            );
+        }
     }
 
     /**
@@ -98,7 +173,7 @@ protected function removeEntries()
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getNonAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts);
+        return $select->where('ccp.product_id IN (?) OR relation.child_id IN (?)', $this->limitationByProducts);
     }
 
     /**
@@ -136,16 +211,31 @@ protected function isRangingNeeded()
     }
 
     /**
-     * Get cache context
+     * Returns a list of category ids which are assigned to product ids in the index
      *
      * @return \Magento\Framework\Indexer\CacheContext
-     * @deprecated 101.0.0
      */
-    private function getCacheContext()
+    private function getCategoryIdsFromIndex(array $productIds)
     {
-        if ($this->cacheContext === null) {
-            $this->cacheContext = \Magento\Framework\App\ObjectManager::getInstance()->get(CacheContext::class);
+        $categoryIds = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $categoryIds = array_merge(
+                $categoryIds,
+                $this->connection->fetchCol(
+                    $this->connection->select()
+                        ->from($this->getIndexTable($store->getId()), ['category_id'])
+                        ->where('product_id IN (?)', $productIds)
+                        ->distinct()
+                )
+            );
+        }
+        $parentCategories = $categoryIds;
+        foreach ($categoryIds as $categoryId) {
+            $parentIds = explode('/', $this->getPathFromCategoryId($categoryId));
+            $parentCategories = array_merge($parentCategories, $parentIds);
         }
-        return $this->cacheContext;
+        $categoryIds = array_unique($parentCategories);
+
+        return $categoryIds;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
index 6a2642a8568f4..6101e5cd362e4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
@@ -3,13 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Product\Eav;
 
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav;
+
 /**
  * Abstract action reindex class
  */
 abstract class AbstractAction
 {
+    /**
+     * Config path for enable EAV indexer
+     */
+    const ENABLE_EAV_INDEXER = 'catalog/search/enable_eav_indexer';
+
     /**
      * EAV Indexers by type
      *
@@ -27,17 +36,27 @@ abstract class AbstractAction
      */
     protected $_eavDecimalFactory;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * AbstractAction constructor.
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
+        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
     ) {
         $this->_eavDecimalFactory = $eavDecimalFactory;
         $this->_eavSourceFactory = $eavSourceFactory;
+        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\App\Config\ScopeConfigInterface::class
+        );
     }
 
     /**
@@ -51,7 +70,7 @@ abstract public function execute($ids);
     /**
      * Retrieve array of EAV type indexers
      *
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav[]
+     * @return AbstractEav[]
      */
     public function getIndexers()
     {
@@ -69,7 +88,7 @@ public function getIndexers()
      * Retrieve indexer instance by type
      *
      * @param string $type
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav
+     * @return AbstractEav
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getIndexer($type)
@@ -90,6 +109,9 @@ public function getIndexer($type)
      */
     public function reindex($ids = null)
     {
+        if (!$this->isEavIndexerEnabled()) {
+            return;
+        }
         foreach ($this->getIndexers() as $indexer) {
             if ($ids === null) {
                 $indexer->reindexAll();
@@ -108,7 +130,7 @@ public function reindex($ids = null)
     /**
      * Synchronize data between index storage and original storage
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav $indexer
+     * @param AbstractEav $indexer
      * @param string $destinationTable
      * @param array $ids
      * @throws \Exception
@@ -134,16 +156,32 @@ protected function syncData($indexer, $destinationTable, $ids)
     /**
      * Retrieve product relations by children and parent
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav $indexer
+     * @param AbstractEav $indexer
      * @param array $ids
-     *
      * @param bool $onlyParents
      * @return array $ids
      */
-    protected function processRelations($indexer, $ids, $onlyParents = false)
+    protected function processRelations(AbstractEav $indexer, array $ids, bool $onlyParents = false)
     {
         $parentIds = $indexer->getRelationsByChild($ids);
+        $parentIds = array_unique(array_merge($parentIds, $ids));
         $childIds = $onlyParents ? [] : $indexer->getRelationsByParent($parentIds);
+
         return array_unique(array_merge($ids, $childIds, $parentIds));
     }
+
+    /**
+     * Get EAV indexer status
+     *
+     * @return bool
+     */
+    private function isEavIndexerEnabled(): bool
+    {
+        $eavIndexerStatus = $this->scopeConfig->getValue(
+            self::ENABLE_EAV_INDEXER,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+
+        return (bool)$eavIndexerStatus;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
index bc747e62f641e..802176092d147 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
 
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 
 /**
  * Class Full reindex action
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
 {
@@ -32,6 +35,11 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
@@ -39,6 +47,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
      * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator
      * @param ActiveTableSwitcher|null $activeTableSwitcher
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
@@ -46,9 +55,13 @@ public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
         \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator = null,
-        ActiveTableSwitcher $activeTableSwitcher = null
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
     ) {
-        parent::__construct($eavDecimalFactory, $eavSourceFactory);
+        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\App\Config\ScopeConfigInterface::class
+        );
+        parent::__construct($eavDecimalFactory, $eavSourceFactory, $scopeConfig);
         $this->metadataPool = $metadataPool ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
             \Magento\Framework\EntityManager\MetadataPool::class
         );
@@ -73,6 +86,9 @@ public function __construct(
      */
     public function execute($ids = null)
     {
+        if (!$this->isEavIndexerEnabled()) {
+            return;
+        }
         try {
             foreach ($this->getIndexers() as $indexerName => $indexer) {
                 $connection = $indexer->getConnection();
@@ -129,4 +145,19 @@ protected function syncData($indexer, $destinationTable, $ids = null)
             throw $e;
         }
     }
+
+    /**
+     * Get EAV indexer status
+     *
+     * @return bool
+     */
+    private function isEavIndexerEnabled(): bool
+    {
+        $eavIndexerStatus = $this->scopeConfig->getValue(
+            self::ENABLE_EAV_INDEXER,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+
+        return (bool)$eavIndexerStatus;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index 8182e6f07fab1..ad734b96d59d7 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -8,7 +8,12 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Store\Model\Store;
 
+/**
+ * Flat item eraser. Used to clear items from the catalog flat table.
+ */
 class Eraser
 {
     /**
@@ -50,12 +55,7 @@ public function __construct(
      */
     public function removeDeletedProducts(array &$ids, $storeId)
     {
-        $select = $this->connection->select()->from(
-            $this->productIndexerHelper->getTable('catalog_product_entity')
-        )->where(
-            'entity_id IN(?)',
-            $ids
-        );
+        $select = $this->getSelectForProducts($ids);
         $result = $this->connection->query($select);
 
         $existentProducts = [];
@@ -69,6 +69,62 @@ public function removeDeletedProducts(array &$ids, $storeId)
         $this->deleteProductsFromStore($productsToDelete, $storeId);
     }
 
+    /**
+     * Remove products with "Disabled" status from the flat table(s).
+     *
+     * @param array $ids
+     * @param int $storeId
+     * @return void
+     */
+    public function removeDisabledProducts(array &$ids, $storeId)
+    {
+        /* @var $statusAttribute \Magento\Eav\Model\Entity\Attribute */
+        $statusAttribute = $this->productIndexerHelper->getAttribute('status');
+
+        $select = $this->getSelectForProducts($ids);
+        $select->joinLeft(
+            ['status_global_attr' => $statusAttribute->getBackendTable()],
+            ' status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
+            . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID,
+            []
+        );
+        $select->joinLeft(
+            ['status_attr' => $statusAttribute->getBackendTable()],
+            ' status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
+            . ' AND status_attr.store_id = ' . $storeId,
+            []
+        );
+        $select->where('IFNULL(status_attr.value, status_global_attr.value) = ?', Status::STATUS_DISABLED);
+
+        $result = $this->connection->query($select);
+
+        $disabledProducts = [];
+        foreach ($result->fetchAll() as $product) {
+            $disabledProducts[] = $product['entity_id'];
+        }
+
+        if (!empty($disabledProducts)) {
+            $ids = array_diff($ids, $disabledProducts);
+            $this->deleteProductsFromStore($disabledProducts, $storeId);
+        }
+    }
+
+    /**
+     * Get Select object for existed products.
+     *
+     * @param array $ids
+     * @return \Magento\Framework\DB\Select
+     */
+    private function getSelectForProducts(array $ids)
+    {
+        $productTable = $this->productIndexerHelper->getTable('catalog_product_entity');
+        $select = $this->connection->select()
+            ->from(['product_table' => $productTable])
+            ->columns('entity_id')
+            ->where('product_table.entity_id IN(?)', $ids);
+        return $select;
+    }
+
     /**
      * Delete products from flat table(s)
      *
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index 9dd312e9da801..a669fb73f64fc 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
 
 /**
  * Class Indexer
@@ -56,39 +57,36 @@ public function __construct(
      * @return \Magento\Catalog\Model\Indexer\Product\Flat
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function write($storeId, $productId, $valueFieldSuffix = '')
     {
         $flatTable = $this->_productIndexerHelper->getFlatTableName($storeId);
+        $entityTableName = $this->_productIndexerHelper->getTable('catalog_product_entity');
 
         $attributes = $this->_productIndexerHelper->getAttributes();
         $eavAttributes = $this->_productIndexerHelper->getTablesStructure($attributes);
         $updateData = [];
         $describe = $this->_connection->describeTable($flatTable);
+        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
 
         foreach ($eavAttributes as $tableName => $tableColumns) {
             $columnsChunks = array_chunk($tableColumns, self::ATTRIBUTES_CHUNK_SIZE, true);
 
             foreach ($columnsChunks as $columns) {
                 $select = $this->_connection->select();
-                $selectValue = $this->_connection->select();
-                $keyColumns = [
-                    'entity_id' => 'e.entity_id',
-                    'attribute_id' => 't.attribute_id',
-                    'value' => $this->_connection->getIfNullSql('`t2`.`value`', '`t`.`value`'),
-                ];
-
-                if ($tableName != $this->_productIndexerHelper->getTable('catalog_product_entity')) {
+
+                if ($tableName != $entityTableName) {
                     $valueColumns = [];
                     $ids = [];
                     $select->from(
-                        ['e' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
-                        $keyColumns
-                    );
-
-                    $selectValue->from(
-                        ['e' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
-                        $keyColumns
+                        ['e' => $entityTableName],
+                        [
+                            'entity_id' => 'e.entity_id',
+                            'attribute_id' => 't.attribute_id',
+                            'value' => 't.value'
+                        ]
                     );
 
                     /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
@@ -97,40 +95,35 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                             $ids[$attribute->getId()] = $columnName;
                         }
                     }
-                    $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-                    $select->joinLeft(
+                    $select->joinInner(
                         ['t' => $tableName],
                         sprintf('e.%s = t.%s ', $linkField, $linkField) . $this->_connection->quoteInto(
                             ' AND t.attribute_id IN (?)',
                             array_keys($ids)
-                        ) . ' AND t.store_id = 0',
-                        []
-                    )->joinLeft(
-                        ['t2' => $tableName],
-                        sprintf('t.%s = t2.%s ', $linkField, $linkField) .
-                        ' AND t.attribute_id = t2.attribute_id  ' .
-                        $this->_connection->quoteInto(
-                            ' AND t2.store_id = ?',
-                            $storeId
-                        ),
+                        ) . ' AND ' . $this->_connection->quoteInto('t.store_id IN(?)', [
+                                Store::DEFAULT_STORE_ID,
+                                $storeId
+                            ]),
                         []
                     )->where(
                         'e.entity_id = ' . $productId
-                    )->where(
-                        't.attribute_id IS NOT NULL'
-                    );
+                    )->order('t.store_id ASC');
                     $cursor = $this->_connection->query($select);
                     while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
                         $updateData[$ids[$row['attribute_id']]] = $row['value'];
                         $valueColumnName = $ids[$row['attribute_id']] . $valueFieldSuffix;
                         if (isset($describe[$valueColumnName])) {
-                            $valueColumns[$row['value']] = $valueColumnName;
+                            $valueColumns[$row['attribute_id']] = [
+                                'value' => $row['value'],
+                                'column_name' => $valueColumnName
+                            ];
                         }
                     }
 
                     //Update not simple attributes (eg. dropdown)
                     if (!empty($valueColumns)) {
-                        $valueIds = array_keys($valueColumns);
+                        $valueIds = array_column($valueColumns, 'value');
+                        $optionIdToAttributeName = array_column($valueColumns, 'column_name', 'value');
 
                         $select = $this->_connection->select()->from(
                             ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
@@ -139,14 +132,14 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                             $this->_connection->quoteInto('t.option_id IN (?)', $valueIds)
                         )->where(
                             $this->_connection->quoteInto('t.store_id IN(?)', [
-                                \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                                Store::DEFAULT_STORE_ID,
                                 $storeId
                             ])
                         )
                         ->order('t.store_id ASC');
                         $cursor = $this->_connection->query($select);
                         while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
-                            $valueColumnName = $valueColumns[$row['option_id']];
+                            $valueColumnName = $optionIdToAttributeName[$row['option_id']];
                             if (isset($describe[$valueColumnName])) {
                                 $updateData[$valueColumnName] = $row['value'];
                             }
@@ -156,8 +149,9 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                     $columnNames = array_keys($columns);
                     $columnNames[] = 'attribute_set_id';
                     $columnNames[] = 'type_id';
+                    $columnNames[] = $linkField;
                     $select->from(
-                        ['e' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
+                        ['e' => $entityTableName],
                         $columnNames
                     )->where(
                         'e.entity_id = ' . $productId
@@ -165,6 +159,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                     $cursor = $this->_connection->query($select);
                     $row = $cursor->fetch(\Zend_Db::FETCH_ASSOC);
                     if (!empty($row)) {
+                        $linkFieldId = $linkField;
                         foreach ($row as $columnName => $value) {
                             $updateData[$columnName] = $value;
                         }
@@ -175,6 +170,9 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
 
         if (!empty($updateData)) {
             $updateData += ['entity_id' => $productId];
+            if ($linkField !== $metadata->getIdentifierField()) {
+                $updateData += [$linkField => $linkFieldId];
+            }
             $updateFields = [];
             foreach ($updateData as $key => $value) {
                 $updateFields[$key] = $key;
@@ -186,6 +184,8 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
     }
 
     /**
+     * Get MetadataPool instance
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index b5dbdb68606ff..64a7c4be4e03c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -5,16 +5,20 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder;
 use Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Class Row reindex action
+ * Class Row reindex action.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
 {
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer
+     * @var Indexer
      */
     protected $flatItemWriter;
 
@@ -23,6 +27,11 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      */
     protected $flatItemEraser;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -32,6 +41,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      * @param FlatTableBuilder $flatTableBuilder
      * @param Indexer $flatItemWriter
      * @param Eraser $flatItemEraser
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -41,7 +51,8 @@ public function __construct(
         TableBuilder $tableBuilder,
         FlatTableBuilder $flatTableBuilder,
         Indexer $flatItemWriter,
-        Eraser $flatItemEraser
+        Eraser $flatItemEraser,
+        MetadataPool $metadataPool = null
     ) {
         parent::__construct(
             $resource,
@@ -53,6 +64,8 @@ public function __construct(
         );
         $this->flatItemWriter = $flatItemWriter;
         $this->flatItemEraser = $flatItemEraser;
+        $this->metadataPool = $metadataPool ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -70,24 +83,50 @@ public function execute($id = null)
             );
         }
         $ids = [$id];
-        foreach ($this->_storeManager->getStores() as $store) {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
+        $stores = $this->_storeManager->getStores();
+        foreach ($stores as $store) {
             $tableExists = $this->_isFlatTableExists($store->getId());
             if ($tableExists) {
                 $this->flatItemEraser->removeDeletedProducts($ids, $store->getId());
+                $this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
             }
-            if (isset($ids[0])) {
+
+            /* @var $status \Magento\Eav\Model\Entity\Attribute */
+            $status = $this->_productIndexerHelper->getAttribute(ProductInterface::STATUS);
+            $statusTable = $status->getBackend()->getTable();
+            $catalogProductEntityTable = $this->_productIndexerHelper->getTable('catalog_product_entity');
+            $statusConditions = [
+                's.store_id IN(0,' . (int)$store->getId() . ')',
+                's.attribute_id = ' . (int)$status->getId(),
+                'e.entity_id = ' . (int)$id,
+            ];
+            $select = $this->_connection->select();
+            $select->from(['e' => $catalogProductEntityTable], ['s.value'])
+                ->where(implode(' AND ', $statusConditions))
+                ->joinLeft(['s' => $statusTable], "e.{$linkField} = s.{$linkField}", [])
+                ->order('s.store_id DESC')
+                ->limit(1);
+            $result = $this->_connection->query($select);
+            $status = $result->fetchColumn(0);
+
+            if ($status == \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) {
                 if (!$tableExists) {
                     $this->_flatTableBuilder->build(
                         $store->getId(),
-                        [$ids[0]],
+                        $ids,
                         $this->_valueFieldSuffix,
                         $this->_tableDropSuffix,
                         false
                     );
                 }
-                $this->flatItemWriter->write($store->getId(), $ids[0], $this->_valueFieldSuffix);
+                $this->flatItemWriter->write($store->getId(), $id, $this->_valueFieldSuffix);
+            } else {
+                $this->flatItemEraser->deleteProductsFromStore($id, $store->getId());
             }
         }
+
         return $this;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index a32379b8c0a67..a3d958ea537e1 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -7,6 +7,9 @@
 
 use Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterfaceFactory;
 
+/**
+ * Class TableBuilder
+ */
 class TableBuilder
 {
     /**
@@ -137,13 +140,23 @@ protected function _createTemporaryTable($tableName, array $columns, $valueField
             );
             $flatColumns = $this->_productIndexerHelper->getFlatColumns();
 
-            $temporaryTableBuilder->addColumn('entity_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
+            $temporaryTableBuilder->addColumn(
+                'entity_id',
+                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+                null,
+                ['unsigned'=>true]
+            );
 
             $temporaryTableBuilder->addColumn('type_id', \Magento\Framework\DB\Ddl\Table::TYPE_TEXT);
 
             $temporaryTableBuilder->addColumn('attribute_set_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
 
-            $valueTemporaryTableBuilder->addColumn('entity_id', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER);
+            $valueTemporaryTableBuilder->addColumn(
+                'entity_id',
+                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+                null,
+                ['unsigned'=>true]
+            );
 
             /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
             foreach ($columns as $columnName => $attribute) {
@@ -198,9 +211,10 @@ protected function _getTemporaryTableName($tableName)
      * Fill temporary entity table
      *
      * @param string $tableName
-     * @param array  $columns
-     * @param array  $changedIds
+     * @param array $columns
+     * @param array $changedIds
      * @return void
+     * @throws \Exception
      */
     protected function _fillTemporaryEntityTable($tableName, array $columns, array $changedIds = [])
     {
@@ -244,11 +258,12 @@ protected function _addPrimaryKeyToTable($tableName, $columnName = 'entity_id')
      * Fill temporary table by data from products EAV attributes by type
      *
      * @param string $tableName
-     * @param array  $tableColumns
-     * @param array  $changedIds
+     * @param array $tableColumns
+     * @param array $changedIds
      * @param string $valueFieldSuffix
      * @param int $storeId
      * @return void
+     * @throws \Exception
      */
     protected function _fillTemporaryTable(
         $tableName,
@@ -345,6 +360,8 @@ protected function _fillTemporaryTable(
     }
 
     /**
+     * Get Metadata Pool
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      * @deprecated 101.1.0
      */
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index 6db52f969d273..e9a907f0b5097 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price;
 
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
 /**
  * Abstract action reindex class
  *
@@ -15,7 +21,7 @@ abstract class AbstractAction
     /**
      * Default Product Type Price indexer resource model
      *
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
+     * @var DefaultPrice
      */
     protected $_defaultIndexerResource;
 
@@ -71,9 +77,19 @@ abstract class AbstractAction
     protected $_indexers;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice
+     */
+    private $tierPriceIndexResource;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
+     */
+    private $dimensionCollectionFactory;
+
+    /**
+     * @var TableMaintainer
      */
-    private $productResource;
+    private $tableMaintainer;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
@@ -83,7 +99,13 @@ abstract class AbstractAction
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource
+     * @param DefaultPrice $defaultIndexerResource
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice|null $tierPriceIndexResource
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
+     * @param TableMaintainer|null $tableMaintainer
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
@@ -93,7 +115,10 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource
+        DefaultPrice $defaultIndexerResource,
+        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice $tierPriceIndexResource = null,
+        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory = null,
+        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $tableMaintainer = null
     ) {
         $this->_config = $config;
         $this->_storeManager = $storeManager;
@@ -104,6 +129,15 @@ public function __construct(
         $this->_indexerPriceFactory = $indexerPriceFactory;
         $this->_defaultIndexerResource = $defaultIndexerResource;
         $this->_connection = $this->_defaultIndexerResource->getConnection();
+        $this->tierPriceIndexResource = $tierPriceIndexResource ?? ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice::class
+        );
+        $this->dimensionCollectionFactory = $dimensionCollectionFactory ?? ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+        );
+        $this->tableMaintainer = $tableMaintainer ?? ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class
+        );
     }
 
     /**
@@ -119,30 +153,29 @@ abstract public function execute($ids);
      *
      * @param array $processIds
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated Used only for backward compatibility for indexer, which not support indexation by dimensions
      */
     protected function _syncData(array $processIds = [])
     {
-        // delete invalid rows
-        $select = $this->_connection->select()->from(
-            ['index_price' => $this->getIndexTargetTable()],
-            null
-        )->joinLeft(
-            ['ip_tmp' => $this->_defaultIndexerResource->getIdxTable()],
-            'index_price.entity_id = ip_tmp.entity_id AND index_price.website_id = ip_tmp.website_id',
-            []
-        )->where(
-            'ip_tmp.entity_id IS NULL'
-        );
-        if (!empty($processIds)) {
-            $select->where('index_price.entity_id IN(?)', $processIds);
-        }
-        $sql = $select->deleteFromSelect('index_price');
-        $this->_connection->query($sql);
+        // for backward compatibility split data from old idx table on dimension tables
+        foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+            $insertSelect = $this->getConnection()->select()->from(
+                ['ip_tmp' => $this->_defaultIndexerResource->getIdxTable()]
+            );
 
-        $this->_insertFromTable(
-            $this->_defaultIndexerResource->getIdxTable(),
-            $this->getIndexTargetTable()
-        );
+            foreach ($dimensions as $dimension) {
+                if ($dimension->getName() === WebsiteDimensionProvider::DIMENSION_NAME) {
+                    $insertSelect->where('ip_tmp.website_id = ?', $dimension->getValue());
+                }
+                if ($dimension->getName() === CustomerGroupDimensionProvider::DIMENSION_NAME) {
+                    $insertSelect->where('ip_tmp.customer_group_id = ?', $dimension->getValue());
+                }
+            }
+
+            $query = $insertSelect->insertFromSelect($this->tableMaintainer->getMainTable($dimensions));
+            $this->getConnection()->query($query);
+        }
         return $this;
     }
 
@@ -150,12 +183,15 @@ protected function _syncData(array $processIds = [])
      * Prepare website current dates table
      *
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _prepareWebsiteDateTable()
     {
         $baseCurrency = $this->_config->getValue(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE);
 
-        $select = $this->_connection->select()->from(
+        $select = $this->getConnection()->select()->from(
             ['cw' => $this->_defaultIndexerResource->getTable('store_website')],
             ['website_id']
         )->join(
@@ -167,7 +203,7 @@ protected function _prepareWebsiteDateTable()
         );
 
         $data = [];
-        foreach ($this->_connection->fetchAll($select) as $item) {
+        foreach ($this->getConnection()->fetchAll($select) as $item) {
             /** @var $website \Magento\Store\Model\Website */
             $website = $this->_storeManager->getWebsite($item['website_id']);
 
@@ -192,6 +228,7 @@ protected function _prepareWebsiteDateTable()
                     'website_id' => $website->getId(),
                     'website_date' => $this->_dateTime->formatDate($timestamp, false),
                     'rate' => $rate,
+                    'default_store_id' => $store->getId()
                 ];
             }
         }
@@ -200,7 +237,7 @@ protected function _prepareWebsiteDateTable()
         $this->_emptyTable($table);
         if ($data) {
             foreach ($data as $row) {
-                $this->_connection->insertOnDuplicate($table, $row, array_keys($row));
+                $this->getConnection()->insertOnDuplicate($table, $row, array_keys($row));
             }
         }
 
@@ -215,101 +252,21 @@ protected function _prepareWebsiteDateTable()
      */
     protected function _prepareTierPriceIndex($entityIds = null)
     {
-        $table = $this->_defaultIndexerResource->getTable('catalog_product_index_tier_price');
-        $this->_emptyTable($table);
-        if (empty($entityIds)) {
-            return $this;
-        }
-        $linkField = $this->getProductIdFieldName();
-        $priceAttribute = $this->getProductResource()->getAttribute('price');
-        $baseColumns = [
-            'cpe.entity_id',
-            'tp.customer_group_id',
-            'tp.website_id'
-        ];
-        if ($linkField !== 'entity_id') {
-            $baseColumns[] = 'cpe.' . $linkField;
-        };
-        $subSelect = $this->_connection->select()->from(
-            ['cpe' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
-            array_merge_recursive(
-                $baseColumns,
-                [
-                    'min(tp.value) AS value',
-                    'min(tp.percentage_value) AS percentage_value'
-                ]
-            )
-        )->joinInner(
-            ['tp' => $this->_defaultIndexerResource->getTable(['catalog_product_entity', 'tier_price'])],
-            'tp.' . $linkField . ' = cpe.' . $linkField,
-            []
-        )->where("cpe.entity_id IN(?)", $entityIds)
-            ->where("tp.website_id != 0")
-            ->group(['cpe.entity_id', 'tp.customer_group_id', 'tp.website_id']);
-
-        $subSelect2 = $this->_connection->select()
-            ->from(
-                ['cpe' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
-                array_merge_recursive(
-                    $baseColumns,
-                    [
-                        'MIN(ROUND(tp.value * cwd.rate, 4)) AS value',
-                        'MIN(ROUND(tp.percentage_value * cwd.rate, 4)) AS percentage_value'
+        $this->tierPriceIndexResource->reindexEntity((array) $entityIds);
 
-                    ]
-                )
-            )
-            ->joinInner(
-                ['tp' => $this->_defaultIndexerResource->getTable(['catalog_product_entity', 'tier_price'])],
-                'tp.' . $linkField . ' = cpe.' . $linkField,
-                []
-            )->join(
-                ['cw' => $this->_defaultIndexerResource->getTable('store_website')],
-                true,
-                []
-            )
-            ->joinInner(
-                ['cwd' => $this->_defaultIndexerResource->getTable('catalog_product_index_website')],
-                'cw.website_id = cwd.website_id',
-                []
-            )
-            ->where("cpe.entity_id IN(?)", $entityIds)
-            ->where("tp.website_id = 0")
-            ->group(
-                ['cpe.entity_id', 'tp.customer_group_id', 'tp.website_id']
-            );
-
-        $unionSelect = $this->_connection->select()
-            ->union([$subSelect, $subSelect2], \Magento\Framework\DB\Select::SQL_UNION_ALL);
-        $select = $this->_connection->select()
-            ->from(
-                ['b' => new \Zend_Db_Expr(sprintf('(%s)', $unionSelect->assemble()))],
-                [
-                    'b.entity_id',
-                    'b.customer_group_id',
-                    'b.website_id',
-                    'MIN(IF(b.value = 0, product_price.value * (1 - b.percentage_value / 100), b.value))'
-                ]
-            )
-            ->joinInner(
-                ['product_price' => $priceAttribute->getBackend()->getTable()],
-                'b.' . $linkField . ' = product_price.' . $linkField,
-                []
-            )
-            ->group(['b.entity_id', 'b.customer_group_id', 'b.website_id']);
-
-        $query = $select->insertFromSelect($table, [], false);
-
-        $this->_connection->query($query);
         return $this;
     }
 
     /**
      * Retrieve price indexers per product type
      *
+     * @param bool $fullReindexAction
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface[]
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getTypeIndexers()
+    public function getTypeIndexers($fullReindexAction = false)
     {
         if ($this->_indexers === null) {
             $this->_indexers = [];
@@ -319,14 +276,20 @@ public function getTypeIndexers()
                     $typeInfo['price_indexer']
                 ) ? $typeInfo['price_indexer'] : get_class($this->_defaultIndexerResource);
 
-                $isComposite = !empty($typeInfo['composite']);
                 $indexer = $this->_indexerPriceFactory->create(
-                    $modelName
-                )->setTypeId(
-                    $typeId
-                )->setIsComposite(
-                    $isComposite
+                    $modelName,
+                    [
+                        'fullReindexAction' => $fullReindexAction
+                    ]
                 );
+                // left setters for backward compatibility
+                if ($indexer instanceof DefaultPrice) {
+                    $indexer->setTypeId(
+                        $typeId
+                    )->setIsComposite(
+                        !empty($typeInfo['composite'])
+                    );
+                }
                 $this->_indexers[$typeId] = $indexer;
             }
         }
@@ -339,7 +302,9 @@ public function getTypeIndexers()
      *
      * @param string $productTypeId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface
+     *
      * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _getIndexer($productTypeId)
     {
@@ -360,19 +325,19 @@ protected function _getIndexer($productTypeId)
      */
     protected function _insertFromTable($sourceTable, $destTable, $where = null)
     {
-        $sourceColumns = array_keys($this->_connection->describeTable($sourceTable));
-        $targetColumns = array_keys($this->_connection->describeTable($destTable));
-        $select = $this->_connection->select()->from($sourceTable, $sourceColumns);
+        $sourceColumns = array_keys($this->getConnection()->describeTable($sourceTable));
+        $targetColumns = array_keys($this->getConnection()->describeTable($destTable));
+        $select = $this->getConnection()->select()->from($sourceTable, $sourceColumns);
         if ($where) {
             $select->where($where);
         }
-        $query = $this->_connection->insertFromSelect(
+        $query = $this->getConnection()->insertFromSelect(
             $select,
             $destTable,
             $targetColumns,
             \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
         );
-        $this->_connection->query($query);
+        $this->getConnection()->query($query);
     }
 
     /**
@@ -383,7 +348,7 @@ protected function _insertFromTable($sourceTable, $destTable, $where = null)
      */
     protected function _emptyTable($table)
     {
-        $this->_connection->delete($table);
+        $this->getConnection()->delete($table);
     }
 
     /**
@@ -391,74 +356,64 @@ protected function _emptyTable($table)
      *
      * @param array $changedIds
      * @return array Affected ids
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _reindexRows($changedIds = [])
     {
-        $this->_emptyTable($this->_defaultIndexerResource->getIdxTable());
         $this->_prepareWebsiteDateTable();
 
-        $select = $this->_connection->select()->from(
-            $this->_defaultIndexerResource->getTable('catalog_product_entity'),
-            ['entity_id', 'type_id']
-        )->where(
-            'entity_id IN(?)',
-            $changedIds
-        );
-        $pairs = $this->_connection->fetchPairs($select);
-        $byType = [];
-        foreach ($pairs as $productId => $productType) {
-            $byType[$productType][$productId] = $productId;
-        }
+        $productsTypes = $this->getProductsTypes($changedIds);
+        $parentProductsTypes = $this->getParentProductsTypes($changedIds);
 
-        $compositeIds = [];
-        $notCompositeIds = [];
+        $changedIds = array_merge($changedIds, ...array_values($parentProductsTypes));
+        $productsTypes = array_merge_recursive($productsTypes, $parentProductsTypes);
 
-        foreach ($byType as $productType => $entityIds) {
-            $indexer = $this->_getIndexer($productType);
-            if ($indexer->getIsComposite()) {
-                $compositeIds += $entityIds;
-            } else {
-                $notCompositeIds += $entityIds;
-            }
+        if ($changedIds) {
+            $this->deleteIndexData($changedIds);
         }
-
-        if (!empty($notCompositeIds)) {
-            $select = $this->_connection->select()->from(
-                ['l' => $this->_defaultIndexerResource->getTable('catalog_product_relation')],
-                ''
-            )->join(
-                ['e' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
-                'e.' . $this->getProductIdFieldName() . ' = l.parent_id',
-                ['e.entity_id as parent_id', 'type_id']
-            )->where(
-                'l.child_id IN(?)',
-                $notCompositeIds
-            );
-            $pairs = $this->_connection->fetchPairs($select);
-            foreach ($pairs as $productId => $productType) {
-                if (!in_array($productId, $changedIds)) {
-                    $changedIds[] = (string) $productId;
-                    $byType[$productType][$productId] = $productId;
-                    $compositeIds[$productId] = $productId;
+        foreach ($productsTypes as $productType => $entityIds) {
+            $indexer = $this->_getIndexer($productType);
+            if ($indexer instanceof DimensionalIndexerInterface) {
+                foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+                    $this->tableMaintainer->createMainTmpTable($dimensions);
+                    $temporaryTable = $this->tableMaintainer->getMainTmpTable($dimensions);
+                    $this->_emptyTable($temporaryTable);
+                    $indexer->executeByDimensions($dimensions, \SplFixedArray::fromArray($entityIds, false));
+                    // copy to index
+                    $this->_insertFromTable(
+                        $temporaryTable,
+                        $this->tableMaintainer->getMainTable($dimensions)
+                    );
                 }
+            } else {
+                // handle 3d-party indexers for backward compatibility
+                $this->_emptyTable($this->_defaultIndexerResource->getIdxTable());
+                $this->_copyRelationIndexData($entityIds);
+                $indexer->reindexEntity($entityIds);
+                $this->_syncData($entityIds);
             }
         }
 
-        if (!empty($compositeIds)) {
-            $this->_copyRelationIndexData($compositeIds, $notCompositeIds);
-        }
-        $this->_prepareTierPriceIndex($compositeIds + $notCompositeIds);
+        return $changedIds;
+    }
 
-        $indexers = $this->getTypeIndexers();
-        foreach ($indexers as $indexer) {
-            if (!empty($byType[$indexer->getTypeId()])) {
-                $indexer->reindexEntity($byType[$indexer->getTypeId()]);
-            }
+    /**
+     * @param array $entityIds
+     * @return void
+     */
+    private function deleteIndexData(array $entityIds)
+    {
+        foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+            $select = $this->getConnection()->select()->from(
+                ['index_price' => $this->tableMaintainer->getMainTable($dimensions)],
+                null
+            )->where('index_price.entity_id IN (?)', $entityIds);
+            $query = $select->deleteFromSelect('index_price');
+            $this->getConnection()->query($query);
         }
-        $this->_syncData($changedIds);
-
-        return $compositeIds + $notCompositeIds;
     }
 
     /**
@@ -467,16 +422,21 @@ protected function _reindexRows($changedIds = [])
      * @param null|array $parentIds
      * @param array $excludeIds
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     * @deprecated Used only for backward compatibility for do not broke custom indexer implementation
+     * which do not work by dimensions.
+     * For indexers, which support dimensions all composite products read data directly from main price indexer table
+     * or replica table for partial or full reindex correspondingly.
      */
     protected function _copyRelationIndexData($parentIds, $excludeIds = null)
     {
         $linkField = $this->getProductIdFieldName();
-        $select = $this->_connection->select()->from(
+        $select = $this->getConnection()->select()->from(
             $this->_defaultIndexerResource->getTable('catalog_product_relation'),
             ['child_id']
         )->join(
             ['e' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
-            'e.' . $linkField . ' = parent_id'
+            'e.' . $linkField . ' = parent_id',
+            []
         )->where(
             'e.entity_id IN(?)',
             $parentIds
@@ -485,22 +445,45 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
             $select->where('child_id NOT IN(?)', $excludeIds);
         }
 
-        $children = $this->_connection->fetchCol($select);
+        $children = $this->getConnection()->fetchCol($select);
 
         if ($children) {
-            $select = $this->_connection->select()->from(
-                $this->getIndexTargetTable()
-            )->where(
-                'entity_id IN(?)',
-                $children
-            );
-            $query = $select->insertFromSelect($this->_defaultIndexerResource->getIdxTable(), [], false);
-            $this->_connection->query($query);
+            foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+                $select = $this->getConnection()->select()->from(
+                    $this->getIndexTargetTableByDimension($dimensions)
+                )->where(
+                    'entity_id IN(?)',
+                    $children
+                );
+                $query = $select->insertFromSelect($this->_defaultIndexerResource->getIdxTable(), [], false);
+                $this->getConnection()->query($query);
+            }
         }
 
         return $this;
     }
 
+    /**
+     * Retrieve index table by dimension that will be used for write operations.
+     *
+     * This method is used during both partial and full reindex to identify the table.
+     *
+     * @param \Magento\Framework\Search\Request\Dimension[] $dimensions
+     *
+     * @return string
+     */
+    private function getIndexTargetTableByDimension(array $dimensions)
+    {
+        $indexTargetTable = $this->getIndexTargetTable();
+        if ($indexTargetTable === self::getIndexTargetTable()) {
+            $indexTargetTable = $this->tableMaintainer->getMainTable($dimensions);
+        }
+        if ($indexTargetTable === self::getIndexTargetTable() . '_replica') {
+            $indexTargetTable = $this->tableMaintainer->getMainReplicaTable($dimensions);
+        }
+        return $indexTargetTable;
+    }
+
     /**
      * Retrieve index table that will be used for write operations.
      *
@@ -519,20 +502,72 @@ protected function getIndexTargetTable()
     protected function getProductIdFieldName()
     {
         $table = $this->_defaultIndexerResource->getTable('catalog_product_entity');
-        $indexList = $this->_connection->getIndexList($table);
-        return $indexList[$this->_connection->getPrimaryKeyName($table)]['COLUMNS_LIST'][0];
+        $indexList = $this->getConnection()->getIndexList($table);
+        return $indexList[$this->getConnection()->getPrimaryKeyName($table)]['COLUMNS_LIST'][0];
+    }
+
+    /**
+     * Get products types.
+     *
+     * @param array $changedIds
+     * @return array
+     */
+    private function getProductsTypes(array $changedIds = [])
+    {
+        $select = $this->getConnection()->select()->from(
+            $this->_defaultIndexerResource->getTable('catalog_product_entity'),
+            ['entity_id', 'type_id']
+        );
+        if ($changedIds) {
+            $select->where('entity_id IN (?)', $changedIds);
+        }
+        $pairs = $this->getConnection()->fetchPairs($select);
+
+        $byType = [];
+        foreach ($pairs as $productId => $productType) {
+            $byType[$productType][$productId] = $productId;
+        }
+
+        return $byType;
     }
 
     /**
-     * @return \Magento\Catalog\Model\ResourceModel\Product
-     * @deprecated 101.1.0
+     * Get parent products types
+     * Used for add composite products to reindex if we have only simple products in changed ids set
+     *
+     * @param array $productsIds
+     * @return array
      */
-    private function getProductResource()
+    private function getParentProductsTypes(array $productsIds)
     {
-        if (null === $this->productResource) {
-            $this->productResource = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $select = $this->getConnection()->select()->from(
+            ['l' => $this->_defaultIndexerResource->getTable('catalog_product_relation')],
+            ''
+        )->join(
+            ['e' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
+            'e.' . $this->getProductIdFieldName() . ' = l.parent_id',
+            ['e.entity_id as parent_id', 'type_id']
+        )->where(
+            'l.child_id IN(?)',
+            $productsIds
+        );
+        $pairs = $this->getConnection()->fetchPairs($select);
+
+        $byType = [];
+        foreach ($pairs as $productId => $productType) {
+            $byType[$productType][$productId] = $productId;
         }
-        return $this->productResource;
+
+        return $byType;
+    }
+
+    /**
+     * Get connection
+     *
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private function getConnection()
+    {
+        return $this->_defaultIndexerResource->getConnection();
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
index eb15833a7d0b2..1a75751570658 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -6,9 +6,17 @@
 namespace Magento\Catalog\Model\Indexer\Product\Price\Action;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 
 /**
  * Class Full reindex action
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
@@ -33,6 +41,26 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var EntityMetadataInterface
+     */
+    private $productMetaDataCached;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
+     */
+    private $dimensionCollectionFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer
+     */
+    private $dimensionTableMaintainer;
+
+    /**
+     * @var \Magento\Indexer\Model\ProcessManager
+     */
+    private $processManager;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -46,7 +74,9 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator|null $batchSizeCalculator
      * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
-     *
+     * @param \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory|null $dimensionCollectionFactory
+     * @param \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer|null $dimensionTableMaintainer
+     * @param \Magento\Indexer\Model\ProcessManager $processManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -61,7 +91,10 @@ public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator $batchSizeCalculator = null,
         \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null
+        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
+        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory = null,
+        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $dimensionTableMaintainer = null,
+        \Magento\Indexer\Model\ProcessManager $processManager = null
     ) {
         parent::__construct(
             $config,
@@ -85,6 +118,15 @@ public function __construct(
         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
             \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
         );
+        $this->dimensionCollectionFactory = $dimensionCollectionFactory ?: ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+        );
+        $this->dimensionTableMaintainer = $dimensionTableMaintainer ?: ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class
+        );
+        $this->processManager = $processManager ?: ObjectManager::getInstance()->get(
+            \Magento\Indexer\Model\ProcessManager::class
+        );
     }
 
     /**
@@ -92,75 +134,335 @@ public function __construct(
      *
      * @param array|int|null $ids
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($ids = null)
     {
         try {
-            $this->_defaultIndexerResource->getTableStrategy()->setUseIdxTable(false);
-            $this->_prepareWebsiteDateTable();
+            //Prepare indexer tables before full reindex
+            $this->prepareTables();
+
+            /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $indexer */
+            foreach ($this->getTypeIndexers(true) as $typeId => $priceIndexer) {
+                if ($priceIndexer instanceof DimensionalIndexerInterface) {
+                    //New price reindex mechanism
+                    $this->reindexProductTypeWithDimensions($priceIndexer, $typeId);
+                    continue;
+                }
+
+                $priceIndexer->getTableStrategy()->setUseIdxTable(false);
+
+                //Old price reindex mechanism
+                $this->reindexProductType($priceIndexer, $typeId);
+            }
+
+            //Final replacement of tables from replica to main
+            $this->switchTables();
+        } catch (\Exception $e) {
+            throw new LocalizedException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Prepare indexer tables before full reindex
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function prepareTables()
+    {
+        $this->_defaultIndexerResource->getTableStrategy()->setUseIdxTable(false);
+
+        $this->_prepareWebsiteDateTable();
 
-            $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-            $replicaTable = $this->activeTableSwitcher->getAdditionalTableName(
-                $this->_defaultIndexerResource->getMainTable()
+        $this->truncateReplicaTables();
+    }
+
+    /**
+     * Truncate replica tables by dimensions
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function truncateReplicaTables()
+    {
+        foreach ($this->dimensionCollectionFactory->create() as $dimension) {
+            $dimensionTable = $this->dimensionTableMaintainer->getMainReplicaTable($dimension);
+            $this->_defaultIndexerResource->getConnection()->truncateTable($dimensionTable);
+        }
+    }
+
+    /**
+     * Reindex new 'Dimensional' price indexer by product type
+     *
+     * @param DimensionalIndexerInterface $priceIndexer
+     * @param string $typeId
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $priceIndexer, string $typeId)
+    {
+        $userFunctions = [];
+        foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+            $userFunctions[] = function () use ($priceIndexer, $dimensions, $typeId) {
+                return $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
+            };
+        }
+        $this->processManager->execute($userFunctions);
+    }
+
+    /**
+     * Reindex new 'Dimensional' price indexer by batches
+     *
+     * @param DimensionalIndexerInterface $priceIndexer
+     * @param array $dimensions
+     * @param string $typeId
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function reindexByBatches(DimensionalIndexerInterface $priceIndexer, array $dimensions, string $typeId)
+    {
+        foreach ($this->getBatchesForIndexer($typeId) as $batch) {
+            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions, $typeId);
+        }
+    }
+
+    /**
+     * Get batches for new 'Dimensional' price indexer
+     *
+     * @param string $typeId
+     *
+     * @return \Generator
+     * @throws \Exception
+     */
+    private function getBatchesForIndexer(string $typeId)
+    {
+        $connection = $this->_defaultIndexerResource->getConnection();
+        return $this->batchProvider->getBatches(
+            $connection,
+            $this->getProductMetaData()->getEntityTable(),
+            $this->getProductMetaData()->getIdentifierField(),
+            $this->batchSizeCalculator->estimateBatchSize(
+                $connection,
+                $typeId
+            )
+        );
+    }
+
+    /**
+     * Reindex by batch for new 'Dimensional' price indexer
+     *
+     * @param DimensionalIndexerInterface $priceIndexer
+     * @param array $batch
+     * @param array $dimensions
+     * @param string $typeId
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function reindexByBatchWithDimensions(
+        DimensionalIndexerInterface $priceIndexer,
+        array $batch,
+        array $dimensions,
+        string $typeId
+    ) {
+        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
+
+        if (!empty($entityIds)) {
+            $this->dimensionTableMaintainer->createMainTmpTable($dimensions);
+            $temporaryTable = $this->dimensionTableMaintainer->getMainTmpTable($dimensions);
+            $this->_emptyTable($temporaryTable);
+
+            $priceIndexer->executeByDimensions($dimensions, \SplFixedArray::fromArray($entityIds, false));
+
+            // Sync data from temp table to index table
+            $this->_insertFromTable(
+                $temporaryTable,
+                $this->dimensionTableMaintainer->getMainReplicaTable($dimensions)
             );
+        }
+    }
 
-            // Prepare replica table for indexation.
-            $this->_defaultIndexerResource->getConnection()->truncateTable($replicaTable);
-
-            /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer $indexer */
-            foreach ($this->getTypeIndexers() as $indexer) {
-                $indexer->getTableStrategy()->setUseIdxTable(false);
-                $connection = $indexer->getConnection();
-
-                $batches = $this->batchProvider->getBatches(
-                    $connection,
-                    $entityMetadata->getEntityTable(),
-                    $entityMetadata->getIdentifierField(),
-                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexer->getTypeId())
-                );
-
-                foreach ($batches as $batch) {
-                    // Get entity ids from batch
-                    $select = $connection->select();
-                    $select->distinct(true);
-                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-                    $select->where('type_id = ?', $indexer->getTypeId());
-
-                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
-
-                    if (!empty($entityIds)) {
-                        // Temporary table will created if not exists
-                        $idxTableName = $this->_defaultIndexerResource->getIdxTable();
-                        $this->_emptyTable($idxTableName);
-
-                        if ($indexer->getIsComposite()) {
-                            $this->_copyRelationIndexData($entityIds);
-                        }
-                        $this->_prepareTierPriceIndex($entityIds);
-
-                        // Reindex entities by id
-                        $indexer->reindexEntity($entityIds);
-
-                        // Sync data from temp table to index table
-                        $this->_insertFromTable($idxTableName, $replicaTable);
-
-                        // Drop temporary index table
-                        $connection->dropTable($idxTableName);
-                    }
-                }
+    /**
+     * Reindex old price indexer by product type
+     *
+     * @param PriceInterface $priceIndexer
+     * @param string $typeId
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function reindexProductType(PriceInterface $priceIndexer, string $typeId)
+    {
+        foreach ($this->getBatchesForIndexer($typeId) as $batch) {
+            $this->reindexBatch($priceIndexer, $batch, $typeId);
+        }
+    }
+
+    /**
+     * Reindex by batch for old price indexer
+     *
+     * @param PriceInterface $priceIndexer
+     * @param array $batch
+     * @param string $typeId
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function reindexBatch(PriceInterface $priceIndexer, array $batch, string $typeId)
+    {
+        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
+
+        if (!empty($entityIds)) {
+            // Temporary table will created if not exists
+            $idxTableName = $this->_defaultIndexerResource->getIdxTable();
+            $this->_emptyTable($idxTableName);
+
+            if ($priceIndexer->getIsComposite()) {
+                $this->_copyRelationIndexData($entityIds);
             }
+
+            // Reindex entities by id
+            $priceIndexer->reindexEntity($entityIds);
+
+            // Sync data from temp table to index table
+            $this->_insertFromTable($idxTableName, $this->getReplicaTable());
+
+            // Drop temporary index table
+            $this->_defaultIndexerResource->getConnection()->dropTable($idxTableName);
+        }
+    }
+
+    /**
+     * Get Entity Ids from batch
+     *
+     * @param string $typeId
+     * @param array $batch
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getEntityIdsFromBatch(string $typeId, array $batch)
+    {
+        $connection = $this->_defaultIndexerResource->getConnection();
+
+        // Get entity ids from batch
+        $select = $connection
+            ->select()
+            ->distinct(true)
+            ->from(
+                ['e' => $this->getProductMetaData()->getEntityTable()],
+                $this->getProductMetaData()->getIdentifierField()
+            )
+            ->where('type_id = ?', $typeId);
+
+        return $this->batchProvider->getBatchIds($connection, $select, $batch);
+    }
+
+    /**
+     * Get product meta data
+     *
+     * @return EntityMetadataInterface
+     * @throws \Exception
+     */
+    private function getProductMetaData()
+    {
+        if ($this->productMetaDataCached === null) {
+            $this->productMetaDataCached = $this->metadataPool->getMetadata(ProductInterface::class);
+        }
+
+        return $this->productMetaDataCached;
+    }
+
+    /**
+     * Get replica table
+     *
+     * @return string
+     * @throws \Exception
+     */
+    private function getReplicaTable()
+    {
+        return $this->activeTableSwitcher->getAdditionalTableName(
+            $this->_defaultIndexerResource->getMainTable()
+        );
+    }
+
+    /**
+     * Replacement of tables from replica to main
+     *
+     * @return void
+     */
+    private function switchTables()
+    {
+        // Switch dimension tables
+        $mainTablesByDimension = [];
+
+        foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
+            $mainTablesByDimension[] = $this->dimensionTableMaintainer->getMainTable($dimensions);
+
+            //Move data from indexers with old realisation
+            $this->moveDataFromReplicaTableToReplicaTables($dimensions);
+        }
+
+        if (count($mainTablesByDimension) > 0) {
             $this->activeTableSwitcher->switchTable(
                 $this->_defaultIndexerResource->getConnection(),
-                [$this->_defaultIndexerResource->getMainTable()]
+                $mainTablesByDimension
             );
-        } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 
     /**
+     * Move data from old price indexer mechanism to new indexer mechanism by dimensions.
+     * Used only for backward compatibility
+     *
+     * @param array $dimensions
+     *
+     * @return void
+     */
+    private function moveDataFromReplicaTableToReplicaTables(array $dimensions)
+    {
+        if (!$dimensions) {
+            return;
+        }
+        $select = $this->dimensionTableMaintainer->getConnection()->select()->from(
+            $this->dimensionTableMaintainer->getMainReplicaTable([])
+        );
+
+        $check = clone $select;
+        $check->reset('columns')->columns('count(*)');
+
+        if (!$this->dimensionTableMaintainer->getConnection()->query($check)->fetchColumn()) {
+            return;
+        }
+
+        $replicaTablesByDimension = $this->dimensionTableMaintainer->getMainReplicaTable($dimensions);
+
+        foreach ($dimensions as $dimension) {
+            if ($dimension->getName() === WebsiteDimensionProvider::DIMENSION_NAME) {
+                $select->where('website_id = ?', $dimension->getValue());
+            }
+            if ($dimension->getName() === CustomerGroupDimensionProvider::DIMENSION_NAME) {
+                $select->where('customer_group_id = ?', $dimension->getValue());
+            }
+        }
+
+        $this->dimensionTableMaintainer->getConnection()->query(
+            $this->dimensionTableMaintainer->getConnection()->insertFromSelect(
+                $select,
+                $replicaTablesByDimension,
+                [],
+                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+            )
+        );
+    }
+
+    /**
+     * @deprecated
+     *
      * @inheritdoc
      */
     protected function getIndexTargetTable()
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionCollectionFactory.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionCollectionFactory.php
new file mode 100644
index 0000000000000..31459af81ccc7
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionCollectionFactory.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\Framework\Indexer\DimensionProviderInterface;
+use Magento\Framework\Indexer\MultiDimensionProvider;
+
+class DimensionCollectionFactory
+{
+    /**
+     * @var \Magento\Framework\Indexer\MultiDimensionProviderFactory
+     */
+    private $multiDimensionProviderFactory;
+
+    /**
+     * @var DimensionProviderInterface[]
+     */
+    private $dimensionProviders;
+
+    /**
+     * @var DimensionModeConfiguration
+     */
+    private $dimensionModeConfiguration;
+
+    /**
+     * @param \Magento\Framework\Indexer\MultiDimensionProviderFactory $multiDimensionProviderFactory
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     * @param array $dimensionProviders
+     */
+    public function __construct(
+        \Magento\Framework\Indexer\MultiDimensionProviderFactory $multiDimensionProviderFactory,
+        DimensionModeConfiguration $dimensionModeConfiguration,
+        array $dimensionProviders
+    ) {
+        $this->multiDimensionProviderFactory = $multiDimensionProviderFactory;
+        $this->dimensionProviders = $dimensionProviders;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+    }
+
+    /**
+     * Create MultiDimensionProvider for specified "dimension mode".
+     * By default return multiplication of dimensions by current set mode
+     *
+     * @param string|null $dimensionsMode
+     * @return MultiDimensionProvider
+     */
+    public function create(string $dimensionsMode = null): MultiDimensionProvider
+    {
+        $dimensionConfiguration = $this->dimensionModeConfiguration->getDimensionConfiguration($dimensionsMode);
+
+        $providers = [];
+        foreach ($dimensionConfiguration as $dimensionName) {
+            if (!isset($this->dimensionProviders[$dimensionName])) {
+                throw new \LogicException(
+                    'Dimension Provider is missing. Cannot handle unknown dimension: ' . $dimensionName
+                );
+            }
+            $providers[] = clone $this->dimensionProviders[$dimensionName];
+        }
+
+        return $this->multiDimensionProviderFactory->create(
+            [
+                'dimensionProviders' => $providers
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php
new file mode 100644
index 0000000000000..7a4d8e313462d
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+
+class DimensionModeConfiguration
+{
+    /**#@+
+     * Available modes of dimensions for product price indexer
+     */
+    const DIMENSION_NONE = 'none';
+    const DIMENSION_WEBSITE = 'website';
+    const DIMENSION_CUSTOMER_GROUP = 'customer_group';
+    const DIMENSION_WEBSITE_AND_CUSTOMER_GROUP = 'website_and_customer_group';
+    /**#@-*/
+
+    /**
+     * Mapping between dimension mode and dimension provider name
+     *
+     * @var array
+     */
+    private $modesMapping = [
+        self::DIMENSION_NONE => [
+        ],
+        self::DIMENSION_WEBSITE => [
+            WebsiteDimensionProvider::DIMENSION_NAME
+        ],
+        self::DIMENSION_CUSTOMER_GROUP => [
+            CustomerGroupDimensionProvider::DIMENSION_NAME
+        ],
+        self::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP => [
+            WebsiteDimensionProvider::DIMENSION_NAME,
+            CustomerGroupDimensionProvider::DIMENSION_NAME
+        ],
+    ];
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var string
+     */
+    private $currentMode;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Return dimension modes configuration.
+     *
+     * @return array
+     */
+    public function getDimensionModes(): array
+    {
+        return $this->modesMapping;
+    }
+
+    /**
+     * Get names of dimensions which used for provided mode.
+     * By default return dimensions for current enabled mode
+     *
+     * @param string|null $mode
+     * @return string[]
+     * @throws \InvalidArgumentException
+     */
+    public function getDimensionConfiguration(string $mode = null): array
+    {
+        if ($mode && !isset($this->modesMapping[$mode])) {
+            throw new \InvalidArgumentException(
+                sprintf('Undefined dimension mode "%s".', $mode)
+            );
+        }
+        return $this->modesMapping[$mode ?? $this->getCurrentMode()];
+    }
+
+    /**
+     * @return string
+     */
+    private function getCurrentMode(): string
+    {
+        if (null === $this->currentMode) {
+            $this->currentMode = $this->scopeConfig->getValue(ModeSwitcherConfiguration::XML_PATH_PRICE_DIMENSIONS_MODE)
+                ?: self::DIMENSION_NONE;
+        }
+
+        return $this->currentMode;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php
new file mode 100644
index 0000000000000..c418f2e1f253b
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Indexer\Model\DimensionModes;
+use Magento\Indexer\Model\DimensionMode;
+
+/**
+ * Class to prepare new tables for new indexer mode
+ */
+class ModeSwitcher implements \Magento\Indexer\Model\ModeSwitcherInterface
+{
+    /**
+     * TableMaintainer
+     *
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * DimensionCollectionFactory
+     *
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
+     */
+    private $dimensionCollectionFactory;
+
+    /**
+     * @var array|null
+     */
+    private $dimensionsArray;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration
+     */
+    private $dimensionModeConfiguration;
+
+    /**
+     * @var ModeSwitcherConfiguration
+     */
+    private $modeSwitcherConfiguration;
+
+    /**
+     * @param TableMaintainer $tableMaintainer
+     * @param DimensionCollectionFactory $dimensionCollectionFactory
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     * @param ModeSwitcherConfiguration $modeSwitcherConfiguration
+     */
+    public function __construct(
+        TableMaintainer $tableMaintainer,
+        DimensionCollectionFactory $dimensionCollectionFactory,
+        DimensionModeConfiguration $dimensionModeConfiguration,
+        ModeSwitcherConfiguration $modeSwitcherConfiguration
+    ) {
+        $this->tableMaintainer = $tableMaintainer;
+        $this->dimensionCollectionFactory = $dimensionCollectionFactory;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+        $this->modeSwitcherConfiguration = $modeSwitcherConfiguration;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDimensionModes(): DimensionModes
+    {
+        $dimensionsList = [];
+        foreach ($this->dimensionModeConfiguration->getDimensionModes() as $dimension => $modes) {
+            $dimensionsList[] = new DimensionMode($dimension, $modes);
+        }
+
+        return new DimensionModes($dimensionsList);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function switchMode(string $currentMode, string $previousMode)
+    {
+        //Create new tables and move data
+        $this->createTables($currentMode);
+        $this->moveData($currentMode, $previousMode);
+
+        //Change config options
+        $this->modeSwitcherConfiguration->saveMode($currentMode);
+
+        //Delete old tables
+        $this->dropTables($previousMode);
+    }
+
+    /**
+     * Create new tables
+     *
+     * @param string $currentMode
+     *
+     * @return void
+     * @throws \Zend_Db_Exception
+     */
+    public function createTables(string $currentMode)
+    {
+        foreach ($this->getDimensionsArray($currentMode) as $dimensions) {
+            if (!empty($dimensions)) {
+                $this->tableMaintainer->createTablesForDimensions($dimensions);
+            }
+        }
+    }
+
+    /**
+     * Move data from old tables to new
+     *
+     * @param string $currentMode
+     * @param string $previousMode
+     *
+     * @return void
+     */
+    public function moveData(string $currentMode, string $previousMode)
+    {
+        $dimensionsArrayForCurrentMode = $this->getDimensionsArray($currentMode);
+        $dimensionsArrayForPreviousMode = $this->getDimensionsArray($previousMode);
+
+        foreach ($dimensionsArrayForCurrentMode as $dimensionsForCurrentMode) {
+            $newTable = $this->tableMaintainer->getMainTable($dimensionsForCurrentMode);
+            if (empty($dimensionsForCurrentMode)) {
+                // new mode is 'none'
+                foreach ($dimensionsArrayForPreviousMode as $dimensionsForPreviousMode) {
+                    $oldTable = $this->tableMaintainer->getMainTable($dimensionsForPreviousMode);
+                    $this->insertFromOldTablesToNew($newTable, $oldTable);
+                }
+            } else {
+                // new mode is not 'none'
+                foreach ($dimensionsArrayForPreviousMode as $dimensionsForPreviousMode) {
+                    $oldTable = $this->tableMaintainer->getMainTable($dimensionsForPreviousMode);
+                    $this->insertFromOldTablesToNew($newTable, $oldTable, $dimensionsForCurrentMode);
+                }
+            }
+        }
+    }
+
+    /**
+     * Drop old tables
+     *
+     * @param string $previousMode
+     *
+     * @return void
+     */
+    public function dropTables(string $previousMode)
+    {
+        foreach ($this->getDimensionsArray($previousMode) as $dimensions) {
+            if (empty($dimensions)) {
+                $this->tableMaintainer->truncateTablesForDimensions($dimensions);
+            } else {
+                $this->tableMaintainer->dropTablesForDimensions($dimensions);
+            }
+        }
+    }
+
+    /**
+     * Get dimensions array
+     *
+     * @param string $mode
+     *
+     * @return \Magento\Framework\Indexer\MultiDimensionProvider
+     */
+    private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\MultiDimensionProvider
+    {
+        if (isset($this->dimensionsArray[$mode])) {
+            return $this->dimensionsArray[$mode];
+        }
+
+        $this->dimensionsArray[$mode] = $this->dimensionCollectionFactory->create($mode);
+
+        return $this->dimensionsArray[$mode];
+    }
+
+    /**
+     * Insert from old tables data to new
+     *
+     * @param string $newTable
+     * @param string $oldTable
+     * @param Dimension[] $dimensions
+     *
+     * @return void
+     */
+    private function insertFromOldTablesToNew(string $newTable, string $oldTable, array $dimensions = [])
+    {
+        $select = $this->tableMaintainer->getConnection()->select()->from($oldTable);
+
+        foreach ($dimensions as $dimension) {
+            if ($dimension->getName() === WebsiteDimensionProvider::DIMENSION_NAME) {
+                $select->where('website_id = ?', $dimension->getValue());
+            }
+            if ($dimension->getName() === CustomerGroupDimensionProvider::DIMENSION_NAME) {
+                $select->where('customer_group_id = ?', $dimension->getValue());
+            }
+        }
+        $this->tableMaintainer->getConnection()->query(
+            $this->tableMaintainer->getConnection()->insertFromSelect(
+                $select,
+                $newTable,
+                [],
+                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcherConfiguration.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcherConfiguration.php
new file mode 100644
index 0000000000000..ae00ec51f2960
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcherConfiguration.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Indexer\Model\Indexer;
+
+/**
+ * Class to configure indexers and system config after modes has been switched
+ */
+class ModeSwitcherConfiguration
+{
+    const XML_PATH_PRICE_DIMENSIONS_MODE = 'indexer/catalog_product_price/dimensions_mode';
+
+    /**
+     * ConfigInterface
+     *
+     * @var ConfigInterface
+     */
+    private $configWriter;
+
+    /**
+     * TypeListInterface
+     *
+     * @var TypeListInterface
+     */
+    private $cacheTypeList;
+
+    /**
+     * @var Indexer $indexer
+     */
+    private $indexer;
+
+    /**
+     * @param ConfigInterface $configWriter
+     * @param TypeListInterface $cacheTypeList
+     * @param Indexer $indexer
+     */
+    public function __construct(
+        ConfigInterface $configWriter,
+        TypeListInterface $cacheTypeList,
+        Indexer $indexer
+    ) {
+        $this->configWriter = $configWriter;
+        $this->cacheTypeList = $cacheTypeList;
+        $this->indexer = $indexer;
+    }
+
+    /**
+     * Save switcher mode and invalidate reindex.
+     *
+     * @param string $mode
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    public function saveMode(string $mode)
+    {
+        //Change config options
+        $this->configWriter->saveConfig(self::XML_PATH_PRICE_DIMENSIONS_MODE, $mode);
+        $this->cacheTypeList->cleanType('config');
+        $this->indexer->load(\Magento\Catalog\Model\Indexer\Product\Price\Processor::INDEXER_ID);
+        $this->indexer->invalidate();
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
index 32b2db8a7008c..9b99ee8c8dc8c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
@@ -5,9 +5,15 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Api\Data\GroupInterface;
-use \Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Framework\Indexer\Dimension;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 
 class CustomerGroup
 {
@@ -17,14 +23,46 @@ class CustomerGroup
     private $updateIndex;
 
     /**
-     * Constructor
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * DimensionFactory
      *
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var DimensionModeConfiguration
+     */
+    private $dimensionModeConfiguration;
+
+    /**
+     * @var WebsiteDimensionProvider
+     */
+    private $websiteDimensionProvider;
+
+    /**
      * @param UpdateIndexInterface $updateIndex
+     * @param TableMaintainer $tableMaintainer
+     * @param DimensionFactory $dimensionFactory
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     * @param WebsiteDimensionProvider $websiteDimensionProvider
      */
     public function __construct(
-        UpdateIndexInterface $updateIndex
+        UpdateIndexInterface $updateIndex,
+        TableMaintainer $tableMaintainer,
+        DimensionFactory $dimensionFactory,
+        DimensionModeConfiguration $dimensionModeConfiguration,
+        WebsiteDimensionProvider $websiteDimensionProvider
     ) {
         $this->updateIndex = $updateIndex;
+        $this->tableMaintainer = $tableMaintainer;
+        $this->dimensionFactory = $dimensionFactory;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+        $this->websiteDimensionProvider = $websiteDimensionProvider;
     }
 
     /**
@@ -32,7 +70,8 @@ public function __construct(
      *
      * @param GroupRepositoryInterface $subject
      * @param \Closure $proceed
-     * @param GroupInterface $result
+     * @param GroupInterface $group
+     *
      * @return GroupInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -43,7 +82,64 @@ public function aroundSave(
     ) {
         $isGroupNew = !$group->getId();
         $group = $proceed($group);
+        if ($isGroupNew) {
+            foreach ($this->getAffectedDimensions((string)$group->getId()) as $dimensions) {
+                $this->tableMaintainer->createTablesForDimensions($dimensions);
+            }
+        }
         $this->updateIndex->update($group, $isGroupNew);
         return $group;
     }
+
+    /**
+     * Update price index after customer group deleted
+     *
+     * @param GroupRepositoryInterface $subject
+     * @param bool $result
+     * @param string $groupId
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDeleteById(GroupRepositoryInterface $subject, bool $result, string $groupId)
+    {
+        foreach ($this->getAffectedDimensions($groupId) as $dimensions) {
+            $this->tableMaintainer->dropTablesForDimensions($dimensions);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get affected dimensions
+     *
+     * @param string $groupId
+     * @return Dimension[][]
+     */
+    private function getAffectedDimensions(string $groupId): array
+    {
+        $currentDimensions = $this->dimensionModeConfiguration->getDimensionConfiguration();
+        // do not return dimensions if Customer Group dimension is not present in configuration
+        if (!in_array(CustomerGroupDimensionProvider::DIMENSION_NAME, $currentDimensions, true)) {
+            return [];
+        }
+        $customerGroupDimension = $this->dimensionFactory->create(
+            CustomerGroupDimensionProvider::DIMENSION_NAME,
+            $groupId
+        );
+
+        $dimensions = [];
+        if (in_array(WebsiteDimensionProvider::DIMENSION_NAME, $currentDimensions, true)) {
+            foreach ($this->websiteDimensionProvider as $websiteDimension) {
+                $dimensions[] = [
+                    $customerGroupDimension,
+                    $websiteDimension
+                ];
+            }
+        } else {
+            $dimensions[] = [$customerGroupDimension];
+        }
+
+        return $dimensions;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/TableResolver.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/TableResolver.php
new file mode 100644
index 0000000000000..fbeec22783090
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/TableResolver.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price\Plugin;
+
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Framework\App\Http\Context;
+use Magento\Framework\Indexer\Dimension;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Context as CustomerContext;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
+/**
+ * Replace catalog_product_index_price table name on the table name segmented per dimension.
+ * Used only for backward compatibility
+ */
+class TableResolver
+{
+    /**
+     * @var IndexScopeResolverInterface
+     */
+    private $priceTableResolver;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Context
+     */
+    private $httpContext;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var DimensionModeConfiguration
+     */
+    private $dimensionModeConfiguration;
+
+    /**
+     * @param IndexScopeResolverInterface $priceTableResolver
+     * @param StoreManagerInterface $storeManager
+     * @param Context $context
+     * @param DimensionFactory $dimensionFactory
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     */
+    public function __construct(
+        IndexScopeResolverInterface $priceTableResolver,
+        StoreManagerInterface $storeManager,
+        Context $context,
+        DimensionFactory $dimensionFactory,
+        DimensionModeConfiguration $dimensionModeConfiguration
+    ) {
+        $this->priceTableResolver = $priceTableResolver;
+        $this->storeManager = $storeManager;
+        $this->httpContext = $context;
+        $this->dimensionFactory = $dimensionFactory;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+    }
+
+    /**
+     * Replacing catalog_product_index_price table name on the table name segmented per dimension.
+     *
+     * @param ResourceConnection $subject
+     * @param string $result
+     * @param string|string[] $tableName
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetTableName(
+        ResourceConnection $subject,
+        string $result,
+        $tableName
+    ) {
+        if (!is_array($tableName)
+            && $tableName === 'catalog_product_index_price'
+            && $this->dimensionModeConfiguration->getDimensionConfiguration()
+        ) {
+            return $this->priceTableResolver->resolve('catalog_product_index_price', $this->getDimensions());
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return Dimension[]
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getDimensions(): array
+    {
+        $dimensions = [];
+        foreach ($this->dimensionModeConfiguration->getDimensionConfiguration() as $dimensionName) {
+            if ($dimensionName === WebsiteDimensionProvider::DIMENSION_NAME) {
+                $dimensions[] = $this->createDimensionFromWebsite();
+            }
+            if ($dimensionName === CustomerGroupDimensionProvider::DIMENSION_NAME) {
+                $dimensions[] = $this->createDimensionFromCustomerGroup();
+            }
+        }
+
+        return $dimensions;
+    }
+
+    /**
+     * @return Dimension
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function createDimensionFromWebsite(): Dimension
+    {
+        $storeKey = $this->httpContext->getValue(StoreManagerInterface::CONTEXT_STORE);
+        return $this->dimensionFactory->create(
+            WebsiteDimensionProvider::DIMENSION_NAME,
+            (string)$this->storeManager->getStore($storeKey)->getWebsiteId()
+        );
+    }
+
+    /**
+     * @return Dimension
+     */
+    private function createDimensionFromCustomerGroup(): Dimension
+    {
+        return $this->dimensionFactory->create(
+            CustomerGroupDimensionProvider::DIMENSION_NAME,
+            (string)$this->httpContext->getValue(CustomerContext::CONTEXT_GROUP)
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php
index 269515e292e17..4831680f07c33 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/Website.php
@@ -5,33 +5,128 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Framework\Indexer\Dimension;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\AbstractModel;
+
 class Website
 {
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * DimensionFactory
+     *
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var DimensionModeConfiguration
      */
-    protected $_processor;
+    private $dimensionModeConfiguration;
 
     /**
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $processor
+     * @var CustomerGroupDimensionProvider
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Price\Processor $processor)
+    private $customerGroupDimensionProvider;
+
+    /**
+     * @param TableMaintainer $tableMaintainer
+     * @param DimensionFactory $dimensionFactory
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     * @param CustomerGroupDimensionProvider $customerGroupDimensionProvider
+     */
+    public function __construct(
+        TableMaintainer $tableMaintainer,
+        DimensionFactory $dimensionFactory,
+        DimensionModeConfiguration $dimensionModeConfiguration,
+        CustomerGroupDimensionProvider $customerGroupDimensionProvider
+    ) {
+        $this->tableMaintainer = $tableMaintainer;
+        $this->dimensionFactory = $dimensionFactory;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+        $this->customerGroupDimensionProvider = $customerGroupDimensionProvider;
+    }
+
+    /**
+     * Update price index after website deleted
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $website
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $website)
     {
-        $this->_processor = $processor;
+        foreach ($this->getAffectedDimensions($website->getId()) as $dimensions) {
+            $this->tableMaintainer->dropTablesForDimensions($dimensions);
+        }
+
+        return $objectResource;
     }
 
     /**
-     * Invalidate price indexer
+     * Update price index after website created
      *
-     * @param \Magento\Store\Model\ResourceModel\Website $subject
-     * @param \Magento\Store\Model\ResourceModel\Website $result
-     * @return \Magento\Store\Model\ResourceModel\Website
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $website
      *
+     * @return AbstractDb
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterDelete(\Magento\Store\Model\ResourceModel\Website $subject, $result)
+    public function afterSave(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $website)
+    {
+        if ($website->isObjectNew()) {
+            foreach ($this->getAffectedDimensions($website->getId()) as $dimensions) {
+                $this->tableMaintainer->createTablesForDimensions($dimensions);
+            }
+        }
+
+        return $objectResource;
+    }
+
+    /**
+     * Get affected dimensions
+     *
+     * @param string $websiteId
+     *
+     * @return Dimension[][]
+     */
+    private function getAffectedDimensions(string $websiteId): array
     {
-        $this->_processor->markIndexerAsInvalid();
-        return $result;
+        $currentDimensions = $this->dimensionModeConfiguration->getDimensionConfiguration();
+        // do not return dimensions if Website dimension is not present in configuration
+        if (!in_array(WebsiteDimensionProvider::DIMENSION_NAME, $currentDimensions, true)) {
+            return [];
+        }
+        $websiteDimension = $this->dimensionFactory->create(
+            WebsiteDimensionProvider::DIMENSION_NAME,
+            $websiteId
+        );
+
+        $dimensions = [];
+        if (in_array(CustomerGroupDimensionProvider::DIMENSION_NAME, $currentDimensions, true)) {
+            foreach ($this->customerGroupDimensionProvider as $customerGroupDimension) {
+                $dimensions[] = [
+                    $customerGroupDimension,
+                    $websiteDimension
+                ];
+            }
+        } else {
+            $dimensions[] = [$websiteDimension];
+        }
+
+        return $dimensions;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/PriceTableResolver.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/PriceTableResolver.php
new file mode 100644
index 0000000000000..eeaa731aac686
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/PriceTableResolver.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\Framework\Indexer\Dimension;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+
+/**
+ * Class return price table name based on dimension
+ * use only on the frontend area
+ */
+class PriceTableResolver implements IndexScopeResolverInterface
+{
+    /**
+     * @var IndexScopeResolver
+     */
+    private $indexScopeResolver;
+
+    /**
+     * @var DimensionModeConfiguration
+     */
+    private $dimensionModeConfiguration;
+
+    /**
+     * @param IndexScopeResolver $indexScopeResolver
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     */
+    public function __construct(
+        IndexScopeResolver $indexScopeResolver,
+        DimensionModeConfiguration $dimensionModeConfiguration
+    ) {
+        $this->indexScopeResolver = $indexScopeResolver;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+    }
+
+    /**
+     * Return price table name based on dimension
+     * @param string $index
+     * @param array $dimensions
+     * @return string
+     */
+    public function resolve($index, array $dimensions)
+    {
+        if ($index === 'catalog_product_index_price') {
+            $dimensions = $this->filterDimensions($dimensions);
+        }
+        return $this->indexScopeResolver->resolve($index, $dimensions);
+    }
+
+    /**
+     * @param Dimension[] $dimensions
+     * @return array
+     * @throws \Exception
+     */
+    private function filterDimensions($dimensions): array
+    {
+        $existDimensions = [];
+        $currentDimensions = $this->dimensionModeConfiguration->getDimensionConfiguration();
+        foreach ($dimensions as $dimension) {
+            if ((string)$dimension->getValue() === '') {
+                throw new \InvalidArgumentException(
+                    sprintf('Dimension value of "%s" can not be empty', $dimension->getName())
+                );
+            }
+            if (in_array($dimension->getName(), $currentDimensions, true)) {
+                $existDimensions[] = $dimension;
+            }
+        }
+
+        return $existDimensions;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/TableMaintainer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/TableMaintainer.php
new file mode 100644
index 0000000000000..e3077baaeb7a6
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/TableMaintainer.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+
+/**
+ * Class encapsulate logic of work with tables per store in Product Price indexer
+ */
+class TableMaintainer
+{
+    /**
+     * Catalog product price index table name
+     */
+    const MAIN_INDEX_TABLE = 'catalog_product_index_price';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * Catalog tmp category index table name
+     */
+    private $tmpTableSuffix = '_temp';
+
+    /**
+     * Catalog tmp category index table name
+     */
+    private $additionalTableSuffix = '_replica';
+
+    /**
+     * @var string[]
+     */
+    private $mainTmpTable;
+
+    /**
+     * @var null|string
+     */
+    private $connectionName;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param TableResolver $tableResolver
+     * @param null $connectionName
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        TableResolver $tableResolver,
+        $connectionName = null
+    ) {
+        $this->resource = $resource;
+        $this->tableResolver = $tableResolver;
+        $this->connectionName = $connectionName;
+    }
+
+    /**
+     * Get connection for work with price indexer
+     *
+     * @return AdapterInterface
+     */
+    public function getConnection(): AdapterInterface
+    {
+        if (null === $this->connection) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Return validated table name
+     *
+     * @param string $table
+     * @return string
+     */
+    private function getTable(string $table): string
+    {
+        return $this->resource->getTableName($table);
+    }
+
+    /**
+     * Create table based on main table
+     *
+     * @param string $mainTableName
+     * @param string $newTableName
+     *
+     * @return void
+     *
+     * @throws \Zend_Db_Exception
+     */
+    private function createTable(string $mainTableName, string $newTableName)
+    {
+        if (!$this->getConnection()->isTableExists($newTableName)) {
+            $this->getConnection()->createTable(
+                $this->getConnection()->createTableByDdl($mainTableName, $newTableName)
+            );
+        }
+    }
+
+    /**
+     * Drop table
+     *
+     * @param string $tableName
+     *
+     * @return void
+     */
+    private function dropTable(string $tableName)
+    {
+        if ($this->getConnection()->isTableExists($tableName)) {
+            $this->getConnection()->dropTable($tableName);
+        }
+    }
+
+    /**
+     * Truncate table
+     *
+     * @param string $tableName
+     *
+     * @return void
+     */
+    private function truncateTable(string $tableName)
+    {
+        if ($this->getConnection()->isTableExists($tableName)) {
+            $this->getConnection()->truncateTable($tableName);
+        }
+    }
+
+    /**
+     * Get array key for tmp table
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return string
+     */
+    private function getArrayKeyForTmpTable(array $dimensions): string
+    {
+        $key = 'temp';
+        foreach ($dimensions as $dimension) {
+            $key .= $dimension->getName() . '_' . $dimension->getValue();
+        }
+        return $key;
+    }
+
+    /**
+     * Return main index table name
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return string
+     */
+    public function getMainTable(array $dimensions): string
+    {
+        return $this->tableResolver->resolve(self::MAIN_INDEX_TABLE, $dimensions);
+    }
+
+    /**
+     * Create main and replica index tables for dimensions
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return void
+     *
+     * @throws \Zend_Db_Exception
+     */
+    public function createTablesForDimensions(array $dimensions)
+    {
+        $mainTableName = $this->getMainTable($dimensions);
+        //Create index table for dimensions based on main replica table
+        //Using main replica table is necessary for backward capability and TableResolver plugin work
+        $this->createTable(
+            $this->getTable(self::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
+            $mainTableName
+        );
+
+        $mainReplicaTableName = $this->getMainTable($dimensions) . $this->additionalTableSuffix;
+        //Create replica table for dimensions based on main replica table
+        $this->createTable(
+            $this->getTable(self::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
+            $mainReplicaTableName
+        );
+    }
+
+    /**
+     * Drop main and replica index tables for dimensions
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return void
+     */
+    public function dropTablesForDimensions(array $dimensions)
+    {
+        $mainTableName = $this->getMainTable($dimensions);
+        $this->dropTable($mainTableName);
+
+        $mainReplicaTableName = $this->getMainTable($dimensions) . $this->additionalTableSuffix;
+        $this->dropTable($mainReplicaTableName);
+    }
+
+    /**
+     * Truncate main and replica index tables for dimensions
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return void
+     */
+    public function truncateTablesForDimensions(array $dimensions)
+    {
+        $mainTableName = $this->getMainTable($dimensions);
+        $this->truncateTable($mainTableName);
+
+        $mainReplicaTableName = $this->getMainTable($dimensions) . $this->additionalTableSuffix;
+        $this->truncateTable($mainReplicaTableName);
+    }
+
+    /**
+     * Return replica index table name
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return string
+     */
+    public function getMainReplicaTable(array $dimensions): string
+    {
+        return $this->getMainTable($dimensions) . $this->additionalTableSuffix;
+    }
+
+    /**
+     * Create temporary index table for dimensions
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return void
+     */
+    public function createMainTmpTable(array $dimensions)
+    {
+        // Create temporary table based on template table catalog_product_index_price_tmp without indexes
+        $templateTableName = $this->resource->getTableName(self::MAIN_INDEX_TABLE . '_tmp');
+        $temporaryTableName = $this->getMainTable($dimensions) . $this->tmpTableSuffix;
+        $this->getConnection()->createTemporaryTableLike($temporaryTableName, $templateTableName, true);
+        $this->mainTmpTable[$this->getArrayKeyForTmpTable($dimensions)] = $temporaryTableName;
+    }
+
+    /**
+     * Return temporary index table name
+     *
+     * @param Dimension[] $dimensions
+     *
+     * @return string
+     *
+     * @throws \LogicException
+     */
+    public function getMainTmpTable(array $dimensions): string
+    {
+        $cacheKey = $this->getArrayKeyForTmpTable($dimensions);
+        if (!isset($this->mainTmpTable[$cacheKey])) {
+            throw new \LogicException(
+                sprintf('Temporary table for provided dimensions "%s" does not exist', $cacheKey)
+            );
+        }
+        return $this->mainTmpTable[$cacheKey];
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 28e8343c6d051..fb94e82f0007c 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -168,7 +168,7 @@ public function prepareProductCollection($collection)
      * Apply layer
      * Method is colling after apply all filters, can be used
      * for prepare some index data before getting information
-     * about existing intexes
+     * about existing indexes
      *
      * @return \Magento\Catalog\Model\Layer
      */
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index a4db630f0234b..f2e2e67f944e9 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -139,7 +139,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * Get fiter items count
+     * Get filter items count
      *
      * @return int
      */
@@ -241,7 +241,7 @@ protected function _createItem($label, $value, $count = 0)
     }
 
     /**
-     * Get all product ids from from collection with applied filters
+     * Get all product ids from collection with applied filters
      *
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
index 36caa148b2e4e..bb1fce309f4f4 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
@@ -56,7 +56,7 @@ public function getRange(FilterInterface $filter)
             $index = 1;
             do {
                 $range = pow(10, strlen(floor($maxValue)) - $index);
-                $items = $this->getRangeItemCounts($range, $filter);
+                $items = $this->getRangeItemCounts($range, $filter) ?: [];
                 $index++;
             } while ($range > self::MIN_RANGE_POWER && count($items) < 2);
             $this->range = $range;
@@ -109,7 +109,7 @@ public function getMinValue(FilterInterface $filter)
      *
      * @param int $range
      * @param FilterInterface $filter
-     * @return mixed
+     * @return array
      */
     public function getRangeItemCounts($range, FilterInterface $filter)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
index 8a17a3b6c8cfa..d1aee8c4c5ba6 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -282,7 +282,8 @@ public function getMaxPrice()
     public function getPriorFilters($filterParams)
     {
         $priorFilters = [];
-        for ($i = 1; $i < count($filterParams); ++$i) {
+        $count = count($filterParams);
+        for ($i = 1; $i < $count; ++$i) {
             $priorFilter = $this->validateFilter($filterParams[$i]);
             if ($priorFilter) {
                 $priorFilters[] = $priorFilter;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index 6a9c37e06a7e2..b0467c98907da 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -71,7 +71,7 @@ public function create(array $data = [])
         );
 
         if (!isset($this->algorithms[$calculationType])) {
-            throw new LocalizedException(__('%1 was not found in algorithms', $calculationType));
+            throw new LocalizedException(__("The %1 value wasn't found in the algorithms.", $calculationType));
         }
 
         $className = $this->algorithms[$calculationType];
diff --git a/app/code/Magento/Catalog/Model/Layer/State.php b/app/code/Magento/Catalog/Model/Layer/State.php
index 25f0caddd987b..c404e5539d209 100644
--- a/app/code/Magento/Catalog/Model/Layer/State.php
+++ b/app/code/Magento/Catalog/Model/Layer/State.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Layer;
 
 use Magento\Catalog\Model\Layer\Filter\Item;
@@ -42,7 +43,7 @@ public function addFilter($filter)
     public function setFilters($filters)
     {
         if (!is_array($filters)) {
-            throw new LocalizedException(__('The filters must be an array.'));
+            throw new LocalizedException(__('The filters are invalid. Set them in an array and try again.'));
         }
         $this->setData('filters', $filters);
         return $this;
diff --git a/app/code/Magento/Catalog/Model/Locator/RegistryLocator.php b/app/code/Magento/Catalog/Model/Locator/RegistryLocator.php
index 9770c8b39398c..700fd4b0b8997 100644
--- a/app/code/Magento/Catalog/Model/Locator/RegistryLocator.php
+++ b/app/code/Magento/Catalog/Model/Locator/RegistryLocator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Locator;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -52,7 +53,7 @@ public function getProduct()
             return $this->product = $product;
         }
 
-        throw new NotFoundException(__('Product was not registered'));
+        throw new NotFoundException(__("The product wasn't registered."));
     }
 
     /**
@@ -69,7 +70,7 @@ public function getStore()
             return $this->store = $store;
         }
 
-        throw new NotFoundException(__('Store was not registered'));
+        throw new NotFoundException(__("The store wasn't registered. Verify the store and try again."));
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index cf1392a7e9e8c..5d47e85768fad 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -10,8 +10,10 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
+use Magento\Catalog\Model\FilterProductCustomAttribute;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 
@@ -69,6 +71,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     const STORE_ID = 'store_id';
 
+    /**
+     * Product Url path.
+     */
+    const URL_PATH = 'url_path';
+
     /**
      * @var string
      */
@@ -117,6 +124,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_urlModel = null;
 
+    /**
+     * @var ResourceModel\Product
+     */
+    protected $_resource;
+
     /**
      * @var string
      */
@@ -270,6 +282,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
+     * @deprecated Not used anymore due to performance issue (loaded all product attributes)
      */
     protected $metadataService;
 
@@ -305,22 +318,12 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * List of attributes in ProductInterface
+     *
+     * @deprecated
+     * @see ProductInterface::ATTRIBUTES
      * @var array
      */
-    protected $interfaceAttributes = [
-        ProductInterface::SKU,
-        ProductInterface::NAME,
-        ProductInterface::PRICE,
-        ProductInterface::WEIGHT,
-        ProductInterface::STATUS,
-        ProductInterface::VISIBILITY,
-        ProductInterface::ATTRIBUTE_SET_ID,
-        ProductInterface::TYPE_ID,
-        ProductInterface::CREATED_AT,
-        ProductInterface::UPDATED_AT,
-        'media_gallery',
-        'tier_price',
-    ];
+    protected $interfaceAttributes = ProductInterface::ATTRIBUTES;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
@@ -347,7 +350,15 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
     protected $linkTypeProvider;
 
     /**
-     * Product constructor.
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+    /**
+     * @var FilterProductCustomAttribute|null
+     */
+    private $filterCustomAttribute;
+
+    /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
@@ -383,7 +394,8 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param array $data
-     *
+     * @param \Magento\Eav\Model\Config|null $config
+     * @param FilterProductCustomAttribute|null $filterCustomAttribute
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -422,7 +434,9 @@ public function __construct(
         EntryConverterPool $mediaGalleryEntryConverterPool,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor,
-        array $data = []
+        array $data = [],
+        \Magento\Eav\Model\Config $config = null,
+        FilterProductCustomAttribute $filterCustomAttribute = null
     ) {
         $this->metadataService = $metadataService;
         $this->_itemOptionFactory = $itemOptionFactory;
@@ -461,6 +475,9 @@ public function __construct(
             $resourceCollection,
             $data
         );
+        $this->eavConfig = $config ?? ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
+        $this->filterCustomAttribute = $filterCustomAttribute
+            ?? ObjectManager::getInstance()->get(FilterProductCustomAttribute::class);
     }
 
     /**
@@ -474,14 +491,40 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * Get resource instance
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Product
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
+    /**
+     * Get a list of custom attribute codes that belongs to product attribute set.
+     *
+     * If attribute set not specified for product will return all product attribute codes
+     *
+     * @return string[]
      */
     protected function getCustomAttributesCodes()
     {
         if ($this->customAttributesCodes === null) {
-            $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
-            $this->customAttributesCodes = array_diff($this->customAttributesCodes, $this->interfaceAttributes);
+            $this->customAttributesCodes = array_diff(
+                array_keys(
+                    $this->filterCustomAttribute->execute(
+                        $this->eavConfig->getEntityAttributes(
+                            self::ENTITY,
+                            $this
+                        )
+                    )
+                ),
+                ProductInterface::ATTRIBUTES
+            );
         }
+
         return $this->customAttributesCodes;
     }
 
@@ -493,22 +536,9 @@ protected function getCustomAttributesCodes()
     public function getStoreId()
     {
         if ($this->hasData(self::STORE_ID)) {
-            return $this->getData(self::STORE_ID);
+            return (int)$this->getData(self::STORE_ID);
         }
-        return $this->_storeManager->getStore()->getId();
-    }
-
-    /**
-     * Get collection instance
-     *
-     * @return object
-     * @deprecated 101.1.0 because collections should be used directly via factory
-     */
-    public function getResourceCollection()
-    {
-        $collection = parent::getResourceCollection();
-        $collection->setStoreId($this->getStoreId());
-        return $collection;
+        return (int)$this->_storeManager->getStore()->getId();
     }
 
     /**
@@ -564,8 +594,9 @@ public function getPrice()
     }
 
     /**
-     * @codeCoverageIgnoreStart
      * Get visibility status
+     *
+     * @codeCoverageIgnoreStart
      * @see \Magento\Catalog\Model\Product\Visibility
      *
      * @return int
@@ -610,6 +641,7 @@ public function getUpdatedAt()
      *
      * @param bool $calculate
      * @return void
+     * @deprecated
      */
     public function setPriceCalculation($calculate = true)
     {
@@ -641,6 +673,7 @@ public function getStatus()
 
     /**
      * Retrieve type instance of the product.
+     *
      * Type instance implements product type depended logic and is a singleton shared by all products of the same type.
      *
      * @return \Magento\Catalog\Model\Product\Type\AbstractType
@@ -694,7 +727,7 @@ public function getIdBySku($sku)
     public function getCategoryId()
     {
         $category = $this->_registry->registry('current_category');
-        if ($category) {
+        if ($category && in_array($category->getId(), $this->getCategoryIds())) {
             return $category->getId();
         }
         return false;
@@ -789,6 +822,9 @@ public function getStoreIds()
         if (!$this->hasStoreIds()) {
             $storeIds = [];
             if ($websiteIds = $this->getWebsiteIds()) {
+                if ($this->_storeManager->isSingleStoreMode()) {
+                    $websiteIds = array_keys($websiteIds);
+                }
                 foreach ($websiteIds as $websiteId) {
                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
                     $storeIds = array_merge($storeIds, $websiteStores);
@@ -801,9 +837,10 @@ public function getStoreIds()
 
     /**
      * Retrieve product attributes
-     * if $groupId is null - retrieve all product attributes
      *
-     * @param int  $groupId   Retrieve attributes of the specified group
+     * If $groupId is null - retrieve all product attributes
+     *
+     * @param int $groupId Retrieve attributes of the specified group
      * @param bool $skipSuper Not used
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -895,10 +932,11 @@ public function beforeSave()
 
     /**
      * Check/set if options can be affected when saving product
+     *
      * If value specified, it will be set.
      *
-     * @param   bool $value
-     * @return  bool
+     * @param bool $value
+     * @return bool
      */
     public function canAffectOptions($value = null)
     {
@@ -930,13 +968,6 @@ public function afterSave()
         $this->_getResource()->addCommitCallback([$this, 'reindex']);
         $this->reloadPriceInfo();
 
-        // Resize images for catalog product and save results to image cache
-        /** @var Product\Image\Cache $imageCache */
-        if (!$this->_appState->isAreaCodeEmulated()) {
-            $imageCache = $this->imageCacheFactory->create();
-            $imageCache->generate($this);
-        }
-
         return $result;
     }
 
@@ -962,7 +993,7 @@ public function setQty($qty)
      */
     public function getQty()
     {
-        return $this->getData('qty');
+        return (float)$this->getData('qty');
     }
 
     /**
@@ -1022,9 +1053,11 @@ public function reindex()
 
     /**
      * Clear cache related with product and protect delete from not admin
+     *
      * Register indexing event before delete product
      *
      * @return \Magento\Catalog\Model\Product
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function beforeDelete()
     {
@@ -1128,11 +1161,24 @@ public function getTierPrice($qty = null)
     /**
      * Get formatted by currency product price
      *
-     * @return  array || double
+     * @return  array|double
+     */
+    public function getFormattedPrice()
+    {
+        return $this->getPriceModel()->getFormattedPrice($this);
+    }
+
+    /**
+     * Get formatted by currency product price
+     *
+     * @return  array|double
+     *
+     * @deprecated
+     * @see getFormattedPrice()
      */
     public function getFormatedPrice()
     {
-        return $this->getPriceModel()->getFormatedPrice($this);
+        return $this->getFormattedPrice();
     }
 
     /**
@@ -1159,10 +1205,11 @@ public function setFinalPrice($price)
      */
     public function getFinalPrice($qty = null)
     {
-        if ($this->_getData('final_price') === null) {
-            $this->setFinalPrice($this->getPriceModel()->getFinalPrice($qty, $this));
+        if ($this->_calculatePrice || $this->_getData('final_price') === null) {
+            return $this->getPriceModel()->getFinalPrice($qty, $this);
+        } else {
+            return $this->_getData('final_price');
         }
-        return $this->_getData('final_price');
     }
 
     /**
@@ -1471,10 +1518,14 @@ public function getMediaAttributeValues()
     public function getMediaGalleryImages()
     {
         $directory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
-        if (!$this->hasData('media_gallery_images') && is_array($this->getMediaGallery('images'))) {
-            $images = $this->_collectionFactory->create();
+        if (!$this->hasData('media_gallery_images')) {
+            $this->setData('media_gallery_images', $this->_collectionFactory->create());
+        }
+        if (!$this->getData('media_gallery_images')->count() && is_array($this->getMediaGallery('images'))) {
+            $images = $this->getData('media_gallery_images');
             foreach ($this->getMediaGallery('images') as $image) {
-                if ((isset($image['disabled']) && $image['disabled'])
+                if (!empty($image['disabled'])
+                    || !empty($image['removed'])
                     || empty($image['value_id'])
                     || $images->getItemById($image['value_id']) != null
                 ) {
@@ -1513,12 +1564,13 @@ public function hasGalleryAttribute()
     /**
      * Add image to media gallery
      *
-     * @param string        $file              file path of image in file system
-     * @param string|array  $mediaAttribute    code of attribute with type 'media_image',
-     *                                          leave blank if image should be only in gallery
-     * @param boolean       $move              if true, it will move source file
-     * @param boolean       $exclude           mark image as disabled in product page view
+     * @param string $file file path of image in file system
+     * @param string|array $mediaAttribute code of attribute with type 'media_image',
+     * leave blank if image should be only in gallery
+     * @param bool $move if true, it will move source file
+     * @param bool $exclude mark image as disabled in product page view
      * @return \Magento\Catalog\Model\Product
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function addImageToMediaGallery($file, $mediaAttribute = null, $move = false, $exclude = true)
     {
@@ -1679,7 +1731,6 @@ public function getIsSalable()
 
     /**
      * Check is a virtual product
-     * Data helper wrapper
      *
      * @return bool
      */
@@ -1712,7 +1763,7 @@ public function isInStock()
      * Get attribute text by its code
      *
      * @param string $attributeCode Code of the attribute
-     * @return string
+     * @return string|array|null
      */
     public function getAttributeText($attributeCode)
     {
@@ -1772,8 +1823,8 @@ public function formatUrlKey($str)
      * Save current attribute with code $code and assign new value
      *
      * @param string $code  Attribute code
-     * @param mixed  $value New attribute value
-     * @param int    $store Store ID
+     * @param mixed $value New attribute value
+     * @param int $store Store ID
      * @return void
      */
     public function addAttributeUpdate($code, $value, $store)
@@ -1843,6 +1894,7 @@ public function getRequestPath()
 
     /**
      * Custom function for other modules
+     *
      * @return string
      */
     public function getGiftMessageAvailable()
@@ -1961,6 +2013,8 @@ public function getOptions()
     }
 
     /**
+     * Set product options
+     *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface[] $options
      * @return $this
      */
@@ -1984,14 +2038,14 @@ public function getIsVirtual()
     /**
      * Add custom option information to product
      *
-     * @param   string $code    Option code
-     * @param   mixed  $value   Value of the option
-     * @param   int|Product    $product Product ID
-     * @return  $this
+     * @param string $code Option code
+     * @param mixed $value Value of the option
+     * @param int|Product|null $product Product ID
+     * @return $this
      */
     public function addCustomOption($code, $value, $product = null)
     {
-        $product = $product ? $product : $this;
+        $product = $product ?: $this;
         $option = $this->_itemOptionFactory->create()->addData(
             ['product_id' => $product->getId(), 'product' => $product, 'code' => $code, 'value' => $value]
         );
@@ -2094,6 +2148,8 @@ public function reset()
     /**
      * Get cache tags associated with object id
      *
+     * @deprecated
+     * @see \Magento\Catalog\Model\Product::getIdentities
      * @return string[]
      */
     public function getCacheIdTags()
@@ -2179,6 +2235,7 @@ public function getPreconfiguredValues()
 
     /**
      * Prepare product custom options.
+     *
      * To be sure that all product custom options does not has ID and has product instance
      *
      * @return \Magento\Catalog\Model\Product
@@ -2513,23 +2570,17 @@ public function setTypeId($typeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @return \Magento\Catalog\Api\Data\ProductExtensionInterface
+     * @return \Magento\Framework\Api\ExtensionAttributesInterface
      */
     public function getExtensionAttributes()
     {
-        $extensionAttributes = $this->_getExtensionAttributes();
-        if (null === $extensionAttributes) {
-            /** @var \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes */
-            $extensionAttributes = $this->extensionAttributesFactory->create(ProductInterface::class);
-            $this->setExtensionAttributes($extensionAttributes);
-        }
-        return $extensionAttributes;
+        return $this->_getExtensionAttributes();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes
      * @return $this
@@ -2542,8 +2593,11 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensio
     //@codeCoverageIgnoreEnd
 
     /**
+     * Convert Image to ProductAttributeMediaGalleryEntryInterface
+     *
      * @param array $mediaGallery
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function convertToMediaGalleryInterface(array $mediaGallery)
     {
@@ -2559,7 +2613,10 @@ protected function convertToMediaGalleryInterface(array $mediaGallery)
     }
 
     /**
+     * Get media gallery entries
+     *
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getMediaGalleryEntries()
     {
@@ -2573,8 +2630,11 @@ public function getMediaGalleryEntries()
     }
 
     /**
+     * Set media gallery entries
+     *
      * @param ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function setMediaGalleryEntries(array $mediaGalleryEntries = null)
     {
@@ -2615,6 +2675,8 @@ public function setId($value)
     }
 
     /**
+     * Get link repository
+     *
      * @return ProductLinkRepositoryInterface
      */
     private function getLinkRepository()
@@ -2627,6 +2689,8 @@ private function getLinkRepository()
     }
 
     /**
+     * Get media gallery processor
+     *
      * @return Product\Gallery\Processor
      */
     private function getMediaGalleryProcessor()
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
index c2108b0273bdb..be1e523960f27 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
 use Magento\Catalog\Model\Product\Attribute\Source\Boolean as BooleanSource;
@@ -25,7 +27,9 @@ public function beforeSave($object)
         $attributeCode = $this->getAttribute()->getName();
         if ($object->getData('use_config_' . $attributeCode)) {
             $object->setData($attributeCode, BooleanSource::VALUE_USE_CONFIG);
+            return $this;
         }
-        return $this;
+
+        return parent::beforeSave($object);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 1b418bd5882c7..e26717e47274c 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -247,6 +247,8 @@ public function validate($object)
     }
 
     /**
+     * Validate price.
+     *
      * @param array $priceRow
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -312,6 +314,8 @@ public function afterLoad($object)
     }
 
     /**
+     * Get website id.
+     *
      * @param int $storeId
      * @return int|null
      */
@@ -327,6 +331,8 @@ private function getWebsiteId($storeId)
     }
 
     /**
+     * Set price data.
+     *
      * @param \Magento\Catalog\Model\Product $object
      * @param array $priceData
      */
@@ -358,7 +364,7 @@ protected function modifyPriceData($object, $data)
     {
         /** @var array $priceItem */
         foreach ($data as $key => $priceItem) {
-            if (isset($priceItem['price']) && $priceItem['price'] > 0) {
+            if (array_key_exists('price', $priceItem)) {
                 $data[$key]['website_price'] = $priceItem['price'];
             }
             if ($priceItem['all_groups']) {
@@ -373,122 +379,16 @@ protected function modifyPriceData($object, $data)
      *
      * @param \Magento\Catalog\Model\Product $object
      * @return $this
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterSave($object)
     {
-        $websiteId = $this->_storeManager->getStore($object->getStoreId())->getWebsiteId();
-        $isGlobal = $this->getAttribute()->isScopeGlobal() || $websiteId == 0;
-
-        $priceRows = $object->getData($this->getAttribute()->getName());
-        if (null === $priceRows) {
-            return $this;
-        }
-
-        $priceRows = array_filter((array)$priceRows);
-
-        $old = [];
-        $new = [];
-
-        // prepare original data for compare
-        $origPrices = $object->getOrigData($this->getAttribute()->getName());
-        if (!is_array($origPrices)) {
-            $origPrices = [];
-        }
-        foreach ($origPrices as $data) {
-            if ($data['website_id'] > 0 || $data['website_id'] == '0' && $isGlobal) {
-                $key = implode(
-                    '-',
-                    array_merge(
-                        [$data['website_id'], $data['cust_group']],
-                        $this->_getAdditionalUniqueFields($data)
-                    )
-                );
-                $old[$key] = $data;
-            }
-        }
-
-        // prepare data for save
-        foreach ($priceRows as $data) {
-            $hasEmptyData = false;
-            foreach ($this->_getAdditionalUniqueFields($data) as $field) {
-                if (empty($field)) {
-                    $hasEmptyData = true;
-                    break;
-                }
-            }
-
-            if ($hasEmptyData || !isset($data['cust_group']) || !empty($data['delete'])) {
-                continue;
-            }
-            if ($this->getAttribute()->isScopeGlobal() && $data['website_id'] > 0) {
-                continue;
-            }
-            if (!$isGlobal && (int)$data['website_id'] == 0) {
-                continue;
-            }
-
-            $key = implode(
-                '-',
-                array_merge([$data['website_id'], $data['cust_group']], $this->_getAdditionalUniqueFields($data))
-            );
-
-            $useForAllGroups = $data['cust_group'] == $this->_groupManagement->getAllCustomersGroup()->getId();
-            $customerGroupId = !$useForAllGroups ? $data['cust_group'] : 0;
-            $new[$key] = array_merge(
-                $this->getAdditionalFields($data),
-                [
-                    'website_id' => $data['website_id'],
-                    'all_groups' => $useForAllGroups ? 1 : 0,
-                    'customer_group_id' => $customerGroupId,
-                    'value' => isset($data['price']) ? $data['price'] : null,
-                ],
-                $this->_getAdditionalUniqueFields($data)
-            );
-        }
-
-        $delete = array_diff_key($old, $new);
-        $insert = array_diff_key($new, $old);
-        $update = array_intersect_key($new, $old);
-
-        $isChanged = false;
-        $productId = $object->getData($this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField());
-
-        if (!empty($delete)) {
-            foreach ($delete as $data) {
-                $this->_getResource()->deletePriceData($productId, null, $data['price_id']);
-                $isChanged = true;
-            }
-        }
-
-        if (!empty($insert)) {
-            foreach ($insert as $data) {
-                $price = new \Magento\Framework\DataObject($data);
-                $price->setData(
-                    $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField(),
-                    $productId
-                );
-                $this->_getResource()->savePriceData($price);
-
-                $isChanged = true;
-            }
-        }
-
-        if (!empty($update)) {
-            $isChanged |= $this->updateValues($update, $old);
-        }
-
-        if ($isChanged) {
-            $valueChangedKey = $this->getAttribute()->getName() . '_changed';
-            $object->setData($valueChangedKey, 1);
-        }
-
         return $this;
     }
 
     /**
+     * Update values.
+     *
      * @param array $valuesToUpdate
      * @param array $oldValues
      * @return boolean
@@ -544,6 +444,8 @@ public function getResource()
     }
 
     /**
+     * Get metadata pool.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
index a312f00b26bbb..98738e055ca8f 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog product SKU backend attribute model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
 use Magento\Catalog\Model\Product;
 
+/**
+ * Catalog product SKU backend attribute model.
+ */
 class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
@@ -51,7 +49,7 @@ public function validate($object)
         $value = $object->getData($attrCode);
         if ($this->getAttribute()->getIsRequired() && strlen($value) === 0) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('The value of attribute "%1" must be set', $attrCode)
+                __('The "%1" attribute value is empty. Set the attribute and try again.', $attrCode)
             );
         }
 
@@ -97,6 +95,7 @@ protected function _generateUniqueSku($object)
     public function beforeSave($object)
     {
         $this->_generateUniqueSku($object);
+        $this->trimValue($object);
         return parent::beforeSave($object);
     }
 
@@ -127,4 +126,19 @@ protected function _getLastSimilarAttributeValueIncrement($attribute, $object)
         $data = $connection->fetchOne($select, $bind);
         return abs((int)str_replace($value, '', $data));
     }
+
+    /**
+     * Remove extra spaces from attribute value before save.
+     *
+     * @param Product $object
+     * @return void
+     */
+    private function trimValue($object)
+    {
+        $attrCode = $this->getAttribute()->getAttributeCode();
+        $value = $object->getData($attrCode);
+        if ($value) {
+            $object->setData($attrCode, trim($value));
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php
new file mode 100644
index 0000000000000..fc0f090937db9
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/AbstractHandler.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
+
+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
+
+/**
+ * Tier price data abstract handler.
+ */
+abstract class AbstractHandler implements ExtensionInterface
+{
+    /**
+     * @var \Magento\Customer\Api\GroupManagementInterface
+     */
+    protected $groupManagement;
+
+    /**
+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+     */
+    public function __construct(
+        GroupManagementInterface $groupManagement
+    ) {
+        $this->groupManagement = $groupManagement;
+    }
+
+    /**
+     * Get additional tier price fields.
+     *
+     * @param array $objectArray
+     * @return array
+     */
+    protected function getAdditionalFields(array $objectArray): array
+    {
+        $percentageValue = $this->getPercentage($objectArray);
+
+        return [
+            'value' => $percentageValue ? null : $objectArray['price'],
+            'percentage_value' => $percentageValue ?: null,
+        ];
+    }
+
+    /**
+     * Check whether price has percentage value.
+     *
+     * @param array $priceRow
+     * @return float|null
+     */
+    protected function getPercentage(array $priceRow): ?float
+    {
+        return isset($priceRow['percentage_value']) && is_numeric($priceRow['percentage_value'])
+            ? (float)$priceRow['percentage_value']
+            : null;
+    }
+
+    /**
+     * Prepare tier price data by provided price row data.
+     *
+     * @param array $data
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function prepareTierPrice(array $data): array
+    {
+        $useForAllGroups = (int)$data['cust_group'] === $this->groupManagement->getAllCustomersGroup()->getId();
+        $customerGroupId = $useForAllGroups ? 0 : $data['cust_group'];
+        $tierPrice = array_merge(
+            $this->getAdditionalFields($data),
+            [
+                'website_id' => $data['website_id'],
+                'all_groups' => (int)$useForAllGroups,
+                'customer_group_id' => $customerGroupId,
+                'value' => $data['price'] ?? null,
+                'qty' => $this->parseQty($data['price_qty']),
+            ]
+        );
+
+        return $tierPrice;
+    }
+
+    /**
+     * Parse quantity value into float.
+     *
+     * @param mixed $value
+     * @return float|int
+     */
+    protected function parseQty($value)
+    {
+        return $value * 1;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
new file mode 100644
index 0000000000000..9cb2ac0145898
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/SaveHandler.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
+
+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
+
+/**
+ * Process tier price data for handled new product
+ */
+class SaveHandler extends AbstractHandler
+{
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPoll;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
+     */
+    private $tierPriceResource;
+
+    /**
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice $tierPriceResource
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        ProductAttributeRepositoryInterface $attributeRepository,
+        GroupManagementInterface $groupManagement,
+        MetadataPool $metadataPool,
+        Tierprice $tierPriceResource
+    ) {
+        parent::__construct($groupManagement);
+
+        $this->storeManager = $storeManager;
+        $this->attributeRepository = $attributeRepository;
+        $this->metadataPoll = $metadataPool;
+        $this->tierPriceResource = $tierPriceResource;
+    }
+
+    /**
+     * Set tier price data for product entity
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
+     * @param array $arguments
+     * @return \Magento\Catalog\Api\Data\ProductInterface|object
+     * @throws \Magento\Framework\Exception\InputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute($entity, $arguments = [])
+    {
+        $attribute = $this->attributeRepository->get('tier_price');
+        $priceRows = $entity->getData($attribute->getName());
+        if (null !== $priceRows) {
+            if (!is_array($priceRows)) {
+                throw new \Magento\Framework\Exception\InputException(
+                    __('Tier prices data should be array, but actually other type is received')
+                );
+            }
+            $websiteId = $this->storeManager->getStore($entity->getStoreId())->getWebsiteId();
+            $isGlobal = $attribute->isScopeGlobal() || $websiteId === 0;
+            $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
+            $priceRows = array_filter($priceRows);
+            $productId = (int) $entity->getData($identifierField);
+
+            // prepare and save data
+            foreach ($priceRows as $data) {
+                $isPriceWebsiteGlobal = (int)$data['website_id'] === 0;
+                if ($isGlobal === $isPriceWebsiteGlobal
+                    || !empty($data['price_qty'])
+                    || isset($data['cust_group'])
+                ) {
+                    $tierPrice = $this->prepareTierPrice($data);
+                    $price = new \Magento\Framework\DataObject($tierPrice);
+                    $price->setData(
+                        $identifierField,
+                        $productId
+                    );
+                    $this->tierPriceResource->savePriceData($price);
+                    $valueChangedKey = $attribute->getName() . '_changed';
+                    $entity->setData($valueChangedKey, 1);
+                }
+            }
+        }
+
+        return $entity;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
new file mode 100644
index 0000000000000..663b7facf4257
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
+
+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
+
+/**
+ * Process tier price data for handled existing product.
+ */
+class UpdateHandler extends AbstractHandler
+{
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPoll;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice
+     */
+    private $tierPriceResource;
+
+    /**
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice $tierPriceResource
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        ProductAttributeRepositoryInterface $attributeRepository,
+        GroupManagementInterface $groupManagement,
+        MetadataPool $metadataPool,
+        Tierprice $tierPriceResource
+    ) {
+        parent::__construct($groupManagement);
+
+        $this->storeManager = $storeManager;
+        $this->attributeRepository = $attributeRepository;
+        $this->metadataPoll = $metadataPool;
+        $this->tierPriceResource = $tierPriceResource;
+    }
+
+    /**
+     * Perform action on relation/extension attribute.
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
+     * @param array $arguments
+     * @return \Magento\Catalog\Api\Data\ProductInterface|object
+     * @throws \Magento\Framework\Exception\InputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute($entity, $arguments = [])
+    {
+        $attribute = $this->attributeRepository->get('tier_price');
+        $priceRows = $entity->getData($attribute->getName());
+        if (null !== $priceRows) {
+            if (!is_array($priceRows)) {
+                throw new \Magento\Framework\Exception\InputException(
+                    __('Tier prices data should be array, but actually other type is received')
+                );
+            }
+            $websiteId = (int)$this->storeManager->getStore($entity->getStoreId())->getWebsiteId();
+            $isGlobal = $attribute->isScopeGlobal() || $websiteId === 0;
+            $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
+            $productId = (int)$entity->getData($identifierField);
+
+            // prepare original data to compare
+            $origPrices = [];
+            $originalId = $entity->getOrigData($identifierField);
+            if (empty($originalId) || $entity->getData($identifierField) == $originalId) {
+                $origPrices = $entity->getOrigData($attribute->getName());
+            }
+
+            $old = $this->prepareOldTierPriceToCompare($origPrices);
+            // prepare data for save
+            $new = $this->prepareNewDataForSave($priceRows, $isGlobal);
+
+            $delete = array_diff_key($old, $new);
+            $insert = array_diff_key($new, $old);
+            $update = array_intersect_key($new, $old);
+
+            $isAttributeChanged = $this->deleteValues($productId, $delete);
+            $isAttributeChanged |= $this->insertValues($productId, $insert);
+            $isAttributeChanged |= $this->updateValues($update, $old);
+
+            if ($isAttributeChanged) {
+                $valueChangedKey = $attribute->getName() . '_changed';
+                $entity->setData($valueChangedKey, 1);
+            }
+        }
+
+        return $entity;
+    }
+
+    /**
+     * Update existing tier prices for processed product
+     *
+     * @param array $valuesToUpdate
+     * @param array $oldValues
+     * @return bool
+     */
+    private function updateValues(array $valuesToUpdate, array $oldValues): bool
+    {
+        $isChanged = false;
+        foreach ($valuesToUpdate as $key => $value) {
+            if ((!empty($value['value']) && (float)$oldValues[$key]['price'] !== (float)$value['value'])
+                || $this->getPercentage($oldValues[$key]) !== $this->getPercentage($value)
+            ) {
+                $price = new \Magento\Framework\DataObject(
+                    [
+                        'value_id' => $oldValues[$key]['price_id'],
+                        'value' => $value['value'],
+                        'percentage_value' => $this->getPercentage($value)
+                    ]
+                );
+                $this->tierPriceResource->savePriceData($price);
+                $isChanged = true;
+            }
+        }
+
+        return $isChanged;
+    }
+
+    /**
+     * Insert new tier prices for processed product
+     *
+     * @param int $productId
+     * @param array $valuesToInsert
+     * @return bool
+     */
+    private function insertValues(int $productId, array $valuesToInsert): bool
+    {
+        $isChanged = false;
+        $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
+        foreach ($valuesToInsert as $data) {
+            $price = new \Magento\Framework\DataObject($data);
+            $price->setData(
+                $identifierField,
+                $productId
+            );
+            $this->tierPriceResource->savePriceData($price);
+            $isChanged = true;
+        }
+
+        return $isChanged;
+    }
+
+    /**
+     * Delete tier price values for processed product
+     *
+     * @param int $productId
+     * @param array $valuesToDelete
+     * @return bool
+     */
+    private function deleteValues(int $productId, array $valuesToDelete): bool
+    {
+        $isChanged = false;
+        foreach ($valuesToDelete as $data) {
+            $this->tierPriceResource->deletePriceData($productId, null, $data['price_id']);
+            $isChanged = true;
+        }
+
+        return $isChanged;
+    }
+
+    /**
+     * Get generated price key based on price data
+     *
+     * @param array $priceData
+     * @return string
+     */
+    private function getPriceKey(array $priceData): string
+    {
+        $qty = $this->parseQty($priceData['price_qty']);
+        $key = implode(
+            '-',
+            array_merge([$priceData['website_id'], $priceData['cust_group']], [$qty])
+        );
+
+        return $key;
+    }
+
+    /**
+     * Check by id is website global
+     *
+     * @param int $websiteId
+     * @return bool
+     */
+    private function isWebsiteGlobal(int $websiteId): bool
+    {
+        return $websiteId === 0;
+    }
+
+    /**
+     * Prepare old data to compare.
+     *
+     * @param array|null $origPrices
+     * @return array
+     */
+    private function prepareOldTierPriceToCompare(?array $origPrices): array
+    {
+        $old = [];
+        if (is_array($origPrices)) {
+            foreach ($origPrices as $data) {
+                $key = $this->getPriceKey($data);
+                $old[$key] = $data;
+            }
+        }
+
+        return $old;
+    }
+
+    /**
+     * Prepare new data for save.
+     *
+     * @param array $priceRows
+     * @param bool $isGlobal
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function prepareNewDataForSave(array $priceRows, bool $isGlobal = true): array
+    {
+        $new = [];
+        $priceRows = array_filter($priceRows);
+        foreach ($priceRows as $data) {
+            if (empty($data['delete'])
+                && (!empty($data['price_qty'])
+                    || isset($data['cust_group'])
+                    || $isGlobal === $this->isWebsiteGlobal((int)$data['website_id']))
+            ) {
+                $key = $this->getPriceKey($data);
+                $new[$key] = $this->prepareTierPrice($data);
+            }
+        }
+
+        return $new;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 92b9a2e4239b2..e346c912dccaa 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -13,6 +13,9 @@
 
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 
+/**
+ * Backend model for Tierprice attribute
+ */
 class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
 {
     /**
@@ -159,8 +162,22 @@ protected function validatePrice(array $priceRow)
      */
     protected function modifyPriceData($object, $data)
     {
+        /** @var \Magento\Catalog\Model\Product $object */
         $data = parent::modifyPriceData($object, $data);
         $price = $object->getPrice();
+
+        $specialPrice = $object->getSpecialPrice();
+        $specialPriceFromDate = $object->getSpecialFromDate();
+        $specialPriceToDate = $object->getSpecialToDate();
+        $today = time();
+
+        if ($specialPrice && ($object->getPrice() > $object->getFinalPrice())) {
+            if ($today >= strtotime($specialPriceFromDate) && $today <= strtotime($specialPriceToDate) ||
+                $today >= strtotime($specialPriceFromDate) && $specialPriceToDate === null) {
+                $price = $specialPrice;
+            }
+        }
+
         foreach ($data as $key => $tierPrice) {
             $percentageValue = $this->getPercentage($tierPrice);
             if ($percentageValue) {
@@ -172,6 +189,10 @@ protected function modifyPriceData($object, $data)
     }
 
     /**
+     * Update Price values in DB
+     *
+     * Updates price values in DB from array comparing to old values. Returns bool if updated
+     *
      * @param array $valuesToUpdate
      * @param array $oldValues
      * @return boolean
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
index 6173a76eca421..cdd6da7019da5 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -9,23 +9,28 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Catalog\Model\Product\Attribute\Frontend;
 
-class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+class Image extends AbstractFrontend
 {
     /**
      * Store manager
      *
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * Construct
      *
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+    public function __construct(StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
@@ -42,9 +47,9 @@ public function getUrl($product)
         $image = $product->getData($this->getAttribute()->getAttributeCode());
         $url = false;
         if (!empty($image)) {
-            $url = $this->_storeManager->getStore($product->getStore())
-                ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
-                . 'catalog/product/' . $image;
+            $url = $this->_storeManager
+                    ->getStore($product->getStore())
+                    ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . 'catalog/product/' . ltrim($image, '/');
         }
         return $url;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Inputtype/Presentation.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Inputtype/Presentation.php
new file mode 100644
index 0000000000000..03b8c7aa1cadc
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Inputtype/Presentation.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype;
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+/**
+ * Class Input type preprocessor.
+ *
+ * @package Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype
+ */
+class Presentation
+{
+    /**
+     * Get input type for presentation layer from stored input type.
+     *
+     * @param Attribute $attribute
+     * @return string|null
+     */
+    public function getPresentationInputType(Attribute $attribute) :?string
+    {
+        $inputType = $attribute->getFrontendInput();
+        if ($inputType == 'textarea' && $attribute->getIsWysiwygEnabled()) {
+            return 'texteditor';
+        }
+        return $inputType;
+    }
+
+    /**
+     * Convert presentation to storable input type.
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function convertPresentationDataToInputType(array $data) : array
+    {
+        if (isset($data['frontend_input']) && $data['frontend_input'] === 'texteditor') {
+            $data['is_wysiwyg_enabled'] = 1;
+            $data['frontend_input'] = 'textarea';
+        } elseif (isset($data['frontend_input']) && $data['frontend_input'] === 'textarea') {
+            $data['is_wysiwyg_enabled'] = 0;
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index a840498dfbf2b..8b638feafaafc 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Exception\InputException;
 
+/**
+ * Option management model for product attribute.
+ */
 class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
 {
     /**
@@ -25,7 +28,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems($attributeCode)
     {
@@ -36,10 +39,21 @@ public function getItems($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function add($attributeCode, $option)
     {
+        /** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $currentOptions */
+        $currentOptions = $this->getItems($attributeCode);
+        if (is_array($currentOptions)) {
+            array_walk($currentOptions, function (&$attributeOption) {
+                /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
+                    $attributeOption = $attributeOption->getLabel();
+            });
+            if (in_array($option->getLabel(), $currentOptions, true)) {
+                return false;
+            }
+        }
         return $this->eavOptionManagement->add(
             \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,
@@ -48,7 +62,7 @@ public function add($attributeCode, $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($attributeCode, $optionId)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
index 270a2f229678b..99edfe5bc7208 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
@@ -11,6 +11,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
+ * Product attribute repository
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInterface
@@ -78,7 +80,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($attributeCode)
     {
@@ -89,7 +91,7 @@ public function get($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -100,12 +102,17 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
+        $attribute->setEntityTypeId(
+            $this->eavConfig
+                ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
+                ->getId()
+        );
         if ($attribute->getAttributeId()) {
             $existingModel = $this->get($attribute->getAttributeCode());
 
@@ -119,16 +126,7 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             $attribute->setIsUserDefined($existingModel->getIsUserDefined());
             $attribute->setFrontendInput($existingModel->getFrontendInput());
 
-            if (is_array($attribute->getFrontendLabels())) {
-                $defaultFrontendLabel = $attribute->getDefaultFrontendLabel();
-                $frontendLabel[0] = !empty($defaultFrontendLabel)
-                    ? $defaultFrontendLabel
-                    : $existingModel->getDefaultFrontendLabel();
-                foreach ($attribute->getFrontendLabels() as $item) {
-                    $frontendLabel[$item->getStoreId()] = $item->getLabel();
-                }
-                $attribute->setDefaultFrontendLabel($frontendLabel);
-            }
+            $this->updateDefaultFrontendLabel($attribute, $existingModel);
         } else {
             $attribute->setAttributeId(null);
 
@@ -136,22 +134,10 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
                 throw InputException::requiredField('frontend_label');
             }
 
-            $frontendLabels = [];
-            if ($attribute->getDefaultFrontendLabel()) {
-                $frontendLabels[0] = $attribute->getDefaultFrontendLabel();
-            }
-            if ($attribute->getFrontendLabels() && is_array($attribute->getFrontendLabels())) {
-                foreach ($attribute->getFrontendLabels() as $label) {
-                    $frontendLabels[$label->getStoreId()] = $label->getLabel();
-                }
-                if (!isset($frontendLabels[0]) || !$frontendLabels[0]) {
-                    throw InputException::invalidFieldValue('frontend_label', null);
-                }
+            $frontendLabel = $this->updateDefaultFrontendLabel($attribute, null);
 
-                $attribute->setDefaultFrontendLabel($frontendLabels);
-            }
             $attribute->setAttributeCode(
-                $attribute->getAttributeCode() ?: $this->generateCode($frontendLabels[0])
+                $attribute->getAttributeCode() ?: $this->generateCode($frontendLabel)
             );
             $this->validateCode($attribute->getAttributeCode());
             $this->validateFrontendInput($attribute->getFrontendInput());
@@ -165,11 +151,6 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             $attribute->setBackendModel(
                 $this->productHelper->getAttributeBackendModelByInputType($attribute->getFrontendInput())
             );
-            $attribute->setEntityTypeId(
-                $this->eavConfig
-                    ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
-                    ->getId()
-            );
             $attribute->setIsUserDefined(1);
         }
         if (!empty($attribute->getData(AttributeInterface::OPTIONS))) {
@@ -201,7 +182,7 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
@@ -210,7 +191,7 @@ public function delete(\Magento\Catalog\Api\Data\ProductAttributeInterface $attr
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($attributeCode)
     {
@@ -221,7 +202,7 @@ public function deleteById($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
@@ -275,4 +256,52 @@ protected function validateFrontendInput($frontendInput)
             throw InputException::invalidFieldValue('frontend_input', $frontendInput);
         }
     }
+
+    /**
+     * This method sets default frontend value using given default frontend value or frontend value from admin store
+     * if default frontend value is not presented.
+     * If both default frontend label and admin store frontend label are not given it throws exception
+     * for attribute creation process or sets existing attribute value for attribute update action.
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface|null $existingModel
+     * @return string|null
+     * @throws InputException
+     */
+    private function updateDefaultFrontendLabel($attribute, $existingModel)
+    {
+        $frontendLabel = $attribute->getDefaultFrontendLabel();
+        if (empty($frontendLabel)) {
+            $frontendLabel = $this->extractAdminStoreFrontendLabel($attribute);
+            if (empty($frontendLabel)) {
+                if ($existingModel) {
+                    $frontendLabel = $existingModel->getDefaultFrontendLabel();
+                } else {
+                    throw InputException::invalidFieldValue('frontend_label', null);
+                }
+            }
+            $attribute->setDefaultFrontendLabel($frontendLabel);
+        }
+        return $frontendLabel;
+    }
+
+    /**
+     * This method extracts frontend label from FrontendLabel object for admin store.
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @return string|null
+     */
+    private function extractAdminStoreFrontendLabel($attribute)
+    {
+        $frontendLabel = [];
+        $frontendLabels = $attribute->getFrontendLabels();
+        if (isset($frontendLabels[0])
+            && $frontendLabels[0] instanceof \Magento\Eav\Api\Data\AttributeFrontendLabelInterface
+        ) {
+            foreach ($attribute->getFrontendLabels() as $label) {
+                $frontendLabel[$label->getStoreId()] = $label->getLabel();
+            }
+        }
+        return $frontendLabel[0] ?? null;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php
index fb52e83a51c58..19cb71e4231dd 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetManagement.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Attribute;
 
 use Magento\Framework\Exception\StateException;
@@ -65,12 +66,12 @@ protected function validateSkeletonSet($skeletonId)
             $productEntityId = $this->eavConfig->getEntityType(\Magento\Catalog\Model\Product::ENTITY)->getId();
             if ($skeletonSet->getEntityTypeId() != $productEntityId) {
                 throw new StateException(
-                    __('Can not create attribute set based on non product attribute set.')
+                    __("The attribute set couldn't be created because it's based on a non-product attribute set.")
                 );
             }
         } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
             throw new StateException(
-                __('Can not create attribute set based on not existing attribute set')
+                __("The attribute set couldn't be created because it's based on a non-existing attribute set.")
             );
         }
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
index adbd6579e6828..07a8c4cc4d1a7 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
@@ -28,13 +28,16 @@ class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputt
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Registry $coreRegistry
+     * @param array $optionsArray
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Registry $coreRegistry
+        \Magento\Framework\Registry $coreRegistry,
+        array $optionsArray = []
     ) {
         $this->_eventManager = $eventManager;
         $this->_coreRegistry = $coreRegistry;
+        parent::__construct($optionsArray);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
index 8f18780ef8f71..fd07380bebd7a 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -158,8 +158,8 @@ public function addProductData($product)
     {
         if ($product instanceof Product) {
             $this->setProductId($product->getId());
-        } elseif (intval($product)) {
-            $this->setProductId(intval($product));
+        } elseif ((int) $product) {
+            $this->setProductId((int) $product);
         }
 
         return $this;
@@ -220,7 +220,7 @@ public function clean()
     }
 
     /**
-     * Retrieve Customer Id if loggined
+     * Retrieve Customer Id if logged in
      *
      * @return int
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
new file mode 100644
index 0000000000000..68d0877c6cd66
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemResolverComposite implements ItemResolverInterface
+{
+    /** @var string[] */
+    private $itemResolvers = [];
+
+    /** @var ItemResolverInterface[] */
+    private $itemResolversInstances = [];
+
+    /**
+     * @param string[] $itemResolvers
+     */
+    public function __construct(array $itemResolvers)
+    {
+        $this->itemResolvers = $itemResolvers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface
+    {
+        $finalProduct = $item->getProduct();
+        foreach ($this->itemResolvers as $resolver) {
+            $resolvedProduct = $this->getItemResolverInstance($resolver)->getFinalProduct($item);
+            if ($resolvedProduct !== $finalProduct) {
+                $finalProduct = $resolvedProduct;
+                break;
+            }
+        }
+        return $finalProduct;
+    }
+
+    /**
+     * Get the instance of the item resolver by class name.
+     *
+     * @param string $className
+     * @return ItemResolverInterface
+     */
+    private function getItemResolverInstance(string $className) : ItemResolverInterface
+    {
+        if (!isset($this->itemResolversInstances[$className])) {
+            $this->itemResolversInstances[$className] = ObjectManager::getInstance()->get($className);
+        }
+        return $this->itemResolversInstances[$className];
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
new file mode 100644
index 0000000000000..35c0a7835cb6c
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Resolves the product from a configured item.
+ *
+ * @api
+ */
+interface ItemResolverInterface
+{
+    /**
+     * Get the final product from a configured item by product type and selection.
+     *
+     * @param ItemInterface $item
+     * @return ProductInterface
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface;
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Copier.php b/app/code/Magento/Catalog/Model/Product/Copier.php
index e94104ae473a0..ce6b4d98bbc9f 100644
--- a/app/code/Magento/Catalog/Model/Product/Copier.php
+++ b/app/code/Magento/Catalog/Model/Product/Copier.php
@@ -8,7 +8,11 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 
+/**
+ * The copier creates product duplicates.
+ */
 class Copier
 {
     /**
@@ -49,7 +53,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
      */
-    public function copy(\Magento\Catalog\Model\Product $product)
+    public function copy(Product $product)
     {
         $product->getWebsiteIds();
         $product->getCategoryIds();
@@ -79,6 +83,7 @@ public function copy(\Magento\Catalog\Model\Product $product)
                 ? $matches[1] . '-' . ($matches[2] + 1)
                 : $urlKey . '-1';
             $duplicate->setUrlKey($urlKey);
+            $duplicate->setData(Product::URL_PATH, null);
             try {
                 $duplicate->save();
                 $isDuplicateSaved = true;
@@ -94,6 +99,8 @@ public function copy(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * Returns product option repository.
+     *
      * @return Option\Repository
      * @deprecated 101.0.0
      */
@@ -107,6 +114,8 @@ private function getOptionRepository()
     }
 
     /**
+     * Returns metadata pool.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      * @deprecated 101.0.0
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index 03d418f3ba0d9..65111979c5d3a 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -102,6 +102,8 @@ public function __construct(
     }
 
     /**
+     * Execute create handler
+     *
      * @param object $product
      * @param array $arguments
      * @return object
@@ -167,23 +169,19 @@ public function execute($product, $arguments = [])
             if (empty($attrData) && empty($clearImages) && empty($newImages) && empty($existImages)) {
                 continue;
             }
-            if (in_array($attrData, $clearImages)) {
-                $product->setData($mediaAttrCode, 'no_selection');
-            }
-
-            if (in_array($attrData, array_keys($newImages))) {
-                $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
-                $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
-            }
-
-            if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
-                $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
-            }
-            if (!empty($product->getData($mediaAttrCode))) {
-                $product->addAttributeUpdate(
+            $this->processMediaAttribute(
+                $product,
+                $mediaAttrCode,
+                $clearImages,
+                $newImages
+            );
+            if (in_array($mediaAttrCode, ['image', 'small_image', 'thumbnail'])) {
+                $this->processMediaAttributeLabel(
+                    $product,
                     $mediaAttrCode,
-                    $product->getData($mediaAttrCode),
-                    $product->getStoreId()
+                    $clearImages,
+                    $newImages,
+                    $existImages
                 );
             }
         }
@@ -208,6 +206,8 @@ public function execute($product, $arguments = [])
     }
 
     /**
+     * Returns media gallery atribute instance
+     *
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
      * @since 101.0.0
      */
@@ -223,6 +223,8 @@ public function getAttribute()
     }
 
     /**
+     * Process delete images
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $images
      * @return void
@@ -234,6 +236,8 @@ protected function processDeletedImages($product, array &$images)
     }
 
     /**
+     * Process images
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $images
      * @return void
@@ -245,12 +249,13 @@ protected function processNewAndExistingImages($product, array &$images)
             if (empty($image['removed'])) {
                 $data = $this->processNewImage($product, $image);
 
-                $this->resourceModel->deleteGalleryValueInStore(
-                    $image['value_id'],
-                    $product->getData($this->metadata->getLinkField()),
-                    $product->getStoreId()
-                );
-
+                if (!$product->isObjectNew()) {
+                    $this->resourceModel->deleteGalleryValueInStore(
+                        $image['value_id'],
+                        $product->getData($this->metadata->getLinkField()),
+                        $product->getStoreId()
+                    );
+                }
                 // Add per store labels, position, disabled
                 $data['value_id'] = $image['value_id'];
                 $data['label'] = isset($image['label']) ? $image['label'] : '';
@@ -295,6 +300,8 @@ protected function processNewImage($product, array &$image)
     }
 
     /**
+     * Duplicate attribute
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      * @since 101.0.0
@@ -363,6 +370,8 @@ private function getSafeFilename($file)
     }
 
     /**
+     * Returns file name according to tmp name
+     *
      * @param string $file
      * @return string
      * @since 101.0.0
@@ -448,4 +457,81 @@ private function getMediaAttributeCodes()
         }
         return $this->mediaAttributeCodes;
     }
+
+    /**
+     * Process media attribute
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string $mediaAttrCode
+     * @param array $clearImages
+     * @param array $newImages
+     */
+    private function processMediaAttribute(
+        \Magento\Catalog\Model\Product $product,
+        $mediaAttrCode,
+        array $clearImages,
+        array $newImages
+    ) {
+        $attrData = $product->getData($mediaAttrCode);
+        if (in_array($attrData, $clearImages)) {
+            $product->setData($mediaAttrCode, 'no_selection');
+        }
+
+        if (in_array($attrData, array_keys($newImages))) {
+            $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
+        }
+        if (!empty($product->getData($mediaAttrCode))) {
+            $product->addAttributeUpdate(
+                $mediaAttrCode,
+                $product->getData($mediaAttrCode),
+                $product->getStoreId()
+            );
+        }
+    }
+
+    /**
+     * Process media attribute label
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string $mediaAttrCode
+     * @param array $clearImages
+     * @param array $newImages
+     * @param array $existImages
+     */
+    private function processMediaAttributeLabel(
+        \Magento\Catalog\Model\Product $product,
+        $mediaAttrCode,
+        array $clearImages,
+        array $newImages,
+        array $existImages
+    ) {
+        $resetLabel = false;
+        $attrData = $product->getData($mediaAttrCode);
+        if (in_array($attrData, $clearImages)) {
+            $product->setData($mediaAttrCode . '_label', null);
+            $resetLabel = true;
+        }
+
+        if (in_array($attrData, array_keys($newImages))) {
+            $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
+        }
+
+        if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
+            $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
+        }
+
+        if ($attrData === 'no_selection' && !empty($product->getData($mediaAttrCode . '_label'))) {
+            $product->setData($mediaAttrCode . '_label', null);
+            $resetLabel = true;
+        }
+        if (!empty($product->getData($mediaAttrCode . '_label'))
+            || $resetLabel === true
+        ) {
+            $product->addAttributeUpdate(
+                $mediaAttrCode . '_label',
+                $product->getData($mediaAttrCode . '_label'),
+                $product->getStoreId()
+            );
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 1b5f96baeaf9f..0e08b0af92862 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -1,19 +1,22 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Gallery;
 
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
-use Magento\Catalog\Api\Data\ProductInterface as Product;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Api\ImageContentValidatorInterface;
 
 /**
+ * Class GalleryManagement
+ *
+ * Provides implementation of api interface ProductAttributeMediaGalleryManagementInterface
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface
@@ -43,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
     {
@@ -51,9 +54,9 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
         $entryContent = $entry->getContent();
 
         if (!$this->contentValidator->isValid($entryContent)) {
-            throw new InputException(__('The image content is not valid.'));
+            throw new InputException(__('The image content is invalid. Verify the content and try again.'));
         }
-        $product = $this->productRepository->get($sku);
+        $product = $this->productRepository->get($sku, true);
 
         $existingMediaGalleryEntries = $product->getMediaGalleryEntries();
         $existingEntryIds = [];
@@ -71,7 +74,7 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
         } catch (InputException $inputException) {
             throw $inputException;
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot save product.'));
+            throw new StateException(__("The product can't be saved."));
         }
 
         foreach ($product->getMediaGalleryEntries() as $entry) {
@@ -79,18 +82,20 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
                 return $entry->getId();
             }
         }
-        throw new StateException(__('Failed to save new media gallery entry.'));
+        throw new StateException(__('The new media gallery entry failed to save.'));
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
     {
-        $product = $this->productRepository->get($sku);
+        $product = $this->productRepository->get($sku, true);
         $existingMediaGalleryEntries = $product->getMediaGalleryEntries();
         if ($existingMediaGalleryEntries == null) {
-            throw new NoSuchEntityException(__('There is no image with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No image with the provided ID was found. Verify the ID and try again.')
+            );
         }
         $found = false;
         foreach ($existingMediaGalleryEntries as $key => $existingEntry) {
@@ -107,27 +112,31 @@ public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
             }
         }
         if (!$found) {
-            throw new NoSuchEntityException(__('There is no image with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No image with the provided ID was found. Verify the ID and try again.')
+            );
         }
         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
 
         try {
             $this->productRepository->save($product);
         } catch (\Exception $exception) {
-            throw new StateException(__('Cannot save product.'));
+            throw new StateException(__("The product can't be saved."));
         }
         return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function remove($sku, $entryId)
     {
-        $product = $this->productRepository->get($sku);
+        $product = $this->productRepository->get($sku, true);
         $existingMediaGalleryEntries = $product->getMediaGalleryEntries();
         if ($existingMediaGalleryEntries == null) {
-            throw new NoSuchEntityException(__('There is no image with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No image with the provided ID was found. Verify the ID and try again.')
+            );
         }
         $found = false;
         foreach ($existingMediaGalleryEntries as $key => $entry) {
@@ -138,7 +147,9 @@ public function remove($sku, $entryId)
             }
         }
         if (!$found) {
-            throw new NoSuchEntityException(__('There is no image with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No image with the provided ID was found. Verify the ID and try again.')
+            );
         }
         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
         $this->productRepository->save($product);
@@ -146,14 +157,14 @@ public function remove($sku, $entryId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($sku, $entryId)
     {
         try {
             $product = $this->productRepository->get($sku);
         } catch (\Exception $exception) {
-            throw new NoSuchEntityException(__('Such product doesn\'t exist'));
+            throw new NoSuchEntityException(__("The product doesn't exist. Verify and try again."));
         }
 
         $mediaGalleryEntries = $product->getMediaGalleryEntries();
@@ -163,11 +174,11 @@ public function get($sku, $entryId)
             }
         }
 
-        throw new NoSuchEntityException(__('Such image doesn\'t exist'));
+        throw new NoSuchEntityException(__("The image doesn't exist. Verify and try again."));
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
index 31e322f4e38f2..0912324745360 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -3,11 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Gallery;
 
+use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog product Media Gallery attribute processor.
@@ -55,28 +57,39 @@ class Processor
      */
     protected $resourceModel;
 
+    /**
+     * @var \Magento\Framework\File\Mime
+     */
+    private $mime;
+
     /**
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Catalog\Model\ResourceModel\Product\Gallery $resourceModel
+     * @param \Magento\Framework\File\Mime|null $mime
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
         \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb,
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\Catalog\Model\ResourceModel\Product\Gallery $resourceModel
+        \Magento\Catalog\Model\ResourceModel\Product\Gallery $resourceModel,
+        \Magento\Framework\File\Mime $mime = null
     ) {
         $this->attributeRepository = $attributeRepository;
         $this->fileStorageDb = $fileStorageDb;
         $this->mediaConfig = $mediaConfig;
         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->resourceModel = $resourceModel;
+        $this->mime = $mime ?: ObjectManager::getInstance()->get(\Magento\Framework\File\Mime::class);
     }
 
     /**
+     * Return media_gallery attribute
+     *
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
      * @since 101.0.0
      */
@@ -108,7 +121,9 @@ public function validate($object)
         if ($this->getAttribute()->getIsUnique()) {
             if (!$this->getAttribute()->getEntity()->checkAttributeUniqueValue($this->getAttribute(), $object)) {
                 $label = $this->getAttribute()->getFrontend()->getLabel();
-                throw new LocalizedException(__('The value of attribute "%1" must be unique.', $label));
+                throw new LocalizedException(
+                    __('The value of the "%1" attribute isn\'t unique. Set a unique value and try again.', $label)
+                );
             }
         }
 
@@ -139,17 +154,19 @@ public function addImage(
     ) {
         $file = $this->mediaDirectory->getRelativePath($file);
         if (!$this->mediaDirectory->isFile($file)) {
-            throw new LocalizedException(__('The image does not exist.'));
+            throw new LocalizedException(__("The image doesn't exist."));
         }
 
         $pathinfo = pathinfo($file);
         $imgExtensions = ['jpg', 'jpeg', 'gif', 'png'];
         if (!isset($pathinfo['extension']) || !in_array(strtolower($pathinfo['extension']), $imgExtensions)) {
-            throw new LocalizedException(__('Please correct the image file type.'));
+            throw new LocalizedException(
+                __('The image type for the file is invalid. Enter the correct image type and try again.')
+            );
         }
 
         $fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($pathinfo['basename']);
-        $dispretionPath = \Magento\MediaStorage\Model\File\Uploader::getDispretionPath($fileName);
+        $dispretionPath = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
         $fileName = $dispretionPath . '/' . $fileName;
 
         $fileName = $this->getNotDuplicatedFilename($fileName, $dispretionPath);
@@ -170,7 +187,7 @@ public function addImage(
                 $storageHelper->saveFile($this->mediaConfig->getTmpMediaShortUrl($fileName));
             }
         } catch (\Exception $e) {
-            throw new LocalizedException(__('We couldn\'t move this file: %1.', $e->getMessage()));
+            throw new LocalizedException(__('The "%1" file couldn\'t be moved.', $e->getMessage()));
         }
 
         $fileName = str_replace('\\', '/', $fileName);
@@ -178,6 +195,13 @@ public function addImage(
         $attrCode = $this->getAttribute()->getAttributeCode();
         $mediaGalleryData = $product->getData($attrCode);
         $position = 0;
+
+        $absoluteFilePath = $this->mediaDirectory->getAbsolutePath($file);
+        $imageMimeType = $this->mime->getMimeType($absoluteFilePath);
+        $imageContent = $this->mediaDirectory->readFile($absoluteFilePath);
+        $imageBase64 = base64_encode($imageContent);
+        $imageName = $pathinfo['filename'];
+
         if (!is_array($mediaGalleryData)) {
             $mediaGalleryData = ['images' => []];
         }
@@ -192,9 +216,17 @@ public function addImage(
         $mediaGalleryData['images'][] = [
             'file' => $fileName,
             'position' => $position,
-            'media_type' => 'image',
             'label' => '',
             'disabled' => (int)$exclude,
+            'media_type' => 'image',
+            'types' => $mediaAttribute,
+            'content' => [
+                'data' => [
+                    ImageContentInterface::NAME => $imageName,
+                    ImageContentInterface::BASE64_ENCODED_DATA => $imageBase64,
+                    ImageContentInterface::TYPE => $imageMimeType,
+                ]
+            ]
         ];
 
         $product->setData($attrCode, $mediaGalleryData);
@@ -340,9 +372,9 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi
         $mediaAttributeCodes = $this->mediaConfig->getMediaAttributeCodes();
 
         if (is_array($mediaAttribute)) {
-            foreach ($mediaAttribute as $atttribute) {
-                if (in_array($atttribute, $mediaAttributeCodes)) {
-                    $product->setData($atttribute, $value);
+            foreach ($mediaAttribute as $attribute) {
+                if (in_array($attribute, $mediaAttributeCodes)) {
+                    $product->setData($attribute, $value);
                 }
             }
         } elseif (in_array($mediaAttribute, $mediaAttributeCodes)) {
@@ -353,7 +385,8 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi
     }
 
     /**
-     * get media attribute codes
+     * Get media attribute codes
+     *
      * @return array
      * @since 101.0.0
      */
@@ -363,6 +396,8 @@ public function getMediaAttributeCodes()
     }
 
     /**
+     * Trim .tmp ending from filename
+     *
      * @param string $file
      * @return string
      * @since 101.0.0
@@ -484,7 +519,6 @@ public function getAffectedFields($object)
     /**
      * Attribute value is not to be saved in a conventional way, separate table is used to store the complex value
      *
-     * {@inheritdoc}
      * @since 101.0.0
      */
     public function isScalar()
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
index c785d08e64b7f..a3726207b3024 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
@@ -47,6 +47,8 @@ public function __construct(
     }
 
     /**
+     * Execute read handler for catalog product gallery
+     *
      * @param Product $entity
      * @param array $arguments
      * @return object
@@ -55,9 +57,6 @@ public function __construct(
      */
     public function execute($entity, $arguments = [])
     {
-        $value = [];
-        $value['images'] = [];
-
         $mediaEntries = $this->resourceModel->loadProductGalleryByAttributeId(
             $entity,
             $this->getAttribute()->getAttributeId()
@@ -72,6 +71,8 @@ public function execute($entity, $arguments = [])
     }
 
     /**
+     * Add media data to product
+     *
      * @param Product $product
      * @param array $mediaEntries
      * @return void
@@ -79,40 +80,18 @@ public function execute($entity, $arguments = [])
      */
     public function addMediaDataToProduct(Product $product, array $mediaEntries)
     {
-        $attrCode = $this->getAttribute()->getAttributeCode();
-        $value = [];
-        $value['images'] = [];
-        $value['values'] = [];
-
-        foreach ($mediaEntries as $mediaEntry) {
-            $mediaEntry = $this->substituteNullsWithDefaultValues($mediaEntry);
-            $value['images'][$mediaEntry['value_id']] = $mediaEntry;
-        }
-        $product->setData($attrCode, $value);
-    }
-
-    /**
-     * @param array $rawData
-     * @return array
-     */
-    private function substituteNullsWithDefaultValues(array $rawData)
-    {
-        $processedData = [];
-        foreach ($rawData as $key => $rawValue) {
-            if (null !== $rawValue) {
-                $processedValue = $rawValue;
-            } elseif (isset($rawData[$key . '_default'])) {
-                $processedValue = $rawData[$key . '_default'];
-            } else {
-                $processedValue = null;
-            }
-            $processedData[$key] = $processedValue;
-        }
-
-        return $processedData;
+        $product->setData(
+            $this->getAttribute()->getAttributeCode(),
+            [
+                'images' => array_column($mediaEntries, null, 'value_id'),
+                'values' => []
+            ]
+        );
     }
 
     /**
+     * Get attribute
+     *
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
      * @since 101.0.0
      */
@@ -126,6 +105,8 @@ public function getAttribute()
     }
 
     /**
+     * Find default value
+     *
      * @param string $key
      * @param string[] &$image
      * @return string
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
index 53083d7168b45..189135776b68b 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
@@ -16,7 +16,8 @@
 class UpdateHandler extends \Magento\Catalog\Model\Product\Gallery\CreateHandler
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     protected function processDeletedImages($product, array &$images)
@@ -31,7 +32,10 @@ protected function processDeletedImages($product, array &$images)
 
         foreach ($images as &$image) {
             if (!empty($image['removed'])) {
-                if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
+                if (!empty($image['value_id'])) {
+                    if (preg_match('/\.\.(\\\|\/)/', $image['file'])) {
+                        continue;
+                    }
                     $recordsToDelete[] = $image['value_id'];
                     $catalogPath = $this->mediaConfig->getBaseMediaPath();
                     $isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']);
@@ -49,7 +53,8 @@ protected function processDeletedImages($product, array &$images)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     protected function processNewImage($product, array &$image)
@@ -76,6 +81,8 @@ protected function processNewImage($product, array &$image)
     }
 
     /**
+     * Retrieve store ids from product.
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
      * @since 101.0.0
@@ -94,6 +101,8 @@ protected function extractStoreIds($product)
     }
 
     /**
+     * Remove deleted images.
+     *
      * @param array $files
      * @return null
      * @since 101.0.0
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 91f589f9b5bd7..a0be36c5a327c 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -6,11 +6,17 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
+use Magento\Catalog\Model\View\Asset\ImageFactory;
+use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Image as MagentoImage;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
 
 /**
+ * Image operations
+ *
  * @method string getFile()
  * @method string getLabel()
  * @method string getPosition()
@@ -20,6 +26,11 @@
  */
 class Image extends \Magento\Framework\Model\AbstractModel
 {
+    /**
+     * Config path for the jpeg image quality value
+     */
+    const XML_PATH_JPEG_QUALITY = 'system/upload_configuration/jpeg_quality';
+
     /**
      * @var int
      */
@@ -34,8 +45,9 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * Default quality value (for JPEG images only).
      *
      * @var int
+     * @deprecated use config setting with path self::XML_PATH_JPEG_QUALITY
      */
-    protected $_quality = 80;
+    protected $_quality = null;
 
     /**
      * @var bool
@@ -158,12 +170,12 @@ class Image extends \Magento\Framework\Model\AbstractModel
     protected $_storeManager;
 
     /**
-     * @var \Magento\Catalog\Model\View\Asset\ImageFactory
+     * @var ImageFactory
      */
     private $viewAssetImageFactory;
 
     /**
-     * @var \Magento\Catalog\Model\View\Asset\PlaceholderFactory
+     * @var PlaceholderFactory
      */
     private $viewAssetPlaceholderFactory;
 
@@ -172,6 +184,21 @@ class Image extends \Magento\Framework\Model\AbstractModel
      */
     private $imageAsset;
 
+    /**
+     * @var ParamsBuilder
+     */
+    private $paramsBuilder;
+
+    /**
+     * @var string
+     */
+    private $cachePrefix = 'IMG_INFO';
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
     /**
      * Constructor
      *
@@ -184,12 +211,14 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Image\Factory $imageFactory
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
+     * @param ImageFactory $viewAssetImageFactory
+     * @param PlaceholderFactory $viewAssetPlaceholderFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @param \Magento\Catalog\Model\View\Asset\ImageFactory|null $viewAssetImageFactory
-     * @param \Magento\Catalog\Model\View\Asset\PlaceholderFactory|null $viewAssetPlaceholderFactory
+     * @param SerializerInterface $serializer
+     * @param ParamsBuilder $paramsBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -203,12 +232,14 @@ public function __construct(
         \Magento\Framework\Image\Factory $imageFactory,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\View\FileSystem $viewFileSystem,
+        ImageFactory $viewAssetImageFactory,
+        PlaceholderFactory $viewAssetPlaceholderFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        \Magento\Catalog\Model\View\Asset\ImageFactory $viewAssetImageFactory = null,
-        \Magento\Catalog\Model\View\Asset\PlaceholderFactory $viewAssetPlaceholderFactory = null
+        SerializerInterface $serializer = null,
+        ParamsBuilder $paramsBuilder = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_catalogProductMediaConfig = $catalogProductMediaConfig;
@@ -219,13 +250,15 @@ public function __construct(
         $this->_assetRepo = $assetRepo;
         $this->_viewFileSystem = $viewFileSystem;
         $this->_scopeConfig = $scopeConfig;
-        $this->viewAssetImageFactory = $viewAssetImageFactory ?: ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Model\View\Asset\ImageFactory::class);
-        $this->viewAssetPlaceholderFactory = $viewAssetPlaceholderFactory ?: ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Model\View\Asset\PlaceholderFactory::class);
+        $this->viewAssetImageFactory = $viewAssetImageFactory;
+        $this->viewAssetPlaceholderFactory = $viewAssetPlaceholderFactory;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->paramsBuilder = $paramsBuilder ?: ObjectManager::getInstance()->get(ParamsBuilder::class);
     }
 
     /**
+     * Set image width property
+     *
      * @param int $width
      * @return $this
      */
@@ -236,6 +269,8 @@ public function setWidth($width)
     }
 
     /**
+     * Get image width property
+     *
      * @return int
      */
     public function getWidth()
@@ -244,6 +279,8 @@ public function getWidth()
     }
 
     /**
+     * Set image height property
+     *
      * @param int $height
      * @return $this
      */
@@ -254,6 +291,8 @@ public function setHeight($height)
     }
 
     /**
+     * Get image height property
+     *
      * @return int
      */
     public function getHeight()
@@ -266,6 +305,7 @@ public function getHeight()
      *
      * @param int $quality
      * @return $this
+     * @deprecated use config setting with path self::XML_PATH_JPEG_QUALITY
      */
     public function setQuality($quality)
     {
@@ -280,10 +320,14 @@ public function setQuality($quality)
      */
     public function getQuality()
     {
-        return $this->_quality;
+        return $this->_quality === null
+            ? $this->_scopeConfig->getValue(self::XML_PATH_JPEG_QUALITY)
+            : $this->_quality;
     }
 
     /**
+     * Set _keepAspectRatio property
+     *
      * @param bool $keep
      * @return $this
      */
@@ -294,6 +338,8 @@ public function setKeepAspectRatio($keep)
     }
 
     /**
+     * Set _keepFrame property
+     *
      * @param bool $keep
      * @return $this
      */
@@ -304,6 +350,8 @@ public function setKeepFrame($keep)
     }
 
     /**
+     * Set _keepTransparency
+     *
      * @param bool $keep
      * @return $this
      */
@@ -314,6 +362,8 @@ public function setKeepTransparency($keep)
     }
 
     /**
+     * Set _constrainOnly
+     *
      * @param bool $flag
      * @return $this
      */
@@ -324,6 +374,8 @@ public function setConstrainOnly($flag)
     }
 
     /**
+     * Set background color
+     *
      * @param int[] $rgbArray
      * @return $this
      */
@@ -334,6 +386,8 @@ public function setBackgroundColor(array $rgbArray)
     }
 
     /**
+     * Set size
+     *
      * @param string $size
      * @return $this
      */
@@ -356,105 +410,6 @@ public function setSize($size)
         return $this;
     }
 
-    /**
-     * @param string|null $file
-     * @return bool
-     */
-    protected function _checkMemory($file = null)
-    {
-        return $this->_getMemoryLimit() > $this->_getMemoryUsage() + $this->_getNeedMemoryForFile(
-            $file
-        )
-        || $this->_getMemoryLimit() == -1;
-    }
-
-    /**
-     * @return string
-     */
-    protected function _getMemoryLimit()
-    {
-        $memoryLimit = trim(strtoupper(ini_get('memory_limit')));
-
-        if (!isset($memoryLimit[0])) {
-            $memoryLimit = "128M";
-        }
-
-        if (substr($memoryLimit, -1) == 'K') {
-            return substr($memoryLimit, 0, -1) * 1024;
-        }
-        if (substr($memoryLimit, -1) == 'M') {
-            return substr($memoryLimit, 0, -1) * 1024 * 1024;
-        }
-        if (substr($memoryLimit, -1) == 'G') {
-            return substr($memoryLimit, 0, -1) * 1024 * 1024 * 1024;
-        }
-        return $memoryLimit;
-    }
-
-    /**
-     * @return int
-     */
-    protected function _getMemoryUsage()
-    {
-        if (function_exists('memory_get_usage')) {
-            return memory_get_usage();
-        }
-        return 0;
-    }
-
-    /**
-     * @param string|null $file
-     * @return float|int
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    protected function _getNeedMemoryForFile($file = null)
-    {
-        $file = $file === null ? $this->getBaseFile() : $file;
-        if (!$file) {
-            return 0;
-        }
-
-        if (!$this->_mediaDirectory->isExist($file)) {
-            return 0;
-        }
-
-        $imageInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($file));
-
-        if (!isset($imageInfo[0]) || !isset($imageInfo[1])) {
-            return 0;
-        }
-        if (!isset($imageInfo['channels'])) {
-            // if there is no info about this parameter lets set it for maximum
-            $imageInfo['channels'] = 4;
-        }
-        if (!isset($imageInfo['bits'])) {
-            // if there is no info about this parameter lets set it for maximum
-            $imageInfo['bits'] = 8;
-        }
-        return round(
-            ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + Pow(2, 16)) * 1.65
-        );
-    }
-
-    /**
-     * Convert array of 3 items (decimal r, g, b) to string of their hex values
-     *
-     * @param int[] $rgbArray
-     * @return string
-     */
-    protected function _rgbToString($rgbArray)
-    {
-        $result = [];
-        foreach ($rgbArray as $value) {
-            if (null === $value) {
-                $result[] = 'null';
-            } else {
-                $result[] = sprintf('%02s', dechex($value));
-            }
-        }
-        return implode($result);
-    }
-
     /**
      * Set filenames for base file and new file
      *
@@ -472,9 +427,7 @@ public function setBaseFile($file)
                 'filePath' => $file,
             ]
         );
-        if ($file == 'no_selection' || !$this->_fileExists($this->imageAsset->getSourceFile())
-            || !$this->_checkMemory($this->imageAsset->getSourceFile())
-        ) {
+        if ($file == 'no_selection' || !$this->_fileExists($this->imageAsset->getSourceFile())) {
             $this->_isBaseFilePlaceholder = true;
             $this->imageAsset = $this->viewAssetPlaceholderFactory->create(
                 [
@@ -489,6 +442,8 @@ public function setBaseFile($file)
     }
 
     /**
+     * Get base filename
+     *
      * @return string
      */
     public function getBaseFile()
@@ -497,6 +452,8 @@ public function getBaseFile()
     }
 
     /**
+     * Get new file
+     *
      * @deprecated 101.1.0
      * @return bool|string
      */
@@ -516,6 +473,8 @@ public function isBaseFilePlaceholder()
     }
 
     /**
+     * Set image processor
+     *
      * @param MagentoImage $processor
      * @return $this
      */
@@ -526,6 +485,8 @@ public function setImageProcessor($processor)
     }
 
     /**
+     * Get image processor
+     *
      * @return MagentoImage
      */
     public function getImageProcessor()
@@ -539,11 +500,13 @@ public function getImageProcessor()
         $this->_processor->keepTransparency($this->_keepTransparency);
         $this->_processor->constrainOnly($this->_constrainOnly);
         $this->_processor->backgroundColor($this->_backgroundColor);
-        $this->_processor->quality($this->_quality);
+        $this->_processor->quality($this->getQuality());
         return $this->_processor;
     }
 
     /**
+     * Resize image
+     *
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter
      * @return $this
      */
@@ -557,12 +520,14 @@ public function resize()
     }
 
     /**
+     * Rotate image
+     *
      * @param int $angle
      * @return $this
      */
     public function rotate($angle)
     {
-        $angle = intval($angle);
+        $angle = (int) $angle;
         $this->getImageProcessor()->rotate($angle);
         return $this;
     }
@@ -583,7 +548,8 @@ public function setAngle($angle)
 
     /**
      * Add watermark to image
-     * size param in format 100x200
+     *
+     * Size param in format 100x200
      *
      * @param string $file
      * @param string $position
@@ -642,6 +608,8 @@ public function setWatermark(
     }
 
     /**
+     * Save file
+     *
      * @return $this
      */
     public function saveFile()
@@ -656,6 +624,8 @@ public function saveFile()
     }
 
     /**
+     * Get url
+     *
      * @return string
      */
     public function getUrl()
@@ -664,6 +634,8 @@ public function getUrl()
     }
 
     /**
+     * Set destination subdir
+     *
      * @param string $dir
      * @return $this
      */
@@ -674,6 +646,8 @@ public function setDestinationSubdir($dir)
     }
 
     /**
+     * Get destination subdir
+     *
      * @return string
      */
     public function getDestinationSubdir()
@@ -682,11 +656,14 @@ public function getDestinationSubdir()
     }
 
     /**
-     * @return bool|void
+     * Check is image cached
+     *
+     * @return bool
      */
     public function isCached()
     {
-        return file_exists($this->imageAsset->getPath());
+        $path = $this->imageAsset->getPath();
+        return is_array($this->loadImageInfoFromCache($path)) || file_exists($path);
     }
 
     /**
@@ -713,7 +690,8 @@ public function getWatermarkFile()
 
     /**
      * Get relative watermark file path
-     * or false if file not found
+     *
+     * Return false if file not found
      *
      * @return string | bool
      */
@@ -848,7 +826,10 @@ public function getWatermarkHeight()
     }
 
     /**
+     * Clear cache
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function clearCache()
     {
@@ -856,10 +837,12 @@ public function clearCache()
         $this->_mediaDirectory->delete($directory);
 
         $this->_coreFileStorageDatabase->deleteFolder($this->_mediaDirectory->getAbsolutePath($directory));
+        $this->clearImageInfoFromCache();
     }
 
     /**
      * First check this file on FS
+     *
      * If it doesn't exist - try to download it from DB
      *
      * @param string $filename
@@ -878,6 +861,7 @@ protected function _fileExists($filename)
 
     /**
      * Return resized product image information
+     *
      * @return array
      * @throws NotLoadInfoImageException
      */
@@ -890,7 +874,7 @@ public function getResizedImageInfo()
                 $image = $this->imageAsset->getPath();
             }
 
-            $imageProperties = getimagesize($image);
+            $imageProperties = $this->getImageSize($image);
 
             return $imageProperties;
         } finally {
@@ -908,28 +892,81 @@ public function getResizedImageInfo()
      */
     private function getMiscParams()
     {
-        $miscParams = [
-            'image_type' => $this->getDestinationSubdir(),
-            'image_height' => $this->getHeight(),
-            'image_width' => $this->getWidth(),
-            'keep_aspect_ratio' => ($this->_keepAspectRatio ? '' : 'non') . 'proportional',
-            'keep_frame' => ($this->_keepFrame ? '' : 'no') . 'frame',
-            'keep_transparency' => ($this->_keepTransparency ? '' : 'no') . 'transparency',
-            'constrain_only' => ($this->_constrainOnly ? 'do' : 'not') . 'constrainonly',
-            'background' => $this->_rgbToString($this->_backgroundColor),
-            'angle' => $this->_angle,
-            'quality' => $this->_quality,
-        ];
+        return $this->paramsBuilder->build(
+            [
+                'type' => $this->getDestinationSubdir(),
+                'width' => $this->getWidth(),
+                'height' => $this->getHeight(),
+                'frame' => $this->_keepFrame,
+                'constrain' => $this->_constrainOnly,
+                'aspect_ratio' => $this->_keepAspectRatio,
+                'transparency' => $this->_keepTransparency,
+                'background' => $this->_backgroundColor,
+                'angle' => $this->_angle,
+                'quality' => $this->getQuality()
+            ]
+        );
+    }
 
-        // if has watermark add watermark params to hash
-        if ($this->getWatermarkFile()) {
-            $miscParams['watermark_file'] = $this->getWatermarkFile();
-            $miscParams['watermark_image_opacity'] = $this->getWatermarkImageOpacity();
-            $miscParams['watermark_position'] = $this->getWatermarkPosition();
-            $miscParams['watermark_width'] = $this->getWatermarkWidth();
-            $miscParams['watermark_height'] = $this->getWatermarkHeight();
+    /**
+     * Get image size
+     *
+     * @param string $imagePath
+     * @return array
+     */
+    private function getImageSize($imagePath)
+    {
+        $imageInfo = $this->loadImageInfoFromCache($imagePath);
+        if (!isset($imageInfo['size'])) {
+            $imageSize = getimagesize($imagePath);
+            $this->saveImageInfoToCache(['size' => $imageSize], $imagePath);
+            return $imageSize;
+        } else {
+            return $imageInfo['size'];
         }
+    }
 
-        return $miscParams;
+    /**
+     * Save image data to cache
+     *
+     * @param array $imageInfo
+     * @param string $imagePath
+     * @return void
+     */
+    private function saveImageInfoToCache(array $imageInfo, string $imagePath)
+    {
+        $imagePath = $this->cachePrefix  . $imagePath;
+        $this->_cacheManager->save(
+            $this->serializer->serialize($imageInfo),
+            $imagePath,
+            [$this->cachePrefix]
+        );
+    }
+
+    /**
+     * Load image data from cache
+     *
+     * @param string $imagePath
+     * @return array|false
+     */
+    private function loadImageInfoFromCache(string $imagePath)
+    {
+        $imagePath = $this->cachePrefix  . $imagePath;
+        $cacheData = $this->_cacheManager->load($imagePath);
+        if (!$cacheData) {
+            return false;
+        } else {
+            return $this->serializer->unserialize($cacheData);
+        }
+    }
+
+    /**
+     * Clear image data from cache
+     *
+     * @return void
+     */
+    private function clearImageInfoFromCache()
+    {
+        $this->_cacheManager->clean([$this->cachePrefix]);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
new file mode 100644
index 0000000000000..f6be7f7392b5e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Image;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Catalog\Model\Product\Image;
+
+/**
+ * Builds parameters array used to build Image Asset
+ */
+class ParamsBuilder
+{
+    /**
+     * @var array
+     */
+    private $defaultBackground = [255, 255, 255];
+
+    /**
+     * @var int|null
+     */
+    private $defaultAngle = null;
+
+    /**
+     * @var bool
+     */
+    private $defaultKeepAspectRatio = true;
+
+    /**
+     * @var bool
+     */
+    private $defaultKeepTransparency = true;
+
+    /**
+     * @var bool
+     */
+    private $defaultConstrainOnly = true;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $viewConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param ConfigInterface $viewConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        ConfigInterface $viewConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->viewConfig = $viewConfig;
+    }
+
+    /**
+     * Build image params
+     *
+     * @param array $imageArguments
+     * @return array
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function build(array $imageArguments): array
+    {
+        $miscParams = [
+            'image_type' => $imageArguments['type'] ?? null,
+            'image_height' => $imageArguments['height'] ?? null,
+            'image_width' => $imageArguments['width'] ?? null,
+        ];
+
+        $overwritten = $this->overwriteDefaultValues($imageArguments);
+        $watermark = isset($miscParams['image_type']) ? $this->getWatermark($miscParams['image_type']) : [];
+
+        return array_merge($miscParams, $overwritten, $watermark);
+    }
+
+    /**
+     * Overwrite default values
+     *
+     * @param array $imageArguments
+     * @return array
+     */
+    private function overwriteDefaultValues(array $imageArguments): array
+    {
+        $frame = $imageArguments['frame'] ?? $this->hasDefaultFrame();
+        $constrain = $imageArguments['constrain'] ?? $this->defaultConstrainOnly;
+        $aspectRatio = $imageArguments['aspect_ratio'] ?? $this->defaultKeepAspectRatio;
+        $transparency = $imageArguments['transparency'] ?? $this->defaultKeepTransparency;
+        $background = $imageArguments['background'] ?? $this->defaultBackground;
+        $angle = $imageArguments['angle'] ?? $this->defaultAngle;
+        $quality = (int) $this->scopeConfig->getValue(Image::XML_PATH_JPEG_QUALITY);
+
+        return [
+            'background' => (array) $background,
+            'angle' => $angle,
+            'quality' => $quality,
+            'keep_aspect_ratio' => (bool) $aspectRatio,
+            'keep_frame' => (bool) $frame,
+            'keep_transparency' => (bool) $transparency,
+            'constrain_only' => (bool) $constrain,
+        ];
+    }
+
+    /**
+     * Get watermark
+     *
+     * @param string $type
+     * @return array
+     */
+    private function getWatermark(string $type): array
+    {
+        $file = $this->scopeConfig->getValue(
+            "design/watermark/{$type}_image",
+            ScopeInterface::SCOPE_STORE
+        );
+
+        if ($file) {
+            $size = $this->scopeConfig->getValue(
+                "design/watermark/{$type}_size",
+                ScopeInterface::SCOPE_STORE
+            );
+            $opacity = $this->scopeConfig->getValue(
+                "design/watermark/{$type}_imageOpacity",
+                ScopeInterface::SCOPE_STORE
+            );
+            $position = $this->scopeConfig->getValue(
+                "design/watermark/{$type}_position",
+                ScopeInterface::SCOPE_STORE
+            );
+            $width = !empty($size['width']) ? $size['width'] : null;
+            $height = !empty($size['height']) ? $size['height'] : null;
+
+            return [
+                'watermark_file' => $file,
+                'watermark_image_opacity' => $opacity,
+                'watermark_position' => $position,
+                'watermark_width' => $width,
+                'watermark_height' => $height
+            ];
+        }
+
+        return [];
+    }
+
+    /**
+     * Get frame from product_image_white_borders
+     *
+     * @return bool
+     */
+    private function hasDefaultFrame(): bool
+    {
+        return (bool) $this->viewConfig->getViewConfig()->getVarValue(
+            'Magento_Catalog',
+            'product_image_white_borders'
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Image/UrlBuilder.php b/app/code/Magento/Catalog/Model/Product/Image/UrlBuilder.php
new file mode 100644
index 0000000000000..a5fdc3b0a6eaf
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Image/UrlBuilder.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Image;
+
+use Magento\Catalog\Helper\Image;
+use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Catalog\Model\View\Asset\ImageFactory;
+
+/**
+ * Used to build product image url
+ */
+class UrlBuilder
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $presentationConfig;
+
+    /**
+     * @var ImageFactory
+     */
+    private $viewAssetImageFactory;
+
+    /**
+     * @var ParamsBuilder
+     */
+    private $imageParamsBuilder;
+
+    /**
+     * @var PlaceholderFactory
+     */
+    private $placeholderFactory;
+
+    /**
+     * @param ConfigInterface $presentationConfig
+     * @param ParamsBuilder $imageParamsBuilder
+     * @param ImageFactory $viewAssetImageFactory
+     * @param PlaceholderFactory $placeholderFactory
+     */
+    public function __construct(
+        ConfigInterface $presentationConfig,
+        ParamsBuilder $imageParamsBuilder,
+        ImageFactory $viewAssetImageFactory,
+        PlaceholderFactory $placeholderFactory
+    ) {
+        $this->presentationConfig = $presentationConfig;
+        $this->imageParamsBuilder = $imageParamsBuilder;
+        $this->viewAssetImageFactory = $viewAssetImageFactory;
+        $this->placeholderFactory = $placeholderFactory;
+    }
+
+    /**
+     * Build image url using base path and params
+     *
+     * @param string $baseFilePath
+     * @param string $imageDisplayArea
+     * @return string
+     */
+    public function getUrl(string $baseFilePath, string $imageDisplayArea): string
+    {
+        $imageArguments = $this->presentationConfig->getViewConfig()->getMediaAttributes(
+            'Magento_Catalog',
+            Image::MEDIA_TYPE_CONFIG_NODE,
+            $imageDisplayArea
+        );
+
+        $imageMiscParams = $this->imageParamsBuilder->build($imageArguments);
+
+        if ($baseFilePath === null || $baseFilePath === 'no_selection') {
+            $asset = $this->placeholderFactory->create(
+                [
+                    'type' => $imageMiscParams['image_type']
+                ]
+            );
+        } else {
+            $asset = $this->viewAssetImageFactory->create(
+                [
+                    'miscParams' => $imageMiscParams,
+                    'filePath' => $baseFilePath,
+                ]
+            );
+        }
+
+        return $asset->getUrl();
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
index 13c6a13a50407..a7468bcb1e77f 100644
--- a/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
@@ -31,6 +31,7 @@ class SaveHandler
     private $linkResource;
 
     /**
+     * SaveHandler constructor.
      * @param MetadataPool $metadataPool
      * @param Link $linkResource
      * @param ProductLinkRepositoryInterface $productLinkRepository
@@ -55,12 +56,30 @@ public function execute($entityType, $entity)
     {
         $link = $entity->getData($this->metadataPool->getMetadata($entityType)->getLinkField());
         if ($this->linkResource->hasProductLinks($link)) {
-            /** @var \Magento\Catalog\Api\Data\ProductInterface $entity*/
+            /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
             foreach ($this->productLinkRepository->getList($entity) as $link) {
                 $this->productLinkRepository->delete($link);
             }
         }
-        $productLinks = $entity->getProductLinks();
+
+        // Build links per type
+        $linksByType = [];
+        foreach ($entity->getProductLinks() as $link) {
+            $linksByType[$link->getLinkType()][] = $link;
+        }
+
+        // Set array position as a fallback position if necessary
+        foreach ($linksByType as $linkType => $links) {
+            if (!$this->hasPosition($links)) {
+                array_walk($linksByType[$linkType], function ($productLink, $position) {
+                    $productLink->setPosition(++$position);
+                });
+            }
+        }
+
+        // Flatten multi-dimensional linksByType in ProductLinks
+        $productLinks = array_reduce($linksByType, 'array_merge', []);
+
         if (count($productLinks) > 0) {
             foreach ($entity->getProductLinks() as $link) {
                 $this->productLinkRepository->save($link);
@@ -68,4 +87,19 @@ public function execute($entityType, $entity)
         }
         return $entity;
     }
+
+    /**
+     * Check if at least one link without position
+     * @param array $links
+     * @return bool
+     */
+    private function hasPosition(array $links)
+    {
+        foreach ($links as $link) {
+            if (!array_key_exists('position', $link->getData())) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index 72936d317399c..33af93db13b4c 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -10,11 +10,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Catalog product media config
+ * Catalog product media config.
  *
  * @api
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Config implements ConfigInterface
@@ -31,6 +29,11 @@ class Config implements ConfigInterface
      */
     private $attributeHelper;
 
+    /**
+     * @var string[]
+     */
+    private $mediaAttributeCodes;
+
     /**
      * @param StoreManagerInterface $storeManager
      */
@@ -40,8 +43,7 @@ public function __construct(StoreManagerInterface $storeManager)
     }
 
     /**
-     * Filesystem directory path of product images
-     * relatively to media folder
+     * Get filesystem directory path for product images relative to the media directory.
      *
      * @return string
      */
@@ -51,8 +53,7 @@ public function getBaseMediaPathAddition()
     }
 
     /**
-     * Web-based directory path of product images
-     * relatively to media folder
+     * Get web-based directory path for product images relative to the media directory.
      *
      * @return string
      */
@@ -62,7 +63,7 @@ public function getBaseMediaUrlAddition()
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getBaseMediaPath()
     {
@@ -70,7 +71,7 @@ public function getBaseMediaPath()
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getBaseMediaUrl()
     {
@@ -79,8 +80,7 @@ public function getBaseMediaUrl()
     }
 
     /**
-     * Filesystem directory path of temporary product images
-     * relatively to media folder
+     * Filesystem directory path of temporary product images relative to the media directory.
      *
      * @return string
      */
@@ -90,6 +90,8 @@ public function getBaseTmpMediaPath()
     }
 
     /**
+     * Get temporary base media URL.
+     *
      * @return string
      */
     public function getBaseTmpMediaUrl()
@@ -100,8 +102,7 @@ public function getBaseTmpMediaUrl()
     }
 
     /**
-     * @param string $file
-     * @return string
+     * @inheritdoc
      */
     public function getMediaUrl($file)
     {
@@ -109,8 +110,7 @@ public function getMediaUrl($file)
     }
 
     /**
-     * @param string $file
-     * @return string
+     * @inheritdoc
      */
     public function getMediaPath($file)
     {
@@ -118,6 +118,8 @@ public function getMediaPath($file)
     }
 
     /**
+     * Get temporary media URL.
+     *
      * @param string $file
      * @return string
      */
@@ -127,8 +129,7 @@ public function getTmpMediaUrl($file)
     }
 
     /**
-     * Part of URL of temporary product images
-     * relatively to media folder
+     * Part of URL of temporary product images relative to the media directory.
      *
      * @param string $file
      * @return string
@@ -139,7 +140,7 @@ public function getTmpMediaShortUrl($file)
     }
 
     /**
-     * Part of URL of product images relatively to media folder
+     * Part of URL of product images relatively to media folder.
      *
      * @param string $file
      * @return string
@@ -150,6 +151,8 @@ public function getMediaShortUrl($file)
     }
 
     /**
+     * Get path to the temporary media.
+     *
      * @param string $file
      * @return string
      */
@@ -159,6 +162,8 @@ public function getTmpMediaPath($file)
     }
 
     /**
+     * Process file path.
+     *
      * @param string $file
      * @return string
      */
@@ -168,15 +173,23 @@ protected function _prepareFile($file)
     }
 
     /**
+     * Get codes of media attribute.
+     *
      * @return array
      * @since 100.0.4
      */
     public function getMediaAttributeCodes()
     {
-        return $this->getAttributeHelper()->getAttributeCodesByFrontendType('media_image');
+        if (!isset($this->mediaAttributeCodes)) {
+            // the in-memory object-level caching allows to prevent unnecessary calls to the DB
+            $this->mediaAttributeCodes = $this->getAttributeHelper()->getAttributeCodesByFrontendType('media_image');
+        }
+        return $this->mediaAttributeCodes;
     }
 
     /**
+     * Get attribute helper.
+     *
      * @return Attribute
      */
     private function getAttributeHelper()
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 67d9074d91382..b4a4ec08d390d 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
@@ -102,6 +103,11 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      */
     private $metadataPool;
 
+    /**
+     * @var ProductCustomOptionValuesInterfaceFactory
+     */
+    private $customOptionValuesFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -114,6 +120,7 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param ProductCustomOptionValuesInterfaceFactory|null $customOptionValuesFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -127,12 +134,16 @@ public function __construct(
         Option\Validator\Pool $validatorPool,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null
     ) {
         $this->productOptionValue = $productOptionValue;
         $this->optionTypeFactory = $optionFactory;
         $this->validatorPool = $validatorPool;
         $this->string = $string;
+        $this->customOptionValuesFactory = $customOptionValuesFactory ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
+
         parent::__construct(
             $context,
             $registry,
@@ -312,7 +323,7 @@ public function getGroupByType($type = null)
             self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
         ];
 
-        return isset($optionGroupsToTypes[$type]) ? $optionGroupsToTypes[$type] : '';
+        return $optionGroupsToTypes[$type] ?? '';
     }
 
     /**
@@ -377,6 +388,10 @@ public function beforeSave()
                 }
             }
         }
+        if ($this->getGroupByType($this->getData('type')) === self::OPTION_GROUP_FILE) {
+            $this->cleanFileExtensions();
+        }
+
         return $this;
     }
 
@@ -386,20 +401,21 @@ public function beforeSave()
      */
     public function afterSave()
     {
-        $this->getValueInstance()->unsetValues();
         $values = $this->getValues() ?: $this->getData('values');
         if (is_array($values)) {
             foreach ($values as $value) {
-                if ($value instanceof \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface) {
+                if ($value instanceof ProductCustomOptionValuesInterface) {
                     $data = $value->getData();
                 } else {
                     $data = $value;
                 }
-                $this->getValueInstance()->addValue($data);
-            }
 
-            $this->getValueInstance()->setOption($this)->saveValues();
-        } elseif ($this->getGroupByType($this->getType()) == self::OPTION_GROUP_SELECT) {
+                $this->customOptionValuesFactory->create()
+                    ->addValue($data)
+                    ->setOption($this)
+                    ->saveValues();
+            }
+        } elseif ($this->getGroupByType($this->getType()) === self::OPTION_GROUP_SELECT) {
             throw new LocalizedException(__('Select type options required values rows.'));
         }
 
@@ -800,7 +816,7 @@ public function setImageSizeY($imageSizeY)
     }
 
     /**
-     * @param \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface[] $values
+     * @param ProductCustomOptionValuesInterface[] $values
      * @return $this
      */
     public function setValues(array $values = null)
@@ -902,4 +918,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/Repository.php b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
index c2d7781b37ad8..9dc9695daffd1 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -147,7 +148,7 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
     {
         $productSku = $option->getProductSku();
         if (!$productSku) {
-            throw new CouldNotSaveException(__('ProductSku should be specified'));
+            throw new CouldNotSaveException(__('The ProductSku is empty. Set the ProductSku and try again.'));
         }
         /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productRepository->get($productSku);
@@ -200,7 +201,7 @@ public function deleteByIdentifier($sku, $optionId)
                 $this->productRepository->save($product);
             }
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not remove custom option'));
+            throw new CouldNotSaveException(__("The custom option couldn't be removed."));
         }
         return true;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index cb6e76aebaadb..b19906ecd6cc9 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
@@ -101,11 +102,11 @@ public function validateUserValue($values)
             $this->setUserValue(
                 [
                     'date' => isset($value['date']) ? $value['date'] : '',
-                    'year' => isset($value['year']) ? intval($value['year']) : 0,
-                    'month' => isset($value['month']) ? intval($value['month']) : 0,
-                    'day' => isset($value['day']) ? intval($value['day']) : 0,
-                    'hour' => isset($value['hour']) ? intval($value['hour']) : 0,
-                    'minute' => isset($value['minute']) ? intval($value['minute']) : 0,
+                    'year' => isset($value['year']) ? (int) $value['year'] : 0,
+                    'month' => isset($value['month']) ? (int) $value['month'] : 0,
+                    'day' => isset($value['day']) ? (int) $value['day'] : 0,
+                    'hour' => isset($value['hour']) ? (int) $value['hour'] : 0,
+                    'minute' => isset($value['minute']) ? (int) $value['minute'] : 0,
                     'day_part' => isset($value['day_part']) ? $value['day_part'] : '',
                     'date_internal' => isset($value['date_internal']) ? $value['date_internal'] : '',
                 ]
@@ -122,7 +123,10 @@ public function validateUserValue($values)
                 );
             } else {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please specify product\'s required option(s).')
+                    __(
+                        "The product's required option(s) weren't entered. "
+                        . "Make sure the options are entered and try again."
+                    )
                 );
             }
         } else {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 6b1b42b305bf9..c388be8b6f394 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -212,7 +212,9 @@ public function validateUserValue($values)
 
         $option = $this->getOption();
         if (!isset($values[$option->getId()]) && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         } elseif (isset($values[$option->getId()])) {
             $this->setUserValue($values[$option->getId()]);
             $this->setIsValid(true);
@@ -277,7 +279,7 @@ public function getFormattedOptionValue($optionValue)
      */
     public function getCustomizedView($optionInfo)
     {
-        return isset($optionInfo['value']) ? $optionInfo['value'] : $optionInfo;
+        return $optionInfo['value'] ?? $optionInfo;
     }
 
     /**
@@ -339,7 +341,7 @@ public function getOptionPrice($optionValue, $basePrice)
     {
         $option = $this->getOption();
 
-        return $this->_getChargableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
+        return $this->_getChargeableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
     }
 
     /**
@@ -393,14 +395,27 @@ public function getProductOptions()
     }
 
     /**
-     * Return final chargable price for option
-     *
      * @param float $price Price of option
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
+     * @deprecated 102.0.4 typo in method name
+     * @see _getChargeableOptionPrice
      */
     protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
+    {
+        return $this->_getChargeableOptionPrice($price, $isPercent, $basePrice);
+    }
+
+    /**
+     * Return final chargeable price for option
+     *
+     * @param float $price Price of option
+     * @param boolean $isPercent Price type - percent or fixed
+     * @param float $basePrice For percent price type
+     * @return float
+     */
+    protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
     {
         if ($isPercent) {
             return $basePrice * $price / 100;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index a7304c9b67bb2..9f1eae207e116 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -126,7 +127,7 @@ public function __construct(
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->validatorInfo = $validatorInfo;
         $this->validatorFile = $validatorFile;
-        $this->serializer = $serializer ? $serializer : ObjectManager::getInstance()->get(Json::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
         parent::__construct($checkoutSession, $scopeConfig, $data);
     }
 
@@ -255,7 +256,12 @@ public function validateUserValue($values)
         } catch (ProductException $e) {
             switch ($this->getProcessMode()) {
                 case \Magento\Catalog\Model\Product\Type\AbstractType::PROCESS_MODE_FULL:
-                    throw new LocalizedException(__('Please specify product\'s required option(s).'));
+                    throw new LocalizedException(
+                        __(
+                            "The product's required option(s) weren't entered. "
+                            . "Make sure the options are entered and try again."
+                        )
+                    );
                     break;
                 default:
                     $this->setUserValue(null);
@@ -367,7 +373,7 @@ protected function _getOptionHtml($optionValue)
                 $sizes
             );
         } catch (\Exception $e) {
-            throw new LocalizedException(__('The file options format is not valid.'));
+            throw new LocalizedException(__('The file options format is invalid. Use a correct format and try again.'));
         }
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php
new file mode 100644
index 0000000000000..c9afdf023b307
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Option\Type\File;
+
+/**
+ * Validator for existing (already saved) files.
+ */
+class ExistingValidate extends \Zend_Validate
+{
+    /**
+     * @inheritDoc
+     *
+     * @param string $value File's full path.
+     * @param string|null $originalName Original file's name (when uploaded).
+     */
+    public function isValid($value, string $originalName = null)
+    {
+        $this->_messages = [];
+        $this->_errors = [];
+
+        if (!is_string($value)) {
+            $this->_messages[] = __('Full file path is expected.')->render();
+            return false;
+        }
+
+        $result = true;
+        $fileInfo = null;
+        if ($originalName) {
+            $fileInfo = ['name' => $originalName];
+        }
+        foreach ($this->_validators as $element) {
+            $validator = $element['instance'];
+            if ($validator->isValid($value, $fileInfo)) {
+                continue;
+            }
+            $result = false;
+            $messages = $validator->getMessages();
+            $this->_messages = array_merge($this->_messages, $messages);
+            $this->_errors = array_merge($this->_errors, array_keys($messages));
+            if ($element['breakChainOnFailure']) {
+                break;
+            }
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
index 32c901afe8e74..a7add0ad87b89 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php
@@ -6,13 +6,18 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
+/**
+ * Class ValidateFactory. Creates Validator with type "ExistingValidate"
+ */
 class ValidateFactory
 {
     /**
+     * Main factory method
+     *
      * @return \Zend_Validate
      */
     public function create()
     {
-        return new \Zend_Validate();
+        return new ExistingValidate();
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
index 2c4b76d637d53..860010c3db08c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -102,7 +103,7 @@ protected function getValidatorErrors($errors, $fileInfo, $option)
                     break;
                 case \Zend_Validate_File_ImageSize::NOT_DETECTED:
                     $result[] = __(
-                        "The file '%1' is empty. Please choose another one",
+                        'The file "%1" is empty. Select another file and try again.',
                         $fileInfo['title']
                     );
                     break;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
index af6c4dba784f0..fef4999a1174a 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
@@ -10,8 +10,12 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Math\Random;
+use Magento\Framework\App\ObjectManager;
 
 /**
+ * Validator class. Represents logic for validation file given from product option
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ValidatorFile extends Validator
@@ -63,11 +67,19 @@ class ValidatorFile extends Validator
     protected $isImageValidator;
 
     /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * Constructor method
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\File\Size $fileSize
      * @param \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory
      * @param \Magento\Framework\Validator\File\IsImage $isImageValidator
+     * @param Random|null $random
      * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function __construct(
@@ -75,16 +87,21 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\File\Size $fileSize,
         \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory,
-        \Magento\Framework\Validator\File\IsImage $isImageValidator
+        \Magento\Framework\Validator\File\IsImage $isImageValidator,
+        Random $random = null
     ) {
         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->filesystem = $filesystem;
         $this->httpFactory = $httpFactory;
         $this->isImageValidator = $isImageValidator;
+        $this->random = $random
+            ?? ObjectManager::getInstance()->get(Random::class);
         parent::__construct($scopeConfig, $filesystem, $fileSize);
     }
 
     /**
+     * Setter method for the product
+     *
      * @param Product $product
      * @return $this
      */
@@ -95,6 +112,8 @@ public function setProduct(Product $product)
     }
 
     /**
+     * Validation method
+     *
      * @param \Magento\Framework\DataObject $processingParams
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return array
@@ -115,7 +134,10 @@ public function validate($processingParams, $option)
             $runValidation = $option->getIsRequire() || $upload->isUploaded($file);
             if (!$runValidation) {
                 throw new \Magento\Framework\Validator\Exception(
-                    __('Validation failed. Required options were not filled or the file was not uploaded.')
+                    __(
+                        'The validation failed. '
+                        . 'Make sure the required options are entered and the file is uploaded, then try again.'
+                    )
                 );
             }
 
@@ -128,10 +150,14 @@ public function validate($processingParams, $option)
             if ($this->validateContentLength()) {
                 $value = $this->fileSize->getMaxFileSizeInMb();
                 throw new LocalizedException(
-                    __('The file you uploaded is larger than %1 Megabytes allowed by server', $value)
+                    __(
+                        "The file was too big and couldn't be uploaded. "
+                        . "Use a file smaller than %1 MBs and try to upload again.",
+                        $value
+                    )
                 );
             } else {
-                throw new ProductException(__('Option required.'));
+                throw new ProductException(__("The required option wasn't entered. Enter the option and try again."));
             }
         }
 
@@ -147,16 +173,15 @@ public function validate($processingParams, $option)
         $userValue = [];
 
         if ($upload->isUploaded($file) && $upload->isValid($file)) {
-            $extension = pathinfo(strtolower($fileInfo['name']), PATHINFO_EXTENSION);
-
             $fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($fileInfo['name']);
-            $dispersion = \Magento\MediaStorage\Model\File\Uploader::getDispretionPath($fileName);
+            $dispersion = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
 
             $filePath = $dispersion;
 
             $tmpDirectory = $this->filesystem->getDirectoryRead(DirectoryList::SYS_TMP);
             $fileHash = md5($tmpDirectory->readFile($tmpDirectory->getRelativePath($fileInfo['tmp_name'])));
-            $filePath .= '/' . $fileHash . '.' . $extension;
+            $fileRandomName = $this->random->getRandomString(32);
+            $filePath .= '/' .$fileRandomName;
             $fileFullPath = $this->mediaDirectory->getAbsolutePath($this->quotePath . $filePath);
 
             $upload->addFilter(new \Zend_Filter_File_Rename(['target' => $fileFullPath, 'overwrite' => true]));
@@ -182,7 +207,7 @@ public function validate($processingParams, $option)
                         $imageSize = getimagesize($fileInfo['tmp_name']);
                     }
                 } else {
-                    throw new LocalizedException(__('The file is empty. Please choose another one'));
+                    throw new LocalizedException(__('The file is empty. Select another file and try again.'));
                 }
 
                 if (!empty($imageSize)) {
@@ -209,7 +234,9 @@ public function validate($processingParams, $option)
                 throw new LocalizedException(__(implode("\n", $errors)));
             }
         } else {
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         }
         return $userValue;
     }
@@ -234,6 +261,8 @@ protected function initFilesystem()
     }
 
     /**
+     * Validate contents length method
+     *
      * @return bool
      * @todo need correctly name
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
index 30c3de932c3e6..100ad37273cff 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
+/**
+ * Validator for existing files.
+ */
 class ValidatorInfo extends Validator
 {
     /**
@@ -34,6 +37,8 @@ class ValidatorInfo extends Validator
     protected $fileRelativePath;
 
     /**
+     * Construct method
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\File\Size $fileSize
@@ -53,6 +58,8 @@ public function __construct(
     }
 
     /**
+     * Setter method for property "useQuotePath"
+     *
      * @param mixed $useQuotePath
      * @return $this
      */
@@ -63,6 +70,8 @@ public function setUseQuotePath($useQuotePath)
     }
 
     /**
+     * Validate method for the option value depends on an option
+     *
      * @param array $optionValue
      * @param \Magento\Catalog\Model\Product\Option $option
      * @return bool
@@ -90,7 +99,7 @@ public function validate($optionValue, $option)
         }
 
         $result = false;
-        if ($validatorChain->isValid($this->fileFullPath)) {
+        if ($validatorChain->isValid($this->fileFullPath, $optionValue['title'])) {
             $result = $this->rootDirectory->isReadable($this->fileRelativePath)
                 && isset($optionValue['secret_key'])
                 && $this->buildSecretKey($this->fileRelativePath) == $optionValue['secret_key'];
@@ -102,13 +111,15 @@ public function validate($optionValue, $option)
             }
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Please specify product\'s required option(s).')
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
             );
         }
         return $result;
     }
 
     /**
+     * Method for creation secret key for the given file
+     *
      * @param string $fileRelativePath
      * @return string
      */
@@ -118,6 +129,8 @@ protected function buildSecretKey($fileRelativePath)
     }
 
     /**
+     * Calculates path for the file
+     *
      * @param array $optionValue
      * @return void
      */
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 78cce7bd76163..4a257a4781063 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -64,13 +65,21 @@ public function validateUserValue($values)
 
         if (empty($value) && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
             $this->setIsValid(false);
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         }
         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(__('Please specify product\'s required option(s).'));
+                throw new LocalizedException(
+                    __(
+                        "The product's required option(s) weren't entered. "
+                        . "Make sure the options are entered and try again."
+                    )
+                );
             }
         }
         return $this;
@@ -222,7 +231,7 @@ public function getOptionPrice($optionValue, $basePrice)
             foreach (explode(',', $optionValue) as $value) {
                 $_result = $option->getValueById($value);
                 if ($_result) {
-                    $result += $this->_getChargableOptionPrice(
+                    $result += $this->_getChargeableOptionPrice(
                         $_result->getPrice(),
                         $_result->getPriceType() == 'percent',
                         $basePrice
@@ -237,7 +246,7 @@ public function getOptionPrice($optionValue, $basePrice)
         } elseif ($this->_isSingleSelection()) {
             $_result = $option->getValueById($optionValue);
             if ($_result) {
-                $result = $this->_getChargableOptionPrice(
+                $result = $this->_getChargeableOptionPrice(
                     $_result->getPrice(),
                     $_result->getPriceType() == 'percent',
                     $basePrice
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
index 79ee37c51671d..9ffe75e513bce 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -60,14 +61,16 @@ public function validateUserValue($values)
         // Check requires option to have some value
         if (strlen($value) == 0 && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
             $this->setIsValid(false);
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         }
 
         // Check maximal length limit
         $maxCharacters = $option->getMaxCharacters();
         if ($maxCharacters > 0 && $this->string->strlen($value) > $maxCharacters) {
             $this->setIsValid(false);
-            throw new LocalizedException(__('The text is too long.'));
+            throw new LocalizedException(__('The text is too long. Shorten the text and try again.'));
         }
 
         $this->setUserValue($value);
@@ -81,7 +84,7 @@ public function validateUserValue($values)
      */
     public function prepareForCart()
     {
-        if ($this->getIsValid() && strlen($this->getUserValue()) > 0) {
+        if ($this->getIsValid() && ($this->getUserValue() !== '')) {
             return $this->getUserValue();
         } else {
             return null;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
index 1e5c7f76d829b..99d5016f5cdb9 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\Product\Option;
 use Zend_Validate_Exception;
 
+/**
+ * Product option default validator
+ */
 class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
@@ -106,7 +109,9 @@ protected function isValidOptionTitle($title, $storeId)
         if ($storeId > \Magento\Store\Model\Store::DEFAULT_STORE_ID && $title === null) {
             return true;
         }
-        if ($this->isEmpty($title)) {
+
+        // checking whether title is null and is empty string
+        if ($title === null || $title === '') {
             return false;
         }
 
@@ -132,7 +137,7 @@ protected function validateOptionType(Option $option)
      */
     protected function validateOptionValue(Option $option)
     {
-        return $this->isInRange($option->getPriceType(), $this->priceTypes) && !$this->isNegative($option->getPrice());
+        return $this->isInRange($option->getPriceType(), $this->priceTypes);
     }
 
     /**
@@ -166,6 +171,6 @@ protected function isInRange($value, array $range)
      */
     protected function isNegative($value)
     {
-        return intval($value) < 0;
+        return (int) $value < 0;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
index 1e00654249556..2256f031098f1 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
@@ -29,6 +29,6 @@ public function __construct(array $validators)
      */
     public function get($type)
     {
-        return isset($this->validators[$type]) ? $this->validators[$type] : $this->validators['default'];
+        return $this->validators[$type] ?? $this->validators['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
index f04ab497e1d4f..44756890b6ed7 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -83,7 +83,7 @@ protected function isValidOptionPrice($priceType, $price, $storeId)
         if (!$priceType && !$price) {
             return true;
         }
-        if (!$this->isInRange($priceType, $this->priceTypes) || $this->isNegative($price)) {
+        if (!$this->isInRange($priceType, $this->priceTypes)) {
             return false;
         }
 
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index fcfe5b0abccfe..ebbc060c99edf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Option;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator;
+use Magento\Catalog\Pricing\Price\RegularPrice;
 
 /**
  * Catalog product option select type model
@@ -18,6 +21,9 @@
  * @method \Magento\Catalog\Model\Product\Option\Value setOptionId(int $value)
  *
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - added use of constants instead of string literals:
+ *      BasePrice::PRICE_CODE - instead of 'base_price'
+ *      RegularPrice::PRICE_CODE - instead of 'regular_price'
  * @since 100.0.2
  */
 class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface
@@ -58,6 +64,11 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      */
     protected $_valueCollectionFactory;
 
+    /**
+     * @var CustomOptionPriceCalculator
+     */
+    private $customOptionPriceCalculator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -65,6 +76,7 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param CustomOptionPriceCalculator|null $customOptionPriceCalculator
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -72,9 +84,13 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory $valueCollectionFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        CustomOptionPriceCalculator $customOptionPriceCalculator = null
     ) {
         $this->_valueCollectionFactory = $valueCollectionFactory;
+        $this->customOptionPriceCalculator = $customOptionPriceCalculator
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
+
         parent::__construct(
             $context,
             $registry,
@@ -187,18 +203,15 @@ public function getProduct()
      */
     public function saveValues()
     {
+        $option = $this->getOption();
+
         foreach ($this->getValues() as $value) {
-            $this->setData(
-                $value
-            )->setData(
-                'option_id',
-                $this->getOption()->getId()
-            )->setData(
-                'store_id',
-                $this->getOption()->getStoreId()
-            );
-
-            if ($this->getData('is_delete') == '1') {
+            $this->isDeleted(false);
+            $this->setData($value)
+                ->setData('option_id', $option->getId())
+                ->setData('store_id', $option->getStoreId());
+
+            if ((bool) $this->getData('is_delete') === true) {
                 if ($this->getId()) {
                     $this->deleteValues($this->getId());
                     $this->delete();
@@ -207,7 +220,7 @@ public function saveValues()
                 $this->save();
             }
         }
-        //eof foreach()
+
         return $this;
     }
 
@@ -220,10 +233,8 @@ public function saveValues()
      */
     public function getPrice($flag = false)
     {
-        if ($flag && $this->getPriceType() == self::TYPE_PERCENT) {
-            $basePrice = $this->getOption()->getProduct()->getFinalPrice();
-            $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);
-            return $price;
+        if ($flag) {
+            return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, BasePrice::PRICE_CODE);
         }
         return $this->_getData(self::KEY_PRICE);
     }
@@ -235,13 +246,7 @@ public function getPrice($flag = false)
      */
     public function getRegularPrice()
     {
-        if ($this->getPriceType() == self::TYPE_PERCENT) {
-            $basePrice = $this->getOption()->getProduct()->getPriceInfo()
-                ->getPrice('regular_price')->getAmount()->getValue();
-            $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);
-            return $price;
-        }
-        return $this->_getData(self::KEY_PRICE);
+        return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, RegularPrice::PRICE_CODE);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Price/SpecialPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/SpecialPriceStorage.php
index 8f1e64e1b7a3a..83a2d1340794c 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/SpecialPriceStorage.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/SpecialPriceStorage.php
@@ -143,7 +143,7 @@ private function retrieveValidPrices(array $prices)
                 $this->validationResult->addFailedItem(
                     $key,
                     __(
-                        'Requested product doesn\'t exist. '
+                        'The product that was requested doesn\'t exist. Verify the product and try again. '
                         . 'Row ID: SKU = %SKU, Store ID: %storeId, Price From: %priceFrom, Price To: %priceTo.',
                         [
                             'SKU' => $price->getSku(),
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
index 3bb6bba69bfb4..3ee064670a460 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
@@ -97,7 +97,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get(array $skus)
     {
@@ -107,7 +107,7 @@ public function get(array $skus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function update(array $prices)
     {
@@ -128,7 +128,7 @@ public function update(array $prices)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function replace(array $prices)
     {
@@ -144,7 +144,7 @@ public function replace(array $prices)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(array $prices)
     {
@@ -171,14 +171,17 @@ private function getExistingPrices(array $skus, $groupBySku = false)
         $ids = $this->retrieveAffectedIds($skus);
         $rawPrices = $this->tierPricePersistence->get($ids);
         $prices = [];
-
-        foreach ($rawPrices as $rawPrice) {
-            $sku = $this->retrieveSkuById($rawPrice[$this->tierPricePersistence->getEntityLinkField()], $skus);
-            $price = $this->tierPriceFactory->create($rawPrice, $sku);
-            if ($groupBySku) {
-                $prices[$sku][] = $price;
-            } else {
-                $prices[] = $price;
+        if ($rawPrices) {
+            $linkField = $this->tierPricePersistence->getEntityLinkField();
+            $skuByIdLookup = $this->buildSkuByIdLookup($skus);
+            foreach ($rawPrices as $rawPrice) {
+                $sku = $skuByIdLookup[$rawPrice[$linkField]];
+                $price = $this->tierPriceFactory->create($rawPrice, $sku);
+                if ($groupBySku) {
+                    $prices[$sku][] = $price;
+                } else {
+                    $prices[] = $price;
+                }
             }
         }
 
@@ -300,21 +303,21 @@ private function isCorrectPriceValue(array $existingPrice, array $price)
     }
 
     /**
-     * Retrieve SKU by product ID.
+     * Generate lookup to retrieve SKU by product ID.
      *
-     * @param int $id
      * @param array $skus
-     * @return string|null
+     * @return array
      */
-    private function retrieveSkuById($id, $skus)
+    private function buildSkuByIdLookup($skus)
     {
+        $lookup = [];
         foreach ($this->productIdLocator->retrieveProductIdsBySkus($skus) as $sku => $ids) {
-            if (isset($ids[$id])) {
-                return $sku;
+            foreach (array_keys($ids) as $id) {
+                $lookup[$id] = $sku;
             }
         }
 
-        return null;
+        return $lookup;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier.php b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
index 4d81000501cff..c4d5bdfedcd5f 100644
--- a/app/code/Magento/Catalog/Model/Product/PriceModifier.php
+++ b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Product form price modifier
+ */
 class PriceModifier
 {
     /**
@@ -26,6 +29,8 @@ public function __construct(
     }
 
     /**
+     * Remove tier price
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param int|string $customerGroupId
      * @param int $qty
@@ -40,17 +45,17 @@ public function removeTierPrice(\Magento\Catalog\Model\Product $product, $custom
         $prices = $product->getData('tier_price');
         // verify if price exist
         if ($prices === null) {
-            throw new NoSuchEntityException(__('This product doesn\'t have tier price'));
+            throw new NoSuchEntityException(__('Tier price is unavailable for this product.'));
         }
         $tierPricesQty = count($prices);
 
         foreach ($prices as $key => $tierPrice) {
             if ($customerGroupId == 'all' && $tierPrice['price_qty'] == $qty
-                && $tierPrice['all_groups'] == 1 && intval($tierPrice['website_id']) === intval($websiteId)
+                && $tierPrice['all_groups'] == 1 && (int) $tierPrice['website_id'] === (int) $websiteId
             ) {
                 unset($prices[$key]);
             } elseif ($tierPrice['price_qty'] == $qty && $tierPrice['cust_group'] == $customerGroupId
-                && intval($tierPrice['website_id']) === intval($websiteId)
+                && (int) $tierPrice['website_id'] === (int) $websiteId
             ) {
                 unset($prices[$key]);
             }
@@ -69,7 +74,7 @@ public function removeTierPrice(\Magento\Catalog\Model\Product $product, $custom
         try {
             $this->productRepository->save($product);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Invalid data provided for tier_price'));
+            throw new CouldNotSaveException(__('The tier_price data is invalid. Verify the data and try again.'));
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 7a1926cf642ec..3ec8e968aa245 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -163,7 +163,7 @@ public function syncActions(array $productsData, $typeId)
 
         /**
          * Note that collection is also filtered by visitor id and customer id
-         * This collection shouldnt be flushed when visitor has products and then login
+         * This collection shouldn't be flushed when visitor has products and then login
          * It can remove only products for visitor, or only products for customer
          *
          * ['product_id' => 'added_at']
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
index c2046bea550e6..af0772251e235 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
@@ -102,6 +102,6 @@ public function getLimit()
     public function getCurrentPage()
     {
         $page = (int) $this->request->getParam(self::PAGE_PARM_NAME);
-        return $page ? $page : 1;
+        return $page ?: 1;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
new file mode 100644
index 0000000000000..9c1a781d594f7
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\ProductList;
+
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class ToolbarMemorizer
+ *
+ * Responds for saving toolbar settings to catalog session
+ */
+class ToolbarMemorizer
+{
+    /**
+     * XML PATH to enable/disable saving toolbar parameters to session
+     */
+    const XML_PATH_CATALOG_REMEMBER_PAGINATION = 'catalog/frontend/remember_pagination';
+
+    /**
+     * @var CatalogSession
+     */
+    private $catalogSession;
+
+    /**
+     * @var Toolbar
+     */
+    private $toolbarModel;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var string|bool
+     */
+    private $order;
+
+    /**
+     * @var string|bool
+     */
+    private $direction;
+
+    /**
+     * @var string|bool
+     */
+    private $mode;
+
+    /**
+     * @var string|bool
+     */
+    private $limit;
+
+    /**
+     * @var bool
+     */
+    private $isMemorizingAllowed;
+
+    /**
+     * @param Toolbar $toolbarModel
+     * @param CatalogSession $catalogSession
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        Toolbar $toolbarModel,
+        CatalogSession $catalogSession,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->toolbarModel = $toolbarModel;
+        $this->catalogSession = $catalogSession;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get sort order
+     *
+     * @return string|bool
+     */
+    public function getOrder()
+    {
+        if ($this->order === null) {
+            $this->order = $this->toolbarModel->getOrder() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::ORDER_PARAM_NAME) : null);
+        }
+        return $this->order;
+    }
+
+    /**
+     * Get sort direction
+     *
+     * @return string|bool
+     */
+    public function getDirection()
+    {
+        if ($this->direction === null) {
+            $this->direction = $this->toolbarModel->getDirection() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::DIRECTION_PARAM_NAME) : null);
+        }
+        return $this->direction;
+    }
+
+    /**
+     * Get sort mode
+     *
+     * @return string|bool
+     */
+    public function getMode()
+    {
+        if ($this->mode === null) {
+            $this->mode = $this->toolbarModel->getMode() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::MODE_PARAM_NAME) : null);
+        }
+        return $this->mode;
+    }
+
+    /**
+     * Get products per page limit
+     *
+     * @return string|bool
+     */
+    public function getLimit()
+    {
+        if ($this->limit === null) {
+            $this->limit = $this->toolbarModel->getLimit() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::LIMIT_PARAM_NAME) : null);
+        }
+        return $this->limit;
+    }
+
+    /**
+     * Method to save all catalog parameters in catalog session
+     *
+     * @return void
+     */
+    public function memorizeParams()
+    {
+        if (!$this->catalogSession->getParamsMemorizeDisabled() && $this->isMemorizingAllowed()) {
+            $this->memorizeParam(Toolbar::ORDER_PARAM_NAME, $this->getOrder())
+                ->memorizeParam(Toolbar::DIRECTION_PARAM_NAME, $this->getDirection())
+                ->memorizeParam(Toolbar::MODE_PARAM_NAME, $this->getMode())
+                ->memorizeParam(Toolbar::LIMIT_PARAM_NAME, $this->getLimit());
+        }
+    }
+
+    /**
+     * Check configuration for enabled/disabled toolbar memorizing
+     *
+     * @return bool
+     */
+    public function isMemorizingAllowed()
+    {
+        if ($this->isMemorizingAllowed === null) {
+            $this->isMemorizingAllowed = $this->scopeConfig->isSetFlag(self::XML_PATH_CATALOG_REMEMBER_PAGINATION);
+        }
+        return $this->isMemorizingAllowed;
+    }
+
+    /**
+     * Memorize parameter value for session
+     *
+     * @param string $param parameter name
+     * @param mixed $value parameter value
+     * @return $this
+     */
+    private function memorizeParam($param, $value)
+    {
+        if ($value && $this->catalogSession->getData($param) != $value) {
+            $this->catalogSession->setData($param, $value);
+        }
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/ScopedTierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/ScopedTierPriceManagement.php
index 9e2a79c05fee1..ca5b8038b327d 100644
--- a/app/code/Magento/Catalog/Model/Product/ScopedTierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/ScopedTierPriceManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
@@ -69,7 +70,7 @@ public function add($sku, ProductTierPriceInterface $tierPrice)
         try {
             $this->productRepository->save($product);
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\CouldNotSaveException(__('Could not save group price'));
+            throw new \Magento\Framework\Exception\CouldNotSaveException(__("The group price couldn't be saved."));
         }
         return true;
     }
@@ -126,7 +127,9 @@ private function validate(ProductTierPriceInterface $tierPrice)
         $data = ['qty' => $tierPrice->getQty(), 'price' => $tierPrice->getValue()];
         foreach ($data as $value) {
             if (!is_float($value) || $value <= 0) {
-                throw new \Magento\Framework\Exception\InputException(__('Please provide valid data'));
+                throw new \Magento\Framework\Exception\InputException(
+                    __('The data was invalid. Verify the data and try again.')
+                );
             }
         }
     }
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index 7cecd2f37bb84..f2da1e770279e 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Exception\TemporaryStateExceptionInterface;
 
 /**
+ * Product tier price management
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManagementInterface
@@ -82,14 +84,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function add($sku, $customerGroupId, $price, $qty)
     {
         if (!\Zend_Validate::is($price, 'Float') || $price <= 0 || !\Zend_Validate::is($qty, 'Float') || $qty <= 0) {
-            throw new InputException(__('Please provide valid data'));
+            throw new InputException(__('The data was invalid. Verify the data and try again.'));
         }
         $product = $this->productRepository->get($sku, ['edit_mode' => true]);
         $tierPrices = $product->getData('tier_price');
@@ -132,7 +134,7 @@ public function add($sku, $customerGroupId, $price, $qty)
         if (is_array($errors) && count($errors)) {
             $errorAttributeCodes = implode(', ', array_keys($errors));
             throw new InputException(
-                __('Values of following attributes are invalid: %1', $errorAttributeCodes)
+                __('Values in the %1 attributes are invalid. Verify the values and try again.', $errorAttributeCodes)
             );
         }
         try {
@@ -142,13 +144,13 @@ public function add($sku, $customerGroupId, $price, $qty)
                 // temporary state exception must be already localized
                 throw $e;
             }
-            throw new CouldNotSaveException(__('Could not save group price'));
+            throw new CouldNotSaveException(__("The group price couldn't be saved."));
         }
         return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function remove($sku, $customerGroupId, $qty)
     {
@@ -163,7 +165,7 @@ public function remove($sku, $customerGroupId, $qty)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku, $customerGroupId)
     {
@@ -181,7 +183,7 @@ public function getList($sku, $customerGroupId)
 
         $prices = [];
         foreach ($product->getData('tier_price') as $price) {
-            if ((is_numeric($customerGroupId) && intval($price['cust_group']) === intval($customerGroupId))
+            if ((is_numeric($customerGroupId) && (int) $price['cust_group'] === (int) $customerGroupId)
                 || ($customerGroupId === 'all' && $price['all_groups'])
             ) {
                 /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
index dc3971397acb2..4c973be20dee5 100644
--- a/app/code/Magento/Catalog/Model/Product/Type.php
+++ b/app/code/Magento/Catalog/Model/Product/Type.php
@@ -232,7 +232,7 @@ public function getOptions()
     public function getOptionText($optionId)
     {
         $options = $this->getOptionArray();
-        return isset($options[$optionId]) ? $options[$optionId] : null;
+        return $options[$optionId] ?? null;
     }
 
     /**
@@ -285,7 +285,7 @@ public function getTypesByPriority()
 
             $types = $this->getTypes();
             foreach ($types as $typeId => $typeInfo) {
-                $priority = isset($typeInfo['index_priority']) ? abs(intval($typeInfo['index_priority'])) : 0;
+                $priority = isset($typeInfo['index_priority']) ? abs((int) $typeInfo['index_priority']) : 0;
                 if (!empty($typeInfo['composite'])) {
                     $compositePriority[$typeId] = $priority;
                 } else {
@@ -307,7 +307,7 @@ public function getTypesByPriority()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toOptionArray()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 33ff3ecccd4dd..e6804d9246faa 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Type;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -251,7 +252,7 @@ public function getChildrenIds($parentId, $required = true)
     }
 
     /**
-     * Retrieve parent ids array by requered child
+     * Retrieve parent ids array by required child
      *
      * @param int|array $childId
      * @return array
@@ -291,13 +292,7 @@ public function attributesCompare($attributeOne, $attributeTwo)
         $sortOne = $attributeOne->getGroupSortPath() * 1000 + $attributeOne->getSortPath() * 0.0001;
         $sortTwo = $attributeTwo->getGroupSortPath() * 1000 + $attributeTwo->getSortPath() * 0.0001;
 
-        if ($sortOne > $sortTwo) {
-            return 1;
-        } elseif ($sortOne < $sortTwo) {
-            return -1;
-        }
-
-        return 0;
+        return $sortOne <=> $sortTwo;
     }
 
     /**
@@ -506,7 +501,7 @@ public function processFileQueue()
                             $rootDir->create($rootDir->getRelativePath($path));
                         } catch (\Magento\Framework\Exception\FileSystemException $e) {
                             throw new \Magento\Framework\Exception\LocalizedException(
-                                __('We can\'t create writeable directory "%1".', $path)
+                                __('We can\'t create the "%1" writeable directory.', $path)
                             );
                         }
 
@@ -519,7 +514,9 @@ public function processFileQueue()
                             if (isset($queueOptions['option'])) {
                                 $queueOptions['option']->setIsValid(false);
                             }
-                            throw new \Magento\Framework\Exception\LocalizedException(__('The file upload failed.'));
+                            throw new \Magento\Framework\Exception\LocalizedException(
+                                __('The file upload failed. Try to upload again.')
+                            );
                         }
                         $this->_fileStorageDb->saveFile($dst);
                         break;
@@ -535,7 +532,7 @@ public function processFileQueue()
 
     /**
      * Add file to File Queue
-     * @param array $queueOptions   Array of File Queue
+     * @param array $queueOptions Array of File Queue
      *                              (eg. ['operation'=>'move',
      *                                    'src_name'=>'filename',
      *                                    'dst_name'=>'filename2'])
@@ -564,7 +561,7 @@ protected function _isStrictProcessMode($processMode)
      */
     public function getSpecifyOptionMessage()
     {
-        return __('Please specify product\'s required option(s).');
+        return __("The product's required option(s) weren't entered. Make sure the options are entered and try again.");
     }
 
     /**
@@ -635,7 +632,7 @@ public function checkProductBuyState($product)
                     if (!$customOption || strlen($customOption->getValue()) == 0) {
                         $product->setSkipCheckRequiredOption(true);
                         throw new \Magento\Framework\Exception\LocalizedException(
-                            __('The product has required options.')
+                            __('The product has required options. Enter the options and try again.')
                         );
                     }
                 }
@@ -938,7 +935,7 @@ public function getForceChildItemQtyChanges($product)
      */
     public function prepareQuoteItemQty($qty, $product)
     {
-        return floatval($qty);
+        return (float)$qty;
     }
 
     /**
@@ -974,7 +971,7 @@ public function setConfig($config)
         }
 
         if (isset($config['can_use_qty_decimals'])) {
-            $this->_canUseQtyDecimals = (bool) $config['can_use_qty_decimals'];
+            $this->_canUseQtyDecimals = (bool)$config['can_use_qty_decimals'];
         }
 
         return $this;
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index aa28a3478ebf7..f6caa299d66d7 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -341,7 +341,7 @@ public function getTierPrice($qty, $product)
             }
         }
 
-        return $prices ? $prices : [];
+        return $prices ?: [];
     }
 
     /**
@@ -474,14 +474,15 @@ public function getTierPriceCount($product)
      *
      * @param   float $qty
      * @param   Product $product
+     *
      * @return  array|float
      */
-    public function getFormatedTierPrice($qty, $product)
+    public function getFormattedTierPrice($qty, $product)
     {
         $price = $product->getTierPrice($qty);
         if (is_array($price)) {
             foreach (array_keys($price) as $index) {
-                $price[$index]['formated_price'] = $this->priceCurrency->convertAndFormat(
+                $price[$index]['formatted_price'] = $this->priceCurrency->convertAndFormat(
                     $price[$index]['website_price']
                 );
             }
@@ -492,15 +493,45 @@ public function getFormatedTierPrice($qty, $product)
         return $price;
     }
 
+    /**
+     * Get formatted by currency tier price
+     *
+     * @param   float $qty
+     * @param   Product $product
+     *
+     * @return  array|float
+     *
+     * @deprecated
+     * @see getFormattedTierPrice()
+     */
+    public function getFormatedTierPrice($qty, $product)
+    {
+        return $this->getFormattedTierPrice($qty, $product);
+    }
+
+    /**
+     * Get formatted by currency product price
+     *
+     * @param   Product $product
+     * @return  array|float
+     */
+    public function getFormattedPrice($product)
+    {
+        return $this->priceCurrency->format($product->getFinalPrice());
+    }
+
     /**
      * Get formatted by currency product price
      *
      * @param   Product $product
      * @return  array || float
+     *
+     * @deprecated
+     * @see getFormattedPrice()
      */
     public function getFormatedPrice($product)
     {
-        return $this->priceCurrency->format($product->getFinalPrice());
+        return $this->getFormattedPrice($product);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index c291dc33fedab..f3ac9f55d1aea 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -7,6 +7,7 @@
 
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Product Url model
@@ -45,6 +46,11 @@ class Url extends \Magento\Framework\DataObject
      */
     protected $urlFinder;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\UrlFactory $urlFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -52,6 +58,7 @@ class Url extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param UrlFinderInterface $urlFinder
      * @param array $data
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Framework\UrlFactory $urlFactory,
@@ -59,7 +66,8 @@ public function __construct(
         \Magento\Framework\Filter\FilterManager $filter,
         \Magento\Framework\Session\SidResolverInterface $sidResolver,
         UrlFinderInterface $urlFinder,
-        array $data = []
+        array $data = [],
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($data);
         $this->urlFactory = $urlFactory;
@@ -67,16 +75,8 @@ public function __construct(
         $this->filter = $filter;
         $this->sidResolver = $sidResolver;
         $this->urlFinder = $urlFinder;
-    }
-
-    /**
-     * Retrieve URL Instance
-     *
-     * @return \Magento\Framework\UrlInterface
-     */
-    private function getUrlInstance()
-    {
-        return $this->urlFactory->create();
+        $this->scopeConfig = $scopeConfig ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -157,10 +157,19 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
                     UrlRewrite::ENTITY_TYPE => \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
                     UrlRewrite::STORE_ID => $storeId,
                 ];
+                $useCategories = $this->scopeConfig->getValue(
+                    \Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                );
+
                 if ($categoryId) {
                     $filterData[UrlRewrite::METADATA]['category_id'] = $categoryId;
+                } elseif (!$useCategories) {
+                    $filterData[UrlRewrite::METADATA]['category_id'] = '';
                 }
+
                 $rewrite = $this->urlFinder->findOneByData($filterData);
+
                 if ($rewrite) {
                     $requestPath = $rewrite->getRequestPath();
                     $product->setRequestPath($requestPath);
@@ -194,6 +203,7 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
             $routeParams['_query'] = [];
         }
 
-        return $this->getUrlInstance()->setScope($storeId)->getUrl($routePath, $routeParams);
+        $url = $this->urlFactory->create()->setScope($storeId);
+        return $url->getUrl($routePath, $routeParams);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php b/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php
index ad1ea248916fb..f43ff45b93efa 100644
--- a/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -66,7 +67,9 @@ public function get($groupId)
         $group = $this->groupFactory->create();
         $this->groupResource->load($group, $groupId);
         if (!$group->getId()) {
-            throw new NoSuchEntityException(__('Group with id "%1" does not exist.', $groupId));
+            throw new NoSuchEntityException(
+                __('The group with the "%1" ID doesn\'t exist. Verify the ID and try again.', $groupId)
+            );
         }
         return $group;
     }
@@ -90,7 +93,7 @@ public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
         /** @var \Magento\Catalog\Model\Product\Attribute\Group $group */
         if ($group->hasSystemAttributes()) {
             throw new StateException(
-                __('Attribute group that contains system attributes can not be deleted')
+                __("The attribute group can't be deleted because it contains system attributes.")
             );
         }
         return $this->groupRepository->delete($group);
diff --git a/app/code/Magento/Catalog/Model/ProductCategoryList.php b/app/code/Magento/Catalog/Model/ProductCategoryList.php
index ae875453be938..c3a88a505c516 100644
--- a/app/code/Magento/Catalog/Model/ProductCategoryList.php
+++ b/app/code/Magento/Catalog/Model/ProductCategoryList.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sql\UnionExpression;
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Provides info about product categories.
@@ -29,16 +31,32 @@ class ProductCategoryList
      */
     private $category;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * @param ResourceModel\Product $productResource
      * @param ResourceModel\Category $category
+     * @param StoreManagerInterface $storeManager
+     * @param TableMaintainer|null $tableMaintainer
      */
     public function __construct(
         ResourceModel\Product $productResource,
-        ResourceModel\Category $category
+        ResourceModel\Category $category,
+        StoreManagerInterface $storeManager = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->productResource = $productResource;
         $this->category = $category;
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -50,18 +68,22 @@ public function __construct(
     public function getCategoryIds($productId)
     {
         if (!isset($this->categoryIdList[$productId])) {
+            $unionTables[] = $this->getCategorySelect($productId, $this->category->getCategoryProductTable());
+            foreach ($this->storeManager->getStores() as $store) {
+                $unionTables[] = $this->getCategorySelect(
+                    $productId,
+                    $this->tableMaintainer->getMainTable($store->getId())
+                );
+            }
             $unionSelect = new UnionExpression(
-                [
-                    $this->getCategorySelect($productId, $this->category->getCategoryProductTable()),
-                    $this->getCategorySelect(
-                        $productId,
-                        $this->productResource->getTable(AbstractAction::MAIN_INDEX_TABLE)
-                    )
-                ],
+                $unionTables,
                 Select::SQL_UNION_ALL
             );
 
-            $this->categoryIdList[$productId] = $this->productResource->getConnection()->fetchCol($unionSelect);
+            $this->categoryIdList[$productId] = array_map(
+                'intval',
+                $this->productResource->getConnection()->fetchCol($unionSelect)
+            );
         }
 
         return $this->categoryIdList[$productId];
diff --git a/app/code/Magento/Catalog/Model/ProductIdLocator.php b/app/code/Magento/Catalog/Model/ProductIdLocator.php
index 2d9af6829ad6e..2d382164f2649 100644
--- a/app/code/Magento/Catalog/Model/ProductIdLocator.php
+++ b/app/code/Magento/Catalog/Model/ProductIdLocator.php
@@ -37,23 +37,43 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
      */
     private $idsBySku = [];
 
+    /**
+     * Batch size to iterate collection
+     *
+     * @var int
+     */
+    private $batchSize;
+
     /**
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
-     * @param string $limitIdsBySkuValues
+     * @param string $idsLimit
+     * @param int $batchSize defines how many items can be processed by one iteration
      */
     public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory,
-        $idsLimit
+        $idsLimit,
+        int $batchSize = 5000
     ) {
         $this->metadataPool = $metadataPool;
         $this->collectionFactory = $collectionFactory;
         $this->idsLimit = (int)$idsLimit;
+        $this->batchSize = $batchSize;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
+     * Load product items by provided products SKUs.
+     * Products collection will be iterated by pages with the $this->batchSize as a page size (for a cases when to many
+     * products SKUs were provided in parameters.
+     * Loaded products will be chached in the $this->idsBySku variable, but in the end of the method these storage will
+     * be truncated to $idsLimit quantity.
+     * As a result array with the products data will be returned with the following scheme:
+     * $data['product_sku']['link_field_value' => 'product_type']
+     *
+     * @throws \Exception
      */
     public function retrieveProductIdsBySkus(array $skus)
     {
@@ -72,8 +92,16 @@ public function retrieveProductIdsBySkus(array $skus)
             $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
                 ->getLinkField();
 
-            foreach ($collection as $item) {
-                $this->idsBySku[strtolower(trim($item->getSku()))][$item->getData($linkField)] = $item->getTypeId();
+            $collection->setPageSize($this->batchSize);
+            $pages = $collection->getLastPageNumber();
+            for ($currentPage = 1; $currentPage <= $pages; $currentPage++) {
+                $collection->setCurPage($currentPage);
+                foreach ($collection->getItems() as $item) {
+                    $sku = strtolower(trim($item->getSku()));
+                    $itemIdentifier = $item->getData($linkField);
+                    $this->idsBySku[$sku][$itemIdentifier] = $item->getTypeId();
+                }
+                $collection->clear();
             }
         }
 
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
index b635d854c9e2b..b96aff148e750 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\ProductLink\Converter\ConverterPool;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Provides a collection of linked product items (crosssells, related, upsells, ...)
+ */
 class CollectionProvider
 {
     /**
@@ -42,27 +45,25 @@ public function __construct(ConverterPool $converterPool, array $providers = [])
     public function getCollection(\Magento\Catalog\Model\Product $product, $type)
     {
         if (!isset($this->providers[$type])) {
-            throw new NoSuchEntityException(__('Collection provider is not registered'));
+            throw new NoSuchEntityException(__("The collection provider isn't registered."));
         }
 
         $products = $this->providers[$type]->getLinkedProducts($product);
         $converter = $this->converterPool->getConverter($type);
-        $output = [];
         $sorterItems = [];
         foreach ($products as $item) {
-            $output[$item->getId()] = $converter->convert($item);
+            $itemId = $item->getId();
+            $sorterItems[$itemId] = $converter->convert($item);
+            $sorterItems[$itemId]['position'] = $sorterItems[$itemId]['position'] ?? 0;
         }
 
-        foreach ($output as $item) {
-            $itemPosition = $item['position'];
-            if (!isset($sorterItems[$itemPosition])) {
-                $sorterItems[$itemPosition] = $item;
-            } else {
-                $newPosition = $itemPosition + 1;
-                $sorterItems[$newPosition] = $item;
-            }
-        }
-        ksort($sorterItems);
+        usort($sorterItems, function ($itemA, $itemB) {
+            $posA = (int)$itemA['position'];
+            $posB = (int)$itemB['position'];
+
+            return $posA <=> $posB;
+        });
+
         return $sorterItems;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Management.php b/app/code/Magento/Catalog/Model/ProductLink/Management.php
index 18950b74eca65..066549274b07c 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Management.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Management.php
@@ -45,7 +45,9 @@ public function getLinkedItemsByType($sku, $type)
         $linkTypes = $this->linkTypeProvider->getLinkTypes();
 
         if (!isset($linkTypes[$type])) {
-            throw new NoSuchEntityException(__('Unknown link type: %1', (string)$type));
+            throw new NoSuchEntityException(
+                __('The "%1" link type is unknown. Verify the type and try again.', (string)$type)
+            );
         }
         $product = $this->productRepository->get($sku);
         $links = $product->getProductLinks();
@@ -76,7 +78,7 @@ public function setProductLinks($sku, array $items)
                 }
                 if (!isset($linkTypes[$type])) {
                     throw new NoSuchEntityException(
-                        __('Provided link type "%1" does not exist', $type)
+                        __('The "%1" link type wasn\'t found. Verify the type and try again.', $type)
                     );
                 }
             }
@@ -101,7 +103,7 @@ public function setProductLinks($sku, array $items)
         try {
             $this->productRepository->save($product);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Invalid data provided for linked products'));
+            throw new CouldNotSaveException(__('The linked products data is invalid. Verify the data and try again.'));
         }
 
         return true;
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Repository.php b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
index f8dee9216ddcf..98977de7effaf 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Repository.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
 use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks as LinksInitializer;
 use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -137,7 +138,7 @@ public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
                 $linkTypesToId[$entity->getLinkType()]
             );
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Invalid data provided for linked products'));
+            throw new CouldNotSaveException(__('The linked products data is invalid. Verify the data and try again.'));
         }
         return true;
     }
@@ -170,7 +171,7 @@ public function getList(\Magento\Catalog\Api\Data\ProductInterface $product)
                     foreach ($item['custom_attributes'] as $option) {
                         $name = $option['attribute_code'];
                         $value = $option['value'];
-                        $setterName = 'set'.ucfirst($name);
+                        $setterName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($name);
                         // Check if setter exists
                         if (method_exists($productLinkExtension, $setterName)) {
                             call_user_func([$productLinkExtension, $setterName], $value);
@@ -212,7 +213,7 @@ public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
         try {
             $this->getLinkResource()->deleteProductLink($linkId);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Invalid data provided for linked products'));
+            throw new CouldNotSaveException(__('The linked products data is invalid. Verify the data and try again.'));
         }
         return true;
     }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Search.php b/app/code/Magento/Catalog/Model/ProductLink/Search.php
new file mode 100644
index 0000000000000..8750345aa222b
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/Search.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ProductLink;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/** Returns collection of product visible in catalog by search key */
+class Search
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var \Magento\Ui\DataProvider\AddFilterToCollectionInterface[]
+     */
+    private $filter;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Visibility
+     */
+    private $catalogVisibility;
+
+    /**
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\Catalog\Model\Product\Visibility $catalogVisibility
+     * @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface $filter
+     */
+    public function __construct(
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
+        \Magento\Catalog\Model\Product\Visibility $catalogVisibility,
+        \Magento\Ui\DataProvider\AddFilterToCollectionInterface $filter
+    ) {
+        $this->productCollectionFactory = $productCollectionFactory;
+        $this->filter = $filter;
+        $this->catalogVisibility = $catalogVisibility;
+    }
+
+    /**
+     * Add required filters and limitations for product collection
+     *
+     * @param string $searchKey
+     * @param int $pageNum
+     * @param int $limit
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     */
+    public function prepareCollection(
+        string $searchKey,
+        int $pageNum,
+        int $limit
+    ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addAttributeToSelect(ProductInterface::NAME);
+        $productCollection->setVisibility($this->catalogVisibility->getVisibleInCatalogIds());
+        $productCollection->setPage($pageNum, $limit);
+        $this->filter->addFilter($productCollection, 'fulltext', ['fulltext' => $searchKey]);
+        $productCollection->setPage($pageNum, $limit);
+        return $productCollection;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
index e814dc03cf37f..d124bf5e42639 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -4,11 +4,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\Data\ProductExtension;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\Api\ImageContentValidatorInterface;
@@ -17,14 +20,17 @@
 use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\DB\Adapter\DeadlockException;
 use Magento\Framework\DB\Adapter\LockWaitException;
+use Magento\Framework\EntityManager\Operation\Read\ReadExtensions;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryState\CouldNotSaveException as TemporaryCouldNotSaveException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\ValidatorException;
 
 /**
+ * Product Repository.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -150,6 +156,11 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     private $serializer;
 
+    /**
+     * @var ReadExtensions
+     */
+    private $readExtensions;
+
     /**
      * ProductRepository constructor.
      * @param ProductFactory $productFactory
@@ -175,6 +186,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      * @param CollectionProcessorInterface $collectionProcessor [optional]
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param int $cacheLimit [optional]
+     * @param ReadExtensions|null $readExtensions
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -201,7 +213,8 @@ public function __construct(
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
         CollectionProcessorInterface $collectionProcessor = null,
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        $cacheLimit = 1000
+        $cacheLimit = 1000,
+        ReadExtensions $readExtensions = null
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
@@ -224,20 +237,25 @@ public function __construct(
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->cacheLimit = (int)$cacheLimit;
+        $this->readExtensions = $readExtensions ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ReadExtensions::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($sku, $editMode = false, $storeId = null, $forceReload = false)
     {
         $cacheKey = $this->getCacheKey([$editMode, $storeId]);
-        if (!isset($this->instances[$sku][$cacheKey]) || $forceReload) {
+        $cachedProduct = $this->getProductFromLocalCache($sku, $cacheKey);
+        if ($cachedProduct === null || $forceReload) {
             $product = $this->productFactory->create();
 
             $productId = $this->resourceModel->getIdBySku($sku);
             if (!$productId) {
-                throw new NoSuchEntityException(__('Requested product doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The product that was requested doesn't exist. Verify the product and try again.")
+                );
             }
             if ($editMode) {
                 $product->setData('_edit_mode', true);
@@ -247,15 +265,14 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
             }
             $product->load($productId);
             $this->cacheProduct($cacheKey, $product);
+            $cachedProduct = $product;
         }
-        if (!isset($this->instances[$sku])) {
-            $sku = trim($sku);
-        }
-        return $this->instances[$sku][$cacheKey];
+
+        return $cachedProduct;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getById($productId, $editMode = false, $storeId = null, $forceReload = false)
     {
@@ -270,7 +287,9 @@ public function getById($productId, $editMode = false, $storeId = null, $forceRe
             }
             $product->load($productId);
             if (!$product->getId()) {
-                throw new NoSuchEntityException(__('Requested product doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The product that was requested doesn't exist. Verify the product and try again.")
+                );
             }
             $this->cacheProduct($cacheKey, $product);
         }
@@ -301,13 +320,13 @@ protected function getCacheKey($data)
      * Add product to internal cache and truncate cache if it has more than cacheLimit elements.
      *
      * @param string $cacheKey
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param ProductInterface $product
      * @return void
      */
-    private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterface $product)
+    private function cacheProduct($cacheKey, ProductInterface $product)
     {
         $this->instancesById[$product->getId()][$cacheKey] = $product;
-        $this->instances[$product->getSku()][$cacheKey] = $product;
+        $this->saveProductInLocalCache($product, $cacheKey);
 
         if ($this->cacheLimit && count($this->instances) > $this->cacheLimit) {
             $offset = round($this->cacheLimit / -2);
@@ -321,7 +340,7 @@ private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterf
      *
      * @param array $productData
      * @param bool $createNew
-     * @return \Magento\Catalog\Api\Data\ProductInterface|Product
+     * @return ProductInterface|Product
      * @throws NoSuchEntityException
      */
     protected function initializeProductData(array $productData, $createNew)
@@ -329,48 +348,39 @@ protected function initializeProductData(array $productData, $createNew)
         unset($productData['media_gallery']);
         if ($createNew) {
             $product = $this->productFactory->create();
-            if ($this->storeManager->hasSingleStore()) {
-                $product->setWebsiteIds([$this->storeManager->getStore(true)->getWebsiteId()]);
-            }
+            $this->assignProductToWebsites($product);
         } else {
-            unset($this->instances[$productData['sku']]);
+            $this->removeProductFromLocalCache($productData['sku']);
             $product = $this->get($productData['sku']);
         }
 
         foreach ($productData as $key => $value) {
             $product->setData($key, $value);
         }
-        $this->assignProductToWebsites($product, $createNew);
 
         return $product;
     }
 
     /**
+     * Assign product to websites.
+     *
      * @param \Magento\Catalog\Model\Product $product
-     * @param bool $createNew
      * @return void
      */
-    private function assignProductToWebsites(\Magento\Catalog\Model\Product $product, $createNew)
+    private function assignProductToWebsites(\Magento\Catalog\Model\Product $product)
     {
-        $websiteIds = $product->getWebsiteIds();
-
-        if (!$this->storeManager->hasSingleStore()) {
-            $websiteIds = array_unique(
-                array_merge(
-                    $websiteIds,
-                    [$this->storeManager->getStore()->getWebsiteId()]
-                )
-            );
-        }
-
-        if ($createNew && $this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {
+        if ($this->storeManager->getStore(true)->getCode() == \Magento\Store\Model\Store::ADMIN_CODE) {
             $websiteIds = array_keys($this->storeManager->getWebsites());
+        } else {
+            $websiteIds = [$this->storeManager->getStore()->getWebsiteId()];
         }
 
         $product->setWebsiteIds($websiteIds);
     }
 
     /**
+     * Process new gallery media entry.
+     *
      * @param ProductInterface $product
      * @param array $newEntry
      * @return $this
@@ -393,7 +403,9 @@ protected function processNewMediaGalleryEntry(
         $tmpFilePath = $mediaConfig->getTmpMediaShortUrl($relativeFilePath);
 
         if (!$product->hasGalleryAttribute()) {
-            throw new StateException(__('Requested product does not support images.'));
+            throw new StateException(
+                __("The product that was requested doesn't exist. Verify the product and try again.")
+            );
         }
 
         $imageFileUri = $this->getMediaGalleryProcessor()->addImage(
@@ -420,12 +432,12 @@ protected function processNewMediaGalleryEntry(
     /**
      * Process product links, creating new links, updating and deleting existing links
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param ProductInterface $product
      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $newLinks
      * @return $this
      * @throws NoSuchEntityException
      */
-    private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $product, $newLinks)
+    private function processLinks(ProductInterface $product, $newLinks)
     {
         if ($newLinks === null) {
             // If product links were not specified, don't do anything
@@ -460,7 +472,7 @@ private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $produc
                     $linkedSku = $link->getLinkedProductSku();
                     if (!isset($linkedProductIds[$linkedSku])) {
                         throw new NoSuchEntityException(
-                            __('Product with SKU "%1" does not exist', $linkedSku)
+                            __('The Product with the "%1" SKU doesn\'t exist.', $linkedSku)
                         );
                     }
                     $linkDataArray['product_id'] = $linkedProductIds[$linkedSku];
@@ -520,19 +532,20 @@ protected function processMediaGallery(ProductInterface $product, $mediaGalleryE
             $newEntries = $mediaGalleryEntries;
         }
 
+        $images = (array)$product->getMediaGallery('images');
+        $images = $this->determineImageRoles($product, $images);
+
         $this->getMediaGalleryProcessor()->clearMediaAttribute($product, array_keys($product->getMediaAttributes()));
-        $images = $product->getMediaGallery('images');
-        if ($images) {
-            foreach ($images as $image) {
-                if (!isset($image['removed']) && !empty($image['types'])) {
-                    $this->getMediaGalleryProcessor()->setMediaAttribute($product, $image['types'], $image['file']);
-                }
+
+        foreach ($images as $image) {
+            if (!isset($image['removed']) && !empty($image['types'])) {
+                $this->getMediaGalleryProcessor()->setMediaAttribute($product, $image['types'], $image['file']);
             }
         }
 
         foreach ($newEntries as $newEntry) {
             if (!isset($newEntry['content'])) {
-                throw new InputException(__('The image content is not valid.'));
+                throw new InputException(__('The image content is invalid. Verify the content and try again.'));
             }
             /** @var ImageContentInterface $contentDataObject */
             $contentDataObject = $this->contentFactory->create()
@@ -553,11 +566,11 @@ protected function processMediaGallery(ProductInterface $product, $mediaGalleryE
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveOptions = false)
+    public function save(ProductInterface $product, $saveOptions = false)
     {
         $tierPrices = $product->getData('tier_price');
 
@@ -571,12 +584,18 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             if (!$product->hasData(Product::STATUS)) {
                 $product->setStatus($existingProduct->getStatus());
             }
+
+            /** @var ProductExtension $extensionAttributes */
+            $extensionAttributes = $product->getExtensionAttributes();
+            if (empty($extensionAttributes->__toArray())) {
+                $product->setExtensionAttributes($existingProduct->getExtensionAttributes());
+            }
         } catch (NoSuchEntityException $e) {
             $existingProduct = null;
         }
 
         $productDataArray = $this->extensibleDataObjectConverter
-            ->toNestedArray($product, [], \Magento\Catalog\Api\Data\ProductInterface::class);
+            ->toNestedArray($product, [], ProductInterface::class);
         $productDataArray = array_replace($productDataArray, $product->getData());
         $ignoreLinksFlag = $product->getData('ignore_links_flag');
         $productLinks = null;
@@ -602,74 +621,43 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             );
         }
 
-        try {
-            if ($tierPrices !== null) {
-                $product->setData('tier_price', $tierPrices);
-            }
-            unset($this->instances[$product->getSku()]);
-            unset($this->instancesById[$product->getId()]);
-            $this->resourceModel->save($product);
-        } catch (ConnectionException $exception) {
-            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
-                __('Database connection error'),
-                $exception,
-                $exception->getCode()
-            );
-        } catch (DeadlockException $exception) {
-            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
-                __('Database deadlock found when trying to get lock'),
-                $exception,
-                $exception->getCode()
-            );
-        } catch (LockWaitException $exception) {
-            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
-                __('Database lock wait timeout exceeded'),
-                $exception,
-                $exception->getCode()
-            );
-        } catch (\Magento\Eav\Model\Entity\Attribute\Exception $exception) {
-            throw \Magento\Framework\Exception\InputException::invalidFieldValue(
-                $exception->getAttributeCode(),
-                $product->getData($exception->getAttributeCode()),
-                $exception
-            );
-        } catch (ValidatorException $e) {
-            throw new CouldNotSaveException(__($e->getMessage()));
-        } catch (LocalizedException $e) {
-            throw $e;
-        } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\CouldNotSaveException(__('Unable to save product'), $e);
+        if ($tierPrices !== null) {
+            $product->setData('tier_price', $tierPrices);
         }
-        unset($this->instances[$product->getSku()]);
+
+        $this->saveProduct($product);
+        $this->removeProductFromLocalCache($product->getSku());
         unset($this->instancesById[$product->getId()]);
+
         return $this->get($product->getSku(), false, $product->getStoreId());
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function delete(\Magento\Catalog\Api\Data\ProductInterface $product)
+    public function delete(ProductInterface $product)
     {
         $sku = $product->getSku();
         $productId = $product->getId();
         try {
-            unset($this->instances[$product->getSku()]);
+            $this->removeProductFromLocalCache($product->getSku());
             unset($this->instancesById[$product->getId()]);
             $this->resourceModel->delete($product);
         } catch (ValidatorException $e) {
             throw new CouldNotSaveException(__($e->getMessage()));
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\StateException(
-                __('Unable to remove product %1', $sku)
+                __('The "%1" product couldn\'t be removed.', $sku)
             );
         }
-        unset($this->instances[$sku]);
+        $this->removeProductFromLocalCache($sku);
         unset($this->instancesById[$productId]);
+
         return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($sku)
     {
@@ -678,7 +666,7 @@ public function deleteById($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -695,6 +683,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $collection->load();
 
         $collection->addCategoryIds();
+        $this->addExtensionAttributes($collection);
         $searchResult = $this->searchResultsFactory->create();
         $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setItems($collection->getItems());
@@ -705,7 +694,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
                 $this->getCacheKey(
                     [
                         false,
-                        $product->hasData(\Magento\Catalog\Model\Product::STORE_ID) ? $product->getStoreId() : null
+                        $product->getStoreId()
                     ]
                 ),
                 $product
@@ -715,6 +704,20 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         return $searchResult;
     }
 
+    /**
+     * Add extension attributes to loaded items.
+     *
+     * @param Collection $collection
+     * @return Collection
+     */
+    private function addExtensionAttributes(Collection $collection) : Collection
+    {
+        foreach ($collection->getItems() as $item) {
+            $this->readExtensions->execute($item);
+        }
+        return $collection;
+    }
+
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
@@ -730,7 +733,7 @@ protected function addFilterGroupToCollection(
         $fields = [];
         $categoryFilter = [];
         foreach ($filterGroup->getFilters() as $filter) {
-            $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+            $conditionType = $filter->getConditionType() ?: 'eq';
 
             if ($filter->getField() == 'category_id') {
                 $categoryFilter[$conditionType][] = $filter->getValue();
@@ -760,6 +763,34 @@ public function cleanCache()
     }
 
     /**
+     * Ascertain image roles, if they are not set against the gallery entries
+     *
+     * @param ProductInterface $product
+     * @param array $images
+     * @return array
+     */
+    private function determineImageRoles(ProductInterface $product, array $images) : array
+    {
+        $imagesWithRoles = [];
+        foreach ($images as $image) {
+            if (!isset($image['types'])) {
+                $image['types'] = [];
+                if (isset($image['file'])) {
+                    foreach (array_keys($product->getMediaAttributes()) as $attribute) {
+                        if ($image['file'] == $product->getData($attribute)) {
+                            $image['types'][] = $attribute;
+                        }
+                    }
+                }
+            }
+            $imagesWithRoles[] = $image;
+        }
+        return $imagesWithRoles;
+    }
+
+    /**
+     * Retrieve media gallery processor.
+     *
      * @return Product\Gallery\Processor
      */
     private function getMediaGalleryProcessor()
@@ -786,4 +817,105 @@ private function getCollectionProcessor()
         }
         return $this->collectionProcessor;
     }
+
+    /**
+     * Gets product from the local cache by SKU.
+     *
+     * @param string $sku
+     * @param string $cacheKey
+     * @return Product|null
+     */
+    private function getProductFromLocalCache(string $sku, string $cacheKey)
+    {
+        $preparedSku = $this->prepareSku($sku);
+
+        return $this->instances[$preparedSku][$cacheKey] ?? null;
+    }
+
+    /**
+     * Removes product in the local cache.
+     *
+     * @param string $sku
+     * @return void
+     */
+    private function removeProductFromLocalCache(string $sku) :void
+    {
+        $preparedSku = $this->prepareSku($sku);
+        unset($this->instances[$preparedSku]);
+    }
+
+    /**
+     * Saves product in the local cache.
+     *
+     * @param Product $product
+     * @param string $cacheKey
+     * @return void
+     */
+    private function saveProductInLocalCache(Product $product, string $cacheKey) : void
+    {
+        $preparedSku = $this->prepareSku($product->getSku());
+        $this->instances[$preparedSku][$cacheKey] = $product;
+    }
+
+    /**
+     * Converts SKU to lower case and trims.
+     *
+     * @param string $sku
+     * @return string
+     */
+    private function prepareSku(string $sku): string
+    {
+        return mb_strtolower(trim($sku));
+    }
+
+    /**
+     * Save product resource model.
+     *
+     * @param ProductInterface|Product $product
+     * @throws TemporaryCouldNotSaveException
+     * @throws InputException
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     */
+    private function saveProduct($product): void
+    {
+        try {
+            $this->removeProductFromLocalCache($product->getSku());
+            unset($this->instancesById[$product->getId()]);
+            $this->resourceModel->save($product);
+        } catch (ConnectionException $exception) {
+            throw new TemporaryCouldNotSaveException(
+                __('Database connection error'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (DeadlockException $exception) {
+            throw new TemporaryCouldNotSaveException(
+                __('Database deadlock found when trying to get lock'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (LockWaitException $exception) {
+            throw new TemporaryCouldNotSaveException(
+                __('Database lock wait timeout exceeded'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (AttributeException $exception) {
+            throw InputException::invalidFieldValue(
+                $exception->getAttributeCode(),
+                $product->getData($exception->getAttributeCode()),
+                $exception
+            );
+        } catch (ValidatorException $e) {
+            throw new CouldNotSaveException(__($e->getMessage()));
+        } catch (LocalizedException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(
+                __('The product was unable to be saved. Please try again.'),
+                $e
+            );
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index a97a3dcdd2164..b9e629912a5b3 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -78,7 +78,7 @@ public function getDefaultStoreId()
      */
     protected function _isApplicableAttribute($object, $attribute)
     {
-        $applyTo = $attribute->getApplyTo();
+        $applyTo = $attribute->getApplyTo() ?: [];
         return (count($applyTo) == 0 || in_array($object->getTypeId(), $applyTo))
             && $attribute->isInSet($object->getAttributeSetId());
     }
@@ -180,7 +180,10 @@ protected function _prepareLoadSelect(array $selects)
     protected function _saveAttributeValue($object, $attribute, $value)
     {
         $connection = $this->getConnection();
-        $storeId = (int) $this->_storeManager->getStore($object->getStoreId())->getId();
+        $hasSingleStore = $this->_storeManager->hasSingleStore();
+        $storeId = $hasSingleStore
+            ? $this->getDefaultStoreId()
+            : (int) $this->_storeManager->getStore($object->getStoreId())->getId();
         $table = $attribute->getBackend()->getTable();
 
         /**
@@ -189,15 +192,18 @@ protected function _saveAttributeValue($object, $attribute, $value)
          * In this case we clear all not default values
          */
         $entityIdField = $this->getLinkField();
-        if ($this->_storeManager->hasSingleStore()) {
-            $storeId = $this->getDefaultStoreId();
+        $conditions = [
+            'attribute_id = ?' => $attribute->getAttributeId(),
+            "{$entityIdField} = ?" => $object->getData($entityIdField),
+            'store_id <> ?' => $storeId
+        ];
+        if ($hasSingleStore
+            && !$object->isObjectNew()
+            && $this->isAttributePresentForNonDefaultStore($attribute, $conditions)
+        ) {
             $connection->delete(
                 $table,
-                [
-                    'attribute_id = ?' => $attribute->getAttributeId(),
-                    "{$entityIdField} = ?" => $object->getData($entityIdField),
-                    'store_id <> ?' => $storeId
-                ]
+                $conditions
             );
         }
 
@@ -236,6 +242,27 @@ protected function _saveAttributeValue($object, $attribute, $value)
         return $this;
     }
 
+    /**
+     * Check if attribute present for non default Store View.
+     * Prevent "delete" query locking in a case when nothing to delete
+     *
+     * @param AbstractAttribute $attribute
+     * @param array $conditions
+     *
+     * @return boolean
+     */
+    private function isAttributePresentForNonDefaultStore($attribute, $conditions)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()->from($attribute->getBackend()->getTable());
+        foreach ($conditions as $condition => $conditionValue) {
+            $select->where($condition, $conditionValue);
+        }
+        $select->limit(1);
+
+        return !empty($connection->fetchRow($select));
+    }
+
     /**
      * Insert entity attribute value
      *
@@ -571,8 +598,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         }
 
         if (is_array($attributesData) && sizeof($attributesData) == 1) {
-            $_data = each($attributesData);
-            $attributesData = $_data[1];
+            $attributesData = array_shift($attributesData);
         }
 
         return $attributesData === false ? false : $attributesData;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
index bdb3cdab617ac..8457e5d0eaa5c 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
@@ -141,19 +141,17 @@ public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
                     ->getMetadata(ProductInterface::class)
                     ->getLinkField();
 
-                $select = $this->getConnection()->select()->from(
-                    $attribute->getEntity()->getEntityTable(),
-                    $linkField
-                )->where(
-                    'attribute_set_id = ?',
-                    $result['attribute_set_id']
-                );
+                $backendLinkField = $attribute->getBackend()->getEntityIdField();
 
-                $clearCondition = [
-                    'attribute_id =?' => $attribute->getId(),
-                    $linkField . ' IN (?)' => $select,
-                ];
-                $this->getConnection()->delete($backendTable, $clearCondition);
+                $select = $this->getConnection()->select()
+                    ->from(['b' => $backendTable])
+                    ->join(
+                        ['e' => $attribute->getEntity()->getEntityTable()],
+                        "b.$backendLinkField = e.$linkField"
+                    )->where('b.attribute_id = ?', $attribute->getId())
+                    ->where('e.attribute_set_id = ?', $result['attribute_set_id']);
+
+                $this->getConnection()->query($select->deleteFromSelect('b'));
             }
         }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index a9c705697b268..90f55cd44bdb9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -11,9 +11,13 @@
  */
 namespace Magento\Catalog\Model\ResourceModel;
 
+use Magento\Catalog\Model\Indexer\Category\Product\Processor;
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
 
 /**
+ * Resource model for category entity
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Category extends AbstractResource
@@ -82,6 +86,11 @@ class Category extends AbstractResource
      */
     protected $aggregateCount;
 
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
     /**
      * Category constructor.
      * @param \Magento\Eav\Model\Entity\Context $context
@@ -90,6 +99,7 @@ class Category extends AbstractResource
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param Category\TreeFactory $categoryTreeFactory
      * @param Category\CollectionFactory $categoryCollectionFactory
+     * @param Processor $indexerProcessor
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      */
@@ -100,6 +110,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryTreeFactory,
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+        Processor $indexerProcessor,
         $data = [],
         \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
@@ -113,6 +124,7 @@ public function __construct(
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_eventManager = $eventManager;
         $this->connectionName  = 'catalog';
+        $this->indexerProcessor = $indexerProcessor;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
@@ -197,6 +209,18 @@ protected function _beforeDelete(\Magento\Framework\DataObject $object)
         $this->deleteChildren($object);
     }
 
+    /**
+     * Mark Category indexer as invalid to be picked up by cron.
+     *
+     * @param DataObject $object
+     * @return $this
+     */
+    protected function _afterDelete(DataObject $object)
+    {
+        $this->indexerProcessor->markIndexerAsInvalid();
+        return parent::_afterDelete($object);
+    }
+
     /**
      * Delete children categories of specific category
      *
@@ -227,7 +251,8 @@ public function deleteChildren(\Magento\Framework\DataObject $object)
 
     /**
      * Process category data before saving
-     * prepare path and increment children count for parent categories
+     *
+     * Prepare path and increment children count for parent categories
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
@@ -276,7 +301,8 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
 
     /**
      * Process category data after save category object
-     * save related products ids and update path value
+     *
+     * Save related products ids and update path value
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
@@ -410,9 +436,18 @@ protected function _saveCategoryProducts($category)
          * Update product positions in category
          */
         if (!empty($update)) {
+            $newPositions = [];
             foreach ($update as $productId => $position) {
-                $where = ['category_id = ?' => (int)$id, 'product_id = ?' => (int)$productId];
-                $bind = ['position' => (int)$position];
+                $delta = $position - $oldProducts[$productId];
+                if (!isset($newPositions[$delta])) {
+                    $newPositions[$delta] = [];
+                }
+                $newPositions[$delta][] = $productId;
+            }
+
+            foreach ($newPositions as $delta => $productIds) {
+                $bind = ['position' => new \Zend_Db_Expr("position + ({$delta})")];
+                $where = ['category_id = ?' => (int)$id, 'product_id IN (?)' => $productIds];
                 $connection->update($this->getCategoryProductTable(), $bind, $where);
             }
         }
@@ -423,6 +458,8 @@ protected function _saveCategoryProducts($category)
                 'catalog_category_change_products',
                 ['category' => $category, 'product_ids' => $productIds]
             );
+
+            $category->setChangedProductIds($productIds);
         }
 
         if (!empty($insert) || !empty($update) || !empty($delete)) {
@@ -449,15 +486,27 @@ public function getProductsPosition($category)
             $this->getCategoryProductTable(),
             ['product_id', 'position']
         )->where(
-            'category_id = :category_id'
+            "{$this->getTable('catalog_category_product')}.category_id = ?",
+            $category->getId()
         );
+        $websiteId = $category->getStore()->getWebsiteId();
+        if ($websiteId) {
+            $select->join(
+                ['product_website' => $this->getTable('catalog_product_website')],
+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
+                []
+            )->where(
+                'product_website.website_id = ?',
+                $websiteId
+            );
+        }
         $bind = ['category_id' => (int)$category->getId()];
 
         return $this->getConnection()->fetchPairs($select, $bind);
     }
 
     /**
-     * Get chlden categories count
+     * Get children categories count
      *
      * @param int $categoryId
      * @return int
@@ -631,7 +680,7 @@ public function getProductCount($category)
         $bind = ['category_id' => (int)$category->getId()];
         $counts = $this->getConnection()->fetchOne($select, $bind);
 
-        return intval($counts);
+        return (int) $counts;
     }
 
     /**
@@ -829,6 +878,7 @@ public function isInRootCategoryList($category)
 
     /**
      * Check category is forbidden to delete.
+     *
      * If category is root and assigned to store group return false
      *
      * @param integer $categoryId
@@ -885,7 +935,7 @@ public function changeParent(
         $childrenCount = $this->getChildrenCount($category->getId()) + 1;
         $table = $this->getEntityTable();
         $connection = $this->getConnection();
-        $levelFiled = $connection->quoteIdentifier('level');
+        $levelField = $connection->quoteIdentifier('level');
         $pathField = $connection->quoteIdentifier('path');
 
         /**
@@ -925,7 +975,7 @@ public function changeParent(
                         $newPath . '/'
                     ) . ')'
                 ),
-                'level' => new \Zend_Db_Expr($levelFiled . ' + ' . $levelDisposition)
+                'level' => new \Zend_Db_Expr($levelField . ' + ' . $levelDisposition)
             ],
             [$pathField . ' LIKE ?' => $category->getPath() . '/%']
         );
@@ -949,6 +999,7 @@ public function changeParent(
 
     /**
      * Process positions of old parent category children and new parent category children.
+     *
      * Get position for moved category
      *
      * @param \Magento\Catalog\Model\Category $category
@@ -1029,7 +1080,7 @@ public function load($object, $entityId, $attributes = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($object)
     {
@@ -1055,6 +1106,8 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
+     * Returns EntityManager object
+     *
      * @return EntityManager
      */
     private function getEntityManager()
@@ -1067,6 +1120,8 @@ private function getEntityManager()
     }
 
     /**
+     * Returns AggregateCount object
+     *
      * @return Category\AggregateCount
      */
     private function getAggregateCount()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
index eed1ab136cce1..618abda0a942d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -6,12 +6,15 @@
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Category resource collection
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
@@ -58,6 +61,61 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      */
     protected $_loadWithProductCount = false;
 
+    /**
+     * Core store config
+     *
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Constructor
+     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
+     * @param \Magento\Eav\Model\ResourceModel\Helper $resourceHelper
+     * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Eav\Model\EntityFactory $eavEntityFactory,
+        \Magento\Eav\Model\ResourceModel\Helper $resourceHelper,
+        \Magento\Framework\Validator\UniversalFactory $universalFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
+    ) {
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $eavConfig,
+            $resource,
+            $eavEntityFactory,
+            $resourceHelper,
+            $universalFactory,
+            $storeManager,
+            $connection
+        );
+        $this->scopeConfig = $scopeConfig ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+    }
+
     /**
      * Init collection and determine table names
      *
@@ -265,9 +323,7 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
                         'main_table.category_id=e.entity_id',
                         []
                     )->where(
-                        'e.entity_id = :entity_id'
-                    )->orWhere(
-                        'e.path LIKE :c_path'
+                        '(e.entity_id = :entity_id OR e.path LIKE :c_path)'
                     );
                     if ($websiteId) {
                         $select->join(
@@ -313,7 +369,7 @@ public function joinUrlRewrite()
             ['request_path'],
             sprintf(
                 '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = %d AND {{table}}.entity_type = \'%s\'',
-                $this->_storeManager->getStore()->getId(),
+                $this->getStoreId(),
                 CategoryUrlRewriteGenerator::ENTITY_TYPE
             ),
             'left'
@@ -404,6 +460,23 @@ public function addRootLevelFilter()
         return $this;
     }
 
+    /**
+     * Add navigation max depth filter
+     *
+     * @return $this
+     */
+    public function addNavigationMaxDepthFilter()
+    {
+        $navigationMaxDepth = (int)$this->scopeConfig->getValue(
+            'catalog/navigation/max_depth',
+            ScopeInterface::SCOPE_STORE
+        );
+        if ($navigationMaxDepth > 0) {
+            $this->addLevelFilter($navigationMaxDepth);
+        }
+        return $this;
+    }
+
     /**
      * Add order field
      *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index d7f8bd9d789a2..05950531e2178 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -173,7 +173,7 @@ public function getMainTable()
     public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
     {
         if (is_string($storeId)) {
-            $storeId = intval($storeId);
+            $storeId = (int) $storeId;
         }
 
         if ($storeId) {
@@ -602,9 +602,10 @@ public function isInRootCategoryList($category)
      * @param \Magento\Catalog\Model\Category $category
      * @param bool $recursive
      * @param bool $isActive
+     * @param bool $sortByPosition
      * @return array
      */
-    public function getChildren($category, $recursive = true, $isActive = true)
+    public function getChildren($category, $recursive = true, $isActive = true, $sortByPosition = false)
     {
         $select = $this->getConnection()->select()->from(
             $this->getMainStoreTable($category->getStoreId()),
@@ -619,6 +620,9 @@ public function getChildren($category, $recursive = true, $isActive = true)
         if ($isActive) {
             $select->where('is_active = ?', '1');
         }
+        if ($sortByPosition) {
+            $select->order('position ASC');
+        }
         $_categories = $this->getConnection()->fetchAll($select);
         $categoriesIds = [];
         foreach ($_categories as $_category) {
@@ -695,8 +699,20 @@ public function getProductsPosition($category)
             $this->getTable('catalog_category_product'),
             ['product_id', 'position']
         )->where(
-            'category_id = :category_id'
+            "{$this->getTable('catalog_category_product')}.category_id = ?",
+            $category->getId()
         );
+        $websiteId = $category->getStore()->getWebsiteId();
+        if ($websiteId) {
+            $select->join(
+                ['product_website' => $this->getTable('catalog_product_website')],
+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
+                []
+            )->where(
+                'product_website.website_id = ?',
+                $websiteId
+            );
+        }
         $bind = ['category_id' => (int)$category->getId()];
 
         return $this->getConnection()->fetchPairs($select, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
index 3b3005f1ce65a..03e33365b776b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
@@ -12,11 +12,13 @@
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Catalog category flat collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
@@ -48,12 +50,20 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected $_storeId;
 
+    /**
+     * Core store config
+     *
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param Logger $logger
      * @param FetchStrategyInterface $fetchStrategy
      * @param ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param AbstractDb $resource
      */
@@ -63,10 +73,12 @@ public function __construct(
         FetchStrategyInterface $fetchStrategy,
         ManagerInterface $eventManager,
         StoreManagerInterface $storeManager,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         AbstractDb $resource = null
     ) {
         $this->_storeManager = $storeManager;
+        $this->scopeConfig = $scopeConfig;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
     }
 
@@ -387,4 +399,21 @@ public function setPage($pageNum, $pageSize)
         $this->setCurPage($pageNum)->setPageSize($pageSize);
         return $this;
     }
+
+    /**
+     * Add navigation max depth filter
+     *
+     * @return $this
+     */
+    public function addNavigationMaxDepthFilter()
+    {
+        $navigationMaxDepth = (int)$this->scopeConfig->getValue(
+            'catalog/navigation/max_depth',
+            ScopeInterface::SCOPE_STORE
+        );
+        if ($navigationMaxDepth > 0) {
+            $this->addLevelFilter($navigationMaxDepth);
+        }
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php
new file mode 100644
index 0000000000000..fc476ab6ff286
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\ResourceModel\Category;
+
+/**
+ * Factory class for state dependent category collection
+ */
+class StateDependentCollectionFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Catalog category flat state
+     *
+     * @var \Magento\Catalog\Model\Indexer\Category\Flat\State
+     */
+    private $catalogCategoryFlatState;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param \Magento\Catalog\Model\Indexer\Category\Flat\State $catalogCategoryFlatState
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        \Magento\Catalog\Model\Indexer\Category\Flat\State $catalogCategoryFlatState
+    ) {
+        $this->objectManager = $objectManager;
+        $this->catalogCategoryFlatState = $catalogCategoryFlatState;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\Data\Collection\AbstractDb
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create(
+            ($this->catalogCategoryFlatState->isAvailable()) ? Flat\Collection::class : Collection::class,
+            $data
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
index 0d8c3992ddbb8..9ab863cde2704 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
@@ -140,7 +140,7 @@ public function getDefaultStoreId()
      *
      * @param string $table
      * @param array|int $attributeIds
-     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
+     * @return \Magento\Framework\DB\Select
      */
     protected function _getLoadAttributesSelect($table, $attributeIds = [])
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Model/ResourceModel/Config.php
index 7fb13265cd130..7b5d4e09a3599 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Config.php
@@ -149,8 +149,7 @@ public function getAttributesUsedForSortBy()
             ['main_table' => $this->getTable('eav_attribute')]
         )->join(
             ['additional_table' => $this->getTable('catalog_eav_attribute')],
-            'main_table.attribute_id = additional_table.attribute_id',
-            []
+            'main_table.attribute_id = additional_table.attribute_id'
         )->joinLeft(
             ['al' => $this->getTable('eav_attribute_label')],
             'al.attribute_id = main_table.attribute_id AND al.store_id = ' . $this->getStoreId(),
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 90b206e5a6091..707ebbb2964cc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -21,7 +21,6 @@
  * @method int setSearchWeight(int $value)
  * @method bool getIsUsedForPriceRules()
  * @method int setIsUsedForPriceRules(int $value)
- * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -80,6 +79,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      */
     protected $_indexerEavProcessor;
 
+    /**
+     * @var \Magento\Eav\Api\Data\AttributeExtensionFactory
+     */
+    private $eavAttributeFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -96,14 +100,15 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Catalog\Model\Product\ReservedAttributeList $reservedAttributeList
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productFlatIndexerHelper
      * @param LockValidatorInterface $lockValidator
-     * @param DateTimeFormatterInterface $dateTimeFormatter
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param \Magento\Eav\Api\Data\AttributeExtensionFactory|null $eavAttributeFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -129,12 +134,15 @@ public function __construct(
         LockValidatorInterface $lockValidator,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Eav\Api\Data\AttributeExtensionFactory $eavAttributeFactory = null
     ) {
         $this->_indexerEavProcessor = $indexerEavProcessor;
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->_productFlatIndexerHelper = $productFlatIndexerHelper;
         $this->attrLockValidator = $lockValidator;
+        $this->eavAttributeFactory = $eavAttributeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Eav\Api\Data\AttributeExtensionFactory::class);
         parent::__construct(
             $context,
             $registry,
@@ -159,6 +167,8 @@ public function __construct(
     }
 
     /**
+     * Init model
+     *
      * @return void
      */
     protected function _construct()
@@ -230,6 +240,16 @@ public function afterSave()
         return parent::afterSave();
     }
 
+    /**
+     * Is attribute enabled for flat indexing
+     *
+     * @return bool
+     */
+    public function isEnabledInFlat()
+    {
+        return $this->_isEnabledInFlat();
+    }
+
     /**
      * Is attribute enabled for flat indexing
      *
@@ -237,11 +257,11 @@ public function afterSave()
      */
     protected function _isEnabledInFlat()
     {
-        return $this->getData('backend_type') == 'static'
+        return $this->_getData('backend_type') == 'static'
         || $this->_productFlatIndexerHelper->isAddFilterableAttributes()
-        && $this->getData('is_filterable') > 0
-        || $this->getData('used_in_product_listing') == 1
-        || $this->getData('used_for_sort_by') == 1;
+        && $this->_getData('is_filterable') > 0
+        || $this->_getData('used_in_product_listing') == 1
+        || $this->_getData('used_for_sort_by') == 1;
     }
 
     /**
@@ -339,11 +359,12 @@ public function getStoreId()
         if ($dataObject) {
             return $dataObject->getStoreId();
         }
-        return $this->getData('store_id');
+        return $this->_getData('store_id');
     }
 
     /**
      * Retrieve apply to products array
+     *
      * Return empty array if applied to all products
      *
      * @return string[]
@@ -364,7 +385,7 @@ public function getApplyTo()
      */
     public function getSourceModel()
     {
-        $model = $this->getData('source_model');
+        $model = $this->_getData('source_model');
         if (empty($model)) {
             if ($this->getBackendType() == 'int' && $this->getFrontendInput() == 'select') {
                 return $this->_getDefaultSourceModel();
@@ -460,7 +481,7 @@ protected function _isOriginalIndexable()
         $backendType = $this->getOrigData('backend_type');
         $frontendInput = $this->getOrigData('frontend_input');
 
-        if ($backendType == 'int' && $frontendInput == 'select') {
+        if ($backendType == 'int' && ($frontendInput == 'select' || $frontendInput == 'boolean')) {
             return true;
         } elseif ($backendType == 'varchar' && $frontendInput == 'multiselect') {
             return true;
@@ -489,138 +510,138 @@ public function getIndexType()
     }
 
     /**
+     * @inheritdoc
      * @codeCoverageIgnoreStart
-     * {@inheritdoc}
      */
     public function getIsWysiwygEnabled()
     {
-        return $this->getData(self::IS_WYSIWYG_ENABLED);
+        return $this->_getData(self::IS_WYSIWYG_ENABLED);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsHtmlAllowedOnFront()
     {
-        return $this->getData(self::IS_HTML_ALLOWED_ON_FRONT);
+        return $this->_getData(self::IS_HTML_ALLOWED_ON_FRONT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUsedForSortBy()
     {
-        return $this->getData(self::USED_FOR_SORT_BY);
+        return $this->_getData(self::USED_FOR_SORT_BY);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsFilterable()
     {
-        return $this->getData(self::IS_FILTERABLE);
+        return $this->_getData(self::IS_FILTERABLE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsFilterableInSearch()
     {
-        return $this->getData(self::IS_FILTERABLE_IN_SEARCH);
+        return $this->_getData(self::IS_FILTERABLE_IN_SEARCH);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsUsedInGrid()
     {
-        return (bool)$this->getData(self::IS_USED_IN_GRID);
+        return (bool)$this->_getData(self::IS_USED_IN_GRID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsVisibleInGrid()
     {
-        return (bool)$this->getData(self::IS_VISIBLE_IN_GRID);
+        return (bool)$this->_getData(self::IS_VISIBLE_IN_GRID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsFilterableInGrid()
     {
-        return (bool)$this->getData(self::IS_FILTERABLE_IN_GRID);
+        return (bool)$this->_getData(self::IS_FILTERABLE_IN_GRID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPosition()
     {
-        return $this->getData(self::POSITION);
+        return $this->_getData(self::POSITION);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsSearchable()
     {
-        return $this->getData(self::IS_SEARCHABLE);
+        return $this->_getData(self::IS_SEARCHABLE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsVisibleInAdvancedSearch()
     {
-        return $this->getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
+        return $this->_getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsComparable()
     {
-        return $this->getData(self::IS_COMPARABLE);
+        return $this->_getData(self::IS_COMPARABLE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsUsedForPromoRules()
     {
-        return $this->getData(self::IS_USED_FOR_PROMO_RULES);
+        return $this->_getData(self::IS_USED_FOR_PROMO_RULES);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsVisibleOnFront()
     {
-        return $this->getData(self::IS_VISIBLE_ON_FRONT);
+        return $this->_getData(self::IS_VISIBLE_ON_FRONT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUsedInProductListing()
     {
-        return $this->getData(self::USED_IN_PRODUCT_LISTING);
+        return $this->_getData(self::USED_IN_PRODUCT_LISTING);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsVisible()
     {
-        return $this->getData(self::IS_VISIBLE);
+        return $this->_getData(self::IS_VISIBLE);
     }
 
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getScope()
     {
@@ -702,7 +723,7 @@ public function setPosition($position)
     /**
      * Set apply to value for the element
      *
-     * @param string []|string
+     * @param string[]|string $applyTo
      * @return $this
      */
     public function setApplyTo($applyTo)
@@ -811,7 +832,7 @@ public function setScope($scope)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function afterDelete()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
index bed129e19168f..585da2af529a4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
@@ -5,6 +5,15 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Layer\Filter;
 
+use Magento\Framework\App\Http\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Context as CustomerContext;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
 /**
  * Catalog Layer Price Filter resource model
  *
@@ -41,6 +50,21 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     private $storeManager;
 
+    /**
+     * @var IndexScopeResolverInterface|null
+     */
+    private $priceTableResolver;
+
+    /**
+     * @var Context
+     */
+    private $httpContext;
+
+    /**
+     * @var DimensionFactory|null
+     */
+    private $dimensionFactory;
+
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -48,6 +72,9 @@ class Price extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Customer\Model\Session $session
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param null $connectionName
+     * @param IndexScopeResolverInterface|null $priceTableResolver
+     * @param Context|null $httpContext
+     * @param DimensionFactory|null $dimensionFactory
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -55,12 +82,19 @@ public function __construct(
         \Magento\Catalog\Model\Layer\Resolver $layerResolver,
         \Magento\Customer\Model\Session $session,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        $connectionName = null
+        $connectionName = null,
+        IndexScopeResolverInterface $priceTableResolver = null,
+        Context $httpContext = null,
+        DimensionFactory $dimensionFactory = null
     ) {
         $this->layer = $layerResolver->get();
         $this->session = $session;
         $this->storeManager = $storeManager;
         $this->_eventManager = $eventManager;
+        $this->priceTableResolver = $priceTableResolver
+            ?? ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+        $this->httpContext = $httpContext ?? ObjectManager::getInstance()->get(Context::class);
+        $this->dimensionFactory = $dimensionFactory ?? ObjectManager::getInstance()->get(DimensionFactory::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -78,7 +112,7 @@ public function getCount($range)
         /**
          * Check and set correct variable values to prevent SQL-injections
          */
-        $range = floatval($range);
+        $range = (float)$range;
         if ($range == 0) {
             $range = 1;
         }
@@ -118,11 +152,8 @@ protected function _getSelect()
 
         // remove join with main table
         $fromPart = $select->getPart(\Magento\Framework\DB\Select::FROM);
-        if (!isset(
-            $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::INDEX_TABLE_ALIAS]
-        ) || !isset(
-            $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::MAIN_TABLE_ALIAS]
-        )
+        if (!isset($fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::INDEX_TABLE_ALIAS]) ||
+            !isset($fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::MAIN_TABLE_ALIAS])
         ) {
             return $select;
         }
@@ -376,6 +407,30 @@ protected function _construct()
         $this->_init('catalog_product_index_price', 'entity_id');
     }
 
+    /**
+     * {@inheritdoc}
+     * @return string
+     */
+    public function getMainTable()
+    {
+        $storeKey = $this->httpContext->getValue(StoreManagerInterface::CONTEXT_STORE);
+        $priceTableName = $this->priceTableResolver->resolve(
+            'catalog_product_index_price',
+            [
+                $this->dimensionFactory->create(
+                    WebsiteDimensionProvider::DIMENSION_NAME,
+                    (string)$this->storeManager->getStore($storeKey)->getWebsiteId()
+                ),
+                $this->dimensionFactory->create(
+                    CustomerGroupDimensionProvider::DIMENSION_NAME,
+                    (string)$this->httpContext->getValue(CustomerContext::CONTEXT_GROUP)
+                )
+            ]
+        );
+
+        return $this->getTable($priceTableName);
+    }
+
     /**
      * Retrieve joined price index table alias
      *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index a5fdc264aa19a..d71ec23881982 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Product entity resource model
@@ -83,6 +84,11 @@ class Product extends AbstractResource
      */
     private $productCategoryLink;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -94,6 +100,7 @@ class Product extends AbstractResource
      * @param \Magento\Eav\Model\Entity\TypeFactory $typeFactory
      * @param \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes
      * @param array $data
+     * @param TableMaintainer|null $tableMaintainer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -107,7 +114,8 @@ public function __construct(
         \Magento\Eav\Model\Entity\Attribute\SetFactory $setFactory,
         \Magento\Eav\Model\Entity\TypeFactory $typeFactory,
         \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes,
-        $data = []
+        $data = [],
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
@@ -122,6 +130,7 @@ public function __construct(
             $data
         );
         $this->connectionName  = 'catalog';
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -366,22 +375,42 @@ public function getAvailableInCategories($object)
         // fetching all parent IDs, including those are higher on the tree
         $entityId = (int)$object->getEntityId();
         if (!isset($this->availableCategoryIdsCache[$entityId])) {
-            $this->availableCategoryIdsCache[$entityId] = $this->getConnection()->fetchCol(
-                $this->getConnection()->select()->distinct()->from(
-                    $this->getTable('catalog_category_product_index'),
-                    ['category_id']
-                )->where(
-                    'product_id = ? AND is_parent = 1',
-                    $entityId
-                )->where(
-                    'visibility != ?',
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
-                )
+            foreach ($this->_storeManager->getStores() as $store) {
+                $unionTables[] = $this->getAvailableInCategoriesSelect(
+                    $entityId,
+                    $this->tableMaintainer->getMainTable($store->getId())
+                );
+            }
+            $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
+                $unionTables,
+                \Magento\Framework\DB\Select::SQL_UNION_ALL
             );
+            $this->availableCategoryIdsCache[$entityId] = array_unique($this->getConnection()->fetchCol($unionSelect));
         }
         return $this->availableCategoryIdsCache[$entityId];
     }
 
+    /**
+     * Returns DB select for available categories.
+     *
+     * @param int $entityId
+     * @param string $tableName
+     * @return \Magento\Framework\DB\Select
+     */
+    private function getAvailableInCategoriesSelect($entityId, $tableName)
+    {
+        return $this->getConnection()->select()->distinct()->from(
+            $tableName,
+            ['category_id']
+        )->where(
+            'product_id = ? AND is_parent = 1',
+            $entityId
+        )->where(
+            'visibility != ?',
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
+        );
+    }
+
     /**
      * Get default attribute source model
      *
@@ -402,7 +431,7 @@ public function getDefaultAttributeSourceModel()
     public function canBeShowInCategory($product, $categoryId)
     {
         $select = $this->getConnection()->select()->from(
-            $this->getTable('catalog_category_product_index'),
+            $this->tableMaintainer->getMainTable($product->getStoreId()),
             'product_id'
         )->where(
             'product_id = ?',
@@ -505,11 +534,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/BaseSelectProcessorInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
index d97f6bebf4e91..da3c4fb4417f2 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface BaseSelectProcessorInterface
+ *
  * @api
  * @since 101.0.3
  */
@@ -20,6 +21,8 @@ interface BaseSelectProcessorInterface
     const PRODUCT_TABLE_ALIAS = 'child';
 
     /**
+     * Process the select statement
+     *
      * @param Select $select
      * @return Select
      * @since 101.0.3
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
index 6e2642d09910a..cf5760b0c33a9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
@@ -83,15 +83,18 @@ public function saveCategoryLinks(ProductInterface $product, array $categoryLink
         $insertUpdate = $this->processCategoryLinks($categoryLinks, $oldCategoryLinks);
         $deleteUpdate = $this->processCategoryLinks($oldCategoryLinks, $categoryLinks);
 
-        list($delete, $insert) = $this->analyseUpdatedLinks($deleteUpdate, $insertUpdate);
+        list($delete, $insert, $update) = $this->analyseUpdatedLinks($deleteUpdate, $insertUpdate);
 
         return array_merge(
-            $this->updateCategoryLinks($product, $insert),
-            $this->deleteCategoryLinks($product, $delete)
+            $this->deleteCategoryLinks($product, $delete),
+            $this->updateCategoryLinks($product, $insert, true),
+            $this->updateCategoryLinks($product, $update)
         );
     }
 
     /**
+     * Get category link metadata
+     *
      * @return \Magento\Framework\EntityManager\EntityMetadataInterface
      */
     private function getCategoryLinkMetadata()
@@ -113,16 +116,22 @@ private function getCategoryLinkMetadata()
     private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositions)
     {
         $result = ['changed' => [], 'updated' => []];
+
+        $oldCategoryPositions = array_values($oldCategoryPositions);
         foreach ($newCategoryPositions as $newCategoryPosition) {
-            $key = array_search(
-                $newCategoryPosition['category_id'],
-                array_column($oldCategoryPositions, 'category_id')
-            );
+            $key = false;
+
+            foreach ($oldCategoryPositions as $oldKey => $oldCategoryPosition) {
+                if ((int)$oldCategoryPosition['category_id'] === (int)$newCategoryPosition['category_id']) {
+                    $key = $oldKey;
+                    break;
+                }
+            }
 
             if ($key === false) {
                 $result['changed'][] = $newCategoryPosition;
             } elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
-                $result['updated'][] = $newCategoryPositions[$key];
+                $result['updated'][] = $newCategoryPosition;
                 unset($oldCategoryPositions[$key]);
             }
         }
@@ -131,18 +140,19 @@ private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositi
     }
 
     /**
+     * Update category links
+     *
      * @param ProductInterface $product
      * @param array $insertLinks
+     * @param bool $insert
      * @return array
      */
-    private function updateCategoryLinks(ProductInterface $product, array $insertLinks)
+    private function updateCategoryLinks(ProductInterface $product, array $insertLinks, $insert = false)
     {
         if (empty($insertLinks)) {
             return [];
         }
 
-        $connection = $this->resourceConnection->getConnection();
-
         $data = [];
         foreach ($insertLinks as $categoryLink) {
             $data[] = [
@@ -153,17 +163,30 @@ private function updateCategoryLinks(ProductInterface $product, array $insertLin
         }
 
         if ($data) {
-            $connection->insertOnDuplicate(
-                $this->getCategoryLinkMetadata()->getEntityTable(),
-                $data,
-                ['position']
-            );
+            $connection = $this->resourceConnection->getConnection();
+            if ($insert) {
+                $connection->insertArray(
+                    $this->getCategoryLinkMetadata()->getEntityTable(),
+                    array_keys($data[0]),
+                    $data,
+                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_IGNORE
+                );
+            } else {
+                // for mass update category links with constraint by unique key use insert on duplicate statement
+                $connection->insertOnDuplicate(
+                    $this->getCategoryLinkMetadata()->getEntityTable(),
+                    $data,
+                    ['position']
+                );
+            }
         }
 
         return array_column($insertLinks, 'category_id');
     }
 
     /**
+     * Delete category links
+     *
      * @param ProductInterface $product
      * @param array $deleteLinks
      * @return array
@@ -215,7 +238,7 @@ private function verifyCategoryLinks(array $links)
     }
 
     /**
-     * Analyse category links for update or/and delete
+     * Analyse category links for update or/and delete. Return array of links for delete, insert and update
      *
      * @param array $deleteUpdate
      * @param array $insertUpdate
@@ -226,8 +249,7 @@ private function analyseUpdatedLinks($deleteUpdate, $insertUpdate)
         $delete = $deleteUpdate['changed'] ?: [];
         $insert = $insertUpdate['changed'] ?: [];
         $insert = array_merge_recursive($insert, $deleteUpdate['updated']);
-        $insert = array_merge_recursive($insert, $insertUpdate['updated']);
 
-        return [$delete, $insert];
+        return [$delete, $insert, $insertUpdate['updated']];
     }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 0729f2bd1f8f5..bd314c0192d38 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -12,10 +12,15 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 use Magento\Store\Model\Store;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Framework\Indexer\DimensionFactory;
 
 /**
  * Product collection
@@ -270,9 +275,28 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      */
     private $backend;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @var PriceTableResolver
+     */
+    private $priceTableResolver;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var \Magento\Framework\DataObject
+     */
+    private $emptyItem;
+
     /**
      * Collection constructor
-     *
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
@@ -295,7 +319,9 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @param ProductLimitationFactory|null $productLimitationFactory
      * @param MetadataPool|null $metadataPool
-     *
+     * @param TableMaintainer|null $tableMaintainer
+     * @param PriceTableResolver|null $priceTableResolver
+     * @param DimensionFactory|null $dimensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -320,7 +346,10 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         ProductLimitationFactory $productLimitationFactory = null,
-        MetadataPool $metadataPool = null
+        MetadataPool $metadataPool = null,
+        TableMaintainer $tableMaintainer = null,
+        PriceTableResolver $priceTableResolver = null,
+        DimensionFactory $dimensionFactory = null
     ) {
         $this->moduleManager = $moduleManager;
         $this->_catalogProductFlatState = $catalogProductFlatState;
@@ -350,6 +379,10 @@ public function __construct(
             $storeManager,
             $connection
         );
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->priceTableResolver = $priceTableResolver ?: ObjectManager::getInstance()->get(PriceTableResolver::class);
+        $this->dimensionFactory = $dimensionFactory
+            ?: ObjectManager::getInstance()->get(DimensionFactory::class);
     }
 
     /**
@@ -446,8 +479,7 @@ public function getFlatState()
     }
 
     /**
-     * Retrieve is flat enabled flag
-     * Return always false if magento run admin
+     * Retrieve is flat enabled. Return always false if magento run admin.
      *
      * @return bool
      */
@@ -478,8 +510,7 @@ protected function _construct()
     }
 
     /**
-     * Standard resource collection initialization
-     * Needed for child classes
+     * Standard resource collection initialization. Needed for child classes.
      *
      * @param string $model
      * @param string $entityModel
@@ -518,14 +549,16 @@ protected function _prepareStaticFields()
     }
 
     /**
-     * Retrieve collection empty item
-     * Redeclared for specifying id field name without getting resource model inside model
+     * Get collection empty item. Redeclared for specifying id field name without getting resource model inside model.
      *
      * @return \Magento\Framework\DataObject
      */
     public function getNewEmptyItem()
     {
-        $object = parent::getNewEmptyItem();
+        if (null === $this->emptyItem) {
+            $this->emptyItem = parent::getNewEmptyItem();
+        }
+        $object = clone $this->emptyItem;
         if ($this->isEnabledFlat()) {
             $object->setIdFieldName($this->getEntity()->getIdFieldName());
         }
@@ -605,8 +638,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
     }
 
     /**
-     * Add attribute to entities in collection
-     * If $attribute=='*' select all attributes
+     * Add attribute to entities in collection. If $attribute=='*' select all attributes.
      *
      * @param array|string|integer|\Magento\Framework\App\Config\Element $attribute
      * @param bool|string $joinType
@@ -642,8 +674,7 @@ public function addAttributeToSelect($attribute, $joinType = false)
     }
 
     /**
-     * Processing collection items after loading
-     * Adding url rewrites, minimal prices, final prices, tax percents
+     * Processing collection items after loading. Adding url rewrites, minimal prices, final prices, tax percents.
      *
      * @return $this
      */
@@ -654,6 +685,7 @@ protected function _afterLoad()
         }
 
         $this->_prepareUrlDataObject();
+        $this->prepareStoreId();
 
         if (count($this)) {
             $this->_eventManager->dispatch('catalog_product_collection_load_after', ['collection' => $this]);
@@ -662,6 +694,23 @@ protected function _afterLoad()
         return $this;
     }
 
+    /**
+     * Add Store ID to products from collection.
+     *
+     * @return $this
+     */
+    protected function prepareStoreId()
+    {
+        if ($this->getStoreId() !== null) {
+            /** @var $item \Magento\Catalog\Model\Product */
+            foreach ($this->_items as $item) {
+                $item->setStoreId($this->getStoreId());
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Prepare Url Data object
      *
@@ -728,8 +777,7 @@ public function addIdFilter($productId, $exclude = false)
     }
 
     /**
-     * Adding product website names to result collection
-     * Add for each product websites information
+     * Adding product website names to result collection. Add for each product websites information.
      *
      * @return $this
      */
@@ -740,7 +788,7 @@ public function addWebsiteNamesToResult()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -791,14 +839,14 @@ protected function doAddWebsiteNamesToResult()
         foreach ($this as $product) {
             if (isset($productWebsites[$product->getId()])) {
                 $product->setData('websites', $productWebsites[$product->getId()]);
+                $product->setData('website_ids', $productWebsites[$product->getId()]);
             }
         }
         return $this;
     }
 
     /**
-     * Add store availability filter. Include availability product
-     * for store website
+     * Add store availability filter. Include availability product for store website.
      *
      * @param null|string|bool|int|Store $store
      * @return $this
@@ -904,7 +952,7 @@ private function mapConditionType($conditionType)
             'eq' => 'in',
             'neq' => 'nin'
         ];
-        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+        return $conditionsMap[$conditionType] ?? $conditionType;
     }
 
     /**
@@ -1052,14 +1100,15 @@ public function getAllAttributeValues($attribute)
         $select = clone $this->getSelect();
         $attribute = $this->getEntity()->getAttribute($attribute);
 
-        $aiField = $this->getConnection()->getAutoIncrementField($this->getMainTable());
+        $fieldMainTable = $this->getConnection()->getAutoIncrementField($this->getMainTable());
+        $fieldJoinTable = $attribute->getEntity()->getLinkField();
         $select->reset()
             ->from(
                 ['cpe' => $this->getMainTable()],
                 ['entity_id']
             )->join(
                 ['cpa' => $attribute->getBackend()->getTable()],
-                'cpe.' . $aiField . ' = cpa.' . $aiField,
+                'cpe.' . $fieldMainTable . ' = cpa.' . $fieldJoinTable,
                 ['store_id', 'value']
             )->where('attribute_id = ?', (int)$attribute->getId());
 
@@ -1086,11 +1135,11 @@ public function getSelectCountSql()
     /**
      * Get SQL for get record count
      *
-     * @param null $select
+     * @param Select $select
      * @param bool $resetLeftJoins
-     * @return \Magento\Framework\DB\Select
+     * @return Select
      */
-    protected function _getSelectCountSql($select = null, $resetLeftJoins = true)
+    protected function _getSelectCountSql(?Select $select = null, $resetLeftJoins = true)
     {
         $this->_renderFilters();
         $countSelect = $select === null ? $this->_getClearSelect() : $this->_buildClearSelect($select);
@@ -1193,7 +1242,7 @@ public function getProductCountSelect()
             )->distinct(
                 false
             )->join(
-                ['count_table' => $this->getTable('catalog_category_product_index')],
+                ['count_table' => $this->tableMaintainer->getMainTable($this->getStoreId())],
                 'count_table.product_id = e.entity_id',
                 [
                     'count_table.category_id',
@@ -1328,8 +1377,7 @@ public function joinUrlRewrite()
     }
 
     /**
-     * Add URL rewrites data to product
-     * If collection loadded - run processing else set flag
+     * Add URL rewrites data to product. If collection loadded - run processing else set flag.
      *
      * @param int|string $categoryId
      * @return $this
@@ -1383,8 +1431,13 @@ protected function _addUrlRewrite()
                 ['cu' => $this->getTable('catalog_url_rewrite_product_category')],
                 'u.url_rewrite_id=cu.url_rewrite_id'
             )->where('cu.category_id IN (?)', $this->_urlRewriteCategory);
+        } else {
+            $select->joinLeft(
+                ['cu' => $this->getTable('catalog_url_rewrite_product_category')],
+                'u.url_rewrite_id=cu.url_rewrite_id'
+            )->where('cu.url_rewrite_id IS NULL');
         }
-
+        
         // more priority is data with category id
         $urlRewrites = [];
 
@@ -1489,7 +1542,7 @@ public function addPriceData($customerGroupId = null, $websiteId = null)
     /**
      * Add attribute to filter
      *
-     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string $attribute
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string|array $attribute
      * @param array $condition
      * @param string $joinType
      * @return $this
@@ -1552,7 +1605,8 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $entity)
@@ -1561,7 +1615,7 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
     }
 
     /**
-     * Add requere tax percent flag for product collection
+     * Add require tax percent flag for product collection
      *
      * @return $this
      */
@@ -1671,7 +1725,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
 
             return $this;
         } elseif ($attribute == 'is_saleable') {
-            $this->getSelect()->order("is_saleable " . $dir);
+            $this->getSelect()->order("is_salable " . $dir);
             return $this;
         }
 
@@ -1763,7 +1817,8 @@ protected function _productLimitationJoinWebsite()
             }
             $conditions[] = $this->getConnection()->quoteInto(
                 'product_website.website_id IN(?)',
-                $filters['website_ids']
+                $filters['website_ids'],
+                'int'
             );
         } elseif (isset(
             $filters['store_id']
@@ -1775,7 +1830,7 @@ protected function _productLimitationJoinWebsite()
         ) {
             $joinWebsite = true;
             $websiteId = $this->_storeManager->getStore($filters['store_id'])->getWebsiteId();
-            $conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId);
+            $conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId, 'int');
         }
 
         $fromPart = $this->getSelect()->getPart(\Magento\Framework\DB\Select::FROM);
@@ -1854,7 +1909,12 @@ protected function _productLimitationJoinPrice()
     protected function _productLimitationPrice($joinLeft = false)
     {
         $filters = $this->_productLimitationFilters;
-        if (!$filters->isUsingPriceIndex()) {
+        if (!$filters->isUsingPriceIndex() ||
+            !isset($filters['website_id']) ||
+            (string)$filters['website_id'] === '' ||
+            !isset($filters['customer_group_id']) ||
+            (string)$filters['customer_group_id'] === ''
+        ) {
             return $this;
         }
 
@@ -1889,7 +1949,23 @@ protected function _productLimitationPrice($joinLeft = false)
                 'max_price',
                 'tier_price',
             ];
-            $tableName = ['price_index' => $this->getTable('catalog_product_index_price')];
+
+            $tableName = [
+                'price_index' => $this->priceTableResolver->resolve(
+                    'catalog_product_index_price',
+                    [
+                        $this->dimensionFactory->create(
+                            CustomerGroupDimensionProvider::DIMENSION_NAME,
+                            (string)$filters['customer_group_id']
+                        ),
+                        $this->dimensionFactory->create(
+                            WebsiteDimensionProvider::DIMENSION_NAME,
+                            (string)$filters['website_id']
+                        )
+                    ]
+                )
+            ];
+
             if ($joinLeft) {
                 $select->joinLeft($tableName, $joinCond, $colls);
             } else {
@@ -1950,12 +2026,16 @@ protected function _applyProductLimitations()
 
         $conditions = [
             'cat_index.product_id=e.entity_id',
-            $this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id']),
+            $this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id'], 'int'),
         ];
         if (isset($filters['visibility']) && !isset($filters['store_table'])) {
-            $conditions[] = $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility']);
+            $conditions[] = $this->getConnection()->quoteInto(
+                'cat_index.visibility IN(?)',
+                $filters['visibility'],
+                'int'
+            );
         }
-        $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id']);
+        $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id'], 'int');
         if (isset($filters['category_is_anchor'])) {
             $conditions[] = $this->getConnection()->quoteInto('cat_index.is_parent=?', $filters['category_is_anchor']);
         }
@@ -1967,7 +2047,7 @@ protected function _applyProductLimitations()
             $this->getSelect()->setPart(\Magento\Framework\DB\Select::FROM, $fromPart);
         } else {
             $this->getSelect()->join(
-                ['cat_index' => $this->getTable('catalog_category_product_index')],
+                ['cat_index' => $this->tableMaintainer->getMainTable($this->getStoreId())],
                 $joinCond,
                 ['cat_index_position' => 'position']
             );
@@ -2219,6 +2299,7 @@ public function addPriceDataFieldFilter($comparisonFormat, $fields)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @since 101.0.1
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function addMediaGalleryData()
     {
@@ -2230,34 +2311,36 @@ public function addMediaGalleryData()
             return $this;
         }
 
-        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-        $attribute = $this->getAttribute('media_gallery');
-        $select = $this->getMediaGalleryResource()->createBatchBaseSelect(
-            $this->getStoreId(),
-            $attribute->getAttributeId()
-        );
-
-        $mediaGalleries = [];
-        $linkField = $this->getProductEntityMetadata()->getLinkField();
         $items = $this->getItems();
+        $linkField = $this->getProductEntityMetadata()->getLinkField();
 
-        $select->where(
-            'entity.' . $linkField . ' IN (?)',
-            array_map(
-                function ($item) use ($linkField) {
-                    return $item->getData($linkField);
-                },
-                $items
-            )
-        );
+        $select = $this->getMediaGalleryResource()
+            ->createBatchBaseSelect(
+                $this->getStoreId(),
+                $this->getAttribute('media_gallery')->getAttributeId()
+            )->reset(
+                Select::ORDER // we don't care what order is in current scenario
+            )->where(
+                'entity.' . $linkField . ' IN (?)',
+                array_map(
+                    function ($item) use ($linkField) {
+                        return (int) $item->getOrigData($linkField);
+                    },
+                    $items
+                )
+            );
+
+        $mediaGalleries = [];
         foreach ($this->getConnection()->fetchAll($select) as $row) {
             $mediaGalleries[$row[$linkField]][] = $row;
         }
 
         foreach ($items as $item) {
-            $mediaEntries = isset($mediaGalleries[$item->getData($linkField)]) ?
-                $mediaGalleries[$item->getData($linkField)] : [];
-            $this->getGalleryReadHandler()->addMediaDataToProduct($item, $mediaEntries);
+            $this->getGalleryReadHandler()
+                ->addMediaDataToProduct(
+                    $item,
+                    $mediaGalleries[$item->getOrigData($linkField)] ?? []
+                );
         }
 
         $this->setFlag('media_gallery_added', true);
@@ -2290,7 +2373,10 @@ private function getGalleryReadHandler()
     }
 
     /**
+     * Retrieve Media gallery resource.
+     *
      * @deprecated 101.0.1
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Gallery
      */
     private function getMediaGalleryResource()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index 2868392f85280..635715a60742f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -49,7 +49,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     protected function _construct()
@@ -58,7 +59,8 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function getConnection()
@@ -67,6 +69,8 @@ public function getConnection()
     }
 
     /**
+     * Load data from table by valueId
+     *
      * @param string $tableNameAlias
      * @param array $ids
      * @param int|null $storeId
@@ -111,6 +115,8 @@ public function loadDataFromTableByValueId(
     }
 
     /**
+     * Load product gallery by attributeId
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param int $attributeId
      * @return array
@@ -132,6 +138,8 @@ public function loadProductGalleryByAttributeId($product, $attributeId)
     }
 
     /**
+     * Create base load select
+     *
      * @param int $entityId
      * @param int $storeId
      * @param int $attributeId
@@ -151,6 +159,8 @@ protected function createBaseLoadSelect($entityId, $storeId, $attributeId)
     }
 
     /**
+     * Create batch base select
+     *
      * @param int $storeId
      * @param int $attributeId
      * @return \Magento\Framework\DB\Select
@@ -190,7 +200,7 @@ public function createBatchBaseSelect($storeId, $attributeId)
                     'value.' . $linkField . ' = entity.' . $linkField,
                 ]
             ),
-            ['label', 'position', 'disabled']
+            []
         )->joinLeft(
             ['default_value' => $this->getTable(self::GALLERY_VALUE_TABLE)],
             implode(
@@ -201,8 +211,15 @@ public function createBatchBaseSelect($storeId, $attributeId)
                     'default_value.' . $linkField . ' = entity.' . $linkField,
                 ]
             ),
-            ['label_default' => 'label', 'position_default' => 'position', 'disabled_default' => 'disabled']
-        )->where(
+            []
+        )->columns([
+            'label' => $this->getConnection()->getIfNullSql('`value`.`label`', '`default_value`.`label`'),
+            'position' => $this->getConnection()->getIfNullSql('`value`.`position`', '`default_value`.`position`'),
+            'disabled' => $this->getConnection()->getIfNullSql('`value`.`disabled`', '`default_value`.`disabled`'),
+            'label_default' => 'default_value.label',
+            'position_default' => 'default_value.position',
+            'disabled_default' => 'default_value.disabled'
+        ])->where(
             $mainTableAlias . '.attribute_id = ?',
             $attributeId
         )->where(
@@ -240,6 +257,8 @@ protected function removeDuplicates(&$result)
     }
 
     /**
+     * Get main table alias
+     *
      * @return string
      * @since 101.0.0
      */
@@ -249,6 +268,8 @@ public function getMainTableAlias()
     }
 
     /**
+     * Bind value to entity
+     *
      * @param int $valueId
      * @param int $entityId
      * @return int
@@ -266,6 +287,8 @@ public function bindValueToEntity($valueId, $entityId)
     }
 
     /**
+     * Save data row
+     *
      * @param string $table
      * @param array $data
      * @param array $fields
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
new file mode 100644
index 0000000000000..77f67480619e0
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Class for retrieval of all product images
+ */
+class Image
+{
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var Generator
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @param Generator $generator
+     * @param ResourceConnection $resourceConnection
+     * @param int $batchSize
+     */
+    public function __construct(
+        Generator $generator,
+        ResourceConnection $resourceConnection,
+        $batchSize = 100
+    ) {
+        $this->batchQueryGenerator = $generator;
+        $this->resourceConnection = $resourceConnection;
+        $this->connection = $this->resourceConnection->getConnection();
+        $this->batchSize = $batchSize;
+    }
+
+    /**
+     * Returns product images
+     *
+     * @return \Generator
+     */
+    public function getAllProductImages(): \Generator
+    {
+        $batchSelectIterator = $this->batchQueryGenerator->generate(
+            'value_id',
+            $this->getVisibleImagesSelect(),
+            $this->batchSize,
+            \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+        );
+
+        foreach ($batchSelectIterator as $select) {
+            foreach ($this->connection->fetchAll($select) as $key => $value) {
+                yield $key => $value;
+            }
+        }
+    }
+
+    /**
+     * Get the number of unique pictures of products
+     *
+     * @return int
+     */
+    public function getCountAllProductImages(): int
+    {
+        $select = $this->getVisibleImagesSelect()
+            ->reset('columns')
+            ->reset('distinct')
+            ->columns(
+                new \Zend_Db_Expr('count(distinct value)')
+            );
+
+        return (int) $this->connection->fetchOne($select);
+    }
+
+    /**
+     * Return Select to fetch all products images
+     *
+     * @return Select
+     */
+    private function getVisibleImagesSelect(): Select
+    {
+        return $this->connection->select()->distinct()
+            ->from(
+                ['images' => $this->resourceConnection->getTableName(Gallery::GALLERY_TABLE)],
+                'value as filepath'
+            )->where(
+                'disabled = 0'
+            );
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index c4e3fb1bf1e70..c33ea7c781aa3 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -82,6 +82,7 @@ public function reindexEntities($processIds)
         $this->_prepareIndex($processIds);
         $this->_prepareRelationIndex($processIds);
         $this->_removeNotVisibleEntityFromIndex();
+
         return $this;
     }
 
@@ -159,11 +160,12 @@ protected function _removeNotVisibleEntityFromIndex()
      * @param array $parentIds the parent entity ids limitation
      * @return \Magento\Framework\DB\Select
      */
-    protected function _prepareRelationIndexSelect($parentIds = null)
+    protected function _prepareRelationIndexSelect(array $parentIds = null)
     {
         $connection = $this->getConnection();
         $idxTable = $this->getIdxTable();
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+
         $select = $connection->select()->from(
             ['l' => $this->getTable('catalog_product_relation')],
             []
@@ -179,6 +181,14 @@ protected function _prepareRelationIndexSelect($parentIds = null)
             ['i' => $idxTable],
             'l.child_id = i.entity_id AND cs.store_id = i.store_id',
             []
+        )->join(
+            ['sw' => $this->getTable('store_website')],
+            "cs.website_id = sw.website_id",
+            []
+        )->join(
+            ['cpw' => $this->getTable('catalog_product_website')],
+            'i.entity_id = cpw.product_id AND sw.website_id = cpw.website_id',
+            []
         )->group(
             ['parent_id', 'i.attribute_id', 'i.store_id', 'i.value', 'l.child_id']
         )->columns(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
index 5b68730209b40..7730d7cc9a7fd 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 
 /**
  * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
@@ -24,6 +25,16 @@ class Source extends AbstractEav
      */
     protected $_resourceHelper;
 
+    /**
+     * @var \Magento\Eav\Api\AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $criteriaBuilder;
+
     /**
      * Construct
      *
@@ -33,6 +44,8 @@ class Source extends AbstractEav
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param null|string $connectionName
+     * @param \Magento\Eav\Api\AttributeRepositoryInterface|null $attributeRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $criteriaBuilder
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -40,7 +53,9 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-        $connectionName = null
+        $connectionName = null,
+        \Magento\Eav\Api\AttributeRepositoryInterface $attributeRepository = null,
+        \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder = null
     ) {
         parent::__construct(
             $context,
@@ -50,6 +65,12 @@ public function __construct(
             $connectionName
         );
         $this->_resourceHelper = $resourceHelper;
+        $this->attributeRepository = $attributeRepository
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+        $this->criteriaBuilder = $criteriaBuilder
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
     }
 
     /**
@@ -84,7 +105,7 @@ protected function _getIndexableAttributes($multiSelect)
         if ($multiSelect == true) {
             $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect');
         } else {
-            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input = ?', 'select');
+            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input IN( ? )', ['select', 'boolean']);
         }
 
         return $this->getConnection()->fetchCol($select);
@@ -234,6 +255,10 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
             $options[$row['attribute_id']][$row['option_id']] = true;
         }
 
+        // Retrieve any custom source model options
+        $sourceModelOptions = $this->getMultiSelectAttributeWithSourceModels($attrIds);
+        $options = array_replace_recursive($options, $sourceModelOptions);
+
         // prepare get multiselect values query
         $productValueExpression = $connection->getCheckSql('pvs.value_id > 0', 'pvs.value', 'pvd.value');
         $select = $connection->select()->from(
@@ -297,6 +322,39 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
         return $this;
     }
 
+    /**
+     * Get options for multiselect attributes using custom source models
+     * Based on @maderlock's fix from:
+     * https://github.com/magento/magento2/issues/417#issuecomment-265146285
+     *
+     * @param array $attrIds
+     *
+     * @return array
+     */
+    private function getMultiSelectAttributeWithSourceModels($attrIds)
+    {
+        // Add options from custom source models
+        $this->criteriaBuilder
+                ->addFilter('attribute_id', $attrIds, 'in')
+                ->addFilter('source_model', true, 'notnull');
+        $criteria = $this->criteriaBuilder->create();
+        $attributes = $this->attributeRepository->getList(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            $criteria
+        )->getItems();
+        
+        $options = [];
+        foreach ($attributes as $attribute) {
+            $sourceModelOptions = $attribute->getOptions();
+            // Add options to list used below
+            foreach ($sourceModelOptions as $option) {
+                $options[$attribute->getAttributeId()][$option->getValue()] = true;
+            }
+        }
+
+        return $options;
+    }
+
     /**
      * Save a data to temporary source index table
      *
@@ -330,6 +388,8 @@ public function getIdxTable($table = null)
     }
 
     /**
+     * Save data from select
+     *
      * @param \Magento\Framework\DB\Select $select
      * @param array $options
      * @return void
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
index b4f7e43387d0e..ebe04fb63b217 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -7,9 +7,13 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 
 class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuilderInterface
 {
@@ -38,6 +42,16 @@ class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuild
      */
     private $baseSelectProcessor;
 
+    /**
+     * @var IndexScopeResolverInterface|null
+     */
+    private $priceTableResolver;
+
+    /**
+     * @var DimensionFactory|null
+     */
+    private $dimensionFactory;
+
     /**
      * LinkedProductSelectBuilderByIndexPrice constructor.
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -45,13 +59,17 @@ class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuild
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface|null $baseSelectProcessor
+     * @param IndexScopeResolverInterface|null $priceTableResolver
+     * @param DimensionFactory|null $dimensionFactory
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        BaseSelectProcessorInterface $baseSelectProcessor = null
+        BaseSelectProcessorInterface $baseSelectProcessor = null,
+        IndexScopeResolverInterface $priceTableResolver = null,
+        DimensionFactory $dimensionFactory = null
     ) {
         $this->storeManager = $storeManager;
         $this->resource = $resourceConnection;
@@ -59,6 +77,9 @@ public function __construct(
         $this->metadataPool = $metadataPool;
         $this->baseSelectProcessor = (null !== $baseSelectProcessor)
             ? $baseSelectProcessor : ObjectManager::getInstance()->get(BaseSelectProcessorInterface::class);
+        $this->priceTableResolver = $priceTableResolver
+            ?? ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+        $this->dimensionFactory = $dimensionFactory ?? ObjectManager::getInstance()->get(DimensionFactory::class);
     }
 
     /**
@@ -68,6 +89,8 @@ public function build($productId)
     {
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $productTable = $this->resource->getTableName('catalog_product_entity');
+        $websiteId = $this->storeManager->getStore()->getWebsiteId();
+        $customerGroupId = $this->customerSession->getCustomerGroupId();
 
         $priceSelect = $this->resource->getConnection()->select()
             ->from(['parent' => $productTable], '')
@@ -80,13 +103,22 @@ public function build($productId)
                 sprintf('%s.entity_id = link.child_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
                 ['entity_id']
             )->joinInner(
-                ['t' => $this->resource->getTableName('catalog_product_index_price')],
+                [
+                    't' => $this->priceTableResolver->resolve('catalog_product_index_price', [
+                        $this->dimensionFactory->create(WebsiteDimensionProvider::DIMENSION_NAME, (string)$websiteId),
+                        $this->dimensionFactory->create(
+                            CustomerGroupDimensionProvider::DIMENSION_NAME,
+                            (string)$customerGroupId
+                        ),
+                    ])
+                ],
                 sprintf('t.entity_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
                 []
             )->where('parent.entity_id = ?', $productId)
-            ->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId())
-            ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
+            ->where('t.website_id = ?', $websiteId)
+            ->where('t.customer_group_id = ?', $customerGroupId)
             ->order('t.min_price ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BasePriceModifier.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BasePriceModifier.php
new file mode 100644
index 0000000000000..cf5ba451c380e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BasePriceModifier.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+/**
+ * Apply price modifiers to product price indexer which are common for all product types:
+ * custom options, catalog rule, catalog inventory modifiers
+ */
+class BasePriceModifier implements PriceModifierInterface
+{
+    /**
+     * @var PriceModifierInterface[]
+     */
+    private $priceModifiers;
+
+    /**
+     * @param array $priceModifiers
+     */
+    public function __construct(array $priceModifiers)
+    {
+        $this->priceModifiers = $priceModifiers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void
+    {
+        foreach ($this->priceModifiers as $priceModifier) {
+            $priceModifier->modifyPrice($priceTable, $entityIds);
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
new file mode 100644
index 0000000000000..47fc6802d7eaf
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
@@ -0,0 +1,464 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\ColumnValueExpression;
+
+/**
+ * Class for modify custom option price.
+ */
+class CustomOptionPriceModifier implements PriceModifierInterface
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\DB\Sql\ColumnValueExpression
+     */
+    private $columnValueExpressionFactory;
+
+    /**
+     * @var \Magento\Catalog\Helper\Data
+     */
+    private $dataHelper;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var bool
+     */
+    private $isPriceGlobalFlag;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var \Magento\Framework\Indexer\Table\StrategyInterface
+     */
+    private $tableStrategy;
+
+    /**
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Framework\DB\Sql\ColumnValueExpressionFactory $columnValueExpressionFactory
+     * @param \Magento\Catalog\Helper\Data $dataHelper
+     * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
+     * @param string $connectionName
+     */
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        \Magento\Framework\DB\Sql\ColumnValueExpressionFactory $columnValueExpressionFactory,
+        \Magento\Catalog\Helper\Data $dataHelper,
+        \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
+        $connectionName = 'indexer'
+    ) {
+        $this->resource = $resource;
+        $this->metadataPool = $metadataPool;
+        $this->connectionName = $connectionName;
+        $this->columnValueExpressionFactory = $columnValueExpressionFactory;
+        $this->dataHelper = $dataHelper;
+        $this->tableStrategy = $tableStrategy;
+    }
+
+    /**
+     * Apply custom option price to temporary index price table
+     *
+     * @param IndexTableStructure $priceTable
+     * @param array $entityIds
+     * @return void
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void
+    {
+        // no need to run all queries if current products have no custom options
+        if (!$this->checkIfCustomOptionsExist($priceTable)) {
+            return;
+        }
+
+        $connection = $this->getConnection();
+        $finalPriceTable = $priceTable->getTableName();
+
+        $coaTable = $this->getCustomOptionAggregateTable();
+        $this->prepareCustomOptionAggregateTable();
+
+        $copTable = $this->getCustomOptionPriceTable();
+        $this->prepareCustomOptionPriceTable();
+
+        $select = $this->getSelectForOptionsWithMultipleValues($finalPriceTable);
+        $query = $select->insertFromSelect($coaTable);
+        $connection->query($query);
+
+        $select = $this->getSelectForOptionsWithOneValue($finalPriceTable);
+        $query = $select->insertFromSelect($coaTable);
+        $connection->query($query);
+
+        $select = $this->getSelectAggregated($coaTable);
+        $query = $select->insertFromSelect($copTable);
+        $connection->query($query);
+
+        // update tmp price index with prices from custom options (from previous aggregated table)
+        $select = $this->getSelectForUpdate($copTable);
+        $query = $select->crossUpdateFromSelect(['i' => $finalPriceTable]);
+        $connection->query($query);
+
+        $connection->delete($coaTable);
+        $connection->delete($copTable);
+    }
+
+    /**
+     * @param IndexTableStructure $priceTable
+     * @return bool
+     * @throws \Exception
+     */
+    private function checkIfCustomOptionsExist(IndexTableStructure $priceTable): bool
+    {
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+        $select = $this->getConnection()
+            ->select()
+            ->from(
+                ['i' => $priceTable->getTableName()],
+                ['entity_id']
+            )->join(
+                ['e' => $this->getTable('catalog_product_entity')],
+                'e.entity_id = i.entity_id',
+                []
+            )->join(
+                ['o' => $this->getTable('catalog_product_option')],
+                'o.product_id = e.' . $metadata->getLinkField(),
+                ['option_id']
+            );
+
+        return !empty($this->getConnection()->fetchRow($select));
+    }
+
+    /**
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (null === $this->connection) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Prepare prices for products with custom options that has multiple values
+     *
+     * @param string $sourceTable
+     * @return \Magento\Framework\DB\Select
+     * @throws \Exception
+     */
+    private function getSelectForOptionsWithMultipleValues(string $sourceTable): Select
+    {
+        $connection = $this->resource->getConnection($this->connectionName);
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+        $select = $connection->select()
+            ->from(
+                ['i' => $sourceTable],
+                ['entity_id', 'customer_group_id', 'website_id']
+            )->join(
+                ['e' => $this->getTable('catalog_product_entity')],
+                'e.entity_id = i.entity_id',
+                []
+            )->join(
+                ['cwd' => $this->getTable('catalog_product_index_website')],
+                'i.website_id = cwd.website_id',
+                []
+            )->join(
+                ['o' => $this->getTable('catalog_product_option')],
+                'o.product_id = e.' . $metadata->getLinkField(),
+                ['option_id']
+            )->join(
+                ['ot' => $this->getTable('catalog_product_option_type_value')],
+                'ot.option_id = o.option_id',
+                []
+            )->join(
+                ['otpd' => $this->getTable('catalog_product_option_type_price')],
+                'otpd.option_type_id = ot.option_type_id AND otpd.store_id = 0',
+                []
+            )->group(
+                ['i.entity_id', 'i.customer_group_id', 'i.website_id', 'o.option_id']
+            );
+
+        if ($this->isPriceGlobal()) {
+            $optPriceType = 'otpd.price_type';
+            $optPriceValue = 'otpd.price';
+        } else {
+            $select->joinLeft(
+                ['otps' => $this->getTable('catalog_product_option_type_price')],
+                'otps.option_type_id = otpd.option_type_id AND otpd.store_id = cwd.default_store_id',
+                []
+            );
+
+            $optPriceType = $connection->getCheckSql(
+                'otps.option_type_price_id > 0',
+                'otps.price_type',
+                'otpd.price_type'
+            );
+            $optPriceValue = $connection->getCheckSql('otps.option_type_price_id > 0', 'otps.price', 'otpd.price');
+        }
+
+        $minPriceRound = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "ROUND(i.final_price * ({$optPriceValue} / 100), 4)"
+            ]);
+        $minPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $minPriceRound);
+        $minPriceMin = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "MIN({$minPriceExpr})"
+            ]);
+        $minPrice = $connection->getCheckSql("MIN(o.is_require) = 1", $minPriceMin, '0');
+
+        $tierPriceRound = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "ROUND(i.tier_price * ({$optPriceValue} / 100), 4)"
+            ]);
+        $tierPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $tierPriceRound);
+        $tierPriceMin = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "MIN({$tierPriceExpr})"
+            ]);
+        $tierPriceValue = $connection->getCheckSql("MIN(o.is_require) > 0", $tierPriceMin, 0);
+        $tierPrice = $connection->getCheckSql("MIN(i.tier_price) IS NOT NULL", $tierPriceValue, "NULL");
+
+        $maxPriceRound = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "ROUND(i.final_price * ({$optPriceValue} / 100), 4)"
+            ]);
+        $maxPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $maxPriceRound);
+        $maxPrice = $connection->getCheckSql(
+            "(MIN(o.type)='radio' OR MIN(o.type)='drop_down')",
+            "MAX({$maxPriceExpr})",
+            "SUM({$maxPriceExpr})"
+        );
+
+        $select->columns(
+            [
+                'min_price' => $minPrice,
+                'max_price' => $maxPrice,
+                'tier_price' => $tierPrice,
+            ]
+        );
+
+        return $select;
+    }
+
+    /**
+     * Prepare prices for products with custom options that has single value
+     *
+     * @param string $sourceTable
+     * @return \Magento\Framework\DB\Select
+     * @throws \Exception
+     */
+    private function getSelectForOptionsWithOneValue(string $sourceTable): Select
+    {
+        $connection = $this->resource->getConnection($this->connectionName);
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+        $select = $connection->select()
+            ->from(
+                ['i' => $sourceTable],
+                ['entity_id', 'customer_group_id', 'website_id']
+            )->join(
+                ['e' => $this->getTable('catalog_product_entity')],
+                'e.entity_id = i.entity_id',
+                []
+            )->join(
+                ['cwd' => $this->getTable('catalog_product_index_website')],
+                'i.website_id = cwd.website_id',
+                []
+            )->join(
+                ['o' => $this->getTable('catalog_product_option')],
+                'o.product_id = e.' . $metadata->getLinkField(),
+                ['option_id']
+            )->join(
+                ['opd' => $this->getTable('catalog_product_option_price')],
+                'opd.option_id = o.option_id AND opd.store_id = 0',
+                []
+            );
+
+        if ($this->isPriceGlobal()) {
+            $optPriceType = 'opd.price_type';
+            $optPriceValue = 'opd.price';
+        } else {
+            $select->joinLeft(
+                ['ops' => $this->getTable('catalog_product_option_price')],
+                'ops.option_id = opd.option_id AND ops.store_id = cwd.default_store_id',
+                []
+            );
+
+            $optPriceType = $connection->getCheckSql('ops.option_price_id > 0', 'ops.price_type', 'opd.price_type');
+            $optPriceValue = $connection->getCheckSql('ops.option_price_id > 0', 'ops.price', 'opd.price');
+        }
+
+        $minPriceRound = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "ROUND(i.final_price * ({$optPriceValue} / 100), 4)"
+            ]);
+        $priceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $minPriceRound);
+        $minPrice = $connection->getCheckSql("{$priceExpr} > 0 AND o.is_require = 1", $priceExpr, 0);
+
+        $maxPrice = $priceExpr;
+
+        $tierPriceRound = $this->columnValueExpressionFactory
+            ->create([
+                'expression' => "ROUND(i.tier_price * ({$optPriceValue} / 100), 4)"
+            ]);
+        $tierPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $tierPriceRound);
+        $tierPriceValue = $connection->getCheckSql("{$tierPriceExpr} > 0 AND o.is_require = 1", $tierPriceExpr, 0);
+        $tierPrice = $connection->getCheckSql("i.tier_price IS NOT NULL", $tierPriceValue, "NULL");
+
+        $select->columns(
+            [
+                'min_price' => $minPrice,
+                'max_price' => $maxPrice,
+                'tier_price' => $tierPrice,
+            ]
+        );
+
+        return $select;
+    }
+
+    /**
+     * Aggregate prices with one and multiply options into one table
+     *
+     * @param string $sourceTable
+     * @return \Magento\Framework\DB\Select
+     */
+    private function getSelectAggregated(string $sourceTable): Select
+    {
+        $connection = $this->resource->getConnection($this->connectionName);
+
+        $select = $connection->select()
+            ->from(
+                [$sourceTable],
+                [
+                    'entity_id',
+                    'customer_group_id',
+                    'website_id',
+                    'min_price' => 'SUM(min_price)',
+                    'max_price' => 'SUM(max_price)',
+                    'tier_price' => 'SUM(tier_price)',
+                ]
+            )->group(
+                ['entity_id', 'customer_group_id', 'website_id']
+            );
+
+        return $select;
+    }
+
+    /**
+     * @param string $sourceTable
+     * @return \Magento\Framework\DB\Select
+     */
+    private function getSelectForUpdate(string $sourceTable): Select
+    {
+        $connection = $this->resource->getConnection($this->connectionName);
+
+        $select = $connection->select()->join(
+            ['io' => $sourceTable],
+            'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
+            ' AND i.website_id = io.website_id',
+            []
+        );
+        $select->columns(
+            [
+                'min_price' => new ColumnValueExpression('i.min_price + io.min_price'),
+                'max_price' => new ColumnValueExpression('i.max_price + io.max_price'),
+                'tier_price' => $connection->getCheckSql(
+                    'i.tier_price IS NOT NULL',
+                    'i.tier_price + io.tier_price',
+                    'NULL'
+                ),
+            ]
+        );
+
+        return $select;
+    }
+
+    /**
+     * @param string $tableName
+     * @return string
+     */
+    private function getTable(string $tableName): string
+    {
+        return $this->resource->getTableName($tableName, $this->connectionName);
+    }
+
+    /**
+     * @return bool
+     */
+    private function isPriceGlobal(): bool
+    {
+        if ($this->isPriceGlobalFlag === null) {
+            $this->isPriceGlobalFlag = $this->dataHelper->isPriceGlobal();
+        }
+
+        return $this->isPriceGlobalFlag;
+    }
+
+    /**
+     * Retrieve table name for custom option temporary aggregation data
+     *
+     * @return string
+     */
+    private function getCustomOptionAggregateTable(): string
+    {
+        return $this->tableStrategy->getTableName('catalog_product_index_price_opt_agr');
+    }
+
+    /**
+     * Retrieve table name for custom option prices data
+     *
+     * @return string
+     */
+    private function getCustomOptionPriceTable(): string
+    {
+        return $this->tableStrategy->getTableName('catalog_product_index_price_opt');
+    }
+
+    /**
+     * Prepare table structure for custom option temporary aggregation data
+     *
+     * @return void
+     */
+    private function prepareCustomOptionAggregateTable()
+    {
+        $this->getConnection()->delete($this->getCustomOptionAggregateTable());
+    }
+
+    /**
+     * Prepare table structure for custom option prices data
+     *
+     * @return void
+     */
+    private function prepareCustomOptionPriceTable()
+    {
+        $this->getConnection()->delete($this->getCustomOptionPriceTable());
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index 4761b8b1ce896..168fa8f50acc2 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
 
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
 
 /**
  * Default Product Type Price Indexer Resource model
@@ -16,6 +17,8 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
+ * @deprecated Not used anymore for price indexation. Class left for backward compatibility
+ * @see DimensionalIndexerInterface
  */
 class DefaultPrice extends AbstractIndexer implements PriceInterface
 {
@@ -52,6 +55,16 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      */
     private $hasEntity = null;
 
+    /**
+     * @var IndexTableStructureFactory
+     */
+    private $indexTableStructureFactory;
+
+    /**
+     * @var PriceModifierInterface[]
+     */
+    private $priceModifiers = [];
+
     /**
      * DefaultPrice constructor.
      *
@@ -61,7 +74,8 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param string|null $connectionName
-     * @param null|\Magento\Indexer\Model\Indexer\StateFactory $stateFactory
+     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param PriceModifierInterface[] $priceModifiers
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -69,11 +83,25 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\Module\Manager $moduleManager,
-        $connectionName = null
+        $connectionName = null,
+        IndexTableStructureFactory $indexTableStructureFactory = null,
+        array $priceModifiers = []
     ) {
         $this->_eventManager = $eventManager;
         $this->moduleManager = $moduleManager;
         parent::__construct($context, $tableStrategy, $eavConfig, $connectionName);
+
+        $this->indexTableStructureFactory = $indexTableStructureFactory ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(IndexTableStructureFactory::class);
+        foreach ($priceModifiers as $priceModifier) {
+            if (!($priceModifier instanceof PriceModifierInterface)) {
+                throw new \InvalidArgumentException(
+                    'Argument \'priceModifiers\' must be of the type ' . PriceModifierInterface::class . '[]'
+                );
+            }
+
+            $this->priceModifiers[] = $priceModifier;
+        }
     }
 
     /**
@@ -209,6 +237,8 @@ protected function _getDefaultFinalPriceTable()
      * Prepare final price temporary index table
      *
      * @return $this
+     * @deprecated
+     * @see prepareFinalPriceTable()
      */
     protected function _prepareDefaultFinalPriceTable()
     {
@@ -216,6 +246,32 @@ protected function _prepareDefaultFinalPriceTable()
         return $this;
     }
 
+    /**
+     * Create (if needed), clean and return structure of final price table
+     *
+     * @return IndexTableStructure
+     */
+    private function prepareFinalPriceTable()
+    {
+        $tableName = $this->_getDefaultFinalPriceTable();
+        $this->getConnection()->delete($tableName);
+
+        $finalPriceTable = $this->indexTableStructureFactory->create([
+            'tableName' => $tableName,
+            'entityField' => 'entity_id',
+            'customerGroupField' => 'customer_group_id',
+            'websiteField' => 'website_id',
+            'taxClassField' => 'tax_class_id',
+            'originalPriceField' => 'orig_price',
+            'finalPriceField' => 'price',
+            'minPriceField' => 'min_price',
+            'maxPriceField' => 'max_price',
+            'tierPriceField' => 'tier_price',
+        ]);
+
+        return $finalPriceTable;
+    }
+
     /**
      * Retrieve website current dates table name
      *
@@ -248,11 +304,14 @@ protected function _prepareFinalPriceData($entityIds = null)
      */
     protected function prepareFinalPriceDataForType($entityIds, $type)
     {
-        $this->_prepareDefaultFinalPriceTable();
+        $finalPriceTable = $this->prepareFinalPriceTable();
 
         $select = $this->getSelect($entityIds, $type);
-        $query = $select->insertFromSelect($this->_getDefaultFinalPriceTable(), [], false);
+        $query = $select->insertFromSelect($finalPriceTable->getTableName(), [], false);
         $this->getConnection()->query($query);
+
+        $this->modifyPriceIndex($finalPriceTable);
+
         return $this;
     }
 
@@ -271,6 +330,7 @@ protected function prepareFinalPriceDataForType($entityIds, $type)
     protected function getSelect($entityIds = null, $type = null)
     {
         $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $linkField = $metadata->getLinkField();
         $connection = $this->getConnection();
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],
@@ -300,9 +360,38 @@ protected function getSelect($entityIds = null, $type = null)
             'pw.product_id = e.entity_id AND pw.website_id = cw.website_id',
             []
         )->joinLeft(
-            ['tp' => $this->_getTierPriceIndexTable()],
-            'tp.entity_id = e.entity_id AND tp.website_id = cw.website_id' .
-            ' AND tp.customer_group_id = cg.customer_group_id',
+            // we need this only for BCC in case someone expects table `tp` to be present in query
+            ['tp' => $this->getTable('catalog_product_index_tier_price')],
+            'tp.entity_id = e.entity_id AND tp.customer_group_id = cg.customer_group_id' .
+            ' AND tp.website_id = pw.website_id',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `All Websites` and Customer Group = `Specific Customer Group`
+            ['tier_price_1' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_1.' . $linkField . ' = e.' . $linkField . ' AND tier_price_1.all_groups = 0' .
+            ' AND tier_price_1.customer_group_id = cg.customer_group_id AND tier_price_1.qty = 1' .
+            ' AND tier_price_1.website_id = 0',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `Specific Website`
+            //and Customer Group = `Specific Customer Group`
+            ['tier_price_2' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_2.' . $linkField . ' = e.' . $linkField . ' AND tier_price_2.all_groups = 0' .
+            ' AND tier_price_2.customer_group_id = cg.customer_group_id AND tier_price_2.qty = 1' .
+            ' AND tier_price_2.website_id = cw.website_id',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `All Websites` and Customer Group = `ALL GROUPS`
+            ['tier_price_3' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_3.' . $linkField . ' = e.' . $linkField . ' AND tier_price_3.all_groups = 1' .
+            ' AND tier_price_3.customer_group_id = 0 AND tier_price_3.qty = 1 AND tier_price_3.website_id = 0',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `Specific Website` and Customer Group = `ALL GROUPS`
+            ['tier_price_4' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_4.' . $linkField . ' = e.' . $linkField . ' AND tier_price_4.all_groups = 1' .
+            ' AND tier_price_4.customer_group_id = 0 AND tier_price_4.qty = 1' .
+            ' AND tier_price_4.website_id = cw.website_id',
             []
         );
 
@@ -318,7 +407,7 @@ protected function getSelect($entityIds = null, $type = null)
         $this->_addAttributeToSelect(
             $select,
             'status',
-            'e.' . $metadata->getLinkField(),
+            'e.' . $linkField,
             'cs.store_id',
             $statusCond,
             true
@@ -327,7 +416,7 @@ protected function getSelect($entityIds = null, $type = null)
             $taxClassId = $this->_addAttributeToSelect(
                 $select,
                 'tax_class_id',
-                'e.' . $metadata->getLinkField(),
+                'e.' . $linkField,
                 'cs.store_id'
             );
         } else {
@@ -338,41 +427,46 @@ protected function getSelect($entityIds = null, $type = null)
         $price = $this->_addAttributeToSelect(
             $select,
             'price',
-            'e.' . $metadata->getLinkField(),
+            'e.' . $linkField,
             'cs.store_id'
         );
         $specialPrice = $this->_addAttributeToSelect(
             $select,
             'special_price',
-            'e.' . $metadata->getLinkField(),
+            'e.' . $linkField,
             'cs.store_id'
         );
         $specialFrom = $this->_addAttributeToSelect(
             $select,
             'special_from_date',
-            'e.' . $metadata->getLinkField(),
+            'e.' . $linkField,
             'cs.store_id'
         );
         $specialTo = $this->_addAttributeToSelect(
             $select,
             'special_to_date',
-            'e.' . $metadata->getLinkField(),
+            'e.' . $linkField,
             'cs.store_id'
         );
-        $currentDate = $connection->getDatePartSql('cwd.website_date');
+        $currentDate = 'cwd.website_date';
 
+        $maxUnsignedBigint = '~0';
         $specialFromDate = $connection->getDatePartSql($specialFrom);
         $specialToDate = $connection->getDatePartSql($specialTo);
-
-        $specialFromUse = $connection->getCheckSql("{$specialFromDate} <= {$currentDate}", '1', '0');
-        $specialToUse = $connection->getCheckSql("{$specialToDate} >= {$currentDate}", '1', '0');
-        $specialFromHas = $connection->getCheckSql("{$specialFrom} IS NULL", '1', "{$specialFromUse}");
-        $specialToHas = $connection->getCheckSql("{$specialTo} IS NULL", '1', "{$specialToUse}");
-        $finalPrice = $connection->getCheckSql(
-            "{$specialFromHas} > 0 AND {$specialToHas} > 0" . " AND {$specialPrice} < {$price}",
+        $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
+        $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
+        $specialPriceExpr = $connection->getCheckSql(
+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
             $specialPrice,
-            $price
+            $maxUnsignedBigint
         );
+        $tierPrice = $this->getTotalTierPriceExpression($price);
+        $tierPriceExpr = $connection->getIfNullSql($tierPrice, $maxUnsignedBigint);
+        $finalPrice = $connection->getLeastSql([
+            $price,
+            $specialPriceExpr,
+            $tierPriceExpr,
+        ]);
 
         $select->columns(
             [
@@ -380,8 +474,8 @@ protected function getSelect($entityIds = null, $type = null)
                 'price' => $connection->getIfNullSql($finalPrice, 0),
                 'min_price' => $connection->getIfNullSql($finalPrice, 0),
                 'max_price' => $connection->getIfNullSql($finalPrice, 0),
-                'tier_price' => new \Zend_Db_Expr('tp.min_price'),
-                'base_tier' => new \Zend_Db_Expr('tp.min_price'),
+                'tier_price' => $tierPrice,
+                'base_tier' => $tierPrice,
             ]
         );
 
@@ -401,6 +495,7 @@ protected function getSelect($entityIds = null, $type = null)
                 'store_field' => new \Zend_Db_Expr('cs.store_id'),
             ]
         );
+
         return $select;
     }
 
@@ -446,6 +541,19 @@ protected function _prepareCustomOptionPriceTable()
         return $this;
     }
 
+    /**
+     * Modify data in price index table.
+     *
+     * @param IndexTableStructure $finalPriceTable
+     * @return void
+     */
+    private function modifyPriceIndex(IndexTableStructure $finalPriceTable) : void
+    {
+        foreach ($this->priceModifiers as $priceModifier) {
+            $priceModifier->modifyPrice($finalPriceTable);
+        }
+    }
+
     /**
      * Apply custom option minimal and maximal price to temporary final price index table
      *
@@ -455,15 +563,21 @@ protected function _prepareCustomOptionPriceTable()
     protected function _applyCustomOption()
     {
         $connection = $this->getConnection();
+        $finalPriceTable = $this->_getDefaultFinalPriceTable();
         $coaTable = $this->_getCustomOptionAggregateTable();
         $copTable = $this->_getCustomOptionPriceTable();
+        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
 
         $this->_prepareCustomOptionAggregateTable();
         $this->_prepareCustomOptionPriceTable();
 
         $select = $connection->select()->from(
-            ['i' => $this->_getDefaultFinalPriceTable()],
+            ['i' => $finalPriceTable],
             ['entity_id', 'customer_group_id', 'website_id']
+        )->join(
+            ['e' => $this->getTable('catalog_product_entity')],
+            'e.entity_id = i.entity_id',
+            []
         )->join(
             ['cw' => $this->getTable('store_website')],
             'cw.website_id = i.website_id',
@@ -478,7 +592,7 @@ protected function _applyCustomOption()
             []
         )->join(
             ['o' => $this->getTable('catalog_product_option')],
-            'o.product_id = i.entity_id',
+            'o.product_id = e.' . $metadata->getLinkField(),
             ['option_id']
         )->join(
             ['ot' => $this->getTable('catalog_product_option_type_value')],
@@ -529,8 +643,12 @@ protected function _applyCustomOption()
         $connection->query($query);
 
         $select = $connection->select()->from(
-            ['i' => $this->_getDefaultFinalPriceTable()],
+            ['i' => $finalPriceTable],
             ['entity_id', 'customer_group_id', 'website_id']
+        )->join(
+            ['e' => $this->getTable('catalog_product_entity')],
+            'e.entity_id = i.entity_id',
+            []
         )->join(
             ['cw' => $this->getTable('store_website')],
             'cw.website_id = i.website_id',
@@ -545,7 +663,7 @@ protected function _applyCustomOption()
             []
         )->join(
             ['o' => $this->getTable('catalog_product_option')],
-            'o.product_id = i.entity_id',
+            'o.product_id = e.' . $metadata->getLinkField(),
             ['option_id']
         )->join(
             ['opd' => $this->getTable('catalog_product_option_price')],
@@ -562,13 +680,13 @@ protected function _applyCustomOption()
 
         $minPriceRound = new \Zend_Db_Expr("ROUND(i.price * ({$optPriceValue} / 100), 4)");
         $priceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $minPriceRound);
-        $minPrice = $connection->getCheckSql("{$priceExpr} > 0 AND o.is_require > 1", $priceExpr, 0);
+        $minPrice = $connection->getCheckSql("{$priceExpr} > 0 AND o.is_require = 1", $priceExpr, 0);
 
         $maxPrice = $priceExpr;
 
         $tierPriceRound = new \Zend_Db_Expr("ROUND(i.base_tier * ({$optPriceValue} / 100), 4)");
         $tierPriceExpr = $connection->getCheckSql("{$optPriceType} = 'fixed'", $optPriceValue, $tierPriceRound);
-        $tierPriceValue = $connection->getCheckSql("{$tierPriceExpr} > 0 AND o.is_require > 0", $tierPriceExpr, 0);
+        $tierPriceValue = $connection->getCheckSql("{$tierPriceExpr} > 0 AND o.is_require = 1", $tierPriceExpr, 0);
         $tierPrice = $connection->getCheckSql("i.base_tier IS NOT NULL", $tierPriceValue, "NULL");
 
         $select->columns(
@@ -598,7 +716,7 @@ protected function _applyCustomOption()
         $query = $select->insertFromSelect($copTable);
         $connection->query($query);
 
-        $table = ['i' => $this->_getDefaultFinalPriceTable()];
+        $table = ['i' => $finalPriceTable];
         $select = $connection->select()->join(
             ['io' => $copTable],
             'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
@@ -703,4 +821,62 @@ protected function hasEntity()
 
         return $this->hasEntity;
     }
+
+    /**
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
+    private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
+    {
+        $maxUnsignedBigint = '~0';
+
+        return $this->getConnection()->getCheckSql(
+            implode(
+                ' AND ',
+                [
+                    'tier_price_1.value_id is NULL',
+                    'tier_price_2.value_id is NULL',
+                    'tier_price_3.value_id is NULL',
+                    'tier_price_4.value_id is NULL'
+                ]
+            ),
+            'NULL',
+            $this->getConnection()->getLeastSql([
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_1', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_2', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_3', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_4', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+            ])
+        );
+    }
+
+    /**
+     * @param string $tableAlias
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
+    private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
+    {
+        return $this->getConnection()->getCheckSql(
+            sprintf('%s.value = 0', $tableAlias),
+            sprintf(
+                'ROUND(%s * (1 - ROUND(%s.percentage_value * cwd.rate, 4) / 100), 4)',
+                $priceExpression,
+                $tableAlias
+            ),
+            sprintf('ROUND(%s.value * cwd.rate, 4)', $tableAlias)
+        );
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
index 21a7647214c26..9a310c7365ac9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Factory.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
 
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+
 class Factory
 {
     /**
@@ -40,14 +42,17 @@ public function create($className, array $data = [])
     {
         $indexerPrice = $this->_objectManager->create($className, $data);
 
-        if (!$indexerPrice instanceof \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice) {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __(
-                    '%1 doesn\'t extend \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice',
-                    $className
-                )
-            );
+        if ($indexerPrice instanceof PriceInterface || $indexerPrice instanceof DimensionalIndexerInterface) {
+            return $indexerPrice;
         }
-        return $indexerPrice;
+
+        throw new \Magento\Framework\Exception\LocalizedException(
+            __(
+                'Price indexer "%1" must implement %2 or %3',
+                $className,
+                PriceInterface::class,
+                DimensionalIndexerInterface::class
+            )
+        );
     }
 }
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 89df6677f2490..7707fadffe98c 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/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php
new file mode 100644
index 0000000000000..fb3eef2bf38eb
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+/**
+ * Wrapper for structure of price index table.
+ */
+class IndexTableStructure
+{
+    /**
+     * @var string
+     */
+    private $tableName;
+
+    /**
+     * @var string
+     */
+    private $entityField;
+
+    /**
+     * @var string
+     */
+    private $customerGroupField;
+
+    /**
+     * @var string
+     */
+    private $websiteField;
+
+    /**
+     * @var string
+     */
+    private $taxClassField;
+
+    /**
+     * @var string
+     */
+    private $originalPriceField;
+
+    /**
+     * @var string
+     */
+    private $finalPriceField;
+
+    /**
+     * @var string
+     */
+    private $minPriceField;
+
+    /**
+     * @var string
+     */
+    private $maxPriceField;
+
+    /**
+     * @var string
+     */
+    private $tierPriceField;
+
+    /**
+     * @param string $tableName
+     * @param string $entityField
+     * @param string $customerGroupField
+     * @param string $websiteField
+     * @param string $taxClassField
+     * @param string $originalPriceField
+     * @param string $finalPriceField
+     * @param string $minPriceField
+     * @param string $maxPriceField
+     * @param string $tierPriceField
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $tableName,
+        string $entityField,
+        string $customerGroupField,
+        string $websiteField,
+        string $taxClassField,
+        string $originalPriceField,
+        string $finalPriceField,
+        string $minPriceField,
+        string $maxPriceField,
+        string $tierPriceField
+    ) {
+        $this->tableName = $tableName;
+        $this->entityField = $entityField;
+        $this->customerGroupField = $customerGroupField;
+        $this->websiteField = $websiteField;
+        $this->taxClassField = $taxClassField;
+        $this->originalPriceField = $originalPriceField;
+        $this->finalPriceField = $finalPriceField;
+        $this->minPriceField = $minPriceField;
+        $this->maxPriceField = $maxPriceField;
+        $this->tierPriceField = $tierPriceField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTableName(): string
+    {
+        return $this->tableName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityField(): string
+    {
+        return $this->entityField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCustomerGroupField(): string
+    {
+        return $this->customerGroupField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWebsiteField(): string
+    {
+        return $this->websiteField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTaxClassField(): string
+    {
+        return $this->taxClassField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalPriceField(): string
+    {
+        return $this->originalPriceField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFinalPriceField(): string
+    {
+        return $this->finalPriceField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMinPriceField(): string
+    {
+        return $this->minPriceField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMaxPriceField(): string
+    {
+        return $this->maxPriceField;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTierPriceField(): string
+    {
+        return $this->tierPriceField;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php
new file mode 100644
index 0000000000000..6ecb6aba89933
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+/**
+ * Interface for modifying price data in price index table.
+ */
+interface PriceModifierInterface
+{
+    /**
+     * Modify price data.
+     *
+     * @param IndexTableStructure $priceTable
+     * @param array $entityIds
+     * @return void
+     */
+    public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void;
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
new file mode 100644
index 0000000000000..0005ac8dea58a
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query;
+
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\ColumnValueExpression;
+use Magento\Framework\Indexer\Dimension;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
+/**
+ * Prepare base select for Product Price index limited by specified dimensions: website and customer group
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BaseFinalPrice
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var JoinAttributeProcessor
+     */
+    private $joinAttributeProcessor;
+
+    /**
+     * @var \Magento\Framework\Module\Manager
+     */
+    private $moduleManager;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * Mapping between dimensions and field in database
+     *
+     * @var array
+     */
+    private $dimensionToFieldMapper = [
+        WebsiteDimensionProvider::DIMENSION_NAME => 'pw.website_id',
+        CustomerGroupDimensionProvider::DIMENSION_NAME => 'cg.customer_group_id',
+    ];
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * BaseFinalPrice constructor.
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param JoinAttributeProcessor $joinAttributeProcessor
+     * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param string $connectionName
+     */
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resource,
+        JoinAttributeProcessor $joinAttributeProcessor,
+        \Magento\Framework\Module\Manager $moduleManager,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        $connectionName = 'indexer'
+    ) {
+        $this->resource = $resource;
+        $this->connectionName = $connectionName;
+        $this->joinAttributeProcessor = $joinAttributeProcessor;
+        $this->moduleManager = $moduleManager;
+        $this->eventManager = $eventManager;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * @param Dimension[] $dimensions
+     * @param string $productType
+     * @param array $entityIds
+     * @return Select
+     * @throws \LogicException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Select_Exception
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getQuery(array $dimensions, string $productType, array $entityIds = []): Select
+    {
+        $connection = $this->getConnection();
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $linkField = $metadata->getLinkField();
+
+        $select = $connection->select()->from(
+            ['e' => $this->getTable('catalog_product_entity')],
+            ['entity_id']
+        )->joinInner(
+            ['cg' => $this->getTable('customer_group')],
+            array_key_exists(CustomerGroupDimensionProvider::DIMENSION_NAME, $dimensions)
+                ? sprintf(
+                    '%s = %s',
+                    $this->dimensionToFieldMapper[CustomerGroupDimensionProvider::DIMENSION_NAME],
+                    $dimensions[CustomerGroupDimensionProvider::DIMENSION_NAME]->getValue()
+                ) : '',
+            ['customer_group_id']
+        )->joinInner(
+            ['pw' => $this->getTable('catalog_product_website')],
+            'pw.product_id = e.entity_id',
+            ['pw.website_id']
+        )->joinInner(
+            ['cwd' => $this->getTable('catalog_product_index_website')],
+            'pw.website_id = cwd.website_id',
+            []
+        )->joinLeft(
+            // we need this only for BCC in case someone expects table `tp` to be present in query
+            ['tp' => $this->getTable('catalog_product_index_tier_price')],
+            'tp.entity_id = e.entity_id AND' .
+            ' tp.customer_group_id = cg.customer_group_id AND tp.website_id = pw.website_id',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `All Websites` and Customer Group = `Specific Customer Group`
+            ['tier_price_1' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_1.' . $linkField . ' = e.' . $linkField . ' AND tier_price_1.all_groups = 0' .
+            ' AND tier_price_1.customer_group_id = cg.customer_group_id AND tier_price_1.qty = 1' .
+            ' AND tier_price_1.website_id = 0',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `Specific Website`
+            //and Customer Group = `Specific Customer Group`
+            ['tier_price_2' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_2.' . $linkField . ' = e.' . $linkField . ' AND tier_price_2.all_groups = 0 ' .
+            'AND tier_price_2.customer_group_id = cg.customer_group_id AND tier_price_2.qty = 1' .
+            ' AND tier_price_2.website_id = pw.website_id',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `All Websites` and Customer Group = `ALL GROUPS`
+            ['tier_price_3' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_3.' . $linkField . ' = e.' . $linkField . ' AND tier_price_3.all_groups = 1 ' .
+            'AND tier_price_3.customer_group_id = 0 AND tier_price_3.qty = 1 AND tier_price_3.website_id = 0',
+            []
+        )->joinLeft(
+            // calculate tier price specified as Website = `Specific Website` and Customer Group = `ALL GROUPS`
+            ['tier_price_4' => $this->getTable('catalog_product_entity_tier_price')],
+            'tier_price_4.' . $linkField . ' = e.' . $linkField . ' AND tier_price_4.all_groups = 1' .
+            ' AND tier_price_4.customer_group_id = 0 AND tier_price_4.qty = 1' .
+            ' AND tier_price_4.website_id = pw.website_id',
+            []
+        );
+
+        foreach ($dimensions as $dimension) {
+            if (!isset($this->dimensionToFieldMapper[$dimension->getName()])) {
+                throw new \LogicException(
+                    'Provided dimension is not valid for Price indexer: ' . $dimension->getName()
+                );
+            }
+            $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
+        }
+
+        if ($this->moduleManager->isEnabled('Magento_Tax')) {
+            $taxClassId = $this->joinAttributeProcessor->process($select, 'tax_class_id');
+        } else {
+            $taxClassId = new \Zend_Db_Expr(0);
+        }
+        $select->columns(['tax_class_id' => $taxClassId]);
+
+        $this->joinAttributeProcessor->process($select, 'status', Status::STATUS_ENABLED);
+
+        $price = $this->joinAttributeProcessor->process($select, 'price');
+        $specialPrice = $this->joinAttributeProcessor->process($select, 'special_price');
+        $specialFrom = $this->joinAttributeProcessor->process($select, 'special_from_date');
+        $specialTo = $this->joinAttributeProcessor->process($select, 'special_to_date');
+        $currentDate = 'cwd.website_date';
+
+        $maxUnsignedBigint = '~0';
+        $specialFromDate = $connection->getDatePartSql($specialFrom);
+        $specialToDate = $connection->getDatePartSql($specialTo);
+        $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
+        $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
+        $specialPriceExpr = $connection->getCheckSql(
+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
+            $specialPrice,
+            $maxUnsignedBigint
+        );
+        $tierPrice = $this->getTotalTierPriceExpression($price);
+        $tierPriceExpr = $connection->getIfNullSql($tierPrice, $maxUnsignedBigint);
+        $finalPrice = $connection->getLeastSql([
+            $price,
+            $specialPriceExpr,
+            $tierPriceExpr,
+        ]);
+
+        $select->columns(
+            [
+                //orig_price in catalog_product_index_price_final_tmp
+                'price' => $connection->getIfNullSql($price, 0),
+                //price in catalog_product_index_price_final_tmp
+                'final_price' => $connection->getIfNullSql($finalPrice, 0),
+                'min_price' => $connection->getIfNullSql($finalPrice, 0),
+                'max_price' => $connection->getIfNullSql($finalPrice, 0),
+                'tier_price' => $tierPrice,
+            ]
+        );
+
+        $select->where("e.type_id = ?", $productType);
+
+        if ($entityIds !== null) {
+            if (count($entityIds) > 1) {
+                $select->where(sprintf('e.entity_id BETWEEN %s AND %s', min($entityIds), max($entityIds)));
+            } else {
+                $select->where('e.entity_id = ?', $entityIds);
+            }
+        }
+
+        /**
+         * throw event for backward compatibility
+         */
+        $this->eventManager->dispatch(
+            'prepare_catalog_product_index_select',
+            [
+                'select' => $select,
+                'entity_field' => new ColumnValueExpression('e.entity_id'),
+                'website_field' => new ColumnValueExpression('pw.website_id'),
+                'store_field' => new ColumnValueExpression('cwd.default_store_id'),
+            ]
+        );
+
+        return $select;
+    }
+
+    /**
+     * Get total tier price expression
+     *
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
+    private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
+    {
+        $maxUnsignedBigint = '~0';
+
+        return $this->getConnection()->getCheckSql(
+            implode(
+                ' AND ',
+                [
+                    'tier_price_1.value_id is NULL',
+                    'tier_price_2.value_id is NULL',
+                    'tier_price_3.value_id is NULL',
+                    'tier_price_4.value_id is NULL'
+                ]
+            ),
+            'NULL',
+            $this->getConnection()->getLeastSql([
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_1', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_2', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_3', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+                $this->getConnection()->getIfNullSql(
+                    $this->getTierPriceExpressionForTable('tier_price_4', $priceExpression),
+                    $maxUnsignedBigint
+                ),
+            ])
+        );
+    }
+
+    /**
+     * Get tier price expression for table
+     *
+     * @param $tableAlias
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
+    private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression): \Zend_Db_Expr
+    {
+        return $this->getConnection()->getCheckSql(
+            sprintf('%s.value = 0', $tableAlias),
+            sprintf(
+                'ROUND(%s * (1 - ROUND(%s.percentage_value * cwd.rate, 4) / 100), 4)',
+                $priceExpression,
+                $tableAlias
+            ),
+            sprintf('ROUND(%s.value * cwd.rate, 4)', $tableAlias)
+        );
+    }
+
+    /**
+     * Get connection
+     *
+     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @throws \DomainException
+     */
+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+    {
+        if ($this->connection === null) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Get table
+     *
+     * @param string $tableName
+     * @return string
+     */
+    private function getTable($tableName)
+    {
+        return $this->resource->getTableName($tableName, $this->connectionName);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/JoinAttributeProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/JoinAttributeProcessor.php
new file mode 100644
index 0000000000000..888e68a817081
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/JoinAttributeProcessor.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\Expression;
+
+/**
+ * Allows to join product attribute to Select. Used for build price index for specified dimension
+ */
+class JoinAttributeProcessor
+{
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param string $connectionName
+     */
+    public function __construct(
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        \Magento\Framework\App\ResourceConnection $resource,
+        $connectionName = 'indexer'
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->metadataPool = $metadataPool;
+        $this->resource = $resource;
+        $this->connectionName = $connectionName;
+    }
+
+    /**
+     * @param Select $select
+     * @param string $attributeCode
+     * @param string|null $attributeValue
+     * @return \Zend_Db_Expr
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Select_Exception
+     */
+    public function process(Select $select, $attributeCode, $attributeValue = null): \Zend_Db_Expr
+    {
+        $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+        $attributeId = $attribute->getAttributeId();
+        $attributeTable = $attribute->getBackend()->getTable();
+        $connection = $this->resource->getConnection($this->connectionName);
+        $joinType = $attributeValue !== null ? 'join' : 'joinLeft';
+        $productIdField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
+        if ($attribute->isScopeGlobal()) {
+            $alias = 'ta_' . $attributeCode;
+            $select->{$joinType}(
+                [$alias => $attributeTable],
+                "{$alias}.{$productIdField} = e.{$productIdField} AND {$alias}.attribute_id = {$attributeId}" .
+                " AND {$alias}.store_id = 0",
+                []
+            );
+            $whereExpression = new Expression("{$alias}.value");
+        } else {
+            $dAlias = 'tad_' . $attributeCode;
+            $sAlias = 'tas_' . $attributeCode;
+
+            $select->{$joinType}(
+                [$dAlias => $attributeTable],
+                "{$dAlias}.{$productIdField} = e.{$productIdField} AND {$dAlias}.attribute_id = {$attributeId}" .
+                " AND {$dAlias}.store_id = 0",
+                []
+            );
+            $select->joinLeft(
+                [$sAlias => $attributeTable],
+                "{$sAlias}.{$productIdField} = e.{$productIdField} AND {$sAlias}.attribute_id = {$attributeId}" .
+                " AND {$sAlias}.store_id = cwd.default_store_id",
+                []
+            );
+            $whereExpression = $connection->getCheckSql(
+                $connection->getIfNullSql("{$sAlias}.value_id", -1) . ' > 0',
+                "{$sAlias}.value",
+                "{$dAlias}.value"
+            );
+        }
+
+        if ($attributeValue !== null) {
+            $select->where("{$whereExpression} = ?", $attributeValue);
+        }
+
+        return $whereExpression;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/SimpleProductPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/SimpleProductPrice.php
new file mode 100644
index 0000000000000..5a055e5ed9603
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/SimpleProductPrice.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+
+/**
+ * Simple Product Type Price Indexer
+ */
+class SimpleProductPrice implements DimensionalIndexerInterface
+{
+    /**
+     * @var BaseFinalPrice
+     */
+    private $baseFinalPrice;
+
+    /**
+     * @var IndexTableStructureFactory
+     */
+    private $indexTableStructureFactory;
+
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @var string
+     */
+    private $productType;
+
+    /**
+     * @var BasePriceModifier
+     */
+    private $basePriceModifier;
+
+    /**
+     * @param BaseFinalPrice $baseFinalPrice
+     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param TableMaintainer $tableMaintainer
+     * @param BasePriceModifier $basePriceModifier
+     * @param string $productType
+     */
+    public function __construct(
+        BaseFinalPrice $baseFinalPrice,
+        IndexTableStructureFactory $indexTableStructureFactory,
+        TableMaintainer $tableMaintainer,
+        BasePriceModifier $basePriceModifier,
+        $productType = \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+    ) {
+        $this->baseFinalPrice = $baseFinalPrice;
+        $this->indexTableStructureFactory = $indexTableStructureFactory;
+        $this->tableMaintainer = $tableMaintainer;
+        $this->productType = $productType;
+        $this->basePriceModifier = $basePriceModifier;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
+    {
+        $this->tableMaintainer->createMainTmpTable($dimensions);
+
+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+            'entityField' => 'entity_id',
+            'customerGroupField' => 'customer_group_id',
+            'websiteField' => 'website_id',
+            'taxClassField' => 'tax_class_id',
+            'originalPriceField' => 'price',
+            'finalPriceField' => 'final_price',
+            'minPriceField' => 'min_price',
+            'maxPriceField' => 'max_price',
+            'tierPriceField' => 'tier_price',
+        ]);
+        $select = $this->baseFinalPrice->getQuery($dimensions, $this->productType, iterator_to_array($entityIds));
+        $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
+        $this->tableMaintainer->getConnection()->query($query);
+
+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
new file mode 100644
index 0000000000000..a866c1eaa413f
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice as TierPriceResourceModel;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\DB\Select;
+
+/**
+ * Class for filling tier price index table.
+ */
+class TierPrice extends AbstractDb
+{
+    /**
+     * @var TierPriceResourceModel
+     */
+    private $tierPriceResourceModel;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @param Context $context
+     * @param TierPriceResourceModel $tierPriceResourceModel
+     * @param MetadataPool $metadataPool
+     * @param ProductAttributeRepositoryInterface $attributeRepository
+     * @param string|null $connectionName
+     */
+    public function __construct(
+        Context $context,
+        TierPriceResourceModel $tierPriceResourceModel,
+        MetadataPool $metadataPool,
+        ProductAttributeRepositoryInterface $attributeRepository,
+        string $connectionName = null
+    ) {
+        parent::__construct($context, $connectionName);
+
+        $this->tierPriceResourceModel = $tierPriceResourceModel;
+        $this->metadataPool = $metadataPool;
+        $this->attributeRepository = $attributeRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init('catalog_product_index_tier_price', 'entity_id');
+    }
+
+    /**
+     * Reindex tier price for entities.
+     *
+     * @param array $entityIds
+     * @return void
+     */
+    public function reindexEntity(array $entityIds = [])
+    {
+        $this->getConnection()->delete($this->getMainTable(), ['entity_id IN (?)' => $entityIds]);
+
+        //separate by variations for increase performance
+        $tierPriceVariations = [
+            [true, true], //all websites; all customer groups
+            [true, false], //all websites; specific customer group
+            [false, true], //specific website; all customer groups
+            [false, false], //specific website; specific customer group
+        ];
+        foreach ($tierPriceVariations as $variation) {
+            list ($isAllWebsites, $isAllCustomerGroups) = $variation;
+            $select = $this->getTierPriceSelect($isAllWebsites, $isAllCustomerGroups, $entityIds);
+            $query = $select->insertFromSelect($this->getMainTable());
+            $this->getConnection()->query($query);
+        }
+    }
+
+    /**
+     * Join websites table.
+     * If $isAllWebsites is true, for each website will be used default value for all websites,
+     * otherwise per each website will be used their own values.
+     *
+     * @param Select $select
+     * @param bool $isAllWebsites
+     */
+    private function joinWebsites(Select $select, bool $isAllWebsites)
+    {
+        $websiteTable = ['website' => $this->getTable('store_website')];
+        if ($isAllWebsites) {
+            $select->joinCross($websiteTable, [])
+                ->where('website.website_id > ?', 0)
+                ->where('tier_price.website_id = ?', 0);
+        } else {
+            $select->join($websiteTable, 'website.website_id = tier_price.website_id', [])
+                ->where('tier_price.website_id > 0');
+        }
+    }
+
+    /**
+     * Join customer groups table.
+     * If $isAllCustomerGroups is true, for each customer group will be used default value for all customer groups,
+     * otherwise per each customer group will be used their own values.
+     *
+     * @param Select $select
+     * @param bool $isAllCustomerGroups
+     */
+    private function joinCustomerGroups(Select $select, bool $isAllCustomerGroups)
+    {
+        $customerGroupTable = ['customer_group' => $this->getTable('customer_group')];
+        if ($isAllCustomerGroups) {
+            $select->joinCross($customerGroupTable, [])
+                ->where('tier_price.all_groups = ?', 1)
+                ->where('tier_price.customer_group_id = ?', 0);
+        } else {
+            $select->join($customerGroupTable, 'customer_group.customer_group_id = tier_price.customer_group_id', [])
+                ->where('tier_price.all_groups = ?', 0);
+        }
+    }
+
+    /**
+     * Join price table and return price value.
+     *
+     * @param Select $select
+     * @param string $linkField
+     * @return string
+     */
+    private function joinPrice(Select $select, string $linkField): string
+    {
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
+        $priceAttribute = $this->attributeRepository->get('price');
+        $select->joinLeft(
+            ['entity_price_default' => $priceAttribute->getBackend()->getTable()],
+            'entity_price_default.' . $linkField . ' = entity.' . $linkField
+            . ' AND entity_price_default.attribute_id = ' . $priceAttribute->getAttributeId()
+            . ' AND entity_price_default.store_id = 0',
+            []
+        );
+        $priceValue = 'entity_price_default.value';
+
+        if (!$priceAttribute->isScopeGlobal()) {
+            $select->joinLeft(
+                ['store_group' => $this->getTable('store_group')],
+                'store_group.group_id = website.default_group_id',
+                []
+            )->joinLeft(
+                ['entity_price_store' => $priceAttribute->getBackend()->getTable()],
+                'entity_price_store.' . $linkField . ' = entity.' . $linkField
+                . ' AND entity_price_store.attribute_id = ' . $priceAttribute->getAttributeId()
+                . ' AND entity_price_store.store_id = store_group.default_store_id',
+                []
+            );
+            $priceValue = $this->getConnection()
+                ->getIfNullSql('entity_price_store.value', 'entity_price_default.value');
+        }
+
+        return (string) $priceValue;
+    }
+
+    /**
+     * Build select for getting tier price data.
+     *
+     * @param bool $isAllWebsites
+     * @param bool $isAllCustomerGroups
+     * @param array $entityIds
+     * @return Select
+     */
+    private function getTierPriceSelect(bool $isAllWebsites, bool $isAllCustomerGroups, array $entityIds = []): Select
+    {
+        $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $entityMetadata->getLinkField();
+
+        $select = $this->getConnection()->select();
+        $select->from(['tier_price' => $this->tierPriceResourceModel->getMainTable()], [])
+            ->where('tier_price.qty = ?', 1);
+
+        $select->join(
+            ['entity' => $this->getTable('catalog_product_entity')],
+            "entity.{$linkField} = tier_price.{$linkField}",
+            []
+        );
+        if (!empty($entityIds)) {
+            $select->where('entity.entity_id IN (?)', $entityIds);
+        }
+        $this->joinWebsites($select, $isAllWebsites);
+        $this->joinCustomerGroups($select, $isAllCustomerGroups);
+
+        $priceValue = $this->joinPrice($select, $linkField);
+        $tierPriceValue = 'tier_price.value';
+        $tierPricePercentageValue = 'tier_price.percentage_value';
+        $tierPriceValueExpr = $this->getConnection()->getCheckSql(
+            $tierPriceValue,
+            $tierPriceValue,
+            sprintf('(1 - %s / 100) * %s', $tierPricePercentageValue, $priceValue)
+        );
+        $select->columns(
+            [
+                'entity.entity_id',
+                'customer_group.customer_group_id',
+                'website.website_id',
+                'tier_price' => $tierPriceValueExpr,
+            ]
+        );
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
index 4b420329eef99..ef3f83e5ffa7e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
 /**
  * Catalog product link resource model
  *
@@ -136,7 +138,6 @@ public function saveProductLinks($parentId, $data, $typeId)
             $data = [];
         }
 
-        $attributes = $this->getAttributesByType($typeId);
         $connection = $this->getConnection();
 
         $bind = [':product_id' => (int)$parentId, ':link_type_id' => (int)$typeId];
@@ -151,42 +152,38 @@ public function saveProductLinks($parentId, $data, $typeId)
 
         $links = $connection->fetchPairs($select, $bind);
 
-        foreach ($data as $linkedProductId => $linkInfo) {
-            $linkId = null;
-            if (isset($links[$linkedProductId])) {
-                $linkId = $links[$linkedProductId];
-                unset($links[$linkedProductId]);
-            } else {
-                $bind = [
-                    'product_id' => $parentId,
-                    'linked_product_id' => $linkedProductId,
-                    'link_type_id' => $typeId,
-                ];
-                $connection->insert($this->getMainTable(), $bind);
-                $linkId = $connection->lastInsertId($this->getMainTable());
-            }
+        list($insertData, $updateData, $deleteConditions) = $this->prepareProductLinksData(
+            $parentId,
+            $data,
+            $typeId,
+            $links
+        );
 
-            foreach ($attributes as $attributeInfo) {
-                $attributeTable = $this->getAttributeTypeTable($attributeInfo['type']);
-                if ($attributeTable) {
-                    if (isset($linkInfo[$attributeInfo['code']])) {
-                        $value = $this->_prepareAttributeValue(
-                            $attributeInfo['type'],
-                            $linkInfo[$attributeInfo['code']]
-                        );
-                        $bind = [
-                            'product_link_attribute_id' => $attributeInfo['id'],
-                            'link_id' => $linkId,
-                            'value' => $value,
-                        ];
-                        $connection->insertOnDuplicate($attributeTable, $bind, ['value']);
-                    } else {
-                        $connection->delete(
-                            $attributeTable,
-                            ['link_id = ?' => $linkId, 'product_link_attribute_id = ?' => $attributeInfo['id']]
-                        );
-                    }
-                }
+        if ($insertData) {
+            $insertColumns = [
+                'product_link_attribute_id',
+                'link_id',
+                'value',
+            ];
+            foreach ($insertData as $table => $values) {
+                $connection->insertArray($table, $insertColumns, $values, AdapterInterface::INSERT_IGNORE);
+            }
+        }
+        if ($updateData) {
+            // for mass update product links with constraint by unique key use insert on duplicate statement
+            foreach ($updateData as $table => $values) {
+                $connection->insertOnDuplicate($table, $values, ['value']);
+            }
+        }
+        if ($deleteConditions) {
+            foreach ($deleteConditions as $table => $deleteCondition) {
+                $connection->delete(
+                    $table,
+                    [
+                        'link_id = ?' => $deleteCondition['link_id'],
+                        'product_link_attribute_id = ?' => $deleteCondition['product_link_attribute_id']
+                    ]
+                );
             }
         }
 
@@ -302,4 +299,69 @@ public function getParentIdsByChild($childId, $typeId)
 
         return $parentIds;
     }
+
+    /**
+     * Prepare data for insert, update or delete product link attributes
+     *
+     * @param int $parentId
+     * @param array $data
+     * @param int $typeId
+     * @param array $links
+     * @return array
+     */
+    private function prepareProductLinksData($parentId, $data, $typeId, $links)
+    {
+        $connection =  $this->getConnection();
+        $attributes = $this->getAttributesByType($typeId);
+
+        $insertData = [];
+        $updateData = [];
+        $deleteConditions = [];
+
+        foreach ($data as $linkedProductId => $linkInfo) {
+            $linkId = null;
+            if (isset($links[$linkedProductId])) {
+                $linkId = $links[$linkedProductId];
+            } else {
+                $bind = [
+                    'product_id' => $parentId,
+                    'linked_product_id' => $linkedProductId,
+                    'link_type_id' => $typeId,
+                ];
+                $connection->insert($this->getMainTable(), $bind);
+                $linkId = $connection->lastInsertId($this->getMainTable());
+            }
+
+            foreach ($attributes as $attributeInfo) {
+                $attributeTable = $this->getAttributeTypeTable($attributeInfo['type']);
+                if (!$attributeTable) {
+                    continue;
+                }
+                if (isset($linkInfo[$attributeInfo['code']])) {
+                    $value = $this->_prepareAttributeValue(
+                        $attributeInfo['type'],
+                        $linkInfo[$attributeInfo['code']]
+                    );
+                    if (isset($links[$linkedProductId])) {
+                        $updateData[$attributeTable][] = [
+                            'product_link_attribute_id' => $attributeInfo['id'],
+                            'link_id' => $linkId,
+                            'value' => $value,
+                        ];
+                    } else {
+                        $insertData[$attributeTable][] = [
+                            'product_link_attribute_id' => $attributeInfo['id'],
+                            'link_id' => $linkId,
+                            'value' => $value,
+                        ];
+                    }
+                } else {
+                    $deleteConditions[$attributeTable]['link_id'][] = $linkId;
+                    $deleteConditions[$attributeTable]['product_link_attribute_id'][] = $attributeInfo['id'];
+                }
+            }
+        }
+
+        return [$insertData, $updateData, $deleteConditions];
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
index 600b05e39fc68..024c87c9fc886 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
@@ -72,8 +72,8 @@ public function execute($entityType, $entity)
         $linkedProduct = $this->productRepository->get($entity->getLinkedProductSku());
         $product = $this->productRepository->get($entity->getSku());
         $linkTypesToId = $this->linkTypeProvider->getLinkTypes();
-        $prodyctHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
-        $productData = $prodyctHydrator->extract($product);
+        $productHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
+        $productData = $productHydrator->extract($product);
         $linkId = $this->linkResource->getProductLinkId(
             $productData[$this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()],
             $linkedProduct->getId(),
@@ -93,7 +93,9 @@ public function execute($entityType, $entity)
         try {
             $this->linkResource->deleteProductLink($linkId);
         } catch (\Exception $exception) {
-            throw new CouldNotDeleteException(__('Invalid data provided for linked products'));
+            throw new CouldNotDeleteException(
+                __('The linked products data is invalid. Verify the data and try again.')
+            );
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
index 5dc8a89465255..c40872ed64bed 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
@@ -97,15 +97,15 @@ public function execute($entityType, $entity)
 
         try {
             $linkTypesToId = $this->linkTypeProvider->getLinkTypes();
-            $prodyctHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
-            $productData = $prodyctHydrator->extract($product);
+            $productHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
+            $productData = $productHydrator->extract($product);
             $this->linkResource->saveProductLinks(
                 $productData[$this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()],
                 $links,
                 $linkTypesToId[$entity->getLinkType()]
             );
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Invalid data provided for linked products'));
+            throw new CouldNotSaveException(__('The linked products data is invalid. Verify the data and try again.'));
         }
         return $entity;
     }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
index f018e2b148f15..8841b6059c46f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
@@ -95,6 +95,7 @@ public function build($productId)
             ->where('t.attribute_id = ?', $priceAttribute->getAttributeId())
             ->where('t.value IS NOT NULL')
             ->order('t.value ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
index b4459cd1eea07..5c47185a85bf4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -139,6 +139,7 @@ public function build($productId)
                 'special_to.value IS NULL OR ' . $connection->getDatePartSql('special_to.value') .' >= ?',
                 $currentDate
             )->order('t.value ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $specialPrice = $this->baseSelectProcessor->process($specialPrice);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
index 79323e57b033e..37281193d6a1b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
@@ -97,6 +97,7 @@ public function build($productId)
             ->where('t.all_groups = 1 OR customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->where('t.qty = ?', 1)
             ->order('t.value ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
index 4775b96e3a448..179da06b59990 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
@@ -307,7 +307,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
     }
 
     /**
-     * Get first col from from first row for option table
+     * Get first col from first row for option table
      *
      * @param string $tableName
      * @param int $optionId
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
index 91bb99ca971a7..318c9bd132ccd 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
@@ -85,6 +85,7 @@ protected function _construct()
 
     /**
      * Proceed operations after object is saved
+     *
      * Save options store data
      *
      * @param AbstractModel $object
@@ -160,19 +161,22 @@ protected function _saveValuePrices(AbstractModel $object)
             && isset($objectPrice)
             && $object->getStoreId() != Store::DEFAULT_STORE_ID
         ) {
-            $baseCurrency = $this->_config->getValue(
+            $website  = $this->_storeManager->getStore($object->getStoreId())->getWebsite();
+
+            $websiteBaseCurrency = $this->_config->getValue(
                 Currency::XML_PATH_CURRENCY_BASE,
-                'default'
+                ScopeInterface::SCOPE_WEBSITE,
+                $website
             );
 
-            $storeIds = $this->_storeManager->getStore($object->getStoreId())->getWebsite()->getStoreIds();
+            $storeIds = $website->getStoreIds();
             if (is_array($storeIds)) {
                 foreach ($storeIds as $storeId) {
                     if ($priceType == 'fixed') {
                         $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
                         /** @var $currencyModel Currency */
                         $currencyModel = $this->_currencyFactory->create();
-                        $currencyModel->load($baseCurrency);
+                        $currencyModel->load($websiteBaseCurrency);
                         $rate = $currencyModel->getRate($storeCurrency);
                         if (!$rate) {
                             $rate = 1;
@@ -256,7 +260,8 @@ protected function _saveValueTitles(AbstractModel $object)
                 $object->unsetData('title');
             }
 
-            if ($object->getTitle()) {
+            /*** Checking whether title is not null ***/
+            if ($object->getTitle()!= null) {
                 if ($existInCurrentStore) {
                     if ($storeId == $object->getStoreId()) {
                         $where = [
@@ -300,7 +305,7 @@ protected function _saveValueTitles(AbstractModel $object)
     }
 
     /**
-     * Get first col from from first row for option table
+     * Get first col from first row for option table
      *
      * @param string $tableName
      * @param int $optionId
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
index c7829ab3a31d2..c5c656b726528 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php
@@ -13,6 +13,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class StatusBaseSelectProcessor
@@ -30,28 +31,32 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
     private $metadataPool;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @param Config $eavConfig
      * @param MetadataPool $metadataPool
      * @param StoreResolverInterface $storeResolver
+     * @param StoreManagerInterface $storeManager
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Config $eavConfig,
         MetadataPool $metadataPool,
-        StoreResolverInterface $storeResolver
+        StoreResolverInterface $storeResolver,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->eavConfig = $eavConfig;
         $this->metadataPool = $metadataPool;
-        $this->storeResolver = $storeResolver;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
-     * @param Select $select
-     * @return Select
+     * @inheritdoc
      */
     public function process(Select $select)
     {
@@ -70,7 +75,7 @@ public function process(Select $select)
             ['status_attr' => $statusAttribute->getBackendTable()],
             "status_attr.{$linkField} = " . self::PRODUCT_TABLE_ALIAS . ".{$linkField}"
             . ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
-            . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
+            . ' AND status_attr.store_id = ' . $this->storeManager->getStore()->getId(),
             []
         );
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Url.php b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
index 1cb2fed839dde..be95f088a2477 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Url.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
@@ -14,6 +14,7 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Class Url
@@ -101,6 +102,11 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $metadataPool;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * Url constructor.
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -110,6 +116,7 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\Category $catalogCategory
      * @param \Psr\Log\LoggerInterface $logger
      * @param null $connectionName
+     * @param TableMaintainer|null $tableMaintainer
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -118,7 +125,8 @@ public function __construct(
         Product $productResource,
         \Magento\Catalog\Model\Category $catalogCategory,
         \Psr\Log\LoggerInterface $logger,
-        $connectionName = null
+        $connectionName = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_eavConfig = $eavConfig;
@@ -126,6 +134,7 @@ public function __construct(
         $this->_catalogCategory = $catalogCategory;
         $this->_logger = $logger;
         parent::__construct($context, $connectionName);
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -621,7 +630,7 @@ public function getProduct($productId, $storeId)
     }
 
     /**
-     * Retrieve Product data obects for store
+     * Retrieve Product data objects for store
      *
      * @param int $storeId
      * @param int &$lastEntityId
@@ -655,43 +664,52 @@ public function getRewriteByProductStore(array $products)
         }
         $connection = $this->getConnection();
 
-        $select = $connection->select()->from(
-            ['i' => $this->getTable('catalog_category_product_index')],
-            ['product_id', 'store_id', 'visibility']
-        )->joinLeft(
-            ['u' => $this->getMainTable()],
-            'i.product_id = u.entity_id AND i.store_id = u.store_id'
-            . ' AND u.entity_type = "' . ProductUrlRewriteGenerator::ENTITY_TYPE . '"',
-            ['request_path']
-        )->joinLeft(
-            ['r' => $this->getTable('catalog_url_rewrite_product_category')],
-            'u.url_rewrite_id = r.url_rewrite_id AND r.category_id is NULL',
-            []
-        );
-
-        $bind = [];
+        $storesProducts = [];
         foreach ($products as $productId => $storeId) {
-            $catId = $this->_storeManager->getStore($storeId)->getRootCategoryId();
-            $productBind = 'product_id' . $productId;
-            $storeBind = 'store_id' . $storeId;
-            $catBind = 'category_id' . $catId;
-            $cond = '(' . implode(
-                ' AND ',
-                ['i.product_id = :' . $productBind, 'i.store_id = :' . $storeBind, 'i.category_id = :' . $catBind]
-            ) . ')';
-            $bind[$productBind] = $productId;
-            $bind[$storeBind] = $storeId;
-            $bind[$catBind] = $catId;
-            $select->orWhere($cond);
+            $storesProducts[$storeId][] = $productId;
         }
 
-        $rowSet = $connection->fetchAll($select, $bind);
-        foreach ($rowSet as $row) {
-            $result[$row['product_id']] = [
-                'store_id' => $row['store_id'],
-                'visibility' => $row['visibility'],
-                'url_rewrite' => $row['request_path'],
-            ];
+        foreach ($storesProducts as $storeId => $productIds) {
+            $select = $connection->select()->from(
+                ['i' => $this->tableMaintainer->getMainTable($storeId)],
+                ['product_id', 'store_id', 'visibility']
+            )->joinLeft(
+                ['u' => $this->getMainTable()],
+                'i.product_id = u.entity_id AND i.store_id = u.store_id'
+                . ' AND u.entity_type = "' . ProductUrlRewriteGenerator::ENTITY_TYPE . '"',
+                ['request_path']
+            )->joinLeft(
+                ['r' => $this->getTable('catalog_url_rewrite_product_category')],
+                'u.url_rewrite_id = r.url_rewrite_id AND r.category_id is NULL',
+                []
+            );
+
+            $bind = [];
+            foreach ($productIds as $productId) {
+                $catId = $this->_storeManager->getStore($storeId)->getRootCategoryId();
+                $productBind = 'product_id' . $productId;
+                $storeBind = 'store_id' . $storeId;
+                $catBind = 'category_id' . $catId;
+                $bindArray = [
+                    'i.product_id = :' . $productBind,
+                    'i.store_id = :' . $storeBind,
+                    'i.category_id = :' . $catBind
+                ];
+                $cond = '(' . implode(' AND ', $bindArray) . ')';
+                $bind[$productBind] = $productId;
+                $bind[$storeBind] = $storeId;
+                $bind[$catBind] = $catId;
+                $select->orWhere($cond);
+            }
+
+            $rowSet = $connection->fetchAll($select, $bind);
+            foreach ($rowSet as $row) {
+                $result[$row['product_id']] = [
+                    'store_id' => $row['store_id'],
+                    'visibility' => $row['visibility'],
+                    'url_rewrite' => $row['request_path'],
+                ];
+            }
         }
 
         return $result;
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index b4445510d49e2..1eb30ff95a40b 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -125,7 +125,7 @@ public function viewDirective($construction)
      */
     public function mediaDirective($construction)
     {
-        $params = $this->getParameters($construction[2]);
+        $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
                 ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
diff --git a/app/code/Magento/Catalog/Model/View/Asset/Image.php b/app/code/Magento/Catalog/Model/View/Asset/Image.php
index ce85ba21d211f..dfae9f4b0da9c 100644
--- a/app/code/Magento/Catalog/Model/View/Asset/Image.php
+++ b/app/code/Magento/Catalog/Model/View/Asset/Image.php
@@ -19,6 +19,13 @@
  */
 class Image implements LocalInterface
 {
+    /**
+     * Image type of image (thumbnail,small_image,image,swatch_image,swatch_thumb)
+     *
+     * @var string
+     */
+    private $sourceContentType;
+
     /**
      * @var string
      */
@@ -65,8 +72,14 @@ public function __construct(
         ContextInterface $context,
         EncryptorInterface $encryptor,
         $filePath,
-        array $miscParams = []
+        array $miscParams
     ) {
+        if (isset($miscParams['image_type'])) {
+            $this->sourceContentType = $miscParams['image_type'];
+            unset($miscParams['image_type']);
+        } else {
+            $this->sourceContentType = $this->contentType;
+        }
         $this->mediaConfig = $mediaConfig;
         $this->context = $context;
         $this->filePath = $filePath;
@@ -79,7 +92,7 @@ public function __construct(
      */
     public function getUrl()
     {
-        return $this->context->getBaseUrl() . $this->getRelativePath(DIRECTORY_SEPARATOR);
+        return $this->context->getBaseUrl() . DIRECTORY_SEPARATOR . $this->getImageInfo();
     }
 
     /**
@@ -95,22 +108,7 @@ public function getContentType()
      */
     public function getPath()
     {
-        return $this->getAbsolutePath($this->context->getPath());
-    }
-
-    /**
-     * Subroutine for building path
-     *
-     * @param string $path
-     * @param string $item
-     * @return string
-     */
-    private function join($path, $item)
-    {
-        return trim(
-            $path . ($item ? DIRECTORY_SEPARATOR . ltrim($item, DIRECTORY_SEPARATOR) : ''),
-            DIRECTORY_SEPARATOR
-        );
+        return $this->context->getPath() . DIRECTORY_SEPARATOR . $this->getImageInfo();
     }
 
     /**
@@ -119,7 +117,7 @@ private function join($path, $item)
     public function getSourceFile()
     {
         return $this->mediaConfig->getBaseMediaPath()
-            . DIRECTORY_SEPARATOR . ltrim($this->filePath, DIRECTORY_SEPARATOR);
+            . DIRECTORY_SEPARATOR . ltrim($this->getFilePath(), DIRECTORY_SEPARATOR);
     }
 
     /**
@@ -129,7 +127,7 @@ public function getSourceFile()
      */
     public function getSourceContentType()
     {
-        return $this->contentType;
+        return $this->sourceContentType;
     }
 
     /**
@@ -172,35 +170,43 @@ public function getModule()
      */
     private function getMiscPath()
     {
-        return $this->encryptor->hash(implode('_', $this->miscParams), Encryptor::HASH_VERSION_MD5);
+        return $this->encryptor->hash(
+            implode('_', $this->convertToReadableFormat($this->miscParams)),
+            Encryptor::HASH_VERSION_MD5
+        );
     }
 
     /**
-     * Generate absolute path
+     * Generate path from image info
      *
-     * @param string $result
      * @return string
      */
-    private function getAbsolutePath($result)
+    private function getImageInfo()
     {
-        $prefix = (substr($result, 0, 1) == DIRECTORY_SEPARATOR) ? DIRECTORY_SEPARATOR : '';
-        $result = $this->join($result, $this->getModule());
-        $result = $this->join($result, $this->getMiscPath());
-        $result = $this->join($result, $this->getFilePath());
-        return $prefix . $result;
+        $path = $this->getModule()
+            . DIRECTORY_SEPARATOR . $this->getMiscPath()
+            . DIRECTORY_SEPARATOR . $this->getFilePath();
+        return preg_replace('|\Q'. DIRECTORY_SEPARATOR . '\E+|', DIRECTORY_SEPARATOR, $path);
     }
 
     /**
-     * Generate relative path
-     *
-     * @param string $result
-     * @return string
+     * Converting bool into a string representation
+     * @param $miscParams
+     * @return array
      */
-    private function getRelativePath($result)
+    private function convertToReadableFormat($miscParams)
     {
-        $result = $this->join($result, $this->getModule());
-        $result = $this->join($result, $this->getMiscPath());
-        $result = $this->join($result, $this->getFilePath());
-        return DIRECTORY_SEPARATOR . $result;
+        $miscParams['image_height'] = 'h:' . ($miscParams['image_height'] ?? 'empty');
+        $miscParams['image_width'] = 'w:' . ($miscParams['image_width'] ?? 'empty');
+        $miscParams['quality'] = 'q:' . ($miscParams['quality'] ?? 'empty');
+        $miscParams['angle'] = 'r:' . ($miscParams['angle'] ?? 'empty');
+        $miscParams['keep_aspect_ratio'] = (isset($miscParams['keep_aspect_ratio']) ? '' : 'non') . 'proportional';
+        $miscParams['keep_frame'] = (isset($miscParams['keep_frame']) ? '' : 'no') . 'frame';
+        $miscParams['keep_transparency'] = (isset($miscParams['keep_transparency']) ? '' : 'no') . 'transparency';
+        $miscParams['constrain_only'] = (isset($miscParams['constrain_only']) ? 'do' : 'not') . 'constrainonly';
+        $miscParams['background'] = isset($miscParams['background'])
+            ? 'rgb' . implode(',', $miscParams['background'])
+            : 'nobackground';
+        return $miscParams;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/View/Asset/Image/Context.php b/app/code/Magento/Catalog/Model/View/Asset/Image/Context.php
index 5b9f6d33d3aa8..49d150a31750c 100644
--- a/app/code/Magento/Catalog/Model/View/Asset/Image/Context.php
+++ b/app/code/Magento/Catalog/Model/View/Asset/Image/Context.php
@@ -37,6 +37,8 @@ class Context implements ContextInterface
     private $filesystem;
 
     /**
+     * @param \Magento\Catalog\Model\Product\Media\ConfigInterface $mediaConfig
+     * @param \Magento\Framework\Filesystem $filesystem
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Media\ConfigInterface $mediaConfig,
diff --git a/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php b/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php
new file mode 100644
index 0000000000000..ca87efaa87490
--- /dev/null
+++ b/app/code/Magento/Catalog/Observer/CategoryProductIndexer.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Observer;
+
+use Magento\Catalog\Model\Indexer\Category\Product\Processor;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Checks if a category has changed products and depends on indexer configuration.
+ */
+class CategoryProductIndexer implements ObserverInterface
+{
+    /**
+     * @var Processor
+     */
+    private $processor;
+
+    /**
+     * @param Processor $processor
+     */
+    public function __construct(Processor $processor)
+    {
+        $this->processor = $processor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(Observer $observer): void
+    {
+        $productIds = $observer->getEvent()->getProductIds();
+        if (!empty($productIds) && $this->processor->isIndexerScheduled()) {
+            $this->processor->markIndexerAsInvalid();
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php b/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php
new file mode 100644
index 0000000000000..91d2868afab8c
--- /dev/null
+++ b/app/code/Magento/Catalog/Observer/ImageResizeAfterProductSave.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\App\State;
+use Magento\MediaStorage\Service\ImageResize;
+
+class ImageResizeAfterProductSave implements ObserverInterface
+{
+    /**
+     * @var ImageResize
+     */
+    private $imageResize;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * Product constructor.
+     * @param ImageResize $imageResize
+     * @param State $state
+     */
+    public function __construct(
+        ImageResize $imageResize,
+        State $state
+    ) {
+        $this->imageResize = $imageResize;
+        $this->state = $state;
+    }
+
+    /**
+     * Process event on 'save_commit_after' event
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        /** @var $product \Magento\Catalog\Model\Product */
+        $product = $observer->getEvent()->getProduct();
+
+        if ($this->state->isAreaCodeEmulated()) {
+            return;
+        }
+
+        if (!(bool) $product->getId()) {
+            foreach ($product->getMediaGalleryImages() as $image) {
+                $this->imageResize->resizeFromImageName($image->getFile());
+            }
+        } else {
+            $new = $product->getData('media_gallery');
+            $original = $product->getOrigData('media_gallery');
+            $mediaGallery = !empty($new['images']) ? array_column($new['images'], 'file') : [];
+            $mediaOriginalGallery = !empty($original['images']) ? array_column($original['images'], 'file') : [];
+
+            foreach (array_diff($mediaGallery, $mediaOriginalGallery) as $image) {
+                $this->imageResize->resizeFromImageName($image);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Observer/UnsetSpecialPrice.php b/app/code/Magento/Catalog/Observer/UnsetSpecialPrice.php
deleted file mode 100644
index 0ba1251edc7d6..0000000000000
--- a/app/code/Magento/Catalog/Observer/UnsetSpecialPrice.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-/**
- *  Unset value for Special Price if passed as null
- */
-class UnsetSpecialPrice implements ObserverInterface
-{
-    /**
-     * Unset the Special Price attribute if it is null
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        /** @var  $product \Magento\Catalog\Model\Product */
-        $product = $observer->getEvent()->getProduct();
-        if ($product->getSpecialPrice() === null) {
-            $product->setData('special_price', '');
-        }
-
-        return $this;
-    }
-}
diff --git a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
index 5119a32d921de..44f9193ab4012 100644
--- a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
+++ b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
@@ -22,7 +22,7 @@ class Topmenu
     protected $catalogCategory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+     * @var \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory
      */
     private $collectionFactory;
 
@@ -40,13 +40,13 @@ class Topmenu
      * Initialize dependencies.
      *
      * @param \Magento\Catalog\Helper\Category $catalogCategory
-     * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      */
     public function __construct(
         \Magento\Catalog\Helper\Category $catalogCategory,
-        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver
     ) {
@@ -162,6 +162,7 @@ private function getCategoryAsArray($category, $currentCategory, $isParentActive
             'url' => $this->catalogCategory->getCategoryUrl($category),
             'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),
             'is_active' => $category->getId() == $currentCategory->getId(),
+            'is_category' => true,
             'is_parent_active' => $isParentActive
         ];
     }
@@ -183,6 +184,7 @@ protected function getCategoryTree($storeId, $rootId)
         $collection->addFieldToFilter('path', ['like' => '1/' . $rootId . '/%']); //load only from store root
         $collection->addAttributeToFilter('include_in_menu', 1);
         $collection->addIsActiveFilter();
+        $collection->addNavigationMaxDepthFilter();
         $collection->addUrlRewriteToResult();
         $collection->addOrder('level', Collection::SORT_ORDER_ASC);
         $collection->addOrder('position', Collection::SORT_ORDER_ASC);
diff --git a/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
new file mode 100644
index 0000000000000..6add542b15554
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin\Framework\App\Action;
+
+use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Http\Context as HttpContext;
+
+/**
+ * Before dispatch plugin for all frontend controllers to update http context.
+ */
+class ContextPlugin
+{
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
+    /**
+     * @var CatalogSession
+     */
+    private $catalogSession;
+
+    /**
+     * @var HttpContext
+     */
+    private $httpContext;
+
+    /**
+     * @param ToolbarMemorizer $toolbarMemorizer
+     * @param CatalogSession $catalogSession
+     * @param HttpContext $httpContext
+     */
+    public function __construct(
+        ToolbarMemorizer $toolbarMemorizer,
+        CatalogSession $catalogSession,
+        HttpContext $httpContext
+    ) {
+        $this->toolbarMemorizer = $toolbarMemorizer;
+        $this->catalogSession = $catalogSession;
+        $this->httpContext = $httpContext;
+    }
+
+    /**
+     * Update http context with catalog sensitive information.
+     *
+     * @return void
+     */
+    public function beforeDispatch()
+    {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $params = [
+                ToolbarModel::ORDER_PARAM_NAME,
+                ToolbarModel::DIRECTION_PARAM_NAME,
+                ToolbarModel::MODE_PARAM_NAME,
+                ToolbarModel::LIMIT_PARAM_NAME
+            ];
+            foreach ($params as $param) {
+                $paramValue = $this->catalogSession->getData($param);
+                if ($paramValue) {
+                    $this->httpContext->setValue($param, $paramValue, false);
+                }
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
index 597a1466a125e..eca4d468950e1 100644
--- a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
+++ b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php
@@ -7,6 +7,9 @@
 
 use Magento\Store\Model\Store;
 
+/**
+ * Attribute validation
+ */
 class AttributeValidation
 {
     /**
@@ -14,6 +17,11 @@ class AttributeValidation
      */
     private $storeManager;
 
+    /**
+     * @var array
+     */
+    private $allowedEntityTypes;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $allowedEntityTypes
@@ -27,9 +35,12 @@ public function __construct(
     }
 
     /**
+     * Around validate
+     *
      * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
      * @param \Closure $proceed
      * @param \Magento\Framework\DataObject $entity
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return bool
      */
     public function aroundValidate(
@@ -41,7 +52,7 @@ public function aroundValidate(
             return $entity instanceof $allowedEntity;
         }, $this->allowedEntityTypes)));
 
-        if ($isAllowedType && $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
+        if ($isAllowedType && (int) $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
             $attrCode = $subject->getAttribute()->getAttributeCode();
             // Null is meaning "no value" which should be overridden by value from default scope
             if (array_key_exists($attrCode, $entity->getData()) && $entity->getData($attrCode) === null) {
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
new file mode 100644
index 0000000000000..ff4d2f93c912a
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Plugin\Model\ResourceModel;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\Eav\Model\ResourceModel\ReadSnapshot;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * Extend Eav ReadSnapshot by adding data from product or category attributes with global scope.
+ * Default ReadSnapshot returns only data for current scope where entity is editing, but attributes with global scope,
+ * e.g. price, is written only to default scope (store_id = 0) in case Catalog Price Scope set to "Global"
+ */
+class ReadSnapshotPlugin
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var EavConfig
+     */
+    private $config;
+
+    /**
+     * @param MetadataPool $metadataPool
+     * @param EavConfig $config
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        EavConfig $config
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->config = $config;
+    }
+
+    /**
+     * @param ReadSnapshot $subject
+     * @param array $entityData
+     * @param string $entityType
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(ReadSnapshot $subject, array $entityData, $entityType)
+    {
+        if (!in_array($entityType, [ProductInterface::class, CategoryInterface::class], true)) {
+            return $entityData;
+        }
+
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $connection = $metadata->getEntityConnection();
+        $globalAttributes = [];
+        $attributesMap = [];
+        $eavEntityType = $metadata->getEavEntityType();
+        $attributes = null === $eavEntityType
+            ? []
+            : $this->config->getEntityAttributes($eavEntityType, new \Magento\Framework\DataObject($entityData));
+
+        /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
+        foreach ($attributes as $attribute) {
+            if (!$attribute->isStatic() && $attribute->isScopeGlobal()) {
+                $globalAttributes[$attribute->getBackend()->getTable()][] = $attribute->getAttributeId();
+                $attributesMap[$attribute->getAttributeId()] = $attribute->getAttributeCode();
+            }
+        }
+
+        if ($globalAttributes) {
+            $selects = [];
+            foreach ($globalAttributes as $table => $attributeIds) {
+                $select = $connection->select()
+                    ->from(
+                        ['t' => $table],
+                        ['value' => 't.value', 'attribute_id' => 't.attribute_id']
+                    )
+                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
+                    ->where('attribute_id' . ' in (?)', $attributeIds)
+                    ->where('store_id = ?', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
+                $selects[] = $select;
+            }
+            $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
+                $selects,
+                \Magento\Framework\DB\Select::SQL_UNION_ALL
+            );
+            foreach ($connection->fetchAll($unionSelect) as $attributeValue) {
+                $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
+            }
+        }
+
+        return $entityData;
+    }
+}
diff --git a/app/code/Magento/Catalog/Pricing/Price/BasePrice.php b/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
index 54a13be864db7..77368517a3155 100644
--- a/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/BasePrice.php
@@ -30,7 +30,7 @@ public function getValue()
             $this->value = false;
             foreach ($this->priceInfo->getPrices() as $price) {
                 if ($price instanceof BasePriceProviderInterface && $price->getValue() !== false) {
-                    $this->value = min($price->getValue(), $this->value ?: $price->getValue());
+                    $this->value = min($price->getValue(), $this->value !== false ? $this->value: $price->getValue());
                 }
             }
         }
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php
new file mode 100644
index 0000000000000..f96d56cb8818c
--- /dev/null
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredOptions.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Price;
+
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+
+/**
+ * Configured Options model.
+ */
+class ConfiguredOptions
+{
+    /**
+     * Get value of configured options.
+     *
+     * @param float $basePrice
+     * @param ItemInterface $item
+     *
+     * @return float
+     */
+    public function getItemOptionsValue(float $basePrice, ItemInterface $item): float
+    {
+        $product = $item->getProduct();
+        $value = 0.;
+        $optionIds = $item->getOptionByCode('option_ids');
+        if ($optionIds) {
+            foreach (explode(',', $optionIds->getValue()) as $optionId) {
+                $option = $product->getOptionById($optionId);
+                if ($option !== null) {
+                    $itemOption = $item->getOptionByCode('option_' . $option->getId());
+                    /** @var $group \Magento\Catalog\Model\Product\Option\Type\DefaultType */
+                    $group = $option->groupFactory($option->getType())
+                        ->setOption($option)
+                        ->setConfigurationItem($item)
+                        ->setConfigurationItemOption($itemOption);
+                    $value += $group->getOptionPrice($itemOption->getValue(), $basePrice);
+                }
+            }
+        }
+
+        return $value;
+    }
+}
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
index 87d031d8d5b35..6ec282e45a1a0 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Configured price model
@@ -25,21 +26,29 @@ class ConfiguredPrice extends FinalPrice implements ConfiguredPriceInterface
      */
     protected $item;
 
+    /**
+     * @var ConfiguredOptions
+     */
+    private $configuredOptions;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @param ItemInterface $item
+     * @param ItemInterface|null $item
+     * @param ConfiguredOptions|null $configuredOptions
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        ItemInterface $item = null
+        ItemInterface $item = null,
+        ConfiguredOptions $configuredOptions = null
     ) {
         $this->item = $item;
+        $this->configuredOptions = $configuredOptions ?: ObjectManager::getInstance()->get(ConfiguredOptions::class);
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
     }
 
@@ -54,11 +63,12 @@ public function setItem(ItemInterface $item)
     }
 
     /**
-     * Get value of configured options
+     * Get value of configured options.
      *
-     * @return array
+     * @deprecated ConfiguredOptions::getItemOptionsValue is used instead
+     * @return float
      */
-    protected function getOptionsValue()
+    protected function getOptionsValue(): float
     {
         $product = $this->item->getProduct();
         $value = 0.;
@@ -78,16 +88,21 @@ protected function getOptionsValue()
                 }
             }
         }
+
         return $value;
     }
 
     /**
-     * Price value of product with configured options
+     * Price value of product with configured options.
      *
      * @return bool|float
      */
     public function getValue()
     {
-        return $this->item ? parent::getValue() + $this->getOptionsValue() : parent::getValue();
+        $basePrice = parent::getValue();
+
+        return $this->item
+            ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)
+            : $basePrice;
     }
 }
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
index e6d35a0f5239a..e41df30ea1dec 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
@@ -9,15 +9,20 @@
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 
 /**
- * Configured price interface
+ * Configured price interface.
  */
 interface ConfiguredPriceInterface
 {
     /**
-     * Price type configured
+     * Price type configured.
      */
     const CONFIGURED_PRICE_CODE = 'configured_price';
 
+    /**
+     * Regular price type configured.
+     */
+    const CONFIGURED_REGULAR_PRICE_CODE = 'configured_regular_price';
+
     /**
      * @param ItemInterface $item
      * @return $this
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceSelection.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceSelection.php
new file mode 100644
index 0000000000000..1dedbfa354466
--- /dev/null
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceSelection.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Price;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+
+/**
+ * Configured price selection model
+ */
+class ConfiguredPriceSelection
+{
+    /**
+     * @var CalculatorInterface
+     */
+    private $calculator;
+
+    /**
+     * @param CalculatorInterface $calculator
+     */
+    public function __construct(
+        CalculatorInterface $calculator
+    ) {
+        $this->calculator = $calculator;
+    }
+
+    /**
+     * Get Selection pricing list.
+     *
+     * @param ConfiguredPriceInterface $price
+     * @return array
+     */
+    public function getSelectionPriceList(ConfiguredPriceInterface $price): array
+    {
+        $selectionPriceList = [];
+        foreach ($price->getOptions() as $option) {
+            $selectionPriceList = array_merge(
+                $selectionPriceList,
+                $this->createSelectionPriceList($option, $price->getProduct())
+            );
+        }
+
+        return $selectionPriceList;
+    }
+
+    /**
+     * Create Selection Price List.
+     *
+     * @param ExtensibleDataInterface $option
+     * @param Product $product
+     * @return array
+     */
+    private function createSelectionPriceList(ExtensibleDataInterface $option, Product $product): array
+    {
+        return $this->calculator->createSelectionPriceList($option, $product);
+    }
+}
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php
new file mode 100644
index 0000000000000..83d59718400bd
--- /dev/null
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Price;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Configured regular price model.
+ */
+class ConfiguredRegularPrice extends RegularPrice implements ConfiguredPriceInterface
+{
+    /**
+     * Price type configured.
+     */
+    const PRICE_CODE = self::CONFIGURED_REGULAR_PRICE_CODE;
+
+    /**
+     * @var null|ItemInterface
+     */
+    private $item;
+
+    /**
+     * @var ConfiguredOptions
+     */
+    private $configuredOptions;
+
+    /**
+     * @param Product $saleableItem
+     * @param float $quantity
+     * @param CalculatorInterface $calculator
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param ConfiguredOptions $configuredOptions
+     * @param ItemInterface|null $item
+     */
+    public function __construct(
+        Product $saleableItem,
+        $quantity,
+        CalculatorInterface $calculator,
+        PriceCurrencyInterface $priceCurrency,
+        ConfiguredOptions $configuredOptions,
+        ItemInterface $item = null
+    ) {
+        $this->item = $item;
+        $this->configuredOptions = $configuredOptions;
+        parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
+    }
+
+    /**
+     * @param ItemInterface $item
+     * @return $this
+     */
+    public function setItem(ItemInterface $item) : ConfiguredRegularPrice
+    {
+        $this->item = $item;
+
+        return $this;
+    }
+
+    /**
+     * Price value of product with configured options.
+     *
+     * @return bool|float
+     */
+    public function getValue()
+    {
+        $basePrice = parent::getValue();
+
+        return $this->item && $basePrice !== false
+            ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)
+            : $basePrice;
+    }
+}
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
index 5026286610118..93bf7920355db 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
@@ -35,32 +35,42 @@ class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterf
      */
     protected $excludeAdjustment = null;
 
+    /**
+     * @var CustomOptionPriceCalculator
+     */
+    private $customOptionPriceCalculator;
+
     /**
      * @param SaleableInterface $saleableItem
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @param array $excludeAdjustment
+     * @param array|null $excludeAdjustment
+     * @param CustomOptionPriceCalculator|null $customOptionPriceCalculator
      */
     public function __construct(
         SaleableInterface $saleableItem,
         $quantity,
         CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        $excludeAdjustment = null
+        $excludeAdjustment = null,
+        CustomOptionPriceCalculator $customOptionPriceCalculator = null
     ) {
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->excludeAdjustment = $excludeAdjustment;
+        $this->customOptionPriceCalculator = $customOptionPriceCalculator
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
     }
 
     /**
-     * Get minimal and maximal option values
+     * Get minimal and maximal option values.
      *
+     * @param string $priceCode
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function getValue()
+    public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::PRICE_CODE)
     {
         $optionValues = [];
         $options = $this->product->getOptions();
@@ -85,7 +95,8 @@ public function getValue()
                 } else {
                     /** @var $optionValue \Magento\Catalog\Model\Product\Option\Value */
                     foreach ($optionItem->getValues() as $optionValue) {
-                        $price = $optionValue->getPrice($optionValue->getPriceType() == Value::TYPE_PERCENT);
+                        $price =
+                            $this->customOptionPriceCalculator->getOptionPriceByPriceCode($optionValue, $priceCode);
                         if ($min === null) {
                             $min = $price;
                         } elseif ($price < $min) {
@@ -130,15 +141,16 @@ public function getCustomAmount($amount = null, $exclude = null, $context = [])
     }
 
     /**
-     * Return the minimal or maximal price for custom options
+     * Return the minimal or maximal price for custom options.
      *
      * @param bool $getMin
+     * @param string $priceCode
      * @return float
      */
-    public function getCustomOptionRange($getMin)
+    public function getCustomOptionRange($getMin, $priceCode = \Magento\Catalog\Pricing\Price\BasePrice::PRICE_CODE)
     {
         $optionValue = 0.;
-        $options = $this->getValue();
+        $options = $this->getValue($priceCode);
         foreach ($options as $option) {
             if ($getMin) {
                 $optionValue += $option['min'];
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php
new file mode 100644
index 0000000000000..dd5c295ce0db7
--- /dev/null
+++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Price;
+
+use Magento\Catalog\Model\Product\Option\Value as ProductOptionValue;
+
+/**
+ *  Calculates prices of custom options of the product.
+ */
+class CustomOptionPriceCalculator
+{
+    /**
+     * Calculates prices of custom option by code.
+     *
+     * Price is calculated depends on Price Code.
+     * Existing logic was taken from methods \Magento\Catalog\Model\Product\Option\Value::(getPrice|getRegularPrice)
+     * where $priceCode was hardcoded and changed to have dynamical approach.
+     *
+     * Examples of usage:
+     *      \Magento\Catalog\Pricing\Price\CustomOptionPrice::getValue
+     *      \Magento\Catalog\Model\Product\Option\Value::getPrice
+     *      \Magento\Catalog\Model\Product\Option\Value::getRegularPrice
+     *
+     * @param ProductOptionValue $optionValue
+     * @param string $priceCode
+     * @return float|int
+     */
+    public function getOptionPriceByPriceCode(
+        ProductOptionValue $optionValue,
+        string $priceCode = BasePrice::PRICE_CODE
+    ) {
+        if ($optionValue->getPriceType() === ProductOptionValue::TYPE_PERCENT) {
+            $basePrice = $optionValue->getOption()->getProduct()->getPriceInfo()->getPrice($priceCode)->getValue();
+            $price = $basePrice * ($optionValue->getData(ProductOptionValue::KEY_PRICE) / 100);
+
+            return $price;
+        }
+
+        return $optionValue->getData(ProductOptionValue::KEY_PRICE);
+    }
+}
diff --git a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
index 609255d852da3..2c4e332e71237 100644
--- a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
@@ -22,14 +22,14 @@ class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
     /**
      * Get price value
      *
-     * @return float|bool
+     * @return float
      */
     public function getValue()
     {
         if ($this->value === null) {
             $price = $this->product->getPrice();
             $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
-            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : false;
+            $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : 0;
         }
         return $this->value;
     }
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 74f98c2e66a54..f250927889c29 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -80,7 +80,7 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         CustomerGroupRetrieverInterface $customerGroupRetriever = null
     ) {
-        $quantity = floatval($quantity) ? $quantity : 1;
+        $quantity = (float)$quantity ? $quantity : 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->customerSession = $customerSession;
         $this->groupManagement = $groupManagement;
diff --git a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
index 0722f018ae4eb..91b2b6d2a0d7f 100644
--- a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php
@@ -7,12 +7,62 @@
 namespace Magento\Catalog\Pricing\Render;
 
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface;
+use Magento\Catalog\Pricing\Price\MinimalPriceCalculatorInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Framework\Pricing\Render\RendererPool;
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Catalog\Pricing\Price\ConfiguredPriceSelection;
+use Magento\Framework\App\ObjectManager;
 
 /**
- * Class for configured_price rendering
+ * Class for configured_price rendering.
  */
 class ConfiguredPriceBox extends FinalPriceBox
 {
+    /**
+     * @var ConfiguredPriceSelection
+     */
+    private $configuredPriceSelection;
+
+    /**
+     * @param Context $context
+     * @param SaleableInterface $saleableItem
+     * @param PriceInterface $price
+     * @param RendererPool $rendererPool
+     * @param array $data
+     * @param SalableResolverInterface|null $salableResolver
+     * @param MinimalPriceCalculatorInterface|null $minimalPriceCalculator
+     * @param ConfiguredPriceSelection|null $configuredPriceSelection
+     */
+    public function __construct(
+        Context $context,
+        SaleableInterface $saleableItem,
+        PriceInterface $price,
+        RendererPool $rendererPool,
+        array $data = [],
+        SalableResolverInterface $salableResolver = null,
+        MinimalPriceCalculatorInterface $minimalPriceCalculator = null,
+        ConfiguredPriceSelection $configuredPriceSelection = null
+    ) {
+        $this->configuredPriceSelection = $configuredPriceSelection
+            ?: ObjectManager::getInstance()
+            ->get(ConfiguredPriceSelection::class);
+        parent::__construct(
+            $context,
+            $saleableItem,
+            $price,
+            $rendererPool,
+            $data,
+            $salableResolver,
+            $minimalPriceCalculator
+        );
+    }
+
     /**
      * Retrieve an item instance to the configured price model
      *
@@ -34,4 +84,67 @@ protected function _prepareLayout()
         }
         return parent::_prepareLayout();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriceType($priceCode)
+    {
+        $price = $this->saleableItem->getPriceInfo()->getPrice($priceCode);
+        $item = $this->getData('item');
+        if ($price instanceof ConfiguredPriceInterface
+            && $item instanceof ItemInterface
+        ) {
+            $price->setItem($item);
+        }
+
+        return $price;
+    }
+
+    /**
+     * @return PriceInterface
+     */
+    public function getConfiguredPrice(): PriceInterface
+    {
+        /** @var \Magento\Bundle\Pricing\Price\ConfiguredPrice $configuredPrice */
+        $configuredPrice = $this->getPrice();
+        if (empty($this->configuredPriceSelection->getSelectionPriceList($configuredPrice))) {
+            // If there was no selection we must show minimal regular price
+            return $this->getSaleableItem()->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
+        }
+
+        return $configuredPrice;
+    }
+
+    /**
+     * @return PriceInterface
+     */
+    public function getConfiguredRegularPrice(): PriceInterface
+    {
+        /** @var \Magento\Bundle\Pricing\Price\ConfiguredPrice $configuredPrice */
+        $configuredPrice = $this->getPriceType(ConfiguredPriceInterface::CONFIGURED_REGULAR_PRICE_CODE);
+        if (empty($this->configuredPriceSelection->getSelectionPriceList($configuredPrice))) {
+            // If there was no selection we must show minimal regular price
+            return $this->getSaleableItem()->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE);
+        }
+
+        return $configuredPrice;
+    }
+
+    /**
+     * Define if the special price should be shown.
+     *
+     * @return bool
+     */
+    public function hasSpecialPrice(): bool
+    {
+        if ($this->price->getPriceCode() == ConfiguredPriceInterface::CONFIGURED_PRICE_CODE) {
+            $displayRegularPrice = $this->getConfiguredRegularPrice()->getAmount()->getValue();
+            $displayFinalPrice = $this->getConfiguredPrice()->getAmount()->getValue();
+
+            return $displayFinalPrice < $displayRegularPrice;
+        }
+
+        return parent::hasSpecialPrice();
+    }
 }
diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
index f370c49cdfa20..e0a92ea0e0bea 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/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
index f85407a9a9d7a..271387932829b 100644
--- a/app/code/Magento/Catalog/Setup/CategorySetup.php
+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -7,13 +7,51 @@
  */
 namespace Magento\Catalog\Setup;
 
+use Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep;
+use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available;
+use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby;
+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage;
+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category as CategoryFormHelper;
+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight as WeightFormHelper;
+use Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate;
+use Magento\Catalog\Model\Attribute\Backend\Startdate;
+use Magento\Catalog\Model\Category\Attribute\Backend\Image;
+use Magento\Catalog\Model\Category\Attribute\Backend\Sortby as SortbyBackendModel;
+use Magento\Catalog\Model\Category\Attribute\Source\Layout;
+use Magento\Catalog\Model\Category\Attribute\Source\Mode;
+use Magento\Catalog\Model\Category\Attribute\Source\Page;
+use Magento\Catalog\Model\Category\Attribute\Source\Sortby;
 use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Entity\Product\Attribute\Design\Options\Container;
+use Magento\Catalog\Model\Product\Attribute\Backend\Category as CategoryBackendAttribute;
+use Magento\Catalog\Model\Product\Attribute\Backend\Price;
+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
+use Magento\Catalog\Model\Product\Attribute\Backend\Stock;
+use Magento\Catalog\Model\Product\Attribute\Backend\Tierprice;
+use Magento\Catalog\Model\Product\Attribute\Backend\Weight;
+use Magento\Catalog\Model\Product\Attribute\Frontend\Image as ImageFrontendModel;
+use Magento\Catalog\Model\Product\Attribute\Source\Countryofmanufacture;
+use Magento\Catalog\Model\Product\Attribute\Source\Layout as LayoutModel;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Category;
+use Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\CatalogInventory\Block\Adminhtml\Form\Field\Stock as StockField;
+use Magento\CatalogInventory\Model\Source\Stock as StockSourceModel;
+use Magento\CatalogInventory\Model\Stock as StockModel;
+use Magento\Eav\Model\Entity\Attribute\Backend\Datetime;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\Source\Boolean;
 use Magento\Eav\Model\Entity\Setup\Context;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Theme\Model\Theme\Source\Theme;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -80,28 +118,28 @@ public function getDefaultEntities()
         return [
             'catalog_category' => [
                 'entity_type_id' => self::CATEGORY_ENTITY_TYPE_ID,
-                'entity_model' => \Magento\Catalog\Model\ResourceModel\Category::class,
-                'attribute_model' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+                'entity_model' => Category::class,
+                'attribute_model' => Attribute::class,
                 'table' => 'catalog_category_entity',
                 'additional_attribute_table' => 'catalog_eav_attribute',
                 'entity_attribute_collection' =>
-                    \Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection::class,
+                    Collection::class,
                 'attributes' => [
                     'name' => [
                         'type' => 'varchar',
                         'label' => 'Name',
                         'input' => 'text',
                         'sort_order' => 1,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'is_active' => [
                         'type' => 'int',
                         'label' => 'Is Active',
                         'input' => 'select',
-                        'source' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class,
+                        'source' => Boolean::class,
                         'sort_order' => 2,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'description' => [
@@ -110,7 +148,7 @@ public function getDefaultEntities()
                         'input' => 'textarea',
                         'required' => false,
                         'sort_order' => 4,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'group' => 'General Information',
@@ -119,10 +157,10 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Image',
                         'input' => 'image',
-                        'backend' => \Magento\Catalog\Model\Category\Attribute\Backend\Image::class,
+                        'backend' => Image::class,
                         'required' => false,
                         'sort_order' => 5,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'meta_title' => [
@@ -131,7 +169,7 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 6,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'meta_keywords' => [
@@ -140,7 +178,7 @@ public function getDefaultEntities()
                         'input' => 'textarea',
                         'required' => false,
                         'sort_order' => 7,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'meta_description' => [
@@ -149,34 +187,34 @@ public function getDefaultEntities()
                         'input' => 'textarea',
                         'required' => false,
                         'sort_order' => 8,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'display_mode' => [
                         'type' => 'varchar',
                         'label' => 'Display Mode',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Mode::class,
+                        'source' => Mode::class,
                         'required' => false,
                         'sort_order' => 10,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
                     'landing_page' => [
                         'type' => 'int',
                         'label' => 'CMS Block',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Page::class,
+                        'source' => Page::class,
                         'required' => false,
                         'sort_order' => 20,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
                     'is_anchor' => [
                         'type' => 'int',
                         'label' => 'Is Anchor',
                         'input' => 'select',
-                        'source' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class,
+                        'source' => Boolean::class,
                         'required' => false,
                         'sort_order' => 30,
                         'group' => 'Display Settings',
@@ -222,50 +260,50 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Custom Design',
                         'input' => 'select',
-                        'source' => \Magento\Theme\Model\Theme\Source\Theme::class,
+                        'source' => Theme::class,
                         'required' => false,
                         'sort_order' => 10,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'custom_design_from' => [
                         'type' => 'datetime',
                         'label' => 'Active From',
                         'input' => 'date',
-                        'backend' => \Magento\Catalog\Model\Attribute\Backend\Startdate::class,
+                        'backend' => Startdate::class,
                         'required' => false,
                         'sort_order' => 30,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'custom_design_to' => [
                         'type' => 'datetime',
                         'label' => 'Active To',
                         'input' => 'date',
-                        'backend' => \Magento\Eav\Model\Entity\Attribute\Backend\Datetime::class,
+                        'backend' => Datetime::class,
                         'required' => false,
                         'sort_order' => 40,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'page_layout' => [
                         'type' => 'varchar',
                         'label' => 'Page Layout',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Layout::class,
+                        'source' => Layout::class,
                         'required' => false,
                         'sort_order' => 50,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'custom_layout_update' => [
                         'type' => 'text',
                         'label' => 'Custom Layout Update',
                         'input' => 'textarea',
-                        'backend' => \Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate::class,
+                        'backend' => Customlayoutupdate::class,
                         'required' => false,
                         'sort_order' => 60,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'level' => [
@@ -288,53 +326,53 @@ public function getDefaultEntities()
                         'type' => 'text',
                         'label' => 'Available Product Listing Sort By',
                         'input' => 'multiselect',
-                        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Sortby::class,
-                        'backend' => \Magento\Catalog\Model\Category\Attribute\Backend\Sortby::class,
+                        'source' => Sortby::class,
+                        'backend' => SortbyBackendModel::class,
                         'sort_order' => 40,
-                        'input_renderer' => \Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available::class,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'input_renderer' => Available::class,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
                     'default_sort_by' => [
                         'type' => 'varchar',
                         'label' => 'Default Product Listing Sort By',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Sortby::class,
-                        'backend' => \Magento\Catalog\Model\Category\Attribute\Backend\Sortby::class,
+                        'source' => Sortby::class,
+                        'backend' => SortbyBackendModel::class,
                         'sort_order' => 50,
                         'input_renderer' =>
-                            \Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby::class,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                            DefaultSortby::class,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
                     'include_in_menu' => [
                         'type' => 'int',
                         'label' => 'Include in Navigation Menu',
                         'input' => 'select',
-                        'source' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class,
+                        'source' => Boolean::class,
                         'default' => '1',
                         'sort_order' => 10,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'General Information',
                     ],
                     'custom_use_parent_settings' => [
                         'type' => 'int',
                         'label' => 'Use Parent Category Settings',
                         'input' => 'select',
-                        'source' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class,
+                        'source' => Boolean::class,
                         'required' => false,
                         'sort_order' => 5,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'custom_apply_to_products' => [
                         'type' => 'int',
                         'label' => 'Apply To Products',
                         'input' => 'select',
-                        'source' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class,
+                        'source' => Boolean::class,
                         'required' => false,
                         'sort_order' => 6,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Custom Design',
                     ],
                     'filter_price_range' => [
@@ -343,20 +381,20 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 51,
-                        'input_renderer' => \Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep::class,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'input_renderer' => Pricestep::class,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
                 ],
             ],
             'catalog_product' => [
                 'entity_type_id' => self::CATALOG_PRODUCT_ENTITY_TYPE_ID,
-                'entity_model' => \Magento\Catalog\Model\ResourceModel\Product::class,
-                'attribute_model' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+                'entity_model' => Product::class,
+                'attribute_model' => Attribute::class,
                 'table' => 'catalog_product_entity',
                 'additional_attribute_table' => 'catalog_eav_attribute',
                 'entity_attribute_collection' =>
-                    \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class,
+                    Product\Attribute\Collection::class,
                 'attributes' => [
                     'name' => [
                         'type' => 'varchar',
@@ -364,7 +402,7 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'frontend_class' => 'validate-length maximum-length-255',
                         'sort_order' => 1,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'searchable' => true,
                         'visible_in_advanced_search' => true,
                         'used_in_product_listing' => true,
@@ -375,7 +413,7 @@ public function getDefaultEntities()
                         'label' => 'SKU',
                         'input' => 'text',
                         'frontend_class' => 'validate-length maximum-length-64',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Sku::class,
+                        'backend' => Sku::class,
                         'unique' => true,
                         'sort_order' => 2,
                         'searchable' => true,
@@ -387,7 +425,7 @@ public function getDefaultEntities()
                         'label' => 'Description',
                         'input' => 'textarea',
                         'sort_order' => 3,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'searchable' => true,
                         'comparable' => true,
                         'wysiwyg_enabled' => true,
@@ -399,7 +437,7 @@ public function getDefaultEntities()
                         'label' => 'Short Description',
                         'input' => 'textarea',
                         'sort_order' => 4,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'searchable' => true,
                         'comparable' => true,
                         'wysiwyg_enabled' => true,
@@ -414,9 +452,9 @@ public function getDefaultEntities()
                         'type' => 'decimal',
                         'label' => 'Price',
                         'input' => 'price',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Price::class,
+                        'backend' => Price::class,
                         'sort_order' => 1,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'searchable' => true,
                         'filterable' => true,
                         'visible_in_advanced_search' => true,
@@ -429,10 +467,10 @@ public function getDefaultEntities()
                         'type' => 'decimal',
                         'label' => 'Special Price',
                         'input' => 'price',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Price::class,
+                        'backend' => Price::class,
                         'required' => false,
                         'sort_order' => 3,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'used_in_product_listing' => true,
                         'apply_to' => 'simple,virtual',
                         'group' => 'Prices',
@@ -444,10 +482,10 @@ public function getDefaultEntities()
                         'type' => 'datetime',
                         'label' => 'Special Price From Date',
                         'input' => 'date',
-                        'backend' => \Magento\Catalog\Model\Attribute\Backend\Startdate::class,
+                        'backend' => Startdate::class,
                         'required' => false,
                         'sort_order' => 4,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'used_in_product_listing' => true,
                         'apply_to' => 'simple,virtual',
                         'group' => 'Prices',
@@ -459,10 +497,10 @@ public function getDefaultEntities()
                         'type' => 'datetime',
                         'label' => 'Special Price To Date',
                         'input' => 'date',
-                        'backend' => \Magento\Eav\Model\Entity\Attribute\Backend\Datetime::class,
+                        'backend' => Datetime::class,
                         'required' => false,
                         'sort_order' => 5,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'used_in_product_listing' => true,
                         'apply_to' => 'simple,virtual',
                         'group' => 'Prices',
@@ -474,11 +512,11 @@ public function getDefaultEntities()
                         'type' => 'decimal',
                         'label' => 'Cost',
                         'input' => 'price',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Price::class,
+                        'backend' => Price::class,
                         'required' => false,
                         'user_defined' => true,
                         'sort_order' => 6,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'apply_to' => 'simple,virtual',
                         'group' => 'Prices',
                         'is_used_in_grid' => true,
@@ -489,8 +527,8 @@ public function getDefaultEntities()
                         'type' => 'decimal',
                         'label' => 'Weight',
                         'input' => 'weight',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Weight::class,
-                        'input_renderer' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight::class,
+                        'backend' => Weight::class,
+                        'input_renderer' => WeightFormHelper::class,
                         'sort_order' => 5,
                         'apply_to' => 'simple,virtual',
                         'is_used_in_grid' => true,
@@ -518,7 +556,7 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 20,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Meta Information',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -530,7 +568,7 @@ public function getDefaultEntities()
                         'input' => 'textarea',
                         'required' => false,
                         'sort_order' => 30,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Meta Information',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -544,7 +582,7 @@ public function getDefaultEntities()
                         'note' => 'Maximum 255 chars',
                         'class' => 'validate-length maximum-length-255',
                         'sort_order' => 40,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Meta Information',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -554,11 +592,11 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Base Image',
                         'input' => 'media_image',
-                        'frontend' => \Magento\Catalog\Model\Product\Attribute\Frontend\Image::class,
-                        'input_renderer' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage::class,
+                        'frontend' => ImageFrontendModel::class,
+                        'input_renderer' => BaseImage::class,
                         'required' => false,
                         'sort_order' => 0,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'used_in_product_listing' => true,
                         'group' => 'General',
                     ],
@@ -566,10 +604,10 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Small Image',
                         'input' => 'media_image',
-                        'frontend' => \Magento\Catalog\Model\Product\Attribute\Frontend\Image::class,
+                        'frontend' => ImageFrontendModel::class,
                         'required' => false,
                         'sort_order' => 2,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'used_in_product_listing' => true,
                         'group' => 'Images',
                     ],
@@ -577,10 +615,10 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Thumbnail',
                         'input' => 'media_image',
-                        'frontend' => \Magento\Catalog\Model\Product\Attribute\Frontend\Image::class,
+                        'frontend' => ImageFrontendModel::class,
                         'required' => false,
                         'sort_order' => 3,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'used_in_product_listing' => true,
                         'group' => 'Images',
                     ],
@@ -588,7 +626,7 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Media Gallery',
                         'input' => 'gallery',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Media::class,
+                        'backend' => Media::class,
                         'required' => false,
                         'sort_order' => 4,
                         'group' => 'Images',
@@ -598,10 +636,10 @@ public function getDefaultEntities()
                         'type' => 'decimal',
                         'label' => 'Tier Price',
                         'input' => 'text',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice::class,
+                        'backend' => Tierprice::class,
                         'required' => false,
                         'sort_order' => 7,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'apply_to' => 'simple,virtual',
                         'group' => 'Prices',
                     ],
@@ -624,10 +662,10 @@ public function getDefaultEntities()
                         'type' => 'datetime',
                         'label' => 'Set Product as New from Date',
                         'input' => 'date',
-                        'backend' => \Magento\Catalog\Model\Attribute\Backend\Startdate::class,
+                        'backend' => Startdate::class,
                         'required' => false,
                         'sort_order' => 7,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'used_in_product_listing' => true,
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -637,10 +675,10 @@ public function getDefaultEntities()
                         'type' => 'datetime',
                         'label' => 'Set Product as New to Date',
                         'input' => 'date',
-                        'backend' => \Magento\Eav\Model\Entity\Attribute\Backend\Datetime::class,
+                        'backend' => Datetime::class,
                         'required' => false,
                         'sort_order' => 8,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'used_in_product_listing' => true,
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -658,9 +696,9 @@ public function getDefaultEntities()
                         'type' => 'int',
                         'label' => 'Status',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Product\Attribute\Source\Status::class,
+                        'source' => Status::class,
                         'sort_order' => 9,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'searchable' => true,
                         'used_in_product_listing' => true,
                     ],
@@ -670,7 +708,7 @@ public function getDefaultEntities()
                         'input' => 'price',
                         'required' => false,
                         'sort_order' => 8,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'visible' => false,
                         'apply_to' => 'simple,virtual',
                         'group' => 'Prices',
@@ -679,19 +717,19 @@ public function getDefaultEntities()
                         'type' => 'int',
                         'label' => 'Visibility',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Product\Visibility::class,
+                        'source' => Visibility::class,
                         'default' => '4',
                         'sort_order' => 12,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                     ],
                     'custom_design' => [
                         'type' => 'varchar',
                         'label' => 'Custom Design',
                         'input' => 'select',
-                        'source' => \Magento\Theme\Model\Theme\Source\Theme::class,
+                        'source' => Theme::class,
                         'required' => false,
                         'sort_order' => 1,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Design',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -701,10 +739,10 @@ public function getDefaultEntities()
                         'type' => 'datetime',
                         'label' => 'Active From',
                         'input' => 'date',
-                        'backend' => \Magento\Catalog\Model\Attribute\Backend\Startdate::class,
+                        'backend' => Startdate::class,
                         'required' => false,
                         'sort_order' => 2,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Design',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -714,10 +752,10 @@ public function getDefaultEntities()
                         'type' => 'datetime',
                         'label' => 'Active To',
                         'input' => 'date',
-                        'backend' => \Magento\Eav\Model\Entity\Attribute\Backend\Datetime::class,
+                        'backend' => Datetime::class,
                         'required' => false,
                         'sort_order' => 3,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Design',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -727,20 +765,20 @@ public function getDefaultEntities()
                         'type' => 'text',
                         'label' => 'Custom Layout Update',
                         'input' => 'textarea',
-                        'backend' => \Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate::class,
+                        'backend' => Customlayoutupdate::class,
                         'required' => false,
                         'sort_order' => 4,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Design',
                     ],
                     'page_layout' => [
                         'type' => 'varchar',
                         'label' => 'Page Layout',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Product\Attribute\Source\Layout::class,
+                        'source' => LayoutModel::class,
                         'required' => false,
                         'sort_order' => 5,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Design',
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
@@ -749,9 +787,9 @@ public function getDefaultEntities()
                     'category_ids' => [
                         'type' => 'static',
                         'label' => 'Categories',
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Category::class,
-                        'input_renderer' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category::class,
+                        'global' => ScopedAttributeInterface::SCOPE_GLOBAL,
+                        'backend' => CategoryBackendAttribute::class,
+                        'input_renderer' => CategoryFormHelper::class,
                         'required' => false,
                         'sort_order' => 9,
                         'visible' => true,
@@ -764,11 +802,11 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Display Product Options In',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Entity\Product\Attribute\Design\Options\Container::class,
+                        'source' => Container::class,
                         'required' => false,
                         'default' => 'container2',
                         'sort_order' => 6,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Design',
                     ],
                     'required_options' => [
@@ -792,7 +830,7 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 16,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'visible' => false,
                         'used_in_product_listing' => true,
                     ],
@@ -802,7 +840,7 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 17,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'visible' => false,
                         'used_in_product_listing' => true,
                     ],
@@ -812,7 +850,7 @@ public function getDefaultEntities()
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 18,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                        'global' => ScopedAttributeInterface::SCOPE_STORE,
                         'visible' => false,
                         'used_in_product_listing' => true,
                     ],
@@ -832,9 +870,9 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Country of Manufacture',
                         'input' => 'select',
-                        'source' => \Magento\Catalog\Model\Product\Attribute\Source\Countryofmanufacture::class,
+                        'source' => Countryofmanufacture::class,
                         'required' => false,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                        'global' => ScopedAttributeInterface::SCOPE_WEBSITE,
                         'visible' => true,
                         'user_defined' => false,
                         'searchable' => false,
@@ -851,13 +889,13 @@ public function getDefaultEntities()
                     'quantity_and_stock_status' => [
                         'group' => 'General',
                         'type' => 'int',
-                        'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Stock::class,
+                        'backend' => Stock::class,
                         'label' => 'Quantity',
                         'input' => 'select',
-                        'input_renderer' => \Magento\CatalogInventory\Block\Adminhtml\Form\Field\Stock::class,
-                        'source' => \Magento\CatalogInventory\Model\Source\Stock::class,
-                        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                        'default' => \Magento\CatalogInventory\Model\Stock::STOCK_IN_STOCK,
+                        'input_renderer' => StockField::class,
+                        'source' => StockSourceModel::class,
+                        'global' => ScopedAttributeInterface::SCOPE_GLOBAL,
+                        'default' => StockModel::STOCK_IN_STOCK,
                         'user_defined' => false,
                         'visible' => true,
                         'required' => false,
diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php
deleted file mode 100644
index 5b1a10b098eb5..0000000000000
--- a/app/code/Magento/Catalog/Setup/InstallData.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Catalog\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Catalog\Helper\DefaultCategory;
-
-/**
- * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Category setup factory
-     *
-     * @var CategorySetupFactory
-     */
-    private $categorySetupFactory;
-
-    /**
-     * @var DefaultCategory
-     */
-    private $defaultCategory;
-
-    /**
-     * @deprecated 101.0.0
-     * @return DefaultCategory
-     */
-    private function getDefaultCategory()
-    {
-        if ($this->defaultCategory === null) {
-            $this->defaultCategory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(DefaultCategory::class);
-        }
-        return $this->defaultCategory;
-    }
-
-    /**
-     * Init
-     *
-     * @param CategorySetupFactory $categorySetupFactory
-     */
-    public function __construct(CategorySetupFactory $categorySetupFactory)
-    {
-        $this->categorySetupFactory = $categorySetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
-        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-        $rootCategoryId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
-        $defaultCategoryId = $this->getDefaultCategory()->getId();
-
-        $categorySetup->installEntities();
-        // Create Root Catalog Node
-        $categorySetup->createCategory()
-            ->load($rootCategoryId)
-            ->setId($rootCategoryId)
-            ->setStoreId(0)
-            ->setPath($rootCategoryId)
-            ->setLevel(0)
-            ->setPosition(0)
-            ->setChildrenCount(0)
-            ->setName('Root Catalog')
-            ->setInitialSetupFlag(true)
-            ->save();
-
-        // Create Default Catalog Node
-        $category = $categorySetup->createCategory();
-        $category->load($defaultCategoryId)
-            ->setId($defaultCategoryId)
-            ->setStoreId(0)
-            ->setPath($rootCategoryId . '/' . $defaultCategoryId)
-            ->setName('Default Category')
-            ->setDisplayMode('PRODUCTS')
-            ->setIsActive(1)
-            ->setLevel(1)
-            ->setInitialSetupFlag(true)
-            ->setAttributeSetId($category->getDefaultAttributeSetId())
-            ->save();
-
-        $data = [
-            'scope' => 'default',
-            'scope_id' => 0,
-            'path' => \Magento\Catalog\Helper\Category::XML_PATH_CATEGORY_ROOT_ID,
-            'value' => $category->getId(),
-        ];
-        $setup->getConnection()
-            ->insertOnDuplicate($setup->getTable('core_config_data'), $data, ['value']);
-
-        $categorySetup->addAttributeGroup(\Magento\Catalog\Model\Product::ENTITY, 'Default', 'Design', 6);
-
-        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Category::ENTITY);
-        $attributeSetId = $categorySetup->getDefaultAttributeSetId($entityTypeId);
-        $attributeGroupId = $categorySetup->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
-
-        // update General Group
-        $categorySetup->updateAttributeGroup($entityTypeId, $attributeSetId, $attributeGroupId, 'sort_order', '10');
-
-        $groups = [
-            'display' => ['name' => 'Display Settings', 'code' => 'display-settings', 'sort' => 20, 'id' => null],
-            'design' => ['name' => 'Custom Design', 'code' => 'custom-design', 'sort' => 30, 'id' => null],
-        ];
-
-        foreach ($groups as $k => $groupProp) {
-            $categorySetup->addAttributeGroup($entityTypeId, $attributeSetId, $groupProp['name'], $groupProp['sort']);
-            $groups[$k]['id'] = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['code']);
-        }
-
-        // update attributes group and sort
-        $attributes = [
-            'custom_design' => ['group' => 'design', 'sort' => 10],
-            // 'custom_design_apply' => array('group' => 'design', 'sort' => 20),
-            'custom_design_from' => ['group' => 'design', 'sort' => 30],
-            'custom_design_to' => ['group' => 'design', 'sort' => 40],
-            'page_layout' => ['group' => 'design', 'sort' => 50],
-            'custom_layout_update' => ['group' => 'design', 'sort' => 60],
-            'display_mode' => ['group' => 'display', 'sort' => 10],
-            'landing_page' => ['group' => 'display', 'sort' => 20],
-            'is_anchor' => ['group' => 'display', 'sort' => 30],
-            'available_sort_by' => ['group' => 'display', 'sort' => 40],
-            'default_sort_by' => ['group' => 'display', 'sort' => 50],
-        ];
-
-        foreach ($attributes as $attributeCode => $attributeProp) {
-            $categorySetup->addAttributeToGroup(
-                $entityTypeId,
-                $attributeSetId,
-                $groups[$attributeProp['group']]['id'],
-                $attributeCode,
-                $attributeProp['sort']
-            );
-        }
-
-        /**
-         * Install product link types
-         */
-        $data = [
-            ['link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED, 'code' => 'relation'],
-            ['link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL, 'code' => 'up_sell'],
-            ['link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_CROSSSELL, 'code' => 'cross_sell'],
-        ];
-
-        foreach ($data as $bind) {
-            $setup->getConnection()
-                ->insertForce($setup->getTable('catalog_product_link_type'), $bind);
-        }
-
-        /**
-         * install product link attributes
-         */
-        $data = [
-            [
-                'link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED,
-                'product_link_attribute_code' => 'position',
-                'data_type' => 'int',
-            ],
-            [
-                'link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL,
-                'product_link_attribute_code' => 'position',
-                'data_type' => 'int'
-            ],
-            [
-                'link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_CROSSSELL,
-                'product_link_attribute_code' => 'position',
-                'data_type' => 'int'
-            ],
-        ];
-
-        $setup->getConnection()
-            ->insertMultiple($setup->getTable('catalog_product_link_attribute'), $data);
-
-        /**
-         * Remove Catalog specified attribute options (columns) from eav/attribute table
-         *
-         */
-        $describe = $setup->getConnection()
-            ->describeTable($setup->getTable('catalog_eav_attribute'));
-        foreach ($describe as $columnData) {
-            if ($columnData['COLUMN_NAME'] == 'attribute_id') {
-                continue;
-            }
-            $setup->getConnection()
-                ->dropColumn($setup->getTable('eav_attribute'), $columnData['COLUMN_NAME']);
-        }
-
-        $newGeneralTabName = 'Product Details';
-        $newPriceTabName = 'Advanced Pricing';
-        $newImagesTabName = 'Image Management';
-        $newMetaTabName = 'Search Engine Optimization';
-        $autosettingsTabName = 'Autosettings';
-        $tabNames = [
-            'General' => [
-                'attribute_group_name' => $newGeneralTabName,
-                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newGeneralTabName),
-                'tab_group_code' => 'basic',
-                'sort_order' => 10,
-            ],
-            'Images' => [
-                'attribute_group_name' => $newImagesTabName,
-                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newImagesTabName),
-                'tab_group_code' => 'basic',
-                'sort_order' => 20,
-            ],
-            'Meta Information' => [
-                'attribute_group_name' => $newMetaTabName,
-                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newMetaTabName),
-                'tab_group_code' => 'basic',
-                'sort_order' => 30,
-            ],
-            'Prices' => [
-                'attribute_group_name' => $newPriceTabName,
-                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newPriceTabName),
-                'tab_group_code' => 'advanced',
-                'sort_order' => 40,
-            ],
-            'Design' => ['attribute_group_code' => 'design', 'tab_group_code' => 'advanced', 'sort_order' => 50],
-        ];
-
-        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-        $attributeSetId = $categorySetup->getAttributeSetId($entityTypeId, 'Default');
-
-        //Rename attribute tabs
-        foreach ($tabNames as $tabName => $tab) {
-            $groupId = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $tabName);
-            if ($groupId) {
-                foreach ($tab as $propertyName => $propertyValue) {
-                    $categorySetup->updateAttributeGroup(
-                        $entityTypeId,
-                        $attributeSetId,
-                        $groupId,
-                        $propertyName,
-                        $propertyValue
-                    );
-                }
-            }
-        }
-
-        //Add new tab
-        $categorySetup->addAttributeGroup($entityTypeId, $attributeSetId, $autosettingsTabName, 60);
-        $categorySetup->updateAttributeGroup(
-            $entityTypeId,
-            $attributeSetId,
-            'Autosettings',
-            'attribute_group_code',
-            'autosettings'
-        );
-        $categorySetup->updateAttributeGroup(
-            $entityTypeId,
-            $attributeSetId,
-            'Autosettings',
-            'tab_group_code',
-            'advanced'
-        );
-
-        //New attributes order and properties
-        $properties = ['is_required', 'default_value', 'frontend_input_renderer'];
-        $attributesOrder = [
-            //Product Details tab
-            'name' => [$newGeneralTabName => 10],
-            'sku' => [$newGeneralTabName => 20],
-            'price' => [$newGeneralTabName => 30],
-            'image' => [$newGeneralTabName => 50],
-            'weight' => [$newGeneralTabName => 70, 'is_required' => 0],
-            'category_ids' => [$newGeneralTabName => 80],
-            'description' => [$newGeneralTabName => 90, 'is_required' => 0],
-            'status' => [
-                $newGeneralTabName => 100,
-                'is_required' => 0,
-                'default_value' => 1,
-                'frontend_input_renderer' => \Magento\Framework\Data\Form\Element\Hidden::class,
-            ],
-            //Autosettings tab
-            'short_description' => [$autosettingsTabName => 0, 'is_required' => 0],
-            'visibility' => [$autosettingsTabName => 20, 'is_required' => 0],
-            'news_from_date' => [$autosettingsTabName => 30],
-            'news_to_date' => [$autosettingsTabName => 40],
-            'country_of_manufacture' => [$autosettingsTabName => 50],
-        ];
-
-        foreach ($attributesOrder as $key => $value) {
-            $attribute = $categorySetup->getAttribute($entityTypeId, $key);
-            if ($attribute) {
-                foreach ($value as $propertyName => $propertyValue) {
-                    if (in_array($propertyName, $properties)) {
-                        $categorySetup->updateAttribute(
-                            $entityTypeId,
-                            $attribute['attribute_id'],
-                            $propertyName,
-                            $propertyValue
-                        );
-                    } else {
-                        $categorySetup->addAttributeToGroup(
-                            $entityTypeId,
-                            $attributeSetId,
-                            $propertyName,
-                            $attribute['attribute_id'],
-                            $propertyValue
-                        );
-                    }
-                }
-            }
-        }
-
-        foreach (['status', 'visibility'] as $attributeCode) {
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeCode,
-                'is_required_in_admin_store',
-                '1'
-            );
-        }
-        $categorySetup->updateAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
-            'custom_design_from',
-            'attribute_model',
-            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-        );
-        $categorySetup->updateAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
-            'custom_design_from',
-            'frontend_model',
-            \Magento\Eav\Model\Entity\Attribute\Frontend\Datetime::class
-        );
-    }
-}
diff --git a/app/code/Magento/Catalog/Setup/InstallSchema.php b/app/code/Magento/Catalog/Setup/InstallSchema.php
deleted file mode 100644
index a96f58ecc046a..0000000000000
--- a/app/code/Magento/Catalog/Setup/InstallSchema.php
+++ /dev/null
@@ -1,4265 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Catalog\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @throws \Zend_Db_Exception
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'catalog_product_entity'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_set_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute Set ID'
-            )
-            ->addColumn(
-                'type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => false, 'default' => 'simple'],
-                'Type ID'
-            )
-            ->addColumn(
-                'sku',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                [],
-                'SKU'
-            )
-            ->addColumn(
-                'has_options',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Has Options'
-            )
-            ->addColumn(
-                'required_options',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Required Options'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Creation Time'
-            )
-            ->addColumn(
-                'updated_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                'Update Time'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity', ['attribute_set_id']),
-                ['attribute_set_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity', ['sku']),
-                ['sku']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity',
-                    'attribute_set_id',
-                    'eav_attribute_set',
-                    'attribute_set_id'
-                ),
-                'attribute_set_id',
-                $installer->getTable('eav_attribute_set'),
-                'attribute_set_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_datetime'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity_datetime'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-                null,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_datetime',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_datetime', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_datetime', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_datetime',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_datetime',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_datetime', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Datetime Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_decimal'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity_decimal'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_decimal',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_decimal', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_decimal', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_decimal',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_decimal',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_decimal', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Decimal Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_int'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity_int'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_int',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_int', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_int', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_int', 'attribute_id', 'eav_attribute', 'attribute_id'),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_int', 'entity_id', 'catalog_product_entity', 'entity_id'),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_int', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Integer Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_text'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity_text'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_text',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_text', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_text', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_text',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_text',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_text', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Text Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_varchar'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity_varchar'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_varchar',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_varchar', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_varchar', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_varchar',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_varchar',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_varchar', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Varchar Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_gallery'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_entity_gallery'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true, 'default' => null],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_gallery',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_gallery', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_gallery', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_gallery', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_gallery',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_gallery',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_gallery', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Gallery Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_entity'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_entity'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_set_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attriute Set ID'
-            )
-            ->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Parent Category ID'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Creation Time'
-            )
-            ->addColumn(
-                'updated_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                'Update Time'
-            )
-            ->addColumn(
-                'path',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Tree Path'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false],
-                'Position'
-            )
-            ->addColumn(
-                'level',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Tree Level'
-            )
-            ->addColumn(
-                'children_count',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false],
-                'Child Count'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity', ['level']),
-                ['level']
-            )
-            ->setComment('Catalog Category Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_entity_datetime'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_entity_datetime'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-                null,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_entity_datetime',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_datetime', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_datetime', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_datetime', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_datetime',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_datetime',
-                    'entity_id',
-                    'catalog_category_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_category_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_datetime', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Category Datetime Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_entity_decimal'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_entity_decimal'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_entity_decimal',
-                    [ 'entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_decimal', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_decimal', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_decimal', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_decimal',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_decimal',
-                    'entity_id',
-                    'catalog_category_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_category_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_decimal', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Category Decimal Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_entity_int'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_entity_int'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_entity_int',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_int', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_int', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_int', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_int', 'attribute_id', 'eav_attribute', 'attribute_id'),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_int',
-                    'entity_id',
-                    'catalog_category_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_category_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_int', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Category Integer Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_entity_text'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_entity_text'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_entity_text',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_text', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_text', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_text', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_text', 'attribute_id', 'eav_attribute', 'attribute_id'),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_text',
-                    'entity_id',
-                    'catalog_category_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_category_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_text', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Category Text Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_entity_varchar'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_entity_varchar'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_entity_varchar',
-                    ['entity_id', 'attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_varchar', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_varchar', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_entity_varchar', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_varchar',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_category_entity_varchar',
-                    'entity_id',
-                    'catalog_category_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_category_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_entity_varchar', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Category Varchar Attribute Backend Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_product'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_product'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'category_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Category ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_product', ['product_id']),
-                ['product_id']
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_product',
-                    ['category_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['category_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_category_product', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product To Category Linkage Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_category_product_index'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_category_product_index'))
-            ->addColumn(
-                'category_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Category ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => false, 'nullable' => true, 'default' => null],
-                'Position'
-            )
-            ->addColumn(
-                'is_parent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Parent'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'visibility',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Visibility'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_product_index',
-                    ['product_id', 'store_id', 'category_id', 'visibility']
-                ),
-                ['product_id', 'store_id', 'category_id', 'visibility']
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_category_product_index',
-                    ['store_id', 'category_id', 'visibility', 'is_parent', 'position']
-                ),
-                ['store_id', 'category_id', 'visibility', 'is_parent', 'position']
-            )
-            ->setComment('Catalog Category Product Index');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_compare_item'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_compare_item')
-            )
-            ->addColumn(
-                'catalog_compare_item_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Compare Item ID'
-            )
-            ->addColumn(
-                'visitor_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Visitor ID'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Customer ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Store ID'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_compare_item', ['product_id']),
-                ['product_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_compare_item', ['visitor_id', 'product_id']),
-                ['visitor_id', 'product_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_compare_item', ['customer_id', 'product_id']),
-                ['customer_id', 'product_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_compare_item', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_compare_item', 'customer_id', 'customer_entity', 'entity_id'),
-                'customer_id',
-                $installer->getTable('customer_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_compare_item', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_compare_item', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment(
-                'Catalog Compare Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_website'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_website')
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_website', ['website_id']),
-                ['website_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_website', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_website', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product To Website Linkage Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_link_type'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_link_type')
-            )
-            ->addColumn(
-                'link_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Link Type ID'
-            )
-            ->addColumn(
-                'code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => true, 'default' => null],
-                'Code'
-            )
-            ->setComment(
-                'Catalog Product Link Type Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_link'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_link')
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Link ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'linked_product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Linked Product ID'
-            )
-            ->addColumn(
-                'link_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Link Type ID'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_link',
-                    ['link_type_id', 'product_id', 'linked_product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['link_type_id', 'product_id', 'linked_product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_link', ['product_id']),
-                ['product_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_link', ['linked_product_id']),
-                ['linked_product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link',
-                    'linked_product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'linked_product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_link', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link',
-                    'link_type_id',
-                    'catalog_product_link_type',
-                    'link_type_id'
-                ),
-                'link_type_id',
-                $installer->getTable('catalog_product_link_type'),
-                'link_type_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product To Product Linkage Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_link_attribute'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_link_attribute')
-            )
-            ->addColumn(
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product Link Attribute ID'
-            )
-            ->addColumn(
-                'link_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Link Type ID'
-            )
-            ->addColumn(
-                'product_link_attribute_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => true, 'default' => null],
-                'Product Link Attribute Code'
-            )
-            ->addColumn(
-                'data_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => true, 'default' => null],
-                'Data Type'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_link_attribute', ['link_type_id']),
-                ['link_type_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute',
-                    'link_type_id',
-                    'catalog_product_link_type',
-                    'link_type_id'
-                ),
-                'link_type_id',
-                $installer->getTable('catalog_product_link_type'),
-                'link_type_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Link Attribute Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_link_attribute_decimal'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_link_attribute_decimal')
-            )
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Product Link Attribute ID'
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'unsigned' => true],
-                'Link ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_link_attribute_decimal', ['link_id']),
-                ['link_id']
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_link_attribute_decimal',
-                    ['product_link_attribute_id', 'link_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_link_attribute_id', 'link_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute_decimal',
-                    'link_id',
-                    'catalog_product_link',
-                    'link_id'
-                ),
-                'link_id',
-                $installer->getTable('catalog_product_link'),
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute_decimal',
-                    'product_link_attribute_id',
-                    'catalog_product_link_attribute',
-                    'product_link_attribute_id'
-                ),
-                'product_link_attribute_id',
-                $installer->getTable('catalog_product_link_attribute'),
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Link Decimal Attribute Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_link_attribute_int'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_link_attribute_int')
-            )
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Product Link Attribute ID'
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'unsigned' => true],
-                'Link ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_link_attribute_int', ['link_id']),
-                ['link_id']
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_link_attribute_int',
-                    ['product_link_attribute_id', 'link_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_link_attribute_id', 'link_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute_int',
-                    'link_id',
-                    'catalog_product_link',
-                    'link_id'
-                ),
-                'link_id',
-                $installer->getTable('catalog_product_link'),
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute_int',
-                    'product_link_attribute_id',
-                    'catalog_product_link_attribute',
-                    'product_link_attribute_id'
-                ),
-                'product_link_attribute_id',
-                $installer->getTable('catalog_product_link_attribute'),
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Link Integer Attribute Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_link_attribute_varchar'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_link_attribute_varchar')
-            )
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product Link Attribute ID'
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'unsigned' => true],
-                'Link ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_link_attribute_varchar', ['link_id']),
-                ['link_id']
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_link_attribute_varchar',
-                    ['product_link_attribute_id', 'link_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_link_attribute_id', 'link_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute_varchar',
-                    'link_id',
-                    'catalog_product_link',
-                    'link_id'
-                ),
-                'link_id',
-                $installer->getTable('catalog_product_link'),
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_link_attribute_varchar',
-                    'product_link_attribute_id',
-                    'catalog_product_link_attribute',
-                    'product_link_attribute_id'
-                ),
-                'product_link_attribute_id',
-                $installer->getTable('catalog_product_link_attribute'),
-                'product_link_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Link Varchar Attribute Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        $customerGroupTable = $setup->getConnection()->describeTable($setup->getTable('customer_group'));
-        $customerGroupIdType = $customerGroupTable['customer_group_id']['DATA_TYPE'] == 'int'
-            ? \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER : $customerGroupTable['customer_group_id']['DATA_TYPE'];
-        /**
-         * Create table 'catalog_product_entity_tier_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_entity_tier_price')
-            )
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'all_groups',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Is Applicable To All Customer Groups'
-            )
-            ->addColumn(
-                'customer_group_id',
-                $customerGroupIdType,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '1.0000'],
-                'QTY'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Value'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Website ID'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_entity_tier_price',
-                    ['entity_id', 'all_groups', 'customer_group_id', 'qty', 'website_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_id', 'all_groups', 'customer_group_id', 'qty', 'website_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_tier_price', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_tier_price', ['website_id']),
-                ['website_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_tier_price',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                ),
-                'customer_group_id',
-                $installer->getTable('customer_group'),
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_tier_price',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_tier_price', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Tier Price Attribute Backend Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_media_gallery'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_entity_media_gallery')
-            )
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_media_gallery', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_media_gallery', ['entity_id']),
-                ['entity_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_media_gallery',
-                    'attribute_id',
-                    'eav_attribute',
-                    'attribute_id'
-                ),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Media Gallery Attribute Backend Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_entity_media_gallery_value'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_entity_media_gallery_value')
-            )
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Value ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity ID'
-            )
-            ->addColumn(
-                'label',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Label'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Position'
-            )
-            ->addColumn(
-                'disabled',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Disabled'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_media_gallery_value', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity_media_gallery_value', ['entity_id']),
-                ['entity_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_media_gallery_value',
-                    'value_id',
-                    'catalog_product_entity_media_gallery',
-                    'value_id'
-                ),
-                'value_id',
-                $installer->getTable('catalog_product_entity_media_gallery'),
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity_media_gallery_value', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_media_gallery_value',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Media Gallery Attribute Value Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_option'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_option')
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                ['nullable' => true, 'default' => null],
-                'Type'
-            )
-            ->addColumn(
-                'is_require',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '1'],
-                'Is Required'
-            )
-            ->addColumn(
-                'sku',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                [],
-                'SKU'
-            )
-            ->addColumn(
-                'max_characters',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Max Characters'
-            )
-            ->addColumn(
-                'file_extension',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                [],
-                'File Extension'
-            )
-            ->addColumn(
-                'image_size_x',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Image Size X'
-            )
-            ->addColumn(
-                'image_size_y',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Image Size Y'
-            )
-            ->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sort Order'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_option', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_option', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Option Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_option_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_option_price')
-            )
-            ->addColumn(
-                'option_price_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option Price ID'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Option ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Price'
-            )
-            ->addColumn(
-                'price_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                7,
-                ['nullable' => false, 'default' => 'fixed'],
-                'Price Type'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_option_price',
-                    ['option_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['option_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_option_price', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_option_price',
-                    'option_id',
-                    'catalog_product_option',
-                    'option_id'
-                ),
-                'option_id',
-                $installer->getTable('catalog_product_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_option_price', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Option Price Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_option_title'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_option_title')
-            )
-            ->addColumn(
-                'option_title_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option Title ID'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Option ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true, 'default' => null],
-                'Title'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_option_title',
-                    ['option_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['option_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_option_title', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_option_title',
-                    'option_id',
-                    'catalog_product_option',
-                    'option_id'
-                ),
-                'option_id',
-                $installer->getTable('catalog_product_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_option_title', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Option Title Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_option_type_value'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_option_type_value')
-            )
-            ->addColumn(
-                'option_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option Type ID'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Option ID'
-            )
-            ->addColumn(
-                'sku',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                [],
-                'SKU'
-            )
-            ->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sort Order'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_option_type_value', ['option_id']),
-                ['option_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_option_type_value',
-                    'option_id',
-                    'catalog_product_option',
-                    'option_id'
-                ),
-                'option_id',
-                $installer->getTable('catalog_product_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Option Type Value Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_option_type_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_option_type_price')
-            )
-            ->addColumn(
-                'option_type_price_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option Type Price ID'
-            )
-            ->addColumn(
-                'option_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Option Type ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Price'
-            )
-            ->addColumn(
-                'price_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                7,
-                ['nullable' => false, 'default' => 'fixed'],
-                'Price Type'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_option_type_price',
-                    ['option_type_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['option_type_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_option_type_price', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_option_type_price',
-                    'option_type_id',
-                    'catalog_product_option_type_value',
-                    'option_type_id'
-                ),
-                'option_type_id',
-                $installer->getTable('catalog_product_option_type_value'),
-                'option_type_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_option_type_price', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Option Type Price Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_option_type_title'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_option_type_title')
-            )
-            ->addColumn(
-                'option_type_title_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Option Type Title ID'
-            )
-            ->addColumn(
-                'option_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Option Type ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true, 'default' => null],
-                'Title'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_option_type_title',
-                    ['option_type_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['option_type_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_option_type_title', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_option_type_title',
-                    'option_type_id',
-                    'catalog_product_option_type_value',
-                    'option_type_id'
-                ),
-                'option_type_id',
-                $installer->getTable('catalog_product_option_type_value'),
-                'option_type_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_option_type_title', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Option Type Title Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_eav_attribute'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_eav_attribute')
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'frontend_input_renderer',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Frontend Input Renderer'
-            )
-            ->addColumn(
-                'is_global',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Is Global'
-            )
-            ->addColumn(
-                'is_visible',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Is Visible'
-            )
-            ->addColumn(
-                'is_searchable',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Searchable'
-            )
-            ->addColumn(
-                'is_filterable',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Filterable'
-            )
-            ->addColumn(
-                'is_comparable',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Comparable'
-            )
-            ->addColumn(
-                'is_visible_on_front',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Visible On Front'
-            )
-            ->addColumn(
-                'is_html_allowed_on_front',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is HTML Allowed On Front'
-            )
-            ->addColumn(
-                'is_used_for_price_rules',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Used For Price Rules'
-            )
-            ->addColumn(
-                'is_filterable_in_search',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Filterable In Search'
-            )
-            ->addColumn(
-                'used_in_product_listing',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Used In Product Listing'
-            )
-            ->addColumn(
-                'used_for_sort_by',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Used For Sorting'
-            )
-            ->addColumn(
-                'apply_to',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Apply To'
-            )
-            ->addColumn(
-                'is_visible_in_advanced_search',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Visible In Advanced Search'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addColumn(
-                'is_wysiwyg_enabled',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is WYSIWYG Enabled'
-            )
-            ->addColumn(
-                'is_used_for_promo_rules',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Used For Promo Rules'
-            )
-            ->addColumn(
-                'is_required_in_admin_store',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Required In Admin Store'
-            )
-            ->addColumn(
-                'is_used_in_grid',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Used in Grid'
-            )
-            ->addColumn(
-                'is_visible_in_grid',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Visible in Grid'
-            )
-            ->addColumn(
-                'is_filterable_in_grid',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Filterable in Grid'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_eav_attribute', ['used_for_sort_by']),
-                ['used_for_sort_by']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_eav_attribute', ['used_in_product_listing']),
-                ['used_in_product_listing']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_eav_attribute', 'attribute_id', 'eav_attribute', 'attribute_id'),
-                'attribute_id',
-                $installer->getTable('eav_attribute'),
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog EAV Attribute Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_relation'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_relation')
-            )
-            ->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Parent ID'
-            )
-            ->addColumn(
-                'child_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Child ID'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_relation', ['child_id']),
-                ['child_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_relation', 'child_id', 'catalog_product_entity', 'entity_id'),
-                'child_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_relation', 'parent_id', 'catalog_product_entity', 'entity_id'),
-                'parent_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Relation Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_eav'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_eav')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav', ['value']),
-                ['value']
-            )
-            ->setComment(
-                'Catalog Product EAV Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_eav_decimal'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_eav_decimal')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'primary' => false],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal', ['value']),
-                ['value']
-            )
-            ->setComment(
-                'Catalog Product EAV Decimal Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                $customerGroupIdType,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'final_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Final Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price', ['min_price']),
-                ['min_price']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price', ['website_id', 'customer_group_id', 'min_price']),
-                ['website_id', 'customer_group_id', 'min_price']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_index_price',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                ),
-                'customer_group_id',
-                $installer->getTable('customer_group'),
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_index_price',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_index_price', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Price Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_tier_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_tier_price')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                $customerGroupIdType,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_tier_price', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_tier_price', ['website_id']),
-                ['website_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_index_tier_price',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                ),
-                'customer_group_id',
-                $installer->getTable('customer_group'),
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_index_tier_price',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_index_tier_price', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Tier Price Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_website'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_website')
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'website_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'Website Date'
-            )
-            ->addColumn(
-                'rate',
-                \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
-                null,
-                ['default' => '1.0000'],
-                'Rate'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_website', ['website_date']),
-                ['website_date']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_index_website', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment(
-                'Catalog Product Website Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_cfg_opt_agr_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_cfg_opt_agr_idx')
-            )
-            ->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Parent ID'
-            )
-            ->addColumn(
-                'child_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Child ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Config Option Aggregate Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_cfg_opt_agr_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_cfg_opt_agr_tmp')
-            )
-            ->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Parent ID'
-            )
-            ->addColumn(
-                'child_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Child ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Config Option Aggregate Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_cfg_opt_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_cfg_opt_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Config Option Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_cfg_opt_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_cfg_opt_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Config Option Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_final_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_final_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class ID'
-            )
-            ->addColumn(
-                'orig_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Original Price'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addColumn(
-                'base_tier',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Base Tier'
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Final Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_final_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_final_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class ID'
-            )
-            ->addColumn(
-                'orig_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Original Price'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addColumn(
-                'base_tier',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Base Tier'
-            )
-
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Final Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_opt_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_opt_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Option Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_opt_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_opt_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Option Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_opt_agr_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_opt_agr_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Option Aggregate Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_opt_agr_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_opt_agr_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Option ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Option Aggregate Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_eav_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_eav_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_idx', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_idx', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_idx', ['value']),
-                ['value']
-            )
-            ->setComment(
-                'Catalog Product EAV Indexer Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_eav_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_eav_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_tmp', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_tmp', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_tmp', ['value']),
-                ['value']
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product EAV Indexer Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_eav_decimal_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_eav_decimal_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'primary' => true],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal_idx', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal_idx', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal_idx', ['value']),
-                ['value']
-            )
-            ->setComment(
-                'Catalog Product EAV Decimal Indexer Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_eav_decimal_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_eav_decimal_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store ID'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'primary' => false],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal_tmp', ['attribute_id']),
-                ['attribute_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal_tmp', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_eav_decimal_tmp', ['value']),
-                ['value']
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product EAV Decimal Indexer Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_idx')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'final_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Final Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price_idx', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price_idx', ['website_id']),
-                ['website_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price_idx', ['min_price']),
-                ['min_price']
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Index Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_product_index_price_tmp')
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'tax_class_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Tax Class ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Price'
-            )
-            ->addColumn(
-                'final_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Final Price'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Min Price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Max Price'
-            )
-            ->addColumn(
-                'tier_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Tier Price'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price_tmp', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price_tmp', ['website_id']),
-                ['website_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_index_price_tmp', ['min_price']),
-                ['min_price']
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Product Price Indexer Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'catalog_category_product_index_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('catalog_category_product_index_tmp')
-            )
-            ->addColumn(
-                'category_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Category ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addColumn(
-                'is_parent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Parent'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'visibility',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Visibility'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_category_product_index_tmp', ['product_id', 'category_id', 'store_id']),
-                ['product_id', 'category_id', 'store_id']
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment(
-                'Catalog Category Product Indexer Temp Table'
-            );
-        $installer->getConnection()
-            ->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php b/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
new file mode 100644
index 0000000000000..9698e2e049f26
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ChangePriceAttributeDefaultScope
+ * @package Magento\Catalog\Setup\Patch
+ */
+class ChangePriceAttributeDefaultScope implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * ChangePriceAttributeDefaultScope constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $this->changePriceAttributeDefaultScope($categorySetup);
+    }
+
+    /**
+     * @param CategorySetup $categorySetup
+     * @return void
+     */
+    private function changePriceAttributeDefaultScope($categorySetup)
+    {
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        foreach (['price', 'cost', 'special_price'] as $attributeCode) {
+            $attribute = $categorySetup->getAttribute($entityTypeId, $attributeCode);
+            if (isset($attribute['attribute_id'])) {
+                $categorySetup->updateAttribute(
+                    $entityTypeId,
+                    $attribute['attribute_id'],
+                    'is_global',
+                    \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
+                );
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateProductMetaDescription::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.1.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php b/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
new file mode 100644
index 0000000000000..226b94ceb1749
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class DisallowUsingHtmlForProductName.
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class DisallowUsingHtmlForProductName implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * DisallowUsingHtmlForProductName constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'name');
+
+        $this->moduleDataSetup->getConnection()->update(
+            $this->moduleDataSetup->getTable('catalog_eav_attribute'),
+            ['is_html_allowed_on_front' => 0],
+            $this->moduleDataSetup->getConnection()->quoteInto('attribute_id = ?', $attribute['attribute_id'])
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            ChangePriceAttributeDefaultScope::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.1.5';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/EnableDirectiveParsing.php b/app/code/Magento/Catalog/Setup/Patch/Data/EnableDirectiveParsing.php
new file mode 100644
index 0000000000000..f881b2f49f600
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/EnableDirectiveParsing.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Class EnableDirectiveParsing
+ * @package Magento\Catalog\Setup\Patch
+ */
+class EnableDirectiveParsing implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $configTable = $this->moduleDataSetup->getTable('core_config_data');
+        $select = $this->moduleDataSetup->getConnection()->select()
+            ->from($configTable)
+            ->where('path = ?', 'catalog/frontend/parse_url_directives');
+        $config = $this->moduleDataSetup->getConnection()->fetchAll($select);
+        if (!empty($config)) {
+            $this->moduleDataSetup->getConnection()->update(
+                $configTable,
+                ['value' => '1'],
+                ['path = ?' => 'catalog/frontend/parse_url_directives', 'value IN (?)' => '0']
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/EnableSegmentation.php b/app/code/Magento/Catalog/Setup/Patch/Data/EnableSegmentation.php
new file mode 100644
index 0000000000000..d7b683a439ff1
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/EnableSegmentation.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Class EnableSegmentation.
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class EnableSegmentation implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * EnableSegmentation constructor.
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+        $setup = $this->moduleDataSetup;
+
+        $catalogCategoryProductIndexColumns = array_keys(
+            $setup->getConnection()->describeTable($setup->getTable('catalog_category_product_index'))
+        );
+        $storeSelect = $setup->getConnection()->select()->from($setup->getTable('store'))->where('store_id > 0');
+        foreach ($setup->getConnection()->fetchAll($storeSelect) as $store) {
+            $catalogCategoryProductIndexSelect = $setup->getConnection()->select()
+                ->from(
+                    $setup->getTable('catalog_category_product_index')
+                )->where(
+                    'store_id = ?',
+                    $store['store_id']
+                );
+            $indexTable = $setup->getTable('catalog_category_product_index') .
+                '_' .
+                \Magento\Store\Model\Store::ENTITY .
+                $store['store_id'];
+            $setup->getConnection()->query(
+                $setup->getConnection()->insertFromSelect(
+                    $catalogCategoryProductIndexSelect,
+                    $indexTable,
+                    $catalogCategoryProductIndexColumns,
+                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                )
+            );
+        }
+        $setup->getConnection()->delete($setup->getTable('catalog_category_product_index'));
+        $setup->getConnection()->delete($setup->getTable('catalog_category_product_index_replica'));
+        $setup->getConnection()->delete($setup->getTable('catalog_category_product_index_tmp'));
+
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php b/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php
new file mode 100644
index 0000000000000..f1d836a5862f6
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php
@@ -0,0 +1,377 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\Catalog\Helper\DefaultCategoryFactory;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InstallDefaultCategories data patch.
+ *
+ * @package Magento\Catalog\Setup\Patch
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class InstallDefaultCategories implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * @var DefaultCategoryFactory
+     */
+    private $defaultCategoryFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     * @param DefaultCategoryFactory $defaultCategoryFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory,
+        \Magento\Catalog\Helper\DefaultCategoryFactory $defaultCategoryFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+        $this->defaultCategoryFactory = $defaultCategoryFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function apply()
+    {
+        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $rootCategoryId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        $defaultCategory = $this->defaultCategoryFactory->create();
+        $defaultCategoryId = $defaultCategory->getId();
+
+        $categorySetup->installEntities();
+        // Create Root Catalog Node
+        $categorySetup->createCategory()
+            ->load($rootCategoryId)
+            ->setId($rootCategoryId)
+            ->setStoreId(0)
+            ->setPath($rootCategoryId)
+            ->setLevel(0)
+            ->setPosition(0)
+            ->setChildrenCount(0)
+            ->setName('Root Catalog')
+            ->setInitialSetupFlag(true)
+            ->save();
+
+        // Create Default Catalog Node
+        $category = $categorySetup->createCategory();
+        $category->load($defaultCategoryId)
+            ->setId($defaultCategoryId)
+            ->setStoreId(0)
+            ->setPath($rootCategoryId . '/' . $defaultCategoryId)
+            ->setName('Default Category')
+            ->setDisplayMode('PRODUCTS')
+            ->setIsActive(1)
+            ->setLevel(1)
+            ->setInitialSetupFlag(true)
+            ->setAttributeSetId($category->getDefaultAttributeSetId())
+            ->save();
+
+        $data = [
+            'scope' => 'default',
+            'scope_id' => 0,
+            'path' => \Magento\Catalog\Helper\Category::XML_PATH_CATEGORY_ROOT_ID,
+            'value' => $category->getId(),
+        ];
+        $this->moduleDataSetup->getConnection()->insertOnDuplicate(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            $data,
+            ['value']
+        );
+
+        $categorySetup->addAttributeGroup(\Magento\Catalog\Model\Product::ENTITY, 'Default', 'Design', 6);
+
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Category::ENTITY);
+        $attributeSetId = $categorySetup->getDefaultAttributeSetId($entityTypeId);
+        $attributeGroupId = $categorySetup->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
+
+        // update General Group
+        $categorySetup->updateAttributeGroup($entityTypeId, $attributeSetId, $attributeGroupId, 'sort_order', '10');
+
+        $groups = [
+            'display' => ['name' => 'Display Settings', 'code' => 'display-settings', 'sort' => 20, 'id' => null],
+            'design' => ['name' => 'Custom Design', 'code' => 'custom-design', 'sort' => 30, 'id' => null],
+        ];
+
+        foreach ($groups as $k => $groupProp) {
+            $categorySetup->addAttributeGroup($entityTypeId, $attributeSetId, $groupProp['name'], $groupProp['sort']);
+            $groups[$k]['id'] = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['code']);
+        }
+
+        // update attributes group and sort
+        $attributes = [
+            'custom_design' => ['group' => 'design', 'sort' => 10],
+            // 'custom_design_apply' => array('group' => 'design', 'sort' => 20),
+            'custom_design_from' => ['group' => 'design', 'sort' => 30],
+            'custom_design_to' => ['group' => 'design', 'sort' => 40],
+            'page_layout' => ['group' => 'design', 'sort' => 50],
+            'custom_layout_update' => ['group' => 'design', 'sort' => 60],
+            'display_mode' => ['group' => 'display', 'sort' => 10],
+            'landing_page' => ['group' => 'display', 'sort' => 20],
+            'is_anchor' => ['group' => 'display', 'sort' => 30],
+            'available_sort_by' => ['group' => 'display', 'sort' => 40],
+            'default_sort_by' => ['group' => 'display', 'sort' => 50],
+        ];
+
+        foreach ($attributes as $attributeCode => $attributeProp) {
+            $categorySetup->addAttributeToGroup(
+                $entityTypeId,
+                $attributeSetId,
+                $groups[$attributeProp['group']]['id'],
+                $attributeCode,
+                $attributeProp['sort']
+            );
+        }
+
+        /**
+         * Install product link types
+         */
+        $data = [
+            ['link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED, 'code' => 'relation'],
+            ['link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL, 'code' => 'up_sell'],
+            ['link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_CROSSSELL, 'code' => 'cross_sell'],
+        ];
+
+        foreach ($data as $bind) {
+            $this->moduleDataSetup->getConnection()->insertForce(
+                $this->moduleDataSetup->getTable(
+                    'catalog_product_link_type'
+                ),
+                $bind
+            );
+        }
+
+        /**
+         * install product link attributes
+         */
+        $data = [
+            [
+                'link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_RELATED,
+                'product_link_attribute_code' => 'position',
+                'data_type' => 'int',
+            ],
+            [
+                'link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL,
+                'product_link_attribute_code' => 'position',
+                'data_type' => 'int'
+            ],
+            [
+                'link_type_id' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_CROSSSELL,
+                'product_link_attribute_code' => 'position',
+                'data_type' => 'int'
+            ],
+        ];
+
+        $this->moduleDataSetup->getConnection()->insertMultiple(
+            $this->moduleDataSetup->getTable('catalog_product_link_attribute'),
+            $data
+        );
+
+        /**
+         * Remove Catalog specified attribute options (columns) from eav/attribute table
+         *
+         */
+        $describe = $this->moduleDataSetup->getConnection()
+            ->describeTable($this->moduleDataSetup->getTable('catalog_eav_attribute'));
+        foreach ($describe as $columnData) {
+            if ($columnData['COLUMN_NAME'] == 'attribute_id') {
+                continue;
+            }
+            $this->moduleDataSetup->getConnection()->dropColumn(
+                $this->moduleDataSetup->getTable('eav_attribute'),
+                $columnData['COLUMN_NAME']
+            );
+        }
+
+        $newGeneralTabName = 'Product Details';
+        $newPriceTabName = 'Advanced Pricing';
+        $newImagesTabName = 'Image Management';
+        $newMetaTabName = 'Search Engine Optimization';
+        $autosettingsTabName = 'Autosettings';
+        $tabNames = [
+            'General' => [
+                'attribute_group_name' => $newGeneralTabName,
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newGeneralTabName),
+                'tab_group_code' => 'basic',
+                'sort_order' => 10,
+            ],
+            'Images' => [
+                'attribute_group_name' => $newImagesTabName,
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newImagesTabName),
+                'tab_group_code' => 'basic',
+                'sort_order' => 20,
+            ],
+            'Meta Information' => [
+                'attribute_group_name' => $newMetaTabName,
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newMetaTabName),
+                'tab_group_code' => 'basic',
+                'sort_order' => 30,
+            ],
+            'Prices' => [
+                'attribute_group_name' => $newPriceTabName,
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newPriceTabName),
+                'tab_group_code' => 'advanced',
+                'sort_order' => 40,
+            ],
+            'Design' => ['attribute_group_code' => 'design', 'tab_group_code' => 'advanced', 'sort_order' => 50],
+        ];
+
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $attributeSetId = $categorySetup->getAttributeSetId($entityTypeId, 'Default');
+
+        //Rename attribute tabs
+        foreach ($tabNames as $tabName => $tab) {
+            $groupId = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $tabName);
+            if ($groupId) {
+                foreach ($tab as $propertyName => $propertyValue) {
+                    $categorySetup->updateAttributeGroup(
+                        $entityTypeId,
+                        $attributeSetId,
+                        $groupId,
+                        $propertyName,
+                        $propertyValue
+                    );
+                }
+            }
+        }
+
+        //Add new tab
+        $categorySetup->addAttributeGroup($entityTypeId, $attributeSetId, $autosettingsTabName, 60);
+        $categorySetup->updateAttributeGroup(
+            $entityTypeId,
+            $attributeSetId,
+            'Autosettings',
+            'attribute_group_code',
+            'autosettings'
+        );
+        $categorySetup->updateAttributeGroup(
+            $entityTypeId,
+            $attributeSetId,
+            'Autosettings',
+            'tab_group_code',
+            'advanced'
+        );
+
+        //New attributes order and properties
+        $properties = ['is_required', 'default_value', 'frontend_input_renderer'];
+        $attributesOrder = [
+            //Product Details tab
+            'name' => [$newGeneralTabName => 10],
+            'sku' => [$newGeneralTabName => 20],
+            'price' => [$newGeneralTabName => 30],
+            'image' => [$newGeneralTabName => 50],
+            'weight' => [$newGeneralTabName => 70, 'is_required' => 0],
+            'category_ids' => [$newGeneralTabName => 80],
+            'description' => [$newGeneralTabName => 90, 'is_required' => 0],
+            'status' => [
+                $newGeneralTabName => 100,
+                'is_required' => 0,
+                'default_value' => 1,
+                'frontend_input_renderer' => \Magento\Framework\Data\Form\Element\Hidden::class,
+            ],
+            //Autosettings tab
+            'short_description' => [$autosettingsTabName => 0, 'is_required' => 0],
+            'visibility' => [$autosettingsTabName => 20, 'is_required' => 0],
+            'news_from_date' => [$autosettingsTabName => 30],
+            'news_to_date' => [$autosettingsTabName => 40],
+            'country_of_manufacture' => [$autosettingsTabName => 50],
+        ];
+
+        foreach ($attributesOrder as $key => $value) {
+            $attribute = $categorySetup->getAttribute($entityTypeId, $key);
+            if ($attribute) {
+                foreach ($value as $propertyName => $propertyValue) {
+                    if (in_array($propertyName, $properties)) {
+                        $categorySetup->updateAttribute(
+                            $entityTypeId,
+                            $attribute['attribute_id'],
+                            $propertyName,
+                            $propertyValue
+                        );
+                    } else {
+                        $categorySetup->addAttributeToGroup(
+                            $entityTypeId,
+                            $attributeSetId,
+                            $propertyName,
+                            $attribute['attribute_id'],
+                            $propertyValue
+                        );
+                    }
+                }
+            }
+        }
+
+        foreach (['status', 'visibility'] as $attributeCode) {
+            $categorySetup->updateAttribute(
+                \Magento\Catalog\Model\Product::ENTITY,
+                $attributeCode,
+                'is_required_in_admin_store',
+                '1'
+            );
+        }
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'custom_design_from',
+            'attribute_model',
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'custom_design_from',
+            'frontend_model',
+            \Magento\Eav\Model\Entity\Attribute\Frontend\Datetime::class
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php b/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php
new file mode 100644
index 0000000000000..d59347f501de1
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SetNewResourceModelsPaths
+ * @package Magento\Catalog\Setup\Patch
+ */
+class SetNewResourceModelsPaths implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        // set new resource model paths
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $categorySetup->updateEntityType(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'entity_model',
+            \Magento\Catalog\Model\ResourceModel\Category::class
+        );
+        $categorySetup->updateEntityType(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'attribute_model',
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        );
+        $categorySetup->updateEntityType(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'entity_attribute_collection',
+            \Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection::class
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'custom_design_from',
+            'attribute_model',
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        );
+        $categorySetup->updateEntityType(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'entity_model',
+            \Magento\Catalog\Model\ResourceModel\Product::class
+        );
+        $categorySetup->updateEntityType(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'attribute_model',
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        );
+        $categorySetup->updateEntityType(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'entity_attribute_collection',
+            \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InstallDefaultCategories::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
new file mode 100644
index 0000000000000..1d58de1994a11
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateDefaultAttributeValue
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpdateDefaultAttributeValue implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $categorySetup->updateAttribute(3, 54, 'default_value', 1);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            SetNewResourceModelsPaths::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php
new file mode 100644
index 0000000000000..43665c569c0c9
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateMediaAttributesBackendTypes
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpdateMediaAttributesBackendTypes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $mediaBackendType = 'static';
+        $mediaBackendModel = null;
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $categorySetup->updateAttribute(
+            'catalog_product',
+            'media_gallery',
+            'backend_type',
+            $mediaBackendType
+        );
+        $categorySetup->updateAttribute(
+            'catalog_product',
+            'media_gallery',
+            'backend_model',
+            $mediaBackendModel
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateDefaultAttributeValue::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
new file mode 100644
index 0000000000000..d02753d44adee
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateProductAttributes
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpdateProductAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        //Product Details tab
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'status',
+            'frontend_label',
+            'Enable Product',
+            5
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'name',
+            'frontend_label',
+            'Product Name'
+        );
+        $attributeSetId = $categorySetup->getDefaultAttributeSetId(\Magento\Catalog\Model\Product::ENTITY);
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Product Details',
+            'visibility',
+            80
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Product Details',
+            'news_from_date',
+            90
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Product Details',
+            'news_to_date',
+            100
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Product Details',
+            'country_of_manufacture',
+            110
+        );
+
+        //Content tab
+        $categorySetup->addAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            15
+        );
+        $categorySetup->updateAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'tab_group_code',
+            'basic'
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'description'
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'short_description',
+            100
+        );
+
+        //Images tab
+        $groupId = (int)$categorySetup->getAttributeGroupByCode(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'image-management',
+            'attribute_group_id'
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            $groupId,
+            'image',
+            1
+        );
+        $categorySetup->updateAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            $groupId,
+            'attribute_group_name',
+            'Images'
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'image',
+            'frontend_label',
+            'Base'
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'small_image',
+            'frontend_label',
+            'Small'
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'image',
+            'frontend_input_renderer',
+            null
+        );
+
+        //Design tab
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'page_layout',
+            'frontend_label',
+            'Layout'
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'custom_layout_update',
+            'frontend_label',
+            'Layout Update XML',
+            10
+        );
+
+        //Schedule Design Update tab
+        $categorySetup->addAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Schedule Design Update',
+            55
+        );
+        $categorySetup->updateAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Schedule Design Update',
+            'tab_group_code',
+            'advanced'
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Schedule Design Update',
+            'custom_design_from',
+            20
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Schedule Design Update',
+            'custom_design_to',
+            30
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'custom_design',
+            'frontend_label',
+            'New Theme',
+            40
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Schedule Design Update',
+            'custom_design'
+        );
+        $categorySetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'custom_layout',
+            [
+                'type' => 'varchar',
+                'label' => 'New Layout',
+                'input' => 'select',
+                'source' => \Magento\Catalog\Model\Product\Attribute\Source\Layout::class,
+                'required' => false,
+                'sort_order' => 50,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'group' => 'Schedule Design Update',
+                'is_used_in_grid' => true,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => false
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateMediaAttributesBackendTypes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.5';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php
new file mode 100644
index 0000000000000..0c8f248d1d5c5
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateProductMetaDescription
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpdateProductMetaDescription implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        $eavSetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'meta_description',
+            [
+                'note' => 'Maximum 255 chars. Meta Description should optimally be between 150-160 characters'
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateProductAttributes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.7';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/UpgradeWebsiteAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
similarity index 75%
rename from app/code/Magento/Catalog/Setup/UpgradeWebsiteAttributes.php
rename to app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
index 3d300d9c849a9..a190bde2c6775 100644
--- a/app/code/Magento/Catalog/Setup/UpgradeWebsiteAttributes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Catalog\Setup;
+namespace Magento\Catalog\Setup\Patch\Data;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -12,14 +12,16 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpgradeWebsiteAttributes
- * @package Magento\Catalog\Setup
+ * @package Magento\Catalog\Setup\Patch
  *
  * IMPORTANT: This class const/methods can not be reused because it needs to be isolated
  */
-class UpgradeWebsiteAttributes
+class UpgradeWebsiteAttributes implements DataPatchInterface, PatchVersionInterface
 {
     /**
      * ATTENTION: These constants must not be reused anywhere outside
@@ -79,48 +81,55 @@ class UpgradeWebsiteAttributes
      */
     private $linkFields = [];
 
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
     /**
      * UpgradeWebsiteAttributes constructor.
      * @param Generator $batchQueryGenerator
      * @param MetadataPool $metadataPool
+     * @param ModuleDataSetupInterface $moduleDataSetup
      */
-    public function __construct(Generator $batchQueryGenerator, MetadataPool $metadataPool)
-    {
+    public function __construct(
+        Generator $batchQueryGenerator,
+        MetadataPool $metadataPool,
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
         $this->batchQueryGenerator = $batchQueryGenerator;
         $this->metaDataPool = $metadataPool;
+        $this->moduleDataSetup = $moduleDataSetup;
     }
 
     /**
-     * @param ModuleDataSetupInterface $setup
-     * @return void
+     * {@inheritdoc}
      */
-    public function upgrade(ModuleDataSetupInterface $setup)
+    public function apply()
     {
         foreach (array_keys($this->tableMetaDataClass) as $tableName) {
-            $this->upgradeTable($setup, $tableName);
+            $this->upgradeTable($tableName);
         }
     }
 
     /**
-     * @param ModuleDataSetupInterface $setup
      * @param string $tableName
      * @return void
      */
-    private function upgradeTable(ModuleDataSetupInterface $setup, $tableName)
+    private function upgradeTable($tableName)
     {
-        foreach ($this->fetchAttributeValues($setup, $tableName) as $attributeValueItems) {
-            $this->processAttributeValues($setup, $attributeValueItems, $tableName);
+        foreach ($this->fetchAttributeValues($tableName) as $attributeValueItems) {
+            $this->processAttributeValues($attributeValueItems, $tableName);
         }
     }
 
     /**
      * Aligns website attribute values
-     * @param ModuleDataSetupInterface $setup
      * @param array $attributeValueItems
      * @param string $tableName
      * @return void
      */
-    private function processAttributeValues(ModuleDataSetupInterface $setup, array $attributeValueItems, $tableName)
+    private function processAttributeValues(array $attributeValueItems, $tableName)
     {
         $this->resetProcessedAttributeValues();
 
@@ -129,9 +138,9 @@ private function processAttributeValues(ModuleDataSetupInterface $setup, array $
                 continue;
             }
 
-            $insertions = $this->generateAttributeValueInsertions($setup, $attributeValueItem, $tableName);
+            $insertions = $this->generateAttributeValueInsertions($attributeValueItem, $tableName);
             if (!empty($insertions)) {
-                $this->executeInsertions($setup, $insertions, $tableName);
+                $this->executeInsertions($insertions, $tableName);
             }
 
             $this->markAttributeValueProcessed($attributeValueItem, $tableName);
@@ -141,32 +150,46 @@ private function processAttributeValues(ModuleDataSetupInterface $setup, array $
     /**
      * Yields batch of AttributeValues
      *
-     * @param ModuleDataSetupInterface $setup
      * @param string $tableName
      * @yield array
-     * @return void
+     * @return \Generator
      */
-    private function fetchAttributeValues(ModuleDataSetupInterface $setup, $tableName)
+    private function fetchAttributeValues($tableName)
     {
-        $connection = $setup->getConnection();
+        //filter store groups which have more than 1 store
+        $multipleStoresInWebsite = array_values(
+            array_reduce(
+                array_filter($this->getGroupedStoreViews(), function ($storeViews) {
+                    return is_array($storeViews) && count($storeViews) > 1;
+                }),
+                'array_merge',
+                []
+            )
+        );
+
+        if (count($multipleStoresInWebsite) < 1) {
+            return [];
+        }
+
+        $connection = $this->moduleDataSetup->getConnection();
         $batchSelectIterator = $this->batchQueryGenerator->generate(
             'value_id',
             $connection
                 ->select()
                 ->from(
-                    ['cpei' => $setup->getTable($tableName)],
+                    ['cpei' => $this->moduleDataSetup->getTable($tableName)],
                     '*'
                 )
                 ->join(
                     [
-                        'cea' => $setup->getTable('catalog_eav_attribute'),
+                        'cea' => $this->moduleDataSetup->getTable('catalog_eav_attribute'),
                     ],
                     'cpei.attribute_id = cea.attribute_id',
                     ''
                 )
                 ->join(
                     [
-                        'st' => $setup->getTable('store'),
+                        'st' => $this->moduleDataSetup->getTable('store'),
                     ],
                     'st.store_id = cpei.store_id',
                     'st.website_id'
@@ -176,9 +199,10 @@ private function fetchAttributeValues(ModuleDataSetupInterface $setup, $tableNam
                     self::ATTRIBUTE_WEBSITE
                 )
                 ->where(
-                    'cpei.store_id <> ?',
-                    self::GLOBAL_STORE_VIEW_ID
-                )
+                    'cpei.store_id IN (?)',
+                    $multipleStoresInWebsite
+                ),
+            1000
         );
 
         foreach ($batchSelectIterator as $select) {
@@ -187,20 +211,19 @@ private function fetchAttributeValues(ModuleDataSetupInterface $setup, $tableNam
     }
 
     /**
-     * @param ModuleDataSetupInterface $setup
      * @return array
      */
-    private function getGroupedStoreViews(ModuleDataSetupInterface $setup)
+    private function getGroupedStoreViews()
     {
         if (!empty($this->groupedStoreViews)) {
             return $this->groupedStoreViews;
         }
 
-        $connection = $setup->getConnection();
+        $connection = $this->moduleDataSetup->getConnection();
         $query = $connection
             ->select()
             ->from(
-                $setup->getTable('store'),
+                $this->moduleDataSetup->getTable('store'),
                 '*'
             );
 
@@ -274,17 +297,15 @@ private function getAttributeValueKey($entityId, $attributeId, $websiteId)
     }
 
     /**
-     * @param ModuleDataSetupInterface $setup
      * @param array $attributeValue
      * @param string $tableName
      * @return array|null
      */
     private function generateAttributeValueInsertions(
-        ModuleDataSetupInterface $setup,
         array $attributeValue,
         $tableName
     ) {
-        $groupedStoreViews = $this->getGroupedStoreViews($setup);
+        $groupedStoreViews = $this->getGroupedStoreViews();
         if (empty($groupedStoreViews[$attributeValue['website_id']])) {
             return null;
         }
@@ -305,12 +326,11 @@ private function generateAttributeValueInsertions(
     }
 
     /**
-     * @param ModuleDataSetupInterface $setup
      * @param array $insertions
      * @param string $tableName
      * @return void
      */
-    private function executeInsertions(ModuleDataSetupInterface $setup, array $insertions, $tableName)
+    private function executeInsertions(array $insertions, $tableName)
     {
         $rawQuery = sprintf(
             'INSERT INTO 
@@ -318,12 +338,12 @@ private function executeInsertions(ModuleDataSetupInterface $setup, array $inser
             VALUES 
             %s
             ON duplicate KEY UPDATE `value` = VALUES(`value`)',
-            $setup->getTable($tableName),
+            $this->moduleDataSetup->getTable($tableName),
             $this->getTableLinkField($tableName),
             $this->prepareInsertValuesStatement($insertions)
         );
 
-        $setup->getConnection()->query($rawQuery, $this->getPlaceholderValues($insertions));
+        $this->moduleDataSetup->getConnection()->query($rawQuery, $this->getPlaceholderValues($insertions));
     }
 
     /**
@@ -386,4 +406,30 @@ private function getTableLinkField($tableName)
 
         return $this->linkFields[$tableName];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpgradeWidgetData::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.2.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
 }
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php
new file mode 100644
index 0000000000000..8f72f94319971
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Widget\Setup\LayoutUpdateConverter;
+
+/**
+ * Class UpgradeWidgetData.
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpgradeWidgetData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetup
+     */
+    private $eavSetup;
+
+    /**
+     * @var QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * @var AggregatedFieldDataConverter
+     */
+    private $aggregatedFieldDataConverter;
+
+    /**
+     * PrepareInitialConfig constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     * @param QueryModifierFactory $queryModifierFactory
+     * @param AggregatedFieldDataConverter $aggregatedFieldDataConverter
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory,
+        QueryModifierFactory $queryModifierFactory,
+        AggregatedFieldDataConverter $aggregatedFieldDataConverter
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetup = $eavSetupFactory->create(['setup' => $moduleDataSetup]);
+        $this->queryModifierFactory = $queryModifierFactory;
+        $this->aggregatedFieldDataConverter = $aggregatedFieldDataConverter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $categoryTypeId = $this->eavSetup->getEntityTypeId(\Magento\Catalog\Model\Category::ENTITY);
+        $categoryLayoutUpdateAttribute = $this->eavSetup->getAttribute($categoryTypeId, 'custom_layout_update');
+        $categoryLayoutUpdateAttributeModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'attribute_id' => $categoryLayoutUpdateAttribute['attribute_id']
+                ]
+            ]
+        );
+        $layoutUpdateValueModifier = $this->queryModifierFactory->create(
+            'like',
+            [
+                'values' => [
+                    'value' => '%conditions_encoded%'
+                ]
+            ]
+        );
+        $categoryLayoutUpdateModifier = $this->queryModifierFactory->create(
+            'composite',
+            [
+                'queryModifiers' => [
+                    $categoryLayoutUpdateAttributeModifier,
+                    $layoutUpdateValueModifier
+                ]
+            ]
+        );
+        $productTypeId = $this->eavSetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $productLayoutUpdateAttribute = $this->eavSetup->getAttribute($productTypeId, 'custom_layout_update');
+        $productLayoutUpdateAttributeModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'attribute_id' => $productLayoutUpdateAttribute['attribute_id']
+                ]
+            ]
+        );
+        $productLayoutUpdateModifier = $this->queryModifierFactory->create(
+            'composite',
+            [
+                'queryModifiers' => [
+                    $productLayoutUpdateAttributeModifier,
+                    $layoutUpdateValueModifier
+                ]
+            ]
+        );
+        $this->aggregatedFieldDataConverter->convert(
+            [
+                new FieldToConvert(
+                    LayoutUpdateConverter::class,
+                    $this->eavSetup->getSetup()->getTable('catalog_category_entity_text'),
+                    'value_id',
+                    'value',
+                    $categoryLayoutUpdateModifier
+                ),
+                new FieldToConvert(
+                    LayoutUpdateConverter::class,
+                    $this->eavSetup->getSetup()->getTable('catalog_product_entity_text'),
+                    'value_id',
+                    'value',
+                    $productLayoutUpdateModifier
+                ),
+            ],
+            $this->eavSetup->getSetup()->getConnection()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            DisallowUsingHtmlForProductName::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.2.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Schema/EnableSegmentation.php b/app/code/Magento/Catalog/Setup/Patch/Schema/EnableSegmentation.php
new file mode 100644
index 0000000000000..8ae84f9f8e321
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Schema/EnableSegmentation.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Schema;
+
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+
+/**
+ * Class EnableSegmentation.
+ *
+ * @package Magento\Catalog\Setup\Patch\Schema
+ */
+class EnableSegmentation implements SchemaPatchInterface
+{
+    /**
+     * @var SchemaSetupInterface
+     */
+    private $schemaSetup;
+
+    /**
+     * EnableSegmentation constructor.
+     *
+     * @param SchemaSetupInterface $schemaSetup
+     */
+    public function __construct(
+        SchemaSetupInterface $schemaSetup
+    ) {
+        $this->schemaSetup = $schemaSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->schemaSetup->startSetup();
+        $setup = $this->schemaSetup;
+
+        $storeSelect = $setup->getConnection()->select()->from($setup->getTable('store'))->where('store_id > 0');
+        foreach ($setup->getConnection()->fetchAll($storeSelect) as $store) {
+            $indexTable = $setup->getTable('catalog_category_product_index') .
+                '_' .
+                \Magento\Store\Model\Store::ENTITY .
+                $store['store_id'];
+            if (!$setup->getConnection()->isTableExists($indexTable)) {
+                $setup->getConnection()->createTable(
+                    $setup->getConnection()->createTableByDdl(
+                        $setup->getTable('catalog_category_product_index'),
+                        $indexTable
+                    )
+                );
+            }
+            if (!$setup->getConnection()->isTableExists($indexTable . '_replica')) {
+                $setup->getConnection()->createTable(
+                    $setup->getConnection()->createTableByDdl(
+                        $setup->getTable('catalog_category_product_index'),
+                        $indexTable . '_replica'
+                    )
+                );
+            }
+        }
+
+        $this->schemaSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/UpgradeData.php b/app/code/Magento/Catalog/Setup/UpgradeData.php
deleted file mode 100644
index a290d4870bd49..0000000000000
--- a/app/code/Magento/Catalog/Setup/UpgradeData.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Setup;
-
-use Magento\Eav\Setup\EavSetup;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-/**
- * Upgrade Data script
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * Category setup factory
-     *
-     * @var CategorySetupFactory
-     */
-    private $categorySetupFactory;
-
-    /**
-     * EAV setup factory
-     *
-     * @var \Magento\Eav\Setup\EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * @var UpgradeWidgetData
-     */
-    private $upgradeWidgetData;
-
-    /**
-     * @var UpgradeWebsiteAttributes
-     */
-    private $upgradeWebsiteAttributes;
-
-    /**
-     * Constructor
-     *
-     * @param CategorySetupFactory $categorySetupFactory
-     * @param \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory
-     * @param UpgradeWidgetData $upgradeWidgetData
-     * @param UpgradeWebsiteAttributes $upgradeWebsiteAttributes
-     */
-    public function __construct(
-        CategorySetupFactory $categorySetupFactory,
-        \Magento\Eav\Setup\EavSetupFactory $eavSetupFactory,
-        UpgradeWidgetData $upgradeWidgetData,
-        UpgradeWebsiteAttributes $upgradeWebsiteAttributes
-    ) {
-        $this->categorySetupFactory = $categorySetupFactory;
-        $this->eavSetupFactory = $eavSetupFactory;
-        $this->upgradeWidgetData = $upgradeWidgetData;
-        $this->upgradeWebsiteAttributes = $upgradeWebsiteAttributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        if ($context->getVersion()
-            && version_compare($context->getVersion(), '2.0.1') < 0
-        ) {
-            $select = $setup->getConnection()->select()
-                ->from(
-                    $setup->getTable('catalog_product_entity_group_price'),
-                    [
-                        'entity_id',
-                        'all_groups',
-                        'customer_group_id',
-                        new \Zend_Db_Expr('1'),
-                        'value',
-                        'website_id'
-                    ]
-                );
-            $select = $setup->getConnection()->insertFromSelect(
-                $select,
-                $setup->getTable('catalog_product_entity_tier_price'),
-                [
-                    'entity_id',
-                    'all_groups',
-                    'customer_group_id',
-                    'qty',
-                    'value',
-                    'website_id'
-                ]
-            );
-            $setup->getConnection()->query($select);
-
-            $categorySetupManager = $this->categorySetupFactory->create();
-            $categorySetupManager->removeAttribute(\Magento\Catalog\Model\Product::ENTITY, 'group_price');
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2') < 0) {
-            // set new resource model paths
-            /** @var CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-            $categorySetup->updateEntityType(
-                \Magento\Catalog\Model\Category::ENTITY,
-                'entity_model',
-                \Magento\Catalog\Model\ResourceModel\Category::class
-            );
-            $categorySetup->updateEntityType(
-                \Magento\Catalog\Model\Category::ENTITY,
-                'attribute_model',
-                \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-            );
-            $categorySetup->updateEntityType(
-                \Magento\Catalog\Model\Category::ENTITY,
-                'entity_attribute_collection',
-                \Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection::class
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Category::ENTITY,
-                'custom_design_from',
-                'attribute_model',
-                \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-            );
-            $categorySetup->updateEntityType(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'entity_model',
-                \Magento\Catalog\Model\ResourceModel\Product::class
-            );
-            $categorySetup->updateEntityType(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'attribute_model',
-                \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-            );
-            $categorySetup->updateEntityType(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'entity_attribute_collection',
-                \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.3') < 0) {
-            /** @var CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-            $categorySetup->updateAttribute(3, 54, 'default_value', 1);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.4') < 0) {
-            $mediaBackendType = 'static';
-            $mediaBackendModel = null;
-            /** @var CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-            $categorySetup->updateAttribute(
-                'catalog_product',
-                'media_gallery',
-                'backend_type',
-                $mediaBackendType
-            );
-            $categorySetup->updateAttribute(
-                'catalog_product',
-                'media_gallery',
-                'backend_model',
-                $mediaBackendModel
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.5', '<')) {
-            /** @var CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-
-            //Product Details tab
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'status',
-                'frontend_label',
-                'Enable Product',
-                5
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'name',
-                'frontend_label',
-                'Product Name'
-            );
-            $attributeSetId = $categorySetup->getDefaultAttributeSetId(\Magento\Catalog\Model\Product::ENTITY);
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Product Details',
-                'visibility',
-                80
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Product Details',
-                'news_from_date',
-                90
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Product Details',
-                'news_to_date',
-                100
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Product Details',
-                'country_of_manufacture',
-                110
-            );
-
-            //Content tab
-            $categorySetup->addAttributeGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Content',
-                15
-            );
-            $categorySetup->updateAttributeGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Content',
-                'tab_group_code',
-                'basic'
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Content',
-                'description'
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Content',
-                'short_description',
-                100
-            );
-
-            //Images tab
-            $groupId = (int)$categorySetup->getAttributeGroupByCode(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'image-management',
-                'attribute_group_id'
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                $groupId,
-                'image',
-                1
-            );
-            $categorySetup->updateAttributeGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                $groupId,
-                'attribute_group_name',
-                'Images'
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'image',
-                'frontend_label',
-                'Base'
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'small_image',
-                'frontend_label',
-                'Small'
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'image',
-                'frontend_input_renderer',
-                null
-            );
-
-            //Design tab
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'page_layout',
-                'frontend_label',
-                'Layout'
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'custom_layout_update',
-                'frontend_label',
-                'Layout Update XML',
-                10
-            );
-
-            //Schedule Design Update tab
-            $categorySetup->addAttributeGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Schedule Design Update',
-                55
-            );
-            $categorySetup->updateAttributeGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Schedule Design Update',
-                'tab_group_code',
-                'advanced'
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Schedule Design Update',
-                'custom_design_from',
-                20
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Schedule Design Update',
-                'custom_design_to',
-                30
-            );
-            $categorySetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'custom_design',
-                'frontend_label',
-                'New Theme',
-                40
-            );
-            $categorySetup->addAttributeToGroup(
-                \Magento\Catalog\Model\Product::ENTITY,
-                $attributeSetId,
-                'Schedule Design Update',
-                'custom_design'
-            );
-            $categorySetup->addAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'custom_layout',
-                [
-                    'type' => 'varchar',
-                    'label' => 'New Layout',
-                    'input' => 'select',
-                    'source' => \Magento\Catalog\Model\Product\Attribute\Source\Layout::class,
-                    'required' => false,
-                    'sort_order' => 50,
-                    'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                    'group' => 'Schedule Design Update',
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false
-                ]
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.7') < 0) {
-            /** @var EavSetup $eavSetup */
-            $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-
-            $eavSetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'meta_description',
-                [
-                    'note' => 'Maximum 255 chars. Meta Description should optimally be between 150-160 characters'
-                ]
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.1.3') < 0) {
-            /** @var CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-            $this->changePriceAttributeDefaultScope($categorySetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.1.5') < 0) {
-            $this->disallowUsingHtmlForProductName($setup);
-        }
-
-        if ($context->getVersion() && version_compare($context->getVersion(), '2.2.1') < 0) {
-            $this->upgradeWidgetData->upgrade();
-        }
-
-        if (version_compare($context->getVersion(), '2.2.2') < 0) {
-            $this->upgradeWebsiteAttributes->upgrade($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Set to 'No' 'Is Allowed Html on Store Front' option on product name attribute, because product name
-     * is multi entity field (used in order, quote) and cannot be conditionally escaped in all places
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function disallowUsingHtmlForProductName(ModuleDataSetupInterface $setup)
-    {
-        /** @var CategorySetup $categorySetup */
-        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-        $attribute = $categorySetup->getAttribute($entityTypeId, 'name');
-
-        $setup->getConnection()
-            ->update(
-                $setup->getTable('catalog_eav_attribute'),
-                ['is_html_allowed_on_front' => 0],
-                $setup->getConnection()->quoteInto('attribute_id = ?', $attribute['attribute_id'])
-            );
-    }
-
-    /**
-     * @param CategorySetup $categorySetup
-     * @return void
-     */
-    private function changePriceAttributeDefaultScope($categorySetup)
-    {
-        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-        foreach (['price', 'cost', 'special_price'] as $attributeCode) {
-            $attribute = $categorySetup->getAttribute($entityTypeId, $attributeCode);
-            if (isset($attribute['attribute_id'])) {
-                $categorySetup->updateAttribute(
-                    $entityTypeId,
-                    $attribute['attribute_id'],
-                    'is_global',
-                    \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
-                );
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
deleted file mode 100755
index d08108d1fc22b..0000000000000
--- a/app/code/Magento/Catalog/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,724 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Catalog\Setup;
-
-use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
-use Magento\Catalog\Model\ResourceModel\Product\Gallery;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\DB\Ddl\Table;
-
-/**
- * Upgrade the Catalog module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->addSupportVideoMediaAttributes($setup);
-            $this->removeGroupPrice($setup);
-        }
-        if (version_compare($context->getVersion(), '2.0.6', '<')) {
-            $this->addUniqueKeyToCategoryProductTable($setup);
-        }
-        if (version_compare($context->getVersion(), '2.1.4', '<')) {
-            $this->addSourceEntityIdToProductEavIndex($setup);
-        }
-        if (version_compare($context->getVersion(), '2.1.5', '<')) {
-            $this->addPercentageValueColumn($setup);
-            $tables = [
-                'catalog_product_index_price_cfg_opt_agr_idx',
-                'catalog_product_index_price_cfg_opt_agr_tmp',
-                'catalog_product_index_price_cfg_opt_idx',
-                'catalog_product_index_price_cfg_opt_tmp',
-                'catalog_product_index_price_final_idx',
-                'catalog_product_index_price_final_tmp',
-                'catalog_product_index_price_idx',
-                'catalog_product_index_price_opt_agr_idx',
-                'catalog_product_index_price_opt_agr_tmp',
-                'catalog_product_index_price_opt_idx',
-                'catalog_product_index_price_opt_tmp',
-                'catalog_product_index_price_tmp',
-            ];
-            foreach ($tables as $table) {
-                $setup->getConnection()->modifyColumn(
-                    $setup->getTable($table),
-                    'customer_group_id',
-                    [
-                        'type' => Table::TYPE_INTEGER,
-                        'nullable' => false,
-                        'unsigned' => true,
-                        'default' => '0',
-                        'comment' => 'Customer Group ID',
-                    ]
-                );
-            }
-            $this->recreateCatalogCategoryProductIndexTmpTable($setup);
-        }
-        if (version_compare($context->getVersion(), '2.2.0', '<')) {
-            //remove fk from price index table
-            $setup->getConnection()->dropForeignKey(
-                $setup->getTable('catalog_product_index_price'),
-                $setup->getFkName(
-                    'catalog_product_index_price',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                )
-            );
-            $setup->getConnection()->dropForeignKey(
-                $setup->getTable('catalog_product_index_price'),
-                $setup->getFkName(
-                    'catalog_product_index_price',
-                    'website_id',
-                    'store_website',
-                    'website_id'
-                )
-            );
-            $setup->getConnection()->dropForeignKey(
-                $setup->getTable('catalog_product_index_price'),
-                $setup->getFkName(
-                    'catalog_product_index_price',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                )
-            );
-
-            $this->addReplicaTable($setup, 'catalog_product_index_eav', 'catalog_product_index_eav_replica');
-            $this->addReplicaTable(
-                $setup,
-                'catalog_product_index_eav_decimal',
-                'catalog_product_index_eav_decimal_replica'
-            );
-            $this->addPathKeyToCategoryEntityTableIfNotExists($setup);
-            //  By adding 'catalog_product_index_price_replica' we provide separation of tables
-            //  used for indexation write and read operations and affected models.
-            $this->addReplicaTable(
-                $setup,
-                'catalog_product_index_price',
-                'catalog_product_index_price_replica'
-            );
-            // the same for 'catalog_category_product_index'
-            $this->addReplicaTable(
-                $setup,
-                'catalog_category_product_index',
-                'catalog_category_product_index_replica'
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.2.3', '<')) {
-            $this->addCatalogProductFrontendActionTable($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.2.2', '<')) {
-            $this->fixCustomerGroupIdColumn($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.2.4', '<')) {
-            $this->removeAttributeSetRelation($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Change definition of customer group id column
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function fixCustomerGroupIdColumn(SchemaSetupInterface $setup)
-    {
-        $tables = [
-            'catalog_product_entity_tier_price',
-            'catalog_product_index_price_cfg_opt_agr_idx',
-            'catalog_product_index_price_cfg_opt_agr_tmp',
-            'catalog_product_index_price_cfg_opt_idx',
-            'catalog_product_index_price_cfg_opt_tmp',
-            'catalog_product_index_price_final_idx',
-            'catalog_product_index_price_final_tmp',
-            'catalog_product_index_price_idx',
-            'catalog_product_index_price_opt_agr_idx',
-            'catalog_product_index_price_opt_agr_tmp',
-            'catalog_product_index_price_opt_idx',
-            'catalog_product_index_price_opt_tmp',
-            'catalog_product_index_price_tmp',
-        ];
-        foreach ($tables as $table) {
-            $setup->getConnection()->modifyColumn(
-                $setup->getTable($table),
-                'customer_group_id',
-                [
-                    'type' => Table::TYPE_INTEGER,
-                    'nullable' => false,
-                    'unsigned' => true,
-                    'default' => '0',
-                    'comment' => 'Customer Group ID',
-                ]
-            );
-        }
-    }
-
-    /**
-     * Add table which allows to hold product frontend actions like product view or comparison
-     * with next definition: visitor or customer definition, product definition and added time in JS format
-     *
-     * @param SchemaSetupInterface $installer
-     * @return void
-     */
-    private function addCatalogProductFrontendActionTable(SchemaSetupInterface $installer)
-    {
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_frontend_action'))
-            ->addColumn(
-                'action_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product Action Id'
-            )
-            ->addColumn(
-                'type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                ['nullable' => false],
-                'Type of product action'
-            )
-            ->addColumn(
-                'visitor_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Visitor Id'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Customer Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Product Id'
-            )
-            ->addColumn(
-                'added_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['nullable' => false],
-                'Added At'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_frontend_action',
-                    ['visitor_id', 'product_id', 'type_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['visitor_id', 'product_id', 'type_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_frontend_action',
-                    ['customer_id', 'product_id', 'type_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['customer_id', 'product_id', 'type_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_frontend_action', 'customer_id', 'customer_entity', 'entity_id'),
-                'customer_id',
-                $installer->getTable('customer_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            //should be uncommented when this issue become fixed @MAGETWO-69393
-//            ->addForeignKey(
-//                $installer->getFkName(
-//                    'catalog_product_frontend_action',
-//                    'product_id',
-//                    'catalog_product_entity',
-//                    'entity_id'
-//                ),
-//                'product_id',
-//                $installer->getTable('catalog_product_entity'),
-//                'entity_id',
-//                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-//            )
-            ->setComment('Catalog Product Frontend Action Table');
-        $installer->getConnection()->createTable($table);
-    }
-
-    /**
-     * Add the column 'source_id' to the Product EAV index tables.
-     * It allows to identify which entity was used to create value in the index.
-     * It is useful to identify original entity in a composite products.
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addSourceEntityIdToProductEavIndex(SchemaSetupInterface $setup)
-    {
-        $tables = [
-            'catalog_product_index_eav',
-            'catalog_product_index_eav_idx',
-            'catalog_product_index_eav_tmp',
-            'catalog_product_index_eav_decimal',
-            'catalog_product_index_eav_decimal_idx',
-            'catalog_product_index_eav_decimal_tmp',
-        ];
-        $connection = $setup->getConnection();
-        foreach ($tables as $tableName) {
-            $tableName = $setup->getTable($tableName);
-            if (!$connection->tableColumnExists($tableName, 'source_id')) {
-                $connection->addColumn(
-                    $tableName,
-                    'source_id',
-                    [
-                        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                        'unsigned' => true,
-                        'nullable' => false,
-                        'default' => 0,
-                        'comment' => 'Original entity Id for attribute value',
-                    ]
-                );
-                $connection->dropIndex($tableName, $connection->getPrimaryKeyName($tableName));
-                $primaryKeyFields = ['entity_id', 'attribute_id', 'store_id', 'value', 'source_id'];
-                $setup->getConnection()->addIndex(
-                    $tableName,
-                    $connection->getIndexName($tableName, $primaryKeyFields),
-                    $primaryKeyFields,
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY
-                );
-            }
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    protected function addUniqueKeyToCategoryProductTable(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->addIndex(
-            $setup->getTable('catalog_category_product'),
-            $setup->getIdxName(
-                'catalog_category_product',
-                ['category_id', 'product_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['category_id', 'product_id'],
-            \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-        );
-    }
-
-    /**
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    protected function createValueToEntityTable(SchemaSetupInterface $setup)
-    {
-        /**
-         * Create table 'catalog_product_entity_media_gallery_value_to_entity'
-         */
-        $table = $setup->getConnection()
-            ->newTable($setup->getTable(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Value media Entry ID'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Product entity ID'
-            )
-            ->addIndex(
-                $setup->getIdxName(
-                    Gallery::GALLERY_VALUE_TO_ENTITY_TABLE,
-                    ['value_id', 'entity_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['value_id', 'entity_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $setup->getFkName(
-                    Gallery::GALLERY_VALUE_TO_ENTITY_TABLE,
-                    'value_id',
-                    Gallery::GALLERY_TABLE,
-                    'value_id'
-                ),
-                'value_id',
-                $setup->getTable(Gallery::GALLERY_TABLE),
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $setup->getFkName(
-                    Gallery::GALLERY_VALUE_TO_ENTITY_TABLE,
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $setup->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Link Media value to Product entity table');
-        $setup->getConnection()->createTable($table);
-    }
-
-    /**
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    protected function addForeignKeys(SchemaSetupInterface $setup)
-    {
-        /**
-         * Add foreign keys again
-         */
-        $setup->getConnection()->addForeignKey(
-            $setup->getFkName(
-                Gallery::GALLERY_VALUE_TABLE,
-                'value_id',
-                Gallery::GALLERY_TABLE,
-                'value_id'
-            ),
-            $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-            'value_id',
-            $setup->getTable(Gallery::GALLERY_TABLE),
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-
-        $setup->getConnection()->addForeignKey(
-            $setup->getFkName(
-                Gallery::GALLERY_VALUE_TABLE,
-                'store_id',
-                $setup->getTable('store'),
-                'store_id'
-            ),
-            $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-            'store_id',
-            $setup->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addSupportVideoMediaAttributes(SchemaSetupInterface $setup)
-    {
-        if ($setup->tableExists(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE)) {
-            return;
-        }
-
-        /** Add support video media attribute */
-        $this->createValueToEntityTable($setup);
-        /**
-         * Add media type property to the Gallery entry table
-         */
-        $setup->getConnection()->addColumn(
-            $setup->getTable(Gallery::GALLERY_TABLE),
-            'media_type',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                'length' => 32,
-                'nullable' => false,
-                'default' => ImageEntryConverter::MEDIA_TYPE_CODE,
-                'comment' => 'Media entry type'
-            ]
-        );
-        $setup->getConnection()->addColumn(
-            $setup->getTable(Gallery::GALLERY_TABLE),
-            'disabled',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => 0,
-                'comment' => 'Visibility status'
-            ]
-        );
-
-        /**
-         * Drop entity Id columns
-         */
-        $setup->getConnection()->dropColumn($setup->getTable(Gallery::GALLERY_TABLE), 'entity_id');
-
-        /**
-         * Drop primary index
-         */
-        $setup->getConnection()->dropForeignKey(
-            $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-            $setup->getFkName(
-                Gallery::GALLERY_VALUE_TABLE,
-                'value_id',
-                Gallery::GALLERY_TABLE,
-                'value_id'
-            )
-        );
-        $setup->getConnection()->dropForeignKey(
-            $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-            $setup->getFkName(
-                Gallery::GALLERY_VALUE_TABLE,
-                'store_id',
-                'store',
-                'store_id'
-            )
-        );
-        $setup->getConnection()->dropIndex($setup->getTable(Gallery::GALLERY_VALUE_TABLE), 'primary');
-        $setup->getConnection()->addColumn(
-            $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-            'record_id',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                'primary' => true,
-                'auto_increment' => true,
-                'unsigned' => true,
-                'nullable' => false,
-                'comment' => 'Record Id'
-            ]
-        );
-
-        /**
-         * Add index 'value_id'
-         */
-        $setup->getConnection()->addIndex(
-            $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-            $setup->getConnection()->getIndexName(
-                $setup->getTable(Gallery::GALLERY_VALUE_TABLE),
-                'value_id',
-                'index'
-            ),
-            'value_id'
-        );
-        $this->addForeignKeys($setup);
-    }
-
-    /**
-     * Remove Group Price
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function removeGroupPrice(SchemaSetupInterface $setup)
-    {
-        $connection = $setup->getConnection();
-        $fields = [
-            ['table' => 'catalog_product_index_price_final_idx', 'column' => 'base_group_price'],
-            ['table' => 'catalog_product_index_price_final_tmp', 'column' => 'base_group_price'],
-            ['table' => 'catalog_product_index_price', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_cfg_opt_agr_idx', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_cfg_opt_agr_tmp', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_cfg_opt_idx', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_cfg_opt_tmp', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_final_idx', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_final_tmp', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_idx', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_opt_agr_idx', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_opt_agr_tmp', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_opt_idx', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_opt_tmp', 'column' => 'group_price'],
-            ['table' => 'catalog_product_index_price_tmp', 'column' => 'group_price'],
-        ];
-
-        foreach ($fields as $filedInfo) {
-            $connection->dropColumn($setup->getTable($filedInfo['table']), $filedInfo['column']);
-        }
-    }
-
-    /**
-     * Add percentage value column
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addPercentageValueColumn(SchemaSetupInterface $setup)
-    {
-        $connection = $setup->getConnection();
-        $tableName = $setup->getTable('catalog_product_entity_tier_price');
-
-        if (!$connection->tableColumnExists($tableName, 'percentage_value')) {
-            $connection->addColumn(
-                $tableName,
-                'percentage_value',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                    'nullable' => true,
-                    'length' => '5,2',
-                    'comment' => 'Percentage value',
-                    'after' => 'value'
-                ]
-            );
-        }
-    }
-
-    /**
-     * Drop and recreate catalog_category_product_index_tmp table
-     *
-     * Before this update the catalog_category_product_index_tmp table was created without usage of PK
-     * and with engine=MEMORY. Such structure of catalog_category_product_index_tmp table causes
-     * issues with MySQL DB replication.
-     *
-     * To avoid replication issues this method drops catalog_category_product_index_tmp table
-     * and creates new one with PK and engine=InnoDB
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function recreateCatalogCategoryProductIndexTmpTable(SchemaSetupInterface $setup)
-    {
-        $tableName = $setup->getTable('catalog_category_product_index_tmp');
-
-        // Drop catalog_category_product_index_tmp table
-        $setup->getConnection()->dropTable($tableName);
-
-        // Create catalog_category_product_index_tmp table with PK
-        $table = $setup->getConnection()
-            ->newTable($tableName)
-            ->addColumn(
-                'category_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Category ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addColumn(
-                'is_parent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Parent'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'visibility',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Visibility'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment('Catalog Category Product Indexer temporary table');
-
-        $setup->getConnection()->createTable($table);
-    }
-
-    /**
-     * Add key for the path field if not exists
-     * significantly improves category tree performance
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addPathKeyToCategoryEntityTableIfNotExists(SchemaSetupInterface $setup)
-    {
-        /**
-         * @var \Magento\Framework\DB\Adapter\AdapterInterface
-         */
-        $connection = $setup->getConnection();
-        $tableName = $setup->getTable('catalog_category_entity');
-
-        $keyName = $setup->getIdxName(
-            $tableName,
-            ['path'],
-            \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-        );
-
-        $existingKeys = $connection->getIndexList($tableName);
-        if (!array_key_exists($keyName, $existingKeys)) {
-            $connection->addIndex(
-                $tableName,
-                $keyName,
-                ['path'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-            );
-        }
-    }
-
-    /**
-     * Add the replica table for existing one.
-     *
-     * @param SchemaSetupInterface $setup
-     * @param string $existingTable
-     * @param string $replicaTable
-     * @return void
-     */
-    private function addReplicaTable(SchemaSetupInterface $setup, $existingTable, $replicaTable)
-    {
-        $sql = sprintf(
-            'CREATE TABLE IF NOT EXISTS %s LIKE %s',
-            $setup->getConnection()->quoteIdentifier($setup->getTable($replicaTable)),
-            $setup->getConnection()->quoteIdentifier($setup->getTable($existingTable))
-        );
-        $setup->getConnection()->query($sql);
-    }
-
-    /**
-     * Remove foreign key between catalog_product_entity and eav_attribute_set tables.
-     * Drop foreign key to delegate cascade on delete to plugin.
-     * @see \Magento\Catalog\Plugin\Model\AttributeSetRepository\RemoveProducts
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function removeAttributeSetRelation(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->dropForeignKey(
-            $setup->getTable('catalog_product_entity'),
-            $setup->getFkName('catalog_product_entity', 'attribute_set_id', 'eav_attribute_set', 'attribute_set_id')
-        );
-    }
-}
diff --git a/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php b/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php
deleted file mode 100644
index f9eba413f5416..0000000000000
--- a/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Setup;
-
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Widget\Setup\LayoutUpdateConverter;
-use Magento\Eav\Setup\EavSetup;
-use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\DB\AggregatedFieldDataConverter;
-
-/**
- * Convert serialized widget data for categories and products tables to JSON
- */
-class UpgradeWidgetData
-{
-    /**
-     * @var EavSetup
-     */
-    private $eavSetup;
-
-    /**
-     * @var QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * Constructor
-     *
-     * @param EavSetup $eavSetup
-     * @param QueryModifierFactory $queryModifierFactory
-     * @param AggregatedFieldDataConverter $aggregatedFieldDataConverter
-     */
-    public function __construct(
-        EavSetup $eavSetup,
-        QueryModifierFactory $queryModifierFactory,
-        AggregatedFieldDataConverter $aggregatedFieldDataConverter
-    ) {
-        $this->eavSetup = $eavSetup;
-        $this->queryModifierFactory = $queryModifierFactory;
-        $this->aggregatedFieldDataConverter = $aggregatedFieldDataConverter;
-    }
-
-    /**
-     * Convert category and product layout update
-     *
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    public function upgrade()
-    {
-        $categoryTypeId = $this->eavSetup->getEntityTypeId(\Magento\Catalog\Model\Category::ENTITY);
-        $categoryLayoutUpdateAttribute = $this->eavSetup->getAttribute($categoryTypeId, 'custom_layout_update');
-        $categoryLayoutUpdateAttributeModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'attribute_id' => $categoryLayoutUpdateAttribute['attribute_id']
-                ]
-            ]
-        );
-        $layoutUpdateValueModifier = $this->queryModifierFactory->create(
-            'like',
-            [
-                'values' => [
-                    'value' => '%conditions_encoded%'
-                ]
-            ]
-        );
-        $categoryLayoutUpdateModifier = $this->queryModifierFactory->create(
-            'composite',
-            [
-                'queryModifiers' => [
-                    $categoryLayoutUpdateAttributeModifier,
-                    $layoutUpdateValueModifier
-                ]
-            ]
-        );
-        $productTypeId = $this->eavSetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-        $productLayoutUpdateAttribute = $this->eavSetup->getAttribute($productTypeId, 'custom_layout_update');
-        $productLayoutUpdateAttributeModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'attribute_id' => $productLayoutUpdateAttribute['attribute_id']
-                ]
-            ]
-        );
-        $productLayoutUpdateModifier = $this->queryModifierFactory->create(
-            'composite',
-            [
-                'queryModifiers' => [
-                    $productLayoutUpdateAttributeModifier,
-                    $layoutUpdateValueModifier
-                ]
-            ]
-        );
-        $this->aggregatedFieldDataConverter->convert(
-            [
-                new FieldToConvert(
-                    LayoutUpdateConverter::class,
-                    $this->eavSetup->getSetup()->getTable('catalog_category_entity_text'),
-                    'value_id',
-                    'value',
-                    $categoryLayoutUpdateModifier
-                ),
-                new FieldToConvert(
-                    LayoutUpdateConverter::class,
-                    $this->eavSetup->getSetup()->getTable('catalog_product_entity_text'),
-                    'value_id',
-                    'value',
-                    $productLayoutUpdateModifier
-                ),
-            ],
-            $this->eavSetup->getSetup()->getConnection()
-        );
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
new file mode 100644
index 0000000000000..692487c1d60cd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AddSimpleProductToCart">
+        <arguments>
+            <argument name="product" defaultValue="product"/>
+        </arguments>
+        <amOnPage url="/{{product.name}}.html" stepKey="navigateProductPage"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
new file mode 100644
index 0000000000000..57f91b78fcbe9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Create a new category-->
+    <actionGroup name="CreateCategory">
+        <arguments>
+            <argument name="categoryEntity" defaultValue="_defaultCategory"/>
+        </arguments>
+        <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryEntity.name}}" stepKey="enterCategoryName"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryEntity.name_lwr}}" stepKey="enterURLKey"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+        <seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeNewCategoryPageTitle"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="seeCategoryInTree"/>
+    </actionGroup>
+
+    <!-- Go to create new root or sub category page -->
+    <actionGroup name="goToCreateCategoryPage">
+        <arguments>
+            <argument name="selector" defaultValue="AdminCategorySidebarActionSection.AddSubcategoryButton"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnAdminCategoryPage"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{selector}}" stepKey="clickOnAddCategory"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
+    </actionGroup>
+
+    <!-- Go to admin category page by id -->
+    <actionGroup name="goToAdminCategoryPageById">
+        <arguments>
+            <argument name="id" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryEditPage.url(id)}}" stepKey="amOnAdminCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="{{id}}" stepKey="seeCategoryPageTitle"/>
+    </actionGroup>
+
+    <!-- Fill category fields -->
+    <actionGroup name="fillCategoryForm">
+        <arguments>
+            <argument name="categoryEntity" defaultValue="_defaultCategory"/>
+        </arguments>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryEntity.name}}" stepKey="enterCategoryName"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryEntity.name_lwr}}" stepKey="enterURLKey"/>
+    </actionGroup>
+
+    <!-- Save category form -->
+    <actionGroup name="saveCategoryForm">
+        <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+    </actionGroup>
+
+    <!--Upload image for category -->
+    <actionGroup name="addCategoryImage">
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+        </arguments>
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminCategoryContentSection.uploadButton}}" stepKey="seeImageSectionIsReady"/>
+        <attachFile selector="{{AdminCategoryContentSection.uploadImageFile}}" userInput="{{image.file}}" stepKey="uploadFile"/>
+        <waitForAjaxLoad time="30" stepKey="waitForAjaxUpload"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+        <see selector="{{AdminCategoryContentSection.imageFileName}}" userInput="{{image.file}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Remove image from category -->
+    <actionGroup name="removeCategoryImage">
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminCategoryContentSection.uploadButton}}" stepKey="seeImageSectionIsReady"/>
+        <click selector="{{AdminCategoryContentSection.removeImageButton}}" stepKey="clickRemoveImage"/>
+        <waitForAjaxLoad time="30" stepKey="waitForAjaxUpload"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+        <dontSee selector="{{AdminCategoryContentSection.imageFileName}}" stepKey="dontSeeImage"/>
+    </actionGroup>
+
+    <actionGroup name="checkCategoryImageInAdmin">
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+        </arguments>
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminCategoryContentSection.uploadButton}}" stepKey="seeImageSectionIsReady"/>
+        <see selector="{{AdminCategoryContentSection.imageFileName}}" userInput="{{image.file}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Action to navigate to Media Gallery. Used in tests to cleanup uploaded images -->
+    <actionGroup name="navigateToMediaGallery">
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnAdminCategoryPage"/>
+        <waitForElementVisible selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="waitForContentSection"/>
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="waitForSelectFromGalleryButton"/>
+        <click selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="clickSelectFromGalleryButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+
+    <!--Actions to check if a category exists on StoreFront-->
+    <actionGroup name="CheckCategoryOnStorefront">
+        <arguments>
+            <argument name="categoryEntity" defaultValue="_defaultCategory"/>
+        </arguments>
+        <amOnPage url="/{{categoryEntity.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{categoryEntity.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
+        <seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeCategoryNameInTitle"/>
+    </actionGroup>
+
+    <!--Actions to delete category-->
+    <actionGroup name="DeleteCategory">
+        <arguments>
+            <argument name="categoryEntity" defaultValue="_defaultCategory"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
+        <waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="clickCategoryLink"/>
+        <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
+        <see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+        <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/>
+    </actionGroup>
+
+    <!-- Actions to fill out a new category from the product page-->
+    <!-- The action assumes that you are already on an admin product configuration page -->
+    <actionGroup name="FillNewProductCategory" >
+        <arguments>
+            <argument name="categoryName" defaultValue="Test Category" type="string"/>
+            <argument name="parentCategoryName" defaultValue="default" type="string"/>
+        </arguments>
+
+        <!-- Click on new Category -->
+        <click stepKey="clickNewCategory" selector="{{AdminProductCategoryCreationSection.newCategory}}"/>
+        <waitForPageLoad stepKey="waitForFieldSet"/>
+
+        <fillField stepKey="fillCategoryName" selector="{{AdminProductCategoryCreationSection.nameInput}}" userInput="{{categoryName}}"/>
+
+        <!-- Search and select a parent catagory for the product -->
+        <click stepKey="clickParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategory}}"/>
+        <waitForPageLoad stepKey="waitForDropDownVisible"/>
+        <fillField stepKey="searchForParent" userInput="{{parentCategoryName}}" selector="{{AdminProductCategoryCreationSection.parentSearch}}"/>
+        <waitForPageLoad stepKey="waitForFieldResults"/>
+        <click stepKey="clickParent" selector="{{AdminProductCategoryCreationSection.parentSearchResult}}"/>
+
+        <click stepKey="createCategory" selector="{{AdminProductCategoryCreationSection.createCategory}}"/>
+        <waitForPageLoad stepKey="waitForCategoryCreated"/>
+    </actionGroup>
+
+    <!-- Actions to delete the category last made -->
+    <actionGroup name="DeleteMostRecentCategory">
+
+        <amOnPage url="/{{AdminCategoryPage.url}}" stepKey="goToCategoryFrontPage"/>
+
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+
+        <click stepKey="goToCreateCategory" selector="{{AdminCategorySidebarTreeSection.lastCreatedCategory}}" />
+        <waitForPageLoad stepKey="waitForCreatedCategoryPageLoad"/>
+
+        <click stepKey="clickDeleteCategory" selector="{{AdminCategoryMainActionsSection.DeleteButton}}" />
+        <waitForPageLoad stepKey="waitForModalVisible"/>
+
+        <click stepKey="clickOkToDelete" selector="{{AdminCategoryModalSection.ok}}" />
+
+        <waitForPageLoad stepKey="waitForModalNotVisible"/>
+
+    </actionGroup>
+
+    <!-- Actions to check if a certain category is present on the page -->
+    <actionGroup name="CategoryPresent" >
+        <arguments>
+            <argument name="categoryName" defaultValue="Test Category" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryAdminPage"/>
+        <waitForPageLoad stepKey="waitForCategoryAdminPageLoad"/>
+
+        <see userInput="{{categoryName}}" stepKey="assertCategoryOnAdminPage" selector="{{AdminCategorySidebarTreeSection.treeContainer}}"/>
+
+        <amOnPage url="/{{categoryName}}.html" stepKey="goToCustomerFrontPage"/>
+
+        <see userInput="{{categoryName}}" stepKey="assertCategoryNameOnStorefront" selector="{{StorefrontCategoryMainSection.CategoryTitle}}"/>
+
+        <waitForPageLoad stepKey="waitForCustomerCategoryPageLoad"/>
+    </actionGroup>
+
+    <!--Check that name field is required-->
+    <actionGroup name="CheckCategoryNameIsRequiredField">
+        <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+        <clearField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" stepKey="makeNameFieldEmpty"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeInCurrentUrl url="{{AdminCategoryPage.url}}add" stepKey="seeBackOnCreateCategoryPage"/>
+        <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/>
+    </actionGroup>
+
+    <actionGroup name="switchCategoryStoreView">
+        <arguments>
+            <argument name="Store"/>
+            <argument name="CatName"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryPage.page}}" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatName)}}" stepKey="navigateToCreatedCategory" />
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner"/>
+        <scrollToTopOfPage stepKey="scrollToToggle"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}" stepKey="openStoreViewDropDown"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption(Store)}}" stepKey="selectStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner2"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}" stepKey="selectStoreViewAccept"/>
+        <waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
+    </actionGroup>
+
+    <actionGroup name="navigateToCreatedCategory">
+        <arguments>
+            <argument name="Category"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryPage.page}}" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandAll"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category.Name)}}" stepKey="navigateToCreatedCategory" />
+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner" />
+    </actionGroup>
+
+    <actionGroup name="ChangeSeoUrlKey">
+        <arguments>
+            <argument name="value" type="string"/>
+        </arguments>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{value}}" stepKey="enterURLKey"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="ChangeSeoUrlKeyForSubCategory">
+        <arguments>
+            <argument name="value" type="string"/>
+        </arguments>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}" stepKey="uncheckDefaultValue"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{value}}" stepKey="enterURLKey"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
new file mode 100644
index 0000000000000..a99420bcf95bb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Create a new root category-->
+    <actionGroup name="AdminCreateRootCategory">
+        <arguments>
+            <argument name="categoryEntity" defaultValue="NewRootCategory"/>
+        </arguments>
+        <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddRootCategoryButton}}" stepKey="clickOnAddRootCategoryButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryEntity.name}}" stepKey="enterNewRootCategoryName"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryEntity.name_lwr}}" stepKey="enterURLKey"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+        <seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeNewCategoryPageTitle"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="seeCategoryInTree"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
new file mode 100644
index 0000000000000..2b5fbfbe6a79b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Navigate to create product page from product grid page-->
+    <actionGroup name="goToCreateProductPage">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForElementVisible selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="waitForAddProductDropdown" time="30"/>
+        <click selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="clickAddProductType"/>
+        <waitForPageLoad stepKey="waitForCreateProductPageLoad"/>
+        <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
+    </actionGroup>
+
+    <!--Fill main fields in create product form-->
+    <actionGroup name="fillMainProductForm">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
+    </actionGroup>
+
+    <!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
+    <actionGroup name="fillMainProductFormNoWeight">
+        <arguments>
+            <argument name="product" defaultValue="DownloadableProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has no weight" stepKey="selectWeight"/>
+    </actionGroup>
+
+    <!--Fill main fields in create product form with name and sku -->
+    <actionGroup name="fillProductNameAndSkuInProductForm">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+    </actionGroup>
+
+    <!--Check that required fields are actually required-->
+    <actionGroup name="checkRequiredFieldsInProductForm">
+        <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductName"/>
+        <clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductSku"/>
+        <clearField selector="{{AdminProductFormSection.productPrice}}" stepKey="clearProductPrice"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeStillOnEditPage"/>
+        <see selector="{{AdminProductFormSection.fieldError('name')}}" userInput="This is a required field." stepKey="seeNameRequired"/>
+        <see selector="{{AdminProductFormSection.fieldError('sku')}}" userInput="This is a required field." stepKey="seeSkuRequired"/>
+        <see selector="{{AdminProductFormSection.priceFieldError}}" userInput="This is a required field." stepKey="seePriceRequired"/>
+    </actionGroup>
+
+    <!--Save product and see success message-->
+    <actionGroup name="saveProductForm">
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
+    </actionGroup>
+
+    <!--Upload image for product-->
+    <actionGroup name="addProductImage">
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="seeImageSectionIsReady"/>
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
+        <waitForElementNotVisible selector="{{AdminProductImagesSection.uploadProgressBar}}" stepKey="waitForUpload"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
+    </actionGroup>
+
+    <!--Remove image for product-->
+    <actionGroup name="removeProductImage">
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <click selector="{{AdminProductImagesSection.removeImageButton}}" stepKey="clickRemoveImage"/>
+    </actionGroup>
+
+    <!-- Assert product image in Admin Product page -->
+    <actionGroup name="assertProductImageAdminProductPage">
+        <arguments>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductImagesSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert no product image in Admin Product page -->
+    <actionGroup name="assertProductImageNotInAdminProductPage">
+        <arguments>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{AdminProductImagesSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!--Fill fields for simple product in a category in Admin-->
+    <actionGroup name="FillAdminSimpleProductForm">
+        <arguments>
+            <argument name="category"/>
+            <argument name="simpleProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+        <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
+        <seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
+        <seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
+        <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
+    </actionGroup>
+
+    <!--Fill fields for simple product in a category in Admin, including text option with char limit-->
+    <actionGroup name="AdminCreateSimpleProductWithTextOptionCharLimit">
+        <arguments>
+            <argument name="category"/>
+            <argument name="simpleProduct"/>
+            <argument name="charLimit"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+        <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
+        <fillField userInput="option1" selector="{{AdminProductCustomizableOptionsSection.optionTitleInput}}" stepKey="fillOptionTitle"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/>
+        <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/>
+
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+        <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
+        <seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
+        <seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
+        <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
+    </actionGroup>
+
+    <actionGroup name="ProductSetWebsite">
+        <arguments>
+            <argument name="website" type="string"/>
+        </arguments>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ScrollToWebsites"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ClickTpOpenProductInWebsite"/>
+        <waitForPageLoad stepKey="waitForPageOpened"/>
+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="SelectWebsite"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad time='60' stepKey="waitForPageOpened1"/>
+    </actionGroup>
+
+    <actionGroup name="ProductSetAdvancedPricing">
+        <arguments>
+            <argument name="website" type="string" defaultValue=""/>
+            <argument name="group" type="string" defaultValue="Retailer"/>
+            <argument name="quantity" type="string" defaultValue="1"/>
+            <argument name="price" type="string" defaultValue="Discount"/>
+            <argument name="amount" type="string" defaultValue="45"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{website}}" stepKey="selectProductWebsiteValue"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{group}}" stepKey="selectProductCustomGroupValue"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{quantity}}" stepKey="fillProductTierPriceQtyInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="{{price}}" stepKey="selectProductTierPriceValueType"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="{{amount}}" stepKey="selectProductTierPricePriceInput"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <waitForPageLoad stepKey="WaitForProductSave"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct1"/>
+        <waitForPageLoad time="60" stepKey="WaitForProductSave1"/>
+        <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
+    </actionGroup>
+
+    <!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page-->
+    <actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection">
+        <arguments>
+            <argument name="element" defaultValue="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openTab"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
+        <see selector="{{element}}" userInput="{{expectedText}}" stepKey="assertText"/>
+    </actionGroup>
+
+    <!--Related products-->
+    <actionGroup name="addRelatedProductBySku">
+        <arguments>
+            <argument name="sku"/>
+        </arguments>
+        <!--Scroll up to avoid error-->
+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" x="0" y="-100" stepKey="scrollTo"/>
+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedUpSellCrossSell"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
+    </actionGroup>
+
+    <!--Add special price to product in Admin product page-->
+    <actionGroup name="AddSpecialPriceToProductActionGroup">
+        <arguments>
+            <argument name="price" type="string" defaultValue="8"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitSpecialPrice"/>
+        <fillField userInput="{{price}}" selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="fillSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
+        <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForCloseModalWindow"/>
+      </actionGroup>
+
+    <!--Select Product In Websites-->
+    <actionGroup name="SelectProductInWebsitesActionGroup">
+        <arguments>
+            <argument name="website" type="string"/>
+        </arguments>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenProductInWebsite"/>
+        <waitForPageLoad stepKey="waitForPageOpened"/>
+        <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
+    </actionGroup>
+
+    <!--Switch to New Store view-->
+    <actionGroup name="SwitchToTheNewStoreView">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <scrollTo selector="{{AdminProductContentSection.pageHeader}}" stepKey="scrollToUp"/>
+        <waitForElementVisible selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="waitForElementBecomeVisible"/>
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(storeViewName)}}" stepKey="chooseStoreView"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!--Create a Simple Product-->
+    <actionGroup name="createSimpleProductAndAddToWebsite">
+        <arguments>
+            <argument name="product"/>
+            <argument name="website" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
+        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
+        <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
+        <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+    </actionGroup>
+
+    <actionGroup name="CreatedProductConnectToWebsite">
+        <arguments>
+            <argument name="website"/>
+            <argument name="product"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductsList"/>
+        <click stepKey="openProduct" selector="{{AdminProductGridActionSection.productName(product.name)}}"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ScrollToWebsites"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openWebsitesList"/>
+        <waitForPageLoad stepKey="waitForWebsitesList"/>
+        <click selector="{{ProductInWebsitesSection.website(website.name)}}" stepKey="SelectWebsite"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForSave"/>
+    </actionGroup>
+
+    <!--Check tier price with a discount percentage on product-->
+    <actionGroup name="AssertDiscountsPercentageOfProducts">
+        <arguments>
+            <argument name="amount" type="string" defaultValue="45"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
+        <grabValueFrom selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" stepKey="grabProductTierPriceInput"/>
+        <assertEquals stepKey="assertProductTierPriceInput">
+            <expectedResult type="string">{{amount}}</expectedResult>
+            <actualResult type="string">$grabProductTierPriceInput</actualResult>
+        </assertEquals>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
new file mode 100644
index 0000000000000..80cadbb6571f2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="navigateToCreatedProductAttribute">
+        <arguments>
+            <argument name="ProductAttribute"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}"
+                   userInput="{{ProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
+    <actionGroup name="navigateToEditProductAttribute">
+        <arguments>
+            <argument name="ProductAttribute" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{ProductAttribute}}" stepKey="navigateToAttributeEditPage1" />
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="navigateToAttributeEditPage2" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="navigateToAttributeEditPage3" />
+        <waitForPageLoad stepKey="waitForPageLoad3" />
+    </actionGroup>
+    <actionGroup name="changeUseForPromoRuleConditionsProductAttribute">
+        <arguments>
+            <argument name="option" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStoreFrontPropertiesTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <selectOption selector="{{StorefrontPropertiesSection.useForPromoRuleConditions}}" userInput="{{option}}" stepKey="changeOption"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product attribute." stepKey="successMessage"/>
+    </actionGroup>
+    <actionGroup name="deleteProductAttribute" extends="navigateToCreatedProductAttribute">
+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
+                    stepKey="waitForSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
new file mode 100644
index 0000000000000..5948ca12dcf0f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssignAttributeToGroup">
+        <arguments>
+            <argument name="group" type="string"/>
+            <argument name="attribute" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductAttributeSetEditSection.attributeGroupExtender(group)}}" dependentSelector="{{AdminProductAttributeSetEditSection.attributeGroupCollapsed(group)}}" visible="true" stepKey="extendGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetEditSection.unassignedAttribute(attribute)}}" selector2="{{AdminProductAttributeSetEditSection.xThLineItemAttributeGroup(group, '1')}}" stepKey="dragAndDropToGroupProductDetails"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <see userInput="{{attribute}}" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
+    </actionGroup>
+    <actionGroup name="UnassignAttributeFromGroup">
+        <arguments>
+            <argument name="group" type="string"/>
+            <argument name="attribute" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductAttributeSetEditSection.attributeGroupExtender(group)}}" dependentSelector="{{AdminProductAttributeSetEditSection.attributeGroupCollapsed(group)}}" visible="true" stepKey="extendGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetEditSection.assignedAttribute(attribute)}}" selector2="{{AdminProductAttributeSetEditSection.xThLineItemUnassignedAttribute('1')}}" stepKey="dragAndDropToUnassigned"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <see userInput="{{attribute}}" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
+    </actionGroup>
+    <actionGroup name="SaveAttributeSet">
+        <click selector="{{AdminProductAttributeSetActionSection.save}}" stepKey="clickSave"/>
+        <see userInput="You saved the attribute set" selector="{{AdminMessagesSection.success}}" stepKey="successMessage"/>
+    </actionGroup>
+    <actionGroup name="CreateDefaultAttributeSet">
+        <!--Generic atrribute set creation-->
+        <arguments>
+            <argument name="label" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{AdminProductAttributeSetGridSection.addAttributeSetBtn}}" stepKey="clickAddAttributeSet"/>
+        <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{label}}" stepKey="fillName"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
new file mode 100644
index 0000000000000..8d16d35ab0dde
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Reset the product grid to the default view-->
+    <actionGroup name="resetProductGridToDefaultView">
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
+        <click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
+        <waitForPageLoad stepKey="waitForProductGridLoad"/>
+        <see selector="{{AdminProductGridFilterSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
+    </actionGroup>
+
+    <!--Filter the product grid by the SKU field-->
+    <actionGroup name="filterProductGridBySku">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid by the SKU string -->
+    <actionGroup name="filterProductGridBySku2">
+        <arguments>
+            <argument name="sku" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid by the Name field-->
+    <actionGroup name="filterProductGridByName">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid by the Name field-->
+    <actionGroup name="filterProductGridByName2">
+        <arguments>
+            <argument name="name" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{name}}" stepKey="fillProductNameFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid by new from date filter-->
+    <actionGroup name="filterProductGridBySetNewFromDate">
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.newFromDateFilter}}" userInput="05/16/2018" stepKey="fillSetAsNewProductFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid by a price range-->
+    <actionGroup name="filterProductGridByPriceRange">
+        <arguments>
+            <argument name="filter"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.priceFilterFrom}}" userInput="{{filter.from}}" stepKey="fillProductPriceFromFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.priceFilterTo}}" userInput="{{filter.to}}" stepKey="fillProductPriceToFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid to Enabled products-->
+    <actionGroup name="filterProductGridByEnabledStatus">
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <selectOption selector="{{AdminProductGridFilterSection.statusFilter}}" userInput="Enabled" stepKey="selectEnabledStatusFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Filter the product grid to Disabled products-->
+    <actionGroup name="filterProductGridByDisabledStatus">
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <selectOption selector="{{AdminProductGridFilterSection.statusFilter}}" userInput="Disabled" stepKey="selectDisabledStatusFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
+    <!--Search product grid with keyword search-->
+    <actionGroup name="searchProductGridByKeyword">
+        <arguments>
+            <argument name="keyword"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+
+    <!--Search product grid with keyword search-->
+    <!-- Argument type: string (see more in MQE-965) -->
+    <actionGroup name="searchProductGridByKeyword2">
+        <arguments>
+            <argument name="keyword" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+
+    <!--Filter product grid by name, sku, and type; and see expected product-->
+    <actionGroup name="viewProductInAdminGrid">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{product.type_id}}" stepKey="selectionProductType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{product.name}}"  stepKey="seeProductNameInGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" userInput="{{product.price}}"  stepKey="seeProductPriceInGrid"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
+    </actionGroup>
+
+    <!--Delete a product by filtering grid and using delete action-->
+    <actionGroup name="deleteProductUsingProductGrid">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{product.sku}}"  stepKey="seeProductSkuInGrid"/>
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+    </actionGroup>
+    <!--Delete all products by filtering grid and using mass delete action-->
+    <actionGroup name="deleteAllDuplicateProductUsingProductGrid" extends="deleteProductUsingProductGrid">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <remove keyForRemoval="seeProductSkuInGrid"/>
+    </actionGroup>
+
+    <!--Delete a product by filtering grid and using delete action-->
+    <actionGroup name="deleteProductBySku">
+        <arguments>
+            <argument name="sku" type="string"/>
+        </arguments>
+        <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{sku}}"  stepKey="seeProductSkuInGrid"/>
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+    </actionGroup>
+
+    <actionGroup name="deleteProductByName" extends="deleteProductBySku">
+        <arguments>
+            <argument name="sku" type="string" defaultValue=""/>
+            <argument name="name" type="string"/>
+        </arguments>
+        <remove keyForRemoval="fillProductSkuFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{name}}" stepKey="fillProductSkuFilter" after="openProductFilters"/>
+        <remove keyForRemoval="seeProductSkuInGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{name}}"  stepKey="seeProductNameInGrid" after="clickApplyFilters"/>
+    </actionGroup>
+
+    <!--Open product for edit by clicking row X and column Y in product grid-->
+    <actionGroup name="openProducForEditByClickingRowXColumnYInProductGrid">
+        <arguments>
+            <argument name="X" type="string" defaultValue="1"/>
+            <argument name="Y" type="string" defaultValue="2"/>
+        </arguments>
+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton(X, Y)}}" stepKey="openProductForEdit"/>
+    </actionGroup>
+
+    <!-- Sort products by ID descending -->
+    <actionGroup name="sortProductsByIdDescending">
+        <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('ascend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('descend')}}" visible="false" stepKey="sortById"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Sort products by ID ascending -->
+    <actionGroup name="sortProductsByIdAscending">
+        <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('descend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('ascend')}}" visible="false" stepKey="sortById"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!--Disabled a product by filtering grid and using change status action-->
+    <actionGroup name="ChangeStatusProductUsingProductGridActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="status" defaultValue="Enable" type="string" />
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{product.sku}}"  stepKey="seeProductSkuInGrid"/>
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
+        <click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled" parameterized="true"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMaskToDisappear"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..8b657fa1b8aab
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductInStorefrontCategoryPage">
+        <arguments>
+            <argument name="category"/>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront category page, assert product visibility -->
+        <amOnPage url="{{StorefrontCategoryPage.url(category.name)}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <see userInput="{{product.name}}" stepKey="assertProductPresent"/>
+        <see userInput="{{product.price}}" stepKey="assertProductPricePresent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
new file mode 100644
index 0000000000000..391a1a7d670de
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductInStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront product page, assert product name, sku and price -->
+        <amOnPage url="{{product.urlKey}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+    </actionGroup>
+    <actionGroup name="AssertProductNameAndSkuInStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront product page, assert product name and sku -->
+        <amOnPage url="{{product.urlKey}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+    </actionGroup>
+    <actionGroup name="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront product page, assert product name and sku -->
+        <amOnPage url="{{product.custom_attributes[url_key]}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
new file mode 100644
index 0000000000000..f2a7a0acffefa
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CheckItemInLayeredNavigationActionGroup">
+        <arguments>
+            <argument name="itemType"/>
+            <argument name="itemName"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontCategorySidebarSection.filterOptionsTitle('itemType')}}" dependentSelector="{{StorefrontCategorySidebarSection.filterOptions}}" visible="false" stepKey="expandFilterOptions"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
new file mode 100644
index 0000000000000..7373d5baea0c5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateCustomRadioOptions">
+        <!-- ActionGroup will add a single custom option to a product -->
+        <!-- You must already be on the product creation page -->
+        <arguments>
+            <argument name="customOptionName"/>
+            <argument name="productOption"/>
+            <argument name="productOption2"/>
+        </arguments>
+
+        <click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
+        <waitForPageLoad stepKey="waitForAddProductPageLoad"/>
+
+        <!-- Fill in the option and select the type of radio (once) -->
+        <fillField stepKey="fillInOptionTitle" selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{customOptionName}}"/>
+        <click stepKey="clickOptionTypeParent" selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}"/>
+        <waitForPageLoad stepKey="waitForDropdownOpen"/>
+        <click stepKey="clickOptionType" selector="{{AdminProductCustomizableOptionsSection.optionType('Radio Buttons')}}"/>
+
+        <!-- Add three radio options based on the parameter -->
+        <click stepKey="clickAddValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
+
+        <fillField stepKey="fillInValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption.title}}"/>
+        <fillField stepKey="fillInValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption.price}}"/>
+
+        <click stepKey="clickAddValue2" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
+
+        <fillField stepKey="fillInValueTitle2" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption2.title}}"/>
+        <fillField stepKey="fillInValuePrice2" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption2.price}}"/>
+    </actionGroup>
+
+    <!--Add a custom option of type "file" to a product-->
+    <actionGroup name="AddProductCustomOptionFile">
+        <arguments>
+            <argument name="option" defaultValue="ProductOptionFile"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" stepKey="waitForOption"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" userInput="{{option.price}}" stepKey="fillPrice"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
new file mode 100644
index 0000000000000..7bb9aa60ca628
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/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="urn:magento:mftf: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/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
new file mode 100644
index 0000000000000..ea2543cd5c2ab
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenEditProductOnBackendActionGroup">
+        <arguments>
+            <argument name="product" defaultValue="product"/>
+        </arguments>
+        <click selector="{{AdminProductGridSection.productRowBySku(product.sku)}}" stepKey="clickOnProductRow"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageLoad"/>
+        <seeInField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="seeProductSkuOnEditProductPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..c460dcbfbec91
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenProductFromCategoryPageActionGroup">
+        <arguments>
+            <argument name="category"/>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url(category.custom_attributes[url_path])}}" stepKey="navigateToCategoryPage"/>
+        <!-- Go to storefront product page -->
+        <click selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo(product.name)}}" stepKey="openProductPage"/>
+        <waitForAjaxLoad stepKey="waitForImageLoader"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
new file mode 100644
index 0000000000000..2f9d38516bd05
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="RestoreLayoutSetting">
+        <selectOption selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="selectNoLayoutUpdates1" after="expandDefaultLayouts"/>
+        <selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="No layout updates" stepKey="selectNoLayoutUpdates2" before="clickSaveConfig"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
new file mode 100644
index 0000000000000..53e7ea3589d1e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="searchAndMultiSelectActionGroup">
+        <arguments>
+            <argument name="dropDownSelector" />
+            <argument name="options" type="string"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{dropDownSelector}} .action-select.admin__action-multiselect" stepKey="waitForDropdown"/>
+        <click selector="{{dropDownSelector}} .action-select.admin__action-multiselect" stepKey="clickDropdown"/>
+        <selectMultipleOptions filterSelector="{{dropDownSelector}} .admin__action-multiselect-search-wrap>input" optionSelector="{{dropDownSelector}} .admin__action-multiselect-label>span" stepKey="selectSpecifiedOptions">
+            <array>[{{options}}]</array>
+        </selectMultipleOptions>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
new file mode 100644
index 0000000000000..a303511ffe5bb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SearchForProductOnBackendActionGroup">
+        <arguments>
+            <argument name="product" defaultValue="product"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad time="60" stepKey="waitForProductsPageToLoad"/>
+        <click selector="{{AdminProductFiltersSection.filtersButton}}" stepKey="openFiltersSectionOnProductsPage"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.clearFiltersButton}}" dependentSelector="{{AdminProductFiltersSection.clearFiltersButton}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFiltersSection.skuInput}}" stepKey="fillSkuFieldOnFiltersSection"/>
+        <click selector="{{AdminProductFiltersSection.apply}}" stepKey="clickApplyFiltersButton"/>
+    </actionGroup>
+
+    <actionGroup name="ClearProductsFilterActionGroup">
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.clearFiltersButton}}" dependentSelector="{{AdminProductFiltersSection.clearFiltersButton}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
new file mode 100644
index 0000000000000..c7ae52d2b37c3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Click Add to Cart button in storefront product page-->
+    <actionGroup name="StorefrontAddToCartCustomOptionsProductPageActionGroup">
+        <arguments>
+            <argument name="productName"/>
+        </arguments>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
new file mode 100644
index 0000000000000..4c7c011028c92
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Go to storefront category product page by given parameters -->
+    <actionGroup name="GoToStorefrontCategoryPageByParameters">
+        <arguments>
+            <argument name="category" type="string"/>
+            <argument name="mode" type="string"/>
+            <argument name="numOfProductsPerPage" type="string"/>
+            <argument name="sortBy" type="string" defaultValue="position"/>
+            <argument name="sort" type="string" defaultValue="asc"/>
+        </arguments>
+        <!-- Go to storefront category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url(category)}}?product_list_limit={{numOfProductsPerPage}}&amp;product_list_mode={{mode}}&amp;product_list_order={{sortBy}}&amp;product_list_dir={{sort}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <actionGroup name="VerifyCategoryPageParameters">
+        <arguments>
+            <argument name="category"/>
+            <argument name="mode" type="string"/>
+            <argument name="numOfProductsPerPage" type="string"/>
+            <argument name="sortBy" type="string" defaultValue="position"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="{{mode}}" selector="{{StorefrontCategoryMainSection.modeGridIsActive}}" stepKey="assertViewMode"/>
+        <see userInput="{{numOfProductsPerPage}}" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="assertNumberOfProductsPerPage"/>
+        <see userInput="{{sortBy}}" selector="{{StorefrontCategoryMainSection.sortedBy}}" stepKey="assertSortedBy"/>
+    </actionGroup>
+
+    <!-- Check the category page -->
+    <actionGroup name="StorefrontCheckCategoryActionGroup">
+        <arguments>
+            <argument name="category"/>
+            <argument name="productCount" type="string"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="{{productCount}}" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Check simple product on the category page -->
+    <actionGroup name="StorefrontCheckCategorySimpleProduct">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{product.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+    </actionGroup>
+
+    <actionGroup name="StorefrontSwitchCategoryViewToListMode">
+        <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="switchCategoryViewToListMode"/>
+        <waitForElement selector="{{StorefrontCategoryMainSection.CategoryTitle}}" time="30" stepKey="waitForCategoryReload"/>
+    </actionGroup>
+
+    <actionGroup name="GoToSubCategoryPage">
+        <arguments>
+            <argument name="parentCategory"/>
+            <argument name="subCategory"/>
+            <argument name="urlPath" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(parentCategory.name)}}" stepKey="moveMouseOnMainCategory"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategory.name)}}" stepKey="waitForSubCategoryVisible"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategory.name)}}" stepKey="goToCategory"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeInCurrentUrl url="{{urlPath}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{subCategory.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{subCategory.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
new file mode 100644
index 0000000000000..04e15da91777c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add Product to Compare from the category page and check message -->
+    <actionGroup name="StorefrontAddCategoryProductToCompareActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productVar.name)}}" stepKey="moveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCompareByName(productVar.name)}}" stepKey="clickAddProductToCompare"/>
+        <waitForElement selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForAddCategoryProductToCompareSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added product {{productVar.name}} to the comparison list." stepKey="assertAddCategoryProductToCompareSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Add Product to Compare from the product page and check message -->
+    <actionGroup name="StorefrontAddProductToCompareActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickAddToCompare" />
+        <waitForElement selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForAddProductToCompareSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added product {{productVar.name}} to the comparison list." stepKey="assertAddProductToCompareSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Check the product in compare sidebar -->
+    <actionGroup name="StorefrontCheckCompareSidebarProductActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName(productVar.name)}}" stepKey="waitForProduct"/>
+    </actionGroup>
+
+    <!-- Open and check comparison page -->
+    <actionGroup name="StorefrontOpenAndCheckComparisionActionGroup">
+        <click selector="{{StorefrontComparisonSidebarSection.Compare}}" stepKey="clickCompare"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForComparePageloaded" />
+        <seeInCurrentUrl url="{{StorefrontProductComparePage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Products Comparison List" stepKey="assertPageNameInTitle"/>
+        <see userInput="Compare Products" selector="{{StorefrontProductCompareMainSection.PageName}}" stepKey="assertPageName"/>
+    </actionGroup>
+
+    <!-- Check the simple product in comparison page -->
+    <actionGroup name="StorefrontCheckCompareSimpleProductActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName(productVar.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{productVar.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(productVar.name)}}" stepKey="assertProductPrice1"/>
+        <see userInput="{{productVar.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', productVar.name)}}" stepKey="assertProductPrice2"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductAddToCartByName(productVar.name)}}" stepKey="assertProductAddToCart"/>
+    </actionGroup>
+
+    <!-- Clear the compare list -->
+    <actionGroup name="StorefrontClearCompareActionGroup">
+        <waitForElementVisible selector="{{StorefrontComparisonSidebarSection.ClearAll}}" time="30" stepKey="waitForClearAll"/>
+        <click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
+        <waitForElementVisible selector="{{ModalConfirmationSection.OkButton}}" time="30" stepKey="waitForClearOk"/>
+        <scrollTo selector="{{ModalConfirmationSection.OkButton}}" stepKey="scrollToClearOk"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickClearOk"/>
+        <waitForElement selector="{{StorefrontMessagesSection.message('You cleared the comparison list.')}}" time="30" stepKey="AssertMessageCleared"/>
+        <waitForElement selector="{{StorefrontComparisonSidebarSection.NoItemsMessage}}" time="30" stepKey="assertNoItems"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
new file mode 100644
index 0000000000000..5f0d03597dab1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check the simple product on the product page -->
+    <actionGroup name="StorefrontCheckSimpleProduct">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="AssertProductNameInTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see userInput="${{product.price}}.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="assertAddToCart" />
+        <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
+        <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
+    </actionGroup>
+
+    <!-- Assert product image in Storefront Product page -->
+    <actionGroup name="assertProductImageStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert product image in Storefront Product page -->
+    <actionGroup name="assertProductImageStorefrontProductPage2">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert no product image in Storefront Product page -->
+    <actionGroup name="assertProductImageNotInStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert no product image in Storefront Product page -->
+    <actionGroup name="assertProductImageNotInStorefrontProductPage2">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
new file mode 100644
index 0000000000000..82042975d5fb8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Click Add to Cart button in storefront product page-->
+    <actionGroup name="addToCartFromStorefrontProductPage">
+        <arguments>
+            <argument name="productName"/>
+        </arguments>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
+    </actionGroup>
+
+    <!--Verify text length validation hint with multiple inputs-->
+    <actionGroup name="testDynamicValidationHint">
+        <arguments>
+            <argument name="charLimit"/>
+        </arguments>
+        <fillField userInput="abcde" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput1"/>
+        <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(15 remaining)" stepKey="assertHint1"/>
+        <fillField userInput="abcdefghjklansdmnbv" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput2"/>
+        <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(1 remaining)" stepKey="assertHint2"/>
+        <fillField userInput="abcdefghjklansdmnbvd" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput3"/>
+        <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(0 remaining)" stepKey="assertHint3"/>
+        <fillField userInput="abcdefghjklansdmnbvds" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput4"/>
+        <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(1 too many)" stepKey="assertHint4"/>
+        <fillField userInput="abcdefghjklansdmnbvdsasdfghjmn" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput5"/>
+        <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(10 too many)" stepKey="assertHint5"/>
+    </actionGroup>
+    <actionGroup name="checkAttributeInMoreInformationTab">
+        <arguments>
+            <argument name="attributeLabel" type="string"/>
+            <argument name="attributeValue" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="clickTab"/>
+        <see userInput="{{attributeLabel}}" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="seeAttributeLabel"/>
+        <see userInput="{{attributeValue}}" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="seeAttributeValue"/>
+    </actionGroup>
+    <actionGroup name="checkAttributeNotInMoreInformationTab">
+        <arguments>
+            <argument name="attributeLabel" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="clickTab"/>
+        <dontSee userInput="{{attributeLabel}}" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="seeAttributeLabel"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
new file mode 100644
index 0000000000000..d78c03a51dd75
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CatalogAttributeSet" type="CatalogAttributeSet">
+        <data key="attribute_set_name" unique="suffix">test_set_</data>
+        <data key="attributeGroupId">7</data>
+        <data key="skeletonId">4</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
new file mode 100644
index 0000000000000..cad8a8cd03e0d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CatalogPriceScopeWebsite" type="catalog_price_config_state">
+        <requiredEntity type="scope">scopeWebsite</requiredEntity>
+        <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
+    </entity>
+    <entity name="scopeWebsite" type="scope">
+        <data key="value">1</data>
+    </entity>
+    <entity name="defaultProductPrice" type="default_product_price">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultConfigCatalogPrice" type="catalog_price_config_state">
+        <requiredEntity type="scope">scopeGlobal</requiredEntity>
+        <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
+    </entity>
+    <entity name="scopeGlobal" type="scope">
+        <data key="value">0</data>
+    </entity>
+    <entity name="defaultProductPrice" type="default_product_price">
+        <data key="value"/>
+    </entity>
+
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
new file mode 100644
index 0000000000000..d8ec84013d93b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="RememberPaginationCatalogStorefrontConfig" type="catalog_storefront_config">
+        <requiredEntity type="grid_per_page_values">GridPerPageValues</requiredEntity>
+        <requiredEntity type="remember_pagination">RememberCategoryPagination</requiredEntity>
+    </entity>
+
+    <entity name="GridPerPageValues" type="grid_per_page_values">
+        <data key="value">9,12,20,24</data>
+    </entity>
+
+    <entity name="RememberCategoryPagination" type="remember_pagination">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DefaultCatalogStorefrontConfiguration" type="default_catalog_storefront_config">
+        <requiredEntity type="catalogStorefrontFlagZero">DefaultCatalogStorefrontFlagZero</requiredEntity>
+        <data key="list_allow_all">DefaultListAllowAll</data>
+        <data key="flat_catalog_product">DefaultFlatCatalogProduct</data>
+    </entity>
+
+    <entity name="DefaultCatalogStorefrontFlagZero" type="catalogStorefrontFlagZero">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultListAllowAll" type="list_allow_all">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultFlatCatalogProduct" type="flat_catalog_product">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
new file mode 100644
index 0000000000000..ff3c5cb4403bf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultCategory" type="category">
+        <data key="name" unique="suffix">simpleCategory</data>
+        <data key="name_lwr" unique="suffix">simplecategory</data>
+        <data key="is_active">true</data>
+    </entity>
+    <entity name="ApiCategory" type="category">
+        <data key="name" unique="suffix">ApiCategory</data>
+        <data key="is_active">true</data>
+    </entity>
+    <entity name="SimpleSubCategory" type="category">
+        <data key="name" unique="suffix">SimpleSubCategory</data>
+        <data key="name_lwr" unique="suffix">simplesubcategory</data>
+        <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>
+    <entity name="NewSubCategoryWithParent" 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>
+    <entity name="FirstLevelSubCat" type="category">
+        <data key="name" unique="suffix">FirstLevelSubCategory</data>
+        <data key="name_lwr" unique="suffix">subcategory</data>
+    </entity>
+    <entity name="SecondLevelSubCat" type="category">
+        <data key="name" unique="suffix">SecondLevelSubCategory</data>
+        <data key="name_lwr" unique="suffix">subcategory</data>
+    </entity>
+    <entity name="ThirdLevelSubCat" type="category">
+        <data key="name" unique="suffix">ThirdLevelSubCategory</data>
+        <data key="name_lwr" unique="suffix">subcategory</data>
+    </entity>
+    <entity name="FourthLevelSubCat" type="category">
+        <data key="name" unique="suffix">FourthLevelSubCategory</data>
+        <data key="name_lwr" unique="suffix">subcategory</data>
+    </entity>
+    <entity name="FifthLevelCat" type="category">
+        <data key="name" unique="suffix">FifthLevelCategory</data>
+        <data key="name_lwr" unique="suffix">category</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
new file mode 100644
index 0000000000000..8a26b6babdbbc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="one">1</data>
+        <data key="two">2</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
new file mode 100644
index 0000000000000..389c41abf0bd1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomAttributeCategoryUrlKey" type="custom_attribute">
+        <data key="attribute_code">url_key</data>
+        <data key="value" unique="suffix">category</data>
+    </entity>
+    <entity name="CustomAttributeProductUrlKey" type="custom_attribute">
+        <data key="attribute_code">url_key</data>
+        <data key="value" unique="suffix">product</data>
+    </entity>
+    <entity name="CustomAttributeCategoryIds" type="custom_attribute_array">
+        <data key="attribute_code">category_ids</data>
+        <var key="value" entityType="category" entityKey="id"/>
+    </entity>
+    <entity name="CustomAttributeProductAttribute" type="custom_attribute">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <var key="value" entityKey="value" entityType="ProductAttributeOption"/>
+    </entity>
+    <entity name="ApiProductDescription" type="custom_attribute">
+        <data key="attribute_code">description</data>
+        <data key="value" unique="suffix">API Product Description</data>
+    </entity>
+    <entity name="ApiProductShortDescription" type="custom_attribute">
+        <data key="attribute_code">short_description</data>
+        <data key="value" unique="suffix">API Product Short Description</data>
+    </entity>
+    <entity name="ApiProductNewsFromDate" type="custom_attribute">
+        <data key="attribute_code">news_from_date</data>
+        <data key="value">2018-05-17 00:00:00</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
new file mode 100644
index 0000000000000..a2bdaa7dbc62f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductAttributeFrontendLabel" type="FrontendLabel">
+        <data key="store_id">0</data>
+        <data key="label" unique="suffix">attribute</data>
+    </entity>
+    <entity name="ProductAttributeFrontendLabelTwo" type="FrontendLabel">
+        <data key="store_id">0</data>
+        <data key="label" unique="suffix">attributeTwo</data>
+    </entity>
+    <entity name="ProductAttributeFrontendLabelThree" type="FrontendLabel">
+        <data key="store_id">0</data>
+        <data key="label" unique="suffix">attributeThree</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
new file mode 100644
index 0000000000000..1f4b1470098e2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+   <entity name="TestImageContent" type="ImageContent">
+        <data key="base64_encoded_data">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAGAAYAMBIgACEQEDEQH/xACXAAEBAAMBAQEBAAAAAAAAAAAABgMEBQgCAQcQAAEDAQUFBgQDCQAAAAAAAAABAgMEBQYRFpESMTZV0QchcnOzwhMUIkEygaE1QlFSYXGCsbIBAAEFAQAAAAAAAAAAAAAAAAACAwQGBwERAAECAwMLBAMBAAAAAAAAAAEAAgMEERMhkRQxMzRBUVJTcXKxBRJhoSKBwUL/2gAMAwEAAhEDEQA/AP7+AYKysp7Po5aurlbFBEmL3u3NQ6ASaBdArcFnBN5/urzqn0d0Gf7q86p9HdCRkUzy3YFOWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSAm8/wB1edU+jugz/dXnVPo7oGRTPLdgUWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSA1bPtGktWiZWUM7Z6d6qjZG7lwXBf1Q2iO5paaOFCmyCDQoTd/uBLX8n3IUhN3+4EtfyfchIk9Zh9w8pyBpW9QvN4Bwbcsujis+pq2Q4Tq5HbW0u9XJj3Y4fc0ibjPgQjEY0GgJNTS4brj/FaIz3Q2FwFafNP4V3gc1aWz7FY+rjhVrsNjBrlcrsV3Iir/ABPxtqzRyM+boJKeJ7kakm2jkRV3Yom4TlbYf4xrnfFSBuqaCn7ouWwbc+4/FT90XTBz57RlbVvpqWjdUSRoiyfWjUbju71MUlqSyWdVPjpnsqIUVJI3ORFZ3fix+4OnoLSRU3V2HZnANKEjcEGOwVG74OxdUGjZM1RNQROqIlYuw3Zcr9pXpgn1f0xN4kQYgiww8bU4xwe0OG1eg+y7gCg8cvqOLEjuy7gCg8cvqOLEzT1HXIvcfKq0zpn9ShN3+4EtfyfchSE3f7gS1/J9yCJPWYfcPKTA0reoXm85l4P2HUf4/wDSHTPmSOOZiskY17F3tcmKKaXMwjGgvhj/AECMQrTFZ72ObvC5lvxq+gjeivRsUzXvVn4kb34qmpozxWc+NjVtWtqPiOREjbMj1Vf7YFHvMMdLTxP244ImP/maxEUhzMhaxC8UvABrXZuoR9pmLL+9xddfvXNrfkVtJyPqJaOpRiL8VHbKPT8+5THFVS1FnWnE+VKhsUbmsmamG3i1e78jsSwQzoiTRRyIm5HtRf8AZ9MjZGxGMY1rU/damCHTJPMQuDgAa5q31G0VpdnrnuRYO9xNaA1+/r9rUsmeGazqdscrHuZExHo1cVauH30U3THFBDBtfBijj2t+w1Ex0MhMgMcyG1r843J+GC1oDs69B9l3AFB45fUcWJHdl3AFB45fUcWJm3qOuRe4+VV5nTP6lCbv9wJa/k+5CkJu/wBwJa/k+5BEnrMPuHlJgaVvULzeADUlbUAAIQAAhAACF6D7LuAKDxy+o4sSO7LuAKDxy+o4sTMPUdci9x8qqTOmf1KE3f7gS1/J9yFITd/uBLX8n3IIk9Zh9w8pMDSt6hebwAakragABCAAEIAAQvQfZdwBQeOX1HFiR3ZdwBQeOX1HFiZh6jrkXuPlVSZ0z+pQwVlHT2hRy0lXE2WCVMHsduchnBEBINQmQaXhTeQLq8lp9XdRkC6vJafV3UpASMtmeY7Epy3i8RxU3kC6vJafV3UZAuryWn1d1KQBlszzHYlFvF4jipvIF1eS0+ruoyBdXktPq7qUgDLZnmOxKLeLxHFTeQLq8lp9XdRkC6vJafV3UpAGWzPMdiUW8XiOK1bPs6ksqiZR0MDYKdiqrY27kxXFf1U2gCO5xcauNSmySTUr/9k=</data>
+        <data key="type">image/jpeg</data>
+        <data key="name" unique="prefix">test_image.jpg</data>
+    </entity>
+    <entity name="MagentoLogoImageContent" type="ImageContent">
+        <data key="base64_encoded_data">iVBORw0KGgoAAAANSUhEUgAAAP8AAAEsCAYAAAAM1WX/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACY7SURBVHhe7Z0LlBxXnd6HXWyWhx9g8HS3pJFGPVU1klmC2RB28frBIbY00y2NpBnN9GMkG4JJcOJsgCVrszZg56wJuxj2BTjLY8FsADsb20kwmEc4WYgNxPYuiwX2yg9ZxrKsefS7R5IlufP/qm+N76hbo5qa7p6qru875zs6M5quvvd/76/q3lt1/9VDhU/7Ll79ikrauL66y8pVUsZ1ezf1nan+i6KoblV+bP22uUlrT+1dG2vlycEa/pWfH5kej4+oP6Eoqpt0aGx9vJqxvnF892Dt2JUbavmMNW/8fEx+X81aXy9MxNerj1AUFWQ9eGHPy4sp4wOHJ60ZXOWLWauW08CH8TN+r0YBM8W0+f47B3vOUIegKCpoyo/HL6tkzAcA9eFdgw3Qn2z8/5z8Hf6+krEeyE/EL1WHoigqCHo+2X9+MW18dm5y8MSLV25sCvrpfEI+V520TuA4h4b6etWhKYryqwTWXTJ3fxpXbyzone5qfyrjc+WsjALeLSeBrPl0MWNOqq+gKMpPmh3rf2Mpbdxbu2pj7ejuDZ6hP9k4Do6HEUQpY34zl+r/TfWVFEWtpH52ee+rZF7/kbmsVQb4hZPgbZVxXBx/btIqldLmjQeSkVeqIlAU1Wnl0gNJAf/nGOJXlzHEd2scH99jLwhmzX8sTgwkVFEoiuqEcjvW9pWzxleO7hqsHT/pnn2njO/F95cz5pefk/KoolEU1S5VM+Y1law1hatvqck9+04Z34vvr48CrEMolyoiRVGtVG5n/0Vylf07zLvd3LPvlFEOlAflkqnA/5kdX/92VWSKopajZ8Zir53LGrdWJ61jL161oW0Lest1fUFwQ60i5ZxLG7fuT/Sdq6pAUdRSVU4ZqXLGenK59+w7ZZTP2SxUzlpPlNPGhKoKRVFuND22zpQh9N+euHJD7YXdK7Ogt1yj3Ch/JWv97fSOPktVjaKoZsK++krGuK6cNUu4emKzTTOwgmJns5CcyIqVtPkH9zJvAEU1amZi3eXVjPkQYMHmGr8P8d0a9XA2C1Wz5oOFsXX/UlWZosKt6a1rotWs9XmsmGOY3AygbjHqd3hysFbNWH+1X+qtQkBR4VMpZbynOmkewFWxlO2eq/2pjPqhnvboJms+i/qrUFBUOFRI9f+WdP7v4tbYkRZuwgmKUV/UG/WXqcB3Cjvjb1Ghoaju1L6RtedUM8YtMsw/2s5NOEGxs1moOmkdKWeMjyM+KlQU1T3KTxjb57LWL+3V7wDcs++UEQfEoz4VsH6RT63fpkJGUcFWPXGm+V+PyzD35MSZ9EI7iUQrGetriJsKIUUFS0icmU8ZH0BCTFzVmiXOpBca8XGeDTictaaLqYH/gDiqkFKU/1VKxy+Zy1h24sxuumffKSNe9mYhiV81a92fG4tfokJLUf7UoZ19vcWM8ZnqMhJn0guNONqJRFPGXyIxqQo1RflHFSTOnLT24WoVhE04QTHiaG8Werf9bMBTchLYrUJOUSurfCr+5lLG+taLV25oaeJMeqER13oi0Q21Ytr4Vn7nwD9TTUBRndWeS899dTltfFSu9hXes++cnWcD5iTuiP/By3tfpZqEotqvysRAopOJM+mFRrz1RKKVlDGsmoai2qN64kzzS0d3r1ziTHqh0Q5HdtmJRP86t7N/jWoqimqdyinj31Wz1iFcbVYycSa90GgHJ5GotM/zTCRKtUzFifjvyBDfTpyJKwyh96fRLmgftBMSiRbT639bNSFFLU3PXBF7bSVdT5yJ3WfNOhztPzuJRKXdXqhkjE8ykSi1JBVSRqqStR7nPftgGu3lPBuAdkR7qqalqOY6OBrfKJ3l7iAnzqQXGu2IRUEZBdw1s3XNBtXUFFXXnrHBM2SIf305Y5ZxtecmnO4x2lFLJFpCO+8ZHDxDNT0VZs2MDlxezVh24sxqiBb0AASemMO/zf6/24x2RfvW7woMPjjDRKLh1dT2NZG5tHkbEkqeCNEmHEAA6Oek3vm0+Rh2z4XtsWS0t51INGv+F2zGUl2CCoNKE8bV1UkrNIkzYdSxrJJnYgNSLjWQrSUjr5wZj++qZq2n8Xv8f1hi8VIiUetXTCQaAk3vjL9FzvahTJyJ9/xVZIg/lzH//Int/W9QIbF1UH6uZI2/kJOA/XfNPt+NRvs7iUQlLt/Jj8cvVCGhukUzm/vPKmaMj8sV70iYNuGgc9svzJA6y0nv/unR+KUqJE01PR6/rDpp3m9fEUO0/uFsFqpI/yimjFv2Sn9RIaGCrPzEeiTO/AU6dFgSZ6KO8yvcGTNXThkfuGN7z6+pkCyqj17c8+tyovygjBJy+HxY7nygjkwk2iWa2rbOqGSsO5AQMmyJM+uJMDfgzTjfOLTFWyLMqR39A3LiuBPHCWf87ESi30AcVEgovwsJH4sTxgfDljhTv3LJVfuX+fTADhWSZamUGhiVk8Cj9nFDOHJCP5KpwAd+ICMiFRLKj8qND1wcxsSZzpy1nDXx8otbprec8xoVkpZoZvPZZ1UzxsflpBLONZN32W8Wuh/9S4WE8ouwWl1MG39RnbSOvyids1lDdqPROZ3VagHzu+1+7RVeM1bJGN8L590S3CIdPI5+hv6mQkKtpJDQ8XDIEmeijs596nLGPFDp8H1qGQVcXZXvxfeH6jkJNa2qZq19chLYpcJBdVpI4FhKG6FMnGm/6lqGo5W0eRte8a1C0lHNjK2OyRTjr7CHvttfLa4b/cxJJCr9716ZCrxJhYRqtw4kI68sp4yPze2y7E04YZp/Os+mlzLmQ4Xx+BUqJCuqQmr9JinPw/YVMSQjL9hZZ5nLWmUkEkW/VCGh2qFieiCJhI2h62hq5bmaNYtytf+DvZt6zlQh8YX2buo7s5IxrkP57BOylLdZPbrN9glZTQWQ0LWYGUiokFCtUn5i7dpqxrr9qFz5wpQ4E50L+9ExrC6nzXtmR+MbVUh8qdlUfGM5Y/4PJx9CWE7OMPol+mc5bX0lP7J2rQoJtRzJvPLasCXORB21xaXHZVg5ocIRCMm0DJmQnkAmnXAtwjojNOsQEr6qcFBLVXE8/rZKxrITZ2JxKyxXEWcuiRx0hbRxq8wlz1MhCZRQ7lLa+BTqgfo0q2s3Gv3Ufsmo1BmJRGfHmEjUtZBwsZoxPilXjtB1Gjv7rP1AidU1nWYW2Y8n5SQu9QrfSdx+/uKFatb8k30ja89RIaGaqTAxkLaHizJ0CuNw8fCkdbCcMq+pqXh0i27o6XlZQYbBc1nr+bBO36RfM5FoM81MGIMSnLvCmDgTC0Uv7FZvnMms7VMh6Uqphdsvo75hWriFnYXbSsb879M7DEuFJLy6F7eI0sb1SKyIs2OYNuE4t4jkavgPsyF711xR6iv1/hnqH5Zbtqijs1mojESiGeM69H8VknBpdjx+hcyFHrQBCNtc0O70VjXMb5nFW47lJHBTNWvNIR5helirvlkIdwXMB5FAVoWk+4XEmdWM+QUs/oT1sVC56n0zlzJ+U4Uk1Do0PvAmice9oX1MW0Y+1bT1eXChQtKdKqSN91YnQ7ghRG3Ckavc0/kJ40oVDkpTfnzgKonPfsQpnIlEzWcLE8bVKhzdI2zCkcp9J6yJM6VT42r/508m+89XIaGa6HmJTyVj/aVMicKbSHTSvC8/Gn+zCklw9eTYurPLKeMW6fyHcc8+TPM650EPmdfdPzUWv0SFhHKh6Yn4pQJBaJOyVLODh8tp84/AjwpJsITEmQL9L9GAoUycmbVmkTiT6Z+8CXGrMJFosBKJHhpbH0fiyOOhTpxpfu35HX39KiTUMnRoIr5eLiJfC3MiUan/1wsSBxUS/8lOnClXusMhT5xZmjC2q5BQLRQSkoY+kWjafD84UyHxh/Lj8cukYew5Whg34eBlD9WMccujLU6cSS3U9BbzNSqR6NGwrSFpzwbcn59Y/OUrHRFWZ4tp47Nzk4MnXgzZyy6d1VkZkn13Zqz/rSokVAdUSPe/VaaW9USiu0J290g4q05aJ8op4zPgT4Wks0ICQ+n49Rc8hmgYNp84M2s9V8p04X3ZAKmUNt4ro4CDaI/QJRJ9tz0KeLqYMSdVONqv2bH+NyJxIYZdYU2cicSV0ylzRRJnUgs1M2bEymnj8+F9YtTO6fjNXKq/fU+M/uzy3lfJvP4jc1mrHNb5VhmJMydC9Cx2gFRIx6+Q9rETiYbx2YC5SatUSps3tjyRaA6JMzPmzxHYMCXOdFZaZY5VkCH+dX5LnEkt1A8uXv0KGZVeLyAU0G5ov2bt2m0Gj/OJRLPmPxYnWpBINLdjbV85a3wlbIkz4fnEmRnjLuQbUCGhAiC0l0wF7kb7hTE/hJ1INGN++TnhV4VkaapmzGsqWWsKZ5PQJs6cMMdVOKgAqpA2JtCOaM8wZoYSfg+BYxWO0yu3s/8iOWuEMnFm/X1s1jEZOt5aGIu9VoWECrCeHYm+TqZsn0a7on3DtFbl7C+xE4mOr3+7CkmjnpHOPpc1bq0HaUP4gvQupFiy/m7RIFGBVS5tXlS1s0GHNJGocD0nFzUkyFUhqQt54csZ68nwDY/qQ/w5GR4VJox/i0STKiRUF+qOnp5fU4lE7fdAhOkRdGc6W85aT8y/ByI3MXDHcRkahHJhROosQ/yvYGHTDgYVCiGRqEwFbg9lIlGpL3gH9z3Ht6+pFXbG6/8pV8KT/7ibjDOgljjzZ8VxY0j1ByqEQuJU9AP0h1DcwlZ8g3dw3zM7FKnZ3rq6lhuXkwD+oAtPAvbcB42ctSphTpxJLdSesXNfXcZbnyetStc+vKaYBt/g3GG+Z3Y4WrPtnAS29dXyKUN9oMmBAmaczecTZ05a/2t2vP8C1e4UNS88ti6jgO5KJAp+wbHwDK7nGVfMvwS/Y/Wfue1ra/m0Wf9wswP73PoiR3XS2ldMx3epdqaoU6qYMnZ3xYY1cCv8gmOda92N8DvGHyditdxo/0sHO/kLfOwT9tbHwVolY3zmudH1r1dtS1GnFfpLJWt9Zk76T+A2CylOwS34bQa941PDD+OD8JZVtRwWBXFgH58EcJaef7AhYz4wvSN+mWpPilqypsf63yH96MeBeOBNsQlOwes8u824Vl4cfsfqQLmta2r58QHfnQTQKM4mHDlj54oZ44NMnEm1QrchPV3a+H3pV3n0L989G+CwKFyCTzfQO3YHv2N10Ny2tbWcsyjYrEAd9nzizKz5tUPbfJzokAqs7MS0WevreC7AN4lEhT9wCB51Pt16afA7xpdgPWDHuhVbFMTZ10mcKY3CxJlUR2QnEp1c4USi4A2LecLf6eb1i9kb/I7xpUk5CYytf6lQJxe0Da4/r2xDf1iu9n/ExJlUJ7V389lnlTPGx/FyjY4+G6D4Am/gziv0jpcHP4wCwFva/5AQzrK4B2tvVMia353eGX+Lag+K6rimR/t/q+IkEm3nswGKKfshHZeLeW68fPgd2wWSf0fW1PITrV0URFDnE2dmzAOllPEeFf/QSaY3g7WxwTPUj77Q3k19Z6Jc6sfQqZoxrm7LC2gdhoQncGXz1QLoHbcOfseqcDn7ScHWrAfgXuuRXYO1ctr6/MzY6piKeah0aGdfbylrfTmXMp6ckWGn+rUvlHvnWWdLuZ4qZ80voZzq16HSzLboKrkwfQH9tCXPBoAbezGvbwFXrXTr4XeMwi5jURBnTydxZiljPlwYj1+h4hw6VVLWu8oZ61e1q9+IWD7+zGjsN9R/+UJIGjmbMp9C+UpSzkp64Cr1X6FTJR2/opQ2/x791lMiUXDSgsU8N24f/I5R+OSqJS0KOvfs5yatfCVtXI/EjCq2odLUePzCatb8NuaUWOuA82njsZZnaF2msEkqlzL3Yt7rrMlUs9a9U93wqmkP2if9Vfrth5eUSFRxUV/MU/P6Zjy10O2HH0ZFxDkXi4J64sywziORJr2aMf9T5aRXmwcBfpTTuRtTxt2YtHmz38rbKc2OxjeeNpGoYgFcgA+HlaYctdidgd+xU7GRNbXchLNzsD400l52+bjMnUKbOLM0Ed9azVh77FicdB85KPDDepvKKOCRXCq+Rf156FRIGSmJweN4y878ZiGn7wsH9cW8zkHvuLPwO1aVxI4j6TS1Oek0MkQ6WkoZn0TCRRWzUCk/tmadDPH/BleIUz1BFiT4daM+yJojo5mv5kfWrlUfC5Wkzc5DYlj0c/R39PvFdtx1wisDv2OpdHnLqlppbN3B2XEjlIkzsQehOGG+v5I1T/tq86DCj/q8tPfCnC6nzN9DPj318VAJiUQr0t/R71cKescrC7/4ha2x2vRQ5CcqNqGSDPl+V672/xdQuNk1FlT4HaN+zq5LGQb/KLfTvEgdIlSaHer9Kfp9Mx466RWH/6gEYWY48pCKSyj0mAwBKxnzzypZ6wTSpDcDpZmDDr9u5NAvS/0rafNPwzTVq4lnhyMPo98346GTJvwdVmFiIF2dtJ7A1X6pmWK6CX7U28m0JPPgx2dTRkodrqtF+DWHBX7kDpzLmPcgRxwW9ZYCveNugt8x4uDc3pXR0D2zqfhGddiuFOHX3O3wA9RCeuBGmeOWcZUruHng4xTuRvgdIy6IT3XSLEm8bnjIZ3VslQi/5m6Gf3Zi/WYZ0tqPerYiL3w3ww8jPtp7FR6eHVu/SX1F14jwa+5G+PFq5HLG/GKrX23e7fDrRtywSaYkcczt7F+jvirwIvyauw3+UnrgfXLVeg5Xr5Zu7xSHCX7Ebf5dipPWgVJq4F+rrwu0CL/mboFfhqi/Xc2a/9tO7LCrPYkdwgS/Y8QR8bQ3C2Ws7xfH429TXxtIEX7NQYd/38jac0pp84/l6nSk3Smdwgi/4/nUbRLnUsr8xJNj685WXx8oEX7NQYa/PGGNVTuYzDHM8MOIr7ZZ6JcyFRhVRQiMCL/mIMI/vcOwyhnzv9lpnNvc4XWHHX7d2CyE+JfT5p3TY5apiuJ7EX7NQYL/wQt7Xl7JmB+Sq878Cxyadcx2mfAvtLNZSNojV0kbv4/2UUXyrQi/5qDAXxg33ilX+/9nrz57Sc/UAhP+RqMdnHRv5Yz103LKfIcqli9F+DX7Hf79W9dEK1nzs/ZLG5ewCacdJvyLG5ukqpPWCbyc9entayKqeL4S4dfsZ/grafNflbPms7iqtPqevRcT/sWN9nGeDShlzGdlivZuVUTfiPBr9iP8eBmInjhzpaF3TPjdGe2FWKlnA76FRKiqqCsuwq/ZT/Dnd7/pHJnXNyTO9IsJ/9LsPBsg7TlXTps3o31VkVdMhF+zn+DP7ej/cO09F9SqbXpCb7km/Es32hHtiXadGe2/XhV5xUT4NfsJ/unNvTfXRvtquZ2dffGoWxP+JVq1H3Lh10bX1KR9b1JFXjERfs1+gn92KPrR2og0ylCkltu6ppYbb+07B5drwu/Sqs3Qfrmt9Vz4aFfpZx9RRV4xEX7NvoN/26p62VRmVbwrLZdy3jHQpKN10IT/NEb7APoJo5YbWfiOO7Qr4V9owq9pAfyOnZPAdm/vHGylCf8iRrvgHXfSTnq7OSb8jSb8mprC7xidCS8eHe1/qbOd3AHbbMLfxKod0C6LvdiS8Dea8GtaFH4YHQvesqq+KKiGmQ0dsk0m/JoRd4k/2gHtMd82zdpNTPgbTfg1nRZ+x05H27pa5pedWxQk/GIVa8Qd8T8d9I4Jf6MJvybX8DtWnQ6LgnlnUbBZh22RQw8/4itxRrz1+Lsx4W804de0ZPgdOyeBHe1dFAwt/IgnFvMkvnq8l2LC32jCr8kz/I7RKZOxWm6sPYuCoYNfxQ/xRFy9QO+Y8Dea8GtaNvwwOii8ZXUttzNe78AtOgmEBn4VM8QPcZyPabN4uzThbzTh19QS+B2rDpsbWWM/dNKKk0DXw+9APzFgx60V0Dsm/I0m/JpaCr9j1Xlz29Yue1Gwq+FHXOzFvLUL4tYqE/5GE35NbYHfsXMSsBcFVWdvBsEi7kr4EQeJx3IW89yY8Dea8GtqK/yO0bmTq+ydZvOd/2QgTuGugl/VG3FAPNoFvWPC32jCr6kj8MPo6DAWBcfdLwp2Bfyqrqh3qxbz3JjwN5rwa+oY/I5Vx8fiVn5+UbAJMMqBht95FNrecdfaxTw3JvyNJvyaOg6/YwVBbjsWBU/9kFBg4Ud9pF6on17fTprwN5rwa1ox+B0DikV2DgYOflX+3Oi6RXfcdcKEv9GEX9OKww8PwQIJFgXxkJAGUWDgd6DHQzrOYh7q1ay+HTLhbzTh1+QL+B3bwIixc1AtCh69cqO/4Uf5pJz2Yt4Sdtx1woS/0YRfk6/gd+wAtK2vdnQSw2nznwCbKrIvdOjSc1+dy1iPH8ladjn9BL1jwt9owq/Jl/A7FpiObJWpwLa+R2pjg2eoIvtCezf1nZnbtmbPYSmf36B3TPgbTfg1+Rp+sR2rod4HVXF9pdmh3of80KFPZcLfaMKvKRDw+yRWuvzUoU9lwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt/onmNbV9UKiagEpvkftNuE370Jv3cT/rrBOXgH9z0zQ9HPVZKx2gsrVBjC796E37sJf93gHLyDe7tAUphNpUT04drIqloZ/9HkQ+0y4Xdvwu/dYYYfPINr8F1KxB4C7/XSKO27ePUrSsnYHxYT0fKL8kd59aFmB2ulCb97E37vDiP84DcvQ3zwLBf3Umk48uEfCOf1kjTRbKL3AjlL3I3hwZEt7S8g4Xdvwu/dYYQf/ILjciJ218Et52+sl8CFColoRkYB+xA0+dc+izT7guWa8Ls34ffusMAPTsGr4vap2WQ0Xf/mJepAMnKeTAU+XU5GXzjepsISfvcm/N4dBvhz4uMjsVpJeBVuP/WY8Fv/1mUol4xcVEzEfoS5Q7XFC4KE370Jv3d3M/zgsSpDfPBZTER+ODsUeXv921qkG3p6XiYjgGtl/jCFQGIhoRUnAcLv3oTfu7sRfvAHDlE34fJQcTh6LTitf1MbdHBL77ricOyrWExoRQUIv3sTfu/uRvidRflSInp7ftMb1ta/oQMqJqJbxHvss84ypgKE370Jv3d3C/zgzL5nL/UR/h4pJqPJ+pE7rL2bzz6rOBS9uZKIVU7IfAMLDs0KvJgJv3sTfu/uBvjBF+b1MsSvCPgf23Ppua+uH3UFld8ce3N+OHLfiZFY7bAMQ5YyCiD87k34vTvo8IMrrOTLHP9bU8Jb/Wg+Un4odlUlGd2vhiSuTgKE370Jv3cHEX7wA45Q9nIiuj+XiO2uH8Wnmtq0JiKjgNuweQA7h5pVSjfhd2/C791BhB/8gKPcUPRzh4bO660fIQDKD/W+o5yM/gRBt3cRNakcTPjdm/B7d1DgByfgxd5kl4j+OD98/mX1TwZMezf1nSlzlA9JJXIIfrNnAwi/exN+7w4C/M49e5k6z+aHYx/cMzZ4Rv1TAdb0pqgpo4A7m20WIvzuTfi92+/wH1XPzQgnd0wNRY36X3eR8oneUTmrPYaGKCXrowDC796E37v9CD/6f0nds5fR8aP5ZGRH/a+6VPsTfeeWEtE/LiaiR/FsAEYDhN+dCb93+w1+9Hv0f2HhSCER/cTPhYv6X4RAM1esfmslEf1+bXR1TaD7hfr1iorwexPhX5okVo+i30v//9705t5/rn4dLqHTlJOR908PR+6rXX3hy+u/XTkRfm8i/O5VGxs8Q2J1nwzzf0/9Ktya3nLOa2oX9/y6+nHFRPi9ifC7F/o5+rv6kfKLCL83EX4q8CL83kT4qcCL8HsT4acCL8LvTYSfCrwIvzcRfirwIvzeRPipwIvwexPhpwIvwu9NhJ8KvAi/NxF+KvAi/N5E+KnAi/B7E+GnAi/C702Enwq8CL83EX4q8CL83kT4qcDL7/Aj+8v0cPQnqri+kpTvpyjfyWX2iwk/taj8Dj/e0VZIRA9ODUcuVkX2hXKbey8pSrlQvmbl9oMJP7Wo/A6/k9O9lIgeKyVif3rgksh5qugrouc29b5eyvFnUp7ji72bwQ8m/NSi8jv8MABzXuEk0D1ZHI5kVfE7qmIyMinf/xTK4fbVbCtpwk8tqunN0Zv8Dr9uvAPhmMyzy8noPQcv771AVaOten7oDW8sJ6L/89hI4zsY/Gy7XYd6P6aqQVELJVf+j9XGVmNe7fsrmWPntc1yFS6XEpEb9l28+hWqOi3VA2+L/UZpOHKjjDQq+D4vr2NfCaMd0Z5oV175qVNqZnh1TK6iX6jKFc3PK9cnGx0ci232VCAZ/fupzb1Dqkot0dRw77Ac9x9wfHxPUE6MMNqxIu1ZGI58YXrrmqiqEkU11+xwZFM5EXsoqJ29KmWWofkXf7U5ukpVyZOevSK6Wo7zpSCfDNGOU0ORzapKFHV64SWjpUTshqIMpwM5zMUoIBE9WBiOvU9VaUnKDcWukc8/j+MEaRqUF6O90G6lZOQP0Y6qShS1NB1M9F5QTMTuxsLa4QAtcAHWOSmvWg/4/kxi9VtVlRbVzPCqf1FJRr+PV0nh80Ea9WABEiMUmaLcM7vp/I2qShS1POGWmlxNAnNryzFGLOqdcEcLw9E/2XNF7LWqSgv0jPy+JP+Pv8PfB2mkg/ZQ7fJkLhHNqCpRVOt0IBk5T4aSn5J58LHjI8EaBeCtyACkkog+NpvoHVNVslUY7t0pV/t/sqcK6u3JzY7jN+MEhXYoJ6MvlJKxTz/7zujrVJUoqj2Sq8vvlhORH9bkConFtSAOjWeGIt+Y2Ry5fHYoegd+DtI9e8QbcX9RwC9KO+SSkYtU01BU+1W7oedlxWT02nIiNhXERTEAjxVx/Iufg1B2lNFZzETci0PRf3+DtINqEorqrA5tfv364nDsq1gM9POW1mbOC0jNfu9X40SFOMsJ4PbnE2/oV01AUSsrmQpsKSVij9TnzcGaCvjZiKNzz76SjP08NxzZqkJOUf4RXr0sV9Oby4loNUgr5n414odblTLEr8jU5KZHf4evtqZ8rvzm2JuLyci3j0vHxTCVo4ClGfFC3BC/4nDk24inCi1FBUP5odhVMgrYjyFrkJ4NWCkjPs49e7naP50f7r1ShZKigqepTa+L5Iain0Oyi2NyJWvW6em6ER+Z35/IS7yelripEFJUsJXfsuod5WT0x3g2wO9ZbzppxAHxQFxklPRAfvj8y1TIKKp7hE0m+eHof5ROnsNCVtButbXaqL+9oJeMzs4moh/aMzZ4hgoVRXWnnt0UNYvJ6J32k3UBezagVcYzEbDM8e+YGooaKjQUFQ4VEr1jlWT00fqzAd2/IIj6OXsM5Gr/aH5z76gKBUWFT/sTfeeWEtFPBG033VKNejm7C4vJ2H9GvVUIKCrcOhjgffSLGfVAfVCvaiL6Pbd5BSgqdJpN9P4bGRo/h6FxkDYLnWyU29mEI/U5UBqOvFdVkaKoUwm592R4/EVcMbEo2AwuvxvlRvmREPWZ4dUxVTWKotxodiiyWU4CD9v3wAPwbADK52zCKSViDyERqqoKRVFLFfLwF4ajNxZ9nEgU0DuJM+VkVSokIjf8oE3vD6Co0Gk20XuBXFXvxiOwfsu6g/LYj+YmYncd3MLEmRTVFqlEovswtF7JzUL4XmcTjvz7VIGJMymq/aonEo19WubVx4+vwIIgph524sxE7JiU41OPSXlU0SiK6oRyw5GLi4nYjzDX7kQiURy/njgTV/vID0tMnElRK6cbenpeVtYSiWKzTKtPAjgejovj43uKw9Fr8b2qCBRFraScRKJYfGt1IlF7A5Ict5SI3l5g4kyK8qeKiegW8R77Kr2MqQA+59yzl+M9UkxGk+orKIryq/ZuPvus4lD05koiVvGyWcjZhCND/IoM8W96dAsTZ1JUoITEl/nhyH0nRur57t2MAuqJM/Eij8i3p5g4k6KCLSQSrSRPnUgUP+P39QW96P5iIrZbfZSiqKBratOaiFzNb7MTiW5dmEgUP+P3SDR6aOi8XvURiqK6SfmhXiQS/Qnu1QN4/CtX+x8zcSZFhUC4R19I9l5THYk9kRuOvE/9mgqVenr+P+OvTjWo+kMRAAAAAElFTkSuQmCC</data>
+        <data key="type">image/png</data>
+        <data key="name" unique="prefix">magento-logo.png</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml
new file mode 100644
index 0000000000000..a2391dda54809
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="placeholderBaseImage" type="imageFile">
+        <data key="file">adobe-base.jpg</data>
+        <data key="name">adobe-base</data>
+        <data key="extension">jpg</data>
+    </entity>
+
+    <entity name="placeholderSmallImage" type="imageFile">
+        <data key="file">adobe-small.jpg</data>
+        <data key="name">adobe-small</data>
+        <data key="extension">jpg</data>
+    </entity>
+
+    <entity name="placeholderThumbnailImage" type="imageFile">
+        <data key="file">adobe-thumb.jpg</data>
+        <data key="name">adobe-thumb</data>
+        <data key="extension">jpg</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
new file mode 100644
index 0000000000000..b367cdcab9d8b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="productAttributeWysiwyg" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">textarea</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="backend_type">text</data>
+        <data key="is_wysiwyg_enabled">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+    <entity name="productAttributeWithTwoOptions" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">select</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+    <entity name="productDropDownAttribute" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">select</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+    <entity name="productAttributeWithDropdownTwoOptions" type="ProductAttribute">
+        <data key="attribute_code">testattribute</data>
+        <data key="frontend_input">select</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+    <entity name="productAttributeMultiselectTwoOptions" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">multiselect</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
new file mode 100644
index 0000000000000..98c9a70e6aad4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ApiProductAttributeMediaGalleryEntryTestImage" type="ProductAttributeMediaGalleryEntry">
+        <data key="media_type">image</data>
+        <data key="label" unique="suffix">Test Image </data>
+        <data key="position">1</data>
+        <array key="types">
+            <item>image</item>
+            <item>small_image</item>
+            <item>thumbnail</item>
+        </array>
+        <data key="disabled">false</data>
+        <requiredEntity type="ImageContent">TestImageContent</requiredEntity>
+    </entity>
+    <entity name="ApiProductAttributeMediaGalleryEntryMagentoLogo" type="ProductAttributeMediaGalleryEntry">
+        <data key="media_type">image</data>
+        <data key="label" unique="suffix">Magento Logo </data>
+        <data key="position">1</data>
+        <array key="types">
+            <item>small_image</item>
+        </array>
+        <data key="disabled">false</data>
+        <requiredEntity type="ImageContent">MagentoLogoImageContent</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
new file mode 100644
index 0000000000000..5be2a84f54555
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="productAttributeOption1" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">option1</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">0</data>
+        <requiredEntity type="StoreLabel">Option1Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option1Store1</requiredEntity>
+    </entity>
+    <entity name="productAttributeOption2" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">option2</data>
+        <data key="is_default">true</data>
+        <data key="sort_order">1</data>
+        <requiredEntity type="StoreLabel">Option2Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option2Store1</requiredEntity>
+    </entity>
+    <entity name="productAttributeOption3" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">option3</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">2</data>
+        <requiredEntity type="StoreLabel">Option3Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option3Store1</requiredEntity>
+    </entity>
+    <entity name="productAttributeOption4" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">option4</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option4Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option4Store1</requiredEntity>
+    </entity>
+    <entity name="productAttributeOption5" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">option5</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">4</data>
+        <requiredEntity type="StoreLabel">Option5Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option5Store1</requiredEntity>
+    </entity>
+    <entity name="productAttributeOption6" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">option6</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">5</data>
+        <requiredEntity type="StoreLabel">Option6Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option6Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeOptionGetter" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+    </entity>
+    <entity name="productAttributeOption" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">customOption</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">0</data>
+    </entity>
+    <entity name="ProductAttributeOption7" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">Green</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option7Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option8Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeOption8" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">Red</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option9Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option10Store1</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
new file mode 100644
index 0000000000000..68f51559a9f31
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="AddToDefaultSet" type="ProductAttributeSet">
+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="attributeSetId">4</data>
+        <data key="attributeGroupId">7</data>
+        <data key="sortOrder">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
new file mode 100644
index 0000000000000..23253ad6ad8f8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultProduct" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">testProductName</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleProduct" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleProductUpdateDescription" type="product2">
+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleProductUpdateName" type="product">
+        <data key="name" unique="suffix">Updated Api Simple Product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+    </entity>
+    <entity name="SimpleProduct" type="product">
+        <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">123.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <data key="urlKey" unique="suffix">simpleproduct</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProduct2" type="product">
+        <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">123.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
+    <entity name="SimpleProduct3" type="product">
+        <data key="sku" unique="suffix">simple</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">simple</data>
+        <data key="price">123.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <data key="urlKey" unique="suffix">simple</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProduct4" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">OutOfStockProduct</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">0</data>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="NewSimpleProduct" type="product">
+        <data key="price">321.00</data>
+    </entity>
+    <entity name="SimpleOne" type="product2">
+        <data key="sku" unique="suffix">SimpleOne</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">1.23</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleOne" type="product2">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleOneHidden" type="product2">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">1</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleTwo" type="product2">
+        <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product Two</data>
+        <data key="price">234.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleTwoHidden" type="product2">
+        <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">1</data>
+        <data key="name" unique="suffix">Api Simple Product Two</data>
+        <data key="price">234.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="VirtualProduct" type="product">
+        <data key="sku" unique="suffix">virtualproduct</data>
+        <data key="type_id">virtual</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="price">99.99</data>
+        <data key="quantity">250</data>
+        <data key="weight">0</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
+    <entity name="SimpleTwo" type="product2">
+        <data key="sku" unique="suffix">SimpleTwo</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">1.23</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductUrlKey</requiredEntity>
+    </entity>
+    <entity name="SetProductVisibilityHidden" type="product2">
+        <data key="visibility">1</data>
+    </entity>
+    <entity name="ProductImage" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-logo.png</data>
+        <data key="fileName">magento-logo</data>
+    </entity>
+    <entity name="MagentoLogo" type="image">
+        <data key="title" unique="suffix">MagentoLogo</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-logo.png</data>
+        <data key="filename">magento-logo</data>
+        <data key="file_extension">png</data>
+    </entity>
+    <entity name="TestImageNew" type="image">
+        <data key="title" unique="suffix">magento-again</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-again.jpg</data>
+        <data key="filename">magento-again</data>
+        <data key="file_extension">jpg</data>
+    </entity>
+    <entity name="ProductWithUnicode" type="product">
+        <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">&#38657;&#20135;&#21697;</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="productWithHTMLEntityOne" type="product">
+        <data key="sku" unique="suffix">SimpleOne&#8482;Product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">SimpleOne&#8482;Product</data>
+        <data key="price">50.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="productWithHTMLEntityTwo" type="product">
+        <data key="sku" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
+        <data key="price">50.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="defaultVirtualProduct" type="product">
+        <data key="sku" unique="suffix">virtualProduct</data>
+        <data key="type_id">virtual</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">virtualProduct</data>
+        <data key="price">12.34</data>
+        <data key="urlKey" unique="suffix">virtualproduct</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="weight">0</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="productWithDescription" type="product">
+        <data key="sku" unique="suffix">testProductWithDescriptionSku</data>
+        <data key="type_id">simple</data>
+        <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>
+    <entity name="ApiProductWithDescription" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
+    <entity name="_newDefaultProduct" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">testproductname</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProductWithCustomAttributeSet" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <var key="attribute_set_id" entityKey="attribute_set_id" entityType="CatalogAttributeSet"/>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">testProductName</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="weight">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="productWithOptions" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <data key="file">magento.jpg</data>
+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionDropDown</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionRadiobutton</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionCheckbox</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionMultiSelect</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionDate</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionDateTime</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionTime</requiredEntity>
+    </entity>
+    <entity name="productWithOptions2" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
+    </entity>
+    <entity name="ApiVirtualProductWithDescription" type="product">
+        <data key="sku" unique="suffix">api-virtual-product</data>
+        <data key="type_id">virtual</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Virtual Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-virtual-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
+    <entity name="SimpleProductWithNewFromDate" type="product">
+        <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">125.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <data key="urlKey" unique="suffix">simpleproduct</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductNewsFromDate</requiredEntity>
+    </entity>
+    <entity name="SimpleProductNameWithDoubleQuote" type="product">
+        <data key="name" unique="prefix">Double Quote"</data>
+        <data key="sku" unique="prefix">doubleQuote</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="price">10.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
+    <entity name="GetProduct" type="product">
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+    <entity name="GetProduct2" type="product2">
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="GetProduct3" type="product3">
+        <var key="sku" entityKey="sku" entityType="product3"/>
+    </entity>
+    <entity name="ApiSimplePrice1" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">1.00</data>
+    </entity>
+    <entity name="ApiSimplePrice100" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">100.00</data>
+    </entity>
+    <entity name="ApiSimplePrice10Qty10" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">10.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock10</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiSimplePrice100Qty100" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">100.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiSimplePrice100Qty100v2" type="product">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">100.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+    </entity>
+    <entity name="simpleProductForMassUpdate" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">massUpdateProductName</data>
+        <data key="keyword">massUpdateProductName</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">masstesturlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="simpleProductForMassUpdate2" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">massUpdateProductName</data>
+        <data key="keyword">massUpdateProductName</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">masstesturlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleSingleQty" type="product2">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="defaultSimpleProduct" type="product">
+        <data key="name" unique="suffix">Test </data>
+        <data key="sku" unique="suffix">testsku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="price">560.00</data>
+        <data key="urlKey" unique="suffix">testurl-</data>
+        <data key="status">1</data>
+        <data key="quantity">25</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+    </entity>
+    <entity name="ProductWithLongNameSku" extends="ApiSimpleProduct">
+        <data key="name" unique="suffix">Product With Long Name And Sku - But not too long</data>
+        <data key="sku" unique="suffix">Product With Long Name And Sku - But not too long</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
new file mode 100644
index 0000000000000..e9e9e43752365
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EavStockItem" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_1000</requiredEntity>
+    </entity>
+    <entity name="EavStock100" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_100</requiredEntity>
+    </entity>
+    <entity name="EavStock10" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_10</requiredEntity>
+    </entity>
+    <entity name="EavStock1" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_1</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
new file mode 100644
index 0000000000000..ea0bcafe56c48
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="PriceFilterRange" type="filter">
+        <data key="from">10</data>
+        <data key="to">100</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
new file mode 100644
index 0000000000000..ca5024920ad40
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductOptionField" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionField</data>
+        <data key="type">field</data>
+        <data key="is_require">true</data>
+        <data key="sort_order">1</data>
+        <data key="price">10</data>
+        <data key="price_type">fixed</data>
+        <data key="max_characters">0</data>
+    </entity>
+    <entity name="ProductOptionField2" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionField2</data>
+        <data key="type">field</data>
+        <data key="is_require">true</data>
+        <data key="sort_order">1</data>
+        <data key="price">20</data>
+        <data key="price_type">fixed</data>
+        <data key="max_characters">0</data>
+    </entity>
+    <entity name="ProductOptionArea" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionArea</data>
+        <data key="type">area</data>
+        <data key="is_require">true</data>
+        <data key="sort_order">2</data>
+        <data key="price">10</data>
+        <data key="price_type">percent</data>
+        <data key="max_characters">0</data>
+    </entity>
+    <entity name="ProductOptionFile" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionFile</data>
+        <data key="type">file</data>
+        <data key="is_require">true</data>
+        <data key="sort_order">3</data>
+        <data key="price">9.99</data>
+        <data key="price_type">fixed</data>
+        <data key="file_extension">png, jpg, gif</data>
+        <data key="image_size_x">0</data>
+        <data key="image_size_y">0</data>
+    </entity>
+    <entity name="ProductOptionDropDown" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionDropDown</data>
+        <data key="type">drop_down</data>
+        <data key="sort_order">4</data>
+        <data key="is_require">true</data>
+        <requiredEntity type="product_option_value">ProductOptionValueDropdown1</requiredEntity>
+        <requiredEntity type="product_option_value">ProductOptionValueDropdown2</requiredEntity>
+    </entity>
+    <entity name="ProductOptionDropDownWithLongValuesTitle" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionDropDownWithLongTitles</data>
+        <data key="type">drop_down</data>
+        <data key="sort_order">4</data>
+        <data key="is_require">true</data>
+        <requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle1</requiredEntity>
+        <requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle2</requiredEntity>
+    </entity>
+    <entity name="ProductOptionRadiobutton" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionRadioButtons</data>
+        <data key="type">radio</data>
+        <data key="sort_order">5</data>
+        <data key="is_require">true</data>
+        <requiredEntity type="product_option_value">ProductOptionValueRadioButtons1</requiredEntity>
+        <requiredEntity type="product_option_value">ProductOptionValueRadioButtons2</requiredEntity>
+    </entity>
+    <entity name="ProductOptionCheckbox" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionCheckbox</data>
+        <data key="type">checkbox</data>
+        <data key="sort_order">6</data>
+        <data key="is_require">true</data>
+        <requiredEntity type="product_option_value">ProductOptionValueCheckbox</requiredEntity>
+    </entity>
+    <entity name="ProductOptionMultiSelect" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionMultiSelect</data>
+        <data key="type">multiple</data>
+        <data key="sort_order">7</data>
+        <data key="is_require">true</data>
+        <requiredEntity type="product_option_value">ProductOptionValueMultiSelect1</requiredEntity>
+        <requiredEntity type="product_option_value">ProductOptionValueMultiSelect2</requiredEntity>
+    </entity>
+    <entity name="ProductOptionDate" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionDate</data>
+        <data key="type">date</data>
+        <data key="sort_order">8</data>
+        <data key="is_require">true</data>
+        <data key="price">1234</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionDateTime" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionDateTime</data>
+        <data key="type">date_time</data>
+        <data key="sort_order">9</data>
+        <data key="is_require">true</data>
+        <data key="price">0.00</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionTime" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionTime</data>
+        <data key="type">time</data>
+        <data key="sort_order">10</data>
+        <data key="is_require">true</data>
+        <data key="price">0.00</data>
+        <data key="price_type">percent</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
new file mode 100644
index 0000000000000..d16a201cd9ecc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductOptionValueDropdown1" type="product_option_value">
+        <data key="title">OptionValueDropDown1</data>
+        <data key="sort_order">1</data>
+        <data key="price">0.01</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionValueDropdown2" type="product_option_value">
+        <data key="title">OptionValueDropDown2</data>
+        <data key="sort_order">2</data>
+        <data key="price">0.01</data>
+        <data key="price_type">percent</data>
+    </entity>
+    <entity name="ProductOptionValueRadioButtons1" type="product_option_value">
+        <data key="title">OptionValueRadioButtons1</data>
+        <data key="sort_order">1</data>
+        <data key="price">99.99</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionValueRadioButtons2" type="product_option_value">
+        <data key="title">OptionValueRadioButtons2</data>
+        <data key="sort_order">2</data>
+        <data key="price">99.99</data>
+        <data key="price_type">percent</data>
+    </entity>
+    <entity name="ProductOptionValueCheckbox" type="product_option_value">
+        <data key="title">OptionValueCheckbox</data>
+        <data key="sort_order">1</data>
+        <data key="price">123</data>
+        <data key="price_type">percent</data>
+    </entity>
+    <entity name="ProductOptionValueMultiSelect1" type="product_option_value">
+        <data key="title">OptionValueMultiSelect1</data>
+        <data key="sort_order">1</data>
+        <data key="price">1</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionValueMultiSelect2" type="product_option_value">
+        <data key="title">OptionValueMultiSelect2</data>
+        <data key="sort_order">2</data>
+        <data key="price">2</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionValueDropdownLongTitle1" type="product_option_value">
+        <data key="title">Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111</data>
+        <data key="sort_order">1</data>
+        <data key="price">10</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionValueDropdownLongTitle2" type="product_option_value">
+        <data key="title">Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj22222Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj22222</data>
+        <data key="sort_order">2</data>
+        <data key="price">20</data>
+        <data key="price_type">percent</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
new file mode 100644
index 0000000000000..7cba4c3c76fe9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Qty_1000" type="stock_item">
+        <data key="qty">1000</data>
+        <data key="is_in_stock">true</data>
+    </entity>
+    <entity name="Qty_100" type="stock_item">
+        <data key="qty">100</data>
+        <data key="is_in_stock">true</data>
+    </entity>
+    <entity name="Qty_10" type="stock_item">
+        <data key="qty">10</data>
+        <data key="is_in_stock">true</data>
+    </entity>
+    <entity name="Qty_99" type="stock_item">
+        <data key="qty">99</data>
+        <data key="is_in_stock">true</data>
+    </entity>
+    <entity name="Qty_101" type="stock_item">
+        <data key="qty">101</data>
+        <data key="is_in_stock">true</data>
+    </entity>
+    <entity name="Qty_1" type="stock_item">
+        <data key="qty">1</data>
+        <data key="is_in_stock">true</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
new file mode 100644
index 0000000000000..0e51995ac72e8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Option1Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">option1</data>
+    </entity>
+    <entity name="Option1Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">option1</data>
+    </entity>
+    <entity name="Option2Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">option2</data>
+    </entity>
+    <entity name="Option2Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">option2</data>
+    </entity>
+    <entity name="Option3Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">option3</data>
+    </entity>
+    <entity name="Option3Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">option3</data>
+    </entity>
+    <entity name="Option4Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">option4</data>
+    </entity>
+    <entity name="Option4Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">option4</data>
+    </entity>
+    <entity name="Option5Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">option5</data>
+    </entity>
+    <entity name="Option5Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">option5</data>
+    </entity>
+    <entity name="Option6Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">option6</data>
+    </entity>
+    <entity name="Option6Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">option6</data>
+    </entity>
+    <entity name="Option7Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">Green</data>
+    </entity>
+    <entity name="Option8Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">Green</data>
+    </entity>
+    <entity name="Option9Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">Red</data>
+    </entity>
+    <entity name="Option10Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">Red</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
new file mode 100644
index 0000000000000..0aec1244d2650
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="testDataTierPrice" type="data">
+        <data key="goldenPrice1">$676.50</data>
+        <data key="goldenPrice2">$615.00</data>
+    </entity>
+    <entity name="customStoreTierPrice" type="data">
+        <data key="name">secondStore</data>
+        <data key="code">second_store</data>
+    </entity>
+    <entity name="customStoreView" type="data">
+        <data key="name">secondStoreView</data>
+        <data key="code">second_store_view</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE.txt b/app/code/Magento/Catalog/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE.txt
rename to app/code/Magento/Catalog/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE_AFL.txt b/app/code/Magento/Catalog/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE_AFL.txt
rename to app/code/Magento/Catalog/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
new file mode 100644
index 0000000000000..9ef7b507812a0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="AddCatalogAttributeToAttributeSet" dataType="CatalogAttributeSet" type="create" auth="adminOauth" url="/V1/products/attribute-sets" method="POST">
+        <contentType>application/json</contentType>
+        <object key="attributeSet" dataType="CatalogAttributeSet">
+            <field key="attribute_set_name">string</field>
+            <field key="sort_order">integer</field>
+        </object>
+        <field key="skeletonId">integer</field>
+    </operation>
+    <operation name="DeleteCatalogAttributeFromAttributeSet" dataType="CatalogAttributeSet" type="delete" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="GetCatalogAttributesFromDefaultSet" dataType="CatalogAttributeSet" type="get" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
new file mode 100644
index 0000000000000..b1f2b43220b36
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogStorefrontConfiguration" dataType="catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_storefront_config">
+            <object key="frontend" dataType="catalog_storefront_config">
+                <object key="fields" dataType="catalog_storefront_config">
+                    <object key="list_mode" dataType="list_mode">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="grid_per_page_values" dataType="grid_per_page_values">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="grid_per_page" dataType="grid_per_page">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_per_page_values" dataType="list_per_page_values">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_per_page" dataType="list_per_page">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="default_sort_by" dataType="default_sort_by">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_allow_all" dataType="list_allow_all">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="remember_pagination" dataType="remember_pagination">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_category" dataType="flat_catalog_category">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="swatches_per_product" dataType="swatches_per_product">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="show_swatches_in_product_list" dataType="show_swatches_in_product_list">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DefaultCatalogStorefrontConfiguration" dataType="default_catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="default_catalog_storefront_config">
+            <object key="frontend" dataType="default_catalog_storefront_config">
+                <object key="fields" dataType="default_catalog_storefront_config">
+                    <object key="list_mode" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grid_per_page_values" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grid_per_page" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_per_page_values" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_per_page" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="default_sort_by" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="remember_pagination" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="flat_catalog_category" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="swatches_per_product" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="show_swatches_in_product_list" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_allow_all" dataType="list_allow_all">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
new file mode 100644
index 0000000000000..e16688ba0d37b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogPriceConfigState" dataType="catalog_price_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_price_config_state">
+            <object key="price" dataType="catalog_price_config_state">
+                <object key="fields" dataType="catalog_price_config_state">
+                    <object key="scope" dataType="scope">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="default_product_price" dataType="default_product_price">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
index d22c2bc1f7738..ae491aefc10cf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
@@ -5,8 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCategory" dataType="category" type="create" auth="adminOauth" url="/V1/categories" method="POST">
         <contentType>application/json</contentType>
         <object key="category" dataType="category">
@@ -57,4 +57,4 @@
     <operation name="DeleteCategory" dataType="category" type="delete" auth="adminOauth" url="/V1/categories/{id}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
-</config>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/custom_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/custom_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
index f3312bb08c3c3..a37bb36eb6597 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/custom_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCustomAttribute" dataType="custom_attribute" type="create">
         <field key="attribute_code">string</field>
         <field key="value">string</field>
@@ -22,4 +22,4 @@
         <field key="attribute_code">string</field>
         <field key="value">string</field>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
new file mode 100644
index 0000000000000..7faac6c3b6d3d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="create">
+    </operation>
+    <operation name="UpdateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="update">
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
new file mode 100644
index 0000000000000..063b8c2e5ac63
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateFrontendLabel" dataType="FrontendLabel" type="create">
+        <field key="store_id">integer</field>
+        <field key="label">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml
new file mode 100644
index 0000000000000..8b12a2fbbbc5d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateImageContent" dataType="ImageContent" type="create">
+        <field key="base64_encoded_data" required="true">string</field>
+        <field key="type" required="true">string</field>
+        <field key="name" required="true">string</field>
+    </operation>
+    <operation name="UpdateImageContent" dataType="ImageContent" type="update">
+        <field key="base64_encoded_data" required="true">string</field>
+        <field key="type" required="true">string</field>
+        <field key="name" required="true">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
new file mode 100644
index 0000000000000..9ece47c01fca3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProduct" dataType="product" type="create" auth="adminOauth" url="/V1/products" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="product" key="product">
+            <field key="sku">string</field>
+            <field key="name">string</field>
+            <field key="attribute_set_id">integer</field>
+            <field key="price">number</field>
+            <field key="status">integer</field>
+            <field key="visibility">integer</field>
+            <field key="type_id">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="weight">integer</field>
+            <field key="extension_attributes">product_extension_attribute</field>
+            <array key="product_links">
+                <value>product_link</value>
+            </array>
+            <array key="custom_attributes">
+                <value>custom_attribute_array</value>
+            </array>
+            <array key="options">
+                <value>product_option</value>
+            </array>
+        </object>
+    </operation>
+    <operation name="UpdateProduct" dataType="product" type="update" auth="adminOauth" url="/V1/products/{sku}" method="PUT">
+        <contentType>application/json</contentType>
+        <object dataType="product" key="product">
+            <field key="id">integer</field>
+            <field key="sku">string</field>
+            <field key="name">string</field>
+            <field key="attribute_set_id">integer</field>
+            <field key="price">number</field>
+            <field key="status">integer</field>
+            <field key="visibility">integer</field>
+            <field key="type_id">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="weight">integer</field>
+            <field key="extension_attributes">product_extension_attribute</field>
+            <array key="product_links">
+                <value>product_link</value>
+            </array>
+            <array key="custom_attributes">
+                <value>custom_attribute_array</value>
+            </array>
+            <array key="options">
+                <value>product_option</value>
+            </array>
+        </object>
+        <field key="saveOptions">boolean</field>
+    </operation>
+    <operation name="DeleteProduct" dataType="product" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="GetProduct" dataType="product" type="get" auth="adminOauth" url="/V1/products/{sku}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="CreateProduct2" dataType="product2" type="create" auth="adminOauth" url="/V1/products" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="product2" key="product">
+            <field key="sku">string</field>
+            <field key="name">string</field>
+            <field key="attribute_set_id">integer</field>
+            <field key="price">number</field>
+            <field key="status">integer</field>
+            <field key="visibility">integer</field>
+            <field key="type_id">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="weight">integer</field>
+            <field key="extension_attributes">product_extension_attribute</field>
+            <array key="product_links">
+                <value>product_link</value>
+            </array>
+            <array key="custom_attributes">
+                <value>custom_attribute</value>
+            </array>
+            <array key="options">
+                <value>product_option</value>
+            </array>
+        </object>
+    </operation>
+    <operation name="UpdateProduct2" dataType="product2" type="update" auth="adminOauth" url="/V1/products/{sku}" method="PUT">
+        <contentType>application/json</contentType>
+        <object dataType="product2" key="product">
+            <field key="id">integer</field>
+            <field key="sku">string</field>
+            <field key="name">string</field>
+            <field key="attribute_set_id">integer</field>
+            <field key="price">number</field>
+            <field key="status">integer</field>
+            <field key="visibility">integer</field>
+            <field key="type_id">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="weight">integer</field>
+            <field key="extension_attributes">product_extension_attribute</field>
+            <array key="product_links">
+                <value>product_link</value>
+            </array>
+            <array key="custom_attributes">
+                <value>custom_attribute</value>
+            </array>
+            <array key="options">
+                <value>product_option</value>
+            </array>
+        </object>
+        <field key="saveOptions">boolean</field>
+    </operation>
+    <operation name="DeleteProduct2" dataType="product2" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="GetProduct2" dataType="product2" type="get" auth="adminOauth" url="/V1/products/{sku}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+    <!-- Data type product3 is to work around MQE-1035 -->
+    <operation name="CreateProduct3" dataType="product3" type="create" auth="adminOauth" url="/V1/products" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="product3" key="product">
+            <field key="sku">string</field>
+            <field key="name">string</field>
+            <field key="attribute_set_id">integer</field>
+            <field key="price">number</field>
+            <field key="status">integer</field>
+            <field key="visibility">integer</field>
+            <field key="type_id">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="weight">integer</field>
+            <field key="extension_attributes">product_extension_attribute</field>
+            <array key="product_links">
+                <value>product_link</value>
+            </array>
+            <array key="custom_attributes">
+                <value>custom_attribute_array</value>
+            </array>
+            <array key="options">
+                <value>product_option</value>
+            </array>
+        </object>
+    </operation>
+    <!-- Data type product3 is to work around MQE-1035 -->
+    <operation name="DeleteProduct3" dataType="product3" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="GetProduct3" dataType="product3" type="get" auth="adminOauth" url="/V1/products/{sku}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
index 3a2bfb76d067c..1e9aa3bc219e9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductAttribute" dataType="ProductAttribute" type="create" auth="adminOauth" url="/V1/products/attributes" method="POST">
         <contentType>application/json</contentType>
         <object dataType="ProductAttribute" key="attribute">
@@ -112,4 +112,4 @@
     <operation name="DeleteProductAttribute" dataType="ProductAttribute" type="delete" auth="adminOauth" url="/V1/products/attributes/{attribute_code}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
new file mode 100644
index 0000000000000..521e864702e57
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="create" auth="adminOauth" url="/V1/products/{sku}/media" method="POST">
+        <contentType>application/json</contentType>
+        <object key="entry" dataType="ProductAttributeMediaGalleryEntry">
+            <field key="id">integer</field>
+            <field key="media_type" required="true">string</field>
+            <field key="label" required="true">string</field>
+            <field key="position" required="true">integer</field>
+            <field key="disabled" required="true">boolean</field>
+            <array key="types">
+                <value>string</value>
+            </array>
+            <field key="file">string</field>
+            <field key="content">ImageContent</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+    <operation name="UpdateProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="update" auth="adminOauth" url="/V1/products/{sku}/media/{id}" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="entry" dataType="ProductAttributeMediaGalleryEntry">
+            <field key="id" required="true">integer</field>
+            <field key="media_type" required="true">string</field>
+            <field key="label" required="true">string</field>
+            <field key="position" required="true">integer</field>
+            <field key="disabled" required="true">boolean</field>
+            <array key="types">
+                <value>string</value>
+            </array>
+            <field key="file">string</field>
+            <field key="content">ImageContent</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+    <operation name="DeleteProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="delete" auth="adminOauth" url="/V1/products/{sku}/media/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_option-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
index 81fbc4d313e79..467ff9a48eb77 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_option-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductAttributeOption" dataType="ProductAttributeOption" type="create" auth="adminOauth" url="/V1/products/attributes/{attribute_code}/options" method="POST">
         <contentType>application/json</contentType>
         <object dataType="ProductAttributeOption" key="option">
@@ -26,4 +26,4 @@
     <operation name="GetProductAttributeOption" dataType="ProductAttributeOption" type="get" auth="adminOauth" url="/V1/products/attributes/{attribute_code}/options/" method="GET">
         <contentType>application/json</contentType>
     </operation>
-</config>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
index dde27a54a4a3e..6f04c48e79254 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="AddProductAttributeToAttributeSet" dataType="ProductAttributeSet" type="create" auth="adminOauth" url="/V1/products/attribute-sets/attributes" method="POST">
         <contentType>application/json</contentType>
         <field key="attributeSetId">integer</field>
@@ -24,4 +24,4 @@
     <operation name="GetDefaultProductAttributeSetInfo" dataType="DefaultProductAttributeSetInfo" type="get" auth="adminOauth" url="/V1/products/attribute-sets/4" method="GET">
         <contentType>application/json</contentType>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
new file mode 100644
index 0000000000000..127a754c88808
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductExtensionAttribute" dataType="product_extension_attribute" type="create">
+        <field key="stock_item">stock_item</field>
+    </operation>
+    <operation name="UpdateProductExtensionAttribute" dataType="product_extension_attribute" type="update">
+        <field key="stock_item">stock_item</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
new file mode 100644
index 0000000000000..a2fcbb1417d6f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductLink" dataType="product_link" type="create">
+        <field key="sku">string</field>
+        <field key="link_type">string</field>
+        <field key="linked_product_sku">string</field>
+        <field key="linked_product_type">string</field>
+        <field key="position">integer</field>
+        <object key="extension_attributes" dataType="product_link_extension_attribute">
+            <field key="qty">integer</field>
+        </object>
+    </operation>
+    <operation name="UpdateProductLink" dataType="product_link" type="update">
+        <field key="sku">string</field>
+        <field key="link_type">string</field>
+        <field key="linked_product_sku">string</field>
+        <field key="linked_product_type">string</field>
+        <field key="position">integer</field>
+        <object key="extension_attributes" dataType="product_link_extension_attribute">
+            <field key="qty">integer</field>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
new file mode 100644
index 0000000000000..90888463ef8a2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductLinkExtensionAttribute" dataType="product_link_extension_attribute" type="create">
+        <contentType>application/json</contentType>
+        <field key="qty">integer</field>
+    </operation>
+    <operation name="UpdateProductLinkExtensionAttribute" dataType="product_link_extension_attribute" type="update">
+        <contentType>application/json</contentType>
+        <field key="qty">integer</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
new file mode 100644
index 0000000000000..450ea99b9d016
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductLinks" dataType="product_links" type="create" auth="adminOauth" url="/V1/products/{sku}/links" method="POST">
+        <contentType>application/json</contentType>
+        <array key="items">
+            <value>product_link</value>
+        </array>
+    </operation>
+    <operation name="UpdateProductLinks" dataType="product_links" type="update" auth="adminOauth" url="/V1/products/{sku}/links" method="PUT">
+        <contentType>application/json</contentType>
+        <field key="entity">product_link</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
index a6f2d2a8f5ab1..6464c2988ad25 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductOption" dataType="product_option" type="create">
         <field key="product_sku">string</field>
         <field key="option_id">integer</field>
@@ -15,7 +15,7 @@
         <field key="type">string</field>
         <field key="sort_order">integer</field>
         <field key="is_require">boolean</field>
-        <field key="price">integer</field>
+        <field key="price">number</field>
         <field key="price_type">string</field>
         <field key="sku">string</field>
         <field key="file_extension">string</field>
@@ -33,7 +33,7 @@
         <field key="type">string</field>
         <field key="sort_order">integer</field>
         <field key="is_require">boolean</field>
-        <field key="price">integer</field>
+        <field key="price">number</field>
         <field key="price_type">string</field>
         <field key="sku">string</field>
         <field key="file_extension">string</field>
@@ -44,4 +44,4 @@
             <value>product_option_value</value>
         </array>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
new file mode 100644
index 0000000000000..bce77bc3a2612
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductOptionValue" dataType="product_option_value" type="create">
+        <field key="title">string</field>
+        <field key="sort_order">integer</field>
+        <field key="price">number</field>
+        <field key="price_type">string</field>
+        <field key="sku">string</field>
+        <field key="option_type_id">integer</field>
+    </operation>
+    <operation name="UpdateProductOptionValue" dataType="product_option_value" type="update">
+        <field key="title">string</field>
+        <field key="sort_order">integer</field>
+        <field key="price">number</field>
+        <field key="price_type">string</field>
+        <field key="sku">string</field>
+        <field key="option_type_id">integer</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
new file mode 100644
index 0000000000000..6ec5f2c8051ea
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateStockItem" dataType="stock_item" type="create">
+        <field key="qty">integer</field>
+        <field key="is_in_stock">boolean</field>
+    </operation>
+    <operation name="UpdateStockItem" dataType="stock_item" type="update">
+        <field key="qty">integer</field>
+        <field key="is_in_stock">boolean</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
new file mode 100644
index 0000000000000..584ba5eebb551
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateStoreLabel" dataType="StoreLabel" type="create">
+        <field key="store_id">integer</field>
+        <field key="label">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
new file mode 100644
index 0000000000000..aa120491ece5d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateValidationRule" dataType="validation_rule" type="create">
+        <field key="key">string</field>
+        <field key="value">string</field>
+    </operation>
+    <operation name="UpdateValidationRule" dataType="validation_rule" type="update">
+        <field key="key">string</field>
+        <field key="value">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
new file mode 100644
index 0000000000000..e1c8e5c75e9ac
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCategoryEditPage" url="catalog/category/edit/id/{{categoryId}}/" area="admin" module="Catalog" parameterized="true">
+        <section name="AdminCategorySidebarActionSection"/>
+        <section name="AdminCategoryMainActionsSection"/>
+        <section name="AdminCategorySidebarTreeSection"/>
+        <section name="AdminCategoryBasicFieldSection"/>
+        <section name="AdminCategorySEOSection"/>
+        <section name="AdminCategoryProductsSection"/>
+        <section name="AdminCategoryProductsGridSection"/>
+        <section name="AdminCategoryModalSection"/>
+        <section name="AdminCategoryMessagesSection"/>
+        <section name="AdminCategoryContentSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
new file mode 100644
index 0000000000000..f7d8abf8b2fea
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Magento_Catalog">
+        <section name="AdminCategorySidebarActionSection"/>
+        <section name="AdminCategoryMainActionsSection"/>
+        <section name="AdminCategorySidebarTreeSection"/>
+        <section name="AdminCategoryBasicFieldSection"/>
+        <section name="AdminCategorySEOSection"/>
+        <section name="AdminCategoryProductsSection"/>
+        <section name="AdminCategoryProductsGridSection"/>
+        <section name="AdminCategoryModalSection"/>
+        <section name="AdminCategoryMessagesSection"/>
+        <section name="AdminCategoryContentSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
new file mode 100644
index 0000000000000..fab87f90f86dd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ProductAttributePage" url="catalog/product_attribute/new/" area="admin" module="Catalog">
+        <section name="AdminCreateProductAttributeSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
new file mode 100644
index 0000000000000..e6aafa53601a6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductAttributeGridPage" url="catalog/product_attribute" area="admin" module="Catalog">
+        <section name="AdminProductAttributeGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
new file mode 100644
index 0000000000000..3e89cbc8262ce
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductAttributeSetEditPage" url="catalog/product_set/edit/id" area="admin" module="Catalog">
+        <section name="AdminProductAttributeSetEditSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
new file mode 100644
index 0000000000000..d55e71adca24b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductAttributeSetGridPage" url="catalog/product_set/" area="admin" module="ProductAttributeSet">
+        <section name="AdminProductAttributeSetGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
new file mode 100644
index 0000000000000..66475a93b75b1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ProductAttributesEditPage" url="catalog/product_action_attribute/edit/" area="admin" module="Catalog">
+        <section name="AdminEditProductAttributesSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..b3ed3f478f810
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminProductFormSection"/>
+        <section name="AdminProductFormActionSection"/>
+        <section name="AdminProductSEOSection"/>
+        <section name="AdminProductImagesSection"/>
+        <section name="AdminAddProductsToOptionPanel"/>
+        <section name="AdminProductMessagesSection"/>
+        <section name="AdminProductFormRelatedUpSellCrossSellSection"/>
+        <section name="AdminProductFormAdvancedPricingSection"/>
+        <section name="AdminProductFormAdvancedInventorySection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
new file mode 100644
index 0000000000000..c9debf8bf3b3d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductEditPage" url="catalog/product/edit/id/{{productId}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <!-- This page object only exists for the url. Use the AdminProductCreatePage for selectors. -->
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
new file mode 100644
index 0000000000000..a6edf06f2c1b7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductIndexPage" url="catalog/product/index" area="admin" module="Magento_Catalog">
+        <section name="AdminProductGridActionSection" />
+        <section name="AdminProductGridFilterSection" />
+        <section name="AdminProductGridPaginationSection"/>
+        <section name="AdminProductGridSection" />
+        <section name="AdminMessagesSection" />
+        <section name="AdminProductFiltersSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
new file mode 100644
index 0000000000000..012aeaaf14e70
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  /**
+   * Copyright © Magento, Inc. All rights reserved.
+   * See COPYING.txt for license details.
+   */
+ -->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ProductCatalogPage" url="/catalog/product/" area="admin" module="Magento_Catalog">
+        <section name="ProductCatalogPageSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
new file mode 100644
index 0000000000000..469c153d38b88
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
+        <section name="StorefrontCategoryMainSection"/>
+        <section name="WYSIWYGToolbarSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
new file mode 100644
index 0000000000000..5451d92022496
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontProductComparePage" url="catalog/product_compare/index" module="Magento_Catalog" area="storefront">
+        <section name="StorefrontProductCompareMainSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
new file mode 100644
index 0000000000000..75e3210cad7d4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
+        <section name="StorefrontProductInfoMainSection" />
+        <section name="StorefrontProductInfoDetailsSection" />
+        <section name="WYSIWYGToolbarSection"/>
+        <section name="StorefrontProductImageSection" />
+        <section name="StorefrontMessagesSection" />
+        <section name="StorefrontProductRelatedProductsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/README.md b/app/code/Magento/Catalog/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e7a95609c394b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Functional Tests
+
+The Functional Test Module for **Magento Catalog** module.
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
new file mode 100644
index 0000000000000..069a8b28698d1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminAddProductsToOptionPanel">
+        <element name="addSelectedProducts" type="button" selector=".product_form_product_form_bundle-items_modal button.action-primary" timeout="30"/>
+        <element name="filters" type="button" selector=".product_form_product_form_bundle-items_modal button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="applyFilters" type="button" selector=".product_form_product_form_bundle-items_modal [data-action='grid-filter-apply']" timeout="30"/>
+        <element name="nameFilter" type="input" selector=".product_form_product_form_bundle-items_modal input[name='name']"/>
+        <element name="firstCheckbox" type="input" selector="//tr[1]//input[@data-action='select-row']"/>
+        <element name="nthCheckbox" type="input" selector="//tr[{{var}}]//input[@data-action='select-row']" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
new file mode 100644
index 0000000000000..651ee54c08339
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryBasicFieldSection">
+        <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
+        <element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
+        <element name="includeInMenuUseDefault" type="checkbox" selector="input[name='use_default[include_in_menu]']"/>
+        <element name="EnableCategory" type="checkbox" selector="input[name='is_active']"/>
+        <element name="enableCategoryLabel" type="text" selector="input[name='is_active']+label"/>
+        <element name="enableUseDefault" type="checkbox" selector="input[name='use_default[is_active]']"/>
+        <element name="CategoryNameInput" type="input" selector="input[name='name']"/>
+        <element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="RequiredFieldIndicatorColor" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('color');"/>
+        <element name="categoryNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
+        <element name="ContentTab" type="input" selector="input[name='name']"/>
+        <element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
+        <element name="panelFieldControl" type="input" selector='//aside//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}"]' parameterized="true"/>
+        <element name="productsInCategory" type="input" selector="div[data-index='assign_products']"/>
+    </section>
+    <section name="CategoryContentSection">
+        <element name="SelectFromGalleryBtn" type="button" selector="//label[text()='Select from Gallery']"/>
+        <element name="ImagePlaceHolder" type="button" selector=".file-uploader-summary.product-image-wrapper"/>
+        <element name="Upload" type="button" selector=".file-uploader-area input"/>
+    </section>
+    <section name="CategoryDesignSection">
+        <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>
+        <element name="LayoutDropdown" type="select" selector="select[name='page_layout']"/>
+    </section>
+    <section name="CategoryDisplaySettingsSection">
+        <element name="DisplaySettingTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Display Settings']"/>
+        <element name="layeredNavigationPriceInput" type="input" selector="input[name='filter_price_range']"/>
+        <element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
+        <element name="filterPriceRangeUseConfig" type="checkbox" selector="input[name='use_config[filter_price_range]']"/>
+        <element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index={{arg1}}]&gt;.admin__field-label span'), ':after').getPropertyValue('content');" parameterized="true"/>
+        <element name="displayMode" type="button" selector="select[name='display_mode']"/>
+        <element name="anchor" type="checkbox" selector="input[name='is_anchor']"/>
+        <element name="productListCheckBox" type="checkbox" selector="input[name='use_config[available_sort_by]']" />
+        <element name="productList" type="text" selector="select[name='available_sort_by']"/>
+        <element name="defaultProductLisCheckBox" type="checkbox" selector="input[name='use_config[default_sort_by]']"/>
+        <element name="defaultProductList" type="text" selector="select[name='default_sort_by']"/>
+        <element name="layeredNavigationPriceCheckBox" type="checkbox" selector="input[name='use_config[filter_price_range]']"/>
+    </section>
+    <section name="CatalogWYSIWYGSection">
+        <element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>
+        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by"/>
+        <element name="Style" type="button" selector=".mce-txt" />
+        <element name="Bold" type="button" selector=".mce-i-bold" />
+        <element name="Italic" type="button" selector=".mce-i-italic" />
+        <element name="Underline" type="button" selector=".mce-i-underline" />
+        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
+        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
+        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
+        <element name="Bullet" type="button" selector=".mce-i-bullist" />
+        <element name="Numlist" type="button" selector=".mce-i-numlist" />
+        <element name="InsertLink" type="button" selector=".mce-i-link" />
+        <element name="InsertImage" type="button" selector=".mce-i-image" />
+        <element name="InsertTable" type="button" selector=".mce-i-table" />
+        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap"/>
+        <element name="InsertImageIcon" type="button" selector=".mce-i-image"/>
+        <element name="Browse" type="button" selector=".mce-i-browse"/>
+        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
+        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
+        <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
+        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
+        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
+        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
+        <element name="UploadImage" type="file" selector=".fileupload" />
+        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
+        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="CreateFolder" type="button" selector="#new_folder" />
+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
+        <element name="CancelBtn" type="button" selector="#cancel" />
+        <element name="FolderName" type="button" selector="input[data-role='promptField']" />
+        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
+        <element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
+        <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
+        <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
new file mode 100644
index 0000000000000..e3d224904671b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryContentSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
+        <element name="uploadButton" type="button" selector="//*[@class='file-uploader-area']/label[text()='Upload']"/>
+        <element name="selectFromGalleryButton" type="button" selector="//*[@class='file-uploader-area']/label[text()='Select from Gallery']"/>
+        <element name="uploadImageFile" type="input" selector=".file-uploader-area>input"/>
+        <element name="imageFileName" type="text" selector=".file-uploader-filename"/>
+        <element name="removeImageButton" type="button" selector=".file-uploader-summary .action-remove"/>
+        <element name="AddCMSBlock" type="select" selector="//*[@name='landing_page']"/>
+        <element name="description" type="input" selector="//*[@name='description']"/>
+        <element name="content" type="button" selector="div[data-index='content'"/>
+        <element name="categoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'no-active-category')]" parameterized="true" />
+        <element name="categoryPageTitle" type="text" selector="h1.page-title" />
+        <element name="activeCategoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'active-category')]" parameterized="true" />
+        <element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
+        <element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
+        <element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml
new file mode 100644
index 0000000000000..daa00eb0a27b7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryDisplaySettingsSection">
+        <element name="settingsHeader" type="button" selector="//*[contains(text(),'Display Settings')]" timeout="30"/>
+        <element name="displayMode" type="button" selector="//*[@name='display_mode']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
new file mode 100644
index 0000000000000..009110a729bde
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryMainActionsSection">
+        <element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
+        <element name="DeleteButton" type="button" selector=".page-actions-inner #delete" timeout="30"/>
+        <element name="CategoryStoreViewDropdownToggle" type="button" selector="#store-change-button"/>
+        <element name="CategoryStoreViewOption" type="button" selector="//div[contains(@class, 'store-switcher')]//a[normalize-space()='{{store}}']" parameterized="true"/>
+        <element name="CategoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
new file mode 100644
index 0000000000000..fee86ca1caa29
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryMessagesSection">
+        <element name="SuccessMessage" type="text" selector=".message-success"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
new file mode 100644
index 0000000000000..85b8dc894a139
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryModalSection">
+        <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-secondary"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
new file mode 100644
index 0000000000000..a449836fa08f4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryProductsGridSection">
+        <element name="rowProductId" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-id" parameterized="true"/>
+        <element name="rowProductName" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-name" parameterized="true"/>
+        <element name="rowProductSku" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-sku" parameterized="true"/>
+        <element name="rowPrice" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-price" parameterized="true"/>
+        <element name="rowPosition" type="input" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-position .position input" timeout="30" parameterized="true"/>
+        <element name="productGridNameProduct" type="text" selector="//table[@id='catalog_category_products_table']//td[contains(., '{{productName}}')]" parameterized="true"/>
+        <element name="productVisibility" type="select" selector="//*[@name='product[visibility]']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
new file mode 100644
index 0000000000000..3c05f72ff1597
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryProductsSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
new file mode 100644
index 0000000000000..b5d5d61f6468b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategorySEOSection">
+        <element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
+        <element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
+        <element name="UrlKeyDefaultValueCheckbox" type="button" selector="input[name='use_default[url_key]']"/>
+        <element name="UrlKeyRedirectCheckbox" type="button" selector="[data-index='url_key_create_redirect'] input[type='checkbox']"/>
+        <element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
+        <element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
+        <element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
new file mode 100644
index 0000000000000..0a1901f1fdaf8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategorySidebarActionSection">
+        <element name="AddRootCategoryButton" type="button" selector="#add_root_category_button" timeout="30"/>
+        <element name="AddSubcategoryButton" type="button" selector="#add_subcategory_button" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
new file mode 100644
index 0000000000000..ef6fb99e88eed
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategorySidebarTreeSection">
+        <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
+        <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
+        <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
+        <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
+        <element name="categoryInTreeUnderRoot" type="text" selector="//div[@class='x-tree-root-node']/li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
+        <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
+        <element name="treeContainer" type="block" selector=".tree-holder" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
new file mode 100644
index 0000000000000..4c16e9081f4c6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryWarningMessagesPopupSection">
+        <element name="warningMessage" type="text" selector=".modal-inner-wrap .modal-content .message.message-notice"/>
+        <element name="cancelButton" type="button" selector=".modal-inner-wrap .action-secondary"/>
+        <element name="okButton" type="button" selector=".modal-inner-wrap .action-primary" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
new file mode 100644
index 0000000000000..324f261f3a50a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AttributePropertiesSection">
+        <element name="propertiesTab" type="button" selector="#product_attribute_tabs_main"/>
+        <element name="DefaultLabel" type="input" selector="#attribute_label"/>
+        <element name="InputType" type="select" selector="#frontend_input"/>
+        <element name="ValueRequired" type="select" selector="#is_required"/>
+        <element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
+        <element name="DefaultValue" type="input" selector="#default_value_text"/>
+        <element name="Scope" type="select" selector="#is_global"/>
+        <element name="Save" type="button" selector="#save" timeout="30"/>
+        <element name="DeleteAttribute" type="button" selector="#delete" timeout="30"/>
+        <element name="SaveAndEdit" type="button" selector="#save_and_edit_button" timeout="30"/>
+        <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//div[@class='mce-branding-powered-by']"/>
+        <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
+        <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
+    </section>
+    <section name="AttributeOptionsSection">
+        <element name="AddOption" type="button" selector="#add_new_option_button"/>
+    </section>
+    <section name="StorefrontPropertiesSection">
+        <element name="PageTitle" type="text" selector="//span[text()='Storefront Properties']" />
+        <element name="StoreFrontPropertiesTab" selector="#product_attribute_tabs_front" type="button"/>
+        <element name="EnableWYSIWYG" type="select" selector="#enabled"/>
+        <element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
+    </section>
+    <section name="WYSIWYGProductAttributeSection">
+        <element name="ShowHideBtn" type="button" selector="#toggledefault_value_texteditor"/>
+        <element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
+        <element name="InsertImageIcon" type="button" selector=".mce-i-image"/>
+        <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
+        <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
+        <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
+        <element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
+        <element name="Browse" type="button" selector=".mce-i-browse"/>
+        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
+        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
+        <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
+        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
+        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
+        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
+        <element name="UploadImage" type="file" selector=".fileupload" />
+        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
+        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="CreateFolder" type="button" selector="#new_folder" />
+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
+        <element name="CancelBtn" type="button" selector="#cancel" />
+        <element name="Style" type="button" selector=".mce-txt" />
+        <element name="Bold" type="button" selector=".mce-i-bold" />
+        <element name="Italic" type="button" selector=".mce-i-italic" />
+        <element name="Underline" type="button" selector=".mce-i-underline" />
+        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
+        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
+        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
+        <element name="Bullet" type="button" selector=".mce-i-bullist" />
+        <element name="Numlist" type="button" selector=".mce-i-numlist" />
+        <element name="InsertLink" type="button" selector=".mce-i-link" />
+        <element name="InsertImage" type="button" selector=".mce-i-image" />
+        <element name="InsertTable" type="button" selector=".mce-i-table" />
+        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
+        <element name="TextArea" type="input" selector="#default_value_textarea" />
+    </section>
+    <section name="AdvancedAttributePropertiesSection">
+        <element name="AdvancedAttributePropertiesSectionToggle"
+                 type="button" selector="#advanced_fieldset-wrapper"/>
+        <element name="AttributeCode" type="text" selector="#attribute_code"/>
+        <element name="Scope" type="select" selector="#is_global"/>
+        <element name="AddToColumnOptions" type="select" selector="#is_used_in_grid"/>
+        <element name="UseInFilterOptions" type="select" selector="#is_filterable_in_grid"/>
+        <element name="UseInProductListing" type="select" selector="#used_in_product_listing"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
new file mode 100644
index 0000000000000..5df17cb4f5a42
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditProductAttributesSection">
+        <element name="AttributeName" type="text" selector="#name"/>
+        <element name="ChangeAttributeNameToggle" type="checkbox" selector="#toggle_name"/>
+        <element name="NameError" type="text" selector="#name-error"/>
+        <element name="AttributePrice" type="text" selector="#price"/>
+        <element name="ChangeAttributePriceToggle" type="checkbox" selector="#toggle_price"/>
+        <element name="PriceError" type="text" selector="#price-error"/>
+        <element name="AttributeDescription" type="text" selector="#description"/>
+        <element name="ChangeAttributeDescriptionToggle" type="checkbox" selector="#toggle_description"/>
+        <element name="Save" type="button" selector="button[title=Save]" timeout="30"/>
+        <element name="defaultLabel" type="text" selector="//td[contains(text(), '{{attributeName}}')]/following-sibling::td[contains(@class, 'col-frontend_label')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
new file mode 100644
index 0000000000000..160948f8f1f2c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductAttributeGridSection">
+        <element name="AttributeCode" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
+        <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
+        <element name="GridFilterFrontEndLabel" type="input" selector="#attributeGrid_filter_frontend_label"/>
+        <element name="Search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="ResetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
+        <element name="FirstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]" timeout="30"/>
+        <element name="FilterByAttributeCode" type="input" selector="#attributeGrid_filter_attribute_code"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
new file mode 100644
index 0000000000000..0f438540603d0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="DropdownAttributeOptionsSection">
+        <element name="nthOptionAdminLabel" type="input"
+                 selector="(//*[@id='manage-options-panel']//tr[{{var}}]//input[contains(@name, 'option[value]')])[1]" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
new file mode 100644
index 0000000000000..e165b51ef180e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductAttributeSetActionSection">
+        <element name="save" type="button" selector="button[title='Save']" timeout="30"/>
+        <element name="reset" type="button" selector="button[title='Reset']" timeout="30"/>
+        <element name="back" type="button" selector="button[title='Back']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
new file mode 100644
index 0000000000000..0814c7ea7dc3e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductAttributeSetEditSection">
+        <!-- Groups Column -->
+        <element name="groupTree" type="block" selector="#tree-div1"/>
+        <element name="attributeGroup" type="text" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']" parameterized="true"/>
+        <element name="attributeGroupExtender" type="button" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']" parameterized="true"/>
+        <element name="attributeGroupCollapsed" type="button" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']/parent::*/parent::*[contains(@class, 'collapsed')]" parameterized="true"/>
+        <element name="assignedAttribute" type="text" selector="//*[@id='tree-div1']//span[text()='{{attributeName}}']" parameterized="true"/>
+        <element name="xThLineItemYthAttributeGroup" type="text" selector="//*[@id='tree-div1']/ul/div/li[{{y}}]//li[{{x}}]" parameterized="true"/>
+        <element name="xThLineItemAttributeGroup" type="text" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']/parent::*/parent::*/parent::*//li[{{x}}]//a/span" parameterized="true"/>
+        <!-- Unassigned Attributes Column -->
+        <element name="unassignedAttributesTree" type="block" selector="#tree-div2"/>
+        <element name="unassignedAttribute" type="text" selector="//*[@id='tree-div2']//span[text()='{{attributeName}}']" parameterized="true"/>
+        <element name="xThLineItemUnassignedAttribute" type="text" selector="//*[@id='tree-div2']//li[{{x}}]//a/span" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
new file mode 100644
index 0000000000000..b906e2fa9084b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductAttributeSetGridSection">
+        <element name="filter" type="input" selector="#setGrid_filter_set_name"/>
+        <element name="searchBtn" type="button" selector="#container button[title='Search']" timeout="30"/>
+        <element name="nthRow" type="block" selector="#setGrid_table tbody tr:nth-of-type({{var1}})" parameterized="true"/>
+        <element name="AttributeSetName" type="text" selector="//td[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="addAttributeSetBtn" type="button" selector="button.add-set" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
new file mode 100644
index 0000000000000..8f635214ffffd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductAttributeSetSection">
+        <element name="name" type="input" selector="#attribute_set_name"/>
+        <element name="basedOn" type="select" selector="#skeleton_set"/>
+        <element name="saveBtn" type="button" selector="button.save-attribute-set" timeout="30"/>
+        <element name="deleteBtn" type="button" selector="button[title='Delete']" timeout="30"/>
+        <element name="attribute" type="button" selector="//span[text()='{{var1}}']" parameterized="true"/>
+        <element name="addNewGroupBtn" type="button" selector="button.add" timeout="30"/>
+        <element name="newGroupName" type="input" selector="input[name='name']"/>
+        <element name="modalOk" type="button" selector="button.action-accept" timeout="30"/>
+    </section>
+    <section name="AttributeSetSection">
+        <element name="Save" type="button" selector="button[title='Save']" />
+    </section>
+    <section name="UnassignedAttributes">
+        <element name="ProductAttributeName" type="text" selector="//span[text()='{{var1}}']" parameterized="true"/>
+    </section>
+    <section name="Group">
+        <element name="FolderName" type="text" selector="//span[text()='{{var1}}']" parameterized="true"/>
+    </section>
+    <section name="ModifyAttributes">
+        <!-- Parameter is the attribute name -->
+        <element name="nthExistingAttribute" type="select" selector="//*[text()='{{attributeName}}']/../../..//select" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
new file mode 100644
index 0000000000000..337cf0527dd4e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductCategoryCreationSection">
+        <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)"/>
+        <element name="newCategory" type="button" selector="//button/span[text()='New Category']"/>
+
+        <element name="nameInput" type="input" selector="input[name='name']"/>
+
+        <element name="parentCategory" type="block" selector=".product_form_product_form_create_category_modal div[data-role='selected-option']"/>
+        <element name="parentSearch" type="input" selector="aside input[data-role='advanced-select-text']"/>
+        <element name="parentSearchResult" type="block" selector="aside .admin__action-multiselect-menu-inner"/>
+        <element name="createCategory" type="button" selector="#save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
new file mode 100644
index 0000000000000..784eff12a6c04
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductContentSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
+        <element name="descriptionTextArea" type="textarea" selector="#product_form_description"/>
+        <element name="shortDescriptionTextArea" type="textarea" selector="#product_form_short_description"/>
+        <element name="sectionHeaderIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
+        <element name="pageHeader" type="textarea" selector="//*[@class='page-header row']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
new file mode 100644
index 0000000000000..052195ec1aaa7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductCustomizableOptionsSection">
+        <element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
+        <element name="customizableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
+        <element name="useDefaultOptionTitle" type="text" selector="[data-index='options'] tr.data-row [data-index='title'] [name^='options_use_default']"/>
+        <element name="useDefaultOptionTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/>
+        <element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
+        <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Title']/parent::label/parent::div/parent::div//input[@class='admin__control-text']" parameterized="true"/>
+        <element name="optionTitleInput" type="input" selector="input[name='product[options][0][title]']"/>
+        <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select"/>
+        <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li"/>
+        <element name="maxCharactersInput" type="input" selector="input[name='product[options][0][max_characters]']"/>
+
+        <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div/parent::div//div[@data-role='selected-option']" parameterized="true"/>
+        <element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
+        <element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/>
+        <element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Title']/parent::label/parent::div/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
+        <element name="fillOptionValuePrice" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Price']/parent::label/parent::div//div[@class='admin__control-addon']/input" parameterized="true"/>
+        <element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//span[text()='Price Type']/parent::label/parent::div/parent::div//select" parameterized="true"/>
+        <element name="checkboxUseDefaultTitle" type="checkbox" selector="//span[text()='Option Title']/parent::label/parent::div/parent::div/div//input[@type='checkbox']"/>
+        <element name="checkboxUseDefaultOption" type="checkbox" selector="//table[@data-index='values']//tbody//tr[@data-repeat-index='{{var1}}']//div[@class='admin__field-control']//input[@type='checkbox']" parameterized="true"/>
+
+        <!-- Elements that make it easier to select the most recently added element -->
+        <element name="lastOptionTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, '_required')]//input" />
+        <element name="lastOptionTypeParent" type="block" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__action-multiselect-text')]" />
+        <!-- var 1 represents the option type that you want to select, i.e "radio buttons" -->
+        <element name="optionType" type="block" selector="//*[@data-index='custom_options']//label[text()='{{var1}}'][ancestor::*[contains(@class, '_active')]]" parameterized="true" />
+        <element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" />
+        <element name="valueTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='title']//input" />
+        <element name="valuePrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='price']//input" />
+
+        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price]']"/>
+        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price_type]']"/>
+        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][sku]']"/>
+        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][file_extension]']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
new file mode 100644
index 0000000000000..06ff54b2a3997
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFiltersSection">
+        <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
+        <element name="clearFiltersButton" type="button" selector="//div[@class='admin__data-grid-header']//button[@class='action-tertiary action-clear']" timeout="10"/>
+        <element name="nameInput" type="input" selector="input[name=name]"/>
+        <element name="skuInput" type="input" selector="input[name=sku]"/>
+        <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="filter" type="button" selector="//div[@class='data-grid-filters-action-wrap']/button" timeout="30"/>
+        <element name="typeDropDown" type="multiselect"  selector="//select[@name='type_id']" timeout="30"/>
+        <element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[@value='bundle']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="//button[@class='action-secondary']" timeout="30"/>
+        <element name="allCheckbox" type="checkbox" selector="//div[@data-role='grid-wrapper']//label[@data-bind='attr: {for: ko.uid}']" timeout="30"/>
+        <element name="actions" type="button" selector="//div[@class='action-select-wrap']/button" timeout="30"/>
+        <element name="changeStatus" type="multiselect" selector="//div[@class='action-menu-items']//li[2]" timeout="30"/>
+        <element name="delete" type="multiselect" selector="//div[@class='action-menu-items']//li[1]" timeout="30"/>
+        <element name="disable" type="multiselect" selector="//div[@class='action-menu-items']//ul[@class='action-submenu _active']//li[span='Disable']" timeout="30"/>
+        <element name="enable" type="multiselect" selector="//div[@class='action-menu-items']//ul[@class='action-submenu _active']//li[span='Enable']" timeout="30"/>
+        <element name="filtersClear" type="button" selector="//div[@class='admin__data-grid-header']//button[@data-action='grid-filter-reset']" timeout="30"/>
+        <element name="productType" type="text" selector="//tr[@data-repeat-index='{{var1}}']//td[5]//div[@class='data-grid-cell-content']" parameterized="true"/>
+        <element name="priceOfFirstRow" type="text" selector="//tr[@data-repeat-index='0']//div[contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="AllProductsNotOfBundleType" type="text" selector="//td[5]/div[text() != 'Bundle Product']"/>
+        <element name="attributeSetOfFirstRow" type="text" selector="//tr[@data-repeat-index='0']//div[contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="storeViewDropDown" type="multiselect" selector="//select[@name='store_id']" timeout="30"/>
+        <element name="storeViewOption" type="multiselect" selector="//select[@name='store_id']/option[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
new file mode 100644
index 0000000000000..aa752e0e2289c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <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="30"/>
+        <element name="saveAndClose" type="button" selector="span[title='Save &amp; Close']" timeout="30"/>
+        <element name="changeStoreButton" type="button" selector="#store-change-button" timeout="10"/>
+        <element name="selectStoreView" type="button" selector="//ul[@data-role='stores-list']/li/a[normalize-space(.)='{{var1}}']" timeout="10" parameterized="true"/>
+        <element name="selectTaxClass" type="select" selector="select[name='product[tax_class_id]']"/>
+        <element name="saveAndDuplicate" type="button" selector="span[id='save_and_duplicate']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
new file mode 100644
index 0000000000000..0314534dcddfb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormAdvancedInventorySection">
+        <element name="enableQtyIncrements" type="select" selector="//*[@name='product[stock_data][enable_qty_increments]']"/>
+        <element name="enableQtyIncrementsOptions" type="select" selector="//*[@name='product[stock_data][enable_qty_increments]']//option[contains(@value, '{{var1}}')]" parameterized="true"/>
+        <element name="enableQtyIncrementsUseConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_enable_qty_inc]']"/>
+        <element name="qtyUsesDecimals" type="select" selector="//*[@name='product[stock_data][is_qty_decimal]']"/>
+        <element name="qtyUsesDecimalsOptions" type="select" selector="//*[@name='product[stock_data][is_qty_decimal]']//option[contains(@value, '{{var1}}')]" parameterized="true"/>
+        <element name="qtyIncrements" type="input" selector="//input[@name='product[stock_data][qty_increments]']"/>
+        <element name="qtyIncrementsUseConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_qty_increments]']"/>
+        <element name="doneButton" type="button" selector="//aside[contains(@class,'product_form_product_form_advanced_inventory_modal')]//button[contains(@data-role,'action')]" timeout="5"/>
+    </section>
+</sections>
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
new file mode 100644
index 0000000000000..0a1804aa284dc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormAdvancedPricingSection">
+        <element name="customerGroupPriceAddButton" type="button" selector="[data-action='add_new_row']" timeout="30"/>
+        <element name="customerGroupPriceDeleteButton" type="button" selector="[data-action='remove_row']" timeout="30"/>
+        <element name="advancedPricingCloseButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-close" timeout="30"/>
+        <element name="productTierPriceWebsiteSelect" type="select" selector="[name='product[tier_price][{{var1}}][website_id]']" parameterized="true"/>
+        <element name="productTierPriceCustGroupSelect" type="select" selector="[name='product[tier_price][{{var1}}][cust_group]']" parameterized="true"/>
+        <element name="productTierPriceQtyInput" type="input" selector="[name='product[tier_price][{{var1}}][price_qty]']" parameterized="true"/>
+        <element name="productTierPriceValueTypeSelect" type="select" selector="[name='product[tier_price][{{var1}}][value_type]']" parameterized="true"/>
+        <element name="productTierPriceFixedPriceInput" type="input" selector="[name='product[tier_price][{{var1}}][price]']" parameterized="true"/>
+        <element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
+        <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
+        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
+        <element name="save" type="button" selector="#save-button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
new file mode 100644
index 0000000000000..04e5445c8ab63
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormChangeStoreSection">
+        <element name="storeSelector" type="button" selector="//a[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="acceptButton" type="button" selector="button[class='action-primary action-accept']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
new file mode 100644
index 0000000000000..5791d0bfedab9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormSection">
+        <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
+        <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input" timeout="30"/>
+        <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last" timeout="30"/>
+        <element name="attributeSetFilterResultByName" type="text" selector="//label/span[text() = '{{var}}']" timeout="30" parameterized="true"/>
+        <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
+        <element name="RequiredNameIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="RequiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
+        <element name="enableProductAttributeLabel" type="text" selector="//span[text()='Enable Product']/parent::label"/>
+        <element name="enableProductAttributeLabelWrapper" type="text" selector="//span[text()='Enable Product']/parent::label/parent::div"/>
+        <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>
+        <element name="enableProductLabel" type="checkbox" selector="input[name='product[status]']+label"/>
+        <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
+        <element name="productNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
+        <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
+        <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
+        <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
+        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
+        <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="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]"/>
+        <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
+        <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
+        <element name="productWeightSelect" type="select" selector="select[name='product[product_has_weight]']"/>
+        <element name="contentTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Content']"/>
+        <element name="fieldError" type="text" selector="//input[@name='product[{{fieldName}}]']/following-sibling::label[@class='admin__field-error']" parameterized="true"/>
+        <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
+        <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[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"/>
+        <element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
+        <element name="visibility" type="select" selector="//select[@name='product[visibility]']"/>
+        <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/>
+        <element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
+        <element name="setProductAsNewFrom" type="input" selector="input[name='product[news_from_date]']"/>
+        <element name="setProductAsNewTo" type="input" selector="input[name='product[news_to_date]']"/>
+        <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
+        <element name="customSelectField" type="select" selector="//select[@name='product[{{var}}]']" parameterized="true"/>
+    </section>
+    <section name="ProductInWebsitesSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
+        <element name="website" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox']" parameterized="true"/>
+    </section>
+    <section name="ProductDesignSection">
+        <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>
+        <element name="LayoutDropdown" type="select" selector="select[name='product[page_layout]']"/>
+    </section>
+    <section name="AdminProductFormRelatedUpSellCrossSellSection">
+        <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
+    </section>
+    <section name="AdminAddRelatedProductsModalSection">
+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_related_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
+    </section>
+    <section name="ProductWYSIWYGSection">
+        <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
+        <element name="v436" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']" />
+        <element name="v3" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 3.6(Deprecated)']" />
+        <element name="TinymceDescription3" type ="button" selector="//span[text()='Description']" />
+        <element name="SaveConfig" type ="button" selector="#save" />
+        <element name="v4" type="button" selector="#category_form_description_v4"/>
+        <element name="WYSIWYGBtn" type="button" selector=".//button[@class='action-default scalable action-wysiwyg']"/>
+    </section>
+    <section name="ProductAttributeWYSIWYGSection">
+        <element name="TextArea" type ="text" selector="//div[@data-index='{{var1}}']//textarea" parameterized="true"/>
+        <element name="showHideBtn" type="button" selector="//button[contains(@id,'{{var1}}')]" parameterized="true"/>
+        <element name="InsertImageBtn" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Insert Image...']" parameterized="true"/>
+        <element name="Style" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Paragraph']" parameterized="true"/>
+        <element name="Bold" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true"/>
+        <element name="Italic" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true"/>
+        <element name="Underline" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-underline']" parameterized="true"/>
+        <element name="AlignLeft" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignleft']" parameterized="true"/>
+        <element name="AlignCenter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-aligncenter']" parameterized="true"/>
+        <element name="AlignRight" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignright']" parameterized="true"/>
+        <element name="Numlist" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bullist']" parameterized="true"/>
+        <element name="Bullet" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-numlist']" parameterized="true"/>
+        <element name="InsertLink" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-link']" parameterized="true"/>
+        <element name="InsertImageIcon" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-image']" parameterized="true"/>
+        <element name="InsertTable" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-table']" parameterized="true"/>
+        <element name="SpecialCharacter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-charmap']" parameterized="true"/>
+        <element name="TinyMCE4" type="text" selector="//div[contains(@id, '{{var1}}')]//div[@class='mce-branding-powered-by']" parameterized="true"/>
+    </section>
+    <section name="ProductDescriptionWYSIWYGToolbarSection">
+        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_description']//div[@class='mce-branding-powered-by']" />
+        <element name="showHideBtn" type="button" selector="#toggleproduct_form_description"/>
+        <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_description > .scalable.action-add-image.plugin" />
+        <element name="Style" type="button" selector="//div[@id='editorproduct_form_description']//span[text()='Paragraph']" />
+        <element name="Bold" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-bold']" />
+        <element name="Italic" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-italic']" />
+        <element name="Underline" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-underline']" />
+        <element name="AlignLeft" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-alignleft']" />
+        <element name="AlignCenter" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-aligncenter']" />
+        <element name="AlignRight" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-alignright']" />
+        <element name="Numlist" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-bullist']" />
+        <element name="Bullet" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-numlist']" />
+        <element name="InsertLink" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-link']" />
+        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-image']" timeout="30"/>
+        <element name="InsertTable" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-table']" />
+        <element name="SpecialCharacter" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-charmap']" />
+        <element name="Browse" type="button" selector=".mce-i-browse" timeout="30"/>
+        <element name="BrowseUploadImage" type="file" selector=".fileupload" timeout="30"/>
+        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
+        <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
+        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
+        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
+        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
+        <element name="UploadImage" type="file" selector=".fileupload" />
+        <element name="OkBtn" type="button" selector="//button//span[text()='Ok']"/>
+        <element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
+        <element name="CreateFolder" type="button" selector="#new_folder" timeout="30"/>
+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files" timeout="30"/>
+        <element name="CancelBtn" type="button" selector=".page-actions #cancel" />
+        <element name="FolderName" type="button" selector="input[data-role='promptField']" />
+        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" timeout="30"/>
+        <element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
+        <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
+        <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
+        <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />
+        <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
+    </section>
+    <section name="ProductShortDescriptionWYSIWYGToolbarSection">
+        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_short_description']//div[@class='mce-branding-powered-by']" />
+        <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_short_description > .scalable.action-add-image.plugin" />
+        <element name="showHideBtn" type="button" selector="#toggleproduct_form_short_description"/>
+        <element name="Style" type="button" selector="//div[@id='editorproduct_form_short_description']//span[text()='Paragraph']" />
+        <element name="Bold" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-bold']" />
+        <element name="Italic" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-italic']" />
+        <element name="Underline" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-underline']" />
+        <element name="AlignLeft" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-alignleft']" />
+        <element name="AlignCenter" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-aligncenter']" />
+        <element name="AlignRight" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-alignright']" />
+        <element name="Numlist" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-bullist']" />
+        <element name="Bullet" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-numlist']" />
+        <element name="InsertLink" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-link']" />
+        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-image']" timeout="30"/>
+        <element name="InsertTable" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-table']" />
+        <element name="SpecialCharacter" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-charmap']"/>
+        <element name="Browse" type="button" selector=".mce-i-browse"/>
+        <element name="BrowseUploadImage" type="file" selector=".fileupload" timeout="30" />
+        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
+        <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
+        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
+        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
+        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
+        <element name="UploadImage" type="file" selector=".fileupload" />
+        <element name="OkBtn" type="button" selector="//span[text()='Ok']" timeout="30"/>
+        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="CreateFolder" type="button" selector="#new_folder" />
+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files" timeout="30"/>
+        <element name="CancelBtn" type="button" selector="#cancel" />
+        <element name="FolderName" type="button" selector="input[data-role='promptField']" />
+        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
+        <element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
+        <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
+        <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
+    </section>
+    <section name="ProductDescriptionWysiwygSection">
+        <element name="EditArea" type="text" selector="#editorproduct_form_description .mce-edit-area"/>
+    </section>
+    <section name="ProductShortDescriptionWysiwygSection">
+        <element name="EditArea" type="text" selector="#editorproduct_form_short_description .mce-edit-area"/>
+    </section>
+    <section name="AdminProductFormAdvancedPricingSection">
+        <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
+        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
new file mode 100644
index 0000000000000..3b74041684017
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridActionSection">
+        <element name="addProductBtn" type="button" selector="#add_new_product-button" timeout="30"/>
+        <element name="addProductToggle" type="button" selector=".action-toggle.primary.add"/>
+        <element name="addSimpleProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-simple']" timeout="30"/>
+        <element name="addGroupedProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-grouped']" timeout="30"/>
+        <element name="addVirtualProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-virtual']" timeout="30"/>
+        <element name="addBundleProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-bundle']" timeout="30"/>
+        <element name="addDownloadableProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-downloadable']" timeout="30"/>
+        <element name="addTypeProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-{{type}}']" parameterized="true"/>
+        <element name="productName" type="text" selector="//div[text()='{{var1}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
new file mode 100644
index 0000000000000..5bf73076e14de
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridConfirmActionSection">
+        <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
+        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
new file mode 100644
index 0000000000000..611f12a39b510
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridFilterSection">
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
+        <element name="enabledFilters" type="textarea" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
+        <element name="basicSearchFilter" type="textarea" selector=".admin__control-text.data-grid-search-control"/>
+        <element name="basicSearchFilterButton" type="button" selector=".data-grid-search-control-wrap button.action-submit"/>
+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="columnsDropdown" type="button" selector=".admin__data-grid-action-columns button.admin__action-dropdown"/>
+        <element name="viewColumnOption" type="checkbox" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//div[@class='admin__field-option']//label[text()='{{col}}']/preceding-sibling::input" parameterized="true"/>
+        <element name="resetGridColumns" type="button" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//button[text()='Reset']"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']"/>
+        <element name="nameFilter" type="input" selector="input.admin__control-text[name='name']"/>
+        <element name="skuFilter" type="input" selector="input.admin__control-text[name='sku']"/>
+        <element name="priceFilterFrom" type="input" selector="input.admin__control-text[name='price[from]']"/>
+        <element name="priceFilterTo" type="input" selector="input.admin__control-text[name='price[to]']"/>
+        <element name="typeFilter" type="select" selector="select.admin__control-select[name='type_id']"/>
+        <element name="statusFilter" type="select" selector="select.admin__control-select[name='status']"/>
+        <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
+        <element name="keywordSearch" type="input" selector="input#fulltext"/>
+        <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
new file mode 100644
index 0000000000000..fbcfabfa02fa1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridPaginationSection">
+        <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
+        <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{label}}']" parameterized="true"/>
+        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
+        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>
+        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
+        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
+        <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
+        <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
new file mode 100644
index 0000000000000..fe87c81ad6ac8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridSection">
+        <element name="productRowBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
+        <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
+        <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="productGridElement1" type="input" selector="#addselector" />
+        <element name="productGridElement2" type="text" selector="#addselector" />
+        <element name="productGridRows" type="text" selector="table.data-grid tr.data-row"/>
+        <element name="firstProductRow" type="text" selector="table.data-grid tr.data-row:first-of-type"/>
+        <element name="firstProductRowEditButton" type="button" selector="table.data-grid tr.data-row td .action-menu-item:first-of-type"/>
+        <element name="productThumbnail" type="text" selector="table.data-grid tr:nth-child({{row}}) td.data-grid-thumbnail-cell > img" parameterized="true"/>
+        <element name="productThumbnailBySrc" type="text" selector="img.admin__control-thumbnail[src*='{{pattern}}']" parameterized="true"/>
+        <element name="productGridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="productGridHeaderCell" type="text" selector="//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]" parameterized="true"/>
+        <element name="multicheckDropdown" type="button" selector="div[data-role='grid-wrapper'] th.data-grid-multicheck-cell button.action-multicheck-toggle"/>
+        <element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/>
+        <element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
+        <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
+        <element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
+        <element name="table" type="text" selector="#container > div > div.admin__data-grid-wrap > table"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="productGridCheckboxOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td[1]//input" parameterized="true"/>
+        <element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
+        <element name="productGridContentsOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td" parameterized="true"/>
+        <element name="selectRowBasedOnName" type="input" selector="//td/div[text()='{{var1}}']" parameterized="true"/>
+        <element name="changeStatus" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-menu-item')]//ul/li/span[text() = '{{status}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
new file mode 100644
index 0000000000000..7341a6ded7a09
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridTableHeaderSection">
+        <element name="id" type="button" selector=".//*[@class='sticky-header']/following-sibling::*//th[@class='data-grid-th _sortable _draggable _{{order}}']/span[text()='ID']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagePlaceholderConfigSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagePlaceholderConfigSection.xml
new file mode 100644
index 0000000000000..7558b13d624bb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagePlaceholderConfigSection.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductImagePlaceholderConfigSection">
+        <element name="sectionHeader" type="text" selector="#catalog_placeholder-head"/>
+        <!--Base image placeholder-->
+        <element name="baseImageInput" type="file" selector="#catalog_placeholder_image_placeholder" timeout="10"/>
+        <element name="baseImageDelete" type="checkbox" selector="#catalog_placeholder_image_placeholder_delete"/>
+        <element name="baseImage" type="text" selector="#catalog_placeholder_image_placeholder_image"/>
+        <element name="baseImageBySrc" type="text" selector="#catalog_placeholder_image_placeholder_image[src*='{{var}}']" parameterized="true"/>
+
+        <!--Small image placeholder-->
+        <element name="smallImageInput" type="file" selector="#catalog_placeholder_small_image_placeholder" timeout="10"/>
+        <element name="smallImageDelete" type="checkbox" selector="#catalog_placeholder_small_image_placeholder_delete"/>
+        <element name="smallImage" type="text" selector="#catalog_placeholder_small_image_placeholder_image"/>
+        <element name="smallImageBySrc" type="text" selector="#catalog_placeholder_small_image_placeholder_image[src*='{{var}}']" parameterized="true"/>
+
+        <!--Swatch image placeholder-->
+        <element name="swatchImageInput" type="file" selector="#catalog_placeholder_swatch_image_placeholder" timeout="10"/>
+        <element name="swatchImageDelete" type="checkbox" selector="#catalog_placeholder_swatch_image_placeholder_delete"/>
+        <element name="swatchImage" type="text" selector="#catalog_placeholder_swatch_image_placeholder_image"/>
+        <element name="swatchImageBySrc" type="text" selector="#catalog_placeholder_swatch_image_placeholder_image[src*='{{var}}']" parameterized="true"/>
+
+        <!--Thumbnail image placeholder-->
+        <element name="thumbnailImageInput" type="file" selector="#catalog_placeholder_thumbnail_placeholder" timeout="10"/>
+        <element name="thumbnailImageDelete" type="checkbox" selector="#catalog_placeholder_thumbnail_placeholder_delete"/>
+        <element name="thumbnailImage" type="text" selector="#catalog_placeholder_thumbnail_placeholder_image"/>
+        <element name="thumbnailImageBySrc" type="text" selector="#catalog_placeholder_thumbnail_placeholder_image[src*='{{var}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
new file mode 100644
index 0000000000000..eca0cb6f02ea1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductImagesSection">
+        <element name="productImagesToggle" type="button" selector="div[data-index=gallery] .admin__collapsible-title"/>
+        <element name="imageFileUpload" type="input" selector="#fileupload"/>
+        <element name="imageUploadButton" type="button" selector="div.image div.fileinput-button"/>
+        <element name="imageFile" type="text" selector="//*[@id='media_gallery_content']//img[contains(@src, '{{url}}')]" parameterized="true"/>
+        <element name="removeImageButton" type="button" selector=".action-remove"/>
+        <element name="modalOkBtn" type="button" selector="button.action-primary.action-accept"/>
+        <element name="uploadProgressBar" type="text" selector=".uploader .file-row"/>
+
+        <element name="nthProductImage" type="button" selector="#media_gallery_content > div:nth-child({{var}}) img.product-image" parameterized="true"/>
+        <element name="nthRemoveImageBtn" type="button" selector="#media_gallery_content > div:nth-child({{var}}) button.action-remove" parameterized="true"/>
+
+        <element name="altText" type="textarea" selector="textarea[data-role='image-description']"/>
+
+        <element name="roleBase" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li/label[normalize-space(.) = 'Base']"/>
+        <element name="roleSmall" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li/label[normalize-space(.) = 'Small']"/>
+        <element name="roleThumbnail" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li/label[normalize-space(.) = 'Thumbnail']"/>
+        <element name="roleSwatch" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li/label[normalize-space(.) = 'Swatch']"/>
+
+        <element name="isBaseSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Base']"/>
+        <element name="isSmallSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Small']"/>
+        <element name="isThumbnailSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Thumbnail']"/>
+        <element name="isSwatchSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Swatch']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
new file mode 100644
index 0000000000000..59fbeee142dfe
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductMessagesSection">
+        <element name="successMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector=".message.message-error.error"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
new file mode 100644
index 0000000000000..adc3a753f06f5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductModalSlideGridSection">
+        <element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
new file mode 100644
index 0000000000000..e90d806805f7c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormRelatedUpSellCrossSellSection">
+        <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
+        <element name="relatedProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='related']"/>
+        <element name="upSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='upsell']"/>
+        <element name="crossSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='crosssell']"/>
+        <element name="relatedDropdown" type="block" selector="//div[@data-index='related']" timeout="30"/>
+        <element name="relatedDependent" type="block" selector="//div[@data-index='related']//div[contains(@class, '_show')]"/>
+        <element name="selectedRelatedProduct" type="block" selector="//span[@data-index='name']"/>
+        <element name="removeRelatedProduct" type="button" selector="//span[text()='Related Products']//..//..//..//span[text()='{{productName}}']//..//..//..//..//..//button[@class='action-delete']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
new file mode 100644
index 0000000000000..c545fcd408831
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductSEOSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
+        <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
new file mode 100644
index 0000000000000..bf8812b3acef5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminUpdateAttributesSection">
+        <element name="saveButton" type="button" selector="button[title='Save']" timeout="30"/>
+
+        <element name="toggleCountryOfManufacture" type="checkbox" selector="#toggle_country_of_manufacture"/>
+        <element name="toggleCustomDesign" type="checkbox" selector="#toggle_custom_design"/>
+        <element name="toggleCustomDesignFrom" type="checkbox" selector="#toggle_custom_design_from"/>
+        <element name="toggleCustomDesignTo" type="checkbox" selector="#toggle_custom_design_to"/>
+        <element name="toggleCustomLayout" type="checkbox" selector="#toggle_custom_layout"/>
+        <element name="toggleCustomLayoutUpdate" type="checkbox" selector="#toggle_custom_layout_update"/>
+        <element name="toggleDescription" type="checkbox" selector="#toggle_description"/>
+        <element name="toggleMetaDescription" type="checkbox" selector="#toggle_meta_description"/>
+        <element name="toggleMetaKeyword" type="checkbox" selector="#toggle_meta_keyword"/>
+        <element name="toggleMetaTitle" type="checkbox" selector="#toggle_meta_title"/>
+        <element name="toggleName" type="checkbox" selector="#toggle_name"/>
+        <element name="toggleNewsFromDate" type="checkbox" selector="#toggle_news_from_date"/>
+        <element name="toggleNewsToDate" type="checkbox" selector="#toggle_news_to_date"/>
+        <element name="toggleOptionsContainer" type="checkbox" selector="#toggle_options_container"/>
+        <element name="togglePageLayout" type="checkbox" selector="#toggle_page_layout"/>
+        <element name="togglePrice" type="checkbox" selector="#toggle_price"/>
+        <element name="toggleShortDescription" type="checkbox" selector="#toggle_short_description"/>
+        <element name="toggleSpecialFromDate" type="checkbox" selector="#toggle_special_from_date"/>
+        <element name="toggleSpecialPrice" type="checkbox" selector="#toggle_special_price"/>
+        <element name="toggleSpecialToDate" type="checkbox" selector="#toggle_special_to_date"/>
+        <element name="toggleTaxClass" type="checkbox" selector="#toggle_tax_class_id"/>
+        <element name="toggleVisibility" type="checkbox" selector="#toggle_visibility"/>
+        <element name="toggleWeight" type="checkbox" selector="#toggle_weight"/>
+        <element name="toggleColor" type="checkbox" selector="#toggle_color"/>
+
+        <element name="description" type="input" selector="#description"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
new file mode 100644
index 0000000000000..ddec4428f90e2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryFilterSection">
+        <element name="CategoryFilter" type="button" selector="//main//div[@class='filter-options']//div[contains(text(), 'Category')]"/>
+        <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
new file mode 100644
index 0000000000000..03566be55ad2f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryMainSection">
+        <element name="perPage" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[3]//*[@id='limiter']"/>
+        <element name="sortedBy" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@id='sorter']"/>
+        <element name="modeGridIsActive" type="text" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@class='modes']/strong[@class='modes-mode active mode-grid']/span"/>
+        <element name="modeListButton" type="button" selector="#mode-list"/>
+        <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
+        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
+        <element name="specifiedProductItemInfo" type="button" selector="//a[@class='product-item-link'][contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="SuccessMsg" type="button" selector="div.message-success"/>
+        <element name="productCount" type="text" selector="#toolbar-amount"/>
+        <element name="CatalogDescription" type="text" selector="//div[@class='category-description']//p"/>
+        <element name="mediaDescription" type="text" selector="img[alt='{{var1}}']" parameterized="true"/>
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="productImage" type="text" selector="img.product-image-photo"/>
+        <element name="productLink" type="text" selector="a.product-item-link"/>
+        <element name="productLinkByHref" type="text" selector="a.product-item-link[href$='{{var1}}.html']" parameterized="true"/>
+        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
+        <element name="categoryImage" type="text" selector=".category-image"/>
+        <element name="emptyProductMessage" type="block" selector=".message.info.empty>div"/>
+        <element name="lineProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 0000000000000..178e58ef2d649
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="ProductTitleByNumber" type="button" selector="//main//li[{{var1}}]//a[@class='product-item-link']" parameterized="true"/>
+        <element name="ProductPriceByNumber" type="text" selector="//main//li[{{var1}}]//span[@class='price']" parameterized="true"/>
+        <element name="ProductSpecialPriceByNumber" type="text" selector="//main//li[{{var1}}]//span[@class='special-price']//span[@class='price']" parameterized="true"/>
+        <element name="ProductOldPriceByNumber" type="text" selector="//main//li[{{var1}}]//span[@class='old-price']//span[@class='price']" parameterized="true"/>
+        <element name="ProductInfoByNumber" type="text" selector="//main//li[{{var1}}]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="ProductAddToCompareByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'tocompare')]" parameterized="true"/>
+        <element name="listedProduct" type="block" selector="ol li:nth-child({{productPositionInList}}) img" parameterized="true"/>
+        <element name="categoryListView" type="button" selector="a[title='List']" timeout="30"/>
+
+        <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductImageBySrc" type="text" selector=".products-grid img[src*='{{pattern}}']" parameterized="true"/>
+        <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="productPriceFinal" type="text" selector="//span[@data-price-type='finalPrice']//span[@class='price'][contains(.,'{{var1}}')]" parameterized="true"/>
+        <element name="productPriceOld" type="text" selector="//span[@data-price-type='oldPrice']//span[@class='price'][contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="productPriceLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
+        <!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
+        <element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
+        <element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
new file mode 100644
index 0000000000000..1b7bbd58eea9f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategorySidebarSection">
+        <element name="filterOptionsTitle" type="text" selector="//div[@class='filter-options-title' and contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="filterOptions" type="text" selector=".filter-options-content .items"/>
+        <element name="filterOption" type="text" selector=".filter-options-content .item"/>
+        <element name="optionQty" type="text" selector=".filter-options-content .item .count"/>
+    </section>
+    <section name="StorefrontCategorySidebarMobileSection">
+        <element name="shopByButton" type="button" selector="//div[contains(@class, 'filter-title')]/strong[contains(text(), 'Shop By')]"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml
new file mode 100644
index 0000000000000..e063b5fc8c1b7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryTopToolbarSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryTopToolbarSection">
+        <element name="gridMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-grid']" timeout="30"/>
+        <element name="listMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-list']" timeout="30"/>
+        <element name="sortByDropdown" type="select" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='sorter']" timeout="30"/>
+        <element name="sortDirectionAsc" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//a[contains(@class, 'sort-asc')]" timeout="30"/>
+        <element name="sortDirectionDesc" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//a[contains(@class, 'sort-desc')]" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
new file mode 100644
index 0000000000000..d097d6bbc4626
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontComparisonSidebarSection">
+        <element name="Compare" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action compare')]"/>
+        <element name="ClearAll" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action clear')]"/>
+        <element name="ProductTitleByName" type="button" selector="//main//ol[@id='compare-items']//a[@class='product-item-link'][text()='{{var1}}']" parameterized="true"/>
+        <element name="NoItemsMessage" type="text" selector="//main//div[contains(@class, 'block-compare')]//div[@class='empty']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
new file mode 100644
index 0000000000000..1c937637ad823
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontFooterSection">
+        <element name="switchStoreButton" type="button" selector="#switcher-store-trigger"/>
+        <element name="storeLink" type="button" selector="//ul[@class='dropdown switcher-dropdown']//a[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
new file mode 100644
index 0000000000000..509ad2b8f849c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontHeaderSection">
+        <element name="NavigationCategoryByName" type="button" selector="//nav//a[span[contains(., '{{var1}}')]]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
new file mode 100644
index 0000000000000..4dcda8dcd41ae
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontMessagesSection">
+        <element name="success" type="text" selector="div.message-success.success.message"/>
+        <element name="error" type="text" selector="div.message-error.error.message"/>
+        <element name="noticeMessage" type="text" selector="div.message-notice"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
new file mode 100644
index 0000000000000..ff2e5f2f36015
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontMiniCartSection">
+        <element name="quantity" type="button" selector="span.counter-number"/>
+        <element name="show" type="button" selector="a.showcart"/>
+        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
new file mode 100644
index 0000000000000..e8f35fc6787b7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontNavigationSection">
+        <element name="topCategory" type="button" selector="//a[contains(@class,'level-top')]/span[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="subCategory" type="button" selector="//ul[contains(@class,'submenu')]//span[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="breadcrumbs" type="textarea" selector=".items"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
new file mode 100644
index 0000000000000..f4db37b677584
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductRelatedProductsSection">
+        <element name="relatedProductsActionsHeaderText" type="text" selector=".block.related .block-actions" />
+        <element name="relatedProductsListSectionText" type="text" selector=".block.related .products.wrapper.grid.products-grid.products-related" />
+        <element name="relatedProductName" type="button" selector="//*[@class='block related']//a[contains(text(), '{{productName}}')]" parameterized="true"/>
+        <element name="relatedProductCheckBoxButton" type="button" selector="//*[@class='block related']//a[contains(text(), '{{productName}}')]/parent::*/parent::*//input[@class='checkbox related']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
new file mode 100644
index 0000000000000..98dc5e764fd77
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductActionSection">
+        <element name="quantity" type="input" selector="#qty"/>
+        <element name="addToCart" type="button" selector="#product-addtocart-button"/>
+        <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
+        <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
+        <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
new file mode 100644
index 0000000000000..ad31be6b277ee
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductCompareMainSection">
+        <element name="PageName" type="text" selector="//*[@id='maincontent']//h1//span"/>
+        <element name="ProductLinkByName" type="button" selector="//*[@id='product-comparison']//tr//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductAttributeByCodeAndProductName" type="text" selector="//*[@id='product-comparison']//tr[.//th[./span[contains(text(), '{{var1}}')]]]//td[count(//*[@id='product-comparison']//tr//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var2}}')]]/preceding-sibling::td)+1]/div" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
new file mode 100644
index 0000000000000..0745c0d0819a0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoDetailsSection">
+        <element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
+        <element name="detailsTab" type="button" selector="#tab-label-description-title" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..b93a70559fc4a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="stock" type="input" selector=".stock.available"/>
+        <element name="productName" type="text" selector=".base"/>
+        <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
+        <element name="productPriceLabel" type="text" selector=".price-label"/>
+        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
+        <element name="qty" type="input" selector="#qty"/>
+        <element name="specialPrice" type="text" selector=".special-price"/>
+        <element name="updatedPrice" type="text" selector="div.price-box.price-final_price [data-price-type='finalPrice'] .price"/>
+        <element name="oldPrice" type="text" selector=".old-price"/>
+        <element name="oldPriceTag" type="text" selector=".old-price .price-label"/>
+        <element name="oldPriceAmount" type="text" selector=".old-price .price"/>
+        <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
+        <element name="productImage" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[@class='fotorama__img']"/>
+        <element name="productImageSrc" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[contains(@src, '{{src}}')]" parameterized="true"/>
+        <element name="productDescription" type="text" selector="#description .value"/>
+        <element name="productOptionFieldInput" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@type='text']" parameterized="true"/>
+        <element name="productOptionAreaInput" type="textarea" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//textarea" parameterized="true"/>
+        <element name="productOptionFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'OptionFile')]/../div[@class='control']//input[@type='file']" parameterized="true"/>
+        <element name="productOptionSelect" type="select" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//select" parameterized="true"/>
+
+
+        <!-- The parameter is the nth custom option that you want to get -->
+        <element name="nthCustomOption" type="block" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]" parameterized="true" />
+        <!-- The 1st parameter is the nth custom option, the 2nd parameter is the nth value in the option -->
+        <element name="nthCustomOptionInput" type="radio" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]//*[contains(@class, 'admin__field-option')][{{customOptionValueNum}}]//input" parameterized="true" />
+        <element name="productOptionRadioButtonsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@price='{{var2}}']" parameterized="true"/>
+
+        <element name="productOptionDataMonth" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='month']" parameterized="true"/>
+        <element name="productOptionDataDay" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='day']" parameterized="true"/>
+        <element name="productOptionDataYear" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='year']" parameterized="true"/>
+        <element name="productOptionDateAndTimeMonth" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='month']" parameterized="true"/>
+        <element name="productOptionDateAndTimeDay" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='day']" parameterized="true"/>
+        <element name="productOptionDateAndTimeYear" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='year']" parameterized="true"/>
+        <element name="productOptionDateAndTimeHour" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='hour']" parameterized="true"/>
+        <element name="productOptionDateAndTimeMinute" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='minute']" parameterized="true"/>
+        <element name="productOptionTimeHour" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='hour']" parameterized="true"/>
+        <element name="productOptionTimeMinute" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='minute']" parameterized="true"/>
+
+        <!-- Only one of Upload/Url Inputs are available for File and Sample depending on the value of the corresponding TypeSelector -->
+        <element name="addLinkFileUploadFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@type='file']" parameterized="true" />
+
+        <element name="productShortDescription" type="text" selector="//div[@class='product attribute overview']//div[@class='value']"/>
+        <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
+        <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
+        <element name="productAttributeOptionsPrice" type="text" selector="//label[contains(.,'{{var1}}')]//span[@data-price-amount='{{var2}}']" parameterized="true"/>
+        <element name="productAttributeOptionsDropDown" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//select//option[@price='{{var2}}']" parameterized="true"/>
+        <element name="productAttributeOptionsRadioButtons" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//span[@data-price-amount='{{var2}}']" parameterized="true"/>
+        <element name="productAttributeOptionsCheckbox" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//span[@data-price-amount='{{var2}}']" parameterized="true"/>
+        <element name="productAttributeOptionsMultiselect" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//select//option[@price='{{var2}}']" parameterized="true"/>
+        <element name="productAttributeOptionsData" type="text" selector="//span[contains(.,'{{var1}}')]/../span[@class='price-notice']//span[@data-price-amount='{{var2}}']" parameterized="true"/>
+        <element name="mediaDescription" type="text" selector=".product.attribute.description>div>p>img"/>
+        <element name="mediaShortDescription" type="text" selector=".product.attribute.overview>div>p>img"/>
+        <element name="productAddToCompare" type="button" selector="a.action.tocompare"/>
+        <element name="productOptionDropDownTitle" type="text" selector="//label[contains(.,'{{var1}}')]" parameterized="true"/>
+        <element name="productOptionDropDownOptionTitle" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//select//option[contains(.,'{{var2}}')]" parameterized="true"/>
+
+        <!-- Tier price selectors -->
+        <element name="productTierPriceByForTextLabel" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}][contains(text(),'Buy {{var2}} for')]" parameterized="true"/>
+        <element name="productTierPriceAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(text(), '{{var2}}')]" parameterized="true"/>
+        <element name="productTierPriceSavePercentageAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(@class, 'percent')][contains(text(), '{{var2}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
new file mode 100644
index 0000000000000..83c3ca5348606
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductMediaSection">
+        <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
new file mode 100644
index 0000000000000..ee687fa62da93
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductMoreInformationSection">
+        <element name="moreInformation" type="button" selector="#tab-label-additional-title" timeout="30"/>
+        <element name="moreInformationTextArea" type="textarea" selector="#additional"/>
+        <element name="attributeLabel" type="text" selector=".col.label"/>
+        <element name="attributeValue" type="text" selector=".col.data"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
new file mode 100644
index 0000000000000..e9c8f53f97e5f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductPageSection">
+        <element name="qtyInput" type="button" selector="input.input-text.qty" timeout="30"/>
+        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
+        <element name="successMsg" type="button" selector="div.message-success" timeout="30"/>
+        <element name="errorMsg" type="button" selector="div.message-error" timeout="30"/>
+        <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
+        <element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/>
+        <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>
+        <element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/>
+        <element name="charCounter" type="text" selector=".character-counter"/>
+        <element name="tax" type="input" selector=".totals-tax .amount .price"/>
+        <element name="subTotal" type="input" selector="span[data-th='Subtotal']"/>
+        <element name="shipping" type="input" selector="span[data-th='Shipping']"/>
+        <element name="orderTotal" type="input" selector=".grand.totals .amount .price"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
new file mode 100644
index 0000000000000..88a39a9087bb3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultImageSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default image for a Simple Product"/>
+            <description value="Admin should be able to add default images for a Simple Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-113"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProductSimple">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="SimpleProduct3"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
new file mode 100644
index 0000000000000..3f857c258924f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageVirtualProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default images for a Virtual Product"/>
+            <description value="Admin should be able to add default images for a Virtual Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-103"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductMain">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
new file mode 100644
index 0000000000000..5456cb02e74ca
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default product video for a Simple Product"/>
+            <description value="Admin should be able to add default product video for a Simple Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-111"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="ApiSimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="ApiSimpleProduct"/>
+        </actionGroup>
+
+        <!-- Save product -->
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="ApiSimpleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
new file mode 100644
index 0000000000000..f48c352c5290a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultVideoVirtualProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default product video for a Virtual Product"/>
+            <description value="Admin should be able to add default product video for a Virtual Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-109"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
+
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
new file mode 100644
index 0000000000000..8ac0cfa512b03
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageForCategoryTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add image to a Category"/>
+            <description value="Admin should be able to add image to a Category"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-188"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="DeleteCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to create a new category with image -->
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateCategoryPage"/>
+        <actionGroup ref="fillCategoryForm" stepKey="fillCategoryForm">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <actionGroup ref="addCategoryImage" stepKey="addCategoryImage"/>
+        <actionGroup ref="saveCategoryForm" stepKey="saveCategoryForm"/>
+
+        <!-- Verify category with image in admin -->
+        <actionGroup ref="checkCategoryImageInAdmin" stepKey="checkCategoryImageInAdmin"/>
+
+        <!-- Verify category with image in storefront -->
+        <actionGroup ref="CheckCategoryOnStorefront" stepKey="CheckCategoryOnStorefront">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <seeElement selector="{{StorefrontCategoryMainSection.imageSource(ProductImage.filename)}}" stepKey="seeImage"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
new file mode 100644
index 0000000000000..50d192a27e46d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageToWYSIWYGCatalogTest">
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
+            <group value="Catalog"/>
+            <title value="Admin should be able to add image to WYSIWYG Editor on Catalog Page"/>
+            <description value="Admin should be able to add image to WYSIWYG Editor on Catalog Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84373"/>
+        </annotations>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToNewCatalog"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <waitForLoadingMaskToDisappear stepKey="wait2" />
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
+        <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
+        <actionGroup ref="attachImage" stepKey="attachImage1">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="deleteImage" stepKey="deleteImage"/>
+        <actionGroup ref="attachImage" stepKey="attachImage2">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
+        <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
new file mode 100644
index 0000000000000..03f3e93bb30ec
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageToWYSIWYGProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
+            <group value="Catalog"/>
+            <title value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
+            <description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84375"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
+        <waitForPageLoad stepKey="waitForPageLoadProductCreatePage"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillBasicProductInfo" />
+
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon1" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse1" />
+        <waitForLoadingMaskToDisappear stepKey="waitForBrowseModal" />
+        <see selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn1" />
+        <see selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn1" />
+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn1" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" stepKey="createFolder1" />
+        <waitForElement selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" stepKey="waitForPopUp1" />
+        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName1" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.AcceptFolderName}}" stepKey="acceptFolderName11" />
+        <conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.StorageRootArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfArrowExpand}}" stepKey="clickStorageRootArrowIfClosed" visible="true"/>
+        <conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.WysiwygArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
+        <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
+        <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading4" timeout="45"/>
+        <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload1" timeout="30"/>
+        <waitForElementVisible  selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
+        <see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected1" />
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmDelete1"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete1" />
+        <waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForImageDeleted1" />
+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn2" />
+        <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload2" timeout="45"/>
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" stepKey="waitForImageDescriptionButton1" />
+        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription1" />
+        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight1" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn1" />
+        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
+        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
+        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
+        <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading13" timeout="30"/>
+        <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading14" timeout="40"/>
+        <dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
+        <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload3" timeout="45"/>
+        <waitForElementVisible  selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
+        <waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
+        <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
+        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected2" />
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirm3"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete2" />
+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn4" />
+        <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload4" timeout="45"/>
+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
+        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn2" />
+        <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload3.content}}" stepKey="fillImageDescription2" />
+        <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload3.height}}" stepKey="fillImageHeight2" />
+        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn2" />
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading12" />
+        <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource3"/>
+        <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload1.fileName)}}" stepKey="assertMediaSource1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
new file mode 100644
index 0000000000000..545e7c10379bf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminApplyTierPriceToProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Apply tier price to a product"/>
+            <title value="You should be able to apply tier price to a product."/>
+            <description value="You should be able to apply tier price to a product."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-68921"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUSCustomer">
+                <field key="group_id">1</field>
+            </createData>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
+            <waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <!--Case: Group Price-->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton1"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton1"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="1" stepKey="fillProductTierPriceQtyInput1"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="Discount" stepKey="selectProductTierPriceValueType1"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="10" stepKey="selectProductTierPricePriceInput"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin1">
+            <argument name="Customer" value="$$createSimpleUSCustomer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_1"/>
+        <amOnPage url="customer/account/logout/" stepKey="logoutCustomer1"/>
+        <waitForPageLoad  time="30" stepKey="waitForPageLoad2"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_2"/>
+        <!--Case: Tier Price for General Customer Group-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad1"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton2"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton2"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" time="30" stepKey="waitForSelectCustomerGroupNameAttribute1"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="General" stepKey="selectCustomerGroupGeneral"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton2"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage3"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_1"/>
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_3"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin2">
+            <argument name="Customer" value="$$createSimpleUSCustomer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage4"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_4"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_3"/>
+        <!--Case: Tier Price applied if Product quantity meets Tier Price Condition-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex3"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad2"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage3"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton3"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton3"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="ALL GROUPS" stepKey="selectCustomerGroupAllGroups"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="15" stepKey="fillProductTierPriceQtyInput15"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickToLoseFocusOnRequiredInputElement"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty20PriceDiscountAnd18percent2"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" userInput="20" stepKey="fillProductTierPriceQtyInput20"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('1')}}" userInput="Discount" stepKey="selectProductTierPriceValueType2"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="18" stepKey="selectProductTierPricePriceInput18"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton3"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct3"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage5"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_1"/>
+        <amOnPage url="customer/account/logout/" stepKey="logoutCustomer2"/>
+        <waitForPageLoad  time="30" stepKey="waitForPageLoad7"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage6"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_2"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="goToProductPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('1', '90')}}" stepKey="assertProductTierPriceAmountForFirstRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '82')}}" stepKey="assertProductTierPriceAmountForSecondRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '18')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow1"/>
+        <fillField userInput="10" selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="fillProductQuantity1"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToCheckoutFromMinicart"/>
+        <seeInField userInput="10" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField10"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField1"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,000" stepKey="assertSubtotalField1">
+            <expectedResult type="string">$1,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField1</actualResult>
+        </assertEquals>
+        <fillField userInput="15" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="fillProductQuantity2"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField2"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,350" stepKey="assertSubtotalField2">
+            <expectedResult type="string">$1,350.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField2</actualResult>
+        </assertEquals>
+        <fillField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="fillProductQuantity3"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField3"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,640" stepKey="assertSubtotalField3">
+            <expectedResult type="string">$1,640.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField3</actualResult>
+        </assertEquals>
+        <!--Tier Price is changed in Shopping Cart and is changed on Product page if Tier Price parameters are changed in Admin-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex4"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoa4"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage4"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton4"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton4"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="25" stepKey="selectProductTierPricePercentageValue2"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton4"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct4"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad1"/>
+        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField4"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField4">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField4</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal1"/>
+        <assertEquals message="Shopping cart summary section should contain subtotal $1,500" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection1">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal1</actualResult>
+        </assertEquals>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart1"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="waitForminiCartSubtotalField1"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField"/>
+        <assertEquals message="Mini shopping cart should contain subtotal $1,500" stepKey="assertSubtotalFieldFromMiniShoppingCart1">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromMiniCartSubtotalField</actualResult>
+        </assertEquals>
+        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab1"/>
+        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad1"/>
+        <uncheckOption selector="{{AdminSalesConfigSection.enableMAPUseSystemValue}}" stepKey="uncheckMAPUseSystemValue"/>
+        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="Yes" stepKey="setEnableMAPYes"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage1"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad2"/>
+        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_2"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField5"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField5">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField5</actualResult>
+        </assertEquals>
+        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab2"/>
+        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad2"/>
+        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="No" stepKey="setEnableMAPNo"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage2"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage3"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad3"/>
+        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_3"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField6"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField6">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField6</actualResult>
+        </assertEquals>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="goToProductPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('1', '90')}}" stepKey="assertProductTierPriceAmountForFirstRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '75')}}" stepKey="assertProductTierPriceAmountForSecondRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '25')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex5"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad3"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct5">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage5"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton5"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="waitForcustomerGroupPriceDeleteButton"/>
+        <scrollTo selector="(//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//tr//button[@data-action='remove_row'])[1]" x="30" y="0" stepKey="scrollToDeleteFirstRowOfCustomerGroupPrice" />
+        <click selector="(//tr//button[@data-action='remove_row'])[1]" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
+        <click selector="//tr//button[@data-action='remove_row']" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="clickDoneButton5"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct5"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage6"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton6"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton5"/>
+        <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="dontSeeQtyInputOfFirstRow"/>
+        <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" stepKey="dontSeeQtyInputOfSecondRow"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="closeAdvancedPricingPopup"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage4"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad4"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField7"/>
+        <assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">
+            <expectedResult type="string">$4,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField7</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal2"/>
+        <assertEquals message="Shopping cart summary section should contain subtotal $4,000" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection2">
+            <expectedResult type="string">$4,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal2</actualResult>
+        </assertEquals>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart2"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="waitForminiCartSubtotalField2"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField2"/>
+        <assertEquals message="Mini shopping cart should contain subtotal $4,000" stepKey="assertSubtotalFieldFromMiniShoppingCart2">
+            <expectedResult type="string">$4,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromMiniCartSubtotalField2</actualResult>
+        </assertEquals>
+    </test>
+    <test name="AdminApplyTierPriceToProductWithPercentageDiscountTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MC-5517 - System tries to save 0 in Advanced Pricing which is invalid for Discount field"/>
+            <title value="You should be able to apply tier price to a product with float percent discount."/>
+            <description value="You should be able to apply tier price to a product with float percent discount."/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-96881"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAndpercent"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="1" stepKey="fillProductTierPriceQtyInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="Discount" stepKey="selectProductTierPriceValueType"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="0.1" stepKey="selectProductTierPricePriceInput"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.sku$$)}}" stepKey="goProductPageOnStorefront"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('99.90')}}" stepKey="assertProductFinalPriceProductPage"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceProductPage"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmountProductPage"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('99.90')}}" stepKey="assertProductFinalPriceCategoryPage"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabelCategoryPage"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmountCategoryPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
new file mode 100644
index 0000000000000..4261721d36064
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAssignProductAttributeToAttributeSetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/Update attribute set"/>
+            <title value="Admin should be able to assign attributes to an attribute set"/>
+            <description value="Admin should be able to assign attributes to an attribute set"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-168"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="productDropDownAttribute" stepKey="attribute"/>
+
+            <createData entity="productAttributeOption1" stepKey="option1">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="option2">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to default attribute set edit page -->
+        <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/{{AddToDefaultSet.attributeSetId}}/" stepKey="onAttributeSetEdit"/>
+        <!-- Assert created attribute in unassigned section -->
+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
+        <!-- Assign attribute to a group -->
+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+            <argument name="group" value="Product Details"/>
+            <argument name="attribute" value="$$attribute.attribute_code$$"/>
+        </actionGroup>
+        <!-- Assert attribute in a group -->
+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
+        <!-- Save attribute set -->
+        <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
+        <!-- Go to create new product page -->
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!-- Assert attribute can be used in product creation -->
+        <seeElement selector="{{AdminProductFormSection.attributeLabelByText($$attribute.attribute[frontend_labels][0][label]$$)}}" stepKey="seeLabel"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml
new file mode 100644
index 0000000000000..4d97dee56f059
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigureProductImagePlaceholderTest">
+
+        <annotations>
+            <features value="Configuration"/>
+            <stories value="Configure product placeholder images"/>
+            <title value="Admin is able to configure product placeholder images"/>
+            <description value="Admin should be able to configure the images used for product image placeholders. The configured placeholders should be seen on the frontend when an image has no image."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-5005"/>
+            <group value="configuration"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="category"/>
+            <!--Create product with no images-->
+            <createData entity="ApiSimpleProduct" stepKey="productNoImages">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <!--Create product with small, base, and thumbnail image-->
+            <createData entity="ApiSimpleProduct" stepKey="productWithImages">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="productImage">
+                <requiredEntity createDataKey="productWithImages"/>
+            </createData>
+        </before>
+
+        <after>
+            <!--Unset product image placeholders-->
+            <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPageAfter"/>
+            <waitForPageLoad stepKey="waitForConfigurationPageLoadAfter"/>
+            <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSectionAfter"/>
+            <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpenAfter"/>
+            <!--Delete base placeholder-->
+            <checkOption selector="{{AdminProductImagePlaceholderConfigSection.baseImageDelete}}" stepKey="checkDeleteBasePlaceholder"/>
+            <!--Delete small placeholder-->
+            <checkOption selector="{{AdminProductImagePlaceholderConfigSection.smallImageDelete}}" stepKey="checkDeleteSmallPlaceholder"/>
+            <!--Delete thumbnail placeholder-->
+            <checkOption selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImageDelete}}" stepKey="checkDeleteThumbnailPlaceholder"/>
+            <!--Save config to delete placeholders-->
+            <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigWithPlaceholders"/>
+            <!--See placeholders are empty-->
+            <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection2"/>
+            <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen2"/>
+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.baseImage}}" stepKey="dontSeeBaseImageSet"/>
+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.smallImage}}" stepKey="dontSeeSmallImageSet"/>
+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImage}}" stepKey="dontSeeThumbnailImageSet"/>
+            <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.swatchImage}}" stepKey="dontSeeSwatchImageSet"/>
+
+            <!--Delete prerequisite entities-->
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productNoImages" stepKey="deleteProductNoImages"/>
+            <deleteData createDataKey="productWithImages" stepKey="deleteProductWithImages"/>
+        </after>
+        
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        
+        <!--Admin area: configure Product Image Placeholders-->
+        <comment userInput="Configure product image placeholders in store config" stepKey="configurePlaceholderComment"/>
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
+        <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection1"/>
+        <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen1"/>
+        <!--Set base placeholder-->
+        <attachFile selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" userInput="{{placeholderBaseImage.file}}" stepKey="uploadBasePlaceholder"/>
+        <!--Set small placeholder-->
+        <attachFile selector="{{AdminProductImagePlaceholderConfigSection.smallImageInput}}" userInput="{{placeholderSmallImage.file}}" stepKey="uploadSmallPlaceholder"/>
+        <!--Set thumbnail placeholder-->
+        <attachFile selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImageInput}}" userInput="{{placeholderThumbnailImage.file}}" stepKey="uploadThumbnailPlaceholder"/>
+        <!--Save config with placeholders-->
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigWithPlaceholders"/>
+        <!--See images are saved-->
+        <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection2"/>
+        <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen2"/>
+        <seeElement selector="{{AdminProductImagePlaceholderConfigSection.baseImageBySrc(placeholderBaseImage.name)}}" stepKey="seeBasePlaceholderSet"/>
+        <seeElement selector="{{AdminProductImagePlaceholderConfigSection.smallImageBySrc(placeholderSmallImage.name)}}" stepKey="seeSmallPlaceholderSet"/>
+        <seeElement selector="{{AdminProductImagePlaceholderConfigSection.thumbnailImageBySrc(placeholderThumbnailImage.name)}}" stepKey="seeThumbnailPlaceholderSet"/>
+        <dontSeeElement selector="{{AdminProductImagePlaceholderConfigSection.swatchImage}}" stepKey="dontSeeSwatchImageSet"/>
+
+        <!--See correct placeholder images on category page-->
+        <comment userInput="Check placeholder images on the storefront" stepKey="checkStorefrontComment"/>
+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryStorefront1"/>
+        <waitForPageLoad stepKey="waitForStorefrontCategory1"/>
+        <!--Product with no images uses placeholder-->
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByName($$productNoImages.name$$)}}" stepKey="seeProductNoImagesInCategory"/>
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$productNoImages.name$$)}}" userInput="src" stepKey="getSmallPlaceholderImageSrc"/>
+        <assertContains stepKey="checkSmallPlaceholderImage">
+            <actualResult type="variable">$getSmallPlaceholderImageSrc</actualResult>
+            <expectedResult type="string">{{placeholderSmallImage.name}}</expectedResult>
+        </assertContains>
+        <!--Product with images does not use placeholder-->
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$productWithImages.name$$)}}" stepKey="seeProductWithImagesInCategory"/>
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$productWithImages.name$$)}}" userInput="src" stepKey="getSmallNonPlaceholderImageSrc"/>
+        <assertNotContains stepKey="checkSmallPlaceholderImageNotUsed">
+            <actualResult type="variable">$getSmallNonPlaceholderImageSrc</actualResult>
+            <expectedResult type="string">{{placeholderSmallImage.name}}</expectedResult>
+        </assertNotContains>
+
+        <!--Check base image on product page-->
+        <!--Product which is using placeholder-->
+        <click selector="{{StorefrontCategoryProductSection.ProductImageByName($$productNoImages.name$$)}}" stepKey="goToProductNoImages"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
+        <seeInCurrentUrl url="$$productNoImages.sku$$" stepKey="seeCorrectProductPage1"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(placeholderBaseImage.name)}}" stepKey="seeBasePlaceholderImage"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addProductToCart1"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForProductAdded1"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart1"/>
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$productNoImages.name$$)}}" userInput="src" stepKey="getThumbnailPlaceholderImageSrc"/>
+        <assertContains stepKey="checkThumbnailPlaceholderImage">
+            <actualResult type="variable">$getThumbnailPlaceholderImageSrc</actualResult>
+            <expectedResult type="string">{{placeholderThumbnailImage.name}}</expectedResult>
+        </assertContains>
+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromCart1">
+            <argument name="productName" value="$$productNoImages.name$$"/>
+        </actionGroup>
+        <!--Product which is NOT using placeholder-->
+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryStorefront2"/>
+        <waitForPageLoad stepKey="waitForStorefrontCategory2"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductImageByName($$productWithImages.name$$)}}" stepKey="goToProductWithImages"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <seeInCurrentUrl url="$$productWithImages.sku$$" stepKey="seeCorrectProductPage2"/>
+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(placeholderBaseImage.name)}}" stepKey="dontSeeBasePlaceholderImage"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addProductToCart2"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForProductAdded2"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart2"/>
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$productWithImages.name$$)}}" userInput="src" stepKey="getThumbnailImageSrc"/>
+        <assertNotContains stepKey="checkThumbnailImage">
+            <actualResult type="variable">$getThumbnailImageSrc</actualResult>
+            <expectedResult type="string">{{placeholderThumbnailImage.name}}</expectedResult>
+        </assertNotContains>
+        <actionGroup ref="removeProductFromMiniCart" stepKey="removeProductFromCart2">
+            <argument name="productName" value="$$productWithImages.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
new file mode 100644
index 0000000000000..a5150a0fb7f24
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryFromProductPageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/Edit Category in Admin"/>
+            <title value="Admin should be able to create category from the product page"/>
+            <description value="Admin should be able to create category from the product page" />
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-234"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <createData entity="SimpleTwo" stepKey="simpleProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the created category -->
+            <actionGroup ref="DeleteMostRecentCategory" stepKey="getRidOfCreatedCategory"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!-- Find the product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="SimpleTwo"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Fill out the form for the new category -->
+        <actionGroup ref="FillNewProductCategory" stepKey="FillNewProductCategory">
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
+
+        <!-- Check that category was created -->
+        <actionGroup ref="CategoryPresent" stepKey="checkIfCategoryPresent">
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
new file mode 100644
index 0000000000000..8806612c0f5de
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create a Category via the Admin"/>
+            <title value="Admin should be able to create a Category"/>
+            <description value="Admin should be able to create a Category"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-72102"/>
+            <group value="category"/>
+        </annotations>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="enterURLKey"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+
+        <!-- Literal URL below, need to refactor line + StorefrontCategoryPage when support for variable URL is implemented-->
+        <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
+        <seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertTitle"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="assertInfo1"/>
+    </test>
+    <test name="AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Default layout configuration MAGETWO-88793"/>
+            <title value="Admin should be able to configure the default layout for Category Page from System Configuration"/>
+            <description value="Admin should be able to configure the default layout for Category Page from System Configuration"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89024"/>
+            <group value="category"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{DefaultLayoutsSection.categoryLayout}}" stepKey="waitForDefaultCategoryLayout" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected" />
+        <selectOption selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="2 columns with right bar" stepKey="select2ColumnsLayout"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToNewCatalog"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <waitForLoadingMaskToDisappear stepKey="wait2" />
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+        <click selector="{{CategoryDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
+        <waitForElementVisible selector="{{CategoryDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
+        <seeOptionIsSelected selector="{{CategoryDesignSection.LayoutDropdown}}" userInput="2 columns with right bar" stepKey="see2ColumnsSelected" />
+    </test>
+    <test name="AdminCategoryFormDisplaySettingsUIValidationTest">
+    <annotations>
+        <features value="Catalog"/>
+        <stories value="Default layout configuration MAGETWO-88793"/>
+        <title value="Category should not be saved once layered navigation price step field is left empty"/>
+        <description value="Once the Config setting is unchecked Category should not be saved with layered navigation price field left empty"/>
+        <severity value="AVERAGE"/>
+        <testCaseId value="MAGETWO-95797"/>
+        <group value="category"/>
+    </annotations>
+    <before>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+    </before>
+    <after>
+        <actionGroup ref="logout" stepKey="logout"/>
+    </after>
+    <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+    <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+    <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+    <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
+    <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="clickOnDisplaySettingsTab"/>
+     <waitForElementVisible selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="wait"/>
+    <scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" stepKey="scrollToLayeredNavigationField"/>
+    <uncheckOption selector="{{CategoryDisplaySettingsSection.filterPriceRangeUseConfig}}" stepKey="uncheckConfigSetting"/>
+    <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+    <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/>
+    <!-- Verify that the Layered navigation price step field has the required indicator -->
+    <comment userInput="Check if Layered navigation price field has required indictor icon" stepKey="comment" />
+    <executeJS function="{{CategoryDisplaySettingsSection.RequiredFieldIndicator('filter_price_range')}}" stepKey="getRequiredFieldIndicator"/>
+    <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
new file mode 100644
index 0000000000000..9115004ad9585
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithAnchorFieldTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Create anchor subcategory with all fields"/>
+            <description value="Login as admin and create anchor subcategory with all fields"/>
+            <testCaseId value="MC-5267"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultBlock" stepKey="createDefaultCMSBlock"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct" />
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createDefaultCMSBlock" stepKey="deleteDefaultCMSBlock"/>
+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct"/>
+        </after>
+        <!--Create  SubCategory-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <!--Select Content and fill the options-->
+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
+        <scrollTo selector="{{AdminCategoryContentSection.AddCMSBlock}}" x="0" y="-80" stepKey="scrollToAddCMSBlock"/>
+        <selectOption selector="{{AdminCategoryContentSection.AddCMSBlock}}" userInput="$$createDefaultCMSBlock.title$$" stepKey="selectCMSBlock"/>
+        <!--Select Display Setting and fill the options-->
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
+        <selectOption selector="{{CategoryDisplaySettingsSection.displayMode}}" userInput="PRODUCTS_AND_PAGE" stepKey="selectdisplayMode"/>
+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
+        <click selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" stepKey="enableTheAvailableProductList"/>
+        <selectOption selector="{{CategoryDisplaySettingsSection.productList}}" parameterArray="['Position', 'Product Name', 'Price']" stepKey="selectPrice"/>
+        <scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
+        <click selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
+        <selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="name" stepKey="selectProductName"/>
+        <scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" x="0" y="-80" stepKey="scrollToLayeredNavPrice"/>
+        <click selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" stepKey="enableLayeredNavigationPrice"/>
+        <fillField selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" userInput="5.5" stepKey="fillThePrice"/>
+        <!--Search the products and select the category products-->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$"  stepKey="selectProduct"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
+        <!--Verify the Category Title-->
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <!--Verify Product in store front page-->
+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name_lwr)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="seeProductInCategory"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
new file mode 100644
index 0000000000000..e8c6da476a3d6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithCustomRootCategoryTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Create category in the custom root category that is used for custom website"/>
+            <description value="Login as admin and create a root category with nested sub category and verify category in store front "/>
+            <testCaseId value="MC-5272"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
+            <waitForPageLoad stepKey="waitStoreIndexPageLoad" />
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStore.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCreatedNewRootCategory">
+                <argument name="categoryEntity" value="NewRootCategory"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <!--Create Root Category-->
+        <actionGroup ref="AdminCreateRootCategory" stepKey="createNewRootCategory">
+            <argument name="categoryEntity" value="NewRootCategory"/>
+        </actionGroup>
+        <!--Create subcategory-->
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name)}}" stepKey="clickOnCreatedNewRootCategory"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+        <actionGroup ref="CreateCategory" stepKey="createSubcategory">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <!--Create a Store-->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <!--Create a Store View-->
+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
+        <click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
+        <selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
+        <!--Go to store front page-->
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
+        <!--Verify subcategory displayed in store front page-->
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="selectCustomStore"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryInStoreFrontPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
new file mode 100644
index 0000000000000..530bafaef24c2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithFiveNestingTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Create category with five nesting"/>
+            <description value="Login as admin and create nested sub category and verify the subcategory displayed in store front page  "/>
+            <testCaseId value="MC-5271"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
+            <waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
+            <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="clickCategoryLink"/>
+            <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
+            <waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
+            <see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
+            <click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
+            <waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
+            <see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
+            <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+            <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create Category with Five Nesting -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <!--Create Nested First Category-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillFirstSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstSubCategory"/>
+        <waitForPageLoad stepKey="waitForSFirstSubCategorySaved"/>
+        <!-- Verify success message -->
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <!--Create Nested Second Sub Category-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategory"/>
+        <!-- Verify success message -->
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage1"/>
+        <!--Create Nested Third Sub Category/>-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton2"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{ThirdLevelSubCat.name}}" stepKey="fillThirdSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveThirdSubCategory"/>
+        <waitForPageLoad stepKey="waitForThirdCategorySaved"/>
+        <!-- Verify success message -->
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage2"/>
+        <!--Create Nested fourth Sub Category />-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton3"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FourthLevelSubCat.name}}" stepKey="fillFourthSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFourthSubCategory"/>
+        <waitForPageLoad stepKey="waitForFourthCategorySaved"/>
+        <!-- Verify success message -->
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage3"/>
+        <!--Create Nested fifth Sub Category />-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton4"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FifthLevelCat.name}}" stepKey="fillFifthSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFifthLevelCategory"/>
+        <waitForPageLoad stepKey="waitForFifthCategorySaved"/>
+        <!-- Verify success message -->
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage4"/>
+        <amOnPage url="/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}/{{ThirdLevelSubCat.name}}/{{FourthLevelSubCat.name}}/{{FifthLevelCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
+        <!--<Verify category displayed in store front page-->
+        <grabMultiple selector=".breadcrumbs li"  stepKey="breadcrumbs"/>
+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
+            <expectedResult type="array">['Home', {{FirstLevelSubCat.name}}, {{SecondLevelSubCat.name}}, {{ThirdLevelSubCat.name}}, {{FourthLevelSubCat.name}}, {{FifthLevelCat.name}} ]</expectedResult>
+            <actualResult type="variable">breadcrumbs</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
new file mode 100644
index 0000000000000..96f945da138b0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithInactiveCategoryTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Create disabled subcategory"/>
+            <description value="Login as admin and create category with inactivated enable category option"/>
+            <testCaseId value="MC-5268"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Create In active Category -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
+        <!--Verify InActive Category is created-->
+        <seeElement  selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree" />
+        <!--Verify Category is not listed store front page-->
+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreFrontPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
new file mode 100644
index 0000000000000..c983089163f78
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithInactiveIncludeInMenuTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Create not included in menu subcategory"/>
+            <description value="Login as admin and create category with inactivated include in menu option"/>
+            <testCaseId value="MC-5269"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create Category with not included in menu Subcategory  -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageSaved"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <!--Verify Category is created/>-->
+        <seeElement selector="{{AdminCategoryContentSection.activeCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree"  />
+        <!--Verify Category in store front page menu/>-->
+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnNavigation"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
new file mode 100644
index 0000000000000..7c24a8aba27bd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithProductsGridFilter">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Apply category products grid filter"/>
+            <description value="Login as admin and create default product and product with grid filter"/>
+            <testCaseId value="MC-5273"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct1">
+                <argument name="product" value="defaultSimpleProduct"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct2">
+                <argument name="product" value="SimpleProduct"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <!--Create Default Product-->
+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddDefaultProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillDefaultProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{SimpleProduct.sku}}" stepKey="fillDefaultProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="fillDefaultProductPrice"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSearchEngine"/>
+        <click selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="selectSearchEngineOptimization"/>
+        <fillField selector="{{AdminProductFormBundleSection.urlKey}}" userInput="{{SimpleProduct.urlKey}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveDefaultProduct"/>
+        <waitForPageLoad stepKey="waitForPDefaultProductSaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="successMessageYouSavedTheProductIsShown"/>
+        <!--Create product with grid filter Not Visible Individually-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="ProductList"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddFilterProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{defaultSimpleProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{defaultSimpleProduct.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminCategoryProductsGridSection.productVisibility}}" userInput="Not Visible Individually" stepKey="selectProductVisibility"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSearchEngineOptimization"/>
+        <click selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="selectSearchEngineOptimization1"/>
+        <fillField selector="{{AdminProductFormBundleSection.urlKey}}" userInput="{{defaultSimpleProduct.urlKey}}" stepKey="fillUrlKey1"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForProductSaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Create sub category-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
+        <!--Select the default product and product with grid filter-->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="{{SimpleProduct.name}}"  stepKey="selectProduct"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromRow"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="{{defaultSimpleProduct.name}}"  stepKey="selectDefaultProduct"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton1"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectDefaultProductFromTableRow"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="WaitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="successMessageYouSavedTheCategory"/>
+        <!--Verify product with grid filter is not not visible-->
+        <amOnPage url="{{StorefrontProductPage.url(defaultSimpleProduct.urlKey)}}" stepKey="seeOnProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="dontSeeProductInStoreFrontPage"/>
+        <!--Verify product in Store Front Page-->
+        <amOnPage url="{{StorefrontProductPage.url(SimpleProduct.urlKey)}}" stepKey="seeDefaultProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductInStoreFrontPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
new file mode 100644
index 0000000000000..1b6c9707b0656
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCategoryWithRequiredFieldsTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <title value="Create Category from Category page with Required Fields Only"/>
+            <description value="Login as an admin and create a category with required fields."/>
+            <testCaseId value="MC-5265"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Create subcategory with required fields -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <!-- Verify success message -->
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <!-- Verify subcategory created with required fields -->
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <seeElement selector="{{AdminCategoryContentSection.activeCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree"  />
+        <!--Verify Category is listed in store front page menu/>-->
+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
new file mode 100644
index 0000000000000..525f81de6c48c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateDropdownProductAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/configure Dropdown product attribute"/>
+            <title value="Admin should be able to create dropdown product attribute"/>
+            <description value="Admin should be able to create dropdown product attribute"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-4982"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Set attribute properties -->
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}"
+                   userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.InputType}}"
+                      userInput="{{productDropDownAttribute.frontend_input}}" stepKey="fillInputType"/>
+
+        <!-- Set advanced attribute properties -->
+        <click selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}"
+               stepKey="showAdvancedAttributePropertiesSection"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
+                               stepKey="waitForSlideOut"/>
+        <fillField selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
+                   userInput="{{productDropDownAttribute.attribute_code}}"
+                   stepKey="fillAttributeCode"/>
+
+        <!-- Add new attribute options -->
+        <click selector="{{AttributeOptionsSection.AddOption}}" stepKey="clickAddOption1"/>
+        <fillField selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('1')}}"
+                   userInput="Fish and Chips" stepKey="fillAdminValue1"/>
+
+        <click selector="{{AttributeOptionsSection.AddOption}}" stepKey="clickAddOption2"/>
+        <fillField selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('2')}}"
+                   userInput="Fish &amp; Chips" stepKey="fillAdminValue2"/>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave1"/>
+        <waitForPageLoad stepKey="waitForGridPageLoad1"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
+                    stepKey="waitForSuccessMessage"/>
+
+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
+            <argument name="ProductAttribute" value="productDropDownAttribute"/>
+        </actionGroup>
+        <!-- Check attribute data -->
+        <grabValueFrom selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('2')}}"
+                       stepKey="secondOptionAdminLabel"/>
+        <assertEquals actual="$secondOptionAdminLabel" expected="'Fish &amp; Chips'"
+                      stepKey="assertSecondOption"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
new file mode 100644
index 0000000000000..713e1b7d6dfd1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductCustomAttributeSet">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/Update attribute set"/>
+            <title value="Admin should be able to create a simple product using a custom attribute set"/>
+            <description value="Admin should be able to create a simple product using a custom attribute set"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-244"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the new attribute set -->
+            <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
+            <waitForPageLoad stepKey="wait1"/>
+            <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="filterByName"/>
+            <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
+            <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+            <waitForPageLoad stepKey="wait2"/>
+            <click selector="{{AdminProductAttributeSetSection.deleteBtn}}" stepKey="clickDelete"/>
+            <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="confirmDelete"/>
+            <waitForPageLoad stepKey="wait3"/>
+
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a new attribute set -->
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{AdminProductAttributeSetGridSection.addAttributeSetBtn}}" stepKey="clickAddAttributeSet"/>
+        <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillName"/>
+        <selectOption selector="{{AdminProductAttributeSetSection.basedOn}}" userInput="Default" stepKey="selectDefaultSet"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('meta_keyword')}}" selector2="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" stepKey="unassign1"/>
+        <click selector="{{AdminProductAttributeSetSection.addNewGroupBtn}}" stepKey="clickAddNewGroup"/>
+        <fillField selector="{{AdminProductAttributeSetSection.newGroupName}}" userInput="TestGroupName" stepKey="fillNewGroupName"/>
+        <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="clickOkInModal"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" selector2="{{AdminProductAttributeSetSection.attribute('TestGroupName')}}" stepKey="assignManufacturer"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave2"/>
+
+        <!-- Go to new product page and see a default attribute -->
+        <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToNewProductPage"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="expandSEOSection"/>
+        <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('meta_keyword')}}" stepKey="seeMetaKeyword"/>
+        <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('testgroupname')}}" stepKey="dontSeeTestGroupName"/>
+
+        <!-- Switch from default attribute set to new attribute set -->
+        <!-- A scrollToTopOfPage is needed to hide the floating header -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
+
+        <!-- See new attibute set -->
+        <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('testgroupname')}}" stepKey="seeTestGroupName"/>
+        <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('meta_keyword')}}" stepKey="dontSeeMetaKeyword"/>
+
+        <!-- Finish filling the new product page -->
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+        <!-- Check the storefront -->
+        <amOnPage url="{{_defaultProduct.name}}.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitlte"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see userInput="${{_defaultProduct.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
new file mode 100644
index 0000000000000..6658ad36d7150
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductDuplicateUrlkeyTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Errors"/>
+            <title value="Admin should see an error when trying to save a product with a duplicate URL key"/>
+            <description value="Admin should see an error when trying to save a product with a duplicate URL key"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-112"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleTwo" stepKey="simpleProduct">
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="$$simpleProduct.name$$new" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="$$simpleProduct.sku$$new" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="$$simpleProduct.price$$" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="$$simpleProduct.quantity$$" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="$$simpleProduct.custom_attributes[url_key]$$" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
+    </test>
+    <test name="AdminCreateProductDuplicateProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Validation Errors"/>
+            <title value="No validation errors when trying to duplicate product twice"/>
+            <description value="No validation errors when trying to duplicate product twice"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-5472"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!--Delete all products by filtering grid and using mass delete action-->
+            <actionGroup ref="deleteAllDuplicateProductUsingProductGrid" stepKey="deleteAllDuplicateProducts">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <deleteData createDataKey="createCategory" stepKey="deletePreReqCatalog" />
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!--Save and duplicated the product once-->
+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm1"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!--Save and duplicated the product second time-->
+        <actionGroup ref="AdminFormSaveAndDuplicate" stepKey="saveAndDuplicateProductForm2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
new file mode 100644
index 0000000000000..11d919ddefa2c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateRootCategoryAndSubcategoriesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create categories"/>
+            <title value="Admin should be able to create a Root Category and a Subcategory"/>
+            <description value="Admin should be able to create a Root Category and a Subcategory"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-46142"/>
+            <group value="category"/>
+        </annotations>
+        <!--Delete all created data during the test execution and assign Default Root Category to Store-->
+        <after>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
+            <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+            <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
+            <waitForPageLoad  time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
+            <fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"  stepKey="fillFieldOnWebsiteStore"/>
+            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickOnSearchButton"/>
+            <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
+            <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickOnstoreGrpNameInFirstRow"/>
+            <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad1" />
+            <selectOption userInput="Default Category" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectOptionDefaultCategory"/>
+            <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+            <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkOnModalDialog2"/>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCreatedNewRootCategory">
+                <argument name="categoryEntity" value="NewRootCategory"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout2"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnAdminCategoryPage"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!--Create new root category-->
+        <actionGroup ref="AdminCreateRootCategory" stepKey="createNewRootCategory">
+            <argument name="categoryEntity" value="NewRootCategory"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
+        <!--Create subcategory-->
+        <actionGroup ref="CreateCategory" stepKey="createSubcategory1">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name)}}" stepKey="clickOnCreatedNewRootCategory1"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage3"/>
+        <!--Create another subcategory-->
+        <actionGroup ref="CreateCategory" stepKey="createSubcategory2">
+            <argument name="categoryEntity" value="SubCategoryWithParent"/>
+        </actionGroup>
+        <!--Assign new created root category to store-->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
+        <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad  time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
+        <fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"  stepKey="fillFieldOnWebsiteStore"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickOnstoreGrpNameInFirstRow"/>
+        <waitForPageLoad stepKey="waitForPageAdminStoresGroupEditLoad" />
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectOptionCreatedNewRootCategory"/>
+        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkOnModalDialog1"/>
+        <actionGroup ref="logout" stepKey="logout1"/>
+        <!--Go to storefront and verify created subcategory on frontend-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad2"/>
+        <actionGroup ref="CheckCategoryOnStorefront" stepKey="checkCreatedSubcategory1OnFrontend">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <actionGroup ref="CheckCategoryOnStorefront" stepKey="checkCreatedSubcategory2OnFrontend">
+            <argument name="categoryEntity" value="SubCategoryWithParent"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
new file mode 100644
index 0000000000000..f98f9acc46961
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateRootCategoryRequiredFieldsTest">
+        <annotations>
+            <stories value="Create categories"/>
+            <features value="Catalog"/>
+            <title value="Create Root Category from Category Page"/>
+            <description value="Create Root Category from Category Page"/>
+            <testCaseId value="MC-5263"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="LoginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+                <argument name="categoryEntity" value="_defaultCategory" />
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout" />
+        </after>
+
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="OpenAdminCatergoryIndexPage"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddRootCategoryButton}}" stepKey="ClickOnAddRootButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="FillCategoryField"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="EnableCheckOption"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="ClickSaveButton"/>
+        <waitForPageLoad stepKey="WaitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="AssertSuccessMessage"/>
+        <seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}"  stepKey="SeeCheckBoxisSelected"/>
+        <seeInField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="SeedFieldInput"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
new file mode 100644
index 0000000000000..6096ee1fa3996
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create a Simple Product via Admin"/>
+            <title value="Admin should be able to create a Simple Product"/>
+            <description value="Admin should be able to create a Simple Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-23414"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+    </test>
+
+    <test name="AdminConfigDefaultProductLayoutFromConfigurationSettingTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Default layout configuration MAGETWO-88793"/>
+            <title value="Admin should be able to configure a default layout for Product Page from System Configuration"/>
+            <description value="Admin should be able to configure a default layout for Product Page from System Configuration"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89023"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{DefaultLayoutsSection.productLayout}}" stepKey="DefaultProductLayout" />
+        <selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="3 columns" stepKey="select3ColumnsLayout"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{ProductDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
+        <waitForElementVisible selector="{{ProductDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
+        <seeOptionIsSelected selector="{{ProductDesignSection.LayoutDropdown}}" userInput="3 columns" stepKey="see3ColumnsSelected" />
+    </test>
+
+    <test name="AdminCreateSimpleProductZeroPriceTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create a Simple Product via Admin"/>
+            <title value="Admin should be able to create a product with zero price"/>
+            <description value="Admin should be able to create a product with zero price"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89910"/>
+            <group value="product"/>
+        </annotations>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductCreatePage.url(SimpleProduct.visibility, SimpleProduct.type_id)}}" stepKey="goToCreateProduct"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillName"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="0" stepKey="fillPrice"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <amOnPage url="{{StorefrontProductPage.url(SimpleProduct.name)}}" stepKey="viewProduct"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.00" stepKey="seeZeroPrice"/>
+    </test>
+
+    <test name="AdminCreateSimpleProductNegativePriceTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create a Simple Product via Admin"/>
+            <title value="Admin should not be able to create a product with a negative price"/>
+            <description value="Admin should not be able to create a product with a negative price"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89912"/>
+            <group value="product"/>
+        </annotations>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductCreatePage.url(SimpleProduct.visibility, SimpleProduct.type_id)}}" stepKey="goToCreateProduct"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillName"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="-42" stepKey="fillPrice"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <see selector="{{AdminProductFormSection.priceFieldError}}" userInput="Please enter a number 0 or greater in this field." stepKey="seePriceValidationError"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
new file mode 100644
index 0000000000000..896a28d0298e6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateSimpleProductWithUnicodeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create a Unicode Named Simple Product via Admin"/>
+            <title value="Admin should be able to create a unicode named simple product"/>
+            <description value="Admin should be able to create a unicode named simple product"/>
+            <severity value="MAJOR" />
+            <testCaseId value="MC-105"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="ProductWithUnicode"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="product" value="ProductWithUnicode"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2">
+            <argument name="product" value="ProductWithUnicode"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
new file mode 100644
index 0000000000000..e914b8c96d03e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEditTextEditorProductAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-51484-Input type configuration for custom Product Attributes"/>
+            <group value="Catalog"/>
+            <title value="Admin should be able to switch between two versions of TinyMCE"/>
+            <description value="Admin should be able to switch between two versions of TinyMCE"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-85745"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+            <createData stepKey="myProductAttributeCreation" entity="productAttributeWysiwyg"/>
+            <createData stepKey="myProductAttributeSetAssign" entity="AddToDefaultSet">
+                <requiredEntity createDataKey="myProductAttributeCreation"/>
+            </createData>
+        </before>
+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
+            <argument name="ProductAttribute" value="productAttributeWysiwyg"/>
+        </actionGroup>
+        <seeOptionIsSelected selector="{{AttributePropertiesSection.InputType}}" userInput="Text Editor" stepKey="seeTextEditorSelected" />
+        <see selector="{{AttributePropertiesSection.InputType}}" userInput="Text Area" stepKey="seeTextArea1" />
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Area"  stepKey="selectTextArea" />
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab1"/>
+        <dontSeeElement selector="{{StorefrontPropertiesSection.EnableWYSIWYG}}" stepKey="dontSeeWYSIWYGEnableField1" />
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute1" />
+        <waitForPageLoad stepKey="waitForPageLoad3" />
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <dontSeeElement selector="{{ProductAttributeWYSIWYGSection.TinyMCE4($$myProductAttributeCreation.attribute_code$$)}}" stepKey="dontSeeTinyMCE4" />
+        <fillField selector="{{ProductAttributeWYSIWYGSection.TextArea($$myProductAttributeCreation.attribute_code$$)}}" userInput="Text Area" stepKey="fillContentTextarea" />
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading1"/>
+        <!-- Go to storefront product page, assert product content -->
+        <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <see userInput="Text Area" stepKey="seeText2" />
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid2"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <click selector="{{AdminProductAttributeGridSection.AttributeCode($$myProductAttributeCreation.attribute_code$$)}}" stepKey="navigateToAttributeEditPage2" />
+        <waitForPageLoad stepKey="waitForPageLoad7" />
+        <seeOptionIsSelected selector="{{AttributePropertiesSection.InputType}}" userInput="Text Area" stepKey="seeTextAreaSelected" />
+        <see selector="{{AttributePropertiesSection.InputType}}" userInput="Text Editor" stepKey="seeTextEditor" />
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Editor"  stepKey="selectEditor" />
+        <see userInput="Text Editor input type requires WYSIWYG to be enabled in Stores > Configuration > Content Management." stepKey="seeHintMsg" />
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab2"/>
+        <dontSeeElement selector="{{StorefrontPropertiesSection.EnableWYSIWYG}}" stepKey="dontSeeWYSIWYGEnableField2" />
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute8" />
+        <waitForPageLoad stepKey="waitForPageLoad8"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGrid" />
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.enabledFilters}}" visible="true" stepKey="clearAllExistingFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingAfterFilterIsCleared"/>
+        <fillField selector="{{AdminProductGridFilterSection.basicSearchFilter}}" userInput="{{_defaultProduct.name}}" stepKey="addSearchFilterForTestProduct"/>
+        <click selector="{{AdminProductGridFilterSection.basicSearchFilterButton}}" stepKey="clickOnBasicSearchFilterButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingAfterBasicFilter"/>
+        <click selector="{{AdminProductGridActionSection.productName(_defaultProduct.name)}}"  stepKey="navigateToEditProduct" />
+        <waitForPageLoad stepKey="waitForPageLoad10" />
+        <seeElement selector="{{ProductAttributeWYSIWYGSection.TinyMCE4($$myProductAttributeCreation.attribute_code$$)}}" stepKey="seePoweredBy"/>
+        <after>
+            <deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
new file mode 100644
index 0000000000000..efceff6ffb177
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminFilteringCategoryProductsUsingScopeSelectorTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Filtering Category Products using scope selector"/>
+            <description value="Filtering Category Products using scope selector"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-48850"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create website, Sore adn Store View-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateWebsite">
+                <argument name="newWebsiteName" value="secondWebsite"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateStore">
+                <argument name="website" value="secondWebsite"/>
+                <argument name="storeGroupName" value="secondStore"/>
+                <argument name="storeGroupCode" value="second_store"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateStoreView">
+                <argument name="StoreGroup" value="customStoreTierPrice"/>
+                <argument name="customStore" value="customStoreView"/>
+            </actionGroup>
+
+            <!--Create Simple Product and Category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct0">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct12">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Set filter to product name and product0 not assigned to any website-->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct0">
+                <argument name="product" value="$$createProduct0$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit0">
+                <argument name="product" value="$$createProduct0$$"/>
+            </actionGroup>
+            <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsitesSection"/>
+            <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenWebsiteSection"/>
+            <waitForPageLoad stepKey="waitForToOpenedWebsiteSection"/>
+            <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite"/>
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+            <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
+                 stepKey="seeSuccessMessage"/>
+
+            <!-- Set filter to product name and product2 in website 2 only -->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
+                <argument name="product" value="$$createProduct2$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit2">
+                <argument name="product" value="$$createProduct2$$"/>
+            </actionGroup>
+            <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites">
+                <argument name="website" value="secondWebsite"/>
+            </actionGroup>
+            <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite1"/>
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct1"/>
+            <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
+                 stepKey="seeSuccessMessage1"/>
+
+            <!-- Set filter to product name and product12 assigned to both websites 1 and 2 -->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct12">
+                <argument name="product" value="$$createProduct12$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit12">
+                <argument name="product" value="$$createProduct12$$"/>
+            </actionGroup>
+            <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites1">
+                <argument name="website" value="secondWebsite"/>
+            </actionGroup>
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
+            <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
+                 stepKey="seeSuccessMessage2"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
+            <deleteData createDataKey="createProduct0" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createProduct12" stepKey="deleteProduct3"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Step 1-2: Open Category page and Set scope selector to All Store Views-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
+               stepKey="clickCategoryName"/>
+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection"/>
+        <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
+                      stepKey="grabTextFromCategory"/>
+        <assertRegExp expected="/\(4\)$/" expectedType="string" actual="$grabTextFromCategory" actualType="variable"
+                      message="wrongCountProductOnAllStoreViews" stepKey="checkCountProducts"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
+             userInput="$$createProduct0.name$$" stepKey="seeProductName"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
+             userInput="$$createProduct1.name$$" stepKey="seeProductName1"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
+             userInput="$$createProduct2.name$$" stepKey="seeProductName2"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"
+             userInput="$$createProduct12.name$$" stepKey="seeProductName3"/>
+
+        <!-- Step 3: Set scope selector to Website1( Storeview for the Website 1) -->
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}"
+               stepKey="clickStoresList"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad1"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption('Default Store View')}}"
+               stepKey="clickStoreView"/>
+        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
+                               stepKey="waitForPopup1"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}" stepKey="clickActionAccept"/>
+        <waitForElementNotVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
+                                  stepKey="waitForNotVisibleModalAccept"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad2"/>
+        <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
+                      stepKey="grabTextFromCategory1"/>
+        <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory1" actualType="variable"
+                      message="wrongCountProductOnWebsite1" stepKey="checkCountProducts1"/>
+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection1"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
+             userInput="$$createProduct1.name$$" stepKey="seeProductName4"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"
+             userInput="$$createProduct12.name$$" stepKey="seeProductName5"/>
+        <waitForText userInput="$$createCategory.name$$ (2)" stepKey="seeCorrectProductCount"/>
+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
+                 userInput="$$createProduct0.name$$" stepKey="dontSeeProductName"/>
+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
+                 userInput="$$createProduct2.name$$" stepKey="dontSeeProductName1"/>
+
+        <!-- Step 4: Set scope selector to Website2 ( StoreView for Website 2) -->
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}"
+               stepKey="clickStoresList1"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad3"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption('secondStoreView')}}"
+               stepKey="clickStoreView1"/>
+        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
+                               stepKey="waitForPopup2"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
+               stepKey="clickActionAccept1"/>
+        <waitForElementNotVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
+                                  stepKey="waitForNotVisibleModalAccept1"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad4"/>
+        <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection2"/>
+        <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
+                      stepKey="grabTextFromCategory2"/>
+        <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory2" actualType="variable"
+                      message="wrongCountProductOnWebsite2" stepKey="checkCountProducts2"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
+             userInput="$$createProduct2.name$$" stepKey="seeProductName6"/>
+        <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"
+             userInput="$$createProduct12.name$$" stepKey="seeProductName7"/>
+        <waitForText userInput="$$createCategory.name$$ (2)" stepKey="seeCorrectProductCount2"/>
+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
+                 userInput="$$createProduct0.name$$" stepKey="dontSeeProductName2"/>
+        <dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
+                 userInput="$$createProduct1.name$$" stepKey="dontSeeProductName3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
new file mode 100644
index 0000000000000..8d5121cf21461
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassChangeProductsStatusTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass change product status"/>
+            <title value="Admin should be able to mass change products status"/>
+            <description value="Admin should be able to mass change products status"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-57"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass change status -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatus"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Disable')}}" stepKey="clickDisable"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) have been updated." stepKey="seeAttributeUpateSuccessMsg"/>
+
+        <!-- Assert product one is not visible on storefront -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStorefrontAdvancedCatalogSearchProductOne"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameProductOne">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
+            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultForProductOne"/>
+        <see userInput="We can't find any items matching these search criteria" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.message}}" stepKey="seeCantFindProductOneMessage"/>
+
+        <!-- Assert product two is not visible on storefront -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStorefrontAdvancedCatalogSearchProductTwo"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameProductTwo">
+            <argument name="name" value="$$createProductTwo.name$$"/>
+            <argument name="priceFrom" value="$$createProductTwo.price$$0"/>
+            <argument name="priceTo" value="$$createProductTwo.price$$0"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultForProductTwo"/>
+        <see userInput="We can't find any items matching these search criteria" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.message}}" stepKey="seeCantFindProductTwoMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
new file mode 100644
index 0000000000000..c0eebd1512d6d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductAttributesGlobalScopeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product attributes"/>
+            <title value="Admin should be able to mass update product attributes in global scope"/>
+            <description value="Admin should be able to mass update product attributes in global scope"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-56"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <seeInCurrentUrl stepKey="seeInUrl" url="catalog/product_action_attribute/edit/"/>
+        <!-- Switch store view -->
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
+        <!-- Update attribute -->
+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
+        <fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
+        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+
+        <!-- Assert on storefront default view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
+            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Assert on storefront custom view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameCustom">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
+            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
new file mode 100644
index 0000000000000..fe0e46369c5e6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductAttributesMissingRequiredFieldTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product attributes"/>
+            <title value="Mass update product attributes - missing required field"/>
+            <description value="Mass update product attributes - missing required field"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-55"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <seeInCurrentUrl stepKey="seeInUrl" url="catalog/product_action_attribute/edit/"/>
+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributeNameToggle}}" stepKey="toggleToChangeName"/>
+        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
+        <see stepKey="seeError" selector="{{AdminEditProductAttributesSection.NameError}}" userInput="This is a required field"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
new file mode 100644
index 0000000000000..845c47c0e4c20
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductAttributesStoreViewScopeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product attributes"/>
+            <title value="Admin should be able to mass update product attributes in store view scope"/>
+            <description value="Admin should be able to mass update product attributes in store view scope"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-128"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+            <createData entity="ApiProductWithDescription" stepKey="createProductOne"/>
+            <createData entity="ApiProductWithDescription" stepKey="createProductTwo"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <seeInCurrentUrl stepKey="seeInUrl" url="catalog/product_action_attribute/edit/"/>
+        <!-- Switch store view -->
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
+        <!-- Update attribute -->
+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributeDescriptionToggle}}" stepKey="toggleToChangeDescription"/>
+        <fillField selector="{{AdminEditProductAttributesSection.AttributeDescription}}" userInput="Updated $$createProductOne.custom_attributes[description]$$" stepKey="fillAttributeDescriptionField"/>
+        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+
+        <!-- Assert on storefront default view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Assert on storefront custom view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameCustom">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="description" value="Updated $$createProductOne.custom_attributes[description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
new file mode 100644
index 0000000000000..e9b54e3f1a3dc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductStatusStoreViewScopeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product status"/>
+            <title value="Admin should be able to mass update product statuses in store view scope"/>
+            <description value="Admin should be able to mass update product statuses in store view scope"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-59361"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+
+            <!--Create Website -->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="Second Website"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+
+            <!--Create Store -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="Second Website"/>
+                <argument name="storeGroupName" value="Second Store"/>
+                <argument name="storeGroupCode" value="second_store"/>
+            </actionGroup>
+
+            <!--Create Store view -->
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+            <waitForPageLoad stepKey="waitForSystemStorePage"/>
+            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
+            <waitForPageLoad stepKey="waitForProductPageLoad"/>
+            <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
+            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+            <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
+            <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
+            <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+            <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+            <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
+            <waitForPageLoad stepKey="waitForPageLoad2" time="180" />
+            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
+            <see userInput="You saved the store view." stepKey="seeSavedMessage" />
+
+            <!--Create a Simple Product 1 -->
+            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct1">
+                <argument name="product" value="simpleProductForMassUpdate"/>
+                <argument name="website" value="Second Website"/>
+            </actionGroup>
+
+            <!--Create a Simple Product 2 -->
+            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct2">
+                <argument name="product" value="simpleProductForMassUpdate2"/>
+                <argument name="website" value="Second Website"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete website -->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+
+            <!--Delete Products -->
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
+                <argument name="productName" value="simpleProductForMassUpdate.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
+                <argument name="productName" value="simpleProductForMassUpdate2.name"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="{{simpleProductForMassUpdate.keyword}}"/>
+        </actionGroup>
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+
+        <!-- Filter to Second Store View -->
+        <actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterStoreView" >
+            <argument name="customStore" value="'Second Store View'" />
+        </actionGroup>
+
+        <!-- Select Product 2 -->
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickOption"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Disable')}}" stepKey="clickDisabled"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+
+        <!-- Verify Product Statuses -->
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Enabled" stepKey="checkIfProduct1IsEnabled"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Disabled" stepKey="checkIfProduct2IsDisabled"/>
+
+        <!-- Filter to Default Store View -->
+        <actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterDefaultStoreView">
+            <argument name="customStore" value="'Default'" />
+        </actionGroup>
+
+        <!-- Verify Product Statuses -->
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Enabled" stepKey="checkIfDefaultViewProduct1IsEnabled"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Enabled" stepKey="checkIfDefaultViewProduct2IsEnabled"/>
+
+        <!-- Assert on storefront default view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
+            <argument name="name" value="{{simpleProductForMassUpdate.keyword}}"/>
+            <argument name="description" value=""/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <see userInput="2 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Enable the product in Default store view -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckboxDefaultStoreView"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckboxDefaultStoreView2"/>
+
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdownDefaultStoreView"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickOptionDefaultStoreView"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Disable')}}" stepKey="clickDisabledDefaultStoreView"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePageDefaultStoreView"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Disabled" stepKey="checkIfProduct2IsDisabledDefaultStoreView"/>
+
+        <!-- Assert on storefront default view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault2"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault2">
+            <argument name="name" value="{{simpleProductForMassUpdate.name}}"/>
+            <argument name="description" value=""/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault2"/>
+        <see userInput="We can't find any items matching these search criteria." selector="{{StorefrontCatalogSearchAdvancedResultMainSection.message}}" stepKey="seeInDefault2"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
new file mode 100644
index 0000000000000..551b3437cb856
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMoveAnchoredCategoryTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Edit categories"/>
+            <title value="Admin should be able to move a category via categories tree and changes should be applied on frontend without a forced cache cleaning"/>
+            <description value="Admin should be able to move a category via categories tree and changes should be applied on frontend without a forced cache cleaning"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-76273"/>
+            <group value="category"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simpleSubCategoryOne"/>
+            <createData entity="SimpleSubCategory" stepKey="simpleSubCategoryTwo"/>
+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategoryWithParent">
+                <requiredEntity createDataKey="simpleSubCategoryOne"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="productOne">
+                <requiredEntity createDataKey="simpleSubCategoryWithParent"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="productTwo">
+                <requiredEntity createDataKey="simpleSubCategoryOne"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
+            <deleteData createDataKey="productOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="productTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="simpleSubCategoryWithParent" stepKey="deleteSubcategoryWithParent"/>
+            <deleteData createDataKey="simpleSubCategoryTwo" stepKey="deleteSubcategoryTwo"/>
+        </after>
+        <!--Move category one to category two-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage"/>
+        <waitForPageLoad stepKey="waitForAdminCategoryPageLoad1"/>
+        <actionGroup ref="MoveCategoryActionGroup" stepKey="moveSimpleSubCategoryOneToSimpleSubCategoryTwo">
+            <argument name="childCategory" value="$$simpleSubCategoryOne.name$$"/>
+            <argument name="parentCategory" value="$$simpleSubCategoryTwo.name$$"/>
+        </actionGroup>
+        <!--Verify that navigation menu categories level is correct-->
+        <amOnPage url="/" stepKey="amOnStorefrontPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoadAfterHomePageOpened1"/>
+        <seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="verifyThatTopCategoryIsSubCategoryTwo"/>
+        <moveMouseOver selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="mouseOverSubCategoryTwo"/>
+        <waitForAjaxLoad stepKey="waitForAjaxOnMouseOverSubCategoryTwo"/>
+        <seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="verifyThatFirstLevelIsSubCategoryOne"/>
+        <moveMouseOver selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="mouseOverSubCategoryOne"/>
+        <waitForAjaxLoad stepKey="waitForAjaxOnMouseOverSubCategoryOne"/>
+        <seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryWithParent.name$$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent1"/>
+        <!--Open category one via navigation menu. Verify that subcategory is shown in layered navigation-->
+        <click selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu1"/>
+        <actionGroup ref="CheckItemInLayeredNavigationActionGroup" stepKey="verifySimpleSubCategoryWithParentInLayeredNavigation1">
+            <argument name="itemType" value="Category"/>
+            <argument name="itemName" value="$$simpleSubCategoryWithParent.name$$"/>
+        </actionGroup>
+        <!--Open category one by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage1">
+            <argument name="category" value="$$simpleSubCategoryOne$$"/>
+            <argument name="product" value="$$productOne$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs1"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryTwo.name$$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryOne"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne1"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne1"/>
+        <!--Open category two by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryWithParentCategoryPage">
+            <argument name="category" value="$$simpleSubCategoryWithParent$$"/>
+            <argument name="product" value="$$productOne$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbsOnSubCategoryWithParent"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryTwo.name$$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryWithParent"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryWithParent"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryWithParent"/>
+        <!--Move category one to the same level as category two-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage2"/>
+        <waitForPageLoad stepKey="waitForAdminCategoryPageLoad2"/>
+        <actionGroup ref="MoveCategoryActionGroup" stepKey="moveSimpleSubCategoryOneToDefaultCategory">
+            <argument name="childCategory" value="$$simpleSubCategoryOne.name$$"/>
+            <argument name="parentCategory" value="Default Category"/>
+        </actionGroup>
+        <!--Verify that navigation menu categories level is correct-->
+        <amOnPage url="/" stepKey="amOnStorefrontPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoadAfterHomePageOpened2"/>
+        <seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="verifyThatSubCategoryOneIsTopCategory"/>
+        <seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="verifyThatSubCategoryTwoIsTopCategory"/>
+        <moveMouseOver selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="mouseOverTopSubCategoryOne"/>
+        <waitForAjaxLoad stepKey="waitForAjaxOnMouseOverTopSubCategoryOne"/>
+        <seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryWithParent.name$$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent2"/>
+        <!--Open category one via navigation menu. Verify that subcategory is shown in layered navigation-->
+        <click selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu2"/>
+        <actionGroup ref="CheckItemInLayeredNavigationActionGroup" stepKey="verifySimpleSubCategoryWithParentInLayeredNavigation2">
+            <argument name="itemType" value="Category"/>
+            <argument name="itemName" value="$$simpleSubCategoryWithParent.name$$"/>
+        </actionGroup>
+        <!--Open category one by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage2">
+            <argument name="category" value="$$simpleSubCategoryOne$$"/>
+            <argument name="product" value="$$productOne$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs2"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne2"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne2"/>
+        <!--Open category subcategory by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage3">
+            <argument name="category" value="$$simpleSubCategoryWithParent$$"/>
+            <argument name="product" value="$$productOne$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs3"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne3"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent3"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne3"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
new file mode 100644
index 0000000000000..264615ff6736f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMultipleWebsitesUseDefaultValuesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create websites"/>
+            <title value="Use Default Value checkboxes should be checked for new website scope"/>
+            <description value="Use Default Value checkboxes for product attribute should be checked for new website scope"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92454"/>
+            <group value="Catalog"/>
+        </annotations>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+            <argument name="newWebsiteName" value="Second Website"/>
+            <argument name="websiteCode" value="second_website"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+            <argument name="website" value="Second Website"/>
+            <argument name="storeGroupName" value="Second Store"/>
+            <argument name="storeGroupCode" value="second_store"/>
+        </actionGroup>
+
+        <!--Create Store view -->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
+        <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+        <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+        <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
+        <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
+        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store view." stepKey="seeSaveMessage"/>
+
+        <!--Create a Simple Product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
+        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
+        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
+        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
+        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillProductQuantity"/>
+
+        <!-- Add product to second website and save the product -->
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
+        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+
+        <!-- switch to the second store view -->
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
+        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
+
+        <!-- Check if Use Default Value checkboxes are checked -->
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="seeProductStatusCheckboxChecked"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="seeProductNameCheckboxChecked"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productTaxClassUseDefault}}" stepKey="seeTaxClassCheckboxChecked"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.visibilityUseDefault}}" stepKey="seeVisibilityCheckboxChecked"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
new file mode 100644
index 0000000000000..2884cb26cf813
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminProductGridFilteringByDateAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Filter products"/>
+            <title value="Verify Set Product as new Filter input on Product Grid doesn't getreset to currentDate"/>
+            <description value="Data input in the new from date filter field should not change"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92019"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProductWithNewFromDate" stepKey="createSimpleProductWithDate"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProductWithDate" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Set Product as New from Date" stepKey="setAttributeLabel"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="openAdvancedPropertiesTab"/>
+        <selectOption selector="#is_filterable_in_grid" userInput="Yes" stepKey="isFilterableInGrid"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad time="30" stepKey="waitForProductGridPageLoad"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsdropDown1"/>
+        <checkOption selector="{{AdminProductGridFilterSection.viewColumnOption('Set Product as New from Date')}}" stepKey="showProductAsNewColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdown1"/>
+        <seeElement selector="{{AdminProductGridSection.columnHeader('Set Product as New from Date')}}" stepKey="seeNewFromDateColumn"/>
+        <waitForPageLoad stepKey="waitforFiltersToApply"/>
+        <actionGroup ref="filterProductGridBySetNewFromDate" stepKey="filterProductGridToCheckSetAsNewColumn"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnFirstRowProductGrid"/>
+        <waitForPageLoad stepKey="waitForProductEditPageToLoad"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveAndCloseProductForm"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="expandFilters"/>
+        <seeInField selector="{{AdminProductGridFilterSection.newFromDateFilter}}" userInput="05/16/2018" stepKey="checkForNewFromDate"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdown2"/>
+        <uncheckOption selector="{{AdminProductGridFilterSection.viewColumnOption('Set Product as New from Date')}}" stepKey="hideProductAsNewColumn"/>
+        <dontSeeElement selector="{{AdminProductGridSection.columnHeader('Set Product as New from Date')}}" stepKey="dontSeeNewFromDateColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdown2"/>
+        <click selector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearGridFilters"/>
+        </test>
+        </tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
new file mode 100644
index 0000000000000..a882c6e7817ce
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminProductStatusAttributeDisabledByDefaultTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create products"/>
+            <title value="Verify the default option value for product Status attribute is set correctly during product creation"/>
+            <description value="The default option value for product Status attribute is set correctly during product creation"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92424"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        </before>
+        <after>
+            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
+            <waitForPageLoad stepKey="wait1"/>
+            <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid1"/>
+            <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Enable Product" stepKey="setAttributeLabel1"/>
+            <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid1"/>
+            <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow1"/>
+            <waitForPageLoad stepKey="wait2"/>
+            <click selector="{{AdminNewAttributePanel.isDefault('1')}}" stepKey="resetOptionForStatusAttribute"/>
+            <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute1"/>
+            <waitForPageLoad stepKey="waitForSaveAttribute1"/>
+            <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache1"/>
+
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Enable Product" stepKey="setAttributeLabel"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{AdminNewAttributePanel.isDefault('2')}}" stepKey="chooseDisabledOptionForStatus"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad time="30" stepKey="waitForProductGridPageToLoad"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickOnAddSimpleProduct"/>
+        <waitForPageLoad stepKey="waitForProductEditToLoad"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/>
+
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
new file mode 100644
index 0000000000000..9760dc579b10b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultImageSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default images from a Simple Product"/>
+            <description value="Admin should be able to remove default images from a Simple Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-195"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProductSimple">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+        <!-- Remove image from product -->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
new file mode 100644
index 0000000000000..a740b700c3026
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultImageVirtualProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default images from a Virtual Product"/>
+            <description value="Admin should be able to remove default images from a Virtual Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-197"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductMain">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Remove image from product -->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
new file mode 100644
index 0000000000000..1bd218d18c27d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -0,0 +1,51 @@
+<?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="AdminRemoveDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default product video from a Simple Product"/>
+            <description value="Admin should be able to remove default product video from a Simple Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-206"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="ApiSimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="ApiSimpleProduct"/>
+        </actionGroup>
+
+        <!-- Save product -->
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+        <!-- Save product -->
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="ApiSimpleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
new file mode 100644
index 0000000000000..e6d3978cad7bb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultVideoVirtualProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default product video from a Virtual Product"/>
+            <description value="Admin should be able to remove default product video from a Virtual Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-204"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
+
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
new file mode 100644
index 0000000000000..060720ab007eb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveImageAffectsAllScopesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-66442: Changes in default scope not effect product images in other scopes"/>
+            <title value="Effect of product images changes in default scope to other scopes"/>
+            <description value="Product image should be deleted from all scopes"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94265"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!--Create 2 websites (with stores, store views)-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="_defaultProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="FirstWebSite"/>
+                <argument name="websiteCode" value="FirstWebSiteCode"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore" after="createWebsite">
+                <argument name="website" value="FirstWebSite"/>
+                <argument name="storeGroupName" value="NewStore"/>
+                <argument name="storeGroupCode" value="Base1"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView" after="createNewStore">
+                <argument name="StoreGroup" value="staticFirstStoreGroup"/>
+                <argument name="customStore" value="staticStore"/>
+            </actionGroup>
+
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite" after="createCustomStoreView">
+                <argument name="newWebsiteName" value="SecondWebSite"/>
+                <argument name="websiteCode" value="SecondWebSiteCode"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore" after="createSecondWebsite">
+                <argument name="website" value="SecondWebSite"/>
+                <argument name="storeGroupName" value="SecondStore"/>
+                <argument name="storeGroupCode" value="Base2"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView2"  after="createSecondStore">
+                <argument name="StoreGroup" value="staticStoreGroup"/>
+                <argument name="customStore" value="staticSecondStore"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="FirstWebSite"/>
+            </actionGroup>
+
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="SecondWebSite"/>
+            </actionGroup>
+            <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+
+        <!--Open created product-->
+        <click selector="{{AdminProductGridSection.productGridNameProduct($$product.name$$)}}" stepKey="createdProduct"/>
+        <waitForPageLoad stepKey="waitForOpenedCreatedProduct"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addFirstImageForProduct">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+
+        <!-- Add second image to product -->
+        <actionGroup ref="addProductImage" stepKey="addSecondImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <!--"Product in Websites": select both Websites-->
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite1">
+            <argument name="website" value="FirstWebSite"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite2">
+            <argument name="website" value="SecondWebSite"/>
+        </actionGroup>
+
+        <!--Go to "Catalog" -> "Products". Open created product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoaded"/>
+        <click selector="{{AdminProductGridSection.productGridNameProduct($$product.name$$)}}" stepKey="openCreatedProduct"/>
+        <waitForPageLoad stepKey="waitForCreatedProductOpened"/>
+
+        <!--Delete Image 1-->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!--Click "Save" in the upper right corner-->
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!--Switch to "Store view 1"-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="selectStoreView">
+            <argument name="storeViewName" value="Store View"/>
+        </actionGroup>
+
+        <!-- Assert product first image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+
+        <!--Switch to "Store view 2"-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="selectSecondStoreView">
+            <argument name="storeViewName" value="Second Store View"/>
+        </actionGroup>
+
+        <!-- Verify that Image 1 is deleted from the Second Store View list -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInSecondStoreViewPage">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
new file mode 100644
index 0000000000000..fb33e18379982
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveImageFromCategoryTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove image from a Category"/>
+            <description value="Admin should be able to remove image from a Category"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-212"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="DeleteCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to create a new category with image -->
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateCategoryPage"/>
+        <actionGroup ref="fillCategoryForm" stepKey="fillCategoryForm">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <actionGroup ref="addCategoryImage" stepKey="addCategoryImage"/>
+        <actionGroup ref="saveCategoryForm" stepKey="saveCategoryForm"/>
+        <actionGroup ref="checkCategoryImageInAdmin" stepKey="checkCategoryImageInAdmin"/>
+
+        <!-- Remove image from category -->
+        <actionGroup ref="removeCategoryImage" stepKey="removeCategoryImage"/>
+        <actionGroup ref="saveCategoryForm" stepKey="saveCategoryFormAfterRemove"/>
+
+        <actionGroup ref="CheckCategoryOnStorefront" stepKey="CheckCategoryOnStorefront">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+
+        <!-- Verify category with no image in storefront -->
+        <dontSee selector="{{StorefrontCategoryMainSection.categoryImage}}" stepKey="dontSeeImage"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
new file mode 100644
index 0000000000000..240a5492355cf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRequiredFieldsHaveRequiredFieldIndicatorTest">
+        <annotations>
+            <stories value="Verify the presence of required field indicators across different pages in Magento Admin"/>
+            <title value="Required fields should have the required asterisk indicator "/>
+            <description value="Verify that Required fields should have the required indicator icon next to the field name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94330"/>
+            <group value="Catalog"/>
+        </annotations>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+        <waitForElementVisible selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="waitForAddSubCategoryVisible"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+
+        <!-- Verify that the Category Name field has the required field name indicator -->
+        <executeJS function="{{AdminCategoryBasicFieldSection.RequiredFieldIndicator}}" stepKey="getRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator1"/>
+
+        <executeJS function="{{AdminCategoryBasicFieldSection.RequiredFieldIndicatorColor}}" stepKey="getRequiredFieldIndicatorColor"/>
+        <assertEquals expected="rgb(226, 38, 38)" expectedType="string" actualType="variable" actual="getRequiredFieldIndicatorColor" message="pass" stepKey="assertRequiredFieldIndicator2"/>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="addProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="addSimpleProduct"/>
+
+        <!-- Verify that the Product Name and Sku fields have the required field name indicator -->
+        <executeJS function="{{AdminProductFormSection.RequiredNameIndicator}}" stepKey="productNameRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="productNameRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator3"/>
+        <executeJS function="{{AdminProductFormSection.RequiredSkuIndicator}}" stepKey="productSkuRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="productSkuRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator4"/>
+
+        <!-- Verify that the CMS page have the required field name indicator next to Page Title -->
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPage"/>
+        <executeJS function="{{CmsNewPagePageBasicFieldsSection.RequiredFieldIndicator}}" stepKey="pageTitleRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="pageTitleRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator5"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml
new file mode 100644
index 0000000000000..bc5a0319bae7a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductEditUiTest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSimpleProductUiValidationTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Edit products"/>
+            <title value="UI elements on the simple product edit screen should be organized as expected"/>
+            <description value="Admin should be able to use simple product UI in expected manner"/>
+            <testCaseId value="MAGETWO-92835"/>
+            <group value="Catalog"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- This was copied and modified from the EndToEndB2CGuestUserTest -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!--check admin for valid Enable Status label-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeCheckboxEnableProductIsChecked"/>
+
+        <!--check click on wrapping container does not trigger status change-->
+        <click selector="{{AdminProductFormSection.enableProductAttributeLabelWrapper}}" stepKey="clickEnableProductWrapper"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeCheckboxEnableProductIsCheckedAfterWrapperClick"/>
+
+        <!--check click on label itself does trigger status change-->
+        <click selector="{{AdminProductFormSection.enableProductAttributeLabel}}" stepKey="clickEnableProductLabel"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsCheckedAfterLabelClick"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
new file mode 100644
index 0000000000000..1cd0e15780c11
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSimpleProductImagesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add images of different types and sizes to Simple Product"/>
+            <description value="Admin should be able to add images of different types and sizes to Simple Product"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-189"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="_defaultProduct" stepKey="firstProduct">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="secondProduct">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="firstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="secondProduct" stepKey="deleteSecondProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Go to the first product edit page -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="$$firstProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+
+        <!-- Set url key -->
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$firstProduct.name$$" stepKey="fillUrlKey"/>
+
+        <click selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="expandImages"/>
+
+        <!-- *.bmp is not allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="bmp.bmp" stepKey="attachBmp"/>
+        <waitForPageLoad stepKey="waitForUploadBmp"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="bmp.bmp was not uploaded. Disallowed file type." stepKey="seeErrorBmp"/>
+        <click selector="{{AdminProductImagesSection.modalOkBtn}}" stepKey="closeModalBmp"/>
+
+        <!-- *.ico is not allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="ico.ico" stepKey="attachIco"/>
+        <waitForPageLoad stepKey="waitForUploadIco"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="ico.ico was not uploaded. Disallowed file type." stepKey="seeErrorIco"/>
+        <click selector="{{AdminProductImagesSection.modalOkBtn}}" stepKey="closeModalIco"/>
+
+        <!-- *.svg is not allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="svg.svg" stepKey="attachSvg"/>
+        <waitForPageLoad stepKey="waitForUploadSvg"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="svg.svg was not uploaded. Disallowed file type." stepKey="seeErrorSvg"/>
+        <click selector="{{AdminProductImagesSection.modalOkBtn}}" stepKey="closeModalSvg"/>
+
+        <!-- 0kb size is not allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="empty.jpg" stepKey="attachEmpty"/>
+        <waitForPageLoad stepKey="waitForUploadEmpty"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="empty.jpg was not uploaded." stepKey="seeErrorEmpty"/>
+        <click selector="{{AdminProductImagesSection.modalOkBtn}}" stepKey="closeModalEmpty"/>
+
+        <!-- 1~ kb is allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="small.jpg" stepKey="attachSmall"/>
+        <waitForPageLoad stepKey="waitForUploadSmall"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorSmall"/>
+
+        <!-- 1~ mb is allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="medium.jpg" stepKey="attachMedium"/>
+        <waitForPageLoad stepKey="waitForUploadMedium"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorMedium"/>
+
+        <!-- 10~ mb is allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="large.jpg" stepKey="attachLarge"/>
+        <waitForPageLoad stepKey="waitForUploadLarge"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorLarge"/>
+
+        <!-- *.gif is allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="gif.gif" stepKey="attachGif"/>
+        <waitForPageLoad stepKey="waitForUploadGif"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorGif"/>
+
+        <!-- *.jpg is allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="jpg.jpg" stepKey="attachJpg"/>
+        <waitForPageLoad stepKey="waitForUploadJpg"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorJpg"/>
+
+        <!-- *.png is allowed -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="png.png" stepKey="attachPng"/>
+        <waitForPageLoad stepKey="waitForUploadPng"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorPng"/>
+
+        <!-- Save the first product and go to the storefront -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <amOnPage url="$$firstProduct.name$$.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+
+        <!-- See all of the images that we uploaded -->
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('small')}}" stepKey="seeSmall"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('medium')}}" stepKey="seeMedium"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('gif')}}" stepKey="seeGif"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('jpg')}}" stepKey="seeJpg"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('png')}}" stepKey="seePng"/>
+
+        <!-- Go to the category page and see a placeholder image for the second product -->
+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryPage"/>
+        <seeElement selector=".products-grid img[src*='placeholder/small_image.jpg']" stepKey="seePlaceholder"/>
+
+        <!-- Go to the second product edit page -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex2"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2">
+            <argument name="product" value="$$secondProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid2"/>
+
+        <!-- Upload an image -->
+        <click selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="expandImages2"/>
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="large.jpg" stepKey="attachLarge2"/>
+        <waitForPageLoad stepKey="waitForUploadLarge2"/>
+        <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorLarge2"/>
+
+        <!-- Set url key -->
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection2"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$secondProduct.name$$" stepKey="fillUrlKey2"/>
+
+        <!-- Save the second product -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+
+        <!-- Go to the admin grid and see the uploaded image -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid3"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku3">
+            <argument name="product" value="$$secondProduct$$"/>
+        </actionGroup>
+        <seeElement selector="img.admin__control-thumbnail[src*='/large']" stepKey="seeImgInGrid"/>
+
+        <!-- Go to the category page and see the uploaded image -->
+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryPage2"/>
+        <seeElement selector=".products-grid img[src*='/large']" stepKey="seeUploadedImg"/>
+
+        <!-- Go to the product page and see the uploaded image -->
+        <amOnPage url="$$secondProduct.name$$.html" stepKey="goToStorefront2"/>
+        <waitForPageLoad stepKey="waitForStorefront2"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2"/>
+    </test>
+
+    <test name="AdminSimpleProductRemoveImagesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove Product Images assigned as Base, Small and Thumbnail from Simple Product"/>
+            <description value="Admin should be able to remove Product Images assigned as Base, Small and Thumbnail from Simple Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-191"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="_defaultProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Go to the product edit page -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProduct"/>
+
+        <!-- Set url key -->
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$product.name$$" stepKey="fillUrlKey"/>
+
+        <!-- Expand images section -->
+        <click selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="expandImages"/>
+
+        <!-- Upload and set Base image -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-base.jpg" stepKey="attach1"/>
+        <waitForPageLoad stepKey="waitForUpload1"/>
+        <click selector="{{AdminProductImagesSection.nthProductImage('1')}}" stepKey="openImageDetails1"/>
+        <waitForPageLoad stepKey="waitForSlideout1"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isBaseSelected}}" visible="false" stepKey="base1"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSmall}}" dependentSelector="{{AdminProductImagesSection.isSmallSelected}}" visible="true" stepKey="small1"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleThumbnail}}" dependentSelector="{{AdminProductImagesSection.isThumbnailSelected}}" visible="true" stepKey="thumbnail1"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSwatch}}" dependentSelector="{{AdminProductImagesSection.isSwatchSelected}}" visible="true" stepKey="swatch1"/>
+        <pressKey selector="{{AdminProductImagesSection.altText}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ESCAPE]" stepKey="pressEsc1"/>
+        <waitForPageLoad stepKey="waitForHide1"/>
+
+        <!-- Upload and set Small image -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-small.jpg" stepKey="attach2"/>
+        <waitForPageLoad stepKey="waitForUpload2"/>
+        <click selector="{{AdminProductImagesSection.nthProductImage('2')}}" stepKey="openImageDetails2"/>
+        <waitForPageLoad stepKey="waitForSlideout2"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isBaseSelected}}" visible="true" stepKey="base2"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSmall}}" dependentSelector="{{AdminProductImagesSection.isSmallSelected}}" visible="false" stepKey="small2"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleThumbnail}}" dependentSelector="{{AdminProductImagesSection.isThumbnailSelected}}" visible="true" stepKey="thumbnail2"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSwatch}}" dependentSelector="{{AdminProductImagesSection.isSwatchSelected}}" visible="true" stepKey="swatch2"/>
+        <pressKey selector="{{AdminProductImagesSection.altText}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ESCAPE]" stepKey="pressEsc2"/>
+        <waitForPageLoad stepKey="waitForHide2"/>
+
+        <!-- Upload and set Thumbnail image -->
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-thumb.jpg" stepKey="attach3"/>
+        <waitForPageLoad stepKey="waitForUpload3"/>
+        <click selector="{{AdminProductImagesSection.nthProductImage('3')}}" stepKey="openImageDetails3"/>
+        <waitForPageLoad stepKey="waitForSlideout3"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isBaseSelected}}" visible="true" stepKey="base3"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSmall}}" dependentSelector="{{AdminProductImagesSection.isSmallSelected}}" visible="true" stepKey="small3"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleThumbnail}}" dependentSelector="{{AdminProductImagesSection.isThumbnailSelected}}" visible="false" stepKey="thumbnail3"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSwatch}}" dependentSelector="{{AdminProductImagesSection.isSwatchSelected}}" visible="true" stepKey="swatch3"/>
+        <pressKey selector="{{AdminProductImagesSection.altText}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ESCAPE]" stepKey="pressEsc3"/>
+        <waitForPageLoad stepKey="waitForHide3"/>
+
+        <!-- Save the product with all 3 images -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+
+        <!-- Go to the product page and see the Base image -->
+        <amOnPage url="$$product.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile('/adobe-base')}}" stepKey="seeBase"/>
+
+        <!-- Go to the category page and see the Small image -->
+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryPage"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('/adobe-small')}}" stepKey="seeThumb"/>
+
+        <!-- Go to the admin grid and see the Thumbnail image -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex2"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <seeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/adobe-thumb')}}" stepKey="seeBaseInGrid"/>
+
+        <!-- Go to the product edit page again -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid3"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku3">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProduct3"/>
+        <click selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="expandImages2"/>
+
+        <!-- Remove all images -->
+        <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('1')}}" stepKey="removeImage1"/>
+        <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('2')}}" stepKey="removeImage2"/>
+        <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('3')}}" stepKey="removeImage3"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+
+        <!-- Check admin grid for placeholder -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex4"/>
+        <waitForPageLoad stepKey="wait6"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid4"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku4">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <dontSeeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/adobe-thumb')}}" stepKey="dontSeeBaseInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/placeholder/thumbnail')}}" stepKey="seePlaceholderThumb"/>
+
+        <!-- Check category page for placeholder -->
+        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryPage2"/>
+        <waitForPageLoad stepKey="wait7"/>
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('/adobe-small')}}" stepKey="dontSeeThumb"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('placeholder/small_image')}}" stepKey="seePlaceholderSmall"/>
+
+        <!-- Check product page for placeholder -->
+        <amOnPage url="$$product.name$$.html" stepKey="goToProductPage2"/>
+        <waitForPageLoad stepKey="wait8"/>
+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile('/adobe-base')}}" stepKey="dontSeeBase"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile('placeholder/image')}}" stepKey="seePlaceholderBase"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..f5e5911352c86
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSimpleProductSetEditContentTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/edit simple product"/>
+            <title value="Admin should be able to set/edit product Content when editing a simple product"/>
+            <description value="Admin should be able to set/edit product Content when editing a simple product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3422"/>
+            <group value="Catalog"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <before>
+            <!--Admin Login-->
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+        </before>
+        <after>
+            <!-- Delete simple product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="SimpleProduct"/>
+            </actionGroup>
+            <!--Admin Logout-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+
+        <!--Add content-->
+        <!--A generic scroll scrolls past this element, in doing this it fails to execute certain actions on the element and others below it. By scrolling slightly above it it resolves this issue.-->
+        <scrollTo selector="{{AdminProductContentSection.sectionHeader}}" x="0" y="-100" stepKey="scrollTo"/>
+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDown"/>
+        <fillField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="This is the long description" stepKey="fillLongDescription"/>
+        <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="This is the short description" stepKey="fillShortDescription"/>
+
+        <!--save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Edit content-->
+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDownEdit"/>
+        <scrollTo selector="{{AdminProductContentSection.sectionHeader}}" stepKey="scrollToEdit"/>
+        <fillField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="EDIT ~ This is the long description ~ EDIT" stepKey="editLongDescription"/>
+        <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="editShortDescription"/>
+
+        <!--save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
+
+        <!--Checking content admin-->
+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDownAgain"/>
+        <scrollTo selector="{{AdminProductContentSection.sectionHeader}}" stepKey="scrollToAgain"/>
+        <seeInField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="EDIT ~ This is the long description ~ EDIT" stepKey="seeLongDescriptionAdmin"/>
+        <seeInField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="seeShortDescriptionAdmin"/>
+
+        <!--Checking content storefront-->
+        <amOnPage url="{{SimpleProduct.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="EDIT ~ This is the long description ~ EDIT" stepKey="seeLongDescriptionStorefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productShortDescription}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="seeShortDescriptionStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
new file mode 100644
index 0000000000000..b06502ce94c65
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSimpleSetEditRelatedProductsTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/edit simple product"/>
+            <title value="Admin should be able to set/edit Related Products information when editing a simple product"/>
+            <description value="Admin should be able to set/edit Related Products information when editing a simple product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3411"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct0"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+        </before>
+        <after>
+            <!-- Delete simple product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+
+        <!--Add related product-->
+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct0">
+            <argument name="sku" value="$$simpleProduct0.sku$$"/>
+        </actionGroup>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Add another related product-->
+        <actionGroup ref="addRelatedProductBySku" stepKey="addRelatedProduct1">
+            <argument name="sku" value="$$simpleProduct1.sku$$"/>
+        </actionGroup>
+
+        <!--Remove previous related product-->
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
+
+        <!--Save the product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
+
+        <!--See related product in admin-->
+        <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" stepKey="scrollTo"/>
+        <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
+
+        <!--See related product in storefront-->
+        <amOnPage url="{{SimpleProduct3.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$simpleProduct1.sku$$)}}" stepKey="seeRelatedProductInStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
new file mode 100644
index 0000000000000..a33c7bb12879a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUnassignProductAttributeFromAttributeSetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/Update attribute set"/>
+            <title value="Admin should be able to unassign attributes from an attribute set"/>
+            <description value="Admin should be able to unassign attributes from an attribute set"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-194"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="productDropDownAttribute" stepKey="attribute"/>
+            <createData entity="productAttributeOption1" stepKey="option1">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="option2">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Assert attribute presence in storefront product additional information -->
+        <amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="checkAttributeInMoreInformationTab" stepKey="checkAttributeInMoreInformationTab">
+            <argument name="attributeLabel" value="$$attribute.attribute[frontend_labels][0][label]$$"/>
+            <argument name="attributeValue" value="$$option2.option[store_labels][0][label]$$"/>
+        </actionGroup>
+        <!-- Go to default attribute set edit page -->
+        <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/{{AddToDefaultSet.attributeSetId}}/" stepKey="onAttributeSetEdit"/>
+        <!-- Assert created attribute in a group -->
+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
+        <!-- Unassign attribute from group -->
+        <actionGroup ref="UnassignAttributeFromGroup" stepKey="UnassignAttributeFromGroup">
+            <argument name="group" value="Product Details"/>
+            <argument name="attribute" value="$$attribute.attribute_code$$"/>
+        </actionGroup>
+        <!-- Assert attribute in unassigned section -->
+        <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
+        <!-- Save attribute set -->
+        <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
+        <!-- Clear cache -->
+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCacheActionGroup"/>
+        <!-- Go to create new product page -->
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <!-- Assert attribute not present in product creation -->
+        <dontSeeElement selector="{{AdminProductFormSection.attributeLabelByText($$attribute.attribute[frontend_labels][0][label]$$)}}" stepKey="seeLabel"/>
+        <!-- Assert removed attribute not presence in storefront product additional information -->
+        <amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage2"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <dontSeeElement selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="dontSeeProductAttribute"/>
+        <dontSee userInput="$$attribute.attribute[frontend_labels][0][label]$$" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="dontSeeAttributeLabel"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
new file mode 100644
index 0000000000000..2ff83afa15e5e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCategoryStoreUrlKeyTest">
+        <annotations>
+            <features value="SEO-friendly URL Key Update"/>
+            <stories value="Update SEO-friendly URL via the Admin"/>
+            <title value="SEO-friendly URL should update regardless of scope or redirect change."/>
+            <description value="SEO-friendly URL should update regardless of scope or redirect change."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-92338"/>
+            <group value="category"/>
+        </annotations>
+        <after>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+                <argument name="categoryEntity" value="_defaultCategory"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create category, change store view to default -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="CreateCategory" stepKey="createCategory">
+            <argument name="categoryEntity" value="_defaultCategory"/>
+        </actionGroup>
+
+        <!--Switch to "Default Store View" scope-->
+        <actionGroup ref="switchCategoryStoreView" stepKey="SwitchStoreView">
+            <argument name="Store" value="_defaultStore.name"/>
+            <argument name="CatName" value="_defaultCategory.name"/>
+        </actionGroup>
+        <!--See "Use Default Value" checkboxes-->
+        <seeElement selector="{{AdminCategoryBasicFieldSection.enableUseDefault}}" stepKey="seeUseDefaultEnable"/>
+        <seeElement selector="{{AdminCategoryBasicFieldSection.includeInMenuUseDefault}}" stepKey="seeUseDefaultMenu"/>
+        <seeElement selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="seeUseDefaultName"/>
+        <!-- Update SEO key, uncheck "Create Redirect", confirm in frontend -->
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}" stepKey="uncheckUseDefaultUrlKey"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}-hattest" stepKey="enterURLKey"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="uncheckRedirect1"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
+        <amOnPage url="" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForFrontendLoad"/>
+        <click stepKey="clickCategory" selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront"/>
+        <seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle"/>
+        <seeInCurrentUrl stepKey="verifyUrlKey" url="{{_defaultCategory.name_lwr}}-hattest.html"/>
+
+        <!-- Update SEO key to original, uncheck "Create Redirect", confirm in frontend, delete category -->
+        <!--Switch to "Default Store View" scope-->
+        <actionGroup ref="switchCategoryStoreView" stepKey="SwitchStoreView2">
+            <argument name="Store" value="_defaultStore.name"/>
+            <argument name="CatName" value="_defaultCategory.name"/>
+        </actionGroup>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection2"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterOriginalURLKey"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="uncheckRedirect2"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterOriginalSeoKey"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterOriginalSeoKey"/>
+        <amOnPage url="" stepKey="goToStorefrontAfterOriginalSeoKey"/>
+        <waitForPageLoad stepKey="waitForFrontendLoadAfterOriginalSeoKey"/>
+        <click stepKey="clickCategoryAfterOriginalSeoKey" selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront2"/>
+        <seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle2"/>
+        <seeInCurrentUrl stepKey="verifyUrlKeyAfterOriginalSeoKey" url="{{_defaultCategory.name_lwr}}.html"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..c9932de808006
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualProductSetEditContentTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVirtualProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/edit virtual product"/>
+            <title value="Admin should be able to set/edit product Content when editing a virtual product"/>
+            <description value="Admin should be able to set/edit product Content when editing a virtual product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3425"/>
+            <group value="Catalog"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <after>
+            <!-- Delete virtual product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="defaultVirtualProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!--Checking content storefront-->
+        <amOnPage url="{{defaultVirtualProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml
new file mode 100644
index 0000000000000..e630545fff8fb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVirtualSetEditRelatedProductsTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVirtualSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/edit virtual product"/>
+            <title value="Admin should be able to set/edit Related Products information when editing a virtual product"/>
+            <description value="Admin should be able to set/edit Related Products information when editing a virtual product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3415"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before></before>
+        <after>
+            <!-- Delete virtual product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="defaultVirtualProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!--See related product in storefront-->
+        <amOnPage url="{{defaultVirtualProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
new file mode 100644
index 0000000000000..a4c8b492d9d84
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search simple product with product name"/>
+            <description value="Guest customer should be able to advance search simple product with product name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-132"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search simple product with product sku"/>
+            <description value="Guest customer should be able to advance search simple product with product sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-133"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search simple product with product description"/>
+            <description value="Guest customer should be able to advance search simple product with product description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-134"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search simple product with product short description"/>
+            <description value="Guest customer should be able to advance search simple product with product short description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-135"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductByPriceTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search simple product with product price"/>
+            <description value="Guest customer should be able to advance search simple product with product price"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-136"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+            <getData entity="GetProduct" stepKey="arg1">
+                <requiredEntity createDataKey="product"/>
+            </getData>
+            <getData entity="GetProduct" stepKey="arg2">
+                <requiredEntity createDataKey="product"/>
+            </getData>
+            <getData entity="GetProduct" stepKey="arg3">
+                <requiredEntity createDataKey="product"/>
+            </getData>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
new file mode 100644
index 0000000000000..0eb8f5668751a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdvanceCatalogSearchVirtualProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search virtual product with product name"/>
+            <description value="Guest customer should be able to advance search virtual product with product name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-137"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchVirtualProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search virtual product with product sku"/>
+            <description value="Guest customer should be able to advance search virtual product with product sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-162"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchVirtualProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search virtual product with product description"/>
+            <description value="Guest customer should be able to advance search virtual product with product description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-163"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchVirtualProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search virtual product with product short description"/>
+            <description value="Guest customer should be able to advance search virtual product with product short description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-164"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchVirtualProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search virtual product with product price"/>
+            <description value="Guest customer should be able to advance search virtual product with product price"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-165"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+        </before>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
new file mode 100644
index 0000000000000..170da829143a3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -0,0 +1,330 @@
+<?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="CheckTierPricingOfProductsTest">
+        <annotations>
+            <features value="Shopping Cart"/>
+            <stories value="MAGETWO-91697 - [Magento Cloud] 'Tier Pricing' of Products changes to 'Price' (without discount) after Updated Items and Quantities in the Order of B2B Store View."/>
+            <title value="Checking 'Tier Pricing' of Products and 'Price' (without discount) in the Order of B2B Store View"/>
+            <description value="Checking 'Tier Pricing' of Products and 'Price' (without discount) in the Order of B2B Store View"/>
+            <testCaseId value="MAGETWO-94111"/>
+            <severity value="CRITICAL"/>
+            <group value="Shopping Cart"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product1">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="product2">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="product3">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="product4">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+
+        <!--Create website, Sore adn Store View-->
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
+            <argument name="newWebsiteName" value="secondWebsite"/>
+            <argument name="websiteCode" value="second_website"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
+            <argument name="website" value="secondWebsite"/>
+            <argument name="storeGroupName" value="secondStore"/>
+            <argument name="storeGroupCode" value="second_store"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
+            <argument name="StoreGroup" value="customStoreTierPrice"/>
+            <argument name="customStore" value="customStoreView"/>
+        </actionGroup>
+        <!--Set Configuration-->
+        <createData entity="CatalogPriceScopeWebsite" stepKey="paymentMethodsSettingConfig"/>
+        <!--Set advanced pricing for all 4 products-->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct1">
+            <argument name="product" value="$$product1$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$product1$$"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing1">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
+            <argument name="product" value="$$product2$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$product2$$"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite2">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing2">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct3">
+            <argument name="product" value="$$product3$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
+            <argument name="product" value="$$product3$$"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite3">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing3">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct4">
+            <argument name="product" value="$$product4$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
+            <argument name="product" value="$$product4$$"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite4">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetAdvancedPricing" stepKey="ProductSetAdvancedPricing4">
+            <argument name="website" value="secondWebsite"/>
+        </actionGroup>
+        <actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
+
+        <!--Edit customer info-->
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="ClickOnAccountInformationSection"/>
+        <waitForPageLoad stepKey="waitForPageOpened1"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="Group"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="secondStoreView" stepKey="clickToSelectStore"/>
+        <click selector="{{AdminCustomerAccountInformationSection.saveCustomer}}" stepKey="save"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see userInput="You saved the customer." stepKey="CustomerIsSaved"/>
+
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <click selector="{{AdminCustomerFiltersSection.clearAll}}" stepKey="ClearFilters"/>
+        <waitForPageLoad stepKey="waitForFiltersClear"/>
+
+        <!--Create Cart Price Rule-->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <waitForPageLoad stepKey="waitForPageDiscountPageIsLoaded"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="ship" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="secondWebsite" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="ship" stepKey="setCode"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCustomer}}" userInput="0" stepKey="setUserPerCustomer"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="0" stepKey="setUserPerCoupon"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.priority}}" userInput="0" stepKey="setPriority"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="For shipment with matching items" stepKey="selectFreeShippingType"/>
+        <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveAndContinueButton"/>
+        <waitForPageLoad stepKey="waitForCartPriceRuleSaved"/>
+        <see userInput="You saved the rule." stepKey="RuleSaved"/>
+
+        <!--Create new order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="CreateNewOrder">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="storeView" value="customStoreView"/>
+        </actionGroup>
+
+        <click  selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct"/>
+        <waitForPageLoad stepKey="waitForProductsOpened"/>
+        <!--TEST CASE #1-->
+        <!--Add 3 products to order with specified quantity-->
+        <click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct1"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity1"/>
+
+        <click selector="{{OrdersGridSection.selectProduct($$product2.name$$)}}" stepKey="selectProduct2"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product2.name$$)}}" userInput="10" stepKey="AddProductQuantity2"/>
+
+        <click selector="{{OrdersGridSection.selectProduct($$product3.name$$)}}" stepKey="selectProduct3"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product3.name$$)}}" userInput="10" stepKey="AddProductQuantity3"/>
+        <click stepKey="addProductsToOrder" selector="{{OrdersGridSection.addProductsToOrder}}"/>
+        <waitForLoadingMaskToDisappear stepKey="wait6"/>
+        <!--Verify tier price values-->
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice1"/>
+        <assertEquals stepKey="verifyPrice1">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice1</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice2"/>
+        <assertEquals stepKey="verifyPrice2">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice2</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice3"/>
+        <assertEquals stepKey="verifyPrice3">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice3</actualResult>
+        </assertEquals>
+
+        <!--Edit order and verify values-->
+        <waitForPageLoad stepKey="waitForPageLoaded2"/>
+        <click selector="{{OrdersGridSection.customPrice($$product1.name$$)}}" stepKey="ClickOnCustomPrice"/>
+        <fillField selector="{{OrdersGridSection.customQuantity($$product1.name$$)}}" userInput="5" stepKey="ClickOnQuantity"/>
+        <waitForLoadingMaskToDisappear stepKey="wait1"/>
+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate"/>
+        <waitForLoadingMaskToDisappear stepKey="wait2"/>
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice4"/>
+        <assertEquals stepKey="verifyPrice4">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice2}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice4</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice5"/>
+        <assertEquals stepKey="verifyPrice5">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice5</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice6"/>
+        <assertEquals stepKey="verifyPrice6">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice3</actualResult>
+        </assertEquals>
+
+        <!--Remove products from order-->
+        <selectOption selector="{{OrdersGridSection.removeItems($$product1.name$$)}}" userInput="Remove" stepKey="clickToRemove1"/>
+        <selectOption selector="{{OrdersGridSection.removeItems($$product2.name$$)}}" userInput="Remove" stepKey="clickToRemove2"/>
+        <selectOption selector="{{OrdersGridSection.removeItems($$product3.name$$)}}" userInput="Remove" stepKey="clickToRemove3"/>
+        <waitForLoadingMaskToDisappear stepKey="wait3"/>
+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate1"/>
+        <waitForPageLoad stepKey="WaitProductsDeleted"/>
+
+        <!--TEST CASE #2-->
+        <!--Add 3 products to order with specified quantity-->
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click stepKey="clickToAddProduct1" selector="{{OrdersGridSection.addProducts}}"/>
+        <click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct5"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity5"/>
+
+        <click selector="{{OrdersGridSection.selectProduct($$product2.name$$)}}" stepKey="selectProduct6"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product2.name$$)}}" userInput="10" stepKey="AddProductQuantity6"/>
+
+        <click selector="{{OrdersGridSection.selectProduct($$product3.name$$)}}" stepKey="selectProduct7"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product3.name$$)}}" userInput="10" stepKey="AddProductQuantity7"/>
+        <click stepKey="addProductsToOrder1" selector="{{OrdersGridSection.addProductsToOrder}}"/>
+        <waitForLoadingMaskToDisappear stepKey="wait7"/>
+        <!--Verify tier price values-->
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice7"/>
+        <assertEquals stepKey="verifyPrice7">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice7</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice8"/>
+        <assertEquals stepKey="verifyPrice8">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice8</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice9"/>
+        <assertEquals stepKey="verifyPrice9">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice9</actualResult>
+        </assertEquals>
+
+        <!--Add one more product and verify values-->
+        <waitForPageLoad stepKey="waitForPgeLoaded3"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct2"/>
+        <waitForLoadingMaskToDisappear stepKey="wait8"/>
+        <click selector="{{OrdersGridSection.selectProduct($$product4.name$$)}}" stepKey="selectProduct8"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product4.name$$)}}" userInput="10" stepKey="AddProductQuantity9"/>
+        <click selector="{{OrdersGridSection.addProductsToOrder}}" stepKey="addProductsToOrder2"/>
+        <waitForLoadingMaskToDisappear stepKey="wait9"/>
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product4.name$$)}}" stepKey="checkProductPrice10"/>
+        <assertEquals stepKey="verifyPrice10">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice10</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice11"/>
+        <assertEquals stepKey="verifyPrice11">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice11</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product2.name$$)}}" stepKey="checkProductPrice12"/>
+        <assertEquals stepKey="verifyPrice12">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice12</actualResult>
+        </assertEquals>
+
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product3.name$$)}}" stepKey="checkProductPrice13"/>
+        <assertEquals stepKey="verifyPrice13">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice13</actualResult>
+        </assertEquals>
+
+        <selectOption selector="{{OrdersGridSection.removeItems($$product1.name$$)}}" userInput="Remove" stepKey="clickToRemove4"/>
+        <selectOption selector="{{OrdersGridSection.removeItems($$product2.name$$)}}" userInput="Remove" stepKey="clickToRemove5"/>
+        <selectOption selector="{{OrdersGridSection.removeItems($$product3.name$$)}}" userInput="Remove" stepKey="clickToRemove6"/>
+        <waitForLoadingMaskToDisappear stepKey="wait4"/>
+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate2"/>
+        <waitForLoadingMaskToDisappear stepKey="wait10"/>
+
+        <!--TEST CASE #3-->
+        <waitForPageLoad stepKey="WaitProductsDeleted1"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct4" />
+        <click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct9"/>
+        <fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity10"/>
+        <click selector="{{OrdersGridSection.addProductsToOrder}}" stepKey="addProductsToOrder3"/>
+        <waitForLoadingMaskToDisappear stepKey="wait11"/>
+        <fillField selector="{{OrdersGridSection.applyCoupon}}" userInput="ship" stepKey="AddCouponCode"/>
+        <waitForLoadingMaskToDisappear stepKey="wait5"/>
+        <click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate3"/>
+        <waitForLoadingMaskToDisappear stepKey="wait12"/>
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice14"/>
+        <grabTextFrom selector="{{OrdersGridSection.productPrice($$product4.name$$)}}" stepKey="checkProductPrice15"/>
+        <assertEquals stepKey="verifyPrice14">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice14</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="verifyPrice15">
+            <expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
+            <actualResult type="variable">$checkProductPrice15</actualResult>
+        </assertEquals>
+
+        <after>
+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="product3" stepKey="deleteProduct3"/>
+            <deleteData createDataKey="product4" stepKey="deleteProduct4"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="ship"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
new file mode 100644
index 0000000000000..899f3e61b5b86
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ConfigurableOptionTextinputLengthValidationHintTest">
+        <annotations>
+            <features value="Product Customizable Option"/>
+            <stories value="Customizable text option input-length validation hint changes dynamically"/>
+            <title value="You should have a dynamic length validation hint when using text option has max char limit"/>
+            <description value="You should have a dynamic length validation hint when using text option has max char limit"/>
+            <severity value="MINOR"/>
+            <testCaseId value="MAGETWO-92229"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <actionGroup ref="AdminCreateSimpleProductWithTextOptionCharLimit" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+            <argument name="charLimit" value="20"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="testDynamicValidationHint" stepKey="testDynamicValidationHint1">
+            <argument name="charLimit" value="20"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
new file mode 100644
index 0000000000000..5cae81b36a323
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="DeleteCategoriesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Delete categories"/>
+            <title value="Admin should be able to delete the default root category and subcategories and still see products in the storefront"/>
+            <description value="Admin should be able to delete the default root category and subcategories and still see products in the 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/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..1419ca4cb42ef
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CAdminTest">
+        <annotations>
+            <features value="End to End scenarios"/>
+            <stories value="B2C admin - MAGETWO-75412"/>
+            <group value="e2e"/>
+            <title value="Pass End to End B2C Admin scenario"/>
+            <description value="Admin creates products, creates and manages categories, creates promotions, creates an order, processes an order, processes a return, uses admin grids"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-87014"/>
+            <skip>
+                <issueId value="MQE-891"/>
+            </skip>
+        </annotations>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <!--Login to Admin Area-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+
+        <!--Admin creates product-->
+        <!--Create Simple Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageSimple"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageLoadSimple"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
+                <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="checkRequiredFieldsInProductForm" stepKey="checkRequiredFieldsProductSimple"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillSimpleProductMain">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="addProductImage" stepKey="addImageForProductSimple">
+            <argument name="image" value="ProductImage"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+        <click selector="{{AdminProductFormActionSection.backButton}}" stepKey="clickBackToGridSimple"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <grabAttributeFrom selector="{{AdminProductGridSection.productThumbnail('1')}}" userInput="src" stepKey="getSimpleProductThumbnail"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$getSimpleProductThumbnail" stepKey="simpleThumbnailIsNotDefault"/>
+        <actionGroup ref="viewProductInAdminGrid" stepKey="seeSimpleProductInGrid">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+
+        <!--Create Virtual Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageVirtual"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageLoadVirtual"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateVirtualProduct">
+            <argument name="product" value="VirtualProduct"/>
+        </actionGroup>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{VirtualProduct.sku}}" stepKey="fillVirtualName"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{VirtualProduct.name}}" stepKey="fillVirtualSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{VirtualProduct.price}}" stepKey="fillVirtualPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{VirtualProduct.quantity}}" stepKey="fillVirtualQty"/>
+        <actionGroup ref="saveProductForm" stepKey="saveVirtualProduct"/>
+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewVirtualProductInGrid">
+            <argument name="product" value="VirtualProduct"/>
+        </actionGroup>
+
+        <!--Admin uses product grid-->
+        <!--Start with default view-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageGrid"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+
+        <!--Search by keyword-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="useKeywordSearchSimpleProduct">
+            <argument name="keyword" value="SimpleProduct.name"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOnlyOneProductInGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{SimpleProduct.name}}" stepKey="seeOnlySimpleProductInGrid"/>
+
+        <!--Paging works-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultPagination"/>
+        <comment userInput="Admin uses paging on product grid" stepKey="usePagingProductGridComment"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdown"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageOption('50')}}" stepKey="selectProductsPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductGridLoad50PerPage"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" parameterArray="[5,50]" stepKey="see50ProductsInGrid"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdownCustom"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
+        <fillField selector="{{AdminProductGridPaginationSection.perPageInput}}" userInput="5" stepKey="fillCustomPerPage"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
+        <waitForPageLoad stepKey="waitForPageRefreshCustomPerPage"/>
+        <seeInField selector="{{AdminProductGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstProductPage"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="5" stepKey="seeProductsOnFirstPage"/>
+        <click selector="{{AdminProductGridPaginationSection.nextPage}}" stepKey="clickNextProductPage"/>
+        <seeInField selector="{{AdminProductGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondProductPage"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" parameterArray="[1,5]" stepKey="seeProductsOnSecondPage"/>
+
+        <!--Filtering works  (by Name, By Price, by Status)-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultFiltering"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridByGroupedSku">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneMatchingSkuInProductGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1','SKU')}}" userInput="{{GroupedProduct.sku}}" stepKey="seeProductInFilteredGridSku"/>
+        <!--Filter by price-->
+        <actionGroup ref="filterProductGridByPriceRange" stepKey="filterProductGridByPrice">
+            <argument name="filter" value="PriceFilterRange"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortAscForFilter"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getMinimumPriceInGrid"/>
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortDescForFilter"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getMaximumPriceInGrid"/>
+        <assertRegExp expected="'/\$[0-9]{2}\.[0-9]{2}/'" actual="$getMinimumPriceInGrid" stepKey="assertMinimumPriceIsCorrect"/>
+        <assertRegExp expected="'/\$[0-9]{2}\.[0-9]{2}/'" actual="$getMaximumPriceInGrid" stepKey="assertMaximumPriceIsCorrect"/>
+        <assertLessThan expected="$getMaximumPriceInGrid" actual="$getMinimumPriceInGrid" stepKey="checkPriceSortCorrect"/>
+        <!--Filter by status-->
+        <actionGroup ref="filterProductGridByEnabledStatus" stepKey="filterGridByEnabledProducts"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" parameterArray="[1,20]" stepKey="seeEnabledProductsNotEmpty"/>
+        <see selector="{{AdminProductGridSection.column('Status')}}" userInput="Enabled" stepKey="seeOnlyEnabledProducts"/>
+        <actionGroup ref="filterProductGridByDisabledStatus" stepKey="filterGridByDisabledProducts"/>
+        <dontSee selector="{{AdminProductGridSection.column('Status')}}" userInput="Enabled" stepKey="dontSeeEnabledProducts"/>
+
+        <!--Sorting works (By Price, by ID)-->
+        <!--By Price-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingPrice"/>
+        <!--Filter by price so grid contains prices that we can compare correctly-->
+        <actionGroup ref="filterProductGridByPriceRange" stepKey="filterProductGridByPriceForCompare">
+            <argument name="filter" value="PriceFilterRange"/>
+        </actionGroup>
+        <!--Sort Ascending-->
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getFirstPriceSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'Price')}}" stepKey="getSecondPriceSortAsc"/>
+        <assertLessThanOrEqual expected="$getSecondPriceSortAsc" actual="$getFirstPriceSortAsc" stepKey="checkPriceAscSortCorrect"/>
+        <!--Sort Descending-->
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getFirstPriceSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'Price')}}" stepKey="getSecondPriceSortDesc"/>
+        <assertGreaterThanOrEqual expected="$getSecondPriceSortDesc" actual="$getFirstPriceSortDesc" stepKey="checkPriceDescSortCorrect"/>
+        <!--By Product ID-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingId"/>
+        <!--Sort Ascending-->
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'ID')}}" stepKey="getFirstProductIdSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'ID')}}" stepKey="getSecondProductIdSortAsc"/>
+        <assertLessThan expected="$getSecondProductIdSortAsc" actual="$getFirstProductIdSortAsc" stepKey="checkProductIdAscSortCorrect"/>
+        <!--Sort Descending-->
+        <click selector="{{AdminProductGridSection.columnHeader('ID')}}" stepKey="clickIdHeaderToSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'ID')}}" stepKey="getFirstProductIdSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'ID')}}" stepKey="getSecondProductIdSortDesc"/>
+        <assertGreaterThan expected="$getSecondProductIdSortDesc" actual="$getFirstProductIdSortDesc" stepKey="checkProductIdDescSortCorrect"/>
+
+        <!--Adding column works-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultColumns"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdownToReset"/>
+        <click selector="{{AdminProductGridFilterSection.resetGridColumns}}" stepKey="resetProductGridColumns"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdownAfterReset"/>
+        <!--Remove Price column-->
+        <seeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="seeProductPriceColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdown"/>
+        <uncheckOption selector="{{AdminProductGridFilterSection.viewColumnOption('Price')}}" stepKey="hidePriceColumn"/>
+        <dontSeeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="dontSeeProductPriceColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdown"/>
+        <!--Add Weight column-->
+        <dontSeeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="dontSeeWeightColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdownWeight"/>
+        <checkOption selector="{{AdminProductGridFilterSection.viewColumnOption('Weight')}}" stepKey="showWeightColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdownWeight"/>
+        <seeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="seeWeightColumn"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridToCheckWeightColumn">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1','Weight')}}" userInput="{{SimpleProduct.weight}}" stepKey="seeCorrectProductWeightInGrid"/>
+        <!--END Admin uses product grid-->
+
+        <!--Admin creates category-->
+        <comment userInput="Admin creates category." stepKey="adminCreatesCategoryComment" before="navigateToCategoryPage"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPageLoad"/>
+        <!--Create category under Default Category-->
+        <click selector="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}" stepKey="clickDefaultCategory"/>
+        <actionGroup ref="CheckCategoryNameIsRequiredField" stepKey="checkCategoryNameIsRequired"/>
+        <actionGroup ref="CreateCategory" stepKey="createCategory">
+            <argument name="categoryEntity" value="_defaultCategory"/>
+        </actionGroup>
+        <!--Create category under newly created category-->
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="clickCreatedCategoryInTree"/>
+        <actionGroup ref="CreateCategory" stepKey="createSubCategory">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+
+        <!--Admin moves category-->
+        <comment userInput="Admin moves category." stepKey="adminMovesCategoryComment" before="onCategoryPageToMoveCategory"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryPageToMoveCategory"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoadMoveCategory"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandTree"/>
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}"
+                     selector2="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}"
+                     stepKey="dragAndDropCategory"/>
+        <waitForPageLoad time="30" stepKey="waitForMoveConfirmation"/>
+        <see selector="{{AdminCategoryModalSection.title}}" userInput="Warning Message" stepKey="seeMoveConfirmationModal"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkConfirmMove"/>
+        <waitForPageLoad time="30" stepKey="waitForMove"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeCategoryMoveSuccessMessage"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleSubCategory.name)}}" stepKey="seeSubcategoryIsUnderDefault"/>
+
+        <!--Admin deletes category-->
+        <comment userInput="Admin deletes category" stepKey="deleteCategoryComment"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryPageToDeleteCategory"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPageDelete"/>
+        <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+            <argument name="categoryEntity" value="_defaultCategory"/>
+        </actionGroup>
+
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <!--Clean up categories-->
+        <comment userInput="Clean up categories" stepKey="cleanupCategoriesComment"/>
+        <actionGroup ref="DeleteCategory" stepKey="cleanSimpleSubCategory">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <!--Clean up products-->
+        <comment userInput="Clean up simple product" stepKey="cleanUpSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <comment userInput="Clean up virtual product" stepKey="cleanUpVirtualProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
+            <argument name="product" value="VirtualProduct"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..7c0de6da18caf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <annotations>
+            <features value="End to End scenarios"/>
+            <stories value="B2C guest user - MAGETWO-75411"/>
+            <group value="e2e"/>
+            <title value="You should be able to pass End to End B2C Guest User scenario"/>
+            <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-87435"/>
+        </annotations>
+        <before>
+            <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct1Image">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createSimpleProduct1Image1">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createSimpleProduct1"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct2Image">
+                <requiredEntity createDataKey="createSimpleProduct2"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct2" createDataKey="createSimpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image" stepKey="deleteSimpleProduct1Image"/>-->
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image1" stepKey="deleteSimpleProduct1Image1"/>-->
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct2Image" stepKey="deleteSimpleProduct2Image"/>-->
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Step 1: User browses catalog -->
+        <comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog" />
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
+        <waitForPageLoad stepKey="homeWaitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeWaitForWelcomeMessage"/>
+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>
+
+        <!-- Open Category -->
+        <comment userInput="Open category" stepKey="commentOpenCategory" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <!-- Check simple product 1 in category -->
+        <comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault"/>
+        <!-- Check simple product 2 in category -->
+        <comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" />
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault"/>
+
+        <!-- View Simple Product 1 -->
+        <comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" />
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct1PageImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault"/>
+
+        <!-- View Simple Product 2 -->
+        <comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2ViewLoaded" />
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct2PageImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct2PageImageSrc" stepKey="browseAssertSimpleProduct2PageImageNotDefault"/>
+        <comment userInput="End of browsing catalog" stepKey="endOfBrowsingCatalog" after="browseAssertSimpleProduct2PageImageNotDefault"/>
+
+        <!-- Step 4: User compares products -->
+        <comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to comparison -->
+        <comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" />
+        <waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" />
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrc" stepKey="compareAssertSimpleProduct1ImageNotDefault"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="compareClickSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareSimpleProduct1loaded" />
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="compareAssertProduct1Page">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="compareGrabSimpleProduct1PageImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$compareGrabSimpleProduct1PageImageSrc" stepKey="compareAssertSimpleProduct2PageImageNotDefault"/>
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to comparison -->
+        <comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" />
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrc" stepKey="compareAssertSimpleProduct2ImageNotDefault"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products in comparison sidebar -->
+        <!-- Check simple product 1 in comparison sidebar -->
+        <comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- Check simple product 2 in comparison sidebar -->
+        <comment userInput="Check simple product 2 in comparison sidebar" stepKey="commentCheckSimpleProduct2InComparisonSidebar" />
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products on comparison page -->
+        <!-- Check simple product 1 on comparison page -->
+        <comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison"/>
+        <!-- Check simple product2 on comparison page -->
+        <comment userInput="Check simple product 2 on comparison page" stepKey="commentCheckSimpleProduct2OnComparisonPage" />
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrcInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
+
+        <!-- Clear comparison sidebar -->
+        <comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare"/>
+        <comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..3f48c3ca811e3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct1Image">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createSimpleProduct1Image1">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createSimpleProduct1"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct2Image">
+                <requiredEntity createDataKey="createSimpleProduct2"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct2" createDataKey="createSimpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image" stepKey="deleteSimpleProduct1Image"/>-->
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image1" stepKey="deleteSimpleProduct1Image1"/>-->
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct2Image" stepKey="deleteSimpleProduct2Image"/>-->
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Step 1: User browses catalog -->
+        <comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog" after="endOfSigningUpUserAccount"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage" after="startOfBrowsingCatalog"/>
+        <waitForPageLoad stepKey="homeWaitForPageLoad" after="amOnHomePage"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeWaitForWelcomeMessage" after="homeWaitForPageLoad"/>
+        <see userInput="Welcome, John Doe!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome" after="homeWaitForWelcomeMessage"/>
+
+        <!-- Open Category -->
+        <comment userInput="Open category" stepKey="commentOpenCategory" after="homeCheckWelcome"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory" after="commentOpenCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory" after="browseClickCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <!-- Check simple product 1 in category -->
+        <comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" after="browseAssertCategory"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1" after="commentCheckSimpleProductInCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc" after="browseAssertCategoryProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault" after="browseGrabSimpleProduct1ImageSrc"/>
+        <!-- Check simple product 2 in category -->
+        <comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" after="browseAssertSimpleProduct1ImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2" after="commentCheckSimpleProduct2InCategory">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc" after="browseAssertCategoryProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault" after="browseGrabSimpleProduct2ImageSrc"/>
+
+        <!-- View Simple Product 1 -->
+        <comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" after="browseClickCategorySimpleProduct1View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page" after="waitForSimpleProduct1Viewloaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct1PageImageSrc" after="browseAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault" after="browseGrabSimpleProduct1PageImageSrc"/>
+
+        <!-- View Simple Product 2 -->
+        <comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" after="browseAssertSimpleProduct1PageImageNotDefault"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1" after="commentViewSimpleProduct2"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View" after="clickCategory1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2ViewLoaded" after="browseClickCategorySimpleProduct2View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page" after="waitForSimpleProduct2ViewLoaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct2PageImageSrc" after="browseAssertProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct2PageImageSrc" stepKey="browseAssertSimpleProduct2PageImageNotDefault" after="browseGrabSimpleProduct2PageImageSrc"/>
+        <comment userInput="End of browsing catalog" stepKey="endOfBrowsingCatalog" after="browseAssertSimpleProduct2PageImageNotDefault"/>
+
+        <!-- Step 4: User compares products -->
+        <comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to comparison -->
+        <comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" after="startOfComparingProducts"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" after="commentAddSimpleProduct1ToComparison"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" after="compareClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory" after="waitForCategoryloaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1" after="compareAssertCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrc" after="compareAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrc" stepKey="compareAssertSimpleProduct1ImageNotDefault" after="compareGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="compareClickSimpleProduct1" after="compareAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareSimpleProduct1loaded" after="compareClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="compareAssertProduct1Page" after="waitForCompareSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="compareGrabSimpleProduct1PageImageSrc" after="compareAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$compareGrabSimpleProduct1PageImageSrc" stepKey="compareAssertSimpleProduct2PageImageNotDefault" after="compareGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare" after="compareAssertSimpleProduct2PageImageNotDefault">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to comparison -->
+        <comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" after="compareAddSimpleProduct1ToCompare"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1" after="commentAddSimpleProduct2ToComparison"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" after="compareClickCategory1"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1" after="waitForCompareCategory1loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2" after="compareAssertCategory1">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrc" after="compareAssertSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrc" stepKey="compareAssertSimpleProduct2ImageNotDefault" after="compareGrabSimpleProduct2ImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare" after="compareAssertSimpleProduct2ImageNotDefault">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products in comparison sidebar -->
+        <!-- Check simple product 1 in comparison sidebar -->
+        <comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in comparison sidebar -->
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar" after="compareSimpleProduct1InSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products on comparison page -->
+        <!-- Check simple product 1 on comparison page -->
+        <comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison" after="compareOpenComparePage">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison" after="compareAssertSimpleProduct1InComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison" after="compareGrabSimpleProduct1ImageSrcInComparison"/>
+        <!-- Check simple product2 on comparison page -->
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison" after="compareAssertSimpleProduct1ImageNotDefaultInComparison">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrcInComparison" after="compareAssertSimpleProduct2InComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison" after="compareGrabSimpleProduct2ImageSrcInComparison"/>
+
+        <!-- Clear comparison sidebar -->
+        <comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2" after="compareClickCategoryBeforeClear">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare" after="compareAssertCategory2"/>
+        <comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" after="compareClearCompare"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
new file mode 100644
index 0000000000000..9ee56c02c7710
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetSimpleProductTest" extends="NewProductsListWidgetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set Simple Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set Simple Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-104"/>
+            <group value="Catalog"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
+
+        <!-- Create a Simple Product to appear in the widget -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{_defaultProduct.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- If PageCache is enabled, Cache clearing happens here via merge  -->
+
+        <!-- Check for product on the CMS page with the New Products widget -->
+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPage"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
new file mode 100644
index 0000000000000..a4e0d8708eb49
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetVirtualProductTest" extends="NewProductsListWidgetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set Virtual Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set Virtual Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-122"/>
+            <group value="Catalog"/>
+            <group value="WYSIWYGDisabled"/>
+
+        </annotations>
+
+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
+
+        <!-- Create a Virtual Product to appear in the widget -->
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickAddVirtualProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="123.45" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
+
+        <!-- Check for product on the CMS page with the New Products widget -->
+
+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPage"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
new file mode 100644
index 0000000000000..e9e9eb0158789
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="SaveProductWithCustomOptionsAdditionalWebsiteTest">
+        <annotations>
+            <features value="Save a product with Custom Options and assign to a different website"/>
+            <stories value="Purchase a product with Custom Options of different types"/>
+            <title value="You should be able to save a product with custom options assigned to a different website"/>
+            <description value="Custom Options should not be split when saving the product after assigning to a different website"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-91436"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create new website -->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="Second Website"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+
+            <!--Create new Store Group -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="Second Website"/>
+                <argument name="storeGroupName" value="Second Store"/>
+                <argument name="storeGroupCode" value="second_store"/>
+            </actionGroup>
+
+            <!--Create Store view -->
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+            <waitForPageLoad stepKey="waitForAdminSystemStorePage"/>
+            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
+            <waitForPageLoad stepKey="waitForProductPageLoad"/>
+            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+            <selectOption userInput="1" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="enableStoreViewStatus"/>
+            <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
+            <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
+            <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
+            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
+            <see userInput="You saved the store view." stepKey="seeSaveMessage" />
+        </before>
+        <after>
+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
+        <!--Create a Simple Product with Custom Options -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
+        <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
+        <waitForPageLoad stepKey="waitAfterAddOption"/>
+        <fillField selector="input[name='product[options][0][title]']" userInput="Radio Option" stepKey="fillOptionTitle"/>
+        <click selector=".admin__dynamic-rows[data-index='options'] .action-select" stepKey="openOptionTypeDropDown"/>
+        <click selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li:nth-of-type(3) li:nth-of-type(2)" stepKey="selectRadioButtonType"/>
+
+        <!--Add Option Values -->
+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Radio Option')}}" stepKey="clickAddValue1"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Radio Option', '0')}}" userInput="option 1" stepKey="fillOptionValueTitle1"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '0')}}" userInput="5" stepKey="fillOptionValuePrice1"/>
+
+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Radio Option')}}" stepKey="clickAddValue2"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Radio Option', '1')}}" userInput="option 2" stepKey="fillOptionValueTitle2"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '1')}}" userInput="6" stepKey="fillOptionValuePrice2"/>
+
+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Radio Option')}}" stepKey="clickAddValue3"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Radio Option', '2')}}" userInput="option 3" stepKey="fillOptionValueTitle3"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '2')}}" userInput="7" stepKey="fillOptionValuePrice3"/>
+
+        <!--Save the product with custom options -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitProductPageSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeProductSavedMessage"/>
+
+        <!-- Add this product to second website -->
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
+        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
+
+        <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection2"/>
+        <seeNumberOfElements selector=".admin__dynamic-rows[data-index='values'] tr.data-row" userInput="3" stepKey="see4RowsOfOptions"/>
+
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
new file mode 100644
index 0000000000000..0049dcb504335
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="SimpleProductTwoCustomOptionsTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create simple product with two custom options" />
+            <title value="Admin should be able to create simple product with two custom options"/>
+            <description value="Admin should be able to create simple product with two custom options"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-248"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!-- log in as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create product-->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+            <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Delete the created product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- opens the custom option panel and clicks add options -->
+        <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}"/>
+        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
+
+        <!-- Create a custom option with 2 values -->
+        <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption1">
+            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
+            <argument name="productOption" value="ProductOptionField"/>
+            <argument name="productOption2" value="ProductOptionField2"/>
+        </actionGroup>
+
+        <!-- Create another custom option with 2 values -->
+        <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption2">
+            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
+            <argument name="productOption" value="ProductOptionField"/>
+            <argument name="productOption2" value="ProductOptionField2"/>
+        </actionGroup>
+
+        <!-- Save the product -->
+        <click stepKey="saveProduct" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForProductSaved"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+
+        <!-- navigate to the created product page -->
+        <amOnPage url="/{{SimpleProduct3.name}}.html" stepKey="goToCreatedProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Check to make sure all of the created names are there -->
+        <see stepKey="assertNameInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField.title}}"/>
+        <see stepKey="assertNameInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField.title}}"/>
+        <see stepKey="assertSecondNameInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField2.title}}"/>
+        <see stepKey="assertSecondNameInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField2.title}}"/>
+
+        <!-- Check to see that all of the created prices are there -->
+        <see stepKey="assertPriceInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField.price}}"/>
+        <see stepKey="assertPriceInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField.price}}"/>
+        <see stepKey="assertSecondPriceInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField2.price}}"/>
+        <see stepKey="assertSecondPriceInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField2.price}}"/>
+
+        <!-- select two of the radio buttons -->
+        <click stepKey="selectFirstCustomOption" selector="{{StorefrontProductInfoMainSection.nthCustomOptionInput('1','2')}}"/>
+        <click stepKey="selectSecondCustomOption" selector="{{StorefrontProductInfoMainSection.nthCustomOptionInput('2','1')}}"/>
+
+        <!-- Check that the price has actually changed -->
+        <see stepKey="assertPriceHasChanged" selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="153.00"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
new file mode 100644
index 0000000000000..386633f0e9476
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductNameWithDoubleQuote">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create products"/>
+            <title value="Product with double quote in name"/>
+            <description value="Product with a double quote in the name should appear correctly on the storefront"/>
+            <severity value="CRITICAL"/>
+            <group value="product"/>
+            <testCaseId value="MAGETWO-92384"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <!--Create product via admin-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToProductCreatePage">
+            <argument name="product" value="SimpleProductNameWithDoubleQuote"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="SimpleProductNameWithDoubleQuote"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="selectCategory"/>
+        <actionGroup ref="addProductImage" stepKey="addImageToProduct">
+            <argument name="image" value="ProductImage"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Check product in category listing-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToCategoryPage"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByNameAndSrc(SimpleProductNameWithDoubleQuote.name, ProductImage.fileName)}}" stepKey="seeCorrectImageCategoryPage"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(SimpleProductNameWithDoubleQuote.name)}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectNameCategoryPage"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(SimpleProductNameWithDoubleQuote.name)}}" userInput="${{SimpleProductNameWithDoubleQuote.price}}" stepKey="seeCorrectPriceCategoryPage"/>
+        <!--Open product display page-->
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(SimpleProductNameWithDoubleQuote.name)}}" stepKey="clickProductToGoProductPage"/>
+        <waitForPageLoad stepKey="waitForProductDisplayPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectName"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProductNameWithDoubleQuote.sku}}" stepKey="seeCorrectSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="${{SimpleProductNameWithDoubleQuote.price}}" stepKey="seeCorrectPrice"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ProductImage.fileName)}}" stepKey="seeCorrectImage"/>
+        <see selector="{{StorefrontProductInfoMainSection.stock}}" userInput="In Stock" stepKey="seeInStock"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$createCategory.name$$" stepKey="seeCorrectBreadCrumbCategory"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectBreadCrumbProduct"/>
+
+        <!--Remove product-->
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+            <argument name="product" value="SimpleProductNameWithDoubleQuote"/>
+        </actionGroup>
+    </test>
+
+    <test name="StorefrontProductNameWithHTMLEntities">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create product"/>
+            <title value=":Proudct with html special characters in name"/>
+            <description value="Product with html entities in the name should appear correctly on the PDP breadcrumbs on storefront"/>
+            <severity value="CRITICAL"/>
+            <group value="product"/>
+            <testCaseId value="MAGETWO-93794"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategoryOne"/>
+            <createData entity="productWithHTMLEntityOne" stepKey="productOne">
+                <requiredEntity createDataKey="createCategoryOne"/>
+            </createData>
+            <createData entity="productWithHTMLEntityTwo" stepKey="productTwo">
+                <requiredEntity createDataKey="createCategoryOne"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="productOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="productTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategoryOne" stepKey="deleteCategory"/>
+        </after>
+
+        <!--Check product in category listing-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategoryOne.name$$)}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad stepKey="waitforCategoryPageToLoad"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityOne.name)}}" userInput="{{productWithHTMLEntityOne.name}}" stepKey="seeCorrectNameProd1CategoryPage"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityTwo.name)}}" userInput="{{productWithHTMLEntityTwo.name}}" stepKey="seeCorrectNameProd2CategoryPage"/>
+
+        <!--Open product display page-->
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityOne.name)}}" stepKey="clickProductToGoProductPage"/>
+        <waitForPageLoad stepKey="waitForProductDisplayPageLoad2"/>
+
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productWithHTMLEntityOne.name}}" stepKey="seeCorrectName"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productWithHTMLEntityOne.sku}}" stepKey="seeCorrectSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="${{productWithHTMLEntityOne.price}}" stepKey="seeCorrectPrice"/>
+
+        <!--Veriy the breadcrumbs on Product Display page-->
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs1"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$createCategoryOne.name$$" stepKey="seeCorrectBreadCrumbCategory"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeCorrectBreadCrumbProduct"/>
+
+        <click selector="{{StorefrontNavigationSection.topCategory($$createCategoryOne.name$$)}}" stepKey="goBackToCategoryPage"/>
+        <waitForPageLoad stepKey="waitforCategoryPageToLoad2"/>
+
+        <!--Open product display page-->
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByNumber('1')}}" stepKey="goToProduct2DisplayPage"/>
+        <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityOne.name)}}" stepKey="clickProductToGoProductPage"/>-->
+        <waitForPageLoad stepKey="waitForProductDisplayPageLoad3"/>
+
+        <!--Veriy the breadcrumbs on Product Display page-->
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs2"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$createCategoryOne.name$$" stepKey="seeCorrectBreadCrumbCategory2"/>
+        <see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productTwo.name$$" stepKey="seeCorrectBreadCrumbProduct2"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
new file mode 100644
index 0000000000000..1c1b47a6bded9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductWithEmptyAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create products"/>
+            <title value="Product attribute is not visible on storefront if it is empty"/>
+            <description value="Product attribute should not be visible on storefront if it is empty"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-91893"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="productAttributeWithDropdownTwoOptions" stepKey="createProductAttribute"/>
+        </before>
+        <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
+                <argument name="product" value="SimpleProduct"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
+        <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="chooseDefaultAttributeSet"/>
+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+        <dragAndDrop selector1="{{UnassignedAttributes.ProductAttributeName('testattribute')}}" selector2="{{Group.FolderName('Product Details')}}" stepKey="moveProductAttributeToGroup"/>
+        <click selector="{{AttributeSetSection.Save}}" stepKey="saveAttributeSet"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
+        <seeElement selector=".message-success" stepKey="assertSuccess"/>
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
+        <amOnPage url="{{StorefrontProductPage.url(SimpleProduct.urlKey)}}" stepKey="goProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
+        <dontSeeElement selector="//table[@id='product-attribute-specs-table']/tbody/tr/th[contains(text(),'testattribute')]" stepKey="seeAttribute2"/>
+    </test>
+    </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
new file mode 100644
index 0000000000000..d7f98c4cdd307
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductsCompareWithEmptyAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product attributes"/>
+            <title value="Product attribute is not visible on product compare page if it is empty"/>
+            <description value="Product attribute should not be visible on the product compare page if it is empty for all products that are being compared, not even displayed as N/A"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-91960"/>
+            <group value="productCompare"/>
+        </annotations>
+        <before>
+            <createData entity="productAttributeWithDropdownTwoOptions" stepKey="createProductAttribute"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
+        <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="chooseDefaultAttributeSet"/>
+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+        <dragAndDrop selector1="{{UnassignedAttributes.ProductAttributeName('testattribute')}}" selector2="{{Group.FolderName('Product Details')}}" stepKey="moveProductAttributeToGroup"/>
+        <click selector="{{AttributeSetSection.Save}}" stepKey="saveAttributeSet"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
+        <seeElement selector=".message-success" stepKey="assertSuccess"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
+        <amOnPage url="{{StorefrontProductPage.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="goProductPageOnStorefront1"/>
+        <!-- View Simple Product 1 -->
+        <comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="goProductPageOnStorefront1"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" after="browseClickCategorySimpleProduct1View"/>
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="goProductPageOnStorefront2"/>
+        <!-- View Simple Product 2 -->
+        <comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" after="goProductPageOnStorefront2"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View" after="commentViewSimpleProduct2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2Viewloaded" after="browseClickCategorySimpleProduct2View"/>
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="goProductPageOnStorefront3"/>
+        <!-- Check products in comparison sidebar -->
+        <!-- Check simple product 1 in comparison sidebar -->
+        <comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="goProductPageOnStorefront3"/>
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in comparison sidebar -->
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar" after="compareSimpleProduct1InSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- Check products on comparison page -->
+        <!-- Check simple product 1 on comparison page -->
+        <comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison" after="compareOpenComparePage">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <seeElement selector="//table[@id='product-comparison']/tbody/tr/th/*[contains(text(),'SKU')]" stepKey="seeCompareAttribute1"/>
+        <dontSeeElement selector="//table[@id='product-comparison']/tbody/tr/th/*[contains(text(),'testattribute')]" stepKey="seeCompareAttribute2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
new file mode 100644
index 0000000000000..9c9f09f807eaf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Custom options different storeviews"/>
+            <title value="Admin should be able to sell products with different variants of their own"/>
+            <description value="Admin should be able to sell products with different variants of their own"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-58184"/>
+            <group value="product"/>
+        </annotations>
+
+        <before>
+            <!-- Create Customer -->
+
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+
+            <!--Create Simple Product -->
+
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!--Create storeView 1-->
+
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+
+            <!--Create storeView 2-->
+
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+
+            <!-- Delete Store View EN -->
+
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+
+            <!-- Delete Store View FR -->
+
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+        </after>
+
+        <!-- Open Product Grid, Filter product and open -->
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+
+        <!-- Update Product with Option Value DropDown 1-->
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
+        <waitForPageLoad time="10" stepKey="waitForPageLoad3"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue1"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '0')}}" userInput="option1" stepKey="fillOptionValueTitle1"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '0')}}" userInput="5" stepKey="fillOptionValuePrice1"/>
+
+        <!-- Update Product with Option Value 1 DropDown 1-->
+
+        <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue2"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '1')}}" userInput="option2" stepKey="fillOptionValueTitle2"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '1')}}" userInput="50" stepKey="fillOptionValuePrice2"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType('Custom Options 1', '1')}}" userInput="percent" stepKey="clickSelectPriceType"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
+
+        <!-- Switcher to Store FR-->
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
+
+        <!-- Open tab Customizable Options -->
+
+        <waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
+
+        <!-- Update Option Customizable Options and Option Value 1-->
+
+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="uncheckUseDefaultOptionTitle"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('Custom Options 1')}}" userInput="FR Custom Options 1" stepKey="fillOptionTitle2"/>
+        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="uncheckUseDefaultOptionValueTitle1"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '0')}}" userInput="FR option1" stepKey="fillOptionValueTitle3"/>
+
+        <!-- Update Product with Option Value 1 DropDown 1-->
+
+        <click selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="clickHiddenRequireMessage"/>
+        <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="uncheckUseDefaultOptionValueTitle2"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '1')}}" userInput="FR option2" stepKey="fillOptionValueTitle4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+
+        <!-- Login Customer Storefront -->
+
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
+        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField  userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+
+        <!-- Go to Product Page -->
+
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
+
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeproductOptionDropDownOptionTitle2"/>
+
+        <selectOption userInput="5" selector="{{StorefrontProductInfoMainSection.productOptionSelect('Custom Options 1')}}" stepKey="selectProductOptionDropDown"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage1">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <selectOption userInput="50" selector="{{StorefrontProductInfoMainSection.productOptionSelect('Custom Options 1')}}" stepKey="selectProductOptionDropDown1"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
+
+        <!-- See Custom options are displayed as option1 -->
+
+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('105')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" visible="false" stepKey="exposeProductOptions"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" userInput="option1" stepKey="seeProductOptionValueDropdown1Input1"/>
+
+        <!-- See Custom options are displayed as option2 -->
+
+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
+
+        <!-- Place Order -->
+
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!-- Open Order -->
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
+
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="option1" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="option2" stepKey="seeAdminOrderProductOptionValueDropdown2"/>
+
+        <!-- Switch to FR Store View Storefront -->
+
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
+        <waitForPageLoad stepKey="waitForPageLoad12"/>
+
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
+
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option2')}}" stepKey="productFrOptionDropDownOptionTitle2"/>
+
+        <selectOption userInput="5" selector="{{StorefrontProductInfoMainSection.productOptionSelect('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDown"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <selectOption userInput="50" selector="{{StorefrontProductInfoMainSection.productOptionSelect('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDown1"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage3">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1" />
+
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart1"/>
+
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem1"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive1"/>
+
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCar1t"/>
+
+        <!-- See Custom options are displayed as option1 -->
+
+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('105')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" visible="false" stepKey="exposeProductOptions2"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('105')}}" userInput="FR option1" stepKey="seeProductFrOptionValueDropdown1Input2"/>
+
+        <!-- See Custom options are displayed as option2 -->
+
+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
+
+        <!-- Place Order -->
+
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
+
+        <!-- Open Product Grid, Filter product and open -->
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad16"/>
+
+        <!-- Switcher to Store FR-->
+
+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher1"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView1"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage1"/>
+
+        <!-- Open tab Customizable Options -->
+
+        <waitForPageLoad time="30" stepKey="waitForPageLoad17"/>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
+
+        <!-- Update Option Customizable Options and Option Value 1-->
+
+        <waitForPageLoad time="30" stepKey="waitForPageLoad18"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="checkUseDefaultOptionTitle"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="checkUseDefaultOptionValueTitle1"/>
+
+        <!-- Update Product with Option Value 1 DropDown 1-->
+
+        <waitForPageLoad time="30" stepKey="waitForPageLoad19"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
+
+        <!--Go to Product Page-->
+
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
+
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeProductOptionDropDownOptionTitle4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
new file mode 100644
index 0000000000000..86755cb602ee2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontPurchaseProductWithCustomOptions">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Purchase a product with Custom Options of different types"/>
+            <title value="Admin should be able to sell products with different variants of their own"/>
+            <description value="Admin should be able to sell products with different variants of their own"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-61717"/>
+            <group value="Catalog"/>
+            <!-- skip due to MAGETWO-97424 -->
+            <group value="skip"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!--Create Simple Product with Custom Options-->
+
+        <createData entity="_defaultCategory" stepKey="createCategory"/>
+        <createData entity="_defaultProduct" stepKey="createProduct">
+            <requiredEntity createDataKey="createCategory"/>
+            <field key="price">17</field>
+        </createData>
+        <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
+
+        <!-- Login Customer Storeront -->
+
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+
+        <!-- Checking the correctness of displayed prices for user parameters -->
+
+        <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProduct3Page"/>
+
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionField.title, ProductOptionField.price)}}" stepKey="checkFieldProductOption"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionArea.title, '1.7')}}" stepKey="checkAreaProductOption"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsDropDown(ProductOptionDropDown.title, ProductOptionValueDropdown1.price)}}" stepKey="checkDropDownProductOption"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsRadioButtons(ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.price)}}" stepKey="checkButtonsProductOption"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '20.91')}}" stepKey="checkCheckboxProductOptiozn"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsMultiselect(ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.price)}}" stepKey="checkMultiSelectProductOption"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsData(ProductOptionDate.title, ProductOptionDate.price)}}" stepKey="checkDataProductOption"/>
+
+        <!-- Adding items to the checkout -->
+
+        <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
+        <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
+        <attachFile userInput="{{productWithOptions.file}}" selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" stepKey="fillUploadFile"/>
+        <selectOption userInput="{{ProductOptionValueDropdown1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionDropDown.title)}}" stepKey="seeProductOptionDropDown"/>
+        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.price)}}" stepKey="seeProductOptionRadioButtons"/>
+        <checkOption selector="{{StorefrontProductInfoMainSection.productOptionRadioButtonsCheckbox(ProductOptionCheckbox.title, '20.91')}}" stepKey="seeProductOptionCheckbox"/>
+        <selectOption userInput="{{ProductOptionValueMultiSelect1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionMultiSelect.title)}}" stepKey="selectProductOptionMultiSelect"/>
+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataMonth(ProductOptionDate.title)}}" stepKey="selectProductOptionDate"/>
+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataDay(ProductOptionDate.title)}}" stepKey="selectProductOptionDate1"/>
+        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMonth(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMonth"/>
+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeDay(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeDay"/>
+        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeHour(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeHour"/>
+        <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMinute(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMinute"/>
+        <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionTimeHour(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeHour"/>
+        <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionTimeMinute(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeMinute"/>
+
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$createProduct.name$"/>
+        </actionGroup>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$createProduct.name$" stepKey="seeProductInCart"/>
+
+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($createProduct.name$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" visible="false" stepKey="exposeProductOptions"/>
+
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
+        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($createProduct.name$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, 2018" stepKey="seeProductOptionDateAndTimeInput" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/18, 1:00 AM" stepKey="seeProductOptionDataInput" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <!--Select payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <!-- Place Order -->
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!-- Login to Admin and open Order -->
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
+
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile"/>
+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptionsLink(productWithOptions.file)}}" stepKey="seeAdminOrderProductOptionFileLink"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime" />
+
+        <!-- Reorder and Checking the correctness of displayed custom options for user parameters on Order and correctness of displayed price Subtotal-->
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
+        <actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
+
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile1"/>
+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptionsLink(productWithOptions.file)}}" stepKey="seeAdminOrderProductOptionFileLink1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown11"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton11"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect11" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime1" />
+
+        <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
+
+        <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
+
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnProduct4Page"/>
+
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
+        <seeElement selector="{{StorefrontCustomerOrderSection.productCustomOptionsLink($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" stepKey="seeStorefontOrderProductOptionFileLink1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDate.title, 'Jan 1, 2018')}}" userInput="Jan 1, 2018" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/18, 1:00 AM')}}" userInput="1/1/18, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
+
+        <!-- Delete product and category -->
+
+        <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
new file mode 100644
index 0000000000000..04cb813ec0efb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Custom options"/>
+            <group value="Catalog"/>
+            <title value="Admin should be able to see the full title of the selected custom option value in the order"/>
+            <description value="Admin should be able to see the full title of the selected custom option value in the order"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-3043"/>
+        </annotations>
+        <before>
+            <!--Create Simple Product with Custom Options-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">17</field>
+            </createData>
+            <updateData createDataKey="createProduct" entity="productWithOptions2" stepKey="updateProductWithOptions"/>
+
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Login Customer Storefront -->
+
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+
+        <!-- Checking the correctness of displayed prices for user parameters -->
+
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsDropDown(ProductOptionDropDownWithLongValuesTitle.title, ProductOptionValueDropdownLongTitle1.price)}}" stepKey="checkDropDownProductOption"/>
+
+        <!-- Adding items to the checkout -->
+
+        <selectOption userInput="{{ProductOptionValueDropdownLongTitle1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionDropDownWithLongValuesTitle.title)}}" stepKey="seeProductOptionDropDown"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
+
+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
+
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+
+        <!--Select shipping method-->
+
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+
+        <!-- Place Order -->
+
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!-- Login to Admin and open Order -->
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+
+        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
+
+        <dontSee selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="dontSeeAdminOrderProductOptionValueDropdown1"/>
+        <grabTextFrom selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="productOptionValueText"/>
+        <assertEquals stepKey="checkProductOptionValue">
+            <actualResult type="variable">productOptionValueText</actualResult>
+            <expectedResult type="string">Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 ...</expectedResult>
+        </assertEquals>
+        <moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
+        <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
new file mode 100644
index 0000000000000..0ed61b8636c4f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontRememberCategoryPaginationTest">
+        <annotations>
+            <title value="Verify that Number of Products per page retained when visiting a different category"/>
+            <stories value="MAGETWO-61478: Number of Products displayed per page not retained when visiting a different category"/>
+            <description value="Verify that Number of Products per page retained when visiting a different category"/>
+            <features value="Catalog"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94210"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="defaultCategory1"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="defaultCategory1"/>
+            </createData>
+
+            <createData entity="_defaultCategory" stepKey="defaultCategory2"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="defaultCategory2"/>
+            </createData>
+
+            <createData entity="RememberPaginationCatalogStorefrontConfig" stepKey="setRememberPaginationCatalogStorefrontConfig"/>
+        </before>
+
+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="GoToStorefrontCategory1Page">
+            <argument name="category" value="$$defaultCategory1.custom_attributes[url_key]$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory1PageParameters">
+            <argument name="category" value="$$defaultCategory1$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$defaultCategory2.name$$)}}" stepKey="navigateToCategory2Page"/>
+        <waitForPageLoad stepKey="waitForCategory2PageToLoad"/>
+
+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory2PageParameters">
+            <argument name="category" value="$$defaultCategory2$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <after>
+            <createData entity="DefaultCatalogStorefrontConfiguration" stepKey="setDefaultCatalogStorefrontConfiguration"/>
+
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="defaultCategory1" stepKey="deleteCategory1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="defaultCategory2" stepKey="deleteCategory2"/>
+
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
new file mode 100644
index 0000000000000..f283a040ced41
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Tiered pricing and quantity increments work with decimal inventory"/>
+            <title value="Tiered pricing and quantity increments work with decimal inventory"/>
+            <description value="Tiered pricing and quantity increments work with decimal inventory"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-93973"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct" stepKey="createPreReqSimpleProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqSimpleProduct" stepKey="deletePreReqSimpleProduct"/>
+        </after>
+        <!--Step1. Login as admin. Go to Catalog > Products page. Filtering *prod1*. Open *prod1* to edit-->
+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin" />
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productGridNameProduct('$$createPreReqSimpleProduct.name$$')}}"
+               stepKey="clickOpenProductForEdit"/>
+        <waitForPageLoad time="30" stepKey="waitForProductEditOpen"/>
+        <!--Step2. Open *Advanced Inventory* pop-up (Click on *Advanced Inventory* link). Set *Qty Uses Decimals* to *Yes*. Click on button *Done*  -->
+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" stepKey="scrollToQtyUsesDecimalsDropBox"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" stepKey="clickOnQtyUsesDecimalsDropBox"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimalsOptions('1')}}" stepKey="chooseYesOnQtyUsesDecimalsDropBox"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton"/>
+        <!--Step3. Open *Advanced Pricing* pop-up (Click on *Advanced Pricing* link). Click on *Add* button. Fill *0.5* in *Quantity*-->
+        <scrollTo selector="{{AdminProductFormSection.productName}}" stepKey="scrollToProductName"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingLink1"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForAddButton"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickOnCustomerGroupPriceAddButton"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="0.5" stepKey="fillProductTierPriceQty"/>
+        <!--Step4. Close *Advanced Pricing* (Click on button *Done*). Save *prod1* (Click on button *Save*)-->
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickOnDoneButton2"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
+
+        <!--The code should be uncommented after fix MAGETWO-96016-->
+        <!--<click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingLink2"/>-->
+        <!--<seeInField userInput="0.5" selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="seeInField1"/>-->
+        <!--<click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickOnCloseButton"/>-->
+
+        <!--Step5. Open *Advanced Inventory* pop-up. Set *Enable Qty Increments* to *Yes*. Fill *.5* in *Qty Increments*-->
+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink2"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrements}}" stepKey="scrollToEnableQtyIncrements"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrementsUseConfigSettings}}" stepKey="clickOnEnableQtyIncrementsUseConfigSettingsCheckbox"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrements}}" stepKey="clickOnEnableQtyIncrements"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrementsOptions(('1'))}}" stepKey="chooseYesOnEnableQtyIncrements"/>
+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyIncrementsUseConfigSettings}}" stepKey="scrollToQtyIncrementsUseConfigSettings"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.qtyIncrementsUseConfigSettings}}" stepKey="clickOnQtyIncrementsUseConfigSettings"/>
+        <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" stepKey="scrollToQtyIncrements"/>
+        <fillField selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" userInput=".5" stepKey="fillQtyIncrements"/>
+        <!--Step6. Close *Advanced Inventory* (Click on button *Done*). Save *prod1* (Click on button *Save*) -->
+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton3"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <!--Step7. Open *Customer view* (Go to *Store Front*). Open *prod1* page (Find via search and click on product name) -->
+        <amOnPage url="{{StorefrontHomePage.url}}$$createPreReqSimpleProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>
+        <!--Step8. Fill *1.5* in *Qty*. Click on button *Add to Cart*-->
+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1.5" stepKey="fillQty"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="clickOnAddToCart"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createPreReqSimpleProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <!--Step9. Click on *Cart* icon. Click on *View and Edit Cart* link. Change *Qty* value to *5.5*-->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName(('$$createPreReqSimpleProduct.name$$'))}}" userInput="5.5" stepKey="fillQty2"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickOnUpdateShoppingCartButton"/>
+        <seeInField userInput="5.5" selector="{{CheckoutCartProductSection.ProductQuantityByName(('$$createPreReqSimpleProduct.name$$'))}}" stepKey="seeInField2"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
new file mode 100644
index 0000000000000..455e9b58156eb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyChildCategoriesShouldNotIncludeInMenuTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create categories"/>
+            <title value="Customer should not see categories that are not included in the menu"/>
+            <description value="Customer should not see categories that are not included in the menu"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-72238"/>
+            <group value="category"/>
+        </annotations>
+        <after>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage2"/>
+            <waitForPageLoad stepKey="waitForPageLoad3"/>
+            <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategoryBeforeDelete"/>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <!--Create new category under Default Category-->
+        <actionGroup ref="CreateCategory" stepKey="createSubcategory1">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <!--Create another subcategory under created category-->
+        <actionGroup ref="CreateCategory" stepKey="createSubcategory2">
+            <argument name="categoryEntity" value="SubCategoryWithParent"/>
+        </actionGroup>
+        <!--Go to storefront and verify visibility of categories-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSimpleSubCategoryOnStorefront1"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront1"/>
+        <!--Set Include in menu to No on created category under Default Category -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage2"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory1"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="setNoToIncludeInMenuSelect"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton1"/>
+        <seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="seeCheckboxEnableCategoryIsChecked"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="dontSeeCheckboxIncludeInMenuIsChecked"/>
+        <!--Go to storefront and verify visibility of categories-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage2"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront1"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront2"/>
+        <!--Set Enable category to No and Include in menu to Yes on created category under Default Category -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage3"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory2"/>
+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="SetNoToEnableCategorySelect"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="SetYesToIncludeInMenuSelect"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton2"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontSeeCheckboxEnableCategoryIsChecked"/>
+        <seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="seeCheckboxIncludeInMenuIsChecked"/>
+        <!--Go to storefront and verify visibility of categories-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage3"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront2"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront3"/>
+        <!--Set Enable category to No and Include in menu to No on created category under Default Category -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage4"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory3"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="setNoToIncludeInMenuSelect2"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton3"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontSeeCheckboxEnableCategoryIsChecked2"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="dontSeeCheckboxIncludeInMenuIsChecked2"/>
+        <!--Go to storefront and verify visibility of categories-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage4"/>
+        <waitForPageLoad stepKey="waitForPageLoad8"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront3"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront4"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
new file mode 100644
index 0000000000000..53bcac5b1d5f0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyDefaultWYSIWYGToolbarOnProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-70412-Default toolbar configuration in Magento"/>
+            <group value="Catalog"/>
+            <title value="Admin should be able to see default toolbar display on Description content area"/>
+            <description value="Admin should be able to see default toolbar display on Description content area"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-80505"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
+        <waitForPageLoad stepKey="wait"/>
+        <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitforTinyMCE4Visible1"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4Description" />
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Style}}" stepKey="assertInfo2"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Bold}}" stepKey="assertInfo3"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Italic}}" stepKey="assertInfo4"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Underline}}" stepKey="assertInfo5"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.AlignLeft}}" stepKey="assertInfo6"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.AlignCenter}}" stepKey="assertInfo7"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.AlignRight}}" stepKey="assertInfo8"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Numlist}}" stepKey="assertInfo9"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Bullet}}" stepKey="assertInfo10"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertLink}}" stepKey="assertInfo11"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="assertInf12"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertTable}}" stepKey="assertInfo13"/>
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.SpecialCharacter}}" stepKey="assertInfo14"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+    <test name="Verifydefaultcontrolsonproductshortdescription">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Default toolbar configuration in Magento-MAGETWO-70412"/>
+            <group value="WYSIWYG"/>
+            <title value="Admin should be able to see default toolbar display on Short Description content area"/>
+            <description value="Admin should be able to see default toolbar display on Short Description content area"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-80505"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
+        <waitForPageLoad stepKey="wait"/>
+        <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitforTinyMCE4Visible2"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4ShortDescription" />
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Style}}" stepKey="assertInfo16"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Bold}}" stepKey="assertInfo17"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Italic}}" stepKey="assertInfo18"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Underline}}" stepKey="assertInfo19"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.AlignLeft}}" stepKey="assertInfo20"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.AlignCenter}}" stepKey="assertInfo21"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.AlignRight}}" stepKey="assertInfo22"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Numlist}}" stepKey="assertInfo23"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Bullet}}" stepKey="assertInfo324"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertLink}}" stepKey="assertInfo25"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="assertInfo26"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertTable}}" stepKey="assertInfo27"/>
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.SpecialCharacter}}" stepKey="assertInfo28"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
new file mode 100644
index 0000000000000..aad83cd0c2aff
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-72137-Apply new WYSIWYG on Categories Page"/>
+            <group value="Catalog"/>
+            <title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Catalog Page"/>
+            <description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Catalog Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-82551"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToNewCatalog"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <waitForLoadingMaskToDisappear stepKey="wait2" />
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
+        <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <seeElement selector="{{CatalogWYSIWYGSection.ShowHideBtn}}" stepKey="seeShowHideBtn" />
+        <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
+        <executeJS function="tinyMCE.get('category_form_description').setContent('Hello World!');" stepKey="executeJSFillContent"/>
+        <click selector="{{CatalogWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
+        <waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage" />
+        <seeElement selector="{{TinyMCESection.InsertImageBtn}}" stepKey="insertImage"/>
+        <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget" />
+        <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable" />
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
+        <!-- Go to storefront product page, assert product content -->
+        <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.CatalogDescription}}"  stepKey="waitForDesVisible" />
+        <see userInput="Hello World!" selector="{{StorefrontCategoryMainSection.CatalogDescription}}" stepKey="assertCatalogDescription"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
new file mode 100644
index 0000000000000..29ed3af4f01d9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="MAGETWO-72114-TinyMCE v4.6 as a native WYSIWYG editor"/>
+            <group value="Catalog"/>
+            <title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Product Page"/>
+            <description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Product Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-81819"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4Description" />
+        <click selector="{{ProductDescriptionWysiwygSection.EditArea}}" stepKey="focusProductDescriptionWysiwyg"/>
+        <executeJS function="tinyMCE.get('product_form_description').setContent('Hello World!');" stepKey="executeJSFillContent1"/>
+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForShortDescription" />
+        <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4ShortDescription" />
+        <click selector="{{ProductShortDescriptionWysiwygSection.EditArea}}" stepKey="focusProductShortDescriptionWysiwyg"/>
+        <executeJS function="tinyMCE.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
+        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDesShowHideBtn1" />
+        <click selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn1" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" stepKey="waitForInsertImage1" />
+        <see selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage1"/>
+        <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget1" />
+        <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable1" />
+        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="scrollToDesShowHideBtn2" />
+        <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn2" />
+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" stepKey="waitForInsertImage2" />
+        <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage2"/>
+        <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget2" />
+        <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable2" />
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <!-- Go to storefront product page, assert product content -->
+        <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <scrollTo selector="{{StorefrontProductInfoMainSection.stock}}" stepKey="scrollToStock"/>
+        <see userInput="Hello World!" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
+        <see userInput="Hello World! Short Content" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
index b45df0380dcc6..5d8db5d5ba589 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
@@ -55,6 +55,9 @@ public function testCanShowTab($priceAllow, $stockAllow, $canShowTab)
         $this->assertEquals($canShowTab, $this->alerts->canShowTab());
     }
 
+    /**
+     * @return array
+     */
     public function canShowTabDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/CategoryTest.php
index 5e899263519da..1fc105686011f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/CategoryTest.php
@@ -50,6 +50,9 @@ public function testIsAllowed($isAllowed)
         }
     }
 
+    /**
+     * @return array
+     */
     public function isAllowedDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index 804eef25ebdd9..249c32ff276c3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -6,9 +6,13 @@
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Helper\Form\Gallery;
 
 use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content;
-use Magento\Framework\Filesystem;
+use Magento\Catalog\Model\Entity\Attribute;
+use Magento\Catalog\Model\Product;
 use Magento\Framework\Phrase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ContentTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -219,4 +223,146 @@ public function testGetImagesJsonWithException()
 
         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
     }
+
+    /**
+     * Test GetImageTypes() will return value for given attribute from data persistor.
+     *
+     * @return void
+     */
+    public function testGetImageTypesFromDataPersistor()
+    {
+        $attributeCode = 'thumbnail';
+        $value = 'testImageValue';
+        $scopeLabel = 'testScopeLabel';
+        $label = 'testLabel';
+        $name = 'testName';
+        $expectedTypes = [
+            $attributeCode => [
+                'code' => $attributeCode,
+                'value' => $value,
+                'label' => $label,
+                'name' => $name,
+            ],
+        ];
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $product->expects($this->once())
+            ->method('getData')
+            ->with($this->identicalTo($attributeCode))
+            ->willReturn(null);
+        $mediaAttribute = $this->getMediaAttribute($label, $attributeCode);
+        $product->expects($this->once())
+            ->method('getMediaAttributes')
+            ->willReturn([$mediaAttribute]);
+        $this->galleryMock->expects($this->exactly(2))
+            ->method('getDataObject')
+            ->willReturn($product);
+        $this->galleryMock->expects($this->once())
+            ->method('getImageValue')
+            ->with($this->identicalTo($attributeCode))
+            ->willReturn($value);
+        $this->galleryMock->expects($this->once())
+            ->method('getScopeLabel')
+            ->with($this->identicalTo($mediaAttribute))
+            ->willReturn($scopeLabel);
+        $this->galleryMock->expects($this->once())
+            ->method('getAttributeFieldName')
+            ->with($this->identicalTo($mediaAttribute))
+            ->willReturn($name);
+        $this->getImageTypesAssertions($attributeCode, $scopeLabel, $expectedTypes);
+    }
+
+    /**
+     * Test GetImageTypes() will return value for given attribute from product.
+     *
+     * @return void
+     */
+    public function testGetImageTypesFromProduct()
+    {
+        $attributeCode = 'thumbnail';
+        $value = 'testImageValue';
+        $scopeLabel = 'testScopeLabel';
+        $label = 'testLabel';
+        $name = 'testName';
+        $expectedTypes = [
+            $attributeCode => [
+                'code' => $attributeCode,
+                'value' => $value,
+                'label' => $label,
+                'name' => $name,
+            ],
+        ];
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $product->expects($this->once())
+            ->method('getData')
+            ->with($this->identicalTo($attributeCode))
+            ->willReturn($value);
+        $mediaAttribute = $this->getMediaAttribute($label, $attributeCode);
+        $product->expects($this->once())
+            ->method('getMediaAttributes')
+            ->willReturn([$mediaAttribute]);
+        $this->galleryMock->expects($this->exactly(2))
+            ->method('getDataObject')
+            ->willReturn($product);
+        $this->galleryMock->expects($this->never())
+            ->method('getImageValue');
+        $this->galleryMock->expects($this->once())
+            ->method('getScopeLabel')
+            ->with($this->identicalTo($mediaAttribute))
+            ->willReturn($scopeLabel);
+        $this->galleryMock->expects($this->once())
+            ->method('getAttributeFieldName')
+            ->with($this->identicalTo($mediaAttribute))
+            ->willReturn($name);
+        $this->getImageTypesAssertions($attributeCode, $scopeLabel, $expectedTypes);
+    }
+
+    /**
+     * Perform assertions.
+     *
+     * @param string $attributeCode
+     * @param string $scopeLabel
+     * @param array $expectedTypes
+     * @return void
+     */
+    private function getImageTypesAssertions(string $attributeCode, string $scopeLabel, array $expectedTypes)
+    {
+        $this->content->setElement($this->galleryMock);
+        $result = $this->content->getImageTypes();
+        $scope = $result[$attributeCode]['scope'];
+        $this->assertSame($scopeLabel, $scope->getText());
+        unset($result[$attributeCode]['scope']);
+        $this->assertSame($expectedTypes, $result);
+    }
+
+    /**
+     * Get media attribute mock.
+     *
+     * @param string $label
+     * @param string $attributeCode
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getMediaAttribute(string $label, string $attributeCode)
+    {
+        $frontend = $this->getMockBuilder(Product\Attribute\Frontend\Image::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $frontend->expects($this->once())
+            ->method('getLabel')
+            ->willReturn($label);
+        $mediaAttribute = $this->getMockBuilder(Attribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mediaAttribute->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $mediaAttribute->expects($this->once())
+            ->method('getFrontend')
+            ->willReturn($frontend);
+
+        return $mediaAttribute;
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php
index 06e2368f3080e..1e04680676eb2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/GalleryTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\App\Request\DataPersistorInterface;
+
 class GalleryTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -32,18 +34,27 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var DataPersistorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataPersistorMock;
+
     public function setUp()
     {
         $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getData']);
         $this->formMock = $this->createMock(\Magento\Framework\Data\Form::class);
-
+        $this->dataPersistorMock = $this->getMockBuilder(DataPersistorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMockForAbstractClass();
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->gallery = $this->objectManager->getObject(
             \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery::class,
             [
                 'registry' => $this->registryMock,
-                'form' => $this->formMock
+                'form' => $this->formMock,
+                'dataPersistor' => $this->dataPersistorMock
             ]
         );
     }
@@ -70,6 +81,68 @@ public function testGetImages()
         $this->assertSame($mediaGallery, $this->gallery->getImages());
     }
 
+    /**
+     * Test getImages() will try get data from data persistor, if it's absent in registry.
+     *
+     * @return void
+     */
+    public function testGetImagesWithDataPersistor()
+    {
+        $product = [
+            'product' => [
+                'media_gallery' => [
+                    'images' => [
+                        [
+                            'value_id' => '1',
+                            'file' => 'image_1.jpg',
+                            'media_type' => 'image',
+                        ],
+                        [
+                            'value_id' => '2',
+                            'file' => 'image_2.jpg',
+                            'media_type' => 'image',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->registryMock->expects($this->once())->method('registry')->willReturn($this->productMock);
+        $this->productMock->expects($this->once())->method('getData')->willReturn(null);
+        $this->dataPersistorMock->expects($this->once())
+            ->method('get')
+            ->with($this->identicalTo('catalog_product'))
+            ->willReturn($product);
+
+        $this->assertSame($product['product']['media_gallery'], $this->gallery->getImages());
+    }
+
+    /**
+     * Test get image value from data persistor in case it's absent in product from registry.
+     *
+     * @return void
+     */
+    public function testGetImageValue()
+    {
+        $product = [
+            'product' => [
+                'media_gallery' => [
+                    'images' => [
+                        'value_id' => '1',
+                        'file' => 'image_1.jpg',
+                        'media_type' => 'image',
+                    ],
+                ],
+                'small' => 'testSmallImage',
+                'thumbnail' => 'testThumbnail'
+            ]
+        ];
+        $this->dataPersistorMock->expects($this->once())
+            ->method('get')
+            ->with($this->identicalTo('catalog_product'))
+            ->willReturn($product);
+        $this->assertSame($product['product']['small'], $this->gallery->getImageValue('small'));
+    }
+
     public function testGetDataObject()
     {
         $this->registryMock->expects($this->once())->method('registry')->willReturn($this->productMock);
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Category/Plugin/PriceBoxTagsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Category/Plugin/PriceBoxTagsTest.php
index 55402eb1f6fd2..3f388d00eaf9f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Category/Plugin/PriceBoxTagsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Category/Plugin/PriceBoxTagsTest.php
@@ -16,6 +16,11 @@ class PriceBoxTagsTest extends \PHPUnit\Framework\TestCase
      */
     private $priceCurrencyInterface;
 
+    /**
+     * @var \Magento\Directory\Model\Currency | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $currency;
+
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -46,6 +51,9 @@ protected function setUp()
         $this->priceCurrencyInterface = $this->getMockBuilder(
             \Magento\Framework\Pricing\PriceCurrencyInterface::class
         )->getMock();
+        $this->currency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->timezoneInterface = $this->getMockBuilder(
             \Magento\Framework\Stdlib\DateTime\TimezoneInterface::class
         )->getMock();
@@ -82,7 +90,7 @@ protected function setUp()
     public function testAfterGetCacheKey()
     {
         $date = date('Ymd');
-        $currencySymbol = '$';
+        $currencyCode = 'USD';
         $result = 'result_string';
         $billingAddress = ['billing_address'];
         $shippingAddress = ['shipping_address'];
@@ -95,7 +103,7 @@ public function testAfterGetCacheKey()
             '-',
             [
                 $result,
-                $currencySymbol,
+                $currencyCode,
                 $date,
                 $scopeId,
                 $customerGroupId,
@@ -104,7 +112,8 @@ public function testAfterGetCacheKey()
         );
         $priceBox = $this->getMockBuilder(\Magento\Framework\Pricing\Render\PriceBox::class)
             ->disableOriginalConstructor()->getMock();
-        $this->priceCurrencyInterface->expects($this->once())->method('getCurrencySymbol')->willReturn($currencySymbol);
+        $this->priceCurrencyInterface->expects($this->once())->method('getCurrency')->willReturn($this->currency);
+        $this->currency->expects($this->once())->method('getCode')->willReturn($currencyCode);
         $scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)->getMock();
         $this->scopeResolverInterface->expects($this->any())->method('getScope')->willReturn($scope);
         $scope->expects($this->any())->method('getId')->willReturn($scopeId);
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Category/Rss/LinkTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Category/Rss/LinkTest.php
index 8932d77a81247..0cff8b2d0f207 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Category/Rss/LinkTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Category/Rss/LinkTest.php
@@ -72,6 +72,9 @@ public function testIsRssAllowed($isAllowed)
         $this->assertEquals($isAllowed, $this->link->isRssAllowed());
     }
 
+    /**
+     * @return array
+     */
     public function isRssAllowedDataProvider()
     {
         return [
@@ -98,6 +101,9 @@ public function testIsTopCategory($isTop, $categoryLevel)
         $this->assertEquals($isTop, $this->link->isTopCategory());
     }
 
+    /**
+     * @return array
+     */
     public function isTopCategoryDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Category/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Category/ViewTest.php
index 601ce3e9c2bb5..9d282befff2f9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Category/ViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Category/ViewTest.php
@@ -31,9 +31,9 @@ protected function tearDown()
     public function testGetIdentities()
     {
         $categoryTag = ['catalog_category_1'];
-        $currentCatogoryMock = $this->createMock(\Magento\Catalog\Model\Category::class);
-        $currentCatogoryMock->expects($this->once())->method('getIdentities')->will($this->returnValue($categoryTag));
-        $this->block->setCurrentCategory($currentCatogoryMock);
+        $currentCategoryMock = $this->createMock(\Magento\Catalog\Model\Category::class);
+        $currentCategoryMock->expects($this->once())->method('getIdentities')->will($this->returnValue($categoryTag));
+        $this->block->setCurrentCategory($currentCategoryMock);
         $this->assertEquals($categoryTag, $this->block->getIdentities());
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
index 36bd6abea761b..d003c6d01373f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Catalog\Test\Unit\Block\Product;
 
+use Magento\Catalog\Block\Product\Image;
+use Magento\Catalog\Block\Product\ImageBuilder;
+use Magento\Catalog\Model\Product;
+
 /**
  * Class for testing methods of AbstractProduct
  */
@@ -32,7 +36,7 @@ class AbstractProductTest extends \PHPUnit\Framework\TestCase
     protected $stockRegistryMock;
 
     /**
-     * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $imageBuilder;
 
@@ -58,9 +62,7 @@ protected function setUp()
             ['getStockItem']
         );
 
-        $this->imageBuilder = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->imageBuilder = $this->createPartialMock(ImageBuilder::class, ['create']);
 
         $this->productContextMock->expects($this->once())
             ->method('getStockRegistry')
@@ -88,7 +90,7 @@ public function testGetProductPrice()
     {
         $expectedPriceHtml = '<html>Expected Price html with price $30</html>';
         $priceRenderBlock = $this->createPartialMock(\Magento\Framework\Pricing\Render::class, ['render']);
-        $product = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $product = $this->createMock(Product::class);
 
         $this->layoutMock->expects($this->once())
             ->method('getBlock')
@@ -108,7 +110,7 @@ public function testGetProductPriceHtml()
     {
         $expectedPriceHtml = '<html>Expected Price html with price $30</html>';
         $priceRenderBlock = $this->createPartialMock(\Magento\Framework\Pricing\Render::class, ['render']);
-        $product = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $product = $this->createMock(Product::class);
 
         $this->layoutMock->expects($this->once())
             ->method('getBlock')
@@ -139,7 +141,7 @@ public function testGetMinimalQty($minSale, $result)
         $id = 10;
         $websiteId = 99;
 
-        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getId', 'getStore']);
+        $productMock = $this->createPartialMock(Product::class, ['getId', 'getStore']);
         $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getWebsiteId']);
         $stockItemMock = $this->getMockForAbstractClass(
             \Magento\CatalogInventory\Api\Data\StockItemInterface::class,
@@ -168,7 +170,7 @@ public function testGetMinimalQty($minSale, $result)
             ->method('getMinSaleQty')
             ->will($this->returnValue($minSale));
 
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $productMock */
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $this->assertEquals($result, $this->block->getMinimalQty($productMock));
     }
 
@@ -195,34 +197,14 @@ public function testGetImage()
     {
         $imageId = 'test_image_id';
         $attributes = [];
-
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageBuilder->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setImageId')
-            ->with($imageId)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setAttributes')
-            ->with($attributes)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
+        $productMock = $this->createMock(Product::class);
+        $imageMock = $this->createMock(Image::class);
+        $this->imageBuilder->expects(static::once())
             ->method('create')
             ->willReturn($imageMock);
 
-        $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\Image::class,
-            $this->block->getImage($productMock, $imageId, $attributes)
-        );
+        $image = $this->block->getImage($productMock, $imageId, $attributes);
+
+        static::assertInstanceOf(Image::class, $image);
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
deleted file mode 100644
index e0b5d6ef3992a..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Block\Product;
-
-class ImageBuilderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Catalog\Block\Product\ImageBuilder
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Catalog\Helper\ImageFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $helperFactory;
-
-    /**
-     * @var \Magento\Catalog\Block\Product\ImageFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $imageFactory;
-
-    protected function setUp()
-    {
-        $this->helperFactory = $this->getMockBuilder(\Magento\Catalog\Helper\ImageFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->imageFactory = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->model = new \Magento\Catalog\Block\Product\ImageBuilder(
-            $this->helperFactory,
-            $this->imageFactory
-        );
-    }
-
-    public function testSetProduct()
-    {
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\ImageBuilder::class,
-            $this->model->setProduct($productMock)
-        );
-    }
-
-    public function testSetImageId()
-    {
-        $imageId = 'test_image_id';
-
-        $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\ImageBuilder::class,
-            $this->model->setImageId($imageId)
-        );
-    }
-
-    public function testSetAttributes()
-    {
-        $attributes = [
-            'name' => 'value',
-        ];
-        $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\ImageBuilder::class,
-            $this->model->setAttributes($attributes)
-        );
-    }
-
-    /**
-     * @param array $data
-     * @dataProvider createDataProvider
-     */
-    public function testCreate($data, $expected)
-    {
-        $imageId = 'test_image_id';
-
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $helperMock = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $helperMock->expects($this->once())
-            ->method('init')
-            ->with($productMock, $imageId)
-            ->willReturnSelf();
-
-        $helperMock->expects($this->once())
-            ->method('getFrame')
-            ->willReturn($data['frame']);
-        $helperMock->expects($this->once())
-            ->method('getUrl')
-            ->willReturn($data['url']);
-        $helperMock->expects($this->exactly(2))
-            ->method('getWidth')
-            ->willReturn($data['width']);
-        $helperMock->expects($this->exactly(2))
-            ->method('getHeight')
-            ->willReturn($data['height']);
-        $helperMock->expects($this->once())
-            ->method('getLabel')
-            ->willReturn($data['label']);
-        $helperMock->expects($this->once())
-            ->method('getResizedImageInfo')
-            ->willReturn($data['imagesize']);
-
-        $this->helperFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($helperMock);
-
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageFactory->expects($this->once())
-            ->method('create')
-            ->with($expected)
-            ->willReturn($imageMock);
-
-        $this->model->setProduct($productMock);
-        $this->model->setImageId($imageId);
-        $this->model->setAttributes($data['custom_attributes']);
-        $this->assertInstanceOf(\Magento\Catalog\Block\Product\Image::class, $this->model->create());
-    }
-
-    /**
-     * @return array
-     */
-    public function createDataProvider()
-    {
-        return [
-            [
-                'data' => [
-                    'frame' => 0,
-                    'url' => 'test_url_1',
-                    'width' => 100,
-                    'height' => 100,
-                    'label' => 'test_label',
-                    'custom_attributes' => [],
-                    'imagesize' => [100, 100],
-                ],
-                'expected' => [
-                    'data' => [
-                        'template' => 'Magento_Catalog::product/image_with_borders.phtml',
-                        'image_url' => 'test_url_1',
-                        'width' => 100,
-                        'height' => 100,
-                        'label' => 'test_label',
-                        'ratio' =>  1,
-                        'custom_attributes' => '',
-                        'resized_image_width' => 100,
-                        'resized_image_height' => 100,
-                    ],
-                ],
-            ],
-            [
-                'data' => [
-                    'frame' => 1,
-                    'url' => 'test_url_2',
-                    'width' => 100,
-                    'height' => 50,
-                    'label' => 'test_label_2',
-                    'custom_attributes' => [
-                        'name_1' => 'value_1',
-                        'name_2' => 'value_2',
-                    ],
-                    'imagesize' => [120, 70],
-                ],
-                'expected' => [
-                    'data' => [
-                        'template' => 'Magento_Catalog::product/image.phtml',
-                        'image_url' => 'test_url_2',
-                        'width' => 100,
-                        'height' => 50,
-                        'label' => 'test_label_2',
-                        'ratio' =>  0.5,
-                        'custom_attributes' => 'name_1="value_1" name_2="value_2"',
-                        'resized_image_width' => 120,
-                        'resized_image_height' => 70,
-                    ],
-                ],
-            ],
-        ];
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
new file mode 100644
index 0000000000000..95b06e40602bf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Block\Product;
+
+use Magento\Catalog\Block\Product\Image;
+use Magento\Catalog\Block\Product\ImageFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
+use Magento\Catalog\Model\View\Asset\Image as ViewAssetImage;
+use Magento\Catalog\Model\View\Asset\ImageFactory as ViewAssetImageFactory;
+use Magento\Framework\Config\View;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\ObjectManager\ObjectManager;
+
+class ImageFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var  ParamsBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    private $paramsBuilder;
+
+    /** @var  View|\PHPUnit_Framework_MockObject_MockObject */
+    private $viewConfig;
+
+    /** @var  ObjectManager|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectManager;
+
+    /**
+     * @var ImageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var ViewAssetImageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewAssetImageFactory;
+
+    protected function setUp()
+    {
+        $this->viewConfig = $this->createMock(View::class);
+        $configInterface = $this->createMock(ConfigInterface::class);
+        $configInterface->method('getViewConfig')->willReturn($this->viewConfig);
+        $this->viewAssetImageFactory = $this->createMock(ViewAssetImageFactory::class);
+        $this->paramsBuilder = $this->createMock(ParamsBuilder::class);
+        $this->objectManager = $this->createMock(ObjectManager::class);
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            ImageFactory::class,
+            [
+                'objectManager' => $this->objectManager,
+                'presentationConfig' => $configInterface,
+                'viewAssetImageFactory' => $this->viewAssetImageFactory,
+                'imageParamsBuilder' => $this->paramsBuilder
+            ]
+        );
+    }
+
+    /**
+     * @param array $data
+     * @dataProvider createDataProvider
+     */
+    public function testCreate($data, $expected)
+    {
+        $product = $this->createMock(Product::class);
+        $product->method('getName')->willReturn($data['product']['name']);
+        $product->method('getData')->willReturnOnConsecutiveCalls(
+            $data['product']['image_type'],
+            $data['product']['image_type_label']
+        );
+        $imageBlock = $this->createMock(Image::class);
+        $this->viewConfig->method('getMediaAttributes')->willReturn($data['viewImageConfig']);
+        $this->viewConfig->method('getVarValue')->willReturn($data['frame']);
+        $this->viewAssetImageFactory->method('create')->willReturn(
+            $viewAssetImage = $this->createMock(ViewAssetImage::class)
+        );
+        $this->paramsBuilder->method('build')->willReturn($data['imageParamsBuilder']);
+        $viewAssetImage->method('getUrl')->willReturn($data['url']);
+
+        $this->objectManager->expects(self::once())
+            ->method('create')
+            ->with(Image::class, $expected)
+            ->willReturn($imageBlock);
+        $actual = $this->model->create($product, 'image_id', $data['custom_attributes']);
+        self::assertInstanceOf(Image::class, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function createDataProvider(): array
+    {
+        return [
+            $this->getTestDataWithoutAttributes(),
+            $this->getTestDataWithAttributes(),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getTestDataWithoutAttributes(): array
+    {
+        return [
+            'data' => [
+                'viewImageConfig' => [
+                    'width' => 100,
+                    'height' => 100,
+                    'constrain_only' => false,
+                    'aspect_ratio' => false,
+                    'frame' => false,
+                    'transparency' => false,
+                    'background' => '255,255,255',
+                    'type' => 'image_type' //thumbnail,small_image,image,swatch_image,swatch_thumb
+                ],
+                'imageParamsBuilder' => [
+                    'image_width' => 100,
+                    'image_height' => 100,
+                    'constrain_only' => false,
+                    'keep_aspect_ratio' => false,
+                    'keep_frame' => false,
+                    'keep_transparency' => false,
+                    'background' => '255,255,255',
+                    'image_type' => 'image_type', //thumbnail,small_image,image,swatch_image,swatch_thumb
+                    'quality' => 80, // <===
+                    'angle' => null // <===
+                ],
+                'product' => [
+                    'image_type_label' => 'test_image_label',
+                    'name' => 'test_product_name',
+                    'image_type' => 'test_image_path'
+                ],
+                'url' => 'test_url_1',
+                'frame' => 'test_frame',
+                'custom_attributes' => [],
+            ],
+            'expected' => [
+                'data' => [
+                    'template' => 'Magento_Catalog::product/image_with_borders.phtml',
+                    'image_url' => 'test_url_1',
+                    'width' => 100,
+                    'height' => 100,
+                    'label' => 'test_image_label',
+                    'ratio' => 1,
+                    'custom_attributes' => '',
+                    'product_id' => null,
+                    'class' => 'product-image-photo'
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getTestDataWithAttributes(): array
+    {
+        return [
+            'data' => [
+                'viewImageConfig' => [
+                    'width' => 100,
+                    'height' => 50, // <===
+                    'constrain_only' => false,
+                    'aspect_ratio' => false,
+                    'frame' => true, // <===
+                    'transparency' => false,
+                    'background' => '255,255,255',
+                    'type' => 'image_type' //thumbnail,small_image,image,swatch_image,swatch_thumb
+                ],
+                'imageParamsBuilder' => [
+                    'image_width' => 100,
+                    'image_height' => 50,
+                    'constrain_only' => false,
+                    'keep_aspect_ratio' => false,
+                    'keep_frame' => true,
+                    'keep_transparency' => false,
+                    'background' => '255,255,255',
+                    'image_type' => 'image_type', //thumbnail,small_image,image,swatch_image,swatch_thumb
+                    'quality' => 80,
+                    'angle' => null
+                ],
+                'product' => [
+                    'image_type_label' => null, // <==
+                    'name' => 'test_product_name',
+                    'image_type' => 'test_image_path'
+                ],
+                'url' => 'test_url_2',
+                'frame' => 'test_frame',
+                'custom_attributes' => [
+                    'name_1' => 'value_1',
+                    'name_2' => 'value_2',
+                    'class' => 'my-class'
+                ],
+            ],
+            'expected' => [
+                'data' => [
+                    'template' => 'Magento_Catalog::product/image_with_borders.phtml',
+                    'image_url' => 'test_url_2',
+                    'width' => 100,
+                    'height' => 50,
+                    'label' => 'test_product_name',
+                    'ratio' => 0.5, // <==
+                    'custom_attributes' => 'name_1="value_1" name_2="value_2"',
+                    'product_id' => null,
+                    'class' => 'my-class'
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/RelatedTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/RelatedTest.php
index 1d927a6e04ef5..deb84b7b2d3c4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/RelatedTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/RelatedTest.php
@@ -72,6 +72,9 @@ public function testCanItemsAddToCart($isComposite, $isSaleable, $hasRequiredOpt
         );
     }
 
+    /**
+     * @return array
+     */
     public function canItemsAddToCartDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
index dce0be8e62df3..884f4c543c8b8 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
@@ -18,6 +18,11 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $memorizer;
+
     /**
      * @var \Magento\Framework\Url | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -62,6 +67,16 @@ protected function setUp()
                 'getLimit',
                 'getCurrentPage'
             ]);
+        $this->memorizer = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer::class,
+            [
+                'getDirection',
+                'getOrder',
+                'getMode',
+                'getLimit',
+                'isMemorizingAllowed'
+            ]
+        );
         $this->layout = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getChildName', 'getBlock']);
         $this->pagerBlock = $this->createPartialMock(\Magento\Theme\Block\Html\Pager::class, [
                 'setUseContainer',
@@ -116,6 +131,7 @@ protected function setUp()
                 'context' => $context,
                 'catalogConfig' => $this->catalogConfig,
                 'toolbarModel' => $this->model,
+                'toolbarMemorizer' => $this->memorizer,
                 'urlEncoder' => $this->urlEncoder,
                 'productListHelper' => $this->productListHelper
             ]
@@ -155,7 +171,7 @@ public function testGetPagerEncodedUrl()
     public function testGetCurrentOrder()
     {
         $order = 'price';
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getOrder')
             ->will($this->returnValue($order));
         $this->catalogConfig->expects($this->once())
@@ -169,7 +185,7 @@ public function testGetCurrentDirection()
     {
         $direction = 'desc';
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getDirection')
             ->will($this->returnValue($direction));
 
@@ -183,7 +199,7 @@ public function testGetCurrentMode()
         $this->productListHelper->expects($this->once())
             ->method('getAvailableViewMode')
             ->will($this->returnValue(['list' => 'List']));
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue($mode));
 
@@ -216,6 +232,9 @@ public function testSetModes($mode, $expected)
         $this->assertEquals($expected, $block->getModes());
     }
 
+    /**
+     * @return array
+     */
     public function setModesDataProvider()
     {
         return [
@@ -229,11 +248,11 @@ public function testGetLimit()
         $mode = 'list';
         $limit = 10;
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue($mode));
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue($limit));
         $this->productListHelper->expects($this->once())
@@ -263,7 +282,7 @@ public function testGetPagerHtml()
         $this->productListHelper->expects($this->exactly(2))
             ->method('getAvailableLimit')
             ->will($this->returnValue([10 => 10, 20 => 20]));
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue($limit));
         $this->pagerBlock->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
index 32c90496bfc32..a81d8b1c9fc3c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
@@ -5,20 +5,38 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Product\View;
 
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Block\Product\ImageBuilder;
+use Magento\Catalog\Block\Product\View\Gallery;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface;
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\DataObject;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\ArrayUtils;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\Store;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class GalleryTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Block\Product\View\Gallery
+     * @var Gallery
      */
     protected $model;
 
     /**
-     * @var \Magento\Catalog\Block\Product\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $context;
 
     /**
-     * @var \Magento\Framework\Stdlib\ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
+     * @var ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $arrayUtils;
 
@@ -28,70 +46,75 @@ class GalleryTest extends \PHPUnit\Framework\TestCase
     protected $imageHelper;
 
     /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+     * @var Registry|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $registry;
 
     /**
-     * @var \Magento\Framework\Json\EncoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var EncoderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $jsonEncoderMock;
 
     /**
-     * @var \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ImagesConfigFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $imagesConfigFactoryMock;
 
     /**
-     * @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $galleryImagesConfigMock;
 
+    /** @var  UrlBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    private $urlBuilder;
+
     protected function setUp()
     {
-        $this->mockContext();
-
-        $this->arrayUtils = $this->getMockBuilder(\Magento\Framework\Stdlib\ArrayUtils::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->jsonEncoderMock = $this->getMockBuilder(\Magento\Framework\Json\EncoderInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->registry = $this->createMock(Registry::class);
+        $this->context = $this->createConfiguredMock(
+            Context::class,
+            ['getRegistry' => $this->registry]
+        );
 
+        $this->arrayUtils = $this->createMock(ArrayUtils::class);
+        $this->jsonEncoderMock = $this->createMock(EncoderInterface::class);
         $this->imagesConfigFactoryMock = $this->getImagesConfigFactory();
-
-        $this->model = new \Magento\Catalog\Block\Product\View\Gallery(
-            $this->context,
-            $this->arrayUtils,
-            $this->jsonEncoderMock,
-            [],
-            $this->imagesConfigFactoryMock
-        );
+        $this->urlBuilder = $this->createMock(UrlBuilder::class);
+
+        $objectManager = new ObjectManager($this);
+        $this->model =  $objectManager->getObject(Gallery::class, [
+            'context' => $this->context,
+            'arrayUtils' => $this->arrayUtils,
+            'jsonEncoder' => $this->jsonEncoderMock,
+            'urlBuilder' => $this->urlBuilder,
+            'imagesConfigFactory' => $this->imagesConfigFactoryMock
+        ]);
     }
 
-    protected function mockContext()
+    public function testGetGalleryImagesJsonWithLabel()
     {
-        $this->context = $this->getMockBuilder(\Magento\Catalog\Block\Product\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->context->expects($this->any())
-            ->method('getImageHelper')
-            ->willReturn($this->imageHelper);
+        $this->prepareGetGalleryImagesJsonMocks();
+        $json = $this->model->getGalleryImagesJson();
+        $decodedJson = json_decode($json, true);
+        $this->assertEquals('product_page_image_small_url', $decodedJson[0]['thumb']);
+        $this->assertEquals('product_page_image_medium_url', $decodedJson[0]['img']);
+        $this->assertEquals('product_page_image_large_url', $decodedJson[0]['full']);
+        $this->assertEquals('test_label', $decodedJson[0]['caption']);
+        $this->assertEquals('2', $decodedJson[0]['position']);
+        $this->assertEquals(false, $decodedJson[0]['isMain']);
+        $this->assertEquals('test_media_type', $decodedJson[0]['type']);
+        $this->assertEquals('test_video_url', $decodedJson[0]['videoUrl']);
+    }
 
-        $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->context->expects($this->any())
-            ->method('getRegistry')
-            ->willReturn($this->registry);
+    public function testGetGalleryImagesJsonWithoutLabel()
+    {
+        $this->prepareGetGalleryImagesJsonMocks(false);
+        $json = $this->model->getGalleryImagesJson();
+        $decodedJson = json_decode($json, true);
+        $this->assertEquals('test_product_name', $decodedJson[0]['caption']);
     }
 
-    public function testGetGalleryImages()
+    private function prepareGetGalleryImagesJsonMocks($hasLabel = true)
     {
         $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
@@ -104,28 +127,32 @@ public function testGetGalleryImages()
         $productTypeMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\AbstractType::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $productTypeMock->expects($this->once())
+        $productTypeMock->expects($this->any())
             ->method('getStoreFilter')
             ->with($productMock)
             ->willReturn($storeMock);
 
-        $productMock->expects($this->once())
+        $productMock->expects($this->any())
             ->method('getTypeInstance')
             ->willReturn($productTypeMock);
-        $productMock->expects($this->once())
+        $productMock->expects($this->any())
             ->method('getMediaGalleryImages')
-            ->willReturn($this->getImagesCollection());
+            ->willReturn($this->getImagesCollectionWithPopulatedDataObject($hasLabel));
+        $productMock->expects($this->any())
+            ->method('getName')
+            ->willReturn('test_product_name');
 
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->any())
             ->method('registry')
             ->with('product')
             ->willReturn($productMock);
 
-        $this->galleryImagesConfigMock->expects($this->exactly(1))
-            ->method('getItems')
-            ->willReturn($this->getGalleryImagesConfigItems());
+        $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
+            ->setMethods(['init', 'setImageFile', 'getUrl'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->imageHelper->expects($this->exactly(3))
+        $this->imageHelper->expects($this->any())
             ->method('init')
             ->willReturnMap([
                 [$productMock, 'product_page_image_small', [], $this->imageHelper],
@@ -133,69 +160,68 @@ public function testGetGalleryImages()
                 [$productMock, 'product_page_image_large_no_frame', [], $this->imageHelper],
             ])
             ->willReturnSelf();
-        $this->imageHelper->expects($this->exactly(3))
+        $this->imageHelper->expects($this->any())
             ->method('setImageFile')
             ->with('test_file')
             ->willReturnSelf();
-        $this->imageHelper->expects($this->at(0))
+        $this->urlBuilder->expects($this->at(0))
             ->method('getUrl')
             ->willReturn('product_page_image_small_url');
-        $this->imageHelper->expects($this->at(1))
+        $this->urlBuilder->expects($this->at(1))
             ->method('getUrl')
             ->willReturn('product_page_image_medium_url');
-        $this->imageHelper->expects($this->at(2))
+        $this->urlBuilder->expects($this->at(2))
             ->method('getUrl')
             ->willReturn('product_page_image_large_url');
 
-        $images = $this->model->getGalleryImages();
-        $this->assertInstanceOf(\Magento\Framework\Data\Collection::class, $images);
+        $this->galleryImagesConfigMock->expects($this->exactly(2))
+            ->method('getItems')
+            ->willReturn($this->getGalleryImagesConfigItems());
     }
 
-    /**
-     * @return \Magento\Framework\Data\Collection
-     */
-    private function getImagesCollection()
+    public function testGetGalleryImages()
     {
-        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $productMock = $this->createMock(Product::class);
+        $productTypeMock = $this->createMock(AbstractType::class);
+        $productTypeMock->expects(static::once())
+            ->method('getStoreFilter')
+            ->with($productMock)
+            ->willReturn($this->createMock(Store::class));
 
-        $items = [
-            new \Magento\Framework\DataObject([
-                'file' => 'test_file'
-            ]),
-        ];
+        $imagesCollection = $this->createConfiguredMock(
+            Collection::class,
+            ['getIterator' => new \ArrayIterator([new DataObject(['file' => 'test_file'])])]
+        );
 
-        $collectionMock->expects($this->any())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($items));
+        $productMock->method('getTypeInstance')->willReturn($productTypeMock);
+        $productMock->method('getMediaGalleryImages')->willReturn($imagesCollection);
+        $this->registry->expects(static::once())
+            ->method('registry')
+            ->with('product')
+            ->willReturn($productMock);
+        $this->galleryImagesConfigMock->expects(static::exactly(1))
+            ->method('getItems')
+            ->willReturn($this->getGalleryImagesConfigItems());
 
-        return $collectionMock;
+        $images = $this->model->getGalleryImages();
+        static::assertInstanceOf(Collection::class, $images);
     }
 
     /**
      * getImagesConfigFactory
      *
-     * @return \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface
+     * @return ImagesConfigFactoryInterface
      */
     private function getImagesConfigFactory()
     {
-        $this->galleryImagesConfigMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->galleryImagesConfigMock->expects($this->any())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($this->getGalleryImagesConfigItems()));
-
-        $galleryImagesConfigFactoryMock = $this
-            ->getMockBuilder(\Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $galleryImagesConfigFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->galleryImagesConfigMock);
+        $this->galleryImagesConfigMock = $this->createConfiguredMock(
+            Collection::class,
+            ['getIterator' => new \ArrayIterator($this->getGalleryImagesConfigItems())]
+        );
+        $galleryImagesConfigFactoryMock = $this->createConfiguredMock(
+            ImagesConfigFactoryInterface::class,
+            ['create' => $this->galleryImagesConfigMock]
+        );
 
         return $galleryImagesConfigFactoryMock;
     }
@@ -208,21 +234,47 @@ private function getImagesConfigFactory()
     private function getGalleryImagesConfigItems()
     {
         return  [
-            new \Magento\Framework\DataObject([
+            new DataObject([
                 'image_id' => 'product_page_image_small',
                 'data_object_key' => 'small_image_url',
                 'json_object_key' => 'thumb'
             ]),
-            new \Magento\Framework\DataObject([
+            new DataObject([
                 'image_id' => 'product_page_image_medium',
                 'data_object_key' => 'medium_image_url',
                 'json_object_key' => 'img'
             ]),
-            new \Magento\Framework\DataObject([
+            new DataObject([
                 'image_id' => 'product_page_image_large',
                 'data_object_key' => 'large_image_url',
                 'json_object_key' => 'full'
             ])
         ];
     }
+
+    /**
+     * @return \Magento\Framework\Data\Collection
+     */
+    private function getImagesCollectionWithPopulatedDataObject($hasLabel)
+    {
+        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $items = [
+            new \Magento\Framework\DataObject([
+                'file' => 'test_file',
+                'label' => ($hasLabel ? 'test_label' : ''),
+                'position' => '2',
+                'media_type' => 'external-test_media_type',
+                "video_url" => 'test_video_url'
+            ]),
+        ];
+
+        $collectionMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($items));
+
+        return $collectionMock;
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/NewProductsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/NewProductsTest.php
index e2e0fa2f27667..129dea37b185e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/NewProductsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/NewProductsTest.php
@@ -91,6 +91,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function isAllowedDataProvider()
     {
         return [
@@ -108,6 +111,9 @@ public function testIsAllowed($configValue, $expectedResult)
         $this->assertEquals($expectedResult, $this->block->isAllowed());
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getItemMock()
     {
         $methods = [
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/SpecialTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/SpecialTest.php
index 6509aa138802e..3c9f19d61d16a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/SpecialTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Rss/Product/SpecialTest.php
@@ -167,6 +167,9 @@ public function testGetRssData()
         );
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getItemMock()
     {
         $item = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
diff --git a/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php b/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php
deleted file mode 100644
index 457ba7b94529b..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Console\Command;
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Console\Command\ImagesResizeCommand;
-use Magento\Catalog\Model\Product\Image\Cache as ImageCache;
-use Magento\Catalog\Model\Product\Image\CacheFactory as ImageCacheFactory;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
-use Magento\Framework\App\State as AppState;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Symfony\Component\Console\Tester\CommandTester;
-use \Magento\Framework\App\Area;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ImagesResizeCommandTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ImagesResizeCommand
-     */
-    protected $command;
-
-    /**
-     * @var AppState | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $appState;
-
-    /**
-     * @var ProductCollectionFactory | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productCollectionFactory;
-
-    /**
-     * @var ProductCollection | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productCollection;
-
-    /**
-     * @var ProductRepositoryInterface | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productRepository;
-
-    /**
-     * @var ImageCacheFactory | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $imageCacheFactory;
-
-    /**
-     * @var ImageCache | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $imageCache;
-
-    protected function setUp()
-    {
-        $this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->productRepository = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->prepareProductCollection();
-        $this->prepareImageCache();
-
-        $this->command = new ImagesResizeCommand(
-            $this->appState,
-            $this->productCollectionFactory,
-            $this->productRepository,
-            $this->imageCacheFactory
-        );
-    }
-
-    public function testExecuteNoProducts()
-    {
-        $this->appState->expects($this->once())
-            ->method('setAreaCode')
-            ->with(Area::AREA_GLOBAL)
-            ->willReturnSelf();
-
-        $this->productCollection->expects($this->once())
-            ->method('getAllIds')
-            ->willReturn([]);
-
-        $commandTester = new CommandTester($this->command);
-        $commandTester->execute([]);
-
-        $this->assertContains(
-            'No product images to resize',
-            $commandTester->getDisplay()
-        );
-    }
-
-    public function testExecute()
-    {
-        $productsIds = [1, 2];
-
-        $this->appState->expects($this->once())
-            ->method('setAreaCode')
-            ->with(Area::AREA_GLOBAL)
-            ->willReturnSelf();
-
-        $this->productCollection->expects($this->once())
-            ->method('getAllIds')
-            ->willReturn($productsIds);
-
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->productRepository->expects($this->at(0))
-            ->method('getById')
-            ->with($productsIds[0])
-            ->willReturn($productMock);
-        $this->productRepository->expects($this->at(1))
-            ->method('getById')
-            ->with($productsIds[1])
-            ->willThrowException(new NoSuchEntityException());
-
-        $this->imageCache->expects($this->exactly(count($productsIds) - 1))
-            ->method('generate')
-            ->with($productMock)
-            ->willReturnSelf();
-
-        $commandTester = new CommandTester($this->command);
-        $commandTester->execute([]);
-
-        $this->assertContains(
-            'Product images resized successfully',
-            $commandTester->getDisplay()
-        );
-    }
-
-    public function testExecuteWithException()
-    {
-        $productsIds = [1];
-        $exceptionMessage = 'Test exception text';
-
-        $this->appState->expects($this->once())
-            ->method('setAreaCode')
-            ->with(Area::AREA_GLOBAL)
-            ->willReturnSelf();
-
-        $this->productCollection->expects($this->once())
-            ->method('getAllIds')
-            ->willReturn($productsIds);
-
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->productRepository->expects($this->exactly(count($productsIds)))
-            ->method('getById')
-            ->with($productsIds[0])
-            ->willReturn($productMock);
-
-        $this->imageCache->expects($this->once())
-            ->method('generate')
-            ->with($productMock)
-            ->willThrowException(new \Exception($exceptionMessage));
-
-        $commandTester = new CommandTester($this->command);
-        $commandTester->execute([]);
-
-        $this->assertContains(
-            $exceptionMessage,
-            $commandTester->getDisplay()
-        );
-    }
-
-    protected function prepareProductCollection()
-    {
-        $this->productCollectionFactory = $this->getMockBuilder(
-            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
-        )
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->productCollection = $this->getMockBuilder(
-            \Magento\Catalog\Model\ResourceModel\Product\Collection::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->productCollectionFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->productCollection);
-    }
-
-    protected function prepareImageCache()
-    {
-        $this->imageCacheFactory = $this->getMockBuilder(\Magento\Catalog\Model\Product\Image\CacheFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->imageCache = $this->getMockBuilder(\Magento\Catalog\Model\Product\Image\Cache::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageCacheFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->imageCache);
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
index af1ded6987196..196b4df5b47c0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
@@ -71,7 +71,7 @@ protected function setUp()
             false,
             true,
             true,
-            ['addSuccess']
+            ['addSuccessMessage']
         );
         $this->categoryRepository = $this->createMock(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
         $context->expects($this->any())
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
index 07dacae7298cf..e2cd01fd1c23a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
@@ -23,6 +23,9 @@ protected function setUp()
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php
index d729d0ffbdccc..746d3340a6605 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php
@@ -115,7 +115,7 @@ public function testExecuteWithGenericException()
         $layoutMock->expects($this->once())
             ->method('getMessagesBlock')
             ->willReturn($messageBlock);
-        $wysiwigConfig = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
+        $wysiwygConfig = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
             ->disableOriginalConstructor()
             ->getMock();
         $registry = $this->getMockBuilder(Registry::class)
@@ -135,7 +135,7 @@ public function testExecuteWithGenericException()
         $this->objectManager->expects($this->any())
             ->method('get')
             ->withConsecutive([Registry::class], [Registry::class], [\Magento\Cms\Model\Wysiwyg\Config::class])
-            ->willReturnMap([[Registry::class, $registry], [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwigConfig]]);
+            ->willReturnMap([[Registry::class, $registry], [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwygConfig]]);
         $categoryMock->expects($this->once())
             ->method('move')
             ->willThrowException(new \Exception(
@@ -173,7 +173,7 @@ public function testExecuteWithGenericException()
         $this->assertTrue($this->moveController->execute());
     }
 
-    public function testExecuteWithLocaliedException()
+    public function testExecuteWithLocalizedException()
     {
         $exceptionMessage = 'Sorry, but we can\'t find the new category you selected.';
         $messagesCollection = $this->getMockBuilder(\Magento\Framework\Message\Collection::class)
@@ -189,7 +189,7 @@ public function testExecuteWithLocaliedException()
         $layoutMock->expects($this->once())
             ->method('getMessagesBlock')
             ->willReturn($messageBlock);
-        $wysiwigConfig = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
+        $wysiwygConfig = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
             ->disableOriginalConstructor()
             ->getMock();
         $registry = $this->getMockBuilder(Registry::class)
@@ -209,7 +209,7 @@ public function testExecuteWithLocaliedException()
         $this->objectManager->expects($this->any())
             ->method('get')
             ->withConsecutive([Registry::class], [Registry::class], [\Magento\Cms\Model\Wysiwyg\Config::class])
-            ->willReturnMap([[Registry::class, $registry], [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwigConfig]]);
+            ->willReturnMap([[Registry::class, $registry], [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwygConfig]]);
         $this->messageManager->expects($this->once())
             ->method('addExceptionMessage');
         $this->messageManager->expects($this->once())
@@ -246,7 +246,7 @@ public function testExecuteWithLocaliedException()
         $this->assertTrue($this->moveController->execute());
     }
 
-    public function testSuccessfullCategorySave()
+    public function testSuccessfulCategorySave()
     {
         $messagesCollection = $this->getMockBuilder(\Magento\Framework\Message\Collection::class)
             ->disableOriginalConstructor()
@@ -261,7 +261,7 @@ public function testSuccessfullCategorySave()
         $layoutMock->expects($this->once())
             ->method('getMessagesBlock')
             ->willReturn($messageBlock);
-        $wysiwigConfig = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
+        $wysiwygConfig = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
             ->disableOriginalConstructor()
             ->getMock();
         $registry = $this->getMockBuilder(Registry::class)
@@ -281,7 +281,7 @@ public function testSuccessfullCategorySave()
         $this->objectManager->expects($this->any())
             ->method('get')
             ->withConsecutive([Registry::class], [Registry::class], [\Magento\Cms\Model\Wysiwyg\Config::class])
-            ->willReturnMap([[Registry::class, $registry], [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwigConfig]]);
+            ->willReturnMap([[Registry::class, $registry], [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwygConfig]]);
         $this->messageManager->expects($this->once())
             ->method('getMessages')
             ->with(true)
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
new file mode 100644
index 0000000000000..45de62e218cfc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Category;
+
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Catalog\Controller\Adminhtml\Category\RefreshPath;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for class Magento\Catalog\Controller\Adminhtml\Category\RefreshPath.
+ */
+class RefreshPathTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJsonFactoryMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->resultJsonFactoryMock = $this->getMockBuilder(JsonFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create', 'setData'])
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRequest'])
+            ->getMock();
+    }
+
+    /**
+     * Sets object non-public property.
+     *
+     * @param mixed $object
+     * @param string $propertyName
+     * @param mixed $value
+     *
+     * @return void
+     */
+    private function setObjectProperty($object, string $propertyName, $value) : void
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        $reflectionProperty = $reflectionClass->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $value);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute() : void
+    {
+        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
+        $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
+
+        $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+
+        $refreshPath = $this->getMockBuilder(RefreshPath::class)
+            ->setMethods(['getRequest', 'create'])
+            ->setConstructorArgs([
+                $this->contextMock,
+                $this->resultJsonFactoryMock,
+            ])->getMock();
+
+        $refreshPath->expects($this->any())->method('getRequest')->willReturn($requestMock);
+        $requestMock->expects($this->any())->method('getParam')->with('id')->willReturn($value['id']);
+
+        $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPath', 'getParentId', 'getResource'])
+            ->getMock();
+
+        $categoryMock->expects($this->any())->method('getPath')->willReturn($value['path']);
+        $categoryMock->expects($this->any())->method('getParentId')->willReturn($value['parentId']);
+
+        $categoryResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Category::class);
+
+        $objectManagerMock = $this->getMockBuilder(ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->setObjectProperty($refreshPath, '_objectManager', $objectManagerMock);
+        $this->setObjectProperty($categoryMock, '_resource', $categoryResource);
+
+        $objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(\Magento\Catalog\Model\Category::class)
+            ->willReturn($categoryMock);
+
+        $this->resultJsonFactoryMock->expects($this->any())->method('create')->willReturnSelf();
+        $this->resultJsonFactoryMock->expects($this->any())
+            ->method('setData')
+            ->with($value)
+            ->willReturn($result);
+
+        $this->assertEquals($result, $refreshPath->execute());
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithoutCategoryId() : void
+    {
+        $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+
+        $refreshPath = $this->getMockBuilder(RefreshPath::class)
+            ->setMethods(['getRequest', 'create'])
+            ->setConstructorArgs([
+                $this->contextMock,
+                $this->resultJsonFactoryMock,
+            ])->getMock();
+
+        $refreshPath->expects($this->any())->method('getRequest')->willReturn($requestMock);
+        $requestMock->expects($this->any())->method('getParam')->with('id')->willReturn(null);
+
+        $objectManagerMock = $this->getMockBuilder(ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->setObjectProperty($refreshPath, '_objectManager', $objectManagerMock);
+
+        $objectManagerMock->expects($this->never())
+            ->method('create')
+            ->with(\Magento\Catalog\Model\Category::class)
+            ->willReturnSelf();
+
+        $refreshPath->execute();
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
index f6a586950afdc..74173dc926d97 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Category;
 
-use Magento\Catalog\Controller\Adminhtml\Category\Save as Model;
-
 /**
  * Class SaveTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -104,7 +102,7 @@ protected function setUp()
             false,
             true,
             true,
-            ['addSuccess', 'getMessages']
+            ['addSuccessMessage', 'getMessages']
         );
 
         $this->save = $this->objectManager->getObject(
@@ -394,7 +392,7 @@ public function testExecute($categoryId, $storeId, $parentId)
         $categoryMock->expects($this->once())
             ->method('save');
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the category.'));
         $categoryMock->expects($this->at(1))
             ->method('getId')
@@ -463,9 +461,25 @@ public function dataProviderExecute()
      */
     public function imagePreprocessingDataProvider()
     {
+        $dataWithImage = [
+            'image' => 'path.jpg',
+            'name' => 'category',
+            'description' => '',
+            'parent' => 0
+        ];
+        $expectedSameAsDataWithImage = $dataWithImage;
+
+        $dataWithoutImage = [
+            'name' => 'category',
+            'description' => '',
+            'parent' => 0
+        ];
+        $expectedIfDataWithoutImage = $dataWithoutImage;
+        $expectedIfDataWithoutImage['image'] = '';
+
         return [
-            [['attribute1' => null, 'attribute2' => 123]],
-            [['attribute2' => 123]]
+            'categoryPostData contains image' => [$dataWithImage, $expectedSameAsDataWithImage],
+            'categoryPostData doesn\'t contain image' => [$dataWithoutImage, $expectedIfDataWithoutImage],
         ];
     }
 
@@ -473,8 +487,9 @@ public function imagePreprocessingDataProvider()
      * @dataProvider imagePreprocessingDataProvider
      *
      * @param array $data
+     * @param array $expected
      */
-    public function testImagePreprocessingWithoutValue($data)
+    public function testImagePreprocessing($data, $expected)
     {
         $eavConfig = $this->createPartialMock(\Magento\Eav\Model\Config::class, ['getEntityType']);
 
@@ -484,49 +499,17 @@ public function testImagePreprocessingWithoutValue($data)
 
         $collection = new \Magento\Framework\DataObject(['attribute_collection' => [
             new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute1',
+                'attribute_code' => 'image',
                 'backend' => $imageBackendModel
             ]),
             new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute2',
+                'attribute_code' => 'name',
                 'backend' => new \Magento\Framework\DataObject()
-            ])
-        ]]);
-
-        $eavConfig->expects($this->once())
-            ->method('getEntityType')
-            ->with(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
-            ->will($this->returnValue($collection));
-
-        $model = $this->objectManager->getObject(\Magento\Catalog\Controller\Adminhtml\Category\Save::class, [
-            'eavConfig' => $eavConfig
-        ]);
-
-        $result = $model->imagePreprocessing($data);
-
-        $this->assertEquals([
-            'attribute1' => false,
-            'attribute2' => 123
-        ], $result);
-    }
-
-    public function testImagePreprocessingWithValue()
-    {
-        $eavConfig = $this->createPartialMock(\Magento\Eav\Model\Config::class, ['getEntityType']);
-
-        $imageBackendModel = $this->objectManager->getObject(
-            \Magento\Catalog\Model\Category\Attribute\Backend\Image::class
-        );
-
-        $collection = new \Magento\Framework\DataObject(['attribute_collection' => [
-            new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute1',
-                'backend' => $imageBackendModel
             ]),
             new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute2',
+                'attribute_code' => 'level',
                 'backend' => new \Magento\Framework\DataObject()
-            ])
+            ]),
         ]]);
 
         $eavConfig->expects($this->once())
@@ -534,18 +517,12 @@ public function testImagePreprocessingWithValue()
             ->with(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
             ->will($this->returnValue($collection));
 
-        $model = $this->objectManager->getObject(Model::class, [
+        $model = $this->objectManager->getObject(\Magento\Catalog\Controller\Adminhtml\Category\Save::class, [
             'eavConfig' => $eavConfig
         ]);
 
-        $result = $model->imagePreprocessing([
-            'attribute1' => 'somevalue',
-            'attribute2' => null
-        ]);
+        $result = $model->imagePreprocessing($data);
 
-        $this->assertEquals([
-            'attribute1' => 'somevalue',
-            'attribute2' => null
-        ], $result);
+        $this->assertEquals($expected, $result);
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
index 5a977b7934670..0ddd89afeac22 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
@@ -94,7 +94,7 @@ private function prepareContext()
         $messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
             ->setMethods([])
             ->disableOriginalConstructor()->getMock();
-        $messageManager->expects($this->any())->method('addError')->willReturn(true);
+        $messageManager->expects($this->any())->method('addErrorMessage')->willReturn(true);
         $this->context = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
             ->setMethods(['getRequest', 'getObjectManager', 'getMessageManager', 'getResultRedirectFactory'])
             ->disableOriginalConstructor()->getMock();
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
index c88a008efb19b..de44af7f58afc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
@@ -250,8 +250,8 @@ public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
             ['inventory', [], [7]],
         ]));
 
-        $this->messageManager->expects($this->never())->method('addError');
-        $this->messageManager->expects($this->never())->method('addException');
+        $this->messageManager->expects($this->never())->method('addErrorMessage');
+        $this->messageManager->expects($this->never())->method('addExceptionMessage');
 
         $this->object->execute();
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php
index 0ea96d4703985..858860337c5c1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php
@@ -62,6 +62,11 @@ class EditTest extends \PHPUnit\Framework\TestCase
      */
     protected $session;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $presentation;
+
     /**
      * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -82,11 +87,6 @@ class EditTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultPageFactory;
 
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManager;
-
     protected function setUp()
     {
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)->getMock();
@@ -128,6 +128,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->presentation = $this->getMockBuilder(
+            \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class
+        )->disableOriginalConstructor()
+            ->getMock();
+
         $this->blockTemplate = $this->getMockBuilder(\Magento\Backend\Block\Template::class)
             ->setMethods(['setIsPopup'])
             ->disableOriginalConstructor()
@@ -142,8 +147,8 @@ protected function setUp()
         $this->context->expects($this->any())->method('getResultPageFactory')->willReturn($this->resultPageFactory);
         $this->context->expects($this->any())->method('getSession')->willReturn($this->session);
 
-        $this->objectManager = new ObjectManager($this);
-        $this->editController = $this->objectManager->getObject(
+        $objectManager = new ObjectManager($this);
+        $this->editController = $objectManager->getObject(
             \Magento\Catalog\Controller\Adminhtml\Product\Attribute\Edit::class,
             [
                 'context' => $this->context,
@@ -169,9 +174,10 @@ public function testExecutePopup()
             ->with(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->willReturn($this->eavAttribute);
         $this->objectManagerMock->expects($this->any())->method('get')
-            ->with(\Magento\Backend\Model\Session::class)
-            ->willReturn($this->session);
-
+            ->willReturnMap([
+                [\Magento\Backend\Model\Session::class, $this->session],
+                [\Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class, $this->presentation]
+            ]);
         $this->eavAttribute->expects($this->once())->method('setEntityTypeId')->willReturnSelf();
         $this->eavAttribute->expects($this->once())->method('addData')->with($attributesData)->willReturnSelf();
         $this->eavAttribute->expects($this->any())->method('getName')->willReturn(null);
@@ -219,8 +225,10 @@ public function testExecuteNoPopup()
             ->with(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->willReturn($this->eavAttribute);
         $this->objectManagerMock->expects($this->any())->method('get')
-            ->with(\Magento\Backend\Model\Session::class)
-            ->willReturn($this->session);
+            ->willReturnMap([
+                [\Magento\Backend\Model\Session::class, $this->session],
+                [\Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class, $this->presentation]
+            ]);
 
         $this->eavAttribute->expects($this->once())->method('setEntityTypeId')->willReturnSelf();
         $this->eavAttribute->expects($this->once())->method('addData')->with($attributesData)->willReturnSelf();
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
index f493cbc88f18e..ced65b2d2e15d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save;
+use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
 use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
 use Magento\Catalog\Model\Product\AttributeSet\Build;
@@ -13,11 +15,14 @@
 use Magento\Eav\Api\Data\AttributeSetInterface;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Filter\FilterManager;
 use Magento\Catalog\Helper\Product as ProductHelper;
+use Magento\Framework\View\Element\Messages;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Backend\Model\View\Result\Redirect as ResultRedirect;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator as InputTypeValidator;
+use Magento\Framework\View\LayoutInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -79,6 +84,16 @@ class SaveTest extends AttributeTest
      */
     protected $inputTypeValidatorMock;
 
+    /**
+     * @var FormData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formDataSerializerMock;
+
+    /**
+     * @var ProductAttributeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productAttributeMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -108,6 +123,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->redirectMock = $this->getMockBuilder(ResultRedirect::class)
+            ->setMethods(['setData', 'setPath'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->attributeSetMock = $this->getMockBuilder(AttributeSetInterface::class)
@@ -119,6 +135,12 @@ protected function setUp()
         $this->inputTypeValidatorMock = $this->getMockBuilder(InputTypeValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->formDataSerializerMock = $this->getMockBuilder(FormData::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
+            ->setMethods(['getId', 'get'])
+            ->getMockForAbstractClass();
 
         $this->buildFactoryMock->expects($this->any())
             ->method('create')
@@ -126,6 +148,9 @@ protected function setUp()
         $this->validatorFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->inputTypeValidatorMock);
+        $this->attributeFactoryMock
+            ->method('create')
+            ->willReturn($this->productAttributeMock);
     }
 
     /**
@@ -145,11 +170,23 @@ protected function getModel()
             'validatorFactory' => $this->validatorFactoryMock,
             'groupCollectionFactory' => $this->groupCollectionFactoryMock,
             'layoutFactory' => $this->layoutFactoryMock,
+            'formDataSerializer' => $this->formDataSerializerMock,
         ]);
     }
 
     public function testExecuteWithEmptyData()
     {
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['isAjax', null, null],
+                ['serialized_options', '[]', ''],
+            ]);
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with('')
+            ->willReturn([]);
         $this->requestMock->expects($this->once())
             ->method('getPostValue')
             ->willReturn([]);
@@ -170,6 +207,23 @@ public function testExecute()
             'frontend_input' => 'test_frontend_input',
         ];
 
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['isAjax', null, null],
+                ['serialized_options', '[]', ''],
+            ]);
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with('')
+            ->willReturn([]);
+        $this->productAttributeMock
+            ->method('getId')
+            ->willReturn(1);
+        $this->productAttributeMock
+            ->method('getAttributeCode')
+            ->willReturn('test_code');
         $this->requestMock->expects($this->once())
             ->method('getPostValue')
             ->willReturn($data);
@@ -203,4 +257,80 @@ public function testExecute()
 
         $this->assertInstanceOf(ResultRedirect::class, $this->getModel()->execute());
     }
+
+    /**
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteWithOptionsDataError()
+    {
+        $serializedOptions = '{"key":"value"}';
+        $message = "The attribute couldn't be saved due to an error. Verify your information and try again. "
+            . "If the error persists, please try again later.";
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['isAjax', null, true],
+                ['serialized_options', '[]', $serializedOptions],
+            ]);
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willThrowException(new \InvalidArgumentException('Some exception'));
+        $this->messageManager
+            ->expects($this->once())
+            ->method('addErrorMessage')
+            ->with($message);
+        $this->addReturnResultConditions('catalog/*/edit', ['_current' => true], ['error' => true]);
+
+        $this->getModel()->execute();
+    }
+
+    /**
+     * @param string $path
+     * @param array $params
+     * @param array $response
+     * @return mixed
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    private function addReturnResultConditions(string $path = '', array $params = [], array $response = [])
+    {
+        $layoutMock = $this->getMockBuilder(LayoutInterface::class)
+            ->setMethods(['initMessages', 'getMessagesBlock'])
+            ->getMockForAbstractClass();
+        $this->layoutFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with()
+            ->willReturn($layoutMock);
+        $layoutMock
+            ->method('initMessages')
+            ->with();
+        $messageBlockMock = $this->getMockBuilder(Messages::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $layoutMock
+            ->expects($this->once())
+            ->method('getMessagesBlock')
+            ->willReturn($messageBlockMock);
+        $messageBlockMock
+            ->expects($this->once())
+            ->method('getGroupedHtml')
+            ->willReturn('message1');
+        $this->resultFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON)
+            ->willReturn($this->redirectMock);
+        $response  = array_merge($response, [
+            'messages' => ['message1'],
+            'params' => $params,
+        ]);
+        $this->redirectMock
+            ->expects($this->once())
+            ->method('setData')
+            ->with($response)
+            ->willReturnSelf();
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
index 6373712066695..c6210f93e1290 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Validate;
+use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
 use Magento\Eav\Model\Entity\Attribute\Set as AttributeSet;
@@ -61,6 +62,11 @@ class ValidateTest extends AttributeTest
      */
     protected $layoutMock;
 
+    /**
+     * @var FormData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formDataSerializerMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -86,6 +92,9 @@ protected function setUp()
             ->getMock();
         $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)
             ->getMockForAbstractClass();
+        $this->formDataSerializerMock = $this->getMockBuilder(FormData::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->contextMock->expects($this->any())
             ->method('getObjectManager')
@@ -100,25 +109,28 @@ protected function getModel()
         return $this->objectManager->getObject(
             Validate::class,
             [
-            'context' => $this->contextMock,
-            'attributeLabelCache' => $this->attributeLabelCacheMock,
-            'coreRegistry' => $this->coreRegistryMock,
-            'resultPageFactory' => $this->resultPageFactoryMock,
-            'resultJsonFactory' => $this->resultJsonFactoryMock,
-            'layoutFactory' => $this->layoutFactoryMock,
-            'multipleAttributeList' => ['select' => 'option']
+                'context' => $this->contextMock,
+                'attributeLabelCache' => $this->attributeLabelCacheMock,
+                'coreRegistry' => $this->coreRegistryMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'resultJsonFactory' => $this->resultJsonFactoryMock,
+                'layoutFactory' => $this->layoutFactoryMock,
+                'multipleAttributeList' => ['select' => 'option'],
+                'formDataSerializer' => $this->formDataSerializerMock,
             ]
         );
     }
 
     public function testExecute()
     {
+        $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap([
                 ['frontend_label', null, 'test_frontend_label'],
                 ['attribute_code', null, 'test_attribute_code'],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
+                ['serialized_options', '[]', $serializedOptions],
             ]);
         $this->objectManagerMock->expects($this->exactly(2))
             ->method('create')
@@ -160,6 +172,7 @@ public function testExecute()
      */
     public function testUniqueValidation(array $options, $isError)
     {
+        $serializedOptions = '{"key":"value"}';
         $countFunctionCalls = ($isError) ? 6 : 5;
         $this->requestMock->expects($this->exactly($countFunctionCalls))
             ->method('getParam')
@@ -167,10 +180,16 @@ public function testUniqueValidation(array $options, $isError)
                 ['frontend_label', null, null],
                 ['attribute_code', null, "test_attribute_code"],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
-                ['option', null, $options],
-                ['message_key', null, Validate::DEFAULT_MESSAGE_KEY]
+                ['message_key', null, Validate::DEFAULT_MESSAGE_KEY],
+                ['serialized_options', '[]', $serializedOptions],
             ]);
 
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willReturn($options);
+
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->willReturn($this->attributeMock);
@@ -195,58 +214,85 @@ public function testUniqueValidation(array $options, $isError)
         $this->assertInstanceOf(ResultJson::class, $this->getModel()->execute());
     }
 
+    /**
+     * @return array
+     */
     public function provideUniqueData()
     {
         return [
             'no values' => [
                 [
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "",
-                    ]
+                    'option' => [
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "",
+                        ],
+                    ],
                 ], false
             ],
             'valid options' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [2, 0],
-                        "option_2" => [3, 0],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [2, 0],
+                            "option_2" => [3, 0],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "",
-                    ]
                 ], false
             ],
             'duplicate options' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [1, 0],
-                        "option_2" => [3, 0],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [1, 0],
+                            "option_2" => [3, 0],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "",
-                    ]
                 ], true
             ],
             'duplicate and deleted' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [1, 0],
-                        "option_2" => [3, 0],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [1, 0],
+                            "option_2" => [3, 0],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "1",
+                            "option_2" => "",
+                        ],
+                    ],
+                ], false
+            ],
+            'empty and deleted' => [
+                [
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [2, 0],
+                            "option_2" => ["", ""],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "1",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "1",
-                        "option_2" => "",
-                    ]
                 ], false
             ],
         ];
@@ -261,6 +307,7 @@ public function provideUniqueData()
      */
     public function testEmptyOption(array $options, $result)
     {
+        $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap([
@@ -268,10 +315,16 @@ public function testEmptyOption(array $options, $result)
                 ['frontend_input', 'select', 'multipleselect'],
                 ['attribute_code', null, "test_attribute_code"],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
-                ['option', null, $options],
                 ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
+                ['serialized_options', '[]', $serializedOptions],
             ]);
 
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willReturn($options);
+
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->willReturn($this->attributeMock);
@@ -303,8 +356,10 @@ public function provideEmptyOption()
         return [
             'empty admin scope options' => [
                 [
-                    'value' => [
-                        "option_0" => [''],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [''],
+                        ],
                     ],
                 ],
                 (object) [
@@ -314,14 +369,98 @@ public function provideEmptyOption()
             ],
             'not empty admin scope options' => [
                 [
-                    'value' => [
-                        "option_0" => ['asdads'],
+                    'option' => [
+                        'value' => [
+                            "option_0" => ['asdads'],
+                        ],
                     ],
                 ],
                 (object) [
                     'error' => false,
                 ]
-            ]
+            ],
+            'empty admin scope options and deleted' => [
+                [
+                    'option' => [
+                        'value' => [
+                            "option_0" => [''],
+                        ],
+                        'delete' => [
+                            'option_0' => '1',
+                        ],
+                    ],
+                ],
+                (object) [
+                    'error' => false,
+                ],
+            ],
+            'empty admin scope options and not deleted' => [
+                [
+                    'option' => [
+                        'value' => [
+                            "option_0" => [''],
+                        ],
+                        'delete' => [
+                            'option_0' => '0',
+                        ],
+                    ],
+                ],
+                (object) [
+                    'error' => true,
+                    'message' => 'The value of Admin scope can\'t be empty.',
+                ],
+            ],
         ];
     }
+
+    /**
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteWithOptionsDataError()
+    {
+        $serializedOptions = '{"key":"value"}';
+        $message = "The attribute couldn't be validated due to an error. Verify your information and try again. "
+            . "If the error persists, please try again later.";
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['frontend_label', null, 'test_frontend_label'],
+                ['attribute_code', null, 'test_attribute_code'],
+                ['new_attribute_set_name', null, 'test_attribute_set_name'],
+                ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
+                ['serialized_options', '[]', $serializedOptions],
+            ]);
+
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willThrowException(new \InvalidArgumentException('Some exception'));
+
+        $this->objectManagerMock
+            ->method('create')
+            ->willReturnMap([
+                [\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [], $this->attributeMock],
+                [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
+            ]);
+
+        $this->attributeMock
+            ->method('loadByCode')
+            ->willReturnSelf();
+        $this->attributeSetMock
+            ->method('setEntityTypeId')
+            ->willReturnSelf();
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJson);
+        $this->resultJson->expects($this->once())
+            ->method('setJsonData')
+            ->with(json_encode([
+                'error' => true,
+                'message' => $message
+            ]))
+            ->willReturnSelf();
+
+        $this->getModel()->execute();
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
index b85b03852b621..2a75773754fca 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
@@ -9,8 +9,10 @@
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\ObjectManager\ObjectManager;
 use Magento\Framework\Registry;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\ResultFactory;
 
@@ -20,7 +22,7 @@
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var ObjectManager
+     * @var ObjectManagerHelper
      */
     protected $objectManager;
 
@@ -54,9 +56,14 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultFactoryMock;
 
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageManager;
+
     protected function setUp()
     {
-        $this->objectManager = new ObjectManager($this);
+        $this->objectManager = new ObjectManagerHelper($this);
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -74,6 +81,9 @@ protected function setUp()
         $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->contextMock->expects($this->any())
             ->method('getRequest')
@@ -81,6 +91,9 @@ protected function setUp()
         $this->contextMock->expects($this->any())
             ->method('getResultFactory')
             ->willReturn($this->resultFactoryMock);
+        $this->contextMock
+            ->method('getMessageManager')
+            ->willReturn($this->messageManager);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
index 4113ce636d66b..c71fa90fb02dd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
@@ -14,6 +14,9 @@
 use Magento\Framework\Registry;
 use Magento\Cms\Model\Wysiwyg\Config as WysiwygConfig;
 use Magento\Framework\App\Request\Http;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Model\Product\Type as ProductTypes;
 
 /**
  * Class BuilderTest
@@ -67,6 +70,11 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
      */
     protected $storeFactoryMock;
 
+    /**
+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productRepositoryMock;
+
     /**
      * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -90,9 +98,10 @@ protected function setUp()
             ->setMethods(['load'])
             ->getMockForAbstractClass();
 
-        $this->storeFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->storeMock);
+        $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->setMethods(['getById'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $this->builder = $this->objectManager->getObject(
             Builder::class,
@@ -102,140 +111,198 @@ protected function setUp()
                 'registry' => $this->registryMock,
                 'wysiwygConfig' => $this->wysiwygConfigMock,
                 'storeFactory' => $this->storeFactoryMock,
+                'productRepository' => $this->productRepositoryMock
             ]
         );
     }
 
     public function testBuildWhenProductExistAndPossibleToLoadProduct()
     {
+        $productId = 2;
+        $productType = 'type_id';
+        $productStore = 'store';
+        $productSet = 3;
+
         $valueMap = [
-            ['id', null, 2],
-            ['store', 0, 'some_store'],
-            ['type', null, 'type_id'],
-            ['set', null, 3],
-            ['store', null, 'store'],
+            ['id', null, $productId],
+            ['type', null, $productType],
+            ['set', null, $productSet],
+            ['store', 0, $productStore],
         ];
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap($valueMap);
-        $this->productFactoryMock->expects($this->once())
+
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->with($productId, true, $productStore)
+            ->willReturn($this->productMock);
+
+        $this->storeFactoryMock->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->once())
-            ->method('setStoreId')
-            ->with('some_store')
-            ->willReturnSelf();
-        $this->productMock->expects($this->never())
-            ->method('setTypeId');
-        $this->productMock->expects($this->once())
+            ->willReturn($this->storeMock);
+
+        $this->storeMock->expects($this->any())
             ->method('load')
-            ->with(2)
-            ->will($this->returnSelf());
-        $this->productMock->expects($this->once())
-            ->method('setAttributeSetId')
-            ->with(3)
-            ->will($this->returnSelf());
+            ->with($productStore)
+            ->willReturnSelf();
+
         $registryValueMap = [
             ['product', $this->productMock, $this->registryMock],
             ['current_product', $this->productMock, $this->registryMock],
+            ['current_store', $this->registryMock, $this->storeMock],
         ];
+
         $this->registryMock->expects($this->any())
             ->method('register')
             ->willReturn($registryValueMap);
+
         $this->wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
-            ->with('store');
+            ->with($productStore);
+
         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
     }
 
     public function testBuildWhenImpossibleLoadProduct()
     {
+        $productId = 2;
+        $productType = 'type_id';
+        $productStore = 'store';
+        $productSet = 3;
+
         $valueMap = [
-            ['id', null, 15],
-            ['store', 0, 'some_store'],
-            ['type', null, 'type_id'],
-            ['set', null, 3],
-            ['store', null, 'store'],
+            ['id', null, $productId],
+            ['type', null, $productType],
+            ['set', null, $productSet],
+            ['store', 0, $productStore],
         ];
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->will($this->returnValueMap($valueMap));
+            ->willReturnMap($valueMap);
+
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->with($productId, true, $productStore)
+            ->willThrowException(new NoSuchEntityException());
+
         $this->productFactoryMock->expects($this->once())
             ->method('create')
-            ->willReturn($this->productMock);
-        $this->productMock->expects($this->once())
-            ->method('setStoreId')
-            ->with('some_store')
-            ->willReturnSelf();
-        $this->productMock->expects($this->once())
+            ->will($this->returnValue($this->productMock));
+
+        $this->productMock->expects($this->any())
+            ->method('setData')
+            ->with('_edit_mode', true);
+
+        $this->productMock->expects($this->any())
             ->method('setTypeId')
-            ->with(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE)
-            ->willReturnSelf();
-        $this->productMock->expects($this->once())
-            ->method('load')
-            ->with(15)
-            ->willThrowException(new \Exception());
+            ->with(ProductTypes::DEFAULT_TYPE);
+
+        $this->productMock->expects($this->any())
+            ->method('setStoreId')
+            ->with($productStore);
+
+        $this->productMock->expects($this->any())
+            ->method('setAttributeSetId')
+            ->with($productSet);
+
         $this->loggerMock->expects($this->once())
             ->method('critical');
-        $this->productMock->expects($this->once())
-            ->method('setAttributeSetId')
-            ->with(3)
-            ->will($this->returnSelf());
+
+        $this->storeFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->storeMock);
+
+        $this->storeMock->expects($this->any())
+            ->method('load')
+            ->with($productStore)
+            ->willReturnSelf();
+
         $registryValueMap = [
             ['product', $this->productMock, $this->registryMock],
             ['current_product', $this->productMock, $this->registryMock],
+            ['current_store', $this->registryMock, $this->storeMock],
         ];
+
         $this->registryMock->expects($this->any())
             ->method('register')
-            ->will($this->returnValueMap($registryValueMap));
+            ->willReturn($registryValueMap);
+
         $this->wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
-            ->with('store');
+            ->with($productStore);
+
         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
     }
 
     public function testBuildWhenProductNotExist()
     {
+        $productId = 0;
+        $productType = 'type_id';
+        $productStore = 'store';
+        $productSet = 3;
+
         $valueMap = [
-            ['id', null, null],
-            ['store', 0, 'some_store'],
-            ['type', null, 'type_id'],
-            ['set', null, 3],
-            ['store', null, 'store'],
+            ['id', null, $productId],
+            ['type', null, $productType],
+            ['set', null, $productSet],
+            ['store', 0, $productStore],
         ];
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->will($this->returnValueMap($valueMap));
+            ->willReturnMap($valueMap);
+
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->with($productId, true, $productStore)
+            ->willThrowException(new NoSuchEntityException());
+
         $this->productFactoryMock->expects($this->once())
             ->method('create')
-            ->willReturn($this->productMock);
-        $this->productMock->expects($this->once())
-            ->method('setStoreId')
-            ->with('some_store')
-            ->willReturnSelf();
-        $productValueMap = [
-            ['type_id', $this->productMock],
-            [\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE, $this->productMock],
-        ];
+            ->will($this->returnValue($this->productMock));
+
+        $this->productMock->expects($this->any())
+            ->method('setData')
+            ->with('_edit_mode', true);
+
         $this->productMock->expects($this->any())
             ->method('setTypeId')
-            ->willReturnMap($productValueMap);
-        $this->productMock->expects($this->never())
-            ->method('load');
-        $this->productMock->expects($this->once())
+            ->with($productType);
+
+        $this->productMock->expects($this->any())
+            ->method('setStoreId')
+            ->with($productStore);
+
+        $this->productMock->expects($this->any())
             ->method('setAttributeSetId')
-            ->with(3)
-            ->will($this->returnSelf());
+            ->with($productSet);
+
+        $this->storeFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->storeMock);
+
+        $this->storeMock->expects($this->any())
+            ->method('load')
+            ->with($productStore)
+            ->willReturnSelf();
+
         $registryValueMap = [
             ['product', $this->productMock, $this->registryMock],
             ['current_product', $this->productMock, $this->registryMock],
+            ['current_store', $this->registryMock, $this->storeMock],
         ];
+
         $this->registryMock->expects($this->any())
             ->method('register')
-            ->will($this->returnValueMap($registryValueMap));
+            ->willReturn($registryValueMap);
+
         $this->wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
-            ->with('store');
+            ->with($productStore);
+
         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php
index 28617addc6d27..424427b871456 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class AttributeFilterTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,12 +19,12 @@ class AttributeFilterTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     * @var Product|MockObject
      */
     protected $productMock;
 
@@ -44,15 +47,25 @@ public function testPrepareProductAttributes(
         $expectedProductData,
         $initialProductData
     ) {
+        /** @var MockObject | Product $productMockMap */
         $productMockMap = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getData'])
+            ->setMethods(['getData', 'getAttributes'])
             ->getMock();
 
         if (!empty($initialProductData)) {
             $productMockMap->expects($this->any())->method('getData')->willReturnMap($initialProductData);
         }
 
+        if ($useDefaults) {
+            $productMockMap
+                ->expects($this->once())
+                ->method('getAttributes')
+                ->willReturn(
+                    $this->getProductAttributesMock($useDefaults)
+                );
+        }
+
         $actualProductData = $this->model->prepareProductAttributes($productMockMap, $requestProductData, $useDefaults);
         $this->assertEquals($expectedProductData, $actualProductData);
     }
@@ -69,15 +82,15 @@ public function setupInputDataProvider()
                     'name' => 'testName',
                     'sku' => 'testSku',
                     'price' => '100',
-                    'description' => ''
+                    'description' => '',
                 ],
                 'useDefaults' => [],
                 'expectedProductData' => [
                     'name' => 'testName',
                     'sku' => 'testSku',
-                    'price' => '100'
+                    'price' => '100',
                 ],
-                'initialProductData' => []
+                'initialProductData' => [],
             ],
             'update_product_without_use_defaults' => [
                 'productData' => [
@@ -85,21 +98,21 @@ public function setupInputDataProvider()
                     'sku' => 'testSku2',
                     'price' => '101',
                     'description' => '',
-                    'special_price' => null
+                    'special_price' => null,
                 ],
                 'useDefaults' => [],
                 'expectedProductData' => [
                     'name' => 'testName2',
                     'sku' => 'testSku2',
                     'price' => '101',
-                    'special_price' => null
+                    'special_price' => null,
                 ],
                 'initialProductData' => [
                     ['name', 'testName2'],
                     ['sku', 'testSku2'],
                     ['price', '101'],
-                    ['special_price', null]
-                ]
+                    ['special_price', null],
+                ],
             ],
             'update_product_without_use_defaults_2' => [
                 'productData' => [
@@ -107,7 +120,7 @@ public function setupInputDataProvider()
                     'sku' => 'testSku2',
                     'price' => '101',
                     'description' => 'updated description',
-                    'special_price' => null
+                    'special_price' => null,
                 ],
                 'useDefaults' => [],
                 'expectedProductData' => [
@@ -115,14 +128,14 @@ public function setupInputDataProvider()
                     'sku' => 'testSku2',
                     'price' => '101',
                     'description' => 'updated description',
-                    'special_price' => null
+                    'special_price' => null,
                 ],
                 'initialProductData' => [
                     ['name', 'testName2'],
                     ['sku', 'testSku2'],
                     ['price', '101'],
-                    ['special_price', null]
-                ]
+                    ['special_price', null],
+                ],
             ],
             'update_product_with_use_defaults' => [
                 'productData' => [
@@ -130,25 +143,25 @@ public function setupInputDataProvider()
                     'sku' => 'testSku2',
                     'price' => '101',
                     'description' => '',
-                    'special_price' => null
+                    'special_price' => null,
                 ],
                 'useDefaults' => [
-                    'description' => '0'
+                    'description' => '0',
                 ],
                 'expectedProductData' => [
                     'name' => 'testName2',
                     'sku' => 'testSku2',
                     'price' => '101',
                     'special_price' => null,
-                    'description' => ''
+                    'description' => '',
                 ],
                 'initialProductData' => [
                     ['name', 'testName2'],
                     ['sku', 'testSku2'],
                     ['price', '101'],
                     ['special_price', null],
-                    ['description', 'descr text']
-                ]
+                    ['description', 'descr text'],
+                ],
             ],
             'update_product_with_use_defaults_2' => [
                 'requestProductData' => [
@@ -156,48 +169,73 @@ public function setupInputDataProvider()
                     'sku' => 'testSku3',
                     'price' => '103',
                     'description' => 'descr modified',
-                    'special_price' => '100'
+                    'special_price' => '100',
                 ],
                 'useDefaults' => [
-                    'description' => '0'
+                    'description' => '0',
                 ],
                 'expectedProductData' => [
                     'name' => 'testName3',
                     'sku' => 'testSku3',
                     'price' => '103',
                     'special_price' => '100',
-                    'description' => 'descr modified'
+                    'description' => 'descr modified',
                 ],
                 'initialProductData' => [
-                    ['name', null,'testName2'],
+                    ['name', null, 'testName2'],
                     ['sku', null, 'testSku2'],
                     ['price', null, '101'],
-                    ['description', null, 'descr text']
-                ]
+                    ['description', null, 'descr text'],
+                ],
             ],
             'update_product_with_use_defaults_3' => [
                 'requestProductData' => [
                     'name' => 'testName3',
                     'sku' => 'testSku3',
                     'price' => '103',
-                    'special_price' => '100'
+                    'special_price' => '100',
+                    'description' => 'descr modified',
                 ],
                 'useDefaults' => [
-                    'description' => '1'
+                    'description' => '1',
                 ],
                 'expectedProductData' => [
                     'name' => 'testName3',
                     'sku' => 'testSku3',
                     'price' => '103',
                     'special_price' => '100',
+                    'description' => false,
                 ],
                 'initialProductData' => [
-                    ['name', null,'testName2'],
+                    ['name', null, 'testName2'],
                     ['sku', null, 'testSku2'],
                     ['price', null, '101'],
-                    ['description', null, 'descr text']
-                ]
+                    ['description', null, 'descr text'],
+                ],
             ],
         ];
     }
+
+    /**
+     * @param array $useDefaults
+     * @return array
+     */
+    private function getProductAttributesMock(array $useDefaults): array
+    {
+        $returnArray = [];
+        foreach ($useDefaults as $attributecode => $isDefault) {
+            if ($isDefault === '1') {
+                /** @var Attribute | MockObject $attribute */
+                $attribute = $this->getMockBuilder(Attribute::class)
+                    ->disableOriginalConstructor()
+                    ->getMock();
+                $attribute->expects($this->any())
+                    ->method('getBackendType')
+                    ->willReturn('varchar');
+
+                $returnArray[$attributecode] = $attribute;
+            }
+        }
+        return $returnArray;
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php
index 9d0ab628a6450..53d2770f19cc8 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php
@@ -27,11 +27,9 @@ protected function setUp()
 
     public function testCreateWithInvalidType()
     {
-        $this->expectException(
-            '\InvalidArgumentException',
-            \Magento\Framework\DataObject::class . ' does not implement ' .
-            \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerInterface::class
-        );
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage(\Magento\Framework\DataObject::class . ' does not implement ' .
+            \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerInterface::class);
         $this->_objectManagerMock->expects($this->never())->method('create');
         $this->_model->create(\Magento\Framework\DataObject::class);
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
index dce3f5886d1a8..c889c58e3df3a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -95,6 +95,14 @@ class HelperTest extends \PHPUnit\Framework\TestCase
      */
     protected $attributeFilterMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeFilterMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -167,6 +175,11 @@ protected function setUp()
         $resolverProperty = $helperReflection->getProperty('linkResolver');
         $resolverProperty->setAccessible(true);
         $resolverProperty->setValue($this->helper, $this->linkResolverMock);
+
+        $this->dateTimeFilterMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\Filter\DateTime::class);
+        $dateTimeFilterProperty = $helperReflection->getProperty('dateTimeFilter');
+        $dateTimeFilterProperty->setAccessible(true);
+        $dateTimeFilterProperty->setValue($this->helper, $this->dateTimeFilterMock);
     }
 
     /**
@@ -198,14 +211,22 @@ public function testInitialize(
             'option2' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '13'],
             'option3' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '14']
         ];
+        $specialFromDate = '2018-03-03 19:30:00';
         $productData = [
             'stock_data' => ['stock_data'],
             'options' => $optionsData,
-            'website_ids' => $websiteIds
+            'website_ids' => $websiteIds,
+            'special_from_date' => $specialFromDate,
         ];
         if (!empty($tierPrice)) {
             $productData = array_merge($productData, ['tier_price' => $tierPrice]);
         }
+
+        $this->dateTimeFilterMock->expects($this->once())
+            ->method('filter')
+            ->with($specialFromDate)
+            ->willReturn($specialFromDate);
+
         $attributeNonDate = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -306,6 +327,7 @@ public function testInitialize(
         }
 
         $this->assertEquals($expectedLinks, $resultLinks);
+        $this->assertEquals($specialFromDate, $productData['special_from_date']);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php
index ba716fdb53c89..47a60a1916142 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php
@@ -58,7 +58,7 @@ protected function getContext()
         $objectManagerMock = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
         $objectManagerMock->expects($this->any())
             ->method('get')
-            ->willreturn($productActionMock);
+            ->willReturn($productActionMock);
 
         $eventManager = $this->getMockBuilder(\Magento\Framework\Event\Manager::class)
             ->setMethods(['dispatch'])
diff --git a/app/code/Magento/Catalog/Test/Unit/Cron/DeleteAbandonedStoreFlatTablesTest.php b/app/code/Magento/Catalog/Test/Unit/Cron/DeleteAbandonedStoreFlatTablesTest.php
new file mode 100644
index 0000000000000..1a9d7959dda9c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Cron/DeleteAbandonedStoreFlatTablesTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Cron;
+
+use Magento\Catalog\Cron\DeleteAbandonedStoreFlatTables;
+use Magento\Catalog\Helper\Product\Flat\Indexer;
+
+/**
+ * @covers \Magento\Catalog\Cron\DeleteAbandonedStoreFlatTables
+ */
+class DeleteAbandonedStoreFlatTablesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var DeleteAbandonedStoreFlatTables
+     */
+    private $deleteAbandonedStoreFlatTables;
+
+    /**
+     * @var Indexer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexerMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->indexerMock = $this->createMock(Indexer::class);
+        $this->deleteAbandonedStoreFlatTables = new DeleteAbandonedStoreFlatTables($this->indexerMock);
+    }
+
+    /**
+     * Test execute method
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $this->indexerMock->expects($this->once())->method('deleteAbandonedStoreFlatTables');
+        $this->deleteAbandonedStoreFlatTables->execute();
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Cron/DeleteOutdatedPriceValuesTest.php b/app/code/Magento/Catalog/Test/Unit/Cron/DeleteOutdatedPriceValuesTest.php
new file mode 100644
index 0000000000000..f1d0034c29580
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Cron/DeleteOutdatedPriceValuesTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Cron;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Cron\DeleteOutdatedPriceValues;
+use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\BackendInterface;
+use Magento\Framework\App\Config\MutableScopeConfigInterface as ScopeConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Store\Model\Store;
+
+/**
+ * @covers \Magento\Catalog\Cron\DeleteOutdatedPriceValues
+ */
+class DeleteOutdatedPriceValuesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var DeleteOutdatedPriceValues
+     */
+    private $deleteOutdatedPriceValues;
+
+    /**
+     * @var AttributeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeRepositoryMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var ScopeConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var Attribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dbAdapterMock;
+
+    /**
+     * @var BackendInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeBackendMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->attributeRepositoryMock = $this->createMock(AttributeRepository::class);
+        $this->attributeMock = $this->createMock(Attribute::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfig::class);
+        $this->dbAdapterMock = $this->createMock(AdapterInterface::class);
+        $this->attributeBackendMock = $this->createMock(BackendInterface::class);
+        $this->deleteOutdatedPriceValues = new DeleteOutdatedPriceValues(
+            $this->resourceConnectionMock,
+            $this->attributeRepositoryMock,
+            $this->scopeConfigMock
+        );
+    }
+
+    /**
+     * Test execute method
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $table = 'catalog_product_entity_decimal';
+        $attributeId = 15;
+        $conditions = ['first', 'second'];
+
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(Store::XML_PATH_PRICE_SCOPE)
+            ->willReturn(Store::XML_PATH_PRICE_SCOPE);
+        $this->attributeRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE)
+            ->willReturn($this->attributeMock);
+        $this->attributeMock->expects($this->once())->method('getId')->willReturn($attributeId);
+        $this->attributeMock->expects($this->once())->method('getBackend')->willReturn($this->attributeBackendMock);
+        $this->attributeBackendMock->expects($this->once())->method('getTable')->willReturn($table);
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->dbAdapterMock);
+        $this->dbAdapterMock->expects($this->exactly(2))->method('quoteInto')->willReturnMap([
+            ['attribute_id = ?', $attributeId, null, null, $conditions[0]],
+            ['store_id != ?', Store::DEFAULT_STORE_ID, null, null, $conditions[1]],
+        ]);
+        $this->dbAdapterMock->expects($this->once())->method('delete')->with($table, $conditions);
+        $this->deleteOutdatedPriceValues->execute();
+    }
+
+    /**
+     * Test execute method
+     * The price scope config option is not equal to global value
+     *
+     * @return void
+     */
+    public function testExecutePriceConfigIsNotSetToGlobal()
+    {
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(Store::XML_PATH_PRICE_SCOPE)
+            ->willReturn(null);
+        $this->attributeRepositoryMock
+            ->expects($this->never())
+            ->method('get');
+        $this->dbAdapterMock
+            ->expects($this->never())
+            ->method('delete');
+
+        $this->deleteOutdatedPriceValues->execute();
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
new file mode 100644
index 0000000000000..e30ddda0b70b9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\CustomerData;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\CustomerData\CompareProducts;
+use Magento\Catalog\Helper\Output;
+use Magento\Catalog\Helper\Product\Compare;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Url;
+use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CompareProductsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CompareProducts
+     */
+    private $model;
+
+    /**
+     * @var Compare|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * @var Url|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productUrlMock;
+
+    /**
+     * @var Output|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $outputHelperMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var array
+     */
+    private $productValueMap = [
+        'id' => 'getId',
+        ProductInterface::NAME => 'getName'
+    ];
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->helperMock = $this->getMockBuilder(Compare::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productUrlMock = $this->getMockBuilder(Url::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->outputHelperMock = $this->getMockBuilder(Output::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $this->objectManagerHelper->getObject(
+            CompareProducts::class,
+            [
+                'helper' => $this->helperMock,
+                'productUrl' => $this->productUrlMock,
+                'outputHelper' => $this->outputHelperMock
+            ]
+        );
+    }
+
+    /**
+     * Prepare compare items collection.
+     *
+     * @param array $items
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getItemCollectionMock(array $items) : \PHPUnit_Framework_MockObject_MockObject
+    {
+        $itemCollectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $itemCollectionMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($items));
+
+        return $itemCollectionMock;
+    }
+
+    /**
+     * Prepare product mocks objects and add corresponding method mocks for helpers.
+     *
+     * @param array $dataSet
+     * @return array
+     */
+    private function prepareProductsWithCorrespondingMocks(array $dataSet) : array
+    {
+        $items = [];
+        $urlMap = [];
+        $outputMap = [];
+        $helperMap = [];
+
+        $count = count($dataSet);
+
+        foreach ($dataSet as $data) {
+            $item = $this->getProductMock($data);
+            $items[] = $item;
+
+            $outputMap[] = [$item, $data['name'], 'name', 'productName#' . $data['id']];
+            $helperMap[] = [$item, 'http://remove.url/' . $data['id']];
+            $urlMap[] = [$item, [], 'http://product.url/' . $data['id']];
+        }
+
+        $this->productUrlMock->expects($this->exactly($count))
+            ->method('getUrl')
+            ->will($this->returnValueMap($urlMap));
+
+        $this->outputHelperMock->expects($this->exactly($count))
+            ->method('productAttribute')
+            ->will($this->returnValueMap($outputMap));
+
+        $this->helperMock->expects($this->exactly($count))
+            ->method('getPostDataRemove')
+            ->will($this->returnValueMap($helperMap));
+
+        return $items;
+    }
+
+    /**
+     * Prepare mock of product object.
+     *
+     * @param array $data
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getProductMock(array $data) : \PHPUnit_Framework_MockObject_MockObject
+    {
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        foreach ($data as $index => $value) {
+            $product->expects($this->once())
+                ->method($this->productValueMap[$index])
+                ->willReturn($value);
+        }
+
+        return $product;
+    }
+
+    public function testGetSectionData()
+    {
+        $dataSet = [
+            ['id' => 1, 'name' => 'product#1'],
+            ['id' => 2, 'name' => 'product#2'],
+            ['id' => 3, 'name' => 'product#3']
+        ];
+
+        $count = count($dataSet);
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCount')
+            ->willReturn($count);
+
+        $items = $this->prepareProductsWithCorrespondingMocks($dataSet);
+
+        $itemCollectionMock = $this->getItemCollectionMock($items);
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCollection')
+            ->willReturn($itemCollectionMock);
+
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
+            ->willReturn('http://list.url');
+
+        $this->assertEquals(
+            [
+                'count' => $count,
+                'countCaption' =>  __('%1 items', $count),
+                'listUrl' => 'http://list.url',
+                'items' => [
+                    [
+                        'id' => 1,
+                        'product_url' => 'http://product.url/1',
+                        'name' => 'productName#1',
+                        'remove_url' => 'http://remove.url/1'
+                    ],
+                    [
+                        'id' => 2,
+                        'product_url' => 'http://product.url/2',
+                        'name' => 'productName#2',
+                        'remove_url' => 'http://remove.url/2'
+                    ],
+                    [
+                        'id' => 3,
+                        'product_url' => 'http://product.url/3',
+                        'name' => 'productName#3',
+                        'remove_url' => 'http://remove.url/3'
+                    ]
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+
+    public function testGetSectionDataNoItems()
+    {
+        $count = 0;
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCount')
+            ->willReturn($count);
+
+        $this->helperMock->expects($this->never())
+            ->method('getItemCollection');
+
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
+            ->willReturn('http://list.url');
+
+        $this->assertEquals(
+            [
+                'count' => $count,
+                'countCaption' =>  __('%1 items', $count),
+                'listUrl' => 'http://list.url',
+                'items' => []
+            ],
+            $this->model->getSectionData()
+        );
+    }
+
+    public function testGetSectionDataSingleItem()
+    {
+        $count = 1;
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCount')
+            ->willReturn($count);
+
+        $items = $this->prepareProductsWithCorrespondingMocks(
+            [
+                [
+                    'id' => 12345,
+                    'name' => 'SingleProduct'
+                ]
+            ]
+        );
+
+        $itemCollectionMock = $this->getItemCollectionMock($items);
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCollection')
+            ->willReturn($itemCollectionMock);
+
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
+            ->willReturn('http://list.url');
+
+        $this->assertEquals(
+            [
+                'count' => 1,
+                'countCaption' =>  __('1 item'),
+                'listUrl' => 'http://list.url',
+                'items' => [
+                    [
+                        'id' => 12345,
+                        'product_url' => 'http://product.url/12345',
+                        'name' => 'productName#12345',
+                        'remove_url' => 'http://remove.url/12345'
+                    ]
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductsRenderInfoSectionTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductsRenderInfoSectionTest.php
index dd0ce0aaf1c14..3a954c9369089 100644
--- a/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductsRenderInfoSectionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductsRenderInfoSectionTest.php
@@ -134,7 +134,7 @@ public function testGetSectionData()
             ->expects($this->once())
             ->method('create')
             ->willReturn($filterMock);
-        $searchCritera = $this->createMock(SearchCriteria::class);
+        $searchCriteria = $this->createMock(SearchCriteria::class);
         $this->searchCriteriaBuilderMock
             ->expects($this->once())
             ->method('addFilters')
@@ -142,10 +142,10 @@ public function testGetSectionData()
             ->willReturnSelf();
         $this->searchCriteriaBuilderMock->expects($this->once())
             ->method('create')
-            ->willReturn($searchCritera);
+            ->willReturn($searchCriteria);
         $this->productRenderRepositoryMock->expects($this->once())
             ->method('getList')
-            ->with($searchCritera, 3, 'UAH')
+            ->with($searchCriteria, 3, 'UAH')
             ->willReturn($searchResult);
         $searchResult->expects($this->any())
             ->method('getItems')
diff --git a/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
index 6f4d30de1468a..2759371dc96e7 100644
--- a/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Helper;
 
+use Magento\Catalog\Helper\Image;
+
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Helper\Image
+     * @var Image
      */
     protected $helper;
 
@@ -63,7 +65,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->helper = new \Magento\Catalog\Helper\Image(
+        $this->helper = new Image(
             $this->context,
             $this->imageFactory,
             $this->assetRepository,
@@ -118,7 +120,7 @@ public function testInit($data)
         $this->prepareWatermarkProperties($data);
 
         $this->assertInstanceOf(
-            \Magento\Catalog\Helper\Image::class,
+            Image::class,
             $this->helper->init($productMock, $imageId, $attributes)
         );
     }
@@ -160,7 +162,7 @@ protected function prepareAttributes($data, $imageId)
             ->getMock();
         $configViewMock->expects($this->once())
             ->method('getMediaAttributes')
-            ->with('Magento_Catalog', 'images', $imageId)
+            ->with('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId)
             ->willReturn($data);
 
         $this->viewConfig->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/FactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/FactoryTest.php
new file mode 100644
index 0000000000000..e29eef0bed076
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/FactoryTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder;
+
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder\Factory;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Model\Product;
+
+class FactoryTest extends \PHPUnit\Framework\TestCase
+{
+
+    private $productResourceMock;
+
+    private $eavConfigMock;
+
+    private $eavAttrConditionBuilderMock;
+
+    private $nativeAttrConditionBuilderMock;
+
+    private $conditionBuilderFactory;
+
+    protected function setUp()
+    {
+        $this->productResourceMock = $this->getMockBuilder(ProductResource::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityTable'])
+            ->getMock();
+
+        $this->eavConfigMock = $this->getMockBuilder(EavConfig::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttribute'])
+            ->getMock();
+
+        $this->eavAttrConditionBuilderMock = $this->getMockBuilder(CustomConditionInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->nativeAttrConditionBuilderMock = $this->getMockBuilder(CustomConditionInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->conditionBuilderFactory = $objectManagerHelper->getObject(
+            Factory::class,
+            [
+                'eavConfig' => $this->eavConfigMock,
+                'productResource' => $this->productResourceMock,
+                'eavAttributeConditionBuilder' => $this->eavAttrConditionBuilderMock,
+                'nativeAttributeConditionBuilder' => $this->nativeAttrConditionBuilderMock,
+            ]
+        );
+    }
+
+    public function testNativeAttrConditionBuilder()
+    {
+        $fieldName = 'super_field';
+        $attributeTable = 'my-table';
+        $productResourceTable = 'my-table';
+
+        $filterMock = $this->getMockBuilder(Filter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getField'])
+            ->getMock();
+
+        $filterMock
+            ->method('getField')
+            ->willReturn($fieldName);
+
+        $attributeMock = $this->getMockBuilder(Attribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBackendTable'])
+            ->getMock();
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->with(Product::ENTITY, $fieldName)
+            ->willReturn($attributeMock);
+
+        $attributeMock
+            ->method('getBackendTable')
+            ->willReturn($attributeTable);
+
+        $this->productResourceMock
+            ->method('getEntityTable')
+            ->willReturn($productResourceTable);
+
+        $this->assertEquals(
+            $this->nativeAttrConditionBuilderMock,
+            $this->conditionBuilderFactory->createByFilter($filterMock)
+        );
+    }
+
+    public function testEavAttrConditionBuilder()
+    {
+        $fieldName = 'super_field';
+        $attributeTable = 'my-table';
+        $productResourceTable = 'not-my-table';
+
+        $filterMock = $this->getMockBuilder(Filter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getField'])
+            ->getMock();
+
+        $filterMock
+            ->method('getField')
+            ->willReturn($fieldName);
+
+        $attributeMock = $this->getMockBuilder(Attribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBackendTable'])
+            ->getMock();
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->with(Product::ENTITY, $fieldName)
+            ->willReturn($attributeMock);
+
+        $attributeMock
+            ->method('getBackendTable')
+            ->willReturn($attributeTable);
+
+        $this->productResourceMock
+            ->method('getEntityTable')
+            ->willReturn($productResourceTable);
+
+        $this->assertEquals(
+            $this->eavAttrConditionBuilderMock,
+            $this->conditionBuilderFactory->createByFilter($filterMock)
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
index f667638cc4da8..157c72fcedf10 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
@@ -31,7 +31,7 @@ public function testApply()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $filterMock->expects($this->exactly(2))
+        $filterMock->expects($this->exactly(1))
             ->method('getConditionType')
             ->willReturn('condition');
         $filterMock->expects($this->once())
@@ -66,7 +66,7 @@ public function testApplyWithoutCondition()
 
         $collectionMock->expects($this->once())
             ->method('addCategoriesFilter')
-            ->with(['eq' => ['value']]);
+            ->with(['in' => ['value']]);
 
         $this->assertTrue($this->model->apply($filterMock, $collectionMock));
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php
new file mode 100644
index 0000000000000..fbb96933db517
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\TierPrice;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
+
+/**
+ * Unit tests for \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SaveHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var SaveHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $saveHandler;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var ProductAttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeRepository;
+
+    /**
+     * @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupManagement;
+
+    /**
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoll;
+
+    /**
+     * @var Tierprice|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tierPriceResource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->attributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMockForAbstractClass();
+        $this->groupManagement = $this->getMockBuilder(GroupManagementInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllCustomersGroup'])
+            ->getMockForAbstractClass();
+        $this->metadataPoll = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMetadata'])
+            ->getMock();
+        $this->tierPriceResource = $this->getMockBuilder(Tierprice::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->saveHandler = $this->objectManager->getObject(
+            \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler::class,
+            [
+                'storeManager' => $this->storeManager,
+                'attributeRepository' => $this->attributeRepository,
+                'groupManagement' => $this->groupManagement,
+                'metadataPoll' => $this->metadataPoll,
+                'tierPriceResource' => $this->tierPriceResource
+            ]
+        );
+    }
+
+    public function testExecute(): void
+    {
+        $tierPrices = [
+            ['website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 10],
+            ['website_id' => 0, 'price_qty' => 3, 'cust_group' => 3200, 'price' => null, 'percentage_value' => 20]
+        ];
+        $linkField = 'entity_id';
+        $productId = 10;
+
+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData','setData', 'getStoreId'])
+            ->getMockForAbstractClass();
+        $product->expects($this->atLeastOnce())->method('getData')->willReturnMap(
+            [
+                ['tier_price', $tierPrices],
+                ['entity_id', $productId]
+            ]
+        );
+        $product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
+        $product->expects($this->atLeastOnce())->method('setData')->with('tier_price_changed', 1);
+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getWebsiteId'])
+            ->getMockForAbstractClass();
+        $store->expects($this->atLeastOnce())->method('getWebsiteId')->willReturn(0);
+        $this->storeManager->expects($this->atLeastOnce())->method('getStore')->willReturn($store);
+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName', 'isScopeGlobal'])
+            ->getMockForAbstractClass();
+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
+        $attribute->expects($this->atLeastOnce())->method('isScopeGlobal')->willReturn(true);
+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
+            ->willReturn($attribute);
+        $productMetadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLinkField'])
+            ->getMockForAbstractClass();
+        $productMetadata->expects($this->atLeastOnce())->method('getLinkField')->willReturn($linkField);
+        $this->metadataPoll->expects($this->atLeastOnce())->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->willReturn($productMetadata);
+        $customerGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $customerGroup->expects($this->atLeastOnce())->method('getId')->willReturn(3200);
+        $this->groupManagement->expects($this->atLeastOnce())->method('getAllCustomersGroup')
+            ->willReturn($customerGroup);
+        $this->tierPriceResource->expects($this->atLeastOnce())->method('savePriceData')->willReturnSelf();
+
+        $this->assertEquals($product, $this->saveHandler->execute($product));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Tier prices data should be array, but actually other type is received
+     */
+    public function testExecuteWithException(): void
+    {
+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName', 'isScopeGlobal'])
+            ->getMockForAbstractClass();
+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
+            ->willReturn($attribute);
+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData','setData', 'getStoreId', 'getOrigData'])
+            ->getMockForAbstractClass();
+        $product->expects($this->atLeastOnce())->method('getData')->with('tier_price')->willReturn(1);
+
+        $this->saveHandler->execute($product);
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
new file mode 100644
index 0000000000000..cce00c50d37af
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\TierPrice;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
+
+/**
+ * Unit tests for \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var UpdateHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $updateHandler;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var ProductAttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeRepository;
+
+    /**
+     * @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupManagement;
+
+    /**
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoll;
+
+    /**
+     * @var Tierprice|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tierPriceResource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->attributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMockForAbstractClass();
+        $this->groupManagement = $this->getMockBuilder(GroupManagementInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllCustomersGroup'])
+            ->getMockForAbstractClass();
+        $this->metadataPoll = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMetadata'])
+            ->getMock();
+        $this->tierPriceResource = $this->getMockBuilder(Tierprice::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->updateHandler = $this->objectManager->getObject(
+            \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler::class,
+            [
+                'storeManager' => $this->storeManager,
+                'attributeRepository' => $this->attributeRepository,
+                'groupManagement' => $this->groupManagement,
+                'metadataPoll' => $this->metadataPoll,
+                'tierPriceResource' => $this->tierPriceResource
+            ]
+        );
+    }
+
+    public function testExecute(): void
+    {
+        $newTierPrices = [
+            ['website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 15],
+            ['website_id' => 0, 'price_qty' => 3, 'cust_group' => 3200, 'price' => null, 'percentage_value' => 20]
+        ];
+        $priceIdToDelete = 2;
+        $originalTierPrices = [
+            ['price_id' => 1, 'website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 10],
+            ['price_id' => $priceIdToDelete, 'website_id' => 0, 'price_qty' => 4, 'cust_group' => 0, 'price' => 20],
+        ];
+        $linkField = 'entity_id';
+        $productId = 10;
+
+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData','setData', 'getStoreId', 'getOrigData'])
+            ->getMockForAbstractClass();
+        $product->expects($this->atLeastOnce())->method('getData')->willReturnMap(
+            [
+                ['tier_price', $newTierPrices],
+                ['entity_id', $productId]
+            ]
+        );
+        $product->expects($this->atLeastOnce())->method('getOrigData')
+            ->willReturnMap(
+                [
+                    ['tier_price', $originalTierPrices],
+                    ['entity_id', $productId]
+                ]
+            );
+        $product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
+        $product->expects($this->atLeastOnce())->method('setData')->with('tier_price_changed', 1);
+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getWebsiteId'])
+            ->getMockForAbstractClass();
+        $store->expects($this->atLeastOnce())->method('getWebsiteId')->willReturn(0);
+        $this->storeManager->expects($this->atLeastOnce())->method('getStore')->willReturn($store);
+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName', 'isScopeGlobal'])
+            ->getMockForAbstractClass();
+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
+        $attribute->expects($this->atLeastOnce())->method('isScopeGlobal')->willReturn(true);
+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
+            ->willReturn($attribute);
+        $productMetadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLinkField'])
+            ->getMockForAbstractClass();
+        $productMetadata->expects($this->atLeastOnce())->method('getLinkField')->willReturn($linkField);
+        $this->metadataPoll->expects($this->atLeastOnce())->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->willReturn($productMetadata);
+        $customerGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $customerGroup->expects($this->atLeastOnce())->method('getId')->willReturn(3200);
+        $this->groupManagement->expects($this->atLeastOnce())->method('getAllCustomersGroup')
+            ->willReturn($customerGroup);
+        $this->tierPriceResource->expects($this->exactly(2))->method('savePriceData')->willReturnSelf();
+        $this->tierPriceResource->expects($this->once())->method('deletePriceData')
+            ->with($productId, null, $priceIdToDelete);
+
+        $this->assertEquals($product, $this->updateHandler->execute($product));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Tier prices data should be array, but actually other type is received
+     */
+    public function testExecuteWithException(): void
+    {
+        /** @var \PHPUnit_Framework_MockObject_MockObject $attribute */
+        $attribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName', 'isScopeGlobal'])
+            ->getMockForAbstractClass();
+        $attribute->expects($this->atLeastOnce())->method('getName')->willReturn('tier_price');
+        $this->attributeRepository->expects($this->atLeastOnce())->method('get')->with('tier_price')
+            ->willReturn($attribute);
+        /** @var \PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData','setData', 'getStoreId', 'getOrigData'])
+            ->getMockForAbstractClass();
+        $product->expects($this->atLeastOnce())->method('getData')->with('tier_price')->willReturn(1);
+
+        $this->updateHandler->execute($product);
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php
index a0a563e1e070e..779630b9559c6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php
@@ -39,6 +39,9 @@ public function testExemplarXml($fixtureXml, array $expectedErrors)
         $this->assertEquals($expectedErrors, $actualErrors);
     }
 
+    /**
+     * @return array
+     */
     public function exemplarXmlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
index d4e09714d0522..f1672d842de4e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Category\Attribute\Backend;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -27,6 +29,14 @@ class ImageTest extends \PHPUnit\Framework\TestCase
      */
     private $logger;
 
+    /**
+     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystem;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -59,6 +69,9 @@ protected function setUp()
             \Magento\Catalog\Model\ImageUploader::class,
             ['moveFileFromTmp']
         );
+
+        $this->filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -88,7 +101,7 @@ public function testBeforeSaveValueDeletion($value)
 
         $model->beforeSave($object);
 
-        $this->assertEquals('', $object->getTestAttribute());
+        $this->assertEquals(null, $object->getTestAttribute());
     }
 
     /**
@@ -128,6 +141,9 @@ public function testBeforeSaveValueInvalid($value)
         $this->assertEquals('', $object->getTestAttribute());
     }
 
+    /**
+     * Test beforeSaveAttributeFileName.
+     */
     public function testBeforeSaveAttributeFileName()
     {
         $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
@@ -144,6 +160,44 @@ public function testBeforeSaveAttributeFileName()
         $this->assertEquals('test123.jpg', $object->getTestAttribute());
     }
 
+    /**
+     * Test beforeSaveAttributeFileNameOutsideOfCategoryDir.
+     */
+    public function testBeforeSaveAttributeFileNameOutsideOfCategoryDir()
+    {
+        $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class, [
+            'filesystem' => $this->filesystem
+        ]);
+
+        $model->setAttribute($this->attribute);
+
+        $this->filesystem
+            ->expects($this->once())
+            ->method('getUri')
+            ->with(DirectoryList::MEDIA)
+            ->willReturn('pub/media');
+
+        $object = new \Magento\Framework\DataObject([
+            'test_attribute' => [
+                [
+                    'name' => '/test123.jpg',
+                    'url' => '/pub/media/wysiwyg/test123.jpg',
+                ]
+            ]
+        ]);
+
+        $model->beforeSave($object);
+
+        $this->assertEquals('/pub/media/wysiwyg/test123.jpg', $object->getTestAttribute());
+        $this->assertEquals(
+            [['name' => '/pub/media/wysiwyg/test123.jpg', 'url' => '/pub/media/wysiwyg/test123.jpg']],
+            $object->getData('_additional_data_test_attribute')
+        );
+    }
+
+    /**
+     * Test beforeSaveTemporaryAttribute.
+     */
     public function testBeforeSaveTemporaryAttribute()
     {
         $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
@@ -162,6 +216,9 @@ public function testBeforeSaveTemporaryAttribute()
         ], $object->getData('_additional_data_test_attribute'));
     }
 
+    /**
+     * Test beforeSaveAttributeStringValue.
+     */
     public function testBeforeSaveAttributeStringValue()
     {
         $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
@@ -205,6 +262,9 @@ private function setUpModelForAfterSave()
         return $model->setAttribute($this->attribute);
     }
 
+    /**
+     * @return array
+     */
     public function attributeValueDataProvider()
     {
         return [
@@ -259,6 +319,9 @@ public function testAfterSaveWithoutAdditionalData($value)
         $model->afterSave($object);
     }
 
+    /**
+     * Test afterSaveWithExceptions.
+     */
     public function testAfterSaveWithExceptions()
     {
         $model = $this->setUpModelForAfterSave();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
index c582da8811ecb..467d72a549b64 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
@@ -71,6 +71,9 @@ public function testBeforeSave($attributeCode, $data, $expected)
         $this->assertSame($expected, $object->getData($attributeCode));
     }
 
+    /**
+     * @return array
+     */
     public function beforeSaveDataProvider()
     {
         return [
@@ -117,6 +120,9 @@ public function testAfterLoad($attributeCode, $data, $expected)
         $this->assertSame($expected, $object->getData($attributeCode));
     }
 
+    /**
+     * @return array
+     */
     public function afterLoadDataProvider()
     {
         return [
@@ -159,6 +165,9 @@ public function testValidate($attributeData, $data, $expected)
         $this->assertSame($expected, $this->_model->validate($object));
     }
 
+    /**
+     * @return array
+     */
     public function validateDataProvider()
     {
         return [
@@ -251,6 +260,9 @@ public function testValidateDefaultSort($attributeCode, $data)
         $this->assertTrue($this->_model->validate($object));
     }
 
+    /**
+     * @return array
+     */
     public function validateDefaultSortDataProvider()
     {
         return [
@@ -294,6 +306,9 @@ public function testValidateDefaultSortException($attributeCode, $data)
         $this->_model->validate($object);
     }
 
+    /**
+     * @return array
+     */
     public function validateDefaultSortException()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
index 0e8777b5c6f9e..8ca823127e66c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 
 class FileInfoTest extends \PHPUnit\Framework\TestCase
 {
@@ -28,6 +29,11 @@ class FileInfoTest extends \PHPUnit\Framework\TestCase
      */
     private $mediaDirectory;
 
+    /**
+     * @var ReadInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $baseDirectory;
+
     /**
      * @var FileInfo
      */
@@ -38,6 +44,9 @@ protected function setUp()
         $this->mediaDirectory = $this->getMockBuilder(WriteInterface::class)
             ->getMockForAbstractClass();
 
+        $this->baseDirectory = $this->getMockBuilder(ReadInterface::class)
+            ->getMockForAbstractClass();
+
         $this->filesystem = $this->getMockBuilder(Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -46,10 +55,20 @@ protected function setUp()
             ->with(DirectoryList::MEDIA)
             ->willReturn($this->mediaDirectory);
 
+        $this->filesystem->expects($this->any())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::ROOT)
+            ->willReturn($this->baseDirectory);
+
         $this->mime = $this->getMockBuilder(Mime::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->baseDirectory->expects($this->any())
+            ->method('getAbsolutePath')
+            ->with(null)
+            ->willReturn('/a/b/c');
+
         $this->model = new FileInfo(
             $this->filesystem,
             $this->mime
@@ -58,16 +77,24 @@ protected function setUp()
 
     public function testGetMimeType()
     {
-        $mediaPath = '/catalog/category';
-
         $fileName = '/filename.ext1';
-        $absoluteFilePath = '/absolute_path/catalog/category/filename.ext1';
+        $absoluteFilePath = '/a/b/c/pub/media/catalog/category/filename.ext1';
 
         $expected = 'ext1';
 
-        $this->mediaDirectory->expects($this->once())
+        $this->mediaDirectory->expects($this->at(0))
+            ->method('getAbsolutePath')
+            ->with(null)
+            ->willReturn('/a/b/c/pub/media');
+
+        $this->mediaDirectory->expects($this->at(1))
+            ->method('getAbsolutePath')
+            ->with(null)
+            ->willReturn('/a/b/c/pub/media');
+
+        $this->mediaDirectory->expects($this->at(2))
             ->method('getAbsolutePath')
-            ->with($mediaPath. '/' . ltrim($fileName, '/'))
+            ->with('/catalog/category/filename.ext1')
             ->willReturn($absoluteFilePath);
 
         $this->mime->expects($this->once())
@@ -86,6 +113,11 @@ public function testGetStat()
 
         $expected = ['size' => 1];
 
+        $this->mediaDirectory->expects($this->any())
+            ->method('getAbsolutePath')
+            ->with(null)
+            ->willReturn('/a/b/c/pub/media');
+
         $this->mediaDirectory->expects($this->once())
             ->method('stat')
             ->with($mediaPath . $fileName)
@@ -104,6 +136,11 @@ public function testIsExist()
 
         $fileName = '/filename.ext1';
 
+        $this->mediaDirectory->expects($this->any())
+            ->method('getAbsolutePath')
+            ->with(null)
+            ->willReturn('/a/b/c/pub/media');
+
         $this->mediaDirectory->expects($this->once())
             ->method('isExist')
             ->with($mediaPath . $fileName)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
index 78db12be56b42..0b85ef38387fa 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
@@ -197,6 +197,21 @@ public function getCategoryDataProvider()
                 ],
                 [], //affected category_ids
             ],
+            [
+                [3], //model category_ids
+                [
+                    ['category_id' => 3, 'position' => 20],
+                    ['category_id' => 4, 'position' => 30],
+                ], // dto category links
+                [
+                    ['category_id' => 3, 'position' => 10],
+                ],
+                [
+                    ['category_id' => 3, 'position' => 20],
+                    ['category_id' => 4, 'position' => 30],
+                ],
+                [3, 4], //affected category_ids
+            ],
         ];
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
new file mode 100644
index 0000000000000..7ad8b1a0ab3f8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Category\Product;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Category\Product\PositionResolver;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+
+class PositionResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resources;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connection;
+
+    /**
+     * @var Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $select;
+
+    /**
+     * @var PositionResolver
+     */
+    private $model;
+
+    /**
+     * @var array
+     */
+    private $positions = [
+        '3' => 100,
+        '2' => 101,
+        '1' => 102
+    ];
+
+    /**
+     * @var array
+     */
+    private $flippedPositions = [
+        '100' => 3,
+        '101' => 2,
+        '102' => 1
+    ];
+
+    /**
+     * @var int
+     */
+    private $categoryId = 1;
+
+    protected function setUp()
+    {
+        $this->context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resources = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connection = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = (new ObjectManager($this))->getObject(
+            PositionResolver::class,
+            [
+                'context' => $this->context,
+                null,
+                '_resources' => $this->resources
+            ]
+        );
+    }
+
+    public function testGetPositions()
+    {
+        $this->resources->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connection);
+
+        $this->connection->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+        $this->select->expects($this->once())
+            ->method('from')
+            ->willReturnSelf();
+        $this->select->expects($this->once())
+            ->method('where')
+            ->willReturnSelf();
+        $this->select->expects($this->exactly(2))
+            ->method('order')
+            ->willReturnSelf();
+        $this->select->expects($this->once())
+            ->method('joinLeft')
+            ->willReturnSelf();
+        $this->connection->expects($this->once())
+            ->method('fetchCol')
+            ->willReturn($this->positions);
+
+        $this->assertEquals($this->flippedPositions, $this->model->getPositions($this->categoryId));
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
index 6c8951c3ca672..b42262f1f0384 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
@@ -145,7 +145,7 @@ public function testDeleteByIdsWithCouldNotSaveException()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Category does not contain specified product
+     * @expectedExceptionMessage The category doesn't contain the specified product.
      */
     public function testDeleteWithInputException()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
index 1bc5e450ae153..864b91b20d017 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
@@ -255,7 +255,8 @@ public function testSaveWithException()
      */
     public function testSaveWithValidateCategoryException($error, $expectedException, $expectedExceptionMessage)
     {
-        $this->expectException($expectedException, $expectedExceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
         $categoryId = 5;
         $categoryMock = $this->createMock(\Magento\Catalog\Model\Category::class);
         $this->extensibleDataObjectConverterMock
@@ -279,12 +280,15 @@ public function testSaveWithValidateCategoryException($error, $expectedException
         $this->model->save($categoryMock);
     }
 
+    /**
+     * @return array
+     */
     public function saveWithValidateCategoryExceptionDataProvider()
     {
         return [
             [
                 true, \Magento\Framework\Exception\CouldNotSaveException::class,
-                'Could not save category: Attribute "ValidateCategoryTest" is required.',
+                'Could not save category: The "ValidateCategoryTest" attribute is required. Enter and try again.'
             ], [
                 'Something went wrong', \Magento\Framework\Exception\CouldNotSaveException::class,
                 'Could not save category: Something went wrong'
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
index d96ac4bfaab0a..64eedbce2d982 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Test\Unit\Model;
 
 use Magento\Catalog\Model\Indexer;
-use Magento\Catalog\Model\Category;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -285,6 +284,9 @@ public function testGetUseFlatResourceTrue()
         $this->assertEquals(true, $category->getUseFlatResource());
     }
 
+    /**
+     * @return object
+     */
     protected function getCategoryModel()
     {
         return $this->objectManager->getObject(
@@ -313,6 +315,9 @@ protected function getCategoryModel()
         );
     }
 
+    /**
+     * @return array
+     */
     public function reindexFlatEnabledTestDataProvider()
     {
         return [
@@ -372,6 +377,9 @@ public function testReindexFlatEnabled(
         $this->category->reindex();
     }
 
+    /**
+     * @return array
+     */
     public function reindexFlatDisabledTestDataProvider()
     {
         return [
@@ -431,43 +439,49 @@ public function testReindexFlatDisabled(
 
     public function testGetCustomAttributes()
     {
-        $nameAttributeCode = 'name';
-        $descriptionAttributeCode = 'description';
+        $interfaceAttributeCode = 'name';
+        $customAttributeCode = 'description';
+        $initialCustomAttributeValue = 'initial description';
+        $newCustomAttributeValue = 'new description';
+
         $interfaceAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
         $interfaceAttribute->expects($this->once())
             ->method('getAttributeCode')
-            ->willReturn($nameAttributeCode);
-        $descriptionAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-        $descriptionAttribute->expects($this->once())
+            ->willReturn($interfaceAttributeCode);
+        $colorAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
+        $colorAttribute->expects($this->once())
             ->method('getAttributeCode')
-            ->willReturn($descriptionAttributeCode);
-        $customAttributesMetadata = [$interfaceAttribute, $descriptionAttribute];
+            ->willReturn($customAttributeCode);
+        $customAttributesMetadata = [$interfaceAttribute, $colorAttribute];
 
         $this->metadataServiceMock->expects($this->once())
             ->method('getCustomAttributesMetadata')
             ->willReturn($customAttributesMetadata);
-        $this->category->setData($nameAttributeCode, "sub");
+        $this->category->setData($interfaceAttributeCode, 10);
 
-        //The color attribute is not set, expect empty custom attribute array
+        //The description attribute is not set, expect empty custom attribute array
         $this->assertEquals([], $this->category->getCustomAttributes());
 
-        //Set the color attribute;
-        $this->category->setData($descriptionAttributeCode, "description");
+        //Set the description attribute;
+        $this->category->setData($customAttributeCode, $initialCustomAttributeValue);
         $attributeValue = new \Magento\Framework\Api\AttributeValue();
         $attributeValue2 = new \Magento\Framework\Api\AttributeValue();
         $this->attributeValueFactory->expects($this->exactly(2))->method('create')
             ->willReturnOnConsecutiveCalls($attributeValue, $attributeValue2);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
-        $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
-        $this->assertEquals("description", $this->category->getCustomAttribute($descriptionAttributeCode)->getValue());
+        $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $initialCustomAttributeValue,
+            $this->category->getCustomAttribute($customAttributeCode)->getValue()
+        );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->category->setData($descriptionAttributeCode, "new description");
+        $this->category->setCustomAttribute($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
-        $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
+        $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
         $this->assertEquals(
-            "new description",
-            $this->category->getCustomAttribute($descriptionAttributeCode)->getValue()
+            $newCustomAttributeValue,
+            $this->category->getCustomAttribute($customAttributeCode)->getValue()
         );
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
index 9df0a6bc1eac0..f0e17c7938b27 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
@@ -57,10 +57,14 @@ public function testGetCollection()
         $linkedProductOneMock = $this->createMock(Product::class);
         $linkedProductTwoMock = $this->createMock(Product::class);
         $linkedProductThreeMock = $this->createMock(Product::class);
+        $linkedProductFourMock = $this->createMock(Product::class);
+        $linkedProductFiveMock = $this->createMock(Product::class);
 
         $linkedProductOneMock->expects($this->once())->method('getId')->willReturn(1);
         $linkedProductTwoMock->expects($this->once())->method('getId')->willReturn(2);
         $linkedProductThreeMock->expects($this->once())->method('getId')->willReturn(3);
+        $linkedProductFourMock->expects($this->once())->method('getId')->willReturn(4);
+        $linkedProductFiveMock->expects($this->once())->method('getId')->willReturn(5);
 
         $this->converterPoolMock->expects($this->once())
             ->method('getConverter')
@@ -71,9 +75,11 @@ public function testGetCollection()
             [$linkedProductOneMock, ['name' => 'Product One', 'position' => 10]],
             [$linkedProductTwoMock, ['name' => 'Product Two', 'position' => 2]],
             [$linkedProductThreeMock, ['name' => 'Product Three', 'position' => 2]],
+            [$linkedProductFourMock, ['name' => 'Product Four', 'position' => null]],
+            [$linkedProductFiveMock, ['name' => 'Product Five']],
         ];
 
-        $this->converterMock->expects($this->exactly(3))->method('convert')->willReturnMap($map);
+        $this->converterMock->expects($this->exactly(5))->method('convert')->willReturnMap($map);
 
         $this->providerMock->expects($this->once())
             ->method('getLinkedProducts')
@@ -82,14 +88,18 @@ public function testGetCollection()
                 [
                     $linkedProductOneMock,
                     $linkedProductTwoMock,
-                    $linkedProductThreeMock
+                    $linkedProductThreeMock,
+                    $linkedProductFourMock,
+                    $linkedProductFiveMock,
                 ]
             );
 
         $expectedResult = [
-            2 => ['name' => 'Product Two', 'position' => 2],
-            3 => ['name' => 'Product Three', 'position' => 2],
-            10 => ['name' => 'Product One', 'position' => 10],
+            0 => ['name' => 'Product Four', 'position' => 0],
+            1 => ['name' => 'Product Five', 'position' => 0],
+            2 => ['name' => 'Product Three', 'position' => 2],
+            3 => ['name' => 'Product Two', 'position' => 2],
+            4 => ['name' => 'Product One', 'position' => 10],
         ];
 
         $actualResult = $this->model->getCollection($this->productMock, 'crosssell');
@@ -101,7 +111,7 @@ public function testGetCollection()
      * Test exception when collection provider is not configured for product link type.
      *
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Collection provider is not registered
+     * @expectedExceptionMessage The collection provider isn't registered.
      */
     public function testGetCollectionWithMissingProviders()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionTest.php
index 33b7892462f4c..fb90eaaaf1ec5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionTest.php
@@ -7,6 +7,8 @@
 
 use Magento\Catalog\Model\CustomOptions\CustomOption;
 use Magento\Catalog\Model\Webapi\Product\Option\Type\File\Processor as FileProcessor;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Catalog\Api\Data\CustomOptionExtensionInterface;
 
 class CustomOptionTest extends \PHPUnit\Framework\TestCase
 {
@@ -15,6 +17,12 @@ class CustomOptionTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /** @var \Magento\Framework\Api\ExtensionAttributesFactory | \PHPUnit_Framework_MockObject_MockObject */
+    private $extensionAttributesFactoryMock;
+
+    /** @var \Magento\Catalog\Api\Data\CustomOptionExtensionInterface | \PHPUnit_Framework_MockObject_MockObject */
+    private $extensionMock;
+
     /**
      * @var FileProcessor | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -30,7 +38,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $extensionAttributesFactory = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesFactory::class)
+        $this->extensionAttributesFactoryMock = $this->getMockBuilder(ExtensionAttributesFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -52,10 +60,17 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->extensionMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\CustomOptionExtensionInterface::class)
+            ->setMethods(['getFileInfo'])
+            ->getMockForAbstractClass();
+
+        $this->extensionAttributesFactoryMock->expects(self::any())
+            ->method('create')->willReturn($this->extensionMock);
+
         $this->model = new CustomOption(
             $context,
             $registry,
-            $extensionAttributesFactory,
+            $this->extensionAttributesFactoryMock,
             $attributeValueFactory,
             $this->fileProcessor,
             $resource,
@@ -84,14 +99,10 @@ public function testGetOptionValue()
 
     public function testGetOptionValueWithFileInfo()
     {
-        $customOption = $this->getMockBuilder(\Magento\Catalog\Api\Data\CustomOptionExtensionInterface::class)
-            ->setMethods(['getFileInfo'])
-            ->getMockForAbstractClass();
-
         $imageContent = $this->getMockBuilder(\Magento\Framework\Api\Data\ImageContentInterface::class)
             ->getMockForAbstractClass();
 
-        $customOption->expects($this->once())
+        $this->extensionMock->expects($this->once())
             ->method('getFileInfo')
             ->willReturn($imageContent);
 
@@ -112,7 +123,6 @@ public function testGetOptionValueWithFileInfo()
             ->with($imageContent)
             ->willReturn($imageResult);
 
-        $this->model->setExtensionAttributes($customOption);
         $this->model->setData(\Magento\Catalog\Api\Data\CustomOptionInterface::OPTION_VALUE, 'file');
         $this->assertEquals($imageResult, $this->model->getOptionValue());
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
index b8196fcd8bea3..6552e85440008 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
@@ -69,10 +69,17 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
     /**
      * Allowed extensions
      *
-     * @var string
+     * @var array
      */
     private $allowedExtensions;
 
+    /**
+     * Allowed mime types
+     *
+     * @var array
+     */
+    private $allowedMimeTypes;
+
     protected function setUp()
     {
         $this->coreFileStorageDatabaseMock = $this->createMock(
@@ -97,6 +104,7 @@ protected function setUp()
         $this->baseTmpPath = 'base/tmp/';
         $this->basePath =  'base/real/';
         $this->allowedExtensions = ['.jpg'];
+        $this->allowedMimeTypes = ['image/jpg', 'image/jpeg', 'image/gif', 'image/png'];
 
         $this->imageUploader =
             new \Magento\Catalog\Model\ImageUploader(
@@ -107,13 +115,20 @@ protected function setUp()
                 $this->loggerMock,
                 $this->baseTmpPath,
                 $this->basePath,
-                $this->allowedExtensions
+                $this->allowedExtensions,
+                $this->allowedMimeTypes
             );
     }
 
     public function testSaveFileToTmpDir()
     {
         $fileId = 'file.jpg';
+        $allowedMimeTypes = [
+            'image/jpg',
+            'image/jpeg',
+            'image/gif',
+            'image/png',
+        ];
         /** @var \Magento\MediaStorage\Model\File\Uploader|\PHPUnit_Framework_MockObject_MockObject $uploader */
         $uploader = $this->createMock(\Magento\MediaStorage\Model\File\Uploader::class);
         $this->uploaderFactoryMock->expects($this->once())->method('create')->willReturn($uploader);
@@ -123,6 +138,7 @@ public function testSaveFileToTmpDir()
             ->willReturn($this->basePath);
         $uploader->expects($this->once())->method('save')->with($this->basePath)
             ->willReturn(['tmp_name' => $this->baseTmpPath, 'file' => $fileId, 'path' => $this->basePath]);
+        $uploader->expects($this->atLeastOnce())->method('checkMimeType')->with($allowedMimeTypes)->willReturn(true);
         $storeMock = $this->createPartialMock(
             \Magento\Store\Model\Store::class,
             ['getBaseUrl']
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/IndexerConfigDataTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/IndexerConfigDataTest.php
index 56bd04594018c..f69cbeb91631f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/IndexerConfigDataTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/IndexerConfigDataTest.php
@@ -48,6 +48,9 @@ public function testAroundGet($isFlat, $path, $default, $inputData, $outputData)
         $this->assertEquals($outputData, $this->model->afterGet($this->subjectMock, $inputData, $path, $default));
     }
 
+    /**
+     * @return array
+     */
     public function aroundGetDataProvider()
     {
         $flatIndexerData = [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php
index 64e89f8acb2a6..4aef779e4078d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php
@@ -88,7 +88,7 @@ public function testBeforeAndAfterSaveHasChanged()
 
     public function testBeforeAndAfterSaveNoNeed()
     {
-        $this->mockConfigFlatEnabledNeever();
+        $this->mockConfigFlatEnabledNever();
         $storeMock = $this->createPartialMock(
             \Magento\Store\Model\Store::class,
             ['isObjectNew', 'dataHasChangedFor', '__wakeup']
@@ -114,7 +114,7 @@ protected function mockConfigFlatEnabled()
         $this->stateMock->expects($this->once())->method('isFlatEnabled')->will($this->returnValue(true));
     }
 
-    protected function mockConfigFlatEnabledNeever()
+    protected function mockConfigFlatEnabledNever()
     {
         $this->stateMock->expects($this->never())->method('isFlatEnabled');
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/StateTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/StateTest.php
index 3beb9a3ffb773..6916cef2dfa61 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/StateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/StateTest.php
@@ -102,6 +102,9 @@ public function testIsAvailable($isAvailable, $isFlatEnabled, $isValid, $result)
         $this->assertEquals($result, $this->model->isAvailable());
     }
 
+    /**
+     * @return array
+     */
     public function isAvailableDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/System/Config/ModeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/System/Config/ModeTest.php
index 3b3941d116fde..fb02b80a60175 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/System/Config/ModeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/System/Config/ModeTest.php
@@ -57,6 +57,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcessValueEqual()
     {
         return [['0', '0'], ['', '0'], ['0', ''], ['1', '1']];
@@ -92,6 +95,9 @@ public function testProcessValueEqual($oldValue, $value)
         $this->model->processValue();
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcessValueOn()
     {
         return [['0', '1'], ['', '1']];
@@ -143,6 +149,9 @@ public function testProcessValueOn($oldValue, $value)
         $this->model->processValue();
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcessValueOff()
     {
         return [['1', '0'], ['1', '']];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php
index 8310f3692d966..e134407d547ac 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php
@@ -89,6 +89,9 @@ public function testBeforeAndAfterSaveNotNew($valueMap)
         $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->groupMock));
     }
 
+    /**
+     * @return array
+     */
     public function changedDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
index 6e3cd6ed30b52..4da831f5257d0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
@@ -33,6 +33,11 @@ class StoreViewTest extends \PHPUnit\Framework\TestCase
      */
     protected $indexerRegistryMock;
 
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tableMaintainer;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -51,15 +56,30 @@ protected function setUp()
         );
         $this->subject = $this->createMock(Group::class);
         $this->indexerRegistryMock = $this->createPartialMock(IndexerRegistry::class, ['get']);
-        $this->storeMock = $this->createPartialMock(Store::class, ['isObjectNew', 'dataHasChangedFor', '__wakeup']);
+        $this->storeMock = $this->createPartialMock(
+            Store::class,
+            [
+                'isObjectNew',
+                'getId',
+                'dataHasChangedFor',
+                '__wakeup'
+            ]
+        );
+        $this->tableMaintainer = $this->createPartialMock(
+            \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer::class,
+            [
+                'createTablesForStore'
+            ]
+        );
 
-        $this->model = new StoreView($this->indexerRegistryMock);
+        $this->model = new StoreView($this->indexerRegistryMock, $this->tableMaintainer);
     }
 
     public function testAroundSaveNewObject()
     {
         $this->mockIndexerMethods();
-        $this->storeMock->expects($this->once())->method('isObjectNew')->willReturn(true);
+        $this->storeMock->expects($this->atLeastOnce())->method('isObjectNew')->willReturn(true);
+        $this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
         $this->model->beforeSave($this->subject, $this->storeMock);
         $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->storeMock));
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php
index 58654136ab5a8..6ad14af44304e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php
@@ -22,6 +22,14 @@ class AbstractActionTest extends \PHPUnit\Framework\TestCase
      */
     protected $_eavSourceFactoryMock;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->_eavDecimalFactoryMock = $this->createPartialMock(
@@ -32,12 +40,22 @@ protected function setUp()
             \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory::class,
             ['create']
         );
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $this->_model = $this->getMockForAbstractClass(
             \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction::class,
-            [$this->_eavDecimalFactoryMock, $this->_eavSourceFactoryMock, []]
+            [
+                $this->_eavDecimalFactoryMock,
+                $this->_eavSourceFactoryMock,
+                $this->scopeConfig
+            ]
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGetIndexers()
     {
         $expectedIndexers = [
@@ -73,6 +91,10 @@ public function testGetIndexerWithUnknownTypeThrowsException()
         $this->_model->getIndexer('unknown_type');
     }
 
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testGetIndexer()
     {
         $this->_eavSourceFactoryMock->expects($this->once())
@@ -86,6 +108,10 @@ public function testGetIndexer()
         $this->assertEquals('source_return_value', $this->_model->getIndexer('source'));
     }
 
+    /**
+     * @return void
+     * @throws \Exception
+     */
     public function testReindexWithoutArgumentsExecutesReindexAll()
     {
         $eavSource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source::class)
@@ -110,14 +136,27 @@ public function testReindexWithoutArgumentsExecutesReindexAll()
             ->method('create')
             ->will($this->returnValue($eavDecimal));
 
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->willReturn(1);
+
         $this->_model->reindex();
     }
 
-    public function testReindexWithNotNullArgumentExecutesReindexEntities()
-    {
-        $childIds = [1, 2, 3];
-        $parentIds = [4];
-        $reindexIds = array_merge($childIds, $parentIds);
+    /**
+     * @param array $ids
+     * @param array $parentIds
+     * @param array $childIds
+     * @return void
+     * @dataProvider reindexEntitiesDataProvider
+     */
+    public function testReindexWithNotNullArgumentExecutesReindexEntities(
+        array $ids,
+        array $parentIds,
+        array $childIds
+    ) : void {
+        $reindexIds = array_unique(array_merge($ids, $parentIds, $childIds));
+
         $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
             ->getMockForAbstractClass();
 
@@ -129,11 +168,23 @@ public function testReindexWithNotNullArgumentExecutesReindexEntities()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $eavSource->expects($this->once())->method('getRelationsByChild')->with($childIds)->willReturn($childIds);
-        $eavSource->expects($this->once())->method('getRelationsByParent')->with($childIds)->willReturn($parentIds);
+        $eavSource->expects($this->once())
+            ->method('getRelationsByChild')
+            ->with($ids)
+            ->willReturn($parentIds);
+        $eavSource->expects($this->once())
+            ->method('getRelationsByParent')
+            ->with(array_unique(array_merge($parentIds, $ids)))
+            ->willReturn($childIds);
 
-        $eavDecimal->expects($this->once())->method('getRelationsByChild')->with($reindexIds)->willReturn($reindexIds);
-        $eavDecimal->expects($this->once())->method('getRelationsByParent')->with($reindexIds)->willReturn([]);
+        $eavDecimal->expects($this->once())
+            ->method('getRelationsByChild')
+            ->with($reindexIds)
+            ->willReturn($parentIds);
+        $eavDecimal->expects($this->once())
+            ->method('getRelationsByParent')
+            ->with(array_unique(array_merge($parentIds, $reindexIds)))
+            ->willReturn($childIds);
 
         $eavSource->expects($this->once())->method('getConnection')->willReturn($connectionMock);
         $eavDecimal->expects($this->once())->method('getConnection')->willReturn($connectionMock);
@@ -153,6 +204,34 @@ public function testReindexWithNotNullArgumentExecutesReindexEntities()
             ->method('create')
             ->will($this->returnValue($eavDecimal));
 
-        $this->_model->reindex($childIds);
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->willReturn(1);
+
+        $this->_model->reindex($ids);
+    }
+
+    /**
+     * @return void
+     * @throws \Exception
+     */
+    public function testReindexWithDisabledEavIndexer()
+    {
+        $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(0);
+        $this->_eavSourceFactoryMock->expects($this->never())->method('create');
+        $this->_eavDecimalFactoryMock->expects($this->never())->method('create');
+        $this->_model->reindex();
+    }
+
+    /**
+     * @return array
+     */
+    public function reindexEntitiesDataProvider() : array
+    {
+        return [
+            [[4], [], [1, 2, 3]],
+            [[3], [4], []],
+            [[5], [], []],
+        ];
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
index eb5fdabe53303..90c3f999a6a8b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -5,52 +5,87 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Eav\Action;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
-    public function testExecuteWithAdapterErrorThrowsException()
-    {
-        $eavDecimalFactory = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory::class,
-            ['create']
-        );
-        $eavSourceFactory = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory::class,
-            ['create']
-        );
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
 
-        $exceptionMessage = 'exception message';
-        $exception = new \Exception($exceptionMessage);
+    /**
+     * @var DecimalFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavDecimalFactory;
 
-        $eavDecimalFactory->expects($this->once())
-            ->method('create')
-            ->will($this->throwException($exception));
+    /**
+     * @var SourceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavSourceFactory;
 
-        $metadataMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
-        $batchProviderMock = $this->createMock(\Magento\Framework\Indexer\BatchProviderInterface::class);
+    /**
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
 
-        $batchManagementMock = $this->createMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator::class
-        );
+    /**
+     * @var BatchProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $batchProvider;
 
-        $tableSwitcherMock = $this->getMockBuilder(
-            \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
-        )->disableOriginalConstructor()->getMock();
-
-        $model = new \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full(
-            $eavDecimalFactory,
-            $eavSourceFactory,
-            $metadataMock,
-            $batchProviderMock,
-            $batchManagementMock,
-            $tableSwitcherMock
-        );
+    /**
+     * @var BatchSizeCalculator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $batchSizeCalculator;
+
+    /**
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $activeTableSwitcher;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
 
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->eavDecimalFactory = $this->createPartialMock(DecimalFactory::class, ['create']);
+        $this->eavSourceFactory = $this->createPartialMock(SourceFactory::class, ['create']);
+        $this->metadataPool = $this->createMock(MetadataPool::class);
+        $this->batchProvider = $this->getMockForAbstractClass(BatchProviderInterface::class);
+        $this->batchSizeCalculator = $this->createMock(BatchSizeCalculator::class);
+        $this->activeTableSwitcher = $this->createMock(ActiveTableSwitcher::class);
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
-        $model->execute();
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full::class,
+            [
+                'eavDecimalFactory' => $this->eavDecimalFactory,
+                'eavSourceFactory' => $this->eavSourceFactory,
+                'metadataPool' => $this->metadataPool,
+                'batchProvider' => $this->batchProvider,
+                'batchSizeCalculator' => $this->batchSizeCalculator,
+                'activeTableSwitcher' => $this->activeTableSwitcher,
+                'scopeConfig' => $this->scopeConfig
+            ]
+        );
     }
 
     /**
@@ -58,14 +93,7 @@ public function testExecuteWithAdapterErrorThrowsException()
      */
     public function testExecute()
     {
-        $eavDecimalFactory = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory::class,
-            ['create']
-        );
-        $eavSourceFactory = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory::class,
-            ['create']
-        );
+        $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(1);
 
         $ids = [1, 2, 3];
         $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
@@ -89,42 +117,29 @@ public function testExecute()
         $eavSource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
         $eavDecimal->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
 
-        $eavDecimal->expects($this->once())
-            ->method('reindexEntities')
-            ->with($ids);
+        $eavDecimal->expects($this->once())->method('reindexEntities')->with($ids);
 
-        $eavSource->expects($this->once())
-            ->method('reindexEntities')
-            ->with($ids);
+        $eavSource->expects($this->once())->method('reindexEntities')->with($ids);
 
-        $eavDecimalFactory->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($eavSource));
+        $this->eavDecimalFactory->expects($this->once())->method('create')->will($this->returnValue($eavSource));
 
-        $eavSourceFactory->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($eavDecimal));
+        $this->eavSourceFactory->expects($this->once())->method('create')->will($this->returnValue($eavDecimal));
 
-        $metadataMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
         $entityMetadataMock = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
             ->getMockForAbstractClass();
 
-        $metadataMock->expects($this->atLeastOnce())
+        $this->metadataPool->expects($this->atLeastOnce())
             ->method('getMetadata')
             ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->willReturn($entityMetadataMock);
 
-        $batchProviderMock = $this->createMock(\Magento\Framework\Indexer\BatchProviderInterface::class);
-        $batchProviderMock->expects($this->atLeastOnce())
+        $this->batchProvider->expects($this->atLeastOnce())
             ->method('getBatches')
             ->willReturn([['from' => 10, 'to' => 100]]);
-        $batchProviderMock->expects($this->atLeastOnce())
+        $this->batchProvider->expects($this->atLeastOnce())
             ->method('getBatchIds')
             ->willReturn($ids);
 
-        $batchManagementMock = $this->createMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator::class
-        );
         $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -133,19 +148,17 @@ public function testExecute()
         $selectMock->expects($this->atLeastOnce())->method('distinct')->willReturnSelf();
         $selectMock->expects($this->atLeastOnce())->method('from')->willReturnSelf();
 
-        $tableSwitcherMock = $this->getMockBuilder(
-            \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
-        )->disableOriginalConstructor()->getMock();
-
-        $model = new \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full(
-            $eavDecimalFactory,
-            $eavSourceFactory,
-            $metadataMock,
-            $batchProviderMock,
-            $batchManagementMock,
-            $tableSwitcherMock
-        );
+        $this->model->execute();
+    }
 
-        $model->execute();
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecuteWithDisabledEavIndexer()
+    {
+        $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(0);
+        $this->metadataPool->expects($this->never())->method('getMetadata');
+        $this->model->execute();
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php
index cc6f5d84ef001..e1e2816d44220 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php
@@ -53,8 +53,14 @@ public function testRemoveDeletedProducts()
     {
         $productsToDeleteIds = [1, 2];
         $select = $this->createMock(\Magento\Framework\DB\Select::class);
-        $select->expects($this->once())->method('from')->with('catalog_product_entity')->will($this->returnSelf());
-        $select->expects($this->once())->method('where')->with('entity_id IN(?)', $productsToDeleteIds)
+        $select->expects($this->once())
+            ->method('from')
+            ->with(['product_table' => 'catalog_product_entity'])
+            ->will($this->returnSelf());
+        $select->expects($this->once())->method('columns')->with('entity_id')->will($this->returnSelf());
+        $select->expects($this->once())
+            ->method('where')
+            ->with('product_table.entity_id IN(?)', $productsToDeleteIds)
             ->will($this->returnSelf());
         $products = [['entity_id' => 2]];
         $statement = $this->createMock(\Zend_Db_Statement_Interface::class);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
index 7b2a2ff304b80..11d07872fef91 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -6,8 +6,13 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Flat\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class RowTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -16,76 +21,116 @@ class RowTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $storeManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $store;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $productIndexerHelper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $resource;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $connection;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $flatItemWriter;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $flatItemEraser;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $flatTableBuilder;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
+        $attributeTable = 'catalog_product_entity_int';
+        $statusId = 22;
         $this->connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
         $this->resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
         $this->resource->expects($this->any())->method('getConnection')
             ->with('default')
-            ->will($this->returnValue($this->connection));
+            ->willReturn($this->connection);
         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->store = $this->createMock(\Magento\Store\Model\Store::class);
-        $this->store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
-        $this->storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$this->store]));
-        $this->productIndexerHelper = $this->createMock(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
+        $this->store->expects($this->any())->method('getId')->willReturn('store_id_1');
+        $this->storeManager->expects($this->any())->method('getStores')->willReturn([$this->store]);
         $this->flatItemEraser = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser::class);
         $this->flatItemWriter = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer::class);
         $this->flatTableBuilder = $this->createMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder::class
         );
+        $this->productIndexerHelper = $this->createMock(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
+        $statusAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productIndexerHelper->expects($this->any())->method('getAttribute')
+            ->with('status')
+            ->willReturn($statusAttributeMock);
+        $backendMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $backendMock->expects($this->any())->method('getTable')->willReturn($attributeTable);
+        $statusAttributeMock->expects($this->any())->method('getBackend')->willReturn($backendMock);
+        $statusAttributeMock->expects($this->any())->method('getId')->willReturn($statusId);
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connection->expects($this->any())->method('select')->willReturn($selectMock);
+        $selectMock->method('from')
+            ->willReturnSelf();
+        $selectMock->method('joinLeft')
+            ->willReturnSelf();
+        $selectMock->expects($this->any())->method('where')->willReturnSelf();
+        $selectMock->expects($this->any())->method('order')->willReturnSelf();
+        $selectMock->expects($this->any())->method('limit')->willReturnSelf();
+        $pdoMock = $this->createMock(\Zend_Db_Statement_Pdo::class);
+        $this->connection->expects($this->any())->method('query')->with($selectMock)->willReturn($pdoMock);
+        $pdoMock->expects($this->any())->method('fetchColumn')->willReturn('1');
+
+        $metadataPool = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $productMetadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->getMockForAbstractClass();
+        $metadataPool->expects($this->any())->method('getMetadata')->with(ProductInterface::class)
+            ->willReturn($productMetadata);
+        $productMetadata->expects($this->any())->method('getLinkField')->willReturn('entity_id');
 
         $this->model = $objectManager->getObject(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row::class,
             [
-                'resource' => $this->resource,
-                'storeManager' => $this->storeManager,
-                'productHelper' => $this->productIndexerHelper,
-                'flatItemEraser' => $this->flatItemEraser,
-                'flatItemWriter' => $this->flatItemWriter,
-                'flatTableBuilder' => $this->flatTableBuilder
+                'resource'         => $this->resource,
+                'storeManager'     => $this->storeManager,
+                'productHelper'    => $this->productIndexerHelper,
+                'flatItemEraser'   => $this->flatItemEraser,
+                'flatItemWriter'   => $this->flatItemWriter,
+                'flatTableBuilder' => $this->flatTableBuilder,
             ]
         );
+
+        $objectManager->setBackwardCompatibleProperty($this->model, 'metadataPool', $metadataPool);
     }
 
     /**
@@ -100,9 +145,9 @@ public function testExecuteWithEmptyId()
     public function testExecuteWithNonExistingFlatTablesCreatesTables()
     {
         $this->productIndexerHelper->expects($this->any())->method('getFlatTableName')
-            ->will($this->returnValue('store_flat_table'));
+            ->willReturn('store_flat_table');
         $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
         $this->flatItemEraser->expects($this->never())->method('removeDeletedProducts');
         $this->flatTableBuilder->expects($this->once())->method('build')->with('store_id_1', ['product_id_1']);
         $this->flatItemWriter->expects($this->once())->method('write')->with('store_id_1', 'product_id_1');
@@ -112,9 +157,9 @@ public function testExecuteWithNonExistingFlatTablesCreatesTables()
     public function testExecuteWithExistingFlatTablesCreatesTables()
     {
         $this->productIndexerHelper->expects($this->any())->method('getFlatTableName')
-            ->will($this->returnValue('store_flat_table'));
+            ->willReturn('store_flat_table');
         $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
         $this->flatItemEraser->expects($this->once())->method('removeDeletedProducts');
         $this->flatTableBuilder->expects($this->never())->method('build')->with('store_id_1', ['product_id_1']);
         $this->model->execute('product_id_1');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/ProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/ProcessorTest.php
index 8c63d77b74f53..d30a8da0e77a2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/ProcessorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/ProcessorTest.php
@@ -129,6 +129,9 @@ public function testReindexRow(
         $this->_model->reindexRow(1, $forceReindex);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderReindexRow()
     {
         return [
@@ -198,6 +201,9 @@ public function testReindexList(
         $this->_model->reindexList([1], $forceReindex);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderReindexList()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/System/Config/ModeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/System/Config/ModeTest.php
index ca67185203738..34cc5c70418b9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/System/Config/ModeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/System/Config/ModeTest.php
@@ -50,6 +50,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcessValueEqual()
     {
         return [['0', '0'], ['', '0'], ['0', ''], ['1', '1']];
@@ -84,6 +87,9 @@ public function testProcessValueEqual($oldValue, $value)
         $this->model->processValue();
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcessValueOn()
     {
         return [['0', '1'], ['', '1']];
@@ -134,6 +140,9 @@ public function testProcessValueOn($oldValue, $value)
         $this->model->processValue();
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcessValueOff()
     {
         return [['1', '0'], ['1', '']];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/WebsiteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/WebsiteTest.php
index d551822d975ea..f64789a2a3d82 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/WebsiteTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/WebsiteTest.php
@@ -5,43 +5,179 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Price\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
+
 class WebsiteTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
-    protected $_objectManager;
+    protected $objectManager;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website
      */
-    protected $_model;
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\Indexer\DimensionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $dimensionFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tableMaintainer;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor|\PHPUnit_Framework_MockObject_MockObject
+     * @var DimensionModeConfiguration|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_priceProcessorMock;
+    protected $dimensionModeConfiguration;
 
     protected function setUp()
     {
-        $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->_priceProcessorMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Indexer\Product\Price\Processor::class,
-            ['markIndexerAsInvalid']
+        $this->dimensionFactory = $this->createPartialMock(
+            \Magento\Framework\Indexer\DimensionFactory::class,
+            ['create']
         );
 
-        $this->_model = $this->_objectManager->getObject(
+        $this->tableMaintainer = $this->createPartialMock(
+            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class,
+            ['dropTablesForDimensions', 'createTablesForDimensions']
+        );
+
+        $this->dimensionModeConfiguration = $this->createPartialMock(
+            DimensionModeConfiguration::class,
+            ['getDimensionConfiguration']
+        );
+
+        $this->model = $this->objectManager->getObject(
             \Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website::class,
-            ['processor' => $this->_priceProcessorMock]
+            [
+                'dimensionFactory' => $this->dimensionFactory,
+                'tableMaintainer' => $this->tableMaintainer,
+                'dimensionModeConfiguration' => $this->dimensionModeConfiguration,
+            ]
         );
     }
 
     public function testAfterDelete()
     {
-        $this->_priceProcessorMock->expects($this->once())->method('markIndexerAsInvalid');
+        $dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+
+        $this->dimensionFactory->expects($this->once())->method('create')->willReturn(
+            $dimensionMock
+        );
+        $this->tableMaintainer->expects($this->once())->method('dropTablesForDimensions')->with(
+            [$dimensionMock]
+        );
+
+        $this->dimensionModeConfiguration->expects($this->once())->method('getDimensionConfiguration')->willReturn(
+            [\Magento\Store\Model\Indexer\WebsiteDimensionProvider::DIMENSION_NAME]
+        );
+
+        $subjectMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $objectResourceMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $websiteMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->assertEquals(
+            $objectResourceMock,
+            $this->model->afterDelete($subjectMock, $objectResourceMock, $websiteMock)
+        );
+    }
+
+    public function testAfterDeleteOnModeWithoutWebsiteDimension()
+    {
+        $dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+
+        $this->dimensionFactory->expects($this->never())->method('create')->willReturn(
+            $dimensionMock
+        );
+        $this->tableMaintainer->expects($this->never())->method('dropTablesForDimensions')->with(
+            [$dimensionMock]
+        );
 
-        $websiteMock = $this->createMock(\Magento\Store\Model\ResourceModel\Website::class);
-        $this->assertEquals('return_value', $this->_model->afterDelete($websiteMock, 'return_value'));
+        $this->dimensionModeConfiguration->expects($this->once())->method('getDimensionConfiguration')->willReturn(
+            []
+        );
+
+        $subjectMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $objectResourceMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $websiteMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->assertEquals(
+            $objectResourceMock,
+            $this->model->afterDelete($subjectMock, $objectResourceMock, $websiteMock)
+        );
+    }
+
+    public function testAfterSave()
+    {
+        $dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+
+        $this->dimensionFactory->expects($this->once())->method('create')->willReturn(
+            $dimensionMock
+        );
+        $this->tableMaintainer->expects($this->once())->method('createTablesForDimensions')->with(
+            [$dimensionMock]
+        );
+
+        $this->dimensionModeConfiguration->expects($this->once())->method('getDimensionConfiguration')->willReturn(
+            [\Magento\Store\Model\Indexer\WebsiteDimensionProvider::DIMENSION_NAME]
+        );
+
+        $subjectMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $objectResourceMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $websiteMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $websiteMock->expects($this->once())
+            ->method('isObjectNew')
+            ->willReturn(true);
+
+        $this->assertEquals(
+            $objectResourceMock,
+            $this->model->afterSave($subjectMock, $objectResourceMock, $websiteMock)
+        );
+    }
+
+    public function testAfterSaveOnModeWithoutWebsiteDimension()
+    {
+        $dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+
+        $this->dimensionFactory->expects($this->never())->method('create')->willReturn(
+            $dimensionMock
+        );
+        $this->tableMaintainer->expects($this->never())->method('createTablesForDimensions')->with(
+            [$dimensionMock]
+        );
+
+        $this->dimensionModeConfiguration->expects($this->once())->method('getDimensionConfiguration')->willReturn(
+            []
+        );
+
+        $subjectMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $objectResourceMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class);
+        $websiteMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
+        $websiteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $websiteMock->expects($this->once())
+            ->method('isObjectNew')
+            ->willReturn(true);
+
+        $this->assertEquals(
+            $objectResourceMock,
+            $this->model->afterSave($subjectMock, $objectResourceMock, $websiteMock)
+        );
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/CategoryTest.php
index 3e5daf1a98a9c..257a84e50248d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/CategoryTest.php
@@ -77,6 +77,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return \Magento\Catalog\Model\Layer\Filter\DataProvider\Category
+     */
     public function testGetCategoryWithAppliedId()
     {
         $storeId = 1234;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
index 3a23ebcdf4518..8ca23df31cdee 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -152,7 +152,7 @@ public function testGetMaxPrice()
         $this->productCollection->expects($this->once())
             ->method('getMaxPrice')
             ->will($this->returnValue($maxPrice));
-        $this->assertSame(floatval($maxPrice), $this->target->getMaxPrice());
+        $this->assertSame((float)$maxPrice, $this->target->getMaxPrice());
     }
 
     /**
@@ -165,6 +165,9 @@ public function testValidateFilter($filter, $expectedResult)
         $this->assertSame($expectedResult, $this->target->validateFilter($filter));
     }
 
+    /**
+     * @return array
+     */
     public function validateFilterDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Locator/RegistryLocatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Locator/RegistryLocatorTest.php
index fceb29295b6e1..b2810ddea2413 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Locator/RegistryLocatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Locator/RegistryLocatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Model\Locator;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -83,7 +84,7 @@ public function testGetStore()
 
     /**
      * @expectedException \Magento\Framework\Exception\NotFoundException
-     * @expectedExceptionMessage Product was not registered
+     * @expectedExceptionMessage The product wasn't registered.
      */
     public function testGetProductWithException()
     {
@@ -92,7 +93,7 @@ public function testGetProductWithException()
 
     /**
      * @expectedException \Magento\Framework\Exception\NotFoundException
-     * @expectedExceptionMessage Store was not registered
+     * @expectedExceptionMessage The store wasn't registered. Verify the store and try again.
      */
     public function testGetStoreWithException()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ActionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ActionTest.php
index 8cf075f4d8504..a97e4650b49bd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ActionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ActionTest.php
@@ -164,6 +164,9 @@ public function testUpdateWebsites($type, $methodName)
         $this->assertEquals($this->model->getDataByKey('action_type'), $type);
     }
 
+    /**
+     * @return array
+     */
     public function updateWebsitesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
index 5963d8b161633..3003c2f8085e4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -47,7 +47,7 @@ protected function setUp()
                 'scopeOverriddenValue' => $scopeOverriddenValue
             ]
         );
-        $resource = $this->createPartialMock(\StdClass::class, ['getMainTable']);
+        $resource = $this->createPartialMock(\stdClass::class, ['getMainTable']);
         $resource->expects($this->any())->method('getMainTable')->will($this->returnValue('table'));
 
         $this->_model->expects($this->any())->method('_getResource')->will($this->returnValue($resource));
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/TierpriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/TierpriceTest.php
index ebcf76b739162..db103c3017e04 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -141,6 +141,10 @@ public function testSetPriceData()
     {
         $attributeName = 'tier_price';
         $tierPrices = [
+            [
+                'price' => 0,
+                'all_groups' => 1,
+            ],
             [
                 'price' => 10,
                 'all_groups' => 1,
@@ -153,6 +157,12 @@ public function testSetPriceData()
         $productPrice = 20;
         $allCustomersGroupId = 32000;
         $finalTierPrices = [
+            [
+                'price' => 0,
+                'all_groups' => 1,
+                'website_price' => 0,
+                'cust_group' => 32000,
+            ],
             [
                 'price' => 10,
                 'all_groups' => 1,
@@ -170,8 +180,11 @@ public function testSetPriceData()
             ->disableOriginalConstructor()->getMock();
         $allCustomersGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
             ->disableOriginalConstructor()->getMock();
-        $this->groupManagement->expects($this->once())->method('getAllCustomersGroup')->willReturn($allCustomersGroup);
-        $allCustomersGroup->expects($this->once())->method('getId')->willReturn($allCustomersGroupId);
+        $this->groupManagement
+            ->expects($this->exactly(2))
+            ->method('getAllCustomersGroup')
+            ->willReturn($allCustomersGroup);
+        $allCustomersGroup->expects($this->exactly(2))->method('getId')->willReturn($allCustomersGroupId);
         $object->expects($this->once())->method('getPrice')->willReturn($productPrice);
         $this->attribute->expects($this->atLeastOnce())->method('isScopeGlobal')->willReturn(true);
         $object->expects($this->once())->method('getStoreId')->willReturn(null);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/ImageTest.php
index 115a333a38b5b..3ceedddc2b713 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/ImageTest.php
@@ -3,45 +3,71 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Model\Product\Attribute\Frontend;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Frontend\Image;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
 
-class ImageTest extends \PHPUnit\Framework\TestCase
+class ImageTest extends TestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Product\Attribute\Frontend\Image
+     * @var Image
      */
     private $model;
 
-    public function testGetUrl()
+    /**
+     * @dataProvider getUrlDataProvider
+     * @param string $expectedImage
+     * @param string $productImage
+     */
+    public function testGetUrl(string $expectedImage, string $productImage)
+    {
+        $this->assertEquals($expectedImage, $this->model->getUrl($this->getMockedProduct($productImage)));
+    }
+
+    /**
+     * Data provider for testGetUrl
+     *
+     * @return array
+     */
+    public function getUrlDataProvider(): array
     {
-        $this->assertEquals('catalog/product/img.jpg', $this->model->getUrl($this->getMockedProduct()));
+        return [
+            ['catalog/product/img.jpg', 'img.jpg'],
+            ['catalog/product/img.jpg', '/img.jpg'],
+        ];
     }
 
     protected function setUp()
     {
         $helper = new ObjectManager($this);
         $this->model = $helper->getObject(
-            \Magento\Catalog\Model\Product\Attribute\Frontend\Image::class,
+            Image::class,
             ['storeManager' => $this->getMockedStoreManager()]
         );
         $this->model->setAttribute($this->getMockedAttribute());
     }
 
     /**
-     * @return \Magento\Catalog\Model\Product
+     * @param string $productImage
+     * @return Product
      */
-    private function getMockedProduct()
+    private function getMockedProduct(string $productImage): Product
     {
-        $mockBuilder = $this->getMockBuilder(\Magento\Catalog\Model\Product::class);
+        $mockBuilder = $this->getMockBuilder(Product::class);
         $mock = $mockBuilder->setMethods(['getData', 'getStore', '__wakeup'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $mock->expects($this->any())
             ->method('getData')
-            ->will($this->returnValue('img.jpg'));
+            ->will($this->returnValue($productImage));
 
         $mock->expects($this->any())
             ->method('getStore');
@@ -50,13 +76,13 @@ private function getMockedProduct()
     }
 
     /**
-     * @return \Magento\Store\Model\StoreManagerInterface
+     * @return StoreManagerInterface
      */
-    private function getMockedStoreManager()
+    private function getMockedStoreManager(): StoreManagerInterface
     {
         $mockedStore = $this->getMockedStore();
 
-        $mockBuilder = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class);
+        $mockBuilder = $this->getMockBuilder(StoreManagerInterface::class);
         $mock = $mockBuilder->setMethods(['getStore'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -69,11 +95,11 @@ private function getMockedStoreManager()
     }
 
     /**
-     * @return \Magento\Store\Model\Store
+     * @return Store
      */
-    private function getMockedStore()
+    private function getMockedStore(): Store
     {
-        $mockBuilder = $this->getMockBuilder(\Magento\Store\Model\Store::class);
+        $mockBuilder = $this->getMockBuilder(Store::class);
         $mock = $mockBuilder->setMethods(['getBaseUrl', '__wakeup'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -86,11 +112,11 @@ private function getMockedStore()
     }
 
     /**
-     * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+     * @return AbstractAttribute
      */
-    private function getMockedAttribute()
+    private function getMockedAttribute(): AbstractAttribute
     {
-        $mockBuilder = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class);
+        $mockBuilder = $this->getMockBuilder(AbstractAttribute::class);
         $mockBuilder->setMethods(['getAttributeCode', '__wakeup']);
         $mockBuilder->disableOriginalConstructor();
         $mock = $mockBuilder->getMockForAbstractClass();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/InputType/PresentationTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/InputType/PresentationTest.php
new file mode 100644
index 0000000000000..d3d0285614f08
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/InputType/PresentationTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Product\Attribute\Frontend\InputType;
+
+class PresentationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation
+     */
+    private $presentation;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMock;
+
+    protected function setUp()
+    {
+        $this->presentation = new \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation();
+        $this->attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @param string $inputType
+     * @param boolean $isWysiwygEnabled
+     * @param string $expectedResult
+     * @dataProvider getPresentationInputTypeDataProvider
+     */
+    public function testGetPresentationInputType(string $inputType, bool $isWysiwygEnabled, string $expectedResult)
+    {
+        $this->attributeMock->expects($this->once())->method('getFrontendInput')->willReturn($inputType);
+        $this->attributeMock->expects($this->any())->method('getIsWysiwygEnabled')->willReturn($isWysiwygEnabled);
+        $this->assertEquals($expectedResult, $this->presentation->getPresentationInputType($this->attributeMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function getPresentationInputTypeDataProvider()
+    {
+        return [
+            'attribute_is_textarea_and_wysiwyg_enabled' => ['textarea', true, 'texteditor'],
+            'attribute_is_input_and_wysiwyg_enabled' => ['input', true, 'input'],
+            'attribute_is_textarea_and_wysiwyg_disabled' => ['textarea', false, 'textarea'],
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @param array $expectedResult
+     * @dataProvider convertPresentationDataToInputTypeDataProvider
+     */
+    public function testConvertPresentationDataToInputType(array $data, array $expectedResult)
+    {
+        $this->assertEquals($expectedResult, $this->presentation->convertPresentationDataToInputType($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function convertPresentationDataToInputTypeDataProvider()
+    {
+        return [
+            [['key' => 'value'], ['key' => 'value']],
+            [
+                ['frontend_input' => 'texteditor'],
+                ['frontend_input' => 'textarea', 'is_wysiwyg_enabled' => 1]
+            ],
+            [
+                ['frontend_input' => 'textarea'],
+                ['frontend_input' => 'textarea', 'is_wysiwyg_enabled' => 0]
+            ],
+            [
+                ['frontend_input' => 'input'],
+                ['frontend_input' => 'input']
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
index 03bac570c36ad..1b42b09e5dd32 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
@@ -10,7 +10,6 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Product\Attribute\Repository;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use Magento\Eav\Api\Data\AttributeFrontendLabelInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -72,6 +71,9 @@ class RepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $optionManagementMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->attributeResourceMock =
@@ -116,6 +118,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGet()
     {
         $attributeCode = 'some attribute code';
@@ -128,6 +133,9 @@ public function testGet()
         $this->model->get($attributeCode);
     }
 
+    /**
+     * @return void
+     */
     public function testGetList()
     {
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
@@ -141,6 +149,9 @@ public function testGetList()
         $this->model->getList($searchCriteriaMock);
     }
 
+    /**
+     * @return void
+     */
     public function testDelete()
     {
         $attributeMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
@@ -149,6 +160,9 @@ public function testDelete()
         $this->assertEquals(true, $this->model->delete($attributeMock));
     }
 
+    /**
+     * @return void
+     */
     public function testDeleteById()
     {
         $attributeCode = 'some attribute code';
@@ -164,6 +178,9 @@ public function testDeleteById()
         $this->assertEquals(true, $this->model->deleteById($attributeCode));
     }
 
+    /**
+     * @return void
+     */
     public function testGetCustomAttributesMetadata()
     {
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
@@ -207,7 +224,7 @@ public function testSaveNoSuchEntityException()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage frontend_label is a required field.
+     * @expectedExceptionMessage "frontend_label" is required. Enter and try again.
      */
     public function testSaveInputExceptionRequiredField()
     {
@@ -235,15 +252,18 @@ public function testSaveInputExceptionInvalidFieldValue()
         );
         $attributeMock->expects($this->once())->method('getAttributeId')->willReturn(null);
         $attributeMock->expects($this->once())->method('setAttributeId')->with(null)->willReturnSelf();
-        $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeFrontendLabelInterface::class);
-        $attributeMock->expects($this->exactly(4))->method('getFrontendLabels')->willReturn([$labelMock]);
-        $attributeMock->expects($this->exactly(2))->method('getDefaultFrontendLabel')->willReturn('test');
+        $labelMock = $this->createMock(\Magento\Eav\Model\Entity\Attribute\FrontendLabel::class);
+        $attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);
+        $attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn(null);
         $labelMock->expects($this->once())->method('getStoreId')->willReturn(0);
         $labelMock->expects($this->once())->method('getLabel')->willReturn(null);
 
         $this->model->save($attributeMock);
     }
 
+    /**
+     * @return void
+     */
     public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
     {
         $attributeId = 1;
@@ -260,7 +280,7 @@ public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
             ->method('get')
             ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
             ->willReturn($existingModelMock);
-
+        $existingModelMock->expects($this->once())->method('getDefaultFrontendLabel')->willReturn('default_label');
         // Attribute code must not be changed after attribute creation
         $attributeMock->expects($this->once())->method('setAttributeCode')->with($attributeCode);
         $this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
@@ -269,9 +289,12 @@ public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
         $this->model->save($attributeMock);
     }
 
+    /**
+     * @return void
+     */
     public function testSaveSavesDefaultFrontendLabelIfItIsPresentInPayload()
     {
-        $labelMock = $this->createMock(AttributeFrontendLabelInterface::class);
+        $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeFrontendLabelInterface::class);
         $labelMock->expects($this->any())->method('getStoreId')->willReturn(1);
         $labelMock->expects($this->any())->method('getLabel')->willReturn('Store Scope Label');
 
@@ -280,11 +303,12 @@ public function testSaveSavesDefaultFrontendLabelIfItIsPresentInPayload()
         $attributeMock = $this->createMock(Attribute::class);
         $attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
         $attributeMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
-        $attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn('Default Label');
+        $attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn(null);
         $attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);
         $attributeMock->expects($this->any())->method('getOptions')->willReturn([]);
 
         $existingModelMock = $this->createMock(Attribute::class);
+        $existingModelMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn('Default Label');
         $existingModelMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
         $existingModelMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
 
@@ -295,12 +319,7 @@ public function testSaveSavesDefaultFrontendLabelIfItIsPresentInPayload()
 
         $attributeMock->expects($this->once())
             ->method('setDefaultFrontendLabel')
-            ->with(
-                [
-                    0 => 'Default Label',
-                    1 => 'Store Scope Label'
-                ]
-            );
+            ->with('Default Label');
         $this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
 
         $this->model->save($attributeMock);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetManagementTest.php
index 57168f2c1270c..1f4c4dd378206 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetManagementTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Model\Product\Attribute;
 
 class SetManagementTest extends \PHPUnit\Framework\TestCase
@@ -71,7 +72,6 @@ public function testCreate()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Can not create attribute set based on non product attribute set.
      */
     public function testCreateNonProductAttributeSet()
     {
@@ -91,5 +91,9 @@ public function testCreateNonProductAttributeSet()
             ->willReturn($typeMock);
         $skeletonSetMock->expects($this->once())->method('getEntityTypeId')->willReturn(3);
         $this->model->create($attributeSetMock, $skeletonId);
+
+        $this->expectExceptionMessage(
+            "The attribute set couldn't be created because it's based on a non-product attribute set."
+        );
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php
index 8badf6a235b41..ef3a00e535576 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php
@@ -27,26 +27,40 @@ protected function setUp()
         $this->inputtypeModel = $this->objectManagerHelper->getObject(
             \Magento\Catalog\Model\Product\Attribute\Source\Inputtype::class,
             [
-                'coreRegistry' => $this->registry
+                'coreRegistry' => $this->registry,
+                'optionsArray' => $this->getInputTypeSet()
             ]
         );
     }
 
     public function testToOptionArray()
     {
-        $inputTypesSet = [
-            ['value' => 'text', 'label' => 'Text Field'],
-            ['value' => 'textarea', 'label' => 'Text Area'],
-            ['value' => 'date', 'label' => 'Date'],
-            ['value' => 'boolean', 'label' => 'Yes/No'],
-            ['value' => 'multiselect', 'label' => 'Multiple Select'],
-            ['value' => 'select', 'label' => 'Dropdown'],
+
+        $extraValues = [
             ['value' => 'price', 'label' => 'Price'],
-            ['value' => 'media_image', 'label' => 'Media Image'],
+            ['value' => 'media_image', 'label' => 'Media Image']
         ];
+        $inputTypesSet = $this->getInputTypeSet();
+        $inputTypesSet = array_merge($inputTypesSet, $extraValues);
 
         $this->registry->expects($this->once())->method('registry');
         $this->registry->expects($this->once())->method('register');
         $this->assertEquals($inputTypesSet, $this->inputtypeModel->toOptionArray());
     }
+
+    /**
+     * @return array
+     */
+    private function getInputTypeSet()
+    {
+        return [
+            ['value' => 'text', 'label' => 'Text Field'],
+            ['value' => 'textarea', 'label' => 'Text Area'],
+            ['value' => 'texteditor', 'label' => 'Text Editor'],
+            ['value' => 'date', 'label' => 'Date'],
+            ['value' => 'boolean', 'label' => 'Yes/No'],
+            ['value' => 'multiselect', 'label' => 'Multiple Select'],
+            ['value' => 'select', 'label' => 'Dropdown']
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CartConfigurationTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CartConfigurationTest.php
index 6f1f5e120b100..2144cf34c2a09 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CartConfigurationTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CartConfigurationTest.php
@@ -21,6 +21,9 @@ public function testIsProductConfigured($productType, $config, $expected)
         $this->assertEquals($expected, $cartConfiguration->isProductConfigured($productMock, $config));
     }
 
+    /**
+     * @return array
+     */
     public function isProductConfiguredDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
index 31fd0696db320..e9eee5c766883 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use \Magento\Catalog\Model\Product\Copier;
+use Magento\Catalog\Model\Product;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -54,7 +55,7 @@ protected function setUp()
             \Magento\Catalog\Model\Product\Option\Repository::class
         );
         $this->optionRepositoryMock;
-        $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $this->productMock = $this->createMock(Product::class);
         $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
 
         $this->metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
@@ -106,7 +107,7 @@ public function testCopy()
         $this->productMock->expects($this->once())->method('getResource')->will($this->returnValue($resourceMock));
 
         $duplicateMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
+            Product::class,
             [
                 '__wakeup',
                 'setData',
@@ -147,10 +148,10 @@ public function testCopy()
         )->with(
             \Magento\Store\Model\Store::DEFAULT_STORE_ID
         );
-        $duplicateMock->expects($this->once())->method('setData')->with($productData);
+        $duplicateMock->expects($this->atLeastOnce())->method('setData')->willReturn($duplicateMock);
         $this->copyConstructorMock->expects($this->once())->method('build')->with($this->productMock, $duplicateMock);
         $duplicateMock->expects($this->once())->method('getUrlKey')->willReturn('urk-key-1');
-        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2');
+        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2')->willReturn($duplicateMock);
         $duplicateMock->expects($this->once())->method('save');
 
         $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php
index a01e9814b0579..1c0ea6ee1ed39 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php
@@ -27,8 +27,8 @@ protected function setUp()
 
     public function testCreateWithInvalidType()
     {
-        $this->expectException(
-            '\InvalidArgumentException',
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage(
             'Magento\Framework\DataObject does not implement \Magento\Catalog\Model\Product\CopyConstructorInterface'
         );
         $this->_objectManagerMock->expects($this->never())->method('create');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
index cf49d10416d82..1d12645019d1e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
@@ -65,7 +65,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage The image content is not valid.
+     * @expectedExceptionMessage The image content is invalid. Verify the content and try again.
      */
     public function testCreateWithInvalidImageException()
     {
@@ -82,7 +82,7 @@ public function testCreateWithInvalidImageException()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot save product.
+     * @expectedExceptionMessage The product can't be saved.
      */
     public function testCreateWithCannotSaveException()
     {
@@ -136,7 +136,7 @@ public function testCreate()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no image with provided ID.
+     * @expectedExceptionMessage No image with the provided ID was found. Verify the ID and try again.
      */
     public function testUpdateWithNonExistingImage()
     {
@@ -157,7 +157,7 @@ public function testUpdateWithNonExistingImage()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot save product.
+     * @expectedExceptionMessage The product can't be saved.
      */
     public function testUpdateWithCannotSaveException()
     {
@@ -216,7 +216,7 @@ public function testUpdate()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no image with provided ID.
+     * @expectedExceptionMessage No image with the provided ID was found. Verify the ID and try again.
      */
     public function testRemoveWithNonExistingImage()
     {
@@ -253,7 +253,7 @@ public function testRemove()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Such product doesn't exist
+     * @expectedExceptionMessage The product doesn't exist. Verify and try again.
      */
     public function testGetWithNonExistingProduct()
     {
@@ -266,7 +266,7 @@ public function testGetWithNonExistingProduct()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionText Such image doesn't exist
+     * @expectedExceptionMessage The image doesn't exist. Verify and try again.
      */
     public function testGetWithNonExistingImage()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.php
index d52aad50f05f3..15f003282dc04 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.php
@@ -151,6 +151,9 @@ public function testValidate($value)
         $this->assertEquals(!$value, $this->model->validate($this->dataObject));
     }
 
+    /**
+     * @return array
+     */
     public function validateDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
index f918692cb2753..430db70701356 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
 use Magento\Catalog\Model\View\Asset\Image\ContextFactory;
 use Magento\Catalog\Model\View\Asset\ImageFactory;
 use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\View\Asset\ContextInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -73,10 +73,29 @@ class ImageTest extends \PHPUnit\Framework\TestCase
      */
     private $viewAssetPlaceholderFactory;
 
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cacheManager;
+
+    /**
+     * @var ParamsBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paramsBuilder;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->context = $this->createMock(\Magento\Framework\Model\Context::class);
+        $this->cacheManager = $this->getMockBuilder(\Magento\Framework\App\CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->context->expects($this->any())->method('getCacheManager')->will($this->returnValue($this->cacheManager));
 
         $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManager::class)
             ->disableOriginalConstructor()
@@ -112,25 +131,46 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
+        $this->serializer = $this->getMockBuilder(
+            \Magento\Framework\Serialize\SerializerInterface::class
+        )->getMockForAbstractClass();
+        $this->serializer->expects($this->any())
+            ->method('serialize')
+            ->willReturnCallback(
+                function ($value) {
+                    return json_encode($value);
+                }
+            );
+        $this->serializer->expects($this->any())
+            ->method('unserialize')
+            ->willReturnCallback(
+                function ($value) {
+                    return json_decode($value, true);
+                }
+            );
+        $this->paramsBuilder = $this->getMockBuilder(ParamsBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->image = $objectManager->getObject(
             \Magento\Catalog\Model\Product\Image::class,
             [
+                'context' => $this->context,
                 'storeManager' => $this->storeManager,
                 'catalogProductMediaConfig' => $this->config,
                 'coreFileStorageDatabase' => $this->coreFileHelper,
                 'filesystem' => $this->filesystem,
                 'imageFactory' => $this->factory,
                 'viewAssetImageFactory' => $this->viewAssetImageFactory,
-                'viewAssetPlaceholderFactory' => $this->viewAssetPlaceholderFactory
+                'viewAssetPlaceholderFactory' => $this->viewAssetPlaceholderFactory,
+                'serializer' => $this->serializer,
+                'paramsBuilder' => $this->paramsBuilder
             ]
         );
 
-        // Settings for backward compatible property
-        $objectManagerHelper = new ObjectManagerHelper($this);
         $this->imageAsset = $this->getMockBuilder(\Magento\Framework\View\Asset\LocalInterface::class)
             ->getMockForAbstractClass();
-        $objectManagerHelper->setBackwardCompatibleProperty(
+        $objectManager->setBackwardCompatibleProperty(
             $this->image,
             'imageAsset',
             $this->imageAsset
@@ -182,6 +222,21 @@ public function testSetSize()
 
     public function testSetGetBaseFile()
     {
+        $miscParams = [
+            'image_type' => null,
+            'image_height' => null,
+            'image_width' => null,
+            'keep_aspect_ratio' => 'proportional',
+            'keep_frame' => 'frame',
+            'keep_transparency' => 'transparency',
+            'constrain_only' => 'doconstrainonly',
+            'background' => 'ffffff',
+            'angle' => null,
+            'quality' => 80,
+        ];
+        $this->paramsBuilder->expects(self::once())
+            ->method('build')
+            ->willReturn($miscParams);
         $this->mediaDirectory->expects($this->any())->method('isFile')->will($this->returnValue(true));
         $this->mediaDirectory->expects($this->any())->method('isExist')->will($this->returnValue(true));
         $absolutePath = dirname(dirname(__DIR__)) . '/_files/catalog/product/somefile.png';
@@ -191,18 +246,7 @@ public function testSetGetBaseFile()
             ->method('create')
             ->with(
                 [
-                    'miscParams' => [
-                        'image_type' => null,
-                        'image_height' => null,
-                        'image_width' => null,
-                        'keep_aspect_ratio' => 'proportional',
-                        'keep_frame' => 'frame',
-                        'keep_transparency' => 'transparency',
-                        'constrain_only' => 'doconstrainonly',
-                        'background' => 'ffffff',
-                        'angle' => null,
-                        'quality' => 80,
-                    ],
+                    'miscParams' => $miscParams,
                     'filePath' => '/somefile.png',
                 ]
             )
@@ -212,6 +256,10 @@ public function testSetGetBaseFile()
         $this->imageAsset->expects($this->any())->method('getSourceFile')->willReturn('catalog/product/somefile.png');
         $this->image->setBaseFile('/somefile.png');
         $this->assertEquals('catalog/product/somefile.png', $this->image->getBaseFile());
+        $this->assertEquals(
+            null,
+            $this->image->getNewFile()
+        );
     }
 
     public function testSetBaseNoSelectionFile()
@@ -354,12 +402,16 @@ public function testIsCached()
         $this->testSetGetBaseFile();
         $absolutePath = dirname(dirname(__DIR__)) . '/_files/catalog/product/watermark/somefile.png';
         $this->imageAsset->expects($this->any())->method('getPath')->willReturn($absolutePath);
+        $this->cacheManager->expects($this->once())->method('load')->willReturn(
+            json_encode(['size' => ['image data']])
+        );
         $this->assertTrue($this->image->isCached());
     }
 
     public function testClearCache()
     {
         $this->coreFileHelper->expects($this->once())->method('deleteFolder')->will($this->returnValue(true));
+        $this->cacheManager->expects($this->once())->method('clean');
         $this->image->clearCache();
     }
 
@@ -383,4 +435,24 @@ public function testIsBaseFilePlaceholder()
     {
         $this->assertFalse($this->image->isBaseFilePlaceholder());
     }
+
+    public function testGetResizedImageInfoWithCache()
+    {
+        $absolutePath = dirname(dirname(__DIR__)) . '/_files/catalog/product/watermark/somefile.png';
+        $this->imageAsset->expects($this->any())->method('getPath')->willReturn($absolutePath);
+        $this->cacheManager->expects($this->once())->method('load')->willReturn(
+            json_encode(['size' => ['image data']])
+        );
+        $this->cacheManager->expects($this->never())->method('save');
+        $this->assertEquals(['image data'], $this->image->getResizedImageInfo());
+    }
+
+    public function testGetResizedImageInfoEmptyCache()
+    {
+        $absolutePath = dirname(dirname(__DIR__)) . '/_files/catalog/product/watermark/somefile.png';
+        $this->imageAsset->expects($this->any())->method('getPath')->willReturn($absolutePath);
+        $this->cacheManager->expects($this->once())->method('load')->willReturn(false);
+        $this->cacheManager->expects($this->once())->method('save');
+        $this->assertTrue(is_array($this->image->getResizedImageInfo()));
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php
index ecf595fa50889..e242b77f1a5fc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php
@@ -118,6 +118,9 @@ public function testGetItemAttributes($type, $typeId)
         $this->assertEquals($expectedResult, $this->model->getItemAttributes($type));
     }
 
+    /**
+     * @return array
+     */
     public function getItemAttributesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
index ec6aa9d8db83a..fd7283903869d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Model\Product\Option;
 
 use \Magento\Catalog\Model\Product\Option\Repository;
@@ -199,7 +200,7 @@ public function testDeleteByIdentifierWhenCannotRemoveOption()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage ProductSku should be specified
+     * @expectedExceptionMessage The ProductSku is empty. Set the ProductSku and try again.
      */
     public function testSaveCouldNotSaveException()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
index 1eb5f1a2dacd2..da6b790fedfa6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -18,6 +18,9 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -60,31 +63,30 @@ public function isValidTitleDataProvider()
     {
         $mess = ['option required fields' => 'Missed values for option required fields'];
         return [
-            ['option_title', 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
-            ['option_title', 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 0]), [], true],
-            [null, 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
-            [null, 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 0]), $mess, false],
+            ['option_title', 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
+            ['option_title', 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 0]), [], true],
+            [null, 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
+            [null, 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 0]), $mess, false],
         ];
     }
 
     /**
-     * @param $title
-     * @param $type
-     * @param $priceType
-     * @param $price
-     * @param $product
-     * @param $messages
-     * @param $result
+     * @param string $title
+     * @param string $type
+     * @param string $priceType
+     * @param \Magento\Framework\DataObject $product
+     * @param array $messages
+     * @param bool $result
      * @dataProvider isValidTitleDataProvider
      */
-    public function testIsValidTitle($title, $type, $priceType, $price, $product, $messages, $result)
+    public function testIsValidTitle($title, $type, $priceType, $product, $messages, $result)
     {
-        $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
+        $methods = ['getTitle', 'getType', 'getPriceType', '__wakeup', 'getProduct'];
         $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
         $valueMock->expects($this->once())->method('getTitle')->will($this->returnValue($title));
         $valueMock->expects($this->any())->method('getType')->will($this->returnValue($type));
         $valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue($priceType));
-        $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
+       // $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
         $this->assertEquals($result, $this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
@@ -104,7 +106,7 @@ public function isValidFailDataProvider()
     }
 
     /**
-     * @param $product
+     * @param \Magento\Framework\DataObject $product
      * @dataProvider isValidFailDataProvider
      */
     public function testIsValidFail($product)
@@ -124,41 +126,4 @@ public function testIsValidFail($product)
         $this->assertFalse($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
-
-    /**
-     * Data provider for testValidationNegativePrice
-     * @return array
-     */
-    public function validationNegativePriceDataProvider()
-    {
-        return [
-            ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 1])],
-            ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 0])],
-        ];
-    }
-
-    /**
-     * @param $title
-     * @param $type
-     * @param $priceType
-     * @param $price
-     * @param $product
-     * @dataProvider validationNegativePriceDataProvider
-     */
-    public function testValidationNegativePrice($title, $type, $priceType, $price, $product)
-    {
-        $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
-        $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
-        $valueMock->expects($this->once())->method('getTitle')->will($this->returnValue($title));
-        $valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue($type));
-        $valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue($priceType));
-        $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
-        $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
-
-        $messages = [
-            'option values' => 'Invalid option value',
-        ];
-        $this->assertFalse($this->validator->isValid($valueMock));
-        $this->assertEquals($messages, $this->validator->getMessages());
-    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
index 3c06db0e7ce5f..2de993c075514 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
@@ -18,6 +18,9 @@ class FileTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -54,24 +57,34 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidSuccess()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
         $this->valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue('name 1.1'));
-        $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
-        $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
+        $this->valueMock->method('getPriceType')
+            ->willReturn('fixed');
+        $this->valueMock->method('getPrice')
+            ->willReturn(10);
         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeY')->will($this->returnValue(15));
         $this->assertEmpty($this->validator->getMessages());
         $this->assertTrue($this->validator->isValid($this->valueMock));
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidWithNegativeImageSize()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
         $this->valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue('name 1.1'));
-        $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
-        $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
+        $this->valueMock->method('getPriceType')
+            ->willReturn('fixed');
+        $this->valueMock->method('getPrice')
+            ->willReturn(10);
         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(-10));
         $this->valueMock->expects($this->never())->method('getImageSizeY');
         $messages = [
@@ -81,12 +94,17 @@ public function testIsValidWithNegativeImageSize()
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidWithNegativeImageSizeY()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
         $this->valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue('name 1.1'));
-        $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
-        $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
+        $this->valueMock->method('getPriceType')
+            ->willReturn('fixed');
+        $this->valueMock->method('getPrice')
+            ->willReturn(10);
         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeY')->will($this->returnValue(-10));
         $messages = [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
index 046ee703c850e..b97783edf856c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
@@ -18,6 +18,9 @@ class SelectTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -69,6 +72,9 @@ public function testIsValidSuccess($expectedResult, array $value)
         $this->assertEquals($expectedResult, $this->validator->isValid($this->valueMock));
     }
 
+    /**
+     * @return array
+     */
     public function isValidSuccessDataProvider()
     {
         return [
@@ -87,7 +93,7 @@ public function isValidSuccessDataProvider()
                 ]
             ],
             [
-                false,
+                true,
                 [
                     'title' => 'Some Title',
                     'price_type' => 'fixed',
@@ -97,6 +103,9 @@ public function isValidSuccessDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidateWithInvalidOptionValues()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
@@ -115,6 +124,9 @@ public function testIsValidateWithInvalidOptionValues()
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidateWithEmptyValues()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
@@ -154,10 +166,12 @@ public function testIsValidateWithInvalidData($priceType, $price, $title)
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 
+    /**
+     * @return array
+     */
     public function isValidateWithInvalidDataDataProvider()
     {
         return [
-            'invalid_price' => ['fixed', -10, 'Title'],
             'invalid_price_type' => ['some_value', '10', 'Title'],
             'empty_title' => ['fixed', 10, null]
         ];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
index cf31d67817684..4881154728ddc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
@@ -18,6 +18,9 @@ class TextTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
@@ -54,23 +57,33 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidSuccess()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
         $this->valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue('name 1.1'));
-        $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
-        $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
+        $this->valueMock->method('getPriceType')
+            ->willReturn('fixed');
+        $this->valueMock->method('getPrice')
+            ->willReturn(10);
         $this->valueMock->expects($this->once())->method('getMaxCharacters')->will($this->returnValue(10));
         $this->assertTrue($this->validator->isValid($this->valueMock));
         $this->assertEmpty($this->validator->getMessages());
     }
 
+    /**
+     * @return void
+     */
     public function testIsValidWithNegativeMaxCharacters()
     {
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
         $this->valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue('name 1.1'));
-        $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
-        $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
+        $this->valueMock->method('getPriceType')
+            ->willReturn('fixed');
+        $this->valueMock->method('getPrice')
+            ->willReturn(10);
         $this->valueMock->expects($this->once())->method('getMaxCharacters')->will($this->returnValue(-10));
         $messages = [
             'option values' => 'Invalid option value',
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
index a2d31f377e925..1ff5bef78cd79 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
@@ -19,6 +19,32 @@ class ValueTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var \Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator
+     */
+    private $customOptionPriceCalculatorMock;
+
+    protected function setUp()
+    {
+        $mockedResource = $this->getMockedResource();
+        $mockedCollectionFactory = $this->getMockedValueCollectionFactory();
+
+        $this->customOptionPriceCalculatorMock = $this->createMock(
+            \Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator::class
+        );
+
+        $helper = new ObjectManager($this);
+        $this->model = $helper->getObject(
+            \Magento\Catalog\Model\Product\Option\Value::class,
+            [
+                'resource' => $mockedResource,
+                'valueCollectionFactory' => $mockedCollectionFactory,
+                'customOptionPriceCalculator' => $this->customOptionPriceCalculatorMock,
+            ]
+        );
+        $this->model->setOption($this->getMockedOption());
+    }
+
     public function testSaveProduct()
     {
         $this->model->setValues([100])
@@ -35,11 +61,16 @@ public function testSaveProduct()
 
     public function testGetPrice()
     {
-        $this->model->setPrice(1000);
+        $price = 1000;
+        $this->model->setPrice($price);
         $this->model->setPriceType(Value::TYPE_PERCENT);
-        $this->assertEquals(1000, $this->model->getPrice(false));
+        $this->assertEquals($price, $this->model->getPrice(false));
 
-        $this->assertEquals(100, $this->model->getPrice(true));
+        $percentPice = 100;
+        $this->customOptionPriceCalculatorMock->expects($this->atLeastOnce())
+            ->method('getOptionPriceByPriceCode')
+            ->willReturn($percentPice);
+        $this->assertEquals($percentPice, $this->model->getPrice(true));
     }
 
     public function testGetValuesCollection()
@@ -78,23 +109,6 @@ public function testDeleteValue()
         $this->assertInstanceOf(\Magento\Catalog\Model\Product\Option\Value::class, $this->model->deleteValue(1));
     }
 
-    protected function setUp()
-    {
-        $mockedResource = $this->getMockedResource();
-        $mockedCollectionFactory = $this->getMockedValueCollectionFactory();
-        $mockedContext = $this->getMockedContext();
-        $helper = new ObjectManager($this);
-        $this->model = $helper->getObject(
-            \Magento\Catalog\Model\Product\Option\Value::class,
-            [
-                'resource' => $mockedResource,
-                'valueCollectionFactory' => $mockedCollectionFactory,
-                'context' => $mockedContext
-            ]
-        );
-        $this->model->setOption($this->getMockedOption());
-    }
-
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory
      */
@@ -104,8 +118,8 @@ private function getMockedValueCollectionFactory()
 
         $mockBuilder =
             $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor();
+                ->setMethods(['create'])
+                ->disableOriginalConstructor();
         $mock = $mockBuilder->getMock();
 
         $mock->expects($this->any())
@@ -164,13 +178,27 @@ private function getMockedOption()
     private function getMockedProduct()
     {
         $mockBuilder = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->setMethods(['getFinalPrice', '__wakeup'])
+            ->setMethods(['getPriceInfo', '__wakeup'])
             ->disableOriginalConstructor();
         $mock = $mockBuilder->getMock();
 
-        $mock->expects($this->any())
-            ->method('getFinalPrice')
-            ->will($this->returnValue(10));
+        $priceInfoMock = $this->getMockForAbstractClass(
+            \Magento\Framework\Pricing\PriceInfoInterface::class,
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getPrice']
+        );
+
+        $priceMock = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Price\PriceInterface::class);
+
+        $priceInfoMock->expects($this->any())->method('getPrice')->willReturn($priceMock);
+
+        $mock->expects($this->any())->method('getPriceInfo')->willReturn($priceInfoMock);
+
+        $priceMock->expects($this->any())->method('getValue')->willReturn(10);
 
         return $mock;
     }
@@ -229,61 +257,4 @@ private function getMockedResource()
 
         return $mock;
     }
-
-    /**
-     * @return \Magento\Framework\Model\Context
-     */
-    private function getMockedContext()
-    {
-        $mockedRemoveAction = $this->getMockedRemoveAction();
-        $mockEventManager = $this->getMockedEventManager();
-
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-            ->setMethods(['getActionValidator', 'getEventDispatcher'])
-            ->disableOriginalConstructor();
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('getActionValidator')
-            ->will($this->returnValue($mockedRemoveAction));
-
-        $mock->expects($this->any())
-            ->method('getEventDispatcher')
-            ->will($this->returnValue($mockEventManager));
-
-        return $mock;
-    }
-
-    /**
-     * @return RemoveAction
-     */
-    private function getMockedRemoveAction()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-            ->setMethods(['isAllowed'])
-            ->disableOriginalConstructor();
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('isAllowed')
-            ->will($this->returnValue(true));
-
-        return $mock;
-    }
-
-    /**
-     * @return \Magento\Framework\Event\ManagerInterface
-     */
-    private function getMockedEventManager()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->setMethods(['dispatch'])
-            ->disableOriginalConstructor();
-        $mock = $mockBuilder->getMockForAbstractClass();
-
-        $mock->expects($this->any())
-            ->method('dispatch');
-
-        return $mock;
-    }
 }
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 cd0af47180974..1bd85c4053263 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/Product/Price/SpecialPriceStorageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/SpecialPriceStorageTest.php
index c2337d1abdb6a..e2bd4e9c10b97 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/SpecialPriceStorageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/SpecialPriceStorageTest.php
@@ -178,7 +178,7 @@ public function testUpdateWithInvalidSku()
             ->with(
                 1,
                 __(
-                    'Requested product doesn\'t exist. '
+                    'The product that was requested doesn\'t exist. Verify the product and try again. '
                     . 'Row ID: SKU = %SKU, Store ID: %storeId, Price From: %priceFrom, Price To: %priceTo.',
                     [
                         'SKU' => 'sku_1',
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php
index c9288790ed6e1..a97f2281125a6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceStorageTest.php
@@ -152,6 +152,30 @@ public function testGet()
         $this->assertEquals(2, count($prices));
     }
 
+    /**
+     * Test get method without tierprices.
+     *
+     * @return void
+     */
+    public function testGetWithoutTierPrices()
+    {
+        $skus = ['simple', 'virtual'];
+        $this->tierPriceValidator
+            ->expects($this->once())
+            ->method('validateSkus')
+            ->with($skus)
+            ->willReturn($skus);
+        $this->productIdLocator->expects($this->atLeastOnce())
+            ->method('retrieveProductIdsBySkus')
+            ->with(['simple', 'virtual'])
+            ->willReturn(['simple' => ['2' => 'simple'], 'virtual' => ['3' => 'virtual']]);
+        $this->tierPricePersistence->expects($this->once())->method('get')->willReturn([]);
+        $this->tierPricePersistence->expects($this->never())->method('getEntityLinkField');
+        $this->tierPriceFactory->expects($this->never())->method('create');
+        $prices = $this->tierPriceStorage->get($skus);
+        $this->assertEmpty($prices);
+    }
+
     /**
      * Test update method.
      *
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
index 1d0f89f320772..6029a2b820086 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
@@ -54,7 +54,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedMessage This product doesn't have tier price
+     * @expectedExceptionMessage Product hasn't group price with such data: customerGroupId = '1', website = 1, qty = 3
      */
     public function testRemoveWhenTierPricesNotExists()
     {
@@ -70,7 +70,7 @@ public function testRemoveWhenTierPricesNotExists()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedMessage For current  customerGroupId = '10' with 'qty' = 15 any tier price exist'.
+     * @expectedExceptionMessage Product hasn't group price with such data: customerGroupId = '10', website = 1, qty = 5
      */
     public function testRemoveTierPriceForNonExistingCustomerGroup()
     {
@@ -81,7 +81,7 @@ public function testRemoveTierPriceForNonExistingCustomerGroup()
             ->will($this->returnValue($this->prices));
         $this->productMock->expects($this->never())->method('setData');
         $this->productRepositoryMock->expects($this->never())->method('save');
-        $this->priceModifier->removeTierPrice($this->productMock, 10, 15, 1);
+        $this->priceModifier->removeTierPrice($this->productMock, 10, 5, 1);
     }
 
     public function testSuccessfullyRemoveTierPriceSpecifiedForAllGroups()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php
index 84a9e9ded094b..3789ba4ee126d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php
@@ -112,6 +112,9 @@ public function testGetCurrentPageNoParam()
         $this->assertEquals(1, $this->toolbarModel->getCurrentPage());
     }
 
+    /**
+     * @return array
+     */
     public function stringParamProvider()
     {
         return [
@@ -119,6 +122,9 @@ public function stringParamProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function intParamProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php
index 7506b4adc1d3a..5080e64f46e27 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ReservedAttributeListTest.php
@@ -40,6 +40,9 @@ public function testIsReservedAttribute($isUserDefined, $attributeCode, $expecte
         $this->assertEquals($expected, $this->model->isReservedAttribute($attribute));
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
index c57040f24266d..ae479a9b34d48 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
@@ -151,6 +151,9 @@ public function testGetList($configValue, $customerGroupId, $groupData, $expecte
         }
     }
 
+    /**
+     * @return array
+     */
     public function getListDataProvider()
     {
         return [
@@ -192,7 +195,7 @@ public function testSuccessDeleteTierPrice()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @message Such product doesn't exist
+     * @expectedExceptionMessage No such entity.
      */
     public function testDeleteTierPriceFromNonExistingProduct()
     {
@@ -328,7 +331,7 @@ public function testSetUpdatedPriceWithGlobalPriceScope()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Values of following attributes are invalid: attr1, attr2
+     * @expectedExceptionMessage Values in the attr1, attr2 attributes are invalid. Verify the values and try again.
      */
     public function testSetThrowsExceptionIfDoesntValidate()
     {
@@ -403,6 +406,9 @@ public function testAddWithInvalidData($price, $qty)
         $this->service->add('product_sku', 1, $price, $qty);
     }
 
+    /**
+     * @return array
+     */
     public function addDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/AbstractTypeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/AbstractTypeTest.php
index dcddab60fb0b9..b34375256a959 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/AbstractTypeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/AbstractTypeTest.php
@@ -96,6 +96,9 @@ public function testAttributesCompare($attr1, $attr2, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->attributesCompare($attribute, $attribute2));
     }
 
+    /**
+     * @return array
+     */
     public function attributeCompareProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
index 9fa820d64bae1..ef7aad2cbb802 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
@@ -169,6 +169,9 @@ public function testGetUrl(
         }
     }
 
+    /**
+     * @return array
+     */
     public function getUrlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductAttributeGroupRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductAttributeGroupRepositoryTest.php
index 14f0cbdf9ab68..5c3e9a429317c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductAttributeGroupRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductAttributeGroupRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Model;
 
 class ProductAttributeGroupRepositoryTest extends \PHPUnit\Framework\TestCase
@@ -121,7 +122,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Attribute group that contains system attributes can not be deleted
+     * @expectedExceptionMessage The attribute group can't be deleted because it contains system attributes.
      */
     public function testDeleteThrowsExceptionIfGroupHasSystemAttributes()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php
index b730e12ca820b..b9cb82274c808 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductIdLocatorTest.php
@@ -58,7 +58,16 @@ public function testRetrieveProductIdsBySkus()
     {
         $skus = ['sku_1', 'sku_2'];
         $collection = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Collection::class)
-            ->setMethods(['getIterator', 'addFieldToFilter'])
+            ->setMethods(
+                [
+                    'getItems',
+                    'addFieldToFilter',
+                    'setPageSize',
+                    'getLastPageNumber',
+                    'setCurPage',
+                    'clear'
+                ]
+            )
             ->disableOriginalConstructor()->getMock();
         $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->setMethods(['getSku', 'getData', 'getTypeId'])
@@ -69,7 +78,11 @@ public function testRetrieveProductIdsBySkus()
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $collection->expects($this->once())->method('addFieldToFilter')
             ->with(\Magento\Catalog\Api\Data\ProductInterface::SKU, ['in' => $skus])->willReturnSelf();
-        $collection->expects($this->once())->method('getIterator')->willReturn(new \ArrayIterator([$product]));
+        $collection->expects($this->atLeastOnce())->method('getItems')->willReturn([$product]);
+        $collection->expects($this->atLeastOnce())->method('setPageSize')->willReturnSelf();
+        $collection->expects($this->atLeastOnce())->method('getLastPageNumber')->willReturn(1);
+        $collection->expects($this->atLeastOnce())->method('setCurPage')->with(1)->willReturnSelf();
+        $collection->expects($this->atLeastOnce())->method('clear')->willReturnSelf();
         $this->metadataPool
             ->expects($this->once())
             ->method('getMetadata')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
index f9b3af4c7a3bc..ab52d87f56291 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
@@ -79,7 +79,7 @@ public function testGetLinkedItemsByType()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Unknown link type: bad type
+     * @expectedExceptionMessage The "bad type" link type is unknown. Verify the type and try again.
      */
     public function testGetLinkedItemsByTypeWithWrongType()
     {
@@ -132,7 +132,7 @@ public function testSetProductLinks()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage linkType is a required field.
+     * @expectedExceptionMessage "linkType" is required. Enter and try again.
      */
     public function testSetProductLinksWithoutLinkTypeInLink()
     {
@@ -154,7 +154,7 @@ public function testSetProductLinksWithoutLinkTypeInLink()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Provided link type "bad type" does not exist
+     * @expectedExceptionMessage The "bad type" link type wasn't found. Verify the type and try again.
      */
     public function testSetProductLinksThrowExceptionIfProductLinkTypeDoesNotExist()
     {
@@ -181,7 +181,7 @@ public function testSetProductLinksThrowExceptionIfProductLinkTypeDoesNotExist()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testSetProductLinksNoProductException()
     {
@@ -205,7 +205,9 @@ public function testSetProductLinksNoProductException()
             ->method('get')
             ->will(
                 $this->throwException(
-                    new \Magento\Framework\Exception\NoSuchEntityException(__('Requested product doesn\'t exist'))
+                    new \Magento\Framework\Exception\NoSuchEntityException(
+                        __("The product that was requested doesn't exist. Verify the product and try again.")
+                    )
                 )
             );
         $this->model->setProductLinks($productSku, $links);
@@ -213,7 +215,7 @@ public function testSetProductLinksNoProductException()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Invalid data provided for linked products
+     * @expectedExceptionMessage The linked products data is invalid. Verify the data and try again.
      */
     public function testSetProductLinksInvalidDataException()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
index 56aca8d205302..88815f562b5fe 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
@@ -137,7 +137,7 @@ public function testSave()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Invalid data provided for linked products
+     * @expectedExceptionMessage The linked products data is invalid. Verify the data and try again.
      */
     public function testSaveWithException()
     {
@@ -208,7 +208,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Invalid data provided for linked products
+     * @expectedExceptionMessage The linked products data is invalid. Verify the data and try again.
      */
     public function testDeleteWithInvalidDataException()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
index 7470f1fc71c8e..c729a0c58e1ec 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -4,16 +4,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Test\Unit\Model;
 
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\ImageContentValidator;
+use Magento\Framework\Api\ImageContentValidatorInterface;
+use Magento\Framework\Api\ImageProcessorInterface;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\DB\Adapter\ConnectionException;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class ProductRepositoryTest
@@ -25,127 +45,127 @@
 class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Product|MockObject
      */
-    protected $productMock;
+    protected $product;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Product|MockObject
      */
-    protected $initializedProductMock;
+    private $initializedProduct;
 
     /**
-     * @var \Magento\Catalog\Model\ProductRepository
+     * @var ProductRepository
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Helper|MockObject
      */
-    protected $initializationHelperMock;
+    private $initializationHelper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Product|MockObject
      */
-    protected $resourceModelMock;
+    private $resourceModel;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ProductFactory|MockObject
      */
-    protected $productFactoryMock;
+    private $productFactory;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|MockObject
      */
-    protected $collectionFactoryMock;
+    private $collectionFactory;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var SearchCriteriaBuilder|MockObject
      */
-    protected $searchCriteriaBuilderMock;
+    private $searchCriteriaBuilder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var FilterBuilder|MockObject
      */
-    protected $filterBuilderMock;
+    private $filterBuilder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ProductAttributeRepositoryInterface|MockObject
      */
-    protected $metadataServiceMock;
+    private $metadataService;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ProductSearchResultsInterfaceFactory|MockObject
      */
-    protected $searchResultsFactoryMock;
+    private $searchResultsFactory;
 
     /**
-     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var ExtensibleDataObjectConverter|MockObject
      */
-    protected $eavConfigMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $extensibleDataObjectConverterMock;
+    private $extensibleDataObjectConverter;
 
     /**
      * @var array data to create product
      */
-    protected $productData = [
+    private $productData = [
         'sku' => 'exisiting',
         'name' => 'existing product',
     ];
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Filesystem
+     * @var Filesystem|MockObject
      */
-    protected $fileSystemMock;
+    private $fileSystem;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap
+     * @var MimeTypeExtensionMap|MockObject
      */
-    protected $mimeTypeExtensionMapMock;
+    private $mimeTypeExtensionMap;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ImageContentInterfaceFactory|MockObject
      */
-    protected $contentFactoryMock;
+    private $contentFactory;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Api\ImageContentValidator
+     * @var ImageContentValidator|MockObject
      */
-    protected $contentValidatorMock;
+    private $contentValidator;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var LinkTypeProvider|MockObject
      */
-    protected $linkTypeProviderMock;
+    private $linkTypeProvider;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Api\ImageProcessorInterface
+     * @var ImageProcessorInterface|MockObject
      */
-    protected $imageProcessorMock;
+    private $imageProcessor;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
-    protected $storeManagerMock;
+    private $storeManager;
 
     /**
      * @var \Magento\Catalog\Model\Product\Gallery\Processor|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $mediaGalleryProcessor;
+    private $mediaGalleryProcessor;
 
     /**
      * @var CollectionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $collectionProcessorMock;
+    private $collectionProcessor;
+
+    /**
+     * @var ProductExtensionInterface|MockObject
+     */
+    private $productExtension;
 
     /**
      * @var Json|\PHPUnit_Framework_MockObject_MockObject
@@ -164,12 +184,12 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->productFactoryMock = $this->createPartialMock(
+        $this->productFactory = $this->createPartialMock(
             \Magento\Catalog\Model\ProductFactory::class,
             ['create', 'setData']
         );
 
-        $this->productMock = $this->createPartialMock(
+        $this->product = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
             [
                 'getId',
@@ -179,11 +199,12 @@ protected function setUp()
                 'load',
                 'setData',
                 'getStoreId',
-                'getMediaGalleryEntries'
+                'getMediaGalleryEntries',
+                'getExtensionAttributes'
             ]
         );
 
-        $this->initializedProductMock = $this->createPartialMock(
+        $this->initializedProduct = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
             [
                 'getWebsiteIds',
@@ -199,66 +220,66 @@ protected function setUp()
                 'validate',
                 'save',
                 'getMediaGalleryEntries',
+                'getExtensionAttributes'
             ]
         );
-        $this->initializedProductMock->expects($this->any())
+        $this->initializedProduct->expects($this->any())
             ->method('hasGalleryAttribute')
             ->willReturn(true);
-        $this->filterBuilderMock = $this->createMock(\Magento\Framework\Api\FilterBuilder::class);
-        $this->initializationHelperMock = $this->createMock(
-            \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::class
-        );
-        $this->collectionFactoryMock = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class,
-            ['create']
-        );
-        $this->searchCriteriaBuilderMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaBuilder::class);
-        $this->metadataServiceMock = $this->createMock(\Magento\Catalog\Api\ProductAttributeRepositoryInterface::class);
-        $this->searchResultsFactoryMock = $this->createPartialMock(
+        $this->filterBuilder = $this->createMock(FilterBuilder::class);
+        $this->initializationHelper = $this->createMock(Helper::class);
+        $this->collectionFactory = $this->createPartialMock(CollectionFactory::class, ['create']);
+        $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);
+        $this->metadataService = $this->createMock(ProductAttributeRepositoryInterface::class);
+        $this->searchResultsFactory = $this->createPartialMock(
             \Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory::class,
             ['create']
         );
-        $this->resourceModelMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $this->resourceModel = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
         $this->objectManager = new ObjectManager($this);
-        $this->extensibleDataObjectConverterMock = $this
-            ->getMockBuilder(\Magento\Framework\Api\ExtensibleDataObjectConverter::class)
+        $this->extensibleDataObjectConverter = $this
+            ->getMockBuilder(ExtensibleDataObjectConverter::class)
             ->setMethods(['toNestedArray'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->fileSystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
+        $this->fileSystem = $this->getMockBuilder(Filesystem::class)
             ->disableOriginalConstructor()->getMock();
-        $this->mimeTypeExtensionMapMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap::class)->getMock();
-        $this->contentFactoryMock = $this->createPartialMock(
-            \Magento\Framework\Api\Data\ImageContentInterfaceFactory::class,
-            ['create']
-        );
-        $this->contentValidatorMock = $this->getMockBuilder(
-            \Magento\Framework\Api\ImageContentValidatorInterface::class
-        )
+        $this->mimeTypeExtensionMap = $this->getMockBuilder(MimeTypeExtensionMap::class)->getMock();
+        $this->contentFactory = $this->createPartialMock(ImageContentInterfaceFactory::class, ['create']);
+        $this->contentValidator = $this->getMockBuilder(ImageContentValidatorInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->linkTypeProviderMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Product\LinkTypeProvider::class,
-            ['getLinkTypes']
-        );
-        $this->imageProcessorMock = $this->createMock(\Magento\Framework\Api\ImageProcessorInterface::class);
+        $this->linkTypeProvider = $this->createPartialMock(LinkTypeProvider::class, ['getLinkTypes']);
+        $this->imageProcessor = $this->createMock(ImageProcessorInterface::class);
 
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMockForAbstractClass();
-        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+        $this->productExtension = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['__toArray'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->productExtension
+            ->method('__toArray')
+            ->willReturn([]);
+        $this->product
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtension);
+        $this->initializedProduct
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtension);
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMockForAbstractClass();
         $storeMock->expects($this->any())->method('getWebsiteId')->willReturn('1');
         $storeMock->expects($this->any())->method('getCode')->willReturn(\Magento\Store\Model\Store::ADMIN_CODE);
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeMock);
 
         $this->mediaGalleryProcessor = $this->createMock(\Magento\Catalog\Model\Product\Gallery\Processor::class);
 
-        $this->collectionProcessorMock = $this->getMockBuilder(CollectionProcessorInterface::class)
+        $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
             ->getMock();
 
         $this->serializerMock = $this->getMockBuilder(Json::class)->getMock();
@@ -273,26 +294,26 @@ function ($value) {
             );
 
         $this->model = $this->objectManager->getObject(
-            \Magento\Catalog\Model\ProductRepository::class,
+            ProductRepository::class,
             [
-                'productFactory' => $this->productFactoryMock,
-                'initializationHelper' => $this->initializationHelperMock,
-                'resourceModel' => $this->resourceModelMock,
-                'filterBuilder' => $this->filterBuilderMock,
-                'collectionFactory' => $this->collectionFactoryMock,
-                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
-                'metadataServiceInterface' => $this->metadataServiceMock,
-                'searchResultsFactory' => $this->searchResultsFactoryMock,
-                'extensibleDataObjectConverter' => $this->extensibleDataObjectConverterMock,
-                'contentValidator' => $this->contentValidatorMock,
-                'fileSystem' => $this->fileSystemMock,
-                'contentFactory' => $this->contentFactoryMock,
-                'mimeTypeExtensionMap' => $this->mimeTypeExtensionMapMock,
-                'linkTypeProvider' => $this->linkTypeProviderMock,
-                'imageProcessor' => $this->imageProcessorMock,
-                'storeManager' => $this->storeManagerMock,
+                'productFactory' => $this->productFactory,
+                'initializationHelper' => $this->initializationHelper,
+                'resourceModel' => $this->resourceModel,
+                'filterBuilder' => $this->filterBuilder,
+                'collectionFactory' => $this->collectionFactory,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
+                'metadataServiceInterface' => $this->metadataService,
+                'searchResultsFactory' => $this->searchResultsFactory,
+                'extensibleDataObjectConverter' => $this->extensibleDataObjectConverter,
+                'contentValidator' => $this->contentValidator,
+                'fileSystem' => $this->fileSystem,
+                'contentFactory' => $this->contentFactory,
+                'mimeTypeExtensionMap' => $this->mimeTypeExtensionMap,
+                'linkTypeProvider' => $this->linkTypeProvider,
+                'imageProcessor' => $this->imageProcessor,
+                'storeManager' => $this->storeManager,
                 'mediaGalleryProcessor' => $this->mediaGalleryProcessor,
-                'collectionProcessor' => $this->collectionProcessorMock,
+                'collectionProcessor' => $this->collectionProcessor,
                 'serializer' => $this->serializerMock,
                 'cacheLimit' => $this->cacheLimit
             ]
@@ -301,54 +322,54 @@ function ($value) {
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testGetAbsentProduct()
     {
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with('test_sku')
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with('test_sku')
             ->will($this->returnValue(null));
-        $this->productFactoryMock->expects($this->never())->method('setData');
+        $this->productFactory->expects($this->never())->method('setData');
         $this->model->get('test_sku');
     }
 
     public function testCreateCreatesProduct()
     {
         $sku = 'test_sku';
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
             ->will($this->returnValue('test_id'));
-        $this->productMock->expects($this->once())->method('load')->with('test_id');
-        $this->productMock->expects($this->once())->method('getSku')->willReturn($sku);
-        $this->assertEquals($this->productMock, $this->model->get($sku));
+        $this->product->expects($this->once())->method('load')->with('test_id');
+        $this->product->expects($this->once())->method('getSku')->willReturn($sku);
+        $this->assertEquals($this->product, $this->model->get($sku));
     }
 
     public function testGetProductInEditMode()
     {
         $sku = 'test_sku';
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
             ->will($this->returnValue('test_id'));
-        $this->productMock->expects($this->once())->method('setData')->with('_edit_mode', true);
-        $this->productMock->expects($this->once())->method('load')->with('test_id');
-        $this->productMock->expects($this->once())->method('getSku')->willReturn($sku);
-        $this->assertEquals($this->productMock, $this->model->get($sku, true));
+        $this->product->expects($this->once())->method('setData')->with('_edit_mode', true);
+        $this->product->expects($this->once())->method('load')->with('test_id');
+        $this->product->expects($this->once())->method('getSku')->willReturn($sku);
+        $this->assertEquals($this->product, $this->model->get($sku, true));
     }
 
     public function testGetBySkuWithSpace()
     {
         $trimmedSku = 'test_sku';
         $sku = 'test_sku ';
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
             ->will($this->returnValue('test_id'));
-        $this->productMock->expects($this->once())->method('load')->with('test_id');
-        $this->productMock->expects($this->once())->method('getSku')->willReturn($trimmedSku);
-        $this->assertEquals($this->productMock, $this->model->get($sku));
+        $this->product->expects($this->once())->method('load')->with('test_id');
+        $this->product->expects($this->once())->method('getSku')->willReturn($trimmedSku);
+        $this->assertEquals($this->product, $this->model->get($sku));
     }
 
     public function testGetWithSetStoreId()
@@ -356,37 +377,37 @@ public function testGetWithSetStoreId()
         $productId = 123;
         $sku = 'test-sku';
         $storeId = 7;
-        $this->productFactoryMock->expects($this->once())->method('create')->willReturn($this->productMock);
-        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)->willReturn($productId);
-        $this->productMock->expects($this->once())->method('setData')->with('store_id', $storeId);
-        $this->productMock->expects($this->once())->method('load')->with($productId);
-        $this->productMock->expects($this->once())->method('getId')->willReturn($productId);
-        $this->productMock->expects($this->once())->method('getSku')->willReturn($sku);
-        $this->assertSame($this->productMock, $this->model->get($sku, false, $storeId));
+        $this->productFactory->expects($this->once())->method('create')->willReturn($this->product);
+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)->willReturn($productId);
+        $this->product->expects($this->once())->method('setData')->with('store_id', $storeId);
+        $this->product->expects($this->once())->method('load')->with($productId);
+        $this->product->expects($this->once())->method('getId')->willReturn($productId);
+        $this->product->expects($this->once())->method('getSku')->willReturn($sku);
+        $this->assertSame($this->product, $this->model->get($sku, false, $storeId));
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testGetByIdAbsentProduct()
     {
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->once())->method('load')->with('product_id');
-        $this->productMock->expects($this->once())->method('getId')->willReturn(null);
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->product->expects($this->once())->method('load')->with('product_id');
+        $this->product->expects($this->once())->method('getId')->willReturn(null);
         $this->model->getById('product_id');
     }
 
     public function testGetByIdProductInEditMode()
     {
         $productId = 123;
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->once())->method('setData')->with('_edit_mode', true);
-        $this->productMock->expects($this->once())->method('load')->with($productId);
-        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
-        $this->assertEquals($this->productMock, $this->model->getById($productId, true));
+        $this->productFactory->method('create')->willReturn($this->product);
+        $this->product->method('setData')->with('_edit_mode', true);
+        $this->product->method('load')->with($productId);
+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
+        $this->product->method('getSku')->willReturn('simple');
+        $this->assertEquals($this->product, $this->model->getById($productId, true));
     }
 
     /**
@@ -400,20 +421,21 @@ public function testGetByIdProductInEditMode()
     public function testGetByIdForCacheKeyGenerate($identifier, $editMode, $storeId)
     {
         $callIndex = 0;
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
         if ($editMode) {
-            $this->productMock->expects($this->at($callIndex))->method('setData')->with('_edit_mode', $editMode);
+            $this->product->expects($this->at($callIndex))->method('setData')->with('_edit_mode', $editMode);
             ++$callIndex;
         }
         if ($storeId !== null) {
-            $this->productMock->expects($this->at($callIndex))->method('setData')->with('store_id', $storeId);
+            $this->product->expects($this->at($callIndex))->method('setData')->with('store_id', $storeId);
         }
-        $this->productMock->expects($this->once())->method('load')->with($identifier);
-        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($identifier);
-        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
+        $this->product->expects($this->once())->method('load')->with($identifier);
+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($identifier);
+        $this->product->method('getSku')->willReturn('simple');
+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
         //Second invocation should just return from cache
-        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
     }
 
     /**
@@ -427,17 +449,18 @@ public function testGetByIdForcedReload()
         $editMode = false;
         $storeId = 0;
 
-        $this->productFactoryMock->expects($this->exactly(2))->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->exactly(2))->method('load');
+        $this->productFactory->expects($this->exactly(2))->method('create')
+            ->will($this->returnValue($this->product));
+        $this->product->expects($this->exactly(2))->method('load');
         $this->serializerMock->expects($this->exactly(3))->method('serialize');
 
-        $this->productMock->expects($this->exactly(4))->method('getId')->willReturn($identifier);
-        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
+        $this->product->expects($this->exactly(4))->method('getId')->willReturn($identifier);
+        $this->product->method('getSku')->willReturn('simple');
+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
         //second invocation should just return from cache
-        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId));
+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId));
         //force reload
-        $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId, true));
+        $this->assertEquals($this->product, $this->model->getById($identifier, $editMode, $storeId, true));
     }
 
     /**
@@ -452,7 +475,7 @@ public function testGetByIdWhenCacheReduced()
         $productsCount = $this->cacheLimit * 2;
 
         $productMocks =  $this->getProductMocksForReducedCache($productsCount);
-        $productFactoryInvMock = $this->productFactoryMock->expects($this->exactly($productsCount))
+        $productFactoryInvMock = $this->productFactory->expects($this->exactly($productsCount))
             ->method('create');
         call_user_func_array([$productFactoryInvMock, 'willReturnOnConsecutiveCalls'], $productMocks);
         $this->serializerMock->expects($this->atLeastOnce())->method('serialize');
@@ -507,112 +530,112 @@ public function testGetForcedReload()
         $editMode = false;
         $storeId = 0;
 
-        $this->productFactoryMock->expects($this->exactly(2))->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->exactly(2))->method('load');
-        $this->productMock->expects($this->exactly(2))->method('getId')->willReturn($sku);
-        $this->resourceModelMock->expects($this->exactly(2))->method('getIdBySku')
+        $this->productFactory->expects($this->exactly(2))->method('create')
+            ->will($this->returnValue($this->product));
+        $this->product->expects($this->exactly(2))->method('load');
+        $this->product->expects($this->exactly(2))->method('getId')->willReturn($sku);
+        $this->resourceModel->expects($this->exactly(2))->method('getIdBySku')
             ->with($sku)->willReturn($id);
-        $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn($sku);
+        $this->product->expects($this->exactly(2))->method('getSku')->willReturn($sku);
         $this->serializerMock->expects($this->exactly(3))->method('serialize');
 
-        $this->assertEquals($this->productMock, $this->model->get($sku, $editMode, $storeId));
+        $this->assertEquals($this->product, $this->model->get($sku, $editMode, $storeId));
         //second invocation should just return from cache
-        $this->assertEquals($this->productMock, $this->model->get($sku, $editMode, $storeId));
+        $this->assertEquals($this->product, $this->model->get($sku, $editMode, $storeId));
         //force reload
-        $this->assertEquals($this->productMock, $this->model->get($sku, $editMode, $storeId, true));
+        $this->assertEquals($this->product, $this->model->get($sku, $editMode, $storeId, true));
     }
 
     public function testGetByIdWithSetStoreId()
     {
         $productId = 123;
         $storeId = 1;
-        $this->productFactoryMock->expects($this->atLeastOnce())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->once())->method('setData')->with('store_id', $storeId);
-        $this->productMock->expects($this->once())->method('load')->with($productId);
-        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
-        $this->assertEquals($this->productMock, $this->model->getById($productId, false, $storeId));
+        $this->productFactory->expects($this->atLeastOnce())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->product->expects($this->once())->method('setData')->with('store_id', $storeId);
+        $this->product->expects($this->once())->method('load')->with($productId);
+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
+        $this->product->method('getSku')->willReturn('simple');
+        $this->assertEquals($this->product, $this->model->getById($productId, false, $storeId));
     }
 
     public function testGetBySkuFromCacheInitializedInGetById()
     {
         $productId = 123;
         $productSku = 'product_123';
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->once())->method('load')->with($productId);
-        $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
-        $this->productMock->expects($this->once())->method('getSku')->willReturn($productSku);
-        $this->assertEquals($this->productMock, $this->model->getById($productId));
-        $this->assertEquals($this->productMock, $this->model->get($productSku));
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->product->expects($this->once())->method('load')->with($productId);
+        $this->product->expects($this->atLeastOnce())->method('getId')->willReturn($productId);
+        $this->product->expects($this->once())->method('getSku')->willReturn($productSku);
+        $this->assertEquals($this->product, $this->model->getById($productId));
+        $this->assertEquals($this->product, $this->model->get($productSku));
     }
 
     public function testSaveExisting()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-        $this->productFactoryMock->expects($this->any())
+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)->willReturn(true);
-        $this->extensibleDataObjectConverterMock
+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
-        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
 
-        $this->assertEquals($this->productMock, $this->model->save($this->productMock));
+        $this->assertEquals($this->product, $this->model->save($this->product));
     }
 
     public function testSaveNew()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
-        $this->resourceModelMock->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
-        $this->productFactoryMock->expects($this->any())
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->resourceModel->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
+        $this->resourceModel->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)->willReturn(true);
-        $this->extensibleDataObjectConverterMock
+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+        $this->product->method('getSku')->willReturn('simple');
 
-        $this->assertEquals($this->productMock, $this->model->save($this->productMock));
+        $this->assertEquals($this->product, $this->model->save($this->product));
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Unable to save product
+     * @expectedExceptionMessage The product was unable to be saved. Please try again.
      */
     public function testSaveUnableToSaveException()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
-        $this->productFactoryMock->expects($this->exactly(2))
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->resourceModel->expects($this->exactly(1))
+            ->method('getIdBySku')->willReturn(null);
+        $this->productFactory->expects($this->exactly(2))
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)
+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)
             ->willThrowException(new \Exception());
-        $this->extensibleDataObjectConverterMock
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+        $this->product->method('getSku')->willReturn('simple');
 
-        $this->model->save($this->productMock);
+        $this->model->save($this->product);
     }
 
     /**
@@ -621,24 +644,24 @@ public function testSaveUnableToSaveException()
      */
     public function testSaveException()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
-        $this->productFactoryMock->expects($this->exactly(2))
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->resourceModel->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
+        $this->productFactory->expects($this->exactly(2))
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)
+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)
             ->willThrowException(new \Magento\Eav\Model\Entity\Attribute\Exception(__('123')));
-        $this->productMock->expects($this->once())->method('getId')->willReturn(null);
-        $this->extensibleDataObjectConverterMock
+        $this->product->expects($this->once())->method('getId')->willReturn(null);
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+        $this->product->method('getSku')->willReturn('simple');
 
-        $this->model->save($this->productMock);
+        $this->model->save($this->product);
     }
 
     /**
@@ -647,22 +670,22 @@ public function testSaveException()
      */
     public function testSaveInvalidProductException()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
-        $this->productFactoryMock->expects($this->exactly(2))
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->resourceModel->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null));
+        $this->productFactory->expects($this->exactly(2))
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(['error1', 'error2']);
-        $this->productMock->expects($this->never())->method('getId');
-        $this->extensibleDataObjectConverterMock
+        $this->product->expects($this->never())->method('getId');
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
+        $this->product->method('getSku')->willReturn('simple');
 
-        $this->model->save($this->productMock);
+        $this->model->save($this->product);
     }
 
     /**
@@ -671,62 +694,60 @@ public function testSaveInvalidProductException()
      */
     public function testSaveThrowsTemporaryStateExceptionIfDatabaseConnectionErrorOccurred()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->productFactoryMock->expects($this->any())
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())
             ->method('initialize');
-        $this->resourceModelMock->expects($this->once())
+        $this->resourceModel->expects($this->once())
             ->method('validate')
-            ->with($this->productMock)
+            ->with($this->product)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())
+        $this->resourceModel->expects($this->once())
             ->method('save')
-            ->with($this->productMock)
+            ->with($this->product)
             ->willThrowException(new ConnectionException('Connection lost'));
-        $this->extensibleDataObjectConverterMock
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->productMock->expects($this->once())
-            ->method('getWebsiteIds')
-            ->willReturn([]);
+        $this->product->method('getSku')->willReturn('simple');
 
-        $this->model->save($this->productMock);
+        $this->model->save($this->product);
     }
 
     public function testDelete()
     {
-        $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
-        $this->productMock->expects($this->exactly(2))->method('getId')->willReturn(42);
-        $this->resourceModelMock->expects($this->once())->method('delete')->with($this->productMock)
+        $this->product->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
+        $this->product->expects($this->exactly(2))->method('getId')->willReturn(42);
+        $this->resourceModel->expects($this->once())->method('delete')->with($this->product)
             ->willReturn(true);
-        $this->assertTrue($this->model->delete($this->productMock));
+        $this->assertTrue($this->model->delete($this->product));
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Unable to remove product product-42
+     * @expectedExceptionMessage The "product-42" product couldn't be removed.
      */
     public function testDeleteException()
     {
-        $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
-        $this->productMock->expects($this->exactly(2))->method('getId')->willReturn(42);
-        $this->resourceModelMock->expects($this->once())->method('delete')->with($this->productMock)
+        $this->product->expects($this->exactly(2))->method('getSku')->willReturn('product-42');
+        $this->product->expects($this->exactly(2))->method('getId')->willReturn(42);
+        $this->resourceModel->expects($this->once())->method('delete')->with($this->product)
             ->willThrowException(new \Exception());
-        $this->model->delete($this->productMock);
+        $this->model->delete($this->product);
     }
 
     public function testDeleteById()
     {
         $sku = 'product-42';
-        $this->productFactoryMock->expects($this->once())->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->resourceModelMock->expects($this->once())->method('getIdBySku')->with($sku)
+        $this->productFactory->expects($this->once())->method('create')
+            ->will($this->returnValue($this->product));
+        $this->resourceModel->expects($this->once())->method('getIdBySku')->with($sku)
             ->will($this->returnValue('42'));
-        $this->productMock->expects($this->once())->method('load')->with('42');
-        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($sku);
+        $this->product->expects($this->once())->method('load')->with('42');
+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($sku);
         $this->assertTrue($this->model->deleteById($sku));
     }
 
@@ -734,25 +755,24 @@ public function testGetList()
     {
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
         $collectionMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-
-        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
-
+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collectionMock);
+        $this->product->method('getSku')->willReturn('simple');
         $collectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
         $collectionMock->expects($this->exactly(2))->method('joinAttribute')->withConsecutive(
             ['status', 'catalog_product/status', 'entity_id', null, 'inner'],
             ['visibility', 'catalog_product/visibility', 'entity_id', null, 'inner']
         );
-        $this->collectionProcessorMock->expects($this->once())
+        $this->collectionProcessor->expects($this->once())
             ->method('process')
             ->with($searchCriteriaMock, $collectionMock);
         $collectionMock->expects($this->once())->method('load');
         $collectionMock->expects($this->once())->method('addCategoryIds');
-        $collectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$this->productMock]);
+        $collectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$this->product]);
         $collectionMock->expects($this->once())->method('getSize')->willReturn(128);
         $searchResultsMock = $this->createMock(\Magento\Catalog\Api\Data\ProductSearchResultsInterface::class);
         $searchResultsMock->expects($this->once())->method('setSearchCriteria')->with($searchCriteriaMock);
-        $searchResultsMock->expects($this->once())->method('setItems')->with([$this->productMock]);
-        $this->searchResultsFactoryMock->expects($this->once())->method('create')->willReturn($searchResultsMock);
+        $searchResultsMock->expects($this->once())->method('setItems')->with([$this->product]);
+        $this->searchResultsFactory->expects($this->once())->method('create')->willReturn($searchResultsMock);
         $this->assertEquals($searchResultsMock, $this->model->getList($searchCriteriaMock));
     }
 
@@ -822,29 +842,28 @@ public function cacheKeyDataProvider()
      */
     public function testSaveExistingWithOptions(array $newOptions, array $existingOptions, array $expectedData)
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-        $this->productFactoryMock->expects($this->any())
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->initializedProductMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->initializedProductMock)
+            ->will($this->returnValue($this->initializedProduct));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')
-            ->with($this->initializedProductMock)->willReturn(true);
+        $this->resourceModel->expects($this->once())->method('save')
+            ->with($this->initializedProduct)->willReturn(true);
         //option data
         $this->productData['options'] = $newOptions;
-        $this->extensibleDataObjectConverterMock
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
 
-        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
-        $this->initializedProductMock->expects($this->atLeastOnce())
+        $this->initializedProduct->expects($this->atLeastOnce())
             ->method('getSku')->willReturn($this->productData['sku']);
-        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
 
-        $this->assertEquals($this->initializedProductMock, $this->model->save($this->productMock));
+        $this->assertEquals($this->initializedProduct, $this->model->save($this->product));
     }
 
     /**
@@ -994,27 +1013,27 @@ public function saveExistingWithOptionsDataProvider()
      */
     public function testSaveWithLinks(array $newLinks, array $existingLinks, array $expectedData)
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
-        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-        $this->productFactoryMock->expects($this->any())
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->initializedProductMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->initializedProductMock)
+            ->will($this->returnValue($this->initializedProduct));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')
-            ->with($this->initializedProductMock)->willReturn(true);
+        $this->resourceModel->expects($this->once())->method('save')
+            ->with($this->initializedProduct)->willReturn(true);
 
-        $this->initializedProductMock->setData("product_links", $existingLinks);
+        $this->initializedProduct->setData("product_links", $existingLinks);
 
         if (!empty($newLinks)) {
             $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
-            $this->linkTypeProviderMock->expects($this->once())
+            $this->linkTypeProvider->expects($this->once())
                 ->method('getLinkTypes')
                 ->willReturn($linkTypes);
 
-            $this->initializedProductMock->setData("ignore_links_flag", false);
-            $this->resourceModelMock
+            $this->initializedProduct->setData("ignore_links_flag", false);
+            $this->resourceModel
                 ->expects($this->any())->method('getProductsIdsBySkus')
                 ->willReturn([$newLinks['linked_product_sku'] => $newLinks['linked_product_sku']]);
 
@@ -1031,29 +1050,29 @@ public function testSaveWithLinks(array $newLinks, array $existingLinks, array $
 
             $this->productData['product_links'] = [$inputLink];
 
-            $this->initializedProductMock->expects($this->any())
+            $this->initializedProduct->expects($this->any())
                 ->method('getProductLinks')
                 ->willReturn([$inputLink]);
         } else {
-            $this->resourceModelMock
+            $this->resourceModel
                 ->expects($this->any())->method('getProductsIdsBySkus')
                 ->willReturn([]);
 
             $this->productData['product_links'] = [];
 
-            $this->initializedProductMock->setData('ignore_links_flag', true);
-            $this->initializedProductMock->expects($this->never())
+            $this->initializedProduct->setData('ignore_links_flag', true);
+            $this->initializedProduct->expects($this->never())
                 ->method('getProductLinks')
                 ->willReturn([]);
         }
 
-        $this->extensibleDataObjectConverterMock
+        $this->extensibleDataObjectConverter
             ->expects($this->at(0))
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
 
         if (!empty($newLinks)) {
-            $this->extensibleDataObjectConverterMock
+            $this->extensibleDataObjectConverter
                 ->expects($this->at(1))
                 ->method('toNestedArray')
                 ->will($this->returnValue($newLinks));
@@ -1075,23 +1094,25 @@ public function testSaveWithLinks(array $newLinks, array $existingLinks, array $
                 $outputLinks[] = $outputLink;
             }
         }
-        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
 
         if (!empty($outputLinks)) {
-            $this->initializedProductMock->expects($this->once())
+            $this->initializedProduct->expects($this->once())
                 ->method('setProductLinks')
                 ->with($outputLinks);
         } else {
-            $this->initializedProductMock->expects($this->never())
+            $this->initializedProduct->expects($this->never())
                 ->method('setProductLinks');
         }
-        $this->initializedProductMock->expects($this->atLeastOnce())
+        $this->initializedProduct->expects($this->atLeastOnce())
             ->method('getSku')->willReturn($this->productData['sku']);
 
-        $results = $this->model->save($this->initializedProductMock);
-        $this->assertEquals($this->initializedProductMock, $results);
+        $results = $this->model->save($this->initializedProduct);
+        $this->assertEquals($this->initializedProduct, $results);
     }
 
+    /**
+     * @return mixed
+     */
     public function saveWithLinksDataProvider()
     {
         // Scenario 1
@@ -1163,20 +1184,20 @@ public function saveWithLinksDataProvider()
 
     protected function setupProductMocksForSave()
     {
-        $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
-        $this->productFactoryMock->expects($this->any())
+        $this->resourceModel->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->initializedProductMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->initializedProductMock)
+            ->will($this->returnValue($this->initializedProduct));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')
-            ->with($this->initializedProductMock)->willReturn(true);
+        $this->resourceModel->expects($this->once())->method('save')
+            ->with($this->initializedProduct)->willReturn(true);
     }
 
     public function testSaveExistingWithNewMediaGalleryEntries()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
         $newEntriesData = [
             'images' => [
                     [
@@ -1200,13 +1221,13 @@ public function testSaveExistingWithNewMediaGalleryEntries()
         $this->setupProductMocksForSave();
         //media gallery data
         $this->productData['media_gallery'] = $newEntriesData;
-        $this->extensibleDataObjectConverterMock
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
 
-        $this->initializedProductMock->setData('media_gallery', $newEntriesData);
-        $this->initializedProductMock->expects($this->any())
+        $this->initializedProduct->setData('media_gallery', $newEntriesData);
+        $this->initializedProduct->expects($this->any())
             ->method('getMediaAttributes')
             ->willReturn(["image" => "imageAttribute", "small_image" => "small_image_attribute"]);
 
@@ -1215,7 +1236,7 @@ public function testSaveExistingWithNewMediaGalleryEntries()
         $absolutePath = '/a/b/filename.jpg';
 
         $this->mediaGalleryProcessor->expects($this->once())->method('clearMediaAttribute')
-            ->with($this->initializedProductMock, ['image', 'small_image']);
+            ->with($this->initializedProduct, ['image', 'small_image']);
 
         $mediaConfigMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Media\Config::class)
             ->disableOriginalConstructor()
@@ -1224,7 +1245,7 @@ public function testSaveExistingWithNewMediaGalleryEntries()
             ->method('getTmpMediaShortUrl')
             ->with($absolutePath)
             ->willReturn($mediaTmpPath . $absolutePath);
-        $this->initializedProductMock->expects($this->once())
+        $this->initializedProduct->expects($this->once())
             ->method('getMediaConfig')
             ->willReturn($mediaConfigMock);
 
@@ -1233,21 +1254,21 @@ public function testSaveExistingWithNewMediaGalleryEntries()
             ->disableOriginalConstructor()
             ->setMethods(null)
             ->getMock();
-        $this->contentFactoryMock->expects($this->once())
+        $this->contentFactory->expects($this->once())
             ->method('create')
             ->willReturn($contentDataObject);
 
-        $this->imageProcessorMock->expects($this->once())
+        $this->imageProcessor->expects($this->once())
             ->method('processImageContent')
             ->willReturn($absolutePath);
 
         $imageFileUri = "imageFileUri";
         $this->mediaGalleryProcessor->expects($this->once())->method('addImage')
-            ->with($this->initializedProductMock, $mediaTmpPath . $absolutePath, ['image', 'small_image'], true, false)
+            ->with($this->initializedProduct, $mediaTmpPath . $absolutePath, ['image', 'small_image'], true, false)
             ->willReturn($imageFileUri);
         $this->mediaGalleryProcessor->expects($this->once())->method('updateImage')
             ->with(
-                $this->initializedProductMock,
+                $this->initializedProduct,
                 $imageFileUri,
                 [
                     'label' => 'label_text',
@@ -1256,14 +1277,16 @@ public function testSaveExistingWithNewMediaGalleryEntries()
                     'media_type' => 'media_type',
                 ]
             );
-        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
-        $this->initializedProductMock->expects($this->atLeastOnce())
+        $this->initializedProduct->expects($this->atLeastOnce())
             ->method('getSku')->willReturn($this->productData['sku']);
-        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
 
-        $this->model->save($this->productMock);
+        $this->model->save($this->product);
     }
 
+    /**
+     * @return array
+     */
     public function websitesProvider()
     {
         return [
@@ -1274,38 +1297,38 @@ public function websitesProvider()
     public function testSaveWithDifferentWebsites()
     {
         $storeMock = $this->createMock(StoreInterface::class);
-        $this->resourceModelMock->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
-        $this->resourceModelMock->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
-        $this->productFactoryMock->expects($this->any())
+        $this->resourceModel->expects($this->at(0))->method('getIdBySku')->will($this->returnValue(null));
+        $this->resourceModel->expects($this->at(3))->method('getIdBySku')->will($this->returnValue(100));
+        $this->productFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->initializationHelperMock->expects($this->never())->method('initialize');
-        $this->resourceModelMock->expects($this->once())->method('validate')->with($this->productMock)
+            ->will($this->returnValue($this->product));
+        $this->initializationHelper->expects($this->never())->method('initialize');
+        $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
-        $this->resourceModelMock->expects($this->once())->method('save')->with($this->productMock)->willReturn(true);
-        $this->extensibleDataObjectConverterMock
+        $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
-        $this->storeManagerMock->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($storeMock);
-        $this->storeManagerMock->expects($this->once())
+        $this->storeManager->expects($this->once())
             ->method('getWebsites')
             ->willReturn([
                 1 => ['first'],
                 2 => ['second'],
                 3 => ['third']
             ]);
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([1,2,3]);
-        $this->productMock->expects($this->once())->method('setWebsiteIds')->willReturn([2,3]);
+        $this->product->expects($this->once())->method('setWebsiteIds')->willReturn([2,3]);
+        $this->product->method('getSku')->willReturn('simple');
 
-        $this->assertEquals($this->productMock, $this->model->save($this->productMock));
+        $this->assertEquals($this->product, $this->model->save($this->product));
     }
 
     public function testSaveExistingWithMediaGalleryEntries()
     {
-        $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
         //update one entry, delete one entry
         $newEntries = [
             [
@@ -1336,7 +1359,6 @@ public function testSaveExistingWithMediaGalleryEntries()
 
         $expectedResult = [
             [
-                'value_id' => 5,
                 'value_id' => 5,
                 "label" => "new_label_text",
                 'file' => 'filename1',
@@ -1354,27 +1376,26 @@ public function testSaveExistingWithMediaGalleryEntries()
         $this->setupProductMocksForSave();
         //media gallery data
         $this->productData['media_gallery']['images'] = $newEntries;
-        $this->extensibleDataObjectConverterMock
+        $this->extensibleDataObjectConverter
             ->expects($this->once())
             ->method('toNestedArray')
             ->will($this->returnValue($this->productData));
 
-        $this->initializedProductMock->setData('media_gallery', $existingMediaGallery);
-        $this->initializedProductMock->expects($this->any())
+        $this->initializedProduct->setData('media_gallery', $existingMediaGallery);
+        $this->initializedProduct->expects($this->any())
             ->method('getMediaAttributes')
             ->willReturn(["image" => "filename1", "small_image" => "filename2"]);
 
         $this->mediaGalleryProcessor->expects($this->once())->method('clearMediaAttribute')
-            ->with($this->initializedProductMock, ['image', 'small_image']);
+            ->with($this->initializedProduct, ['image', 'small_image']);
         $this->mediaGalleryProcessor->expects($this->once())
             ->method('setMediaAttribute')
-            ->with($this->initializedProductMock, ['image', 'small_image'], 'filename1');
-        $this->initializedProductMock->expects($this->once())->method('getWebsiteIds')->willReturn([]);
-        $this->initializedProductMock->expects($this->atLeastOnce())
+            ->with($this->initializedProduct, ['image', 'small_image'], 'filename1');
+        $this->initializedProduct->expects($this->atLeastOnce())
             ->method('getSku')->willReturn($this->productData['sku']);
-        $this->productMock->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
-        $this->productMock->expects($this->any())->method('getMediaGalleryEntries')->willReturn(null);
-        $this->model->save($this->productMock);
-        $this->assertEquals($expectedResult, $this->initializedProductMock->getMediaGallery('images'));
+        $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($this->productData['sku']);
+        $this->product->expects($this->any())->method('getMediaGalleryEntries')->willReturn(null);
+        $this->model->save($this->product);
+        $this->assertEquals($expectedResult, $this->initializedProduct->getMediaGallery('images'));
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 8d7e3dfb3f2fd..9867fdf910219 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -6,14 +6,13 @@
 
 namespace Magento\Catalog\Test\Unit\Model;
 
-use Magento\Catalog\Api\Data\ProductExtensionFactory;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Product\Attribute\Source\Status as Status;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Product Test
@@ -80,6 +79,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $_priceInfoMock;
 
+    /**
+     * @var \Magento\Catalog\Model\FilterProductCustomAttribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filterCustomAttribute;
+
     /**
      * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -198,6 +202,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $extensionAttributes;
 
+    /**
+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfig;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -324,9 +333,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)
@@ -361,6 +370,7 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
         $this->mediaConfig = $this->createMock(\Magento\Catalog\Model\Product\Media\Config::class);
+        $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
 
         $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['getStockItem'])
@@ -370,6 +380,10 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->extensionAttributes);
 
+        $this->filterCustomAttribute = $this->createTestProxy(
+            \Magento\Catalog\Model\FilterProductCustomAttribute::class
+        );
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
             \Magento\Catalog\Model\Product::class,
@@ -398,7 +412,9 @@ protected function setUp()
                 'catalogProductMediaConfig' => $this->mediaConfig,
                 '_filesystem' => $this->filesystemMock,
                 '_collectionFactory' => $this->collectionFactoryMock,
-                'data' => ['id' => 1]
+                'data' => ['id' => 1],
+                'eavConfig' => $this->eavConfig,
+                'filterCustomAttribute' => $this->filterCustomAttribute
             ]
         );
     }
@@ -503,6 +519,9 @@ public function testGetCategoryCollectionCollectionNull($initCategoryCollection,
         $this->assertEquals($initCategoryCollection, $result);
     }
 
+    /**
+     * @return array
+     */
     public function getCategoryCollectionCollectionNullDataProvider()
     {
         return [
@@ -530,6 +549,7 @@ public function testSetCategoryCollection()
 
     public function testGetCategory()
     {
+        $this->model->setData('category_ids', [10]);
         $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
         $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
         $this->categoryRepository->expects($this->any())->method('get')->will($this->returnValue($this->category));
@@ -538,7 +558,8 @@ public function testGetCategory()
 
     public function testGetCategoryId()
     {
-        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->model->setData('category_ids', [10]);
+        $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
 
         $this->registry->expects($this->at(0))->method('registry');
         $this->registry->expects($this->at(1))->method('registry')->will($this->returnValue($this->category));
@@ -546,6 +567,14 @@ public function testGetCategoryId()
         $this->assertEquals(10, $this->model->getCategoryId());
     }
 
+    public function testGetCategoryIdWhenProductNotInCurrentCategory()
+    {
+        $this->model->setData('category_ids', [12]);
+        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
+        $this->assertFalse($this->model->getCategoryId());
+    }
+
     public function testGetIdBySku()
     {
         $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5));
@@ -613,6 +642,9 @@ public function testReindex($productChanged, $isScheduled, $productFlatCount, $c
         $this->model->reindex();
     }
 
+    /**
+     * @return array
+     */
     public function getProductReindexProvider()
     {
         return [
@@ -859,13 +891,10 @@ public function testGetQty()
      */
     public function testSave()
     {
-        $this->imageCache->expects($this->once())
-            ->method('generate')
-            ->with($this->model);
-        $this->imageCacheFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($this->imageCache);
-
+        $collection = $this->createMock(\Magento\Framework\Data\Collection::class);
+        $collection->method('count')->willReturn(1);
+        $collection->method('getIterator')->willReturn(new \ArrayObject([]));
+        $this->collectionFactoryMock->method('create')->willReturn($collection);
         $this->model->setIsDuplicate(false);
         $this->configureSaveTest();
         $this->model->beforeSave();
@@ -891,13 +920,10 @@ public function testSaveIfAreaEmulated()
      */
     public function testSaveAndDuplicate()
     {
-        $this->imageCache->expects($this->once())
-            ->method('generate')
-            ->with($this->model);
-        $this->imageCacheFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($this->imageCache);
-
+        $collection = $this->createMock(\Magento\Framework\Data\Collection::class);
+        $collection->method('count')->willReturn(1);
+        $collection->method('getIterator')->willReturn(new \ArrayObject([]));
+        $this->collectionFactoryMock->method('create')->willReturn($collection);
         $this->model->setIsDuplicate(true);
         $this->configureSaveTest();
         $this->model->beforeSave();
@@ -1160,19 +1186,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,
@@ -1207,7 +1233,7 @@ public function testGetMediaGalleryImagesMerging()
                     'media_type' => 'image',
                 ],
                 [
-                    'value_id' => 1,
+                    'value_id' => 3,
                     'file' => 'imageFile.jpg',
                 ],
                 [
@@ -1234,33 +1260,31 @@ public function testGetMediaGalleryImagesMerging()
             'path' => '/var/www/html/pub/smallImageFile.jpg',
         ]);
 
-        $directoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->filesystemMock->expects($this->once())->method('getDirectoryRead')->willReturn($directoryMock);
+        $directoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
+        $directoryMock->method('getAbsolutePath')->willReturnOnConsecutiveCalls(
+            '/var/www/html/pub/imageFile.jpg',
+            '/var/www/html/pub/smallImageFile.jpg'
+        );
+        $this->mediaConfig->method('getMediaUrl')->willReturnOnConsecutiveCalls(
+            'http://magento.dev/pub/imageFile.jpg',
+            'http://magento.dev/pub/smallImageFile.jpg'
+        );
+        $this->filesystemMock->method('getDirectoryRead')->willReturn($directoryMock);
         $this->model->setData('media_gallery', $mediaEntries);
-        $imagesCollectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($imagesCollectionMock);
-        $imagesCollectionMock->expects($this->at(2))
-            ->method('getItemById')
-            ->with(1)
-            ->willReturn($expectedImageDataObject);
-        $this->mediaConfig->expects($this->at(0))
-            ->method('getMediaUrl')
-            ->willReturn('http://magento.dev/pub/imageFile.jpg');
-        $directoryMock->expects($this->at(0))
-            ->method('getAbsolutePath')
-            ->willReturn('/var/www/html/pub/imageFile.jpg');
-        $this->mediaConfig->expects($this->at(2))
-            ->method('getMediaUrl')
-            ->willReturn('http://magento.dev/pub/smallImageFile.jpg');
-        $directoryMock->expects($this->at(1))
-            ->method('getAbsolutePath')
-            ->willReturn('/var/www/html/pub/smallImageFile.jpg');
-        $imagesCollectionMock->expects($this->at(1))->method('addItem')->with($expectedImageDataObject);
-        $imagesCollectionMock->expects($this->at(4))->method('addItem')->with($expectedSmallImageDataObject);
+        $imagesCollectionMock = $this->createMock(\Magento\Framework\Data\Collection::class);
+        $imagesCollectionMock->method('count')->willReturn(0);
+        $imagesCollectionMock->method('getItemById')->willReturnMap(
+            [
+                [1, null],
+                [2, null],
+                [3, 'not_null_skeep_foreache'],
+            ]
+        );
+        $imagesCollectionMock->expects(self::exactly(2))->method('addItem')->withConsecutive(
+            $expectedImageDataObject,
+            $expectedSmallImageDataObject
+        );
+        $this->collectionFactoryMock->method('create')->willReturn($imagesCollectionMock);
 
         $this->model->getMediaGalleryImages();
     }
@@ -1268,19 +1292,13 @@ public function testGetMediaGalleryImagesMerging()
     public function testGetCustomAttributes()
     {
         $priceCode = 'price';
-        $colorAttributeCode = 'color';
-        $interfaceAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-        $interfaceAttribute->expects($this->once())
-            ->method('getAttributeCode')
-            ->willReturn($priceCode);
-        $colorAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-        $colorAttribute->expects($this->once())
-            ->method('getAttributeCode')
-            ->willReturn($colorAttributeCode);
-        $customAttributesMetadata = [$interfaceAttribute, $colorAttribute];
-
-        $this->metadataServiceMock->expects($this->once())
-            ->method('getCustomAttributesMetadata')
+        $customAttributeCode = 'color';
+        $initialCustomAttributeValue = 'red';
+        $newCustomAttributeValue = 'blue';
+        $customAttributesMetadata = [$priceCode => 'attribute1', $customAttributeCode => 'attribute2'];
+        $this->metadataServiceMock->expects($this->never())->method('getCustomAttributesMetadata');
+        $this->eavConfig->expects($this->once())
+            ->method('getEntityAttributes')
             ->willReturn($customAttributesMetadata);
         $this->model->setData($priceCode, 10);
 
@@ -1288,20 +1306,26 @@ public function testGetCustomAttributes()
         $this->assertEquals([], $this->model->getCustomAttributes());
 
         //Set the color attribute;
-        $this->model->setData($colorAttributeCode, "red");
+        $this->model->setData($customAttributeCode, $initialCustomAttributeValue);
         $attributeValue = new \Magento\Framework\Api\AttributeValue();
         $attributeValue2 = new \Magento\Framework\Api\AttributeValue();
         $this->attributeValueFactory->expects($this->exactly(2))->method('create')
             ->willReturnOnConsecutiveCalls($attributeValue, $attributeValue2);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
-        $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
-        $this->assertEquals("red", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
+        $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $initialCustomAttributeValue,
+            $this->model->getCustomAttribute($customAttributeCode)->getValue()
+        );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->model->setData($colorAttributeCode, "blue");
+        $this->model->setCustomAttribute($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
-        $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
-        $this->assertEquals("blue", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
+        $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $newCustomAttributeValue,
+            $this->model->getCustomAttribute($customAttributeCode)->getValue()
+        );
     }
 
     /**
@@ -1397,7 +1421,20 @@ public function testGetFinalPricePreset()
         $qty = 1;
         $this->model->setQty($qty);
         $this->model->setFinalPrice($finalPrice);
-        $this->productTypeInstanceMock->expects($this->never())->method('priceFactory');
+        $productTypePriceMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\Type\Price::class,
+            ['getFinalPrice']
+        );
+        $productTypePriceMock->expects($this->any())
+            ->method('getFinalPrice')
+            ->with($qty, $this->model)
+            ->willReturn($finalPrice);
+
+        $this->productTypeInstanceMock->expects($this->any())
+            ->method('priceFactory')
+            ->with($this->model->getTypeId())
+            ->willReturn($productTypePriceMock);
+
         $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty));
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/ConfigTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/ConfigTest.php
index e6de1d33e564d..fb289c7beaac6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/ConfigTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/ConfigTest.php
@@ -68,6 +68,9 @@ public function testGetType($value, $expected)
         $this->assertEquals($expected, $this->config->getType('global'));
     }
 
+    /**
+     * @return array
+     */
     public function getTypeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php
index 64416301faa06..3dcea33d5e00e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php
@@ -25,7 +25,7 @@ protected function _getAttributes()
         foreach ($codes as $code) {
             $mock = $this->createPartialMock(
                 \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
-                ['isInSet', 'getBackend', '__wakeup']
+                ['isInSet', 'getApplyTo', 'getBackend', '__wakeup']
             );
 
             $mock->setAttributeId($code);
@@ -44,11 +44,13 @@ public function testWalkAttributes()
 
         $code = 'test_attr';
         $set = 10;
+        $storeId = 100;
 
         $object = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['__wakeup']);
 
         $object->setData('test_attr', 'test_attr');
         $object->setData('attribute_set_id', $set);
+        $object->setData('store_id', $storeId);
 
         $entityType = new \Magento\Framework\DataObject();
         $entityType->setEntityTypeCode('test');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
new file mode 100644
index 0000000000000..0501d995aaf53
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\ResourceModel\Entity\Type;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\DB\Adapter\AdapterInterface as Adapter;
+use Magento\ResourceConnections\DB\Select;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Attribute\LockValidatorInterface;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var Adapter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Eav\Model\ResourceModel\Entity\Type|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavEntityTypeMock;
+
+    /**
+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfigMock;
+
+    /**
+     * @var LockValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockValidatorMock;
+
+    /**
+     * @var EntityMetadataInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMetaDataInterfaceMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['from', 'where', 'join', 'deleteFromSelect'])
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(Adapter::class)->getMockForAbstractClass();
+        $this->connectionMock->expects($this->once())->method('select')->willReturn($this->selectMock);
+        $this->connectionMock->expects($this->once())->method('query')->willReturn($this->selectMock);
+        $this->connectionMock->expects($this->once())->method('delete')->willReturn($this->selectMock);
+        $this->selectMock->expects($this->once())->method('from')->willReturnSelf();
+        $this->selectMock->expects($this->once())->method('join')->willReturnSelf();
+        $this->selectMock->expects($this->any())->method('where')->willReturnSelf();
+        $this->selectMock->expects($this->any())->method('deleteFromSelect')->willReturnSelf();
+
+        $this->resourceMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['delete', 'getConnection'])
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)->getMock();
+        $this->eavEntityTypeMock = $this->getMockBuilder(Type::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttribute'])
+            ->getMock();
+        $this->lockValidatorMock = $this->getMockBuilder(LockValidatorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['validate'])
+            ->getMock();
+         $this->entityMetaDataInterfaceMock = $this->getMockBuilder(EntityMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * Sets object non-public property.
+     *
+     * @param mixed $object
+     * @param string $propertyName
+     * @param mixed $value
+     *
+     * @return void
+     */
+    private function setObjectProperty($object, string $propertyName, $value) : void
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        $reflectionProperty = $reflectionClass->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $value);
+    }
+
+    /**
+     * @return void
+     */
+    public function testDeleteEntity() : void
+    {
+        $entityAttributeId = 196;
+        $entityTypeId = 4;
+        $result = [
+            'entity_attribute_id' => 196,
+            'entity_type_id' => 4,
+            'attribute_set_id'=> 4,
+            'attribute_group_id' => 7,
+            'attribute_id' => 177,
+            'sort_order' => 3,
+        ];
+
+        $backendTableName = 'weee_tax';
+        $backendFieldName = 'value_id';
+
+        $attributeModel = $this->getMockBuilder(Attribute::class)
+            ->setMethods(['getEntityAttribute', 'getMetadataPool', 'getConnection', 'getTable'])
+            ->setConstructorArgs([
+                $this->contextMock,
+                $this->storeManagerMock,
+                $this->eavEntityTypeMock,
+                $this->eavConfigMock,
+                $this->lockValidatorMock,
+                null,
+            ])->getMock();
+        $attributeModel->expects($this->any())
+            ->method('getEntityAttribute')
+            ->with($entityAttributeId)
+            ->willReturn($result);
+        $metadataPoolMock = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMetadata'])
+            ->getMock();
+
+        $this->setObjectProperty($attributeModel, 'metadataPool', $metadataPoolMock);
+
+        $eavAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $eavAttributeMock->expects($this->any())->method('getId')->willReturn($result['attribute_id']);
+
+        $this->eavConfigMock->expects($this->any())
+            ->method('getAttribute')
+            ->with($entityTypeId, $result['attribute_id'])
+            ->willReturn($eavAttributeMock);
+
+        $abstractModelMock = $this->getMockBuilder(AbstractModel::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityAttributeId','getEntityTypeId'])
+            ->getMockForAbstractClass();
+        $abstractModelMock->expects($this->any())->method('getEntityAttributeId')->willReturn($entityAttributeId);
+        $abstractModelMock->expects($this->any())->method('getEntityTypeId')->willReturn($entityTypeId);
+
+        $this->lockValidatorMock->expects($this->any())
+            ->method('validate')
+            ->with($eavAttributeMock, $result['attribute_set_id'])
+            ->willReturn(true);
+
+        $backendModelMock = $this->getMockBuilder(AbstractBackend::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBackend', 'getTable', 'getEntityIdField'])
+            ->getMock();
+
+        $abstractAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntity'])
+            ->getMockForAbstractClass();
+
+        $eavAttributeMock->expects($this->any())->method('getBackend')->willReturn($backendModelMock);
+        $eavAttributeMock->expects($this->any())->method('getEntity')->willReturn($abstractAttributeMock);
+
+        $backendModelMock->expects($this->any())->method('getTable')->willReturn($backendTableName);
+        $backendModelMock->expects($this->once())->method('getEntityIdField')->willReturn($backendFieldName);
+
+        $metadataPoolMock->expects($this->any())
+            ->method('getMetadata')
+            ->with(ProductInterface::class)
+            ->willReturn($this->entityMetaDataInterfaceMock);
+
+        $this->entityMetaDataInterfaceMock->expects($this->any())
+            ->method('getLinkField')
+            ->willReturn('row_id');
+
+        $attributeModel->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
+        $attributeModel->expects($this->any())
+            ->method('getTable')
+            ->with('eav_entity_attribute')
+            ->willReturn('eav_entity_attribute');
+
+        $attributeModel->deleteEntity($abstractModelMock);
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/CategoryTest.php
index 4812751792f18..b7d05fd2b70ee 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/CategoryTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
 
 use Magento\Catalog\Model\Factory;
+use Magento\Catalog\Model\Indexer\Category\Product\Processor;
 use Magento\Catalog\Model\ResourceModel\Category;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Eav\Model\Config;
@@ -91,6 +92,11 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
      */
     private $serializerMock;
 
+    /**
+     * @var Processor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexerProcessorMock;
+
     /**
      * {@inheritDoc}
      */
@@ -121,6 +127,9 @@ protected function setUp()
         $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->indexerProcessorMock = $this->getMockBuilder(Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->serializerMock = $this->getMockBuilder(Json::class)->getMock();
 
@@ -131,6 +140,7 @@ protected function setUp()
             $this->managerMock,
             $this->treeFactoryMock,
             $this->collectionFactoryMock,
+            $this->indexerProcessorMock,
             [],
             $this->serializerMock
         );
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php
new file mode 100644
index 0000000000000..abbcef942373e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for Magento\Catalog\Model\ResourceModel\Config
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Config
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfig;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Catalog\Model\ResourceModel\Config::class,
+            [
+                'resource' => $this->resource,
+                'storeManager' => $this->storeManager,
+                'eavConfig' => $this->eavConfig,
+            ]
+        );
+
+        parent::setUp();
+    }
+
+    public function testGetAttributesUsedForSortBy()
+    {
+        $expression = 'someExpression';
+        $storeId = 1;
+        $entityTypeId = 4;
+
+        $connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $entityTypeMock = $this->createMock(\Magento\Eav\Model\Entity\Type::class);
+
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
+
+        $connectionMock->expects($this->once())->method('getCheckSql')
+            ->with('al.value IS NULL', 'main_table.frontend_label', 'al.value')
+            ->willReturn($expression);
+        $connectionMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
+
+        $this->resource->expects($this->exactly(3))->method('getTableName')->withConsecutive(
+            ['eav_attribute'],
+            ['catalog_eav_attribute'],
+            ['eav_attribute_label']
+        )->willReturnOnConsecutiveCalls('eav_attribute', 'catalog_eav_attribute', 'eav_attribute_label');
+
+        $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+
+        $this->eavConfig->expects($this->once())->method('getEntityType')->willReturn($entityTypeMock);
+        $entityTypeMock->expects($this->once())->method('getId')->willReturn($entityTypeId);
+
+        $selectMock->expects($this->once())->method('from')
+            ->with(['main_table' => 'eav_attribute'])->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('join')->with(
+            ['additional_table' => 'catalog_eav_attribute'],
+            'main_table.attribute_id = additional_table.attribute_id'
+        )->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('joinLeft')
+            ->with(
+                ['al' => 'eav_attribute_label'],
+                'al.attribute_id = main_table.attribute_id AND al.store_id = ' . $storeId,
+                ['store_label' => $expression]
+            )->willReturn($selectMock);
+        $selectMock->expects($this->exactly(2))->method('where')->withConsecutive(
+            ['main_table.entity_type_id = ?', $entityTypeId],
+            ['additional_table.used_for_sort_by = ?', 1]
+        )->willReturn($selectMock);
+
+        $connectionMock->expects($this->once())->method('fetchAll')->with($selectMock);
+
+        $this->model->getAttributesUsedForSortBy();
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php
index 542b9dba1c9c9..30f410501206d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php
@@ -173,7 +173,7 @@ public function testGetScopeGlobal()
         $this->assertEquals('global', $this->_model->getScope());
     }
 
-    public function testGetScopeWebiste()
+    public function testGetScopeWebsite()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_model = $objectManagerHelper->getObject(
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Layer/Filter/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Layer/Filter/PriceTest.php
deleted file mode 100644
index 9fba7d833c25a..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Layer/Filter/PriceTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Layer\Filter;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
-class PriceTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
-     */
-    private $model;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $resourceMock;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new ObjectManager($this);
-
-        $contextMock = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
-        $this->model = $objectManagerHelper->getObject(
-            \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price::class,
-            [
-                'context' => $contextMock
-            ]
-        );
-    }
-
-    public function testGetMainTable()
-    {
-        $expectedTableName = 'expectedTableName';
-        $this->resourceMock->expects($this->once())->method('getTableName')->willReturn($expectedTableName);
-        $this->assertEquals($expectedTableName, $this->model->getMainTable());
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
index 9e2b196602993..5a1a5906ec4b9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\CategoryLink;
@@ -129,9 +130,20 @@ public function testSaveCategoryLinks($newCategoryLinks, $dbCategoryLinks, $affe
                 );
         }
 
+        $expectedResult = [];
+
+        foreach ($affectedIds as $type => $ids) {
+            $expectedResult = array_merge($expectedResult, $ids);
+            // Verify if the correct insert, update and/or delete actions are performed:
+            $this->setupExpectationsForConnection($type, $ids);
+        }
+
         $actualResult = $this->model->saveCategoryLinks($product, $newCategoryLinks);
+
         sort($actualResult);
-        $this->assertEquals($affectedIds, $actualResult);
+        sort($expectedResult);
+
+        $this->assertEquals($expectedResult, $actualResult);
     }
 
     /**
@@ -151,7 +163,11 @@ public function getCategoryLinksDataProvider()
                     ['category_id' => 3, 'position' => 10],
                     ['category_id' => 4, 'position' => 20],
                 ],
-                [], // Nothing to update - data not changed
+                [
+                    'update' => [],
+                    'insert' => [],
+                    'delete' => [],
+                ],
             ],
             [
                 [
@@ -162,7 +178,11 @@ public function getCategoryLinksDataProvider()
                     ['category_id' => 3, 'position' => 10],
                     ['category_id' => 4, 'position' => 20],
                 ],
-                [3, 4, 5], // 4 - updated position, 5 - added, 3 - deleted
+                [
+                    'update' => [4],
+                    'insert' => [5],
+                    'delete' => [3],
+                ],
             ],
             [
                 [
@@ -173,7 +193,11 @@ public function getCategoryLinksDataProvider()
                     ['category_id' => 3, 'position' => 10],
                     ['category_id' => 4, 'position' => 20],
                 ],
-                [3, 4], // 3 - updated position, 4 - deleted
+                [
+                    'update' => [3],
+                    'insert' => [],
+                    'delete' => [4],
+                ],
             ],
             [
                 [],
@@ -181,8 +205,80 @@ public function getCategoryLinksDataProvider()
                     ['category_id' => 3, 'position' => 10],
                     ['category_id' => 4, 'position' => 20],
                 ],
-                [3, 4], // 3, 4 - deleted
+                [
+                    'update' => [],
+                    'insert' => [],
+                    'delete' => [3, 4],
+                ],
             ],
+            [
+                [
+                    ['category_id' => 3, 'position' => 10],
+                    ['category_id' => 4, 'position' => 20],
+                ],
+                [
+                    ['category_id' => 3, 'position' => 20], // swapped positions
+                    ['category_id' => 4, 'position' => 10], // swapped positions
+                ],
+                [
+                    'update' => [3, 4],
+                    'insert' => [],
+                    'delete' => [],
+                ],
+            ]
         ];
     }
+
+    /**
+     * @param $type
+     * @param $ids
+     */
+    private function setupExpectationsForConnection($type, $ids): void
+    {
+        switch ($type) {
+            case 'insert':
+                $this->connectionMock
+                    ->expects($this->exactly(empty($ids) ? 0 : 1))
+                    ->method('insertArray')
+                    ->with(
+                        $this->anything(),
+                        $this->anything(),
+                        $this->callback(function ($data) use ($ids) {
+                            $foundIds = [];
+                            foreach ($data as $row) {
+                                $foundIds[] = $row['category_id'];
+                            }
+                            return $ids === $foundIds;
+                        })
+                    );
+                break;
+            case 'update':
+                $this->connectionMock
+                    ->expects($this->exactly(empty($ids) ? 0 : 1))
+                    ->method('insertOnDuplicate')
+                    ->with(
+                        $this->anything(),
+                        $this->callback(function ($data) use ($ids) {
+                            $foundIds = [];
+                            foreach ($data as $row) {
+                                $foundIds[] = $row['category_id'];
+                            }
+                            return $ids === $foundIds;
+                        })
+                    );
+                break;
+            case 'delete':
+                $this->connectionMock
+                    ->expects($this->exactly(empty($ids) ? 0 : 1))
+                    ->method('delete')
+                    // Verify that the correct category ID's are touched:
+                    ->with(
+                        $this->anything(),
+                        $this->callback(function ($data) use ($ids) {
+                            return array_values($data)[1] === $ids;
+                        })
+                    );
+                break;
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
index c73e772de3702..bb39aa7f9db77 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Framework\DB\Select;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -57,13 +58,18 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     private $storeManager;
 
+    /**
+     * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityFactory;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $entityFactory = $this->createMock(\Magento\Framework\Data\Collection\EntityFactory::class);
+        $this->entityFactory = $this->createMock(\Magento\Framework\Data\Collection\EntityFactory::class);
         $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -167,7 +173,7 @@ protected function setUp()
         $this->collection = $this->objectManager->getObject(
             \Magento\Catalog\Model\ResourceModel\Product\Collection::class,
             [
-                'entityFactory' => $entityFactory,
+                'entityFactory' => $this->entityFactory,
                 'logger' => $logger,
                 'fetchStrategy' => $fetchStrategy,
                 'eventManager' => $eventManager,
@@ -239,7 +245,7 @@ public function testAddMediaGalleryData()
         $mediaGalleriesMock = [[$linkField => $rowId]];
         $itemMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getData'])
+            ->setMethods(['getOrigData'])
             ->getMock();
         $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
             ->disableOriginalConstructor()
@@ -254,8 +260,10 @@ public function testAddMediaGalleryData()
         $this->galleryResourceMock->expects($this->once())->method('createBatchBaseSelect')->willReturn($selectMock);
         $attributeMock->expects($this->once())->method('getAttributeId')->willReturn($attributeId);
         $this->entityMock->expects($this->once())->method('getAttribute')->willReturn($attributeMock);
-        $itemMock->expects($this->atLeastOnce())->method('getData')->willReturn($rowId);
-        $selectMock->expects($this->once())->method('where')->with('entity.' . $linkField . ' IN (?)', [$rowId]);
+        $itemMock->expects($this->atLeastOnce())->method('getOrigData')->willReturn($rowId);
+        $selectMock->expects($this->once())->method('reset')->with(Select::ORDER)->willReturnSelf();
+        $selectMock->expects($this->once())->method('where')->with('entity.' . $linkField . ' IN (?)', [$rowId])
+            ->willReturnSelf();
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadataMock);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn($linkField);
 
@@ -376,4 +384,20 @@ public function testAddTierPriceData()
 
         $this->assertSame($this->collection, $this->collection->addTierPriceData());
     }
+
+    /**
+     * Test for getNewEmptyItem() method
+     *
+     * @return void
+     */
+    public function testGetNewEmptyItem()
+    {
+        $item = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->entityFactory->expects($this->once())->method('create')->willReturn($item);
+        $firstItem = $this->collection->getNewEmptyItem();
+        $secondItem = $this->collection->getNewEmptyItem();
+        $this->assertEquals($firstItem, $secondItem);
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php
index dfed4e4f37385..47ef3c999125f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php
@@ -281,6 +281,9 @@ public function testBindValueToEntityRecordExists()
         $this->resource->bindValueToEntity($valueId, $entityId);
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testLoadGallery()
     {
         $productId = 5;
@@ -329,7 +332,8 @@ public function testLoadGallery()
             'main.value_id = entity.value_id',
             ['entity_id']
         )->willReturnSelf();
-        $this->product->expects($this->at(0))->method('getData')->with('entity_id')->willReturn($productId);
+        $this->product->expects($this->at(0))->method('getData')
+            ->with('entity_id')->willReturn($productId);
         $this->product->expects($this->at(1))->method('getStoreId')->will($this->returnValue($storeId));
         $this->connection->expects($this->exactly(2))->method('quoteInto')->withConsecutive(
             ['value.store_id = ?'],
@@ -338,26 +342,50 @@ public function testLoadGallery()
             'value.store_id = ' . $storeId,
             'default_value.store_id = ' . 0
         );
+        $this->connection->expects($this->any())->method('getIfNullSql')->will(
+            $this->returnValueMap([
+                [
+                    '`value`.`label`',
+                    '`default_value`.`label`',
+                    'IFNULL(`value`.`label`, `default_value`.`label`)'
+                ],
+                [
+                    '`value`.`position`',
+                    '`default_value`.`position`',
+                    'IFNULL(`value`.`position`, `default_value`.`position`)'
+                ],
+                [
+                    '`value`.`disabled`',
+                    '`default_value`.`disabled`',
+                    'IFNULL(`value`.`disabled`, `default_value`.`disabled`)'
+                ]
+            ])
+        );
         $this->select->expects($this->at(2))->method('joinLeft')->with(
             ['value' => $getTableReturnValue],
             $quoteInfoReturnValue,
-            [
-                'label',
-                'position',
-                'disabled'
-            ]
+            []
         )->willReturnSelf();
         $this->select->expects($this->at(3))->method('joinLeft')->with(
             ['default_value' => $getTableReturnValue],
             $quoteDefaultInfoReturnValue,
-            ['label_default' => 'label', 'position_default' => 'position', 'disabled_default' => 'disabled']
+            []
         )->willReturnSelf();
-        $this->select->expects($this->at(4))->method('where')->with(
+        $this->select->expects($this->at(4))->method('columns')->with([
+            'label' => 'IFNULL(`value`.`label`, `default_value`.`label`)',
+            'position' => 'IFNULL(`value`.`position`, `default_value`.`position`)',
+            'disabled' => 'IFNULL(`value`.`disabled`, `default_value`.`disabled`)',
+            'label_default' => 'default_value.label',
+            'position_default' => 'default_value.position',
+            'disabled_default' => 'default_value.disabled'
+        ])->willReturnSelf();
+        $this->select->expects($this->at(5))->method('where')->with(
             'main.attribute_id = ?',
             $attributeId
         )->willReturnSelf();
-        $this->select->expects($this->at(5))->method('where')->with('main.disabled = 0')->willReturnSelf();
-        $this->select->expects($this->at(7))->method('where')
+        $this->select->expects($this->at(6))->method('where')
+            ->with('main.disabled = 0')->willReturnSelf();
+        $this->select->expects($this->at(8))->method('where')
                      ->with('entity.entity_id = ?', $productId)
                      ->willReturnSelf();
         $this->select->expects($this->once())->method('order')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
new file mode 100644
index 0000000000000..4fce12dc2de89
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Image;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
+
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var AdapterInterface | MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * @var Generator | MockObject
+     */
+    protected $generatorMock;
+
+    /**
+     * @var ResourceConnection | MockObject
+     */
+    protected $resourceMock;
+
+    protected function setUp(): void
+    {
+        $this->objectManager =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->resourceMock = $this->createMock(ResourceConnection::class);
+        $this->resourceMock->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->resourceMock->method('getTableName')
+            ->willReturnArgument(0);
+        $this->generatorMock = $this->createMock(Generator::class);
+    }
+
+    /**
+     * @return MockObject
+     */
+    protected function getVisibleImagesSelectMock(): MockObject
+    {
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $selectMock->expects($this->once())
+            ->method('distinct')
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('from')
+            ->with(
+                ['images' => Gallery::GALLERY_TABLE],
+                'value as filepath'
+            )->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('where')
+            ->with('disabled = 0')
+            ->willReturnSelf();
+
+        return $selectMock;
+    }
+
+    /**
+     * @param int $imagesCount
+     * @dataProvider dataProvider
+     */
+    public function testGetCountAllProductImages(int $imagesCount): void
+    {
+        $selectMock = $this->getVisibleImagesSelectMock();
+        $selectMock->expects($this->exactly(2))
+            ->method('reset')
+            ->withConsecutive(
+                ['columns'],
+                ['distinct']
+            )->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('columns')
+            ->with(new \Zend_Db_Expr('count(distinct value)'))
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($selectMock);
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($selectMock)
+            ->willReturn($imagesCount);
+
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock
+            ]
+        );
+
+        $this->assertSame(
+            $imagesCount,
+            $imageModel->getCountAllProductImages()
+        );
+    }
+
+    /**
+     * @param int $imagesCount
+     * @param int $batchSize
+     * @dataProvider dataProvider
+     */
+    public function testGetAllProductImages(
+        int $imagesCount,
+        int $batchSize
+    ): void {
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->getVisibleImagesSelectMock());
+
+        $batchCount = (int)ceil($imagesCount / $batchSize);
+        $fetchResultsCallback = $this->getFetchResultCallbackForBatches($imagesCount, $batchSize);
+        $this->connectionMock->expects($this->exactly($batchCount))
+            ->method('fetchAll')
+            ->will($this->returnCallback($fetchResultsCallback));
+
+        /** @var Select | MockObject $selectMock */
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->generatorMock->expects($this->once())
+            ->method('generate')
+            ->with(
+                'value_id',
+                $selectMock,
+                $batchSize,
+                BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+            )->will(
+                $this->returnCallback(
+                    $this->getBatchIteratorCallback($selectMock, $batchCount)
+                )
+            );
+
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock,
+                'batchSize' => $batchSize
+            ]
+        );
+
+        $this->assertCount($imagesCount, $imageModel->getAllProductImages());
+    }
+
+    /**
+     * @param int $imagesCount
+     * @param int $batchSize
+     * @return \Closure
+     */
+    protected function getFetchResultCallbackForBatches(
+        int $imagesCount,
+        int $batchSize
+    ): \Closure {
+        $fetchResultsCallback = function () use (&$imagesCount, $batchSize) {
+            $batchSize =
+                ($imagesCount >= $batchSize) ? $batchSize : $imagesCount;
+            $imagesCount -= $batchSize;
+
+            $getFetchResults = function ($batchSize): array {
+                $result = [];
+                $count = $batchSize;
+                while ($count) {
+                    $count--;
+                    $result[$count] = $count;
+                }
+
+                return $result;
+            };
+
+            return $getFetchResults($batchSize);
+        };
+
+        return $fetchResultsCallback;
+    }
+
+    /**
+     * @param Select | MockObject $selectMock
+     * @param int $batchCount
+     * @return \Closure
+     */
+    protected function getBatchIteratorCallback(
+        MockObject $selectMock,
+        int $batchCount
+    ): \Closure {
+        $iteratorCallback = function () use ($batchCount, $selectMock): array {
+            $result = [];
+            $count = $batchCount;
+            while ($count) {
+                $count--;
+                $result[$count] = $selectMock;
+            }
+
+            return $result;
+        };
+
+        return $iteratorCallback;
+    }
+
+    /**
+     * Data Provider
+     * @return array
+     */
+    public function dataProvider(): array
+    {
+        return [
+            [300, 300],
+            [300, 100],
+            [139, 100],
+            [67, 10],
+            [154, 47],
+            [0, 100]
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php
index 6b908d317aa5b..6f3d8e1a84b17 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class LinkedProductSelectBuilderByIndexPriceTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -56,12 +59,26 @@ protected function setUp()
             $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface::class)
                 ->disableOriginalConstructor()
                 ->getMockForAbstractClass();
+
+        $this->indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Search\Request\IndexScopeResolverInterface::class
+        );
+        $this->dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+        $this->dimensionFactoryMock = $this->createMock(\Magento\Framework\Indexer\DimensionFactory::class);
+        $this->dimensionFactoryMock->method('create')->willReturn($this->dimensionMock);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $storeMock->method('getId')->willReturn(1);
+        $storeMock->method('getWebsiteId')->willReturn(1);
+        $this->storeManagerMock->method('getStore')->willReturn($storeMock);
+
         $this->model = new \Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice(
             $this->storeManagerMock,
             $this->resourceMock,
             $this->customerSessionMock,
             $this->metadataPoolMock,
-            $this->baseSelectProcessorMock
+            $this->baseSelectProcessorMock,
+            $this->indexScopeResolverMock,
+            $this->dimensionFactoryMock
         );
     }
 
@@ -79,12 +96,12 @@ public function testBuild()
         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
             ->getMockForAbstractClass();
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-        $this->customerSessionMock->expects($this->once())->method('getCustomerGroupId');
+        $this->customerSessionMock->expects($this->once())->method('getCustomerGroupId')->willReturn(1);
         $connection->expects($this->any())->method('select')->willReturn($select);
         $select->expects($this->any())->method('from')->willReturnSelf();
         $select->expects($this->any())->method('joinInner')->willReturnSelf();
         $select->expects($this->any())->method('where')->willReturnSelf();
-        $select->expects($this->once())->method('order')->willReturnSelf();
+        $select->expects($this->exactly(2))->method('order')->willReturnSelf();
         $select->expects($this->once())->method('limit')->willReturnSelf();
         $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($connection);
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadata);
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 e5720b4f0536c..c0ecc4370816b 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,7 +38,7 @@ protected function setUp()
 
     public function testEstimateRowSize()
     {
-        $expectedValue = 2400000;
+        $expectedValue = 4000000;
 
         $this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100);
         $collectionMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group\Collection::class);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php
index a21883eb4a18e..ee487041600b5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php
@@ -16,7 +16,7 @@
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 /**
@@ -35,9 +35,9 @@ class StatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase
     private $metadataPool;
 
     /**
-     * @var StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @var Select|\PHPUnit_Framework_MockObject_MockObject
@@ -53,13 +53,13 @@ protected function setUp()
     {
         $this->eavConfig = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
         $this->metadataPool = $this->getMockBuilder(MetadataPool::class)->disableOriginalConstructor()->getMock();
-        $this->storeResolver = $this->getMockBuilder(StoreResolverInterface::class)->getMock();
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)->getMock();
         $this->select = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
 
         $this->statusBaseSelectProcessor =  (new ObjectManager($this))->getObject(StatusBaseSelectProcessor::class, [
             'eavConfig' => $this->eavConfig,
             'metadataPool' => $this->metadataPool,
-            'storeResolver' => $this->storeResolver,
+            'storeManager' => $this->storeManager,
         ]);
     }
 
@@ -94,8 +94,14 @@ public function testProcess()
             ->with(Product::ENTITY, ProductInterface::STATUS)
             ->willReturn($statusAttribute);
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->once())
+            ->method('getId')
             ->willReturn($currentStoreId);
 
         $this->select->expects($this->at(0))
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php
index 517b5949ee8ea..eb7b70c8a1718 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php
@@ -8,7 +8,9 @@
 use Magento\Catalog\Model\Product\Media\ConfigInterface;
 use Magento\Catalog\Model\View\Asset\Image;
 use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\ContextInterface;
+use Magento\Framework\View\Asset\Repository;
 
 /**
  * Class ImageTest
@@ -33,18 +35,43 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imageContext;
+    protected $context;
+
+    /**
+     * @var Repository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $assetRepo;
+
+    private $objectManager;
 
     protected function setUp()
     {
-        $this->mediaConfig = $this->getMockBuilder(ConfigInterface::class)->getMockForAbstractClass();
-        $this->encryptor = $this->getMockBuilder(EncryptorInterface::class)->getMockForAbstractClass();
-        $this->imageContext = $this->getMockBuilder(ContextInterface::class)->getMockForAbstractClass();
-        $this->model = new Image(
-            $this->mediaConfig,
-            $this->imageContext,
-            $this->encryptor,
-            '/somefile.png'
+        $this->mediaConfig = $this->createMock(ConfigInterface::class);
+        $this->encryptor = $this->createMock(EncryptorInterface::class);
+        $this->context = $this->createMock(ContextInterface::class);
+        $this->assetRepo = $this->createMock(Repository::class);
+        $this->objectManager = new ObjectManager($this);
+        $this->model = $this->objectManager->getObject(
+            Image::class,
+            [
+                'mediaConfig' => $this->mediaConfig,
+                'imageContext' => $this->context,
+                'encryptor' => $this->encryptor,
+                'filePath' => '/somefile.png',
+                'assetRepo' => $this->assetRepo,
+                'miscParams' => [
+                    'image_width' => 100,
+                    'image_height' => 50,
+                    'constrain_only' => false,
+                    'keep_aspect_ratio' => false,
+                    'keep_frame' => true,
+                    'keep_transparency' => false,
+                    'background' => '255,255,255',
+                    'image_type' => 'image', //thumbnail,small_image,image,swatch_image,swatch_thumb
+                    'quality' => 80,
+                    'angle' => null
+                ]
+            ]
         );
     }
 
@@ -80,43 +107,24 @@ public function testGetContext()
      */
     public function testGetPath($filePath, $miscParams)
     {
-        $imageModel = new Image(
-            $this->mediaConfig,
-            $this->imageContext,
-            $this->encryptor,
-            $filePath,
-            $miscParams
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'mediaConfig' => $this->mediaConfig,
+                'context' => $this->context,
+                'encryptor' => $this->encryptor,
+                'filePath' => $filePath,
+                'assetRepo' => $this->assetRepo,
+                'miscParams' => $miscParams
+            ]
         );
+        $miscParams['background'] = isset($miscParams['background']) ? implode(',', $miscParams['background']) : '';
         $absolutePath = '/var/www/html/magento2ce/pub/media/catalog/product';
         $hashPath = md5(implode('_', $miscParams));
-        $this->imageContext->expects($this->once())->method('getPath')->willReturn($absolutePath);
-        $this->encryptor->expects($this->once())->method('hash')->willReturn($hashPath);
-        $this->assertEquals(
-            $absolutePath . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . $hashPath . $filePath,
-            $imageModel->getPath()
-        );
-    }
-
-    /**
-     * @param string $filePath
-     * @param array $miscParams
-     * @dataProvider getPathDataProvider
-     */
-    public function testGetNotUnixPath($filePath, $miscParams)
-    {
-        $imageModel = new Image(
-            $this->mediaConfig,
-            $this->imageContext,
-            $this->encryptor,
-            $filePath,
-            $miscParams
-        );
-        $absolutePath = 'C:\www\magento2ce\pub\media\catalog\product';
-        $hashPath = md5(implode('_', $miscParams));
-        $this->imageContext->expects($this->once())->method('getPath')->willReturn($absolutePath);
-        $this->encryptor->expects($this->once())->method('hash')->willReturn($hashPath);
-        $this->assertEquals(
-            $absolutePath . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . $hashPath . $filePath,
+        $this->context->method('getPath')->willReturn($absolutePath);
+        $this->encryptor->method('hash')->willReturn($hashPath);
+        static::assertEquals(
+            $absolutePath . '/cache/'. $hashPath . $filePath,
             $imageModel->getPath()
         );
     }
@@ -128,23 +136,31 @@ public function testGetNotUnixPath($filePath, $miscParams)
      */
     public function testGetUrl($filePath, $miscParams)
     {
-        $imageModel = new Image(
-            $this->mediaConfig,
-            $this->imageContext,
-            $this->encryptor,
-            $filePath,
-            $miscParams
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'mediaConfig' => $this->mediaConfig,
+                'context' => $this->context,
+                'encryptor' => $this->encryptor,
+                'filePath' => $filePath,
+                'assetRepo' => $this->assetRepo,
+                'miscParams' => $miscParams
+            ]
         );
+        $miscParams['background'] = isset($miscParams['background']) ? implode(',', $miscParams['background']) : '';
         $absolutePath = 'http://localhost/pub/media/catalog/product';
         $hashPath = md5(implode('_', $miscParams));
-        $this->imageContext->expects($this->once())->method('getBaseUrl')->willReturn($absolutePath);
-        $this->encryptor->expects($this->once())->method('hash')->willReturn($hashPath);
-        $this->assertEquals(
-            $absolutePath . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . $hashPath . $filePath,
+        $this->context->expects(static::once())->method('getBaseUrl')->willReturn($absolutePath);
+        $this->encryptor->expects(static::once())->method('hash')->willReturn($hashPath);
+        static::assertEquals(
+            $absolutePath . '/cache/' . $hashPath . $filePath,
             $imageModel->getUrl()
         );
     }
 
+    /**
+     * @return array
+     */
     public function getPathDataProvider()
     {
         return [
@@ -162,7 +178,7 @@ public function getPathDataProvider()
                     'keep_frame' => 'frame',
                     'keep_transparency' => 'transparency',
                     'constrain_only' => 'doconstrainonly',
-                    'background' => 'ffffff',
+                    'background' => [233,1,0],
                     'angle' => null,
                     'quality' => 80,
                 ],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
index 96a6c15e35651..58007145d21a4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
@@ -147,6 +147,9 @@ public function testGetUrl($imageType, $placeholderPath)
         $this->assertEquals($expectedResult, $imageModel->getUrl());
     }
 
+    /**
+     * @return array
+     */
     public function getPathDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
index 2d67db77d430b..c5a3e5dab7678 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
@@ -87,7 +87,7 @@ protected function setUp()
             \Magento\Catalog\Model\ResourceModel\Category\Collection::class
         );
         $this->categoryCollectionFactoryMock = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class,
+            \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory::class,
             ['create']
         );
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php
new file mode 100644
index 0000000000000..463ecf881977e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Plugin\Model\Attribute\Backend;
+
+use Magento\Catalog\Plugin\Model\Attribute\Backend\AttributeValidation;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\DataObject;
+
+class AttributeValidationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AttributeValidation
+     */
+    private $attributeValidation;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var array
+     */
+    private $allowedEntityTypes;
+
+    /**
+     * @var \Callable
+     */
+    private $proceedMock;
+
+    /**
+     * @var bool
+     */
+    private $isProceedMockCalled = false;
+
+    /**
+     * @var AbstractBackend|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMock;
+
+    /**
+     * @var DataObject|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->attributeMock = $this->getMockBuilder(AbstractBackend::class)
+            ->setMethods(['getAttributeCode'])
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(AbstractBackend::class)
+            ->setMethods(['getAttribute'])
+            ->getMockForAbstractClass();
+        $this->subjectMock->expects($this->any())
+            ->method('getAttribute')
+            ->willReturn($this->attributeMock);
+
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
+        $this->entityMock = $this->getMockBuilder(DataObject::class)
+            ->setMethods(['getData'])
+            ->getMock();
+
+        $this->allowedEntityTypes = [$this->entityMock];
+
+        $this->proceedMock = function () {
+            $this->isProceedMockCalled = true;
+        };
+
+        $this->attributeValidation = $objectManager->getObject(
+            AttributeValidation::class,
+            [
+                'storeManager' => $this->storeManagerMock,
+                'allowedEntityTypes' => $this->allowedEntityTypes,
+            ]
+        );
+    }
+
+    /**
+     * @param bool $shouldProceedRun
+     * @param bool $defaultStoreUsed
+     * @param null|int|string $storeId
+     * @dataProvider aroundValidateDataProvider
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @return void
+     */
+    public function testAroundValidate(bool $shouldProceedRun, bool $defaultStoreUsed, $storeId)
+    {
+        $this->isProceedMockCalled = false;
+        $attributeCode = 'code';
+
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($storeId);
+        if ($defaultStoreUsed) {
+            $this->attributeMock->expects($this->once())
+                ->method('getAttributeCode')
+                ->willReturn($attributeCode);
+            $this->entityMock->expects($this->at(0))
+                ->method('getData')
+                ->willReturn([$attributeCode => null]);
+            $this->entityMock->expects($this->at(1))
+                ->method('getData')
+                ->with($attributeCode)
+                ->willReturn(null);
+        }
+
+        $this->attributeValidation->aroundValidate($this->subjectMock, $this->proceedMock, $this->entityMock);
+        $this->assertSame($shouldProceedRun, $this->isProceedMockCalled);
+    }
+
+    /**
+     * Data provider for testAroundValidate
+     * @return array
+     */
+    public function aroundValidateDataProvider(): array
+    {
+        return [
+            [true, false, '0'],
+            [true, false, 0],
+            [true, false, null],
+            [false, true, 1],
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
index d994e65a63a26..b823549391257 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
@@ -106,6 +106,9 @@ public function testGetValue($specialPriceValue, $expectedResult)
         $this->assertSame($expectedResult, $this->basePrice->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function getValueDataProvider()
     {
         return [[77, 77], [0, 0], [false, 99]];
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php
index f3436b8f9f09f..e21cad7a32a99 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php
@@ -77,6 +77,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @param array $optionsData
+     * @return array
+     */
     protected function setupOptions(array $optionsData)
     {
         $options = [];
@@ -105,6 +109,10 @@ protected function setupOptions(array $optionsData)
         return $options;
     }
 
+    /**
+     * @param $optionsData
+     * @return array
+     */
     protected function setupSingleValueOptions($optionsData)
     {
         $options = [];
@@ -279,7 +287,7 @@ protected function getOptionValueMock($price)
     {
         $optionValueMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Value::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getPriceType', 'getPrice', 'getId', '__wakeup'])
+            ->setMethods(['getPriceType', 'getPrice', 'getId', '__wakeup', 'getOption', 'getData'])
             ->getMock();
         $optionValueMock->expects($this->any())
             ->method('getPriceType')
@@ -288,6 +296,29 @@ protected function getOptionValueMock($price)
             ->method('getPrice')
             ->with($this->equalTo(true))
             ->will($this->returnValue($price));
+
+        $optionValueMock->expects($this->any())
+            ->method('getData')
+            ->with(\Magento\Catalog\Model\Product\Option\Value::KEY_PRICE)
+            ->willReturn($price);
+
+        $optionMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMock();
+
+        $optionValueMock->expects($this->any())->method('getOption')->willReturn($optionMock);
+
+        $optionMock->expects($this->any())->method('getProduct')->willReturn($this->product);
+
+        $priceMock = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getValue'])
+            ->getMockForAbstractClass();
+        $priceMock->method('getValue')->willReturn($price);
+
+        $this->priceInfo->method('getPrice')->willReturn($priceMock);
+
         return $optionValueMock;
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php
index d04bb4c681e67..1c50271976d15 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php
@@ -61,6 +61,9 @@ public function setUp()
         );
     }
 
+    /**
+     * @return int
+     */
     private function getValueTierPricesExistShouldReturnMinTierPrice()
     {
         $minPrice = 5;
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 fc45a2e0c2146..397cd0fb2d165 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
         );
     }
@@ -346,6 +347,9 @@ public function testHasSpecialPrice($regularPrice, $finalPrice, $expectedResult)
         $this->assertEquals($expectedResult, $this->object->hasSpecialPrice());
     }
 
+    /**
+     * @return array
+     */
     public function hasSpecialPriceProvider()
     {
         return [
@@ -359,7 +363,7 @@ public function testShowMinimalPrice()
     {
         $minimalPrice = 5.0;
         $finalPrice = 10.0;
-        $displayMininmalPrice = true;
+        $displayMinimalPrice = true;
 
         $this->minimalPriceCalculator->expects($this->once())->method('getValue')->with($this->product)
             ->willReturn($minimalPrice);
@@ -379,7 +383,7 @@ public function testShowMinimalPrice()
             ->with(FinalPrice::PRICE_CODE)
             ->willReturn($finalPriceType);
 
-        $this->object->setDisplayMinimalPrice($displayMininmalPrice);
+        $this->object->setDisplayMinimalPrice($displayMinimalPrice);
         $this->assertTrue($this->object->showMinimalPrice());
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Render/PriceBoxTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Render/PriceBoxTest.php
index 986a1f7710919..e4d531e91fa07 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Render/PriceBoxTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Render/PriceBoxTest.php
@@ -88,6 +88,9 @@ public function testGetCanDisplayQty($typeCode, $expected)
         $this->assertEquals($expected, $this->object->getCanDisplayQty($product));
     }
 
+    /**
+     * @return array
+     */
     public function getCanDisplayQtyDataProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php
new file mode 100644
index 0000000000000..dcd50d4739d70
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Ui\Component\Product;
+
+use Magento\Catalog\Ui\Component\Product\MassAction;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+
+class MassActionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    /**
+     * @var MassAction
+     */
+    private $massAction;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->contextMock = $this->getMockBuilder(ContextInterface::class)
+            ->getMockForAbstractClass();
+        $this->authorizationMock = $this->getMockBuilder(AuthorizationInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->massAction = $this->objectManager->getObject(
+            MassAction::class,
+            [
+                'authorization' => $this->authorizationMock,
+                'context' => $this->contextMock,
+                'data' => []
+            ]
+        );
+    }
+
+    public function testGetComponentName()
+    {
+        $this->assertTrue($this->massAction->getComponentName() === MassAction::NAME);
+    }
+
+    /**
+     * @param string $componentName
+     * @param array $componentData
+     * @param bool $isAllowed
+     * @param bool $expectActionConfig
+     * @return void
+     * @dataProvider getPrepareDataProvider
+     */
+    public function testPrepare($componentName, $componentData, $isAllowed = true, $expectActionConfig = true)
+    {
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
+        /** @var \Magento\Ui\Component\MassAction $action */
+        $action = $this->objectManager->getObject(
+            \Magento\Ui\Component\MassAction::class,
+            [
+                'context' => $this->contextMock,
+                'data' => [
+                    'name' => $componentName,
+                    'config' => $componentData,
+                ]
+            ]
+        );
+        $this->authorizationMock->method('isAllowed')
+            ->willReturn($isAllowed);
+        $this->massAction->addComponent('action', $action);
+        $this->massAction->prepare();
+        $expected = $expectActionConfig ? ['actions' => [$action->getConfiguration()]] : [];
+        $this->assertEquals($expected, $this->massAction->getConfiguration());
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getPrepareDataProvider() : array
+    {
+        return [
+            [
+                'test_component1',
+                [
+                    'type' => 'first_action',
+                    'label' => 'First Action',
+                    'url' => '/module/controller/firstAction'
+                ],
+            ],
+            [
+                'test_component2',
+                [
+                    'type' => 'second_action',
+                    'label' => 'Second Action',
+                    'actions' => [
+                        [
+                            'type' => 'second_sub_action1',
+                            'label' => 'Second Sub Action 1',
+                            'url' => '/module/controller/secondSubAction1'
+                        ],
+                        [
+                            'type' => 'second_sub_action2',
+                            'label' => 'Second Sub Action 2',
+                            'url' => '/module/controller/secondSubAction2'
+                        ],
+                    ]
+                ],
+            ],
+            [
+                'status_component',
+                [
+                    'type' => 'status',
+                    'label' => 'Status',
+                    'actions' => [
+                        [
+                            'type' => 'enable',
+                            'label' => 'Second Sub Action 1',
+                            'url' => '/module/controller/enable'
+                        ],
+                        [
+                            'type' => 'disable',
+                            'label' => 'Second Sub Action 2',
+                            'url' => '/module/controller/disable'
+                        ],
+                    ]
+                ],
+            ],
+            [
+                'status_component_not_allowed',
+                [
+                    'type' => 'status',
+                    'label' => 'Status',
+                    'actions' => [
+                        [
+                            'type' => 'enable',
+                            'label' => 'Second Sub Action 1',
+                            'url' => '/module/controller/enable'
+                        ],
+                        [
+                            'type' => 'disable',
+                            'label' => 'Second Sub Action 2',
+                            'url' => '/module/controller/disable'
+                        ],
+                    ]
+                ],
+                false,
+                false
+            ],
+            [
+                'delete_component',
+                [
+                    'type' => 'delete',
+                    'label' => 'First Action',
+                    'url' => '/module/controller/delete'
+                ],
+            ],
+            [
+                'delete_component_not_allowed',
+                [
+                    'type' => 'delete',
+                    'label' => 'First Action',
+                    'url' => '/module/controller/delete'
+                ],
+                false,
+                false
+            ],
+            [
+                'attributes_component',
+                [
+                    'type' => 'delete',
+                    'label' => 'First Action',
+                    'url' => '/module/controller/attributes'
+                ],
+            ],
+            [
+                'attributes_component_not_allowed',
+                [
+                    'type' => 'delete',
+                    'label' => 'First Action',
+                    'url' => '/module/controller/attributes'
+                ],
+                false,
+                false
+            ],
+        ];
+    }
+
+    /**
+     * @param bool $expected
+     * @param string $actionType
+     * @param int $callNum
+     * @param string $resource
+     * @param bool $isAllowed
+     * @dataProvider isActionAllowedDataProvider
+     */
+    public function testIsActionAllowed($expected, $actionType, $callNum, $resource = '', $isAllowed = true)
+    {
+        $this->authorizationMock->expects($this->exactly($callNum))
+            ->method('isAllowed')
+            ->with($resource)
+            ->willReturn($isAllowed);
+
+        $this->assertEquals($expected, $this->massAction->isActionAllowed($actionType));
+    }
+
+    /**
+     * @return array
+     */
+    public function isActionAllowedDataProvider()
+    {
+        return [
+            'other' => [true, 'other', 0,],
+            'delete-allowed' => [true, 'delete', 1, 'Magento_Catalog::products'],
+            'delete-not-allowed' => [false, 'delete', 1, 'Magento_Catalog::products', false],
+            'status-allowed' => [true, 'status', 1, 'Magento_Catalog::products'],
+            'status-not-allowed' => [false, 'status', 1, 'Magento_Catalog::products', false],
+            'attributes-allowed' => [true, 'attributes', 1, 'Magento_Catalog::update_attributes'],
+            'attributes-not-allowed' => [false, 'attributes', 1, 'Magento_Catalog::update_attributes', false],
+
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php
index 9b0ade2b1288f..57b277a786ea3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php
@@ -53,6 +53,9 @@ public function testBuild($frontendInput, $frontendClass, array $eavConfig, arra
         $this->assertEquals($expectedResult, $this->catalogEavValidationRules->build($attribute, $eavConfig));
     }
 
+    /**
+     * @return array
+     */
     public function buildDataProvider()
     {
         $data['required'] = true;
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
index af10eeea42fd3..473f1aea33618 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
@@ -63,7 +63,8 @@ protected function setUp()
                 'getAttributes',
                 'getStore',
                 'getAttributeDefaultValue',
-                'getExistsStoreValueFlag'
+                'getExistsStoreValueFlag',
+                'isLockedAttribute'
             ])->getMockForAbstractClass();
         $this->storeMock = $this->getMockBuilder(StoreInterface::class)
             ->setMethods(['load', 'getId', 'getConfig'])
@@ -81,9 +82,6 @@ protected function setUp()
         $this->arrayManagerMock->expects($this->any())
             ->method('set')
             ->willReturnArgument(1);
-        $this->arrayManagerMock->expects($this->any())
-            ->method('merge')
-            ->willReturnArgument(1);
         $this->arrayManagerMock->expects($this->any())
             ->method('remove')
             ->willReturnArgument(1);
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
index c22dde0b456ac..e36021fc7ebf6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AttributeSet;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
@@ -84,7 +85,33 @@ protected function createModel()
 
     public function testModifyMeta()
     {
-        $this->assertNotEmpty($this->getModel()->modifyMeta(['test_group' => []]));
+        $modifyMeta = $this->getModel()->modifyMeta(['test_group' => []]);
+        $this->assertNotEmpty($modifyMeta);
+    }
+
+    /**
+     * @param bool $locked
+     * @dataProvider modifyMetaLockedDataProvider
+     */
+    public function testModifyMetaLocked($locked)
+    {
+        $this->productMock->expects($this->any())
+            ->method('isLockedAttribute')
+            ->willReturn($locked);
+        $modifyMeta = $this->getModel()->modifyMeta([AbstractModifier::DEFAULT_GENERAL_PANEL => []]);
+        $children = $modifyMeta[AbstractModifier::DEFAULT_GENERAL_PANEL]['children'];
+        $this->assertEquals(
+            $locked,
+            $children['attribute_set_id']['arguments']['data']['config']['disabled']
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function modifyMetaLockedDataProvider()
+    {
+        return [[true], [false]];
     }
 
     public function testModifyMetaToBeEmpty()
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
index 4daff7e7930e3..cd6565f32ed18 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
@@ -114,6 +114,47 @@ public function testModifyMeta()
         $this->assertArrayHasKey($groupCode, $this->getModel()->modifyMeta($meta));
     }
 
+    /**
+     * @param bool $locked
+     * @dataProvider modifyMetaLockedDataProvider
+     */
+    public function testModifyMetaLocked($locked)
+    {
+        $groupCode = 'test_group_code';
+        $meta = [
+            $groupCode => [
+                'children' => [
+                    'category_ids' => [
+                        'sortOrder' => 10,
+                    ],
+                ],
+            ],
+        ];
+
+        $this->arrayManagerMock->expects($this->any())
+            ->method('findPath')
+            ->willReturn('path');
+
+        $this->productMock->expects($this->any())
+            ->method('isLockedAttribute')
+            ->willReturn($locked);
+
+        $this->arrayManagerMock->expects($this->any())
+            ->method('merge')
+            ->willReturnArgument(2);
+
+        $modifyMeta = $this->createModel()->modifyMeta($meta);
+        $this->assertEquals($locked, $modifyMeta['arguments']['data']['config']['disabled']);
+    }
+
+    /**
+     * @return array
+     */
+    public function modifyMetaLockedDataProvider()
+    {
+        return [[true], [false]];
+    }
+
     public function testModifyMetaWithCaching()
     {
         $this->arrayManagerMock->expects($this->exactly(2))
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
index 921a8dcdfe6b8..dd9819cdbc5ab 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
@@ -154,7 +154,16 @@ public function testModifyMeta()
             ->method('getAll')
             ->willReturn([]);
 
-        $this->assertArrayHasKey(CustomOptions::GROUP_CUSTOM_OPTIONS_NAME, $this->getModel()->modifyMeta([]));
+        $meta = $this->getModel()->modifyMeta([]);
+
+        $this->assertArrayHasKey(CustomOptions::GROUP_CUSTOM_OPTIONS_NAME, $meta);
+
+        $buttonAdd = $meta['custom_options']['children']['container_header']['children']['button_add'];
+        $buttonAddTargetName = $buttonAdd['arguments']['data']['config']['actions'][0]['targetName'];
+        $expectedTargetName = '${ $.ns }.${ $.ns }.' . CustomOptions::GROUP_CUSTOM_OPTIONS_NAME
+            . '.' . CustomOptions::GRID_OPTIONS_NAME;
+
+        $this->assertEquals($expectedTargetName, $buttonAddTargetName);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
index b91a7e1fa99fd..8cb59b1a2ccec 100755
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\EntityManager\EventManager;
 use Magento\Framework\Phrase;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
@@ -20,6 +19,7 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 use Magento\Eav\Model\Entity\Type as EntityType;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection as AttributeCollection;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
 use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
 use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -88,6 +88,11 @@ class EavTest extends AbstractModifierTest
      */
     private $entityTypeMock;
 
+    /**
+     * @var AttributeCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeCollectionFactoryMock;
+
     /**
      * @var AttributeCollection|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -187,7 +192,7 @@ class EavTest extends AbstractModifierTest
      * @var ObjectManager
      */
     protected $objectManager;
-    
+
     /**
      * @var Eav
      */
@@ -226,6 +231,10 @@ protected function setUp()
         $this->entityTypeMock = $this->getMockBuilder(EntityType::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->attributeCollectionFactoryMock = $this->getMockBuilder(AttributeCollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
         $this->attributeCollectionMock = $this->getMockBuilder(AttributeCollection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -257,7 +266,15 @@ protected function setUp()
         $this->searchResultsMock = $this->getMockBuilder(SearchResultsInterface::class)
             ->getMockForAbstractClass();
         $this->eavAttributeMock = $this->getMockBuilder(Attribute::class)
-            ->setMethods(['load', 'getAttributeGroupCode', 'getApplyTo', 'getFrontendInput', 'getAttributeCode'])
+            ->setMethods([
+                'load',
+                'getAttributeGroupCode',
+                'getApplyTo',
+                'getFrontendInput',
+                'getAttributeCode',
+                'usesSource',
+                'getSource',
+            ])
             ->disableOriginalConstructor()
             ->getMock();
         $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
@@ -324,7 +341,7 @@ protected function setUp()
         $this->eavAttributeMock->expects($this->any())
             ->method('load')
             ->willReturnSelf();
-        
+
         $this->eav =$this->getModel();
         $this->objectManager->setBackwardCompatibleProperty(
             $this->eav,
@@ -353,7 +370,8 @@ protected function createModel()
             'attributeRepository' => $this->attributeRepositoryMock,
             'arrayManager' => $this->arrayManagerMock,
             'eavAttributeFactory' => $this->eavAttributeFactoryMock,
-            '_eventManager' => $this->eventManagerMock
+            '_eventManager' => $this->eventManagerMock,
+            'attributeCollectionFactory' => $this->attributeCollectionFactoryMock
         ]);
     }
 
@@ -367,144 +385,131 @@ public function testModifyData()
             ]
         ];
 
-        $this->locatorMock->expects($this->any())
-            ->method('getProduct')
+        $this->attributeCollectionFactoryMock->expects($this->once())->method('create')
+            ->willReturn($this->attributeCollectionMock);
+
+        $this->attributeCollectionMock->expects($this->any())->method('getItems')
+            ->willReturn([
+                $this->eavAttributeMock
+            ]);
+
+        $this->locatorMock->expects($this->any())->method('getProduct')
             ->willReturn($this->productMock);
 
-        $this->productMock->expects($this->any())
-            ->method('getId')
+        $this->productMock->expects($this->any())->method('getId')
             ->willReturn(1);
-        $this->productMock->expects($this->once())
-            ->method('getAttributeSetId')
+        $this->productMock->expects($this->once())->method('getAttributeSetId')
             ->willReturn(4);
-        $this->productMock->expects($this->once())
-            ->method('getData')
+        $this->productMock->expects($this->once())->method('getData')
             ->with(ProductAttributeInterface::CODE_PRICE)->willReturn('19.9900');
 
-        $this->searchCriteriaBuilderMock->expects($this->any())
-            ->method('addFilter')
+        $this->searchCriteriaBuilderMock->expects($this->any())->method('addFilter')
             ->willReturnSelf();
-        $this->searchCriteriaBuilderMock->expects($this->any())
-            ->method('create')
+        $this->searchCriteriaBuilderMock->expects($this->any())->method('create')
             ->willReturn($this->searchCriteriaMock);
-        $this->attributeGroupRepositoryMock->expects($this->any())
-            ->method('getList')
+        $this->attributeGroupRepositoryMock->expects($this->any())->method('getList')
             ->willReturn($this->searchCriteriaMock);
-        $this->searchCriteriaMock->expects($this->once())
-            ->method('getItems')
+        $this->searchCriteriaMock->expects($this->once())->method('getItems')
             ->willReturn([$this->attributeGroupMock]);
-        $this->sortOrderBuilderMock->expects($this->once())
-            ->method('setField')
+        $this->sortOrderBuilderMock->expects($this->once())->method('setField')
             ->willReturnSelf();
-        $this->sortOrderBuilderMock->expects($this->once())
-            ->method('setAscendingDirection')
+        $this->sortOrderBuilderMock->expects($this->once())->method('setAscendingDirection')
             ->willReturnSelf();
         $dataObjectMock = $this->createMock(\Magento\Framework\Api\AbstractSimpleObject::class);
-        $this->sortOrderBuilderMock->expects($this->once())
-            ->method('create')
+        $this->sortOrderBuilderMock->expects($this->once())->method('create')
             ->willReturn($dataObjectMock);
 
-        $this->searchCriteriaBuilderMock->expects($this->any())
-            ->method('addFilter')
+        $this->searchCriteriaBuilderMock->expects($this->any())->method('addFilter')
             ->willReturnSelf();
-        $this->searchCriteriaBuilderMock->expects($this->once())
-            ->method('addSortOrder')
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('addSortOrder')
             ->willReturnSelf();
-        $this->searchCriteriaBuilderMock->expects($this->any())
-            ->method('create')
+        $this->searchCriteriaBuilderMock->expects($this->any())->method('create')
             ->willReturn($this->searchCriteriaMock);
 
-        $this->attributeRepositoryMock->expects($this->once())
-            ->method('getList')
+        $this->attributeRepositoryMock->expects($this->once())->method('getList')
             ->with($this->searchCriteriaMock)
             ->willReturn($this->searchResultsMock);
-        $this->eavAttributeMock->expects($this->any())
-            ->method('getAttributeGroupCode')
+        $this->eavAttributeMock->expects($this->any())->method('getAttributeGroupCode')
             ->willReturn('product-details');
-        $this->eavAttributeMock->expects($this->once())
-            ->method('getApplyTo')
+        $this->eavAttributeMock->expects($this->once())->method('getApplyTo')
             ->willReturn([]);
-        $this->eavAttributeMock->expects($this->once())
-            ->method('getFrontendInput')
+        $this->eavAttributeMock->expects($this->once())->method('getFrontendInput')
             ->willReturn('price');
-        $this->eavAttributeMock->expects($this->any())
-            ->method('getAttributeCode')
+        $this->eavAttributeMock->expects($this->any())->method('getAttributeCode')
             ->willReturn(ProductAttributeInterface::CODE_PRICE);
-        $this->searchResultsMock->expects($this->once())
-            ->method('getItems')
+        $this->searchResultsMock->expects($this->once())->method('getItems')
             ->willReturn([$this->eavAttributeMock]);
 
-        $this->storeMock->expects(($this->once()))
-            ->method('getBaseCurrencyCode')
+        $this->storeMock->expects(($this->once()))->method('getBaseCurrencyCode')
             ->willReturn('en_US');
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
+        $this->storeManagerMock->expects($this->once())->method('getStore')
             ->willReturn($this->storeMock);
-        $this->currencyMock->expects($this->once())
-            ->method('toCurrency')
+        $this->currencyMock->expects($this->once())->method('toCurrency')
             ->willReturn('19.99');
-        $this->currencyLocaleMock->expects($this->once())
-            ->method('getCurrency')
+        $this->currencyLocaleMock->expects($this->once())->method('getCurrency')
             ->willReturn($this->currencyMock);
 
         $this->assertEquals($sourceData, $this->eav->modifyData([]));
     }
 
     /**
-     * @param int $productId
+     * @param int|null $productId
      * @param bool $productRequired
-     * @param string $attrValue
-     * @param string $note
+     * @param string|null $attrValue
      * @param array $expected
+     * @param bool $locked
      * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::isProductExists
      * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::setupAttributeMeta
      * @dataProvider setupAttributeMetaDataProvider
      */
-    public function testSetupAttributeMetaDefaultAttribute($productId, $productRequired, $attrValue, $note, $expected)
-    {
-        $configPath =  'arguments/data/config';
+    public function testSetupAttributeMetaDefaultAttribute(
+        $productId,
+        bool $productRequired,
+        $attrValue,
+        array $expected,
+        $locked = false
+    ) : void {
+        $configPath = 'arguments/data/config';
         $groupCode = 'product-details';
         $sortOrder = '0';
+        $attributeOptions = [
+            ['value' => 1, 'label' => 'Int label'],
+            ['value' => 1.5, 'label' => 'Float label'],
+            ['value' => true, 'label' => 'Boolean label'],
+            ['value' => 'string', 'label' => 'String label'],
+            ['value' => ['test1', 'test2'], 'label' => 'Array label'],
+        ];
+        $attributeOptionsExpected = [
+            ['value' => '1', 'label' => 'Int label'],
+            ['value' => '1.5', 'label' => 'Float label'],
+            ['value' => '1', 'label' => 'Boolean label'],
+            ['value' => 'string', 'label' => 'String label'],
+            ['value' => ['test1', 'test2'], 'label' => 'Array label'],
+        ];
 
-        $this->productMock->expects($this->any())
-            ->method('getId')
-            ->willReturn($productId);
-
-        $this->productAttributeMock->expects($this->any())
-            ->method('getIsRequired')
-            ->willReturn($productRequired);
-
-        $this->productAttributeMock->expects($this->any())
-            ->method('getDefaultValue')
-            ->willReturn('required_value');
-
-        $this->productAttributeMock->expects($this->any())
-            ->method('getAttributeCode')
-            ->willReturn('code');
-
-        $this->productAttributeMock->expects($this->any())
-            ->method('getValue')
-            ->willReturn('value');
-
-        $this->productAttributeMock->expects($this->any())
-            ->method('getNote')
-            ->willReturn($note);
+        $this->productMock->method('getId')->willReturn($productId);
+        $this->productMock->expects($this->any())->method('isLockedAttribute')->willReturn($locked);
+        $this->productAttributeMock->method('getIsRequired')->willReturn($productRequired);
+        $this->productAttributeMock->method('getDefaultValue')->willReturn('required_value');
+        $this->productAttributeMock->method('getAttributeCode')->willReturn('code');
+        $this->productAttributeMock->method('getValue')->willReturn('value');
 
         $attributeMock = $this->getMockBuilder(AttributeInterface::class)
             ->setMethods(['getValue'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $attributeMock->expects($this->any())
-            ->method('getValue')
-            ->willReturn($attrValue);
+        $attributeMock->method('getValue')->willReturn($attrValue);
 
-        $this->productMock->expects($this->any())
-            ->method('getCustomAttribute')
-            ->willReturn($attributeMock);
+        $this->productMock->method('getCustomAttribute')->willReturn($attributeMock);
+        $this->eavAttributeMock->method('usesSource')->willReturn(true);
 
-        $this->arrayManagerMock->expects($this->any())
-            ->method('set')
+        $attributeSource = $this->getMockBuilder(SourceInterface::class)->getMockForAbstractClass();
+        $attributeSource->method('getAllOptions')->willReturn($attributeOptions);
+
+        $this->eavAttributeMock->method('getSource')->willReturn($attributeSource);
+
+        $this->arrayManagerMock->method('set')
             ->with(
                 $configPath,
                 [],
@@ -514,14 +519,19 @@ public function testSetupAttributeMetaDefaultAttribute($productId, $productRequi
 
         $this->arrayManagerMock->expects($this->any())
             ->method('merge')
+            ->with(
+                $this->anything(),
+                $this->anything(),
+                $this->callback(
+                    function ($value) use ($attributeOptionsExpected) {
+                        return isset($value['options']) ? $value['options'] === $attributeOptionsExpected : true;
+                    }
+                )
+            )
             ->willReturn($expected);
 
-        $this->arrayManagerMock->expects($this->any())
-            ->method('get')
-            ->willReturn([]);
-
-        $this->arrayManagerMock->expects($this->any())
-            ->method('exists');
+        $this->arrayManagerMock->method('get')->willReturn([]);
+        $this->arrayManagerMock->method('exists')->willReturn(true);
 
         $this->assertEquals(
             $expected,
@@ -531,151 +541,127 @@ public function testSetupAttributeMetaDefaultAttribute($productId, $productRequi
 
     /**
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function setupAttributeMetaDataProvider()
     {
         return [
-            'default_null_prod_not_new_and_required' => $this->defaultNullProdNotNewAndRequired(),
-            'default_null_prod_not_new_and_not_required' => $this->defaultNullProdNotNewAndNotRequired(),
-            'default_null_prod_new_and_not_required' => $this->defaultNullProdNewAndNotRequired(),
-            'default_null_prod_new_and_required' => $this->defaultNullProdNewAndRequired(),
-            'default_null_prod_new_and_required_and_filled_notice' =>
-                $this->defaultNullProdNewAndRequiredAndFilledNotice()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function defaultNullProdNotNewAndRequired()
-    {
-        return [
-            'productId'       => 1,
-            'productRequired' => true,
-            'attrValue'       => 'val',
-            'note'            => null,
-            'expected'        => [
-                'dataType'    => null,
-                'formElement' => null,
-                'visible'     => null,
-                'required'    => true,
-                'notice'      => null,
-                'default'     => null,
-                'label'       => null,
-                'code'        => 'code',
-                'source'      => 'product-details',
-                'scopeLabel'  => '',
-                'globalScope' => false,
-                'sortOrder'   => 0
+            'default_null_prod_not_new_and_required' => [
+                'productId' => 1,
+                'productRequired' => true,
+                'attrValue' => 'val',
+                'expected' => [
+                    'dataType' => null,
+                    'formElement' => null,
+                    'visible' => null,
+                    'required' => true,
+                    'notice' => null,
+                    'default' => null,
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                ],
             ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function defaultNullProdNotNewAndNotRequired()
-    {
-        return [
-            'productId'       => 1,
-            'productRequired' => false,
-            'attrValue'       => 'val',
-            'note'            => null,
-            'expected'        => [
-                'dataType'    => null,
-                'formElement' => null,
-                'visible'     => null,
-                'required'    => false,
-                'notice'      => null,
-                'default'     => null,
-                'label'       => null,
-                'code'        => 'code',
-                'source'      => 'product-details',
-                'scopeLabel'  => '',
-                'globalScope' => false,
-                'sortOrder'   => 0
+            'default_null_prod_not_new_locked_and_required' => [
+                'productId' => 1,
+                'productRequired' => true,
+                'attrValue' => 'val',
+                'expected' => [
+                    'dataType' => null,
+                    'formElement' => null,
+                    'visible' => null,
+                    'required' => true,
+                    'notice' => null,
+                    'default' => null,
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                ],
+                'locked' => true,
             ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function defaultNullProdNewAndNotRequired()
-    {
-        return [
-            'productId'       => null,
-            'productRequired' => false,
-            'attrValue'       => null,
-            'note'            => null,
-            'expected'        => [
-                'dataType'    => null,
-                'formElement' => null,
-                'visible'     => null,
-                'required'    => false,
-                'notice'      => null,
-                'default'     => 'required_value',
-                'label'       => null,
-                'code'        => 'code',
-                'source'      => 'product-details',
-                'scopeLabel'  => '',
-                'globalScope' => false,
-                'sortOrder'   => 0
+            'default_null_prod_not_new_and_not_required' => [
+                'productId' => 1,
+                'productRequired' => false,
+                'attrValue' => 'val',
+                'expected' => [
+                    'dataType' => null,
+                    'formElement' => null,
+                    'visible' => null,
+                    'required' => false,
+                    'notice' => null,
+                    'default' => null,
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                ],
             ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function defaultNullProdNewAndRequired()
-    {
-        return [
-            'productId'       => null,
-            'productRequired' => false,
-            'attrValue'       => null,
-            'note'            => null,
-            'expected'        => [
-                'dataType'    => null,
-                'formElement' => null,
-                'visible'     => null,
-                'required'    => false,
-                'notice'      => null,
-                'default'     => 'required_value',
-                'label'       => null,
-                'code'        => 'code',
-                'source'      => 'product-details',
-                'scopeLabel'  => '',
-                'globalScope' => false,
-                'sortOrder'   => 0
+            'default_null_prod_new_and_not_required' => [
+                'productId' => null,
+                'productRequired' => false,
+                'attrValue' => null,
+                'expected' => [
+                    'dataType' => null,
+                    'formElement' => null,
+                    'visible' => null,
+                    'required' => false,
+                    'notice' => null,
+                    'default' => 'required_value',
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                ],
             ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function defaultNullProdNewAndRequiredAndFilledNotice()
-    {
-        return [
-            'productId'       => null,
-            'productRequired' => false,
-            'attrValue'       => null,
-            'note'            => 'example notice',
-            'expected'        => [
-                'dataType'    => null,
-                'formElement' => null,
-                'visible'     => null,
-                'required'    => false,
-                'notice'      => __('example notice'),
-                'default'     => 'required_value',
-                'label'       => null,
-                'code'        => 'code',
-                'source'      => 'product-details',
-                'scopeLabel'  => '',
-                'globalScope' => false,
-                'sortOrder'   => 0
+            'default_null_prod_new_locked_and_not_required' => [
+                'productId' => null,
+                'productRequired' => false,
+                'attrValue' => null,
+                'expected' => [
+                    'dataType' => null,
+                    'formElement' => null,
+                    'visible' => null,
+                    'required' => false,
+                    'notice' => null,
+                    'default' => 'required_value',
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                ],
+                'locked' => true,
             ],
+            'default_null_prod_new_and_required' => [
+                'productId' => null,
+                'productRequired' => false,
+                'attrValue' => null,
+                'expected' => [
+                    'dataType' => null,
+                    'formElement' => null,
+                    'visible' => null,
+                    'required' => false,
+                    'notice' => null,
+                    'default' => 'required_value',
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                ],
+            ]
         ];
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php
index b4460b314513b..a9d717db7b7f9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php
@@ -5,8 +5,11 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\General;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Class GeneralTest
@@ -15,6 +18,35 @@
  */
 class GeneralTest extends AbstractModifierTest
 {
+    /**
+     * @var AttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeRepositoryMock;
+
+    /**
+     * @var General
+     */
+    private $generalModifier;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->attributeRepositoryMock = $this->getMockBuilder(AttributeRepositoryInterface::class)
+        ->getMockForAbstractClass();
+
+        $arrayManager = $this->objectManager->getObject(ArrayManager::class);
+
+        $this->generalModifier = $this->objectManager->getObject(
+            General::class,
+            [
+                'attributeRepository' => $this->attributeRepositoryMock,
+                'locator' => $this->locatorMock,
+                'arrayManager' => $arrayManager,
+            ]
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -28,6 +60,9 @@ protected function createModel()
 
     public function testModifyMeta()
     {
+        $this->arrayManagerMock->expects($this->any())
+            ->method('merge')
+            ->willReturnArgument(2);
         $this->assertNotEmpty($this->getModel()->modifyMeta([
             'first_panel_code' => [
                 'arguments' => [
@@ -40,4 +75,59 @@ public function testModifyMeta()
             ]
         ]));
     }
+
+    /**
+     * @param array $data
+     * @param int $defaultStatusValue
+     * @param array $expectedResult
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @dataProvider modifyDataDataProvider
+     */
+    public function testModifyDataNewProduct(array $data, int $defaultStatusValue, array $expectedResult)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeInterface::class)
+            ->getMockForAbstractClass();
+        $attributeMock
+            ->method('getDefaultValue')
+            ->willReturn($defaultStatusValue);
+        $this->attributeRepositoryMock
+            ->method('get')
+            ->with(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                ProductAttributeInterface::CODE_STATUS
+            )
+            ->willReturn($attributeMock);
+        $this->assertSame($expectedResult, $this->generalModifier->modifyData($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function modifyDataDataProvider(): array
+    {
+        return [
+            'With default status value' => [
+                'data' => [],
+                'defaultStatusAttributeValue' => 5,
+                'expectedResult' => [
+                    null => [
+                        General::DATA_SOURCE_DEFAULT => [
+                            ProductAttributeInterface::CODE_STATUS => 5,
+                        ],
+                    ],
+                ],
+            ],
+            'Without default status value' => [
+                'data' => [],
+                'defaultStatusAttributeValue' => 0,
+                'expectedResult' => [
+                    null => [
+                        General::DATA_SOURCE_DEFAULT => [
+                            ProductAttributeInterface::CODE_STATUS => 1,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdateTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdateTest.php
index d4d4136bf4157..783c6247b9df3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdateTest.php
@@ -24,6 +24,9 @@ protected function createModel()
 
     public function testModifyMeta()
     {
+        $this->arrayManagerMock->expects($this->any())
+            ->method('merge')
+            ->willReturnArgument(1);
         $this->assertSame([], $this->getModel()->modifyMeta([]));
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
index 997b66861c21b..829dc4824416d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
@@ -74,9 +74,15 @@ class WebsitesTest extends AbstractModifierTest
      */
     protected $storeViewMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->objectManager = new ObjectManager($this);
+        parent::setUp();
+        $this->productMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(self::PRODUCT_ID);
         $this->assignedWebsites = [self::SECOND_WEBSITE_ID];
         $this->websiteMock = $this->getMockBuilder(\Magento\Store\Model\Website::class)
             ->setMethods(['getId', 'getName'])
@@ -87,35 +93,28 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->websiteRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\WebsiteRepositoryInterface::class)
-            ->setMethods(['getList', 'getDefault'])
+            ->setMethods(['getList'])
             ->getMockForAbstractClass();
         $this->websiteRepositoryMock->expects($this->any())
             ->method('getDefault')
             ->willReturn($this->websiteMock);
-        $this->websiteRepositoryMock->expects($this->any())
-            ->method('getList')
-            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
         $this->groupRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\GroupRepositoryInterface::class)
             ->setMethods(['getList'])
             ->getMockForAbstractClass();
         $this->storeRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\StoreRepositoryInterface::class)
             ->setMethods(['getList'])
             ->getMockForAbstractClass();
-        $this->locatorMock = $this->getMockBuilder(\Magento\Catalog\Model\Locator\LocatorInterface::class)
-            ->setMethods(['getProduct', 'getWebsiteIds'])
-            ->getMockForAbstractClass();
         $this->productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->setMethods(['getId'])
             ->getMockForAbstractClass();
-        $this->locatorMock->expects($this->any())
-            ->method('getProduct')
-            ->willReturn($this->productMock);
         $this->locatorMock->expects($this->any())
             ->method('getWebsiteIds')
             ->willReturn($this->assignedWebsites);
         $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->setMethods(['isSingleStoreMode'])
+            ->setMethods(['isSingleStoreMode', 'getWesites'])
             ->getMockForAbstractClass();
+        $this->storeManagerMock->method('getWebsites')
+            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
         $this->storeManagerMock->expects($this->any())
             ->method('isSingleStoreMode')
             ->willReturn(false);
@@ -148,9 +147,6 @@ protected function setUp()
         $this->storeRepositoryMock->expects($this->any())
             ->method('getList')
             ->willReturn([$this->storeViewMock]);
-        $this->productMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(self::PRODUCT_ID);
         $this->secondWebsiteMock->expects($this->any())
             ->method('getId')
             ->willReturn($this->assignedWebsites[0]);
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
index 12bc9acfa4c51..009cd690d4cd4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
@@ -15,6 +15,7 @@
 use Magento\Catalog\Helper\ImageFactory;
 use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
 use Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Framework\View\DesignLoader;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -33,6 +34,9 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /** @var  DesignInterface | \PHPUnit_Framework_MockObject_MockObject */
     private $design;
 
+    /** @var DesignLoader | \PHPUnit_Framework_MockObject_MockObject*/
+    private $designLoader;
+
     /** @var  Image */
     private $model;
 
@@ -60,13 +64,15 @@ public function setUp()
             ->getMock();
         $this->storeManager = $this->createMock(StoreManagerInterface::class);
         $this->design = $this->createMock(DesignInterface::class);
+        $this->designLoader = $this->createMock(DesignLoader::class);
         $this->model = new Image(
             $this->imageFactory,
             $this->state,
             $this->storeManager,
             $this->design,
             $this->imageInterfaceFactory,
-            $this->imageCodes
+            $this->imageCodes,
+            $this->designLoader
         );
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
new file mode 100644
index 0000000000000..dbf1292e57368
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\ViewModel\Product;
+
+use Magento\Catalog\Helper\Data as CatalogHelper;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\ViewModel\Product\Breadcrumbs;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Unit test for Magento\Catalog\ViewModel\Product\Breadcrumbs.
+ */
+class BreadcrumbsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Breadcrumbs
+     */
+    private $viewModel;
+
+    /**
+     * @var CatalogHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $catalogHelper;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp() : void
+    {
+        $this->catalogHelper = $this->getMockBuilder(CatalogHelper::class)
+            ->setMethods(['getProduct'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->setMethods(['getValue', 'isSetFlag'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $escaper = $this->getObjectManager()->getObject(\Magento\Framework\Escaper::class);
+
+        $this->viewModel = $this->getObjectManager()->getObject(
+            Breadcrumbs::class,
+            [
+                'catalogData' => $this->catalogHelper,
+                'scopeConfig' => $this->scopeConfig,
+                'escaper' => $escaper
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetCategoryUrlSuffix() : void
+    {
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with('catalog/seo/category_url_suffix', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            ->willReturn('.html');
+
+        $this->assertEquals('.html', $this->viewModel->getCategoryUrlSuffix());
+    }
+
+    /**
+     * @return void
+     */
+    public function testIsCategoryUsedInProductUrl() : void
+    {
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with('catalog/seo/product_use_categories', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            ->willReturn(false);
+
+        $this->assertFalse($this->viewModel->isCategoryUsedInProductUrl());
+    }
+
+    /**
+     * @dataProvider productDataProvider
+     *
+     * @param Product|null $product
+     * @param string $expectedName
+     * @return void
+     */
+    public function testGetProductName($product, string $expectedName) : void
+    {
+        $this->catalogHelper->expects($this->atLeastOnce())
+            ->method('getProduct')
+            ->willReturn($product);
+
+        $this->assertEquals($expectedName, $this->viewModel->getProductName());
+    }
+
+    /**
+     * @return array
+     */
+    public function productDataProvider() : array
+    {
+        return [
+            [$this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test']]), 'Test'],
+            [null, ''],
+        ];
+    }
+
+    /**
+     * @dataProvider productJsonEncodeDataProvider
+     *
+     * @param Product|null $product
+     * @param string $expectedJson
+     * @return void
+     */
+    public function testGetJsonConfiguration($product, string $expectedJson) : void
+    {
+        $this->catalogHelper->expects($this->atLeastOnce())
+            ->method('getProduct')
+            ->willReturn($product);
+
+        $this->scopeConfig->expects($this->any())
+            ->method('isSetFlag')
+            ->with('catalog/seo/product_use_categories', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            ->willReturn(false);
+
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->with('catalog/seo/category_url_suffix', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            ->willReturn('."html');
+
+        $this->assertEquals($expectedJson, $this->viewModel->getJsonConfiguration());
+    }
+
+    /**
+     * @return array
+     */
+    public function productJsonEncodeDataProvider() : array
+    {
+        return [
+            [
+                $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test ™']]),
+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test \u2122"}}',
+            ],
+            [
+                $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test "']]),
+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test &quot;"}}',
+            ],
+            [
+                $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test <b>x</b>']]),
+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":'
+                . '"Test &lt;b&gt;x&lt;\/b&gt;"}}',
+            ],
+            [
+                $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test \'abc\'']]),
+                '{"breadcrumbs":'
+                . '{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test &#039;abc&#039;"}}'
+            ],
+        ];
+    }
+
+    /**
+     * @return ObjectManager
+     */
+    private function getObjectManager() : ObjectManager
+    {
+        if (null === $this->objectManager) {
+            $this->objectManager = new ObjectManager($this);
+        }
+
+        return $this->objectManager;
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index cbc67fee8a5a3..1903bcd144831 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -6,6 +6,8 @@
 namespace Magento\Catalog\Ui\Component;
 
 /**
+ * Column Factory
+ *
  * @api
  * @since 100.0.2
  */
@@ -47,10 +49,14 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
     }
 
     /**
+     * Create Factory
+     *
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
      * @param array $config
+     *
      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function create($attribute, $context, array $config = [])
     {
@@ -82,7 +88,10 @@ public function create($attribute, $context, array $config = [])
     }
 
     /**
+     * Get Js Component
+     *
      * @param string $dataType
+     *
      * @return string
      */
     protected function getJsComponent($dataType)
@@ -91,14 +100,15 @@ protected function getJsComponent($dataType)
     }
 
     /**
+     * Get Data Type
+     *
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     *
      * @return string
      */
     protected function getDataType($attribute)
     {
-        return isset($this->dataTypeMap[$attribute->getFrontendInput()])
-            ? $this->dataTypeMap[$attribute->getFrontendInput()]
-            : $this->dataTypeMap['default'];
+        return $this->dataTypeMap[$attribute->getFrontendInput()] ?? $this->dataTypeMap['default'];
     }
 
     /**
@@ -111,6 +121,6 @@ protected function getFilterType($frontendInput)
     {
         $filtersMap = ['date' => 'dateRange'];
         $result = array_replace_recursive($this->dataTypeMap, $filtersMap);
-        return isset($result[$frontendInput]) ? $result[$frontendInput] : $result['default'];
+        return $result[$frontendInput] ?? $result['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
index fcc500c891607..dd8eaffb0a658 100644
--- a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
@@ -71,8 +71,6 @@ public function create($attribute, $context, $config = [])
      */
     protected function getFilterType($attribute)
     {
-        return isset($this->filterMap[$attribute->getFrontendInput()])
-            ? $this->filterMap[$attribute->getFrontendInput()]
-            : $this->filterMap['default'];
+        return $this->filterMap[$attribute->getFrontendInput()] ?? $this->filterMap['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
index c96498b054d25..8ea6d8b9e5a06 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
@@ -80,6 +80,6 @@ public function prepare()
      */
     protected function getFilterType($frontendInput)
     {
-        return isset($this->filterMap[$frontendInput]) ? $this->filterMap[$frontendInput] : $this->filterMap['default'];
+        return $this->filterMap[$frontendInput] ?? $this->filterMap['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
index d4dc9ddd7ca3b..09c9782fc0e32 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
@@ -9,6 +9,8 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
+ * Class Thumbnail
+ *
  * @api
  * @since 100.0.2
  */
@@ -67,6 +69,8 @@ public function prepareDataSource(array $dataSource)
     }
 
     /**
+     * Get Alt
+     *
      * @param array $row
      *
      * @return null|string
@@ -74,6 +78,6 @@ public function prepareDataSource(array $dataSource)
     protected function getAlt($row)
     {
         $altField = $this->getData('config/altField') ?: self::ALT_FIELD;
-        return isset($row[$altField]) ? $row[$altField] : null;
+        return $row[$altField] ?? null;
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php b/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php
new file mode 100644
index 0000000000000..894e2b701b5ac
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\Component\Product;
+
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\AbstractComponent;
+
+class MassAction extends AbstractComponent
+{
+    const NAME = 'massaction';
+
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * Constructor
+     *
+     * @param AuthorizationInterface $authorization
+     * @param ContextInterface $context
+     * @param UiComponentInterface[] $components
+     * @param array $data
+     */
+    public function __construct(
+        AuthorizationInterface $authorization,
+        ContextInterface $context,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->authorization = $authorization;
+        parent::__construct($context, $components, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare() : void
+    {
+        $config = $this->getConfiguration();
+
+        foreach ($this->getChildComponents() as $actionComponent) {
+            $actionType = $actionComponent->getConfiguration()['type'];
+            if ($this->isActionAllowed($actionType)) {
+                $config['actions'][] = $actionComponent->getConfiguration();
+            }
+        }
+        $origConfig = $this->getConfiguration();
+        if ($origConfig !== $config) {
+            $config = array_replace_recursive($config, $origConfig);
+        }
+
+        $this->setData('config', $config);
+        $this->components = [];
+
+        parent::prepare();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getComponentName() : string
+    {
+        return static::NAME;
+    }
+
+    /**
+     * Check if the given type of action is allowed
+     *
+     * @param string $actionType
+     * @return bool
+     */
+    public function isActionAllowed($actionType) : bool
+    {
+        $isAllowed = true;
+        switch ($actionType) {
+            case 'delete':
+                $isAllowed = $this->authorization->isAllowed('Magento_Catalog::products');
+                break;
+            case 'status':
+                $isAllowed = $this->authorization->isAllowed('Magento_Catalog::products');
+                break;
+            case 'attributes':
+                $isAllowed = $this->authorization->isAllowed('Magento_Catalog::update_attributes');
+                break;
+            default:
+                break;
+        }
+        return $isAllowed;
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php
new file mode 100644
index 0000000000000..01d93de577927
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\Component\UrlInput;
+
+use Magento\Ui\Model\UrlInput\ConfigInterface;
+
+/**
+ * Returns configuration for category Url Input type
+ */
+class Category implements ConfigInterface
+{
+    /**
+     * @var \Magento\Catalog\Ui\Component\Product\Form\Categories\Options
+     */
+    private $options;
+
+    /**
+     * @param \Magento\Catalog\Ui\Component\Product\Form\Categories\Options $options
+     */
+    public function __construct(\Magento\Catalog\Ui\Component\Product\Form\Categories\Options $options)
+    {
+        $this->options = $options;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(): array
+    {
+        return [
+            'label' => __('Category'),
+            'component' => 'Magento_Ui/js/form/element/ui-select',
+            'template' => 'ui/grid/filters/elements/ui-select',
+            'formElement' => 'select',
+            'disableLabel' => true,
+            'multiple' => false,
+            'chipsEnabled' => false,
+            'filterOptions' => true,
+            'levelsVisibility' => '1',
+            'options' => $this->options->toOptionArray(),
+            'sortOrder' => 30,
+            'missingValuePlaceholder' => __('Category with ID: %s doesn\'t exist'),
+            'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php
new file mode 100644
index 0000000000000..be73940237db4
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\Component\UrlInput;
+
+use Magento\Framework\UrlInterface;
+
+class Product implements \Magento\Ui\Model\UrlInput\ConfigInterface
+{
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * Product constructor.
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(UrlInterface $urlBuilder)
+    {
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(): array
+    {
+        return [
+            'label' => __('Product'),
+            'component' => 'Magento_Catalog/js/components/product-ui-select',
+            'disableLabel' => true,
+            'filterOptions' => true,
+            'searchOptions' => true,
+            'chipsEnabled' => true,
+            'levelsVisibility' => '1',
+            'options' => [],
+            'sortOrder' => 25,
+            'multiple' => false,
+            'closeBtn' => true,
+            'template' => 'ui/grid/filters/elements/ui-select',
+            'searchUrl' => $this->urlBuilder->getUrl('catalog/product/search'),
+            'filterPlaceholder' => __('Product Name or SKU'),
+            'isDisplayEmptyPlaceholder' => true,
+            'emptyOptionsHtml' => __('Start typing to find products'),
+            'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),
+            'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
+            'validationUrl' => $this->urlBuilder->getUrl('catalog/product/getSelected'),
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php b/app/code/Magento/Catalog/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php
deleted file mode 100644
index 18d98e620795d..0000000000000
--- a/app/code/Magento/Catalog/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Ui\DataProvider\Category\Form\Modifier;
-
-use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-
-class WysiwygConfigModifier implements ModifierInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function modifyData(array $data)
-    {
-        return $data;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function modifyMeta(array $meta)
-    {
-        $settings = [
-            'height' => '100px',
-            'add_variables' => false,
-            'add_widgets' => false,
-            'add_images' => true,
-            'add_directives' => true
-        ];
-
-        $meta['content']['children']['description']['arguments']['data']['config']['wysiwygConfigData']
-            = $settings;
-
-        return $meta;
-    }
-}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/AddSearchKeyConditionToCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddSearchKeyConditionToCollection.php
new file mode 100644
index 0000000000000..2f90e18074fc6
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddSearchKeyConditionToCollection.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product;
+
+use Magento\Ui\DataProvider\AddFilterToCollectionInterface;
+use Magento\Framework\Data\Collection;
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Class AddSearchKeyConditionToCollection
+ */
+class AddSearchKeyConditionToCollection implements AddFilterToCollectionInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function addFilter(Collection $collection, $field, $condition = null) : void
+    {
+        if (isset($condition['fulltext']) && !empty($condition['fulltext'])) {
+            $collection->addFieldToFilter(
+                ProductInterface::NAME,
+                $condition['fulltext']
+            )->addFieldToFilter(
+                ProductInterface::SKU,
+                $condition['fulltext']
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
index a8378c364a63e..336aeffa10584 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
@@ -432,7 +432,8 @@ private function getTierPriceStructure($tierPricePath)
                         'dndConfig' => [
                             'enabled' => false,
                         ],
-                        'disabled' => false,
+                        'disabled' =>
+                            $this->arrayManager->get($tierPricePath . '/arguments/data/config/disabled', $this->meta),
                         'required' => false,
                         'sortOrder' =>
                             $this->arrayManager->get($tierPricePath . '/arguments/data/config/sortOrder', $this->meta),
@@ -500,7 +501,8 @@ private function getTierPriceStructure($tierPricePath)
                                         'validation' => [
                                             'required-entry' => true,
                                             'validate-greater-than-zero' => true,
-                                            'validate-digits' => true,
+                                            'validate-digits' => false,
+                                            'validate-number' => true,
                                         ],
                                     ],
                                 ],
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
index a1aacc91f2e47..0733d21bf47d7 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
@@ -108,6 +108,7 @@ public function modifyMeta(array $meta)
                     self::ATTRIBUTE_SET_FIELD_ORDER
                 ),
                 'multiple' => false,
+                'disabled' => $this->locator->getProduct()->isLockedAttribute('attribute_set_id'),
             ];
         }
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
index aec6549f400fc..683a96133ad30 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
@@ -182,6 +182,11 @@ private function customizeAddAttributeModal(array $meta)
                                                 . '.create_new_attribute_modal',
                                             'actionName' => 'toggleModal',
                                         ],
+                                        [
+                                            'targetName' => 'product_form.product_form.add_attribute_modal'
+                                                . '.create_new_attribute_modal.product_attribute_add_form',
+                                            'actionName' => 'destroyInserted'
+                                        ],
                                         [
                                             'targetName'
                                             => 'product_form.product_form.add_attribute_modal'
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
index 7456c1bfef91f..681435851fbde 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -118,7 +118,7 @@ private function getCacheManager()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -130,7 +130,7 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -228,6 +228,7 @@ protected function customizeCategoriesField(array $meta)
                             'componentType' => 'container',
                             'component' => 'Magento_Ui/js/form/components/group',
                             'scopeLabel' => __('[GLOBAL]'),
+                            'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
                         ],
                     ],
                 ],
@@ -288,6 +289,7 @@ protected function customizeCategoriesField(array $meta)
                                     'source' => 'product_details',
                                     'displayArea' => 'insideGroup',
                                     'sortOrder' => 20,
+                                    'dataScope'  => $fieldCode,
                                 ],
                             ],
                         ]
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 73fecd17c69ce..86f1db2022cc9 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
@@ -166,7 +166,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -226,7 +226,7 @@ protected function formatPriceByPath($path, array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -348,7 +348,8 @@ protected function getHeaderContainerConfig($sortOrder)
                                 'sortOrder' => 20,
                                 'actions' => [
                                     [
-                                        'targetName' => 'ns = ${ $.ns }, index = ' . static::GRID_OPTIONS_NAME,
+                                        'targetName' => '${ $.ns }.${ $.ns }.' . static::GROUP_CUSTOM_OPTIONS_NAME
+                                            . '.' . static::GRID_OPTIONS_NAME,
                                         'actionName' => 'processingAddChild',
                                     ]
                                 ]
@@ -922,7 +923,7 @@ protected function getPriceFieldConfig($sortOrder)
                         'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(),
                         'sortOrder' => $sortOrder,
                         'validation' => [
-                            'validate-zero-or-greater' => true
+                            'validate-number' => true
                         ],
                     ],
                 ],
@@ -1045,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/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 7b18bfcd4ec9c..7379600011bcf 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
 use Magento\Catalog\Ui\DataProvider\CatalogEavValidationRules;
@@ -31,6 +32,9 @@
 use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
 use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
 
 /**
  * Class Eav
@@ -39,6 +43,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @since 101.0.0
  */
 class Eav extends AbstractModifier
@@ -188,6 +193,28 @@ class Eav extends AbstractModifier
     private $localeCurrency;
 
     /**
+     * internal cache for attribute models
+     * @var array
+     */
+    private $attributesCache = [];
+
+    /**
+     * @var AttributeCollectionFactory
+     */
+    private $attributeCollectionFactory;
+
+    /**
+     * @var CompositeConfigProcessor
+     */
+    private $wysiwygConfigProcessor;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Eav constructor.
      * @param LocatorInterface $locator
      * @param CatalogEavValidationRules $catalogEavValidationRules
      * @param Config $eavConfig
@@ -207,6 +234,9 @@ class Eav extends AbstractModifier
      * @param DataPersistorInterface $dataPersistor
      * @param array $attributesToDisable
      * @param array $attributesToEliminate
+     * @param CompositeConfigProcessor|null $wysiwygConfigProcessor
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param AttributeCollectionFactory $attributeCollectionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -228,7 +258,10 @@ public function __construct(
         ScopeOverriddenValue $scopeOverriddenValue,
         DataPersistorInterface $dataPersistor,
         $attributesToDisable = [],
-        $attributesToEliminate = []
+        $attributesToEliminate = [],
+        CompositeConfigProcessor $wysiwygConfigProcessor = null,
+        ScopeConfigInterface $scopeConfig = null,
+        AttributeCollectionFactory $attributeCollectionFactory = null
     ) {
         $this->locator = $locator;
         $this->catalogEavValidationRules = $catalogEavValidationRules;
@@ -249,10 +282,16 @@ public function __construct(
         $this->dataPersistor = $dataPersistor;
         $this->attributesToDisable = $attributesToDisable;
         $this->attributesToEliminate = $attributesToEliminate;
+        $this->wysiwygConfigProcessor = $wysiwygConfigProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(CompositeConfigProcessor::class);
+        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
+        ->get(ScopeConfigInterface::class);
+        $this->attributeCollectionFactory = $attributeCollectionFactory
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeCollectionFactory::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -265,7 +304,7 @@ public function modifyMeta(array $meta)
             if ($attributes) {
                 $meta[$groupCode]['children'] = $this->getAttributesMeta($attributes, $groupCode);
                 $meta[$groupCode]['arguments']['data']['config']['componentType'] = Fieldset::NAME;
-                $meta[$groupCode]['arguments']['data']['config']['label'] = __('%1', $group->getAttributeGroupName());
+                $meta[$groupCode]['arguments']['data']['config']['label'] = __($group->getAttributeGroupName());
                 $meta[$groupCode]['arguments']['data']['config']['collapsible'] = true;
                 $meta[$groupCode]['arguments']['data']['config']['dataScope'] = self::DATA_SCOPE_PRODUCT;
                 $meta[$groupCode]['arguments']['data']['config']['sortOrder'] =
@@ -363,7 +402,7 @@ public function getContainerChildren(ProductAttributeInterface $attribute, $grou
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -381,7 +420,7 @@ public function modifyData(array $data)
 
             foreach ($attributes as $attribute) {
                 if (null !== ($attributeValue = $this->setupAttributeData($attribute))) {
-                    if ($attribute->getFrontendInput() === 'price' && is_scalar($attributeValue)) {
+                    if ($this->isPriceAttribute($attribute, $attributeValue)) {
                         $attributeValue = $this->formatPrice($attributeValue);
                     }
                     $data[$productId][self::DATA_SOURCE_DEFAULT][$attribute->getAttributeCode()] = $attributeValue;
@@ -392,6 +431,32 @@ public function modifyData(array $data)
         return $data;
     }
 
+    /**
+     * Obtain if given attribute is a price
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @param string|integer $attributeValue
+     * @return bool
+     */
+    private function isPriceAttribute(ProductAttributeInterface $attribute, $attributeValue)
+    {
+        return $attribute->getFrontendInput() === 'price'
+            && is_scalar($attributeValue)
+            && !$this->isBundleSpecialPrice($attribute);
+    }
+
+    /**
+     * Obtain if current product is bundle and given attribute is special_price
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @return bool
+     */
+    private function isBundleSpecialPrice(ProductAttributeInterface $attribute)
+    {
+        return $this->locator->getProduct()->getTypeId() === ProductType::TYPE_BUNDLE
+            && $attribute->getAttributeCode() === ProductAttributeInterface::CODE_SPECIAL_PRICE;
+    }
+
     /**
      * Resolve data persistence
      *
@@ -485,39 +550,59 @@ private function getAttributeSetId()
     private function getAttributes()
     {
         if (!$this->attributes) {
-            foreach ($this->getGroups() as $group) {
-                $this->attributes[$this->calculateGroupCode($group)] = $this->loadAttributes($group);
-            }
+            $this->attributes = $this->loadAttributesForGroups($this->getGroups());
         }
 
         return $this->attributes;
     }
 
     /**
-     * Loading product attributes from group
+     * Loads attributes for specified groups at once
      *
-     * @param AttributeGroupInterface $group
-     * @return ProductAttributeInterface[]
+     * @param AttributeGroupInterface[] $groups
+     * @return @return ProductAttributeInterface[]
      */
-    private function loadAttributes(AttributeGroupInterface $group)
+    private function loadAttributesForGroups(array $groups)
     {
         $attributes = [];
+        $groupIds = [];
+
+        foreach ($groups as $group) {
+            $groupIds[$group->getAttributeGroupId()] = $this->calculateGroupCode($group);
+            $attributes[$this->calculateGroupCode($group)] = [];
+        }
+
+        $collection = $this->attributeCollectionFactory->create();
+        $collection->setAttributeGroupFilter(array_keys($groupIds));
+
+        $mapAttributeToGroup = [];
+
+        foreach ($collection->getItems() as $attribute) {
+            $mapAttributeToGroup[$attribute->getAttributeId()] = $attribute->getAttributeGroupId();
+        }
+
         $sortOrder = $this->sortOrderBuilder
             ->setField('sort_order')
             ->setAscendingDirection()
             ->create();
+
         $searchCriteria = $this->searchCriteriaBuilder
-            ->addFilter(AttributeGroupInterface::GROUP_ID, $group->getAttributeGroupId())
+            ->addFilter(AttributeGroupInterface::GROUP_ID, array_keys($groupIds), 'in')
             ->addFilter(ProductAttributeInterface::IS_VISIBLE, 1)
             ->addSortOrder($sortOrder)
             ->create();
+
         $groupAttributes = $this->attributeRepository->getList($searchCriteria)->getItems();
+
         $productType = $this->getProductType();
+
         foreach ($groupAttributes as $attribute) {
             $applyTo = $attribute->getApplyTo();
             $isRelated = !$applyTo || in_array($productType, $applyTo);
             if ($isRelated) {
-                $attributes[] = $attribute;
+                $attributeGroupId = $mapAttributeToGroup[$attribute->getAttributeId()];
+                $attributeGroupCode = $groupIds[$attributeGroupId];
+                $attributes[$attributeGroupCode][] = $attribute;
             }
         }
 
@@ -572,16 +657,16 @@ private function isProductExists()
     public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupCode, $sortOrder)
     {
         $configPath = ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER);
-
+        $attributeCode = $attribute->getAttributeCode();
         $meta = $this->arrayManager->set($configPath, [], [
             'dataType' => $attribute->getFrontendInput(),
             'formElement' => $this->getFormElementsMapValue($attribute->getFrontendInput()),
             'visible' => $attribute->getIsVisible(),
             'required' => $attribute->getIsRequired(),
             'notice' => $attribute->getNote() === null ? null : __($attribute->getNote()),
-            'default' => (!$this->isProductExists()) ? $attribute->getDefaultValue() : null,
-            'label' => $attribute->getDefaultFrontendLabel(),
-            'code' => $attribute->getAttributeCode(),
+            'default' => (!$this->isProductExists()) ? $this->getAttributeDefaultValue($attribute) : null,
+            'label' => __($attribute->getDefaultFrontendLabel()),
+            'code' => $attributeCode,
             'source' => $groupCode,
             'scopeLabel' => $this->getScopeLabel($attribute),
             'globalScope' => $this->isScopeGlobal($attribute),
@@ -591,8 +676,9 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
+            $options = $attributeModel->getSource()->getAllOptions();
             $meta = $this->arrayManager->merge($configPath, $meta, [
-                'options' => $attributeModel->getSource()->getAllOptions(),
+                'options' => $this->convertOptionsValueToString($options),
             ]);
         }
 
@@ -610,7 +696,9 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
             ]);
         }
 
-        if (in_array($attribute->getAttributeCode(), $this->attributesToDisable)) {
+        $product = $this->locator->getProduct();
+        if (in_array($attributeCode, $this->attributesToDisable)
+            || $product->isLockedAttribute($attributeCode)) {
             $meta = $this->arrayManager->merge($configPath, $meta, [
                 'disabled' => true,
             ]);
@@ -646,6 +734,44 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
     }
 
     /**
+     * Returns attribute default value, based on db setting or setting in the system configuration.
+     *
+     * @param ProductAttributeInterface $attribute
+     * @return null|string
+     */
+    private function getAttributeDefaultValue(ProductAttributeInterface $attribute)
+    {
+        if ($attribute->getAttributeCode() === 'page_layout') {
+            $defaultValue = $this->scopeConfig->getValue(
+                'web/default_layouts/default_product_layout',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $this->storeManager->getStore()
+            );
+            $attribute->setDefaultValue($defaultValue);
+        }
+        return $attribute->getDefaultValue();
+    }
+
+    /**
+     * Convert options value to string.
+     *
+     * @param array $options
+     * @return array
+     */
+    private function convertOptionsValueToString(array $options) : array
+    {
+        array_walk($options, function (&$value) {
+            if (isset($value['value']) && is_scalar($value['value'])) {
+                $value['value'] = (string)$value['value'];
+            }
+        });
+
+        return $options;
+    }
+
+    /**
+     * Adds 'use default value' checkbox.
+     *
      * @param ProductAttributeInterface $attribute
      * @param array $meta
      * @return array
@@ -779,13 +905,7 @@ private function customizeWysiwyg(ProductAttributeInterface $attribute, array $m
 
         $meta['arguments']['data']['config']['formElement'] = WysiwygElement::NAME;
         $meta['arguments']['data']['config']['wysiwyg'] = true;
-        $meta['arguments']['data']['config']['wysiwygConfigData'] = [
-            'add_variables' => false,
-            'add_widgets' => false,
-            'add_directives' => true,
-            'use_container' => true,
-            'container_class' => 'hor-scroll',
-        ];
+        $meta['arguments']['data']['config']['wysiwygConfigData'] = $this->wysiwygConfigProcessor->process($attribute);
 
         return $meta;
     }
@@ -800,7 +920,7 @@ private function getFormElementsMapValue($value)
     {
         $valueMap = $this->formElementMapper->getMappings();
 
-        return isset($valueMap[$value]) ? $valueMap[$value] : $value;
+        return $valueMap[$value] ?? $value;
     }
 
     /**
@@ -854,6 +974,9 @@ private function canDisplayUseDefault(ProductAttributeInterface $attribute)
         $attributeCode = $attribute->getAttributeCode();
         /** @var Product $product */
         $product = $this->locator->getProduct();
+        if ($product->isLockedAttribute($attributeCode)) {
+            return false;
+        }
 
         if (isset($this->canDisplayUseDefault[$attributeCode])) {
             return $this->canDisplayUseDefault[$attributeCode];
@@ -888,7 +1011,13 @@ private function isScopeGlobal($attribute)
      */
     private function getAttributeModel($attribute)
     {
-        return $this->eavAttributeFactory->create()->load($attribute->getAttributeId());
+        $attributeId = $attribute->getAttributeId();
+
+        if (!array_key_exists($attributeId, $this->attributesCache)) {
+            $this->attributesCache[$attributeId] = $this->eavAttributeFactory->create()->load($attributeId);
+        }
+
+        return $this->attributesCache[$attributeId];
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
new file mode 100644
index 0000000000000..5513af9d98e7d
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Psr\Log\LoggerInterface as Logger;
+
+class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
+{
+    /**
+     * @var Logger
+     */
+    private $logger;
+
+    /**
+     * @var array
+     */
+    private $eavWysiwygDataProcessors = [];
+
+    /**
+     * CompositeConfigProcessor constructor.
+     * @param array $eavWysiwygDataProcessors
+     */
+    public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
+    {
+        $this->logger = $logger;
+        $this->eavWysiwygDataProcessors = $eavWysiwygDataProcessors;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
+    {
+        $wysiwygConfigData = [];
+
+        foreach ($this->eavWysiwygDataProcessors as $processor) {
+            if (!$processor instanceof WysiwygConfigDataProcessorInterface) {
+                $this->logger->critical(
+                    __(
+                        'Processor %1 doesn\'t implement WysiwygConfigDataProcessorInterface. It will be skipped',
+                        get_class($processor)
+                    )
+                );
+                continue;
+            }
+
+            $wysiwygConfigData = array_merge_recursive($wysiwygConfigData, $processor->process($attribute));
+        }
+
+        return $wysiwygConfigData;
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
new file mode 100644
index 0000000000000..d301a45d14ff5
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+/**
+ * Add data to related to $meta['arguments']['data']['config']['wysiwygConfigData']
+ */
+class WysiwygConfigDataProcessor implements WysiwygConfigDataProcessorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
+    {
+        return [
+            'add_variables' => false,
+            'add_widgets' => false,
+            'add_directives' => true,
+            'use_container' => true,
+            'container_class' => 'hor-scroll',
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
new file mode 100644
index 0000000000000..64faef7ba2761
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+/**
+ * Interface WysiwygConfigDataProcessorInterface
+ */
+interface WysiwygConfigDataProcessorInterface
+{
+    /**
+     * Returns wysiwygConfigData array to render wysiwyg ui component
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @return array
+     */
+    public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute);
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
index ea69ebf4dda24..6ec1cc6c46d9d 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Ui\Component\Form;
 use Magento\Framework\Stdlib\ArrayManager;
 
@@ -35,21 +36,34 @@ class General extends AbstractModifier
      */
     private $localeCurrency;
 
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
     /**
      * @param LocatorInterface $locator
      * @param ArrayManager $arrayManager
+     * @param AttributeRepositoryInterface|null $attributeRepository
      */
     public function __construct(
         LocatorInterface $locator,
-        ArrayManager $arrayManager
+        ArrayManager $arrayManager,
+        AttributeRepositoryInterface $attributeRepository = null
     ) {
         $this->locator = $locator;
         $this->arrayManager = $arrayManager;
+        $this->attributeRepository = $attributeRepository
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeRepositoryInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * Customize number fields for advanced price and weight fields.
+     *
      * @since 101.0.0
+     * @param array $data
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function modifyData(array $data)
     {
@@ -58,7 +72,12 @@ public function modifyData(array $data)
         $modelId = $this->locator->getProduct()->getId();
 
         if (!isset($data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS])) {
-            $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] = '1';
+            $attributeStatus = $this->attributeRepository->get(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                ProductAttributeInterface::CODE_STATUS
+            );
+            $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] =
+                $attributeStatus->getDefaultValue() ?: 1;
         }
 
         return $data;
@@ -106,7 +125,7 @@ protected function customizeAdvancedPriceFormat(array $data)
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
                     $this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
-                    (int)$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
+                    (float) $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
             }
         }
 
@@ -114,8 +133,11 @@ protected function customizeAdvancedPriceFormat(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * Customize product form fields.
+     *
      * @since 101.0.0
+     * @param array $meta
+     * @return array
      */
     public function modifyMeta(array $meta)
     {
@@ -187,7 +209,7 @@ protected function customizeStatusField(array $meta)
     protected function customizeWeightField(array $meta)
     {
         $weightPath = $this->arrayManager->findPath(ProductAttributeInterface::CODE_WEIGHT, $meta, null, 'children');
-
+        $disabled = $this->arrayManager->get($weightPath . '/arguments/data/config/disabled', $meta);
         if ($weightPath) {
             $meta = $this->arrayManager->merge(
                 $weightPath . static::META_CONFIG_PATH,
@@ -199,7 +221,7 @@ protected function customizeWeightField(array $meta)
                     ],
                     'additionalClasses' => 'admin__field-small',
                     'addafter' => $this->locator->getStore()->getConfig('general/locale/weight_unit'),
-                    'imports' => [
+                    'imports' => $disabled ? [] : [
                         'disabled' => '!${$.provider}:' . self::DATA_SCOPE_PRODUCT
                             . '.product_has_weight:value'
                     ]
@@ -239,6 +261,7 @@ protected function customizeWeightField(array $meta)
                         ],
                     ],
                     'value' => (int)$this->locator->getProduct()->getTypeInstance()->hasWeight(),
+                    'disabled' => $disabled,
                 ]
             );
         }
@@ -344,7 +367,8 @@ protected function customizeNameListeners(array $meta)
             $skuPath . static::META_CONFIG_PATH,
             $meta,
             [
-                'autoImportIfEmpty' => true
+                'autoImportIfEmpty' => true,
+                'validation' => ['no-marginal-whitespace' => true]
             ]
         );
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
index 0eddca3322205..a529580e29239 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.1.0
      */
     public function modifyData(array $data)
@@ -54,8 +54,11 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * Add tier price info to meta array.
+     *
      * @since 101.1.0
+     * @param array $meta
+     * @return array
      */
     public function modifyMeta(array $meta)
     {
@@ -150,8 +153,8 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
                                     'dataType' => Price::NAME,
                                     'addbefore' => '%',
                                     'validation' => [
-                                        'validate-number' => true,
-                                        'less-than-equals-to' => 100
+                                        'required-entry' => true,
+                                        'validate-positive-percent-decimal' => true
                                     ],
                                     'visible' => $firstOption
                                         && $firstOption['value'] == ProductPriceOptionsInterface::VALUE_PERCENT,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
index 298da3d5cd6f2..9cbbb86a2c555 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
@@ -89,7 +89,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -117,7 +117,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -135,7 +135,6 @@ public function modifyMeta(array $meta)
                                     'collapsible' => true,
                                     'componentType' => Form\Fieldset::NAME,
                                     'dataScope' => self::DATA_SCOPE_PRODUCT,
-                                    'disabled' => false,
                                     'sortOrder' => $this->getNextGroupSortOrder(
                                         $meta,
                                         'search-engine-optimization',
@@ -176,9 +175,11 @@ protected function getFieldsForFieldset()
         $label = __('Websites');
 
         $defaultWebsiteId = $this->websiteRepository->getDefault()->getId();
+        $isOnlyOneWebsiteAvailable = count($websitesList) === 1;
         foreach ($websitesList as $website) {
             $isChecked = in_array($website['id'], $websiteIds)
-                || ($defaultWebsiteId == $website['id'] && $isNewProduct);
+                || ($defaultWebsiteId == $website['id'] && $isNewProduct)
+                || $isOnlyOneWebsiteAvailable;
             $children[$website['id']] = [
                 'arguments' => [
                     'data' => [
@@ -196,6 +197,7 @@ protected function getFieldsForFieldset()
                                 'false' => '0',
                             ],
                             'value' => $isChecked ? (string)$website['id'] : '0',
+                            'disabled' => $this->locator->getProduct()->isLockedAttribute('website_ids'),
                         ],
                     ],
                 ],
@@ -331,6 +333,8 @@ protected function getWebsitesOptions()
     }
 
     /**
+     * Returns websites options list.
+     *
      * @return array
      * @since 101.0.0
      */
@@ -397,8 +401,9 @@ protected function getWebsitesList()
         $this->websitesList = [];
         $groupList = $this->groupRepository->getList();
         $storesList = $this->storeRepository->getList();
+        $websiteList = $this->storeManager->getWebsites(true);
 
-        foreach ($this->websiteRepository->getList() as $website) {
+        foreach ($websiteList as $website) {
             $websiteId = $website->getId();
             if (!$websiteId) {
                 continue;
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
index 216bc16968fcb..4fcb87ab1396e 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
@@ -14,15 +14,18 @@
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\View\DesignLoader;
 
 /**
  * Collect enough information about image rendering on front
  * If you want to add new image, that should render on front you need
  * to configure this class in di.xml
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Image implements ProductRenderCollectorInterface
 {
@@ -51,6 +54,7 @@ class Image implements ProductRenderCollectorInterface
 
     /**
      * @var DesignInterface
+     * @deprecated 2.3.0 DesignLoader is used for design theme loading
      */
     private $design;
 
@@ -59,6 +63,11 @@ class Image implements ProductRenderCollectorInterface
      */
     private $imageRenderInfoFactory;
 
+    /**
+     * @var DesignLoader
+     */
+    private $designLoader;
+
     /**
      * Image constructor.
      * @param ImageFactory $imageFactory
@@ -67,6 +76,7 @@ class Image implements ProductRenderCollectorInterface
      * @param DesignInterface $design
      * @param ImageInterfaceFactory $imageRenderInfoFactory
      * @param array $imageCodes
+     * @param DesignLoader $designLoader
      */
     public function __construct(
         ImageFactory $imageFactory,
@@ -74,7 +84,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         DesignInterface $design,
         ImageInterfaceFactory $imageRenderInfoFactory,
-        array $imageCodes = []
+        array $imageCodes = [],
+        DesignLoader $designLoader = null
     ) {
         $this->imageFactory = $imageFactory;
         $this->imageCodes = $imageCodes;
@@ -82,6 +93,8 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->design = $design;
         $this->imageRenderInfoFactory = $imageRenderInfoFactory;
+        $this->designLoader = $designLoader ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(DesignLoader::class);
     }
 
     /**
@@ -92,6 +105,8 @@ public function __construct(
     public function collect(ProductInterface $product, ProductRenderInterface $productRender)
     {
         $images = [];
+        /** @var ThemeInterface $currentTheme */
+        $currentTheme = $this->design->getDesignTheme();
 
         foreach ($this->imageCodes as $imageCode) {
             /** @var ImageInterface $image */
@@ -120,10 +135,13 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
             $images[] = $image;
         }
 
+        $this->design->setDesignTheme($currentTheme);
         $productRender->setImages($images);
     }
 
     /**
+     * Callback for emulating image creation
+     *
      * Callback in which we emulate initialize default design theme, depends on current store, be settings store id
      * from render info
      *
@@ -136,7 +154,7 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
     public function emulateImageCreating(ProductInterface $product, $imageCode, $storeId, ImageInterface $image)
     {
         $this->storeManager->setCurrentStore($storeId);
-        $this->design->setDefaultDesignTheme();
+        $this->designLoader->load();
 
         $imageHelper = $this->imageFactory->create();
         $imageHelper->init($product, $imageCode);
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
new file mode 100644
index 0000000000000..f4334bc25efd8
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Ui\DataProvider\Product;
+
+/**
+ * Collection which is used for rendering product list in the backend.
+ *
+ * Used for product grid and customizes behavior of the default Product collection for grid needs.
+ */
+class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
+{
+    /**
+     * Disables using of price index for grid rendering
+     *
+     * Admin area shouldn't use price index and should rely on actual product data instead.
+     *
+     * @codeCoverageIgnore
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     */
+    protected function _productLimitationJoinPrice()
+    {
+        $this->_productLimitationFilters->setUsePriceIndex(false);
+        return $this->_productLimitationPrice(true);
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
index e31eca89f63c2..200ecf89641fa 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/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
new file mode 100644
index 0000000000000..95f2531e5fdca
--- /dev/null
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\ViewModel\Product;
+
+use Magento\Catalog\Helper\Data;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\Escaper;
+
+/**
+ * Product breadcrumbs view model.
+ */
+class Breadcrumbs extends DataObject implements ArgumentInterface
+{
+    /**
+     * Catalog data.
+     *
+     * @var Data
+     */
+    private $catalogData;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Data $catalogData
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Json|null $json
+     * @param Escaper|null $escaper
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Data $catalogData,
+        ScopeConfigInterface $scopeConfig,
+        Json $json = null,
+        Escaper $escaper = null
+    ) {
+        parent::__construct();
+
+        $this->catalogData = $catalogData;
+        $this->scopeConfig = $scopeConfig;
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
+    }
+
+    /**
+     * Returns category URL suffix.
+     *
+     * @return mixed
+     */
+    public function getCategoryUrlSuffix()
+    {
+        return $this->scopeConfig->getValue(
+            'catalog/seo/category_url_suffix',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Checks if categories path is used for product URLs.
+     *
+     * @return bool
+     */
+    public function isCategoryUsedInProductUrl(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            'catalog/seo/product_use_categories',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Returns product name.
+     *
+     * @return string
+     */
+    public function getProductName(): string
+    {
+        return $this->catalogData->getProduct() !== null
+            ? $this->catalogData->getProduct()->getName()
+            : '';
+    }
+
+    /**
+     * Returns breadcrumb json with html escaped names
+     *
+     * @return string
+     */
+    public function getJsonConfigurationHtmlEscaped() : string
+    {
+        return json_encode(
+            [
+                'breadcrumbs' => [
+                    'categoryUrlSuffix' => $this->escaper->escapeHtml($this->getCategoryUrlSuffix()),
+                    'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
+                    'product' => $this->escaper->escapeHtml($this->getProductName())
+                ]
+            ],
+            JSON_HEX_TAG
+        );
+    }
+
+    /**
+     * Returns breadcrumb json.
+     *
+     * @return string
+     * @deprecated in favor of new method with name {suffix}Html{postfix}()
+     */
+    public function getJsonConfiguration()
+    {
+        return $this->getJsonConfigurationHtmlEscaped();
+    }
+}
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 94d4f2d492bba..44d051933909b 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -5,39 +5,38 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-catalog-rule": "100.3.*",
-        "magento/module-catalog-url-rewrite": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-indexer": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-msrp": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-product-alert": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-url-rewrite": "100.3.*",
-        "magento/module-widget": "100.3.*",
-        "magento/module-wishlist": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-checkout": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-indexer": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-msrp": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-product-alert": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-url-rewrite": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-catalog-sample-data": "Sample Data version:100.3.*"
+        "magento/module-cookie": "*",
+        "magento/module-sales": "*",
+        "magento/module-catalog-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "101.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 430901485aae3..fddc01ac4c189 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -78,6 +78,11 @@
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />
     </type>
+    <virtualType name="\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\Catalog\Ui\DataProvider\Product\ProductCollection</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider">
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">
@@ -86,6 +91,8 @@
             <argument name="addFilterStrategies" xsi:type="array">
                 <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">
@@ -159,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>
@@ -187,19 +195,41 @@
     <type name="Magento\Eav\Api\AttributeSetRepositoryInterface">
         <plugin name="remove_products" type="Magento\Catalog\Plugin\Model\AttributeSetRepository\RemoveProducts"/>
     </type>
-    <virtualType name="UiModifierPool" type="Magento\Ui\DataProvider\Modifier\Pool">
+    <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor">
         <arguments>
-            <argument name="modifiers" xsi:type="array">
-                <item name="wysiwyg-category" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Category\Form\Modifier\WysiwygConfigModifier</item>
-                    <item name="sortOrder" xsi:type="number">10</item>
-                </item>
+            <argument name="eavWysiwygDataProcessors" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\WysiwygConfigDataProcessor</item>
             </argument>
         </arguments>
+    </type>
+    <virtualType name="Magento\Catalog\Ui\Component\Form\Field\Category\PageLayout" type="Magento\Ui\Component\Form\Field\DefaultValue">
+        <arguments>
+            <argument name="path" xsi:type="string">web/default_layouts/default_category_layout</argument>
+        </arguments>
     </virtualType>
-    <type name="Magento\Catalog\Model\Category\DataProvider">
+    <type name="Magento\Ui\Model\UrlInput\LinksConfigProvider">
         <arguments>
-            <argument name="pool" xsi:type="object">UiModifierPool</argument>
+            <argument name="linksConfiguration" xsi:type="array">
+                <item name="product" xsi:type="string">Magento\Catalog\Ui\Component\UrlInput\Product</item>
+                <item name="category" xsi:type="string">Magento\Catalog\Ui\Component\UrlInput\Category</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ProductLink\Search">
+        <arguments>
+            <argument name="filter" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddSearchKeyConditionToCollection</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Attributes">
+        <arguments>
+            <argument name="excludeFields" xsi:type="array">
+                <item name="0" xsi:type="string">category_ids</item>
+                <item name="1" xsi:type="string">gallery</item>
+                <item name="2" xsi:type="string">image</item>
+                <item name="3" xsi:type="string">media_gallery</item>
+                <item name="4" xsi:type="string">quantity_and_stock_status</item>
+                <item name="5" xsi:type="string">tier_price</item>
+            </argument>
         </arguments>
     </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/events.xml b/app/code/Magento/Catalog/etc/adminhtml/events.xml
index f4fd7fc30398c..ad83f5898237a 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/events.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/events.xml
@@ -9,4 +9,7 @@
     <event name="cms_wysiwyg_images_static_urls_allowed">
         <observer name="catalog_wysiwyg" instance="Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowedObserver" />
     </event>
+    <event name="catalog_category_change_products">
+        <observer name="category_product_indexer" instance="Magento\Catalog\Observer\CategoryProductIndexer"/>
+    </event>
 </config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
index aa910e6d5ade4..cfcce3a26cbec 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
@@ -12,7 +12,6 @@
         <add id="Magento_Catalog::catalog_categories" title="Categories" translate="title" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="catalog/category/" resource="Magento_Catalog::categories"/>
         <add id="Magento_Catalog::catalog_attributes_attributes" title="Product" translate="title" module="Magento_Catalog" sortOrder="30" parent="Magento_Backend::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
         <add id="Magento_Catalog::catalog_attributes_sets" title="Attribute Set" translate="title" module="Magento_Catalog" sortOrder="40" parent="Magento_Backend::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>
-
         <add id="Magento_Catalog::inventory" title="Inventory" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index 2ce40386f0553..7a05601fcd666 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -10,6 +10,9 @@
         <tab id="catalog" translate="label" sortOrder="200">
             <label>Catalog</label>
         </tab>
+        <tab id="advanced" translate="label" sortOrder="999999">
+            <label>Advanced</label>
+        </tab>
         <section id="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <class>separator-top</class>
             <label>Catalog</label>
@@ -36,10 +39,10 @@
             </group>
             <group id="recently_products" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Recently Viewed/Compared Products</label>
-                <field id="recently_viewed_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="recently_viewed_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lifetime of products in Recently Viewed Widget</label>
                 </field>
-                <field id="recently_compared_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="recently_compared_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lifetime of products in Recently Compared Widget</label>
                 </field>
                 <field id="synchronize_with_backend" translate="label" type="select" showInDefault="1" canRestore="1">
@@ -85,6 +88,7 @@
                 </field>
                 <field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Product Listing Sort by</label>
+                    <comment>Applies to category pages</comment>
                     <source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
                 </field>
                 <field id="list_allow_all" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -92,9 +96,9 @@
                     <comment>Whether to show "All" option in the "Show X Per Page" dropdown</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="parse_url_directives" translate="label comment" type="select" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Allow Dynamic Media URLs</label>
-                    <comment>E.g. {{media url="path/to/image.jpg"}} {{skin url="path/to/picture.gif"}}. Dynamic directives parsing impacts catalog performance.</comment>
+                <field id="remember_pagination" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Remember Category Pagination</label>
+                    <comment>Changing may affect SEO and cache storage consumption.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
@@ -103,7 +107,6 @@
                 <clone_fields>1</clone_fields>
                 <clone_model>Magento\Catalog\Model\Config\CatalogClone\Media\Image</clone_model>
                 <field id="placeholder" type="image" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label></label>
                     <backend_model>Magento\Config\Model\Config\Backend\Image</backend_model>
                     <upload_dir config="system/filesystem/media" scope_info="1">catalog/product/placeholder</upload_dir>
                     <base_url type="media" scope_info="1">catalog/product/placeholder</base_url>
@@ -186,5 +189,32 @@
                 </field>
             </group>
         </section>
+        <section id="web">
+            <group id="default_layouts" translate="label" type="text" sortOrder="35" showInDefault="1">
+                <label>Default Layouts</label>
+                <field id="default_product_layout" translate="label" type="select" sortOrder="10" showInDefault="1">
+                    <label>Default Product Layout</label>
+                    <source_model>Magento\Catalog\Model\Config\Source\LayoutList</source_model>
+                </field>
+                <field id="default_category_layout" translate="label" type="select" sortOrder="20" showInDefault="1">
+                    <label>Default Category Layout</label>
+                    <source_model>Magento\Catalog\Model\Config\Source\LayoutList</source_model>
+                </field>
+            </group>
+        </section>
+        <section id="system" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
+            <class>separator-top</class>
+            <label>System</label>
+            <tab>advanced</tab>
+            <resource>Magento_Config::config_system</resource>
+            <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Images Upload Configuration</label>
+                <field id="jpeg_quality" translate="label comment" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Quality</label>
+                    <validate>validate-digits validate-digits-range digits-range-1-100 required-entry</validate>
+                    <comment>Jpeg quality for resized images 1-100%.</comment>
+                </field>
+            </group>
+        </section>
     </system>
 </config>
diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
index 3569c0a27b83f..3a842166a3825 100644
--- a/app/code/Magento/Catalog/etc/config.xml
+++ b/app/code/Magento/Catalog/etc/config.xml
@@ -30,6 +30,7 @@
                 <flat_catalog_category>0</flat_catalog_category>
                 <default_sort_by>position</default_sort_by>
                 <parse_url_directives>1</parse_url_directives>
+                <remember_pagination>0</remember_pagination>
             </frontend>
             <product>
                 <flat>
@@ -52,14 +53,23 @@
                 <forbidden_extensions>php,exe</forbidden_extensions>
             </custom_options>
         </catalog>
+        <indexer>
+            <catalog_product_price>
+                <dimensions_mode>none</dimensions_mode>
+            </catalog_product_price>
+        </indexer>
         <system>
             <media_storage_configuration>
                 <allowed_resources>
                     <tmp_images_folder>tmp</tmp_images_folder>
+                    <catalog_product_images>media/catalog/product/cache/</catalog_product_images>
                     <catalog_images_folder>catalog</catalog_images_folder>
                     <product_custom_options_fodler>custom_options</product_custom_options_fodler>
                 </allowed_resources>
             </media_storage_configuration>
+            <upload_configuration>
+                <jpeg_quality>80</jpeg_quality>
+            </upload_configuration>
         </system>
         <design>
             <watermark>
diff --git a/app/code/Magento/Catalog/etc/db_schema.xml b/app/code/Magento/Catalog/etc/db_schema.xml
new file mode 100644
index 0000000000000..17e3dddc41c3b
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/db_schema.xml
@@ -0,0 +1,1834 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_product_entity" resource="default" engine="innodb" comment="Catalog Product Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Attribute Set ID"/>
+        <column xsi:type="varchar" name="type_id" nullable="false" length="32" default="simple" comment="Type ID"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="64" comment="SKU"/>
+        <column xsi:type="smallint" name="has_options" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Has Options"/>
+        <column xsi:type="smallint" name="required_options" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Required Options"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Creation Time"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Update Time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_ATTRIBUTE_SET_ID" indexType="btree">
+            <column name="attribute_set_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_SKU" indexType="btree">
+            <column name="sku"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_datetime" resource="default" engine="innodb"
+           comment="Catalog Product Datetime Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DTIME_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_datetime" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_datetime" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_decimal" resource="default" engine="innodb"
+           comment="Catalog Product Decimal Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_DEC_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_decimal" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_decimal" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_int" resource="default" engine="innodb"
+           comment="Catalog Product Integer Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_int" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_INT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_int" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_INT_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_int" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_INT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_text" resource="default" engine="innodb"
+           comment="Catalog Product Text Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="text" name="value" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_text" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TEXT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_text" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_text" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_varchar" resource="default" engine="innodb"
+           comment="Catalog Product Varchar Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_varchar" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_varchar" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_gallery" resource="default" engine="innodb"
+           comment="Catalog Product Gallery Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_GLR_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_gallery" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_GLR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_gallery" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_gallery" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_entity" resource="default" engine="innodb" comment="Catalog Category Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Attribute Set ID"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Parent Category ID"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Creation Time"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Update Time"/>
+        <column xsi:type="varchar" name="path" nullable="false" length="255" comment="Tree Path"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Position"/>
+        <column xsi:type="int" name="level" padding="11" unsigned="false" nullable="false" identity="false" default="0"
+                comment="Tree Level"/>
+        <column xsi:type="int" name="children_count" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Child Count"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_LEVEL" indexType="btree">
+            <column name="level"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_PATH" indexType="btree">
+            <column name="path"/>
+        </index>
+    </table>
+    <table name="catalog_category_entity_datetime" resource="default" engine="innodb"
+           comment="Catalog Category Datetime Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_category_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DTIME_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_category_entity_datetime" column="entity_id" referenceTable="catalog_category_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID"
+                    table="catalog_category_entity_datetime" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_entity_decimal" resource="default" engine="innodb"
+           comment="Catalog Category Decimal Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_category_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_DEC_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_category_entity_decimal" column="entity_id" referenceTable="catalog_category_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID"
+                    table="catalog_category_entity_decimal" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_entity_int" resource="default" engine="innodb"
+           comment="Catalog Category Integer Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_category_entity_int" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_INT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_category_entity_int" column="entity_id" referenceTable="catalog_category_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_INT_STORE_ID_STORE_STORE_ID"
+                    table="catalog_category_entity_int" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_entity_text" resource="default" engine="innodb"
+           comment="Catalog Category Text Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="text" name="value" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_category_entity_text" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_TEXT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_category_entity_text" column="entity_id" referenceTable="catalog_category_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID_STORE_STORE_ID"
+                    table="catalog_category_entity_text" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_entity_varchar" resource="default" engine="innodb"
+           comment="Catalog Category Varchar Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_category_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_category_entity_varchar" column="entity_id" referenceTable="catalog_category_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID"
+                    table="catalog_category_entity_varchar" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_product" resource="default" engine="innodb"
+           comment="Catalog Product To Category Linkage Table">
+        <column xsi:type="int" name="entity_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="category_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Category ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="category_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_PRD_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_category_product"
+                    column="product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_CTGR_PRD_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_category_product" column="category_id" referenceTable="catalog_category_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_CATEGORY_PRODUCT_CATEGORY_ID_PRODUCT_ID">
+            <column name="category_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="CATALOG_CATEGORY_PRODUCT_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalog_category_product_index" resource="default" engine="innodb"
+           comment="Catalog Category Product Index">
+        <column xsi:type="int" name="category_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Category ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Position"/>
+        <column xsi:type="smallint" name="is_parent" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Parent"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="smallint" name="visibility" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Visibility"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="category_id"/>
+            <column name="product_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY" indexType="btree">
+            <column name="product_id"/>
+            <column name="store_id"/>
+            <column name="category_id"/>
+            <column name="visibility"/>
+        </index>
+        <index referenceId="CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION" indexType="btree">
+            <column name="store_id"/>
+            <column name="category_id"/>
+            <column name="visibility"/>
+            <column name="is_parent"/>
+            <column name="position"/>
+        </index>
+    </table>
+    <table name="catalog_compare_item" resource="default" engine="innodb" comment="Catalog Compare Table">
+        <column xsi:type="int" name="catalog_compare_item_id" padding="10" unsigned="true" nullable="false"
+                identity="true" comment="Compare Item ID"/>
+        <column xsi:type="int" name="visitor_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Visitor ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="catalog_compare_item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="catalog_compare_item" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="catalog_compare_item" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID" table="catalog_compare_item"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <index referenceId="CATALOG_COMPARE_ITEM_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="CATALOG_COMPARE_ITEM_VISITOR_ID_PRODUCT_ID" indexType="btree">
+            <column name="visitor_id"/>
+            <column name="product_id"/>
+        </index>
+        <index referenceId="CATALOG_COMPARE_ITEM_CUSTOMER_ID_PRODUCT_ID" indexType="btree">
+            <column name="customer_id"/>
+            <column name="product_id"/>
+        </index>
+        <index referenceId="CATALOG_COMPARE_ITEM_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_website" resource="default" engine="innodb"
+           comment="Catalog Product To Website Linkage Table">
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="catalog_product_website" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_WS_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_website"
+                    column="product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_WEBSITE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_link_type" resource="default" engine="innodb"
+           comment="Catalog Product Link Type Table">
+        <column xsi:type="smallint" name="link_type_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Link Type ID"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="link_type_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_link" resource="default" engine="innodb"
+           comment="Catalog Product To Product Linkage Table">
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Link ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="linked_product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Linked Product ID"/>
+        <column xsi:type="smallint" name="link_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Link Type ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="link_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_LNKED_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_link"
+                    column="linked_product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="catalog_product_link" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID"
+                    table="catalog_product_link" column="link_type_id" referenceTable="catalog_product_link_type"
+                    referenceColumn="link_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_LINK_LINK_TYPE_ID_PRODUCT_ID_LINKED_PRODUCT_ID">
+            <column name="link_type_id"/>
+            <column name="product_id"/>
+            <column name="linked_product_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_LINK_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_LINK_LINKED_PRODUCT_ID" indexType="btree">
+            <column name="linked_product_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_link_attribute" resource="default" engine="innodb"
+           comment="Catalog Product Link Attribute Table">
+        <column xsi:type="smallint" name="product_link_attribute_id" padding="5" unsigned="true" nullable="false"
+                identity="true" comment="Product Link Attribute ID"/>
+        <column xsi:type="smallint" name="link_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Link Type ID"/>
+        <column xsi:type="varchar" name="product_link_attribute_code" nullable="true" length="32"
+                comment="Product Link Attribute Code"/>
+        <column xsi:type="varchar" name="data_type" nullable="true" length="32" comment="Data Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_link_attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID"
+                    table="catalog_product_link_attribute" column="link_type_id"
+                    referenceTable="catalog_product_link_type" referenceColumn="link_type_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_LINK_TYPE_ID" indexType="btree">
+            <column name="link_type_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_link_attribute_decimal" resource="default" engine="innodb"
+           comment="Catalog Product Link Decimal Attribute Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="product_link_attribute_id" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Product Link Attribute ID"/>
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Link ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_DEC_LNK_ID_CAT_PRD_LNK_LNK_ID"
+                    table="catalog_product_link_attribute_decimal" column="link_id"
+                    referenceTable="catalog_product_link" referenceColumn="link_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_AB2EFA9A14F7BCF1D5400056203D14B6"
+                    table="catalog_product_link_attribute_decimal" column="product_link_attribute_id"
+                    referenceTable="catalog_product_link_attribute" referenceColumn="product_link_attribute_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_LNK_ATTR_DEC_PRD_LNK_ATTR_ID_LNK_ID">
+            <column name="product_link_attribute_id"/>
+            <column name="link_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_DECIMAL_LINK_ID" indexType="btree">
+            <column name="link_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_link_attribute_int" resource="default" engine="innodb"
+           comment="Catalog Product Link Integer Attribute Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="product_link_attribute_id" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Product Link Attribute ID"/>
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Link ID"/>
+        <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_INT_LNK_ID_CAT_PRD_LNK_LNK_ID"
+                    table="catalog_product_link_attribute_int" column="link_id" referenceTable="catalog_product_link"
+                    referenceColumn="link_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_D6D878F8BA2A4282F8DDED7E6E3DE35C"
+                    table="catalog_product_link_attribute_int" column="product_link_attribute_id"
+                    referenceTable="catalog_product_link_attribute" referenceColumn="product_link_attribute_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_LNK_ATTR_INT_PRD_LNK_ATTR_ID_LNK_ID">
+            <column name="product_link_attribute_id"/>
+            <column name="link_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_INT_LINK_ID" indexType="btree">
+            <column name="link_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_link_attribute_varchar" resource="default" engine="innodb"
+           comment="Catalog Product Link Varchar Attribute Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="product_link_attribute_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Product Link Attribute ID"/>
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Link ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_LNK_ATTR_VCHR_LNK_ID_CAT_PRD_LNK_LNK_ID"
+                    table="catalog_product_link_attribute_varchar" column="link_id"
+                    referenceTable="catalog_product_link" referenceColumn="link_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_DEE9C4DA61CFCC01DFCF50F0D79CEA51"
+                    table="catalog_product_link_attribute_varchar" column="product_link_attribute_id"
+                    referenceTable="catalog_product_link_attribute" referenceColumn="product_link_attribute_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_LNK_ATTR_VCHR_PRD_LNK_ATTR_ID_LNK_ID">
+            <column name="product_link_attribute_id"/>
+            <column name="link_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_LINK_ATTRIBUTE_VARCHAR_LINK_ID" indexType="btree">
+            <column name="link_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_tier_price" resource="default" engine="innodb"
+           comment="Catalog Product Tier Price Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="smallint" name="all_groups" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Applicable To All Customer Groups"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="1"
+                comment="QTY"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Value"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="percentage_value" scale="2" precision="5" unsigned="false" nullable="true"
+                comment="Percentage value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+                    table="catalog_product_entity_tier_price" column="customer_group_id" referenceTable="customer_group"
+                    referenceColumn="customer_group_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_tier_price" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_TIER_PRICE_WS_ID_STORE_WS_WS_ID"
+                    table="catalog_product_entity_tier_price" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="UNQ_E8AB433B9ACB00343ABB312AD2FAB087">
+            <column name="entity_id"/>
+            <column name="all_groups"/>
+            <column name="customer_group_id"/>
+            <column name="qty"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_TIER_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_TIER_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_media_gallery" resource="default" engine="innodb"
+           comment="Catalog Product Media Gallery Attribute Backend Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <column xsi:type="varchar" name="media_type" nullable="false" length="32" default="image"
+                comment="Media entry type"/>
+        <column xsi:type="smallint" name="disabled" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Visibility status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="catalog_product_entity_media_gallery" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_media_gallery_value" resource="default" engine="innodb"
+           comment="Catalog Product Media Gallery Attribute Value Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Value ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="label" nullable="true" length="255" comment="Label"/>
+        <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Position"/>
+        <column xsi:type="smallint" name="disabled" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Disabled"/>
+        <column xsi:type="int" name="record_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Record Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="record_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_VAL_ID_CAT_PRD_ENTT_MDA_GLR_VAL_ID"
+                    table="catalog_product_entity_media_gallery_value" column="value_id"
+                    referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_media_gallery_value" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_media_gallery_value" column="entity_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID" indexType="btree">
+            <column name="value_id"/>
+        </index>
+        <index referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_VAL_ID_STORE_ID" indexType="btree">
+            <column name="entity_id"/>
+            <column name="value_id"/>
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_option" resource="default" engine="innodb" comment="Catalog Product Option Table">
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="varchar" name="type" nullable="true" length="50" comment="Type"/>
+        <column xsi:type="smallint" name="is_require" padding="6" unsigned="false" nullable="false" identity="false"
+                default="1" comment="Is Required"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="64" comment="SKU"/>
+        <column xsi:type="int" name="max_characters" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Max Characters"/>
+        <column xsi:type="varchar" name="file_extension" nullable="true" length="50" comment="File Extension"/>
+        <column xsi:type="smallint" name="image_size_x" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Image Size X"/>
+        <column xsi:type="smallint" name="image_size_y" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Image Size Y"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_PRD_ID_CAT_PRD_ENTT_ENTT_ID" table="catalog_product_option"
+                    column="product_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_OPTION_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_option_price" resource="default" engine="innodb"
+           comment="Catalog Product Option Price Table">
+        <column xsi:type="int" name="option_price_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Price ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <column xsi:type="varchar" name="price_type" nullable="false" length="7" default="fixed" comment="Price Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_price_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_PRICE_OPT_ID_CAT_PRD_OPT_OPT_ID"
+                    table="catalog_product_option_price" column="option_id" referenceTable="catalog_product_option"
+                    referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_PRICE_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_option_price" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_PRICE_OPTION_ID_STORE_ID">
+            <column name="option_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_OPTION_PRICE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_option_title" resource="default" engine="innodb"
+           comment="Catalog Product Option Title Table">
+        <column xsi:type="int" name="option_title_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Title ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_title_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_TTL_OPT_ID_CAT_PRD_OPT_OPT_ID"
+                    table="catalog_product_option_title" column="option_id" referenceTable="catalog_product_option"
+                    referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_TITLE_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_option_title" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_TITLE_OPTION_ID_STORE_ID">
+            <column name="option_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_OPTION_TITLE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_option_type_value" resource="default" engine="innodb"
+           comment="Catalog Product Option Type Value Table">
+        <column xsi:type="int" name="option_type_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Type ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option ID"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="64" comment="SKU"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_type_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_OPT_TYPE_VAL_OPT_ID_CAT_PRD_OPT_OPT_ID"
+                    table="catalog_product_option_type_value" column="option_id" referenceTable="catalog_product_option"
+                    referenceColumn="option_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_OPTION_TYPE_VALUE_OPTION_ID" indexType="btree">
+            <column name="option_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_option_type_price" resource="default" engine="innodb"
+           comment="Catalog Product Option Type Price Table">
+        <column xsi:type="int" name="option_type_price_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Type Price ID"/>
+        <column xsi:type="int" name="option_type_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Type ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <column xsi:type="varchar" name="price_type" nullable="false" length="7" default="fixed" comment="Price Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_type_price_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="FK_B523E3378E8602F376CC415825576B7F"
+                    table="catalog_product_option_type_price" column="option_type_id"
+                    referenceTable="catalog_product_option_type_value" referenceColumn="option_type_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_option_type_price" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_TYPE_PRICE_OPTION_TYPE_ID_STORE_ID">
+            <column name="option_type_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_option_type_title" resource="default" engine="innodb"
+           comment="Catalog Product Option Type Title Table">
+        <column xsi:type="int" name="option_type_title_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Type Title ID"/>
+        <column xsi:type="int" name="option_type_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Type ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_type_title_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="FK_C085B9CF2C2A302E8043FDEA1937D6A2"
+                    table="catalog_product_option_type_title" column="option_type_id"
+                    referenceTable="catalog_product_option_type_value" referenceColumn="option_type_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_option_type_title" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_OPTION_TYPE_TITLE_OPTION_TYPE_ID_STORE_ID">
+            <column name="option_type_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_eav_attribute" resource="default" engine="innodb" comment="Catalog EAV Attribute Table">
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="varchar" name="frontend_input_renderer" nullable="true" length="255"
+                comment="Frontend Input Renderer"/>
+        <column xsi:type="smallint" name="is_global" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Global"/>
+        <column xsi:type="smallint" name="is_visible" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Visible"/>
+        <column xsi:type="smallint" name="is_searchable" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Searchable"/>
+        <column xsi:type="smallint" name="is_filterable" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Filterable"/>
+        <column xsi:type="smallint" name="is_comparable" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Comparable"/>
+        <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible On Front"/>
+        <column xsi:type="smallint" name="is_html_allowed_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is HTML Allowed On Front"/>
+        <column xsi:type="smallint" name="is_used_for_price_rules" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Used For Price Rules"/>
+        <column xsi:type="smallint" name="is_filterable_in_search" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Filterable In Search"/>
+        <column xsi:type="smallint" name="used_in_product_listing" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Used In Product Listing"/>
+        <column xsi:type="smallint" name="used_for_sort_by" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Used For Sorting"/>
+        <column xsi:type="varchar" name="apply_to" nullable="true" length="255" comment="Apply To"/>
+        <column xsi:type="smallint" name="is_visible_in_advanced_search" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible In Advanced Search"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <column xsi:type="smallint" name="is_wysiwyg_enabled" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is WYSIWYG Enabled"/>
+        <column xsi:type="smallint" name="is_used_for_promo_rules" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Used For Promo Rules"/>
+        <column xsi:type="smallint" name="is_required_in_admin_store" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Required In Admin Store"/>
+        <column xsi:type="smallint" name="is_used_in_grid" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Used in Grid"/>
+        <column xsi:type="smallint" name="is_visible_in_grid" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible in Grid"/>
+        <column xsi:type="smallint" name="is_filterable_in_grid" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Filterable in Grid"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOG_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="catalog_eav_attribute" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_EAV_ATTRIBUTE_USED_FOR_SORT_BY" indexType="btree">
+            <column name="used_for_sort_by"/>
+        </index>
+        <index referenceId="CATALOG_EAV_ATTRIBUTE_USED_IN_PRODUCT_LISTING" indexType="btree">
+            <column name="used_in_product_listing"/>
+        </index>
+    </table>
+    <table name="catalog_product_relation" resource="default" engine="innodb" comment="Catalog Product Relation Table">
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent ID"/>
+        <column xsi:type="int" name="child_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Child ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="parent_id"/>
+            <column name="child_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_RELATION_CHILD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_relation" column="child_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_RELATION_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_relation" column="parent_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_RELATION_CHILD_ID" indexType="btree">
+            <column name="child_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_eav" resource="default" engine="innodb"
+           comment="Catalog Product EAV Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_VALUE" indexType="btree">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_eav_decimal" resource="default" engine="innodb"
+           comment="Catalog Product EAV Decimal Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE" indexType="btree">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_price" resource="default" engine="innodb"
+           comment="Catalog Product Price Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Final Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE" indexType="btree">
+            <column name="min_price"/>
+        </index>
+        <index referenceId="CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE" indexType="btree">
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="min_price"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_tier_price" resource="default" engine="innodb"
+           comment="Catalog Product Tier Price Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+                    table="catalog_product_index_tier_price" column="customer_group_id" referenceTable="customer_group"
+                    referenceColumn="customer_group_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_index_tier_price" column="entity_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_TIER_PRICE_WS_ID_STORE_WS_WS_ID"
+                    table="catalog_product_index_tier_price" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_INDEX_TIER_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_TIER_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_website" resource="default" engine="innodb"
+           comment="Catalog Product Website Index Table">
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="default_store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Default store id for website"/>
+        <column xsi:type="date" name="website_date" comment="Website Date"/>
+        <column xsi:type="float" name="rate" unsigned="false" nullable="true" default="1" comment="Rate"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_IDX_WS_WS_ID_STORE_WS_WS_ID" table="catalog_product_index_website"
+                    column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_PRODUCT_INDEX_WEBSITE_WEBSITE_DATE" indexType="btree">
+            <column name="website_date"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_price_cfg_opt_agr_idx" resource="default" engine="innodb"
+           comment="Catalog Product Price Indexer Config Option Aggregate Index Table">
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent ID"/>
+        <column xsi:type="int" name="child_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Child ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="parent_id"/>
+            <column name="child_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_cfg_opt_agr_tmp" resource="default" engine="memory"
+           comment="Catalog Product Price Indexer Config Option Aggregate Temp Table">
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent ID"/>
+        <column xsi:type="int" name="child_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Child ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="parent_id"/>
+            <column name="child_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_cfg_opt_idx" resource="default" engine="innodb"
+           comment="Catalog Product Price Indexer Config Option Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_cfg_opt_tmp" resource="default" engine="memory"
+           comment="Catalog Product Price Indexer Config Option Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_final_idx" resource="default" engine="innodb"
+           comment="Catalog Product Price Indexer Final Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Original Price"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tier"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_final_tmp" resource="default" engine="memory"
+           comment="Catalog Product Price Indexer Final Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="decimal" name="orig_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Original Price"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tier"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_opt_idx" resource="default" engine="innodb"
+           comment="Catalog Product Price Indexer Option Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_opt_tmp" resource="default" engine="memory"
+           comment="Catalog Product Price Indexer Option Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_opt_agr_idx" resource="default" engine="innodb"
+           comment="Catalog Product Price Indexer Option Aggregate Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+            <column name="option_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_opt_agr_tmp" resource="default" engine="memory"
+           comment="Catalog Product Price Indexer Option Aggregate Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+            <column name="option_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_eav_idx" resource="default" engine="innodb"
+           comment="Catalog Product EAV Indexer Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_IDX_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_IDX_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_IDX_VALUE" indexType="btree">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_eav_tmp" resource="default" engine="memory"
+           comment="Catalog Product EAV Indexer Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_ATTRIBUTE_ID" indexType="hash">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_STORE_ID" indexType="hash">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_VALUE" indexType="hash">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_eav_decimal_idx" resource="default" engine="innodb"
+           comment="Catalog Product EAV Decimal Indexer Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_VALUE" indexType="btree">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_eav_decimal_tmp" resource="default" engine="memory"
+           comment="Catalog Product EAV Decimal Indexer Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_ATTRIBUTE_ID" indexType="hash">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_STORE_ID" indexType="hash">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_VALUE" indexType="hash">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_price_idx" resource="default" engine="innodb"
+           comment="Catalog Product Price Indexer Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Final Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_IDX_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_IDX_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_IDX_MIN_PRICE" indexType="btree">
+            <column name="min_price"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_price_tmp" resource="default" engine="memory"
+           comment="Catalog Product Price Indexer Temp Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Final Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID" indexType="hash">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID" indexType="hash">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE" indexType="hash">
+            <column name="min_price"/>
+        </index>
+    </table>
+    <table name="catalog_category_product_index_tmp" resource="default" engine="memory"
+           comment="Catalog Category Product Indexer temporary table">
+        <column xsi:type="int" name="category_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Category ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <column xsi:type="smallint" name="is_parent" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Parent"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="smallint" name="visibility" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Visibility"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="category_id"/>
+            <column name="product_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CAT_CTGR_PRD_IDX_TMP_PRD_ID_CTGR_ID_STORE_ID" indexType="hash">
+            <column name="product_id"/>
+            <column name="category_id"/>
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_entity_media_gallery_value_to_entity" resource="default" engine="innodb"
+           comment="Link Media value to Product entity table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Value media Entry ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Entity ID"/>
+        <constraint xsi:type="foreign" referenceId="FK_A6C6C8FAA386736921D3A7C4B50B1185"
+                    table="catalog_product_entity_media_gallery_value_to_entity" column="value_id"
+                    referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_entity_media_gallery_value_to_entity" column="entity_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_VAL_ID_ENTT_ID">
+            <column name="value_id"/>
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_eav_replica" resource="default" engine="innodb"
+           comment="Catalog Product EAV Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_VALUE" indexType="btree">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_eav_decimal_replica" resource="default" engine="innodb"
+           comment="Catalog Product EAV Decimal Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Value"/>
+        <column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Original entity Id for attribute value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+            <column name="value"/>
+            <column name="source_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE" indexType="btree">
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_price_replica" resource="default" engine="innodb"
+           comment="Catalog Product Price Index Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Tax Class ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="final_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Final Price"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Min Price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Max Price"/>
+        <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tier Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE" indexType="btree">
+            <column name="min_price"/>
+        </index>
+        <index referenceId="CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE" indexType="btree">
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="min_price"/>
+        </index>
+    </table>
+    <table name="catalog_category_product_index_replica" resource="default" engine="innodb"
+           comment="Catalog Category Product Index">
+        <column xsi:type="int" name="category_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Category ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Position"/>
+        <column xsi:type="smallint" name="is_parent" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Parent"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="smallint" name="visibility" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Visibility"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="category_id"/>
+            <column name="product_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY" indexType="btree">
+            <column name="product_id"/>
+            <column name="store_id"/>
+            <column name="category_id"/>
+            <column name="visibility"/>
+        </index>
+        <index referenceId="CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION" indexType="btree">
+            <column name="store_id"/>
+            <column name="category_id"/>
+            <column name="visibility"/>
+            <column name="is_parent"/>
+            <column name="position"/>
+        </index>
+    </table>
+    <table name="catalog_product_frontend_action" resource="default" engine="innodb"
+           comment="Catalog Product Frontend Action Table">
+        <column xsi:type="bigint" name="action_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Product Action Id"/>
+        <column xsi:type="varchar" name="type_id" nullable="false" length="64" comment="Type of product action"/>
+        <column xsi:type="int" name="visitor_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Visitor Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="bigint" name="added_at" padding="20" unsigned="false" nullable="false" identity="false"
+                comment="Added At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="action_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_FRONTEND_ACTION_CSTR_ID_CSTR_ENTT_ENTT_ID"
+                    table="catalog_product_frontend_action" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_FRONTEND_ACTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_frontend_action" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE" />
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID">
+            <column name="visitor_id"/>
+            <column name="product_id"/>
+            <column name="type_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID">
+            <column name="customer_id"/>
+            <column name="product_id"/>
+            <column name="type_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Catalog/etc/db_schema_whitelist.json b/app/code/Magento/Catalog/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..d4bd6927d4345
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/db_schema_whitelist.json
@@ -0,0 +1,1125 @@
+{
+    "catalog_product_entity": {
+        "column": {
+            "entity_id": true,
+            "attribute_set_id": true,
+            "type_id": true,
+            "sku": true,
+            "has_options": true,
+            "required_options": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_ATTRIBUTE_SET_ID": true,
+            "CATALOG_PRODUCT_ENTITY_SKU": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_ATTR_SET_ID_EAV_ATTR_SET_ATTR_SET_ID": true
+        }
+    },
+    "catalog_product_entity_datetime": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_DATETIME_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_PRD_ENTT_DTIME_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_entity_decimal": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_DECIMAL_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_PRD_ENTT_DEC_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_entity_int": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_INT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_PRD_ENTT_INT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_ENTITY_INT_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_entity_text": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_TEXT_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_PRD_ENTT_TEXT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_entity_varchar": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_entity_gallery": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "position": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID": true,
+            "CATALOG_PRODUCT_ENTITY_GALLERY_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_GLR_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_PRD_ENTT_GLR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_category_entity": {
+        "column": {
+            "entity_id": true,
+            "attribute_set_id": true,
+            "parent_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "path": true,
+            "position": true,
+            "level": true,
+            "children_count": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_ENTITY_LEVEL": true,
+            "CATALOG_CATEGORY_ENTITY_PATH": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_category_entity_datetime": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DATETIME_ATTRIBUTE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_CTGR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_CTGR_ENTT_DTIME_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_category_entity_decimal": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DECIMAL_ATTRIBUTE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_CTGR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_CTGR_ENTT_DEC_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_category_entity_int": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID": true,
+            "CATALOG_CATEGORY_ENTITY_INT_ATTRIBUTE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_INT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_CTGR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_CTGR_ENTT_INT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CATALOG_CATEGORY_ENTITY_INT_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_category_entity_text": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID": true,
+            "CATALOG_CATEGORY_ENTITY_TEXT_ATTRIBUTE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_CTGR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_CTGR_ENTT_TEXT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_category_entity_varchar": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID": true,
+            "CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_CTGR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "catalog_category_product": {
+        "column": {
+            "entity_id": true,
+            "category_id": true,
+            "product_id": true,
+            "position": true
+        },
+        "index": {
+            "CATALOG_CATEGORY_PRODUCT_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_CTGR_PRD_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_CTGR_PRD_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CATALOG_CATEGORY_PRODUCT_CATEGORY_ID_PRODUCT_ID": true,
+            "CAT_CTGR_PRD_CTGR_ID_SEQUENCE_CAT_CTGR_SEQUENCE_VAL": true
+        }
+    },
+    "catalog_category_product_index": {
+        "column": {
+            "category_id": true,
+            "product_id": true,
+            "position": true,
+            "is_parent": true,
+            "store_id": true,
+            "visibility": true
+        },
+        "index": {
+            "CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY": true,
+            "CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_compare_item": {
+        "column": {
+            "catalog_compare_item_id": true,
+            "visitor_id": true,
+            "customer_id": true,
+            "product_id": true,
+            "store_id": true
+        },
+        "index": {
+            "CATALOG_COMPARE_ITEM_PRODUCT_ID": true,
+            "CATALOG_COMPARE_ITEM_VISITOR_ID_PRODUCT_ID": true,
+            "CATALOG_COMPARE_ITEM_CUSTOMER_ID_PRODUCT_ID": true,
+            "CATALOG_COMPARE_ITEM_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOG_COMPARE_ITEM_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "CATALOG_COMPARE_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
+            "CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "catalog_product_website": {
+        "column": {
+            "product_id": true,
+            "website_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_WEBSITE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOG_PRODUCT_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "CAT_PRD_WS_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true
+        }
+    },
+    "catalog_product_link_type": {
+        "column": {
+            "link_type_id": true,
+            "code": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_link": {
+        "column": {
+            "link_id": true,
+            "product_id": true,
+            "linked_product_id": true,
+            "link_type_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_LINK_PRODUCT_ID": true,
+            "CATALOG_PRODUCT_LINK_LINKED_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_LNK_LNKED_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
+            "CAT_PRD_LNK_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID": true,
+            "CATALOG_PRODUCT_LINK_LINK_TYPE_ID_PRODUCT_ID_LINKED_PRODUCT_ID": true
+        }
+    },
+    "catalog_product_link_attribute": {
+        "column": {
+            "product_link_attribute_id": true,
+            "link_type_id": true,
+            "product_link_attribute_code": true,
+            "data_type": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_LINK_ATTRIBUTE_LINK_TYPE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_LNK_ATTR_LNK_TYPE_ID_CAT_PRD_LNK_TYPE_LNK_TYPE_ID": true
+        }
+    },
+    "catalog_product_link_attribute_decimal": {
+        "column": {
+            "value_id": true,
+            "product_link_attribute_id": true,
+            "link_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_LINK_ATTRIBUTE_DECIMAL_LINK_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_LNK_ATTR_DEC_LNK_ID_CAT_PRD_LNK_LNK_ID": true,
+            "FK_AB2EFA9A14F7BCF1D5400056203D14B6": true,
+            "CAT_PRD_LNK_ATTR_DEC_PRD_LNK_ATTR_ID_LNK_ID": true
+        }
+    },
+    "catalog_product_link_attribute_int": {
+        "column": {
+            "value_id": true,
+            "product_link_attribute_id": true,
+            "link_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_LINK_ATTRIBUTE_INT_LINK_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_LNK_ATTR_INT_LNK_ID_CAT_PRD_LNK_LNK_ID": true,
+            "FK_D6D878F8BA2A4282F8DDED7E6E3DE35C": true,
+            "CAT_PRD_LNK_ATTR_INT_PRD_LNK_ATTR_ID_LNK_ID": true
+        }
+    },
+    "catalog_product_link_attribute_varchar": {
+        "column": {
+            "value_id": true,
+            "product_link_attribute_id": true,
+            "link_id": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_LINK_ATTRIBUTE_VARCHAR_LINK_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_LNK_ATTR_VCHR_LNK_ID_CAT_PRD_LNK_LNK_ID": true,
+            "FK_DEE9C4DA61CFCC01DFCF50F0D79CEA51": true,
+            "CAT_PRD_LNK_ATTR_VCHR_PRD_LNK_ATTR_ID_LNK_ID": true
+        }
+    },
+    "catalog_product_entity_tier_price": {
+        "column": {
+            "value_id": true,
+            "entity_id": true,
+            "all_groups": true,
+            "customer_group_id": true,
+            "qty": true,
+            "value": true,
+            "website_id": true,
+            "percentage_value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_TIER_PRICE_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_ENTITY_TIER_PRICE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true,
+            "CAT_PRD_ENTT_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_ENTT_TIER_PRICE_WS_ID_STORE_WS_WS_ID": true,
+            "UNQ_E8AB433B9ACB00343ABB312AD2FAB087": true
+        }
+    },
+    "catalog_product_entity_media_gallery": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true,
+            "media_type": true,
+            "disabled": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_ENTITY_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_MDA_GLR_ATTR_ID_EAV_ATTR_ATTR_ID": true
+        }
+    },
+    "catalog_product_entity_media_gallery_value": {
+        "column": {
+            "value_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "label": true,
+            "position": true,
+            "disabled": true,
+            "record_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_STORE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID": true,
+            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_VAL_ID_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_VAL_ID_CAT_PRD_ENTT_MDA_GLR_VAL_ID": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_STORE_ID_STORE_STORE_ID": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true
+        }
+    },
+    "catalog_product_option": {
+        "column": {
+            "option_id": true,
+            "product_id": true,
+            "type": true,
+            "is_require": true,
+            "sku": true,
+            "max_characters": true,
+            "file_extension": true,
+            "image_size_x": true,
+            "image_size_y": true,
+            "sort_order": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_OPTION_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_OPT_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true
+        }
+    },
+    "catalog_product_option_price": {
+        "column": {
+            "option_price_id": true,
+            "option_id": true,
+            "store_id": true,
+            "price": true,
+            "price_type": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_OPTION_PRICE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_OPT_PRICE_OPT_ID_CAT_PRD_OPT_OPT_ID": true,
+            "CATALOG_PRODUCT_OPTION_PRICE_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_OPTION_PRICE_OPTION_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_option_title": {
+        "column": {
+            "option_title_id": true,
+            "option_id": true,
+            "store_id": true,
+            "title": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_OPTION_TITLE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_OPT_TTL_OPT_ID_CAT_PRD_OPT_OPT_ID": true,
+            "CATALOG_PRODUCT_OPTION_TITLE_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_OPTION_TITLE_OPTION_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_option_type_value": {
+        "column": {
+            "option_type_id": true,
+            "option_id": true,
+            "sku": true,
+            "sort_order": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_OPTION_TYPE_VALUE_OPTION_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_OPT_TYPE_VAL_OPT_ID_CAT_PRD_OPT_OPT_ID": true
+        }
+    },
+    "catalog_product_option_type_price": {
+        "column": {
+            "option_type_price_id": true,
+            "option_type_id": true,
+            "store_id": true,
+            "price": true,
+            "price_type": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_B523E3378E8602F376CC415825576B7F": true,
+            "CATALOG_PRODUCT_OPTION_TYPE_PRICE_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_OPTION_TYPE_PRICE_OPTION_TYPE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_option_type_title": {
+        "column": {
+            "option_type_title_id": true,
+            "option_type_id": true,
+            "store_id": true,
+            "title": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_C085B9CF2C2A302E8043FDEA1937D6A2": true,
+            "CATALOG_PRODUCT_OPTION_TYPE_TITLE_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_PRODUCT_OPTION_TYPE_TITLE_OPTION_TYPE_ID_STORE_ID": true
+        }
+    },
+    "catalog_eav_attribute": {
+        "column": {
+            "attribute_id": true,
+            "frontend_input_renderer": true,
+            "is_global": true,
+            "is_visible": true,
+            "is_searchable": true,
+            "is_filterable": true,
+            "is_comparable": true,
+            "is_visible_on_front": true,
+            "is_html_allowed_on_front": true,
+            "is_used_for_price_rules": true,
+            "is_filterable_in_search": true,
+            "used_in_product_listing": true,
+            "used_for_sort_by": true,
+            "apply_to": true,
+            "is_visible_in_advanced_search": true,
+            "position": true,
+            "is_wysiwyg_enabled": true,
+            "is_used_for_promo_rules": true,
+            "is_required_in_admin_store": true,
+            "is_used_in_grid": true,
+            "is_visible_in_grid": true,
+            "is_filterable_in_grid": true
+        },
+        "index": {
+            "CATALOG_EAV_ATTRIBUTE_USED_FOR_SORT_BY": true,
+            "CATALOG_EAV_ATTRIBUTE_USED_IN_PRODUCT_LISTING": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOG_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true
+        }
+    },
+    "catalog_product_relation": {
+        "column": {
+            "parent_id": true,
+            "child_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_RELATION_CHILD_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_RELATION_CHILD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_RELATION_PARENT_ID_CAT_PRD_ENTT_ENTT_ID": true
+        }
+    },
+    "catalog_product_index_eav": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_EAV_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID": true
+        }
+    },
+    "catalog_product_index_eav_decimal": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_EAV_DEC_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID": true
+        }
+    },
+    "catalog_product_index_price": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "price": true,
+            "final_price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE": true,
+            "CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true,
+            "CAT_PRD_IDX_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "catalog_product_index_tier_price": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_TIER_PRICE_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_INDEX_TIER_PRICE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_TIER_PRICE_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true,
+            "CAT_PRD_IDX_TIER_PRICE_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_IDX_TIER_PRICE_WS_ID_STORE_WS_WS_ID": true
+        }
+    },
+    "catalog_product_index_website": {
+        "column": {
+            "website_id": true,
+            "website_date": true,
+            "rate": true,
+            "default_store_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_WEBSITE_WEBSITE_DATE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_WS_WS_ID_STORE_WS_WS_ID": true
+        }
+    },
+    "catalog_product_index_price_cfg_opt_agr_idx": {
+        "column": {
+            "parent_id": true,
+            "child_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_cfg_opt_agr_tmp": {
+        "column": {
+            "parent_id": true,
+            "child_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_cfg_opt_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_cfg_opt_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_final_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "orig_price": true,
+            "price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true,
+            "base_tier": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_final_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "orig_price": true,
+            "price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true,
+            "base_tier": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_opt_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_opt_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_opt_agr_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "option_id": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_opt_agr_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "option_id": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_eav_idx": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_IDX_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_IDX_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_IDX_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_EAV_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID": true
+        }
+    },
+    "catalog_product_index_eav_tmp": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_TMP_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_TMP_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_TMP_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_EAV_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID": true
+        }
+    },
+    "catalog_product_index_eav_decimal_idx": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_IDX_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_EAV_DEC_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID": true
+        }
+    },
+    "catalog_product_index_eav_decimal_tmp": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_IDX_EAV_DEC_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID": true
+        }
+    },
+    "catalog_product_index_price_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "price": true,
+            "final_price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_PRICE_IDX_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_IDX_WEBSITE_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_IDX_MIN_PRICE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "price": true,
+            "final_price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_category_product_index_tmp": {
+        "column": {
+            "category_id": true,
+            "product_id": true,
+            "position": true,
+            "is_parent": true,
+            "store_id": true,
+            "visibility": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        },
+        "index": {
+            "CAT_CTGR_PRD_IDX_TMP_PRD_ID_CTGR_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_entity_media_gallery_value_to_entity": {
+        "column": {
+            "value_id": true,
+            "entity_id": true
+        },
+        "constraint": {
+            "FK_A6C6C8FAA386736921D3A7C4B50B1185": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_TO_ENTT_VAL_ID_ENTT_ID": true
+        }
+    },
+    "catalog_product_index_eav_replica": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_REPLICA_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_REPLICA_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_REPLICA_VALUE": true,
+            "CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_eav_decimal_replica": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true,
+            "source_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_REPLICA_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_REPLICA_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_REPLICA_VALUE": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE_ID": true,
+            "CATALOG_PRODUCT_INDEX_EAV_DECIMAL_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_replica": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "tax_class_id": true,
+            "price": true,
+            "final_price": true,
+            "min_price": true,
+            "max_price": true,
+            "tier_price": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_INDEX_PRICE_REPLICA_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_REPLICA_MIN_PRICE": true,
+            "CAT_PRD_IDX_PRICE_REPLICA_WS_ID_CSTR_GROUP_ID_MIN_PRICE": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP_ID": true,
+            "CATALOG_PRODUCT_INDEX_PRICE_MIN_PRICE": true,
+            "CAT_PRD_IDX_PRICE_WS_ID_CSTR_GROUP_ID_MIN_PRICE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_category_product_index_replica": {
+        "column": {
+            "category_id": true,
+            "product_id": true,
+            "position": true,
+            "is_parent": true,
+            "store_id": true,
+            "visibility": true
+        },
+        "index": {
+            "CAT_CTGR_PRD_IDX_REPLICA_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY": true,
+            "IDX_87EB2E3059853CF89A75B4C55074810B": true,
+            "CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY": true,
+            "CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_frontend_action": {
+        "column": {
+            "action_id": true,
+            "type_id": true,
+            "visitor_id": true,
+            "customer_id": true,
+            "product_id": true,
+            "added_at": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_FRONTEND_ACTION_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
+            "CAT_PRD_FRONTEND_ACTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID": true,
+            "CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID": true
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index f28d2cbcdff3e..7d2c3699ee2c2 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -70,7 +70,8 @@
     <preference for="Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterface" type="Magento\Catalog\Model\ProductRender\FormattedPriceInfo" />
     <preference for="Magento\Framework\Indexer\BatchProviderInterface" type="Magento\Framework\Indexer\BatchProvider" />
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
-    <preference for="\Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="\Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
+    <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
+    <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
@@ -167,10 +168,17 @@
     </type>
     <type name="Magento\Catalog\Helper\Data">
         <arguments>
-            <argument name="templateFilterModel" xsi:type="string">Magento\Catalog\Model\Template\Filter</argument>
+            <argument name="templateFilterModel" xsi:type="string">Magento\Widget\Model\Template\Filter</argument>
             <argument name="catalogSession" xsi:type="object">Magento\Catalog\Model\Session\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Helper\Output">
+        <arguments>
+            <argument name="directivePatterns" xsi:type="array">
+                <item name="construct" xsi:type="const">\Magento\Framework\Filter\Template::CONSTRUCTION_PATTERN</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Config\Source\GridPerPage">
         <arguments>
             <argument name="perPageValues" xsi:type="string">9,15,30</argument>
@@ -212,6 +220,12 @@
                 <item name="gif" xsi:type="string">gif</item>
                 <item name="png" xsi:type="string">png</item>
             </argument>
+            <argument name="allowedMimeTypes" xsi:type="array">
+                <item name="jpg" xsi:type="string">image/jpg</item>
+                <item name="jpeg" xsi:type="string">image/jpeg</item>
+                <item name="gif" xsi:type="string">image/gif</item>
+                <item name="png" xsi:type="string">image/png</item>
+            </argument>
         </arguments>
     </virtualType>
     <type name="Magento\Catalog\Controller\Adminhtml\Category\Image\Upload">
@@ -225,7 +239,8 @@
         </arguments>
     </type>
     <type name="Magento\Store\Model\ResourceModel\Website">
-        <plugin name="priceIndexerOnWebsiteDelete" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website"/>
+        <plugin name="invalidatePriceIndexerOnWebsite" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\Website"/>
+        <plugin name="categoryProductWebsiteAfterDelete" type="\Magento\Catalog\Model\Indexer\Category\Product\Plugin\Website"/>
     </type>
     <type name="Magento\Store\Model\ResourceModel\Store">
         <plugin name="storeViewResourceAroundSave" type="Magento\Catalog\Model\Indexer\Category\Flat\Plugin\StoreView"/>
@@ -357,6 +372,7 @@
                 <item name="base_price" xsi:type="string">Magento\Catalog\Pricing\Price\BasePrice</item>
                 <item name="custom_option_price" xsi:type="string">Magento\Catalog\Pricing\Price\CustomOptionPrice</item>
                 <item name="configured_price" xsi:type="string">Magento\Catalog\Pricing\Price\ConfiguredPrice</item>
+                <item name="configured_regular_price" xsi:type="string">Magento\Catalog\Pricing\Price\ConfiguredRegularPrice</item>
             </argument>
         </arguments>
     </virtualType>
@@ -546,16 +562,10 @@
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
-                <item name="imagesResizeCommand" xsi:type="object">Magento\Catalog\Console\Command\ImagesResizeCommand</item>
                 <item name="productAttributesCleanUp" xsi:type="object">Magento\Catalog\Console\Command\ProductAttributesCleanUp</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Catalog\Console\Command\ImagesResizeCommand">
-        <arguments>
-            <argument name="productRepository" xsi:type="object">Magento\Catalog\Api\ProductRepositoryInterface\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Config\View">
         <arguments>
             <argument name="xpath" xsi:type="array">
@@ -592,6 +602,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Order\ProductOption">
+        <arguments>
+            <argument name="processorPool" xsi:type="array">
+                <item name="custom_options" xsi:type="object">Magento\Catalog\Model\ProductOptionProcessor</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Model\Entity\RepositoryFactory">
         <arguments>
             <argument name="entities" xsi:type="array">
@@ -653,12 +670,14 @@
                         <item name="mediaGalleryCreate" xsi:type="string">Magento\Catalog\Model\Product\Gallery\CreateHandler</item>
                         <item name="categoryProductLinksSave" xsi:type="string">Magento\Catalog\Model\Category\Link\SaveHandler</item>
                         <item name="websitePersistor" xsi:type="string">Magento\Catalog\Model\Product\Website\SaveHandler</item>
+                        <item name="tierPriceCreator" xsi:type="string">Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\SaveHandler</item>
                     </item>
                     <item name="update" xsi:type="array">
                         <item name="optionUpdater" xsi:type="string">Magento\Catalog\Model\Product\Option\SaveHandler</item>
                         <item name="mediaGalleryUpdate" xsi:type="string">Magento\Catalog\Model\Product\Gallery\UpdateHandler</item>
                         <item name="categoryProductLinksSave" xsi:type="string">Magento\Catalog\Model\Category\Link\SaveHandler</item>
                         <item name="websitePersistor" xsi:type="string">Magento\Catalog\Model\Product\Website\SaveHandler</item>
+                        <item name="tierPriceUpdater" xsi:type="string">Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler</item>
                     </item>
                 </item>
             </argument>
@@ -686,7 +705,7 @@
                 <item name="Magento\Catalog\Model\Product\Attribute\Backend\Sku" xsi:type="string">string</item>
                 <item name="Magento\Catalog\Model\Product\Attribute\Backend\Category" xsi:type="string">int[]</item>
                 <item name="Magento\Catalog\Model\Product\Attribute\Backend\Stock" xsi:type="string">Magento\CatalogInventory\Api\Data\StockItemInterface[]</item>
-                <item name="Magento\Catalog\Model\Category\Attribute\Backend\Sortby" xsi:type="string">Magento\Eav\Api\Data\AttributeOptionInterface</item>
+                <item name="Magento\Catalog\Model\Category\Attribute\Backend\Sortby" xsi:type="string">string[]</item>
             </argument>
         </arguments>
     </type>
@@ -816,6 +835,9 @@
             <argument name="attributePersistor" xsi:type="object">Magento\Catalog\Model\ResourceModel\AttributePersistor</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Eav\Model\ResourceModel\ReadSnapshot">
+        <plugin name="catalogReadSnapshot" type="Magento\Catalog\Plugin\Model\ResourceModel\ReadSnapshotPlugin" />
+    </type>
     <type name="Magento\Framework\EntityManager\Operation\AttributePool">
         <arguments>
             <argument name="extensionActions" xsi:type="array">
@@ -861,6 +883,7 @@
             <argument name="customFilters" xsi:type="array">
                 <item name="category_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductCategoryFilter</item>
                 <item name="store" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductStoreFilter</item>
+                <item name="store_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductStoreFilter</item>
                 <item name="website_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductWebsiteFilter</item>
             </argument>
         </arguments>
@@ -910,6 +933,7 @@
     <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice">
         <arguments>
             <argument name="baseSelectProcessor" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\CompositeBaseSelectProcessor</argument>
+            <argument name="priceTableResolver" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product\Price\CostStorage">
@@ -1064,4 +1088,80 @@
             <argument name="productRepository" xsi:type="object">Magento\Catalog\Api\ProductRepositoryInterface\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice">
+        <arguments>
+            <argument name="connectionName" xsi:type="string">indexer</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder\Factory">
+        <arguments>
+            <argument name="eavAttributeConditionBuilder" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder\EavAttributeCondition</argument>
+            <argument name="nativeAttributeConditionBuilder" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ConditionBuilder\NativeAttributeCondition</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory">
+        <arguments>
+            <argument name="dimensionProviders" xsi:type="array">
+                <!-- @see \Magento\Store\Model\Indexer\WebsiteDimensionProvider::DIMENSION_NAME -->
+                <item name="ws" xsi:type="object">Magento\Store\Model\Indexer\WebsiteDimensionProvider</item>
+                <!-- @see \Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider::DIMENSION_NAME -->
+                <item name="cg" xsi:type="object">Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver">
+        <arguments>
+            <argument name="priceTableResolver" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver\Proxy</argument>
+            <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
+            <argument name="context" xsi:type="object">Magento\Framework\App\Http\Context\Proxy</argument>
+            <!-- Unccomment after fix issue with Proxy generation -->
+            <!--<argument name="dimensionModeConfiguration" xsi:type="object">-->
+                <!--Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration\Proxy-->
+            <!--</argument>-->
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Layer\Filter\Price">
+        <arguments>
+            <argument name="priceTableResolver" xsi:type="object">
+                Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CustomOptionPriceModifier">
+        <arguments>
+            <argument name="tableStrategy" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\TemporaryTableStrategy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer">
+        <arguments>
+            <argument name="connectionName" xsi:type="string">indexer</argument>
+            <argument name="tableResolver" xsi:type="object">Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier">
+        <arguments>
+            <argument name="priceModifiers" xsi:type="array">
+                <item name="customOptionPriceModifier" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CustomOptionPriceModifier</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\VirtualProductPrice" type="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\SimpleProductPrice">
+        <arguments>
+            <argument name="productType" xsi:type="string">virtual</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand">
+        <arguments>
+            <argument name="dimensionSwitchers" xsi:type="array">
+                <item name="catalog_product_price" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Indexer\Console\Command\IndexerShowDimensionsModeCommand">
+        <arguments>
+            <argument name="indexers" xsi:type="array">
+                <item name="catalog_product_price" xsi:type="string">catalog_product_price</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/events.xml b/app/code/Magento/Catalog/etc/events.xml
index 3fdb554e65b62..5bcdc88369064 100644
--- a/app/code/Magento/Catalog/etc/events.xml
+++ b/app/code/Magento/Catalog/etc/events.xml
@@ -56,9 +56,11 @@
     </event>
     <event name="catalog_product_save_before">
         <observer name="set_special_price_start_date" instance="Magento\Catalog\Observer\SetSpecialPriceStartDate" />
-        <observer name="unset_special_price" instance="Magento\Catalog\Observer\UnsetSpecialPrice" />
     </event>
     <event name="store_save_after">
         <observer name="synchronize_website_attributes" instance="Magento\Catalog\Observer\SynchronizeWebsiteAttributesOnStoreChange" />
     </event>
+    <event name="catalog_product_save_commit_after">
+        <observer name="magento_image_resize" instance="Magento\Catalog\Observer\ImageResizeAfterProductSave" />
+    </event>
 </config>
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index 3989a62a56cc4..ee9c5b29da894 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -79,6 +79,18 @@
             <argument name="typeId" xsi:type="string">recently_compared_product</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
+        <arguments>
+            <argument name="configurationsMap" xsi:type="array">
+                <item name="addCompareSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Catalog::messages/addCompareSuccessMessage.phtml</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Block\Product\View\Gallery">
         <arguments>
             <argument name="galleryImagesConfig" xsi:type="array">
@@ -100,4 +112,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+        <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
+    </type>
+    <type name="Magento\Framework\App\Action\AbstractAction">
+        <plugin name="catalog_app_action_dispatch_controller_context_plugin"
+                type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/module.xml b/app/code/Magento/Catalog/etc/module.xml
index 26ed173420adb..96deaa08bbfae 100644
--- a/app/code/Magento/Catalog/etc/module.xml
+++ b/app/code/Magento/Catalog/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Catalog" setup_version="2.2.4">
+    <module name="Magento_Catalog" >
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Cms"/>
diff --git a/app/code/Magento/Catalog/etc/product_types.xml b/app/code/Magento/Catalog/etc/product_types.xml
index fe4922ab8fa1f..fdcb67ae484d2 100644
--- a/app/code/Magento/Catalog/etc/product_types.xml
+++ b/app/code/Magento/Catalog/etc/product_types.xml
@@ -7,11 +7,13 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/product_types.xsd">
     <type name="simple" label="Simple Product" modelInstance="Magento\Catalog\Model\Product\Type\Simple" indexPriority="10" sortOrder="10">
+        <indexerModel instance="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\SimpleProductPrice" />
         <customAttributes>
             <attribute name="refundable" value="true"/>
         </customAttributes>
     </type>
     <type name="virtual" label="Virtual Product" modelInstance="Magento\Catalog\Model\Product\Type\Virtual" indexPriority="20" sortOrder="40">
+        <indexerModel instance="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\VirtualProductPrice" />
         <customAttributes>
             <attribute name="is_real_product" value="false"/>
             <attribute name="refundable" value="false"/>
diff --git a/app/code/Magento/Catalog/etc/webapi_async.xml b/app/code/Magento/Catalog/etc/webapi_async.xml
new file mode 100644
index 0000000000000..50baad7845e95
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/webapi_async.xml
@@ -0,0 +1,11 @@
+<?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">
+    <route url="async/bulk/V1/products/bySku" method="PUT" alias="async/bulk/V1/products"/>
+</services>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/webapi_rest/di.xml b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
index 1d2b013f2035d..2a5d60222e9f8 100644
--- a/app/code/Magento/Catalog/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
@@ -8,7 +8,6 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Catalog\Model\Product\Option\Type\Date" type="Magento\Catalog\Model\Webapi\Product\Option\Type\Date" />
-
     <type name="Magento\Catalog\Helper\Product\ConfigurationPool">
         <arguments>
             <argument name="instancesByType" xsi:type="array">
@@ -16,4 +15,8 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+        <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/webapi_soap/di.xml b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
index 98a8ef4de8408..2a5d60222e9f8 100644
--- a/app/code/Magento/Catalog/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
@@ -15,4 +15,8 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+        <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/widget.xml b/app/code/Magento/Catalog/etc/widget.xml
index ef9009549da24..f3b37d7d32e31 100644
--- a/app/code/Magento/Catalog/etc/widget.xml
+++ b/app/code/Magento/Catalog/etc/widget.xml
@@ -64,7 +64,11 @@
             </parameter>
             <parameter name="cache_lifetime" xsi:type="text" visible="true">
                 <label translate="true">Cache Lifetime (Seconds)</label>
-                <description translate="true">86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.</description>
+                <description translate="true">
+                    <![CDATA[Time in seconds between the widget updates.
+                    <br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+                    <br/>Widget will not show products that begin to match the specified conditions until cache is refreshed.]]>
+                </description>
             </parameter>
         </parameters>
         <containers>
@@ -292,7 +296,7 @@
         </parameters>
         <containers>
             <container name="sidebar.main">
-                <template name="default" value="list" />
+                <template name="default" value="sidebar" />
             </container>
             <container name="content">
                 <template name="grid" value="grid" />
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index 9745ff0bdac0c..ed27dfd646cb2 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -13,8 +13,8 @@ Position,Position
 Day,Day
 Month,Month
 Year,Year
-"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
-"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+from,from
+to,to
 [GLOBAL],[GLOBAL]
 [WEBSITE],[WEBSITE]
 "[STORE VIEW]","[STORE VIEW]"
@@ -233,7 +233,6 @@ Products,Products
 "This attribute set no longer exists.","This attribute set no longer exists."
 "You saved the attribute set.","You saved the attribute set."
 "Something went wrong while saving the attribute set.","Something went wrong while saving the attribute set."
-"You added product %1 to the comparison list.","You added product %1 to the comparison list."
 "You cleared the comparison list.","You cleared the comparison list."
 "Something went wrong  clearing the comparison list.","Something went wrong  clearing the comparison list."
 "You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
@@ -516,6 +515,9 @@ Groups,Groups
 "Maximum image width","Maximum image width"
 "Maximum image height","Maximum image height"
 "Maximum number of characters:","Maximum number of characters:"
+"Maximum %1 characters", "Maximum %1 characters"
+"too many", "too many"
+"remaining", "remaining"
 "start typing to search template","start typing to search template"
 "Product online","Product online"
 "Product offline","Product offline"
@@ -655,7 +657,6 @@ Comma-separated.,Comma-separated.
 "Product Listing Sort by","Product Listing Sort by"
 "Allow All Products per Page","Allow All Products per Page"
 "Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
-"Allow Dynamic Media URLs","Allow Dynamic Media URLs"
 "E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
 "Product Image Placeholders","Product Image Placeholders"
 "Search Engine Optimization","Search Engine Optimization"
@@ -705,7 +706,13 @@ Template,Template
 "New Products Names Only Template","New Products Names Only Template"
 "New Products Images Only Template","New Products Images Only Template"
 "Cache Lifetime (Seconds)","Cache Lifetime (Seconds)"
-"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
+,
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
 "Catalog Product Link","Catalog Product Link"
 "Link to a Specified Product","Link to a Specified Product"
 "Select Product...","Select Product..."
@@ -797,3 +804,8 @@ Details,Details
 "Recently Viewed","Recently Viewed"
 "The value of Admin must be unique.", "The value of Admin must be unique."
 "The value of Admin must be unique. (%1)", "The value of Admin must be unique. (%1)"
+"Product Name or SKU", "Product Name or SKU"
+"Start typing to find products", "Start typing to find products"
+"Product with ID: (%1) doesn't exist", "Product with ID: (%1) doesn't exist"
+"Category with ID: (%1) doesn't exist", "Category with ID: (%1) doesn't exist"
+"You added product %1 to the <a href=""%2"">comparison list</a>.","You added product %1 to the <a href=""%2"">comparison list</a>."
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
index 4a27158be5f7c..d7aa058a1f446 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Not used since cross-sell products grid moved to UI components.
+@see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
index b5efecf0d03c2..3ba4562c9d3df 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Not used since cross-sell products grid moved to UI components.
+@see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
index 1340d40ef4f9f..c40c4a2818efa 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Not used since related products grid moved to UI components.
+@see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
index 1ae83419ae646..38b791d88a00d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Not used since related products grid moved to UI components.
+@see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
index a9770ed3c182e..eea4450411945 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Not used since upsell products grid moved to UI components.
+@see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
index a4acf572caeb5..2c400746c64f2 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Not used since upsell products grid moved to UI components.
+@see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js b/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js
index 5ffc587f65bec..0677b0a5811c2 100644
--- a/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js
@@ -6,15 +6,29 @@
 var config = {
     map: {
         '*': {
-            categoryForm:       'Magento_Catalog/catalog/category/form',
-            newCategoryDialog:  'Magento_Catalog/js/new-category-dialog',
-            categoryTree:       'Magento_Catalog/js/category-tree',
-            productGallery:     'Magento_Catalog/js/product-gallery',
-            baseImage:          'Magento_Catalog/catalog/base-image-uploader',
-            productAttributes:  'Magento_Catalog/catalog/product-attributes'
+            categoryForm:         'Magento_Catalog/catalog/category/form',
+            newCategoryDialog:    'Magento_Catalog/js/new-category-dialog',
+            categoryTree:         'Magento_Catalog/js/category-tree',
+            productGallery:       'Magento_Catalog/js/product-gallery',
+            baseImage:            'Magento_Catalog/catalog/base-image-uploader',
+            productAttributes:    'Magento_Catalog/catalog/product-attributes',
+            categoryCheckboxTree: 'Magento_Catalog/js/category-checkbox-tree'
         }
     },
     deps: [
         'Magento_Catalog/catalog/product'
-    ]
+    ],
+    config: {
+        mixins: {
+            'Magento_Catalog/js/components/use-parent-settings/select': {
+                'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
+            },
+            'Magento_Catalog/js/components/use-parent-settings/textarea': {
+                'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
+            },
+            'Magento_Catalog/js/components/use-parent-settings/single-checkbox': {
+                'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
+            }
+        }
+    }
 };
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
index 740d389735974..00a1580923a7b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -5,187 +5,33 @@
  */
 
 // @codingStandardsIgnoreFile
-
-?>
-
-<?php $_divId = 'tree-div_' . time() ?>
-<div id="<?= /* @escapeNotVerified */ $_divId ?>" class="tree"></div>
-<script id="ie-deferred-loader" defer="defer" src="//:"></script>
-<script>
-    require([
-        'jquery',
-        "prototype",
-        "extjs/ext-tree-checkbox",
-        "mage/adminhtml/form"
-    ], function(jQuery){
-
-//<![CDATA[
-
-// TODO: cleanup this script. It was copypasted from catalog/category/tree
-
-var tree;
-
 /**
- * Fix ext compatibility with prototype 1.6
+ * @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree
  */
-Ext.lib.Event.getTarget = function(e) {
-    var ee = e.browserEvent || e;
-    return ee.target ? Event.element(ee) : null;
-};
-
-Ext.tree.TreePanel.Enhanced = function(el, config)
-{
-    Ext.tree.TreePanel.Enhanced.superclass.constructor.call(this, el, config);
-};
-
-Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
-
-    loadTree : function(config, firstLoad)
-    {
-        var parameters = config['parameters'];
-        var data = config['data'];
-
-        if ((typeof parameters['root_visible']) != 'undefined') {
-            this.rootVisible = parameters['root_visible']*1;
-        }
-
-        var root = new Ext.tree.TreeNode(parameters);
-
-        this.nodeHash = {};
-        this.setRootNode(root);
-
-        if (firstLoad) {
-            this.addListener('click', this.categoryClick.createDelegate(this));
-        }
-
-        this.loader.buildCategoryTree(root, data);
-        this.el.dom.innerHTML = '';
-        // render the tree
-        this.render();
-    },
-
-    categoryClick : function(node, e)
-    {
-        node.getUI().check(!node.getUI().checked());
-    }
-});
-
-jQuery(function()
-{
-    var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
-    });
-
-    categoryLoader.createNode = function(config) {
-        config.uiProvider = Ext.tree.CheckboxNodeUI;
-        var node;
-        var _node = Object.clone(config);
-        if (config.children && !config.children.length) {
-            delete(config.children);
-            node = new Ext.tree.AsyncTreeNode(config);
-        } else {
-            node = new Ext.tree.TreeNode(config);
-        }
-
-        return node;
-    };
-
-    categoryLoader.buildCategoryTree = function(parent, config)
-    {
-        if (!config) return null;
+?>
 
-        if (parent && config && config.length){
-            for (var i = 0; i < config.length; i++) {
-                config[i].uiProvider = Ext.tree.CheckboxNodeUI;
-                var node;
-                var _node = Object.clone(config[i]);
-                if (_node.children && !_node.children.length) {
-                    delete(_node.children);
-                    node = new Ext.tree.AsyncTreeNode(_node);
-                } else {
-                    node = new Ext.tree.TreeNode(config[i]);
-                }
-                parent.appendChild(node);
-                node.loader = node.getOwnerTree().loader;
-                if (_node.children) {
-                    this.buildCategoryTree(node, _node.children);
-                }
-            }
-        }
-    };
+<?php $divId = $block->escapeHtml('tree-div_' . time()) ?>
+<div id="<?= /* @noEscape */ $divId ?>" class="tree"></div>
+<script id="ie-deferred-loader" defer="defer" src="//:"></script>
 
-    categoryLoader.buildHash = function(node)
+<script type="text/x-magento-init">
     {
-        var hash = {};
-
-        hash = this.toArray(node.attributes);
-
-        if (node.childNodes.length>0 || (node.loaded==false && node.loading==false)) {
-            hash['children'] = new Array;
-
-            for (var i = 0, len = node.childNodes.length; i < len; i++) {
-                if (!hash['children']) {
-                    hash['children'] = new Array;
-                }
-                hash['children'].push(this.buildHash(node.childNodes[i]));
+        "*": {
+            "categoryCheckboxTree": {
+                "dataUrl":       "<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>",
+                "divId":         "<?= /* @noEscape */ $divId ?>",
+                "rootVisible":   <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
+                "useAjax":       <?= $block->escapeHtml($block->getUseAjax()) ?>,
+                "currentNodeId": <?= (int)$block->getCategoryId() ?>,
+                "jsFormObject":  "<?= /* @noEscape */ $block->getJsFormObject() ?>",
+                "name":          "<?= $block->escapeHtml($block->getRoot()->getName()) ?>",
+                "checked":       "<?= $block->escapeHtml($block->getRoot()->getChecked()) ?>",
+                "allowdDrop":    <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
+                "rootId":        <?= (int)$block->getRoot()->getId() ?>,
+                "expanded":      <?= (int)$block->getIsWasExpanded() ?>,
+                "categoryId":    <?= (int)$block->getCategoryId() ?>,
+                "treeJson":      <?= /* @noEscape */ $block->getTreeJson() ?>
             }
         }
-
-        return hash;
-    };
-
-    categoryLoader.toArray = function(attributes) {
-        var data = {};
-        for (var key in attributes) {
-            var value = attributes[key];
-            data[key] = value;
-        }
-
-        return data;
-    };
-
-    categoryLoader.on("beforeload", function(treeLoader, node) {
-        treeLoader.baseParams.id = node.attributes.id;
-    });
-
-    categoryLoader.on("load", function(treeLoader, node, config) {
-        varienWindowOnload();
-    });
-
-    tree = new Ext.tree.TreePanel.Enhanced('<?= /* @escapeNotVerified */ $_divId ?>', {
-        animate:          false,
-        loader:           categoryLoader,
-        enableDD:         false,
-        containerScroll:  true,
-        selModel:         new Ext.tree.CheckNodeMultiSelectionModel(),
-        rootVisible:      '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
-        useAjax:          <?= /* @escapeNotVerified */ $block->getUseAjax() ?>,
-        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
-        addNodeTo:        false,
-        rootUIProvider:   Ext.tree.CheckboxNodeUI
-    });
-
-    tree.on('check', function(node, checked) {
-        <?= /* @escapeNotVerified */ $block->getJsFormObject() ?>.updateElement.value = this.getChecked().join(', ');
-        varienElementMethods.setHasChanges(node.getUI().checkbox);
-    }, tree);
-
-    // set the root node
-    var parameters = {
-        text:        '<?= /* @escapeNotVerified */ htmlentities($block->getRoot()->getName()) ?>',
-        draggable:   false,
-        checked:'<?= /* @escapeNotVerified */ $block->getRoot()->getChecked() ?>',
-        uiProvider: Ext.tree.CheckboxNodeUI,
-        allowDrop:   <?php if ($block->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
-        id:          <?= (int) $block->getRoot()->getId() ?>,
-        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
-        category_id: <?= (int) $block->getCategoryId() ?>
-    };
-
-    tree.loadTree({parameters:parameters, data:<?= /* @escapeNotVerified */ $block->getTreeJson() ?>},true);
-
-});
-//]]>
-
-});
+    }
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index 9865589556e7b..93666470b1b2c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -248,7 +248,7 @@
                                 try {
                                     response = JSON.parse(transport.responseText);
                                 } catch (e) {
-                                    console.warn('An error occured while parsing response');
+                                    console.warn('An error occurred while parsing response');
                                 }
 
                                 if (!response || !response['parameters']) {
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
index 74cf8f5f3a70b..124194519b978 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
@@ -21,13 +21,13 @@
     <input name="form_key" type="hidden" value="<?= $block->escapeHtml($block->getFormKey()) ?>" />
     <?= $block->getChildHtml('form') ?>
 </form>
-
-
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
-
-});
+<script type="text/x-magento-init">
+    {
+        "#edit_form": {
+            "Magento_Catalog/catalog/product/edit/attribute": {
+                "validationUrl": "<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>"
+            }
+        }
+    }
 </script>
 <?= /* @escapeNotVerified */ $block->getFormScripts() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 69bc847c30f46..195ac92422715 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -40,13 +40,16 @@ function getFrontTab() {
 
 function checkOptionsPanelVisibility(){
     if($('manage-options-panel')){
-        var panel = $('manage-options-panel').up('.fieldset');
+        var panel = $('manage-options-panel').up('.fieldset'),
+            activePanelClass = 'selected-type-options';
 
         if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
             panel.show();
+            panel.addClass(activePanelClass);
         }
         else {
             panel.hide();
+            panel.removeClass(activePanelClass);
         }
     }
 }
@@ -55,7 +58,7 @@ function bindAttributeInputType()
 {
     checkOptionsPanelVisibility();
     switchDefaultValueField();
-    if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
+    if($('frontend_input') && ($('frontend_input').value=='boolean' || $('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
         if($('is_filterable') && !$('is_filterable').getAttribute('readonly')){
             $('is_filterable').disabled = false;
         }
@@ -196,9 +199,11 @@ function switchDefaultValueField()
 
         <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
             case '<?= /* @escapeNotVerified */ $type ?>':
+                var isFrontTabHidden = false;
                 <?php foreach ($fields as $one): ?>
                     <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
+                        isFrontTabHidden = true;
                     <?php elseif ($one == '_default_value'): ?>
                         defaultValueTextVisibility =
                         defaultValueTextareaVisibility =
@@ -210,6 +215,10 @@ function switchDefaultValueField()
                         setRowVisibility('<?= /* @escapeNotVerified */ $one ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>
+
+                if (!isFrontTabHidden){
+                  getFrontTab().show();
+                }
             break;
         <?php endforeach; ?>
 
@@ -325,7 +334,7 @@ if ($('is_required')) {
 
 jQuery(function($) {
     bindAttributeInputType();
-    // @todo: refactor collapsable component
+    // @todo: refactor collapsible component
     $('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
         .collapsable()
         .collapse('hide');
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index a0041d2e02988..f812a27f87ad9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -57,7 +57,7 @@ $stores = $block->getStoresSortedBySortOrder();
         <input type="hidden" id="option-count-check" value="" />
     </div>
     <script id="row-template" type="text/x-magento-template">
-         <tr>
+        <tr <% if (data.rowClasses) { %>class="<%- data.rowClasses %>"<% } %>>
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
                     <div data-role="draggable-handle" class="draggable-handle"
@@ -88,7 +88,9 @@ $stores = $block->getStoresSortedBySortOrder();
     $values = [];
     foreach($block->getOptionValues() as $value) {
         $value = $value->getData();
-        $values[] = is_array($value) ? array_map("htmlspecialchars_decode", $value) : $value;
+        $values[] = is_array($value) ? array_map(function($str) {
+            return htmlspecialchars_decode($str, ENT_QUOTES);
+        }, $value) : $value;
     }
     ?>
     <script type="text/x-magento-init">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
index d5dfe845e54c2..9621b9a57168c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -80,7 +80,7 @@
                             // set the root node
                             this.root = new Ext.tree.TreeNode({
                                 text: 'ROOT',
-                                allowDrug:false,
+                                allowDrag:false,
                                 allowDrop:true,
                                 id:'1'
                             });
@@ -188,6 +188,15 @@
                                 for( j in config[i].children ) {
                                     if(config[i].children[j].id) {
                                         newNode = new Ext.tree.TreeNode(config[i].children[j]);
+
+                                        if (typeof newNode.ui.onTextChange === 'function') {
+                                            newNode.ui.onTextChange = function (_3, _4, _5) {
+                                                if (this.rendered) {
+                                                    this.textNode.innerText = _4;
+                                                }
+                                            }
+                                        }
+                                        	                                    }
                                         node.appendChild(newNode);
                                         newNode.addListener('click', editSet.unregister);
                                     }
@@ -195,13 +204,20 @@
                             }
                         }
                     }
-                }
 
-                editSet = function() {
-                    return {
-                        register : function(node) {
-                            editSet.currentNode = node;
-                        },
+
+                    editSet = function () {
+                        return {
+                            register: function (node) {
+                                editSet.currentNode = node;
+                                if (typeof node.ui.onTextChange === 'function') {
+                                    node.ui.onTextChange = function (_3, _4, _5) {
+                                        if (this.rendered) {
+                                            this.textNode.innerText = _4;
+                                        }
+                                    }
+                                }
+                            },
 
                         unregister : function() {
                             editSet.currentNode = false;
@@ -293,6 +309,14 @@
                                             allowDrag : true
                                         });
 
+                                        if (typeof newNode.ui.onTextChange === 'function') {
+                                            newNode.ui.onTextChange = function (_3, _4, _5) {
+                                                if (this.rendered) {
+                                                    this.textNode.innerText = _4;
+                                                }
+                                            }
+                                        }
+
                                         TreePanels.root.appendChild(newNode);
                                         newNode.addListener('beforemove', editSet.groupBeforeMove);
                                         newNode.addListener('beforeinsert', editSet.groupBeforeInsert);
@@ -315,7 +339,7 @@
                         },
 
                         validateGroupName : function(name, exceptNodeId) {
-                            name = name.strip();
+                            name = name.strip().escapeHTML();
                             var result = true;
                             if (name === '') {
                                 result = false;
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
index 223b3e9888eea..75f04eae82159 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
@@ -2,4 +2,4 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */;
+ */
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index 8e5583a6699b7..30c05c2ec689b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -13,7 +13,7 @@
 <div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
   <label class="label admin__field-label">
       <?= $block->escapeHtml($_option->getTitle()) ?>
-      <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
+      <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
   </label>
   <div class="admin__field-control control">
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index edf4f68afded7..4ad7a95c91980 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
+<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData() ? true : false; ?>
@@ -64,7 +65,7 @@ require(['prototype'], function(){
 <div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="admin__field-label label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
-        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
+        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
     </label>
     <div class="admin__field-control control">
         <?php if ($_fileExists): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
index 14e485c6445e0..11fba22ea8139 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
@@ -12,7 +12,7 @@
 <div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="admin__field-label label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
-        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
+        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
     </label>
     <div class="control admin__field-control">
         <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
index d1591d70945cf..a3b0b32e4c29a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
@@ -11,11 +11,12 @@
 <form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
 </form>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#attributes-edit-form').mage('form')
-        .mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
-
-});
+<script type="text/x-magento-init">
+    {
+        "#attributes-edit-form": {
+            "Magento_Catalog/catalog/product/edit/attribute": {
+                "validationUrl": "<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>"
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
index 6a5f6c4648494..a7e8564e7a1d8 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -14,7 +14,7 @@
 <% } %>
 <ul data-mage-init='{"menu":[]}'>
     <% _.each(data.items, function(value) { %>
-    <li <%- data.optionData(value) %>><a href="#"><%- value.label %></a></li>
+    <li <%= data.optionData(value) %>><a href="#"><%- value.label %></a></li>
     <% }); %>
 </ul>
 <% if (!data.term && data.items.length && !data.allShown()) { %>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 15c33c56e3ac6..2c62bbf8db3e9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -27,7 +27,7 @@
             <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
         </select>
         <input type="hidden" id="inventory_manage_stock_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('manage_stock') ?>">
-        <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+        <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
         <input type="checkbox" id="inventory_use_config_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
         <label for="inventory_use_config_manage_stock"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         <?php if (!$block->isReadonly()): ?>
@@ -67,7 +67,7 @@ toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_con
         <input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
 
         <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+            <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
             <input type="checkbox" id="inventory_use_config_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_min_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
@@ -94,7 +94,7 @@ toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_m
                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
                value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
         <div class="control-inner-wrap">
-        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
             <input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_min_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
@@ -117,7 +117,7 @@ toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_con
     </label>
     <div class="control">
         <input type="text" class="input-text validate-number" id="inventory_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-        <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+        <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
         <div class="control-inner-wrap">
             <input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_max_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
@@ -182,7 +182,7 @@ toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_con
         </select>
 
         <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+            <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
             <input type="checkbox" id="inventory_use_config_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_backorders"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
@@ -207,7 +207,7 @@ toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_confi
         <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
 
         <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+            <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
             <input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_notify_stock_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
@@ -238,7 +238,7 @@ toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use
         <input type="hidden" id="inventory_enable_qty_increments_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('enable_qty_increments') ?>">
 
         <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+            <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
             <input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_enable_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
@@ -262,7 +262,7 @@ toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventor
     <div class="control">
         <input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
         <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+            <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
             <input type="checkbox" id="inventory_use_config_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
             <label for="inventory_use_config_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
index 62de124fc10cc..1a54db0d59f0f 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -42,7 +42,7 @@
             </settings>
         </dataProvider>
     </dataSource>
-    <fieldset name="general">
+    <fieldset name="general" sortOrder="5">
         <settings>
             <collapsible>false</collapsible>
             <label/>
@@ -151,32 +151,48 @@
             <collapsible>true</collapsible>
             <label translate="true">Content</label>
         </settings>
-        <field name="image" sortOrder="40" formElement="fileUploader">
+        <field name="image" sortOrder="40" formElement="imageUploader">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">category</item>
                 </item>
             </argument>
             <settings>
-                <elementTmpl>ui/form/element/uploader/uploader</elementTmpl>
+                <elementTmpl>ui/form/element/uploader/image</elementTmpl>
                 <dataType>string</dataType>
                 <label translate="true">Category Image</label>
                 <visible>true</visible>
                 <required>false</required>
             </settings>
             <formElements>
-                <fileUploader>
+                <imageUploader>
                     <settings>
                         <required>false</required>
                         <uploaderConfig>
                             <param xsi:type="url" name="url" path="catalog/category_image/upload"/>
                         </uploaderConfig>
                         <previewTmpl>Magento_Catalog/image-preview</previewTmpl>
+                        <openDialogTitle>Media Gallery</openDialogTitle>
+                        <initialMediaGalleryOpenSubpath>catalog/category</initialMediaGalleryOpenSubpath>
+                        <allowedExtensions>jpg jpeg gif png</allowedExtensions>
+                        <maxFileSize>4194304</maxFileSize>
                     </settings>
-                </fileUploader>
+                </imageUploader>
             </formElements>
         </field>
         <field name="description" template="ui/form/field" sortOrder="50" formElement="wysiwyg">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="wysiwygConfigData" xsi:type="array">
+                        <item name="height" xsi:type="string">100px</item>
+                        <item name="add_variables" xsi:type="boolean">false</item>
+                        <item name="add_widgets" xsi:type="boolean">false</item>
+                        <item name="add_images" xsi:type="boolean">true</item>
+                        <item name="add_directives" xsi:type="boolean">true</item>
+                    </item>
+                    <item name="source" xsi:type="string">category</item>
+                </item>
+            </argument>
             <settings>
                 <label translate="true">Description</label>
                 <dataScope>description</dataScope>
@@ -235,7 +251,6 @@
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
                     <item name="breakLine" xsi:type="boolean">true</item>
-                    <item name="required" xsi:type="boolean">true</item>
                 </item>
             </argument>
             <field name="available_sort_by" formElement="multiselect">
@@ -276,7 +291,6 @@
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
                     <item name="breakLine" xsi:type="boolean">true</item>
-                    <item name="required" xsi:type="boolean">true</item>
                 </item>
             </argument>
             <field name="default_sort_by" formElement="select">
@@ -317,7 +331,6 @@
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
                     <item name="breakLine" xsi:type="boolean">true</item>
-                    <item name="required" xsi:type="boolean">true</item>
                 </item>
             </argument>
             <field name="filter_price_range" formElement="input">
@@ -327,6 +340,9 @@
                     </item>
                 </argument>
                 <settings>
+                    <validation>
+                        <rule name="required-entry" xsi:type="boolean">true</rule>
+                    </validation>
                     <additionalClasses>
                         <class name="admin__field-small">true</class>
                     </additionalClasses>
@@ -438,34 +454,34 @@
                 </checkbox>
             </formElements>
         </field>
-        <field name="custom_design" sortOrder="180" formElement="select">
+        <field name="custom_design" component="Magento_Catalog/js/components/use-parent-settings/select" sortOrder="180" formElement="select">
             <settings>
                 <dataType>string</dataType>
                 <label translate="true">Theme</label>
                 <imports>
-                    <link name="disabled">${ $.parentName }.custom_use_parent_settings:checked</link>
+                    <link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
                 </imports>
             </settings>
         </field>
-        <field name="page_layout" sortOrder="190" formElement="select">
+        <field name="page_layout" sortOrder="190" formElement="select" component="Magento_Catalog/js/components/use-parent-settings/select" class="Magento\Catalog\Ui\Component\Form\Field\Category\PageLayout">
             <settings>
                 <dataType>string</dataType>
                 <label translate="true">Layout</label>
                 <imports>
-                    <link name="disabled">${ $.parentName }.custom_use_parent_settings:checked</link>
+                    <link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
                 </imports>
             </settings>
         </field>
-        <field name="custom_layout_update" sortOrder="200" formElement="textarea">
+        <field name="custom_layout_update" component="Magento_Catalog/js/components/use-parent-settings/textarea" sortOrder="200" formElement="textarea">
             <settings>
                 <dataType>string</dataType>
                 <label translate="true">Layout Update XML</label>
                 <imports>
-                    <link name="disabled">ns = ${ $.ns }, index = custom_use_parent_settings :checked</link>
+                    <link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
                 </imports>
             </settings>
         </field>
-        <field name="custom_apply_to_products" component="Magento_Ui/js/form/element/single-checkbox" sortOrder="210" formElement="checkbox">
+        <field name="custom_apply_to_products" component="Magento_Catalog/js/components/use-parent-settings/single-checkbox" sortOrder="210" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="default" xsi:type="number">0</item>
@@ -478,7 +494,7 @@
                 <dataType>boolean</dataType>
                 <label translate="true">Apply Design to Products</label>
                 <imports>
-                    <link name="disabled">ns = ${ $.ns }, index = custom_use_parent_settings:checked</link>
+                    <link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
                 </imports>
             </settings>
             <formElements>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
index 96055b73d363b..cb0beb67c2711 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
@@ -18,14 +18,14 @@
                     <level>2</level>
                     <label translate="true">Base</label>
                 </settings>
-                <field name="watermark_image_image" formElement="fileUploader">
+                <field name="watermark_image_image" formElement="imageUploader">
                     <settings>
                         <notice translate="true">Allowed file types: jpeg, gif, png.</notice>
                         <label translate="true">Image</label>
-                        <componentType>fileUploader</componentType>
+                        <componentType>imageUploader</componentType>
                     </settings>
                     <formElements>
-                        <fileUploader>
+                        <imageUploader>
                             <settings>
                                 <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
@@ -33,7 +33,7 @@
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                                 </uploaderConfig>
                             </settings>
-                        </fileUploader>
+                        </imageUploader>
                     </formElements>
                 </field>
                 <field name="watermark_image_imageOpacity" formElement="input">
@@ -78,14 +78,13 @@
                     <level>2</level>
                     <label translate="true">Thumbnail</label>
                 </settings>
-                <field name="watermark_thumbnail_image" formElement="fileUploader">
+                <field name="watermark_thumbnail_image" formElement="imageUploader">
                     <settings>
-                        <notice translate="true">Allowed file types: jpeg, gif, png.</notice>
                         <label translate="true">Image</label>
-                        <componentType>fileUploader</componentType>
+                        <componentType>imageUploader</componentType>
                     </settings>
                     <formElements>
-                        <fileUploader>
+                        <imageUploader>
                             <settings>
                                 <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
@@ -93,7 +92,7 @@
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                                 </uploaderConfig>
                             </settings>
-                        </fileUploader>
+                        </imageUploader>
                     </formElements>
                 </field>
                 <field name="watermark_thumbnail_imageOpacity" formElement="input">
@@ -138,14 +137,13 @@
                     <level>2</level>
                     <label translate="true">Small</label>
                 </settings>
-                <field name="watermark_small_image_image" formElement="fileUploader">
+                <field name="watermark_small_image_image" formElement="imageUploader">
                     <settings>
-                        <notice translate="true">Allowed file types: jpeg, gif, png.</notice>
                         <label translate="true">Image</label>
-                        <componentType>fileUploader</componentType>
+                        <componentType>imageUploader</componentType>
                     </settings>
                     <formElements>
-                        <fileUploader>
+                        <imageUploader>
                             <settings>
                                 <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
@@ -153,7 +151,7 @@
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                                 </uploaderConfig>
                             </settings>
-                        </fileUploader>
+                        </imageUploader>
                     </formElements>
                 </field>
                 <field name="watermark_small_image_imageOpacity" formElement="input">
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
index 772bc1e6ec5d7..6c5d37a92ea4a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -71,6 +71,9 @@
         <field name="frontend_input" sortOrder="20" formElement="select">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
+                    <item name="hints" xsi:type="array">
+                        <item name="texteditor" xsi:type="string" translate="true">Text Editor input type requires WYSIWYG to be enabled in Stores > Configuration > Content Management.</item>
+                    </item>
                     <item name="source" xsi:type="string">product_attribute</item>
                 </item>
             </argument>
@@ -78,6 +81,7 @@
                 <dataType>string</dataType>
                 <label translate="true">Catalog Input Type for Store Owner</label>
                 <dataScope>frontend_input</dataScope>
+                <elementTmpl>Magento_Catalog/form/element/frontend-input-select</elementTmpl>
             </settings>
             <formElements>
                 <select>
@@ -95,6 +99,7 @@
                     <item name="valuesForOptions" xsi:type="array">
                         <item name="text" xsi:type="string">text</item>
                         <item name="textarea" xsi:type="string">textarea</item>
+                        <item name="texteditor" xsi:type="string">texteditor</item>
                         <item name="date" xsi:type="string">date</item>
                         <item name="boolean" xsi:type="string">boolean</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
@@ -147,7 +152,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">attribute_options.position</item>
                     </item>
                 </argument>
                 <field name="is_default" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -184,12 +188,8 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
                         <dataType>text</dataType>
                         <visible>false</visible>
-                        <dataScope>position</dataScope>
                     </settings>
                 </field>
             </container>
@@ -285,6 +285,7 @@
                     <item name="valuesForOptions" xsi:type="array">
                         <item name="text" xsi:type="string">text</item>
                         <item name="textarea" xsi:type="string">textarea</item>
+                        <item name="texteditor" xsi:type="string">texteditor</item>
                         <item name="date" xsi:type="string">date</item>
                         <item name="boolean" xsi:type="string">boolean</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
@@ -409,6 +410,7 @@
                     <item name="valuesForOptions" xsi:type="array">
                         <item name="text" xsi:type="string">text</item>
                         <item name="textarea" xsi:type="string">textarea</item>
+                        <item name="texteditor" xsi:type="string">texteditor</item>
                         <item name="date" xsi:type="string">date</item>
                         <item name="boolean" xsi:type="string">boolean</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
@@ -632,32 +634,6 @@
                 </checkbox>
             </formElements>
         </field>
-        <field name="is_wysiwyg_enabled" component="Magento_Catalog/js/components/visible-on-option/yesno" sortOrder="90" formElement="checkbox">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="valuesForOptions" xsi:type="array">
-                        <item name="textarea" xsi:type="string">textarea</item>
-                    </item>
-                    <item name="default" xsi:type="number">0</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>boolean</dataType>
-                <label translate="true">Enable WYSIWYG</label>
-                <dataScope>is_wysiwyg_enabled</dataScope>
-            </settings>
-            <formElements>
-                <checkbox>
-                    <settings>
-                        <valueMap>
-                            <map name="false" xsi:type="number">0</map>
-                            <map name="true" xsi:type="number">1</map>
-                        </valueMap>
-                        <prefer>toggle</prefer>
-                    </settings>
-                </checkbox>
-            </formElements>
-        </field>
         <field name="is_visible_on_front" sortOrder="100" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index 09332d66633f1..65090fa3ac461 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -48,7 +48,9 @@
                 </settings>
             </filterSelect>
         </filters>
-        <massaction name="listing_massaction" component="Magento_Ui/js/grid/tree-massactions">
+        <massaction name="listing_massaction"
+                    component="Magento_Ui/js/grid/tree-massactions"
+                    class="\Magento\Catalog\Ui\Component\Product\MassAction">
             <action name="delete">
                 <settings>
                     <confirm>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
index 75ee3019cf4b6..41f7a874c26f3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
@@ -82,7 +82,7 @@ define([
     return function (config, element) {
         config = config || {};
         jQuery(element).on('click', function () {
-            categorySubmit(config.url, config.ajax);
+            categorySubmit();
         });
     };
 });
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
index 0f6689b88db06..0a04358e41123 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
@@ -14,6 +14,7 @@ define([
             options: {
                 categoryIdSelector: 'input[name="id"]',
                 categoryPathSelector: 'input[name="path"]',
+                categoryParentSelector: 'input[name="parent"]',
                 refreshUrl: config.refreshUrl
             },
 
@@ -45,6 +46,7 @@ define([
                 } else {
                     $(this.options.categoryIdSelector).val(data.id).change();
                     $(this.options.categoryPathSelector).val(data.path).change();
+                    $(this.options.categoryParentSelector).val(data.parentId).change();
                 }
             }
         };
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
index 6903a17bcdcca..a2804a8723ce0 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -469,26 +469,6 @@ define([
             }
         },
 
-        /**
-         * toggles Selects states (for IE) except those to be shown in popup
-         */
-        /*_toggleSelectsExceptBlock: function(flag) {
-         if(Prototype.Browser.IE){
-         if (this.blockForm) {
-         var states = new Array;
-         var selects = this.blockForm.getElementsByTagName("select");
-         for(var i=0; i<selects.length; i++){
-         states[i] = selects[i].style.visibility
-         }
-         }
-         if (this.blockForm) {
-         for(i=0; i<selects.length; i++){
-         selects[i].style.visibility = states[i]
-         }
-         }
-         }
-         },*/
-
         /**
          * Close configuration window
          */
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
new file mode 100644
index 0000000000000..407fd1fe28e39
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function ($) {
+    'use strict';
+
+    return function (config, element) {
+
+        $(element).mage('form').mage('validation', {
+            validationUrl: config.validationUrl
+        });
+    };
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
new file mode 100644
index 0000000000000..0ec404a769f4b
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
@@ -0,0 +1,272 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global Ext, varienWindowOnload, varienElementMethods */
+
+define([
+    'jquery',
+    'prototype',
+    'extjs/ext-tree-checkbox',
+    'mage/adminhtml/form'
+], function (jQuery) {
+    'use strict';
+
+    return function (config) {
+        var tree,
+            options = {
+                dataUrl: config.dataUrl,
+                divId: config.divId,
+                rootVisible: config.rootVisible,
+                useAjax: config.useAjax,
+                currentNodeId: config.currentNodeId,
+                jsFormObject: window[config.jsFormObject],
+                name: config.name,
+                checked: config.checked,
+                allowDrop: config.allowDrop,
+                rootId: config.rootId,
+                expanded: config.expanded,
+                categoryId: config.categoryId,
+                treeJson: config.treeJson
+            },
+            data = {},
+            parameters = {},
+            root = {},
+            key = '';
+
+        /**
+         * Fix ext compatibility with prototype 1.6
+         */
+        Ext.lib.Event.getTarget = function (e) {
+            var ee = e.browserEvent || e;
+
+            return ee.target ? Event.element(ee) : null;
+        };
+
+        /**
+         * @param {Object} el
+         * @param {Object} nodeConfig
+         */
+        Ext.tree.TreePanel.Enhanced = function (el, nodeConfig) {
+            Ext.tree.TreePanel.Enhanced.superclass.constructor.call(this, el, nodeConfig);
+        };
+
+        Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
+            /**
+             * @param {Object} treeConfig
+             * @param {Boolean} firstLoad
+             */
+            loadTree: function (treeConfig, firstLoad) {
+                parameters = treeConfig.parameters,
+                    data = treeConfig.data,
+                    root = new Ext.tree.TreeNode(parameters);
+
+                if (typeof parameters.rootVisible !== 'undefined') {
+                    this.rootVisible = parameters.rootVisible * 1;
+                }
+
+                this.nodeHash = {};
+                this.setRootNode(root);
+
+                if (firstLoad) {
+                    this.addListener('click', this.categoryClick.createDelegate(this));
+                }
+
+                this.loader.buildCategoryTree(root, data);
+                this.el.dom.innerHTML = '';
+                // render the tree
+                this.render();
+            },
+
+            /**
+             * @param {Object} node
+             */
+            categoryClick: function (node) {
+                node.getUI().check(!node.getUI().checked());
+            }
+        });
+
+        jQuery(function () {
+            var categoryLoader = new Ext.tree.TreeLoader({
+                dataUrl: config.dataUrl
+            });
+
+            /**
+             * @param {Object} response
+             * @param {Object} parent
+             * @param {Function} callback
+             */
+            categoryLoader.processResponse = function (response, parent, callback) {
+                config = JSON.parse(response.responseText);
+
+                this.buildCategoryTree(parent, config);
+
+                if (typeof callback === 'function') {
+                    callback(this, parent);
+                }
+            };
+
+            /**
+             * @param {Object} nodeConfig
+             * @returns {Object}
+             */
+            categoryLoader.createNode = function (nodeConfig) {
+                var node;
+
+                nodeConfig.uiProvider = Ext.tree.CheckboxNodeUI;
+
+                if (nodeConfig.children && !nodeConfig.children.length) {
+                    delete nodeConfig.children;
+                    node = new Ext.tree.AsyncTreeNode(nodeConfig);
+                } else {
+                    node = new Ext.tree.TreeNode(nodeConfig);
+                }
+
+                return node;
+            };
+
+            /**
+             * @param {Object} parent
+             * @param {Object} nodeConfig
+             * @param {Integer} i
+             */
+            categoryLoader.processCategoryTree = function (parent, nodeConfig, i) {
+                var node,
+                    _node = {};
+
+                nodeConfig[i].uiProvider = Ext.tree.CheckboxNodeUI;
+
+                _node = Object.clone(nodeConfig[i]);
+
+                if (_node.children && !_node.children.length) {
+                    delete _node.children;
+                    node = new Ext.tree.AsyncTreeNode(_node);
+                } else {
+                    node = new Ext.tree.TreeNode(nodeConfig[i]);
+                }
+                parent.appendChild(node);
+                node.loader = node.getOwnerTree().loader;
+
+                if (_node.children) {
+                    categoryLoader.buildCategoryTree(node, _node.children);
+                }
+            };
+
+            /**
+             * @param {Object} parent
+             * @param {Object} nodeConfig
+             * @returns {void}
+             */
+            categoryLoader.buildCategoryTree = function (parent, nodeConfig) {
+                var i = 0;
+
+                if (!nodeConfig) {
+                    return null;
+                }
+
+                if (parent && nodeConfig && nodeConfig.length) {
+                    for (i; i < nodeConfig.length; i++) {
+                        categoryLoader.processCategoryTree(parent, nodeConfig, i);
+                    }
+                }
+            };
+
+            /**
+             *
+             * @param {Object} hash
+             * @param {Object} node
+             * @returns {Object}
+             */
+            categoryLoader.buildHashChildren = function (hash, node) {
+                var i = 0,
+                    len;
+
+                if (node.childNodes.length > 0 || node.loaded === false && node.loading === false) {
+                    hash.children = [];
+
+                    for (i, len = node.childNodes.length; i < len; i++) {
+                        hash.children = hash.children ? hash.children : [];
+                        hash.children.push(this.buildHash(node.childNodes[i]));
+                    }
+                }
+
+                return hash;
+            };
+
+            /**
+             * @param {Object} node
+             * @returns {Object}
+             */
+            categoryLoader.buildHash = function (node) {
+                var hash = {};
+
+                hash = this.toArray(node.attributes);
+
+                return categoryLoader.buildHashChildren(hash, node);
+            };
+
+            /**
+             * @param {Object} attributes
+             * @returns {Object}
+             */
+            categoryLoader.toArray = function (attributes) {
+                data = {};
+
+                for (key in attributes) {
+
+                    if (attributes[key]) {
+                        data[key] = attributes[key];
+                    }
+                }
+
+                return data;
+            };
+
+            categoryLoader.on('beforeload', function (treeLoader, node) {
+                treeLoader.baseParams.id = node.attributes.id;
+                treeLoader.baseParams.selected = options.jsFormObject.updateElement.value;
+            });
+
+            categoryLoader.on('load', function () {
+                varienWindowOnload();
+            });
+
+            tree = new Ext.tree.TreePanel.Enhanced(options.divId, {
+                animate: false,
+                loader: categoryLoader,
+                enableDD: false,
+                containerScroll: true,
+                selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
+                rootVisible: options.rootVisible,
+                useAjax: options.useAjax,
+                currentNodeId: options.currentNodeId,
+                addNodeTo: false,
+                rootUIProvider: Ext.tree.CheckboxNodeUI
+            });
+
+            tree.on('check', function (node) {
+                options.jsFormObject.updateElement.value = this.getChecked().join(', ');
+                varienElementMethods.setHasChanges(node.getUI().checkbox);
+            }, tree);
+
+            // set the root node
+            //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+            parameters = {
+                text: options.name,
+                draggable: false,
+                checked: options.checked,
+                uiProvider: Ext.tree.CheckboxNodeUI,
+                allowDrop: options.allowDrop,
+                id: options.rootId,
+                expanded: options.expanded,
+                category_id: options.categoryId
+            };
+            //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+
+            tree.loadTree({
+                parameters: parameters, data: options.treeJson
+            }, true);
+        });
+    };
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
index 99b1252b8f781..9c66ce577a2fd 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
@@ -5,9 +5,10 @@
 
 define([
     'jquery',
+    'mageUtils',
     'jquery/ui',
     'jquery/jstree/jquery.jstree'
-], function ($) {
+], function ($, utils) {
     'use strict';
 
     $.widget('mage.categoryTree', {
@@ -90,7 +91,7 @@ define([
             }
             result = {
                 data: {
-                    title: node.name + ' (' + node['product_count'] + ')'
+                    title: utils.unescape(node.name) + ' (' + node['product_count'] + ')'
                 },
                 attr: {
                     'class': node.cls + (!!node.disabled ? ' disabled' : '') //eslint-disable-line no-extra-boolean-cast
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js
index 9201c1c8e0fb4..b5c0e7a95d401 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js
@@ -9,6 +9,10 @@ define([
 ], function (_, DynamicRows) {
     'use strict';
 
+    /**
+     * @deprecated Parent method contains labels sorting.
+     * @see Magento_Ui/js/dynamic-rows/dynamic-rows
+     */
     return DynamicRows.extend({
 
         /**
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js
new file mode 100644
index 0000000000000..fb7ea7a5bcd69
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js
@@ -0,0 +1,78 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/ui-select',
+    'jquery',
+    'underscore'
+], function (Select, $, _) {
+    'use strict';
+
+    return Select.extend({
+        defaults: {
+            validationUrl: false,
+            loadedOption: [],
+            validationLoading: true
+        },
+
+        /** @inheritdoc */
+        initialize: function () {
+            this._super();
+
+            this.validateInitialValue();
+
+            return this;
+        },
+
+        /**
+         * Validate initial value actually exists
+         */
+        validateInitialValue: function () {
+            if (!_.isEmpty(this.value())) {
+                $.ajax({
+                    url: this.validationUrl,
+                    type: 'GET',
+                    dataType: 'json',
+                    context: this,
+                    data: {
+                        productId: this.value()
+                    },
+
+                    /** @param {Object} response */
+                    success: function (response) {
+                        if (!_.isEmpty(response)) {
+                            this.options([response]);
+                            this.loadedOption = response;
+                        }
+                    },
+
+                    /** set empty array if error occurs */
+                    error: function () {
+                        this.options([]);
+                    },
+
+                    /** stop loader */
+                    complete: function () {
+                        this.validationLoading(false);
+                        this.setCaption();
+                    }
+                });
+            } else {
+                this.validationLoading(false);
+            }
+        },
+
+        /** @inheritdoc */
+        getSelected: function () {
+            var options = this._super();
+
+            if (!_.isEmpty(this.loadedOption)) {
+                return this.value() === this.loadedOption.value ? [this.loadedOption] : options;
+            }
+
+            return options;
+        }
+    });
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/select.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/select.js
new file mode 100644
index 0000000000000..1ddb24f3eefbb
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/select.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Ui/js/form/element/select'
+], function (Component) {
+    'use strict';
+
+    return Component;
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/single-checkbox.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/single-checkbox.js
new file mode 100644
index 0000000000000..0f166d3b45582
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/single-checkbox.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Component) {
+    'use strict';
+
+    return Component;
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/textarea.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/textarea.js
new file mode 100644
index 0000000000000..3ef2bb21241a7
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/textarea.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Ui/js/form/element/textarea'
+], function (Component) {
+    'use strict';
+
+    return Component;
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/toggle-disabled-mixin.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/toggle-disabled-mixin.js
new file mode 100644
index 0000000000000..d140cc0fad74e
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/toggle-disabled-mixin.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore'
+], function (_) {
+    'use strict';
+
+    var mixin = {
+        defaults: {
+            imports: {
+                toggleDisabled: '${ $.parentName }.custom_use_parent_settings:checked'
+            },
+            useParent: false,
+            useDefaults: false
+        },
+
+        /**
+         * Disable form input if settings for parent section is used
+         * or default value is applied.
+         *
+         * @param {Boolean} isUseParent
+         */
+        toggleDisabled: function (isUseParent) {
+            var disabled = this.useParent = isUseParent;
+
+            if (!disabled && !_.isUndefined(this.service)) {
+                disabled = !!this.isUseDefault();
+            }
+
+            this.saveUseDefaults();
+            this.disabled(disabled);
+        },
+
+        /**
+         * Stores original state of the field.
+         */
+        saveUseDefaults: function () {
+            this.useDefaults = this.disabled();
+        },
+
+        /** @inheritdoc */
+        setInitialValue: function () {
+            this._super();
+            this.isUseDefault(this.useDefaults);
+
+            return this;
+        },
+
+        /** @inheritdoc */
+        toggleUseDefault: function (state) {
+            this._super();
+            this.disabled(state || this.useParent);
+        }
+    };
+
+    return function (target) {
+        return target.extend(mixin);
+    };
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options-type.js b/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options-type.js
index b46d09a7323b1..353c28d0c9421 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options-type.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options-type.js
@@ -103,11 +103,6 @@ define([
 
                         if (component) {
                             component.visible(visible);
-
-                            /*eslint-disable max-depth */
-                            if (_.isFunction(component.clear)) {
-                                component.clear();
-                            }
                         }
                     }
                 }, this);
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
index 5aa0a163c0d41..4d0448f8f2a1e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
@@ -166,7 +166,7 @@ define([
                                 if (request.length === 0) {
                                     if (!massActionTrigger) {
                                         alert({
-                                            content: $.mage.__('Please select items.')
+                                            content: $.mage.__('An item needs to be selected. Select and try again.')
                                         });
                                     }
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js
index 3544767b8d77f..7c947195f3313 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js
@@ -18,7 +18,10 @@ require([
     /**
      * Delete some category
      * This routine get categoryId explicitly, so even if currently selected tree node is out of sync
-     * with this form, we surely delete same category in the tree and at backend
+     * with this form, we surely delete same category in the tree and at backend.
+     *
+     * @deprecated
+     * @see deleteConfirm
      */
     function categoryDelete(url) {
         confirm({
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
index 51ffeaea0fc0c..2f6703cc92eac 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
@@ -54,9 +54,16 @@ define([
             if (!_.isEmpty(this.suffixName) || _.isNumber(this.suffixName)) {
                 suffixName = '.' + this.suffixName;
             }
-            this.dataScope = 'data.' + this.prefixName + '.' + this.elementName + suffixName;
 
-            this.links.value = this.provider + ':' + this.dataScope;
+            this.exportDataLink = 'data.' + this.prefixName + '.' + this.elementName + suffixName;
+            this.exports.value = this.provider + ':' + this.exportDataLink;
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            this._super();
+
+            this.source.remove(this.exportDataLink);
         },
 
         /**
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
index 5239eb207efca..7adc0dcfdf408 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
@@ -13,17 +13,21 @@ define([
     'jquery/ui',
     'prototype',
     'form',
-    'validation'
+    'validation',
+    'mage/translate'
 ], function (jQuery, mageTemplate, rg) {
     'use strict';
 
     return function (config) {
-        var attributeOption = {
+        var optionPanel = jQuery('#manage-options-panel'),
+            editForm = jQuery('#edit_form'),
+            attributeOption = {
                 table: $('attribute-options-table'),
                 itemCount: 0,
                 totalItems: 0,
                 rendered: 0,
                 template: mageTemplate('#row-template'),
+                newOptionClass: 'new-option',
                 isReadOnly: config.isReadOnly,
                 add: function (data, render) {
                     var isNewOption = false,
@@ -32,7 +36,8 @@ define([
                     if (typeof data.id == 'undefined') {
                         data = {
                             'id': 'option_' + this.itemCount,
-                            'sort_order': this.itemCount + 1
+                            'sort_order': this.itemCount + 1,
+                            'rowClasses': this.newOptionClass
                         };
                         isNewOption = true;
                     }
@@ -84,6 +89,10 @@ define([
                         this.totalItems--;
                         this.updateItemsCountField();
                     }
+
+                    if (element.hasClassName(this.newOptionClass)) {
+                        element.remove();
+                    }
                 },
                 updateItemsCountField: function () {
                     $('option-count-check').value = this.totalItems > 0 ? '1' : '';
@@ -135,7 +144,9 @@ define([
 
                     return optionDefaultInputType;
                 }
-            };
+            },
+            tableBody = jQuery(),
+            activePanelClass = 'selected-type-options';
 
         if ($('add_new_option_button')) {
             Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption, {}, true));
@@ -144,7 +155,7 @@ define([
             attributeOption.remove(event);
         });
 
-        jQuery('#manage-options-panel').on('render', function () {
+        optionPanel.on('render', function () {
             attributeOption.ignoreValidate();
 
             if (attributeOption.rendered) {
@@ -170,7 +181,33 @@ define([
                 });
             });
         }
-
+        editForm.on('beforeSubmit', function () {
+            var optionContainer = optionPanel.find('table tbody'),
+                optionsValues;
+
+            if (optionPanel.hasClass(activePanelClass)) {
+                optionsValues = jQuery.map(
+                    optionContainer.find('tr'),
+                    function (row) {
+                        return jQuery(row).find('input, select, textarea').serialize();
+                    }
+                );
+                jQuery('<input>')
+                    .attr({
+                        type: 'hidden',
+                        name: 'serialized_options'
+                    })
+                    .val(JSON.stringify(optionsValues))
+                    .prependTo(editForm);
+            }
+            tableBody = optionContainer.detach();
+        });
+        editForm.on('afterValidate.error highlight.validate', function () {
+            if (optionPanel.hasClass(activePanelClass)) {
+                optionPanel.find('table').append(tableBody);
+                jQuery('input[name="serialized_options"]').remove();
+            }
+        });
         window.attributeOption = attributeOption;
         window.optionDefaultInputType = attributeOption.getOptionInputType();
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
index 475c9d2dc0601..94300e31f74b5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
@@ -67,10 +67,10 @@ define([
         },
 
         /**
-         * Has weight swither
+         * Has weight switcher
          * @returns {*}
          */
-        hasWeightSwither: function () {
+        hasWeightSwitcher: function () {
             return this.$weightSwitcher().is(':visible');
         },
 
@@ -107,7 +107,7 @@ define([
         'Magento_Catalog/js/product/weight-handler': function () {
             this.bindAll();
 
-            if (this.hasWeightSwither()) {
+            if (this.hasWeightSwitcher()) {
                 this.switchWeight();
             }
         },
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
index d4cfb02611416..9a52dcefa3042 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
@@ -7,7 +7,7 @@
 <button class="action-delete"
         attr="{'data-action': 'remove_row'}"
         data-bind="
-            click: function(){ $data.processingDeleteRecord($parents); },
+            click: function(){ $parent.processingDeleteRecord($record().index, $record.recordId); },
             attr: {
                 title: $parent.deleteButtonLabel
             }
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/frontend-input-select.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/frontend-input-select.html
new file mode 100644
index 0000000000000..8097273a78560
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/frontend-input-select.html
@@ -0,0 +1,23 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<select class="admin__control-select" data-bind="
+    attr: {
+        name: inputName,
+        id: uid,
+        disabled: disabled,
+        'aria-describedby': noticeId
+    },
+    hasFocus: focused,
+    optgroup: options,
+    value: value,
+    optionsCaption: caption,
+    optionsValue: 'value',
+    optionsText: 'label'"
+/>
+<div class="admin__field-note" if="$data.hints">
+    <span translate="$data.hints[$data.value()]"/>
+</div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
index a6a1b3e5b05e8..bf17624517f2a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
@@ -5,15 +5,17 @@
  */
 -->
 <div class="file-uploader-summary">
-    <div class="file-uploader-preview">
-        <a attr="href: $parent.getFilePreview($file)" target="_blank">
+    <div class="file-uploader-preview image-uploader-preview">
+        <a class="image-uploader-preview-link" attr="href: $parent.getFilePreview($file)" target="_blank">
+            <div class="file-uploader-spinner image-uploader-spinner" />
             <img
                 class="preview-image"
                 tabindex="0"
                 event="load: $parent.onPreviewLoad.bind($parent)"
                 attr="
                     src: $parent.getFilePreview($file),
-                    alt: $file.name">
+                    alt: $file.name,
+                    title: $file.name">
         </a>
 
         <div class="actions">
@@ -22,6 +24,7 @@
                 class="action-remove"
                 data-role="delete-button"
                 attr="title: $t('Delete image')"
+                disable="$parent.disabled"
                 click="$parent.removeFile.bind($parent, $file)">
                 <span translate="'Delete image'"/>
             </button>
@@ -30,7 +33,7 @@
 
     <div class="file-uploader-filename" text="$file.name"/>
     <div class="file-uploader-meta">
-        <text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>
+        <text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>,
         <text args="$parent.formatSize($file.size)"/>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
index 86168c742c0f1..ce1561e382eed 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
@@ -19,9 +19,8 @@
         <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
         data-price-amount="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>"
         data-price-type="<?= /* @escapeNotVerified */ $block->getPriceType() ?>"
-        class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>">
-        <?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
-    </span>
+        class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>"
+    ><?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?></span>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?= $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
index 98b713be685d0..c7c6c82986213 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
@@ -6,19 +6,58 @@
 ?>
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
+$schema = ($block->getZone() == 'item_view') ? true : false;
+$idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 /** @var \Magento\Catalog\Pricing\Price\ConfiguredPrice $configuredPrice */
 $configuredPrice = $block->getPrice();
-$schema = ($block->getZone() == 'item_view') ? true : false;
-$priceLabel = ($block->getPriceLabel() !== null)
-    ? $block->getPriceLabel()
-    : '';
+/** @var \Magento\Catalog\Pricing\Price\ConfiguredRegularPrice $configuredRegularPrice */
+$configuredRegularPrice = $block->getPriceType(
+    \Magento\Catalog\Pricing\Price\ConfiguredPriceInterface::CONFIGURED_REGULAR_PRICE_CODE
+);
 ?>
-<p class="price-as-configured">
-    <?= /* @escapeNotVerified */ $block->renderAmount($configuredPrice->getAmount(), [
-        'display_label'     => $priceLabel,
-        'price_id'          => $block->getPriceId('product-price-'),
-        'price_type'        => 'finalPrice',
-        'include_container' => true,
-        'schema' => $schema
-    ]); ?>
-</p>
+<?php if ($configuredPrice->getAmount()->getValue() < $configuredRegularPrice->getAmount()->getValue()) : ?>
+    <p class="price-as-configured">
+        <span class="special-price">
+            <?= /* @noEscape */ $block->renderAmount(
+                $configuredPrice->getAmount(),
+                [
+                    'display_label'     => $block->escapeHtml(__('Special Price')),
+                    'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                    'price_type'        => 'finalPrice',
+                    'include_container' => true,
+                    'schema' => $schema,
+                ]
+            ); ?>
+        </span>
+        <span class="old-price">
+            <?= /* @noEscape */ $block->renderAmount(
+                $configuredRegularPrice->getAmount(),
+                [
+                    'display_label'     => $block->escapeHtml(__('Regular Price')),
+                    'price_id'          => $block->escapeHtml($block->getPriceId('old-price-' . $idSuffix)),
+                    'price_type'        => 'oldPrice',
+                    'include_container' => true,
+                    'skip_adjustments'  => true,
+                ]
+            ); ?>
+        </span>
+    </p>
+<?php else : ?>
+    <?php
+    $priceLabel = ($block->getPriceLabel() !== null)
+        ? $block->getPriceLabel()
+        : '';
+    ?>
+    <p class="price-as-configured">
+        <?= /* @noEscape */ $block->renderAmount(
+            $configuredPrice->getAmount(),
+            [
+                'display_label'     => $block->escapeHtml($priceLabel),
+                'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                'price_type'        => 'finalPrice',
+                'include_container' => true,
+                'schema' => $schema,
+            ]
+        ); ?>
+    </p>
+<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
index 065472c686129..b414f02a3d6fb 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
@@ -11,8 +11,6 @@
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 
-$productId = $block->getSaleableItem()->getId();
-
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
 $priceModel = $block->getPriceType('regular_price');
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
index 72d9124173898..6e281bdef7afb 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
@@ -11,8 +11,6 @@
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 
-$productId = $block->getSaleableItem()->getId();
-
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
 $priceModel = $block->getPriceType('regular_price');
diff --git a/app/code/Magento/Catalog/view/base/web/js/price-box.js b/app/code/Magento/Catalog/view/base/web/js/price-box.js
index 783d39cddbc76..de68d769885fd 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-box.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-box.js
@@ -78,7 +78,11 @@ define([
                 pricesCode = [],
                 priceValue, origin, finalPrice;
 
-            this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
+            if (typeof newPrices !== 'undefined' && newPrices.hasOwnProperty('prices')) {
+                this.cache.additionalPriceObject = {};
+            } else {
+                this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
+            }
 
             if (newPrices) {
                 $.extend(this.cache.additionalPriceObject, newPrices);
diff --git a/app/code/Magento/Catalog/view/base/web/js/price-options.js b/app/code/Magento/Catalog/view/base/web/js/price-options.js
index ceeea4c878622..e18abe3af38a6 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-options.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-options.js
@@ -20,8 +20,10 @@ define([
         optionConfig: {},
         optionHandlers: {},
         optionTemplate: '<%= data.label %>' +
-        '<% if (data.finalPrice.value) { %>' +
+        '<% if (data.finalPrice.value > 0) { %>' +
         ' +<%- data.finalPrice.formatted %>' +
+        '<% } else if (data.finalPrice.value < 0) { %>' +
+        ' <%- data.finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd'
     };
diff --git a/app/code/Magento/Catalog/view/base/web/js/price-utils.js b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
index 7c4280e64930f..e2ea42f7d5fe3 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-utils.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
@@ -79,7 +79,7 @@ define([
         am = Number(Math.round(Math.abs(amount - i) + 'e+' + precision) + ('e-' + precision));
         r = (j ? i.substr(0, j) + groupSymbol : '') +
             i.substr(j).replace(re, '$1' + groupSymbol) +
-            (precision ? decimalSymbol + am.toFixed(2).replace(/-/, 0).slice(2) : '');
+            (precision ? decimalSymbol + am.toFixed(precision).replace(/-/, 0).slice(2) : '');
 
         return pattern.replace('%s', r).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
     }
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html
index 318a6ceed69d1..cf76762b1ff58 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html
@@ -11,6 +11,7 @@
              class="product-image-photo"
              attr="src: getImageUrl($row()),
                alt: getLabel($row()),
+               title: getLabel($row()),
                width: getResizedImageWidth($row()),
                height: getResizedImageHeight($row())"/>
     </a>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html
index 2baa9926df5f1..68b7f4e386896 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html
@@ -14,7 +14,7 @@
                   data-bind="style: {'padding-bottom': getHeight($row())/getWidth($row()) * 100 + '%'}">
                 <img class="product-image-photo"
                      data-bind="attr: {src: getImageUrl($row()),
-                                       alt: getLabel($row())}" />
+                                       alt: getLabel($row()), title: getLabel($row())}" />
             </span>
         </span>
     </a>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index c3d0406740dcc..3630fddb326a7 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -28,6 +28,13 @@
                 <argument name="add_attribute" xsi:type="string">itemscope itemtype="http://schema.org/Product"</argument>
             </arguments>
         </referenceBlock>
+
+        <referenceBlock name="breadcrumbs" template="Magento_Catalog::product/breadcrumbs.phtml">
+            <arguments>
+                <argument name="viewModel" xsi:type="object">Magento\Catalog\ViewModel\Product\Breadcrumbs</argument>
+            </arguments>
+        </referenceBlock>
+
         <referenceContainer name="content">
             <container name="product.info.main" htmlTag="div" htmlClass="product-info-main" before="-">
                 <container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price">
@@ -130,7 +137,7 @@
                 </block>
             </container>
             <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
-                <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
+                <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" as="description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
                     <arguments>
                         <argument name="at_call" xsi:type="string">getDescription</argument>
                         <argument name="at_code" xsi:type="string">description</argument>
diff --git a/app/code/Magento/Catalog/view/frontend/requirejs-config.js b/app/code/Magento/Catalog/view/frontend/requirejs-config.js
index b588600b7db87..55df18afeb024 100644
--- a/app/code/Magento/Catalog/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Catalog/view/frontend/requirejs-config.js
@@ -18,5 +18,12 @@ var config = {
             priceUtils:             'Magento_Catalog/js/price-utils',
             catalogAddToCart:       'Magento_Catalog/js/catalog-add-to-cart'
         }
+    },
+    config: {
+        mixins: {
+            'Magento_Theme/js/view/breadcrumbs': {
+                'Magento_Catalog/js/product/breadcrumbs': true
+            }
+        }
     }
 };
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
new file mode 100644
index 0000000000000..91ab70b03769f
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+/** @var Magento\Catalog\Block\Widget\Link $block */
+?>
+<?= $block->escapeHtml($block->getHref()) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
new file mode 100644
index 0000000000000..5f44c42e17c57
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__(
+    'You added product %1 to the <a href="%2">comparison list</a>.',
+    $block->getData('product_name'),
+    $block->getData('compare_list_url')),
+    ['a']
+);
diff --git a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
index fa70e15135578..01820361744e0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
@@ -28,6 +28,7 @@
                 <dt><?= /* @escapeNotVerified */ __('Category') ?></dt>
                 <dd>
                     <ol class="items">
+                        <?php /** @var \Magento\Catalog\Model\Category $_category */ ?>
                         <?php foreach ($_categories as $_category): ?>
                             <?php if ($_category->getIsActive()): ?>
                                 <li class="item">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
new file mode 100644
index 0000000000000..c4aa84704b598
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var \Magento\Theme\Block\Html\Breadcrumbs $block */
+/** @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel */
+$viewModel = $block->getData('viewModel');
+?>
+<div class="breadcrumbs"></div>
+<script type="text/x-magento-init">
+        {
+            ".breadcrumbs": <?= $viewModel->getJsonConfigurationHtmlEscaped() ?>
+        }
+</script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index 6a2dd1f27d4a9..949d365e7899a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -8,9 +8,9 @@
 
 /* @var $block \Magento\Catalog\Block\Product\Compare\ListCompare */
 ?>
-<?php $_total = $block->getItems()->getSize() ?>
-<?php if ($_total): ?>
-    <a href="#" class="action print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
+<?php $total = $block->getItems()->getSize() ?>
+<?php if ($total): ?>
+    <a href="#" class="action print hidden-print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
         <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
     </a>
         <div class="table-wrapper comparison">
@@ -24,14 +24,14 @@
                 <caption class="table-caption"><?= /* @escapeNotVerified */ __('Compare Products') ?></caption>
                 <thead>
                 <tr>
-                    <?php $_i = 0 ?>
-                    <?php foreach ($block->getItems() as $_item): ?>
-                        <?php if ($_i++ == 0): ?>
+                    <?php $index = 0 ?>
+                    <?php foreach ($block->getItems() as $item): ?>
+                        <?php if ($index++ == 0): ?>
                             <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
                         <?php endif; ?>
-                        <td class="cell remove product">
+                        <td class="cell remove product hidden-print">
                             <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                            <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($_item) ?>'
+                            <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($item) ?>'
                                class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
                                 <span><?= /* @escapeNotVerified */ __('Remove Product') ?></span>
                             </a>
@@ -41,35 +41,35 @@
                 </thead>
                 <tbody>
                 <tr>
-                    <?php $_i = 0; ?>
-                    <?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
-                    <?php /** @var $_item \Magento\Catalog\Model\Product */ ?>
-                    <?php foreach ($block->getItems() as $_item): ?>
-                        <?php if ($_i++ == 0): ?>
+                    <?php $index = 0; ?>
+                    <?php $helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
+                    <?php /** @var $item \Magento\Catalog\Model\Product */ ?>
+                    <?php foreach ($block->getItems() as $item): ?>
+                        <?php if ($index++ == 0): ?>
                             <th scope="row" class="cell label product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
                         <?php endif; ?>
                         <td data-th="<?= $block->escapeHtml(__('Product')) ?>" class="cell product info">
-                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_item->getName(), null, true) ?>">
-                                <?= $block->getImage($_item, 'product_comparison_list')->toHtml() ?>
+                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($item->getName(), null, true) ?>">
+                                <?= $block->getImage($item, 'product_comparison_list')->toHtml() ?>
                             </a>
                             <strong class="product-item-name">
-                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_item->getName(), null, true) ?>">
-                                    <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($item->getName(), null, true) ?>">
+                                    <?= /* @escapeNotVerified */ $helper->productAttribute($item, $item->getName(), 'name') ?>
                                 </a>
                             </strong>
-                            <?= $block->getReviewsSummaryHtml($_item, 'short') ?>
-                            <?= /* @escapeNotVerified */ $block->getProductPrice($_item, '-compare-list-top') ?>
-                            <div class="product-item-actions">
+                            <?= $block->getReviewsSummaryHtml($item, 'short') ?>
+                            <?= /* @escapeNotVerified */ $block->getProductPrice($item, '-compare-list-top') ?>
+                            <div class="product-item-actions hidden-print">
                                 <div class="actions-primary">
-                                    <?php if ($_item->isSaleable()): ?>
-                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" method="post">
+                                    <?php if ($item->isSaleable()): ?>
+                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($item) ?>" method="post">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit" class="action tocart primary">
                                                 <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                             </button>
                                         </form>
                                     <?php else: ?>
-                                        <?php if ($_item->getIsSalable()): ?>
+                                        <?php if ($item->getIsSalable()): ?>
                                             <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                         <?php else: ?>
                                             <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
@@ -78,7 +78,7 @@
                                 </div>
                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
                                     <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
-                                        <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist">
+                                        <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($item) ?>' class="action towishlist" data-action="add-to-wishlist">
                                             <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                         </a>
                                     </div>
@@ -89,39 +89,41 @@
                 </tr>
                 </tbody>
                 <tbody>
-                <?php foreach ($block->getAttributes() as $_attribute): ?>
-                    <tr>
-                        <?php $_i = 0 ?>
-                        <?php foreach ($block->getItems() as $_item): ?>
-                            <?php if ($_i++ == 0): ?>
-                                <th scope="row" class="cell label">
-                                    <span class="attribute label">
-                                        <?= $block->escapeHtml($_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel())) ?>
-                                    </span>
-                                </th>
-                            <?php endif; ?>
-                            <td class="cell product attribute">
-                                <div class="attribute value">
-                                    <?php switch ($_attribute->getAttributeCode()) {
-                                        case "price": ?>
-                                            <?php
-                                                /* @escapeNotVerified */ echo $block->getProductPrice(
-                                                    $_item,
-                                                    '-compare-list-' . $_attribute->getCode()
-                                                )
-                                            ?>
-                                            <?php break;
-                                        case "small_image": ?>
-                                            <?php $block->getImage($_item, 'product_small_image')->toHtml(); ?>
+                <?php foreach ($block->getAttributes() as $attribute): ?>
+                    <?php $index = 0; ?>
+                    <?php if ($block->hasAttributeValueForProducts($attribute)): ?>
+                         <tr>
+                            <?php foreach ($block->getItems() as $item): ?>
+                                <?php if ($index++ == 0): ?>
+                                    <th scope="row" class="cell label">
+                                        <span class="attribute label">
+                                            <?= $block->escapeHtml($attribute->getStoreLabel() ? $attribute->getStoreLabel() : __($attribute->getFrontendLabel())) ?>
+                                        </span>
+                                    </th>
+                                <?php endif; ?>
+                                <td class="cell product attribute">
+                                    <div class="attribute value">
+                                        <?php switch ($attribute->getAttributeCode()) {
+                                            case "price": ?>
+                                                <?php
+                                                    /* @escapeNotVerified */ echo $block->getProductPrice(
+                                                        $item,
+                                                        '-compare-list-' . $attribute->getCode()
+                                                    )
+                                                ?>
+                                                <?php break;
+                                            case "small_image": ?>
+                                                <?php $block->getImage($item, 'product_small_image')->toHtml(); ?>
+                                                <?php break;
+                                            default: ?>
+                                            <?= /* @escapeNotVerified */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
                                             <?php break;
-                                        default: ?>
-                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $block->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
-                                        <?php break;
-                                    } ?>
-                                </div>
-                            </td>
-                        <?php endforeach; ?>
-                    </tr>
+                                        } ?>
+                                    </div>
+                                </td>
+                            <?php endforeach; ?>
+                        </tr>
+                    <?php endif; ?>
                 <?php endforeach; ?>
                 </tbody>
             </table>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
index 6133d55d676c3..c7abb0525b302 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
@@ -25,10 +25,7 @@
         <h1 class="image-label"><?= /* @escapeNotVerified */ $_imageTitle ?></h1>
     <?php endif; ?>
     <?php
-        $imageUrl = $this->helper('Magento\Catalog\Helper\Image')
-            ->init($block->getProduct(), 'product_page_image_large')
-            ->setImageFile($block->getImageFile())
-            ->getUrl();
+        $imageUrl = $block->getImageUrl();
     ?>
     <img src="<?= /* @escapeNotVerified */ $imageUrl ?>"<?php if ($_width): ?> width="<?= /* @escapeNotVerified */ $_width ?>"<?php endif; ?> alt="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" title="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" data-mage-init='{"catalogGallery":{}}'/>
     <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 0352f7f276630..8a907bd54aa6a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -10,10 +10,10 @@
       style="width:<?= /* @escapeNotVerified */ $block->getWidth() ?>px;">
     <span class="product-image-wrapper"
           style="padding-bottom: <?= /* @escapeNotVerified */ ($block->getRatio() * 100) ?>%;">
-        <img class="product-image-photo"
+        <img class="<?= /* @escapeNotVerified */ $block->getClass() ?>"
             <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
             src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-            width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
-            height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
+            max-width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
+            max-height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
             alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index b3f59991bed57..e970ade6cee96 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -27,12 +27,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
     <?php
     if ($block->getMode() == 'grid') {
         $viewMode = 'grid';
-        $image = 'category_page_grid';
+        $imageDisplayArea = 'category_page_grid';
         $showDescription = false;
         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
     } else {
         $viewMode = 'list';
-        $image = 'category_page_list';
+        $imageDisplayArea = 'category_page_list';
         $showDescription = true;
         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::FULL_VIEW;
     }
@@ -46,9 +46,9 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
             <li class="item product product-item">
-                <div class="product-item-info" data-container="product-grid">
+                <div class="product-item-info" data-container="product-<?= /* @escapeNotVerified */ $viewMode ?>">
                     <?php
-                    $productImage = $block->getImage($_product, $image);
+                    $productImage = $block->getImage($_product, $imageDisplayArea);
                     if ($pos != null) {
                         $position = ' style="left:' . $productImage->getWidth() . 'px;'
                             . 'top:' . $productImage->getHeight() . 'px;"';
@@ -77,7 +77,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                 <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : '' ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" data-product-sku="<?=  /* @NoEscape */ $_product->getSku() ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
+                                        <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
                                             <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
                                             <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index aaa040c3a5833..f434402346087 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -146,8 +146,8 @@ switch ($type = $block->getType()) {
         }
     break;
 
-    case 'other':
-    break;
+    default:
+        $exist = null;
 }
 ?>
 
@@ -202,7 +202,7 @@ switch ($type = $block->getType()) {
                                 <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                             <?php endif; ?>
 
-                            <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
+                            <?php if ($canItemsAddToCart && !$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
                                 <?php if (!$_item->getRequiredOptions()): ?>
                                     <div class="field choice related">
                                         <input type="checkbox" class="checkbox related" id="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>" name="related_products[]" value="<?= /* @escapeNotVerified */ $_item->getId() ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
index 16a5147e13458..adf0f44d0c831 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var $block \Magento\Catalog\Block\Catalog\Product\View\Addto\Compare */
+/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
 ?>
 
 <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getPostDataParams() ?>'
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index c7f577107095f..9c18a18ff5837 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/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
index b1af46b80552d..038bea86e7d4e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
@@ -21,7 +21,7 @@
                     $label = $block->getChildData($alias, 'title');
                 ?>
                 <div class="data item title"
-                     aria-labeledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
+                     aria-labelledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
                      data-role="collapsible" id="tab-label-<?= /* @escapeNotVerified */ $alias ?>">
                     <a class="data switch"
                        tabindex="-1"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index c8c915a3140da..9c5cce7865532 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -16,12 +16,13 @@
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
-    <form data-product-sku="<?= /* @NoEscape */ $_product->getSku() ?>"
+    <form data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
           action="<?= /* @NoEscape */ $block->getSubmitUrl($_product) ?>" method="post"
           id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
         <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
+        <input type="hidden" name="item"  value="<?= /* @noEscape */ $block->getRequest()->getParam('id') ?>" />
         <?= $block->getBlockHtml('formkey') ?>
         <?= $block->getChildHtml('form_top') ?>
         <?php if (!$block->hasOptions()):?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 5a064b33355a4..1bfa30478df8a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -47,21 +47,11 @@
                 "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
                 "options": {
                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
-                    <?php if (($block->getVar("gallery/loop"))): ?>
-                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/keyboard"))): ?>
-                        "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/arrows"))): ?>
-                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/allowfullscreen"))): ?>
-                        "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/caption"))): ?>
-                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>,
-                    <?php endif; ?>
+                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ? 'true' : 'false' ?>,
+                    "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ? 'true' : 'false' ?>,
+                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ? 'true' : 'false' ?>,
+                    "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false' ?>,
+                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ? 'true' : 'false' ?>,
                     "width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
                     "thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
                     <?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
@@ -76,28 +66,18 @@
                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
                     <?php endif; ?>
                     "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
-                    <?php if (($block->getVar("gallery/navarrows"))): ?>
-                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>,
-                    <?php endif; ?>
+                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ? 'true' : 'false' ?>,
                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
                     "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
                 },
                 "fullscreen": {
                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/loop")): ?>
-                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>,
-                    <?php endif; ?>
+                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false' ?>,
                     "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
-                    <?php if ($block->getVar("gallery/transition/navarrows")): ?>
-                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>,
-                    <?php endif; ?>
+                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false' ?>,
                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/arrows")): ?>
-                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>,
-                    <?php endif; ?>
-                    <?php if ($block->getVar("gallery/fullscreen/caption")): ?>
-                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>,
-                    <?php endif; ?>
+                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false' ?>,
+                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false' ?>,
                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
                     <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
index b1e46776af465..a2b91a5eeb99f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
@@ -9,7 +9,7 @@
 /** @var $block \Magento\Catalog\Block\Product\View */
 ?>
 
-<meta property="og:type" content="og:product" />
+<meta property="og:type" content="product" />
 <meta property="og:title" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
 <meta property="og:image" content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
 <meta property="og:description" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
index 3420512977aad..66895fa1eabf9 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
+<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_optionId = $_option->getId() ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
@@ -15,7 +16,7 @@
     <fieldset class="fieldset fieldset-product-options-inner<?= /* @escapeNotVerified */ $class ?>">
         <legend class="legend">
             <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-            <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
+            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
         </legend>
         <div class="control">
             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index 3ceba2eebd214..adb729c6d86ec 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
+<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData(); ?>
@@ -19,7 +20,7 @@
 <div class="field file<?= /* @escapeNotVerified */ $class ?>">
     <label class="label" for="<?= /* @noEscape */ $_fileName ?>" id="<?= /* @noEscape */ $_fileName ?>-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
+        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
     </label>
     <?php if ($_fileExists): ?>
     <div class="control">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
index 79dc8591fd724..a04e366a43a2d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
+<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
 <?php
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
@@ -17,7 +18,7 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
 } ?><?= /* @escapeNotVerified */ $class ?>">
     <label class="label" for="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
+        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
     </label>
 
     <div class="control">
@@ -29,6 +30,7 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             if ($_option->getMaxCharacters()) {
                 $_textValidate['maxlength'] = $_option->getMaxCharacters();
             }
+            $_textValidate['validate-no-utf8mb4-characters'] = true;
             ?>
             <input type="text"
                    id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
@@ -47,6 +49,7 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             if ($_option->getMaxCharacters()) {
                 $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
             }
+            $_textAreaValidate['validate-no-utf8mb4-characters'] = true;
             ?>
             <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
                       class="product-custom-option"
@@ -59,8 +62,23 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
                       cols="25"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif; ?>
         <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note"><?= /* @escapeNotVerified */ __('Maximum number of characters:') ?>
-                <strong><?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?></strong></p>
+            <p class="note note_<?= /* @escapeNotVerified */ $_option->getId() ?>">
+                <?= /* @escapeNotVerified */ __('Maximum %1 characters', $_option->getMaxCharacters()) ?>
+                <span class="character-counter no-display"></span>
+            </p>
         <?php endif; ?>
     </div>
+    <?php if ($_option->getMaxCharacters()): ?>
+        <script type="text/x-magento-init">
+        {
+            "[data-selector='options[<?= /* @escapeNotVerified */ $_option->getId() ?>]']": {
+                "Magento_Catalog/js/product/remaining-characters": {
+                    "maxLength":  "<?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?>",
+                    "noteSelector": ".note_<?= /* @escapeNotVerified */ $_option->getId() ?>",
+                    "counterSelector": ".note_<?= /* @escapeNotVerified */ $_option->getId() ?> .character-counter"
+                }
+            }
+        }
+    </script>
+    <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
index f1b2f1a214945..2d2c91aadd473 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
@@ -17,10 +17,8 @@
         'listing' => [
             'displayMode' => 'grid'
         ],
-        'column' => [
-            'image' => [
-                'imageCode' => 'recently_compared_products_images_names_widget'
-            ]
+        'image' => [
+            'imageCode' => 'recently_compared_products_images_names_widget'
         ]
     ]
 );
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
index a4ae3ba907988..45a206f3f92bf 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
@@ -33,7 +33,7 @@
                                 <div class="product-item-actions">
                                     <div class="actions-primary">
                                         <?php if ($_product->isSaleable()): ?>
-                                            <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
+                                            <?php if (!$_product->getTypeInstance()->isPossibleBuyFromList($_product)): ?>
                                                 <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                                         class="action tocart primary"
                                                         data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index 11bbfea1ac8ec..93542c4c9095c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -66,7 +66,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                         <?php if ($showCart): ?>
                                             <div class="actions-primary">
                                                 <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                    <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
                                                         <button class="action tocart primary"
                                                                 data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
                                                                 type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index 615cd13fb6d38..ad75a3a6f0743 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -65,7 +65,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                             <?php if ($showCart): ?>
                                                 <div class="actions-primary">
                                                     <?php if ($_item->isSaleable()): ?>
-                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                        <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
                                                             <button class="action tocart primary"
                                                                     data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
                                                                     type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
index 7686de1d45c5d..7434678d1694b 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -6,8 +6,10 @@
 define([
     'jquery',
     'mage/translate',
+    'underscore',
+    'Magento_Catalog/js/product/view/product-ids-resolver',
     'jquery/ui'
-], function ($, $t) {
+], function ($, $t, _, idsResolver) {
     'use strict';
 
     $.widget('mage.catalogAddToCart', {
@@ -38,12 +40,34 @@ define([
         _bindSubmit: function () {
             var self = this;
 
+            if (this.element.data('catalog-addtocart-initialized')) {
+                return;
+            }
+
+            this.element.data('catalog-addtocart-initialized', 1);
             this.element.on('submit', function (e) {
                 e.preventDefault();
                 self.submitForm($(this));
             });
         },
 
+        /**
+         * @private
+         */
+        _redirect: function (url) {
+            var urlParts, locationParts, forceReload;
+
+            urlParts = url.split('#');
+            locationParts = window.location.href.split('#');
+            forceReload = urlParts[0] === locationParts[0];
+
+            window.location.assign(url);
+
+            if (forceReload) {
+                window.location.reload();
+            }
+        },
+
         /**
          * @return {Boolean}
          */
@@ -54,37 +78,32 @@ define([
         /**
          * Handler for the form 'submit' event
          *
-         * @param {Object} form
+         * @param {jQuery} form
          */
         submitForm: function (form) {
-            var addToCartButton, self = this;
-
-            if (form.has('input[type="file"]').length && form.find('input[type="file"]').val() !== '') {
-                self.element.off('submit');
-                // disable 'Add to Cart' button
-                addToCartButton = $(form).find(this.options.addToCartButtonSelector);
-                addToCartButton.prop('disabled', true);
-                addToCartButton.addClass(this.options.addToCartButtonDisabledClass);
-                form.submit();
-            } else {
-                self.ajaxSubmit(form);
-            }
+            this.ajaxSubmit(form);
         },
 
         /**
-         * @param {String} form
+         * @param {jQuery} form
          */
         ajaxSubmit: function (form) {
-            var self = this;
+            var self = this,
+                productIds = idsResolver(form),
+                formData;
 
             $(self.options.minicartSelector).trigger('contentLoading');
             self.disableAddToCartButton(form);
+            formData = new FormData(form[0]);
 
             $.ajax({
                 url: form.attr('action'),
-                data: form.serialize(),
+                data: formData,
                 type: 'post',
                 dataType: 'json',
+                cache: false,
+                contentType: false,
+                processData: false,
 
                 /** @inheritdoc */
                 beforeSend: function () {
@@ -97,7 +116,12 @@ define([
                 success: function (res) {
                     var eventData, parameters;
 
-                    $(document).trigger('ajax:addToCart', form.data().productSku);
+                    $(document).trigger('ajax:addToCart', {
+                        'sku': form.data().productSku,
+                        'productIds': productIds,
+                        'form': form,
+                        'response': res
+                    });
 
                     if (self.isLoaderEnabled()) {
                         $('body').trigger(self.options.processStop);
@@ -116,7 +140,8 @@ define([
                             parameters.push(eventData.redirectParameters.join('&'));
                             res.backUrl = parameters.join('#');
                         }
-                        window.location = res.backUrl;
+
+                        self._redirect(res.backUrl);
 
                         return;
                     }
@@ -138,6 +163,13 @@ define([
                             .html(res.product.statusText);
                     }
                     self.enableAddToCartButton(form);
+                },
+
+                /** @inheritdoc */
+                complete: function (res) {
+                    if (res.state() === 'rejected') {
+                        location.reload();
+                    }
                 }
             });
         },
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js
new file mode 100644
index 0000000000000..032b8541939c3
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js
@@ -0,0 +1,184 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Theme/js/model/breadcrumb-list'
+], function ($, breadcrumbList) {
+    'use strict';
+
+    return function (widget) {
+
+        $.widget('mage.breadcrumbs', widget, {
+            options: {
+                categoryUrlSuffix: '',
+                useCategoryPathInUrl: false,
+                product: '',
+                categoryItemSelector: '.category-item',
+                menuContainer: '[data-action="navigation"] > ul'
+            },
+
+            /** @inheritdoc */
+            _render: function () {
+                this._appendCatalogCrumbs();
+                this._super();
+            },
+
+            /**
+             * Append category and product crumbs.
+             *
+             * @private
+             */
+            _appendCatalogCrumbs: function () {
+                var categoryCrumbs = this._resolveCategoryCrumbs();
+
+                categoryCrumbs.forEach(function (crumbInfo) {
+                    breadcrumbList.push(crumbInfo);
+                });
+
+                if (this.options.product) {
+                    breadcrumbList.push(this._getProductCrumb());
+                }
+            },
+
+            /**
+             * Resolve categories crumbs.
+             *
+             * @return Array
+             * @private
+             */
+            _resolveCategoryCrumbs: function () {
+                var menuItem = this._resolveCategoryMenuItem(),
+                    categoryCrumbs = [];
+
+                if (menuItem !== null && menuItem.length) {
+                    categoryCrumbs.unshift(this._getCategoryCrumb(menuItem));
+
+                    while ((menuItem = this._getParentMenuItem(menuItem)) !== null) {
+                        categoryCrumbs.unshift(this._getCategoryCrumb(menuItem));
+                    }
+                }
+
+                return categoryCrumbs;
+            },
+
+            /**
+             * Returns crumb data.
+             *
+             * @param {Object} menuItem
+             * @return {Object}
+             * @private
+             */
+            _getCategoryCrumb: function (menuItem) {
+                return {
+                    'name': 'category',
+                    'label': menuItem.text(),
+                    'link': menuItem.attr('href'),
+                    'title': ''
+                };
+            },
+
+            /**
+             * Returns product crumb.
+             *
+             * @return {Object}
+             * @private
+             */
+            _getProductCrumb: function () {
+                return {
+                    'name': 'product',
+                    'label': this.options.product,
+                    'link': '',
+                    'title': ''
+                };
+            },
+
+            /**
+             * Find parent menu item for current.
+             *
+             * @param {Object} menuItem
+             * @return {Object|null}
+             * @private
+             */
+            _getParentMenuItem: function (menuItem) {
+                var classes,
+                    classNav,
+                    parentClass,
+                    parentMenuItem = null;
+
+                if (!menuItem) {
+                    return null;
+                }
+
+                classes = menuItem.parent().attr('class');
+                classNav = classes.match(/(nav\-)[0-9]+(\-[0-9]+)+/gi);
+
+                if (classNav) {
+                    classNav = classNav[0];
+                    parentClass = classNav.substr(0, classNav.lastIndexOf('-'));
+
+                    if (parentClass.lastIndexOf('-') !== -1) {
+                        parentMenuItem = $(this.options.menuContainer).find('.' + parentClass + ' > a');
+                        parentMenuItem = parentMenuItem.length ? parentMenuItem : null;
+                    }
+                }
+
+                return parentMenuItem;
+            },
+
+            /**
+             * Returns category menu item.
+             *
+             * Tries to resolve category from url or from referrer as fallback and
+             * find menu item from navigation menu by category url.
+             *
+             * @return {Object|null}
+             * @private
+             */
+            _resolveCategoryMenuItem: function () {
+                var categoryUrl = this._resolveCategoryUrl(),
+                    menu = $(this.options.menuContainer),
+                    categoryMenuItem = null;
+
+                if (categoryUrl && menu.length) {
+                    categoryMenuItem = menu.find(
+                        this.options.categoryItemSelector +
+                        ' > a[href="' + categoryUrl + '"]'
+                    );
+                }
+
+                return categoryMenuItem;
+            },
+
+            /**
+             * Returns category url.
+             *
+             * @return {String}
+             * @private
+             */
+            _resolveCategoryUrl: function () {
+                var categoryUrl;
+
+                if (this.options.useCategoryPathInUrl) {
+                    // In case category path is used in product url - resolve category url from current url.
+                    categoryUrl = window.location.href.split('?')[0];
+                    categoryUrl = categoryUrl.substring(0, categoryUrl.lastIndexOf('/')) +
+                        this.options.categoryUrlSuffix;
+                } else {
+                    // In other case - try to resolve it from referrer (without parameters).
+                    categoryUrl = document.referrer;
+
+                    if (categoryUrl.indexOf('?') > 0) {
+                        categoryUrl = categoryUrl.substr(0, categoryUrl.indexOf('?'));
+                    }
+                }
+
+                return categoryUrl;
+            }
+        });
+
+        return $.mage.breadcrumbs;
+    };
+});
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 88be03a04e71a..b8b6ff65be2b4 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -27,7 +27,9 @@ define([
             directionDefault: 'asc',
             orderDefault: 'position',
             limitDefault: '9',
-            url: ''
+            url: '',
+            formKey: '',
+            post: false
         },
 
         /** @inheritdoc */
@@ -89,7 +91,7 @@ define([
                 baseUrl = urlPaths[0],
                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
                 paramData = {},
-                parameters, i;
+                parameters, i, form, params, key, input, formKey;
 
             for (i = 0; i < urlParams.length; i++) {
                 parameters = urlParams[i].split('=');
@@ -99,12 +101,38 @@ define([
             }
             paramData[paramName] = paramValue;
 
-            if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
-                delete paramData[paramName];
-            }
-            paramData = $.param(paramData);
+            if (this.options.post) {
+                form = document.createElement('form');
+                params = [this.options.mode, this.options.direction, this.options.order, this.options.limit];
+
+                for (key in paramData) {
+                    if (params.indexOf(key) !== -1) { //eslint-disable-line max-depth
+                        input = document.createElement('input');
+                        input.name = key;
+                        input.value = paramData[key];
+                        form.appendChild(input);
+                        delete paramData[key];
+                    }
+                }
+                formKey = document.createElement('input');
+                formKey.name = 'form_key';
+                formKey.value = this.options.formKey;
+                form.appendChild(formKey);
+
+                paramData = $.param(paramData);
+                baseUrl += paramData.length ? '?' + paramData : '';
 
-            location.href = baseUrl + (paramData.length ? '?' + paramData : '');
+                form.action = baseUrl;
+                form.method = 'POST';
+                document.body.appendChild(form);
+                form.submit();
+            } else {
+                if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
+                    delete paramData[paramName];
+                }
+                paramData = $.param(paramData);
+                location.href = baseUrl + (paramData.length ? '?' + paramData : '');
+            }
         }
     });
 
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js b/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
index c53b2fa6e2a7a..b29ebe7d57d1c 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
@@ -5,11 +5,13 @@
 
 define([
     'underscore',
+    'jquery',
     'mageUtils',
     'uiElement',
     'Magento_Catalog/js/product/storage/storage-service',
-    'Magento_Customer/js/customer-data'
-], function (_, utils, Element, storage, customerData) {
+    'Magento_Customer/js/customer-data',
+    'Magento_Catalog/js/product/view/product-ids-resolver'
+], function (_, $, utils, Element, storage, customerData, productResolver) {
     'use strict';
 
     return Element.extend({
@@ -135,11 +137,16 @@ define([
          */
         filterIds: function (ids) {
             var _ids = {},
-                currentTime = new Date().getTime() / 1000;
+                currentTime = new Date().getTime() / 1000,
+                currentProductIds = productResolver($('#product_addtocart_form'));
 
             _.each(ids, function (id) {
-                if (currentTime - id['added_at'] < ~~this.idsStorage.lifetime) {
+                if (
+                    currentTime - id['added_at'] < ~~this.idsStorage.lifetime &&
+                    !_.contains(currentProductIds, id['product_id'])
+                ) {
                     _ids[id['product_id']] = id;
+
                 }
             }, this);
 
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/remaining-characters.js b/app/code/Magento/Catalog/view/frontend/web/js/product/remaining-characters.js
new file mode 100644
index 0000000000000..3e29e1ebd4d9c
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/remaining-characters.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/translate',
+    'jquery/ui'
+], function ($, $t) {
+    'use strict';
+
+    $.widget('mage.remainingCharacters', {
+        options: {
+            remainingText: $t('remaining'),
+            tooManyText: $t('too many'),
+            errorClass: 'mage-error',
+            noDisplayClass: 'no-display'
+        },
+
+        /**
+         * Initializes custom option component
+         *
+         * @private
+         */
+        _create: function () {
+            this.note = $(this.options.noteSelector);
+            this.counter = $(this.options.counterSelector);
+
+            this.updateCharacterCount();
+            this.element.on('change keyup paste', this.updateCharacterCount.bind(this));
+        },
+
+        /**
+         * Updates counter message
+         */
+        updateCharacterCount: function () {
+            var length = this.element.val().length,
+                diff = this.options.maxLength - length;
+
+            this.counter.text(this._formatMessage(diff));
+            this.counter.toggleClass(this.options.noDisplayClass, length === 0);
+            this.note.toggleClass(this.options.errorClass, diff < 0);
+        },
+
+        /**
+         * Format remaining characters message
+         *
+         * @param {int} diff
+         * @returns {String}
+         * @private
+         */
+        _formatMessage: function (diff) {
+            var count = Math.abs(diff),
+                qualifier = diff < 0 ? this.options.tooManyText : this.options.remainingText;
+
+            return '(' + count + ' ' + qualifier + ')';
+        }
+    });
+
+    return $.mage.remainingCharacters;
+});
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js
index 00cb7d2db6885..3dc9f3e844516 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js
@@ -34,6 +34,21 @@ define([
         };
     }
 
+    /**
+     * Set data to localStorage with support check.
+     *
+     * @param {String} namespace
+     * @param {Object} data
+     */
+    function setLocalStorageItem(namespace, data) {
+        try {
+            window.localStorage.setItem(namespace, JSON.stringify(data));
+        } catch (e) {
+            console.warn('localStorage is unavailable - skipping local caching of product data');
+            console.error(e);
+        }
+    }
+
     return {
 
         /**
@@ -118,7 +133,7 @@ define([
             if (_.isEmpty(data)) {
                 this.localStorage.removeAll();
             } else {
-                this.localStorage.set(data);
+                setLocalStorageItem(this.namespace, data);
             }
         },
 
@@ -228,7 +243,7 @@ define([
             this.updateRequestConfig.data = queryBuilder.buildQuery(prepareAjaxParams);
             this.updateRequestConfig.data['store_id'] = store;
             this.updateRequestConfig.data['currency_code'] = currency;
-            $.ajax(this.updateRequestConfig).success(function (data) {
+            $.ajax(this.updateRequestConfig).done(function (data) {
                 this.request = {};
                 this.providerHandler(getParsedDataFromServer(data));
             }.bind(this));
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js
index 7eafbad8299d8..ec07c19a2c1b1 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage.js
@@ -11,6 +11,21 @@ define([
 ], function ($, _, ko, utils) {
     'use strict';
 
+    /**
+     * Set data to localStorage with support check.
+     *
+     * @param {String} namespace
+     * @param {Object} data
+     */
+    function setLocalStorageItem(namespace, data) {
+        try {
+            window.localStorage.setItem(namespace, JSON.stringify(data));
+        } catch (e) {
+            console.warn('localStorage is unavailable - skipping local caching of product data');
+            console.error(e);
+        }
+    }
+
     return {
 
         /**
@@ -94,11 +109,7 @@ define([
          * Initializes handler to "data" property update
          */
         internalDataHandler: function (data) {
-            var localStorage = this.localStorage.get();
-
-            if (!utils.compare(data, localStorage).equal) {
-                this.localStorage.set(data);
-            }
+            setLocalStorageItem(this.namespace, data);
         },
 
         /**
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js
index 014002bdc4af9..b35ab867bb0e7 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js
@@ -47,7 +47,7 @@ define([
                  * @param {*} data
                  */
                 add: function (data) {
-                    if (!utils.compare(data, this.data()).equal) {
+                    if (!_.isEmpty(data)) {
                         this.data(_.extend(utils.copy(this.data()), data));
                     }
                 },
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js
new file mode 100644
index 0000000000000..f13e8f84a1b13
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Catalog/js/product/view/product-ids'
+], function (_, productIds) {
+    'use strict';
+
+    /**
+     * Returns id's of products in form.
+     *
+     * @param {jQuery} $form
+     * @return {Array}
+     */
+    return function ($form) {
+        var idSet = productIds(),
+            product = _.findWhere($form.serializeArray(), {
+            name: 'product'
+        });
+
+        if (!_.isUndefined(product)) {
+            idSet.push(product.value);
+        }
+
+        return _.uniq(idSet);
+    };
+});
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js
new file mode 100644
index 0000000000000..2198b7b8e48b0
--- /dev/null
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko'
+], function (ko) {
+    'use strict';
+
+    return ko.observableArray([]);
+});
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/storage-manager.js b/app/code/Magento/Catalog/view/frontend/web/js/storage-manager.js
index fcba9e8dcf468..e3f5e04bdcb1b 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/storage-manager.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/storage-manager.js
@@ -161,7 +161,9 @@ define([
          */
         initUpdateStorageDataListener: function () {
             _.each(this.storagesNamespace, function (name) {
-                this[name].data.subscribe(this.updateDataHandler.bind(this, name));
+                if (this[name].data) {
+                    this[name].data.subscribe(this.updateDataHandler.bind(this, name));
+                }
             }.bind(this));
         },
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE.txt b/app/code/Magento/CatalogAnalytics/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE.txt
rename to app/code/Magento/CatalogAnalytics/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE_AFL.txt b/app/code/Magento/CatalogAnalytics/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE_AFL.txt
rename to app/code/Magento/CatalogAnalytics/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogAnalytics/README.md b/app/code/Magento/CatalogAnalytics/README.md
new file mode 100644
index 0000000000000..df125446117a3
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_CatalogAnalytics module
+
+The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE.txt b/app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE.txt
rename to app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE_AFL.txt b/app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE_AFL.txt
rename to app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogAnalytics/Test/Mftf/README.md b/app/code/Magento/CatalogAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1d9f8f781e4b9
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Analytics Functional Tests
+
+The Functional Test Module for **Magento Catalog Analytics** module.
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
new file mode 100644
index 0000000000000..5c97261d483d8
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-catalog-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CatalogAnalytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogAnalytics/etc/analytics.xml b/app/code/Magento/CatalogAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..22d1f2c7d7776
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/etc/analytics.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="products">
+        <providers>
+            <reportProvider name="products" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>products</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/CatalogAnalytics/etc/module.xml b/app/code/Magento/CatalogAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..613af18d1832c
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CatalogAnalytics" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Analytics"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CatalogAnalytics/etc/reports.xml b/app/code/Magento/CatalogAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..5dae3ef90d7b2
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/etc/reports.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="products" connection="default">
+        <source name="catalog_product_entity">
+            <attribute name="entity_id"/>
+            <attribute name="sku"/>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/CatalogAnalytics/registration.php b/app/code/Magento/CatalogAnalytics/registration.php
new file mode 100644
index 0000000000000..77d6ce154b658
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_CatalogAnalytics',
+    __DIR__
+);
diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
new file mode 100644
index 0000000000000..d57154c429920
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use GraphQL\Language\AST\FieldNode;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+
+/**
+ * Joins attributes for provided field node field names.
+ */
+class AttributesJoiner
+{
+    /**
+     * @var array
+     */
+    private $queryFields = [];
+
+    /**
+     * Join fields attached to field node to collection's select.
+     *
+     * @param FieldNode $fieldNode
+     * @param AbstractCollection $collection
+     * @return void
+     */
+    public function join(FieldNode $fieldNode, AbstractCollection $collection) : void
+    {
+        foreach ($this->getQueryFields($fieldNode) as $field) {
+            if (!$collection->isAttributeAdded($field)) {
+                $collection->addAttributeToSelect($field);
+            }
+        }
+    }
+
+    /**
+     * Get an array of queried fields.
+     *
+     * @param FieldNode $fieldNode
+     * @return string[]
+     */
+    public function getQueryFields(FieldNode $fieldNode)
+    {
+        if (!isset($this->queryFields[$fieldNode->name->value])) {
+            $this->queryFields[$fieldNode->name->value] = [];
+            $query = $fieldNode->selectionSet->selections;
+            /** @var FieldNode $field */
+            foreach ($query as $field) {
+                if ($field->kind === 'InlineFragment') {
+                    continue;
+                }
+                $this->queryFields[$fieldNode->name->value][] = $field->name->value;
+            }
+        }
+
+        return $this->queryFields[$fieldNode->name->value];
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php
new file mode 100644
index 0000000000000..f68f2c06a95e2
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class CatalogProductTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['type_id'])) {
+            if ($data['type_id'] == 'simple') {
+                return 'SimpleProduct';
+            } elseif ($data['type_id'] == 'virtual') {
+                return 'VirtualProduct';
+            }
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
new file mode 100644
index 0000000000000..dbe58a9c77cd0
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use GraphQL\Language\AST\FieldNode;
+
+/**
+ * Used for determining the depth information for a requested category tree in a GraphQL request
+ */
+class DepthCalculator
+{
+    /**
+     * Calculate the total depth of a category tree inside a GraphQL request
+     *
+     * @param FieldNode $fieldNode
+     * @return int
+     */
+    public function calculate(FieldNode $fieldNode) : int
+    {
+        $selections = $fieldNode->selectionSet->selections ?? [];
+        $depth = count($selections) ? 1 : 0;
+        $childrenDepth = [0];
+        foreach ($selections as $node) {
+            if ($node->kind === 'InlineFragment') {
+                continue;
+            }
+
+            $childrenDepth[] = $this->calculate($node);
+        }
+
+        return $depth + max($childrenDepth);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
new file mode 100644
index 0000000000000..d2c1fc8f7be9f
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
+use Magento\Framework\Reflection\DataObjectProcessor;
+
+/**
+ * Hydrate GraphQL category structure with model data.
+ */
+class Hydrator
+{
+    /**
+     * @var CustomAttributesFlattener
+     */
+    private $flattener;
+
+    /**
+     * @var DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+
+    /**
+     * @param CustomAttributesFlattener $flattener
+     * @param DataObjectProcessor $dataObjectProcessor
+     */
+    public function __construct(
+        CustomAttributesFlattener $flattener,
+        DataObjectProcessor $dataObjectProcessor
+    ) {
+        $this->flattener = $flattener;
+        $this->dataObjectProcessor = $dataObjectProcessor;
+    }
+
+    /**
+     * Hydrate and flatten category object to flat array
+     *
+     * @param Category $category
+     * @param bool $basicFieldsOnly Set to false to avoid expensive hydration, used for performance optimization
+     * @return array
+     */
+    public function hydrateCategory(Category $category, $basicFieldsOnly = false) : array
+    {
+        if ($basicFieldsOnly) {
+            $categoryData = $category->getData();
+        } else {
+            $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
+        }
+        $categoryData['id'] = $category->getId();
+        $categoryData['children'] = [];
+        $categoryData['available_sort_by'] = $category->getAvailableSortBy();
+        $categoryData['model'] = $category;
+        return $this->flattener->flatten($categoryData);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
new file mode 100644
index 0000000000000..0401e1c42331e
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\ResourceModel\Category;
+
+/**
+ * Determine level data for GraphQL Category request
+ */
+class LevelCalculator
+{
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param Category $resourceCategory
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        Category $resourceCategory
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->resourceCategory = $resourceCategory;
+    }
+
+    /**
+     * Calculate level data for root category ID specified in GraphQL request
+     *
+     * @param int $rootCategoryId
+     * @return int
+     */
+    public function calculate(int $rootCategoryId) : int
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from($this->resourceConnection->getTableName('catalog_category_entity'), 'level')
+            ->where($this->resourceCategory->getLinkField() . " = ?", $rootCategoryId);
+        return (int) $connection->fetchOne($select);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/CategoryInterfaceTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/CategoryInterfaceTypeResolver.php
new file mode 100644
index 0000000000000..9a3b4bcb0cf8d
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/CategoryInterfaceTypeResolver.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Config\Data\TypeResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * {@inheritdoc}
+ */
+class CategoryInterfaceTypeResolver implements \Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     * @throws GraphQlInputException
+     */
+    public function resolveType(array $data) : string
+    {
+        return 'CategoryTree';
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Config/AttributeReader.php b/app/code/Magento/CatalogGraphQl/Model/Config/AttributeReader.php
new file mode 100644
index 0000000000000..c0f8629ed1979
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Config/AttributeReader.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogGraphQl\Model\Config;
+
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\Entity\MapperInterface;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\EavGraphQl\Model\Resolver\Query\Type;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Attributes\Collection;
+
+/**
+ * Adds custom/eav attribute to Catalog product types in the GraphQL config.
+ */
+class AttributeReader implements ReaderInterface
+{
+    /**
+     * @var MapperInterface
+     */
+    private $mapper;
+
+    /**
+     * @var Type
+     */
+    private $typeLocator;
+
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @param MapperInterface $mapper
+     * @param Type $typeLocator
+     * @param Collection $collection
+     */
+    public function __construct(
+        MapperInterface $mapper,
+        Type $typeLocator,
+        Collection $collection
+    ) {
+        $this->mapper = $mapper;
+        $this->typeLocator = $typeLocator;
+        $this->collection = $collection;
+    }
+
+    /**
+     * Read configuration scope
+     *
+     * @param string|null $scope
+     * @return array
+     * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null) : array
+    {
+        $typeNames = $this->mapper->getMappedTypes(\Magento\Catalog\Model\Product::ENTITY);
+        $config =[];
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+        foreach ($this->collection->getAttributes() as $attribute) {
+            $attributeCode = $attribute->getAttributeCode();
+            $locatedType = $this->typeLocator->getType(
+                $attributeCode,
+                \Magento\Catalog\Model\Product::ENTITY
+            ) ?: 'String';
+            $locatedType = $locatedType === TypeProcessor::NORMALIZED_ANY_TYPE ? 'String' : ucfirst($locatedType);
+            foreach ($typeNames as $typeName) {
+                $config[$typeName]['fields'][$attributeCode] = [
+                    'name' => $attributeCode,
+                    'type' => $locatedType,
+                    'arguments' => []
+                ];
+            }
+        }
+
+        return $config;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php b/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
new file mode 100644
index 0000000000000..0ca72d9ff9519
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Config;
+
+use Magento\Catalog\Model\ResourceModel\Category\Attribute\CollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection;
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\EavGraphQl\Model\Resolver\Query\Type;
+
+/**
+ * Adds custom/eav attribute to Catalog category types in the GraphQL config.
+ */
+class CategoryAttributeReader implements ReaderInterface
+{
+    /**
+     * In database data type is differ to graphql type, but eventually type for this attributes
+     * will be casted without problems
+     *
+     * @var array
+     */
+    private static $bannedSystemAttributes = [
+        'position',
+        'is_active',
+        'children',
+        'level',
+        'default_sort_by',
+        'all_children',
+        'page_layout',
+        'custom_design',
+        'custom_design_from',
+        'custom_design_to',
+        'custom_layout_update',
+        'custom_use_parent_settings',
+        'custom_apply_to_products',
+    ];
+
+    /**
+     * @var Type
+     */
+    private $typeLocator;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param Type $typeLocator
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        Type $typeLocator,
+        CollectionFactory $collectionFactory
+    ) {
+        $this->typeLocator = $typeLocator;
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Read configuration scope
+     *
+     * @param string|null $scope
+     * @return array
+     * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null) : array
+    {
+        $config =[];
+        $data = [];
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create();
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+        foreach ($collection as $attribute) {
+            $attributeCode = $attribute->getAttributeCode();
+
+            if (in_array($attributeCode, self::$bannedSystemAttributes)) {
+                continue;
+            }
+
+            $locatedType = $this->typeLocator->getType(
+                $attributeCode,
+                'catalog_category'
+            ) ?: 'String';
+            $locatedType = $locatedType === TypeProcessor::NORMALIZED_ANY_TYPE ? 'String' : ucfirst($locatedType);
+            $data['fields'][$attributeCode]['name'] = $attributeCode;
+            $data['fields'][$attributeCode]['type'] = $locatedType;
+            $data['fields'][$attributeCode]['arguments'] = [];
+        }
+
+        $config['CategoryInterface'] = $data;
+        $config['CategoryTree'] = $data;
+
+        return $config;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/CustomizableOptionTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/CustomizableOptionTypeResolver.php
new file mode 100644
index 0000000000000..7fa3a87b9167b
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/CustomizableOptionTypeResolver.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\Entity\MapperInterface;
+
+/**
+ * Resolve the CustomizableOptionType for graphql schema
+ */
+class CustomizableOptionTypeResolver implements TypeResolverInterface
+{
+    const ENTITY_TYPE = 'customizable_options';
+
+    /**
+     * @var MapperInterface
+     */
+    private $mapper;
+
+    /**
+     * @param MapperInterface $mapper
+     */
+    public function __construct(MapperInterface $mapper)
+    {
+        $this->mapper = $mapper;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        $map = $this->mapper->getMappedTypes(self::ENTITY_TYPE);
+        if (isset($map[$data['type']])) {
+            return $map[$data['type']];
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Layer/CollectionProvider.php b/app/code/Magento/CatalogGraphQl/Model/Layer/CollectionProvider.php
new file mode 100644
index 0000000000000..86645b0d36fdb
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Layer/CollectionProvider.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Layer;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+
+/**
+ * Collection Provider for graphql layered navigation.
+ */
+class CollectionProvider implements \Magento\Catalog\Model\Layer\ItemCollectionProviderInterface
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @param \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor,
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
+    ) {
+        $this->collectionProcessor = $collectionProcessor;
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @param \Magento\Catalog\Model\Category $category
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getCollection(\Magento\Catalog\Model\Category $category) : Collection
+    {
+        if (!$this->collection) {
+            $this->collection = $this->collectionFactory->create();
+        }
+        return $this->collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Layer/Context.php b/app/code/Magento/CatalogGraphQl/Model/Layer/Context.php
new file mode 100644
index 0000000000000..7298089c73e65
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Layer/Context.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Layer;
+
+use Magento\Catalog\Model\Layer\CollectionFilterInterface;
+use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
+use Magento\Catalog\Model\Layer\StateKeyInterface;
+
+/**
+ * Context for graphql layered navigation.
+ */
+class Context implements \Magento\Catalog\Model\Layer\ContextInterface
+{
+    /**
+     * @var ItemCollectionProviderInterface
+     */
+    private $collectionProvider;
+
+    /**
+     * @var StateKeyInterface
+     */
+    private $stateKey;
+
+    /**
+     * @var CollectionFilterInterface
+     */
+    private $collectionFilter;
+
+    /**
+     * @param ItemCollectionProviderInterface $collectionProvider
+     * @param StateKeyInterface $stateKey
+     * @param CollectionFilterInterface $collectionFilter
+     */
+    public function __construct(
+        ItemCollectionProviderInterface $collectionProvider,
+        StateKeyInterface $stateKey,
+        CollectionFilterInterface $collectionFilter
+    ) {
+        $this->collectionProvider = $collectionProvider;
+        $this->stateKey = $stateKey;
+        $this->collectionFilter = $collectionFilter;
+    }
+
+    /**
+     * @return ItemCollectionProviderInterface
+     */
+    public function getCollectionProvider() : ItemCollectionProviderInterface
+    {
+        return $this->collectionProvider;
+    }
+
+    /**
+     * @return StateKeyInterface
+     */
+    public function getStateKey() : StateKeyInterface
+    {
+        return $this->stateKey;
+    }
+
+    /**
+     * @return CollectionFilterInterface
+     */
+    public function getCollectionFilter() : CollectionFilterInterface
+    {
+        return $this->collectionFilter;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolver.php
new file mode 100644
index 0000000000000..44c5a08d0aa77
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolver.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use \Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Resolver for layered filter type.
+ */
+class LayerFilterItemTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        return isset($data['value_string'])
+            && isset($data['label'])
+            && isset($data['items_count'])
+            && count($data) == 3
+                ? 'LayerFilterItem'
+                : '';
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php b/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php
new file mode 100644
index 0000000000000..02594ecfaf8e8
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/LayerFilterItemTypeResolverComposite.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use \Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Composite resolver fo layered filter types.
+ */
+class LayerFilterItemTypeResolverComposite implements TypeResolverInterface
+{
+    /**
+     * @var TypeResolverInterface[]
+     */
+    private $typeResolvers;
+
+    /**
+     * LayerFilterItemTypeResolverComposite constructor.
+     *
+     * @param array $typeResolvers
+     */
+    public function __construct(array $typeResolvers = [])
+    {
+        $this->typeResolvers = $typeResolvers;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolveType(array $data) : string
+    {
+        /** @var TypeResolverInterface $typeResolver */
+        foreach ($this->typeResolvers as $typeResolver) {
+            $resolvedType = $typeResolver->resolveType($data);
+            if ($resolvedType) {
+                return $resolvedType;
+            }
+        }
+        throw new GraphQlInputException(__('Cannot resolve layered filter type'));
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php b/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
new file mode 100644
index 0000000000000..e1106a3f696e4
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Product\Option;
+
+use Magento\Catalog\Model\Product\Option\Type\Date as ProductDateOptionType;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime;
+
+/**
+ * @inheritdoc
+ */
+class DateType extends ProductDateOptionType
+{
+    /**
+     * Make valid string as a value of date option type for GraphQl queries
+     *
+     * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
+     * @return ProductDateOptionType
+     */
+    public function validateUserValue($values)
+    {
+        if ($this->_dateExists() || $this->_timeExists()) {
+            return parent::validateUserValue($this->formatValues($values));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Format date value from string to date array
+     *
+     * @param [] $values
+     * @return []
+     * @throws LocalizedException
+     */
+    private function formatValues($values)
+    {
+        if (isset($values[$this->getOption()->getId()])) {
+            $value = $values[$this->getOption()->getId()];
+            $dateTime = \DateTime::createFromFormat(DateTime::DATETIME_PHP_FORMAT, $value);
+            $values[$this->getOption()->getId()] = [
+                'date' => $value,
+                'year' => $dateTime->format('Y'),
+                'month' => $dateTime->format('m'),
+                'day' => $dateTime->format('d'),
+                'hour' => $dateTime->format('H'),
+                'minute' => $dateTime->format('i'),
+                'day_part' => $dateTime->format('a'),
+            ];
+        }
+
+        return $values;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function useCalendar()
+    {
+        return false;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductDataProvider.php b/app/code/Magento/CatalogGraphQl/Model/ProductDataProvider.php
new file mode 100644
index 0000000000000..0d38490407e7c
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/ProductDataProvider.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/**
+ * Product data provider
+ *
+ * TODO: will be replaces on deferred mechanism
+ */
+class ProductDataProvider
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(ProductRepositoryInterface $productRepository)
+    {
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Get product data by id
+     *
+     * @param int $productId
+     * @return array
+     */
+    public function getProductDataById(int $productId): array
+    {
+        $product = $this->productRepository->getById($productId);
+        $productData = $product->toArray();
+        $productData['model'] = $product;
+        return $productData;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductInterfaceTypeResolverComposite.php b/app/code/Magento/CatalogGraphQl/Model/ProductInterfaceTypeResolverComposite.php
new file mode 100644
index 0000000000000..26dd3c8b4e683
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/ProductInterfaceTypeResolverComposite.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ProductInterfaceTypeResolverComposite implements TypeResolverInterface
+{
+    /**
+     * TypeResolverInterface[]
+     */
+    private $productTypeNameResolvers = [];
+
+    /**
+     * @param TypeResolverInterface[] $productTypeNameResolvers
+     */
+    public function __construct(array $productTypeNameResolvers = [])
+    {
+        $this->productTypeNameResolvers = $productTypeNameResolvers;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws GraphQlInputException
+     */
+    public function resolveType(array $data) : string
+    {
+        $resolvedType = null;
+
+        foreach ($this->productTypeNameResolvers as $productTypeNameResolver) {
+            if (!isset($data['type_id'])) {
+                throw new GraphQlInputException(
+                    __('Missing key %1 in product data', ['type_id'])
+                );
+            }
+            $resolvedType = $productTypeNameResolver->resolveType($data);
+            if (!empty($resolvedType)) {
+                return $resolvedType;
+            }
+        }
+
+        throw new GraphQlInputException(
+            __('Concrete type for %1 not implemented', ['ProductInterface'])
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php b/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php
new file mode 100644
index 0000000000000..c1bf5c0b7bb1c
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class ProductLinkTypeResolverComposite implements TypeResolverInterface
+{
+    /**
+     * TypeResolverInterface[]
+     */
+    private $productLinksTypeNameResolvers = [];
+
+    /**
+     * @param TypeResolverInterface[] $productLinksTypeNameResolvers
+     */
+    public function __construct(array $productLinksTypeNameResolvers = [])
+    {
+        $this->productLinksTypeNameResolvers = $productLinksTypeNameResolvers;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolveType(array $data) : string
+    {
+        $resolvedType = null;
+
+        foreach ($this->productLinksTypeNameResolvers as $productLinksTypeNameResolvers) {
+            if (!isset($data['link_type'])) {
+                throw new GraphQlInputException(
+                    __('Missing key %1 in product data', ['link_type'])
+                );
+            }
+            $resolvedType = $productLinksTypeNameResolvers->resolveType($data);
+
+            if ($resolvedType) {
+                return $resolvedType;
+            }
+        }
+        throw new GraphQlInputException(__('Cannot resolve type'));
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php
new file mode 100644
index 0000000000000..5a230ceed0ca4
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ProductLinksTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @var string[]
+     */
+    private $linkTypes = ['related', 'upsell', 'crosssell'];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['link_type'])) {
+            $linkType = $data['link_type'];
+            if (in_array($linkType, $this->linkTypes)) {
+                return 'ProductLinks';
+            }
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
new file mode 100644
index 0000000000000..cb392a7b2295d
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\CatalogGraphQl\Model\AttributesJoiner;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\CatalogGraphQl\Model\Category\Hydrator as CategoryHydrator;
+
+/**
+ * Resolver for category objects the product is assigned to.
+ */
+class Categories implements ResolverInterface
+{
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * Accumulated category ids
+     *
+     * @var array
+     */
+    private $categoryIds = [];
+
+    /**
+     * @var AttributesJoiner
+     */
+    private $attributesJoiner;
+
+    /**
+     * @var CustomAttributesFlattener
+     */
+    private $customAttributesFlattener;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var CategoryHydrator
+     */
+    private $categoryHydrator;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param AttributesJoiner $attributesJoiner
+     * @param CustomAttributesFlattener $customAttributesFlattener
+     * @param ValueFactory $valueFactory
+     * @param CategoryHydrator $categoryHydrator
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        AttributesJoiner $attributesJoiner,
+        CustomAttributesFlattener $customAttributesFlattener,
+        ValueFactory $valueFactory,
+        CategoryHydrator $categoryHydrator
+    ) {
+        $this->collection = $collectionFactory->create();
+        $this->attributesJoiner = $attributesJoiner;
+        $this->customAttributesFlattener = $customAttributesFlattener;
+        $this->valueFactory = $valueFactory;
+        $this->categoryHydrator = $categoryHydrator;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $value['model'];
+        $categoryIds = $product->getCategoryIds();
+        $this->categoryIds = array_merge($this->categoryIds, $categoryIds);
+        $that = $this;
+
+        return $this->valueFactory->create(function () use ($that, $categoryIds, $info) {
+            $categories = [];
+            if (empty($that->categoryIds)) {
+                return [];
+            }
+
+            if (!$this->collection->isLoaded()) {
+                $that->attributesJoiner->join($info->fieldNodes[0], $this->collection);
+                $this->collection->addIdFilter($this->categoryIds);
+            }
+            /** @var CategoryInterface | \Magento\Catalog\Model\Category $item */
+            foreach ($this->collection as $item) {
+                if (in_array($item->getId(), $categoryIds)) {
+                    // Try to extract all requested fields from the loaded collection data
+                    $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item, true);
+                    $categories[$item->getId()]['model'] = $item;
+                    $requestedFields = $that->attributesJoiner->getQueryFields($info->fieldNodes[0]);
+                    $extractedFields = array_keys($categories[$item->getId()]);
+                    $foundFields = array_intersect($requestedFields, $extractedFields);
+                    if (count($requestedFields) === count($foundFields)) {
+                        continue;
+                    }
+
+                    // If not all requested fields were extracted from the collection, start more complex extraction
+                    $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item);
+                }
+            }
+
+            return $categories;
+        });
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
new file mode 100644
index 0000000000000..b93c7e279153d
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider\Breadcrumbs as BreadcrumbsDataProvider;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Retrieves breadcrumbs
+ */
+class Breadcrumbs implements ResolverInterface
+{
+    /**
+     * @var BreadcrumbsDataProvider
+     */
+    private $breadcrumbsDataProvider;
+
+    /**
+     * @param BreadcrumbsDataProvider $breadcrumbsDataProvider
+     */
+    public function __construct(
+        BreadcrumbsDataProvider $breadcrumbsDataProvider
+    ) {
+        $this->breadcrumbsDataProvider = $breadcrumbsDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['path'])) {
+            throw new LocalizedException(__('"path" value should be specified'));
+        }
+
+        $breadcrumbsData = $this->breadcrumbsDataProvider->getData($value['path']);
+        return count($breadcrumbsData) ? $breadcrumbsData : null;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
new file mode 100644
index 0000000000000..7ccb46c3a293f
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryHtmlAttribute.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Helper\Output as OutputHelper;
+
+/**
+ * Resolve rendered content for category attributes where HTML content is allowed
+ */
+class CategoryHtmlAttribute implements ResolverInterface
+{
+    /**
+     * @var OutputHelper
+     */
+    private $outputHelper;
+
+    /**
+     * @param OutputHelper $outputHelper
+     */
+    public function __construct(
+        OutputHelper $outputHelper
+    ) {
+        $this->outputHelper = $outputHelper;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /* @var $category Category */
+        $category = $value['model'];
+        $fieldName = $field->getName();
+        $renderedValue = $this->outputHelper->categoryAttribute($category, $category->getData($fieldName), $fieldName);
+
+        return $renderedValue;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
new file mode 100644
index 0000000000000..9e23c4f1e9736
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider;
+
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+
+/**
+ * Breadcrumbs data provider
+ */
+class Breadcrumbs
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @param string $categoryPath
+     * @return array
+     */
+    public function getData(string $categoryPath): array
+    {
+        $breadcrumbsData = [];
+
+        $pathCategoryIds = explode('/', $categoryPath);
+        $parentCategoryIds = array_slice($pathCategoryIds, 2, -1);
+
+        if (count($parentCategoryIds)) {
+            $collection = $this->collectionFactory->create();
+            $collection->addAttributeToSelect(['name', 'url_key']);
+            $collection->addAttributeToFilter('entity_id', $parentCategoryIds);
+
+            foreach ($collection as $category) {
+                $breadcrumbsData[] = [
+                    'category_id' => $category->getId(),
+                    'category_name' => $category->getName(),
+                    'category_level' => $category->getLevel(),
+                    'category_url_key' => $category->getUrlKey(),
+                ];
+            }
+        }
+        return $breadcrumbsData;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
new file mode 100644
index 0000000000000..7a41f8fc94e74
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Category products resolver, used by GraphQL endpoints to retrieve products assigned to a category
+ */
+class Products implements ResolverInterface
+{
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var Builder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var Filter
+     */
+    private $filterQuery;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param Builder $searchCriteriaBuilder
+     * @param Filter $filterQuery
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        Builder $searchCriteriaBuilder,
+        Filter $filterQuery
+    ) {
+        $this->productRepository = $productRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterQuery = $filterQuery;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $args['filter'] = [
+            'category_id' => [
+                'eq' => $value['id']
+            ]
+        ];
+        $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
+        $searchCriteria->setCurrentPage($args['currentPage']);
+        $searchCriteria->setPageSize($args['pageSize']);
+        $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
+
+        //possible division by 0
+        if ($searchCriteria->getPageSize()) {
+            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
+        } else {
+            $maxPages = 0;
+        }
+
+        $currentPage = $searchCriteria->getCurrentPage();
+        if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
+            $currentPage = new GraphQlInputException(
+                __(
+                    'currentPage value %1 specified is greater than the number of pages available.',
+                    [$maxPages]
+                )
+            );
+        }
+
+        $data = [
+            'total_count' => $searchResult->getTotalCount(),
+            'items'       => $searchResult->getProductsSearchResult(),
+            'page_info'   => [
+                'page_size'    => $searchCriteria->getPageSize(),
+                'current_page' => $currentPage,
+                'total_pages' => $maxPages
+            ]
+        ];
+        return $data;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
new file mode 100644
index 0000000000000..397fd12b7e714
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\StockProcessor;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Retrieves products count for a category
+ */
+class ProductsCount implements ResolverInterface
+{
+    /**
+     * @var Visibility
+     */
+    private $catalogProductVisibility;
+
+    /**
+     * @var StockProcessor
+     */
+    private $stockProcessor;
+
+    /**
+     * @var SearchCriteriaInterface
+     */
+    private $searchCriteria;
+
+    /**
+     * @param Visibility $catalogProductVisibility
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param StockProcessor $stockProcessor
+     */
+    public function __construct(
+        Visibility $catalogProductVisibility,
+        SearchCriteriaInterface $searchCriteria,
+        StockProcessor $stockProcessor
+    ) {
+        $this->catalogProductVisibility = $catalogProductVisibility;
+        $this->searchCriteria = $searchCriteria;
+        $this->stockProcessor = $stockProcessor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('"model" value should be specified'));
+        }
+        /** @var Category $category */
+        $category = $value['model'];
+        $productsCollection = $category->getProductCollection();
+        $productsCollection->setVisibility($this->catalogProductVisibility->getVisibleInSiteIds());
+        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, []);
+
+        return $productsCollection->getSize();
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php
new file mode 100644
index 0000000000000..cb5553bb03701
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Retrieves the sort fields data
+ */
+class SortFields implements ResolverInterface
+{
+    /**
+     * @var \Magento\Catalog\Model\Config
+     */
+    private $catalogConfig;
+    
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+    
+    /**
+     * @var \Magento\Catalog\Model\Category\Attribute\Source\Sortby
+     */
+    private $sortbyAttributeSource;
+
+    /**
+     * @param \Magento\Catalog\Model\Config $catalogConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @oaram \Magento\Catalog\Model\Category\Attribute\Source\Sortby $sortbyAttributeSource
+     */
+    public function __construct(
+        \Magento\Catalog\Model\Config $catalogConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Model\Category\Attribute\Source\Sortby $sortbyAttributeSource
+    ) {
+        $this->catalogConfig = $catalogConfig;
+        $this->storeManager = $storeManager;
+        $this->sortbyAttributeSource = $sortbyAttributeSource;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $sortFieldsOptions = $this->sortbyAttributeSource->getAllOptions();
+        array_walk(
+            $sortFieldsOptions,
+            function (&$option) {
+                $option['label'] = (string)$option['label'];
+            }
+        );
+        $data = [
+            'default' => $this->catalogConfig->getProductListDefaultSortBy($this->storeManager->getStore()->getId()),
+            'options' => $sortFieldsOptions,
+        ];
+        
+        return $data;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
new file mode 100644
index 0000000000000..4e3a8403f3132
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver;
+
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ExtractDataFromCategoryTree;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Category tree field resolver, used for GraphQL request processing.
+ */
+class CategoryTree implements ResolverInterface
+{
+    /**
+     * Name of type in GraphQL
+     */
+    const CATEGORY_INTERFACE = 'CategoryInterface';
+
+    /**
+     * @var \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree
+     */
+    private $categoryTree;
+
+    /**
+     * @var ExtractDataFromCategoryTree
+     */
+    private $extractDataFromCategoryTree;
+
+    /**
+     * @param \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree $categoryTree
+     * @param ExtractDataFromCategoryTree $extractDataFromCategoryTree
+     */
+    public function __construct(
+        \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree $categoryTree,
+        ExtractDataFromCategoryTree $extractDataFromCategoryTree
+    ) {
+        $this->categoryTree = $categoryTree;
+        $this->extractDataFromCategoryTree = $extractDataFromCategoryTree;
+    }
+
+    /**
+     * Get category id
+     *
+     * @param array $args
+     * @return int
+     * @throws GraphQlInputException
+     */
+    private function getCategoryId(array $args) : int
+    {
+        if (!isset($args['id'])) {
+            throw new GraphQlInputException(__('"id for category should be specified'));
+        }
+
+        return (int)$args['id'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (isset($value[$field->getName()])) {
+            return $value[$field->getName()];
+        }
+
+        $rootCategoryId = $this->getCategoryId($args);
+        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
+        if (!empty($categoriesTree)) {
+            $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
+            return current($result);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php
new file mode 100644
index 0000000000000..786d4f1ab867c
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\CatalogGraphQl\Model\Resolver\Layer\FiltersProvider;
+
+/**
+ * Layered navigation filters data provider.
+ */
+class Filters
+{
+    /**
+     * @var FiltersProvider
+     */
+    private $filtersProvider;
+
+    /**
+     * Filters constructor.
+     * @param FiltersProvider $filtersProvider
+     */
+    public function __construct(
+        FiltersProvider $filtersProvider
+    ) {
+        $this->filtersProvider = $filtersProvider;
+    }
+
+    /**
+     * Get layered navigation filters data
+     *
+     * @param string $layerType
+     * @return array
+     */
+    public function getData(string $layerType) : array
+    {
+        $filtersData = [];
+        /** @var AbstractFilter $filter */
+        foreach ($this->filtersProvider->getFilters($layerType) as $filter) {
+            if ($filter->getItemsCount()) {
+                $filterGroup = [
+                    'name' => (string)$filter->getName(),
+                    'filter_items_count' => $filter->getItemsCount(),
+                    'request_var' => $filter->getRequestVar(),
+                ];
+                /** @var \Magento\Catalog\Model\Layer\Filter\Item $filterItem */
+                foreach ($filter->getItems() as $filterItem) {
+                    $filterGroup['filter_items'][] = [
+                        'label' => (string)$filterItem->getLabel(),
+                        'value_string' => $filterItem->getValueString(),
+                        'items_count' => $filterItem->getCount(),
+                    ];
+                }
+                $filtersData[] = $filterGroup;
+            }
+        }
+        return $filtersData;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/FilterableAttributesListFactory.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/FilterableAttributesListFactory.php
new file mode 100644
index 0000000000000..86f40af2b2ed4
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/FilterableAttributesListFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Layer;
+
+use Magento\Catalog\Model\Layer\Category\FilterableAttributeList as CategoryFilterableAttributeList;
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\Layer\Search\FilterableAttributeList;
+use Magento\Catalog\Model\Layer\FilterableAttributeListInterface;
+
+/**
+ * Factory for filterable attributes list.
+ */
+class FilterableAttributesListFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param string $type
+     * @param array $data
+     * @return FilterableAttributeListInterface
+     */
+    public function create(string $type, array $data = []) : FilterableAttributeListInterface
+    {
+        if ($type === Resolver::CATALOG_LAYER_CATEGORY) {
+            return $this->objectManager->create(CategoryFilterableAttributeList::class, $data);
+        } elseif ($type === Resolver::CATALOG_LAYER_SEARCH) {
+            return $this->objectManager->create(FilterableAttributeList::class, $data);
+        }
+        throw new \InvalidArgumentException('Unknown filterable attribtues list type: ' . $type);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/FiltersProvider.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/FiltersProvider.php
new file mode 100644
index 0000000000000..27b008005960b
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/FiltersProvider.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Layer;
+
+use Magento\Catalog\Model\Layer\FilterListFactory;
+use Magento\Catalog\Model\Layer\Resolver;
+
+/**
+ * Layer types filters provider.
+ */
+class FiltersProvider
+{
+    /**
+     * @var Resolver
+     */
+    private $layerResolver;
+
+    /**
+     * @var FilterableAttributesListFactory
+     */
+    private $filterableAttributesListFactory;
+
+    /**
+     * @var FilterListFactory
+     */
+    private $filterListFactory;
+
+    /**
+     * @param Resolver $layerResolver
+     * @param FilterableAttributesListFactory $filterableAttributesListFactory
+     * @param FilterListFactory $filterListFactory
+     */
+    public function __construct(
+        Resolver $layerResolver,
+        FilterableAttributesListFactory $filterableAttributesListFactory,
+        FilterListFactory $filterListFactory
+    ) {
+        $this->layerResolver = $layerResolver;
+        $this->filterableAttributesListFactory = $filterableAttributesListFactory;
+        $this->filterListFactory = $filterListFactory;
+    }
+
+    /**
+     * Get layer type filters.
+     *
+     * @param string $layerType
+     * @return array
+     */
+    public function getFilters(string $layerType) : array
+    {
+        $filterableAttributesList = $this->filterableAttributesListFactory->create(
+            $layerType
+        );
+        $filterList = $this->filterListFactory->create(
+            [
+                'filterableAttributes' => $filterableAttributesList
+            ]
+        );
+        return $filterList->getFilters($this->layerResolver->get());
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
new file mode 100644
index 0000000000000..0ec7e12e42d55
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Layered navigation filters resolver, used for GraphQL request processing.
+ */
+class LayerFilters implements ResolverInterface
+{
+    /**
+     * @var Layer\DataProvider\Filters
+     */
+    private $filtersDataProvider;
+
+    /**
+     * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
+     */
+    public function __construct(
+        \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
+    ) {
+        $this->filtersDataProvider = $filtersDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['layer_type'])) {
+            return null;
+        }
+
+        return $this->filtersDataProvider->getData($value['layer_type']);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
new file mode 100644
index 0000000000000..40aa54fd93873
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\FieldTranslator;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class Product implements ResolverInterface
+{
+    /**
+     * @var ProductDataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var FieldTranslator
+     */
+    private $fieldTranslator;
+
+    /**
+     * @param ProductDataProvider $productDataProvider
+     * @param ValueFactory $valueFactory
+     * @param FieldTranslator $fieldTranslator
+     */
+    public function __construct(
+        ProductDataProvider $productDataProvider,
+        ValueFactory $valueFactory,
+        FieldTranslator $fieldTranslator
+    ) {
+        $this->productDataProvider = $productDataProvider;
+        $this->valueFactory = $valueFactory;
+        $this->fieldTranslator = $fieldTranslator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['sku'])) {
+            throw new GraphQlInputException(__('No child sku found for product link.'));
+        }
+        $this->productDataProvider->addProductSku($value['sku']);
+        $fields = $this->getProductFields($info);
+        $this->productDataProvider->addEavAttributes($fields);
+
+        $result = function () use ($value) {
+            $data = $this->productDataProvider->getProductBySku($value['sku']);
+            if (empty($data)) {
+                return null;
+            }
+            $productModel = $data['model'];
+            /** @var \Magento\Catalog\Model\Product $productModel */
+            $data = $productModel->getData();
+            $data['model'] = $productModel;
+
+            if (!empty($productModel->getCustomAttributes())) {
+                foreach ($productModel->getCustomAttributes() as $customAttribute) {
+                    if (!isset($data[$customAttribute->getAttributeCode()])) {
+                        $data[$customAttribute->getAttributeCode()] = $customAttribute->getValue();
+                    }
+                }
+            }
+
+            return array_replace($value, $data);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+
+    /**
+     * Return field names for all requested product fields.
+     *
+     * @param ResolveInfo $info
+     * @return string[]
+     */
+    private function getProductFields(ResolveInfo $info) : array
+    {
+        $fieldNames = [];
+        foreach ($info->fieldNodes as $node) {
+            if ($node->name->value !== 'product') {
+                continue;
+            }
+            foreach ($node->selectionSet->selections as $selectionNode) {
+                if ($selectionNode->kind === 'InlineFragment') {
+                    foreach ($selectionNode->selectionSet->selections as $inlineSelection) {
+                        if ($inlineSelection->kind === 'InlineFragment') {
+                            continue;
+                        }
+                        $fieldNames[] = $this->fieldTranslator->translate($inlineSelection->name->value);
+                    }
+                    continue;
+                }
+                $fieldNames[] = $this->fieldTranslator->translate($selectionNode->name->value);
+            }
+        }
+
+        return $fieldNames;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
new file mode 100644
index 0000000000000..9047eaee4b568
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolve data for product canonical URL
+ */
+class CanonicalUrl implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /* @var $product Product */
+        $product = $value['model'];
+        $url = $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]);
+        
+        return $url;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php
new file mode 100644
index 0000000000000..ada3caad5f9f8
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ *
+ * Fixed the id related data in the product data
+ */
+class EntityIdToId implements ResolverInterface
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(MetadataPool $metadataPool)
+    {
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $productId = $product->getData(
+            $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()
+        );
+
+        return $productId;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
new file mode 100644
index 0000000000000..c8f167da583d3
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ *
+ * Format a product's media gallery information to conform to GraphQL schema representation
+ */
+class MediaGalleryEntries implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     *
+     * Format product's media gallery entry data to conform to GraphQL schema
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $mediaGalleryEntries = [];
+        if (!empty($product->getMediaGalleryEntries())) {
+            foreach ($product->getMediaGalleryEntries() as $key => $entry) {
+                $mediaGalleryEntries[$key] = $entry->getData();
+                if ($entry->getExtensionAttributes() && $entry->getExtensionAttributes()->getVideoContent()) {
+                    $mediaGalleryEntries[$key]['video_content']
+                        = $entry->getExtensionAttributes()->getVideoContent()->getData();
+                }
+            }
+        }
+        return $mediaGalleryEntries;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php
new file mode 100644
index 0000000000000..12016282a3081
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/NewFromTo.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ *
+ * Format the new from and to typo of legacy fields news_from_date and news_to_date
+ */
+class NewFromTo implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     *
+     * Transfer data from legacy news_from_date and news_to_date to new names corespondent fields
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return null|array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $attributeName = substr_replace($field->getName(), 's', 3, 0);
+
+        $data = null;
+        if ($product->getData($attributeName)) {
+            $data = $product->getData($attributeName);
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php
new file mode 100644
index 0000000000000..76602288039c5
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Options.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Format a product's option information to conform to GraphQL schema representation
+ */
+class Options implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     *
+     * Format product's option data to conform to GraphQL schema
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return null|array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $options = null;
+        if (!empty($product->getOptions())) {
+            $options = [];
+            /** @var Option $option */
+            foreach ($product->getOptions() as $key => $option) {
+                $options[$key] = $option->getData();
+                $options[$key]['required'] = $option->getIsRequire();
+                $options[$key]['product_sku'] = $option->getProductSku();
+
+                $values = $option->getValues() ?: [];
+                /** @var Option\Value $value */
+                foreach ($values as $valueKey => $value) {
+                    $options[$key]['value'][$valueKey] = $value->getData();
+                    $options[$key]['value'][$valueKey]['price_type']
+                        = $value->getPriceType() !== null ? strtoupper($value->getPriceType()) : 'DYNAMIC';
+                }
+
+                if (empty($values)) {
+                    $options[$key]['value'] = $option->getData();
+                    $options[$key]['value']['price_type']
+                        = $option->getPriceType() !== null ? strtoupper($option->getPriceType()) : 'DYNAMIC';
+                }
+            }
+        }
+
+        return $options;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php
new file mode 100644
index 0000000000000..55d930101fb60
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\Pricing\Adjustment\AdjustmentInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\PriceInfo\Factory as PriceInfoFactory;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Format a product's price information to conform to GraphQL schema representation
+ */
+class Price implements ResolverInterface
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var PriceInfoFactory
+     */
+    private $priceInfoFactory;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param PriceInfoFactory $priceInfoFactory
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        PriceInfoFactory $priceInfoFactory
+    ) {
+        $this->storeManager = $storeManager;
+        $this->priceInfoFactory = $priceInfoFactory;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * Format product's tier price data to conform to GraphQL schema
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $product->unsetData('minimal_price');
+        $priceInfo = $this->priceInfoFactory->create($product);
+        /** @var \Magento\Catalog\Pricing\Price\FinalPriceInterface $finalPrice */
+        $finalPrice = $priceInfo->getPrice(FinalPrice::PRICE_CODE);
+        $minimalPriceAmount =  $finalPrice->getMinimalPrice();
+        $maximalPriceAmount =  $finalPrice->getMaximalPrice();
+        $regularPriceAmount =  $priceInfo->getPrice(RegularPrice::PRICE_CODE)->getAmount();
+
+        $prices = [
+            'minimalPrice' => $this->createAdjustmentsArray($priceInfo->getAdjustments(), $minimalPriceAmount),
+            'regularPrice' => $this->createAdjustmentsArray($priceInfo->getAdjustments(), $regularPriceAmount),
+            'maximalPrice' => $this->createAdjustmentsArray($priceInfo->getAdjustments(), $maximalPriceAmount)
+        ];
+
+        return $prices;
+    }
+
+    /**
+     * Fill a price with an adjustment array structure with amounts from an amount type
+     *
+     * @param AdjustmentInterface[] $adjustments
+     * @param AmountInterface $amount
+     * @return array
+     */
+    private function createAdjustmentsArray(array $adjustments, AmountInterface $amount) : array
+    {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->storeManager->getStore();
+
+        $priceArray = [
+                'amount' => [
+                    'value' => $amount->getValue(),
+                    'currency' => $store->getCurrentCurrencyCode()
+                ],
+                'adjustments' => []
+            ];
+        $priceAdjustmentsArray = [];
+        foreach ($adjustments as $adjustmentCode => $adjustment) {
+            if ($amount->hasAdjustment($adjustmentCode) && $amount->getAdjustmentAmount($adjustmentCode)) {
+                $priceAdjustmentsArray[] = [
+                    'code' => strtoupper($adjustmentCode),
+                    'amount' => [
+                        'value' => $amount->getAdjustmentAmount($adjustmentCode),
+                        'currency' => $store->getCurrentCurrencyCode(),
+                    ],
+                    'description' => $adjustment->isIncludedInDisplayPrice() ?
+                        'INCLUDED' : 'EXCLUDED'
+                ];
+            }
+        }
+        $priceArray['adjustments'] = $priceAdjustmentsArray;
+        return $priceArray;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
new file mode 100644
index 0000000000000..2573e92e564b9
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductComplexTextAttribute.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Helper\Output as OutputHelper;
+
+/**
+ * Resolve rendered content for attributes where HTML content is allowed
+ */
+class ProductComplexTextAttribute implements ResolverInterface
+{
+    /**
+     * @var OutputHelper
+     */
+    private $outputHelper;
+
+    /**
+     * @param OutputHelper $outputHelper
+     */
+    public function __construct(
+        OutputHelper $outputHelper
+    ) {
+        $this->outputHelper = $outputHelper;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): array {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /* @var $product Product */
+        $product = $value['model'];
+        $fieldName = $field->getName();
+        $renderedValue = $this->outputHelper->productAttribute($product, $product->getData($fieldName), $fieldName);
+
+        return ['html' => $renderedValue ?? ''];
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
new file mode 100644
index 0000000000000..d1566162472b0
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Returns product's image data
+ */
+class ProductImage implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): array {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $imageType = $field->getName();
+
+        return [
+            'model' => $product,
+            'image_type' => $imageType,
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php
new file mode 100644
index 0000000000000..f971e35742628
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResourceModel;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Returns product's image label
+ */
+class Label implements ResolverInterface
+{
+    /**
+     * @var ProductResourceModel
+     */
+    private $productResource;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param ProductResourceModel $productResource
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        ProductResourceModel $productResource,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->productResource = $productResource;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['image_type'])) {
+            throw new LocalizedException(__('"image_type" value should be specified'));
+        }
+
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $imageType = $value['image_type'];
+        $imagePath = $product->getData($imageType);
+        $productId = (int)$product->getEntityId();
+
+        // null if image is not set
+        if (null === $imagePath) {
+            return $this->getAttributeValue($productId, 'name');
+        }
+
+        $imageLabel = $this->getAttributeValue($productId, $imageType . '_label');
+        if (null === $imageLabel) {
+            $imageLabel = $this->getAttributeValue($productId, 'name');
+        }
+
+        return $imageLabel;
+    }
+
+    /**
+     * Get attribute value
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @return null|string Null if attribute value is not exists
+     */
+    private function getAttributeValue(int $productId, string $attributeCode): ?string
+    {
+        $storeId = $this->storeManager->getStore()->getId();
+
+        $value = $this->productResource->getAttributeRawValue($productId, $attributeCode, $storeId);
+        return is_array($value) && empty($value) ? null : $value;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php
new file mode 100644
index 0000000000000..3c19ce599a9b3
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\ImageFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Returns product's image url
+ */
+class Url implements ResolverInterface
+{
+    /**
+     * @var ImageFactory
+     */
+    private $productImageFactory;
+
+    /**
+     * @param ImageFactory $productImageFactory
+     */
+    public function __construct(
+        ImageFactory $productImageFactory
+    ) {
+        $this->productImageFactory = $productImageFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['image_type'])) {
+            throw new LocalizedException(__('"image_type" value should be specified'));
+        }
+
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $imagePath = $product->getData($value['image_type']);
+
+        $imageUrl = $this->getImageUrl($value['image_type'], $imagePath);
+        return $imageUrl;
+    }
+
+    /**
+     * Get image url
+     *
+     * @param string $imageType
+     * @param string|null $imagePath Null if image is not set
+     * @return string
+     */
+    private function getImageUrl(string $imageType, ?string $imagePath): string
+    {
+        $image = $this->productImageFactory->create();
+        $image->setDestinationSubdir($imageType)
+            ->setBaseFile($imagePath);
+        $imageUrl = $image->getUrl();
+        return $imageUrl;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php
new file mode 100644
index 0000000000000..4d1b11a74b9d4
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductLinks.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductLink\Link;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ *
+ * Format the product links information to conform to GraphQL schema representation
+ */
+class ProductLinks implements ResolverInterface
+{
+    /**
+     * @var string[]
+     */
+    private $linkTypes = ['related', 'upsell', 'crosssell'];
+
+    /**
+     * @inheritdoc
+     *
+     * Format product links data to conform to GraphQL schema
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return null|array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $links = null;
+        if ($product->getProductLinks()) {
+            $links = [];
+            /** @var Link $productLink */
+            foreach ($product->getProductLinks() as $productLink) {
+                if (in_array($productLink->getLinkType(), $this->linkTypes)) {
+                    $links[] = $productLink->getData();
+                }
+            }
+        }
+
+        return $links;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
new file mode 100644
index 0000000000000..726ef91c56880
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/TierPrices.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\TierPrice;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ *
+ * Format a product's tier price information to conform to GraphQL schema representation
+ */
+class TierPrices implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     *
+     * Format product's tier price data to conform to GraphQL schema
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return null|array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $tierPrices = null;
+        if ($product->getTierPrices()) {
+            $tierPrices = [];
+            /** @var TierPrice $tierPrice */
+            foreach ($product->getTierPrices() as $tierPrice) {
+                $tierPrices[] = $tierPrice->getData();
+            }
+        }
+
+        return $tierPrices;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php
new file mode 100644
index 0000000000000..070c564713a96
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Product\Websites\Collection;
+
+/**
+ * Retrieves the websites information object
+ */
+class Websites implements ResolverInterface
+{
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var Collection
+     */
+    private $productWebsitesCollection;
+
+    /**
+     * @param ValueFactory $valueFactory
+     * @param Collection $productWebsitesCollection
+     */
+    public function __construct(
+        ValueFactory $valueFactory,
+        Collection $productWebsitesCollection
+    ) {
+        $this->valueFactory = $valueFactory;
+        $this->productWebsitesCollection = $productWebsitesCollection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['entity_id'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        $this->productWebsitesCollection->addIdFilters((int)$value['entity_id']);
+        $result = function () use ($value) {
+            return $this->productWebsitesCollection->getWebsiteForProductId((int)$value['entity_id']);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites/Collection.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites/Collection.php
new file mode 100644
index 0000000000000..3091cffb619c2
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites/Collection.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product\Websites;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Store\Model\ResourceModel\Website\Collection as WebsiteCollection;
+use Magento\Store\Model\ResourceModel\Website\CollectionFactory as WebsiteCollectionFactory;
+
+/**
+ * Collection to fetch websites data at resolution time.
+ */
+class Collection
+{
+    /**
+     * @var WebsiteCollection
+     */
+    private $websiteCollection;
+
+    /**
+     * @var ProductCollection
+     */
+    private $productCollection;
+
+    /**
+     * @var int[]
+     */
+    private $productIds = [];
+
+    /**
+     * @var array
+     */
+    private $websites = [];
+
+    /**
+     * @param WebsiteCollectionFactory $websiteCollectionFactory
+     * @param ProductCollectionFactory $productCollectionFactory
+     */
+    public function __construct(
+        WebsiteCollectionFactory $websiteCollectionFactory,
+        ProductCollectionFactory $productCollectionFactory
+    ) {
+        $this->websiteCollection = $websiteCollectionFactory->create();
+        $this->productCollection = $productCollectionFactory->create();
+    }
+
+    /**
+     * Add product and id filter to filter for fetch.
+     *
+     * @param int $productId
+     * @return void
+     */
+    public function addIdFilters(int $productId) : void
+    {
+        if (!in_array($productId, $this->productIds)) {
+            $this->productIds[] = $productId;
+        }
+    }
+
+    /**
+     * Retrieve website for passed in product id.
+     *
+     * @param int $productId
+     * @return array
+     */
+    public function getWebsiteForProductId(int $productId) : array
+    {
+        $websiteList = $this->fetch();
+
+        if (!isset($websiteList[$productId])) {
+            return [];
+        }
+
+        return $websiteList[$productId];
+    }
+
+    /**
+     * Fetch website data and return in array format. Keys for links will be their product Ids.
+     *
+     * @return array
+     */
+    private function fetch() : array
+    {
+        if (empty($this->productIds) || !empty($this->websites)) {
+            return $this->websites;
+        }
+
+        $selectUnique = $this->productCollection->getConnection()->select()->from(
+            ['product_website' => $this->productCollection->getResource()->getTable('catalog_product_website')]
+        )->where(
+            'product_website.product_id IN (?)',
+            $this->productIds
+        )->where(
+            'website_id > ?',
+            0
+        )->group('website_id');
+
+        $websiteDataUnique = $this->productCollection->getConnection()->fetchAll($selectUnique);
+
+        $websiteIds = [];
+        foreach ($websiteDataUnique as $websiteData) {
+            $websiteIds[] = $websiteData['website_id'];
+        }
+        $this->websiteCollection->addIdFilter($websiteIds);
+
+        $siteData = $this->websiteCollection->getItems();
+
+        $select = $this->productCollection->getConnection()->select()->from(
+            ['product_website' => $this->productCollection->getResource()->getTable('catalog_product_website')]
+        )->where(
+            'product_website.product_id IN (?)',
+            $this->productIds
+        )->where(
+            'website_id > ?',
+            0
+        );
+
+        foreach ($this->productCollection->getConnection()->fetchAll($select) as $row) {
+            $website = $siteData[$row['website_id']];
+            $this->websites[$row['product_id']][$row['website_id']] = [
+                'id' => $row['website_id'],
+                'name' => $website->getData('name'),
+                'code' => $website->getData('code'),
+                'sort_order' => $website->getData('sort_order'),
+                'default_group_id' => $website->getData('default_group_id'),
+                'is_default' => $website->getData('is_default'),
+            ];
+        }
+        return $this->websites;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
new file mode 100644
index 0000000000000..ff53299b00e33
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver;
+
+use Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Catalog\Model\Layer\Resolver;
+
+/**
+ * Products field resolver, used for GraphQL request processing.
+ */
+class Products implements ResolverInterface
+{
+    /**
+     * @var Builder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var Search
+     */
+    private $searchQuery;
+
+    /**
+     * @var Filter
+     */
+    private $filterQuery;
+
+    /**
+     * @var SearchFilter
+     */
+    private $searchFilter;
+
+    /**
+     * @param Builder $searchCriteriaBuilder
+     * @param Search $searchQuery
+     * @param Filter $filterQuery
+     * @param SearchFilter $searchFilter
+     */
+    public function __construct(
+        Builder $searchCriteriaBuilder,
+        Search $searchQuery,
+        Filter $filterQuery,
+        SearchFilter $searchFilter
+    ) {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->searchQuery = $searchQuery;
+        $this->filterQuery = $filterQuery;
+        $this->searchFilter = $searchFilter;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
+        $searchCriteria->setCurrentPage($args['currentPage']);
+        $searchCriteria->setPageSize($args['pageSize']);
+        if (!isset($args['search']) && !isset($args['filter'])) {
+            throw new GraphQlInputException(
+                __("'search' or 'filter' input argument is required.")
+            );
+        } elseif (isset($args['search'])) {
+            $layerType = Resolver::CATALOG_LAYER_SEARCH;
+            $this->searchFilter->add($args['search'], $searchCriteria);
+            $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
+        } else {
+            $layerType = Resolver::CATALOG_LAYER_CATEGORY;
+            $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
+        }
+        //possible division by 0
+        if ($searchCriteria->getPageSize()) {
+            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
+        } else {
+            $maxPages = 0;
+        }
+
+        $currentPage = $searchCriteria->getCurrentPage();
+        if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
+            throw new GraphQlInputException(
+                __(
+                    'currentPage value %1 specified is greater than the %2 page(s) available.',
+                    [$currentPage, $maxPages]
+                )
+            );
+        }
+
+        $data = [
+            'total_count' => $searchResult->getTotalCount(),
+            'items' => $searchResult->getProductsSearchResult(),
+            'page_info' => [
+                'page_size' => $searchCriteria->getPageSize(),
+                'current_page' => $currentPage,
+                'total_pages' => $maxPages
+            ],
+            'layer_type' => $layerType
+        ];
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php
new file mode 100644
index 0000000000000..ab0531ad09513
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\Attributes;
+
+use GraphQL\Language\AST\FieldNode;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
+use Magento\Eav\Model\Attribute;
+
+/**
+ * Gather all eav and custom attributes to use in a GraphQL schema for products
+ */
+class Collection
+{
+    /**
+     * @var AttributeCollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var AttributeCollection
+     */
+    private $collection = null;
+
+    /**
+     * @param AttributeCollectionFactory $collectionFactory
+     */
+    public function __construct(AttributeCollectionFactory $collectionFactory)
+    {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Return all custom and eav attributes configured for products.
+     *
+     * @return AttributeCollection
+     */
+    public function getAttributes() : AttributeCollection
+    {
+        if (!$this->collection) {
+            $this->collection = $this->collectionFactory->create();
+            $this->collection->addFieldToFilter('is_user_defined', '1');
+            $this->collection->addFieldToFilter('attribute_code', ['neq' => 'cost']);
+            $this->collection->addFieldToFilter(
+                [
+                    'is_comparable',
+                    'is_filterable',
+                    'is_filterable_in_search',
+                    'is_visible_on_front',
+                    'used_in_product_listing',
+                    'used_for_sort_by'
+                ],
+                [
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1']
+                ]
+            );
+        }
+
+        return $this->collection->load();
+    }
+
+    /**
+     * Find EAV names based on passed in field names from GraphQL request, match to all known EAV attribute codes.
+     *
+     * @param string[] $fieldNames
+     * @return string[]
+     */
+    public function getRequestAttributes(array $fieldNames) : array
+    {
+        $attributes = $this->getAttributes();
+        $attributeNames = [];
+        /** @var Attribute $attribute */
+        foreach ($attributes as $attribute) {
+            $attributeNames[] = $attribute->getAttributeCode();
+        }
+
+        $matchedAttributes = [];
+        foreach ($fieldNames as $name) {
+            if (!in_array($name, $attributeNames)) {
+                continue;
+            }
+
+            $matchedAttributes[] = $name;
+        }
+
+        return $matchedAttributes;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
new file mode 100644
index 0000000000000..f2634574a2d15
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
+
+use GraphQL\Language\AST\FieldNode;
+use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
+use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\CatalogGraphQl\Model\AttributesJoiner;
+use Magento\Catalog\Model\Category;
+
+/**
+ * Category tree data provider
+ */
+class CategoryTree
+{
+    /**
+     * In depth we need to calculate only children nodes, so the first wrapped node should be ignored
+     */
+    const DEPTH_OFFSET = 1;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var AttributesJoiner
+     */
+    private $attributesJoiner;
+
+    /**
+     * @var DepthCalculator
+     */
+    private $depthCalculator;
+
+    /**
+     * @var LevelCalculator
+     */
+    private $levelCalculator;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadata;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param AttributesJoiner $attributesJoiner
+     * @param DepthCalculator $depthCalculator
+     * @param LevelCalculator $levelCalculator
+     * @param MetadataPool $metadata
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        AttributesJoiner $attributesJoiner,
+        DepthCalculator $depthCalculator,
+        LevelCalculator $levelCalculator,
+        MetadataPool $metadata
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->attributesJoiner = $attributesJoiner;
+        $this->depthCalculator = $depthCalculator;
+        $this->levelCalculator = $levelCalculator;
+        $this->metadata = $metadata;
+    }
+
+    /**
+     * Returns categories tree starting from parent $rootCategoryId
+     *
+     * @param ResolveInfo $resolveInfo
+     * @param int $rootCategoryId
+     * @return \Iterator
+     */
+    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator
+    {
+        $categoryQuery = $resolveInfo->fieldNodes[0];
+        $collection = $this->collectionFactory->create();
+        $this->joinAttributesRecursively($collection, $categoryQuery);
+        $depth = $this->depthCalculator->calculate($categoryQuery);
+        $level = $this->levelCalculator->calculate($rootCategoryId);
+
+        // If root category is being filter, we've to remove first slash
+        if ($rootCategoryId == Category::TREE_ROOT_ID) {
+            $regExpPathFilter = sprintf('.*%s/[/0-9]*$', $rootCategoryId);
+        } else {
+            $regExpPathFilter = sprintf('.*/%s/[/0-9]*$', $rootCategoryId);
+        }
+
+        //Search for desired part of category tree
+        $collection->addPathFilter($regExpPathFilter);
+
+        $collection->addFieldToFilter('level', ['gt' => $level]);
+        $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
+        $collection->setOrder('level');
+        $collection->getSelect()->orWhere(
+            $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
+            $rootCategoryId
+        );
+        return $collection->getIterator();
+    }
+
+    /**
+     * Join attributes recursively
+     *
+     * @param Collection $collection
+     * @param FieldNode $fieldNode
+     * @return void
+     */
+    private function joinAttributesRecursively(Collection $collection, FieldNode $fieldNode) : void
+    {
+        if (!isset($fieldNode->selectionSet->selections)) {
+            return;
+        }
+
+        $subSelection = $fieldNode->selectionSet->selections;
+        $this->attributesJoiner->join($fieldNode, $collection);
+
+        /** @var FieldNode $node */
+        foreach ($subSelection as $node) {
+            if ($node->kind === 'InlineFragment') {
+                continue;
+            }
+
+            $this->joinAttributesRecursively($collection, $node);
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php
new file mode 100644
index 0000000000000..3f7af2610db1f
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
+
+/**
+ * Flatten custom attributes
+ */
+class CustomAttributesFlattener
+{
+    /**
+     * Flatten custom attributes within its enclosing array to normalize key-value pairs.
+     *
+     * @param array $categoryData
+     * @return array
+     */
+    public function flatten(array $categoryData) : array
+    {
+        if (!isset($categoryData['custom_attributes'])) {
+            return $categoryData;
+        }
+
+        foreach ($categoryData['custom_attributes'] as $attributeData) {
+            $categoryData[$attributeData['attribute_code']] = $attributeData['value'];
+        }
+
+        unset($categoryData['custom_attributes']);
+
+        return $categoryData;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
new file mode 100644
index 0000000000000..86616cc14fe50
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as ProductDataProvider;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Deferred resolver for product data.
+ */
+class Product
+{
+    /**
+     * @var ProductDataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var string[]
+     */
+    private $productSkus = [];
+
+    /**
+     * @var array
+     */
+    private $productList = [];
+
+    /**
+     * @var string[]
+     */
+    private $attributeCodes = [];
+
+    /**
+     * @param ProductDataProvider $productDataProvider
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        ProductDataProvider $productDataProvider,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->productDataProvider = $productDataProvider;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+    }
+
+    /**
+     * Add product sku to result set at fetch time.
+     *
+     * @param string $sku
+     * @return void
+     */
+    public function addProductSku(string $sku) : void
+    {
+        if (!in_array($sku, $this->productSkus) && !empty($this->productList)) {
+            $this->productList = [];
+            $this->productSkus[] = $sku;
+        } elseif (!in_array($sku, $this->productSkus)) {
+            $this->productSkus[] = $sku;
+        }
+    }
+
+    /**
+     * Add product skus to result set at fetch time.
+     *
+     * @param array $skus
+     * @return void
+     */
+    public function addProductSkus(array $skus) : void
+    {
+        foreach ($skus as $sku) {
+            if (!in_array($sku, $this->productSkus) && !empty($this->productList)) {
+                $this->productList = [];
+                $this->productSkus[] = $sku;
+            } elseif (!in_array($sku, $this->productSkus)) {
+                $this->productSkus[] = $sku;
+            }
+        }
+    }
+
+    /**
+     * Add attributes to collection filter
+     *
+     * @param array $attributeCodes
+     * @return void
+     */
+    public function addEavAttributes(array $attributeCodes) : void
+    {
+        $this->attributeCodes = array_unique(array_merge($this->attributeCodes, $attributeCodes));
+    }
+
+    /**
+     * Get product from result set.
+     *
+     * @param string $sku
+     * @return array
+     */
+    public function getProductBySku(string $sku) : array
+    {
+        $products = $this->fetch();
+
+        if (!isset($products[$sku])) {
+            return [];
+        }
+
+        return $products[$sku];
+    }
+
+    /**
+     * Fetch product data and return in array format. Keys for products will be their skus.
+     *
+     * @return array
+     */
+    private function fetch() : array
+    {
+        if (empty($this->productSkus) || !empty($this->productList)) {
+            return $this->productList;
+        }
+
+        $this->searchCriteriaBuilder->addFilter(ProductInterface::SKU, $this->productSkus, 'in');
+        $result = $this->productDataProvider->getList(
+            $this->searchCriteriaBuilder->create(),
+            $this->attributeCodes,
+            false,
+            true
+        );
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        foreach ($result->getItems() as $product) {
+            $this->productList[$product->getSku()] = ['model' => $product];
+        }
+
+        return $this->productList;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
new file mode 100644
index 0000000000000..ac8d5709c85b3
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
+
+use Magento\CatalogGraphQl\Model\Category\Hydrator;
+use Magento\Catalog\Api\Data\CategoryInterface;
+
+/**
+ * Extract data from category tree
+ */
+class ExtractDataFromCategoryTree
+{
+    /**
+     * @var Hydrator
+     */
+    private $categoryHydrator;
+
+    /**
+     * @param Hydrator $categoryHydrator
+     */
+    public function __construct(
+        Hydrator $categoryHydrator
+    ) {
+        $this->categoryHydrator = $categoryHydrator;
+    }
+
+    /**
+     * Extract data from category tree
+     *
+     * @param \Iterator $iterator
+     * @return array
+     */
+    public function execute(\Iterator $iterator): array
+    {
+        $tree = [];
+        while ($iterator->valid()) {
+            /** @var CategoryInterface $category */
+            $category = $iterator->current();
+            $iterator->next();
+            $nextCategory = $iterator->current();
+            $tree[$category->getId()] = $this->categoryHydrator->hydrateCategory($category);
+            $tree[$category->getId()]['model'] = $category;
+            if ($nextCategory && (int) $nextCategory->getLevel() !== (int) $category->getLevel()) {
+                $tree[$category->getId()]['children'] = $this->execute($iterator);
+            }
+        }
+
+        return $tree;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
new file mode 100644
index 0000000000000..7f1fd71942253
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
+
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
+use Magento\Framework\Api\SearchResultsInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+
+/**
+ * Product field data provider, used for GraphQL resolver processing.
+ */
+class Product
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var ProductSearchResultsInterfaceFactory
+     */
+    private $searchResultsFactory;
+
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var Visibility
+     */
+    private $visibility;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param ProductSearchResultsInterfaceFactory $searchResultsFactory
+     * @param Visibility $visibility
+     * @param CollectionProcessorInterface $collectionProcessor
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        ProductSearchResultsInterfaceFactory $searchResultsFactory,
+        Visibility $visibility,
+        CollectionProcessorInterface $collectionProcessor
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->searchResultsFactory = $searchResultsFactory;
+        $this->visibility = $visibility;
+        $this->collectionProcessor = $collectionProcessor;
+    }
+
+    /**
+     * Gets list of product data with full data set. Adds eav attributes to result set from passed in array
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param string[] $attributes
+     * @param bool $isSearch
+     * @param bool $isChildSearch
+     * @return SearchResultsInterface
+     */
+    public function getList(
+        SearchCriteriaInterface $searchCriteria,
+        array $attributes = [],
+        bool $isSearch = false,
+        bool $isChildSearch = false
+    ): SearchResultsInterface {
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+        $collection = $this->collectionFactory->create();
+
+        $this->collectionProcessor->process($collection, $searchCriteria, $attributes);
+
+        if (!$isChildSearch) {
+            $visibilityIds = $isSearch
+                ? $this->visibility->getVisibleInSearchIds()
+                : $this->visibility->getVisibleInCatalogIds();
+            $collection->setVisibility($visibilityIds);
+        }
+        $collection->load();
+
+        // Methods that perform extra fetches post-load
+        if (in_array('media_gallery_entries', $attributes)) {
+            $collection->addMediaGalleryData();
+        }
+        if (in_array('options', $attributes)) {
+            $collection->addOptionsToResult();
+        }
+
+        $searchResult = $this->searchResultsFactory->create();
+        $searchResult->setSearchCriteria($searchCriteria);
+        $searchResult->setItems($collection->getItems());
+        $searchResult->setTotalCount($collection->getSize());
+        return $searchResult;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
new file mode 100644
index 0000000000000..f4cefeb3f3638
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Adds passed in attributes to product collection results
+ *
+ * {@inheritdoc}
+ */
+class AttributeProcessor implements CollectionProcessorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        foreach ($attributeNames as $name) {
+            $collection->addAttributeToSelect($name);
+        }
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
new file mode 100644
index 0000000000000..5fff991c0d6cd
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+
+/**
+ * Add necessary joins for extensible entities.
+ *
+ * {@inheritdoc}
+ */
+class ExtensibleEntityProcessor implements CollectionProcessorInterface
+{
+    /**
+     * @var JoinProcessorInterface
+     */
+    private $joinProcessor;
+
+    /**
+     * @param JoinProcessorInterface $joinProcessor
+     */
+    public function __construct(JoinProcessorInterface $joinProcessor)
+    {
+        $this->joinProcessor = $joinProcessor;
+    }
+
+    /**
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        $this->joinProcessor->process($collection);
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
new file mode 100644
index 0000000000000..4c5b657874713
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Add attributes required for every GraphQL product resolution process.
+ *
+ * {@inheritdoc}
+ */
+class RequiredColumnsProcessor implements CollectionProcessorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        $collection->addAttributeToSelect('special_price');
+        $collection->addAttributeToSelect('special_price_from');
+        $collection->addAttributeToSelect('special_price_to');
+        $collection->addAttributeToSelect('tax_class_id');
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
new file mode 100644
index 0000000000000..e4c338f599577
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface as SearchCriteriaApplier;
+
+/**
+ * Apply search criteria data to passed in collection.
+ *
+ * {@inheritdoc}
+ */
+class SearchCriteriaProcessor implements CollectionProcessorInterface
+{
+    /**
+     * @var SearchCriteriaApplier
+     */
+    private $searchCriteriaApplier;
+
+    /**
+     * @param SearchCriteriaApplier $searchCriteriaApplier
+     */
+    public function __construct(SearchCriteriaApplier $searchCriteriaApplier)
+    {
+        $this->searchCriteriaApplier = $searchCriteriaApplier;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        $this->searchCriteriaApplier->process($searchCriteria, $collection);
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
new file mode 100644
index 0000000000000..e68136f64e5cf
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
+
+/**
+ * Add stock filtering if configuration requires it.
+ *
+ * {@inheritdoc}
+ */
+class StockProcessor implements CollectionProcessorInterface
+{
+    /**
+     * @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(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        if (!$this->stockConfig->isShowOutOfStock()) {
+            $this->stockStatusResource->addIsInStockFilterToCollection($collection);
+        }
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
new file mode 100644
index 0000000000000..30174a94aaba0
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Join visibility and status tables to product collection
+ *
+ * {@inheritdoc}
+ */
+class VisibilityStatusProcessor implements CollectionProcessorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
+        $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
new file mode 100644
index 0000000000000..62501a1a2382b
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Add additional joins, attributes, and clauses to a product collection.
+ */
+interface CollectionProcessorInterface
+{
+    /**
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @return Collection
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection;
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
new file mode 100644
index 0000000000000..687899c1e60ac
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class CompositeCollectionProcessor implements CollectionProcessorInterface
+{
+    /**
+     * @var CollectionProcessorInterface[]
+     */
+    private $collectionProcessors;
+
+    /**
+     * @param CollectionProcessorInterface[] $collectionProcessors
+     */
+    public function __construct(array $collectionProcessors = [])
+    {
+        $this->collectionProcessors = $collectionProcessors;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        foreach ($this->collectionProcessors as $collectionProcessor) {
+            $collection = $collectionProcessor->process($collection, $searchCriteria, $attributeNames);
+        }
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php
new file mode 100644
index 0000000000000..a547f63b217fe
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\FilterArgument;
+
+use Magento\Framework\GraphQl\Config\Element\InterfaceType;
+use Magento\Framework\GraphQl\Config\Element\Type;
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\FieldEntityAttributesInterface;
+
+/**
+ * Retrieves attributes for a field for the ast converter
+ */
+class ProductEntityAttributesForAst implements FieldEntityAttributesInterface
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var array
+     */
+    private $additionalAttributes = ['min_price', 'max_price', 'category_id'];
+
+    /**
+     * @param ConfigInterface $config
+     * @param array $additionalAttributes
+     */
+    public function __construct(
+        ConfigInterface $config,
+        array $additionalAttributes = []
+    ) {
+        $this->config = $config;
+        $this->additionalAttributes = array_merge($this->additionalAttributes, $additionalAttributes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getEntityAttributes() : array
+    {
+        $productTypeSchema = $this->config->getConfigElement('SimpleProduct');
+        if (!$productTypeSchema instanceof Type) {
+            throw new \LogicException(__("SimpleProduct type not defined in schema."));
+        }
+
+        $fields = [];
+        foreach ($productTypeSchema->getInterfaces() as $interface) {
+            /** @var InterfaceType $configElement */
+            $configElement = $this->config->getConfigElement($interface['interface']);
+
+            foreach ($configElement->getFields() as $field) {
+                $fields[$field->getName()] = 'String';
+            }
+        }
+
+        foreach ($this->additionalAttributes as $attribute) {
+            $fields[$attribute] = 'String';
+        }
+
+        return array_keys($fields);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
new file mode 100644
index 0000000000000..62e2f0c488c6c
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\Query;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product;
+use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
+use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
+use Magento\Framework\GraphQl\Query\FieldTranslator;
+
+/**
+ * Retrieve filtered product data based off given search criteria in a format that GraphQL can interpret.
+ */
+class Filter
+{
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product
+     */
+    private $productDataProvider;
+
+    /**
+     * @var FieldTranslator
+     */
+    private $fieldTranslator;
+
+    /**
+     * @var \Magento\Catalog\Model\Layer\Resolver
+     */
+    private $layerResolver;
+
+    /**
+     * @param SearchResultFactory $searchResultFactory
+     * @param Product $productDataProvider
+     * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
+     * @param FieldTranslator $fieldTranslator
+     */
+    public function __construct(
+        SearchResultFactory $searchResultFactory,
+        Product $productDataProvider,
+        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
+        FieldTranslator $fieldTranslator
+    ) {
+        $this->searchResultFactory = $searchResultFactory;
+        $this->productDataProvider = $productDataProvider;
+        $this->fieldTranslator = $fieldTranslator;
+        $this->layerResolver = $layerResolver;
+    }
+
+    /**
+     * Filter catalog product data based off given search criteria
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param ResolveInfo $info
+     * @param bool $isSearch
+     * @return SearchResult
+     */
+    public function getResult(
+        SearchCriteriaInterface $searchCriteria,
+        ResolveInfo $info,
+        bool $isSearch = false
+    ): SearchResult {
+        $fields = $this->getProductFields($info);
+        $products = $this->productDataProvider->getList($searchCriteria, $fields, $isSearch);
+        $productArray = [];
+        /** @var \Magento\Catalog\Model\Product $product */
+        foreach ($products->getItems() as $product) {
+            $productArray[$product->getId()] = $product->getData();
+            $productArray[$product->getId()]['model'] = $product;
+        }
+
+        return $this->searchResultFactory->create($products->getTotalCount(), $productArray);
+    }
+
+    /**
+     * Return field names for all requested product fields.
+     *
+     * @param ResolveInfo $info
+     * @return string[]
+     */
+    private function getProductFields(ResolveInfo $info) : array
+    {
+        $fieldNames = [];
+        foreach ($info->fieldNodes as $node) {
+            if ($node->name->value !== 'products') {
+                continue;
+            }
+            foreach ($node->selectionSet->selections as $selection) {
+                if ($selection->name->value !== 'items') {
+                    continue;
+                }
+
+                foreach ($selection->selectionSet->selections as $itemSelection) {
+                    if ($itemSelection->kind === 'InlineFragment') {
+                        foreach ($itemSelection->selectionSet->selections as $inlineSelection) {
+                            if ($inlineSelection->kind === 'InlineFragment') {
+                                continue;
+                            }
+                            $fieldNames[] = $this->fieldTranslator->translate($inlineSelection->name->value);
+                        }
+                        continue;
+                    }
+                    $fieldNames[] = $this->fieldTranslator->translate($itemSelection->name->value);
+                }
+            }
+        }
+
+        return $fieldNames;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
new file mode 100644
index 0000000000000..f9b64f3a3c69b
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\Query;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\SearchCriteria\Helper\Filter as FilterHelper;
+use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
+use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
+use Magento\Search\Api\SearchInterface;
+
+/**
+ * Full text search for catalog using given search criteria.
+ */
+class Search
+{
+    /**
+     * @var SearchInterface
+     */
+    private $search;
+
+    /**
+     * @var FilterHelper
+     */
+    private $filterHelper;
+
+    /**
+     * @var Filter
+     */
+    private $filterQuery;
+
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Search\Model\Search\PageSizeProvider
+     */
+    private $pageSizeProvider;
+
+    /**
+     * @param SearchInterface $search
+     * @param FilterHelper $filterHelper
+     * @param Filter $filterQuery
+     * @param SearchResultFactory $searchResultFactory
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Search\Model\Search\PageSizeProvider $pageSize
+     */
+    public function __construct(
+        SearchInterface $search,
+        FilterHelper $filterHelper,
+        Filter $filterQuery,
+        SearchResultFactory $searchResultFactory,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        \Magento\Search\Model\Search\PageSizeProvider $pageSize
+    ) {
+        $this->search = $search;
+        $this->filterHelper = $filterHelper;
+        $this->filterQuery = $filterQuery;
+        $this->searchResultFactory = $searchResultFactory;
+        $this->metadataPool = $metadataPool;
+        $this->pageSizeProvider = $pageSize;
+    }
+
+    /**
+     * Return results of full text catalog search of given term, and will return filtered results if filter is specified
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param ResolveInfo $info
+     * @return SearchResult
+     * @throws \Exception
+     */
+    public function getResult(SearchCriteriaInterface $searchCriteria, ResolveInfo $info) : SearchResult
+    {
+        $idField = $this->metadataPool->getMetadata(
+            \Magento\Catalog\Api\Data\ProductInterface::class
+        )->getIdentifierField();
+        $realPageSize = $searchCriteria->getPageSize();
+        $realCurrentPage = $searchCriteria->getCurrentPage();
+        // Current page must be set to 0 and page size to max for search to grab all ID's as temporary workaround
+        $pageSize = $this->pageSizeProvider->getMaxPageSize();
+        $searchCriteria->setPageSize($pageSize);
+        $searchCriteria->setCurrentPage(0);
+        $itemsResults = $this->search->search($searchCriteria);
+
+        $ids = [];
+        $searchIds = [];
+        foreach ($itemsResults->getItems() as $item) {
+            $ids[$item->getId()] = null;
+            $searchIds[] = $item->getId();
+        }
+
+        $filter = $this->filterHelper->generate($idField, 'in', $searchIds);
+        $searchCriteria = $this->filterHelper->remove($searchCriteria, 'search_term');
+        $searchCriteria = $this->filterHelper->add($searchCriteria, $filter);
+        $searchResult = $this->filterQuery->getResult($searchCriteria, $info, true);
+
+        $searchCriteria->setPageSize($realPageSize);
+        $searchCriteria->setCurrentPage($realCurrentPage);
+        $paginatedProducts = $this->paginateList($searchResult, $searchCriteria);
+
+        $products = [];
+        if (!isset($searchCriteria->getSortOrders()[0])) {
+            foreach ($paginatedProducts as $product) {
+                if (in_array($product[$idField], $searchIds)) {
+                    $ids[$product[$idField]] = $product;
+                }
+            }
+            $products = array_filter($ids);
+        } else {
+            foreach ($paginatedProducts as $product) {
+                $productId = isset($product['entity_id']) ? $product['entity_id'] : $product[$idField];
+                if (in_array($productId, $searchIds)) {
+                    $products[] = $product;
+                }
+            }
+        }
+
+        return $this->searchResultFactory->create($searchResult->getTotalCount(), $products);
+    }
+
+    /**
+     * Paginate an array of Ids that get pulled back in search based off search criteria and total count.
+     *
+     * @param SearchResult $searchResult
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return int[]
+     */
+    private function paginateList(SearchResult $searchResult, SearchCriteriaInterface $searchCriteria) : array
+    {
+        $length = $searchCriteria->getPageSize();
+        // Search starts pages from 0
+        $offset = $length * ($searchCriteria->getCurrentPage() - 1);
+
+        if ($searchCriteria->getPageSize()) {
+            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize()) - 1;
+        } else {
+            $maxPages = 0;
+        }
+
+        if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
+            $offset = (int)$maxPages;
+        }
+        return array_slice($searchResult->getProductsSearchResult(), $offset, $length);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
new file mode 100644
index 0000000000000..e3b3588166163
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Category filter allows to filter products collection using 'category_id' filter from search criteria.
+ */
+class CategoryFilter implements CustomFilterInterface
+{
+    /**
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
+    /**
+     * @var CategoryResourceModel
+     */
+    private $categoryResourceModel;
+
+    /**
+     * @param CategoryFactory $categoryFactory
+     * @param CategoryResourceModel $categoryResourceModel
+     */
+    public function __construct(
+        CategoryFactory $categoryFactory,
+        CategoryResourceModel $categoryResourceModel
+    ) {
+        $this->categoryFactory = $categoryFactory;
+        $this->categoryResourceModel = $categoryResourceModel;
+    }
+
+    /**
+     * Apply filter by 'category_id' to product collection.
+     *
+     * For anchor categories, the products from all children categories will be present in the result.
+     *
+     * @param Filter $filter
+     * @param AbstractDb $collection
+     * @return bool Whether the filter is applied
+     * @throws LocalizedException
+     */
+    public function apply(Filter $filter, AbstractDb $collection)
+    {
+        $conditionType = $filter->getConditionType();
+
+        if ($conditionType !== 'eq') {
+            throw new LocalizedException(__("'category_id' only supports 'eq' condition type."));
+        }
+
+        $categoryId = $filter->getValue();
+        /** @var Collection $collection */
+        $category = $this->categoryFactory->create();
+        $this->categoryResourceModel->load($category, $categoryId);
+        $collection->addCategoryFilter($category);
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/Helper/Filter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/Helper/Filter.php
new file mode 100644
index 0000000000000..5658e086269da
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/Helper/Filter.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\SearchCriteria\Helper;
+
+use Magento\Framework\Api\Filter as Item;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+
+/**
+ * Generate, add, and remove filters and their groups to and from a given Search Criteria object in a simple way.
+ */
+class Filter
+{
+    /**
+     * @var FilterGroupBuilder
+     */
+    private $filterGroupBuilder;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @param FilterGroupBuilder $filterGroupBuilder
+     * @param FilterBuilder $filterBuilder
+     */
+    public function __construct(FilterGroupBuilder $filterGroupBuilder, FilterBuilder $filterBuilder)
+    {
+        $this->filterGroupBuilder = $filterGroupBuilder;
+        $this->filterBuilder = $filterBuilder;
+    }
+
+    /**
+     * Generate filter based off given field name, condition type, and value
+     *
+     * @param string $field
+     * @param string $condition
+     * @param string|array $value
+     * @return Item
+     */
+    public function generate(string $field, string $condition, $value) : Item
+    {
+        $this->filterBuilder->setField($field);
+        $this->filterBuilder->setConditionType($condition);
+        $this->filterBuilder->setValue($value);
+
+        return $this->filterBuilder->create();
+    }
+
+    /**
+     * Add a filter to a newly created filter group on a search criteria object
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param Item $filter
+     * @return SearchCriteriaInterface
+     */
+    public function add(SearchCriteriaInterface $searchCriteria, Item $filter) : SearchCriteriaInterface
+    {
+        $filterGroups = $searchCriteria->getFilterGroups();
+        $filterGroups[] = $this->filterGroupBuilder->addFilter($filter)->create();
+        $searchCriteria->setFilterGroups($filterGroups);
+
+        return $searchCriteria;
+    }
+
+    /**
+     * Remove a filter and its enclosing group when its name matches the given string
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param string $filterName
+     * @return SearchCriteriaInterface
+     */
+    public function remove(SearchCriteriaInterface $searchCriteria, string $filterName) : SearchCriteriaInterface
+    {
+        $filterGroups = [];
+        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
+            $isMatch = false;
+            foreach ($filterGroup->getFilters() as $filter) {
+                if ($filter->getField() == $filterName) {
+                    $isMatch = true;
+                }
+            }
+            if ($isMatch) {
+                continue;
+            }
+
+            $filterGroups[] = $filterGroup;
+        }
+        $searchCriteria->setFilterGroups($filterGroups);
+
+        return $searchCriteria;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchResult.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchResult.php
new file mode 100644
index 0000000000000..6e229bdc38a31
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchResult.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products;
+
+use Magento\Framework\Api\SearchResultsInterface;
+
+/**
+ * Container for a product search holding the item result and the array in the GraphQL-readable product type format.
+ */
+class SearchResult
+{
+    /**
+     * @var SearchResultsInterface
+     */
+    private $totalCount;
+
+    /**
+     * @var array
+     */
+    private $productsSearchResult;
+
+    /**
+     * @param int $totalCount
+     * @param array $productsSearchResult
+     */
+    public function __construct(int $totalCount, array $productsSearchResult)
+    {
+        $this->totalCount = $totalCount;
+        $this->productsSearchResult = $productsSearchResult;
+    }
+
+    /**
+     * Return total count of search and filtered result
+     *
+     * @return int
+     */
+    public function getTotalCount() : int
+    {
+        return $this->totalCount;
+    }
+
+    /**
+     * Retrieve an array in the format of GraphQL-readable type containing product data.
+     *
+     * @return array
+     */
+    public function getProductsSearchResult() : array
+    {
+        return $this->productsSearchResult;
+    }
+}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchResultFactory.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchResultFactory.php
similarity index 90%
rename from app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchResultFactory.php
rename to app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchResultFactory.php
index d6c22ea76b03a..aec9362f47c3a 100644
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchResultFactory.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchResultFactory.php
@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\GraphQlCatalog\Model\Resolver\Products;
+namespace Magento\CatalogGraphQl\Model\Resolver\Products;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -33,7 +34,7 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param array $productsSearchResult
      * @return SearchResult
      */
-    public function create(int $totalCount, array $productsSearchResult)
+    public function create(int $totalCount, array $productsSearchResult) : SearchResult
     {
         return $this->objectManager->create(
             SearchResult::class,
diff --git a/app/code/Magento/CatalogGraphQl/README.md b/app/code/Magento/CatalogGraphQl/README.md
new file mode 100644
index 0000000000000..7e15f09e2551a
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/README.md
@@ -0,0 +1,4 @@
+# CatalogGraphQl
+
+**CatalogGraphQl** provides type and resolver information for the GraphQl module
+to generate catalog and product information endpoints.
diff --git a/app/code/Magento/CatalogGraphQl/Test/Mftf/README.md b/app/code/Magento/CatalogGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..81b6b9cf9beec
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Catalog Graph Ql** module.
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
new file mode 100644
index 0000000000000..eb86ac634412e
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "magento/module-catalog-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-eav": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "magento/module-eav-graph-ql": "*",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*",
+        "magento/module-store-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CatalogGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/di.xml b/app/code/Magento/CatalogGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..406d37b2ea200
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/etc/di.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface" type="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CompositeCollectionProcessor"/>
+    <type name="Magento\EavGraphQl\Model\Resolver\Query\Type">
+        <arguments>
+            <argument name="customTypes" xsi:type="array">
+                <item name="media_gallery" xsi:type="string">ProductMediaGallery</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\GraphQlSchemaStitching\Reader" type="Magento\Framework\GraphQlSchemaStitching\Common\Reader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="productDynamicAttributeReader" xsi:type="object">Magento\CatalogGraphQl\Model\Config\AttributeReader</item>
+                <item name="categoryDynamicAttributeReader" xsi:type="object">Magento\CatalogGraphQl\Model\Config\CategoryAttributeReader</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\GraphQl\Query\FieldTranslator">
+        <arguments>
+            <argument name="translationMap" xsi:type="array">
+                <item name="new_from_date" xsi:type="string">news_from_date</item>
+                <item name="new_to_date" xsi:type="string">news_to_date</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Query\Resolver\Argument\FieldEntityAttributesPool">
+        <arguments>
+            <argument name="attributesInstances" xsi:type="array">
+                <item name="products" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\FilterArgument\ProductEntityAttributesForAst</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CompositeCollectionProcessor">
+        <arguments>
+            <argument name="collectionProcessors" xsi:type="array">
+                <item name="attributes" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\AttributeProcessor</item>
+                <item name="extensible" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\ExtensibleEntityProcessor</item>
+                <item name="required" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\RequiredColumnsProcessor</item>
+                <item name="search" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\SearchCriteriaProcessor</item>
+                <item name="stock" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\StockProcessor</item>
+                <item name="visibility" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\VisibilityStatusProcessor</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\SearchCriteriaProcessor">
+        <arguments>
+            <argument name="searchCriteriaApplier" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..7e18ac34f0fcc
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Catalog\Model\Product\Option\Type\Date" type="Magento\CatalogGraphQl\Model\Product\Option\DateType" />
+    <type name="Magento\CatalogGraphQl\Model\ProductInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="productTypeNameResolvers" xsi:type="array">
+                <item name="catalog_type_resolver" xsi:type="object">Magento\CatalogGraphQl\Model\CatalogProductTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\ProductLinkTypeResolverComposite">
+        <arguments>
+            <argument name="productLinksTypeNameResolvers" xsi:type="array">
+                <item name="catalog_product_link_type_resolver" xsi:type="object">Magento\CatalogGraphQl\Model\ProductLinksTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\LayerFilterItemTypeResolverComposite">
+        <arguments>
+            <argument name="typeResolvers" xsi:type="array">
+                <item name="layer_filter_item" xsi:type="object">Magento\CatalogGraphQl\Model\LayerFilterItemTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="product" xsi:type="string">ProductInterface</item>
+                    <item name="simple" xsi:type="string">SimpleProduct</item>
+                    <item name="virtual" xsi:type="string">VirtualProduct</item>
+                </item>
+                <item name="customizable_options" xsi:type="array">
+                    <item name="field" xsi:type="string">CustomizableFieldOption</item>
+                    <item name="date_time" xsi:type="string">CustomizableDateOption</item>
+                    <item name="file" xsi:type="string">CustomizableFileOption</item>
+                    <item name="area" xsi:type="string">CustomizableAreaOption</item>
+                    <item name="drop_down" xsi:type="string">CustomizableDropDownOption</item>
+                    <item name="radio" xsi:type="string">CustomizableRadioOption</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\Layer\Context">
+        <arguments>
+            <argument name="collectionProvider" xsi:type="object">Magento\CatalogGraphQl\Model\Layer\CollectionProvider</argument>
+            <argument name="stateKey" xsi:type="object">Magento\Catalog\Model\Layer\Category\StateKey</argument>
+            <argument name="collectionFilter" xsi:type="object">Magento\Catalog\Model\Layer\Category\CollectionFilter</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Layer\Search">
+        <arguments>
+            <argument name="context" xsi:type="object">Magento\CatalogGraphQl\Model\Layer\Context</argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\Layer\CollectionProvider">
+        <arguments>
+            <argument name="collectionProcessor" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ProductFilterProcessor" type="Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
+        <arguments>
+            <argument name="customFilters" xsi:type="array">
+                <item name="price" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductPriceFilter</item>
+                <item name="min_price" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductPriceFilter</item>
+                <item name="max_price" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductPriceFilter</item>
+                <item name="category_id" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\SearchCriteria\CollectionProcessor\FilterProcessor\CategoryFilter</item>
+            </argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/CatalogGraphQl/etc/module.xml b/app/code/Magento/CatalogGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..87696c129a714
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/etc/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CatalogGraphQl" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Search"/>
+            <module name="Magento_Store"/>
+            <module name="Magento_Eav"/>
+            <module name="Magento_GraphQl"/>
+            <module name="Magento_StoreGraphQl"/>
+            <module name="Magento_EavGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..45f3a4c83be7b
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -0,0 +1,556 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    products (
+        search: String @doc(description: "Performs a full-text search using the specified key words."),
+        filter: ProductFilterInput @doc(description: "Identifies which product attributes to search for and return."),
+        pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
+        currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
+        sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
+     ): Products
+     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes")
+    category (
+        id: Int @doc(description: "Id of the category")
+    ): CategoryTree
+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
+}
+
+enum CurrencyEnum @doc(description: "The list of available currency codes") {
+    AFN
+    ALL
+    AZN
+    DZD
+    AOA
+    ARS
+    AMD
+    AWG
+    AUD
+    BSD
+    BHD
+    BDT
+    BBD
+    BYR
+    BZD
+    BMD
+    BTN
+    BOB
+    BAM
+    BWP
+    BRL
+    GBP
+    BND
+    BGN
+    BUK
+    BIF
+    KHR
+    CAD
+    CVE
+    CZK
+    KYD
+    GQE
+    CLP
+    CNY
+    COP
+    KMF
+    CDF
+    CRC
+    HRK
+    CUP
+    DKK
+    DJF
+    DOP
+    XCD
+    EGP
+    SVC
+    ERN
+    EEK
+    ETB
+    EUR
+    FKP
+    FJD
+    GMD
+    GEK
+    GEL
+    GHS
+    GIP
+    GTQ
+    GNF
+    GYD
+    HTG
+    HNL
+    HKD
+    HUF
+    ISK
+    INR
+    IDR
+    IRR
+    IQD
+    ILS
+    JMD
+    JPY
+    JOD
+    KZT
+    KES
+    KWD
+    KGS
+    LAK
+    LVL
+    LBP
+    LSL
+    LRD
+    LYD
+    LTL
+    MOP
+    MKD
+    MGA
+    MWK
+    MYR
+    MVR
+    LSM
+    MRO
+    MUR
+    MXN
+    MDL
+    MNT
+    MAD
+    MZN
+    MMK
+    NAD
+    NPR
+    ANG
+    YTL
+    NZD
+    NIC
+    NGN
+    KPW
+    NOK
+    OMR
+    PKR
+    PAB
+    PGK
+    PYG
+    PEN
+    PHP
+    PLN
+    QAR
+    RHD
+    RON
+    RUB
+    RWF
+    SHP
+    STD
+    SAR
+    RSD
+    SCR
+    SLL
+    SGD
+    SKK
+    SBD
+    SOS
+    ZAR
+    KRW
+    LKR
+    SDG
+    SRD
+    SZL
+    SEK
+    CHF
+    SYP
+    TWD
+    TJS
+    TZS
+    THB
+    TOP
+    TTD
+    TND
+    TMM
+    USD
+    UGX
+    UAH
+    AED
+    UYU
+    UZS
+    VUV
+    VEB
+    VEF
+    VND
+    CHE
+    CHW
+    XOF
+    WST
+    YER
+    ZMK
+    ZWD
+    TRY
+    AZM
+    ROL
+    TRL
+    XPF
+}
+
+type Price @doc(description: "The Price object defines the price of a product as well as any tax-related adjustments.") {
+    amount: Money @doc(description: "The price of a product plus a three-letter currency code")
+    adjustments: [PriceAdjustment] @doc(description: "An array that provides information about tax, weee, or weee_tax adjustments")
+}
+
+type PriceAdjustment @doc(description: "The PricedAdjustment object defines the amount of money to apply as an adjustment, the type of adjustment to apply, and whether the item is included or excluded from the adjustment.") {
+    amount: Money @doc(description: "The amount of the price adjustment and its currency code")
+    code: PriceAdjustmentCodesEnum @doc(description: "Indicates whether the adjustment involves tax, weee, or weee_tax")
+    description: PriceAdjustmentDescriptionEnum @doc(description: "Indicates whether the entity described by the code attribute is included or excluded from the adjustment")
+}
+
+enum PriceAdjustmentCodesEnum @doc(description: "Note: This enumeration contains values defined in modules other than the Catalog module.") {
+}
+
+enum PriceAdjustmentDescriptionEnum @doc(description: "This enumeration states whether a price adjustment is included or excluded.") {
+    INCLUDED
+    EXCLUDED
+}
+
+enum PriceTypeEnum @doc(description: "This enumeration the price type.") {
+    FIXED
+    PERCENT
+    DYNAMIC
+}
+
+type Money @doc(description: "A Money object defines a monetary value, including a numeric value and a currency code.") {
+    value: Float @doc(description: "A number expressing a monetary value")
+    currency: CurrencyEnum @doc(description: "A three-letter currency code, such as USD or EUR")
+}
+
+type ProductPrices @doc(description: "The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
+    minimalPrice: Price @doc(description: "The lowest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the from value.")
+    maximalPrice: Price @doc(description: "The highest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the to value.")
+    regularPrice: Price @doc(description: "The base price of a product.")
+}
+
+type ProductLinks implements ProductLinksInterface @doc(description: "ProductLinks is an implementation of ProductLinksInterface.") {
+}
+
+interface ProductLinksInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductLinkTypeResolverComposite") @doc(description:"ProductLinks contains information about linked products, including the link type and product type of each item.") {
+    sku: String @doc(description: "The identifier of the linked product")
+    link_type: String @doc(description: "One of related, associated, upsell, or crosssell")
+    linked_product_sku: String @doc(description: "The SKU of the linked product")
+    linked_product_type: String @doc(description: "The type of linked product (simple, virtual, bundle, downloadable, grouped, configurable)")
+    position: Int @doc(description: "The position within the list of product links")
+}
+
+type ProductTierPrices @doc(description: "The ProductTierPrices object defines a tier price, which is a quantity discount offered to a specific customer group.") {
+    customer_group_id: String @doc(description: "The ID of the customer group")
+    qty: Float @doc(description: "The number of items that must be purchased to qualify for tier pricing")
+    value: Float @doc(description: "The price of the fixed price item")
+    percentage_value: Float @doc(description: "The percentage discount of the item")
+    website_id: Float @doc(description: "The ID assigned to the website")
+}
+
+interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "The ProductInterface contains attributes that are common to all types of products. Note that descriptions may not be available for custom and EAV attributes.") {
+    id: Int @doc(description: "The ID number assigned to the product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToId")
+    name: String @doc(description: "The product name. Customers use this name to identify the product.")
+    sku: String @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
+    description: ComplexTextValue @doc(description: "Detailed information about the product. The value can include simple HTML tags.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
+    short_description: ComplexTextValue @doc(description: "A short description of the product. Its use depends on the theme.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
+    special_price: Float @doc(description: "The discounted price of the product")
+    special_from_date: String @doc(description: "The beginning date that a product has a special price")
+    special_to_date: String @doc(description: "The end date that a product has a special price")
+    attribute_set_id: Int @doc(description: "The attribute set assigned to the product")
+    meta_title: String @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
+    meta_keyword: String @doc(description: "A comma-separated list of keywords that are visible only to search engines")
+    meta_description: String @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
+    image: ProductImage @doc(description: "The relative path to the main image on the product page") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
+    small_image: ProductImage @doc(description: "The relative path to the small image, which is used on catalog pages") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
+    thumbnail: ProductImage @doc(description: "The relative path to the product's thumbnail image") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
+    new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
+    new_to_date: String @doc(description: "The end date for new product listings") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
+    tier_price: Float @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
+    options_container: String @doc(description: "If the product has multiple options, determines where they appear on the product page")
+    created_at: String @doc(description: "Timestamp indicating when the product was created")
+    updated_at: String @doc(description: "Timestamp indicating when the product was updated")
+    country_of_manufacture: String @doc(description: "The product's country of origin")
+    type_id: String @doc(description: "One of simple, virtual, bundle, downloadable, grouped, or configurable")
+    websites: [Website] @doc(description: "An array of websites in which the product is available") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Websites")
+    product_links: [ProductLinksInterface] @doc(description: "An array of ProductLinks objects") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductLinks")
+    media_gallery_entries: [MediaGalleryEntry] @doc(description: "An array of MediaGalleryEntry objects") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGalleryEntries")
+    tier_prices: [ProductTierPrices] @doc(description: "An array of ProductTierPrices objects") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\TierPrices")
+    price: ProductPrices @doc(description: "A ProductPrices object, indicating the price of an item") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
+    gift_message_available: String @doc(description: "Indicates whether a gift message is available")
+    manufacturer: Int @doc(description: "A number representing the product's manufacturer")
+    categories: [CategoryInterface] @doc(description: "The categories assigned to a product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
+    canonical_url: String @doc(description: "Canonical URL") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
+}
+
+interface PhysicalProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "PhysicalProductInterface contains attributes specific to tangible products") {
+    weight: Float @doc(description: "The weight of the item, in units defined by the store")
+}
+
+type CustomizableAreaOption implements CustomizableOptionInterface @doc(description: "CustomizableAreaOption contains information about a text area that is defined as part of a customizable option") {
+    value: CustomizableAreaValue @doc(description: "An object that defines a text area")
+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
+}
+
+type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the price and sku of a product whose page contains a customized text area") {
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option")
+}
+
+type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation") {
+    children: [CategoryTree] @doc(description: "Child categories tree") @resolve(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
+}
+
+type CustomizableDateOption implements CustomizableOptionInterface @doc(description: "CustomizableDateOption contains information about a date picker that is defined as part of a customizable option") {
+    value: CustomizableDateValue @doc(description: "An object that defines a date field in a customizable option.")
+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
+}
+
+type CustomizableDateValue @doc(description: "CustomizableDateValue defines the price and sku of a product whose page contains a customized date picker") {
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+}
+
+type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option") {
+    value: [CustomizableDropDownValue] @doc(description: "An array that defines the set of options for a drop down menu")
+}
+
+type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defines the price and sku of a product whose page contains a customized drop down menu") {
+    option_type_id: Int @doc(description: "The ID assigned to the value")
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    title: String @doc(description: "The display name for this option")
+    sort_order: Int @doc(description: "The order in which the option is displayed")
+}
+
+type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option") {
+    value: CustomizableFieldValue @doc(description: "An object that defines a text field")
+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
+}
+
+type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines the price and sku of a product whose page contains a customized text field") {
+    price: Float @doc(description: "The price of the custom value")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option")
+}
+
+type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option") {
+    value: CustomizableFileValue @doc(description: "An object that defines a file value")
+    product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
+}
+
+type CustomizableFileValue @doc(description: "CustomizableFileValue defines the price and sku of a product whose page contains a customized file picker") {
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    file_extension: String @doc(description: "The file extension to accept")
+    image_size_x: Int @doc(description: "The maximum width of an image")
+    image_size_y: Int @doc(description: "The maximum height of an image")
+}
+
+type ProductImage @doc(description: "Product image information. Contains image relative path, URL and label") {
+    url: String @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage\\Url")
+    label: String @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage\\Label")
+}
+
+interface CustomizableOptionInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CustomizableOptionTypeResolver") @doc(description: "The CustomizableOptionInterface contains basic information about a customizable option. It can be implemented by several types of configurable options.") {
+    title: String @doc(description: "The display name for this option")
+    required: Boolean @doc(description: "Indicates whether the option is required")
+    sort_order: Int @doc(description: "The order in which the option is displayed")
+    option_id: Int @doc(description: "Option ID")
+}
+
+interface CustomizableProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "CustomizableProductInterface contains information about customizable product options.") {
+    options: [CustomizableOptionInterface] @doc(description: "An array of options for a customizable product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Options")
+}
+
+interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CategoryInterfaceTypeResolver") @doc(description: "CategoryInterface contains the full set of attributes that can be returned in a category search") {
+    id: Int @doc(description: "An ID that uniquely identifies the category")
+    description: String @doc(description: "An optional description of the category") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryHtmlAttribute")
+    name: String @doc(description: "The display name of the category")
+    path: String @doc(description: "Category Path")
+    path_in_store: String @doc(description: "Category path in store")
+    url_key: String @doc(description: "The url key assigned to the category")
+    url_path: String @doc(description: "The url path assigned to the category")
+    position: Int @doc(description: "The position of the category relative to other categories at the same level in tree")
+    level: Int @doc(description: "Indicates the depth of the category within the tree")
+    created_at: String @doc(description: "Timestamp indicating when the category was created")
+    updated_at: String @doc(description: "Timestamp indicating when the category was updated")
+    product_count: Int @doc(description: "The number of products in the category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
+    default_sort_by: String @doc(description: "The attribute to use for sorting")
+    products(
+        pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
+        currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
+        sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
+    ): CategoryProducts @doc(description: "The list of products assigned to the category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
+    breadcrumbs: [Breadcrumb] @doc(description: "Breadcrumbs, parent categories info") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Breadcrumbs")
+}
+
+type Breadcrumb @doc(description: "Breadcrumb item"){
+    category_id: Int @doc(description: "Category ID")
+    category_name: String @doc(description: "Category name")
+    category_level: Int @doc(description: "Category level")
+    category_url_key: String @doc(description: "Category URL key")
+}
+
+type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option") {
+    value: [CustomizableRadioValue] @doc(description: "An array that defines a set of radio buttons")
+}
+
+type CustomizableRadioValue  @doc(description: "CustomizableRadioValue defines the price and sku of a product whose page contains a customized set of radio buttons") {
+    option_type_id: Int @doc(description: "The ID assigned to the value")
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    title: String @doc(description: "The display name for this option")
+    sort_order: Int @doc(description: "The order in which the radio button is displayed")
+}
+
+type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory") {
+}
+
+type SimpleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "A simple product is tangible and are usually sold as single units or in fixed quantities")
+{
+}
+
+type Products @doc(description: "The Products object is the top-level object returned in a product search") {
+    items: [ProductInterface] @doc(description: "An array of products that match the specified search criteria")
+    page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query")
+    total_count: Int @doc(description: "The number of products returned")
+    filters: [LayerFilter] @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\LayerFilters") @doc(description: "Layered navigation filters array")
+    sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
+}
+
+type CategoryProducts @doc(description: "The category products object returned in the Category query") {
+    items: [ProductInterface] @doc(description: "An array of products that are assigned to the category")
+    page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query")
+    total_count: Int @doc(description: "The number of products returned")
+}
+
+input ProductFilterInput @doc(description: "ProductFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {
+    name: FilterTypeInput @doc(description: "The product name. Customers use this name to identify the product.")
+    sku: FilterTypeInput @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
+    description: FilterTypeInput @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
+    short_description: FilterTypeInput @doc(description: "A short description of the product. Its use depends on the theme.")
+    price: FilterTypeInput @doc(description: "The price of an item")
+    special_price: FilterTypeInput @doc(description: "The discounted price of the product")
+    special_from_date: FilterTypeInput @doc(description: "The beginning date that a product has a special price")
+    special_to_date: FilterTypeInput @doc(description: "The end date that a product has a special price")
+    weight: FilterTypeInput @doc(description: "The weight of the item, in units defined by the store")
+    manufacturer: FilterTypeInput @doc(description: "A number representing the product's manufacturer")
+    meta_title: FilterTypeInput @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
+    meta_keyword: FilterTypeInput @doc(description: "A comma-separated list of keywords that are visible only to search engines")
+    meta_description: FilterTypeInput @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
+    image: FilterTypeInput @doc(description: "The relative path to the main image on the product page")
+    small_image: FilterTypeInput @doc(description: "The relative path to the small image, which is used on catalog pages")
+    thumbnail: FilterTypeInput @doc(description: "The relative path to the product's thumbnail image")
+    tier_price: FilterTypeInput @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
+    news_from_date: FilterTypeInput @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product")
+    news_to_date: FilterTypeInput @doc(description: "The end date for new product listings")
+    custom_layout_update: FilterTypeInput @doc(description: "XML code that is applied as a layout update to the product page")
+    min_price: FilterTypeInput @doc(description:"The numeric minimal price of the product. Do not include the currency code.")
+    max_price: FilterTypeInput @doc(description:"The numeric maximal price of the product. Do not include the currency code.")
+    special_price: FilterTypeInput @doc(description:"The numeric special price of the product. Do not include the currency code.")
+    category_id: FilterTypeInput @doc(description: "Category ID the product belongs to")
+    options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page")
+    required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options")
+    has_options: FilterTypeInput @doc(description: "Indicates whether additional attributes have been created for the product")
+    image_label: FilterTypeInput @doc(description: "The label assigned to a product image")
+    small_image_label: FilterTypeInput @doc(description: "The label assigned to a product's small image")
+    thumbnail_label: FilterTypeInput @doc(description: "The label assigned to a product's thumbnail image")
+    created_at: FilterTypeInput @doc(description: "Timestamp indicating when the product was created")
+    updated_at: FilterTypeInput @doc(description: "Timestamp indicating when the product was updated")
+    country_of_manufacture: FilterTypeInput @doc(description: "The product's country of origin")
+    custom_layout: FilterTypeInput @doc(description: "The name of a custom layout")
+    gift_message_available: FilterTypeInput @doc(description: "Indicates whether a gift message is available")
+    or: ProductFilterInput @doc(description: "The keyword required to perform a logical OR comparison")
+}
+
+type ProductMediaGalleryEntriesContent @doc(description: "ProductMediaGalleryEntriesContent contains an image in base64 format and basic information about the image") {
+    base64_encoded_data: String @doc(description: "The image in base64 format")
+    type: String @doc(description: "The MIME type of the file, such as image/png")
+    name: String @doc(description: "The file name of the image")
+}
+
+type ProductMediaGalleryEntriesVideoContent @doc(description: "ProductMediaGalleryEntriesVideoContent contains a link to a video file and basic information about the video") {
+    media_type: String @doc(description: "Must be external-video")
+    video_provider: String @doc(description: "Describes the video source")
+    video_url: String @doc(description: "The URL to the video")
+    video_title: String @doc(description: "The title of the video")
+    video_description: String @doc(description: "A description of the video")
+    video_metadata: String @doc(description: "Optional data about the video")
+}
+
+input ProductSortInput  @doc(description: "ProductSortInput specifies the attribute to use for sorting search results and indicates whether the results are sorted in ascending or descending order") {
+    name: SortEnum @doc(description: "The product name. Customers use this name to identify the product.")
+    sku: SortEnum @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
+    description: SortEnum @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
+    short_description: SortEnum @doc(description: "A short description of the product. Its use depends on the theme.")
+    price: SortEnum @doc(description: "The price of the item")
+    special_price: SortEnum @doc(description: "The discounted price of the product")
+    special_from_date: SortEnum @doc(description: "The beginning date that a product has a special price")
+    special_to_date: SortEnum @doc(description: "The end date that a product has a special price")
+    weight: SortEnum @doc(description: "The weight of the item, in units defined by the store")
+    manufacturer: SortEnum @doc(description: "A number representing the product's manufacturer")
+    meta_title: SortEnum @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
+    meta_keyword: SortEnum @doc(description: "A comma-separated list of keywords that are visible only to search engines")
+    meta_description: SortEnum @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
+    image: SortEnum @doc(description: "The relative path to the main image on the product page")
+    small_image: SortEnum @doc(description: "The relative path to the small image, which is used on catalog pages")
+    thumbnail: SortEnum @doc(description: "The relative path to the product's thumbnail image")
+    tier_price: SortEnum @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
+    news_from_date: SortEnum @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product")
+    news_to_date: SortEnum @doc(description: "The end date for new product listings")
+    custom_layout_update: SortEnum @doc(description: "XML code that is applied as a layout update to the product page")
+    options_container: SortEnum @doc(description: "If the product has multiple options, determines where they appear on the product page")
+    required_options: SortEnum @doc(description: "Indicates whether the product has required options")
+    has_options: SortEnum @doc(description: "Indicates whether additional attributes have been created for the product")
+    image_label: SortEnum @doc(description: "The label assigned to a product image")
+    small_image_label: SortEnum @doc(description: "The label assigned to a product's small image")
+    thumbnail_label: SortEnum @doc(description: "The label assigned to a product's thumbnail image")
+    created_at: SortEnum @doc(description: "Timestamp indicating when the product was created")
+    updated_at: SortEnum @doc(description: "Timestamp indicating when the product was updated")
+    country_of_manufacture: SortEnum @doc(description: "The product's country of origin")
+    custom_layout: SortEnum @doc(description: "The name of a custom layout")
+    gift_message_available: SortEnum @doc(description: "Indicates whether a gift message is available")
+}
+
+type MediaGalleryEntry  @doc(description: "MediaGalleryEntry defines characteristics about images and videos associated with a specific product") {
+    id: Int @doc(description: "The identifier assigned to the object")
+    media_type: String @doc(description: "image or video")
+    label: String @doc(description: "The alt text displayed on the UI when the user points to the image")
+    position: Int @doc(description: "The media item's position after it has been sorted")
+    disabled: Boolean @doc(description: "Whether the image is hidden from vie")
+    types: [String] @doc(description: "Array of image types. It can have the following values: image, small_image, thumbnail")
+    file: String @doc(description: "The path of the image on the server")
+    content: ProductMediaGalleryEntriesContent @doc(description: "Contains a ProductMediaGalleryEntriesContent object")
+    video_content: ProductMediaGalleryEntriesVideoContent @doc(description: "Contains a ProductMediaGalleryEntriesVideoContent object")
+}
+
+type LayerFilter {
+    name: String @doc(description: "Layered navigation filter name")
+    request_var: String @doc(description: "Request variable name for filter query")
+    filter_items_count: Int @doc(description: "Count of filter items in filter group")
+    filter_items: [LayerFilterItemInterface] @doc(description: "Array of filter items")
+}
+
+interface LayerFilterItemInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\LayerFilterItemTypeResolverComposite") {
+    label: String @doc(description: "Filter label")
+    value_string: String @doc(description: "Value for filter request variable to be used in query")
+    items_count: Int @doc(description: "Count of items by filter")
+}
+
+type LayerFilterItem implements LayerFilterItemInterface {
+
+}
+
+type SortField {
+    value: String @doc(description: "Attribute code of sort field")
+    label: String @doc(description: "Label of sort field")
+}
+
+type SortFields @doc(description: "SortFields contains a default value for sort fields and all available sort fields") {
+    default: String @doc(description: "Default value of sort fields")
+    options: [SortField] @doc(description: "Available sort fields")
+}
diff --git a/app/code/Magento/CatalogGraphQl/registration.php b/app/code/Magento/CatalogGraphQl/registration.php
new file mode 100644
index 0000000000000..3f5c8e222dc7a
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogGraphQl', __DIR__);
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 97a0e6aaebf4f..345d323e6e129 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\CatalogImportExport\Model\Export;
 
+use Magento\Catalog\Model\ResourceModel\Product\Option\Collection;
 use Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor;
 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
@@ -18,6 +20,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @since 100.0.2
  */
 class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
@@ -202,7 +205,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     protected $_itemFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection
+     * @var Collection
      */
     protected $_optionColFactory;
 
@@ -347,12 +350,13 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     private $productEntityLinkField;
 
     /**
+     * Product constructor.
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $config
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
      * @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
      * @param \Magento\Catalog\Model\ResourceModel\ProductFactory $productFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $attrSetColFactory
@@ -361,10 +365,10 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * @param \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory $optionColFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeColFactory
      * @param Product\Type\Factory $_typeFactory
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
-     * @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
+     * @param ProductEntity\LinkTypeProvider $linkTypeProvider
+     * @param RowCustomizerInterface $rowCustomizer
      * @param array $dateAttrCodes
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -518,10 +522,13 @@ protected function getMediaGallery(array $productIds)
         if (empty($productIds)) {
             return [];
         }
+        
+        $productEntityJoinField = $this->getProductEntityLinkField();
+
         $select = $this->_connection->select()->from(
             ['mgvte' => $this->_resourceModel->getTableName('catalog_product_entity_media_gallery_value_to_entity')],
             [
-                "mgvte.{$this->getProductEntityLinkField()}",
+                "mgvte.$productEntityJoinField",
                 'mgvte.value_id'
             ]
         )->joinLeft(
@@ -533,26 +540,28 @@ protected function getMediaGallery(array $productIds)
             ]
         )->joinLeft(
             ['mgv' => $this->_resourceModel->getTableName('catalog_product_entity_media_gallery_value')],
-            '(mg.value_id = mgv.value_id AND mgv.store_id = 0)',
+            "(mg.value_id = mgv.value_id) and (mgvte.$productEntityJoinField = mgv.$productEntityJoinField)",
             [
                 'mgv.label',
                 'mgv.position',
-                'mgv.disabled'
+                'mgv.disabled',
+                'mgv.store_id',
             ]
         )->where(
-            "mgvte.{$this->getProductEntityLinkField()} IN (?)",
+            "mgvte.$productEntityJoinField IN (?)",
             $productIds
         );
 
         $rowMediaGallery = [];
         $stmt = $this->_connection->query($select);
         while ($mediaRow = $stmt->fetch()) {
-            $rowMediaGallery[$mediaRow[$this->getProductEntityLinkField()]][] = [
+            $rowMediaGallery[$mediaRow[$productEntityJoinField]][] = [
                 '_media_attribute_id' => $mediaRow['attribute_id'],
                 '_media_image' => $mediaRow['filename'],
                 '_media_label' => $mediaRow['label'],
                 '_media_position' => $mediaRow['position'],
                 '_media_is_disabled' => $mediaRow['disabled'],
+                '_media_store_id' => $mediaRow['store_id'],
             ];
         }
 
@@ -688,7 +697,9 @@ protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $pr
     }
 
     /**
-     * {@inheritdoc}
+     * Get header columns
+     *
+     * @return string[]
      */
     public function _getHeaderColumns()
     {
@@ -747,7 +758,10 @@ protected function _getExportMainAttrCodes()
     }
 
     /**
-     * {@inheritdoc}
+     * Get entity collection
+     *
+     * @param bool $resetCollection
+     * @return \Magento\Framework\Data\Collection\AbstractDb
      */
     protected function _getEntityCollection($resetCollection = false)
     {
@@ -792,7 +806,7 @@ protected function getItemsPerPage()
             // Maximal Products limit
             $maxProductsLimit = 5000;
 
-            $this->_itemsPerPage = intval(
+            $this->_itemsPerPage = (int)(
                 ($memoryLimit * $memoryUsagePercent - memory_get_usage(true)) / $memoryPerProduct
             );
             if ($this->_itemsPerPage < $minProductsLimit) {
@@ -854,7 +868,10 @@ public function export()
     }
 
     /**
-     * {@inheritdoc}
+     * Apply filter to collection and add not skipped attributes to select.
+     *
+     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
      * @since 100.2.0
      */
     protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection\AbstractCollection $collection)
@@ -915,6 +932,28 @@ 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
      *
@@ -925,14 +964,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) {
@@ -1001,18 +1041,15 @@ protected function collectRawData()
                     unset($data[$itemId][$storeId][self::COL_ADDITIONAL_ATTRIBUTES]);
                 }
 
-                if (!empty($data[$itemId][$storeId]) || $this->hasMultiselectData($item, $storeId)) {
-                    $attrSetId = $item->getAttributeSetId();
-                    $data[$itemId][$storeId][self::COL_STORE] = $storeCode;
-                    $data[$itemId][$storeId][self::COL_ATTR_SET] = $this->_attrSetIdToName[$attrSetId];
-                    $data[$itemId][$storeId][self::COL_TYPE] = $item->getTypeId();
-                }
+                $attrSetId = $item->getAttributeSetId();
+                $data[$itemId][$storeId][self::COL_STORE] = $storeCode;
+                $data[$itemId][$storeId][self::COL_ATTR_SET] = $this->_attrSetIdToName[$attrSetId];
+                $data[$itemId][$storeId][self::COL_TYPE] = $item->getTypeId();
                 $data[$itemId][$storeId][self::COL_SKU] = htmlspecialchars_decode($item->getSku());
                 $data[$itemId][$storeId]['store_id'] = $storeId;
                 $data[$itemId][$storeId]['product_id'] = $itemId;
                 $data[$itemId][$storeId]['product_link_id'] = $productLinkId;
             }
-            $collection->clear();
         }
 
         return $data;
@@ -1038,6 +1075,8 @@ private function wrapValue($value)
     }
 
     /**
+     * Collect multi raw data from
+     *
      * @return array
      */
     protected function collectMultirawData()
@@ -1079,9 +1118,12 @@ protected function collectMultirawData()
     }
 
     /**
+     * Check the current data has multiselect value
+     *
      * @param \Magento\Catalog\Model\Product $item
      * @param int $storeId
      * @return bool
+     * @deprecated
      */
     protected function hasMultiselectData($item, $storeId)
     {
@@ -1090,6 +1132,8 @@ protected function hasMultiselectData($item, $storeId)
     }
 
     /**
+     * Collect multiselect values based on value
+     *
      * @param \Magento\Catalog\Model\Product $item
      * @param string $attrCode
      * @param int $storeId
@@ -1114,6 +1158,8 @@ protected function collectMultiselectValues($item, $attrCode, $storeId)
     }
 
     /**
+     * Check attribute is valid
+     *
      * @param string $code
      * @param mixed $value
      * @return bool
@@ -1133,6 +1179,8 @@ protected function isValidAttributeValue($code, $value)
     }
 
     /**
+     * Append multi row data
+     *
      * @param array $dataRow
      * @param array $multiRawData
      * @return array
@@ -1140,20 +1188,24 @@ protected function isValidAttributeValue($code, $value)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    private function appendMultirowData(&$dataRow, &$multiRawData)
+    private function appendMultirowData(&$dataRow, $multiRawData)
     {
         $productId = $dataRow['product_id'];
         $productLinkId = $dataRow['product_link_id'];
         $storeId = $dataRow['store_id'];
         $sku = $dataRow[self::COL_SKU];
+        $type = $dataRow[self::COL_TYPE];
+        $attributeSet = $dataRow[self::COL_ATTR_SET];
 
         unset($dataRow['product_id']);
         unset($dataRow['product_link_id']);
         unset($dataRow['store_id']);
         unset($dataRow[self::COL_SKU]);
+        unset($dataRow[self::COL_STORE]);
+        unset($dataRow[self::COL_ATTR_SET]);
+        unset($dataRow[self::COL_TYPE]);
 
         if (Store::DEFAULT_STORE_ID == $storeId) {
-            unset($dataRow[self::COL_STORE]);
             $this->updateDataWithCategoryColumns($dataRow, $multiRawData['rowCategories'], $productId);
             if (!empty($multiRawData['rowWebsites'][$productId])) {
                 $websiteCodes = [];
@@ -1169,11 +1221,13 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
                 $additionalImageLabels = [];
                 $additionalImageIsDisabled = [];
                 foreach ($multiRawData['mediaGalery'][$productLinkId] as $mediaItem) {
-                    $additionalImages[] = $mediaItem['_media_image'];
-                    $additionalImageLabels[] = $mediaItem['_media_label'];
+                    if ((int)$mediaItem['_media_store_id'] === Store::DEFAULT_STORE_ID) {
+                        $additionalImages[] = $mediaItem['_media_image'];
+                        $additionalImageLabels[] = $mediaItem['_media_label'];
 
-                    if ($mediaItem['_media_is_disabled'] == true) {
-                        $additionalImageIsDisabled[] = $mediaItem['_media_image'];
+                        if ($mediaItem['_media_is_disabled'] == true) {
+                            $additionalImageIsDisabled[] = $mediaItem['_media_image'];
+                        }
                     }
                 }
                 $dataRow['additional_images'] =
@@ -1207,6 +1261,21 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
                 }
             }
             $dataRow = $this->rowCustomizer->addData($dataRow, $productId);
+        } else {
+            $additionalImageIsDisabled = [];
+            if (!empty($multiRawData['mediaGalery'][$productLinkId])) {
+                foreach ($multiRawData['mediaGalery'][$productLinkId] as $mediaItem) {
+                    if ((int)$mediaItem['_media_store_id'] === $storeId) {
+                        if ($mediaItem['_media_is_disabled'] == true) {
+                            $additionalImageIsDisabled[] = $mediaItem['_media_image'];
+                        }
+                    }
+                }
+            }
+            if ($additionalImageIsDisabled) {
+                $dataRow['hide_from_product_page'] =
+                    implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalImageIsDisabled);
+            }
         }
 
         if (!empty($this->collectedMultiselectsData[$storeId][$productId])) {
@@ -1234,10 +1303,15 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
             $dataRow[self::COL_STORE] = $this->_storeIdToCode[$storeId];
         }
         $dataRow[self::COL_SKU] = $sku;
+        $dataRow[self::COL_ATTR_SET] = $attributeSet;
+        $dataRow[self::COL_TYPE] = $type;
+        
         return $dataRow;
     }
 
     /**
+     * Add multi row data to export
+     *
      * @deprecated 100.1.0
      * @param array $dataRow
      * @param array $multiRawData
@@ -1285,6 +1359,8 @@ protected function _customHeadersMapping($rowData)
     }
 
     /**
+     * Convert option row to cell string
+     *
      * @param array $option
      * @return string
      */
@@ -1300,6 +1376,12 @@ protected function optionRowToCellString($option)
     }
 
     /**
+     * Collect custom options data for products that will be exported.
+     *
+     * Option name and type will be collected for all store views, all other data (which can't be changed on store view
+     * level will be collected for DEFAULT_STORE_ID only.
+     * Store view specified data will be saved to the additional store view row.
+     *
      * @param int[] $productIds
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -1310,53 +1392,48 @@ protected function getCustomOptionsData($productIds)
         $customOptionsData = [];
 
         foreach (array_keys($this->_storeIdToCode) as $storeId) {
-            if (Store::DEFAULT_STORE_ID != $storeId) {
-                continue;
-            }
             $options = $this->_optionColFactory->create();
-            /* @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection $options*/
-            $options->addOrder('sort_order');
-            $options->reset()->addOrder('sort_order')->addTitleToResult(
-                $storeId
-            )->addPriceToResult(
-                $storeId
-            )->addProductToFilter(
-                $productIds
-            )->addValuesToResult(
-                $storeId
-            );
+            /* @var Collection $options*/
+            $options->reset()
+                ->addOrder('sort_order', Collection::SORT_ORDER_ASC)
+                ->addTitleToResult($storeId)
+                ->addPriceToResult($storeId)
+                ->addProductToFilter($productIds)
+                ->addValuesToResult($storeId);
 
             foreach ($options as $option) {
                 $row = [];
                 $productId = $option['product_id'];
-
                 $row['name'] = $option['title'];
                 $row['type'] = $option['type'];
-                $row['required'] = $option['is_require'];
-                $row['price'] = $option['price'];
-                $row['price_type'] = ($option['price_type'] == 'percent') ? $option['price_type'] : 'fixed';
-                $row['sku'] = $option['sku'];
-                if ($option['max_characters']) {
-                    $row['max_characters'] = $option['max_characters'];
-                }
-
-                foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
-                    if (!isset($option[$fileOptionKey])) {
-                        continue;
+                if (Store::DEFAULT_STORE_ID === $storeId) {
+                    $row['required'] = $option['is_require'];
+                    $row['price'] = $option['price'];
+                    $row['price_type'] = ($option['price_type'] === 'percent') ? 'percent' : 'fixed';
+                    $row['sku'] = $option['sku'];
+                    if ($option['max_characters']) {
+                        $row['max_characters'] = $option['max_characters'];
                     }
 
-                    $row[$fileOptionKey] = $option[$fileOptionKey];
-                }
+                    foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+                        if (!isset($option[$fileOptionKey])) {
+                            continue;
+                        }
 
+                        $row[$fileOptionKey] = $option[$fileOptionKey];
+                    }
+                }
                 $values = $option->getValues();
 
                 if ($values) {
                     foreach ($values as $value) {
-                        $valuePriceType = ($value['price_type'] == 'percent') ? $value['price_type'] : 'fixed';
                         $row['option_title'] = $value['title'];
-                        $row['price'] = $value['price'];
-                        $row['price_type'] = $valuePriceType;
-                        $row['sku'] = $value['sku'];
+                        if (Store::DEFAULT_STORE_ID === $storeId) {
+                            $row['option_title'] = $value['title'];
+                            $row['price'] = $value['price'];
+                            $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
+                            $row['sku'] = $value['sku'];
+                        }
                         $customOptionsData[$productId][$storeId][] = $this->optionRowToCellString($row);
                     }
                 } else {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index d005aa8ec02fa..9298939791e4b 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -5,19 +5,28 @@
  */
 namespace Magento\CatalogImportExport\Model\Import;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Config as CatalogConfig;
 use Magento\Catalog\Model\Product\Visibility;
+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\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogImportExport\Model\StockItemImporterInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\Filesystem;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\Catalog\Model\Config as CatalogConfig;
+use Magento\Store\Model\Store;
 
 /**
  * Import entity product model
@@ -123,6 +132,16 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     const COL_NAME = 'name';
 
+    /**
+     * Column new_from_date.
+     */
+    const COL_NEW_FROM_DATE = 'new_from_date';
+
+    /**
+     * Column new_to_date.
+     */
+    const COL_NEW_TO_DATE = 'new_to_date';
+
     /**
      * Column product website.
      */
@@ -287,7 +306,9 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_MEDIA_PATH_NOT_ACCESSIBLE => 'Imported resource (image) does not exist in the local media storage',
         ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
-        ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually'
+        ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually',
+        ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => "Value for multiselect attribute %s contains duplicated values",
+        ValidatorInterface::ERROR_NEW_TO_DATE => 'Make sure new_to_date is later than or the same as new_from_date',
     ];
     //@codingStandardsIgnoreEnd
 
@@ -309,8 +330,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         Product::COL_TYPE => 'product_type',
         Product::COL_PRODUCT_WEBSITES => 'product_websites',
         'status' => 'product_online',
-        'news_from_date' => 'new_from_date',
-        'news_to_date' => 'new_to_date',
+        'news_from_date' => self::COL_NEW_FROM_DATE,
+        'news_to_date' => self::COL_NEW_TO_DATE,
         'options_container' => 'display_product_options_in',
         'minimal_price' => 'map_price',
         'msrp' => 'msrp_price',
@@ -425,7 +446,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      *
      * @var string[]
      */
-    protected $_imagesArrayKeys = ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image'];
+    protected $_imagesArrayKeys = [];
 
     /**
      * Permanent entity columns.
@@ -531,6 +552,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;
 
@@ -699,6 +721,35 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $catalogConfig;
 
+    /**
+     * Stock Item Importer
+     *
+     * @var StockItemImporterInterface
+     */
+    private $stockItemImporter;
+
+    /**
+     * @var ImageTypeProcessor
+     */
+    private $imageTypeProcessor;
+
+    /**
+     * Provide ability to process and save images during import.
+     *
+     * @var MediaGalleryProcessor
+     */
+    private $mediaProcessor;
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -714,7 +765,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface $stockStateProvider
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\ImportExport\Model\Import\Config $importConfig
-     * @param Proxy\Product\ResourceFactory $resourceFactory
+     * @param Proxy\Product\ResourceModelFactory $resourceFactory
      * @param Product\OptionFactory $optionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $setColFactory
      * @param Product\Type\Factory $productTypeFactory
@@ -735,12 +786,17 @@ 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
-     * @throws \Magento\Framework\Exception\LocalizedException
-     *
+     * @param ImageTypeProcessor $imageTypeProcessor
+     * @param MediaGalleryProcessor $mediaProcessor
+     * @param StockItemImporterInterface|null $stockItemImporter
+     * @param DateTimeFactory $dateTimeFactory
+     * @param ProductRepositoryInterface|null $productRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -781,7 +837,12 @@ public function __construct(
         \Magento\Catalog\Model\Product\Url $productUrl,
         array $data = [],
         array $dateAttrCodes = [],
-        CatalogConfig $catalogConfig = null
+        CatalogConfig $catalogConfig = null,
+        ImageTypeProcessor $imageTypeProcessor = null,
+        MediaGalleryProcessor $mediaProcessor = null,
+        StockItemImporterInterface $stockItemImporter = null,
+        DateTimeFactory $dateTimeFactory = null,
+        ProductRepositoryInterface $productRepository = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -812,9 +873,11 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->productUrl = $productUrl;
         $this->dateAttrCodes = array_merge($this->dateAttrCodes, $dateAttrCodes);
-        $this->catalogConfig = $catalogConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(CatalogConfig::class);
-
+        $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,
@@ -825,16 +888,16 @@ public function __construct(
             $string,
             $errorAggregator
         );
-        $this->_optionEntity = isset(
-            $data['option_entity']
-        ) ? $data['option_entity'] : $optionFactory->create(
-            ['data' => ['product_entity' => $this]]
-        );
-
+        $this->_optionEntity = $data['option_entity'] ??
+            $optionFactory->create(['data' => ['product_entity' => $this]]);
         $this->_initAttributeSets()
             ->_initTypeModels()
-            ->_initSkus();
+            ->_initSkus()
+            ->initImagesArrayKeys();
         $this->validator->init($this);
+        $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()->get(DateTimeFactory::class);
+        $this->productRepository = $productRepository ?? ObjectManager::getInstance()
+                ->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -858,8 +921,8 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
     }
 
     /**
-     *
      * Multiple value separator getter.
+     *
      * @return string
      */
     public function getMultipleValueSeparator()
@@ -870,6 +933,19 @@ public function getMultipleValueSeparator()
         return Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
     }
 
+    /**
+     * Return empty attribute value constant
+     *
+     * @return string
+     */
+    public function getEmptyAttributeValueConstant()
+    {
+        if (!empty($this->_parameters[Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT])) {
+            return $this->_parameters[Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT];
+        }
+        return Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT;
+    }
+
     /**
      * Retrieve instance of product custom options import entity
      *
@@ -896,6 +972,8 @@ public function getMediaGalleryAttributeId()
     }
 
     /**
+     * Retrieve product type by name.
+     *
      * @param string $name
      * @return Product\Type\AbstractType
      */
@@ -1076,6 +1154,17 @@ protected function _initSkus()
         return $this;
     }
 
+    /**
+     * Initialize image array keys.
+     *
+     * @return $this
+     */
+    private function initImagesArrayKeys()
+    {
+        $this->_imagesArrayKeys = $this->imageTypeProcessor->getImageTypes();
+        return $this;
+    }
+
     /**
      * Initialize product type models.
      *
@@ -1089,12 +1178,12 @@ protected function _initTypeModels()
             $params = [$this, $productTypeName];
             if (!($model = $this->_productTypeFactory->create($productTypeConfig['model'], ['params' => $params]))
             ) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('Entity type model \'%1\' is not found', $productTypeConfig['model'])
                 );
             }
             if (!$model instanceof \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __(
                         'Entity type model must be an instance of '
                         . \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::class
@@ -1125,8 +1214,10 @@ protected function _initErrorTemplates()
     }
 
     /**
-     * Set valid attribute set and product type to rows with all scopes
-     * to ensure that existing products doesn't changed.
+     * Set valid attribute set and product type to rows.
+     *
+     * Set valid attribute set and product type to rows with all
+     * scopes to ensure that existing products doesn't changed.
      *
      * @param array $rowData
      * @return array
@@ -1156,6 +1247,7 @@ protected function _prepareRowForDb(array $rowData)
 
     /**
      * Gather and save information about product links.
+     *
      * Must be called after ALL products saving done.
      *
      * @return $this
@@ -1298,20 +1390,15 @@ protected function _saveLinks()
      */
     protected function _saveProductAttributes(array $attributesData)
     {
+        $linkField = $this->getProductEntityLinkField();
         foreach ($attributesData as $tableName => $skuData) {
             $tableData = [];
             foreach ($skuData as $sku => $attributes) {
-                $linkId = $this->_connection->fetchOne(
-                    $this->_connection->select()
-                        ->from($this->getResource()->getTable('catalog_product_entity'))
-                        ->where('sku = ?', (string)$sku)
-                        ->columns($this->getProductEntityLinkField())
-                );
-
+                $linkId = $this->_oldSku[strtolower($sku)][$linkField];
                 foreach ($attributes as $attributeId => $storeValues) {
                     foreach ($storeValues as $storeId => $storeValue) {
                         $tableData[] = [
-                            $this->getProductEntityLinkField() => $linkId,
+                            $linkField => $linkId,
                             'attribute_id' => $attributeId,
                             'store_id' => $storeId,
                             'value' => $storeValue,
@@ -1321,6 +1408,7 @@ protected function _saveProductAttributes(array $attributesData)
             }
             $this->_connection->insertOnDuplicate($tableName, $tableData, ['value']);
         }
+
         return $this;
     }
 
@@ -1346,7 +1434,7 @@ protected function _saveProductCategories(array $categoriesData)
                 $delProductId[] = $productId;
 
                 foreach (array_keys($categories) as $categoryId) {
-                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 1];
+                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 0];
                 }
             }
             if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
@@ -1408,6 +1496,7 @@ public function saveProductEntity(array $entityRowsIn, array $entityRowsUp)
 
     /**
      * Return additional data, needed to select.
+     *
      * @return array
      */
     private function getOldSkuFieldsForSelect()
@@ -1417,6 +1506,7 @@ private function getOldSkuFieldsForSelect()
 
     /**
      * Adds newly created products to _oldSku
+     *
      * @param array $newProducts
      * @return void
      */
@@ -1454,8 +1544,10 @@ private function getNewSkuFieldsForSelect()
 
     /**
      * Init media gallery resources
+     *
      * @return void
      * @since 100.0.4
+     * @deprecated
      */
     protected function initMediaGalleryResources()
     {
@@ -1479,51 +1571,12 @@ protected function initMediaGalleryResources()
      */
     protected function getExistingImages($bunch)
     {
-        $result = [];
-        if ($this->getErrorAggregator()->hasToBeTerminated()) {
-            return $result;
-        }
-
-        $this->initMediaGalleryResources();
-        $productSKUs = array_map('strval', array_column($bunch, self::COL_SKU));
-        $select = $this->_connection->select()->from(
-            ['mg' => $this->mediaGalleryTableName],
-            ['value' => 'mg.value']
-        )->joinInner(
-            ['mgvte' => $this->mediaGalleryEntityToValueTableName],
-            '(mg.value_id = mgvte.value_id)',
-            [
-                $this->getProductEntityLinkField() => 'mgvte.' . $this->getProductEntityLinkField(),
-                'value_id' => 'mgvte.value_id'
-            ]
-        )->joinLeft(
-            ['mgv' => $this->mediaGalleryValueTableName],
-            sprintf(
-                '(mg.value_id = mgv.value_id AND mgv.%s = mgvte.%s AND mgv.store_id = %d)',
-                $this->getProductEntityLinkField(),
-                $this->getProductEntityLinkField(),
-                \Magento\Store\Model\Store::DEFAULT_STORE_ID
-            ),
-            [
-                'label' => 'mgv.label'
-            ]
-        )->joinInner(
-            ['pe' => $this->productEntityTableName],
-            "(mgvte.{$this->getProductEntityLinkField()} = pe.{$this->getProductEntityLinkField()})",
-            ['sku' => 'pe.sku']
-        )->where(
-            'pe.sku IN (?)',
-            $productSKUs
-        );
-
-        foreach ($this->_connection->fetchAll($select) as $image) {
-            $result[$image['sku']][$image['value']] = $image;
-        }
-
-        return $result;
+        return $this->mediaProcessor->getExistingImages($bunch);
     }
 
     /**
+     * Retrieve image from row.
+     *
      * @param array $rowData
      * @return array
      */
@@ -1561,6 +1614,7 @@ public function getImagesFromRow(array $rowData)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @throws LocalizedException
      */
     protected function _saveProducts()
     {
@@ -1578,6 +1632,7 @@ protected function _saveProducts()
             $tierPrices = [];
             $mediaGallery = [];
             $labelsForUpdate = [];
+            $imagesForChangeVisibility = [];
             $uploadedImages = [];
             $previousType = null;
             $prevAttributeSet = null;
@@ -1591,12 +1646,24 @@ protected function _saveProducts()
                     continue;
                 }
                 if ($this->getErrorAggregator()->hasToBeTerminated()) {
-                    $this->getErrorAggregator()->addRowToSkip($rowNum);
-                    continue;
+                    $validationStrategy = $this->_parameters[Import::FIELD_NAME_VALIDATION_STRATEGY];
+                    if (ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS !== $validationStrategy) {
+                        $this->getErrorAggregator()->addRowToSkip($rowNum);
+                        continue;
+                    }
                 }
                 $rowScope = $this->getRowScope($rowData);
 
-                $rowData[self::URL_KEY] = $this->getUrlKey($rowData);
+                $urlKey = $this->getUrlKey($rowData);
+                if (!empty($rowData[self::URL_KEY])) {
+                    // If url_key column and its value were in the CSV file
+                    $rowData[self::URL_KEY] = $urlKey;
+                } else if ($this->isNeedToChangeUrlKey($rowData)) {
+                    // If url_key column was empty or even not declared in the CSV file but by the rules it is need to
+                    // be setteed. In case when url_key is generating from name column we have to ensure that the bunch
+                    // of products will pass for the event with url_key column.
+                    $bunch[$rowNum][self::URL_KEY] = $rowData[self::URL_KEY] = $urlKey;
+                }
 
                 $rowSku = $rowData[self::COL_SKU];
 
@@ -1621,7 +1688,7 @@ protected function _saveProducts()
 
                         // wrong attribute_set_code was received
                         if (!$attributeSetId) {
-                            throw new \Magento\Framework\Exception\LocalizedException(
+                            throw new LocalizedException(
                                 __(
                                     'Wrong attribute set code "%1", please correct it and try again.',
                                     $rowData['attribute_set_code']
@@ -1666,6 +1733,14 @@ protected function _saveProducts()
                         $websiteId = $this->storeResolver->getWebsiteCodeToId($websiteCode);
                         $this->websitesCache[$rowSku][$websiteId] = true;
                     }
+                } else {
+                    $product = $this->retrieveProductBySku($rowSku);
+                    if ($product) {
+                        $websiteIds = $product->getWebsiteIds();
+                        foreach ($websiteIds as $websiteId) {
+                            $this->websitesCache[$rowSku][$websiteId] = true;
+                        }
+                    }
                 }
 
                 // 3. Categories phase
@@ -1697,13 +1772,24 @@ protected function _saveProducts()
                 }
 
                 // 5. Media gallery phase
-                $disabledImages = [];
                 list($rowImages, $rowLabels) = $this->getImagesFromRow($rowData);
-                if (isset($rowData['_media_is_disabled'])) {
-                    $disabledImages = array_flip(
-                        explode($this->getMultipleValueSeparator(), $rowData['_media_is_disabled'])
-                    );
+                $storeId = !empty($rowData[self::COL_STORE])
+                    ? $this->getStoreIdByCode($rowData[self::COL_STORE])
+                    : Store::DEFAULT_STORE_ID;
+                $imageHiddenStates = $this->getImagesHiddenStates($rowData);
+                foreach (array_keys($imageHiddenStates) as $image) {
+                    if (array_key_exists($rowSku, $existingImages)
+                        && array_key_exists($image, $existingImages[$rowSku])
+                    ) {
+                        $rowImages[self::COL_MEDIA_IMAGE][] = $image;
+                        $uploadedImages[$image] = $image;
+                    }
+
+                    if (empty($rowImages)) {
+                        $rowImages[self::COL_MEDIA_IMAGE][] = $image;
+                    }
                 }
+
                 $rowData[self::COL_MEDIA_IMAGE] = [];
 
                 /*
@@ -1714,11 +1800,12 @@ protected function _saveProducts()
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
                         if (!isset($uploadedImages[$columnImage])) {
-                            $uploadedFile = $this->uploadMediaFiles($columnImage, true);
+                            $uploadedFile = $this->uploadMediaFiles($columnImage);
                             $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
                             if ($uploadedFile) {
                                 $uploadedImages[$columnImage] = $uploadedFile;
                             } else {
+                                unset($rowData[$column]);
                                 $this->addRowError(
                                     ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
                                     $rowNum,
@@ -1735,28 +1822,39 @@ protected function _saveProducts()
                             $rowData[$column] = $uploadedFile;
                         }
 
-                        if ($uploadedFile && !isset($mediaGallery[$rowSku][$uploadedFile])) {
+                        if ($uploadedFile && !isset($mediaGallery[$storeId][$rowSku][$uploadedFile])) {
                             if (isset($existingImages[$rowSku][$uploadedFile])) {
+                                $currentFileData = $existingImages[$rowSku][$uploadedFile];
                                 if (isset($rowLabels[$column][$columnImageKey])
                                     && $rowLabels[$column][$columnImageKey] !=
-                                    $existingImages[$rowSku][$uploadedFile]['label']
+                                    $currentFileData['label']
                                 ) {
                                     $labelsForUpdate[] = [
                                         'label' => $rowLabels[$column][$columnImageKey],
-                                        'imageData' => $existingImages[$rowSku][$uploadedFile]
+                                        'imageData' => $currentFileData
+                                    ];
+                                }
+
+                                if (array_key_exists($uploadedFile, $imageHiddenStates)
+                                    && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
+                                ) {
+                                    $imagesForChangeVisibility[] = [
+                                        'disabled' => $imageHiddenStates[$uploadedFile],
+                                        'imageData' => $currentFileData
                                     ];
                                 }
                             } else {
                                 if ($column == self::COL_MEDIA_IMAGE) {
                                     $rowData[$column][] = $uploadedFile;
                                 }
-                                $mediaGallery[$rowSku][$uploadedFile] = [
+                                $mediaGallery[$storeId][$rowSku][$uploadedFile] = [
                                     'attribute_id' => $this->getMediaGalleryAttributeId(),
                                     'label' => isset($rowLabels[$column][$columnImageKey])
                                         ? $rowLabels[$column][$columnImageKey]
                                         : '',
                                     'position' => ++$position,
-                                    'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
+                                    'disabled' => isset($imageHiddenStates[$columnImage])
+                                        ? $imageHiddenStates[$columnImage] : '0',
                                     'value' => $uploadedFile,
                                 ];
                             }
@@ -1826,7 +1924,7 @@ protected function _saveProducts()
                     ) {
                         $attrValue = $this->dateTime->formatDate($attrValue, false);
                     } elseif ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
-                        $attrValue = $this->dateTime->gmDate(
+                        $attrValue = gmdate(
                             'Y-m-d H:i:s',
                             $this->_localeDate->date($attrValue)->getTimestamp()
                         );
@@ -1876,6 +1974,8 @@ protected function _saveProducts()
                 $mediaGallery
             )->_saveProductAttributes(
                 $attributes
+            )->updateMediaGalleryVisibility(
+                $imagesForChangeVisibility
             )->updateMediaGalleryLabels(
                 $labelsForUpdate
             );
@@ -1890,6 +1990,34 @@ protected function _saveProducts()
     }
 
     /**
+     * Prepare array with image states (visible or hidden from product page)
+     *
+     * @param array $rowData
+     * @return array
+     */
+    private function getImagesHiddenStates($rowData)
+    {
+        $statesArray = [];
+        $mappingArray = [
+            '_media_is_disabled' => '1'
+        ];
+
+        foreach ($mappingArray as $key => $value) {
+            if (isset($rowData[$key]) && strlen(trim($rowData[$key]))) {
+                $items = explode($this->getMultipleValueSeparator(), $rowData[$key]);
+
+                foreach ($items as $item) {
+                    $statesArray[$item] = $value;
+                }
+            }
+        }
+
+        return $statesArray;
+    }
+
+    /**
+     * Resolve valid category ids from provided row data.
+     *
      * @param array $rowData
      * @return array
      */
@@ -1912,11 +2040,18 @@ protected function processRowCategories($rowData)
                     . ' ' . $error['exception']->getMessage()
                 );
             }
+        } else {
+            $product = $this->retrieveProductBySku($rowData['sku']);
+            if ($product) {
+                $categoryIds = $product->getCategoryIds();
+            }
         }
         return $categoryIds;
     }
 
     /**
+     * Get product websites.
+     *
      * @param string $productSku
      * @return array
      */
@@ -1926,6 +2061,8 @@ public function getProductWebsites($productSku)
     }
 
     /**
+     * Retrieve product categories.
+     *
      * @param string $productSku
      * @return array
      */
@@ -1935,6 +2072,8 @@ public function getProductCategories($productSku)
     }
 
     /**
+     * Get store id by code.
+     *
      * @param string $storeCode
      * @return array|int|null|string
      */
@@ -2008,7 +2147,7 @@ protected function _getUploader()
             }
 
             if (!$this->_fileUploader->setTmpDir($tmpPath)) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('File directory \'%1\' is not readable.', $tmpPath)
                 );
             }
@@ -2017,7 +2156,7 @@ protected function _getUploader()
 
             $this->_mediaDirectory->create($destinationPath);
             if (!$this->_fileUploader->setDestDir($destinationPath)) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('File directory \'%1\' is not writable.', $destinationPath)
                 );
             }
@@ -2026,6 +2165,8 @@ protected function _getUploader()
     }
 
     /**
+     * Retrieve uploader.
+     *
      * @return Uploader
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -2036,9 +2177,12 @@ public function getUploader()
 
     /**
      * Uploading files into the "catalog/product" media folder.
+     *
      * Return a new file name if the same file is already exists.
      *
      * @param string $fileName
+     * @param bool $renameFileOff [optional] boolean to pass.
+     * Default is false which will set not to rename the file after import.
      * @return string
      */
     protected function uploadMediaFiles($fileName, $renameFileOff = false)
@@ -2047,6 +2191,7 @@ protected function uploadMediaFiles($fileName, $renameFileOff = false)
             $res = $this->_getUploader()->move($fileName, $renameFileOff);
             return $res['file'];
         } catch (\Exception $e) {
+            $this->_logger->critical($e);
             return '';
         }
     }
@@ -2071,95 +2216,14 @@ private function getSystemFile($fileName)
      *
      * @param array $mediaGalleryData
      * @return $this
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _saveMediaGallery(array $mediaGalleryData)
     {
         if (empty($mediaGalleryData)) {
             return $this;
         }
-        $this->initMediaGalleryResources();
-        $productIds = [];
-        $imageNames = [];
-        $multiInsertData = [];
-        $valueToProductId = [];
-        foreach ($mediaGalleryData as $productSku => $mediaGalleryRows) {
-            $productId = $this->skuProcessor->getNewSku($productSku)[$this->getProductEntityLinkField()];
-            $productIds[] = $productId;
-            $insertedGalleryImgs = [];
-            foreach ($mediaGalleryRows as $insertValue) {
-                if (!in_array($insertValue['value'], $insertedGalleryImgs)) {
-                    $valueArr = [
-                        'attribute_id' => $insertValue['attribute_id'],
-                        'value' => $insertValue['value'],
-                    ];
-                    $valueToProductId[$insertValue['value']][] = $productId;
-                    $imageNames[] = $insertValue['value'];
-                    $multiInsertData[] = $valueArr;
-                    $insertedGalleryImgs[] = $insertValue['value'];
-                }
-            }
-        }
-        $oldMediaValues = $this->_connection->fetchAssoc(
-            $this->_connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
-                ->where('value IN (?)', $imageNames)
-        );
-        $this->_connection->insertOnDuplicate($this->mediaGalleryTableName, $multiInsertData, []);
-        $multiInsertData = [];
-        $newMediaSelect = $this->_connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
-            ->where('value IN (?)', $imageNames);
-        if (array_keys($oldMediaValues)) {
-            $newMediaSelect->where('value_id NOT IN (?)', array_keys($oldMediaValues));
-        }
-
-        $dataForSkinnyTable = [];
-        $newMediaValues = $this->_connection->fetchAssoc($newMediaSelect);
-        foreach ($mediaGalleryData as $productSku => $mediaGalleryRows) {
-            foreach ($mediaGalleryRows as $insertValue) {
-                foreach ($newMediaValues as $value_id => $values) {
-                    if ($values['value'] == $insertValue['value']) {
-                        $insertValue['value_id'] = $value_id;
-                        $insertValue[$this->getProductEntityLinkField()]
-                            = array_shift($valueToProductId[$values['value']]);
-                        unset($newMediaValues[$value_id]);
-                        break;
-                    }
-                }
-                if (isset($insertValue['value_id'])) {
-                    $valueArr = [
-                        'value_id' => $insertValue['value_id'],
-                        'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
-                        $this->getProductEntityLinkField() => $insertValue[$this->getProductEntityLinkField()],
-                        'label' => $insertValue['label'],
-                        'position' => $insertValue['position'],
-                        'disabled' => $insertValue['disabled'],
-                    ];
-                    $multiInsertData[] = $valueArr;
-                    $dataForSkinnyTable[] = [
-                        'value_id' => $insertValue['value_id'],
-                        $this->getProductEntityLinkField() => $insertValue[$this->getProductEntityLinkField()],
-                    ];
-                }
-            }
-        }
-        try {
-            $this->_connection->insertOnDuplicate(
-                $this->mediaGalleryValueTableName,
-                $multiInsertData,
-                ['value_id', 'store_id', $this->getProductEntityLinkField(), 'label', 'position', 'disabled']
-            );
-            $this->_connection->insertOnDuplicate(
-                $this->mediaGalleryEntityToValueTableName,
-                $dataForSkinnyTable,
-                ['value_id']
-            );
-        } catch (\Exception $e) {
-            $this->_connection->delete(
-                $this->mediaGalleryTableName,
-                $this->_connection->quoteInto('value_id IN (?)', $newMediaValues)
-            );
-        }
+        $this->mediaProcessor->saveMediaGallery($mediaGalleryData);
+
         return $this;
     }
 
@@ -2208,9 +2272,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 = [];
@@ -2223,39 +2284,8 @@ protected function _saveStockItem()
                 $row = [];
                 $sku = $rowData[self::COL_SKU];
                 if ($this->skuProcessor->getNewSku($sku) !== null) {
-                    $row['product_id'] = $this->skuProcessor->getNewSku($sku)['entity_id'];
+                    $row = $this->formatStockDataForRow($rowData);
                     $productIdsToReindex[] = $row['product_id'];
-
-                    $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();
-                    $row['stock_id'] = $this->stockRegistry->getStock($row['website_id'])->getStockId();
-
-                    $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);
-                    $existStockData = $stockItemDo->getData();
-
-                    $row = array_merge(
-                        $this->defaultStockData,
-                        array_intersect_key($existStockData, $this->defaultStockData),
-                        array_intersect_key($rowData, $this->defaultStockData),
-                        $row
-                    );
-
-                    if ($this->stockConfiguration->isQty(
-                        $this->skuProcessor->getNewSku($sku)['type_id']
-                    )
-                    ) {
-                        $stockItemDo->setData($row);
-                        $row['is_in_stock'] = $this->stockStateProvider->verifyStock($stockItemDo);
-                        if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
-                            $row['low_stock_date'] = $this->dateTime->gmDate(
-                                'Y-m-d H:i:s',
-                                (new \DateTime())->getTimestamp()
-                            );
-                        }
-                        $row['stock_status_changed_auto'] =
-                            (int)!$this->stockStateProvider->verifyStock($stockItemDo);
-                    } else {
-                        $row['qty'] = 0;
-                    }
                 }
 
                 if (!isset($stockData[$sku])) {
@@ -2265,7 +2295,7 @@ protected function _saveStockItem()
 
             // Insert rows
             if (!empty($stockData)) {
-                $this->_connection->insertOnDuplicate($entityTable, array_values($stockData));
+                $this->stockItemImporter->import($stockData);
             }
 
             $this->reindexProducts($productIdsToReindex);
@@ -2342,7 +2372,7 @@ public function getEntityTypeCode()
      * Returns array of new products data with SKU as key. All SKU keys are in lowercase for avoiding creation of
      * new products with the same SKU in different letter cases.
      *
-     * @var string $sku
+     * @param string $sku
      * @return array
      */
     public function getNewSku($sku = null)
@@ -2531,10 +2561,26 @@ public function validateRow(array $rowData, $rowNum)
                 }
             }
         }
+
+        if (!empty($rowData[self::COL_NEW_FROM_DATE]) && !empty($rowData[self::COL_NEW_TO_DATE])
+        ) {
+            $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_FROM_DATE], false));
+            $newToTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_TO_DATE], false));
+            if ($newFromTimestamp > $newToTimestamp) {
+                $this->addRowError(
+                    ValidatorInterface::ERROR_NEW_TO_DATE,
+                    $rowNum,
+                    $rowData[self::COL_NEW_TO_DATE]
+                );
+            }
+        }
+
         return !$this->getErrorAggregator()->isRowInvalid($rowNum);
     }
 
     /**
+     * Check if need to validate url key.
+     *
      * @param array $rowData
      * @return bool
      */
@@ -2716,7 +2762,10 @@ private function _setStockUseConfigFieldsValues($rowData)
     {
         $useConfigFields = [];
         foreach ($rowData as $key => $value) {
-            $useConfigName = self::INVENTORY_USE_CONFIG_PREFIX . $key;
+            $useConfigName = $key === StockItemInterface::ENABLE_QTY_INCREMENTS
+                ? StockItemInterface::USE_CONFIG_ENABLE_QTY_INC
+                : self::INVENTORY_USE_CONFIG_PREFIX . $key;
+
             if (isset($this->defaultStockData[$key])
                 && isset($this->defaultStockData[$useConfigName])
                 && !empty($value)
@@ -2762,7 +2811,7 @@ private function _customFieldsMapping($rowData)
     /**
      * Validate data rows and save bunches to DB
      *
-     * @return $this
+     * @return $this|AbstractEntity
      */
     protected function _saveValidatedBunches()
     {
@@ -2813,7 +2862,12 @@ protected function checkUrlKeyDuplicates()
             );
             foreach ($urlKeyDuplicates as $entityData) {
                 $rowNum = $this->rowNumbers[$entityData['store_id']][$entityData['request_path']];
-                $this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum);
+                $message = sprintf(
+                    $this->retrieveMessageTemplate(ValidatorInterface::ERROR_DUPLICATE_URL_KEY),
+                    $entityData['request_path'],
+                    $entityData['sku']
+                );
+                $this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum, 'url_key', $message);
             }
         }
     }
@@ -2838,14 +2892,17 @@ protected function getProductUrlSuffix($storeId = null)
     }
 
     /**
+     * Retrieve url key from provided row data.
+     *
      * @param array $rowData
      * @return string
+     *
      * @since 100.0.3
      */
     protected function getUrlKey($rowData)
     {
         if (!empty($rowData[self::URL_KEY])) {
-            return strtolower($rowData[self::URL_KEY]);
+            return $this->productUrl->formatUrlKey($rowData[self::URL_KEY]);
         }
 
         if (!empty($rowData[self::COL_NAME])) {
@@ -2856,7 +2913,10 @@ protected function getUrlKey($rowData)
     }
 
     /**
+     * Retrieve resource.
+     *
      * @return Proxy\Product\ResourceModel
+     *
      * @since 100.0.3
      */
     protected function getResource()
@@ -2867,6 +2927,26 @@ protected function getResource()
         return $this->_resource;
     }
 
+    /**
+     * Whether a url key is needed to be change.
+     *
+     * @param array $rowData
+     * @return bool
+     */
+    private function isNeedToChangeUrlKey(array $rowData): bool
+    {
+        $urlKey = $this->getUrlKey($rowData);
+        $productExists = $this->isSkuExist($rowData[self::COL_SKU]);
+        $markedToEraseUrlKey = isset($rowData[self::URL_KEY]);
+        // The product isn't new and the url key index wasn't marked for change.
+        if (!$urlKey && $productExists && !$markedToEraseUrlKey) {
+            // Seems there is no need to change the url key
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Get product entity link field
      *
@@ -2905,42 +2985,24 @@ private function getProductIdentifierField()
      */
     private function updateMediaGalleryLabels(array $labels)
     {
-        if (empty($labels)) {
-            return;
+        if (!empty($labels)) {
+            $this->mediaProcessor->updateMediaGalleryLabels($labels);
         }
+    }
 
-        $insertData = [];
-        foreach ($labels as $label) {
-            $imageData = $label['imageData'];
-
-            if ($imageData['label'] === null) {
-                $insertData[] = [
-                    'label' => $label['label'],
-                    $this->getProductEntityLinkField() => $imageData[$this->getProductEntityLinkField()],
-                    'value_id' => $imageData['value_id'],
-                    'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
-                ];
-            } else {
-                $this->_connection->update(
-                    $this->mediaGalleryValueTableName,
-                    [
-                        'label' => $label['label']
-                    ],
-                    [
-                        $this->getProductEntityLinkField() . ' = ?' => $imageData[$this->getProductEntityLinkField()],
-                        'value_id = ?' => $imageData['value_id'],
-                        'store_id = ?' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
-                    ]
-                );
-            }
+    /**
+     * Update 'disabled' field for media gallery entity
+     *
+     * @param array $images
+     * @return $this
+     */
+    private function updateMediaGalleryVisibility(array $images)
+    {
+        if (!empty($images)) {
+            $this->mediaProcessor->updateMediaGalleryVisibility($images);
         }
 
-        if (!empty($insertData)) {
-            $this->_connection->insertMultiple(
-                $this->mediaGalleryValueTableName,
-                $insertData
-            );
-        }
+        return $this;
     }
 
     /**
@@ -2979,4 +3041,60 @@ private function getExistingSku($sku)
     {
         return $this->_oldSku[strtolower($sku)];
     }
+
+    /**
+     * Format row data to DB compatible values.
+     *
+     * @param array $rowData
+     * @return array
+     */
+    private function formatStockDataForRow(array $rowData): array
+    {
+        $sku = $rowData[self::COL_SKU];
+        $row['product_id'] = $this->skuProcessor->getNewSku($sku)['entity_id'];
+        $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();
+        $row['stock_id'] = $this->stockRegistry->getStock($row['website_id'])->getStockId();
+
+        $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);
+        $existStockData = $stockItemDo->getData();
+
+        $row = array_merge(
+            $this->defaultStockData,
+            array_intersect_key($existStockData, $this->defaultStockData),
+            array_intersect_key($rowData, $this->defaultStockData),
+            $row
+        );
+
+        if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
+            $stockItemDo->setData($row);
+            $row['is_in_stock'] = isset($row['is_in_stock']) && $stockItemDo->getBackorders()
+                ? $row['is_in_stock']
+                : $this->stockStateProvider->verifyStock($stockItemDo);
+            if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
+                $date = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+                $row['low_stock_date'] = $date->format(DateTime::DATETIME_PHP_FORMAT);
+            }
+            $row['stock_status_changed_auto'] = (int)!$this->stockStateProvider->verifyStock($stockItemDo);
+        } else {
+            $row['qty'] = 0;
+        }
+
+        return $row;
+    }
+
+    /**
+     * Retrieve product by sku.
+     *
+     * @param string $sku
+     * @return \Magento\Catalog\Api\Data\ProductInterface|null
+     */
+    private function retrieveProductBySku($sku)
+    {
+        try {
+            $product = $this->productRepository->get($sku);
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+        return $product;
+    }
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
index 788623d822e31..951989146e67e 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
@@ -66,6 +66,8 @@ public function __construct(
     }
 
     /**
+     * Initialize categories
+     *
      * @return $this
      */
     protected function initCategories()
@@ -75,6 +77,7 @@ protected function initCategories()
             $collection->addAttributeToSelect('name')
                 ->addAttributeToSelect('url_key')
                 ->addAttributeToSelect('url_path');
+            $collection->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
             /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
             foreach ($collection as $category) {
                 $structure = explode(self::DELIMITER_CATEGORY, $category->getPath());
@@ -103,7 +106,6 @@ protected function initCategories()
      *
      * @param string $name
      * @param int $parentId
-     *
      * @return int
      */
     protected function createCategory($name, $parentId)
@@ -121,7 +123,6 @@ protected function createCategory($name, $parentId)
         $category->setAttributeSetId($category->getDefaultAttributeSetId());
         $category->save();
         $this->categoriesCache[$category->getId()] = $category;
-
         return $category->getId();
     }
 
@@ -129,7 +130,6 @@ protected function createCategory($name, $parentId)
      * Returns ID of category by string path creating nonexistent ones.
      *
      * @param string $categoryPath
-     *
      * @return int
      */
     protected function upsertCategory($categoryPath)
@@ -160,7 +160,6 @@ protected function upsertCategory($categoryPath)
      *
      * @param string $categoriesString
      * @param string $categoriesSeparator
-     *
      * @return array
      */
     public function upsertCategories($categoriesString, $categoriesSeparator)
@@ -229,7 +228,7 @@ public function clearFailedCategories()
      */
     public function getCategoryById($categoryId)
     {
-        return isset($this->categoriesCache[$categoryId]) ? $this->categoriesCache[$categoryId] : null;
+        return $this->categoriesCache[$categoryId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/ImageTypeProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/ImageTypeProcessor.php
new file mode 100644
index 0000000000000..415d21d4cbce6
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/ImageTypeProcessor.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogImportExport\Model\Import\Product;
+
+use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel;
+
+class ImageTypeProcessor
+{
+    /**
+     * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory
+     */
+    private $resourceFactory;
+
+    /**
+     * @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
+     */
+    public function __construct(
+        \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
+    ) {
+        $this->resourceFactory = $resourceFactory;
+    }
+
+    /**
+     * @return array
+     */
+    public function getImageTypes()
+    {
+        $imageKeys = [];
+        /** @var ResourceModel $resource */
+        $resource = $this->resourceFactory->create();
+        $connection = $resource->getConnection();
+        $select = $connection->select();
+        $select->from(
+            $resource->getTable('eav_attribute'),
+            ['code' => 'attribute_code']
+        );
+        $select->where(
+            'frontend_input = :frontend_input'
+        );
+        $bind = [':frontend_input' => 'media_image'];
+
+        $imageKeys   = $connection->fetchCol($select, $bind);
+        $imageKeys[] = '_media_image';
+
+        return $imageKeys;
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
new file mode 100644
index 0000000000000..d43dc11a68fcf
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
@@ -0,0 +1,378 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogImportExport\Model\Import\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Store\Model\Store;
+
+/**
+ * Process and saves images during import.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MediaGalleryProcessor
+{
+    /**
+     * @var SkuProcessor
+     */
+    private $skuProcessor;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * DB connection.
+     *
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var ResourceModelFactory
+     */
+    private $resourceFactory;
+
+    /**
+     * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel
+     */
+    private $resourceModel;
+
+    /**
+     * @var ProcessingErrorAggregatorInterface
+     */
+    private $errorAggregator;
+
+    /**
+     * @var string
+     */
+    private $productEntityLinkField;
+
+    /**
+     * @var string
+     */
+    private $mediaGalleryTableName;
+
+    /**
+     * @var string
+     */
+    private $mediaGalleryValueTableName;
+
+    /**
+     * @var string
+     */
+    private $mediaGalleryEntityToValueTableName;
+
+    /**
+     * @var string
+     */
+    private $productEntityTableName;
+
+    /**
+     * MediaProcessor constructor.
+     *
+     * @param SkuProcessor $skuProcessor
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param ResourceModelFactory $resourceModelFactory
+     * @param ProcessingErrorAggregatorInterface $errorAggregator
+     */
+    public function __construct(
+        SkuProcessor $skuProcessor,
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        ResourceModelFactory $resourceModelFactory,
+        ProcessingErrorAggregatorInterface $errorAggregator
+    ) {
+        $this->skuProcessor = $skuProcessor;
+        $this->metadataPool = $metadataPool;
+        $this->connection = $resourceConnection->getConnection();
+        $this->resourceFactory = $resourceModelFactory;
+        $this->errorAggregator = $errorAggregator;
+    }
+
+    /**
+     * Save product media gallery.
+     *
+     * @param array $mediaGalleryData
+     * @return void
+     */
+    public function saveMediaGallery(array $mediaGalleryData)
+    {
+        $this->initMediaGalleryResources();
+        $mediaGalleryDataGlobal = array_replace_recursive(...$mediaGalleryData);
+        $imageNames = [];
+        $multiInsertData = [];
+        $valueToProductId = [];
+        foreach ($mediaGalleryDataGlobal as $productSku => $mediaGalleryRows) {
+            $productId = $this->skuProcessor->getNewSku($productSku)[$this->getProductEntityLinkField()];
+            $insertedGalleryImgs = [];
+            foreach ($mediaGalleryRows as $insertValue) {
+                if (!in_array($insertValue['value'], $insertedGalleryImgs)) {
+                    $valueArr = [
+                        'attribute_id' => $insertValue['attribute_id'],
+                        'value' => $insertValue['value'],
+                    ];
+                    $valueToProductId[$insertValue['value']][] = $productId;
+                    $imageNames[] = $insertValue['value'];
+                    $multiInsertData[] = $valueArr;
+                    $insertedGalleryImgs[] = $insertValue['value'];
+                }
+            }
+        }
+        $oldMediaValues = $this->connection->fetchAssoc(
+            $this->connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
+                ->where('value IN (?)', $imageNames)
+        );
+        $this->connection->insertOnDuplicate($this->mediaGalleryTableName, $multiInsertData);
+        $newMediaSelect = $this->connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
+            ->where('value IN (?)', $imageNames);
+        if (array_keys($oldMediaValues)) {
+            $newMediaSelect->where('value_id NOT IN (?)', array_keys($oldMediaValues));
+        }
+        $newMediaValues = $this->connection->fetchAssoc($newMediaSelect);
+        foreach ($mediaGalleryData as $storeId => $storeMediaGalleryData) {
+            $this->processMediaPerStore((int)$storeId, $storeMediaGalleryData, $newMediaValues, $valueToProductId);
+        }
+    }
+
+    /**
+     * Update media gallery labels.
+     *
+     * @param array $labels
+     * @return void
+     */
+    public function updateMediaGalleryLabels(array $labels)
+    {
+        $this->updateMediaGalleryField($labels, 'label');
+    }
+
+    /**
+     * Update 'disabled' field for media gallery entity
+     *
+     * @param array $images
+     * @return void
+     */
+    public function updateMediaGalleryVisibility(array $images)
+    {
+        $this->updateMediaGalleryField($images, 'disabled');
+    }
+
+    /**
+     * Update value for requested field in media gallery entities
+     *
+     * @param array $data
+     * @param string $field
+     * @return void
+     */
+    private function updateMediaGalleryField(array $data, $field)
+    {
+        $insertData = [];
+        foreach ($data as $datum) {
+            $imageData = $datum['imageData'];
+
+            if ($imageData[$field] === null) {
+                $insertData[] = [
+                    $field => $datum[$field],
+                    $this->getProductEntityLinkField() => $imageData[$this->getProductEntityLinkField()],
+                    'value_id' => $imageData['value_id'],
+                    'store_id' => Store::DEFAULT_STORE_ID,
+                ];
+            } else {
+                $this->connection->update(
+                    $this->mediaGalleryValueTableName,
+                    [
+                        $field => $datum[$field],
+                    ],
+                    [
+                        $this->getProductEntityLinkField() . ' = ?' => $imageData[$this->getProductEntityLinkField()],
+                        'value_id = ?' => $imageData['value_id'],
+                        'store_id = ?' => Store::DEFAULT_STORE_ID,
+                    ]
+                );
+            }
+        }
+
+        if (!empty($insertData)) {
+            $this->connection->insertMultiple(
+                $this->mediaGalleryValueTableName,
+                $insertData
+            );
+        }
+    }
+
+    /**
+     * Get existing images for current bunch.
+     *
+     * @param array $bunch
+     * @return array
+     */
+    public function getExistingImages(array $bunch)
+    {
+        $result = [];
+        if ($this->errorAggregator->hasToBeTerminated()) {
+            return $result;
+        }
+        $this->initMediaGalleryResources();
+        $productSKUs = array_map(
+            'strval',
+            array_column($bunch, Product::COL_SKU)
+        );
+        $select = $this->connection->select()->from(
+            ['mg' => $this->mediaGalleryTableName],
+            ['value' => 'mg.value']
+        )->joinInner(
+            ['mgvte' => $this->mediaGalleryEntityToValueTableName],
+            '(mg.value_id = mgvte.value_id)',
+            [
+                $this->getProductEntityLinkField() => 'mgvte.' . $this->getProductEntityLinkField(),
+                'value_id' => 'mgvte.value_id',
+            ]
+        )->joinLeft(
+            ['mgv' => $this->mediaGalleryValueTableName],
+            sprintf(
+                '(mg.value_id = mgv.value_id AND mgv.%s = mgvte.%s AND mgv.store_id = %d)',
+                $this->getProductEntityLinkField(),
+                $this->getProductEntityLinkField(),
+                Store::DEFAULT_STORE_ID
+            ),
+            [
+                'label' => 'mgv.label',
+                'disabled' => 'mgv.disabled',
+            ]
+        )->joinInner(
+            ['pe' => $this->productEntityTableName],
+            "(mgvte.{$this->getProductEntityLinkField()} = pe.{$this->getProductEntityLinkField()})",
+            ['sku' => 'pe.sku']
+        )->where(
+            'pe.sku IN (?)',
+            $productSKUs
+        );
+
+        foreach ($this->connection->fetchAll($select) as $image) {
+            $result[$image['sku']][$image['value']] = $image;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Init media gallery resources.
+     *
+     * @return void
+     */
+    private function initMediaGalleryResources()
+    {
+        if (null == $this->mediaGalleryTableName) {
+            $this->productEntityTableName = $this->getResource()->getTable('catalog_product_entity');
+            $this->mediaGalleryTableName = $this->getResource()->getTable('catalog_product_entity_media_gallery');
+            $this->mediaGalleryValueTableName = $this->getResource()->getTable(
+                'catalog_product_entity_media_gallery_value'
+            );
+            $this->mediaGalleryEntityToValueTableName = $this->getResource()->getTable(
+                'catalog_product_entity_media_gallery_value_to_entity'
+            );
+        }
+    }
+
+    /**
+     * Save media gallery data per store.
+     *
+     * @param int $storeId
+     * @param array $mediaGalleryData
+     * @param array $newMediaValues
+     * @param array $valueToProductId
+     * @return void
+     */
+    private function processMediaPerStore(
+        int $storeId,
+        array $mediaGalleryData,
+        array $newMediaValues,
+        array $valueToProductId
+    ) {
+        $multiInsertData = [];
+        $dataForSkinnyTable = [];
+        foreach ($mediaGalleryData as $mediaGalleryRows) {
+            foreach ($mediaGalleryRows as $insertValue) {
+                foreach ($newMediaValues as $value_id => $values) {
+                    if ($values['value'] == $insertValue['value']) {
+                        $insertValue['value_id'] = $value_id;
+                        $insertValue[$this->getProductEntityLinkField()]
+                            = array_shift($valueToProductId[$values['value']]);
+                        unset($newMediaValues[$value_id]);
+                        break;
+                    }
+                }
+                if (isset($insertValue['value_id'])) {
+                    $valueArr = [
+                        'value_id' => $insertValue['value_id'],
+                        'store_id' => $storeId,
+                        $this->getProductEntityLinkField() => $insertValue[$this->getProductEntityLinkField()],
+                        'label' => $insertValue['label'],
+                        'position' => $insertValue['position'],
+                        'disabled' => $insertValue['disabled'],
+                    ];
+                    $multiInsertData[] = $valueArr;
+                    $dataForSkinnyTable[] = [
+                        'value_id' => $insertValue['value_id'],
+                        $this->getProductEntityLinkField() => $insertValue[$this->getProductEntityLinkField()],
+                    ];
+                }
+            }
+        }
+        try {
+            $this->connection->insertOnDuplicate(
+                $this->mediaGalleryValueTableName,
+                $multiInsertData,
+                ['value_id', 'store_id', $this->getProductEntityLinkField(), 'label', 'position', 'disabled']
+            );
+            $this->connection->insertOnDuplicate(
+                $this->mediaGalleryEntityToValueTableName,
+                $dataForSkinnyTable,
+                ['value_id']
+            );
+        } catch (\Exception $e) {
+            $this->connection->delete(
+                $this->mediaGalleryTableName,
+                $this->connection->quoteInto('value_id IN (?)', $newMediaValues)
+            );
+        }
+    }
+
+    /**
+     * Get product entity link field.
+     *
+     * @return string
+     */
+    private function getProductEntityLinkField()
+    {
+        if (!$this->productEntityLinkField) {
+            $this->productEntityLinkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        }
+
+        return $this->productEntityLinkField;
+    }
+
+    /**
+     * Get resource.
+     *
+     * @return \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel
+     */
+    private function getResource()
+    {
+        if (!$this->resourceModel) {
+            $this->resourceModel = $this->resourceFactory->create();
+        }
+
+        return $this->resourceModel;
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 2a5b009733d36..fa2853c738624 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -12,6 +12,8 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection as ProductOptionValueCollection;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory as ProductOptionValueCollectionFactory;
+use Magento\Store\Model\Store;
+use Magento\ImportExport\Model\Import;
 
 /**
  * Entity class which provide possibility to import product custom options
@@ -331,6 +333,11 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $optionTypeTitles;
 
+    /**
+     * @var array
+     */
+    private $lastOptionTitle;
+
     /**
      * @param \Magento\ImportExport\Model\ResourceModel\Import\Data $importData
      * @param ResourceConnection $resource
@@ -495,7 +502,7 @@ protected function _initStores(array $data)
         if (isset($data['stores'])) {
             $this->_storeCodeToId = $data['stores'];
         } else {
-            /** @var $store \Magento\Store\Model\Store */
+            /** @var $store Store */
             foreach ($this->_storeManager->getStores(true) as $store) {
                 $this->_storeCodeToId[$store->getCode()] = $store->getId();
             }
@@ -759,7 +766,9 @@ protected function _findExistingOptionId(array $newOptionData, array $newOptionT
             ksort($newOptionTitles);
             $existingOptions = $this->_oldCustomOptions[$productId];
             foreach ($existingOptions as $optionId => $optionData) {
-                if ($optionData['type'] == $newOptionData['type'] && $optionData['titles'] == $newOptionTitles) {
+                if ($optionData['type'] == $newOptionData['type']
+                    && $optionData['titles'][Store::DEFAULT_STORE_ID] == $newOptionTitles[Store::DEFAULT_STORE_ID]
+                ) {
                     return $optionId;
                 }
             }
@@ -854,7 +863,7 @@ protected function _saveNewOptionData(array $rowData, $rowNumber)
             $storeCode = $rowData[self::COLUMN_STORE];
             $storeId = $this->_storeCodeToId[$storeCode];
         } else {
-            $storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
+            $storeId = Store::DEFAULT_STORE_ID;
         }
         if (isset($this->_productsSkuToId[$this->_rowProductSku])) {
             // save in existing data array
@@ -1087,7 +1096,7 @@ protected function _getMultiRowFormat($rowData)
         // Parse custom options.
         $rowData = $this->_parseCustomOptions($rowData);
         $multiRow = [];
-        if (empty($rowData['custom_options'])) {
+        if (empty($rowData['custom_options']) || !is_array($rowData['custom_options'])) {
             return $multiRow;
         }
 
@@ -1113,6 +1122,8 @@ protected function _getMultiRowFormat($rowData)
     }
 
     /**
+     * Process option row.
+     *
      * @param string $name
      * @param array $optionRow
      * @return array
@@ -1121,17 +1132,44 @@ private function processOptionRow($name, $optionRow)
     {
         $result = [
             self::COLUMN_TYPE => $name ? $optionRow['type'] : '',
-            self::COLUMN_IS_REQUIRED => $optionRow['required'],
-            self::COLUMN_ROW_SKU => $optionRow['sku'],
-            self::COLUMN_PREFIX . 'sku' => $optionRow['sku'],
             self::COLUMN_ROW_TITLE => '',
             self::COLUMN_ROW_PRICE => ''
         ];
 
+        $result = $this->addPriceData($result, $optionRow);
+
+        if (isset($optionRow['_custom_option_store'])) {
+            $result[self::COLUMN_STORE] = $optionRow['_custom_option_store'];
+        }
+        if (isset($optionRow['required'])) {
+            $result[self::COLUMN_IS_REQUIRED] = $optionRow['required'];
+        }
+        if (isset($optionRow['sku'])) {
+            $result[self::COLUMN_ROW_SKU] = $optionRow['sku'];
+            $result[self::COLUMN_PREFIX . 'sku'] = $optionRow['sku'];
+        }
         if (isset($optionRow['option_title'])) {
             $result[self::COLUMN_ROW_TITLE] = $optionRow['option_title'];
         }
 
+        if (isset($optionRow['max_characters'])) {
+            $result[$this->columnMaxCharacters] = $optionRow['max_characters'];
+        }
+
+        $result = $this->addFileOptions($result, $optionRow);
+
+        return $result;
+    }
+
+    /**
+     * Adds price data.
+     *
+     * @param array $result
+     * @param array $optionRow
+     * @return array
+     */
+    private function addPriceData(array $result, array $optionRow): array
+    {
         if (isset($optionRow['price'])) {
             $percent_suffix = '';
             if (isset($optionRow['price_type']) && $optionRow['price_type'] == 'percent') {
@@ -1142,12 +1180,6 @@ private function processOptionRow($name, $optionRow)
 
         $result[self::COLUMN_PREFIX . 'price'] = $result[self::COLUMN_ROW_PRICE];
 
-        if (isset($optionRow['max_characters'])) {
-            $result[$this->columnMaxCharacters] = $optionRow['max_characters'];
-        }
-
-        $result = $this->addFileOptions($result, $optionRow);
-
         return $result;
     }
 
@@ -1172,7 +1204,9 @@ private function addFileOptions($result, $optionRow)
     }
 
     /**
-     * Import data rows
+     * Import data rows.
+     *
+     * Additional store view data (option titles) will be sought in store view specified import file rows
      *
      * @return boolean
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -1180,13 +1214,13 @@ private function addFileOptions($result, $optionRow)
     protected function _importData()
     {
         $this->_initProductsSku();
-
         $nextOptionId = $this->_resourceHelper->getNextAutoincrement($this->_tables['catalog_product_option']);
         $nextValueId = $this->_resourceHelper->getNextAutoincrement(
             $this->_tables['catalog_product_option_type_value']
         );
         $prevOptionId = 0;
-
+        $optionId = null;
+        $valueId = null;
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $products = [];
             $options = [];
@@ -1197,23 +1231,38 @@ protected function _importData()
             $typeTitles = [];
             $parentCount = [];
             $childCount = [];
-
+            $optionsToRemove = [];
             foreach ($bunch as $rowNumber => $rowData) {
+                if (isset($optionId, $valueId) && empty($rowData[PRODUCT::COL_STORE_VIEW_CODE])) {
+                    $nextOptionId = $optionId;
+                    $nextValueId = $valueId;
+                }
+                $optionId = $nextOptionId;
+                $valueId = $nextValueId;
                 $multiRowData = $this->_getMultiRowFormat($rowData);
-
+                if (!empty($rowData[self::COLUMN_SKU]) && isset($this->_productsSkuToId[$rowData[self::COLUMN_SKU]])) {
+                    $this->_rowProductId = $this->_productsSkuToId[$rowData[self::COLUMN_SKU]];
+                    if (array_key_exists('custom_options', $rowData)
+                        && (
+                            trim($rowData['custom_options']) === '' ||
+                            trim($rowData['custom_options']) === $this->_productEntity->getEmptyAttributeValueConstant()
+                        )
+                    ) {
+                        $optionsToRemove[] = $this->_rowProductId;
+                    }
+                }
                 foreach ($multiRowData as $optionData) {
                     $combinedData = array_merge($rowData, $optionData);
 
-                    if (!$this->isRowAllowedToImport($combinedData, $rowNumber)) {
-                        continue;
-                    }
-                    if (!$this->_parseRequiredData($combinedData)) {
+                    if (!$this->isRowAllowedToImport($combinedData, $rowNumber)
+                        || !$this->_parseRequiredData($combinedData)
+                    ) {
                         continue;
                     }
                     $optionData = $this->_collectOptionMainData(
                         $combinedData,
                         $prevOptionId,
-                        $nextOptionId,
+                        $optionId,
                         $products,
                         $prices
                     );
@@ -1223,47 +1272,121 @@ protected function _importData()
                     $this->_collectOptionTypeData(
                         $combinedData,
                         $prevOptionId,
-                        $nextValueId,
+                        $valueId,
                         $typeValues,
                         $typePrices,
                         $typeTitles,
                         $parentCount,
                         $childCount
                     );
+
                     $this->_collectOptionTitle($combinedData, $prevOptionId, $titles);
+                    $this->checkOptionTitles(
+                        $options,
+                        $titles,
+                        $combinedData,
+                        $prevOptionId,
+                        $optionId,
+                        $products,
+                        $prices
+                    );
                 }
             }
+            $this->removeExistingOptions($products, $optionsToRemove);
+            $types = [
+                'values' => $typeValues,
+                'prices' => $typePrices,
+                'titles' => $typeTitles,
+            ];
+            $this->setLastOptionTitle($titles);
+            //Save prepared custom options data.
+            $this->savePreparedCustomOptions(
+                $products,
+                $options,
+                $titles,
+                $prices,
+                $types
+            );
+        }
+        return true;
+    }
 
-            // Save prepared custom options data !!!
-            if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
-                $this->_deleteEntities(array_keys($products));
+    /**
+     * Check options titles.
+     *
+     * If products were split up between bunches,
+     * this function will add needed option for option titles
+     *
+     * @param array $options
+     * @param array $titles
+     * @param array $combinedData
+     * @param int $prevOptionId
+     * @param int $optionId
+     * @param array $products
+     * @param array $prices
+     * @return void
+     */
+    private function checkOptionTitles(
+        array &$options,
+        array &$titles,
+        array $combinedData,
+        int &$prevOptionId,
+        int &$optionId,
+        array $products,
+        array $prices
+    ) : void {
+        $titlesCount = count($titles);
+        if ($titlesCount > 0 && count($options) !== $titlesCount) {
+            $combinedData[Product::COL_STORE_VIEW_CODE] = '';
+            $optionId--;
+            $option = $this->_collectOptionMainData(
+                $combinedData,
+                $prevOptionId,
+                $optionId,
+                $products,
+                $prices
+            );
+            if ($option) {
+                $options[] = $option;
             }
+        }
+    }
 
-            if ($this->_isReadyForSaving($options, $titles, $typeValues)) {
-                if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
-                    $this->_compareOptionsWithExisting($options, $titles, $prices, $typeValues);
-                    $this->restoreOriginalOptionTypeIds($typeValues, $typePrices, $typeTitles);
-                }
-
-                $this->_saveOptions(
-                    $options
-                )->_saveTitles(
-                    $titles
-                )->_savePrices(
-                    $prices
-                )->_saveSpecificTypeValues(
-                    $typeValues
-                )->_saveSpecificTypePrices(
-                    $typePrices
-                )->_saveSpecificTypeTitles(
-                    $typeTitles
-                )->_updateProducts(
-                    $products
-                );
-            }
+    /**
+     * Setting last Custom Option Title
+     * to use it later in _collectOptionTitle
+     * to set correct title for default store view
+     *
+     * @param array $titles
+     */
+    private function setLastOptionTitle(array &$titles) : void
+    {
+        if (count($titles) > 0) {
+            end($titles);
+            $key = key($titles);
+            $this->lastOptionTitle[$key] = $titles[$key];
         }
+    }
 
-        return true;
+    /**
+     * Remove existing options.
+     *
+     * Remove all existing options if import behaviour is APPEND
+     * in other case remove options for products with empty "custom_options" row only.
+     *
+     * @param array $products
+     * @param array $optionsToRemove
+     *
+     * @return void
+     */
+    private function removeExistingOptions(array $products, array $optionsToRemove): void
+    {
+        if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+            $this->_deleteEntities(array_keys($products));
+        } elseif (!empty($optionsToRemove)) {
+            // Remove options for products with empty "custom_options" row
+            $this->_deleteEntities($optionsToRemove);
+        }
     }
 
     /**
@@ -1306,7 +1429,9 @@ protected function _collectOptionMainData(
         $optionData = null;
 
         if ($this->_rowIsMain) {
-            $optionData = $this->_getOptionData($rowData, $this->_rowProductId, $nextOptionId, $this->_rowType);
+            $optionData = empty($rowData[Product::COL_STORE_VIEW_CODE])
+                ? $this->_getOptionData($rowData, $this->_rowProductId, $nextOptionId, $this->_rowType)
+                : '';
 
             if (!$this->_isRowHasSpecificType($this->_rowType)
                 && ($priceData = $this->_getPriceData($rowData, $nextOptionId, $this->_rowType))
@@ -1337,6 +1462,7 @@ protected function _collectOptionMainData(
      * @param array &$childCount
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _collectOptionTypeData(
         array $rowData,
@@ -1355,43 +1481,28 @@ protected function _collectOptionTypeData(
                 $typeValues[$prevOptionId][] = $specificTypeData['value'];
 
                 // ensure default title is set
-                if (!isset($typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID])) {
-                    $typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] =
-                        $specificTypeData['title'];
+                if (!isset($typeTitles[$nextValueId][Store::DEFAULT_STORE_ID])) {
+                    $typeTitles[$nextValueId][Store::DEFAULT_STORE_ID] = $specificTypeData['title'];
                 }
 
                 if ($specificTypeData['price']) {
                     if ($this->_isPriceGlobal) {
-                        $typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] =
-                            $specificTypeData['price'];
+                        $typePrices[$nextValueId][Store::DEFAULT_STORE_ID] = $specificTypeData['price'];
                     } else {
                         // ensure default price is set
-                        if (!isset($typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID])) {
-                            $typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] =
-                                $specificTypeData['price'];
+                        if (!isset($typePrices[$nextValueId][Store::DEFAULT_STORE_ID])) {
+                            $typePrices[$nextValueId][Store::DEFAULT_STORE_ID] = $specificTypeData['price'];
                         }
                         $typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
                     }
                 }
 
                 $nextValueId++;
-                if (isset($parentCount[$prevOptionId])) {
-                    $parentCount[$prevOptionId]++;
-                } else {
-                    $parentCount[$prevOptionId] = 1;
-                }
-            }
-
-            if (!isset($childCount[$this->_rowStoreId][$prevOptionId])) {
-                $childCount[$this->_rowStoreId][$prevOptionId] = 0;
             }
-            $parentValueId = $nextValueId - $parentCount[$prevOptionId]
-                + $childCount[$this->_rowStoreId][$prevOptionId];
-            $specificTypeData = $this->_getSpecificTypeData($rowData, $parentValueId, false);
+            $specificTypeData = $this->_getSpecificTypeData($rowData, 0, false);
             //For others stores
             if ($specificTypeData) {
-                $typeTitles[$parentValueId][$this->_rowStoreId] = $specificTypeData['title'];
-                $childCount[$this->_rowStoreId][$prevOptionId]++;
+                $typeTitles[$nextValueId++][$this->_rowStoreId] = $specificTypeData['title'];
             }
         }
     }
@@ -1406,11 +1517,15 @@ protected function _collectOptionTypeData(
      */
     protected function _collectOptionTitle(array $rowData, $prevOptionId, array &$titles)
     {
-        $defaultStoreId = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
+        $defaultStoreId = Store::DEFAULT_STORE_ID;
         if (!empty($rowData[self::COLUMN_TITLE])) {
             if (!isset($titles[$prevOptionId][$defaultStoreId])) {
-                // ensure default title is set
-                $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
+                if (isset($this->lastOptionTitle[$prevOptionId])) {
+                     $titles[$prevOptionId] = $this->lastOptionTitle[$prevOptionId];
+                     unset($this->lastOptionTitle);
+                } else {
+                    $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
+                }
             }
             $titles[$prevOptionId][$this->_rowStoreId] = $rowData[self::COLUMN_TITLE];
         }
@@ -1509,6 +1624,8 @@ private function getExistingOptionTypeId($optionId, $storeId, $optionTypeTitle)
     }
 
     /**
+     * Rarse required data.
+     *
      * Parse required data from current row and store to class internal variables some data
      * for underlying dependent rows
      *
@@ -1517,9 +1634,7 @@ private function getExistingOptionTypeId($optionId, $storeId, $optionTypeTitle)
      */
     protected function _parseRequiredData(array $rowData)
     {
-        if ($rowData[self::COLUMN_SKU] != '' && isset($this->_productsSkuToId[$rowData[self::COLUMN_SKU]])) {
-            $this->_rowProductId = $this->_productsSkuToId[$rowData[self::COLUMN_SKU]];
-        } elseif (!isset($this->_rowProductId)) {
+        if ($this->_rowProductId === null) {
             return false;
         }
 
@@ -1530,7 +1645,7 @@ protected function _parseRequiredData(array $rowData)
             }
             $this->_rowStoreId = $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
         } else {
-            $this->_rowStoreId = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
+            $this->_rowStoreId = Store::DEFAULT_STORE_ID;
         }
         // Init option type and set param which tell that row is main
         if (!empty($rowData[self::COLUMN_TYPE])) {
@@ -1644,7 +1759,7 @@ protected function _getPriceData(array $rowData, $optionId, $type)
         ) {
             $priceData = [
                 'option_id' => $optionId,
-                'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                'store_id' => Store::DEFAULT_STORE_ID,
                 'price_type' => 'fixed',
             ];
 
@@ -1679,7 +1794,8 @@ protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultS
             ];
 
             $priceData = false;
-            if (!empty($rowData[self::COLUMN_ROW_PRICE])) {
+            $customOptionRowPrice = $rowData[self::COLUMN_ROW_PRICE];
+            if (!empty($customOptionRowPrice) || $customOptionRowPrice === '0') {
                 $priceData = [
                     'price' => (double)rtrim($rowData[self::COLUMN_ROW_PRICE], '%'),
                     'price_type' => 'fixed',
@@ -1893,7 +2009,8 @@ protected function _updateProducts(array $data)
     protected function _parseCustomOptions($rowData)
     {
         $beforeOptionValueSkuDelimiter = ';';
-        if (empty($rowData['custom_options'])) {
+        if (empty($rowData['custom_options'])
+            || $rowData['custom_options'] === Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT) {
             return $rowData;
         }
         $rowData['custom_options'] = str_replace(
@@ -1971,4 +2088,38 @@ private function getProductIdentifierField()
         }
         return $this->productEntityIdentifierField;
     }
+
+    /**
+     * Save prepared custom options.
+     *
+     * @param array $products
+     * @param array $options
+     * @param array $titles
+     * @param array $prices
+     * @param array $types
+     *
+     * @return void
+     */
+    private function savePreparedCustomOptions(
+        array $products,
+        array $options,
+        array $titles,
+        array $prices,
+        array $types
+    ): void {
+        if ($this->_isReadyForSaving($options, $titles, $types['values'])) {
+            if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+                $this->_compareOptionsWithExisting($options, $titles, $prices, $types['values']);
+                $this->restoreOriginalOptionTypeIds($types['values'], $types['prices'], $types['titles']);
+            }
+
+            $this->_saveOptions($options)
+                ->_saveTitles($titles)
+                ->_savePrices($prices)
+                ->_saveSpecificTypeValues($types['values'])
+                ->_saveSpecificTypePrices($types['prices'])
+                ->_saveSpecificTypeTitles($types['titles'])
+                ->_updateProducts($products);
+        }
+    }
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
index 17f7fae28ba75..cbdc5f5beaaf9 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
@@ -85,6 +85,10 @@ interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorIn
 
     const ERROR_DUPLICATE_URL_KEY = 'duplicatedUrlKey';
 
+    const ERROR_DUPLICATE_MULTISELECT_VALUES = 'duplicatedMultiselectValues';
+
+    const ERROR_NEW_TO_DATE = 'invalidNewToDateValue';
+
     /**
      * Value that means all entities (e.g. websites, groups etc.)
      */
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
index addd1523f87a0..ea6049ba651a5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
@@ -142,7 +142,7 @@ public function getNewSku($sku = null)
     {
         if ($sku !== null) {
             $sku = strtolower($sku);
-            return isset($this->newSkus[$sku]) ? $this->newSkus[$sku] : null;
+            return $this->newSkus[$sku] ?? null;
         }
         return $this->newSkus;
     }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index be5644e22b05b..3dff0188a7dbb 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -75,7 +75,7 @@ public function getWebsiteCodeToId($code = null)
             $this->_initWebsites();
         }
         if ($code) {
-            return isset($this->websiteCodeToId[$code]) ? $this->websiteCodeToId[$code] : null;
+            return $this->websiteCodeToId[$code] ?? null;
         }
         return $this->websiteCodeToId;
     }
@@ -90,7 +90,7 @@ public function getWebsiteCodeToStoreIds($code = null)
             $this->_initWebsites();
         }
         if ($code) {
-            return isset($this->websiteCodeToStoreIds[$code]) ? $this->websiteCodeToStoreIds[$code] : null;
+            return $this->websiteCodeToStoreIds[$code] ?? null;
         }
         return $this->websiteCodeToStoreIds;
     }
@@ -119,7 +119,7 @@ public function getStoreCodeToId($code = null)
             $this->_initStores();
         }
         if ($code) {
-            return isset($this->storeCodeToId[$code]) ? $this->storeCodeToId[$code] : null;
+            return $this->storeCodeToId[$code] ??  null;
         }
         return $this->storeCodeToId;
     }
@@ -134,7 +134,7 @@ public function getStoreIdToWebsiteStoreIds($code = null)
             $this->_initStores();
         }
         if ($code) {
-            return isset($this->storeIdToWebsiteStoreIds[$code]) ? $this->storeIdToWebsiteStoreIds[$code] : null;
+            return $this->storeIdToWebsiteStoreIds[$code] ?? null;
         }
         return $this->storeIdToWebsiteStoreIds;
     }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 5681b1aa6607d..3b6caef66ce6c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -28,6 +28,13 @@ abstract class AbstractType
      */
     public static $commonAttributesCache = [];
 
+    /**
+     * Maintain a list of invisible attributes
+     *
+     * @var array
+     */
+    public static $invAttributesCache = [];
+
     /**
      * Attribute Code to Id cache
      *
@@ -188,6 +195,8 @@ public function __construct(
     }
 
     /**
+     * Initialize template for error message.
+     *
      * @param array $templateCollection
      * @return $this
      */
@@ -278,7 +287,14 @@ protected function _initAttributes()
             }
         }
         foreach ($absentKeys as $attributeSetName => $attributeIds) {
-            $this->attachAttributesById($attributeSetName, $attributeIds);
+            $unknownAttributeIds = array_diff(
+                $attributeIds,
+                array_keys(self::$commonAttributesCache),
+                self::$invAttributesCache
+            );
+            if ($unknownAttributeIds || $this->_forcedAttributesCodes) {
+                $this->attachAttributesById($attributeSetName, $attributeIds);
+            }
         }
         foreach ($entityAttributes as $attributeRow) {
             if (isset(self::$commonAttributesCache[$attributeRow['attribute_id']])) {
@@ -303,37 +319,45 @@ protected function _initAttributes()
     protected function attachAttributesById($attributeSetName, $attributeIds)
     {
         foreach ($this->_prodAttrColFac->create()->addFieldToFilter(
-            'main_table.attribute_id',
-            ['in' => $attributeIds]
+            ['main_table.attribute_id', 'main_table.attribute_code'],
+            [
+                ['in' => $attributeIds],
+                ['in' => $this->_forcedAttributesCodes]
+            ]
         ) as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
             $attributeId = $attribute->getId();
 
             if ($attribute->getIsVisible() || in_array($attributeCode, $this->_forcedAttributesCodes)) {
-                self::$commonAttributesCache[$attributeId] = [
-                    'id' => $attributeId,
-                    'code' => $attributeCode,
-                    'is_global' => $attribute->getIsGlobal(),
-                    'is_required' => $attribute->getIsRequired(),
-                    'is_unique' => $attribute->getIsUnique(),
-                    'frontend_label' => $attribute->getFrontendLabel(),
-                    'is_static' => $attribute->isStatic(),
-                    'apply_to' => $attribute->getApplyTo(),
-                    'type' => \Magento\ImportExport\Model\Import::getAttributeType($attribute),
-                    'default_value' => strlen(
-                        $attribute->getDefaultValue()
-                    ) ? $attribute->getDefaultValue() : null,
-                    'options' => $this->_entityModel->getAttributeOptions(
-                        $attribute,
-                        $this->_indexValueAttributes
-                    ),
-                ];
+                if (!isset(self::$commonAttributesCache[$attributeId])) {
+                    self::$commonAttributesCache[$attributeId] = [
+                        'id' => $attributeId,
+                        'code' => $attributeCode,
+                        'is_global' => $attribute->getIsGlobal(),
+                        'is_required' => $attribute->getIsRequired(),
+                        'is_unique' => $attribute->getIsUnique(),
+                        'frontend_label' => $attribute->getFrontendLabel(),
+                        'is_static' => $attribute->isStatic(),
+                        'apply_to' => $attribute->getApplyTo(),
+                        'type' => \Magento\ImportExport\Model\Import::getAttributeType($attribute),
+                        'default_value' => strlen(
+                            $attribute->getDefaultValue()
+                        ) ? $attribute->getDefaultValue() : null,
+                        'options' => $this->_entityModel->getAttributeOptions(
+                            $attribute,
+                            $this->_indexValueAttributes
+                        ),
+                    ];
+                }
+
                 self::$attributeCodeToId[$attributeCode] = $attributeId;
                 $this->_addAttributeParams(
                     $attributeSetName,
                     self::$commonAttributesCache[$attributeId],
                     $attribute
                 );
+            } else {
+                self::$invAttributesCache[] = $attributeId;
             }
         }
     }
@@ -355,6 +379,8 @@ public function retrieveAttributeFromCache($attributeCode)
     }
 
     /**
+     * Adding attribute option.
+     *
      * In case we've dynamically added new attribute option during import we need to add it to our cache
      * in order to keep it up to date.
      *
@@ -486,8 +512,10 @@ public function isSuitable()
     }
 
     /**
-     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes;
-     * set default values if needed
+     * Adding default attribute to product before save.
+     *
+     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes,
+     * set default values if needed.
      *
      * @param array $rowData
      * @param bool $withDefaultValue
@@ -503,7 +531,7 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
             if ($attrParams['is_static']) {
                 continue;
             }
-            if (isset($rowData[$attrCode]) && strlen($rowData[$attrCode])) {
+            if (isset($rowData[$attrCode]) && strlen(trim($rowData[$attrCode]))) {
                 if (in_array($attrParams['type'], ['select', 'boolean'])) {
                     $resultAttrs[$attrCode] = $attrParams['options'][strtolower($rowData[$attrCode])];
                 } elseif ('multiselect' == $attrParams['type']) {
@@ -515,9 +543,9 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
                 } else {
                     $resultAttrs[$attrCode] = $rowData[$attrCode];
                 }
-            } elseif (array_key_exists($attrCode, $rowData)) {
+            } elseif (array_key_exists($attrCode, $rowData) && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $rowData[$attrCode];
-            } elseif ($withDefaultValue && null !== $attrParams['default_value']) {
+            } elseif ($withDefaultValue && null !== $attrParams['default_value'] && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $attrParams['default_value'];
             }
         }
@@ -534,9 +562,15 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
     public function clearEmptyData(array $rowData)
     {
         foreach ($this->_getProductAttributes($rowData) as $attrCode => $attrParams) {
-            if (!$attrParams['is_static'] && empty($rowData[$attrCode])) {
+            if (!$attrParams['is_static'] && !isset($rowData[$attrCode])) {
                 unset($rowData[$attrCode]);
             }
+
+            if (isset($rowData[$attrCode])
+                && $rowData[$attrCode] === $this->_entityModel->getEmptyAttributeValueConstant()
+            ) {
+                $rowData[$attrCode] = null;
+            }
         }
         return $rowData;
     }
@@ -583,7 +617,8 @@ protected function getProductEntityLinkField()
     }
 
     /**
-     * Clean cached values
+     * Clean cached values.
+     *
      * @since 100.2.0
      */
     public function __destruct()
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 60bfdd56a718e..4b7416f6ad9a6 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -7,6 +7,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\Framework\Validator\AbstractValidator;
+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 
 /**
  * Class Validator
@@ -60,6 +61,8 @@ public function __construct(
     }
 
     /**
+     * Text validation
+     *
      * @param mixed $attrCode
      * @param string $type
      * @return bool
@@ -69,6 +72,8 @@ protected function textValidation($attrCode, $type)
         $val = $this->string->cleanString($this->_rowData[$attrCode]);
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
+        } else if ($attrCode == Product::COL_SKU) {
+            $valid = $this->string->strlen($val) <= SKU::SKU_MAX_LENGTH;
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }
@@ -105,6 +110,8 @@ private function validateOption($attrCode, $possibleOptions, $value)
     }
 
     /**
+     * Numeric validation
+     *
      * @param mixed $attrCode
      * @param string $type
      * @return bool
@@ -132,6 +139,8 @@ protected function numericValidation($attrCode, $type)
     }
 
     /**
+     * Is required attribute valid
+     *
      * @param string $attrCode
      * @param array $attributeParams
      * @param array $rowData
@@ -150,10 +159,17 @@ public function isRequiredAttributeValid($attrCode, array $attributeParams, arra
             $doCheck = true;
         }
 
-        return $doCheck ? isset($rowData[$attrCode]) && strlen(trim($rowData[$attrCode])) : true;
+        if ($doCheck === true) {
+            return isset($rowData[$attrCode])
+                && strlen(trim($rowData[$attrCode]))
+                && trim($rowData[$attrCode]) !== $this->context->getEmptyAttributeValueConstant();
+        }
+        return true;
     }
 
     /**
+     * Is attribute valid
+     *
      * @param string $attrCode
      * @param array $attrParams
      * @param array $rowData
@@ -188,6 +204,11 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
         if (!strlen(trim($rowData[$attrCode]))) {
             return true;
         }
+
+        if ($rowData[$attrCode] === $this->context->getEmptyAttributeValueConstant() && !$attrParams['is_required']) {
+            return true;
+        }
+
         switch ($attrParams['type']) {
             case 'varchar':
             case 'text':
@@ -209,6 +230,12 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
                         break;
                     }
                 }
+
+                $uniqueValues = array_unique($values);
+                if (count($uniqueValues) != count($values)) {
+                    $valid = false;
+                    $this->_addMessages([RowValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES]);
+                }
                 break;
             case 'datetime':
                 $val = trim($rowData[$attrCode]);
@@ -239,6 +266,8 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
     }
 
     /**
+     * Set invalid attribute
+     *
      * @param string|null $attribute
      * @return void
      * @since 100.1.0
@@ -249,6 +278,8 @@ protected function setInvalidAttribute($attribute)
     }
 
     /**
+     * Get invalid attribute
+     *
      * @return string
      * @since 100.1.0
      */
@@ -258,6 +289,8 @@ public function getInvalidAttribute()
     }
 
     /**
+     * Is valid attributes
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -284,7 +317,7 @@ protected function isValidAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isValid($value)
     {
@@ -315,6 +348,8 @@ public function getRowScope(array $rowData)
     }
 
     /**
+     * Init
+     *
      * @param \Magento\CatalogImportExport\Model\Import\Product $context
      * @return $this
      */
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
index 728d3e4d17621..21566c955ba2f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
@@ -18,7 +18,9 @@ class Quantity extends AbstractImportValidator implements RowValidatorInterface
     public function isValid($value)
     {
         $this->_clearMessages();
-        if (!empty($value['qty']) && !is_numeric($value['qty'])) {
+        if (!empty($value['qty']) && (!is_numeric($value['qty'])
+            && $value['qty'] !== $this->context->getEmptyAttributeValueConstant())
+        ) {
             $this->_addMessages(
                 [
                     sprintf(
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
index 07d038a05d2f0..5cc91d4598701 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
@@ -15,7 +15,9 @@ class Weight extends AbstractImportValidator implements RowValidatorInterface
     public function isValid($value)
     {
         $this->_clearMessages();
-        if (!empty($value['weight']) && (!is_numeric($value['weight']) || $value['weight'] < 0)) {
+        if (!empty($value['weight']) && (!is_numeric($value['weight']) || $value['weight'] < 0)
+            && $value['weight'] !== $this->context->getEmptyAttributeValueConstant()
+        ) {
             $this->_addMessages(
                 [
                     sprintf(
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index ac94493722fb1..7e6ada724a81a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -101,7 +101,7 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
-     * @param null $filePath
+     * @param string|null $filePath
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
@@ -113,15 +113,15 @@ public function __construct(
         \Magento\Framework\Filesystem\File\ReadFactory $readFactory,
         $filePath = null
     ) {
-        if ($filePath !== null) {
-            $this->_setUploadFile($filePath);
-        }
         $this->_imageFactory = $imageFactory;
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_coreFileStorage = $coreFileStorage;
         $this->_validator = $validator;
         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $this->_readFactory = $readFactory;
+        if ($filePath !== null) {
+            $this->_setUploadFile($filePath);
+        }
     }
 
     /**
@@ -146,20 +146,24 @@ public function init()
      * @param string $fileName
      * @param bool $renameFileOff
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function move($fileName, $renameFileOff = false)
     {
         if ($renameFileOff) {
             $this->setAllowRenameFiles(false);
         }
+
+        if ($this->getTmpDir()) {
+            $filePath = $this->getTmpDir() . '/';
+        } else {
+            $filePath = '';
+        }
+
         if (preg_match('/\bhttps?:\/\//i', $fileName, $matches)) {
             $url = str_replace($matches[0], '', $fileName);
-
-            if ($matches[0] === $this->httpScheme) {
-                $read = $this->_readFactory->create($url, DriverPool::HTTP);
-            } else {
-                $read = $this->_readFactory->create($url, DriverPool::HTTPS);
-            }
+            $driver = $matches[0] === $this->httpScheme ? DriverPool::HTTP : DriverPool::HTTPS;
+            $read = $this->_readFactory->create($url, $driver);
 
             //only use filename (for URI with query parameters)
             $parsedUrlPath = parse_url($url, PHP_URL_PATH);
@@ -170,14 +174,20 @@ public function move($fileName, $renameFileOff = false)
                 }
             }
 
+            $fileExtension = pathinfo($fileName, PATHINFO_EXTENSION);
+            if ($fileExtension && !$this->checkAllowedExtension($fileExtension)) {
+                throw new \Magento\Framework\Exception\LocalizedException(__('Disallowed file type.'));
+            }
+
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
+            $filePath = $this->_directory->getRelativePath($filePath . $fileName);
             $this->_directory->writeFile(
-                $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName),
+                $filePath,
                 $read->readAll()
             );
         }
 
-        $filePath = $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName);
+        $filePath = $this->_directory->getRelativePath($filePath . $fileName);
         $this->_setUploadFile($filePath);
         $destDir = $this->_directory->getAbsolutePath($this->getDestDir());
         $result = $this->save($destDir);
@@ -241,6 +251,7 @@ protected function _validateFile()
 
         $fileExtension = pathinfo($filePath, PATHINFO_EXTENSION);
         if (!$this->checkAllowedExtension($fileExtension)) {
+            $this->_directory->delete($filePath);
             throw new \Exception('Disallowed file type.');
         }
         //run validate callbacks
@@ -341,7 +352,7 @@ protected function _moveFile($tmpPath, $destPath)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function chmod($file)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php
index 07cf5a3dfc8d7..320b737b77087 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php
@@ -5,8 +5,15 @@
  */
 namespace Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Flat\State as FlatState;
+
 class Import
 {
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
+     */
+    private $flatState;
+
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
      */
@@ -14,10 +21,14 @@ class Import
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $flatState
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
-    {
+    public function __construct(
+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
+        FlatState $flatState
+    ) {
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->flatState = $flatState;
     }
 
     /**
@@ -31,7 +42,10 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
-        $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
+        if ($this->flatState->isFlatEnabled() && !$this->_productFlatIndexerProcessor->isIndexerScheduled()) {
+            $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
+        }
+
         return $import;
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php b/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php
new file mode 100644
index 0000000000000..0e8d3c5fa4cc5
--- /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 0000000000000..bc314d825ba3e
--- /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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE.txt b/app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE.txt
rename to app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE_AFL.txt b/app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE_AFL.txt
rename to app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/README.md b/app/code/Magento/CatalogImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..bdf321bbcd4bd
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Import Export Functional Tests
+
+The Functional Test Module for **Magento Catalog Import Export** module.
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php
index bf47ec4f9da13..919f0cfda7cbe 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php
@@ -34,39 +34,49 @@ class CategoryProcessorTest extends \PHPUnit\Framework\TestCase
      */
     protected $product;
 
+    /**
+     * @var \Magento\Catalog\Model\Category
+     */
+    private $childCategory;
+
+    /**
+     * \Magento\Catalog\Model\Category
+     */
+    private $parentCategory;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
-        $childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+        $this->childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $childCategory->method('getId')->will($this->returnValue(self::CHILD_CATEGORY_ID));
-        $childCategory->method('getName')->will($this->returnValue(self::CHILD_CATEGORY_NAME));
-        $childCategory->method('getPath')->will($this->returnValue(
+        $this->childCategory->method('getId')->will($this->returnValue(self::CHILD_CATEGORY_ID));
+        $this->childCategory->method('getName')->will($this->returnValue(self::CHILD_CATEGORY_NAME));
+        $this->childCategory->method('getPath')->will($this->returnValue(
             self::PARENT_CATEGORY_ID . CategoryProcessor::DELIMITER_CATEGORY
             . self::CHILD_CATEGORY_ID
         ));
 
-        $parentCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+        $this->parentCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $parentCategory->method('getId')->will($this->returnValue(self::PARENT_CATEGORY_ID));
-        $parentCategory->method('getName')->will($this->returnValue('Parent'));
-        $parentCategory->method('getPath')->will($this->returnValue(self::PARENT_CATEGORY_ID));
+        $this->parentCategory->method('getId')->will($this->returnValue(self::PARENT_CATEGORY_ID));
+        $this->parentCategory->method('getName')->will($this->returnValue('Parent'));
+        $this->parentCategory->method('getPath')->will($this->returnValue(self::PARENT_CATEGORY_ID));
 
         $categoryCollection =
             $this->objectManagerHelper->getCollectionMock(
                 \Magento\Catalog\Model\ResourceModel\Category\Collection::class,
                 [
-                    self::PARENT_CATEGORY_ID => $parentCategory,
-                    self::CHILD_CATEGORY_ID => $childCategory,
+                    self::PARENT_CATEGORY_ID => $this->parentCategory,
+                    self::CHILD_CATEGORY_ID => $this->childCategory,
                 ]
             );
         $map = [
-            [self::PARENT_CATEGORY_ID, $parentCategory],
-            [self::CHILD_CATEGORY_ID, $childCategory],
+            [self::PARENT_CATEGORY_ID, $this->parentCategory],
+            [self::CHILD_CATEGORY_ID, $this->childCategory],
         ];
         $categoryCollection->expects($this->any())
             ->method('getItemById')
@@ -89,7 +99,7 @@ protected function setUp()
 
         $categoryFactory = $this->createPartialMock(\Magento\Catalog\Model\CategoryFactory::class, ['create']);
 
-        $categoryFactory->method('create')->will($this->returnValue($childCategory));
+        $categoryFactory->method('create')->will($this->returnValue($this->childCategory));
 
         $this->categoryProcessor =
             new \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor(
@@ -105,6 +115,19 @@ public function testUpsertCategories()
         $this->assertArrayHasKey(self::CHILD_CATEGORY_ID, array_flip($categoryIds));
     }
 
+    /**
+     * Tests case when newly created category save throws exception.
+     */
+    public function testUpsertCategoriesWithAlreadyExistsException()
+    {
+        $exception = new \Magento\Framework\Exception\AlreadyExistsException();
+        $categoriesSeparator = '/';
+        $categoryName = 'Exception Category';
+        $this->childCategory->method('save')->willThrowException($exception);
+        $this->categoryProcessor->upsertCategories($categoryName, $categoriesSeparator);
+        $this->assertNotEmpty($this->categoryProcessor->getFailedCategories());
+    }
+
     public function testClearFailedCategories()
     {
         $dummyFailedCategory = [
@@ -135,6 +158,9 @@ public function testGetCategoryById($categoriesCache, $expectedResult)
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function getCategoryByIdDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ImageTypeProcessorTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ImageTypeProcessorTest.php
new file mode 100644
index 0000000000000..fccfedd74fad2
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ImageTypeProcessorTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product;
+
+use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
+
+class ImageTypeProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetImageTypes()
+    {
+        $resourceFactory = $this->createPartialMock(
+            \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory::class,
+            ['create']
+        );
+
+        $resource = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTable', 'getConnection'])
+            ->getMock();
+        $resource->expects($this->once())
+            ->method('getTable')
+            ->with('eav_attribute')
+            ->willReturnArgument(0);
+        $connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $resource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $resourceFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($resource);
+
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $selectMock->expects($this->once())
+            ->method('from')
+            ->with('eav_attribute', ['code' => 'attribute_code'], null)
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('where')
+            ->with('frontend_input = :frontend_input')
+            ->willReturnSelf();
+        $connection->expects($this->any())
+            ->method('fetchCol')
+            ->willReturn(['image', 'small_image', 'thumbnail', 'swatch_image']);
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($selectMock);
+
+        $typeProcessor = new ImageTypeProcessor($resourceFactory);
+        $this->assertEquals(
+            ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image'],
+            $typeProcessor->getImageTypes()
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
index e24b4e1948149..bd2fe896b8c0a 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
@@ -134,8 +134,28 @@ protected function setUp()
             ->expects($this->any())
             ->method('addFieldToFilter')
             ->with(
-                'main_table.attribute_id',
-                ['in' => ['attribute_id', 'boolean_attribute']]
+                ['main_table.attribute_id', 'main_table.attribute_code'],
+                [
+                    [
+                        'in' =>
+                            [
+                                'attribute_id',
+                                'boolean_attribute',
+                            ],
+                    ],
+                    [
+                        'in' =>
+                            [
+                                'related_tgtr_position_behavior',
+                                'related_tgtr_position_limit',
+                                'upsell_tgtr_position_behavior',
+                                'upsell_tgtr_position_limit',
+                                'thumbnail_label',
+                                'small_image_label',
+                                'image_label',
+                            ],
+                    ],
+                ]
             )
             ->willReturn([$attribute1, $attribute2]);
 
@@ -269,6 +289,9 @@ public function testIsRowValidError()
         $this->assertFalse($this->simpleType->isRowValid($rowData, $rowNum));
     }
 
+    /**
+     * @return array
+     */
     public function addAttributeOptionDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
index 6d16f3da9e703..98e434f217484 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
@@ -19,7 +19,7 @@ class OptionTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
     const PATH_TO_CSV_FILE = '/_files/product_with_custom_options.csv';
 
     /**
-     * Test store parametes
+     * Test store parameters
      *
      * @var array
      */
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php
index 144214fd6e318..b550102cb1a15 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php
@@ -7,6 +7,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\Quantity;
+use Magento\ImportExport\Model\Import;
 
 /**
  * Class QuantityTest
@@ -25,6 +26,10 @@ protected function setUp()
         $contextStub = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $contextStub->expects($this->any())
+            ->method('getEmptyAttributeValueConstant')
+            ->willReturn(Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT);
+
         $contextStub->method('retrieveMessageTemplate')->willReturn(null);
         $this->quantity->init($contextStub);
     }
@@ -54,6 +59,9 @@ public function isValidDataProvider()
             [true, ['qty' => '']],
             [false, ['qty' => 'abc']],
             [false, ['qty' => true]],
+            [false, ['qty' => true]],
+            [true, ['qty' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT]],
+            [false, ['qty' => '__EMPTY__VALUE__TEST__']],
         ];
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/TierPriceTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/TierPriceTest.php
index 4e902024769f7..bffefce24e1fd 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/TierPriceTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/TierPriceTest.php
@@ -48,6 +48,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @param $groupId
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator\TierPrice
+     */
     protected function processInit($groupId)
     {
         $searchResult = $this->createMock(\Magento\Customer\Api\Data\GroupSearchResultsInterface::class);
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
new file mode 100644
index 0000000000000..78174828ae26e
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
+
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\Weight;
+use Magento\ImportExport\Model\Import;
+
+/**
+ * Class WeightTest
+ */
+class WeightTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Weight
+     */
+    private $weight;
+
+    protected function setUp()
+    {
+        $this->weight = new Weight();
+
+        $contextStub = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextStub->expects($this->any())
+            ->method('getEmptyAttributeValueConstant')
+            ->willReturn(Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT);
+
+        $contextStub->method('retrieveMessageTemplate')->willReturn(null);
+        $this->weight->init($contextStub);
+    }
+
+    /**
+     * @param bool $expectedResult
+     * @param array $value
+     * @dataProvider isValidDataProvider
+     */
+    public function testIsValid($expectedResult, $value)
+    {
+        $result = $this->weight->isValid($value);
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function isValidDataProvider()
+    {
+        return [
+            [true, ['weight' => 0]],
+            [true, ['weight' => 1]],
+            [true, ['weight' => 5]],
+            [false, ['weight' => -1]],
+            [false, ['weight' => -10]],
+            [true, ['weight' => '']],
+            [false, ['weight' => 'abc']],
+            [false, ['weight' => true]],
+            [false, ['weight' => true]],
+            [true, ['weight' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT]],
+            [false, ['weight' => '__EMPTY__VALUE__TEST__']],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php
index 1179783fdd3f9..64b925955519e 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php
@@ -167,6 +167,26 @@ public function attributeValidationProvider()
                 ['product_type' => 'any', 'attribute_code' => 'Option 1|Option 2'],
                 true
             ],
+            [
+                Import::BEHAVIOR_APPEND,
+                ['is_required' => true, 'type' => 'multiselect',
+                    'options' => ['option 1' => 0, 'option 2' => 1, 'option 3']],
+                ['product_type' => 'any', 'attribute_code' => 'Option 1|Option 2|Option 1'],
+                false
+            ],
+            [
+                Import::BEHAVIOR_APPEND,
+                ['is_required' => true, 'type' => 'multiselect',
+                    'options' => ['option 1' => 0, 'option 2' => 1, 'option 3']],
+                ['product_type' => 'any', 'attribute_code' => 'Option 3|Option 3|Option 3|Option 1'],
+                false
+            ],
+            [
+                Import::BEHAVIOR_APPEND,
+                ['is_required' => true, 'type' => 'multiselect', 'options' => ['option 1' => 0]],
+                ['product_type' => 'any', 'attribute_code' => 'Option 1|Option 1|Option 1|Option 1'],
+                false
+            ],
             [
                 Import::BEHAVIOR_APPEND,
                 ['is_required' => true, 'type' => 'datetime'],
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index 862276d35bac5..a562916b3b4bb 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
+use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\ImportExport\Model\Import;
 
 /**
@@ -159,6 +159,9 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject*/
     protected $productUrl;
 
+    /** @var  ImageTypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $imageTypeProcessor;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -326,11 +329,16 @@ protected function setUp()
 
         $this->data = [];
 
+        $this->imageTypeProcessor = $this->getMockBuilder(ImageTypeProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->_objectConstructor()
             ->_parentObjectConstructor()
             ->_initAttributeSets()
             ->_initTypeModels()
-            ->_initSkus();
+            ->_initSkus()
+            ->_initImagesArrayKeys();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -373,7 +381,8 @@ protected function setUp()
                 'taxClassProcessor' => $this->taxClassProcessor,
                 'scopeConfig' => $this->scopeConfig,
                 'productUrl' => $this->productUrl,
-                'data' => $this->data
+                'data' => $this->data,
+                'imageTypeProcessor' => $this->imageTypeProcessor
             ]
         );
         $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product::class);
@@ -496,6 +505,17 @@ protected function _initSkus()
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    protected function _initImagesArrayKeys()
+    {
+        $this->imageTypeProcessor->expects($this->once())->method('getImageTypes')->willReturn(
+            ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image']
+        );
+        return $this;
+    }
+
     public function testSaveProductAttributes()
     {
         $testTable = 'test_table';
@@ -513,25 +533,6 @@ public function testSaveProductAttributes()
                 ]
             ]
         ];
-        $entityTable = 'catalog_product_entity';
-        $resource = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getTable'])
-            ->getMock();
-        $resource->expects($this->once())->method('getTable')->with($entityTable)->willReturnArgument(0);
-        $this->_resourceFactory->expects($this->once())->method('create')->willReturn($resource);
-        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $selectMock->expects($this->once())->method('from')->with($entityTable, '*', null)->willReturnSelf();
-        $selectMock->expects($this->once())->method('where')->with('sku = ?', $testSku)->willReturnSelf();
-        $selectMock->expects($this->once())->method('columns')->with('entity_id')->willReturnSelf();
-        $this->_connection->expects($this->any())->method('fetchOne')->willReturn(self::ENTITY_ID);
-        $this->_connection->expects($this->any())->method('select')->willReturn($selectMock);
-        $this->_connection->expects($this->any())
-            ->method('quoteInto')
-            ->willReturnCallback([$this, 'returnQuoteCallback']);
-
         $tableData[] = [
             'entity_id' => self::ENTITY_ID,
             'attribute_id' => $attributeId,
@@ -541,6 +542,7 @@ public function testSaveProductAttributes()
         $this->_connection->expects($this->once())
             ->method('insertOnDuplicate')
             ->with($testTable, $tableData, ['value']);
+        $this->setPropertyValue($this->importProduct, '_oldSku', [$testSku => ['entity_id' => self::ENTITY_ID]]);
         $object = $this->invokeMethod($this->importProduct, '_saveProductAttributes', [$attributesData]);
         $this->assertEquals($this->importProduct, $object);
     }
@@ -601,6 +603,28 @@ public function testGetMultipleValueSeparatorFromParameters()
         );
     }
 
+    public function testGetEmptyAttributeValueConstantDefault()
+    {
+        $this->setPropertyValue($this->importProduct, '_parameters', null);
+        $this->assertEquals(
+            Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+            $this->importProduct->getEmptyAttributeValueConstant()
+        );
+    }
+
+    public function testGetEmptyAttributeValueConstantFromParameters()
+    {
+        $expectedSeparator = '__EMPTY__VALUE__TEST__';
+        $this->setPropertyValue($this->importProduct, '_parameters', [
+            \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT => $expectedSeparator,
+        ]);
+
+        $this->assertEquals(
+            $expectedSeparator,
+            $this->importProduct->getEmptyAttributeValueConstant()
+        );
+    }
+
     public function testDeleteProductsForReplacement()
     {
         $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
@@ -809,6 +833,9 @@ public function testGetCategoryProcessor()
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function getStoreIdByCodeDataProvider()
     {
         return [
@@ -1194,6 +1221,68 @@ public function testParseAttributesWithWrappedValuesWillReturnsLowercasedAttribu
         $this->assertArrayNotHasKey('PARAM2', $attributes);
     }
 
+    /**
+     * Test that errors occurred during importing images are logged.
+     *
+     * @param string $fileName
+     * @param bool $throwException
+     * @dataProvider uploadMediaFilesDataProvider
+     */
+    public function testUploadMediaFiles(string $fileName, bool $throwException)
+    {
+        $exception = new \Exception();
+        $expectedFileName = $fileName;
+        if ($throwException) {
+            $expectedFileName = '';
+            $this->_logger->expects($this->once())->method('critical')->with($exception);
+        }
+        $fileUploaderMock = $this
+            ->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Uploader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fileUploaderMock
+            ->expects($this->once())
+            ->method('move')
+            ->willReturnCallback(
+                function ($name) use ($throwException, $exception) {
+                    if ($throwException) {
+                        throw $exception;
+                    }
+                    return ['file' => $name];
+                }
+            );
+        $this->setPropertyValue(
+            $this->importProduct,
+            '_fileUploader',
+            $fileUploaderMock
+        );
+        $actualFileName = $this->invokeMethod(
+            $this->importProduct,
+            'uploadMediaFiles',
+            [$fileName]
+        );
+        $this->assertEquals(
+            $expectedFileName,
+            $actualFileName
+        );
+    }
+
+    /**
+     * Data provider for testUploadMediaFiles.
+     *
+     * @return array
+     */
+    public function uploadMediaFilesDataProvider()
+    {
+        return [
+            ['test1.jpg', false],
+            ['test2.jpg', true],
+        ];
+    }
+
+    /**
+     * @return array
+     */
     public function getImagesFromRowDataProvider()
     {
         return [
@@ -1220,6 +1309,9 @@ public function getImagesFromRowDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function validateRowValidateNewProductTypeAddRowErrorCallDataProvider()
     {
         return [
@@ -1254,6 +1346,9 @@ public function validateRowValidateNewProductTypeAddRowErrorCallDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function validateRowCheckSpecifiedSkuDataProvider()
     {
         return [
@@ -1272,6 +1367,9 @@ public function validateRowCheckSpecifiedSkuDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function validateRowDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
index f6a211bc47c62..f734596de014b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
@@ -93,17 +93,17 @@ protected function setUp()
                 $this->filesystem,
                 $this->readFactory,
             ])
-            ->setMethods(['_setUploadFile', 'save', 'getTmpDir'])
+            ->setMethods(['_setUploadFile', 'save', 'getTmpDir', 'checkAllowedExtension'])
             ->getMock();
     }
 
     /**
      * @dataProvider moveFileUrlDataProvider
      */
-    public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
+    public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName, $checkAllowedExtension)
     {
         $destDir = 'var/dest/dir';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $expectedFileName;
+        $expectedRelativeFilePath = $expectedFileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)
@@ -128,6 +128,9 @@ public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
         $this->uploader->expects($this->once())->method('_setUploadFile')->will($this->returnSelf());
         $this->uploader->expects($this->once())->method('save')->with($destDir . '/' . $expectedFileName)
             ->willReturn(['name' => $expectedFileName, 'path' => 'absPath']);
+        $this->uploader->expects($this->exactly($checkAllowedExtension))
+            ->method('checkAllowedExtension')
+            ->willReturn(true);
 
         $this->uploader->setDestDir($destDir);
         $result = $this->uploader->move($fileUrl);
@@ -139,7 +142,7 @@ public function testMoveFileName()
     {
         $destDir = 'var/dest/dir';
         $fileName = 'test_uploader_file';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $fileName;
+        $expectedRelativeFilePath = $fileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)
@@ -193,6 +196,9 @@ public function testMoveFileUrlDrivePool($fileUrl, $expectedHost, $expectedDrive
         $this->assertNull($result);
     }
 
+    /**
+     * @return array
+     */
     public function moveFileUrlDriverPoolDataProvider()
     {
         return [
@@ -211,6 +217,9 @@ public function moveFileUrlDriverPoolDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function moveFileUrlDataProvider()
     {
         return [
@@ -218,31 +227,37 @@ public function moveFileUrlDataProvider()
                 '$fileUrl' => 'http://test_uploader_file',
                 '$expectedHost' => 'test_uploader_file',
                 '$expectedFileName' => 'test_uploader_file',
+                '$checkAllowedExtension' => 0
             ],
             [
                 '$fileUrl' => 'https://!:^&`;file',
                 '$expectedHost' => '!:^&`;file',
                 '$expectedFileName' => 'file',
+                '$checkAllowedExtension' => 0
             ],
             [
                 '$fileUrl' => 'https://www.google.com/image.jpg',
                 '$expectedHost' => 'www.google.com/image.jpg',
                 '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1
             ],
             [
                 '$fileUrl' => 'https://www.google.com/image.jpg?param=1',
                 '$expectedHost' => 'www.google.com/image.jpg?param=1',
                 '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1
             ],
             [
                 '$fileUrl' => 'https://www.google.com/image.jpg?param=1&param=2',
                 '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
                 '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1
             ],
             [
                 '$fileUrl' => 'http://www.google.com/image.jpg?param=1&param=2',
                 '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
                 '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1
             ],
         ];
     }
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Indexer/Product/Flat/Plugin/ImportTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Indexer/Product/Flat/Plugin/ImportTest.php
index d40327f097c5b..1d2a12f863a6d 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Indexer/Product/Flat/Plugin/ImportTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Indexer/Product/Flat/Plugin/ImportTest.php
@@ -5,25 +5,79 @@
  */
 namespace Magento\CatalogImportExport\Test\Unit\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class ImportTest extends \PHPUnit\Framework\TestCase
 {
-    public function testAfterImportSource()
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $processorMock;
+
+    /**
+     * @var \Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flatStateMock;
+
+    /**
+     * @var \Magento\ImportExport\Model\Import|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
     {
-        /**
-         * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor|
-         *      \PHPUnit_Framework_MockObject_MockObject $processorMock
-         */
-        $processorMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Indexer\Product\Flat\Processor::class,
-            ['markIndexerAsInvalid']
+        $this->processorMock = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Flat\Processor::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['markIndexerAsInvalid', 'isIndexerScheduled'])
+            ->getMock();
+
+        $this->flatStateMock = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Flat\State::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isFlatEnabled'])
+            ->getMock();
+
+        $this->subjectMock = $this->getMockBuilder(\Magento\ImportExport\Model\Import::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = (new ObjectManager($this))->getObject(
+            \Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import::class,
+            [
+                'productFlatIndexerProcessor' => $this->processorMock,
+                'flatState' => $this->flatStateMock
+            ]
         );
+    }
 
-        $subjectMock = $this->createMock(\Magento\ImportExport\Model\Import::class);
-        $processorMock->expects($this->once())->method('markIndexerAsInvalid');
+    public function testAfterImportSourceWithFlatEnabledAndIndexerScheduledDisabled()
+    {
+        $this->flatStateMock->expects($this->once())->method('isFlatEnabled')->willReturn(true);
+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(false);
+        $this->processorMock->expects($this->once())->method('markIndexerAsInvalid');
+        $someData = [1, 2, 3];
+        $this->assertEquals($someData, $this->model->afterImportSource($this->subjectMock, $someData));
+    }
 
+    public function testAfterImportSourceWithFlatDisabledAndIndexerScheduledDisabled()
+    {
+        $this->flatStateMock->expects($this->once())->method('isFlatEnabled')->willReturn(false);
+        $this->processorMock->expects($this->never())->method('isIndexerScheduled')->willReturn(false);
+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
         $someData = [1, 2, 3];
+        $this->assertEquals($someData, $this->model->afterImportSource($this->subjectMock, $someData));
+    }
 
-        $model = new \Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import($processorMock);
-        $this->assertEquals($someData, $model->afterImportSource($subjectMock, $someData));
+    public function testAfterImportSourceWithFlatEnabledAndIndexerScheduledEnabled()
+    {
+        $this->flatStateMock->expects($this->once())->method('isFlatEnabled')->willReturn(true);
+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(true);
+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
+        $someData = [1, 2, 3];
+        $this->assertEquals($someData, $this->model->afterImportSource($this->subjectMock, $someData));
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index b86bb6be29b46..56307a01e1cb6 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -5,21 +5,20 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "ext-ctype": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-catalog-url-rewrite": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogImportExport/etc/di.xml b/app/code/Magento/CatalogImportExport/etc/di.xml
index 53772c3b3360a..6906272b11d68 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/CatalogImportExport/etc/module.xml b/app/code/Magento/CatalogImportExport/etc/module.xml
index 517ffc0fa393d..9e2c801d27b46 100644
--- a/app/code/Magento/CatalogImportExport/etc/module.xml
+++ b/app/code/Magento/CatalogImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogImportExport" setup_version="2.0.0">
+    <module name="Magento_CatalogImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
index c2521f77ca24a..9ae22e5e1a364 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
@@ -15,6 +15,10 @@
  * Interface StockCollectionInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockCollectionInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
index 53e95921ea955..087fae6e6568a 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
@@ -11,6 +11,10 @@
  * Interface Stock
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockInterface extends ExtensibleDataInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
index 038174c8e52be..59a1f58b74c2c 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
@@ -15,6 +15,10 @@
  * Interface StockItemCollectionInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockItemCollectionInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
index b876615468ba9..e2e8a744c4bcd 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
@@ -11,6 +11,10 @@
  * Interface StockItem
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockItemInterface extends ExtensibleDataInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
index 70a2c29ff9a6e..1cc045745a0c1 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
@@ -11,6 +11,10 @@
  * Stock Status collection interface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStatusCollectionInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
index 83defa64df250..66b639fb088d1 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
@@ -11,9 +11,21 @@
  * Interface StockStatusInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStatusInterface extends ExtensibleDataInterface
 {
+    /**#@+
+     * Stock Status values.
+     */
+    const STATUS_OUT_OF_STOCK = 0;
+
+    const STATUS_IN_STOCK = 1;
+    /**#@-*/
+
     /**#@+
      * Stock status object data keys
      */
diff --git a/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
new file mode 100644
index 0000000000000..6fd1e7466970d
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
@@ -0,0 +1,34 @@
+<?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
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
+ */
+interface 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 0000000000000..552e30da89235
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Api;
+
+/**
+ * @api
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
+ */
+interface 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/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
index 767625e9f3489..5019e86b7af40 100644
--- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
@@ -9,6 +9,10 @@
  * Interface StockConfigurationInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockConfigurationInterface
 {
@@ -77,7 +81,7 @@ public function getEnableQtyIncrements($storeId = null);
 
     /**
      * @param int $storeId
-     * @return int
+     * @return float
      */
     public function getQtyIncrements($store = null);
 
diff --git a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
index 969af6481cb4a..eb6fb2e812f2e 100644
--- a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
@@ -9,6 +9,10 @@
  * Interface StockCriteriaInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
index 1521b34c715b0..18bab6571c209 100644
--- a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
@@ -9,6 +9,10 @@
  * Interface StockIndexInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockIndexInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
index a2fc7801b1d13..1d2cabbb48a11 100644
--- a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
@@ -9,6 +9,10 @@
  * Interface StockItemCriteriaInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockItemCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
index 2732048d1445f..eecf6cbe07632 100644
--- a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
@@ -9,6 +9,10 @@
  * Interface StockItemRepository
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockItemRepositoryInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
index ddb84abf3d1a5..8796953e32fd0 100644
--- a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
@@ -9,6 +9,10 @@
  * Interface StockManagementInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockManagementInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
index c9b6abeb72e23..5478f90fb7d9f 100644
--- a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
@@ -9,6 +9,10 @@
  * Interface StockRegistryInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockRegistryInterface
 {
@@ -72,7 +76,7 @@ public function getProductStockStatusBySku($productSku, $scopeId = null);
      * @param float $qty
      * @param int $currentPage
      * @param int $pageSize
-     * @return \Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface
+     * @return \Magento\CatalogInventory\Api\Data\StockItemCollectionInterface
      */
     public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0);
 
diff --git a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
index 80a7e79289cff..3cfdf45506340 100644
--- a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
@@ -9,6 +9,10 @@
  * Interface StockRepositoryInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockRepositoryInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
index 8a1f7da5158ed..8be7f5be79f27 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
@@ -9,6 +9,10 @@
  * Interface StockStateInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStateInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
index e504e6355a15a..99ad7005d9da4 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
@@ -9,6 +9,10 @@
  * Interface StockStatusCriteriaInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
index 94d4998c1e318..d29171f557f05 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
@@ -9,6 +9,10 @@
  * Interface StockStatusRepositoryInterface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStatusRepositoryInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
index dc992378d128b..f349e94235a9c 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
@@ -84,7 +84,7 @@ protected function _getCustomerGroups($groupId = null)
             $this->_customerGroups[$notLoggedInGroup->getId()] = $notLoggedInGroup->getCode();
         }
         if ($groupId !== null) {
-            return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : null;
+            return $this->_customerGroups[$groupId] ?? null;
         }
         return $this->_customerGroups;
     }
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
index 15dfbd122e950..d3c165bbde1a8 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
@@ -10,6 +10,10 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Minsaleqty extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
 {
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
index 2c41e1798921a..5378801b6c24b 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
@@ -14,6 +14,10 @@
 /**
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Stock extends \Magento\Framework\Data\Form\Element\Select
 {
diff --git a/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php b/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
index cf47f39faac45..8355a96e3d0e8 100644
--- a/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
+++ b/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
@@ -39,8 +39,8 @@ public function afterGetQuantityValidators(
 
         $params = [];
         $params['minAllowed']  = (float)$stockItem->getMinSaleQty();
-        if ($stockItem->getQtyMaxAllowed()) {
-            $params['maxAllowed'] = $stockItem->getQtyMaxAllowed();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
         }
         if ($stockItem->getQtyIncrements() > 0) {
             $params['qtyIncrements'] = (float)$stockItem->getQtyIncrements();
diff --git a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
index adaa762f3279b..a12b72cd0a971 100644
--- a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
+++ b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
@@ -14,6 +14,10 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Qtyincrements extends Template implements IdentityInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
index 568fa600ec52d..4c8f356519e2d 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
@@ -131,7 +131,9 @@ public function getPlaceholderId()
      */
     public function isMsgVisible()
     {
-        return $this->getStockQty() > 0 && $this->getStockQtyLeft() <= $this->getThresholdQty();
+        return $this->getStockQty() > 0
+            && $this->getStockQtyLeft() > 0
+            && $this->getStockQtyLeft() <= $this->getThresholdQty();
     }
 
     /**
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
index c315338be0de0..5a3a3ca6ee983 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
@@ -11,6 +11,10 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class DefaultStockqty extends AbstractStockqty implements \Magento\Framework\DataObject\IdentityInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index 410e35096ee58..798ac4074c188 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -17,6 +17,11 @@
 /**
  * Class Stock
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Stock
 {
@@ -156,7 +161,7 @@ public function addIsInStockFilterToCollection($collection)
             $resource = $this->getStockStatusResource();
             $resource->addStockDataToCollection(
                 $collection,
-                !$isShowOutOfStock || $collection->getFlag('require_stock_items')
+                !$isShowOutOfStock
             );
             $collection->setFlag($stockFlag, true);
         }
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 36721db874887..145b0d1454ae2 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -20,6 +20,10 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Item extends \Magento\CatalogInventory\Model\Stock\Item implements IdentityInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index 06cfde0b7d247..8b0849c8874bc 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -9,6 +9,7 @@
 use Magento\CatalogInventory\Helper\Minsaleqty as MinsaleqtyHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Catalog\Model\ProductTypes\ConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -131,6 +132,8 @@ class Configuration implements StockConfigurationInterface
     protected $storeManager;
 
     /**
+     * Configuration constructor.
+     *
      * @param ConfigInterface $config
      * @param ScopeConfigInterface $scopeConfig
      * @param MinsaleqtyHelper $minsaleqtyHelper
@@ -149,7 +152,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultScopeId()
     {
@@ -159,6 +162,8 @@ public function getDefaultScopeId()
     }
 
     /**
+     * Is Qty Type Ids
+     *
      * @param int|null $filter
      * @return array
      */
@@ -182,6 +187,8 @@ public function getIsQtyTypeIds($filter = null)
     }
 
     /**
+     * Is Qty
+     *
      * @param int $productTypeId
      * @return bool
      */
@@ -201,12 +208,14 @@ public function canSubtractQty($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_CAN_SUBTRACT,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
+     * Get Min Qty
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return float
      */
@@ -214,12 +223,14 @@ public function getMinQty($store = null)
     {
         return (float)$this->scopeConfig->getValue(
             self::XML_PATH_MIN_QTY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
+     * Get Min Sale Qty
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @param int $customerGroupId
      * @return float
@@ -230,6 +241,8 @@ public function getMinSaleQty($store = null, $customerGroupId = null)
     }
 
     /**
+     * Get Max Sale Qty
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return float|null
      */
@@ -237,12 +250,14 @@ public function getMaxSaleQty($store = null)
     {
         return (float)$this->scopeConfig->getValue(
             self::XML_PATH_MAX_SALE_QTY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
+     * Get Notify Stock Qty
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return float
      */
@@ -250,7 +265,7 @@ public function getNotifyStockQty($store = null)
     {
         return (float) $this->scopeConfig->getValue(
             self::XML_PATH_NOTIFY_STOCK_QTY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -264,22 +279,24 @@ public function getNotifyStockQty($store = null)
      */
     public function getEnableQtyIncrements($store = null)
     {
-        return (bool) $this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_ENABLE_QTY_INCREMENTS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
+     * Get Qty Increments
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @return int
+     * @return float
      */
     public function getQtyIncrements($store = null)
     {
         return (float)$this->scopeConfig->getValue(
             self::XML_PATH_QTY_INCREMENTS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -294,7 +311,7 @@ public function getBackorders($store = null)
     {
         return (int) $this->scopeConfig->getValue(
             self::XML_PATH_BACKORDERS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -309,7 +326,7 @@ public function getManageStock($store = null)
     {
         return (int) $this->scopeConfig->isSetFlag(
             self::XML_PATH_MANAGE_STOCK,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -325,7 +342,7 @@ public function getCanBackInStock($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_CAN_BACK_IN_STOCK,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -340,7 +357,7 @@ public function isShowOutOfStock($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_SHOW_OUT_OF_STOCK,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -355,14 +372,13 @@ public function isAutoReturnEnabled($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_ITEM_AUTO_RETURN,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
-     * Get 'Display product stock status' option value
-     * Shows if it is necessary to show product stock status ('in stock'/'out of stock')
+     * Display product stock status. Shows if it is necessary to show product stock status in stock/out of stock.
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return bool
@@ -371,12 +387,14 @@ public function isDisplayProductStockStatus($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
+     * Get Default Config Value
+     *
      * @param string $field
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return string|null
@@ -385,12 +403,14 @@ public function getDefaultConfigValue($field, $store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_ITEM . $field,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
     /**
+     * Get Stock Threshold Qty
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @return string|null
      */
@@ -398,7 +418,7 @@ public function getStockThresholdQty($store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_STOCK_THRESHOLD_QTY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
new file mode 100644
index 0000000000000..f9a49d4f8d121
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\Indexer;
+
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceModifierInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Query\Generator;
+
+/**
+ * Class for filter product price index.
+ */
+class ProductPriceIndexFilter implements PriceModifierInterface
+{
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var Item
+     */
+    private $stockItem;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var Generator
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @param StockConfigurationInterface $stockConfiguration
+     * @param Item $stockItem
+     * @param ResourceConnection $resourceConnection
+     * @param string $connectionName
+     * @param Generator $batchQueryGenerator
+     * @param int $batchSize
+     */
+    public function __construct(
+        StockConfigurationInterface $stockConfiguration,
+        Item $stockItem,
+        ResourceConnection $resourceConnection = null,
+        $connectionName = 'indexer',
+        Generator $batchQueryGenerator = null,
+        $batchSize = 100
+    ) {
+        $this->stockConfiguration = $stockConfiguration;
+        $this->stockItem = $stockItem;
+        $this->resourceConnection = $resourceConnection ?: ObjectManager::getInstance()->get(ResourceConnection::class);
+        $this->connectionName = $connectionName;
+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(Generator::class);
+        $this->batchSize = $batchSize;
+    }
+
+    /**
+     * Remove out of stock products data from price index.
+     *
+     * @param IndexTableStructure $priceTable
+     * @param array $entityIds
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void
+    {
+        if ($this->stockConfiguration->isShowOutOfStock()) {
+            return;
+        }
+
+        $connection = $this->resourceConnection->getConnection($this->connectionName);
+        $select = $connection->select();
+
+        $select->from(
+            ['stock_item' => $this->stockItem->getMainTable()],
+            ['stock_item.product_id', 'MAX(stock_item.is_in_stock) as max_is_in_stock']
+        );
+
+        if ($this->stockConfiguration->getManageStock()) {
+            $select->where('stock_item.use_config_manage_stock = 1 OR stock_item.manage_stock = 1');
+        } else {
+            $select->where('stock_item.use_config_manage_stock = 0 AND stock_item.manage_stock = 1');
+        }
+
+        $select->group('stock_item.product_id');
+        $select->having('max_is_in_stock = 0');
+
+        $batchSelectIterator = $this->batchQueryGenerator->generate(
+            'product_id',
+            $select,
+            $this->batchSize,
+            \Magento\Framework\DB\Query\BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
+        );
+
+        foreach ($batchSelectIterator as $select) {
+            $productIds = null;
+            foreach ($connection->query($select)->fetchAll() as $row) {
+                $productIds[] = $row['product_id'];
+            }
+            if ($productIds !== null) {
+                $where = [$priceTable->getEntityField() .' IN (?)' => $productIds];
+                $connection->delete($priceTable->getTableName(), $where);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
index 1e7c800ea1c38..85fee62eb4303 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
@@ -10,6 +10,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Abstract action reindex class
@@ -70,25 +71,33 @@ abstract class AbstractAction
      */
     private $cacheCleaner;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory $indexerFactory
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Indexer\CacheContext $cacheContext
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         ResourceConnection $resource,
         \Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory $indexerFactory,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Indexer\CacheContext $cacheContext,
-        \Magento\Framework\Event\ManagerInterface $eventManager
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        MetadataPool $metadataPool = null
     ) {
         $this->_resource = $resource;
         $this->_indexerFactory = $indexerFactory;
         $this->_catalogProductType = $catalogProductType;
         $this->cacheContext = $cacheContext;
         $this->eventManager = $eventManager;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -154,10 +163,15 @@ protected function _getTable($entityName)
     public function getRelationsByChild($childIds)
     {
         $connection = $this->_getConnection();
-        $select = $connection->select()
-            ->from($this->_getTable('catalog_product_relation'), 'parent_id')
-            ->where('child_id IN(?)', $childIds);
-
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
+        $select = $connection->select()->from(
+            ['cpe' => $this->_getTable('catalog_product_entity')],
+            'entity_id'
+        )->join(
+            ['relation' => $this->_getTable('catalog_product_relation')],
+            'relation.parent_id = cpe.' . $linkField
+        )->where('child_id IN(?)', $childIds);
         return $connection->fetchCol($select);
     }
 
@@ -230,7 +244,8 @@ protected function _reindexRows($productIds = [])
         if (!is_array($productIds)) {
             $productIds = [$productIds];
         }
-
+        $parentIds = $this->getRelationsByChild($productIds);
+        $productIds = $parentIds ? array_unique(array_merge($parentIds, $productIds)) : $productIds;
         $this->getCacheCleaner()->clean($productIds, function () use ($productIds) {
             $this->doReindex($productIds);
         });
@@ -248,13 +263,10 @@ private function doReindex($productIds = [])
     {
         $connection = $this->_getConnection();
 
-        $parentIds = $this->getRelationsByChild($productIds);
-        $processIds = $parentIds ? array_merge($parentIds, $productIds) : $productIds;
-
         // retrieve product types by processIds
         $select = $connection->select()
             ->from($this->_getTable('catalog_product_entity'), ['entity_id', 'type_id'])
-            ->where('entity_id IN(?)', $processIds);
+            ->where('entity_id IN(?)', $productIds);
         $pairs = $connection->fetchPairs($select);
 
         $byType = [];
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
index a32faa4640a86..b3fa07479a712 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
@@ -10,8 +10,10 @@
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\CatalogInventory\Model\Stock;
 use Magento\Catalog\Model\Product;
@@ -46,25 +48,35 @@ class CacheCleaner
      */
     private $connection;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param ResourceConnection $resource
      * @param StockConfigurationInterface $stockConfiguration
      * @param CacheContext $cacheContext
      * @param ManagerInterface $eventManager
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         ResourceConnection $resource,
         StockConfigurationInterface $stockConfiguration,
         CacheContext $cacheContext,
-        ManagerInterface $eventManager
+        ManagerInterface $eventManager,
+        MetadataPool $metadataPool = null
     ) {
         $this->resource = $resource;
         $this->stockConfiguration = $stockConfiguration;
         $this->cacheContext = $cacheContext;
         $this->eventManager = $eventManager;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
+     * Clean cache by product ids.
+     *
      * @param array $productIds
      * @param callable $reindex
      * @return void
@@ -76,22 +88,37 @@ public function clean(array $productIds, callable $reindex)
         $productStatusesAfter = $this->getProductStockStatuses($productIds);
         $productIds = $this->getProductIdsForCacheClean($productStatusesBefore, $productStatusesAfter);
         if ($productIds) {
-            $this->cacheContext->registerEntities(Product::CACHE_TAG, $productIds);
+            $this->cacheContext->registerEntities(Product::CACHE_TAG, array_unique($productIds));
             $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
         }
     }
 
     /**
+     * Get current stock statuses for product ids.
+     *
      * @param array $productIds
      * @return array
      */
     private function getProductStockStatuses(array $productIds)
     {
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
         $select = $this->getConnection()->select()
             ->from(
-                $this->resource->getTableName('cataloginventory_stock_status'),
+                ['css' => $this->resource->getTableName('cataloginventory_stock_status')],
                 ['product_id', 'stock_status', 'qty']
-            )->where('product_id IN (?)', $productIds)
+            )
+            ->joinLeft(
+                ['cpr' => $this->resource->getTableName('catalog_product_relation')],
+                'css.product_id = cpr.child_id',
+                []
+            )
+            ->joinLeft(
+                ['cpe' => $this->resource->getTableName('catalog_product_entity')],
+                'cpr.parent_id = cpe.' . $linkField,
+                ['parent_id' => 'cpe.entity_id']
+            )
+            ->where('product_id IN (?)', $productIds)
             ->where('stock_id = ?', Stock::DEFAULT_STOCK_ID)
             ->where('website_id = ?', $this->stockConfiguration->getDefaultScopeId());
 
@@ -125,6 +152,9 @@ private function getProductIdsForCacheClean(array $productStatusesBefore, array
             if ($statusBefore['stock_status'] !== $statusAfter['stock_status']
                 || ($stockThresholdQty && $statusAfter['qty'] <= $stockThresholdQty)) {
                 $productIds[] = $productId;
+                if (isset($statusAfter['parent_id'])) {
+                    $productIds[] = $statusAfter['parent_id'];
+                }
             }
         }
 
@@ -132,6 +162,8 @@ private function getProductIdsForCacheClean(array $productStatusesBefore, array
     }
 
     /**
+     * Get database connection.
+     *
      * @return AdapterInterface
      */
     private function getConnection()
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
index ff0b5a42bfd44..edbb7f50771e8 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
@@ -8,39 +8,40 @@
 namespace Magento\CatalogInventory\Model\Plugin;
 
 use Magento\Catalog\Model\Product\Attribute\Repository;
+use Magento\Catalog\Model\FilterProductCustomAttribute as Filter;
 
 class FilterCustomAttribute
 {
     /**
-     * @var array
+     * @var Filter
      */
-    private $blackList;
+    private $filter;
 
     /**
-     * @param array $blackList
+     * @param Filter $filter
+     * @internal param Filter $customAttribute
      */
-    public function __construct(array $blackList = [])
+    public function __construct(Filter $filter)
     {
-        $this->blackList = $blackList;
+        $this->filter = $filter;
     }
 
     /**
-     * Delete custom attribute
+     * Remove attributes from black list
      *
      * @param Repository $repository
      * @param array $attributes
-     * @return \Magento\Eav\Model\AttributeRepository
+     * @return \Magento\Framework\Api\MetadataObjectInterface[]
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes)
+    public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes): array
     {
-        foreach ($attributes as $key => $attribute) {
-            if (in_array($attribute->getAttributeCode(), $this->blackList)) {
-                unset($attributes[$key]);
-            }
+        $return = [];
+        foreach ($attributes as $attribute) {
+            $return[$attribute->getAttributeCode()] = $attribute;
         }
 
-        return $attributes;
+        return $this->filter->execute($return);
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php b/app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php
new file mode 100644
index 0000000000000..c061c459bfb49
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\Plugin;
+
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Update product price index after product stock status changed.
+ */
+class PriceIndexUpdater
+{
+    /**
+     * @var Processor
+     */
+    private $priceIndexProcessor;
+
+    /**
+     * @param Processor $priceIndexProcessor
+     */
+    public function __construct(Processor $priceIndexProcessor)
+    {
+        $this->priceIndexProcessor = $priceIndexProcessor;
+    }
+
+    /**
+     * @param Item $subject
+     * @param Item $result
+     * @param AbstractModel $model
+     * @return Item
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(Item $subject, Item $result, AbstractModel $model): Item
+    {
+        $fields = [
+            'is_in_stock',
+            'use_config_manage_stock',
+            'manage_stock',
+        ];
+        foreach ($fields as $field) {
+            if ($model->dataHasChangedFor($field)) {
+                $this->priceIndexProcessor->reindexRow($model->getProductId());
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Item $subject
+     * @param mixed $result
+     * @param int $websiteId
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUpdateSetOutOfStock(Item $subject, $result, int $websiteId)
+    {
+        $this->priceIndexProcessor->markIndexerAsInvalid();
+    }
+
+    /**
+     * @param Item $subject
+     * @param mixed $result
+     * @param int $websiteId
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUpdateSetInStock(Item $subject, $result, int $websiteId)
+    {
+        $this->priceIndexProcessor->markIndexerAsInvalid();
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/ProductSearch.php b/app/code/Magento/CatalogInventory/Model/Plugin/ProductSearch.php
new file mode 100644
index 0000000000000..ecb84fe26cd61
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/ProductSearch.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\Plugin;
+
+use Magento\CatalogInventory\Helper\Stock;
+
+/** Plugin to add stock filter depends on configuration */
+class ProductSearch
+{
+    /**
+     * @var Stock
+     */
+    private $stockHelper;
+
+    /**
+     * @param Stock $stockHelper
+     */
+    public function __construct(Stock $stockHelper)
+    {
+        $this->stockHelper = $stockHelper;
+    }
+
+    /**
+     * Adds stock filter depends on configuration
+     *
+     * @param \Magento\Catalog\Model\ProductLink\Search $subject
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterPrepareCollection(
+        \Magento\Catalog\Model\ProductLink\Search $subject,
+        \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+    ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
+        $this->stockHelper->addIsInStockFilterToCollection($collection);
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/ReindexUpdatedProducts.php b/app/code/Magento/CatalogInventory/Model/Plugin/ReindexUpdatedProducts.php
new file mode 100644
index 0000000000000..f10afcd4ea329
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/ReindexUpdatedProducts.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogInventory\Model\Plugin;
+
+use Magento\Catalog\Model\Product\Action as ProductAction;
+
+/**
+ * Plugin for Magento\Catalog\Model\Product\Action
+ */
+class ReindexUpdatedProducts
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     */
+    private $indexerProcessor;
+
+    /**
+     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor  $indexerProcessor
+     */
+    public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Processor $indexerProcessor)
+    {
+        $this->indexerProcessor = $indexerProcessor;
+    }
+
+    /**
+     * Reindex on product attribute mass change
+     *
+     * @param ProductAction $subject
+     * @param ProductAction $action
+     * @param array $productIds
+     * @return ProductAction
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUpdateAttributes(
+        ProductAction $subject,
+        ProductAction $action,
+        $productIds
+    ) {
+        $this->indexerProcessor->reindexList(array_unique($productIds));
+        return $action;
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index 3fb0790640ffc..502d9532e8a05 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\Quote\Item;
 
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
@@ -16,10 +17,18 @@
 use Magento\CatalogInventory\Model\Stock;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Quote\Item;
 
 /**
+ * Quote item quantity validator.
+ *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class QuantityValidator
 {
@@ -66,8 +75,7 @@ public function __construct(
      * Add error information to Quote Item
      *
      * @param \Magento\Framework\DataObject $result
-     * @param \Magento\Quote\Model\Quote\Item $quoteItem
-     * @param bool $removeError
+     * @param Item $quoteItem
      * @return void
      */
     private function addErrorInfoToQuote($result, $quoteItem)
@@ -99,12 +107,11 @@ private function addErrorInfoToQuote($result, $quoteItem)
      */
     public function validate(Observer $observer)
     {
-        /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
+        /* @var $quoteItem Item */
         $quoteItem = $observer->getEvent()->getItem();
         if (!$quoteItem ||
             !$quoteItem->getProductId() ||
-            !$quoteItem->getQuote() ||
-            $quoteItem->getQuote()->getIsSuperMode()
+            !$quoteItem->getQuote()
         ) {
             return;
         }
@@ -114,7 +121,19 @@ public function validate(Observer $observer)
         /* @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
         $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
         if (!$stockItem instanceof StockItemInterface) {
-            throw new LocalizedException(__('The stock item for Product is not valid.'));
+            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 */
@@ -159,41 +178,17 @@ 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) {
-                $result = $this->stockState->checkQtyIncrements(
-                    $product->getId(),
-                    $qty,
-                    $product->getStore()->getWebsiteId()
-                );
-                if ($result->getHasError()) {
-                    $quoteItem->addErrorInfo(
-                        'cataloginventory',
-                        Data::ERROR_QTY_INCREMENTS,
-                        $result->getMessage()
-                    );
-
-                    $quoteItem->getQuote()->addErrorInfo(
-                        $result->getQuoteMessageIndex(),
-                        'cataloginventory',
-                        Data::ERROR_QTY_INCREMENTS,
-                        $result->getQuoteMessage()
-                    );
-                } else {
-                    // Delete error from item and its quote, if it was set due to qty problems
-                    $this->_removeErrorsFromQuoteAndItem(
-                        $quoteItem,
-                        Data::ERROR_QTY_INCREMENTS
-                    );
-                }
+                $this->checkOptionsQtyIncrements($quoteItem, $options);
             }
+
             // variable to keep track if we have previously encountered an error in one of the options
             $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
@@ -206,7 +201,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 {
@@ -216,10 +211,47 @@ public function validate(Observer $observer)
         }
     }
 
+    /**
+     * Verifies product options quantity increments.
+     *
+     * @param Item $quoteItem
+     * @param array $options
+     * @return void
+     */
+    private function checkOptionsQtyIncrements(Item $quoteItem, array $options): void
+    {
+        $removeErrors = true;
+        foreach ($options as $option) {
+            $result = $this->stockState->checkQtyIncrements(
+                $option->getProduct()->getId(),
+                $quoteItem->getData('qty'),
+                $option->getProduct()->getStore()->getWebsiteId()
+            );
+            if ($result->getHasError()) {
+                $quoteItem->getQuote()->addErrorInfo(
+                    $result->getQuoteMessageIndex(),
+                    'cataloginventory',
+                    Data::ERROR_QTY_INCREMENTS,
+                    $result->getQuoteMessage()
+                );
+
+                $removeErrors = false;
+            }
+        }
+
+        if ($removeErrors) {
+            // Delete error from item and its quote, if it was set due to qty problems
+            $this->_removeErrorsFromQuoteAndItem(
+                $quoteItem,
+                Data::ERROR_QTY_INCREMENTS
+            );
+        }
+    }
+
     /**
      * Removes error statuses from quote and item, set by this observer
      *
-     * @param \Magento\Quote\Model\Quote\Item $item
+     * @param Item $item
      * @param int $code
      * @return void
      */
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 3e972a1b84203..a48b9ae5f0808 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
@@ -9,6 +9,9 @@
 use Magento\CatalogInventory\Api\StockStateInterface;
 use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList;
 
+/**
+ * Quote item option initializer.
+ */
 class Option
 {
     /**
@@ -67,10 +70,6 @@ public function getStockItem(
          * define that stock item is child for composite product
          */
         $stockItem->setIsChildItem(true);
-        /**
-         * don't check qty increments value for option product
-         */
-        $stockItem->setSuppressCheckQtyIncrements(true);
 
         return $stockItem;
     }
@@ -121,7 +120,7 @@ public function initialize(
             /**
              * if option's qty was updates we also need to update quote item qty
              */
-            $quoteItem->setData('qty', intval($qty));
+            $quoteItem->setData('qty', (int) $qty);
         }
         if ($result->getMessage() !== null) {
             $option->setMessage($result->getMessage());
@@ -133,6 +132,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 6bdc4c67de658..6fb0a949941ec 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/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
index 366cb1c3902a3..ba3b62f554767 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
@@ -18,6 +18,10 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class DefaultStock extends AbstractIndexer implements StockInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
index abe473bd9682b..115002b237645 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
@@ -11,6 +11,10 @@
 /**
  * @api
  * @since 100.1.0
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface QueryProcessorInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
index 5ced55edf208b..24ed496372817 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
@@ -9,6 +9,10 @@
  * CatalogInventory Stock Indexer Interface
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
index f9738484766b9..0ee162e429f40 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
@@ -12,6 +12,10 @@
 /**
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class StockFactory
 {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
index 9f89d380a8f96..b80c26c53a76e 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
@@ -56,7 +56,9 @@ public function process(Select $select)
                 ['stock' => $stockStatusTable],
                 sprintf('stock.product_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
                 []
-            )->where('stock.stock_status = ?', Stock::STOCK_IN_STOCK);
+            )
+                ->where('stock.stock_status = ?', Stock::STOCK_IN_STOCK)
+                ->where('stock.website_id = ?', 0);
         }
 
         return $select;
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
index 9223fd32e3567..53f00529b9bcc 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -113,20 +113,20 @@ protected function _construct()
     }
 
     /**
-     * Lock Stock Item records
+     * Lock Stock Item records.
      *
      * @param int[] $productIds
      * @param int $websiteId
      * @return array
      */
-    public function lockProductsStock($productIds, $websiteId)
+    public function lockProductsStock(array $productIds, $websiteId)
     {
         if (empty($productIds)) {
             return [];
         }
         $itemTable = $this->getTable('cataloginventory_stock_item');
         $select = $this->getConnection()->select()->from(['si' => $itemTable])
-            ->where('website_id=?', $websiteId)
+            ->where('website_id = ?', $websiteId)
             ->where('product_id IN(?)', $productIds)
             ->forUpdate(true);
 
@@ -136,12 +136,19 @@ public function lockProductsStock($productIds, $websiteId)
             ->columns(
                 [
                     'product_id' => 'entity_id',
-                    'type_id' => 'type_id'
+                    'type_id' => 'type_id',
                 ]
             );
-        $this->getConnection()->query($select);
+        $items = [];
 
-        return $this->getConnection()->fetchAll($selectProducts);
+        foreach ($this->getConnection()->query($select)->fetchAll() as $si) {
+            $items[$si['product_id']] = $si;
+        }
+        foreach ($this->getConnection()->fetchAll($selectProducts) as $p) {
+            $items[$p['product_id']]['type_id'] = $p['type_id'];
+        }
+        
+        return $items;
     }
 
     /**
@@ -199,6 +206,8 @@ protected function _initConfig()
     /**
      * Set items out of stock basing on their quantities and config settings
      *
+     * @deprecated
+     * @see \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::updateSetOutOfStock
      * @param string|int $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
@@ -234,6 +243,8 @@ public function updateSetOutOfStock($website = null)
     /**
      * Set items in stock basing on their quantities and config settings
      *
+     * @deprecated
+     * @see \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::updateSetInStock
      * @param int|string $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
@@ -267,6 +278,8 @@ public function updateSetInStock($website)
     /**
      * Update items low stock date basing on their quantities and config settings
      *
+     * @deprecated
+     * @see \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::updateLowStockDate
      * @param int|string $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return void
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
index 895fffaa4f80b..ce8930ad4f7a6 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
@@ -6,10 +6,14 @@
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock;
 
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
-use Magento\Framework\App\ResourceConnection as AppResource;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\DB\Select;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 
 /**
  * Stock item resource model
@@ -29,17 +33,36 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $stockIndexerProcessor;
 
     /**
-     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @param Context $context
      * @param Processor $processor
      * @param string $connectionName
+     * @param StockConfigurationInterface $stockConfiguration
+     * @param DateTime $dateTime
      */
     public function __construct(
-        \Magento\Framework\Model\ResourceModel\Db\Context $context,
+        Context $context,
         Processor $processor,
-        $connectionName = null
+        $connectionName = null,
+        StockConfigurationInterface $stockConfiguration = null,
+        DateTime $dateTime = null
     ) {
         $this->stockIndexerProcessor = $processor;
         parent::__construct($context, $connectionName);
+
+        $this->stockConfiguration = $stockConfiguration ??
+            ObjectManager::getInstance()->get(StockConfigurationInterface::class);
+        $this->dateTime = $dateTime ??
+            ObjectManager::getInstance()->get(DateTime::class);
     }
 
     /**
@@ -139,4 +162,160 @@ public function setProcessIndexEvents($process = true)
         $this->processIndexEvents = $process;
         return $this;
     }
+
+    /**
+     * Set items out of stock basing on their quantities and config settings
+     *
+     * @param int $websiteId
+     * @return void
+     */
+    public function updateSetOutOfStock(int $websiteId)
+    {
+        $connection = $this->getConnection();
+
+        $values = [
+            'is_in_stock' => Stock::STOCK_OUT_OF_STOCK,
+            'stock_status_changed_auto' => 1,
+        ];
+        $select = $this->buildProductsSelectByConfigTypes();
+        $where = [
+            'website_id = ' . $websiteId,
+            'is_in_stock = ' . Stock::STOCK_IN_STOCK,
+            '(use_config_manage_stock = 1 AND 1 = ' . $this->stockConfiguration->getManageStock() . ')'
+            . ' OR (use_config_manage_stock = 0 AND manage_stock = 1)',
+            '(use_config_min_qty = 1 AND qty <= ' . $this->stockConfiguration->getMinQty() . ')'
+            . ' OR (use_config_min_qty = 0 AND qty <= min_qty)',
+            'product_id IN (' . $select->assemble() . ')',
+        ];
+        $backordersWhere = '(use_config_backorders = 0 AND backorders = ' . Stock::BACKORDERS_NO . ')';
+        if (Stock::BACKORDERS_NO == $this->stockConfiguration->getBackorders()) {
+            $where[] = $backordersWhere . ' OR use_config_backorders = 1';
+        } else {
+            $where[] = $backordersWhere;
+        }
+        $connection->update($this->getMainTable(), $values, $where);
+
+        $this->stockIndexerProcessor->markIndexerAsInvalid();
+    }
+
+    /**
+     * Set items in stock basing on their quantities and config settings
+     *
+     * @param int $websiteId
+     * @return void
+     */
+    public function updateSetInStock(int $websiteId)
+    {
+        $connection = $this->getConnection();
+
+        $values = [
+            'is_in_stock' => Stock::STOCK_IN_STOCK,
+        ];
+        $select = $this->buildProductsSelectByConfigTypes();
+        $where = [
+            'website_id = ' . $websiteId,
+            'stock_status_changed_auto = 1',
+            '(use_config_min_qty = 1 AND qty > ' . $this->stockConfiguration->getMinQty() . ')'
+            . ' OR (use_config_min_qty = 0 AND qty > min_qty)',
+            'product_id IN (' . $select->assemble() . ')',
+        ];
+        $manageStockWhere = '(use_config_manage_stock = 0 AND manage_stock = 1)';
+        if ($this->stockConfiguration->getManageStock()) {
+            $where[] = $manageStockWhere . ' OR use_config_manage_stock = 1';
+        } else {
+            $where[] = $manageStockWhere;
+        }
+        $connection->update($this->getMainTable(), $values, $where);
+
+        $this->stockIndexerProcessor->markIndexerAsInvalid();
+    }
+
+    /**
+     * Update items low stock date basing on their quantities and config settings
+     *
+     * @param int $websiteId
+     * @return void
+     */
+    public function updateLowStockDate(int $websiteId)
+    {
+        $connection = $this->getConnection();
+
+        $condition = $connection->quoteInto(
+            '(use_config_notify_stock_qty = 1 AND qty < ?)',
+            $this->stockConfiguration->getNotifyStockQty()
+        ) . ' OR (use_config_notify_stock_qty = 0 AND qty < notify_stock_qty)';
+        $currentDbTime = $connection->quoteInto('?', $this->dateTime->gmtDate());
+        $conditionalDate = $connection->getCheckSql($condition, $currentDbTime, 'NULL');
+        $value = [
+            'low_stock_date' => new \Zend_Db_Expr($conditionalDate),
+        ];
+        $select = $this->buildProductsSelectByConfigTypes();
+        $where = [
+            'website_id = ' . $websiteId,
+            'product_id IN (' . $select->assemble() . ')'
+        ];
+        $manageStockWhere = '(use_config_manage_stock = 0 AND manage_stock = 1)';
+        if ($this->stockConfiguration->getManageStock()) {
+            $where[] = $manageStockWhere . ' OR use_config_manage_stock = 1';
+        } else {
+            $where[] = $manageStockWhere;
+        }
+        $connection->update($this->getMainTable(), $value, $where);
+    }
+
+    public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
+    {
+        if ($tableAlias) {
+            $tableAlias .= '.';
+        }
+        $manageStock = $this->getConnection()->getCheckSql(
+            $tableAlias . 'use_config_manage_stock = 1',
+            $this->stockConfiguration->getManageStock(),
+            $tableAlias . 'manage_stock'
+        );
+
+        return $manageStock;
+    }
+
+    public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
+    {
+        if ($tableAlias) {
+            $tableAlias .= '.';
+        }
+        $itemBackorders = $this->getConnection()->getCheckSql(
+            $tableAlias . 'use_config_backorders = 1',
+            $this->stockConfiguration->getBackorders(),
+            $tableAlias . 'backorders'
+        );
+
+        return $itemBackorders;
+    }
+
+    public function getMinSaleQtyExpr(string $tableAlias = ''): \Zend_Db_Expr
+    {
+        if ($tableAlias) {
+            $tableAlias .= '.';
+        }
+        $itemMinSaleQty = $this->getConnection()->getCheckSql(
+            $tableAlias . 'use_config_min_sale_qty = 1',
+            $this->stockConfiguration->getMinSaleQty(),
+            $tableAlias . 'min_sale_qty'
+        );
+
+        return $itemMinSaleQty;
+    }
+
+    /**
+     * Build select for products with types from config
+     *
+     * @return Select
+     */
+    private function buildProductsSelectByConfigTypes(): Select
+    {
+        $select = $this->getConnection()->select()
+            ->from($this->getTable('catalog_product_entity'), 'entity_id')
+            ->where('type_id IN (?)', array_keys($this->stockConfiguration->getIsQtyTypeIds(true)));
+
+        return $select;
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index e9f3cd59af0bb..402ce5f2f611e 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -5,13 +5,18 @@
  */
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock;
 
-use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\Framework\App\ObjectManager;
 
 /**
  * CatalogInventory Stock Status per website Resource Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -46,19 +51,23 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param string $connectionName
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Store\Model\WebsiteFactory $websiteFactory,
         \Magento\Eav\Model\Config $eavConfig,
-        $connectionName = null
+        $connectionName = null,
+        $stockConfiguration = null
     ) {
         parent::__construct($context, $connectionName);
 
         $this->_storeManager = $storeManager;
         $this->_websiteFactory = $websiteFactory;
         $this->eavConfig = $eavConfig;
+        $this->stockConfiguration = $stockConfiguration ?: ObjectManager::getInstance()
+            ->get(StockConfigurationInterface::class);
     }
 
     /**
@@ -204,7 +213,7 @@ public function getProductCollection($lastEntityId = 0, $limit = 1000)
      */
     public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Magento\Store\Model\Website $website)
     {
-        $websiteId = $this->getStockConfiguration()->getDefaultScopeId();
+        $websiteId = $this->getWebsiteId($website->getId());
         $select->joinLeft(
             ['stock_status' => $this->getMainTable()],
             'e.entity_id = stock_status.product_id AND stock_status.website_id=' . $websiteId,
@@ -221,7 +230,7 @@ public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Ma
      */
     public function addStockDataToCollection($collection, $isFilterInStock)
     {
-        $websiteId = $this->getStockConfiguration()->getDefaultScopeId();
+        $websiteId = $this->getWebsiteId();
         $joinCondition = $this->getConnection()->quoteInto(
             'e.entity_id = stock_status_index.product_id' . ' AND stock_status_index.website_id = ?',
             $websiteId
@@ -255,7 +264,7 @@ public function addStockDataToCollection($collection, $isFilterInStock)
      */
     public function addIsInStockFilterToCollection($collection)
     {
-        $websiteId = $this->getStockConfiguration()->getDefaultScopeId();
+        $websiteId = $this->getWebsiteId();
         $joinCondition = $this->getConnection()->quoteInto(
             'e.entity_id = stock_status_index.product_id' . ' AND stock_status_index.website_id = ?',
             $websiteId
@@ -277,6 +286,19 @@ public function addIsInStockFilterToCollection($collection)
         return $this;
     }
 
+    /**
+     * @param \Magento\Store\Model\Website $websiteId
+     * @return int
+     */
+    private function getWebsiteId($websiteId = null)
+    {
+        if (null === $websiteId) {
+            $websiteId = $this->stockConfiguration->getDefaultScopeId();
+        }
+
+        return $websiteId;
+    }
+
     /**
      * Retrieve Product(s) status for store
      * Return array where key is a product_id, value - status
@@ -335,18 +357,4 @@ public function getProductStatus($productIds, $storeId = null)
         }
         return $statuses;
     }
-
-    /**
-     * @return StockConfigurationInterface
-     *
-     * @deprecated 100.1.0
-     */
-    private function getStockConfiguration()
-    {
-        if ($this->stockConfiguration === null) {
-            $this->stockConfiguration = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class);
-        }
-        return $this->stockConfiguration;
-    }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
index 1d200d27a4445..0bffb9a9888cd 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
@@ -9,6 +9,10 @@
  * Back orders source class
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Backorders implements \Magento\Framework\Option\ArrayInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Stock.php b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
index f64026cce23a5..7d44ab782de61 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
@@ -11,6 +11,10 @@
  * CatalogInventory Stock source model
  * @api
  * @since 100.0.2
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 class Stock extends AbstractSource
 {
@@ -26,4 +30,23 @@ public function getAllOptions()
             ['value' => \Magento\CatalogInventory\Model\Stock::STOCK_OUT_OF_STOCK, 'label' => __('Out of Stock')]
         ];
     }
+
+    /**
+     * Add Value Sort To Collection Select.
+     *
+     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param string $dir
+     *
+     * @return $this
+     */
+    public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
+    {
+        $collection->getSelect()->joinLeft(
+            ['stock_item_table' => 'cataloginventory_stock_item'],
+            "e.entity_id=stock_item_table.product_id",
+            []
+        );
+        $collection->getSelect()->order("stock_item_table.qty $dir");
+        return $this;
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index b4b70041ce148..553ea7393c94d 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -206,7 +206,7 @@ public function getStockStatusChangedAuto()
      */
     public function getQty()
     {
-        return null === $this->_getData(static::QTY) ? null : floatval($this->_getData(static::QTY));
+        return null === $this->_getData(static::QTY) ? null : (float)$this->_getData(static::QTY);
     }
 
     /**
@@ -392,7 +392,7 @@ public function getUseConfigQtyIncrements()
     /**
      * Retrieve Quantity Increments
      *
-     * @return int|false
+     * @return int|float|false
      */
     public function getQtyIncrements()
     {
@@ -401,7 +401,13 @@ public function getQtyIncrements()
                 if ($this->getUseConfigQtyIncrements()) {
                     $this->qtyIncrements = $this->stockConfiguration->getQtyIncrements($this->getStoreId());
                 } else {
-                    $this->qtyIncrements = (int) $this->getData(static::QTY_INCREMENTS);
+                    $this->qtyIncrements = $this->getData(static::QTY_INCREMENTS);
+                }
+
+                if ($this->getIsQtyDecimal()) { // Cast accordingly to decimal qty usage
+                    $this->qtyIncrements = (float) $this->qtyIncrements;
+                } else {
+                    $this->qtyIncrements = (int) $this->qtyIncrements;
                 }
             }
             if ($this->qtyIncrements <= 0) {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
index 9a56c8e8804ec..4941d5d333bdb 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -17,14 +17,6 @@
  */
 class Status extends AbstractExtensibleModel implements StockStatusInterface
 {
-    /**#@+
-     * Stock Status values
-     */
-    const STATUS_OUT_OF_STOCK = 0;
-
-    const STATUS_IN_STOCK = 1;
-    /**#@-*/
-
     /**#@+
      * Field name
      */
@@ -80,6 +72,8 @@ protected function _construct()
     //@codeCoverageIgnoreStart
 
     /**
+     * Retrieve  product ID
+     *
      * @return int
      */
     public function getProductId()
@@ -88,6 +82,8 @@ public function getProductId()
     }
 
     /**
+     * Retrieve website ID
+     *
      * @return int
      */
     public function getWebsiteId()
@@ -96,6 +92,8 @@ public function getWebsiteId()
     }
 
     /**
+     * Retrieve stock ID
+     *
      * @return int
      */
     public function getStockId()
@@ -104,6 +102,8 @@ public function getStockId()
     }
 
     /**
+     * Retrieve qty
+     *
      * @return int
      */
     public function getQty()
@@ -112,16 +112,20 @@ public function getQty()
     }
 
     /**
+     * Retrieve stock status
+     *
      * @return int
      */
-    public function getStockStatus()
+    public function getStockStatus(): int
     {
-        return $this->getData(self::KEY_STOCK_STATUS);
+        return (int)$this->getData(self::KEY_STOCK_STATUS);
     }
 
     //@codeCoverageIgnoreEnd
 
     /**
+     * Retrieve stock item
+     *
      * @return StockItemInterface
      */
     public function getStockItem()
@@ -132,6 +136,8 @@ public function getStockItem()
     //@codeCoverageIgnoreStart
 
     /**
+     * Set product ID
+     *
      * @param int $productId
      * @return $this
      */
@@ -141,6 +147,8 @@ public function setProductId($productId)
     }
 
     /**
+     * Set web website ID
+     *
      * @param int $websiteId
      * @return $this
      */
@@ -150,6 +158,8 @@ public function setWebsiteId($websiteId)
     }
 
     /**
+     * Set stock ID
+     *
      * @param int $stockId
      * @return $this
      */
@@ -159,6 +169,8 @@ public function setStockId($stockId)
     }
 
     /**
+     * Set qty
+     *
      * @param int $qty
      * @return $this
      */
@@ -168,6 +180,8 @@ public function setQty($qty)
     }
 
     /**
+     * Set stock status
+     *
      * @param int $stockStatus
      * @return $this
      */
@@ -177,7 +191,7 @@ public function setStockStatus($stockStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface|null
      */
@@ -187,7 +201,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * Set an extension attributes object.
      *
      * @param \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
index e5154a10f0a19..515080d56541c 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\Stock;
 
 use Magento\Catalog\Model\ProductFactory;
@@ -10,7 +11,7 @@
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\CatalogInventory\Api\StockItemRepositoryInterface as StockItemRepositoryInterface;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Item as StockItemResource;
 use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
@@ -183,7 +184,7 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
 
             $this->resource->save($stockItem);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Unable to save Stock Item'), $exception);
+            throw new CouldNotSaveException(__('The stock item was unable to be saved. Please try again.'), $exception);
         }
         return $stockItem;
     }
@@ -196,7 +197,9 @@ public function get($stockItemId)
         $stockItem = $this->stockItemFactory->create();
         $this->resource->load($stockItem, $stockItemId);
         if (!$stockItem->getItemId()) {
-            throw new NoSuchEntityException(__('Stock Item with id "%1" does not exist.', $stockItemId));
+            throw new NoSuchEntityException(
+                __('The stock item with the "%1" ID wasn\'t found. Verify the ID and try again.', $stockItemId)
+            );
         }
         return $stockItem;
     }
@@ -225,7 +228,10 @@ public function delete(StockItemInterface $stockItem)
             $this->getStockRegistryStorage()->removeStockStatus($stockItem->getProductId());
         } catch (\Exception $exception) {
             throw new CouldNotDeleteException(
-                __('Unable to remove Stock Item with id "%1"', $stockItem->getItemId()),
+                __(
+                    'The stock item with the "%1" ID wasn\'t found. Verify the ID and try again.',
+                    $stockItem->getItemId()
+                ),
                 $exception
             );
         }
@@ -242,7 +248,7 @@ public function deleteById($id)
             $this->delete($stockItem);
         } catch (\Exception $exception) {
             throw new CouldNotDeleteException(
-                __('Unable to remove Stock Item with id "%1"', $id),
+                __('The stock item with the "%1" ID wasn\'t found. Verify the ID and try again.', $id),
                 $exception
             );
         }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
index 0e7add8a95181..d4d82dd35ee2b 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\Stock;
 
 use Magento\CatalogInventory\Api\Data\StockCollectionInterfaceFactory;
@@ -84,7 +85,7 @@ public function save(StockInterface $stock)
         try {
             $this->resource->save($stock);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Unable to save Stock'), $exception);
+            throw new CouldNotSaveException(__('The stock was unable to be saved. Please try again.'), $exception);
         }
         return $stock;
     }
@@ -99,7 +100,9 @@ public function get($stockId)
         $stock = $this->stockFactory->create();
         $this->resource->load($stock, $stockId);
         if (!$stock->getId()) {
-            throw new NoSuchEntityException(__('Stock with id "%1" does not exist.', $stockId));
+            throw new NoSuchEntityException(
+                __('The stock with the "%1" ID wasn\'t found. Verify the ID and try again.', $stockId)
+            );
         }
         return $stock;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
index 3dfc4c49a5d63..4db1b07ea517d 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\Stock;
 
 use Magento\CatalogInventory\Api\Data\StockStatusCollectionInterfaceFactory;
@@ -82,7 +83,10 @@ public function save(StockStatusInterface $stockStatus)
         try {
             $this->resource->save($stockStatus);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('Unable to save Stock Status'), $exception);
+            throw new CouldNotSaveException(
+                __('The stock status was unable to be saved. Please try again.'),
+                $exception
+            );
         }
         return $stockStatus;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockItemValidator.php b/app/code/Magento/CatalogInventory/Model/StockItemValidator.php
index 2cc4832159d55..5d218a4f06516 100644
--- a/app/code/Magento/CatalogInventory/Model/StockItemValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/StockItemValidator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -53,21 +54,34 @@ public function validate(ProductInterface $product, StockItemInterface $stockIte
         $stockId = $stockItem->getStockId();
         if ($stockId !== null && $stockId != $defaultStockId) {
             throw new LocalizedException(
-                __('Invalid stock id: %1. Only default stock with id %2 allowed', $stockId, $defaultStockId)
+                __(
+                    'The "%1" value is invalid for stock ID. Enter stock with a default value of %2 to try again.',
+                    $stockId,
+                    $defaultStockId
+                )
             );
         }
 
         $stockItemId = $stockItem->getItemId();
         if ($stockItemId !== null && (!is_numeric($stockItemId) || $stockItemId <= 0)) {
             throw new LocalizedException(
-                __('Invalid stock item id: %1. Should be null or numeric value greater than 0', $stockItemId)
+                __(
+                    'The "%1" value is invalid for stock item ID. '
+                    . 'Enter either zero or a number than zero to try again.',
+                    $stockItemId
+                )
             );
         }
 
         $defaultStockItemId = $this->stockRegistry->getStockItem($product->getId())->getItemId();
         if ($defaultStockItemId && $stockItemId !== null && $defaultStockItemId != $stockItemId) {
             throw new LocalizedException(
-                __('Invalid stock item id: %1. Assigned stock item id is %2', $stockItemId, $defaultStockItemId)
+                __(
+                    'The "%1" value is invalid for stock item ID. '
+                    . 'Use the stock item ID\'s assigned "%2" value and try again.',
+                    $stockItemId,
+                    $defaultStockItemId
+                )
             );
         }
     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index 06599446a9ea9..b3939f2e5149b 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
@@ -48,6 +50,11 @@ class StockManagement implements StockManagementInterface
      */
     private $qtyCounter;
 
+    /**
+     * @var StockRegistryStorage
+     */
+    private $stockRegistryStorage;
+
     /**
      * @param ResourceStock $stockResource
      * @param StockRegistryProviderInterface $stockRegistryProvider
@@ -55,6 +62,7 @@ class StockManagement implements StockManagementInterface
      * @param StockConfigurationInterface $stockConfiguration
      * @param ProductRepositoryInterface $productRepository
      * @param QtyCounterInterface $qtyCounter
+     * @param StockRegistryStorage|null $stockRegistryStorage
      */
     public function __construct(
         ResourceStock $stockResource,
@@ -62,7 +70,8 @@ public function __construct(
         StockState $stockState,
         StockConfigurationInterface $stockConfiguration,
         ProductRepositoryInterface $productRepository,
-        QtyCounterInterface $qtyCounter
+        QtyCounterInterface $qtyCounter,
+        StockRegistryStorage $stockRegistryStorage = null
     ) {
         $this->stockRegistryProvider = $stockRegistryProvider;
         $this->stockState = $stockState;
@@ -70,11 +79,13 @@ public function __construct(
         $this->productRepository = $productRepository;
         $this->qtyCounter = $qtyCounter;
         $this->resource = $stockResource;
+        $this->stockRegistryStorage = $stockRegistryStorage ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StockRegistryStorage::class);
     }
 
     /**
      * Subtract product qtys from stock.
-     * Return array of items that require full save
+     * Return array of items that require full save.
      *
      * @param string[] $items
      * @param int $websiteId
@@ -92,9 +103,12 @@ public function registerProductsSale($items, $websiteId = null)
         $fullSaveItems = $registeredItems = [];
         foreach ($lockedItems as $lockedItemRecord) {
             $productId = $lockedItemRecord['product_id'];
+            $this->stockRegistryStorage->removeStockItem($productId, $websiteId);
+
             /** @var StockItemInterface $stockItem */
             $orderedQty = $items[$productId];
             $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
+            $stockItem->setQty($lockedItemRecord['qty']); // update data from locked item
             $canSubtractQty = $stockItem->getItemId() && $this->canSubtractQty($stockItem);
             if (!$canSubtractQty || !$this->stockConfiguration->isQty($lockedItemRecord['type_id'])) {
                 continue;
@@ -102,7 +116,7 @@ public function registerProductsSale($items, $websiteId = null)
             if (!$stockItem->hasAdminArea()
                 && !$this->stockState->checkQty($productId, $orderedQty, $stockItem->getWebsiteId())
             ) {
-                $this->getResource()->rollBack();
+                $this->getResource()->commit();
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Not all of your products are available in the requested quantity.')
                 );
@@ -122,6 +136,7 @@ public function registerProductsSale($items, $websiteId = null)
         }
         $this->qtyCounter->correctItemsQty($registeredItems, $websiteId, '-');
         $this->getResource()->commit();
+        
         return $fullSaveItems;
     }
 
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index d688132fdb916..f60edee330195 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Model\ProductFactory;
@@ -192,7 +193,7 @@ protected function resolveProductId($productSku)
         if (!$productId) {
             throw new \Magento\Framework\Exception\NoSuchEntityException(
                 __(
-                    'Product with SKU "%1" does not exist',
+                    'The Product with the "%1" SKU doesn\'t exist.',
                     $productSku
                 )
             );
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
index af417954a8412..8238c1e8f6b21 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
@@ -68,7 +68,7 @@ public function removeStock($scopeId = null)
      */
     public function getStockItem($productId, $scopeId)
     {
-        return isset($this->stockItems[$productId][$scopeId]) ? $this->stockItems[$productId][$scopeId] : null;
+        return $this->stockItems[$productId][$scopeId] ?? null;
     }
 
     /**
@@ -103,7 +103,7 @@ public function removeStockItem($productId, $scopeId = null)
      */
     public function getStockStatus($productId, $scopeId)
     {
-        return isset($this->stockStatuses[$productId][$scopeId]) ? $this->stockStatuses[$productId][$scopeId] : null;
+        return $this->stockStatuses[$productId][$scopeId] ?? null;
     }
 
     /**
@@ -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/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index ea4fdc994d682..31fd5606a9849 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -9,9 +9,9 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
+use Magento\Framework\DataObject\Factory as ObjectFactory;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Math\Division as MathDivision;
-use Magento\Framework\DataObject\Factory as ObjectFactory;
 
 /**
  * Interface StockStateProvider
@@ -65,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Validate stock
+     *
      * @param StockItemInterface $stockItem
      * @return bool
      */
@@ -82,6 +84,8 @@ public function verifyStock(StockItemInterface $stockItem)
     }
 
     /**
+     * Verify notification
+     *
      * @param StockItemInterface $stockItem
      * @return bool
      */
@@ -91,6 +95,8 @@ public function verifyNotification(StockItemInterface $stockItem)
     }
 
     /**
+     * Validate quote qty
+     *
      * @param StockItemInterface $stockItem
      * @param int|float $qty
      * @param int|float $summaryQty
@@ -113,13 +119,13 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
         if (!$stockItem->getIsQtyDecimal()) {
             $result->setHasQtyOptionUpdate(true);
-            $qty = intval($qty);
+            $qty = (int) $qty;
             /**
              * Adding stock data to quote item
              */
             $result->setItemQty($qty);
             $qty = $this->getNumber($qty);
-            $origQty = intval($origQty);
+            $origQty = (int) $origQty;
             $result->setOrigQty($origQty);
         }
 
@@ -160,7 +166,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         }
 
         if (!$this->checkQty($stockItem, $summaryQty) || !$this->checkQty($stockItem, $qty)) {
-            $message = __('We don\'t have as many "%1" as you requested.', $stockItem->getProductName());
+            $message = __('The requested qty is not available');
             $result->setHasError(true)->setMessage($message)->setQuoteMessage($message)->setQuoteMessageIndex('qty');
             return $result;
         } else {
@@ -212,7 +218,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
                         }
                     } elseif ($stockItem->getShowDefaultNotificationMessage()) {
                         $result->setMessage(
-                            __('We don\'t have as many "%1" as you requested.', $stockItem->getProductName())
+                            __('The requested qty is not available')
                         );
                     }
                 }
@@ -254,6 +260,8 @@ public function checkQty(StockItemInterface $stockItem, $qty)
     }
 
     /**
+     * Returns suggested qty
+     *
      * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
      * or original qty if such value does not exist
      *
@@ -294,6 +302,8 @@ public function suggestQty(StockItemInterface $stockItem, $qty)
     }
 
     /**
+     * Check Qty Increments
+     *
      * @param StockItemInterface $stockItem
      * @param float|int $qty
      * @return \Magento\Framework\DataObject
@@ -369,6 +379,8 @@ public function getStockQty(StockItemInterface $stockItem)
     }
 
     /**
+     * Get numeric qty
+     *
      * @param string|float|int|null $qty
      * @return float|null
      */
diff --git a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php
index f34d765b0e5f0..3c4586c9eddd1 100644
--- a/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php
+++ b/app/code/Magento/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\System\Config\Backend;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -22,7 +23,9 @@ public function beforeSave()
     {
         $value = $this->getValue();
         if (floor($value) != $value) {
-            throw new LocalizedException(__('Decimal qty increments is not allowed.'));
+            throw new LocalizedException(
+                __("Quantity increments can't use decimals. Enter a new increment and try again.")
+            );
         }
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Observer/AddStockItemsObserver.php b/app/code/Magento/CatalogInventory/Observer/AddStockItemsObserver.php
new file mode 100644
index 0000000000000..8fa90cf6531c4
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Observer/AddStockItemsObserver.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Observer;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Add Stock items to product collection.
+ */
+class AddStockItemsObserver implements ObserverInterface
+{
+    /**
+     * @var StockItemCriteriaInterfaceFactory
+     */
+    private $criteriaInterfaceFactory;
+
+    /**
+     * @var StockItemRepositoryInterface
+     */
+    private $stockItemRepository;
+
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * AddStockItemsObserver constructor.
+     *
+     * @param StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory
+     * @param StockItemRepositoryInterface $stockItemRepository
+     * @param StockConfigurationInterface $stockConfiguration
+     */
+    public function __construct(
+        StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory,
+        StockItemRepositoryInterface $stockItemRepository,
+        StockConfigurationInterface $stockConfiguration
+    ) {
+        $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
+        $this->stockItemRepository = $stockItemRepository;
+        $this->stockConfiguration = $stockConfiguration;
+    }
+
+    /**
+     * Add stock items to products in collection.
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var Collection $productCollection */
+        $productCollection = $observer->getData('collection');
+        $productIds = array_keys($productCollection->getItems());
+        $criteria = $this->criteriaInterfaceFactory->create();
+        $criteria->setProductsFilter($productIds);
+        $criteria->setScopeFilter($this->stockConfiguration->getDefaultScopeId());
+        $stockItemCollection = $this->stockItemRepository->getList($criteria);
+        foreach ($stockItemCollection->getItems() as $item) {
+            /** @var Product $product */
+            $product = $productCollection->getItemById($item->getProductId());
+            $productExtension = $product->getExtensionAttributes();
+            $productExtension->setStockItem($item);
+            $product->setExtensionAttributes($productExtension);
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Observer/InvalidatePriceIndexUponConfigChangeObserver.php b/app/code/Magento/CatalogInventory/Observer/InvalidatePriceIndexUponConfigChangeObserver.php
new file mode 100644
index 0000000000000..976110ec76cf3
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Observer/InvalidatePriceIndexUponConfigChangeObserver.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+use Magento\CatalogInventory\Model\Configuration;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+
+/**
+ * Catalog inventory config changes module observer.
+ */
+class InvalidatePriceIndexUponConfigChangeObserver implements ObserverInterface
+{
+    /**
+     * @var Processor
+     */
+    private $priceIndexProcessor;
+
+    /**
+     * @param Processor $priceIndexProcessor
+     */
+    public function __construct(Processor $priceIndexProcessor)
+    {
+        $this->priceIndexProcessor = $priceIndexProcessor;
+    }
+
+    /**
+     * Invalidate product price index on catalog inventory config changes.
+     *
+     * @param Observer $observer
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute(Observer $observer)
+    {
+        $changedPaths = (array) $observer->getEvent()->getChangedPaths();
+
+        if (\in_array(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, $changedPaths, true)) {
+            $priceIndexer = $this->priceIndexProcessor->getIndexer();
+            $priceIndexer->invalidate();
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php b/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
index 1055afd263da3..88dab3026c945 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 e473f714bd21d..6aad119694a9f 100644
--- a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
@@ -12,8 +12,7 @@
 use Magento\Framework\Event\Observer as EventObserver;
 
 /**
- * This observer prepares stock data for saving by combining stock data from the stock data property
- * and quantity_and_stock_status attribute and setting it to the single point represented by stock data property.
+ * Prepares stock data for saving
  *
  * @deprecated 100.2.0 Stock data should be processed using the module API
  * @see StockItemInterface when you want to change the stock data
@@ -63,18 +62,17 @@ 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) {
                 $this->setStockDataToProduct($product, $stockItem, $quantityAndStockStatus);
             }
         }
-        $product->unsetData('quantity_and_stock_status');
     }
 
     /**
@@ -97,7 +95,7 @@ private function prepareQuantityAndStockStatus(StockItemInterface $stockItem, ar
             ) {
                 unset($quantityAndStockStatus['is_in_stock']);
             }
-            if (isset($quantityAndStockStatus['qty'])
+            if (array_key_exists('qty', $quantityAndStockStatus)
                 && $stockItem->getQty() == $quantityAndStockStatus['qty']
             ) {
                 unset($quantityAndStockStatus['qty']);
diff --git a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
index 6fbec08e4805b..01689eb7c90b4 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/Observer/UpdateItemsStockUponConfigChangeObserver.php b/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php
index 47ee6512920d8..21c78eca93695 100644
--- a/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/UpdateItemsStockUponConfigChangeObserver.php
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\CatalogInventory\Observer;
 
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\CatalogInventory\Model\Configuration;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
 
 /**
  * Catalog inventory module observer
@@ -15,16 +16,16 @@
 class UpdateItemsStockUponConfigChangeObserver implements ObserverInterface
 {
     /**
-     * @var \Magento\CatalogInventory\Model\ResourceModel\Stock
+     * @var Item
      */
-    protected $resourceStock;
+    protected $resourceStockItem;
 
     /**
-     * @param \Magento\CatalogInventory\Model\ResourceModel\Stock $resourceStock
+     * @param Item $resourceStockItem
      */
-    public function __construct(\Magento\CatalogInventory\Model\ResourceModel\Stock $resourceStock)
+    public function __construct(Item $resourceStockItem)
     {
-        $this->resourceStock = $resourceStock;
+        $this->resourceStockItem = $resourceStockItem;
     }
 
     /**
@@ -35,9 +36,18 @@ public function __construct(\Magento\CatalogInventory\Model\ResourceModel\Stock
      */
     public function execute(EventObserver $observer)
     {
-        $website = $observer->getEvent()->getWebsite();
-        $this->resourceStock->updateSetOutOfStock($website);
-        $this->resourceStock->updateSetInStock($website);
-        $this->resourceStock->updateLowStockDate($website);
+        $website = (int) $observer->getEvent()->getWebsite();
+        $changedPaths = (array) $observer->getEvent()->getChangedPaths();
+
+        if (\array_intersect([
+            Configuration::XML_PATH_MANAGE_STOCK,
+            Configuration::XML_PATH_MIN_QTY,
+            Configuration::XML_PATH_BACKORDERS,
+            Configuration::XML_PATH_NOTIFY_STOCK_QTY,
+        ], $changedPaths)) {
+            $this->resourceStockItem->updateSetOutOfStock($website);
+            $this->resourceStockItem->updateSetInStock($website);
+            $this->resourceStockItem->updateLowStockDate($website);
+        }
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallData.php b/app/code/Magento/CatalogInventory/Setup/InstallData.php
deleted file mode 100644
index 6fd1745574266..0000000000000
--- a/app/code/Magento/CatalogInventory/Setup/InstallData.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogInventory\Setup;
-
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->getConnection()
-            ->insertForce(
-                $setup->getTable('cataloginventory_stock'),
-                ['stock_id' => 1, 'stock_name' => 'Default']
-            );
-
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        $groupName = 'Product Details';
-        $entityTypeId = $eavSetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-        $attributeSetId = $eavSetup->getAttributeSetId($entityTypeId, 'Default');
-
-        $attribute = $eavSetup->getAttribute($entityTypeId, 'quantity_and_stock_status');
-        if ($attribute) {
-            $eavSetup->addAttributeToGroup($entityTypeId, $attributeSetId, $groupName, $attribute['attribute_id'], 60);
-            $eavSetup->updateAttribute($entityTypeId, $attribute['attribute_id'], 'default_value', 1);
-        }
-    }
-}
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
deleted file mode 100644
index 5479b69f8314f..0000000000000
--- a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogInventory\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'cataloginventory_stock'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('cataloginventory_stock'))
-            ->addColumn(
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Stock Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                5,
-                ['unsigned' => true, 'nullable' => false],
-                'Website Id'
-            )
-            ->addColumn(
-                'stock_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Stock Name'
-            )
-            ->addIndex(
-                $setup->getIdxName(
-                    $installer->getTable('cataloginventory_stock'),
-                    ['website_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-                ),
-                ['website_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-            )
-            ->setComment('Cataloginventory Stock');
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'cataloginventory_stock_item'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('cataloginventory_stock_item'))
-            ->addColumn(
-                'item_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Item Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product Id'
-            )
-            ->addColumn(
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Stock Id'
-            )
-            ->addColumn(
-                'qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['unsigned' => false, 'nullable' => true, 'default' => null],
-                'Qty'
-            )
-            ->addColumn(
-                'min_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Min Qty'
-            )
-            ->addColumn(
-                'use_config_min_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Min Qty'
-            )
-            ->addColumn(
-                'is_qty_decimal',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Qty Decimal'
-            )
-            ->addColumn(
-                'backorders',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Backorders'
-            )
-            ->addColumn(
-                'use_config_backorders',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Backorders'
-            )
-            ->addColumn(
-                'min_sale_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '1.0000'],
-                'Min Sale Qty'
-            )
-            ->addColumn(
-                'use_config_min_sale_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Min Sale Qty'
-            )
-            ->addColumn(
-                'max_sale_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Max Sale Qty'
-            )
-            ->addColumn(
-                'use_config_max_sale_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Max Sale Qty'
-            )
-            ->addColumn(
-                'is_in_stock',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is In Stock'
-            )
-            ->addColumn(
-                'low_stock_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Low Stock Date'
-            )
-            ->addColumn(
-                'notify_stock_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                [],
-                'Notify Stock Qty'
-            )
-            ->addColumn(
-                'use_config_notify_stock_qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Notify Stock Qty'
-            )
-            ->addColumn(
-                'manage_stock',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Manage Stock'
-            )
-            ->addColumn(
-                'use_config_manage_stock',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Manage Stock'
-            )
-            ->addColumn(
-                'stock_status_changed_auto',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Stock Status Changed Automatically'
-            )
-            ->addColumn(
-                'use_config_qty_increments',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Qty Increments'
-            )
-            ->addColumn(
-                'qty_increments',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Qty Increments'
-            )
-            ->addColumn(
-                'use_config_enable_qty_inc',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Use Config Enable Qty Increments'
-            )
-            ->addColumn(
-                'enable_qty_increments',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Enable Qty Increments'
-            )
-            ->addColumn(
-                'is_decimal_divided',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                5,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Divided into Multiple Boxes for Shipping'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                5,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Website ID'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'cataloginventory_stock_item',
-                    ['product_id', 'stock_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_id', 'stock_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'cataloginventory_stock_item',
-                    ['website_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-                ),
-                ['website_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_item', ['stock_id']),
-                ['stock_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'cataloginventory_stock_item',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('cataloginventory_stock_item', 'stock_id', 'cataloginventory_stock', 'stock_id'),
-                'stock_id',
-                $installer->getTable('cataloginventory_stock'),
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Cataloginventory Stock Item');
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'cataloginventory_stock_status'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('cataloginventory_stock_status'))
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Stock Id'
-            )
-            ->addColumn(
-                'qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Qty'
-            )
-            ->addColumn(
-                'stock_status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Stock Status'
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status', ['stock_id']),
-                ['stock_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status', ['website_id']),
-                ['website_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status', ['stock_status']),
-                ['stock_status']
-            )
-            ->setComment('Cataloginventory Stock Status');
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'cataloginventory_stock_status_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('cataloginventory_stock_status_idx'))
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Stock Id'
-            )
-            ->addColumn(
-                'qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Qty'
-            )
-            ->addColumn(
-                'stock_status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Stock Status'
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status_idx', ['stock_id']),
-                ['stock_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status_idx', ['website_id']),
-                ['website_id']
-            )
-            ->setComment('Cataloginventory Stock Status Indexer Idx');
-        $installer->getConnection()
-            ->createTable($table);
-
-        /**
-         * Create table 'cataloginventory_stock_status_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('cataloginventory_stock_status_tmp'))
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addColumn(
-                'stock_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Stock Id'
-            )
-            ->addColumn(
-                'qty',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Qty'
-            )
-            ->addColumn(
-                'stock_status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Stock Status'
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status_tmp', ['stock_id']),
-                ['stock_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('cataloginventory_stock_status_tmp', ['website_id']),
-                ['website_id']
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment('Cataloginventory Stock Status Indexer Tmp');
-        $installer->getConnection()
-            ->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..d0ea3da59c51d
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedDataToJson
+ * @package Magento\CatalogInventory\Setup\Patch
+ */
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * @var QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * ConvertSerializedDataToJson constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     * @param QueryModifierFactory $queryModifierFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        FieldDataConverterFactory $fieldDataConverterFactory,
+        QueryModifierFactory $queryModifierFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+        $this->queryModifierFactory = $queryModifierFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $select = $this->moduleDataSetup->getConnection()
+            ->select()
+            ->from(
+                $this->moduleDataSetup->getTable('core_config_data'),
+                ['config_id', 'value']
+            )
+            ->where('path = ?', 'cataloginventory/item_options/min_sale_qty');
+
+        $rows = $this->moduleDataSetup->getConnection()->fetchAssoc($select);
+        $serializedRows = array_filter($rows, function ($row) {
+            return $this->isSerialized($row['value']);
+        });
+
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $queryModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'config_id' => array_keys($serializedRows)
+                ]
+            ]
+        );
+
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'config_id',
+            'value',
+            $queryModifier
+        );
+    }
+
+    /**
+     * Check if value is a serialized string
+     *
+     * @param string $value
+     * @return boolean
+     */
+    private function isSerialized($value)
+    {
+        return (boolean) preg_match('/^((s|i|d|b|a|O|C):|N;)/', $value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateStockItemsWebsite::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.2.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
new file mode 100644
index 0000000000000..ceb353a8091a7
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class CreateDefaultStock
+ * @package Magento\CatalogInventory\Setup\Patch
+ */
+class CreateDefaultStock implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * PrepareInitialConfig constructor.
+     * @param ModuleDataSetupInterface $resourceConnection
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $resourceConnection,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $resourceConnection;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()
+            ->insertForce(
+                $this->moduleDataSetup->getTable('cataloginventory_stock'),
+                ['stock_id' => 1, 'stock_name' => 'Default']
+            );
+
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $groupName = 'Product Details';
+        $entityTypeId = $eavSetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $attributeSetId = $eavSetup->getAttributeSetId($entityTypeId, 'Default');
+        $attribute = $eavSetup->getAttribute($entityTypeId, 'quantity_and_stock_status');
+        if ($attribute) {
+            $eavSetup->addAttributeToGroup($entityTypeId, $attributeSetId, $groupName, $attribute['attribute_id'], 60);
+            $eavSetup->updateAttribute($entityTypeId, $attribute['attribute_id'], 'default_value', 1);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
new file mode 100644
index 0000000000000..9c73da8915b64
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Setup\Patch\Data;
+
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateStockItemsWebsite
+ * @package Magento\CatalogInventory\Setup\Patch
+ */
+class UpdateStockItemsWebsite implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Framework\Indexer\AbstractProcessor
+     */
+    private $indexerProcessor;
+
+    /**
+     * UpdateStockItemsWebsite constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Indexer\AbstractProcessor $indexerProcessor
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        Processor $indexerProcessor
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->stockConfiguration = $stockConfiguration;
+        $this->storeManager = $storeManager;
+        $this->indexerProcessor = $indexerProcessor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->update(
+            $this->moduleDataSetup->getTable('cataloginventory_stock_item'),
+            ['website_id' => $this->stockConfiguration->getDefaultScopeId()],
+            ['website_id = ?' => $this->storeManager->getWebsite()->getId()]
+        );
+        $this->indexerProcessor->getIndexer()->invalidate();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            CreateDefaultStock::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.2.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
deleted file mode 100644
index 8c99861308ba1..0000000000000
--- a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\CatalogInventory\Setup;
-
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Framework\Indexer\AbstractProcessor;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Store\Model\StoreManagerInterface;
-
-/**
- * Upgrade Data script
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var StockConfigurationInterface
-     */
-    private $configuration;
-
-    /**
-     * @var AbstractProcessor
-     */
-    private $indexerProcessor;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * @var QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * @param StockConfigurationInterface $configuration
-     * @param StoreManagerInterface $storeManager
-     * @param AbstractProcessor $indexerProcessor
-     * @param FieldDataConverterFactory $fieldDataConverterFactory
-     * @param QueryModifierFactory $queryModifierFactory
-     */
-    public function __construct(
-        StockConfigurationInterface $configuration,
-        StoreManagerInterface $storeManager,
-        AbstractProcessor $indexerProcessor,
-        FieldDataConverterFactory $fieldDataConverterFactory,
-        QueryModifierFactory $queryModifierFactory
-    ) {
-        $this->configuration = $configuration;
-        $this->storeManager = $storeManager;
-        $this->indexerProcessor = $indexerProcessor;
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-        $this->queryModifierFactory = $queryModifierFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        if (version_compare($context->getVersion(), '2.2.0') < 0) {
-            $this->upgradeCatalogInventoryStockItem($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.2.1', '<')) {
-            $this->convertSerializedDataToJson($setup);
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeCatalogInventoryStockItem($setup)
-    {
-        $setup->getConnection()->update(
-            $setup->getTable('cataloginventory_stock_item'),
-            ['website_id' => $this->configuration->getDefaultScopeId()],
-            ['website_id = ?' => $this->storeManager->getWebsite()->getId()]
-        );
-        $this->indexerProcessor->getIndexer()->invalidate();
-    }
-
-    /**
-     * Upgrade data to version 2.2.1, converts row data in the core_config_data table that uses the
-     * path cataloginventory/item_options/min_sale_qty from serialized to JSON. Stored value may not be
-     * serialized, so validate data format before executing update.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function convertSerializedDataToJson(ModuleDataSetupInterface $setup)
-    {
-        $select = $setup->getConnection()
-            ->select()
-            ->from(
-                $setup->getTable('core_config_data'),
-                ['config_id', 'value']
-            )
-            ->where('path = ?', 'cataloginventory/item_options/min_sale_qty');
-
-        $rows = $setup->getConnection()->fetchAssoc($select);
-        $serializedRows = array_filter($rows, function ($row) {
-            return $this->isSerialized($row['value']);
-        });
-
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-        $queryModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'config_id' => array_keys($serializedRows)
-                ]
-            ]
-        );
-
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('core_config_data'),
-            'config_id',
-            'value',
-            $queryModifier
-        );
-    }
-
-    /**
-     * Check if value is a serialized string
-     *
-     * @param string $value
-     * @return boolean
-     */
-    private function isSerialized($value)
-    {
-        return (boolean) preg_match('/^((s|i|d|b|a|O|C):|N;)/', $value);
-    }
-}
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php b/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php
deleted file mode 100644
index e8f6de22cbfc8..0000000000000
--- a/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogInventory\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\CatalogInventory\Model\Stock\Item as StockItem;
-
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private $productCompositeKeyVersion = '2.2.0';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), $this->productCompositeKeyVersion, '<')) {
-            $this->upgradeProductCompositeKey($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.3.0', '<')) {
-            $this->addCatalogInventoryStockStatusIndexOnStockStatus($setup);
-            $this->addReplicaTable($setup, 'cataloginventory_stock_status', 'cataloginventory_stock_status_replica');
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function upgradeProductCompositeKey(SchemaSetupInterface $setup)
-    {
-        $oldCompositeKeyColumns = ['product_id', 'website_id'];
-        $newCompositeKeyColumns = ['product_id', 'stock_id'];
-
-        $foreignKeys = $this->getForeignKeys($setup, $oldCompositeKeyColumns);
-        // drop foreign keys
-        $this->dropForeignKeys($setup, $foreignKeys);
-
-        $oldIndexName = $setup->getIdxName(
-            $setup->getTable(StockItem::ENTITY),
-            $oldCompositeKeyColumns,
-            \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-        );
-
-        $newIndexName = $setup->getIdxName(
-            $setup->getTable(StockItem::ENTITY),
-            $newCompositeKeyColumns,
-            \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-        );
-
-        // Drop a key based on the following columns: "product_id","website_id"
-        $setup->getConnection()->dropIndex($setup->getTable(StockItem::ENTITY), $oldIndexName);
-
-        // Create a key based on the following columns: "product_id","stock_id"
-        $setup->getConnection()
-            ->addIndex(
-                $setup->getTable(StockItem::ENTITY),
-                $newIndexName,
-                $newCompositeKeyColumns,
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            );
-        // restore deleted foreign keys
-        $this->createForeignKeys($setup, $foreignKeys);
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @param array                $keys
-     * @return void
-     */
-    private function dropForeignKeys(SchemaSetupInterface $setup, array $keys)
-    {
-        foreach ($keys as $key) {
-            $setup->getConnection()->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @param array                $keys
-     * @return void
-     */
-    private function createForeignKeys(SchemaSetupInterface $setup, array $keys)
-    {
-        foreach ($keys as $key) {
-            $setup->getConnection()->addForeignKey(
-                $key['FK_NAME'],
-                $key['TABLE_NAME'],
-                $key['COLUMN_NAME'],
-                $key['REF_TABLE_NAME'],
-                $key['REF_COLUMN_NAME'],
-                $key['ON_DELETE']
-            );
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @param array                $compositeKeys
-     * @return array
-     */
-    private function getForeignKeys(SchemaSetupInterface $setup, array $compositeKeys)
-    {
-        $foreignKeys = [];
-        $allForeignKeys = $setup->getConnection()->getForeignKeys($setup->getTable(StockItem::ENTITY));
-        foreach ($allForeignKeys as $key) {
-            if (in_array($key['COLUMN_NAME'], $compositeKeys)) {
-                $foreignKeys[] = $key;
-            }
-        }
-
-        return $foreignKeys;
-    }
-
-    /**
-     * Creates index for `stock_status` field in `cataloginventory_stock_status` table
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addCatalogInventoryStockStatusIndexOnStockStatus(SchemaSetupInterface $setup)
-    {
-        $table = $setup->getTable('cataloginventory_stock_status');
-        $indexesList = $setup->getConnection()->getIndexList($table);
-        $indexName = $setup->getIdxName($table, ['stock_status']);
-
-        if (!array_key_exists(strtoupper($indexName), $indexesList)) {
-            $setup->getConnection()->addIndex(
-                $table,
-                $indexName,
-                ['stock_status']
-            );
-        }
-    }
-
-    /**
-     * Add replica table for existing one.
-     *
-     * @param SchemaSetupInterface $setup
-     * @param string $existingTable
-     * @param string $replicaTable
-     * @return void
-     */
-    private function addReplicaTable(SchemaSetupInterface $setup, $existingTable, $replicaTable)
-    {
-        $sql = sprintf(
-            'CREATE TABLE IF NOT EXISTS %s LIKE %s',
-            $setup->getConnection()->quoteIdentifier($setup->getTable($replicaTable)),
-            $setup->getConnection()->quoteIdentifier($setup->getTable($existingTable))
-        );
-        $setup->getConnection()->query($sql);
-    }
-}
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
new file mode 100644
index 0000000000000..c7c9126f46803
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="displayOutOfStockProduct">
+        <amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
+        <conditionalClick stepKey="expandProductStockOptions" selector="{{InventoryConfigSection.ProductStockOptionsTab}}" dependentSelector="{{InventoryConfigSection.CheckIfProductStockOptionsTabExpanded}}" visible="true" />
+        <waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="waitForDisplayOutOfStockOption" />
+        <uncheckOption selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" stepKey="waitForSwitcherDropdown" />
+        <selectOption selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" userInput="Yes" stepKey="switchToYes" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+    </actionGroup>
+    <actionGroup name="noDisplayOutOfStockProduct">
+        <amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
+        <uncheckOption selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" stepKey="waitForSwitcherDropdown" />
+        <selectOption selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" userInput="No" stepKey="switchToNo" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE.txt b/app/code/Magento/CatalogInventory/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE.txt
rename to app/code/Magento/CatalogInventory/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE_AFL.txt b/app/code/Magento/CatalogInventory/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE_AFL.txt
rename to app/code/Magento/CatalogInventory/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
new file mode 100644
index 0000000000000..ba8a3c300b2e8
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="InventoryConfigurationPage" url="admin/system_config/edit/section/cataloginventory/" area="admin" module="Magento_Config">
+        <section name="InventorySection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/README.md b/app/code/Magento/CatalogInventory/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3903fe316b36c
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Inventory Functional Tests
+
+The Functional Test Module for **Magento Catalog Inventory** module.
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
new file mode 100644
index 0000000000000..929f43467b947
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="InventoryConfigSection">
+        <element name="ProductStockOptionsTab" type="button" selector="#cataloginventory_options-head"/>
+        <element name="CheckIfProductStockOptionsTabExpanded" type="button" selector="#cataloginventory_options-head:not(.open)"/>
+        <element name="DisplayOutOfStockSystemValue" type="checkbox" selector="#cataloginventory_options_show_out_of_stock_inherit"/>
+        <element name="DisplayOutOfStockDropdown" type="select" selector="#cataloginventory_options_show_out_of_stock"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
new file mode 100644
index 0000000000000..706df79b1ef8b
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AssociatedProductToConfigurableOutOfStockTest">
+        <annotations>
+            <features value="CatalogInventory"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Out of stock associated products to configurable are not full page cache cleaned "/>
+            <description value="After last configurable product was ordered it becomes out of stock"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94135"/>
+            <group value="CatalogInventory"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
+
+            <!-- Create configurable product with two options -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="simplecategory"/>
+            </createData>
+
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create child product with single quantity -->
+            <createData entity="ApiSimpleSingleQty" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- Create customer -->
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer">
+                <field key="group_id">1</field>
+            </createData>
+        </before>
+
+        <after>
+              <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+              <deleteData createDataKey="simplecategory" stepKey="deleteSimpleCategory"/>
+              <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
+              <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+              <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+              <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+          </after>
+
+        <!-- Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUpNewUser">
+            <argument name="Customer" value="$$createSimpleUsCustomer$$"/>
+        </actionGroup>
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <!-- Go to configurable product page -->
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Order product with single quantity -->
+        <selectOption userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="configProductFillOption" />
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <waitForPageLoad stepKey="waitForOrderSuccessPage1"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="StorefrontSignOutActionGroup"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <!-- Reset admin order filter -->
+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
+
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForShipLoadingMask"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="submitShipment"/>
+        <waitForPageLoad stepKey="waitShipmentCreated"/>
+        <actionGroup ref="logout" stepKey="logout"/>
+        <magentoCLI stepKey="runCron" command="cron:run --group='index'"/>
+
+        <!-- Wait till cron job runs for schedule updates -->
+        <wait time="60" stepKey="waitForUpdateStarts"/>
+
+        <!-- Assert that product with single quantity is not available for order -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="assertOptionNotAvailable" />
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
index 4ef2e78e590fb..4ec795daf86aa 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
@@ -28,7 +28,7 @@ protected function setUp()
 
         $this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Model\Stock\Item::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getMinSaleQty', 'getQtyMaxAllowed', 'getQtyIncrements'])
+            ->setMethods(['getMinSaleQty', 'getMaxSaleQty', 'getQtyIncrements'])
             ->getMock();
 
         $this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
@@ -48,8 +48,8 @@ public function testAfterGetQuantityValidators()
             'validate-item-quantity' =>
                 [
                     'minAllowed' => 0.5,
-                    'maxAllowed' => 5,
-                    'qtyIncrements' => 3
+                    'maxAllowed' => 5.0,
+                    'qtyIncrements' => 3.0
                 ]
         ];
         $validators = [];
@@ -74,7 +74,7 @@ public function testAfterGetQuantityValidators()
             ->with('productId', 'websiteId')
             ->willReturn($this->stockItem);
         $this->stockItem->expects($this->once())->method('getMinSaleQty')->willReturn(0.5);
-        $this->stockItem->expects($this->any())->method('getQtyMaxAllowed')->willReturn(5);
+        $this->stockItem->expects($this->any())->method('getMaxSaleQty')->willReturn(5);
         $this->stockItem->expects($this->any())->method('getQtyIncrements')->willReturn(3);
 
         $this->assertEquals($result, $this->block->afterGetQuantityValidators($productViewBlock, $validators));
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
index 2fe40c118b06a..bd04df0da0a4a 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
@@ -167,6 +167,9 @@ public function testAddInStockFilterToCollection($configMock)
         $this->assertNull($this->stock->addInStockFilterToCollection($collectionMock));
     }
 
+    /**
+     * @return array
+     */
     public function filterProvider()
     {
         $configMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
index d2779b79b30d7..cefc4ada7d212 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
@@ -144,7 +144,7 @@ public function testGetEnableQtyIncrements()
         $store = 1;
 
         $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with(
                 Configuration::XML_PATH_ENABLE_QTY_INCREMENTS,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
index e1a19bf10ecd4..3590c96bd1532 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
@@ -44,7 +44,8 @@ public function testExecuteWithAdapterErrorThrowsException()
             ]
         );
 
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage($exceptionMessage);
 
         $model->execute();
     }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
index 5e4249685f8d3..755e54a919b63 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\Product;
@@ -43,6 +44,11 @@ class CacheCleanerTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheContextMock;
 
+    /**
+     * @var MetadataPool |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
     /**
      * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -61,6 +67,8 @@ protected function setUp()
             ->setMethods(['getStockThresholdQty'])->getMockForAbstractClass();
         $this->cacheContextMock = $this->getMockBuilder(CacheContext::class)->disableOriginalConstructor()->getMock();
         $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)->getMock();
+        $this->metadataPoolMock = $this->getMockBuilder(MetadataPool::class)
+            ->setMethods(['getMetadata', 'getLinkField'])->disableOriginalConstructor()->getMock();
         $this->selectMock = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
 
         $this->resourceMock->expects($this->any())
@@ -73,7 +81,8 @@ protected function setUp()
                 'resource' => $this->resourceMock,
                 'stockConfiguration' => $this->stockConfigurationMock,
                 'cacheContext' => $this->cacheContextMock,
-                'eventManager' => $this->eventManagerMock
+                'eventManager' => $this->eventManagerMock,
+                'metadataPool' => $this->metadataPoolMock
             ]
         );
     }
@@ -90,6 +99,7 @@ public function testClean($stockStatusBefore, $stockStatusAfter, $qtyAfter, $sto
         $productId = 123;
         $this->selectMock->expects($this->any())->method('from')->willReturnSelf();
         $this->selectMock->expects($this->any())->method('where')->willReturnSelf();
+        $this->selectMock->expects($this->any())->method('joinLeft')->willReturnSelf();
         $this->connectionMock->expects($this->exactly(2))->method('select')->willReturn($this->selectMock);
         $this->connectionMock->expects($this->exactly(2))->method('fetchAll')->willReturnOnConsecutiveCalls(
             [
@@ -105,7 +115,10 @@ public function testClean($stockStatusBefore, $stockStatusAfter, $qtyAfter, $sto
             ->with(Product::CACHE_TAG, [$productId]);
         $this->eventManagerMock->expects($this->once())->method('dispatch')
             ->with('clean_cache_by_tags', ['object' => $this->cacheContextMock]);
-
+        $this->metadataPoolMock->expects($this->exactly(2))->method('getMetadata')
+            ->willReturnSelf();
+        $this->metadataPoolMock->expects($this->exactly(2))->method('getLinkField')
+            ->willReturn('row_id');
         $callback = function () {
         };
         $this->unit->clean([], $callback);
@@ -136,6 +149,7 @@ public function testNotCleanCache($stockStatusBefore, $stockStatusAfter, $qtyAft
         $productId = 123;
         $this->selectMock->expects($this->any())->method('from')->willReturnSelf();
         $this->selectMock->expects($this->any())->method('where')->willReturnSelf();
+        $this->selectMock->expects($this->any())->method('joinLeft')->willReturnSelf();
         $this->connectionMock->expects($this->exactly(2))->method('select')->willReturn($this->selectMock);
         $this->connectionMock->expects($this->exactly(2))->method('fetchAll')->willReturnOnConsecutiveCalls(
             [
@@ -149,6 +163,10 @@ public function testNotCleanCache($stockStatusBefore, $stockStatusAfter, $qtyAft
             ->willReturn($stockThresholdQty);
         $this->cacheContextMock->expects($this->never())->method('registerEntities');
         $this->eventManagerMock->expects($this->never())->method('dispatch');
+        $this->metadataPoolMock->expects($this->exactly(2))->method('getMetadata')
+            ->willReturnSelf();
+        $this->metadataPoolMock->expects($this->exactly(2))->method('getLinkField')
+            ->willReturn('row_id');
 
         $callback = function () {
         };
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/ProductLinksTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/ProductLinksTest.php
index ea562da2f01c0..3788b1bc401fe 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/ProductLinksTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/ProductLinksTest.php
@@ -48,6 +48,9 @@ public function testAfterGetProductCollectionShow($status, $callCount)
         $this->assertEquals($collectionMock, $this->model->afterGetProductCollection($subjectMock, $collectionMock));
     }
 
+    /**
+     * @return array
+     */
     private function buildMocks()
     {
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection $collectionMock */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php
index eb32c30ab4f86..87233b4048b20 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/OptionTest.php
@@ -151,7 +151,6 @@ public function testInitializeWhenResultIsDecimalGetBackordersMessageHasOptionQt
         $this->optionMock->expects($this->any())->method('getProduct')->will($this->returnValue($this->productMock));
 
         $this->stockItemMock->expects($this->once())->method('setIsChildItem')->with(true);
-        $this->stockItemMock->expects($this->once())->method('setSuppressCheckQtyIncrements')->with(true);
         $this->stockItemMock->expects($this->once())->method('getItemId')->will($this->returnValue(true));
 
         $this->stockRegistry
@@ -222,7 +221,6 @@ public function testInitializeWhenResultNotDecimalGetBackordersMessageHasOptionQ
         $this->optionMock->expects($this->any())->method('getProduct')->will($this->returnValue($this->productMock));
 
         $this->stockItemMock->expects($this->once())->method('setIsChildItem')->with(true);
-        $this->stockItemMock->expects($this->once())->method('setSuppressCheckQtyIncrements')->with(true);
         $this->stockItemMock->expects($this->once())->method('getItemId')->will($this->returnValue(true));
 
         $this->stockRegistry
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 86a021768a6b3..633505a5609be 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,13 @@ public function testValidateWithOptions()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult', 'getProduct'])
             ->getMock();
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
+        $optionMock->method('getProduct')
+            ->willReturn($this->productMock);
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
@@ -316,7 +321,7 @@ public function testValidateWithOptionsAndError()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult', 'getProduct'])
             ->getMock();
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
@@ -324,6 +329,11 @@ public function testValidateWithOptionsAndError()
         $this->stockRegistryMock->expects($this->at(1))
             ->method('getStockStatus')
             ->willReturn($this->stockStatusMock);
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
+        $optionMock->method('getProduct')
+            ->willReturn($this->productMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
@@ -354,12 +364,17 @@ public function testValidateAndRemoveErrorsFromQuote()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult', 'getProduct'])
             ->getMock();
         $quoteItem = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->setMethods(['getItemId', 'getErrorInfos'])
             ->getMock();
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
+        $optionMock->method('getProduct')
+            ->willReturn($this->productMock);
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
@@ -441,6 +456,10 @@ public function testException()
         $this->quantityValidator->validate($this->observerMock);
     }
 
+    /**
+     * @param $qty
+     * @param $hasError
+     */
     private function setUpStubForQuantity($qty, $hasError)
     {
         $this->productMock->expects($this->any())
@@ -471,6 +490,9 @@ private function setUpStubForQuantity($qty, $hasError)
             ->willReturn('');
     }
 
+    /**
+     * @param $qty
+     */
     private function createInitialStub($qty)
     {
         $this->storeMock->expects($this->any())
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 d60a1f3e400dd..8c9a1aa7715ec 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/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
index 9a46dc99ee008..0598fe7e9fe71 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
@@ -56,9 +56,13 @@ public function testProcess()
                 []
             )
             ->willReturnSelf();
-        $this->select->expects($this->once())
+
+        $this->select->expects($this->exactly(2))
             ->method('where')
-            ->with('stock.stock_status = ?', Stock::STOCK_IN_STOCK)
+            ->withConsecutive(
+                ['stock.stock_status = ?', Stock::STOCK_IN_STOCK, null],
+                ['stock.website_id = ?', 0, null]
+            )
             ->willReturnSelf();
 
         $this->stockStatusBaseSelectProcessor->process($this->select);
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/StockTest.php
new file mode 100644
index 0000000000000..c9a148f3d8869
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/StockTest.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Test\Unit\Model\ResourceModel;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Model\Configuration as StockConfiguration;
+use Magento\CatalogInventory\Model\ResourceModel\Stock;
+use Magento\Framework\App\Config;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Test for \Magento\CatalogInventory\Model\ResourceModel\Stock
+ */
+class StockTest extends \PHPUnit\Framework\TestCase
+{
+    const PRODUCT_TABLE = 'testProductTable';
+    const ITEM_TABLE = 'testItemTableName';
+
+    /**
+     * @var Stock|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stock;
+
+    /**
+     * @var Mysql|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var StockConfiguration|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var \Zend_Db_Statement_Interface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementMock;
+    
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock = $objectManager->getObject(Context::class);
+        $this->scopeConfigMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dateTimeMock = $this->getMockBuilder(DateTime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfiguration::class)
+            ->setMethods(['getIsQtyTypeIds', 'getDefaultScopeId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionMock = $this->getMockBuilder(Mysql::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statementMock = $this->getMockForAbstractClass(\Zend_Db_Statement_Interface::class);
+        $this->stock = $this->getMockBuilder(Stock::class)
+            ->setMethods(['getTable', 'getConnection'])
+            ->setConstructorArgs(
+                [
+                    'context' => $this->contextMock,
+                    'scopeConfig' => $this->scopeConfigMock,
+                    'dateTime' => $this->dateTimeMock,
+                    'stockConfiguration' => $this->stockConfigurationMock,
+                    'storeManager' => $this->storeManagerMock,
+                ]
+            )->getMock();
+    }
+
+    /**
+     * Test Save Product Status per website with product ids.
+     *
+     * @dataProvider productsDataProvider
+     * @param int $websiteId
+     * @param array $productIds
+     * @param array $products
+     * @param array $result
+     *
+     * @return void
+     */
+    public function testLockProductsStock(int $websiteId, array $productIds, array $products, array $result)
+    {
+        $this->selectMock->expects($this->exactly(2))
+            ->method('from')
+            ->withConsecutive(
+                [$this->identicalTo(['si' => self::ITEM_TABLE])],
+                [$this->identicalTo(['p' => self::PRODUCT_TABLE]), $this->identicalTo([])]
+            )
+            ->willReturnSelf();
+        $this->selectMock->expects($this->exactly(3))
+            ->method('where')
+            ->withConsecutive(
+                [$this->identicalTo('website_id = ?'), $this->identicalTo($websiteId)],
+                [$this->identicalTo('product_id IN(?)'), $this->identicalTo($productIds)],
+                [$this->identicalTo('entity_id IN (?)'), $this->identicalTo($productIds)]
+            )
+            ->willReturnSelf();
+        $this->selectMock->expects($this->once())
+            ->method('forUpdate')
+            ->with($this->identicalTo(true))
+            ->willReturnSelf();
+        $this->selectMock->expects($this->once())
+            ->method('columns')
+            ->with($this->identicalTo(['product_id' => 'entity_id', 'type_id' => 'type_id']))
+            ->willReturnSelf();
+        $this->connectionMock->expects($this->exactly(2))
+            ->method('select')
+            ->willReturn($this->selectMock);
+        $this->connectionMock->expects($this->once())
+            ->method('query')
+            ->with($this->identicalTo($this->selectMock))
+            ->willReturn($this->statementMock);
+        $this->statementMock->expects($this->once())
+            ->method('fetchAll')
+            ->willReturn($products);
+        $this->connectionMock->expects($this->once())
+            ->method('fetchAll')
+            ->with($this->identicalTo($this->selectMock))
+            ->willReturn($result);
+        $this->stock->expects($this->exactly(2))
+            ->method('getTable')
+            ->withConsecutive(
+                [$this->identicalTo('cataloginventory_stock_item')],
+                [$this->identicalTo('catalog_product_entity')]
+            )->will($this->onConsecutiveCalls(
+                self::ITEM_TABLE,
+                self::PRODUCT_TABLE
+            ));
+        $this->stock->expects($this->exactly(4))
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $lockResult = $this->stock->lockProductsStock($productIds, $websiteId);
+
+        $this->assertEquals($result, $lockResult);
+    }
+
+    /**
+     * @return array
+     */
+    public function productsDataProvider(): array
+    {
+        return [
+            [
+                0,
+                [1, 2, 3],
+                [
+                    1 => ['product_id' => 1],
+                    2 => ['product_id' => 2],
+                    3 => ['product_id' => 3],
+                ],
+                [
+                    1 => [
+                        'product_id' => 1,
+                        'type_id' => 'simple',
+                    ],
+                    2 => [
+                        'product_id' => 2,
+                        'type_id' => 'simple',
+                    ],
+                    3 => [
+                        'product_id' => 3,
+                        'type_id' => 'simple',
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php
new file mode 100644
index 0000000000000..11f41fcaf6d01
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Test\Unit\Model\Source;
+
+use PHPUnit\Framework\TestCase;
+
+class StockTest extends TestCase
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Source\Stock
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\CatalogInventory\Model\Source\Stock();
+    }
+
+    public function testAddValueSortToCollection()
+    {
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $collectionMock = $this->createMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class);
+        $collectionMock->expects($this->atLeastOnce())->method('getSelect')->willReturn($selectMock);
+
+        $selectMock->expects($this->once())
+            ->method('joinLeft')
+            ->with(
+                ['stock_item_table' => 'cataloginventory_stock_item'],
+                "e.entity_id=stock_item_table.product_id",
+                []
+            )
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('order')
+            ->with("stock_item_table.qty DESC")
+            ->willReturnSelf();
+
+        $this->model->addValueSortToCollection($collectionMock);
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php
index 5c75249b7cbf8..aad24cbeb7ac1 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php
@@ -243,41 +243,66 @@ public function testCheckQuoteItemQty(StockItemInterface $stockItem, $expectedRe
         );
     }
 
+    /**
+     * @return array
+     */
     public function verifyStockDataProvider()
     {
         return $this->prepareDataForMethod('verifyStock');
     }
 
+    /**
+     * @return array
+     */
     public function verifyNotificationDataProvider()
     {
         return $this->prepareDataForMethod('verifyNotification');
     }
 
+    /**
+     * @return array
+     */
     public function checkQtyDataProvider()
     {
         return $this->prepareDataForMethod('checkQty');
     }
 
+    /**
+     * @return array
+     */
     public function suggestQtyDataProvider()
     {
         return $this->prepareDataForMethod('suggestQty');
     }
 
+    /**
+     * @return array
+     */
     public function getStockQtyDataProvider()
     {
         return $this->prepareDataForMethod('getStockQty');
     }
 
+    /**
+     * @return array
+     */
     public function checkQtyIncrementsDataProvider()
     {
         return $this->prepareDataForMethod('checkQtyIncrements');
     }
 
+    /**
+     * @return array
+     */
     public function checkQuoteItemQtyDataProvider()
     {
         return $this->prepareDataForMethod('checkQuoteItemQty');
     }
 
+    /**
+     * @param $methodName
+     * @return array
+     */
     protected function prepareDataForMethod($methodName)
     {
         $variations = [];
@@ -318,6 +343,9 @@ protected function prepareDataForMethod($methodName)
         return $variations;
     }
 
+    /**
+     * @return array
+     */
     protected function getVariations()
     {
         $stockQty = 100;
@@ -430,6 +458,9 @@ public function testCheckQtyIncrementsMsg($isChildItem, $expectedMsg)
         $this->assertEquals($expectedMsg, $result->getMessage()->render());
     }
 
+    /**
+     * @return array
+     */
     public function checkQtyIncrementsMsgDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php
index bbc7823b13e01..3dc5992c3ec37 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php
@@ -394,6 +394,7 @@ public function testGetQtyIncrements($config, $expected)
         $this->setDataArrayValue('qty_increments', $config['qty_increments']);
         $this->setDataArrayValue('enable_qty_increments', $config['enable_qty_increments']);
         $this->setDataArrayValue('use_config_qty_increments', $config['use_config_qty_increments']);
+        $this->setDataArrayValue('is_qty_decimal', $config['is_qty_decimal']);
         if ($config['use_config_qty_increments']) {
             $this->stockConfiguration->expects($this->once())
                 ->method('getQtyIncrements')
@@ -415,7 +416,26 @@ public function getQtyIncrementsDataProvider()
                 [
                     'qty_increments' => 1,
                     'enable_qty_increments' => true,
-                    'use_config_qty_increments' => true
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => false,
+                ],
+                1
+            ],
+            [
+                [
+                    'qty_increments' => 1.5,
+                    'enable_qty_increments' => true,
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => true,
+                ],
+                1.5
+            ],
+            [
+                [
+                    'qty_increments' => 1.5,
+                    'enable_qty_increments' => true,
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => false,
                 ],
                 1
             ],
@@ -423,7 +443,8 @@ public function getQtyIncrementsDataProvider()
                 [
                     'qty_increments' => -2,
                     'enable_qty_increments' => true,
-                    'use_config_qty_increments' => true
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => false,
                 ],
                 false
             ],
@@ -431,7 +452,8 @@ public function getQtyIncrementsDataProvider()
                 [
                     'qty_increments' => 3,
                     'enable_qty_increments' => true,
-                    'use_config_qty_increments' => false
+                    'use_config_qty_increments' => false,
+                    'is_qty_decimal' => false,
                 ],
                 3
             ],
@@ -469,6 +491,9 @@ public function testDispatchEvents($eventName, $methodName, $objectName)
         );
     }
 
+    /**
+     * @return array
+     */
     public function eventsDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
index 293874bb32b9f..089f6c42a1736 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Test\Unit\Model\Stock;
 
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -251,7 +252,7 @@ public function testDeleteById()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Unable to remove Stock Item with id "1"
+     * @expectedExceptionMessage The stock item with the "1" ID wasn't found. Verify the ID and try again.
      */
     public function testDeleteByIdException()
     {
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockManagementTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockManagementTest.php
new file mode 100644
index 0000000000000..f1d546d17675b
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockManagementTest.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Test\Unit\Model;
+
+use Magento\CatalogInventory\Model\StockState;
+use Magento\CatalogInventory\Model\StockManagement;
+use Magento\CatalogInventory\Model\StockRegistryStorage;
+use Magento\CatalogInventory\Model\ResourceModel\QtyCounterInterface;
+use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
+use Magento\CatalogInventory\Model\ResourceModel\Stock as ResourceStock;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+
+/**
+ * Test for \Magento\CatalogInventory\Model\StockManagement
+ */
+class StockManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var StockManagement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockManagement;
+
+    /**
+     * @var ResourceStock|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockResourceMock;
+
+    /**
+     * @var StockRegistryProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockRegistryProviderMock;
+
+    /**
+     * @var StockState|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockStateMock;
+
+    /**
+     * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRepositoryMock;
+
+    /**
+     * @var QtyCounterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $qtyCounterMock;
+
+    /**
+     * @var StockRegistryStorage|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockRegistryStorageMock;
+
+    /**
+     * @var StockItemInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockItemInterfaceMock;
+
+    /**
+     * @var int
+     */
+    private $websiteId = 0;
+
+    protected function setUp()
+    {
+        $this->stockResourceMock = $this->getMockBuilder(ResourceStock::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockRegistryProviderMock = $this->getMockBuilder(StockRegistryProviderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockStateMock = $this->getMockBuilder(StockState::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->qtyCounterMock = $this->getMockBuilder(QtyCounterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockRegistryStorageMock = $this->getMockBuilder(StockRegistryStorage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockItemInterfaceMock = $this->getMockBuilder(StockItemInterface::class)
+            ->setMethods(['hasAdminArea','getWebsiteId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockManagement = $this->getMockBuilder(StockManagement::class)
+            ->setMethods(['getResource', 'canSubtractQty'])
+            ->setConstructorArgs(
+                [
+                    'stockResource' => $this->stockResourceMock,
+                    'stockRegistryProvider' => $this->stockRegistryProviderMock,
+                    'stockState' => $this->stockStateMock,
+                    'stockConfiguration' => $this->stockConfigurationMock,
+                    'productRepository' => $this->productRepositoryMock,
+                    'qtyCounter' => $this->qtyCounterMock,
+                    'stockRegistryStorage' => $this->stockRegistryStorageMock,
+                ]
+            )->getMock();
+
+        $this->stockConfigurationMock
+            ->expects($this->once())
+            ->method('getDefaultScopeId')
+            ->willReturn($this->websiteId);
+        $this->stockManagement
+            ->expects($this->any())
+            ->method('getResource')
+            ->willReturn($this->stockResourceMock);
+        $this->stockRegistryProviderMock
+            ->expects($this->any())
+            ->method('getStockItem')
+            ->willReturn($this->stockItemInterfaceMock);
+        $this->stockItemInterfaceMock
+            ->expects($this->any())
+            ->method('hasAdminArea')
+            ->willReturn(false);
+    }
+
+    /**
+     * @dataProvider productsWithCorrectQtyDataProvider
+     *
+     * @param array $items
+     * @param array $lockedItems
+     * @param bool $canSubtract
+     * @param bool $isQty
+     * @param bool $verifyStock
+     *
+     * @return void
+     */
+    public function testRegisterProductsSale(
+        array $items,
+        array $lockedItems,
+        bool $canSubtract,
+        bool $isQty,
+        bool $verifyStock = true
+    ) {
+        $this->stockResourceMock
+            ->expects($this->once())
+            ->method('beginTransaction');
+        $this->stockResourceMock
+            ->expects($this->once())
+            ->method('lockProductsStock')
+            ->willReturn([$lockedItems]);
+        $this->stockItemInterfaceMock
+            ->expects($this->any())
+            ->method('getItemId')
+            ->willReturn($lockedItems['product_id']);
+        $this->stockManagement
+            ->expects($this->any())
+            ->method('canSubtractQty')
+            ->willReturn($canSubtract);
+        $this->stockConfigurationMock
+            ->expects($this->any())
+            ->method('isQty')
+            ->willReturn($isQty);
+        $this->stockItemInterfaceMock
+            ->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($this->websiteId);
+        $this->stockStateMock
+            ->expects($this->any())
+            ->method('checkQty')
+            ->willReturn(true);
+        $this->stockStateMock
+            ->expects($this->any())
+            ->method('verifyStock')
+            ->willReturn($verifyStock);
+        $this->stockStateMock
+            ->expects($this->any())
+            ->method('verifyNotification')
+            ->willReturn(false);
+        $this->stockResourceMock
+            ->expects($this->once())
+            ->method('commit');
+
+        $this->stockManagement->registerProductsSale($items, $this->websiteId);
+    }
+
+    /**
+     * @dataProvider productsWithIncorrectQtyDataProvider
+     *
+     * @param array $items
+     * @param array $lockedItems
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Not all of your products are available in the requested quantity.
+     *
+     * @return void
+     */
+    public function testRegisterProductsSaleException(array $items, array $lockedItems)
+    {
+        $this->stockResourceMock
+            ->expects($this->once())
+            ->method('beginTransaction');
+        $this->stockResourceMock
+            ->expects($this->once())
+            ->method('lockProductsStock')
+            ->willReturn([$lockedItems]);
+        $this->stockItemInterfaceMock
+            ->expects($this->any())
+            ->method('getItemId')
+            ->willReturn($lockedItems['product_id']);
+        $this->stockManagement
+            ->expects($this->any())
+            ->method('canSubtractQty')
+            ->willReturn(true);
+        $this->stockConfigurationMock
+            ->expects($this->any())
+            ->method('isQty')
+            ->willReturn(true);
+        $this->stockStateMock
+            ->expects($this->any())
+            ->method('checkQty')
+            ->willReturn(false);
+        $this->stockResourceMock
+            ->expects($this->once())
+            ->method('commit');
+
+        $this->stockManagement->registerProductsSale($items, $this->websiteId);
+    }
+
+    /**
+     * @return array
+     */
+    public function productsWithCorrectQtyDataProvider(): array
+    {
+        return [
+            [
+                [1 => 3],
+                [
+                    'product_id' => 1,
+                    'qty' => 10,
+                    'type_id' => 'simple',
+                ],
+                false,
+                false,
+            ],
+            [
+                [2 => 4],
+                [
+                    'product_id' => 2,
+                    'qty' => 10,
+                    'type_id' => 'simple',
+                ],
+                true,
+                true,
+            ],
+            [
+                [3 => 5],
+                [
+                    'product_id' => 3,
+                    'qty' => 10,
+                    'type_id' => 'simple',
+                ],
+                true,
+                true,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function productsWithIncorrectQtyDataProvider(): array
+    {
+        return [
+            [
+                [2 => 4],
+                [
+                    'product_id' => 2,
+                    'qty' => 2,
+                    'type_id' => 'simple',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php
index c3abad50ef9f4..9ecab4dca77e3 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php
@@ -125,7 +125,10 @@ public function testDispatchEvents($eventName, $methodName, $objectName)
             sprintf('Event "%s" with object name "%s" doesn\'t dispatched properly', $eventName, $objectName)
         );
     }
-    
+
+    /**
+     * @return array
+     */
     public function eventsDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddStockItemsObserverTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddStockItemsObserverTest.php
new file mode 100644
index 0000000000000..8de05bd014039
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddStockItemsObserverTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Test\Unit\Observer;
+
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\CatalogInventory\Api\Data\StockItemCollectionInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterface;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\CatalogInventory\Observer\AddStockItemsObserver;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+class AddStockItemsObserverTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var AddStockItemsObserver
+     */
+    private $subject;
+    /**
+     * @var StockItemCriteriaInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $criteriaInterfaceFactoryMock;
+
+    /**
+     * @var StockItemRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockItemRepositoryMock;
+
+    /**
+     * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->criteriaInterfaceFactoryMock = $this->getMockBuilder(StockItemCriteriaInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockItemRepositoryMock = $this->getMockBuilder(StockItemRepositoryInterface::class)
+            ->setMethods(['getList'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->setMethods(['getDefaultScopeId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->subject = $objectManager->getObject(
+            AddStockItemsObserver::class,
+            [
+                'criteriaInterfaceFactory' => $this->criteriaInterfaceFactoryMock,
+                'stockItemRepository' => $this->stockItemRepositoryMock,
+                'stockConfiguration' => $this->stockConfigurationMock
+            ]
+        );
+    }
+
+    /**
+     * Test AddStockItemsObserver::execute() add stock item to product as extension attribute.
+     */
+    public function testExecute()
+    {
+        $productId = 1;
+        $defaultScopeId = 0;
+
+        $criteria = $this->getMockBuilder(StockItemCriteriaInterface::class)
+            ->setMethods(['setProductsFilter', 'setScopeFilter'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $criteria->expects(self::once())
+            ->method('setProductsFilter')
+            ->with(self::identicalTo([$productId]))
+            ->willReturn(true);
+        $criteria->expects(self::once())
+            ->method('setScopeFilter')
+            ->with(self::identicalTo($defaultScopeId))
+            ->willReturn(true);
+
+        $this->criteriaInterfaceFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($criteria);
+        $stockItemCollection = $this->getMockBuilder(StockItemCollectionInterface::class)
+            ->setMethods(['getItems'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $stockItem = $this->getMockBuilder(StockItemInterface::class)
+            ->setMethods(['getProductId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $stockItem->expects(self::once())
+            ->method('getProductId')
+            ->willReturn($productId);
+
+        $stockItemCollection->expects(self::once())
+            ->method('getItems')
+            ->willReturn([$stockItem]);
+
+        $this->stockItemRepositoryMock->expects(self::once())
+            ->method('getList')
+            ->with(self::identicalTo($criteria))
+            ->willReturn($stockItemCollection);
+
+        $this->stockConfigurationMock->expects(self::once())
+            ->method('getDefaultScopeId')
+            ->willReturn($defaultScopeId);
+
+        $productExtension = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['setStockItem'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $productExtension->expects(self::once())
+            ->method('setStockItem')
+            ->with(self::identicalTo($stockItem));
+
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $product->expects(self::once())
+            ->method('getExtensionAttributes')
+            ->willReturn($productExtension);
+        $product->expects(self::once())
+            ->method('setExtensionAttributes')
+            ->with(self::identicalTo($productExtension))
+            ->willReturnSelf();
+
+        /** @var ProductCollection|\PHPUnit_Framework_MockObject_MockObject $productCollection */
+        $productCollection = $this->getMockBuilder(ProductCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productCollection->expects(self::once())
+            ->method('getItems')
+            ->willReturn([$productId => $product]);
+        $productCollection->expects(self::once())
+            ->method('getItemById')
+            ->with(self::identicalTo($productId))
+            ->willReturn($product);
+
+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
+        $observer = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $observer->expects(self::once())
+            ->method('getData')
+            ->with('collection')
+            ->willReturn($productCollection);
+
+        $this->subject->execute($observer);
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Observer/UpdateItemsStockUponConfigChangeObserverTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Observer/UpdateItemsStockUponConfigChangeObserverTest.php
index 70a179b484379..7b82b5927d22c 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Observer/UpdateItemsStockUponConfigChangeObserverTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Observer/UpdateItemsStockUponConfigChangeObserverTest.php
@@ -15,9 +15,9 @@ class UpdateItemsStockUponConfigChangeObserverTest extends \PHPUnit\Framework\Te
     protected $observer;
 
     /**
-     * @var \Magento\CatalogInventory\Model\ResourceModel\Stock|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\Item|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $resourceStock;
+    protected $resourceStockItem;
 
     /**
      * @var \Magento\Framework\Event|\PHPUnit_Framework_MockObject_MockObject
@@ -31,11 +31,11 @@ class UpdateItemsStockUponConfigChangeObserverTest extends \PHPUnit\Framework\Te
 
     protected function setUp()
     {
-        $this->resourceStock = $this->createMock(\Magento\CatalogInventory\Model\ResourceModel\Stock::class);
+        $this->resourceStockItem = $this->createMock(\Magento\CatalogInventory\Model\ResourceModel\Stock\Item::class);
 
         $this->event = $this->getMockBuilder(\Magento\Framework\Event::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getWebsite'])
+            ->setMethods(['getWebsite', 'getChangedPaths'])
             ->getMock();
 
         $this->eventObserver = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
@@ -50,7 +50,7 @@ protected function setUp()
         $this->observer = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
             \Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver::class,
             [
-                'resourceStock' => $this->resourceStock,
+                'resourceStockItem' => $this->resourceStockItem,
             ]
         );
     }
@@ -58,13 +58,16 @@ protected function setUp()
     public function testUpdateItemsStockUponConfigChange()
     {
         $websiteId = 1;
-        $this->resourceStock->expects($this->once())->method('updateSetOutOfStock');
-        $this->resourceStock->expects($this->once())->method('updateSetInStock');
-        $this->resourceStock->expects($this->once())->method('updateLowStockDate');
+        $this->resourceStockItem->expects($this->once())->method('updateSetOutOfStock');
+        $this->resourceStockItem->expects($this->once())->method('updateSetInStock');
+        $this->resourceStockItem->expects($this->once())->method('updateLowStockDate');
 
         $this->event->expects($this->once())
             ->method('getWebsite')
             ->will($this->returnValue($websiteId));
+        $this->event->expects($this->once())
+            ->method('getChangedPaths')
+            ->will($this->returnValue([\Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK]));
 
         $this->observer->execute($this->eventObserver);
     }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Ui/Component/Product/Form/Element/UseConfigSettingsTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Ui/Component/Product/Form/Element/UseConfigSettingsTest.php
index db183ae5c0da0..0ce62133d6f9b 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Ui/Component/Product/Form/Element/UseConfigSettingsTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Ui/Component/Product/Form/Element/UseConfigSettingsTest.php
@@ -106,6 +106,9 @@ public function testPrepareSource(
         $this->assertEquals($expectedResult, $this->useConfigSettings->getData('config'));
     }
 
+    /**
+     * @return array
+     */
     public function prepareSourceDataProvider()
     {
         return [
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 c5d18ea727534..7386f133b569a 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',
@@ -224,9 +223,11 @@ private function prepareMeta()
                     $this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/sortOrder',
                     $this->meta
                 ) - 1,
+                'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
             ];
             $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/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 1f8608192bbd3..007d744b2296f 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -28,5 +27,6 @@
         "psr-4": {
             "Magento\\CatalogInventory\\": ""
         }
-    }
+    },
+    "abandoned": "magento/inventory-composer-metapackage"
 }
diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
index 803a6dae492a0..3397ef25918cd 100644
--- a/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
@@ -39,4 +39,7 @@
             </argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Catalog\Model\ProductLink\Search">
+        <plugin name="processOutOfStockProducts" type="Magento\CatalogInventory\Model\Plugin\ProductSearch"/>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
index b9332575c96f7..08ed0a8f49470 100644
--- a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
@@ -41,13 +41,13 @@
                     <![CDATA[Please note that these settings apply to individual items in the cart, not to the entire cart.]]>
                 </comment>
                 <label>Product Stock Options</label>
-                <field id="manage_stock" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="manage_stock" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Manage Stock</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\CatalogInventory\Model\Config\Backend\Managestock</backend_model>
                     <comment>Changing can take some time due to processing whole catalog.</comment>
                 </field>
-                <field id="backorders" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="backorders" translate="label comment" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Backorders</label>
                     <source_model>Magento\CatalogInventory\Model\Source\Backorders</source_model>
                     <backend_model>Magento\CatalogInventory\Model\Config\Backend\Backorders</backend_model>
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
new file mode 100644
index 0000000000000..5ac7fedc5aa18
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/etc/db_schema.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="cataloginventory_stock" resource="default" engine="innodb" comment="Cataloginventory Stock">
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Stock Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="varchar" name="stock_name" nullable="true" length="255" comment="Stock Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="stock_id"/>
+        </constraint>
+        <index referenceId="CATALOGINVENTORY_STOCK_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="cataloginventory_stock_item" resource="default" engine="innodb" comment="Cataloginventory Stock Item">
+        <column xsi:type="int" name="item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Item Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product Id"/>
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Stock Id"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
+        <column xsi:type="decimal" name="min_qty" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Min Qty"/>
+        <column xsi:type="smallint" name="use_config_min_qty" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Min Qty"/>
+        <column xsi:type="smallint" name="is_qty_decimal" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Qty Decimal"/>
+        <column xsi:type="smallint" name="backorders" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Backorders"/>
+        <column xsi:type="smallint" name="use_config_backorders" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Backorders"/>
+        <column xsi:type="decimal" name="min_sale_qty" scale="4" precision="12" unsigned="false" nullable="false"
+                default="1" comment="Min Sale Qty"/>
+        <column xsi:type="smallint" name="use_config_min_sale_qty" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Min Sale Qty"/>
+        <column xsi:type="decimal" name="max_sale_qty" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Max Sale Qty"/>
+        <column xsi:type="smallint" name="use_config_max_sale_qty" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Max Sale Qty"/>
+        <column xsi:type="smallint" name="is_in_stock" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is In Stock"/>
+        <column xsi:type="timestamp" name="low_stock_date" on_update="false" nullable="true" comment="Low Stock Date"/>
+        <column xsi:type="decimal" name="notify_stock_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Notify Stock Qty"/>
+        <column xsi:type="smallint" name="use_config_notify_stock_qty" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Notify Stock Qty"/>
+        <column xsi:type="smallint" name="manage_stock" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Manage Stock"/>
+        <column xsi:type="smallint" name="use_config_manage_stock" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Manage Stock"/>
+        <column xsi:type="smallint" name="stock_status_changed_auto" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Stock Status Changed Automatically"/>
+        <column xsi:type="smallint" name="use_config_qty_increments" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Qty Increments"/>
+        <column xsi:type="decimal" name="qty_increments" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Qty Increments"/>
+        <column xsi:type="smallint" name="use_config_enable_qty_inc" padding="5" unsigned="true" nullable="false"
+                identity="false" default="1" comment="Use Config Enable Qty Increments"/>
+        <column xsi:type="smallint" name="enable_qty_increments" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Enable Qty Increments"/>
+        <column xsi:type="smallint" name="is_decimal_divided" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Divided into Multiple Boxes for Shipping"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="cataloginventory_stock_item" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID"
+                    table="cataloginventory_stock_item" column="stock_id" referenceTable="cataloginventory_stock"
+                    referenceColumn="stock_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID">
+            <column name="product_id"/>
+            <column name="stock_id"/>
+        </constraint>
+        <index referenceId="CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_ITEM_STOCK_ID" indexType="btree">
+            <column name="stock_id"/>
+        </index>
+    </table>
+    <table name="cataloginventory_stock_status" resource="default" engine="innodb"
+           comment="Cataloginventory Stock Status">
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Id"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Qty"/>
+        <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_id"/>
+            <column name="website_id"/>
+            <column name="stock_id"/>
+        </constraint>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_ID" indexType="btree">
+            <column name="stock_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS" indexType="btree">
+            <column name="stock_status"/>
+        </index>
+    </table>
+    <table name="cataloginventory_stock_status_idx" resource="default" engine="innodb"
+           comment="Cataloginventory Stock Status Indexer Idx">
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Id"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Qty"/>
+        <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_id"/>
+            <column name="website_id"/>
+            <column name="stock_id"/>
+        </constraint>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_IDX_STOCK_ID" indexType="btree">
+            <column name="stock_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_IDX_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="cataloginventory_stock_status_tmp" resource="default" engine="memory"
+           comment="Cataloginventory Stock Status Indexer Tmp">
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Id"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Qty"/>
+        <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_id"/>
+            <column name="website_id"/>
+            <column name="stock_id"/>
+        </constraint>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_STOCK_ID" indexType="hash">
+            <column name="stock_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_WEBSITE_ID" indexType="hash">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="cataloginventory_stock_status_replica" resource="default" engine="innodb"
+           comment="Cataloginventory Stock Status">
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Id"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Qty"/>
+        <column xsi:type="smallint" name="stock_status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Stock Status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_id"/>
+            <column name="website_id"/>
+            <column name="stock_id"/>
+        </constraint>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_ID" indexType="btree">
+            <column name="stock_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS" indexType="btree">
+            <column name="stock_status"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json b/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..2580ec1e336f1
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
@@ -0,0 +1,126 @@
+{
+    "cataloginventory_stock": {
+        "column": {
+            "stock_id": true,
+            "website_id": true,
+            "stock_name": true
+        },
+        "index": {
+            "CATALOGINVENTORY_STOCK_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "cataloginventory_stock_item": {
+        "column": {
+            "item_id": true,
+            "product_id": true,
+            "stock_id": true,
+            "qty": true,
+            "min_qty": true,
+            "use_config_min_qty": true,
+            "is_qty_decimal": true,
+            "backorders": true,
+            "use_config_backorders": true,
+            "min_sale_qty": true,
+            "use_config_min_sale_qty": true,
+            "max_sale_qty": true,
+            "use_config_max_sale_qty": true,
+            "is_in_stock": true,
+            "low_stock_date": true,
+            "notify_stock_qty": true,
+            "use_config_notify_stock_qty": true,
+            "manage_stock": true,
+            "use_config_manage_stock": true,
+            "stock_status_changed_auto": true,
+            "use_config_qty_increments": true,
+            "qty_increments": true,
+            "use_config_enable_qty_inc": true,
+            "enable_qty_increments": true,
+            "is_decimal_divided": true,
+            "website_id": true
+        },
+        "index": {
+            "CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID": true,
+            "CATALOGINVENTORY_STOCK_ITEM_STOCK_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID": true,
+            "CATINV_STOCK_ITEM_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    },
+    "cataloginventory_stock_status": {
+        "column": {
+            "product_id": true,
+            "website_id": true,
+            "stock_id": true,
+            "qty": true,
+            "stock_status": true
+        },
+        "index": {
+            "CATALOGINVENTORY_STOCK_STATUS_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "cataloginventory_stock_status_idx": {
+        "column": {
+            "product_id": true,
+            "website_id": true,
+            "stock_id": true,
+            "qty": true,
+            "stock_status": true
+        },
+        "index": {
+            "CATALOGINVENTORY_STOCK_STATUS_IDX_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_IDX_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "cataloginventory_stock_status_tmp": {
+        "column": {
+            "product_id": true,
+            "website_id": true,
+            "stock_id": true,
+            "qty": true,
+            "stock_status": true
+        },
+        "index": {
+            "CATALOGINVENTORY_STOCK_STATUS_TMP_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_TMP_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "cataloginventory_stock_status_replica": {
+        "column": {
+            "product_id": true,
+            "website_id": true,
+            "stock_id": true,
+            "qty": true,
+            "stock_status": true
+        },
+        "index": {
+            "CATALOGINVENTORY_STOCK_STATUS_REPLICA_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_REPLICA_WEBSITE_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_REPLICA_STOCK_STATUS": true,
+            "CATALOGINVENTORY_STOCK_STATUS_STOCK_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_WEBSITE_ID": true,
+            "CATALOGINVENTORY_STOCK_STATUS_STOCK_STATUS": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index 04935b11ce02b..ace72bb11c37b 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -35,7 +35,7 @@
     <type name="Magento\Catalog\Model\Product\Attribute\Repository">
         <plugin name="filterCustomAttribute" type="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute" />
     </type>
-    <type name="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute">
+    <type name="Magento\Catalog\Model\FilterProductCustomAttribute">
         <arguments>
             <argument name="blackList" xsi:type="array">
                 <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
@@ -78,6 +78,9 @@
     <type name="Magento\Catalog\Model\Product">
         <plugin name="catalogInventoryAfterLoad" type="Magento\CatalogInventory\Model\Plugin\AfterProductLoad"/>
     </type>
+    <type name="Magento\Catalog\Model\Product\Action">
+        <plugin name="ReindexUpdatedProducts" type="Magento\CatalogInventory\Model\Plugin\ReindexUpdatedProducts"/>
+    </type>
     <type name="Magento\CatalogInventory\Setup\UpgradeData">
         <arguments>
             <argument name="indexerProcessor" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\Processor</argument>
@@ -115,4 +118,21 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface">
+        <arguments>
+            <argument name="priceModifiers" xsi:type="array">
+                <item name="inventoryProductPriceIndexFilter" xsi:type="object">Magento\CatalogInventory\Model\Indexer\ProductPriceIndexFilter</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier">
+        <arguments>
+            <argument name="priceModifiers" xsi:type="array">
+                <item name="inventoryProductPriceIndexFilter" xsi:type="object">Magento\CatalogInventory\Model\Indexer\ProductPriceIndexFilter</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogInventory\Model\ResourceModel\Stock\Item">
+        <plugin name="priceIndexUpdater" type="Magento\CatalogInventory\Model\Plugin\PriceIndexUpdater" />
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogInventory/etc/events.xml b/app/code/Magento/CatalogInventory/etc/events.xml
index 3b5f2483ec57e..328edbade6068 100644
--- a/app/code/Magento/CatalogInventory/etc/events.xml
+++ b/app/code/Magento/CatalogInventory/etc/events.xml
@@ -27,9 +27,6 @@
     <event name="sales_model_service_quote_submit_failure">
         <observer name="inventory" instance="Magento\CatalogInventory\Observer\RevertQuoteInventoryObserver"/>
     </event>
-    <event name="restore_quote">
-        <observer name="inventory" instance="Magento\CatalogInventory\Observer\RevertQuoteInventoryObserver"/>
-    </event>
     <event name="sales_order_item_cancel">
         <observer name="inventory" instance="Magento\CatalogInventory\Observer\CancelOrderItemObserver"/>
     </event>
@@ -41,5 +38,9 @@
     </event>
     <event name="admin_system_config_changed_section_cataloginventory">
         <observer name="inventory" instance="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver"/>
+        <observer name="invalidatePriceIndex" instance="Magento\CatalogInventory\Observer\InvalidatePriceIndexUponConfigChangeObserver"/>
+    </event>
+    <event name="sales_quote_item_collection_products_after_load">
+        <observer name="add_stock_items" instance="Magento\CatalogInventory\Observer\AddStockItemsObserver"/>
     </event>
 </config>
diff --git a/app/code/Magento/CatalogInventory/etc/module.xml b/app/code/Magento/CatalogInventory/etc/module.xml
index b9cddf838b9f2..d643c5015130f 100644
--- a/app/code/Magento/CatalogInventory/etc/module.xml
+++ b/app/code/Magento/CatalogInventory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogInventory" setup_version="2.3.0">
+    <module name="Magento_CatalogInventory" >
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/app/code/Magento/CatalogInventory/etc/mview.xml b/app/code/Magento/CatalogInventory/etc/mview.xml
index c3d73ff43e8eb..72dda16e8b5bb 100644
--- a/app/code/Magento/CatalogInventory/etc/mview.xml
+++ b/app/code/Magento/CatalogInventory/etc/mview.xml
@@ -11,4 +11,9 @@
             <table name="cataloginventory_stock_item" entity_column="product_id" />
         </subscriptions>
     </view>
+    <view id="catalog_product_price" class="Magento\Catalog\Model\Indexer\Product\Price" group="indexer">
+        <subscriptions>
+            <table name="cataloginventory_stock_item" entity_column="product_id" />
+        </subscriptions>
+    </view>
 </config>
diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv
index 93406163cbe1b..19b73f847b46d 100644
--- a/app/code/Magento/CatalogInventory/i18n/en_US.csv
+++ b/app/code/Magento/CatalogInventory/i18n/en_US.csv
@@ -55,11 +55,7 @@ Inventory,Inventory
 "Only X left Threshold","Only X left Threshold"
 "Display Products Availability in Stock on Storefront","Display Products Availability in Stock on Storefront"
 "Product Stock Options","Product Stock Options"
-"
-                    Please note that these settings apply to individual items in the cart, not to the entire cart.
-                ","
-                    Please note that these settings apply to individual items in the cart, not to the entire cart.
-                "
+"Please note that these settings apply to individual items in the cart, not to the entire cart.","Please note that these settings apply to individual items in the cart, not to the entire cart."
 "Manage Stock","Manage Stock"
 Backorders,Backorders
 "Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
index 3472f4368d617..0a7f0fdc32d40 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>
@@ -285,7 +288,7 @@
                     <settings>
                         <scopeLabel>[GLOBAL]</scopeLabel>
                         <validation>
-                            <rule name="validate-number" xsi:type="boolean">true</rule>
+                            <rule name="validate-greater-than-zero" xsi:type="boolean">true</rule>
                         </validation>
                         <label translate="true">Maximum Qty Allowed in Shopping Cart</label>
                         <dataScope>max_sale_qty</dataScope>
@@ -568,7 +571,7 @@
                     <settings>
                         <scopeLabel>[GLOBAL]</scopeLabel>
                         <validation>
-                            <rule name="validate-digits" xsi:type="boolean">true</rule>
+                            <rule name="validate-integer" xsi:type="boolean">true</rule>
                             <rule name="validate-number" xsi:type="boolean">true</rule>
                         </validation>
                         <label translate="true">Qty Increments</label>
diff --git a/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php
new file mode 100644
index 0000000000000..9e10f0b448504
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/OnlyXLeftInStockResolver.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\CatalogInventory\Model\Configuration;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * @inheritdoc
+ */
+class OnlyXLeftInStockResolver implements ResolverInterface
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StockRegistryInterface
+     */
+    private $stockRegistry;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StockRegistryInterface $stockRegistry
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        StockRegistryInterface $stockRegistry
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->stockRegistry = $stockRegistry;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!array_key_exists('model', $value) || !$value['model'] instanceof ProductInterface) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /* @var $product ProductInterface */
+        $product = $value['model'];
+        $onlyXLeftQty = $this->getOnlyXLeftQty($product);
+
+        return $onlyXLeftQty;
+    }
+
+    /**
+     * Get product qty left when "Catalog > Inventory > Stock Options > Only X left Threshold" is greater than 0
+     *
+     * @param ProductInterface $product
+     *
+     * @return null|float
+     */
+    private function getOnlyXLeftQty(ProductInterface $product): ?float
+    {
+        $thresholdQty = (float)$this->scopeConfig->getValue(
+            Configuration::XML_PATH_STOCK_THRESHOLD_QTY,
+            ScopeInterface::SCOPE_STORE
+        );
+        if ($thresholdQty === 0) {
+            return null;
+        }
+
+        $stockItem = $this->stockRegistry->getStockItem($product->getId());
+
+        $stockCurrentQty = $this->stockRegistry->getStockStatus(
+            $product->getId(),
+            $product->getStore()->getWebsiteId()
+        )->getQty();
+
+        $stockLeft = $stockCurrentQty - $stockItem->getMinQty();
+
+        $thresholdQty = (float)$this->scopeConfig->getValue(
+            Configuration::XML_PATH_STOCK_THRESHOLD_QTY,
+            ScopeInterface::SCOPE_STORE
+        );
+
+        if ($stockCurrentQty > 0 && $stockLeft <= $thresholdQty) {
+            return (float)$stockLeft;
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php
new file mode 100644
index 0000000000000..354e053efa90f
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/StockStatusProvider.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class StockStatusProvider implements ResolverInterface
+{
+    /**
+     * @var StockStatusRepositoryInterface
+     */
+    private $stockStatusRepository;
+
+    /**
+     * @param StockStatusRepositoryInterface $stockStatusRepository
+     */
+    public function __construct(StockStatusRepositoryInterface $stockStatusRepository)
+    {
+        $this->stockStatusRepository = $stockStatusRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!array_key_exists('model', $value) || !$value['model'] instanceof ProductInterface) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /* @var $product ProductInterface */
+        $product = $value['model'];
+
+        $stockStatus = $this->stockStatusRepository->get($product->getId());
+        $productStockStatus = (int)$stockStatus->getStockStatus();
+
+        return $productStockStatus === StockStatusInterface::STATUS_IN_STOCK ? 'IN_STOCK' : 'OUT_OF_STOCK';
+    }
+}
diff --git a/app/code/Magento/CatalogInventoryGraphQl/README.md b/app/code/Magento/CatalogInventoryGraphQl/README.md
new file mode 100644
index 0000000000000..ef4302e8da368
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/README.md
@@ -0,0 +1,4 @@
+# CatalogInventoryGraphQl
+
+**CatalogInventoryGraphQl** provides type information for the GraphQl module
+to generate inventory stock fields for product information endpoints.
diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
new file mode 100644
index 0000000000000..5e85c3ae12f93
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -0,0 +1,24 @@
+{
+  "name": "magento/module-catalog-inventory-graph-ql",
+  "description": "N/A",
+  "type": "magento2-module",
+  "require": {
+    "php": "~7.1.3||~7.2.0",
+    "magento/framework": "*",
+    "magento/module-store": "*",
+    "magento/module-catalog": "*",
+    "magento/module-catalog-inventory": "*"
+  },
+  "license": [
+    "OSL-3.0",
+    "AFL-3.0"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Magento\\CatalogInventoryGraphQl\\": ""
+    }
+  }
+}
diff --git a/app/code/Magento/CatalogInventoryGraphQl/etc/module.xml b/app/code/Magento/CatalogInventoryGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..776e4e165333d
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/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_CatalogInventoryGraphQl">
+        <sequence>
+            <module name="Magento_Store"/>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_CatalogInventory"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CatalogInventoryGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogInventoryGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..6a6c7e75dbd90
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/etc/schema.graphqls
@@ -0,0 +1,12 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+interface ProductInterface {
+    only_x_left_in_stock: Float @doc(description: "Product stock only x left count") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\OnlyXLeftInStockResolver")
+    stock_status: ProductStockStatus @doc(description: "Stock status of the product") @resolver(class: "Magento\\CatalogInventoryGraphQl\\Model\\Resolver\\StockStatusProvider")
+}
+
+enum ProductStockStatus @doc(description: "This enumeration states whether a product stock status is in stock or out of stock") {
+    IN_STOCK
+    OUT_OF_STOCK
+}
diff --git a/app/code/Magento/CatalogInventoryGraphQl/registration.php b/app/code/Magento/CatalogInventoryGraphQl/registration.php
new file mode 100644
index 0000000000000..6ef9d3b1f90b9
--- /dev/null
+++ b/app/code/Magento/CatalogInventoryGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_CatalogInventoryGraphQl', __DIR__);
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
index 6390822b58f4a..184cb6419294f 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
@@ -25,7 +25,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index 0b4748c933a3c..9d1a23611dc27 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -66,7 +66,7 @@ public function getTabTitle()
     }
 
     /**
-     * Returns status flag about this tab can be showen or not
+     * Returns status flag about this tab can be shown or not
      *
      * @return bool
      * @codeCoverageIgnore
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
index 333ee845798ec..87cb18253a107 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
@@ -139,7 +139,7 @@ protected function _getCpCollectionInstance()
     }
 
     /**
-     * Define Cooser Grid Columns and filters
+     * Define Chooser Grid Columns and filters
      *
      * @return $this
      */
@@ -207,7 +207,7 @@ protected function _prepareColumns()
     public function getGridUrl()
     {
         return $this->getUrl(
-            'catalog_rule/*/chooser',
+            '*/*/chooser',
             ['_current' => true, 'current_grid_id' => $this->getId(), 'collapse' => null]
         );
     }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
index 85ad74f7bbfe2..4badfa1219e10 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
@@ -25,14 +25,14 @@ public function execute()
             $ruleJob->applyAll();
 
             if ($ruleJob->hasSuccess()) {
-                $this->messageManager->addSuccess($ruleJob->getSuccess());
+                $this->messageManager->addSuccessMessage($ruleJob->getSuccess());
                 $this->_objectManager->create(\Magento\CatalogRule\Model\Flag::class)->loadSelf()->setState(0)->save();
             } elseif ($ruleJob->hasError()) {
-                $this->messageManager->addError($errorMessage . ' ' . $ruleJob->getError());
+                $this->messageManager->addErrorMessage($errorMessage . ' ' . $ruleJob->getError());
             }
         } catch (\Exception $e) {
             $this->_objectManager->create(\Psr\Log\LoggerInterface::class)->critical($e);
-            $this->messageManager->addError($errorMessage);
+            $this->messageManager->addErrorMessage($errorMessage);
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
index 8b007031f3305..998d45b839c72 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 
-class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
+class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface
 {
     /**
      * @return void
@@ -25,13 +26,13 @@ public function execute()
                 $ruleRepository->deleteById($id);
 
                 $this->_objectManager->create(\Magento\CatalogRule\Model\Flag::class)->loadSelf()->setState(1)->save();
-                $this->messageManager->addSuccess(__('You deleted the rule.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the rule.'));
                 $this->_redirect('catalog_rule/*/');
                 return;
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('We can\'t delete this rule right now. Please review the log and try again.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -39,7 +40,7 @@ public function execute()
                 return;
             }
         }
-        $this->messageManager->addError(__('We can\'t find a rule to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a rule to delete.'));
         $this->_redirect('catalog_rule/*/');
     }
 }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
index 97a5693b18117..2c2abcef8b255 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
-class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface
 {
     /**
      * @return void
@@ -24,7 +26,7 @@ public function execute()
             try {
                 $model = $ruleRepository->get($id);
             } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-                $this->messageManager->addError(__('This rule no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This rule no longer exists.'));
                 $this->_redirect('catalog_rule/*');
                 return;
             }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
index 8c6a38819512f..a9dcd1f6383a3 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
-class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
index c677c75c59534..d86c56402d25a 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
-class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
index b790d90d3804f..a845c104f943e 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php
@@ -6,9 +6,12 @@
  */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Rule\Model\Condition\AbstractCondition;
+use Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog as CatalogAction;
 
-class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
+class NewConditionHtml extends CatalogAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
index 0170fc76b6aab..0ff12faf54cbf 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
@@ -13,9 +14,11 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 
 /**
+ * Save action for catalog rule
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
+class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface
 {
     /**
      * @var DataPersistorInterface
@@ -39,7 +42,9 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * Execute save action from catalog rule
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
@@ -60,6 +65,17 @@ public function execute()
                     ['request' => $this->getRequest()]
                 );
                 $data = $this->getRequest()->getPostValue();
+
+                $filterValues = ['from_date' => $this->_dateFilter];
+                if ($this->getRequest()->getParam('to_date')) {
+                    $filterValues['to_date'] = $this->_dateFilter;
+                }
+                $inputFilter = new \Zend_Filter_Input(
+                    $filterValues,
+                    [],
+                    $data
+                );
+                $data = $inputFilter->getUnescaped();
                 $id = $this->getRequest()->getParam('rule_id');
                 if ($id) {
                     $model = $ruleRepository->get($id);
@@ -68,7 +84,7 @@ public function execute()
                 $validateResult = $model->validateData(new \Magento\Framework\DataObject($data));
                 if ($validateResult !== true) {
                     foreach ($validateResult as $errorMessage) {
-                        $this->messageManager->addError($errorMessage);
+                        $this->messageManager->addErrorMessage($errorMessage);
                     }
                     $this->_getSession()->setPageData($data);
                     $this->dataPersistor->set('catalog_rule', $data);
@@ -88,7 +104,7 @@ public function execute()
 
                 $ruleRepository->save($model);
 
-                $this->messageManager->addSuccess(__('You saved the rule.'));
+                $this->messageManager->addSuccessMessage(__('You saved the rule.'));
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setPageData(false);
                 $this->dataPersistor->clear('catalog_rule');
 
@@ -111,9 +127,9 @@ public function execute()
                 }
                 return;
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Something went wrong while saving the rule data. Please review the error log.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
index 3d9dcd05f8fac..18a58c0f85423 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,8 +8,12 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Model\Category;
 use Magento\Framework\Registry;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 
-class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
+/**
+ * Categories json widget for catalog rule
+ */
+class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget implements HttpPostActionInterface
 {
     /**
      * Core registry
@@ -32,7 +35,7 @@ public function __construct(Context $context, Registry $coreRegistry)
     /**
      * Initialize category object in registry
      *
-     * @return Category
+     * @return Category|bool
      */
     protected function _initCategory()
     {
@@ -77,10 +80,11 @@ public function execute()
             if (!($category = $this->_initCategory())) {
                 return;
             }
+            $selected = $this->getRequest()->getPost('selected', '');
             $block = $this->_view->getLayout()->createBlock(
                 \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree::class
             )->setCategoryIds(
-                [$categoryId]
+                explode(',', $selected)
             );
             $this->getResponse()->representJson(
                 $block->getTreeJson($category)
diff --git a/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php b/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php
index a3fa9a8f67ab2..2655c0fa9646a 100644
--- a/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php
+++ b/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogRule\Model;
 
 use Magento\CatalogRule\Api\Data;
@@ -55,7 +56,9 @@ public function save(Data\RuleInterface $rule)
         } catch (ValidatorException $e) {
             throw new CouldNotSaveException(__($e->getMessage()));
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Unable to save rule %1', $rule->getRuleId()));
+            throw new CouldNotSaveException(
+                __('The "%1" rule was unable to be saved. Please try again.', $rule->getRuleId())
+            );
         }
         return $rule;
     }
@@ -72,7 +75,9 @@ public function get($ruleId)
             /* TODO: change to resource model after entity manager will be fixed */
             $rule->load($ruleId);
             if (!$rule->getRuleId()) {
-                throw new NoSuchEntityException(__('Rule with specified ID "%1" not found.', $ruleId));
+                throw new NoSuchEntityException(
+                    __('The rule with the "%1" ID wasn\'t found. Verify the ID and try again.', $ruleId)
+                );
             }
             $this->rules[$ruleId] = $rule;
         }
@@ -90,7 +95,7 @@ public function delete(Data\RuleInterface $rule)
         } catch (ValidatorException $e) {
             throw new CouldNotSaveException(__($e->getMessage()));
         } catch (\Exception $e) {
-            throw new CouldNotDeleteException(__('Unable to remove rule %1', $rule->getRuleId()));
+            throw new CouldNotDeleteException(__('The "%1" rule couldn\'t be removed.', $rule->getRuleId()));
         }
         return true;
     }
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 34b4bff5a060e..1f62200fc6b1b 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -11,6 +11,8 @@
 use Magento\CatalogRule\Model\Rule;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 
 /**
  * @api
@@ -101,32 +103,32 @@ class IndexBuilder
     protected $connection;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator
+     * @var ProductPriceCalculator
      */
     private $productPriceCalculator;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct
+     * @var ReindexRuleProduct
      */
     private $reindexRuleProduct;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite
+     * @var ReindexRuleGroupWebsite
      */
     private $reindexRuleGroupWebsite;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder
+     * @var RuleProductsSelectBuilder
      */
     private $ruleProductsSelectBuilder;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice
+     * @var ReindexRuleProductPrice
      */
     private $reindexRuleProductPrice;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor
+     * @var RuleProductPricesPersistor
      */
     private $pricesPersistor;
 
@@ -135,6 +137,16 @@ class IndexBuilder
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
+    /**
+     * @var ProductLoader
+     */
+    private $productLoader;
+
     /**
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param PriceCurrencyInterface $priceCurrency
@@ -146,13 +158,15 @@ class IndexBuilder
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param int $batchCount
-     * @param \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator|null $productPriceCalculator
-     * @param \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct|null $reindexRuleProduct
-     * @param \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite|null $reindexRuleGroupWebsite
-     * @param \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder|null $ruleProductsSelectBuilder
-     * @param \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice|null $reindexRuleProductPrice
-     * @param \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor|null $pricesPersistor
+     * @param ProductPriceCalculator|null $productPriceCalculator
+     * @param ReindexRuleProduct|null $reindexRuleProduct
+     * @param ReindexRuleGroupWebsite|null $reindexRuleGroupWebsite
+     * @param RuleProductsSelectBuilder|null $ruleProductsSelectBuilder
+     * @param ReindexRuleProductPrice|null $reindexRuleProductPrice
+     * @param RuleProductPricesPersistor|null $pricesPersistor
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
+     * @param ProductLoader|null $productLoader
+     * @param TableSwapper|null $tableSwapper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -166,13 +180,15 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         $batchCount = 1000,
-        \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator $productPriceCalculator = null,
-        \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct $reindexRuleProduct = null,
-        \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite $reindexRuleGroupWebsite = null,
-        \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder $ruleProductsSelectBuilder = null,
-        \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice $reindexRuleProductPrice = null,
-        \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor $pricesPersistor = null,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null
+        ProductPriceCalculator $productPriceCalculator = null,
+        ReindexRuleProduct $reindexRuleProduct = null,
+        ReindexRuleGroupWebsite $reindexRuleGroupWebsite = null,
+        RuleProductsSelectBuilder $ruleProductsSelectBuilder = null,
+        ReindexRuleProductPrice $reindexRuleProductPrice = null,
+        RuleProductPricesPersistor $pricesPersistor = null,
+        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
+        ProductLoader $productLoader = null,
+        TableSwapper $tableSwapper = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -186,27 +202,32 @@ public function __construct(
         $this->productFactory = $productFactory;
         $this->batchCount = $batchCount;
 
-        $this->productPriceCalculator = $productPriceCalculator ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator::class
+        $this->productPriceCalculator = $productPriceCalculator ?? ObjectManager::getInstance()->get(
+            ProductPriceCalculator::class
         );
-        $this->reindexRuleProduct = $reindexRuleProduct ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct::class
+        $this->reindexRuleProduct = $reindexRuleProduct ?? ObjectManager::getInstance()->get(
+            ReindexRuleProduct::class
         );
-        $this->reindexRuleGroupWebsite = $reindexRuleGroupWebsite ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class
+        $this->reindexRuleGroupWebsite = $reindexRuleGroupWebsite ?? ObjectManager::getInstance()->get(
+            ReindexRuleGroupWebsite::class
         );
-        $this->ruleProductsSelectBuilder = $ruleProductsSelectBuilder ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder::class
+        $this->ruleProductsSelectBuilder = $ruleProductsSelectBuilder ?? ObjectManager::getInstance()->get(
+            RuleProductsSelectBuilder::class
         );
-        $this->reindexRuleProductPrice = $reindexRuleProductPrice ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class
+        $this->reindexRuleProductPrice = $reindexRuleProductPrice ?? ObjectManager::getInstance()->get(
+            ReindexRuleProductPrice::class
         );
-        $this->pricesPersistor = $pricesPersistor ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor::class
+        $this->pricesPersistor = $pricesPersistor ?? ObjectManager::getInstance()->get(
+            RuleProductPricesPersistor::class
         );
-        $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
+        $this->activeTableSwitcher = $activeTableSwitcher ?? ObjectManager::getInstance()->get(
             \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
         );
+        $this->productLoader = $productLoader ?? ObjectManager::getInstance()->get(
+            ProductLoader::class
+        );
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -251,9 +272,10 @@ protected function doReindexByIds($ids)
     {
         $this->cleanByIds($ids);
 
+        $products = $this->productLoader->getProducts($ids);
         foreach ($this->getActiveRules() as $rule) {
-            foreach ($ids as $productId) {
-                $this->applyRule($rule, $this->getProduct($productId));
+            foreach ($products as $product) {
+                $this->applyRule($rule, $product);
             }
         }
     }
@@ -284,13 +306,6 @@ public function reindexFull()
      */
     protected function doReindexFull()
     {
-        $this->connection->truncateTable(
-            $this->getTable($this->activeTableSwitcher->getAdditionalTableName('catalogrule_product'))
-        );
-        $this->connection->truncateTable(
-            $this->getTable($this->activeTableSwitcher->getAdditionalTableName('catalogrule_product_price'))
-        );
-
         foreach ($this->getAllRules() as $rule) {
             $this->reindexRuleProduct->execute($rule, $this->batchCount, true);
         }
@@ -298,8 +313,7 @@ protected function doReindexFull()
         $this->reindexRuleProductPrice->execute($this->batchCount, null, true);
         $this->reindexRuleGroupWebsite->execute(true);
 
-        $this->activeTableSwitcher->switchTable(
-            $this->connection,
+        $this->tableSwapper->swapIndexTables(
             [
                 $this->getTable('catalogrule_product'),
                 $this->getTable('catalogrule_product_price'),
@@ -420,7 +434,7 @@ protected function getTable($tableName)
      * @param Rule $rule
      * @return $this
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct::execute
+     * @see ReindexRuleProduct::execute
      */
     protected function updateRuleProductData(Rule $rule)
     {
@@ -446,8 +460,8 @@ protected function updateRuleProductData(Rule $rule)
      * @throws \Exception
      * @return $this
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::execute
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::execute
+     * @see ReindexRuleProductPrice::execute
+     * @see ReindexRuleGroupWebsite::execute
      */
     protected function applyAllRules(Product $product = null)
     {
@@ -461,7 +475,7 @@ protected function applyAllRules(Product $product = null)
      *
      * @return $this
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::execute
+     * @see ReindexRuleGroupWebsite::execute
      */
     protected function updateCatalogRuleGroupWebsiteData()
     {
@@ -485,7 +499,7 @@ protected function deleteOldData()
      * @param null $productData
      * @return float
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator::calculate
+     * @see ProductPriceCalculator::calculate
      */
     protected function calcRuleProductPrice($ruleData, $productData = null)
     {
@@ -498,7 +512,7 @@ protected function calcRuleProductPrice($ruleData, $productData = null)
      * @return \Zend_Db_Statement_Interface
      * @throws \Magento\Framework\Exception\LocalizedException
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder::build
+     * @see RuleProductsSelectBuilder::build
      */
     protected function getRuleProductsStmt($websiteId, Product $product = null)
     {
@@ -510,7 +524,7 @@ protected function getRuleProductsStmt($websiteId, Product $product = null)
      * @return $this
      * @throws \Exception
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor::execute
+     * @see RuleProductPricesPersistor::execute
      */
     protected function saveRuleProductPrices($arrData)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php
new file mode 100644
index 0000000000000..61c4791549935
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer\IndexBuilder;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Product loader that gets products by ids via product repository
+ */
+class ProductLoader
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->productRepository = $productRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+    }
+
+    /**
+     * Get products by ids
+     *
+     * @param array $productIds
+     * @return ProductInterface[]
+     */
+    public function getProducts(array $productIds): array
+    {
+        $this->searchCriteriaBuilder->addFilter('entity_id', $productIds, 'in');
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        $products = $this->productRepository->getList($searchCriteria)->getItems();
+
+        return $products;
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php
new file mode 100644
index 0000000000000..f99f8c50a7f9a
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * @inheritDoc
+ */
+class IndexerTableSwapper implements IndexerTableSwapperInterface
+{
+    /**
+     * Keys are original tables' names, values - created temporary tables.
+     *
+     * @var string[]
+     */
+    private $temporaryTables = [];
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->resourceConnection = $resource;
+    }
+
+    /**
+     * Create temporary table based on given table to use instead of original.
+     *
+     * @param string $originalTableName
+     *
+     * @return string Created table name.
+     */
+    private function createTemporaryTable(string $originalTableName): string
+    {
+        $temporaryTableName = $this->resourceConnection->getTableName(
+            $originalTableName . '__temp' . $this->generateRandomSuffix()
+        );
+
+        $this->resourceConnection->getConnection()->query(
+            sprintf(
+                'create table %s like %s',
+                $temporaryTableName,
+                $this->resourceConnection->getTableName($originalTableName)
+            )
+        );
+
+        return $temporaryTableName;
+    }
+
+    /**
+     * Random suffix for temporary tables not to conflict with each other.
+     *
+     * @return string
+     */
+    private function generateRandomSuffix(): string
+    {
+        return bin2hex(random_bytes(4));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getWorkingTableName(string $originalTable): string
+    {
+        $originalTable = $this->resourceConnection->getTableName($originalTable);
+        if (!array_key_exists($originalTable, $this->temporaryTables)) {
+            $this->temporaryTables[$originalTable] = $this->createTemporaryTable($originalTable);
+        }
+
+        return $this->temporaryTables[$originalTable];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function swapIndexTables(array $originalTablesNames)
+    {
+        $toRename = [];
+        /** @var string[] $toDrop */
+        $toDrop = [];
+        /** @var string[] $temporaryTablesRenamed */
+        $temporaryTablesRenamed = [];
+        //Renaming temporary tables to original tables' names, dropping old
+        //tables.
+        foreach ($originalTablesNames as $tableName) {
+            $tableName = $this->resourceConnection->getTableName($tableName);
+            $temporaryOriginalName = $this->resourceConnection->getTableName(
+                $tableName . $this->generateRandomSuffix()
+            );
+            $temporaryTableName = $this->getWorkingTableName($tableName);
+            $toRename[] = [
+                'oldName' => $tableName,
+                'newName' => $temporaryOriginalName,
+            ];
+            $toRename[] = [
+                'oldName' => $temporaryTableName,
+                'newName' => $tableName,
+            ];
+            $toDrop[] = $temporaryOriginalName;
+            $temporaryTablesRenamed[] = $tableName;
+        }
+
+        //Swapping tables.
+        $this->resourceConnection->getConnection()->renameTablesBatch($toRename);
+        //Cleaning up.
+        foreach ($temporaryTablesRenamed as $tableName) {
+            unset($this->temporaryTables[$tableName]);
+        }
+        //Removing old ones.
+        foreach ($toDrop as $tableName) {
+            $this->resourceConnection->getConnection()->dropTable($tableName);
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php
new file mode 100644
index 0000000000000..2f37e680949ae
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+/**
+ * Manage additional tables used while building new index to preserve
+ * index tables until the process finishes.
+ */
+interface IndexerTableSwapperInterface
+{
+    /**
+     * Get working table name used to build index.
+     *
+     * @param string $originalTable
+     *
+     * @return string
+     */
+    public function getWorkingTableName(string $originalTable): string;
+
+    /**
+     * Swap working tables with actual tables to save new indexes.
+     *
+     * @param string[] $originalTablesNames
+     *
+     * @return void
+     */
+    public function swapIndexTables(array $originalTablesNames);
+}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php b/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
new file mode 100644
index 0000000000000..404fc32e0c0d4
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceModifierInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\CatalogRule\Model\ResourceModel\Rule\Product\Price;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Class for adding catalog rule prices to price index table.
+ */
+class ProductPriceIndexModifier implements PriceModifierInterface
+{
+    /**
+     * @var Price
+     */
+    private $priceResourceModel;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @param Price $priceResourceModel
+     * @param ResourceConnection $resourceConnection
+     * @param string $connectionName
+     */
+    public function __construct(
+        Price $priceResourceModel,
+        ResourceConnection $resourceConnection,
+        $connectionName = 'indexer'
+    ) {
+        $this->priceResourceModel = $priceResourceModel;
+        $this->resourceConnection = $resourceConnection ?: ObjectManager::getInstance()->get(ResourceConnection::class);
+        $this->connectionName = $connectionName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyPrice(IndexTableStructure $priceTable, array $entityIds = []) : void
+    {
+        $connection = $this->resourceConnection->getConnection($this->connectionName);
+
+        $select = $connection->select();
+
+        $select->join(
+            ['cpiw' => $this->priceResourceModel->getTable('catalog_product_index_website')],
+            'cpiw.website_id = i.' . $priceTable->getWebsiteField(),
+            []
+        );
+        $select->join(
+            ['cpp' => $this->priceResourceModel->getMainTable()],
+            'cpp.product_id = i.' . $priceTable->getEntityField()
+            . ' AND cpp.customer_group_id = i.' . $priceTable->getCustomerGroupField()
+            . ' AND cpp.website_id = i.' . $priceTable->getWebsiteField()
+            . ' AND cpp.rule_date = cpiw.website_date',
+            []
+        );
+        if ($entityIds) {
+            $select->where('i.entity_id IN (?)', $entityIds);
+        }
+
+        $finalPrice = $priceTable->getFinalPriceField();
+        $finalPriceExpr = $select->getConnection()->getLeastSql([
+            $priceTable->getFinalPriceField(),
+            $select->getConnection()->getIfNullSql('cpp.rule_price', 'i.' . $finalPrice),
+        ]);
+        $minPrice = $priceTable->getMinPriceField();
+        $minPriceExpr = $select->getConnection()->getLeastSql([
+            $priceTable->getMinPriceField(),
+            $select->getConnection()->getIfNullSql('cpp.rule_price', 'i.' . $minPrice),
+        ]);
+        $select->columns([
+            $finalPrice => $finalPriceExpr,
+            $minPrice => $minPriceExpr,
+        ]);
+
+        $query = $connection->updateFromSelect($select, ['i' => $priceTable->getTableName()]);
+        $connection->query($query);
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
index cc5d07b18e0fa..752e6fb6ca75d 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+
 /**
  * Reindex information about rule relations with customer groups and websites.
  */
@@ -27,23 +31,32 @@ class ReindexRuleGroupWebsite
     private $catalogRuleGroupWebsiteColumnsList = ['rule_id', 'customer_group_id', 'website_id'];
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->dateTime = $dateTime;
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -61,10 +74,10 @@ public function execute($useAdditionalTable = false)
         $ruleProductTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_group_website')
+                $this->tableSwapper->getWorkingTableName('catalogrule_group_website')
             );
             $ruleProductTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
index 534061d593123..55a234bb8ae27 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Reindex rule relations with products.
  */
@@ -17,20 +21,29 @@ class ReindexRuleProduct
     private $resource;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -65,7 +78,7 @@ public function execute(
         $indexTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
index 853be1888b5b9..0b1264a216257 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Persist product prices to index table.
  */
@@ -22,23 +26,32 @@ class RuleProductPricesPersistor
     private $dateFormat;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime $dateFormat
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateFormat,
         \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->dateFormat = $dateFormat;
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -59,7 +72,7 @@ public function execute(array $priceData, $useAdditionalTable = false)
         $indexTable = $this->resource->getTableName('catalogrule_product_price');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product_price')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product_price')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
index 25d164aeee5c3..6989a33535ad8 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Build select for rule relation with product.
  */
@@ -32,29 +36,38 @@ class RuleProductsSelectBuilder
     private $metadataPool;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->eavConfig = $eavConfig;
         $this->storeManager = $storeManager;
         $this->metadataPool = $metadataPool;
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -74,7 +87,7 @@ public function build(
         $indexTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplier.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplier.php
new file mode 100644
index 0000000000000..13809a381ecb9
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplier.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\CatalogRule\Model\Rule\Condition\Combine;
+use Magento\Framework\Exception\InputException;
+use Magento\CatalogRule\Model\Rule\Condition\ConditionsToSearchCriteriaMapper;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\AdvancedFilterProcessor;
+use Magento\CatalogRule\Model\Rule\Condition\MappableConditionsProcessor;
+
+/**
+ * Applies catalog price rule conditions to product collection as filters
+ */
+class ConditionsToCollectionApplier
+{
+    /**
+     * @var ConditionsToSearchCriteriaMapper
+     */
+    private $conditionsToSearchCriteriaMapper;
+
+    /**
+     * @var AdvancedFilterProcessor
+     */
+    private $searchCriteriaProcessor;
+
+    /**
+     * @var MappableConditionsProcessor
+     */
+    private $mappableConditionsProcessor;
+
+    /**
+     * @param ConditionsToSearchCriteriaMapper $conditionsToSearchCriteriaMapper
+     * @param AdvancedFilterProcessor $searchCriteriaProcessor
+     * @param MappableConditionsProcessor $mappableConditionsProcessor
+     */
+    public function __construct(
+        ConditionsToSearchCriteriaMapper $conditionsToSearchCriteriaMapper,
+        AdvancedFilterProcessor $searchCriteriaProcessor,
+        MappableConditionsProcessor $mappableConditionsProcessor
+    ) {
+        $this->conditionsToSearchCriteriaMapper = $conditionsToSearchCriteriaMapper;
+        $this->searchCriteriaProcessor = $searchCriteriaProcessor;
+        $this->mappableConditionsProcessor = $mappableConditionsProcessor;
+    }
+
+    /**
+     * Transforms catalog rule conditions to search criteria
+     * and applies them on product collection
+     *
+     * @param Combine $conditions
+     * @param ProductCollection $productCollection
+     * @return ProductCollection
+     * @throws InputException
+     */
+    public function applyConditionsToCollection(
+        Combine $conditions,
+        ProductCollection $productCollection
+    ): ProductCollection {
+        // rebuild conditions to have only those that we know how to map them to product collection
+        $mappableConditions = $this->mappableConditionsProcessor->rebuildConditionsTree($conditions);
+
+        // transform conditions to search criteria
+        $searchCriteria = $this->conditionsToSearchCriteriaMapper->mapConditionsToSearchCriteria($mappableConditions);
+
+        $mappedProductCollection = clone $productCollection;
+
+        // apply search criteria to new version of product collection
+        $this->searchCriteriaProcessor->process($searchCriteria, $mappedProductCollection);
+
+        return $mappedProductCollection;
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
index 00808f38c9132..3f396cacd37da 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -105,6 +105,7 @@ public function build($productId)
             ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->where('t.rule_date = ?', $currentDate)
             ->order('t.rule_price ' . Select::SQL_ASC)
+            ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
             ->limit(1);
         $priceSelect = $this->baseSelectProcessor->process($priceSelect);
 
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 715b7a2f3903b..d927d6f4d0c82 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -6,10 +6,34 @@
 namespace Magento\CatalogRule\Model;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogRule\Api\Data\RuleExtensionInterface;
 use Magento\CatalogRule\Api\Data\RuleInterface;
+use Magento\CatalogRule\Helper\Data;
+use Magento\CatalogRule\Model\Data\Condition\Converter;
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+use Magento\CatalogRule\Model\ResourceModel\Rule as RuleResourceModel;
+use Magento\CatalogRule\Model\Rule\Action\CollectionFactory as RuleCollectionFactory;
+use Magento\CatalogRule\Model\Rule\Condition\CombineFactory;
+use Magento\Customer\Model\Session;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\DataObject;
 use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Model\ResourceModel\Iterator;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier;
 
 /**
  * Catalog Rule data model
@@ -136,6 +160,21 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      */
     protected $ruleConditionConverter;
 
+    /**
+     * @var ConditionsToCollectionApplier
+     */
+    private $conditionsToCollectionApplier;
+
+    /**
+     * @var array
+     */
+    private $websitesMap;
+
+    /**
+     * @var RuleResourceModel
+     */
+    private $ruleResourceModel;
+
     /**
      * Rule constructor
      *
@@ -161,32 +200,36 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
      * @param ExtensionAttributesFactory|null $extensionFactory
      * @param AttributeValueFactory|null $customAttributeFactory
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param \Magento\CatalogRule\Model\ResourceModel\RuleResourceModel|null $ruleResourceModel
+     * @param ConditionsToCollectionApplier $conditionsToCollectionApplier
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory,
-        \Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory,
-        \Magento\Catalog\Model\ProductFactory $productFactory,
-        \Magento\Framework\Model\ResourceModel\Iterator $resourceIterator,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\CatalogRule\Helper\Data $catalogRuleData,
-        \Magento\Framework\App\Cache\TypeListInterface $cacheTypesList,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor $ruleProductProcessor,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        Context $context,
+        Registry $registry,
+        FormFactory $formFactory,
+        TimezoneInterface $localeDate,
+        CollectionFactory $productCollectionFactory,
+        StoreManagerInterface $storeManager,
+        CombineFactory $combineFactory,
+        RuleCollectionFactory $actionCollectionFactory,
+        ProductFactory $productFactory,
+        Iterator $resourceIterator,
+        Session $customerSession,
+        Data $catalogRuleData,
+        TypeListInterface $cacheTypesList,
+        DateTime $dateTime,
+        RuleProductProcessor $ruleProductProcessor,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
         array $relatedCacheTypes = [],
         array $data = [],
         ExtensionAttributesFactory $extensionFactory = null,
         AttributeValueFactory $customAttributeFactory = null,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        Json $serializer = null,
+        RuleResourceModel $ruleResourceModel = null,
+        ConditionsToCollectionApplier $conditionsToCollectionApplier = null
     ) {
         $this->_productCollectionFactory = $productCollectionFactory;
         $this->_storeManager = $storeManager;
@@ -200,6 +243,10 @@ public function __construct(
         $this->_relatedCacheTypes = $relatedCacheTypes;
         $this->dateTime = $dateTime;
         $this->_ruleProductProcessor = $ruleProductProcessor;
+        $this->ruleResourceModel = $ruleResourceModel ?: ObjectManager::getInstance()->get(RuleResourceModel::class);
+
+        $this->conditionsToCollectionApplier = $conditionsToCollectionApplier
+            ?? ObjectManager::getInstance()->get(ConditionsToCollectionApplier::class);
 
         parent::__construct(
             $context,
@@ -223,7 +270,7 @@ public function __construct(
     protected function _construct()
     {
         parent::_construct();
-        $this->_init(\Magento\CatalogRule\Model\ResourceModel\Rule::class);
+        $this->_init(RuleResourceModel::class);
         $this->setIdFieldName('rule_id');
     }
 
@@ -255,7 +302,7 @@ public function getActionsInstance()
     public function getCustomerGroupIds()
     {
         if (!$this->hasCustomerGroupIds()) {
-            $customerGroupIds = $this->_getResource()->getCustomerGroupIds($this->getId());
+            $customerGroupIds = $this->ruleResourceModel->getCustomerGroupIds($this->getId());
             $this->setData('customer_group_ids', (array)$customerGroupIds);
         }
         return $this->_getData('customer_group_ids');
@@ -269,7 +316,7 @@ public function getCustomerGroupIds()
     public function getNow()
     {
         if (!$this->_now) {
-            return (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+            return (new \DateTime())->format(DateTime::DATETIME_PHP_FORMAT);
         }
         return $this->_now;
     }
@@ -306,6 +353,11 @@ public function getMatchingProductIds()
                 }
                 $this->getConditions()->collectValidatedAttributes($productCollection);
 
+                if ($this->canPreMapProducts()) {
+                    $productCollection = $this->conditionsToCollectionApplier
+                        ->applyConditionsToCollection($this->getConditions(), $productCollection);
+                }
+
                 $this->_resourceIterator->walk(
                     $productCollection->getSelect(),
                     [[$this, 'callbackValidateProduct']],
@@ -320,6 +372,23 @@ public function getMatchingProductIds()
         return $this->_productIds;
     }
 
+    /**
+     * Check if we can use mapping for rule conditions
+     *
+     * @return bool
+     */
+    private function canPreMapProducts()
+    {
+        $conditions = $this->getConditions();
+
+        // No need to map products if there is no conditions in rule
+        if (!$conditions || !$conditions->getConditions()) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Callback function for product matching
      *
@@ -348,22 +417,25 @@ public function callbackValidateProduct($args)
      */
     protected function _getWebsitesMap()
     {
-        $map = [];
-        $websites = $this->_storeManager->getWebsites();
-        foreach ($websites as $website) {
-            // Continue if website has no store to be able to create catalog rule for website without store
-            if ($website->getDefaultStore() === null) {
-                continue;
+        if ($this->websitesMap === null) {
+            $this->websitesMap = [];
+            $websites = $this->_storeManager->getWebsites();
+            foreach ($websites as $website) {
+                // Continue if website has no store to be able to create catalog rule for website without store
+                if ($website->getDefaultStore() === null) {
+                    continue;
+                }
+                $this->websitesMap[$website->getId()] = $website->getDefaultStore()->getId();
             }
-            $map[$website->getId()] = $website->getDefaultStore()->getId();
         }
-        return $map;
+
+        return $this->websitesMap;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function validateData(\Magento\Framework\DataObject $dataObject)
+    public function validateData(DataObject $dataObject)
     {
         $result = parent::validateData($dataObject);
         if ($result === true) {
@@ -470,7 +542,7 @@ public function calcProductPriceRule(Product $product, $price)
      */
     protected function _getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $productId)
     {
-        return $this->_getResource()->getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $productId);
+        return $this->ruleResourceModel->getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $productId);
     }
 
     /**
@@ -516,10 +588,10 @@ protected function _invalidateCache()
      */
     public function afterSave()
     {
-        if ($this->isObjectNew()) {
-            $this->getMatchingProductIds();
-            if (!empty($this->_productIds) && is_array($this->_productIds)) {
-                $this->_getResource()->addCommitCallback([$this, 'reindex']);
+        if ($this->isObjectNew() && !$this->_ruleProductProcessor->isIndexerScheduled()) {
+            $productIds = $this->getMatchingProductIds();
+            if (!empty($productIds) && is_array($productIds)) {
+                $this->ruleResourceModel->addCommitCallback([$this, 'reindex']);
             }
         } else {
             $this->_ruleProductProcessor->getIndexer()->invalidate();
@@ -534,7 +606,10 @@ public function afterSave()
      */
     public function reindex()
     {
-        $this->_ruleProductProcessor->reindexList($this->_productIds);
+        $productIds = $this->_productIds ? array_keys(array_filter($this->_productIds, function (array $data) {
+            return array_filter($data);
+        })) : [];
+        $this->_ruleProductProcessor->reindexList($productIds);
     }
 
     /**
@@ -778,7 +853,7 @@ public function getExtensionAttributes()
      * @param \Magento\CatalogRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(\Magento\CatalogRule\Api\Data\RuleExtensionInterface $extensionAttributes)
+    public function setExtensionAttributes(RuleExtensionInterface $extensionAttributes)
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
@@ -790,8 +865,8 @@ public function setExtensionAttributes(\Magento\CatalogRule\Api\Data\RuleExtensi
     private function getRuleConditionConverter()
     {
         if (null === $this->ruleConditionConverter) {
-            $this->ruleConditionConverter = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\CatalogRule\Model\Data\Condition\Converter::class);
+            $this->ruleConditionConverter = ObjectManager::getInstance()
+                ->get(Converter::class);
         }
         return $this->ruleConditionConverter;
     }
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
new file mode 100644
index 0000000000000..6d343fe149d21
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
@@ -0,0 +1,308 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Rule\Condition;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Rule\Model\Condition\ConditionInterface;
+use Magento\CatalogRule\Model\Rule\Condition\Combine as CombinedCondition;
+use Magento\CatalogRule\Model\Rule\Condition\Product as SimpleCondition;
+use Magento\Framework\Api\CombinedFilterGroup as FilterGroup;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria;
+
+/**
+ * Maps catalog price rule conditions to search criteria
+ */
+class ConditionsToSearchCriteriaMapper
+{
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilderFactory
+     */
+    private $searchCriteriaBuilderFactory;
+
+    /**
+     * @var \Magento\Framework\Api\CombinedFilterGroupFactory
+     */
+    private $combinedFilterGroupFactory;
+
+    /**
+     * @var \Magento\Framework\Api\FilterFactory
+     */
+    private $filterFactory;
+
+    /**
+     * @param \Magento\Framework\Api\SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory
+     * @param \Magento\Framework\Api\CombinedFilterGroupFactory $combinedFilterGroupFactory
+     * @param \Magento\Framework\Api\FilterFactory $filterFactory
+     */
+    public function __construct(
+        \Magento\Framework\Api\SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
+        \Magento\Framework\Api\CombinedFilterGroupFactory $combinedFilterGroupFactory,
+        \Magento\Framework\Api\FilterFactory $filterFactory
+    ) {
+        $this->searchCriteriaBuilderFactory = $searchCriteriaBuilderFactory;
+        $this->combinedFilterGroupFactory = $combinedFilterGroupFactory;
+        $this->filterFactory = $filterFactory;
+    }
+
+    /**
+     * Maps catalog price rule conditions to search criteria
+     *
+     * @param CombinedCondition $conditions
+     * @return SearchCriteria
+     * @throws InputException
+     */
+    public function mapConditionsToSearchCriteria(CombinedCondition $conditions): SearchCriteria
+    {
+        $filterGroup = $this->mapCombinedConditionToFilterGroup($conditions);
+
+        $searchCriteriaBuilder = $this->searchCriteriaBuilderFactory->create();
+
+        if ($filterGroup !== null) {
+            $searchCriteriaBuilder->setFilterGroups([$filterGroup]);
+        }
+
+        return $searchCriteriaBuilder->create();
+    }
+
+    /**
+     * @param ConditionInterface $condition
+     * @return null|\Magento\Framework\Api\CombinedFilterGroup|\Magento\Framework\Api\Filter
+     * @throws InputException
+     */
+    private function mapConditionToFilterGroup(ConditionInterface $condition)
+    {
+        if ($condition->getType() === CombinedCondition::class) {
+            return $this->mapCombinedConditionToFilterGroup($condition);
+        } elseif ($condition->getType() === SimpleCondition::class) {
+            return $this->mapSimpleConditionToFilterGroup($condition);
+        }
+
+        throw new InputException(
+            __('Undefined condition type "%1" passed in.', $condition->getType())
+        );
+    }
+
+    /**
+     * @param Combine $combinedCondition
+     * @return null|\Magento\Framework\Api\CombinedFilterGroup
+     * @throws InputException
+     */
+    private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCondition)
+    {
+        $filters = [];
+
+        foreach ($combinedCondition->getConditions() as $condition) {
+            $filter = $this->mapConditionToFilterGroup($condition);
+
+            if ($filter === null) {
+                continue;
+            }
+
+            // This required to solve cases when condition is configured like:
+            // "If ALL/ANY of these conditions are FALSE" - we need to reverse SQL operator for this "FALSE"
+            if ((bool)$combinedCondition->getValue() === false) {
+                $this->reverseSqlOperatorInFilter($filter);
+            }
+
+            $filters[] = $filter;
+        }
+
+        if (count($filters) === 0) {
+            return null;
+        }
+
+        return $this->createCombinedFilterGroup($filters, $combinedCondition->getAggregator());
+    }
+
+    /**
+     * @param ConditionInterface $productCondition
+     * @return FilterGroup|Filter
+     * @throws InputException
+     */
+    private function mapSimpleConditionToFilterGroup(ConditionInterface $productCondition)
+    {
+        if (is_array($productCondition->getValue())) {
+            return $this->processSimpleConditionWithArrayValue($productCondition);
+        }
+
+        return $this->createFilter(
+            $productCondition->getAttribute(),
+            (string) $productCondition->getValue(),
+            $productCondition->getOperator()
+        );
+    }
+
+    /**
+     * @param ConditionInterface $productCondition
+     * @return FilterGroup
+     * @throws InputException
+     */
+    private function processSimpleConditionWithArrayValue(ConditionInterface $productCondition): FilterGroup
+    {
+        $filters = [];
+
+        foreach ($productCondition->getValue() as $subValue) {
+            $filters[] = $this->createFilter(
+                $productCondition->getAttribute(),
+                (string) $subValue,
+                $productCondition->getOperator()
+            );
+        }
+
+        $combinationMode = $this->getGlueForArrayValues($productCondition->getOperator());
+
+        return $this->createCombinedFilterGroup($filters, $combinationMode);
+    }
+
+    /**
+     * @param string $operator
+     * @return string
+     */
+    private function getGlueForArrayValues(string $operator): string
+    {
+        if (in_array($operator, ['!=', '!{}', '!()'], true)) {
+            return 'all';
+        }
+
+        return 'any';
+    }
+
+    /**
+     * Reverse sql conditions to their corresponding negative analog
+     *
+     * @param Filter $filter
+     * @return void
+     * @throws InputException
+     */
+    private function reverseSqlOperatorInFilter(Filter $filter)
+    {
+        $operatorsMap = [
+            'eq' => 'neq',
+            'neq' => 'eq',
+            'gteq' => 'lt',
+            'lteq' => 'gt',
+            'gt' => 'lteq',
+            'lt' => 'gteq',
+            'like' => 'nlike',
+            'nlike' => 'like',
+            'in' => 'nin',
+            'nin' => 'in',
+        ];
+
+        if (!array_key_exists($filter->getConditionType(), $operatorsMap)) {
+            throw new InputException(
+                __(
+                    'Undefined SQL operator "%1" passed in. Valid operators are: %2',
+                    $filter->getConditionType(),
+                    implode(',', array_keys($operatorsMap))
+                )
+            );
+        }
+
+        $filter->setConditionType(
+            $operatorsMap[$filter->getConditionType()]
+        );
+    }
+
+    /**
+     * @param array $filters
+     * @param string $combinationMode
+     * @return FilterGroup
+     * @throws InputException
+     */
+    private function createCombinedFilterGroup(array $filters, string $combinationMode): FilterGroup
+    {
+        return $this->combinedFilterGroupFactory->create([
+            'data' => [
+                FilterGroup::FILTERS => $filters,
+                FilterGroup::COMBINATION_MODE => $this->mapRuleAggregatorToSQLAggregator($combinationMode)
+            ]
+        ]);
+    }
+
+    /**
+     * @param string $field
+     * @param string $value
+     * @param string $conditionType
+     * @return Filter
+     * @throws InputException
+     */
+    private function createFilter(string $field, string $value, string $conditionType): Filter
+    {
+        return $this->filterFactory->create([
+            'data' => [
+                Filter::KEY_FIELD => $field,
+                Filter::KEY_VALUE => $value,
+                Filter::KEY_CONDITION_TYPE => $this->mapRuleOperatorToSQLCondition($conditionType)
+            ]
+        ]);
+    }
+
+    /**
+     * Maps catalog price rule operators to their corresponding operators in SQL
+     *
+     * @param string $ruleOperator
+     * @return string
+     * @throws InputException
+     */
+    private function mapRuleOperatorToSQLCondition(string $ruleOperator): string
+    {
+        $operatorsMap = [
+            '==' => 'eq',    // is
+            '!=' => 'neq',   // is not
+            '>=' => 'gteq',  // equals or greater than
+            '<=' => 'lteq',  // equals or less than
+            '>' => 'gt',    // greater than
+            '<' => 'lt',    // less than
+            '{}' => 'like',  // contains
+            '!{}' => 'nlike', // does not contains
+            '()' => 'in',    // is one of
+            '!()' => 'nin',   // is not one of
+        ];
+
+        if (!array_key_exists($ruleOperator, $operatorsMap)) {
+            throw new InputException(
+                __(
+                    'Undefined rule operator "%1" passed in. Valid operators are: %2',
+                    $ruleOperator,
+                    implode(',', array_keys($operatorsMap))
+                )
+            );
+        }
+
+        return $operatorsMap[$ruleOperator];
+    }
+
+    /**
+     * Map rule combine aggregations to corresponding SQL operator
+     *
+     * @param string $ruleAggregator
+     * @return string
+     * @throws InputException
+     */
+    private function mapRuleAggregatorToSQLAggregator(string $ruleAggregator): string
+    {
+        $operatorsMap = [
+            'all' => 'AND',
+            'any' => 'OR',
+        ];
+
+        if (!array_key_exists(strtolower($ruleAggregator), $operatorsMap)) {
+            throw new InputException(
+                __(
+                    'Undefined rule aggregator "%1" passed in. Valid operators are: %2',
+                    $ruleAggregator,
+                    implode(',', array_keys($operatorsMap))
+                )
+            );
+        }
+
+        return $operatorsMap[$ruleAggregator];
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/MappableConditionsProcessor.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/MappableConditionsProcessor.php
new file mode 100644
index 0000000000000..63c3f62ad0590
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/MappableConditionsProcessor.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Rule\Condition;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionProviderInterface;
+use Magento\CatalogRule\Model\Rule\Condition\Combine as CombinedCondition;
+use Magento\CatalogRule\Model\Rule\Condition\Product as SimpleCondition;
+
+/**
+ * Rebuilds catalog price rule conditions tree
+ * so only those conditions that can be mapped to search criteria are left
+ *
+ * Those conditions that can't be mapped are deleted from tree
+ * If deleted condition is part of combined condition with OR aggregation all this group will be removed
+ */
+class MappableConditionsProcessor
+{
+    /**
+     * @var CustomConditionProviderInterface
+     */
+    private $customConditionProvider;
+
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
+    /**
+     * @param CustomConditionProviderInterface $customConditionProvider
+     * @param \Magento\Eav\Model\Config $eavConfig
+     */
+    public function __construct(
+        CustomConditionProviderInterface $customConditionProvider,
+        \Magento\Eav\Model\Config $eavConfig
+    ) {
+        $this->customConditionProvider = $customConditionProvider;
+        $this->eavConfig = $eavConfig;
+    }
+
+    /**
+     * @param Combine $conditions
+     * @return Combine
+     */
+    public function rebuildConditionsTree(CombinedCondition $conditions): CombinedCondition
+    {
+        return $this->rebuildCombinedCondition($conditions);
+    }
+
+    /**
+     * @param Combine $originalConditions
+     * @return Combine
+     * @throws InputException
+     */
+    private function rebuildCombinedCondition(CombinedCondition $originalConditions): CombinedCondition
+    {
+        $validConditions = [];
+        $invalidConditions = [];
+
+        foreach ($originalConditions->getConditions() as $condition) {
+            if ($condition->getType() === CombinedCondition::class) {
+                $rebuildSubCondition = $this->rebuildCombinedCondition($condition);
+
+                if (count($rebuildSubCondition->getConditions()) > 0) {
+                    $validConditions[] = $rebuildSubCondition;
+                } else {
+                    $invalidConditions[] = $rebuildSubCondition;
+                }
+
+                continue;
+            }
+
+            if ($condition->getType() === SimpleCondition::class) {
+                if ($this->validateSimpleCondition($condition)) {
+                    $validConditions[] = $condition;
+                } else {
+                    $invalidConditions[] = $condition;
+                }
+
+                continue;
+            }
+
+            throw new InputException(
+                __('Undefined condition type "%1" passed in.', $condition->getType())
+            );
+        }
+
+        // if resulted condition group has left no mappable conditions - we can remove it at all
+        if (count($invalidConditions) > 0 && strtolower($originalConditions->getAggregator()) === 'any') {
+            $validConditions = [];
+        }
+
+        $rebuildCondition = clone $originalConditions;
+        $rebuildCondition->setConditions($validConditions);
+
+        return $rebuildCondition;
+    }
+
+    /**
+     * @param Product $originalConditions
+     * @return bool
+     */
+    private function validateSimpleCondition(SimpleCondition $originalConditions): bool
+    {
+        return $this->canUseFieldForMapping($originalConditions->getAttribute());
+    }
+
+    /**
+     * Checks if condition field is mappable
+     *
+     * @param string $fieldName
+     * @return bool
+     */
+    private function canUseFieldForMapping(string $fieldName): bool
+    {
+        // We can map field to search criteria if we have custom processor for it
+        if ($this->customConditionProvider->hasProcessorForField($fieldName)) {
+            return true;
+        }
+
+        // Also we can map field to search criteria if it is an EAV attribute
+        $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $fieldName);
+
+        // We have this weird check for getBackendType() to verify that attribute really exists
+        // because due to eavConfig behavior even if pass non existing attribute code we still receive AbstractAttribute
+        // getAttributeId() is not sufficient too because some attributes don't have it - e.g. attribute_set_id
+        if ($attribute && $attribute->getBackendType() !== null) {
+            return true;
+        }
+
+        // In any other cases we can't map field to search criteria
+        return false;
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
index 51cb6638af48b..ab650c94a0f08 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
@@ -99,6 +99,10 @@ protected function _prepareDatetimeValue($value, \Magento\Framework\Model\Abstra
     {
         $attribute = $model->getResource()->getAttribute($this->getAttribute());
         if ($attribute && $attribute->getBackendType() == 'datetime') {
+            if (!$value) {
+                return null;
+            }
+            $this->setValue(strtotime($this->getValue()));
             $value = strtotime($value);
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php
index 63ff98d4ca5b7..71734eb3c5d46 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Job.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php
@@ -8,6 +8,10 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\CatalogRule\Model\Rule;
+
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+
 /**
  * Catalog Rule job model
  *
@@ -18,13 +22,8 @@
  * @method bool hasSuccess()
  * @method bool hasError()
  *
- * @author    Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\CatalogRule\Model\Rule;
-
-use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
-
-/**
+ * @author Magento Core Team <core@magentocommerce.com>
+ *
  * @api
  * @since 100.0.2
  */
@@ -39,10 +38,14 @@ class Job extends \Magento\Framework\DataObject
      * Basic object initialization
      *
      * @param RuleProductProcessor $ruleProcessor
+     * @param array $data
      */
-    public function __construct(RuleProductProcessor $ruleProcessor)
-    {
+    public function __construct(
+        RuleProductProcessor $ruleProcessor,
+        array $data = []
+    ) {
         $this->ruleProcessor = $ruleProcessor;
+        parent::__construct($data);
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php b/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
index 08c3d97b216ed..749ac3cf51249 100644
--- a/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
+++ b/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
@@ -37,7 +37,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $dirtyRules = $observer->getData('dirty_rules');
         if (!empty($dirtyRules)) {
             if ($dirtyRules->getState()) {
-                $this->messageManager->addNotice($observer->getData('message'));
+                $this->messageManager->addNoticeMessage($observer->getData('message'));
             }
         }
     }
diff --git a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
index 8a3a821707624..321780eca5632 100644
--- a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
+++ b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
@@ -22,7 +22,7 @@ class RulePricesStorage
      */
     public function getRulePrice($id)
     {
-        return isset($this->rulePrices[$id]) ? $this->rulePrices[$id] : false;
+        return $this->rulePrices[$id] ?? false;
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php
index 8bcc1fd8d6834..50e3703087680 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Category.php
@@ -35,8 +35,8 @@ public function afterSave(
         \Magento\Catalog\Model\Category $result
     ) {
         /** @var \Magento\Catalog\Model\Category $result */
-        $productIds = $result->getAffectedProductIds();
-        if ($productIds) {
+        $productIds = $result->getChangedProductIds();
+        if (!empty($productIds) && !$this->productRuleProcessor->isIndexerScheduled()) {
             $this->productRuleProcessor->reindexList($productIds);
         }
         return $result;
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
index cc808a38db698..7fdffe933db8c 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
@@ -103,7 +103,7 @@ protected function checkCatalogRulesAvailability($attributeCode)
 
         if ($disabledRulesCount) {
             $this->ruleProductProcessor->markIndexerAsInvalid();
-            $this->messageManager->addWarning(
+            $this->messageManager->addWarningMessage(
                 __(
                     'You disabled %1 Catalog Price Rules based on "%2" attribute.',
                     $disabledRulesCount,
diff --git a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
index a45a548264a4c..c71b51317fd59 100644
--- a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
@@ -89,7 +89,7 @@ public function getValue()
     {
         if (null === $this->value) {
             if ($this->product->hasData(self::PRICE_CODE)) {
-                $this->value = floatval($this->product->getData(self::PRICE_CODE)) ?: false;
+                $this->value = (float)$this->product->getData(self::PRICE_CODE) ?: false;
             } else {
                 $this->value = $this->getRuleResource()
                     ->getRulePrice(
@@ -98,7 +98,7 @@ public function getValue()
                         $this->customerSession->getCustomerGroupId(),
                         $this->product->getId()
                     );
-                $this->value = $this->value ? floatval($this->value) : false;
+                $this->value = $this->value ? (float)$this->value : false;
             }
             if ($this->value) {
                 $this->value = $this->priceCurrency->convertAndRound($this->value);
diff --git a/app/code/Magento/CatalogRule/Setup/InstallData.php b/app/code/Magento/CatalogRule/Setup/InstallData.php
deleted file mode 100644
index 47591f838d185..0000000000000
--- a/app/code/Magento/CatalogRule/Setup/InstallData.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogRule\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup->createMigrationSetup();
-        $setup->startSetup();
-
-        $installer->appendClassAliasReplace(
-            'catalogrule',
-            'conditions_serialized',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
-            ['rule_id']
-        );
-        $installer->appendClassAliasReplace(
-            'catalogrule',
-            'actions_serialized',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
-            ['rule_id']
-        );
-
-        $installer->doUpdateClassAliases();
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Setup/InstallSchema.php b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
deleted file mode 100644
index a12856d92422a..0000000000000
--- a/app/code/Magento/CatalogRule/Setup/InstallSchema.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogRule\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        $customerGroupTable = $setup->getConnection()->describeTable($setup->getTable('customer_group'));
-        $customerGroupIdType = $customerGroupTable['customer_group_id']['DATA_TYPE'] == 'int'
-            ? \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER : $customerGroupTable['customer_group_id']['DATA_TYPE'];
-        /**
-         * Create table 'catalogrule'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalogrule'))
-            ->addColumn(
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rule Id'
-            )
-            ->addColumn(
-                'name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Name'
-            )
-            ->addColumn(
-                'description',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Description'
-            )
-            ->addColumn(
-                'from_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'From'
-            )
-            ->addColumn(
-                'to_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'To'
-            )
-            ->addColumn(
-                'is_active',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Is Active'
-            )
-            ->addColumn(
-                'conditions_serialized',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '2M',
-                [],
-                'Conditions Serialized'
-            )
-            ->addColumn(
-                'actions_serialized',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '2M',
-                [],
-                'Actions Serialized'
-            )
-            ->addColumn(
-                'stop_rules_processing',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '1'],
-                'Stop Rules Processing'
-            )
-            ->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sort Order'
-            )
-            ->addColumn(
-                'simple_action',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                [],
-                'Simple Action'
-            )
-            ->addColumn(
-                'discount_amount',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                [12, 4],
-                ['nullable' => false, 'default' => 0.0000],
-                'Discount Amount'
-            )
-            ->addColumn(
-                'sub_is_enable',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Is Rule Enable For Subitems'
-            )
-            ->addColumn(
-                'sub_simple_action',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                [],
-                'Simple Action For Subitems'
-            )
-            ->addColumn(
-                'sub_discount_amount',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                [12, 4],
-                ['nullable' => false, 'default' => 0.0000],
-                'Discount Amount For Subitems'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule', ['is_active', 'sort_order', 'to_date', 'from_date']),
-                ['is_active', 'sort_order', 'to_date', 'from_date']
-            )
-            ->setComment('CatalogRule');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalogrule_product'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalogrule_product'))
-            ->addColumn(
-                'rule_product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rule Product Id'
-            )
-            ->addColumn(
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Rule Id'
-            )
-            ->addColumn(
-                'from_time',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'From Time'
-            )
-            ->addColumn(
-                'to_time',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'To time'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product Id'
-            )
-            ->addColumn(
-                'action_operator',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                10,
-                ['default' => 'to_fixed'],
-                'Action Operator'
-            )
-            ->addColumn(
-                'action_amount',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                [12, 4],
-                ['nullable' => false, 'default' => '0.0000'],
-                'Action Amount'
-            )
-            ->addColumn(
-                'action_stop',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Action Stop'
-            )
-            ->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sort Order'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Website Id'
-            )
-            ->addColumn(
-                'sub_simple_action',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                [],
-                'Simple Action For Subitems'
-            )
-            ->addColumn(
-                'sub_discount_amount',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                [12, 4],
-                ['nullable' => false, 'default' => '0.0000'],
-                'Discount Amount For Subitems'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalogrule_product',
-                    ['rule_id', 'from_time', 'to_time', 'website_id', 'customer_group_id', 'product_id', 'sort_order'],
-                    true
-                ),
-                ['rule_id', 'from_time', 'to_time', 'website_id', 'customer_group_id', 'product_id', 'sort_order'],
-                ['type' => 'unique']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product', ['website_id']),
-                ['website_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product', ['from_time']),
-                ['from_time']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product', ['to_time']),
-                ['to_time']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product', ['product_id']),
-                ['product_id']
-            )
-            ->setComment('CatalogRule Product');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalogrule_product_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalogrule_product_price'))
-            ->addColumn(
-                'rule_product_price_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rule Product PriceId'
-            )
-            ->addColumn(
-                'rule_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                ['nullable' => false],
-                'Rule Date'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product Id'
-            )
-            ->addColumn(
-                'rule_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                [12, 4],
-                ['nullable' => false, 'default' => '0.0000'],
-                'Rule Price'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Website Id'
-            )
-            ->addColumn(
-                'latest_start_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'Latest StartDate'
-            )
-            ->addColumn(
-                'earliest_end_date',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'Earliest EndDate'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalogrule_product_price',
-                    ['rule_date', 'website_id', 'customer_group_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['rule_date', 'website_id', 'customer_group_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product_price', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product_price', ['website_id']),
-                ['website_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_product_price', ['product_id']),
-                ['product_id']
-            )
-            ->setComment('CatalogRule Product Price');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalogrule_group_website'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalogrule_group_website'))
-            ->addColumn(
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Rule Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                $customerGroupIdType,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Customer Group Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Website Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_group_website', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_group_website', ['website_id']),
-                ['website_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalogrule_group_website',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                ),
-                'customer_group_id',
-                $installer->getTable('customer_group'),
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalogrule_group_website', 'rule_id', 'catalogrule', 'rule_id'),
-                'rule_id',
-                $installer->getTable('catalogrule'),
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalogrule_group_website', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('CatalogRule Group Website');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalogrule_website'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalogrule_website'))
-            ->addColumn(
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rule Id'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_website', ['website_id']),
-                ['website_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalogrule_website', 'rule_id', 'catalogrule', 'rule_id'),
-                'rule_id',
-                $installer->getTable('catalogrule'),
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalogrule_website', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Rules To Websites Relations');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalogrule_customer_group'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalogrule_customer_group'))
-            ->addColumn(
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rule Id'
-            )
-            ->addColumn(
-                'customer_group_id',
-                $customerGroupIdType,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalogrule_customer_group', ['customer_group_id']),
-                ['customer_group_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalogrule_customer_group', 'rule_id', 'catalogrule', 'rule_id'),
-                'rule_id',
-                $installer->getTable('catalogrule'),
-                'rule_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalogrule_customer_group',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                ),
-                'customer_group_id',
-                $installer->getTable('customer_group'),
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Rules To Customer Groups Relations');
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..111d7acd53099
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogRule\Setup\Patch\Data;
+
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldToConvert;
+use Magento\CatalogRule\Api\Data\RuleInterface;
+
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var AggregatedFieldDataConverter
+     */
+    private $aggregatedFieldDataConverter;
+
+    /**
+     * ConvertSerializedDataToJson constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param MetadataPool $metadataPool
+     * @param AggregatedFieldDataConverter $aggregatedFieldDataConverter
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        MetadataPool $metadataPool,
+        AggregatedFieldDataConverter $aggregatedFieldDataConverter
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->metadataPool = $metadataPool;
+        $this->aggregatedFieldDataConverter = $aggregatedFieldDataConverter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $metadata = $this->metadataPool->getMetadata(RuleInterface::class);
+        $this->aggregatedFieldDataConverter->convert(
+            [
+                new FieldToConvert(
+                    SerializedToJson::class,
+                    $this->moduleDataSetup->getTable('catalogrule'),
+                    $metadata->getLinkField(),
+                    'conditions_serialized'
+                ),
+                new FieldToConvert(
+                    SerializedToJson::class,
+                    $this->moduleDataSetup->getTable('catalogrule'),
+                    $metadata->getLinkField(),
+                    'actions_serialized'
+                ),
+            ],
+            $this->moduleDataSetup->getConnection()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateClassAliasesForCatalogRules::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php b/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php
new file mode 100644
index 0000000000000..ce1d76876f690
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogRule\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateClassAliasesForCatalogRules
+ * @package Magento\CatalogRule\Setup\Patch
+ */
+class UpdateClassAliasesForCatalogRules implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $dataSetup;
+
+    /**
+     * UpdateClassAliasesForCatalogRules constructor.
+     * @param ModuleDataSetupInterface $dataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $dataSetup
+    ) {
+        $this->dataSetup = $dataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $installer = $this->dataSetup->createMigrationSetup();
+        $installer->appendClassAliasReplace(
+            'catalogrule',
+            'conditions_serialized',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
+            ['rule_id']
+        );
+        $installer->appendClassAliasReplace(
+            'catalogrule',
+            'actions_serialized',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
+            ['rule_id']
+        );
+        $installer->doUpdateClassAliases();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Setup/UpgradeData.php b/app/code/Magento/CatalogRule/Setup/UpgradeData.php
deleted file mode 100644
index 7f75b7e41dfac..0000000000000
--- a/app/code/Magento/CatalogRule/Setup/UpgradeData.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogRule\Setup;
-
-use Magento\Framework\DB\AggregatedFieldDataConverter;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\CatalogRule\Api\Data\RuleInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var MetadataPool
-     */
-    private $metadataPool;
-
-    /**
-     * @var AggregatedFieldDataConverter
-     */
-    private $aggregatedFieldConverter;
-
-    /**
-     * UpgradeData constructor.
-     *
-     * @param AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @param MetadataPool $metadataPool
-     */
-    public function __construct(
-        AggregatedFieldDataConverter $aggregatedFieldConverter,
-        MetadataPool $metadataPool
-    ) {
-        $this->aggregatedFieldConverter = $aggregatedFieldConverter;
-        $this->metadataPool = $metadataPool;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $this->convertSerializedDataToJson($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Convert metadata from serialized to JSON format:
-     *
-     * @param ModuleDataSetupInterface $setup
-     *
-     * @return void
-     */
-    public function convertSerializedDataToJson($setup)
-    {
-        $metadata = $this->metadataPool->getMetadata(RuleInterface::class);
-        $this->aggregatedFieldConverter->convert(
-            [
-                new FieldToConvert(
-                    SerializedToJson::class,
-                    $setup->getTable('catalogrule'),
-                    $metadata->getLinkField(),
-                    'conditions_serialized'
-                ),
-                new FieldToConvert(
-                    SerializedToJson::class,
-                    $setup->getTable('catalogrule'),
-                    $metadata->getLinkField(),
-                    'actions_serialized'
-                ),
-            ],
-            $setup->getConnection()
-        );
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php b/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php
deleted file mode 100644
index b75e5ea61fe6e..0000000000000
--- a/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogRule\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Upgrade the CatalogRule module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->removeSubProductDiscounts($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $tables = [
-                'catalogrule_product',
-                'catalogrule_product_price',
-            ];
-            foreach ($tables as $table) {
-                $setup->getConnection()->modifyColumn(
-                    $setup->getTable($table),
-                    'customer_group_id',
-                    ['type' => 'integer']
-                );
-            }
-        }
-
-        if (version_compare($context->getVersion(), '2.1.0', '<')) {
-            $connection = $setup->getConnection();
-            $connection->dropForeignKey(
-                $setup->getTable('catalogrule_group_website'),
-                $setup->getFkName(
-                    'catalogrule_group_website',
-                    'customer_group_id',
-                    'customer_group',
-                    'customer_group_id'
-                )
-            );
-            $connection->dropForeignKey(
-                $setup->getTable('catalogrule_group_website'),
-                $setup->getFkName('catalogrule_group_website', 'rule_id', 'catalogrule', 'rule_id')
-            );
-            $connection->dropForeignKey(
-                $setup->getTable('catalogrule_group_website'),
-                $setup->getFkName('catalogrule_group_website', 'website_id', 'store_website', 'website_id')
-            );
-
-            $this->addReplicaTable($setup, 'catalogrule_product', 'catalogrule_product_replica');
-            $this->addReplicaTable($setup, 'catalogrule_product_price', 'catalogrule_product_price_replica');
-            $this->addReplicaTable($setup, 'catalogrule_group_website', 'catalogrule_group_website_replica');
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Remove Sub Product Discounts
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function removeSubProductDiscounts(SchemaSetupInterface $setup)
-    {
-        $connection = $setup->getConnection();
-        $data = [
-            'catalogrule' => [
-                'sub_is_enable',
-                'sub_simple_action',
-                'sub_discount_amount',
-            ],
-            'catalogrule_product' => [
-                'sub_simple_action',
-                'sub_discount_amount',
-            ],
-        ];
-
-        foreach ($data as $table => $fields) {
-            foreach ($fields as $field) {
-                $connection->dropColumn($setup->getTable($table), $field);
-            }
-        }
-    }
-
-    /**
-     * Add the replica table for existing one.
-     *
-     * @param SchemaSetupInterface $setup
-     * @param string $existingTable
-     * @param string $replicaTable
-     * @return void
-     */
-    private function addReplicaTable(SchemaSetupInterface $setup, $existingTable, $replicaTable)
-    {
-        $sql = sprintf(
-            'CREATE TABLE IF NOT EXISTS %s LIKE %s',
-            $setup->getTable($replicaTable),
-            $setup->getTable($existingTable)
-        );
-        $setup->getConnection()->query($sql);
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
new file mode 100644
index 0000000000000..fe4042e8a2e9f
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- action group to create a new catalog price rule giving a catalogRule entity -->
+    <actionGroup name="newCatalogPriceRuleByUI">
+        <arguments>
+            <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
+        </arguments>
+        <!-- Go to the admin Catalog rule grid and add a new one -->
+        <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
+
+        <!-- Fill the form according the attributes of the entity -->
+        <fillField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
+        <fillField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
+        <selectOption stepKey="selectSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"/>
+        <click stepKey="clickFromCalender" selector="{{AdminNewCatalogPriceRule.fromDateButton}}"/>
+        <click stepKey="clickFromToday" selector="{{AdminNewCatalogPriceRule.todayDate}}"/>
+        <click stepKey="clickToCalender" selector="{{AdminNewCatalogPriceRule.toDateButton}}"/>
+        <click stepKey="clickToToday" selector="{{AdminNewCatalogPriceRule.todayDate}}"/>
+        <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
+        <selectOption stepKey="discountType" selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{catalogRule.simple_action}}"/>
+        <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
+        <selectOption stepKey="discardSubsequentRules" selector="{{AdminNewCatalogPriceRuleActions.disregardRules}}" userInput="Yes"/>
+
+        <!-- Scroll to top and either save or save and apply after the action group -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForPageLoad stepKey="waitForApplied"/>
+    </actionGroup>
+
+    <!-- Apply all of the saved catalog price rules -->
+    <actionGroup name="applyCatalogPriceRules">
+        <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <click stepKey="applyRules" selector="{{AdminCatalogPriceRuleGrid.applyRules}}"/>
+        <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="Updated rules applied."/>
+    </actionGroup>
+
+    <!--Add Catalog Rule Condition With product SKU-->
+    <actionGroup name="newCatalogPriceRuleByUIWithConditionIsSKU" extends="newCatalogPriceRuleByUI">
+        <arguments>
+            <argument name="productSku"/>
+        </arguments>
+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" after="discardSubsequentRules" stepKey="openConditionsTab"/>
+        <waitForPageLoad after="openConditionsTab" stepKey="waitForConditionTabOpened"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" after="waitForConditionTabOpened" stepKey="addNewCondition"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="Magento\CatalogRule\Model\Rule\Condition\Product|sku" after="addNewCondition" stepKey="selectTypeCondition"/>
+        <waitForPageLoad after="selectTypeCondition" stepKey="waitForConditionChosed"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsis('1')}}" after="waitForConditionChosed" stepKey="clickEllipsis"/>
+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.targetInput('1', '1')}}" userInput="{{productSku}}" after="clickEllipsis" stepKey="fillProductSku"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.applyButton('1', '1')}}" after="fillProductSku" stepKey="clickApply"/>
+    </actionGroup>
+
+    <!--Add Catalog Rule Condition With Category-->
+    <actionGroup name="newCatalogPriceRuleByUIWithConditionIsCategory" extends="newCatalogPriceRuleByUI">
+        <arguments>
+            <argument name="categoryId"/>
+        </arguments>
+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" after="discardSubsequentRules" stepKey="openConditionsTab"/>
+        <waitForPageLoad after="openConditionsTab" stepKey="waitForConditionTabOpened"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" after="waitForConditionTabOpened" stepKey="addNewCondition"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="Magento\CatalogRule\Model\Rule\Condition\Product|category_ids" after="addNewCondition" stepKey="selectTypeCondition"/>
+        <waitForPageLoad after="selectTypeCondition" stepKey="waitForConditionChosed"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsis('1')}}" after="waitForConditionChosed" stepKey="clickEllipsis"/>
+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.targetInput('1', '1')}}" userInput="{{categoryId}}" after="clickEllipsis" stepKey="fillCategoryId"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.applyButton('1', '1')}}" after="fillCategoryId" stepKey="clickApply"/>
+    </actionGroup>
+
+    <actionGroup name="selectGeneralCustomerGroupActionGroup">
+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="General" stepKey="selectCustomerGroup"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
new file mode 100644
index 0000000000000..71bdfe0613bb7
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultCatalogRule" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+    </entity>
+
+    <entity name="CatalogRuleByFixed" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">by_fixed</data>
+        <data key="discount_amount">12.3</data>
+    </entity>
+
+    <entity name="CatalogRuleToPercent" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">to_percent</data>
+        <data key="discount_amount">90</data>
+    </entity>
+
+    <entity name="CatalogRuleToFixed" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">to_fixed</data>
+        <data key="discount_amount">110.7</data>
+    </entity>
+
+    <entity name="CatalogRuleByPercentWith96Amount" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">96</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE.txt b/app/code/Magento/CatalogRule/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE.txt
rename to app/code/Magento/CatalogRule/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE_AFL.txt b/app/code/Magento/CatalogRule/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE_AFL.txt
rename to app/code/Magento/CatalogRule/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
new file mode 100644
index 0000000000000..0d89c7970b852
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="createCatalogRule" dataType="catalogRule"
+               type="create" auth="adminFormKey" url="/catalog_rule/promo_catalog/save/" method="POST">
+        <contentType>application/x-www-form-urlencoded</contentType>
+        <field key="name">string</field>
+        <field key="description">string</field>
+        <field key="is_active">string</field>
+        <array key="customer_group_ids">
+            <value>integer</value>
+        </array>
+        <array key="website_ids">
+            <value>integer</value>
+        </array>
+        <field key="simple_action">string</field>
+        <field key="discount_amount">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml b/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml
new file mode 100644
index 0000000000000..511a9ac0615d5
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Page/CatalogRulePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CatalogRulePage" url="catalog_rule/promo_catalog/" module="Magento_CatalogRule" area="admin">
+        <section name="AdminSecondaryGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/README.md b/app/code/Magento/CatalogRule/Test/Mftf/README.md
new file mode 100644
index 0000000000000..086f52535e00a
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Rule Functional Tests
+
+The Functional Test Module for **Magento Catalog Rule** module.
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
new file mode 100644
index 0000000000000..bab9842caaa42
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCatalogPriceRuleStagingSection">
+        <element name="status" type="select" selector=".modal-component [data-index='is_active'] select"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
new file mode 100644
index 0000000000000..7cfb5bf40be55
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewCatalogPriceRule">
+        <element name="saveAndApply" type="button" selector="#save_and_apply" timeout="30"/>
+        <element name="save" type="button" selector="#save" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
+
+        <element name="ruleName" type="input" selector="[name='name']"/>
+        <element name="description" type="textarea" selector="[name='description']"/>
+        <element name="status" type="select" selector="[name='is_active']"/>
+
+        <element name="websites" type="select" selector="[name='website_ids']"/>
+        <element name="websitesOptions" type="select" selector="[name='website_ids'] option"/>
+        <element name="customerGroups" type="select" selector="[name='customer_group_ids']"/>
+        <element name="customerGroupsOptions" type="select" selector="[name='customer_group_ids'] option"/>
+
+        <element name="fromDateButton" type="button" selector="[name='from_date'] + button" timeout="15"/>
+        <element name="toDateButton" type="button" selector="[name='to_date'] + button" timeout="15"/>
+        <element name="todayDate" type="button" selector="#ui-datepicker-div [data-handler='today']"/>
+        <element name="priority" type="input" selector="[name='sort_order']"/>
+        <element name="conditionsTab" type="block" selector="[data-index='block_promo_catalog_edit_tab_conditions']"/>
+        <element name="actionsTab" type="block" selector="[data-index='actions']"/>
+    </section>
+
+    <section name="AdminNewCatalogPriceRuleActions">
+        <element name="apply" type="select" selector="[name='simple_action']"/>
+        <element name="discountAmount" type="input" selector="[name='discount_amount']"/>
+        <element name="disregardRules" type="select" selector="[name='stop_rules_processing']"/>
+    </section>
+
+    <section name="AdminNewCatalogPriceRuleConditions">
+        <element name="newCondition" type="button" selector=".rule-param.rule-param-new-child"/>
+        <element name="conditionSelect" type="select" selector="select#conditions__{{var}}__new_child" parameterized="true"/>
+        <element name="targetEllipsis" type="button" selector="//li[{{var}}]//a[@class='label'][text() = '...']" parameterized="true"/>
+        <element name="targetInput" type="input" selector="input#conditions__{{var1}}--{{var2}}__value" parameterized="true"/>
+        <element name="applyButton" type="button" selector="#conditions__{{var1}}__children li:nth-of-type({{var2}}) a.rule-param-apply" parameterized="true"/>
+    </section>
+
+    <section name="AdminCatalogPriceRuleGrid">
+        <element name="applyRules" type="button" selector="#apply_rules" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
new file mode 100644
index 0000000000000..875a7842f21ff
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminApplyCatalogRuleByCategoryTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Apply catalog price rule"/>
+            <title value="Admin should be able to apply the catalog rule by category"/>
+            <description value="Admin should be able to apply the catalog rule by category"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-74"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategoryOne"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProductOne">
+                <requiredEntity createDataKey="createCategoryOne"/>
+            </createData>
+            <createData entity="ApiCategory" stepKey="createCategoryTwo"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProductTwo">
+                <requiredEntity createDataKey="createCategoryTwo"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategoryOne" stepKey="deleteCategoryOne"/>
+            <deleteData createDataKey="createSimpleProductOne" stepKey="deleteSimpleProductOne"/>
+            <deleteData createDataKey="createCategoryTwo" stepKey="deleteCategoryTwo"/>
+            <deleteData createDataKey="createSimpleProductTwo" stepKey="deleteSimpleProductTwo"/>
+
+            <!-- Delete the catalog price rule -->
+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- 1. Begin creating a new catalog price rule -->
+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <click selector="{{AdminGridMainControls.add}}" stepKey="addNewRule"/>
+        <waitForPageLoad stepKey="waitForIndividualRulePage"/>
+        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{_defaultCatalogRule.name}}" stepKey="fillName"/>
+        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{_defaultCatalogRule.description}}" stepKey="fillDescription"/>
+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{_defaultCatalogRule.website_ids[0]}}" stepKey="selectSite"/>
+        <click selector="{{AdminNewCatalogPriceRule.fromDateButton}}" stepKey="clickFromCalender"/>
+        <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickFromToday"/>
+        <click selector="{{AdminNewCatalogPriceRule.toDateButton}}" stepKey="clickToCalender"/>
+        <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickToToday"/>
+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="openConditions"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="clickNewRule"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="Category" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForEllipsis"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsis('1')}}" stepKey="clickEllipsis"/>
+        <waitForPageLoad stepKey="waitForInput"/>
+
+        <!-- 2. Fill condition of category = createCategoryOne -->
+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.targetInput('1', '1')}}" userInput="$$createCategoryOne.id$$" stepKey="fillCategory"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.applyButton('1', '1')}}" stepKey="clickApply"/>
+        <click selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="openActionDropdown"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleActions.apply}}" userInput="{{_defaultCatalogRule.simple_action}}" stepKey="discountType"/>
+        <fillField selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="50" stepKey="fillDiscountValue"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleActions.disregardRules}}" userInput="Yes" stepKey="discardSubsequentRules"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForPageLoad stepKey="waitForApplied"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+
+        <!-- 3. Save and apply the new catalog price rule -->
+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!-- 4. Verify the storefront -->
+        <amOnPage url="$$createCategoryOne.name$$.html" stepKey="goToCategoryOne"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createSimpleProductOne.name$$" stepKey="seeProductOne"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$61.50" stepKey="seeProductOnePrice"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="Regular Price $123.00" stepKey="seeProductOneRegularPrice"/>
+        <amOnPage url="$$createCategoryTwo.name$$.html" stepKey="goToCategoryTwo"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createSimpleProductTwo.name$$" stepKey="seeProductTwo"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$123.00" stepKey="seeProductTwoPrice"/>
+        <dontSee selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$61.50" stepKey="dontSeeDiscount"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
new file mode 100644
index 0000000000000..10db68e9053d7
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCatalogPriceRuleByPercentTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Create catalog price rule"/>
+            <title value="Admin should be able to create a catalog price rule applied as a percentage of original (for simple product)"/>
+            <description value="Admin should be able to create a catalog price rule applied as a percentage of original (for simple product)"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-65"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <!-- Create the simple product and category that it will be in -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- log in and create the price rule -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI"/>
+            <actionGroup stepKey="selectNotLoggedInCustomerGroup" ref="selectNotLoggedInCustomerGroup"/>
+            <click stepKey="saveAndApply" selector="{{AdminNewCatalogPriceRule.saveAndApply}}"/>
+            <see stepKey="assertSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule."/>
+        </before>
+        <after>
+            <!-- delete the simple product and catalog price rule and logout -->
+            <amOnPage stepKey="goToPriceRulePage" url="admin/catalog_rule/promo_catalog/"/>
+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Go to category page and make sure that all of the prices are correct -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategory"/>
+        <see stepKey="seeOldPrice" selector="{{StorefrontCategoryProductSection.ProductOldPriceByNumber('1')}}" userInput="$$createProduct.price$$"/>
+        <see stepKey="seeNewPrice" selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="$110.70"/>
+
+        <!-- Go to the simple product page and check that the prices are correct -->
+        <amOnPage stepKey="goToProductPage" url="$$createProduct.sku$$.html"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <see stepKey="seeOldPriceTag" selector="{{StorefrontProductInfoMainSection.oldPriceTag}}" userInput="Regular Price"/>
+        <see stepKey="seeOldPrice2" selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" userInput="$$createProduct.price$$"/>
+        <see stepKey="seeNewPrice2" selector="{{StorefrontProductInfoMainSection.updatedPrice}}" userInput="$110.70"/>
+
+        <!-- Add the product to cart and check that the price is correct there -->
+        <click stepKey="addToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForAddedToCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <see stepKey="seeNewPriceInCart" selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$110.70"/>
+    </test>
+
+    <test name="AdminCreateCatalogPriceRuleByFixedTest" extends="AdminCreateCatalogPriceRuleByPercentTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Create catalog price rule"/>
+            <title value="Admin should be able to create a catalog price rule applied as a fixed amount (for simple product)"/>
+            <description value="Admin should be able to create a catalog price rule applied as a fixed amount (for simple product)"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-93"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
+                <argument name="catalogRule" value="CatalogRuleByFixed"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+                <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+        </after>
+    </test>
+
+    <test name="AdminCreateCatalogPriceRuleToPercentTest" extends="AdminCreateCatalogPriceRuleByPercentTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Create catalog price rule"/>
+            <title value="Admin should be able to create a catalog price rule adjust final price to this percentage (for simple product)"/>
+            <description value="Admin should be able to create a catalog price rule adjust final price to this percentage (for simple product)"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-69"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
+                <argument name="catalogRule" value="CatalogRuleToPercent"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+                <argument name="name" value="{{CatalogRuleToPercent.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+        </after>
+    </test>
+
+    <test name="AdminCreateCatalogPriceRuleToFixedTest" extends="AdminCreateCatalogPriceRuleByPercentTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Create catalog price rule"/>
+            <title value="Admin should be able to create a catalog price rule adjust final price to discount value (for simple product)"/>
+            <description value="Admin should be able to create a catalog price rule adjust final price to discount value (for simple product)"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-60"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
+                <argument name="catalogRule" value="CatalogRuleToFixed"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+                <argument name="name" value="{{CatalogRuleToFixed.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+        </after>
+    </test>
+
+    <test name="AdminCreateCatalogPriceRuleForCustomerGroupTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Apply catalog price rule"/>
+            <title value="Admin should be able to apply the catalog rule by customer group"/>
+            <description value="Admin should be able to apply the catalog rule by customer group"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-71"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <!-- Create a simple product and a category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete the simple product and category -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete the catalog rule -->
+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToRulePage"/>
+            <waitForPageLoad stepKey="waitForRulePage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a catalog rule for the NOT LOGGED IN customer group -->
+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createNewPriceRule"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
+
+        <!-- As a NOT LOGGED IN user, go to the storefront category page and should see the discount -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory1"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createProduct.name$$" stepKey="seeProduct1"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$110.70" stepKey="seeDiscountedPrice1"/>
+
+        <!-- Create a user account -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+
+        <!-- As a logged in user, go to the storefront category page and should NOT see discount -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory2"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createProduct.name$$" stepKey="seeProduct2"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$123.00" stepKey="seeDiscountedPrice2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
new file mode 100644
index 0000000000000..06f3682aedd85
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteCatalogPriceRuleTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Delete Catalog Price Rule"/>
+            <title value="Admin should be able to delete catalog price rule"/>
+            <description value="Admin should be able to delete catalog price rule"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-160"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create a simple product -->
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create a configurable product -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createConfigurableProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+
+        <!-- Create a catalog price rule -->
+        <actionGroup ref="newCatalogPriceRuleByUI" stepKey="createNewPriceRule"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
+
+        <!-- Verify that category page shows the discount -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage1"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(ApiSimpleProduct.name)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct1"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(ApiSimpleProduct.name)}}" userInput="$110.70" stepKey="seeSimpleProductDiscount1"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(_defaultProduct.name)}}" userInput="{{_defaultProduct.name}}" stepKey="seeConfigurableProduct1"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(_defaultProduct.name)}}" userInput="$0.90" stepKey="seeConfigurableProductDiscount1"/>
+
+        <!-- Verify that the simple product page shows the discount -->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeCorrectName1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createSimpleProduct.sku$$" stepKey="seeCorrectSku1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$110.70" stepKey="seeCorrectPrice1"/>
+
+        <!-- Verify that the configurable product page the catalog price rule discount -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToConfigurableProductPage1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="seeCorrectName2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="seeCorrectSku2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.90" stepKey="seeCorrectPrice2"/>
+
+        <!-- Delete the rule -->
+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+            <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+        </actionGroup>
+
+        <!-- Apply and flush the cache -->
+        <click selector="{{AdminCatalogPriceRuleGrid.applyRules}}" stepKey="clickApplyRules"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!-- Verify that category page shows the original prices -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage2"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(ApiSimpleProduct.name)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(ApiSimpleProduct.name)}}" userInput="$123.00" stepKey="seeSimpleProductDiscount2"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName(_defaultProduct.name)}}" userInput="{{_defaultProduct.name}}" stepKey="seeConfigurableProduct2"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName(_defaultProduct.name)}}" userInput="$1.00" stepKey="seeConfigurableProductDiscount2"/>
+
+        <!-- Verify that the simple product page shows the original price -->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeCorrectName3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createSimpleProduct.sku$$" stepKey="seeCorrectSku3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$123.00" stepKey="seeCorrectPrice3"/>
+
+        <!-- Verify that the configurable product page shows the original price -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToConfigurableProductPage2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="seeCorrectName4"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="seeCorrectSku4"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$1.00" stepKey="seeCorrectPrice4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
new file mode 100644
index 0000000000000..cac7c94de446f
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Check the price"/>
+            <title value="Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"/>
+            <description value="Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-69455"/>
+            <group value="persistent"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">50</field>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
+                <field key="group_id">1</field>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!--Create Catalog Rule-->
+            <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="createCatalogPriceRule">
+                <argument name="catalogRule" value="_defaultCatalogRule"/>
+                <argument name="categoryId" value="$$createCategory.id$$"/>
+            </actionGroup>
+            <actionGroup ref="selectGeneralCustomerGroupActionGroup" stepKey="selectCustomerGroup"/>
+            <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
+            <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!-- Delete the rule -->
+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!--Go to category and check price-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct"/>
+
+        <!--Login to storfront from customer and check price-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage2"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="45.00" stepKey="checkPriceSimpleProduct2"/>
+
+        <!--Click *Sign Out* and check the price of the Simple Product-->
+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="storefrontSignOut"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage3"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome2"/>
+        <seeElement selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="checkLinkNotYoy"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductSpecialPriceByNumber('1')}}" userInput="45.00" stepKey="checkPriceSimpleProduct3"/>
+
+        <!--Click the *Not you?* link and check the price for Simple Product-->
+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickNext"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage4"/>
+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome3"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
new file mode 100644
index 0000000000000..c6ecc1c6d9658
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontInactiveCatalogRuleTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Customer view catalog price rule"/>
+            <title value="Customer should not see the catalog price rule promotion if status is inactive"/>
+            <description value="Customer should not see the catalog price rule promotion if status is inactive"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-79"/>
+            <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI"/>
+            <actionGroup stepKey="selectLoggedInCustomers" ref="selectNotLoggedInCustomerGroup"/>
+            <selectOption selector="{{AdminNewCatalogPriceRule.status}}" userInput="Inactive" stepKey="setInactive"/>
+            <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
+            <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="seeSuccess"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/catalog_rule/promo_catalog/" stepKey="goToPriceRulePage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+        </after>
+
+        <!-- Verify price is not discounted on category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory"/>
+        <waitForPageLoad stepKey="waitForCategory"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="seePrice1"/>
+
+        <!-- Verify price is not discounted on the product page -->
+        <amOnPage url="$$createProduct.sku$$.html" stepKey="goToProduct"/>
+        <waitForPageLoad stepKey="waitForProduct"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seePrice2"/>
+
+        <!-- Verify price is not discounted in the cart -->
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCheckout"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$$createProduct.price$$" stepKey="seePrice3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
index 6178d51644fde..f969b342f826d 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
@@ -24,13 +24,16 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase
      */
     protected $registryMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
         $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
         $contextMock = $this->createMock(\Magento\Backend\Block\Widget\Context::class);
 
-        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
+        $contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
 
         $this->model = new \Magento\CatalogRule\Block\Adminhtml\Edit\DeleteButton(
             $contextMock,
@@ -38,33 +41,9 @@ protected function setUp()
         );
     }
 
-    public function testGetButtonData()
-    {
-        $ruleId = 42;
-        $deleteUrl = 'http://magento.com/rule/delete/' . $ruleId;
-        $ruleMock = new \Magento\Framework\DataObject(['id' => $ruleId]);
-
-        $this->registryMock->expects($this->once())
-            ->method('registry')
-            ->with(RegistryConstants::CURRENT_CATALOG_RULE_ID)
-            ->willReturn($ruleMock);
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('*/*/delete', ['id' => $ruleId])
-            ->willReturn($deleteUrl);
-
-        $data = [
-            'label' => __('Delete Rule'),
-            'class' => 'delete',
-            'on_click' => 'deleteConfirm(\'' . __(
-                'Are you sure you want to do this?'
-            ) . '\', \'' . $deleteUrl . '\')',
-            'sort_order' => 20,
-        ];
-
-        $this->assertEquals($data, $this->model->getButtonData());
-    }
-
+    /**
+     * Test empty response without a present rule.
+     */
     public function testGetButtonDataWithoutRule()
     {
         $this->assertEquals([], $this->model->getButtonData());
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/CatalogRuleRepositoryTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/CatalogRuleRepositoryTest.php
index 32c6896625a1f..7db805908ae72 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/CatalogRuleRepositoryTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/CatalogRuleRepositoryTest.php
@@ -65,7 +65,7 @@ public function testEditRule()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Unable to save rule 1
+     * @expectedExceptionMessage The "1" rule was unable to be saved. Please try again.
      */
     public function testEnableSaveRule()
     {
@@ -106,7 +106,7 @@ public function testDeleteRuleById()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Unable to remove rule 1
+     * @expectedExceptionMessage The "1" rule couldn't be removed.
      */
     public function testUnableDeleteRule()
     {
@@ -132,7 +132,7 @@ public function testGetRule()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Rule with specified ID "1" not found.
+     * @expectedExceptionMessage The rule with the "1" ID wasn't found. Verify the ID and try again.
      */
     public function testGetNonExistentRule()
     {
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php
new file mode 100644
index 0000000000000..0560bc616f9ca
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Test\Unit\Model\Indexer\IndexBuilder;
+
+use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Api\SearchCriteria;
+
+class ProductLoaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductLoader
+     */
+    protected $productLoader;
+
+    /**
+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRepository;
+
+    /**
+     * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var ProductSearchResultsInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productSearchResultsInterface;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteria|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $searchCriteria;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $product;
+
+    /**
+     * Set up test
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productSearchResultsInterface = $this->getMockBuilder(ProductSearchResultsInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->searchCriteria = $this->getMockBuilder(SearchCriteria::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->productLoader = new ProductLoader(
+            $this->productRepository,
+            $this->searchCriteriaBuilder
+        );
+    }
+
+    public function testGetProducts()
+    {
+        $this->searchCriteriaBuilder->expects($this->once())
+            ->method('addFilter')
+            ->willReturnSelf();
+        $this->searchCriteriaBuilder->expects($this->once())
+            ->method('create')
+            ->willReturn($this->searchCriteria);
+        $this->productRepository->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteria)
+            ->willReturn($this->productSearchResultsInterface);
+        $iterator = [$this->product];
+        $this->productSearchResultsInterface->expects($this->once())
+            ->method('getItems')
+            ->willReturn($iterator);
+
+        $this->assertSame($iterator, $this->productLoader->getProducts([1]));
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
index 997cf704a8657..521e4e1d59897 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -122,10 +125,16 @@ class IndexBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $reindexRuleGroupWebsite;
 
+    /**
+     * @var ProductLoader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productLoader;
+
     /**
      * Set up test
      *
      * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp()
     {
@@ -171,36 +180,47 @@ protected function setUp()
         $this->rules->expects($this->any())->method('getId')->will($this->returnValue(1));
         $this->rules->expects($this->any())->method('getWebsiteIds')->will($this->returnValue([1]));
         $this->rules->expects($this->any())->method('getCustomerGroupIds')->will($this->returnValue([1]));
+
         $this->ruleCollectionFactory->expects($this->any())->method('create')->will($this->returnSelf());
         $this->ruleCollectionFactory->expects($this->any())->method('addFieldToFilter')->will(
             $this->returnValue([$this->rules])
         );
+
         $this->product->expects($this->any())->method('load')->will($this->returnSelf());
         $this->product->expects($this->any())->method('getId')->will($this->returnValue(1));
         $this->product->expects($this->any())->method('getWebsiteIds')->will($this->returnValue([1]));
+
         $this->rules->expects($this->any())->method('validate')->with($this->product)->willReturn(true);
         $this->attribute->expects($this->any())->method('getBackend')->will($this->returnValue($this->backend));
         $this->productFactory->expects($this->any())->method('create')->will($this->returnValue($this->product));
+        $this->productLoader = $this->getMockBuilder(ProductLoader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->indexBuilder = new \Magento\CatalogRule\Model\Indexer\IndexBuilder(
-            $this->ruleCollectionFactory,
-            $this->priceCurrency,
-            $this->resource,
-            $this->storeManager,
-            $this->logger,
-            $this->eavConfig,
-            $this->dateFormat,
-            $this->dateTime,
-            $this->productFactory
+        $this->indexBuilder = (new ObjectManager($this))->getObject(
+            \Magento\CatalogRule\Model\Indexer\IndexBuilder::class,
+            [
+                'ruleCollectionFactory' => $this->ruleCollectionFactory,
+                'priceCurrency' => $this->priceCurrency,
+                'resource' => $this->resource,
+                'storeManager' => $this->storeManager,
+                'logger' => $this->logger,
+                'eavConfig' => $this->eavConfig,
+                'dateFormat' => $this->dateFormat,
+                'dateTime' => $this->dateTime,
+                'productFactory' => $this->productFactory,
+                'productLoader' => $this->productLoader,
+            ]
         );
+
         $this->reindexRuleProductPrice =
             $this->getMockBuilder(\Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
         $this->reindexRuleGroupWebsite =
             $this->getMockBuilder(\Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
         $this->setProperties($this->indexBuilder, [
             'metadataPool' => $this->metadataPool,
             'reindexRuleProductPrice' => $this->reindexRuleProductPrice,
@@ -235,6 +255,11 @@ public function testUpdateCatalogRuleGroupWebsiteData()
             ->method('getBackend')
             ->will($this->returnValue($backendModelMock));
 
+        $iterator = [$this->product];
+        $this->productLoader->expects($this->once())
+            ->method('getProducts')
+            ->willReturn($iterator);
+
         $this->reindexRuleProductPrice->expects($this->once())->method('execute')->willReturn(true);
         $this->reindexRuleGroupWebsite->expects($this->once())->method('execute')->willReturn(true);
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php
new file mode 100644
index 0000000000000..654a1180d8717
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
+
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapper;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * Test for Magento\CatalogRule\Model\Indexer\IndexerTableSwapper class.
+ */
+class IndexerTableSwapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResourceConnection|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterInterfaceMock;
+
+    /**
+     * @var \Zend_Db_Statement_Interface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementInterfaceMock;
+
+    /**
+     * @var Table|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+
+        $this->adapterInterfaceMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        /** @var \Zend_Db_Statement_Interface $statementInterfaceMock */
+        $this->statementInterfaceMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
+            ->getMockForAbstractClass();
+        /** @var Table $tableMock */
+        $this->tableMock = $this->createMock(Table::class);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->adapterInterfaceMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetWorkingTableNameWithExistingTemporaryTable(): void
+    {
+        $model = new IndexerTableSwapper($this->resourceConnectionMock);
+        $originalTableName = 'catalogrule_product';
+        $temporaryTableNames = ['catalogrule_product' => 'catalogrule_product__temp9604'];
+        $this->setObjectProperty($model, 'temporaryTables', $temporaryTableNames);
+
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getTableName')
+            ->with($originalTableName)
+            ->willReturn($originalTableName);
+
+        $this->assertEquals(
+            $temporaryTableNames[$originalTableName],
+            $model->getWorkingTableName($originalTableName)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetWorkingTableNameWithoutExistingTemporaryTable(): void
+    {
+        $model = new IndexerTableSwapper($this->resourceConnectionMock);
+        $originalTableName = 'catalogrule_product';
+        $temporaryTableName = 'catalogrule_product__temp9604';
+        $this->setObjectProperty($model, 'temporaryTables', []);
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getTableName')
+            ->with($originalTableName)
+            ->willReturn($originalTableName);
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getTableName')
+            ->with($this->stringStartsWith($originalTableName . '__temp'))
+            ->willReturn($temporaryTableName);
+
+        $this->assertEquals(
+            $temporaryTableName,
+            $model->getWorkingTableName($originalTableName)
+        );
+    }
+
+    /**
+     * Sets object non-public property.
+     *
+     * @param mixed $object
+     * @param string $propertyName
+     * @param mixed $value
+     *
+     * @return void
+     */
+    private function setObjectProperty($object, string $propertyName, $value): void
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        $reflectionProperty = $reflectionClass->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $value);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSwapIndexTables(): void
+    {
+        $model = $this->getMockBuilder(IndexerTableSwapper::class)
+            ->setMethods(['getWorkingTableName'])
+            ->setConstructorArgs([$this->resourceConnectionMock])
+            ->getMock();
+        $originalTableName = 'catalogrule_product';
+        $temporaryOriginalTableName = 'catalogrule_product9604';
+        $temporaryTableName = 'catalogrule_product__temp9604';
+        $toRename = [
+            [
+                'oldName' => $originalTableName,
+                'newName' => $temporaryOriginalTableName,
+            ],
+            [
+                'oldName' => $temporaryTableName,
+                'newName' => $originalTableName,
+            ],
+        ];
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getTableName')
+            ->with($originalTableName)
+            ->willReturn($originalTableName);
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getTableName')
+            ->with($this->stringStartsWith($originalTableName))
+            ->willReturn($temporaryOriginalTableName);
+        $model->expects($this->once())
+            ->method('getWorkingTableName')
+            ->with($originalTableName)
+            ->willReturn($temporaryTableName);
+        $this->adapterInterfaceMock->expects($this->once())
+            ->method('renameTablesBatch')
+            ->with($toRename)
+            ->willReturn(true);
+        $this->adapterInterfaceMock->expects($this->once())
+            ->method('dropTable')
+            ->with($temporaryOriginalTableName)
+            ->willReturn(true);
+
+        $model->swapIndexTables([$originalTableName]);
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
index d60a662193e54..f02c2c643f809 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
+
 class ReindexRuleGroupWebsiteTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,10 +27,15 @@ class ReindexRuleGroupWebsiteTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
@@ -37,13 +45,17 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
+            $this->getMockBuilder(ActiveTableSwitcher::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
         $this->model = new \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite(
             $this->dateTimeMock,
             $this->resourceMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -55,31 +67,25 @@ public function testExecute()
         $this->resourceMock->expects($this->at(0))->method('getConnection')->willReturn($connectionMock);
         $this->dateTimeMock->expects($this->once())->method('gmtTimestamp')->willReturn($timeStamp);
 
-        $this->activeTableSwitcherMock->expects($this->at(0))
-            ->method('getAdditionalTableName')
-            ->with('catalogrule_group_website')
-            ->willReturn('catalogrule_group_website_replica');
-        $this->activeTableSwitcherMock->expects($this->at(1))
-            ->method('getAdditionalTableName')
-            ->with('catalogrule_product')
-            ->willReturn('catalogrule_product_replica');
+        $this->tableSwapperMock->expects($this->any())
+            ->method('getWorkingTableName')
+            ->willReturnMap(
+                [
+                    ['catalogrule_group_website', 'catalogrule_group_website_replica'],
+                    ['catalogrule_product', 'catalogrule_product_replica'],
+                ]
+            );
 
-        $this->resourceMock->expects($this->at(1))
-            ->method('getTableName')
-            ->with('catalogrule_group_website')
-            ->willReturn('catalogrule_group_website');
-        $this->resourceMock->expects($this->at(2))
-            ->method('getTableName')
-            ->with('catalogrule_product')
-            ->willReturn('catalogrule_product');
-        $this->resourceMock->expects($this->at(3))
-            ->method('getTableName')
-            ->with('catalogrule_group_website_replica')
-            ->willReturn('catalogrule_group_website_replica');
-        $this->resourceMock->expects($this->at(4))
+        $this->resourceMock->expects($this->any())
             ->method('getTableName')
-            ->with('catalogrule_product_replica')
-            ->willReturn('catalogrule_product_replica');
+            ->willReturnMap(
+                [
+                    ['catalogrule_group_website', 'default', 'catalogrule_group_website'],
+                    ['catalogrule_product', 'default', 'catalogrule_product'],
+                    ['catalogrule_group_website_replica', 'default', 'catalogrule_group_website_replica'],
+                    ['catalogrule_product_replica', 'default', 'catalogrule_product_replica'],
+                ]
+            );
 
         $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
index b829468396bf0..0dbbaee8d2871 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
+
 class ReindexRuleProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -19,22 +22,30 @@ class ReindexRuleProductTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
         $this->model = new \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct(
             $this->resourceMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -71,8 +82,8 @@ public function testExecute()
         $ruleMock->expects($this->exactly(2))->method('getWebsiteIds')->willReturn(1);
         $ruleMock->expects($this->once())->method('getMatchingProductIds')->willReturn($productIds);
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with('catalogrule_product')
             ->willReturn('catalogrule_product_replica');
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
index 3efe26971627e..03163aa2d7c45 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
+
 class RuleProductPricesPersistorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,10 +27,15 @@ class RuleProductPricesPersistorTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class)
@@ -36,14 +44,17 @@ protected function setUp()
         $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
         $this->model = new \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor(
             $this->dateTimeMock,
             $this->resourceMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -64,8 +75,8 @@ public function testExecute()
         ];
         $tableName = 'catalogrule_product_price_replica';
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with('catalogrule_product_price')
             ->willReturn($tableName);
 
@@ -120,8 +131,8 @@ public function testExecuteWithException()
         ];
         $tableName = 'catalogrule_product_price_replica';
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with('catalogrule_product_price')
             ->willReturn($tableName);
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
index 92b4bb353f046..e43fe41dc2127 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
@@ -7,6 +7,8 @@
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -35,7 +37,7 @@ class RuleProductsSelectBuilderTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
@@ -49,6 +51,11 @@ class RuleProductsSelectBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $metadataPoolMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
@@ -56,8 +63,7 @@ protected function setUp()
         $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
+        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
@@ -66,13 +72,17 @@ protected function setUp()
         $this->metadataPoolMock = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
 
         $this->model = new \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder(
             $this->resourceMock,
             $this->eavConfigMock,
             $this->storeManagerMock,
             $this->metadataPoolMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -92,8 +102,8 @@ public function testBuild()
         $connectionMock = $this->getMockBuilder(AdapterInterface::class)->disableOriginalConstructor()->getMock();
         $this->resourceMock->expects($this->at(0))->method('getConnection')->willReturn($connectionMock);
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with($ruleTable)
             ->willReturn($rplTable);
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Product/PriceModifierTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Product/PriceModifierTest.php
index b1e27bf973404..ccc86920a7e74 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Product/PriceModifierTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Product/PriceModifierTest.php
@@ -56,6 +56,9 @@ public function testModifyPriceIfPriceExists($resultPrice, $expectedPrice)
         $this->assertEquals($expectedPrice, $this->priceModifier->modifyPrice(100, $this->productMock));
     }
 
+    /**
+     * @return array
+     */
     public function modifyPriceDataProvider()
     {
         return ['resulted_price_exists' => [150, 150], 'resulted_price_not_exists' => [null, 100]];
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Rule/Condition/MappableConditionProcessorTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Rule/Condition/MappableConditionProcessorTest.php
new file mode 100644
index 0000000000000..87f959214a8fb
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Rule/Condition/MappableConditionProcessorTest.php
@@ -0,0 +1,1046 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Test\Unit\Model\Rule\Condition;
+
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\CatalogRule\Model\Rule\Condition\MappableConditionsProcessor;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionProviderInterface;
+use Magento\CatalogRule\Model\Rule\Condition\Combine as CombinedCondition;
+use Magento\CatalogRule\Model\Rule\Condition\Product as SimpleCondition;
+
+class MappableConditionProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var MappableConditionsProcessor
+     */
+    private $mappableConditionProcessor;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfigMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customConditionProcessorBuilderMock;
+
+    protected function setUp()
+    {
+        $this->eavConfigMock = $this->getMockBuilder(EavConfig::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttribute'])
+            ->getMock();
+
+        $this->customConditionProcessorBuilderMock = $this->getMockBuilder(
+            CustomConditionProviderInterface::class
+        )->disableOriginalConstructor()
+        ->setMethods(['hasProcessorForField'])
+        ->getMockForAbstractClass();
+
+        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->mappableConditionProcessor = $this->objectManagerHelper->getObject(
+            MappableConditionsProcessor::class,
+            [
+                'customConditionProvider' => $this->customConditionProcessorBuilderMock,
+                'eavConfig' => $this->eavConfigMock,
+            ]
+        );
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  condition-1 => [ attribute => field-1 ]
+     *                  condition-2 => [ attribute => field-2 ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-2 is not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions => []
+     *      ]
+     * ]
+     */
+    public function testConditionV1()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'any'
+        );
+
+        $validResult = $this->getMockForCombinedCondition([], 'any');
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, true],
+                        [$field2, false],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions =>
+     *              [
+     *                  condition-1 => [ attribute => field-1 ]
+     *                  condition-2 => [ attribute => field-2 ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-2 is not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions =>
+     *              [
+     *                  condition-1 => [ attribute => field-1 ]
+     *              ]
+     *      ]
+     * ]
+     */
+    public function testConditionV2()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'all'
+        );
+
+        $validResult = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1
+            ],
+            'all'
+        );
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, true],
+                        [$field2, false],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions =>
+     *              [
+     *                  condition-1 => [ attribute => field-1 ]
+     *                  condition-2 => [ attribute => field-2 ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-1 and condition-2 are not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions => []
+     *      ]
+     * ]
+     */
+    public function testConditionV3()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'all'
+        );
+
+        $validResult = $this->getMockForCombinedCondition([], 'all');
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, false],
+                        [$field2, false],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => all
+     *                          conditions =>
+     *                              [
+     *                                  condition-1 => [ attribute => field-1 ]
+     *                                  condition-2 => [ attribute => field-2 ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-1 is not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => all
+     *                          conditions =>
+     *                              [
+     *                                  condition-2 => [ attribute => field-2 ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     */
+    public function testConditionV4()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $subCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'all'
+        );
+
+        $field3 = 'field-3';
+        $field4 = 'field-4';
+
+        $simpleCondition3 = $this->getMockForSimpleCondition($field3);
+        $simpleCondition4 = $this->getMockForSimpleCondition($field4);
+        $subCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $subCondition1,
+                $subCondition2
+            ],
+            'any'
+        );
+
+        $validSubCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition2
+            ],
+            'all'
+        );
+        $validSubCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+        $validResult = $this->getMockForCombinedCondition(
+            [
+                $validSubCondition1,
+                $validSubCondition2
+            ],
+            'any'
+        );
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, false],
+                        [$field2, true],
+                        [$field3, true],
+                        [$field4, true],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-1 => [ attribute => field-1 ]
+     *                                  condition-2 => [ attribute => field-2 ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-1 is not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     */
+    public function testConditionV5()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $subCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'any'
+        );
+
+        $field3 = 'field-3';
+        $field4 = 'field-4';
+
+        $simpleCondition3 = $this->getMockForSimpleCondition($field3);
+        $simpleCondition4 = $this->getMockForSimpleCondition($field4);
+        $subCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $subCondition1,
+                $subCondition2
+            ],
+            'all'
+        );
+
+        $validSubCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+        $validResult = $this->getMockForCombinedCondition(
+            [
+                $validSubCondition2
+            ],
+            'all'
+        );
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, false],
+                        [$field2, true],
+                        [$field3, true],
+                        [$field4, true],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => all
+     *          conditions =>
+     *              [
+     *                  condition-1 => [ attribute => field-1 ]
+     *                  condition-2 => [ attribute => field-2 ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when all condition are mappable there must not be any changes to input
+     */
+    public function testConditionV6()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+
+        $field3 = 'field-3';
+        $field4 = 'field-4';
+
+        $simpleCondition3 = $this->getMockForSimpleCondition($field3);
+        $simpleCondition4 = $this->getMockForSimpleCondition($field4);
+        $subCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2,
+                $subCondition1
+            ],
+            'all'
+        );
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, true],
+                        [$field2, true],
+                        [$field3, true],
+                        [$field4, true],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($inputCondition, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => all
+     *                          conditions =>
+     *                              [
+     *                                  condition-1 => [ attribute => field-1 ]
+     *                                  combined-condition =>
+     *                                      [
+     *                                          aggregation => any
+     *                                          conditions =>
+     *                                              [
+     *                                                  condition-2 => [ attribute => field-2 ]
+     *                                                  condition-3 => [ attribute => field-3 ]
+     *                                              ]
+     *                                      ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => all
+     *                          conditions =>
+     *                              [
+     *                                  combined-condition =>
+     *                                      [
+     *                                          aggregation => any
+     *                                          conditions =>
+     *                                              [
+     *                                                  condition-4 => [ attribute => field-4 ]
+     *                                                  condition-5 => [ attribute => field-5 ]
+     *                                              ]
+     *                                      ]
+     *                                  combined-condition =>
+     *                                      [
+     *                                          aggregation => any
+     *                                          conditions =>
+     *                                              [
+     *                                                  condition-6 => [ attribute => field-6 ]
+     *                                                  condition-7 => [ attribute => field-7 ]
+     *                                              ]
+     *                                      ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-3 and condition-5 are not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => all
+     *                          conditions =>
+     *                              [
+     *                                  condition-1 => [ attribute => field-1 ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => all
+     *                          conditions =>
+     *                              [
+     *                                  combined-condition =>
+     *                                      [
+     *                                          aggregation => any
+     *                                          conditions =>
+     *                                              [
+     *                                                  condition-6 => [ attribute => field-6 ]
+     *                                                  condition-7 => [ attribute => field-7 ]
+     *                                              ]
+     *                                      ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testConditionV7()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+        $field3 = 'field-3';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $simpleCondition3 = $this->getMockForSimpleCondition($field3);
+
+        $subCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition2,
+                $simpleCondition3
+            ],
+            'any'
+        );
+        $subCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $subCondition1
+            ],
+            'all'
+        );
+
+        $field4 = 'field-4';
+        $field5 = 'field-5';
+        $field6 = 'field-6';
+        $field7 = 'field-7';
+
+        $simpleCondition4 = $this->getMockForSimpleCondition($field4);
+        $simpleCondition5 = $this->getMockForSimpleCondition($field5);
+        $simpleCondition6 = $this->getMockForSimpleCondition($field6);
+        $simpleCondition7 = $this->getMockForSimpleCondition($field7);
+
+        $subCondition3 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition4,
+                $simpleCondition5
+            ],
+            'any'
+        );
+        $subCondition4 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition6,
+                $simpleCondition7
+            ],
+            'any'
+        );
+        $subCondition5 = $this->getMockForCombinedCondition(
+            [
+                $subCondition3,
+                $subCondition4
+            ],
+            'all'
+        );
+
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $subCondition2,
+                $subCondition5
+            ],
+            'any'
+        );
+
+        $validSubCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1
+            ],
+            'all'
+        );
+        $validSubCondition4 = $this->getMockForCombinedCondition(
+            [
+                $subCondition4
+            ],
+            'all'
+        );
+
+        $validResult = $this->getMockForCombinedCondition(
+            [
+                $validSubCondition2,
+                $validSubCondition4
+            ],
+            'any'
+        );
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, true],
+                        [$field2, true],
+                        [$field3, false],
+                        [$field4, true],
+                        [$field5, false],
+                        [$field6, true],
+                        [$field7, true],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-1 => [ attribute => field-1 ]
+     *                                  condition-2 => [ attribute => field-2 ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-1 and condition-4 are not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions => []
+     * ]
+     */
+    public function testConditionV8()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $subCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'any'
+        );
+
+        $field3 = 'field-3';
+        $field4 = 'field-4';
+
+        $simpleCondition3 = $this->getMockForSimpleCondition($field3);
+        $simpleCondition4 = $this->getMockForSimpleCondition($field4);
+        $subCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $subCondition1,
+                $subCondition2
+            ],
+            'any'
+        );
+
+        $validResult = $this->getMockForCombinedCondition([], 'any');
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, false],
+                        [$field2, true],
+                        [$field3, true],
+                        [$field4, false],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * input condition tree:
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions =>
+     *              [
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-1 => [ attribute => field-1 ]
+     *                                  condition-2 => [ attribute => field-2 ]
+     *                              ]
+     *                      ]
+     *                  combined-condition =>
+     *                      [
+     *                          aggregation => any
+     *                          conditions =>
+     *                              [
+     *                                  condition-3 => [ attribute => field-3 ]
+     *                                  condition-4 => [ attribute => field-4 ]
+     *                              ]
+     *                      ]
+     *                  condition-5 => [ attribute => field-5 ]
+     *              ]
+     *      ]
+     * ]
+     *
+     * in case when condition-1 and condition-4 are not mappable the result must be next:
+     *
+     * [
+     *  combined-condition =>
+     *      [
+     *          aggregation => any
+     *          conditions => []
+     * ]
+     */
+    public function testConditionV9()
+    {
+        $field1 = 'field-1';
+        $field2 = 'field-2';
+
+        $simpleCondition1 = $this->getMockForSimpleCondition($field1);
+        $simpleCondition2 = $this->getMockForSimpleCondition($field2);
+        $subCondition1 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition1,
+                $simpleCondition2
+            ],
+            'any'
+        );
+
+        $field3 = 'field-3';
+        $field4 = 'field-4';
+
+        $simpleCondition3 = $this->getMockForSimpleCondition($field3);
+        $simpleCondition4 = $this->getMockForSimpleCondition($field4);
+        $subCondition2 = $this->getMockForCombinedCondition(
+            [
+                $simpleCondition3,
+                $simpleCondition4
+            ],
+            'any'
+        );
+
+        $field5 = 'field-5';
+        $simpleCondition5 = $this->getMockForSimpleCondition($field5);
+
+        $inputCondition = $this->getMockForCombinedCondition(
+            [
+                $subCondition1,
+                $subCondition2,
+                $simpleCondition5
+            ],
+            'any'
+        );
+
+        $validResult = $this->getMockForCombinedCondition([], 'any');
+
+        $this->customConditionProcessorBuilderMock
+            ->method('hasProcessorForField')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [$field1, false],
+                        [$field2, true],
+                        [$field3, true],
+                        [$field4, false],
+                        [$field5, true],
+                    ]
+                )
+            );
+
+        $this->eavConfigMock
+            ->method('getAttribute')
+            ->willReturn(null);
+
+        $result = $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+
+        $this->assertEquals($validResult, $result);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Undefined condition type "olo-lo" passed in.
+     */
+    public function testException()
+    {
+        $simpleCondition = $this->getMockForSimpleCondition('field');
+        $simpleCondition->setType('olo-lo');
+        $inputCondition = $this->getMockForCombinedCondition([$simpleCondition], 'any');
+
+        $this->mappableConditionProcessor->rebuildConditionsTree($inputCondition);
+    }
+
+    /**
+     * @param $subConditions
+     * @param $aggregator
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getMockForCombinedCondition($subConditions, $aggregator)
+    {
+        $mock = $this->getMockBuilder(CombinedCondition::class)
+            ->disableOriginalConstructor()
+            ->setMethods()
+            ->getMock();
+
+        $mock->setConditions($subConditions);
+        $mock->setAggregator($aggregator);
+        $mock->setType(CombinedCondition::class);
+
+        return $mock;
+    }
+
+    /**
+     * @param $attribute
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getMockForSimpleCondition($attribute)
+    {
+        $mock = $this->getMockBuilder(SimpleCondition::class)
+            ->disableOriginalConstructor()
+            ->setMethods()
+            ->getMock();
+
+        $mock->setAttribute($attribute);
+        $mock->setType(SimpleCondition::class);
+
+        return $mock;
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php b/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
index b052ccddbf6b4..25bae43a930bb 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
@@ -49,7 +49,7 @@ public function testExecute()
         $eventObserverMock->expects($this->at(0))->method('getData')->with('dirty_rules')->willReturn($flagMock);
         $flagMock->expects($this->once())->method('getState')->willReturn(1);
         $eventObserverMock->expects($this->at(1))->method('getData')->with('message')->willReturn($message);
-        $this->messageManagerMock->expects($this->once())->method('addNotice')->with($message);
+        $this->messageManagerMock->expects($this->once())->method('addNoticeMessage')->with($message);
         $this->observer->execute($eventObserverMock);
     }
 }
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php b/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php
index 5822e01853deb..71e2093b0e325 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php
@@ -32,7 +32,7 @@ protected function setUp()
         );
         $this->subject = $this->createPartialMock(
             \Magento\Catalog\Model\Category::class,
-            ['getAffectedProductIds', '__wakeUp']
+            ['getChangedProductIds', '__wakeUp']
         );
 
         $this->plugin = (new ObjectManager($this))->getObject(
@@ -46,7 +46,7 @@ protected function setUp()
     public function testAfterSaveWithoutAffectedProductIds()
     {
         $this->subject->expects($this->any())
-            ->method('getAffectedProductIds')
+            ->method('getChangedProductIds')
             ->will($this->returnValue([]));
 
         $this->productRuleProcessor->expects($this->never())
@@ -60,7 +60,7 @@ public function testAfterSave()
         $productIds = [1, 2, 3];
 
         $this->subject->expects($this->any())
-            ->method('getAffectedProductIds')
+            ->method('getChangedProductIds')
             ->will($this->returnValue($productIds));
 
         $this->productRuleProcessor->expects($this->once())
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 66fe04c126d8f..5b09765d9ae51 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -5,22 +5,21 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-rule": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-import-export": "100.3.*",
-        "magento/module-catalog-rule-sample-data": "Sample Data version:100.3.*"
+        "magento/module-import-export": "*",
+        "magento/module-catalog-rule-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogRule/etc/db_schema.xml b/app/code/Magento/CatalogRule/etc/db_schema.xml
new file mode 100644
index 0000000000000..6f7d713e49fe3
--- /dev/null
+++ b/app/code/Magento/CatalogRule/etc/db_schema.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalogrule" resource="default" engine="innodb" comment="CatalogRule">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="date" name="from_date" comment="From"/>
+        <column xsi:type="date" name="to_date" comment="To"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Is Active"/>
+        <column xsi:type="mediumtext" name="conditions_serialized" nullable="true" comment="Conditions Serialized"/>
+        <column xsi:type="mediumtext" name="actions_serialized" nullable="true" comment="Actions Serialized"/>
+        <column xsi:type="smallint" name="stop_rules_processing" padding="6" unsigned="false" nullable="false"
+                identity="false" default="1" comment="Stop Rules Processing"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="varchar" name="simple_action" nullable="true" length="32" comment="Simple Action"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Discount Amount"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE" indexType="btree">
+            <column name="is_active"/>
+            <column name="sort_order"/>
+            <column name="to_date"/>
+            <column name="from_date"/>
+        </index>
+    </table>
+    <table name="catalogrule_product" resource="default" engine="innodb" comment="CatalogRule Product">
+        <column xsi:type="int" name="rule_product_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rule Product Id"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="from_time" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="From Time"/>
+        <column xsi:type="int" name="to_time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="To time"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product Id"/>
+        <column xsi:type="varchar" name="action_operator" nullable="true" length="10" default="to_fixed"
+                comment="Action Operator"/>
+        <column xsi:type="decimal" name="action_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Action Amount"/>
+        <column xsi:type="smallint" name="action_stop" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Action Stop"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_product_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
+            <column name="rule_id"/>
+            <column name="from_time"/>
+            <column name="to_time"/>
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="product_id"/>
+            <column name="sort_order"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_FROM_TIME" indexType="btree">
+            <column name="from_time"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_TO_TIME" indexType="btree">
+            <column name="to_time"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_product_price" resource="default" engine="innodb" comment="CatalogRule Product Price">
+        <column xsi:type="int" name="rule_product_price_id" padding="10" unsigned="true" nullable="false"
+                identity="true" comment="Rule Product PriceId"/>
+        <column xsi:type="date" name="rule_date" nullable="false" comment="Rule Date"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product Id"/>
+        <column xsi:type="decimal" name="rule_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Rule Price"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="date" name="latest_start_date" comment="Latest StartDate"/>
+        <column xsi:type="date" name="earliest_end_date" comment="Earliest EndDate"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_product_price_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID">
+            <column name="rule_date"/>
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_group_website" resource="default" engine="innodb" comment="CatalogRule Group Website">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_website" resource="default" engine="innodb" comment="Catalog Rules To Websites Relations">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOGRULE_WEBSITE_RULE_ID_CATALOGRULE_RULE_ID"
+                    table="catalogrule_website" column="rule_id" referenceTable="catalogrule" referenceColumn="rule_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOGRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="catalogrule_website" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOGRULE_WEBSITE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_customer_group" resource="default" engine="innodb"
+           comment="Catalog Rules To Customer Groups Relations">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="customer_group_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOGRULE_CUSTOMER_GROUP_RULE_ID_CATALOGRULE_RULE_ID"
+                    table="catalogrule_customer_group" column="rule_id" referenceTable="catalogrule"
+                    referenceColumn="rule_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+                    table="catalogrule_customer_group" column="customer_group_id" referenceTable="customer_group"
+                    referenceColumn="customer_group_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOGRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_product_replica" resource="default" engine="innodb" comment="CatalogRule Product">
+        <column xsi:type="int" name="rule_product_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rule Product Id"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="from_time" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="From Time"/>
+        <column xsi:type="int" name="to_time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="To time"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product Id"/>
+        <column xsi:type="varchar" name="action_operator" nullable="true" default="to_fixed" length="10"
+                comment="Action Operator"/>
+        <column xsi:type="decimal" name="action_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Action Amount"/>
+        <column xsi:type="smallint" name="action_stop" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Action Stop"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_product_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
+            <column name="rule_id"/>
+            <column name="from_time"/>
+            <column name="to_time"/>
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="product_id"/>
+            <column name="sort_order"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_FROM_TIME" indexType="btree">
+            <column name="from_time"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_TO_TIME" indexType="btree">
+            <column name="to_time"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_product_price_replica" resource="default" engine="innodb"
+           comment="CatalogRule Product Price">
+        <column xsi:type="int" name="rule_product_price_id" padding="10" unsigned="true" nullable="false"
+                identity="true" comment="Rule Product PriceId"/>
+        <column xsi:type="date" name="rule_date" nullable="false" comment="Rule Date"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product Id"/>
+        <column xsi:type="decimal" name="rule_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Rule Price"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="date" name="latest_start_date" comment="Latest StartDate"/>
+        <column xsi:type="date" name="earliest_end_date" comment="Earliest EndDate"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_product_price_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID">
+            <column name="rule_date"/>
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="catalogrule_group_website_replica" resource="default" engine="innodb"
+           comment="CatalogRule Group Website">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Group Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/CatalogRule/etc/db_schema_whitelist.json b/app/code/Magento/CatalogRule/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b6c1391ce67fb
--- /dev/null
+++ b/app/code/Magento/CatalogRule/etc/db_schema_whitelist.json
@@ -0,0 +1,195 @@
+{
+    "catalogrule": {
+        "column": {
+            "rule_id": true,
+            "name": true,
+            "description": true,
+            "from_date": true,
+            "to_date": true,
+            "is_active": true,
+            "conditions_serialized": true,
+            "actions_serialized": true,
+            "stop_rules_processing": true,
+            "sort_order": true,
+            "simple_action": true,
+            "discount_amount": true,
+            "sub_is_enable": true,
+            "sub_simple_action": true,
+            "sub_discount_amount": true
+        },
+        "index": {
+            "CATALOGRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalogrule_product": {
+        "column": {
+            "rule_product_id": true,
+            "rule_id": true,
+            "from_time": true,
+            "to_time": true,
+            "customer_group_id": true,
+            "product_id": true,
+            "action_operator": true,
+            "action_amount": true,
+            "action_stop": true,
+            "sort_order": true,
+            "website_id": true,
+            "sub_simple_action": true,
+            "sub_discount_amount": true
+        },
+        "index": {
+            "CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_PRODUCT_WEBSITE_ID": true,
+            "CATALOGRULE_PRODUCT_FROM_TIME": true,
+            "CATALOGRULE_PRODUCT_TO_TIME": true,
+            "CATALOGRULE_PRODUCT_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "IDX_EAA51B56FF092A0DCB795D1CEF812B7B": true,
+            "UNQ_EAA51B56FF092A0DCB795D1CEF812B7B": true
+        }
+    },
+    "catalogrule_product_price": {
+        "column": {
+            "rule_product_price_id": true,
+            "rule_date": true,
+            "customer_group_id": true,
+            "product_id": true,
+            "rule_price": true,
+            "website_id": true,
+            "latest_start_date": true,
+            "earliest_end_date": true
+        },
+        "index": {
+            "CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID": true
+        }
+    },
+    "catalogrule_group_website": {
+        "column": {
+            "rule_id": true,
+            "customer_group_id": true,
+            "website_id": true
+        },
+        "index": {
+            "CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATRULE_GROUP_WS_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true,
+            "CATALOGRULE_GROUP_WEBSITE_RULE_ID_CATALOGRULE_RULE_ID": true,
+            "CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "catalogrule_website": {
+        "column": {
+            "rule_id": true,
+            "website_id": true
+        },
+        "index": {
+            "CATALOGRULE_WEBSITE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOGRULE_WEBSITE_RULE_ID_CATALOGRULE_RULE_ID": true,
+            "CATALOGRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "catalogrule_customer_group": {
+        "column": {
+            "rule_id": true,
+            "customer_group_id": true
+        },
+        "index": {
+            "CATALOGRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOGRULE_CUSTOMER_GROUP_RULE_ID_CATALOGRULE_RULE_ID": true,
+            "CATRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true
+        }
+    },
+    "catalogrule_product_replica": {
+        "column": {
+            "rule_product_id": true,
+            "rule_id": true,
+            "from_time": true,
+            "to_time": true,
+            "customer_group_id": true,
+            "product_id": true,
+            "action_operator": true,
+            "action_amount": true,
+            "action_stop": true,
+            "sort_order": true,
+            "website_id": true
+        },
+        "index": {
+            "CATALOGRULE_PRODUCT_REPLICA_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_PRODUCT_REPLICA_WEBSITE_ID": true,
+            "CATALOGRULE_PRODUCT_REPLICA_FROM_TIME": true,
+            "CATALOGRULE_PRODUCT_REPLICA_TO_TIME": true,
+            "CATALOGRULE_PRODUCT_REPLICA_PRODUCT_ID": true,
+            "CATALOGRULE_PRODUCT_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_PRODUCT_WEBSITE_ID": true,
+            "CATALOGRULE_PRODUCT_FROM_TIME": true,
+            "CATALOGRULE_PRODUCT_TO_TIME": true,
+            "CATALOGRULE_PRODUCT_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "IDX_EAA51B56FF092A0DCB795D1CEF812B7B": true,
+            "UNQ_EAA51B56FF092A0DCB795D1CEF812B7B": true
+        }
+    },
+    "catalogrule_product_price_replica": {
+        "column": {
+            "rule_product_price_id": true,
+            "rule_date": true,
+            "customer_group_id": true,
+            "product_id": true,
+            "rule_price": true,
+            "website_id": true,
+            "latest_start_date": true,
+            "earliest_end_date": true
+        },
+        "index": {
+            "CATALOGRULE_PRODUCT_PRICE_REPLICA_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_REPLICA_WEBSITE_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_REPLICA_PRODUCT_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_WEBSITE_ID": true,
+            "CATALOGRULE_PRODUCT_PRICE_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATRULE_PRD_PRICE_REPLICA_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID": true,
+            "CATRULE_PRD_PRICE_RULE_DATE_WS_ID_CSTR_GROUP_ID_PRD_ID": true
+        }
+    },
+    "catalogrule_group_website_replica": {
+        "column": {
+            "rule_id": true,
+            "customer_group_id": true,
+            "website_id": true
+        },
+        "index": {
+            "CATALOGRULE_GROUP_WEBSITE_REPLICA_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_GROUP_WEBSITE_REPLICA_WEBSITE_ID": true,
+            "CATALOGRULE_GROUP_WEBSITE_CUSTOMER_GROUP_ID": true,
+            "CATALOGRULE_GROUP_WEBSITE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CatalogRule/etc/di.xml b/app/code/Magento/CatalogRule/etc/di.xml
index 4b368b1cef89a..e0d91db542390 100644
--- a/app/code/Magento/CatalogRule/etc/di.xml
+++ b/app/code/Magento/CatalogRule/etc/di.xml
@@ -126,4 +126,42 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface" type="Magento\CatalogRule\Model\Indexer\IndexerTableSwapper" />
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface">
+        <arguments>
+            <argument name="priceModifiers" xsi:type="array">
+                <item name="catalogRulePriceModifier" xsi:type="object">Magento\CatalogRule\Model\Indexer\ProductPriceIndexModifier</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier">
+        <arguments>
+            <argument name="priceModifiers" xsi:type="array">
+                <item name="catalogRulePriceModifier" xsi:type="object">Magento\CatalogRule\Model\Indexer\ProductPriceIndexModifier</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="CatalogRuleCustomConditionProvider" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionProvider">
+        <arguments>
+            <argument name="customConditionProcessors" xsi:type="array">
+                <item name="category_ids" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\ProductCategoryCondition</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="CatalogRuleAdvancedFilterProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\AdvancedFilterProcessor">
+        <arguments>
+            <argument name="defaultConditionProcessor" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\DefaultCondition</argument>
+            <argument name="customConditionProvider" xsi:type="object">CatalogRuleCustomConditionProvider</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier">
+        <arguments>
+            <argument name="searchCriteriaProcessor" xsi:type="object">CatalogRuleAdvancedFilterProcessor</argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogRule\Model\Rule\Condition\MappableConditionsProcessor">
+        <arguments>
+            <argument name="customConditionProvider" xsi:type="object">CatalogRuleCustomConditionProvider</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogRule/etc/indexer.xml b/app/code/Magento/CatalogRule/etc/indexer.xml
index 08ed456457bfe..e648ea567631c 100644
--- a/app/code/Magento/CatalogRule/etc/indexer.xml
+++ b/app/code/Magento/CatalogRule/etc/indexer.xml
@@ -14,4 +14,9 @@
         <title translate="true">Catalog Product Rule</title>
         <description translate="true">Indexed product/rule association</description>
     </indexer>
+    <indexer id="catalog_product_price">
+        <dependencies>
+            <indexer id="catalogrule_rule" />
+        </dependencies>
+    </indexer>
 </config>
diff --git a/app/code/Magento/CatalogRule/etc/module.xml b/app/code/Magento/CatalogRule/etc/module.xml
index 1dc0f27b137bc..c2acce2ff995d 100644
--- a/app/code/Magento/CatalogRule/etc/module.xml
+++ b/app/code/Magento/CatalogRule/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogRule" setup_version="2.1.0">
+    <module name="Magento_CatalogRule">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/CatalogRule/etc/mview.xml b/app/code/Magento/CatalogRule/etc/mview.xml
index 2990c03ae0159..35efe33461afc 100644
--- a/app/code/Magento/CatalogRule/etc/mview.xml
+++ b/app/code/Magento/CatalogRule/etc/mview.xml
@@ -18,11 +18,15 @@
             <table name="catalog_product_entity_decimal" entity_column="entity_id" />
             <table name="catalog_product_entity_gallery" entity_column="entity_id" />
             <table name="catalog_product_entity_int" entity_column="entity_id" />
-            <table name="catalog_product_entity_media_gallery_value" entity_column="entity_id" />
             <table name="catalog_product_entity_text" entity_column="entity_id" />
             <table name="catalog_product_entity_tier_price" entity_column="entity_id" />
             <table name="catalog_product_entity_varchar" entity_column="entity_id" />
             <table name="catalog_category_product" entity_column="product_id" />
         </subscriptions>
     </view>
+    <view id="catalog_product_price" class="Magento\Catalog\Model\Indexer\Product\Price" group="indexer">
+        <subscriptions>
+            <table name="catalogrule_product_price" entity_column="product_id" />
+        </subscriptions>
+    </view>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE.txt b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE.txt
rename to app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE_AFL.txt b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE_AFL.txt
rename to app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3d271b8325e60
--- /dev/null
+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Rule Configurable Functional Tests
+
+The Functional Test Module for **Magento Catalog Rule Configurable** module.
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index e07209cfbc075..657e6efb4e44c 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-rule": "100.3.*",
-        "magento/module-configurable-product": "100.3.*"
+        "magento/module-catalog": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-configurable-product": "*"
     },
     "suggest": {
-        "magento/module-catalog-rule": "100.3.*"
+        "magento/module-catalog-rule": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogRuleConfigurable/etc/module.xml b/app/code/Magento/CatalogRuleConfigurable/etc/module.xml
index 3552af8ceb337..0f4d5742fb778 100644
--- a/app/code/Magento/CatalogRuleConfigurable/etc/module.xml
+++ b/app/code/Magento/CatalogRuleConfigurable/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogRuleConfigurable" setup_version="2.0.0">
+    <module name="Magento_CatalogRuleConfigurable" >
         <sequence>
             <module name="Magento_CatalogRule"/>
             <module name="Magento_ConfigurableProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
index 59d33ddbfd60b..681b7ecfb02dc 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Advanced search form
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\CatalogSearch\Block\Advanced;
 
 use Magento\CatalogSearch\Model\Advanced;
@@ -21,6 +16,8 @@
 use Magento\Framework\View\Element\Template\Context;
 
 /**
+ * Advanced search form
+ *
  * @api
  * @since 100.0.2
  */
@@ -58,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBlock
+     * @inheritdoc
      */
     public function _prepareLayout()
     {
@@ -177,19 +174,11 @@ public function getCurrencyCount()
      *
      * @param AbstractAttribute $attribute
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getCurrency($attribute)
     {
         return $this->_storeManager->getStore()->getCurrentCurrencyCode();
-
-        $baseCurrency = $this->_storeManager->getStore()->getBaseCurrency()->getCurrencyCode();
-        return $this->getAttributeValue(
-            $attribute,
-            'currency'
-        ) ? $this->getAttributeValue(
-            $attribute,
-            'currency'
-        ) : $baseCurrency;
     }
 
     /**
@@ -201,16 +190,16 @@ public function getCurrency($attribute)
     public function getAttributeInputType($attribute)
     {
         $dataType = $attribute->getBackend()->getType();
-        $imputType = $attribute->getFrontend()->getInputType();
-        if ($imputType == 'select' || $imputType == 'multiselect') {
+        $inputType = $attribute->getFrontend()->getInputType();
+        if ($inputType == 'select' || $inputType == 'multiselect') {
             return 'select';
         }
 
-        if ($imputType == 'boolean') {
+        if ($inputType == 'boolean') {
             return 'yesno';
         }
 
-        if ($imputType == 'price') {
+        if ($inputType == 'price') {
             return 'price';
         }
 
@@ -294,6 +283,8 @@ public function getAttributeYesNoElement($attribute)
     }
 
     /**
+     * Get select block.
+     *
      * @return BlockInterface
      */
     protected function _getSelectBlock()
@@ -307,6 +298,8 @@ protected function _getSelectBlock()
     }
 
     /**
+     * Get date block.
+     *
      * @return BlockInterface|mixed
      */
     protected function _getDateBlock()
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
index 7c8e65b249139..9f25990594a49 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
@@ -63,7 +63,7 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBlock
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
@@ -125,6 +125,8 @@ public function setListModes()
     }
 
     /**
+     * Initialize list collection.
+     *
      * @return void
      */
     public function setListCollection()
@@ -133,6 +135,8 @@ public function setListCollection()
     }
 
     /**
+     * Get product collection.
+     *
      * @return Collection
      */
     protected function _getProductCollection()
@@ -141,6 +145,8 @@ protected function _getProductCollection()
     }
 
     /**
+     * Set search model.
+     *
      * @return Advanced
      */
     public function getSearchModel()
@@ -149,6 +155,8 @@ public function getSearchModel()
     }
 
     /**
+     * Get result count.
+     *
      * @return mixed
      */
     public function getResultCount()
@@ -161,6 +169,8 @@ public function getResultCount()
     }
 
     /**
+     * Get product list HTML.
+     *
      * @return string
      */
     public function getProductListHtml()
@@ -169,6 +179,8 @@ public function getProductListHtml()
     }
 
     /**
+     * Get form URL.
+     *
      * @return string
      */
     public function getFormUrl()
@@ -182,6 +194,8 @@ public function getFormUrl()
     }
 
     /**
+     * Get search criteria.
+     *
      * @return array
      */
     public function getSearchCriterias()
diff --git a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
index 94cb9c3c8fcf2..85ad66013cf32 100644
--- a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
+++ b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Data\Form\Element\Fieldset;
 
 /**
- * Plugin for Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front
+ * Add Search Weight field to the product attribute add/edit tab
  */
 class FrontTabPlugin
 {
diff --git a/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php b/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php
new file mode 100644
index 0000000000000..005c7860cfe5f
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Block;
+
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Provider of the information on whether the page is cacheable, so that AJAX-based logging of terms can be triggered
+ */
+class SearchTermsLog implements ArgumentInterface
+{
+    /**
+     * @var \Magento\Framework\App\ResponseInterface
+     */
+    private $response;
+
+    /**
+     * @param ResponseInterface $response
+     */
+    public function __construct(
+        ResponseInterface $response
+    ) {
+        $this->response = $response;
+    }
+
+    /**
+     * Check is current page cacheable
+     *
+     * @return bool
+     */
+    public function isPageCacheable()
+    {
+        $pragma = $this->response->getHeader('pragma')->getFieldValue();
+        return ($pragma == 'cache');
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
index b20e36016d20b..4942b36743c12 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
@@ -6,12 +6,17 @@
  */
 namespace Magento\CatalogSearch\Controller\Advanced;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Index extends \Magento\Framework\App\Action\Action
+/**
+ * Advanced search controller.
+ */
+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @inheritdoc
      */
     public function execute()
     {
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
index 86195aa31f0e4..184fd9cfd5b37 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -6,13 +6,22 @@
  */
 namespace Magento\CatalogSearch\Controller\Advanced;
 
-use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\CatalogSearch\Model\Advanced as ModelAdvanced;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\UrlFactory;
 
-class Result extends \Magento\Framework\App\Action\Action
+/**
+ * Advanced search result.
+ */
+class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
+    /**
+     * No results default handle.
+     */
+    const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_advanced_result_noresults';
+
     /**
      * Url factory
      *
@@ -45,20 +54,31 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     public function execute()
     {
         try {
             $this->_catalogSearchAdvanced->addFilters($this->getRequest()->getQueryValue());
-            $this->_view->loadLayout();
+            $size = $this->_catalogSearchAdvanced->getProductCollection()->getSize();
+
+            $handles = null;
+            if ($size == 0) {
+                $this->_view->getPage()->initLayout();
+                $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+                $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
+            }
+
+            $this->_view->loadLayout($handles);
             $this->_view->renderLayout();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
             $defaultUrl = $this->_urlFactory->create()
                 ->addQueryParams($this->getRequest()->getQueryValue())
                 ->getUrl('*/*/');
-            $this->getResponse()->setRedirect($this->_redirect->error($defaultUrl));
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setUrl($this->_redirect->error($defaultUrl));
+            return $resultRedirect;
         }
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index f3990da3a325e..975c6ba1e7eb9 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -6,15 +6,25 @@
  */
 namespace Magento\CatalogSearch\Controller\Result;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Catalog\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\QueryFactory;
+use Magento\Search\Model\PopularSearchTerms;
 
-class Index extends \Magento\Framework\App\Action\Action
+/**
+ * Search result.
+ */
+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
+    /**
+     * No results default handle.
+     */
+    const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_result_index_noresults';
+
     /**
      * Catalog session
      *
@@ -64,34 +74,97 @@ public function __construct(
      * Display search result
      *
      * @return void
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
         $this->layerResolver->create(Resolver::CATALOG_LAYER_SEARCH);
+
         /* @var $query \Magento\Search\Model\Query */
         $query = $this->_queryFactory->get();
 
-        $query->setStoreId($this->_storeManager->getStore()->getId());
+        $storeId = $this->_storeManager->getStore()->getId();
+        $query->setStoreId($storeId);
+
+        $queryText = $query->getQueryText();
+
+        if ($queryText != '') {
+            $catalogSearchHelper = $this->_objectManager->get(\Magento\CatalogSearch\Helper\Data::class);
 
-        if ($query->getQueryText() != '') {
-            if ($this->_objectManager->get(\Magento\CatalogSearch\Helper\Data::class)->isMinQueryLength()) {
-                $query->setId(0)->setIsActive(1)->setIsProcessed(1);
+            $getAdditionalRequestParameters = $this->getRequest()->getParams();
+            unset($getAdditionalRequestParameters[QueryFactory::QUERY_VAR_NAME]);
+
+            $handles = null;
+            if ($query->getNumResults() == 0) {
+                $this->_view->getPage()->initLayout();
+                $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+                $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
+            }
+
+            if (empty($getAdditionalRequestParameters) &&
+                $this->_objectManager->get(PopularSearchTerms::class)->isCacheable($queryText, $storeId)
+            ) {
+                $this->getCacheableResult($catalogSearchHelper, $query, $handles);
             } else {
-                $query->saveIncrementalPopularity();
+                $this->getNotCacheableResult($catalogSearchHelper, $query, $handles);
+            }
+        } else {
+            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+        }
+    }
 
-                $redirect = $query->getRedirect();
-                if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
-                    $this->getResponse()->setRedirect($redirect);
-                    return;
-                }
+    /**
+     * Return cacheable result
+     *
+     * @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
+     * @param \Magento\Search\Model\Query $query
+     * @param array $handles
+     * @return void
+     */
+    private function getCacheableResult($catalogSearchHelper, $query, $handles)
+    {
+        if (!$catalogSearchHelper->isMinQueryLength()) {
+            $redirect = $query->getRedirect();
+            if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
+                $this->getResponse()->setRedirect($redirect);
+                return;
             }
+        }
 
-            $this->_objectManager->get(\Magento\CatalogSearch\Helper\Data::class)->checkNotes();
+        $catalogSearchHelper->checkNotes();
 
-            $this->_view->loadLayout();
-            $this->_view->renderLayout();
+        $this->_view->loadLayout($handles);
+        $this->_view->renderLayout();
+    }
+
+    /**
+     * Return not cacheable result
+     *
+     * @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
+     * @param \Magento\Search\Model\Query $query
+     * @param array $handles
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getNotCacheableResult($catalogSearchHelper, $query, $handles)
+    {
+        if ($catalogSearchHelper->isMinQueryLength()) {
+            $query->setId(0)->setIsActive(1)->setIsProcessed(1);
         } else {
-            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+            $query->saveIncrementalPopularity();
+            $redirect = $query->getRedirect();
+            if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
+                $this->getResponse()->setRedirect($redirect);
+                return;
+            }
         }
+
+        $catalogSearchHelper->checkNotes();
+
+        $this->_view->loadLayout($handles);
+        $this->getResponse()->setNoCacheHeaders();
+        $this->_view->renderLayout();
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php b/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php
new file mode 100644
index 0000000000000..a4a843c636cd0
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Controller\SearchTermsLog;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Search\Model\QueryFactory;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\CatalogSearch\Helper\Data as HelperData;
+use Magento\Framework\Controller\Result\Json;
+
+/**
+ * Controller for save search terms
+ */
+class Save extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * Catalog search helper
+     *
+     * @var HelperData
+     */
+    private $catalogSearchHelper;
+
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @param Context $context
+     * @param HelperData $catalogSearchHelper
+     * @param StoreManagerInterface $storeManager
+     * @param QueryFactory $queryFactory
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Context $context,
+        HelperData $catalogSearchHelper,
+        StoreManagerInterface $storeManager,
+        QueryFactory $queryFactory,
+        JsonFactory $resultJsonFactory
+    ) {
+        parent::__construct($context);
+        $this->storeManager = $storeManager;
+        $this->catalogSearchHelper = $catalogSearchHelper;
+        $this->queryFactory = $queryFactory;
+        $this->resultJsonFactory = $resultJsonFactory;
+    }
+
+    /**
+     * Save search term
+     *
+     * @return Json
+     */
+    public function execute()
+    {
+        /* @var $query \Magento\Search\Model\Query */
+        $query = $this->queryFactory->get();
+
+        $query->setStoreId($this->storeManager->getStore()->getId());
+
+        if ($query->getQueryText() != '') {
+            try {
+                if ($this->catalogSearchHelper->isMinQueryLength()) {
+                    $query->setId(0)->setIsActive(1)->setIsProcessed(1);
+                } else {
+                    $query->saveIncrementalPopularity();
+                }
+                $responseContent = ['success' => true, 'error_message' => ''];
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                $responseContent = ['success' => false, 'error_message' => $e];
+            }
+        } else {
+            $responseContent = ['success' => false, 'error_message' => __('Search term is empty')];
+        }
+
+        /** @var Json $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData($responseContent);
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
index 8ca0c0eeddf1b..8a484d4cc7903 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
@@ -14,6 +14,9 @@
 use Magento\Framework\Search\RequestInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
 
+/**
+ * Aggregation resolver.
+ */
 class AggregationResolver implements AggregationResolverInterface
 {
     /**
@@ -75,7 +78,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resolve(RequestInterface $request, array $documentIds)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
index 8f1f3fde14240..cea42347dc3f9 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
@@ -29,7 +29,7 @@ public function __construct($name)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isApplicable(RequestInterface $request)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
index 01e95c4676af4..42da02f8ca4ff 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isApplicable(RequestInterface $request)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
index 9e4f93b45985c..75910e1720734 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Composite request checker.
+ */
 class RequestCheckerComposite implements RequestCheckerInterface
 {
     /**
@@ -53,7 +56,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isApplicable(RequestInterface $request)
     {
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 a2242ff0f355b..15856bbee7461 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
@@ -6,9 +6,9 @@
 namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\Stock;
-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;
@@ -16,10 +16,10 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class DataProvider implements DataProviderInterface
 {
@@ -28,43 +28,42 @@ class DataProvider implements DataProviderInterface
      */
     private $eavConfig;
 
-    /**
-     * @var Resource
-     */
-    private $resource;
-
     /**
      * @var ScopeResolverInterface
      */
     private $scopeResolver;
 
     /**
-     * @var Session
+     * @var AdapterInterface
      */
-    private $customerSession;
+    private $connection;
 
     /**
-     * @var AdapterInterface
+     * @var SelectBuilderForAttribute
      */
-    private $connection;
+    private $selectBuilderForAttribute;
 
     /**
      * @param Config $eavConfig
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
-     * @param Session $customerSession
+     * @param null $customerSession @deprecated
+     * @param SelectBuilderForAttribute|null $selectBuilderForAttribute
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Config $eavConfig,
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
-        Session $customerSession
+        $customerSession,
+        SelectBuilderForAttribute $selectBuilderForAttribute = null
     ) {
         $this->eavConfig = $eavConfig;
-        $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->scopeResolver = $scopeResolver;
-        $this->customerSession = $customerSession;
+        $this->selectBuilderForAttribute = $selectBuilderForAttribute
+            ?: ObjectManager::getInstance()->get(SelectBuilderForAttribute::class);
     }
 
     /**
@@ -76,9 +75,7 @@ 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->joinInner(
@@ -86,39 +83,7 @@ public function getDataSet(
             'main_table.entity_id  = entities.entity_id',
             []
         );
-
-        if ($attribute->getAttributeCode() === 'price') {
-            /** @var \Magento\Store\Model\Store $store */
-            $store = $this->scopeResolver->getScope($currentScope);
-            if (!$store instanceof \Magento\Store\Model\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()
-                ->joinLeft(
-                    ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
-                    'main_table.source_id = stock_index.product_id',
-                    []
-                )
-                ->where('main_table.attribute_id = ?', $attribute->getAttributeId())
-                ->where('main_table.store_id = ? ', $currentScopeId)
-                ->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK);
-            $parentSelect = $this->getSelect();
-            $parentSelect->from(['main_table' => $subSelect], ['main_table.value']);
-            $select = $parentSelect;
-        }
+        $select = $this->selectBuilderForAttribute->build($select, $attribute, $currentScope);
 
         return $select;
     }
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
new file mode 100644
index 0000000000000..26837448f2df2
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider;
+
+use Magento\CatalogInventory\Model\Configuration as CatalogInventoryConfiguration;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+
+/**
+ * Attribute query builder
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class QueryBuilder
+{
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var Resource
+     */
+    private $resource;
+
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
+    /**
+     * @var CatalogInventoryConfiguration
+     */
+    private $inventoryConfig;
+
+    /**
+     * @var IndexScopeResolverInterface
+     */
+    private $priceTableResolver;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param ScopeResolverInterface $scopeResolver
+     * @param CatalogInventoryConfiguration $inventoryConfig
+     * @param IndexScopeResolverInterface $priceTableResolver
+     * @param DimensionFactory|null $dimensionFactory
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        ScopeResolverInterface $scopeResolver,
+        CatalogInventoryConfiguration $inventoryConfig,
+        IndexScopeResolverInterface $priceTableResolver = null,
+        DimensionFactory $dimensionFactory = null
+    ) {
+        $this->resource = $resource;
+        $this->scopeResolver = $scopeResolver;
+        $this->inventoryConfig = $inventoryConfig;
+        $this->priceTableResolver = $priceTableResolver
+            ?: ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+        $this->dimensionFactory = $dimensionFactory ?: ObjectManager::getInstance()->get(DimensionFactory::class);
+    }
+
+    /**
+     * Build select.
+     *
+     * @param AbstractAttribute $attribute
+     * @param string $tableName
+     * @param int $currentScope
+     * @param int $customerGroupId
+     *
+     * @return Select
+     */
+    public function build(
+        AbstractAttribute $attribute,
+        string $tableName,
+        int $currentScope,
+        int $customerGroupId
+    ) : Select {
+        $select = $this->resource->getConnection()->select();
+        $select->joinInner(
+            ['entities' => $tableName],
+            'main_table.entity_id  = entities.entity_id',
+            []
+        );
+
+        if ($attribute->getAttributeCode() === 'price') {
+            return $this->buildQueryForPriceAttribute($currentScope, $customerGroupId, $select);
+        }
+
+        return $this->buildQueryForAttribute($currentScope, $attribute, $select);
+    }
+
+    /**
+     * Build select for price attribute.
+     *
+     * @param int $currentScope
+     * @param int $customerGroupId
+     * @param Select $select
+     *
+     * @return Select
+     */
+    private function buildQueryForPriceAttribute(
+        int $currentScope,
+        int $customerGroupId,
+        Select $select
+    ) : Select {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->scopeResolver->getScope($currentScope);
+        if (!$store instanceof \Magento\Store\Model\Store) {
+            throw new \RuntimeException('Illegal scope resolved');
+        }
+        $websiteId = $store->getWebsiteId();
+
+        $tableName = $this->priceTableResolver->resolve(
+            'catalog_product_index_price',
+            [
+                $this->dimensionFactory->create(
+                    WebsiteDimensionProvider::DIMENSION_NAME,
+                    (string)$websiteId
+                ),
+                $this->dimensionFactory->create(
+                    CustomerGroupDimensionProvider::DIMENSION_NAME,
+                    (string)$customerGroupId
+                ),
+            ]
+        );
+        $select->from(['main_table' => $tableName], null)
+            ->columns([BucketInterface::FIELD_VALUE => 'main_table.min_price'])
+            ->where('main_table.customer_group_id = ?', $customerGroupId)
+            ->where('main_table.website_id = ?', $websiteId);
+
+        return $select;
+    }
+
+    /**
+     * Build select for attribute.
+     *
+     * @param int $currentScope
+     * @param AbstractAttribute $attribute
+     * @param Select $select
+     *
+     * @return Select
+     */
+    private function buildQueryForAttribute(
+        int $currentScope,
+        AbstractAttribute $attribute,
+        Select $select
+    ) : Select {
+        $currentScopeId = $this->scopeResolver->getScope($currentScope)->getId();
+        $table = $this->resource->getTableName(
+            'catalog_product_index_eav' . ($attribute->getBackendType() === 'decimal' ? '_decimal' : '')
+        );
+        $select->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
+            ->distinct()
+            ->joinLeft(
+                ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
+                'main_table.source_id = stock_index.product_id',
+                []
+            )
+            ->where('main_table.attribute_id = ?', $attribute->getAttributeId())
+            ->where('main_table.store_id = ? ', $currentScopeId);
+
+        if (!$this->inventoryConfig->isShowOutOfStock($currentScopeId)) {
+            $select->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK);
+        }
+
+        $parentSelect = $this->resource->getConnection()->select();
+        $parentSelect->from(['main_table' => $select], ['main_table.value']);
+        return $parentSelect;
+    }
+}
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 0000000000000..ddb4085fa13d9
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php
@@ -0,0 +1,130 @@
+<?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.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+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 0000000000000..be572793f1ec3
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/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\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.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+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/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
index 87fc896f50956..27a784f8609bb 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
@@ -18,6 +18,9 @@
  *
  * The main idea of this strategy is using eav index table as main table for query
  * in case when search request requires search by attributes
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class BaseSelectAttributesSearchStrategy implements BaseSelectStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
index 0732df7bd9f57..bff878122c8c4 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
@@ -17,6 +17,9 @@
  *
  * The main idea of this strategy is using fulltext search index table as main table for query
  * in case when search request does not requires any search by attributes
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class BaseSelectFullTextSearchStrategy implements BaseSelectStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index 8b7a7ed214e36..eb4761adf830c 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -6,20 +6,26 @@
 namespace Magento\CatalogSearch\Model\Adapter\Mysql\Dynamic;
 
 use Magento\Catalog\Model\Layer\Filter\Price\Range;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Indexer\DimensionFactory;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface as MysqlDataProviderInterface;
 use Magento\Framework\Search\Dynamic\DataProviderInterface;
 use Magento\Framework\Search\Dynamic\IntervalFactory;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 use Magento\Store\Model\StoreManager;
+use \Magento\Framework\Search\Request\IndexScopeResolverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class DataProvider implements DataProviderInterface
 {
@@ -58,6 +64,16 @@ class DataProvider implements DataProviderInterface
      */
     private $storeManager;
 
+    /**
+     * @var IndexScopeResolverInterface
+     */
+    private $priceTableResolver;
+
+    /**
+     * @var DimensionFactory|null
+     */
+    private $dimensionFactory;
+
     /**
      * @param ResourceConnection $resource
      * @param Range $range
@@ -65,6 +81,8 @@ class DataProvider implements DataProviderInterface
      * @param MysqlDataProviderInterface $dataProvider
      * @param IntervalFactory $intervalFactory
      * @param StoreManager $storeManager
+     * @param IndexScopeResolverInterface|null $priceTableResolver
+     * @param DimensionFactory|null $dimensionFactory
      */
     public function __construct(
         ResourceConnection $resource,
@@ -72,7 +90,9 @@ public function __construct(
         Session $customerSession,
         MysqlDataProviderInterface $dataProvider,
         IntervalFactory $intervalFactory,
-        StoreManager $storeManager = null
+        StoreManager $storeManager = null,
+        IndexScopeResolverInterface $priceTableResolver = null,
+        DimensionFactory $dimensionFactory = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -81,6 +101,10 @@ public function __construct(
         $this->dataProvider = $dataProvider;
         $this->intervalFactory = $intervalFactory;
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManager::class);
+        $this->priceTableResolver = $priceTableResolver ?: ObjectManager::getInstance()->get(
+            IndexScopeResolverInterface::class
+        );
+        $this->dimensionFactory = $dimensionFactory ?: ObjectManager::getInstance()->get(DimensionFactory::class);
     }
 
     /**
@@ -104,16 +128,30 @@ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage
         ];
 
         $select = $this->getSelect();
-
-        $tableName = $this->resource->getTableName('catalog_product_index_price');
+        $websiteId = $this->storeManager->getStore()->getWebsiteId();
+        $customerGroupId = $this->customerSession->getCustomerGroupId();
+
+        $tableName = $this->priceTableResolver->resolve(
+            'catalog_product_index_price',
+            [
+                $this->dimensionFactory->create(
+                    WebsiteDimensionProvider::DIMENSION_NAME,
+                    (string)$websiteId
+                ),
+                $this->dimensionFactory->create(
+                    CustomerGroupDimensionProvider::DIMENSION_NAME,
+                    (string)$customerGroupId
+                ),
+            ]
+        );
         /** @var Table $table */
         $table = $entityStorage->getSource();
         $select->from(['main_table' => $tableName], [])
             ->where('main_table.entity_id in (select entity_id from ' . $table->getName() . ')')
             ->columns($aggregation);
 
-        $select = $this->setCustomerGroupId($select);
-        $select->where('main_table.website_id = ?', $this->storeManager->getStore()->getWebsiteId());
+        $select->where('customer_group_id = ?', $customerGroupId);
+        $select->where('main_table.website_id = ?', $websiteId);
 
         return $this->connection->fetchRow($select);
     }
@@ -192,13 +230,4 @@ private function getSelect()
     {
         return $this->connection->select();
     }
-
-    /**
-     * @param Select $select
-     * @return Select
-     */
-    private function setCustomerGroupId($select)
-    {
-        return $select->where('customer_group_id = ?', $this->customerSession->getCustomerGroupId());
-    }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
index a187ccc8f9681..c24acf4610e07 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
@@ -10,6 +10,10 @@
 use Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface;
 use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
 
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Resolver implements ResolverInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
index 547122125b1d0..bf431396cc0c7 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
@@ -12,6 +12,8 @@
  * Purpose of class is to resolve table alias for Search Request filter
  * @api
  * @since 100.1.6
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class AliasResolver
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
index 35addc3fafd4f..2ffa63098cdee 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -25,6 +25,8 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class Preprocessor implements PreprocessorInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
index 6bf735e2141cc..a5650cac73395 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
@@ -12,7 +12,15 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class DataProvider
 {
     /**
@@ -32,20 +40,28 @@ class DataProvider
      */
     protected $categoryFactory;
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
     /**
      * DataProvider constructor.
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
      * @param Resolver $layerResolver
+     * @param TableResolver|null $tableResolver
      */
     public function __construct(
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
-        Resolver $layerResolver
+        Resolver $layerResolver,
+        TableResolver $tableResolver = null
     ) {
         $this->resource = $resource;
         $this->scopeResolver = $scopeResolver;
         $this->layer = $layerResolver->get();
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
     }
 
     /**
@@ -69,9 +85,18 @@ public function aroundGetDataSet(
             $currentScopeId = $this->scopeResolver->getScope($dimensions['scope']->getValue())->getId();
             $currentCategory = $this->layer->getCurrentCategory();
 
+            $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $currentScopeId);
+
+            $catalogCategoryProductTableName = $this->tableResolver->resolve(
+                AbstractAction::MAIN_INDEX_TABLE,
+                [
+                    $catalogCategoryProductDimension
+                ]
+            );
+
             $derivedTable = $this->resource->getConnection()->select();
             $derivedTable->from(
-                ['main_table' => $this->resource->getTableName('catalog_category_product_index')],
+                ['main_table' => $catalogCategoryProductTableName],
                 [
                     'value' => 'category_id'
                 ]
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
index 425e6c0041616..f2e1c3c4c42d2 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
@@ -10,6 +10,8 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
+ * Catalog search config.
+ *
  * @api
  * @since 100.0.2
  */
@@ -33,7 +35,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
index 2964f836ab9d6..1f11d2650334d 100644
--- a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
@@ -6,7 +6,8 @@
 namespace Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend;
 
 /**
- * @author      Magento Core Team <core@magentocommerce.com>
+ * Backend model for catalog search engine system config
+ *
  * @api
  * @since 100.0.2
  */
@@ -43,6 +44,7 @@ public function __construct(
 
     /**
      * After save call
+     *
      * Invalidate catalog search index if engine was changed
      *
      * @return $this
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index d158bdf40b421..af0e9ff5528cf 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -22,6 +22,7 @@
 
 /**
  * Catalog advanced search model
+ *
  * @method int getEntityTypeId()
  * @method \Magento\CatalogSearch\Model\Advanced setEntityTypeId(int $value)
  * @method int getAttributeSetId()
@@ -226,7 +227,7 @@ public function addFilters($values)
             $this->_registry->register('advanced_search_conditions', $allConditions);
             $this->getProductCollection()->addFieldsToFilter($allConditions);
         } else {
-            throw new LocalizedException(__('Please specify at least one search term.'));
+            throw new LocalizedException(__('Enter a search term and try again.'));
         }
 
         return $this;
@@ -296,6 +297,8 @@ public function prepareProductCollection($collection)
     }
 
     /**
+     * Add search criteria.
+     *
      * @param EntityAttribute $attribute
      * @param mixed $value
      * @return void
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
index 429c29fd3d2e6..9e7737123b2ec 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
@@ -8,12 +8,16 @@
 use Magento\Framework\Search\Request\Builder as RequestBuilder;
 
 /**
+ * Catalog search advanced request builder.
+ *
  * @api
  * @since 100.0.2
  */
 class Builder extends RequestBuilder
 {
     /**
+     * Bind value to query.
+     *
      * @param string $attributeCode
      * @param array|string $attributeValue
      * @return void
diff --git a/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php b/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
index d6110f4b3b2c9..fa42cadb8a2fa 100644
--- a/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
+++ b/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
@@ -7,8 +7,9 @@
 namespace Magento\CatalogSearch\Model\Attribute;
 
 /**
- * This plugin is responsible for processing of search_weight property of a product attribute,
- * which is used to boost matches by specific attributes.
+ * This plugin is responsible for processing of search_weight property of a product attribute.
+ *
+ * 'search_weight' is used to boost matches by specific attributes.
  *
  * This is part of search accuracy customization functionality.
  */
diff --git a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
index c4413d002e19c..f014c6d133187 100644
--- a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
@@ -10,9 +10,19 @@
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Catalog search auto-complete data provider.
+ */
 class DataProvider implements DataProviderInterface
 {
+    /**
+     * Autocomplete limit
+     */
+    const CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
+
     /**
      * Query factory
      *
@@ -27,20 +37,34 @@ class DataProvider implements DataProviderInterface
      */
     protected $itemFactory;
 
+    /**
+     * Limit
+     *
+     * @var int
+     */
+    protected $limit;
+
     /**
      * @param QueryFactory $queryFactory
      * @param ItemFactory $itemFactory
+     * @param ScopeConfig $scopeConfig
      */
     public function __construct(
         QueryFactory $queryFactory,
-        ItemFactory $itemFactory
+        ItemFactory $itemFactory,
+        ScopeConfig $scopeConfig
     ) {
         $this->queryFactory = $queryFactory;
         $this->itemFactory = $itemFactory;
+
+        $this->limit = (int) $scopeConfig->getValue(
+            self::CONFIG_AUTOCOMPLETE_LIMIT,
+            ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems()
     {
@@ -58,7 +82,7 @@ public function getItems()
                 $result[] = $resultItem;
             }
         }
-        return $result;
+        return ($this->limit) ? array_splice($result, 0, $this->limit) : $result;
     }
 
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Fulltext.php
index 838d0aa906730..398d6e9dd18dd 100644
--- a/app/code/Magento/CatalogSearch/Model/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Fulltext.php
@@ -21,6 +21,9 @@
  * @method \Magento\CatalogSearch\Model\Fulltext setStoreId(int $value)
  * @method string getDataIndex()
  * @method \Magento\CatalogSearch\Model\Fulltext setDataIndex(string $value)
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class Fulltext extends \Magento\Framework\Model\AbstractModel
 {
@@ -73,6 +76,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 9009a40c19dff..21d8b7297da7d 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -6,20 +6,24 @@
 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\DimensionProviderInterface;
+use Magento\Store\Model\StoreDimensionProvider;
+use Magento\Indexer\Model\ProcessManager;
 
 /**
  * Provide functionality for Fulltext Search indexing.
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
  * @api
  * @since 100.0.2
  */
-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\DimensionalIndexerInterface
 {
     /**
      * Indexer ID in configuration
@@ -36,16 +40,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 +50,6 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      */
     private $fulltextResource;
 
-    /**
-     * @var \Magento\Framework\Search\Request\Config
-     */
-    private $searchRequestConfig;
-
     /**
      * @var IndexSwitcherInterface
      */
@@ -71,90 +60,114 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      */
     private $indexScopeState;
 
+    /**
+     * @var DimensionProviderInterface
+     */
+    private $dimensionProvider;
+
+    /**
+     * @var ProcessManager
+     */
+    private $processManager;
+
     /**
      * @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
+     * @param array $data
+     * @param ProcessManager $processManager
      */
     public function __construct(
         FullFactory $fullActionFactory,
         IndexerHandlerFactory $indexerHandlerFactory,
-        StoreManagerInterface $storeManager,
-        DimensionFactory $dimensionFactory,
         FulltextResource $fulltextResource,
-        SearchRequestConfig $searchRequestConfig,
+        IndexSwitcherInterface $indexSwitcher,
+        StateFactory $indexScopeStateFactory,
+        DimensionProviderInterface $dimensionProvider,
         array $data,
-        IndexSwitcherInterface $indexSwitcher = null,
-        State $indexScopeState = null
+        ProcessManager $processManager = null
     ) {
         $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;
+        $this->processManager = $processManager ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            ProcessManager::class
+        );
     }
 
     /**
      * 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->executeByDimensions($dimension, new \ArrayIterator($entityIds));
         }
     }
 
     /**
-     * Execute full indexation
+     * @inheritdoc
      *
-     * @return void
+     * @throws \InvalidArgumentException
      */
-    public function executeFull()
+    public function executeByDimensions(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))
+            );
+            if ($saveHandler->isAvailable($dimensions)) {
+                $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
+                $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
+            }
+        }
+    }
+
+    /**
+     * Execute full indexation
+     *
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    public function executeFull()
+    {
+        $userFunctions = [];
+        foreach ($this->dimensionProvider->getIterator() as $dimension) {
+            $userFunctions[] = function () use ($dimension) {
+                $this->executeByDimensions($dimension);
+            };
         }
-        $this->fulltextResource->resetSearchResults();
-        $this->searchRequestConfig->reset();
+        $this->processManager->execute($userFunctions);
     }
 
     /**
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 f61ec7ce56f81..39cb95747c2cf 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -6,10 +6,16 @@
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Store\Model\Store;
 
 /**
+ * Catalog search full test search data provider.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @api
  * @since 100.0.3
  */
@@ -101,6 +107,23 @@ class DataProvider
      */
     private $attributeOptions = [];
 
+    /**
+     * Cache searchable attributes by backend type
+     *
+     * @var array
+     */
+    private $searchableAttributesByBackendType = [];
+
+    /**
+     * Adjusts a size of filtered rows for searchable products. Filtered rows counts by the following condition:
+     * entity_id > X AND entity_id < X + BatchSize * antiGapMultiplier
+     * It will help in case a lot of gaps between entity_id in product table, when selected amount of products will be
+     * less than batch size
+     *
+     * @var int
+     */
+    private $antiGapMultiplier;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -110,6 +133,7 @@ class DataProvider
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param int $antiGapMultiplier
      */
     public function __construct(
         ResourceConnection $resource,
@@ -119,7 +143,8 @@ public function __construct(
         \Magento\CatalogSearch\Model\ResourceModel\EngineProvider $engineProvider,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        int $antiGapMultiplier = 5
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -130,6 +155,7 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->engine = $engineProvider->get();
         $this->metadata = $metadataPool->getMetadata(ProductInterface::class);
+        $this->antiGapMultiplier = $antiGapMultiplier;
     }
 
     /**
@@ -150,7 +176,7 @@ private function getTable($table)
      * @param array $staticFields
      * @param array|int $productIds
      * @param int $lastProductId
-     * @param int $limit
+     * @param int $batch
      * @return array
      * @since 100.0.3
      */
@@ -159,9 +185,47 @@ public function getSearchableProducts(
         array $staticFields,
         $productIds = null,
         $lastProductId = 0,
-        $limit = 100
+        $batch = 100
+    ) {
+
+        $select = $this->getSelectForSearchableProducts($storeId, $staticFields, $productIds, $lastProductId, $batch);
+        if ($productIds === null) {
+            $select->where(
+                'e.entity_id < ?',
+                $lastProductId ? $this->antiGapMultiplier * $batch + $lastProductId + 1 : $batch + 1
+            );
+        }
+        $products = $this->connection->fetchAll($select);
+        if ($productIds === null && !$products) {
+            // try to search without limit entity_id by batch size for cover case with a big gap between entity ids
+            $products = $this->connection->fetchAll(
+                $this->getSelectForSearchableProducts($storeId, $staticFields, $productIds, $lastProductId, $batch)
+            );
+        }
+
+        return $products;
+    }
+
+    /**
+     * Get Select object for searchable products
+     *
+     * @param int $storeId
+     * @param array $staticFields
+     * @param array|int $productIds
+     * @param int $lastProductId
+     * @param int $batch
+     * @return Select
+     */
+    private function getSelectForSearchableProducts(
+        $storeId,
+        array $staticFields,
+        $productIds,
+        $lastProductId,
+        $batch
     ) {
-        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+        $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
+        $lastProductId = (int) $lastProductId;
+
         $select = $this->connection->select()
             ->useStraightJoin(true)
             ->from(
@@ -174,15 +238,65 @@ public function getSearchableProducts(
                 []
             );
 
+        $this->joinAttribute($select, 'visibility', $storeId, $this->engine->getAllowedVisibility());
+        $this->joinAttribute($select, 'status', $storeId, [Status::STATUS_ENABLED]);
+
         if ($productIds !== null) {
             $select->where('e.entity_id IN (?)', $productIds);
         }
+        $select->where('e.entity_id > ?', $lastProductId);
+        $select->order('e.entity_id');
+        $select->limit($batch);
 
-        $select->where('e.entity_id > ?', $lastProductId)->limit($limit)->order('e.entity_id');
+        return $select;
+    }
 
-        $result = $this->connection->fetchAll($select);
+    /**
+     * Join attribute to searchable product for filtration
+     *
+     * @param Select $select
+     * @param string $attributeCode
+     * @param int $storeId
+     * @param array $whereValue
+     */
+    private function joinAttribute(Select $select, $attributeCode, $storeId, array $whereValue)
+    {
+        $linkField = $this->metadata->getLinkField();
+        $attribute = $this->getSearchableAttribute($attributeCode);
+        $attributeTable = $this->getTable('catalog_product_entity_' . $attribute->getBackendType());
+        $defaultAlias = $attributeCode . '_default';
+        $storeAlias = $attributeCode . '_store';
+
+        $whereCondition = $this->connection->getCheckSql(
+            $storeAlias . '.value_id > 0',
+            $storeAlias . '.value',
+            $defaultAlias . '.value'
+        );
 
-        return $result;
+        $select->join(
+            [$defaultAlias => $attributeTable],
+            $this->connection->quoteInto(
+                $defaultAlias . '.' . $linkField . '= e.' . $linkField . ' AND ' . $defaultAlias . '.attribute_id = ?',
+                $attribute->getAttributeId()
+            ) . $this->connection->quoteInto(
+                ' AND ' . $defaultAlias . '.store_id = ?',
+                Store::DEFAULT_STORE_ID
+            ),
+            []
+        )->joinLeft(
+            [$storeAlias => $attributeTable],
+            $this->connection->quoteInto(
+                $storeAlias . '.' . $linkField . '= e.' . $linkField . ' AND ' . $storeAlias . '.attribute_id = ?',
+                $attribute->getAttributeId()
+            ) . $this->connection->quoteInto(
+                ' AND ' . $storeAlias . '.store_id = ?',
+                $storeId
+            ),
+            []
+        )->where(
+            $whereCondition . ' IN (?)',
+            $whereValue
+        );
     }
 
     /**
@@ -204,29 +318,38 @@ public function getSearchableAttributes($backendType = null)
             /** @var \Magento\Eav\Model\Entity\Attribute[] $attributes */
             $attributes = $productAttributes->getItems();
 
+            /** @deprecated */
             $this->eventManager->dispatch(
                 'catelogsearch_searchable_attributes_load_after',
                 ['engine' => $this->engine, 'attributes' => $attributes]
             );
+            
+            $this->eventManager->dispatch(
+                'catalogsearch_searchable_attributes_load_after',
+                ['engine' => $this->engine, 'attributes' => $attributes]
+            );
 
             $entity = $this->eavConfig->getEntityType(\Magento\Catalog\Model\Product::ENTITY)->getEntity();
 
             foreach ($attributes as $attribute) {
                 $attribute->setEntity($entity);
+                $this->searchableAttributes[$attribute->getAttributeId()] = $attribute;
+                $this->searchableAttributes[$attribute->getAttributeCode()] = $attribute;
             }
-
-            $this->searchableAttributes = $attributes;
         }
 
         if ($backendType !== null) {
-            $attributes = [];
-            foreach ($this->searchableAttributes as $attributeId => $attribute) {
+            if (isset($this->searchableAttributesByBackendType[$backendType])) {
+                return $this->searchableAttributesByBackendType[$backendType];
+            }
+            $this->searchableAttributesByBackendType[$backendType] = [];
+            foreach ($this->searchableAttributes as $attribute) {
                 if ($attribute->getBackendType() == $backendType) {
-                    $attributes[$attributeId] = $attribute;
+                    $this->searchableAttributesByBackendType[$backendType][$attribute->getAttributeId()] = $attribute;
                 }
             }
 
-            return $attributes;
+            return $this->searchableAttributesByBackendType[$backendType];
         }
 
         return $this->searchableAttributes;
@@ -242,16 +365,8 @@ public function getSearchableAttributes($backendType = null)
     public function getSearchableAttribute($attribute)
     {
         $attributes = $this->getSearchableAttributes();
-        if (is_numeric($attribute)) {
-            if (isset($attributes[$attribute])) {
-                return $attributes[$attribute];
-            }
-        } elseif (is_string($attribute)) {
-            foreach ($attributes as $attributeModel) {
-                if ($attributeModel->getAttributeCode() == $attribute) {
-                    return $attributeModel;
-                }
-            }
+        if (isset($attributes[$attribute])) {
+            return $attributes[$attribute];
         }
 
         return $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attribute);
@@ -301,33 +416,45 @@ 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;
             }
         }
 
         if ($selects) {
-            $select = $this->connection->select()->union($selects, \Magento\Framework\DB\Select::SQL_UNION_ALL);
+            $select = $this->connection->select()->union($selects, Select::SQL_UNION_ALL);
             $query = $this->connection->query($select);
             while ($row = $query->fetch()) {
                 $entityId = $productLinkFieldsToEntityIdMap[$row[$linkField]];
@@ -365,9 +492,9 @@ private function getProductTypeInstance($typeId)
     public function getProductChildIds($productId, $typeId)
     {
         $typeInstance = $this->getProductTypeInstance($typeId);
-        $relation = $typeInstance->isComposite(
-            $this->getProductEmulator($typeId)
-        ) ? $typeInstance->getRelationInfo() : false;
+        $relation = $typeInstance->isComposite($this->getProductEmulator($typeId))
+            ? $typeInstance->getRelationInfo()
+            : false;
 
         if ($relation && $relation->getTable() && $relation->getParentFieldName() && $relation->getChildFieldName()) {
             $select = $this->connection->select()->from(
@@ -413,7 +540,7 @@ private function getProductEmulator($typeId)
      * @param array $indexData
      * @param array $productData
      * @param int $storeId
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @since 100.0.3
      */
@@ -442,10 +569,9 @@ public function prepareProductIndex($indexData, $productData, $storeId)
                 }
             }
         }
-
         foreach ($indexData as $entityId => $attributeData) {
-            foreach ($attributeData as $attributeId => $attributeValue) {
-                $value = $this->getAttributeValue($attributeId, $attributeValue, $storeId);
+            foreach ($attributeData as $attributeId => $attributeValues) {
+                $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
                 if (!empty($value)) {
                     if (isset($index[$attributeId])) {
                         $index[$attributeId][$entityId] = $value;
@@ -476,41 +602,72 @@ public function prepareProductIndex($indexData, $productData, $storeId)
      * Retrieve attribute source value for search
      *
      * @param int $attributeId
-     * @param mixed $valueId
+     * @param mixed $valueIds
      * @param int $storeId
      * @return string
      */
-    private function getAttributeValue($attributeId, $valueId, $storeId)
+    private function getAttributeValue($attributeId, $valueIds, $storeId)
     {
         $attribute = $this->getSearchableAttribute($attributeId);
-        $value = $this->engine->processAttributeValue($attribute, $valueId);
+        $value = $this->engine->processAttributeValue($attribute, $valueIds);
+        if (false !== $value) {
+            $optionValue = $this->getAttributeOptionValue($attributeId, $valueIds, $storeId);
+            if (null === $optionValue) {
+                $value = $this->filterAttributeValue($value);
+            } else {
+                $value = implode($this->separator, array_filter([$value, $optionValue]));
+            }
+        }
+
+        return $value;
+    }
 
-        if (false !== $value
-            && $attribute->getIsSearchable()
-            && $attribute->usesSource()
-            && $this->engine->allowAdvancedIndex()
+    /**
+     * Get attribute option value
+     *
+     * @param int $attributeId
+     * @param int|string $valueIds
+     * @param int $storeId
+     * @return null|string
+     */
+    private function getAttributeOptionValue($attributeId, $valueIds, $storeId)
+    {
+        $optionKey = $attributeId . '-' . $storeId;
+        $attributeValueIds = explode(',', $valueIds);
+        $attributeOptionValue = '';
+        if (!array_key_exists($optionKey, $this->attributeOptions)
         ) {
-            if (!isset($this->attributeOptions[$attributeId][$storeId])) {
+            $attribute = $this->getSearchableAttribute($attributeId);
+            if ($this->engine->allowAdvancedIndex()
+                && $attribute->getIsSearchable()
+                && $attribute->usesSource()
+            ) {
                 $attribute->setStoreId($storeId);
                 $options = $attribute->getSource()->toOptionArray();
-                $this->attributeOptions[$attributeId][$storeId] = array_combine(
-                    array_column($options, 'value'),
-                    array_column($options, 'label')
-                );
+                $this->attributeOptions[$optionKey] = array_column($options, 'label', 'value');
+                $this->attributeOptions[$optionKey] = array_map(function ($value) {
+                    return $this->filterAttributeValue($value);
+                }, $this->attributeOptions[$optionKey]);
+            } else {
+                $this->attributeOptions[$optionKey] = null;
             }
-
-            $valueText = '';
-            if (isset($this->attributeOptions[$attributeId][$storeId][$valueId])) {
-                $valueText = $this->attributeOptions[$attributeId][$storeId][$valueId];
+        }
+        foreach ($attributeValueIds as $attrValueId) {
+            if (isset($this->attributeOptions[$optionKey][$attrValueId])) {
+                $attributeOptionValue .= $this->attributeOptions[$optionKey][$attrValueId] . ' ';
             }
-
-            $pieces = array_filter(array_merge([$value], [$valueText]));
-
-            $value = implode($this->separator, $pieces);
         }
+        return empty($attributeOptionValue) ? null : trim($attributeOptionValue);
+    }
 
-        $value = preg_replace('/\\s+/siu', ' ', trim(strip_tags($value)));
-
-        return $value;
+    /**
+     * Remove whitespaces and tags from attribute value
+     *
+     * @param string $value
+     * @return string
+     */
+    private function filterAttributeValue($value)
+    {
+        return preg_replace('/\s+/iu', ' ', trim(strip_tags($value)));
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index 639c0e8ca66f0..f56a4fe4d1b76 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
@@ -197,6 +198,13 @@ class Full
      */
     private $dataProvider;
 
+    /**
+     * Batch size for searchable product ids
+     *
+     * @var int
+     */
+    private $batchSize;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -218,6 +226,7 @@ class Full
      * @param \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\IndexIteratorFactory $indexIteratorFactory
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param DataProvider $dataProvider
+     * @param int $batchSize
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -240,7 +249,8 @@ public function __construct(
         \Magento\Framework\Indexer\ConfigInterface $indexerConfig,
         \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\IndexIteratorFactory $indexIteratorFactory,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        DataProvider $dataProvider = null
+        DataProvider $dataProvider = null,
+        $batchSize = 500
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -264,6 +274,7 @@ public function __construct(
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\EntityManager\MetadataPool::class);
         $this->dataProvider = $dataProvider ?: ObjectManager::getInstance()->get(DataProvider::class);
+        $this->batchSize = $batchSize;
     }
 
     /**
@@ -297,27 +308,30 @@ protected function getTable($table)
     /**
      * Get parents IDs of product IDs to be re-indexed
      *
+     * @deprecated as it not used in the class anymore and duplicates another API method
+     * @see \Magento\CatalogSearch\Model\ResourceModel\Fulltext::getRelationsByChild()
+     *
      * @param int[] $entityIds
      * @return int[]
+     * @throws \Exception
      */
     protected function getProductIdsFromParents(array $entityIds)
     {
-        /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
-        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $fieldForParent = $metadata->getLinkField();
+        $connection = $this->connection;
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
-        $select = $this->connection
+        $select = $connection
             ->select()
             ->from(['relation' => $this->getTable('catalog_product_relation')], [])
             ->distinct(true)
             ->where('child_id IN (?)', $entityIds)
-            ->where('parent_id NOT IN (?)', $entityIds)
             ->join(
                 ['cpe' => $this->getTable('catalog_product_entity')],
-                'relation.parent_id = cpe.' . $fieldForParent,
+                'relation.parent_id = cpe.' . $linkField,
                 ['cpe.entity_id']
             );
-        return $this->connection->fetchCol($select);
+
+        return $connection->fetchCol($select);
     }
 
     /**
@@ -335,7 +349,7 @@ protected function getProductIdsFromParents(array $entityIds)
     public function rebuildStoreIndex($storeId, $productIds = null)
     {
         if ($productIds !== null) {
-            $productIds = array_unique(array_merge($productIds, $this->getProductIdsFromParents($productIds)));
+            $productIds = array_unique($productIds);
         }
 
         // prepare searchable attributes
@@ -354,7 +368,7 @@ public function rebuildStoreIndex($storeId, $productIds = null)
 
         $lastProductId = 0;
         $products = $this->dataProvider
-            ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId);
+            ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId, $this->batchSize);
         while (count($products) > 0) {
             $productsIds = array_column($products, 'entity_id');
             $relatedProducts = $this->getRelatedProducts($products);
@@ -365,12 +379,6 @@ public function rebuildStoreIndex($storeId, $productIds = null)
             foreach ($products as $productData) {
                 $lastProductId = $productData['entity_id'];
 
-                if (!$this->isProductVisible($productData['entity_id'], $productsAttributes) ||
-                    !$this->isProductEnabled($productData['entity_id'], $productsAttributes)
-                ) {
-                    continue;
-                }
-
                 $productIndex = [$productData['entity_id'] => $productsAttributes[$productData['entity_id']]];
                 if (isset($relatedProducts[$productData['entity_id']])) {
                     $childProductsIndex = $this->getChildProductsIndex(
@@ -388,8 +396,8 @@ public function rebuildStoreIndex($storeId, $productIds = null)
                 yield $productData['entity_id'] => $index;
             }
             $products = $this->dataProvider
-                ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId);
-        };
+                ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId, $this->batchSize);
+        }
     }
 
     /**
@@ -412,25 +420,6 @@ private function getRelatedProducts($products)
         return array_filter($relatedProducts);
     }
 
-    /**
-     * Performs check that product is visible on Store Front
-     *
-     * Check that product is visible on Store Front using visibility attribute
-     * and allowed visibility values.
-     *
-     * @param int $productId
-     * @param array $productsAttributes
-     * @return bool
-     */
-    private function isProductVisible($productId, array $productsAttributes)
-    {
-        $visibility = $this->dataProvider->getSearchableAttribute('visibility');
-        $allowedVisibility = $this->engine->getAllowedVisibility();
-        return isset($productsAttributes[$productId]) &&
-            isset($productsAttributes[$productId][$visibility->getId()]) &&
-            in_array($productsAttributes[$productId][$visibility->getId()], $allowedVisibility);
-    }
-
     /**
      * Performs check that product is enabled on Store Front
      *
@@ -445,8 +434,7 @@ private function isProductEnabled($productId, array $productsAttributes)
     {
         $status = $this->dataProvider->getSearchableAttribute('status');
         $allowedStatuses = $this->catalogProductStatus->getVisibleStatusIds();
-        return isset($productsAttributes[$productId]) &&
-            isset($productsAttributes[$productId][$status->getId()]) &&
+        return isset($productsAttributes[$productId][$status->getId()]) &&
             in_array($productsAttributes[$productId][$status->getId()], $allowedStatuses);
     }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
index abd65c71cad62..a2c39deff1892 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
@@ -14,6 +14,9 @@
  * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full
  * @api
  * @since 100.0.3
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class IndexIterator implements \Iterator
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/Category.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/Category.php
new file mode 100644
index 0000000000000..ed841996ea07b
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/Category.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Model\Plugin;
+
+use Magento\Catalog\Model\ResourceModel\Category as Resource;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+
+/**
+ * Perform indexer invalidation after a category delete.
+ */
+class Category
+{
+    /**
+     * @var Processor
+     */
+    private $fulltextIndexerProcessor;
+
+    /**
+     * @param Processor $fulltextIndexerProcessor
+     */
+    public function __construct(Processor $fulltextIndexerProcessor)
+    {
+        $this->fulltextIndexerProcessor = $fulltextIndexerProcessor;
+    }
+
+    /**
+     * Mark fulltext indexer as invalid post-deletion of category.
+     *
+     * @param Resource $subjectCategory
+     * @param Resource $resultCategory
+     * @return Resource
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(Resource $subjectCategory, Resource $resultCategory) : Resource
+    {
+        $this->fulltextIndexerProcessor->markIndexerAsInvalid();
+
+        return $resultCategory;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
index 83ad7acca84dc..86dccf8cfe559 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
@@ -7,6 +7,9 @@
 
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 
+/**
+ * Catalog search indexer plugin for catalog attribute.
+ */
 class Attribute extends AbstractPlugin
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
index e9c0e06ac38a0..1218e3da9a783 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
@@ -10,8 +10,7 @@
 use Magento\Framework\Model\AbstractModel;
 
 /**
- * Class Category
- * @package Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin
+ * Catalog search indexer plugin for catalog category.
  */
 class Category extends AbstractPlugin
 {
@@ -30,6 +29,8 @@ public function aroundSave(ResourceCategory $resourceCategory, \Closure $proceed
     }
 
     /**
+     * Reindex catalog search.
+     *
      * @param ResourceCategory $resourceCategory
      * @param \Closure $proceed
      * @param AbstractModel $category
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
index 949033bb338e0..e250d1123937a 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
@@ -9,15 +9,19 @@
 use Magento\Catalog\Model\ResourceModel\Product as ResourceProduct;
 use Magento\Framework\Model\AbstractModel;
 
+/**
+ * Catalog search indexer plugin for catalog product.
+ */
 class Product extends AbstractPlugin
 {
     /**
-     * Reindex on product save
+     * Reindex on product save.
      *
      * @param ResourceProduct $productResource
      * @param \Closure $proceed
      * @param AbstractModel $product
      * @return ResourceProduct
+     * @throws \Exception
      */
     public function aroundSave(ResourceProduct $productResource, \Closure $proceed, AbstractModel $product)
     {
@@ -31,6 +35,7 @@ public function aroundSave(ResourceProduct $productResource, \Closure $proceed,
      * @param \Closure $proceed
      * @param AbstractModel $product
      * @return ResourceProduct
+     * @throws \Exception
      */
     public function aroundDelete(ResourceProduct $productResource, \Closure $proceed, AbstractModel $product)
     {
@@ -38,6 +43,8 @@ public function aroundDelete(ResourceProduct $productResource, \Closure $proceed
     }
 
     /**
+     * Reindex catalog search.
+     *
      * @param ResourceProduct $productResource
      * @param \Closure $proceed
      * @param AbstractModel $product
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
index e971f59cf10f2..23ab52012f2e5 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Catalog search indexer plugin for store.
+ */
 class Store implements ObserverInterface
 {
     /**
@@ -44,6 +47,8 @@ public function __construct(
     }
 
     /**
+     * Reindex catalog search.
+     *
      * @param \Magento\Store\Model\Store $store
      * @return void
      */
@@ -59,6 +64,8 @@ private function clearIndex(\Magento\Store\Model\Store $store)
     }
 
     /**
+     * Reindex catalog search on store modification.
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
index c46f062c1e6d8..0d226acdc3d7b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 
 /**
+ * Catalog search index structure.
+ *
  * @api
  * @since 100.0.2
  */
@@ -43,9 +45,7 @@ public function __construct(
     }
 
     /**
-     * @param string $index
-     * @param Dimension[] $dimensions
-     * @return void
+     * @inheritdoc
      */
     public function delete($index, array $dimensions = [])
     {
@@ -56,11 +56,7 @@ public function delete($index, array $dimensions = [])
     }
 
     /**
-     * @param string $index
-     * @param array $fields
-     * @param array $dimensions
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @return void
+     * @inheritdoc
      */
     public function create($index, array $fields, array $dimensions = [])
     {
@@ -68,6 +64,8 @@ public function create($index, array $fields, array $dimensions = [])
     }
 
     /**
+     * Create fulltext index table.
+     *
      * @param string $tableName
      * @throws \Zend_Db_Exception
      * @return void
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
index c3c979433b273..d54d6c939cccc 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
+ * Index structure factory
+ *
  * @api
  * @since 100.1.0
  */
@@ -31,37 +32,26 @@ class IndexStructureFactory
      * @since 100.1.0
      */
     protected $structures = null;
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
-     * Configuration path by which current indexer handler stored
-     *
-     * @var string
+     * @var EngineResolverInterface
      */
-    private $configPath;
+    private $engineResolver;
 
     /**
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $structures
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
+        EngineResolverInterface $engineResolver,
         array $structures = []
     ) {
         $this->objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
-        $this->configPath = $configPath;
         $this->structures = $structures;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -73,7 +63,7 @@ public function __construct(
      */
     public function create(array $data = [])
     {
-        $currentStructure = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        $currentStructure = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->structures[$currentStructure])) {
             throw new \LogicException(
                 'There is no such index structure: ' . $currentStructure
@@ -83,7 +73,7 @@ public function create(array $data = [])
 
         if (!$indexStructure instanceof IndexStructureInterface) {
             throw new \InvalidArgumentException(
-                $indexStructure . ' doesn\'t implement \Magento\Framework\Indexer\IndexStructureInterface'
+                $currentStructure . ' index structure doesn\'t implement '. IndexStructureInterface::class
             );
         }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
index 0fb8af5144562..c62d2a033565f 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Indexer\IndexStructureInterface;
 
+/**
+ * Catalog search index structure proxy.
+ */
 class IndexStructureProxy implements IndexStructureInterface
 {
     /**
@@ -29,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(
         $index,
@@ -39,7 +42,7 @@ public function delete(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function create(
         $index,
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
index bdb663a0b616d..f45ef11a86389 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
@@ -6,7 +6,8 @@
 namespace Magento\CatalogSearch\Model\Indexer;
 
 /**
- * Provides a functionality to replace main index with its temporary representation
+ * Provides a functionality to replace main index with its temporary representation.
+ *
  * @api
  * @since 100.2.0
  */
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
index 47357e8023bb3..e4a20cc188fbd 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
@@ -6,9 +6,8 @@
 
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * Proxy for adapter-specific index switcher
@@ -30,49 +29,39 @@ class IndexSwitcherProxy implements IndexSwitcherInterface
     private $handlers;
 
     /**
-     * @var ScopeConfigInterface
+     * @var EngineResolverInterface
      */
-    private $scopeConfig;
-
-    /**
-     * Configuration path by which current indexer handler stored
-     *
-     * @var string
-     */
-    private $configPath;
+    private $engineResolver;
 
     /**
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $handlers
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
+        EngineResolverInterface $engineResolver,
         array $handlers = []
     ) {
         $this->objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
-        $this->configPath = $configPath;
         $this->handlers = $handlers;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      *
      * As index switcher is an optional part of the search SPI, it may be not defined by a search engine.
-     * It is especially reasonable for search engines with pre-defined indexes declaration (like old SOLR and Sphinx)
+     * It is especially reasonable for search engines with pre-defined indexes declaration (like Sphinx)
      * which cannot create temporary indexes on the fly.
      * That's the reason why this method do nothing for the case
      * when switcher is not defined for a specific search engine.
      */
     public function switchIndex(array $dimensions)
     {
-        $currentHandler = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        $currentHandler = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->handlers[$currentHandler])) {
             return;
         }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
index ea5bb8be17c74..9f105bd3ea462 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
@@ -14,8 +14,12 @@
 use Magento\Framework\Indexer\SaveHandler\Batch;
 
 /**
+ * Catalog search indexer handler.
+ *
  * @api
  * @since 100.0.2
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class IndexerHandler implements IndexerInterface
 {
@@ -75,7 +79,7 @@ public function __construct(
         Batch $batch,
         IndexScopeResolverInterface $indexScopeResolver,
         array $data,
-        $batchSize = 100
+        $batchSize = 500
     ) {
         $this->indexScopeResolver = $indexScopeResolver;
         $this->indexStructure = $indexStructure;
@@ -90,7 +94,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function saveIndex($dimensions, \Traversable $documents)
     {
@@ -100,7 +104,7 @@ public function saveIndex($dimensions, \Traversable $documents)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteIndex($dimensions, \Traversable $documents)
     {
@@ -111,7 +115,7 @@ public function deleteIndex($dimensions, \Traversable $documents)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function cleanIndex($dimensions)
     {
@@ -120,14 +124,20 @@ public function cleanIndex($dimensions)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function isAvailable()
+    public function isAvailable($dimensions = [])
     {
-        return true;
+        if (empty($dimensions)) {
+            return true;
+        }
+
+        return $this->resource->getConnection()->isTableExists($this->getTableName($dimensions));
     }
 
     /**
+     * Returns table name.
+     *
      * @param Dimension[] $dimensions
      * @return string
      */
@@ -137,6 +147,8 @@ private function getTableName($dimensions)
     }
 
     /**
+     * Returns index name.
+     *
      * @return string
      */
     private function getIndexName()
@@ -145,6 +157,8 @@ private function getIndexName()
     }
 
     /**
+     * Add documents to storage.
+     *
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
@@ -163,6 +177,8 @@ private function insertDocuments(array $documents, array $dimensions)
     }
 
     /**
+     * Searchable filter preparation.
+     *
      * @param array $documents
      * @return array
      */
@@ -183,6 +199,8 @@ private function prepareSearchableFields(array $documents)
     }
 
     /**
+     * Prepare fields.
+     *
      * @return void
      */
     private function prepareFields()
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
index 9b0a37bbc7152..841ee8708f264 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
+ * Indexer handler factory.
+ *
  * @api
  * @since 100.0.2
  */
@@ -31,35 +32,25 @@ class IndexerHandlerFactory
     protected $handlers = null;
 
     /**
-     * @var ScopeConfigInterface
+     * @var EngineResolverInterface
      */
-    private $scopeConfig;
-
-    /**
-     * Configuration path by which current indexer handler stored
-     *
-     * @var string
-     */
-    private $configPath;
+    private $engineResolver;
 
     /**
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $handlers
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
+        EngineResolverInterface $engineResolver,
         array $handlers = []
     ) {
         $this->_objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
-        $this->configPath = $configPath;
         $this->handlers = $handlers;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -70,7 +61,7 @@ public function __construct(
      */
     public function create(array $data = [])
     {
-        $currentHandler = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        $currentHandler = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->handlers[$currentHandler])) {
             throw new \LogicException(
                 'There is no such indexer handler: ' . $currentHandler
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
index 47a8681a73c60..b6639f760457b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Mview\ActionInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
 
+/**
+ * Catalog search materialized view index action.
+ */
 class Action implements ActionInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
index 343dc50d604bc..6db063bde7d1e 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
@@ -13,6 +13,8 @@
 /**
  * @api
  * @since 100.0.2
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class ProductFieldset implements \Magento\Framework\Indexer\FieldsetInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php
index 86649cd1093d2..ed2b1be5c7035 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexSwitcher.php
@@ -11,6 +11,9 @@
 
 /**
  * Provides a functionality to replace main index with its temporary representation
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class IndexSwitcher implements IndexSwitcherInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
index a386b74084af3..b01f3c50d5002 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
@@ -14,6 +14,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class IndexTableNotExistException extends LocalizedException
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
index 9166ddbef60da..fcecb36e7d508 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
@@ -9,8 +9,7 @@
 use Magento\Framework\Search\Request\Dimension;
 
 /**
- * Implementation of IndexScopeResolverInterface which resolves index scope dynamically
- * depending on current scope state
+ * Implementation of IndexScopeResolverInterface which resolves index scope dynamically depending on current scope state
  */
 class ScopeProxy implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
 {
@@ -64,9 +63,7 @@ private function create($state)
     }
 
     /**
-     * @param string $index
-     * @param Dimension[] $dimensions
-     * @return string
+     * @inheritdoc
      */
     public function resolve($index, array $dimensions)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
index 5f9a3e305995a..a12ae8e69c310 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
@@ -31,6 +31,7 @@ class State
 
     /**
      * Set the state to use temporary Index
+     *
      * @return void
      */
     public function useTemporaryIndex()
@@ -40,6 +41,7 @@ public function useTemporaryIndex()
 
     /**
      * Set the state to use regular Index
+     *
      * @return void
      */
     public function useRegularIndex()
@@ -48,6 +50,8 @@ public function useRegularIndex()
     }
 
     /**
+     * Get state.
+     *
      * @return string
      */
     public function getState()
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
index c52a0a0586659..796559d1f7034 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
@@ -11,6 +11,9 @@
 
 /**
  * Resolves name of a temporary table for indexation
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TemporaryResolver implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
index b44a2d220545c..8722cd52b618a 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
@@ -13,6 +13,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class UnknownStateException extends LocalizedException
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
index 4ce286bf15922..c24665f4808d2 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
+/**
+ * Catalog search category layer collection provider.
+ */
 class ItemCollectionProvider implements ItemCollectionProviderInterface
 {
     /**
@@ -25,8 +28,7 @@ public function __construct(CollectionFactory $collectionFactory)
     }
 
     /**
-     * @param \Magento\Catalog\Model\Category $category
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @inheritdoc
      */
     public function getCollection(\Magento\Catalog\Model\Category $category)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
index 7c15514f211d2..0998cf7a9b3ac 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -24,14 +24,16 @@ class Category extends AbstractFilter
     private $dataProvider;
 
     /**
+     * Category constructor.
+     *
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
-     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Framework\Escaper $escaper
-     * @param CategoryManagerFactory $categoryManager
+     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\CategoryFactory $categoryDataProviderFactory
      * @param array $data
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 108f1b9f4fd8d..a19f53469ae01 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -86,6 +86,8 @@ public function __construct(
     }
 
     /**
+     * Get resource model.
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
      */
     public function getResource()
@@ -223,6 +225,8 @@ protected function _getItemsData()
     }
 
     /**
+     * Get 'to' part of the filter.
+     *
      * @param float $from
      * @return float
      */
@@ -237,6 +241,8 @@ protected function getTo($from)
     }
 
     /**
+     * Get 'from' part of the filter.
+     *
      * @param float $from
      * @return float
      */
@@ -251,6 +257,8 @@ protected function getFrom($from)
     }
 
     /**
+     * Prepare filter data.
+     *
      * @param string $key
      * @param int $count
      * @return array
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
index 4ffd8ff4ba5ea..eb901498c4ea5 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\Category;
 use Magento\Search\Model\QueryFactory;
 
+/**
+ * Catalog search plugin for search collection filter in layered navigation.
+ */
 class CollectionFilter
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
index 4f14b7daba1d5..98caccea2ae49 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
@@ -9,6 +9,9 @@
 
 use Magento\Catalog\Model\Layer\StateKeyInterface;
 
+/**
+ * Catalog search state key for layered navigation.
+ */
 class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements StateKeyInterface
 {
     /**
@@ -31,8 +34,7 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Catalog\Model\Category $category
-     * @return string|void
+     * @inheritdoc
      */
     public function toString($category)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Price/Interval.php b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
index db1d550c3724b..ea2d24aeadfd1 100644
--- a/app/code/Magento/CatalogSearch/Model/Price/Interval.php
+++ b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Search\Dynamic\IntervalInterface;
 
+/**
+ * Catalog search price interval.
+ */
 class Interval implements IntervalInterface
 {
     /**
@@ -23,7 +26,7 @@ public function __construct(\Magento\Catalog\Model\ResourceModel\Layer\Filter\Pr
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function load($limit, $offset = null, $lower = null, $upper = null)
     {
@@ -32,7 +35,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function loadPrevious($data, $index, $lower = null)
     {
@@ -41,7 +44,7 @@ public function loadPrevious($data, $index, $lower = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function loadNext($data, $rightIndex, $upper = null)
     {
@@ -50,6 +53,8 @@ public function loadNext($data, $rightIndex, $upper = null)
     }
 
     /**
+     * Convert to float values.
+     *
      * @param array $prices
      * @return array
      */
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
index 8a5a6372bb22f..05254a50aadc6 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
@@ -8,7 +8,6 @@
 /**
  * Advanced Catalog Search resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 02bc3e2bc2400..b4b15554f6029 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -17,9 +17,10 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 
 /**
- * Collection Advanced
+ * Advanced search collection
+ *
+ * This collection should be refactored to not have dependencies on MySQL-specific implementation.
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
@@ -39,6 +40,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
+     * @deprecated There must be no dependencies on specific adapter in generic search implementation
      */
     private $temporaryStorageFactory;
 
@@ -187,7 +189,7 @@ protected function _renderFiltersBefore()
             } catch (NonExistingRequestNameException $e) {
                 $this->_logger->error($e->getMessage());
                 throw new LocalizedException(
-                    __('Sorry, something went wrong. You can find out more in the error log.')
+                    __('An error occurred. For details, see the error log.')
                 );
             }
             $temporaryStorage = $this->temporaryStorageFactory->create();
@@ -205,6 +207,8 @@ protected function _renderFiltersBefore()
     }
 
     /**
+     * Get attribute code.
+     *
      * @param string $attributeCode
      * @return string
      */
@@ -264,6 +268,8 @@ private function addRangeAttributeToSearch($attributeCode, $attributeValue)
     }
 
     /**
+     * Get search.
+     *
      * @return \Magento\Search\Api\SearchInterface
      */
     private function getSearch()
@@ -276,6 +282,8 @@ private function getSearch()
     }
 
     /**
+     * Get search criteria builder.
+     *
      * @return SearchCriteriaBuilder
      */
     private function getSearchCriteriaBuilder()
@@ -288,6 +296,8 @@ private function getSearchCriteriaBuilder()
     }
 
     /**
+     * Get fielter builder.
+     *
      * @return FilterBuilder
      */
     private function getFilterBuilder()
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
index 4212912af9930..49caede8c4ac2 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -7,6 +7,9 @@
 
 /**
  * CatalogSearch Fulltext Index Engine resource model
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class Engine implements EngineInterface
 {
@@ -70,6 +73,13 @@ public function allowAdvancedIndex()
         return true;
     }
 
+    /**
+     * Is attribute filterable as term cache
+     *
+     * @var array
+     */
+    private $termFilterableAttributeAttributeCache = [];
+
     /**
      * Is Attribute Filterable as Term
      *
@@ -78,10 +88,16 @@ public function allowAdvancedIndex()
      */
     private function isTermFilterableAttribute($attribute)
     {
-        return ($attribute->getIsVisibleInAdvancedSearch()
-            || $attribute->getIsFilterable()
-            || $attribute->getIsFilterableInSearch())
-        && in_array($attribute->getFrontendInput(), ['select', 'multiselect']);
+        $attributeId = $attribute->getAttributeId();
+        if (!isset($this->termFilterableAttributeAttributeCache[$attributeId])) {
+            $this->termFilterableAttributeAttributeCache[$attributeId] =
+                in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true)
+                && ($attribute->getIsVisibleInAdvancedSearch()
+                    || $attribute->getIsFilterable()
+                    || $attribute->getIsFilterableInSearch());
+        }
+
+        return $this->termFilterableAttributeAttributeCache[$attributeId];
     }
 
     /**
@@ -107,7 +123,7 @@ public function processAttributeValue($attribute, $value)
      *
      * @param array $index
      * @param string $separator
-     * @return string
+     * @return array
      */
     public function prepareEntityIndex($index, $separator = ' ')
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
index df1f9c89791f6..4b9db55105ea9 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
@@ -3,13 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-/**
- * CatalogSearch Index Engine Interface
- */
 namespace Magento\CatalogSearch\Model\ResourceModel;
 
 /**
+ * CatalogSearch Index Engine Interface
+ *
  * @api
  * @since 100.0.2
  */
@@ -19,11 +17,17 @@ interface EngineInterface
 
     /**
      * Scope identifier
+     *
+     * @deprecated since using engine resolver
+     * @see \Magento\Framework\Search\EngineResolverInterface
      */
     const SCOPE_IDENTIFIER = 'scope';
 
     /**
      * Configuration path by which current indexer handler stored
+     *
+     * @deprecated since using engine resolver
+     * @see \Magento\Framework\Search\EngineResolverInterface
      */
     const CONFIG_ENGINE_PATH = 'catalog/search/engine';
 
@@ -55,7 +59,7 @@ public function processAttributeValue($attribute, $value);
      *
      * @param array $index
      * @param string $separator
-     * @return string
+     * @return array
      */
     public function prepareEntityIndex($index, $separator = ' ');
 }
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
index 6b0ac40ee9d22..d1259159606d3 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
@@ -4,28 +4,32 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog Search engine provider
- */
 namespace Magento\CatalogSearch\Model\ResourceModel;
 
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
+ * Catalog Search engine provider
+ *
  * @api
  * @since 100.0.2
  */
 class EngineProvider
 {
+    /**
+     * @deprecated since using engine resolver
+     * @see \Magento\Framework\Search\EngineResolverInterface
+     */
     const CONFIG_ENGINE_PATH = 'catalog/search/engine';
 
     /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\EngineInterface
+     * @var EngineInterface
      */
     protected $engine;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @deprecated since it is not used anymore
      */
     protected $scopeConfig;
 
@@ -42,18 +46,23 @@ class EngineProvider
     private $enginePool;
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $engines
+     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\ObjectManagerInterface $objectManager,
-        array $engines
+        array $engines,
+        EngineResolverInterface $engineResolver
     ) {
-        $this->scopeConfig = $scopeConfig;
         $this->objectManager = $objectManager;
         $this->enginePool = $engines;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -64,7 +73,7 @@ public function __construct(
     public function get()
     {
         if (!$this->engine) {
-            $currentEngine = $this->scopeConfig->getValue(self::CONFIG_ENGINE_PATH, ScopeInterface::SCOPE_STORE);
+            $currentEngine = $this->engineResolver->getCurrentSearchEngine();
             if (!isset($this->enginePool[$currentEngine])) {
                 throw new \LogicException(
                     'There is no such engine: ' . $currentEngine
@@ -73,12 +82,13 @@ public function get()
             $engineClassName = $this->enginePool[$currentEngine];
 
             $engine = $this->objectManager->create($engineClassName);
-            if (false === $engine instanceof \Magento\CatalogSearch\Model\ResourceModel\EngineInterface) {
+            if (false === $engine instanceof EngineInterface) {
                 throw new \LogicException(
-                    $engineClassName . ' doesn\'t implement \Magento\CatalogSearch\Model\ResourceModel\EngineInterface'
+                    $currentEngine . ' doesn\'t implement ' . EngineInterface::class
                 );
             }
 
+            /** @var $engine EngineInterface */
             if ($engine && !$engine->isAvailable()) {
                 throw new \LogicException(
                     'Engine is not available: ' . $currentEngine
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index 15349e91c3fe9..0835fb66f876a 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.
      *
@@ -82,17 +103,20 @@ public function getRelationsByChild($childIds)
     {
         $connection = $this->getConnection();
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-        $select = $connection->select()->from(
-            ['relation' => $this->getTable('catalog_product_relation')],
-            []
-        )->join(
-            ['cpe' => $this->getTable('catalog_product_entity')],
-            'cpe.' . $linkField . ' = relation.parent_id',
-            ['cpe.entity_id']
-        )->where(
-            'relation.child_id IN (?)',
-            $childIds
-        )->distinct(true);
+        $select = $connection
+            ->select()
+            ->from(
+                ['relation' => $this->getTable('catalog_product_relation')],
+                []
+            )->distinct(true)
+            ->join(
+                ['cpe' => $this->getTable('catalog_product_entity')],
+                'cpe.' . $linkField . ' = relation.parent_id',
+                ['cpe.entity_id']
+            )->where(
+                'relation.child_id IN (?)',
+                $childIds
+            );
 
         return $connection->fetchCol($select);
     }
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
index 379b21813860a..e6cfe8ca112f7 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -20,10 +20,12 @@
 
 /**
  * Fulltext Collection
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * This collection should be refactored to not have dependencies on MySQL-specific implementation.
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -70,6 +72,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
+     * @deprecated There must be no dependencies on specific adapter in generic search implementation
      */
     private $temporaryStorageFactory;
 
@@ -198,6 +201,8 @@ public function __construct(
     }
 
     /**
+     * Get search.
+     *
      * @deprecated 100.1.0
      * @return \Magento\Search\Api\SearchInterface
      */
@@ -210,6 +215,8 @@ private function getSearch()
     }
 
     /**
+     * Test search.
+     *
      * @deprecated 100.1.0
      * @param \Magento\Search\Api\SearchInterface $object
      * @return void
@@ -221,6 +228,8 @@ public function setSearch(\Magento\Search\Api\SearchInterface $object)
     }
 
     /**
+     * Set search criteria builder.
+     *
      * @deprecated 100.1.0
      * @return \Magento\Framework\Api\Search\SearchCriteriaBuilder
      */
@@ -234,6 +243,8 @@ private function getSearchCriteriaBuilder()
     }
 
     /**
+     * Set search criteria builder.
+     *
      * @deprecated 100.1.0
      * @param \Magento\Framework\Api\Search\SearchCriteriaBuilder $object
      * @return void
@@ -245,6 +256,8 @@ public function setSearchCriteriaBuilder(\Magento\Framework\Api\Search\SearchCri
     }
 
     /**
+     * Get filter builder.
+     *
      * @deprecated 100.1.0
      * @return \Magento\Framework\Api\FilterBuilder
      */
@@ -257,6 +270,8 @@ private function getFilterBuilder()
     }
 
     /**
+     * Set filter builder.
+     *
      * @deprecated 100.1.0
      * @param \Magento\Framework\Api\FilterBuilder $object
      * @return void
@@ -271,7 +286,7 @@ public function setFilterBuilder(\Magento\Framework\Api\FilterBuilder $object)
      * Apply attribute filter to facet collection
      *
      * @param string $field
-     * @param null $condition
+     * @param mixed|null $condition
      * @return $this
      */
     public function addFieldToFilter($field, $condition = null)
@@ -347,7 +362,7 @@ protected function _renderFiltersBefore()
             $this->searchResult = $this->searchResultFactory->create()->setItems([]);
         } catch (NonExistingRequestNameException $e) {
             $this->_logger->error($e->getMessage());
-            throw new LocalizedException(__('Sorry, something went wrong. You can find out more in the error log.'));
+            throw new LocalizedException(__('An error occurred. For details, see the error log.'));
         }
 
         $temporaryStorage = $this->temporaryStorageFactory->create();
@@ -366,18 +381,26 @@ protected function _renderFiltersBefore()
                 'search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
             );
         }
+        return parent::_renderFiltersBefore();
+    }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _beforeLoad()
+    {
         /*
          * This order is required to force search results be the same
          * for the same requests and products with the same relevance
          * NOTE: this does not replace existing orders but ADDs one more
          */
         $this->setOrder('entity_id');
-
-        return parent::_renderFiltersBefore();
+        return parent::_beforeLoad();
     }
 
     /**
+     * Render filters.
+     *
      * @return $this
      */
     protected function _renderFilters()
@@ -435,7 +458,7 @@ public function getFacetedData($field)
                     $result[$metrics['value']] = $metrics;
                 }
             } else {
-                throw new StateException(__('Bucket does not exist'));
+                throw new StateException(__("The bucket doesn't exist."));
             }
         }
         return $result;
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
index c6495015fee4e..2d8dfb9222497 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
@@ -8,8 +8,10 @@
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
 /**
- * Interface BaseSelectStrategyInterface
  * This interface represents strategy that will be used to create base select for search request
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface BaseSelectStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
index 65759685c2b62..e554d3c774a31 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
@@ -10,8 +10,10 @@
 use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
 
 /**
- * Class StrategyMapper
  * This class is responsible for deciding which BaseSelectStrategyInterface should be used for passed SelectContainer
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class StrategyMapper
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
index 4572336d761ed..31ac889b19e69 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
@@ -9,8 +9,6 @@
 
 /**
  * Search model for backend search
- *
- * @deprecated 100.2.0
  */
 class Catalog extends \Magento\Framework\DataObject
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
index 98bf1e5984a74..bcd4080b30b14 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
@@ -10,8 +10,10 @@
 use Magento\Catalog\Model\Product;
 
 /**
- * Class CustomAttributeFilterSelector
  * Checks if FilterInterface is by custom attribute
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class CustomAttributeFilterCheck
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
index fc93b86f5da5e..8c796f8770657 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
@@ -16,8 +16,10 @@
 use Magento\Catalog\Model\Product;
 
 /**
- * Class CustomAttributeFilter
- * Applies filters by custom attributes to base select
+ * Applies filters by custom attributes to base select.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class CustomAttributeFilter
 {
@@ -71,13 +73,13 @@ public function __construct(
      * Applies filters by custom attributes to base select
      *
      * @param Select $select
-     * @param FilterInterface[] ...$filters
+     * @param FilterInterface[] $filters
      * @return Select
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \InvalidArgumentException
      * @throws \DomainException
      */
-    public function apply(Select $select, FilterInterface ... $filters)
+    public function apply(Select $select, FilterInterface ...$filters)
     {
         $select = clone $select;
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
@@ -141,7 +143,6 @@ private function getJoinConditions($attrId, $mainTable, $joinTable)
     {
         return [
             sprintf('`%s`.`entity_id` = `%s`.`entity_id`', $mainTable, $joinTable),
-            sprintf('`%s`.`source_id` = `%s`.`source_id`', $mainTable, $joinTable),
             $this->conditionManager->generateCondition(
                 sprintf('%s.attribute_id', $joinTable),
                 '=',
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
index 67f427d4be471..3d2b9eed03761 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
@@ -16,6 +16,9 @@
 /**
  * Class DimensionsProcessor
  * Adds dimension conditions to select query
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class DimensionsProcessor
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
index dadce2ed0240c..c382569338e29 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
@@ -7,9 +7,24 @@
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Framework\App\Http\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Customer\Model\Context as CustomerContext;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 
 /**
  * Strategy which processes exclusions from general rules
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ExclusionStrategy implements FilterStrategyInterface
 {
@@ -34,19 +49,53 @@ class ExclusionStrategy implements FilterStrategyInterface
      */
     private $validFields = ['price', 'category_ids'];
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @var IndexScopeResolverInterface
+     */
+    private $priceTableResolver;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var Context
+     */
+    private $httpContext;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param AliasResolver $aliasResolver
+     * @param TableResolver|null $tableResolver
+     * @param DimensionFactory $dimensionFactory
+     * @param IndexScopeResolverInterface $priceTableResolver
+     * @param Context $httpContext
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        AliasResolver $aliasResolver
+        AliasResolver $aliasResolver,
+        TableResolver $tableResolver = null,
+        DimensionFactory $dimensionFactory = null,
+        IndexScopeResolverInterface $priceTableResolver = null,
+        Context $httpContext = null
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->storeManager = $storeManager;
         $this->aliasResolver = $aliasResolver;
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
+        $this->dimensionFactory = $dimensionFactory ?: ObjectManager::getInstance()->get(DimensionFactory::class);
+        $this->priceTableResolver = $priceTableResolver ?: ObjectManager::getInstance()->get(
+            IndexScopeResolverInterface::class
+        );
+        $this->httpContext = $httpContext ?: ObjectManager::getInstance()->get(Context::class);
     }
 
     /**
@@ -81,7 +130,17 @@ private function applyPriceFilter(
         \Magento\Framework\DB\Select $select
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
-        $tableName = $this->resourceConnection->getTableName('catalog_product_index_price');
+        $websiteId = $this->storeManager->getWebsite()->getId();
+        $tableName = $this->priceTableResolver->resolve(
+            'catalog_product_index_price',
+            [
+                $this->dimensionFactory->create(WebsiteDimensionProvider::DIMENSION_NAME, (string)$websiteId),
+                $this->dimensionFactory->create(
+                    CustomerGroupDimensionProvider::DIMENSION_NAME,
+                    (string)$this->httpContext->getValue(CustomerContext::CONTEXT_GROUP)
+                )
+            ]
+        );
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
 
         $select->joinInner(
@@ -90,7 +149,7 @@ private function applyPriceFilter(
             ],
             $this->resourceConnection->getConnection()->quoteInto(
                 sprintf('%s.entity_id = price_index.entity_id AND price_index.website_id = ?', $mainTableAlias),
-                $this->storeManager->getWebsite()->getId()
+                $websiteId
             ),
             []
         );
@@ -112,7 +171,18 @@ private function applyCategoryFilter(
         \Magento\Framework\DB\Select $select
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
-        $tableName = $this->resourceConnection->getTableName('catalog_category_product_index');
+
+        $catalogCategoryProductDimension = new Dimension(
+            \Magento\Store\Model\Store::ENTITY,
+            $this->storeManager->getStore()->getId()
+        );
+
+        $tableName = $this->tableResolver->resolve(
+            AbstractAction::MAIN_INDEX_TABLE,
+            [
+                $catalogCategoryProductDimension
+            ]
+        );
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
 
         $select->joinInner(
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
index 0c8233316338e..67ed66da2a036 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
@@ -13,7 +13,10 @@
 /**
  * FilterContext represents a Context of the Strategy pattern
  * Its responsibility is to choose appropriate strategy to apply passed filter to the Select
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class FilterContext implements FilterStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
index 27128327554d2..7136fad5b19a9 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
@@ -13,6 +13,9 @@
 /**
  * Class FilterMapper
  * This class applies filters to Select based on SelectContainer configuration
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class FilterMapper
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php
index b59f7eeec9773..a61c691c0d5cd 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterStrategyInterface.php
@@ -10,6 +10,8 @@
  * FilterStrategyInterface provides the interface to work with strategies
  * @api
  * @since 100.1.6
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface FilterStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php
index 8544b463dbb17..3986cc617f06d 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StaticAttributeStrategy.php
@@ -12,6 +12,9 @@
 
 /**
  * This strategy handles static attributes
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class StaticAttributeStrategy implements FilterStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
index 1cd9d1a3dd771..0e3ba0d4e669f 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
@@ -15,6 +15,9 @@
 /**
  * Class StockStatusFilter
  * Adds filter by stock status to base select
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class StockStatusFilter
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
index 9bd26d799fd5d..9d7e31ee3b6d1 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
@@ -7,16 +7,17 @@
 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:
  *   - The filter for dropdown or multi-select attribute
  *   - The filter is Term filter
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TermDropdownStrategy implements FilterStrategyInterface
 {
@@ -25,46 +26,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 +69,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 +83,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 0000000000000..c28bc3485cf49
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php
@@ -0,0 +1,59 @@
+<?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;
+use Magento\CatalogInventory\Model\Stock\Status;
+
+/**
+ * Apply stock condition to select.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+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 AND %2$s.stock_status = %3$d',
+                $alias,
+                $stockAlias,
+                Status::STATUS_IN_STOCK
+            ),
+            []
+        );
+    }
+}
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 0000000000000..007647db39b32
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php
@@ -0,0 +1,102 @@
+<?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.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+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/Model/Search/FilterMapper/VisibilityFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
index a615d76bef4d2..690ef9115edfe 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
@@ -16,6 +16,9 @@
 /**
  * Class VisibilityFilter
  * Applies filter by visibility to base select
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class VisibilityFilter
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php b/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
index 53c27eb66f6ae..55c8582979912 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
@@ -12,6 +12,9 @@
 /**
  * Class FiltersExtractor
  * Extracts filters from QueryInterface
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class FiltersExtractor
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
index 890a0d4000140..906220db28dc1 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -26,6 +26,8 @@
 /**
  * Build base Query for Index
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class IndexBuilder implements IndexBuilderInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
index f6c2ac0a4f55a..a47ea54375205 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
@@ -12,6 +12,9 @@
 
 /**
  * Class is responsible for checking if fulltext search is required for search query
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class FullTextSearchCheck
 {
@@ -22,7 +25,7 @@ class FullTextSearchCheck
      * to join catalog_eav_attribute table to search query or not
      *
      * In case when the $query does not requires full text search
-     * - we can skipp joining catalog_eav_attribute table because it becomes excessive
+     * - we can skip joining catalog_eav_attribute table because it becomes excessive
      *
      * @param QueryInterface $query
      * @return bool
@@ -34,6 +37,8 @@ public function isRequiredForQuery(QueryInterface $query)
     }
 
     /**
+     * Process query
+     *
      * @param QueryInterface $query
      * @return bool
      * @throws \InvalidArgumentException
@@ -59,6 +64,8 @@ private function processQuery(QueryInterface $query)
     }
 
     /**
+     * Process boolean query
+     *
      * @param BoolExpression $query
      * @return bool
      * @throws \InvalidArgumentException
@@ -87,6 +94,8 @@ private function processBoolQuery(BoolExpression $query)
     }
 
     /**
+     * Process filter query
+     *
      * @param Filter $query
      * @return bool
      * @throws \InvalidArgumentException
diff --git a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
index 8ddc8408959e3..916e03f471493 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\CatalogSearch\Model\Search;
 
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class ReaderPlugin
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index 6f6a5eed642e7..0adc2fcecbfa7 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -14,6 +14,8 @@
 use Magento\Framework\Search\Request\QueryInterface;
 
 /**
+ * Catalog search request generator.
+ *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
index 3fb3021ff9db4..b3d39a48fe9fc 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
@@ -10,10 +10,13 @@
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\FilterInterface;
 
+/**
+ * Catalog search range request generator.
+ */
 class Decimal implements GeneratorInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFilterData(Attribute $attribute, $filterName)
     {
@@ -27,7 +30,7 @@ public function getFilterData(Attribute $attribute, $filterName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAggregationData(Attribute $attribute, $bucketName)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
index f2965bb9f9818..63b09de7f08d8 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
@@ -10,10 +10,13 @@
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\FilterInterface;
 
+/**
+ * Catalog search request generator.
+ */
 class General implements GeneratorInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFilterData(Attribute $attribute, $filterName)
     {
@@ -26,7 +29,7 @@ public function getFilterData(Attribute $attribute, $filterName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAggregationData(Attribute $attribute, $bucketName)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
index a7379eaa0bd29..22f829063fbe7 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
@@ -9,13 +9,16 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 
 /**
+ * Catalog search reguest generator interface.
+ *
  * @api
  * @since 100.1.6
  */
 interface GeneratorInterface
 {
     /**
-     * Get filter data for specific attribute
+     * Get filter data for specific attribute.
+     *
      * @param Attribute $attribute
      * @param string $filterName
      * @return array
@@ -24,7 +27,8 @@ interface GeneratorInterface
     public function getFilterData(Attribute $attribute, $filterName);
 
     /**
-     * Get aggregation data for specific attribute
+     * Get aggregation data for specific attribute.
+     *
      * @param Attribute $attribute
      * @param string $bucketName
      * @return array
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
index d2841e5cdf321..68ca546b81919 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
@@ -9,6 +9,8 @@
 /**
  * @api
  * @since 100.1.6
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class GeneratorResolver
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
index 5305ed276bf38..f0eade4bfbcf5 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
@@ -10,8 +10,10 @@
 use Magento\Framework\Search\Request\FilterInterface;
 
 /**
- * Class SelectContainer
  * This class is a container for all data that is required for creating select query by search request
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class SelectContainer
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
index a18ef8e91d7f7..d5b7be8bf0106 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
@@ -18,6 +18,8 @@
  * Class SelectContainerBuilder
  * Class is responsible for SelectContainer creation and filling it with all required data
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class SelectContainerBuilder
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php b/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
index eab79c22309f0..6b18c4307f515 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/TableMapper.php
@@ -25,6 +25,8 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TableMapper
 {
diff --git a/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php b/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php
new file mode 100644
index 0000000000000..956a1b2360f89
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Plugin;
+
+/**
+ * Enable Product EAV indexer in configuration for MySQL search engine
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+class EnableEavIndexer
+{
+    /**
+     * Config search engine path
+     */
+    const SEARCH_ENGINE_VALUE_PATH = 'groups/search/fields/engine/value';
+
+    /**
+     * @param \Magento\Config\Model\Config $subject
+     */
+    public function beforeSave(\Magento\Config\Model\Config $subject)
+    {
+        $searchEngine = $subject->getData(self::SEARCH_ENGINE_VALUE_PATH);
+        if ($searchEngine === 'mysql') {
+            $data = $subject->getData();
+            $data['groups']['search']['fields']['enable_eav_indexer']['value'] = 1;
+
+            $subject->setData($data);
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Setup/InstallData.php b/app/code/Magento/CatalogSearch/Setup/InstallData.php
deleted file mode 100644
index 89ac6f91270a4..0000000000000
--- a/app/code/Magento/CatalogSearch/Setup/InstallData.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\CatalogSearch\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Indexer\IndexerInterfaceFactory;
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-
-class InstallData implements InstallDataInterface
-{
-    /**
-     * @var IndexerInterfaceFactory
-     */
-    private $indexerFactory;
-
-    /**
-     * @param IndexerInterfaceFactory $indexerFactory
-     * @param ProductAttributeRepositoryInterface $attributeRepository
-     */
-    public function __construct(
-        IndexerInterfaceFactory $indexerFactory,
-        ProductAttributeRepositoryInterface $attributeRepository
-    ) {
-        $this->indexerFactory = $indexerFactory;
-        $this->attributeRepository = $attributeRepository;
-    }
-
-    /**
-     * Installs data for a module
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $this->setWeight('sku', 6);
-        $this->setWeight('name', 5);
-        $this->getIndexer('catalogsearch_fulltext')->reindexAll();
-    }
-
-    /**
-     * @param string $indexerId
-     * @return \Magento\Framework\Indexer\IndexerInterface
-     */
-    private function getIndexer($indexerId)
-    {
-        return $this->indexerFactory->create()->load($indexerId);
-    }
-
-    /**
-     * @param string $attributeCode
-     * @param int $weight
-     * @return void
-     */
-    private function setWeight($attributeCode, $weight)
-    {
-        $attribute = $this->attributeRepository->get($attributeCode);
-        $attribute->setSearchWeight($weight);
-        $this->attributeRepository->save($attribute);
-    }
-}
diff --git a/app/code/Magento/CatalogSearch/Setup/InstallSchema.php b/app/code/Magento/CatalogSearch/Setup/InstallSchema.php
deleted file mode 100644
index 4953e72fa8124..0000000000000
--- a/app/code/Magento/CatalogSearch/Setup/InstallSchema.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogSearch\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-        $installer->getConnection()->addColumn(
-            $installer->getTable('catalog_eav_attribute'),
-            'search_weight',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '1',
-                'comment' => 'Search Weight'
-            ]
-        );
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
new file mode 100644
index 0000000000000..d3c5aa5aaa6f5
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Setup\Patch\Data;
+
+/**
+ * Implementation of the notification about MySQL search being deprecated.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+class MySQLSearchDeprecationNotification implements \Magento\Framework\Setup\Patch\DataPatchInterface
+{
+    /**
+     * @var \Magento\Framework\Search\EngineResolverInterface
+     */
+    private $searchEngineResolver;
+
+    /**
+     * @var \Magento\Framework\Notification\NotifierInterface
+     */
+    private $notifier;
+
+    public function __construct(
+        \Magento\Framework\Search\EngineResolverInterface $searchEngineResolver,
+        \Magento\Framework\Notification\NotifierInterface $notifier
+    ) {
+        $this->searchEngineResolver = $searchEngineResolver;
+        $this->notifier = $notifier;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        if ($this->searchEngineResolver->getCurrentSearchEngine() === 'mysql') {
+            $message = <<<MESSAGE
+Catalog Search is currently configured to use the MySQL engine, which has been deprecated. Consider migrating to one of
+the Elasticsearch engines now to ensure there are no service interruptions during your next upgrade.
+MESSAGE;
+
+            $this->notifier->addNotice(__('Deprecation Notice'), __($message));
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
new file mode 100644
index 0000000000000..7f6dbe033e3a5
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Setup\Patch\Data;
+
+use Magento\Framework\App\State;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+class SetInitialSearchWeightForAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var IndexerInterfaceFactory
+     */
+    private $indexerFactory;
+
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * SetInitialSearchWeightForAttributes constructor.
+     * @param IndexerInterfaceFactory $indexerFactory
+     * @param ProductAttributeRepositoryInterface $attributeRepository
+     * @param State $state
+     */
+    public function __construct(
+        IndexerInterfaceFactory $indexerFactory,
+        ProductAttributeRepositoryInterface $attributeRepository,
+        State $state
+    ) {
+        $this->indexerFactory = $indexerFactory;
+        $this->attributeRepository = $attributeRepository;
+        $this->state = $state;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->setWeight('sku', 6);
+        $this->setWeight('name', 5);
+        $indexer = $this->indexerFactory->create()->load('catalogsearch_fulltext');
+        $this->state->emulateAreaCode(
+            \Magento\Framework\App\Area::AREA_CRONTAB,
+            function () use ($indexer) {
+                $indexer->reindexAll();
+            }
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Set attribute search weight.
+     *
+     * @param string $attributeCode
+     * @param int $weight
+     * @return void
+     */
+    private function setWeight($attributeCode, $weight)
+    {
+        $attribute = $this->attributeRepository->get($attributeCode);
+        $attribute->setSearchWeight($weight);
+        $this->attributeRepository->save($attribute);
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
new file mode 100644
index 0000000000000..387a7547f4daf
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Quick search the phrase and check if the result page contains correct information -->
+    <actionGroup name="StorefrontCheckQuickSearchActionGroup">
+        <arguments>
+            <argument name="phrase"/>
+        </arguments>
+        <submitForm selector="#search_mini_form" parameterArray="['q' => '{{phrase}}']" stepKey="fillQuickSearch" />
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
+        <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
+        <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
+        <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
+    </actionGroup>
+
+    <!-- Open advanced search page -->
+    <actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
+        <click selector="{{StorefrontFooterSection.AdvancedSearch}}" stepKey="clickAdvancedSearchLink" />
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchAdvancedFormPage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Advanced Search" stepKey="assertAdvancedSearchTitle1"/>
+        <see userInput="Advanced Search" selector="{{StorefrontCatalogSearchAdvancedFormSection.SearchTitle}}" stepKey="assertAdvancedSearchTitle2"/>
+    </actionGroup>
+
+    <!-- Check that Advanced Search result page contains correct information -->
+    <actionGroup name="StorefrontCheckAdvancedSearchResultActionGroup">
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchAdvancedResultPage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Advanced Search Results" stepKey="assertAdvancedSearchTitle"/>
+        <see userInput="Catalog Advanced Search" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertAdvancedSearchName"/>
+    </actionGroup>
+
+    <!-- Select the category in the filter -->
+    <actionGroup name="StorefrontSelectSearchFilterCategoryActionGroup">
+        <arguments>
+            <argument name="category"/>
+        </arguments>
+        <click selector="{{StorefrontCategoryFilterSection.CategoryFilter}}" stepKey="clickCategoryFilterTitle" />
+        <scrollTo selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="scrollToClickCategoryFilter"/>
+        <click selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="clickCategoryFilter"/>
+    </actionGroup>
+
+    <!-- Go to store's advanced catalog search page -->
+    <actionGroup name="GoToStoreViewAdvancedCatalogSearchActionGroup">
+        <amOnPage url="{{StorefrontCatalogSearchAdvancedFormPage.url}}" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product name -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByProductNameActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{name}}" stepKey="fill"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product sku -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByProductSkuActionGroup">
+        <arguments>
+            <argument name="sku" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" userInput="{{sku}}" stepKey="fill"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product description -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByDescriptionActionGroup">
+        <arguments>
+            <argument name="description" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.Description}}" userInput="{{description}}" stepKey="fill"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product short description -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup">
+        <arguments>
+            <argument name="shortDescription" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ShortDescription}}" userInput="{{shortDescription}}" stepKey="fill"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product name and price -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+            <argument name="priceFrom" type="string"/>
+            <argument name="priceTo" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{name}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" userInput="{{priceFrom}}" stepKey="fillPriceFrom"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" userInput="{{priceTo}}" stepKey="fillPriceTo"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product name and description -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+            <argument name="description" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{name}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.Description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
new file mode 100644
index 0000000000000..52fd61301c3b3
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="apiSimpleProduct">Api Simple Product</data>
+        <data key="nonexistentProductName">NonexistentProductName</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE.txt b/app/code/Magento/CatalogSearch/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE.txt
rename to app/code/Magento/CatalogSearch/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE_AFL.txt b/app/code/Magento/CatalogSearch/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE_AFL.txt
rename to app/code/Magento/CatalogSearch/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
new file mode 100644
index 0000000000000..28515c8186a23
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCatalogSearchAdvancedFormPage" url="/catalogsearch/advanced/" area="storefront" module="Magento_CatalogSearch">
+        <section name="StorefrontCatalogSearchAdvancedFormSection" />
+        <section name="StorefrontQuickSearchSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
new file mode 100644
index 0000000000000..0584f5e338035
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCatalogSearchAdvancedResultPage" url="/catalogsearch/advanced/result" area="storefront" module="Magento_CatalogSearch">
+        <section name="StorefrontCatalogSearchAdvancedResultMainSection" />
+        <section name="StorefrontQuickSearchSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
new file mode 100644
index 0000000000000..0700adb6d30e0
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCatalogSearchPage" url="/catalogsearch/result/" area="storefront" module="Magento_CatalogSearch">
+        <section name="StorefrontCatalogSearchMainSection" />
+        <section name="StorefrontQuickSearchSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/README.md b/app/code/Magento/CatalogSearch/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5ee0e968a4d3a
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Search Functional Tests
+
+The Functional Test Module for **Magento Catalog Search** module.
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
new file mode 100644
index 0000000000000..6889025530098
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCatalogSearchAdvancedFormSection">
+        <element name="SearchTitle" type="text" selector=".page-title span"/>
+        <element name="ProductName" type="input" selector="#name"/>
+        <element name="SKU" type="input" selector="#sku"/>
+        <element name="Description" type="input" selector="#description"/>
+        <element name="ShortDescription" type="input" selector="#short_description"/>
+        <element name="PriceFrom" type="input" selector="#price"/>
+        <element name="PriceTo" type="input" selector="#price_to"/>
+        <element name="AttributeByCode" type="input" selector="#{{var1}}" parameterized="true"/>
+        <element name="SubmitButton" type="button" selector="//*[@id='form-validate']//button[@type='submit']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
new file mode 100644
index 0000000000000..6b28b4f36c6a7
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCatalogSearchAdvancedResultMainSection">
+        <element name="SearchTitle" type="text" selector=".page-title span"/>
+        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
+        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="SuccessMsg" type="button" selector="div.message-success"/>
+        <element name="productCount" type="text" selector="#toolbar-amount"/>
+        <element name="message" type="text" selector="div.message div"/>
+        <element name="itemFound" type="text" selector=".search.found>strong"/>
+        <element name="productName" type="text" selector=".product.name.product-item-name>a"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
new file mode 100644
index 0000000000000..8b35ef3336175
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCatalogSearchMainSection">
+        <element name="SearchTitle" type="text" selector=".page-title span"/>
+        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
+        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="SuccessMsg" type="button" selector="div.message-success"/>
+        <element name="productCount" type="text" selector="#toolbar-amount"/>
+        <element name="message" type="text" selector="div.message div"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
new file mode 100644
index 0000000000000..dbecf55a0104b
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontFooterSection">
+        <element name="AdvancedSearch" type="button" selector="//footer//ul//li//a[text()='Advanced Search']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
new file mode 100644
index 0000000000000..13665100f79af
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <group value="CatalogSearch"/>
+        </annotations>
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameActionGroup" stepKey="search">
+            <argument name="name" value="$$product.name$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <group value="CatalogSearch"/>
+        </annotations>
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search">
+            <argument name="sku" value="$$product.sku$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <group value="CatalogSearch"/>
+        </annotations>
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search">
+            <argument name="description" value="$$product.custom_attributes[description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <group value="CatalogSearch"/>
+        </annotations>
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search">
+            <argument name="shortDescription" value="$$product.custom_attributes[short_description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchSimpleProductByPriceTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <group value="CatalogSearch"/>
+        </annotations>
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search">
+            <argument name="name" value="$$arg1.name$$"/>
+            <argument name="priceFrom" value="$$arg2.price$$"/>
+            <argument name="priceTo" value="$$arg3.price$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$arg1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..99f3fc00a7401
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <!-- Step 2: User searches for product -->
+        <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Advanced Search with Product 1 Data -->
+        <comment userInput="Advanced search" stepKey="commentAdvancedSearch" after="startOfSearchingProducts"/>
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="searchOpenAdvancedSearchForm" after="commentAdvancedSearch"/>
+        <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+        <fillField userInput="$$createSimpleProduct1.name$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" stepKey="searchAdvancedFillProductName" after="searchOpenAdvancedSearchForm"/>
+        <fillField userInput="$$createSimpleProduct1.sku$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" stepKey="searchAdvancedFillSKU" after="searchAdvancedFillProductName"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" stepKey="searchAdvancedFillPriceFrom" after="searchAdvancedFillSKU"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" stepKey="searchAdvancedFillPriceTo" after="searchAdvancedFillPriceFrom"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="searchClickAdvancedSearchSubmitButton" after="searchAdvancedFillPriceTo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchProductsloaded" after="searchClickAdvancedSearchSubmitButton"/>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="searchCheckAdvancedSearchResult" after="waitForSearchProductsloaded"/>
+        <see userInput="1" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productCount}} span" stepKey="searchAdvancedAssertProductCount" after="searchCheckAdvancedSearchResult"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertSimpleProduct1" after="searchAdvancedAssertProductCount">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1ImageSrc" after="searchAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1ImageSrc" stepKey="searchAdvancedAssertSimpleProduct1ImageNotDefault" after="searchAdvancedGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="searchClickSimpleProduct1View" after="searchAdvancedAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchSimpleProduct1Viewloaded" after="searchClickSimpleProduct1View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="searchAssertSimpleProduct1Page" after="waitForSearchSimpleProduct1Viewloaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1PageImageSrc" after="searchAssertSimpleProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1PageImageSrc" stepKey="searchAdvancedAssertSimpleProduct1PageImageNotDefault" after="searchAdvancedGrabSimpleProduct1PageImageSrc"/>
+
+        <!-- Quick Search with common part of product names -->
+        <comment userInput="Quick search" stepKey="commentQuickSearch" after="searchAdvancedAssertSimpleProduct1PageImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchQuickSearchCommonPart" after="commentQuickSearch">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.apiSimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectSearchFilterCategoryActionGroup" stepKey="searchSelectFilterCategoryCommonPart" after="searchQuickSearchCommonPart">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <see userInput="3" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="searchAssertFilterCategoryProductCountCommonPart" after="searchSelectFilterCategoryCommonPart"/>
+
+        <!-- Search simple product 1 -->
+        <comment userInput="Search simple product 1" stepKey="commentSearchSimpleProduct1" after="searchAssertFilterCategoryProductCountCommonPart"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct1" after="commentSearchSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct1ImageSrc" after="searchAssertFilterCategorySimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct1ImageSrc" stepKey="searchAssertSimpleProduct1ImageNotDefault" after="searchGrabSimpleProduct1ImageSrc"/>
+        <!-- Search simple product2 -->
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct2" after="searchAssertSimpleProduct1ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct2ImageSrc" after="searchAssertFilterCategorySimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
+
+        <!-- Quick Search with non-existent product name -->
+        <comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNonExistentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNonExistentProductName">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.nonexistentProductName"/>
+        </actionGroup>
+        <see userInput="Your search returned no results." selector="{{StorefrontCatalogSearchMainSection.message}}" stepKey="searchAssertQuickSearchMessageNonExistent" after="searchFillQuickSearchNonExistent"/>
+        <comment userInput="End of searching products" stepKey="endOfSearchingProducts" after="searchAssertQuickSearchMessageNonExistent" />
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..367cb6a6e214e
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <!-- Step 2: User searches for product -->
+        <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Advanced Search with Product 1 Data -->
+        <comment userInput="Advanced search" stepKey="commentAdvancedSearch" after="startOfSearchingProducts"/>
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="searchOpenAdvancedSearchForm" after="commentAdvancedSearch"/>
+        <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+        <fillField userInput="$$createSimpleProduct1.name$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" stepKey="searchAdvancedFillProductName" after="searchOpenAdvancedSearchForm"/>
+        <fillField userInput="$$createSimpleProduct1.sku$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" stepKey="searchAdvancedFillSKU" after="searchAdvancedFillProductName"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" stepKey="searchAdvancedFillPriceFrom" after="searchAdvancedFillSKU"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" stepKey="searchAdvancedFillPriceTo" after="searchAdvancedFillPriceFrom"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="searchClickAdvancedSearchSubmitButton" after="searchAdvancedFillPriceTo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchProductsloaded" after="searchClickAdvancedSearchSubmitButton"/>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="searchCheckAdvancedSearchResult" after="waitForSearchProductsloaded"/>
+        <see userInput="1" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productCount}} span" stepKey="searchAdvancedAssertProductCount" after="searchCheckAdvancedSearchResult"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertSimpleProduct1" after="searchAdvancedAssertProductCount">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1ImageSrc" after="searchAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1ImageSrc" stepKey="searchAdvancedAssertSimpleProduct1ImageNotDefault" after="searchAdvancedGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="searchClickSimpleProduct1View" after="searchAdvancedAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchSimpleProduct1Viewloaded" after="searchClickSimpleProduct1View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="searchAssertSimpleProduct1Page" after="waitForSearchSimpleProduct1Viewloaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1PageImageSrc" after="searchAssertSimpleProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1PageImageSrc" stepKey="searchAdvancedAssertSimpleProduct1PageImageNotDefault" after="searchAdvancedGrabSimpleProduct1PageImageSrc"/>
+
+        <!-- Quick Search with common part of product names -->
+        <comment userInput="Quick search" stepKey="commentQuickSearch" after="searchAdvancedAssertSimpleProduct1PageImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchQuickSearchCommonPart" after="commentQuickSearch">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.apiSimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectSearchFilterCategoryActionGroup" stepKey="searchSelectFilterCategoryCommonPart" after="searchQuickSearchCommonPart">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <see userInput="3" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="searchAssertFilterCategoryProductCountCommonPart" after="searchSelectFilterCategoryCommonPart"/>
+
+        <!-- Search simple product 1 -->
+        <comment userInput="Search simple product 1" stepKey="commentSearchSimpleProduct1" after="searchAssertFilterCategoryProductCountCommonPart"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct1" after="commentSearchSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct1ImageSrc" after="searchAssertFilterCategorySimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct1ImageSrc" stepKey="searchAssertSimpleProduct1ImageNotDefault" after="searchGrabSimpleProduct1ImageSrc"/>
+        <!-- Search simple product2 -->
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct2" after="searchAssertSimpleProduct1ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct2ImageSrc" after="searchAssertFilterCategorySimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
+
+        <!-- Quick Search with non-existent product name -->
+        <comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNonExistentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNonExistentProductName">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.nonexistentProductName"/>
+        </actionGroup>
+        <see userInput="Your search returned no results." selector="{{StorefrontCatalogSearchMainSection.message}}" stepKey="searchAssertQuickSearchMessageNonExistent" after="searchFillQuickSearchNonExistent"/>
+        <comment userInput="End of searching products" stepKey="endOfSearchingProducts" after="searchAssertQuickSearchMessageNonExistent" />
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
index 9aa97f8e6b52a..2faacea24262c 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
@@ -5,8 +5,16 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Controller\Advanced;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ResultTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * Test result action filters set before load layout scenario
+     *
+     * @return void
+     */
     public function testResultActionFiltersSetBeforeLoadLayout()
     {
         $filters = null;
@@ -24,9 +32,15 @@ function () use (&$filters, $expectedQuery) {
         $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
         $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
 
+        $collection = $this->createPartialMock(
+            \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
+            ['getSize']
+        );
+        $collection->expects($this->once())->method('getSize')->will($this->returnValue(1));
+
         $catalogSearchAdvanced = $this->createPartialMock(
             \Magento\CatalogSearch\Model\Advanced::class,
-            ['addFilters', '__wakeup']
+            ['addFilters', '__wakeup', 'getProductCollection']
         );
         $catalogSearchAdvanced->expects($this->once())->method('addFilters')->will(
             $this->returnCallback(
@@ -35,6 +49,159 @@ function ($added) use (&$filters) {
                 }
             )
         );
+        $catalogSearchAdvanced->expects($this->once())->method('getProductCollection')
+            ->will($this->returnValue($collection));
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $context = $objectManager->getObject(
+            \Magento\Framework\App\Action\Context::class,
+            ['view' => $view, 'request' => $request]
+        );
+
+        /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
+        $instance = $objectManager->getObject(
+            \Magento\CatalogSearch\Controller\Advanced\Result::class,
+            ['context' => $context, 'catalogSearchAdvanced' => $catalogSearchAdvanced]
+        );
+        $instance->execute();
+    }
+
+    /**
+     * Test url set on exception scenario
+     *
+     * @return void
+     */
+    public function testUrlSetOnException()
+    {
+        $redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
+        $redirectResultMock->expects($this->once())
+            ->method('setUrl');
+
+        $redirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $redirectFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($redirectResultMock);
+
+        $catalogSearchAdvanced = $this->createPartialMock(
+            \Magento\CatalogSearch\Model\Advanced::class,
+            ['addFilters']
+        );
+
+        $catalogSearchAdvanced->expects($this->once())->method('addFilters')->will(
+            $this->throwException(new \Magento\Framework\Exception\LocalizedException(
+                new \Magento\Framework\Phrase("Test Exception")
+            ))
+        );
+
+        $responseMock = $this->createMock(\Magento\Framework\Webapi\Response::class);
+        $requestMock = $this->createPartialMock(
+            \Magento\Framework\App\Request\Http::class,
+            ['getQueryValue']
+        );
+        $requestMock->expects($this->any())->method('getQueryValue')->willReturn(['key' => 'value']);
+
+        $redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
+        $redirectMock->expects($this->any())->method('error')->with('urlstring');
+
+        $messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
+
+        $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+
+        $contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
+        $contextMock->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($requestMock);
+        $contextMock->expects($this->any())
+            ->method('getResponse')
+            ->willReturn($responseMock);
+        $contextMock->expects($this->any())
+            ->method('getRedirect')
+            ->willReturn($redirectMock);
+        $contextMock->expects($this->any())
+            ->method('getMessageManager')
+            ->willReturn($messageManagerMock);
+        $contextMock->expects($this->any())
+            ->method('getEventManager')
+            ->willReturn($eventManagerMock);
+        $contextMock->expects($this->any())
+            ->method('getResultRedirectFactory')
+            ->willReturn($redirectFactoryMock);
+
+        $urlMock = $this->createMock(\Magento\Framework\Url::class);
+        $urlMock->expects($this->once())
+            ->method('addQueryParams')
+            ->willReturnSelf();
+        $urlMock->expects($this->once())
+            ->method('getUrl')
+            ->willReturn("urlstring");
+
+        $urlFactoryMock = $this->createMock(\Magento\Framework\UrlFactory::class);
+        $urlFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($urlMock));
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
+        $instance = $objectManager->getObject(
+            \Magento\CatalogSearch\Controller\Advanced\Result::class,
+            [
+                'context'               => $contextMock,
+                'catalogSearchAdvanced' => $catalogSearchAdvanced,
+                'urlFactory'            => $urlFactoryMock
+            ]
+        );
+        $this->assertEquals($redirectResultMock, $instance->execute());
+    }
+
+    /**
+     * Test no result handle scenario
+     *
+     * @return void
+     */
+    public function testNoResultsHandle()
+    {
+        $expectedQuery = 'notExistTerm';
+
+        $update = $this->createPartialMock(\Magento\Framework\View\Model\Layout\Merge::class, ['getHandles']);
+        $update->expects($this->once())->method('getHandles')->will($this->returnValue([]));
+
+        $layout = $this->createPartialMock(\Magento\Framework\View\Result\Layout::class, ['getUpdate']);
+        $layout->expects($this->once())->method('getUpdate')->will($this->returnValue($update));
+
+        $page = $this->createPartialMock(\Magento\Framework\View\Result\Page::class, ['initLayout']);
+
+        $view = $this->createPartialMock(
+            \Magento\Framework\App\View::class,
+            ['loadLayout', 'renderLayout', 'getPage', 'getLayout']
+        );
+
+        $view->expects($this->once())->method('loadLayout')
+            ->with([\Magento\CatalogSearch\Controller\Advanced\Result::DEFAULT_NO_RESULT_HANDLE]);
+
+        $view->expects($this->once())->method('getPage')->will($this->returnValue($page));
+        $view->expects($this->once())->method('getLayout')->will($this->returnValue($layout));
+
+        $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
+        $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
+
+        $collection = $this->createPartialMock(
+            \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
+            ['getSize']
+        );
+        $collection->expects($this->once())->method('getSize')->will($this->returnValue(0));
+
+        $catalogSearchAdvanced = $this->createPartialMock(
+            \Magento\CatalogSearch\Model\Advanced::class,
+            ['addFilters', '__wakeup', 'getProductCollection']
+        );
+
+        $catalogSearchAdvanced->expects($this->once())->method('getProductCollection')
+            ->will($this->returnValue($collection));
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $context = $objectManager->getObject(
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php
index 2bceaca068b8b..4f7a6a6542932 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php
@@ -87,7 +87,7 @@ protected function setUp()
         );
     }
 
-    public function testIsNotAplicable()
+    public function testIsNotApplicable()
     {
         $documentIds = [1];
         $this->aggregationChecker
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php
new file mode 100644
index 0000000000000..949554506d5b0
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Mysql\Aggregation\DataProvider;
+
+use Magento\CatalogInventory\Model\Configuration as CatalogInventoryConfiguration;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Store\Model\Store;
+
+/**
+ * Test for Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+class QueryBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var QueryBuilder
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeResolverMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $inventoryConfigMock;
+
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->scopeResolverMock = $this->createMock(ScopeResolverInterface::class);
+        $this->adapterMock = $this->createMock(AdapterInterface::class);
+        $this->inventoryConfigMock = $this->createMock(CatalogInventoryConfiguration::class);
+
+        $this->resourceConnectionMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->adapterMock);
+
+        $this->indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Search\Request\IndexScopeResolverInterface::class
+        );
+        $this->dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+        $this->dimensionFactoryMock = $this->createMock(\Magento\Framework\Indexer\DimensionFactory::class);
+        $this->dimensionFactoryMock->method('create')->willReturn($this->dimensionMock);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $storeMock->method('getId')->willReturn(1);
+        $storeMock->method('getWebsiteId')->willReturn(1);
+        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->storeManagerMock->method('getStore')->willReturn($storeMock);
+        $this->indexScopeResolverMock->method('resolve')->willReturn('catalog_product_index_price');
+
+        $this->model = new QueryBuilder(
+            $this->resourceConnectionMock,
+            $this->scopeResolverMock,
+            $this->inventoryConfigMock,
+            $this->indexScopeResolverMock,
+            $this->dimensionFactoryMock
+        );
+    }
+
+    public function testBuildWithPriceAttributeCode()
+    {
+        $tableName = 'test_table';
+        $scope = 1;
+        $selectMock = $this->createMock(Select::class);
+        $attributeMock = $this->createMock(AbstractAttribute::class);
+        $storeMock = $this->createMock(Store::class);
+
+        $this->adapterMock->expects($this->atLeastOnce())->method('select')
+            ->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('joinInner')
+            ->with(['entities' => $tableName], 'main_table.entity_id  = entities.entity_id', []);
+        $attributeMock->expects($this->once())->method('getAttributeCode')
+            ->willReturn('price');
+        $this->scopeResolverMock->expects($this->once())->method('getScope')
+            ->with($scope)->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn(1);
+        $selectMock->expects($this->once())->method('from')
+            ->with(['main_table' => 'catalog_product_index_price'], null)
+            ->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('columns')
+            ->with(['value' => 'main_table.min_price'])
+            ->willReturn($selectMock);
+        $selectMock->expects($this->exactly(2))->method('where')
+            ->withConsecutive(
+                ['main_table.customer_group_id = ?', 1],
+                ['main_table.website_id = ?', 1]
+            )->willReturn($selectMock);
+
+        $this->model->build($attributeMock, $tableName, $scope, 1);
+    }
+
+    public function testBuildWithNotPriceAttributeCode()
+    {
+        $tableName = 'test_table';
+        $scope = 1;
+        $selectMock = $this->createMock(Select::class);
+        $attributeMock = $this->createMock(AbstractAttribute::class);
+        $storeMock = $this->createMock(Store::class);
+
+        $this->adapterMock->expects($this->atLeastOnce())->method('select')
+            ->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('joinInner')
+            ->with(['entities' => $tableName], 'main_table.entity_id  = entities.entity_id', []);
+        $attributeMock->expects($this->once())->method('getBackendType')
+            ->willReturn('decimal');
+        $this->scopeResolverMock->expects($this->once())->method('getScope')
+            ->with($scope)->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getId')->willReturn(1);
+        $this->resourceConnectionMock->expects($this->exactly(2))->method('getTableName')
+            ->withConsecutive(
+                ['catalog_product_index_eav_decimal'],
+                ['cataloginventory_stock_status']
+            )->willReturnOnConsecutiveCalls(
+                'catalog_product_index_eav_decimal',
+                'cataloginventory_stock_status'
+            );
+
+        $selectMock->expects($this->exactly(2))->method('from')
+            ->withConsecutive(
+                [
+                    ['main_table' => 'catalog_product_index_eav_decimal'],
+                    ['main_table.entity_id', 'main_table.value']
+                ],
+                [['main_table' => $selectMock], ['main_table.value']]
+            )
+            ->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('distinct')->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('joinLeft')
+            ->with(
+                ['stock_index' => 'cataloginventory_stock_status'],
+                'main_table.source_id = stock_index.product_id',
+                []
+            )->willReturn($selectMock);
+        $attributeMock->expects($this->once())->method('getAttributeId')->willReturn(3);
+        $selectMock->expects($this->exactly(3))->method('where')
+            ->withConsecutive(
+                ['main_table.attribute_id = ?', 3],
+                ['main_table.store_id = ? ', 1],
+                ['stock_index.stock_status = ?', Stock::STOCK_IN_STOCK]
+            )->willReturn($selectMock);
+        $this->inventoryConfigMock->expects($this->once())->method('isShowOutOfStock')->with(1)->willReturn(false);
+
+        $this->model->build($attributeMock, $tableName, $scope, 1);
+    }
+}
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 4305bc5cb0706..85b1b136e78d2 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,6 +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\SelectBuilderForAttribute;
 use Magento\Eav\Model\Config;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ResourceConnection;
@@ -22,6 +23,9 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class DataProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -55,6 +59,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $adapterMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|SelectBuilderForAttribute
+     */
+    private $selectBuilderForAttribute;
+
     protected function setUp()
     {
         $this->eavConfigMock = $this->createMock(Config::class);
@@ -63,12 +72,13 @@ 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->selectBuilderForAttribute = $this->createMock(SelectBuilderForAttribute::class);
         $this->model = new DataProvider(
             $this->eavConfigMock,
             $this->resourceConnectionMock,
             $this->scopeResolverMock,
-            $this->sessionMock
+            $this->sessionMock,
+            $this->selectBuilderForAttribute
         );
     }
 
@@ -78,24 +88,20 @@ public function testGetDataSetUsesFrontendPriceIndexerTableIfAttributeIsPrice()
         $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);
-        $attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
         $this->eavConfigMock->expects($this->once())
             ->method('getAttribute')->with(Product::ENTITY, $attributeCode)
             ->willReturn($attributeMock);
 
         $selectMock = $this->createMock(Select::class);
-        $selectMock->expects($this->any())->method('from')->willReturnSelf();
-        $selectMock->expects($this->any())->method('where')->willReturnSelf();
-        $selectMock->expects($this->any())->method('columns')->willReturnSelf();
-        $this->adapterMock->expects($this->once())->method('select')->willReturn($selectMock);
+        $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
         $tableMock = $this->createMock(Table::class);
 
         $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
@@ -107,27 +113,22 @@ public function testGetDataSetUsesFrontendPriceIndexerTableForDecimalAttributes(
         $attributeCode = 'my_decimal';
 
         $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);
-        $this->scopeResolverMock->expects($this->any())->method('getScope')->with($storeId)->willReturn($scopeMock);
+        $dimensionMock->expects($this->atLeastOnce())->method('getValue')->willReturn($storeId);
+        $this->scopeResolverMock->expects($this->atLeastOnce())->method('getScope')->with($storeId)
+            ->willReturn($scopeMock);
 
         $bucketMock = $this->createMock(BucketInterface::class);
         $bucketMock->expects($this->once())->method('getField')->willReturn($attributeCode);
         $attributeMock = $this->createMock(Attribute::class);
-        $attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
         $this->eavConfigMock->expects($this->once())
             ->method('getAttribute')->with(Product::ENTITY, $attributeCode)
             ->willReturn($attributeMock);
 
         $selectMock = $this->createMock(Select::class);
-        $selectMock->expects($this->any())->method('from')->willReturnSelf();
-        $selectMock->expects($this->any())->method('distinct')->willReturnSelf();
-        $selectMock->expects($this->any())->method('where')->willReturnSelf();
-        $selectMock->expects($this->any())->method('columns')->willReturnSelf();
-        $selectMock->expects($this->any())->method('joinLeft')->willReturnSelf();
-        $selectMock->expects($this->any())->method('group')->willReturnSelf();
-        $this->adapterMock->expects($this->any())->method('select')->willReturn($selectMock);
+        $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/Adapter/Mysql/Dynamic/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
index 1aeeb0d9bd731..b064eec3338e9 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
@@ -19,8 +19,9 @@
 use Magento\Store\Model\StoreManager;
 
 /**
- * Class DataProviderTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class DataProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -74,6 +75,18 @@ protected function setUp()
         $this->mysqlDataProviderMock = $this->createMock(DataProviderInterface::class);
         $this->intervalFactoryMock = $this->createMock(IntervalFactory::class);
         $this->storeManagerMock = $this->createMock(StoreManager::class);
+        $this->indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Search\Request\IndexScopeResolverInterface::class
+        );
+        $this->dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+        $this->dimensionFactoryMock = $this->createMock(\Magento\Framework\Indexer\DimensionFactory::class);
+        $this->dimensionFactoryMock->method('create')->willReturn($this->dimensionMock);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $storeMock->method('getId')->willReturn(1);
+        $storeMock->method('getWebsiteId')->willReturn(1);
+        $this->storeManagerMock->method('getStore')->willReturn($storeMock);
+        $this->indexScopeResolverMock->method('resolve')->willReturn('catalog_product_index_price');
+        $this->sessionMock->method('getCustomerGroupId')->willReturn(1);
 
         $this->model = new DataProvider(
             $this->resourceConnectionMock,
@@ -81,7 +94,9 @@ protected function setUp()
             $this->sessionMock,
             $this->mysqlDataProviderMock,
             $this->intervalFactoryMock,
-            $this->storeManagerMock
+            $this->storeManagerMock,
+            $this->indexScopeResolverMock,
+            $this->dimensionFactoryMock
         );
     }
 
@@ -97,10 +112,6 @@ public function testGetAggregationsUsesFrontendPriceIndexerTable()
         $entityStorageMock = $this->createMock(EntityStorage::class);
         $entityStorageMock->expects($this->any())->method('getSource')->willReturn($tableMock);
 
-        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
-        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn(42);
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-
         $this->model->getAggregations($entityStorageMock);
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php
index ca19e5e995c81..1e609cdeac28f 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Field/ResolverTest.php
@@ -9,6 +9,9 @@
 
 /**
  * Unit tests for Magento\CatalogSearch\Model\Adapter\Mysql\Field\Resolver class.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class ResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
index 697fab6507934..1690d9f39360f 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/AliasResolverTest.php
@@ -9,6 +9,10 @@
 use Magento\CatalogSearch\Model\Search\RequestGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class AliasResolverTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
index f4c512916465f..7e3de7534e8c4 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class PreprocessorTest extends \PHPUnit\Framework\TestCase
 {
@@ -314,6 +316,9 @@ public function testProcessTermFilter($frontendInput, $fieldValue, $isNegation,
         $this->assertSame($expected, $this->removeWhitespaces($actualResult));
     }
 
+    /**
+     * @return array
+     */
     public function testTermFilterDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
index ac3e84a5c8fef..fc5915bb3cdff 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
@@ -99,6 +99,9 @@ protected function setUp()
             ->willReturn($this->store);
     }
 
+    /**
+     * @return array
+     */
     public function addFiltersDataProvider()
     {
         return array_merge(
@@ -269,6 +272,10 @@ private function createBackend($table)
         return $backend;
     }
 
+    /**
+     * @param string $optionText
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function createSource($optionText = 'optionText')
     {
         $source = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Source\AbstractSource::class)
@@ -281,6 +288,9 @@ private function createSource($optionText = 'optionText')
         return $source;
     }
 
+    /**
+     * @return array
+     */
     private function addFiltersPriceDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
index 75daf438f7bf2..91d1d773172b6 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
@@ -30,6 +30,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $suggestCollection;
 
+    /**
+     * @var integer
+     */
+    private $limit = 3;
+
     protected function setUp()
     {
         $helper = new ObjectManager($this);
@@ -60,11 +65,20 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
+        $scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn($this->limit);
+
         $this->model = $helper->getObject(
             \Magento\CatalogSearch\Model\Autocomplete\DataProvider::class,
             [
                 'queryFactory' => $queryFactory,
-                'itemFactory' => $this->itemFactory
+                'itemFactory' => $this->itemFactory,
+                'scopeConfig' => $scopeConfig
             ]
         );
     }
@@ -103,10 +117,15 @@ public function testGetItems()
             ->will($this->returnValue($expected));
 
         $this->itemFactory->expects($this->any())->method('create')->willReturn($itemMock);
+
         $result = $this->model->getItems();
         $this->assertEquals($expected, $result[0]->toArray());
+        $this->assertEquals($this->limit, count($result));
     }
 
+    /**
+     * @param array $data
+     */
     private function buildCollection(array $data)
     {
         $collectionData = [];
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 60d4ef5f55f02..f70c61cdbafdb 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\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,19 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
     protected $fulltextResource;
 
     /**
-     * @var \Magento\Framework\Search\Request\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $searchRequestConfig;
+    private $indexSwitcher;
 
     /**
-     * @var \Magento\Framework\Search\Request\DimensionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DimensionProviderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $dimensionFactory;
+    private $dimensionProviderMock;
 
     /**
-     * @var \Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Indexer\Model\ProcessManager|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $indexSwitcher;
+    private $processManager;
 
     protected function setUp()
     {
@@ -69,38 +64,33 @@ 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->processManager = new \Magento\Indexer\Model\ProcessManager(
+            $this->getClassMock(\Magento\Framework\App\ResourceConnection::class)
+        );
+
         $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,
+                'processManager' => $this->processManager,
             ]
         );
     }
@@ -118,61 +108,70 @@ 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');
+        $this->saveHandler->expects($this->exactly(2))->method('isAvailable')->willReturn(true);
+        $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);
     }
 
+    /**
+     * @param $stores
+     */
+    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,13 +180,14 @@ 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->saveHandler->expects($this->exactly(2))->method('isAvailable')->willReturn(true);
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
             ->willReturn(new \ArrayObject([$indexData, $indexData]));
@@ -199,13 +199,14 @@ 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->saveHandler->expects($this->exactly(2))->method('isAvailable')->willReturn(true);
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
             ->willReturn(new \ArrayObject([$indexData, $indexData]));
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexStructureFactoryTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexStructureFactoryTest.php
new file mode 100644
index 0000000000000..5122cacf9ef2e
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexStructureFactoryTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Test\Unit\Model\Indexer;
+
+use Magento\CatalogSearch\Model\Indexer\IndexStructureFactory;
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+class IndexStructureFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var IndexStructureFactory */
+    private $model;
+
+    /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectManagerMock;
+
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
+    }
+
+    public function testCreate()
+    {
+        $currentStructure = 'current_structure';
+        $currentStructureClass = IndexStructureInterface::class;
+        $structures = [
+            $currentStructure => $currentStructureClass,
+        ];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentStructure);
+
+        $indexerStructureMock = $this->getMockBuilder($currentStructureClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentStructureClass, $data)
+            ->willReturn($indexerStructureMock);
+
+        $this->model = new IndexStructureFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $structures
+        );
+
+        $this->assertEquals($indexerStructureMock, $this->model->create($data));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage There is no such index structure: current_structure
+     */
+    public function testCreateWithoutStructures()
+    {
+        $currentStructure = 'current_structure';
+        $structures = [];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentStructure);
+
+        $this->model = new IndexStructureFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $structures
+        );
+
+        $this->model->create($data);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage current_structure index structure doesn't implement
+     */
+    public function testCreateWithWrongStructure()
+    {
+        $currentStructure = 'current_structure';
+        $currentStructureClass = \stdClass::class;
+        $structures = [
+            $currentStructure => $currentStructureClass,
+        ];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentStructure);
+
+        $indexerStructureMock = $this->getMockBuilder($currentStructureClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentStructureClass, $data)
+            ->willReturn($indexerStructureMock);
+
+        $this->model = new IndexStructureFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $structures
+        );
+
+        $this->model->create($data);
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexSwitcherProxyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexSwitcherProxyTest.php
new file mode 100644
index 0000000000000..4c9872187f632
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexSwitcherProxyTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Test\Unit\Model\Indexer;
+
+use Magento\CatalogSearch\Model\Indexer\IndexSwitcherInterface;
+use Magento\CatalogSearch\Model\Indexer\IndexSwitcherProxy;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+class IndexSwitcherProxyTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var IndexSwitcherProxy */
+    private $model;
+
+    /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectManagerMock;
+
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
+    }
+
+    public function testSwitchIndex()
+    {
+        $currentHandler = 'current_handler';
+        $currentHandlerClass = IndexSwitcherInterface::class;
+        $handles = [
+            $currentHandler => $currentHandlerClass,
+        ];
+        $dimensions = ['dimension'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentHandler);
+
+        $indexSwitcherMock = $this->getMockBuilder($currentHandlerClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentHandlerClass)
+            ->willReturn($indexSwitcherMock);
+
+        $indexSwitcherMock->expects($this->once())
+            ->method('switchIndex')
+            ->with($dimensions);
+
+        $this->model = new IndexSwitcherProxy(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $handles
+        );
+
+        $this->model->switchIndex($dimensions);
+    }
+
+    public function testSwitchIndexWithoutHandlers()
+    {
+        $currentHandler = 'current_handler';
+        $handles = [];
+        $dimensions = ['dimension'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentHandler);
+
+        $this->objectManagerMock->expects($this->never())
+            ->method('create');
+
+        $this->model = new IndexSwitcherProxy(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $handles
+        );
+
+        $this->model->switchIndex($dimensions);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage current_handler index switcher doesn't implement
+     */
+    public function testSwitchIndexWithWrongHandler()
+    {
+        $currentHandler = 'current_handler';
+        $currentHandlerClass = \stdClass::class;
+        $handles = [
+            $currentHandler => $currentHandlerClass,
+        ];
+        $dimensions = ['dimension'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentHandler);
+
+        $indexSwitcherMock = $this->getMockBuilder($currentHandlerClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentHandlerClass)
+            ->willReturn($indexSwitcherMock);
+
+        $this->model = new IndexSwitcherProxy(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $handles
+        );
+
+        $this->model->switchIndex($dimensions);
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexerHandlerFactoryTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexerHandlerFactoryTest.php
index d16140b641784..b1bd8ba70e345 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexerHandlerFactoryTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexerHandlerFactoryTest.php
@@ -6,46 +6,43 @@
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer;
 
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 class IndexerHandlerFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /** @var IndexerHandlerFactory */
-    protected $model;
+    private $model;
 
     /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $objectManagerMock;
+    private $objectManagerMock;
 
-    /** @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $scopeConfigMock;
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
 
     protected function setUp()
     {
         $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
             ->getMockForAbstractClass();
-        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
             ->getMockForAbstractClass();
     }
 
     public function testCreate()
     {
-        $configPath = 'config_path';
         $currentHandler = 'current_handler';
-        $currentHandlerClass = 'current_handler_class';
+        $currentHandlerClass = IndexerInterface::class;
         $handlers = [
             $currentHandler => $currentHandlerClass,
         ];
         $data = ['data'];
 
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with($configPath, ScopeInterface::SCOPE_STORE)
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
             ->willReturn($currentHandler);
 
-        $indexerMock = $this->getMockBuilder(IndexerInterface::class)
+        $indexerMock = $this->getMockBuilder($currentHandlerClass)
             ->getMockForAbstractClass();
 
         $this->objectManagerMock->expects($this->once())
@@ -59,8 +56,7 @@ public function testCreate()
 
         $this->model = new IndexerHandlerFactory(
             $this->objectManagerMock,
-            $this->scopeConfigMock,
-            $configPath,
+            $this->engineResolverMock,
             $handlers
         );
 
@@ -73,20 +69,17 @@ public function testCreate()
      */
     public function testCreateWithoutHandlers()
     {
-        $configPath = 'config_path';
         $currentHandler = 'current_handler';
         $handlers = [];
         $data = ['data'];
 
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with($configPath, ScopeInterface::SCOPE_STORE)
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
             ->willReturn($currentHandler);
 
         $this->model = new IndexerHandlerFactory(
             $this->objectManagerMock,
-            $this->scopeConfigMock,
-            $configPath,
+            $this->engineResolverMock,
             $handlers
         );
 
@@ -99,20 +92,18 @@ public function testCreateWithoutHandlers()
      */
     public function testCreateWithWrongHandler()
     {
-        $configPath = 'config_path';
         $currentHandler = 'current_handler';
-        $currentHandlerClass = 'current_handler_class';
+        $currentHandlerClass = \stdClass::class;
         $handlers = [
             $currentHandler => $currentHandlerClass,
         ];
         $data = ['data'];
 
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with($configPath, ScopeInterface::SCOPE_STORE)
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
             ->willReturn($currentHandler);
 
-        $indexerMock = $this->getMockBuilder(\stdClass::class)
+        $indexerMock = $this->getMockBuilder($currentHandlerClass)
             ->getMockForAbstractClass();
 
         $this->objectManagerMock->expects($this->once())
@@ -122,8 +113,7 @@ public function testCreateWithWrongHandler()
 
         $this->model = new IndexerHandlerFactory(
             $this->objectManagerMock,
-            $this->scopeConfigMock,
-            $configPath,
+            $this->engineResolverMock,
             $handlers
         );
 
@@ -136,20 +126,18 @@ public function testCreateWithWrongHandler()
      */
     public function testCreateWithoutAvailableHandler()
     {
-        $configPath = 'config_path';
         $currentHandler = 'current_handler';
-        $currentHandlerClass = 'current_handler_class';
+        $currentHandlerClass = IndexerInterface::class;
         $handlers = [
             $currentHandler => $currentHandlerClass,
         ];
         $data = ['data'];
 
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with($configPath, ScopeInterface::SCOPE_STORE)
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
             ->willReturn($currentHandler);
 
-        $indexerMock = $this->getMockBuilder(IndexerInterface::class)
+        $indexerMock = $this->getMockBuilder($currentHandlerClass)
             ->getMockForAbstractClass();
 
         $this->objectManagerMock->expects($this->once())
@@ -163,8 +151,7 @@ public function testCreateWithoutAvailableHandler()
 
         $this->model = new IndexerHandlerFactory(
             $this->objectManagerMock,
-            $this->scopeConfigMock,
-            $configPath,
+            $this->engineResolverMock,
             $handlers
         );
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
index 21d67bdf53c56..b65a0d6ca47a0 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
@@ -13,6 +13,8 @@
  * Tests Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class CollectionTest extends BaseCollection
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php
index e99d75c25f5cd..9ea103e23d2a7 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollection.php
@@ -9,6 +9,9 @@
  * Base class for Collection tests.
  *
  * Contains helper methods to get commonly used mocks used for collection tests.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  **/
 class BaseCollection extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/EngineProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/EngineProviderTest.php
new file mode 100644
index 0000000000000..0d50b038a3043
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/EngineProviderTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel;
+
+use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
+use Magento\CatalogSearch\Model\ResourceModel\EngineProvider;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+class EngineProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var EngineProvider */
+    private $model;
+
+    /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectManagerMock;
+
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
+    }
+
+    public function testGet()
+    {
+        $currentEngine = 'current_engine';
+        $currentEngineClass = EngineInterface::class;
+        $engines = [
+            $currentEngine => $currentEngineClass,
+        ];
+
+        $this->engineResolverMock->expects($this->once())
+        ->method('getCurrentSearchEngine')
+        ->willReturn($currentEngine);
+
+        $engineMock = $this->getMockBuilder($currentEngineClass)
+            ->setMethods(['isAvailable'])
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentEngineClass)
+            ->willReturn($engineMock);
+
+        $engineMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
+
+        $this->model = new EngineProvider(
+            $this->objectManagerMock,
+            $engines,
+            $this->engineResolverMock
+        );
+
+        $this->assertEquals($engineMock, $this->model->get());
+        $this->assertEquals($engineMock, $this->model->get());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage There is no such engine: current_engine
+     */
+    public function testGetWithoutEngines()
+    {
+        $currentEngine = 'current_engine';
+        $engines = [];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentEngine);
+
+        $this->objectManagerMock->expects($this->never())
+            ->method('create');
+
+        $this->model = new EngineProvider(
+            $this->objectManagerMock,
+            $engines,
+            $this->engineResolverMock
+        );
+
+        $this->model->get();
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage current_engine doesn't implement
+     */
+    public function testGetWithWrongEngine()
+    {
+        $currentEngine = 'current_engine';
+        $currentEngineClass = \stdClass::class;
+        $engines = [
+            $currentEngine => $currentEngineClass,
+        ];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentEngine);
+
+        $engineMock = $this->getMockBuilder($currentEngineClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentEngineClass)
+            ->willReturn($engineMock);
+
+        $this->model = new EngineProvider(
+            $this->objectManagerMock,
+            $engines,
+            $this->engineResolverMock
+        );
+
+        $this->model->get();
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Engine is not available: current_engine
+     */
+    public function testGetWithoutAvailableEngine()
+    {
+        $currentEngine = 'current_engine';
+        $currentEngineClass = EngineInterface::class;
+        $engines = [
+            $currentEngine => $currentEngineClass,
+        ];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentEngine);
+
+        $engineMock = $this->getMockBuilder($currentEngineClass)
+            ->setMethods(['isAvailable'])
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($currentEngineClass)
+            ->willReturn($engineMock);
+
+        $engineMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(false);
+
+        $this->model = new EngineProvider(
+            $this->objectManagerMock,
+            $engines,
+            $this->engineResolverMock
+        );
+
+        $this->model->get();
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
index c0f1f3fcaa5e6..a3b1d2fd0f2b6 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -206,6 +206,11 @@ protected function getFilterBuilder()
         return $filterBuilder;
     }
 
+    /**
+     * @param MockObject $filterBuilder
+     * @param array $filters
+     * @return MockObject
+     */
     protected function addFiltersToFilterBuilder(MockObject $filterBuilder, array $filters)
     {
         $i = 1;
@@ -222,6 +227,9 @@ protected function addFiltersToFilterBuilder(MockObject $filterBuilder, array $f
         return $filterBuilder;
     }
 
+    /**
+     * @return MockObject
+     */
     protected function createFilter()
     {
         $filter = $this->getMockBuilder(\Magento\Framework\Api\Filter::class)
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 a49770a40f6fe..f30733fb0824c 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/BaseSelectStrategy/StrategyMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
index 1ff1131e5f002..b168e72811760 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
@@ -11,6 +11,10 @@
 use \Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper;
 use \Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class StrategyMapperTest extends \PHPUnit\Framework\TestCase
 {
     /** @var  BaseSelectAttributesSearchStrategy|\PHPUnit_Framework_MockObject_MockObject */
@@ -91,6 +95,9 @@ public function testBaseSelectFullTextSearchStrategy(
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php
index 2022492ed1c86..175407bda677f 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php
@@ -78,6 +78,9 @@ public function testIsCustomPositive($attributeFrontEndType)
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForIsCustomPositive()
     {
         return [
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
index 7c6cafd7e9924..e693807760ea5 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
@@ -15,6 +15,11 @@
 use Magento\Framework\Search\Request\Filter\Term;
 use Magento\Store\Api\Data\WebsiteInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class ExclusionStrategyTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -50,10 +55,31 @@ protected function setUp()
         $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
         $this->aliasResolverMock = $this->createMock(AliasResolver::class);
 
+        $this->indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Search\Request\IndexScopeResolverInterface::class
+        );
+        $this->tableResolverMock = $this->createMock(
+            \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class
+        );
+        $this->dimensionMock = $this->createMock(\Magento\Framework\Indexer\Dimension::class);
+        $this->dimensionFactoryMock = $this->createMock(\Magento\Framework\Indexer\DimensionFactory::class);
+        $this->dimensionFactoryMock->method('create')->willReturn($this->dimensionMock);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $storeMock->method('getId')->willReturn(1);
+        $storeMock->method('getWebsiteId')->willReturn(1);
+        $this->storeManagerMock->method('getStore')->willReturn($storeMock);
+        $this->indexScopeResolverMock->method('resolve')->willReturn('catalog_product_index_price');
+        $this->httpContextMock = $this->createMock(\Magento\Framework\App\Http\Context::class);
+        $this->httpContextMock->method('getValue')->willReturn(1);
+
         $this->model = new ExclusionStrategy(
             $this->resourceConnectionMock,
             $this->storeManagerMock,
-            $this->aliasResolverMock
+            $this->aliasResolverMock,
+            $this->tableResolverMock,
+            $this->dimensionFactoryMock,
+            $this->indexScopeResolverMock,
+            $this->httpContextMock
         );
     }
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php
index e16f23ca09d2c..12ce0d63ac685 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/FilterContextTest.php
@@ -16,6 +16,10 @@
 use Magento\Framework\Search\Request\FilterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class FilterContextTest extends \PHPUnit\Framework\TestCase
 {
     /**
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 af13f96f78d25..e064f46655d91 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,18 +6,21 @@
 
 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.
  * Unit test for \Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TermDropdownStrategyTest extends \PHPUnit\Framework\TestCase
 {
@@ -27,90 +30,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/Test/Unit/Model/Search/IndexBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
index da7cfa1ea9821..b066c118ef783 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
@@ -27,6 +27,8 @@
  * Test for \Magento\CatalogSearch\Model\Search\IndexBuilder
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class IndexBuilderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
index c393f91f21fe1..ee16a22ff9f36 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
@@ -120,6 +120,12 @@ private function createDimensionMock($name, $value)
         return $dimension;
     }
 
+    /**
+     * @param $callNumber
+     * @param $tableName
+     * @param $isTableExist
+     * @return mixed
+     */
     private function mockDropTable($callNumber, $tableName, $isTableExist)
     {
         $this->connection->expects($this->at($callNumber++))
@@ -135,6 +141,11 @@ private function mockDropTable($callNumber, $tableName, $isTableExist)
         return $callNumber;
     }
 
+    /**
+     * @param $callNumber
+     * @param $tableName
+     * @return mixed
+     */
     private function mockFulltextTable($callNumber, $tableName)
     {
         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/QueryChecker/FullTextSearchCheckTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/QueryChecker/FullTextSearchCheckTest.php
index bb6e4ab8b4281..d13dcc11628f2 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/QueryChecker/FullTextSearchCheckTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/QueryChecker/FullTextSearchCheckTest.php
@@ -78,6 +78,9 @@ public function testInvalidArgumentException2()
         $this->fullTextSearchCheck->isRequiredForQuery($filterMock);
     }
 
+    /**
+     * @return array
+     */
     public function positiveDataProvider()
     {
         $boolQueryMock = $this->getBoolQueryMock();
@@ -114,6 +117,9 @@ public function positiveDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function negativeDataProvider()
     {
         $emptyBoolQueryMock = $this->getBoolQueryMock();
@@ -147,6 +153,9 @@ public function negativeDataProvider()
         ];
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getMatchQueryMock()
     {
         $matchQueryMock = $this->getMockBuilder(\Magento\Framework\Search\Request\QueryInterface::class)
@@ -161,6 +170,9 @@ private function getMatchQueryMock()
         return $matchQueryMock;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getBoolQueryMock()
     {
         $boolQueryMock = $this->getMockBuilder(\Magento\Framework\Search\Request\Query\BoolExpression::class)
@@ -175,6 +187,9 @@ private function getBoolQueryMock()
         return $boolQueryMock;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getFilterQueryMock()
     {
         $filterQueryMock = $this->getMockBuilder(\Magento\Framework\Search\Request\Query\Filter::class)
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
index 259c8e5d7f897..b52c9cfd67494 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
@@ -239,6 +239,10 @@ private function createAttributeMock($attributeOptions)
         return $attribute;
     }
 
+    /**
+     * @param $value
+     * @return int|void
+     */
     private function countVal(&$value)
     {
         return !empty($value) ? count($value) : 0;
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php
index ef4d8d314825b..374d0390f937c 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php
@@ -190,6 +190,9 @@ public function testBuildByRequest()
         );
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function mockQuery()
     {
         return $this->getMockBuilder(QueryInterface::class)
@@ -197,6 +200,9 @@ private function mockQuery()
             ->getMockForAbstractClass();
     }
 
+    /**
+     * @return array
+     */
     private function mockFilters()
     {
         $visibilityFilter = $this->getMockBuilder(Term::class)
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
index 1521b38d8c298..db46755261534 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
@@ -18,7 +18,10 @@
 
 /**
  * Test for \Magento\CatalogSearch\Model\Search\TableMapper
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TableMapperTest extends \PHPUnit\Framework\TestCase
 {
@@ -275,6 +278,9 @@ function (FilterInterface $filter) {
         $this->tableMapper->addTables($select, $request);
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getSelectMock()
     {
         return $this->getMockBuilder(\Magento\Framework\DB\Select::class)
@@ -282,6 +288,9 @@ private function getSelectMock()
             ->getMock();
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getRequestMock()
     {
         return $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
@@ -289,6 +298,9 @@ private function getRequestMock()
             ->getMock();
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getQueryMock()
     {
         return $this->getMockBuilder(QueryInterface::class)
@@ -296,6 +308,9 @@ private function getQueryMock()
             ->getMockForAbstractClass();
     }
 
+    /**
+     * @return array
+     */
     private function getDifferentFiltersMock()
     {
         $visibilityFilter = $this->getMockBuilder(Term::class)
@@ -316,6 +331,9 @@ private function getDifferentFiltersMock()
         return [$visibilityFilter, $customFilter, $nonCustomFilter];
     }
 
+    /**
+     * @return array
+     */
     private function getSameFiltersMock()
     {
         $visibilityFilter1 = $this->getMockBuilder(Term::class)
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php
new file mode 100644
index 0000000000000..b20fdde7c5216
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Plugin/EnableEavIndexerTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Test\Unit\Plugin;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
+class EnableEavIndexerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\CatalogSearch\Plugin\EnableEavIndexer
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Config\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(\Magento\Config\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData', 'setData'])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\CatalogSearch\Plugin\EnableEavIndexer::class
+        );
+    }
+
+    /**
+     * Test with other search engine (not MySQL) selected in config
+     *
+     * @return void
+     */
+    public function testBeforeSave()
+    {
+        $this->config->expects($this->once())->method('getData')->willReturn('elasticsearch');
+        $this->config->expects($this->never())->method('setData')->willReturnSelf();
+
+        $this->model->beforeSave($this->config);
+    }
+
+    /**
+     * Test with MySQL search engine selected in config
+     *
+     * @return void
+     */
+    public function testBeforeSaveMysqlSearchEngine()
+    {
+        $this->config->expects($this->at(0))->method('getData')->willReturn('mysql');
+        $this->config->expects($this->at(1))->method('getData')->willReturn([]);
+        $this->config->expects($this->once())->method('setData')->willReturnSelf();
+
+        $this->model->beforeSave($this->config);
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 057117448e78f..7bcb91e945417 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -1,25 +1,28 @@
 {
     "name": "magento/module-catalog-search",
-    "description": "N/A",
+    "description": "Catalog search",
     "config": {
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-search": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-indexer": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
+    },
+    "suggest": {
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/di.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/di.xml
index 7877ff04b24fd..2d41d17889e49 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/di.xml
@@ -26,4 +26,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\ProductLink\Search">
+        <arguments>
+            <argument name="filter" xsi:type="object">Magento\CatalogSearch\Ui\DataProvider\Product\AddFulltextFilterToCollection</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Category">
+        <plugin name="fulltext_search_indexer" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Model\Plugin\Category"/>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
index 0eeb6ab33871e..b8f2863139e9b 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
@@ -27,6 +27,23 @@
                     <label>Maximum Query Length</label>
                     <validate>validate-digits</validate>
                 </field>
+                <field id="max_count_cacheable_search_terms" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Number of top search results to cache</label>
+                    <comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
+                    <validate>validate-digits</validate>
+                </field>
+                <field id="autocomplete_limit" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Autocomplete Limit</label>
+                    <validate>validate-digits</validate>
+                </field>
+                <field id="enable_eav_indexer" translate="label" type="select" sortOrder="18" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable EAV Indexer</label>
+                    <comment>Enable/Disable Product EAV indexer to improve indexation speed. Make sure that indexer is not used by 3rd party extensions.</comment>
+                    <depends>
+                        <field id="engine" separator="," negative="1">mysql</field>
+                    </depends>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/CatalogSearch/etc/config.xml b/app/code/Magento/CatalogSearch/etc/config.xml
index d5ff194813b9c..66b79226c9f34 100644
--- a/app/code/Magento/CatalogSearch/etc/config.xml
+++ b/app/code/Magento/CatalogSearch/etc/config.xml
@@ -15,6 +15,9 @@
                 <engine>mysql</engine>
                 <min_query_length>1</min_query_length>
                 <max_query_length>128</max_query_length>
+                <max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
+                <autocomplete_limit>8</autocomplete_limit>
+                <enable_eav_indexer>1</enable_eav_indexer>
             </search>
         </catalog>
     </default>
diff --git a/app/code/Magento/CatalogSearch/etc/db_schema.xml b/app/code/Magento/CatalogSearch/etc/db_schema.xml
new file mode 100644
index 0000000000000..ae9217b0632a7
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/etc/db_schema.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_eav_attribute" resource="default" comment="Catalog EAV Attribute Table">
+        <column xsi:type="float" name="search_weight" unsigned="false" nullable="false"
+                default="1" comment="Search Weight"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/CatalogSearch/etc/db_schema_whitelist.json b/app/code/Magento/CatalogSearch/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..0d94c3a63a850
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/etc/db_schema_whitelist.json
@@ -0,0 +1,7 @@
+{
+    "catalog_eav_attribute": {
+        "column": {
+            "search_weight": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index 546f4a80e53a4..cc07384d4c525 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -16,7 +16,6 @@
     <preference for="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerInterface" type="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerComposite"/>
     <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
         <arguments>
-            <argument name="configPath" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
             <argument name="handlers" xsi:type="array">
                 <item name="mysql" xsi:type="string">Magento\CatalogSearch\Model\Indexer\IndexerHandler</item>
             </argument>
@@ -24,7 +23,6 @@
     </type>
     <type name="Magento\CatalogSearch\Model\Indexer\IndexSwitcherProxy">
         <arguments>
-            <argument name="configPath" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
             <argument name="handlers" xsi:type="array">
                 <item name="mysql" xsi:type="string">\Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher</item>
             </argument>
@@ -32,7 +30,6 @@
     </type>
     <type name="Magento\CatalogSearch\Model\Indexer\IndexStructureFactory">
         <arguments>
-            <argument name="configPath" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
             <argument name="structures" xsi:type="array">
                 <item name="mysql" xsi:type="string">Magento\CatalogSearch\Model\Indexer\IndexStructure</item>
             </argument>
@@ -105,20 +102,16 @@
     </type>
     <type name="Magento\Framework\Search\Dynamic\IntervalFactory">
         <arguments>
-            <argument name="configPath" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
             <argument name="intervals" xsi:type="array">
                 <item name="mysql" xsi:type="string">Magento\Framework\Search\Adapter\Mysql\Aggregation\Interval</item>
             </argument>
-            <argument name="scope" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Search\Dynamic\DataProviderFactory">
         <arguments>
-            <argument name="configPath" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
             <argument name="dataProviders" xsi:type="array">
                 <item name="mysql" xsi:type="string">Magento\CatalogSearch\Model\Adapter\Mysql\Dynamic\DataProvider</item>
             </argument>
-            <argument name="scope" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch">
@@ -218,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>
@@ -241,12 +236,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Search\Model\AdapterFactory">
-        <arguments>
-            <argument name="path" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
-            <argument name="scopeType" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
-        </arguments>
-    </type>
     <type name="Magento\Search\Model\Autocomplete">
         <arguments>
             <argument name="dataProviders" xsi:type="array">
@@ -310,4 +299,45 @@
             <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>
+    <type name="Magento\CatalogSearch\Model\Search\FilterMapper\ExclusionStrategy">
+        <arguments>
+            <argument name="priceTableResolver" xsi:type="object">
+                Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Adapter\Mysql\Dynamic\DataProvider">
+        <arguments>
+            <argument name="priceTableResolver" xsi:type="object">
+                Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder">
+        <arguments>
+            <argument name="priceTableResolver" xsi:type="object">
+                Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Model\Config">
+        <plugin name="config_enable_eav_indexer" type="Magento\CatalogSearch\Plugin\EnableEavIndexer" />
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogSearch/etc/module.xml b/app/code/Magento/CatalogSearch/etc/module.xml
index fd31faa083926..8fe282ce7539b 100644
--- a/app/code/Magento/CatalogSearch/etc/module.xml
+++ b/app/code/Magento/CatalogSearch/etc/module.xml
@@ -6,10 +6,13 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogSearch" setup_version="2.0.0">
+    <module name="Magento_CatalogSearch" >
         <sequence>
             <module name="Magento_Search"/>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Indexer"/>
+            <module name="Magento_CatalogRule" />
+            <module name="Magento_CatalogInventory" />
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/CatalogSearch/etc/webapi_rest/di.xml b/app/code/Magento/CatalogSearch/etc/webapi_rest/di.xml
new file mode 100644
index 0000000000000..c7293783dc609
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/etc/webapi_rest/di.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:ObjectManager/etc/config.xsd">
+    <type name="Magento\Catalog\Model\ResourceModel\Category">
+        <plugin name="fulltext_search_indexer" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Model\Plugin\Category"/>
+    </type>
+</config>
diff --git a/app/code/Magento/CatalogSearch/etc/webapi_soap/di.xml b/app/code/Magento/CatalogSearch/etc/webapi_soap/di.xml
new file mode 100644
index 0000000000000..c7293783dc609
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/etc/webapi_soap/di.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:ObjectManager/etc/config.xsd">
+    <type name="Magento\Catalog\Model\ResourceModel\Category">
+        <plugin name="fulltext_search_indexer" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Model\Plugin\Category"/>
+    </type>
+</config>
diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv
index 9121520774ccc..ba97dc9de1d31 100644
--- a/app/code/Magento/CatalogSearch/i18n/en_US.csv
+++ b/app/code/Magento/CatalogSearch/i18n/en_US.csv
@@ -37,3 +37,4 @@ name,name
 "Minimal Query Length","Minimal Query Length"
 "Maximum Query Length","Maximum Query Length"
 "Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
+"Please enter a valid price range.","Please enter a valid price range."
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
index e54b45093589a..8dd8e3ed72828 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
@@ -9,16 +9,16 @@
     <body>
         <attribute name="class" value="page-products"/>
         <referenceContainer name="content">
-            <block class="Magento\CatalogSearch\Block\Result" name="search.result" template="Magento_CatalogSearch::result.phtml" cacheable="false">
-                <block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="Magento_Catalog::product/list.phtml" cacheable="false">
+            <block class="Magento\CatalogSearch\Block\Result" name="search.result" template="Magento_CatalogSearch::result.phtml">
+                <block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="Magento_Catalog::product/list.phtml">
                     <arguments>
                         <!-- If argument's position depends on image size changeable in VDE:
                         positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
                     -->
                         <argument name="positioned" xsi:type="string">positions:list-secondary</argument>
                     </arguments>
-                    <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml" cacheable="false">
-                        <block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager" cacheable="false"/>
+                    <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml">
+                        <block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager"/>
                     </block>
                     <action method="setToolbarBlockName">
                         <argument name="name" xsi:type="string">product_list_toolbar</argument>
@@ -36,6 +36,11 @@
                 <action method="setListModes"/>
                 <action method="setListCollection"/>
             </block>
+            <block class="Magento\Framework\View\Element\Template" name="search.search_terms_log" template="Magento_CatalogSearch::search_terms_log.phtml">
+                <arguments>
+                    <argument name="search_terms_log" xsi:type="object">Magento\CatalogSearch\Block\SearchTermsLog</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 53a301022873b..95ea7fcef3a1a 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -147,8 +147,8 @@ require([
                 }
             },
             messages: {
-                'price[to]': {'greater-than-equals-to': 'Please enter a valid price range.'},
-                'price[from]': {'less-than-equals-to': 'Please enter a valid price range.'}
+                'price[to]': {'greater-than-equals-to': '<?= /* @escapeNotVerified */ __('Please enter a valid price range.') ?>'},
+                'price[from]': {'less-than-equals-to': '<?= /* @escapeNotVerified */ __('Please enter a valid price range.') ?>'}
             }
         });
 });
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
new file mode 100644
index 0000000000000..61609bdf66bda
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+?>
+<?php if ($block->getSearchTermsLog()->isPageCacheable()): ?>
+    <script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_CatalogSearch/js/search-terms-log": {
+                "url": "<?= /* @escapeNotVerified */ $block->getUrl('catalogsearch/searchTermsLog/save') ?>"
+            }
+        }
+    }
+</script>
+<?php endif; ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/web/js/search-terms-log.js b/app/code/Magento/CatalogSearch/view/frontend/web/js/search-terms-log.js
new file mode 100644
index 0000000000000..8638a837f56b9
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/view/frontend/web/js/search-terms-log.js
@@ -0,0 +1,21 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mageUtils'
+], function ($, utils) {
+    'use strict';
+
+    return function (data) {
+        $.ajax({
+            method: 'GET',
+            url: data.url,
+            data: {
+                'q': utils.getUrlParameters(window.location.href).q
+            }
+        });
+    };
+});
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
index 6aa33f37cd31f..d18034220cfa8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
@@ -10,7 +10,11 @@
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 
+/**
+ * Model for generate url rewrites for children categories
+ */
 class ChildrenUrlRewriteGenerator
 {
     /**
@@ -28,15 +32,22 @@ class ChildrenUrlRewriteGenerator
      */
     private $mergeDataProviderPrototype;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
+     * @param CategoryRepositoryInterface|null $categoryRepository
      */
     public function __construct(
         ChildrenCategoriesProvider $childrenCategoriesProvider,
         CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory,
-        MergeDataProviderFactory $mergeDataProviderFactory = null
+        MergeDataProviderFactory $mergeDataProviderFactory = null,
+        CategoryRepositoryInterface $categoryRepository = null
     ) {
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->categoryUrlRewriteGeneratorFactory = $categoryUrlRewriteGeneratorFactory;
@@ -44,6 +55,8 @@ public function __construct(
             $mergeDataProviderFactory = ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
         }
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
+        $this->categoryRepository = $categoryRepository
+            ?: ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
     }
 
     /**
@@ -53,18 +66,23 @@ public function __construct(
      * @param \Magento\Catalog\Model\Category $category
      * @param int|null $rootCategoryId
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function generate($storeId, Category $category, $rootCategoryId = null)
     {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
-        foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
-            $childCategory->setStoreId($storeId);
-            $childCategory->setData('save_rewrites_history', $category->getData('save_rewrites_history'));
-            /** @var CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator */
-            $categoryUrlRewriteGenerator = $this->categoryUrlRewriteGeneratorFactory->create();
-            $mergeDataProvider->merge(
-                $categoryUrlRewriteGenerator->generate($childCategory, false, $rootCategoryId)
-            );
+        $childrenIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
+        if ($childrenIds) {
+            foreach ($childrenIds as $childId) {
+                /** @var Category $childCategory */
+                $childCategory = $this->categoryRepository->get($childId, $storeId);
+                $childCategory->setData('save_rewrites_history', $category->getData('save_rewrites_history'));
+                /** @var CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator */
+                $categoryUrlRewriteGenerator = $this->categoryUrlRewriteGeneratorFactory->create();
+                $mergeDataProvider->merge(
+                    $categoryUrlRewriteGenerator->generate($childCategory, false, $rootCategoryId)
+                );
+            }
         }
 
         return $mergeDataProvider->getData();
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
index 17d12ba563ebd..f3984bf7d62ab 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
@@ -6,9 +6,14 @@
 namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Category;
 
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryFactory;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
+use Magento\Store\Model\Store;
 
+/**
+ * Perform url updating for children categories.
+ */
 class Move
 {
     /**
@@ -21,16 +26,24 @@ class Move
      */
     private $childrenCategoriesProvider;
 
+    /**
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
     /**
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
+     * @param CategoryFactory $categoryFactory
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
-        ChildrenCategoriesProvider $childrenCategoriesProvider
+        ChildrenCategoriesProvider $childrenCategoriesProvider,
+        CategoryFactory $categoryFactory
     ) {
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
+        $this->categoryFactory = $categoryFactory;
     }
 
     /**
@@ -51,20 +64,57 @@ public function afterChangeParent(
         Category $newParent,
         $afterCategoryId
     ) {
-        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-        $category->getResource()->saveAttribute($category, 'url_path');
-        $this->updateUrlPathForChildren($category);
+        $categoryStoreId = $category->getStoreId();
+        foreach ($category->getStoreIds() as $storeId) {
+            $category->setStoreId($storeId);
+            if (!$this->isGlobalScope($storeId)) {
+                $this->updateCategoryUrlKeyForStore($category);
+                $category->unsUrlPath();
+                $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+                $category->getResource()->saveAttribute($category, 'url_path');
+                $this->updateUrlPathForChildren($category);
+            }
+        }
+        $category->setStoreId($categoryStoreId);
 
         return $result;
     }
 
     /**
+     * Set category url_key according to current category store id.
+     *
+     * @param Category $category
+     * @return void
+     */
+    private function updateCategoryUrlKeyForStore(Category $category)
+    {
+        $item = $this->categoryFactory->create();
+        $item->setStoreId($category->getStoreId());
+        $item->load($category->getId());
+        $category->setUrlKey($item->getUrlKey());
+    }
+
+    /**
+     * Check is global scope.
+     *
+     * @param int|null $storeId
+     * @return bool
+     */
+    private function isGlobalScope($storeId)
+    {
+        return null === $storeId || $storeId == Store::DEFAULT_STORE_ID;
+    }
+
+    /**
+     * Updates url_path for child categories.
+     *
      * @param Category $category
      * @return void
      */
-    protected function updateUrlPathForChildren($category)
+    private function updateUrlPathForChildren($category)
     {
         foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
+            $childCategory->setStoreId($category->getStoreId());
             $childCategory->unsUrlPath();
             $childCategory->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($childCategory));
             $childCategory->getResource()->saveAttribute($childCategory, 'url_path');
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/UpdateUrlPath.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/UpdateUrlPath.php
new file mode 100644
index 0000000000000..23d11686e8292
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/UpdateUrlPath.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Category;
+
+use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+
+/**
+ * Generate and save url-rewrites for category if its parent have specified url-key for different store views.
+ */
+class UpdateUrlPath
+{
+    /**
+     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
+     */
+    private $categoryUrlPathGenerator;
+
+    /**
+     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
+     */
+    private $categoryUrlRewriteGenerator;
+
+    /**
+     * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
+     */
+    private $storeViewService;
+
+    /**
+     * @var \Magento\UrlRewrite\Model\UrlPersistInterface
+     */
+    private $urlPersist;
+
+    /**
+     * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
+     * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param StoreViewService $storeViewService
+     */
+    public function __construct(
+        CategoryUrlPathGenerator $categoryUrlPathGenerator,
+        CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        StoreViewService $storeViewService
+    ) {
+        $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
+        $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
+        $this->urlPersist = $urlPersist;
+        $this->storeViewService = $storeViewService;
+    }
+
+    /**
+     * Perform url updating for different stores.
+     *
+     * @param CategoryResource $subject
+     * @param CategoryResource $result
+     * @param AbstractModel $category
+     * @return CategoryResource
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(
+        CategoryResource $subject,
+        CategoryResource $result,
+        AbstractModel $category
+    ): CategoryResource {
+        $parentCategoryId = $category->getParentId();
+        if ($category->isObjectNew()
+            && !$category->isInRootCategoryList()
+            && !empty($parentCategoryId)
+        ) {
+            foreach ($category->getStoreIds() as $storeId) {
+                if (!$this->isGlobalScope((int)$storeId)
+                    && $this->storeViewService->doesEntityHaveOverriddenUrlPathForStore(
+                        $storeId,
+                        $parentCategoryId,
+                        Category::ENTITY
+                    )
+                ) {
+                    $category->setStoreId($storeId);
+                    $this->updateUrlPathForCategory($category, $subject);
+                    $this->urlPersist->replace($this->categoryUrlRewriteGenerator->generate($category));
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check that store id is in global scope.
+     *
+     * @param int $storeId
+     * @return bool
+     */
+    private function isGlobalScope(int $storeId): bool
+    {
+        return $storeId === Store::DEFAULT_STORE_ID;
+    }
+
+    /**
+     * Updates category url path.
+     *
+     * @param Category $category
+     * @param CategoryResource $categoryResource
+     * @return void
+     */
+    private function updateUrlPathForCategory(Category $category, CategoryResource $categoryResource): void
+    {
+        $category->unsUrlPath();
+        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        $categoryResource->saveAttribute($category, 'url_path');
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index ee20b0e934b5d..cba9218ce7c72 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -8,6 +8,9 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 
+/**
+ * Class for generation category url_path
+ */
 class CategoryUrlPathGenerator
 {
     /**
@@ -61,9 +64,11 @@ public function __construct(
      * Build category URL path
      *
      * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $category
+     * @param null|\Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $parentCategory
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getUrlPath($category)
+    public function getUrlPath($category, $parentCategory = null)
     {
         if (in_array($category->getParentId(), [Category::ROOT_CATEGORY_ID, Category::TREE_ROOT_ID])) {
             return '';
@@ -77,15 +82,17 @@ public function getUrlPath($category)
             return $category->getUrlPath();
         }
         if ($this->isNeedToGenerateUrlPathForParent($category)) {
-            $parentPath = $this->getUrlPath(
-                $this->categoryRepository->get($category->getParentId(), $category->getStoreId())
-            );
+            $parentCategory = $parentCategory === null ?
+                $this->categoryRepository->get($category->getParentId(), $category->getStoreId()) : $parentCategory;
+            $parentPath = $this->getUrlPath($parentCategory);
             $path = $parentPath === '' ? $path : $parentPath . '/' . $path;
         }
         return $path;
     }
 
     /**
+     * Define whether we should generate URL path for parent
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @return bool
      */
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
index b2da0ab39f31f..a86604672e2b4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
@@ -15,6 +15,9 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 
+/**
+ * Generate list of urls.
+ */
 class CategoryUrlRewriteGenerator
 {
     /** Entity type code */
@@ -84,6 +87,8 @@ public function __construct(
     }
 
     /**
+     * Generate list of urls.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @param bool $overrideStoreUrls
      * @param int|null $rootCategoryId
@@ -119,6 +124,7 @@ protected function generateForGlobalScope(
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $categoryId = $category->getId();
         foreach ($category->getStoreIds() as $storeId) {
+            $category->setStoreId($storeId);
             if (!$this->isGlobalScope($storeId)
                 && $this->isOverrideUrlsForStore($storeId, $categoryId, $overrideStoreUrls)
             ) {
@@ -131,6 +137,8 @@ protected function generateForGlobalScope(
     }
 
     /**
+     * Checks if urls should be overridden for store.
+     *
      * @param int $storeId
      * @param int $categoryId
      * @param bool $overrideStoreUrls
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
index 019959f9c1fea..a048c216139e3 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ObjectRegistry.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\CatalogUrlRewrite\Model;
 
+/**
+ * Class ObjectRegistry
+ */
 class ObjectRegistry
 {
     /**
@@ -26,15 +29,19 @@ public function __construct($entities)
     }
 
     /**
+     * Get Entity
+     *
      * @param int $entityId
      * @return \Magento\Framework\DataObject|null
      */
     public function get($entityId)
     {
-        return isset($this->entitiesMap[$entityId]) ? $this->entitiesMap[$entityId] : null;
+        return $this->entitiesMap[$entityId] ?? null;
     }
 
     /**
+     * List Entities
+     *
      * @return \Magento\Framework\DataObject[]
      */
     public function getList()
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
index 81bbb08b0f39e..6b838f83d31e4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
@@ -207,8 +207,9 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ
      */
     public function isCategoryProperForGenerating(Category $category, $storeId)
     {
-        if ($category->getParentId() != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
-            list(, $rootCategoryId) = $category->getParentIds();
+        $parentIds = $category->getParentIds();
+        if (is_array($parentIds) && count($parentIds) >= 2) {
+            $rootCategoryId = $parentIds[1];
             return $rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId();
         }
         return false;
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
index 2e192d895c6d5..4fdb9a3e2138d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Model;
 
-use Magento\Store\Model\Store;
-
 class ProductUrlPathGenerator
 {
     const XML_PATH_PRODUCT_URL_SUFFIX = 'catalog/seo/product_url_suffix';
@@ -120,11 +118,12 @@ public function getCanonicalUrlPath($product, $category = null)
      * Generate product url key based on url_key entered by merchant or product name
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return string
+     * @return string|null
      */
     public function getUrlKey($product)
     {
-        return $product->getUrlKey() === false ? false : $this->prepareProductUrlKey($product);
+        $generatedProductUrlKey = $this->prepareProductUrlKey($product);
+        return ($product->getUrlKey() === false || empty($generatedProductUrlKey)) ? null : $generatedProductUrlKey;
     }
 
     /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
index 748589924d916..f0351467e5f0e 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/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
index 92a46facbe71c..5d7e323e8b2d8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Category;
@@ -12,6 +13,9 @@
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Store\Model\ResourceModel\Group\CollectionFactory;
+use Magento\Store\Model\ResourceModel\Group\Collection as StoreGroupCollection;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Generates Category Url Rewrites after save and Products Url Rewrites assigned to the category that's being saved
@@ -43,12 +47,18 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface
      */
     private $dataUrlRewriteClassNames;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $storeGroupFactory;
+
     /**
      * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
      * @param UrlRewriteHandler $urlRewriteHandler
      * @param UrlRewriteBunchReplacer $urlRewriteBunchReplacer
      * @param DatabaseMapPool $databaseMapPool
      * @param string[] $dataUrlRewriteClassNames
+     * @param CollectionFactory|null $storeGroupFactory
      */
     public function __construct(
         CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
@@ -56,15 +66,18 @@ public function __construct(
         UrlRewriteBunchReplacer $urlRewriteBunchReplacer,
         DatabaseMapPool $databaseMapPool,
         $dataUrlRewriteClassNames = [
-        DataCategoryUrlRewriteDatabaseMap::class,
-        DataProductUrlRewriteDatabaseMap::class
-        ]
+            DataCategoryUrlRewriteDatabaseMap::class,
+            DataProductUrlRewriteDatabaseMap::class
+        ],
+        CollectionFactory $storeGroupFactory = null
     ) {
         $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
         $this->urlRewriteHandler = $urlRewriteHandler;
         $this->urlRewriteBunchReplacer = $urlRewriteBunchReplacer;
         $this->databaseMapPool = $databaseMapPool;
         $this->dataUrlRewriteClassNames = $dataUrlRewriteClassNames;
+        $this->storeGroupFactory = $storeGroupFactory
+            ?: ObjectManager::getInstance()->get(CollectionFactory::class);
     }
 
     /**
@@ -82,10 +95,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return;
         }
 
+        if (!$category->hasData('store_id')) {
+            $this->setCategoryStoreId($category);
+        }
+
         $mapsGenerated = false;
         if ($category->dataHasChangedFor('url_key')
             || $category->dataHasChangedFor('is_anchor')
-            || $category->getIsChangedProductList()
+            || !empty($category->getChangedProductIds())
         ) {
             if ($category->dataHasChangedFor('url_key')) {
                 $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
@@ -102,6 +119,29 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
     }
 
+    /**
+     * In case store_id is not set for category then we can assume that it was passed through product import.
+     * Store group must have only one root category, so receiving category's path and checking if one of it parts
+     * is the root category for store group, we can set default_store_id value from it to category.
+     * it prevents urls duplication for different stores
+     * ("Default Category/category/sub" and "Default Category2/category/sub")
+     *
+     * @param Category $category
+     * @return void
+     */
+    private function setCategoryStoreId($category)
+    {
+        /** @var StoreGroupCollection $storeGroupCollection */
+        $storeGroupCollection = $this->storeGroupFactory->create();
+
+        foreach ($storeGroupCollection as $storeGroup) {
+            /** @var \Magento\Store\Model\Group $storeGroup */
+            if (in_array($storeGroup->getRootCategoryId(), explode('/', $category->getPath()))) {
+                $category->setStoreId($storeGroup->getDefaultStoreId());
+            }
+        }
+    }
+
     /**
      * Resets used data maps to free up memory and temporary tables
      *
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
index eb54f0427c11a..713dd6ac0c736 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
@@ -8,11 +8,15 @@
 use Magento\Catalog\Model\Category;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\Event\Observer;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\Store;
 
+/**
+ * Class for set or update url path.
+ */
 class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
 {
     /**
@@ -30,22 +34,32 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
      */
     protected $storeViewService;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
+     * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
         ChildrenCategoriesProvider $childrenCategoriesProvider,
-        StoreViewService $storeViewService
+        StoreViewService $storeViewService,
+        CategoryRepositoryInterface $categoryRepository
     ) {
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->storeViewService = $storeViewService;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
+     * Method for update/set url path.
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -57,45 +71,69 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $useDefaultAttribute = !$category->isObjectNew() && !empty($category->getData('use_default')['url_key']);
         if ($category->getUrlKey() !== false && !$useDefaultAttribute) {
             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
-            if (empty($resultUrlKey)) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
-            }
-            $category->setUrlKey($resultUrlKey)
-                ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-            if (!$category->isObjectNew()) {
-                $category->getResource()->saveAttribute($category, 'url_path');
-                if ($category->dataHasChangedFor('url_path')) {
-                    $this->updateUrlPathForChildren($category);
-                }
+            $this->updateUrlKey($category, $resultUrlKey);
+        } else if ($useDefaultAttribute) {
+            $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
+            $this->updateUrlKey($category, $resultUrlKey);
+            $category->setUrlKey(null)->setUrlPath(null);
+        }
+    }
+
+    /**
+     * Update Url Key
+     *
+     * @param Category $category
+     * @param string $urlKey
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function updateUrlKey($category, $urlKey)
+    {
+        if (empty($urlKey)) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
+        }
+        $category->setUrlKey($urlKey)
+            ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        if (!$category->isObjectNew()) {
+            $category->getResource()->saveAttribute($category, 'url_path');
+            if ($category->dataHasChangedFor('url_path')) {
+                $this->updateUrlPathForChildren($category);
             }
         }
     }
 
     /**
+     * Update url path for children category.
+     *
      * @param Category $category
      * @return void
      */
     protected function updateUrlPathForChildren(Category $category)
     {
-        $children = $this->childrenCategoriesProvider->getChildren($category, true);
-
         if ($this->isGlobalScope($category->getStoreId())) {
-            foreach ($children as $child) {
+            $childrenIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
+            foreach ($childrenIds as $childId) {
                 foreach ($category->getStoreIds() as $storeId) {
                     if ($this->storeViewService->doesEntityHaveOverriddenUrlPathForStore(
                         $storeId,
-                        $child->getId(),
+                        $childId,
                         Category::ENTITY
                     )) {
-                        $child->setStoreId($storeId);
+                        $child = $this->categoryRepository->get($childId, $storeId);
                         $this->updateUrlPathForCategory($child);
                     }
                 }
             }
         } else {
+            $children = $this->childrenCategoriesProvider->getChildren($category, true);
             foreach ($children as $child) {
+                /** @var Category $child */
                 $child->setStoreId($category->getStoreId());
-                $this->updateUrlPathForCategory($child);
+                if ($child->getParentId() === $category->getId()) {
+                    $this->updateUrlPathForCategory($child, $category);
+                } else {
+                    $this->updateUrlPathForCategory($child);
+                }
             }
         }
     }
@@ -112,13 +150,17 @@ protected function isGlobalScope($storeId)
     }
 
     /**
+     * Update url path for category.
+     *
      * @param Category $category
+     * @param Category|null $parentCategory
      * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function updateUrlPathForCategory(Category $category)
+    protected function updateUrlPathForCategory(Category $category, Category $parentCategory = null)
     {
         $category->unsUrlPath();
-        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category, $parentCategory));
         $category->getResource()->saveAttribute($category, 'url_path');
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
index e4ccd0b869db7..6eda8dd0b61ee 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
@@ -6,11 +6,15 @@
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Product;
+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\App\ObjectManager;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class ProductProcessUrlRewriteSavingObserver
+ */
 class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
 {
     /**
@@ -23,22 +27,33 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
      */
     private $urlPersist;
 
+    /**
+     * @var ProductUrlPathGenerator
+     */
+    private $productUrlPathGenerator;
+
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
+     * @param ProductUrlPathGenerator|null $productUrlPathGenerator
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
-        UrlPersistInterface $urlPersist
+        UrlPersistInterface $urlPersist,
+        ProductUrlPathGenerator $productUrlPathGenerator = null
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
+        $this->productUrlPathGenerator = $productUrlPathGenerator ?: ObjectManager::getInstance()
+            ->get(ProductUrlPathGenerator::class);
     }
 
     /**
      * Generate urls for UrlRewrite and save it in storage
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
+     * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -50,14 +65,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             || $product->getIsChangedWebsites()
             || $product->dataHasChangedFor('visibility')
         ) {
-            $this->urlPersist->deleteByData([
-                UrlRewrite::ENTITY_ID => $product->getId(),
-                UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-                UrlRewrite::REDIRECT_TYPE => 0,
-                UrlRewrite::STORE_ID => $product->getStoreId()
-            ]);
-
             if ($product->isVisibleInSiteVisibility()) {
+                $product->unsUrlPath();
+                $product->setUrlPath($this->productUrlPathGenerator->getUrlPath($product));
                 $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
             }
         }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
index b201ae31b680a..28afff56c019f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
@@ -33,6 +33,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var Product $product */
         $product = $observer->getEvent()->getProduct();
-        $product->setUrlKey($this->productUrlPathGenerator->getUrlKey($product));
+        $urlKey = $this->productUrlPathGenerator->getUrlKey($product);
+        if (null !== $urlKey) {
+            $product->setUrlKey($urlKey);
+        }
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 5a6777f94e2d5..c4ec0bb3a74b2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -3,27 +3,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
+use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\UrlRewrite\Model\MergeDataProvider;
+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class UrlRewriteHandler
 {
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
+     * @var ChildrenCategoriesProvider
      */
     protected $childrenCategoriesProvider;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
+     * @var CategoryUrlRewriteGenerator
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
+     * @var ProductUrlRewriteGenerator
      */
     protected $productUrlRewriteGenerator;
 
     /**
-     * @var \Magento\UrlRewrite\Model\UrlPersistInterface
+     * @var UrlPersistInterface
      */
     protected $urlPersist;
 
@@ -33,44 +54,51 @@ class UrlRewriteHandler
     protected $isSkippedProduct;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     * @var CollectionFactory
      */
     protected $productCollectionFactory;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator
+     * @var CategoryProductUrlPathGenerator
      */
     private $categoryBasedProductRewriteGenerator;
 
     /**
-     * @var \Magento\UrlRewrite\Model\MergeDataProvider
+     * @var MergeDataProvider
      */
     private $mergeDataProviderPrototype;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var Json
      */
     private $serializer;
 
     /**
-     * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
-     * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
-     * @param \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator
-     * @param \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist
-     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-     * @param \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
-     * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @var ProductScopeRewriteGenerator
+     */
+    private $productScopeRewriteGenerator;
+
+    /**
+     * @param ChildrenCategoriesProvider $childrenCategoriesProvider
+     * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
+     * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param CollectionFactory $productCollectionFactory
+     * @param CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
+     * @param MergeDataProviderFactory|null $mergeDataProviderFactory
+     * @param Json|null $serializer
+     * @param ProductScopeRewriteGenerator|null $productScopeRewriteGenerator
      */
     public function __construct(
-        \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider,
-        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
-        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator,
-        \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-        \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
-        \Magento\UrlRewrite\Model\MergeDataProviderFactory $mergeDataProviderFactory = null,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        ChildrenCategoriesProvider $childrenCategoriesProvider,
+        CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
+        ProductUrlRewriteGenerator $productUrlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        CollectionFactory $productCollectionFactory,
+        CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
+        MergeDataProviderFactory $mergeDataProviderFactory = null,
+        Json $serializer = null,
+        ProductScopeRewriteGenerator $productScopeRewriteGenerator = null
     ) {
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
@@ -79,57 +107,29 @@ public function __construct(
         $this->productCollectionFactory = $productCollectionFactory;
         $this->categoryBasedProductRewriteGenerator = $categoryBasedProductRewriteGenerator;
 
-        if (!isset($mergeDataProviderFactory)) {
-            $mergeDataProviderFactory =  \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\UrlRewrite\Model\MergeDataProviderFactory::class
-            );
-        }
-
+        $objectManager = ObjectManager::getInstance();
+        $mergeDataProviderFactory = $mergeDataProviderFactory ?: $objectManager->get(MergeDataProviderFactory::class);
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
-
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Serialize\Serializer\Json::class
-        );
+        $this->serializer = $serializer ?: $objectManager->get(Json::class);
+        $this->productScopeRewriteGenerator = $productScopeRewriteGenerator
+            ?: $objectManager->get(ProductScopeRewriteGenerator::class);
     }
 
     /**
-     * Generate url rewrites for products assigned to category
+     * Generates URL rewrites for products assigned to category.
      *
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
      * @return array
      */
-    public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $category)
+    public function generateProductUrlRewrites(Category $category): array
     {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $this->isSkippedProduct[$category->getEntityId()] = [];
-        $saveRewriteHistory = $category->getData('save_rewrites_history');
-        $storeId = $category->getStoreId();
-        if ($category->getAffectedProductIds()) {
-            $this->isSkippedProduct[$category->getEntityId()] = $category->getAffectedProductIds();
-            /* @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
-            $collection = $this->productCollectionFactory->create()
-                ->setStoreId($storeId)
-                ->addIdFilter($category->getAffectedProductIds())
-                ->addAttributeToSelect('visibility')
-                ->addAttributeToSelect('name')
-                ->addAttributeToSelect('url_key')
-                ->addAttributeToSelect('url_path');
+        $saveRewriteHistory = (bool)$category->getData('save_rewrites_history');
+        $storeId = (int)$category->getStoreId();
 
-            $collection->setPageSize(1000);
-            $pageCount = $collection->getLastPageNumber();
-            $currentPage = 1;
-            while ($currentPage <= $pageCount) {
-                $collection->setCurPage($currentPage);
-                foreach ($collection as $product) {
-                    $product->setStoreId($storeId);
-                    $product->setData('save_rewrites_history', $saveRewriteHistory);
-                    $mergeDataProvider->merge(
-                        $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
-                    );
-                }
-                $collection->clear();
-                $currentPage++;
-            }
+        if ($category->getChangedProductIds()) {
+            $this->generateChangedProductUrls($mergeDataProvider, $category, $storeId, $saveRewriteHistory);
         } else {
             $mergeDataProvider->merge(
                 $this->getCategoryProductsUrlRewrites(
@@ -140,6 +140,7 @@ public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $cate
                 )
             );
         }
+
         foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
             $mergeDataProvider->merge(
                 $this->getCategoryProductsUrlRewrites(
@@ -155,21 +156,49 @@ public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $cate
     }
 
     /**
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
+     * @return void
+     */
+    public function deleteCategoryRewritesForChildren(Category $category)
+    {
+        $categoryIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
+        $categoryIds[] = $category->getId();
+        foreach ($categoryIds as $categoryId) {
+            $this->urlPersist->deleteByData(
+                [
+                    UrlRewrite::ENTITY_ID =>
+                        $categoryId,
+                    UrlRewrite::ENTITY_TYPE =>
+                        CategoryUrlRewriteGenerator::ENTITY_TYPE,
+                ]
+            );
+            $this->urlPersist->deleteByData(
+                [
+                    UrlRewrite::METADATA =>
+                        $this->serializer->serialize(['category_id' => $categoryId]),
+                    UrlRewrite::ENTITY_TYPE =>
+                        ProductUrlRewriteGenerator::ENTITY_TYPE,
+                ]
+            );
+        }
+    }
+
+    /**
+     * @param Category $category
      * @param int $storeId
      * @param bool $saveRewriteHistory
      * @param int|null $rootCategoryId
      * @return array
      */
     private function getCategoryProductsUrlRewrites(
-        \Magento\Catalog\Model\Category $category,
+        Category $category,
         $storeId,
         $saveRewriteHistory,
         $rootCategoryId = null
     ) {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
 
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+        /** @var Collection $productCollection */
         $productCollection = $this->productCollectionFactory->create();
 
         $productCollection->addCategoriesFilter(['eq' => [$category->getEntityId()]])
@@ -197,30 +226,65 @@ private function getCategoryProductsUrlRewrites(
     }
 
     /**
-     * @param \Magento\Catalog\Model\Category $category
+     * Generates product URL rewrites.
+     *
+     * @param MergeDataProvider $mergeDataProvider
+     * @param Category $category
+     * @param int $storeId
+     * @param bool $saveRewriteHistory
      * @return void
      */
-    public function deleteCategoryRewritesForChildren(\Magento\Catalog\Model\Category $category)
-    {
-        $categoryIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
-        $categoryIds[] = $category->getId();
-        foreach ($categoryIds as $categoryId) {
-            $this->urlPersist->deleteByData(
-                [
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_ID =>
-                        $categoryId,
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE =>
-                        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::ENTITY_TYPE,
-                ]
-            );
-            $this->urlPersist->deleteByData(
-                [
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::METADATA =>
-                        $this->serializer->serialize(['category_id' => $categoryId]),
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE =>
-                        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
-                ]
-            );
+    private function generateChangedProductUrls(
+        MergeDataProvider $mergeDataProvider,
+        Category $category,
+        int $storeId,
+        bool $saveRewriteHistory
+    ) {
+        $this->isSkippedProduct[$category->getEntityId()] = $category->getAffectedProductIds();
+
+        $categoryStoreIds = [$storeId];
+        // If category is changed in the Global scope when need to regenerate product URL rewrites for all other scopes.
+        if ($this->productScopeRewriteGenerator->isGlobalScope($storeId)) {
+            $categoryStoreIds = $this->getCategoryStoreIds($category);
+        }
+
+        foreach ($categoryStoreIds as $categoryStoreId) {
+            /* @var Collection $collection */
+            $collection = $this->productCollectionFactory->create()
+                ->setStoreId($categoryStoreId)
+                ->addIdFilter($category->getAffectedProductIds())
+                ->addAttributeToSelect('visibility')
+                ->addAttributeToSelect('name')
+                ->addAttributeToSelect('url_key')
+                ->addAttributeToSelect('url_path');
+
+            $collection->setPageSize(1000);
+            $pageCount = $collection->getLastPageNumber();
+            $currentPage = 1;
+            while ($currentPage <= $pageCount) {
+                $collection->setCurPage($currentPage);
+                foreach ($collection as $product) {
+                    $product->setData('save_rewrites_history', $saveRewriteHistory);
+                    $product->setStoreId($categoryStoreId);
+                    $mergeDataProvider->merge(
+                        $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
+                    );
+                }
+                $collection->clear();
+                $currentPage++;
+            }
         }
     }
+
+    /**
+     * Gets category store IDs without Global Store.
+     *
+     * @param Category $category
+     * @return array
+     */
+    private function getCategoryStoreIds(Category $category): array
+    {
+        $ids = $category->getStoreIds();
+        return array_filter($ids);
+    }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Webapi/Controller/Rest/InputParamsResolver.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Webapi/Controller/Rest/InputParamsResolver.php
new file mode 100644
index 0000000000000..4e8e3840693a5
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Webapi/Controller/Rest/InputParamsResolver.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Webapi\Rest\Request as RestRequest;
+
+/**
+ * Plugin for InputParamsResolver
+ *
+ * Used to modify product data with save_rewrites_history flag
+ */
+class InputParamsResolver
+{
+    /**
+     * @var RestRequest
+     */
+    private $request;
+
+    /**
+     * @param RestRequest $request
+     */
+    public function __construct(RestRequest $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Add 'save_rewrites_history' param to the product data
+     *
+     * @see \Magento\CatalogUrlRewrite\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper
+     * @param \Magento\Webapi\Controller\Rest\InputParamsResolver $subject
+     * @param array $result
+     * @return array
+     */
+    public function afterResolve(\Magento\Webapi\Controller\Rest\InputParamsResolver $subject, array $result): array
+    {
+        $route = $subject->getRoute();
+        $serviceMethodName = $route->getServiceMethod();
+        $serviceClassName = $route->getServiceClass();
+        $requestBodyParams = $this->request->getBodyParams();
+
+        if ($this->isProductSaveCalled($serviceClassName, $serviceMethodName)
+            && $this->isCustomAttributesExists($requestBodyParams)) {
+            foreach ($requestBodyParams['product']['custom_attributes'] as $attribute) {
+                if ($attribute['attribute_code'] === 'save_rewrites_history') {
+                    foreach ($result as $resultItem) {
+                        if ($resultItem instanceof \Magento\Catalog\Model\Product) {
+                            $resultItem->setData('save_rewrites_history', (bool)$attribute['value']);
+                            break 2;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Check that product save method called
+     *
+     * @param string $serviceClassName
+     * @param string $serviceMethodName
+     * @return bool
+     */
+    private function isProductSaveCalled(string $serviceClassName, string $serviceMethodName): bool
+    {
+        return $serviceClassName === ProductRepositoryInterface::class && $serviceMethodName === 'save';
+    }
+
+    /**
+     * Check is any custom options exists in product data
+     *
+     * @param array $requestBodyParams
+     * @return bool
+     */
+    private function isCustomAttributesExists(array $requestBodyParams): bool
+    {
+        return !empty($requestBodyParams['product']['custom_attributes']);
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php b/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php
deleted file mode 100644
index bbc5f497843b0..0000000000000
--- a/app/code/Magento/CatalogUrlRewrite/Setup/InstallData.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogUrlRewrite\Setup;
-
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
-            'url_key',
-            [
-                'type' => 'varchar',
-                'label' => 'URL Key',
-                'input' => 'text',
-                'required' => false,
-                'sort_order' => 3,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'group' => 'General Information',
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Category::ENTITY,
-            'url_path',
-            [
-                'type' => 'varchar',
-                'required' => false,
-                'sort_order' => 17,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'visible' => false,
-                'group' => 'General Information',
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'url_key',
-            [
-                'type' => 'varchar',
-                'label' => 'URL Key',
-                'input' => 'text',
-                'required' => false,
-                'sort_order' => 10,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'used_in_product_listing' => true,
-                'group' => 'Search Engine Optimization',
-                'is_used_in_grid' => true,
-                'is_visible_in_grid' => false,
-                'is_filterable_in_grid' => true,
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'url_path',
-            [
-                'type' => 'varchar',
-                'required' => false,
-                'sort_order' => 11,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'visible' => false,
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php b/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
deleted file mode 100644
index 44ccdab247a9e..0000000000000
--- a/app/code/Magento/CatalogUrlRewrite/Setup/InstallSchema.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogUrlRewrite\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        $tableName = \Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product::TABLE_NAME;
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable($tableName))
-            ->addColumn(
-                'url_rewrite_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'url_rewrite_id'
-            )
-            ->addColumn(
-                'category_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'category_id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'product_id'
-            )
-            ->addIndex(
-                $installer->getIdxName($tableName, ['category_id', 'product_id']),
-                ['category_id', 'product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName($tableName, 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName($tableName, 'url_rewrite_id', 'url_rewrite', 'url_rewrite_id'),
-                'url_rewrite_id',
-                $installer->getTable('url_rewrite'),
-                'url_rewrite_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('url_rewrite_relation');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php b/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php
new file mode 100644
index 0000000000000..22e87174e1f11
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogUrlRewrite\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class CreateUrlAttributes
+ * @package Magento\CatalogUrlRewrite\Setup\Patch
+ */
+class CreateUrlAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * CreateUrlAttributes constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'url_key',
+            [
+                'type' => 'varchar',
+                'label' => 'URL Key',
+                'input' => 'text',
+                'required' => false,
+                'sort_order' => 3,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'group' => 'General Information',
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'url_path',
+            [
+                'type' => 'varchar',
+                'required' => false,
+                'sort_order' => 17,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'visible' => false,
+                'group' => 'General Information',
+            ]
+        );
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'url_key',
+            [
+                'type' => 'varchar',
+                'label' => 'URL Key',
+                'input' => 'text',
+                'required' => false,
+                'sort_order' => 10,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'used_in_product_listing' => true,
+                'group' => 'Search Engine Optimization',
+                'is_used_in_grid' => true,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => true,
+            ]
+        );
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'url_path',
+            [
+                'type' => 'varchar',
+                'required' => false,
+                'sort_order' => 11,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'visible' => false,
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE.txt b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE.txt
rename to app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE_AFL.txt b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE_AFL.txt
rename to app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md
new file mode 100644
index 0000000000000..785d0cce48c3e
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Url Rewrite Functional Tests
+
+The Functional Test Module for **Magento Catalog Url Rewrite** module.
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml
new file mode 100644
index 0000000000000..67870c51140a6
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="RewriteStoreLevelUrlKeyOfChildCategoryTest">
+        <annotations>
+            <title value="Rewriting Store-level URL key of child category"/>
+            <stories value="MAGETWO-91649: #13513: Magento ignore store-level url_key of child category in URL rewrite process for global scope"/>
+            <description value="Rewriting Store-level URL key of child category"/>
+            <features value="CatalogUrlRewrite"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94934"/>
+            <group value="CatalogUrlRewrite"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+
+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
+            <createData entity="SubCategoryWithParent" stepKey="subCategory">
+                <requiredEntity createDataKey="defaultCategory"/>
+            </createData>
+        </before>
+
+        <actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedSubCategory">
+            <argument name="Category" value="$$subCategory$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewForSubCategory"/>
+
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyForSubCategory">
+            <argument name="value" value="bags-second"/>
+        </actionGroup>
+
+        <actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedDefaultCategory">
+            <argument name="Category" value="$$defaultCategory$$"/>
+        </actionGroup>
+
+        <actionGroup ref="ChangeSeoUrlKey" stepKey="changeSeoUrlKeyForDefaultCategory">
+            <argument name="value" value="gear-global"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchStoreView"/>
+
+        <actionGroup ref="GoToSubCategoryPage" stepKey="goToSubCategoryPage">
+            <argument name="parentCategory" value="$$defaultCategory$$"/>
+            <argument name="subCategory" value="$$subCategory$$"/>
+            <argument name="urlPath" value="gear-global/bags-second"/>
+        </actionGroup>
+
+        <after>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
+            <deleteData createDataKey="defaultCategory" stepKey="deleteNewRootCategory"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
index 3f641256b1259..f8422c7c05fa6 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
@@ -31,6 +31,9 @@ class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    private $categoryRepository;
+
     protected function setUp()
     {
         $this->serializerMock = $this->getMockBuilder(Json::class)
@@ -47,6 +50,9 @@ protected function setUp()
         $this->categoryUrlRewriteGenerator = $this->getMockBuilder(
             \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::class
         )->disableOriginalConstructor()->getMock();
+        $this->categoryRepository = $this->getMockBuilder(
+            \Magento\Catalog\Model\CategoryRepository::class
+        )->disableOriginalConstructor()->getMock();
         $mergeDataProviderFactory = $this->createPartialMock(
             \Magento\UrlRewrite\Model\MergeDataProviderFactory::class,
             ['create']
@@ -59,14 +65,15 @@ protected function setUp()
             [
                 'childrenCategoriesProvider' => $this->childrenCategoriesProvider,
                 'categoryUrlRewriteGeneratorFactory' => $this->categoryUrlRewriteGeneratorFactory,
-                'mergeDataProviderFactory' => $mergeDataProviderFactory
+                'mergeDataProviderFactory' => $mergeDataProviderFactory,
+                'categoryRepository' => $this->categoryRepository
             ]
         );
     }
 
     public function testNoChildrenCategories()
     {
-        $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->with($this->category, true)
+        $this->childrenCategoriesProvider->expects($this->once())->method('getChildrenIds')->with($this->category, true)
             ->will($this->returnValue([]));
 
         $this->assertEquals([], $this->childrenUrlRewriteGenerator->generate('store_id', $this->category));
@@ -76,14 +83,16 @@ public function testGenerate()
     {
         $storeId = 'store_id';
         $saveRewritesHistory = 'flag';
+        $childId = 2;
 
         $childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()->getMock();
-        $childCategory->expects($this->once())->method('setStoreId')->with($storeId);
         $childCategory->expects($this->once())->method('setData')
             ->with('save_rewrites_history', $saveRewritesHistory);
-        $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->with($this->category, true)
-            ->will($this->returnValue([$childCategory]));
+        $this->childrenCategoriesProvider->expects($this->once())->method('getChildrenIds')->with($this->category, true)
+            ->will($this->returnValue([$childId]));
+        $this->categoryRepository->expects($this->once())->method('get')
+            ->with($childId, $storeId)->willReturn($childCategory);
         $this->category->expects($this->any())->method('getData')->with('save_rewrites_history')
             ->will($this->returnValue($saveRewritesHistory));
         $this->categoryUrlRewriteGeneratorFactory->expects($this->once())->method('create')
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
index f91a55c11b974..85e8837027151 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Category;
 
+use Magento\Catalog\Model\CategoryFactory;
 use Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move as CategoryMovePlugin;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
@@ -39,6 +40,11 @@ class MoveTest extends \PHPUnit\Framework\TestCase
      */
     private $categoryMock;
 
+    /**
+     * @var CategoryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryFactory;
+
     /**
      * @var CategoryMovePlugin
      */
@@ -55,28 +61,44 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getChildren'])
             ->getMock();
+        $this->categoryFactory = $this->getMockBuilder(CategoryFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->subjectMock = $this->getMockBuilder(CategoryResourceModel::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->categoryMock = $this->getMockBuilder(Category::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getResource', 'setUrlPath'])
+            ->setMethods(['getResource', 'setUrlPath', 'getStoreIds', 'getStoreId', 'setStoreId'])
             ->getMock();
         $this->plugin = $this->objectManager->getObject(
             CategoryMovePlugin::class,
             [
                 'categoryUrlPathGenerator' => $this->categoryUrlPathGeneratorMock,
-                'childrenCategoriesProvider' => $this->childrenCategoriesProviderMock
+                'childrenCategoriesProvider' => $this->childrenCategoriesProviderMock,
+                'categoryFactory' => $this->categoryFactory
             ]
         );
     }
 
+    /**
+     * Tests url updating for children categories.
+     */
     public function testAfterChangeParent()
     {
         $urlPath = 'test/path';
-        $this->categoryMock->expects($this->once())
-            ->method('getResource')
+        $storeIds = [1];
+        $originalCategory = $this->getMockBuilder(Category::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->categoryFactory->method('create')
+            ->willReturn($originalCategory);
+
+        $this->categoryMock->method('getResource')
             ->willReturn($this->subjectMock);
+        $this->categoryMock->expects($this->once())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
         $this->childrenCategoriesProviderMock->expects($this->once())
             ->method('getChildren')
             ->with($this->categoryMock, true)
@@ -85,9 +107,6 @@ public function testAfterChangeParent()
             ->method('getUrlPath')
             ->with($this->categoryMock)
             ->willReturn($urlPath);
-        $this->categoryMock->expects($this->once())
-            ->method('getResource')
-            ->willReturn($this->subjectMock);
         $this->categoryMock->expects($this->once())
             ->method('setUrlPath')
             ->with($urlPath);
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/UpdateUrlPathTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/UpdateUrlPathTest.php
new file mode 100644
index 0000000000000..1d1f9c7fad91b
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/UpdateUrlPathTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+
+/**
+ * Unit test for Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\UpdateUrlPath class.
+ */
+class UpdateUrlPathTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var CategoryUrlPathGenerator|MockObject
+     */
+    private $categoryUrlPathGenerator;
+
+    /**
+     * @var CategoryUrlRewriteGenerator|MockObject
+     */
+    private $categoryUrlRewriteGenerator;
+
+    /**
+     * @var StoreViewService|MockObject
+     */
+    private $storeViewService;
+
+    /**
+     * @var UrlPersistInterface|MockObject
+     */
+    private $urlPersist;
+
+    /**
+     * @var CategoryResource|MockObject
+     */
+    private $categoryResource;
+
+    /**
+     * @var Category|MockObject
+     */
+    private $category;
+
+    /**
+     * @var \Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\UpdateUrlPath
+     */
+    private $updateUrlPathPlugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->categoryUrlPathGenerator = $this->getMockBuilder(CategoryUrlPathGenerator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrlPath'])
+            ->getMock();
+        $this->categoryUrlRewriteGenerator = $this->getMockBuilder(CategoryUrlRewriteGenerator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['generate'])
+            ->getMock();
+        $this->categoryResource = $this->getMockBuilder(CategoryResource::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['saveAttribute'])
+            ->getMock();
+        $this->category = $this->getMockBuilder(Category::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getStoreId',
+                    'getParentId',
+                    'isObjectNew',
+                    'isInRootCategoryList',
+                    'getStoreIds',
+                    'setStoreId',
+                    'unsUrlPath',
+                    'setUrlPath',
+                ]
+            )
+            ->getMock();
+        $this->storeViewService = $this->getMockBuilder(StoreViewService::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['doesEntityHaveOverriddenUrlPathForStore'])
+            ->getMock();
+        $this->urlPersist = $this->getMockBuilder(UrlPersistInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['replace'])
+            ->getMockForAbstractClass();
+
+        $this->updateUrlPathPlugin = $this->objectManager->getObject(
+            \Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\UpdateUrlPath::class,
+            [
+                'categoryUrlPathGenerator' => $this->categoryUrlPathGenerator,
+                'categoryUrlRewriteGenerator' => $this->categoryUrlRewriteGenerator,
+                'urlPersist' => $this->urlPersist,
+                'storeViewService' => $this->storeViewService,
+            ]
+        );
+    }
+
+    public function testAroundSaveWithoutRootCategory()
+    {
+        $this->category->expects($this->atLeastOnce())->method('getParentId')->willReturn(0);
+        $this->category->expects($this->atLeastOnce())->method('isObjectNew')->willReturn(true);
+        $this->category->expects($this->atLeastOnce())->method('isInRootCategoryList')->willReturn(false);
+        $this->category->expects($this->never())->method('getStoreIds');
+
+        $this->assertEquals(
+            $this->categoryResource,
+            $this->updateUrlPathPlugin->afterSave($this->categoryResource, $this->categoryResource, $this->category)
+        );
+    }
+
+    public function testAroundSaveWithRootCategory()
+    {
+        $parentId = 1;
+        $categoryStoreIds = [0,1,2];
+        $generatedUrlPath = 'parent_category/child_category';
+
+        $this->categoryUrlPathGenerator
+            ->expects($this->once())
+            ->method('getUrlPath')
+            ->with($this->category)
+            ->willReturn($generatedUrlPath);
+        $this->category->expects($this->atLeastOnce())->method('getParentId')->willReturn($parentId);
+        $this->category->expects($this->atLeastOnce())->method('isObjectNew')->willReturn(true);
+        $this->category->expects($this->atLeastOnce())->method('isInRootCategoryList')->willReturn(false);
+        $this->category->expects($this->atLeastOnce())->method('getStoreIds')->willReturn($categoryStoreIds);
+        $this->category->expects($this->once())->method('setStoreId')->with($categoryStoreIds[2])->willReturnSelf();
+        $this->category->expects($this->once())->method('unsUrlPath')->willReturnSelf();
+        $this->category->expects($this->once())->method('setUrlPath')->with($generatedUrlPath)->willReturnSelf();
+        $this->storeViewService->expects($this->exactly(2))->method('doesEntityHaveOverriddenUrlPathForStore')
+            ->willReturnMap(
+                [
+                    [$categoryStoreIds[1], $parentId, 'catalog_category', false],
+                    [$categoryStoreIds[2], $parentId, 'catalog_category', true],
+                ]
+            );
+        $this->categoryResource
+            ->expects($this->once())
+            ->method('saveAttribute')
+            ->with($this->category, 'url_path')
+            ->willReturnSelf();
+        $generatedUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->categoryUrlRewriteGenerator->expects($this->once())->method('generate')->with($this->category)
+            ->willReturn([$generatedUrlRewrite]);
+        $this->urlPersist->expects($this->once())->method('replace')->with([$generatedUrlRewrite])->willReturnSelf();
+
+        $this->assertEquals(
+            $this->categoryResource,
+            $this->updateUrlPathPlugin->afterSave($this->categoryResource, $this->categoryResource, $this->category)
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php
index 48399d5ef612b..06be01445df4c 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php
@@ -47,6 +47,9 @@ class ProductScopeRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
     private $serializer;
 
+    /** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
+    private $categoryMock;
+
     public function setUp()
     {
         $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
@@ -83,6 +86,10 @@ function ($value) {
         $this->storeViewService = $this->getMockBuilder(\Magento\CatalogUrlRewrite\Service\V1\StoreViewService::class)
             ->disableOriginalConstructor()->getMock();
         $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $storeRootCategoryId = 2;
+        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
+        $store->expects($this->any())->method('getRootCategoryId')->will($this->returnValue($storeRootCategoryId));
+        $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $mergeDataProviderFactory = $this->createPartialMock(
             \Magento\UrlRewrite\Model\MergeDataProviderFactory::class,
             ['create']
@@ -103,6 +110,7 @@ function ($value) {
                 'mergeDataProviderFactory' => $mergeDataProviderFactory
             ]
         );
+        $this->categoryMock = $this->getMockBuilder(Category::class)->disableOriginalConstructor()->getMock();
     }
 
     public function testGenerationForGlobalScope()
@@ -112,12 +120,6 @@ public function testGenerationForGlobalScope()
         $product->expects($this->any())->method('getStoreIds')->will($this->returnValue([1]));
         $this->storeViewService->expects($this->once())->method('doesEntityHaveOverriddenUrlKeyForStore')
             ->will($this->returnValue(false));
-        $categoryMock = $this->getMockBuilder(Category::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $categoryMock->expects($this->once())
-            ->method('getParentId')
-            ->willReturn(1);
         $this->initObjectRegistryFactory([]);
         $canonical = new \Magento\UrlRewrite\Service\V1\Data\UrlRewrite([], $this->serializer);
         $canonical->setRequestPath('category-1')
@@ -149,25 +151,21 @@ public function testGenerationForGlobalScope()
                 'category-3_3' => $current,
                 'category-4_4' => $anchorCategories
             ],
-            $this->productScopeGenerator->generateForGlobalScope([$categoryMock], $product, 1)
+            $this->productScopeGenerator->generateForGlobalScope([$this->categoryMock], $product, 1)
         );
     }
 
     public function testGenerationForSpecificStore()
     {
+        $storeRootCategoryId = 2;
+        $category_id = 4;
         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
         $product->expects($this->any())->method('getStoreId')->will($this->returnValue(1));
         $product->expects($this->never())->method('getStoreIds');
-        $storeRootCategoryId = 'root-for-store-id';
-        $category = $this->createMock(\Magento\Catalog\Model\Category::class);
-        $category->expects($this->any())->method('getParentIds')
+        $this->categoryMock->expects($this->any())->method('getParentIds')
             ->will($this->returnValue(['root-id', $storeRootCategoryId]));
-        $category->expects($this->any())->method('getParentId')->will($this->returnValue('parent_id'));
-        $category->expects($this->any())->method('getId')->will($this->returnValue('category_id'));
-        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
-        $store->expects($this->any())->method('getRootCategoryId')->will($this->returnValue($storeRootCategoryId));
-        $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
-        $this->initObjectRegistryFactory([$category]);
+        $this->categoryMock->expects($this->any())->method('getId')->will($this->returnValue($category_id));
+        $this->initObjectRegistryFactory([$this->categoryMock]);
         $canonical = new \Magento\UrlRewrite\Service\V1\Data\UrlRewrite([], $this->serializer);
         $canonical->setRequestPath('category-1')
             ->setStoreId(1);
@@ -184,7 +182,7 @@ public function testGenerationForSpecificStore()
 
         $this->assertEquals(
             ['category-1_1' => $canonical],
-            $this->productScopeGenerator->generateForSpecificStoreView(1, [$category], $product, 1)
+            $this->productScopeGenerator->generateForSpecificStoreView(1, [$this->categoryMock], $product, 1)
         );
     }
 
@@ -212,4 +210,40 @@ protected function initObjectRegistryFactory($entities)
             ->with(['entities' => $entities])
             ->will($this->returnValue($objectRegistry));
     }
+
+    /**
+     * Test the possibility of url rewrite generation.
+     *
+     * @param array $parentIds
+     * @param bool $expectedResult
+     * @dataProvider isCategoryProperForGeneratingDataProvider
+     */
+    public function testIsCategoryProperForGenerating($parentIds, $expectedResult)
+    {
+        $storeId = 1;
+        $this->categoryMock->expects(self::any())->method('getParentIds')->willReturn($parentIds);
+        $result = $this->productScopeGenerator->isCategoryProperForGenerating(
+            $this->categoryMock,
+            $storeId
+        );
+        self::assertEquals(
+            $expectedResult,
+            $result
+        );
+    }
+
+    /**
+     * Data provider for testIsCategoryProperForGenerating.
+     *
+     * @return array
+     */
+    public function isCategoryProperForGeneratingDataProvider()
+    {
+        return [
+            [['0'], false],
+            [['1'], false],
+            [['1', '2'], true],
+            [['1', '3'], false],
+        ];
+    }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
index b32b0216b9bdf..7435096642de2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
@@ -32,7 +34,10 @@ class ProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
     protected $category;
 
-    protected function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
         $this->category = $this->createMock(\Magento\Catalog\Model\Category::class);
         $productMethods = [
@@ -69,7 +74,7 @@ protected function setUp()
     /**
      * @return array
      */
-    public function getUrlPathDataProvider()
+    public function getUrlPathDataProvider(): array
     {
         return [
             'path based on url key' => ['url-key', null, 'url-key'],
@@ -84,8 +89,9 @@ public function getUrlPathDataProvider()
      * @param string|null|bool $urlKey
      * @param string|null|bool $productName
      * @param string $result
+     * @return void
      */
-    public function testGetUrlPath($urlKey, $productName, $result)
+    public function testGetUrlPath($urlKey, $productName, $result): void
     {
         $this->product->expects($this->once())->method('getData')->with('url_path')
             ->will($this->returnValue(null));
@@ -99,22 +105,23 @@ public function testGetUrlPath($urlKey, $productName, $result)
     /**
      * @param string|bool $productUrlKey
      * @param string|bool $expectedUrlKey
+     * @return void
      * @dataProvider getUrlKeyDataProvider
      */
-    public function testGetUrlKey($productUrlKey, $expectedUrlKey)
+    public function testGetUrlKey($productUrlKey, $expectedUrlKey): void
     {
         $this->product->expects($this->any())->method('getUrlKey')->will($this->returnValue($productUrlKey));
         $this->product->expects($this->any())->method('formatUrlKey')->will($this->returnValue($productUrlKey));
-        $this->assertEquals($expectedUrlKey, $this->productUrlPathGenerator->getUrlKey($this->product));
+        $this->assertSame($expectedUrlKey, $this->productUrlPathGenerator->getUrlKey($this->product));
     }
 
     /**
      * @return array
      */
-    public function getUrlKeyDataProvider()
+    public function getUrlKeyDataProvider(): array
     {
         return [
-            'URL Key use default' => [false, false],
+            'URL Key use default' => [false, null],
             'URL Key empty' => ['product-url', 'product-url'],
         ];
     }
@@ -123,9 +130,10 @@ public function getUrlKeyDataProvider()
      * @param string|null|bool $storedUrlKey
      * @param string|null|bool $productName
      * @param string $expectedUrlKey
+     * @return void
      * @dataProvider getUrlPathDefaultUrlKeyDataProvider
      */
-    public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expectedUrlKey)
+    public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expectedUrlKey): void
     {
         $this->product->expects($this->once())->method('getData')->with('url_path')
             ->will($this->returnValue(null));
@@ -138,7 +146,7 @@ public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expect
     /**
      * @return array
      */
-    public function getUrlPathDefaultUrlKeyDataProvider()
+    public function getUrlPathDefaultUrlKeyDataProvider(): array
     {
         return [
             ['default-store-view-url-key', null, 'default-store-view-url-key'],
@@ -146,7 +154,10 @@ public function getUrlPathDefaultUrlKeyDataProvider()
         ];
     }
 
-    public function testGetUrlPathWithCategory()
+    /**
+     * @return void
+     */
+    public function testGetUrlPathWithCategory(): void
     {
         $this->product->expects($this->once())->method('getData')->with('url_path')
             ->will($this->returnValue('product-path'));
@@ -159,7 +170,10 @@ public function testGetUrlPathWithCategory()
         );
     }
 
-    public function testGetUrlPathWithSuffix()
+    /**
+     * @return void
+     */
+    public function testGetUrlPathWithSuffix(): void
     {
         $storeId = 1;
         $this->product->expects($this->once())->method('getData')->with('url_path')
@@ -177,7 +191,10 @@ public function testGetUrlPathWithSuffix()
         );
     }
 
-    public function testGetUrlPathWithSuffixAndCategoryAndStore()
+    /**
+     * @return void
+     */
+    public function testGetUrlPathWithSuffixAndCategoryAndStore(): void
     {
         $storeId = 1;
         $this->product->expects($this->once())->method('getData')->with('url_path')
@@ -195,7 +212,10 @@ public function testGetUrlPathWithSuffixAndCategoryAndStore()
         );
     }
 
-    public function testGetCanonicalUrlPath()
+    /**
+     * @return void
+     */
+    public function testGetCanonicalUrlPath(): void
     {
         $this->product->expects($this->once())->method('getId')->will($this->returnValue(1));
 
@@ -205,7 +225,10 @@ public function testGetCanonicalUrlPath()
         );
     }
 
-    public function testGetCanonicalUrlPathWithCategory()
+    /**
+     * @return void
+     */
+    public function testGetCanonicalUrlPathWithCategory(): void
     {
         $this->product->expects($this->once())->method('getId')->will($this->returnValue(1));
         $this->category->expects($this->once())->method('getId')->will($this->returnValue(1));
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php
new file mode 100644
index 0000000000000..b12da6243a903
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
+
+use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
+use Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteMovingObserver;
+use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+
+/**
+ * Class CategoryProcessUrlRewriteMovingObserverTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CategoryProcessUrlRewriteMovingObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CategoryProcessUrlRewriteMovingObserver
+     */
+    private $observer;
+
+    /**
+     * @var CategoryUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryUrlRewriteGeneratorMock;
+
+    /**
+     * @var UrlPersistInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlPersistMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var UrlRewriteHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlRewriteHandlerMock;
+
+    /**
+     * @var DatabaseMapPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseMapPoolMock;
+
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->categoryUrlRewriteGeneratorMock = $this->createMock(CategoryUrlRewriteGenerator::class);
+        $this->urlPersistMock = $this->createMock(UrlPersistInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->urlRewriteHandlerMock = $this->createMock(UrlRewriteHandler::class);
+        /** @var UrlRewriteBunchReplacer|\PHPUnit_Framework_MockObject_MockObject $urlRewriteMock */
+        $urlRewriteMock = $this->createMock(UrlRewriteBunchReplacer::class);
+        $this->databaseMapPoolMock = $this->createMock(DatabaseMapPool::class);
+
+        $this->observer = new CategoryProcessUrlRewriteMovingObserver(
+            $this->categoryUrlRewriteGeneratorMock,
+            $this->urlPersistMock,
+            $this->scopeConfigMock,
+            $this->urlRewriteHandlerMock,
+            $urlRewriteMock,
+            $this->databaseMapPoolMock,
+            [
+                DataCategoryUrlRewriteDatabaseMap::class,
+                DataProductUrlRewriteDatabaseMap::class
+            ]
+        );
+    }
+
+    /**
+     * Test category process rewrite url by changing the parent
+     *
+     * @return void
+     */
+    public function testCategoryProcessUrlRewriteAfterMovingWithChangedParentId()
+    {
+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observerMock */
+        $observerMock = $this->createMock(Observer::class);
+        $eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCategory'])
+            ->getMock();
+        $categoryMock = $this->createPartialMock(Category::class, [
+            'dataHasChangedFor',
+            'getEntityId',
+            'getStoreId',
+            'setData'
+        ]);
+
+        $categoryMock->expects($this->once())->method('dataHasChangedFor')->with('parent_id')
+            ->willReturn(true);
+        $eventMock->expects($this->once())->method('getCategory')->willReturn($categoryMock);
+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+        $this->scopeConfigMock->expects($this->once())->method('isSetFlag')
+            ->with(UrlKeyRenderer::XML_PATH_SEO_SAVE_HISTORY)->willReturn(true);
+        $this->categoryUrlRewriteGeneratorMock->expects($this->once())->method('generate')
+            ->with($categoryMock, true)->willReturn(['category-url-rewrite']);
+        $this->urlRewriteHandlerMock->expects($this->once())->method('generateProductUrlRewrites')
+            ->with($categoryMock)->willReturn(['product-url-rewrite']);
+        $this->databaseMapPoolMock->expects($this->exactly(2))->method('resetMap')->willReturnSelf();
+
+        $this->observer->execute($observerMock);
+    }
+
+    /**
+     * Test category process rewrite url without changing the parent
+     *
+     * @return void
+     */
+    public function testCategoryProcessUrlRewriteAfterMovingWithinNotChangedParent()
+    {
+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observerMock */
+        $observerMock = $this->createMock(Observer::class);
+        $eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCategory'])
+            ->getMock();
+        $categoryMock = $this->createPartialMock(Category::class, ['dataHasChangedFor']);
+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+        $eventMock->expects($this->once())->method('getCategory')->willReturn($categoryMock);
+        $categoryMock->expects($this->once())->method('dataHasChangedFor')->with('parent_id')
+            ->willReturn(false);
+
+        $this->observer->execute($observerMock);
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
new file mode 100644
index 0000000000000..afdb548887577
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
+
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteSavingObserver;
+use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
+use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
+use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
+use Magento\Store\Model\ResourceModel\Group\CollectionFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Model\Category;
+
+/**
+ * Unit tests for \Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteSavingObserver class.
+ */
+class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $observer;
+
+    /**
+     * @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $category;
+
+    /**
+     * @var CategoryProcessUrlRewriteSavingObserver
+     */
+    private $categoryProcessUrlRewriteSavingObserver;
+
+    /**
+     * @var CategoryUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryUrlRewriteGeneratorMock;
+
+    /**
+     * @var UrlRewriteBunchReplacer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlRewriteBunchReplacerMock;
+
+    /**
+     * @var UrlRewriteHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlRewriteHandlerMock;
+
+    /**
+     * @var DatabaseMapPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseMapPoolMock;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeGroupFactory;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->observer = $this->createPartialMock(
+            \Magento\Framework\Event\Observer::class,
+            ['getEvent', 'getData']
+        );
+        $this->category = $this->createPartialMock(Category::class, [
+            'hasData',
+            'getParentId',
+            'dataHasChangedFor',
+            'getChangedProductIds',
+        ]);
+        $this->observer->expects($this->any())
+            ->method('getEvent')
+            ->willReturnSelf();
+        $this->observer->expects($this->any())
+            ->method('getData')
+            ->with('category')
+            ->willReturn($this->category);
+
+        $this->categoryUrlRewriteGeneratorMock = $this->getMockBuilder(CategoryUrlRewriteGenerator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlRewriteBunchReplacerMock = $this->getMockBuilder(UrlRewriteBunchReplacer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlRewriteHandlerMock = $this->getMockBuilder(UrlRewriteHandler::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->databaseMapPoolMock = $this->getMockBuilder(DatabaseMapPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeGroupFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->categoryProcessUrlRewriteSavingObserver = (new ObjectManagerHelper($this))->getObject(
+            CategoryProcessUrlRewriteSavingObserver::class,
+            [
+                'categoryUrlRewriteGenerator' => $this->categoryUrlRewriteGeneratorMock,
+                'urlRewriteHandler' => $this->urlRewriteHandlerMock,
+                'urlRewriteBunchReplacer' => $this->urlRewriteBunchReplacerMock,
+                'databaseMapPool' => $this->databaseMapPoolMock,
+                'storeGroupFactory' => $this->storeGroupFactory,
+            ]
+        );
+    }
+
+    public function testExecuteForRootDirectory()
+    {
+        $this->category->expects($this->once())
+            ->method('getParentId')
+            ->willReturn(Category::TREE_ROOT_ID);
+        $this->category->expects($this->never())
+            ->method('hasData');
+
+        $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer);
+    }
+
+    public function testExecuteHasStoreId()
+    {
+        $this->category->expects($this->once())
+            ->method('getParentId')
+            ->willReturn(2);
+        $this->category->expects($this->once())
+            ->method('hasData')
+            ->with('store_id')
+            ->willReturn(true);
+        $this->storeGroupFactory->expects($this->never())
+            ->method('create');
+        $this->category->expects($this->any())
+            ->method('dataHasChangedFor')
+            ->willReturnMap(
+                [
+                    ['url_key', false],
+                    ['is_anchor', false],
+                ]
+            );
+        $this->category->expects($this->once())
+            ->method('getChangedProductIds')
+            ->willReturn([]);
+
+        $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer);
+    }
+
+    public function testExecuteHasNotChanges()
+    {
+        $this->category->expects($this->once())
+            ->method('getParentId')
+            ->willReturn(2);
+        $this->category->expects($this->once())
+            ->method('hasData')
+            ->willReturn(false);
+        $this->storeGroupFactory->expects($this->once())
+            ->method('create')
+            ->willReturn([]);
+        $this->category->expects($this->any())
+            ->method('dataHasChangedFor')
+            ->willReturnMap(
+                [
+                    ['url_key', false],
+                    ['is_anchor', false],
+                ]
+            );
+        $this->category->expects($this->once())
+            ->method('getChangedProductIds')
+            ->willReturn([]);
+        $this->databaseMapPoolMock->expects($this->never())
+            ->method('resetMap');
+
+        $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer);
+    }
+
+    public function testExecuteHasChanges()
+    {
+        $this->category->expects($this->once())
+            ->method('getParentId')
+            ->willReturn(2);
+        $this->category->expects($this->once())
+            ->method('hasData')
+            ->willReturn(false);
+        $this->storeGroupFactory->expects($this->once())
+            ->method('create')
+            ->willReturn([]);
+        $this->category->expects($this->any())
+            ->method('dataHasChangedFor')
+            ->willReturnMap(
+                [
+                    ['url_key', true],
+                    ['is_anchor', false],
+                ]
+            );
+        $this->category->expects($this->any())
+            ->method('getChangedProductIds')
+            ->willReturn([]);
+
+        $result1 = ['test'];
+        $this->categoryUrlRewriteGeneratorMock->expects($this->once())
+            ->method('generate')
+            ->with($this->category)
+            ->willReturn($result1);
+        $this->urlRewriteBunchReplacerMock->expects($this->at(0))
+            ->method('doBunchReplace')
+            ->with($result1)
+            ->willReturn(null);
+
+        $result2 = ['test2'];
+        $this->urlRewriteHandlerMock->expects($this->once())
+            ->method('generateProductUrlRewrites')
+            ->with($this->category)
+            ->willReturn($result2);
+        $this->urlRewriteBunchReplacerMock->expects($this->at(1))
+            ->method('doBunchReplace')
+            ->with($result2)
+            ->willReturn(null);
+
+        $this->databaseMapPoolMock->expects($this->any())
+            ->method('resetMap');
+
+        $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer);
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
index d294f6d022ef3..39317b42af989 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -103,7 +103,6 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
-                'expectedDeleteCount'   => 1,
                 'expectedReplaceCount'  => 1,
 
             ],
@@ -113,7 +112,6 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
-                'expectedDeleteCount'   => 0,
                 'expectedReplaceCount'  => 0
             ],
             'visibility changed' => [
@@ -122,7 +120,6 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
-                'expectedDeleteCount'   => 1,
                 'expectedReplaceCount'  => 1
             ],
             'websites changed' => [
@@ -131,7 +128,6 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => true,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
-                'expectedDeleteCount'   => 1,
                 'expectedReplaceCount'  => 1
             ],
             'categories changed' => [
@@ -140,7 +136,6 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => true,
                 'visibilityResult'      => true,
-                'expectedDeleteCount'   => 1,
                 'expectedReplaceCount'  => 1
             ],
             'url changed invisible' => [
@@ -149,7 +144,6 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => false,
-                'expectedDeleteCount'   => 1,
                 'expectedReplaceCount'  => 0
             ],
         ];
@@ -161,7 +155,6 @@ public function urlKeyDataProvider()
      * @param bool $isChangedWebsites
      * @param bool $isChangedCategories
      * @param bool $visibilityResult
-     * @param int $expectedDeleteCount
      * @param int $expectedReplaceCount
      *
      * @dataProvider urlKeyDataProvider
@@ -172,7 +165,6 @@ public function testExecuteUrlKey(
         $isChangedWebsites,
         $isChangedCategories,
         $visibilityResult,
-        $expectedDeleteCount,
         $expectedReplaceCount
     ) {
         $this->product->expects($this->any())->method('getStoreId')->will($this->returnValue(12));
@@ -194,13 +186,6 @@ public function testExecuteUrlKey(
             ->method('getIsChangedCategories')
             ->will($this->returnValue($isChangedCategories));
 
-        $this->urlPersist->expects($this->exactly($expectedDeleteCount))->method('deleteByData')->with([
-            UrlRewrite::ENTITY_ID => $this->product->getId(),
-            UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-            UrlRewrite::REDIRECT_TYPE => 0,
-            UrlRewrite::STORE_ID => $this->product->getStoreId()
-        ]);
-
         $this->product->expects($this->any())
             ->method('isVisibleInSiteVisibility')
             ->will($this->returnValue($visibilityResult));
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductUrlKeyAutogeneratorObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductUrlKeyAutogeneratorObserverTest.php
new file mode 100644
index 0000000000000..b9628caff8400
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductUrlKeyAutogeneratorObserverTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
+
+/**
+ * Unit tests for \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver class
+ */
+class ProductUrlKeyAutogeneratorObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productUrlPathGenerator;
+
+    /** @var \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver */
+    private $productUrlKeyAutogeneratorObserver;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->productUrlPathGenerator = $this->getMockBuilder(ProductUrlPathGenerator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrlKey'])
+            ->getMock();
+
+        $this->productUrlKeyAutogeneratorObserver = (new ObjectManagerHelper($this))->getObject(
+            \Magento\CatalogUrlRewrite\Observer\ProductUrlKeyAutogeneratorObserver::class,
+            [
+                'productUrlPathGenerator' => $this->productUrlPathGenerator
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithUrlKey(): void
+    {
+        $urlKey = 'product_url_key';
+
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setUrlKey'])
+            ->getMock();
+        $product->expects($this->atLeastOnce())->method('setUrlKey')->with($urlKey);
+        $event = $this->getMockBuilder(\Magento\Framework\Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMock();
+        $event->expects($this->atLeastOnce())->method('getProduct')->willReturn($product);
+        /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
+        $observer = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEvent'])
+            ->getMock();
+        $observer->expects($this->atLeastOnce())->method('getEvent')->willReturn($event);
+        $this->productUrlPathGenerator->expects($this->atLeastOnce())->method('getUrlKey')->with($product)
+            ->willReturn($urlKey);
+
+        $this->productUrlKeyAutogeneratorObserver->execute($observer);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithEmptyUrlKey(): void
+    {
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setUrlKey'])
+            ->getMock();
+        $product->expects($this->never())->method('setUrlKey');
+        $event = $this->getMockBuilder(\Magento\Framework\Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMock();
+        $event->expects($this->atLeastOnce())->method('getProduct')->willReturn($product);
+        /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
+        $observer = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEvent'])
+            ->getMock();
+        $observer->expects($this->atLeastOnce())->method('getEvent')->willReturn($event);
+        $this->productUrlPathGenerator->expects($this->atLeastOnce())->method('getUrlKey')->with($product)
+            ->willReturn(null);
+
+        $this->productUrlKeyAutogeneratorObserver->execute($observer);
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
index 747e0cfa771fd..b18597a42bf94 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
@@ -127,7 +127,7 @@ public function testGenerateProductUrlRewrites()
     {
         /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $category */
         $category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-            ->setMethods(['getEntityId', 'getStoreId', 'getData', 'getAffectedProductIds'])
+            ->setMethods(['getEntityId', 'getStoreId', 'getData', 'getChangedProductIds'])
             ->disableOriginalConstructor()
             ->getMock();
         $category->expects($this->any())
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Webapi/Controller/Rest/InputParamsResolverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Webapi/Controller/Rest/InputParamsResolverTest.php
new file mode 100644
index 0000000000000..8e705b2c09f6b
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Webapi/Controller/Rest/InputParamsResolverTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Plugin\Webapi\Controller\Rest;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Webapi\Controller\Rest\InputParamsResolver;
+use Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest\InputParamsResolver as InputParamsResolverPlugin;
+use Magento\Framework\Webapi\Rest\Request as RestRequest;
+use Magento\Catalog\Model\Product;
+use Magento\Webapi\Controller\Rest\Router\Route;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/**
+ * Unit test for InputParamsResolver plugin
+ */
+class InputParamsResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private $saveRewritesHistory;
+
+    /**
+     * @var array
+     */
+    private $requestBodyParams;
+
+    /**
+     * @var array
+     */
+    private $result;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var InputParamsResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subject;
+
+    /**
+     * @var RestRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $request;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $product;
+
+    /**
+     * @var Route|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $route;
+
+    /**
+     * @var InputParamsResolverPlugin
+     */
+    private $plugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->saveRewritesHistory = 'save_rewrites_history';
+        $this->requestBodyParams = [
+            'product' => [
+                'sku' => 'test',
+                'custom_attributes' => [
+                    ['attribute_code' => $this->saveRewritesHistory, 'value' => 1]
+                ]
+            ]
+        ];
+
+        $this->route = $this->createPartialMock(Route::class, ['getServiceMethod', 'getServiceClass']);
+        $this->request = $this->createPartialMock(RestRequest::class, ['getBodyParams']);
+        $this->request->expects($this->any())->method('getBodyParams')->willReturn($this->requestBodyParams);
+        $this->subject = $this->createPartialMock(InputParamsResolver::class, ['getRoute']);
+        $this->subject->expects($this->any())->method('getRoute')->willReturn($this->route);
+        $this->product = $this->createPartialMock(Product::class, ['setData']);
+
+        $this->result = [false, $this->product, 'test'];
+
+        $this->objectManager = new ObjectManager($this);
+        $this->plugin = $this->objectManager->getObject(
+            InputParamsResolverPlugin::class,
+            [
+                'request' => $this->request
+            ]
+        );
+    }
+
+    public function testAfterResolve()
+    {
+        $this->route->expects($this->once())
+            ->method('getServiceClass')
+            ->willReturn(ProductRepositoryInterface::class);
+        $this->route->expects($this->once())
+            ->method('getServiceMethod')
+            ->willReturn('save');
+        $this->product->expects($this->once())
+            ->method('setData')
+            ->with($this->saveRewritesHistory, true);
+
+        $this->plugin->afterResolve($this->subject, $this->result);
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewriteTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewriteTest.php
index 763f78ac1fea6..40f7642f35383 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewriteTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewriteTest.php
@@ -27,6 +27,9 @@ protected function setUp()
             ->getMockForAbstractClass();
     }
 
+    /**
+     * @return \Magento\Ui\DataProvider\Modifier\ModifierInterface|object
+     */
     protected function createModel()
     {
         return $this->objectManager->getObject(ProductUrlRewrite::class, [
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index d5d9babce9cd1..b4ceff96b50b7 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -5,19 +5,21 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-url-rewrite": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-url-rewrite": "*"
+    },
+    "suggest": {
+        "magento/module-webapi": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml b/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
new file mode 100644
index 0000000000000..c8da5b59cf5f5
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_url_rewrite_product_category" resource="default" engine="innodb"
+           comment="url_rewrite_relation">
+        <column xsi:type="int" name="url_rewrite_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="url_rewrite_id"/>
+        <column xsi:type="int" name="category_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="category_id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="product_id"/>
+        <constraint xsi:type="foreign" referenceId="CAT_URL_REWRITE_PRD_CTGR_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_url_rewrite_product_category" column="product_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_BB79E64705D7F17FE181F23144528FC8"
+                    table="catalog_url_rewrite_product_category" column="url_rewrite_id" referenceTable="url_rewrite"
+                    referenceColumn="url_rewrite_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_URL_REWRITE_PRD_CTGR_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID"
+                    table="catalog_url_rewrite_product_category" column="category_id"
+                    referenceTable="catalog_category_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_URL_REWRITE_PRODUCT_CATEGORY_CATEGORY_ID_PRODUCT_ID" indexType="btree">
+            <column name="category_id"/>
+            <column name="product_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/db_schema_whitelist.json b/app/code/Magento/CatalogUrlRewrite/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..5562ae5d48cc9
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/etc/db_schema_whitelist.json
@@ -0,0 +1,19 @@
+{
+    "catalog_url_rewrite_product_category": {
+        "column": {
+            "url_rewrite_id": true,
+            "category_id": true,
+            "product_id": true
+        },
+        "index": {
+            "CATALOG_URL_REWRITE_PRODUCT_CATEGORY_CATEGORY_ID_PRODUCT_ID": true
+        },
+        "constraint": {
+            "CAT_URL_REWRITE_PRD_CTGR_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "FK_BB79E64705D7F17FE181F23144528FC8": true,
+            "CAT_URL_REWRITE_PRD_CTGR_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID": true,
+            "CAT_URL_REWRITE_PRD_CTGR_CTGR_ID_SEQUENCE_CAT_CTGR_SEQUENCE_VAL": true,
+            "CAT_URL_REWRITE_PRD_CTGR_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
index 2d421417bfdc0..f6426677e8ce8 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/di.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
@@ -19,6 +19,7 @@
     <type name="Magento\Catalog\Model\ResourceModel\Category">
         <plugin name="category_move_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move"/>
         <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
+        <plugin name="update_url_path_for_different_stores" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\UpdateUrlPath"/>
     </type>
     <type name="Magento\UrlRewrite\Model\StorageInterface">
         <plugin name="storage_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/module.xml b/app/code/Magento/CatalogUrlRewrite/etc/module.xml
index 65d6e5c748d98..277c551d7b212 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/module.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogUrlRewrite" setup_version="2.0.0">
+    <module name="Magento_CatalogUrlRewrite" >
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.xml
new file mode 100644
index 0000000000000..9c5186a5ec0ac
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/etc/webapi_rest/di.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:ObjectManager/etc/config.xsd">
+    <type name="Magento\Webapi\Controller\Rest\InputParamsResolver">
+        <plugin name="product_save_rewrites_history_rest_plugin" type="Magento\CatalogUrlRewrite\Plugin\Webapi\Controller\Rest\InputParamsResolver" sortOrder="1" disabled="false" />
+    </type>
+</config>
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/README.md b/app/code/Magento/CatalogUrlRewriteGraphQl/README.md
new file mode 100644
index 0000000000000..02d8c9a7084c1
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/README.md
@@ -0,0 +1,4 @@
+# CatalogUrlRewriteGraphQl
+
+**CatalogUrlRewriteGraphQl** provides type information for the GraphQl module
+to generate url rewrite fields for catalog and product information endpoints.
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md b/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..331e823743b19
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Url Rewrite Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Catalog Url Rewrite Graph Ql** module.
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
new file mode 100644
index 0000000000000..ab91f745c5d0c
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-catalog-url-rewrite-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-url-rewrite-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CatalogUrlRewriteGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..e6e0f6cf72100
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CatalogUrlRewriteGraphQl" >
+        <sequence>
+            <module name="Magento_UrlRewriteGraphQl"/>
+            <module name="Magento_CatalogGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..f4ad2e930ddab
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls
@@ -0,0 +1,23 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+interface ProductInterface {
+    url_key: String @doc(description: "The part of the URL that identifies the product")
+    url_path: String @doc(description: "The part of the URL that precedes the url_key")
+    url_rewrites: [UrlRewrite] @doc(description: "URL rewrites list") @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite")
+}
+
+input ProductFilterInput {
+    url_key: FilterTypeInput @doc(description: "The part of the URL that identifies the product")
+    url_path: FilterTypeInput @doc(description: "The part of the URL that precedes the url_key")
+}
+
+input ProductSortInput {
+    url_key: SortEnum @doc(description: "The part of the URL that identifies the product")
+    url_path: SortEnum @doc(description: "The part of the URL that precedes the url_key")
+}
+
+enum UrlRewriteEntityTypeEnum @doc(description: "This enumeration defines the entity type.") {
+    PRODUCT
+    CATEGORY
+}
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/registration.php b/app/code/Magento/CatalogUrlRewriteGraphQl/registration.php
new file mode 100644
index 0000000000000..feced5dd68ba3
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogUrlRewriteGraphQl', __DIR__);
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 373b88049c7b5..2b95de24d0201 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -11,11 +11,13 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Widget\Block\BlockInterface;
+use Magento\Framework\Url\EncoderInterface;
 
 /**
  * Catalog Products List widget block
- * Class ProductsList
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
 class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
 {
@@ -94,6 +96,11 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      */
     private $json;
 
+    /**
+     * @var \Magento\Framework\Url\EncoderInterface|null
+     */
+    private $urlEncoder;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -104,6 +111,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
      * @param array $data
      * @param Json|null $json
+     * @param \Magento\Framework\Url\EncoderInterface|null $urlEncoder
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -114,7 +122,8 @@ public function __construct(
         \Magento\CatalogWidget\Model\Rule $rule,
         \Magento\Widget\Helper\Conditions $conditionsHelper,
         array $data = [],
-        Json $json = null
+        Json $json = null,
+        EncoderInterface $urlEncoder = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
@@ -123,6 +132,7 @@ public function __construct(
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
+        $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()->get(EncoderInterface::class);
         parent::__construct(
             $context,
             $data
@@ -130,7 +140,9 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * Internal constructor, that is called from real constructor
+     *
+     * @return void
      */
     protected function _construct()
     {
@@ -151,6 +163,7 @@ protected function _construct()
      * Get key pieces for caching block content
      *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCacheKeyInfo()
     {
@@ -160,19 +173,21 @@ public function getCacheKeyInfo()
 
         return [
             'CATALOG_PRODUCTS_LIST_WIDGET',
-            $this->getPriceCurrency()->getCurrencySymbol(),
+            $this->getPriceCurrency()->getCurrency()->getCode(),
             $this->_storeManager->getStore()->getId(),
             $this->_design->getDesignTheme()->getId(),
             $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP),
-            intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
+            (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
             $this->getProductsPerPage(),
             $conditions,
-            $this->json->serialize($this->getRequest()->getParams())
+            $this->json->serialize($this->getRequest()->getParams()),
+            $this->getTemplate(),
+            $this->getTitle()
         ];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getProductPriceHtml(
@@ -194,22 +209,27 @@ public function getProductPriceHtml(
             ? $arguments['display_minimal_price']
             : true;
 
-            /** @var \Magento\Framework\Pricing\Render $priceRender */
+        /** @var \Magento\Framework\Pricing\Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
-
-        $price = '';
-        if ($priceRender) {
-            $price = $priceRender->render(
-                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                $product,
-                $arguments
+        if (!$priceRender) {
+            $priceRender = $this->getLayout()->createBlock(
+                \Magento\Framework\Pricing\Render::class,
+                'product.price.render.default',
+                ['data' => ['price_render_handle' => 'catalog_product_prices']]
             );
         }
+
+        $price = $priceRender->render(
+            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+            $product,
+            $arguments
+        );
+
         return $price;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
@@ -221,6 +241,7 @@ protected function _beforeToHtml()
      * Prepare and return product collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function createCollection()
     {
@@ -247,6 +268,8 @@ public function createCollection()
     }
 
     /**
+     * Get conditions
+     *
      * @return \Magento\Rule\Model\Condition\Combine
      */
     protected function getConditions()
@@ -336,7 +359,7 @@ public function getPagerHtml()
             if (!$this->pager) {
                 $this->pager = $this->getLayout()->createBlock(
                     \Magento\Catalog\Block\Product\Widget\Html\Pager::class,
-                    'widget.products.list.pager'
+                    $this->getWidgetPagerBlockName()
                 );
 
                 $this->pager->setUseContainer(true)
@@ -384,8 +407,9 @@ public function getTitle()
     }
 
     /**
-     * @return PriceCurrencyInterface
+     * Get currency of product
      *
+     * @return PriceCurrencyInterface
      * @deprecated 100.2.0
      */
     private function getPriceCurrency()
@@ -396,4 +420,37 @@ private function getPriceCurrency()
         }
         return $this->priceCurrency;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAddToCartUrl($product, $additional = [])
+    {
+        $requestingPageUrl = $this->getRequest()->getParam('requesting_page_url');
+
+        if (!empty($requestingPageUrl)) {
+            $additional['useUencPlaceholder'] = true;
+            $url = parent::getAddToCartUrl($product, $additional);
+            return str_replace('%25uenc%25', $this->urlEncoder->encode($requestingPageUrl), $url);
+        }
+
+        return parent::getAddToCartUrl($product, $additional);
+    }
+
+    /**
+     * Get widget block name
+     *
+     * @return string
+     */
+    private function getWidgetPagerBlockName()
+    {
+        $pageName = $this->getData('page_var_name');
+        $pagerBlockName = 'widget.products.list.pager';
+
+        if (!$pageName) {
+            return $pagerBlockName;
+        }
+
+        return $pagerBlockName . '.' . $pageName;
+    }
 }
diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
index 04ae7c6a2d750..9f7962301cab4 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
@@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface
     /**
      * @var string
      */
-    protected $_template = 'product/widget/conditions.phtml';
+    protected $_template = 'Magento_CatalogWidget::product/widget/conditions.phtml';
 
     /**
      * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 9c679b8bfe9b0..e5fb20a58aea1 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -9,6 +9,7 @@
  */
 namespace Magento\CatalogWidget\Model\Rule\Condition;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ProductCategoryList;
 
 /**
@@ -77,17 +78,22 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function loadAttributeOptions()
     {
         $productAttributes = $this->_productResource->loadAllAttributes()->getAttributesByCode();
+        $productAttributes = array_filter(
+            $productAttributes,
+            function ($attribute) {
+                return $attribute->getFrontendLabel() &&
+                    $attribute->getFrontendInput() !== 'text' &&
+                    $attribute->getAttributeCode() !== ProductInterface::STATUS;
+            }
+        );
 
         $attributes = [];
         foreach ($productAttributes as $attribute) {
-            if (!$attribute->getFrontendLabel() || $attribute->getFrontendInput() == 'text') {
-                continue;
-            }
             $attributes[$attribute->getAttributeCode()] = $attribute->getFrontendLabel();
         }
 
@@ -101,6 +107,9 @@ public function loadAttributeOptions()
 
     /**
      * {@inheritdoc}
+     *
+     * @param array &$attributes
+     * @return void
      */
     protected function _addSpecialAttributes(array &$attributes)
     {
@@ -119,8 +128,21 @@ public function addToCollection($collection)
         $attribute = $this->getAttributeObject();
 
         if ($collection->isEnabledFlat()) {
-            $alias = array_keys($collection->getSelect()->getPart('from'))[0];
-            $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.' . $attribute->getAttributeCode();
+            if ($attribute->isEnabledInFlat()) {
+                $alias = array_keys($collection->getSelect()->getPart('from'))[0];
+                $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.' . $attribute->getAttributeCode();
+            } else {
+                $alias = 'at_' . $attribute->getAttributeCode();
+                if (!in_array($alias, array_keys($collection->getSelect()->getPart('from')))) {
+                    $collection->joinAttribute(
+                        $attribute->getAttributeCode(),
+                        'catalog_product/'.$attribute->getAttributeCode(),
+                        'entity_id'
+                    );
+                }
+
+                $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.value';
+            }
             return $this;
         }
 
@@ -150,8 +172,6 @@ protected function addGlobalAttribute(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
         \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
     ) {
-        $storeId =  $this->storeManager->getStore()->getId();
-
         switch ($attribute->getBackendType()) {
             case 'decimal':
             case 'datetime':
@@ -160,10 +180,15 @@ protected function addGlobalAttribute(
                 $collection->addAttributeToSelect($attribute->getAttributeCode(), 'inner');
                 break;
             default:
-                $alias = 'at_' . md5($this->getId()) . $attribute->getAttributeCode();
+                $alias = 'at_' . sha1($this->getId()) . $attribute->getAttributeCode();
+
+                $connection = $this->_productResource->getConnection();
+                $storeId = $connection->getIfNullSql($alias . '.store_id', $this->storeManager->getStore()->getId());
+                $linkField = $attribute->getEntity()->getLinkField();
+
                 $collection->getSelect()->join(
-                    [$alias => $collection->getTable('catalog_product_index_eav')],
-                    "($alias.entity_id = e.entity_id) AND ($alias.store_id = $storeId)" .
+                    [$alias => $collection->getTable('catalog_product_entity_varchar')],
+                    "($alias.$linkField = e.$linkField) AND ($alias.store_id = $storeId)" .
                     " AND ($alias.attribute_id = {$attribute->getId()})",
                     []
                 );
@@ -212,6 +237,8 @@ protected function addNotGlobalAttribute(
 
     /**
      * {@inheritdoc}
+     *
+     * @return string
      */
     public function getMappedSqlField()
     {
@@ -231,6 +258,9 @@ public function getMappedSqlField()
 
     /**
      * {@inheritdoc}
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
+     * @return $this
      */
     public function collectValidatedAttributes($productCollection)
     {
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml b/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml
new file mode 100644
index 0000000000000..1f54ff40283b1
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateBlockWithWidget">
+        <arguments>
+            <argument name="addCondition" type="string"/>
+            <argument name="isCondition" type="string"/>
+            <argument name="fieldCondition" type="string"/>
+        </arguments>
+
+        <click stepKey="clickShowHideButton" selector="{{BlockWYSIWYGSection.ShowHideBtn}}"/>
+        <waitForElementVisible stepKey="waitForInsertWidgetButton" selector="{{CatalogWidgetSection.insertWidgetButton}}"/>
+
+        <selectOption stepKey="selectAllStoreView" userInput="All Store Views" selector="{{CatalogWidgetSection.storeViewOption}}"/>
+        <fillField selector="{{BlockContentSection.TextArea}}" userInput="" stepKey="makeContentFieldEmpty"/>
+
+        <click selector="{{CatalogWidgetSection.insertWidgetButton}}" stepKey="clickInsertWidgetButton"/>
+        <waitForElementVisible stepKey="waitForInsertWidgetFrame" selector="{{InsertWidgetSection.widgetTypeDropDown}}" time="10"/>
+
+        <selectOption selector="{{InsertWidgetSection.widgetTypeDropDown}}" userInput="Catalog Products List" stepKey="selectCatalogProductListOption"/>
+        <waitForElementVisible stepKey="waitForConditionsElementBecomeAvailable" selector="{{InsertWidgetSection.conditionsAddButton}}"/>
+
+        <click selector="{{InsertWidgetSection.conditionsAddButton}}" stepKey="clickToAddCondition"/>
+        <waitForElementVisible stepKey="waitForSelectBoxOpened" selector="{{InsertWidgetSection.conditionsSelectBox}}"/>
+
+        <selectOption selector="{{InsertWidgetSection.conditionsSelectBox}}" userInput="{{addCondition}}" stepKey="selectConditionsSelectBox"/>
+        <waitForElementVisible stepKey="seeConditionsAdded" selector="{{InsertWidgetSection.addCondition('1')}}"/>
+
+        <click selector="{{InsertWidgetSection.conditionIs}}" stepKey="clickToConditionIs"/>
+        <selectOption selector="{{InsertWidgetSection.conditionOperator('1')}}" stepKey="selectOperatorGreaterThan" userInput="{{isCondition}}"/>
+
+        <click selector="{{InsertWidgetSection.addCondition('1')}}" stepKey="clickAddConditionItem"/>
+        <waitForElementVisible stepKey="waitForConditionFieldOpened" selector="{{InsertWidgetSection.conditionField('1')}}"/>
+
+        <fillField selector="{{InsertWidgetSection.conditionField('1')}}" stepKey="setOperator" userInput="{{fieldCondition}}"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
+
+        <waitForElementVisible stepKey="waitForInsertWidgetSaved" selector="{{InsertWidgetSection.save}}"/>
+        <click stepKey="clickSaveButton" selector="{{InsertWidgetSection.save}}"/>
+        <see userInput="You saved the block." stepKey="seeSavedBlockMsgOnForm"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE.txt b/app/code/Magento/CatalogWidget/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE.txt
rename to app/code/Magento/CatalogWidget/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE_AFL.txt b/app/code/Magento/CatalogWidget/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE_AFL.txt
rename to app/code/Magento/CatalogWidget/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/README.md b/app/code/Magento/CatalogWidget/Test/Mftf/README.md
new file mode 100644
index 0000000000000..2ba00559524cb
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Widget Functional Tests
+
+The Functional Test Module for **Magento Catalog Widget** module.
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Section/CatalogWidgetSection.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Section/CatalogWidgetSection.xml
new file mode 100644
index 0000000000000..2957cfdfe6f43
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Section/CatalogWidgetSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CatalogWidgetSection">
+        <element name="insertWidgetButton" type="button" selector=".scalable.action-add-widget.plugin"/>
+        <element name="storeViewOption" type="button" selector="//*[@name='store_id']"/>
+    </section>
+
+    <section name="InsertWidgetSection">
+        <element name="widgetTypeDropDown" type="select" selector="#select_widget_type"/>
+        <element name="conditionsAddButton" type="button" selector=".rule-param.rule-param-new-child"/>
+        <element name="conditionsSelectBox" type="button" selector="#conditions__1__new_child"/>
+        <element name="addCondition" type="button" selector="//*[@id='conditions__1--{{arg1}}__value']/../preceding-sibling::a" parameterized="true"/>
+        <element name="conditionField" type="button" selector="#conditions__1--{{arg2}}__value" parameterized="true"/>
+        <element name="save" type="button" selector="#save-button"/>
+        <element name="conditionIs" type="button" selector="//*[@id='conditions__1--1__attribute']/following-sibling::span[1]"/>
+        <element name="conditionOperator" type="button" selector="#conditions__1--{{arg3}}__operator" parameterized="true"/>
+        <element name="checkElementStorefrontByPrice" type="button" selector="//*[@class='product-items widget-product-grid']//*[contains(text(),'${{arg4}}.00')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml
new file mode 100644
index 0000000000000..03bef8ffa3b7d
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="ProductListWidgetSection">
+        <element name="AddToCartByName" type="button" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{arg1}}')]]//button[contains(@class,'tocart')]" parameterized="true"/>
+        <element name="AddToCompareByName" type="button" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{arg1}}')]]//button[contains(@class,'tocompare')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
new file mode 100644
index 0000000000000..32bea8b604cf8
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CatalogProductListWidgetOperatorsTest">
+        <annotations>
+            <features value="CatalogWidget"/>
+            <stories value="MAGETWO-91609: Problems with operator more/less in the 'catalog Products List' widget"/>
+            <title value="Checking operator more/less in the 'catalog Products List' widget"/>
+            <description value="Check 'less than', 'equals or greater than', 'equals or less than' operators"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94479"/>
+            <group value="CatalogWidget"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
+            <createData entity="SimpleProduct" stepKey="createFirstProduct">
+                <requiredEntity createDataKey="simplecategory"/>
+                <field key="price">10</field>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSecondProduct">
+                <requiredEntity createDataKey="simplecategory"/>
+                <field key="price">50</field>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createThirdProduct">
+                <requiredEntity createDataKey="simplecategory"/>
+                <field key="price">100</field>
+            </createData>
+
+            <createData entity="_defaultBlock" stepKey="createPreReqBlock"/>
+            <!--User log in on back-end as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+        </before>
+
+        <!--Open block with widget.-->
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidget">
+            <argument name="addCondition" value="Price"/>
+            <argument name="isCondition" value="greater than"/>
+            <argument name="fieldCondition" value="20"/>
+        </actionGroup>
+
+        <!--Go to Catalog > Categories (choose category where created products)-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoadAddProducts" after="onCategoryIndexPage"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandAll" after="waitForCategoryPageLoadAddProducts"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickCategoryLink"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+
+        <!--Content > Add CMS Block: name saved block-->
+        <waitForElementVisible selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="waitForContentSection"/>
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
+        <waitForPageLoad stepKey="waitForContentLoad"/>
+
+        <selectOption selector="{{AdminCategoryContentSection.AddCMSBlock}}" stepKey="selectSavedBlock" userInput="{{_defaultBlock.title}}"/>
+
+        <!--Display Settings > Display Mode: Static block only-->
+        <waitForElementVisible selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" stepKey="waitForDisplaySettingsSection"/>
+        <conditionalClick selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" dependentSelector="{{AdminCategoryDisplaySettingsSection.displayMode}}" visible="false" stepKey="openDisplaySettingsSection"/>
+        <waitForPageLoad stepKey="waitForDisplaySettingsLoad"/>
+        <selectOption stepKey="selectStaticBlockOnlyOption" userInput="Static block only" selector="{{AdminCategoryDisplaySettingsSection.displayMode}}"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryWithProducts"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see userInput="You saved the category." stepKey="seeSuccessMessage"/>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded"/>
+
+        <!--Check operators Greater than-->
+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice20"/>
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50"/>
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="seeElementByPrice100"/>
+
+        <!--Open block with widget.-->
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage2">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidgetLessThan">
+            <argument name="addCondition" value="Price"/>
+            <argument name="isCondition" value="less than"/>
+            <argument name="fieldCondition" value="20"/>
+        </actionGroup>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage2"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded2"/>
+
+        <!--Check operators Greater than-->
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice20"/>
+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="dontSeeElementByPrice50"/>
+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="dontSeeElementByPrice100"/>
+
+        <!--Open block with widget.-->
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage3">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidgetEqualsOrGreaterThan">
+            <argument name="addCondition" value="Price"/>
+            <argument name="isCondition" value="equals or greater than"/>
+            <argument name="fieldCondition" value="50"/>
+        </actionGroup>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage3"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded3"/>
+
+        <!--Check operators Greater than-->
+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice20s"/>
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50s"/>
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="seeElementByPrice100s"/>
+
+        <!--Open block with widget.-->
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage4">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateBlockWithWidget" stepKey="adminCreateBlockWithWidgetEqualsOrLessThan">
+            <argument name="addCondition" value="Price"/>
+            <argument name="isCondition" value="equals or less than"/>
+            <argument name="fieldCondition" value="50"/>
+        </actionGroup>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="$$simplecategory.name$$.html" stepKey="goToStorefrontCategoryPage4"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded4"/>
+
+        <!--Check operators Greater than-->
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice20s"/>
+        <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50t"/>
+        <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('100')}}" stepKey="dontSeeElementByPrice100s"/>
+
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
+            <deleteData createDataKey="simplecategory" stepKey="deleteSimpleCategory"/>
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
index e871ed4359d5c..5de8b9d9632fc 100644
--- a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
+++ b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
@@ -87,8 +87,8 @@ protected function setUp()
     {
         $this->collectionFactory =
             $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()->getMock();
+                ->setMethods(['create'])
+                ->disableOriginalConstructor()->getMock();
         $this->visibility = $this->getMockBuilder(\Magento\Catalog\Model\Product\Visibility::class)
             ->setMethods(['getVisibleInCatalogIds'])
             ->disableOriginalConstructor()
@@ -144,10 +144,14 @@ public function testGetCacheKeyInfo()
         $this->productsList->setData('conditions', 'some_serialized_conditions');
 
         $this->productsList->setData('page_var_name', 'page_number');
+        $this->productsList->setTemplate('test_template');
+        $this->productsList->setData('title', 'test_title');
         $this->request->expects($this->once())->method('getParam')->with('page_number')->willReturn(1);
 
         $this->request->expects($this->once())->method('getParams')->willReturn('request_params');
-        $this->priceCurrency->expects($this->once())->method('getCurrencySymbol')->willReturn('$');
+        $currency = $this->createMock(\Magento\Directory\Model\Currency::class);
+        $currency->expects($this->once())->method('getCode')->willReturn('USD');
+        $this->priceCurrency->expects($this->once())->method('getCurrency')->willReturn($currency);
 
         $this->serializer->expects($this->any())
             ->method('serialize')
@@ -157,14 +161,16 @@ public function testGetCacheKeyInfo()
 
         $cacheKey = [
             'CATALOG_PRODUCTS_LIST_WIDGET',
-            '$',
+            'USD',
             1,
             'blank',
             'context_group',
             1,
             5,
             'some_serialized_conditions',
-            json_encode('request_params')
+            json_encode('request_params'),
+            'test_template',
+            'test_title'
         ];
         $this->assertEquals($cacheKey, $this->productsList->getCacheKeyInfo());
     }
@@ -249,9 +255,10 @@ public function testGetPagerHtml()
      * Test public `createCollection` method and protected `getPageSize` method via `createCollection`
      *
      * @param bool $pagerEnable
-     * @param int $productsCount
-     * @param int $productsPerPage
-     * @param int $expectedPageSize
+     * @param int  $productsCount
+     * @param int  $productsPerPage
+     * @param int  $expectedPageSize
+     *
      * @dataProvider createCollectionDataProvider
      */
     public function testCreateCollection($pagerEnable, $productsCount, $productsPerPage, $expectedPageSize)
@@ -309,6 +316,9 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
         $this->assertSame($collection, $this->productsList->createCollection());
     }
 
+    /**
+     * @return array
+     */
     public function createCollectionDataProvider()
     {
         return [
@@ -380,6 +390,7 @@ public function testGetIdentities()
 
     /**
      * @param $collection
+     *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
     private function getConditionsForCollection($collection)
diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
index 09270b6b41fc7..219cae6829299 100644
--- a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
@@ -17,11 +17,21 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productResource;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     private $attributeMock;
 
+    /**
+     * @inheritdoc
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
@@ -33,9 +43,9 @@ protected function setUp()
         $storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
         $storeManager->expects($this->any())->method('getStore')->willReturn($storeMock);
-        $productResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
-        $productResource->expects($this->once())->method('loadAllAttributes')->willReturnSelf();
-        $productResource->expects($this->once())->method('getAttributesByCode')->willReturn([]);
+        $this->productResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $this->productResource->expects($this->once())->method('loadAllAttributes')->willReturnSelf();
+        $this->productResource->expects($this->once())->method('getAttributesByCode')->willReturn([]);
         $productCategoryList = $this->getMockBuilder(\Magento\Catalog\Model\ProductCategoryList::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -45,7 +55,7 @@ protected function setUp()
             [
                 'config' => $eavConfig,
                 'storeManager' => $storeManager,
-                'productResource' => $productResource,
+                'productResource' => $this->productResource,
                 'productCategoryList' => $productCategoryList,
                 'data' => [
                     'rule' => $ruleMock,
@@ -55,6 +65,11 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test addToCollection method.
+     *
+     * @return void
+     */
     public function testAddToCollection()
     {
         $collectionMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
@@ -67,9 +82,22 @@ public function testAddToCollection()
         $this->attributeMock->expects($this->once())->method('isScopeGlobal')->willReturn(true);
         $this->attributeMock->expects($this->once())->method('isScopeGlobal')->willReturn(true);
         $this->attributeMock->expects($this->once())->method('getBackendType')->willReturn('multiselect');
+
+        $entityMock = $this->createMock(\Magento\Eav\Model\Entity\AbstractEntity::class);
+        $entityMock->expects($this->once())->method('getLinkField')->willReturn('entitiy_id');
+        $this->attributeMock->expects($this->once())->method('getEntity')->willReturn($entityMock);
+        $connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+
+        $this->productResource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+
         $this->model->addToCollection($collectionMock);
     }
 
+    /**
+     * Test getMappedSqlField method.
+     *
+     * @return void
+     */
     public function testGetMappedSqlFieldSku()
     {
         $this->model->setAttribute('sku');
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 11920e94e7e47..3998e58c99baa 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -5,19 +5,18 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-rule": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-widget": "100.3.*",
-        "magento/module-wishlist": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogWidget/etc/module.xml b/app/code/Magento/CatalogWidget/etc/module.xml
index 8954f11f954f7..b3724d4b91f79 100644
--- a/app/code/Magento/CatalogWidget/etc/module.xml
+++ b/app/code/Magento/CatalogWidget/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogWidget" setup_version="2.0.0">
+    <module name="Magento_CatalogWidget" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Widget"/>
diff --git a/app/code/Magento/CatalogWidget/etc/widget.xml b/app/code/Magento/CatalogWidget/etc/widget.xml
index 3d54c314c6622..1e6ed19057171 100644
--- a/app/code/Magento/CatalogWidget/etc/widget.xml
+++ b/app/code/Magento/CatalogWidget/etc/widget.xml
@@ -33,14 +33,18 @@
             <parameter name="template" xsi:type="select" required="true" visible="true">
                 <label translate="true">Template</label>
                 <options>
-                    <option name="default" value="product/widget/content/grid.phtml" selected="true">
+                    <option name="default" value="Magento_CatalogWidget::product/widget/content/grid.phtml" selected="true">
                         <label translate="true">Products Grid Template</label>
                     </option>
                 </options>
             </parameter>
             <parameter name="cache_lifetime" xsi:type="text" visible="true">
                 <label translate="true">Cache Lifetime (Seconds)</label>
-                <description translate="true">86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.</description>
+                <description translate="true">
+                    <![CDATA[Time in seconds between the widget updates.
+                    <br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+                    <br/>Widget will not show products that begin to match the specified conditions until cache is refreshed.]]>
+                </description>
             </parameter>
             <parameter name="condition" xsi:type="conditions" visible="true" required="true" sort_order="10"
                        class="Magento\CatalogWidget\Block\Product\Widget\Conditions">
diff --git a/app/code/Magento/CatalogWidget/i18n/en_US.csv b/app/code/Magento/CatalogWidget/i18n/en_US.csv
index 9ecde5cb1a062..4cccbdd926282 100644
--- a/app/code/Magento/CatalogWidget/i18n/en_US.csv
+++ b/app/code/Magento/CatalogWidget/i18n/en_US.csv
@@ -16,5 +16,11 @@ Title,Title
 Template,Template
 "Products Grid Template","Products Grid Template"
 "Cache Lifetime (Seconds)","Cache Lifetime (Seconds)"
-"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
+,
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
 Conditions,Conditions
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 1eb9b25a9a451..6789ace243b84 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -33,76 +33,77 @@
             <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
             <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
                 <ol class="product-items <?= /* @noEscape */ $type ?>">
+                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <li class="product-item">
-                            <div class="product-item-info">
-                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                    <?= $block->getImage($_item, $image)->toHtml() ?>
-                                </a>
-                                <div class="product-item-details">
-                                    <strong class="product-item-name">
-                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
-                                           class="product-item-link">
-                                            <?= $block->escapeHtml($_item->getName()) ?>
-                                        </a>
-                                    </strong>
-                                    <?php
-                                    echo $block->getProductPriceHtml($_item, $type);
-                                    ?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <div class="product-item-info">
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
+                            </a>
+                            <div class="product-item-details">
+                                <strong class="product-item-name">
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                       class="product-item-link">
+                                        <?= $block->escapeHtml($_item->getName()) ?>
+                                    </a>
+                                </strong>
+                                <?php
+                                echo $block->getProductPriceHtml($_item, $type);
+                                ?>
 
-                                    <?php if ($templateType): ?>
-                                        <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                                    <?php endif; ?>
+                                <?php if ($templateType): ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                <?php endif; ?>
 
-                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                        <div class="product-item-actions">
-                                            <?php if ($showCart): ?>
-                                                <div class="actions-primary">
-                                                    <?php if ($_item->isSaleable()): ?>
-                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                            </button>
-                                                        <?php else: ?>
-                                                            <?php
-                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                            ?>
-                                                            <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                            </button>
-                                                        <?php endif; ?>
+                                <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                    <div class="product-item-actions">
+                                        <?php if ($showCart): ?>
+                                            <div class="actions-primary">
+                                                <?php if ($_item->isSaleable()): ?>
+                                                    <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
+                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                        </button>
                                                     <?php else: ?>
-                                                        <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-                                                        <?php else: ?>
-                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
-                                                        <?php endif; ?>
+                                                        <?php
+                                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                        ?>
+                                                        <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                        </button>
                                                     <?php endif; ?>
-                                                </div>
-                                            <?php endif; ?>
-                                            <?php if ($showWishlist || $showCompare): ?>
-                                                <div class="actions-secondary" data-role="add-to-links">
-                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                        <a href="#"
-                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                        </a>
-                                                    <?php endif; ?>
-                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                        <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                        </a>
+                                                <?php else: ?>
+                                                    <?php if ($_item->getIsSalable()): ?>
+                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                    <?php else: ?>
+                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                                     <?php endif; ?>
-                                                </div>
-                                            <?php endif; ?>
-                                        </div>
-                                    <?php endif; ?>
-                                </div>
+                                                <?php endif; ?>
+                                            </div>
+                                        <?php endif; ?>
+                                        <?php if ($showWishlist || $showCompare): ?>
+                                            <div class="actions-secondary" data-role="add-to-links">
+                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                    <a href="#"
+                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                    </a>
+                                                <?php endif; ?>
+                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                    <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                    </a>
+                                                <?php endif; ?>
+                                            </div>
+                                        <?php endif; ?>
+                                    </div>
+                                <?php endif; ?>
                             </div>
-                        </li>
+                        </div>
+                        <?= ($iterator == count($items) + 1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
index 45e885d0dbd46..cad1c100c7e5b 100644
--- a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
@@ -9,7 +9,7 @@
  * Interface PaymentDetailsInterface
  * @api
  */
-interface PaymentDetailsInterface
+interface PaymentDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**#@+
      * Constants defined for keys of array, makes typos less likely
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 57ca4b7b2e606..a43f074d8df67 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -11,6 +11,8 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * Shopping cart item render block
@@ -21,6 +23,7 @@
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setProductName(string)
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setDeleteUrl(string)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class Renderer extends \Magento\Framework\View\Element\Template implements
     \Magento\Framework\DataObject\IdentityInterface
@@ -91,6 +94,9 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      */
     private $messageInterpretationStrategy;
 
+    /** @var ItemResolverInterface */
+    private $itemResolver;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
@@ -102,6 +108,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param InterpretationStrategyInterface $messageInterpretationStrategy
      * @param array $data
+     * @param ItemResolverInterface|null $itemResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
@@ -115,7 +122,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Manager $moduleManager,
         InterpretationStrategyInterface $messageInterpretationStrategy,
-        array $data = []
+        array $data = [],
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->imageBuilder = $imageBuilder;
@@ -127,6 +135,7 @@ public function __construct(
         $this->_isScopePrivate = true;
         $this->moduleManager = $moduleManager;
         $this->messageInterpretationStrategy = $messageInterpretationStrategy;
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -172,7 +181,7 @@ public function getProduct()
      */
     public function getProductForThumbnail()
     {
-        return $this->getProduct();
+        return $this->itemResolver->getFinalProduct($this->getItem());
     }
 
     /**
@@ -611,9 +620,6 @@ public function getActions(AbstractItem $item)
      */
     public function getImage($product, $imageId, $attributes = [])
     {
-        return $this->imageBuilder->setProduct($product)
-            ->setImageId($imageId)
-            ->setAttributes($attributes)
-            ->create();
+        return $this->imageBuilder->create($product, $imageId, $attributes);
     }
 }
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 7b0ab1bc03e5b..c52b7fe18814f 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -74,7 +74,8 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return $this->serializer->serialize($this->jsLayout);
+
+        return json_encode($this->jsLayout, JSON_HEX_TAG);
     }
 
     /**
@@ -94,6 +95,6 @@ public function getBaseUrl()
      */
     public function getSerializedCheckoutConfig()
     {
-        return $this->serializer->serialize($this->getCheckoutConfig());
+        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
     }
 }
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 5c237eecf0a9f..92ba6bf2bbbb1 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -100,9 +100,7 @@ public function getSerializedConfig()
      */
     public function getImageHtmlTemplate()
     {
-        return $this->imageHelper->getFrame()
-            ? 'Magento_Catalog/product/image'
-            : 'Magento_Catalog/product/image_with_borders';
+        return 'Magento_Catalog/product/image_with_borders';
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index d3d3adbe40f38..375c564f29059 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -69,7 +69,8 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return parent::getJsLayout();
+
+        return json_encode($this->jsLayout, JSON_HEX_TAG);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
index 2cc07f49b6dfa..0ec2982b83c01 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/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index d93475a4744ca..de996bed02439 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -394,9 +394,9 @@ protected function orderCountryOptions(array $countryOptions)
         ]];
         foreach ($countryOptions as $countryOption) {
             if (empty($countryOption['value']) || in_array($countryOption['value'], $this->topCountryCodes)) {
-                array_push($headOptions, $countryOption);
+                $headOptions[] = $countryOption;
             } else {
-                array_push($tailOptions, $countryOption);
+                $tailOptions[] = $countryOption;
             }
         }
         return array_merge($headOptions, $tailOptions);
diff --git a/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
index 1d5bb5bb07d81..587dd06d89106 100644
--- a/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
@@ -141,9 +141,9 @@ private function orderCountryOptions(array $countryOptions)
         ]];
         foreach ($countryOptions as $countryOption) {
             if (empty($countryOption['value']) || in_array($countryOption['value'], $topCountryCodes)) {
-                array_push($headOptions, $countryOption);
+                $headOptions[] = $countryOption;
             } else {
-                array_push($tailOptions, $countryOption);
+                $tailOptions[] = $countryOption;
             }
         }
         return array_merge($headOptions, $tailOptions);
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index f47e514948d69..3f6f638db5b82 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -7,7 +7,7 @@
 
 use Magento\Checkout\Helper\Data;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class LayoutProcessor
@@ -40,9 +40,9 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
     private $checkoutDataHelper;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @var \Magento\Shipping\Model\Config
@@ -53,30 +53,36 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
      * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider
      * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper
      * @param AttributeMerger $merger
+     * @param \Magento\Customer\Model\Options|null $options
+     * @param Data|null $checkoutDataHelper
+     * @param \Magento\Shipping\Model\Config|null $shippingConfig
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider,
         \Magento\Ui\Component\Form\AttributeMapper $attributeMapper,
-        AttributeMerger $merger
+        AttributeMerger $merger,
+        \Magento\Customer\Model\Options $options = null,
+        Data $checkoutDataHelper = null,
+        \Magento\Shipping\Model\Config $shippingConfig = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
         $this->attributeMapper = $attributeMapper;
         $this->merger = $merger;
+        $this->options = $options ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Customer\Model\Options::class);
+        $this->checkoutDataHelper = $checkoutDataHelper ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(Data::class);
+        $this->shippingConfig = $shippingConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Shipping\Model\Config::class);
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
-     * @deprecated 100.0.11
-     * @return \Magento\Customer\Model\Options
-     */
-    private function getOptions()
-    {
-        if (!is_object($this->options)) {
-            $this->options = ObjectManager::getInstance()->get(\Magento\Customer\Model\Options::class);
-        }
-        return $this->options;
-    }
-
-    /**
+     * Get address attributes.
+     *
      * @return array
      */
     private function getAddressAttributes()
@@ -143,8 +149,8 @@ private function convertElementsToSelect($elements, $attributesToConvert)
     public function process($jsLayout)
     {
         $attributesToConvert = [
-            'prefix' => [$this->getOptions(), 'getNamePrefixOptions'],
-            'suffix' => [$this->getOptions(), 'getNameSuffixOptions'],
+            'prefix' => [$this->options, 'getNamePrefixOptions'],
+            'suffix' => [$this->options, 'getNameSuffixOptions'],
         ];
 
         $elements = $this->getAddressAttributes();
@@ -192,8 +198,8 @@ public function process($jsLayout)
      */
     private function processShippingChildrenComponents($shippingRatesLayout)
     {
-        $activeCarriers = $this->getShippingConfig()->getActiveCarriers(
-            $this->getStoreResolver()->getCurrentStoreId()
+        $activeCarriers = $this->shippingConfig->getActiveCarriers(
+            $this->storeManager->getStore()->getId()
         );
         foreach (array_keys($shippingRatesLayout) as $carrierName) {
             $carrierKey = str_replace('-rates-validation', '', $carrierName);
@@ -206,6 +212,7 @@ private function processShippingChildrenComponents($shippingRatesLayout)
 
     /**
      * Appends billing address form component to payment layout
+     *
      * @param array $paymentLayout
      * @param array $elements
      * @return array
@@ -221,7 +228,7 @@ private function processPaymentChildrenComponents(array $paymentLayout, array $e
         }
 
         // The if billing address should be displayed on Payment method or page
-        if ($this->getCheckoutDataHelper()->isDisplayBillingOnPaymentMethodAvailable()) {
+        if ($this->checkoutDataHelper->isDisplayBillingOnPaymentMethodAvailable()) {
             $paymentLayout['payments-list']['children'] =
                 array_merge_recursive(
                     $paymentLayout['payments-list']['children'],
@@ -340,49 +347,4 @@ private function getBillingAddressComponent($paymentCode, $elements)
             ],
         ];
     }
-
-    /**
-     * Get checkout data helper instance
-     *
-     * @return Data
-     * @deprecated 100.1.4
-     */
-    private function getCheckoutDataHelper()
-    {
-        if (!$this->checkoutDataHelper) {
-            $this->checkoutDataHelper = ObjectManager::getInstance()->get(Data::class);
-        }
-
-        return $this->checkoutDataHelper;
-    }
-
-    /**
-     * Retrieve Shipping Configuration.
-     *
-     * @return \Magento\Shipping\Model\Config
-     * @deprecated 100.2.0
-     */
-    private function getShippingConfig()
-    {
-        if (!$this->shippingConfig) {
-            $this->shippingConfig = ObjectManager::getInstance()->get(\Magento\Shipping\Model\Config::class);
-        }
-
-        return $this->shippingConfig;
-    }
-
-    /**
-     * Get store resolver.
-     *
-     * @return StoreResolverInterface
-     * @deprecated 100.2.0
-     */
-    private function getStoreResolver()
-    {
-        if (!$this->storeResolver) {
-            $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class);
-        }
-
-        return $this->storeResolver;
-    }
 }
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index bc3cd43a024a6..ca6b045ddbb5d 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -77,7 +77,8 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return $this->serializer->serialize($this->jsLayout);
+
+        return json_encode($this->jsLayout, JSON_HEX_TAG);
     }
 
     /**
@@ -119,6 +120,6 @@ public function getBaseUrl()
      */
     public function getSerializedCheckoutConfig()
     {
-        return $this->serializer->serialize($this->getCheckoutConfig());
+        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
     }
 }
diff --git a/app/code/Magento/Checkout/Block/Registration.php b/app/code/Magento/Checkout/Block/Registration.php
index 91ec85c1db0ed..e880230f50a74 100644
--- a/app/code/Magento/Checkout/Block/Registration.php
+++ b/app/code/Magento/Checkout/Block/Registration.php
@@ -91,7 +91,7 @@ public function getEmailAddress()
      */
     public function getCreateAccountUrl()
     {
-        return $this->getUrl('checkout/account/create');
+        return $this->getUrl('checkout/account/delegateCreate');
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Controller/Account/Create.php b/app/code/Magento/Checkout/Controller/Account/Create.php
index 2ee5d6d5528c3..dae0bb98be453 100644
--- a/app/code/Magento/Checkout/Controller/Account/Create.php
+++ b/app/code/Magento/Checkout/Controller/Account/Create.php
@@ -9,6 +9,10 @@
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * @deprecated
+ * @see DelegateCreate
+ */
 class Create extends \Magento\Framework\App\Action\Action
 {
     /**
diff --git a/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php b/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php
new file mode 100644
index 0000000000000..e4f909f9a8131
--- /dev/null
+++ b/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Controller\Account;
+
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Checkout\Model\Session;
+use Magento\Sales\Api\OrderCustomerDelegateInterface;
+
+/**
+ * Redirect guest customer for registration.
+ */
+class DelegateCreate extends Action implements HttpGetActionInterface
+{
+    /**
+     * @var OrderCustomerDelegateInterface
+     */
+    private $delegateService;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Context $context
+     * @param OrderCustomerDelegateInterface $customerDelegation
+     * @param Session $session
+     */
+    public function __construct(
+        Context $context,
+        OrderCustomerDelegateInterface $customerDelegation,
+        Session $session
+    ) {
+        parent::__construct($context);
+        $this->delegateService = $customerDelegation;
+        $this->session = $session;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        /** @var string|null $orderId */
+        $orderId = $this->session->getLastOrderId();
+        if (!$orderId) {
+            return $this->resultRedirectFactory->create()->setPath('/');
+        }
+
+        return $this->delegateService->delegateNew((int)$orderId);
+    }
+}
diff --git a/app/code/Magento/Checkout/Controller/Action.php b/app/code/Magento/Checkout/Controller/Action.php
index d985a7cd53cab..7ec5336001ce8 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.php b/app/code/Magento/Checkout/Controller/Cart.php
index f244fe310af27..d7b09c17ee036 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -106,8 +106,7 @@ protected function _isInternalUrl($url)
     /**
      * Get resolved back url
      *
-     * @param null $defaultUrl
-     *
+     * @param string|null $defaultUrl
      * @return mixed|null|string
      */
     protected function getBackUrl($defaultUrl = null)
@@ -118,12 +117,7 @@ protected function getBackUrl($defaultUrl = null)
             return $returnUrl;
         }
 
-        $shouldRedirectToCart = $this->_scopeConfig->getValue(
-            'checkout/cart/redirect_to_cart',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-
-        if ($shouldRedirectToCart || $this->getRequest()->getParam('in_cart')) {
+        if ($this->shouldRedirectToCart() || $this->getRequest()->getParam('in_cart')) {
             if ($this->getRequest()->getActionName() == 'add' && !$this->getRequest()->getParam('in_cart')) {
                 $this->_checkoutSession->setContinueShoppingUrl($this->_redirect->getRefererUrl());
             }
@@ -132,4 +126,17 @@ protected function getBackUrl($defaultUrl = null)
 
         return $defaultUrl;
     }
+
+    /**
+     * Is redirect should be performed after the product was added to cart.
+     *
+     * @return bool
+     */
+    private function shouldRedirectToCart()
+    {
+        return $this->_scopeConfig->isSetFlag(
+            'checkout/cart/redirect_to_cart',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 8831b92f3ec86..739f71caeb804 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -6,14 +6,17 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Checkout\Model\Cart as CustomerCart;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
+ * Controller for processing add to cart action.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Add extends \Magento\Checkout\Controller\Cart
+class Add extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
 {
     /**
      * @var ProductRepositoryInterface
@@ -80,6 +83,9 @@ protected function _initProduct()
     public function execute()
     {
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
+            $this->messageManager->addErrorMessage(
+                __('Your session has expired')
+            );
             return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
 
@@ -122,23 +128,33 @@ public function execute()
 
             if (!$this->_checkoutSession->getNoCartRedirect(true)) {
                 if (!$this->cart->getQuote()->getHasError()) {
-                    $message = __(
-                        'You added %1 to your shopping cart.',
-                        $product->getName()
-                    );
-                    $this->messageManager->addSuccessMessage($message);
+                    if ($this->shouldRedirectToCart()) {
+                        $message = __(
+                            'You added %1 to your shopping cart.',
+                            $product->getName()
+                        );
+                        $this->messageManager->addSuccessMessage($message);
+                    } else {
+                        $this->messageManager->addComplexSuccessMessage(
+                            'addCartSuccessMessage',
+                            [
+                                'product_name' => $product->getName(),
+                                'cart_url' => $this->getCartUrl(),
+                            ]
+                        );
+                    }
                 }
                 return $this->goBack(null, $product);
             }
         } 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)
                     );
                 }
@@ -147,13 +163,15 @@ public function execute()
             $url = $this->_checkoutSession->getRedirectUrl(true);
 
             if (!$url) {
-                $cartUrl = $this->_objectManager->get(\Magento\Checkout\Helper\Cart::class)->getCartUrl();
-                $url = $this->_redirect->getRedirectUrl($cartUrl);
+                $url = $this->_redirect->getRedirectUrl($this->getCartUrl());
             }
 
             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();
         }
@@ -188,4 +206,27 @@ protected function goBack($backUrl = null, $product = null)
             $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($result)
         );
     }
+
+    /**
+     * Returns cart url
+     *
+     * @return string
+     */
+    private function getCartUrl()
+    {
+        return $this->_url->getUrl('checkout/cart', ['_secure' => true]);
+    }
+
+    /**
+     * Is redirect should be performed after the product was added to cart.
+     *
+     * @return bool
+     */
+    private function shouldRedirectToCart()
+    {
+        return $this->_scopeConfig->isSetFlag(
+            'checkout/cart/redirect_to_cart',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index fba1b85caf7b9..c205f3c16072f 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 132fbf7d199a0..aa4ae755d7940 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -4,15 +4,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Controller\Cart;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Configure extends \Magento\Checkout\Controller\Cart
+class Configure extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
@@ -63,7 +65,9 @@ public function execute()
 
         try {
             if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
-                $this->messageManager->addError(__("We can't find the quote item."));
+                $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');
             }
 
@@ -82,7 +86,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 56215814d2cf6..fdfe817f354f4 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CouponPost extends \Magento\Checkout\Controller\Cart
+class CouponPost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
 {
     /**
      * Sales quote repository
@@ -95,14 +97,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 +113,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 +129,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 5687e0cad0710..e9c15bd7f8cc1 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -1,12 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Cart;
 
-class Delete extends \Magento\Checkout\Controller\Cart
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+/**
+ * Action Delete.
+ *
+ * Deletes item from cart.
+ */
+class Delete extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
 {
     /**
      * Delete shopping cart item action
@@ -22,9 +28,14 @@ public function execute()
         $id = (int)$this->getRequest()->getParam('id');
         if ($id) {
             try {
-                $this->cart->removeItem($id)->save();
+                $this->cart->removeItem($id);
+                // We should set Totals to be recollected once more because of Cart model as usually is loading
+                // before action executing and in case when triggerRecollect setted as true recollecting will
+                // executed and the flag will be true already.
+                $this->cart->getQuote()->setTotalsCollectedFlag(false);
+                $this->cart->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/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 3fb582d35e28a..182ab6777776a 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -7,7 +7,9 @@
 
 namespace Magento\Checkout\Controller\Cart;
 
-class Index extends \Magento\Checkout\Controller\Cart
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 118611263220b..40ce2252581cf 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -4,9 +4,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Controller\Cart;
 
-class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class UpdateItemOptions extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
 {
     /**
      * Update product configuration for a cart item
@@ -35,7 +38,9 @@ public function execute()
 
             $quoteItem = $this->cart->getQuote()->getItemById($id);
             if (!$quoteItem) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t find the quote item.'));
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __("The quote item isn't found. Verify the item and try again.")
+                );
             }
 
             $item = $this->cart->updateItem($id, new \Magento\Framework\DataObject($params));
@@ -64,17 +69,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);
                 }
             }
 
@@ -86,7 +91,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/UpdateItemQty.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemQty.php
new file mode 100644
index 0000000000000..ac4a93e6066a4
--- /dev/null
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemQty.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Controller\Cart;
+
+use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\Quote\Model\Quote\Item;
+use Psr\Log\LoggerInterface;
+
+class UpdateItemQty extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var RequestQuantityProcessor
+     */
+    private $quantityProcessor;
+
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @var CheckoutSession
+     */
+    private $checkoutSession;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context,
+     * @param RequestQuantityProcessor $quantityProcessor
+     * @param FormKeyValidator $formKeyValidator
+     * @param CheckoutSession $checkoutSession
+     * @param Json $json
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        RequestQuantityProcessor $quantityProcessor,
+        FormKeyValidator $formKeyValidator,
+        CheckoutSession $checkoutSession,
+        Json $json,
+        LoggerInterface $logger
+    ) {
+        $this->quantityProcessor = $quantityProcessor;
+        $this->formKeyValidator = $formKeyValidator;
+        $this->checkoutSession = $checkoutSession;
+        $this->json = $json;
+        $this->logger = $logger;
+        parent::__construct($context);
+    }
+
+    /**
+     * @return void
+     */
+    public function execute()
+    {
+        try {
+            if (!$this->formKeyValidator->validate($this->getRequest())) {
+                throw new LocalizedException(
+                    __('Something went wrong while saving the page. Please refresh the page and try again.')
+                );
+            }
+
+            $cartData = $this->getRequest()->getParam('cart');
+            if (!is_array($cartData)) {
+                throw new LocalizedException(
+                    __('Something went wrong while saving the page. Please refresh the page and try again.')
+                );
+            }
+
+            $cartData = $this->quantityProcessor->process($cartData);
+            $quote = $this->checkoutSession->getQuote();
+
+            foreach ($cartData as $itemId => $itemInfo) {
+                $item = $quote->getItemById($itemId);
+                $qty = isset($itemInfo['qty']) ? (double)$itemInfo['qty'] : 0;
+                if ($item) {
+                    $this->updateItemQuantity($item, $qty);
+                }
+            }
+
+            $this->jsonResponse();
+        } catch (LocalizedException $e) {
+            $this->jsonResponse($e->getMessage());
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $this->jsonResponse('Something went wrong while saving the page. Please refresh the page and try again.');
+        }
+    }
+
+    /**
+     * Updates quote item quantity.
+     *
+     * @param Item $item
+     * @param float $qty
+     * @throws LocalizedException
+     */
+    private function updateItemQuantity(Item $item, float $qty)
+    {
+        if ($qty > 0) {
+            $item->setQty($qty);
+
+            if ($item->getHasError()) {
+                throw new LocalizedException(__($item->getMessage()));
+            }
+        }
+    }
+
+    /**
+     * JSON response builder.
+     *
+     * @param string $error
+     * @return void
+     */
+    private function jsonResponse(string $error = '')
+    {
+        $this->getResponse()->representJson(
+            $this->json->serialize($this->getResponseData($error))
+        );
+    }
+
+    /**
+     * Returns response data.
+     *
+     * @param string $error
+     * @return array
+     */
+    private function getResponseData(string $error = ''): array
+    {
+        $response = [
+            'success' => true,
+        ];
+
+        if (!empty($error)) {
+            $response = [
+                'success' => false,
+                'error_message' => $error,
+            ];
+        }
+
+        return $response;
+    }
+}
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 09fa1bd64f8c6..bfc408d920ad3 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -1,13 +1,54 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Cart;
 
-class UpdatePost extends \Magento\Checkout\Controller\Cart
+use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Post update shopping cart.
+ */
+class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface, HttpPostActionInterface
 {
+    /**
+     * @var RequestQuantityProcessor
+     */
+    private $quantityProcessor;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
+     * @param \Magento\Checkout\Model\Cart $cart
+     * @param RequestQuantityProcessor $quantityProcessor
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
+        \Magento\Checkout\Model\Cart $cart,
+        RequestQuantityProcessor $quantityProcessor = null
+    ) {
+        parent::__construct(
+            $context,
+            $scopeConfig,
+            $checkoutSession,
+            $storeManager,
+            $formKeyValidator,
+            $cart
+        );
+
+        $this->quantityProcessor = $quantityProcessor ?: $this->_objectManager->get(RequestQuantityProcessor::class);
+    }
+
     /**
      * Empty customer's shopping cart
      *
@@ -18,9 +59,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.'));
         }
     }
 
@@ -34,29 +75,19 @@ protected function _updateShoppingCart()
         try {
             $cartData = $this->getRequest()->getParam('cart');
             if (is_array($cartData)) {
-                $filter = new \Zend_Filter_LocalizedToNormalized(
-                    ['locale' => $this->_objectManager->get(
-                        \Magento\Framework\Locale\ResolverInterface::class
-                    )->getLocale()]
-                );
-                foreach ($cartData as $index => $data) {
-                    if (isset($data['qty'])) {
-                        $cartData[$index]['qty'] = $filter->filter(trim($data['qty']));
-                    }
-                }
                 if (!$this->cart->getCustomerSession()->getCustomerId() && $this->cart->getQuote()->getCustomerId()) {
                     $this->cart->getQuote()->setCustomerId(null);
                 }
-
+                $cartData = $this->quantityProcessor->process($cartData);
                 $cartData = $this->cart->suggestItemsQty($cartData);
                 $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 0a5b7f190e3d3..5acfab435b512 100644
--- a/app/code/Magento/Checkout/Controller/Index/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -4,9 +4,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Checkout\Controller\Index;
 
-class Index extends \Magento\Checkout\Controller\Onepage
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface
 {
     /**
      * Checkout page
@@ -18,7 +23,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,15 +33,39 @@ 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');
         }
 
-        $this->_customerSession->regenerateId();
+        // generate session ID only if connection is unsecure according to issues in session_regenerate_id function.
+        // @see http://php.net/manual/en/function.session-regenerate-id.php
+        if (!$this->isSecureRequest()) {
+            $this->_customerSession->regenerateId();
+        }
         $this->_objectManager->get(\Magento\Checkout\Model\Session::class)->setCartWasUpdated(false);
         $this->getOnepage()->initCheckout();
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getConfig()->getTitle()->set(__('Checkout'));
         return $resultPage;
     }
+
+    /**
+     * Checks if current request uses SSL and referer also is secure.
+     *
+     * @return bool
+     */
+    private function isSecureRequest(): bool
+    {
+        $request = $this->getRequest();
+
+        $referrer = $request->getHeader('referer');
+        $secure = false;
+
+        if ($referrer) {
+            $scheme = parse_url($referrer, PHP_URL_SCHEME);
+            $secure = $scheme === 'https';
+        }
+
+        return $secure && $request->isSecure();
+    }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
index 3597962b83831..12b725a8f6df9 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Controller\Onepage;
 
 use Magento\Framework\DataObject;
@@ -37,7 +38,10 @@ public function execute()
                 $result->setData('error', true);
                 $result->setData(
                     'error_messages',
-                    __('Please agree to all the terms and conditions before placing the order.')
+                    __(
+                        "The order wasn't placed. "
+                        . "First, agree to the terms and conditions, then try placing your order again."
+                    )
                 );
                 return $this->resultJsonFactory->create()->setData($result->getData());
             }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index ae9be42a89c86..a657b23cca4d6 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Onepage;
 
-class Success extends \Magento\Checkout\Controller\Onepage
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+/**
+ * Onepage checkout success controller class
+ */
+class Success extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface
 {
     /**
      * Order success action
@@ -24,7 +28,10 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
         $this->_eventManager->dispatch(
             'checkout_onepage_controller_success_action',
-            ['order_ids' => [$session->getLastOrderId()]]
+            [
+                'order_ids' => [$session->getLastOrderId()],
+                'order' => $session->getLastRealOrder()
+            ]
         );
         return $resultPage;
     }
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
index c84aec336a589..f589e702de950 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Checkout\Controller\Sidebar;
 
-class RemoveItem extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class RemoveItem extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Checkout\Model\Sidebar
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
index e9a968681bf3d..0208519c33d78 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/CustomerData/Cart.php b/app/code/Magento/Checkout/CustomerData/Cart.php
index ddb077462ef10..01e91d75c02d9 100644
--- a/app/code/Magento/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Checkout/CustomerData/Cart.php
@@ -82,7 +82,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
@@ -158,11 +158,10 @@ protected function getRecentItems()
                     : $item->getProduct();
 
                 $products = $this->catalogUrl->getRewriteByProductStore([$product->getId() => $item->getStoreId()]);
-                if (!isset($products[$product->getId()])) {
-                    continue;
+                if (isset($products[$product->getId()])) {
+                    $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
+                    $item->getProduct()->setUrlDataObject($urlDataObject);
                 }
-                $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
-                $item->getProduct()->setUrlDataObject($urlDataObject);
             }
             $items[] = $this->itemPoolInterface->getItemData($item);
         }
diff --git a/app/code/Magento/Checkout/CustomerData/DefaultItem.php b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
index 6e917366c9cd2..21580d1275d0c 100644
--- a/app/code/Magento/Checkout/CustomerData/DefaultItem.php
+++ b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Checkout\CustomerData;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 /**
  * Default item
  */
@@ -36,12 +39,24 @@ class DefaultItem extends AbstractItem
      */
     protected $checkoutHelper;
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Catalog\Helper\Image $imageHelper
      * @param \Magento\Msrp\Helper\Data $msrpHelper
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
+     * @param \Magento\Framework\Escaper|null $escaper
+     * @param ItemResolverInterface|null $itemResolver
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -49,13 +64,17 @@ public function __construct(
         \Magento\Msrp\Helper\Data $msrpHelper,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
-        \Magento\Checkout\Helper\Data $checkoutHelper
+        \Magento\Checkout\Helper\Data $checkoutHelper,
+        \Magento\Framework\Escaper $escaper = null,
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->configurationPool = $configurationPool;
         $this->imageHelper = $imageHelper;
         $this->msrpHelper = $msrpHelper;
         $this->urlBuilder = $urlBuilder;
         $this->checkoutHelper = $checkoutHelper;
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -64,6 +83,8 @@ public function __construct(
     protected function doGetItemData()
     {
         $imageHelper = $this->imageHelper->init($this->getProductForThumbnail(), 'mini_cart_product_thumbnail');
+        $productName = $this->escaper->escapeHtml($this->item->getProduct()->getName());
+
         return [
             'options' => $this->getOptionList(),
             'qty' => $this->item->getQty() * 1,
@@ -71,7 +92,7 @@ protected function doGetItemData()
             'configure_url' => $this->getConfigureUrl(),
             'is_visible_in_site_visibility' => $this->item->getProduct()->isVisibleInSiteVisibility(),
             'product_id' => $this->item->getProduct()->getId(),
-            'product_name' => $this->item->getProduct()->getName(),
+            'product_name' => $productName,
             'product_sku' => $this->item->getProduct()->getSku(),
             'product_url' => $this->getProductUrl(),
             'product_has_url' => $this->hasProductUrl(),
@@ -105,7 +126,7 @@ protected function getOptionList()
      */
     protected function getProductForThumbnail()
     {
-        return $this->getProduct();
+        return $this->itemResolver->getFinalProduct($this->item);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index b3c2e17e5d678..40bdf93d161ed 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -9,6 +9,7 @@
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Sales\Api\PaymentFailuresInterface;
 
 /**
  * Checkout default helper
@@ -53,6 +54,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $priceCurrency;
 
     /**
+     * @var PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
+    /**
+     * Data constructor.
+     *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Checkout\Model\Session $checkoutSession
@@ -60,6 +68,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param PriceCurrencyInterface $priceCurrency
+     * @param PaymentFailuresInterface|null $paymentFailures
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -69,7 +78,8 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
-        PriceCurrencyInterface $priceCurrency
+        PriceCurrencyInterface $priceCurrency,
+        PaymentFailuresInterface $paymentFailures = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_checkoutSession = $checkoutSession;
@@ -77,6 +87,8 @@ public function __construct(
         $this->_transportBuilder = $transportBuilder;
         $this->inlineTranslation = $inlineTranslation;
         $this->priceCurrency = $priceCurrency;
+        $this->paymentFailures = $paymentFailures ? : \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(PaymentFailuresInterface::class);
         parent::__construct($context);
     }
 
@@ -103,6 +115,8 @@ public function getQuote()
     }
 
     /**
+     * Format Price
+     *
      * @param float $price
      * @return string
      */
@@ -117,6 +131,8 @@ public function formatPrice($price)
     }
 
     /**
+     * Convert Price
+     *
      * @param float $price
      * @param bool $format
      * @return float
@@ -135,9 +151,9 @@ public function convertPrice($price, $format = true)
      */
     public function canOnepageCheckout()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             'checkout/options/onepage_checkout_enabled',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -154,7 +170,7 @@ public function getPriceInclTax($item)
         }
         $qty = $item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1);
         $taxAmount = $item->getTaxAmount() + $item->getDiscountTaxCompensation();
-        $price = floatval($qty) ? ($item->getRowTotal() + $taxAmount) / $qty : 0;
+        $price = (float)$qty ? ($item->getRowTotal() + $taxAmount) / $qty : 0;
         return $this->priceCurrency->round($price);
     }
 
@@ -174,6 +190,8 @@ public function getSubtotalInclTax($item)
     }
 
     /**
+     * Get Base Price Incl Tax
+     *
      * @param AbstractItem $item
      * @return float
      */
@@ -181,11 +199,13 @@ public function getBasePriceInclTax($item)
     {
         $qty = $item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1);
         $taxAmount = $item->getBaseTaxAmount() + $item->getBaseDiscountTaxCompensation();
-        $price = floatval($qty) ? ($item->getBaseRowTotal() + $taxAmount) / $qty : 0;
+        $price = (float)$qty ? ($item->getBaseRowTotal() + $taxAmount) / $qty : 0;
         return $this->priceCurrency->round($price);
     }
 
     /**
+     * Get Base Subtotal Incl Tax
+     *
      * @param AbstractItem $item
      * @return float
      */
@@ -202,131 +222,20 @@ public function getBaseSubtotalInclTax($item)
      * @param string $message
      * @param string $checkoutType
      * @return $this
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'onepage')
-    {
-        $this->inlineTranslation->suspend();
-
-        $template = $this->scopeConfig->getValue(
-            'checkout/payment_failed/template',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $checkout->getStoreId()
-        );
-
-        $copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId());
-        $copyMethod = $this->scopeConfig->getValue(
-            'checkout/payment_failed/copy_method',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $checkout->getStoreId()
-        );
-        $bcc = [];
-        if ($copyTo && $copyMethod == 'bcc') {
-            $bcc = $copyTo;
-        }
-
-        $_receiver = $this->scopeConfig->getValue(
-            'checkout/payment_failed/receiver',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $checkout->getStoreId()
-        );
-        $sendTo = [
-            [
-                'email' => $this->scopeConfig->getValue(
-                    'trans_email/ident_' . $_receiver . '/email',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    $checkout->getStoreId()
-                ),
-                'name' => $this->scopeConfig->getValue(
-                    'trans_email/ident_' . $_receiver . '/name',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    $checkout->getStoreId()
-                ),
-            ],
-        ];
-
-        if ($copyTo && $copyMethod == 'copy') {
-            foreach ($copyTo as $email) {
-                $sendTo[] = ['email' => $email, 'name' => null];
-            }
-        }
-        $shippingMethod = '';
-        if ($shippingInfo = $checkout->getShippingAddress()->getShippingMethod()) {
-            $data = explode('_', $shippingInfo);
-            $shippingMethod = $data[0];
-        }
-
-        $paymentMethod = '';
-        if ($paymentInfo = $checkout->getPayment()) {
-            $paymentMethod = $paymentInfo->getMethod();
-        }
-
-        $items = '';
-        foreach ($checkout->getAllVisibleItems() as $_item) {
-            /* @var $_item \Magento\Quote\Model\Quote\Item */
-            $items .=
-                $_item->getProduct()->getName() . '  x ' . $_item->getQty() . '  ' . $checkout->getStoreCurrencyCode()
-                . ' ' . $_item->getProduct()->getFinalPrice(
-                    $_item->getQty()
-                ) . "\n";
-        }
-        $total = $checkout->getStoreCurrencyCode() . ' ' . $checkout->getGrandTotal();
-
-        foreach ($sendTo as $recipient) {
-            $transport = $this->_transportBuilder->setTemplateIdentifier(
-                $template
-            )->setTemplateOptions(
-                [
-                    'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
-                    'store' => Store::DEFAULT_STORE_ID
-                ]
-            )->setTemplateVars(
-                [
-                    'reason' => $message,
-                    'checkoutType' => $checkoutType,
-                    'dateAndTime' => $this->_localeDate->formatDateTime(
-                        new \DateTime(),
-                        \IntlDateFormatter::MEDIUM,
-                        \IntlDateFormatter::MEDIUM
-                    ),
-                    'customer' => $checkout->getCustomerFirstname() . ' ' . $checkout->getCustomerLastname(),
-                    'customerEmail' => $checkout->getCustomerEmail(),
-                    'billingAddress' => $checkout->getBillingAddress(),
-                    'shippingAddress' => $checkout->getShippingAddress(),
-                    'shippingMethod' => $this->scopeConfig->getValue(
-                        'carriers/' . $shippingMethod . '/title',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                    'paymentMethod' => $this->scopeConfig->getValue(
-                        'payment/' . $paymentMethod . '/title',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                    'items' => nl2br($items),
-                    'total' => $total,
-                ]
-            )->setFrom(
-                $this->scopeConfig->getValue(
-                    'checkout/payment_failed/identity',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    $checkout->getStoreId()
-                )
-            )->addTo(
-                $recipient['email'],
-                $recipient['name']
-            )->addBcc(
-                $bcc
-            )->getTransport();
-
-            $transport->sendMessage();
-        }
-
-        $this->inlineTranslation->resume();
+    public function sendPaymentFailedEmail(
+        \Magento\Quote\Model\Quote $checkout,
+        string $message,
+        string $checkoutType = 'onepage'
+    ): Data {
+        $this->paymentFailures->handle((int)$checkout->getId(), $message, $checkoutType);
 
         return $this;
     }
 
     /**
+     * Get Emails
+     *
      * @param string $configPath
      * @param null|string|bool|int|Store $storeId
      * @return array|false
@@ -335,7 +244,7 @@ protected function _getEmails($configPath, $storeId)
     {
         $data = $this->scopeConfig->getValue(
             $configPath,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if (!empty($data)) {
@@ -345,8 +254,7 @@ protected function _getEmails($configPath, $storeId)
     }
 
     /**
-     * Check is allowed Guest Checkout
-     * Use config settings and observer
+     * Check is allowed Guest Checkout. Use config settings and observer
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @param int|Store $store
@@ -359,7 +267,7 @@ public function isAllowedGuestCheckout(\Magento\Quote\Model\Quote $quote, $store
         }
         $guestCheckout = $this->scopeConfig->isSetFlag(
             self::XML_PATH_GUEST_CHECKOUT,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
 
@@ -398,13 +306,13 @@ public function isCustomerMustBeLogged()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_CUSTOMER_MUST_BE_LOGGED,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
     /**
-     * Checks if display billing address on payment method is available, otherwise
-     * billing address should be display on payment page
+     * If display billing address on payment method is available, otherwise should be display on payment page
+     *
      * @return bool
      */
     public function isDisplayBillingOnPaymentMethodAvailable()
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index cda4454ea17e0..eff07af0e6a3e 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -13,9 +14,11 @@
 
 /**
  * Shopping cart model
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated 100.1.0
+ * @deprecated 100.1.0 Use \Magento\Quote\Model\Quote instead
+ * @see \Magento\Quote\Api\Data\CartInterface
  */
 class Cart extends DataObject implements CartInterface
 {
@@ -297,21 +300,30 @@ protected function _getProduct($productInfo)
         if ($productInfo instanceof Product) {
             $product = $productInfo;
             if (!$product->getId()) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t find the product.'));
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __("The product wasn't found. Verify the product and try again.")
+                );
             }
         } elseif (is_int($productInfo) || is_string($productInfo)) {
             $storeId = $this->_storeManager->getStore()->getId();
             try {
                 $product = $this->productRepository->getById($productInfo, false, $storeId);
             } catch (NoSuchEntityException $e) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t find the product.'), $e);
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __("The product wasn't found. Verify the product and try again."),
+                    $e
+                );
             }
         } else {
-            throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t find the product.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("The product wasn't found. Verify the product and try again.")
+            );
         }
         $currentWebsiteId = $this->_storeManager->getStore()->getWebsiteId();
         if (!is_array($product->getWebsiteIds()) || !in_array($currentWebsiteId, $product->getWebsiteIds())) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t find the product.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("The product wasn't found. Verify the product and try again.")
+            );
         }
         return $product;
     }
@@ -368,6 +380,10 @@ public function addProduct($productInfo, $requestInfo = null)
             }
 
             try {
+                $this->_eventManager->dispatch(
+                    'checkout_cart_product_add_before',
+                    ['info' => $requestInfo, 'product' => $product]
+                );
                 $result = $this->getQuote()->addProduct($product, $request);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->_checkoutSession->setUseNotice(false);
@@ -433,10 +449,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;
@@ -522,7 +538,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()
                     );
@@ -531,7 +547,7 @@ public function updateItems($data)
         }
 
         if ($qtyRecalculatedFlag) {
-            $this->messageManager->addNotice(
+            $this->messageManager->addNoticeMessage(
                 __('We adjusted product quantities to fit the required increments.')
             );
         }
@@ -603,6 +619,8 @@ public function truncate()
     }
 
     /**
+     * Get product ids.
+     *
      * @return int[]
      */
     public function getProductIds()
diff --git a/app/code/Magento/Checkout/Model/Cart/CartInterface.php b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
index 2f4b679381740..40aff1980e787 100644
--- a/app/code/Magento/Checkout/Model/Cart/CartInterface.php
+++ b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
@@ -12,7 +12,8 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
- * @deprecated 100.1.0
+ * @deprecated 100.1.0 Use \Magento\Quote\Api\Data\CartInterface instead
+ * @see \Magento\Quote\Api\Data\CartInterface
  */
 interface CartInterface
 {
diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
index d8d0003d8ca7e..cdadf3573c8ec 100644
--- a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
+++ b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Checkout\Model\Cart;
 
+use Magento\Checkout\CustomerData\DefaultItem;
+use Magento\Framework\App\ObjectManager;
+
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  */
 class ImageProvider
@@ -18,20 +20,27 @@ class ImageProvider
 
     /**
      * @var \Magento\Checkout\CustomerData\ItemPoolInterface
+     * @deprecated No need for the pool as images are resolved in the default item implementation
+     * @see \Magento\Checkout\CustomerData\DefaultItem::getProductForThumbnail
      */
     protected $itemPool;
 
+    /** @var \Magento\Checkout\CustomerData\DefaultItem */
+    protected $customerDataItem;
+
     /**
      * @param \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository
      * @param \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
-     * @codeCoverageIgnore
+     * @param DefaultItem|null $customerDataItem
      */
     public function __construct(
         \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository,
-        \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
+        \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool,
+        \Magento\Checkout\CustomerData\DefaultItem $customerDataItem = null
     ) {
         $this->itemRepository = $itemRepository;
         $this->itemPool = $itemPool;
+        $this->customerDataItem = $customerDataItem ?: ObjectManager::getInstance()->get(DefaultItem::class);
     }
 
     /**
@@ -45,7 +54,7 @@ public function getImages($cartId)
         $items = $this->itemRepository->getList($cartId);
         /** @var \Magento\Quote\Model\Quote\Item $cartItem */
         foreach ($items as $cartItem) {
-            $allData = $this->itemPool->getItemData($cartItem);
+            $allData = $this->customerDataItem->getItemData($cartItem);
             $itemData[$cartItem->getItemId()] = $allData['product_image'];
         }
         return $itemData;
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestQuantityProcessor.php b/app/code/Magento/Checkout/Model/Cart/RequestQuantityProcessor.php
new file mode 100644
index 0000000000000..971b35c8f3e3d
--- /dev/null
+++ b/app/code/Magento/Checkout/Model/Cart/RequestQuantityProcessor.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model\Cart;
+
+use Magento\Framework\Locale\ResolverInterface;
+
+class RequestQuantityProcessor
+{
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * RequestQuantityProcessor constructor.
+     * @param ResolverInterface $localeResolver
+     */
+    public function __construct(
+        ResolverInterface $localeResolver
+    ) {
+        $this->localeResolver = $localeResolver;
+    }
+
+    /**
+     * Process cart request data
+     *
+     * @param array $cartData
+     * @return array
+     */
+    public function process(array $cartData): array
+    {
+        $filter = new \Zend\I18n\Filter\NumberParse($this->localeResolver->getLocale());
+
+        foreach ($cartData as $index => $data) {
+            if (isset($data['qty'])) {
+                $data['qty'] = is_string($data['qty']) ? trim($data['qty']) : $data['qty'];
+                $cartData[$index]['qty'] = $filter->filter($data['qty']);
+            }
+        }
+
+        return $cartData;
+    }
+}
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index b5727bf8f365e..f30bd73deeae2 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -8,27 +8,40 @@
 use Magento\Catalog\Helper\Product\ConfigurationPool;
 use Magento\Checkout\Helper\Data as CheckoutHelper;
 use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Model\Context as CustomerContext;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Customer\Model\Url as CustomerUrlManager;
+use Magento\Eav\Api\AttributeOptionManagementInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Locale\FormatInterface as LocaleFormat;
 use Magento\Framework\UrlInterface;
 use Magento\Quote\Api\CartItemRepositoryInterface as QuoteItemRepository;
 use Magento\Quote\Api\CartTotalRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\ShippingMethodManagementInterface as ShippingMethodManager;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Ui\Component\Form\Element\Multiline;
 
 /**
+ * Default Config Provider
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class DefaultConfigProvider implements ConfigProviderInterface
 {
+    /**
+     * @var AttributeOptionManagementInterface
+     */
+    private $attributeOptionManager;
+
     /**
      * @var CheckoutHelper
      */
@@ -159,6 +172,11 @@ class DefaultConfigProvider implements ConfigProviderInterface
      */
     protected $urlBuilder;
 
+    /**
+     * @var AddressMetadataInterface
+     */
+    private $addressMetadata;
+
     /**
      * @param CheckoutHelper $checkoutHelper
      * @param Session $checkoutSession
@@ -186,6 +204,8 @@ class DefaultConfigProvider implements ConfigProviderInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
      * @param UrlInterface $urlBuilder
+     * @param AddressMetadataInterface $addressMetadata
+     * @param AttributeOptionManagementInterface $attributeOptionManager
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -215,7 +235,9 @@ public function __construct(
         \Magento\Shipping\Model\Config $shippingMethodConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
-        UrlInterface $urlBuilder
+        UrlInterface $urlBuilder,
+        AddressMetadataInterface $addressMetadata = null,
+        AttributeOptionManagementInterface $attributeOptionManager = null
     ) {
         $this->checkoutHelper = $checkoutHelper;
         $this->checkoutSession = $checkoutSession;
@@ -243,20 +265,40 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->paymentMethodManagement = $paymentMethodManagement;
         $this->urlBuilder = $urlBuilder;
+        $this->addressMetadata = $addressMetadata ?: ObjectManager::getInstance()->get(AddressMetadataInterface::class);
+        $this->attributeOptionManager = $attributeOptionManager ??
+            ObjectManager::getInstance()->get(AttributeOptionManagementInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * Return configuration array
+     *
+     * @return array|mixed
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getConfig()
     {
-        $quoteId = $this->checkoutSession->getQuote()->getId();
+        $quote = $this->checkoutSession->getQuote();
+        $quoteId = $quote->getId();
+        $email = $quote->getShippingAddress()->getEmail();
+        $quoteItemData = $this->getQuoteItemData();
         $output['formKey'] = $this->formKey->getFormKey();
         $output['customerData'] = $this->getCustomerData();
         $output['quoteData'] = $this->getQuoteData();
-        $output['quoteItemData'] = $this->getQuoteItemData();
+        $output['quoteItemData'] = $quoteItemData;
+        $output['quoteMessages'] = $this->getQuoteItemsMessages($quoteItemData);
         $output['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
         $output['selectedShippingMethod'] = $this->getSelectedShippingMethod();
+        if ($email && !$this->isCustomerLoggedIn()) {
+            $shippingAddressFromData = $this->getAddressFromData($quote->getShippingAddress());
+            $billingAddressFromData = $this->getAddressFromData($quote->getBillingAddress());
+            $output['shippingAddressFromData'] = $shippingAddressFromData;
+            if ($shippingAddressFromData != $billingAddressFromData) {
+                $output['billingAddressFromData'] = $billingAddressFromData;
+            }
+            $output['validatedEmailValue'] = $email;
+        }
         $output['storeCode'] = $this->getStoreCode();
         $output['isGuestCheckoutAllowed'] = $this->isGuestCheckoutAllowed();
         $output['isCustomerLoginRequired'] = $this->isCustomerLoginRequired();
@@ -268,14 +310,15 @@ public function getConfig()
         $output['staticBaseUrl'] = $this->getStaticBaseUrl();
         $output['priceFormat'] = $this->localeFormat->getPriceFormat(
             null,
-            $this->checkoutSession->getQuote()->getQuoteCurrencyCode()
+            $quote->getQuoteCurrencyCode()
         );
         $output['basePriceFormat'] = $this->localeFormat->getPriceFormat(
             null,
-            $this->checkoutSession->getQuote()->getBaseCurrencyCode()
+            $quote->getBaseCurrencyCode()
         );
         $output['postCodes'] = $this->postCodesConfig->getPostCodes();
         $output['imageData'] = $this->imageProvider->getImages($quoteId);
+
         $output['totalsData'] = $this->getTotalsData();
         $output['shippingPolicy'] = [
             'isEnabled' => $this->scopeConfig->isSetFlag(
@@ -324,11 +367,34 @@ private function getCustomerData()
             $customerData = $customer->__toArray();
             foreach ($customer->getAddresses() as $key => $address) {
                 $customerData['addresses'][$key]['inline'] = $this->getCustomerAddressInline($address);
+                if ($address->getCustomAttributes()) {
+                    $customerData['addresses'][$key]['custom_attributes'] = $this->filterNotVisibleAttributes(
+                        $customerData['addresses'][$key]['custom_attributes']
+                    );
+                }
             }
         }
         return $customerData;
     }
 
+    /**
+     * Filter not visible on storefront custom attributes.
+     *
+     * @param array $attributes
+     * @return array
+     */
+    private function filterNotVisibleAttributes(array $attributes)
+    {
+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
+        foreach ($attributesMetadata as $attributeMetadata) {
+            if (!$attributeMetadata->isVisible()) {
+                unset($attributes[$attributeMetadata->getAttributeCode()]);
+            }
+        }
+
+        return $this->setLabelsToAttributes($attributes);
+    }
+
     /**
      * Set additional customer address data
      *
@@ -387,6 +453,7 @@ private function getQuoteItemData()
                     $quoteItem->getProduct(),
                     'product_thumbnail_image'
                 )->getUrl();
+                $quoteItemData[$index]['message'] = $quoteItem->getMessage();
             }
         }
         return $quoteItemData;
@@ -480,6 +547,38 @@ private function getSelectedShippingMethod()
         return $shippingMethodData;
     }
 
+    /**
+     * Create address data appropriate to fill checkout address form
+     *
+     * @param AddressInterface $address
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAddressFromData(AddressInterface $address)
+    {
+        $addressData = [];
+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
+        foreach ($attributesMetadata as $attributeMetadata) {
+            if (!$attributeMetadata->isVisible()) {
+                continue;
+            }
+            $attributeCode = $attributeMetadata->getAttributeCode();
+            $attributeData = $address->getData($attributeCode);
+            if ($attributeData) {
+                if ($attributeMetadata->getFrontendInput() === Multiline::NAME) {
+                    $attributeData = \is_array($attributeData) ? $attributeData : explode("\n", $attributeData);
+                    $attributeData = (object)$attributeData;
+                }
+                if ($attributeMetadata->isUserDefined()) {
+                    $addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][$attributeCode] = $attributeData;
+                    continue;
+                }
+                $addressData[$attributeCode] = $attributeData;
+            }
+        }
+        return $addressData;
+    }
+
     /**
      * Retrieve store code
      *
@@ -548,6 +647,7 @@ protected function getStaticBaseUrl()
 
     /**
      * Return quote totals data
+     *
      * @return array
      */
     private function getTotalsData()
@@ -579,6 +679,7 @@ private function getTotalsData()
 
     /**
      * Returns active carriers codes
+     *
      * @return array
      */
     private function getActiveCarriers()
@@ -592,6 +693,7 @@ private function getActiveCarriers()
 
     /**
      * Returns origin country code
+     *
      * @return string
      */
     private function getOriginCountryCode()
@@ -605,7 +707,9 @@ private function getOriginCountryCode()
 
     /**
      * Returns array of payment methods
-     * @return array
+     *
+     * @return array $paymentMethods
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getPaymentMethods()
     {
@@ -621,4 +725,77 @@ private function getPaymentMethods()
         }
         return $paymentMethods;
     }
+
+    /**
+     * Set Labels to custom Attributes
+     *
+     * @param array $customAttributes
+     * @return array $customAttributes
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    private function setLabelsToAttributes(array $customAttributes) : array
+    {
+        if (!empty($customAttributes)) {
+            foreach ($customAttributes as $customAttributeCode => $customAttribute) {
+                $attributeOptionLabels = $this->getAttributeLabels($customAttribute, $customAttributeCode);
+                if (!empty($attributeOptionLabels)) {
+                    $customAttributes[$customAttributeCode]['label'] = implode(', ', $attributeOptionLabels);
+                }
+            }
+        }
+
+        return $customAttributes;
+    }
+
+    /**
+     * Get Labels by CustomAttribute and CustomAttributeCode
+     *
+     * @param array $customAttribute
+     * @param string|integer $customAttributeCode
+     * @return array $attributeOptionLabels
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    private function getAttributeLabels(array $customAttribute, string $customAttributeCode) : array
+    {
+        $attributeOptionLabels = [];
+
+        if (!empty($customAttribute['value'])) {
+            $customAttributeValues = explode(',', $customAttribute['value']);
+            $attributeOptions = $this->attributeOptionManager->getItems(
+                \Magento\Customer\Model\Indexer\Address\AttributeProvider::ENTITY,
+                $customAttributeCode
+            );
+
+            if (!empty($attributeOptions)) {
+                foreach ($attributeOptions as $attributeOption) {
+                    $attributeOptionValue = $attributeOption->getValue();
+                    if (in_array($attributeOptionValue, $customAttributeValues)) {
+                        $attributeOptionLabels[] = $attributeOption->getLabel() ?? $attributeOptionValue;
+                    }
+                }
+            }
+        }
+
+        return $attributeOptionLabels;
+    }
+
+    /**
+     * Get notification messages for the quote items
+     *
+     * @param array $quoteItemData
+     * @return array
+     */
+    private function getQuoteItemsMessages(array $quoteItemData): array
+    {
+        $quoteItemsMessages = [];
+        if ($quoteItemData) {
+            foreach ($quoteItemData as $item) {
+                $quoteItemsMessages[$item['item_id']] = $item['message'];
+            }
+        }
+
+        return $quoteItemsMessages;
+    }
 }
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 6779da354faf8..333226b7d216f 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Checkout\Model;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Quote\Model\Quote;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -50,6 +54,11 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
      */
     private $logger;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $connectionPool;
+
     /**
      * @param \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement
      * @param \Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement
@@ -57,6 +66,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
      * @param \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationManagement
      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CartRepositoryInterface $cartRepository
+     * @param ResourceConnection|null
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -65,7 +75,8 @@ public function __construct(
         \Magento\Quote\Api\GuestCartManagementInterface $cartManagement,
         \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationManagement,
         \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        ResourceConnection $connectionPool = null
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
@@ -73,6 +84,7 @@ public function __construct(
         $this->paymentInformationManagement = $paymentInformationManagement;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
         $this->cartRepository = $cartRepository;
+        $this->connectionPool = $connectionPool ?: ObjectManager::getInstance()->get(ResourceConnection::class);
     }
 
     /**
@@ -84,21 +96,35 @@ public function savePaymentInformationAndPlaceOrder(
         \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
         \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
     ) {
-        $this->savePaymentInformation($cartId, $email, $paymentMethod, $billingAddress);
+        $salesConnection = $this->connectionPool->getConnection('sales');
+        $checkoutConnection = $this->connectionPool->getConnection('checkout');
+        $salesConnection->beginTransaction();
+        $checkoutConnection->beginTransaction();
+
         try {
-            $orderId = $this->cartManagement->placeOrder($cartId);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            throw new CouldNotSaveException(
-                __($e->getMessage()),
-                $e
-            );
+            $this->savePaymentInformation($cartId, $email, $paymentMethod, $billingAddress);
+            try {
+                $orderId = $this->cartManagement->placeOrder($cartId);
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                throw new CouldNotSaveException(
+                    __($e->getMessage()),
+                    $e
+                );
+            } catch (\Exception $e) {
+                $this->getLogger()->critical($e);
+                throw new CouldNotSaveException(
+                    __('An error occurred on the server. Please try to place the order again.'),
+                    $e
+                );
+            }
+            $salesConnection->commit();
+            $checkoutConnection->commit();
         } catch (\Exception $e) {
-            $this->getLogger()->critical($e);
-            throw new CouldNotSaveException(
-                __('An error occurred on the server. Please try to place the order again.'),
-                $e
-            );
+            $salesConnection->rollBack();
+            $checkoutConnection->rollBack();
+            throw $e;
         }
+
         return $orderId;
     }
 
@@ -111,13 +137,19 @@ public function savePaymentInformation(
         \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
         \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
     ) {
+        $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
+        /** @var Quote $quote */
+        $quote = $this->cartRepository->getActive($quoteIdMask->getQuoteId());
+
         if ($billingAddress) {
             $billingAddress->setEmail($email);
-            $this->billingAddressManagement->assign($cartId, $billingAddress);
+            $quote->removeAddress($quote->getBillingAddress()->getId());
+            $quote->setBillingAddress($billingAddress);
+            $quote->setDataChanges(true);
         } else {
-            $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
-            $this->cartRepository->getActive($quoteIdMask->getQuoteId())->getBillingAddress()->setEmail($email);
+            $quote->getBillingAddress()->setEmail($email);
         }
+        $this->limitShippingCarrier($quote);
 
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
         return true;
@@ -145,4 +177,22 @@ private function getLogger()
         }
         return $this->logger;
     }
+
+    /**
+     * Limits shipping rates request by carrier from shipping address.
+     *
+     * @param Quote $quote
+     *
+     * @return void
+     * @see \Magento\Shipping\Model\Shipping::collectRates
+     */
+    private function limitShippingCarrier(Quote $quote) : void
+    {
+        $shippingAddress = $quote->getShippingAddress();
+        if ($shippingAddress && $shippingAddress->getShippingMethod()) {
+            $shippingDataArray = explode('_', $shippingAddress->getShippingMethod());
+            $shippingCarrier = array_shift($shippingDataArray);
+            $shippingAddress->setLimitCarrier($shippingCarrier);
+        }
+    }
 }
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index 3d6b0aa0cdc12..d2bd680aa38f3 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Model;
 
 use Magento\Framework\Exception\CouldNotSaveException;
 
 /**
+ * Payment information management
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInformationManagementInterface
@@ -71,7 +74,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function savePaymentInformationAndPlaceOrder(
         $cartId,
@@ -89,7 +92,7 @@ public function savePaymentInformationAndPlaceOrder(
         } catch (\Exception $e) {
             $this->getLogger()->critical($e);
             throw new CouldNotSaveException(
-                __('An error occurred on the server. Please try to place the order again.'),
+                __('A server error stopped your order from being placed. Please try to place your order again.'),
                 $e
             );
         }
@@ -97,7 +100,7 @@ public function savePaymentInformationAndPlaceOrder(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function savePaymentInformation(
         $cartId,
@@ -114,9 +117,8 @@ public function savePaymentInformation(
             $quote->setDataChanges(true);
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingAddress && $shippingAddress->getShippingMethod()) {
-                $shippingDataArray = explode('_', $shippingAddress->getShippingMethod());
-                $shippingCarrier = array_shift($shippingDataArray);
-                $shippingAddress->setLimitCarrier($shippingCarrier);
+                $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
+                $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
             }
         }
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
@@ -124,7 +126,7 @@ public function savePaymentInformation(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getPaymentInformation($cartId)
     {
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index d8142d033f78c..cd3bd2c5a7deb 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Model;
 
 use Magento\Framework\Exception\InputException;
@@ -18,6 +19,9 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
+ * Class ShippingInformationManagement
+ *
+ * @package Magento\Checkout\Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInformationManagementInterface
@@ -98,8 +102,8 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
-     * @param CartExtensionFactory|null $cartExtensionFactory,
-     * @param ShippingAssignmentFactory|null $shippingAssignmentFactory,
+     * @param CartExtensionFactory|null $cartExtensionFactory
+     * @param ShippingAssignmentFactory|null $shippingAssignmentFactory
      * @param ShippingFactory|null $shippingFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -135,7 +139,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * Save address information.
+     *
+     * @param int $cartId
+     * @param \Magento\Checkout\Api\Data\ShippingInformationInterface $addressInformation
+     * @return \Magento\Checkout\Api\Data\PaymentDetailsInterface
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
      */
     public function saveAddressInformation(
         $cartId,
@@ -150,8 +161,12 @@ public function saveAddressInformation(
             $address->setCustomerAddressId(null);
         }
 
+        if ($billingAddress && !$billingAddress->getCustomerAddressId()) {
+            $billingAddress->setCustomerAddressId(null);
+        }
+
         if (!$address->getCountryId()) {
-            throw new StateException(__('Shipping address is not set'));
+            throw new StateException(__('The shipping address is missing. Set the address and try again.'));
         }
 
         /** @var \Magento\Quote\Model\Quote $quote */
@@ -169,7 +184,9 @@ public function saveAddressInformation(
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            throw new InputException(__('Unable to save shipping information. Please check input data.'));
+            throw new InputException(
+                __('The shipping information was unable to be saved. Verify the input data and try again.')
+            );
         }
 
         $shippingAddress = $quote->getShippingAddress();
@@ -198,11 +215,15 @@ public function saveAddressInformation(
     protected function validateQuote(\Magento\Quote\Model\Quote $quote)
     {
         if (0 == $quote->getItemsCount()) {
-            throw new InputException(__('Shipping method is not applicable for empty cart'));
+            throw new InputException(
+                __("The shipping method can't be set for an empty cart. Add an item to cart and try again.")
+            );
         }
     }
 
     /**
+     * Prepare shipping assignment.
+     *
      * @param CartInterface $quote
      * @param AddressInterface $address
      * @param string $method
diff --git a/app/code/Magento/Checkout/Model/Sidebar.php b/app/code/Magento/Checkout/Model/Sidebar.php
index 1a0e3aa818351..6f6655508f1b4 100644
--- a/app/code/Magento/Checkout/Model/Sidebar.php
+++ b/app/code/Magento/Checkout/Model/Sidebar.php
@@ -85,7 +85,7 @@ public function checkQuoteItem($itemId)
     {
         $item = $this->cart->getQuote()->getItemById($itemId);
         if (!$item instanceof CartItemInterface) {
-            throw new LocalizedException(__('We can\'t find the quote item.'));
+            throw new LocalizedException(__("The quote item isn't found. Verify the item and try again."));
         }
         return $this;
     }
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index bc6eb07b51a41..f7e55fdc84cf7 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 7b0aa82be31e7..63c573f2ffe65 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/Observer/SalesQuoteSaveAfterObserver.php b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
index d926e33d54113..6bc7965ff5e34 100644
--- a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
+++ b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class SalesQuoteSaveAfterObserver
+ */
 class SalesQuoteSaveAfterObserver implements ObserverInterface
 {
     /**
@@ -24,15 +27,18 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
     }
 
     /**
+     * Assign quote to session
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        /* @var \Magento\Quote\Model\Quote $quote */
         $quote = $observer->getEvent()->getQuote();
-        /* @var $quote \Magento\Quote\Model\Quote */
+
         if ($quote->getIsCheckoutCart()) {
-            $this->checkoutSession->getQuoteId($quote->getId());
+            $this->checkoutSession->setQuoteId($quote->getId());
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php b/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
new file mode 100644
index 0000000000000..e7776b3dcbedc
--- /dev/null
+++ b/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Plugin\Model\Quote;
+
+use Magento\Quote\Model\Quote;
+
+/**
+ * Clear quote addresses after all items were removed.
+ */
+class ResetQuoteAddresses
+{
+    /**
+     * Clears the quote addresses when all the items are removed from the cart
+     *
+     * @param Quote $quote
+     * @param Quote $result
+     * @param mixed $itemId
+     * @return Quote
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRemoveItem(Quote $quote, Quote $result, $itemId): Quote
+    {
+        if (empty($result->getAllVisibleItems())) {
+            foreach ($result->getAllAddresses() as $address) {
+                $result->removeAddress($address->getId());
+            }
+            $extensionAttributes = $result->getExtensionAttributes();
+            if (!$result->isVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+                $extensionAttributes->setShippingAssignments([]);
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Checkout/Setup/InstallData.php b/app/code/Magento/Checkout/Setup/InstallData.php
deleted file mode 100644
index 38879e06d65ac..0000000000000
--- a/app/code/Magento/Checkout/Setup/InstallData.php
+++ /dev/null
@@ -1,826 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Checkout\Setup;
-
-use Magento\Customer\Helper\Address;
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Customer address
-     *
-     * @var Address
-     */
-    private $customerAddress;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     * @param Address $customerAddress
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory, Address $customerAddress)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-        $this->customerAddress = $customerAddress;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        
-        $setup->startSetup();
-
-        $connection = $setup->getConnection();
-
-        $select = $connection->select()->from(
-            $setup->getTable('core_config_data'),
-            'COUNT(*)'
-        )->where(
-            'path=?',
-            'customer/address/prefix_show'
-        )->where(
-            'value NOT LIKE ?',
-            '0'
-        );
-        $showPrefix = (bool)$this->customerAddress->getConfig('prefix_show')
-            || $connection->fetchOne($select) > 0;
-
-        $select = $connection->select()->from(
-            $setup->getTable('core_config_data'),
-            'COUNT(*)'
-        )->where(
-            'path=?',
-            'customer/address/middlename_show'
-        )->where(
-            'value NOT LIKE ?',
-            '0'
-        );
-        $showMiddlename = (bool)$this->customerAddress->getConfig(
-            'middlename_show'
-        ) || $connection->fetchOne(
-            $select
-        ) > 0;
-
-        $select = $connection->select()->from(
-            $setup->getTable('core_config_data'),
-            'COUNT(*)'
-        )->where(
-            'path=?',
-            'customer/address/suffix_show'
-        )->where(
-            'value NOT LIKE ?',
-            '0'
-        );
-        $showSuffix = (bool)$this->customerAddress->getConfig('suffix_show')
-            || $connection->fetchOne($select) > 0;
-
-        $select = $connection->select()->from(
-            $setup->getTable('core_config_data'),
-            'COUNT(*)'
-        )->where(
-            'path=?',
-            'customer/address/dob_show'
-        )->where(
-            'value NOT LIKE ?',
-            '0'
-        );
-        $showDob = (bool)$this->customerAddress->getConfig('dob_show')
-            || $connection->fetchOne($select) > 0;
-
-        $select = $connection->select()->from(
-            $setup->getTable('core_config_data'),
-            'COUNT(*)'
-        )->where(
-            'path=?',
-            'customer/address/taxvat_show'
-        )->where(
-            'value NOT LIKE ?',
-            '0'
-        );
-        $showTaxVat = (bool)$this->customerAddress->getConfig('taxvat_show')
-            || $connection->fetchOne($select) > 0;
-
-        $customerEntityTypeId = $eavSetup->getEntityTypeId('customer');
-        $addressEntityTypeId = $eavSetup->getEntityTypeId('customer_address');
-
-        /**
-         *****************************************************************************
-         * checkout/onepage/register
-         *****************************************************************************
-         */
-
-        $connection->insert(
-            $setup->getTable('eav_form_type'),
-            [
-                'code' => 'checkout_onepage_register',
-                'label' => 'checkout_onepage_register',
-                'is_system' => 1,
-                'theme' => '',
-                'store_id' => 0
-            ]
-        );
-        $formTypeId = $connection->lastInsertId($setup->getTable('eav_form_type'));
-
-        $connection->insert(
-            $setup->getTable('eav_form_type_entity'),
-            ['type_id' => $formTypeId, 'entity_type_id' => $customerEntityTypeId]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_type_entity'),
-            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
-        );
-
-        $elementSort = 0;
-        if ($showPrefix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showMiddlename) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showSuffix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'email'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showDob) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'dob'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        if ($showTaxVat) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'taxvat'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-
-        /**
-         *****************************************************************************
-         * checkout/onepage/register_guest
-         *****************************************************************************
-         */
-
-        $connection->insert(
-            $setup->getTable('eav_form_type'),
-            [
-                'code' => 'checkout_onepage_register_guest',
-                'label' => 'checkout_onepage_register_guest',
-                'is_system' => 1,
-                'theme' => '',
-                'store_id' => 0
-            ]
-        );
-        $formTypeId = $connection->lastInsertId($setup->getTable('eav_form_type'));
-
-        $connection->insert(
-            $setup->getTable('eav_form_type_entity'),
-            ['type_id' => $formTypeId, 'entity_type_id' => $customerEntityTypeId]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_type_entity'),
-            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
-        );
-
-        $elementSort = 0;
-        if ($showPrefix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showMiddlename) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showSuffix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'email'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showDob) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'dob'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        if ($showTaxVat) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'taxvat'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-
-        /**
-         *****************************************************************************
-         * checkout/onepage/billing_address
-         *****************************************************************************
-         */
-
-        $connection->insert(
-            $setup->getTable('eav_form_type'),
-            [
-                'code' => 'checkout_onepage_billing_address',
-                'label' => 'checkout_onepage_billing_address',
-                'is_system' => 1,
-                'theme' => '',
-                'store_id' => 0
-            ]
-        );
-        $formTypeId = $connection->lastInsertId($setup->getTable('eav_form_type'));
-
-        $connection->insert(
-            $setup->getTable('eav_form_type_entity'),
-            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
-        );
-
-        $elementSort = 0;
-        if ($showPrefix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showMiddlename) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showSuffix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
-                'sort_order' => $elementSort++
-            ]
-        );
-
-        /**
-         *****************************************************************************
-         * checkout/onepage/shipping_address
-         *****************************************************************************
-         */
-
-        $connection->insert(
-            $setup->getTable('eav_form_type'),
-            [
-                'code' => 'checkout_onepage_shipping_address',
-                'label' => 'checkout_onepage_shipping_address',
-                'is_system' => 1,
-                'theme' => '',
-                'store_id' => 0
-            ]
-        );
-        $formTypeId = $connection->lastInsertId($setup->getTable('eav_form_type'));
-
-        $connection->insert(
-            $setup->getTable('eav_form_type_entity'),
-            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
-        );
-
-        $elementSort = 0;
-        if ($showPrefix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showMiddlename) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        if ($showSuffix) {
-            $connection->insert(
-                $setup->getTable('eav_form_element'),
-                [
-                    'type_id' => $formTypeId,
-                    'fieldset_id' => null,
-                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
-                    'sort_order' => $elementSort++
-                ]
-            );
-        }
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
-                'sort_order' => $elementSort++
-            ]
-        );
-        $connection->insert(
-            $setup->getTable('eav_form_element'),
-            [
-                'type_id' => $formTypeId,
-                'fieldset_id' => null,
-                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
-                'sort_order' => $elementSort++
-            ]
-        );
-
-        $table = $setup->getTable('core_config_data');
-
-        $select = $connection->select()->from(
-            $table,
-            ['config_id', 'value']
-        )->where(
-            'path = ?',
-            'checkout/options/onepage_checkout_disabled'
-        );
-
-        $data = $connection->fetchAll($select);
-
-        if ($data) {
-            try {
-                $connection->beginTransaction();
-
-                foreach ($data as $value) {
-                    $bind = ['path' => 'checkout/options/onepage_checkout_enabled', 'value' => !(bool)$value['value']];
-                    $where = 'config_id = ' . $value['config_id'];
-                    $connection->update($table, $bind, $where);
-                }
-
-                $connection->commit();
-            } catch (\Exception $e) {
-                $connection->rollback();
-                throw $e;
-            }
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php b/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
new file mode 100644
index 0000000000000..47a19fb3234fd
--- /dev/null
+++ b/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
@@ -0,0 +1,851 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class PrepareInitialCheckoutConfiguration
+ * @package Magento\Checkout\Setup\Patch
+ */
+class PrepareInitialCheckoutConfiguration implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * @var \Magento\Customer\Helper\Address
+     */
+    private $customerAddress;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory,
+        \Magento\Customer\Helper\Address $customerAddress
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+        $this->customerAddress = $customerAddress;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        $connection = $this->moduleDataSetup->getConnection();
+
+        $select = $connection->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'COUNT(*)'
+        )->where(
+            'path=?',
+            'customer/address/prefix_show'
+        )->where(
+            'value NOT LIKE ?',
+            '0'
+        );
+        $showPrefix = (bool)$this->customerAddress->getConfig('prefix_show')
+            || $connection->fetchOne($select) > 0;
+
+        $select = $connection->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'COUNT(*)'
+        )->where(
+            'path=?',
+            'customer/address/middlename_show'
+        )->where(
+            'value NOT LIKE ?',
+            '0'
+        );
+        $showMiddlename = (bool)$this->customerAddress->getConfig('middlename_show')
+            || $connection->fetchOne($select) > 0;
+
+        $select = $connection->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'COUNT(*)'
+        )->where(
+            'path=?',
+            'customer/address/suffix_show'
+        )->where(
+            'value NOT LIKE ?',
+            '0'
+        );
+        $showSuffix = (bool)$this->customerAddress->getConfig('suffix_show')
+            || $connection->fetchOne($select) > 0;
+
+        $select = $connection->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'COUNT(*)'
+        )->where(
+            'path=?',
+            'customer/address/dob_show'
+        )->where(
+            'value NOT LIKE ?',
+            '0'
+        );
+        $showDob = (bool)$this->customerAddress->getConfig('dob_show')
+            || $connection->fetchOne($select) > 0;
+
+        $select = $connection->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'COUNT(*)'
+        )->where(
+            'path=?',
+            'customer/address/taxvat_show'
+        )->where(
+            'value NOT LIKE ?',
+            '0'
+        );
+        $showTaxVat = (bool)$this->customerAddress->getConfig('taxvat_show')
+            || $connection->fetchOne($select) > 0;
+
+        $customerEntityTypeId = $eavSetup->getEntityTypeId('customer');
+        $addressEntityTypeId = $eavSetup->getEntityTypeId('customer_address');
+
+        /**
+         *****************************************************************************
+         * checkout/onepage/register
+         *****************************************************************************
+         */
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type'),
+            [
+                'code' => 'checkout_onepage_register',
+                'label' => 'checkout_onepage_register',
+                'is_system' => 1,
+                'theme' => '',
+                'store_id' => 0
+            ]
+        );
+        $formTypeId = $connection->lastInsertId($this->moduleDataSetup->getTable('eav_form_type'));
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type_entity'),
+            ['type_id' => $formTypeId, 'entity_type_id' => $customerEntityTypeId]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type_entity'),
+            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
+        );
+
+        $elementSort = 0;
+        if ($showPrefix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showMiddlename) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showSuffix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'email'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showDob) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'dob'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        if ($showTaxVat) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'taxvat'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+
+        /**
+         *****************************************************************************
+         * checkout/onepage/register_guest
+         *****************************************************************************
+         */
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type'),
+            [
+                'code' => 'checkout_onepage_register_guest',
+                'label' => 'checkout_onepage_register_guest',
+                'is_system' => 1,
+                'theme' => '',
+                'store_id' => 0
+            ]
+        );
+        $formTypeId = $connection->lastInsertId($this->moduleDataSetup->getTable('eav_form_type'));
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type_entity'),
+            ['type_id' => $formTypeId, 'entity_type_id' => $customerEntityTypeId]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type_entity'),
+            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
+        );
+
+        $elementSort = 0;
+        if ($showPrefix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showMiddlename) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showSuffix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'email'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showDob) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'dob'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        if ($showTaxVat) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($customerEntityTypeId, 'taxvat'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+
+        /**
+         *****************************************************************************
+         * checkout/onepage/billing_address
+         *****************************************************************************
+         */
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type'),
+            [
+                'code' => 'checkout_onepage_billing_address',
+                'label' => 'checkout_onepage_billing_address',
+                'is_system' => 1,
+                'theme' => '',
+                'store_id' => 0
+            ]
+        );
+        $formTypeId = $connection->lastInsertId($this->moduleDataSetup->getTable('eav_form_type'));
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type_entity'),
+            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
+        );
+
+        $elementSort = 0;
+        if ($showPrefix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showMiddlename) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showSuffix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
+                'sort_order' => $elementSort++
+            ]
+        );
+
+        /**
+         *****************************************************************************
+         * checkout/onepage/shipping_address
+         *****************************************************************************
+         */
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type'),
+            [
+                'code' => 'checkout_onepage_shipping_address',
+                'label' => 'checkout_onepage_shipping_address',
+                'is_system' => 1,
+                'theme' => '',
+                'store_id' => 0
+            ]
+        );
+        $formTypeId = $connection->lastInsertId($this->moduleDataSetup->getTable('eav_form_type'));
+
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_type_entity'),
+            ['type_id' => $formTypeId, 'entity_type_id' => $addressEntityTypeId]
+        );
+
+        $elementSort = 0;
+        if ($showPrefix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'prefix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'firstname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showMiddlename) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'middlename'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'lastname'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        if ($showSuffix) {
+            $connection->insert(
+                $this->moduleDataSetup->getTable('eav_form_element'),
+                [
+                    'type_id' => $formTypeId,
+                    'fieldset_id' => null,
+                    'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'suffix'),
+                    'sort_order' => $elementSort++
+                ]
+            );
+        }
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'company'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'street'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'city'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'region'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'postcode'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'country_id'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'telephone'),
+                'sort_order' => $elementSort++
+            ]
+        );
+        $connection->insert(
+            $this->moduleDataSetup->getTable('eav_form_element'),
+            [
+                'type_id' => $formTypeId,
+                'fieldset_id' => null,
+                'attribute_id' => $eavSetup->getAttributeId($addressEntityTypeId, 'fax'),
+                'sort_order' => $elementSort++
+            ]
+        );
+
+        $table = $this->moduleDataSetup->getTable('core_config_data');
+
+        $select = $connection->select()->from(
+            $table,
+            ['config_id', 'value']
+        )->where(
+            'path = ?',
+            'checkout/options/onepage_checkout_disabled'
+        );
+
+        $data = $connection->fetchAll($select);
+
+        if ($data) {
+            try {
+                $connection->beginTransaction();
+
+                foreach ($data as $value) {
+                    $bind = ['path' => 'checkout/options/onepage_checkout_enabled', 'value' => !(bool)$value['value']];
+                    $where = 'config_id = ' . $value['config_id'];
+                    $connection->update($table, $bind, $where);
+                }
+
+                $connection->commit();
+            } catch (\Exception $e) {
+                $connection->rollBack();
+                throw $e;
+            }
+        }
+
+        $connection->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..a29564b2457a9
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Checkout select Check/Money billing method -->
+    <actionGroup name="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{AdminCheckoutPaymentSection.checkBillingMethodByName('Check / Money order')}}" dependentSelector="{{AdminCheckoutPaymentSection.checkBillingMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoBillingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterBillingMethodSelection"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
new file mode 100644
index 0000000000000..54a4c6fd1b6d8
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Checkout select Flat Rate shipping method -->
+    <actionGroup name="CheckoutSelectFlatRateShippingMethodActionGroup">
+        <conditionalClick selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" dependentSelector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" visible="true" stepKey="selectFlatRateShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
+    </actionGroup>
+
+    <!-- Go to checkout from minicart -->
+    <actionGroup name="GoToCheckoutFromMinicartActionGroup">
+        <waitForElementNotVisible selector="{{StorefrontMinicartSection.emptyCart}}" stepKey="waitUpdateQuantity" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+    </actionGroup>
+
+    <!-- Go to checkout from cart -->
+    <actionGroup name="GoToCheckoutFromCartActionGroup">
+        <waitForElementNotVisible selector="{{StorefrontMinicartSection.emptyCart}}" stepKey="waitUpdateQuantity" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertCheckoutCartUrl"/>
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
+    </actionGroup>
+
+    <!-- Guest checkout filling shipping section -->
+    <actionGroup name="GuestCheckoutFillingShippingSectionActionGroup">
+        <arguments>
+            <argument name="customerVar" defaultValue="CustomerEntityOne"/>
+            <argument name="customerAddressVar" defaultValue="CustomerAddressSimple"/>
+            <!--First available shipping method will be selected if value is not passed for shippingMethod-->
+            <argument name="shippingMethod" defaultValue="" type="string"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <actionGroup name="GuestCheckoutFillShippingNoWaitForPaymentActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
+        <remove keyForRemoval="waitForPaymentSectionLoaded"/>
+        <remove keyForRemoval="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <!-- Guest checkout filling shipping section without region -->
+    <actionGroup name="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddressVar.country_id}}" stepKey="enterCountry"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <!-- Guest checkout filling shipping section with unavailable payments-->
+    <actionGroup name="GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.noQuotes}}" stepKey="waitMessage"/>
+        <see userInput="No Payment method available." stepKey="checkMessage"/>
+    </actionGroup>
+
+    <actionGroup name="GuestCheckoutWithSpecificCountryOptionForPaymentMethodActionGroup" extends="GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup">
+        <arguments>
+            <argument name="paymentMethod" type="string"/>
+        </arguments>
+        <remove keyForRemoval="checkMessage"/>
+        <dontsee selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" parametrized="true" stepKey="paymentMethodDoesNotAvailable"/>
+    </actionGroup>
+    <!-- Logged in user checkout filling shipping section -->
+    <actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <!-- Logged in user checkout filling shipping section -->
+    <actionGroup name="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddressVar.country_id}}" stepKey="enterCountry"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="clickSaveAddress"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <!-- Place order with logged the user -->
+    <actionGroup name="PlaceOrderWithLoggedUserActionGroup">
+        <arguments>
+            <!--First available shipping method will be selected if value is not passed for shippingMethod-->
+            <argument name="shippingMethod" defaultValue="" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitProceedToCheckout"/>
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
+    </actionGroup>
+
+    <!-- Check product in checkout cart items -->
+    <actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="{{productVar.name}}" stepKey="seeProductInCart"/>
+    </actionGroup>
+
+    <!-- Check order summary in checkout -->
+    <actionGroup name="CheckOrderSummaryInCheckoutActionGroup">
+        <arguments>
+            <argument name="subtotal"/>
+            <argument name="shippingTotal"/>
+            <argument name="shippingMethod"/>
+            <argument name="total"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="${{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="${{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
+        <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
+        <see userInput="${{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
+   </actionGroup>
+
+    <actionGroup name="CheckTotalsSortOrderInSummarySection">
+        <arguments>
+            <argument name="elementName" type="string"/>
+            <argument name="positionNumber" type="string"/>
+        </arguments>
+        <see userInput="{{elementName}}" selector="{{CheckoutCartSummarySection.elementPosition(positionNumber)}}" stepKey="assertElementPosition"/>
+    </actionGroup>
+
+    <!-- Check ship to information in checkout -->
+    <actionGroup name="CheckShipToInformationInCheckoutActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="{{customerVar.firstname}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationFirstName"/>
+        <see userInput="{{customerVar.lastname}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationLastName"/>
+        <see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationStreet"/>
+        <see userInput="{{customerAddressVar.city}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationCity"/>
+        <see userInput="{{customerAddressVar.state}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationState"/>
+        <see userInput="{{customerAddressVar.postcode}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationPostcode"/>
+        <see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="assertShipToInformationTelephone"/>
+    </actionGroup>
+
+    <!-- Check shipping method in checkout -->
+    <actionGroup name="CheckShippingMethodInCheckoutActionGroup">
+        <arguments>
+            <argument name="shippingMethod"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.shippingMethodInformation}}" stepKey="assertshippingMethodInformation"/>
+    </actionGroup>
+
+    <!-- Checkout select Check/Money Order payment -->
+    <actionGroup name="CheckoutSelectCheckMoneyOrderPaymentActionGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
+    </actionGroup>
+
+    <!-- Check billing address in checkout -->
+    <actionGroup name="CheckBillingAddressInCheckoutActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="{{customerVar.firstName}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressFirstName"/>
+        <see userInput="{{customerVar.lastName}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressLastName"/>
+        <see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressStreet"/>
+        <see userInput="{{customerAddressVar.city}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressCity"/>
+        <see userInput="{{customerAddressVar.state}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressState"/>
+        <see userInput="{{customerAddressVar.postcode}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressPostcode"/>
+        <see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressTelephone"/>
+    </actionGroup>
+
+    <!-- Checkout place order -->
+    <actionGroup name="CheckoutPlaceOrderActionGroup">
+        <arguments>
+            <argument name="orderNumberMessage"/>
+            <argument name="emailYouMessage"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
+    </actionGroup>
+
+    <!--Verify country options in checkout top destination section-->
+    <actionGroup name="VerifyTopDestinationsCountry">
+        <arguments>
+            <argument name="country" type="string"/>
+            <argument name="placeNumber"/>
+        </arguments>
+        <conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="openShippingDetails"/>
+        <see selector="{{CheckoutCartSummarySection.countryParameterized('placeNumber')}}" userInput="{{country}}" stepKey="seeCountry"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontSignOutActionGroup">
+        <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
+        <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You are signed out" stepKey="signOut"/>
+    </actionGroup>
+
+    <!--Click Place Order button-->
+    <actionGroup name="ClickPlaceOrderActionGroup">
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
new file mode 100644
index 0000000000000..83f6b635bfee7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="FillShippingZipForm">
+        <arguments>
+            <argument name="address"/>
+        </arguments>
+        <conditionalClick stepKey="openShippingDetails" selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false"/>
+        <selectOption stepKey="selectCountry" selector="{{CheckoutCartSummarySection.country}}" userInput="{{address.country}}"/>
+        <selectOption stepKey="selectStateProvince" selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}"/>
+        <fillField stepKey="fillPostCode" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}"/>
+        <waitForPageLoad stepKey="waitForFormUpdate"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
new file mode 100644
index 0000000000000..34f2cfe7f7fff
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Guest checkout filling billing section -->
+    <actionGroup name="GuestCheckoutFillNewBillingAddressActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
+        <fillField selector="{{CheckoutPaymentSection.guestFirstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutPaymentSection.guestLastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutPaymentSection.guestStreet}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutPaymentSection.guestCity}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutPaymentSection.guestRegion}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutPaymentSection.guestPostcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutPaymentSection.guestTelephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+    </actionGroup>
+
+    <actionGroup name="LoggedInCheckoutFillNewBillingAddressActionGroup">
+        <arguments>
+            <argument name="Address"/>
+            <!-- the classPrefix argument is to specifically select the inputs of the correct form
+                 this is to prevent having 3 action groups doing essentially the same thing -->
+            <argument name="classPrefix" type="string" defaultValue=""/>
+        </arguments>
+        <fillField stepKey="fillFirstName" selector="{{classPrefix}} {{CheckoutShippingSection.firstName}}" userInput="{{Address.firstname}}"/>
+        <fillField stepKey="fillLastName" selector="{{classPrefix}} {{CheckoutShippingSection.lastName}}" userInput="{{Address.lastname}}"/>
+        <fillField stepKey="fillCompany" selector="{{classPrefix}} {{CheckoutShippingSection.company}}" userInput="{{Address.company}}"/>
+        <fillField stepKey="fillPhoneNumber" selector="{{classPrefix}} {{CheckoutShippingSection.telephone}}" userInput="{{Address.telephone}}"/>
+        <fillField stepKey="fillStreetAddress1" selector="{{classPrefix}} {{CheckoutShippingSection.street}}" userInput="{{Address.street[0]}}"/>
+        <fillField stepKey="fillStreetAddress2" selector="{{classPrefix}} {{CheckoutShippingSection.street2}}" userInput="{{Address.street[1]}}"/>
+        <fillField stepKey="fillCityName" selector="{{classPrefix}} {{CheckoutShippingSection.city}}" userInput="{{Address.city}}"/>
+        <selectOption stepKey="selectState" selector="{{classPrefix}} {{CheckoutShippingSection.region}}" userInput="{{Address.state}}"/>
+        <fillField stepKey="fillZip" selector="{{classPrefix}} {{CheckoutShippingSection.postcode}}" userInput="{{Address.postcode}}"/>
+        <selectOption stepKey="selectCounty" selector="{{classPrefix}} {{CheckoutShippingSection.country}}" userInput="{{Address.country_id}}"/>
+        <waitForPageLoad stepKey="waitForFormUpdate2"/>
+    </actionGroup>
+    <!--Filling address without second address field and without state field-->
+    <actionGroup name="LoggedInCheckoutWithOneAddressFieldWithoutStateField" extends="LoggedInCheckoutFillNewBillingAddressActionGroup">
+        <remove keyForRemoval="fillStreetAddress2"/>
+        <remove keyForRemoval="selectState"/>
+    </actionGroup>
+
+    <actionGroup name="clearCheckoutAddressPopupFieldsActionGroup">
+        <arguments>
+            <argument name="classPrefix" type="string" defaultValue=""/>
+        </arguments>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.firstName}}" stepKey="clearFieldFirstName"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.lastName}}" stepKey="clearFieldLastName"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.company}}" stepKey="clearFieldCompany"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.street}}" stepKey="clearFieldStreetAddress1"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.street2}}" stepKey="clearFieldStreetAddress2"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.city}}" stepKey="clearFieldCityName"/>
+        <selectOption selector="{{classPrefix}} {{CheckoutShippingSection.region}}" userInput="" stepKey="clearFieldRegion"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.postcode}}"  stepKey="clearFieldZip"/>
+        <selectOption selector="{{classPrefix}} {{CheckoutShippingSection.country}}" userInput="" stepKey="clearFieldCounty"/>
+        <clearField selector="{{classPrefix}} {{CheckoutShippingSection.telephone}}" stepKey="clearFieldPhoneNumber"/>
+    </actionGroup>
+    <actionGroup name="GuestCheckoutSelectPaymentAndFillNewBillingAddressActionGroup" extends="GuestCheckoutFillNewBillingAddressActionGroup">
+        <arguments>
+            <argument name="paymentMethod" type="string"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="waitForLoading3" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" parametrized="true" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
new file mode 100644
index 0000000000000..6e5f127eefc18
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <!--Assert That Shipping And Billing Address are the same-->
+    <actionGroup name="AssertThatShippingAndBillingAddressTheSame">
+        <!--Get shipping and billing addresses-->
+        <grabTextFrom selector="{{ShipmentFormSection.shippingAddress}}" stepKey="shippingAddr"/>
+        <grabTextFrom selector="{{ShipmentFormSection.billingAddress}}" stepKey="billingAddr"/>
+        <!--Make sure that shipping and billing addresses are different-->
+        <see userInput="Shipping Address" stepKey="seeShippingAddress"/>
+        <see userInput="Billing Address" stepKey="seeBillingAddress"/>
+        <assertEquals stepKey="assert" actual="$billingAddr" expected="$shippingAddr"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
new file mode 100644
index 0000000000000..7a5c5e1d15872
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="clickViewAndEditCartFromMiniCart">
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
+        <seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
+    </actionGroup>
+    <actionGroup name="assertOneProductNameInMiniCart">
+        <arguments>
+            <argument name="productName"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}" stepKey="seeInMiniCart"/>
+    </actionGroup>
+
+    <!--Remove an item from the cart using minicart-->
+    <actionGroup name="removeProductFromMiniCart">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForMiniCartOpen"/>
+        <click selector="{{StorefrontMinicartSection.deleteMiniCartItemByName(productName)}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{StoreFrontRemoveItemModalSection.message}}" stepKey="waitForConfirmationModal"/>
+        <see selector="{{StoreFrontRemoveItemModalSection.message}}" userInput="Are you sure you would like to remove this item from the shopping cart?" stepKey="seeDeleteConfirmationMessage"/>
+        <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
new file mode 100644
index 0000000000000..72c5648991ef5
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add Product to Cart from the category page and check message and product count in Minicart -->
+    <actionGroup name="StorefrontAddCategoryProductToCartActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="productCount"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
+        <seeLink stepKey="assertLinkToShoppingCart" url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart/" userInput="shopping cart" />
+        <waitForText userInput="{{productCount}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Add Product to Cart from the category page with specified quantity and check message and product count in Minicart -->
+    <actionGroup name="StorefrontAddCategoryProductToCartWithQuantityActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="quantity" defaultValue="1" type="string"/>
+            <argument name="checkQuantity" defaultValue="1" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
+        <seeLink stepKey="assertLinkToShoppingCart" url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart/" userInput="shopping cart" />
+        <waitForText userInput="{{checkQuantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <fillField selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" userInput="{{quantity}}" stepKey="setProductQtyToFiftyInMiniCart"/>
+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdate(product.name)}}" stepKey="updateQtyInMiniCart"/>
+    </actionGroup>
+
+    <!-- Add Product to Cart from the product page and check message and product count in Minicart -->
+    <actionGroup name="StorefrontAddProductToCartActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="productCount" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
+        <seeLink stepKey="assertLinkToShoppingCart" url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart/" userInput="shopping cart" />
+        <waitForText userInput="{{productCount}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Open the Minicart and check Simple Product -->
+    <actionGroup name="StorefrontOpenMinicartAndCheckSimpleProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontMinicartSection.productLinkByName(product.name)}}" stepKey="waitForMinicartProduct" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart" />
+        <see userInput="${{product.price}}.00" selector="{{StorefrontMinicartSection.productPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+    </actionGroup>
+
+    <!-- Check Simple Product in the Cart -->
+    <actionGroup name="StorefrontCheckCartSimpleProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="productQuantity"/>
+        </arguments>
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{product.price}}.00" selector="{{CheckoutCartProductSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+        <seeInField userInput="{{productQuantity}}" selector="{{CheckoutCartProductSection.ProductQuantityByName(product.name)}}" stepKey="assertProductQuantity"/>
+    </actionGroup>
+
+    <!-- Check the Cart -->
+    <actionGroup name="StorefrontCheckCartActionGroup">
+        <arguments>
+            <argument name="subtotal"/>
+            <argument name="shipping"/>
+            <argument name="shippingMethod"/>
+            <argument name="total"/>
+        </arguments>
+        <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodForm}}" visible="false" stepKey="openEstimateShippingSection"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="waitForShippingSection"/>
+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
+        <see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
+        <waitForText userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
+        <see userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
+    </actionGroup>
+
+    <!-- Open the Cart from Minicart-->
+    <actionGroup name="StorefrontOpenCartFromMinicartActionGroup">
+        <waitForElement selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForShowMinicart" />
+        <waitForElement selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForCartLink" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart" />
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="clickCart" />
+    </actionGroup>
+
+    <actionGroup name="changeSummaryQuoteAddress">
+        <arguments>
+            <argument name="taxCode"/>
+        </arguments>
+        <conditionalClick stepKey="openShippingDetails" selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false"/>
+        <selectOption stepKey="selectCountry" selector="{{CheckoutCartSummarySection.country}}" userInput="{{taxCode.country}}"/>
+        <selectOption stepKey="selectStateProvince" selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{taxCode.state}}"/>
+        <fillField stepKey="fillZip" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{taxCode.zip}}"/>
+        <waitForPageLoad stepKey="waitForFormUpdate"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
new file mode 100644
index 0000000000000..354ad6d2b44ba
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Fill shipment form for free shipping-->
+    <actionGroup name="ShipmentFormFreeShippingActionGroup">
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="setCustomerEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="SetCustomerFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="SetCustomerLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street}}" stepKey="SetCustomerStreetAddress"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="SetCustomerCity"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="SetCustomerZipCode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="SetCustomerPhoneNumber"/>
+        <click selector="{{CheckoutShippingSection.region}}" stepKey="clickToSetState"/>
+        <click selector="{{CheckoutShippingSection.state}}" stepKey="clickToChooseState"/>
+        <see userInput="$0.00	Free	Free Shipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free Shipping')}}" stepKey="seeShippingMethod" after="clickToChooseState"/>
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Free Shipping')}}" stepKey="selectFlatShippingMethod" after="seeShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask" after="selectFlatShippingMethod"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickToSaveShippingInfo"/>
+        <waitForPageLoad time="5" stepKey="waitForReviewAndPaymentsPageIsLoaded"/>
+        <seeInCurrentUrl url="payment" stepKey="reviewAndPaymentIsShown"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
new file mode 100644
index 0000000000000..f946d04fc9f95
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="successGuestCheckoutOrderNumberMessage">Your order # is:</data>
+        <data key="successCheckoutOrderNumberMessage">Your order number is:</data>
+        <data key="successCheckoutEmailYouMessage">We'll email you an order confirmation with details and tracking info.</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
new file mode 100644
index 0000000000000..dc82932ec5ca7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Countries" type="countryArray">
+        <array key="country">
+            <item>Bahamas</item>
+        </array>
+    </entity>
+    <entity name="DefaultCountriesWithRequiredRegions" type="countryArray">
+        <array key="country">
+            <item>Australia</item>
+            <item>Brazil</item>
+            <item>Canada</item>
+            <item>Croatia</item>
+            <item>Estonia</item>
+            <item>India</item>
+            <item>Latvia</item>
+            <item>Lithuania</item>
+            <item>Romania</item>
+            <item>Spain</item>
+            <item>Switzerland</item>
+            <item>United States</item>
+            <item>Australia</item>
+        </array>
+    </entity>
+    <entity name="CustomCountryWithRequiredRegion" type="countryArray">
+        <array key="country">
+            <item>United Kingdom</item>
+        </array>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
new file mode 100644
index 0000000000000..530157851191f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="E2EB2CQuote" type="Quote">
+        <data key="subtotal">480.00</data>
+        <data key="shipping">15.00</data>
+        <data key="total">495.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE.txt b/app/code/Magento/Checkout/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE.txt
rename to app/code/Magento/Checkout/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE_AFL.txt b/app/code/Magento/Checkout/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE_AFL.txt
rename to app/code/Magento/Checkout/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
new file mode 100644
index 0000000000000..b0acc64c77727
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CheckoutCartPage" url="/checkout/cart" module="Magento_Checkout" area="storefront">
+        <section name="CheckoutCartProductSection"/>
+        <section name="CheckoutCartSummarySection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
new file mode 100644
index 0000000000000..d3fa045e4654f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
+        <section name="CheckoutShippingSection"/>
+        <section name="CheckoutShippingMethodsSection"/>
+        <section name="CheckoutOrderSummarySection"/>
+        <section name="CheckoutSuccessMainSection"/>
+        <section name="CheckoutPaymentSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
new file mode 100644
index 0000000000000..c8641f7d8fbf3
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CheckoutShippingPage" url="/checkout/#shipping" module="Checkout" area="storefront">
+        <section name="CheckoutShippingGuestInfoSection"/>
+        <section name="CheckoutShippingSection"/>
+        <section name="StorefrontCheckoutAddressPopupSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
new file mode 100644
index 0000000000000..ebca0651b457d
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CheckoutSuccessPage" url="/checkout/onepage/success/" area="storefront" module="Magento_Checkout">
+        <section name="CheckoutSuccessMainSection"/>
+        <section name="CheckoutSuccessRegisterSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
new file mode 100644
index 0000000000000..90f8a914b4f42
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="GuestCheckoutReviewAndPaymentsPage" url="/checkout/#payment" area="storefront" module="Magento_Checkout">
+        <section name="CheckoutPaymentSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/README.md b/app/code/Magento/Checkout/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ec43eb9c6c3ef
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Checkout Functional Tests
+
+The Functional Test Module for **Magento Checkout** module.
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml
new file mode 100644
index 0000000000000..2b5dd512bc4e4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCheckoutPaymentSection">
+        <element name="checkBillingMethodByName" type="radio" selector="//div[@id='order-billing_method']//dl[@class='admin__payment-methods']//dt//label[contains(., '{{methodName}}')]/..//input" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml
new file mode 100644
index 0000000000000..3e1f902f6c3be
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminDataGridHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDataGridHeaderSection">
+        <element name="attributeCodeFilterInput" type="input" selector=".admin__data-grid-filters input[name='attribute_code']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
new file mode 100644
index 0000000000000..ab82d9fdd93b5
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartProductSection">
+        <element name="ProductLinkByName" type="button"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]"
+                 parameterized="true"/>
+        <element name="ProductPriceByName" type="text"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'price')]//span[@class='price']"
+                 parameterized="true"/>
+        <element name="ProductImageByName" type="text"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr//img[contains(@class, 'product-image-photo') and @alt='{{var1}}']"
+                 parameterized="true"/>
+        <element name="ProductQuantityByName" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'qty')]//input[contains(@class, 'qty')]"
+                 parameterized="true"/>
+        <element name="ProductOptionByNameAndAttribute" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[.//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]]//dl[@class='item-options']//dt[.='{{var2}}']/following-sibling::dd[1]"
+                 parameterized="true"/>
+        <element name="RemoveItem" type="button"
+                 selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
+        <element name="nthItemOption" type="block" selector=".item:nth-of-type({{numElement}}) .item-options" parameterized="true"/>
+        <element name="nthEditButton" type="block" selector=".item:nth-of-type({{numElement}}) .action-edit" parameterized="true"/>
+        <element name="nthBundleOptionName" type="text" selector=".product-item-details .item-options:nth-of-type({{numOption}}) dt" parameterized="true"/>
+        <element name="productSubtotalByName" type="input" selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'subtotal')]//span[@class='price']" parameterized="true"/>
+        <element name="updateShoppingCartButton" type="button" selector="#form-validate button[type='submit'].update" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..d84df3401bab0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="elementPosition" type="text" selector=".data.table.totals > tbody tr:nth-of-type({{value}}) > th" parameterized="true"/>
+        <element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>
+        <element name="shippingMethodForm" type="text" selector="#co-shipping-method-form"/>
+        <element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>
+        <element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
+        <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
+        <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
+        <element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
+        <element name="shippingHeading" type="button" selector="#block-shipping-heading"/>
+        <element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
+        <element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
+        <element name="country" type="select" selector="select[name='country_id']" timeout="10"/>
+        <element name="countryParameterized" type="select" selector="select[name='country_id'] > option:nth-child({{var}})" timeout="10" parameterized="true"/>
+        <element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
+        <element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
new file mode 100644
index 0000000000000..babbe51746df8
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutHeaderSection">
+        <element name="shippingMethodStep" type="text" selector=".opc-progress-bar-item:nth-of-type(1)"/>
+        <element name="reviewAndPaymentsStep" type="text" selector=".opc-progress-bar-item:nth-of-type(2)"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
new file mode 100644
index 0000000000000..6e00329901757
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutOrderSummarySection">
+        <element name="miniCartTab" type="button" selector=".title[role='tab']"/>
+        <element name="productItemName" type="text" selector=".product-item-name"/>
+        <element name="productItemQty" type="text" selector=".value"/>
+        <element name="productItemPrice" type="text" selector=".price"/>
+        <element name="orderNumber" type="text" selector="//div[@class='checkout-success']//a"/>
+        <element name="shippingAddress" type="textarea" selector="//*[@class='box box-address-shipping']//address"/>
+        <element name="billingAddress" type="textarea" selector="//*[@class='box box-address-billing']//address"/>
+        <element name="additionalAddress" type="text" selector=".block.block-addresses-list"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
new file mode 100644
index 0000000000000..0206c18b819c2
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutPaymentSection">
+        <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
+        <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
+        <element name="notAvailablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div.payment-method._active>div.payment-method-title.field.choice"/>
+        <element name="billingNewAddressForm" type="text" selector="[data-form='billing-new-address']"/>
+        <element name="billingAddressNotSameCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-checkmo"/>
+        <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
+        <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
+        <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>
+        <element name="guestLastName" type="input" selector=".billing-address-form input[name*='lastname']"/>
+        <element name="guestStreet" type="input" selector=".billing-address-form input[name*='street[0]']"/>
+        <element name="guestCity" type="input" selector=".billing-address-form input[name*='city']"/>
+        <element name="guestRegion" type="select" selector=".billing-address-form select[name*='region_id']"/>
+        <element name="guestPostcode" type="input" selector=".billing-address-form input[name*='postcode']"/>
+        <element name="guestTelephone" type="input" selector=".billing-address-form input[name*='telephone']"/>
+        <element name="billingAddress" type="text" selector=".payment-method._active div.billing-address-details"/>
+        <element name="cartItems" type="text" selector="ol.minicart-items"/>
+        <element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
+        <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active" timeout="30"/>
+        <element name="checkMoneyOrderPayment" type="radio" selector="input#checkmo.radio" timeout="30"/>
+        <element name="placeOrder" type="button" selector=".payment-method._active button.action.primary.checkout" timeout="30"/>
+        <element name="paymentSectionTitle" type="text" selector="//*[@id='checkout-payment-method-load']//div[text()='Payment Method']" />
+        <element name="orderSummarySubtotal" type="text" selector="//tr[@class='totals sub']//span[@class='price']" />
+        <element name="orderSummaryShippingTotal" type="text" selector="//tr[@class='totals shipping excl']//span[@class='price']" />
+        <element name="orderSummaryShippingMethod" type="text" selector="//tr[@class='totals shipping excl']//span[@class='value']" />
+        <element name="orderSummaryTotal" type="text" selector="//tr[@class='grand totals']//span[@class='price']" />
+        <element name="ProductItemByName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']" parameterized="true" />
+        <element name="ProductOptionsByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true" />
+        <element name="ProductOptionsActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true" />
+        <element name="ProductOptionLinkActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']//a[text() = '{{var2}}']" parameterized="true" />
+        <element name="shipToInformation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
+        <element name="shippingMethodInformation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
+        <element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
+        <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
+        <element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>
+        <element name="productItemPriceByName" type="text" selector="//div[@class='product-item-details'][contains(., '{{ProductName}}')]//span[@class='price']" parameterized="true"/>
+
+        <element name="tax" type="text" selector="[data-th='Tax'] span" timeout="30"/>
+        <element name="taxPercentage" type="text" selector=".totals-tax-details .mark"/>
+        <element name="orderSummaryTotalIncluding" type="text" selector="//tr[@class='grand totals incl']//span[@class='price']" />
+        <element name="orderSummaryTotalExcluding" type="text" selector="//tr[@class='grand totals excl']//span[@class='price']" />
+        <element name="shippingAndBillingAddressSame" type="input" selector="#billing-address-same-as-shipping-braintree_cc_vault"/>
+        <element name="addressAction" type="button" selector="//span[text()='{{action}}']" parameterized="true"/>
+        <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
+        <element name="noQuotes" type="text" selector=".no-quotes-block"/>
+        <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
new file mode 100644
index 0000000000000..ad2a43eb90c8c
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutShippingGuestInfoSection">
+        <element name="email" type="input" selector="#customer-email"/>
+        <element name="firstName" type="input" selector="input[name=firstname]"/>
+        <element name="lastName" type="input" selector="input[name=lastname]"/>
+        <element name="street" type="input" selector="input[name='street[0]']"/>
+        <element name="city" type="input" selector="input[name=city]"/>
+        <element name="region" type="select" selector="select[name=region_id]"/>
+        <element name="postcode" type="input" selector="input[name=postcode]"/>
+        <element name="telephone" type="input" selector="input[name=telephone]"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
+        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
new file mode 100644
index 0000000000000..ab4b59fd67d03
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutShippingMethodsSection">
+        <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
+        <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
+        <element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
+        <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
+        <element name="shippingMethodFlatRate" type="radio" selector="#checkout-shipping-method-load input[value='flatrate_flatrate']"/>
+        <element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
+        <element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
+        <element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
new file mode 100644
index 0000000000000..a182a3357a9ce
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutShippingSection">
+        <element name="isShippingStep" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Shipping')]]"/>
+        <element name="shippingTab" type="text" selector="//li[contains(@class,'opc-progress-bar-item')]//*[text()='Shipping']" timeout="30"/>
+        <element name="selectedShippingAddress" type="text" selector=".shipping-address-item.selected-item"/>
+        <element name="editAddressButton" type="button" selector=".action-edit-address" timeout="30"/>
+        <element name="addressDropdown" type="select" selector="[name=billing_address_id]"/>
+        <element name="newAddressButton" type="button" selector=".action-show-popup" timeout="30"/>
+        <element name="email" type="input" selector="#customer-email"/>
+        <element name="firstName" type="input" selector="input[name=firstname]"/>
+        <element name="lastName" type="input" selector="input[name=lastname]"/>
+        <element name="company" type="input" selector="input[name=company]"/>
+        <element name="street" type="input" selector="input[name='street[0]']"/>
+        <element name="street2" type="input" selector="input[name='street[1]']"/>
+        <element name="city" type="input" selector="input[name=city]"/>
+        <element name="region" type="select" selector="select[name=region_id]"/>
+        <element name="postcode" type="input" selector="input[name=postcode]"/>
+        <element name="country" type="select" selector="select[name=country_id]"/>
+        <element name="telephone" type="input" selector="input[name=telephone]"/>
+        <element name="saveAddress" type="button" selector=".action-save-address"/>
+        <element name="updateAddress" type="button" selector=".action-update"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
+        <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
+        <element name="defaultShipping" type="button" selector=".billing-address-details"/>
+        <element name="state" type="button" selector="//*[text()='Alabama']"/>
+        <element name="stateInput" type="input" selector="input[name=region]"/>
+        <element name="regionOptions" type="select" selector="select[name=region_id] option"/>
+        <element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
new file mode 100644
index 0000000000000..34819f641cbc9
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutSuccessMainSection">
+        <element name="successTitle" type="text" selector=".page-title"/>
+        <element name="success" type="text" selector="div.checkout-success"/>
+        <element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
+        <element name="orderNumber22" type="text" selector=".order-number>strong"/>
+        <element name="orderLink" type="text" selector="a[href*=order_id].order-number" timeout="30"/>
+        <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
+        <element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
+        <element name="printLink" type="button" selector=".print" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
new file mode 100644
index 0000000000000..d0ef8d347efb5
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutSuccessRegisterSection">
+        <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
+        <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
+        <element name="createAccountButton" type="button" selector="#registration form input[type='submit']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
new file mode 100644
index 0000000000000..89b3a25b45e3c
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+    <section name="ShipmentFormSection">
+        <element name="shippingAddress" type="textarea" selector="//*[@class='box box-billing-address']//address"/>
+        <element name="billingAddress" type="textarea" selector="//*[@class='box box-shipping-address']//address"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
new file mode 100644
index 0000000000000..e8001af6f0344
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StoreFrontRemoveItemModalSection">
+        <element name="message" type="text" selector="aside.confirm div.modal-content"/>
+        <element name="ok" type="button" selector="aside.confirm .modal-footer .action-primary"/>
+        <element name="cancel" type="button" selector="aside.confirm .modal-footer .action-secondary"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 0000000000000..0427938a02df1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="ProductAddToCartByNumber" type="button" selector="//main//li[{{var1}}]//button[contains(@class, 'tocart')]" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutAddressPopupSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutAddressPopupSection.xml
new file mode 100644
index 0000000000000..6a27915768dd7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutAddressPopupSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCheckoutAddressPopupSection">
+        <element name="newAddressModalPopup" type="block" selector=".modal-popup.modal-slide._inner-scroll"/>
+        <element name="closeAddressModalPopup" type="button" selector=".action-hide-popup"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
new file mode 100644
index 0000000000000..55c4385706ba9
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCheckoutPaymentMethodSection">
+        <element name="billingAddress" type="text" selector=".checkout-billing-address"/>
+        <element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
+        <element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
new file mode 100644
index 0000000000000..8bd6a59f5633b
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontMessagesSection">
+        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
+        <element name="messageProductAddedToCart" type="text"
+                 selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), 'You added {{var1}} to your') and a[contains(., 'shopping cart')]]"
+                 parameterized="true"
+        />
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
new file mode 100644
index 0000000000000..3f717943fe8f0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontMinicartSection">
+        <element name="productCount" type="text" selector="//header//div[contains(@class, 'minicart-wrapper')]//a[contains(@class, 'showcart')]//span[@class='counter-number']"/>
+        <element name="productLinkByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details']//a[contains(text(), '{{var1}}')]"  parameterized="true"/>
+        <element name="productPriceByName" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[@class='price']"  parameterized="true"/>
+        <element name="productImageByName" type="text" selector="//header//ol[@id='mini-cart']//span[@class='product-image-container']//img[@alt='{{var1}}']"  parameterized="true"/>
+        <element name="productOptionsDetailsByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[.='See Details']"  parameterized="true"/>
+        <element name="productOptionByNameAndAttribute" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//dt[@class='label' and .='{{var2}}']/following-sibling::dd[@class='values']//span"  parameterized="true"/>
+        <element name="showCart" type="button" selector="a.showcart"/>
+        <element name="quantity" type="button" selector="span.counter-number"/>
+        <element name="miniCartOpened" type="button" selector="a.showcart.active"/>
+        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
+        <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
+        <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
+        <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
+        <element name="deleteMiniCartItemByName" type="button" selector="//ol[@id='mini-cart']//div[contains(., '{{var}}')]//a[contains(@class, 'delete')]" parameterized="true"/>
+        <element name="miniCartSubtotalField" type="text" selector=".block-minicart .amount span.price"/>
+        <element name="itemQuantity" type="input" selector="//a[text()='{{productName}}']/../..//input[contains(@class,'cart-item-qty')]" parameterized="true"/>
+        <element name="itemQuantityUpdate" type="button" selector="//a[text()='{{productName}}']/../..//span[text()='Update']" parameterized="true"/>
+        <element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
+        <element name="subtotal" type="text" selector="//tr[@class='totals sub']//td[@class='amount']/span"/>
+        <element name="emptyCart" type="text" selector=".counter.qty.empty"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
new file mode 100644
index 0000000000000..200a742e58f14
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductCompareMainSection">
+        <element name="ProductAddToCartByName" type="button" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..95929401620b8
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="AddToCart" type="button" selector="#product-addtocart-button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
new file mode 100644
index 0000000000000..52a69307550c5
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Guest checkout"/>
+            <title value="Address State Field For UK Customers Remain Option even After Browser Refresh"/>
+            <description value="Address State Field For UK Customers Remain Option even After Browser Refresh"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93329"/>
+            <group value="checkout"/>
+            <skip>
+                <issueId value="MAGETWO-93726"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+        <selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}"/>
+        <waitForPageLoad stepKey="waitFormToReload"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{UK_Address.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{UK_Address.city}}" stepKey="enterCity"/>
+        <fillField selector="{{CheckoutShippingSection.stateInput}}" userInput="{{UK_Address.province}}" stepKey="enterProvince"/>
+        <waitForPageLoad stepKey="waitFormToReload2"/>
+        <see userInput="State/Province" stepKey="StateFieldStillExists"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{UK_Address.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
new file mode 100644
index 0000000000000..71a0c7f7fbdb3
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AddressStateFieldShouldNotAcceptJustIntegerValuesTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="MAGETWO-91465"/>
+            <title value="Guest Checkout"/>
+            <description value="Address State field should not allow just integer values"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93203"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+        <selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}"/>
+        <waitForPageLoad stepKey="waitFormToReload"/>
+        <fillField selector="{{CheckoutShippingSection.stateInput}}" userInput="1" stepKey="enterStateAsIntegerValue"/>
+        <waitForPageLoad stepKey="waitforFormValidation"/>
+        <see userInput="First character must be letter." stepKey="seeTheErrorMessageDisplayed"/>
+        <fillField selector="{{CheckoutShippingSection.stateInput}}" userInput=" 1" stepKey="enterStateAsIntegerValue1"/>
+        <waitForPageLoad stepKey="waitforFormValidation1"/>
+        <see userInput="First character must be letter." stepKey="seeTheErrorMessageDisplayed1"/>
+        <fillField selector="{{CheckoutShippingSection.stateInput}}" userInput="ABC1" stepKey="enterStateAsIntegerValue2"/>
+        <waitForPageLoad stepKey="waitforFormValidation2"/>
+        <dontSee userInput="First character must be letter." stepKey="seeTheErrorMessageIsNotDisplayed"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
new file mode 100644
index 0000000000000..e19627e7435d6
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckCheckoutSuccessPageAsRegisterCustomer">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Success page elements are presented for placed order as Customer"/>
+            <title value="Customer Checkout"/>
+            <description value="To be sure that other elements of Success page are shown for placed order as registered Customer."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-60345"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer">
+                <field key="group_id">1</field>
+            </createData>
+        </before>
+
+        <after>
+            <!--Logout from customer account-->
+            <amOnPage url="customer/account/logout/" stepKey="logoutCustomerOne"/>
+            <waitForPageLoad stepKey="waitLogoutCustomerOne"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!--Log in to Storefront as Customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUpNewUser">
+            <argument name="Customer" value="$$createSimpleUsCustomer$$"/>
+        </actionGroup>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessNotify"/>
+
+        <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerOrderPage.url}}" stepKey="seeMyOrderPage"/>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton2"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>
+        <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
+        <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
+        <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage3"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad3"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage3">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart3"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod3"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton3"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext3"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder3"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage3"/>
+
+        <!--Check "Print Receipt" button is presented (desktop only)-->
+        <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
+        <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
+        <waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
+        <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
+        <resizeWindow width="1360" height="1020" stepKey="maximizeWindowKey1"/>
+        <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
+        <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
+
+        <!--See print page-->
+        <click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
+        <switchToWindow stepKey="switchToWindow"/>
+        <switchToNextTab stepKey="switchToTab"/>
+        <seeInCurrentUrl url="sales/order/print/order_id" stepKey="seePrintPage"/>
+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
+        <switchToWindow stepKey="switchToWindow2"/>
+    </test>
+    <test name="CheckCheckoutSuccessPageAsGuest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Success page elements are presented for placed order as Guest"/>
+            <title value="Customer Checkout"/>
+            <description value="To be sure that other elements of Success page are presented for placed order as Guest."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-60346"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
+
+        <!--See success messages-->
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
+
+        <!--Check register section-->
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessNotify"/>
+        <see selector="{{CheckoutSuccessRegisterSection.registerMessage}}" userInput="You can track your order status by creating an account." stepKey="seeRegisterMessage"/>
+        <see selector="{{CheckoutSuccessRegisterSection.customerEmail}}" userInput="Email Address: {{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
+        <seeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeVisibleCreateAccountButton"/>
+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerCreatePage.url}}" stepKey="seeCreateAccountPage"/>
+        <see userInput="Create New Customer Account" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeCreateAccountPageTitle"/>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection2">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>
+
+        <!--Continue shopping-->
+        <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
+        <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
+        <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml
new file mode 100644
index 0000000000000..4b4ca1935fd78
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckNotVisibleProductInMinicartTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="MAGETWO-96422: Hidden Products are absent in Storefront Mini-Cart" />
+            <title value="Not visible individually product in mini-shopping cart."/>
+            <description value="To be sure that product in mini-shopping cart remains visible after admin makes it not visible individually"/>
+            <severity value="MAJOR"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <!--Create simple product1 and simple product2-->
+        <createData entity="SimpleTwo" stepKey="createSimpleProduct1"/>
+        <createData entity="SimpleTwo" stepKey="createSimpleProduct2"/>
+
+        <!--Go to simple product1 page-->
+        <amOnPage url="$$createSimpleProduct1.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage1"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add simple product1 to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage1">
+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product1 in minicart-->
+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="addToCartFromStorefrontProductPage1"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProduct1NameInMiniCart">
+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
+        </actionGroup>
+
+        <!--Make simple product1 not visible individually-->
+        <updateData entity="SetProductVisibilityHidden" createDataKey="createSimpleProduct1" stepKey="updateSimpleProduct1">
+            <requiredEntity createDataKey="createSimpleProduct1"/>
+        </updateData>
+
+        <!--Go to simple product2 page-->
+        <amOnPage url="$$createSimpleProduct2.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+
+        <!--Add simple product2 to Shopping Cart for updating cart items-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product1 in minicart-->
+        <comment userInput="Check hidden simple product 1 in minicart" stepKey="commentCheckHiddenSimpleProduct1InMinicart" after="addToCartFromStorefrontProductPage2"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertHiddenProduct1NameInMiniCart">
+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product2 in minicart-->
+        <comment userInput="Check hidden simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="addToCartFromStorefrontProductPage2"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProduct2NameInMiniCart">
+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
+        </actionGroup>
+
+        <!--Delete simple product1 and simple product2-->
+        <deleteData createDataKey="createSimpleProduct1" stepKey="deleteProduct1"/>
+        <deleteData createDataKey="createSimpleProduct2" stepKey="deleteProduct2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
new file mode 100644
index 0000000000000..269ca94b3f772
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="CheckoutSpecificDestinationsTest">
+        <annotations>
+            <title value="Check that top destinations can be removed after a selection was previously saved"/>
+            <stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/>
+            <description value="Check that top destinations can be removed after a selection was previously saved"/>
+            <features value="Checkout"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-94195"/>
+            <group value="Checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
+            <createData entity="_defaultProduct" stepKey="simpleProduct">
+                <requiredEntity createDataKey="defaultCategory"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!--Go to configuration general page-->
+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/>
+
+        <!--Open country options section-->
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
+
+        <!--Select top destinations country-->
+        <actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry">
+            <argument name="countries" value="Countries"/>
+        </actionGroup>
+
+        <!--Go to product page-->
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!--Add product to cart-->
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart">
+            <argument name="productName" value="$$simpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to shopping cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+
+        <!--Verify country options in checkout top destination section-->
+        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry">
+            <argument name="country" value="Bahamas"/>
+            <argument name="placeNumber" value="2"/>
+        </actionGroup>
+
+        <!--Go to configuration general page-->
+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/>
+
+        <!--Open country options section-->
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
+
+        <!--Deselect top destinations country-->
+        <actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry">
+            <argument name="countries" value="Countries"/>
+        </actionGroup>
+
+        <!--Go to shopping cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/>
+
+        <!--Verify country options is shown by default-->
+        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2">
+            <argument name="country" value="Afghanistan"/>
+            <argument name="placeNumber" value="2"/>
+        </actionGroup>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
+        </after>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..35e0058440f6e
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <!-- Step 3: User adds products to cart -->
+        <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to cart -->
+        <comment userInput="Add Simple Product 1 to cart" stepKey="commentAddSimpleProduct1ToCart" after="startOfAddingProductsToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory" after="commentAddSimpleProduct1ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategoryloaded" after="cartClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory" after="waitForCartCategoryloaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct1ImageSrc" after="cartAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct1ImageSrc" stepKey="cartAssertSimpleProduct1ImageNotDefault" after="cartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickSimpleProduct1" after="cartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loaded" after="cartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertProduct1Page" after="waitForCartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabSimpleProduct1PageImageSrc" after="cartAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabSimpleProduct1PageImageSrc" stepKey="cartAssertSimpleProduct1PageImageNotDefault" after="cartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddProduct1ToCart" after="cartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to cart -->
+        <comment userInput="Add Simple Product 2 to cart" stepKey="commentAddSimpleProduct2ToCart" after="cartAddProduct1ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory1" after="commentAddSimpleProduct2ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory1loaded" after="cartClickCategory1"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForSimpleProduct2" after="waitForCartCategory1loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct2ImageSrc" after="cartAssertSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct2ImageSrc" stepKey="cartAssertSimpleProduct2ImageNotDefault" after="cartGrabSimpleProduct2ImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCartActionGroup" stepKey="cartAddProduct2ToCart" after="cartAssertSimpleProduct2ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.two"/>
+        </actionGroup>
+
+        <!-- Check products in minicart -->
+        <!-- Check simple product 1 in minicart -->
+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="cartAddProduct2ToCart"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct1" after="commentCheckSimpleProduct1InMinicart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1ImageSrc" after="cartOpenMinicartAndCheckSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct1ImageSrc" stepKey="cartMinicartAssertSimpleProduct1ImageNotDefault" after="cartMinicartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartMinicartClickSimpleProduct1" after="cartMinicartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct1loaded" after="cartMinicartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct1Page" after="waitForMinicartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1PageImageSrc" after="cartAssertMinicartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct1PageImageSrc" stepKey="cartMinicartAssertSimpleProduct1PageImageNotDefault" after="cartMinicartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct2" after="cartMinicartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in minicart -->
+        <comment userInput="Check simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="cartOpenMinicartAndCheckSimpleProduct2"/>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2ImageSrc" after="commentCheckSimpleProduct2InMinicart"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct2ImageSrc" stepKey="cartMinicartAssertSimpleProduct2ImageNotDefault" after="cartMinicartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartMinicartClickSimpleProduct2" after="cartMinicartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct2loaded" after="cartMinicartClickSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct2Page" after="waitForMinicartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2PageImageSrc" after="cartAssertMinicartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct2PageImageSrc" stepKey="cartMinicartAssertSimpleProduct2PageImageNotDefault" after="cartMinicartGrabSimpleProduct2PageImageSrc"/>
+
+        <!-- Check products in cart -->
+        <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+
+        <!-- Check simple product 1 in cart -->
+        <comment userInput="Check simple product 1 in cart" stepKey="commentCheckSimpleProduct1InCart" after="cartAssertCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct1" after="commentCheckSimpleProduct1InCart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct1ImageSrc" after="cartAssertCartSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct1ImageSrc" stepKey="cartCartAssertSimpleProduct1ImageNotDefault" after="cartCartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickCartSimpleProduct1" after="cartCartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loadedAgain" after="cartClickCartSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct1Page" after="waitForCartSimpleProduct1loadedAgain">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc1" after="cartAssertCartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc1" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault1" after="cartCartGrabSimpleProduct2PageImageSrc1"/>
+
+        <!-- Check simple product 2 in cart -->
+        <comment userInput="Check simple product 2 in cart" stepKey="commentCheckSimpleProduct2InCart" after="cartCartAssertSimpleProduct2PageImageNotDefault1"/>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart1" after="commentCheckSimpleProduct2InCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct2" after="cartOpenCart1">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct2ImageSrc" after="cartAssertCartSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct2ImageSrc" stepKey="cartCartAssertSimpleProduct2ImageNotDefault" after="cartCartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartClickCartSimpleProduct2" after="cartCartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct2loaded" after="cartClickCartSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct2Page" after="waitForCartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc2" after="cartAssertCartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc2" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault2" after="cartCartGrabSimpleProduct2PageImageSrc2"/>
+        <comment userInput="End of adding products to cart" stepKey="endOfAddingProductsToCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+
+        <!-- Step 6: Check out -->
+        <comment userInput="Start of checking out" stepKey="startOfCheckingOut" after="endOfUsingCouponCode" />
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" after="startOfCheckingOut"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection" after="guestGoToCheckoutFromMinicart">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check order summary in checkout -->
+        <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="guestCheckoutFillingShippingSection" />
+        <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="guestCheckoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="{{E2EB2CQuote.total}}"/>
+        </actionGroup>
+
+        <!-- Check ship to information in checkout -->
+        <comment userInput="Check ship to information in checkout" stepKey="commentCheckShipToInformationInCheckout" after="guestCheckoutCheckOrderSummary" />
+        <actionGroup ref="CheckShipToInformationInCheckoutActionGroup" stepKey="guestCheckoutCheckShipToInformation" after="commentCheckShipToInformationInCheckout">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check shipping method in checkout -->
+        <comment userInput="Check shipping method in checkout" stepKey="commentCheckShippingMethodInCheckout" after="guestCheckoutCheckShipToInformation" />
+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckShippingMethod" after="commentCheckShippingMethodInCheckout">
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod" />
+        </actionGroup>
+
+        <!-- Verify Simple Product 1 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 1 is in checkout cart items" stepKey="commentVerifySimpleProduct1IsInCheckoutCartItems" after="guestCheckoutCheckShippingMethod" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="guestCheckoutCheckSimpleProduct1InCartItems" after="commentVerifySimpleProduct1IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Verify Simple Product 2 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 2 is in checkout cart items" stepKey="commentVerifySimpleProduct2IsInCheckoutCartItems" after="guestCheckoutCheckSimpleProduct1InCartItems" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="guestCheckoutCheckSimpleProduct2InCartItems" after="commentVerifySimpleProduct2IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <comment userInput="Place order with check money order payment" stepKey="commentPlaceOrderWithCheckMoneyOrderPayment" after="guestCheckoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" after="commentPlaceOrderWithCheckMoneyOrderPayment"/>
+        <actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="guestSeeBillingAddress" after="guestSelectCheckMoneyOrderPayment">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceorder" after="guestSeeBillingAddress">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <comment userInput="End of checking out" stepKey="endOfCheckingOut" after="guestPlaceorder" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..371826c9e7841
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <!-- Step 3: User adds products to cart -->
+        <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to cart -->
+        <comment userInput="Add Simple Product 1 to cart" stepKey="commentAddSimpleProduct1ToCart" after="startOfAddingProductsToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory" after="commentAddSimpleProduct1ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategoryloaded" after="cartClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory" after="waitForCartCategoryloaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct1ImageSrc" after="cartAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct1ImageSrc" stepKey="cartAssertSimpleProduct1ImageNotDefault" after="cartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickSimpleProduct1" after="cartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loaded" after="cartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertProduct1Page" after="waitForCartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabSimpleProduct1PageImageSrc" after="cartAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabSimpleProduct1PageImageSrc" stepKey="cartAssertSimpleProduct1PageImageNotDefault" after="cartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddProduct1ToCart" after="cartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to cart -->
+        <comment userInput="Add Simple Product 2 to cart" stepKey="commentAddSimpleProduct2ToCart" after="cartAddProduct1ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory1" after="commentAddSimpleProduct2ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory1loaded" after="cartClickCategory1"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForSimpleProduct2" after="waitForCartCategory1loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct2ImageSrc" after="cartAssertSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct2ImageSrc" stepKey="cartAssertSimpleProduct2ImageNotDefault" after="cartGrabSimpleProduct2ImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCartActionGroup" stepKey="cartAddProduct2ToCart" after="cartAssertSimpleProduct2ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.two"/>
+        </actionGroup>
+
+        <!-- Check products in minicart -->
+        <!-- Check simple product 1 in minicart -->
+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="cartAddProduct2ToCart"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct1" after="commentCheckSimpleProduct1InMinicart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1ImageSrc" after="cartOpenMinicartAndCheckSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct1ImageSrc" stepKey="cartMinicartAssertSimpleProduct1ImageNotDefault" after="cartMinicartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartMinicartClickSimpleProduct1" after="cartMinicartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct1loaded" after="cartMinicartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct1Page" after="waitForMinicartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1PageImageSrc" after="cartAssertMinicartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct1PageImageSrc" stepKey="cartMinicartAssertSimpleProduct1PageImageNotDefault" after="cartMinicartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct2" after="cartMinicartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in minicart -->
+        <comment userInput="Check simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="cartOpenMinicartAndCheckSimpleProduct2"/>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2ImageSrc" after="commentCheckSimpleProduct2InMinicart"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct2ImageSrc" stepKey="cartMinicartAssertSimpleProduct2ImageNotDefault" after="cartMinicartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartMinicartClickSimpleProduct2" after="cartMinicartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct2loaded" after="cartMinicartClickSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct2Page" after="waitForMinicartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2PageImageSrc" after="cartAssertMinicartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct2PageImageSrc" stepKey="cartMinicartAssertSimpleProduct2PageImageNotDefault" after="cartMinicartGrabSimpleProduct2PageImageSrc"/>
+
+        <!-- Check products in cart -->
+        <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+
+        <!-- Check simple product 1 in cart -->
+        <comment userInput="Check simple product 1 in cart" stepKey="commentCheckSimpleProduct1InCart" after="cartAssertCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct1" after="commentCheckSimpleProduct1InCart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct1ImageSrc" after="cartAssertCartSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct1ImageSrc" stepKey="cartCartAssertSimpleProduct1ImageNotDefault" after="cartCartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickCartSimpleProduct1" after="cartCartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loadedAgain" after="cartClickCartSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct1Page" after="waitForCartSimpleProduct1loadedAgain">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc1" after="cartAssertCartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc1" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault1" after="cartCartGrabSimpleProduct2PageImageSrc1"/>
+
+        <!-- Check simple product 2 in cart -->
+        <comment userInput="Check simple product 2 in cart" stepKey="commentCheckSimpleProduct2InCart" after="cartCartAssertSimpleProduct2PageImageNotDefault1"/>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart1" after="commentCheckSimpleProduct2InCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct2" after="cartOpenCart1">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct2ImageSrc" after="cartAssertCartSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct2ImageSrc" stepKey="cartCartAssertSimpleProduct2ImageNotDefault" after="cartCartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartClickCartSimpleProduct2" after="cartCartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct2loaded" after="cartClickCartSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct2Page" after="waitForCartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc2" after="cartAssertCartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc2" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault2" after="cartCartGrabSimpleProduct2PageImageSrc2"/>
+        <comment userInput="End of adding products to cart" stepKey="endOfAddingProductsToCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+
+        <!-- Step 7: Check out -->
+        <comment userInput="Start of checking out" stepKey="startOfCheckingOut" after="endOfUsingCouponCode" />
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" after="startOfCheckingOut"/>
+        <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="checkoutFillingShippingSection" after="goToCheckoutFromMinicart">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check order summary in checkout -->
+        <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="checkoutFillingShippingSection" />
+        <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="checkoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="{{E2EB2CQuote.total}}"/>
+        </actionGroup>
+
+        <!-- Check ship to information in checkout -->
+        <comment userInput="Check ship to information in checkout" stepKey="commentCheckShipToInformationInCheckout" after="checkoutCheckOrderSummary" />
+        <actionGroup ref="CheckShipToInformationInCheckoutActionGroup" stepKey="checkoutCheckShipToInformation" after="commentCheckShipToInformationInCheckout">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check shipping method in checkout -->
+        <comment userInput="Check shipping method in checkout" stepKey="commentCheckShippingMethodInCheckout" after="checkoutCheckShipToInformation" />
+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="checkoutCheckShippingMethod" after="commentCheckShippingMethodInCheckout">
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod" />
+        </actionGroup>
+
+        <!-- Verify Simple Product 1 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 1 is in checkout cart items" stepKey="commentVerifySimpleProduct1IsInCheckoutCartItems" after="checkoutCheckShippingMethod" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="checkoutCheckSimpleProduct1InCartItems" after="commentVerifySimpleProduct1IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Verify Simple Product 2 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 2 is in checkout cart items" stepKey="commentVerifySimpleProduct2IsInCheckoutCartItems" after="checkoutCheckSimpleProduct1InCartItems" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="checkoutCheckSimpleProduct2InCartItems" after="commentVerifySimpleProduct2IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <comment userInput="Place order with check money order payment" stepKey="commentPlaceOrderWithCheckMoneyOrderPayment" after="checkoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" after="commentPlaceOrderWithCheckMoneyOrderPayment"/>
+        <actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="seeBillingAddress" after="selectCheckMoneyOrderPayment">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeorder" after="seeBillingAddress">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <comment userInput="End of checking out" stepKey="endOfCheckingOut" after="placeorder" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
new file mode 100644
index 0000000000000..9664ec47420cc
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="IdentityOfDefaultBillingAndShippingAddressTest">
+        <annotations>
+            <features value="Customer"/>
+            <title value="Checking assignment of default billing address after placing an orde"/>
+            <description value="In 'Address book' field 'Default Billing Address' should be the same as 'Default Shipping Address'"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94108"/>
+            <stories value="MAGETWO-62891: New address is not marked as 'Default Billing'"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <!--Create product-->
+            <createData stepKey="category" entity="SimpleSubCategory"/>
+            <createData stepKey="product" entity="SimpleProduct">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+        </before>
+
+        <!--Go to Storefront-->
+        <amOnPage url="" stepKey="DoToStorefront"/>
+
+        <!-- Fill out form for a new user with address -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
+            <argument name="Customer" value="Simple_US_Customer_NY"/>
+        </actionGroup>
+
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+
+        <!--Proceed to shipment-->
+        <amOnPage url="{{CheckoutPage.url}}/" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+
+        <!--Fill shipment form-->
+        <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="checkoutFillingShippingSection" >
+            <argument name="customerVar" value="Simple_US_Customer_NY" />
+            <argument name="customerAddressVar" value="US_Address_NY" />
+        </actionGroup>
+
+        <!--Fill cart data-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" />
+
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeorder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <!--Go To My Account-->
+        <amOnPage stepKey="goToMyAccountPage" url="/customer/account/"/>
+
+        <!--Assert That Shipping And Billing Address are the same-->
+        <actionGroup ref="AssertThatShippingAndBillingAddressTheSame" stepKey="assertThatShippingAndBillingAddressTheSame"/>
+
+        <after>
+            <!--Delete created Product-->
+            <deleteData stepKey="deleteProduct" createDataKey="product"/>
+            <deleteData stepKey="deleteCategory" createDataKey="category"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
new file mode 100644
index 0000000000000..1f3d9db5ca524
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NoErrorCartCheckoutForProductsDeletedFromMiniCartTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Delete product from Storefront checkout"/>
+            <title value="Delete product from Checkout"/>
+            <description value="No error from cart should be thrown for product deleted from minicart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-91451"/>
+            <group value="checkout"/>
+        </annotations>
+        <!-- Preconditions  -->
+        <before>
+            <!--  Simple product is created with price = 100 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <field key="price">100.00</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addProductToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <!-- open the minicart -->
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart1"/>
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="editProductFromMiniCart"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart2"/>
+        <click selector="{{StorefrontMinicartSection.deleteMiniCartItem}}" stepKey="deleteMiniCartItem"/>
+        <waitForElementVisible selector="{{StoreFrontRemoveItemModalSection.message}}" stepKey="waitFortheConfirmationModal"/>
+        <see selector="{{StoreFrontRemoveItemModalSection.message}}" userInput="Are you sure you would like to remove this item from the shopping cart?" stepKey="seeDeleteConfirmationMessage"/>
+        <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+        <click selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="deleteProductFromCheckoutCart"/>
+        <waitForPageLoad stepKey="WaitForPageLoad3"/>
+        <see userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
new file mode 100644
index 0000000000000..e7c2ad3dd28a4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCustomerCheckoutTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Admin"/>
+            <title value="Customer Checkout"/>
+            <description value="Should be able to place an order as a customer."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5922"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
+            <createData entity="SimpleProduct" stepKey="simpleproduct1">
+                <requiredEntity createDataKey="simplecategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
+        </before>
+        <after>
+            <!--Clear filters-->
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+            <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingCustomerFilters"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
+        </after>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$simpleuscustomer$$" />
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$simplecategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+
+        <click stepKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
+        <waitForElement stepKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
+        <click stepKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <waitForPageLoad stepKey="s39"/>
+        <waitForElement stepKey="s41" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
+        <see stepKey="s47" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+        <click stepKey="s49" selector="{{CheckoutPaymentSection.placeOrder}}" />
+        <waitForPageLoad stepKey="s51"/>
+        <grabTextFrom stepKey="s53" selector="{{CheckoutSuccessMainSection.orderNumber22}}"/>
+        <see stepKey="s55" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage stepKey="s67" url="{{AdminOrdersPage.url}}"/>
+        <waitForPageLoad stepKey="s75"/>
+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFiltersIfPresent"/>
+        <fillField stepKey="s77" selector="{{AdminOrdersGridSection.search}}" userInput="{$s53}" />
+        <waitForPageLoad stepKey="s78"/>
+
+        <click stepKey="s81" selector="{{AdminOrdersGridSection.submitSearch22}}" />
+        <waitForPageLoad stepKey="s831"/>
+        <click stepKey="s84" selector="{{AdminOrdersGridSection.firstRow}}" />
+        <see stepKey="s85" selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
+        <see stepKey="s87" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
+        <see stepKey="s89" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
+        <see stepKey="s91" selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+        <see stepKey="s93" selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+        <see stepKey="s95" selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
+
+        <amOnPage stepKey="s96" url="{{AdminCustomerPage.url}}"/>
+        <waitForPageLoad stepKey="s97"/>
+        <waitForElementVisible selector="{{AdminCustomerFiltersSection.filtersButton}}" time="30" stepKey="waitFiltersButton"/>
+        <click stepKey="s98" selector="{{AdminCustomerFiltersSection.filtersButton}}"/>
+        <fillField stepKey="s99" selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="$$simpleuscustomer.email$$"/>
+        <click stepKey="s100" selector="{{AdminCustomerFiltersSection.apply}}"/>
+        <click stepKey="s101" selector="{{AdminCustomerGridSection.firstRowEditLink}}"/>
+        <click stepKey="s102" selector="{{AdminEditCustomerInformationSection.orders}}"/>
+        <see stepKey="s103" selector="{{AdminEditCustomerOrdersSection.orderGrid}}" userInput="$$simpleuscustomer.firstname$$ $$simpleuscustomer.lastname$$" />
+    </test>
+    <test name="StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRates">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Customer checkout"/>
+            <title value="Customer Checkout with multiple addresses and tax rates"/>
+            <description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
+            <testCaseId value="MAGETWO-93109"/>
+            <severity value="AVERAGE"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
+            <createData entity="SimpleProduct" stepKey="simpleproduct1">
+                <requiredEntity createDataKey="simplecategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="multiple_address_customer"/>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="multiple_address_customer" stepKey="deleteCustomer"/>
+        </after>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$multiple_address_customer$$" />
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$simplecategory.name$$)}}" stepKey="onCategoryPage1"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct1"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart1"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded1"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart." stepKey="seeAddedToCartMessage1"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity1"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1" />
+
+        <click stepKey="selectFirstShippingMethod1" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
+        <waitForElement stepKey="waitForShippingMethodSelect1" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
+        <click stepKey="clickNextOnShippingMethodLoad1" selector="{{CheckoutShippingMethodsSection.next}}" />
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <waitForElement stepKey="waitForPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
+        <see stepKey="seeBillingAddressIsCorrect1" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" />
+        <click stepKey="clickPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" />
+        <waitForPageLoad stepKey="waitForOrderSuccessPage1"/>
+        <see stepKey="seeSuccessMessage1" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$simplecategory.name$$)}}" stepKey="onCategoryPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct2"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart2"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded2"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart." stepKey="seeAddedToCartMessage2"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity2"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2" />
+
+        <click stepKey="changeShippingAddress" selector="{{CheckoutShippingMethodsSection.shipHereButton}}"/>
+        <waitForElementNotVisible stepKey="waitForShippingMethodLoaderNotVisible" selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30"/>
+        <waitForElementVisible stepKey="waitForShippingMethodRadioToBeVisible" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30"/>
+        <waitForPageLoad stepKey="waitForPageLoad23"/>
+        <click stepKey="selectFirstShippingMethod2" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
+        <waitForElement stepKey="waitForShippingMethodSelect2" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
+        <click stepKey="clickNextOnShippingMethodLoad2" selector="{{CheckoutShippingMethodsSection.next}}" />
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+        <waitForElement stepKey="waitForPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
+        <see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" />
+        <click stepKey="clickPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" />
+        <waitForPageLoad stepKey="waitForOrderSuccessPage2"/>
+        <see stepKey="seeSuccessMessage2" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
+    </test>
+    <test name="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPayment">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout flow if payment solutions are not available"/>
+            <title value="Checkout via Customer Checkout with restricted countries for payment"/>
+            <description value="Should be able to place an order as a Customer with restricted countries for payment."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-42653"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
+            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
+            <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 0" />
+            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry ''" />
+        </after>
+        <!-- Login as Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$simpleuscustomer$$" />
+        </actionGroup>
+
+        <!-- Add product to cart -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+
+        <!-- Go to checkout page -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="customerGoToCheckoutFromMinicart" />
+
+        <!-- Select address -->
+        <click stepKey="selectAddress" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
+        <waitForElement stepKey="waitNextButton" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
+        <click stepKey="clickNextButton" selector="{{CheckoutShippingMethodsSection.next}}" />
+        <waitForPageLoad stepKey="waitBillingForm"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+        <dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
+
+        <!-- Fill UK Address and verify that payment available and checkout successful -->
+        <click selector="{{CheckoutHeaderSection.shippingMethodStep}}" stepKey="goToShipping" />
+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="fillNewAddress" />
+        <actionGroup ref="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup" stepKey="customerCheckoutFillingShippingSectionUK">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="UK_Not_Default_Address" />
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="customerSelectCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceorder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
new file mode 100644
index 0000000000000..0cc0dcf38e312
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCustomerCheckoutWithoutRegionTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Admin"/>
+            <title value="Shipping address is not validated in checkout when proceeding step as logged in user with default shipping address"/>
+            <description value="Shouldn't be able to place an order as a customer without state if it's required."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="#"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_GB_Customer" stepKey="createCustomer"/>
+            <actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
+            <actionGroup ref="SelectCountriesWithRequiredRegion" stepKey="setCustomCountryWithRequiredRegion">
+                <argument name="countries" value="CustomCountryWithRequiredRegion"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="SelectCountriesWithRequiredRegion" stepKey="setDefaultCountriesWithRequiredRegion">
+                <argument name="countries" value="DefaultCountriesWithRequiredRegions"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
+
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
+        <see selector="{{StorefrontMessagesSection.error}}" userInput='Please specify a regionId in shipping address.' stepKey="seeErrorMessages"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
new file mode 100644
index 0000000000000..cc5e723c72ea0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="Customer can place order with new addresses that was edited during checkout with several conditions"/>
+            <description value="Customer can place order with new addresses."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-67837"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <!--Logout from customer account-->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!--Go to Storefront as Customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+
+        <!-- Add simple product to cart and go to checkout-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+
+        <!-- Click "+ New Address" and Fill new address-->
+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addAddress"/>
+        <actionGroup ref="LoggedInCheckoutWithOneAddressFieldWithoutStateField" stepKey="changeAddress">
+            <argument name="Address" value="UK_Not_Default_Address"/>
+            <argument name="classPrefix" value="._show"/>
+        </actionGroup>
+
+        <!--Click "Save Addresses" -->
+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
+
+        <!--Select Shipping Rate "Flat Rate"-->
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" stepKey="selectFlatShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+
+        <click selector="{{CheckoutShippingSection.editActiveAddress}}" stepKey="editNewAddress"/>
+        <actionGroup ref="clearCheckoutAddressPopupFieldsActionGroup" stepKey="clearRequiredFields">
+            <argument name="classPrefix" value="._show"/>
+        </actionGroup>
+
+        <!--Close Popup and click next-->
+        <click selector="{{StorefrontCheckoutAddressPopupSection.closeAddressModalPopup}}" stepKey="closePopup"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+
+        <!--Refresh Page and Place Order-->
+        <reloadPage stepKey="reloadPage"/>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="grabOrderNumber"/>
+
+        <!--Verify New addresses in Customer's Address Book-->
+        <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToCustomerAddressBook"/>
+        <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddresses"/>
+        <!--Order review page has address that was created during checkout-->
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="goToOrderReviewPage"/>
+        <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
+             selector="{{StorefrontCustomerOrderViewSection.shippingAddress}}" stepKey="checkShippingAddress"/>
+        <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
+             selector="{{StorefrontCustomerOrderViewSection.billingAddress}}" stepKey="checkBillingAddress"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
new file mode 100644
index 0000000000000..7b81f12624864
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontGuestCheckoutTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Guest Checkout"/>
+            <description value="Should be able to place an order as a Guest."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-72094"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="guestSeeAddress">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceorder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
+        <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
+        <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
+        <see selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
+        <see selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
+        <see selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$createProduct.name$$" stepKey="seeAdminOrderProduct"/>
+    </test>
+    <test name="StorefrontGuestCheckoutWithSidebarDisabledTest" extends="StorefrontGuestCheckoutTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Guest Checkout when Cart sidebar disabled"/>
+            <description value="Should be able to place an order as a Guest when Cart sidebar is disabled"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-97001"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <magentoCLI stepKey="disableSidebar" command="config:set checkout/sidebar/display 0" />
+        </before>
+        <after>
+            <magentoCLI stepKey="enableSidebar" command="config:set checkout/sidebar/display 1" />
+        </after>
+        <remove keyForRemoval="guestGoToCheckoutFromMinicart" />
+        <actionGroup ref="GoToCheckoutFromCartActionGroup" stepKey="guestGoToCheckoutFromCart" after="seeCartQuantity" />
+    </test>
+    <test name="StorefrontGuestCheckoutTestWithRestrictedCountriesForPayment">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout flow if payment solutions are not available"/>
+            <title value="Checkout via Guest Checkout with restricted countries for payment"/>
+            <description value="Should be able to place an order as a Guest with restricted countries for payment."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-42653"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
+            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
+
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 0" />
+            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry ''" />
+        </after>
+
+        <!-- Add product to cart -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+
+        <!-- Go to checkout page -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+
+        <!-- Fill US Address and verify that no payment available -->
+        <actionGroup ref="GuestCheckoutWithSpecificCountryOptionForPaymentMethodActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+            <argument name="paymentMethod" value="Check / Money order"/>
+        </actionGroup>
+
+        <!-- Fill UK Address and verify that payment available and checkout successful -->
+        <click selector="{{CheckoutHeaderSection.shippingMethodStep}}" stepKey="goToShipping" />
+        <actionGroup ref="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup" stepKey="guestCheckoutFillingShippingSectionUK">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="UK_Not_Default_Address" />
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceorder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..70f950f6f6c35
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
+            <title value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
+            <description value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-46795"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer">
+                <field key="group_id">1</field>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Steps -->
+        <!-- Step 1: Go to Storefront as Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!-- Step 2: Add virtual product to cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.custom_attributes[url_key]$)}}" stepKey="amOnPage"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!-- Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
+        <!-- Step 4: Open Estimate Tax section -->
+        <click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
+        <see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCountry"/>
+        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
new file mode 100644
index 0000000000000..b4747a6bf7273
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontUpdatePriceInShoppingCartAfterProductSaveTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="Update price in shopping cart after product save"/>
+            <description value="Price in shopping cart should be updated after product save with changed price"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-58179"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+                <field key="price">100</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SetCustomerDataLifetimeActionGroup" stepKey="setCustomerDataLifetime">
+                <argument name="minutes" value="1"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="SetCustomerDataLifetimeActionGroup" stepKey="setDefaultCustomerDataLifetime"/>
+            <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Go to product page-->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"/>
+
+        <!--Check price-->
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="openItemProductBlock"/>
+        <see userInput="$100.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="checkSummarySubtotal"/>
+        <see userInput="$100.00" selector="{{CheckoutPaymentSection.productItemPriceByName($$createSimpleProduct.name$$)}}" stepKey="checkItemPrice"/>
+
+        <!--Edit product price via admin panel-->
+        <openNewTab stepKey="openNewTab"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
+        <fillField userInput="120" selector="{{AdminProductFormSection.productPrice}}"  stepKey="setNewPrice"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <closeTab stepKey="closeTab"/>
+
+        <!--Check price-->
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageReload"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="openItemProductBlock1"/>
+        <see userInput="$120.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="checkSummarySubtotal1"/>
+        <see userInput="$120.00" selector="{{CheckoutPaymentSection.productItemPriceByName($$createSimpleProduct.name$$)}}" stepKey="checkItemPrice1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
new file mode 100644
index 0000000000000..2cc21df85ab67
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ZeroSubtotalOrdersWithProcessingStatusTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="MAGETWO-71375: Zero Subtotal Orders have incorrect status"/>
+            <title value="Checking status of Zero Subtotal Orders with 'Processing' New Order Status"/>
+            <description value="Created order should be in Processing status"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94178"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
+            <createData entity="SimpleProduct" stepKey="simpleproduct">
+                <requiredEntity createDataKey="simplecategory"/>
+            </createData>
+            <createData entity="PaymentMethodsSettingConfig" stepKey="paymentMethodsSettingConfig"/>
+            <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
+            <!--Go to Admin page-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteSalesRule">
+                <argument name="ruleName" value="{{ApiSalesRule.name}}"/>
+            </actionGroup>
+            <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
+            <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
+            <createData entity="DisablePaymentMethodsSettingConfig" stepKey="disablePaymentMethodsSettingConfig"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!--Open MARKETING > Cart Price Rules-->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+
+        <!--Add New Rule-->
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ApiSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsite"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="chooseNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="fillCouponCode"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="99" stepKey="fillUserPerCoupon"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="100" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!--Proceed to store front and place an order with free shipping using created coupon-->
+        <!--Add product to card-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="AddProductToCard">
+            <argument name="product" value="$$simpleproduct$$"/>
+        </actionGroup>
+
+        <!--Proceed to shipment-->
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickToOpenCard"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="clickToProceedToCheckout"/>
+        <waitForPageLoad stepKey="waitForTheFormIsOpened"/>
+
+        <!--Fill shipping form-->
+        <actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
+
+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToAddDiscount"/>
+        <fillField selector="{{DiscountSection.DiscountInput}}" userInput="{{_defaultCoupon.code}}" stepKey="TypeDiscountCode"/>
+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="clickToApplyDiscount"/>
+        <waitForPageLoad stepKey="WaitForDiscountToBeAdded"/>
+        <see userInput="Your coupon was successfully applied." stepKey="verifyText"/>
+
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <!--Proceed to Admin panel > SALES > Orders. Created order should be in Processing status-->
+        <amOnPage url="/admin/sales/order/" stepKey="navigateToSalesOrderPage"/>
+        <waitForPageLoad stepKey="waitForSalesOrderPageLoaded"/>
+
+        <!-- Open Order -->
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForCreatedOrderPageOpened"/>
+
+        <!--Verify that Created order is in Processing status-->
+        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatus"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php
index aecaf0ec9f039..1a9c5555c91c0 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php
@@ -124,6 +124,9 @@ public function testGetTotalsCache($expectedResult, $isVirtual)
         $this->assertEquals($expectedResult, $model->getTotalsCache());
     }
 
+    /**
+     * @return array
+     */
     public function getTotalsCacheDataProvider()
     {
         return [
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
index d963fa2d76e6b..40154563774d5 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
@@ -5,8 +5,11 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Cart\Item;
 
+use Magento\Catalog\Block\Product\Image;
+use Magento\Catalog\Model\Product;
 use Magento\Checkout\Block\Cart\Item\Renderer;
 use Magento\Quote\Model\Quote\Item;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -16,17 +19,22 @@ class RendererTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Renderer
      */
-    protected $_renderer;
+    private $renderer;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $layout;
+    private $layout;
 
     /**
      * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imageBuilder;
+    private $imageBuilder;
+
+    /**
+     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
 
     protected function setUp()
     {
@@ -39,17 +47,22 @@ protected function setUp()
             ->getMock();
         $context->expects($this->once())
             ->method('getLayout')
-            ->will($this->returnValue($this->layout));
+            ->willReturn($this->layout);
 
         $this->imageBuilder = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->itemResolver = $this->createMock(
+            ItemResolverInterface::class
+        );
+
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\Checkout\Block\Cart\Item\Renderer::class,
             [
                 'context' => $context,
                 'imageBuilder' => $this->imageBuilder,
+                'itemResolver' => $this->itemResolver,
             ]
         );
     }
@@ -57,29 +70,34 @@ protected function setUp()
     public function testGetProductForThumbnail()
     {
         $product = $this->_initProduct();
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
+        $productForThumbnail = $this->renderer->getProductForThumbnail();
         $this->assertEquals($product->getName(), $productForThumbnail->getName(), 'Invalid product was returned.');
     }
 
     /**
      * Initialize product.
      *
-     * @return \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
+     * @return Product|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function _initProduct()
     {
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
+            Product::class,
             ['getName', '__wakeup', 'getIdentities']
         );
-        $product->expects($this->any())->method('getName')->will($this->returnValue('Parent Product'));
+        $product->expects($this->any())->method('getName')->willReturn('Parent Product');
 
         /** @var Item|\PHPUnit_Framework_MockObject_MockObject $item */
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($product));
+        $item->expects($this->any())->method('getProduct')->willReturn($product);
+
+        $this->itemResolver->expects($this->any())
+            ->method('getFinalProduct')
+            ->with($item)
+            ->willReturn($product);
 
-        $this->_renderer->setItem($item);
+        $this->renderer->setItem($item);
         return $product;
     }
 
@@ -89,14 +107,14 @@ public function testGetIdentities()
         $identities = [1 => 1, 2 => 2, 3 => 3];
         $product->expects($this->exactly(2))
             ->method('getIdentities')
-            ->will($this->returnValue($identities));
+            ->willReturn($identities);
 
-        $this->assertEquals($product->getIdentities(), $this->_renderer->getIdentities());
+        $this->assertEquals($product->getIdentities(), $this->renderer->getIdentities());
     }
 
     public function testGetIdentitiesFromEmptyItem()
     {
-        $this->assertEmpty($this->_renderer->getIdentities());
+        $this->assertEmpty($this->renderer->getIdentities());
     }
 
     /**
@@ -106,7 +124,7 @@ public function testGetIdentitiesFromEmptyItem()
     public function testGetProductPriceHtml()
     {
         $priceHtml = 'some price html';
-        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+        $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -117,7 +135,7 @@ public function testGetProductPriceHtml()
         $this->layout->expects($this->atLeastOnce())
             ->method('getBlock')
             ->with('product.price.render.default')
-            ->will($this->returnValue($priceRender));
+            ->willReturn($priceRender);
 
         $priceRender->expects($this->once())
             ->method('render')
@@ -129,9 +147,9 @@ public function testGetProductPriceHtml()
                     'display_minimal_price' => true,
                     'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST
                 ]
-            )->will($this->returnValue($priceHtml));
+            )->willReturn($priceHtml);
 
-        $this->assertEquals($priceHtml, $this->_renderer->getProductPriceHtml($product));
+        $this->assertEquals($priceHtml, $this->renderer->getProductPriceHtml($product));
     }
 
     public function testGetActions()
@@ -148,7 +166,7 @@ public function testGetActions()
 
         $this->layout->expects($this->once())
             ->method('getChildName')
-            ->with($this->_renderer->getNameInLayout(), 'actions')
+            ->with($this->renderer->getNameInLayout(), 'actions')
             ->willReturn($blockNameInLayout);
         $this->layout->expects($this->once())
             ->method('getBlock')
@@ -169,14 +187,14 @@ public function testGetActions()
             ->method('toHtml')
             ->willReturn($blockHtml);
 
-        $this->assertEquals($blockHtml, $this->_renderer->getActions($itemMock));
+        $this->assertEquals($blockHtml, $this->renderer->getActions($itemMock));
     }
 
     public function testGetActionsWithNoBlock()
     {
         $this->layout->expects($this->once())
             ->method('getChildName')
-            ->with($this->_renderer->getNameInLayout(), 'actions')
+            ->with($this->renderer->getNameInLayout(), 'actions')
             ->willReturn(false);
 
         /**
@@ -186,41 +204,24 @@ public function testGetActionsWithNoBlock()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->assertEquals('', $this->_renderer->getActions($itemMock));
+        $this->assertEquals('', $this->renderer->getActions($itemMock));
     }
 
     public function testGetImage()
     {
         $imageId = 'test_image_id';
         $attributes = [];
+        $product = $this->createMock(Product::class);
+        $imageMock = $this->createMock(Image::class);
 
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageBuilder->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setImageId')
-            ->with($imageId)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setAttributes')
-            ->with($attributes)
-            ->willReturnSelf();
         $this->imageBuilder->expects($this->once())
             ->method('create')
+            ->with($product, $imageId, $attributes)
             ->willReturn($imageMock);
 
         $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\Image::class,
-            $this->_renderer->getImage($productMock, $imageId, $attributes)
+            Image::class,
+            $this->renderer->getImage($product, $imageId, $attributes)
         );
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php
index 2478270e0aec6..417c1e4295ea1 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php
@@ -82,6 +82,9 @@ public function testGetLabel($productCount, $label)
         $this->assertSame($label, (string)$block->getLabel());
     }
 
+    /**
+     * @return array
+     */
     public function getLabelDataProvider()
     {
         return [[1, 'My Cart (1 item)'], [2, 'My Cart (2 items)'], [0, 'My Cart']];
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index e419a1535207e..302188224b97a 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -99,9 +99,6 @@ public function testGetJsLayout()
             ->with($this->layout)
             ->willReturn($layoutProcessed);
 
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue($jsonLayoutProcessed)
-        );
         $this->assertEquals(
             $jsonLayoutProcessed,
             $this->model->getJsLayout()
@@ -121,9 +118,6 @@ public function testGetSerializedCheckoutConfig()
     {
         $checkoutConfig = ['checkout', 'config'];
         $this->configProvider->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue(json_encode($checkoutConfig))
-        );
 
         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
index 88751b899d7c9..1c5224d007ec8 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
@@ -163,7 +163,6 @@ public function testGetConfig()
             ->willReturnMap($valueMap);
         $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock);
         $storeMock->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
-        $this->imageHelper->expects($this->once())->method('getFrame')->willReturn(false);
 
         $this->scopeConfigMock->expects($this->at(0))
             ->method('getValue')
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
index b3e55bb418d3d..31ca2a2033012 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php
@@ -10,15 +10,12 @@
 use Magento\Checkout\Helper\Data;
 use Magento\Customer\Model\AttributeMetadataDataProvider;
 use Magento\Customer\Model\Options;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 use Magento\Ui\Component\Form\AttributeMapper;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * LayoutProcessorTest covers a list of variations for
- * checkout layout processor
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * LayoutProcessorTest covers a list of variations for checkout layout processor
  */
 class LayoutProcessorTest extends \PHPUnit\Framework\TestCase
 {
@@ -50,12 +47,10 @@ class LayoutProcessorTest extends \PHPUnit\Framework\TestCase
     /**
      * @var MockObject
      */
-    private $storeResolver;
+    private $storeManager;
 
     protected function setUp()
     {
-        $objectManager = new ObjectManager($this);
-
         $this->attributeDataProvider = $this->getMockBuilder(AttributeMetadataDataProvider::class)
             ->disableOriginalConstructor()
             ->setMethods(['loadAttributesCollection'])
@@ -80,17 +75,21 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $shippingConfig = $this->getMockBuilder(\Magento\Shipping\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+
         $this->layoutProcessor = new LayoutProcessor(
             $this->attributeDataProvider,
             $this->attributeMapper,
-            $this->attributeMerger
+            $this->attributeMerger,
+            $options,
+            $this->dataHelper,
+            $shippingConfig,
+            $this->storeManager
         );
-
-        $this->storeResolver = $this->createMock(\Magento\Store\Api\StoreResolverInterface::class);
-
-        $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'checkoutDataHelper', $this->dataHelper);
-        $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'options', $options);
-        $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'storeResolver', $this->storeResolver);
     }
 
     /**
@@ -277,7 +276,7 @@ private function getBillingComponent($paymentCode)
             'telephone' => [
                 'config' => [
                     'tooltip' => [
-                        'description' => __('For delivery questions.'),
+                        'description' => ('For delivery questions.'),
                     ],
                 ],
             ],
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/LinkTest.php b/app/code/Magento/Checkout/Test/Unit/Block/LinkTest.php
index 24065c1f54eb3..7db5d7ecb19fd 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/LinkTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/LinkTest.php
@@ -68,6 +68,9 @@ public function testToHtml($canOnepageCheckout, $isOutputEnabled)
         $this->assertEquals('', $block->toHtml());
     }
 
+    /**
+     * @return array
+     */
     public function toHtmlDataProvider()
     {
         return [[false, true], [true, false], [false, false]];
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Onepage/SuccessTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Onepage/SuccessTest.php
index 18281494029b6..36d37d07ef752 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Onepage/SuccessTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Onepage/SuccessTest.php
@@ -153,6 +153,9 @@ public function testToHtmlOrderVisibleOnFront(array $invisibleStatuses, $expecte
         $this->assertEquals($expectedResult, $this->block->getIsOrderVisible());
     }
 
+    /**
+     * @return array
+     */
     public function invisibleStatusesProvider()
     {
         return [
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index e47fac06d8057..54f77c95148ac 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -93,9 +93,6 @@ public function testGetJsLayout()
         $processedLayout = ['layout' => ['processed' => true]];
         $jsonLayout = '{"layout":{"processed":true}}';
         $this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue(json_encode($processedLayout))
-        );
 
         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
     }
@@ -104,9 +101,6 @@ public function testGetSerializedCheckoutConfig()
     {
         $checkoutConfig = ['checkout', 'config'];
         $this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue(json_encode($checkoutConfig))
-        );
 
         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
new file mode 100644
index 0000000000000..7c0e542dd6705
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\Controller\Cart;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class AddTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formKeyValidator;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactory;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $request;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageManager;
+
+    /**
+     * @var \Magento\Checkout\Controller\Cart\Add|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cartAdd;
+
+    /**
+     * Init mocks for tests.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->formKeyValidator = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resultRedirectFactory =
+            $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
+                ->disableOriginalConstructor()->getMock();
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->disableOriginalConstructor()->getmock();
+        $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->cartAdd = $this->objectManagerHelper->getObject(
+            \Magento\Checkout\Controller\Cart\Add::class,
+            [
+                '_formKeyValidator' => $this->formKeyValidator,
+                'resultRedirectFactory' => $this->resultRedirectFactory,
+                '_request' => $this->request,
+                'messageManager' => $this->messageManager
+            ]
+        );
+    }
+
+    /**
+     * Test for method execute.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $redirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $path = '*/*/';
+
+        $this->formKeyValidator->expects($this->once())->method('validate')->with($this->request)->willReturn(false);
+        $this->messageManager->expects($this->once())->method('addErrorMessage');
+        $this->resultRedirectFactory->expects($this->once())->method('create')->willReturn($redirect);
+        $redirect->expects($this->once())->method('setPath')->with($path)->willReturnSelf();
+        $this->assertEquals($redirect, $this->cartAdd->execute());
+    }
+}
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 05518e3ab943b..aff19b109711d 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 b8f46feab0a48..1cf5006c20f73 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/Controller/Index/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
index 8d105f25465e4..b7ff79fc3c200 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
@@ -1,14 +1,23 @@
 <?php
 /**
- * Test for \Magento\Checkout\Controller\Index\Index
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Checkout\Test\Unit\Controller\Index;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManager;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
+use PHPUnit\Framework\MockObject\Matcher\InvokedCount as InvokedCount;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Checkout\Helper\Data;
+use Magento\Quote\Model\Quote;
+use Magento\Framework\View\Result\Page;
+use Magento\Checkout\Controller\Index\Index;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -17,108 +26,111 @@
 class IndexTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $objectManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    private $dataMock;
+    private $data;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
-    private $quoteMock;
+    private $quote;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $contextMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $sessionMock;
+    private $session;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $onepageMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $layoutMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Http|MockObject
      */
-    private $requestMock;
+    private $request;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $responseMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $redirectMock;
 
     /**
-     * @var \Magento\Checkout\Controller\Index\Index
+     * @var Index
      */
     private $model;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var Page|MockObject
      */
-    protected $resultPageMock;
+    private $resultPage;
 
     /**
      * @var \Magento\Framework\View\Page\Config
      */
-    protected $pageConfigMock;
+    private $pageConfigMock;
 
     /**
      * @var \Magento\Framework\View\Page\Title
      */
-    protected $titleMock;
+    private $titleMock;
 
     /**
      * @var \Magento\Framework\UrlInterface
      */
-    protected $url;
+    private $url;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Redirect|MockObject
      */
-    protected $resultRedirectMock;
+    private $resultRedirectMock;
 
     protected function setUp()
     {
         // mock objects
         $this->objectManager = new ObjectManager($this);
-        $this->objectManagerMock = $this->basicMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->dataMock = $this->basicMock(\Magento\Checkout\Helper\Data::class);
-        $this->quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+        $this->objectManagerMock = $this->basicMock(ObjectManagerInterface::class);
+        $this->data = $this->basicMock(Data::class);
+        $this->quote = $this->createPartialMock(
+            Quote::class,
             ['getHasError', 'hasItems', 'validateMinimumAmount', 'hasError']
         );
         $this->contextMock = $this->basicMock(\Magento\Framework\App\Action\Context::class);
-        $this->sessionMock = $this->basicMock(\Magento\Customer\Model\Session::class);
+        $this->session = $this->basicMock(Session::class);
         $this->onepageMock = $this->basicMock(\Magento\Checkout\Model\Type\Onepage::class);
         $this->layoutMock = $this->basicMock(\Magento\Framework\View\Layout::class);
-        $this->requestMock = $this->basicMock(\Magento\Framework\App\RequestInterface::class);
+        $this->request = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isSecure', 'getHeader'])
+            ->getMock();
         $this->responseMock = $this->basicMock(\Magento\Framework\App\ResponseInterface::class);
         $this->redirectMock = $this->basicMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->resultPageMock = $this->basicMock(\Magento\Framework\View\Result\Page::class);
+        $this->resultPage = $this->basicMock(Page::class);
         $this->pageConfigMock = $this->basicMock(\Magento\Framework\View\Page\Config::class);
         $this->titleMock = $this->basicMock(\Magento\Framework\View\Page\Title::class);
         $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
@@ -130,7 +142,7 @@ protected function setUp()
             ->getMock();
         $resultPageFactoryMock->expects($this->any())
             ->method('create')
-            ->willReturn($this->resultPageMock);
+            ->willReturn($this->resultPage);
 
         $resultRedirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
             ->disableOriginalConstructor()
@@ -141,21 +153,21 @@ protected function setUp()
             ->willReturn($this->resultRedirectMock);
 
         // stubs
-        $this->basicStub($this->onepageMock, 'getQuote')->willReturn($this->quoteMock);
-        $this->basicStub($this->resultPageMock, 'getLayout')->willReturn($this->layoutMock);
+        $this->basicStub($this->onepageMock, 'getQuote')->willReturn($this->quote);
+        $this->basicStub($this->resultPage, 'getLayout')->willReturn($this->layoutMock);
 
         $this->basicStub($this->layoutMock, 'getBlock')
             ->willReturn($this->basicMock(\Magento\Theme\Block\Html\Header::class));
-        $this->basicStub($this->resultPageMock, 'getConfig')->willReturn($this->pageConfigMock);
+        $this->basicStub($this->resultPage, 'getConfig')->willReturn($this->pageConfigMock);
         $this->basicStub($this->pageConfigMock, 'getTitle')->willReturn($this->titleMock);
         $this->basicStub($this->titleMock, 'set')->willReturn($this->titleMock);
 
         // objectManagerMock
         $objectManagerReturns = [
-            [\Magento\Checkout\Helper\Data::class, $this->dataMock],
+            [Data::class, $this->data],
             [\Magento\Checkout\Model\Type\Onepage::class, $this->onepageMock],
             [\Magento\Checkout\Model\Session::class, $this->basicMock(\Magento\Checkout\Model\Session::class)],
-            [\Magento\Customer\Model\Session::class, $this->basicMock(\Magento\Customer\Model\Session::class)],
+            [Session::class, $this->basicMock(Session::class)],
 
         ];
         $this->objectManagerMock->expects($this->any())
@@ -165,7 +177,7 @@ protected function setUp()
             ->willReturn($this->basicMock(\Magento\Framework\UrlInterface::class));
         // context stubs
         $this->basicStub($this->contextMock, 'getObjectManager')->willReturn($this->objectManagerMock);
-        $this->basicStub($this->contextMock, 'getRequest')->willReturn($this->requestMock);
+        $this->basicStub($this->contextMock, 'getRequest')->willReturn($this->request);
         $this->basicStub($this->contextMock, 'getResponse')->willReturn($this->responseMock);
         $this->basicStub($this->contextMock, 'getMessageManager')
             ->willReturn($this->basicMock(\Magento\Framework\Message\ManagerInterface::class));
@@ -175,33 +187,82 @@ protected function setUp()
 
         // SUT
         $this->model = $this->objectManager->getObject(
-            \Magento\Checkout\Controller\Index\Index::class,
+            Index::class,
             [
                 'context' => $this->contextMock,
-                'customerSession' => $this->sessionMock,
+                'customerSession' => $this->session,
                 'resultPageFactory' => $resultPageFactoryMock,
                 'resultRedirectFactory' => $resultRedirectFactoryMock
             ]
         );
     }
 
-    public function testRegenerateSessionIdOnExecute()
+    /**
+     * Checks a case when session should be or not regenerated during the request.
+     *
+     * @param bool $secure
+     * @param string $referer
+     * @param InvokedCount $expectedCall
+     * @dataProvider sessionRegenerationDataProvider
+     */
+    public function testRegenerateSessionIdOnExecute(bool $secure, string $referer, InvokedCount $expectedCall)
+    {
+        $this->data->method('canOnepageCheckout')
+            ->willReturn(true);
+        $this->quote->method('hasItems')
+            ->willReturn(true);
+        $this->quote->method('getHasError')
+            ->willReturn(false);
+        $this->quote->method('validateMinimumAmount')
+            ->willReturn(true);
+        $this->session->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request->method('isSecure')
+            ->willReturn($secure);
+        $this->request->method('getHeader')
+            ->with('referer')
+            ->willReturn($referer);
+
+        $this->session->expects($expectedCall)
+            ->method('regenerateId');
+        $this->assertSame($this->resultPage, $this->model->execute());
+    }
+
+    /**
+     * Gets list of variations for generating new session.
+     *
+     * @return array
+     */
+    public function sessionRegenerationDataProvider(): array
     {
-        //Stubs to control execution flow
-        $this->basicStub($this->dataMock, 'canOnepageCheckout')->willReturn(true);
-        $this->basicStub($this->quoteMock, 'hasItems')->willReturn(true);
-        $this->basicStub($this->quoteMock, 'getHasError')->willReturn(false);
-        $this->basicStub($this->quoteMock, 'validateMinimumAmount')->willReturn(true);
-        $this->basicStub($this->sessionMock, 'isLoggedIn')->willReturn(true);
-
-        //Expected outcomes
-        $this->sessionMock->expects($this->once())->method('regenerateId');
-        $this->assertSame($this->resultPageMock, $this->model->execute());
+        return [
+            [
+                'secure' => false,
+                'referer' => 'https://test.domain.com/',
+                'expectedCall' => self::once()
+            ],
+            [
+                'secure' => true,
+                'referer' => false,
+                'expectedCall' => self::once()
+            ],
+            [
+                'secure' => true,
+                'referer' => 'http://test.domain.com/',
+                'expectedCall' => self::once()
+            ],
+            // This is the only case in which session regeneration can be skipped
+            [
+                'secure' => true,
+                'referer' => 'https://test.domain.com/',
+                'expectedCall' => self::never()
+            ],
+        ];
     }
 
     public function testOnepageCheckoutNotAvailable()
     {
-        $this->basicStub($this->dataMock, 'canOnepageCheckout')->willReturn(false);
+        $this->basicStub($this->data, 'canOnepageCheckout')->willReturn(false);
         $expectedPath = 'checkout/cart';
 
         $this->resultRedirectMock->expects($this->once())
@@ -214,7 +275,7 @@ public function testOnepageCheckoutNotAvailable()
 
     public function testInvalidQuote()
     {
-        $this->basicStub($this->quoteMock, 'hasError')->willReturn(true);
+        $this->basicStub($this->quote, 'hasError')->willReturn(true);
 
         $expectedPath = 'checkout/cart';
         $this->resultRedirectMock->expects($this->once())
@@ -226,23 +287,22 @@ public function testInvalidQuote()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $mock
+     * @param MockObject $mock
      * @param string $method
      *
-     * @return \PHPUnit\Framework\MockObject_Builder_InvocationMocker
+     * @return InvocationMocker
      */
-    private function basicStub($mock, $method)
+    private function basicStub($mock, $method): InvocationMocker
     {
-        return $mock->expects($this->any())
-                ->method($method)
-                ->withAnyParameters();
+        return $mock->method($method)
+            ->withAnyParameters();
     }
 
     /**
      * @param string $className
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
-    private function basicMock($className)
+    private function basicMock(string $className): MockObject
     {
         return $this->getMockBuilder($className)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php b/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php
index 26771c1531267..1a8fecd8356bb 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php
@@ -8,6 +8,9 @@
 
 class OnepageStub extends \Magento\Checkout\Controller\Onepage
 {
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
+     */
     public function execute()
     {
         // Empty method stub for test
diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
index 8a7c2e951dd72..9a408f1ecd1c8 100644
--- a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\Checkout\Test\Unit\CustomerData;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 class DefaultItemTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Checkout\CustomerData\DefaultItem
      */
-    protected $model;
+    private $model;
 
     /**
      * @var \Magento\Catalog\Helper\Image
@@ -22,6 +24,11 @@ class DefaultItemTest extends \PHPUnit\Framework\TestCase
      */
     private $configurationPool;
 
+    /**
+     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -35,12 +42,14 @@ protected function setUp()
         $checkoutHelper = $this->getMockBuilder(\Magento\Checkout\Helper\Data::class)
             ->setMethods(['formatPrice'])->disableOriginalConstructor()->getMock();
         $checkoutHelper->expects($this->any())->method('formatPrice')->willReturn(5);
+        $this->itemResolver = $this->createMock(ItemResolverInterface::class);
         $this->model = $objectManager->getObject(
             \Magento\Checkout\CustomerData\DefaultItem::class,
             [
                 'imageHelper' => $this->imageHelper,
                 'configurationPool' => $this->configurationPool,
-                'checkoutHelper' => $checkoutHelper
+                'checkoutHelper' => $checkoutHelper,
+                'itemResolver' => $this->itemResolver,
             ]
         );
     }
@@ -73,6 +82,11 @@ public function testGetItemData()
         $this->imageHelper->expects($this->any())->method('getHeight')->willReturn(100);
         $this->configurationPool->expects($this->any())->method('getByProductType')->willReturn($product);
 
+        $this->itemResolver->expects($this->any())
+            ->method('getFinalProduct')
+            ->with($item)
+            ->will($this->returnValue($product));
+
         $itemData = $this->model->getItemData($item);
         $this->assertArrayHasKey('options', $itemData);
         $this->assertArrayHasKey('qty', $itemData);
diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
index c403156dc13e9..089ea15726c68 100644
--- a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
@@ -6,8 +6,7 @@
 
 namespace Magento\Checkout\Test\Unit\Helper;
 
-use \Magento\Checkout\Helper\Data;
-
+use Magento\Checkout\Helper\Data;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 
@@ -24,38 +23,36 @@ class DataTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Data
      */
-    private $_helper;
+    private $helper;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_transportBuilder;
+    private $transportBuilder;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_translator;
+    private $translator;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_checkoutSession;
+    private $checkoutSession;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_collectionFactory;
+    private $eventManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @inheritdoc
      */
-    protected $_eventManager;
-
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -63,191 +60,88 @@ protected function setUp()
         $arguments = $objectManagerHelper->getConstructArguments($className);
         /** @var \Magento\Framework\App\Helper\Context $context */
         $context = $arguments['context'];
-        $this->_translator = $arguments['inlineTranslation'];
-        $this->_eventManager = $context->getEventManager();
-        $this->_scopeConfig = $context->getScopeConfig();
-        $this->_scopeConfig->expects($this->any())
+        $this->translator = $arguments['inlineTranslation'];
+        $this->eventManager = $context->getEventManager();
+        $this->scopeConfig = $context->getScopeConfig();
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->will(
-                $this->returnValueMap(
+            ->willReturnMap(
+                [
+                    [
+                        'checkout/payment_failed/template',
+                        ScopeInterface::SCOPE_STORE,
+                        8,
+                        'fixture_email_template_payment_failed',
+                    ],
+                    [
+                        'checkout/payment_failed/receiver',
+                        ScopeInterface::SCOPE_STORE,
+                        8,
+                        'sysadmin',
+                    ],
+                    [
+                        'trans_email/ident_sysadmin/email',
+                        ScopeInterface::SCOPE_STORE,
+                        8,
+                        'sysadmin@example.com',
+                    ],
+                    [
+                        'trans_email/ident_sysadmin/name',
+                        ScopeInterface::SCOPE_STORE,
+                        8,
+                        'System Administrator',
+                    ],
+                    [
+                        'checkout/payment_failed/identity',
+                        ScopeInterface::SCOPE_STORE,
+                        8,
+                        'noreply@example.com',
+                    ],
+                    [
+                        'carriers/ground/title',
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        'Ground Shipping',
+                    ],
                     [
-                        [
-                            'checkout/payment_failed/template',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            8,
-                            'fixture_email_template_payment_failed'
-                        ],
-                        [
-                            'checkout/payment_failed/receiver',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            8,
-                            'sysadmin'
-                        ],
-                        [
-                            'trans_email/ident_sysadmin/email',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            8,
-                            'sysadmin@example.com'
-                        ],
-                        [
-                            'trans_email/ident_sysadmin/name',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            8,
-                            'System Administrator'
-                        ],
-                        [
-                            'checkout/payment_failed/identity',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            8,
-                            'noreply@example.com'
-                        ],
-                        [
-                            'carriers/ground/title',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            null,
-                            'Ground Shipping'
-                        ],
-                        [
-                            'payment/fixture-payment-method/title',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            null,
-                            'Check Money Order'
-                        ],
-                        [
-                            'checkout/options/onepage_checkout_enabled',
-                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                            null,
-                            'One Page Checkout'
-                        ]
-                    ]
-                )
+                        'payment/fixture-payment-method/title',
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        'Check Money Order',
+                    ],
+                    [
+                        'checkout/options/onepage_checkout_enabled',
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        'One Page Checkout',
+                    ],
+                ]
             );
 
-        $this->_checkoutSession = $arguments['checkoutSession'];
+        $this->checkoutSession = $arguments['checkoutSession'];
         $arguments['localeDate']->expects($this->any())
             ->method('formatDateTime')
             ->willReturn('Oct 02, 2013');
 
-        $this->_transportBuilder = $arguments['transportBuilder'];
+        $this->transportBuilder = $arguments['transportBuilder'];
 
         $this->priceCurrency = $arguments['priceCurrency'];
 
-        $this->_helper = $objectManagerHelper->getObject($className, $arguments);
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
      * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testSendPaymentFailedEmail()
     {
-        $shippingAddress = new \Magento\Framework\DataObject(['shipping_method' => 'ground_transportation']);
-        $billingAddress = new \Magento\Framework\DataObject(['street' => 'Fixture St']);
-
-        $this->_transportBuilder->expects(
-            $this->once()
-        )->method(
-            'setTemplateOptions'
-        )->with(
-            [
-                'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
-                'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
-            ]
-        )->will(
-            $this->returnSelf()
-        );
-
-        $this->_transportBuilder->expects(
-            $this->once()
-        )->method(
-            'setTemplateIdentifier'
-        )->with(
-            'fixture_email_template_payment_failed'
-        )->will(
-            $this->returnSelf()
-        );
+        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+            ->setMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quoteMock->expects($this->any())->method('getId')->willReturn(1);
 
-        $this->_transportBuilder->expects(
-            $this->once()
-        )->method(
-            'setFrom'
-        )->with(
-            'noreply@example.com'
-        )->will(
-            $this->returnSelf()
-        );
-
-        $this->_transportBuilder->expects(
-            $this->once()
-        )->method(
-            'addTo'
-        )->with(
-            'sysadmin@example.com',
-            'System Administrator'
-        )->will(
-            $this->returnSelf()
-        );
-
-        $this->_transportBuilder->expects(
-            $this->once()
-        )->method(
-            'setTemplateVars'
-        )->with(
-            [
-                'reason' => 'test message',
-                'checkoutType' => 'onepage',
-                'dateAndTime' => 'Oct 02, 2013',
-                'customer' => 'John Doe',
-                'customerEmail' => 'john.doe@example.com',
-                'billingAddress' => $billingAddress,
-                'shippingAddress' => $shippingAddress,
-                'shippingMethod' => 'Ground Shipping',
-                'paymentMethod' => 'Check Money Order',
-                'items' => "Product One  x 2  USD 10<br />\nProduct Two  x 3  USD 60<br />\n",
-                'total' => 'USD 70'
-            ]
-        )->will(
-            $this->returnSelf()
-        );
-
-        $this->_transportBuilder->expects($this->once())->method('addBcc')->will($this->returnSelf());
-        $this->_transportBuilder->expects(
-            $this->once()
-        )->method(
-            'getTransport'
-        )->will(
-            $this->returnValue($this->createMock(\Magento\Framework\Mail\TransportInterface::class))
-        );
-
-        $this->_translator->expects($this->at(1))->method('suspend');
-        $this->_translator->expects($this->at(1))->method('resume');
-
-        $productOne = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productOne->expects($this->once())->method('getName')->will($this->returnValue('Product One'));
-        $productOne->expects($this->once())->method('getFinalPrice')->with(2)->will($this->returnValue(10));
-
-        $productTwo = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productTwo->expects($this->once())->method('getName')->will($this->returnValue('Product Two'));
-        $productTwo->expects($this->once())->method('getFinalPrice')->with(3)->will($this->returnValue(60));
-
-        $quote = new \Magento\Framework\DataObject(
-            [
-                'store_id' => 8,
-                'store_currency_code' => 'USD',
-                'grand_total' => 70,
-                'customer_firstname' => 'John',
-                'customer_lastname' => 'Doe',
-                'customer_email' => 'john.doe@example.com',
-                'billing_address' => $billingAddress,
-                'shipping_address' => $shippingAddress,
-                'payment' => new \Magento\Framework\DataObject(['method' => 'fixture-payment-method']),
-                'all_visible_items' => [
-                    new \Magento\Framework\DataObject(['product' => $productOne, 'qty' => 2]),
-                    new \Magento\Framework\DataObject(['product' => $productTwo, 'qty' => 3])
-                ]
-            ]
-        );
-        $this->assertSame($this->_helper, $this->_helper->sendPaymentFailedEmail($quote, 'test message'));
+        $this->assertSame($this->helper, $this->helper->sendPaymentFailedEmail($quoteMock, 'test message'));
     }
 
     /**
@@ -255,14 +149,14 @@ public function testSendPaymentFailedEmail()
      */
     public function testGetCheckout()
     {
-        $this->assertEquals($this->_checkoutSession, $this->_helper->getCheckout());
+        $this->assertEquals($this->checkoutSession, $this->helper->getCheckout());
     }
 
     public function testGetQuote()
     {
         $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->_checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock));
-        $this->assertEquals($quoteMock, $this->_helper->getQuote());
+        $this->checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock));
+        $this->assertEquals($quoteMock, $this->helper->getQuote());
     }
 
     public function testFormatPrice()
@@ -270,26 +164,26 @@ public function testFormatPrice()
         $price = 5.5;
         $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
         $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['formatPrice', '__wakeup']);
-        $this->_checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock));
+        $this->checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock));
         $quoteMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
         $this->priceCurrency->expects($this->once())->method('format')->will($this->returnValue('5.5'));
-        $this->assertEquals('5.5', $this->_helper->formatPrice($price));
+        $this->assertEquals('5.5', $this->helper->formatPrice($price));
     }
 
     public function testConvertPrice()
     {
         $price = 5.5;
         $this->priceCurrency->expects($this->once())->method('convertAndFormat')->willReturn($price);
-        $this->assertEquals(5.5, $this->_helper->convertPrice($price));
+        $this->assertEquals(5.5, $this->helper->convertPrice($price));
     }
 
     public function testCanOnepageCheckout()
     {
-        $this->_scopeConfig->expects($this->once())->method('getValue')->with(
+        $this->scopeConfig->expects($this->once())->method('isSetFlag')->with(
             'checkout/options/onepage_checkout_enabled',
             'store'
         )->will($this->returnValue(true));
-        $this->assertTrue($this->_helper->canOnepageCheckout());
+        $this->assertTrue($this->helper->canOnepageCheckout());
     }
 
     public function testIsContextCheckout()
@@ -310,18 +204,18 @@ public function testIsContextCheckout()
 
     public function testIsCustomerMustBeLogged()
     {
-        $this->_scopeConfig->expects($this->once())->method('isSetFlag')->with(
+        $this->scopeConfig->expects($this->once())->method('isSetFlag')->with(
             'checkout/options/customer_must_be_logged',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will($this->returnValue(true));
-        $this->assertTrue($this->_helper->isCustomerMustBeLogged());
+        $this->assertTrue($this->helper->isCustomerMustBeLogged());
     }
 
     public function testGetPriceInclTax()
     {
         $itemMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getPriceInclTax']);
         $itemMock->expects($this->exactly(2))->method('getPriceInclTax')->will($this->returnValue(5.5));
-        $this->assertEquals(5.5, $this->_helper->getPriceInclTax($itemMock));
+        $this->assertEquals(5.5, $this->helper->getPriceInclTax($itemMock));
     }
 
     public function testGetPriceInclTaxWithoutTax()
@@ -362,7 +256,7 @@ public function testGetSubtotalInclTax()
         $expected = 5.5;
         $itemMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getRowTotalInclTax']);
         $itemMock->expects($this->exactly(2))->method('getRowTotalInclTax')->will($this->returnValue($rowTotalInclTax));
-        $this->assertEquals($expected, $this->_helper->getSubtotalInclTax($itemMock));
+        $this->assertEquals($expected, $this->helper->getSubtotalInclTax($itemMock));
     }
 
     public function testGetSubtotalInclTaxNegative()
@@ -380,7 +274,7 @@ public function testGetSubtotalInclTaxNegative()
         $itemMock->expects($this->once())
             ->method('getDiscountTaxCompensation')->will($this->returnValue($discountTaxCompensation));
         $itemMock->expects($this->once())->method('getRowTotal')->will($this->returnValue($rowTotal));
-        $this->assertEquals($expected, $this->_helper->getSubtotalInclTax($itemMock));
+        $this->assertEquals($expected, $this->helper->getSubtotalInclTax($itemMock));
     }
 
     public function testGetBasePriceInclTaxWithoutQty()
@@ -427,7 +321,7 @@ public function testGetBaseSubtotalInclTax()
         $itemMock->expects($this->once())->method('getBaseTaxAmount');
         $itemMock->expects($this->once())->method('getBaseDiscountTaxCompensation');
         $itemMock->expects($this->once())->method('getBaseRowTotal');
-        $this->_helper->getBaseSubtotalInclTax($itemMock);
+        $this->helper->getBaseSubtotalInclTax($itemMock);
     }
 
     public function testIsAllowedGuestCheckoutWithoutStore()
@@ -435,9 +329,9 @@ public function testIsAllowedGuestCheckoutWithoutStore()
         $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
         $store = null;
         $quoteMock->expects($this->once())->method('getStoreId')->will($this->returnValue(1));
-        $this->_scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->once())
             ->method('isSetFlag')
             ->will($this->returnValue(true));
-        $this->assertTrue($this->_helper->isAllowedGuestCheckout($quoteMock, $store));
+        $this->assertTrue($this->helper->isAllowedGuestCheckout($quoteMock, $store));
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/CollectQuoteTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/CollectQuoteTest.php
new file mode 100644
index 0000000000000..14410578b12e4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/CollectQuoteTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\Model\Cart;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\RegionInterface;
+use Magento\Checkout\Model\Cart\CollectQuote;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\EstimateAddressInterface;
+use Magento\Quote\Api\Data\EstimateAddressInterfaceFactory;
+use Magento\Quote\Api\ShippingMethodManagementInterface;
+use Magento\Quote\Model\Quote;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class CollectQuoteTest
+ */
+class CollectQuoteTest extends TestCase
+{
+    /**
+     * @var CollectQuote
+     */
+    private $model;
+
+    /**
+     * @var CustomerSession|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressRepositoryMock;
+
+    /**
+     * @var EstimateAddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $estimateAddressFactoryMock;
+
+    /**
+     * @var EstimateAddressInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $estimateAddressMock;
+
+    /**
+     * @var ShippingMethodManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shippingMethodManagerMock;
+
+    /**
+     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteRepositoryMock;
+
+    /**
+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteMock;
+
+    /**
+     * @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerMock;
+
+    /**
+     * @var AddressInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressMock;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->customerSessionMock = $this->createMock(CustomerSession::class);
+        $this->customerRepositoryMock = $this->getMockForAbstractClass(
+            CustomerRepositoryInterface::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getById']
+        );
+        $this->addressRepositoryMock = $this->createMock(AddressRepositoryInterface::class);
+        $this->estimateAddressMock = $this->createMock(EstimateAddressInterface::class);
+        $this->estimateAddressFactoryMock =
+            $this->createPartialMock(EstimateAddressInterfaceFactory::class, ['create']);
+        $this->shippingMethodManagerMock = $this->createMock(ShippingMethodManagementInterface::class);
+        $this->quoteRepositoryMock = $this->createMock(CartRepositoryInterface::class);
+        $this->quoteMock = $this->createMock(Quote::class);
+        $this->customerMock = $this->createMock(CustomerInterface::class);
+        $this->addressMock = $this->createMock(AddressInterface::class);
+
+        $this->model = new CollectQuote(
+            $this->customerSessionMock,
+            $this->customerRepositoryMock,
+            $this->addressRepositoryMock,
+            $this->estimateAddressFactoryMock,
+            $this->shippingMethodManagerMock,
+            $this->quoteRepositoryMock
+        );
+    }
+
+    /**
+     * Test collect method
+     */
+    public function testCollect()
+    {
+        $customerId = 1;
+        $defaultAddressId = 999;
+        $countryId = 'USA';
+        $regionId = 'CA';
+        $regionMock = $this->createMock(RegionInterface::class);
+
+        $this->customerSessionMock->expects(self::once())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->customerSessionMock->expects(self::once())
+            ->method('getCustomerId')
+            ->willReturn($customerId);
+        $this->customerRepositoryMock->expects(self::once())
+            ->method('getById')
+            ->willReturn($this->customerMock);
+        $this->customerMock->expects(self::once())
+            ->method('getDefaultShipping')
+            ->willReturn($defaultAddressId);
+        $this->addressMock->expects(self::once())
+            ->method('getCountryId')
+            ->willReturn($countryId);
+        $regionMock->expects(self::once())
+            ->method('getRegion')
+            ->willReturn($regionId);
+        $this->addressMock->expects(self::once())
+            ->method('getRegion')
+            ->willReturn($regionMock);
+        $this->addressRepositoryMock->expects(self::once())
+            ->method('getById')
+            ->with($defaultAddressId)
+            ->willReturn($this->addressMock);
+        $this->estimateAddressFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($this->estimateAddressMock);
+        $this->quoteRepositoryMock->expects(self::once())
+            ->method('save')
+            ->with($this->quoteMock);
+
+        $this->model->collect($this->quoteMock);
+    }
+
+    /**
+     * Test with a not logged in customer
+     */
+    public function testCollectWhenCustomerIsNotLoggedIn()
+    {
+        $this->customerSessionMock->expects(self::once())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $this->customerRepositoryMock->expects(self::never())
+            ->method('getById');
+
+        $this->model->collect($this->quoteMock);
+    }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
index 5330d93b46f6a..993a01d922c1c 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
@@ -11,25 +11,34 @@ class ImageProviderTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Checkout\Model\Cart\ImageProvider
      */
-    public $model;
+    private $model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Quote\Api\CartItemRepositoryInterface
      */
-    protected $itemRepositoryMock;
+    private $itemRepositoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\CustomerData\ItemPoolInterface
      */
-    protected $itemPoolMock;
+    private $itemPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\CustomerData\DefaultItem
+     */
+    private $customerItem;
 
     protected function setUp()
     {
         $this->itemRepositoryMock = $this->createMock(\Magento\Quote\Api\CartItemRepositoryInterface::class);
         $this->itemPoolMock = $this->createMock(\Magento\Checkout\CustomerData\ItemPoolInterface::class);
+        $this->customerItem = $this->getMockBuilder(\Magento\Checkout\CustomerData\DefaultItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = new \Magento\Checkout\Model\Cart\ImageProvider(
             $this->itemRepositoryMock,
-            $this->itemPoolMock
+            $this->itemPoolMock,
+            $this->customerItem
         );
     }
 
@@ -44,7 +53,7 @@ public function testGetImages()
         $expectedResult = [$itemId => $itemData['product_image']];
 
         $this->itemRepositoryMock->expects($this->once())->method('getList')->with($cartId)->willReturn([$itemMock]);
-        $this->itemPoolMock->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
+        $this->customerItem->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
 
         $this->assertEquals($expectedResult, $this->model->getImages($cartId));
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
new file mode 100644
index 0000000000000..daabb080b1c9a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\Model\Cart;
+
+use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
+use Magento\Framework\Locale\ResolverInterface;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class RequestQuantityProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResolverInterface | MockObject
+     */
+    private $localeResolver;
+
+    /**
+     * @var RequestQuantityProcessor
+     */
+    private $requestProcessor;
+
+    protected function setUp()
+    {
+        $this->localeResolver = $this->getMockBuilder(ResolverInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->localeResolver->method('getLocale')
+            ->willReturn('en_US');
+
+        $this->requestProcessor = new RequestQuantityProcessor(
+            $this->localeResolver
+        );
+    }
+
+    /**
+     * Test of cart data processing.
+     *
+     * @param array $cartData
+     * @param array $expected
+     * @dataProvider cartDataProvider
+     */
+    public function testProcess($cartData, $expected)
+    {
+        $this->assertEquals($this->requestProcessor->process($cartData), $expected);
+    }
+
+    public function cartDataProvider()
+    {
+        return [
+            'empty_array' => [
+                'cartData' => [],
+                'expected' => [],
+            ],
+            'strings_array' => [
+                'cartData' => [
+                    ['qty' => ' 10 '],
+                    ['qty' => ' 0.5 ']
+                ],
+                'expected' => [
+                    ['qty' => 10],
+                    ['qty' => 0.5]
+                ],
+            ],
+            'integer_array' => [
+                'cartData' => [
+                    ['qty' => 1],
+                    ['qty' => 0.002]
+                ],
+                'expected' => [
+                    ['qty' => 1],
+                    ['qty' => 0.002]
+                ],
+            ],
+            'array_of arrays' => [
+                'cartData' => [
+                    ['qty' => [1, 2 ,3]],
+                ],
+                'expected' => [
+                    ['qty' => [1, 2, 3]],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
index 40de71e28c05e..bc66324c2986d 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
@@ -279,6 +279,9 @@ public function testGetSummaryQty($useQty)
         $this->assertEquals($itemsCount, $this->cart->getSummaryQty());
     }
 
+    /**
+     * @return array
+     */
     public function useQtyDataProvider()
     {
         return [
@@ -315,6 +318,12 @@ public function testAddProduct($productInfo, $requestInfo)
         $this->productRepository->expects($this->any())
             ->method('getById')
             ->will($this->returnValue($product));
+
+        $this->eventManagerMock->expects($this->at(0))->method('dispatch')->with(
+            'checkout_cart_product_add_before',
+            ['info' => $requestInfo, 'product' => $product]
+        );
+
         $this->quoteMock->expects($this->once())
         ->method('addProduct')
         ->will($this->returnValue(1));
@@ -322,7 +331,7 @@ public function testAddProduct($productInfo, $requestInfo)
             ->method('getQuote')
             ->will($this->returnValue($this->quoteMock));
 
-        $this->eventManagerMock->expects($this->at(0))->method('dispatch')->with(
+        $this->eventManagerMock->expects($this->at(1))->method('dispatch')->with(
             'checkout_cart_product_add_after',
             ['quote_item' => 1, 'product' => $product]
         );
@@ -360,6 +369,12 @@ public function testAddProductException()
         $this->productRepository->expects($this->any())
             ->method('getById')
             ->will($this->returnValue($product));
+
+        $this->eventManagerMock->expects($this->once())->method('dispatch')->with(
+            'checkout_cart_product_add_before',
+            ['info' => 4, 'product' => $product]
+        );
+
         $this->quoteMock->expects($this->once())
             ->method('addProduct')
             ->will($this->returnValue('error'));
@@ -367,10 +382,6 @@ public function testAddProductException()
             ->method('getQuote')
             ->will($this->returnValue($this->quoteMock));
 
-        $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
-            'checkout_cart_product_add_after',
-            ['quote_item' => 1, 'product' => $product]
-        );
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $this->cart->addProduct(4, 4);
     }
@@ -396,6 +407,11 @@ public function testAddProductExceptionBadParams()
             ->method('getById')
             ->will($this->returnValue($product));
 
+        $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
+            'checkout_cart_product_add_before',
+            ['info' => 'bad', 'product' => $product]
+        );
+
         $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
             'checkout_cart_product_add_after',
             ['quote_item' => 1, 'product' => $product]
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index a33649551bdcb..853ae0157e64a 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -3,8 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Checkout\Test\Unit\Model;
 
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\QuoteIdMask;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -45,6 +53,11 @@ class GuestPaymentInformationManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $loggerMock;
 
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -62,6 +75,10 @@ protected function setUp()
             ['create']
         );
         $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = $objectManager->getObject(
             \Magento\Checkout\Model\GuestPaymentInformationManagement::class,
             [
@@ -69,7 +86,8 @@ protected function setUp()
                 'paymentMethodManagement' => $this->paymentMethodManagementMock,
                 'cartManagement' => $this->cartManagementMock,
                 'cartRepository' => $this->cartRepositoryMock,
-                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock
+                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
+                'connectionPool' => $this->resourceConnectionMock,
             ]
         );
         $objectManager->setBackwardCompatibleProperty($this->model, 'logger', $this->loggerMock);
@@ -82,12 +100,30 @@ public function testSavePaymentInformationAndPlaceOrder()
         $email = 'email@magento.com';
         $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
         $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
 
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
-        $this->billingAddressManagementMock->expects($this->once())
-            ->method('assign')
-            ->with($cartId, $billingAddressMock);
+        $adapterMockForSales = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $adapterMockForCheckout = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getConnection')
+            ->with('sales')
+            ->willReturn($adapterMockForSales);
+        $adapterMockForSales->expects($this->once())->method('beginTransaction');
+        $adapterMockForSales->expects($this->once())->method('commit');
+
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getConnection')
+            ->with('checkout')
+            ->willReturn($adapterMockForCheckout);
+        $adapterMockForCheckout->expects($this->once())->method('beginTransaction');
+        $adapterMockForCheckout->expects($this->once())->method('commit');
         $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
         $this->cartManagementMock->expects($this->once())->method('placeOrder')->with($cartId)->willReturn($orderId);
 
@@ -98,7 +134,6 @@ public function testSavePaymentInformationAndPlaceOrder()
     }
 
     /**
-     * @expectedExceptionMessage An error occurred on the server. Please try to place the order again.
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      */
     public function testSavePaymentInformationAndPlaceOrderException()
@@ -108,16 +143,39 @@ public function testSavePaymentInformationAndPlaceOrderException()
         $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
         $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
 
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
-        $this->billingAddressManagementMock->expects($this->once())
-            ->method('assign')
-            ->with($cartId, $billingAddressMock);
+        $adapterMockForSales = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $adapterMockForCheckout = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getConnection')
+            ->with('sales')
+            ->willReturn($adapterMockForSales);
+        $adapterMockForSales->expects($this->once())->method('beginTransaction');
+        $adapterMockForSales->expects($this->once())->method('rollback');
+
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getConnection')
+            ->with('checkout')
+            ->willReturn($adapterMockForCheckout);
+        $adapterMockForCheckout->expects($this->once())->method('beginTransaction');
+        $adapterMockForCheckout->expects($this->once())->method('rollback');
+
         $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-        $exception = new \Exception(__('DB exception'));
+        $exception = new \Magento\Framework\Exception\CouldNotSaveException(__('DB exception'));
         $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
 
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
+
+        $this->expectExceptionMessage(
+            'A server error stopped your order from being placed. Please try to place your order again.'
+        );
     }
 
     public function testSavePaymentInformation()
@@ -126,11 +184,9 @@ public function testSavePaymentInformation()
         $email = 'email@magento.com';
         $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
         $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
-        $this->billingAddressManagementMock->expects($this->once())
-            ->method('assign')
-            ->with($cartId, $billingAddressMock);
         $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
 
         $this->assertTrue($this->model->savePaymentInformation($cartId, $email, $paymentMock, $billingAddressMock));
@@ -142,13 +198,13 @@ public function testSavePaymentInformationWithoutBillingAddress()
         $email = 'email@magento.com';
         $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
         $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
 
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
         $this->billingAddressManagementMock->expects($this->never())->method('assign');
         $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-        $quoteIdMaskMock = $this->createPartialMock(\Magento\Quote\Model\QuoteIdMask::class, ['getQuoteId', 'load']);
+        $quoteIdMaskMock = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']);
         $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($quoteIdMaskMock);
         $quoteIdMaskMock->expects($this->once())->method('load')->with($cartId, 'masked_id')->willReturnSelf();
         $quoteIdMaskMock->expects($this->once())->method('getQuoteId')->willReturn($cartId);
@@ -162,18 +218,45 @@ public function testSavePaymentInformationWithoutBillingAddress()
      * @expectedExceptionMessage DB exception
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      */
-    public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
+    public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
     {
         $cartId = 100;
         $email = 'email@magento.com';
         $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
         $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
 
+        $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
+
+        $quoteIdMask = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']);
+        $this->quoteIdMaskFactoryMock->method('create')->willReturn($quoteIdMask);
+        $quoteIdMask->method('load')->with($cartId, 'masked_id')->willReturnSelf();
+        $quoteIdMask->method('getQuoteId')->willReturn($cartId);
+
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
-        $this->billingAddressManagementMock->expects($this->once())
-            ->method('assign')
-            ->with($cartId, $billingAddressMock);
+        $adapterMockForSales = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $adapterMockForCheckout = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getConnection')
+            ->with('sales')
+            ->willReturn($adapterMockForSales);
+        $adapterMockForSales->expects($this->once())->method('beginTransaction');
+        $adapterMockForSales->expects($this->once())->method('rollback');
+
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getConnection')
+            ->with('checkout')
+            ->willReturn($adapterMockForCheckout);
+        $adapterMockForCheckout->expects($this->once())->method('beginTransaction');
+        $adapterMockForCheckout->expects($this->once())->method('rollback');
+
         $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
         $phrase = new \Magento\Framework\Phrase(__('DB exception'));
         $exception = new \Magento\Framework\Exception\LocalizedException($phrase);
@@ -182,4 +265,57 @@ public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
 
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
     }
+
+    /**
+     * @param int $cartId
+     * @param \PHPUnit_Framework_MockObject_MockObject $billingAddressMock
+     * @return void
+     */
+    private function getMockForAssignBillingAddress(
+        int $cartId,
+        \PHPUnit_Framework_MockObject_MockObject  $billingAddressMock
+    ) : void {
+        $quoteIdMask = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']);
+        $this->quoteIdMaskFactoryMock->method('create')
+            ->willReturn($quoteIdMask);
+        $quoteIdMask->method('load')
+            ->with($cartId, 'masked_id')
+            ->willReturnSelf();
+        $quoteIdMask->method('getQuoteId')
+            ->willReturn($cartId);
+
+        $billingAddressId = 1;
+        $quote = $this->createMock(Quote::class);
+        $quoteBillingAddress = $this->createMock(Address::class);
+        $quoteShippingAddress = $this->createPartialMock(
+            Address::class,
+            ['setLimitCarrier', 'getShippingMethod']
+        );
+        $this->cartRepositoryMock->method('getActive')
+            ->with($cartId)
+            ->willReturn($quote);
+        $quote->expects($this->once())
+            ->method('getBillingAddress')
+            ->willReturn($quoteBillingAddress);
+        $quote->expects($this->once())
+            ->method('getShippingAddress')
+            ->willReturn($quoteShippingAddress);
+        $quoteBillingAddress->expects($this->once())
+            ->method('getId')
+            ->willReturn($billingAddressId);
+        $quote->expects($this->once())
+            ->method('removeAddress')
+            ->with($billingAddressId);
+        $quote->expects($this->once())
+            ->method('setBillingAddress')
+            ->with($billingAddressMock);
+        $quote->expects($this->once())
+            ->method('setDataChanges')
+            ->willReturnSelf();
+        $quoteShippingAddress->method('getShippingMethod')
+            ->willReturn('flatrate_flatrate');
+        $quoteShippingAddress->expects($this->once())
+            ->method('setLimitCarrier')
+            ->with('flatrate');
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
index b40b2b244ac4c..ea841e86586ba 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Test\Unit\Model;
 
 /**
@@ -83,7 +84,6 @@ public function testSavePaymentInformationAndPlaceOrder()
     }
 
     /**
-     * @expectedExceptionMessage An error occurred on the server. Please try to place the order again.
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      */
     public function testSavePaymentInformationAndPlaceOrderException()
@@ -99,6 +99,10 @@ public function testSavePaymentInformationAndPlaceOrderException()
         $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
 
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
+
+        $this->expectExceptionMessage(
+            'A server error stopped your order from being placed. Please try to place your order again.'
+        );
     }
 
     public function testSavePaymentInformationAndPlaceOrderIfBillingAddressNotExist()
@@ -168,9 +172,11 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
         $billingAddressId = 1;
         $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
         $quoteBillingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $shippingRate = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Rate::class, []);
+        $shippingRate->setCarrier('flatrate');
         $quoteShippingAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
-            ['setLimitCarrier', 'getShippingMethod']
+            ['setLimitCarrier', 'getShippingMethod', 'getShippingRateByCode']
         );
         $this->cartRepositoryMock->expects($this->any())->method('getActive')->with($cartId)->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($quoteBillingAddress);
@@ -179,6 +185,7 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
         $quoteMock->expects($this->once())->method('removeAddress')->with($billingAddressId);
         $quoteMock->expects($this->once())->method('setBillingAddress')->with($billingAddressMock);
         $quoteMock->expects($this->once())->method('setDataChanges')->willReturnSelf();
+        $quoteShippingAddress->expects($this->any())->method('getShippingRateByCode')->willReturn($shippingRate);
         $quoteShippingAddress->expects($this->any())->method('getShippingMethod')->willReturn('flatrate_flatrate');
         $quoteShippingAddress->expects($this->once())->method('setLimitCarrier')->with('flatrate')->willReturnSelf();
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Session/SuccessValidatorTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Session/SuccessValidatorTest.php
index fec1d6d4d003f..ced6faa00fabe 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Session/SuccessValidatorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Session/SuccessValidatorTest.php
@@ -90,6 +90,10 @@ public function testIsValidTrue()
         $this->assertTrue($this->createSuccessValidator($checkoutSession)->isValid($checkoutSession));
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $checkoutSession
+     * @return object
+     */
     protected function createSuccessValidator(\PHPUnit_Framework_MockObject_MockObject $checkoutSession)
     {
         return $this->objectManagerHelper->getObject(
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
index 5c6314b2a35c8..dd88b7161acdf 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Test\Unit\Model;
 
 /**
@@ -157,7 +158,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Shipping method is not applicable for empty cart
+     * @expectedExceptionMessage The shipping method can't be set for an empty cart. Add an item to cart and try again.
      */
     public function testSaveAddressInformationIfCartIsEmpty()
     {
@@ -238,7 +239,7 @@ private function setShippingAssignmentsMocks($shippingMethod)
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Shipping address is not set
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSaveAddressInformationIfShippingAddressNotSet()
     {
@@ -263,7 +264,7 @@ public function testSaveAddressInformationIfShippingAddressNotSet()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Unable to save shipping information. Please check input data.
+     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
      */
     public function testSaveAddressInformationIfCanNotSaveQuote()
     {
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
index 29537e8ec0526..ff7340f87f32e 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Test\Unit\Model;
 
 use Magento\Checkout\Model\Sidebar;
@@ -45,6 +46,9 @@ public function testGetResponseData($error, $result)
         $this->assertEquals($result, $this->sidebar->getResponseData($error));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetResponseData()
     {
         return [
@@ -94,7 +98,7 @@ public function testCheckQuoteItem()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @exceptedExceptionMessage We can't find the quote item.
+     * @expectedExceptionMessage The quote item isn't found. Verify the item and try again.
      */
     public function testCheckQuoteItemWithException()
     {
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
index 48b6a535ae9c1..eb6a5623d9df9 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
@@ -271,6 +271,9 @@ public function testInitCheckout($stepData, $isLoggedIn, $isSetStepDataCalled)
         $this->onepage->initCheckout();
     }
 
+    /**
+     * @return array
+     */
     public function initCheckoutDataProvider()
     {
         return [
@@ -303,6 +306,9 @@ public function testGetCheckoutMethod($isLoggedIn, $quoteCheckoutMethod, $isAllo
         $this->assertEquals($expected, $this->onepage->getCheckoutMethod());
     }
 
+    /**
+     * @return array
+     */
     public function getCheckoutMethodDataProvider()
     {
         return [
diff --git a/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php b/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php
index ab207d0a67ec2..875bcda157ab3 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/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php b/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
index 6070bb5d424c1..dabaf173d90b3 100644
--- a/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
@@ -30,13 +30,14 @@ protected function setUp()
 
     public function testSalesQuoteSaveAfter()
     {
+        $quoteId = 7;
         $observer = $this->createMock(\Magento\Framework\Event\Observer::class);
         $observer->expects($this->once())->method('getEvent')->will(
             $this->returnValue(new \Magento\Framework\DataObject(
-                ['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => 7])]
+                ['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => $quoteId])]
             ))
         );
-        $this->checkoutSession->expects($this->once())->method('getQuoteId')->with(7);
+        $this->checkoutSession->expects($this->once())->method('setQuoteId')->with($quoteId);
 
         $this->object->execute($observer);
     }
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 1fad0ab9986ea..540565345bd9b 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -5,32 +5,30 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-msrp": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-sales-rule": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-msrp": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.3.*"
+        "magento/module-cookie": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Checkout/etc/adminhtml/routes.xml b/app/code/Magento/Checkout/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..e537861059870
--- /dev/null
+++ b/app/code/Magento/Checkout/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="checkout" frontName="checkout">
+            <module name="Magento_Checkout" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 6947e1162600a..11e3ba5f3ed9a 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -41,6 +41,10 @@
                 <field id="number_items_to_display_pager" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of Items to Display Pager</label>
                 </field>
+                <field id="crosssell_enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Show Cross-sell Items in the Shopping Cart</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>My Cart Link</label>
diff --git a/app/code/Magento/Checkout/etc/config.xml b/app/code/Magento/Checkout/etc/config.xml
index 3c24c38ecf85b..e1ba4381f2230 100644
--- a/app/code/Magento/Checkout/etc/config.xml
+++ b/app/code/Magento/Checkout/etc/config.xml
@@ -17,6 +17,7 @@
                 <delete_quote_after>30</delete_quote_after>
                 <redirect_to_cart>0</redirect_to_cart>
                 <number_items_to_display_pager>20</number_items_to_display_pager>
+                <crosssell_enabled>1</crosssell_enabled>
             </cart>
             <cart_link>
                 <use_qty>1</use_qty>
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 4ebd594a28562..71dfd12bb4779 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,4 +49,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 889689e6c0d16..d80f88786c87b 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -39,7 +39,7 @@
     </type>
     <preference for="Magento\Checkout\CustomerData\ItemPoolInterface"
                 type="Magento\Checkout\CustomerData\ItemPool"/>
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
+    <type name="Magento\Checkout\CustomerData\ItemPool">
         <arguments>
             <argument name="defaultItemId" xsi:type="string">Magento\Checkout\CustomerData\DefaultItem</argument>
         </arguments>
@@ -83,4 +83,16 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
+        <arguments>
+            <argument name="configurationsMap" xsi:type="array">
+                <item name="addCartSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Checkout::messages/addCartSuccessMessage.phtml</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/module.xml b/app/code/Magento/Checkout/etc/module.xml
index 219ca87337fc9..153de5ef2a790 100644
--- a/app/code/Magento/Checkout/etc/module.xml
+++ b/app/code/Magento/Checkout/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Checkout" setup_version="2.0.0">
+    <module name="Magento_Checkout" >
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>
diff --git a/app/code/Magento/Checkout/etc/webapi.xml b/app/code/Magento/Checkout/etc/webapi.xml
index 7b435db200f19..26c601a4e9f38 100644
--- a/app/code/Magento/Checkout/etc/webapi.xml
+++ b/app/code/Magento/Checkout/etc/webapi.xml
@@ -104,7 +104,7 @@
             <resource ref="anonymous" />
         </resources>
     </route>
-    <!-- Managing My shipping information -->
+    <!-- Managing My payment information -->
     <route url="/V1/carts/mine/set-payment-information" method="POST">
         <service class="Magento\Checkout\Api\PaymentInformationManagementInterface" method="savePaymentInformation"/>
         <resources>
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 69ec68a2cd579..7f2f0b4390321 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -176,3 +176,10 @@ Payment,Payment
 "Not yet calculated","Not yet calculated"
 "We received your order!","We received your order!"
 "Thank you for your purchase!","Thank you for your purchase!"
+"Password", "Password"
+"Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again."
+"Item in Cart","Item in Cart"
+"Items in Cart","Items in Cart"
+"Close","Close"
+"Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
+"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
index fb55f9b601dc9..03ad7d9e8d848 100644
--- a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
+++ b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
@@ -23,43 +23,43 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
 
 <ul>
     <li>
-        <b>{{trans "Reason"}}</b><br />
+        <strong>{{trans "Reason"}}</strong><br />
         {{var reason}}
     </li>
     <li>
-        <b>{{trans "Checkout Type"}}</b><br />
+        <strong>{{trans "Checkout Type"}}</strong><br />
         {{var checkoutType}}
     </li>
     <li>
-        <b>{{trans "Customer:"}}</b><br />
+        <strong>{{trans "Customer:"}}</strong><br />
         <a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
     </li>
     <li>
-        <b>{{trans "Items"}}</b><br />
+        <strong>{{trans "Items"}}</strong><br />
         {{var items|raw}}
     </li>
     <li>
-        <b>{{trans "Total:"}}</b><br />
+        <strong>{{trans "Total:"}}</strong><br />
         {{var total}}
     </li>
     <li>
-        <b>{{trans "Billing Address:"}}</b><br />
+        <strong>{{trans "Billing Address:"}}</strong><br />
         {{var billingAddress.format('html')|raw}}
     </li>
     <li>
-        <b>{{trans "Shipping Address:"}}</b><br />
+        <strong>{{trans "Shipping Address:"}}</strong><br />
         {{var shippingAddress.format('html')|raw}}
     </li>
     <li>
-        <b>{{trans "Shipping Method:"}}</b><br />
+        <strong>{{trans "Shipping Method:"}}</strong><br />
         {{var shippingMethod}}
     </li>
     <li>
-        <b>{{trans "Payment Method:"}}</b><br />
+        <strong>{{trans "Payment Method:"}}</strong><br />
         {{var paymentMethod}}
     </li>
     <li>
-        <b>{{trans "Date & Time:"}}</b><br />
+        <strong>{{trans "Date & Time:"}}</strong><br />
         {{var dateAndTime}}
     </li>
 </ul>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
index 01c687df4b775..69d2523d88dfb 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
@@ -145,21 +145,21 @@
                                                         <!-- sort order for this totals is configured on admin panel-->
                                                         <!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
                                                         <item name="subtotal" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
+                                                            <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="title" xsi:type="string" translate="true">Subtotal</item>
                                                                 <item name="template" xsi:type="string">Magento_Checkout/cart/totals/subtotal</item>
                                                             </item>
                                                         </item>
                                                         <item name="shipping" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Checkout/js/view/cart/totals/shipping</item>
+                                                            <item name="component" xsi:type="string">Magento_Checkout/js/view/cart/totals/shipping</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="title" xsi:type="string" translate="true">Shipping</item>
                                                                 <item name="template" xsi:type="string">Magento_Checkout/cart/totals/shipping</item>
                                                             </item>
                                                         </item>
                                                         <item name="grand-total" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
+                                                            <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="title" xsi:type="string" translate="true">Order Total</item>
                                                                 <item name="template" xsi:type="string">Magento_Checkout/cart/totals/grand-total</item>
@@ -186,7 +186,7 @@
                         </block>
                         <container name="checkout.cart.widget" as="checkout_cart_widget" label="Shopping Cart Items After"/>
                     </container>
-                    <block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" template="Magento_Catalog::product/list/items.phtml" after="-">
+                    <block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" template="Magento_Catalog::product/list/items.phtml" after="-" ifconfig="checkout/cart/crosssell_enabled">
                         <arguments>
                             <argument name="type" xsi:type="string">crosssell</argument>
                         </arguments>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index 6c562f0b9027b..64b70e80bd84f 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -364,20 +364,20 @@
                                                             <!-- sort order for this totals is configured on admin panel-->
                                                             <!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
                                                             <item name="subtotal" xsi:type="array">
-                                                                <item name="component"  xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
+                                                                <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
                                                                 <item name="config" xsi:type="array">
                                                                     <item name="title" xsi:type="string" translate="true">Cart Subtotal</item>
                                                                 </item>
                                                             </item>
                                                             <item name="shipping" xsi:type="array">
-                                                                <item name="component"  xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
+                                                                <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
                                                                 <item name="config" xsi:type="array">
                                                                     <item name="title" xsi:type="string" translate="true">Shipping</item>
                                                                     <item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
                                                                 </item>
                                                             </item>
                                                             <item name="grand-total" xsi:type="array">
-                                                                <item name="component"  xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
+                                                                <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
                                                                 <item name="config" xsi:type="array">
                                                                     <item name="title" xsi:type="string" translate="true">Order Total</item>
                                                                 </item>
@@ -404,6 +404,10 @@
                                                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/subtotal</item>
                                                                         <item name="displayArea" xsi:type="string">after_details</item>
                                                                     </item>
+                                                                    <item name="message" xsi:type="array">
+                                                                        <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/message</item>
+                                                                        <item name="displayArea" xsi:type="string">item_message</item>
+                                                                    </item>
                                                                 </item>
                                                             </item>
                                                         </item>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index b224c96f07e9b..1d67b325e01c5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -24,7 +24,7 @@
                 <div class="field">
                     <label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
                     <div class="control">
-                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" />
+                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" <?php if (strlen($block->getCouponCode())): ?> disabled="disabled" <?php endif; ?> />
                     </div>
                 </div>
                 <div class="actions-toolbar">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 4940cd7f26747..1005c11e44d95 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -13,7 +13,9 @@
 <form action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/updatePost') ?>"
           method="post"
           id="form-validate"
-          data-mage-init='{"validation":{}}'
+          data-mage-init='{"Magento_Checkout/js/action/update-shopping-cart":
+              {"validationURL" : "/checkout/cart/updateItemQty"}
+          }'
           class="form form-cart">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
@@ -22,9 +24,9 @@
         <?php endif ?>
         <table id="shopping-cart-table"
                class="cart items data table"
-               data-mage-init='{"shoppingCart":{"emptyCartButton": "action.clear",
+               data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
                "updateCartActionContainer": "#update_cart_action_container"}}'>
-            <caption role="heading" aria-level="2" class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
             <thead>
                 <tr>
                     <th class="col item" scope="col"><span><?= /* @escapeNotVerified */ __('Item') ?></span></th>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index b41d548e95b99..c1db2f7775ca8 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -23,7 +23,7 @@
                            value=""
                            title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                            class="input-text qty"
-                           data-validate="{'required-number':true,digits:true}"/>
+                           data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"/>
                 </div>
             </div>
             <?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 02c969f849074..c96df9cdd3195 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -90,7 +90,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                 <div class="control qty">
                     <input id="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty"
                            name="cart[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
-                           data-cart-item-id="<?= /* @escapeNotVerified */ $_item->getSku() ?>"
+                           data-cart-item-id="<?= $block->escapeHtml($_item->getSku()) ?>"
                            value="<?= /* @escapeNotVerified */ $block->getQty() ?>"
                            type="number"
                            size="4"
@@ -111,7 +111,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
         </td>
     </tr>
     <tr class="item-actions">
-        <td colspan="100">
+        <td colspan="4">
             <div class="actions-toolbar">
                 <?= /* @escapeNotVerified */ $block->getActions($_item) ?>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
index 1876cf2edb786..da0a83f05ef60 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
@@ -12,8 +12,6 @@
     <a class="action action-edit"
        href="<?= /* @escapeNotVerified */ $block->getConfigureUrl() ?>"
        title="<?= $block->escapeHtml(__('Edit item parameters')) ?>">
-        <span>
-            <?= /* @escapeNotVerified */ __('Edit') ?>
-        </span>
-   </a>
+        <span><?= /* @escapeNotVerified */ __('Edit') ?></span>
+    </a>
 <?php endif ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
index 5530f7661bb1b..d329e2e8c1770 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
@@ -14,7 +14,8 @@
 <?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
 <ul class="checkout methods items checkout-methods-items">
 <?php foreach ($methods as $method): ?>
-    <?php if ($methodHtml = $block->getMethodHtml($method)): ?>
+    <?php $methodHtml = $block->getMethodHtml($method); ?>
+    <?php if (trim($methodHtml) !== ''): ?>
     <li class="item"><?= /* @escapeNotVerified */ $methodHtml ?></li>
     <?php endif; ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index af652e6f556b9..20be9cd010c64 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -25,7 +25,7 @@
         </span>
     </a>
     <?php if ($block->getIsNeedToDisplaySideBar()): ?>
-        <div class="block block-minicart empty"
+        <div class="block block-minicart"
              data-role="dropdownDialog"
              data-mage-init='{"dropdownDialog":{
                 "appendTo":"[data-block=minicart]",
@@ -41,6 +41,14 @@
             </div>
             <?= $block->getChildHtml('minicart.addons') ?>
         </div>
+    <?php else: ?>
+        <script>
+            require(['jquery'], function ($) {
+                $('a.action.showcart').click(function() {
+                    $(document.body).trigger('processStart');
+                });
+            });
+        </script>
     <?php endif ?>
     <script>
         window.checkout = <?= /* @escapeNotVerified */ $block->getSerializedConfig() ?>;
diff --git a/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
new file mode 100644
index 0000000000000..e835037b5fcb4
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+
+<?= $block->escapeHtml(__(
+    'You added %1 to your <a href="%2">shopping cart</a>.',
+    $block->getData('product_name'),
+    $block->getData('cart_url')
+), ['a']);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
new file mode 100644
index 0000000000000..ce1527b3d72d6
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
@@ -0,0 +1,127 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/modal/alert',
+    'jquery',
+    'jquery/ui',
+    'mage/validation'
+], function (alert, $) {
+    'use strict';
+
+    $.widget('mage.updateShoppingCart', {
+        options: {
+            validationURL: '',
+            eventName: 'updateCartItemQty'
+        },
+
+        /** @inheritdoc */
+        _create: function () {
+            this._on(this.element, {
+                'submit': this.onSubmit
+            });
+        },
+
+        /**
+         * Prevents default submit action and calls form validator.
+         *
+         * @param {Event} event
+         * @return {Boolean}
+         */
+        onSubmit: function (event) {
+            if (!this.options.validationURL) {
+                return true;
+            }
+
+            if (this.isValid()) {
+                event.preventDefault();
+                this.validateItems(this.options.validationURL, this.element.serialize());
+            }
+
+            return false;
+        },
+
+        /**
+         * Validates requested form.
+         *
+         * @return {Boolean}
+         */
+        isValid: function () {
+            return this.element.validation() && this.element.validation('isValid');
+        },
+
+        /**
+         * Validates updated shopping cart data.
+         *
+         * @param {String} url - request url
+         * @param {Object} data - post data for ajax call
+         */
+        validateItems: function (url, data) {
+            $.extend(data, {
+                'form_key': $.mage.cookies.get('form_key')
+            });
+
+            $.ajax({
+                url: url,
+                data: data,
+                type: 'post',
+                dataType: 'json',
+                context: this,
+
+                /** @inheritdoc */
+                beforeSend: function () {
+                    $(document.body).trigger('processStart');
+                },
+
+                /** @inheritdoc */
+                complete: function () {
+                    $(document.body).trigger('processStop');
+                }
+            })
+            .done(function (response) {
+                if (response.success) {
+                    this.onSuccess();
+                } else {
+                    this.onError(response);
+                }
+            })
+            .fail(function () {
+                this.submitForm();
+            });
+        },
+
+        /**
+         * Form validation succeed.
+         */
+        onSuccess: function () {
+            $(document).trigger('ajax:' + this.options.eventName);
+            this.submitForm();
+        },
+
+        /**
+         * Form validation failed.
+         */
+        onError: function (response) {
+            if (response['error_message']) {
+                alert({
+                    content: response['error_message']
+                });
+            } else {
+                this.submitForm();
+            }
+        },
+
+        /**
+         * Real submit of validated form.
+         */
+        submitForm: function () {
+            this.element
+                .off('submit', this.onSubmit)
+                .submit();
+        }
+    });
+
+    return $.mage.updateShoppingCart;
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
index 6e689091d091f..9b20a782c38d9 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -58,6 +58,16 @@ define([
             }
             delete addressData['region_id'];
 
+            if (addressData['custom_attributes']) {
+                addressData['custom_attributes'] = Object.entries(addressData['custom_attributes'])
+                    .map(function (customAttribute) {
+                        return {
+                            'attribute_code': customAttribute[0],
+                            'value': customAttribute[1]
+                        };
+                    });
+            }
+
             return address(addressData);
         },
 
@@ -72,20 +82,20 @@ define([
                 output = {},
                 streetObject;
 
+            $.each(addrs, function (key) {
+                if (addrs.hasOwnProperty(key) && !$.isFunction(addrs[key])) {
+                    output[self.toUnderscore(key)] = addrs[key];
+                }
+            });
+
             if ($.isArray(addrs.street)) {
                 streetObject = {};
                 addrs.street.forEach(function (value, index) {
                     streetObject[index] = value;
                 });
-                addrs.street = streetObject;
+                output.street = streetObject;
             }
 
-            $.each(addrs, function (key) {
-                if (addrs.hasOwnProperty(key) && !$.isFunction(addrs[key])) {
-                    output[self.toUnderscore(key)] = addrs[key];
-                }
-            });
-
             return output;
         },
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
index 76e3d911e7d3f..54e496131972e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
@@ -14,55 +14,71 @@ define([
     'use strict';
 
     var rateProcessors = [],
-        totalsProcessors = [];
+        totalsProcessors = [],
 
-    quote.shippingAddress.subscribe(function () {
-        var type = quote.shippingAddress().getType();
+        /**
+         * Estimate totals for shipping address and update shipping rates.
+         */
+        estimateTotalsAndUpdateRates = function () {
+            var type = quote.shippingAddress().getType();
 
-        if (
-            quote.isVirtual() ||
-            window.checkoutConfig.activeCarriers && window.checkoutConfig.activeCarriers.length === 0
-        ) {
-            // update totals block when estimated address was set
-            totalsProcessors['default'] = totalsDefaultProvider;
-            totalsProcessors[type] ?
-                totalsProcessors[type].estimateTotals(quote.shippingAddress()) :
-                totalsProcessors['default'].estimateTotals(quote.shippingAddress());
-        } else {
-            // check if user data not changed -> load rates from cache
-            if (!cartCache.isChanged('address', quote.shippingAddress()) &&
-                !cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
-                cartCache.get('rates')
+            if (
+                quote.isVirtual() ||
+                window.checkoutConfig.activeCarriers && window.checkoutConfig.activeCarriers.length === 0
             ) {
-                shippingService.setShippingRates(cartCache.get('rates'));
+                // update totals block when estimated address was set
+                totalsProcessors['default'] = totalsDefaultProvider;
+                totalsProcessors[type] ?
+                    totalsProcessors[type].estimateTotals(quote.shippingAddress()) :
+                    totalsProcessors['default'].estimateTotals(quote.shippingAddress());
+            } else {
+                // check if user data not changed -> load rates from cache
+                if (!cartCache.isChanged('address', quote.shippingAddress()) &&
+                    !cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
+                    cartCache.get('rates')
+                ) {
+                    shippingService.setShippingRates(cartCache.get('rates'));
 
-                return;
+                    return;
+                }
+
+                // update rates list when estimated address was set
+                rateProcessors['default'] = defaultProcessor;
+                rateProcessors[type] ?
+                    rateProcessors[type].getRates(quote.shippingAddress()) :
+                    rateProcessors['default'].getRates(quote.shippingAddress());
+
+                // save rates to cache after load
+                shippingService.getShippingRates().subscribe(function (rates) {
+                    cartCache.set('rates', rates);
+                });
             }
+        },
 
-            // update rates list when estimated address was set
-            rateProcessors['default'] = defaultProcessor;
-            rateProcessors[type] ?
-                rateProcessors[type].getRates(quote.shippingAddress()) :
-                rateProcessors['default'].getRates(quote.shippingAddress());
+        /**
+         * Estimate totals for shipping address.
+         */
+        estimateTotalsShipping = function () {
+            totalsDefaultProvider.estimateTotals(quote.shippingAddress());
+        },
 
-            // save rates to cache after load
-            shippingService.getShippingRates().subscribe(function (rates) {
-                cartCache.set('rates', rates);
-            });
-        }
-    });
-    quote.shippingMethod.subscribe(function () {
-        totalsDefaultProvider.estimateTotals(quote.shippingAddress());
-    });
-    quote.billingAddress.subscribe(function () {
-        var type = quote.billingAddress().getType();
+        /**
+         * Estimate totals for billing address.
+         */
+        estimateTotalsBilling = function () {
+            var type = quote.billingAddress().getType();
+
+            if (quote.isVirtual()) {
+                // update totals block when estimated address was set
+                totalsProcessors['default'] = totalsDefaultProvider;
+                totalsProcessors[type] ?
+                    totalsProcessors[type].estimateTotals(quote.billingAddress()) :
+                    totalsProcessors['default'].estimateTotals(quote.billingAddress());
+            }
+        };
 
-        if (quote.isVirtual()) {
-            // update totals block when estimated address was set
-            totalsProcessors['default'] = totalsDefaultProvider;
-            totalsProcessors[type] ?
-                totalsProcessors[type].estimateTotals(quote.billingAddress()) :
-                totalsProcessors['default'].estimateTotals(quote.billingAddress());
-        }
-    });
+    quote.shippingAddress.subscribe(estimateTotalsAndUpdateRates);
+    quote.shippingMethod.subscribe(estimateTotalsShipping);
+    quote.billingAddress.subscribe(estimateTotalsBilling);
+    customerData.get('cart').subscribe(estimateTotalsShipping);
 });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
index e269462047748..0e94232786c65 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
@@ -38,7 +38,7 @@ define([
             payload.addressInformation['shipping_carrier_code'] = quote.shippingMethod()['carrier_code'];
         }
 
-        storage.post(
+        return storage.post(
             serviceUrl, JSON.stringify(payload), false
         ).done(function (result) {
             var data = {
@@ -96,7 +96,7 @@ define([
             ) {
                 quote.setTotals(cartCache.get('totals'));
             } else {
-                loadFromServer(address);
+                return loadFromServer(address);
             }
         }
     };
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index 73f4df567903c..9cc60a3645d58 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -60,14 +60,21 @@ define([
                     this.resolveBillingAddress();
                 }
             }
-
         },
 
         /**
          * Resolve shipping address. Used local storage
          */
         resolveShippingAddress: function () {
-            var newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
+            var newCustomerShippingAddress;
+
+            if (!checkoutData.getShippingAddressFromData() &&
+                window.checkoutConfig.shippingAddressFromData
+            ) {
+                checkoutData.setShippingAddressFromData(window.checkoutConfig.shippingAddressFromData);
+            }
+
+            newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
 
             if (newCustomerShippingAddress) {
                 createShippingAddress(newCustomerShippingAddress);
@@ -196,8 +203,17 @@ define([
          * Resolve billing address. Used local storage
          */
         resolveBillingAddress: function () {
-            var selectedBillingAddress = checkoutData.getSelectedBillingAddress(),
-                newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
+            var selectedBillingAddress,
+                newCustomerBillingAddressData;
+
+            if (!checkoutData.getBillingAddressFromData() &&
+                window.checkoutConfig.billingAddressFromData
+            ) {
+                checkoutData.setBillingAddressFromData(window.checkoutConfig.billingAddressFromData);
+            }
+
+            selectedBillingAddress = checkoutData.getSelectedBillingAddress();
+            newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
 
             if (selectedBillingAddress) {
                 if (selectedBillingAddress == 'new-customer-address' && newCustomerBillingAddressData) { //eslint-disable-line
@@ -218,16 +234,31 @@ define([
          * Apply resolved billing address to quote
          */
         applyBillingAddress: function () {
-            var shippingAddress;
+            var shippingAddress,
+                isBillingAddressInitialized;
 
             if (quote.billingAddress()) {
                 selectBillingAddress(quote.billingAddress());
 
                 return;
             }
+
+            if (quote.isVirtual()) {
+                isBillingAddressInitialized = addressList.some(function (addrs) {
+                    if (addrs.isDefaultBilling()) {
+                        selectBillingAddress(addrs);
+
+                        return true;
+                    }
+
+                    return false;
+                });
+            }
+
             shippingAddress = quote.shippingAddress();
 
-            if (shippingAddress &&
+            if (!isBillingAddressInitialized &&
+                shippingAddress &&
                 shippingAddress.canUseForBilling() &&
                 (shippingAddress.isDefaultShipping() || !quote.isVirtual())
             ) {
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js b/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
index 848a7daf71e1b..42b692ff9dd8d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
@@ -8,8 +8,9 @@
  */
 define([
     'mage/url',
-    'Magento_Ui/js/model/messageList'
-], function (url, globalMessageList) {
+    'Magento_Ui/js/model/messageList',
+    'mage/translate'
+], function (url, globalMessageList, $t) {
     'use strict';
 
     return {
@@ -25,7 +26,11 @@ define([
             if (response.status == 401) { //eslint-disable-line eqeqeq
                 window.location.replace(url.build('customer/account/login/'));
             } else {
-                error = JSON.parse(response.responseText);
+                try {
+                    error = JSON.parse(response.responseText);
+                } catch (exception) {
+                    error = $t('Something went wrong with your request. Please try again later.');
+                }
                 messageContainer.addErrorMessage(error);
             }
         }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js b/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
index 3bc5911946fda..4ef39421440ce 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js
@@ -17,17 +17,25 @@ define([
      */
     return function (addressData) {
         var identifier = Date.now(),
+            countryId = addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
             regionId;
 
         if (addressData.region && addressData.region['region_id']) {
             regionId = addressData.region['region_id'];
-        } else if (addressData['country_id'] && addressData['country_id'] == window.checkoutConfig.defaultCountryId) { //eslint-disable-line
+        } else if (!addressData['region_id']) {
+            regionId = undefined;
+        } else if (
+            /* eslint-disable */
+            addressData['country_id'] && addressData['country_id'] == window.checkoutConfig.defaultCountryId ||
+            !addressData['country_id'] && countryId == window.checkoutConfig.defaultCountryId
+            /* eslint-enable */
+        ) {
             regionId = window.checkoutConfig.defaultRegionId || undefined;
         }
 
         return {
             email: addressData.email,
-            countryId: addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
+            countryId: countryId,
             regionId: regionId || addressData.regionId,
             regionCode: addressData.region ? addressData.region['region_code'] : null,
             region: addressData.region ? addressData.region.region : null,
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js b/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js
index 2d27d4a032b24..410f5b4927374 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js
@@ -75,8 +75,8 @@ define([
                             quoteId: quoteId
                         } : {},
                     urls = {
-                        'guest': '/guest-carts/' + quoteId + '/coupons/' + couponCode,
-                        'customer': '/carts/mine/coupons/' + couponCode
+                        'guest': '/guest-carts/' + quoteId + '/coupons/' + encodeURIComponent(couponCode),
+                        'customer': '/carts/mine/coupons/' + encodeURIComponent(couponCode)
                     };
 
                 return this.getUrl(urls, params);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
index d31c0dca38116..fde88ebadb393 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -35,7 +35,7 @@ define([
     var checkoutConfig = window.checkoutConfig,
         validators = [],
         observedElements = [],
-        postcodeElement = null,
+        postcodeElements = [],
         postcodeElementName = 'postcode';
 
     validators.push(defaultValidator);
@@ -101,7 +101,7 @@ define([
 
             if (element.index === postcodeElementName) {
                 this.bindHandler(element, delay);
-                postcodeElement = element;
+                postcodeElements.push(element);
             }
         },
 
@@ -136,7 +136,13 @@ define([
                     if (!formPopUpState.isVisible()) {
                         clearTimeout(self.validateAddressTimeout);
                         self.validateAddressTimeout = setTimeout(function () {
-                            self.postcodeValidation();
+                            if (element.index === postcodeElementName) {
+                                self.postcodeValidation(element);
+                            } else {
+                                $.each(postcodeElements, function (index, elem) {
+                                    self.postcodeValidation(elem);
+                                });
+                            }
                             self.validateFields();
                         }, delay);
                     }
@@ -148,8 +154,8 @@ define([
         /**
          * @return {*}
          */
-        postcodeValidation: function () {
-            var countryId = $('select[name="country_id"]').val(),
+        postcodeValidation: function (postcodeElement) {
+            var countryId = $('select[name="country_id"]:visible').val(),
                 validationResult,
                 warnMessage;
 
@@ -178,8 +184,8 @@ define([
          */
         validateFields: function () {
             var addressFlat = addressConverter.formDataProviderToFlatData(
-                    this.collectObservedData(),
-                    'shippingAddress'
+                this.collectObservedData(),
+                'shippingAddress'
                 ),
                 address;
 
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 0210fa37bb9ad..0f2b0f4e26869 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
@@ -66,7 +66,7 @@ define([
          * @param {*} sortOrder
          */
         registerStep: function (code, alias, title, isVisible, navigate, sortOrder) {
-            var hash;
+            var hash, active;
 
             if ($.inArray(code, this.validCodes) !== -1) {
                 throw new DOMException('Step code [' + code + '] already registered in step navigator');
@@ -87,6 +87,12 @@ define([
                 navigate: navigate,
                 sortOrder: sortOrder
             });
+            active = this.getActiveItemIndex();
+            steps.each(function (elem, index) {
+                if (active !== index) {
+                    elem.isVisible(false);
+                }
+            });
             this.stepCodes.push(code);
             hash = window.location.hash.replace('#', '');
 
@@ -111,10 +117,14 @@ define([
         getActiveItemIndex: function () {
             var activeIndex = 0;
 
-            steps().sort(this.sortItems).forEach(function (element, index) {
+            steps().sort(this.sortItems).some(function (element, index) {
                 if (element.isVisible()) {
                     activeIndex = index;
+
+                    return true;
                 }
+
+                return false;
             });
 
             return activeIndex;
@@ -144,7 +154,7 @@ define([
          */
         navigateTo: function (code, scrollToElementId) {
             var sortedItems = steps().sort(this.sortItems),
-                bodyElem = $.browser.safari || $.browser.chrome ? $('body') : $('html');
+                bodyElem = $('body');
 
             scrollToElementId = scrollToElementId || null;
 
@@ -172,6 +182,15 @@ define([
             });
         },
 
+        /**
+         * Sets window location hash.
+         *
+         * @param {String} hash
+         */
+        setHash: function (hash) {
+            window.location.hash = hash;
+        },
+
         /**
          * Next step.
          */
@@ -189,7 +208,7 @@ define([
             if (steps().length > activeIndex + 1) {
                 code = steps()[activeIndex + 1].code;
                 steps()[activeIndex + 1].isVisible(true);
-                window.location = window.checkoutConfig.checkoutUrl + '#' + code;
+                this.setHash(code);
                 document.body.scrollTop = document.documentElement.scrollTop = 0;
             }
         }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
index f0679c657ab90..0bb0a53ce0a6b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
@@ -22,6 +22,7 @@ define([
 
                 return false;
             }
+            $(element).attr('disabled', true);
             location.href = config.checkoutUrl;
         });
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index 82033590b1135..cf2a59cdba427 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -188,6 +188,8 @@ define([
 
                     if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
                         regionList.attr('disabled', 'disabled');
+                    } else {
+                        regionList.removeAttr('disabled');
                     }
                 }
 
@@ -195,6 +197,8 @@ define([
                 regionInput.hide();
                 label.attr('for', regionList.attr('id'));
             } else {
+                this._removeSelectOptions(regionList);
+
                 if (this.options.isRegionRequired) {
                     regionInput.addClass('required-entry').removeAttr('disabled');
                     requiredLabel.addClass('required');
@@ -206,7 +210,7 @@ define([
                     regionInput.removeClass('required-entry');
                 }
 
-                regionList.removeClass('required-entry').hide();
+                regionList.removeClass('required-entry').prop('disabled', 'disabled').hide();
                 regionInput.show();
                 label.attr('for', regionInput.attr('id'));
             }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index 399321bd2f67d..3ea49cd981d90 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -12,7 +12,7 @@ define([
     $.widget('mage.shoppingCart', {
         /** @inheritdoc */
         _create: function () {
-            var items, i;
+            var items, i, reload;
 
             $(this.options.emptyCartButton).on('click', $.proxy(function () {
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
@@ -36,6 +36,27 @@ define([
             $(this.options.continueShoppingButton).on('click', $.proxy(function () {
                 location.href = this.options.continueShoppingUrl;
             }, this));
+
+            $(document).on('ajax:removeFromCart', $.proxy(function () {
+                reload = true;
+                $('div.block.block-minicart').on('dropdowndialogclose', $.proxy(function () {
+                    if (reload === true) {
+                        location.reload();
+                        reload = false;
+                    }
+                    $('div.block.block-minicart').off('dropdowndialogclose');
+                }));
+            }, this));
+            $(document).on('ajax:updateItemQty', $.proxy(function () {
+                reload = true;
+                $('div.block.block-minicart').on('dropdowndialogclose', $.proxy(function () {
+                    if (reload === true) {
+                        location.reload();
+                        reload = false;
+                    }
+                    $('div.block.block-minicart').off('dropdowndialogclose');
+                }));
+            }, this));
         }
     });
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index 13a2b524e5186..dde1ad72ba15e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -9,11 +9,12 @@ define([
     'Magento_Customer/js/customer-data',
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/modal/confirm',
+    'underscore',
     'jquery/ui',
     'mage/decorate',
     'mage/collapsible',
     'mage/cookies'
-], function ($, authenticationPopup, customerData, alert, confirm) {
+], function ($, authenticationPopup, customerData, alert, confirm, _) {
     'use strict';
 
     $.widget('mage.sidebar', {
@@ -60,13 +61,15 @@ define([
             };
             events['click ' + this.options.button.checkout] = $.proxy(function () {
                 var cart = customerData.get('cart'),
-                    customer = customerData.get('customer');
+                    customer = customerData.get('customer'),
+                    element = $(this.options.button.checkout);
 
                 if (!customer().firstname && cart().isGuestCheckoutAllowed === false) {
                     // set URL for redirect on successful login/registration. It's postprocessed on backend.
                     $.cookie('login_redirect', this.options.url.checkout);
 
                     if (this.options.url.isRedirectRequired) {
+                        element.prop('disabled', true);
                         location.href = this.options.url.loginUrl;
                     } else {
                         authenticationPopup.showModal();
@@ -74,6 +77,7 @@ define([
 
                     return false;
                 }
+                element.prop('disabled', true);
                 location.href = this.options.url.checkout;
             }, this);
 
@@ -105,6 +109,13 @@ define([
                 self._showItemButton($(event.target));
             };
 
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['change ' + this.options.item.qty] = function (event) {
+                self._showItemButton($(event.target));
+            };
+
             /**
              * @param {jQuery.Event} event
              */
@@ -212,6 +223,11 @@ define([
          * @param {HTMLElement} elem
          */
         _updateItemQtyAfter: function (elem) {
+            var productData = this._getProductById(Number(elem.data('cart-item')));
+
+            if (!_.isUndefined(productData)) {
+                $(document).trigger('ajax:updateCartItemQty');
+            }
             this._hideItemButton(elem);
         },
 
@@ -234,11 +250,26 @@ define([
          * @private
          */
         _removeItemAfter: function (elem) {
-            var productData = customerData.get('cart')().items.find(function (item) {
-                return Number(elem.data('cart-item')) === Number(item['item_id']);
-            });
+            var productData = this._getProductById(Number(elem.data('cart-item')));
 
-            $(document).trigger('ajax:removeFromCart', productData['product_sku']);
+            if (!_.isUndefined(productData)) {
+                $(document).trigger('ajax:removeFromCart', {
+                    productIds: [productData['product_id']]
+                });
+            }
+        },
+
+        /**
+         * Retrieves product data by Id.
+         *
+         * @param {Number} productId - product Id
+         * @returns {Object|undefined}
+         * @private
+         */
+        _getProductById: function (productId) {
+            return _.find(customerData.get('cart')().items, function (item) {
+                return productId === Number(item['item_id']);
+            });
         },
 
         /**
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 6b5d08c2641cc..6f9a1a46826da 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -17,7 +17,8 @@ define([
     'Magento_Customer/js/customer-data',
     'Magento_Checkout/js/action/set-billing-address',
     'Magento_Ui/js/model/messageList',
-    'mage/translate'
+    'mage/translate',
+    'Magento_Checkout/js/model/shipping-rates-validator'
 ],
 function (
     ko,
@@ -33,7 +34,8 @@ function (
     customerData,
     setBillingAddressAction,
     globalMessageList,
-    $t
+    $t,
+    shippingRatesValidator
 ) {
     'use strict';
 
@@ -71,6 +73,7 @@ function (
             quote.paymentMethod.subscribe(function () {
                 checkoutDataResolver.resolveBillingAddress();
             }, this);
+            shippingRatesValidator.initFields(this.get('name') + '.form-fields');
         },
 
         /**
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js b/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
index 39b5ea0299ab8..a857d89a72b14 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js
@@ -55,6 +55,12 @@ define(
                     checkoutDataResolver.resolveEstimationAddress();
                     address = quote.isVirtual() ? quote.billingAddress() : quote.shippingAddress();
 
+                    if (!address && quote.isVirtual()) {
+                        address = addressConverter.formAddressDataToQuoteAddress(
+                            checkoutData.getSelectedBillingAddress()
+                        );
+                    }
+
                     if (address) {
                         estimatedAddress = address.isEditable() ?
                             addressConverter.quoteAddressToFormAddressData(address) :
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js b/app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js
index a612b5e2dc6b7..0e2fc6bbfc8fe 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js
@@ -1,15 +1,19 @@
 require([
     'jquery',
-    'Magento_Customer/js/customer-data'
-], function ($, customerData) {
+    'Magento_Customer/js/customer-data',
+    'underscore',
+    'domReady!'
+], function ($, customerData, _) {
     'use strict';
 
     var selectors = {
         qtySelector: '#product_addtocart_form [name="qty"]',
-        productIdSelector: '#product_addtocart_form [name="product"]'
+        productIdSelector: '#product_addtocart_form [name="product"]',
+        itemIdSelector: '#product_addtocart_form [name="item"]'
     },
     cartData = customerData.get('cart'),
     productId = $(selectors.productIdSelector).val(),
+    itemId = $(selectors.itemIdSelector).val(),
     productQty,
     productQtyInput,
 
@@ -38,9 +42,11 @@ require([
         if (!(data && data.items && data.items.length && productId)) {
             return;
         }
-        product = data.items.find(function (item) {
-            return item['product_id'] === productId ||
-                item['item_id'] === productId;
+        product = _.find(data.items, function (item) {
+            if (item['item_id'] === itemId) {
+                return item['product_id'] === productId ||
+                    item['item_id'] === productId;
+            }
         });
 
         if (!product) {
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
index 4a25778e754c7..c0de643d3a223 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -17,7 +17,16 @@ define([
 ], function ($, Component, ko, customer, checkEmailAvailability, loginAction, quote, checkoutData, fullScreenLoader) {
     'use strict';
 
-    var validatedEmail = checkoutData.getValidatedEmailValue();
+    var validatedEmail;
+
+    if (!checkoutData.getValidatedEmailValue() &&
+        window.checkoutConfig.validatedEmailValue
+    ) {
+        checkoutData.setInputFieldEmailValue(window.checkoutConfig.validatedEmailValue);
+        checkoutData.setValidatedEmailValue(window.checkoutConfig.validatedEmailValue);
+    }
+
+    validatedEmail = checkoutData.getValidatedEmailValue();
 
     if (validatedEmail && !customer.isLoggedIn()) {
         quote.guestEmail = validatedEmail;
@@ -33,6 +42,9 @@ define([
             listens: {
                 email: 'emailHasChanged',
                 emailFocused: 'validateEmail'
+            },
+            ignoreTmpls: {
+                email: true
             }
         },
         checkDelay: 2000,
@@ -168,7 +180,7 @@ define([
         },
 
         /**
-         * Resolves an initial sate of a login form.
+         * Resolves an initial state of a login form.
          *
          * @returns {Boolean} - initial visibility state.
          */
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
index 5ac062a12180c..a2f8c8c56ff33 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
@@ -10,7 +10,8 @@ define([
     'ko',
     'underscore',
     'sidebar',
-    'mage/translate'
+    'mage/translate',
+    'mage/dropdown'
 ], function (Component, customerData, $, ko, _) {
     'use strict';
 
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 0cbc16ef72bc3..30ea9da1dd601 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';
 
@@ -24,8 +23,19 @@ define([
 
         /** @inheritdoc */
         initialize: function () {
+            var stepsValue;
+
             this._super();
-            $(window).hashchange(_.bind(stepNavigator.handleHash, stepNavigator));
+            window.addEventListener('hashchange', _.bind(stepNavigator.handleHash, stepNavigator));
+
+            if (!window.location.hash) {
+                stepsValue = stepNavigator.steps();
+
+                if (stepsValue.length) {
+                    stepNavigator.setHash(stepsValue.sort(stepNavigator.sortItems)[0].code);
+                }
+            }
+
             stepNavigator.handleHash();
         },
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/registration.js b/app/code/Magento/Checkout/view/frontend/web/js/view/registration.js
index c715b5c4d45ce..a7b3e18c06088 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/registration.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/registration.js
@@ -38,7 +38,16 @@ define([
         },
 
         /**
-         * Create new user account
+         * @return String
+         */
+        getUrl: function () {
+            return this.registrationUrl;
+        },
+
+        /**
+         * Create new user account.
+         *
+         * @deprecated
          */
         createAccount: function () {
             this.creationStarted(true);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 619de95e467f0..c811d3a1e8369 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -247,6 +247,8 @@ define([
          */
         setShippingInformation: function () {
             if (this.validateShippingInformation()) {
+                quote.billingAddress(null);
+                checkoutDataResolver.resolveBillingAddress();
                 setShippingInformationAction().done(
                     function () {
                         stepNavigator.next();
@@ -263,10 +265,16 @@ define([
                 addressData,
                 loginFormSelector = 'form[data-role=email-with-possible-login]',
                 emailValidationResult = customer.isLoggedIn(),
-                field;
+                field,
+                country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
+                countryIndexedOptions = country.indexedOptions,
+                option = countryIndexedOptions[quote.shippingAddress().countryId],
+                messageContainer = registry.get('checkout.errors').messageContainer;
 
             if (!quote.shippingMethod()) {
-                this.errorValidationMessage($t('Please specify a shipping method.'));
+                this.errorValidationMessage(
+                    $t('The shipping method is missing. Select the shipping method and try again.')
+                );
 
                 return false;
             }
@@ -314,6 +322,16 @@ define([
                     shippingAddress['save_in_address_book'] = 1;
                 }
                 selectShippingAddress(shippingAddress);
+            } else if (customer.isLoggedIn() &&
+                option &&
+                option['is_region_required'] &&
+                !quote.shippingAddress().region
+            ) {
+                messageContainer.addErrorMessage({
+                    message: $t('Please specify a regionId in shipping address.')
+                });
+
+                return false;
             }
 
             if (!emailValidationResult) {
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js
new file mode 100644
index 0000000000000..ed41fd26c47ec
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['uiComponent'], function (Component) {
+    'use strict';
+
+    var quoteMessages = window.checkoutConfig.quoteMessages;
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Checkout/summary/item/details/message'
+        },
+        displayArea: 'item_message',
+        quoteMessages: quoteMessages,
+
+        /**
+         * @param {Object} item
+         * @return {null}
+         */
+        getMessage: function (item) {
+            if (this.quoteMessages[item['item_id']]) {
+                return this.quoteMessages[item['item_id']];
+            }
+
+            return null;
+        }
+    });
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
index 3fda260339254..10d49265e3bb9 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
@@ -21,14 +21,21 @@ define([
          * @return {*}
          */
         getShippingMethodTitle: function () {
-            var shippingMethod;
+            var shippingMethod = '',
+                shippingMethodTitle = '';
 
             if (!this.isCalculated()) {
                 return '';
             }
             shippingMethod = quote.shippingMethod();
 
-            return shippingMethod ? shippingMethod['carrier_title'] + ' - ' + shippingMethod['method_title'] : '';
+            if (typeof shippingMethod['method_title'] !== 'undefined') {
+                shippingMethodTitle = ' - ' + shippingMethod['method_title'];
+            }
+
+            return shippingMethod ?
+                shippingMethod['carrier_title'] + shippingMethodTitle :
+                shippingMethod['carrier_title'];
         },
 
         /**
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index f2baf5d50030e..ea521b3a8afd4 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -4,28 +4,37 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
-    <!-- ko text: currentBillingAddress().prefix --><!-- /ko --> <!-- ko text: currentBillingAddress().firstname --><!-- /ko --> <!-- ko text: currentBillingAddress().middlename --><!-- /ko -->
-    <!-- ko text: currentBillingAddress().lastname --><!-- /ko --> <!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>
-    <!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
-    <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <span data-bind="html: currentBillingAddress().region"></span> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
-    <!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
-    <!-- ko if: (currentBillingAddress().telephone) -->
-    <a data-bind="text: currentBillingAddress().telephone, attr: {'href': 'tel:' + currentBillingAddress().telephone}"></a>
-    <!-- /ko --><br/>
-    <!-- ko foreach: { data: currentBillingAddress().customAttributes, as: 'element' } -->
-        <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
-            <!-- ko if: (typeof element[attribute] === "object") -->
-                <!-- ko text: element[attribute].value --><!-- /ko -->
-            <!-- /ko -->
-            <!-- ko if: (typeof element[attribute] === "string") -->
-                <!-- ko text: element[attribute] --><!-- /ko -->
-            <!-- /ko --><br/>
-        <!-- /ko -->
-    <!-- /ko -->
-    <button type="button"
+<div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
+    <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
+    <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
+    <text args="_.values(currentBillingAddress().street).join(', ')"/><br/>
+    <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
+    <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
+    <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
+
+    <each args="data: currentBillingAddress().customAttributes, as: 'element'">
+        <each args="data: Object.keys(element), as: 'attribute'">
+            <if args="typeof element[attribute] === 'object'">
+                <if args="element[attribute].label">
+                    <text args="element[attribute].label"/>
+                </if>
+                <ifnot args="element[attribute].label">
+                    <if args="element[attribute].value">
+                        <text args="element[attribute].value"/>
+                    </if>
+                </ifnot>
+            </if>
+            <if args="typeof element[attribute] === 'string'">
+                <text args="element[attribute]"/>
+            </if><br/>
+        </each>
+    </each>
+
+    <button visible="!isAddressSameAsShipping()"
+            type="button"
             class="action action-edit-address"
-            data-bind="visible: !isAddressSameAsShipping(), click: editAddress">
-        <span data-bind="i18n: 'Edit'"></span>
+            click="editAddress">
+        <span translate="'Edit'"></span>
     </button>
 </div>
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 1be754934042b..54fe9a1f59394 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -9,14 +9,14 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
-        <fieldset id="billing-new-address-form" class="fieldset address">
+        <fieldset class="fieldset address" data-form="billing-new-address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
             <!-- ko if: (isCustomerLoggedIn && customerHasAddresses) -->
             <div class="choice field">
-                <input type="checkbox" class="checkbox" id="billing-save-in-address-book" data-bind="checked: saveInAddressBook" />
-                <label class="label" for="billing-save-in-address-book">
+                <input type="checkbox" class="checkbox"  data-bind="checked: saveInAddressBook, attr: {id: 'billing-save-in-address-book-' + getCode($parent)}" />
+                <label class="label" data-bind="attr: {for: 'billing-save-in-address-book-' + getCode($parent)}" >
                     <span data-bind="i18n: 'Save in address book'"></span>
                 </label>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
index 0dee6cb0708e6..8d6142e07fcf0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
@@ -22,7 +22,8 @@
                        type="email"
                        data-bind="
                             textInput: email,
-                            hasFocus: emailFocused"
+                            hasFocus: emailFocused,
+                            mageInit: {'mage/trim-input':{}}"
                        name="username"
                        data-validate="{required:true, 'validate-email':true}"
                        id="customer-email" />
@@ -41,7 +42,7 @@
                     <input class="input-text"
                            data-bind="
                                 attr: {
-                                    placeholder: $t('optional'),
+                                    placeholder: $t('Password'),
                                 }"
                            type="password"
                            name="password"
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index 8bf1a87d34e6e..2daca51a2f5da 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -30,8 +30,12 @@
             <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
             <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
             <span class="count" text="getCartLineItemsCount()"/>
-            <translate args="'Item in Cart'" if="getCartLineItemsCount() === 1"/>
-            <translate args="'Items in Cart'" if="getCartLineItemsCount() > 1"/>
+                <!-- ko if: (getCartLineItemsCount() === 1) -->
+                    <span translate="'Item in Cart'"/>
+                <!--/ko-->
+                <!-- ko if: (getCartLineItemsCount() > 1) -->
+                    <span translate="'Items in Cart'"/>
+                <!--/ko-->
         </div>
 
         <each args="getRegion('subtotalContainer')" render=""/>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 8d32adb75308f..357b0e550af0f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -24,7 +24,7 @@
         <div class="product-item-details">
             <strong class="product-item-name">
                 <!-- ko if: product_has_url -->
-                <a data-bind="attr: {href: product_url}, text: product_name"></a>
+                <a data-bind="attr: {href: product_url}, html: product_name"></a>
                 <!-- /ko -->
                 <!-- ko ifnot: product_has_url -->
                     <!-- ko text: product_name --><!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
index 256fc1968abfc..ea94726e5443e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/registration.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
@@ -11,11 +11,8 @@
     <!-- ko if: isFormVisible -->
     <p data-bind="i18n: 'You can track your order status by creating an account.'"></p>
     <p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
-    <form method="post" data-bind="submit: createAccount">
-        <input type="submit" class="action primary" data-bind="value: $t('Create an Account'), disable: creationStarted" />
+    <form method="get" data-bind="attr: { action: getUrl() }">
+        <input type="submit" class="action primary" data-bind="value: $t('Create an Account')" />
     </form>
-    <!-- /ko -->
-    <!-- ko if: accountCreated -->
-    <p data-bind="i18n: 'A letter with further instructions will be sent to your email.'"></p>
-    <!-- /ko -->
+    <!--/ko-->
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index 2e268461d1eea..cf64c0140b955 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -4,33 +4,40 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="shipping-address-item" data-bind="css: isSelected() ? 'selected-item' : 'not-selected-item'">
-    <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
-    <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
-    <!-- ko text: _.values(address().street).join(", ") --><!-- /ko --><br/>
-    <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
-    <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
-    <!-- ko if: (address().telephone) -->
-    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
-    <!-- /ko --><br/>
-    <!-- ko foreach: { data: address().customAttributes, as: 'element' } -->
-        <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
-            <!-- ko if: (typeof element[attribute] === "object") -->
-                <!-- ko text: element[attribute].value --><!-- /ko -->
-            <!-- /ko -->
-            <!-- ko if: (typeof element[attribute] === "string") -->
-                <!-- ko text: element[attribute] --><!-- /ko -->
-            <!-- /ko --><br/>
-        <!-- /ko -->
-    <!-- /ko -->
-    <!-- ko if: (address().isEditable()) -->
-    <button type="button"
+<div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
+    <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
+    <text args="address().lastname"/> <text args="address().suffix"/><br/>
+    <text args="_.values(address().street).join(', ')"/><br/>
+    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
+    <text args="getCountryName(address().countryId)"/><br/>
+    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
+
+    <each args="data: address().customAttributes, as: 'element'">
+        <each args="data: Object.keys(element), as: 'attribute'">
+            <if args="typeof element[attribute] === 'object'">
+                <if args="element[attribute].label">
+                    <text args="element[attribute].label"/>
+                </if>
+                <ifnot args="element[attribute].label">
+                    <if args="element[attribute].value">
+                        <text args="element[attribute].value"/>
+                    </if>
+                </ifnot>
+            </if>
+            <if args="typeof element[attribute] === 'string'">
+                <text args="element[attribute]"/>
+            </if><br/>
+        </each>
+    </each>
+
+    <button visible="address().isEditable()" type="button"
             class="action edit-address-link"
-            data-bind="click: editAddress, visible: address().isEditable()">
-        <span data-bind="i18n: 'Edit'"></span>
+            click="editAddress">
+        <span translate="'Edit'"></span>
     </button>
-    <!-- /ko -->
-    <button type="button" data-bind="click: selectAddress" class="action action-select-shipping-item">
-        <span data-bind="i18n: 'Ship Here'"></span>
+    <!-- ko if: (!isSelected()) -->
+    <button type="button" click="selectAddress" class="action action-select-shipping-item">
+        <span translate="'Ship Here'"></span>
     </button>
+    <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
index ec41cae0bdc5e..541413955cb47 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -4,23 +4,29 @@
  * See COPYING.txt for license details.
  */
 -->
-<!-- ko if: (visible()) -->
-    <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
-    <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
-    <!-- ko text: address().street --><!-- /ko --><br/>
-    <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
-    <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
-    <!-- ko if: (address().telephone) -->
-    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
-    <!-- /ko --><br/>
-    <!-- ko foreach: { data: address().customAttributes, as: 'element' } -->
-        <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } -->
-            <!-- ko if: (typeof element[attribute] === "object") -->
-                <!-- ko text: element[attribute].value --><!-- /ko -->
-            <!-- /ko -->
-            <!-- ko if: (typeof element[attribute] === "string") -->
-                <!-- ko text: element[attribute] --><!-- /ko -->
-            <!-- /ko --><br/>
-        <!-- /ko -->
-    <!-- /ko -->
-<!-- /ko -->
+<if args="visible()">
+    <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
+    <text args="address().lastname"/> <text args="address().suffix"/><br/>
+    <text args="_.values(address().street).join(', ')"/><br/>
+    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
+    <text args="getCountryName(address().countryId)"/><br/>
+    <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
+
+    <each args="data: address().customAttributes, as: 'element'">
+        <each args="data: Object.keys(element), as: 'attribute'">
+            <if args="typeof element[attribute] === 'object'">
+                <if args="element[attribute].label">
+                    <text args="element[attribute].label"/>
+                </if>
+                <ifnot args="element[attribute].label">
+                    <if args="element[attribute].value">
+                        <text args="element[attribute].value"/>
+                    </if>
+                </ifnot>
+            </if>
+            <if args="typeof element[attribute] === 'string'">
+                <text args="element[attribute]"/>
+            </if><br/>
+        </each>
+    </each>
+</if>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index daa37cbe2dc89..2491ee12d263c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -12,7 +12,7 @@
 
     <div class="product-item-inner">
         <div class="product-item-name-block">
-            <strong class="product-item-name" data-bind="text: $parent.name"></strong>
+            <strong class="product-item-name" data-bind="html: $parent.name"></strong>
             <div class="details-qty">
                 <span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
                 <span class="value" data-bind="text: $parent.qty"></span>
@@ -43,3 +43,6 @@
     </div>
     <!-- /ko -->
 </div>
+<!-- ko foreach: getRegion('item_message') -->
+    <!-- ko template: getTemplate() --><!-- /ko -->
+<!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html
new file mode 100644
index 0000000000000..ea8f58cccd595
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="cart item message notice" if="getMessage($parents[1])">
+    <div data-bind="text: getMessage($parents[1])"></div>
+</div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
index 981541e7251e7..eb218bbee9941 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
@@ -8,6 +8,6 @@
       data-bind="attr: {'style': 'height: ' + getHeight($parents[1]) + 'px; width: ' + getWidth($parents[1]) + 'px;' }">
     <span class="product-image-wrapper">
         <img
-            data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]) }"/>
+            data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]), 'title': getAlt($parents[1]) }"/>
     </span>
 </span>
diff --git a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php
new file mode 100644
index 0000000000000..b91701acef04d
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Api;
+
+/**
+ * Interface for retrieving list of checkout agreements.
+ *
+ * Extended variation of CheckoutAgreementsRepositoryInterface::getList with possibility to get results according
+ * search filters without predefined limitations.
+ *
+ * @api
+ */
+interface CheckoutAgreementsListInterface
+{
+    /**
+     * List of checkout agreements.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) : array;
+}
diff --git a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
index ffff1675d8ff4..5822b8f082fef 100644
--- a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
+++ b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
@@ -25,6 +25,8 @@ public function get($id, $storeId = null);
      * Lists active checkout agreements.
      *
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
+     * @deprecated
+     * @see \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::getList
      */
     public function getList();
 
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
index ed9ecc642e16b..4a35a58a41ff9 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
@@ -5,27 +5,42 @@
  */
 namespace Magento\CheckoutAgreements\Block\Adminhtml\Agreement;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid\CollectionFactory as GridCollectionFactory;
+
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
+     * @deprecated
      */
     protected $_collectionFactory;
 
+    /**
+     * @param GridCollectionFactory
+     */
+    private $gridCollectionFactory;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory
      * @param array $data
+     * @param GridCollectionFactory $gridColFactory
      * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory,
-        array $data = []
+        array $data = [],
+        GridCollectionFactory $gridColFactory = null
     ) {
+
         $this->_collectionFactory = $collectionFactory;
+        $this->gridCollectionFactory = $gridColFactory
+            ? : ObjectManager::getInstance()->get(GridCollectionFactory::class);
+
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -47,7 +62,7 @@ protected function _construct()
      */
     protected function _prepareCollection()
     {
-        $this->setCollection($this->_collectionFactory->create());
+        $this->setCollection($this->gridCollectionFactory->create());
         return parent::_prepareCollection();
     }
 
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
index 13130a4491eb2..aa6f461fc5ee2 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml;
 
-abstract class Agreement extends \Magento\Backend\App\Action
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+
+abstract class Agreement extends Action
 {
     /**
      * Authorization level of a basic admin session
@@ -22,12 +26,14 @@ abstract class Agreement extends \Magento\Backend\App\Action
     protected $_coreRegistry = null;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @param Context $context
+     * @param Registry $coreRegistry
      * @codeCoverageIgnore
      */
-    public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
-    {
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry
+    ) {
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
index 65aca6205caa4..d727107a86f49 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
@@ -6,27 +6,54 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends Agreement implements HttpPostActionInterface
 {
+    /**
+     * @var CheckoutAgreementsRepositoryInterface
+     */
+    private $agreementRepository;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param CheckoutAgreementsRepositoryInterface $agreementRepository
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        CheckoutAgreementsRepositoryInterface $agreementRepository = null
+    ) {
+        $this->agreementRepository = $agreementRepository ?:
+                ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      */
     public function execute()
     {
         $id = (int)$this->getRequest()->getParam('id');
-        $model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class)->load($id);
-        if (!$model->getId()) {
+        $agreement = $this->agreementRepository->get($id);
+        if (!$agreement->getAgreementId()) {
             $this->messageManager->addError(__('This condition no longer exists.'));
             $this->_redirect('checkout/*/');
             return;
         }
 
         try {
-            $model->delete();
+            $this->agreementRepository->delete($agreement);
             $this->messageManager->addSuccess(__('You deleted the condition.'));
             $this->_redirect('checkout/*/');
             return;
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
             $this->messageManager->addError(__('Something went wrong  while deleting this condition.'));
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
index 73ac129bc993c..1a82108a3da8d 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
@@ -6,8 +6,35 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Model\AgreementFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit as BlockEdit;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+class Edit extends Agreement implements HttpGetActionInterface
 {
+    /**
+     * @var AgreementFactory
+     */
+    private $agreementFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param AgreementFactory $agreementFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        AgreementFactory $agreementFactory = null
+    ) {
+        $this->agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(AgreementFactory::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -15,7 +42,7 @@ class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
     public function execute()
     {
         $id = $this->getRequest()->getParam('id');
-        $agreementModel = $this->_objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
+        $agreementModel = $this->agreementFactory->create();
 
         if ($id) {
             $agreementModel->load($id);
@@ -26,7 +53,7 @@ public function execute()
             }
         }
 
-        $data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAgreementData(true);
+        $data = $this->_session->getAgreementData(true);
         if (!empty($data)) {
             $agreementModel->setData($data);
         }
@@ -38,7 +65,7 @@ public function execute()
             $id ? __('Edit Condition') : __('New Condition')
         )->_addContent(
             $this->_view->getLayout()->createBlock(
-                \Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit::class
+                BlockEdit::class
             )->setData(
                 'action',
                 $this->getUrl('checkout/*/save')
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
index b1dfd8c304d79..d32ee7a4b7528 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
index 4d482ebfc206c..caa21c4682303 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
index 25c034203620b..4d4dd076ea163 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
@@ -6,8 +6,36 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Model\AgreementFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Save extends Agreement implements HttpPostActionInterface
 {
+    /**
+     * @var AgreementFactory
+     */
+    private $agreementFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param AgreementFactory $agreementFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        AgreementFactory $agreementFactory = null
+    ) {
+        $this->agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(AgreementFactory::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      */
@@ -15,11 +43,11 @@ public function execute()
     {
         $postData = $this->getRequest()->getPostValue();
         if ($postData) {
-            $model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class);
+            $model = $this->agreementFactory->create();
             $model->setData($postData);
 
             try {
-                $validationResult = $model->validateData(new \Magento\Framework\DataObject($postData));
+                $validationResult = $model->validateData(new DataObject($postData));
                 if ($validationResult !== true) {
                     foreach ($validationResult as $message) {
                         $this->messageManager->addError($message);
@@ -30,13 +58,13 @@ public function execute()
                     $this->_redirect('checkout/*/');
                     return;
                 }
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('Something went wrong while saving this condition.'));
             }
 
-            $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setAgreementData($postData);
+            $this->_session->setAgreementData($postData);
             $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
     }
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
index 331307292e40a..1f1b5be9683ed 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
@@ -6,7 +6,9 @@
 namespace Magento\CheckoutAgreements\Model;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
+use Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter;
 
 /**
  * Configuration provider for GiftMessage rendering on "Shipping Method" step of checkout.
@@ -28,20 +30,40 @@ class AgreementsConfigProvider implements ConfigProviderInterface
      */
     protected $escaper;
 
+    /**
+     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface
+     */
+    private $checkoutAgreementsList;
+
+    /**
+     * @var ActiveStoreAgreementsFilter
+     */
+    private $activeStoreAgreementsFilter;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
      * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
      * @param \Magento\Framework\Escaper $escaper
+     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface|null $checkoutAgreementsList
+     * @param ActiveStoreAgreementsFilter|null $activeStoreAgreementsFilter
      * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
         \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository,
-        \Magento\Framework\Escaper $escaper
+        \Magento\Framework\Escaper $escaper,
+        \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList = null,
+        ActiveStoreAgreementsFilter $activeStoreAgreementsFilter = null
     ) {
         $this->scopeConfiguration = $scopeConfiguration;
         $this->checkoutAgreementsRepository = $checkoutAgreementsRepository;
         $this->escaper = $escaper;
+        $this->checkoutAgreementsList = $checkoutAgreementsList ?: ObjectManager::getInstance()->get(
+            \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
+        );
+        $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter ?: ObjectManager::getInstance()->get(
+            ActiveStoreAgreementsFilter::class
+        );
     }
 
     /**
@@ -67,7 +89,9 @@ protected function getAgreementsConfig()
             ScopeInterface::SCOPE_STORE
         );
 
-        $agreementsList = $this->checkoutAgreementsRepository->getList();
+        $agreementsList = $this->checkoutAgreementsList->getList(
+            $this->activeStoreAgreementsFilter->buildSearchCriteria()
+        );
         $agreementConfiguration['isEnabled'] = (bool)($isAgreementsEnabled && count($agreementsList) > 0);
 
         foreach ($agreementsList as $agreement) {
diff --git a/app/code/Magento/CheckoutAgreements/Model/Api/SearchCriteria/ActiveStoreAgreementsFilter.php b/app/code/Magento/CheckoutAgreements/Model/Api/SearchCriteria/ActiveStoreAgreementsFilter.php
new file mode 100644
index 0000000000000..fc4d4515be406
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Model/Api/SearchCriteria/ActiveStoreAgreementsFilter.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Model\Api\SearchCriteria;
+
+/**
+ * Build search criteria for agreements list.
+ */
+class ActiveStoreAgreementsFilter
+{
+    /**
+     * @var \Magento\Framework\Api\FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        \Magento\Framework\Api\FilterBuilder $filterBuilder,
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
+        \Magento\Store\Model\StoreManagerInterface $storeManager
+    ) {
+        $this->filterBuilder = $filterBuilder;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Build search criteria with store and is_active filters.
+     *
+     * @return \Magento\Framework\Api\SearchCriteriaInterface
+     */
+    public function buildSearchCriteria() : \Magento\Framework\Api\SearchCriteriaInterface
+    {
+        $storeFilter = $this->filterBuilder
+            ->setField('store_id')
+            ->setConditionType('eq')
+            ->setValue($this->storeManager->getStore()->getId())
+            ->create();
+        $isActiveFilter = $this->filterBuilder->setField('is_active')
+            ->setConditionType('eq')
+            ->setValue(1)
+            ->create();
+        $this->searchCriteriaBuilder->addFilters([$storeFilter]);
+        $this->searchCriteriaBuilder->addFilters([$isActiveFilter]);
+        return $this->searchCriteriaBuilder->create();
+    }
+}
diff --git a/app/code/Magento/CheckoutAgreements/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/StoreFilter.php b/app/code/Magento/CheckoutAgreements/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/StoreFilter.php
new file mode 100644
index 0000000000000..5372386868a55
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/StoreFilter.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Api\Filter;
+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection;
+
+/**
+ * Custom store filter to collection
+ */
+class StoreFilter implements CustomFilterInterface
+{
+    /**
+     * Apply custom store filter to collection
+     *
+     * @param Filter $filter
+     * @param AbstractDb $collection
+     * @return bool
+     */
+    public function apply(Filter $filter, AbstractDb $collection)
+    {
+        /** @var Collection $collection */
+        $collection->addStoreFilter($filter->getValue());
+        return true;
+    }
+}
diff --git a/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidation.php b/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidation.php
index c1a1568638310..fbceca0906702 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidation.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidation.php
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CheckoutAgreements\Model\Checkout\Plugin;
 
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
 use Magento\Store\Model\ScopeInterface;
+use Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter;
 
 /**
  * Class GuestValidation
@@ -23,28 +25,36 @@ class GuestValidation
     private $scopeConfiguration;
 
     /**
-     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface
+     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
      */
-    private $checkoutAgreementsRepository;
+    private $agreementsValidator;
 
     /**
-     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
+     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface
      */
-    private $agreementsValidator;
+    private $checkoutAgreementsList;
+
+    /**
+     * @var \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter
+     */
+    private $activeStoreAgreementsFilter;
 
     /**
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
-     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
+     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList
+     * @param ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
      */
     public function __construct(
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
-        \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
+        \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList,
+        \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
     ) {
         $this->agreementsValidator = $agreementsValidator;
         $this->scopeConfiguration = $scopeConfiguration;
-        $this->checkoutAgreementsRepository = $checkoutAgreementsRepository;
+        $this->checkoutAgreementsList = $checkoutAgreementsList;
+        $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter;
     }
 
     /**
@@ -53,6 +63,7 @@ public function __construct(
      * @param string $email
      * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -74,6 +85,7 @@ public function beforeSavePaymentInformationAndPlaceOrder(
      * @param string $email
      * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -102,7 +114,10 @@ private function validateAgreements(\Magento\Quote\Api\Data\PaymentInterface $pa
 
         if (!$this->agreementsValidator->isValid($agreements)) {
             throw new \Magento\Framework\Exception\CouldNotSaveException(
-                __('Please agree to all the terms and conditions before placing the order.')
+                __(
+                    "The order wasn't placed. "
+                    . "First, agree to the terms and conditions, then try placing your order again."
+                )
             );
         }
     }
@@ -117,7 +132,9 @@ private function isAgreementEnabled()
             AgreementsProvider::PATH_ENABLED,
             ScopeInterface::SCOPE_STORE
         );
-        $agreementsList = $isAgreementsEnabled ? $this->checkoutAgreementsRepository->getList() : [];
+        $agreementsList = $isAgreementsEnabled
+            ? $this->checkoutAgreementsList->getList($this->activeStoreAgreementsFilter->buildSearchCriteria())
+            : [];
         return (bool)($isAgreementsEnabled && count($agreementsList) > 0);
     }
 }
diff --git a/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php b/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
index 8ec73a33a5a3b..67e2a6c9ec334 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CheckoutAgreements\Model\Checkout\Plugin;
 
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
 use Magento\Store\Model\ScopeInterface;
+use Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter;
 
 /**
  * Class Validation
@@ -19,28 +21,36 @@ class Validation
     protected $scopeConfiguration;
 
     /**
-     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface
+     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
      */
-    protected $checkoutAgreementsRepository;
+    protected $agreementsValidator;
 
     /**
-     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
+     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface
      */
-    protected $agreementsValidator;
+    private $checkoutAgreementsList;
+
+    /**
+     * @var \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter
+     */
+    private $activeStoreAgreementsFilter;
 
     /**
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
-     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
+     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList
+     * @param ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
      */
     public function __construct(
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
-        \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
+        \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList,
+        \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
     ) {
         $this->agreementsValidator = $agreementsValidator;
         $this->scopeConfiguration = $scopeConfiguration;
-        $this->checkoutAgreementsRepository = $checkoutAgreementsRepository;
+        $this->checkoutAgreementsList = $checkoutAgreementsList;
+        $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter;
     }
 
     /**
@@ -48,6 +58,7 @@ public function __construct(
      * @param int $cartId
      * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -67,6 +78,7 @@ public function beforeSavePaymentInformationAndPlaceOrder(
      * @param int $cartId
      * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
      * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -94,7 +106,10 @@ protected function validateAgreements(\Magento\Quote\Api\Data\PaymentInterface $
 
         if (!$this->agreementsValidator->isValid($agreements)) {
             throw new \Magento\Framework\Exception\CouldNotSaveException(
-                __('Please agree to all the terms and conditions before placing the order.')
+                __(
+                    "The order wasn't placed. "
+                    . "First, agree to the terms and conditions, then try placing your order again."
+                )
             );
         }
     }
@@ -109,7 +124,9 @@ protected function isAgreementEnabled()
             AgreementsProvider::PATH_ENABLED,
             ScopeInterface::SCOPE_STORE
         );
-        $agreementsList = $isAgreementsEnabled ? $this->checkoutAgreementsRepository->getList() : [];
+        $agreementsList = $isAgreementsEnabled
+            ? $this->checkoutAgreementsList->getList($this->activeStoreAgreementsFilter->buildSearchCriteria())
+            : [];
         return (bool)($isAgreementsEnabled && count($agreementsList) > 0);
     }
 }
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php
new file mode 100644
index 0000000000000..2bca4803670fb
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsList.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Model;
+
+/**
+ * {@inheritdoc}
+ */
+class CheckoutAgreementsList implements \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface
+{
+    /**
+     * Collection factory.
+     *
+     * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
+     */
+    private $extensionAttributesJoinProcessor;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @param ResourceModel\Agreement\CollectionFactory $collectionFactory
+     * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
+     * @param \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
+     */
+    public function __construct(
+        \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory,
+        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
+        \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
+        $this->collectionProcessor = $collectionProcessor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) : array
+    {
+        /** @var $collection \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection */
+        $collection = $this->collectionFactory->create();
+        $this->collectionProcessor->process($searchCriteria, $collection);
+        $this->extensionAttributesJoinProcessor->process($collection);
+        return $collection->getItems();
+    }
+}
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
index 9fb4d4c59e200..60cc1f98264aa 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
@@ -7,15 +7,15 @@
 namespace Magento\CheckoutAgreements\Model;
 
 use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory as AgreementCollectionFactory;
-use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection as AgreementCollection;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
 use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Store\Model\Store;
+use Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter;
 
 /**
  * Checkout agreement repository.
@@ -60,6 +60,16 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      */
     private $extensionAttributesJoinProcessor;
 
+    /**
+     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface
+     */
+    private $agreementsList;
+
+    /**
+     * @var ActiveStoreAgreementsFilter
+     */
+    private $activeStoreAgreementsFilter;
+
     /**
      * Constructs a checkout agreement data object.
      *
@@ -69,6 +79,8 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * @param AgreementResource $agreementResource
      * @param AgreementFactory $agreementFactory
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
+     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface|null $agreementsList
+     * @param ActiveStoreAgreementsFilter|null $activeStoreAgreementsFilter
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -77,7 +89,9 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         AgreementResource $agreementResource,
         AgreementFactory $agreementFactory,
-        JoinProcessorInterface $extensionAttributesJoinProcessor
+        JoinProcessorInterface $extensionAttributesJoinProcessor,
+        \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $agreementsList = null,
+        ActiveStoreAgreementsFilter $activeStoreAgreementsFilter = null
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->storeManager = $storeManager;
@@ -85,6 +99,12 @@ public function __construct(
         $this->resourceModel = $agreementResource;
         $this->agreementFactory = $agreementFactory;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
+        $this->agreementsList = $agreementsList ?: ObjectManager::getInstance()->get(
+            \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
+        );
+        $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter ?: ObjectManager::getInstance()->get(
+            ActiveStoreAgreementsFilter::class
+        );
     }
 
     /**
@@ -97,18 +117,7 @@ public function getList()
         if (!$this->scopeConfig->isSetFlag('checkout/options/enable_agreements', ScopeInterface::SCOPE_STORE)) {
             return [];
         }
-        $storeId = $this->storeManager->getStore()->getId();
-        /** @var $agreementCollection AgreementCollection */
-        $agreementCollection = $this->collectionFactory->create();
-        $this->extensionAttributesJoinProcessor->process($agreementCollection);
-        $agreementCollection->addStoreFilter($storeId);
-        $agreementCollection->addFieldToFilter('is_active', 1);
-        $agreementDataObjects = [];
-        foreach ($agreementCollection as $agreement) {
-            $agreementDataObjects[] = $agreement;
-        }
-
-        return $agreementDataObjects;
+        return $this->agreementsList->getList($this->activeStoreAgreementsFilter->buildSearchCriteria());
     }
 
     /**
@@ -129,7 +138,7 @@ public function save(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $da
             $this->resourceModel->save($data);
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\CouldNotSaveException(
-                __('Unable to save checkout agreement %1', $data->getAgreementId())
+                __('The "%1" checkout agreement couldn\'t be saved.', $data->getAgreementId())
             );
         }
         return $data;
@@ -144,7 +153,7 @@ public function delete(\Magento\CheckoutAgreements\Api\Data\AgreementInterface $
             $this->resourceModel->delete($data);
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\CouldNotDeleteException(
-                __('Unable to remove checkout agreement %1', $data->getAgreementId())
+                __('The "%1" checkout agreement couldn\'t be removed.', $data->getAgreementId())
             );
         }
         return true;
@@ -169,7 +178,9 @@ public function get($id, $storeId = null)
         $agreement = $this->agreementFactory->create();
         $this->resourceModel->load($agreement, $id);
         if (!$agreement->getId()) {
-            throw new NoSuchEntityException(__('Checkout agreement with specified ID "%1" not found.', $id));
+            throw new NoSuchEntityException(
+                __('A checkout agreement with the "%1" specified ID wasn\'t found. Verify the ID and try again.', $id)
+            );
         }
         return $agreement;
     }
diff --git a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
new file mode 100644
index 0000000000000..bc055ca9f663b
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid;
+
+/**
+ * CheckoutAgreement Grid Collection
+ */
+class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function load($printQuery = false, $logQuery = false)
+    {
+        if ($this->isLoaded()) {
+            return $this;
+        }
+
+        parent::load($printQuery, $logQuery);
+
+        $this->addStoresToResult();
+
+        return $this;
+    }
+
+    /**
+     * Add stores to result
+     *
+     * @return void
+     */
+    private function addStoresToResult()
+    {
+        $stores = $this->getStoresForAgreements();
+
+        if (!empty($stores)) {
+            $storesByAgreementId = [];
+
+            foreach ($stores as $storeData) {
+                $storesByAgreementId[$storeData['agreement_id']][] = $storeData['store_id'];
+            }
+
+            foreach ($this as $item) {
+                $agreementId = $item->getData('agreement_id');
+
+                if (!isset($storesByAgreementId[$agreementId])) {
+                    continue;
+                }
+
+                $item->setData('stores', $storesByAgreementId[$agreementId]);
+            }
+        }
+    }
+
+    /**
+     * Get stores for agreements
+     *
+     * @return array
+     */
+    private function getStoresForAgreements()
+    {
+        $agreementId = $this->getColumnValues('agreement_id');
+
+        if (!empty($agreementId)) {
+            $select = $this->getConnection()->select()->from(
+                ['agreement_store' => $this->getResource()->getTable('checkout_agreement_store')]
+            )->where(
+                'agreement_store.agreement_id IN (?)',
+                $agreementId
+            );
+
+            return $this->getConnection()->fetchAll($select);
+        }
+
+        return [];
+    }
+}
diff --git a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
deleted file mode 100644
index 8e043ecd78d5b..0000000000000
--- a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CheckoutAgreements\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'checkout_agreement'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('checkout_agreement')
-        )->addColumn(
-            'agreement_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Agreement Id'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'content',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Content'
-        )->addColumn(
-            'content_height',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            25,
-            [],
-            'Content Height'
-        )->addColumn(
-            'checkbox_text',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Checkbox Text'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Is Active'
-        )->addColumn(
-            'is_html',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Is Html'
-        )->setComment(
-            'Checkout Agreement'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'checkout_agreement_store'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('checkout_agreement_store')
-        )->addColumn(
-            'agreement_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Agreement Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store Id'
-        )->addForeignKey(
-            $installer->getFkName('checkout_agreement_store', 'agreement_id', 'checkout_agreement', 'agreement_id'),
-            'agreement_id',
-            $installer->getTable('checkout_agreement'),
-            'agreement_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('checkout_agreement_store', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Checkout Agreement Store'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php b/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php
deleted file mode 100644
index ee1efcefa386d..0000000000000
--- a/app/code/Magento/CheckoutAgreements/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\CheckoutAgreements\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * Class UpgradeSchema
- *
- * Used to create/modify DB tables
- *
- * Fresh install processing order:
- * - InstallSchema
- * - UpgradeSchema (installed version will be equal to '' on fresh install)
- *
- * Upgrade processing order:
- * - UpgradeSchema(Runs if version in module.xml is greater than installed version)
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $connection = $setup->getConnection();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $column = [
-                'type' => Table::TYPE_SMALLINT,
-                'length' => 6,
-                'nullable' => false,
-                'comment' => 'Applied mode',
-                'default' => '0'
-            ];
-            $connection->addColumn($setup->getTable('checkout_agreement'), 'mode', $column);
-        }
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE.txt b/app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE.txt
rename to app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE_AFL.txt b/app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE_AFL.txt
rename to app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/README.md b/app/code/Magento/CheckoutAgreements/Test/Mftf/README.md
new file mode 100644
index 0000000000000..593e89f08b5b5
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Checkout Agreements Functional Tests
+
+The Functional Test Module for **Magento Checkout Agreements** module.
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
index eae347e27aa11..c59a3d2433ec2 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
@@ -23,25 +23,39 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $agreementsRepositoryMock;
+    protected $escaperMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $escaperMock;
+    private $checkoutAgreementsListMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $agreementsFilterMock;
 
     protected function setUp()
     {
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->agreementsRepositoryMock = $this->createMock(
+        $agreementsRepositoryMock = $this->createMock(
             \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface::class
         );
         $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
 
+        $this->checkoutAgreementsListMock = $this->createMock(
+            \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
+        );
+        $this->agreementsFilterMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter::class
+        );
+
         $this->model = new \Magento\CheckoutAgreements\Model\AgreementsConfigProvider(
             $this->scopeConfigMock,
-            $this->agreementsRepositoryMock,
-            $this->escaperMock
+            $agreementsRepositoryMock,
+            $this->escaperMock,
+            $this->checkoutAgreementsListMock,
+            $this->agreementsFilterMock
         );
     }
 
@@ -71,7 +85,14 @@ public function testGetConfigIfContentIsHtml()
             ->willReturn(true);
 
         $agreement = $this->createMock(\Magento\CheckoutAgreements\Api\Data\AgreementInterface::class);
-        $this->agreementsRepositoryMock->expects($this->any())->method('getList')->willReturn([$agreement]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([$agreement]);
 
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
         $agreement->expects($this->once())->method('getContent')->willReturn($content);
@@ -109,7 +130,15 @@ public function testGetConfigIfContentIsNotHtml()
             ->willReturn(true);
 
         $agreement = $this->createMock(\Magento\CheckoutAgreements\Api\Data\AgreementInterface::class);
-        $this->agreementsRepositoryMock->expects($this->any())->method('getList')->willReturn([$agreement]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([$agreement]);
+
         $this->escaperMock->expects($this->once())->method('escapeHtml')->with($content)->willReturn($escapedContent);
 
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(false);
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/StoreFilterTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/StoreFilterTest.php
new file mode 100644
index 0000000000000..1aee296162add
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/StoreFilterTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Test\Unit\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use PHPUnit\Framework\TestCase;
+use Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\StoreFilter;
+
+class StoreFilterTest extends TestCase
+{
+    /**
+     * @var StoreFilter
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new StoreFilter();
+    }
+
+    public function testApply()
+    {
+        $filterMock = $this->createMock(\Magento\Framework\Api\Filter::class);
+        $filterMock->expects($this->once())->method('getValue')->willReturn(1);
+        $collectionMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection::class
+        );
+        $collectionMock->expects($this->once())->method('addStoreFilter')->with(1)->willReturnSelf();
+        $this->assertTrue($this->model->apply($filterMock, $collectionMock));
+    }
+}
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php
index 23c6adf48f721..3d7b910c7abc5 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CheckoutAgreements\Test\Unit\Model\Checkout\Plugin;
 
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Class GuestValidationTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class GuestValidationTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -43,12 +48,17 @@ class GuestValidationTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $repositoryMock;
+    private $scopeConfigMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $scopeConfigMock;
+    private $checkoutAgreementsListMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $agreementsFilterMock;
 
     protected function setUp()
     {
@@ -61,14 +71,18 @@ protected function setUp()
             ['getAgreementIds']
         );
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->repositoryMock = $this->createMock(
-            \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface::class
+        $this->checkoutAgreementsListMock = $this->createMock(
+            \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
+        );
+        $this->agreementsFilterMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter::class
         );
 
         $this->model = new \Magento\CheckoutAgreements\Model\Checkout\Plugin\GuestValidation(
             $this->agreementsValidatorMock,
             $this->scopeConfigMock,
-            $this->repositoryMock
+            $this->checkoutAgreementsListMock,
+            $this->agreementsFilterMock
         );
     }
 
@@ -82,7 +96,14 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
             ->method('isSetFlag')
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
-        $this->repositoryMock->expects($this->once())->method('getList')->willReturn([1]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
         $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(true);
         $this->paymentMock->expects(static::atLeastOnce())
@@ -99,7 +120,6 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Please agree to all the terms and conditions before placing the order.
      */
     public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotValid()
     {
@@ -111,7 +131,14 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
             ->method('isSetFlag')
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
-        $this->repositoryMock->expects($this->once())->method('getList')->willReturn([1]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
         $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(false);
         $this->paymentMock->expects(static::atLeastOnce())
@@ -124,6 +151,10 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
             $this->paymentMock,
             $this->addressMock
         );
+
+        $this->expectExceptionMessage(
+            "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
+        );
     }
 
     public function testBeforeSavePaymentInformation()
@@ -136,7 +167,14 @@ public function testBeforeSavePaymentInformation()
             ->method('isSetFlag')
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
-        $this->repositoryMock->expects($this->once())->method('getList')->willReturn([1]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
         $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(true);
         $this->paymentMock->expects(static::atLeastOnce())
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php
index fbc896863e5b5..7f11fad202401 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CheckoutAgreements\Test\Unit\Model\Checkout\Plugin;
 
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Class ValidationTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ValidationTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -43,12 +48,17 @@ class ValidationTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $repositoryMock;
+    protected $scopeConfigMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeConfigMock;
+    private $checkoutAgreementsListMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $agreementsFilterMock;
 
     protected function setUp()
     {
@@ -61,14 +71,18 @@ protected function setUp()
             ['getAgreementIds']
         );
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->repositoryMock = $this->createMock(
-            \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface::class
+        $this->checkoutAgreementsListMock = $this->createMock(
+            \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
+        );
+        $this->agreementsFilterMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter::class
         );
 
         $this->model = new \Magento\CheckoutAgreements\Model\Checkout\Plugin\Validation(
             $this->agreementsValidatorMock,
             $this->scopeConfigMock,
-            $this->repositoryMock
+            $this->checkoutAgreementsListMock,
+            $this->agreementsFilterMock
         );
     }
 
@@ -81,7 +95,14 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
             ->method('isSetFlag')
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
-        $this->repositoryMock->expects($this->once())->method('getList')->willReturn([1]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
         $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(true);
         $this->paymentMock->expects(static::atLeastOnce())
@@ -92,7 +113,6 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Please agree to all the terms and conditions before placing the order.
      */
     public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotValid()
     {
@@ -103,13 +123,24 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
             ->method('isSetFlag')
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
-        $this->repositoryMock->expects($this->once())->method('getList')->willReturn([1]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
         $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(false);
         $this->paymentMock->expects(static::atLeastOnce())
             ->method('getExtensionAttributes')
             ->willReturn($this->extensionAttributesMock);
         $this->model->beforeSavePaymentInformation($this->subjectMock, $cartId, $this->paymentMock, $this->addressMock);
+
+        $this->expectExceptionMessage(
+            "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
+        );
     }
 
     public function testBeforeSavePaymentInformation()
@@ -121,7 +152,14 @@ public function testBeforeSavePaymentInformation()
             ->method('isSetFlag')
             ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
             ->willReturn(true);
-        $this->repositoryMock->expects($this->once())->method('getList')->willReturn([1]);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
+        $this->checkoutAgreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([1]);
         $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(true);
         $this->paymentMock->expects(static::atLeastOnce())
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsListTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsListTest.php
new file mode 100644
index 0000000000000..38c6d2485a9aa
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsListTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Test\Unit\Model;
+
+class CheckoutAgreementsListTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\CheckoutAgreements\Model\CheckoutAgreementsList
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributesJoinProcessorMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionProcessorMock;
+
+    protected function setUp()
+    {
+        $this->collectionFactoryMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory::class
+        );
+        $this->attributesJoinProcessorMock = $this->createMock(
+            \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface::class
+        );
+        $this->collectionProcessorMock = $this->createMock(
+            \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
+        );
+        $this->model = new \Magento\CheckoutAgreements\Model\CheckoutAgreementsList(
+            $this->collectionFactoryMock,
+            $this->attributesJoinProcessorMock,
+            $this->collectionProcessorMock
+        );
+    }
+
+    public function testGetList()
+    {
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
+        $collectionMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection::class
+        );
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
+        $this->collectionProcessorMock->expects($this->once())
+            ->method('process')
+            ->with($searchCriteriaMock, $collectionMock);
+        $this->attributesJoinProcessorMock->expects($this->once())->method('process')->with($collectionMock);
+        $agreementMock = $this->createMock(\Magento\CheckoutAgreements\Api\Data\AgreementInterface::class);
+        $collectionMock->expects($this->once())->method('getItems')->willReturn([$agreementMock]);
+        $this->assertEquals([$agreementMock], $this->model->getList($searchCriteriaMock));
+    }
+}
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsRepositoryTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsRepositoryTest.php
index bcb3c798e515c..44c4bcecebe88 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsRepositoryTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsRepositoryTest.php
@@ -64,6 +64,16 @@ class CheckoutAgreementsRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     protected $extensionAttributesJoinProcessorMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $agreementsListMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $agreementsFilterMock;
+
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -88,13 +98,22 @@ protected function setUp()
             ['process']
         );
 
+        $this->agreementsListMock = $this->createMock(
+            \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
+        );
+        $this->agreementsFilterMock = $this->createMock(
+            \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter::class
+        );
+
         $this->model = new \Magento\CheckoutAgreements\Model\CheckoutAgreementsRepository(
             $this->factoryMock,
             $this->storeManagerMock,
             $this->scopeConfigMock,
             $this->resourceMock,
             $this->agrFactoryMock,
-            $this->extensionAttributesJoinProcessorMock
+            $this->extensionAttributesJoinProcessorMock,
+            $this->agreementsListMock,
+            $this->agreementsFilterMock
         );
     }
 
@@ -112,28 +131,20 @@ public function testGetListReturnsEmptyListIfCheckoutAgreementsAreDisabledOnFron
 
     public function testGetListReturnsTheListOfActiveCheckoutAgreements()
     {
-        $this->extensionAttributesJoinProcessorMock->expects($this->once())
-            ->method('process')
-            ->with($this->isInstanceOf(\Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection::class));
-
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
             ->with('checkout/options/enable_agreements', ScopeInterface::SCOPE_STORE, null)
             ->will($this->returnValue(true));
 
-        $storeId = 1;
-        $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
-        $storeMock->expects($this->any())->method('getId')->will($this->returnValue($storeId));
-        $this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
-
-        $collectionMock = $this->objectManager->getCollectionMock(
-            \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection::class,
-            [$this->agreementMock]
-        );
-        $this->factoryMock->expects($this->once())->method('create')->will($this->returnValue($collectionMock));
-        $collectionMock->expects($this->once())->method('addStoreFilter')->with($storeId);
-        $collectionMock->expects($this->once())->method('addFieldToFilter')->with('is_active', 1);
+        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $this->agreementsFilterMock->expects($this->once())
+            ->method('buildSearchCriteria')
+            ->willReturn($searchCriteriaMock);
 
+        $this->agreementsListMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn([$this->agreementMock]);
         $this->assertEquals([$this->agreementMock], $this->model->getList());
     }
 
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 74df969951219..7408bf5cab3fe 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
index 1249ea44b991e..5a708f49a7034 100644
--- a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="admin">
-        <route id="checkout" frontName="checkout">
+        <route id="checkout">
             <module name="Magento_CheckoutAgreements" before="Magento_Backend" />
         </route>
     </router>
diff --git a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
new file mode 100644
index 0000000000000..09cd1c5b63965
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="checkout_agreement" resource="default" engine="innodb" comment="Checkout Agreement">
+        <column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Agreement Id"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="text" name="content" nullable="true" comment="Content"/>
+        <column xsi:type="varchar" name="content_height" nullable="true" length="25" comment="Content Height"/>
+        <column xsi:type="text" name="checkbox_text" nullable="true" comment="Checkbox Text"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Is Active"/>
+        <column xsi:type="smallint" name="is_html" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Is Html"/>
+        <column xsi:type="smallint" name="mode" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Applied mode"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="agreement_id"/>
+        </constraint>
+    </table>
+    <table name="checkout_agreement_store" resource="default" engine="innodb" comment="Checkout Agreement Store">
+        <column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Agreement Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="agreement_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CHKT_AGRT_STORE_AGRT_ID_CHKT_AGRT_AGRT_ID" table="checkout_agreement_store"
+                    column="agreement_id" referenceTable="checkout_agreement" referenceColumn="agreement_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CHECKOUT_AGREEMENT_STORE_STORE_ID_STORE_STORE_ID"
+                    table="checkout_agreement_store" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="CASCADE"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/CheckoutAgreements/etc/db_schema_whitelist.json b/app/code/Magento/CheckoutAgreements/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..f0be46a47e063
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/etc/db_schema_whitelist.json
@@ -0,0 +1,28 @@
+{
+    "checkout_agreement": {
+        "column": {
+            "agreement_id": true,
+            "name": true,
+            "content": true,
+            "content_height": true,
+            "checkbox_text": true,
+            "is_active": true,
+            "is_html": true,
+            "mode": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "checkout_agreement_store": {
+        "column": {
+            "agreement_id": true,
+            "store_id": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CHKT_AGRT_STORE_AGRT_ID_CHKT_AGRT_AGRT_ID": true,
+            "CHECKOUT_AGREEMENT_STORE_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CheckoutAgreements/etc/di.xml b/app/code/Magento/CheckoutAgreements/etc/di.xml
index 12415e328356b..081e3daa781ff 100644
--- a/app/code/Magento/CheckoutAgreements/etc/di.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/di.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface" type="Magento\CheckoutAgreements\Model\CheckoutAgreementsRepository" />
     <preference for="Magento\CheckoutAgreements\Api\Data\AgreementInterface" type="Magento\CheckoutAgreements\Model\Agreement" />
+    <preference for="Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface" type="Magento\CheckoutAgreements\Model\CheckoutAgreementsList" />
     <type name="Magento\CheckoutAgreements\Model\AgreementsValidator">
         <arguments>
             <argument name="list" xsi:type="array">
@@ -22,4 +23,25 @@
     <type name="Magento\Checkout\Api\GuestPaymentInformationManagementInterface">
         <plugin name="validate-guest-agreements" type="Magento\CheckoutAgreements\Model\Checkout\Plugin\GuestValidation"/>
     </type>
+    <type name="\Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
+        <arguments>
+            <argument name="collectionProcessor" xsi:type="object">Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="filters" xsi:type="object">Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor</item>
+                <item name="sorting" xsi:type="object">Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor</item>
+                <item name="pagination" xsi:type="object">Magento\Framework\Api\SearchCriteria\CollectionProcessor\PaginationProcessor</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
+        <arguments>
+            <argument name="customFilters" xsi:type="array">
+                <item name="store_id" xsi:type="object">Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\StoreFilter</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/app/code/Magento/CheckoutAgreements/etc/module.xml b/app/code/Magento/CheckoutAgreements/etc/module.xml
index 42a373eaad429..1ea97b556be67 100644
--- a/app/code/Magento/CheckoutAgreements/etc/module.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CheckoutAgreements" setup_version="2.2.0">
+    <module name="Magento_CheckoutAgreements" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Checkout"/>
diff --git a/app/code/Magento/CheckoutAgreements/etc/webapi.xml b/app/code/Magento/CheckoutAgreements/etc/webapi.xml
index 5a39f9760c62c..45969c457b0fe 100644
--- a/app/code/Magento/CheckoutAgreements/etc/webapi.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/webapi.xml
@@ -13,4 +13,10 @@
             <resource ref="Magento_Sales::sales" />
         </resources>
     </route>
+    <route url="/V1/carts/licence/list" method="GET">
+        <service class="Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface" method="getList"/>
+        <resources>
+            <resource ref="Magento_Sales::sales" />
+        </resources>
+    </route>
 </routes>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
index 663cae4debcfa..28a6e998d8d4e 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
@@ -13,11 +13,11 @@ if (!$block->getAgreements()) {
     return;
 }
 
-/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $argeementsCollection */
-$argeementsCollection = $block->getAgreements();
+/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $agreementsCollection */
+$agreementsCollection = $block->getAgreements();
 $agreementMappedArray = [];
 /** @var \Magento\CheckoutAgreements\Model\Agreement $agreement */
-foreach ($argeementsCollection as $agreement) {
+foreach ($agreementsCollection as $agreement) {
     if ($agreement->getIsActive()) {
         $agreementMappedArray[] = [
             'mode' => $agreement->getMode(),
diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
index 9b285051fc44b..b713ca91ea852 100644
--- a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Cms\Api;
 
-use Magento\Framework\Api\SearchCriteriaInterface;
-
 /**
  * CMS block CRUD interface.
  * @api
diff --git a/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php b/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php
new file mode 100644
index 0000000000000..c6bf4c8404701
--- /dev/null
+++ b/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Api;
+
+/**
+ * Utility Cms Pages
+ *
+ * @api
+ */
+interface GetUtilityPageIdentifiersInterface
+{
+    /**
+     * Get List Page Identifiers
+     * @return array
+     */
+    public function execute();
+}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
index a7410cac64d76..51a9313fdefd2 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
@@ -13,7 +13,7 @@
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
     /**
-     * @return array
+     * @inheritDoc
      */
     public function getButtonData()
     {
@@ -24,7 +24,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                ) . '\', \'' . $this->getDeleteUrl() . '\', {"data": {}})',
                 'sort_order' => 20,
             ];
         }
@@ -32,6 +32,8 @@ public function getButtonData()
     }
 
     /**
+     * URL to send delete requests to.
+     *
      * @return string
      */
     public function getDeleteUrl()
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/ResetButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/ResetButton.php
deleted file mode 100644
index acbfd3e1a7aa1..0000000000000
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/ResetButton.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Block\Adminhtml\Block\Edit;
-
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-
-/**
- * Class ResetButton
- */
-class ResetButton implements ButtonProviderInterface
-{
-    /**
-     * @return array
-     */
-    public function getButtonData()
-    {
-        return [
-            'label' => __('Reset'),
-            'class' => 'reset',
-            'on_click' => 'location.reload();',
-            'sort_order' => 30
-        ];
-    }
-}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php
deleted file mode 100644
index eeae1ee18663e..0000000000000
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Block\Adminhtml\Block\Edit;
-
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-
-/**
- * Class SaveAndContinueButton
- */
-class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
-{
-    /**
-     * @return array
-     */
-    public function getButtonData()
-    {
-        return [
-            'label' => __('Save and Continue Edit'),
-            'class' => 'save',
-            'data_attribute' => [
-                'mage-init' => [
-                    'button' => ['event' => 'saveAndContinueEdit'],
-                ],
-            ],
-            'sort_order' => 80,
-        ];
-    }
-}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveButton.php
index f64f54ef5918c..ac2b9652c9f78 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveButton.php
@@ -6,6 +6,7 @@
 namespace Magento\Cms\Block\Adminhtml\Block\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Ui\Component\Control\Container;
 
 /**
  * Class SaveButton
@@ -19,13 +20,85 @@ class SaveButton extends GenericButton implements ButtonProviderInterface
     public function getButtonData()
     {
         return [
-            'label' => __('Save Block'),
+            'label' => __('Save'),
             'class' => 'save primary',
             'data_attribute' => [
-                'mage-init' => ['button' => ['event' => 'save']],
-                'form-role' => 'save',
+                'mage-init' => [
+                    'buttonAdapter' => [
+                        'actions' => [
+                            [
+                                'targetName' => 'cms_block_form.cms_block_form',
+                                'actionName' => 'save',
+                                'params' => [
+                                    true,
+                                    [
+                                        'back' => 'continue'
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
             ],
-            'sort_order' => 90,
+            'class_name' => Container::SPLIT_BUTTON,
+            'options' => $this->getOptions(),
         ];
     }
+
+    /**
+     * Retrieve options
+     *
+     * @return array
+     */
+    private function getOptions()
+    {
+        $options = [
+            [
+                'label' => __('Save & Duplicate'),
+                'id_hard' => 'save_and_duplicate',
+                'data_attribute' => [
+                    'mage-init' => [
+                        'buttonAdapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'cms_block_form.cms_block_form',
+                                    'actionName' => 'save',
+                                    'params' => [
+                                        true,
+                                        [
+                                            'back' => 'duplicate'
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+            [
+                'id_hard' => 'save_and_close',
+                'label' => __('Save & Close'),
+                'data_attribute' => [
+                    'mage-init' => [
+                        'buttonAdapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'cms_block_form.cms_block_form',
+                                    'actionName' => 'save',
+                                    'params' => [
+                                        true,
+                                        [
+                                            'back' => 'close'
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        return $options;
+    }
 }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
index 1fc599e4c856a..b434fd3f5d348 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
@@ -13,7 +13,7 @@
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
     /**
-     * @return array
+     * @inheritDoc
      */
     public function getButtonData()
     {
@@ -24,7 +24,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                ) . '\', \'' . $this->getDeleteUrl() . '\', {"data": {}})',
                 'sort_order' => 20,
             ];
         }
@@ -32,6 +32,8 @@ public function getButtonData()
     }
 
     /**
+     * Url to send delete requests to.
+     *
      * @return string
      */
     public function getDeleteUrl()
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/ResetButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/ResetButton.php
deleted file mode 100644
index 5be536e2da39b..0000000000000
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/ResetButton.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Block\Adminhtml\Page\Edit;
-
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-
-/**
- * Class ResetButton
- */
-class ResetButton implements ButtonProviderInterface
-{
-    /**
-     * @return array
-     */
-    public function getButtonData()
-    {
-        return [
-            'label' => __('Reset'),
-            'class' => 'reset',
-            'on_click' => 'location.reload();',
-            'sort_order' => 30
-        ];
-    }
-}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php
deleted file mode 100644
index b767b299c41d3..0000000000000
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Block\Adminhtml\Page\Edit;
-
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-
-/**
- * Class SaveAndContinueButton
- */
-class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
-{
-    /**
-     * @return array
-     */
-    public function getButtonData()
-    {
-        return [
-            'label' => __('Save and Continue Edit'),
-            'class' => 'save',
-            'data_attribute' => [
-                'mage-init' => [
-                    'button' => ['event' => 'saveAndContinueEdit'],
-                ],
-            ],
-            'sort_order' => 80,
-        ];
-    }
-}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveButton.php
index 5631e6c838fb2..676cdd3918470 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveButton.php
@@ -6,6 +6,7 @@
 namespace Magento\Cms\Block\Adminhtml\Page\Edit;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Ui\Component\Control\Container;
 
 /**
  * Class SaveButton
@@ -19,13 +20,80 @@ class SaveButton extends GenericButton implements ButtonProviderInterface
     public function getButtonData()
     {
         return [
-            'label' => __('Save Page'),
+            'label' => __('Save'),
             'class' => 'save primary',
             'data_attribute' => [
-                'mage-init' => ['button' => ['event' => 'save']],
-                'form-role' => 'save',
+                'mage-init' => [
+                    'buttonAdapter' => [
+                        'actions' => [
+                            [
+                                'targetName' => 'cms_page_form.cms_page_form',
+                                'actionName' => 'save',
+                                'params' => [
+                                    false
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
             ],
+            'class_name' => Container::SPLIT_BUTTON,
+            'options' => $this->getOptions(),
             'sort_order' => 90,
         ];
     }
+
+    /**
+     * Retrieve options
+     *
+     * @return array
+     */
+    private function getOptions()
+    {
+        $options = [
+            [
+                'label' => __('Save & Duplicate'),
+                'id_hard' => 'save_and_duplicate',
+                'data_attribute' => [
+                    'mage-init' => [
+                        'buttonAdapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'cms_page_form.cms_page_form',
+                                    'actionName' => 'save',
+                                    'params' => [
+                                        true,
+                                        [
+                                            'back' => 'duplicate'
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+            [
+                'id_hard' => 'save_and_close',
+                'label' => __('Save & Close'),
+                'data_attribute' => [
+                    'mage-init' => [
+                        'buttonAdapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'cms_page_form.cms_page_form',
+                                    'actionName' => 'save',
+                                    'params' => [
+                                        true
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+            ]
+        ];
+
+        return $options;
+    }
 }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
index 67ae137fb4d8e..08ba2c3fff330 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action;
 
-use Magento\Store\Api\StoreResolverInterface;
-
+/**
+ * Url builder class used to compose dynamic urls.
+ */
 class UrlBuilder
 {
     /**
@@ -32,15 +33,25 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
      */
     public function getUrl($routePath, $scope, $store)
     {
-        $this->frontendUrlBuilder->setScope($scope);
-        $href = $this->frontendUrlBuilder->getUrl(
-            $routePath,
-            [
-                '_current' => false,
-                '_nosid' => true,
-                '_query' => [StoreResolverInterface::PARAM_NAME => $store]
-            ]
-        );
+        if ($scope) {
+            $this->frontendUrlBuilder->setScope($scope);
+            $href = $this->frontendUrlBuilder->getUrl(
+                $routePath,
+                [
+                    '_current' => false,
+                    '_nosid' => true,
+                    '_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
+                ]
+            );
+        } else {
+            $href = $this->frontendUrlBuilder->getUrl(
+                $routePath,
+                [
+                    '_current' => false,
+                    '_nosid' => true
+                ]
+            );
+        }
 
         return $href;
     }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
index f1e1b3797d8d3..e94992ae26b60 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
@@ -78,7 +78,7 @@ protected function _construct()
 
         $this->buttonList->add(
             'insert_files',
-            ['class' => 'save no-display primary', 'label' => __('Add Selected'), 'type' => 'button'],
+            ['class' => 'save no-display action-primary', 'label' => __('Add Selected'), 'type' => 'button'],
             0,
             0,
             'header'
@@ -92,7 +92,9 @@ protected function _construct()
      */
     public function getContentsUrl()
     {
-        return $this->getUrl('cms/*/contents', ['type' => $this->getRequest()->getParam('type')]);
+        return $this->getUrl('cms/*/contents', [
+            'type' => $this->getRequest()->getParam('type'),
+        ]);
     }
 
     /**
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
index e76da406f4c33..d862e5df06fe6 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
@@ -75,7 +75,7 @@ public function getFilesCount()
     }
 
     /**
-     * File idetifier getter
+     * File identifier getter
      *
      * @param  \Magento\Framework\DataObject $file
      * @return string
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index 5471bbfb8b0f3..41e9358e160cf 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -69,12 +69,21 @@ public function getTreeJson()
         );
         $jsonArray = [];
         foreach ($collection as $item) {
-            $jsonArray[] = [
+            $data = [
                 'text' => $this->_cmsWysiwygImages->getShortFilename($item->getBasename(), 20),
                 'id' => $this->_cmsWysiwygImages->convertPathToId($item->getFilename()),
                 'path' => substr($item->getFilename(), strlen($storageRoot)),
                 'cls' => 'folder',
             ];
+
+            $hasNestedDirectories = count(glob($item->getFilename() . '/*', GLOB_ONLYDIR)) > 0;
+
+            // if no nested directories inside dir, add 'leaf' state so that jstree hides dropdown arrow next to dir
+            if (!$hasNestedDirectories) {
+                $data['state'] = 'leaf';
+            }
+
+            $jsonArray[] = $data;
         }
         return $this->serializer->serialize($jsonArray);
     }
@@ -86,7 +95,18 @@ public function getTreeJson()
      */
     public function getTreeLoaderUrl()
     {
-        return $this->getUrl('cms/*/treeJson');
+        $params = [];
+
+        $currentTreePath = $this->getRequest()->getParam('current_tree_path');
+
+        if (strlen($currentTreePath)) {
+            $params['current_tree_path'] = $currentTreePath;
+        }
+
+        return $this->getUrl(
+            'cms/*/treeJson',
+            $params
+        );
     }
 
     /**
@@ -107,7 +127,14 @@ public function getRootNodeName()
     public function getTreeCurrentPath()
     {
         $treePath = ['root'];
-        if ($path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath()) {
+
+        if ($idEncodedPath = $this->getRequest()->getParam('current_tree_path')) {
+            $path = $this->_cmsWysiwygImages->idDecode($idEncodedPath);
+        } else {
+            $path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath();
+        }
+
+        if (strlen($path)) {
             $path = str_replace($this->_cmsWysiwygImages->getStorageRoot(), '', $path);
             $relative = [];
             foreach (explode('/', $path) as $dirName) {
@@ -117,6 +144,7 @@ public function getTreeCurrentPath()
                 }
             }
         }
+
         return $treePath;
     }
 
diff --git a/app/code/Magento/Cms/Block/Widget/Block.php b/app/code/Magento/Cms/Block/Widget/Block.php
index d8bd483fae5e4..aa6aeaff4ecbe 100644
--- a/app/code/Magento/Cms/Block/Widget/Block.php
+++ b/app/code/Magento/Cms/Block/Widget/Block.php
@@ -3,14 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Block\Widget;
 
+use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Cms\Model\Block as CmsBlock;
+use Magento\Widget\Block\BlockInterface;
+
 /**
  * Cms Static Block Widget
  *
- * @author     Magento Core Team <core@magentocommerce.com>
+ * @author Magento Core Team <core@magentocommerce.com>
  */
-class Block extends \Magento\Framework\View\Element\Template implements \Magento\Widget\Block\BlockInterface
+class Block extends \Magento\Framework\View\Element\Template implements BlockInterface, IdentityInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
@@ -31,6 +39,11 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
      */
     protected $_blockFactory;
 
+    /**
+     * @var CmsBlock
+     */
+    private $block;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
@@ -49,8 +62,9 @@ public function __construct(
     }
 
     /**
-     * Prepare block text and determine whether block output enabled or not
-     * Prevent blocks recursion if needed
+     * Prepare block text and determine whether block output enabled or not.
+     *
+     * Prevent blocks recursion if needed.
      *
      * @return $this
      */
@@ -65,19 +79,63 @@ protected function _beforeToHtml()
         }
         self::$_widgetUsageMap[$blockHash] = true;
 
-        if ($blockId) {
-            $storeId = $this->_storeManager->getStore()->getId();
-            /** @var \Magento\Cms\Model\Block $block */
-            $block = $this->_blockFactory->create();
-            $block->setStoreId($storeId)->load($blockId);
-            if ($block->isActive()) {
+        $block = $this->getBlock();
+
+        if ($block && $block->isActive()) {
+            try {
+                $storeId = $this->_storeManager->getStore()->getId();
                 $this->setText(
                     $this->_filterProvider->getBlockFilter()->setStoreId($storeId)->filter($block->getContent())
                 );
+            } catch (NoSuchEntityException $e) {
             }
         }
-
         unset(self::$_widgetUsageMap[$blockHash]);
         return $this;
     }
+
+    /**
+     * Get identities of the Cms Block
+     *
+     * @return array
+     */
+    public function getIdentities()
+    {
+        $block = $this->getBlock();
+
+        if ($block) {
+            return $block->getIdentities();
+        }
+
+        return [];
+    }
+
+    /**
+     * Get block
+     *
+     * @return CmsBlock|null
+     */
+    private function getBlock(): ?CmsBlock
+    {
+        if ($this->block) {
+            return $this->block;
+        }
+
+        $blockId = $this->getData('block_id');
+
+        if ($blockId) {
+            try {
+                $storeId = $this->_storeManager->getStore()->getId();
+                /** @var \Magento\Cms\Model\Block $block */
+                $block = $this->_blockFactory->create();
+                $block->setStoreId($storeId)->load($blockId);
+                $this->block = $block;
+
+                return $block;
+            } catch (NoSuchEntityException $e) {
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
index 76b6aeb013285..4af6b684496ea 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-class Delete extends \Magento\Cms\Controller\Adminhtml\Block
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
 {
     /**
      * Delete action
@@ -26,18 +28,18 @@ public function execute()
                 $model->load($id);
                 $model->delete();
                 // display success message
-                $this->messageManager->addSuccess(__('You deleted the block.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the block.'));
                 // go to grid
                 return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
             }
         }
         // display error message
-        $this->messageManager->addError(__('We can\'t find a block to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a block to delete.'));
         // go to grid
         return $resultRedirect->setPath('*/*/');
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index d4c0517621144..655b3eb5b91b8 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -5,7 +5,12 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-class Edit extends \Magento\Cms\Controller\Adminhtml\Block
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Edit CMS block action.
+ */
+class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
@@ -42,7 +47,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This block no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This block no longer exists.'));
                 /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index a4096e4d1a447..b7504a5c2b226 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-class Index extends \Magento\Cms\Controller\Adminhtml\Block
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Index action.
+ */
+class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
index e267c568fa9e5..3a7e73fbe5eaa 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
@@ -46,6 +46,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index cff9c8a39b746..ccdddc7c2b594 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
 /**
  * Class MassDelete
  */
-class MassDelete extends \Magento\Backend\App\Action
+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -60,7 +61,7 @@ public function execute()
             $block->delete();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
+        $this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
index cfac00915c97c..5983594f876a2 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Create CMS block action.
+ */
+class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 3eb790c83ad69..0c6c6470398c1 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -1,35 +1,58 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
+use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Model\Block;
+use Magento\Cms\Model\BlockFactory;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\TestFramework\Inspection\Exception;
+use Magento\Framework\Registry;
 
-class Save extends \Magento\Cms\Controller\Adminhtml\Block
+/**
+ * Save CMS block action.
+ */
+class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
 {
     /**
      * @var DataPersistorInterface
      */
     protected $dataPersistor;
 
+    /**
+     * @var BlockFactory
+     */
+    private $blockFactory;
+
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
     /**
      * @param Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @param Registry $coreRegistry
      * @param DataPersistorInterface $dataPersistor
+     * @param BlockFactory|null $blockFactory
+     * @param BlockRepositoryInterface|null $blockRepository
      */
     public function __construct(
         Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        DataPersistorInterface $dataPersistor
+        Registry $coreRegistry,
+        DataPersistorInterface $dataPersistor,
+        BlockFactory $blockFactory = null,
+        BlockRepositoryInterface $blockRepository = null
     ) {
         $this->dataPersistor = $dataPersistor;
+        $this->blockFactory = $blockFactory
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(BlockFactory::class);
+        $this->blockRepository = $blockRepository
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(BlockRepositoryInterface::class);
         parent::__construct($context, $coreRegistry);
     }
 
@@ -45,8 +68,6 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         $data = $this->getRequest()->getPostValue();
         if ($data) {
-            $id = $this->getRequest()->getParam('block_id');
-
             if (isset($data['is_active']) && $data['is_active'] === 'true') {
                 $data['is_active'] = Block::STATUS_ENABLED;
             }
@@ -55,32 +76,64 @@ public function execute()
             }
 
             /** @var \Magento\Cms\Model\Block $model */
-            $model = $this->_objectManager->create(\Magento\Cms\Model\Block::class)->load($id);
-            if (!$model->getId() && $id) {
-                $this->messageManager->addError(__('This block no longer exists.'));
-                return $resultRedirect->setPath('*/*/');
+            $model = $this->blockFactory->create();
+
+            $id = $this->getRequest()->getParam('block_id');
+            if ($id) {
+                try {
+                    $model = $this->blockRepository->getById($id);
+                } catch (LocalizedException $e) {
+                    $this->messageManager->addErrorMessage(__('This block no longer exists.'));
+                    return $resultRedirect->setPath('*/*/');
+                }
             }
 
             $model->setData($data);
 
             try {
-                $model->save();
-                $this->messageManager->addSuccess(__('You saved the block.'));
+                $this->blockRepository->save($model);
+                $this->messageManager->addSuccessMessage(__('You saved the block.'));
                 $this->dataPersistor->clear('cms_block');
-
-                if ($this->getRequest()->getParam('back')) {
-                    return $resultRedirect->setPath('*/*/edit', ['block_id' => $model->getId()]);
-                }
-                return $resultRedirect->setPath('*/*/');
+                return $this->processBlockReturn($model, $data, $resultRedirect);
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while saving the block.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the block.'));
             }
 
             $this->dataPersistor->set('cms_block', $data);
-            return $resultRedirect->setPath('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
+            return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
         }
         return $resultRedirect->setPath('*/*/');
     }
+
+    /**
+     * Process and set the block return
+     *
+     * @param \Magento\Cms\Model\Block $model
+     * @param array $data
+     * @param \Magento\Framework\Controller\ResultInterface $resultRedirect
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    private function processBlockReturn($model, $data, $resultRedirect)
+    {
+        $redirect = $data['back'] ?? 'close';
+
+        if ($redirect ==='continue') {
+            $resultRedirect->setPath('*/*/edit', ['block_id' => $model->getId()]);
+        } else if ($redirect === 'close') {
+            $resultRedirect->setPath('*/*/');
+        } else if ($redirect === 'duplicate') {
+            $duplicateModel = $this->blockFactory->create(['data' => $data]);
+            $duplicateModel->setId(null);
+            $duplicateModel->setIdentifier($data['identifier'] . '-' . uniqid());
+            $duplicateModel->setIsActive(Block::STATUS_DISABLED);
+            $this->blockRepository->save($duplicateModel);
+            $id = $duplicateModel->getId();
+            $this->messageManager->addSuccessMessage(__('You duplicated the block.'));
+            $this->dataPersistor->set('cms_block', $data);
+            $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
+        }
+        return $resultRedirect;
+    }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index c604e683f9aee..15bb40930536f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-class Delete extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Delete CMS page action.
+ */
+class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -26,21 +30,26 @@ public function execute()
         $id = $this->getRequest()->getParam('page_id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
+        
         if ($id) {
             $title = "";
             try {
                 // init model and delete
                 $model = $this->_objectManager->create(\Magento\Cms\Model\Page::class);
                 $model->load($id);
+                
                 $title = $model->getTitle();
                 $model->delete();
+                
                 // display success message
-                $this->messageManager->addSuccess(__('The page has been deleted.'));
+                $this->messageManager->addSuccessMessage(__('The page has been deleted.'));
+                
                 // go to grid
-                $this->_eventManager->dispatch(
-                    'adminhtml_cmspage_on_delete',
-                    ['title' => $title, 'status' => 'success']
-                );
+                $this->_eventManager->dispatch('adminhtml_cmspage_on_delete', [
+                    'title' => $title,
+                    'status' => 'success'
+                ]);
+                
                 return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 $this->_eventManager->dispatch(
@@ -48,13 +57,15 @@ public function execute()
                     ['title' => $title, 'status' => 'fail']
                 );
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]);
             }
         }
+        
         // display error message
-        $this->messageManager->addError(__('We can\'t find a page to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a page to delete.'));
+        
         // go to grid
         return $resultRedirect->setPath('*/*/');
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index ca50a935ce915..f50fb2b19c00f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -1,14 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action;
 
-class Edit extends \Magento\Backend\App\Action
+/**
+ * Edit CMS page action.
+ */
+class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -76,7 +79,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This page no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This page no longer exists.'));
                 /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index 75f9ad70dc408..04557ddaeec78 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -1,15 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class Index extends \Magento\Backend\App\Action
+/**
+ * Index action.
+ */
+class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
index 6d75f490d42dc..8774d7e69adfe 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
@@ -57,6 +57,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index a711f20d65639..222849f97602d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -13,7 +14,7 @@
 /**
  * Class MassDelete
  */
-class MassDelete extends \Magento\Backend\App\Action
+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -59,10 +60,11 @@ public function execute()
             $page->delete();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
+        $this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        
         return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index e39c2115f961e..0a8c667d4d7b3 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -13,7 +14,7 @@
 /**
  * Class MassDisable
  */
-class MassDisable extends \Magento\Backend\App\Action
+class MassDisable extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -59,7 +60,9 @@ public function execute()
             $item->save();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been disabled.', $collection->getSize()));
+        $this->messageManager->addSuccessMessage(
+            __('A total of %1 record(s) have been disabled.', $collection->getSize())
+        );
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 8278c28a1e696..e2cb8d984e01d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -13,7 +14,7 @@
 /**
  * Class MassEnable
  */
-class MassEnable extends \Magento\Backend\App\Action
+class MassEnable extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -59,7 +60,9 @@ public function execute()
             $item->save();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been enabled.', $collection->getSize()));
+        $this->messageManager->addSuccessMessage(
+            __('A total of %1 record(s) have been enabled.', $collection->getSize())
+        );
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
index 407657b05c1c8..6a4f4951cef02 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -6,7 +6,12 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-class NewAction extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Create CMS page action.
+ */
+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index 57f92a713ecb0..9b8933c8dba2e 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -119,7 +119,7 @@ public function validateRequireEntry(array $data)
         foreach ($data as $field => $value) {
             if (in_array($field, array_keys($requiredFields)) && $value == '') {
                 $errorNo = false;
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('To apply changes you should fill in hidden required "%1" field', $requiredFields[$field])
                 );
             }
@@ -140,6 +140,7 @@ private function validateData($data, $layoutXmlValidator)
             if (!empty($data['layout_update_xml']) && !$layoutXmlValidator->isValid($data['layout_update_xml'])) {
                 return false;
             }
+            
             if (!empty($data['custom_layout_update_xml']) &&
                 !$layoutXmlValidator->isValid($data['custom_layout_update_xml'])
             ) {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 5644e25dd4c4a..37cb45753174f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -1,17 +1,20 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Cms\Model\Page;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
 
-class Save extends \Magento\Backend\App\Action
+/**
+ * Save CMS page action.
+ */
+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -44,9 +47,8 @@ class Save extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param PostDataProcessor $dataProcessor
      * @param DataPersistorInterface $dataPersistor
-     * @param \Magento\Cms\Model\PageFactory $pageFactory
-     * @param \Magento\Cms\Api\PageRepositoryInterface $pageRepository
-     *
+     * @param \Magento\Cms\Model\PageFactory|null $pageFactory
+     * @param \Magento\Cms\Api\PageRepositoryInterface|null $pageRepository
      */
     public function __construct(
         Action\Context $context,
@@ -90,11 +92,10 @@ public function execute()
 
             $id = $this->getRequest()->getParam('page_id');
             if ($id) {
-                $model->load($id);
-                if (!$model->getId()) {
+                try {
+                    $model = $this->pageRepository->getById($id);
+                } catch (LocalizedException $e) {
                     $this->messageManager->addErrorMessage(__('This page no longer exists.'));
-                    /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-                    $resultRedirect = $this->resultRedirectFactory->create();
                     return $resultRedirect->setPath('*/*/');
                 }
             }
@@ -113,13 +114,9 @@ public function execute()
             try {
                 $this->pageRepository->save($model);
                 $this->messageManager->addSuccessMessage(__('You saved the page.'));
-                $this->dataPersistor->clear('cms_page');
-                if ($this->getRequest()->getParam('back')) {
-                    return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
-                }
-                return $resultRedirect->setPath('*/*/');
+                return $this->processResultRedirect($model, $resultRedirect, $data);
             } catch (LocalizedException $e) {
-                $this->messageManager->addExceptionMessage($e->getPrevious() ?:$e);
+                $this->messageManager->addExceptionMessage($e->getPrevious() ?: $e);
             } catch (\Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the page.'));
             }
@@ -129,4 +126,38 @@ public function execute()
         }
         return $resultRedirect->setPath('*/*/');
     }
+
+    /**
+     * Process result redirect
+     *
+     * @param \Magento\Cms\Api\Data\PageInterface $model
+     * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect
+     * @param array $data
+     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws LocalizedException
+     */
+    private function processResultRedirect($model, $resultRedirect, $data)
+    {
+        if ($this->getRequest()->getParam('back', false) === 'duplicate') {
+            $newPage = $this->pageFactory->create(['data' => $data]);
+            $newPage->setId(null);
+            $identifier = $model->getIdentifier() . '-' . uniqid();
+            $newPage->setIdentifier($identifier);
+            $newPage->setIsActive(false);
+            $this->pageRepository->save($newPage);
+            $this->messageManager->addSuccessMessage(__('You duplicated the page.'));
+            return $resultRedirect->setPath(
+                '*/*/edit',
+                [
+                    'page_id' => $newPage->getId(),
+                    '_current' => true
+                ]
+            );
+        }
+        $this->dataPersistor->clear('cms_page');
+        if ($this->getRequest()->getParam('back')) {
+            return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
+        }
+        return $resultRedirect->setPath('*/*/');
+    }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
index 1c46ac6807eef..340f4b24dd16e 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
@@ -1,14 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Page\Widget;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
-class Chooser extends \Magento\Backend\App\Action
+/**
+ * Chooser Source action.
+ */
+class Chooser extends Action implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
index 19dc989620b89..6f57efad41e75 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -6,8 +6,12 @@
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+/**
+ * Delete image files.
+ */
+class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
@@ -19,6 +23,11 @@ class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      */
     protected $resultRawFactory;
 
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryResolver
+     */
+    private $directoryResolver;
+
     /**
      * Constructor
      *
@@ -26,22 +35,28 @@ class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\App\Filesystem\DirectoryResolver|null $directoryResolver
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\App\Filesystem\DirectoryResolver $directoryResolver = null
     ) {
+        parent::__construct($context, $coreRegistry);
+
         $this->resultRawFactory = $resultRawFactory;
         $this->resultJsonFactory = $resultJsonFactory;
-        parent::__construct($context, $coreRegistry);
+        $this->directoryResolver = $directoryResolver
+            ?: $this->_objectManager->get(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
     }
 
     /**
-     * Delete file from media storage
+     * Delete file from media storage.
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
@@ -54,21 +69,28 @@ public function execute()
             /** @var $helper \Magento\Cms\Helper\Wysiwyg\Images */
             $helper = $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
             $path = $this->getStorage()->getSession()->getCurrentPath();
+            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Directory %1 is not under storage root path.', $path)
+                );
+            }
             foreach ($files as $file) {
                 $file = $helper->idDecode($file);
                 /** @var \Magento\Framework\Filesystem $filesystem */
                 $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
                 $dir = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
                 $filePath = $path . '/' . \Magento\Framework\File\Uploader::getCorrectFileName($file);
-                if ($dir->isFile($dir->getRelativePath($filePath))) {
+                if ($dir->isFile($dir->getRelativePath($filePath)) && !preg_match('#.htaccess#', $file)) {
                     $this->getStorage()->deleteFile($filePath);
                 }
             }
+            
             return $this->resultRawFactory->create();
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
             /** @var \Magento\Framework\Controller\Result\Json $resultJson */
             $resultJson = $this->resultJsonFactory->create();
+
             return $resultJson->setData($result);
         }
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index 8a89de87a6f85..5344472a79a9d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -6,7 +6,13 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
-class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Delete image folder.
+ */
+class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
@@ -18,38 +24,55 @@ class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      */
     protected $resultRawFactory;
 
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryResolver
+     */
+    private $directoryResolver;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\App\Filesystem\DirectoryResolver|null $directoryResolver
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\App\Filesystem\DirectoryResolver $directoryResolver = null
     ) {
+        parent::__construct($context, $coreRegistry);
         $this->resultRawFactory = $resultRawFactory;
         $this->resultJsonFactory = $resultJsonFactory;
-        parent::__construct($context, $coreRegistry);
+        $this->directoryResolver = $directoryResolver
+            ?: $this->_objectManager->get(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
     }
 
     /**
-     * Delete folder action
+     * Delete folder action.
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
+            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Directory %1 is not under storage root path.', $path)
+                );
+            }
             $this->getStorage()->deleteDirectory($path);
+            
             return $this->resultRawFactory->create();
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
             /** @var \Magento\Framework\Controller\Result\Json $resultJson */
             $resultJson = $this->resultJsonFactory->create();
+
             return $resultJson->setData($result);
         }
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
index 525fd31052db8..13765e9faca04 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
@@ -39,7 +39,7 @@ public function execute()
         try {
             $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class)->getCurrentPath();
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         }
         $this->_initAction();
         /** @var \Magento\Framework\View\Result\Layout $resultLayout */
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
index 2124bdabe6009..a7f49e8a431a4 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
@@ -6,6 +6,11 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Creates new folder.
+ */
 class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
@@ -13,24 +18,34 @@ class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      */
     protected $resultJsonFactory;
 
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryResolver
+     */
+    private $directoryResolver;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\App\Filesystem\DirectoryResolver|null $directoryResolver
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\App\Filesystem\DirectoryResolver $directoryResolver = null
     ) {
-        $this->resultJsonFactory = $resultJsonFactory;
         parent::__construct($context, $coreRegistry);
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->directoryResolver = $directoryResolver
+            ?: $this->_objectManager->get(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
     }
 
     /**
-     * New folder action
+     * New folder action.
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
@@ -38,12 +53,18 @@ public function execute()
             $this->_initAction();
             $name = $this->getRequest()->getPost('name');
             $path = $this->getStorage()->getSession()->getCurrentPath();
+            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Directory %1 is not under storage root path.', $path)
+                );
+            }
             $result = $this->getStorage()->createDirectory($name, $path);
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
+        
         return $resultJson->setData($result);
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index 2daaf39d58d14..3244a7d14f0a3 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -34,17 +34,26 @@ public function __construct(
      */
     public function execute()
     {
-        $helper = $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
-        $storeId = $this->getRequest()->getParam('store');
+        $imagesHelper = $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $request = $this->getRequest();
 
-        $filename = $this->getRequest()->getParam('filename');
-        $filename = $helper->idDecode($filename);
-        $asIs = $this->getRequest()->getParam('as_is');
+        $storeId = $request->getParam('store');
+
+        $filename = $request->getParam('filename');
+        $filename = $imagesHelper->idDecode($filename);
+
+        $asIs = $request->getParam('as_is');
+
+        $forceStaticPath = $request->getParam('force_static_path');
 
         $this->_objectManager->get(\Magento\Catalog\Helper\Data::class)->setStoreId($storeId);
-        $helper->setStoreId($storeId);
+        $imagesHelper->setStoreId($storeId);
 
-        $image = $helper->getImageHtmlDeclaration($filename, $asIs);
+        if ($forceStaticPath) {
+            $image = parse_url($imagesHelper->getCurrentUrl() . $filename, PHP_URL_PATH);
+        } else {
+            $image = $imagesHelper->getImageHtmlDeclaration($filename, $asIs);
+        }
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
index 7a94c4ab6aa12..31b01ce115c21 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -6,43 +6,65 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
-class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Upload image.
+ */
+class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
      */
     protected $resultJsonFactory;
 
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryResolver
+     */
+    private $directoryResolver;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\App\Filesystem\DirectoryResolver|null $directoryResolver
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\App\Filesystem\DirectoryResolver $directoryResolver = null
     ) {
-        $this->resultJsonFactory = $resultJsonFactory;
         parent::__construct($context, $coreRegistry);
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->directoryResolver = $directoryResolver
+            ?: $this->_objectManager->get(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
     }
 
     /**
-     * Files upload processing
+     * Files upload processing.
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
         try {
             $this->_initAction();
-            $targetPath = $this->getStorage()->getSession()->getCurrentPath();
-            $result = $this->getStorage()->uploadFile($targetPath, $this->getRequest()->getParam('type'));
+            $path = $this->getStorage()->getSession()->getCurrentPath();
+            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Directory %1 is not under storage root path.', $path)
+                );
+            }
+            $result = $this->getStorage()->uploadFile($path, $this->getRequest()->getParam('type'));
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
+        
         return $resultJson->setData($result);
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index 8e20feb0f058f..59ed1a6248b7c 100644
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -1,27 +1,61 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Index;
 
-class Index extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Controller\Result\Forward;
+use Magento\Framework\Controller\Result\ForwardFactory;
+use Magento\Framework\View\Result\Page as ResultPage;
+use Magento\Cms\Helper\Page;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Action\Action;
+
+/**
+ * Home page. Needs to be accessible by POST because of the store switching.
+ */
+class Index extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
-     * @var \Magento\Framework\Controller\Result\ForwardFactory
+     * @var ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * Index constructor.
+     *
+     * @param Context $context
+     * @param ForwardFactory $resultForwardFactory
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param Page|null $page
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+        Context $context,
+        ForwardFactory $resultForwardFactory,
+        ScopeConfigInterface $scopeConfig = null,
+        Page $page = null
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
+        $this->scopeConfig = $scopeConfig ? : ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->page = $page ? : ObjectManager::getInstance()->get(Page::class);
         parent::__construct($context);
     }
 
@@ -29,20 +63,17 @@ public function __construct(
      * Renders CMS Home page
      *
      * @param string|null $coreRoute
-     * @return \Magento\Framework\Controller\Result\Forward
+     *
+     * @return bool|ResponseInterface|Forward|ResultInterface|ResultPage
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($coreRoute = null)
     {
-        $pageId = $this->_objectManager->get(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->getValue(
-            \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $resultPage = $this->_objectManager->get(\Magento\Cms\Helper\Page::class)->prepareResultPage($this, $pageId);
+        $pageId = $this->scopeConfig->getValue(Page::XML_PATH_HOME_PAGE, ScopeInterface::SCOPE_STORE);
+        $resultPage = $this->page->prepareResultPage($this, $pageId);
         if (!$resultPage) {
-            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            /** @var Forward $resultForward */
             $resultForward = $this->resultForwardFactory->create();
             $resultForward->forward('defaultIndex');
             return $resultForward;
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index db84ce9556dac..b30beae73dce1 100644
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -6,6 +6,9 @@
  */
 namespace Magento\Cms\Controller\Noroute;
 
+/**
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
index ab02bc5e717a1..9d5785450ec71 100644
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/app/code/Magento/Cms/Controller/Page/View.php
@@ -6,7 +6,14 @@
  */
 namespace Magento\Cms\Controller\Page;
 
-class View extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\Action;
+
+/**
+ * Custom page for storefront. Needs to be accessible by POST because of the store switching.
+ */
+class View extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\ForwardFactory
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index bf51c5f0210e9..abd260b260b93 100644
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -116,7 +116,7 @@ public function __construct(
      * Return result CMS page
      *
      * @param Action $action
-     * @param null $pageId
+     * @param int $pageId
      * @return \Magento\Framework\View\Result\Page|bool
      */
     public function prepareResultPage(Action $action, $pageId = null)
@@ -189,9 +189,7 @@ public function getPageUrl($pageId = null)
         $page = $this->_pageFactory->create();
         if ($pageId !== null && $pageId !== $page->getId()) {
             $page->setStoreId($this->_storeManager->getStore()->getId());
-            if (!$page->load($pageId)) {
-                return null;
-            }
+            $page->load($pageId);
         }
 
         if (!$page->getId()) {
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index f830910ca1e4f..cd3473c6bab87 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -8,10 +8,17 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
- * Wysiwyg Images Helper
+ * Wysiwyg Images Helper.
  */
 class Images extends \Magento\Framework\App\Helper\AbstractHelper
 {
+    /**
+     * Image directory subpath relative to media directory
+     *
+     * @var string
+     */
+    private $imageDirectorySubpath;
+
     /**
      * Current directory path
      * @var string
@@ -25,11 +32,11 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_currentUrl;
 
     /**
-     * Currenty selected store ID if applicable
+     * Currently selected store ID if applicable
      *
      * @var int
      */
-    protected $_storeId = null;
+    protected $_storeId;
 
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
@@ -50,6 +57,13 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_storeManager;
 
+    /**
+     * String escaper
+     *
+     * @var \Magento\Framework\Escaper
+     */
+    protected $escaper;
+
     /**
      * Construct
      *
@@ -57,19 +71,22 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Backend\Helper\Data $backendData
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Escaper $escaper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Backend\Helper\Data $backendData,
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Escaper $escaper
     ) {
         parent::__construct($context);
         $this->_backendData = $backendData;
         $this->_storeManager = $storeManager;
+        $this->escaper = $escaper;
 
         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-        $this->_directory->create(\Magento\Cms\Model\Wysiwyg\Config::IMAGE_DIRECTORY);
+        $this->_directory->create($this->getStorageRoot());
     }
 
     /**
@@ -91,7 +108,17 @@ public function setStoreId($store)
      */
     public function getStorageRoot()
     {
-        return $this->_directory->getAbsolutePath(\Magento\Cms\Model\Wysiwyg\Config::IMAGE_DIRECTORY);
+        return $this->_directory->getAbsolutePath($this->getStorageRootSubpath());
+    }
+
+    /**
+     * Get image storage root subpath.  User is unable to traverse outside of this subpath in media gallery
+     *
+     * @return string
+     */
+    public function getStorageRootSubpath()
+    {
+        return '';
     }
 
     /**
@@ -127,17 +154,23 @@ public function convertPathToId($path)
     }
 
     /**
-     * Decode HTML element id
+     * Decode HTML element id.
      *
      * @param string $id
      * @return string
+     * @throws \InvalidArgumentException When path contains restricted symbols.
      */
     public function convertIdToPath($id)
     {
         if ($id === \Magento\Theme\Helper\Storage::NODE_ROOT) {
             return $this->getStorageRoot();
         } else {
-            return $this->getStorageRoot() . $this->idDecode($id);
+            $path = $this->getStorageRoot() . $this->idDecode($id);
+            if (preg_match('/\.\.(\\\|\/)/', $path)) {
+                throw new \InvalidArgumentException('Path is invalid');
+            }
+
+            return $path;
         }
     }
 
@@ -148,7 +181,7 @@ public function convertIdToPath($id)
      */
     public function isUsingStaticUrlsAllowed()
     {
-        $checkResult = new \StdClass();
+        $checkResult = (object) [];
         $checkResult->isAllowed = false;
         $this->_eventManager->dispatch(
             'cms_wysiwyg_images_static_urls_allowed',
@@ -166,18 +199,25 @@ public function isUsingStaticUrlsAllowed()
      */
     public function getImageHtmlDeclaration($filename, $renderAsTag = false)
     {
-        $fileurl = $this->getCurrentUrl() . $filename;
+        $fileUrl = $this->getCurrentUrl() . $filename;
         $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
-        $mediaPath = str_replace($mediaUrl, '', $fileurl);
+        $mediaPath = str_replace($mediaUrl, '', $fileUrl);
         $directive = sprintf('{{media url="%s"}}', $mediaPath);
         if ($renderAsTag) {
-            $html = sprintf('<img src="%s" alt="" />', $this->isUsingStaticUrlsAllowed() ? $fileurl : $directive);
+            $src = $this->isUsingStaticUrlsAllowed() ? $fileUrl : $this->escaper->escapeHtml($directive);
+            $html = sprintf('<img src="%s" alt="" />', $src);
         } else {
             if ($this->isUsingStaticUrlsAllowed()) {
-                $html = $fileurl; // $mediaPath;
+                $html = $fileUrl;
             } else {
                 $directive = $this->urlEncoder->encode($directive);
-                $html = $this->_backendData->getUrl('cms/wysiwyg/directive', ['___directive' => $directive]);
+                $html = $this->_backendData->getUrl(
+                    'cms/wysiwyg/directive',
+                    [
+                        '___directive' => $directive,
+                        '_escape_params' => false,
+                    ]
+                );
             }
         }
         return $html;
@@ -193,7 +233,7 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
     public function getCurrentPath()
     {
         if (!$this->_currentPath) {
-            $currentPath = $this->_directory->getAbsolutePath() . \Magento\Cms\Model\Wysiwyg\Config::IMAGE_DIRECTORY;
+            $currentPath = $this->getStorageRoot();
             $path = $this->_getRequest()->getParam($this->getTreeNodeName());
             if ($path) {
                 $path = $this->convertIdToPath($path);
@@ -229,7 +269,7 @@ public function getCurrentUrl()
             )->getBaseUrl(
                 \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
             );
-            $this->_currentUrl = $mediaUrl . $this->_directory->getRelativePath($path) . '/';
+            $this->_currentUrl = rtrim($mediaUrl . $this->_directory->getRelativePath($path), '/') . '/';
         }
         return $this->_currentUrl;
     }
@@ -246,7 +286,7 @@ public function idEncode($string)
     }
 
     /**
-     * Revert opration to idEncode
+     * Revert operation to idEncode
      *
      * @param string $string
      * @return string
@@ -271,4 +311,15 @@ public function getShortFilename($filename, $maxLength = 20)
         }
         return substr($filename, 0, $maxLength) . '...';
     }
+
+    /**
+     * Set user-traversable image directory subpath relative to media directory and relative to nested storage root
+     *
+     * @var string $subpath
+     * @return void
+     */
+    public function setImageDirectorySubpath($subpath)
+    {
+        $this->imageDirectorySubpath = $subpath;
+    }
 }
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index e724c1581e8f5..fa29cc9ff7631 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\BlockRepositoryInterface;
@@ -134,7 +135,7 @@ public function getById($blockId)
         $block = $this->blockFactory->create();
         $this->resource->load($block, $blockId);
         if (!$block->getId()) {
-            throw new NoSuchEntityException(__('CMS Block with id "%1" does not exist.', $blockId));
+            throw new NoSuchEntityException(__('The CMS block with the "%1" ID doesn\'t exist.', $blockId));
         }
         return $block;
     }
diff --git a/app/code/Magento/Cms/Model/Config/Source/Block.php b/app/code/Magento/Cms/Model/Config/Source/Block.php
new file mode 100644
index 0000000000000..85dc4e4dd24bf
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Config/Source/Block.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Config\Source;
+
+use Magento\Cms\Model\ResourceModel\Block\CollectionFactory;
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Class Block
+ */
+class Block implements OptionSourceInterface
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        if (!$this->options) {
+            $this->options = $this->collectionFactory->create()->toOptionIdArray();
+        }
+
+        return $this->options;
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php
index 6840fdfd6efe2..2997a624a6c10 100644
--- a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php
+++ b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php
@@ -10,13 +10,24 @@
  */
 class Editor implements \Magento\Framework\Option\ArrayInterface
 {
+    /**
+     * @var array
+     */
+    private $adapterOptions;
+
+    /**
+     * @param array $adapterOptions
+     */
+    public function __construct(array $adapterOptions = [])
+    {
+        $this->adapterOptions = $adapterOptions;
+    }
+
     /**
      * @inheritdoc
      */
     public function toOptionArray()
     {
-        return [
-            ['value' => 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter', 'label' => __('TinyMCE 4')]
-        ];
+        return $this->adapterOptions;
     }
 }
diff --git a/app/code/Magento/Cms/Model/GetBlockByIdentifier.php b/app/code/Magento/Cms/Model/GetBlockByIdentifier.php
index 587785ce3d842..071e6225c82a2 100644
--- a/app/code/Magento/Cms/Model/GetBlockByIdentifier.php
+++ b/app/code/Magento/Cms/Model/GetBlockByIdentifier.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\GetBlockByIdentifierInterface;
@@ -46,7 +47,7 @@ public function execute(string $identifier, int $storeId) : BlockInterface
         $this->blockResource->load($block, $identifier, BlockInterface::IDENTIFIER);
 
         if (!$block->getId()) {
-            throw new NoSuchEntityException(__('CMS Block with identifier "%1" does not exist.', $identifier));
+            throw new NoSuchEntityException(__('The CMS block with the "%1" ID doesn\'t exist.', $identifier));
         }
 
         return $block;
diff --git a/app/code/Magento/Cms/Model/GetPageByIdentifier.php b/app/code/Magento/Cms/Model/GetPageByIdentifier.php
index d12e7749f7d7a..d3ad65fb01183 100644
--- a/app/code/Magento/Cms/Model/GetPageByIdentifier.php
+++ b/app/code/Magento/Cms/Model/GetPageByIdentifier.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\Data\PageInterface;
@@ -46,7 +47,7 @@ public function execute(string $identifier, int $storeId) : PageInterface
         $this->pageResource->load($page, $identifier, PageInterface::IDENTIFIER);
 
         if (!$page->getId()) {
-            throw new NoSuchEntityException(__('CMS Page with identifier "%1" does not exist.', $identifier));
+            throw new NoSuchEntityException(__('The CMS page with the "%1" ID doesn\'t exist.', $identifier));
         }
 
         return $page;
diff --git a/app/code/Magento/Cms/Model/GetUtilityPageIdentifiers.php b/app/code/Magento/Cms/Model/GetUtilityPageIdentifiers.php
new file mode 100644
index 0000000000000..c05eb21fe6737
--- /dev/null
+++ b/app/code/Magento/Cms/Model/GetUtilityPageIdentifiers.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Model;
+
+use Magento\Cms\Api\GetUtilityPageIdentifiersInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Utility Cms Pages.
+ */
+class GetUtilityPageIdentifiers implements GetUtilityPageIdentifiersInterface
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * UtilityCmsPage constructor.
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get List Page Identifiers.
+     *
+     * @return array
+     */
+    public function execute()
+    {
+        $homePageIdentifier = $this->scopeConfig->getValue(
+            'web/default/cms_home_page',
+            ScopeInterface::SCOPE_STORE
+        );
+        $noRouteIdentifier  = $this->scopeConfig->getValue(
+            'web/default/cms_no_route',
+            ScopeInterface::SCOPE_STORE
+        );
+
+        $noCookieIdentifier = $this->scopeConfig->getValue(
+            'web/default/cms_no_cookies',
+            ScopeInterface::SCOPE_STORE
+        );
+
+        return [$homePageIdentifier, $noRouteIdentifier, $noCookieIdentifier];
+    }
+}
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 9c9e18211aa86..5578ae49f586d 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\Data;
@@ -110,7 +111,7 @@ public function __construct(
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page)
     {
-        if (empty($page->getStoreId())) {
+        if ($page->getStoreId() === null) {
             $storeId = $this->storeManager->getStore()->getId();
             $page->setStoreId($storeId);
         }
@@ -137,7 +138,7 @@ public function getById($pageId)
         $page = $this->pageFactory->create();
         $page->load($pageId);
         if (!$page->getId()) {
-            throw new NoSuchEntityException(__('CMS Page with id "%1" does not exist.', $pageId));
+            throw new NoSuchEntityException(__('The CMS page with the "%1" ID doesn\'t exist.', $pageId));
         }
         return $page;
     }
diff --git a/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php
index cd5945c2f47cb..2a67378614445 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php
@@ -176,4 +176,32 @@ public function getSelectCountSql()
 
         return $countSelect;
     }
+
+    /**
+     * Returns pairs identifier - title for unique identifiers
+     * and pairs identifier|entity_id - title for non-unique after first
+     *
+     * @return array
+     */
+    public function toOptionIdArray()
+    {
+        $res = [];
+        $existingIdentifiers = [];
+        foreach ($this as $item) {
+            $identifier = $item->getData('identifier');
+
+            $data['value'] = $identifier;
+            $data['label'] = $item->getData('title');
+
+            if (in_array($identifier, $existingIdentifiers)) {
+                $data['value'] .= '|' . $item->getData($this->getIdFieldName());
+            } else {
+                $existingIdentifiers[] = $identifier;
+            }
+
+            $res[] = $data;
+        }
+
+        return $res;
+    }
 }
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
index f45d9ee223106..60e87afc61884 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Model\ResourceModel\Block\Grid;
 
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\Search\AggregationInterface;
+use Magento\Framework\Api\Search\AggregationInterface;
 use Magento\Cms\Model\ResourceModel\Block\Collection as BlockCollection;
 
 /**
@@ -82,6 +82,7 @@ public function getAggregations()
     public function setAggregations($aggregations)
     {
         $this->aggregations = $aggregations;
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page.php b/app/code/Magento/Cms/Model/ResourceModel/Page.php
index b836cf199632d..079d64d2882a5 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page.php
@@ -117,13 +117,16 @@ protected function _beforeSave(AbstractModel $object)
 
         if (!$this->isValidPageIdentifier($object)) {
             throw new LocalizedException(
-                __('The page URL key contains capital letters or disallowed symbols.')
+                __(
+                    "The page URL key can't use capital letters or disallowed symbols. "
+                    . "Remove the letters and symbols and try again."
+                )
             );
         }
 
         if ($this->isNumericPageIdentifier($object)) {
             throw new LocalizedException(
-                __('The page URL key cannot be made of only numbers.')
+                __("The page URL key can't use only numbers. Add letters or words and try again.")
             );
         }
         return parent::_beforeSave($object);
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
index 98c071890be46..4ccc2c8f6e77d 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
@@ -51,34 +51,6 @@ protected function _construct()
         $this->_map['fields']['store'] = 'store_table.store_id';
     }
 
-    /**
-     * Returns pairs identifier - title for unique identifiers
-     * and pairs identifier|page_id - title for non-unique after first
-     *
-     * @return array
-     */
-    public function toOptionIdArray()
-    {
-        $res = [];
-        $existingIdentifiers = [];
-        foreach ($this as $item) {
-            $identifier = $item->getData('identifier');
-
-            $data['value'] = $identifier;
-            $data['label'] = $item->getData('title');
-
-            if (in_array($identifier, $existingIdentifiers)) {
-                $data['value'] .= '|' . $item->getData('page_id');
-            } else {
-                $existingIdentifiers[] = $identifier;
-            }
-
-            $res[] = $data;
-        }
-
-        return $res;
-    }
-
     /**
      * Set first store flag
      *
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
index c5c43c3120dcc..19f945e5b4637 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
@@ -83,6 +83,7 @@ public function getAggregations()
     public function setAggregations($aggregations)
     {
         $this->aggregations = $aggregations;
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Cms/Model/Template/Filter.php b/app/code/Magento/Cms/Model/Template/Filter.php
index 2dcbfbc4ab598..f93972bade2af 100644
--- a/app/code/Magento/Cms/Model/Template/Filter.php
+++ b/app/code/Magento/Cms/Model/Template/Filter.php
@@ -37,7 +37,7 @@ public function setUseSessionInUrl($flag)
      */
     public function mediaDirective($construction)
     {
-        $params = $this->getParameters($construction[2]);
+        $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()->getBaseMediaDir() . '/' . $params['url'];
     }
 }
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/CompositeConfigProvider.php b/app/code/Magento/Cms/Model/Wysiwyg/CompositeConfigProvider.php
new file mode 100644
index 0000000000000..a97529a7d4e45
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/CompositeConfigProvider.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Model\Wysiwyg;
+
+/**
+ * Class CompositeConfigProvider loads required config by adapter specified in system configuration
+ * General > Content Management >WYSIWYG Options > WYSIWYG Editor
+ */
+class CompositeConfigProvider
+{
+    /**
+     * @var \Magento\Ui\Block\Wysiwyg\ActiveEditor
+     */
+    private $activeEditor;
+
+    /**
+     * List of variable config processors by adapter type
+     *
+     * @var array
+     */
+    private $variablePluginConfigProvider;
+
+    /**
+     * List of widget config processors by adapter type
+     *
+     * @var array
+     */
+    private $widgetPluginConfigProvider;
+
+    /**
+     * List of wysiwyg config postprocessors by adapter type
+     *
+     * @var array
+     */
+    private $wysiwygConfigPostProcessor;
+
+    /**
+     * Factory to create required processor object
+     *
+     * @var \Magento\Cms\Model\Wysiwyg\ConfigProviderFactory
+     */
+    private $configProviderFactory;
+
+    /**
+     * Current active editor path
+     *
+     * @var string
+     */
+    private $activeEditorPath;
+
+    /**
+     * List of gallery config processors by adapter type
+     *
+     * @var array
+     */
+    private $galleryConfigProvider;
+
+    /**
+     * @param \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor
+     * @param ConfigProviderFactory $configProviderFactory
+     * @param array $variablePluginConfigProvider
+     * @param array $widgetPluginConfigProvider
+     * @param array $galleryConfigProvider
+     * @param array $wysiwygConfigPostProcessor
+     */
+    public function __construct(
+        \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor,
+        \Magento\Cms\Model\Wysiwyg\ConfigProviderFactory $configProviderFactory,
+        array $variablePluginConfigProvider,
+        array $widgetPluginConfigProvider,
+        array $galleryConfigProvider,
+        array $wysiwygConfigPostProcessor
+    ) {
+        $this->activeEditor = $activeEditor;
+        $this->configProviderFactory = $configProviderFactory;
+        $this->variablePluginConfigProvider = $variablePluginConfigProvider;
+        $this->widgetPluginConfigProvider = $widgetPluginConfigProvider;
+        $this->galleryConfigProvider = $galleryConfigProvider;
+        $this->wysiwygConfigPostProcessor = $wysiwygConfigPostProcessor;
+    }
+
+    /**
+     * Add config for variable plugin
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function processVariableConfig($config)
+    {
+        return $this->updateConfig($config, $this->variablePluginConfigProvider);
+    }
+
+    /**
+     * Add config for widget plugin
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function processWidgetConfig($config)
+    {
+        return $this->updateConfig($config, $this->widgetPluginConfigProvider);
+    }
+
+    /**
+     * Add config for gallery
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function processGalleryConfig($config)
+    {
+        return $this->updateConfig($config, $this->galleryConfigProvider);
+    }
+
+    /**
+     * Update wysiwyg config with data required for adapter
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function processWysiwygConfig($config)
+    {
+        return $this->updateConfig($config, $this->wysiwygConfigPostProcessor);
+    }
+
+    /**
+     * Returns active editor path
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return string
+     */
+    private function getActiveEditorPath($config)
+    {
+        if (!isset($this->activeEditorPath) || $this->activeEditorPath !== $config->getData('activeEditorPath')) {
+            $this->activeEditorPath = $config->getData('activeEditorPath')
+                ? $config->getData('activeEditorPath')
+                : $this->activeEditor->getWysiwygAdapterPath();
+            $config->setData('activeEditorPath', $this->activeEditorPath);
+        }
+        return $this->activeEditorPath;
+    }
+
+    /**
+     * Update config using config provider by active editor path
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @param array $configProviders
+     * @return \Magento\Framework\DataObject
+     */
+    private function updateConfig($config, array $configProviders)
+    {
+        $adapterType = $this->getActiveEditorPath($config);
+        //Extension point to update plugin settings by adapter type
+        $providerClass = isset($configProviders[$adapterType])
+            ? $configProviders[$adapterType]
+            : $configProviders['default'];
+        /** @var \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface $provider */
+        $provider = $this->configProviderFactory->create($providerClass);
+        return $provider->getConfig($config);
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 671b436fa4054..1da7b99c6d886 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -8,13 +8,14 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Wysiwyg Config for Editor HTML Element
  *
  * @api
- * @deprecated file will be moved to UI module in future release
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Config extends \Magento\Framework\DataObject implements ConfigInterface
 {
@@ -60,11 +61,15 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
 
     /**
      * @var \Magento\Variable\Model\Variable\Config
+     * @deprecated
+     * @see \Magento\Cms\Model\ConfigProvider::processVariableConfig
      */
     protected $_variableConfig;
 
     /**
      * @var \Magento\Widget\Model\Widget\Config
+     * @deprecated
+     * @see \Magento\Cms\Model\ConfigProvider::processWidgetConfig
      */
     protected $_widgetConfig;
 
@@ -104,6 +109,12 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
     protected $filesystem;
 
     /**
+     * @var \Magento\Cms\Model\Wysiwyg\CompositeConfigProvider
+     */
+    private $configProvider;
+
+    /**
+     * Config constructor.
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\AuthorizationInterface $authorization
@@ -115,6 +126,7 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
      * @param Filesystem $filesystem
      * @param array $windowSize
      * @param array $data
+     * @param CompositeConfigProvider|null $configProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -128,7 +140,8 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         Filesystem $filesystem,
         array $windowSize = [],
-        array $data = []
+        array $data = [],
+        \Magento\Cms\Model\Wysiwyg\CompositeConfigProvider $configProvider = null
     ) {
         $this->_backendUrl = $backendUrl;
         $this->_eventManager = $eventManager;
@@ -140,6 +153,8 @@ public function __construct(
         $this->_windowSize = $windowSize;
         $this->_storeManager = $storeManager;
         $this->filesystem = $filesystem;
+        $this->configProvider = $configProvider ?: ObjectManager::getInstance()
+            ->get(\Magento\Cms\Model\Wysiwyg\CompositeConfigProvider ::class);
         parent::__construct($data);
     }
 
@@ -175,65 +190,37 @@ public function getConfig($data = [])
                 'add_variables' => true,
                 'add_widgets' => true,
                 'no_display' => false,
-                'encode_directives' => true,
+                'add_directives' => true,
                 'width' => '100%',
                 'height' => '500px',
-                'tinymce4' => [
-                    'toolbar' => 'formatselect | bold italic underline | alignleft aligncenter alignright | '
-                        . 'bullist numlist | link image table charmap',
-                    'plugins' => implode(
-                        ' ',
-                        [
-                            'advlist',
-                            'autolink',
-                            'lists',
-                            'link',
-                            'image',
-                            'charmap',
-                            'media',
-                            'noneditable',
-                            'table',
-                            'contextmenu',
-                            'paste',
-                            'code',
-                            'help',
-                            'table'
-                        ]
-                    ),
-                    'content_css' => $this->_assetRepo->getUrl('mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css')
-                ],
                 'plugins' => [],
             ]
         );
 
         $config->setData('directives_url_quoted', preg_quote($config->getData('directives_url')));
 
+        if (is_array($data)) {
+            $config->addData($data);
+        }
+
         if ($this->_authorization->isAllowed('Magento_Cms::media_gallery')) {
+            $this->configProvider->processGalleryConfig($config);
             $config->addData(
                 [
-                    'add_images' => true,
-                    'files_browser_window_url' => $this->_backendUrl->getUrl('cms/wysiwyg_images/index'),
                     'files_browser_window_width' => $this->_windowSize['width'],
                     'files_browser_window_height' => $this->_windowSize['height'],
                 ]
             );
         }
-
-        if (is_array($data)) {
-            $config->addData($data);
+        if ($config->getData('add_widgets')) {
+            $this->configProvider->processWidgetConfig($config);
         }
 
         if ($config->getData('add_variables')) {
-            $settings = $this->_variableConfig->getWysiwygPluginSettings($config);
-            $config->addData($settings);
-        }
-
-        if ($config->getData('add_widgets')) {
-            $settings = $this->_widgetConfig->getPluginSettings($config);
-            $config->addData($settings);
+            $this->configProvider->processVariableConfig($config);
         }
 
-        return $config;
+        return $this->configProvider->processWysiwygConfig($config);
     }
 
     /**
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php b/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php
new file mode 100644
index 0000000000000..d07f90f43adad
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Wysiwyg;
+
+use Magento\Framework\Data\Wysiwyg\ConfigProviderInterface as WysiwygConfigInterface;
+
+/**
+ * Class ConfigProviderFactory to create config provider object by class name
+ */
+class ConfigProviderFactory
+{
+    /**
+     * Object manager
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create config provider instance
+     *
+     * @param string $instance
+     * @param array $arguments
+     * @return \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+     */
+    public function create(string $instance, array $arguments = []): WysiwygConfigInterface
+    {
+        return $this->objectManager->create($instance, $arguments);
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php b/app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php
new file mode 100644
index 0000000000000..2ff2aa3f82ba8
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Wysiwyg;
+
+/**
+ * Class DefaultConfigProvider returns data required to render tinymce4 editor
+ */
+class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     */
+    public function __construct(\Magento\Framework\View\Asset\Repository $assetRepo)
+    {
+        $this->assetRepo = $assetRepo;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $config->addData([
+            'tinymce4' => [
+                'toolbar' => 'formatselect | bold italic underline | alignleft aligncenter alignright | '
+                    . 'bullist numlist | link table charmap',
+                'plugins' => implode(
+                    ' ',
+                    [
+                        'advlist',
+                        'autolink',
+                        'lists',
+                        'link',
+                        'charmap',
+                        'media',
+                        'noneditable',
+                        'table',
+                        'contextmenu',
+                        'paste',
+                        'code',
+                        'help',
+                        'table'
+                    ]
+                ),
+                'content_css' => $this->assetRepo->getUrl('mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css')
+            ]
+        ]);
+        return $config;
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php b/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php
new file mode 100644
index 0000000000000..822f9ce2b1cb5
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Wysiwyg\Gallery;
+
+class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    private $backendUrl;
+
+    /**
+     * @var \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $imagesHelper;
+
+    /**
+     * @var array
+     */
+    private $windowSize;
+
+    /**
+     * @var string|null
+     */
+    private $currentTreePath;
+
+    /**
+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
+     * @param \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper
+     * @param array $windowSize
+     * @param string|null $currentTreePath
+     */
+    public function __construct(
+        \Magento\Backend\Model\UrlInterface $backendUrl,
+        \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper,
+        array $windowSize = [],
+        $currentTreePath = null
+    ) {
+        $this->backendUrl = $backendUrl;
+        $this->imagesHelper = $imagesHelper;
+        $this->windowSize = $windowSize;
+        $this->currentTreePath = $currentTreePath;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $pluginData = (array) $config->getData('plugins');
+        $imageData = [
+            [
+                'name' => 'image',
+            ]
+        ];
+
+        $fileBrowserUrlParams = [];
+
+        if (is_string($this->currentTreePath)) {
+            $fileBrowserUrlParams = [
+                'current_tree_path' => $this->imagesHelper->idEncode($this->currentTreePath),
+            ];
+        }
+
+        return $config->addData(
+            [
+                'add_images' => true,
+                'files_browser_window_url' => $this->backendUrl->getUrl(
+                    'cms/wysiwyg_images/index',
+                    $fileBrowserUrlParams
+                ),
+                'files_browser_window_width' => $this->windowSize['width'],
+                'files_browser_window_height' => $this->windowSize['height'],
+                'plugins' => array_merge($pluginData, $imageData)
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 0688534dc4ad9..b2ef78bab9909 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -241,10 +241,12 @@ protected function getConditionsForExcludeDirs()
     protected function removeItemFromCollection($collection, $conditions)
     {
         $regExp = $conditions['reg_exp'] ? '~' . implode('|', array_keys($conditions['reg_exp'])) . '~i' : null;
-        $storageRootLength = strlen($this->_cmsWysiwygImages->getStorageRoot());
+        $storageRoot = $this->_cmsWysiwygImages->getStorageRoot();
+        $storageRootLength = strlen($storageRoot);
 
         foreach ($collection as $key => $value) {
-            $rootChildParts = explode('/', substr($value->getFilename(), $storageRootLength));
+            $mediaSubPathname = substr($value->getFilename(), $storageRootLength);
+            $rootChildParts = explode('/', '/' . ltrim($mediaSubPathname, '/'));
 
             if (array_key_exists($rootChildParts[1], $conditions['plain'])
                 || ($regExp && preg_match($regExp, $value->getFilename()))) {
@@ -318,6 +320,8 @@ public function getFilesCollection($path, $type = null)
             $item->setName($item->getBasename());
             $item->setShortName($this->_cmsWysiwygImages->getShortFilename($item->getBasename()));
             $item->setUrl($this->_cmsWysiwygImages->getCurrentUrl() . $item->getBasename());
+            $item->setSize(filesize($item->getFilename()));
+            $item->setMimeType(\mime_content_type($item->getFilename()));
 
             if ($this->isImage($item->getBasename())) {
                 $thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
@@ -485,6 +489,9 @@ public function uploadFile($targetPath, $type = null)
         }
         $uploader->setAllowRenameFiles(true);
         $uploader->setFilesDispersion(false);
+        if (!$uploader->checkMimeType($this->getAllowedMimeTypes($type))) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('File validation failed.'));
+        }
         $result = $uploader->save($targetPath);
 
         if (!$result) {
@@ -494,14 +501,6 @@ public function uploadFile($targetPath, $type = null)
         // create thumbnail
         $this->resizeFile($targetPath . '/' . $uploader->getUploadedFileName(), true);
 
-        $result['cookie'] = [
-            'name' => $this->getSession()->getName(),
-            'value' => $this->getSession()->getSessionId(),
-            'lifetime' => $this->getSession()->getCookieLifetime(),
-            'path' => $this->getSession()->getCookiePath(),
-            'domain' => $this->getSession()->getCookieDomain(),
-        ];
-
         return $result;
     }
 
@@ -560,10 +559,10 @@ public function getThumbnailUrl($filePath, $checkFile = false)
      * Create thumbnail for image and save it to thumbnails directory
      *
      * @param string $source Image path to be resized
-     * @param bool $keepRation Keep aspect ratio or not
+     * @param bool $keepRatio Keep aspect ratio or not
      * @return bool|string Resized filepath or false if errors were occurred
      */
-    public function resizeFile($source, $keepRation = true)
+    public function resizeFile($source, $keepRatio = true)
     {
         $realPath = $this->_directory->getRelativePath($source);
         if (!$this->_directory->isFile($realPath) || !$this->_directory->isExist($realPath)) {
@@ -580,7 +579,7 @@ public function resizeFile($source, $keepRation = true)
         }
         $image = $this->_imageFactory->create();
         $image->open($source);
-        $image->keepAspectRatio($keepRation);
+        $image->keepAspectRatio($keepRatio);
         $image->resize($this->_resizeParameters['width'], $this->_resizeParameters['height']);
         $dest = $targetDir . '/' . pathinfo($source, PATHINFO_BASENAME);
         $image->save($dest);
@@ -641,11 +640,7 @@ public function getSession()
      */
     public function getAllowedExtensions($type = null)
     {
-        if (is_string($type) && array_key_exists("{$type}_allowed", $this->_extensions)) {
-            $allowed = $this->_extensions["{$type}_allowed"];
-        } else {
-            $allowed = $this->_extensions['allowed'];
-        }
+        $allowed = $this->getExtensionsList($type);
 
         return array_keys(array_filter($allowed));
     }
@@ -735,7 +730,7 @@ protected function _validatePath($path)
      */
     protected function _sanitizePath($path)
     {
-        return rtrim(preg_replace('~[/\\\]+~', '/', $this->_directory->getDriver()->getRealPath($path)), '/');
+        return rtrim(preg_replace('~[/\\\]+~', '/', $this->_directory->getDriver()->getRealPathSafety($path)), '/');
     }
 
     /**
@@ -751,4 +746,34 @@ protected function _getRelativePathToRoot($path)
             strlen($this->_sanitizePath($this->_cmsWysiwygImages->getStorageRoot()))
         );
     }
+
+    /**
+     * Prepare mime types config settings.
+     *
+     * @param string|null $type Type of storage, e.g. image, media etc.
+     * @return array Array of allowed file extensions
+     */
+    private function getAllowedMimeTypes($type = null): array
+    {
+        $allowed = $this->getExtensionsList($type);
+
+        return array_values(array_filter($allowed));
+    }
+
+    /**
+     * Get list of allowed file extensions with mime type in values.
+     *
+     * @param string|null $type
+     * @return array
+     */
+    private function getExtensionsList($type = null): array
+    {
+        if (is_string($type) && array_key_exists("{$type}_allowed", $this->_extensions)) {
+            $allowed = $this->_extensions["{$type}_allowed"];
+        } else {
+            $allowed = $this->_extensions['allowed'];
+        }
+
+        return $allowed;
+    }
 }
diff --git a/app/code/Magento/Cms/Model/WysiwygDefaultConfig.php b/app/code/Magento/Cms/Model/WysiwygDefaultConfig.php
new file mode 100644
index 0000000000000..b0f7260d209ea
--- /dev/null
+++ b/app/code/Magento/Cms/Model/WysiwygDefaultConfig.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model;
+
+class WysiwygDefaultConfig implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        return $config;
+    }
+}
diff --git a/app/code/Magento/Cms/Setup/InstallData.php b/app/code/Magento/Cms/Setup/InstallData.php
deleted file mode 100644
index 57e9aadd691d4..0000000000000
--- a/app/code/Magento/Cms/Setup/InstallData.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Cms\Setup;
-
-use Magento\Cms\Model\Page;
-use Magento\Cms\Model\PageFactory;
-use Magento\Framework\Module\Setup\Migration;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Page factory
-     *
-     * @var PageFactory
-     */
-    private $pageFactory;
-
-    /**
-     * Init
-     *
-     * @param PageFactory $pageFactory
-     */
-    public function __construct(PageFactory $pageFactory)
-    {
-        $this->pageFactory = $pageFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $cmsPages = [
-            [
-                'title' => '404 Not Found',
-                'page_layout' => '2columns-right',
-                'meta_keywords' => 'Page keywords',
-                'meta_description' => 'Page description',
-                'identifier' => 'no-route',
-                'content_heading' => 'Whoops, our bad...',
-                'content' => "<dl>\r\n<dt>The page you requested was not found, and we have a fine guess why.</dt>\r\n"
-                    . "<dd>\r\n<ul class=\"disc\">\r\n<li>If you typed the URL directly, please make sure the spelling"
-                    . " is correct.</li>\r\n<li>If you clicked on a link to get here, the link is outdated.</li>\r\n"
-                    . "</ul></dd>\r\n</dl>\r\n<dl>\r\n<dt>What can you do?</dt>\r\n<dd>Have no fear, help is near!"
-                    . " There are many ways you can get back on track with Magento Store.</dd>\r\n<dd>\r\n"
-                    . "<ul class=\"disc\">\r\n<li><a href=\"#\" onclick=\"history.go(-1); return false;\">Go back</a> "
-                    . "to the previous page.</li>\r\n<li>Use the search bar at the top of the page to search for your"
-                    . " products.</li>\r\n<li>Follow these links to get you back on track!<br />"
-                    . "<a href=\"{{store url=\"\"}}\">Store Home</a> <span class=\"separator\">|</span> "
-                    . "<a href=\"{{store url=\"customer/account\"}}\">My Account</a></li></ul></dd></dl>\r\n",
-                'is_active' => 1,
-                'stores' => [0],
-                'sort_order' => 0
-            ],
-            [
-                'title' => 'Home page',
-                'page_layout' => '1column',
-                'identifier' => 'home',
-                'content_heading' => 'Home Page',
-                'content' => "<p>CMS homepage content goes here.</p>\r\n",
-                'is_active' => 1,
-                'stores' => [0],
-                'sort_order' => 0
-            ],
-            [
-                'title' => 'Enable Cookies',
-                'page_layout' => '1column',
-                'identifier' => 'enable-cookies',
-                'content_heading' => 'What are Cookies?',
-                'content' => "<div class=\"enable-cookies cms-content\">\r\n<p>\"Cookies\" are little pieces of data"
-                    . " we send when you visit our store. Cookies help us get to know you better and personalize your"
-                    . " experience. Plus they help protect you and other shoppers from fraud.</p>\r\n"
-                    . "<p style=\"margin-bottom: 20px;\">Set your browser to accept cookies so you can buy items, "
-                    . "save items, and receive customized recommendations. Here’s how:</p>\r\n<ul>\r\n<li>"
-                    . "<a href=\"https://support.google.com/accounts/answer/61416?hl=en\" target=\"_blank\">Google "
-                    . "Chrome</a></li>\r\n<li>"
-                    . "<a href=\"http://windows.microsoft.com/en-us/internet-explorer/delete-manage-cookies\""
-                    . " target=\"_blank\">Internet Explorer</a></li>\r\n<li>"
-                    . "<a href=\"http://support.apple.com/kb/PH19214\" target=\"_blank\">Safari</a></li>\r\n<li>"
-                    . "<a href=\"https://support.mozilla.org/en-US/kb/enable-and-disable-cookies-website-preferences\""
-                    . " target=\"_blank\">Mozilla/Firefox</a></li>\r\n</ul>\r\n</div>",
-                'is_active' => 1,
-                'stores' => [0]
-            ]
-        ];
-
-        /**
-         * Insert default and system pages
-         */
-        foreach ($cmsPages as $data) {
-            $this->createPage()->setData($data)->save();
-        }
-
-        $pageContent = <<<EOD
-<div class="privacy-policy cms-content">
-    <div class="message info">
-        <span>
-            Please replace this text with your Privacy Policy.
-            Please add any additional cookies your website uses below (e.g. Google Analytics).
-        </span>
-    </div>
-    <p>
-        This privacy policy sets out how this website (hereafter "the Store") uses and protects any information that
-        you give the Store while using this website. The Store is committed to ensuring that your privacy is protected.
-        Should we ask you to provide certain information by which you can be identified when using this website, then
-        you can be assured that it will only be used in accordance with this privacy statement. The Store may change
-        this policy from time to time by updating this page. You should check this page from time to time to ensure
-        that you are happy with any changes.
-    </p>
-    <h2>What we collect</h2>
-    <p>We may collect the following information:</p>
-    <ul>
-        <li>name</li>
-        <li>contact information including email address</li>
-        <li>demographic information such as postcode, preferences and interests</li>
-        <li>other information relevant to customer surveys and/or offers</li>
-    </ul>
-    <p>
-        For the exhaustive list of cookies we collect see the <a href="#list">List of cookies we collect</a> section.
-    </p>
-    <h2>What we do with the information we gather</h2>
-    <p>
-        We require this information to understand your needs and provide you with a better service,
-        and in particular for the following reasons:
-    </p>
-    <ul>
-        <li>Internal record keeping.</li>
-        <li>We may use the information to improve our products and services.</li>
-        <li>
-            We may periodically send promotional emails about new products, special offers or other information which we
-            think you may find interesting using the email address which you have provided.
-        </li>
-        <li>
-            From time to time, we may also use your information to contact you for market research purposes.
-            We may contact you by email, phone, fax or mail. We may use the information to customise the website
-            according to your interests.
-        </li>
-    </ul>
-    <h2>Security</h2>
-    <p>
-        We are committed to ensuring that your information is secure. In order to prevent unauthorised access or
-        disclosure, we have put in place suitable physical, electronic and managerial procedures to safeguard and
-        secure the information we collect online.
-    </p>
-    <h2>How we use cookies</h2>
-    <p>
-        A cookie is a small file which asks permission to be placed on your computer's hard drive.
-        Once you agree, the file is added and the cookie helps analyse web traffic or lets you know when you visit
-        a particular site. Cookies allow web applications to respond to you as an individual. The web application
-        can tailor its operations to your needs, likes and dislikes by gathering and remembering information about
-        your preferences.
-    </p>
-    <p>
-        We use traffic log cookies to identify which pages are being used. This helps us analyse data about web page
-        traffic and improve our website in order to tailor it to customer needs. We only use this information for
-        statistical analysis purposes and then the data is removed from the system.
-    </p>
-    <p>
-        Overall, cookies help us provide you with a better website, by enabling us to monitor which pages you find
-        useful and which you do not. A cookie in no way gives us access to your computer or any information about you,
-        other than the data you choose to share with us. You can choose to accept or decline cookies.
-        Most web browsers automatically accept cookies, but you can usually modify your browser setting
-        to decline cookies if you prefer. This may prevent you from taking full advantage of the website.
-    </p>
-    <h2>Links to other websites</h2>
-    <p>
-        Our website may contain links to other websites of interest. However, once you have used these links
-        to leave our site, you should note that we do not have any control over that other website.
-        Therefore, we cannot be responsible for the protection and privacy of any information which you provide whilst
-        visiting such sites and such sites are not governed by this privacy statement.
-        You should exercise caution and look at the privacy statement applicable to the website in question.
-    </p>
-    <h2>Controlling your personal information</h2>
-    <p>You may choose to restrict the collection or use of your personal information in the following ways:</p>
-    <ul>
-        <li>
-            whenever you are asked to fill in a form on the website, look for the box that you can click to indicate
-            that you do not want the information to be used by anybody for direct marketing purposes
-        </li>
-        <li>
-            if you have previously agreed to us using your personal information for direct marketing purposes,
-            you may change your mind at any time by letting us know using our Contact Us information
-        </li>
-    </ul>
-    <p>
-        We will not sell, distribute or lease your personal information to third parties unless we have your permission
-        or are required by law to do so. We may use your personal information to send you promotional information
-        about third parties which we think you may find interesting if you tell us that you wish this to happen.
-    </p>
-    <p>
-        You may request details of personal information which we hold about you under the Data Protection Act 1998.
-        A small fee will be payable. If you would like a copy of the information held on you please email us this
-        request using our Contact Us information.
-    </p>
-    <p>
-        If you believe that any information we are holding on you is incorrect or incomplete,
-        please write to or email us as soon as possible, at the above address.
-        We will promptly correct any information found to be incorrect.
-    </p>
-    <h2><a name="list"></a>List of cookies we collect</h2>
-    <p>The table below lists the cookies we collect and what information they store.</p>
-    <table class="data-table data-table-definition-list">
-        <thead>
-            <tr>
-                <th>COOKIE name</th>
-                <th>COOKIE Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>CART</th>
-                <td>The association with your shopping cart.</td>
-            </tr>
-            <tr>
-                <th>CATEGORY_INFO</th>
-                <td>Stores the category info on the page, that allows to display pages more quickly.</td>
-            </tr>
-            <tr>
-                <th>COMPARE</th>
-                <td>The items that you have in the Compare Products list.</td>
-            </tr>
-            <tr>
-                <th>CUSTOMER</th>
-                <td>An encrypted version of your customer id with the store.</td>
-            </tr>
-            <tr>
-                <th>CUSTOMER_AUTH</th>
-                <td>An indicator if you are currently logged into the store.</td>
-            </tr>
-            <tr>
-                <th>CUSTOMER_INFO</th>
-                <td>An encrypted version of the customer group you belong to.</td>
-            </tr>
-            <tr>
-                <th>CUSTOMER_SEGMENT_IDS</th>
-                <td>Stores the Customer Segment ID</td>
-            </tr>
-            <tr>
-                <th>EXTERNAL_NO_CACHE</th>
-                <td>A flag, which indicates whether caching is disabled or not.</td>
-            </tr>
-            <tr>
-                <th>FORM_KEY</th>
-                <td>Stores form key used by page cache functionality.</td>
-            </tr>
-            <tr>
-                <th>FRONTEND</th>
-                <td>Your session ID on the server.</td>
-            </tr>
-            <tr>
-                <th>GUEST-VIEW</th>
-                <td>Allows guests to edit their orders.</td>
-            </tr>
-            <tr>
-                <th>LAST_CATEGORY</th>
-                <td>The last category you visited.</td>
-            </tr>
-            <tr>
-                <th>LAST_PRODUCT</th>
-                <td>The most recent product you have viewed.</td>
-            </tr>
-            <tr>
-                <th>NEWMESSAGE</th>
-                <td>Indicates whether a new message has been received.</td>
-            </tr>
-            <tr>
-                <th>NO_CACHE</th>
-                <td>Indicates whether it is allowed to use cache.</td>
-            </tr>
-            <tr>
-                <th>PERSISTENT_SHOPPING_CART</th>
-                <td>A link to information about your cart and viewing history if you have asked the site.</td>
-            </tr>
-            <tr>
-                <th>RECENTLYCOMPARED</th>
-                <td>The items that you have recently compared.</td>
-            </tr>
-            <tr>
-                <th>STF</th>
-                <td>Information on products you have emailed to friends.</td>
-            </tr>
-            <tr>
-                <th>STORE</th>
-                <td>The store view or language you have selected.</td>
-            </tr>
-            <tr>
-                <th>USER_ALLOWED_SAVE_COOKIE</th>
-                <td>Indicates whether a customer allowed to use cookies.</td>
-            </tr>
-            <tr>
-                <th>VIEWED_PRODUCT_IDS</th>
-                <td>The products that you have recently viewed.</td>
-            </tr>
-            <tr>
-                <th>WISHLIST</th>
-                <td>An encrypted list of products added to your Wish List.</td>
-            </tr>
-            <tr>
-                <th>WISHLIST_CNT</th>
-                <td>The number of items in your Wish List.</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-EOD;
-
-        $privacyPageData = [
-            'title' => 'Privacy and Cookie Policy',
-            'content_heading' => 'Privacy and Cookie Policy',
-            'page_layout' => '1column',
-            'identifier' => 'privacy-policy-cookie-restriction-mode',
-            'content' => $pageContent,
-            'is_active' => 1,
-            'stores' => [0],
-            'sort_order' => 0,
-        ];
-
-        $this->createPage()->setData($privacyPageData)->save();
-
-        $footerLinksBlock = $this->createPage()->load('footer_links', 'identifier');
-
-        if ($footerLinksBlock->getId()) {
-            $content = $footerLinksBlock->getContent();
-            if (preg_match('/<ul>(.*?)<\\/ul>/ims', $content)) {
-                $content = preg_replace('/<li class="last">/ims', '<li>', $content);
-                $replacment = '<li class="last privacy">' .
-                    "<a href=\"{{store direct_url=\"privacy-policy-cookie-restriction-mode\"}}\">" .
-                    __('Privacy and Cookie Policy') . "</a></li>\r\n</ul>";
-                $content = preg_replace('/<\\/ul>/ims', $replacment, $content);
-                $footerLinksBlock->setContent($content)->save();
-            }
-        }
-
-        $installer = $setup->createMigrationSetup();
-        $setup->startSetup();
-
-        $installer->appendClassAliasReplace(
-            'cms_block',
-            'content',
-            Migration::ENTITY_TYPE_BLOCK,
-            Migration::FIELD_CONTENT_TYPE_WIKI,
-            ['block_id']
-        );
-        $installer->appendClassAliasReplace(
-            'cms_page',
-            'content',
-            Migration::ENTITY_TYPE_BLOCK,
-            Migration::FIELD_CONTENT_TYPE_WIKI,
-            ['page_id']
-        );
-        $installer->appendClassAliasReplace(
-            'cms_page',
-            'layout_update_xml',
-            Migration::ENTITY_TYPE_BLOCK,
-            Migration::FIELD_CONTENT_TYPE_XML,
-            ['page_id']
-        );
-        $installer->appendClassAliasReplace(
-            'cms_page',
-            'custom_layout_update_xml',
-            Migration::ENTITY_TYPE_BLOCK,
-            Migration::FIELD_CONTENT_TYPE_XML,
-            ['page_id']
-        );
-
-        $installer->doUpdateClassAliases();
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Create page
-     *
-     * @return Page
-     */
-    public function createPage()
-    {
-        return $this->pageFactory->create();
-    }
-}
diff --git a/app/code/Magento/Cms/Setup/InstallSchema.php b/app/code/Magento/Cms/Setup/InstallSchema.php
deleted file mode 100644
index 038f1620963be..0000000000000
--- a/app/code/Magento/Cms/Setup/InstallSchema.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Cms\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'cms_block'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('cms_block')
-        )->addColumn(
-            'block_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Block ID'
-        )->addColumn(
-            'title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Block Title'
-        )->addColumn(
-            'identifier',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Block String Identifier'
-        )->addColumn(
-            'content',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '2M',
-            [],
-            'Block Content'
-        )->addColumn(
-            'creation_time',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Block Creation Time'
-        )->addColumn(
-            'update_time',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Block Modification Time'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '1'],
-            'Is Block Active'
-        )->addIndex(
-            $setup->getIdxName(
-                $installer->getTable('cms_block'),
-                ['title', 'identifier', 'content'],
-                AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            ['title', 'identifier', 'content'],
-            ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->setComment(
-            'CMS Block Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'cms_block_store'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('cms_block_store')
-        )->addColumn(
-            'block_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'primary' => true],
-            'Block ID'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store ID'
-        )->addIndex(
-            $installer->getIdxName('cms_block_store', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('cms_block_store', 'block_id', 'cms_block', 'block_id'),
-            'block_id',
-            $installer->getTable('cms_block'),
-            'block_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('cms_block_store', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'CMS Block To Store Linkage Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'cms_page'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('cms_page')
-        )->addColumn(
-            'page_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Page ID'
-        )->addColumn(
-            'title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Page Title'
-        )->addColumn(
-            'page_layout',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Page Layout'
-        )->addColumn(
-            'meta_keywords',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => true],
-            'Page Meta Keywords'
-        )->addColumn(
-            'meta_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => true],
-            'Page Meta Description'
-        )->addColumn(
-            'identifier',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            ['nullable' => true, 'default' => null],
-            'Page String Identifier'
-        )->addColumn(
-            'content_heading',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Page Content Heading'
-        )->addColumn(
-            'content',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '2M',
-            [],
-            'Page Content'
-        )->addColumn(
-            'creation_time',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Page Creation Time'
-        )->addColumn(
-            'update_time',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Page Modification Time'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '1'],
-            'Is Page Active'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Page Sort Order'
-        )->addColumn(
-            'layout_update_xml',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => true],
-            'Page Layout Update Content'
-        )->addColumn(
-            'custom_theme',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            ['nullable' => true],
-            'Page Custom Theme'
-        )->addColumn(
-            'custom_root_template',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Page Custom Template'
-        )->addColumn(
-            'custom_layout_update_xml',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => true],
-            'Page Custom Layout Update Content'
-        )->addColumn(
-            'custom_theme_from',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => true],
-            'Page Custom Theme Active From Date'
-        )->addColumn(
-            'custom_theme_to',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => true],
-            'Page Custom Theme Active To Date'
-        )->addIndex(
-            $installer->getIdxName('cms_page', ['identifier']),
-            ['identifier']
-        )->addIndex(
-            $setup->getIdxName(
-                $installer->getTable('cms_page'),
-                ['title', 'meta_keywords', 'meta_description', 'identifier', 'content'],
-                AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            ['title', 'meta_keywords', 'meta_description', 'identifier', 'content'],
-            ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->setComment(
-            'CMS Page Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'cms_page_store'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('cms_page_store')
-        )->addColumn(
-            'page_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'primary' => true],
-            'Page ID'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store ID'
-        )->addIndex(
-            $installer->getIdxName('cms_page_store', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('cms_page_store', 'page_id', 'cms_page', 'page_id'),
-            'page_id',
-            $installer->getTable('cms_page'),
-            'page_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('cms_page_store', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'CMS Page To Store Linkage Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php b/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php
new file mode 100644
index 0000000000000..61f26c9bd0710
--- /dev/null
+++ b/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Setup\Patch\Data;
+
+use Magento\Cms\Setup\ContentConverter;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Widget\Setup\LayoutUpdateConverter;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Cms\Api\Data\PageInterface;
+
+/**
+ * Class ConvertWidgetConditionsToJson
+ * @package Magento\Cms\Setup\Patch
+ */
+class ConvertWidgetConditionsToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var AggregatedFieldDataConverter
+     */
+    private $aggregatedFieldDataConverter;
+
+    /**
+     * ConvertWidgetConditionsToJson constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param QueryModifierFactory $queryModifierFactory
+     * @param MetadataPool $metadataPool
+     * @param AggregatedFieldDataConverter $aggregatedFieldDataConverter
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        QueryModifierFactory $queryModifierFactory,
+        MetadataPool $metadataPool,
+        AggregatedFieldDataConverter $aggregatedFieldDataConverter
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->queryModifierFactory = $queryModifierFactory;
+        $this->metadataPool = $metadataPool;
+        $this->aggregatedFieldDataConverter = $aggregatedFieldDataConverter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $queryModifier = $this->queryModifierFactory->create(
+            'like',
+            [
+                'values' => [
+                    'content' => '%conditions_encoded%'
+                ]
+            ]
+        );
+        $layoutUpdateXmlFieldQueryModifier = $this->queryModifierFactory->create(
+            'like',
+            [
+                'values' => [
+                    'layout_update_xml' => '%conditions_encoded%'
+                ]
+            ]
+        );
+        $customLayoutUpdateXmlFieldQueryModifier = $this->queryModifierFactory->create(
+            'like',
+            [
+                'values' => [
+                    'custom_layout_update_xml' => '%conditions_encoded%'
+                ]
+            ]
+        );
+        $blockMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
+        $pageMetadata = $this->metadataPool->getMetadata(PageInterface::class);
+        $this->aggregatedFieldDataConverter->convert(
+            [
+                new FieldToConvert(
+                    ContentConverter::class,
+                    $this->moduleDataSetup->getTable('cms_block'),
+                    $blockMetadata->getIdentifierField(),
+                    'content',
+                    $queryModifier
+                ),
+                new FieldToConvert(
+                    ContentConverter::class,
+                    $this->moduleDataSetup->getTable('cms_page'),
+                    $pageMetadata->getIdentifierField(),
+                    'content',
+                    $queryModifier
+                ),
+                new FieldToConvert(
+                    LayoutUpdateConverter::class,
+                    $this->moduleDataSetup->getTable('cms_page'),
+                    $pageMetadata->getIdentifierField(),
+                    'layout_update_xml',
+                    $layoutUpdateXmlFieldQueryModifier
+                ),
+                new FieldToConvert(
+                    LayoutUpdateConverter::class,
+                    $this->moduleDataSetup->getTable('cms_page'),
+                    $pageMetadata->getIdentifierField(),
+                    'custom_layout_update_xml',
+                    $customLayoutUpdateXmlFieldQueryModifier
+                ),
+            ],
+            $this->moduleDataSetup->getConnection()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdatePrivacyPolicyPage::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php b/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php
new file mode 100644
index 0000000000000..615cdb144fd1f
--- /dev/null
+++ b/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php
@@ -0,0 +1,411 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Module\Setup\Migration;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+/**
+ * Class CreateDefaultPages
+ * @package Magento\Cms\Setup\Patch
+ */
+class CreateDefaultPages implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Cms\Model\PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * CreateDefaultPages constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Cms\Model\PageFactory $pageFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Cms\Model\PageFactory $pageFactory
+    ) {
+        $this->pageFactory = $pageFactory;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        $cmsPages = [
+            [
+                'title' => '404 Not Found',
+                'page_layout' => '2columns-right',
+                'meta_keywords' => 'Page keywords',
+                'meta_description' => 'Page description',
+                'identifier' => 'no-route',
+                'content_heading' => 'Whoops, our bad...',
+                'content' => "<dl>\r\n<dt>The page you requested was not found, and we have a fine guess why.</dt>\r\n"
+                    . "<dd>\r\n<ul class=\"disc\">\r\n<li>If you typed the URL directly, please make sure the spelling"
+                    . " is correct.</li>\r\n<li>If you clicked on a link to get here, the link is outdated.</li>\r\n"
+                    . "</ul></dd>\r\n</dl>\r\n<dl>\r\n<dt>What can you do?</dt>\r\n<dd>Have no fear, help is near!"
+                    . " There are many ways you can get back on track with Magento Store.</dd>\r\n<dd>\r\n"
+                    . "<ul class=\"disc\">\r\n<li><a href=\"#\" onclick=\"history.go(-1); return false;\">Go back</a> "
+                    . "to the previous page.</li>\r\n<li>Use the search bar at the top of the page to search for your"
+                    . " products.</li>\r\n<li>Follow these links to get you back on track!<br />"
+                    . "<a href=\"{{store url=\"\"}}\">Store Home</a> <span class=\"separator\">|</span> "
+                    . "<a href=\"{{store url=\"customer/account\"}}\">My Account</a></li></ul></dd></dl>\r\n",
+                'is_active' => 1,
+                'stores' => [0],
+                'sort_order' => 0
+            ],
+            [
+                'title' => 'Home page',
+                'page_layout' => '1column',
+                'identifier' => 'home',
+                'content_heading' => 'Home Page',
+                'content' => "<p>CMS homepage content goes here.</p>\r\n",
+                'is_active' => 1,
+                'stores' => [0],
+                'sort_order' => 0
+            ],
+            [
+                'title' => 'Enable Cookies',
+                'page_layout' => '1column',
+                'identifier' => 'enable-cookies',
+                'content_heading' => 'What are Cookies?',
+                'content' => "<div class=\"enable-cookies cms-content\">\r\n<p>\"Cookies\" are little pieces of data"
+                    . " we send when you visit our store. Cookies help us get to know you better and personalize your"
+                    . " experience. Plus they help protect you and other shoppers from fraud.</p>\r\n"
+                    . "<p style=\"margin-bottom: 20px;\">Set your browser to accept cookies so you can buy items, "
+                    . "save items, and receive customized recommendations. Here’s how:</p>\r\n<ul>\r\n<li>"
+                    . "<a href=\"https://support.google.com/accounts/answer/61416?hl=en\" target=\"_blank\">Google "
+                    . "Chrome</a></li>\r\n<li>"
+                    . "<a href=\"http://windows.microsoft.com/en-us/internet-explorer/delete-manage-cookies\""
+                    . " target=\"_blank\">Internet Explorer</a></li>\r\n<li>"
+                    . "<a href=\"http://support.apple.com/kb/PH19214\" target=\"_blank\">Safari</a></li>\r\n<li>"
+                    . "<a href=\"https://support.mozilla.org/en-US/kb/enable-and-disable-cookies-website-preferences\""
+                    . " target=\"_blank\">Mozilla/Firefox</a></li>\r\n</ul>\r\n</div>",
+                'is_active' => 1,
+                'stores' => [0]
+            ]
+        ];
+
+        /**
+         * Insert default and system pages
+         */
+        foreach ($cmsPages as $data) {
+            $this->createPage()->setData($data)->save();
+        }
+        $pageContent = <<<EOD
+<div class="privacy-policy cms-content">
+    <div class="message info">
+        <span>
+            Please replace this text with your Privacy Policy.
+            Please add any additional cookies your website uses below (e.g. Google Analytics).
+        </span>
+    </div>
+    <p>
+        This privacy policy sets out how this website (hereafter "the Store") uses and protects any information that
+        you give the Store while using this website. The Store is committed to ensuring that your privacy is protected.
+        Should we ask you to provide certain information by which you can be identified when using this website, then
+        you can be assured that it will only be used in accordance with this privacy statement. The Store may change
+        this policy from time to time by updating this page. You should check this page from time to time to ensure
+        that you are happy with any changes.
+    </p>
+    <h2>What we collect</h2>
+    <p>We may collect the following information:</p>
+    <ul>
+        <li>name</li>
+        <li>contact information including email address</li>
+        <li>demographic information such as postcode, preferences and interests</li>
+        <li>other information relevant to customer surveys and/or offers</li>
+    </ul>
+    <p>
+        For the exhaustive list of cookies we collect see the <a href="#list">List of cookies we collect</a> section.
+    </p>
+    <h2>What we do with the information we gather</h2>
+    <p>
+        We require this information to understand your needs and provide you with a better service,
+        and in particular for the following reasons:
+    </p>
+    <ul>
+        <li>Internal record keeping.</li>
+        <li>We may use the information to improve our products and services.</li>
+        <li>
+            We may periodically send promotional emails about new products, special offers or other information which we
+            think you may find interesting using the email address which you have provided.
+        </li>
+        <li>
+            From time to time, we may also use your information to contact you for market research purposes.
+            We may contact you by email, phone, fax or mail. We may use the information to customise the website
+            according to your interests.
+        </li>
+    </ul>
+    <h2>Security</h2>
+    <p>
+        We are committed to ensuring that your information is secure. In order to prevent unauthorised access or
+        disclosure, we have put in place suitable physical, electronic and managerial procedures to safeguard and
+        secure the information we collect online.
+    </p>
+    <h2>How we use cookies</h2>
+    <p>
+        A cookie is a small file which asks permission to be placed on your computer's hard drive.
+        Once you agree, the file is added and the cookie helps analyse web traffic or lets you know when you visit
+        a particular site. Cookies allow web applications to respond to you as an individual. The web application
+        can tailor its operations to your needs, likes and dislikes by gathering and remembering information about
+        your preferences.
+    </p>
+    <p>
+        We use traffic log cookies to identify which pages are being used. This helps us analyse data about web page
+        traffic and improve our website in order to tailor it to customer needs. We only use this information for
+        statistical analysis purposes and then the data is removed from the system.
+    </p>
+    <p>
+        Overall, cookies help us provide you with a better website, by enabling us to monitor which pages you find
+        useful and which you do not. A cookie in no way gives us access to your computer or any information about you,
+        other than the data you choose to share with us. You can choose to accept or decline cookies.
+        Most web browsers automatically accept cookies, but you can usually modify your browser setting
+        to decline cookies if you prefer. This may prevent you from taking full advantage of the website.
+    </p>
+    <h2>Links to other websites</h2>
+    <p>
+        Our website may contain links to other websites of interest. However, once you have used these links
+        to leave our site, you should note that we do not have any control over that other website.
+        Therefore, we cannot be responsible for the protection and privacy of any information which you provide whilst
+        visiting such sites and such sites are not governed by this privacy statement.
+        You should exercise caution and look at the privacy statement applicable to the website in question.
+    </p>
+    <h2>Controlling your personal information</h2>
+    <p>You may choose to restrict the collection or use of your personal information in the following ways:</p>
+    <ul>
+        <li>
+            whenever you are asked to fill in a form on the website, look for the box that you can click to indicate
+            that you do not want the information to be used by anybody for direct marketing purposes
+        </li>
+        <li>
+            if you have previously agreed to us using your personal information for direct marketing purposes,
+            you may change your mind at any time by letting us know using our Contact Us information
+        </li>
+    </ul>
+    <p>
+        We will not sell, distribute or lease your personal information to third parties unless we have your permission
+        or are required by law to do so. We may use your personal information to send you promotional information
+        about third parties which we think you may find interesting if you tell us that you wish this to happen.
+    </p>
+    <p>
+        You may request details of personal information which we hold about you under the Data Protection Act 1998.
+        A small fee will be payable. If you would like a copy of the information held on you please email us this
+        request using our Contact Us information.
+    </p>
+    <p>
+        If you believe that any information we are holding on you is incorrect or incomplete,
+        please write to or email us as soon as possible, at the above address.
+        We will promptly correct any information found to be incorrect.
+    </p>
+    <h2><a name="list"></a>List of cookies we collect</h2>
+    <p>The table below lists the cookies we collect and what information they store.</p>
+    <table class="data-table data-table-definition-list">
+        <thead>
+            <tr>
+                <th>COOKIE name</th>
+                <th>COOKIE Description</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>CART</th>
+                <td>The association with your shopping cart.</td>
+            </tr>
+            <tr>
+                <th>CATEGORY_INFO</th>
+                <td>Stores the category info on the page, that allows to display pages more quickly.</td>
+            </tr>
+            <tr>
+                <th>COMPARE</th>
+                <td>The items that you have in the Compare Products list.</td>
+            </tr>
+            <tr>
+                <th>CUSTOMER</th>
+                <td>An encrypted version of your customer id with the store.</td>
+            </tr>
+            <tr>
+                <th>CUSTOMER_AUTH</th>
+                <td>An indicator if you are currently logged into the store.</td>
+            </tr>
+            <tr>
+                <th>CUSTOMER_INFO</th>
+                <td>An encrypted version of the customer group you belong to.</td>
+            </tr>
+            <tr>
+                <th>CUSTOMER_SEGMENT_IDS</th>
+                <td>Stores the Customer Segment ID</td>
+            </tr>
+            <tr>
+                <th>EXTERNAL_NO_CACHE</th>
+                <td>A flag, which indicates whether caching is disabled or not.</td>
+            </tr>
+            <tr>
+                <th>FORM_KEY</th>
+                <td>Stores form key used by page cache functionality.</td>
+            </tr>
+            <tr>
+                <th>FRONTEND</th>
+                <td>Your session ID on the server.</td>
+            </tr>
+            <tr>
+                <th>GUEST-VIEW</th>
+                <td>Allows guests to edit their orders.</td>
+            </tr>
+            <tr>
+                <th>LAST_CATEGORY</th>
+                <td>The last category you visited.</td>
+            </tr>
+            <tr>
+                <th>LAST_PRODUCT</th>
+                <td>The most recent product you have viewed.</td>
+            </tr>
+            <tr>
+                <th>NEWMESSAGE</th>
+                <td>Indicates whether a new message has been received.</td>
+            </tr>
+            <tr>
+                <th>NO_CACHE</th>
+                <td>Indicates whether it is allowed to use cache.</td>
+            </tr>
+            <tr>
+                <th>PERSISTENT_SHOPPING_CART</th>
+                <td>A link to information about your cart and viewing history if you have asked the site.</td>
+            </tr>
+            <tr>
+                <th>RECENTLYCOMPARED</th>
+                <td>The items that you have recently compared.</td>
+            </tr>
+            <tr>
+                <th>STF</th>
+                <td>Information on products you have emailed to friends.</td>
+            </tr>
+            <tr>
+                <th>STORE</th>
+                <td>The store view or language you have selected.</td>
+            </tr>
+            <tr>
+                <th>USER_ALLOWED_SAVE_COOKIE</th>
+                <td>Indicates whether a customer allowed to use cookies.</td>
+            </tr>
+            <tr>
+                <th>VIEWED_PRODUCT_IDS</th>
+                <td>The products that you have recently viewed.</td>
+            </tr>
+            <tr>
+                <th>WISHLIST</th>
+                <td>An encrypted list of products added to your Wish List.</td>
+            </tr>
+            <tr>
+                <th>WISHLIST_CNT</th>
+                <td>The number of items in your Wish List.</td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+EOD;
+        $privacyPageData = [
+            'title' => 'Privacy and Cookie Policy',
+            'content_heading' => 'Privacy and Cookie Policy',
+            'page_layout' => '1column',
+            'identifier' => 'privacy-policy-cookie-restriction-mode',
+            'content' => $pageContent,
+            'is_active' => 1,
+            'stores' => [0],
+            'sort_order' => 0,
+        ];
+        $this->createPage()->setData($privacyPageData)->save();
+        $footerLinksBlock = $this->createPage()->load('footer_links', 'identifier');
+        if ($footerLinksBlock->getId()) {
+            $content = $footerLinksBlock->getContent();
+            if (preg_match('/<ul>(.*?)<\\/ul>/ims', $content)) {
+                $content = preg_replace('/<li class="last">/ims', '<li>', $content);
+                $replacment = '<li class="last privacy">' .
+                    "<a href=\"{{store direct_url=\"privacy-policy-cookie-restriction-mode\"}}\">" .
+                    __('Privacy and Cookie Policy') . "</a></li>\r\n</ul>";
+                $content = preg_replace('/<\\/ul>/ims', $replacment, $content);
+                $footerLinksBlock->setContent($content)->save();
+            }
+        }
+        $installer = $this->moduleDataSetup->createMigrationSetup();
+        $this->moduleDataSetup->startSetup();
+        $installer->appendClassAliasReplace(
+            'cms_block',
+            'content',
+            Migration::ENTITY_TYPE_BLOCK,
+            Migration::FIELD_CONTENT_TYPE_WIKI,
+            ['block_id']
+        );
+        $installer->appendClassAliasReplace(
+            'cms_page',
+            'content',
+            Migration::ENTITY_TYPE_BLOCK,
+            Migration::FIELD_CONTENT_TYPE_WIKI,
+            ['page_id']
+        );
+        $installer->appendClassAliasReplace(
+            'cms_page',
+            'layout_update_xml',
+            Migration::ENTITY_TYPE_BLOCK,
+            Migration::FIELD_CONTENT_TYPE_XML,
+            ['page_id']
+        );
+        $installer->appendClassAliasReplace(
+            'cms_page',
+            'custom_layout_update_xml',
+            Migration::ENTITY_TYPE_BLOCK,
+            Migration::FIELD_CONTENT_TYPE_XML,
+            ['page_id']
+        );
+        $installer->doUpdateClassAliases();
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Create page model instance
+     *
+     * @return \Magento\Cms\Model\Page
+     */
+    private function createPage()
+    {
+        return $this->pageFactory->create();
+    }
+}
diff --git a/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php b/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php
new file mode 100644
index 0000000000000..dff931bfd6359
--- /dev/null
+++ b/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Setup\Patch\Data;
+
+use Magento\Cms\Model\PageFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdatePrivacyPolicyPage
+ * @package Magento\Cms\Setup\Patch
+ */
+class UpdatePrivacyPolicyPage implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * UpdatePrivacyPolicyPage constructor.
+     * @param PageFactory $pageFactory
+     */
+    public function __construct(
+        PageFactory $pageFactory
+    ) {
+        $this->pageFactory = $pageFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+                $newPageContent = <<<EOD
+<div class="privacy-policy cms-content">
+    <div class="message info">
+        <span>
+            Please replace this text with you Privacy Policy.
+            Please add any additional cookies your website uses below (e.g. Google Analytics).
+        </span>
+    </div>
+    <p>
+        This privacy policy sets out how this website (hereafter "the Store") uses and protects any information that
+        you give the Store while using this website. The Store is committed to ensuring that your privacy is protected.
+        Should we ask you to provide certain information by which you can be identified when using this website, then
+        you can be assured that it will only be used in accordance with this privacy statement. The Store may change
+        this policy from time to time by updating this page. You should check this page from time to time to ensure
+        that you are happy with any changes.
+    </p>
+    <h2>What we collect</h2>
+    <p>We may collect the following information:</p>
+    <ul>
+        <li>name</li>
+        <li>contact information including email address</li>
+        <li>demographic information such as postcode, preferences and interests</li>
+        <li>other information relevant to customer surveys and/or offers</li>
+    </ul>
+    <p>
+        For the exhaustive list of cookies we collect see the <a href="#list">List of cookies we collect</a> section.
+    </p>
+    <h2>What we do with the information we gather</h2>
+    <p>
+        We require this information to understand your needs and provide you with a better service,
+        and in particular for the following reasons:
+    </p>
+    <ul>
+        <li>Internal record keeping.</li>
+        <li>We may use the information to improve our products and services.</li>
+        <li>
+            We may periodically send promotional emails about new products, special offers or other information which we
+            think you may find interesting using the email address which you have provided.
+        </li>
+        <li>
+            From time to time, we may also use your information to contact you for market research purposes.
+            We may contact you by email, phone, fax or mail. We may use the information to customise the website
+            according to your interests.
+        </li>
+    </ul>
+    <h2>Security</h2>
+    <p>
+        We are committed to ensuring that your information is secure. In order to prevent unauthorised access or
+        disclosure, we have put in place suitable physical, electronic and managerial procedures to safeguard and
+        secure the information we collect online.
+    </p>
+    <h2>How we use cookies</h2>
+    <p>
+        A cookie is a small file which asks permission to be placed on your computer's hard drive.
+        Once you agree, the file is added and the cookie helps analyse web traffic or lets you know when you visit
+        a particular site. Cookies allow web applications to respond to you as an individual. The web application
+        can tailor its operations to your needs, likes and dislikes by gathering and remembering information about
+        your preferences.
+    </p>
+    <p>
+        We use traffic log cookies to identify which pages are being used. This helps us analyse data about web page
+        traffic and improve our website in order to tailor it to customer needs. We only use this information for
+        statistical analysis purposes and then the data is removed from the system.
+    </p>
+    <p>
+        Overall, cookies help us provide you with a better website, by enabling us to monitor which pages you find
+        useful and which you do not. A cookie in no way gives us access to your computer or any information about you,
+        other than the data you choose to share with us. You can choose to accept or decline cookies.
+        Most web browsers automatically accept cookies, but you can usually modify your browser setting
+        to decline cookies if you prefer. This may prevent you from taking full advantage of the website.
+    </p>
+    <h2>Links to other websites</h2>
+    <p>
+        Our website may contain links to other websites of interest. However, once you have used these links
+        to leave our site, you should note that we do not have any control over that other website.
+        Therefore, we cannot be responsible for the protection and privacy of any information which you provide whilst
+        visiting such sites and such sites are not governed by this privacy statement.
+        You should exercise caution and look at the privacy statement applicable to the website in question.
+    </p>
+    <h2>Controlling your personal information</h2>
+    <p>You may choose to restrict the collection or use of your personal information in the following ways:</p>
+    <ul>
+        <li>
+            whenever you are asked to fill in a form on the website, look for the box that you can click to indicate
+            that you do not want the information to be used by anybody for direct marketing purposes
+        </li>
+        <li>
+            if you have previously agreed to us using your personal information for direct marketing purposes,
+            you may change your mind at any time by letting us know using our Contact Us information
+        </li>
+    </ul>
+    <p>
+        We will not sell, distribute or lease your personal information to third parties unless we have your permission
+        or are required by law to do so. We may use your personal information to send you promotional information
+        about third parties which we think you may find interesting if you tell us that you wish this to happen.
+    </p>
+    <p>
+        You may request details of personal information which we hold about you under the Data Protection Act 1998.
+        A small fee will be payable. If you would like a copy of the information held on you please email us this
+        request using our Contact Us information.
+    </p>
+    <p>
+        If you believe that any information we are holding on you is incorrect or incomplete,
+        please write to or email us as soon as possible, at the above address.
+        We will promptly correct any information found to be incorrect.
+    </p>
+    <h2><a name="list"></a>List of cookies we collect</h2>
+    <p>The table below lists the cookies we collect and what information they store.</p>
+    <table class="data-table data-table-definition-list">
+        <thead>
+        <tr>
+            <th>Cookie Name</th>
+            <th>Cookie Description</th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>FORM_KEY</th>
+                <td>Stores randomly generated key used to prevent forged requests.</td>
+            </tr>
+            <tr>
+                <th>PHPSESSID</th>
+                <td>Your session ID on the server.</td>
+            </tr>
+            <tr>
+                <th>GUEST-VIEW</th>
+                <td>Allows guests to view and edit their orders.</td>
+            </tr>
+            <tr>
+                <th>PERSISTENT_SHOPPING_CART</th>
+                <td>A link to information about your cart and viewing history, if you have asked for this.</td>
+            </tr>
+            <tr>
+                <th>STF</th>
+                <td>Information on products you have emailed to friends.</td>
+            </tr>
+            <tr>
+                <th>STORE</th>
+                <td>The store view or language you have selected.</td>
+            </tr>
+            <tr>
+                <th>USER_ALLOWED_SAVE_COOKIE</th>
+                <td>Indicates whether a customer allowed to use cookies.</td>
+            </tr>
+            <tr>
+                <th>MAGE-CACHE-SESSID</th>
+                <td>Facilitates caching of content on the browser to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>MAGE-CACHE-STORAGE</th>
+                <td>Facilitates caching of content on the browser to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>MAGE-CACHE-STORAGE-SECTION-INVALIDATION</th>
+                <td>Facilitates caching of content on the browser to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>MAGE-CACHE-TIMEOUT</th>
+                <td>Facilitates caching of content on the browser to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>SECTION-DATA-IDS</th>
+                <td>Facilitates caching of content on the browser to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>PRIVATE_CONTENT_VERSION</th>
+                <td>Facilitates caching of content on the browser to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>X-MAGENTO-VARY</th>
+                <td>Facilitates caching of content on the server to make pages load faster.</td>
+            </tr>
+            <tr>
+                <th>MAGE-TRANSLATION-FILE-VERSION</th>
+                <td>Facilitates translation of content to other languages.</td>
+            </tr>
+            <tr>
+                <th>MAGE-TRANSLATION-STORAGE</th>
+                <td>Facilitates translation of content to other languages.</td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+EOD;
+        $privacyAndCookiePolicyPage = $this->createPage()->load(
+            'privacy-policy-cookie-restriction-mode',
+            'identifier'
+        );
+        $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
+        if ($privacyAndCookiePolicyPageId) {
+            $privacyAndCookiePolicyPage->setContent($newPageContent);
+            $privacyAndCookiePolicyPage->save();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            CreateDefaultPages::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Create page instance.
+     *
+     * @return \Magento\Cms\Model\Page
+     */
+    private function createPage()
+    {
+        return $this->pageFactory->create();
+    }
+}
diff --git a/app/code/Magento/Cms/Setup/UpgradeData.php b/app/code/Magento/Cms/Setup/UpgradeData.php
deleted file mode 100644
index 91bda43d2e0e7..0000000000000
--- a/app/code/Magento/Cms/Setup/UpgradeData.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Setup;
-
-use Magento\Cms\Api\Data\BlockInterface;
-use Magento\Cms\Api\Data\PageInterface;
-use Magento\Cms\Model\Page;
-use Magento\Cms\Model\PageFactory;
-use Magento\Framework\DB\AggregatedFieldDataConverter;
-use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Widget\Setup\LayoutUpdateConverter;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @deprecated
-     */
-    const PRIVACY_COOKIE_PAGE_ID = 4;
-
-    /**
-     * @var PageFactory
-     */
-    private $pageFactory;
-
-    /**
-     * @var \Magento\Framework\DB\Select\QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * @var MetadataPool
-     */
-    private $metadataPool;
-
-    /**
-     * @var AggregatedFieldDataConverter
-     */
-    private $aggregatedFieldConverter;
-
-    /**
-     * UpgradeData constructor.
-     *
-     * @param PageFactory $pageFactory
-     * @param AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @param \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
-     * @param MetadataPool $metadataPool
-     */
-    public function __construct(
-        PageFactory $pageFactory,
-        AggregatedFieldDataConverter $aggregatedFieldConverter,
-        \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory,
-        MetadataPool $metadataPool
-    ) {
-        $this->pageFactory = $pageFactory;
-        $this->aggregatedFieldConverter = $aggregatedFieldConverter;
-        $this->queryModifierFactory = $queryModifierFactory;
-        $this->metadataPool = $metadataPool;
-    }
-
-    /**
-     * Upgrades data for a module
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->upgradeVersionTwoZeroOne();
-        }
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $this->convertWidgetConditionsToJson($setup);
-        }
-    }
-
-    /**
-     * Upgrade data to version 2.0.2
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function convertWidgetConditionsToJson(ModuleDataSetupInterface $setup)
-    {
-        $queryModifier = $this->queryModifierFactory->create(
-            'like',
-            [
-                'values' => [
-                    'content' => '%conditions_encoded%'
-                ]
-            ]
-        );
-        $layoutUpdateXmlFieldQueryModifier = $this->queryModifierFactory->create(
-            'like',
-            [
-                'values' => [
-                    'layout_update_xml' => '%conditions_encoded%'
-                ]
-            ]
-        );
-        $customLayoutUpdateXmlFieldQueryModifier = $this->queryModifierFactory->create(
-            'like',
-            [
-                'values' => [
-                    'custom_layout_update_xml' => '%conditions_encoded%'
-                ]
-            ]
-        );
-        $blockMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
-        $pageMetadata = $this->metadataPool->getMetadata(PageInterface::class);
-        $this->aggregatedFieldConverter->convert(
-            [
-                new FieldToConvert(
-                    ContentConverter::class,
-                    $setup->getTable('cms_block'),
-                    $blockMetadata->getIdentifierField(),
-                    'content',
-                    $queryModifier
-                ),
-                new FieldToConvert(
-                    ContentConverter::class,
-                    $setup->getTable('cms_page'),
-                    $pageMetadata->getIdentifierField(),
-                    'content',
-                    $queryModifier
-                ),
-                new FieldToConvert(
-                    LayoutUpdateConverter::class,
-                    $setup->getTable('cms_page'),
-                    $pageMetadata->getIdentifierField(),
-                    'layout_update_xml',
-                    $layoutUpdateXmlFieldQueryModifier
-                ),
-                new FieldToConvert(
-                    LayoutUpdateConverter::class,
-                    $setup->getTable('cms_page'),
-                    $pageMetadata->getIdentifierField(),
-                    'custom_layout_update_xml',
-                    $customLayoutUpdateXmlFieldQueryModifier
-                ),
-            ],
-            $setup->getConnection()
-        );
-    }
-
-    /**
-     * Create page
-     *
-     * @return Page
-     */
-    private function createPage()
-    {
-        return $this->pageFactory->create();
-    }
-
-    /**
-     * Upgrade data to version 2.0.1,
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    private function upgradeVersionTwoZeroOne()
-    {
-        $newPageContent = <<<EOD
-<div class="privacy-policy cms-content">
-    <div class="message info">
-        <span>
-            Please replace this text with you Privacy Policy.
-            Please add any additional cookies your website uses below (e.g. Google Analytics).
-        </span>
-    </div>
-    <p>
-        This privacy policy sets out how this website (hereafter "the Store") uses and protects any information that
-        you give the Store while using this website. The Store is committed to ensuring that your privacy is protected.
-        Should we ask you to provide certain information by which you can be identified when using this website, then
-        you can be assured that it will only be used in accordance with this privacy statement. The Store may change
-        this policy from time to time by updating this page. You should check this page from time to time to ensure
-        that you are happy with any changes.
-    </p>
-    <h2>What we collect</h2>
-    <p>We may collect the following information:</p>
-    <ul>
-        <li>name</li>
-        <li>contact information including email address</li>
-        <li>demographic information such as postcode, preferences and interests</li>
-        <li>other information relevant to customer surveys and/or offers</li>
-    </ul>
-    <p>
-        For the exhaustive list of cookies we collect see the <a href="#list">List of cookies we collect</a> section.
-    </p>
-    <h2>What we do with the information we gather</h2>
-    <p>
-        We require this information to understand your needs and provide you with a better service,
-        and in particular for the following reasons:
-    </p>
-    <ul>
-        <li>Internal record keeping.</li>
-        <li>We may use the information to improve our products and services.</li>
-        <li>
-            We may periodically send promotional emails about new products, special offers or other information which we
-            think you may find interesting using the email address which you have provided.
-        </li>
-        <li>
-            From time to time, we may also use your information to contact you for market research purposes.
-            We may contact you by email, phone, fax or mail. We may use the information to customise the website
-            according to your interests.
-        </li>
-    </ul>
-    <h2>Security</h2>
-    <p>
-        We are committed to ensuring that your information is secure. In order to prevent unauthorised access or
-        disclosure, we have put in place suitable physical, electronic and managerial procedures to safeguard and
-        secure the information we collect online.
-    </p>
-    <h2>How we use cookies</h2>
-    <p>
-        A cookie is a small file which asks permission to be placed on your computer's hard drive.
-        Once you agree, the file is added and the cookie helps analyse web traffic or lets you know when you visit
-        a particular site. Cookies allow web applications to respond to you as an individual. The web application
-        can tailor its operations to your needs, likes and dislikes by gathering and remembering information about
-        your preferences.
-    </p>
-    <p>
-        We use traffic log cookies to identify which pages are being used. This helps us analyse data about web page
-        traffic and improve our website in order to tailor it to customer needs. We only use this information for
-        statistical analysis purposes and then the data is removed from the system.
-    </p>
-    <p>
-        Overall, cookies help us provide you with a better website, by enabling us to monitor which pages you find
-        useful and which you do not. A cookie in no way gives us access to your computer or any information about you,
-        other than the data you choose to share with us. You can choose to accept or decline cookies.
-        Most web browsers automatically accept cookies, but you can usually modify your browser setting
-        to decline cookies if you prefer. This may prevent you from taking full advantage of the website.
-    </p>
-    <h2>Links to other websites</h2>
-    <p>
-        Our website may contain links to other websites of interest. However, once you have used these links
-        to leave our site, you should note that we do not have any control over that other website.
-        Therefore, we cannot be responsible for the protection and privacy of any information which you provide whilst
-        visiting such sites and such sites are not governed by this privacy statement.
-        You should exercise caution and look at the privacy statement applicable to the website in question.
-    </p>
-    <h2>Controlling your personal information</h2>
-    <p>You may choose to restrict the collection or use of your personal information in the following ways:</p>
-    <ul>
-        <li>
-            whenever you are asked to fill in a form on the website, look for the box that you can click to indicate
-            that you do not want the information to be used by anybody for direct marketing purposes
-        </li>
-        <li>
-            if you have previously agreed to us using your personal information for direct marketing purposes,
-            you may change your mind at any time by letting us know using our Contact Us information
-        </li>
-    </ul>
-    <p>
-        We will not sell, distribute or lease your personal information to third parties unless we have your permission
-        or are required by law to do so. We may use your personal information to send you promotional information
-        about third parties which we think you may find interesting if you tell us that you wish this to happen.
-    </p>
-    <p>
-        You may request details of personal information which we hold about you under the Data Protection Act 1998.
-        A small fee will be payable. If you would like a copy of the information held on you please email us this
-        request using our Contact Us information.
-    </p>
-    <p>
-        If you believe that any information we are holding on you is incorrect or incomplete,
-        please write to or email us as soon as possible, at the above address.
-        We will promptly correct any information found to be incorrect.
-    </p>
-    <h2><a name="list"></a>List of cookies we collect</h2>
-    <p>The table below lists the cookies we collect and what information they store.</p>
-    <table class="data-table data-table-definition-list">
-        <thead>
-        <tr>
-            <th>Cookie Name</th>
-            <th>Cookie Description</th>
-        </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>FORM_KEY</th>
-                <td>Stores randomly generated key used to prevent forged requests.</td>
-            </tr>
-            <tr>
-                <th>PHPSESSID</th>
-                <td>Your session ID on the server.</td>
-            </tr>
-            <tr>
-                <th>GUEST-VIEW</th>
-                <td>Allows guests to view and edit their orders.</td>
-            </tr>
-            <tr>
-                <th>PERSISTENT_SHOPPING_CART</th>
-                <td>A link to information about your cart and viewing history, if you have asked for this.</td>
-            </tr>
-            <tr>
-                <th>STF</th>
-                <td>Information on products you have emailed to friends.</td>
-            </tr>
-            <tr>
-                <th>STORE</th>
-                <td>The store view or language you have selected.</td>
-            </tr>
-            <tr>
-                <th>USER_ALLOWED_SAVE_COOKIE</th>
-                <td>Indicates whether a customer allowed to use cookies.</td>
-            </tr>
-            <tr>
-                <th>MAGE-CACHE-SESSID</th>
-                <td>Facilitates caching of content on the browser to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>MAGE-CACHE-STORAGE</th>
-                <td>Facilitates caching of content on the browser to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>MAGE-CACHE-STORAGE-SECTION-INVALIDATION</th>
-                <td>Facilitates caching of content on the browser to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>MAGE-CACHE-TIMEOUT</th>
-                <td>Facilitates caching of content on the browser to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>SECTION-DATA-IDS</th>
-                <td>Facilitates caching of content on the browser to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>PRIVATE_CONTENT_VERSION</th>
-                <td>Facilitates caching of content on the browser to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>X-MAGENTO-VARY</th>
-                <td>Facilitates caching of content on the server to make pages load faster.</td>
-            </tr>
-            <tr>
-                <th>MAGE-TRANSLATION-FILE-VERSION</th>
-                <td>Facilitates translation of content to other languages.</td>
-            </tr>
-            <tr>
-                <th>MAGE-TRANSLATION-STORAGE</th>
-                <td>Facilitates translation of content to other languages.</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-EOD;
-        $privacyAndCookiePolicyPage = $this->createPage()->load(
-            'privacy-policy-cookie-restriction-mode',
-            'identifier'
-        );
-        $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
-        if ($privacyAndCookiePolicyPageId) {
-            $privacyAndCookiePolicyPage->setContent($newPageContent);
-            $privacyAndCookiePolicyPage->save();
-        }
-    }
-}
diff --git a/app/code/Magento/Cms/Setup/UpgradeSchema.php b/app/code/Magento/Cms/Setup/UpgradeSchema.php
deleted file mode 100644
index b6fdc9f115809..0000000000000
--- a/app/code/Magento/Cms/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Upgrade the Cms module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->addMetaTitleField($setup);
-        }
-    }
-
-    /**
-     * Add meta title
-     *
-     * @param SchemaSetupInterface $setup
-     * @return $this
-     */
-    protected function addMetaTitleField(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->addColumn(
-            $setup->getTable('cms_page'),
-            'meta_title',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                'length' => 255,
-                'nullable' => true,
-                'comment' => 'Page Meta Title'
-            ]
-        );
-        return $this;
-    }
-}
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
new file mode 100644
index 0000000000000..d2f81c1c24c35
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertBlockContent">
+        <grabValueFrom selector="{{BlockNewPageBasicFieldsSection.blockTitle}}"  stepKey="grabTextFromTitle"/>
+        <assertEquals stepKey="assertTitle" message="pass">
+            <expectedResult type="string">{{_defaultBlock.title}}</expectedResult>
+            <actualResult type="variable">grabTextFromTitle</actualResult>
+        </assertEquals>
+        <executeJS function="(el = document.querySelector('[name=\'identifier\']')) &amp;&amp; el['se' + 'tAt' + 'tribute']('data-value', el.value.split('-')[0]);" stepKey="setAttribute" />
+        <seeElement selector="{{BlockNewPageBasicFieldsSection.duplicatedIdentifier(_defaultBlock.identifier)}}" stepKey="see"/>
+        <grabValueFrom selector="{{BlockContentSection.TextArea}}"  stepKey="grabTextFromContent"/>
+        <assertEquals stepKey="assertContent" message="pass">
+            <expectedResult type="string">{{_defaultBlock.content}}</expectedResult>
+            <actualResult type="variable">grabTextFromContent</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
new file mode 100644
index 0000000000000..58318660d2c42
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertCMSPageContent">
+        <grabValueFrom selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}"  stepKey="grabTextFromTitle"/>
+        <assertEquals stepKey="assertTitle" message="pass">
+            <expectedResult type="string">{{_duplicatedCMSPage.title}}</expectedResult>
+            <actualResult type="variable">grabTextFromTitle</actualResult>
+        </assertEquals>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
+        <grabValueFrom selector="{{CmsNewPagePageContentSection.content}}"  stepKey="grabTextFromContent"/>
+        <assertEquals stepKey="assertContent" message="pass">
+            <expectedResult type="string">{{_duplicatedCMSPage.content}}</expectedResult>
+            <actualResult type="variable">grabTextFromContent</actualResult>
+        </assertEquals>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <executeJS function="(el = document.querySelector('[name=\'identifier\']')) &amp;&amp; el['se' + 'tAt' + 'tribute']('data-value', el.value.split('-')[0]);" stepKey="setAttribute" />
+        <seeElement selector="{{CmsNewPagePageBasicFieldsSection.duplicatedURLKey(_duplicatedCMSPage.title)}}" stepKey="see"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
new file mode 100644
index 0000000000000..5720e79e95abd
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssignBlockToCMSPage">
+        <arguments>
+            <argument name="Block" defaultValue=""/>
+            <argument name="CmsPage" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForGridReload"/>
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending1" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish1" />
+        <!-- Conditional Click again in case it goes from default state to ascending on first click -->
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending2" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish1" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select(CmsPage.identifier)}}" stepKey="waitForCMSPageGrid" />
+        <click selector="{{CmsPagesPageActionsSection.select(CmsPage.identifier)}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit(CmsPage.identifier)}}" stepKey="waitForEditLink" />
+        <click selector="{{CmsPagesPageActionsSection.edit(CmsPage.identifier)}}" stepKey="clickEdit" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad3" />
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static Block" stepKey="selectCMSStaticBlock" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading1" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
+        <fillField selector="//input[@name='chooser_identifier']" userInput="{{Block.identifier}}" stepKey="fillBlockIdentifier"/>
+        <click selector="//div[@class='modal-inner-wrap']//button[@title='Search']" stepKey="clickSearchBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish2" />
+        <waitForElementVisible selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="waitForBlockTitle" />
+        <click selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="selectPreCreateBlock" />
+        <wait time="3" stepKey="wait1" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
+        <waitForPageLoad stepKey="waitForPageLoad4" />
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
new file mode 100644
index 0000000000000..75e059f620c2d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="navigateToCreatedCMSPage">
+        <arguments>
+            <argument name="CMSPage" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
+        <!-- Conditional Click again in case it goes from default state to ascending on first click -->
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
+        <click selector="{{CmsPagesPageActionsSection.select(CMSPage.identifier)}}" stepKey="clickSelectCreatedCMSPage" />
+        <click selector="{{CmsPagesPageActionsSection.edit(CMSPage.identifier)}}" stepKey="navigateToCreatedCMSPage" />
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
+    </actionGroup>
+    <actionGroup name="navigateToCreatedCMSBlockPage">
+        <arguments>
+            <argument name="CMSBlockPage" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
+        <!-- Conditional Click again in case it goes from default state to ascending on first click  -->
+        <conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
+        <click selector="{{BlockPageActionsSection.select(CMSBlockPage.identifier)}}" stepKey="clickSelectCreatedCMSBlock" />
+        <click selector="{{BlockPageActionsSection.edit(CMSBlockPage.identifier)}}" stepKey="navigateToCreatedCMSBlock" />
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
new file mode 100644
index 0000000000000..c51e673139af9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateNewPageWithAllValues">
+        <arguments>
+            <argument name="PageTitle" type="string"/>
+            <argument name="ContentHeading" type="string"/>
+            <argument name="URLKey" type="string"/>
+            <argument name="selectStoreViewOpt" type="string"/>
+            <argument name="selectHierarchyOpt" type="string"/>
+        </arguments>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnCMSNewPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{PageTitle}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{ContentHeading}}" stepKey="fillFieldContentHeading"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimization"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{URLKey}}" stepKey="fillFieldURLKey"/>
+        <click selector="{{CmsNewPagePiwSection.header}}" stepKey="clickPageInWebsites"/>
+        <waitForElementVisible selector="{{CmsNewPagePiwSection.selectStoreView(selectStoreViewOpt)}}" stepKey="waitForStoreGridReload"/>
+        <clickWithLeftButton selector="{{CmsNewPagePiwSection.selectStoreView(selectStoreViewOpt)}}" stepKey="clickStoreView2"/>
+        <click selector="{{CmsNewPageHierarchySection.header}}" stepKey="clickHierarchy"/>
+        <click selector="{{CmsNewPageHierarchySection.selectHierarchy(selectHierarchyOpt)}}" stepKey="clickPageCheckBoxes"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
new file mode 100644
index 0000000000000..6de6f27e1069f
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteImageFromStorageActionGroup">
+        <arguments>
+            <argument name="Image"/>
+        </arguments>
+        <waitForElementVisible selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForInitialImages"/>
+        <grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="initialImages"/>
+        <click selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="selectImage"/>
+        <waitForElementVisible selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="waitForDeleteBtn"/>
+        <click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible selector="{{MediaGallerySection.confirmDelete}}" stepKey="waitForConfirmBtn"/>
+        <click selector="{{MediaGallerySection.confirmDelete}}" stepKey="clickConfirmBtn"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="newImages"/>
+        <assertLessThan stepKey="assertLessImages">
+            <expectedResult type="variable">initialImages</expectedResult>
+            <actualResult type="variable">newImages</actualResult>
+        </assertLessThan>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
new file mode 100644
index 0000000000000..2a2b2ff15d375
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeletePageByUrlKeyActionGroup">
+        <arguments>
+            <argument name="UrlKey" type="string"/>
+        </arguments>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCMSNewPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{CmsPagesPageActionsSection.select(UrlKey)}}" stepKey="clickSelect"/>
+        <click selector="{{CmsPagesPageActionsSection.delete(UrlKey)}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="clickOkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="The page has been deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
new file mode 100644
index 0000000000000..3ffc999b41abb
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="FillOutBlockContent">
+        <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/>
+        <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
+        <fillField selector="{{BlockContentSection.TextArea}}" userInput="{{_defaultBlock.content}}" stepKey="fillContentField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
new file mode 100644
index 0000000000000..e47ff472ccdcb
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="FillOutCMSPageContent">
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_duplicatedCMSPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{_duplicatedCMSPage.content}}" stepKey="fillFieldContent"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_duplicatedCMSPage.identifier}}" stepKey="fillFieldUrlKey"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
new file mode 100644
index 0000000000000..3c447f808e721
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="NavigateToMediaFolderActionGroup">
+        <arguments>
+            <argument name="FolderName" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
+        <waitForText userInput="{{FolderName}}" stepKey="waitForNewFolder"/>
+        <click userInput="{{FolderName}}" stepKey="clickOnCreatedFolder"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
new file mode 100644
index 0000000000000..3016fba6caba8
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="RestoreLayoutSetting">
+        <waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="waittForDefaultCMSLayout" after="expandDefaultLayouts" />
+        <selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="selectOneColumn" before="clickSaveConfig"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
new file mode 100644
index 0000000000000..12205aeed8fa3
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="searchBlockOnGridPage">
+        <arguments>
+            <argument name="Block" defaultValue=""/>
+        </arguments>
+        <fillField selector="//input[@name='chooser_identifier']" userInput="{{Block.identifier}}" stepKey="fillEntityIdentifier"/>
+        <click selector="//div[@class='modal-inner-wrap']//button[@title='Search']" stepKey="clickSearchBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish2" />
+        <waitForElementVisible selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="waitForBlockTitle" />
+    </actionGroup>
+    <actionGroup name ="deleteBlock">
+        <arguments>
+            <argument name="Block" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{BlockPageActionsSection.FilterBtn}}" stepKey="clickFilterBtn"/>
+        <fillField selector="{{BlockPageActionsSection.URLKey}}" userInput="{{Block.identifier}}" stepKey="fillBlockIdentifierInput"/>
+        <click selector="{{BlockPageActionsSection.ApplyFiltersBtn}}" stepKey="applyFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridToLoadResults" />
+        <waitForElementVisible selector="{{BlockPageActionsSection.select(Block.identifier)}}" stepKey="waitForCMSPageGrid" />
+        <click selector="{{BlockPageActionsSection.select(Block.identifier)}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{BlockPageActionsSection.edit(Block.identifier)}}" stepKey="waitForEditLink" />
+        <click selector="{{BlockPageActionsSection.edit(Block.identifier)}}" stepKey="clickEdit" />
+        <waitForLoadingMaskToDisappear stepKey="waitForPageToLoad" />
+        <click selector="{{CmsBlockBlockActionSection.deleteBlock}}" stepKey="deleteBlock"/>
+        <waitForElementVisible selector="{{CmsBlockBlockActionSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{CmsBlockBlockActionSection.deleteConfirm}}" stepKey="clickOkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="You deleted the block." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
new file mode 100644
index 0000000000000..84704b18a40bc
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="clickBrowseBtnOnUploadPopup">
+        <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse" />
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+    </actionGroup>
+    <actionGroup name="VerifyMediaGalleryStorageActions">
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading1" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
+        <see selector="{{MediaGallerySection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn" />
+        <see selector="{{MediaGallerySection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn" />
+    </actionGroup>
+    <actionGroup name="CreateImageFolder">
+        <arguments>
+            <argument name="ImageFolder" defaultValue="ImageFolder"/>
+        </arguments>
+        <click selector="{{MediaGallerySection.CreateFolder}}" stepKey="createFolder"/>
+        <waitForElementVisible selector="{{MediaGallerySection.FolderName}}" stepKey="waitForPopUp" />
+        <fillField selector="{{MediaGallerySection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName" />
+        <click selector="{{MediaGallerySection.AcceptFolderName}}" stepKey="acceptFolderName" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
+        <waitForPageLoad stepKey="waitForLoadingArrowToExpand" time="15" />
+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
+        <conditionalClick selector="{{MediaGallerySection.WysiwygArrow}}" dependentSelector="{{MediaGallerySection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
+        <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder" />
+        <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
+    </actionGroup>
+    <actionGroup name="attachImage">
+        <arguments>
+            <argument name="Image"/>
+        </arguments>
+        <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{Image.value}}" stepKey="uploadImage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible  selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForUploadImage"/>
+    </actionGroup>
+    <actionGroup name="deleteImage">
+        <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>
+    <actionGroup name="saveImage">
+        <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+    <actionGroup name="fillOutUploadImagePopup">
+        <waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkBtn" />
+        <fillField selector="{{MediaGallerySection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
+        <fillField selector="{{MediaGallerySection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight" />
+        <click selector="{{MediaGallerySection.OkBtn}}" stepKey="clickOkBtn" />
+        <waitForPageLoad stepKey="wait3"/>
+    </actionGroup>
+    <actionGroup name="verifyOversizeValidationMsg">
+        <see userInput="this is oversize" stepKey="seeValidationMsg"/>
+        <click selector="#OK" stepKey="clickOKBtn"/>
+    </actionGroup>
+    <actionGroup name="verifyWrongExtensionValidationMsg">
+        <see userInput="this is wrong extension" stepKey="seeValidationMsg"/>
+        <click selector="#OK" stepKey="clickOKBtn"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
new file mode 100644
index 0000000000000..ed19c291aadd3
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyTinyMCEActionGroup">
+        <seeElement selector="{{TinyMCESection.Style}}" stepKey="assertInfo2"/>
+        <seeElement selector="{{TinyMCESection.Bold}}" stepKey="assertInfo3"/>
+        <seeElement selector="{{TinyMCESection.Italic}}" stepKey="assertInfo4"/>
+        <seeElement selector="{{TinyMCESection.Underline}}" stepKey="assertInfo5"/>
+        <seeElement selector="{{TinyMCESection.AlignLeft}}" stepKey="assertInfo6"/>
+        <seeElement selector="{{TinyMCESection.AlignCenter}}" stepKey="assertInfo7"/>
+        <seeElement selector="{{TinyMCESection.AlignRight}}" stepKey="assertInfo8"/>
+        <seeElement selector="{{TinyMCESection.Numlist}}" stepKey="assertInfo9"/>
+        <seeElement selector="{{TinyMCESection.Bullet}}" stepKey="assertInfo10"/>
+        <seeElement selector="{{TinyMCESection.InsertLink}}" stepKey="assertInfo11"/>
+        <seeElement selector="{{TinyMCESection.InsertImageIcon}}" stepKey="assertInf12"/>
+        <seeElement selector="{{TinyMCESection.InsertTable}}" stepKey="assertInfo13"/>
+        <seeElement selector="{{TinyMCESection.SpecialCharacter}}" stepKey="assertInfo14"/>
+    </actionGroup>
+    <actionGroup name="VerifyMagentoEntityActionGroup">
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="assertInfo15"/>
+        <seeElement selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="assertInfo16"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
new file mode 100644
index 0000000000000..368df3baa561f
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultBlock" type="block">
+        <data key="title">Default Block</data>
+        <data key="identifier" unique="suffix" >block</data>
+        <data key="content">Here is a block test. Yeah!</data>
+        <data key="active">true</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
new file mode 100644
index 0000000000000..d8a8401c31f15
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultCmsPage" type="cms_page">
+        <data key="title">Test CMS Page</data>
+        <data key="content_heading">Test Content Heading</data>
+        <data key="content">Sample page content. Yada yada yada.</data>
+        <data key="identifier" unique="suffix">test-page-</data>
+    </entity>
+    <entity name="_newDefaultCmsPage" type="cms_page">
+        <data key="title" unique="suffix">Test CMS Page</data>
+        <data key="content_heading">Test Content Heading</data>
+        <data key="content">Sample page content. Yada yada yada.</data>
+        <data key="identifier" unique="suffix">test-page-</data>
+    </entity>
+    <entity name="_duplicatedCMSPage" type="cms_page">
+        <data key="title">testpage</data>
+        <data key="content_heading">Test Content Heading</data>
+        <data key="content">Sample page content. Yada yada yada.</data>
+        <data key="identifier" unique="suffix">testpage-</data>
+    </entity>
+    <entity name="simpleCmsPage" type="cms_page">
+        <data key="title" unique="suffix">Test CMS Page</data>
+        <data key="content_heading">Test Content Heading</data>
+        <data key="content">Sample page content. Yada yada yada.</data>
+        <data key="identifier" unique="suffix">test-page-</data>
+    </entity>
+    <entity name="ImageUpload" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento.jpg</data>
+        <data key="value">magento.jpg</data>
+        <data key="fileName">magento</data>
+        <data key="extension">jpg</data>
+        <data key="content">Image content. Yeah.</data>
+        <data key="height">1000</data>
+    </entity>
+    <entity name="ImageUpload_1" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-again.jpg</data>
+        <data key="value">magento-again.jpg</data>
+        <data key="content">Image content. Yeah.</data>
+        <data key="height">1000</data>
+    </entity>
+    <entity name="ImageUpload1" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="value">magento2.jpg</data>
+        <data key="fileName">magento2</data>
+        <data key="extension">jpg</data>
+        <data key="content">Image content. Yeah.</data>
+        <data key="height">1000</data>
+    </entity>
+    <entity name="ImageUpload3" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="value">magento3.jpg</data>
+        <data key="fileName">magento3</data>
+        <data key="extension">jpg</data>
+        <data key="content">Image content. Yeah.</data>
+        <data key="height">1000</data>
+        <data key="path">wysiwyg</data>
+    </entity>
+    <entity name="ImageFolder" type="uploadImage">
+        <data key="name" unique="suffix">Test</data>
+    </entity>
+    <entity name="_longContentCmsPage" type="cms_page">
+        <data key="title">Test CMS Page</data>
+        <data key="content_heading">Test Content Heading</data>
+        <data key="content">1&lt;br/&gt;2&lt;br/&gt;3&lt;br/&gt;4&lt;br/&gt;5&lt;br/&gt;6&lt;br/&gt;7&lt;br/&gt;8&lt;br/&gt;9&lt;br/&gt;10&lt;br/&gt;11&lt;br/&gt;12&lt;br/&gt;13&lt;br/&gt;14&lt;br/&gt;15&lt;br/&gt;16&lt;br/&gt;17&lt;br/&gt;18&lt;br/&gt;19&lt;br/&gt;20&lt;br/&gt;line21&lt;br/&gt;22&lt;br/&gt;23&lt;br/&gt;24&lt;br/&gt;25&lt;br/&gt;26&lt;br/&gt;line27&lt;br/&gt;2&lt;br/&gt;3&lt;br/&gt;4&lt;br/&gt;5</data>
+        <data key="identifier" unique="suffix">test-page-</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE.txt b/app/code/Magento/Cms/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE.txt
rename to app/code/Magento/Cms/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE_AFL.txt b/app/code/Magento/Cms/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE_AFL.txt
rename to app/code/Magento/Cms/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
new file mode 100644
index 0000000000000..c007c89b313ae
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateBlock" dataType="block" type="create" auth="adminOauth" url="/V1/cmsBlock" method="POST">
+        <contentType>application/json</contentType>
+        <object key="block" dataType="block">
+            <field key="title">string</field>
+            <field key="identifier">string</field>
+            <field key="content">string</field>
+            <field key="active">true</field>
+        </object>
+    </operation>
+
+    <operation name="DeleteBlock" dataType="block" type="delete" auth="adminOauth" url="/V1/cmsBlock/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
new file mode 100644
index 0000000000000..44a9d9452e8fe
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateCMSPage" dataType="cms_page" type="create" auth="adminOauth" url="/V1/cmsPage" method="POST">
+        <contentType>application/json</contentType>
+        <object key="page" dataType="cms_page">
+            <field key="identifier">string</field>
+            <field key="title">string</field>
+            <field key="content_heading">string</field>
+            <field key="active">true</field>
+            <field key="content">string</field>
+        </object>
+    </operation>
+    <operation name="DeleteCMS" dataType="cms_page" type="delete" auth="adminOauth" url="/V1/cmsPage/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
new file mode 100644
index 0000000000000..1d9564fee8680
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CmsBlocksPage" url="/cms/block/" area="admin" module="Magento_Cms">
+        <section name="BlockPageActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
new file mode 100644
index 0000000000000..0a2b7a7ed37b4
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CmsNewBlock" area="admin" url="/cms/block/new" module="Magento_Cms">
+        <section name="CmsNewBlockBlockActionsSection"/>
+        <section name="CmsNewBlockBlockBasicFieldsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
new file mode 100644
index 0000000000000..c844dc55ea156
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CmsNewPagePage" url="/cms/page/new" area="admin" module="Magento_Cms">
+        <section name="CmsNewPagePageActionsSection"/>
+        <section name="CmsNewPagePageBasicFieldsSection"/>
+        <section name="CmsNewPagePageContentSection"/>
+        <section name="CmsNewPagePageSeoSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
new file mode 100644
index 0000000000000..45ba6eb6cf00c
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CmsPagesPage" url="/cms/page" area="admin" module="Magento_Cms">
+        <section name="CmsPagesPageActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
new file mode 100644
index 0000000000000..07deacfaaef88
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
+        <section name="StorefrontHeaderSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/README.md b/app/code/Magento/Cms/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5e223390c07cd
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cms Functional Tests
+
+The Functional Test Module for **Magento Cms** module.
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
new file mode 100644
index 0000000000000..d487517269c01
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="BlockPageActionsSection">
+        <element name="addNewBlock" type="button" selector="#add" timeout="30"/>
+        <element name="select" type="button" selector="//div[text()='{{var1}}']//parent::td//following-sibling::td//button[text()='Select']" parameterized="true"/>
+        <element name="edit" type="button" selector="//div[text()='{{var1}}']//parent::td//following-sibling::td//a[text()='Edit']" parameterized="true"/>
+        <element name="idColumn" type="button" selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]"/>
+        <element name="clearAll" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
+        <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
+        <element name="FilterBtn" type="input" selector="//button[text()='Filters']"/>
+        <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
+        <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
new file mode 100644
index 0000000000000..4c6014af51264
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewBlockBlockActionsSection">
+        <element name="savePage" type="button" selector="#save-button" timeout="30"/>
+    </section>
+    <section name="BlockNewPagePageActionsSection">
+        <element name="saveBlock" type="button" selector="#save-button" timeout="10"/>
+        <element name="saveAndContinueEdit" type="button" selector="#save-button" timeout="10"/>
+        <element name="saveAndDuplicate" type="button" selector="#save_and_duplicate" timeout="10"/>
+        <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
+        <element name="expandSplitButton" type="button" selector="//button[@data-ui-id='save-button-dropdown']" timeout="10"/>
+    </section>
+    <section name="BlockWYSIWYGSection">
+        <element name="ShowHideBtn" type="button" selector="#togglecms_block_form_content"/>
+    </section>
+    <section name="BlockContentSection">
+        <element name="TextArea" type="input" selector="#cms_block_form_content"/>
+    </section>
+    <section name="CmsBlockBlockActionSection">
+        <element name="deleteBlock" type="button" selector="#delete" timeout="30"/>
+        <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
new file mode 100644
index 0000000000000..79fc3bac0fb25
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewBlockBlockBasicFieldsSection">
+        <element name="title" type="input" selector="input[name=title]"/>
+        <element name="identifier" type="input" selector="input[name=identifier]"/>
+        <element name="content_textarea" type="input" selector="#cms_block_form_content"/>
+    </section>
+    <section name="BlockNewPageBasicFieldsSection">
+        <element name="isActive" type="button" selector="//input[@name='is_active' and @value='{{var1}}']" parameterized="true"/>
+        <element name="blockTitle" type="input" selector="input[name=title]"/>
+        <element name="identifier" type="input" selector="input[name=identifier]"/>
+        <element name="storeView" type="multiselect" selector="select[name=store_id]"/>
+        <element name="duplicatedIdentifier" type="input" selector="//input[contains(@data-value,'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml
new file mode 100644
index 0000000000000..a2e4aecf8db2d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPageHierarchySection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewPageHierarchySection">
+        <element name="header" type="button" selector="div[data-index=hierarchy]" timeout="30"/>
+        <element name="selectHierarchy" type="button" selector="//a/span[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
+    </section>
+</sections>
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
new file mode 100644
index 0000000000000..42f8f4d00ee9f
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewPagePageActionsSection">
+        <element name="savePage" type="button" selector="#save_and_close" timeout="10"/>
+        <element name="reset" type="button" selector="#reset"/>
+        <element name="saveAndContinueEdit" type="button" selector="#save-button" timeout="10"/>
+        <element name="saveAndDuplicate" type="button" selector="#save_and_duplicate" timeout="10"/>
+        <element name="splitButtonMenu" type="button" selector="//ul[@data-ui-id='save-button-dropdown-menu']" timeout="10"/>
+        <element name="expandSplitButton" type="button" selector="//button[@data-ui-id='save-button-dropdown']" timeout="10"/>
+        <element name="cmsPageTitle" type="text" selector=".page-header .page-title"/>
+        <element name="pageTitle" type="input" selector="input[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"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
new file mode 100644
index 0000000000000..7288e5d455d52
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewPagePageBasicFieldsSection">
+        <element name="pageTitle" type="input" selector="input[name=title]"/>
+        <element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=title]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="isActive" type="button" selector="//input[@name='is_active' and @value='{{var1}}']" parameterized="true"/>
+        <element name="duplicatedURLKey" type="input" selector="//input[contains(@data-value,'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
new file mode 100644
index 0000000000000..05a125b9cc6a8
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewPagePageContentSection">
+        <element name="header" type="button" selector="div[data-index=content]"/>
+        <element name="contentHeading" type="input" selector="input[name=content_heading]"/>
+        <element name="content" type="input" selector="#cms_page_form_content"/>
+    </section>
+    <section name="CmsWYSIWYGSection">
+        <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
+        <element name="ShowHideBtn" type="button" selector="#togglecms_page_form_content"/>
+        <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
+        <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
+        <element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="ImageAlt" type="text" selector="//img[contains(@alt,'{{var1}}')]" parameterized="true"/>
+    </section>
+    <section name="CmsDesignSection">
+        <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>
+        <element name="LayoutDropdown" type="select" selector="select[name='page_layout']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
new file mode 100644
index 0000000000000..dfd7386e09aba
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewPagePageSeoSection">
+        <element name="header" type="button" selector="div[data-index=search_engine_optimisation]" timeout="30"/>
+        <element name="urlKey" type="input" selector="input[name=identifier]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml
new file mode 100644
index 0000000000000..bd487e3b2c03c
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsNewPagePiwSection">
+        <element name="header" type="button" selector="div[data-index=websites]" timeout="30"/>
+        <element name="selectStoreView" type="select" selector="//option[contains(text(),'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
new file mode 100644
index 0000000000000..11d8bb23313fb
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CmsPagesPageActionsSection">
+        <element name="filterButton" type="input" selector="//button[text()='Filters']"/>
+        <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
+        <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
+        <element name="searchInput" type="input" selector="//*[@id='fulltext']"/>
+        <element name="searchButton" type="button" selector="//*[@id='fulltext']/parent::*/button"/>
+        <element name="addNewPageButton" type="button" selector="#add" timeout="30"/>
+        <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
+        <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
+        <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
+        <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
+        <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
+        <element name="spinner" type="input" selector='//div[@data-component="cms_page_listing.cms_page_listing.cms_page_columns"]'/>
+        <element name="firstItemSelectButton" type="button" selector=".data-grid .action-select-wrap button.action-select"/>
+        <element name="firstItemEditButton" type="button" selector=".data-grid .action-select-wrap .action-menu-item[data-action~='item-edit']"/>
+        <element name="activeFilter" type="button" selector="(//div[contains(@class, 'admin__data-grid-filters-current') and contains(@class, '_show')])[1]"/>
+        <element name="savePageSuccessMessage" type="text" selector=".message-success"/>
+        <element name="delete" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" parameterized="true"/>
+        <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CustomVariableSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CustomVariableSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
index 6df729ffb29ab..1488134ea511d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CustomVariableSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomVariableSection">
         <element name="GridCustomVariableCode" type="text" selector=".//*[@id='customVariablesGrid_table']/tbody//tr//td[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="variableCode" type="input" selector="#code"/>
@@ -18,4 +18,4 @@
         <element name="delete" type="button" selector="#delete"/>
         <element name="confirmDelete" type="button" selector=".action-primary.action-accept"/>
     </section>
-</config>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
new file mode 100644
index 0000000000000..bd2f9e5a646d5
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontBlockSection">
+        <element name="mediaDescription" type="text" selector=".widget.block.block-static-block>p>img"/>
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
new file mode 100644
index 0000000000000..7a358c61263d6
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCMSPageSection">
+        <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="mainTitle" type="text" selector="#maincontent .page-title"/>
+        <element name="mainContent" type="text" selector="#maincontent"/>
+        <element name="footerTop" type="text" selector="footer.page-footer"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
new file mode 100644
index 0000000000000..d26f7d83616d5
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontHeaderSection">
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
new file mode 100644
index 0000000000000..c7ea85e441bb9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="TinyMCESection">
+        <element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
+        <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
+        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
+        <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
+        <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
+        <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
+        <element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
+        <element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
+        <element name="InsertImageIcon" type="button" selector=".mce-i-image"/>
+        <element name="Style" type="button" selector=".mce-txt" />
+        <element name="Bold" type="button" selector=".mce-i-bold" />
+        <element name="Italic" type="button" selector=".mce-i-italic" />
+        <element name="Underline" type="button" selector=".mce-i-underline" />
+        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
+        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
+        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
+        <element name="Bullet" type="button" selector=".mce-i-bullist" />
+        <element name="Numlist" type="button" selector=".mce-i-numlist" />
+        <element name="InsertLink" type="button" selector=".mce-i-link" />
+        <element name="InsertImage" type="button" selector=".mce-i-image" />
+        <element name="InsertTable" type="button" selector=".mce-i-table" />
+        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
+    </section>
+    <section name="MediaGallerySection">
+        <element name="Browse" type="button" selector=".mce-i-browse"/>
+        <element name="browseForImage" type="button" selector="//*[@id='srcbrowser']"/>
+        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
+        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
+        <element name="imageOrImageCopy" type="text" selector="//div[contains(@class,'media-gallery-modal')]//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
+        <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
+        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
+        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
+        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" />
+        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
+        <element name="UploadImage" type="file" selector=".fileupload" />
+        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
+        <element name="insertBtn" type="button" selector="#insert"/>
+        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="CreateFolder" type="button" selector="#new_folder" />
+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
+        <element name="CancelBtn" type="button" selector="#cancel" />
+        <element name="FolderName" type="button" selector="input[data-role='promptField']" />
+        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
+        <element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
+        <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
+        <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
+        <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />
+        <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
+    </section>
+    <section name="VariableSection">
+        <element name="InsertWidget" type="button" selector="#insert_variable"/>
+        <element name="InsertVariableBtnEnabled" type="button" selector="//button[@id='insert_variable' and not(contains(@class,'disabled'))]"/>
+        <element name="InsertVariableBtnDisabled" type="button" selector="//button[@id='insert_variable' and contains(@class,'disabled')]"/>
+        <element name="CancelBtnEnabled" type="button" selector="//button[@class='action-scalable cancel' and not(contains(@class,'disabled'))]"/>
+        <element name="Close" type="button" selector="#close"/>
+        <element name="SearchTxtbox" type="input" selector="input[placeholder='Search by keyword']"/>
+        <element name="ColName" type="text" selector="//table[@class='data-grid data-grid-draggable']/thead/tr/th/span[text()='{{var1}}']" parameterized="true"/>
+        <element name="Radio" type="input" selector="//input[@type='radio' and contains(@value, '{{var1}}')]" parameterized="true"/>
+        <element name="VariableRadio" type="input" selector="//div[text()='{{var1}}']/parent::td//preceding-sibling::td/input[@type='radio']" parameterized="true"/>
+        <element name="VariableInAscSort" type="input" selector="#variable"/>
+        <element name="VariableInDescSort" type="input" selector="#variable"/>
+        <element name="Type" type="input" selector="#value"/>
+        <element name="Code" type="input" selector="#code"/>
+        <element name="searchResult" type="text" selector="//table/tbody/tr//td/div[text()='{{var1}}']" parameterized="true" />
+        <element name="VariableTitle" type="text" selector="//h1[contains(text(), 'Insert Variable')]"/>
+    </section>
+    <section name="WidgetSection">
+        <element name="InsertWidgetTitle" type="text" selector="//h1[contains(text(),'Insert Widget')]"/>
+        <element name="DisplayType" type="select" selector="select[name='parameters[display_type]']"/>
+        <element name="SelectCategoryTitle" type="text" selector="//h1[contains(text(),'Select Category')]"/>
+        <element name="SelectProductTitle" type="text" selector="//h1[contains(text(),'Select Product')]"/>
+        <element name="SelectPageTitle" type="text" selector="//h1[contains(text(),'Select Page')]"/>
+        <element name="SelectBlockTitle" type="text" selector="//h1[contains(text(),'Select Block')]"/>
+        <element name="InsertWidget" type="button" selector="#insert_button" timeout="30"/>
+        <element name="InsertWidgetBtnDisabled" type="button" selector="//button[@id='insert_button' and contains(@class,'disabled')]"/>
+        <element name="InsertWidgetBtnEnabled" type="button" selector="//button[@id='insert_button' and not(contains(@class,'disabled'))]"/>
+        <element name="CancelBtnEnabled" type="button" selector="//button[@id='reset' and not(contains(@class,'disabled'))]"/>
+        <element name="Close" type="button" selector="#close"/>
+        <element name="WidgetType" type="button" selector="#select_widget_type"/>
+        <element name="WidgetTemplate" type="button" selector="select[name='parameters[template]']"/>
+        <element name="BtnChooser" type="button" selector=".btn-chooser"/>
+        <element name="CMSPage" type="text" selector="//td[contains(text(),'Home page')]"/>
+        <element name="BlockPage" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="PreCreateCategory" type="text" selector=" //span[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="PreCreateProduct" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="NoOfProductToDisplay" type="input" selector="input[data-ui-id='wysiwyg-widget-options-fieldset-element-text-parameters-products-count']"/>
+        <element name="AddParam" type="button" selector=".rule-param-add"/>
+        <element name="ConditionsDropdown" type="select" selector="#conditions__1__new_child"/>
+        <element name="RuleParam" type="button" selector="//a[text()='...']"/>
+        <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
+        <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
+        <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
+        <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
+        <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
+        <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
+        <element name="ButtonToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
+        <!--Compare on Storefront-->
+        <element name="ProductName" type="text" selector=".product.name.product-item-name" />
+        <element name="CompareBtn" type="button" selector=".action.tocompare"/>
+        <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
+        <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
new file mode 100644
index 0000000000000..11bf03c1d5ee9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageToCMSPageTinyMCE3Test">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Admin should be able to upload images with TinyMCE3 WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Verify that admin is able to upload image to a CMS Page with TinyMCE3 enabled"/>
+            <description value="Verify that admin is able to upload image to CMS Page with TinyMCE3 enabled"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95725"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <!-- Choose TinyMCE3 as the default WYSIWYG editor-->
+            <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
+        </before>
+        <after>
+            <!-- Switch WYSIWYG editor to TinyMCE4-->
+            <comment userInput="Reset editor as TinyMCE4" stepKey="chooseTinyMCE4AsEditor"/>
+            <magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
+        <seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
+        <wait time="3" stepKey="waiting"/>
+        <comment userInput="Click Insert image button" stepKey="clickImageButton"/>
+        <click selector="{{TinyMCESection.InsertImageBtnTinyMCE3}}" stepKey="clickInsertImage" />
+        <waitForPageLoad stepKey="waitForiFrameToLoad" />
+        <!-- Switch to the Edit/Insert Image iFrame -->
+        <comment userInput="Switching to iFrame" stepKey="insertImageiFrame"/>
+        <executeJS function="document.querySelector('.clearlooks2 iframe').setAttribute('name', 'insert-image');" stepKey="makeIFrameInteractable"/>
+        <switchToIFrame selector="insert-image" stepKey="switchToIFrame"/>
+        <click selector="{{MediaGallerySection.browseForImage}}" stepKey="clickBrowse"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForPageToLoad" />
+        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
+        <actionGroup ref="attachImage" stepKey="attachImage1">
+            <argument name="Image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <!-- Switching back to the Edit/Insert Image iFrame-->
+        <comment userInput="switching back to iFrame" stepKey="switchBackToIFrame"/>
+        <executeJS function="document.querySelector('.clearlooks2 iframe').setAttribute('name', 'insert-image');" stepKey="makeIFrameInteractable2"/>
+        <switchToIFrame selector="insert-image" stepKey="switchToIFrame2"/>
+        <waitForElementVisible selector="{{MediaGallerySection.insertBtn}}" stepKey="waitForInsertBtnOnIFrame" />
+        <fillField selector="{{MediaGallerySection.ImageDescriptionTinyMCE3}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
+        <click selector="{{MediaGallerySection.insertBtn}}" stepKey="clickInsertBtn" />
+        <waitForPageLoad stepKey="wait3"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
new file mode 100644
index 0000000000000..03edc69e6d625
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageToWYSIWYGBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to add image to WYSIWYG content of Block"/>
+            <description value="Admin should be able to add image to WYSIWYG content of Block"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84376"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
+            <createData entity="_defaultBlock" stepKey="createPreReqBlock" />
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <actionGroup ref="AssignBlockToCMSPage" stepKey="assignBlockToCMSPage">
+            <argument name="Block" value="$$createPreReqBlock$$"/>
+            <argument name="CmsPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
+        <actionGroup ref="attachImage" stepKey="attachImage1">
+            <argument name="Image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="deleteImage" stepKey="deleteImage"/>
+        <actionGroup ref="attachImage" stepKey="attachImage2">
+            <argument name="Image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
+        <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad11" />
+        <!--see image on Storefront-->
+        <seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontBlockSection.imageSource(ImageUpload.fileName)}}" stepKey="assertMediaSource"/>
+        <after>
+            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad"/>
+            <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+            <waitForPageLoad stepKey="waitForGridReload"/>
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
+            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
new file mode 100644
index 0000000000000..205850f888797
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageToWYSIWYGCMSTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to add image to WYSIWYG content of CMS Page"/>
+            <description value="Admin should be able to add image to WYSIWYG content of CMS Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-85825"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
+        <actionGroup ref="attachImage" stepKey="attachImage1">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="deleteImage" stepKey="deleteImage"/>
+        <actionGroup ref="attachImage" stepKey="attachImage2">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad  stepKey="wait4"/>
+        <seeElement selector="{{StorefrontCMSPageSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
new file mode 100644
index 0000000000000..8fea72764f280
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddVariableToWYSIWYGBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to add variable to WYSIWYG content of Block"/>
+            <description value="You should be able to add variable to WYSIWYG content Block"/>
+            <testCaseId value="MAGETWO-84378"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
+            <createData entity="_defaultBlock" stepKey="createPreReqBlock" />
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Create Custom Variable-->
+        <actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />
+        <!--Setup Store information-->
+        <waitForPageLoad stepKey="wait" />
+        <amOnPage url="/admin/admin/system_config/" stepKey="goToConfigStoreInformation" />
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <conditionalClick selector="{{StoreConfigSection.StoreInformation}}" dependentSelector="{{StoreConfigSection.CheckIfTabExpand}}" stepKey="checkIfTabOpen" visible="true"/>
+        <fillField selector="{{StoreConfigSection.City}}" userInput="{{_defaultVariable.city}}" stepKey="fillCity" />
+        <click selector="{{StoreConfigSection.Save}}" stepKey="saveConfig"/>
+        <!--Main test-->
+        <actionGroup ref="AssignBlockToCMSPage" stepKey="assignBlockToCMSPage">
+            <argument name="Block" value="$$createPreReqBlock$$"/>
+            <argument name="CmsPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <seeElement selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />
+        <click selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon1" />
+        <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
+        <!--see Insert Variable button disabled-->
+        <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--see 4 colums-->
+        <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
+        <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
+        <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
+        <see selector="{{VariableSection.ColName('Code')}}" userInput="Code" stepKey="codeCol" />
+        <!--select default variable-->
+        <click selector="{{VariableSection.Radio('city')}}" stepKey="selectDefaultVariable"/>
+        <see selector="{{VariableSection.InsertVariableBtnEnabled}}" userInput="Insert Variable" stepKey="seeInsertVarialeEnabled" />
+        <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save1" />
+        <scrollTo selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" stepKey="scrollToBlockTitle" />
+        <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideoutCloses" />
+        <click selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon2" />
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <!--see custom variable-->
+        <see userInput="{{customVariable.code}}"  stepKey="seeCustomVariable"/>
+        <seeElement selector="{{VariableSection.SearchTxtbox}}"  stepKey="searchBox"/>
+        <!--press Enter-->
+        <pressKey selector="{{VariableSection.SearchTxtbox}}" parameterArray="['Test Variable',\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
+        <waitForPageLoad stepKey="waitForPageLoad5" />
+        <!--see result-->
+        <see selector="{{VariableSection.searchResult(customVariable.code)}}" userInput="{{customVariable.code}}" stepKey="seeResult" />
+        <!--Insert custom variable-->
+        <click selector="{{VariableSection.VariableRadio(customVariable.code)}}" stepKey="selectCustomVariable1"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
+        <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
+        <click selector="{{BlockWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn"/>
+        <waitForElementVisible selector="{{TinyMCESection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
+        <seeElement selector="{{TinyMCESection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
+        <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter1" visible="true"/>
+        <waitForPageLoad stepKey="waitForFilterReload"/>
+        <click selector="{{CmsPagesPageActionsSection.filterButton}}" stepKey="clickFiltersBtn" />
+        <fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillOutURLKey" />
+        <click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="waitForCMSPageGrid" />
+        <click selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit('$$createCMSPage.identifier$$')}}" stepKey="waitForEditLink" />
+        <click selector="{{CmsPagesPageActionsSection.edit('$$createCMSPage.identifier$$')}}" stepKey="clickEdit" />
+        <waitForPageLoad stepKey="waitForPageLoad8" />
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad9" />
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static Block" stepKey="selectCMSStaticBlock" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappearAfterClickingBtnChooser" />
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending2" />
+        <waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="waitForBlockTitle" />
+        <click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
+        <wait time="3" stepKey="wait1" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <waitForPageLoad stepKey="waitForPageLoad10" />
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterSaveCmsPage" />
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad11" />
+        <!--see Default Variable on Storefront-->
+        <see userInput="{{_defaultVariable.city}}" stepKey="seeDefaultVariable" />
+        <!--see Custom Variable on Storefront-->
+        <see userInput="{{customVariable.html}}" stepKey="seeCustomVariable2" />
+        <!--Delete Custom Variable-->
+        <actionGroup ref="DeleteCustomVariableActionGroup" stepKey="deleteCustomVariable" />
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
+        <!--Refresh Storefront-->
+        <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage2"/>
+        <waitForPageLoad stepKey="waitForPageLoad12" />
+        <!--see custom variable blank-->
+        <dontSee userInput="{{customVariable.html}}" stepKey="dontSeeCustomVariableName" />
+        <after>
+            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+            <waitForPageLoad stepKey="waitForGridReload"/>
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
+            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
new file mode 100644
index 0000000000000..9e5eb2558d6f2
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddVariableToWYSIWYGCMSTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42158-Variable with WYSIWYG "/>
+            <title value="Admin should be able to insert the default Magento variable into content of WYSIWYG on CMS Pages"/>
+            <description value="Admin should be able to insert the default Magento variable into content of WYSIWYG on CMS Pages"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83504"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Create Custom Variable-->
+        <actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />
+        <!--Setup Store information-->
+        <waitForPageLoad stepKey="wait" />
+        <amOnPage url="/admin/admin/system_config/" stepKey="goToConfigStoreInformation" />
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <conditionalClick selector="{{StoreConfigSection.StoreInformation}}" dependentSelector="{{StoreConfigSection.CheckIfTabExpand}}" stepKey="checkIfTabOpen" visible="true"/>
+        <fillField selector="{{StoreConfigSection.City}}" userInput="{{_defaultVariable.city}}" stepKey="fillCity" />
+        <click selector="{{StoreConfigSection.Save}}" stepKey="saveConfig"/>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />
+        <click selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon1" />
+        <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
+        <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
+        <!--see Insert Variable button disabled-->
+        <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--see 4 colums-->
+        <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
+        <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
+        <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
+        <see selector="{{VariableSection.ColName('Code')}}" userInput="Code" stepKey="codeCol" />
+        <!--select default variable-->
+        <click selector="{{VariableSection.Radio('city')}}" stepKey="selectDefaultVariable"/>
+        <see selector="{{VariableSection.InsertVariableBtnEnabled}}" userInput="Insert Variable" stepKey="seeInsertVarialeEnabled" />
+        <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save1" />
+        <waitForPageLoad stepKey="waitForPageLoad8" />
+        <click selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon2" />
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <!--see custom variable-->
+        <see userInput="{{customVariable.code}}"  stepKey="seeCustomVariable"/>
+        <seeElement selector="{{VariableSection.SearchTxtbox}}"  stepKey="searchBox"/>
+        <!--press Enter-->
+        <pressKey selector="{{VariableSection.SearchTxtbox}}" parameterArray="['Test Variable',\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
+        <waitForPageLoad stepKey="waitForPageLoad5" />
+        <!--see result-->
+        <see selector="{{VariableSection.searchResult(customVariable.code)}}" userInput="{{customVariable.code}}" stepKey="seeResult" />
+        <!--Insert custom variable-->
+        <click selector="{{VariableSection.VariableRadio(customVariable.code)}}" stepKey="selectCustomVariable1"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
+        <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
+        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn"/>
+        <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
+        <seeElement selector="{{CmsWYSIWYGSection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <!--see Default Variable on Storefront-->
+        <see userInput="{{_defaultVariable.city}}" stepKey="seeDefaultVariable" />
+        <!--see Custom Variable on Storefront-->
+        <see userInput="{{customVariable.html}}" stepKey="seeCustomVariable2" />
+        <!--Delete Custom Variable-->
+        <actionGroup ref="DeleteCustomVariableActionGroup" stepKey="deleteCustomVariable" />
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
+        <!--Refresh Storefront-->
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPageRefresh"/>
+        <waitForPageLoad stepKey="waitForPageLoad7" />
+        <!--see custom variable blank-->
+        <dontSee userInput="{{customVariable.html}}" stepKey="dontSeeCustomVariableName" />
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
new file mode 100644
index 0000000000000..ad5e769c61be4
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Apply new WYSIWYG in Block"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to add widget to WYSIWYG content of Block"/>
+            <description value="Admin should be able to add widget to WYSIWYG content Block"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84654"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
+            <createData entity="_defaultBlock" stepKey="createPreReqBlock" />
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon1" />
+        <wait time="10" stepKey="waitForPageLoad2" />
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear1" />
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Page Link Block Template" stepKey="selectTemplate1" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn1" />
+        <waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
+        <click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
+        <waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
+        <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon2" />
+        <waitForPageLoad stepKey="waitForPageLoad5" />
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static Block" stepKey="selectCMSStaticBlock" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate2" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn2" />
+        <waitForLoadingMaskToDisappear stepKey="waitForWidgetChooserLoadingMaskToDisappear"/>
+        <actionGroup ref="searchBlockOnGridPage" stepKey="searchBlockOnGridPage">
+            <argument name="Block" value="_defaultBlock"/>
+        </actionGroup>
+        <click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
+        <wait time="3" stepKey="wait1" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
+        <waitForPageLoad stepKey="waitForPageLoad6" />
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
+        <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad7" />
+        <see userInput="Home page" stepKey="seeHomePageCMSPage"/>
+        <after>
+            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+            <waitForPageLoad stepKey="waitForGridReload"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
new file mode 100644
index 0000000000000..ded94eab92042
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: CMS page link"/>
+            <description value="Admin should be able to create a CMS page with widget type: CMS page link"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83781"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="wait2"/>
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Page Link Block Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
+        <scrollTo selector="{{WidgetSection.CMSPage}}" stepKey="scrollToCMSName" />
+        <click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
+        <waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
+        <wait time="3" stepKey="waitForInsertWidgetClickable"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideoutCloses" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <wait stepKey="waitForPageLoad5" time="10" />
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait5" />
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <!--see widget on Storefront-->
+        <see userInput="Home page" stepKey="seeHomepageWidget" />
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
new file mode 100644
index 0000000000000..f37038435e109
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: CMS Static Block"/>
+            <description value="Admin should be able to create a CMS page with widget type: CMS Static Block"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83787"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultBlock" stepKey="createPreReqBlock" />
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static" stepKey="selectCMSStaticBlock" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <!--see Insert Widget button enabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForLoadingMaskToDisappear stepKey="wait3"/>
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
+        <waitForElementVisible selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}" stepKey="waitForSlideoutOpens" />
+        <scrollTo selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}"  stepKey="scrollToBlockIdentifier" />
+        <click selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}" stepKey="selectPreCreateBlock" />
+        <waitForElementNotVisible selector="{{WidgetSection.SelectBlockTitle}}" stepKey="waitForSlideoutCloses" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitingForLoading" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait5" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockLink"/>
+        <after>
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
new file mode 100644
index 0000000000000..5b3679bed77e0
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: Catalog category link"/>
+            <description value="Admin should be able to create a CMS page with widget type: Catalog category link"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83611"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+            <actionGroup ref="ConfigAdminAccountSharingActionGroup" stepKey="allowAdminShareAccount"/>
+        </before>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="wait2"/>
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Category Link" stepKey="selectCatalogCategoryLink" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Category Link Block Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectCategoryBtn" />
+        <waitForLoadingMaskToDisappear stepKey="wait3"/>
+        <click userInput="$$createPreReqCategory.name$$" stepKey="selectPreCreateCategory" />
+        <waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses2" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait5" />
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <!--see widget on Storefront-->
+        <see userInput="$$createPreReqCategory.name$$" stepKey="seeCategoryLink"/>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
new file mode 100644
index 0000000000000..123d25f92b6b7
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: Catalog product link"/>
+            <description value="Admin should be able to create a CMS page with widget type: Catalog product link"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83788"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="wait2"/>
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <waitForPageLoad stepKey="wait3"/>
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Product Link" stepKey="selectCatalogProductLink" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Product Link Block Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForLoadingMaskToDisappear stepKey="wait4"/>
+        <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
+        <waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
+        <click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />
+        <waitForElementNotVisible selector="{{WidgetSection.SelectProductTitle}}" stepKey="waitForSlideOutCloses" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitLoadingMask1" />
+        <waitForPageLoad stepKey="wait6" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait7" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductLink"/>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
new file mode 100644
index 0000000000000..2586ffc11d086
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: Catalog product list"/>
+            <description value="Admin should be able to create a CMS page with widget type: Catalog product list"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-67091"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct1">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct2">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <fillField selector="{{WidgetSection.NoOfProductToDisplay}}" userInput="5" stepKey="fillNoOfProduct" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Products Grid Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn" />
+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Category" stepKey="selectCategoryCondition" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam" />
+        <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear4" />
+        <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
+
+        <!-- Test that the "<" operand functions correctly -->
+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn2" />
+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible2"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Price" stepKey="selectPriceCondition"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3"/>
+        <click selector="{{WidgetSection.RuleParamLabel('2','1')}}" stepKey="clickOperatorLabel"/>
+        <selectOption selector="{{WidgetSection.RuleParamSelect('2','1')}}" userInput="&lt;" stepKey="selectLessThanCondition"/>
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam2"/>
+        <fillField selector="{{WidgetSection.RuleParamInput('2','2')}}" userInput="125" stepKey="fillMaxPrice"/>
+
+        <!-- Test that the ">" operand functions correctly -->
+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn3" />
+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible3"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Price" stepKey="selectPriceCondition2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear5"/>
+        <click selector="{{WidgetSection.RuleParamLabel('3','1')}}" stepKey="clickOperatorLabel2"/>
+        <selectOption selector="{{WidgetSection.RuleParamSelect('3','1')}}" userInput="&gt;" stepKey="selectLessThanCondition2"/>
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam3"/>
+        <fillField selector="{{WidgetSection.RuleParamInput('3','2')}}" userInput="1" stepKey="fillMinPrice"/>
+
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForPageLoad stepKey="wait6" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait5" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <see userInput="$$createPreReqProduct1.name$$" stepKey="seeProductLink1"/>
+        <see userInput="$$createPreReqProduct2.name$$" stepKey="seeProductLink2"/>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
+            <deleteData createDataKey="createPreReqProduct1" stepKey="deletePreReqProduct1" />
+            <deleteData createDataKey="createPreReqProduct2" stepKey="deletePreReqProduct2" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
new file mode 100644
index 0000000000000..691a99a73b90b
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: Recently Compared Products"/>
+            <description value="Admin should be able to create a CMS page with widget type: Recently Compared Products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83792"/>
+        </annotations>
+        <!--Main test-->
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <waitForPageLoad stepKey="wait2"/>
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Compared Products" stepKey="selectRecentlyComparedProducts" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <!--see Insert Widget button enabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <fillField selector="{{WidgetSection.PageSize}}" userInput="5" stepKey="fillNoOfProductDisplay" />
+        <selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
+        <selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Compared Products Grid Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="amOnProductPage" />
+        <waitForPageLoad stepKey="waitForPage" />
+        <click selector="{{WidgetSection.CompareBtn}}" stepKey="clickCompareBtn" />
+        <amOnPage url="$$createPreReqCategory.name$$.html" stepKey="amOnCatalogPage" />
+        <waitForPageLoad stepKey="waitForPage1" />
+        <waitForPageLoad stepKey="waitForPage2" />
+        <waitForElementVisible selector="{{WidgetSection.ClearCompare}}" stepKey="waitForClearBtn" />
+        <click selector="{{WidgetSection.ClearCompare}}" stepKey="clickClearCompareBtn" />
+        <waitForElementVisible selector="{{WidgetSection.AcceptClear}}" stepKey="waitForAcceptBtn"/>
+        <click selector="{{WidgetSection.AcceptClear}}" stepKey="acceptClearCompare" />
+        <waitForPageLoad stepKey="waitForPage3" />
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait5" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <waitForPageLoad stepKey="wait6" />
+        <waitForText userInput="$$createPreReqProduct.name$$" stepKey="waitForProductVisible" />
+        <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductName" />
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
new file mode 100644
index 0000000000000..9cdbccd1f8c32
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42156-Widgets in WYSIWYG"/>
+            <group value="Cms"/>
+            <title value="Admin should be able to create a CMS page with widget type: Recently Viewed Products"/>
+            <description value="Admin should be able to create a CMS page with widget type: Recently Viewed Products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-83789"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Main test-->
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
+        <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <!--see Insert Widget button disabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--Select "Widget Type"-->
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Viewed Products" stepKey="selectRecentlyViewedProducts" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <!--see Insert Widget button enabled-->
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <fillField selector="{{WidgetSection.PageSize}}" userInput="5" stepKey="fillNoOfProductDisplay" />
+        <selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
+        <selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Viewed Products Grid Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="amOnProductPage" />
+        <waitForPageLoad stepKey="waitForPage" />
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="wait5" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello CMS Page!" stepKey="seeContent"/>
+        <waitForPageLoad stepKey="wait6" />
+        <waitForText userInput="$$createPreReqProduct.name$$" stepKey="waitForProductVisible" />
+        <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductName" />
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
new file mode 100644
index 0000000000000..7ab0d9209dde3
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateDuplicatedCmsBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="CMS Block Duplication and Reset Removal MAGETWO-88797"/>
+            <title value="Admin should be able to duplicate a CMS block"/>
+            <description value="Admin should be able to duplicate a CMS block"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89185"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+        </before>
+        <after>
+            <actionGroup ref="deleteBlock" stepKey="deleteCreatedBlock">
+                <argument name="Block" value="_defaultBlock"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnBlocksCreationForm"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!--Verify Save&Duplicate button and Save&Close button-->
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn1" />
+        <see selector="{{BlockNewPagePageActionsSection.saveAndDuplicate}}" userInput="Save &amp; Duplicate" stepKey="seeSaveAndDuplicate"/>
+        <see selector="{{BlockNewPagePageActionsSection.saveAndClose}}" userInput="Save &amp; Close" stepKey="seeSaveAndClose"/>
+        <!--Create new CMS Block page-->
+        <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent"/>
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn2" />
+        <click selector="{{BlockNewPagePageActionsSection.saveAndDuplicate}}" stepKey="clickSaveAndDuplicate" />
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="You saved the block." stepKey="seeSavedBlockMsgOnForm"/>
+        <see userInput="You duplicated the block." stepKey="seeDuplicatedBlockMsg"/>
+        <!--Verify duplicated CMS Block Page-->
+        <seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('0')}}" stepKey="seeBlockNotEnable" />
+        <actionGroup ref="AssertBlockContent" stepKey="assertContent"/>
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn3" />
+        <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
+        <see userInput="You saved the block." stepKey="seeSavedBlockMsgOnGrid"/>
+        <seeElement selector="div[data-role='grid-wrapper']" stepKey="seeGridPage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
new file mode 100644
index 0000000000000..fccc5b5980f2b
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCmsPageTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Create a CMS Page via the Admin"/>
+            <title value="Admin should be able to create a CMS Page"/>
+            <description value="Admin should be able to create a CMS Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-25580"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPage"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_defaultCmsPage.content_heading}}" stepKey="fillFieldContentHeading"/>
+        <!-- As of 2017/11/15, this test is failing here (Jenkins only, works locally). See MQE-282. -->
+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{_defaultCmsPage.content}}" stepKey="fillFieldContent"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <see userInput="{{_defaultCmsPage.content_heading}}" stepKey="seeContentHeading"/>
+        <see userInput="{{_defaultCmsPage.content}}" stepKey="seeContent"/>
+    </test>
+    <test name="AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Default layout configuration MAGETWO-88793"/>
+            <title value="Admin should be able to configure the default layout for CMS Page from System Configuration"/>
+            <description value="Admin should be able to configure the default layout for CMS Page from System Configuration"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89025"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="DefaultProductLayout" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="seeOneColumnSelected" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected1" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected2" />
+        <selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="2 columns with right bar" stepKey="selectColumnsWithRightBar"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPagePagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForLoadingMaskToDisappear stepKey="wait2" />
+        <click selector="{{CmsDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
+        <waitForElementVisible selector="{{CmsDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
+        <seeOptionIsSelected selector="{{CmsDesignSection.LayoutDropdown}}" userInput="2 columns with right bar" stepKey="seeColumnsWithRightBar" />
+    </test>
+    <test name="AdminCreateDuplicatedCmsPageTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="CMS Page Duplication and Reset Removal MAGETWO-87096"/>
+            <title value="Admin should be able to duplicate a CMS Page"/>
+            <description value="Admin should be able to duplicate a CMS Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-89184"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPageCreationForm"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!--Verify Save&Duplicate button and Save&Close button-->
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn1" />
+        <see selector="{{CmsNewPagePageActionsSection.saveAndDuplicate}}" userInput="Save &amp; Duplicate" stepKey="seeSaveAndDuplicate"/>
+        <see selector="{{CmsNewPagePageActionsSection.saveAndClose}}" userInput="Save &amp; Close" stepKey="seeSaveAndClose"/>
+        <!--Create new CMS Page page-->
+        <actionGroup ref="FillOutCMSPageContent" stepKey="FillOutBlockContent"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn2" />
+        <click selector="{{CmsNewPagePageActionsSection.saveAndDuplicate}}" stepKey="clickSaveAndDuplicate" />
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="You saved the page." stepKey="seeSavedPageMsgOnForm"/>
+        <see userInput="You duplicated the page." stepKey="seeDuplicatedPageMsg"/>
+        <!--Verify duplicated CMS Page-->
+        <seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('0')}}" stepKey="seeBlockNotEnable" />
+        <actionGroup ref="AssertCMSPageContent" stepKey="assertContent"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn3" />
+        <click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
+        <see userInput="You saved the page." stepKey="seeSavedCMSPageMsgOnGrid"/>
+        <seeElement selector="div[data-role='grid-wrapper']" stepKey="seeGridPage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml
new file mode 100644
index 0000000000000..6165def067ef4
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreFrontMobileViewValidation.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StoreFrontMobileViewValidation">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Mobile view page footer should stick to the bottom of page on Store front"/>
+            <title value="Mobile view page footer should stick to the bottom of page on Store front"/>
+            <description value="Mobile view page footer should stick to the bottom of page on Store front"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94333"/>
+            <useCaseId value="MAGETWO-93978"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <createData entity="_longContentCmsPage" stepKey="createPreReqCMSPage"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage"/>
+            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        </after>
+        <resizeWindow width="375" height="812" stepKey="resizeWindowToMobile"/>
+        <amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad6" />
+         <!--Verifying that Footer is not in visible area by default as the CMS page has lots of content which will occupy entire visible area-->
+        <executeJS function="return document.querySelector('{{StorefrontCMSPageSection.footerTop}}').getBoundingClientRect().top" stepKey="topOfFooter"/>
+        <assertGreaterThan stepKey="assertDefaultLoad">
+            <actualResult type="variable">topOfFooter</actualResult>
+            <expectedResult type="string">812</expectedResult>
+        </assertGreaterThan>
+         <!--Verifying that even after scroll footer section is below the main content section-->
+        <scrollTo selector="{{StorefrontCMSPageSection.footerTop}}" stepKey="scrollToFooterSection"/>
+        <executeJS function="return document.querySelector('{{StorefrontCMSPageSection.footerTop}}').getBoundingClientRect().top" stepKey="topOfTheFooterAfterScroll"/>
+        <executeJS function="return document.querySelector('{{StorefrontCMSPageSection.mainContent}}').getBoundingClientRect().bottom" stepKey="bottomOfMainContent"/>
+        <assertGreaterThan stepKey="assertAfterScroll">
+            <actualResult type="variable">topOfTheFooterAfterScroll</actualResult>
+            <expectedResult type="variable">bottomOfMainContent</expectedResult>
+        </assertGreaterThan>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
new file mode 100644
index 0000000000000..9ee2055aae650
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42046-Apply new WYSIWYG on CMS Page and Block"/>
+            <group value="Cms"/>
+            <title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Block"/>
+            <description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Block"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84184"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage" />
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnNewBlockPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle"/>
+        <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
+        <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
+        <executeJS function="tinyMCE.get('cms_block_form_content').setContent('Hello Block Page!');" stepKey="executeJSFillContent"/>
+        <click selector="{{BlockWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn1" />
+        <waitForElementVisible selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="waitForInsertWidget" />
+        <see selector="{{TinyMCESection.InsertImageBtn}}" userInput="Insert Image..." stepKey="assertInf17"/>
+        <see selector="{{TinyMCESection.InsertWidgetBtn}}" userInput="Insert Widget..." stepKey="assertInfo18"/>
+        <see selector="{{TinyMCESection.InsertVariableBtn}}" userInput="Insert Variable..." stepKey="assertInfo19"/>
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
+        <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForGridReload"/>
+        <click selector="{{CmsPagesPageActionsSection.filterButton}}" stepKey="clickFiltersBtn" />
+        <fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createPreReqCMSPage.identifier$$" stepKey="fillOutURLKey" />
+        <click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select('$$createPreReqCMSPage.identifier$$')}}" stepKey="waitForCMSPageGrid" />
+        <scrollTo selector="{{CmsPagesPageActionsSection.select('$$createPreReqCMSPage.identifier$$')}}" stepKey="scrollToCMSPage" />
+        <click selector="{{CmsPagesPageActionsSection.select('$$createPreReqCMSPage.identifier$$')}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit('$$createPreReqCMSPage.identifier$$')}}" stepKey="waitForEditLink" />
+        <click selector="{{CmsPagesPageActionsSection.edit('$$createPreReqCMSPage.identifier$$')}}" stepKey="clickEdit" />
+        <waitForPageLoad stepKey="waitForPageLoad3" />
+        <scrollTo selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" stepKey="scrollToPageTitle" />
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementVisible selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="waitforShowHideBtn" />
+        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2"/>
+        <waitForElementVisible selector="{{TinyMCESection.InsertWidgetBtn}}"  stepKey="waitForInsertInsertWidgetBtn" />
+        <seeElement selector="{{TinyMCESection.InsertWidgetBtn}}"  stepKey="widgetBtn" />
+        <click selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="clickInsertWidgetBtn"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static Block" stepKey="selectCMSStaticBlock" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappearAfterClickingBtnChooser" />
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending2" />
+        <waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="waitForBlockCode" />
+        <scrollTo selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}"  stepKey="scrollToBlockIdentifier" />
+        <click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
+        <wait time="3" stepKey="wait1" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <waitForPageLoad stepKey="waitForPageLoad5" />
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad6" />
+        <!--see content of Block on Storefront-->
+        <see userInput="Hello Block Page!" stepKey="seeContent"/>
+        <after>
+            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad"/>
+            <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+            <waitForPageLoad stepKey="waitForGridReload"/>
+            <deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage" />
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
new file mode 100644
index 0000000000000..caad1cabe78c5
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-42046-Apply new WYSIWYG on CMS Page"/>
+            <group value="Cms"/>
+            <title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on CMS Page"/>
+            <description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on CMS Page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84182 "/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPage"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_defaultCmsPage.content_heading}}" stepKey="fillFieldContentHeading"/>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
+        <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
+        <executeJS function="tinyMCE.get('cms_page_form_content').setContent('Hello World!');" stepKey="executeJSFillContent"/>
+        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
+        <waitForElementVisible selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="waitForInsertWidget" />
+        <see selector="{{TinyMCESection.InsertImageBtn}}" userInput="Insert Image..." stepKey="assertInf17"/>
+        <see selector="{{TinyMCESection.InsertWidgetBtn}}" userInput="Insert Widget..." stepKey="assertInfo18"/>
+        <see selector="{{TinyMCESection.InsertVariableBtn}}" userInput="Insert Variable..." stepKey="assertInfo19"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <see userInput="{{_defaultCmsPage.content_heading}}" stepKey="seeContentHeading"/>
+        <see userInput="Hello World!" stepKey="seeContent" />
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
index 97988a5676842..a27110ca96b6d 100644
--- a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
@@ -233,6 +233,9 @@ public function testPrepareElementHtml($elementValue, $modelBlockId)
         $this->assertEquals($this->elementMock, $this->this->prepareElementHtml($this->elementMock));
     }
 
+    /**
+     * @return array
+     */
     public function prepareElementHtmlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Page/Widget/ChooserTest.php b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Page/Widget/ChooserTest.php
index 174e3a68b7c66..7b91d54ec3aa1 100644
--- a/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Page/Widget/ChooserTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Page/Widget/ChooserTest.php
@@ -236,6 +236,9 @@ public function testPrepareElementHtml($elementValue, $cmsPageId)
         $this->assertEquals($this->elementMock, $this->this->prepareElementHtml($this->elementMock));
     }
 
+    /**
+     * @return array
+     */
     public function prepareElementHtmlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
index ff1ed408eb131..55e8382d9ca23 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
@@ -134,10 +134,10 @@ public function testDeleteAction()
             ->with($this->blockId);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You deleted the block.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
@@ -154,10 +154,10 @@ public function testDeleteActionNoId()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t find a block to delete.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
@@ -181,10 +181,10 @@ public function testDeleteActionThrowsException()
             ->willThrowException(new \Exception(__($errorMsg)));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($errorMsg);
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php
index 875dde9fb226b..a28a1b793d943 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php
@@ -139,7 +139,7 @@ public function testEditActionBlockNoExists()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('This block no longer exists.'));
 
         $this->resultRedirectFactoryMock->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index 2dc14154c85e5..39a7d0d74e4d8 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -68,9 +68,9 @@ public function testMassDeleteAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocksCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
index f6b709a5c96c9..0d44f66048ba3 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
@@ -65,6 +65,16 @@ class SaveTest extends \PHPUnit\Framework\TestCase
      */
     protected $saveController;
 
+    /**
+     * @var \Magento\Cms\Model\BlockFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $blockFactory;
+
+    /**
+     * @var \Magento\Cms\Api\BlockRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $blockRepository;
+
     /**
      * @var int
      */
@@ -129,11 +139,22 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->resultRedirectFactory);
 
+        $this->blockFactory = $this->getMockBuilder(\Magento\Cms\Model\BlockFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->blockRepository = $this->getMockBuilder(\Magento\Cms\Api\BlockRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->saveController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Block\Save::class,
             [
                 'context' => $this->contextMock,
                 'dataPersistor' => $this->dataPersistorMock,
+                'blockFactory' => $this->blockFactory,
+                'blockRepository' => $this->blockRepository,
             ]
         );
     }
@@ -141,11 +162,12 @@ protected function setUp()
     public function testSaveAction()
     {
         $postData = [
-        'title' => '"><img src=y onerror=prompt(document.domain)>;',
-        'identifier' => 'unique_title_123',
-        'stores' => ['0'],
-        'is_active' => true,
-        'content' => '"><script>alert("cookie: "+document.cookie)</script>'
+            'title' => '"><img src=y onerror=prompt(document.domain)>;',
+            'identifier' => 'unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '"><script>alert("cookie: "+document.cookie)</script>',
+            'back' => 'continue'
         ];
 
         $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
@@ -154,33 +176,31 @@ public function testSaveAction()
             ->willReturnMap(
                 [
                     ['block_id', null, 1],
-                    ['back', null, false],
+                    ['back', null, 'continue'],
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
         $this->blockMock->expects($this->once())->method('setData');
-        $this->blockMock->expects($this->once())->method('save');
+        $this->blockRepository->expects($this->once())->method('save')->with($this->blockMock);
 
         $this->dataPersistorMock->expects($this->any())
             ->method('clear')
             ->with('cms_block');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the block.'));
 
-        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/edit') ->willReturnSelf();
 
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
@@ -194,7 +214,12 @@ public function testSaveActionWithoutData()
 
     public function testSaveActionNoId()
     {
-        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['block_id' => 1]);
+        $postData = [
+            'block_id' => 1,
+            'back' => 'continue'
+        ];
+
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getParam')
             ->willReturnMap(
@@ -204,20 +229,17 @@ public function testSaveActionNoId()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(false);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('Error message')));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('This block no longer exists.'));
 
         $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
@@ -225,9 +247,18 @@ public function testSaveActionNoId()
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
-    public function testSaveAndContinue()
+    public function testSaveAndDuplicate()
     {
-        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['block_id' => 1]);
+        $postData = [
+            'title' => 'unique_title_123',
+            'identifier' => 'unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '"><script>alert("cookie: "+document.cookie)</script>',
+            'back' => 'duplicate'
+        ];
+
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getParam')
             ->willReturnMap(
@@ -237,24 +268,53 @@ public function testSaveAndContinue()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->at(0))
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
+        $duplicateBlockMock = $this->getMockBuilder(
+            \Magento\Cms\Model\Block::class
+        )->disableOriginalConstructor()->getMock();
+
+        $this->blockFactory->expects($this->at(1))
+            ->method('create')
+            ->willReturn($duplicateBlockMock);
+
+        $duplicateBlockMock->expects($this->atLeastOnce())
+            ->method('setId')
+            ->with(null)
+            ->willReturnSelf();
+
+        $duplicateBlockMock->expects($this->atLeastOnce())
+            ->method('setIdentifier')
+            ->willReturnSelf();
+
+        $duplicateBlockMock->expects($this->atLeastOnce())
+            ->method('setIsActive')
+            ->with(0)
             ->willReturnSelf();
-        $this->blockMock->expects($this->any())
+
+        $duplicateBlockMock->expects($this->atLeastOnce())
             ->method('getId')
-            ->willReturn(true);
-        $this->blockMock->expects($this->once())->method('setData');
-        $this->blockMock->expects($this->once())->method('save');
+            ->willReturn(1);
 
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
+        $this->blockMock->expects($this->any())->method('setData');
+        $this->blockRepository->expects($this->at(1))->method('save')->with($this->blockMock);
+        $this->blockRepository->expects($this->at(2))->method('save')->with($duplicateBlockMock);
+
+        $this->messageManagerMock->expects($this->at(0))
+            ->method('addSuccessMessage')
             ->with(__('You saved the block.'));
 
+        $this->messageManagerMock->expects($this->at(1))
+            ->method('addSuccessMessage')
+            ->with(__('You duplicated the block.'));
+
         $this->dataPersistorMock->expects($this->any())
             ->method('clear')
             ->with('cms_block');
@@ -267,9 +327,64 @@ public function testSaveAndContinue()
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
+    public function testSaveAndClose()
+    {
+        $postData = [
+            'title' => '"><img src=y onerror=prompt(document.domain)>;',
+            'identifier' => 'unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '"><script>alert("cookie: "+document.cookie)</script>',
+            'back' => 'close'
+        ];
+
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                    ['block_id', null, 1],
+                    ['back', null, 'close'],
+                ]
+            );
+
+        $this->blockFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($this->blockMock);
+
+        $this->blockRepository->expects($this->atLeastOnce())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
+        $this->blockMock->expects($this->atLeastOnce())->method('setData');
+        $this->blockRepository->expects($this->once())->method('save')->with($this->blockMock);
+
+        $this->dataPersistorMock->expects($this->any())
+            ->method('clear')
+            ->with('cms_block');
+
+        $this->messageManagerMock->expects($this->atLeastOnce())
+            ->method('addSuccessMessage')
+            ->with(__('You saved the block.'));
+
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/')->willReturnSelf();
+
+        $this->assertSame($this->resultRedirect, $this->saveController->execute());
+    }
+
     public function testSaveActionThrowsException()
     {
-        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['block_id' => 1]);
+        $postData = [
+            'title' => '"><img src=y onerror=prompt(document.domain)>;',
+            'identifier' => 'unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '"><script>alert("cookie: "+document.cookie)</script>',
+            'back' => 'continue'
+        ];
+
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getParam')
             ->willReturnMap(
@@ -279,28 +394,28 @@ public function testSaveActionThrowsException()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
         $this->blockMock->expects($this->once())->method('setData');
-        $this->blockMock->expects($this->once())->method('save')->willThrowException(new \Exception('Error message.'));
+        $this->blockRepository->expects($this->once())->method('save')
+            ->with($this->blockMock)
+            ->willThrowException(new \Exception('Error message.'));
 
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
         $this->messageManagerMock->expects($this->once())
-            ->method('addException');
+            ->method('addExceptionMessage');
 
         $this->dataPersistorMock->expects($this->any())
             ->method('set')
-            ->with('cms_block', ['block_id' => 1]);
+            ->with('cms_block', array_merge($postData, ['block_id' => null]));
 
         $this->resultRedirect->expects($this->atLeastOnce())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
index 7f994bf5b3df5..09b36bc41d405 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
@@ -124,10 +124,10 @@ public function testDeleteAction()
             ->method('delete');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('The page has been deleted.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
 
         $this->eventManagerMock->expects($this->once())
             ->method('dispatch')
@@ -151,10 +151,10 @@ public function testDeleteActionNoId()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t find a page to delete.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
@@ -195,10 +195,10 @@ public function testDeleteActionThrowsException()
             );
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($errorMsg);
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php
index 335abb837523a..5ea5ce5a9fdbb 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php
@@ -139,7 +139,7 @@ public function testEditActionPageNoExists()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('This page no longer exists.'));
 
         $this->resultRedirectFactoryMock->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index 8f1a651b0a7e1..f51ab152ba2a4 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -68,9 +68,9 @@ public function testMassDeleteAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
index 0185654434be1..5b80dd1873d5c 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -67,9 +67,9 @@ public function testMassDisableAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
index b5907e7b3ffed..16b3dfe4ee638 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -67,9 +67,9 @@ public function testMassEnableAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
index 03a8fc0969064..26b4055923107 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
@@ -117,11 +117,12 @@ protected function setUp()
     public function testSaveAction()
     {
         $postData = [
-        'title' => '"><img src=y onerror=prompt(document.domain)>;',
-        'identifier' => 'unique_title_123',
-        'stores' => ['0'],
-        'is_active' => true,
-        'content' => '"><script>alert("cookie: "+document.cookie)</script>'
+            'title' => '"><img src=y onerror=prompt(document.domain)>;',
+            'identifier' => 'unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '"><script>alert("cookie: "+document.cookie)</script>',
+            'back' => 'close'
         ];
 
         $filteredPostData = [
@@ -129,7 +130,8 @@ public function testSaveAction()
             'identifier' => 'unique_title_123',
             'stores' => ['0'],
             'is_active' => true,
-            'content' => '&quot;&gt;&lt;script&gt;alert(&quot;cookie: &quot;+document.cookie)&lt;/script&gt;'
+            'content' => '&quot;&gt;&lt;script&gt;alert(&quot;cookie: &quot;+document.cookie)&lt;/script&gt;',
+            'back' => 'close'
         ];
 
         $this->dataProcessorMock->expects($this->any())
@@ -153,12 +155,7 @@ public function testSaveAction()
             ->method('create')
             ->willReturn($page);
 
-        $page->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $page->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
         $this->pageRepository->expects($this->once())->method('save')->with($page);
 
@@ -182,15 +179,53 @@ public function testSaveActionWithoutData()
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
+    public function testSaveActionNoId()
+    {
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['page_id' => 1]);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                    ['page_id', null, 1],
+                    ['back', null, 'close'],
+                ]
+            );
+
+        $page = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pageFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($page);
+        $this->pageRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->pageId)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('Error message')));
+        $this->messageManagerMock->expects($this->once())
+            ->method('addErrorMessage')
+            ->with(__('This page no longer exists.'));
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->assertSame($this->resultRedirect, $this->saveController->execute());
+    }
+
     public function testSaveAndContinue()
     {
-        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['page_id' => $this->pageId]);
+        $postData = [
+            'title' => '"><img src=y onerror=prompt(document.domain)>;',
+            'identifier' => 'unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '"><script>alert("cookie: "+document.cookie)</script>',
+            'back' => 'continue'
+        ];
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getParam')
             ->willReturnMap(
                 [
                     ['page_id', null, $this->pageId],
-                    ['back', null, true],
+                    ['back', null, 'continue'],
                 ]
             );
 
@@ -204,12 +239,7 @@ public function testSaveAndContinue()
             ->method('create')
             ->willReturn($page);
 
-        $page->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $page->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
         $this->pageRepository->expects($this->once())->method('save')->with($page);
 
@@ -251,12 +281,7 @@ public function testSaveActionThrowsException()
             ->method('create')
             ->willReturn($page);
 
-        $page->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $page->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
         $this->pageRepository->expects($this->once())->method('save')->with($page)
             ->willThrowException(new \Exception('Error message.'));
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php
index 8ff206e8a80fc..53064e87c2755 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php
@@ -42,6 +42,9 @@ class IndexTest extends \PHPUnit\Framework\TestCase
      */
     protected $pageId = 'home';
 
+    /**
+     * Test setUp
+     */
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -84,11 +87,16 @@ protected function setUp()
                 'response' => $responseMock,
                 'objectManager' => $objectManagerMock,
                 'request' => $this->requestMock,
-                'resultForwardFactory' => $this->forwardFactoryMock
+                'resultForwardFactory' => $this->forwardFactoryMock,
+                'scopeConfig' => $scopeConfigMock,
+                'page' => $this->cmsHelperMock
             ]
         );
     }
 
+    /**
+     * Controller test
+     */
     public function testExecuteResultPage()
     {
         $this->cmsHelperMock->expects($this->once())
@@ -98,6 +106,9 @@ public function testExecuteResultPage()
         $this->assertSame($this->resultPageMock, $this->controller->execute());
     }
 
+    /**
+     * Controller test
+     */
     public function testExecuteResultForward()
     {
         $this->forwardMock->expects($this->once())
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
index 31d99df5f6289..d13dfc628201d 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
@@ -65,7 +65,7 @@ public function testValidateRequireEntry()
             'title' => ''
         ];
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('To apply changes you should fill in hidden required "%1" field', 'Page Title'));
 
         $this->assertFalse($this->postDataProcessor->validateRequireEntry($postData));
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/RouterTest.php b/app/code/Magento/Cms/Test/Unit/Controller/RouterTest.php
index 3bf67bf1a41ae..e6708905e01c9 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/RouterTest.php
@@ -78,7 +78,7 @@ protected function setUp()
     public function testMatchCmsControllerRouterMatchBeforeEventParams()
     {
         $identifier = '/test';
-        $trimedIdentifier = 'test';
+        $trimmedIdentifier = 'test';
         $pageId = 1;
         $storeId = 1;
 
@@ -114,10 +114,10 @@ public function testMatchCmsControllerRouterMatchBeforeEventParams()
             ->willReturnSelf();
         $requestMock->expects($this->once())
             ->method('setAlias')
-            ->with(\Magento\Framework\Url::REWRITE_REQUEST_PATH_ALIAS, $trimedIdentifier)
+            ->with(\Magento\Framework\Url::REWRITE_REQUEST_PATH_ALIAS, $trimmedIdentifier)
             ->willReturnSelf();
 
-        $condition = new \Magento\Framework\DataObject(['identifier' => $trimedIdentifier, 'continue' => true]);
+        $condition = new \Magento\Framework\DataObject(['identifier' => $trimmedIdentifier, 'continue' => true]);
 
         $this->eventManagerMock->expects($this->once())
             ->method('dispatch')
@@ -135,7 +135,7 @@ public function testMatchCmsControllerRouterMatchBeforeEventParams()
             ->getMock();
         $pageMock->expects($this->once())
             ->method('checkIdentifier')
-            ->with($trimedIdentifier, $storeId)
+            ->with($trimmedIdentifier, $storeId)
             ->willReturn($pageId);
 
         $this->pageFactoryMock->expects($this->once())
diff --git a/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php b/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php
index 8b41f0e3ac0d4..19f3b113c5e2c 100644
--- a/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Helper/PageTest.php
@@ -118,6 +118,9 @@ class PageTest extends \PHPUnit\Framework\TestCase
      */
     private $httpRequestMock;
 
+    /**
+     * Test Setup
+     */
     protected function setUp()
     {
         $this->actionMock = $this->getMockBuilder(\Magento\Framework\App\Action\Action::class)
@@ -367,6 +370,9 @@ public function testPrepareResultPage(
         );
     }
 
+    /**
+     * @return array
+     */
     public function renderPageExtendedDataProvider()
     {
         return [
@@ -467,12 +473,15 @@ public function testGetPageUrl(
         $this->assertEquals($expectedResult, $this->object->getPageUrl($pageId));
     }
 
+    /**
+     * @return array
+     */
     public function getPageUrlDataProvider()
     {
         return [
             'ids NOT EQUAL BUT page->load() NOT SUCCESSFUL' => [
                 'pageId' => 123,
-                'internalPageId' => 234,
+                'internalPageId' => null,
                 'pageLoadResultIndex' => 0,
                 'expectedResult' => null,
             ],
diff --git a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
index 1fcc10609870a..d13b4f47a85e7 100644
--- a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
@@ -67,6 +67,11 @@ class ImagesTest extends \PHPUnit\Framework\TestCase
      */
     protected $backendDataMock;
 
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $escaperMock;
+
     /**
      * @var string
      */
@@ -74,7 +79,7 @@ class ImagesTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->path = 'PATH/';
+        $this->path = 'PATH';
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
@@ -105,7 +110,8 @@ protected function setUp()
             ->willReturnMap(
                 [
                     [WysiwygConfig::IMAGE_DIRECTORY, null, $this->getAbsolutePath(WysiwygConfig::IMAGE_DIRECTORY)],
-                    [null, null, $this->getAbsolutePath(null)]
+                    [null, null, $this->getAbsolutePath(null)],
+                    ['', null, $this->getAbsolutePath('')],
                 ]
             );
 
@@ -119,7 +125,7 @@ protected function setUp()
                 [
                     'clearWebsiteCache', 'getDefaultStoreView', 'getGroup', 'getGroups',
                     'getStore', 'getStores', 'getWebsite', 'getWebsites', 'hasSingleStore',
-                    'isSingleStoreMode', 'reinitStores', 'setCurrentStore', 'setIsSingleStoreModeAllowed'
+                    'isSingleStoreMode', 'reinitStores', 'setCurrentStore', 'setIsSingleStoreModeAllowed',
                 ]
             )
             ->disableOriginalConstructor()
@@ -127,13 +133,16 @@ protected function setUp()
 
         $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class);
 
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+
         $this->imagesHelper = $this->objectManager->getObject(
             \Magento\Cms\Helper\Wysiwyg\Images::class,
             [
                 'context' => $this->contextMock,
                 'filesystem' => $this->filesystemMock,
                 'storeManager' => $this->storeManagerMock,
-                'backendData' => $this->backendDataMock
+                'backendData' => $this->backendDataMock,
+                'escaper' => $this->escaperMock,
             ]
         );
     }
@@ -151,6 +160,7 @@ protected function tearDown()
         $this->requestMock = null;
         $this->urlEncoderMock = null;
         $this->backendDataMock = null;
+        $this->escaperMock = null;
     }
 
     /**
@@ -170,7 +180,7 @@ public function testSetStoreId()
     public function testGetStorageRoot()
     {
         $this->assertEquals(
-            $this->getAbsolutePath(WysiwygConfig::IMAGE_DIRECTORY),
+            $this->getAbsolutePath(''),
             $this->imagesHelper->getStorageRoot()
         );
     }
@@ -194,7 +204,7 @@ public function testGetTreeNodeName()
     public function testConvertPathToId()
     {
         $pathOne = '/test_path';
-        $pathTwo = $this->getAbsolutePath(WysiwygConfig::IMAGE_DIRECTORY) . '/test_path';
+        $pathTwo = $this->getAbsolutePath('') . '/test_path';
         $this->assertEquals(
             $this->imagesHelper->convertPathToId($pathOne),
             $this->imagesHelper->convertPathToId($pathTwo)
@@ -220,7 +230,7 @@ public function providerConvertIdToPath()
     {
         return [
             ['', ''],
-            ['/test_path', 'L3Rlc3RfcGF0aA--']
+            ['/test_path', 'L3Rlc3RfcGF0aA--'],
         ];
     }
 
@@ -230,6 +240,15 @@ public function testConvertIdToPathNodeRoot()
         $this->assertEquals($this->imagesHelper->getStorageRoot(), $this->imagesHelper->convertIdToPath($pathId));
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Path is invalid
+     */
+    public function testConvertIdToPathInvalid()
+    {
+        $this->imagesHelper->convertIdToPath('Ly4uLy4uLy4uLy4uLy4uL3dvcms-');
+    }
+
     /**
      * @param string $fileName
      * @param int $maxLength
@@ -249,7 +268,7 @@ public function providerShortFilename()
         return [
             ['test', 3, 'tes...'],
             ['test', 4, 'test'],
-            ['test', 20, 'test']
+            ['test', 20, 'test'],
         ];
     }
 
@@ -271,7 +290,7 @@ public function providerShortFilenameDefaultMaxLength()
         return [
             ['Mini text', 'Mini text'],
             ['20 symbols are here', '20 symbols are here'],
-            ['Some text for this unit test', 'Some text for this u...']
+            ['Some text for this unit test', 'Some text for this u...'],
         ];
     }
 
@@ -293,7 +312,7 @@ protected function generalSettingsIsUsingStaticUrlsAllowed($allowedValue)
     {
         $storeId = 1;
         $this->imagesHelper->setStoreId($storeId);
-        $checkResult = new \StdClass();
+        $checkResult = new \stdClass();
         $checkResult->isAllowed = false;
         $this->eventManagerMock->expects($this->any())
             ->method('dispatch')
@@ -310,7 +329,7 @@ public function providerIsUsingStaticUrlsAllowed()
     {
         return [
             [true],
-            [false]
+            [false],
         ];
     }
 
@@ -322,26 +341,30 @@ public function providerIsUsingStaticUrlsAllowed()
      */
     public function testGetCurrentPath($pathId, $expectedPath, $isExist)
     {
-        $this->requestMock->expects($this->once())
+        $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturn($pathId);
+            ->willReturnMap(
+                [
+                    ['node', null, $pathId],
+                ]
+            );
 
         $this->directoryWriteMock->expects($this->any())
             ->method('isDirectory')
             ->willReturnMap(
                 [
-                    ['/../wysiwyg/test_path', true],
-                    ['/../wysiwyg/my.jpg', false],
-                    ['/../wysiwyg', true]
+                    ['/../test_path', true],
+                    ['/../my.jpg', false],
+                    ['.', true],
                 ]
             );
         $this->directoryWriteMock->expects($this->any())
             ->method('getRelativePath')
             ->willReturnMap(
                 [
-                    ['PATH/wysiwyg/test_path', '/../wysiwyg/test_path'],
-                    ['PATH/wysiwyg/my.jpg', '/../wysiwyg/my.jpg'],
-                    ['PATH/wysiwyg', '/../wysiwyg'],
+                    ['PATH/test_path', '/../test_path'],
+                    ['PATH/my.jpg', '/../my.jpg'],
+                    ['PATH', '.'],
                 ]
             );
         $this->directoryWriteMock->expects($this->once())
@@ -356,10 +379,8 @@ public function testGetCurrentPath($pathId, $expectedPath, $isExist)
 
     public function testGetCurrentPathThrowException()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            'The directory PATH/wysiwyg is not writable by server.'
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('The directory PATH is not writable by server.');
 
         $this->directoryWriteMock->expects($this->once())
             ->method('isExist')
@@ -375,15 +396,18 @@ public function testGetCurrentPathThrowException()
         $this->fail('An expected exception has not been raised.');
     }
 
+    /**
+     * @return array
+     */
     public function providerGetCurrentPath()
     {
         return [
-            ['L3Rlc3RfcGF0aA--', 'PATH/wysiwyg/test_path', true],
-            ['L215LmpwZw--', 'PATH/wysiwyg', true],
-            [null, 'PATH/wysiwyg', true],
-            ['L3Rlc3RfcGF0aA--', 'PATH/wysiwyg/test_path', false],
-            ['L215LmpwZw--', 'PATH/wysiwyg', false],
-            [null, 'PATH/wysiwyg', false]
+            ['L3Rlc3RfcGF0aA--', 'PATH/test_path', true],
+            ['L215LmpwZw--', 'PATH', true],
+            [null, 'PATH', true],
+            ['L3Rlc3RfcGF0aA--', 'PATH/test_path', false],
+            ['L215LmpwZw--', 'PATH', false],
+            [null, 'PATH', false],
         ];
     }
 
@@ -413,20 +437,41 @@ public function testGetCurrentUrl()
      * @param string $baseUrl
      * @param string $fileName
      * @param bool $isUsingStaticUrls
+     * @param string|null $escapedValue
      * @param string $expectedHtml
      * @dataProvider providerGetImageHtmlDeclarationRenderingAsTag
      */
-    public function testGetImageHtmlDeclarationRenderingAsTag($baseUrl, $fileName, $isUsingStaticUrls, $expectedHtml)
-    {
-        $this->generalSettingsGetImageHtmlDeclaration($baseUrl, $isUsingStaticUrls);
+    public function testGetImageHtmlDeclarationRenderingAsTag(
+        $baseUrl,
+        $fileName,
+        $isUsingStaticUrls,
+        $escapedValue,
+        $expectedHtml
+    ) {
+        $this->generalSettingsGetImageHtmlDeclaration($baseUrl, $isUsingStaticUrls, $escapedValue);
         $this->assertEquals($expectedHtml, $this->imagesHelper->getImageHtmlDeclaration($fileName, true));
     }
 
+    /**
+     * @return array
+     */
     public function providerGetImageHtmlDeclarationRenderingAsTag()
     {
         return [
-            ['http://localhost', 'test.png', true, '<img src="http://localhost/test.png" alt="" />'],
-            ['http://localhost', 'test.png', false, '<img src="{{media url="/test.png"}}" alt="" />']
+            [
+                'http://localhost',
+                'test.png',
+                true,
+                null,
+                '<img src="http://localhost/test.png" alt="" />',
+            ],
+            [
+                'http://localhost',
+                'test.png',
+                false,
+                '{{media url=&quot;/test.png&quot;}}',
+                '<img src="{{media url=&quot;/test.png&quot;}}" alt="" />',
+            ],
         ];
     }
 
@@ -450,25 +495,29 @@ public function testGetImageHtmlDeclaration($baseUrl, $fileName, $isUsingStaticU
 
         $this->backendDataMock->expects($this->any())
             ->method('getUrl')
-            ->with('cms/wysiwyg/directive', ['___directive' => $directive])
+            ->with('cms/wysiwyg/directive', ['___directive' => $directive, '_escape_params' => false])
             ->willReturn($directive);
 
         $this->assertEquals($expectedHtml, $this->imagesHelper->getImageHtmlDeclaration($fileName));
     }
 
+    /**
+     * @return array
+     */
     public function providerGetImageHtmlDeclaration()
     {
         return [
             ['http://localhost', 'test.png', true, 'http://localhost/test.png'],
-            ['http://localhost', 'test.png', false, '{{media url="/test.png"}}']
+            ['http://localhost', 'test.png', false, '{{media url="/test.png"}}'],
         ];
     }
 
     /**
      * @param string $baseUrl
      * @param bool $isUsingStaticUrls
+     * @param string|null $escapedValue
      */
-    protected function generalSettingsGetImageHtmlDeclaration($baseUrl, $isUsingStaticUrls)
+    protected function generalSettingsGetImageHtmlDeclaration($baseUrl, $isUsingStaticUrls, $escapedValue = null)
     {
         $storeId = 1;
         $this->imagesHelper->setStoreId($storeId);
@@ -481,6 +530,10 @@ protected function generalSettingsGetImageHtmlDeclaration($baseUrl, $isUsingStat
             ->method('getStore')
             ->willReturn($this->storeMock);
 
+        if ($escapedValue) {
+            $this->escaperMock->expects($this->once())->method('escapeHtml')->willReturn($escapedValue);
+        }
+
         $this->generalSettingsIsUsingStaticUrlsAllowed($isUsingStaticUrls);
     }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/BlockTest.php b/app/code/Magento/Cms/Test/Unit/Model/BlockTest.php
new file mode 100644
index 0000000000000..448112b228a0d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/BlockTest.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model;
+
+use Magento\Cms\Model\Block;
+use Magento\Cms\Model\ResourceModel\Block as BlockResource;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * @covers \Magento\Cms\Model\Block
+ */
+class BlockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var Block
+     */
+    private $blockModel;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManagerMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var BlockResource|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resourceMock = $this->createMock(BlockResource::class);
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
+        $this->contextMock = $this->createMock(Context::class);
+        $this->contextMock->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManagerMock);
+        $this->objectManager = new ObjectManager($this);
+        $this->blockModel = $this->objectManager->getObject(
+            Block::class,
+            [
+                'context' => $this->contextMock,
+                'resource' => $this->resourceMock,
+            ]
+        );
+    }
+
+    /**
+     * Test beforeSave method
+     *
+     * @return void
+     *
+     * @throws LocalizedException
+     */
+    public function testBeforeSave()
+    {
+        $blockId = 7;
+        $this->blockModel->setData(Block::BLOCK_ID, $blockId);
+        $this->blockModel->setData(Block::CONTENT, 'test');
+        $this->objectManager->setBackwardCompatibleProperty($this->blockModel, '_hasDataChanges', true);
+        $this->eventManagerMock->expects($this->atLeastOnce())->method('dispatch');
+        $expected = $this->blockModel;
+        $actual = $this->blockModel->beforeSave();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test beforeSave method
+     *
+     * @return void
+     *
+     * @throws LocalizedException
+     */
+    public function testBeforeSaveWithException()
+    {
+        $blockId = 10;
+        $this->blockModel->setData(Block::BLOCK_ID, $blockId);
+        $this->blockModel->setData(Block::CONTENT, 'Test block_id="' . $blockId . '".');
+        $this->objectManager->setBackwardCompatibleProperty($this->blockModel, '_hasDataChanges', false);
+        $this->eventManagerMock->expects($this->never())->method('dispatch');
+        $this->expectException(LocalizedException::class);
+        $this->blockModel->beforeSave();
+    }
+
+    /**
+     * Test getIdentities method
+     *
+     * @return void
+     */
+    public function testGetIdentities()
+    {
+        $result = $this->blockModel->getIdentities();
+        self::assertInternalType('array', $result);
+    }
+
+    /**
+     * Test getId method
+     *
+     * @return void
+     */
+    public function testGetId()
+    {
+        $blockId = 12;
+        $this->blockModel->setData(Block::BLOCK_ID, $blockId);
+        $expected = $blockId;
+        $actual = $this->blockModel->getId();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test getIdentifier method
+     *
+     * @return void
+     */
+    public function testGetIdentifier()
+    {
+        $identifier = 'test01';
+        $this->blockModel->setData(Block::IDENTIFIER, $identifier);
+        $expected = $identifier;
+        $actual = $this->blockModel->getIdentifier();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test getTitle method
+     *
+     * @return void
+     */
+    public function testGetTitle()
+    {
+        $title = 'test02';
+        $this->blockModel->setData(Block::TITLE, $title);
+        $expected = $title;
+        $actual = $this->blockModel->getTitle();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test getContent method
+     *
+     * @return void
+     */
+    public function testGetContent()
+    {
+        $content = 'test03';
+        $this->blockModel->setData(Block::CONTENT, $content);
+        $expected = $content;
+        $actual = $this->blockModel->getContent();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test getCreationTime method
+     *
+     * @return void
+     */
+    public function testGetCreationTime()
+    {
+        $creationTime = 'test04';
+        $this->blockModel->setData(Block::CREATION_TIME, $creationTime);
+        $expected = $creationTime;
+        $actual = $this->blockModel->getCreationTime();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test getUpdateTime method
+     *
+     * @return void
+     */
+    public function testGetUpdateTime()
+    {
+        $updateTime = 'test05';
+        $this->blockModel->setData(Block::UPDATE_TIME, $updateTime);
+        $expected = $updateTime;
+        $actual = $this->blockModel->getUpdateTime();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test isActive method
+     *
+     * @return void
+     */
+    public function testIsActive()
+    {
+        $isActive = true;
+        $this->blockModel->setData(Block::IS_ACTIVE, $isActive);
+        $result = $this->blockModel->isActive();
+        self::assertTrue($result);
+    }
+
+    /**
+     * Test setId method
+     *
+     * @return void
+     */
+    public function testSetId()
+    {
+        $blockId = 15;
+        $this->blockModel->setId($blockId);
+        $expected = $blockId;
+        $actual = $this->blockModel->getData(Block::BLOCK_ID);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setIdentifier method
+     *
+     * @return void
+     */
+    public function testSetIdentifier()
+    {
+        $identifier = 'test06';
+        $this->blockModel->setIdentifier($identifier);
+        $expected = $identifier;
+        $actual = $this->blockModel->getData(Block::IDENTIFIER);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setTitle method
+     *
+     * @return void
+     */
+    public function testSetTitle()
+    {
+        $title = 'test07';
+        $this->blockModel->setTitle($title);
+        $expected = $title;
+        $actual = $this->blockModel->getData(Block::TITLE);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setContent method
+     *
+     * @return void
+     */
+    public function testSetContent()
+    {
+        $content = 'test08';
+        $this->blockModel->setContent($content);
+        $expected = $content;
+        $actual = $this->blockModel->getData(Block::CONTENT);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setCreationTime method
+     *
+     * @return void
+     */
+    public function testSetCreationTime()
+    {
+        $creationTime = 'test09';
+        $this->blockModel->setCreationTime($creationTime);
+        $expected = $creationTime;
+        $actual = $this->blockModel->getData(Block::CREATION_TIME);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setUpdateTime method
+     *
+     * @return void
+     */
+    public function testSetUpdateTime()
+    {
+        $updateTime = 'test10';
+        $this->blockModel->setUpdateTime($updateTime);
+        $expected = $updateTime;
+        $actual = $this->blockModel->getData(Block::UPDATE_TIME);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test setIsActive method
+     *
+     * @return void
+     */
+    public function testSetIsActive()
+    {
+        $this->blockModel->setIsActive(false);
+        $result = $this->blockModel->getData(Block::IS_ACTIVE);
+        self::assertFalse($result);
+    }
+
+    /**
+     * Test getStores method
+     *
+     * @return void
+     */
+    public function testGetStores()
+    {
+        $stores = [1, 4, 9];
+        $this->blockModel->setData('stores', $stores);
+        $expected = $stores;
+        $actual = $this->blockModel->getStores();
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test getAvailableStatuses method
+     *
+     * @return void
+     */
+    public function testGetAvailableStatuses()
+    {
+        $result = $this->blockModel->getAvailableStatuses();
+        self::assertInternalType('array', $result);
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Config/Source/BlockTest.php b/app/code/Magento/Cms/Test/Unit/Model/Config/Source/BlockTest.php
new file mode 100644
index 0000000000000..b6a91e9f56b30
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/Config/Source/BlockTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\Config\Source;
+
+/**
+ * Class BlockTest
+ */
+class BlockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactory;
+
+    /**
+     * @var \Magento\Cms\Model\Config\Source\Block
+     */
+    protected $block;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->collectionFactory = $this->createPartialMock(
+            \Magento\Cms\Model\ResourceModel\Block\CollectionFactory::class,
+            ['create']
+        );
+
+        $this->block = $objectManager->getObject(
+            \Magento\Cms\Model\Config\Source\Block::class,
+            [
+                'collectionFactory' => $this->collectionFactory,
+            ]
+        );
+    }
+
+    /**
+     * Run test toOptionArray method
+     *
+     * @return void
+     */
+    public function testToOptionArray()
+    {
+        $blockCollectionMock = $this->createMock(\Magento\Cms\Model\ResourceModel\Block\Collection::class);
+
+        $this->collectionFactory->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($blockCollectionMock));
+
+        $blockCollectionMock->expects($this->once())
+            ->method('toOptionIdArray')
+            ->will($this->returnValue('return-value'));
+
+        $this->assertEquals('return-value', $this->block->toOptionArray());
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Model/GetUtilityPageIdentifiersTest.php b/app/code/Magento/Cms/Test/Unit/Model/GetUtilityPageIdentifiersTest.php
new file mode 100644
index 0000000000000..f4b744d469c55
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/GetUtilityPageIdentifiersTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Test\Unit\Model;
+
+use Magento\Cms\Model\GetUtilityPageIdentifiers;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for GetUtilityPageIdentifiers model.
+ */
+class GetUtilityPageIdentifiersTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var GetUtilityPageIdentifiers
+     */
+    private $model;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->model = $objectManager->getObject(
+            GetUtilityPageIdentifiers::class,
+            [
+                'scopeConfig' => $this->scopeConfig,
+            ]
+        );
+    }
+
+    /**
+     * Test GetUtilityPageIdentifiers::execute() will read config for getting correct routes.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $cmsHomePage = 'testCmsHomePage';
+        $cmsNoRoute = 'testCmsNoRoute';
+        $cmsNoCookies = 'testCmsNoCookies';
+        $this->scopeConfig->expects($this->exactly(3))
+            ->method('getValue')
+            ->withConsecutive(
+                [$this->identicalTo('web/default/cms_home_page'), $this->identicalTo(ScopeInterface::SCOPE_STORE)],
+                [$this->identicalTo('web/default/cms_no_route'), $this->identicalTo(ScopeInterface::SCOPE_STORE)],
+                [$this->identicalTo('web/default/cms_no_cookies'), $this->identicalTo(ScopeInterface::SCOPE_STORE)]
+            )->willReturnOnConsecutiveCalls(
+                $cmsHomePage,
+                $cmsNoRoute,
+                $cmsNoCookies
+            );
+        $this->assertSame([$cmsHomePage, $cmsNoRoute, $cmsNoCookies], $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/CollectionTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/CollectionTest.php
index b9b0d6f772c62..26b5d74ffb961 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/CollectionTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/CollectionTest.php
@@ -119,6 +119,9 @@ public function testAfterLoad($item, $storesData)
         $this->assertEquals($expectedResult[$item->getId()], $item->getStoreId());
     }
 
+    /**
+     * @return array
+     */
     public function getItemsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/CollectionTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/CollectionTest.php
index dd31650cb3a3a..6d45e7bf6ab1d 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/CollectionTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/CollectionTest.php
@@ -119,6 +119,9 @@ public function testAfterLoad($item, $storesData)
         $this->assertEquals($expectedResult[$item->getId()], $item->getStoreId());
     }
 
+    /**
+     * @return array
+     */
     public function getItemsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
index 009a740305a82..09476f291fb06 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
@@ -62,4 +62,20 @@ public function testMediaDirective()
             ->willReturn($baseMediaDir);
         $this->assertEquals($expectedResult, $this->filter->mediaDirective($construction));
     }
+
+    public function testMediaDirectiveWithEncodedQuotes()
+    {
+        $baseMediaDir = 'pub/media';
+        $construction = [
+            '{{media url=&quot;wysiwyg/image.jpg&quot;}}',
+            'media',
+            ' url=&quot;wysiwyg/image.jpg&quot;'
+        ];
+        $expectedResult = 'pub/media/wysiwyg/image.jpg';
+
+        $this->storeMock->expects($this->once())
+            ->method('getBaseMediaDir')
+            ->willReturn($baseMediaDir);
+        $this->assertEquals($expectedResult, $this->filter->mediaDirective($construction));
+    }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
index bcd943fed1553..b7825ce49c20f 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
@@ -66,6 +66,11 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     protected $filesystemMock;
 
+    /**
+     * @var \Magento\Cms\Model\Wysiwyg\CompositeConfigProvider
+     */
+    private $configProvider;
+
     /**
      * @var array
      */
@@ -105,8 +110,28 @@ protected function setUp()
             'width' => 1200,
             'height' => 800,
         ];
-
+        $defaultConfigProvider = new \Magento\Cms\Model\WysiwygDefaultConfig();
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $configProviderFactory = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\ConfigProviderFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configProviderFactory->expects($this->any())->method('create')->willReturn($defaultConfigProvider);
+        $this->configProvider = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\CompositeConfigProvider::class)
+            ->enableOriginalConstructor()
+            ->setConstructorArgs(
+                [
+                    'activeEditor' => $this->getMockBuilder(\Magento\Ui\Block\Wysiwyg\ActiveEditor::class)
+                        ->disableOriginalConstructor()->getMock(),
+                    'configProviderFactory' => $configProviderFactory,
+                    'variablePluginConfigProvider' => ['default' => \Magento\Cms\Model\WysiwygDefaultConfig::class],
+                    'widgetPluginConfigProvider' => ['default' => \Magento\Cms\Model\WysiwygDefaultConfig::class],
+                    'wysiwygConfigPostProcessor' => ['default' => \Magento\Cms\Model\WysiwygDefaultConfig::class],
+                    'galleryConfigProvider' => ['default' => \Magento\Cms\Model\WysiwygDefaultConfig::class],
+                ]
+            )
+            ->setMethods(['processVariableConfig', 'processWidgetConfig'])
+            ->getMock();
+
         $this->wysiwygConfig = $objectManager->getObject(
             \Magento\Cms\Model\Wysiwyg\Config::class,
             [
@@ -119,6 +144,7 @@ protected function setUp()
                 'windowSize' => $this->windowSize,
                 'storeManager' => $this->storeManagerMock,
                 'filesystem' => $this->filesystemMock,
+                'configProvider' => $this->configProvider
             ]
         );
     }
@@ -133,14 +159,6 @@ protected function setUp()
      */
     public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
     {
-        $wysiwygPluginSettings = [
-            'wysiwygPluginSettings' => 'wysiwyg is here',
-        ];
-
-        $pluginSettings = [
-            'pluginSettings' => 'plugins are here',
-        ];
-
         $this->backendUrlMock->expects($this->atLeastOnce())
             ->method('getUrl')
             ->withConsecutive(
@@ -165,22 +183,25 @@ public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
             ->method('isAllowed')
             ->with('Magento_Cms::media_gallery')
             ->willReturn($isAuthorizationAllowed);
-        $this->variableConfigMock->expects($this->any())
-            ->method('getWysiwygPluginSettings')
-            ->willReturn($wysiwygPluginSettings);
-        $this->widgetConfigMock->expects($this->any())
-            ->method('getPluginSettings')
-            ->willReturn($pluginSettings);
+        if ($data['add_variables']) {
+            $this->configProvider->expects($this->once())
+                ->method('processVariableConfig');
+        }
+        if ($data['add_widgets']) {
+            $this->configProvider->expects($this->once())
+                ->method('processWidgetConfig');
+        }
 
         $config = $this->wysiwygConfig->getConfig($data);
         $this->assertInstanceOf(\Magento\Framework\DataObject::class, $config);
         $this->assertEquals($expectedResults[0], $config->getData('someData'));
-        $this->assertEquals($expectedResults[1], $config->getData('wysiwygPluginSettings'));
-        $this->assertEquals($expectedResults[2], $config->getData('pluginSettings'));
         $this->assertEquals('localhost/pub/static/', $config->getData('baseStaticUrl'));
         $this->assertEquals('localhost/pub/static/', $config->getData('baseStaticDefaultUrl'));
     }
 
+    /**
+     * @return array
+     */
     public function getConfigDataProvider()
     {
         return [
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index a2178489e1298..309f08a54aab6 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -107,6 +107,13 @@ class StorageTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManagerHelper;
 
+    private $allowedImageExtensions = [
+        'jpg' => 'image/jpg',
+        'jpeg' => 'image/jpeg',
+        'png' => 'image/png',
+        'gif' => 'image/png',
+    ];
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -114,20 +121,13 @@ class StorageTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
-        $this->driverMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Filesystem\DriverInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['getRealPath']
-        );
-        $this->driverMock->expects($this->any())->method('getRealPath')->will($this->returnArgument(0));
+        $this->driverMock = $this->getMockBuilder(\Magento\Framework\Filesystem\DriverInterface::class)
+            ->setMethods(['getRealPathSafety'])
+            ->getMockForAbstractClass();
 
         $this->directoryMock = $this->createPartialMock(
             \Magento\Framework\Filesystem\Directory\Write::class,
-            ['delete', 'getDriver', 'create']
+            ['delete', 'getDriver', 'create', 'getRelativePath', 'isExist', 'isFile']
         );
         $this->directoryMock->expects(
             $this->any()
@@ -151,7 +151,7 @@ protected function setUp()
         $this->adapterFactoryMock = $this->createMock(\Magento\Framework\Image\AdapterFactory::class);
         $this->imageHelperMock = $this->createPartialMock(
             \Magento\Cms\Helper\Wysiwyg\Images::class,
-            ['getStorageRoot']
+            ['getStorageRoot', 'getCurrentPath']
         );
         $this->imageHelperMock->expects(
             $this->any()
@@ -182,12 +182,28 @@ protected function setUp()
         $this->uploaderFactoryMock = $this->getMockBuilder(\Magento\MediaStorage\Model\File\UploaderFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->sessionMock = $this->createMock(\Magento\Backend\Model\Session::class);
+        $this->sessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
+            ->setMethods(
+                [
+                    'getCurrentPath',
+                    'getName',
+                    'getSessionId',
+                    'getCookieLifetime',
+                    'getCookiePath',
+                    'getCookieDomain',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->backendUrlMock = $this->createMock(\Magento\Backend\Model\Url::class);
 
         $this->coreFileStorageMock = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $allowedExtensions = [
+            'allowed' => $this->allowedImageExtensions,
+            'image_allowed' => $this->allowedImageExtensions,
+        ];
 
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -209,8 +225,9 @@ protected function setUp()
                 'resizeParameters' => $this->resizeParameters,
                 'dirs' => [
                     'exclude' => [],
-                    'include' => []
-                ]
+                    'include' => [],
+                ],
+                'extensions' => $allowedExtensions,
             ]
         );
     }
@@ -233,25 +250,23 @@ public function testGetResizeHeight()
 
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Directory /storage/some/another/dir is not under storage root path.
      */
     public function testDeleteDirectoryOverRoot()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('Directory %s is not under storage root path.', self::INVALID_DIRECTORY_OVER_ROOT)
-        );
+        $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::INVALID_DIRECTORY_OVER_ROOT);
     }
 
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage We can't delete root directory /storage/root/dir right now.
      */
     public function testDeleteRootDirectory()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR)
-        );
+        $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR);
     }
 
@@ -306,8 +321,8 @@ public function testGetDirsCollection($exclude, $include, $fileNames, $expectedR
                 'resizeParameters' => $this->resizeParameters,
                 'dirs' => [
                     'exclude' => $exclude,
-                    'include' => $include
-                ]
+                    'include' => $include,
+                ],
             ]
         );
 
@@ -332,11 +347,11 @@ public function dirsCollectionDataProvider()
         return [
             [
                 'exclude' => [
-                    ['name' => 'dress']
+                    ['name' => 'dress'],
                 ],
                 'include' => [],
                 'filenames' => [],
-                'expectRemoveKeys' => []
+                'expectRemoveKeys' => [],
             ],
             [
                 'exclude' => [],
@@ -344,36 +359,36 @@ public function dirsCollectionDataProvider()
                 'filenames' => [
                     '/dress',
                 ],
-                'expectRemoveKeys' => []
+                'expectRemoveKeys' => [],
             ],
             [
                 'exclude' => [
-                    ['name' => 'dress']
+                    ['name' => 'dress'],
                 ],
                 'include' => [],
                 'filenames' => [
                     '/collection',
                 ],
-                'expectRemoveKeys' => []
+                'expectRemoveKeys' => [],
             ],
             [
                 'exclude' => [
                     ['name' => 'gear', 'regexp' => 1],
                     ['name' => 'home', 'regexp' => 1],
                     ['name' => 'collection'],
-                    ['name' => 'dress']
+                    ['name' => 'dress'],
                 ],
                 'include' => [
                     ['name' => 'home', 'regexp' => 1],
-                    ['name' => 'collection']
+                    ['name' => 'collection'],
                 ],
                 'filenames' => [
                     '/dress',
                     '/collection',
-                    '/gear'
+                    '/gear',
                 ],
-                'expectRemoveKeys' => [[0], [2]]
-            ]
+                'expectRemoveKeys' => [[0], [2]],
+            ],
         ];
     }
 
@@ -415,4 +430,76 @@ protected function generalTestGetDirsCollection($path, $collectionArray = [], $e
 
         $this->imagesStorage->getDirsCollection($path);
     }
+
+    public function testUploadFile()
+    {
+        $targetPath = '/target/path';
+        $fileName = 'image.gif';
+        $realPath = $targetPath . '/' . $fileName;
+        $thumbnailTargetPath = self::STORAGE_ROOT_DIR . '/.thumbs';
+        $thumbnailDestination = $thumbnailTargetPath . '/' . $fileName;
+        $type = 'image';
+        $result = [
+            'result'
+        ];
+        $uploader = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Uploader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'setAllowedExtensions',
+                    'setAllowRenameFiles',
+                    'setFilesDispersion',
+                    'checkMimeType',
+                    'save',
+                    'getUploadedFileName',
+                ]
+            )
+            ->getMock();
+        $this->uploaderFactoryMock->expects($this->atLeastOnce())->method('create')->with(['fileId' => 'image'])
+            ->willReturn($uploader);
+        $uploader->expects($this->atLeastOnce())->method('setAllowedExtensions')
+            ->with(array_keys($this->allowedImageExtensions))->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('setAllowRenameFiles')->with(true)->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('setFilesDispersion')->with(false)
+            ->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('checkMimeType')
+            ->with(array_values($this->allowedImageExtensions))->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('save')->with($targetPath)->willReturn($result);
+        $uploader->expects($this->atLeastOnce())->method('getUploadedFileName')->willReturn($fileName);
+
+        $this->directoryMock->expects($this->atLeastOnce())->method('getRelativePath')->willReturnMap(
+            [
+                [$realPath, $realPath],
+                [$thumbnailTargetPath, $thumbnailTargetPath],
+                [$thumbnailDestination, $thumbnailDestination],
+            ]
+        );
+        $this->directoryMock->expects($this->atLeastOnce())->method('isFile')
+            ->willReturnMap(
+                [
+                    [$realPath, true],
+                    [$thumbnailDestination, true],
+                ]
+            );
+        $this->directoryMock->expects($this->atLeastOnce())->method('isExist')
+            ->willReturnMap(
+                [
+                    [$realPath, true],
+                    [$thumbnailTargetPath, true],
+                ]
+            );
+
+        $image = $this->getMockBuilder(\Magento\Catalog\Model\Product\Image::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['open', 'keepAspectRatio', 'resize', 'save'])
+            ->getMock();
+        $image->expects($this->atLeastOnce())->method('open')->with($realPath);
+        $image->expects($this->atLeastOnce())->method('keepAspectRatio')->with(true);
+        $image->expects($this->atLeastOnce())->method('resize')->with(100, 50);
+        $image->expects($this->atLeastOnce())->method('save')->with($thumbnailDestination);
+
+        $this->adapterFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($image);
+
+        $this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
+    }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Observer/NoCookiesObserverTest.php b/app/code/Magento/Cms/Test/Unit/Observer/NoCookiesObserverTest.php
index 8c09d42ec556e..cbb13c6f254eb 100644
--- a/app/code/Magento/Cms/Test/Unit/Observer/NoCookiesObserverTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Observer/NoCookiesObserverTest.php
@@ -139,6 +139,9 @@ public function testNoCookies($pageUrl)
         $this->assertEquals($this->noCookiesObserver, $this->noCookiesObserver->execute($this->observerMock));
     }
 
+    /**
+     * @return array
+     */
     public function noCookiesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
index 3dcf6c4a3fce0..3095abef7bbe3 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
@@ -95,6 +95,7 @@ public function testPrepareDataSource()
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
                         ],
+                        'post' => true
                     ]
                 ],
             ]
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
index b0cc1bf061a48..9b3165a2c5517 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
@@ -70,6 +70,7 @@ public function testPrepareItemsByPageId()
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
                         ],
+                        'post' => true
                     ]
                 ],
             ]
diff --git a/app/code/Magento/Cms/Ui/Component/AddFilterInterface.php b/app/code/Magento/Cms/Ui/Component/AddFilterInterface.php
new file mode 100644
index 0000000000000..406b40fbc1647
--- /dev/null
+++ b/app/code/Magento/Cms/Ui/Component/AddFilterInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Ui\Component;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+
+/**
+ * Provides extension point to add additional filters to search criteria.
+ */
+interface AddFilterInterface
+{
+    /**
+     * Adds custom filter to search criteria builder based on received filter.
+     *
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param Filter $filter
+     * @return void
+     */
+    public function addFilter(SearchCriteriaBuilder $searchCriteriaBuilder, Filter $filter);
+}
diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
index 3298d66b0b877..5fc9c5a896037 100644
--- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Ui\Component;
 
+use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\App\ObjectManager;
@@ -19,6 +20,11 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      */
     private $authorization;
 
+    /**
+     * @var AddFilterInterface[]
+     */
+    private $additionalFilterPool;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -29,6 +35,8 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      * @param FilterBuilder $filterBuilder
      * @param array $meta
      * @param array $data
+     * @param array $additionalFilterPool
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         $name,
@@ -39,7 +47,8 @@ public function __construct(
         RequestInterface $request,
         FilterBuilder $filterBuilder,
         array $meta = [],
-        array $data = []
+        array $data = [],
+        array $additionalFilterPool = []
     ) {
         parent::__construct(
             $name,
@@ -54,6 +63,7 @@ public function __construct(
         );
 
         $this->meta = array_replace_recursive($meta, $this->prepareMetadata());
+        $this->additionalFilterPool = $additionalFilterPool;
     }
 
     /**
@@ -95,4 +105,16 @@ public function prepareMetadata()
 
         return $metadata;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFilter(Filter $filter)
+    {
+        if (!empty($this->additionalFilterPool[$filter->getField()])) {
+            $this->additionalFilterPool[$filter->getField()]->addFilter($this->searchCriteriaBuilder, $filter);
+        } else {
+            parent::addFilter($filter);
+        }
+    }
 }
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
index 60b9f34d29ae6..f68ef35e534f3 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -55,10 +55,7 @@ public function __construct(
     }
 
     /**
-     * Prepare Data Source
-     *
-     * @param array $dataSource
-     * @return array
+     * @inheritDoc
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -87,7 +84,8 @@ public function prepareDataSource(array $dataSource)
                             'confirm' => [
                                 'title' => __('Delete %1', $title),
                                 'message' => __('Are you sure you want to delete a %1 record?', $title)
-                            ]
+                            ],
+                            'post' => true
                         ]
                     ];
                 }
@@ -99,6 +97,7 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * Get instance of escaper
+     *
      * @return Escaper
      * @deprecated 101.0.7
      */
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
index ea6882e21c85f..26d31456bf61d 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
@@ -67,10 +67,7 @@ public function __construct(
     }
 
     /**
-     * Prepare Data Source
-     *
-     * @param array $dataSource
-     * @return array
+     * @inheritDoc
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -89,7 +86,8 @@ public function prepareDataSource(array $dataSource)
                         'confirm' => [
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
-                        ]
+                        ],
+                        'post' => true
                     ];
                 }
                 if (isset($item['identifier'])) {
@@ -110,6 +108,7 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * Get instance of escaper
+     *
      * @return Escaper
      * @deprecated 101.0.7
      */
diff --git a/app/code/Magento/Cms/Ui/Component/Page/FulltextFilter.php b/app/code/Magento/Cms/Ui/Component/Page/FulltextFilter.php
new file mode 100644
index 0000000000000..9b0c69a4f10c4
--- /dev/null
+++ b/app/code/Magento/Cms/Ui/Component/Page/FulltextFilter.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Ui\Component\Page;
+
+use Magento\Cms\Ui\Component\AddFilterInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+
+/**
+ * Adds fulltext filter for CMS Page title attribute.
+ */
+class FulltextFilter implements AddFilterInterface
+{
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @param FilterBuilder $filterBuilder
+     */
+    public function __construct(FilterBuilder $filterBuilder)
+    {
+        $this->filterBuilder = $filterBuilder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFilter(SearchCriteriaBuilder $searchCriteriaBuilder, Filter $filter)
+    {
+        $titleFilter = $this->filterBuilder->setField('title')
+            ->setValue(sprintf('%%%s%%', $filter->getValue()))
+            ->setConditionType('like')
+            ->create();
+        $searchCriteriaBuilder->addFilter($titleFilter);
+    }
+}
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index d6842ccc67169..f051271c05051 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -5,23 +5,22 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-email": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-variable": "100.3.*",
-        "magento/module-widget": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-email": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-variable": "*",
+        "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-cms-sample-data": "Sample Data version:100.3.*"
+        "magento/module-cms-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "101.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cms/etc/adminhtml/di.xml b/app/code/Magento/Cms/etc/adminhtml/di.xml
index 8a1a4b24258d7..98a8ff6e9ec91 100644
--- a/app/code/Magento/Cms/etc/adminhtml/di.xml
+++ b/app/code/Magento/Cms/etc/adminhtml/di.xml
@@ -12,4 +12,44 @@
             <argument name="frontendUrlBuilder" xsi:type="object">Magento\Framework\Url</argument>
         </arguments>
     </type>
+    <type name="Magento\Cms\Model\Wysiwyg\CompositeConfigProvider">
+        <arguments>
+            <argument name="variablePluginConfigProvider" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Variable\Model\Variable\ConfigProvider</item>
+            </argument>
+            <argument name="widgetPluginConfigProvider" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Widget\Model\Widget\Config</item>
+            </argument>
+            <argument name="wysiwygConfigPostProcessor" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Cms\Model\Wysiwyg\DefaultConfigProvider</item>
+            </argument>
+            <argument name="galleryConfigProvider" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Cms\Model\Wysiwyg\Gallery\DefaultConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Cms\Model\Config\Source\Wysiwyg\Editor">
+        <arguments>
+            <argument name="adapterOptions" xsi:type="array">
+                <item name="tinymce4" xsi:type="array">
+                    <item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</item>
+                    <item name="label" xsi:type="string" translatable="true">TinyMCE 4</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Cms\Model\Wysiwyg\Gallery\DefaultConfigProvider">
+        <arguments>
+            <argument name="currentTreePath" xsi:type="const">\Magento\Cms\Model\Wysiwyg\Config::IMAGE_DIRECTORY</argument>
+            <argument name="windowSize" xsi:type="array">
+                <item name="height" xsi:type="number">600</item>
+                <item name="width" xsi:type="number">1000</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Cms\Ui\Component\Form\Field\PageLayout" type="Magento\Ui\Component\Form\Field\DefaultValue">
+        <arguments>
+            <argument name="path" xsi:type="string">web/default_layouts/default_cms_layout</argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/app/code/Magento/Cms/etc/adminhtml/system.xml b/app/code/Magento/Cms/etc/adminhtml/system.xml
index c3cfb6077ac4a..20d543440565b 100644
--- a/app/code/Magento/Cms/etc/adminhtml/system.xml
+++ b/app/code/Magento/Cms/etc/adminhtml/system.xml
@@ -41,6 +41,12 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
+            <group id="default_layouts">
+                <field id="default_cms_layout" translate="label" type="select" sortOrder="30" showInDefault="1">
+                    <label>Default Page Layout</label>
+                    <source_model>Magento\Cms\Model\Page\Source\PageLayout</source_model>
+                </field>
+            </group>
         </section>
         <section id="cms" translate="label" type="text" sortOrder="1001" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Content Management</label>
diff --git a/app/code/Magento/Cms/etc/config.xml b/app/code/Magento/Cms/etc/config.xml
index 60e54c8f223b7..7090bb7a1fd25 100644
--- a/app/code/Magento/Cms/etc/config.xml
+++ b/app/code/Magento/Cms/etc/config.xml
@@ -16,6 +16,9 @@
                 <no_route>cms/noroute/index</no_route>
                 <show_cms_breadcrumbs>1</show_cms_breadcrumbs>
             </default>
+            <default_layouts>
+                <default_cms_layout>1column</default_cms_layout>
+            </default_layouts>
         </web>
         <cms>
             <wysiwyg>
diff --git a/app/code/Magento/Cms/etc/db_schema.xml b/app/code/Magento/Cms/etc/db_schema.xml
new file mode 100644
index 0000000000000..1e64c905badd8
--- /dev/null
+++ b/app/code/Magento/Cms/etc/db_schema.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="cms_block" resource="default" engine="innodb" comment="CMS Block Table">
+        <column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Block Title"/>
+        <column xsi:type="varchar" name="identifier" nullable="false" length="255" comment="Block String Identifier"/>
+        <column xsi:type="mediumtext" name="content" nullable="true" comment="Block Content"/>
+        <column xsi:type="timestamp" name="creation_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Block Creation Time"/>
+        <column xsi:type="timestamp" name="update_time" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Block Modification Time"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="1" comment="Is Block Active"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="block_id"/>
+        </constraint>
+        <index referenceId="CMS_BLOCK_TITLE_IDENTIFIER_CONTENT" indexType="fulltext">
+            <column name="title"/>
+            <column name="identifier"/>
+            <column name="content"/>
+        </index>
+    </table>
+    <table name="cms_block_store" resource="default" engine="innodb" comment="CMS Block To Store Linkage Table">
+        <column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="false"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="block_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CMS_BLOCK_STORE_BLOCK_ID_CMS_BLOCK_BLOCK_ID" table="cms_block_store"
+                    column="block_id" referenceTable="cms_block" referenceColumn="block_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CMS_BLOCK_STORE_STORE_ID_STORE_STORE_ID" table="cms_block_store"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="CMS_BLOCK_STORE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="cms_page" resource="default" engine="innodb" comment="CMS Page Table">
+        <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Page Title"/>
+        <column xsi:type="varchar" name="page_layout" nullable="true" length="255" comment="Page Layout"/>
+        <column xsi:type="text" name="meta_keywords" nullable="true" comment="Page Meta Keywords"/>
+        <column xsi:type="text" name="meta_description" nullable="true" comment="Page Meta Description"/>
+        <column xsi:type="varchar" name="identifier" nullable="true" length="100" comment="Page String Identifier"/>
+        <column xsi:type="varchar" name="content_heading" nullable="true" length="255" comment="Page Content Heading"/>
+        <column xsi:type="mediumtext" name="content" nullable="true" comment="Page Content"/>
+        <column xsi:type="timestamp" name="creation_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Page Creation Time"/>
+        <column xsi:type="timestamp" name="update_time" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Page Modification Time"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="1" comment="Is Page Active"/>
+        <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Page Sort Order"/>
+        <column xsi:type="text" name="layout_update_xml" nullable="true" comment="Page Layout Update Content"/>
+        <column xsi:type="varchar" name="custom_theme" nullable="true" length="100" comment="Page Custom Theme"/>
+        <column xsi:type="varchar" name="custom_root_template" nullable="true" length="255"
+                comment="Page Custom Template"/>
+        <column xsi:type="text" name="custom_layout_update_xml" nullable="true"
+                comment="Page Custom Layout Update Content"/>
+        <column xsi:type="date" name="custom_theme_from" comment="Page Custom Theme Active From Date"/>
+        <column xsi:type="date" name="custom_theme_to" comment="Page Custom Theme Active To Date"/>
+        <column xsi:type="varchar" name="meta_title" nullable="true" length="255" comment="Page Meta Title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id"/>
+        </constraint>
+        <index referenceId="CMS_PAGE_IDENTIFIER" indexType="btree">
+            <column name="identifier"/>
+        </index>
+        <index referenceId="CMS_PAGE_TITLE_META_KEYWORDS_META_DESCRIPTION_IDENTIFIER_CONTENT" indexType="fulltext">
+            <column name="title"/>
+            <column name="meta_keywords"/>
+            <column name="meta_description"/>
+            <column name="identifier"/>
+            <column name="content"/>
+        </index>
+    </table>
+    <table name="cms_page_store" resource="default" engine="innodb" comment="CMS Page To Store Linkage Table">
+        <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CMS_PAGE_STORE_PAGE_ID_CMS_PAGE_PAGE_ID" table="cms_page_store"
+                    column="page_id" referenceTable="cms_page" referenceColumn="page_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CMS_PAGE_STORE_STORE_ID_STORE_STORE_ID" table="cms_page_store"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="CMS_PAGE_STORE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Cms/etc/db_schema_whitelist.json b/app/code/Magento/Cms/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8da44baf71719
--- /dev/null
+++ b/app/code/Magento/Cms/etc/db_schema_whitelist.json
@@ -0,0 +1,77 @@
+{
+    "cms_block": {
+        "column": {
+            "block_id": true,
+            "title": true,
+            "identifier": true,
+            "content": true,
+            "creation_time": true,
+            "update_time": true,
+            "is_active": true
+        },
+        "index": {
+            "CMS_BLOCK_TITLE_IDENTIFIER_CONTENT": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "cms_block_store": {
+        "column": {
+            "block_id": true,
+            "store_id": true
+        },
+        "index": {
+            "CMS_BLOCK_STORE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CMS_BLOCK_STORE_BLOCK_ID_CMS_BLOCK_BLOCK_ID": true,
+            "CMS_BLOCK_STORE_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "cms_page": {
+        "column": {
+            "page_id": true,
+            "title": true,
+            "page_layout": true,
+            "meta_keywords": true,
+            "meta_description": true,
+            "identifier": true,
+            "content_heading": true,
+            "content": true,
+            "creation_time": true,
+            "update_time": true,
+            "is_active": true,
+            "sort_order": true,
+            "layout_update_xml": true,
+            "custom_theme": true,
+            "custom_root_template": true,
+            "custom_layout_update_xml": true,
+            "custom_theme_from": true,
+            "custom_theme_to": true,
+            "meta_title": true
+        },
+        "index": {
+            "CMS_PAGE_IDENTIFIER": true,
+            "CMS_PAGE_TITLE_META_KEYWORDS_META_DESCRIPTION_IDENTIFIER_CONTENT": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "cms_page_store": {
+        "column": {
+            "page_id": true,
+            "store_id": true
+        },
+        "index": {
+            "CMS_PAGE_STORE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CMS_PAGE_STORE_PAGE_ID_CMS_PAGE_PAGE_ID": true,
+            "CMS_PAGE_STORE_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 448d7c3996554..b6e13c63302cd 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -16,6 +16,8 @@
     <preference for="Magento\Cms\Api\Data\BlockInterface" type="Magento\Cms\Model\Block" />
     <preference for="Magento\Cms\Api\BlockRepositoryInterface" type="Magento\Cms\Model\BlockRepository" />
     <preference for="Magento\Cms\Api\PageRepositoryInterface" type="Magento\Cms\Model\PageRepository" />
+    <preference for="Magento\Ui\Component\Wysiwyg\ConfigInterface" type="Magento\Cms\Model\Wysiwyg\Config"/>
+    <preference for="Magento\Cms\Api\GetUtilityPageIdentifiersInterface" type="Magento\Cms\Model\GetUtilityPageIdentifiers" />
     <type name="Magento\Cms\Model\Wysiwyg\Config">
         <arguments>
             <argument name="windowSize" xsi:type="array">
@@ -32,29 +34,62 @@
             </argument>
             <argument name="extensions" xsi:type="array">
                 <item name="allowed" xsi:type="array">
-                    <item name="jpg" xsi:type="number">1</item>
-                    <item name="jpeg" xsi:type="number">1</item>
-                    <item name="png" xsi:type="number">1</item>
-                    <item name="gif" xsi:type="number">1</item>
+                    <item name="jpg" xsi:type="string">image/jpg</item>
+                    <item name="jpeg" xsi:type="string">image/jpeg</item>
+                    <item name="png" xsi:type="string">image/png</item>
+                    <item name="gif" xsi:type="string">image/gif</item>
                 </item>
                 <item name="image_allowed" xsi:type="array">
-                    <item name="jpg" xsi:type="number">1</item>
-                    <item name="jpeg" xsi:type="number">1</item>
-                    <item name="png" xsi:type="number">1</item>
-                    <item name="gif" xsi:type="number">1</item>
+                    <item name="jpg" xsi:type="string">image/jpg</item>
+                    <item name="jpeg" xsi:type="string">image/jpeg</item>
+                    <item name="png" xsi:type="string">image/png</item>
+                    <item name="gif" xsi:type="string">image/gif</item>
                 </item>
                 <item name="media_allowed" xsi:type="array">
-                    <item name="flv" xsi:type="number">1</item>
-                    <item name="swf" xsi:type="number">1</item>
-                    <item name="avi" xsi:type="number">1</item>
-                    <item name="mov" xsi:type="number">1</item>
-                    <item name="rm" xsi:type="number">1</item>
-                    <item name="wmv" xsi:type="number">1</item>
+                    <item name="flv" xsi:type="string">video/x-flv</item>
+                    <item name="swf" xsi:type="string">application/x-shockwave-flash</item>
+                    <item name="avi" xsi:type="string">video/x-msvideo</item>
+                    <item name="mov" xsi:type="string">video/x-sgi-movie</item>
+                    <item name="rm" xsi:type="string">application/vnd.rn-realmedia</item>
+                    <item name="wmv" xsi:type="string">video/x-ms-wmv</item>
                 </item>
             </argument>
             <argument name="dirs" xsi:type="array">
-                <item name="exclude" xsi:type="string"/>
-                <item name="include" xsi:type="string"/>
+                <item name="exclude" xsi:type="array">
+                    <item name="captcha" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+captcha[/\\]*$</item>
+                    </item>
+                    <item name="catalog/product" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+catalog[/\\]+product[/\\]*$</item>
+                    </item>
+                    <item name="customer" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+customer[/\\]*$</item>
+                    </item>
+                    <item name="downloadable" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+downloadable[/\\]*$</item>
+                    </item>
+                    <item name="import" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+import[/\\]*$</item>
+                    </item>
+                    <item name="theme" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+theme[/\\]*$</item>
+                    </item>
+                    <item name="theme_customization" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+theme_customization[/\\]*$</item>
+                    </item>
+                    <item name="tmp" xsi:type="array">
+                        <item name="regexp" xsi:type="boolean">true</item>
+                        <item name="name" xsi:type="string">pub[/\\]+media[/\\]+tmp[/\\]*$</item>
+                    </item>
+                </item>
+                <item name="include" xsi:type="array"/>
             </argument>
         </arguments>
     </type>
@@ -190,4 +225,13 @@
             <argument name="collectionProcessor" xsi:type="object">Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor</argument>
         </arguments>
     </type>
+
+    <type name="Magento\Cms\Ui\Component\DataProvider">
+        <arguments>
+            <argument name="additionalFilterPool" xsi:type="array">
+                <item name="fulltext" xsi:type="object">Magento\Cms\Ui\Component\Page\FulltextFilter</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
+
diff --git a/app/code/Magento/Cms/etc/module.xml b/app/code/Magento/Cms/etc/module.xml
index 18bd90fddfb90..d3fc2846217d9 100644
--- a/app/code/Magento/Cms/etc/module.xml
+++ b/app/code/Magento/Cms/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Cms" setup_version="2.0.2">
+    <module name="Magento_Cms" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Theme"/>
diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv
index 983493bb7732a..b34793c35d659 100644
--- a/app/code/Magento/Cms/i18n/en_US.csv
+++ b/app/code/Magento/Cms/i18n/en_US.csv
@@ -45,6 +45,7 @@ Blocks,Blocks
 "Please correct the data sent.","Please correct the data sent."
 "A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
 "You saved the block.","You saved the block."
+"You duplicated the block.","You duplicated the block."
 "Something went wrong while saving the block.","Something went wrong while saving the block."
 "The page has been deleted.","The page has been deleted."
 "We can't find a page to delete.","We can't find a page to delete."
@@ -58,6 +59,7 @@ Pages,Pages
 "Page Title","Page Title"
 "To apply changes you should fill in hidden required ""%1"" field","To apply changes you should fill in hidden required ""%1"" field"
 "You saved the page.","You saved the page."
+"You duplicated the page.","You duplicated the page."
 "The directory %1 is not writable by server.","The directory %1 is not writable by server."
 "Make sure that static block content does not reference the block itself.","Make sure that static block content does not reference the block itself."
 "CMS Block with id ""%1"" does not exist.","CMS Block with id ""%1"" does not exist."
@@ -133,7 +135,7 @@ Block,Block
 "Enable Page","Enable Page"
 Content,Content
 "Content Heading","Content Heading"
-"Search Engine Optimisation","Search Engine Optimisation"
+"Search Engine Optimization","Search Engine Optimization"
 "Meta Title","Meta Title"
 "Meta Keywords","Meta Keywords"
 "Meta Description","Meta Description"
@@ -146,6 +148,7 @@ To,To
 "New Theme","New Theme"
 "-- Please Select --","-- Please Select --"
 "New Layout","New Layout"
+"Default Page Layout","Default Page Layout"
 Disable,Disable
 Enable,Enable
 "Custom design from","Custom design from"
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml
index 1bc8828ef6c8e..6703b6c277123 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml
@@ -9,7 +9,11 @@
     <container name="root">
         <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content" name="wysiwyg_images.content" template="Magento_Cms::browser/content.phtml">
             <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree" name="wysiwyg_images.tree" template="Magento_Cms::browser/tree.phtml"/>
-            <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml"/>
+            <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml">
+                <arguments>
+                    <argument name="image_upload_config_data" xsi:type="object">Magento\Backend\Block\DataProviders\ImageUploadConfig</argument>
+                </arguments>
+            </block>
         </block>
     </container>
 </layout>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index a4c570f9d65a1..da89991869929 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -14,7 +14,13 @@ $_height = $block->getImagesHeight();
 ?>
 <?php if ($block->getFilesCount() > 0): ?>
     <?php foreach ($block->getFiles() as $file): ?>
-    <div data-row="file" class="filecnt" id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>">
+    <div
+        data-row="file"
+        class="filecnt"
+        id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>"
+        data-size="<?= $block->escapeHtmlAttr($file->getSize()) ?>"
+        data-mime-type="<?= $block->escapeHtmlAttr($file->getMimeType()) ?>"
+    >
         <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;width:<?= $block->escapeHtmlAttr($_width) ?>px;">
         <?php if ($block->getFileThumbUrl($file)):?>
             <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index 8693195449f71..414d42cb45382 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -7,6 +7,23 @@
 // @codingStandardsIgnoreFile
 
 /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
+
+$filters = $block->getConfig()->getFilters() ?? [];
+$allowedExtensions = [];
+
+foreach ($filters as $media_type) {
+    $allowedExtensions = array_merge($allowedExtensions, array_map(function ($fileExt) {
+        return ltrim($fileExt, '.*');
+    }, $media_type['files']));
+}
+
+$resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
+    ? "{action: 'resize', maxWidth: "
+        . $block->escapeHtml($block->getImageUploadMaxWidth())
+        . ", maxHeight: "
+        . $block->escapeHtml($block->getImageUploadMaxHeight())
+        . "}"
+    : "{action: 'resize'}";
 ?>
 
 <div id="<?= $block->getHtmlId() ?>" class="uploader">
@@ -28,10 +45,15 @@
 require([
     'jquery',
     'mage/template',
+    'Magento_Ui/js/lib/validation/validator',
+    'Magento_Ui/js/modal/alert',
     'jquery/file-uploader',
     'domReady!',
     'mage/translate'
-], function ($, mageTemplate) {
+], function ($, mageTemplate, validator, uiAlert) {
+    var maxFileSize = <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?>,
+        allowedExtensions = '<?= $block->escapeHtml(implode(' ', $allowedExtensions)) ?>';
+
     $('#<?= $block->getHtmlId() ?> .fileupload').fileupload({
         dataType: 'json',
         formData: {
@@ -40,17 +62,44 @@ require([
         },
         sequentialUploads: true,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-        maxFileSize: <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?>,
+        allowedExtensions: allowedExtensions,
+        maxFileSize: maxFileSize,
+        dropZone: $('#<?= $block->getHtmlId() ?>').closest('[role="dialog"]'),
         add: function (e, data) {
             var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
                 fileSize,
-                tmpl;
+                tmpl,
+                validationResult;
 
-            $.each(data.files, function (index, file) {
+            data.files = data.files.filter(function (file) {
                 fileSize = typeof file.size == "undefined" ?
                     $.mage.__('We could not detect a size.') :
                     byteConvert(file.size);
 
+                if (maxFileSize) {
+                    validationResult = validator('validate-max-size', file.size, maxFileSize);
+
+                    if (!validationResult.passed) {
+                        uiAlert({
+                            content: validationResult.message
+                        });
+
+                        return false;
+                    }
+                }
+
+                if (allowedExtensions) {
+                    validationResult = validator('validate-file-type', file.name, allowedExtensions);
+
+                    if (!validationResult.passed) {
+                        uiAlert({
+                            content: validationResult.message
+                        });
+
+                        return false;
+                    }
+                }
+
                 data.fileId = Math.random().toString(36).substr(2, 9);
 
                 tmpl = progressTmpl({
@@ -62,11 +111,15 @@ require([
                 });
 
                 $(tmpl).data('image', data).appendTo('#<?= $block->getHtmlId() ?>');
-            });
 
-            $(this).fileupload('process', data).done(function () {
-                data.submit();
+                return true;
             });
+
+            if (data.files.length) {
+                $(this).fileupload('process', data).done(function () {
+                    data.submit();
+                });
+            }
         },
         done: function (e, data) {
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
@@ -99,11 +152,9 @@ require([
             action: 'load',
             fileTypes: /^image\/(gif|jpeg|png)$/,
             maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
-        }, {
-            action: 'resize',
-            maxWidth: <?= (float) \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
-            maxHeight: <?= (float) \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
-        }, {
+        },
+        <?= /* @noEscape */ $resizeConfig ?>,
+        {
             action: 'save'
         }]
     });
diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml
index 4864f32534b9c..4b4a1a9bfe4db 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml
@@ -15,9 +15,7 @@
     </argument>
     <settings>
         <buttons>
-            <button name="save_and_continue" class="Magento\Cms\Block\Adminhtml\Block\Edit\SaveAndContinueButton"/>
             <button name="save" class="Magento\Cms\Block\Adminhtml\Block\Edit\SaveButton"/>
-            <button name="reset" class="Magento\Cms\Block\Adminhtml\Block\Edit\ResetButton"/>
             <button name="delete" class="Magento\Cms\Block\Adminhtml\Block\Edit\DeleteButton"/>
             <button name="back" class="Magento\Cms\Block\Adminhtml\Block\Edit\BackButton"/>
         </buttons>
diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
index f8c4f07bd4336..9781675a6d917 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
@@ -15,9 +15,7 @@
     </argument>
     <settings>
         <buttons>
-            <button name="save_and_continue" class="Magento\Cms\Block\Adminhtml\Page\Edit\SaveAndContinueButton"/>
             <button name="save" class="Magento\Cms\Block\Adminhtml\Page\Edit\SaveButton"/>
-            <button name="reset" class="Magento\Cms\Block\Adminhtml\Page\Edit\ResetButton"/>
             <button name="delete" class="Magento\Cms\Block\Adminhtml\Page\Edit\DeleteButton"/>
             <button name="back" class="Magento\Cms\Block\Adminhtml\Page\Edit\BackButton"/>
         </buttons>
@@ -141,7 +139,7 @@
     <fieldset name="search_engine_optimisation" sortOrder="20">
         <settings>
             <collapsible>true</collapsible>
-            <label translate="true">Search Engine Optimisation</label>
+            <label translate="true">Search Engine Optimization</label>
         </settings>
         <field name="identifier" formElement="input">
             <argument name="data" xsi:type="array">
@@ -226,7 +224,7 @@
             <collapsible>true</collapsible>
             <label translate="true">Design</label>
         </settings>
-        <field name="page_layout" formElement="select">
+        <field name="page_layout" formElement="select" class="Magento\Cms\Ui\Component\Form\Field\PageLayout">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">page</item>
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 22540ef9d0c77..9f082b2ce32ce 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 (path.length > 1) {
-                        tree.jstree('open_node', el, recursiveOpen);
+                    // if folder doesn't exist, select the last opened folder
+                    if (!folderEl.length) {
+                        tree.jstree('select_node', lastExistentFolderEl);
+
+                        return;
+                    }
+
+                    lastExistentFolderEl = folderEl;
+
+                    if (path.length) {
+                        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);
                         });
                     }
                 };
@@ -114,7 +124,7 @@ define([
                     metadata: {
                         node: codeCopy
                     },
-                    state: 'closed'
+                    state: node.state || 'closed'
                 };
             });
         }
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
new file mode 100644
index 0000000000000..e55db2a3fa42a
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver;
+
+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Block as BlockDataProvider;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * CMS blocks field resolver, used for GraphQL request processing
+ */
+class Blocks implements ResolverInterface
+{
+    /**
+     * @var BlockDataProvider
+     */
+    private $blockDataProvider;
+
+    /**
+     * @param BlockDataProvider $blockDataProvider
+     */
+    public function __construct(
+        BlockDataProvider $blockDataProvider
+    ) {
+        $this->blockDataProvider = $blockDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+
+        $blockIdentifiers = $this->getBlockIdentifiers($args);
+        $blocksData = $this->getBlocksData($blockIdentifiers);
+
+        $resultData = [
+            'items' => $blocksData,
+        ];
+        return $resultData;
+    }
+
+    /**
+     * Get block identifiers
+     *
+     * @param array $args
+     * @return string[]
+     * @throws GraphQlInputException
+     */
+    private function getBlockIdentifiers(array $args): array
+    {
+        if (!isset($args['identifiers']) || !is_array($args['identifiers']) || count($args['identifiers']) === 0) {
+            throw new GraphQlInputException(__('"identifiers" of CMS blocks should be specified'));
+        }
+
+        return $args['identifiers'];
+    }
+
+    /**
+     * Get blocks data
+     *
+     * @param array $blockIdentifiers
+     * @return array
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getBlocksData(array $blockIdentifiers): array
+    {
+        $blocksData = [];
+        foreach ($blockIdentifiers as $blockIdentifier) {
+            try {
+                $blocksData[$blockIdentifier] = $this->blockDataProvider->getData($blockIdentifier);
+            } catch (NoSuchEntityException $e) {
+                $blocksData[$blockIdentifier] = new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            }
+        }
+        return $blocksData;
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
new file mode 100644
index 0000000000000..47a2439c4fad0
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\DataProvider;
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Widget\Model\Template\FilterEmulate;
+
+/**
+ * Cms block data provider
+ */
+class Block
+{
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
+    /**
+     * @var FilterEmulate
+     */
+    private $widgetFilter;
+
+    /**
+     * @param BlockRepositoryInterface $blockRepository
+     * @param FilterEmulate $widgetFilter
+     */
+    public function __construct(
+        BlockRepositoryInterface $blockRepository,
+        FilterEmulate $widgetFilter
+    ) {
+        $this->blockRepository = $blockRepository;
+        $this->widgetFilter = $widgetFilter;
+    }
+
+    /**
+     * Get block data
+     *
+     * @param string $blockIdentifier
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    public function getData(string $blockIdentifier): array
+    {
+        $block = $this->blockRepository->getById($blockIdentifier);
+
+        if (false === $block->isActive()) {
+            throw new NoSuchEntityException(
+                __('The CMS block with the "%1" ID doesn\'t exist.', $blockIdentifier)
+            );
+        }
+
+        $renderedContent = $this->widgetFilter->filter($block->getContent());
+
+        $blockData = [
+            BlockInterface::IDENTIFIER => $block->getIdentifier(),
+            BlockInterface::TITLE => $block->getTitle(),
+            BlockInterface::CONTENT => $renderedContent,
+        ];
+        return $blockData;
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
new file mode 100644
index 0000000000000..22009824452be
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\DataProvider;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Widget\Model\Template\FilterEmulate;
+
+/**
+ * Cms page data provider
+ */
+class Page
+{
+    /**
+     * @var FilterEmulate
+     */
+    private $widgetFilter;
+
+    /**
+     * @var PageRepositoryInterface
+     */
+    private $pageRepository;
+
+    /**
+     * @param PageRepositoryInterface $pageRepository
+     * @param FilterEmulate $widgetFilter
+     */
+    public function __construct(
+        PageRepositoryInterface $pageRepository,
+        FilterEmulate $widgetFilter
+    ) {
+        $this->pageRepository = $pageRepository;
+        $this->widgetFilter = $widgetFilter;
+    }
+
+    /**
+     * @param int $pageId
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    public function getData(int $pageId): array
+    {
+        $page = $this->pageRepository->getById($pageId);
+
+        if (false === $page->isActive()) {
+            throw new NoSuchEntityException();
+        }
+
+        $renderedContent = $this->widgetFilter->filter($page->getContent());
+
+        $pageData = [
+            'url_key' => $page->getIdentifier(),
+            PageInterface::TITLE => $page->getTitle(),
+            PageInterface::CONTENT => $renderedContent,
+            PageInterface::CONTENT_HEADING => $page->getContentHeading(),
+            PageInterface::PAGE_LAYOUT => $page->getPageLayout(),
+            PageInterface::META_TITLE => $page->getMetaTitle(),
+            PageInterface::META_DESCRIPTION => $page->getMetaDescription(),
+            PageInterface::META_KEYWORDS => $page->getMetaKeywords(),
+        ];
+        return $pageData;
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
new file mode 100644
index 0000000000000..1077ab81551c2
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver;
+
+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Page as PageDataProvider;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * CMS page field resolver, used for GraphQL request processing
+ */
+class Page implements ResolverInterface
+{
+    /**
+     * @var PageDataProvider
+     */
+    private $pageDataProvider;
+
+    /**
+     * @param PageDataProvider $pageDataProvider
+     */
+    public function __construct(
+        PageDataProvider $pageDataProvider
+    ) {
+        $this->pageDataProvider = $pageDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $pageId = $this->getPageId($args);
+        $pageData = $this->getPageData($pageId);
+
+        return $pageData;
+    }
+
+    /**
+     * @param array $args
+     * @return int
+     * @throws GraphQlInputException
+     */
+    private function getPageId(array $args): int
+    {
+        if (!isset($args['id'])) {
+            throw new GraphQlInputException(__('"Page id should be specified'));
+        }
+
+        return (int)$args['id'];
+    }
+
+    /**
+     * @param int $pageId
+     * @return array
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getPageData(int $pageId): array
+    {
+        try {
+            $pageData = $this->pageDataProvider->getData($pageId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        }
+        return $pageData;
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/README.md b/app/code/Magento/CmsGraphQl/README.md
new file mode 100644
index 0000000000000..970444837f145
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/README.md
@@ -0,0 +1,4 @@
+# CmsGraphQl
+
+**CmsGraphQl** provides type information for the GraphQl module
+to generate CMS fields for cms information endpoints.
diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
new file mode 100644
index 0000000000000..6a2e3950f93d0
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-cms-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-widget": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*",
+        "magento/module-store-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CmsGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/etc/graphql/di.xml b/app/code/Magento/CmsGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..78c1071d8e07c
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/etc/graphql/di.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="front" xsi:type="string">web/default/front</item>
+                <item name="cms_home_page" xsi:type="string">web/default/cms_home_page</item>
+                <item name="no_route" xsi:type="string">web/default/no_route</item>
+                <item name="cms_no_route" xsi:type="string">web/default/cms_no_route</item>
+                <item name="cms_no_cookies" xsi:type="string">web/default/cms_no_cookies</item>
+                <item name="show_cms_breadcrumbs" xsi:type="string">web/default/show_cms_breadcrumbs</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/CmsGraphQl/etc/module.xml b/app/code/Magento/CmsGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..4fca42430d166
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/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_CmsGraphQl">
+        <sequence>
+            <module name="Magento_GraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CmsGraphQl/etc/schema.graphqls b/app/code/Magento/CmsGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..e8abd2201b886
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/etc/schema.graphqls
@@ -0,0 +1,41 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+type StoreConfig @doc(description: "The type contains information about a store config") {
+    front : String @doc(description: "Default Web URL")
+    cms_home_page : String @doc(description: "CMS Home Page")
+    no_route : String @doc(description: "Default No-route URL")
+    cms_no_route : String @doc(description: "CMS No Route Page")
+    cms_no_cookies : String @doc(description: "CMS No Cookies Page")
+    show_cms_breadcrumbs : Int @doc(description: "Show Breadcrumbs for CMS Pages")
+}
+
+
+type Query {
+    cmsPage (
+        id: Int @doc(description: "Id of the CMS page")
+    ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page")
+    cmsBlocks (
+        identifiers: [String] @doc(description: "Identifiers of the CMS blocks")
+    ): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "The CMS block query returns information about CMS blocks")
+}
+
+type CmsPage @doc(description: "CMS page defines all CMS page information") {
+    url_key: String @doc(description: "URL key of CMS page")
+    title: String @doc(description: "CMS page title")
+    content: String @doc(description: "CMS page content")
+    content_heading: String @doc(description: "CMS page content heading")
+    page_layout: String @doc(description: "CMS page content heading")
+    meta_title: String @doc(description: "CMS page meta title")
+    meta_description: String @doc(description: "CMS page meta description")
+    meta_keywords: String @doc(description: "CMS page meta keywords")
+}
+
+type CmsBlocks @doc(description: "CMS blocks information") {
+    items: [CmsBlock] @doc(description: "An array of CMS blocks")
+}
+
+type CmsBlock @doc(description: "CMS block defines all CMS block information") {
+    identifier: String @doc(description: "CMS block identifier")
+    title: String @doc(description: "CMS block title")
+    content: String @doc(description: "CMS block content")
+}
\ No newline at end of file
diff --git a/app/code/Magento/CmsGraphQl/registration.php b/app/code/Magento/CmsGraphQl/registration.php
new file mode 100644
index 0000000000000..9a3fabf6c95e8
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_CmsGraphQl', __DIR__);
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE.txt b/app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE.txt
rename to app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE_AFL.txt b/app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE_AFL.txt
rename to app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md b/app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md
new file mode 100644
index 0000000000000..4b377286964b1
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cms Url Rewrite Functional Tests
+
+The Functional Test Module for **Magento Cms Url Rewrite** module.
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 675cd8fe8f466..d4d2942a786f2 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-url-rewrite": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-store": "*",
+        "magento/module-url-rewrite": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CmsUrlRewrite/etc/module.xml b/app/code/Magento/CmsUrlRewrite/etc/module.xml
index bce3dce2a40e0..1e12b5b74971d 100644
--- a/app/code/Magento/CmsUrlRewrite/etc/module.xml
+++ b/app/code/Magento/CmsUrlRewrite/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CmsUrlRewrite" setup_version="2.0.0">
+    <module name="Magento_CmsUrlRewrite" >
     </module>
 </config>
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php
new file mode 100644
index 0000000000000..6cc669e46d080
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite;
+
+use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Cms\Helper\Page;
+
+/**
+ * Home page URL locator.
+ */
+class HomePageUrlLocator implements CustomUrlLocatorInterface
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function locateUrl($urlKey): ?string
+    {
+        if ($urlKey === '/') {
+            $homePageUrl = $this->scopeConfig->getValue(
+                Page::XML_PATH_HOME_PAGE,
+                ScopeInterface::SCOPE_STORE
+            );
+            return $homePageUrl;
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/README.md b/app/code/Magento/CmsUrlRewriteGraphQl/README.md
new file mode 100644
index 0000000000000..686f74a6e612a
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/README.md
@@ -0,0 +1,4 @@
+# CmsUrlRewriteGraphQl
+
+**CmsUrlRewriteGraphQl** provides type information for the GraphQl module
+to generate url rewrite fields for cms information endpoints.
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md b/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..284cf1e935466
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cms Url Rewrite Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Cms Url Rewrite Graph Ql** module.
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
new file mode 100644
index 0000000000000..c57e4cdc92a83
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/module-cms-url-rewrite-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-url-rewrite-graph-ql": "*",
+        "magento/module-store": "*",
+        "magento/module-cms": "*"
+    },
+    "suggest": {
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-catalog-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CmsUrlRewriteGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..d384c898acb62
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocator">
+        <arguments>
+            <argument name="urlLocators" xsi:type="array">
+                <item name="homePageUrlLocator" xsi:type="object">Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite\HomePageUrlLocator</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/etc/module.xml b/app/code/Magento/CmsUrlRewriteGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..d3c65b440aab7
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CmsUrlRewriteGraphQl" />
+</config>
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/CmsUrlRewriteGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..ccbebc67e65fe
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/etc/schema.graphqls
@@ -0,0 +1,6 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+enum UrlRewriteEntityTypeEnum {
+    CMS_PAGE
+}
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/registration.php b/app/code/Magento/CmsUrlRewriteGraphQl/registration.php
new file mode 100644
index 0000000000000..adf8301e51fec
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CmsUrlRewriteGraphQl', __DIR__);
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index ed645bb63febc..c237d0ea9963a 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -5,58 +5,48 @@
  */
 namespace Magento\Config\App\Config\Type;
 
+use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\Config\ConfigTypeInterface;
+use Magento\Framework\App\Config\Spi\PostProcessorInterface;
+use Magento\Framework\App\Config\Spi\PreProcessorInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Config\App\Config\Type\System\Reader;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Store\Model\Config\Processor\Fallback;
+use Magento\Store\Model\ScopeInterface as StoreScope;
+use Magento\Framework\Encryption\Encryptor;
 
 /**
  * System configuration type
+ *
  * @api
  * @since 100.1.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class System implements ConfigTypeInterface
 {
     const CACHE_TAG = 'config_scopes';
-
     const CONFIG_TYPE = 'system';
 
-    /**
-     * @var \Magento\Framework\App\Config\ConfigSourceInterface
-     */
-    private $source;
-
     /**
      * @var array
      */
     private $data = [];
 
     /**
-     * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
+     * @var PostProcessorInterface
      */
     private $postProcessor;
 
     /**
-     * @var \Magento\Framework\App\Config\Spi\PreProcessorInterface
-     */
-    private $preProcessor;
-
-    /**
-     * @var \Magento\Framework\Cache\FrontendInterface
+     * @var FrontendInterface
      */
     private $cache;
 
     /**
-     * @var int
-     */
-    private $cachingNestedLevel;
-
-    /**
-     * @var \Magento\Store\Model\Config\Processor\Fallback
-     */
-    private $fallback;
-
-    /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var SerializerInterface
      */
     private $serializer;
 
@@ -79,42 +69,51 @@ class System implements ConfigTypeInterface
      *
      * @var array
      */
-    private $availableDataScopes = null;
+    private $availableDataScopes;
 
     /**
-     * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
-     * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
-     * @param \Magento\Store\Model\Config\Processor\Fallback $fallback
-     * @param \Magento\Framework\Cache\FrontendInterface $cache
-     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-     * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor
+     * @var Encryptor
+     */
+    private $encryptor;
+
+    /**
+     * @param ConfigSourceInterface $source
+     * @param PostProcessorInterface $postProcessor
+     * @param Fallback $fallback
+     * @param FrontendInterface $cache
+     * @param SerializerInterface $serializer
+     * @param PreProcessorInterface $preProcessor
      * @param int $cachingNestedLevel
      * @param string $configType
-     * @param Reader $reader
+     * @param Reader|null $reader
+     * @param Encryptor|null $encryptor
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\Config\ConfigSourceInterface $source,
-        \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor,
-        \Magento\Store\Model\Config\Processor\Fallback $fallback,
-        \Magento\Framework\Cache\FrontendInterface $cache,
-        \Magento\Framework\Serialize\SerializerInterface $serializer,
-        \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor,
+        ConfigSourceInterface $source,
+        PostProcessorInterface $postProcessor,
+        Fallback $fallback,
+        FrontendInterface $cache,
+        SerializerInterface $serializer,
+        PreProcessorInterface $preProcessor,
         $cachingNestedLevel = 1,
         $configType = self::CONFIG_TYPE,
-        Reader $reader = null
+        Reader $reader = null,
+        Encryptor $encryptor = null
     ) {
-        $this->source = $source;
         $this->postProcessor = $postProcessor;
-        $this->preProcessor = $preProcessor;
         $this->cache = $cache;
-        $this->cachingNestedLevel = $cachingNestedLevel;
-        $this->fallback = $fallback;
         $this->serializer = $serializer;
         $this->configType = $configType;
         $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class);
+        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(\Magento\Framework\Encryption\Encryptor::class);
     }
 
     /**
+     * Get configuration value by path
+     *
      * System configuration is separated by scopes (default, websites, stores). Configuration of a scope is inherited
      * from its parent scope (store inherits website).
      *
@@ -136,27 +135,52 @@ public function get($path = '')
     {
         if ($path === '') {
             $this->data = array_replace_recursive($this->loadAllData(), $this->data);
+
             return $this->data;
         }
+
+        return $this->getWithParts($path);
+    }
+
+    /**
+     * Proceed with parts extraction from path.
+     *
+     * @param string $path
+     * @return array|int|string|boolean
+     */
+    private function getWithParts($path)
+    {
         $pathParts = explode('/', $path);
-        if (count($pathParts) === 1 && $pathParts[0] !== 'default') {
+
+        if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$pathParts[0]])) {
-                $data = $this->reader->read();
+                $data = $this->readData();
                 $this->data = array_replace_recursive($data, $this->data);
             }
+
             return $this->data[$pathParts[0]];
         }
+
         $scopeType = array_shift($pathParts);
-        if ($scopeType === 'default') {
+
+        if ($scopeType === ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$scopeType])) {
                 $this->data = array_replace_recursive($this->loadDefaultScopeData($scopeType), $this->data);
             }
+
             return $this->getDataByPathParts($this->data[$scopeType], $pathParts);
         }
+
         $scopeId = array_shift($pathParts);
+
         if (!isset($this->data[$scopeType][$scopeId])) {
-            $this->data = array_replace_recursive($this->loadScopeData($scopeType, $scopeId), $this->data);
+            $scopeData = $this->loadScopeData($scopeType, $scopeId);
+
+            if (!isset($this->data[$scopeType][$scopeId])) {
+                $this->data = array_replace_recursive($scopeData, $this->data);
+            }
         }
+
         return isset($this->data[$scopeType][$scopeId])
             ? $this->getDataByPathParts($this->data[$scopeType][$scopeId], $pathParts)
             : null;
@@ -170,11 +194,13 @@ public function get($path = '')
     private function loadAllData()
     {
         $cachedData = $this->cache->load($this->configType);
+
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
         } else {
-            $data = $this->serializer->unserialize($cachedData);
+            $data = $this->serializer->unserialize($this->encryptor->decrypt($cachedData));
         }
+
         return $data;
     }
 
@@ -187,12 +213,14 @@ private function loadAllData()
     private function loadDefaultScopeData($scopeType)
     {
         $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
+
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
-            $data = [$scopeType => $this->serializer->unserialize($cachedData)];
+            $data = [$scopeType => $this->serializer->unserialize($this->encryptor->decrypt($cachedData))];
         }
+
         return $data;
     }
 
@@ -206,26 +234,31 @@ private function loadDefaultScopeData($scopeType)
     private function loadScopeData($scopeType, $scopeId)
     {
         $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
+
         if ($cachedData === false) {
             if ($this->availableDataScopes === null) {
                 $cachedScopeData = $this->cache->load($this->configType . '_scopes');
                 if ($cachedScopeData !== false) {
-                    $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
+                    $serializedCachedData = $this->encryptor->decrypt($cachedScopeData);
+                    $this->availableDataScopes = $this->serializer->unserialize($serializedCachedData);
                 }
             }
             if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
                 return [$scopeType => [$scopeId => []]];
             }
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
-            $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
+            $serializedCachedData = $this->encryptor->decrypt($cachedData);
+            $data = [$scopeType => [$scopeId => $this->serializer->unserialize($serializedCachedData)]];
         }
+
         return $data;
     }
 
     /**
-     * Cache configuration data.
+     * Cache configuration data
+     *
      * Caches data per scope to avoid reading data for all scopes on every request
      *
      * @param array $data
@@ -234,29 +267,29 @@ private function loadScopeData($scopeType, $scopeId)
     private function cacheData(array $data)
     {
         $this->cache->save(
-            $this->serializer->serialize($data),
+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($data)),
             $this->configType,
             [self::CACHE_TAG]
         );
         $this->cache->save(
-            $this->serializer->serialize($data['default']),
+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($data['default'])),
             $this->configType . '_default',
             [self::CACHE_TAG]
         );
         $scopes = [];
-        foreach (['websites', 'stores'] as $curScopeType) {
-            foreach ($data[$curScopeType] as $curScopeId => $curScopeData) {
+        foreach ([StoreScope::SCOPE_WEBSITES, StoreScope::SCOPE_STORES] as $curScopeType) {
+            foreach ($data[$curScopeType] ?? [] as $curScopeId => $curScopeData) {
                 $scopes[$curScopeType][$curScopeId] = 1;
                 $this->cache->save(
-                    $this->serializer->serialize($curScopeData),
+                    $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($curScopeData)),
                     $this->configType . '_' . $curScopeType . '_' . $curScopeId,
                     [self::CACHE_TAG]
                 );
             }
         }
         $this->cache->save(
-            $this->serializer->serialize($scopes),
-            $this->configType . "_scopes",
+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($scopes)),
+            $this->configType . '_scopes',
             [self::CACHE_TAG]
         );
     }
@@ -279,9 +312,25 @@ private function getDataByPathParts($data, $pathParts)
                 return null;
             }
         }
+
         return $data;
     }
 
+    /**
+     * The freshly read data.
+     *
+     * @return array
+     */
+    private function readData(): array
+    {
+        $this->data = $this->reader->read();
+        $this->data = $this->postProcessor->process(
+            $this->data
+        );
+
+        return $this->data;
+    }
+
     /**
      * Clean cache and global variables cache
      *
diff --git a/app/code/Magento/Config/App/Config/Type/System/Reader.php b/app/code/Magento/Config/App/Config/Type/System/Reader.php
index d5a0f09cdd631..9916b795a53b2 100644
--- a/app/code/Magento/Config/App/Config/Type/System/Reader.php
+++ b/app/code/Magento/Config/App/Config/Type/System/Reader.php
@@ -27,17 +27,13 @@ class Reader
      */
     private $preProcessor;
 
-    /**
-     * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
-     */
-    private $postProcessor;
-
     /**
      * Reader constructor.
      * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
      * @param \Magento\Store\Model\Config\Processor\Fallback $fallback
      * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor
      * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\App\Config\ConfigSourceInterface $source,
@@ -48,7 +44,6 @@ public function __construct(
         $this->source = $source;
         $this->fallback = $fallback;
         $this->preProcessor = $preProcessor;
-        $this->postProcessor = $postProcessor;
     }
 
     /**
@@ -60,11 +55,9 @@ public function __construct(
      */
     public function read()
     {
-        return $this->postProcessor->process(
-            $this->fallback->process(
-                $this->preProcessor->process(
-                    $this->source->get()
-                )
+        return $this->fallback->process(
+            $this->preProcessor->process(
+                $this->source->get()
             )
         );
     }
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index c60dbffbdc5e0..81e39a83296d7 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -8,6 +8,7 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
 use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
@@ -425,23 +426,21 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
         if ($placeholderValue) {
             $data = $placeholderValue;
         }
-        if ($data === null) {
-            if (array_key_exists($path, $this->_configData)) {
-                $data = $this->_configData[$path];
-            } elseif ($field->getConfigPath() !== null) {
-                $data = $this->getConfigValue($field->getConfigPath());
-            } else {
-                $data = $this->getConfigValue($path);
-            }
 
+        if ($data === null) {
+            $path = $field->getConfigPath() !== null ? $field->getConfigPath() : $path;
+            $data = $this->getConfigValue($path);
             if ($field->hasBackendModel()) {
                 $backendModel = $field->getBackendModel();
-                $backendModel->setPath($path)
-                    ->setValue($data)
-                    ->setWebsite($this->getWebsiteCode())
-                    ->setStore($this->getStoreCode())
-                    ->afterLoad();
-                $data = $backendModel->getValue();
+                // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
+                if (!$backendModel instanceof ProcessorInterface) {
+                    $backendModel->setPath($path)
+                        ->setValue($data)
+                        ->setWebsite($this->getWebsiteCode())
+                        ->setStore($this->getStoreCode())
+                        ->afterLoad();
+                    $data = $backendModel->getValue();
+                }
             }
         }
 
@@ -710,7 +709,7 @@ protected function _getAdditionalElementTypes()
     }
 
     /**
-     * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block
+     * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block
      * to getBlala() methods to be later set from controller with setters
      */
 
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
index 63dbb2b80e334..16b18e020008d 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php
@@ -33,6 +33,8 @@ public function __construct(
     }
 
     /**
+     * Returns element html
+     *
      * @param AbstractElement $element
      * @return string
      * @codeCoverageIgnore
@@ -40,7 +42,7 @@ public function __construct(
     protected function _getElementHtml(AbstractElement $element)
     {
         return $this->dateTimeFormatter->formatObject(
-            $this->_localeDate->date(intval($element->getValue())),
+            $this->_localeDate->date((int) $element->getValue()),
             $this->_localeDate->getDateTimeFormat(\IntlDateFormatter::MEDIUM)
         );
     }
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
index 7f21bf4b92bf4..2e79cec7088b9 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php
@@ -10,6 +10,7 @@
 
 /**
  * Backend system config datetime field renderer
+ *
  * @api
  * @since 100.0.2
  */
@@ -35,6 +36,8 @@ public function __construct(
     }
 
     /**
+     * Returns element html
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -44,6 +47,6 @@ protected function _getElementHtml(AbstractElement $element)
         $format = $this->_localeDate->getDateTimeFormat(
             \IntlDateFormatter::MEDIUM
         );
-        return $this->dateTimeFormatter->formatObject($this->_localeDate->date(intval($element->getValue())), $format);
+        return $this->dateTimeFormatter->formatObject($this->_localeDate->date((int) $element->getValue()), $format);
     }
 }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
index e005747ea5ed5..1b287573a9285 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Console\Command\ConfigSet;
 
 use Magento\Config\Console\Command\ConfigSetCommand;
@@ -27,7 +28,14 @@ class ConfigSetProcessorFactory
      * lock - save and lock configuration
      */
     const TYPE_DEFAULT = 'default';
+    
+    /**
+     * @deprecated
+     * @see TYPE_LOCK_ENV or TYPE_LOCK_CONFIG
+     */
     const TYPE_LOCK = 'lock';
+    const TYPE_LOCK_ENV = 'lock-env';
+    const TYPE_LOCK_CONFIG = 'lock-config';
     /**#@-*/
 
     /**#@-*/
@@ -65,7 +73,9 @@ public function __construct(
     public function create($processorName)
     {
         if (!isset($this->processors[$processorName])) {
-            throw new ConfigurationMismatchException(__('Class for type "%1" was not declared', $processorName));
+            throw new ConfigurationMismatchException(
+                __('The class for "%1" type wasn\'t declared. Enter the class and try again.', $processorName)
+            );
         }
 
         $object = $this->objectManager->create($this->processors[$processorName]);
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 2f5c10037ef06..d7d513bfad423 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -72,7 +72,7 @@ public function process($path, $value, $scope, $scopeCode)
             throw new CouldNotSaveException(
                 __(
                     'The value you set has already been locked. To change the value, use the --%1 option.',
-                    ConfigSetCommand::OPTION_LOCK
+                    ConfigSetCommand::OPTION_LOCK_ENV
                 )
             );
         }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php
index 0bd28f0f78d96..6fe2adde3c41e 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php
@@ -16,7 +16,8 @@
 
 /**
  * Processes file lock flow of config:set command.
- * This processor saves the value of configuration and lock it for editing in Admin interface.
+ * This processor saves the value of configuration into app/etc/env.php
+ * and locks it for editing in Admin interface.
  *
  * {@inheritdoc}
  */
@@ -49,23 +50,30 @@ class LockProcessor implements ConfigSetProcessorInterface
      * @var ConfigPathResolver
      */
     private $configPathResolver;
+    /**
+     * @var string
+     */
+    private $target;
 
     /**
      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
      * @param DeploymentConfig\Writer $writer The deployment configuration writer
      * @param ArrayManager $arrayManager An array manager for different manipulations with arrays
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
+     * @param string $target
      */
     public function __construct(
         PreparedValueFactory $preparedValueFactory,
         DeploymentConfig\Writer $writer,
         ArrayManager $arrayManager,
-        ConfigPathResolver $configPathResolver
+        ConfigPathResolver $configPathResolver,
+        $target = ConfigFilePool::APP_ENV
     ) {
         $this->preparedValueFactory = $preparedValueFactory;
         $this->deploymentConfigWriter = $writer;
         $this->arrayManager = $arrayManager;
         $this->configPathResolver = $configPathResolver;
+        $this->target = $target;
     }
 
     /**
@@ -97,7 +105,7 @@ public function process($path, $value, $scope, $scopeCode)
                  * we'll write value just after all validations are triggered.
                  */
                 $this->deploymentConfigWriter->saveConfig(
-                    [ConfigFilePool::APP_ENV => $this->arrayManager->set($configPath, [], $value)],
+                    [$this->target => $this->arrayManager->set($configPath, [], $value)],
                     false
                 );
             }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
index 06a01c6686bfd..fcd7c0d5335b1 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Config\Model\Config\PathValidator;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -98,12 +99,35 @@ public function __construct(
      * @param boolean $lock The lock flag
      * @return string Processor response message
      * @throws ValidatorException If some validation is wrong
-     * @throws CouldNotSaveException If cannot save config value
-     * @throws ConfigurationMismatchException If processor can not be instantiated
      * @since 100.2.0
+     * @deprecated
+     * @see processWithLockTarget()
      */
     public function process($path, $value, $scope, $scopeCode, $lock)
     {
+        return $this->processWithLockTarget($path, $value, $scope, $scopeCode, $lock);
+    }
+
+    /**
+     * Processes config:set command with the option to set a target file.
+     *
+     * @param string $path The configuration path in format section/group/field_name
+     * @param string $value The configuration value
+     * @param string $scope The configuration scope (default, website, or store)
+     * @param string $scopeCode The scope code
+     * @param boolean $lock The lock flag
+     * @param string $lockTarget
+     * @return string Processor response message
+     * @throws ValidatorException If some validation is wrong
+     */
+    public function processWithLockTarget(
+        $path,
+        $value,
+        $scope,
+        $scopeCode,
+        $lock,
+        $lockTarget = ConfigFilePool::APP_ENV
+    ) {
         try {
             $this->scopeValidator->isValid($scope, $scopeCode);
             $this->pathValidator->validate($path);
@@ -111,14 +135,24 @@ public function process($path, $value, $scope, $scopeCode, $lock)
             throw new ValidatorException(__($exception->getMessage()), $exception);
         }
 
-        $processor = $lock
-            ? $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK)
-            : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_DEFAULT);
-        $message = $lock
-            ? 'Value was saved and locked.'
-            : 'Value was saved.';
+        $processor =
+            $lock
+                ? ( $lockTarget == ConfigFilePool::APP_ENV
+                    ? $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK_ENV)
+                    : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK_CONFIG)
+                )
+                : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_DEFAULT)
+            ;
+
+        $message =
+            $lock
+                ? ( $lockTarget == ConfigFilePool::APP_ENV
+                    ? 'Value was saved in app/etc/env.php and locked.'
+                    : 'Value was saved in app/etc/config.php and locked.'
+                )
+                : 'Value was saved.';
 
-        // The processing flow depends on --lock option.
+        // The processing flow depends on --lock and --share options.
         $processor->process($path, $value, $scope, $scopeCode);
 
         $this->hash->regenerate(System::CONFIG_TYPE);
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
index 1df1b3c4bed14..cb79daddbf5f9 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\App\Config\Type\System;
@@ -10,6 +11,7 @@
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -34,6 +36,8 @@ class ConfigSetCommand extends Command
     const OPTION_SCOPE = 'scope';
     const OPTION_SCOPE_CODE = 'scope-code';
     const OPTION_LOCK = 'lock';
+    const OPTION_LOCK_ENV = 'lock-env';
+    const OPTION_LOCK_CONFIG = 'lock-config';
     /**#@-*/
 
     /**#@-*/
@@ -108,11 +112,24 @@ protected function configure()
                     InputArgument::OPTIONAL,
                     'Scope code (required only if scope is not \'default\')'
                 ),
+                new InputOption(
+                    static::OPTION_LOCK_ENV,
+                    'le',
+                    InputOption::VALUE_NONE,
+                    'Lock value which prevents modification in the Admin (will be saved in app/etc/env.php)'
+                ),
+                new InputOption(
+                    static::OPTION_LOCK_CONFIG,
+                    'lc',
+                    InputOption::VALUE_NONE,
+                    'Lock and share value with other installations, prevents modification in the Admin '
+                    . '(will be saved in app/etc/config.php)'
+                ),
                 new InputOption(
                     static::OPTION_LOCK,
                     'l',
                     InputOption::VALUE_NONE,
-                    'Lock value which prevents modification in the Admin'
+                    'Deprecated, use the --' . static::OPTION_LOCK_ENV . ' option instead.'
                 ),
             ]);
 
@@ -146,12 +163,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $message = $this->emulatedAreaProcessor->process(function () use ($input) {
-                return $this->processorFacadeFactory->create()->process(
+
+                $lock = $input->getOption(static::OPTION_LOCK_ENV)
+                    || $input->getOption(static::OPTION_LOCK_CONFIG)
+                    || $input->getOption(static::OPTION_LOCK);
+
+                $lockTargetPath = ConfigFilePool::APP_ENV;
+                if ($input->getOption(static::OPTION_LOCK_CONFIG)) {
+                    $lockTargetPath = ConfigFilePool::APP_CONFIG;
+                }
+
+                return $this->processorFacadeFactory->create()->processWithLockTarget(
                     $input->getArgument(static::ARG_PATH),
                     $input->getArgument(static::ARG_VALUE),
                     $input->getOption(static::OPTION_SCOPE),
                     $input->getOption(static::OPTION_SCOPE_CODE),
-                    $input->getOption(static::OPTION_LOCK)
+                    $lock,
+                    $lockTargetPath
                 );
             });
 
diff --git a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
index 582f87508089f..aeb57010e4969 100644
--- a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
@@ -97,7 +97,7 @@ public function process($scope, $scopeCode, $value, $path)
         $field = $configStructure->getElementByConfigPath($path);
 
         /** @var Value $backendModel */
-        $backendModel = $field && $field->hasBackendModel()
+        $backendModel = $field instanceof Field && $field->hasBackendModel()
             ? $field->getBackendModel()
             : $this->configValueFactory->create();
 
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
index b65f6e9d4e4c5..12c6ecbab9fd9 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Config\Controller\Adminhtml\System\Config;
 
-class Edit extends AbstractScopeConfig
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends AbstractScopeConfig implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
index 66290a7926121..03479085f3f6b 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Config\Controller\Adminhtml\System\Config;
 
-class Index extends AbstractScopeConfig
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends AbstractScopeConfig implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
index 290a43c9cd62e..2d4b20033806e 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Config\Controller\Adminhtml\System\Config;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Config\Controller\Adminhtml\System\AbstractConfig;
 
 /**
@@ -13,7 +14,7 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends AbstractConfig
+class Save extends AbstractConfig implements HttpPostActionInterface
 {
     /**
      * Backend Config Model Factory
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
index 75716fa380be3..5d74eb7ea4e27 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php
@@ -6,7 +6,13 @@
  */
 namespace Magento\Config\Controller\Adminhtml\System\Config;
 
-class State extends AbstractScopeConfig
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Save current state of open tabs. GET is allowed for legacy reasons.
+ */
+class State extends AbstractScopeConfig implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index bc1515aadb0ca..a9c400c46643d 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -5,10 +5,15 @@
  */
 namespace Magento\Config\Model;
 
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Config\Model\Config\Structure\Element\Group;
+use Magento\Config\Model\Config\Structure\Element\Field;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backend config model
- * Used to save configuration
  *
+ * Used to save configuration
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
@@ -77,6 +82,11 @@ class Config extends \Magento\Framework\DataObject
      */
     protected $_storeManager;
 
+    /**
+     * @var Config\Reader\Source\Deployed\SettingChecker
+     */
+    private $settingChecker;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -85,6 +95,7 @@ class Config extends \Magento\Framework\DataObject
      * @param \Magento\Config\Model\Config\Loader $configLoader
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
      */
     public function __construct(
@@ -95,6 +106,7 @@ public function __construct(
         \Magento\Config\Model\Config\Loader $configLoader,
         \Magento\Framework\App\Config\ValueFactory $configValueFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
+        SettingChecker $settingChecker = null,
         array $data = []
     ) {
         parent::__construct($data);
@@ -105,10 +117,12 @@ public function __construct(
         $this->_configLoader = $configLoader;
         $this->_configValueFactory = $configValueFactory;
         $this->_storeManager = $storeManager;
+        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
     }
 
     /**
      * Save config section
+     *
      * Require set: section, website, store and groups
      *
      * @throws \Exception
@@ -126,11 +140,12 @@ public function save()
 
         $oldConfig = $this->_getConfig(true);
 
+        /** @var \Magento\Framework\DB\Transaction $deleteTransaction */
         $deleteTransaction = $this->_transactionFactory->create();
-        /* @var $deleteTransaction \Magento\Framework\DB\Transaction */
+        /** @var \Magento\Framework\DB\Transaction $saveTransaction */
         $saveTransaction = $this->_transactionFactory->create();
-        /* @var $saveTransaction \Magento\Framework\DB\Transaction */
 
+        $changedPaths = [];
         // Extends for old config data
         $extraOldGroups = [];
 
@@ -145,6 +160,9 @@ public function save()
                 $saveTransaction,
                 $deleteTransaction
             );
+
+            $groupChangedPaths = $this->getChangedPaths($sectionId, $groupId, $groupData, $oldConfig, $extraOldGroups);
+            $changedPaths = \array_merge($changedPaths, $groupChangedPaths);
         }
 
         try {
@@ -157,7 +175,11 @@ public function save()
             // website and store codes can be used in event implementation, so set them as well
             $this->_eventManager->dispatch(
                 "admin_system_config_changed_section_{$this->getSection()}",
-                ['website' => $this->getWebsite(), 'store' => $this->getStore()]
+                [
+                    'website' => $this->getWebsite(),
+                    'store' => $this->getStore(),
+                    'changed_paths' => $changedPaths,
+                ]
             );
         } catch (\Exception $e) {
             // re-init configuration
@@ -168,6 +190,145 @@ public function save()
         return $this;
     }
 
+    /**
+     * Map field name if they were cloned
+     *
+     * @param Group $group
+     * @param string $fieldId
+     * @return string
+     */
+    private function getOriginalFieldId(Group $group, string $fieldId): string
+    {
+        if ($group->shouldCloneFields()) {
+            $cloneModel = $group->getCloneModel();
+
+            /** @var \Magento\Config\Model\Config\Structure\Element\Field $field */
+            foreach ($group->getChildren() as $field) {
+                foreach ($cloneModel->getPrefixes() as $prefix) {
+                    if ($prefix['field'] . $field->getId() === $fieldId) {
+                        $fieldId = $field->getId();
+                        break(2);
+                    }
+                }
+            }
+        }
+
+        return $fieldId;
+    }
+
+    /**
+     * Get field object
+     *
+     * @param string $sectionId
+     * @param string $groupId
+     * @param string $fieldId
+     * @return Field
+     */
+    private function getField(string $sectionId, string $groupId, string $fieldId): Field
+    {
+        /** @var \Magento\Config\Model\Config\Structure\Element\Group $group */
+        $group = $this->_configStructure->getElement($sectionId . '/' . $groupId);
+        $fieldPath = $group->getPath() . '/' . $this->getOriginalFieldId($group, $fieldId);
+        $field = $this->_configStructure->getElement($fieldPath);
+
+        return $field;
+    }
+
+    /**
+     * Get field path
+     *
+     * @param Field $field
+     * @param string $fieldId Need for support of clone_field feature
+     * @param array &$oldConfig Need for compatibility with _processGroup()
+     * @param array &$extraOldGroups Need for compatibility with _processGroup()
+     * @return string
+     */
+    private function getFieldPath(Field $field, string $fieldId, array &$oldConfig, array &$extraOldGroups): string
+    {
+        $path = $field->getGroupPath() . '/' . $fieldId;
+
+        /**
+         * Look for custom defined field path
+         */
+        $configPath = $field->getConfigPath();
+        if ($configPath && strrpos($configPath, '/') > 0) {
+            // Extend old data with specified section group
+            $configGroupPath = substr($configPath, 0, strrpos($configPath, '/'));
+            if (!isset($extraOldGroups[$configGroupPath])) {
+                $oldConfig = $this->extendConfig($configGroupPath, true, $oldConfig);
+                $extraOldGroups[$configGroupPath] = true;
+            }
+            $path = $configPath;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Check is config value changed
+     *
+     * @param array $oldConfig
+     * @param string $path
+     * @param array $fieldData
+     * @return bool
+     */
+    private function isValueChanged(array $oldConfig, string $path, array $fieldData): bool
+    {
+        if (isset($oldConfig[$path]['value'])) {
+            $result = !isset($fieldData['value']) || $oldConfig[$path]['value'] !== $fieldData['value'];
+        } else {
+            $result = empty($fieldData['inherit']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get changed paths
+     *
+     * @param string $sectionId
+     * @param string $groupId
+     * @param array $groupData
+     * @param array &$oldConfig
+     * @param array &$extraOldGroups
+     * @return array
+     */
+    private function getChangedPaths(
+        string $sectionId,
+        string $groupId,
+        array $groupData,
+        array &$oldConfig,
+        array &$extraOldGroups
+    ): array {
+        $changedPaths = [];
+
+        if (isset($groupData['fields'])) {
+            foreach ($groupData['fields'] as $fieldId => $fieldData) {
+                $field = $this->getField($sectionId, $groupId, $fieldId);
+                $path = $this->getFieldPath($field, $fieldId, $oldConfig, $extraOldGroups);
+                if ($this->isValueChanged($oldConfig, $path, $fieldData)) {
+                    $changedPaths[] = $path;
+                }
+            }
+        }
+
+        if (isset($groupData['groups'])) {
+            $subSectionId = $sectionId . '/' . $groupId;
+            foreach ($groupData['groups'] as $subGroupId => $subGroupData) {
+                $subGroupChangedPaths = $this->getChangedPaths(
+                    $subSectionId,
+                    $subGroupId,
+                    $subGroupData,
+                    $oldConfig,
+                    $extraOldGroups
+                );
+                $changedPaths = \array_merge($changedPaths, $subGroupChangedPaths);
+            }
+        }
+
+        return $changedPaths;
+    }
+
     /**
      * Process group data
      *
@@ -182,7 +343,6 @@ public function save()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function _processGroup(
         $groupId,
@@ -195,92 +355,55 @@ protected function _processGroup(
         \Magento\Framework\DB\Transaction $deleteTransaction
     ) {
         $groupPath = $sectionPath . '/' . $groupId;
-        $scope = $this->getScope();
-        $scopeId = $this->getScopeId();
-        $scopeCode = $this->getScopeCode();
-        /**
-         *
-         * Map field names if they were cloned
-         */
-        /** @var $group \Magento\Config\Model\Config\Structure\Element\Group */
-        $group = $this->_configStructure->getElement($groupPath);
 
-        // set value for group field entry by fieldname
-        // use extra memory
-        $fieldsetData = [];
         if (isset($groupData['fields'])) {
-            if ($group->shouldCloneFields()) {
-                $cloneModel = $group->getCloneModel();
-                $mappedFields = [];
-
-                /** @var $field \Magento\Config\Model\Config\Structure\Element\Field */
-                foreach ($group->getChildren() as $field) {
-                    foreach ($cloneModel->getPrefixes() as $prefix) {
-                        $mappedFields[$prefix['field'] . $field->getId()] = $field->getId();
-                    }
-                }
-            }
+            /** @var \Magento\Config\Model\Config\Structure\Element\Group $group */
+            $group = $this->_configStructure->getElement($groupPath);
+
+            // set value for group field entry by fieldname
+            // use extra memory
+            $fieldsetData = [];
             foreach ($groupData['fields'] as $fieldId => $fieldData) {
-                $fieldsetData[$fieldId] = is_array(
-                    $fieldData
-                ) && isset(
-                    $fieldData['value']
-                ) ? $fieldData['value'] : null;
+                $fieldsetData[$fieldId] = $fieldData['value'] ?? null;
             }
 
             foreach ($groupData['fields'] as $fieldId => $fieldData) {
-                $originalFieldId = $fieldId;
-                if ($group->shouldCloneFields() && isset($mappedFields[$fieldId])) {
-                    $originalFieldId = $mappedFields[$fieldId];
+                $isReadOnly = $this->settingChecker->isReadOnly(
+                    $groupPath . '/' . $fieldId,
+                    $this->getScope(),
+                    $this->getScopeCode()
+                );
+
+                if ($isReadOnly) {
+                    continue;
                 }
-                /** @var $field \Magento\Config\Model\Config\Structure\Element\Field */
-                $field = $this->_configStructure->getElement($groupPath . '/' . $originalFieldId);
 
+                $field = $this->getField($sectionPath, $groupId, $fieldId);
                 /** @var \Magento\Framework\App\Config\ValueInterface $backendModel */
-                $backendModel = $field->hasBackendModel() ? $field
-                    ->getBackendModel() : $this
-                    ->_configValueFactory
-                    ->create();
+                $backendModel = $field->hasBackendModel()
+                    ? $field->getBackendModel()
+                    : $this->_configValueFactory->create();
 
+                if (!isset($fieldData['value'])) {
+                    $fieldData['value'] = null;
+                }
                 $data = [
                     'field' => $fieldId,
                     'groups' => $groups,
                     'group_id' => $group->getId(),
-                    'scope' => $scope,
-                    'scope_id' => $scopeId,
-                    'scope_code' => $scopeCode,
+                    'scope' => $this->getScope(),
+                    'scope_id' => $this->getScopeId(),
+                    'scope_code' => $this->getScopeCode(),
                     'field_config' => $field->getData(),
-                    'fieldset_data' => $fieldsetData
+                    'fieldset_data' => $fieldsetData,
                 ];
                 $backendModel->addData($data);
-
                 $this->_checkSingleStoreMode($field, $backendModel);
 
-                if (false == isset($fieldData['value'])) {
-                    $fieldData['value'] = null;
-                }
-
-                $path = $field->getGroupPath() . '/' . $fieldId;
-                /**
-                 * Look for custom defined field path
-                 */
-                if ($field && $field->getConfigPath()) {
-                    $configPath = $field->getConfigPath();
-                    if (!empty($configPath) && strrpos($configPath, '/') > 0) {
-                        // Extend old data with specified section group
-                        $configGroupPath = substr($configPath, 0, strrpos($configPath, '/'));
-                        if (!isset($extraOldGroups[$configGroupPath])) {
-                            $oldConfig = $this->extendConfig($configGroupPath, true, $oldConfig);
-                            $extraOldGroups[$configGroupPath] = true;
-                        }
-                        $path = $configPath;
-                    }
-                }
-
-                $inherit = !empty($fieldData['inherit']);
-
+                $path = $this->getFieldPath($field, $fieldId, $extraOldGroups, $oldConfig);
                 $backendModel->setPath($path)->setValue($fieldData['value']);
 
+                $inherit = !empty($fieldData['inherit']);
                 if (isset($oldConfig[$path])) {
                     $backendModel->setConfigId($oldConfig[$path]['config_id']);
 
@@ -383,6 +506,7 @@ public function setDataByPath($path, $value)
 
     /**
      * Get scope name and scopeId
+     *
      * @todo refactor to scope resolver
      * @return void
      */
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
index 27a8485741877..09ff3cdffc392 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
@@ -29,7 +29,11 @@ class Custom extends \Magento\Framework\App\Config\Value
     const XML_PATH_ADMIN_SECURITY_USEFORMKEY = 'admin/security/use_form_key';
     const XML_PATH_MAINTENANCE_MODE = 'maintenance_mode';
     const XML_PATH_WEB_COOKIE_COOKIE_LIFETIME = 'web/cookie/cookie_lifetime';
+    /**
+     * @deprecated Misspelled constant - use XML_PATH_WEB_COOKIE_COOKIE_PATH instead
+     */
     const XML_PATH_WEB_COOKIE_COOKE_PATH = 'web/cookie/cookie_path';
+    const XML_PATH_WEB_COOKIE_COOKIE_PATH = 'web/cookie/cookie_path';
     const XML_PATH_WEB_COOKIE_COOKIE_DOMAIN = 'web/cookie/cookie_domain';
     const XML_PATH_WEB_COOKIE_HTTPONLY = 'web/cookie/cookie_httponly';
     const XML_PATH_WEB_COOKIE_RESTRICTION = 'web/cookie/cookie_restriction';
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
index b86b86ad3bb8c..4ae66bfd9692b 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -71,7 +71,7 @@ protected function _getCurrencyBase()
                 $this->getScopeId()
             );
         }
-        return strval($value);
+        return (string)$value;
     }
 
     /**
@@ -88,7 +88,7 @@ protected function _getCurrencyDefault()
                 $this->getScopeId()
             );
         }
-        return strval($value);
+        return (string)$value;
     }
 
     /**
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
index 3f80e01802b8d..f29fa0611efa4 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
@@ -10,6 +10,8 @@
 namespace Magento\Config\Model\Config\Backend\Currency;
 
 /**
+ * Cron job configuration for currency
+ *
  * @api
  * @since 100.0.2
  */
@@ -47,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * After save handler
+     *
      * @return $this
      * @throws \Exception
      */
@@ -59,8 +63,8 @@ public function afterSave()
         $frequencyMonthly = \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY;
 
         $cronExprArray = [
-            intval($time[1]),                                 # Minute
-            intval($time[0]),                                 # Hour
+            (int)$time[1],                                 # Minute
+            (int)$time[0],                                 # Hour
             $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
             '*',                                              # Month of the Year
             $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week
diff --git a/app/code/Magento/Config/Model/Config/Backend/Email/Address.php b/app/code/Magento/Config/Model/Config/Backend/Email/Address.php
index 77fa787bcadc5..2d12884e7bc70 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Email/Address.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Email/Address.php
@@ -25,7 +25,9 @@ public function beforeSave()
     {
         $value = $this->getValue();
         if (!\Zend_Validate::is($value, \Magento\Framework\Validator\EmailAddress::class)) {
-            throw new LocalizedException(__('Please correct the email address: "%1".', $value));
+            throw new LocalizedException(
+                __('The "%1" email address is incorrect. Verify the email address and try again.', $value)
+            );
         }
         return $this;
     }
diff --git a/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php b/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
index 4e8be3623f399..cac4da2b52621 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
@@ -24,7 +24,7 @@ class Timezone extends \Magento\Framework\App\Config\Value
     public function beforeSave()
     {
         if (!in_array($this->getValue(), \DateTimeZone::listIdentifiers(\DateTimeZone::ALL))) {
-            throw new LocalizedException(__('Please correct the timezone.'));
+            throw new LocalizedException(__('The time zone is incorrect. Verify the time zone and try again.'));
         }
         return $this;
     }
diff --git a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
index 3c36baf6f31f4..cff6f54b3a7a8 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Log/Cron.php
@@ -10,6 +10,8 @@
 namespace Magento\Config\Model\Config\Backend\Log;
 
 /**
+ * Cron logger configuration
+ *
  * @api
  * @since 100.0.2
  */
@@ -73,8 +75,8 @@ public function afterSave()
 
         if ($enabled) {
             $cronExprArray = [
-                intval($time[1]),                                 # Minute
-                intval($time[0]),                                 # Hour
+                (int)$time[1],                                 # Minute
+                (int)$time[0],                                 # Hour
                 $frequency == $frequencyMonthly ? '1' : '*',      # Day of the Month
                 '*',                                              # Month of the Year
                 $frequency == $frequencyWeekly ? '1' : '*',        # Day of the Week
diff --git a/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php b/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
index 961931d6d28c1..5fc54fa1a8d1e 100644
--- a/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
+++ b/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Model\Config\Compiler;
 
 use Magento\Framework\DataObject;
@@ -114,6 +115,6 @@ protected function getContent($includePath)
             return $directoryRead->readFile($path);
         }
 
-        throw new LocalizedException(__('The file "%1" does not exist', $path));
+        throw new LocalizedException(__('The "%1" file doesn\'t exist.', $path));
     }
 }
diff --git a/app/code/Magento/Config/Model/Config/Importer.php b/app/code/Magento/Config/Model/Config/Importer.php
index 70ffdaec829b2..a54af2ead5048 100644
--- a/app/code/Magento/Config/Model/Config/Importer.php
+++ b/app/code/Magento/Config/Model/Config/Importer.php
@@ -124,13 +124,15 @@ public function import(array $data)
                 $this->scopeConfig->clean();
             }
 
-            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data) {
+            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) {
                 $this->scope->setCurrentScope(Area::AREA_ADMINHTML);
 
                 // Invoke saving of new values.
                 $this->saveProcessor->process($changedData);
-                $this->flagManager->saveFlag(static::FLAG_CODE, $data);
             });
+
+            $this->scope->setCurrentScope($currentScope);
+            $this->flagManager->saveFlag(static::FLAG_CODE, $data);
         } catch (\Exception $e) {
             throw new InvalidTransitionException(__('%1', $e->getMessage()), $e);
         } finally {
diff --git a/app/code/Magento/Config/Model/Config/PathValidator.php b/app/code/Magento/Config/Model/Config/PathValidator.php
index c7edbf51b7d36..68363bef69d91 100644
--- a/app/code/Magento/Config/Model/Config/PathValidator.php
+++ b/app/code/Magento/Config/Model/Config/PathValidator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Model\Config;
 
 use Magento\Framework\Exception\ValidatorException;
@@ -42,7 +43,7 @@ public function validate($path)
         $allPaths = $this->structure->getFieldPaths();
 
         if (!array_key_exists($path, $allPaths)) {
-            throw new ValidatorException(__('The "%1" path does not exist', $path));
+            throw new ValidatorException(__('The "%1" path doesn\'t exist. Verify and try again.', $path));
         }
 
         return true;
diff --git a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
index 03fe5ca2abccc..1c9eb801dfec7 100644
--- a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
+++ b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
@@ -11,15 +11,19 @@
  */
 class Nooptreq implements \Magento\Framework\Option\ArrayInterface
 {
+    const VALUE_NO = '';
+    const VALUE_OPTIONAL = 'opt';
+    const VALUE_REQUIRED = 'req';
+
     /**
      * @return array
      */
     public function toOptionArray()
     {
         return [
-            ['value' => '', 'label' => __('No')],
-            ['value' => 'opt', 'label' => __('Optional')],
-            ['value' => 'req', 'label' => __('Required')]
+            ['value' => self::VALUE_NO, 'label' => __('No')],
+            ['value' => self::VALUE_OPTIONAL, 'label' => __('Optional')],
+            ['value' => self::VALUE_REQUIRED, 'label' => __('Required')]
         ];
     }
 }
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
index 5a6dbc8e31896..a380dc82a7c5e 100644
--- a/app/code/Magento/Config/Model/Config/Structure.php
+++ b/app/code/Magento/Config/Model/Config/Structure.php
@@ -281,6 +281,10 @@ protected function _createEmptyElement(array $pathParts)
     public function getFieldPathsByAttribute($attributeName, $attributeValue)
     {
         $result = [];
+        if (empty($this->_data['sections'])) {
+            return $result;
+        }
+
         foreach ($this->_data['sections'] as $section) {
             if (!isset($section['children'])) {
                 continue;
@@ -333,7 +337,6 @@ protected function _getGroupFieldPathsByAttribute(array $fields, $parentPath, $a
     /**
      * Collects config paths and their structure paths from configuration files.
      * Returns the map of config paths and their structure paths.
-     *
      * All paths are declared in module's system.xml.
      *
      * ```xml
@@ -390,7 +393,7 @@ private function getFieldsRecursively(array $elements = [])
 
         foreach ($elements as $element) {
             if (isset($element['children'])) {
-                $result = array_replace_recursive(
+                $result = array_merge_recursive(
                     $result,
                     $this->getFieldsRecursively($element['children'])
                 );
diff --git a/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php b/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php
index 115a372e6150a..252042a41cc1d 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php
@@ -11,7 +11,8 @@
  * Defines status of visibility of form elements on Stores > Settings > Configuration page
  * in Admin Panel in Production mode.
  * @api
- * @since 100.2.0
+ * @deprecated class location was changed
+ * @see \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction
  */
 class ConcealInProductionConfigList implements ElementVisibilityInterface
 {
@@ -54,11 +55,12 @@ public function __construct(State $state, array $configs = [])
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @deprecated
      */
     public function isHidden($path)
     {
         $path = $this->normalizePath($path);
+
         return $this->state->getMode() === State::MODE_PRODUCTION
             && !empty($this->configs[$path])
             && $this->configs[$path] === static::HIDDEN;
@@ -66,7 +68,7 @@ public function isHidden($path)
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @deprecated
      */
     public function isDisabled($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php
new file mode 100755
index 0000000000000..d5ded9292864a
--- /dev/null
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\ElementVisibility;
+
+use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\State;
+
+/**
+ * Defines status of visibility of form elements on Stores > Settings > Configuration page
+ * in Admin Panel in Production mode.
+ * @api
+ */
+class ConcealInProduction implements ElementVisibilityInterface
+{
+    /**
+     * The list of form element paths with concrete visibility status.
+     *
+     * E.g.
+     *
+     * ```php
+     * [
+     *      'general/locale/code' => ElementVisibilityInterface::DISABLED,
+     *      'general/country' => ElementVisibilityInterface::HIDDEN,
+     * ];
+     * ```
+     *
+     * It means that:
+     *  - field Locale (in group Locale Options in section General) will be disabled
+     *  - group Country Options (in section General) will be hidden
+     *
+     * @var array
+     */
+    private $configs = [];
+
+    /**
+     * The object that has information about the state of the system.
+     *
+     * @var State
+     */
+    private $state;
+
+    /**
+     *
+     * The list of form element paths which ignore visibility status.
+     *
+     * E.g.
+     *
+     * ```php
+     * [
+     *      'general/country/default' => '',
+     * ];
+     * ```
+     *
+     * It means that:
+     *  - field 'default' in group Country Options (in section General) will be showed, even if all group(section)
+     *    will be hidden.
+     *
+     * @var array
+     */
+    private $exemptions = [];
+
+    /**
+     * @param State $state The object that has information about the state of the system
+     * @param array $configs The list of form element paths with concrete visibility status.
+     * @param array $exemptions The list of form element paths which ignore visibility status.
+     */
+    public function __construct(State $state, array $configs = [], array $exemptions = [])
+    {
+        $this->state = $state;
+        $this->configs = $configs;
+        $this->exemptions = $exemptions;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.2.0
+     */
+    public function isHidden($path)
+    {
+        $path = $this->normalizePath($path);
+        if ($this->state->getMode() === State::MODE_PRODUCTION
+            && preg_match('/(?<group>(?<section>.*?)\/.*?)\/.*?/', $path, $match)) {
+            $group = $match['group'];
+            $section = $match['section'];
+            $exemptions = array_keys($this->exemptions);
+            $checkedItems = [];
+            foreach ([$path, $group, $section] as $itemPath) {
+                $checkedItems[] = $itemPath;
+                if (!empty($this->configs[$itemPath])) {
+                    return $this->configs[$itemPath] === static::HIDDEN
+                        && empty(array_intersect($checkedItems, $exemptions));
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.2.0
+     */
+    public function isDisabled($path)
+    {
+        $path = $this->normalizePath($path);
+        if ($this->state->getMode() === State::MODE_PRODUCTION) {
+            while (true) {
+                if (!empty($this->configs[$path])) {
+                    return $this->configs[$path] === static::DISABLED;
+                }
+
+                $position = strripos($path, '/');
+                if ($position === false) {
+                    break;
+                }
+                $path = substr($path, 0, $position);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns normalized path.
+     *
+     * @param string $path The path to be normalized
+     * @return string The normalized path
+     */
+    private function normalizePath($path)
+    {
+        return trim($path, '/');
+    }
+}
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
new file mode 100755
index 0000000000000..29148a244dcc6
--- /dev/null
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\ElementVisibility;
+
+use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
+
+/**
+ * Defines status of visibility of form elements on Stores > Settings > Configuration page
+ * when Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION is enabled
+ * otherwise rule from Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction is used
+ * @see \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction
+ *
+ * @api
+ */
+class ConcealInProductionWithoutScdOnDemand implements ElementVisibilityInterface
+{
+    /**
+     * @var ConcealInProduction Element visibility rules in the Production mode
+     */
+    private $concealInProduction;
+
+    /**
+     * @var DeploymentConfig The application deployment configuration
+     */
+    private $deploymentConfig;
+
+    /**
+     * @param ConcealInProductionFactory $concealInProductionFactory
+     * @param DeploymentConfig $deploymentConfig Deployment configuration reader
+     * @param array $configs The list of form element paths with concrete visibility status.
+     * @param array $exemptions The list of form element paths which ignore visibility status.
+     */
+    public function __construct(
+        ConcealInProductionFactory $concealInProductionFactory,
+        DeploymentConfig $deploymentConfig,
+        array $configs = [],
+        array $exemptions = []
+    ) {
+        $this->concealInProduction = $concealInProductionFactory
+            ->create(['configs' => $configs, 'exemptions' => $exemptions]);
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isHidden($path): bool
+    {
+        if (!$this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)) {
+            return $this->concealInProduction->isHidden($path);
+        }
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isDisabled($path): bool
+    {
+        if (!$this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)) {
+            return $this->concealInProduction->isDisabled($path);
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
index f6f3a0be187a3..19e1acc6170f9 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
@@ -10,6 +10,8 @@
 namespace Magento\Config\Model\Config\Structure\Mapper;
 
 /**
+ * Sorting mapper
+ *
  * @api
  * @since 100.0.2
  */
@@ -30,6 +32,8 @@ public function map(array $data)
     }
 
     /**
+     * Process config
+     *
      * @param array $data
      * @return array
      */
@@ -55,17 +59,13 @@ protected function _cmp($elementA, $elementB)
     {
         $sortIndexA = 0;
         if ($this->_hasValue('sortOrder', $elementA)) {
-            $sortIndexA = floatval($elementA['sortOrder']);
+            $sortIndexA = (float)$elementA['sortOrder'];
         }
         $sortIndexB = 0;
         if ($this->_hasValue('sortOrder', $elementB)) {
-            $sortIndexB = floatval($elementB['sortOrder']);
-        }
-
-        if ($sortIndexA == $sortIndexB) {
-            return 0;
+            $sortIndexB = (float)$elementB['sortOrder'];
         }
 
-        return $sortIndexA < $sortIndexB ? -1 : 1;
+        return $sortIndexA <=> $sortIndexB;
     }
 }
diff --git a/app/code/Magento/Config/Model/Config/Structure/Reader.php b/app/code/Magento/Config/Model/Config/Structure/Reader.php
index 5916649588bcb..d59f6dd7a40fd 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Reader.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Reader.php
@@ -6,6 +6,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Model\Config\Structure;
 
 use Magento\Framework\DataObject;
@@ -97,7 +98,10 @@ protected function _readFiles($fileList)
                 }
             } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
                 throw new LocalizedException(
-                    new \Magento\Framework\Phrase("Invalid XML in file %1:\n%2", [$key, $e->getMessage()])
+                    new \Magento\Framework\Phrase(
+                        'The XML in file "%1" is invalid:' . "\n%2\nVerify the XML and try again.",
+                        [$key, $e->getMessage()]
+                    )
                 );
             }
         }
@@ -124,14 +128,18 @@ protected function _readFiles($fileList)
      * Processing nodes of the document before merging
      *
      * @param string $content
+     * @throws \Magento\Framework\Config\Dom\ValidationException
      * @return string
      */
     protected function processingDocument($content)
     {
         $object = new DataObject();
         $document = new \DOMDocument();
-
-        $document->loadXML($content);
+        try {
+            $document->loadXML($content);
+        } catch (\Exception $e) {
+            throw new \Magento\Framework\Config\Dom\ValidationException($e->getMessage());
+        }
         $this->compiler->compile($document->documentElement, $object, $object);
 
         return $document->saveXML();
diff --git a/app/code/Magento/Config/Model/ResourceModel/Config.php b/app/code/Magento/Config/Model/ResourceModel/Config.php
index d8ea2410ce860..594a9df719daa 100644
--- a/app/code/Magento/Config/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Config/Model/ResourceModel/Config.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Model\ResourceModel;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Core Resource Resource Model
  *
@@ -34,7 +36,7 @@ protected function _construct()
      * @param int $scopeId
      * @return $this
      */
-    public function saveConfig($path, $value, $scope, $scopeId)
+    public function saveConfig($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $connection = $this->getConnection();
         $select = $connection->select()->from(
@@ -70,7 +72,7 @@ public function saveConfig($path, $value, $scope, $scopeId)
      * @param int $scopeId
      * @return $this
      */
-    public function deleteConfig($path, $scope, $scopeId)
+    public function deleteConfig($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $connection = $this->getConnection();
         $connection->delete(
diff --git a/app/code/Magento/Config/Setup/InstallData.php b/app/code/Magento/Config/Setup/InstallData.php
deleted file mode 100644
index 37b8c72851712..0000000000000
--- a/app/code/Magento/Config/Setup/InstallData.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Config\Setup;
-
-use Magento\Framework\Module\Setup\Migration;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup->createMigrationSetup();
-        $setup->startSetup();
-
-        $installer->appendClassAliasReplace(
-            'core_config_data',
-            'value',
-            Migration::ENTITY_TYPE_MODEL,
-            Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['config_id']
-        );
-        $installer->doUpdateClassAliases();
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Config/Setup/InstallSchema.php b/app/code/Magento/Config/Setup/InstallSchema.php
deleted file mode 100644
index 2fd267f0dacc7..0000000000000
--- a/app/code/Magento/Config/Setup/InstallSchema.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Config\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $connection = $setup->getConnection();
-
-        $setup->startSetup();
-
-        /**
-         * Create table 'core_config_data'
-         */
-        $table = $connection->newTable(
-            $setup->getTable('core_config_data')
-        )->addColumn(
-            'config_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Config Id'
-        )->addColumn(
-            'scope',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            8,
-            ['nullable' => false, 'default' => 'default'],
-            'Config Scope'
-        )->addColumn(
-            'scope_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Config Scope Id'
-        )->addColumn(
-            'path',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false, 'default' => 'general'],
-            'Config Path'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Config Value'
-        )->addIndex(
-            $setup->getIdxName(
-                'core_config_data',
-                ['scope', 'scope_id', 'path'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['scope', 'scope_id', 'path'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->setComment(
-            'Config Data'
-        );
-        $connection->createTable($table);
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php b/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php
new file mode 100644
index 0000000000000..8986f624c1606
--- /dev/null
+++ b/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Config\Setup\Patch\Data;
+
+use Magento\Framework\Module\Setup\Migration;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateClassAliases
+ * @package Magento\Config\Setup\Patch
+ */
+class UpdateClassAliases implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * UpdateClassAliases constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $installer = $this->moduleDataSetup->createMigrationSetup();
+        $this->moduleDataSetup->startSetup();
+
+        $installer->appendClassAliasReplace(
+            'core_config_data',
+            'value',
+            Migration::ENTITY_TYPE_MODEL,
+            Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['config_id']
+        );
+        $installer->doUpdateClassAliases();
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
new file mode 100644
index 0000000000000..084f4ce92f0f8
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetGroupForValidVATIdIntraUnionActionGroup">
+        <arguments>
+            <argument name="value" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminStoresCustomerConfigurationPage.url}}" stepKey="navigateToCustomerConfigurationPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandCreateNewAccountOptionsTab" selector="{{AdminStoresCustomerConfigurationSection.createNewAccOpt}}" dependentSelector="{{AdminStoresCustomerConfigurationSection.enableAutoAssignCustomerGroup}}" visible="false"/>
+        <waitForElementVisible selector="{{AdminStoresCustomerConfigurationSection.createNewAccOpt}}" stepKey="waitForElementsAppeared"/>
+        <selectOption selector="{{AdminStoresCustomerConfigurationSection.groupForValidVATIdIntraUnion}}" userInput="{{value}}" stepKey="selectValue"/>
+        <click selector="{{AdminStoresCustomerConfigurationSection.createNewAccOpt}}" stepKey="collapseTab" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForConfigSaved"/>
+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
new file mode 100644
index 0000000000000..00bda74c7b5f8
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ConfigAdminAccountSharingActionGroup">
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/system_config/edit/section/admin/" stepKey="navigateToConfigurationPage" />
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick stepKey="expandSecurityTab" selector="{{AdminSection.SecurityTab}}" dependentSelector="{{AdminSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{AdminSection.AdminAccountSharing}}" stepKey="waitForAdminAccountSharingDrpDown" />
+        <uncheckOption selector="{{AdminSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{AdminSection.AdminAccountSharing}}" userInput="Yes" stepKey="selectYes"/>
+        <click selector="{{AdminSection.SecurityTab}}" stepKey="clollapseSecurityTab" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+    </actionGroup>
+    <actionGroup name="EnableAdminAccountSharingActionGroup">
+        <createData stepKey="setConfig" entity="EnableAdminAccountSharing"/>
+    </actionGroup>
+    <actionGroup name="DisableAdminAccountSharingActionGroup">
+        <createData stepKey="setConfig" entity="DisableAdminAccountSharing"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminCatalogSearchActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminCatalogSearchActionGroup.xml
new file mode 100644
index 0000000000000..2109b1cdbb566
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminCatalogSearchActionGroup.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ChooseElasticSearchAsSearchEngine">
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="configureSearchEngine"/>
+        <waitForPageLoad stepKey="waitForConfigPage"/>
+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab"/>
+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible"/>
+        <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="elasticsearch5" stepKey="chooseES5"/>
+        <!--<scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>-->
+        <!--<click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseCatalogSearchTab"/>-->
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="ResetSearchEngineConfiguration">
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="resetSearchEngine"/>
+        <waitForPageLoad stepKey="waitForConfigPage2"/>
+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>
+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab2"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible2"/>
+        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="mysql" stepKey="chooseMySQL"/>
+        <checkOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="checkUseSystemValue"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration2"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage2"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml
new file mode 100644
index 0000000000000..06c041fabeb35
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigSalesTaxClassActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetTaxClassForShipping">
+        <amOnPage url="{{AdminSalesTaxClassPage.url}}" stepKey="navigateToSalesTaxPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{SalesConfigSection.TaxClassesTab}}" dependentSelector="{{SalesConfigSection.CheckIfTaxClassesTabExpand}}" visible="true" stepKey="expandTaxClassesTab"/>
+        <waitForElementVisible selector="{{SalesConfigSection.ShippingTaxClass}}" stepKey="seeShippingTaxClass"/>
+        <uncheckOption selector="{{SalesConfigSection.EnableTaxClassForShipping}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{SalesConfigSection.ShippingTaxClass}}" userInput="Taxable Goods" stepKey="setShippingTaxClass"/>
+        <click selector="{{SalesConfigSection.TaxClassesTab}}" stepKey="collapseTaxClassesTab"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+    </actionGroup>
+    <actionGroup name="ResetTaxClassForShipping">
+        <amOnPage url="{{AdminSalesTaxClassPage.url}}" stepKey="navigateToSalesTaxConfigPagetoReset"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <conditionalClick selector="{{SalesConfigSection.TaxClassesTab}}" dependentSelector="{{SalesConfigSection.CheckIfTaxClassesTabExpand}}" visible="true" stepKey="openTaxClassTab"/>
+        <waitForElementVisible selector="{{SalesConfigSection.ShippingTaxClass}}" stepKey="seeShippingTaxClass2"/>
+        <selectOption selector="{{SalesConfigSection.ShippingTaxClass}}" userInput="None" stepKey="resetShippingTaxClass"/>
+        <checkOption selector="{{SalesConfigSection.EnableTaxClassForShipping}}" stepKey="useSystemValue"/>
+        <click selector="{{SalesConfigSection.TaxClassesTab}}" stepKey="collapseTaxClassesTab"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>
+    </actionGroup>
+    </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
new file mode 100644
index 0000000000000..771f0035b82b9
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="EnabledWYSIWYG">
+        <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
+    </actionGroup>
+    <actionGroup name="SwitchToTinyMCE3">
+    <comment userInput="Choose TinyMCE3 as the default editor" stepKey="chooseTinyMCE3AsEditor"/>
+    <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
+    <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
+    <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
+    <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown2" />
+    <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
+    <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
+    <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+    <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="DisabledWYSIWYG">
+        <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
+    </actionGroup>
+    <actionGroup name="UseStaticURLForMediaContentInWYSIWYG">
+        <arguments>
+            <argument name="value" defaultValue="Yes" type="string"/>
+        </arguments>
+        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
+        <selectOption selector="{{ContentManagementSection.StaticURL}}" userInput="{{value}}" stepKey="selectOption1"/>
+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
new file mode 100644
index 0000000000000..f1e0ea6b7e175
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="EnableWebUrlOptions">
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{WebSection.UrlOptionsTab}}" dependentSelector="{{WebSection.CheckIfUrlOptionsTabExpand}}" visible="true" stepKey="expandUrlSectionTab"/>
+        <waitForElementVisible selector="{{UrlOptionsSection.addStoreCodeToUrl}}" stepKey="seeAddStoreCodeToUrl"/>
+        <uncheckOption selector="{{UrlOptionsSection.systemValueForStoreCode}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{UrlOptionsSection.addStoreCodeToUrl}}" userInput="Yes" stepKey="enableStoreCode"/>
+        <click selector="{{WebSection.UrlOptionsTab}}" stepKey="collapseUrlOptions"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+    </actionGroup>
+    <actionGroup name="ResetWebUrlOptions">
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPagetoReset"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <conditionalClick selector="{{WebSection.UrlOptionsTab}}" dependentSelector="{{WebSection.CheckIfUrlOptionsTabExpand}}" visible="true" stepKey="closeUrlSectionTab"/>
+        <waitForElementVisible selector="{{UrlOptionsSection.addStoreCodeToUrl}}" stepKey="seeAddStoreCodeToUrl2"/>
+        <!--<uncheckOption selector="{{UrlOptionsSection.systemValueForStoreCode}}" stepKey="uncheckUseSystemValue"/>-->
+        <selectOption selector="{{UrlOptionsSection.addStoreCodeToUrl}}" userInput="No" stepKey="enableStoreCode"/>
+        <checkOption selector="{{UrlOptionsSection.systemValueForStoreCode}}" stepKey="checkUseSystemValue"/>
+        <click selector="{{WebSection.UrlOptionsTab}}" stepKey="collapseUrlOptions"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..f05cf5be3448e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="NavigateToDefaultLayoutsSetting">
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{DefaultLayoutsSection.categoryLayout}}" stepKey="waittForDefaultCategoryLayout" />
+    </actionGroup>
+
+    <actionGroup name="NavigateToConfigurationGeneralPage">
+        <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToConfigGeneralPage"/>
+        <waitForPageLoad stepKey="waitForConfigPageLoad"/>
+    </actionGroup>
+
+    <actionGroup name="SelectTopDestinationsCountry">
+        <arguments>
+            <argument name="countries" type="countryArray"/>
+        </arguments>
+        <selectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="selectTopDestinationsCountry"/>
+        <click selector="#save" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForSavingConfig"/>
+    </actionGroup>
+
+    <actionGroup name="UnSelectTopDestinationsCountry">
+        <arguments>
+            <argument name="countries" type="countryArray"/>
+        </arguments>
+        <unselectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="unSelectTopDestinationsCountry"/>
+        <click selector="#save" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForSavingConfig"/>
+    </actionGroup>
+
+    <actionGroup name="SelectCountriesWithRequiredRegion">
+        <arguments>
+            <argument name="countries" type="countryArray"/>
+        </arguments>
+        <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
+        <conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab" />
+        <waitForAjaxLoad stepKey="waitForAjax"/>
+        <scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
+        <selectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{countries.country}}]" stepKey="selectCountriesWithRequiredRegion"/>
+        <click selector="#save" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForSavingConfig"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
new file mode 100644
index 0000000000000..e9e899a68c33e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="RestoreLayoutSetting">
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SwitcherActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SwitcherActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
index d586a0a51c400..f29ee1a407203 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SwitcherActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
@@ -6,10 +6,11 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SwitchToVersion4ActionGroup">
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
         <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue"/>
@@ -18,4 +19,4 @@
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
     </actionGroup>
-</config>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
new file mode 100644
index 0000000000000..75dc19dc99c8e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="AdminAccountSharingYes" type="admin_account_sharing_value">
+        <data key="value">Yes</data>
+    </entity>
+    <entity name="AdminAccountSharingNo" type="admin_account_sharing_value">
+        <data key="value">No</data>
+    </entity>
+    <entity name="EnableAdminAccountSharing" type="admin_account_sharing_config">
+        <requiredEntity type="admin_account_sharing_value">AdminAccountSharingYes</requiredEntity>
+    </entity>
+    <entity name="DisableAdminAccountSharing" type="admin_account_sharing_config">
+        <requiredEntity type="admin_account_sharing_value">AdminAccountSharingNo</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
new file mode 100644
index 0000000000000..eda0eb904be86
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultWebUrlOptionsConfig" type="web_url_use_store">
+        <requiredEntity type="url_use_store_value">DefaultConfigWebUrlOptions</requiredEntity>
+    </entity>
+    <entity name="DefaultConfigWebUrlOptions" type="url_use_store_value">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="EnableWebUrlOptionsConfig" type="web_url_use_store">
+        <requiredEntity type="url_use_store_value">WebUrlOptionsYes</requiredEntity>
+    </entity>
+    <entity name="WebUrlOptionsYes" type="url_use_store_value">
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE.txt b/app/code/Magento/Config/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE.txt
rename to app/code/Magento/Config/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE_AFL.txt b/app/code/Magento/Config/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE_AFL.txt
rename to app/code/Magento/Config/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
new file mode 100644
index 0000000000000..37b8414d1f396
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="AdminAccountSharingConfig" dataType="admin_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/admin/" method="POST">
+        <object key="groups" dataType="admin_account_sharing_config">
+            <object key="security" dataType="admin_account_sharing_config">
+                 <object key="fields" dataType="admin_account_sharing_config">
+                    <object key="admin_account_sharing" dataType="admin_account_sharing_value">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
new file mode 100644
index 0000000000000..fc14ba7bbaba3
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="WebUrlOptionsConfig" dataType="web_url_use_store" type="create" auth="adminFormKey" url="/admin/system_config/save/section/web/"
+               method="POST" successRegex="/messages-message-success/" returnRegex="">
+        <object key="groups" dataType="web_url_use_store">
+            <object key="url" dataType="web_url_use_store">
+                 <object key="fields" dataType="web_url_use_store">
+                    <object key="use_store" dataType="url_use_store_value">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
new file mode 100644
index 0000000000000..c3fa13f59697e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCatalogSearchConfigurationPage" url="admin/system_config/edit/section/catalog/" area="admin" module="Magento_Config">
+        <section name="AdminCatalogSearchConfigurationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
new file mode 100644
index 0000000000000..7a62dfff8323b
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigPage" url="admin/system_config/" area="admin" module="Magento_Config">
+        <section name="AdminConfigSection"/>
+    </page>
+    <page name="AdminContentManagementPage" url="admin/system_config/edit/section/cms/" area="admin" module="Magento_Config">
+        <section name="ContentManagementSection"/>
+    </page>
+    <page name="CatalogConfigPage" url="admin/system_config/edit/section/catalog/" area="admin" module="Magento_Config">
+        <section name="ContentManagementSection"/>
+    </page>
+    <page name="AdminSalesTaxClassPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Config">
+        <section name="SalesTaxClassSection"/>
+    </page>
+    <page name="AdminConfigGeneralPage" url="admin/system_config/edit/section/general/" area="admin" module="Magento_Config">
+        <section name="GeneralSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
new file mode 100644
index 0000000000000..7897a181ff405
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSalesConfigPage" url="admin/system_config/edit/section/sales/{{var1}}" area="admin" parameterized="true" module="Magento_Config">
+        <section name="AdminSalesConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml
new file mode 100644
index 0000000000000..6a4efb6b9e152
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminStoresCustomerConfigurationPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminStoresCustomerConfigurationPage" url="admin/system_config/edit/section/customer/" area="admin" module="Magento_Config">
+        <section name="AdminStoresCustomerConfigurationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Config/Test/Mftf/README.md b/app/code/Magento/Config/Test/Mftf/README.md
new file mode 100644
index 0000000000000..060168a5fa643
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Config Functional Tests
+
+The Functional Test Module for **Magento Config** module.
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
new file mode 100644
index 0000000000000..8a56c2777084e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminConfigSection">
+        <element name="saveButton" type="button" selector="#save"/>
+        <element name="generalTab" type="text" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='General']"/>
+        <element name="generalTabClosed" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='false' or @aria-expanded='0']//strong[text()='General']"/>
+        <element name="generalTabOpened" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='true' or @aria-expanded='1']//strong[text()='General']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
new file mode 100644
index 0000000000000..1c2e2603566bf
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSalesConfigSection">
+        <element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
+        <element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>
+        <element name="giftOptions" type="select" selector="#sales_gift_options-head"/>
+        <element name="allowGiftReceipt" type="select" selector="#sales_gift_options_allow_gift_receipt"/>
+        <element name="allowPrintedCard" type="select" selector="#sales_gift_options_allow_printed_card"/>
+        <element name="go" type="select" selector="//a[@id='sales_gift_options-head']/ancestor::div[@class='entry-edit-head admin__collapsible-block']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
new file mode 100644
index 0000000000000..7b6c9f8ab3b79
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSection">
+        <element name="CheckIfTabExpand" type="button" selector="#admin_security-head:not(.open)"/>
+        <element name="SecurityTab" type="button" selector="#admin_security-head"/>
+        <element name="AdminAccountSharing" type="button" selector="#admin_security_admin_account_sharing"/>
+        <element name="EnableSystemValue" type="button" selector="#admin_security_admin_account_sharing_inherit"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
new file mode 100644
index 0000000000000..823be383ce123
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoresCustomerConfigurationSection">
+        <element name="createNewAccOpt" type="button" selector="#customer_create_account-head"/>
+        <element name="enableAutoAssignCustomerGroup" type="button" selector="#customer_create_account_auto_group_assign"/>
+        <element name="groupForValidVATIdIntraUnion" type="select" selector="#customer_create_account_viv_intra_union_group"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
new file mode 100644
index 0000000000000..e82ad4670f9b3
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCatalogSearchConfigurationSection">
+        <element name="catalogSearchTab" type="button" selector="#catalog_search-head"/>
+        <element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
+        <element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
+        <element name="searchEngine" type="select" selector="#catalog_search_engine"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
new file mode 100644
index 0000000000000..c48f33ba06b3b
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CatalogSection">
+        <element name="storefront" type="select" selector="#catalog_frontend-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#catalog_frontend-head:not(.open)"/>
+        <element name="price" type="button" selector="#catalog_price-head"/>
+        <element name="checkIfPriceExpand" type="button" selector="//a[@id='catalog_price-head' and @class='open']"/>
+        <element name="catalogPriceScope" type="select" selector="#catalog_price_scope"/>
+        <element name="catalogPriceScopeValue" type="select" selector="//select[@id='catalog_price_scope']/option[text()='{{args}}']" parameterized="true"/>
+        <element name="defaultProductPrice" type="input" selector="#catalog_price_default_product_price"/>
+        <element name="save" type="button" selector="#save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
new file mode 100644
index 0000000000000..66b40f74d8e98
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="ContentManagementSection">
+        <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
+        <element name="EnableSystemValue" type="button" selector="#cms_wysiwyg_enabled_inherit"/>
+        <element name="EnableWYSIWYG" type="button" selector="#cms_wysiwyg_enabled"/>
+        <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit"/>
+        <element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
+        <element name="StaticURL" type="button" selector="#cms_wysiwyg_use_static_urls_in_catalog" />
+        <element name="Save" type="button" selector="#save" timeout="30"/>
+    </section>
+    <section name="WebSection">
+        <element name="DefaultLayoutsTab" type="button" selector="#web_default_layouts-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#web_default_layouts-head:not(.open)"/>
+        <element name="UrlOptionsTab" type="button" selector="#web_url-head"/>
+        <element name="CheckIfUrlOptionsTabExpand" type="button" selector="#web_url-head:not(.open)"/>
+    </section>
+    <section name="DefaultLayoutsSection">
+        <element name="productLayout" type="select" selector="#web_default_layouts_default_product_layout"/>
+        <element name="categoryLayout" type="select" selector="#web_default_layouts_default_category_layout"/>
+        <element name="pageLayout" type="select" selector="#web_default_layouts_default_cms_layout"/>
+    </section>
+    <section name="UrlOptionsSection">
+        <element name="addStoreCodeToUrl" type="select" selector="#web_url_use_store"/>
+        <element name="systemValueForStoreCode" type="checkbox" selector="#web_url_use_store_inherit"/>
+    </section>
+    <section name="CountryOptionsSection">
+        <element name="countryOptions" type="button" selector="#general_country-head"/>
+        <element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
+        <element name="topDestinations" type="select" selector="#general_country_destinations"/>
+    </section>
+    <section name="StateOptionsSection">
+        <element name="stateOptions" type="button" selector="#general_region-head"/>
+        <element name="countriesWithRequiredRegions" type="select" selector="#general_region_state_required"/>
+        <element name="allowToChooseState" type="select" selector="general_region_display_all"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml
new file mode 100644
index 0000000000000..fbe1fd77eaa46
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/SalesConfigSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="SalesConfigSection">
+        <element name="TaxClassesTab" type="button" selector="#tax_classes-head"/>
+        <element name="CheckIfTaxClassesTabExpand" type="button" selector="#tax_classes-head:not(.open)"/>
+        <element name="ShippingTaxClass" type="select" selector="#tax_classes_shipping_tax_class"/>
+        <element name="EnableTaxClassForShipping" type="checkbox" selector="#tax_classes_shipping_tax_class_inherit"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
new file mode 100644
index 0000000000000..52fc0018a949d
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StoreConfigSection">
+        <element name="CheckIfTabExpand" type="button" selector="#general_store_information-head:not(.open)"/>
+        <element name="StoreInformation" type="button" selector="#general_store_information-head"/>
+        <element name="City" type="input" selector="#general_store_information_city"/>
+        <element name="Save" type="button" selector="#save" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
new file mode 100644
index 0000000000000..66aacf706b039
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyAllowDynamicMediaURLsSettingIsRemoved">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Dynamic Media URL"/>
+            <title value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <description value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-1364"/>
+            <testCaseId value="MC-3178"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandStorefrontTab" selector="{{CatalogSection.storefront}}" dependentSelector="{{CatalogSection.CheckIfTabExpand}}" visible="true" />
+        <dontSee stepKey="dontSeeDynamicMediaURLsSetting" userInput="Allow Dynamic Media URLs"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/EnvironmentConfigSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/EnvironmentConfigSourceTest.php
index 5737ee54fd3a4..d06fde7becabb 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Source/EnvironmentConfigSourceTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/EnvironmentConfigSourceTest.php
@@ -91,7 +91,7 @@ public function getDataProvider()
         ];
     }
 
-    public function testGetWithoutEnvCongigurationVariables()
+    public function testGetWithoutEnvConfigurationVariables()
     {
         $expectedArray = [];
 
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
index 7fb126a00ff84..9ec2d9bb9a1f4 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
@@ -84,10 +84,6 @@ public function testGetCachedWithLoadDefaultScopeData()
             ->method('process')
             ->with($data)
             ->willReturn($data);
-        $this->postProcessor->expects($this->once())
-            ->method('process')
-            ->with($data)
-            ->willReturn($data);
         $this->assertEquals($data, $this->model->read());
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
deleted file mode 100644
index 74315af448226..0000000000000
--- a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Config\Test\Unit\App\Config\Type;
-
-use Magento\Config\App\Config\Type\System;
-use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\App\Config\Spi\PostProcessorInterface;
-use Magento\Framework\App\Config\Spi\PreProcessorInterface;
-use Magento\Framework\Cache\FrontendInterface;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Store\Model\Config\Processor\Fallback;
-use Magento\Config\App\Config\Type\System\Reader;
-
-/**
- * Test how Class process source, cache them and retrieve value by path
- * @package Magento\Config\Test\Unit\App\Config\Type
- */
-class SystemTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ConfigSourceInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $source;
-
-    /**
-     * @var PostProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $postProcessor;
-
-    /**
-     * @var PreProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $preProcessor;
-
-    /**
-     * @var Fallback|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fallback;
-
-    /**
-     * @var FrontendInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cache;
-
-    /**
-     * @var System
-     */
-    private $configType;
-
-    /**
-     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $serializer;
-
-    /**
-     * @var Reader|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $reader;
-
-    public function setUp()
-    {
-        $this->source = $this->getMockBuilder(ConfigSourceInterface::class)
-            ->getMockForAbstractClass();
-        $this->postProcessor = $this->getMockBuilder(PostProcessorInterface::class)
-            ->getMockForAbstractClass();
-        $this->fallback = $this->getMockBuilder(Fallback::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->cache = $this->getMockBuilder(FrontendInterface::class)
-            ->getMockForAbstractClass();
-        $this->preProcessor = $this->getMockBuilder(PreProcessorInterface::class)
-            ->getMockForAbstractClass();
-        $this->serializer = $this->getMockBuilder(SerializerInterface::class)
-            ->getMock();
-        $this->reader = $this->getMockBuilder(Reader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->configType = new System(
-            $this->source,
-            $this->postProcessor,
-            $this->fallback,
-            $this->cache,
-            $this->serializer,
-            $this->preProcessor,
-            1,
-            'system',
-            $this->reader
-        );
-    }
-
-    public function testGetCachedWithLoadDefaultScopeData()
-    {
-        $path = 'default/dev/unsecure/url';
-        $url = 'http://magento.test/';
-        $data = [
-            'dev' => [
-                'unsecure' => [
-                    'url' => $url
-                ]
-            ]
-        ];
-
-        $this->cache->expects($this->any())
-            ->method('load')
-            ->willReturnOnConsecutiveCalls('1', serialize($data));
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->willReturn($data);
-        $this->assertEquals($url, $this->configType->get($path));
-    }
-
-    public function testGetCachedWithLoadAllData()
-    {
-        $url = 'http://magento.test/';
-        $data = [
-            'dev' => [
-                'unsecure' => [
-                    'url' => $url
-                ]
-            ]
-        ];
-
-        $this->cache->expects($this->any())
-            ->method('load')
-            ->willReturnOnConsecutiveCalls('1', serialize($data));
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->willReturn($data);
-        $this->assertEquals($data, $this->configType->get(''));
-    }
-
-    public function testGetNotCached()
-    {
-        $path = 'stores/default/dev/unsecure/url';
-        $url = 'http://magento.test/';
-
-        $dataToCache = [
-            'unsecure' => [
-                'url' => $url
-            ]
-        ];
-        $data = [
-            'default' => [],
-            'websites' => [],
-            'stores' => [
-                'default' => [
-                    'dev' => [
-                        'unsecure' => [
-                            'url' => $url
-                        ]
-                    ]
-                ]
-            ]
-        ];
-        $this->cache->expects($this->any())
-            ->method('load')
-            ->willReturnOnConsecutiveCalls(false, false);
-
-        $this->serializer->expects($this->atLeastOnce())
-            ->method('serialize')
-            ->willReturn(serialize($dataToCache));
-        $this->cache->expects($this->atLeastOnce())
-            ->method('save')
-            ->willReturnSelf();
-        $this->reader->expects($this->once())
-            ->method('read')
-            ->willReturn($data);
-
-        $this->assertEquals($url, $this->configType->get($path));
-    }
-}
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
index d3750022d93de..1cb393b212199 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
@@ -121,6 +121,9 @@ public function testInitTabs($section, $website, $store)
         );
     }
 
+    /**
+     * @return array
+     */
     public function initTabsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
index 1679ac75ad02c..8a005a52ab614 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -72,7 +72,7 @@ public function testGetElementHtmlWithValue()
                 'showInWebsite' => '1',
                 'showInStore' => '1',
                 'label' => null,
-                'backend_model' => \Magento\BackendModelConfig\Backend\Image::class,
+                'backend_model' => \Magento\Config\Model\Config\Backend\Image::class,
                 'upload_dir' => [
                     'config' => 'system/filesystem/media',
                     'scope_info' => '1',
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php
index 4f53f1072e035..0b4d5f7ef15f7 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php
@@ -128,7 +128,8 @@ public function testRenderCellTemplateWrongColumnName()
 
         $this->object->addColumn($wrongColumnName, $this->cellParameters);
 
-        $this->expectException('\Exception', 'Wrong column name specified.');
+        $this->expectException('\Exception');
+        $this->expectExceptionMessage('Wrong column name specified.');
 
         $this->object->renderCellTemplate($columnName);
     }
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index be3b8e2ead0c1..f5c65e848b3bf 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -85,6 +85,9 @@ public function testGetHtmlWhenValueIsEmpty($value)
         $this->assertNotEmpty($this->_object->getHtml());
     }
 
+    /**
+     * @return array
+     */
     public function getHtmlWhenValueIsEmptyDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
index 9d76363213d0b..bb109bcb25f06 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
@@ -224,6 +224,9 @@ public function testRender($expanded, $nested, $extra)
         }
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index 8385f75a0820a..93650dd62657c 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -227,6 +227,9 @@ public function testInitForm($sectionIsVisible)
         $this->assertEquals($this->_formMock, $object->getForm());
     }
 
+    /**
+     * @return array
+     */
     public function initFormDataProvider()
     {
         return [
@@ -340,6 +343,9 @@ public function testInitGroup($shouldCloneFields, $prefixes, $callNum)
         $object->initForm();
     }
 
+    /**
+     * @return array
+     */
     public function initGroupDataProvider()
     {
         return [
@@ -546,8 +552,8 @@ public function initFieldsDataProvider()
         return [
             [
                 ['section1/group1/field1' => 'some_value'],
-                false,
-                null,
+                'some_value',
+                'section1/group1/field1',
                 false,
                 'some_value',
                 null,
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php
index 1fa0310ca62eb..12b97eb254ded 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
 
 use Magento\Config\Console\Command\ConfigSet\ConfigSetProcessorFactory;
@@ -40,7 +41,7 @@ protected function setUp()
         $this->model = new ConfigSetProcessorFactory(
             $this->objectManagerMock,
             [
-                ConfigSetProcessorFactory::TYPE_LOCK => LockProcessor::class,
+                ConfigSetProcessorFactory::TYPE_LOCK_ENV => LockProcessor::class,
                 ConfigSetProcessorFactory::TYPE_DEFAULT => DefaultProcessor::class,
                 'wrongType' => \stdClass::class,
             ]
@@ -58,13 +59,13 @@ public function testCreate()
 
         $this->assertInstanceOf(
             ConfigSetProcessorInterface::class,
-            $this->model->create(ConfigSetProcessorFactory::TYPE_LOCK)
+            $this->model->create(ConfigSetProcessorFactory::TYPE_LOCK_ENV)
         );
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Class for type "dummyType" was not declared
+     * @expectedExceptionMessage The class for "dummyType" type wasn't declared. Enter the class and try again.
      */
     public function testCreateNonExisted()
     {
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 066b0fbe84b50..984e0fe842687 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -166,7 +166,9 @@ private function configMockForProcessTest($path, $scope, $scopeCode)
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The value you set has already been locked. To change the value, use the --lock option.
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessage The value you set has already been locked. To change the value, use the --lock-env option.
+     * @codingStandardsIgnoreEnd
      */
     public function testProcessLockedValue()
     {
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockConfigProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockConfigProcessorTest.php
new file mode 100644
index 0000000000000..c727184efb4fc
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockConfigProcessorTest.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
+
+use Magento\Config\Console\Command\ConfigSet\LockProcessor;
+use Magento\Config\Model\PreparedValueFactory;
+use Magento\Framework\App\Config\ConfigPathResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+
+/**
+ * Test for ShareProcessor.
+ *
+ * @see ShareProcessor
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class LockConfigProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var LockProcessor
+     */
+    private $model;
+
+    /**
+     * @var PreparedValueFactory|Mock
+     */
+    private $preparedValueFactory;
+
+    /**
+     * @var DeploymentConfig\Writer|Mock
+     */
+    private $deploymentConfigWriterMock;
+
+    /**
+     * @var ArrayManager|Mock
+     */
+    private $arrayManagerMock;
+
+    /**
+     * @var ConfigPathResolver|Mock
+     */
+    private $configPathResolver;
+
+    /**
+     * @var Value|Mock
+     */
+    private $valueMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->preparedValueFactory = $this->getMockBuilder(PreparedValueFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->deploymentConfigWriterMock = $this->getMockBuilder(DeploymentConfig\Writer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->arrayManagerMock = $this->getMockBuilder(ArrayManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configPathResolver = $this->getMockBuilder(ConfigPathResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->valueMock = $this->getMockBuilder(Value::class)
+            ->setMethods(['validateBeforeSave', 'beforeSave', 'setValue', 'getValue', 'afterSave'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new LockProcessor(
+            $this->preparedValueFactory,
+            $this->deploymentConfigWriterMock,
+            $this->arrayManagerMock,
+            $this->configPathResolver,
+            ConfigFilePool::APP_CONFIG
+        );
+    }
+
+    /**
+     * Tests process of share flow.
+     *
+     * @param string $path
+     * @param string $value
+     * @param string $scope
+     * @param string|null $scopeCode
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($path, $value, $scope, $scopeCode)
+    {
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->with($path, $value, $scope, $scopeCode)
+            ->willReturn($this->valueMock);
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->arrayManagerMock->expects($this->once())
+            ->method('set')
+            ->with('system/default/test/test/test', [], $value)
+            ->willReturn([
+                'system' => [
+                    'default' => [
+                        'test' => [
+                            'test' => [
+                                'test' => $value
+                            ]
+                        ]
+                    ]
+                ]
+            ]);
+        $this->valueMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($value);
+        $this->deploymentConfigWriterMock->expects($this->once())
+            ->method('saveConfig')
+            ->with(
+                [
+                    ConfigFilePool::APP_CONFIG => [
+                        'system' => [
+                            'default' => [
+                                'test' => [
+                                    'test' => [
+                                        'test' => $value
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                false
+            );
+        $this->valueMock->expects($this->once())
+            ->method('validateBeforeSave');
+        $this->valueMock->expects($this->once())
+            ->method('beforeSave');
+        $this->valueMock->expects($this->once())
+            ->method('afterSave');
+
+        $this->model->process($path, $value, $scope, $scopeCode);
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            ['test/test/test', 'value', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+            ['test/test/test', 'value', ScopeInterface::SCOPE_WEBSITE, 'base'],
+            ['test/test/test', 'value', ScopeInterface::SCOPE_STORE, 'test'],
+        ];
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Filesystem is not writable.
+     */
+    public function testProcessNotReadableFs()
+    {
+        $path = 'test/test/test';
+        $value = 'value';
+
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->valueMock);
+        $this->valueMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($value);
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->arrayManagerMock->expects($this->once())
+            ->method('set')
+            ->with('system/default/test/test/test', [], $value)
+            ->willReturn(null);
+        $this->deploymentConfigWriterMock->expects($this->once())
+            ->method('saveConfig')
+            ->willThrowException(new FileSystemException(__('Filesystem is not writable.')));
+
+        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Invalid values
+     */
+    public function testCustomException()
+    {
+        $path = 'test/test/test';
+        $value = 'value';
+
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->valueMock);
+        $this->arrayManagerMock->expects($this->never())
+            ->method('set');
+        $this->valueMock->expects($this->once())
+            ->method('getValue');
+        $this->valueMock->expects($this->once())
+            ->method('afterSave')
+            ->willThrowException(new \Exception('Invalid values'));
+        $this->deploymentConfigWriterMock->expects($this->never())
+            ->method('saveConfig');
+
+        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+    }
+}
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockEnvProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockEnvProcessorTest.php
new file mode 100644
index 0000000000000..4e0248f886028
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockEnvProcessorTest.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
+
+use Magento\Config\Console\Command\ConfigSet\LockProcessor;
+use Magento\Config\Model\PreparedValueFactory;
+use Magento\Framework\App\Config\ConfigPathResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+
+/**
+ * Test for LockProcessor.
+ *
+ * @see LockProcessor
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class LockEnvProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var LockProcessor
+     */
+    private $model;
+
+    /**
+     * @var PreparedValueFactory|Mock
+     */
+    private $preparedValueFactory;
+
+    /**
+     * @var DeploymentConfig\Writer|Mock
+     */
+    private $deploymentConfigWriterMock;
+
+    /**
+     * @var ArrayManager|Mock
+     */
+    private $arrayManagerMock;
+
+    /**
+     * @var ConfigPathResolver|Mock
+     */
+    private $configPathResolver;
+
+    /**
+     * @var Value|Mock
+     */
+    private $valueMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->preparedValueFactory = $this->getMockBuilder(PreparedValueFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->deploymentConfigWriterMock = $this->getMockBuilder(DeploymentConfig\Writer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->arrayManagerMock = $this->getMockBuilder(ArrayManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configPathResolver = $this->getMockBuilder(ConfigPathResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->valueMock = $this->getMockBuilder(Value::class)
+            ->setMethods(['validateBeforeSave', 'beforeSave', 'setValue', 'getValue', 'afterSave'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new LockProcessor(
+            $this->preparedValueFactory,
+            $this->deploymentConfigWriterMock,
+            $this->arrayManagerMock,
+            $this->configPathResolver,
+            ConfigFilePool::APP_ENV
+        );
+    }
+
+    /**
+     * Tests process of lock flow.
+     *
+     * @param string $path
+     * @param string $value
+     * @param string $scope
+     * @param string|null $scopeCode
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($path, $value, $scope, $scopeCode)
+    {
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->with($path, $value, $scope, $scopeCode)
+            ->willReturn($this->valueMock);
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->arrayManagerMock->expects($this->once())
+            ->method('set')
+            ->with('system/default/test/test/test', [], $value)
+            ->willReturn([
+                'system' => [
+                    'default' => [
+                        'test' => [
+                            'test' => [
+                                'test' => $value
+                            ]
+                        ]
+                    ]
+                ]
+            ]);
+        $this->valueMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($value);
+        $this->deploymentConfigWriterMock->expects($this->once())
+            ->method('saveConfig')
+            ->with(
+                [
+                    ConfigFilePool::APP_ENV => [
+                        'system' => [
+                            'default' => [
+                                'test' => [
+                                    'test' => [
+                                        'test' => $value
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                false
+            );
+        $this->valueMock->expects($this->once())
+            ->method('validateBeforeSave');
+        $this->valueMock->expects($this->once())
+            ->method('beforeSave');
+        $this->valueMock->expects($this->once())
+            ->method('afterSave');
+
+        $this->model->process($path, $value, $scope, $scopeCode);
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            ['test/test/test', 'value', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+            ['test/test/test', 'value', ScopeInterface::SCOPE_WEBSITE, 'base'],
+            ['test/test/test', 'value', ScopeInterface::SCOPE_STORE, 'test'],
+        ];
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Filesystem is not writable.
+     */
+    public function testProcessNotReadableFs()
+    {
+        $path = 'test/test/test';
+        $value = 'value';
+
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->valueMock);
+        $this->valueMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($value);
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->arrayManagerMock->expects($this->once())
+            ->method('set')
+            ->with('system/default/test/test/test', [], $value)
+            ->willReturn(null);
+        $this->deploymentConfigWriterMock->expects($this->once())
+            ->method('saveConfig')
+            ->willThrowException(new FileSystemException(__('Filesystem is not writable.')));
+
+        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Invalid values
+     */
+    public function testCustomException()
+    {
+        $path = 'test/test/test';
+        $value = 'value';
+
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->valueMock);
+        $this->arrayManagerMock->expects($this->never())
+            ->method('set');
+        $this->valueMock->expects($this->once())
+            ->method('getValue');
+        $this->valueMock->expects($this->once())
+            ->method('afterSave')
+            ->willThrowException(new \Exception('Invalid values'));
+        $this->deploymentConfigWriterMock->expects($this->never())
+            ->method('saveConfig');
+
+        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+    }
+}
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockProcessorTest.php
deleted file mode 100644
index 4535e9ad888c2..0000000000000
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockProcessorTest.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
-
-use Magento\Config\Console\Command\ConfigSet\LockProcessor;
-use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\ConfigPathResolver;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\Config\File\ConfigFilePool;
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Store\Model\ScopeInterface;
-use PHPUnit_Framework_MockObject_MockObject as Mock;
-
-/**
- * Test for LockProcessor.
- *
- * @see LockProcessor
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class LockProcessorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var LockProcessor
-     */
-    private $model;
-
-    /**
-     * @var PreparedValueFactory|Mock
-     */
-    private $preparedValueFactory;
-
-    /**
-     * @var DeploymentConfig\Writer|Mock
-     */
-    private $deploymentConfigWriterMock;
-
-    /**
-     * @var ArrayManager|Mock
-     */
-    private $arrayManagerMock;
-
-    /**
-     * @var ConfigPathResolver|Mock
-     */
-    private $configPathResolver;
-
-    /**
-     * @var Value|Mock
-     */
-    private $valueMock;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp()
-    {
-        $this->preparedValueFactory = $this->getMockBuilder(PreparedValueFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->deploymentConfigWriterMock = $this->getMockBuilder(DeploymentConfig\Writer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->arrayManagerMock = $this->getMockBuilder(ArrayManager::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configPathResolver = $this->getMockBuilder(ConfigPathResolver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->valueMock = $this->getMockBuilder(Value::class)
-            ->setMethods(['validateBeforeSave', 'beforeSave', 'setValue', 'getValue', 'afterSave'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->model = new LockProcessor(
-            $this->preparedValueFactory,
-            $this->deploymentConfigWriterMock,
-            $this->arrayManagerMock,
-            $this->configPathResolver
-        );
-    }
-
-    /**
-     * Tests process of lock flow.
-     *
-     * @param string $path
-     * @param string $value
-     * @param string $scope
-     * @param string|null $scopeCode
-     * @dataProvider processDataProvider
-     */
-    public function testProcess($path, $value, $scope, $scopeCode)
-    {
-        $this->preparedValueFactory->expects($this->once())
-            ->method('create')
-            ->with($path, $value, $scope, $scopeCode)
-            ->willReturn($this->valueMock);
-        $this->configPathResolver->expects($this->once())
-            ->method('resolve')
-            ->willReturn('system/default/test/test/test');
-        $this->arrayManagerMock->expects($this->once())
-            ->method('set')
-            ->with('system/default/test/test/test', [], $value)
-            ->willReturn([
-                'system' => [
-                    'default' => [
-                        'test' => [
-                            'test' => [
-                                'test' => $value
-                            ]
-                        ]
-                    ]
-                ]
-            ]);
-        $this->valueMock->expects($this->once())
-            ->method('getValue')
-            ->willReturn($value);
-        $this->deploymentConfigWriterMock->expects($this->once())
-            ->method('saveConfig')
-            ->with(
-                [
-                    ConfigFilePool::APP_ENV => [
-                        'system' => [
-                            'default' => [
-                                'test' => [
-                                    'test' => [
-                                        'test' => $value
-                                    ]
-                                ]
-                            ]
-                        ]
-                    ]
-                ],
-                false
-            );
-        $this->valueMock->expects($this->once())
-            ->method('validateBeforeSave');
-        $this->valueMock->expects($this->once())
-            ->method('beforeSave');
-        $this->valueMock->expects($this->once())
-            ->method('afterSave');
-
-        $this->model->process($path, $value, $scope, $scopeCode);
-    }
-
-    /**
-     * @return array
-     */
-    public function processDataProvider()
-    {
-        return [
-            ['test/test/test', 'value', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
-            ['test/test/test', 'value', ScopeInterface::SCOPE_WEBSITE, 'base'],
-            ['test/test/test', 'value', ScopeInterface::SCOPE_STORE, 'test'],
-        ];
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Filesystem is not writable.
-     */
-    public function testProcessNotReadableFs()
-    {
-        $path = 'test/test/test';
-        $value = 'value';
-
-        $this->preparedValueFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($this->valueMock);
-        $this->valueMock->expects($this->once())
-            ->method('getValue')
-            ->willReturn($value);
-        $this->configPathResolver->expects($this->once())
-            ->method('resolve')
-            ->willReturn('system/default/test/test/test');
-        $this->arrayManagerMock->expects($this->once())
-            ->method('set')
-            ->with('system/default/test/test/test', [], $value)
-            ->willReturn(null);
-        $this->deploymentConfigWriterMock->expects($this->once())
-            ->method('saveConfig')
-            ->willThrowException(new FileSystemException(__('Filesystem is not writable.')));
-
-        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Invalid values
-     */
-    public function testCustomException()
-    {
-        $path = 'test/test/test';
-        $value = 'value';
-
-        $this->configPathResolver->expects($this->once())
-            ->method('resolve')
-            ->willReturn('system/default/test/test/test');
-        $this->preparedValueFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($this->valueMock);
-        $this->arrayManagerMock->expects($this->never())
-            ->method('set');
-        $this->valueMock->expects($this->once())
-            ->method('getValue');
-        $this->valueMock->expects($this->once())
-            ->method('afterSave')
-            ->willThrowException(new \Exception('Invalid values'));
-        $this->deploymentConfigWriterMock->expects($this->never())
-            ->method('saveConfig');
-
-        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
-    }
-}
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
index 4e65ab3f4cc21..ac4dda2a98517 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Config\Model\Config\PathValidator;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -122,7 +123,13 @@ public function testProcess()
 
         $this->assertSame(
             'Value was saved.',
-            $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false)
+            $this->model->processWithLockTarget(
+                'test/test/test',
+                'test',
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                null,
+                false
+            )
         );
     }
 
@@ -132,12 +139,19 @@ public function testProcess()
      */
     public function testProcessWithValidatorException(LocalizedException $exception)
     {
-        $this->expectException(ValidatorException::class, 'Some error');
+        $this->expectException(ValidatorException::class);
+        $this->expectExceptionMessage('Some error');
         $this->scopeValidatorMock->expects($this->once())
             ->method('isValid')
             ->willThrowException($exception);
 
-        $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false);
+        $this->model->processWithLockTarget(
+            'test/test/test',
+            'test',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            null,
+            false
+        );
     }
 
     /**
@@ -172,7 +186,13 @@ public function testProcessWithConfigurationMismatchException()
         $this->configMock->expects($this->never())
             ->method('clean');
 
-        $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false);
+        $this->model->processWithLockTarget(
+            'test/test/test',
+            'test',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            null,
+            false
+        );
     }
 
     /**
@@ -198,17 +218,50 @@ public function testProcessWithCouldNotSaveException()
         $this->configMock->expects($this->never())
             ->method('clean');
 
-        $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false);
+        $this->model->processWithLockTarget(
+            'test/test/test',
+            'test',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            null,
+            false
+        );
+    }
+
+    public function testExecuteLockEnv()
+    {
+        $this->scopeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->willReturn(true);
+        $this->configSetProcessorFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ConfigSetProcessorFactory::TYPE_LOCK_ENV)
+            ->willReturn($this->processorMock);
+        $this->processorMock->expects($this->once())
+            ->method('process')
+            ->with('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+        $this->configMock->expects($this->once())
+            ->method('clean');
+
+        $this->assertSame(
+            'Value was saved in app/etc/env.php and locked.',
+            $this->model->processWithLockTarget(
+                'test/test/test',
+                'test',
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                null,
+                true
+            )
+        );
     }
 
-    public function testExecuteLock()
+    public function testExecuteLockConfig()
     {
         $this->scopeValidatorMock->expects($this->once())
             ->method('isValid')
             ->willReturn(true);
         $this->configSetProcessorFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ConfigSetProcessorFactory::TYPE_LOCK)
+            ->with(ConfigSetProcessorFactory::TYPE_LOCK_CONFIG)
             ->willReturn($this->processorMock);
         $this->processorMock->expects($this->once())
             ->method('process')
@@ -217,8 +270,15 @@ public function testExecuteLock()
             ->method('clean');
 
         $this->assertSame(
-            'Value was saved and locked.',
-            $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, true)
+            'Value was saved in app/etc/config.php and locked.',
+            $this->model->processWithLockTarget(
+                'test/test/test',
+                'test',
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                null,
+                true,
+                ConfigFilePool::APP_CONFIG
+            )
         );
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
index 39f9c47361352..cb3a401e6f1d1 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Test\Unit\Console\Command;
 
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
@@ -94,7 +95,7 @@ public function testExecute()
             ->method('create')
             ->willReturn($this->processorFacadeMock);
         $this->processorFacadeMock->expects($this->once())
-            ->method('process')
+            ->method('processWithLockTarget')
             ->willReturn('Some message');
         $this->emulatedAreProcessorMock->expects($this->once())
             ->method('process')
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php
index cf758553e876d..07dcc65493a85 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php
@@ -73,15 +73,15 @@ protected function setUp()
 
     /**
      * @param bool $hasBackendModel
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetBackendModel
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCreate
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetValue
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetPath
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScope
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScopeId
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetValue
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsAfterLoad
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSerialize
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetBackendModel
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCreate
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetPath
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScope
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScopeId
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsAfterLoad
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSerialize
      * @param string $expectsValue
      * @param string $className
      * @param string $value
diff --git a/app/code/Magento/Config/Test/Unit/Model/Compiler/IncludeElementTest.php b/app/code/Magento/Config/Test/Unit/Model/Compiler/IncludeElementTest.php
index 451c73319d5bc..3197c04b12312 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Compiler/IncludeElementTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Compiler/IncludeElementTest.php
@@ -82,7 +82,7 @@ public function testCompileSuccess()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The file "adminhtml/path/to/file.xml" does not exist
+     * @expectedExceptionMessage The "adminhtml/path/to/file.xml" file doesn't exist.
      */
     public function testCompileException()
     {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/AddressTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/AddressTest.php
index bacbda537fb1d..e6b774db041c3 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/AddressTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/AddressTest.php
@@ -40,6 +40,9 @@ public function testBeforeSave($value, $expectedValue)
         $this->assertEquals($expectedValue, $this->model->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function beforeSaveDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php
index 8e559ff8284ed..e38c247c3861a 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php
@@ -41,6 +41,9 @@ public function testBeforeSave($value, $expectedValue)
         $this->assertEquals($expectedValue, $this->model->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function beforeSaveDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
index 493fdf9505c4c..bb1e0e0225901 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
@@ -52,6 +52,9 @@ public function testAfterLoad($expected, $value, $numCalls, $unserializedValue =
         $this->assertEquals($expected, $this->serializedConfig->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function afterLoadDataProvider()
     {
         return [
@@ -87,6 +90,9 @@ public function testBeforeSave($expected, $value, $numCalls, $serializedValue =
         $this->assertEquals($expected, $this->serializedConfig->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function beforeSaveDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php
index 0fdf4532462ac..4d8eec0aa76ba 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php
@@ -156,6 +156,9 @@ public function testImport()
         $this->scopeMock->expects($this->at(2))
             ->method('setCurrentScope')
             ->with('oldScope');
+        $this->scopeMock->expects($this->at(3))
+            ->method('setCurrentScope')
+            ->with('oldScope');
         $this->flagManagerMock->expects($this->once())
             ->method('saveFlag')
             ->with(Importer::FLAG_CODE, $data);
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/PathValidatorTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/PathValidatorTest.php
index b1d712a29cb5f..5a8ea95eff2b9 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/PathValidatorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/PathValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Test\Unit\Model\Config;
 
 use Magento\Config\Model\Config\PathValidator;
@@ -55,7 +56,7 @@ public function testValidate()
 
     /**
      * @expectedException \Magento\Framework\Exception\ValidatorException
-     * @expectedExceptionMessage The "test/test/test" path does not exist
+     * @expectedExceptionMessage The "test/test/test" path doesn't exist. Verify and try again.
      */
     public function testValidateWithException()
     {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/AbstractElementTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/AbstractElementTest.php
index 51432366bb441..e602e0407feff 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/AbstractElementTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/AbstractElementTest.php
@@ -141,6 +141,9 @@ public function testIsVisibleReturnsTrueForProperScopes($settings, $scope)
         $this->assertTrue($this->_model->isVisible());
     }
 
+    /**
+     * @return array
+     */
     public function isVisibleReturnsTrueForProperScopesDataProvider()
     {
         return [
@@ -170,6 +173,9 @@ public function testIsVisibleReturnsFalseForNonProperScopes($settings, $scope)
         $this->assertFalse($this->_model->isVisible());
     }
 
+    /**
+     * @return array
+     */
     public function isVisibleReturnsFalseForNonProperScopesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ConcealInProductionConfigListTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ConcealInProductionConfigListTest.php
index 5cad923264e00..ba74b93d9ad76 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ConcealInProductionConfigListTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ConcealInProductionConfigListTest.php
@@ -8,6 +8,11 @@
 use Magento\Config\Model\Config\Structure\ConcealInProductionConfigList;
 use Magento\Framework\App\State;
 
+/**
+ * @deprecated Original class has changed the location
+ * @see \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction
+ * @see \Magento\Config\Test\Unit\Model\Config\Structure\ElementVisibility\ConcealInProductionTest
+ */
 class ConcealInProductionConfigListTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -43,6 +48,8 @@ protected function setUp()
      * @param string $mageMode
      * @param bool $expectedResult
      * @dataProvider disabledDataProvider
+     *
+     * @deprecated
      */
     public function testIsDisabled($path, $mageMode, $expectedResult)
     {
@@ -54,6 +61,8 @@ public function testIsDisabled($path, $mageMode, $expectedResult)
 
     /**
      * @return array
+     *
+     * @deprecated
      */
     public function disabledDataProvider()
     {
@@ -78,6 +87,8 @@ public function disabledDataProvider()
      * @param string $mageMode
      * @param bool $expectedResult
      * @dataProvider hiddenDataProvider
+     *
+     * @deprecated
      */
     public function testIsHidden($path, $mageMode, $expectedResult)
     {
@@ -89,6 +100,8 @@ public function testIsHidden($path, $mageMode, $expectedResult)
 
     /**
      * @return array
+     *
+     * @deprecated
      */
     public function hiddenDataProvider()
     {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/FieldTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/FieldTest.php
index 30c567fb490e6..750a829eef7ec 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/FieldTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/FieldTest.php
@@ -88,6 +88,9 @@ public function testIsNegative($data, $isNegative)
         $this->assertEquals($isNegative, $this->_getFieldObject($data, $isNegative)->isNegative());
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
@@ -110,6 +113,9 @@ public function testIsValueSatisfy($data, $isNegative, $value, $expected)
         $this->assertEquals($expected, $this->_getFieldObject($data, $isNegative)->isValueSatisfy($value));
     }
 
+    /**
+     * @return array
+     */
     public function isValueSatisfyDataProvider()
     {
         return [
@@ -135,6 +141,9 @@ public function testGetValues($data, $isNegative, $expected)
         $this->assertEquals($expected, $this->_getFieldObject($data, $isNegative)->getValues());
     }
 
+    /**
+     * @return array
+     */
     public function getValuesDataProvider()
     {
         $complexDataValues = [self::COMPLEX_VALUE1, self::COMPLEX_VALUE2, self::COMPLEX_VALUE3];
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/MapperTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/MapperTest.php
index 1c758bfcbefaa..c6cd03cf8f35b 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/MapperTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/MapperTest.php
@@ -98,7 +98,8 @@ public function testGetDependenciesWhenDependentIsInvisible($isValueSatisfy)
     {
         $expected = [];
         $rowData = array_values($this->_testData);
-        for ($i = 0; $i < count($this->_testData); ++$i) {
+        $count = count($this->_testData);
+        for ($i = 0; $i < $count; ++$i) {
             $data = $rowData[$i];
             $dependentPath = 'some path ' . $i;
             $field = $this->_getField(
@@ -149,6 +150,9 @@ public function testGetDependenciesWhenDependentIsInvisible($isValueSatisfy)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function getDependenciesDataProvider()
     {
         return [[true], [false]];
@@ -158,7 +162,8 @@ public function testGetDependenciesIsVisible()
     {
         $expected = [];
         $rowData = array_values($this->_testData);
-        for ($i = 0; $i < count($this->_testData); ++$i) {
+        $count = count($this->_testData);
+        for ($i = 0; $i < $count; ++$i) {
             $data = $rowData[$i];
             $field = $this->_getField(
                 true,
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/IteratorTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/IteratorTest.php
index 1a0f3d03b060c..dcb7a90e55290 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/IteratorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/IteratorTest.php
@@ -68,6 +68,9 @@ public function testIsLast($elementId, $result)
         $this->assertEquals($result, $this->_model->isLast($elementMock));
     }
 
+    /**
+     * @return array
+     */
     public function isLastDataProvider()
     {
         return [[1, false], [2, false], [3, true]];
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionTest.php
new file mode 100644
index 0000000000000..5fc689f911c1c
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Test\Unit\Model\Config\Structure\ElementVisibility;
+
+use Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction;
+use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\State;
+
+class ConcealInProductionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stateMock;
+
+    /**
+     * @var ConcealInProduction
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->stateMock = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $configs = [
+            'section1/group1/field1' => ElementVisibilityInterface::DISABLED,
+            'section1/group1' => ElementVisibilityInterface::HIDDEN,
+            'section1' => ElementVisibilityInterface::DISABLED,
+            'section1/group2' => 'no',
+            'section2/group1' => ElementVisibilityInterface::DISABLED,
+            'section2/group2' => ElementVisibilityInterface::HIDDEN,
+            'section3' => ElementVisibilityInterface::HIDDEN,
+            'section3/group1/field1' => 'no',
+        ];
+        $exemptions = [
+            'section1/group1/field3' => '',
+            'section1/group2/field1' => '',
+            'section2/group2/field1' => '',
+            'section3/group2' => '',
+        ];
+
+        $this->model = new ConcealInProduction($this->stateMock, $configs, $exemptions);
+    }
+
+    /**
+     * @param string $path
+     * @param string $mageMode
+     * @param bool $isDisabled
+     * @param bool $isHidden
+     * @dataProvider disabledDataProvider
+     */
+    public function testCheckVisibility(string $path, string $mageMode, bool $isHidden, bool $isDisabled): void
+    {
+        $this->stateMock->expects($this->any())
+            ->method('getMode')
+            ->willReturn($mageMode);
+
+        $this->assertSame($isHidden, $this->model->isHidden($path));
+        $this->assertSame($isDisabled, $this->model->isDisabled($path));
+    }
+
+    /**
+     * @return array
+     */
+    public function disabledDataProvider(): array
+    {
+        return [
+            //visibility of field 'section1/group1/field1' should be applied
+            ['section1/group1/field1', State::MODE_PRODUCTION, false, true],
+            ['section1/group1/field1', State::MODE_DEFAULT, false, false],
+            ['section1/group1/field1', State::MODE_DEVELOPER, false, false],
+            //visibility of group 'section1/group1' should be applied
+            ['section1/group1/field2', State::MODE_PRODUCTION, true, false],
+            ['section1/group1/field2', State::MODE_DEFAULT, false, false],
+            ['section1/group1/field2', State::MODE_DEVELOPER, false, false],
+            //exemption should be applied for section1/group2/field1
+            ['section1/group2/field1', State::MODE_PRODUCTION, false, false],
+            ['section1/group2/field1', State::MODE_DEFAULT, false, false],
+            ['section1/group2/field1', State::MODE_DEVELOPER, false, false],
+            //as 'section1/group2' has neither Disable nor Hidden rule, this field should be visible
+            ['section1/group2/field2', State::MODE_PRODUCTION, false, false],
+            //exemption should be applied for section1/group1/field3
+            ['section1/group1/field3', State::MODE_PRODUCTION, false, false],
+            //visibility of group 'section2/group1' should be applied
+            ['section2/group1/field1', State::MODE_PRODUCTION, false, true],
+            //exemption should be applied for section2/group2/field1
+            ['section2/group2/field1', State::MODE_PRODUCTION, false, false],
+            //any rule should not be applied
+            ['section2/group3/field1', State::MODE_PRODUCTION, false, false],
+            //any rule should not be applied
+            ['section3/group1/field1', State::MODE_PRODUCTION, false, false],
+            //visibility of section 'section3' should be applied
+            ['section3/group1/field2', State::MODE_PRODUCTION, true, false],
+            //exception from 'section3/group2' should be applied
+            ['section3/group2/field1', State::MODE_PRODUCTION, false, false],
+
+        ];
+    }
+}
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemandTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemandTest.php
new file mode 100644
index 0000000000000..9d69a587f695d
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemandTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Test\Unit\Model\Config\Structure\ElementVisibility;
+
+use Magento\Framework\App\DeploymentConfig;
+use \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction;
+use \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProductionFactory;
+use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
+use Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProductionWithoutScdOnDemand;
+use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+
+class ConcealInProductionWithoutScdOnDemandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConcealInProduction|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $concealInProductionMock;
+
+    /**
+     * @var ConcealInProductionWithoutScdOnDemand
+     */
+    private $model;
+
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    protected function setUp()
+    {
+        $concealInProductionFactoryMock = $this->createMock(ConcealInProductionFactory::class);
+
+        $this->concealInProductionMock = $this->createMock(ConcealInProduction::class);
+
+        $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+
+        $configs = [
+            'section1/group1/field1' => ElementVisibilityInterface::DISABLED,
+            'section1/group1' => ElementVisibilityInterface::HIDDEN,
+            'section1' => ElementVisibilityInterface::DISABLED,
+            'section1/group2' => 'no',
+            'section2/group1' => ElementVisibilityInterface::DISABLED,
+            'section2/group2' => ElementVisibilityInterface::HIDDEN,
+            'section3' => ElementVisibilityInterface::HIDDEN,
+            'section3/group1/field1' => 'no',
+        ];
+        $exemptions = [
+            'section1/group1/field3' => '',
+            'section1/group2/field1' => '',
+            'section2/group2/field1' => '',
+            'section3/group2' => '',
+        ];
+
+        $concealInProductionFactoryMock->expects($this->any())
+            ->method('create')
+            ->with(['configs' => $configs, 'exemptions' => $exemptions])
+            ->willReturn($this->concealInProductionMock);
+
+        $this->model = new ConcealInProductionWithoutScdOnDemand(
+            $concealInProductionFactoryMock,
+            $this->deploymentConfigMock,
+            $configs,
+            $exemptions
+        );
+    }
+
+    public function testIsHiddenScdOnDemandEnabled(): void
+    {
+        $path = 'section1/group1/field1';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(true);
+        $this->concealInProductionMock->expects($this->never())
+            ->method('isHidden');
+
+        $this->assertFalse($this->model->isHidden($path));
+    }
+
+    public function testIsDisabledScdOnDemandEnabled(): void
+    {
+        $path = 'section1/group1/field1';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(true);
+        $this->concealInProductionMock->expects($this->never())
+            ->method('isDisabled');
+
+        $this->assertFalse($this->model->isDisabled($path));
+    }
+
+    /**
+     * @param bool $isHidden
+     *
+     * @dataProvider visibilityDataProvider
+     */
+    public function testIsHiddenScdOnDemandDisabled(bool $isHidden): void
+    {
+        $path = 'section1/group1/field1';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(false);
+        $this->concealInProductionMock->expects($this->once())
+            ->method('isHidden')
+            ->with($path)
+            ->willReturn($isHidden);
+
+        $this->assertSame($isHidden, $this->model->isHidden($path));
+    }
+
+    /**
+     * @param bool $isDisabled
+     *
+     * @dataProvider visibilityDataProvider
+     */
+    public function testIsDisabledScdOnDemandDisabled(bool $isDisabled): void
+    {
+        $path = 'section1/group1/field1';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(false);
+        $this->concealInProductionMock->expects($this->once())
+            ->method('isDisabled')
+            ->with($path)
+            ->willReturn($isDisabled);
+
+        $this->assertSame($isDisabled, $this->model->isDisabled($path));
+    }
+
+    /**
+     * @return array
+     */
+    public function visibilityDataProvider(): array
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+}
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
index a3bdb6f008f1d..d2a89a8abc7fa 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
@@ -44,16 +44,16 @@ protected function setUp()
     public function testException()
     {
         $visibility = [
-            'stdClass' => new \StdClass()
+            'stdClass' => new \stdClass()
         ];
 
         new ElementVisibilityComposite($visibility);
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects
      * @param bool $firstResult
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects
      * @param bool $secondResult
      * @param bool $expectedResult
      * @dataProvider visibilityDataProvider
@@ -74,9 +74,9 @@ public function testDisabled($firstExpects, $firstResult, $secondExpects, $secon
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects
      * @param bool $firstResult
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects
      * @param bool $secondResult
      * @param bool $expectedResult
      * @dataProvider visibilityDataProvider
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php
index 95e8246c6a3d3..dde19c801f4de 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php
@@ -31,10 +31,8 @@ public function testMap($sourceData, $resultData)
 
     public function testMapWithBadPath()
     {
-        $this->expectException(
-            'InvalidArgumentException',
-            'Invalid path in extends attribute of config/system/sections/section1 node'
-        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid path in extends attribute of config/system/sections/section1 node');
         $sourceData = [
             'config' => [
                 'system' => ['sections' => ['section1' => ['extends' => 'nonExistentSection2']]],
@@ -44,6 +42,9 @@ public function testMapWithBadPath()
         $this->_sut->map($sourceData);
     }
 
+    /**
+     * @return array
+     */
     public function mapDataProvider()
     {
         return [
@@ -55,6 +56,9 @@ public function mapDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     protected function _emptySectionsNodeData()
     {
         $data = ['config' => ['system' => ['sections' => 'some_non_array']]];
@@ -62,6 +66,9 @@ protected function _emptySectionsNodeData()
         return [$data, $data];
     }
 
+    /**
+     * @return array
+     */
     protected function _extendFromASiblingData()
     {
         $source = $result = [
@@ -81,6 +88,9 @@ protected function _extendFromASiblingData()
         return [$source, $result];
     }
 
+    /**
+     * @return array
+     */
     protected function _extendFromNodeOnHigherLevelData()
     {
         $source = $result = [
@@ -114,6 +124,9 @@ protected function _extendFromNodeOnHigherLevelData()
         return [$source, $result];
     }
 
+    /**
+     * @return array
+     */
     protected function _extendWithMerge()
     {
         $source = $result = [
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php
index c671a5326c4de..dd95574ffa62d 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php
@@ -24,7 +24,8 @@ public function testConvertWithInvalidRelativePath()
 
         $exceptionMessage = sprintf('Invalid relative path %s in %s node', $relativePath, $nodePath);
 
-        $this->expectException('InvalidArgumentException', $exceptionMessage);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($exceptionMessage);
         $this->_sut->convert($nodePath, $relativePath);
     }
 
@@ -35,7 +36,8 @@ public function testConvertWithInvalidRelativePath()
      */
     public function testConvertWithInvalidArguments($nodePath, $relativePath)
     {
-        $this->expectException('InvalidArgumentException', 'Invalid arguments');
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid arguments');
         $this->_sut->convert($nodePath, $relativePath);
     }
 
@@ -50,11 +52,17 @@ public function testConvert($nodePath, $relativePath, $result)
         $this->assertEquals($result, $this->_sut->convert($nodePath, $relativePath));
     }
 
+    /**
+     * @return array
+     */
     public function convertWithInvalidArgumentsDataProvider()
     {
         return [['', ''], ['some/node', ''], ['', 'some/node']];
     }
 
+    /**
+     * @return array
+     */
     public function convertDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ReaderTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ReaderTest.php
index 3b076b219109d..9e107a545d76f 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ReaderTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ReaderTest.php
@@ -100,4 +100,24 @@ public function testReadSuccessNotValidatedCase()
 
         $this->assertEquals($expectedResult, $this->reader->read());
     }
+
+    /**
+     * Test the execution with the Validation exception of the 'read' method
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Verify the XML and try again.
+     */
+    public function testReadWithValidationException()
+    {
+        $content = '<config><item name="test1"></item><wrong></config>';
+        $expectedResult = ['result_data'];
+        $fileList = ['file' => $content];
+
+        $this->fileResolverMock->expects($this->once())
+            ->method('get')
+            ->with('system.xml', 'global')
+            ->willReturn($fileList);
+        
+        $this->assertEquals($expectedResult, $this->reader->read());
+    }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php
index e67ea6ec0fba1..a17faf8f35883 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/StructureTest.php
@@ -221,6 +221,9 @@ private function getElementReturnsEmptyElementIfNotExistingElementIsRequested(
         return $elementMock;
     }
 
+    /**
+     * @return array
+     */
     public function emptyElementDataProvider()
     {
         return [
@@ -389,6 +392,9 @@ public function testGetFieldPathsByAttribute($attributeName, $attributeValue, $p
         $this->assertEquals($paths, $this->_model->getFieldPathsByAttribute($attributeName, $attributeValue));
     }
 
+    /**
+     * @return array
+     */
     public function getFieldPathsByAttributeDataProvider()
     {
         return [
@@ -412,6 +418,7 @@ public function testGetFieldPaths()
                 'field_2'
             ],
             'field_3' => [
+                'field_3',
                 'field_3'
             ],
             'field_3_1' => [
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index 2832e8e54e5f6..d0568f48ded1e 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -60,6 +60,11 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     protected $_configStructure;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $_settingsChecker;
+
     protected function setUp()
     {
         $this->_eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
@@ -79,7 +84,7 @@ protected function setUp()
 
         $this->_transFactoryMock = $this->createPartialMock(
             \Magento\Framework\DB\TransactionFactory::class,
-            ['create']
+            ['create', 'addObject']
         );
         $this->_appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
         $this->_configLoaderMock = $this->createPartialMock(
@@ -90,6 +95,9 @@ protected function setUp()
 
         $this->_storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
 
+        $this->_settingsChecker = $this
+            ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
+
         $this->_model = new \Magento\Config\Model\Config(
             $this->_appConfigMock,
             $this->_eventManagerMock,
@@ -97,7 +105,8 @@ protected function setUp()
             $this->_transFactoryMock,
             $this->_configLoaderMock,
             $this->_dataFactoryMock,
-            $this->_storeManager
+            $this->_storeManager,
+            $this->_settingsChecker
         );
     }
 
@@ -149,55 +158,96 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
         $this->_model->save();
     }
 
-    public function testSaveToCheckScopeDataSet()
+    public function testDoNotSaveReadOnlyFields()
     {
         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-
         $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
 
+        $this->_settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
         $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
 
-        $this->_eventManagerMock->expects(
-            $this->at(0)
-        )->method(
-            'dispatch'
-        )->with(
-            $this->equalTo('admin_system_config_changed_section_'),
-            $this->arrayHasKey('website')
-        );
-
-        $this->_eventManagerMock->expects(
-            $this->at(0)
-        )->method(
-            'dispatch'
-        )->with(
-            $this->equalTo('admin_system_config_changed_section_'),
-            $this->arrayHasKey('store')
-        );
+        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+        $this->_model->setSection('section');
 
         $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+        $group->method('getPath')->willReturn('section/1');
 
         $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
+        $field->method('getGroupPath')->willReturn('section/1');
+        $field->method('getId')->willReturn('key');
+
+        $this->_configStructure->expects($this->at(0))
+            ->method('getElement')
+            ->with('section/1')
+            ->will($this->returnValue($group));
+        $this->_configStructure->expects($this->at(1))
+            ->method('getElement')
+            ->with('section/1')
+            ->will($this->returnValue($group));
+        $this->_configStructure->expects($this->at(2))
+            ->method('getElement')
+            ->with('section/1/key')
+            ->will($this->returnValue($field));
 
-        $this->_configStructure->expects(
-            $this->at(0)
-        )->method(
-            'getElement'
-        )->with(
-            '/1'
-        )->will(
-            $this->returnValue($group)
+        $backendModel = $this->createPartialMock(
+            \Magento\Framework\App\Config\Value::class,
+            ['addData']
         );
+        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
 
-        $this->_configStructure->expects(
-            $this->at(1)
-        )->method(
-            'getElement'
-        )->with(
-            '/1/key'
-        )->will(
-            $this->returnValue($field)
-        );
+        $this->_transFactoryMock->expects($this->never())->method('addObject');
+        $backendModel->expects($this->never())->method('addData');
+
+        $this->_model->save();
+    }
+
+    public function testSaveToCheckScopeDataSet()
+    {
+        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
+        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+
+        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+
+        $this->_eventManagerMock->expects($this->at(0))
+            ->method('dispatch')
+            ->with(
+                $this->equalTo('admin_system_config_changed_section_section'),
+                $this->arrayHasKey('website')
+            );
+        $this->_eventManagerMock->expects($this->at(0))
+            ->method('dispatch')
+            ->with(
+                $this->equalTo('admin_system_config_changed_section_section'),
+                $this->arrayHasKey('store')
+            );
+
+        $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+        $group->method('getPath')->willReturn('section/1');
+
+        $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
+        $field->method('getGroupPath')->willReturn('section/1');
+        $field->method('getId')->willReturn('key');
+
+        $this->_configStructure->expects($this->at(0))
+            ->method('getElement')
+            ->with('section/1')
+            ->will($this->returnValue($group));
+        $this->_configStructure->expects($this->at(1))
+            ->method('getElement')
+            ->with('section/1')
+            ->will($this->returnValue($group));
+        $this->_configStructure->expects($this->at(2))
+            ->method('getElement')
+            ->with('section/1/key')
+            ->will($this->returnValue($field));
+        $this->_configStructure->expects($this->at(3))
+            ->method('getElement')
+            ->with('section/1')
+            ->will($this->returnValue($group));
+        $this->_configStructure->expects($this->at(4))
+            ->method('getElement')
+            ->with('section/1/key')
+            ->will($this->returnValue($field));
 
         $website = $this->createMock(\Magento\Store\Model\Website::class);
         $website->expects($this->any())->method('getCode')->will($this->returnValue('website_code'));
@@ -206,19 +256,16 @@ public function testSaveToCheckScopeDataSet()
         $this->_storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
 
         $this->_model->setWebsite('website');
-
+        $this->_model->setSection('section');
         $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
 
         $backendModel = $this->createPartialMock(
             \Magento\Framework\App\Config\Value::class,
             ['setPath', 'addData', '__sleep', '__wakeup']
         );
-        $backendModel->expects(
-            $this->once()
-        )->method(
-            'addData'
-        )->with(
-            [
+        $backendModel->expects($this->once())
+            ->method('addData')
+            ->with([
                 'field' => 'key',
                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
                 'group_id' => null,
@@ -227,17 +274,11 @@ public function testSaveToCheckScopeDataSet()
                 'scope_code' => 'website_code',
                 'field_config' => null,
                 'fieldset_data' => ['key' => null],
-            ]
-        );
-        $backendModel->expects(
-            $this->once()
-        )->method(
-            'setPath'
-        )->with(
-            '/key'
-        )->will(
-            $this->returnValue($backendModel)
-        );
+            ]);
+        $backendModel->expects($this->once())
+            ->method('setPath')
+            ->with('section/1/key')
+            ->will($this->returnValue($backendModel));
 
         $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
 
@@ -280,7 +321,8 @@ public function testSetDataByPathEmpty()
     public function testSetDataByPathWrongDepth($path, $expectedException)
     {
         $expectedException = 'Allowed depth of configuration is 3 (<section>/<group>/<field>). ' . $expectedException;
-        $this->expectException('\UnexpectedValueException', $expectedException);
+        $this->expectException('\UnexpectedValueException');
+        $this->expectExceptionMessage($expectedException);
         $value = 'value';
         $this->_model->setDataByPath($path, $value);
     }
@@ -294,7 +336,7 @@ public function setDataByPathWrongDepthDataProvider()
             'depth 2' => ['section/group', "Your configuration depth is 2 for path 'section/group'"],
             'depth 1' => ['section', "Your configuration depth is 1 for path 'section'"],
             'depth 4' => ['section/group/field/sub-field', "Your configuration depth is 4 for path"
-            . " 'section/group/field/sub-field'", ],
+                . " 'section/group/field/sub-field'", ],
         ];
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php b/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
index 8217ff09c0541..e4c01e794fb0f 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
@@ -52,6 +52,9 @@ public function testGenerate($path, $scope, $scopeId, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function getGenerateDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 52f257311e146..57c067d2cae27 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-cron": "100.3.*",
-        "magento/module-deploy": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-email": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cron": "*",
+        "magento/module-deploy": "*",
+        "magento/module-directory": "*",
+        "magento/module-email": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Config/etc/adminhtml/di.xml b/app/code/Magento/Config/etc/adminhtml/di.xml
index c21c06c7f3e1f..5e54f177776ba 100644
--- a/app/code/Magento/Config/etc/adminhtml/di.xml
+++ b/app/code/Magento/Config/etc/adminhtml/di.xml
@@ -15,6 +15,8 @@
         <arguments>
             <argument name="visibility" xsi:type="array">
                 <item name="productionVisibility" xsi:type="object">Magento\Config\Model\Config\Structure\ConcealInProductionConfigList</item>
+                <item name="concealInProduction" xsi:type="object">Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction</item>
+                <item name="concealInProductionWithoutScdOnDemand" xsi:type="object">Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProductionWithoutScdOnDemand</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Config/etc/db_schema.xml b/app/code/Magento/Config/etc/db_schema.xml
new file mode 100644
index 0000000000000..8aeac802fbd91
--- /dev/null
+++ b/app/code/Magento/Config/etc/db_schema.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="core_config_data" resource="default" engine="innodb" comment="Config Data">
+        <column xsi:type="int" name="config_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Config Id"/>
+        <column xsi:type="varchar" name="scope" nullable="false" length="8" default="default" comment="Config Scope"/>
+        <column xsi:type="int" name="scope_id" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Config Scope Id"/>
+        <column xsi:type="varchar" name="path" nullable="false" length="255" default="general" comment="Config Path"/>
+        <column xsi:type="text" name="value" nullable="true" comment="Config Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="config_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="CORE_CONFIG_DATA_SCOPE_SCOPE_ID_PATH">
+            <column name="scope"/>
+            <column name="scope_id"/>
+            <column name="path"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Config/etc/db_schema_whitelist.json b/app/code/Magento/Config/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..850e160bc732f
--- /dev/null
+++ b/app/code/Magento/Config/etc/db_schema_whitelist.json
@@ -0,0 +1,15 @@
+{
+    "core_config_data": {
+        "column": {
+            "config_id": true,
+            "scope": true,
+            "scope_id": true,
+            "path": true,
+            "value": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CORE_CONFIG_DATA_SCOPE_SCOPE_ID_PATH": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index bcddd8ceaf27a..a5dd18097fb47 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -296,10 +296,21 @@
         <arguments>
             <argument name="processors" xsi:type="array">
                 <item name="default" xsi:type="string">Magento\Config\Console\Command\ConfigSet\DefaultProcessor</item>
-                <item name="lock" xsi:type="string">Magento\Config\Console\Command\ConfigSet\LockProcessor</item>
+                <item name="lock-env" xsi:type="string">Magento\Config\Console\Command\ConfigSet\VirtualLockEnvProcessor</item>
+                <item name="lock-config" xsi:type="string">Magento\Config\Console\Command\ConfigSet\VirtualLockConfigProcessor</item>
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Config\Console\Command\ConfigSet\VirtualLockEnvProcessor" type="Magento\Config\Console\Command\ConfigSet\LockProcessor">
+        <arguments>
+            <argument name="target" xsi:type="string">app_env</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Config\Console\Command\ConfigSet\VirtualLockConfigProcessor" type="Magento\Config\Console\Command\ConfigSet\LockProcessor">
+        <arguments>
+            <argument name="target" xsi:type="string">app_config</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Deploy\Model\DeploymentConfig\ImporterPool">
         <arguments>
             <argument name="importers" xsi:type="array">
diff --git a/app/code/Magento/Config/etc/module.xml b/app/code/Magento/Config/etc/module.xml
index b64cbe2b72623..2fd4255a2bc0c 100644
--- a/app/code/Magento/Config/etc/module.xml
+++ b/app/code/Magento/Config/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_Config" setup_version="2.0.0"/>
+    <module name="Magento_Config">
+        <sequence>
+            <module name="Magento_Store"/>
+        </sequence>
+    </module>
 </config>
diff --git a/app/code/Magento/Config/etc/system_file.xsd b/app/code/Magento/Config/etc/system_file.xsd
index 5a2b915262a9a..f1688b2e35371 100644
--- a/app/code/Magento/Config/etc/system_file.xsd
+++ b/app/code/Magento/Config/etc/system_file.xsd
@@ -474,7 +474,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z0-9\\:]+" />
+            <xs:pattern value="[A-Za-z0-9_\\:]+" />
             <xs:minLength value="5" />
         </xs:restriction>
     </xs:simpleType>
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 8264c7d7b396a..a1e26b7805d4b 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/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index 93af2cfa653f8..cf235d368b9bc 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -21,7 +21,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
                     <th><?= /* @escapeNotVerified */ $column['label'] ?></th>
                 <?php endforeach;?>
-                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>">Action</th>
+                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>"><?= /* @escapeNotVerified */ __('Action') ?></th>
             </tr>
             </thead>
             <tfoot>
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
index 58462b873d8b1..7146108f61fe1 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -3,14 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableImportExport\Model\Export;
 
-use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\ImportExport\Model\Import;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Customizes output during export
+ */
 class RowCustomizer implements RowCustomizerInterface
 {
     /**
@@ -36,6 +43,19 @@ class RowCustomizer implements RowCustomizerInterface
         self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
     ];
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * Prepare configurable data for export
      *
@@ -49,6 +69,9 @@ public function prepareData($collection, $productIds)
         $productCollection->addAttributeToFilter('entity_id', ['in' => $productIds])
             ->addAttributeToFilter('type_id', ['eq' => ConfigurableProductType::TYPE_CODE]);
 
+        // set global scope during export
+        $this->storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+
         while ($product = $productCollection->fetchItem()) {
             $productAttributesOptions = $product->getTypeInstance()->getConfigurableOptions($product);
             $this->configurableData[$product->getId()] = [];
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index 3dc47b42c1e40..3f4565771e70b 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Importing configurable products
@@ -24,6 +25,12 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
     /**
      * Error codes.
      */
+    const ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST = 'attrCodeDoesNotExist';
+
+    const ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE = 'attrCodeNotGlobalScope';
+
+    const ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT = 'attrCodeNotTypeSelect';
+
     const ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER = 'attrCodeIsNotSuper';
 
     const ERROR_INVALID_OPTION_VALUE = 'invalidOptionValue';
@@ -32,16 +39,28 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
 
     const ERROR_DUPLICATED_VARIATIONS = 'duplicatedVariations';
 
+    const ERROR_UNIDENTIFIABLE_VARIATION = 'unidentifiableVariation';
+
     /**
      * Validation failure message template definitions
      *
      * @var array
+     *
+     * Note: Some of these messages exceed maximum limit of 120 characters per line. Split up accordingly.
      */
     protected $_messageTemplates = [
-        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super',
-        self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value for attribute "%s"',
+        self::ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST => 'Column configurable_variations: Attribute with code ' .
+            '"%s" does not exist or is missing from product attribute set',
+        self::ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE => 'Column configurable_variations: Attribute with code ' .
+            '"%s" is not super - it needs to have Global Scope',
+        self::ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT => 'Column configurable_variations: Attribute with code ' .
+            '"%s" is not super - it needs to be Input Type of Dropdown, Visual Swatch or Text Swatch',
+        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Column configurable_variations: Attribute with code ' .
+            '"%s" is not super',
+        self::ERROR_INVALID_OPTION_VALUE => 'Column configurable_variations: Invalid option value for attribute "%s"',
         self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute',
         self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations',
+        self::ERROR_UNIDENTIFIABLE_VARIATION => 'Configurable variation "%s" is unidentifiable',
     ];
 
     /**
@@ -229,7 +248,7 @@ public function __construct(
      */
     protected function _addAttributeParams($attrSetName, array $attrParams, $attribute)
     {
-        // save super attributes for simplier and quicker search in future
+        // save super attributes for simpler and quicker search in future
         if ('select' == $attrParams['type'] && 1 == $attrParams['is_global']) {
             $this->_superAttributes[$attrParams['code']] = $attrParams;
         }
@@ -247,9 +266,8 @@ protected function _getSuperAttributeId($productId, $attributeId)
     {
         if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {
             return $this->_productSuperAttrs["{$productId}_{$attributeId}"];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -286,10 +304,11 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
     {
         if (!empty($rowData['_super_attribute_code'])) {
             $superAttrCode = $rowData['_super_attribute_code'];
-
             if (!$this->_isAttributeSuper($superAttrCode)) {
-                // check attribute superity
-                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER, $rowNum, $superAttrCode);
+                // Identify reason why attribute is not super:
+                if (!$this->identifySuperAttributeError($superAttrCode, $rowNum)) {
+                    $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER, $rowNum, $superAttrCode);
+                }
                 return false;
             } elseif (isset($rowData['_super_attribute_option']) && strlen($rowData['_super_attribute_option'])) {
                 $optionKey = strtolower($rowData['_super_attribute_option']);
@@ -302,6 +321,66 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
         return true;
     }
 
+    /**
+     * Identify exactly why a super attribute code is not super.
+     *
+     * @param string $superAttrCode
+     * @param int $rowNum
+     * @return bool
+     */
+    private function identifySuperAttributeError($superAttrCode, $rowNum)
+    {
+        // This attribute code is not a super attribute. Need to give a clearer message why?
+        $reasonFound = false;
+        $codeExists = false;
+
+        // Does this attribute code exist?
+        $sourceAttribute = $this->doesSuperAttributeExist($superAttrCode);
+        if (is_array($sourceAttribute)) {
+            $codeExists = true;
+            // Does attribute have the correct settings?
+            if (isset($sourceAttribute['is_global']) && $sourceAttribute['is_global'] !== '1') {
+                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE, $rowNum, $superAttrCode);
+                $reasonFound = true;
+            } elseif (isset($sourceAttribute['type']) && $sourceAttribute['type'] !== 'select') {
+                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT, $rowNum, $superAttrCode);
+                $reasonFound = true;
+            }
+        }
+
+        if ($codeExists === false) {
+            $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST, $rowNum, $superAttrCode);
+            $reasonFound = true;
+        }
+
+        return $reasonFound;
+    }
+
+    /**
+     * Does the super attribute exist in the current attribute set?
+     *
+     * @param string $superAttrCode
+     * @return array
+     */
+    private function doesSuperAttributeExist($superAttrCode)
+    {
+        $returnAttributeArray = null;
+        if (is_array(self::$commonAttributesCache)) {
+            $filteredAttribute = array_filter(
+                self::$commonAttributesCache,
+                function ($element) use ($superAttrCode) {
+                    return $element['code'] == $superAttrCode;
+                }
+            );
+
+            // Return the first element of the filtered array (if found).
+            if (count($filteredAttribute)) {
+                $returnAttributeArray = array_shift($filteredAttribute);
+            }
+        }
+        return $returnAttributeArray;
+    }
+
     /**
      * Array of SKU to array of super attribute values for all products.
      *
@@ -470,14 +549,22 @@ protected function _processSuperData()
      * @param array $rowData
      *
      * @return array
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _parseVariations($rowData)
     {
         $additionalRows = [];
-        if (!isset($rowData['configurable_variations'])) {
+        if (empty($rowData['configurable_variations'])) {
             return $additionalRows;
+        } elseif (!empty($rowData['store_view_code'])) {
+            throw new LocalizedException(
+                __(
+                    'Product with assigned super attributes should not have specified "%1" value',
+                    'store_view_code'
+                )
+            );
         }
         $variations = explode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $rowData['configurable_variations']);
         foreach ($variations as $variation) {
@@ -489,7 +576,8 @@ protected function _parseVariations($rowData)
                 $nameAndValue = explode(ImportProduct::PAIR_NAME_VALUE_SEPARATOR, $nameAndValue);
                 if (!empty($nameAndValue)) {
                     $value = isset($nameAndValue[1]) ? trim($nameAndValue[1]) : '';
-                    $fieldName  = trim($nameAndValue[0]);
+                    // Ignoring field names' case.
+                    $fieldName  = strtolower(trim($nameAndValue[0]));
                     if ($fieldName) {
                         $fieldAndValuePairs[$fieldName] = $value;
                     }
@@ -510,8 +598,18 @@ protected function _parseVariations($rowData)
                     $additionalRow = [];
                     $position += 1;
                 }
+            } else {
+                throw new LocalizedException(
+                    __(
+                        sprintf(
+                            $this->_messageTemplates[self::ERROR_UNIDENTIFIABLE_VARIATION],
+                            $variation
+                        )
+                    )
+                );
             }
         }
+
         return $additionalRows;
     }
 
@@ -607,7 +705,7 @@ protected function _insertData()
     }
 
     /**
-     * Get new supper attribute id.
+     * Get new super attribute id.
      *
      * @return int
      */
@@ -822,7 +920,14 @@ protected function configurableInBunch($bunch)
     public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
     {
         $error = false;
-        $dataWithExtraVirtualRows = $this->_parseVariations($rowData);
+        try {
+            $dataWithExtraVirtualRows = $this->_parseVariations($rowData);
+        } catch (LocalizedException $exception) {
+            $this->_entityModel->addRowError($exception->getMessage(), $rowNum);
+
+            return false;
+        }
+
         $skus = [];
         $rowData['price'] = isset($rowData['price']) && $rowData['price'] ? $rowData['price'] : '0.00';
         if (!empty($dataWithExtraVirtualRows)) {
@@ -846,6 +951,7 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
             }
             $error |= !parent::isRowValid($option, $rowNum, $isNewProduct);
         }
+
         return !$error;
     }
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE.txt b/app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE.txt
rename to app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE_AFL.txt b/app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE_AFL.txt
rename to app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md b/app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e496ea6011c7f
--- /dev/null
+++ b/app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Import Export Functional Tests
+
+The Functional Test Module for **Magento Configurable Import Export** module.
diff --git a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
index f6912fe8b6d6c..4446f98cff515 100644
--- a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
@@ -392,6 +392,9 @@ protected function _getBunch()
         ];
     }
 
+    /**
+     * @return array
+     */
     protected function _getSuperAttributes()
     {
         return [
@@ -560,15 +563,56 @@ public function testIsRowValid()
             '_type' => 'configurable',
             '_product_websites' => 'website_1',
         ];
+        // Checking that variations' field names are case-insensitive with this
+        // product.
+        $caseInsensitiveSKU = 'configurableskuI22CaseInsensitive';
+        $caseInsensitiveProduct = [
+            'sku' => $caseInsensitiveSKU,
+            'store_view_code' => null,
+            'attribute_set_code' => 'Default',
+            'product_type' => 'configurable',
+            'name' => 'Configurable Product 21',
+            'product_websites' => 'website_1',
+            'configurable_variation_labels' => 'testattr2=Select Color, testattr3=Select Size',
+            'configurable_variations' => 'SKU=testconf2-attr2val1-testattr3v1,'
+                . 'testattr2=attr2val1,'
+                . 'testattr3=testattr3v1,'
+                . 'display=1|sku=testconf2-attr2val1-testattr3v2,'
+                . 'testattr2=attr2val1,'
+                . 'testattr3=testattr3v2,'
+                . 'display=0',
+            '_store' => null,
+            '_attribute_set' => 'Default',
+            '_type' => 'configurable',
+            '_product_websites' => 'website_1',
+        ];
         $bunch[] = $badProduct;
+        $bunch[] = $caseInsensitiveProduct;
         // Set _attributes to avoid error in Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType.
         $this->setPropertyValue($this->configurable, '_attributes', [
             $badProduct[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [],
         ]);
+        // Avoiding errors about attributes not being super
+        $this->setPropertyValue(
+            $this->configurable,
+            '_superAttributes',
+            [
+                'testattr2' => ['options' => ['attr2val1' => 1]],
+                'testattr3' => [
+                    'options' => [
+                        'testattr3v2' => 1,
+                        'testattr3v1' => 1,
+                    ],
+                ],
+            ]
+        );
 
         foreach ($bunch as $rowData) {
             $result = $this->configurable->isRowValid($rowData, 0, !isset($this->_oldSku[$rowData['sku']]));
             $this->assertNotNull($result);
+            if ($rowData['sku'] === $caseInsensitiveSKU) {
+                $this->assertTrue($result);
+            }
         }
     }
 
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index 1de5024f61981..419a08e14b0a2 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -5,16 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-configurable-product": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableImportExport/etc/module.xml b/app/code/Magento/ConfigurableImportExport/etc/module.xml
index 83a4fc4e1a793..7ff81f8d63443 100644
--- a/app/code/Magento/ConfigurableImportExport/etc/module.xml
+++ b/app/code/Magento/ConfigurableImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ConfigurableImportExport" setup_version="2.0.0">
+    <module name="Magento_ConfigurableImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
index 9ebd5f3ee3705..92c40f71f2db9 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
@@ -16,7 +16,7 @@ class Created extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/new/created.phtml';
+    protected $_template = 'Magento_ConfigurableProduct::catalog/product/attribute/new/created.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
index 8848fc78dad6d..f2de5e72211ee 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
@@ -8,7 +8,6 @@
 use Magento\Ui\Component\Control\Container;
 use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
-use Magento\Catalog\Model\Product\Type;
 
 /**
  * Class Save
@@ -16,16 +15,7 @@
 class Save extends Generic
 {
     /**
-     * @var array
-     */
-    private static $availableProductTypes = [
-        ConfigurableType::TYPE_CODE,
-        Type::TYPE_SIMPLE,
-        Type::TYPE_VIRTUAL
-    ];
-
-    /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getButtonData()
     {
@@ -135,7 +125,8 @@ protected function getOptions()
     }
 
     /**
-     * Retrieve target for button
+     * Retrieve target for button.
+     *
      * @return string
      */
     protected function getSaveTarget()
@@ -148,7 +139,8 @@ protected function getSaveTarget()
     }
 
     /**
-     * Retrieve action for button
+     * Retrieve action for button.
+     *
      * @return string
      */
     protected function getSaveAction()
@@ -161,10 +153,12 @@ protected function getSaveAction()
     }
 
     /**
+     * Is configurable product.
+     *
      * @return boolean
      */
     protected function isConfigurableProduct()
     {
-        return in_array($this->getProduct()->getTypeId(), self::$availableProductTypes);
+        return !$this->getProduct()->isComposite() || $this->getProduct()->getTypeId() === ConfigurableType::TYPE_CODE;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
index c02a922c71b5c..1c5d01da574cf 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
@@ -18,7 +18,7 @@ class Config extends Widget implements TabInterface
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/edit/super/config.phtml';
+    protected $_template = 'Magento_ConfigurableProduct::catalog/product/edit/super/config.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 2698da8dcb368..77110975401ff 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -19,6 +19,8 @@ class Configurable extends Renderer implements IdentityInterface
 {
     /**
      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     * @deprecated moved to model because of class refactoring
+     * @see \Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver::CONFIG_THUMBNAIL_SOURCE
      */
     const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
 
@@ -55,29 +57,6 @@ public function getOptionList()
         return $this->_productConfig->getOptions($this->getItem());
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProductForThumbnail()
-    {
-        /**
-         * Show parent product thumbnail if it must be always shown according to the related setting in system config
-         * or if child thumbnail is not available
-         */
-        if ($this->_scopeConfig->getValue(
-            self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE
-          || !($this->getChildProduct()
-          && $this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
-        ) {
-            $product = $this->getProduct();
-        } else {
-            $product = $this->getChildProduct();
-        }
-        return $product;
-    }
-
     /**
      * Return identifiers for produced content
      *
@@ -91,4 +70,14 @@ public function getIdentities()
         }
         return $identities;
     }
+
+    /**
+     * Get price for exact simple product added to cart
+     *
+     * @inheritdoc
+     */
+    public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
+    {
+        return parent::getProductPriceHtml($this->getChildProduct());
+    }
 }
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 b5d02f64e6eb5..2502b79921e99 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,
@@ -126,7 +136,7 @@ public function __construct(
     public function getCacheKeyInfo()
     {
         $parentData = parent::getCacheKeyInfo();
-        $parentData[] = $this->priceCurrency->getCurrencySymbol();
+        $parentData[] = $this->priceCurrency->getCurrency()->getCode();
         $parentData[] = $this->customerSession->getCustomerGroupId();
         return $parentData;
     }
@@ -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/Controller/Adminhtml/Product/AddAttribute.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
index 5991097e456f2..34f10b59f3a98 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\Controller\ResultFactory;
 
-class AddAttribute extends Action
+class AddAttribute extends Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
index 6f5f106a8bb24..cfa2562d974f4 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
 
-class CreateOptions extends Action
+class CreateOptions extends Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
index b6b34073db60d..9f5d5062b5366 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\ConfigurableProduct\Model\AttributesListInterface;
 
-class GetAttributes extends Action
+class GetAttributes extends Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
index 5cd8b6a7d0b95..b5940e36aa792 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
@@ -158,7 +158,7 @@ protected function getVariationMatrix()
             $configurableMatrix = json_decode($configurableMatrix, true);
 
             foreach ($configurableMatrix as $item) {
-                if ($item['newProduct']) {
+                if (isset($item['newProduct']) && $item['newProduct']) {
                     $result[$item['variationKey']] = $this->mapData($item);
 
                     if (isset($item['qty'])) {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php
index 442c48a4554d0..f9cf1b71c87da 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Product initialzation helper
+ * Product initialization helper
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
index 8adfdea96102c..104181aed4fc9 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Catalog\Controller\Adminhtml\Product\Builder;
@@ -13,7 +15,7 @@
 /**
  * Class Wizard
  */
-class Wizard extends Action
+class Wizard extends Action implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
deleted file mode 100644
index 0a4fc20578ed9..0000000000000
--- a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ConfigurableProduct\CustomerData;
-
-use Magento\Catalog\Model\Config\Source\Product\Thumbnail as ThumbnailSource;
-use Magento\Checkout\CustomerData\DefaultItem;
-
-/**
- * Configurable item
- */
-class ConfigurableItem extends DefaultItem
-{
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Msrp\Helper\Data $msrpHelper
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
-     * @param \Magento\Checkout\Helper\Data $checkoutHelper
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Msrp\Helper\Data $msrpHelper,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
-        \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        parent::__construct(
-            $imageHelper,
-            $msrpHelper,
-            $urlBuilder,
-            $configurationPool,
-            $checkoutHelper
-        );
-        $this->_scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getProductForThumbnail()
-    {
-        /**
-         * Show parent product thumbnail if it must be always shown according to the related setting in system config
-         * or if child thumbnail is not available
-         */
-        $config = $this->_scopeConfig->getValue(
-            \Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-
-        $product = $config == ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            || (!$this->getChildProduct()->getThumbnail() || $this->getChildProduct()->getThumbnail() == 'no_selection')
-            ? $this->getProduct()
-            : $this->getChildProduct();
-
-        return $product;
-    }
-
-    /**
-     * Get item configurable child product
-     *
-     * @return \Magento\Catalog\Model\Product
-     */
-    protected function getChildProduct()
-    {
-        if ($option = $this->item->getOptionByCode('simple_product')) {
-            return $option->getProduct();
-        }
-        return $this->getProduct();
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php
index 1de82eaad3196..674bd3703fa82 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Data.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php
@@ -6,7 +6,11 @@
 
 namespace Magento\ConfigurableProduct\Helper;
 
-use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Image;
 
 /**
  * Class Data
@@ -17,50 +21,48 @@
 class Data
 {
     /**
-     * Catalog Image Helper
-     *
-     * @var \Magento\Catalog\Helper\Image
+     * @var ImageHelper
      */
     protected $imageHelper;
 
     /**
-     * @param \Magento\Catalog\Helper\Image $imageHelper
+     * @var UrlBuilder
+     */
+    private $imageUrlBuilder;
+
+    /**
+     * @param ImageHelper $imageHelper
+     * @param UrlBuilder $urlBuilder
      */
-    public function __construct(\Magento\Catalog\Helper\Image $imageHelper)
+    public function __construct(ImageHelper $imageHelper, UrlBuilder $urlBuilder = null)
     {
         $this->imageHelper = $imageHelper;
+        $this->imageUrlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
     }
 
     /**
      * Retrieve collection of gallery images
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
-     * @return \Magento\Catalog\Model\Product\Image[]|null
+     * @param ProductInterface $product
+     * @return Image[]|null
      */
-    public function getGalleryImages(\Magento\Catalog\Api\Data\ProductInterface $product)
+    public function getGalleryImages(ProductInterface $product)
     {
         $images = $product->getMediaGalleryImages();
         if ($images instanceof \Magento\Framework\Data\Collection) {
+            /** @var $image Image */
             foreach ($images as $image) {
-                /** @var $image \Magento\Catalog\Model\Product\Image */
-                $image->setData(
-                    'small_image_url',
-                    $this->imageHelper->init($product, 'product_page_image_small')
-                        ->setImageFile($image->getFile())
-                        ->getUrl()
-                );
-                $image->setData(
-                    'medium_image_url',
-                    $this->imageHelper->init($product, 'product_page_image_medium_no_frame')
-                        ->setImageFile($image->getFile())
-                        ->getUrl()
-                );
-                $image->setData(
-                    'large_image_url',
-                    $this->imageHelper->init($product, 'product_page_image_large_no_frame')
-                        ->setImageFile($image->getFile())
-                        ->getUrl()
-                );
+                $smallImageUrl = $this->imageUrlBuilder
+                    ->getUrl($image->getFile(), 'product_page_image_small');
+                $image->setData('small_image_url', $smallImageUrl);
+
+                $mediumImageUrl = $this->imageUrlBuilder
+                    ->getUrl($image->getFile(), 'product_page_image_medium');
+                $image->setData('medium_image_url', $mediumImageUrl);
+
+                $largeImageUrl = $this->imageUrlBuilder
+                    ->getUrl($image->getFile(), 'product_page_image_large');
+                $image->setData('large_image_url', $largeImageUrl);
             }
         }
 
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 01981b5dae9db..79c2dd812acf1 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Model;
 
 use Magento\Framework\Exception\InputException;
@@ -115,19 +116,24 @@ public function addChild($sku, $childSku)
 
         $childrenIds = array_values($this->configurableType->getChildrenIds($product->getId())[0]);
         if (in_array($child->getId(), $childrenIds)) {
-            throw new StateException(__('Product has been already attached'));
+            throw new StateException(__('The product is already attached.'));
         }
 
         $configurableProductOptions = $product->getExtensionAttributes()->getConfigurableProductOptions();
         if (empty($configurableProductOptions)) {
-            throw new StateException(__('Parent product does not have configurable product options'));
+            throw new StateException(__("The parent product doesn't have configurable product options."));
         }
 
         $attributeIds = [];
         foreach ($configurableProductOptions as $configurableProductOption) {
             $attributeCode = $configurableProductOption->getProductAttribute()->getAttributeCode();
             if (!$child->getData($attributeCode)) {
-                throw new StateException(__('Child product does not have attribute value %1', $attributeCode));
+                throw new StateException(
+                    __(
+                        'The child product doesn\'t have the "%1" attribute value. Verify the value and try again.',
+                        $attributeCode
+                    )
+                );
             }
             $attributeIds[] = $configurableProductOption->getAttributeId();
         }
@@ -152,7 +158,7 @@ public function removeChild($sku, $childSku)
 
         if ($product->getTypeId() != \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
             throw new InputException(
-                __('Product with specified sku: %1 is not a configurable product', $sku)
+                __('The product with the "%1" SKU isn\'t a configurable product.', $sku)
             );
         }
 
@@ -165,7 +171,9 @@ public function removeChild($sku, $childSku)
             $ids[] = $option->getId();
         }
         if (count($options) == count($ids)) {
-            throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
+            throw new NoSuchEntityException(
+                __("The option that was requested doesn't exist. Verify the entity and try again.")
+            );
         }
         $product->getExtensionAttributes()->setConfigurableProductLinks($ids);
         $this->productRepository->save($product);
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
index bdf4a3678524e..b4db0a4db5fcd 100644
--- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -124,7 +125,9 @@ public function get($sku, $id)
             }
         }
 
-        throw new NoSuchEntityException(__('Requested option doesn\'t exist: %1', $id));
+        throw new NoSuchEntityException(
+            __('The "%1" entity that was requested doesn\'t exist. Verify the entity and try again.', $id)
+        );
     }
 
     /**
@@ -150,14 +153,14 @@ public function delete(OptionInterface $option)
             $this->configurableType->resetConfigurableAttributes($product);
         } catch (\Exception $exception) {
             throw new StateException(
-                __('Cannot delete variations from product: %1', $entityId)
+                __('The variations from the "%1" product can\'t be deleted.', $entityId)
             );
         }
         try {
             $this->optionResource->delete($option);
         } catch (\Exception $exception) {
             throw new StateException(
-                __('Cannot delete option with id: %1', $option->getId())
+                __('The option with "%1" ID can\'t be deleted.', $option->getId())
             );
         }
         return true;
@@ -173,7 +176,9 @@ public function deleteById($sku, $id)
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $option */
         $option = $attributeCollection->getItemById($id);
         if ($option === null) {
-            throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
+            throw new NoSuchEntityException(
+                __("The option that was requested doesn't exist. Verify the entity and try again.")
+            );
         }
         return $this->delete($option);
     }
@@ -213,11 +218,11 @@ public function save($sku, OptionInterface $option)
         try {
             $option->save();
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Something went wrong while saving option.'));
+            throw new CouldNotSaveException(__('An error occurred while saving the option. Please try to save again.'));
         }
 
         if (!$option->getId()) {
-            throw new CouldNotSaveException(__('Something went wrong while saving option.'));
+            throw new CouldNotSaveException(__('An error occurred while saving the option. Please try to save again.'));
         }
         return $option->getId();
     }
@@ -234,7 +239,7 @@ private function getProduct($sku)
         $product = $this->productRepository->get($sku);
         if (\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE !== $product->getTypeId()) {
             throw new InputException(
-                __('Only implemented for configurable product: %1', $sku)
+                __('This is implemented for the "%1" configurable product only.', $sku)
             );
         }
         return $product;
@@ -252,7 +257,7 @@ private function getProductById($id)
         $product = $this->productRepository->getById($id);
         if (\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE !== $product->getTypeId()) {
             throw new InputException(
-                __('Only implemented for configurable product: %1', $id)
+                __('This is implemented for the "%1" configurable product only.', $id)
             );
         }
         return $product;
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductIdentitiesExtender.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductIdentitiesExtender.php
new file mode 100644
index 0000000000000..0c3fc6fba6005
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductIdentitiesExtender.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Plugin;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ *  Extender of product identities for child of configurable products
+ */
+class ProductIdentitiesExtender
+{
+    /**
+     * @var Configurable
+     */
+    private $configurableType;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param Configurable $configurableType
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(Configurable $configurableType, ProductRepositoryInterface $productRepository)
+    {
+        $this->configurableType = $configurableType;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Add parent identities to product identities
+     *
+     * @param Product $subject
+     * @param array $identities
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetIdentities(Product $subject, array $identities): array
+    {
+        foreach ($this->configurableType->getParentIdsByChild($subject->getId()) as $parentId) {
+            $parentProduct = $this->productRepository->getById($parentId);
+            $identities = array_merge($identities, $parentProduct->getIdentities());
+        }
+
+        return array_unique($identities);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php
deleted file mode 100644
index ac42e320f3ad9..0000000000000
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\ConfigurableProduct\Model\Product\Cache\Tag;
-
-use Magento\Framework\App\Cache\Tag\StrategyInterface;
-
-/**
- * Add parent invalidation tags
- */
-class Configurable implements StrategyInterface
-{
-    /**
-     *  Configurable product type resource
-     *
-     * @var \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
-     */
-    private $catalogProductTypeConfigurable;
-
-    /**
-     * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $catalogProductTypeConfigurable
-     */
-    public function __construct(
-        \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $catalogProductTypeConfigurable
-    ) {
-        $this->catalogProductTypeConfigurable = $catalogProductTypeConfigurable;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTags($object)
-    {
-        if (!is_object($object)) {
-            throw new \InvalidArgumentException('Provided argument is not an object');
-        }
-
-        if (!($object instanceof \Magento\Catalog\Model\Product)) {
-            throw new \InvalidArgumentException('Provided argument must be a product');
-        }
-
-        $result = $object->getIdentities();
-
-        foreach ($this->catalogProductTypeConfigurable->getParentIdsByChild($object->getId()) as $parentId) {
-            $result[] = \Magento\Catalog\Model\Product::CACHE_TAG . '_' . $parentId;
-        }
-        return $result;
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
new file mode 100644
index 0000000000000..7de78b6612a10
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Resolves the product from a configured item.
+ */
+class ItemProductResolver implements ItemResolverInterface
+{
+    /**
+     * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     */
+    public const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get the final product from a configured item by product type and selection.
+     *
+     * @param ItemInterface $item
+     * @return ProductInterface
+     */
+    public function getFinalProduct(ItemInterface $item): ProductInterface
+    {
+        /**
+         * Show parent product thumbnail if it must be always shown according to the related setting in system config
+         * or if child thumbnail is not available.
+         */
+        $finalProduct = $item->getProduct();
+        $childProduct = $this->getChildProduct($item);
+        if ($childProduct !== null && $this->isUseChildProduct($childProduct)) {
+            $finalProduct = $childProduct;
+        }
+        return $finalProduct;
+    }
+
+    /**
+     * Get item configurable child product.
+     *
+     * @param ItemInterface $item
+     * @return Product | null
+     */
+    private function getChildProduct(ItemInterface $item): ?Product
+    {
+        /** @var \Magento\Quote\Model\Quote\Item\Option $option */
+        $option = $item->getOptionByCode('simple_product');
+        return $option ? $option->getProduct() : null;
+    }
+
+    /**
+     * Is need to use child product
+     *
+     * @param Product $childProduct
+     * @return bool
+     */
+    private function isUseChildProduct(Product $childProduct): bool
+    {
+        $configValue = $this->scopeConfig->getValue(
+            self::CONFIG_THUMBNAIL_SOURCE,
+            ScopeInterface::SCOPE_STORE
+        );
+        $childThumb = $childProduct->getData('thumbnail');
+        return $configValue !== Thumbnail::OPTION_USE_PARENT_IMAGE
+            && $childThumb !== null
+            && $childThumb !== 'no_selection';
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php
index d42d4ccafdd01..1c470808824a8 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php
@@ -10,6 +10,8 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ResourceModelConfigurable;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
+use Magento\ConfigurableProduct\Api\Data\OptionInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 
 /**
  * Class SaveHandler
@@ -76,35 +78,66 @@ public function execute($entity, $arguments = [])
     }
 
     /**
-     * Save attributes for configurable product
+     * Save only newly created attributes for configurable product.
      *
      * @param ProductInterface $product
      * @param array $attributes
      * @return array
      */
-    private function saveConfigurableProductAttributes(ProductInterface $product, array $attributes)
+    private function saveConfigurableProductAttributes(ProductInterface $product, array $attributes): array
     {
         $ids = [];
+        $existingAttributeIds = [];
+        foreach ($this->optionRepository->getList($product->getSku()) as $option) {
+            $existingAttributeIds[$option->getAttributeId()] = $option;
+        }
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $attribute */
         foreach ($attributes as $attribute) {
-            $attribute->setId(null);
-            $ids[] = $this->optionRepository->save($product->getSku(), $attribute);
+            if (!in_array($attribute->getAttributeId(), array_keys($existingAttributeIds))
+                || $this->isOptionChanged($existingAttributeIds[$attribute->getAttributeId()], $attribute)
+            ) {
+                $attribute->setId(null);
+                $ids[] = $this->optionRepository->save($product->getSku(), $attribute);
+            }
         }
 
         return $ids;
     }
 
     /**
-     * Remove product attributes
+     * Remove product attributes which no longer used.
      *
      * @param ProductInterface $product
      * @return void
      */
-    private function deleteConfigurableProductAttributes(ProductInterface $product)
+    private function deleteConfigurableProductAttributes(ProductInterface $product): void
+    {
+        $newAttributeIds = [];
+        foreach ($product->getExtensionAttributes()->getConfigurableProductOptions() as $option) {
+            $newAttributeIds[$option->getAttributeId()] = $option;
+        }
+        foreach ($this->optionRepository->getList($product->getSku()) as $option) {
+            if (!in_array($option->getAttributeId(), array_keys($newAttributeIds))
+                || $this->isOptionChanged($option, $newAttributeIds[$option->getAttributeId()])
+            ) {
+                $this->optionRepository->deleteById($product->getSku(), $option->getId());
+            }
+        }
+    }
+
+    /**
+     * Check if existing option is changed.
+     *
+     * @param OptionInterface $option
+     * @param Attribute $attribute
+     * @return bool
+     */
+    private function isOptionChanged(OptionInterface $option, Attribute $attribute): bool
     {
-        $list = $this->optionRepository->getList($product->getSku());
-        foreach ($list as $item) {
-            $this->optionRepository->deleteById($product->getSku(), $item->getId());
+        if ($option->getLabel() == $attribute->getLabel() && $option->getPosition() == $attribute->getPosition()) {
+            return false;
         }
+
+        return true;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 360a11cf2748f..f98075f2294cc 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -3,17 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Model\Product\Type;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
 use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
+use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
 
 /**
  * Configurable product type implementation
@@ -266,7 +267,6 @@ public function __construct(
             $productRepository,
             $serializer
         );
-
     }
 
     /**
@@ -453,6 +453,10 @@ public function getConfigurableAttributes($product)
             ['group' => 'CONFIGURABLE', 'method' => __METHOD__]
         );
         if (!$product->hasData($this->_configurableAttributes)) {
+            // for new product do not load configurable attributes
+            if (!$product->getId()) {
+                return [];
+            }
             $configurableAttributes = $this->getConfigurableAttributeCollection($product);
             $this->extensionAttributesJoinProcessor->process($configurableAttributes);
             $configurableAttributes->orderByPosition()->load();
@@ -682,7 +686,7 @@ private function saveConfigurableOptions(ProductInterface $product)
                 ->setProductId($product->getData($metadata->getLinkField()))
                 ->save();
         }
-        /** @var $configurableAttributesCollection \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection  */
+        /** @var $configurableAttributesCollection \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection */
         $configurableAttributesCollection = $this->_attributeCollectionFactory->create();
         $configurableAttributesCollection->setProductFilter($product);
         $configurableAttributesCollection->addFieldToFilter(
@@ -926,6 +930,8 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                         return $result;
                     }
                 }
+            } elseif (is_string($result)) {
+                return __($result)->render();
             }
         }
 
@@ -1276,6 +1282,8 @@ public function getSalableUsedProducts(\Magento\Catalog\Model\Product $product,
      * Load collection on sub-products for specified configurable product
      *
      * Load collection of sub-products, apply result to specified configurable product and store result to cache
+     * Please note $salableOnly parameter is used for backwards compatibility because of deprecated method
+     * getSalableUsedProducts
      * Number of loaded sub-products depends on $salableOnly parameter
      * $salableOnly = true - result array contains only salable sub-products
      * $salableOnly = false - result array contains all sub-products
@@ -1292,11 +1300,11 @@ private function loadUsedProducts(\Magento\Catalog\Model\Product $product, $cach
         if (!$product->hasData($dataFieldName)) {
             $usedProducts = $this->readUsedProductsCacheData($cacheKey);
             if ($usedProducts === null) {
-                $collection = $this->getConfiguredUsedProductCollection($product);
+                $collection = $this->getConfiguredUsedProductCollection($product, false);
                 if ($salableOnly) {
                     $collection = $this->salableProcessor->process($collection);
                 }
-                $usedProducts = $collection->getItems();
+                $usedProducts = array_values($collection->getItems());
                 $this->saveUsedProductsCacheData($product, $usedProducts, $cacheKey);
             }
             $product->setData($dataFieldName, $usedProducts);
@@ -1386,26 +1394,55 @@ private function getUsedProductsCacheKey($keyParts)
      * Retrieve related products collection with additional configuration
      *
      * @param \Magento\Catalog\Model\Product $product
+     * @param bool $skipStockFilter
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
      */
-    private function getConfiguredUsedProductCollection(\Magento\Catalog\Model\Product $product)
-    {
+    private function getConfiguredUsedProductCollection(
+        \Magento\Catalog\Model\Product $product,
+        $skipStockFilter = true
+    ) {
         $collection = $this->getUsedProductCollection($product);
+
+        if ($skipStockFilter) {
+            $collection->setFlag('has_stock_status_filter', true);
+        }
+
         $collection
-            ->setFlag('has_stock_status_filter', true)
-            ->addAttributeToSelect($this->getCatalogConfig()->getProductAttributes())
+            ->addAttributeToSelect($this->getAttributesForCollection($product))
             ->addFilterByRequiredOptions()
             ->setStoreId($product->getStoreId());
 
-        $requiredAttributes = ['name', 'price', 'weight', 'image', 'thumbnail', 'status', 'media_gallery'];
-        foreach ($requiredAttributes as $attributeCode) {
-            $collection->addAttributeToSelect($attributeCode);
-        }
-        foreach ($this->getUsedProductAttributes($product) as $usedProductAttribute) {
-            $collection->addAttributeToSelect($usedProductAttribute->getAttributeCode());
-        }
         $collection->addMediaGalleryData();
         $collection->addTierPriceData();
+
         return $collection;
     }
+
+    /**
+     * @return array
+     */
+    private function getAttributesForCollection(\Magento\Catalog\Model\Product $product)
+    {
+        $productAttributes = $this->getCatalogConfig()->getProductAttributes();
+
+        $requiredAttributes = [
+            'name',
+            'price',
+            'weight',
+            'image',
+            'thumbnail',
+            'status',
+            'visibility',
+            'media_gallery'
+        ];
+
+        $usedAttributes = array_map(
+            function($attr) {
+                return $attr->getAttributeCode();
+            },
+            $this->getUsedProductAttributes($product)
+        );
+
+        return array_unique(array_merge($productAttributes, $requiredAttributes, $usedAttributes));
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
index 617297e545b7d..7306942c3c49b 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
@@ -18,7 +18,7 @@
 class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\ConfigurableProduct\Api\Data\OptionInterface
 {
-    /**#@+
+    /**
      * Constants for field names
      */
     const KEY_ATTRIBUTE_ID = 'attribute_id';
@@ -27,9 +27,10 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
     const KEY_IS_USE_DEFAULT = 'is_use_default';
     const KEY_VALUES = 'values';
     const KEY_PRODUCT_ID = 'product_id';
-    /**#@-*/
 
-    /**#@-*/
+    /**
+     * @var MetadataPool|\Magento\Framework\EntityManager\MetadataPool
+     */
     private $metadataPool;
 
     /**
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 0000000000000..b8a948d55f11a
--- /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/Product/VariationHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
index a462a5ffd9edd..73e7f9053fa4a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Model\Product;
 
 use Magento\Catalog\Model\Product\Type as ProductType;
@@ -96,7 +97,9 @@ public function generateSimpleProducts($parentProduct, $productsData)
                 $configurableAttribute = json_decode($simpleProductData['configurable_attribute'], true);
                 unset($simpleProductData['configurable_attribute']);
             } else {
-                throw new LocalizedException(__('Configuration must have specified attributes'));
+                throw new LocalizedException(
+                    __('Contribution must have attributes specified. Enter attributes and try again.')
+                );
             }
 
             $this->fillSimpleProductData(
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 4450bbd75e574..56993ecec1fbf 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -59,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -69,7 +69,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
             if (is_array($options)) {
                 $requestData = [];
                 foreach ($options as $option) {
-                    $requestData['super_attribute'][$option->getOptionId()] = $option->getOptionValue();
+                    $requestData['super_attribute'][$option->getOptionId()] = (string) $option->getOptionValue();
                 }
                 return $this->objectFactory->create($requestData);
             }
@@ -78,7 +78,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function processOptions(CartItemInterface $cartItem)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
index 958d802682d52..8fbab8142fecd 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
@@ -40,7 +40,7 @@ public function __construct(Attribute $attributeResource, OptionProvider $attrib
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSelect(AbstractAttribute $superAttribute, int $productId, ScopeInterface $scope)
     {
@@ -91,6 +91,12 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId, Sco
                 ]
             ),
             []
+        )->joinLeft(
+            ['attribute_option' => $this->attributeResource->getTable('eav_attribute_option')],
+            'attribute_option.option_id = entity_value.value',
+            []
+        )->order(
+            'attribute_option.sort_order ASC'
         )->where(
             'super_attribute.product_id = ?',
             $productId
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 487ab19de2063..b7bbf7aa1871c 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -1,193 +1,313 @@
 <?php
 /**
- * Configurable Products Price Indexer Resource model
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
 
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Magento\Store\Api\StoreResolverInterface;
-use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogInventory\Model\Configuration;
 
 /**
+ * Configurable Products Price Indexer Resource model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Configurable extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
+class Configurable implements DimensionalIndexerInterface
 {
     /**
-     * @var StoreResolverInterface
+     * @var BaseFinalPrice
      */
-    private $storeResolver;
+    private $baseFinalPrice;
 
     /**
-     * Class constructor
-     *
-     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Module\Manager $moduleManager
-     * @param string|null $connectionName
-     * @param StoreResolverInterface|null $storeResolver
+     * @var IndexTableStructureFactory
      */
-    public function __construct(
-        \Magento\Framework\Model\ResourceModel\Db\Context $context,
-        \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Module\Manager $moduleManager,
-        $connectionName = null,
-        StoreResolverInterface $storeResolver = null
-    ) {
-        parent::__construct($context, $tableStrategy, $eavConfig, $eventManager, $moduleManager, $connectionName);
-        $this->storeResolver = $storeResolver ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            StoreResolverInterface::class
-        );
-    }
+    private $indexTableStructureFactory;
 
     /**
-     * @param null|int|array $entityIds
-     * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
+     * @var TableMaintainer
      */
-    protected function reindex($entityIds = null)
-    {
-        if ($this->hasEntity() || !empty($entityIds)) {
-            $this->prepareFinalPriceDataForType($entityIds, $this->getTypeId());
-            $this->_applyCustomOption();
-            $this->_applyConfigurableOption();
-            $this->_movePriceDataToIndexTable($entityIds);
-        }
-        return $this;
-    }
+    private $tableMaintainer;
 
     /**
-     * Retrieve table name for custom option temporary aggregation data
-     *
-     * @return string
+     * @var MetadataPool
      */
-    protected function _getConfigurableOptionAggregateTable()
-    {
-        return $this->tableStrategy->getTableName('catalog_product_index_price_cfg_opt_agr');
-    }
+    private $metadataPool;
 
     /**
-     * Retrieve table name for custom option prices data
-     *
-     * @return string
+     * @var \Magento\Framework\App\ResourceConnection
      */
-    protected function _getConfigurableOptionPriceTable()
-    {
-        return $this->tableStrategy->getTableName('catalog_product_index_price_cfg_opt');
+    private $resource;
+
+    /**
+     * @var bool
+     */
+    private $fullReindexAction;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var BasePriceModifier
+     */
+    private $basePriceModifier;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param BaseFinalPrice $baseFinalPrice
+     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param TableMaintainer $tableMaintainer
+     * @param MetadataPool $metadataPool
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param BasePriceModifier $basePriceModifier
+     * @param bool $fullReindexAction
+     * @param string $connectionName
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        BaseFinalPrice $baseFinalPrice,
+        IndexTableStructureFactory $indexTableStructureFactory,
+        TableMaintainer $tableMaintainer,
+        MetadataPool $metadataPool,
+        \Magento\Framework\App\ResourceConnection $resource,
+        BasePriceModifier $basePriceModifier,
+        $fullReindexAction = false,
+        $connectionName = 'indexer',
+        ScopeConfigInterface $scopeConfig = null
+    ) {
+        $this->baseFinalPrice = $baseFinalPrice;
+        $this->indexTableStructureFactory = $indexTableStructureFactory;
+        $this->tableMaintainer = $tableMaintainer;
+        $this->connectionName = $connectionName;
+        $this->metadataPool = $metadataPool;
+        $this->resource = $resource;
+        $this->fullReindexAction = $fullReindexAction;
+        $this->basePriceModifier = $basePriceModifier;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
-     * Prepare table structure for custom option temporary aggregation data
+     * @inheritdoc
      *
-     * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
+     * @throws \Exception
      */
-    protected function _prepareConfigurableOptionAggregateTable()
+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
     {
-        $this->getConnection()->delete($this->_getConfigurableOptionAggregateTable());
-        return $this;
+        $this->tableMaintainer->createMainTmpTable($dimensions);
+
+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+            'entityField' => 'entity_id',
+            'customerGroupField' => 'customer_group_id',
+            'websiteField' => 'website_id',
+            'taxClassField' => 'tax_class_id',
+            'originalPriceField' => 'price',
+            'finalPriceField' => 'final_price',
+            'minPriceField' => 'min_price',
+            'maxPriceField' => 'max_price',
+            'tierPriceField' => 'tier_price',
+        ]);
+        $select = $this->baseFinalPrice->getQuery(
+            $dimensions,
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE,
+            iterator_to_array($entityIds)
+        );
+        $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
+        $this->tableMaintainer->getConnection()->query($query);
+
+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
+        $this->applyConfigurableOption($temporaryPriceTable, $dimensions, iterator_to_array($entityIds));
     }
 
     /**
-     * Prepare table structure for custom option prices data
+     * Apply configurable option
+     *
+     * @param IndexTableStructure $temporaryPriceTable
+     * @param array $dimensions
+     * @param array $entityIds
      *
-     * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
+     * @return $this
+     * @throws \Exception
      */
-    protected function _prepareConfigurableOptionPriceTable()
-    {
-        $this->getConnection()->delete($this->_getConfigurableOptionPriceTable());
+    private function applyConfigurableOption(
+        IndexTableStructure $temporaryPriceTable,
+        array $dimensions,
+        array $entityIds
+    ) {
+        $temporaryOptionsTableName = 'catalog_product_index_price_cfg_opt_temp';
+        $this->getConnection()->createTemporaryTableLike(
+            $temporaryOptionsTableName,
+            $this->getTable('catalog_product_index_price_cfg_opt_tmp'),
+            true
+        );
+
+        $this->fillTemporaryOptionsTable($temporaryOptionsTableName, $dimensions, $entityIds);
+        $this->updateTemporaryTable($temporaryPriceTable->getTableName(), $temporaryOptionsTableName);
+
+        $this->getConnection()->delete($temporaryOptionsTableName);
+
         return $this;
     }
 
     /**
-     * Calculate minimal and maximal prices for configurable product options
-     * and apply it to final price
+     * Put data into catalog product price indexer config option temp table
+     *
+     * @param string $temporaryOptionsTableName
+     * @param array $dimensions
+     * @param array $entityIds
      *
-     * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return void
+     * @throws \Exception
      */
-    protected function _applyConfigurableOption()
+    private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, array $dimensions, array $entityIds)
     {
-        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
-        $connection = $this->getConnection();
-        $coaTable = $this->_getConfigurableOptionAggregateTable();
-        $copTable = $this->_getConfigurableOptionPriceTable();
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
         $linkField = $metadata->getLinkField();
 
-        $this->_prepareConfigurableOptionAggregateTable();
-        $this->_prepareConfigurableOptionPriceTable();
-
-        $subSelect = $this->getSelect();
-        $subSelect->join(
+        $select = $this->getConnection()->select()->from(
+            ['i' => $this->getMainTable($dimensions)],
+            []
+        )->join(
             ['l' => $this->getTable('catalog_product_super_link')],
-            'l.product_id = e.entity_id',
+            'l.product_id = i.entity_id',
             []
         )->join(
             ['le' => $this->getTable('catalog_product_entity')],
             'le.' . $linkField . ' = l.parent_id',
-            ['parent_id' => 'entity_id']
+            []
         );
 
-        $select = $connection->select();
-        $select
-            ->from(['sub' => new \Zend_Db_Expr('(' . (string)$subSelect . ')')], '')
-            ->columns([
-                'sub.parent_id',
-                'sub.entity_id',
-                'sub.customer_group_id',
-                'sub.website_id',
-                'sub.price',
-                'sub.tier_price'
-            ]);
-
-        $query = $select->insertFromSelect($coaTable);
-        $connection->query($query);
-
-        $select = $connection->select()->from(
-            [$coaTable],
+        // Does not make sense to extend query if out of stock products won't appear in tables for indexing
+        if ($this->isConfigShowOutOfStock()) {
+            $select->join(
+                ['si' => $this->getTable('cataloginventory_stock_item')],
+                'si.product_id = l.product_id',
+                []
+            );
+            $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
+        }
+
+        $select->columns(
             [
-                'parent_id',
+                'le.entity_id',
                 'customer_group_id',
                 'website_id',
-                'MIN(price)',
-                'MAX(price)',
+                'MIN(final_price)',
+                'MAX(final_price)',
                 'MIN(tier_price)',
             ]
         )->group(
-            ['parent_id', 'customer_group_id', 'website_id']
+            ['le.entity_id', 'customer_group_id', 'website_id']
         );
+        if ($entityIds !== null) {
+            $select->where('le.entity_id IN (?)', $entityIds);
+        }
+        $query = $select->insertFromSelect($temporaryOptionsTableName);
+        $this->getConnection()->query($query);
+    }
 
-        $query = $select->insertFromSelect($copTable);
-        $connection->query($query);
-
-        $table = ['i' => $this->_getDefaultFinalPriceTable()];
-        $select = $connection->select()->join(
-            ['io' => $copTable],
+    /**
+     * Update data in the catalog product price indexer temp table
+     *
+     * @param string $temporaryPriceTableName
+     * @param string $temporaryOptionsTableName
+     *
+     * @return void
+     */
+    private function updateTemporaryTable(string $temporaryPriceTableName, string $temporaryOptionsTableName)
+    {
+        $table = ['i' => $temporaryPriceTableName];
+        $selectForCrossUpdate = $this->getConnection()->select()->join(
+            ['io' => $temporaryOptionsTableName],
             'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
             ' AND i.website_id = io.website_id',
             []
         );
-        $select->columns(
+        // adds price of custom option, that was applied in DefaultPrice::_applyCustomOption
+        $selectForCrossUpdate->columns(
             [
-                'min_price' => new \Zend_Db_Expr('i.min_price - i.orig_price + io.min_price'),
-                'max_price' => new \Zend_Db_Expr('i.max_price - i.orig_price + io.max_price'),
+                'min_price' => new \Zend_Db_Expr('i.min_price - i.price + io.min_price'),
+                'max_price' => new \Zend_Db_Expr('i.max_price - i.price + io.max_price'),
                 'tier_price' => 'io.tier_price',
             ]
         );
 
-        $query = $select->crossUpdateFromSelect($table);
-        $connection->query($query);
+        $query = $selectForCrossUpdate->crossUpdateFromSelect($table);
+        $this->getConnection()->query($query);
+    }
+
+    /**
+     * Get main table
+     *
+     * @param array $dimensions
+     * @return string
+     */
+    private function getMainTable($dimensions)
+    {
+        if ($this->fullReindexAction) {
+            return $this->tableMaintainer->getMainReplicaTable($dimensions);
+        }
+        return $this->tableMaintainer->getMainTable($dimensions);
+    }
+
+    /**
+     * Get connection
+     *
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @throws \DomainException
+     */
+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+    {
+        if ($this->connection === null) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
 
-        $connection->delete($coaTable);
-        $connection->delete($copTable);
+        return $this->connection;
+    }
 
-        return $this;
+    /**
+     * Get table
+     *
+     * @param string $tableName
+     * @return string
+     */
+    private function getTable($tableName)
+    {
+        return $this->resource->getTableName($tableName, $this->connectionName);
+    }
+
+    /**
+     * Is flag Show Out Of Stock setted
+     *
+     * @return bool
+     */
+    private function isConfigShowOutOfStock(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+            ScopeInterface::SCOPE_STORE
+        );
     }
 }
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 0000000000000..3f1c22548c8d8
--- /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/LinkedProductSelectBuilderComposite.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
new file mode 100644
index 0000000000000..59a7b81e068a5
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+
+/**
+ * Used in Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProvider
+ * to provide queries to select configurable product option with lowest price
+ *
+ * @see app/code/Magento/ConfigurableProduct/etc/di.xml
+ */
+class LinkedProductSelectBuilderComposite implements LinkedProductSelectBuilderInterface
+{
+    /**
+     * @var LinkedProductSelectBuilderInterface[]
+     */
+    private $linkedProductSelectBuilder;
+
+    /**
+     * @param LinkedProductSelectBuilderInterface[] $linkedProductSelectBuilder
+     */
+    public function __construct($linkedProductSelectBuilder)
+    {
+        $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build($productId)
+    {
+        $selects = [];
+        foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {
+            $selects = array_merge($selects, $productSelectBuilder->build($productId));
+        }
+
+        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 0000000000000..bc118043adc8e
--- /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/Model/ResourceModel/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
index 3c9689a1c4eb9..feffd22a0fb3d 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
@@ -17,7 +17,11 @@
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionProvider;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
+/**
+ * Configurable product resource model.
+ */
 class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
@@ -109,27 +113,34 @@ public function saveProducts($mainProduct, array $productIds)
         }
 
         $productId = $mainProduct->getData($this->optionProvider->getProductEntityLinkField());
+        $select = $this->getConnection()->select()->from(
+            ['t' => $this->getMainTable()],
+            ['product_id']
+        )->where(
+            't.parent_id = ?',
+            $productId
+        );
 
-        $data = [];
-        foreach ($productIds as $id) {
-            $data[] = ['product_id' => (int) $id, 'parent_id' => (int) $productId];
-        }
+        $existingProductIds = $this->getConnection()->fetchCol($select);
+        $insertProductIds = array_diff($productIds, $existingProductIds);
+        $deleteProductIds = array_diff($existingProductIds, $productIds);
 
-        if (!empty($data)) {
-            $this->getConnection()->insertOnDuplicate(
+        if (!empty($insertProductIds)) {
+            $insertData = [];
+            foreach ($insertProductIds as $id) {
+                $insertData[] = ['product_id' => (int) $id, 'parent_id' => (int) $productId];
+            }
+            $this->getConnection()->insertMultiple(
                 $this->getMainTable(),
-                $data,
-                ['product_id', 'parent_id']
+                $insertData
             );
         }
 
-        $where = ['parent_id = ?' => $productId];
-        if (!empty($productIds)) {
-            $where['product_id NOT IN(?)'] = $productIds;
+        if (!empty($deleteProductIds)) {
+            $where = ['parent_id = ?' => $productId, 'product_id IN (?)' => $deleteProductIds];
+            $this->getConnection()->delete($this->getMainTable(), $where);
         }
 
-        $this->getConnection()->delete($this->getMainTable(), $where);
-
         // configurable product relations should be added to relation table
         $this->catalogProductRelation->processRelations($productId, $productIds);
 
@@ -165,10 +176,13 @@ public function getChildrenIds($parentId, $required = true)
             $parentId
         );
 
-        $childrenIds = [0 => []];
-        foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $childrenIds[0][$row['product_id']] = $row['product_id'];
-        }
+        $childrenIds = [
+            0 => array_column(
+                $this->getConnection()->fetchAll($select),
+                'product_id',
+                'product_id'
+            )
+        ];
 
         return $childrenIds;
     }
@@ -181,7 +195,6 @@ public function getChildrenIds($parentId, $required = true)
      */
     public function getParentIdsByChild($childId)
     {
-        $parentIds = [];
         $select = $this->getConnection()
             ->select()
             ->from(['l' => $this->getMainTable()], [])
@@ -190,10 +203,7 @@ public function getParentIdsByChild($childId)
                 'e.' . $this->optionProvider->getProductEntityLinkField() . ' = l.parent_id',
                 ['e.entity_id']
             )->where('l.product_id IN(?)', $childId);
-
-        foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $parentIds[] = $row['entity_id'];
-        }
+        $parentIds = $this->getConnection()->fetchCol($select);
 
         return $parentIds;
     }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
index 7ea83099f2589..e93c44893bf58 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
@@ -8,8 +8,8 @@
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable;
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute as ConfigurableAttribute;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -85,22 +85,30 @@ public function saveLabel($attribute)
             'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
         ];
         $valueId = $connection->fetchOne($select, $bind);
+
         if ($valueId) {
-            $storeId = (int)$attribute->getStoreId() ?: $this->_storeManager->getStore()->getId();
+            $connection->insertOnDuplicate(
+                $this->_labelTable,
+                [
+                    'product_super_attribute_id' => (int)$attribute->getId(),
+                    'store_id' => (int)$attribute->getStoreId() ?: $this->_storeManager->getStore()->getId(),
+                    'use_default' => (int)$attribute->getUseDefault(),
+                    'value' => $attribute->getLabel(),
+                ],
+                ['value', 'use_default']
+            );
         } else {
             // if attribute label not exists, always store on default store (0)
-            $storeId = Store::DEFAULT_STORE_ID;
+            $connection->insert(
+                $this->_labelTable,
+                [
+                    'product_super_attribute_id' => (int)$attribute->getId(),
+                    'store_id' => Store::DEFAULT_STORE_ID,
+                    'use_default' => (int)$attribute->getUseDefault(),
+                    'value' => $attribute->getLabel(),
+                ]
+            );
         }
-        $connection->insertOnDuplicate(
-            $this->_labelTable,
-            [
-                'product_super_attribute_id' => (int)$attribute->getId(),
-                'use_default' => (int)$attribute->getUseDefault(),
-                'store_id' => $storeId,
-                'value' => $attribute->getLabel(),
-            ],
-            ['value', 'use_default']
-        );
 
         return $this;
     }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index 3f76fb7a2e959..3124a3b8cf0ed 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -41,6 +41,7 @@ protected function _construct()
 
     /**
      * Init select
+     *
      * @return $this|\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
      */
     protected function _initSelect()
@@ -73,9 +74,9 @@ public function setProductFilter($product)
      *
      * @return $this
      */
-    protected function _beforeLoad()
+    protected function _renderFilters()
     {
-        parent::_beforeLoad();
+        parent::_renderFilters();
         $metadata = $this->getProductEntityMetadata();
         $parentIds = [];
         foreach ($this->products as $product) {
@@ -88,8 +89,7 @@ protected function _beforeLoad()
     }
 
     /**
-     * Retrieve is flat enabled flag
-     * Return alvays false if magento run admin
+     * Retrieve is flat enabled flag. Return always false if magento run admin
      *
      * @return bool
      */
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 0000000000000..df8782ae422b4
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -0,0 +1,51 @@
+<?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) {
+            $result = $salableItem->isSalable();
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
index 3d42217de5f91..5581fcc07b861 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
@@ -64,7 +64,7 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
 
         foreach ($this->lowestPriceOptionsProvider->getProducts($product) as $subProduct) {
             $productPrice = $this->priceResolver->resolvePrice($subProduct);
-            $price = $price ? min($price, $productPrice) : $productPrice;
+            $price = isset($price) ? min($price, $productPrice) : $productPrice;
         }
 
         return (float)$price;
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
index 66bc3db7ee89d..d3ce508b31e0d 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Retrieve list of products where each product contains lower price than others at least for one possible price type
@@ -31,7 +32,12 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
     private $collectionFactory;
 
     /**
-     * Key is product id. Value is array of prepared linked products
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * Key is product id and store id. Value is array of prepared linked products
      *
      * @var array
      */
@@ -41,15 +47,18 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
      * @param ResourceConnection $resourceConnection
      * @param LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
      * @param CollectionFactory $collectionFactory
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         LinkedProductSelectBuilderInterface $linkedProductSelectBuilder,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        StoreManagerInterface $storeManager
     ) {
         $this->resource = $resourceConnection;
         $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
         $this->collectionFactory = $collectionFactory;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -57,18 +66,19 @@ public function __construct(
      */
     public function getProducts(ProductInterface $product)
     {
-        if (!isset($this->linkedProductMap[$product->getId()])) {
+        $key = $this->storeManager->getStore()->getId() . '-' . $product->getId();
+        if (!isset($this->linkedProductMap[$key])) {
             $productIds = $this->resource->getConnection()->fetchCol(
                 '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
             );
 
-            $this->linkedProductMap[$product->getId()] = $this->collectionFactory->create()
+            $this->linkedProductMap[$key] = $this->collectionFactory->create()
                 ->addAttributeToSelect(
                     ['price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id']
                 )
                 ->addIdFilter($productIds)
                 ->getItems();
         }
-        return $this->linkedProductMap[$product->getId()];
+        return $this->linkedProductMap[$key];
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
deleted file mode 100644
index 7bc56569dea44..0000000000000
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ConfigurableProduct\Setup;
-
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        $attributes = [
-            'country_of_manufacture',
-            'minimal_price',
-            'msrp',
-            'msrp_display_actual_price_type',
-            'price',
-            'special_price',
-            'special_from_date',
-            'special_to_date',
-            'tier_price',
-            'weight',
-            'color'
-        ];
-        foreach ($attributes as $attributeCode) {
-            $relatedProductTypes = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
-            );
-            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
-                $relatedProductTypes[] = Configurable::TYPE_CODE;
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    $attributeCode,
-                    'apply_to',
-                    implode(',', $relatedProductTypes)
-                );
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
deleted file mode 100644
index 75157b9655eaa..0000000000000
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ConfigurableProduct\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'catalog_product_super_attribute'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_super_attribute'))
-            ->addColumn(
-                'product_super_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Product Super Attribute ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attribute ID'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Position'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_super_attribute',
-                    ['product_id', 'attribute_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_id', 'attribute_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_super_attribute',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Super Attribute Table');
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_super_attribute_label'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_super_attribute_label'))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Value ID'
-            )
-            ->addColumn(
-                'product_super_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product Super Attribute ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'use_default',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Use Default Value'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Value'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_super_attribute_label',
-                    ['product_super_attribute_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_super_attribute_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_super_attribute_label', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_super_attribute_label',
-                    'product_super_attribute_id',
-                    'catalog_product_super_attribute',
-                    'product_super_attribute_id'
-                ),
-                'product_super_attribute_id',
-                $installer->getTable('catalog_product_super_attribute'),
-                'product_super_attribute_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_super_attribute_label', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Super Attribute Label Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_super_link'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_super_link'))
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Link ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'parent_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Parent ID'
-            )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_super_link', ['parent_id']),
-                ['parent_id']
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'catalog_product_super_link',
-                    ['product_id', 'parent_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['product_id', 'parent_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_super_link',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_super_link', 'parent_id', 'catalog_product_entity', 'entity_id'),
-                'parent_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Super Link Table');
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
new file mode 100644
index 0000000000000..f69d8529fb801
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ConfigurableProduct\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Class InstallInitialConfigurableAttributes
+ * @package Magento\ConfigurableProduct\Setup\Patch
+ */
+class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * InstallInitialConfigurableAttributes constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $attributes = [
+            'country_of_manufacture',
+            'manufacturer',
+            'minimal_price',
+            'msrp',
+            'msrp_display_actual_price_type',
+            'price',
+            'special_price',
+            'special_from_date',
+            'special_to_date',
+            'tier_price',
+            'weight',
+            'color'
+        ];
+        foreach ($attributes as $attributeCode) {
+            $relatedProductTypes = explode(
+                ',',
+                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
+            );
+            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+                $relatedProductTypes[] = Configurable::TYPE_CODE;
+                $eavSetup->updateAttribute(
+                    \Magento\Catalog\Model\Product::ENTITY,
+                    $attributeCode,
+                    'apply_to',
+                    implode(',', $relatedProductTypes)
+                );
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php
new file mode 100644
index 0000000000000..1e085e0fdb389
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateManufacturerAttribute.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Update manufacturer attribute if it's presented in system.
+ */
+class UpdateManufacturerAttribute implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        if ($manufacturer = $eavSetup->getAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'manufacturer',
+            'apply_to'
+        )) {
+            $relatedProductTypes = explode(
+                ',',
+                $manufacturer
+            );
+
+            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+                $relatedProductTypes[] = Configurable::TYPE_CODE;
+                $eavSetup->updateAttribute(
+                    \Magento\Catalog\Model\Product::ENTITY,
+                    'manufacturer',
+                    'apply_to',
+                    implode(',', $relatedProductTypes)
+                );
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InstallInitialConfigurableAttributes::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.2.1';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php
new file mode 100644
index 0000000000000..325fb447d225f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ConfigurableProduct\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Class UpdateTierPriceAttribute
+ * @package Magento\ConfigurableProduct\Setup\Patch
+ */
+class UpdateTierPriceAttribute implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * UpdateTierPriceAttribute constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $relatedProductTypes = explode(
+            ',',
+            $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'tier_price', 'apply_to')
+        );
+        $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
+        if ($key !== false) {
+            unset($relatedProductTypes[$key]);
+            $eavSetup->updateAttribute(
+                \Magento\Catalog\Model\Product::ENTITY,
+                'tier_price',
+                'apply_to',
+                implode(',', $relatedProductTypes)
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InstallInitialConfigurableAttributes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}\
+     */
+    public static function getVersion()
+    {
+        return '2.2.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
deleted file mode 100644
index 326af02fe39bb..0000000000000
--- a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\ConfigurableProduct\Setup;
-
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-
-/**
- * Upgrade Data script
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        if (version_compare($context->getVersion(), '2.2.0') < 0) {
-            /** @var EavSetup $eavSetup */
-            $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-            $relatedProductTypes = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'tier_price', 'apply_to')
-            );
-            $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
-            if ($key !== false) {
-                unset($relatedProductTypes[$key]);
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    'tier_price',
-                    'apply_to',
-                    implode(',', $relatedProductTypes)
-                );
-            }
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
new file mode 100644
index 0000000000000..0ac1914040d25
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Filter the product grid and view expected products-->
+    <actionGroup name="viewConfigurableProductInAdminGrid">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="3" stepKey="seeCorrectNumberOfProducts"/>
+
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFiltersSimple"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="simple" stepKey="selectionProductType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersWithSimpleType"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.name}}"  stepKey="seeSimpleProductNameInGrid"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.price}}"  stepKey="seeSimpleProductPriceInGrid"/>
+
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFiltersConfigurable"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{product.type_id}}" stepKey="selectionConfigurableProductType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersWithConfigurableType"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.name}}"  stepKey="seeConfigurableProductNameInGrid"/>
+        <dontSee selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.price}}"  stepKey="dontSeeProductPriceNameInGrid"/>
+
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
+    </actionGroup>
+
+    <!--
+
+    Create a configurable product with three options for color: red, white, and blue
+
+    Expected start state = logged in as an admin
+    End state = on the product edit page in the admin
+
+    -->
+    <actionGroup name="createConfigurableProduct">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+            <argument name="category" defaultValue="_defaultCategory"/>
+        </arguments>
+
+        <!-- fill in basic configurable product values -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="wait1"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
+        <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="fillCategory"/>
+        <selectOption userInput="{{product.visibility}}" selector="{{AdminProductFormSection.visibility}}" stepKey="fillVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+        <!-- create configurations for colors the product is available in -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
+        <waitForPageLoad stepKey="waitForIFrame"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForFilters"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
+        <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
+        <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
+        <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
+        <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
+        <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="seeProductNameInTitle"/>
+    </actionGroup>
+
+    <actionGroup name="generateConfigurationsByAttributeCode">
+        <arguments>
+            <argument name="attributeCode" type="string" defaultValue="SomeString"/>
+        </arguments>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="99" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+    </actionGroup>
+
+    <actionGroup name="createConfigurationsForAttribute" extends="generateConfigurationsByAttributeCode">
+        <arguments>
+            <argument name="attributeCode" type="string" defaultValue="SomeString"/>
+        </arguments>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
new file mode 100644
index 0000000000000..033e6757c3bf9
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateApiConfigurableProductActionGroup">
+        <arguments>
+            <argument name="productName" defaultValue="ApiConfigurableProductWithOutCategory" type="string"/>
+        </arguments>
+
+        <!-- Create the configurable product based on the data in the /data folder -->
+        <createData entity="ApiConfigurableProductWithOutCategory" stepKey="createConfigProduct">
+            <field key="name">{{productName}}</field>
+        </createData>
+
+        <!-- Create attribute with 2 options to be used in children products -->
+        <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+        <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </createData>
+        <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </createData>
+        <createData entity="AddToDefaultSet" stepKey="addAttributeToAttributeSet">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </createData>
+        <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </getData>
+        <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </getData>
+
+        <!-- Create the 2 children that will be a part of the configurable product -->
+        <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
+        </createData>
+        <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
+        </createData>
+
+        <!-- Assign the two products to the configurable product -->
+        <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
+        </createData>
+        <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createConfigChildProduct1"/>
+        </createData>
+        <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createConfigChildProduct2"/>
+        </createData>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
new file mode 100644
index 0000000000000..95533057608f2
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="GotoCatalogProductsPage">
+
+        <!--Click on Catalog item-->
+        <click stepKey="clickOnCatalogItem" selector="{{CatalogProductsSection.catalogItem}}"/>
+        <waitForPageLoad stepKey="waitForCatalogLoad"/>
+
+        <!--Click on Products item-->
+        <click stepKey="clickOnProductItem" selector="{{CatalogProductsSection.productItem}}"/>
+        <waitForPageLoad stepKey="waitForCatalogProductPageLoad"/>
+
+        <!--Assert we have gone desired page successfully-->
+        <seeInCurrentUrl stepKey="assertWeAreOnTheCatalogProductPage" url="{{assertionData.catalogProduct}}"/>
+
+    </actionGroup>
+
+    <actionGroup name="GotoConfigurableProductPage">
+
+        <!--Click on Add product item-->
+        <click stepKey="clickOnAddProductItem" selector="{{ConfigurableProductSection.addProductItem}}"/>
+
+        <!--Click on Configuration Product item-->
+        <click stepKey="clickOnConfigurationProductItem" selector="{{ConfigurableProductSection.configProductItem}}"/>
+        <waitForPageLoad stepKey="waitForConfigurableProductPageLoad"/>
+
+        <!--Assert we have gone desired page successfully-->
+        <seeInCurrentUrl stepKey="assertWeAreOnTheConfigurableProductPage" url="{{assertionData.configurableProduct}}"/>
+
+    </actionGroup>
+
+    <actionGroup name="FillAllRequiredFields">
+
+        <!--Fill In Product Name Fields-->
+        <fillField stepKey="fillInProductNameFields" selector="{{NewProduct.productName}}" userInput="{{NewProductsData.productName}}"/>
+
+        <!--Fill In Price Fields-->
+        <fillField stepKey="fillInPriceFields" selector="{{NewProduct.price}}" userInput="{{NewProductsData.price}}"/>
+
+        <!--Fill In Weight Fields-->
+        <fillField stepKey="fillInWeightFields" selector="{{NewProduct.weight}}" userInput="{{NewProductsData.weight}}"/>
+
+        <!--Click "Create Configurations" button in configurations field-->
+        <click stepKey="clickOnCreateConfigurationsButton" selector="{{NewProduct.createConfigurationButton}}"/>
+        <waitForPageLoad stepKey="waitForCreateProductConfigurationsPageLoad"/>
+
+        <!--Click "Create New Attribute" button-->
+        <click stepKey="clickOnCreateNewAttributeButton" selector="{{NewProduct.createNewAttributeButton}}"/>
+        <waitForPageLoad stepKey="waitForNewAttributePageLoad"/>
+
+    </actionGroup>
+
+
+    <actionGroup name="CreateNewAttribute">
+
+        <switchToIFrame stepKey="NewAttributePage" selector="{{NewProduct.newAttributeIFrame}}"/>
+
+        <!--Fill In Product Name Fields-->
+        <fillField stepKey="fillInDefaultLabelField" selector="{{NewProduct.defaultLabel}}" userInput="{{NewProductsData.defaultLabel}}"/>
+
+        <!--Add option 1 to attribute-->
+        <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption1"/>
+        <waitForPageLoad stepKey="waitForOption1"/>
+        <fillField stepKey="fillInAdminFieldRed" selector="{{NewProduct.adminFieldRed}}" userInput="{{NewProductsData.adminFieldRed}}"/>
+        <fillField stepKey="fillInDefaultStoreViewFieldRed" selector="{{NewProduct.defaultStoreViewFieldRed}}" userInput="{{NewProductsData.defaultStoreViewFieldRed}}"/>
+
+        <!--Add option 2 to attribute-->
+        <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption2"/>
+        <waitForPageLoad stepKey="waitForOption2"/>
+        <fillField stepKey="fillInAdminFieldBlue" selector="{{NewProduct.adminFieldBlue}}" userInput="{{NewProductsData.adminFieldBlue}}"/>
+        <fillField stepKey="fillInDefaultStoreViewFieldBlue" selector="{{NewProduct.defaultStoreViewFieldBlue}}" userInput="{{NewProductsData.defaultStoreViewFieldBlue}}"/>
+
+        <!--Add option 3 to attribute-->
+        <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption3"/>
+        <waitForPageLoad stepKey="waitForOption3"/>
+        <fillField stepKey="fillInAdminFieldYellow" selector="{{NewProduct.adminFieldYellow}}" userInput="{{NewProductsData.adminFieldYellow}}"/>
+        <fillField stepKey="fillInDefaultStoreViewFieldYellow" selector="{{NewProduct.defaultStoreViewFieldYellow}}" userInput="{{NewProductsData.defaultStoreViewFieldYellow}}"/>
+
+        <!--Add option 4 to attribute-->
+        <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption4"/>
+        <waitForPageLoad stepKey="waitForOption4"/>
+        <fillField stepKey="fillInAdminFieldGreen" selector="{{NewProduct.adminFieldGreen}}" userInput="{{NewProductsData.adminFieldGreen}}"/>
+        <fillField stepKey="fillInDefaultStoreViewFieldGreen" selector="{{NewProduct.defaultStoreViewFieldGreen}}" userInput="{{NewProductsData.defaultStoreViewFieldGreen}}"/>
+
+        <!--Add option 5 to attribute-->
+        <click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption5"/>
+        <waitForPageLoad stepKey="waitForOption5"/>
+        <fillField stepKey="fillInAdminFieldBlack" selector="{{NewProduct.adminFieldBlack}}" userInput="{{NewProductsData.adminFieldBlack}}"/>
+        <fillField stepKey="fillInDefaultStoreViewFieldBlack" selector="{{NewProduct.defaultStoreViewFieldBlack}}" userInput="{{NewProductsData.defaultStoreViewFieldBlack}}"/>
+
+        <!--Click Save Attribute button-->
+        <click selector="{{NewProduct.saveAttributeButton}}" stepKey="clickSaveAttributeButton"/>
+        <waitForPageLoad stepKey="waitForSavingSettings"/>
+
+        <!--Select created Attribute -->
+        <click selector="{{ConfigurableProductSection.selectCreatedAttribute}}" stepKey="selectCreatedAttribute"/>
+
+        <!--Click Next button-->
+        <click selector="{{ConfigurableProductSection.nextButton}}" stepKey="clickNextButton"/>
+        <waitForPageLoad stepKey="waitForNextPageLoaded"/>
+
+        <!--Select all the options of all the attributes button-->
+        <click selector="{{CreateProductConfigurations.checkboxRed}}" stepKey="selectCheckboxRed"/>
+        <click selector="{{CreateProductConfigurations.checkboxBlue}}" stepKey="selectCheckboxBlue"/>
+        <click selector="{{CreateProductConfigurations.checkboxYellow}}" stepKey="selectCheckboxYellow"/>
+        <click selector="{{CreateProductConfigurations.checkboxGreen}}" stepKey="selectCheckboxGreen"/>
+        <click selector="{{CreateProductConfigurations.checkboxBlack}}" stepKey="selectCheckboxBlack"/>
+
+        <!--Click Next button-->
+        <click selector="{{ConfigurableProductSection.nextButton}}" stepKey="clickNextButton2"/>
+        <waitForPageLoad stepKey="waitForBulkImagesPricePageLoaded"/>
+
+        <!--Click Next button-->
+        <click selector="{{ConfigurableProductSection.nextButton}}" stepKey="clickNextButton3"/>
+        <waitForPageLoad stepKey="waitForSummaryPageLoaded"/>
+
+        <!--Click Generate Configure button-->
+        <click selector="{{ConfigurableProductSection.generateConfigure}}" stepKey="generateConfigure"/>
+        <waitForPageLoad stepKey="waitForGenerateConfigure"/>
+
+        <!-- This Error message shouldn't appear: Test will pass when bug will be fixed-->
+        <dontSee selector="{{CreateProductConfigurations.errorMessage}}" userInput="{{assertionData.errorMessage}}"  stepKey="dontSeeError"/>
+
+        <!--Close frame-->
+        <conditionalClick selector="{{ConfigurableProductSection.closeFrame}}" dependentSelector="{{ConfigurableProductSection.closeFrame}}" visible="1" stepKey="closeFrame"/>
+        <waitForPageLoad stepKey="waitForClosingFrame"/>
+
+    </actionGroup>
+
+    <actionGroup name="DeleteCreatedAttribute">
+
+        <!--Click on Stores item-->
+        <click stepKey="clickOnStoresItem" selector="{{CatalogProductsSection.storesItem}}"/>
+        <waitForPageLoad stepKey="waitForNavigationPanel"/>
+
+        <!--Click on Products item-->
+        <waitForElementVisible selector="{{CatalogProductsSection.storesProductItem}}" stepKey="waitForCatalogLoad"/>
+        <click stepKey="clickOnStoresProductItem" selector="{{CatalogProductsSection.storesProductItem}}"/>
+        <waitForPageLoad stepKey="waitForStoresProductPageLoad"/>
+
+        <!--Click on created Attribute -->
+        <fillField stepKey="searchProductDefaultLabel" selector="{{CatalogProductsSection.searchDefaultLabelField}}" userInput="{{NewProductsData.defaultLabel}}"/>
+        <click stepKey="clickSearchButton" selector="{{CatalogProductsSection.searchButton}}"/>
+        <waitForPageLoad stepKey="waitForCreatedAttributeLoad"/>
+        <click stepKey="clickOnCreatedAttributeItem" selector="{{CatalogProductsSection.createdAttributeItem}}"/>
+        <waitForPageLoad stepKey="waitForAttributePropertiesPageLoad"/>
+
+        <!--Click on Delete Attribute item-->
+        <click stepKey="clickOnDeleteAttributeItem" selector="{{CatalogProductsSection.deleteAttributeItem}}"/>
+        <waitForPageLoad stepKey="waitForDeletedDialogOpened"/>
+
+        <!--Click on OK button-->
+        <click stepKey="clickOnOKButton" selector="{{CatalogProductsSection.okButton}}"/>
+        <waitForPageLoad stepKey="waitFordAttributeDeleted"/>
+        <see userInput="You deleted the product attribute." stepKey="seeDeletedTheProductAttributeMessage"/>
+
+        <!-- Click Reset Filter button-->
+        <click stepKey="clickResetFilterButton" selector="{{CatalogProductsSection.resetFilter}}"/>
+        <waitForPageLoad stepKey="waitForAllFilterReset"/>
+
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..f88ed5e1b02f3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check configurable product in checkout cart items -->
+    <actionGroup name="CheckConfigurableProductInCheckoutCartItemsActionGroup">
+        <arguments>
+            <argument name="productVar" />
+            <argument name="optionLabel" />
+            <argument name="optionValue" />
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="{{productVar.name}}" stepKey="seeProductInCart"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName(productVar.name)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName(productVar.name)}}" visible="false" stepKey="exposeProductOptions"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName(productVar.name)}}" userInput="{{optionLabel}}" stepKey="seeProductOptionLabel" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName(productVar.name)}}" userInput="{{optionValue}}" stepKey="seeProductOptionValue" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
new file mode 100644
index 0000000000000..39c206e365a2d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check configurable product on the category page -->
+    <actionGroup name="StorefrontCheckCategoryConfigurableProduct">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
new file mode 100644
index 0000000000000..a0c82ae356e22
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check the configurable product in comparison page -->
+    <actionGroup name="StorefrontCheckCompareConfigurableProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', product.name)}}" stepKey="assertProductSku"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductAddToCartByName(product.name)}}" stepKey="assertProductAddToCart"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
new file mode 100644
index 0000000000000..0a8d8e56426ba
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check the configurable product on the product page -->
+    <actionGroup name="StorefrontCheckConfigurableProduct">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="AssertProductNameInTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="assertAddToCart" />
+        <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
+        <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
new file mode 100644
index 0000000000000..e07b97c63a92b
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check Configurable Product in the Cart -->
+    <actionGroup name="StorefrontCheckCartConfigurableProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+            <argument name="productQuantity"/>
+        </arguments>
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{CheckoutCartProductSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+        <seeInField userInput="{{productQuantity}}" selector="{{CheckoutCartProductSection.ProductQuantityByName(product.name)}}" stepKey="assertProductQuantity"/>
+    </actionGroup>
+
+    <!-- Open the Minicart and check Configurable Product -->
+    <actionGroup name="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontMinicartSection.productLinkByName(product.name)}}" stepKey="waitForMinicartProduct" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart" />
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontMinicartSection.productPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
new file mode 100644
index 0000000000000..73a668fd2fefd
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="NewProductsData" type="user">
+        <data key="productName" unique="prefix">Shoes</data>
+        <data key="price">60</data>
+        <data key="weight">100</data>
+        <data key="defaultLabel">design</data>
+        <data key="adminFieldRed">red</data>
+        <data key="defaultStoreViewFieldRed">red123</data>
+        <data key="adminFieldBlue">blue</data>
+        <data key="defaultStoreViewFieldBlue">blue123</data>
+        <data key="adminFieldYellow">yellow</data>
+        <data key="defaultStoreViewFieldYellow">yellow123</data>
+        <data key="adminFieldGreen">green</data>
+        <data key="defaultStoreViewFieldGreen">green123</data>
+        <data key="adminFieldBlack">black</data>
+        <data key="defaultStoreViewFieldBlack">black123</data>
+        <data key="attributeCodeField">bug91524</data>
+    </entity>
+
+    <entity name="assertionData" type="assertion">
+        <data key="catalogProduct">product</data>
+        <data key="configurableProduct">configurable</data>
+        <data key="errorMessage">element.disabled is not a function</data>
+    </entity>
+
+</entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
new file mode 100644
index 0000000000000..e7d9d61491a32
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="BaseConfigurableProduct" type="product">
+        <data key="sku" unique="suffix">configurable</data>
+        <data key="type_id">configurable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">configurable</data>
+        <data key="price">123.00</data>
+        <data key="weight">2</data>
+        <data key="urlKey" unique="suffix">configurableurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiConfigurableProduct" type="product">
+        <data key="sku" unique="suffix">api-configurable-product</data>
+        <data key="type_id">configurable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">API Configurable Product</data>
+        <data key="urlKey" unique="suffix">api-configurable-product</data>
+        <data key="price">123.00</data>
+        <data key="weight">2</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiConfigurableProductWithOutCategory" type="product">
+        <data key="sku" unique="suffix">api-configurable-product-with-out-category</data>
+        <data key="type_id">configurable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">API Configurable Product</data>
+        <data key="urlKey" unique="suffix">api-configurable-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
+    <entity name="ApiConfigurableProductWithDescription" type="product">
+        <data key="sku" unique="suffix">api-configurable-product</data>
+        <data key="type_id">configurable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">API Configurable Product</data>
+        <data key="urlKey" unique="suffix">api-configurable-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
+    <entity name="ConfigurableProductAddChild" type="ConfigurableProductAddChild">
+        <var key="sku" entityKey="sku" entityType="product" />
+        <var key="childSku" entityKey="sku" entityType="product2"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
new file mode 100644
index 0000000000000..f231d74b70dad
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ConfigurableProductTwoOptions" type="ConfigurableProductOption">
+        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
+        <data key="label">option</data>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex2</requiredEntity>
+    </entity>
+    <entity name="ConfigurableProductThreeOptions" type="ConfigurableProductOption">
+        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
+        <data key="label">option</data>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex2</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex3</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
new file mode 100644
index 0000000000000..7e21729ba15c4
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="three">3</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
new file mode 100644
index 0000000000000..9342172f7d4df
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="colorProductAttribute" type="product_attribute">
+        <data key="default_label" unique="suffix">Color</data>
+        <data key="input_type">Dropdown</data>
+        <data key="attribute_quantity">1</data>
+    </entity>
+    <entity name="colorProductAttribute1" type="product_attribute">
+        <data key="name" unique="suffix">White</data>
+        <data key="price">1.00</data>
+    </entity>
+    <entity name="colorProductAttribute2" type="product_attribute">
+        <data key="name" unique="suffix">Red</data>
+        <data key="price">2.00</data>
+    </entity>
+    <entity name="colorProductAttribute3" type="product_attribute">
+        <data key="name" unique="suffix">Blue</data>
+        <data key="price">3.00</data>
+    </entity>
+    <entity name="colorProductAttribute4" type="product_attribute">
+        <data key="name" unique="suffix">Orange</data>
+        <data key="price">99.99</data>
+    </entity>
+    <entity name="colorDefaultProductAttribute" type="product_attribute">
+        <data key="default_label">Color</data>
+        <data key="input_type">Dropdown</data>
+        <data key="attribute_quantity">2</data>
+    </entity>
+    <entity name="colorDefaultProductAttribute1" type="product_attribute">
+        <data key="name">Green</data>
+        <data key="price">4.00</data>
+    </entity>
+    <entity name="colorDefaultProductAttribute2" type="product_attribute">
+        <data key="name">Black</data>
+        <data key="price">5.00</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
new file mode 100644
index 0000000000000..537ba2bbce086
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ValueIndex1" type="ValueIndex">
+        <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
+    </entity>
+    <entity name="ValueIndex2" type="ValueIndex">
+        <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
+    </entity>
+    <entity name="ValueIndex3" type="ValueIndex">
+        <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE.txt b/app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE.txt
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE_AFL.txt b/app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE_AFL.txt
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
new file mode 100644
index 0000000000000..ec4da787541f9
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="ConfigurableProductAddChild" dataType="ConfigurableProductAddChild" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/child" method="POST">
+        <contentType>application/json</contentType>
+        <field key="childSku">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
new file mode 100644
index 0000000000000..4d894f780092d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateConfigurableProductOption" dataType="ConfigurableProductOption" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/options" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="ConfigurableProductOption" key="option">
+            <field key="attribute_id">integer</field>
+            <field key="label">string</field>
+            <array key="values">
+                <value>ValueIndex</value>
+            </array>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
new file mode 100644
index 0000000000000..4b12abd3053fe
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateExtensionAttributeConfigProductOption" dataType="ExtensionAttributeConfigProductOption" type="create">
+        <contentType>application/json</contentType>
+        <array key="configurable_product_options">
+            <object dataType="ExtensionAttributeConfigProductOption" key="configurable_product_options">
+                <array key="0">
+                    <value>ConfigProductOption</value>
+                </array>
+            </object>
+        </array>
+    </operation>
+</operations>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
new file mode 100644
index 0000000000000..e83faddf0e332
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="ValueIndex" dataType="ValueIndex" type="create">
+        <field key="value_index">integer</field>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..7705b34f0af03
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminProductFormConfigurationsSection"/>
+        <section name="AdminCreateProductConfigurationsPanel"/>
+        <section name="AdminNewAttributePanel"/>
+        <section name="AdminChooseAffectedAttributeSetPopup"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/README.md b/app/code/Magento/ConfigurableProduct/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fb3770d722a63
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Product Functional Tests
+
+The Functional Test Module for **Magento Configurable Product** module.
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
new file mode 100644
index 0000000000000..4289638352990
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminChooseAffectedAttributeSetPopup">
+        <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
new file mode 100644
index 0000000000000..7901b6f2290c9
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreateProductConfigurationsPanel">
+        <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
+        <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
+        <element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
+        <element name="id" type="text" selector="//tr[contains(@data-repeat-index, '0')]/td[2]/div"/>
+
+        <element name="selectAll" type="button" selector=".action-select-all"/>
+        <element name="selectAllByAttribute" type="button" selector="//div[@data-attribute-title='{{attr}}']//button[contains(@class, 'action-select-all')]" parameterized="true"/>
+        <element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>
+        <element name="attributeName" type="input" selector="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
+        <element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
+        <element name="attributeCheckboxByIndex" type="input" selector="li.attribute-option:nth-of-type({{var1}}) input" parameterized="true"/>
+
+        <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
+        <element name="applySinglePriceToAllSkus" type="radio" selector=".admin__field-label[for='apply-single-price-radio']"/>
+        <element name="singlePrice" type="input" selector="#apply-single-price-input"/>
+        <element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/>
+        <element name="attribute1" type="input" selector="#apply-single-price-input-0"/>
+        <element name="attribute2" type="input" selector="#apply-single-price-input-1"/>
+        <element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
+
+        <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
+        <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
+        <element name="gridLoadingMask" type="text" selector="[data-role='spinner'][data-component*='product_attributes_listing']"/>
+        <element name="attributeColorCheckbox" type="select" selector="//div[contains(text(),'color') and @class='data-grid-cell-content']/../preceding-sibling::td/label/input"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
new file mode 100644
index 0000000000000..44077888f8bc0
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewAttributePanel">
+        <element name="container" type="text" selector="#create_new_attribute"/>
+        <element name="saveAttribute" type="button" selector="#save"/>
+        <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
+        <element name="defaultLabel" type="input" selector="input[name='frontend_label[0]']"/>
+        <element name="inputType" type="select" selector="select[name='frontend_input']" timeout="30"/>
+        <element name="valuesRequired" type="select" selector="select#is_required"/>
+        <element name="addOption" type="button" selector="#add_new_option_button"/>
+        <element name="isDefault" type="radio" selector="[data-role='options-container'] tr:nth-of-type({{row}}) input[name='default[]']" parameterized="true"/>
+        <element name="optionAdminValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][0]']" parameterized="true"/>
+        <element name="optionDefaultStoreValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][1]']" parameterized="true"/>
+        <element name="deleteOption" type="button" selector="#delete_button_option_{{row}}" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
new file mode 100644
index 0000000000000..f2caef1717e84
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormConfigurationsSection">
+        <element name="sectionHeader" type="text" selector=".admin__collapsible-block-wrapper[data-index='configurable']"/>
+        <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
+        <element name="currentVariationsRows" type="button" selector=".data-row"/>
+        <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
+        <element name="currentVariationsSkuCells" type="textarea" selector=".admin__control-fields[data-index='sku_container']"/>
+        <element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/>
+        <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
+        <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
+        <element name="currentVariationsStatusCells" type="textarea" selector="._no-header[data-index='status']"/>
+        <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/>
+        <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
+        <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
+        <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
+        <element name="variationsSkuInputByRow" selector="[data-index='configurable-matrix'] table > tbody > tr:nth-of-type({{row}}) input[name*='sku']" type="input" parameterized="true"/>
+        <element name="variationsSkuInputErrorByRow" selector="[data-index='configurable-matrix'] table > tbody > tr:nth-of-type({{row}}) .admin__field-error" type="text" parameterized="true"/>
+    </section>
+    <section name="AdminConfigurableProductFormSection">
+        <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>
+        <element name="productQuantity" type="input" selector=".admin__control-text[name='product[quantity_and_stock_status][qty]']"/>
+        <element name="currentVariationsQuantityCells" type="button" selector="td[data-index='quantity_container']"/>
+        <element name="rowByCode" type="textarea" selector="//span[contains(text(), '{{var1}}-{{var2}}')]//ancestor-or-self::tr" parameterized="true"/>
+    </section>
+    <section name="AdminConfigurableProductSelectAttributesSlideOut">
+        <element name="grid" type="button" selector=".admin__data-grid-wrap tbody"/>
+    </section>
+    <section name="StorefrontConfigurableProductPage">
+        <element name="productAttributeDropDown" type="select" selector="select[id*='attribute']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
new file mode 100644
index 0000000000000..e3403ce71acaa
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridActionSection">
+        <element name="addConfigurableProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-configurable']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
new file mode 100644
index 0000000000000..b3077d9d5d566
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CatalogProductsSection">
+        <element name="catalogItem" type="button" selector="//*[@id='menu-magento-catalog-catalog']/a/span"/>
+        <element name="productItem" type="button" selector="//*[@data-ui-id='menu-magento-catalog-catalog-products']/a"/>
+        <element name="storesItem" type="button" selector="//*[@id='menu-magento-backend-stores']/a/span"/>
+        <element name="searchDefaultLabelField" type="input" selector="//*[@id='attributeGrid_filter_frontend_label']"/>
+        <element name="searchButton" type="button" selector="//div[@class='admin__filter-actions']//*[contains(text(), 'Search')]"/>
+        <element name="storesProductItem" type="button" selector="//*[@data-ui-id='menu-magento-catalog-catalog-attributes-attributes']/a"/>
+        <element name="createdAttributeItem" type="button" selector="//td[contains(@class, 'col-label') and normalize-space()='design']"/>
+        <element name="deleteAttributeItem" type="button" selector="//*[@id='delete']"/>
+        <element name="okButton" type="button" selector="//footer[@class='modal-footer']//*[contains(text(),'OK')]"/>
+        <element name="messageSuccessSavedProduct" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
+        <element name="resetFilter" type="button" selector="//span[contains(text(), 'Reset Filter')]"/>
+    </section>
+
+    <section name="ConfigurableProductSection">
+        <element name="addProductItem" type="button" selector="//*[@id='add_new_product']/button[2]"/>
+        <element name="configProductItem" type="button" selector="//*[@id='add_new_product']//*[contains(text(),'Configurable Product')]"/>
+        <element name="nextButton" type="button" selector="//div[@class='nav-bar-outer-actions']//*[contains(text(),'Next')]"/>
+        <element name="generateConfigure" type="button" selector="//div[@class='nav-bar-outer-actions']//*[contains(text(),'Generate Products')]"/>
+        <element name="selectCreatedAttribute" type="button" selector="//*[@class='admin__data-grid-wrap']//td[normalize-space()='design']/preceding-sibling::td"/>
+        <element name="closeFrame" type="button" selector="//*[@class='modal-header']//*[contains(text(),'Create Product Configurations')]/following-sibling::button"/>
+    </section>
+
+    <section name="NewProduct">
+        <element name="productName" type="input" selector="//input[@name='product[name]']"/>
+        <element name="price" type="input" selector="//input[@name='product[price]']"/>
+        <element name="weight" type="input" selector="//input[@name='product[weight]']"/>
+        <element name="createConfigurationButton" type="button" selector="//*[contains(text(),'Create Configurations')]"/>
+        <element name="createNewAttributeButton" type="button" selector="//*[contains(text(),'Create New Attribute')]"/>
+        <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
+        <element name="defaultLabel" type="input" selector="//*[@id='attribute_label']"/>
+        <element name="addOptionButton" type="button" selector="//*[@id='add_new_option_button']"/>
+        <element name="adminFieldRed" type="input" selector="//input[@name='option[value][option_0][0]']"/>
+        <element name="defaultStoreViewFieldRed" type="input" selector="//input[@name='option[value][option_0][1]']"/>
+        <element name="adminFieldBlue" type="input" selector="//input[@name='option[value][option_1][0]']"/>
+        <element name="defaultStoreViewFieldBlue" type="input" selector="//input[@name='option[value][option_1][1]']"/>
+        <element name="adminFieldYellow" type="input" selector="//input[@name='option[value][option_2][0]']"/>
+        <element name="defaultStoreViewFieldYellow" type="input" selector="//input[@name='option[value][option_2][1]']"/>
+        <element name="adminFieldGreen" type="input" selector="//input[@name='option[value][option_3][0]']"/>
+        <element name="defaultStoreViewFieldGreen" type="input" selector="//input[@name='option[value][option_3][1]']"/>
+        <element name="adminFieldBlack" type="input" selector="//input[@name='option[value][option_4][0]']"/>
+        <element name="defaultStoreViewFieldBlack" type="input" selector="//input[@name='option[value][option_4][1]']"/>
+        <element name="saveAttributeButton" type="button" selector="//*[@id='save']"/>
+        <element name="advancedAttributeProperties" type="button" selector="//*[@id='advanced_fieldset-wrapper']//*[contains(text(),'Advanced Attribute Properties')]"/>
+        <element name="attributeCodeField" type="input"  selector="//*[@id='attribute_code']"/>
+
+    </section>
+
+    <section name="CreateProductConfigurations">
+        <element name="checkboxRed" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'red')]/preceding-sibling::input"/>
+        <element name="checkboxBlue" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'blue')]/preceding-sibling::input"/>
+        <element name="checkboxYellow" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'yellow')]/preceding-sibling::input"/>
+        <element name="checkboxGreen" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'green')]/preceding-sibling::input"/>
+        <element name="checkboxBlack" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'black')]/preceding-sibling::input"/>
+        <element name="errorMessage" type="input" selector="//div[@data-ui-id='messages-message-error']"/>
+    </section>
+
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..b195c19f7bedd
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="optionByAttributeId" type="input" selector="#attribute{{var1}}" parameterized="true"/>
+        <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
+        <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
+        <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
+        <element name="productAttributeOptionsError" type="text" selector="//div[@class='mage-error']"/>
+        <!-- Parameter is the order number of the attribute on the page (1 is the newest) -->
+        <element name="nthAttributeOnPage" type="block" selector="tr:nth-of-type({{numElement}}) .data" parameterized="true"/>
+        <element name="stockIndication" type="block" selector=".stock" />
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
new file mode 100644
index 0000000000000..92928c9384672
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultImageConfigurableTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default images for a Configurable Product"/>
+            <description value="Admin should be able to add default images for a Configurable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-101"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="BaseConfigurableProduct" stepKey="baseConfigProductHandle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChild2"/>
+            <deleteData createDataKey="baseConfigProductHandle" stepKey="deleteConfig"/>
+            <deleteData createDataKey="categoryHandle" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGrid">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid1"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage2" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
new file mode 100644
index 0000000000000..48f46a1205ec3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductCreateTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to create a configurable product with attributes"/>
+            <description value="admin should be able to create a configurable product with attributes"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-84"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a configurable product via the UI -->
+        <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!-- assert color configurations on the admin create product page -->
+        <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeName3InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeSku1InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeSku2InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeSku3InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" stepKey="seeUniquePrice1InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" stepKey="seeUniquePrice2InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
+
+        <!-- assert storefront category list page -->
+        <amOnPage url="/" stepKey="amOnStorefront"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
+        <see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
+
+        <!-- assert storefront product details page -->
+        <click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
new file mode 100644
index 0000000000000..1a694b8adf17e
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductDeleteTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to delete a configurable product"/>
+            <description value="admin should be able to delete a configurable product"/>
+            <testCaseId value="MC-87"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- assert product visible in storefront -->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="gotoStorefront1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProduct"/>
+
+        <!-- go to admin and delete -->
+        <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+        <click selector="label.data-grid-checkbox-cell-inner" stepKey="clickCheckbox"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="seeSuccessMsg"/>
+
+        <!-- after delete, assert product page is 404 -->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="gotoStorefront2"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="dontSeeProduct"/>
+    </test>
+
+    <test name="AdminConfigurableProductBulkDeleteTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to mass delete configurable products"/>
+            <description value="admin should be able to mass delete configurable products"/>
+            <testCaseId value="MC-99"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: Parts of this should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create shared category and attribute -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create first of three configurable products -->
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption1">
+                <requiredEntity createDataKey="createProduct1"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createProduct1"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createProduct1"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- Create second configurable product -->
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct4">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption2">
+                <requiredEntity createDataKey="createProduct2"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createProduct2"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild4">
+                <requiredEntity createDataKey="createProduct2"/>
+                <requiredEntity createDataKey="createConfigChildProduct4"/>
+            </createData>
+
+            <!-- Create third configurable product -->
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct3">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct5">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct6">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption3">
+                <requiredEntity createDataKey="createProduct3"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild5">
+                <requiredEntity createDataKey="createProduct3"/>
+                <requiredEntity createDataKey="createConfigChildProduct5"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild6">
+                <requiredEntity createDataKey="createProduct3"/>
+                <requiredEntity createDataKey="createConfigChildProduct6"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigChildProduct4" stepKey="deleteConfigChildProduct4"/>
+            <deleteData createDataKey="createConfigChildProduct5" stepKey="deleteConfigChildProduct5"/>
+            <deleteData createDataKey="createConfigChildProduct6" stepKey="deleteConfigChildProduct6"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search for prefix of the 3 products we created via api -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+
+        <!-- Select all, then delete -->
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+
+        <!-- Should not see the records in the admin panel -->
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 3 record(s) have been deleted." stepKey="seeSuccessMsg"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="0" stepKey="seeNoResults"/>
+
+        <!-- after delete, assert product pages are 404 -->
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoStorefront1"/>
+        <waitForPageLoad stepKey="waitForProduct1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops1"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct1.name$$" stepKey="dontSeeProduct1"/>
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoStorefront2"/>
+        <waitForPageLoad stepKey="waitForProduct2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops2"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct1.name$$" stepKey="dontSeeProduct2"/>
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoStorefront3"/>
+        <waitForPageLoad stepKey="waitForProduct3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops3"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct1.name$$" stepKey="dontSeeProduct3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
new file mode 100644
index 0000000000000..c599a6a23f190
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductLongSkuTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Admin is able to create an product with a long sku below that is below the character limit"/>
+            <description value="Try to create a product with sku slightly less than char limit. Get client side SKU length error for child products. Correct SKUs and save product succeeds."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-5685"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!--Create product attribute with options-->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <!--Create Category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+
+        <after>
+            <!--Clean up products-->
+            <actionGroup ref="deleteProductByName" stepKey="cleanUpProducts">
+                <argument name="sku" value="{{ProductWithLongNameSku.sku}}"/>
+                <argument name="name" value="{{ProductWithLongNameSku.name}}"/>
+            </actionGroup>
+            <!--Clean up attribute-->
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <!--Clean up category-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+         <!--Create a configurable product with long name and sku-->
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'configurable')}}" stepKey="goToProductCreatePage"/>
+        <waitForPageLoad stepKey="waitForProductCreatePage"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{ProductWithLongNameSku.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{ProductWithLongNameSku.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{ProductWithLongNameSku.price}}" stepKey="fillProductPrice"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="selectCategory"/>
+        <!--Setup configurations-->
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="setupConfigurations">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+
+         <!--See SKU length errors in Current Variations grid-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFail"/>
+        <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'configurable')}}" stepKey="seeRemainOnCreateProductPage"/>
+        <see selector="{{AdminProductFormConfigurationsSection.variationsSkuInputErrorByRow('1')}}" userInput="Please enter less or equal than 64 symbols." stepKey="seeSkuTooLongError1"/>
+        <see selector="{{AdminProductFormConfigurationsSection.variationsSkuInputErrorByRow('2')}}" userInput="Please enter less or equal than 64 symbols." stepKey="seeSkuTooLongError2"/>
+        <!--Fix SKU lengths-->
+        <fillField selector="{{AdminProductFormConfigurationsSection.variationsSkuInputByRow('1')}}" userInput="LongSku-$$getConfigAttributeOption1.label$$" stepKey="fixConfigurationSku1"/>
+        <fillField selector="{{AdminProductFormConfigurationsSection.variationsSkuInputByRow('2')}}" userInput="LongSku-$$getConfigAttributeOption2.label$$" stepKey="fixConfigurationSku2"/>
+        <!--Save product successfully-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductSuccess"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+
+         <!--Assert configurations on the product edit pag-->
+        <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="2" stepKey="seeNumberOfRows"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{ProductWithLongNameSku.name}}-$$getConfigAttributeOption1.label$$" stepKey="seeChildProductName1"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{ProductWithLongNameSku.name}}-$$getConfigAttributeOption2.label$$" stepKey="seeChildProductName2"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="LongSku-$$getConfigAttributeOption1.label$$" stepKey="seeChildProductSku1"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="LongSku-$$getConfigAttributeOption2.label$$" stepKey="seeChildProductSku2"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{ProductWithLongNameSku.price}}" stepKey="seeConfigurationsPrice"/>
+
+         <!--Assert storefront category list page-->
+        <amOnPage url="/" stepKey="amOnStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefrontLoad"/>
+        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see userInput="{{ProductWithLongNameSku.name}}" stepKey="assertProductPresent"/>
+        <see userInput="{{ProductWithLongNameSku.price}}" stepKey="assertProductPricePresent"/>
+
+        <!--Assert storefront product details page-->
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(ProductWithLongNameSku.name)}}" stepKey="clickOnProductName"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <seeInTitle userInput="{{ProductWithLongNameSku.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{ProductWithLongNameSku.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{ProductWithLongNameSku.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="$$createConfigProductAttribute.default_frontend_label$$" stepKey="seeColorAttributeName1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="seeInDropDown1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="$$getConfigAttributeOption2.label$$" stepKey="seeInDropDown2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
new file mode 100644
index 0000000000000..5633c3675ca85
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductChildrenOutOfStockTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Product visibility when in stock/out of stock"/>
+            <title value="Configurable Product goes 'Out of Stock' if all associated Simple Products are 'Out of Stock'"/>
+            <description value="Configurable Product goes 'Out of Stock' if all associated Simple Products are 'Out of Stock'"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-181"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category to put the product in -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- log in -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
+        <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK" />
+
+        <!-- Find the first simple product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="ApiSimpleOne"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Edit the quantity of the simple first product as 0 -->
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad2"/>
+        <see stepKey="checkForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
+
+        <!-- Find the second simple product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct2">
+            <argument name="product" value="ApiSimpleTwo"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied2"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+
+        <!-- Edit the quantity of the second simple product as 0 -->
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
+
+        <!-- Check to make sure that the configurable product shows up as out of stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad3"/>
+        <see stepKey="checkForOutOfStock3" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
+    </test>
+
+    <test name="AdminConfigurableProductOutOfStockTestDeleteChildren">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Product visibility when in stock/out of stock"/>
+            <title value="Configurable Product goes 'Out of Stock' if all associated Simple Products are deleted"/>
+            <description value="Configurable Product goes 'Out of Stock' if all associated Simple Products are deleted"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3042"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category to put the product in -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- log in -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
+        <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK" />
+
+        <!-- Delete the first simple product -->
+        <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+            <argument name="sku" value="{{ApiSimpleOne.sku}}"/>
+        </actionGroup>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad2"/>
+        <see stepKey="checkForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
+
+        <!-- Delete the second simple product -->
+        <actionGroup stepKey="deleteProduct2" ref="deleteProductBySku">
+            <argument name="sku" value="{{ApiSimpleTwo.sku}}"/>
+        </actionGroup>
+
+        <!-- Check to make sure that the configurable product shows up as out of stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad3"/>
+        <see stepKey="checkForOutOfStock3" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
+    </test>
+
+    <test name="AdminConfigurableProductOutOfStockAndDeleteCombinationTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Product visibility when in stock/out of stock"/>
+            <title value="Configurable Product goes 'Out of Stock' if all associated Simple Products are a combination of 'Out of Stock' and deleted"/>
+            <description value="Configurable Product goes 'Out of Stock' if all associated Simple Products are a combination of 'Out of Stock' and deleted"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3046"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category to put the product in -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- log in -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
+        <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK" />
+
+        <!-- Delete the first simple product -->
+        <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+            <argument name="sku" value="{{ApiSimpleOne.sku}}"/>
+        </actionGroup>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad2"/>
+        <see stepKey="checkForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
+
+        <!-- Find the second simple product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct2">
+            <argument name="product" value="ApiSimpleTwo"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied2"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+
+        <!-- Edit the quantity of the second simple product as 0 -->
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
+
+        <!-- Check to make sure that the configurable product shows up as out of stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad3"/>
+        <see stepKey="checkForOutOfStock3" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
new file mode 100644
index 0000000000000..059a18200e90c
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductSearchTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Search"/>
+            <title value="admin should be able to search for a configurable product"/>
+            <description value="admin should be able to search for a configurable product"/>
+            <testCaseId value="MC-100"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="wait2"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneResult"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInGrid"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInActiveFilters"/>
+    </test>
+
+    <test name="AdminConfigurableProductFilterByTypeTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Search"/>
+            <title value="admin should be able to filter by type configurable product"/>
+            <description value="admin should be able to filter by type configurable product"/>
+            <testCaseId value="MC-66"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickShowFilters"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{ApiConfigurableProduct.type_id}}" stepKey="selectConfigurableType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Type: Configurable Product" stepKey="seeFilter"/>
+        <see selector="{{AdminProductGridSection.table}}" userInput="$$createConfigProduct.name$$" stepKey="seeProduct"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSetEditContentTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..42e12852f563f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSetEditContentTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create/edit configurable product"/>
+            <title value="Admin should be able to set/edit product Content when editing a configurable product"/>
+            <description value="Admin should be able to set/edit product Content when editing a configurable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3424"/>
+            <group value="ConfigurableProduct"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Checking content storefront-->
+        <amOnPage url="{{BaseConfigurableProduct.name}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
new file mode 100644
index 0000000000000..001d4d17ec213
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductUpdateAttributeTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Edit a configurable product in admin"/>
+            <title value="Admin should be able to update existing attributes of a configurable product"/>
+            <description value="Admin should be able to update existing attributes of a configurable product"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-179"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- Create the attribute we will be modifying -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createModifiableProductAttribute"/>
+
+            <!-- Create the two attributes the product will have -->
+            <createData entity="productAttributeOption1" stepKey="createModifiableProductAttributeOption1">
+                <requiredEntity createDataKey="createModifiableProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createModifiableProductAttributeOption2">
+                <requiredEntity createDataKey="createModifiableProductAttribute"/>
+            </createData>
+
+            <!-- Add the product to the default set -->
+            <createData entity="AddToDefaultSet" stepKey="createModifiableAddToAttributeSet">
+                <requiredEntity createDataKey="createModifiableProductAttribute"/>
+            </createData>
+
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category the product will be a part of -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+
+            <!-- Create the two attributes the product will have -->
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the product to the default set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the two attributes -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the two children product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Create the two configurable product with both children -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- login -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+
+            <!-- Delete everything that was created in the before block -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCatagory" />
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createModifiableProductAttribute" stepKey="deleteModifiableProductAttribute"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Get the current option of the attribute before it was changed -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+
+        <grabTextFrom stepKey="getBeforeOption" selector="{{StorefrontProductInfoMainSection.nthAttributeOnPage('1')}}"/>
+
+        <!-- Find the product that we just created using the product grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductFilterLoad"/>
+
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- change the option on the first attribute -->
+        <selectOption stepKey="clickFirstAttribute" selector="{{ModifyAttributes.nthExistingAttribute($$createModifiableProductAttribute.default_frontend_label$$)}}" userInput="option1"/>
+
+        <!-- Save the product -->
+        <click stepKey="saveProductAttribute" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
+
+        <!-- Go back to the configurable product page and check to see if it has changed -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad2"/>
+        <grabTextFrom stepKey="getCurrentOption" selector="{{StorefrontProductInfoMainSection.nthAttributeOnPage('1')}}"/>
+        <assertNotEquals expected="{$getBeforeOption}" expectedType="string" actual="{$getCurrentOption}" actualType="string"  stepKey="assertNotEquals"/>
+
+    </test>
+
+    <test name="AdminConfigurableProductUpdateChildAttributeTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Edit a configurable product in admin"/>
+            <title value="Admin should be able to update existing attributes of child products of a configurable product"/>
+            <description value="Admin should be able to update existing attributes of child products of a configurable product"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-288"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category the product will be a part of -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+
+            <!-- Create the two attributes the product will have -->
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the product to the default set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the two attributes -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the two children product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Create the two configurable product with both children -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- login -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+
+            <!-- Delete everything that was created in the before block -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCatagory" />
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Find the product that we just created using the product grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductFilterLoad"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openProduct">
+            <argument name="product" value="$$createConfigProduct$$" />
+        </actionGroup>
+
+        <!-- Open the wizard for editing configurations and fill out a new attribute -->
+        <click stepKey="clickEditConfig" selector="{{AdminProductFormConfigurationsSection.createConfigurations}}"/>
+        <waitForPageLoad stepKey="waitForEditConfig"/>
+        <click stepKey="clickNextWizard" selector="{{AdminCreateProductConfigurationsPanel.next}}"/>
+        <click stepKey="createNewValue" selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}"/>
+        <fillField stepKey="fillNewAttribute" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" userInput="simple"/>
+        <click stepKey="confirmNewAttribute" selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}"/>
+        <click stepKey="clickNextWizard2" selector="{{AdminCreateProductConfigurationsPanel.next}}"/>
+
+        <!-- Give the product a price and quantity -->
+        <click stepKey="click" selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}"/>
+        <fillField stepKey="fillProductQuantity" selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="{{_defaultProduct.quantity}}"/>
+        <click stepKey="clickNextWizard3" selector="{{AdminCreateProductConfigurationsPanel.next}}"/>
+        <click stepKey="clickGenerateProducts" selector="{{AdminCreateProductConfigurationsPanel.next}}"/>
+
+        <!-- Save the product -->
+        <waitForPageLoad stepKey="waitForGeneration"/>
+        <click stepKey="saveProductAttribute" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
+
+        <!-- Check to make sure the created product has appeared on the configurable product storefront -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <selectOption stepKey="clickFirstAttribute" selector="{{ModifyAttributes.nthExistingAttribute($$createConfigProductAttribute.default_frontend_label$$)}}" userInput="simple"/>
+        <waitForPageLoad stepKey="waitForPageExecution"/>
+        <see stepKey="checkPrice" selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="0.00"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+
+        <!-- Find the simple product that we just created using the product grid and delete it -->
+        <actionGroup ref="deleteProductBySku" stepKey="findCreatedProduct2">
+            <argument name="sku" value="{{ApiConfigurableProduct.sku}}2-simple"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
new file mode 100644
index 0000000000000..af12f49bf86ea
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductBulkUpdateTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to bulk update attributes of configurable products"/>
+            <description value="admin should be able to bulk update attributes of configurable products"/>
+            <testCaseId value="MC-88"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct3">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search for prefix of the 3 products we created via api -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+
+        <!-- Select all, then start the bulk update attributes flow -->
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickBulkUpdate"/>
+        <waitForPageLoad stepKey="wait2"/>
+
+        <!-- Update the description -->
+        <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToggleDescription"/>
+        <fillField selector="{{AdminUpdateAttributesSection.description}}" userInput="MFTF automation!" stepKey="fillDescription"/>
+        <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 3 record(s) were updated." stepKey="seeSaveSuccess"/>
+
+        <!-- Check storefront for description -->
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoProduct1"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeDescription1"/>
+        <amOnPage url="$$createProduct2.sku$$.html" stepKey="gotoProduct2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeDescription2"/>
+        <amOnPage url="$$createProduct3.sku$$.html" stepKey="gotoProduct3"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeDescription3"/>
+    </test>
+
+    <test name="AdminConfigurableProductRemoveAnOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="Admin should be able to remove a product configuration"/>
+            <description value="Admin should be able to remove a product configuration"/>
+            <testCaseId value="MC-63"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- This was copied and modified from the EndToEndB2CGuestUserTest -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!--check storefront for both options-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="seeOption1Storefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Storefront"/>
+
+        <!--check admin for both options-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct1.name$$" stepKey="seeOption1Admin"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct2.name$$" stepKey="seeOption2Admin"/>
+
+        <!--remove an option-->
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActions"/>
+        <click selector="{{AdminProductFormConfigurationsSection.removeProductBtn}}" stepKey="clickRemove"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="wait3"/>
+
+        <!--check admin for one option-->
+        <dontSee selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct1.name$$" stepKey="dontSeeOption1Admin"/>
+
+        <!--check storefront for one option-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="dontSeeOption1InStorefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Again"/>
+    </test>
+
+    <test name="AdminConfigurableProductDisableAnOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="Admin should be able to disable a product configuration"/>
+            <description value="Admin should be able to disable a product configuration"/>
+            <testCaseId value="MC-119"/>
+            <group value="ConfigurableProduct"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+
+        <before>
+            <!-- This was copied and modified from the EndToEndB2CGuestUserTest -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!--check storefront for both options-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="seeOption1Storefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Storefront"/>
+
+        <!--go to admin and disable an option-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActions"/>
+        <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisable"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="wait3"/>
+
+        <!--check storefront for one option-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="dontSeeOption1InStorefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Again"/>
+    </test>
+
+    <test name="AdminConfigurableProductRemoveConfigurationTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Edit a configurable product in admin"/>
+            <title value="Admin should be able to remove a configuration from a Configurable Product"/>
+            <description value="Admin should be able to remove a configuration from a Configurable Product"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-86"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+        </after>
+
+        <!-- Create a configurable product via the UI -->
+        <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!--
+            After saving, we are still on the product edit page. There is no need to reload or go to this page
+            again, because a round trip to the server has already happened.
+        -->
+
+        <!-- Remove a configuration option from the configurable product -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickEditConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckboxByIndex('1')}}" stepKey="deselectOption"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+
+        <!-- Verify that the removed option is not present in the storefront -->
+        <amOnPage url="{{StorefrontProductPage.url(_defaultProduct.urlKey)}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPage"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
+    </test>
+
+    <test name="AdminConfigurableProductAddConfigurationTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Edit a configurable product in admin"/>
+            <title value="Admin should be able to edit configuration to add a value to an existing attribute"/>
+            <description value="Admin should be able to edit configuration to add a value to an existing attribute"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-95"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+        </after>
+
+        <!-- Create a configurable product via the UI -->
+        <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!--
+            After saving, we are still on the product edit page. There is no need to reload or go to this page
+            again, because a round trip to the server has already happened.
+        -->
+
+        <!-- Add a configuration option to the configurable product -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickEditConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
+        <fillField userInput="{{colorProductAttribute4.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="42" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+
+        <!-- Verify that the added option is present in the storefront -->
+        <amOnPage url="{{StorefrontProductPage.url(_defaultProduct.urlKey)}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute4.name}}" stepKey="seeInDropDown4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
new file mode 100644
index 0000000000000..11f1e9bb33c10
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create/Edit configurable product"/>
+            <title value="Admin should be able to set/edit Related Products information when editing a configurable product"/>
+            <description value="Admin should be able to set/edit Related Products information when editing a configurable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3414"/>
+            <group value="ConfigurableProduct"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="_defaultProduct"/>
+            </actionGroup>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Create product -->
+        <remove keyForRemoval="goToCreateProduct"/>
+        <actionGroup ref="createConfigurableProduct" stepKey="fillProductForm">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!--See related product in storefront-->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
new file mode 100644
index 0000000000000..aa34693ed82f0
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRelatedProductsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Promote Products as Related"/>
+            <title value="Admin should be able to promote products as related"/>
+            <description value="Admin should be able to promote products as related"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-116"/>
+            <group value="configurable"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="BaseConfigurableProduct" stepKey="baseConfigProductHandle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChild2"/>
+            <deleteData createDataKey="baseConfigProductHandle" stepKey="deleteConfig"/>
+            <deleteData createDataKey="categoryHandle" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
+        </after>
+
+        <comment userInput="Filter and edit simple product 1" stepKey="filterAndEditComment1"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple">
+            <argument name="product" value="$$simple1Handle$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+        <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
+
+        <!-- TODO: move adding related product to a action group when nested action group is allowed (ref#: MQE-539)-->
+        <comment userInput="Add related simple product to simple product" stepKey="addSimpleToSimpleComment"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple1">
+            <argument name="product" value="$$simple2Handle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectSimpleTwo"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll1"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected1"/>
+
+        <comment userInput="Add related config product to simple product" stepKey="addConfigToSimpleComment"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimpleForRelatedConfig1">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectConfigProduct"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll2"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected2"/>
+
+        <comment userInput="Save simple product" stepKey="saveSimpleProductComment"/>
+        <actionGroup ref="saveProductForm" stepKey="saveRelatedProduct1"/>
+
+        <comment userInput="Assert related simple products for simple product in Admin Product Form" stepKey="assertRelated1Comment"/>
+        <actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated1">
+            <argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText" value="$$simple2Handle.name$$"/>
+        </actionGroup>
+
+        <comment userInput="Assert related config products for simple product in Admin Product Form" stepKey="assertRelated2Comment"/>
+        <actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated2">
+            <argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText" value="$$baseConfigProductHandle.name$$"/>
+        </actionGroup>
+
+        <comment userInput="Filter and edit config product" stepKey="filterAndEditComment2"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridConfig">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid2"/>
+        <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
+
+        <comment userInput="Add related simple product to config product" stepKey="addSimpleToConfigComment"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton3"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridForConfig3">
+            <argument name="product" value="$$simple2Handle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectSimpleTwo2"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll3"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected3"/>
+
+        <comment userInput="Save config product" stepKey="saveConfigProductComment"/>
+        <actionGroup ref="saveProductForm" stepKey="saveRelatedProduct2"/>
+
+        <comment userInput="Assert related simple product for config product in Admin Product Form" stepKey="assertRelated3Comment"/>
+        <actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated3">
+            <argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText" value="$$simple2Handle.name$$"/>
+        </actionGroup>
+
+        <comment userInput="Check storefront related products on simple product page" stepKey="navigateToSimpleProduct1PageComment"/>
+        <amOnPage url="$$simple1Handle.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProduct1Page"/>
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsActionsHeaderText}}" userInput="Check items to add to the cart" stepKey="assertRelatedProductHeaderInStorefront1"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsActionsHeaderText}}" userInput="select all" stepKey="assertRelatedProductHeaderInStorefront2"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$simple2Handle.name$$" stepKey="assertRelatedSimpleProductNameInStorefront"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$baseConfigProductHandle.name$$" stepKey="assertRelatedConfigProductNameInStorefront"/>
+
+        <comment userInput="Navigate to product page from related product link" stepKey="navigateToConfigProductFromRelatedSectionComment"/>
+        <click selector="{{StorefrontProductRelatedProductsSection.relatedProductName('$$baseConfigProductHandle.custom_attributes[url_key]$$')}}" stepKey="clickRelatedProductByName"/>
+        <waitForPageLoad stepKey="waitForPageLoad11"/>
+        <seeInCurrentUrl url="$$baseConfigProductHandle.custom_attributes[url_key]$$" stepKey="seeInCurrentUrl"/>
+
+        <comment userInput="Select option for configurable product" stepKey="selectOptionConfigProduct"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$productAttributeOption1Handle.option[store_labels][0][label]$$" stepKey="configSelectOption"/>
+
+        <comment userInput="Check storefront related products on config product page" stepKey="navigateToConfigProductPageComment"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$simple2Handle.name$$" stepKey="assertRelatedSimpleProductNameInStorefront2"/>
+
+        <comment userInput="Check related product in product page" stepKey="checkRelatedProductInProductPageComment"/>
+        <click selector="{{StorefrontProductRelatedProductsSection.relatedProductCheckBoxButton('$$simple2Handle.name$$')}}" stepKey="checkRelatedProcut"/>
+
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$baseConfigProductHandle.name$$"/>
+        </actionGroup>
+
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="2" stepKey="seeItemCounterInMiniCart"/>
+
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertOneProductNameInMiniCart">
+            <argument name="productName" value="$$baseConfigProductHandle.name$$"/>
+        </actionGroup>
+
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertOneProductNameInMiniCart2">
+            <argument name="productName" value="$$simple2Handle.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
new file mode 100644
index 0000000000000..e7492f4eeaecf
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultImageConfigurableTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default images from a Configurable Product"/>
+            <description value="Admin should be able to remove default images from a Configurable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-196"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="BaseConfigurableProduct" stepKey="baseConfigProductHandle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChild2"/>
+            <deleteData createDataKey="baseConfigProductHandle" stepKey="deleteConfig"/>
+            <deleteData createDataKey="categoryHandle" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGrid">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid1"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Remove image from product -->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage2" stepKey="assertProductImageNotInStorefrontProductPage2">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
new file mode 100644
index 0000000000000..454f9f5f29a7a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
@@ -0,0 +1,307 @@
+<?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="AdvanceCatalogSearchConfigurableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search configurable product with product name"/>
+            <description value="Guest customer should be able to advance search configurable product with product name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-138"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
+
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchConfigurableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search configurable product with product sku"/>
+            <description value="Guest customer should be able to advance search configurable product with product sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-144"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
+
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchConfigurableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search configurable product with product description"/>
+            <description value="Guest customer should be able to advance search configurable product with product description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-237"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
+
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchConfigurableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search configurable product with product short description"/>
+            <description value="Guest customer should be able to advance search configurable product with product short description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-240"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle" before="product">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
+
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml
new file mode 100644
index 0000000000000..7fbff5eac2583
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductAttributeNameDesignTest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ConfigurableProductAttributeNameDesignTest">
+        <annotations>
+            <title value="Generation of configurable products with an attribute named 'design'"/>
+            <description value="Generation of configurable products with an attribute named 'design'"/>
+            <features value="Product Customizable Option"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-93307"/>
+            <stories value="MAGETWO-91524 : 'element.disabled is not a function' error is thrown when configurable products are generated with an attribute named 'design'"/>
+            <group value="product"/>
+        </annotations>
+
+        <before>
+            <!-- Log in to Dashboard page -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+
+
+        <!-- Navigate to Catalog-> Products -->
+        <actionGroup ref="GotoCatalogProductsPage" stepKey="goToCatalogProductsPage"/>
+        <!-- Fill the fields on Configurable Product-->
+        <actionGroup ref="GotoConfigurableProductPage" stepKey="goToConfigurableProductPage"/>
+        <actionGroup ref="FillAllRequiredFields" stepKey="fillInAllRequiredFields"/>
+        <!-- Create New Attribute (Default Label= design) -->
+        <actionGroup ref="CreateNewAttribute" stepKey="createNewAttribute"/>
+
+        <after>
+            <!-- Delete Created Attribute -->
+            <actionGroup ref="DeleteCreatedAttribute" stepKey="deleteCreatedAttribute"/>
+        </after>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
new file mode 100644
index 0000000000000..232dfe8391468
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ConfigurableProductPriceAdditionalStoreViewTest">
+        <annotations>
+            <features value="ConfigurableProductPriceStoreFront"/>
+            <stories value="View products"/>
+            <title value="Configurable product prices should not disappear on storefront for additional store"/>
+            <description value="Configurable product price should not disappear for additional stores on frontEnd if disabled for default store"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-92247"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addNewWebsite">
+            <argument name="newWebsiteName" value="Second Website"/>
+            <argument name="websiteCode" value="second_website"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup">
+            <argument name="website" value="Second Website"/>
+            <argument name="storeGroupName" value="Second Store"/>
+            <argument name="storeGroupCode" value="second_store"/>
+        </actionGroup>
+
+        <!--Create Store view -->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+        <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+        <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+        <selectOption userInput="1" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="enableStoreViewStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
+        <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
+        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
+        <see userInput="You saved the store view." stepKey="seeSaveMessage" />
+
+        <!--go to admin and open product edit page to disable product all store view -->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToProductEditPage"/>
+        <waitForPageLoad stepKey="waitEditPage"/>
+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProductForAllStoreView"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave1" />
+        <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/>
+
+        <!-- Disable each of the child products for All Store views -->
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActionsForFirstVariation1"/>
+        <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisableChildProduct1"/>
+
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('2')}}" stepKey="clickToExpandActionsForSecondVariation1"/>
+        <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisableChildProduct2"/>
+
+        <!-- Add product to second website -->
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
+        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+
+        <!-- switch to the second store view -->
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
+        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
+
+        <!-- enable the config product for the second store -->
+       <waitForElementVisible selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="waitForDefaultValueCheckBox"/>
+        <click selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="unCheckUseDefaultValueCheckBox"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSlider"/>
+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreView"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProductIsEnabled"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="enabledConfigProductSecondStore"/>
+
+        <!--go to admin and open product edit page to enable child product for second store view -->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToProductEditPage2"/>
+        <waitForPageLoad stepKey="waitEditPage2"/>
+       <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher1"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView1"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
+        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName1"/>
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActionsForFirstVariation2"/>
+        <click selector="{{AdminProductFormConfigurationsSection.enableProductBtn}}" stepKey="clickEnableChildProduct1"/>
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('2')}}" stepKey="clickToExpandActionsForSecondVariation2"/>
+        <click selector="{{AdminProductFormConfigurationsSection.enableProductBtn}}" stepKey="clickEnableChildProduct2"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveAll"/>
+
+        <!-- assert second store view storefront category list page -->
+        <amOnPage url="/second_store_view/" stepKey="amOnsecondStoreFront1"/>
+        <waitForPageLoad stepKey="waitForPageLoad31"/>
+        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName1"/>
+        <waitForPageLoad stepKey="waitForPageLoad41"/>
+        <see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent1"/>
+
+        <!--go to admin and open child product1 and assign it to the second website -->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToProduct1EditPage1"/>
+        <waitForPageLoad stepKey="waitChild1EditPageToLoad"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProduct1InWebsitesSection"/>
+        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite1"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveUpdatedChild1Again"/>
+
+        <!--go to admin again and open child product1 and enable for second store view-->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToProduct1EditPage"/>
+        <waitForPageLoad stepKey="waitChild1EditPageToLoad1"/>
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcherP1"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView2P1"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessageP1"/>
+        <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP1"/>
+        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP1"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP1"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProduct1IsEnabled"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="save2UpdatedChild1"/>
+
+        <!--go to admin and open child product2 edit page  and assign it to the second website -->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToProduct2EditPage"/>
+        <waitForPageLoad stepKey="waitChild2EditPageToLoad"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProduct2InWebsitesSection"/>
+        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite2"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveUpdatedChild2"/>
+
+        <!--go to admin again and open child product2 and enable for second store view-->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToProduct2EditPage2"/>
+        <waitForPageLoad stepKey="waitChild2EditPageToLoad1"/>
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcherP2"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView2P2"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessageP2"/>
+        <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP2"/>
+        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP2"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP2"/>
+        <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProduct2IsEnabled"/>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="save2UpdatedChild2"/>
+
+        <!-- assert storefront category list page -->
+        <amOnPage url="/second_store_view/" stepKey="amOnsecondStoreFront"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent"/>
+        <See userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..6bbb97c66cdd8
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CAdminTest">
+        <!--Create configurable product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageConfigurable" after="seeSimpleProductInGrid"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadConfigurable" after="visitAdminProductPageConfigurable"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct" after="waitForProductPageLoadConfigurable">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="checkRequiredFieldsInProductForm" stepKey="checkRequiredFieldsProductConfigurable" after="goToCreateConfigurableProduct"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductMain" after="checkRequiredFieldsProductConfigurable">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <!--Create product configurations-->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductMain"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+        <!--Create new attribute-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute" after="waitForConfigurationModalOpen"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="enterAttributePanelIFrame" after="clickCreateNewAttribute"/>
+        <wait time="2" stepKey="waitForModalIframeReady" after="enterAttributePanelIFrame"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" time="30" stepKey="waitForIframeLoad" after="waitForModalIframeReady"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel" after="waitForIframeLoad"/>
+        <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="{{colorProductAttribute.input_type}}" stepKey="selectAttributeInputType" after="fillDefaultLabel"/>
+        <!--Add option 1 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1" after="selectAttributeInputType"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillDefaultLabel1" after="fillAdminLabel1"/>
+        <!--Add option 2 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption2" after="fillDefaultLabel1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('2')}}" time="30" stepKey="waitForOptionRow2" after="clickAddOption2"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('1')}}" userInput="{{colorProductAttribute2.name}}" stepKey="fillAdminLabel2" after="waitForOptionRow2"/>
+        <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('1')}}" userInput="{{colorProductAttribute2.name}}" stepKey="fillDefaultLabel2" after="fillAdminLabel2"/>
+        <!--Save new attribute-->
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickSaveAttribute" after="fillDefaultLabel2"/>
+        <switchToIFrame stepKey="switchToParentPage" after="clickSaveAttribute"/>
+        <waitForElementNotVisible selector="{{AdminNewAttributePanel.container}}" time="30" stepKey="waitForNewAttributePanelClose" after="switchToParentPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSaveAttributeLoadingMask" after="waitForNewAttributePanelClose"/>
+        <!--Find new attribute in grid and select-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="openFilterPanel" after="waitForSaveAttributeLoadingMask"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillAttributeCodeFilter" after="openFilterPanel"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersAttribute" after="fillAttributeCodeFilter"/>
+        <checkOption selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="checkAttributeInGrid" after="clickApplyFiltersAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNext1" after="checkAttributeInGrid"/>
+        <!--Select all options for attribute-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="selectAllAttributeOptions" after="clickNext1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNext2" after="selectAllAttributeOptions"/>
+        <!--Images, price and quantity configuration-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="selectApplySingleQty" after="clickNext2"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="{{BaseConfigurableProduct.quantity}}" stepKey="fillConfigurableQuantity" after="selectApplySingleQty"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNext3" after="fillConfigurableQuantity"/>
+        <!--Generate products-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickGenerateProducts" after="clickNext3"/>
+        <!--Save configurable product-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveConfigurableProduct" after="clickGenerateProducts"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" time="30" stepKey="waitForAttributeSetConfirmation" after="clickSaveConfigurableProduct"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickConfirmAttributeSet" after="waitForAttributeSetConfirmation"/>
+        <see selector="You saved the product" stepKey="seeConfigurableSaveConfirmation" after="clickConfirmAttributeSet"/>
+        <actionGroup ref="viewConfigurableProductInAdminGrid" stepKey="viewConfigurableProductInGrid" after="seeConfigurableSaveConfirmation">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <comment userInput="Clean up configurable product" stepKey="cleanUpConfigurableProduct" after="deleteSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct" after="cleanUpConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..47ee09e4b2086
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <before>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildProduct1Image">
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigChildProduct2Image">
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateConfigProduct" createDataKey="createConfigProduct"/>
+        </before>
+        <after>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct1Image" stepKey="deleteConfigChildProduct1Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct2Image" stepKey="deleteConfigChildProduct2Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigProductImage" stepKey="deleteConfigProductImage"/>-->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Verify Configurable Product in checkout cart items -->
+        <comment userInput="Verify Configurable Product in checkout cart items" stepKey="commentVerifyConfigurableProductInCheckoutCartItems" after="guestCheckoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckConfigurableProductInCheckoutCartItemsActionGroup" stepKey="guestCheckoutCheckConfigurableProductInCartItems" after="commentVerifyConfigurableProductInCheckoutCartItems">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionLabel" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$" />
+            <argument name="optionValue" value="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" />
+        </actionGroup>
+
+        <!-- Check configurable product in category -->
+        <comment userInput="Verify Configurable Product in category" stepKey="commentVerifyConfigurableProductInCategory" after="browseAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="browseAssertCategoryConfigProduct" after="commentVerifyConfigurableProductInCategory">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="browseGrabConfigProductImageSrc" after="browseAssertCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabConfigProductImageSrc" stepKey="browseAssertConfigProductImageNotDefault" after="browseGrabConfigProductImageSrc"/>
+
+        <!-- View Configurable Product -->
+        <comment userInput="View Configurable Product" stepKey="commentViewConfigurableProduct" after="browseAssertSimpleProduct2PageImageNotDefault" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory2" after="commentViewConfigurableProduct"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="browseClickCategoryConfigProductView" after="clickCategory2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductViewloaded" after="browseClickCategoryConfigProductView"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="browseAssertConfigProductPage" after="waitForConfigurableProductViewloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabConfigProductPageImageSrc" after="browseAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabConfigProductPageImageSrc" stepKey="browseAssertConfigProductPageImageNotDefault" after="browseGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to cart -->
+        <comment userInput="Add Configurable Product to cart" stepKey="commentAddConfigurableProductToCart" after="cartAddProduct2ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory2" after="commentAddConfigurableProductToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory2loaded" after="cartClickCategory2"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForConfigurableProduct" after="waitForCartCategory2loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartGrabConfigProductImageSrc" after="cartAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabConfigProductImageSrc" stepKey="cartAssertConfigProductImageNotDefault" after="cartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName($$createConfigProduct.name$$)}}" stepKey="cartClickCategoryConfigProductAddToCart" after="cartAssertConfigProductImageNotDefault"/>
+        <waitForElement selector="{{StorefrontMessagesSection.message('You need to choose options for your item.')}}" time="30" stepKey="cartWaitForConfigProductPageLoad" after="cartClickCategoryConfigProductAddToCart"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductPage" after="cartWaitForConfigProductPageLoad">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc1" after="cartAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc1" stepKey="cartAssertConfigProductPageImageNotDefault1" after="cartGrabConfigProductPageImageSrc1"/>
+        <selectOption userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="cartConfigProductFillOption" after="cartAssertConfigProductPageImageNotDefault1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductOptionloaded" after="cartConfigProductFillOption"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductWithOptionPage" after="waitForConfigurableProductOptionloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc2" after="cartAssertConfigProductWithOptionPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc2" stepKey="cartAssertConfigProductPageImageNotDefault2" after="cartGrabConfigProductPageImageSrc2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigProductToCart" after="cartAssertConfigProductPageImageNotDefault2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+
+        <!-- Check configurable product in minicart -->
+        <comment userInput="Check configurable product in minicart" stepKey="commentCheckConfigurableProductInMinicart" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup" stepKey="cartOpenMinicartAndCheckConfigProduct" after="commentCheckConfigurableProductInMinicart">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartMinicartGrabConfigProductImageSrc" after="cartOpenMinicartAndCheckConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabConfigProductImageSrc" stepKey="cartMinicartAssertConfigProductImageNotDefault" after="cartMinicartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productOptionsDetailsByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProductDetails" after="cartMinicartAssertConfigProductImageNotDefault"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontMinicartSection.productOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartMinicartCheckConfigProductOption" after="cartMinicartClickConfigProductDetails"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProduct" after="cartMinicartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartConfigProductloaded" after="cartMinicartClickConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertMinicartConfigProductPage" after="waitForMinicartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabConfigProductPageImageSrc" after="cartAssertMinicartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabConfigProductPageImageSrc" stepKey="cartMinicartAssertConfigProductPageImageNotDefault" after="cartMinicartGrabConfigProductPageImageSrc"/>
+
+        <!-- Check configurable product in cart -->
+        <comment userInput="Check configurable product in cart" stepKey="commentCheckConfigurableProductInCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart2" after="commentCheckConfigurableProductInCart"/>
+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="cartAssertCartConfigProduct" after="cartOpenCart2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartCartGrabConfigProduct2ImageSrc" after="cartAssertCartConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabConfigProduct2ImageSrc" stepKey="cartCartAssertConfigProduct2ImageNotDefault" after="cartCartGrabConfigProduct2ImageSrc"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartCheckConfigProductOption" after="cartCartAssertConfigProduct2ImageNotDefault"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createConfigProduct.name$$)}}" stepKey="cartClickCartConfigProduct" after="cartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartConfigProductloaded" after="cartClickCartConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertCartConfigProductPage" after="waitForCartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabConfigProductPageImageSrc" after="cartAssertCartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabConfigProductPageImageSrc" stepKey="cartCartAssertConfigProductPageImageNotDefault" after="cartCartGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to comparison -->
+        <comment userInput="Add Configurable Product to comparison" stepKey="commentAddConfigurableProductToComparison" after="compareAddSimpleProduct2ToCompare" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="compareAssertConfigProduct" after="commentAddConfigurableProductToComparison">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrc" after="compareAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrc" stepKey="compareAssertConfigProductImageNotDefault" after="compareGrabConfigProductImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddConfigProductToCompare" after="compareAssertConfigProductImageNotDefault">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product in comparison sidebar -->
+        <comment userInput="Add Configurable Product in comparison sidebar" stepKey="commentAddConfigurableProductInComparisonSidebar" after="compareSimpleProduct2InSidebar" />
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareConfigProductInSidebar" after="commentAddConfigurableProductInComparisonSidebar">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product on comparison page -->
+        <comment userInput="Add Configurable Product on comparison page" stepKey="commentAddConfigurableProductOnComparisonPage" after="compareAssertSimpleProduct2ImageNotDefaultInComparison" />
+        <actionGroup ref="StorefrontCheckCompareConfigurableProductActionGroup" stepKey="compareAssertConfigProductInComparison" after="commentAddConfigurableProductOnComparisonPage">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrcInComparison" after="compareAssertConfigProductInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrcInComparison" stepKey="compareAssertConfigProductImageNotDefaultInComparison" after="compareGrabConfigProductImageSrcInComparison"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..6f9ad93a56dc5
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <before>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildProduct1Image">
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigChildProduct2Image">
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateConfigProduct" createDataKey="createConfigProduct"/>
+        </before>
+        <after>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct1Image" stepKey="deleteConfigChildProduct1Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct2Image" stepKey="deleteConfigChildProduct2Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigProductImage" stepKey="deleteConfigProductImage"/>-->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Verify Configurable Product in checkout cart items -->
+        <comment userInput="Verify Configurable Product in checkout cart items" stepKey="commentVerifyConfigurableProductInCheckoutCartItems" after="checkoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckConfigurableProductInCheckoutCartItemsActionGroup" stepKey="checkoutCheckConfigurableProductInCartItems" after="commentVerifyConfigurableProductInCheckoutCartItems">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionLabel" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$" />
+            <argument name="optionValue" value="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" />
+        </actionGroup>
+
+        <!-- Check configurable product in category -->
+        <comment userInput="Verify Configurable Product in category" stepKey="commentVerifyConfigurableProductInCategory" after="browseAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="browseAssertCategoryConfigProduct" after="commentVerifyConfigurableProductInCategory">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="browseGrabConfigProductImageSrc" after="browseAssertCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabConfigProductImageSrc" stepKey="browseAssertConfigProductImageNotDefault" after="browseGrabConfigProductImageSrc"/>
+
+        <!-- View Configurable Product -->
+        <comment userInput="View Configurable Product" stepKey="commentViewConfigurableProduct" after="browseAssertSimpleProduct2PageImageNotDefault" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory2" after="commentViewConfigurableProduct"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="browseClickCategoryConfigProductView" after="clickCategory2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductViewloaded" after="browseClickCategoryConfigProductView"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="browseAssertConfigProductPage" after="waitForConfigurableProductViewloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabConfigProductPageImageSrc" after="browseAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabConfigProductPageImageSrc" stepKey="browseAssertConfigProductPageImageNotDefault" after="browseGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to cart -->
+        <comment userInput="Add Configurable Product to cart" stepKey="commentAddConfigurableProductToCart" after="cartAddProduct2ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory2" after="commentAddConfigurableProductToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory2loaded" after="cartClickCategory2"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForConfigurableProduct" after="waitForCartCategory2loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartGrabConfigProductImageSrc" after="cartAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabConfigProductImageSrc" stepKey="cartAssertConfigProductImageNotDefault" after="cartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName($$createConfigProduct.name$$)}}" stepKey="cartClickCategoryConfigProductAddToCart" after="cartAssertConfigProductImageNotDefault"/>
+        <waitForElement selector="{{StorefrontMessagesSection.message('You need to choose options for your item.')}}" time="30" stepKey="cartWaitForConfigProductPageLoad" after="cartClickCategoryConfigProductAddToCart"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductPage" after="cartWaitForConfigProductPageLoad">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc1" after="cartAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc1" stepKey="cartAssertConfigProductPageImageNotDefault1" after="cartGrabConfigProductPageImageSrc1"/>
+        <selectOption userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="cartConfigProductFillOption" after="cartAssertConfigProductPageImageNotDefault1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductOptionloaded" after="cartConfigProductFillOption"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductWithOptionPage" after="waitForConfigurableProductOptionloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc2" after="cartAssertConfigProductWithOptionPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc2" stepKey="cartAssertConfigProductPageImageNotDefault2" after="cartGrabConfigProductPageImageSrc2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigProductToCart" after="cartAssertConfigProductPageImageNotDefault2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+
+        <!-- Check configurable product in minicart -->
+        <comment userInput="Check configurable product in minicart" stepKey="commentCheckConfigurableProductInMinicart" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup" stepKey="cartOpenMinicartAndCheckConfigProduct" after="commentCheckConfigurableProductInMinicart">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartMinicartGrabConfigProductImageSrc" after="cartOpenMinicartAndCheckConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabConfigProductImageSrc" stepKey="cartMinicartAssertConfigProductImageNotDefault" after="cartMinicartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productOptionsDetailsByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProductDetails" after="cartMinicartAssertConfigProductImageNotDefault"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontMinicartSection.productOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartMinicartCheckConfigProductOption" after="cartMinicartClickConfigProductDetails"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProduct" after="cartMinicartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartConfigProductloaded" after="cartMinicartClickConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertMinicartConfigProductPage" after="waitForMinicartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabConfigProductPageImageSrc" after="cartAssertMinicartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabConfigProductPageImageSrc" stepKey="cartMinicartAssertConfigProductPageImageNotDefault" after="cartMinicartGrabConfigProductPageImageSrc"/>
+
+        <!-- Check configurable product in cart -->
+        <comment userInput="Check configurable product in cart" stepKey="commentCheckConfigurableProductInCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart2" after="commentCheckConfigurableProductInCart"/>
+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="cartAssertCartConfigProduct" after="cartOpenCart2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartCartGrabConfigProduct2ImageSrc" after="cartAssertCartConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabConfigProduct2ImageSrc" stepKey="cartCartAssertConfigProduct2ImageNotDefault" after="cartCartGrabConfigProduct2ImageSrc"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartCheckConfigProductOption" after="cartCartAssertConfigProduct2ImageNotDefault"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createConfigProduct.name$$)}}" stepKey="cartClickCartConfigProduct" after="cartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartConfigProductloaded" after="cartClickCartConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertCartConfigProductPage" after="waitForCartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabConfigProductPageImageSrc" after="cartAssertCartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabConfigProductPageImageSrc" stepKey="cartCartAssertConfigProductPageImageNotDefault" after="cartCartGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to comparison -->
+        <comment userInput="Add Configurable Product to comparison" stepKey="commentAddConfigurableProductToComparison" after="compareAddSimpleProduct2ToCompare" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="compareAssertConfigProduct" after="commentAddConfigurableProductToComparison">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrc" after="compareAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrc" stepKey="compareAssertConfigProductImageNotDefault" after="compareGrabConfigProductImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddConfigProductToCompare" after="compareAssertConfigProductImageNotDefault">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product in comparison sidebar -->
+        <comment userInput="Add Configurable Product in comparison sidebar" stepKey="commentAddConfigurableProductInComparisonSidebar" after="compareSimpleProduct2InSidebar" />
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareConfigProductInSidebar" after="commentAddConfigurableProductInComparisonSidebar">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product on comparison page -->
+        <comment userInput="Add Configurable Product on comparison page" stepKey="commentAddConfigurableProductOnComparisonPage" after="compareAssertSimpleProduct2ImageNotDefaultInComparison" />
+        <actionGroup ref="StorefrontCheckCompareConfigurableProductActionGroup" stepKey="compareAssertConfigProductInComparison" after="commentAddConfigurableProductOnComparisonPage">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrcInComparison" after="compareAssertConfigProductInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrcInComparison" stepKey="compareAssertConfigProductImageNotDefaultInComparison" after="compareGrabConfigProductImageSrcInComparison"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
new file mode 100644
index 0000000000000..eadc7dadaf708
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetConfigurableProductTest" extends="NewProductsListWidgetTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set Configurable Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set Configurable Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-120"/>
+            <group value="ConfigurableProduct"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
+
+        <!-- Modify the Configurable Product that we created in the before block -->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="amOnEditPage"/>
+        <waitForPageLoad stepKey="waitForEditPage"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
+
+        <!-- Check for product on the CMS page with the New Products widget -->
+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPage"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
new file mode 100644
index 0000000000000..1959551f8de2d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductCategoryViewChildOnlyTest.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductCategoryViewChildOnlyTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product child in storefront"/>
+            <title value="It should be possible to only view the child product of a configurable product"/>
+            <description value="Create configurable product, add to category such that only child variation is visible in category"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5832"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- Create the category -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiCategory" stepKey="secondCategory"/>
+
+            <!-- Create an attribute with two options to be used in the first child product -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the attribute we just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the first option of the attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Get the second option of the attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the configurable product and add it to the category -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create a simple product and give it the attribute with the first option -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+
+            <!-- Create a simple product and give it the attribute with the second option -->
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Add the first simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+
+            <!-- Add the second simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
+            <deleteData createDataKey="secondCategory" stepKey="deleteSecondCategory"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+        <!-- Go to the product page for the first product -->
+        <amOnPage stepKey="goToProductGrid" url="{{ProductCatalogPage.url}}"/>
+        <waitForPageLoad stepKey="waitForProductGridLoad"/>
+        <actionGroup stepKey="searchForSimpleProduct" ref="filterProductGridBySku2">
+            <argument name="sku" value="$$createConfigChildProduct1.sku$$"/>
+        </actionGroup>
+        <actionGroup stepKey="openProductEditPage" ref="openProducForEditByClickingRowXColumnYInProductGrid"/>
+        <!-- Edit the visibility the first simple product -->
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="Catalog, Search" stepKey="selectVisibilityCatalogSearch"/>
+        <!--Add to category-->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$secondCategory.name$$]" stepKey="addProductToCategory"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+
+        <!-- Go to storefront to view child product -->
+        <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$secondCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefrontCategory"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigChildProduct1.name$$)}}" stepKey="seeChildProductInCategory"/>
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigChildProduct2.name$$)}}" stepKey="dontSeeOtherChildProduct"/>
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="dontSeeParentProduct"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigChildProduct1.name$$)}}" stepKey="clickProductName"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <seeInCurrentUrl url="$$createConfigChildProduct1.custom_attributes[url_key]$$" stepKey="seeProductPageIsAccessible"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productName($$createConfigChildProduct1.name$$)}}" stepKey="seeProductNameOnProductPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
new file mode 100644
index 0000000000000..1075f79aef187
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductChildSearchTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product details in storefront"/>
+            <title value="Guest customer should be able to search configurable product by attributes of child products"/>
+            <description value="Guest customer should be able to search configurable product by attributes of child products"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-249"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product and add it to the category -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create an attribute with two options to be used in the first child product -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Create an attribute with two options to be used in the second child product -->
+            <createData entity="productAttributeMultiselectTwoOptions" stepKey="createConfigProductAttributeMultiSelect"/>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption1Multiselect">
+                <requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
+            </createData>
+            <createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOption2Multiselect">
+                <requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
+            </createData>
+
+            <!-- Add the attribute we just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the second attribute we just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet2">
+                <requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
+            </createData>
+
+            <!-- Get the first option of the attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Get the first option of the second attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
+            </getData>
+
+            <!-- Create a simple product and give it the attribute with the first option -->
+            <createData entity="ApiSimpleOneHidden" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createConfigChildProduct1"/>
+
+            <!-- Create a simple product and give it the attribute with the second option -->
+            <createData entity="ApiSimpleTwoHidden" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Add the first simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+
+            <!-- Add the second simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- Create an attribute with two options to be used in the first child product (in the UI) -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttributeSelect"/>
+            <createData entity="productAttributeOption5" stepKey="createConfigProductAttributeSelectOption1">
+                <requiredEntity createDataKey="createConfigProductAttributeSelect"/>
+            </createData>
+            <createData entity="productAttributeOption6" stepKey="createConfigProductAttributeSelectOption2">
+                <requiredEntity createDataKey="createConfigProductAttributeSelect"/>
+            </createData>
+
+            <!-- Add the attribute we just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet3">
+                <requiredEntity createDataKey="createConfigProductAttributeSelect"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+            <!-- Go to the product page for the first product -->
+            <amOnPage stepKey="goToProductGrid" url="{{ProductCatalogPage.url}}"/>
+            <waitForPageLoad stepKey="waitForProductGridLoad"/>
+            <actionGroup stepKey="searchForSimpleProduct" ref="filterProductGridBySku2">
+                <argument name="sku" value="$$createConfigChildProduct1.sku$$"/>
+            </actionGroup>
+            <actionGroup stepKey="openProductEditPage" ref="openProducForEditByClickingRowXColumnYInProductGrid"/>
+
+            <!-- Edit the attribute for the first simple product -->
+            <selectOption stepKey="editSelectAttribute" selector="{{ModifyAttributes.nthExistingAttribute($$createConfigProductAttributeSelect.default_frontend_label$$)}}" userInput="$$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$"/>
+            <scrollToTopOfPage stepKey="scrollToTop"/>
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createConfigProductAttributeMultiSelect" stepKey="deleteConfigProductAttributeMultiSelect"/>
+            <deleteData createDataKey="createConfigProductAttributeSelect" stepKey="deleteConfigProductAttributeSelect"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
+        </after>
+
+        <!-- Quick search the storefront for the first attribute option -->
+        <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$]" stepKey="searchStorefront1" />
+        <seeElement stepKey="seeProduct1" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
+
+        <!-- Quick search the storefront for the second attribute option -->
+        <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigProductAttributeOption1Multiselect.option[store_labels][0][label]$$]" stepKey="searchStorefront2" />
+        <seeElement stepKey="seeProduct2" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
+
+        <!-- Quick search the storefront for the first product description -->
+        <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigChildProduct1.custom_attributes[short_description]$$]" stepKey="searchStorefront3" />
+        <seeElement stepKey="seeProduct3" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
new file mode 100644
index 0000000000000..836bc2cdca970
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductBasicInfoTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product details in storefront"/>
+            <title value="Guest customer should see basic Configurable Product details"/>
+            <description value="Guest customer should see basic Configurable Product details"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-77"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify configurable product details in storefront product view -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="seeProductSku"/>
+        <see userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="seeProductPriceLabel"/>
+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="seeProductStockStatus"/>
+        <see userInput="1.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice"/>
+        <see userInput="{{colorProductAttribute.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeProductAttributeTitle"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
+        <see userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeInDropDown1"/>
+        <see userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeInDropDown2"/>
+        <see userInput="{{colorProductAttribute3.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeInDropDown3"/>
+    </test>
+
+    <test name="StorefrontConfigurableProductOptionsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product details in storefront"/>
+            <title value="Guest customer should be able to see product configuration options"/>
+            <description value="Guest customer should be able to see product configuration options"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-92"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify configurable product options in storefront product view -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel1"/>
+        <see userInput="1.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice1"/>
+        <selectOption userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel2"/>
+        <see userInput="2.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice2"/>
+        <selectOption userInput="{{colorProductAttribute3.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption3"/>
+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel3"/>
+        <see userInput="3.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice3"/>
+    </test>
+
+    <test name="StorefrontConfigurableProductCanAddToCartTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product details in storefront"/>
+            <title value="Guest customer should be able to successfully add the product to the cart"/>
+            <description value="Guest customer should be able to successfully add the product to the cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-97"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify adding configurable product to cart after an option is selected in storefront product view -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="waitForAddToCartVisible"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+    </test>
+
+    <test name="StorefrontConfigurableProductCantAddToCartTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product details in storefront"/>
+            <title value="Guest customer should not be able to add the product to the cart if options are not selected"/>
+            <description value="Guest customer should not be able to add the product to the cart if options are not selected"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-81"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify not able to add configurable product to cart when no option is selected in storefront product view -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="waitForAddToCartVisible"/>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
+        <see userInput="This is a required field" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsError}}" stepKey="seeError"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
new file mode 100644
index 0000000000000..cc8291a83eb40
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductGridViewTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product in a category in storefront"/>
+            <title value="customer should see the configurable product in the category grid"/>
+            <description value="customer should see the configurable product in the category grid"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-94"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify the storefront category grid view -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="amOnCategoryPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productImage}}" stepKey="seePhoto"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{_defaultProduct.name}}" stepKey="seeName"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref(_defaultProduct.urlKey)}}" stepKey="seeNameLink"/>
+        <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="{{colorProductAttribute1.price}}" stepKey="seePrice"/>
+    </test>
+
+    <test name="StorefrontConfigurableProductListViewTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product in a category in storefront"/>
+            <title value="customer should see the configurable product in the category list"/>
+            <description value="customer should see the configurable product in the category list"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-61"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify storefront category list view -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="amOnCategoryPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="clickListView"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productImage}}" stepKey="seePhoto"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{_defaultProduct.name}}" stepKey="seeName"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref(_defaultProduct.urlKey)}}" stepKey="seeNameLink"/>
+        <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="{{colorProductAttribute1.price}}" stepKey="seePrice"/>
+    </test>
+
+    <test name="StorefrontConfigurableProductAddToCartTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product in a category in storefront"/>
+            <title value="customer should be taken to the product details page when clicking add to cart"/>
+            <description value="customer should be taken to the product details page when clicking add to cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-89"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Should be taken to product details page when adding to cart because an option needs to be selected -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="amOnCategoryPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="clickListView"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCart"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <grabFromCurrentUrl stepKey="grabUrl"/>
+        <assertContains stepKey="assertUrl">
+            <expectedResult type="string">{{_defaultProduct.urlKey}}</expectedResult>
+            <actualResult type="string">{$grabUrl}</actualResult>
+        </assertContains>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
new file mode 100644
index 0000000000000..d890d59858116
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductWithFileCustomOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Add configurable product to cart"/>
+            <title value="Correct error message and redirect with invalid file option"/>
+            <description value="Configurable product has file custom option. When adding to cart with an invalid filetype, the correct error message is shown, and options remain selected."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-93059"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Create a configurable product via the UI -->
+        <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <!--Add custom option to configurable product-->
+        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        
+        <!--Go to storefront-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
+        <click selector="{{StorefrontNavigationSection.topCategory($$createCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="$$createCategory.name$$" stepKey="seeOnCategoryPage"/>
+        <!--Add configurable product to cart-->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductTitleByName(BaseConfigurableProduct.name)}}" stepKey="hoverProductInGrid"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(BaseConfigurableProduct.name)}}" stepKey="tryAddToCartFromCategoryPage"/>
+        <waitForPageLoad stepKey="waitForRedirectToProductPage"/>
+        <seeInCurrentUrl url="{{StorefrontProductPage.url(BaseConfigurableProduct.urlKey)}}" stepKey="seeOnProductPage"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorProductAttribute2.name}}" stepKey="selectColor"/>
+        <!--Try invalid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="lorem_ipsum.docx" stepKey="attachInvalidFile"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartInvalidFile"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForErrorMessageInvalidFile"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="The file 'lorem_ipsum.docx' for '{{ProductOptionFile.title}}' has an invalid extension." stepKey="seeMessageInvalidFile"/>
+        <!--Option remains selected-->
+        <seeOptionIsSelected selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeOptionRemainSelected"/>
+        <!--Try valid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="attachValidFile"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$11.99" stepKey="seePriceUpdated"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartValidFile"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{BaseConfigurableProduct.name}} to your shopping cart." stepKey="seeSuccessMessage"/>
+
+        <!--Check item in cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName(BaseConfigurableProduct.name)}}" stepKey="seeProductInCart"/>
+        <see selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute(BaseConfigurableProduct.name, colorProductAttribute.default_label)}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeSelectedOption"/>
+        <see selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute(BaseConfigurableProduct.name, ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="seeCorrectOptionFile"/>
+        <!--Delete cart item-->
+        <click selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="deleteCartItem"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
new file mode 100644
index 0000000000000..72fce95ade68d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontSortingByPriceForConfigurableProductWithCatalogRuleAppliedTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View soting by price in storefront"/>
+            <title value="Sorting by price for Configurable with Catalog Rule applied"/>
+            <description value="Sort by price should be correct if the apply Catalog Rule to child product of configurable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-69988"/>
+            <skip>
+                <issueId value="MC-5777"/>
+            </skip>
+            <group value="сonfigurable_product"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">5.00</field>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">10.00</field>
+            </createData>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <field key="price">15.00</field>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <field key="price">20.00</field>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+                <field key="price">25.00</field>
+            </createData>
+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--SKU Product Attribute is enabled for Promo Rule Conditions-->
+            <actionGroup ref="navigateToEditProductAttribute" stepKey="navigateToSkuProductAttribute">
+                <argument name="ProductAttribute" value="sku"/>
+            </actionGroup>
+            <actionGroup ref="changeUseForPromoRuleConditionsProductAttribute" stepKey="changeUseForPromoRuleConditionsProductAttributeToYes">
+                <argument name="option" value="Yes"/>
+            </actionGroup>
+            <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache1"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+
+            <!--SKU Product Attribute is disable for Promo Rule Conditions-->
+            <actionGroup ref="navigateToEditProductAttribute" stepKey="navigateToSkuProductAttribute">
+                <argument name="ProductAttribute" value="sku"/>
+            </actionGroup>
+            <actionGroup ref="changeUseForPromoRuleConditionsProductAttribute" stepKey="changeUseForPromoRuleConditionsProductAttributeToNo">
+                <argument name="option" value="No"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <!--Open category with products and Sort by price desc-->
+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="goToStorefrontCategoryPage">
+            <argument name="category" value="$$createCategory.custom_attributes[url_key]$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="25"/>
+            <argument name="sortBy" value="price"/>
+            <argument name="sort" value="desc"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct"/>
+
+        <!--Create and apply catalog price rule-->
+        <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsSKU" stepKey="createCatalogPriceRule">
+            <argument name="catalogRule" value="CatalogRuleByPercentWith96Amount" />
+            <argument name="productSku" value="$$createConfigChildProduct3.sku$$" />
+        </actionGroup>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
+
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!--Reopen category with products and Sort by price desc-->
+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="goToStorefrontCategoryPage2">
+            <argument name="category" value="$$createCategory.custom_attributes[url_key]$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="9"/>
+            <argument name="sortBy" value="price"/>
+            <argument name="sort" value="desc"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct2"/>
+
+        <!-- Delete the rule -->
+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+            <argument name="name" value="{{CatalogRuleByPercentWith96Amount.name}}"/>
+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
index 8df6df53cc065..2d73b61245a4b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
@@ -38,7 +38,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->productMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['isReadonly', 'isDuplicable'])
+            ->setMethods(['isReadonly', 'isDuplicable', 'isComposite'])
             ->getMockForAbstractClass();
 
         $this->registryMock->expects(static::any())
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php
index 040329dbb3d87..33b87467950fd 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php
@@ -114,6 +114,9 @@ public function testGetAddNewAttributeButton($isAllowed, $result)
         $this->assertEquals($result, $this->selectAttributes->getAddNewAttributeButton());
     }
 
+    /**
+     * @return array
+     */
     public function attributesDataProvider()
     {
         return [
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
index e199841cbcdc4..9a21431ffcfa5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
@@ -11,154 +11,48 @@
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\View\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_configManager;
+    private $configManager;
 
     /** @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_imageHelper;
+    private $imageHelper;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $productConfigMock;
+    private $productConfigMock;
 
     /** @var Renderer */
-    protected $_renderer;
+    private $renderer;
 
     protected function setUp()
     {
         parent::setUp();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
-        $this->_imageHelper = $this->createPartialMock(
+        $this->configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
+        $this->imageHelper = $this->createPartialMock(
             \Magento\Catalog\Helper\Image::class,
             ['init', 'resize', '__toString']
         );
-        $this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->productConfigMock = $this->createMock(\Magento\Catalog\Helper\Product\Configuration::class);
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable::class,
             [
-                'viewConfig' => $this->_configManager,
-                'imageHelper' => $this->_imageHelper,
-                'scopeConfig' => $this->_scopeConfig,
+                'viewConfig' => $this->configManager,
+                'imageHelper' => $this->imageHelper,
+                'scopeConfig' => $this->scopeConfig,
                 'productConfig' => $this->productConfigMock
             ]
         );
     }
 
-    /**
-     * Child thumbnail is available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnail()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['childProduct'],
-            $productForThumbnail,
-            'Child product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is not available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailChildThumbnailNotAvailable()
-    {
-        $childHasThumbnail = false;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is available and config option is set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailConfigUseParent()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = true;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned ' .
-            'if "checkout/cart/configurable_product_image option" is set to "parent" in system config.'
-        );
-    }
-
-    /**
-     * Initialize parent configurable product and child product.
-     *
-     * @param bool $childHasThumbnail
-     * @param bool $useParentThumbnail
-     * @return \Magento\Catalog\Model\Product[]|\PHPUnit_Framework_MockObject_MockObject[]
-     */
-    protected function _initProducts($childHasThumbnail = true, $useParentThumbnail = false)
-    {
-        /** Set option which can force usage of parent product thumbnail when configurable product is displayed */
-        $thumbnailToBeUsed = $useParentThumbnail
-            ? ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            : ThumbnailSource::OPTION_USE_OWN_IMAGE;
-        $this->_scopeConfig->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->with(
-            Renderer::CONFIG_THUMBNAIL_SOURCE
-        )->will(
-            $this->returnValue($thumbnailToBeUsed)
-        );
-
-        /** Initialized parent product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $parentProduct */
-        $parentProduct = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        /** Initialize child product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $childProduct */
-        $childProduct = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getThumbnail', '__wakeup']);
-        $childThumbnail = $childHasThumbnail ? 'thumbnail.jpg' : 'no_selection';
-        $childProduct->expects($this->any())->method('getThumbnail')->will($this->returnValue($childThumbnail));
-
-        /** Mock methods which return parent and child products */
-        /** @var \Magento\Quote\Model\Quote\Item\Option|\PHPUnit_Framework_MockObject_MockObject $itemOption */
-        $itemOption = $this->createMock(\Magento\Quote\Model\Quote\Item\Option::class);
-        $itemOption->expects($this->any())->method('getProduct')->will($this->returnValue($childProduct));
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $item */
-        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($parentProduct));
-        $item->expects(
-            $this->any()
-        )->method(
-            'getOptionByCode'
-        )->with(
-            'simple_product'
-        )->will(
-            $this->returnValue($itemOption)
-        );
-        $this->_renderer->setItem($item);
-
-        return ['parentProduct' => $parentProduct, 'childProduct' => $childProduct];
-    }
-
     public function testGetOptionList()
     {
         $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $this->_renderer->setItem($itemMock);
+        $this->renderer->setItem($itemMock);
         $this->productConfigMock->expects($this->once())->method('getOptions')->with($itemMock);
-        $this->_renderer->getOptionList();
+        $this->renderer->getOptionList();
     }
 
     public function testGetIdentities()
@@ -168,7 +62,7 @@ public function testGetIdentities()
         $product->expects($this->exactly(2))->method('getIdentities')->will($this->returnValue($productTags));
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $item->expects($this->exactly(2))->method('getProduct')->will($this->returnValue($product));
-        $this->_renderer->setItem($item);
-        $this->assertEquals(array_merge($productTags, $productTags), $this->_renderer->getIdentities());
+        $this->renderer->setItem($item);
+        $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
index 1908d897be6da..25d8412c91056 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
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Product\View\Type;
 
 use Magento\Customer\Model\Session;
@@ -48,6 +49,11 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $priceCurrency;
 
+    /**
+     * @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $currency;
+
     /**
      * @var \Magento\ConfigurableProduct\Model\ConfigurableAttributeData|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -73,6 +79,14 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $customerSession;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $variationPricesMock;
+
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         $this->mockContextObject();
@@ -122,6 +136,9 @@ protected function setUp()
         $this->context->expects($this->once())
             ->method('getResolver')
             ->willReturn($fileResolverMock);
+        $this->currency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->configurableAttributeData = $this->getMockBuilder(
             \Magento\ConfigurableProduct\Model\ConfigurableAttributeData::class
         )
@@ -136,6 +153,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,
@@ -147,7 +168,8 @@ protected function setUp()
             $this->configurableAttributeData,
             [],
             $this->localeFormat,
-            $this->customerSession
+            $this->customerSession,
+            $this->variationPricesMock
         );
     }
 
@@ -156,7 +178,7 @@ protected function setUp()
      *
      * @return array
      */
-    public function cacheKeyProvider() : array
+    public function cacheKeyProvider(): array
     {
         return [
             'without_currency_and_customer_group' => [
@@ -192,10 +214,10 @@ public function cacheKeyProvider() : array
                     2 => null,
                     'base_url' => null,
                     'template' => null,
-                    3 => '$',
+                    3 => 'USD',
                     4 => null,
                 ],
-                '$',
+                'USD',
                 null,
             ]
         ];
@@ -223,7 +245,10 @@ public function testGetCacheKeyInfo(array $expected, string $priceCurrency = nul
             ->method('getStore')
             ->willReturn($storeMock);
         $this->priceCurrency->expects($this->once())
-            ->method('getCurrencySymbol')
+            ->method('getCurrency')
+            ->willReturn($this->currency);
+        $this->currency->expects($this->once())
+            ->method('getCode')
             ->willReturn($priceCurrency);
         $this->customerSession->expects($this->once())
             ->method('getCustomerGroupId')
@@ -249,12 +274,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();
@@ -272,27 +293,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' => [],
@@ -304,27 +314,34 @@ 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([
-                [$amount, $amount],
-                [$priceQty, $priceQty],
-                [$percentage, $percentage],
-            ]);
+            ->willReturnArgument(0);
+
+        $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);
     }
@@ -332,13 +349,13 @@ public function testGetJsonConfig()
     /**
      * Retrieve array with expected parameters for method getJsonConfig()
      *
-     * @param $productId
-     * @param $amount
-     * @param $priceQty
-     * @param $percentage
+     * @param int $productId
+     * @param double $amount
+     * @param int $priceQty
+     * @param int $percentage
      * @return array
      */
-    private function getExpectedArray($productId, $amount, $priceQty, $percentage)
+    private function getExpectedArray($productId, $amount, $priceQty, $percentage): array
     {
         $expectedArray = [
             'attributes' => [],
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
index 92b7cace509bf..cd9fb419981a1 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Helper;
 
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class DataTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -23,12 +26,27 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     protected $_productMock;
 
+    /**
+     * @var UrlBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $imageUrlBuilder;
+
     protected function setUp()
     {
+        $objectManager = new ObjectManager($this);
+        $this->imageUrlBuilder = $this->getMockBuilder(UrlBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->_imageHelperMock = $this->createMock(\Magento\Catalog\Helper\Image::class);
         $this->_productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
 
-        $this->_model = new \Magento\ConfigurableProduct\Helper\Data($this->_imageHelperMock);
+        $this->_model = $objectManager->getObject(
+            \Magento\ConfigurableProduct\Helper\Data::class,
+            [
+                '_imageHelper' => $this->_imageHelperMock
+            ]
+        );
+        $objectManager->setBackwardCompatibleProperty($this->_model, 'imageUrlBuilder', $this->imageUrlBuilder);
     }
 
     public function testGetAllowAttributes()
@@ -196,25 +214,38 @@ public function testGetGalleryImages()
             ->method('getMediaGalleryImages')
             ->willReturn($this->getImagesCollection());
 
-        $this->_imageHelperMock->expects($this->exactly(3))
-            ->method('init')
-            ->willReturnMap([
-                [$productMock, 'product_page_image_small', [], $this->_imageHelperMock],
-                [$productMock, 'product_page_image_medium_no_frame', [], $this->_imageHelperMock],
-                [$productMock, 'product_page_image_large_no_frame', [], $this->_imageHelperMock],
-            ])
-            ->willReturnSelf();
-        $this->_imageHelperMock->expects($this->exactly(3))
+        $this->imageUrlBuilder->expects($this->exactly(3))
+            ->method('getUrl')
+            ->withConsecutive(
+                [
+                    self::identicalTo('test_file'),
+                    self::identicalTo('product_page_image_small')
+                ],
+                [
+                    self::identicalTo('test_file'),
+                    self::identicalTo('product_page_image_medium')
+                ],
+                [
+                    self::identicalTo('test_file'),
+                    self::identicalTo('product_page_image_large')
+                ]
+            )
+            ->will(self::onConsecutiveCalls(
+                'testSmallImageUrl',
+                'testMediumImageUrl',
+                'testLargeImageUrl'
+            ));
+        $this->_imageHelperMock->expects(self::never())
             ->method('setImageFile')
             ->with('test_file')
             ->willReturnSelf();
-        $this->_imageHelperMock->expects($this->at(0))
+        $this->_imageHelperMock->expects(self::never())
             ->method('getUrl')
             ->willReturn('product_page_image_small_url');
-        $this->_imageHelperMock->expects($this->at(1))
+        $this->_imageHelperMock->expects(self::never())
             ->method('getUrl')
             ->willReturn('product_page_image_medium_url');
-        $this->_imageHelperMock->expects($this->at(2))
+        $this->_imageHelperMock->expects(self::never())
             ->method('getUrl')
             ->willReturn('product_page_image_large_url');
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php
index 090c464d49307..665f296fc9a94 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php
@@ -108,6 +108,10 @@ public function testValidateException()
         $this->validate(true);
     }
 
+    /**
+     * @param $exception
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function validate($exception)
     {
         $attrTable = 'someAttributeTable';
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
index acbb976318b3b..ad2fcd1e59360 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
@@ -235,7 +235,7 @@ public function testAddChild()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Product has been already attached
+     * @expectedExceptionMessage The product is already attached.
      */
     public function testAddChildStateException()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php
index 2d824e52c7244..4b35182fb9e2f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Test\Unit\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -113,7 +114,7 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Only implemented for configurable product: configurable
+     * @expectedExceptionMessage This is implemented for the "configurable" configurable product only.
      */
     public function testGetNotConfigurableProduct()
     {
@@ -141,7 +142,7 @@ public function testGetNotConfigurableProduct()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Only implemented for configurable product: 3
+     * @expectedExceptionMessage This is implemented for the "3" configurable product only.
      */
     public function testGetNotProductById()
     {
@@ -168,7 +169,7 @@ public function testGetNotProductById()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot delete variations from product: 3
+     * @expectedExceptionMessage The variations from the "3" product can't be deleted.
      */
     public function testDeleteCantSaveProducts()
     {
@@ -200,7 +201,7 @@ public function testDeleteCantSaveProducts()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot delete option with id: 33
+     * @expectedExceptionMessage The option with "33" ID can't be deleted.
      */
     public function testDeleteCantDeleteOption()
     {
@@ -276,7 +277,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested option doesn't exist: 3
+     * @expectedExceptionMessage The "3" entity that was requested doesn't exist. Verify the entity and try again.
      */
     public function testGetEmptyExtensionAttribute()
     {
@@ -329,7 +330,7 @@ public function testGetList()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Only implemented for configurable product: configurable
+     * @expectedExceptionMessage This is implemented for the "configurable" configurable product only.
      */
     public function testGetListNotConfigurableProduct()
     {
@@ -356,7 +357,8 @@ public function testGetListNotConfigurableProduct()
      */
     public function testValidateNewOptionData($attributeId, $label, $optionValues, $msg)
     {
-        $this->expectException(\Magento\Framework\Exception\InputException::class, $msg);
+        $this->expectException(\Magento\Framework\Exception\InputException::class);
+        $this->expectExceptionMessage($msg);
         $optionValueMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\OptionValueInterface::class)
             ->setMethods(['getValueIndex', 'getPricingValue', 'getIsPercent'])
             ->getMockForAbstractClass();
@@ -388,6 +390,9 @@ public function testValidateNewOptionData($attributeId, $label, $optionValues, $
         $this->model->validateNewOptionData($optionMock);
     }
 
+    /**
+     * @return array
+     */
     public function validateOptionDataProvider()
     {
         return [
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductIdentitiesExtenderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductIdentitiesExtenderTest.php
new file mode 100644
index 0000000000000..d29f163ee1129
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductIdentitiesExtenderTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Plugin;
+
+use Magento\ConfigurableProduct\Model\Plugin\ProductIdentitiesExtender;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ * Class ProductIdentitiesExtenderTest
+ */
+class ProductIdentitiesExtenderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Configurable
+     */
+    private $configurableTypeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ProductRepositoryInterface
+     */
+    private $productRepositoryMock;
+
+    /**
+     * @var ProductIdentitiesExtender
+     */
+    private $plugin;
+
+    protected function setUp()
+    {
+        $this->configurableTypeMock = $this->getMockBuilder(Configurable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->getMock();
+
+        $this->plugin = new ProductIdentitiesExtender($this->configurableTypeMock, $this->productRepositoryMock);
+    }
+
+    public function testAfterGetIdentities()
+    {
+        $productId = 1;
+        $productIdentity = 'cache_tag_1';
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $parentProductId = 2;
+        $parentProductIdentity = 'cache_tag_2';
+        $parentProductMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $productMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($productId);
+        $this->configurableTypeMock->expects($this->once())
+            ->method('getParentIdsByChild')
+            ->with($productId)
+            ->willReturn([$parentProductId]);
+        $this->productRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->with($parentProductId)
+            ->willReturn($parentProductMock);
+        $parentProductMock->expects($this->once())
+            ->method('getIdentities')
+            ->willReturn([$parentProductIdentity]);
+
+        $productIdentities = $this->plugin->afterGetIdentities($productMock, [$productIdentity]);
+        $this->assertEquals([$productIdentity, $parentProductIdentity], $productIdentities);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
deleted file mode 100644
index 519288a50c858..0000000000000
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Cache\Tag;
-
-use Magento\ConfigurableProduct\Model\Product\Cache\Tag\Configurable;
-
-class ConfigurableTest extends \PHPUnit\Framework\TestCase
-{
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Configurable
-     */
-    private $typeResource;
-
-    /**
-     * @var Configurable
-     */
-    private $model;
-
-    protected function setUp()
-    {
-        $this->typeResource = $this->createMock(
-            \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable::class
-        );
-
-        $this->model = new Configurable($this->typeResource);
-    }
-
-    public function testGetWithScalar()
-    {
-        $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object');
-        $this->model->getTags('scalar');
-    }
-
-    public function testGetTagsWithObject()
-    {
-        $this->expectException(\InvalidArgumentException::class, 'Provided argument must be a product');
-        $this->model->getTags(new \StdClass());
-    }
-
-    public function testGetTagsWithVariation()
-    {
-        $product = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        $identities = ['id1', 'id2'];
-
-        $product->expects($this->once())
-            ->method('getIdentities')
-            ->willReturn($identities);
-
-        $parentId = 4;
-        $this->typeResource->expects($this->once())
-            ->method('getParentIdsByChild')
-            ->willReturn([$parentId]);
-
-        $expected = array_merge($identities, [\Magento\Catalog\Model\Product::CACHE_TAG . '_' . $parentId]);
-
-        $this->assertEquals($expected, $this->model->getTags($product));
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
new file mode 100644
index 0000000000000..8dac2dee10d37
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
+use Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\Quote\Item\Option;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ItemProductResolverTest extends TestCase
+{
+    /** @var ItemProductResolver */
+    private $model;
+    /** @var ItemInterface | MockObject */
+    private $item;
+    /** @var Product | MockObject */
+    private $parentProduct;
+    /** @var  ScopeConfigInterface | MockObject */
+    private $scopeConfig;
+    /** @var OptionInterface | MockObject */
+    private $option;
+    /** @var Product | MockObject */
+    private $childProduct;
+
+    /**
+     * Set up method
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->parentProduct = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->parentProduct
+            ->method('getSku')
+            ->willReturn('parent_product');
+
+        $this->childProduct = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->childProduct
+            ->method('getSku')
+            ->willReturn('child_product');
+
+        $this->option = $this->getMockBuilder(Option::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->option
+            ->method('getProduct')
+            ->willReturn($this->childProduct);
+
+        $this->item = $this->getMockBuilder(ItemInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->item
+            ->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->parentProduct);
+
+        $this->model = new ItemProductResolver($this->scopeConfig);
+    }
+
+    /**
+     * Test for deleted child product from configurable product
+     */
+    public function testGetFinalProductChildIsNull(): void
+    {
+        $this->scopeConfig->expects($this->never())->method('getValue');
+        $this->childProduct->expects($this->never())->method('getData');
+
+        $this->item->expects($this->once())
+            ->method('getOptionByCode')
+            ->willReturn(null);
+
+        $finalProduct = $this->model->getFinalProduct($this->item);
+        $this->assertEquals(
+            $this->parentProduct->getSku(),
+            $finalProduct->getSku()
+        );
+    }
+
+    /**
+     * Tests child product from configurable product
+     *
+     * @dataProvider provideScopeConfig
+     * @param string $expectedSku
+     * @param string $scopeValue
+     * @param string | null $thumbnail
+     */
+    public function testGetFinalProductChild($expectedSku, $scopeValue, $thumbnail): void
+    {
+        $this->item->expects($this->once())
+            ->method('getOptionByCode')
+            ->willReturn($this->option);
+
+        $this->childProduct
+            ->expects($this->once())
+            ->method('getData')
+            ->willReturn($thumbnail);
+
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->willReturn($scopeValue);
+
+        $finalProduct = $this->model->getFinalProduct($this->item);
+        $this->assertEquals($expectedSku, $finalProduct->getSku());
+    }
+
+    /**
+     * Dataprovider for scope test
+     * @return array
+     */
+    public function provideScopeConfig(): array
+    {
+        return [
+            ['child_product', Thumbnail::OPTION_USE_OWN_IMAGE, 'thumbnail'],
+            ['parent_product', Thumbnail::OPTION_USE_PARENT_IMAGE, 'thumbnail'],
+
+            ['parent_product', Thumbnail::OPTION_USE_OWN_IMAGE, null],
+            ['parent_product', Thumbnail::OPTION_USE_OWN_IMAGE, 'no_selection'],
+
+            ['parent_product', Thumbnail::OPTION_USE_PARENT_IMAGE, null],
+            ['parent_product', Thumbnail::OPTION_USE_PARENT_IMAGE, 'no_selection'],
+        ];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php
index 6fda5b867ccef..851595422f596 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php
@@ -88,6 +88,7 @@ public function testExecuteWithInvalidProductType()
     public function testExecuteWithEmptyExtensionAttributes()
     {
         $sku = 'test';
+        $configurableProductLinks = [1, 2, 3];
         $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTypeId', 'getExtensionAttributes', 'getSku'])
@@ -105,16 +106,16 @@ public function testExecuteWithEmptyExtensionAttributes()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $product->expects(static::once())
+        $product->expects(static::atLeastOnce())
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributes);
 
-        $extensionAttributes->expects(static::exactly(2))
+        $extensionAttributes->expects(static::atLeastOnce())
             ->method('getConfigurableProductOptions')
             ->willReturn([]);
-        $extensionAttributes->expects(static::once())
+        $extensionAttributes->expects(static::atLeastOnce())
             ->method('getConfigurableProductLinks')
-            ->willReturn([]);
+            ->willReturn($configurableProductLinks);
 
         $this->optionRepository->expects(static::once())
             ->method('getList')
@@ -133,7 +134,10 @@ public function testExecuteWithEmptyExtensionAttributes()
     public function testExecute()
     {
         $sku = 'config-1';
-        $id = 25;
+        $idOld = 25;
+        $idNew = 26;
+        $attributeIdOld = 11;
+        $attributeIdNew = 22;
         $configurableProductLinks = [1, 2, 3];
 
         $product = $this->getMockBuilder(Product::class)
@@ -143,7 +147,7 @@ public function testExecute()
         $product->expects(static::once())
             ->method('getTypeId')
             ->willReturn(ConfigurableModel::TYPE_CODE);
-        $product->expects(static::exactly(3))
+        $product->expects(static::exactly(4))
             ->method('getSku')
             ->willReturn($sku);
 
@@ -156,30 +160,36 @@ public function testExecute()
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributes);
 
-        $attribute = $this->getMockBuilder(Attribute::class)
+        $attributeNew = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAttributeId', 'loadByProductAndAttribute', 'setId', 'getId'])
             ->getMock();
-        $this->processSaveOptions($attribute, $sku, $id);
-
-        $option = $this->getMockForAbstractClass(OptionInterface::class);
-        $option->expects(static::once())
+        $attributeNew->expects(static::atLeastOnce())
+            ->method('getAttributeId')
+            ->willReturn($attributeIdNew);
+        $this->processSaveOptions($attributeNew, $sku, $idNew);
+
+        $optionOld = $this->getMockForAbstractClass(OptionInterface::class);
+        $optionOld->expects(static::atLeastOnce())
+            ->method('getAttributeId')
+            ->willReturn($attributeIdOld);
+        $optionOld->expects(static::atLeastOnce())
             ->method('getId')
-            ->willReturn($id);
+            ->willReturn($idOld);
 
-        $list = [$option];
-        $this->optionRepository->expects(static::once())
+        $list = [$optionOld];
+        $this->optionRepository->expects(static::atLeastOnce())
             ->method('getList')
             ->with($sku)
             ->willReturn($list);
         $this->optionRepository->expects(static::once())
             ->method('deleteById')
-            ->with($sku, $id);
+            ->with($sku, $idOld);
 
         $configurableAttributes = [
-            $attribute
+            $attributeNew
         ];
-        $extensionAttributes->expects(static::exactly(2))
+        $extensionAttributes->expects(static::atLeastOnce())
             ->method('getConfigurableProductOptions')
             ->willReturn($configurableAttributes);
 
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 0000000000000..b4e7689498fe6
--- /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/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
index 7bfa78e92349c..c351d12fa813d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
@@ -8,20 +8,23 @@
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Config;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\EntityManager\EntityMetadata;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Customer\Model\Session;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
 use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory
+    as ProductCollectionFactory;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
+use Magento\Customer\Model\Session;
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
@@ -153,9 +156,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->productCollectionFactory = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory::class
-        )
+        $this->productCollectionFactory = $this->getMockBuilder(ProductCollectionFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -197,11 +198,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->productFactory = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterfaceFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->salableProcessor = $this->createMock(SalableProcessor::class);
 
         $this->model = $this->objectHelper->getObject(
@@ -286,9 +282,7 @@ public function testSave()
         $product->expects($this->atLeastOnce())
             ->method('getData')
             ->willReturnMap($dataMap);
-        $attribute = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
-        )
+        $attribute = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['addData', 'setStoreId', 'setProductId', 'save', '__wakeup', '__sleep'])
             ->getMock();
@@ -385,7 +379,7 @@ public function testGetUsedProducts()
                     ['_cache_instance_used_product_attributes', null, []]
                 ]
             );
-
+        $this->catalogConfig->expects($this->any())->method('getProductAttributes')->willReturn([]);
         $productCollection->expects($this->atLeastOnce())->method('addAttributeToSelect')->willReturnSelf();
         $productCollection->expects($this->once())->method('setProductFilter')->willReturnSelf();
         $productCollection->expects($this->atLeastOnce())->method('setFlag')->willReturnSelf();
@@ -470,9 +464,7 @@ public function testGetConfigurableAttributesAsArray($productStore)
         $eavAttribute->expects($this->once())->method('getSource')->willReturn($attributeSource);
         $eavAttribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn('Store Label');
 
-        $attribute = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
-        )
+        $attribute = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['getProductAttribute', '__wakeup', '__sleep'])
             ->getMock();
@@ -515,17 +507,34 @@ public function getConfigurableAttributesAsArrayDataProvider()
         ];
     }
 
+    public function testGetConfigurableAttributesNewProduct()
+    {
+        $configurableAttributes = '_cache_instance_configurable_attributes';
+
+        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->setMethods(['hasData', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $product->expects($this->once())->method('hasData')->with($configurableAttributes)->willReturn(false);
+        $product->expects($this->once())->method('getId')->willReturn(null);
+
+        $this->assertEquals([], $this->model->getConfigurableAttributes($product));
+    }
+
     public function testGetConfigurableAttributes()
     {
         $configurableAttributes = '_cache_instance_configurable_attributes';
 
         /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->setMethods(['getData', 'hasData', 'setData'])
+            ->setMethods(['getData', 'hasData', 'setData', 'getId'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $product->expects($this->once())->method('hasData')->with($configurableAttributes)->willReturn(false);
+        $product->expects($this->once())->method('getId')->willReturn(1);
 
         $attributeCollection = $this->getMockBuilder(Collection::class)
             ->setMethods(['setProductFilter', 'orderByPosition', 'load'])
@@ -581,9 +590,7 @@ public function testHasOptionsConfigurableAttribute()
             ->setMethods(['__wakeup', 'getAttributeCode', 'getOptions', 'hasData', 'getData'])
             ->disableOriginalConstructor()
             ->getMock();
-        $attributeMock = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
-        )
+        $attributeMock = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -689,7 +696,7 @@ function ($value) {
             ->disableOriginalConstructor()
             ->getMock();
         $usedAttributeMock = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
+            Attribute::class
         )
             ->setMethods(['getProductAttribute'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
index 235c16c9b556c..537288618b648 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
@@ -66,7 +66,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->select = $this->getMockBuilder(Select::class)
-            ->setMethods(['from', 'joinInner', 'joinLeft', 'where', 'columns'])
+            ->setMethods(['from', 'joinInner', 'joinLeft', 'where', 'columns', 'order'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->connectionMock->expects($this->atLeastOnce())
@@ -113,9 +113,27 @@ public function testGetSelect()
         $this->select->expects($this->exactly(1))->method('from')->willReturnSelf();
         $this->select->expects($this->exactly(1))->method('columns')->willReturnSelf();
         $this->select->expects($this->exactly(5))->method('joinInner')->willReturnSelf();
-        $this->select->expects($this->exactly(3))->method('joinLeft')->willReturnSelf();
+        $this->select->expects($this->exactly(4))->method('joinLeft')->willReturnSelf();
+        $this->select->expects($this->exactly(1))->method('order')->willReturnSelf();
         $this->select->expects($this->exactly(2))->method('where')->willReturnSelf();
 
+        $this->attributeResourceMock->expects($this->exactly(9))
+            ->method('getTable')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['catalog_product_super_attribute', 'catalog_product_super_attribute value'],
+                        ['catalog_product_entity', 'catalog_product_entity value'],
+                        ['catalog_product_super_link', 'catalog_product_super_link value'],
+                        ['eav_attribute', 'eav_attribute value'],
+                        ['catalog_product_entity', 'catalog_product_entity value'],
+                        ['catalog_product_super_attribute_label', 'catalog_product_super_attribute_label value'],
+                        ['eav_attribute_option', 'eav_attribute_option value'],
+                        ['eav_attribute_option_value', 'eav_attribute_option_value value']
+                    ]
+                )
+            );
+
         $this->abstractAttributeMock->expects($this->atLeastOnce())
             ->method('getAttributeId')
             ->willReturn('getAttributeId value');
@@ -139,9 +157,26 @@ public function testGetSelectWithBackendModel()
         $this->select->expects($this->exactly(1))->method('from')->willReturnSelf();
         $this->select->expects($this->exactly(0))->method('columns')->willReturnSelf();
         $this->select->expects($this->exactly(5))->method('joinInner')->willReturnSelf();
-        $this->select->expects($this->exactly(1))->method('joinLeft')->willReturnSelf();
+        $this->select->expects($this->exactly(2))->method('joinLeft')->willReturnSelf();
+        $this->select->expects($this->exactly(1))->method('order')->willReturnSelf();
         $this->select->expects($this->exactly(2))->method('where')->willReturnSelf();
 
+        $this->attributeResourceMock->expects($this->exactly(7))
+            ->method('getTable')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['catalog_product_super_attribute', 'catalog_product_super_attribute value'],
+                        ['catalog_product_entity', 'catalog_product_entity value'],
+                        ['catalog_product_super_link', 'catalog_product_super_link value'],
+                        ['eav_attribute', 'eav_attribute value'],
+                        ['catalog_product_entity', 'catalog_product_entity value'],
+                        ['catalog_product_super_attribute_label', 'catalog_product_super_attribute_label value'],
+                        ['eav_attribute_option', 'eav_attribute_option value']
+                    ]
+                )
+            );
+
         $this->abstractAttributeMock->expects($this->atLeastOnce())
             ->method('getAttributeId')
             ->willReturn('getAttributeId value');
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 0000000000000..3ef03f32ae05d
--- /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 0000000000000..5717e995f9f96
--- /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/Model/ResourceModel/Product/Type/Configurable/AttributeTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/Configurable/AttributeTest.php
index a6c7f00c2dfbe..e7b033ff84fd0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/Configurable/AttributeTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/Configurable/AttributeTest.php
@@ -53,7 +53,7 @@ protected function setUp()
         );
     }
 
-    public function testSaveLabel()
+    public function testSaveNewLabel()
     {
         $attributeId = 4354;
 
@@ -70,7 +70,7 @@ public function testSaveLabel()
             ]
         )->willReturn(0);
 
-        $this->connection->expects($this->once())->method('insertOnDuplicate')->with(
+        $this->connection->expects($this->once())->method('insert')->with(
             'catalog_product_super_attribute_label',
             [
                 'product_super_attribute_id' => $attributeId,
@@ -79,12 +79,48 @@ public function testSaveLabel()
                 'value' => 'test',
             ]
         );
-        $attributeMode = $this->getMockBuilder(AttributeModel::class)->setMethods(
+        $attributeMock = $this->getMockBuilder(AttributeModel::class)->setMethods(
             ['getId', 'getUseDefault', 'getLabel']
         )->disableOriginalConstructor()->getMock();
-        $attributeMode->expects($this->any())->method('getId')->willReturn($attributeId);
-        $attributeMode->expects($this->any())->method('getUseDefault')->willReturn(0);
-        $attributeMode->expects($this->any())->method('getLabel')->willReturn('test');
-        $this->assertEquals($this->attribute, $this->attribute->saveLabel($attributeMode));
+        $attributeMock->expects($this->atLeastOnce())->method('getId')->willReturn($attributeId);
+        $attributeMock->expects($this->atLeastOnce())->method('getUseDefault')->willReturn(0);
+        $attributeMock->expects($this->atLeastOnce())->method('getLabel')->willReturn('test');
+        $this->assertEquals($this->attribute, $this->attribute->saveLabel($attributeMock));
+    }
+
+    public function testSaveExistingLabel()
+    {
+        $attributeId = 4354;
+
+        $select = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
+        $this->connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->willReturnSelf();
+        $select->expects($this->at(1))->method('where')->willReturnSelf();
+        $select->expects($this->at(2))->method('where')->willReturnSelf();
+        $this->connection->expects($this->once())->method('fetchOne')->with(
+            $select,
+            [
+                'product_super_attribute_id' => $attributeId,
+                'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+            ]
+        )->willReturn(1);
+
+        $this->connection->expects($this->once())->method('insertOnDuplicate')->with(
+            'catalog_product_super_attribute_label',
+            [
+                'product_super_attribute_id' => $attributeId,
+                'use_default' => 0,
+                'store_id' => 1,
+                'value' => 'test',
+            ]
+        );
+        $attributeMock = $this->getMockBuilder(AttributeModel::class)->setMethods(
+            ['getId', 'getUseDefault', 'getLabel', 'getStoreId']
+        )->disableOriginalConstructor()->getMock();
+        $attributeMock->expects($this->atLeastOnce())->method('getId')->willReturn($attributeId);
+        $attributeMock->expects($this->atLeastOnce())->method('getStoreId')->willReturn(1);
+        $attributeMock->expects($this->atLeastOnce())->method('getUseDefault')->willReturn(0);
+        $attributeMock->expects($this->atLeastOnce())->method('getLabel')->willReturn('test');
+        $this->assertEquals($this->attribute, $this->attribute->saveLabel($attributeMock));
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php
index 5a494d1c7a19b..cda9c300cd1d9 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php
@@ -142,19 +142,48 @@ public function testSaveProducts()
         $this->optionProvider->expects($this->once())
             ->method('getProductEntityLinkField')
             ->willReturnSelf();
-        $this->connectionMock->expects($this->once())
-            ->method('insertOnDuplicate')
-            ->willReturnSelf();
-
         $this->resource->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
         $this->resource->expects($this->any())->method('getTableName')->willReturn('table name');
 
-        $statement  = $this->getMockBuilder(\Zend_Db_Statement::class)->disableOriginalConstructor()->getMock();
-        $statement->method('fetchAll')->willReturn([1]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->setMethods(['from', 'where'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $select->expects($this->exactly(1))->method('from')->willReturnSelf();
+        $select->expects($this->exactly(1))->method('where')->willReturnSelf();
+
+        $this->connectionMock->expects($this->atLeastOnce())
+            ->method('select')
+            ->willReturn($select);
+
+        $existingProductIds = [1, 2];
+        $this->connectionMock->expects($this->once())
+            ->method('fetchCol')
+            ->with($select)
+            ->willReturn($existingProductIds);
+
+        $this->connectionMock->expects($this->once())
+            ->method('insertMultiple')
+            ->with(
+                'table name',
+                [
+                    ['product_id' => 3, 'parent_id' => 3],
+                    ['product_id' => 4, 'parent_id' => 3],
+                ]
+            )
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('delete')
+            ->with(
+                'table name',
+                ['parent_id = ?' => 3, 'product_id IN (?)' => [1]]
+            )
+            ->willReturnSelf();
 
         $this->assertSame(
             $this->configurable,
-            $this->configurable->saveProducts($this->product, [1, 2, 3])
+            $this->configurable->saveProducts($this->product, [2, 3, 4])
         );
     }
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php
index 3bad81126f510..03c26fd949283 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php
@@ -59,6 +59,11 @@ private function createTarget(\PHPUnit_Framework_MockObject_MockObject $request,
         );
     }
 
+    /**
+     * @param $popup
+     * @param string $productTab
+     * @return MockObject
+     */
     private function createRequestMock($popup, $productTab = 'variations')
     {
         $request = $this->getMockBuilder(RequestInterface::class)
@@ -107,6 +112,9 @@ public function testExecuteWithDefaultTypes(array $supportedTypes, array $origin
         $this->assertEquals(null, $target->execute($event));
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
@@ -143,11 +151,21 @@ public function executeDataProvider()
         ];
     }
 
+    /**
+     * @param $value
+     * @param $label
+     * @return array
+     */
     private function createFrontendInputValue($value, $label)
     {
         return ['value' => $value, 'label' => $label];
     }
 
+    /**
+     * @param array $originalValues
+     * @param array $expectedValues
+     * @return MockObject
+     */
     private function createForm(array $originalValues = [], array $expectedValues = [])
     {
         $form = $this->getMockBuilder(\Magento\Framework\Data\Form::class)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php
index 99c31420473f5..189730e18080c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php
@@ -55,24 +55,31 @@ protected function setUp()
      * situation: one product is supplying the price, which could be a price of zero (0)
      *
      * @dataProvider resolvePriceDataProvider
+     *
+     * @param $variantPrices
+     * @param $expectedPrice
      */
-    public function testResolvePrice($expectedValue)
+    public function testResolvePrice($variantPrices, $expectedPrice)
     {
-        $price = $expectedValue;
-
         $product = $this->getMockBuilder(
             \Magento\Catalog\Model\Product::class
         )->disableOriginalConstructor()->getMock();
 
         $product->expects($this->never())->method('getSku');
 
-        $this->lowestPriceOptionsProvider->expects($this->once())->method('getProducts')->willReturn([$product]);
-        $this->priceResolver->expects($this->once())
+        $products = array_map(function () {
+            return $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        }, $variantPrices);
+
+        $this->lowestPriceOptionsProvider->expects($this->once())->method('getProducts')->willReturn($products);
+        $this->priceResolver
             ->method('resolvePrice')
-            ->with($product)
-            ->willReturn($price);
+            ->willReturnOnConsecutiveCalls(...$variantPrices);
 
-        $this->assertEquals($expectedValue, $this->resolver->resolvePrice($product));
+        $actualPrice = $this->resolver->resolvePrice($product);
+        self::assertSame($expectedPrice, $actualPrice);
     }
 
     /**
@@ -81,8 +88,40 @@ public function testResolvePrice($expectedValue)
     public function resolvePriceDataProvider()
     {
         return [
-            'price of zero' => [0.00],
-            'price of five' => [5],
+            'Single variant at price 0.00 (float), should return 0.00 (float)' => [
+                $variantPrices = [
+                    0.00,
+                ],
+                $expectedPrice = 0.00,
+            ],
+            'Single variant at price 5 (integer), should return 5.00 (float)' => [
+                $variantPrices = [
+                    5,
+                ],
+                $expectedPrice = 5.00,
+            ],
+            'Single variants at price null (null), should return 0.00 (float)' => [
+                $variantPrices = [
+                    null,
+                ],
+                $expectedPrice = 0.00,
+            ],
+            'Multiple variants at price 0, 10, 20, should return 0.00 (float)' => [
+                $variantPrices = [
+                    0,
+                    10,
+                    20,
+                ],
+                $expectedPrice = 0.00,
+            ],
+            'Multiple variants at price 10, 0, 20, should return 0.00 (float)' => [
+                $variantPrices = [
+                    10,
+                    0,
+                    20,
+                ],
+                $expectedPrice = 0.00,
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
index ceeb242a750a2..7c83645a9fda3 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
@@ -9,6 +9,9 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
 
 class LowestPriceOptionsProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -42,6 +45,16 @@ class LowestPriceOptionsProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $productCollection;
 
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
     protected function setUp()
     {
         $this->connection = $this
@@ -68,6 +81,11 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($this->productCollection);
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
 
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
@@ -76,6 +94,7 @@ protected function setUp()
                 'resourceConnection' => $this->resourceConnection,
                 'linkedProductSelectBuilder' => $this->linkedProductSelectBuilder,
                 'collectionFactory' => $this->collectionFactory,
+                'storeManager' => $this->storeManagerMock,
             ]
         );
     }
@@ -94,6 +113,13 @@ public function testGetProducts()
             ->willReturnSelf();
         $this->productCollection->expects($this->once())->method('addIdFilter')->willReturnSelf();
         $this->productCollection->expects($this->once())->method('getItems')->willReturn($linkedProducts);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with(Store::DEFAULT_STORE_ID)
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(Store::DEFAULT_STORE_ID);
 
         $this->assertEquals($linkedProducts, $this->model->getProducts($product));
     }
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 67f758af22bec..c3f2008c8a687 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/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePriceTest.php
index 794f421f99cbd..48ce6f1c59ef6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePriceTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePriceTest.php
@@ -41,7 +41,7 @@ public function metaDataProvider()
         return [
             [
                 'metaInput' => [
-                    'pruduct-details' => [
+                    'product-details' => [
                         'children' => [
                             'container_price' => [
                                 'children' => [
@@ -54,7 +54,7 @@ public function metaDataProvider()
                     ]
                 ],
                 'metaOutput' => [
-                    'pruduct-details' => [
+                    'product-details' => [
                         'children' => [
                             'container_price' => [
                                 'children' => [
@@ -86,7 +86,7 @@ public function metaDataProvider()
                 ]
             ], [
                 'metaInput' => [
-                    'pruduct-details' => [
+                    'product-details' => [
                         'children' => [
                             'container_price' => [
                                 'children' => []
@@ -95,7 +95,7 @@ public function metaDataProvider()
                     ]
                 ],
                 'metaOutput' => [
-                    'pruduct-details' => [
+                    'product-details' => [
                         'children' => [
                             'container_price' => [
                                 'children' => [
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
index e2e9fe9b2b1f9..659f7346faba4 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
@@ -10,6 +10,14 @@
 
 class CustomOptionsTest extends AbstractModifierTest
 {
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->arrayManagerMock->expects($this->any())
+            ->method('merge')
+            ->willReturnArgument(1);
+    }
+
     /**
      * {@inheritdoc}
      */
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 c9c3a5659aa5e..2d727b81143de 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/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index 0e03dfe3cde51..fbab25ff1bea6 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\Form;
@@ -466,7 +467,20 @@ protected function getRows()
                         [],
                         ['dataScope' => 'product_link']
                     ),
-                    'sku_container' => $this->getColumn('sku', __('SKU')),
+                    'sku_container' => $this->getColumn(
+                        'sku',
+                        __('SKU'),
+                        [
+                            'validation' =>
+                                [
+                                    'required-entry' => true,
+                                    'max_text_length' => Sku::SKU_MAX_LENGTH,
+                                ],
+                        ],
+                        [
+                            'elementTmpl' => 'Magento_ConfigurableProduct/components/cell-sku',
+                        ]
+                    ),
                     'price_container' => $this->getColumn(
                         'price',
                         __('Price'),
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
index 9150215e2c41e..c474acbec5094 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
@@ -17,6 +17,8 @@
 use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\Locale\CurrencyInterface;
 use Magento\Framework\UrlInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -83,6 +85,11 @@ class AssociatedProducts
      */
     protected $imageHelper;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param LocatorInterface $locator
      * @param UrlInterface $urlBuilder
@@ -93,6 +100,8 @@ class AssociatedProducts
      * @param CurrencyInterface $localeCurrency
      * @param JsonHelper $jsonHelper
      * @param ImageHelper $imageHelper
+     * @param Escaper|null $escaper
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         LocatorInterface $locator,
@@ -103,7 +112,8 @@ public function __construct(
         VariationMatrix $variationMatrix,
         CurrencyInterface $localeCurrency,
         JsonHelper $jsonHelper,
-        ImageHelper $imageHelper
+        ImageHelper $imageHelper,
+        Escaper $escaper = null
     ) {
         $this->locator = $locator;
         $this->urlBuilder = $urlBuilder;
@@ -114,6 +124,7 @@ public function __construct(
         $this->localeCurrency = $localeCurrency;
         $this->jsonHelper = $jsonHelper;
         $this->imageHelper = $imageHelper;
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
     }
 
     /**
@@ -280,9 +291,9 @@ protected function prepareVariations()
                         'product_link' => '<a href="' . $this->urlBuilder->getUrl(
                             'catalog/product/edit',
                             ['id' => $product->getId()]
-                        ) . '" target="_blank">' . $product->getName() . '</a>',
+                        ) . '" target="_blank">' . $this->escaper->escapeHtml($product->getName()) . '</a>',
                         'sku' => $product->getSku(),
-                        'name' => $product->getName(),
+                        'name' => $this->escaper->escapeHtml($product->getName()),
                         'qty' => $this->getProductStockQty($product),
                         'price' => $price,
                         'price_string' => $currency->toCurrency(sprintf("%f", $price)),
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index f06afe07d7b7f..e795ea7cd3618 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -5,29 +5,29 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-msrp": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-product-video": "100.3.*",
-        "magento/module-configurable-sample-data": "Sample Data version:100.3.*",
-        "magento/module-product-links-sample-data": "Sample Data version:100.3.*"
+        "magento/module-msrp": "*",
+        "magento/module-webapi": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-product-video": "*",
+        "magento/module-configurable-sample-data": "*",
+        "magento/module-product-links-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/etc/adminhtml/system.xml b/app/code/Magento/ConfigurableProduct/etc/adminhtml/system.xml
index ba52b51d6b077..86baea3c0d296 100644
--- a/app/code/Magento/ConfigurableProduct/etc/adminhtml/system.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/adminhtml/system.xml
@@ -9,7 +9,7 @@
     <system>
         <section id="checkout">
             <group id="cart">
-                <field id="configurable_product_image" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="configurable_product_image" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Configurable Product Image</label>
                     <source_model>Magento\Catalog\Model\Config\Source\Product\Thumbnail</source_model>
                 </field>
diff --git a/app/code/Magento/ConfigurableProduct/etc/db_schema.xml b/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
new file mode 100644
index 0000000000000..d6917e8c1845a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_product_super_attribute" resource="default" engine="innodb"
+           comment="Catalog Product Super Attribute Table">
+        <column xsi:type="int" name="product_super_attribute_id" padding="10" unsigned="true" nullable="false"
+                identity="true" comment="Product Super Attribute ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Position"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="product_super_attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_SPR_ATTR_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_super_attribute" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_SUPER_ATTRIBUTE_PRODUCT_ID_ATTRIBUTE_ID">
+            <column name="product_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_super_attribute_label" resource="default" engine="innodb"
+           comment="Catalog Product Super Attribute Label Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="int" name="product_super_attribute_id" padding="10" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Product Super Attribute ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="smallint" name="use_default" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Use Default Value"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="FK_309442281DF7784210ED82B2CC51E5D5"
+                    table="catalog_product_super_attribute_label" column="product_super_attribute_id"
+                    referenceTable="catalog_product_super_attribute" referenceColumn="product_super_attribute_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_super_attribute_label" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_SPR_ATTR_LBL_PRD_SPR_ATTR_ID_STORE_ID">
+            <column name="product_super_attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_super_link" resource="default" engine="innodb"
+           comment="Catalog Product Super Link Table">
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Link ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Parent ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="link_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_SPR_LNK_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_super_link" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_SPR_LNK_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="catalog_product_super_link" column="parent_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CATALOG_PRODUCT_SUPER_LINK_PRODUCT_ID_PARENT_ID">
+            <column name="product_id"/>
+            <column name="parent_id"/>
+        </constraint>
+        <index referenceId="CATALOG_PRODUCT_SUPER_LINK_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/ConfigurableProduct/etc/db_schema_whitelist.json b/app/code/Magento/ConfigurableProduct/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..70ce362e02c71
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/etc/db_schema_whitelist.json
@@ -0,0 +1,50 @@
+{
+    "catalog_product_super_attribute": {
+        "column": {
+            "product_super_attribute_id": true,
+            "product_id": true,
+            "attribute_id": true,
+            "position": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_SPR_ATTR_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_SUPER_ATTRIBUTE_PRODUCT_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "catalog_product_super_attribute_label": {
+        "column": {
+            "value_id": true,
+            "product_super_attribute_id": true,
+            "store_id": true,
+            "use_default": true,
+            "value": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_309442281DF7784210ED82B2CC51E5D5": true,
+            "CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true,
+            "CAT_PRD_SPR_ATTR_LBL_PRD_SPR_ATTR_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_super_link": {
+        "column": {
+            "link_id": true,
+            "product_id": true,
+            "parent_id": true
+        },
+        "index": {
+            "CATALOG_PRODUCT_SUPER_LINK_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CAT_PRD_SPR_LNK_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CAT_PRD_SPR_LNK_PARENT_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "CATALOG_PRODUCT_SUPER_LINK_PRODUCT_ID_PARENT_ID": true,
+            "CAT_PRD_SPR_LNK_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index b9ea0c7e27011..102ed1314f864 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -125,6 +125,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Order\ProductOption">
+        <arguments>
+            <argument name="processorPool" xsi:type="array">
+                <item name="configurable" xsi:type="object">Magento\ConfigurableProduct\Model\ProductOptionProcessor</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType name="ConfigurableFinalPriceResolver" type="Magento\ConfigurableProduct\Pricing\Price\ConfigurablePriceResolver">
         <arguments>
             <argument name="priceResolver" xsi:type="object">Magento\ConfigurableProduct\Pricing\Price\FinalPriceResolver</argument>
@@ -168,13 +175,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Cache\Tag\Strategy\Factory">
-        <arguments>
-            <argument name="customStrategies" xsi:type="array">
-                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="object">\Magento\ConfigurableProduct\Model\Product\Cache\Tag\Configurable</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator">
         <arguments>
             <argument name="estimators" xsi:type="array">
@@ -183,6 +183,14 @@
             <argument name="batchSizeAdjusters" xsi:type="array">
                 <item name="configurable" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjuster</item>
             </argument>
+            <!--
+            real batch size will be smaller.
+            It depends on amount configurable product variations.
+            E.g for 100 variations real batch size will be 50000/100=500
+            -->
+            <argument name="batchRowsCount" xsi:type="array">
+                <item name="configurable" xsi:type="number">50000</item>
+            </argument>
         </arguments>
     </type>
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable">
@@ -196,4 +204,42 @@
             <argument name="productIndexer" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Full</argument>
         </arguments>
     </type>
+    <virtualType name="LinkedProductSelectBuilderByIndexMinPrice" type="Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilderComposite">
+        <arguments>
+            <argument name="linkedProductSelectBuilder" xsi:type="array">
+                <item name="indexPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <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>
+            <argument name="linkedProductSelectBuilder" xsi:type="object">LinkedProductSelectBuilderByIndexMinPrice</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>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\ProductIdentitiesExtender" />
+    </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array">
+                <item name="configurable" xsi:type="string">Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesRule\Model\Quote\ChildrenValidationLocator">
+        <arguments>
+            <argument name="productTypeChildrenValidationMap" xsi:type="array">
+                <item name="configurable" xsi:type="boolean">false</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index 592b0292c98ab..bb830c36b929d 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -7,13 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="configurable" xsi:type="string">Magento\ConfigurableProduct\CustomerData\ConfigurableItem</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
diff --git a/app/code/Magento/ConfigurableProduct/etc/module.xml b/app/code/Magento/ConfigurableProduct/etc/module.xml
index 188337fb0ed7c..e81553191f867 100644
--- a/app/code/Magento/ConfigurableProduct/etc/module.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ConfigurableProduct" setup_version="2.2.0">
+    <module name="Magento_ConfigurableProduct" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Msrp"/>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
index d70576d975ac3..0e0eb3464eaa6 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
@@ -89,7 +89,7 @@
                             showLoader: true,
                             context: $form
                         })
-                            .success(function (data) {
+                            .done(function (data) {
                                 if (!data.error) {
                                     setAttributeSetId(data.id);
                                     closeDialogAndProcessForm($form);
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 01abce7696014..94a24779450ae 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/product-grid.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js
index d8f902f0dbfc6..63361baab809f 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js
@@ -95,7 +95,7 @@ define([
                 type: 'GET',
                 url: this._buildGridUrl(filterData),
                 context: $('body')
-            }).success(function (data) {
+            }).done(function (data) {
                 bootstrap(JSON.parse(data));
             });
         },
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js
index cc565cab6b260..1fa65e03f54e0 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js
@@ -233,7 +233,7 @@ define([
          */
         requestAttributes: function (attributeIds) {
             $.ajax({
-                type: 'POST',
+                type: 'GET',
                 url: this.optionsUrl,
                 data: {
                     attributes: attributeIds
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 8ae6804908cb0..00bf1feff7fb5 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 dc83a58899981..ac952ca531a34 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/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
index 3c77fb06bbae5..8d27e3dc58a4a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -357,12 +357,12 @@ define([
             var element;
 
             _.each(this.disabledAttributes, function (attribute) {
-                registry.get('code = ' + attribute, 'index = ' + attribute).disabled(false);
+                registry.get('inputName = ' + 'product[' + attribute + ']').disabled(false);
             });
             this.disabledAttributes = [];
 
             _.each(attributes, function (attribute) {
-                element = registry.get('code = ' + attribute.code, 'index = ' + attribute.code);
+                element = registry.get('inputName = ' + 'product[' + attribute.code + ']');
 
                 if (!_.isUndefined(element)) {
                     element.disabled(true);
@@ -390,19 +390,23 @@ define([
                 this.attributeSetHandlerModal().openModal();
             } else {
                 this.formElement().save(arguments[0], arguments[1]);
+
+                if (this.formElement().source.get('params.invalid')) {
+                    this.unserializeData();
+                }
             }
         },
 
         /**
          * Serialize data for specific form fields
          *
-         * Get data from outdated fields, serialize it and produce new form fields.
+         * Serializes some complex data fields
          *
-         * Outdated fields:
+         * Original fields:
          *   - configurable-matrix;
          *   - associated_product_ids.
          *
-         * New fields:
+         * Serialized fields in request:
          *   - configurable-matrix-serialized;
          *   - associated_product_ids_serialized.
          */
@@ -410,18 +414,35 @@ define([
             if (this.source.data['configurable-matrix']) {
                 this.source.data['configurable-matrix-serialized'] =
                     JSON.stringify(this.source.data['configurable-matrix']);
-
                 delete this.source.data['configurable-matrix'];
             }
 
             if (this.source.data['associated_product_ids']) {
                 this.source.data['associated_product_ids_serialized'] =
                     JSON.stringify(this.source.data['associated_product_ids']);
-
                 delete this.source.data['associated_product_ids'];
             }
         },
 
+        /**
+         * Unserialize data for specific form fields
+         *
+         * Unserializes some fields that were serialized this.serializeData
+         */
+        unserializeData: function () {
+            if (this.source.data['configurable-matrix-serialized']) {
+                this.source.data['configurable-matrix'] =
+                    JSON.parse(this.source.data['configurable-matrix-serialized']);
+                delete this.source.data['configurable-matrix-serialized'];
+            }
+
+            if (this.source.data['associated_product_ids_serialized']) {
+                this.source.data['associated_product_ids'] =
+                    JSON.parse(this.source.data['associated_product_ids_serialized']);
+                delete this.source.data['associated_product_ids_serialized'];
+            }
+        },
+
         /**
          * Check for newly added attributes
          * @returns {Boolean}
@@ -445,20 +466,20 @@ define([
          * @returns {Boolean}
          */
         addNewAttributeSetHandler: function () {
-            var choosenAttributeSetOption;
+            var chosenAttributeSetOption;
 
             this.formElement().validate();
 
             if (this.formElement().source.get('params.invalid') === false) {
-                choosenAttributeSetOption = this.attributeSetSelection;
+                chosenAttributeSetOption = this.attributeSetSelection;
 
-                if (choosenAttributeSetOption === 'new') {
+                if (chosenAttributeSetOption === 'new') {
                     this.createNewAttributeSet();
 
                     return false;
                 }
 
-                if (choosenAttributeSetOption === 'existing') {
+                if (chosenAttributeSetOption === 'existing') {
                     this.set(
                         'skeletonAttributeSet',
                         this.attributeSetId
@@ -469,6 +490,10 @@ define([
 
                 return true;
             }
+
+            this.unserializeData();
+
+            return false;
         },
 
         /**
@@ -492,7 +517,7 @@ define([
                 dataType: 'json',
                 showLoader: true,
                 context: this
-            }).success(function (data) {
+            }).done(function (data) {
                 if (!data.error) {
                     this.set(
                         'skeletonAttributeSet',
@@ -507,7 +532,7 @@ define([
                 }
 
                 return false;
-            }).error(function (xhr) {
+            }).fail(function (xhr) {
                 if (xhr.statusText === 'abort') {
                     return;
                 }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/cell-sku.html b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/cell-sku.html
new file mode 100644
index 0000000000000..fcd4e3b74442b
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/cell-sku.html
@@ -0,0 +1,13 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="control-table-text">
+    <span attr="'data-index': index" data-bind="
+        text: value,
+        css: {_disabled: disabled}
+    ">
+    </span>
+</div>
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
index 98abb906f69d6..f020e4c2c9495 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
@@ -19,16 +19,20 @@ $finalPriceModel = $block->getPriceType('final_price');
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 $schema = ($block->getZone() == 'item_view') ? true : false;
 ?>
+<span class="normal-price">
+    <?php
+    $arguments = [
+        'display_label' => __('As low as'),
+        'price_id' => $block->getPriceId('product-price-' . $idSuffix),
+        'price_type' => 'finalPrice',
+        'include_container' => true,
+        'schema' => $schema,
+    ];
+    /* @noEscape */ echo $block->renderAmount($finalPriceModel->getAmount(), $arguments);
+    ?>
+</span>
+
 <?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
-    <span class="special-price">
-        <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
-            'display_label'     => __('Special Price'),
-            'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-            'price_type'        => 'finalPrice',
-            'include_container' => true,
-            'schema' => $schema
-        ]); ?>
-    </span>
     <span class="old-price sly-old-price no-display">
         <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
             'display_label'     => __('Regular Price'),
@@ -38,13 +42,6 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
             'skip_adjustments'  => true
         ]); ?>
     </span>
-<?php else: ?>
-    <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
-        'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-        'price_type'        => 'finalPrice',
-        'include_container' => true,
-        'schema' => $schema
-    ]); ?>
 <?php endif; ?>
 
 <?php if ($block->showMinimalPrice()): ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
index 18f96cfaaf398..325ee1d5d79b3 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
@@ -15,10 +15,13 @@
                 + '</span>'
             + '</span>'; %>
         <li class="item">
-            <%= $t('Buy %1 for %2 each and').replace('%1', item.qty).replace('%2', priceStr) %>
-                <strong class="benefit">
-                        <%= $t('save') %><span class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
-                </strong>
+            <%= '<?= $block->escapeHtml(__('Buy %1 for %2 each and', '%1', '%2')) ?>'
+            .replace('%1', item.qty)
+            .replace('%2', priceStr) %>
+            <strong class="benefit">
+                <?= $block->escapeHtml(__('save')) ?><span
+                        class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
+            </strong>
         </li>
         <% }); %>
     </ul>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
index 9b8e2c0c8c0bd..f5ed067967547 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
@@ -38,6 +38,9 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
                     "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                         'Magento_ConfigurableProduct') ?: 'replace'; ?>"
                 }
+            },
+            "*" : {
+                "Magento_ConfigurableProduct/js/catalog-add-to-cart": {}
             }
         }
     </script>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js
new file mode 100644
index 0000000000000..3e6a611c268af
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * Add selected configurable attributes to redirect url
+     *
+     * @see Magento_Catalog/js/catalog-add-to-cart
+     */
+    $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
+        $(data.form).find('select[name*="super"]').each(function (index, item) {
+            data.redirectParameters.push(item.config.id + '=' + $(item).val());
+        });
+    });
+});
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 545887d04c965..6357bbd6c7c0c 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -32,6 +32,7 @@ define([
             mediaGallerySelector: '[data-gallery-role=gallery-placeholder]',
             mediaGalleryInitial: null,
             slyOldPriceSelector: '.sly-old-price',
+            normalPriceLabelSelector: '.normal-price .price-label',
 
             /**
              * Defines the mechanism of how images of a gallery should be
@@ -269,6 +270,7 @@ define([
             this._reloadPrice();
             this._displayRegularPriceBlock(this.simpleProduct);
             this._displayTierPriceBlock(this.simpleProduct);
+            this._displayNormalPriceLabel();
             this._changeProductImage();
         },
 
@@ -289,6 +291,8 @@ define([
             images = this.options.spConfig.images[this.simpleProduct];
 
             if (images) {
+                images = this._sortImages(images);
+
                 if (this.options.gallerySwitchStrategy === 'prepend') {
                     images = images.concat(initialImages);
                 }
@@ -307,7 +311,17 @@ define([
                 $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
             }
 
-            galleryObject.first();
+        },
+
+        /**
+         * Sorting images array
+         *
+         * @private
+         */
+        _sortImages: function (images) {
+            return _.sortBy(images, function (image) {
+                return image.position;
+            });
         },
 
         /**
@@ -358,7 +372,11 @@ define([
                 index = 1,
                 allowedProducts,
                 i,
-                j;
+                j,
+                basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount),
+                optionFinalPrice,
+                optionPriceDiff,
+                optionPrices = this.options.spConfig.optionPrices;
 
             this._clearSelect(element);
             element.options[0] = new Option('', '');
@@ -372,6 +390,7 @@ define([
             if (options) {
                 for (i = 0; i < options.length; i++) {
                     allowedProducts = [];
+                    optionPriceDiff = 0;
 
                     /* eslint-disable max-depth */
                     if (prevConfig) {
@@ -385,6 +404,20 @@ define([
                         }
                     } else {
                         allowedProducts = options[i].products.slice(0);
+
+                        if (typeof allowedProducts[0] !== 'undefined' &&
+                            typeof optionPrices[allowedProducts[0]] !== 'undefined') {
+
+                            optionFinalPrice = parseFloat(optionPrices[allowedProducts[0]].finalPrice.amount);
+                            optionPriceDiff = optionFinalPrice - basePrice;
+
+                            if (optionPriceDiff !== 0) {
+                                options[i].label = options[i].label + ' ' + priceUtils.formatPrice(
+                                    optionPriceDiff,
+                                    this.options.priceFormat,
+                                    true);
+                            }
+                        }
                     }
 
                     if (allowedProducts.length > 0) {
@@ -392,7 +425,7 @@ define([
                         element.options[index] = new Option(this._getOptionLabel(options[i]), options[i].id);
 
                         if (typeof options[i].price !== 'undefined') {
-                            element.options[index].setAttribute('price', options[i].prices);
+                            element.options[index].setAttribute('price', options[i].price);
                         }
 
                         element.options[index].config = options[i];
@@ -456,7 +489,9 @@ define([
         _getPrices: function () {
             var prices = {},
                 elements = _.toArray(this.options.settings),
-                hasProductPrice = false;
+                hasProductPrice = false,
+                optionPriceDiff = 0,
+                allowedProduct, optionPrices, basePrice, optionFinalPrice;
 
             _.each(elements, function (element) {
                 var selected = element.options[element.selectedIndex],
@@ -464,8 +499,23 @@ define([
                     priceValue = {};
 
                 if (config && config.allowedProducts.length === 1 && !hasProductPrice) {
+                    prices = {};
                     priceValue = this._calculatePrice(config);
                     hasProductPrice = true;
+                } else if (element.value) {
+                    allowedProduct = this._getAllowedProductWithMinPrice(config.allowedProducts);
+                    optionPrices = this.options.spConfig.optionPrices;
+                    basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount);
+
+                    if (!_.isEmpty(allowedProduct)) {
+                        optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
+                        optionPriceDiff = optionFinalPrice - basePrice;
+                    }
+
+                    if (optionPriceDiff !== 0) {
+                        prices = {};
+                        priceValue = this._calculatePriceDifference(allowedProduct);
+                    }
                 }
 
                 prices[element.attributeId] = priceValue;
@@ -474,6 +524,55 @@ define([
             return prices;
         },
 
+        /**
+         * Get product with minimum price from selected options.
+         *
+         * @param {Array} allowedProducts
+         * @returns {String}
+         * @private
+         */
+        _getAllowedProductWithMinPrice: function (allowedProducts) {
+            var optionPrices = this.options.spConfig.optionPrices,
+                product = {},
+                optionMinPrice, optionFinalPrice;
+
+            _.each(allowedProducts, function (allowedProduct) {
+                optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
+
+                if (_.isEmpty(product)) {
+                    optionMinPrice = optionFinalPrice;
+                    product = allowedProduct;
+                }
+
+                if (optionFinalPrice < optionMinPrice) {
+                    product = allowedProduct;
+                }
+            }, this);
+
+            return product;
+        },
+
+        /**
+         * Calculate price difference for allowed product
+         *
+         * @param {*} allowedProduct - Product
+         * @returns {*}
+         * @private
+         */
+        _calculatePriceDifference: function (allowedProduct) {
+            var displayPrices = $(this.options.priceHolderSelector).priceBox('option').prices,
+                newPrices = this.options.spConfig.optionPrices[allowedProduct];
+
+            _.each(displayPrices, function (price, code) {
+
+                if (newPrices[code]) {
+                    displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
+                }
+            });
+
+            return displayPrices;
+        },
+
         /**
          * Returns prices for configured products
          *
@@ -527,8 +626,16 @@ define([
          * @private
          */
         _displayRegularPriceBlock: function (optionId) {
-            if (typeof optionId != 'undefined' &&
-                this.options.spConfig.optionPrices[optionId].oldPrice.amount != //eslint-disable-line eqeqeq
+            var shouldBeShown = true;
+
+            _.each(this.options.settings, function (element) {
+                if (element.value === '') {
+                    shouldBeShown = false;
+                }
+            });
+
+            if (shouldBeShown &&
+                this.options.spConfig.optionPrices[optionId].oldPrice.amount !==
                 this.options.spConfig.optionPrices[optionId].finalPrice.amount
             ) {
                 $(this.options.slyOldPriceSelector).show();
@@ -537,6 +644,27 @@ define([
             }
         },
 
+        /**
+         * Show or hide normal price label
+         *
+         * @private
+         */
+        _displayNormalPriceLabel: function () {
+            var shouldBeShown = false;
+
+            _.each(this.options.settings, function (element) {
+                if (element.value === '') {
+                    shouldBeShown = true;
+                }
+            });
+
+            if (shouldBeShown) {
+                $(this.options.normalPriceLabelSelector).show();
+            } else {
+                $(this.options.normalPriceLabelSelector).hide();
+            }
+        },
+
         /**
          * Callback which fired after gallery gets initialized.
          *
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/options-updater.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/options-updater.js
index 64aefc27dc080..558a1fdf31085 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/options-updater.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/options-updater.js
@@ -1,15 +1,18 @@
 define([
     'jquery',
+    'underscore',
     'Magento_Customer/js/customer-data'
-], function ($, customerData) {
+], function ($, _, customerData) {
     'use strict';
 
     var selectors = {
         formSelector: '#product_addtocart_form',
-        productIdSelector: '#product_addtocart_form [name="product"]'
+        productIdSelector: '#product_addtocart_form [name="product"]',
+        itemIdSelector: '#product_addtocart_form [name="item"]'
     },
     cartData = customerData.get('cart'),
     productId = $(selectors.productIdSelector).val(),
+    itemId = $(selectors.itemIdSelector).val(),
 
     /**
     * set productOptions according to cart data from customer-data
@@ -23,8 +26,10 @@ define([
         if (!(data && data.items && data.items.length && productId)) {
             return false;
         }
-        changedProductOptions = data.items.find(function (item) {
-            return item['product_id'] === productId;
+        changedProductOptions = _.find(data.items, function (item) {
+            if (item['item_id'] === itemId) {
+                return item['product_id'] === productId;
+            }
         });
         changedProductOptions = changedProductOptions && changedProductOptions.options &&
             changedProductOptions.options.reduce(function (obj, val) {
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
new file mode 100644
index 0000000000000..aae39800cdd30
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ConfigurableProductTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['type_id']) && $data['type_id'] == 'configurable') {
+            return 'ConfigurableProduct';
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
new file mode 100644
index 0000000000000..90ed5cf54892d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Options;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
+    as AttributeCollection;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * Collection for fetching options for all configurable options pulled back in result set.
+ */
+class Collection
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $attributeCollectionFactory;
+
+    /**
+     * @var ProductFactory
+     */
+    private $productFactory;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var int[]
+     */
+    private $productIds = [];
+
+    /**
+     * @var array
+     */
+    private $attributeMap = [];
+
+    /**
+     * @param CollectionFactory $attributeCollectionFactory
+     * @param ProductFactory $productFactory
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        CollectionFactory $attributeCollectionFactory,
+        ProductFactory $productFactory,
+        MetadataPool $metadataPool
+    ) {
+        $this->attributeCollectionFactory = $attributeCollectionFactory;
+        $this->productFactory = $productFactory;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Add product id to attribute collection filter.
+     *
+     * @param int $productId
+     */
+    public function addProductId(int $productId) : void
+    {
+        if (!in_array($productId, $this->productIds)) {
+            $this->productIds[] = $productId;
+        }
+    }
+
+    /**
+     * Retrieve attributes for given product id or empty array
+     *
+     * @param int $productId
+     * @return array
+     */
+    public function getAttributesByProductId(int $productId) : array
+    {
+        $attributes = $this->fetch();
+
+        if (!isset($attributes[$productId])) {
+            return [];
+        }
+
+        return $attributes[$productId];
+    }
+
+    /**
+     * Fetch attribute data
+     *
+     * @return array
+     */
+    private function fetch() : array
+    {
+        if (empty($this->productIds) || !empty($this->attributeMap)) {
+            return $this->attributeMap;
+        }
+
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        /** @var AttributeCollection $attributeCollection */
+        $attributeCollection = $this->attributeCollectionFactory->create();
+        foreach ($this->productIds as $id) {
+            /** @var Product $product */
+            $product = $this->productFactory->create();
+            $product->setData($linkField, $id);
+            $attributeCollection->setProductFilter($product);
+        }
+
+        /** @var Attribute $attribute */
+        foreach ($attributeCollection->getItems() as $attribute) {
+            $productId = (int)$attribute->getProductId();
+            if (!isset($this->attributeMap[$productId])) {
+                $this->attributeMap[$productId] = [];
+            }
+
+            $attributeData = $attribute->getData();
+            $this->attributeMap[$productId][$attribute->getId()] = $attribute->getData();
+            $this->attributeMap[$productId][$attribute->getId()]['id'] = $attribute->getId();
+            $this->attributeMap[$productId][$attribute->getId()]['attribute_code']
+                = $attribute->getProductAttribute()->getAttributeCode();
+            $this->attributeMap[$productId][$attribute->getId()]['values'] = $attributeData['options'];
+        }
+
+        return $this->attributeMap;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
new file mode 100644
index 0000000000000..a6e39f693b0e5
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Attributes\Collection as AttributeCollection;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
+use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
+use Magento\ConfigurableProductGraphQl\Model\Variant\Collection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class ConfigurableVariant implements ResolverInterface
+{
+    /**
+     * @var Collection
+     */
+    private $variantCollection;
+
+    /**
+     * @var OptionCollection
+     */
+    private $optionCollection;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var AttributeCollection
+     */
+    private $attributeCollection;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param Collection $variantCollection
+     * @param OptionCollection $optionCollection
+     * @param ValueFactory $valueFactory
+     * @param AttributeCollection $attributeCollection
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        Collection $variantCollection,
+        OptionCollection $optionCollection,
+        ValueFactory $valueFactory,
+        AttributeCollection $attributeCollection,
+        MetadataPool $metadataPool
+    ) {
+        $this->variantCollection = $variantCollection;
+        $this->optionCollection = $optionCollection;
+        $this->valueFactory = $valueFactory;
+        $this->attributeCollection = $attributeCollection;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Fetch and format configurable variants.
+     *
+     * {@inheritDoc}
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        if ($value['type_id'] !== Type::TYPE_CODE || !isset($value[$linkField])) {
+            $result = function () {
+                return null;
+            };
+            return $this->valueFactory->create($result);
+        }
+
+        $this->variantCollection->addParentId((int)$value[$linkField]);
+        $fields = $this->getProductFields($info);
+        $matchedFields = $this->attributeCollection->getRequestAttributes($fields);
+        $this->variantCollection->addEavAttributes($matchedFields);
+        $this->optionCollection->addProductId((int)$value[$linkField]);
+
+        $result = function () use ($value, $linkField) {
+            $children = $this->variantCollection->getChildProductsByParentId((int)$value[$linkField]);
+            $options = $this->optionCollection->getAttributesByProductId((int)$value[$linkField]);
+            $variants = [];
+            /** @var Product $child */
+            foreach ($children as $key => $child) {
+                $variants[$key] = ['sku' => $child['sku'], 'product' => $child, 'options' => $options];
+            }
+
+            return $variants;
+        };
+
+        return $this->valueFactory->create($result);
+    }
+
+    /**
+     * Return field names for all requested product fields.
+     *
+     * @param ResolveInfo $info
+     * @return string[]
+     */
+    private function getProductFields(ResolveInfo $info)
+    {
+        $fieldNames = [];
+        foreach ($info->fieldNodes as $node) {
+            if ($node->name->value !== 'product') {
+                continue;
+            }
+
+            foreach ($node->selectionSet->selections as $selectionNode) {
+                $fieldNames[] = $selectionNode->name->value;
+            }
+        }
+
+        return $fieldNames;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php
new file mode 100644
index 0000000000000..aa7ed6f55254c
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Options.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
+use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class Options implements ResolverInterface
+{
+    /**
+     * @var OptionCollection
+     */
+    private $optionCollection;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param OptionCollection $optionCollection
+     * @param ValueFactory $valueFactory
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        OptionCollection $optionCollection,
+        ValueFactory $valueFactory,
+        MetadataPool $metadataPool
+    ) {
+        $this->optionCollection = $optionCollection;
+        $this->valueFactory = $valueFactory;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Fetch and format configurable variants.
+     *
+     * {@inheritdoc}
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        if ($value['type_id'] !== Type::TYPE_CODE || !isset($value[$linkField])) {
+            $result = function () {
+                return null;
+            };
+            return $this->valueFactory->create($result);
+        }
+
+        $this->optionCollection->addProductId((int)$value[$linkField]);
+
+        $result = function () use ($value, $linkField) {
+            return $this->optionCollection->getAttributesByProductId((int)$value[$linkField]);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
new file mode 100644
index 0000000000000..658e898f09f81
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Variant;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Format a product's option information to conform to GraphQL schema representation
+ */
+class Attributes implements ResolverInterface
+{
+    /**
+     * Format product's option data to conform to GraphQL schema
+     *
+     * {@inheritdoc}
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['options']) || !isset($value['product'])) {
+            return null;
+        }
+
+        $data = [];
+        foreach ($value['options'] as $option) {
+            $code = $option['attribute_code'];
+            if (!isset($value['product'][$code])) {
+                continue;
+            }
+
+            foreach ($option['values'] as $optionValue) {
+                if ($optionValue['value_index'] != $value['product'][$code]) {
+                    continue;
+                }
+                $data[] = [
+                    'label' => $optionValue['label'],
+                    'code' => $code,
+                    'use_default_value' => $optionValue['use_default_value'],
+                    'value_index' => $optionValue['value_index']
+                ];
+            }
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
new file mode 100644
index 0000000000000..0d86e16574395
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Variant;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ChildCollection;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as DataProvider;
+
+/**
+ * Collection for fetching configurable child product data.
+ */
+class Collection
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $childCollectionFactory;
+
+    /**
+     * @var ProductFactory
+     */
+    private $productFactory;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var DataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var int[]
+     */
+    private $parentIds = [];
+
+    /**
+     * @var array
+     */
+    private $childrenMap = [];
+
+    /**
+     * @var string[]
+     */
+    private $attributeCodes = [];
+
+    /**
+     * @param CollectionFactory $childCollectionFactory
+     * @param ProductFactory $productFactory
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param DataProvider $productDataProvider
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        CollectionFactory $childCollectionFactory,
+        ProductFactory $productFactory,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        DataProvider $productDataProvider,
+        MetadataPool $metadataPool
+    ) {
+        $this->childCollectionFactory = $childCollectionFactory;
+        $this->productFactory = $productFactory;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->productDataProvider = $productDataProvider;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Add parent Id to collection filter
+     *
+     * @param int $id
+     * @return void
+     */
+    public function addParentId(int $id) : void
+    {
+        if (!in_array($id, $this->parentIds) && !empty($this->childrenMap)) {
+            $this->childrenMap = [];
+            $this->parentIds[] = $id;
+        } elseif (!in_array($id, $this->parentIds)) {
+            $this->parentIds[] = $id;
+        }
+    }
+
+    /**
+     * Add attributes to collection filter
+     *
+     * @param array $attributeCodes
+     * @return void
+     */
+    public function addEavAttributes(array $attributeCodes) : void
+    {
+        $this->attributeCodes = array_replace($this->attributeCodes, $attributeCodes);
+    }
+
+    /**
+     * Retrieve child products from for passed in parent id.
+     *
+     * @param int $id
+     * @return array
+     */
+    public function getChildProductsByParentId(int $id) : array
+    {
+        $childrenMap = $this->fetch();
+
+        if (!isset($childrenMap[$id])) {
+            return [];
+        }
+
+        return $childrenMap[$id];
+    }
+
+    /**
+     * Fetch all children products from parent id's.
+     *
+     * @return array
+     */
+    private function fetch() : array
+    {
+        if (empty($this->parentIds) || !empty($this->childrenMap)) {
+            return $this->childrenMap;
+        }
+
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        foreach ($this->parentIds as $id) {
+            /** @var ChildCollection $childCollection */
+            $childCollection = $this->childCollectionFactory->create();
+            /** @var Product $product */
+            $product = $this->productFactory->create();
+            $product->setData($linkField, $id);
+            $childCollection->setProductFilter($product);
+
+            /** @var Product $childProduct */
+            foreach ($childCollection->getItems() as $childProduct) {
+                $formattedChild = ['model' => $childProduct, 'sku' => $childProduct->getSku()];
+                $parentId = (int)$childProduct->getParentId();
+                if (!isset($this->childrenMap[$parentId])) {
+                    $this->childrenMap[$parentId] = [];
+                }
+
+                $this->childrenMap[$parentId][] = $formattedChild;
+            }
+        }
+
+        return $this->childrenMap;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/README.md b/app/code/Magento/ConfigurableProductGraphQl/README.md
new file mode 100644
index 0000000000000..0a4f92887f5b2
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/README.md
@@ -0,0 +1,4 @@
+# ConfigurableProductGraphQl
+
+**ConfigurableProductGraphQl** provides type and resolver information for the GraphQl module
+to generate configurable product information.
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md b/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..4204eeb6a0874
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Product Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Configurable Product Graph Ql** module.
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
new file mode 100644
index 0000000000000..a22df27734b76
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/module-configurable-product-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-catalog": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/framework": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\ConfigurableProductGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..f9d3c8b769795
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\CatalogGraphQl\Model\ProductInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="productTypeNameResolvers" xsi:type="array">
+                <item name="configurable_product_type_resolver" xsi:type="object">Magento\ConfigurableProductGraphQl\Model\ConfigurableProductTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="configurable" xsi:type="string">ConfigurableProduct</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..98e7957d0af8e
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_ConfigurableProductGraphQl" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_ConfigurableProduct"/>
+            <module name="Magento_GraphQl"/>
+            <module name="Magento_CatalogGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..267a94a1d434e
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -0,0 +1,37 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type ConfigurableProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "ConfigurableProduct defines basic features of a configurable product and its simple product variants") {
+    variants: [ConfigurableVariant] @doc(description: "An array of variants of products") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableVariant")
+    configurable_options: [ConfigurableProductOptions] @doc(description: "An array of linked simple product items") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Options")
+}
+
+type ConfigurableVariant @doc(description: "An array containing all the simple product variants of a configurable product") {
+    attributes: [ConfigurableAttributeOption] @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes")  @doc(description: "")
+    product: SimpleProduct @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
+}
+
+type ConfigurableAttributeOption @doc(description: "ConfigurableAttributeOption contains the value_index (and other related information) assigned to a configurable product option") {
+    label: String @doc(description: "A string that describes the configurable attribute option")
+    code: String @doc(description: "The ID assigned to the attribute")
+    value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
+}
+
+type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions defines configurable attributes for the specified product") {
+    id: Int @doc(description: "The configurable option ID number assigned by the system")
+    attribute_id: String @doc(description: "The ID assigned to the attribute")
+    attribute_code: String @doc(description: "A string that identifies the attribute")
+    label: String @doc(description: "A string that describes the configurable product option, which is displayed on the UI")
+    position: Int @doc(description: "A number that indicates the order in which the attribute is displayed")
+    use_default: Boolean @doc(description: "Indicates whether the option is the default")
+    values: [ConfigurableProductOptionsValues] @doc(description: "An array that defines the value_index codes assigned to the configurable product")
+    product_id: Int @doc(description: "This is the same as a product's id field")
+}
+
+type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOptionsValues contains the index number assigned to a configurable product option") {
+    value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
+    label: String @doc(description: "The label of the product")
+    default_label: String @doc(description: "The label of the product on the default store")
+    store_label: String @doc(description: "The label of the product on the current store")
+    use_default_value: Boolean @doc(description: "Indicates whether to use the default_label")
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/registration.php b/app/code/Magento/ConfigurableProductGraphQl/registration.php
new file mode 100644
index 0000000000000..e75f3121cfce2
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ConfigurableProductGraphQl', __DIR__);
diff --git a/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php b/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
index dceb5767edae9..8ef1e24125981 100644
--- a/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
+++ b/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
@@ -5,11 +5,12 @@
  */
 namespace Magento\ConfigurableProductSales\Model\Order\Reorder;
 
-use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityCheckerInterface;
-use Magento\Sales\Model\Order\Item;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Sales\Model\Order\Item;
+use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityCheckerInterface;
 use Magento\Store\Model\Store;
 
 /**
@@ -27,16 +28,24 @@ class OrderedProductAvailabilityChecker implements OrderedProductAvailabilityChe
      */
     private $metadataPool;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @param ResourceConnection $resourceConnection
      * @param MetadataPool $metadataPool
+     * @param ProductRepositoryInterface $productRepository
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool,
+        ProductRepositoryInterface $productRepository
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->metadataPool = $metadataPool;
+        $this->productRepository = $productRepository;
     }
 
     /**
@@ -45,10 +54,12 @@ public function __construct(
     public function isAvailable(Item $item)
     {
         $buyRequest = $item->getBuyRequest();
-        $superAttribute = $buyRequest->getData()['super_attribute'];
+        $superAttribute = $buyRequest->getData()['super_attribute'] ?? [];
         $connection = $this->getConnection();
         $select = $connection->select();
-        $orderItemParentId = $item->getParentItem()->getProductId();
+        $linkField = $this->getMetadata()->getLinkField();
+        $parentItem = $this->productRepository->getById($item->getParentItem()->getProductId());
+        $orderItemParentId = $parentItem->getData($linkField);
         $select->from(
             ['cpe' => $this->resourceConnection->getTableName('catalog_product_entity')],
             ['cpe.entity_id']
@@ -67,7 +78,7 @@ public function isAvailable(Item $item)
                 ['cpid' . $attributeId => $this->resourceConnection->getTableName('catalog_product_entity_int')],
                 sprintf(
                     'cpe.%1$s = cpid%2$d.%1$s AND cpid%2$d.attribute_id = %2$d AND cpid%2$d.store_id = %3$d',
-                    $this->getMetadata()->getLinkField(),
+                    $linkField,
                     $attributeId,
                     Store::DEFAULT_STORE_ID
                 ),
@@ -77,7 +88,7 @@ public function isAvailable(Item $item)
                     ['cpis' . $attributeId => $this->resourceConnection->getTableName('catalog_product_entity_int')],
                     sprintf(
                         'cpe.%1$s = cpis%2$d.%1$s AND cpis%2$d.attribute_id = %2$d AND cpis%2$d.store_id = %3$d',
-                        $this->getMetadata()->getLinkField(),
+                        $linkField,
                         $attributeId,
                         $item->getStoreId()
                     ),
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE.txt b/app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE.txt
rename to app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE_AFL.txt b/app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE_AFL.txt
rename to app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md b/app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md
new file mode 100644
index 0000000000000..944286966a7ad
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Product Sales Functional Tests
+
+The Functional Test Module for **Magento Configurable Product Sales** module.
diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index 4a1d4732b9967..2a106b3abc75a 100644
--- a/app/code/Magento/ConfigurableProductSales/composer.json
+++ b/app/code/Magento/ConfigurableProductSales/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-configurable-product": "100.3.*"
+        "magento/module-configurable-product": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProductSales/etc/module.xml b/app/code/Magento/ConfigurableProductSales/etc/module.xml
index 4da83c9c0269b..bf5bc4472c8b2 100644
--- a/app/code/Magento/ConfigurableProductSales/etc/module.xml
+++ b/app/code/Magento/ConfigurableProductSales/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ConfigurableProductSales" setup_version="2.2.0">
+    <module name="Magento_ConfigurableProductSales" >
         <sequence>
             <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_Sales"/>
diff --git a/app/code/Magento/Contact/Controller/Index/Index.php b/app/code/Magento/Contact/Controller/Index/Index.php
index 4b734c4f9b610..562b077087241 100644
--- a/app/code/Magento/Contact/Controller/Index/Index.php
+++ b/app/code/Magento/Contact/Controller/Index/Index.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Contact\Controller\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Index extends \Magento\Contact\Controller\Index
+class Index extends \Magento\Contact\Controller\Index implements HttpGetActionInterface
 {
     /**
      * Show Contact Us page
diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
index 3374ff1fa5cf4..cbe49a767262c 100644
--- a/app/code/Magento/Contact/Controller/Index/Post.php
+++ b/app/code/Magento/Contact/Controller/Index/Post.php
@@ -4,19 +4,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Contact\Controller\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Contact\Model\ConfigInterface;
 use Magento\Contact\Model\MailInterface;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 
-class Post extends \Magento\Contact\Controller\Index
+class Post extends \Magento\Contact\Controller\Index implements HttpPostActionInterface
 {
     /**
      * @var DataPersistorInterface
@@ -56,7 +58,7 @@ public function __construct(
         $this->context = $context;
         $this->mail = $mail;
         $this->dataPersistor = $dataPersistor;
-        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()->get(LoggerInterface::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -66,60 +68,38 @@ public function __construct(
      */
     public function execute()
     {
-        if (!$this->isPostRequest()) {
+        if (!$this->getRequest()->isPost()) {
             return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
         try {
             $this->sendEmail($this->validatedParams());
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('Thanks for contacting us with your comments and questions. We\'ll respond to you very soon.')
             );
-            $this->getDataPersistor()->clear('contact_us');
+            $this->dataPersistor->clear('contact_us');
         } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
-            $this->getDataPersistor()->set('contact_us', $this->getRequest()->getParams());
+            $this->dataPersistor->set('contact_us', $this->getRequest()->getParams());
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $this->messageManager->addErrorMessage(
                 __('An error occurred while processing your form. Please try again later.')
             );
-            $this->getDataPersistor()->set('contact_us', $this->getRequest()->getParams());
+            $this->dataPersistor->set('contact_us', $this->getRequest()->getParams());
         }
         return $this->resultRedirectFactory->create()->setPath('contact/index');
     }
 
-    /**
-     * Get Data Persistor
-     *
-     * @return DataPersistorInterface
-     */
-    private function getDataPersistor()
-    {
-        if ($this->dataPersistor === null) {
-            $this->dataPersistor = ObjectManager::getInstance()
-                ->get(DataPersistorInterface::class);
-        }
-
-        return $this->dataPersistor;
-    }
-
     /**
      * @param array $post Post data from contact form
      * @return void
      */
     private function sendEmail($post)
     {
-        $this->mail->send($post['email'], ['data' => new \Magento\Framework\DataObject($post)]);
-    }
-
-    /**
-     * @return bool
-     */
-    private function isPostRequest()
-    {
-        /** @var Request $request */
-        $request = $this->getRequest();
-        return !empty($request->getPostValue());
+        $this->mail->send(
+            $post['email'],
+            ['data' => new DataObject($post)]
+        );
     }
 
     /**
@@ -130,13 +110,13 @@ private function validatedParams()
     {
         $request = $this->getRequest();
         if (trim($request->getParam('name')) === '') {
-            throw new LocalizedException(__('Name is missing'));
+            throw new LocalizedException(__('Enter the Name and try again.'));
         }
         if (trim($request->getParam('comment')) === '') {
-            throw new LocalizedException(__('Comment is missing'));
+            throw new LocalizedException(__('Enter the comment and try again.'));
         }
         if (false === \strpos($request->getParam('email'), '@')) {
-            throw new LocalizedException(__('Invalid email address'));
+            throw new LocalizedException(__('The email address is invalid. Verify the email address and try again.'));
         }
         if (trim($request->getParam('hideit')) !== '') {
             throw new \Exception();
diff --git a/app/code/Magento/Contact/Model/Mail.php b/app/code/Magento/Contact/Model/Mail.php
index d63efbbca573b..43c1974252b5a 100644
--- a/app/code/Magento/Contact/Model/Mail.php
+++ b/app/code/Magento/Contact/Model/Mail.php
@@ -6,9 +6,10 @@
 namespace Magento\Contact\Model;
 
 use Magento\Framework\Mail\Template\TransportBuilder;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Translate\Inline\StateInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Area;
 
 class Mail implements MailInterface
 {
@@ -49,8 +50,7 @@ public function __construct(
         $this->contactsConfig = $contactsConfig;
         $this->transportBuilder = $transportBuilder;
         $this->inlineTranslation = $inlineTranslation;
-        $this->storeManager = $storeManager ?:
-            ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -71,7 +71,7 @@ public function send($replyTo, array $variables)
                 ->setTemplateIdentifier($this->contactsConfig->emailTemplate())
                 ->setTemplateOptions(
                     [
-                        'area' => 'frontend',
+                        'area' => Area::AREA_FRONTEND,
                         'store' => $this->storeManager->getStore()->getId()
                     ]
                 )
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE.txt b/app/code/Magento/Contact/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE.txt
rename to app/code/Magento/Contact/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE_AFL.txt b/app/code/Magento/Contact/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE_AFL.txt
rename to app/code/Magento/Contact/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Contact/Test/Mftf/README.md b/app/code/Magento/Contact/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e2f9a58f72089
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Contact Functional Tests
+
+The Functional Test Module for **Magento Contact** module.
diff --git a/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php b/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php
index 0e1ddf21c2a08..e5b7f53ecb26b 100644
--- a/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php
+++ b/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php
@@ -65,6 +65,9 @@ class PostTest extends \PHPUnit\Framework\TestCase
      */
     private $mailMock;
 
+    /**
+     * test setup
+     */
     protected function setUp()
     {
         $this->mailMock = $this->getMockBuilder(MailInterface::class)->getMockForAbstractClass();
@@ -78,7 +81,7 @@ protected function setUp()
             $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
         $this->requestStub = $this->createPartialMock(
             \Magento\Framework\App\Request\Http::class,
-            ['getPostValue', 'getParams', 'getParam']
+            ['getPostValue', 'getParams', 'getParam', 'isPost']
         );
         $this->redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
         $this->redirectResultMock->method('setPath')->willReturnSelf();
@@ -120,6 +123,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecuteEmptyPost
+     */
     public function testExecuteEmptyPost()
     {
         $this->stubRequestPostData([]);
@@ -127,6 +133,8 @@ public function testExecuteEmptyPost()
     }
 
     /**
+     * @param array $postData
+     * @param bool $exceptionExpected
      * @dataProvider postDataProvider
      */
     public function testExecutePostValidation($postData, $exceptionExpected)
@@ -144,6 +152,9 @@ public function testExecutePostValidation($postData, $exceptionExpected)
         $this->controller->execute();
     }
 
+    /**
+     * @return array
+     */
     public function postDataProvider()
     {
         return [
@@ -156,6 +167,9 @@ public function postDataProvider()
         ];
     }
 
+    /**
+     * testExecuteValidPost
+     */
     public function testExecuteValidPost()
     {
         $post = ['name' => 'Name', 'comment' => 'Comment', 'email' => 'valid@mail.com', 'hideit' => null];
@@ -174,6 +188,10 @@ public function testExecuteValidPost()
      */
     private function stubRequestPostData($post)
     {
+        $this->requestStub
+             ->expects($this->once())
+             ->method('isPost')
+             ->willReturn(!empty($post));
         $this->requestStub->method('getPostValue')->willReturn($post);
         $this->requestStub->method('getParams')->willReturn($post);
         $this->requestStub->method('getParam')->willReturnCallback(
diff --git a/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php b/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php
index a238daafaafaf..cabcebda061f9 100644
--- a/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php
+++ b/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php
@@ -8,6 +8,9 @@
 
 class IndexStub extends \Magento\Contact\Controller\Index
 {
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
+     */
     public function execute()
     {
         // Empty method stub for test
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 688089adaae1e..b45132d0a360b 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Contact/etc/module.xml b/app/code/Magento/Contact/etc/module.xml
index ec91859ee2c8d..64ba1c1fb0f0d 100644
--- a/app/code/Magento/Contact/etc/module.xml
+++ b/app/code/Magento/Contact/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Contact" setup_version="2.0.0">
+    <module name="Magento_Contact" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Contact/view/frontend/email/submitted_form.html b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
index 1bce6159c586a..17146257aeff1 100644
--- a/app/code/Magento/Contact/view/frontend/email/submitted_form.html
+++ b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
@@ -16,19 +16,19 @@
 
 <table class="message-details">
     <tr>
-        <td><b>{{trans "Name"}}</b></td>
+        <td><strong>{{trans "Name"}}</strong></td>
         <td>{{var data.name}}</td>
     </tr>
     <tr>
-        <td><b>{{trans "Email"}}</b></td>
+        <td><strong>{{trans "Email"}}</strong></td>
         <td>{{var data.email}}</td>
     </tr>
     <tr>
-        <td><b>{{trans "Phone"}}</b></td>
+        <td><strong>{{trans "Phone"}}</strong></td>
         <td>{{var data.telephone}}</td>
     </tr>
 </table>
-<p><b>{{trans "Message"}}</b></p>
+<p><strong>{{trans "Message"}}</strong></p>
 <p>{{var data.comment}}</p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE.txt b/app/code/Magento/Cookie/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE.txt
rename to app/code/Magento/Cookie/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE_AFL.txt b/app/code/Magento/Cookie/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/Cookie/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Cookie/Test/Mftf/README.md b/app/code/Magento/Cookie/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c06fe5dcd60de
--- /dev/null
+++ b/app/code/Magento/Cookie/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cookie Functional Tests
+
+The Functional Test Module for **Magento Cookie** module.
diff --git a/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php b/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
index 5694f3f3cab56..62ce6baf6c101 100644
--- a/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
+++ b/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
@@ -79,6 +79,9 @@ public function testGetCookieRestrictionLifetime()
         $this->assertEquals($this->_object->getCookieRestrictionLifetime(), 60 * 60 * 24 * 365);
     }
 
+    /**
+     * @return $this
+     */
     protected function _initMock()
     {
         $scopeConfig = $this->_getConfigStub();
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 7b1c04461766a..58f28ad472120 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-backend": "100.3.*"
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cookie/etc/adminhtml/system.xml b/app/code/Magento/Cookie/etc/adminhtml/system.xml
index 26c963ddba76d..9790410969055 100644
--- a/app/code/Magento/Cookie/etc/adminhtml/system.xml
+++ b/app/code/Magento/Cookie/etc/adminhtml/system.xml
@@ -22,7 +22,7 @@
                     <label>Cookie Domain</label>
                     <backend_model>Magento\Cookie\Model\Config\Backend\Domain</backend_model>
                 </field>
-                <field id="cookie_httponly" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="cookie_httponly" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use HTTP Only</label>
                     <comment>
                         <![CDATA[<strong style="color:red">Warning</strong>:  Do not set to "No". User security could be compromised.]]>
diff --git a/app/code/Magento/Cookie/etc/module.xml b/app/code/Magento/Cookie/etc/module.xml
index 35c5a52f42ec7..df64e8b3ebfe8 100644
--- a/app/code/Magento/Cookie/etc/module.xml
+++ b/app/code/Magento/Cookie/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Cookie" setup_version="2.0.0"/>
+    <module name="Magento_Cookie" />
 </config>
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/notices.js b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
index 253950747ce14..f1f3754ea54b1 100644
--- a/app/code/Magento/Cookie/view/frontend/web/js/notices.js
+++ b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
@@ -29,7 +29,7 @@ define([
                 });
 
                 if ($.mage.cookies.get(this.options.cookieName)) {
-                    window.location.reload();
+                    this.element.hide();
                 } else {
                     window.location.href = this.options.noCookiesUrl;
                 }
diff --git a/app/code/Magento/Cron/Console/Command/CronCommand.php b/app/code/Magento/Cron/Console/Command/CronCommand.php
index 78bbb2329f8dc..142a9a397eb5f 100644
--- a/app/code/Magento/Cron/Console/Command/CronCommand.php
+++ b/app/code/Magento/Cron/Console/Command/CronCommand.php
@@ -10,10 +10,12 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
 use Magento\Cron\Observer\ProcessCronQueueObserver;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Shell\ComplexParameter;
 
@@ -35,13 +37,24 @@ class CronCommand extends Command
     private $objectManagerFactory;
 
     /**
-     * Constructor
+     * Application deployment configuration
      *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
      * @param ObjectManagerFactory $objectManagerFactory
+     * @param DeploymentConfig $deploymentConfig Application deployment configuration
      */
-    public function __construct(ObjectManagerFactory $objectManagerFactory)
-    {
+    public function __construct(
+        ObjectManagerFactory $objectManagerFactory,
+        DeploymentConfig $deploymentConfig = null
+    ) {
         $this->objectManagerFactory = $objectManagerFactory;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(
+            DeploymentConfig::class
+        );
         parent::__construct();
     }
 
@@ -71,10 +84,16 @@ protected function configure()
     }
 
     /**
+     * Runs cron jobs if cron is not disabled in Magento configurations
+     *
      * {@inheritdoc}
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (!$this->deploymentConfig->get('cron/enabled', 1)) {
+            $output->writeln('<info>' . 'Cron is disabled. Jobs were not run.' . '</info>');
+            return;
+        }
         $omParams = $_SERVER;
         $omParams[StoreManager::PARAM_RUN_CODE] = 'admin';
         $omParams[Store::CUSTOM_ENTRY_POINT_PARAM] = true;
diff --git a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
index 2fc0f0ab4c1a0..eeef291fb6ad1 100644
--- a/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
+++ b/app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Cron\Model\Config\Backend\Product;
 
+/**
+ * Cron job Alert configuration
+ */
 class Alert extends \Magento\Framework\App\Config\Value
 {
     /**
@@ -61,7 +64,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return $this
      * @throws \Exception
@@ -72,8 +75,8 @@ public function afterSave()
         $frequency = $this->getData('groups/productalert_cron/fields/frequency/value');
 
         $cronExprArray = [
-            intval($time[1]), //Minute
-            intval($time[0]), //Hour
+            (int)$time[1], //Minute
+            (int)$time[0], //Hour
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY ? '1' : '*', //Day of the Month
             '*', //Month of the Year
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY ? '1' : '*', //Day of the Week
diff --git a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
index 681129916647d..44ed4c001d23c 100644
--- a/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
+++ b/app/code/Magento/Cron/Model/Config/Backend/Sitemap.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Cron\Model\Config\Backend;
 
+/**
+ * Sitemap configuration
+ */
 class Sitemap extends \Magento\Framework\App\Config\Value
 {
     /**
@@ -61,6 +64,8 @@ public function __construct(
     }
 
     /**
+     * After save handler
+     *
      * @return $this
      * @throws \Exception
      */
@@ -70,8 +75,8 @@ public function afterSave()
         $frequency = $this->getData('groups/generate/fields/frequency/value');
 
         $cronExprArray = [
-            intval($time[1]), //Minute
-            intval($time[0]), //Hour
+            (int)$time[1], //Minute
+            (int)$time[0], //Hour
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY ? '1' : '*', //Day of the Month
             '*', //Month of the Year
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY ? '1' : '*', //# Day of the Week
diff --git a/app/code/Magento/Cron/Model/ResourceModel/Schedule.php b/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
index a47227bb60598..25dd02c207f4e 100644
--- a/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
+++ b/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
@@ -66,7 +66,14 @@ public function trySetJobUniqueStatusAtomic($scheduleId, $newStatus, $currentSta
     {
         $connection = $this->getConnection();
 
-        $match = $connection->quoteInto('existing.job_code = current.job_code AND existing.status = ?', $newStatus);
+        // this condition added to avoid cron jobs locking after incorrect termination of running job
+        $match = $connection->quoteInto(
+            'existing.job_code = current.job_code ' .
+            'AND (existing.executed_at > UTC_TIMESTAMP() - INTERVAL 1 DAY OR existing.executed_at IS NULL) ' .
+            'AND existing.status = ?',
+            $newStatus
+        );
+
         $selectIfUnlocked = $connection->select()
             ->joinLeft(
                 ['existing' => $this->getTable('cron_schedule')],
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 39a58ef360cb3..200b0fd690882 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -71,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     public function _construct()
     {
@@ -79,6 +79,8 @@ public function _construct()
     }
 
     /**
+     * Set cron expression.
+     *
      * @param string $expr
      * @return $this
      * @throws \Magento\Framework\Exception\CronException
@@ -95,7 +97,7 @@ public function setCronExpr($expr)
     }
 
     /**
-     * Checks the observer's cron expression against time
+     * Checks the observer's cron expression against time.
      *
      * Supports $this->setCronExpr('* 0-5,10-59/5 2-10,15-25 january-june/2 mon-fri')
      *
@@ -125,6 +127,8 @@ public function trySchedule()
     }
 
     /**
+     * Match cron expression.
+     *
      * @param string $expr
      * @param int $num
      * @return bool
@@ -191,6 +195,8 @@ public function matchCronExpression($expr, $num)
     }
 
     /**
+     * Get number of a month.
+     *
      * @param int|string $value
      * @return bool|int|string
      */
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
index b98a456a511f1..4bb5dc196f985 100644
--- a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
+++ b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -13,8 +13,12 @@
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Cron\Model\Schedule;
+use Magento\Framework\Profiler\Driver\Standard\Stat;
+use Magento\Framework\Profiler\Driver\Standard\StatFactory;
 
 /**
+ * The observer for processing cron jobs.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProcessCronQueueObserver implements ObserverInterface
@@ -56,6 +60,16 @@ class ProcessCronQueueObserver implements ObserverInterface
      */
     const SECONDS_IN_MINUTE = 60;
 
+    /**
+     * How long to wait for cron group to become unlocked
+     */
+    const LOCK_TIMEOUT = 5;
+
+    /**
+     * Static lock prefix for cron group locking
+     */
+    const LOCK_PREFIX = 'CRON_GROUP_';
+
     /**
      * @var \Magento\Cron\Model\ResourceModel\Schedule\Collection
      */
@@ -116,15 +130,20 @@ class ProcessCronQueueObserver implements ObserverInterface
      */
     private $state;
 
+    /**
+     * @var \Magento\Framework\Lock\LockManagerInterface
+     */
+    private $lockManager;
+
     /**
      * @var array
      */
     private $invalid = [];
 
     /**
-     * @var array
+     * @var Stat
      */
-    private $jobs;
+    private $statProfiler;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
@@ -137,7 +156,9 @@ class ProcessCronQueueObserver implements ObserverInterface
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\Framework\Process\PhpExecutableFinderFactory $phpExecutableFinderFactory
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\App\State $state
+     * @param State $state
+     * @param StatFactory $statFactory
+     * @param \Magento\Framework\Lock\LockManagerInterface $lockManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -151,7 +172,9 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\Framework\Process\PhpExecutableFinderFactory $phpExecutableFinderFactory,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\App\State $state
+        \Magento\Framework\App\State $state,
+        StatFactory $statFactory,
+        \Magento\Framework\Lock\LockManagerInterface $lockManager
     ) {
         $this->_objectManager = $objectManager;
         $this->_scheduleFactory = $scheduleFactory;
@@ -164,6 +187,8 @@ public function __construct(
         $this->phpExecutableFinder = $phpExecutableFinderFactory->create();
         $this->logger = $logger;
         $this->state = $state;
+        $this->statProfiler = $statFactory->create();
+        $this->lockManager = $lockManager;
     }
 
     /**
@@ -179,27 +204,26 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        $pendingJobs = $this->_getPendingSchedules();
+
         $currentTime = $this->dateTime->gmtTimestamp();
         $jobGroupsRoot = $this->_config->getJobs();
+        // sort jobs groups to start from used in separated process
+        uksort(
+            $jobGroupsRoot,
+            function ($a, $b) {
+                return $this->getCronGroupConfigurationValue($b, 'use_separate_process')
+                    - $this->getCronGroupConfigurationValue($a, 'use_separate_process');
+            }
+        );
 
         $phpPath = $this->phpExecutableFinder->find() ?: 'php';
 
         foreach ($jobGroupsRoot as $groupId => $jobsRoot) {
-            $this->_cleanup($groupId);
-            $this->_generate($groupId);
-            if ($this->_request->getParam('group') !== null
-                && $this->_request->getParam('group') !== '\'' . ($groupId) . '\''
-                && $this->_request->getParam('group') !== $groupId
-            ) {
+            if (!$this->isGroupInFilter($groupId)) {
                 continue;
             }
-            if (($this->_request->getParam(self::STANDALONE_PROCESS_STARTED) !== '1') && (
-                    $this->_scopeConfig->getValue(
-                        'system/cron/' . $groupId . '/use_separate_process',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ) == 1
-                )
+            if ($this->_request->getParam(self::STANDALONE_PROCESS_STARTED) !== '1'
+                && $this->getCronGroupConfigurationValue($groupId, 'use_separate_process') == 1
             ) {
                 $this->_shell->execute(
                     $phpPath . ' %s cron:run --group=' . $groupId . ' --' . Cli::INPUT_KEY_BOOTSTRAP . '='
@@ -211,42 +235,43 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 continue;
             }
 
-            /** @var \Magento\Cron\Model\Schedule $schedule */
-            foreach ($pendingJobs as $schedule) {
-                $jobConfig = isset($jobsRoot[$schedule->getJobCode()]) ? $jobsRoot[$schedule->getJobCode()] : null;
-                if (!$jobConfig) {
-                    continue;
+            $this->lockGroup(
+                $groupId,
+                function ($groupId) use ($currentTime, $jobsRoot) {
+                    $this->cleanupJobs($groupId, $currentTime);
+                    $this->generateSchedules($groupId);
+                    $this->processPendingJobs($groupId, $jobsRoot, $currentTime);
                 }
+            );
+        }
+    }
 
-                $scheduledTime = strtotime($schedule->getScheduledAt());
-                if ($scheduledTime > $currentTime) {
-                    continue;
-                }
+    /**
+     * Lock group
+     *
+     * It should be taken by standalone (child) process, not by the parent process.
+     *
+     * @param int $groupId
+     * @param callable $callback
+     *
+     * @return void
+     */
+    private function lockGroup($groupId, callable $callback)
+    {
 
-                try {
-                    if ($schedule->tryLockJob()) {
-                        $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
-                    }
-                } catch (\Exception $e) {
-                    $schedule->setMessages($e->getMessage());
-                    if ($schedule->getStatus() === Schedule::STATUS_ERROR) {
-                        $this->logger->critical($e);
-                    }
-                    if ($schedule->getStatus() === Schedule::STATUS_MISSED
-                        && $this->state->getMode() === State::MODE_DEVELOPER
-                    ) {
-                        $this->logger->info(
-                            sprintf(
-                                "%s Schedule Id: %s Job Code: %s",
-                                $schedule->getMessages(),
-                                $schedule->getScheduleId(),
-                                $schedule->getJobCode()
-                            )
-                        );
-                    }
-                }
-                $schedule->save();
-            }
+        if (!$this->lockManager->lock(self::LOCK_PREFIX . $groupId, self::LOCK_TIMEOUT)) {
+            $this->logger->warning(
+                sprintf(
+                    "Could not acquire lock for cron group: %s, skipping run",
+                    $groupId
+                )
+            );
+            return;
+        }
+        try {
+            $callback($groupId);
+        } finally {
+            $this->lockManager->unlock(self::LOCK_PREFIX . $groupId);
         }
     }
 
@@ -263,19 +288,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      */
     protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId)
     {
-        $scheduleLifetime = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        $jobCode = $schedule->getJobCode();
+        $scheduleLifetime = $this->getCronGroupConfigurationValue($groupId, self::XML_PATH_SCHEDULE_LIFETIME);
         $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
         if ($scheduledTime < $currentTime - $scheduleLifetime) {
             $schedule->setStatus(Schedule::STATUS_MISSED);
-            throw new \Exception('Too late for the schedule');
+            throw new \Exception(sprintf('Cron Job %s is missed at %s', $jobCode, $schedule->getScheduledAt()));
         }
 
         if (!isset($jobConfig['instance'], $jobConfig['method'])) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
-            throw new \Exception('No callbacks found');
+            throw new \Exception(sprintf('No callbacks found for cron job %s', $jobCode));
         }
         $model = $this->_objectManager->create($jobConfig['instance']);
         $callback = [$model, $jobConfig['method']];
@@ -288,33 +311,88 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
 
         $schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp()))->save();
 
+        $this->startProfiling();
         try {
+            $this->logger->info(sprintf('Cron Job %s is run', $jobCode));
             call_user_func_array($callback, [$schedule]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
+            $this->logger->error(sprintf(
+                'Cron Job %s has an error: %s. Statistics: %s',
+                $jobCode,
+                $e->getMessage(),
+                $this->getProfilingStat()
+            ));
+            if (!$e instanceof \Exception) {
+                $e = new \RuntimeException(
+                    'Error when running a cron job',
+                    0,
+                    $e
+                );
+            }
             throw $e;
+        } finally {
+            $this->stopProfiling();
         }
 
         $schedule->setStatus(Schedule::STATUS_SUCCESS)->setFinishedAt(strftime(
             '%Y-%m-%d %H:%M:%S',
             $this->dateTime->gmtTimestamp()
         ));
+
+        $this->logger->info(sprintf(
+            'Cron Job %s is successfully finished. Statistics: %s',
+            $jobCode,
+            $this->getProfilingStat()
+        ));
     }
 
     /**
-     * Return job collection from data base with status 'pending'
+     * Starts profiling
      *
+     * @return void
+     */
+    private function startProfiling()
+    {
+        $this->statProfiler->clear();
+        $this->statProfiler->start('job', microtime(true), memory_get_usage(true), memory_get_usage());
+    }
+
+    /**
+     * Stops profiling
+     *
+     * @return void
+     */
+    private function stopProfiling()
+    {
+        $this->statProfiler->stop('job', microtime(true), memory_get_usage(true), memory_get_usage());
+    }
+
+    /**
+     * Retrieves statistics in the JSON format
+     *
+     * @return string
+     */
+    private function getProfilingStat()
+    {
+        $stat = $this->statProfiler->get('job');
+        unset($stat[Stat::START]);
+        return json_encode($stat);
+    }
+
+    /**
+     * Return job collection from data base with status 'pending'.
+     *
+     * @param string $groupId
      * @return \Magento\Cron\Model\ResourceModel\Schedule\Collection
      */
-    protected function _getPendingSchedules()
+    private function getPendingSchedules($groupId)
     {
-        if (!$this->_pendingSchedules) {
-            $this->_pendingSchedules = $this->_scheduleFactory->create()->getCollection()->addFieldToFilter(
-                'status',
-                Schedule::STATUS_PENDING
-            )->load();
-        }
-        return $this->_pendingSchedules;
+        $jobs = $this->_config->getJobs();
+        $pendingJobs = $this->_scheduleFactory->create()->getCollection();
+        $pendingJobs->addFieldToFilter('status', Schedule::STATUS_PENDING);
+        $pendingJobs->addFieldToFilter('job_code', ['in' => array_keys($jobs[$groupId])]);
+        return $pendingJobs;
     }
 
     /**
@@ -323,22 +401,32 @@ protected function _getPendingSchedules()
      * @param string $groupId
      * @return $this
      */
-    protected function _generate($groupId)
+    private function generateSchedules($groupId)
     {
         /**
          * check if schedule generation is needed
          */
         $lastRun = (int)$this->_cache->load(self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId);
-        $rawSchedulePeriod = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_GENERATE_EVERY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        $rawSchedulePeriod = (int)$this->getCronGroupConfigurationValue(
+            $groupId,
+            self::XML_PATH_SCHEDULE_GENERATE_EVERY
         );
         $schedulePeriod = $rawSchedulePeriod * self::SECONDS_IN_MINUTE;
         if ($lastRun > $this->dateTime->gmtTimestamp() - $schedulePeriod) {
             return $this;
         }
 
-        $schedules = $this->_getPendingSchedules();
+        /**
+         * save time schedules generation was ran with no expiration
+         */
+        $this->_cache->save(
+            $this->dateTime->gmtTimestamp(),
+            self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId,
+            ['crontab'],
+            null
+        );
+
+        $schedules = $this->getPendingSchedules($groupId);
         $exists = [];
         /** @var Schedule $schedule */
         foreach ($schedules as $schedule) {
@@ -348,21 +436,11 @@ protected function _generate($groupId)
         /**
          * generate global crontab jobs
          */
-        $jobs = $this->getJobs();
+        $jobs = $this->_config->getJobs();
         $this->invalid = [];
         $this->_generateJobs($jobs[$groupId], $exists, $groupId);
         $this->cleanupScheduleMismatches();
 
-        /**
-         * save time schedules generation was ran with no expiration
-         */
-        $this->_cache->save(
-            $this->dateTime->gmtTimestamp(),
-            self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId,
-            ['crontab'],
-            null
-        );
-
         return $this;
     }
 
@@ -372,7 +450,7 @@ protected function _generate($groupId)
      * @param   array $jobs
      * @param   array $exists
      * @param   string $groupId
-     * @return  $this
+     * @return  void
      */
     protected function _generateJobs($jobs, $exists, $groupId)
     {
@@ -385,80 +463,65 @@ protected function _generateJobs($jobs, $exists, $groupId)
             $timeInterval = $this->getScheduleTimeInterval($groupId);
             $this->saveSchedule($jobCode, $cronExpression, $timeInterval, $exists);
         }
-        return $this;
     }
 
     /**
      * Clean expired jobs
      *
      * @param string $groupId
-     * @return $this
+     * @param int $currentTime
+     * @return void
      */
-    protected function _cleanup($groupId)
+    private function cleanupJobs($groupId, $currentTime)
     {
-        $this->cleanupDisabledJobs($groupId);
-
         // check if history cleanup is needed
         $lastCleanup = (int)$this->_cache->load(self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId);
-        $historyCleanUp = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_CLEANUP_EVERY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        $historyCleanUp = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_HISTORY_CLEANUP_EVERY);
         if ($lastCleanup > $this->dateTime->gmtTimestamp() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
             return $this;
         }
-
-        // check how long the record should stay unprocessed before marked as MISSED
-        $scheduleLifetime = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        // save time history cleanup was ran with no expiration
+        $this->_cache->save(
+            $this->dateTime->gmtTimestamp(),
+            self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId,
+            ['crontab'],
+            null
         );
-        $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
 
-        /**
-         * @var \Magento\Cron\Model\ResourceModel\Schedule\Collection $history
-         */
-        $history = $this->_scheduleFactory->create()->getCollection()->addFieldToFilter(
-            'status',
-            ['in' => [Schedule::STATUS_SUCCESS, Schedule::STATUS_MISSED, Schedule::STATUS_ERROR]]
-        )->load();
+        $this->cleanupDisabledJobs($groupId);
 
-        $historySuccess = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_SUCCESS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $historyFailure = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_FAILURE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        $historySuccess = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_HISTORY_SUCCESS);
+        $historyFailure = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_HISTORY_FAILURE);
         $historyLifetimes = [
             Schedule::STATUS_SUCCESS => $historySuccess * self::SECONDS_IN_MINUTE,
             Schedule::STATUS_MISSED => $historyFailure * self::SECONDS_IN_MINUTE,
             Schedule::STATUS_ERROR => $historyFailure * self::SECONDS_IN_MINUTE,
+            Schedule::STATUS_PENDING => max($historyFailure, $historySuccess) * self::SECONDS_IN_MINUTE,
         ];
 
-        $now = $this->dateTime->gmtTimestamp();
-        /** @var Schedule $record */
-        foreach ($history as $record) {
-            $checkTime = $record->getExecutedAt() ? strtotime($record->getExecutedAt()) :
-                strtotime($record->getScheduledAt()) + $scheduleLifetime;
-            if ($checkTime < $now - $historyLifetimes[$record->getStatus()]) {
-                $record->delete();
-            }
+        $jobs = $this->_config->getJobs()[$groupId];
+        $scheduleResource = $this->_scheduleFactory->create()->getResource();
+        $connection = $scheduleResource->getConnection();
+        $count = 0;
+        foreach ($historyLifetimes as $status => $time) {
+            $count += $connection->delete(
+                $scheduleResource->getMainTable(),
+                [
+                    'status = ?' => $status,
+                    'job_code in (?)' => array_keys($jobs),
+                    'created_at < ?' => $connection->formatDate($currentTime - $time)
+                ]
+            );
         }
 
-        // save time history cleanup was ran with no expiration
-        $this->_cache->save(
-            $this->dateTime->gmtTimestamp(),
-            self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId,
-            ['crontab'],
-            null
-        );
-
-        return $this;
+        if ($count) {
+            $this->logger->info(sprintf('%d cron jobs were cleaned', $count));
+        }
     }
 
     /**
+     * Get config of schedule.
+     *
      * @param array $jobConfig
      * @return mixed
      */
@@ -473,6 +536,8 @@ protected function getConfigSchedule($jobConfig)
     }
 
     /**
+     * Save a schedule of cron job.
+     *
      * @param string $jobCode
      * @param string $cronExpression
      * @param int $timeInterval
@@ -486,7 +551,7 @@ protected function saveSchedule($jobCode, $cronExpression, $timeInterval, $exist
         for ($time = $currentTime; $time < $timeAhead; $time += self::SECONDS_IN_MINUTE) {
             $scheduledAt = strftime('%Y-%m-%d %H:%M:00', $time);
             $alreadyScheduled = !empty($exists[$jobCode . '/' . $scheduledAt]);
-            $schedule = $this->generateSchedule($jobCode, $cronExpression, $time);
+            $schedule = $this->createSchedule($jobCode, $cronExpression, $time);
             $valid = $schedule->trySchedule();
             if (!$valid) {
                 if ($alreadyScheduled) {
@@ -505,12 +570,14 @@ protected function saveSchedule($jobCode, $cronExpression, $timeInterval, $exist
     }
 
     /**
+     * Create a schedule of cron job.
+     *
      * @param string $jobCode
      * @param string $cronExpression
      * @param int $time
      * @return Schedule
      */
-    protected function generateSchedule($jobCode, $cronExpression, $time)
+    protected function createSchedule($jobCode, $cronExpression, $time)
     {
         $schedule = $this->_scheduleFactory->create()
             ->setCronExpr($cronExpression)
@@ -523,43 +590,55 @@ protected function generateSchedule($jobCode, $cronExpression, $time)
     }
 
     /**
+     * Get time interval for scheduling.
+     *
      * @param string $groupId
      * @return int
      */
     protected function getScheduleTimeInterval($groupId)
     {
-        $scheduleAheadFor = (int)$this->_scopeConfig->getValue(
-            'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_AHEAD_FOR,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        $scheduleAheadFor = (int)$this->getCronGroupConfigurationValue($groupId, self::XML_PATH_SCHEDULE_AHEAD_FOR);
         $scheduleAheadFor = $scheduleAheadFor * self::SECONDS_IN_MINUTE;
 
         return $scheduleAheadFor;
     }
 
     /**
-     * Clean up scheduled jobs that are disabled in the configuration
-     * This can happen when you turn off a cron job in the config and flush the cache
+     * Clean up scheduled jobs that are disabled in the configuration.
+     *
+     * This can happen when you turn off a cron job in the config and flush the cache.
      *
      * @param string $groupId
      * @return void
      */
     private function cleanupDisabledJobs($groupId)
     {
-        $jobs = $this->getJobs();
+        $jobs = $this->_config->getJobs();
+        $jobsToCleanup = [];
         foreach ($jobs[$groupId] as $jobCode => $jobConfig) {
             if (!$this->getCronExpression($jobConfig)) {
                 /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
-                $scheduleResource = $this->_scheduleFactory->create()->getResource();
-                $scheduleResource->getConnection()->delete($scheduleResource->getMainTable(), [
-                    'status=?' => Schedule::STATUS_PENDING,
-                    'job_code=?' => $jobCode,
-                ]);
+                $jobsToCleanup[] = $jobCode;
             }
         }
+
+        if (count($jobsToCleanup) > 0) {
+            $scheduleResource = $this->_scheduleFactory->create()->getResource();
+            $count = $scheduleResource->getConnection()->delete(
+                $scheduleResource->getMainTable(),
+                [
+                    'status = ?' => Schedule::STATUS_PENDING,
+                    'job_code in (?)' => $jobsToCleanup,
+                ]
+            );
+
+            $this->logger->info(sprintf('%d cron jobs were cleaned', $count));
+        }
     }
 
     /**
+     * Get cron expression of cron job.
+     *
      * @param array $jobConfig
      * @return null|string
      */
@@ -579,19 +658,20 @@ private function getCronExpression($jobConfig)
     }
 
     /**
-     * Clean up scheduled jobs that do not match their cron expression anymore
-     * This can happen when you change the cron expression and flush the cache
+     * Clean up scheduled jobs that do not match their cron expression anymore.
+     *
+     * This can happen when you change the cron expression and flush the cache.
      *
      * @return $this
      */
     private function cleanupScheduleMismatches()
     {
+        /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
+        $scheduleResource = $this->_scheduleFactory->create()->getResource();
         foreach ($this->invalid as $jobCode => $scheduledAtList) {
-            /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
-            $scheduleResource = $this->_scheduleFactory->create()->getResource();
             $scheduleResource->getConnection()->delete($scheduleResource->getMainTable(), [
-                'status=?' => Schedule::STATUS_PENDING,
-                'job_code=?' => $jobCode,
+                'status = ?' => Schedule::STATUS_PENDING,
+                'job_code = ?' => $jobCode,
                 'scheduled_at in (?)' => $scheduledAtList,
             ]);
         }
@@ -599,13 +679,90 @@ private function cleanupScheduleMismatches()
     }
 
     /**
-     * @return array
+     * Get CronGroup Configuration Value.
+     *
+     * @param string $groupId
+     * @param string $path
+     * @return int
+     */
+    private function getCronGroupConfigurationValue($groupId, $path)
+    {
+        return $this->_scopeConfig->getValue(
+            'system/cron/' . $groupId . '/' . $path,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Is Group In Filter.
+     *
+     * @param string $groupId
+     * @return bool
+     */
+    private function isGroupInFilter($groupId): bool
+    {
+        return !($this->_request->getParam('group') !== null
+            && trim($this->_request->getParam('group'), "'") !== $groupId);
+    }
+
+    /**
+     * Process pending jobs.
+     *
+     * @param string $groupId
+     * @param array $jobsRoot
+     * @param int $currentTime
+     */
+    private function processPendingJobs($groupId, $jobsRoot, $currentTime)
+    {
+        $procesedJobs = [];
+        $pendingJobs = $this->getPendingSchedules($groupId);
+        /** @var \Magento\Cron\Model\Schedule $schedule */
+        foreach ($pendingJobs as $schedule) {
+            if (isset($procesedJobs[$schedule->getJobCode()])) {
+                // process only on job per run
+                continue;
+            }
+            $jobConfig = isset($jobsRoot[$schedule->getJobCode()]) ? $jobsRoot[$schedule->getJobCode()] : null;
+            if (!$jobConfig) {
+                continue;
+            }
+
+            $scheduledTime = strtotime($schedule->getScheduledAt());
+            if ($scheduledTime > $currentTime) {
+                continue;
+            }
+
+            try {
+                if ($schedule->tryLockJob()) {
+                    $this->_runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $groupId);
+                }
+            } catch (\Exception $e) {
+                $this->processError($schedule, $e);
+            }
+            if ($schedule->getStatus() === Schedule::STATUS_SUCCESS) {
+                $procesedJobs[$schedule->getJobCode()] = true;
+            }
+            $schedule->save();
+        }
+    }
+
+    /**
+     * Process error messages.
+     *
+     * @param Schedule $schedule
+     * @param \Exception $exception
+     * @return void
      */
-    private function getJobs()
+    private function processError(\Magento\Cron\Model\Schedule $schedule, \Exception $exception)
     {
-        if ($this->jobs === null) {
-            $this->jobs = $this->_config->getJobs();
+        $schedule->setMessages($exception->getMessage());
+        if ($schedule->getStatus() === Schedule::STATUS_ERROR) {
+            $this->logger->critical($exception);
+        }
+        if ($schedule->getStatus() === Schedule::STATUS_MISSED
+            && $this->state->getMode() === State::MODE_DEVELOPER
+        ) {
+            $this->logger->info($schedule->getMessages());
         }
-        return $this->jobs;
     }
 }
diff --git a/app/code/Magento/Cron/Setup/InstallSchema.php b/app/code/Magento/Cron/Setup/InstallSchema.php
deleted file mode 100644
index 921080e11cb71..0000000000000
--- a/app/code/Magento/Cron/Setup/InstallSchema.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Cron\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'cron_schedule'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('cron_schedule')
-        )->addColumn(
-            'schedule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Schedule Id'
-        )->addColumn(
-            'job_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false, 'default' => '0'],
-            'Job Code'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            7,
-            ['nullable' => false, 'default' => 'pending'],
-            'Status'
-        )->addColumn(
-            'messages',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Messages'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'scheduled_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true],
-            'Scheduled At'
-        )->addColumn(
-            'executed_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true],
-            'Executed At'
-        )->addColumn(
-            'finished_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true],
-            'Finished At'
-        )->addIndex(
-            $installer->getIdxName('cron_schedule', ['job_code']),
-            ['job_code']
-        )->addIndex(
-            $installer->getIdxName('cron_schedule', ['scheduled_at', 'status']),
-            ['scheduled_at', 'status']
-        )->setComment(
-            'Cron Schedule'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Cron/Setup/Recurring.php b/app/code/Magento/Cron/Setup/Recurring.php
new file mode 100644
index 0000000000000..e45524c174afe
--- /dev/null
+++ b/app/code/Magento/Cron/Setup/Recurring.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cron\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Cron recurring setup
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var \Magento\Cron\Model\ResourceModel\Schedule
+     */
+    private $schedule;
+
+    /**
+     * Recurring constructor.
+     * @param \Magento\Cron\Model\ResourceModel\Schedule $schedule
+     */
+    public function __construct(
+        \Magento\Cron\Model\ResourceModel\Schedule $schedule
+    ) {
+        $this->schedule = $schedule;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $connection = $this->schedule->getConnection();
+        $connection->update(
+            $this->schedule->getMainTable(),
+            [
+                'status' => \Magento\Cron\Model\Schedule::STATUS_ERROR,
+                'messages' => 'The job is terminated due to system upgrade'
+            ],
+            $connection->quoteInto('status = ?', \Magento\Cron\Model\Schedule::STATUS_RUNNING)
+        );
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE.txt b/app/code/Magento/Cron/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE.txt
rename to app/code/Magento/Cron/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE_AFL.txt b/app/code/Magento/Cron/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE_AFL.txt
rename to app/code/Magento/Cron/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Cron/Test/Mftf/README.md b/app/code/Magento/Cron/Test/Mftf/README.md
new file mode 100644
index 0000000000000..76e02eadfb055
--- /dev/null
+++ b/app/code/Magento/Cron/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cron Functional Tests
+
+The Functional Test Module for **Magento Cron** module.
diff --git a/app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php b/app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php
index 8b3e50d6afb3a..6b1af9323cc93 100644
--- a/app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php
@@ -6,19 +6,74 @@
 namespace Magento\Cron\Test\Unit\Console\Command;
 
 use Magento\Cron\Console\Command\CronCommand;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManagerFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class CronCommandTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var ObjectManagerFactory|MockObject
+     */
+    private $objectManagerFactory;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerFactory = $this->createMock(ObjectManagerFactory::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+    }
+
+    /**
+     * Test command with disables cron
+     *
+     * @return void
+     */
+    public function testExecuteWithDisabledCrons()
+    {
+        $this->objectManagerFactory->expects($this->never())
+            ->method('create');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cron/enabled', 1)
+            ->willReturn(0);
+        $commandTester = new CommandTester(
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
+        );
+        $commandTester->execute([]);
+        $expectedMsg = 'Cron is disabled. Jobs were not run.' . PHP_EOL;
+        $this->assertEquals($expectedMsg, $commandTester->getDisplay());
+    }
+
+    /**
+     * Test command with enabled cron
+     *
+     * @return void
+     */
     public function testExecute()
     {
-        $objectManagerFactory = $this->createMock(\Magento\Framework\App\ObjectManagerFactory::class);
         $objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
         $cron = $this->createMock(\Magento\Framework\App\Cron::class);
-        $objectManager->expects($this->once())->method('create')->willReturn($cron);
-        $cron->expects($this->once())->method('launch');
-        $objectManagerFactory->expects($this->once())->method('create')->willReturn($objectManager);
-        $commandTester = new CommandTester(new CronCommand($objectManagerFactory));
+        $objectManager->expects($this->once())
+            ->method('create')
+            ->willReturn($cron);
+        $cron->expects($this->once())
+            ->method('launch');
+        $this->objectManagerFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($objectManager);
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('cron/enabled', 1)
+            ->willReturn(1);
+        $commandTester = new CommandTester(
+            new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
+        );
         $commandTester->execute([]);
         $expectedMsg = 'Ran jobs by schedule.' . PHP_EOL;
         $this->assertEquals($expectedMsg, $commandTester->getDisplay());
diff --git a/app/code/Magento/Cron/Test/Unit/Model/CronJobException.php b/app/code/Magento/Cron/Test/Unit/Model/CronJobException.php
index c50afa0e6f0d1..6954fe49fdc43 100644
--- a/app/code/Magento/Cron/Test/Unit/Model/CronJobException.php
+++ b/app/code/Magento/Cron/Test/Unit/Model/CronJobException.php
@@ -12,8 +12,27 @@
 
 class CronJobException
 {
+    /**
+     * @var \Throwable|null
+     */
+    private $exception;
+
+    /**
+     * @param \Throwable|null $exception
+     */
+    public function __construct(\Throwable $exception = null)
+    {
+        $this->exception = $exception;
+    }
+
+    /**
+     * @throws \Throwable
+     */
     public function execute()
     {
-        throw new \Exception('Test exception');
+        if (!$this->exception) {
+            $this->exception = new \Exception('Test exception');
+        }
+        throw $this->exception;
     }
 }
diff --git a/app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php b/app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php
new file mode 100644
index 0000000000000..703926b4c0116
--- /dev/null
+++ b/app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cron\Test\Unit\Model\System\Config\Initial;
+
+use Magento\Cron\Model\Groups\Config\Data as GroupsConfigModel;
+use Magento\Cron\Model\System\Config\Initial\Converter as ConverterPlugin;
+use Magento\Framework\App\Config\Initial\Converter;
+
+/**
+ * Class ConverterTest
+ *
+ * Unit test for \Magento\Cron\Model\System\Config\Initial\Converter
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GroupsConfigModel|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupsConfigMock;
+
+    /**
+     * @var Converter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterMock;
+
+    /**
+     * @var ConverterPlugin
+     */
+    private $converterPlugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->groupsConfigMock = $this->getMockBuilder(
+            GroupsConfigModel::class
+        )->disableOriginalConstructor()->getMock();
+        $this->converterMock = $this->getMockBuilder(Converter::class)->getMock();
+        $this->converterPlugin = new ConverterPlugin($this->groupsConfigMock);
+    }
+
+    /**
+     * Tests afterConvert method with no $result['data']['default']['system'] set
+     */
+    public function testAfterConvertWithNoData()
+    {
+        $expectedResult = ['test'];
+        $this->groupsConfigMock->expects($this->never())
+            ->method('get');
+
+        $result = $this->converterPlugin->afterConvert($this->converterMock, $expectedResult);
+
+        self::assertSame($expectedResult, $result);
+    }
+
+    /**
+     * Tests afterConvert method with $result['data']['default']['system'] set
+     */
+    public function testAfterConvertWithData()
+    {
+        $groups = [
+            'group1' => ['val1' => ['value' => '1']],
+            'group2' => ['val2' => ['value' => '2']]
+        ];
+        $expectedResult['data']['default']['system']['cron'] = [
+            'group1' => [
+                'val1' => '1'
+            ],
+            'group2' => [
+                'val2' => '2'
+            ]
+        ];
+        $result['data']['default']['system']['cron'] = '1';
+
+        $this->groupsConfigMock->expects($this->once())
+            ->method('get')
+            ->willReturn($groups);
+
+        $result = $this->converterPlugin->afterConvert($this->converterMock, $result);
+
+        self::assertEquals($expectedResult, $result);
+    }
+}
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
index 0db6a598fb56f..632a014a0ab77 100644
--- a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -8,6 +8,7 @@
 use Magento\Cron\Model\Schedule;
 use Magento\Cron\Observer\ProcessCronQueueObserver as ProcessCronQueueObserver;
 use Magento\Framework\App\State;
+use Magento\Framework\Profiler\Driver\Standard\StatFactory;
 
 /**
  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
@@ -84,6 +85,11 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $appStateMock;
 
+    /**
+     * @var \Magento\Framework\Lock\LockManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockManagerMock;
+
     /**
      * @var \Magento\Cron\Model\ResourceModel\Schedule|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -116,6 +122,7 @@ protected function setUp()
         )->disableOriginalConstructor()->getMock();
         $this->_collection->expects($this->any())->method('addFieldToFilter')->will($this->returnSelf());
         $this->_collection->expects($this->any())->method('load')->will($this->returnSelf());
+
         $this->_scheduleFactory = $this->getMockBuilder(
             \Magento\Cron\Model\ScheduleFactory::class
         )->setMethods(
@@ -135,6 +142,12 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->lockManagerMock = $this->getMockBuilder(\Magento\Framework\Lock\LockManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->lockManagerMock->method('lock')->willReturn(true);
+        $this->lockManagerMock->method('unlock')->willReturn(true);
+
         $this->observer = $this->createMock(\Magento\Framework\Event\Observer::class);
 
         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
@@ -159,6 +172,15 @@ protected function setUp()
         $this->scheduleResource->method('getConnection')->willReturn($connection);
         $connection->method('delete')->willReturn(1);
 
+        $this->statFactory = $this->getMockBuilder(StatFactory::class)
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+
+        $this->stat = $this->getMockBuilder(\Magento\Framework\Profiler\Driver\Standard\Stat::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statFactory->expects($this->any())->method('create')->willReturn($this->stat);
+
         $this->_observer = new ProcessCronQueueObserver(
             $this->_objectManager,
             $this->_scheduleFactory,
@@ -170,41 +192,23 @@ protected function setUp()
             $this->dateTimeMock,
             $phpExecutableFinderFactory,
             $this->loggerMock,
-            $this->appStateMock
+            $this->appStateMock,
+            $this->statFactory,
+            $this->lockManagerMock
         );
     }
 
-    /**
-     * Test case without saved cron jobs in data base
-     */
-    public function testDispatchNoPendingJobs()
-    {
-        $lastRun = $this->time + 10000000;
-        $this->_cache->expects($this->any())->method('load')->will($this->returnValue($lastRun));
-        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
-
-        $this->_config->expects($this->once())->method('getJobs')->will($this->returnValue([]));
-
-        $scheduleMock = $this->getMockBuilder(
-            \Magento\Cron\Model\Schedule::class
-        )->disableOriginalConstructor()->getMock();
-        $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
-
-        $this->_observer->execute($this->observer);
-    }
-
     /**
      * Test case for not existed cron jobs in files but in data base is presented
      */
     public function testDispatchNoJobConfig()
     {
         $lastRun = $this->time + 10000000;
-        $this->_cache->expects($this->any())->method('load')->will($this->returnValue($lastRun));
-        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
+        $this->_cache->expects($this->atLeastOnce())->method('load')->will($this->returnValue($lastRun));
+        $this->_scopeConfig->expects($this->atLeastOnce())->method('getValue')->will($this->returnValue(0));
 
         $this->_config->expects(
-            $this->any()
+            $this->atLeastOnce()
         )->method(
             'getJobs'
         )->will(
@@ -212,16 +216,21 @@ public function testDispatchNoJobConfig()
         );
 
         $schedule = $this->createPartialMock(\Magento\Cron\Model\Schedule::class, ['getJobCode', '__wakeup']);
-        $schedule->expects($this->once())->method('getJobCode')->will($this->returnValue('not_existed_job_code'));
+        $schedule->expects($this->atLeastOnce())
+            ->method('getJobCode')
+            ->will($this->returnValue('not_existed_job_code'));
 
         $this->_collection->addItem($schedule);
 
         $scheduleMock = $this->getMockBuilder(
             \Magento\Cron\Model\Schedule::class
         )->disableOriginalConstructor()->getMock();
-        $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-        $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->any())->method('create')->will($this->returnValue($scheduleMock));
+        $scheduleMock->expects($this->atLeastOnce())
+            ->method('getCollection')
+            ->will($this->returnValue($this->_collection));
+        $this->_scheduleFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -240,11 +249,13 @@ public function testDispatchCanNotLock()
         $schedule = $this->getMockBuilder(
             \Magento\Cron\Model\Schedule::class
         )->setMethods(
-            ['getJobCode', 'tryLockJob', 'getScheduledAt', '__wakeup', 'save']
+            ['getJobCode', 'tryLockJob', 'getScheduledAt', '__wakeup', 'save', 'setFinishedAt']
         )->disableOriginalConstructor()->getMock();
         $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
-        $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
         $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(false));
+        $schedule->expects($this->never())->method('setFinishedAt');
+
         $abstractModel = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
         $schedule->expects($this->any())->method('save')->will($this->returnValue($abstractModel));
         $this->_collection->addItem($schedule);
@@ -262,7 +273,9 @@ public function testDispatchCanNotLock()
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -272,10 +285,8 @@ public function testDispatchCanNotLock()
      */
     public function testDispatchExceptionTooLate()
     {
-        $exceptionMessage = 'Too late for the schedule';
-        $scheduleId = 42;
+        $exceptionMessage = 'Cron Job test_job1 is missed at 2017-07-30 15:00:00';
         $jobCode = 'test_job1';
-        $exception = $exceptionMessage . ' Schedule Id: ' . $scheduleId . ' Job Code: ' . $jobCode;
 
         $lastRun = $this->time + 10000000;
         $this->_cache->expects($this->any())->method('load')->willReturn($lastRun);
@@ -299,25 +310,25 @@ public function testDispatchExceptionTooLate()
                 'getScheduleId',
             ]
         )->disableOriginalConstructor()->getMock();
-        $schedule->expects($this->any())->method('getJobCode')->willReturn($jobCode);
-        $schedule->expects($this->once())->method('getScheduledAt')->willReturn($dateScheduledAt);
+        $schedule->expects($this->atLeastOnce())->method('getJobCode')->willReturn($jobCode);
+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->willReturn($dateScheduledAt);
         $schedule->expects($this->once())->method('tryLockJob')->willReturn(true);
         $schedule->expects(
-            $this->once()
+            $this->any()
         )->method(
             'setStatus'
         )->with(
             $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_MISSED)
         )->willReturnSelf();
         $schedule->expects($this->once())->method('setMessages')->with($this->equalTo($exceptionMessage));
-        $schedule->expects($this->any())->method('getStatus')->willReturn(Schedule::STATUS_MISSED);
-        $schedule->expects($this->once())->method('getMessages')->willReturn($exceptionMessage);
-        $schedule->expects($this->once())->method('getScheduleId')->willReturn($scheduleId);
+        $schedule->expects($this->atLeastOnce())->method('getStatus')->willReturn(Schedule::STATUS_MISSED);
+        $schedule->expects($this->atLeastOnce())->method('getMessages')->willReturn($exceptionMessage);
         $schedule->expects($this->once())->method('save');
 
         $this->appStateMock->expects($this->once())->method('getMode')->willReturn(State::MODE_DEVELOPER);
 
-        $this->loggerMock->expects($this->once())->method('info')->with($exception);
+        $this->loggerMock->expects($this->once())->method('info')
+            ->with('Cron Job test_job1 is missed at 2017-07-30 15:00:00');
 
         $this->_collection->addItem($schedule);
 
@@ -333,7 +344,7 @@ public function testDispatchExceptionTooLate()
             ->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->willReturn($this->_collection);
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->willReturn($scheduleMock);
+        $this->_scheduleFactory->expects($this->atLeastOnce())->method('create')->willReturn($scheduleMock);
 
         $this->_observer->execute($this->observer);
     }
@@ -343,7 +354,8 @@ public function testDispatchExceptionTooLate()
      */
     public function testDispatchExceptionNoCallback()
     {
-        $exceptionMessage = 'No callbacks found';
+        $jobName = 'test_job1';
+        $exceptionMessage = 'No callbacks found for cron job ' . $jobName;
         $exception = new \Exception(__($exceptionMessage));
 
         $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
@@ -372,7 +384,7 @@ public function testDispatchExceptionNoCallback()
 
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
 
-        $jobConfig = ['test_group' => ['test_job1' => ['instance' => 'Some_Class']]];
+        $jobConfig = ['test_group' => [$jobName => ['instance' => 'Some_Class']]];
 
         $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
 
@@ -388,7 +400,7 @@ public function testDispatchExceptionNoCallback()
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -453,7 +465,7 @@ public function testDispatchExceptionInCallback(
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
         $this->_objectManager
             ->expects($this->once())
             ->method('create')
@@ -468,6 +480,7 @@ public function testDispatchExceptionInCallback(
      */
     public function dispatchExceptionInCallbackDataProvider()
     {
+        $throwable = new \TypeError();
         return [
             'non-callable callback' => [
                 'Not_Existed_Class',
@@ -483,6 +496,19 @@ public function dispatchExceptionInCallbackDataProvider()
                 2,
                 new \Exception(__('Test exception'))
             ],
+            'throwable in execution' => [
+                'CronJobException',
+                new \Magento\Cron\Test\Unit\Model\CronJobException(
+                    $throwable
+                ),
+                'Error when running a cron job',
+                2,
+                new \RuntimeException(
+                    'Error when running a cron job',
+                    0,
+                    $throwable
+                )
+            ],
         ];
     }
 
@@ -515,23 +541,22 @@ public function testDispatchRunJob()
             $scheduleMethods
         )->disableOriginalConstructor()->getMock();
         $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
-        $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-        $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(true));
+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
+        $schedule->expects($this->atLeastOnce())->method('tryLockJob')->will($this->returnValue(true));
+        $schedule->expects($this->any())->method('setFinishedAt')->willReturnSelf();
 
         // cron start to execute some job
         $schedule->expects($this->any())->method('setExecutedAt')->will($this->returnSelf());
-        $schedule->expects($this->at(5))->method('save');
+        $schedule->expects($this->atLeastOnce())->method('save');
 
         // cron end execute some job
         $schedule->expects(
-            $this->at(6)
+            $this->atLeastOnce()
         )->method(
             'setStatus'
         )->with(
             $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_SUCCESS)
-        )->will(
-            $this->returnSelf()
-        );
+        )->willReturnSelf();
 
         $schedule->expects($this->at(8))->method('save');
 
@@ -550,7 +575,7 @@ public function testDispatchRunJob()
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->once(2))->method('create')->will($this->returnValue($scheduleMock));
 
         $testCronJob = $this->getMockBuilder('CronJob')->setMethods(['execute'])->getMock();
         $testCronJob->expects($this->atLeastOnce())->method('execute')->with($schedule);
@@ -585,6 +610,8 @@ public function testDispatchNotGenerate()
         )->will(
             $this->returnValue(['test_group' => []])
         );
+        $this->_config->expects($this->at(2))->method('getJobs')->will($this->returnValue($jobConfig));
+        $this->_config->expects($this->at(3))->method('getJobs')->will($this->returnValue($jobConfig));
         $this->_request->expects($this->any())->method('getParam')->will($this->returnValue('test_group'));
         $this->_cache->expects(
             $this->at(0)
@@ -654,6 +681,8 @@ public function testDispatchGenerate()
         ];
         $this->_config->expects($this->at(0))->method('getJobs')->willReturn($jobConfig);
         $this->_config->expects($this->at(1))->method('getJobs')->willReturn($jobs);
+        $this->_config->expects($this->at(2))->method('getJobs')->willReturn($jobs);
+        $this->_config->expects($this->at(3))->method('getJobs')->willReturn($jobs);
         $this->_request->expects($this->any())->method('getParam')->willReturn('default');
         $this->_cache->expects(
             $this->at(0)
@@ -730,7 +759,7 @@ public function testDispatchCleanup()
         $this->_request->expects($this->any())->method('getParam')->will($this->returnValue('test_group'));
         $this->_collection->addItem($schedule);
 
-        $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
+        $this->_config->expects($this->atLeastOnce())->method('getJobs')->will($this->returnValue($jobConfig));
 
         $this->_cache->expects($this->at(0))->method('load')->will($this->returnValue($this->time + 10000000));
         $this->_cache->expects($this->at(1))->method('load')->will($this->returnValue($this->time - 10000000));
@@ -757,7 +786,7 @@ public function testDispatchCleanup()
         )->setMethods(['getCollection', 'getResource'])->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->at(1))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->any())->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -781,55 +810,17 @@ public function testMissedJobsCleanedInTime()
         $this->_cache->expects($this->at(2))->method('load')->will($this->returnValue($this->time + 10000000));
         $this->_scheduleFactory->expects($this->at(2))->method('create')->will($this->returnValue($scheduleMock));
 
-        // This item was scheduled 2 days and 2 hours ago
-        $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 180000);
-        /** @var \Magento\Cron\Model\Schedule|\PHPUnit_Framework_MockObject_MockObject $schedule1 */
-        $schedule1 = $this->getMockBuilder(
-            \Magento\Cron\Model\Schedule::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getExecutedAt', 'getScheduledAt', 'getStatus', 'delete', '__wakeup']
-        )->getMock();
-        $schedule1->expects($this->any())->method('getExecutedAt')->will($this->returnValue(null));
-        $schedule1->expects($this->any())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-        $schedule1->expects($this->any())->method('getStatus')->will($this->returnValue(Schedule::STATUS_MISSED));
-        //we expect this job be deleted from the list
-        $schedule1->expects($this->once())->method('delete')->will($this->returnValue(true));
-        $this->_collection->addItem($schedule1);
-
-        // This item was scheduled 1 day ago
-        $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
-        $schedule2 = $this->getMockBuilder(
-            \Magento\Cron\Model\Schedule::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getExecutedAt', 'getScheduledAt', 'getStatus', 'delete', '__wakeup']
-        )->getMock();
-        $schedule2->expects($this->any())->method('getExecutedAt')->will($this->returnValue(null));
-        $schedule2->expects($this->any())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-        $schedule2->expects($this->any())->method('getStatus')->will($this->returnValue(Schedule::STATUS_MISSED));
-        //we don't expect this job be deleted from the list
-        $schedule2->expects($this->never())->method('delete');
-        $this->_collection->addItem($schedule2);
-
-        $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
-
-        $this->_scopeConfig->expects($this->at(0))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/history_cleanup_every'))
-            ->will($this->returnValue(10));
-        $this->_scopeConfig->expects($this->at(1))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/schedule_lifetime'))
-            ->will($this->returnValue(2*24*60));
-        $this->_scopeConfig->expects($this->at(2))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/history_success_lifetime'))
-            ->will($this->returnValue(0));
-        $this->_scopeConfig->expects($this->at(3))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/history_failure_lifetime'))
-            ->will($this->returnValue(0));
-        $this->_scopeConfig->expects($this->at(4))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/schedule_generate_every'))
-            ->will($this->returnValue(0));
-        $this->_scopeConfig->expects($this->at(5))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/use_separate_process'))
-            ->will($this->returnValue(0));
+        $this->_config->expects($this->atLeastOnce())->method('getJobs')->will($this->returnValue($jobConfig));
+
+        $this->_scopeConfig->expects($this->any())->method('getValue')
+            ->willReturnMap([
+                ['system/cron/test_group/use_separate_process', 0],
+                ['system/cron/test_group/history_cleanup_every', 10],
+                ['system/cron/test_group/schedule_lifetime', 2*24*60],
+                ['system/cron/test_group/history_success_lifetime', 0],
+                ['system/cron/test_group/history_failure_lifetime', 0],
+                ['system/cron/test_group/schedule_generate_every', 0],
+            ]);
 
         $this->_collection->expects($this->any())->method('addFieldToFilter')->will($this->returnSelf());
         $this->_collection->expects($this->any())->method('load')->will($this->returnSelf());
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index a3b87649f3c77..5595bf1cb55f5 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cron/etc/cron_groups.xml b/app/code/Magento/Cron/etc/cron_groups.xml
index a01426eab723e..9aa57662427c8 100644
--- a/app/code/Magento/Cron/etc/cron_groups.xml
+++ b/app/code/Magento/Cron/etc/cron_groups.xml
@@ -11,8 +11,8 @@
         <schedule_ahead_for>20</schedule_ahead_for>
         <schedule_lifetime>15</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>10080</history_success_lifetime>
-        <history_failure_lifetime>10080</history_failure_lifetime>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>4320</history_failure_lifetime>
         <use_separate_process>0</use_separate_process>
     </group>
 </config>
diff --git a/app/code/Magento/Cron/etc/db_schema.xml b/app/code/Magento/Cron/etc/db_schema.xml
new file mode 100644
index 0000000000000..b3061eefa6313
--- /dev/null
+++ b/app/code/Magento/Cron/etc/db_schema.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="cron_schedule" resource="default" engine="innodb" comment="Cron Schedule">
+        <column xsi:type="int" name="schedule_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Schedule Id"/>
+        <column xsi:type="varchar" name="job_code" nullable="false" length="255" default="0" comment="Job Code"/>
+        <column xsi:type="varchar" name="status" nullable="false" length="7" default="pending" comment="Status"/>
+        <column xsi:type="text" name="messages" nullable="true" comment="Messages"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="scheduled_at" on_update="false" nullable="true" comment="Scheduled At"/>
+        <column xsi:type="timestamp" name="executed_at" on_update="false" nullable="true" comment="Executed At"/>
+        <column xsi:type="timestamp" name="finished_at" on_update="false" nullable="true" comment="Finished At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="schedule_id"/>
+        </constraint>
+        <index referenceId="CRON_SCHEDULE_JOB_CODE" indexType="btree">
+            <column name="job_code"/>
+        </index>
+        <index referenceId="CRON_SCHEDULE_SCHEDULED_AT_STATUS" indexType="btree">
+            <column name="scheduled_at"/>
+            <column name="status"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Cron/etc/db_schema_whitelist.json b/app/code/Magento/Cron/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..c8666896627e2
--- /dev/null
+++ b/app/code/Magento/Cron/etc/db_schema_whitelist.json
@@ -0,0 +1,21 @@
+{
+    "cron_schedule": {
+        "column": {
+            "schedule_id": true,
+            "job_code": true,
+            "status": true,
+            "messages": true,
+            "created_at": true,
+            "scheduled_at": true,
+            "executed_at": true,
+            "finished_at": true
+        },
+        "index": {
+            "CRON_SCHEDULE_JOB_CODE": true,
+            "CRON_SCHEDULE_SCHEDULED_AT_STATUS": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Cron/etc/di.xml b/app/code/Magento/Cron/etc/di.xml
index a37f3760b70a5..3e3bdc2053576 100644
--- a/app/code/Magento/Cron/etc/di.xml
+++ b/app/code/Magento/Cron/etc/di.xml
@@ -16,6 +16,18 @@
     <type name="Magento\Framework\App\Config\Initial\Converter">
         <plugin name="cron_system_config_initial_converter_plugin" type="Magento\Cron\Model\System\Config\Initial\Converter" />
     </type>
+    <virtualType name="Magento\Cron\Model\VirtualLoggerHandler" type="Magento\Framework\Logger\Handler\Base">
+        <arguments>
+            <argument name="fileName" xsi:type="string">/var/log/cron.log</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Cron\Model\VirtualLogger" type="Magento\Framework\Logger\Monolog">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="system" xsi:type="object">Magento\Cron\Model\VirtualLoggerHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
     <!-- @api -->
     <virtualType name="shellBackground" type="Magento\Framework\Shell">
         <arguments>
@@ -25,6 +37,7 @@
     <type name="Magento\Cron\Observer\ProcessCronQueueObserver">
         <arguments>
             <argument name="shell" xsi:type="object">shellBackground</argument>
+            <argument name="logger" xsi:type="object">Magento\Cron\Model\VirtualLogger</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Console\CommandListInterface">
diff --git a/app/code/Magento/Cron/etc/module.xml b/app/code/Magento/Cron/etc/module.xml
index ce31b046500f7..8112b9e8c46db 100644
--- a/app/code/Magento/Cron/etc/module.xml
+++ b/app/code/Magento/Cron/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Cron" setup_version="2.0.0">
+    <module name="Magento_Cron" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
index c740b17ed008c..ec73ac0cf7aa5 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -20,7 +20,7 @@ class Currency extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'system/currency/rates.phtml';
+    protected $_template = 'Magento_CurrencySymbol::system/currency/rates.phtml';
 
     /**
      * Prepare layout
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
index 80415c9486898..e20054a5a8084 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
@@ -16,7 +16,7 @@ class Matrix extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'system/currency/rate/matrix.phtml';
+    protected $_template = 'Magento_CurrencySymbol::system/currency/rate/matrix.phtml';
 
     /**
      * @var \Magento\Directory\Model\CurrencyFactory
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
index 919a4d0ed6d7b..491ed93900bde 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
@@ -16,7 +16,7 @@ class Services extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'system/currency/rate/services.phtml';
+    protected $_template = 'Magento_CurrencySymbol::system/currency/rate/services.phtml';
 
     /**
      * @var \Magento\Directory\Model\Currency\Import\Source\ServiceFactory
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
index b16330f1b3f98..34d24a8b0a7a8 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
@@ -4,12 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currency as CurrencyAction;
 
-class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
+class FetchRates extends CurrencyAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Fetch rates action
@@ -24,14 +28,16 @@ public function execute()
             $service = $this->getRequest()->getParam('rate_services');
             $this->_getSession()->setCurrencyRateService($service);
             if (!$service) {
-                throw new LocalizedException(__('Please specify a correct Import Service.'));
+                throw new LocalizedException(__('The Import Service is incorrect. Verify the service and try again.'));
             }
             try {
                 /** @var \Magento\Directory\Model\Currency\Import\ImportInterface $importModel */
                 $importModel = $this->_objectManager->get(\Magento\Directory\Model\Currency\Import\Factory::class)
                     ->create($service);
             } catch (\Exception $e) {
-                throw new LocalizedException(__('We can\'t initialize the import model.'));
+                throw new LocalizedException(
+                    __("The import model can't be initialized. Verify the model and try again.")
+                );
             }
             $rates = $importModel->fetchRates();
             $errors = $importModel->getMessages();
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
index 9b07777a14dc7..a9b1b78cbc668 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
-class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpGetActionInterface
 {
     /**
      * Currency management main page
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
index ae13c4d399e47..8dd6b5e6fac41 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
@@ -7,7 +7,9 @@
 
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
-class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpPostActionInterface
 {
     /**
      * Save rates action
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
index 808372bd3a697..1762a907a75a4 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
-class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpGetActionInterface
 {
     /**
      * Show Currency Symbols Management dialog
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
index eee7961b02f4a..703117f34fce6 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
-class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpPostActionInterface
 {
     /**
      * Save custom Currency symbol
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index fcde688a1e145..6c7019986cce0 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -187,14 +187,16 @@ public function getCurrencySymbolsData()
     /**
      * Save currency symbol to config
      *
-     * @param  $symbols array
+     * @param array $symbols
      * @return $this
      */
     public function setCurrencySymbolsData($symbols = [])
     {
-        foreach ($this->getCurrencySymbolsData() as $code => $values) {
-            if (isset($symbols[$code]) && ($symbols[$code] == $values['parentSymbol'] || empty($symbols[$code]))) {
-                unset($symbols[$code]);
+        if (!$this->_storeManager->isSingleStoreMode()) {
+            foreach ($this->getCurrencySymbolsData() as $code => $values) {
+                if (isset($symbols[$code]) && ($symbols[$code] == $values['parentSymbol'] || empty($symbols[$code]))) {
+                    unset($symbols[$code]);
+                }
             }
         }
         $value = [];
diff --git a/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php b/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php
new file mode 100644
index 0000000000000..be2f2c5147124
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CurrencySymbol\Setup\Patch\Data;
+
+use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedCustomCurrencySymbolToJson
+ * @package Magento\CurrencySymbol\Setup\Patch
+ */
+class ConvertSerializedCustomCurrencySymbolToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * @param QueryModifierFactory $queryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     * @param QueryModifierFactory $queryModifierFactory
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        FieldDataConverterFactory $fieldDataConverterFactory,
+        QueryModifierFactory $queryModifierFactory,
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+        $this->queryModifierFactory = $queryModifierFactory;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $queryModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'path' => [Currencysymbol::XML_PATH_CUSTOM_CURRENCY_SYMBOL]
+                ]
+            ]
+        );
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'config_id',
+            'value',
+            $queryModifier
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php b/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php
deleted file mode 100644
index 474efde78ea5b..0000000000000
--- a/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\CurrencySymbol\Setup;
-
-use Magento\CurrencySymbol\Model\System\Currencysymbol;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * Data upgrade script
- *
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * @var QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * Constructor
-     *
-     * @param FieldDataConverterFactory $fieldDataConverterFactory
-     * @param QueryModifierFactory $queryModifierFactory
-     */
-    public function __construct(
-        FieldDataConverterFactory $fieldDataConverterFactory,
-        QueryModifierFactory $queryModifierFactory
-    ) {
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-        $this->queryModifierFactory = $queryModifierFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->convertSerializedCustomCurrencySymbolToJson($setup);
-        }
-    }
-
-    /**
-     * Converts custom currency symbol configuration in core_config_data table from serialized to JSON format
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function convertSerializedCustomCurrencySymbolToJson(ModuleDataSetupInterface $setup)
-    {
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-        $queryModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'path' => [Currencysymbol::XML_PATH_CUSTOM_CURRENCY_SYMBOL]
-                ]
-            ]
-        );
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('core_config_data'),
-            'config_id',
-            'value',
-            $queryModifier
-        );
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE.txt b/app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE.txt
rename to app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE_AFL.txt b/app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE_AFL.txt
rename to app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
new file mode 100644
index 0000000000000..f523cb58d3bb6
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ConfigCurrencySetupPage" url="admin/system_config/edit/section/currency" area="admin" module="Magento_Config">
+    </page>
+</pages>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/README.md b/app/code/Magento/CurrencySymbol/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5a927d934494a
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Currency Symbol Functional Tests
+
+The Functional Test Module for **Magento Currency Symbol** module.
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
new file mode 100644
index 0000000000000..20fcd1e89360c
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CurrencySetupSection">
+        <element name="allowCurrencies" type="select" selector="#currency_options_allow"/>
+        <element name="currencyOptions" type="select" selector="#currency_options-head"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php
index 453a06651f354..0ae099fd78edc 100644
--- a/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php
+++ b/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php
@@ -236,6 +236,9 @@ public function testGetCurrencySymbol(
         $this->assertEquals($expectedSymbol, $currencySymbol);
     }
 
+    /**
+     * @return array
+     */
     public function getCurrencySymbolDataProvider()
     {
         return [
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index deb971933f9fa..009cb62488916 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CurrencySymbol/etc/module.xml b/app/code/Magento/CurrencySymbol/etc/module.xml
index f638479031f4f..2af87335518d1 100644
--- a/app/code/Magento/CurrencySymbol/etc/module.xml
+++ b/app/code/Magento/CurrencySymbol/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CurrencySymbol" setup_version="2.0.1">
+    <module name="Magento_CurrencySymbol" >
         <sequence>
             <module name="Magento_Widget"/>
         </sequence>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 7dca29263bae3..6e9b9a396ec2f 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -13,8 +13,6 @@
  */
 ?>
 
-<?php $block->getCurrencySymbolsData();?>
-
 <form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
     <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
     <fieldset class="admin__fieldset">
@@ -25,10 +23,9 @@
             </label>
             <div class="admin__field-control">
                 <input id="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>"
-                       class="required-entry admin__control-text"
+                       class="required-entry admin__control-text <?= $data['inherited'] ? 'disabled' : '' ?>"
                        type="text"
                        value="<?= $block->escapeHtmlAttr($data['displaySymbol']) ?>"
-                       <?= $data['inherited'] ? ' disabled="disabled"' : '' ?>
                        name="custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
                 <div class="admin__field admin__field-option">
                     <input id="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"
@@ -51,16 +48,18 @@ require(['jquery', "mage/mage", 'prototype'], function(jQuery){
 
     function toggleUseDefault(code, value)
     {
-        checkbox = $('custom_currency_symbol_inherit'+code);
-        input = $('custom_currency_symbol'+code);
-        if (checkbox.checked) {
-            input.value = value;
-            input.disabled = true;
+        checkbox = jQuery('#custom_currency_symbol_inherit'+code);
+        input = jQuery('#custom_currency_symbol'+code);
+
+        if (checkbox.is(':checked')) {
+            input.addClass('disabled');
+            input.val(value);
+            input.prop('readonly', true);
         } else {
-            input.disabled = false;
+            input.removeClass('disabled');
+            input.prop('readonly', false);
         }
     }
-
     window.toggleUseDefault = toggleUseDefault;
 });
 </script>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
index 8e0abcb319764..8a16eb71e0853 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
@@ -45,7 +45,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
                                            class="admin__control-text"
                                             <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
                                     <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
                                     <?php endif; ?>
                                 </td>
                             <?php else: ?>
@@ -56,7 +56,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
                                            class="admin__control-text"
                                            <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
                                     <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
                                     <?php endif; ?>
                                 </td>
                             <?php endif; ?>
diff --git a/app/code/Magento/Customer/Api/AccountDelegationInterface.php b/app/code/Magento/Customer/Api/AccountDelegationInterface.php
new file mode 100644
index 0000000000000..e3a738530c49d
--- /dev/null
+++ b/app/code/Magento/Customer/Api/AccountDelegationInterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Api;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Controller\Result\Redirect;
+
+/**
+ * Delegating account actions from outside of customer module.
+ */
+interface AccountDelegationInterface
+{
+    /**
+     * Create redirect to default new account form.
+     *
+     * @param CustomerInterface $customer Pre-filled customer data.
+     * @param array|null $mixedData Add this data to new-customer event
+     * if the new customer is created.
+     *
+     * @return Redirect
+     */
+    public function createRedirectForNew(
+        CustomerInterface $customer,
+        array $mixedData = null
+    ): Redirect;
+}
diff --git a/app/code/Magento/Customer/Api/AccountManagementInterface.php b/app/code/Magento/Customer/Api/AccountManagementInterface.php
index d2f9fb7ebc420..e84da5b9fcd57 100644
--- a/app/code/Magento/Customer/Api/AccountManagementInterface.php
+++ b/app/code/Magento/Customer/Api/AccountManagementInterface.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Customer\Api;
 
+use Magento\Framework\Exception\InputException;
+
 /**
  * Interface for managing customers accounts.
  * @api
@@ -29,13 +31,15 @@ interface AccountManagementInterface
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @param string $password
      * @param string $redirectUrl
+     * @param string[] $extensions
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function createAccount(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
         $password = null,
-        $redirectUrl = ''
+        $redirectUrl = '',
+        $extensions = []
     );
 
     /**
@@ -46,6 +50,7 @@ public function createAccount(
      * @param string $hash Password hash that we can save directly
      * @param string $redirectUrl URL fed to welcome email templates. Can be used by templates to, for example, direct
      *                            the customer to a product they were looking at after pressing confirmation link.
+     * @param string[] $extensions
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\InputException If bad input is provided
      * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
@@ -54,7 +59,8 @@ public function createAccount(
     public function createAccountWithPasswordHash(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
         $hash,
-        $redirectUrl = ''
+        $redirectUrl = '',
+        $extensions = []
     );
 
     /**
@@ -144,19 +150,24 @@ public function initiatePasswordReset($email, $template, $websiteId = null);
     /**
      * Reset customer password.
      *
-     * @param string $email
+     * @param string $email If empty value given then the customer
+     * will be matched by the RP token.
      * @param string $resetToken
      * @param string $newPassword
+     *
      * @return bool true on success
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InputException
      */
     public function resetPassword($email, $resetToken, $newPassword);
 
     /**
      * Check if password reset token is valid.
      *
-     * @param int $customerId
+     * @param int $customerId If null is given then a customer
+     * will be matched by the RP token.
      * @param string $resetPasswordLinkToken
+     *
      * @return bool True if the token is valid
      * @throws \Magento\Framework\Exception\State\InputMismatchException If token is mismatched
      * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
index ded7238edc755..87132c3afb8bc 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
@@ -102,7 +102,7 @@ public function getSubscriptionObject()
             $this->_subscription = $this->_createSubscriber();
             $customer = $this->getCustomer();
             if ($customer) {
-                $this->_subscription->loadByEmail($customer->getEmail());
+                $this->_subscription->loadByCustomerId($customer->getId());
             }
         }
         return $this->_subscription;
diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
index cb38d762769f2..705acbcda4c6a 100644
--- a/app/code/Magento/Customer/Block/Account/Navigation.php
+++ b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Customer\Block\Account;
 
@@ -44,8 +45,8 @@ public function getLinks()
      * @return int
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
-    private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink)
+    private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
     {
-        return ($firstLink->getSortOrder() < $secondLink->getSortOrder());
+        return  $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
     }
 }
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index 6362f28a4f96d..6a42e9670ccc6 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -129,7 +129,7 @@ protected function _prepareLayout()
 
         if ($postedData = $this->_customerSession->getAddressFormData(true)) {
             $postedData['region'] = [
-                'region_id' => $postedData['region_id'],
+                'region_id' => isset($postedData['region_id']) ? $postedData['region_id'] : null,
                 'region' => $postedData['region'],
             ];
             $this->dataObjectHelper->populateWithArray(
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php
new file mode 100644
index 0000000000000..d94b956918370
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/CancelButton.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
+
+/**
+ * Class CancelButton
+ */
+class CancelButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @inheritdoc
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Cancel'),
+            'on_click' => '',
+            'data_attribute' => [
+                'mage-init' => [
+                    'Magento_Ui/js/form/button-adapter' => [
+                        'actions' => [
+                            [
+                                'targetName' => 'customer_form.areas.address.address.customer_address_update_modal',
+                                'actionName' => 'closeModal'
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'sort_order' => 20
+        ];
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php
new file mode 100644
index 0000000000000..da589a25df28e
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/DeleteButton.php
@@ -0,0 +1,65 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Customer\Ui\Component\Listing\Address\Column\Actions;
+
+/**
+ * Delete button on edit customer address form
+ */
+class DeleteButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * Get delete button data.
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        if ($this->getAddressId()) {
+            $data = [
+                'label' => __('Delete'),
+                'on_click' => '',
+                'data_attribute' => [
+                    'mage-init' => [
+                        'Magento_Ui/js/form/button-adapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'customer_address_form.customer_address_form',
+                                    'actionName' => 'deleteAddress',
+                                    'params' => [
+                                        $this->getDeleteUrl(),
+                                    ],
+
+                                ]
+                            ],
+                        ],
+                    ],
+                ],
+                'sort_order' => 20
+            ];
+        }
+        return $data;
+    }
+
+    /**
+     * Get delete button url.
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getDeleteUrl(): string
+    {
+        return $this->getUrl(
+            Actions::CUSTOMER_ADDRESS_PATH_DELETE,
+            ['parent_id' => $this->getCustomerId(), 'id' => $this->getAddressId()]
+        );
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php
new file mode 100644
index 0000000000000..ae09ee6896891
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/GenericButton.php
@@ -0,0 +1,110 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
+
+use Magento\Customer\Model\AddressFactory;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Customer\Model\ResourceModel\Address;
+use Magento\Customer\Model\ResourceModel\AddressRepository;
+
+/**
+ * Class for common code for buttons on the create/edit address form
+ */
+class GenericButton
+{
+    /**
+     * @var AddressFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var Address
+     */
+    private $addressResourceModel;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var AddressRepository
+     */
+    private $addressRepository;
+
+    /**
+     * @param AddressFactory $addressFactory
+     * @param UrlInterface $urlBuilder
+     * @param Address $addressResourceModel
+     * @param RequestInterface $request
+     * @param AddressRepository $addressRepository
+     */
+    public function __construct(
+        AddressFactory $addressFactory,
+        UrlInterface $urlBuilder,
+        Address $addressResourceModel,
+        RequestInterface $request,
+        AddressRepository $addressRepository
+    ) {
+        $this->addressFactory = $addressFactory;
+        $this->urlBuilder = $urlBuilder;
+        $this->addressResourceModel = $addressResourceModel;
+        $this->request = $request;
+        $this->addressRepository = $addressRepository;
+    }
+
+    /**
+     * Return address Id.
+     *
+     * @return int|null
+     */
+    public function getAddressId()
+    {
+        $address = $this->addressFactory->create();
+
+        $entityId = $this->request->getParam('entity_id');
+        $this->addressResourceModel->load(
+            $address,
+            $entityId
+        );
+
+        return $address->getEntityId() ?: null;
+    }
+
+    /**
+     * Get customer id.
+     *
+     * @return int|null
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getCustomerId()
+    {
+        $addressId = $this->request->getParam('entity_id');
+
+        $address = $this->addressRepository->getById($addressId);
+
+        return $address->getCustomerId() ?: null;
+    }
+
+    /**
+     * Generate url by route and parameters
+     *
+     * @param   string $route
+     * @param   array $params
+     * @return  string
+     */
+    public function getUrl($route = '', array $params = []): string
+    {
+        return $this->urlBuilder->getUrl($route, $params);
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php
new file mode 100644
index 0000000000000..9d403185ca888
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Address/SaveButton.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Block\Adminhtml\Edit\Address;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
+
+/**
+ * Class SaveButton
+ */
+class SaveButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @inheritdoc
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Save'),
+            'class' => 'save primary',
+            'data_attribute' => [
+                'mage-init' => ['button' => ['event' => 'save']],
+                'form-role' => 'save',
+            ],
+            'sort_order' => 10
+        ];
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
index f2d1dd9f0a853..aa93785116851 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php
@@ -13,6 +13,8 @@
 class ResetPasswordButton extends GenericButton implements ButtonProviderInterface
 {
     /**
+     * Retrieve button-specified settings
+     *
      * @return array
      */
     public function getButtonData()
@@ -31,6 +33,8 @@ public function getButtonData()
     }
 
     /**
+     * Get reset password url
+     *
      * @return string
      */
     public function getResetPasswordUrl()
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
index 9ee152078d960..db560f7de3ecb 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -82,7 +82,7 @@ protected function _construct()
         parent::_construct();
         $this->setUseAjax(true);
         $this->_parentTemplate = $this->getTemplate();
-        $this->setTemplate('tab/cart.phtml');
+        $this->setTemplate('Magento_Customer::tab/cart.phtml');
     }
 
     /**
@@ -220,7 +220,7 @@ public function getGridParentHtml()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
index 8506defbf9005..46a8dcfb28f1b 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -17,7 +17,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
     /**
      * @var string
      */
-    protected $_template = 'tab/newsletter.phtml';
+    protected $_template = 'Magento_Customer::tab/newsletter.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory
@@ -160,7 +160,7 @@ public function initForm()
             ]
         );
 
-        if ($this->customerAccountManagement->isReadOnly($customerId)) {
+        if ($this->customerAccountManagement->isReadonly($customerId)) {
             $form->getElement('subscription')->setReadonly(true, true);
         }
         $isSubscribed = $subscriber->isSubscribed();
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
index bb190260e4776..f2b8133e352ad 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
@@ -57,7 +57,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -102,7 +102,7 @@ protected function _prepareCollection()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _prepareColumns()
     {
@@ -123,7 +123,8 @@ protected function _prepareColumns()
                 'header' => __('Order Total'),
                 'index' => 'grand_total',
                 'type' => 'currency',
-                'currency' => 'order_currency_code'
+                'currency' => 'order_currency_code',
+                'rate'  => 1
             ]
         );
 
@@ -162,7 +163,7 @@ public function getRowUrl($row)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 81b7b8b3f96b5..a6e0eb0bcbc58 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -152,13 +152,12 @@ public function __construct(
     /**
      * Set customer registry
      *
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Registry $customerRegistry
      * @return void
      * @deprecated 100.1.0
      */
     public function setCustomerRegistry(\Magento\Customer\Model\CustomerRegistry $customerRegistry)
     {
-
         $this->customerRegistry = $customerRegistry;
     }
 
@@ -461,7 +460,7 @@ protected function getOnlineMinutesInterval()
             'customer/online_customers/online_minutes_interval',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        return intval($configValue) > 0 ? intval($configValue) : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
+        return (int)$configValue > 0 ? (int)$configValue : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
index 76c33f143e671..5eeacca4c73a5 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
@@ -147,10 +147,12 @@ public function _beforeToHtml()
      */
     public function getWebsiteCount($websiteId)
     {
-        return isset($this->_websiteCounts[$websiteId]) ? $this->_websiteCounts[$websiteId] : 0;
+        return $this->_websiteCounts[$websiteId] ?? 0;
     }
 
     /**
+     * Returns Grouped Collection Rows
+     *
      * @return array
      */
     public function getRows()
@@ -159,6 +161,8 @@ public function getRows()
     }
 
     /**
+     * Return totals data
+     *
      * @return \Magento\Framework\DataObject
      */
     public function getTotals()
@@ -171,7 +175,9 @@ public function getTotals()
      *
      * @param float $price
      * @param null|int $websiteId
+     *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function formatCurrency($price, $websiteId = null)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
index 4a0d0f66425bb..9ee856f6e0af9 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -24,7 +24,7 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
     /**
      * @var string
      */
-    protected $_template = 'sales/order/create/address/form/renderer/vat.phtml';
+    protected $_template = 'Magento_Customer::sales/order/create/address/form/renderer/vat.phtml';
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
diff --git a/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php b/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
index 83ce7bef26d60..8cbe5c0680bd3 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
@@ -99,7 +99,7 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
         if (!$this->getTemplate()) {
-            $this->setTemplate('system/config/validatevat.phtml');
+            $this->setTemplate('Magento_Customer::system/config/validatevat.phtml');
         }
         return $this;
     }
diff --git a/app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php
new file mode 100644
index 0000000000000..2be340c8ccca4
--- /dev/null
+++ b/app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\DataProviders;
+
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Provides address attribute data into template.
+ */
+class AddressAttributeData implements ArgumentInterface
+{
+    /**
+     * @var AddressMetadataInterface
+     */
+    private $addressMetadata;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param AddressMetadataInterface $addressMetadata
+     * @param Escaper $escaper
+     */
+    public function __construct(
+        AddressMetadataInterface $addressMetadata,
+        Escaper $escaper
+    ) {
+
+        $this->addressMetadata = $addressMetadata;
+        $this->escaper = $escaper;
+    }
+
+    /**
+     * Returns frontend label for attribute.
+     *
+     * @param string $attributeCode
+     * @return string
+     * @throws LocalizedException
+     */
+    public function getFrontendLabel(string $attributeCode): string
+    {
+        try {
+            $attribute =  $this->addressMetadata->getAttributeMetadata($attributeCode);
+            $frontendLabel = $attribute->getFrontendLabel();
+        } catch (NoSuchEntityException $e) {
+            $frontendLabel = '';
+        }
+
+        return $this->escaper->escapeHtml(__($frontendLabel));
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php
index 7a34b1d892bc1..a5e768915f91b 100644
--- a/app/code/Magento/Customer/Block/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Newsletter.php
@@ -20,7 +20,7 @@ class Newsletter extends \Magento\Customer\Block\Account\Dashboard
     /**
      * @var string
      */
-    protected $_template = 'form/newsletter.phtml';
+    protected $_template = 'Magento_Customer::form/newsletter.phtml';
 
     /**
      * @return bool
diff --git a/app/code/Magento/Customer/Block/Widget/Company.php b/app/code/Magento/Customer/Block/Widget/Company.php
index 4b928805fa543..8052e396f7dda 100644
--- a/app/code/Magento/Customer/Block/Widget/Company.php
+++ b/app/code/Magento/Customer/Block/Widget/Company.php
@@ -40,12 +40,12 @@ class Company extends AbstractWidget
     protected $options;
 
     /**
-     * @param Context                   $context
-     * @param AddressHelper             $addressHelper
+     * @param Context $context
+     * @param AddressHelper $addressHelper
      * @param CustomerMetadataInterface $customerMetadata
-     * @param Options                   $options
-     * @param AddressMetadataInterface  $addressMetadata
-     * @param array                     $data
+     * @param Options $options
+     * @param AddressMetadataInterface $addressMetadata
+     * @param array $data
      */
     public function __construct(
         Context $context,
@@ -69,7 +69,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/company.phtml');
+        $this->setTemplate('Magento_Customer::widget/company.phtml');
     }
 
     /**
@@ -95,7 +95,7 @@ public function showCompany()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getAttribute($attributeCode)
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index f29a9fc76f1d2..936563d519823 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -66,7 +66,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('widget/dob.phtml');
+        $this->setTemplate('Magento_Customer::widget/dob.phtml');
     }
 
     /**
@@ -127,7 +127,8 @@ protected function getFormFilter()
     protected function applyOutputFilter($value)
     {
         $filter = $this->getFormFilter();
-        if ($filter) {
+        if ($filter && $value) {
+            $value = date('Y-m-d', $this->getTime());
             $value = $filter->outputFilter($value);
         }
         return $value;
@@ -186,7 +187,8 @@ public function getFieldHtml()
             'max_date' => '-1d',
             'change_month' => 'true',
             'change_year' => 'true',
-            'show_on' => 'both'
+            'show_on' => 'both',
+            'first_day' => $this->getFirstDay()
         ]);
         return $this->dateElement->getHtml();
     }
@@ -208,17 +210,14 @@ public function getHtmlId()
      */
     public function getHtmlExtraParams()
     {
-        $extraParams = [
-            "'validate-date-au':true"
-        ];
-
+        $validators = [];
         if ($this->isRequired()) {
-            $extraParams[] = 'required:true';
+            $validators['required'] = true;
         }
-
-        $extraParams = implode(', ', $extraParams);
-
-        return 'data-validate="{' . $extraParams . '}"';
+        $validators['validate-date'] = [
+            'dateFormat' => $this->getDateFormat()
+        ];
+        return 'data-validate="' . $this->_escaper->escapeHtml(json_encode($validators)) . '"';
     }
 
     /**
@@ -228,7 +227,7 @@ public function getHtmlExtraParams()
      */
     public function getDateFormat()
     {
-        return $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        return $this->_localeDate->getDateFormatWithLongYear();
     }
 
     /**
@@ -307,4 +306,17 @@ public function getMaxDateRange()
         }
         return null;
     }
+
+    /**
+     * Return first day of the week
+     *
+     * @return int
+     */
+    public function getFirstDay()
+    {
+        return (int)$this->_scopeConfig->getValue(
+            'general/locale/firstday',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Customer/Block/Widget/Fax.php b/app/code/Magento/Customer/Block/Widget/Fax.php
index 2ede51f0eec96..aa1cff632abd3 100644
--- a/app/code/Magento/Customer/Block/Widget/Fax.php
+++ b/app/code/Magento/Customer/Block/Widget/Fax.php
@@ -40,12 +40,12 @@ class Fax extends AbstractWidget
     protected $options;
 
     /**
-     * @param Context                   $context
-     * @param AddressHelper             $addressHelper
+     * @param Context $context
+     * @param AddressHelper $addressHelper
      * @param CustomerMetadataInterface $customerMetadata
-     * @param Options                   $options
-     * @param AddressMetadataInterface  $addressMetadata
-     * @param array                     $data
+     * @param Options $options
+     * @param AddressMetadataInterface $addressMetadata
+     * @param array $data
      */
     public function __construct(
         Context $context,
@@ -69,7 +69,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/fax.phtml');
+        $this->setTemplate('Magento_Customer::widget/fax.phtml');
     }
 
     /**
@@ -95,7 +95,7 @@ public function showFax()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getAttribute($attributeCode)
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Gender.php b/app/code/Magento/Customer/Block/Widget/Gender.php
index 1d3730e6c6d58..d03c64a54fb94 100644
--- a/app/code/Magento/Customer/Block/Widget/Gender.php
+++ b/app/code/Magento/Customer/Block/Widget/Gender.php
@@ -59,7 +59,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('widget/gender.phtml');
+        $this->setTemplate('Magento_Customer::widget/gender.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Name.php b/app/code/Magento/Customer/Block/Widget/Name.php
index ecd09319cd85e..d50045f4a4092 100644
--- a/app/code/Magento/Customer/Block/Widget/Name.php
+++ b/app/code/Magento/Customer/Block/Widget/Name.php
@@ -62,7 +62,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/name.phtml');
+        $this->setTemplate('Magento_Customer::widget/name.phtml');
     }
 
     /**
@@ -106,8 +106,11 @@ public function getPrefixOptions()
         $prefixOptions = $this->options->getNamePrefixOptions();
 
         if ($this->getObject() && !empty($prefixOptions)) {
-            $oldPrefix = $this->escapeHtml(trim($this->getObject()->getPrefix()));
-            $prefixOptions[$oldPrefix] = $oldPrefix;
+            $prefixOption = $this->getObject()->getPrefix();
+            $oldPrefix = $this->escapeHtml(trim($prefixOption));
+            if ($prefixOption !== null && !isset($prefixOptions[$oldPrefix]) && !isset($prefixOptions[$prefixOption])) {
+                $prefixOptions[$oldPrefix] = $oldPrefix;
+            }
         }
         return $prefixOptions;
     }
@@ -161,8 +164,11 @@ public function getSuffixOptions()
     {
         $suffixOptions = $this->options->getNameSuffixOptions();
         if ($this->getObject() && !empty($suffixOptions)) {
-            $oldSuffix = $this->escapeHtml(trim($this->getObject()->getSuffix()));
-            $suffixOptions[$oldSuffix] = $oldSuffix;
+            $suffixOption = $this->getObject()->getSuffix();
+            $oldSuffix = $this->escapeHtml(trim($suffixOption));
+            if ($suffixOption !== null && !isset($suffixOptions[$oldSuffix]) && !isset($suffixOptions[$suffixOption])) {
+                $suffixOptions[$oldSuffix] = $oldSuffix;
+            }
         }
         return $suffixOptions;
     }
@@ -195,7 +201,7 @@ public function getContainerClassName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getAttribute($attributeCode)
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Taxvat.php b/app/code/Magento/Customer/Block/Widget/Taxvat.php
index e695681ad4a6c..e5c9c01dc3ac5 100644
--- a/app/code/Magento/Customer/Block/Widget/Taxvat.php
+++ b/app/code/Magento/Customer/Block/Widget/Taxvat.php
@@ -41,7 +41,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('widget/taxvat.phtml');
+        $this->setTemplate('Magento_Customer::widget/taxvat.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Telephone.php b/app/code/Magento/Customer/Block/Widget/Telephone.php
index b0d155eff6db5..b67e92ed7d29f 100644
--- a/app/code/Magento/Customer/Block/Widget/Telephone.php
+++ b/app/code/Magento/Customer/Block/Widget/Telephone.php
@@ -40,12 +40,12 @@ class Telephone extends AbstractWidget
     protected $options;
 
     /**
-     * @param Context                   $context
-     * @param AddressHelper             $addressHelper
+     * @param Context $context
+     * @param AddressHelper $addressHelper
      * @param CustomerMetadataInterface $customerMetadata
-     * @param Options                   $options
-     * @param AddressMetadataInterface  $addressMetadata
-     * @param array                     $data
+     * @param Options $options
+     * @param AddressMetadataInterface $addressMetadata
+     * @param array $data
      */
     public function __construct(
         Context $context,
@@ -69,7 +69,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/telephone.phtml');
+        $this->setTemplate('Magento_Customer::widget/telephone.phtml');
     }
 
     /**
@@ -95,7 +95,7 @@ public function showTelephone()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getAttribute($attributeCode)
     {
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
index e7d23cac8d62a..a3e2db0207630 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirmation.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -6,8 +6,10 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Model\Url;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
@@ -35,24 +37,32 @@ class Confirmation extends \Magento\Customer\Controller\AbstractAccount
      */
     protected $resultPageFactory;
 
+    /**
+     * @var Url
+     */
+    private $customerUrl;
+
     /**
      * @param Context $context
      * @param Session $customerSession
      * @param PageFactory $resultPageFactory
      * @param StoreManagerInterface $storeManager
      * @param AccountManagementInterface $customerAccountManagement
+     * @param Url $customerUrl
      */
     public function __construct(
         Context $context,
         Session $customerSession,
         PageFactory $resultPageFactory,
         StoreManagerInterface $storeManager,
-        AccountManagementInterface $customerAccountManagement
+        AccountManagementInterface $customerAccountManagement,
+        Url $customerUrl = null
     ) {
         $this->session = $customerSession;
         $this->resultPageFactory = $resultPageFactory;
         $this->storeManager = $storeManager;
         $this->customerAccountManagement = $customerAccountManagement;
+        $this->customerUrl = $customerUrl ?: ObjectManager::getInstance()->get(Url::class);
         parent::__construct($context);
     }
 
@@ -98,6 +108,8 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->getBlock('accountConfirmation')->setEmail(
             $this->getRequest()->getParam('email', $email)
+        )->setLoginUrl(
+            $this->customerUrl->getLoginUrl()
         );
         return $resultPage;
     }
diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php
index 8f1bc107547ea..450fe461534a6 100644
--- a/app/code/Magento/Customer/Controller/Account/Create.php
+++ b/app/code/Magento/Customer/Controller/Account/Create.php
@@ -6,12 +6,13 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\Model\Registration;
 use Magento\Customer\Model\Session;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\Context;
 
-class Create extends \Magento\Customer\Controller\AbstractAccount
+class Create extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Customer\Model\Registration
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePassword.php b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
index fb2e3dd42908b..124ac912a7ccf 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePassword.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,10 +7,16 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\Context;
 
-class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
+/**
+ * Class CreatePassword
+ *
+ * @package Magento\Customer\Controller\Account
+ */
+class CreatePassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -54,27 +59,27 @@ public function __construct(
     public function execute()
     {
         $resetPasswordToken = (string)$this->getRequest()->getParam('token');
-        $customerId = (int)$this->getRequest()->getParam('id');
-        $isDirectLink = $resetPasswordToken != '' && $customerId != 0;
+        $isDirectLink = $resetPasswordToken != '';
         if (!$isDirectLink) {
             $resetPasswordToken = (string)$this->session->getRpToken();
-            $customerId = (int)$this->session->getRpCustomerId();
         }
 
         try {
-            $this->accountManagement->validateResetPasswordLinkToken($customerId, $resetPasswordToken);
+            $this->accountManagement->validateResetPasswordLinkToken(null, $resetPasswordToken);
 
             if ($isDirectLink) {
                 $this->session->setRpToken($resetPasswordToken);
-                $this->session->setRpCustomerId($customerId);
                 $resultRedirect = $this->resultRedirectFactory->create();
                 $resultRedirect->setPath('*/*/createpassword');
+
                 return $resultRedirect;
             } else {
                 /** @var \Magento\Framework\View\Result\Page $resultPage */
                 $resultPage = $this->resultPageFactory->create();
-                $resultPage->getLayout()->getBlock('resetPassword')->setCustomerId($customerId)
+                $resultPage->getLayout()
+                    ->getBlock('resetPassword')
                     ->setResetPasswordLinkToken($resetPasswordToken);
+
                 return $resultPage;
             }
         } catch (\Exception $exception) {
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 27d8ddd99344c..79a575add7347 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -5,14 +5,20 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Helper\Address;
@@ -29,12 +35,13 @@
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Customer\Controller\AbstractAccount;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CreatePost extends \Magento\Customer\Controller\AbstractAccount
+class CreatePost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -273,6 +280,31 @@ protected function extractAddress()
         return $addressDataObject;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $url = $this->urlModel->getUrl('*/*/create', ['_secure' => true]);
+        $resultRedirect->setUrl($this->_redirect->error($url));
+
+        return new InvalidRequestException(
+            $resultRedirect,
+            [new Phrase('Invalid Form Key. Please refresh the page.')]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return null;
+    }
+
     /**
      * Create customer account action
      *
@@ -282,17 +314,19 @@ protected function extractAddress()
      */
     public function execute()
     {
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         if ($this->session->isLoggedIn() || !$this->registration->isAllowed()) {
             $resultRedirect->setPath('*/*/');
             return $resultRedirect;
         }
 
-        if (!$this->getRequest()->isPost() || !$this->formKeyValidator->validate($this->getRequest())) {
+        if (!$this->getRequest()->isPost()
+            || !$this->formKeyValidator->validate($this->getRequest())
+        ) {
             $url = $this->urlModel->getUrl('*/*/create', ['_secure' => true]);
-            $resultRedirect->setUrl($this->_redirect->error($url));
-            return $resultRedirect;
+            return $this->resultRedirectFactory->create()
+                ->setUrl($this->_redirect->error($url));
         }
 
         $this->session->regenerateId();
@@ -375,8 +409,7 @@ public function execute()
 
         $this->session->setCustomerFormData($this->getRequest()->getPostValue());
         $defaultUrl = $this->urlModel->getUrl('*/*/create', ['_secure' => true]);
-        $resultRedirect->setUrl($this->_redirect->error($defaultUrl));
-        return $resultRedirect;
+        return $resultRedirect->setUrl($this->_redirect->error($defaultUrl));
     }
 
     /**
diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php
index 3c1e60199399b..7c2b7215a05ef 100644
--- a/app/code/Magento/Customer/Controller/Account/Edit.php
+++ b/app/code/Magento/Customer/Controller/Account/Edit.php
@@ -6,13 +6,14 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Customer\Model\Session;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\Context;
 
-class Edit extends \Magento\Customer\Controller\AbstractAccount
+class Edit extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Customer\Api\CustomerRepositoryInterface
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index 3f895ad2f17ac..38bc52eac4266 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -4,28 +4,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Customer\Mapper;
 use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerExtractor;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\Escaper;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Exception\State\UserLockedException;
+use Magento\Customer\Controller\AbstractAccount;
+use Magento\Framework\Phrase;
 
 /**
  * Class EditPost
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class EditPost extends \Magento\Customer\Controller\AbstractAccount
+class EditPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
 {
     /**
      * Form code for data extractor
@@ -72,6 +80,11 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
      */
     private $customerMapper;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -79,6 +92,7 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
      * @param CustomerRepositoryInterface $customerRepository
      * @param Validator $formKeyValidator
      * @param CustomerExtractor $customerExtractor
+     * @param Escaper|null $escaper
      */
     public function __construct(
         Context $context,
@@ -86,7 +100,8 @@ public function __construct(
         AccountManagementInterface $customerAccountManagement,
         CustomerRepositoryInterface $customerRepository,
         Validator $formKeyValidator,
-        CustomerExtractor $customerExtractor
+        CustomerExtractor $customerExtractor,
+        ?Escaper $escaper = null
     ) {
         parent::__construct($context);
         $this->session = $customerSession;
@@ -94,6 +109,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->formKeyValidator = $formKeyValidator;
         $this->customerExtractor = $customerExtractor;
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
     }
 
     /**
@@ -130,6 +146,30 @@ private function getEmailNotification()
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/*/edit');
+
+        return new InvalidRequestException(
+            $resultRedirect,
+            [new Phrase('Invalid Form Key. Please refresh the page.')]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return null;
+    }
+
     /**
      * Change customer email or password action
      *
@@ -165,19 +205,20 @@ public function execute()
                 $this->messageManager->addSuccess(__('You saved the account information.'));
                 return $resultRedirect->setPath('customer/account');
             } catch (InvalidEmailOrPasswordException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
             } catch (UserLockedException $e) {
                 $message = __(
-                    'You did not sign in correctly or your account is temporarily disabled.'
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
                 );
                 $this->session->logout();
                 $this->session->start();
                 $this->messageManager->addError($message);
                 return $resultRedirect->setPath('customer/account/login');
             } catch (InputException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
                 foreach ($e->getErrors() as $error) {
-                    $this->messageManager->addError($error->getMessage());
+                    $this->messageManager->addErrorMessage($this->escaper->escapeHtml($error->getMessage()));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
@@ -188,7 +229,10 @@ public function execute()
             $this->session->setCustomerFormData($this->getRequest()->getPostValue());
         }
 
-        return $resultRedirect->setPath('*/*/edit');
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/*/edit');
+        return $resultRedirect;
     }
 
     /**
@@ -287,7 +331,9 @@ private function processChangeEmailRequest(\Magento\Customer\Api\Data\CustomerIn
                     $this->getRequest()->getPost('current_password')
                 );
             } catch (InvalidEmailOrPasswordException $e) {
-                throw new InvalidEmailOrPasswordException(__('The password doesn\'t match this account.'));
+                throw new InvalidEmailOrPasswordException(
+                    __("The password doesn't match this account. Verify the password and try again.")
+                );
             }
         }
     }
diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
index f115b64efebdd..cfa605580777c 100644
--- a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
+++ b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
@@ -1,16 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount
+/**
+ * Forgot Password controller
+ */
+class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
@@ -40,10 +43,17 @@ public function __construct(
     /**
      * Forgot customer password page
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
      */
     public function execute()
     {
+        if ($this->session->isLoggedIn()) {
+            /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setPath('*/*/');
+            return $resultRedirect;
+        }
+
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->getBlock('forgotPassword')->setEmailValue($this->session->getForgottenEmail());
diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
index fe92032b1b75e..3c7fca99184d0 100644
--- a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\Session;
@@ -18,7 +19,7 @@
  * ForgotPasswordPost controller
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount
+class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -66,7 +67,9 @@ public function execute()
         if ($email) {
             if (!\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
                 $this->session->setForgottenEmail($email);
-                $this->messageManager->addErrorMessage(__('Please correct the email address.'));
+                $this->messageManager->addErrorMessage(
+                    __('The email address is incorrect. Verify the email address and try again.')
+                );
                 return $resultRedirect->setPath('*/*/forgotpassword');
             }
 
diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
index f734660fc3a77..301fd584cfabe 100644
--- a/app/code/Magento/Customer/Controller/Account/Index.php
+++ b/app/code/Magento/Customer/Controller/Account/Index.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class Index extends \Magento\Customer\Controller\AbstractAccount
+class Index extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
@@ -35,9 +36,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/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php
index 51c244ec0cfe9..64cc24095f935 100644
--- a/app/code/Magento/Customer/Controller/Account/Login.php
+++ b/app/code/Magento/Customer/Controller/Account/Login.php
@@ -6,11 +6,17 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Customer\Controller\AbstractAccount;
 
-class Login extends \Magento\Customer\Controller\AbstractAccount
+/**
+ * Login form page. Accepts POST for backward compatibility reasons.
+ */
+class Login extends AbstractAccount implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var Session
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index b55863a3b486a..04051fbbf366b 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -3,24 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Customer\Controller\AbstractAccount;
+use Magento\Framework\Phrase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class LoginPost extends \Magento\Customer\Controller\AbstractAccount
+class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -130,6 +138,30 @@ private function getCookieMetadataFactory()
         return $this->cookieMetadataFactory;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/*/');
+
+        return new InvalidRequestException(
+            $resultRedirect,
+            [new Phrase('Invalid Form Key. Please refresh the page.')]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return null;
+    }
+
     /**
      * Login post action
      *
@@ -171,27 +203,28 @@ public function execute()
                         'This account is not confirmed. <a href="%1">Click here</a> to resend confirmation email.',
                         $value
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (UserLockedException $e) {
                     $message = __(
-                        'You did not sign in correctly or your account is temporarily disabled.'
+                        'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (AuthenticationException $e) {
-                    $message = __('You did not sign in correctly or your account is temporarily disabled.');
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
+                    $message = __(
+                        'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                    );
                 } catch (LocalizedException $e) {
                     $message = $e->getMessage();
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (\Exception $e) {
                     // PA DSS violation: throwing or logging an exception here can disclose customer password
                     $this->messageManager->addError(
                         __('An unspecified error occurred. Please contact us for assistance.')
                     );
+                } finally {
+                    if (isset($message)) {
+                        $this->messageManager->addError($message);
+                        $this->session->setUsername($login['username']);
+                    }
                 }
             } else {
                 $this->messageManager->addError(__('A login and a password are required.'));
diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php
index 3d5d5480c502b..9344f482bd6e5 100644
--- a/app/code/Magento/Customer/Controller/Account/Logout.php
+++ b/app/code/Magento/Customer/Controller/Account/Logout.php
@@ -6,13 +6,19 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
+use Magento\Customer\Controller\AbstractAccount;
 
-class Logout extends \Magento\Customer\Controller\AbstractAccount
+/**
+ * Sign out a customer.
+ */
+class Logout extends AbstractAccount implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var Session
diff --git a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
index c58416434c0b6..e00494d221d2c 100644
--- a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
+++ b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount
+class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
index 3de44e35d2447..27a00f86dd95d 100644
--- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,11 +9,16 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Customer\Model\Customer\CredentialsValidator;
-use Magento\Framework\App\ObjectManager;
 
-class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
+/**
+ * Class ResetPasswordPost
+ *
+ * @package Magento\Customer\Controller\Account
+ */
+class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -31,17 +35,14 @@ class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
      */
     protected $session;
 
-    /**
-     * @var CredentialsValidator
-     */
-    private $credentialsValidator;
-
     /**
      * @param Context $context
      * @param Session $customerSession
      * @param AccountManagementInterface $accountManagement
      * @param CustomerRepositoryInterface $customerRepository
      * @param CredentialsValidator|null $credentialsValidator
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
@@ -53,8 +54,6 @@ public function __construct(
         $this->session = $customerSession;
         $this->accountManagement = $accountManagement;
         $this->customerRepository = $customerRepository;
-        $this->credentialsValidator = $credentialsValidator ?: ObjectManager::getInstance()
-            ->get(CredentialsValidator::class);
         parent::__construct($context);
     }
 
@@ -70,29 +69,32 @@ public function execute()
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         $resetPasswordToken = (string)$this->getRequest()->getQuery('token');
-        $customerId = (int)$this->getRequest()->getQuery('id');
         $password = (string)$this->getRequest()->getPost('password');
         $passwordConfirmation = (string)$this->getRequest()->getPost('password_confirmation');
 
         if ($password !== $passwordConfirmation) {
             $this->messageManager->addError(__("New Password and Confirm New Password values didn't match."));
-            $resultRedirect->setPath('*/*/createPassword', ['id' => $customerId, 'token' => $resetPasswordToken]);
+            $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
+
             return $resultRedirect;
         }
         if (iconv_strlen($password) <= 0) {
             $this->messageManager->addError(__('Please enter a new password.'));
-            $resultRedirect->setPath('*/*/createPassword', ['id' => $customerId, 'token' => $resetPasswordToken]);
+            $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
+
             return $resultRedirect;
         }
 
         try {
-            $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
-            $this->credentialsValidator->checkPasswordDifferentFromEmail($customerEmail, $password);
-            $this->accountManagement->resetPassword($customerEmail, $resetPasswordToken, $password);
+            $this->accountManagement->resetPassword(
+                null,
+                $resetPasswordToken,
+                $password
+            );
             $this->session->unsRpToken();
-            $this->session->unsRpCustomerId();
             $this->messageManager->addSuccess(__('You updated your password.'));
             $resultRedirect->setPath('*/*/login');
+
             return $resultRedirect;
         } catch (InputException $e) {
             $this->messageManager->addError($e->getMessage());
@@ -102,7 +104,8 @@ public function execute()
         } catch (\Exception $exception) {
             $this->messageManager->addError(__('Something went wrong while saving the new password.'));
         }
-        $resultRedirect->setPath('*/*/createPassword', ['id' => $customerId, 'token' => $resetPasswordToken]);
+        $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
+
         return $resultRedirect;
     }
 }
diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
index ef92bd2ef533b..a30e15db4b3f8 100644
--- a/app/code/Magento/Customer/Controller/Address/Delete.php
+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
@@ -6,9 +6,16 @@
  */
 namespace Magento\Customer\Controller\Address;
 
-class Delete extends \Magento\Customer\Controller\Address
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Delete customer address controller action.
+ */
+class Delete extends \Magento\Customer\Controller\Address implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
+     * @inheritdoc
      * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php
index a30eb10b11524..0a5affefae349 100644
--- a/app/code/Magento/Customer/Controller/Address/Edit.php
+++ b/app/code/Magento/Customer/Controller/Address/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Customer\Controller\Address;
 
-class Edit extends \Magento\Customer\Controller\Address
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
 {
     /**
      * Customer address edit action
diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php
index fc62a6c1a572d..9b3f4e36be0ed 100644
--- a/app/code/Magento/Customer/Controller/Address/Form.php
+++ b/app/code/Magento/Customer/Controller/Address/Form.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Customer\Controller\Address;
 
-class Form extends \Magento\Customer\Controller\Address
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Form extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
 {
     /**
      * Address book form
diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
index 21334f51b1752..217af0abd7592 100644
--- a/app/code/Magento/Customer/Controller/Address/FormPost.php
+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Address;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\RegionInterface;
@@ -26,7 +28,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class FormPost extends \Magento\Customer\Controller\Address
+class FormPost extends \Magento\Customer\Controller\Address implements HttpPostActionInterface
 {
     /**
      * @var RegionFactory
@@ -197,17 +199,17 @@ public function execute()
         try {
             $address = $this->_extractAddress();
             $this->_addressRepository->save($address);
-            $this->messageManager->addSuccess(__('You saved the address.'));
+            $this->messageManager->addSuccessMessage(__('You saved the address.'));
             $url = $this->_buildUrl('*/*/index', ['_secure' => true]);
             return $this->resultRedirectFactory->create()->setUrl($this->_redirect->success($url));
         } catch (InputException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             foreach ($e->getErrors() as $error) {
-                $this->messageManager->addError($error->getMessage());
+                $this->messageManager->addErrorMessage($error->getMessage());
             }
         } catch (\Exception $e) {
             $redirectUrl = $this->_buildUrl('*/*/index');
-            $this->messageManager->addException($e, __('We can\'t save the address.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t save the address.'));
         }
 
         $url = $redirectUrl;
diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
index ad04c7bd5c71b..92c6078349d6e 100644
--- a/app/code/Magento/Customer/Controller/Address/Index.php
+++ b/app/code/Magento/Customer/Controller/Address/Index.php
@@ -6,12 +6,13 @@
  */
 namespace Magento\Customer\Controller\Address;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Index extends \Magento\Customer\Controller\Address
+class Index extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
 {
     /**
      * @var CustomerRepositoryInterface
@@ -28,9 +29,9 @@ class Index extends \Magento\Customer\Controller\Address
      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionDataFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @param CustomerRepositoryInterface $customerRepository
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param CustomerRepositoryInterface $customerRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php
index e97c746057880..043c2b91db292 100644
--- a/app/code/Magento/Customer/Controller/Address/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Address/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Customer\Controller\Address;
 
-class NewAction extends \Magento\Customer\Controller\Address
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\Customer\Controller\Address implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Framework\Controller\Result\Forward
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php
new file mode 100644
index 0000000000000..bf8ca4aeb5cd7
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultBillingAddress.php
@@ -0,0 +1,109 @@
+<?php
+declare(strict_types=1);
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Backend\App\Action;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class to process set default billing address action
+ */
+class DefaultBillingAddress extends Action implements HttpPostActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param AddressRepositoryInterface $addressRepository
+     * @param LoggerInterface $logger
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        AddressRepositoryInterface $addressRepository,
+        LoggerInterface $logger,
+        JsonFactory $resultJsonFactory
+    ) {
+        parent::__construct($context);
+        $this->addressRepository = $addressRepository;
+        $this->logger = $logger;
+        $this->resultJsonFactory = $resultJsonFactory;
+    }
+
+    /**
+     * Execute action to set customer default billing address
+     *
+     * @return Json
+     */
+    public function execute(): Json
+    {
+        $customerId = $this->getRequest()->getParam('parent_id', false);
+        $addressId = $this->getRequest()->getParam('id', false);
+        $error = true;
+        $message = __('There is no address id in setting default billing address.');
+
+        if ($addressId) {
+            try {
+                $address = $this->addressRepository->getById($addressId)->setCustomerId($customerId);
+                $this->setAddressAsDefault($address);
+                $this->addressRepository->save($address);
+                $message = __('Default billing address has been changed.');
+                $error = false;
+            } catch (\Exception $e) {
+                $message = __('We can\'t change default billing address right now.');
+                $this->logger->critical($e);
+            }
+        }
+
+        $resultJson = $this->resultJsonFactory->create();
+        $resultJson->setData(
+            [
+                'message' => $message,
+                'error' => $error,
+            ]
+        );
+
+        return $resultJson;
+    }
+
+    /**
+     * Set address as default billing address
+     *
+     * @param AddressInterface $address
+     * @return void
+     */
+    private function setAddressAsDefault(AddressInterface $address): void
+    {
+        $address->setIsDefaultBilling(true);
+    }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php
new file mode 100644
index 0000000000000..81928ae2d28d0
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/DefaultShippingAddress.php
@@ -0,0 +1,109 @@
+<?php
+declare(strict_types=1);
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Backend\App\Action;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class to process set default shipping address action
+ */
+class DefaultShippingAddress extends Action implements HttpPostActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param AddressRepositoryInterface $addressRepository
+     * @param LoggerInterface $logger
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        AddressRepositoryInterface $addressRepository,
+        LoggerInterface $logger,
+        JsonFactory $resultJsonFactory
+    ) {
+        parent::__construct($context);
+        $this->addressRepository = $addressRepository;
+        $this->logger = $logger;
+        $this->resultJsonFactory = $resultJsonFactory;
+    }
+
+    /**
+     * Execute action to set customer default shipping address
+     *
+     * @return Json
+     */
+    public function execute(): Json
+    {
+        $customerId = $this->getRequest()->getParam('parent_id', false);
+        $addressId = $this->getRequest()->getParam('id', false);
+        $error = true;
+        $message = __('There is no address id in setting default shipping address.');
+
+        if ($addressId) {
+            try {
+                $address = $this->addressRepository->getById($addressId)->setCustomerId($customerId);
+                $this->setAddressAsDefault($address);
+                $this->addressRepository->save($address);
+                $message = __('Default shipping address has been changed.');
+                $error = false;
+            } catch (\Exception $e) {
+                $message = __('We can\'t change default shipping address right now.');
+                $this->logger->critical($e);
+            }
+        }
+
+        $resultJson = $this->resultJsonFactory->create();
+        $resultJson->setData(
+            [
+                'message' => $message,
+                'error' => $error,
+            ]
+        );
+
+        return $resultJson;
+    }
+
+    /**
+     * Set address as default shipping address
+     *
+     * @param AddressInterface $address
+     * @return void
+     */
+    private function setAddressAsDefault(AddressInterface $address): void
+    {
+        $address->setIsDefaultShipping(true);
+    }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php
new file mode 100644
index 0000000000000..711cd2473cdc5
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Delete.php
@@ -0,0 +1,95 @@
+<?php
+declare(strict_types=1);
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Button for deletion of customer address in admin
+ */
+class Delete extends Action implements HttpPostActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Action\Context $context
+     * @param AddressRepositoryInterface $addressRepository
+     * @param JsonFactory $resultJsonFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Action\Context $context,
+        AddressRepositoryInterface $addressRepository,
+        JsonFactory $resultJsonFactory,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+        $this->addressRepository = $addressRepository;
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Delete customer address action
+     *
+     * @return Json
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute(): Json
+    {
+        $customerId = $this->getRequest()->getParam('parent_id', false);
+        $addressId = $this->getRequest()->getParam('id', false);
+        $error = false;
+        $message = '';
+        if ($addressId && $this->addressRepository->getById($addressId)->getCustomerId() === $customerId) {
+            try {
+                $this->addressRepository->deleteById($addressId);
+                $message = __('You deleted the address.');
+            } catch (\Exception $e) {
+                $error = true;
+                $message = __('We can\'t delete the address right now.');
+                $this->logger->critical($e);
+            }
+        }
+
+        $resultJson = $this->resultJsonFactory->create();
+        $resultJson->setData(
+            [
+                'message' => $message,
+                'error' => $error,
+            ]
+        );
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php
new file mode 100644
index 0000000000000..cd319d662a093
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/MassDelete.php
@@ -0,0 +1,131 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Ui\Component\MassAction\Filter;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class to delete selected customer addresses through massaction
+ */
+class MassDelete extends Action implements HttpPostActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see MassDelete::_isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Customer::manage';
+
+    /**
+     * @var Filter
+     */
+    private $filter;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @param Context $context
+     * @param Filter $filter
+     * @param CollectionFactory $collectionFactory
+     * @param AddressRepositoryInterface $addressRepository
+     * @param LoggerInterface $logger
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Context $context,
+        Filter $filter,
+        CollectionFactory $collectionFactory,
+        AddressRepositoryInterface $addressRepository,
+        LoggerInterface $logger,
+        JsonFactory $resultJsonFactory
+    ) {
+        $this->filter = $filter;
+        $this->collectionFactory = $collectionFactory;
+        $this->addressRepository = $addressRepository;
+        $this->logger = $logger;
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context);
+    }
+
+    /**
+     * Delete specified customer addresses using grid massaction
+     *
+     * @return Json
+     * @throws LocalizedException
+     */
+    public function execute(): Json
+    {
+        $customerData = $this->_session->getData('customer_data');
+        /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+        $collection = $this->filter->getCollection($this->collectionFactory->create());
+        $error = false;
+
+        try {
+            if ($customerData && $customerData['customer_id']) {
+                $collection->addFieldToFilter('parent_id', $customerData['customer_id']);
+            } else {
+                throw new \Exception();
+            }
+            $collectionSize = $collection->getSize();
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($collection as $address) {
+                $this->addressRepository->deleteById($address->getId());
+            }
+            $message = __('A total of %1 record(s) have been deleted.', $collectionSize);
+        } catch (NoSuchEntityException $e) {
+            $message = __('There is no such address entity to delete.');
+            $error = true;
+            $this->logger->critical($e);
+        } catch (LocalizedException $e) {
+            $message = __($e->getMessage());
+            $error = true;
+            $this->logger->critical($e);
+        } catch (\Exception $e) {
+            $message = __('We can\'t mass delete the addresses right now.');
+            $error = true;
+            $this->logger->critical($e);
+        }
+
+        $resultJson = $this->resultJsonFactory->create();
+        $resultJson->setData(
+            [
+                'message' => $message,
+                'error' => $error,
+            ]
+        );
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
new file mode 100644
index 0000000000000..e4daea6f59fdb
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
@@ -0,0 +1,174 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class for saving of customer address
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Save extends Action implements HttpPostActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
+
+    /**
+     * @var \Magento\Customer\Api\AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var \Magento\Customer\Model\Metadata\FormFactory
+     */
+    private $formFactory;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
+     */
+    private $addressDataFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
+     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory
+     * @param LoggerInterface $logger
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
+        \Magento\Customer\Model\Metadata\FormFactory $formFactory,
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
+        LoggerInterface $logger,
+        JsonFactory $resultJsonFactory
+    ) {
+        parent::__construct($context);
+        $this->addressRepository = $addressRepository;
+        $this->formFactory = $formFactory;
+        $this->customerRepository = $customerRepository;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->addressDataFactory = $addressDataFactory;
+        $this->logger = $logger;
+        $this->resultJsonFactory = $resultJsonFactory;
+    }
+
+    /**
+     * Save customer address action
+     *
+     * @return Json
+     */
+    public function execute(): Json
+    {
+        $customerId = $this->getRequest()->getParam('parent_id', false);
+        $addressId = $this->getRequest()->getParam('entity_id', false);
+
+        $error = false;
+        try {
+            /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+            $customer = $this->customerRepository->getById($customerId);
+
+            $addressForm = $this->formFactory->create(
+                'customer_address',
+                'adminhtml_customer_address',
+                [],
+                false,
+                false
+            );
+            $addressData = $addressForm->extractData($this->getRequest());
+            $addressData = $addressForm->compactData($addressData);
+
+            $addressData['region'] = [
+                'region' => $addressData['region'] ?? null,
+                'region_id' => $addressData['region_id'] ?? null,
+            ];
+            $addressToSave = $this->addressDataFactory->create();
+            $this->dataObjectHelper->populateWithArray(
+                $addressToSave,
+                $addressData,
+                \Magento\Customer\Api\Data\AddressInterface::class
+            );
+            $addressToSave->setCustomerId($customer->getId());
+            $addressToSave->setIsDefaultBilling(
+                (bool)$this->getRequest()->getParam('default_billing', false)
+            );
+            $addressToSave->setIsDefaultShipping(
+                (bool)$this->getRequest()->getParam('default_shipping', false)
+            );
+            if ($addressId) {
+                $addressToSave->setId($addressId);
+                $message = __('Customer address has been updated.');
+            } else {
+                $addressToSave->setId(null);
+                $message = __('New customer address has been added.');
+            }
+            $savedAddress = $this->addressRepository->save($addressToSave);
+            $addressId = $savedAddress->getId();
+        } catch (NoSuchEntityException $e) {
+            $this->logger->critical($e);
+            $error = true;
+            $message = __('There is no customer with such id.');
+        } catch (LocalizedException $e) {
+            $error = true;
+            $message = __($e->getMessage());
+            $this->logger->critical($e);
+        } catch (\Exception $e) {
+            $error = true;
+            $message = __('We can\'t change customer address right now.');
+            $this->logger->critical($e);
+        }
+
+        $addressId = empty($addressId) ? null : $addressId;
+        $resultJson = $this->resultJsonFactory->create();
+        $resultJson->setData(
+            [
+                'message' => $message,
+                'error' => $error,
+                'data' => [
+                    'entity_id' => $addressId
+                ]
+            ]
+        );
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
new file mode 100644
index 0000000000000..16a40fd9016f8
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
@@ -0,0 +1,99 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\DataObject;
+
+/**
+ * Class for validation of customer address form on admin.
+ */
+class Validate extends Action implements HttpPostActionInterface, HttpGetActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var \Magento\Customer\Model\Metadata\FormFactory
+     */
+    private $formFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Customer\Model\Metadata\FormFactory $formFactory
+    ) {
+        parent::__construct($context);
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->formFactory = $formFactory;
+    }
+
+    /**
+     * AJAX customer address validation action
+     *
+     * @return Json
+     */
+    public function execute(): Json
+    {
+        /** @var \Magento\Framework\DataObject $response */
+        $response = new \Magento\Framework\DataObject();
+        $response->setError(false);
+
+        /** @var \Magento\Framework\DataObject $validatedResponse */
+        $validatedResponse = $this->validateCustomerAddress($response);
+        $resultJson = $this->resultJsonFactory->create();
+        if ($validatedResponse->getError()) {
+            $validatedResponse->setError(true);
+            $validatedResponse->setMessages($response->getMessages());
+        }
+
+        $resultJson->setData($validatedResponse);
+
+        return $resultJson;
+    }
+
+    /**
+     * Customer address validation.
+     *
+     * @param DataObject $response
+     * @return \Magento\Framework\DataObject
+     */
+    private function validateCustomerAddress(DataObject $response): DataObject
+    {
+        $addressForm = $this->formFactory->create('customer_address', 'adminhtml_customer_address');
+        $formData = $addressForm->extractData($this->getRequest());
+
+        $errors = $addressForm->validateData($formData);
+        if ($errors !== true) {
+            $messages = $response->hasMessages() ? $response->getMessages() : [];
+            foreach ($errors as $error) {
+                $messages[] = $error;
+            }
+            $response->setMessages($messages);
+            $response->setError(true);
+        }
+
+        return $response;
+    }
+}
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
index c0ea38de809db..2603ac193e007 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Adminhtml\Cart\Product\Composite;
 
 use Magento\Backend\App\Action;
@@ -78,7 +79,7 @@ protected function _initData()
     {
         $this->_customerId = (int)$this->getRequest()->getParam('customer_id');
         if (!$this->_customerId) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('No customer ID defined.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__("The customer ID isn't defined."));
         }
 
         $quoteItemId = (int)$this->getRequest()->getParam('id');
@@ -95,7 +96,7 @@ protected function _initData()
 
         $this->_quoteItem = $this->_quote->getItemById($quoteItemId);
         if (!$this->_quoteItem) {
-            throw new LocalizedException(__('Please correct the quote items and try again.'));
+            throw new LocalizedException(__('The quote items are incorrect. Verify the quote items and try again.'));
         }
 
         return $this;
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
index 506eac3230200..e9034c8050383 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
@@ -10,11 +10,16 @@
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Model\FileUploader;
 use Magento\Customer\Model\FileUploaderFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 
-class Upload extends Action
+/**
+ * Uploads files for customer address
+ */
+class Upload extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -38,21 +43,29 @@ class Upload extends Action
      */
     private $logger;
 
+    /**
+     * @var string
+     */
+    private $scope;
+
     /**
      * @param Context $context
      * @param FileUploaderFactory $fileUploaderFactory
      * @param AddressMetadataInterface $addressMetadataService
      * @param LoggerInterface $logger
+     * @param string $scope
      */
     public function __construct(
         Context $context,
         FileUploaderFactory $fileUploaderFactory,
         AddressMetadataInterface $addressMetadataService,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        string $scope = 'address'
     ) {
         $this->fileUploaderFactory = $fileUploaderFactory;
         $this->addressMetadataService = $addressMetadataService;
         $this->logger = $logger;
+        $this->scope = $scope;
         parent::__construct($context);
     }
 
@@ -69,14 +82,14 @@ public function execute()
             // Must be executed before any operations with $_FILES!
             $this->convertFilesArray();
 
-            $attributeCode = key($_FILES['address']['name']);
+            $attributeCode = key($_FILES[$this->scope]['name']);
             $attributeMetadata = $this->addressMetadataService->getAttributeMetadata($attributeCode);
 
             /** @var FileUploader $fileUploader */
             $fileUploader = $this->fileUploaderFactory->create([
                 'attributeMetadata' => $attributeMetadata,
                 'entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
-                'scope' => 'address',
+                'scope' => $this->scope,
             ]);
 
             $errors = $fileUploader->validate();
@@ -114,14 +127,11 @@ public function execute()
      */
     private function convertFilesArray()
     {
-        foreach ($_FILES['address'] as $itemKey => $item) {
-            foreach ($item as $value) {
-                if (is_array($value)) {
-                    $_FILES['address'][$itemKey] = [
-                        key($value) => current($value),
-                    ];
-                }
+        foreach ($_FILES as $itemKey => $item) {
+            foreach ($item as $fieldName => $value) {
+                    $_FILES[$this->scope][$fieldName] = [$itemKey => $value];
             }
+            unset($_FILES[$itemKey]);
         }
     }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
index 571ef57702bc3..ab32ea08a44aa 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-class Delete extends \Magento\Customer\Controller\Adminhtml\Group
+class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
 {
     /**
      * Delete customer group.
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
index 9da132078c9cb..221d01a112ea4 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
-class Edit extends \Magento\Customer\Controller\Adminhtml\Group
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface
 {
     /**
      * Edit customer group action. Forward to new action.
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
index 1246b6a6d0bd2..6da79d2c40f31 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
-class Index extends \Magento\Customer\Controller\Adminhtml\Group
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface
 {
     /**
      * Customer groups list.
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
index 2c230cd0b3f7b..a5c832bf0f1e4 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\Controller\RegistryConstants;
 
-class NewAction extends \Magento\Customer\Controller\Adminhtml\Group
+class NewAction extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface
 {
     /**
      * Initialize current group and set it in the registry.
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
index 936d9cdbc1704..7549315f9ffcd 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\Data\GroupInterfaceFactory;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 
-class Save extends \Magento\Customer\Controller\Adminhtml\Group
+class Save extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index ebab2a42a02ec..e26b49aaebe7a 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -73,7 +73,7 @@ public function execute()
 
     /**
      * Return component referer url
-     * TODO: Technical dept referer url should be implement as a part of Action configuration in in appropriate way
+     * TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way
      *
      * @return null|string
      */
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
index 7a981b82b7e1e..15da8b20adbca 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Delete extends \Magento\Customer\Controller\Adminhtml\Index
+class Delete extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface
 {
     /**
      * Delete customer action
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
index 90417c1ad5443..25b4ddd4e1732 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-class Edit extends \Magento\Customer\Controller\Adminhtml\Index
+class Edit extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * Customer edit action
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
index 861ac93b262cb..b1986c8b6f08a 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
-class Index extends \Magento\Customer\Controller\Adminhtml\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * Customers list action
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
index 2d0ee3ae13da4..3c3808d0a1ee6 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -6,16 +6,19 @@
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Customer\Test\Block\Form\Login;
 use Magento\Customer\Ui\Component\Listing\AttributeRepository;
-use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Message\MessageInterface;
 
 /**
+ * Customer inline edit action
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class InlineEdit extends \Magento\Backend\App\Action
+class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -101,7 +104,11 @@ private function getEmailNotification()
     }
 
     /**
+     * Inline edit action execute
+     *
      * @return \Magento\Framework\Controller\Result\Json
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute()
     {
@@ -139,7 +146,7 @@ public function execute()
      * Receive entity(customer|customer_address) data from request
      *
      * @param array $data
-     * @param null $isCustomerData
+     * @param mixed $isCustomerData
      * @return array
      */
     protected function getData(array $data, $isCustomerData = null)
@@ -249,7 +256,7 @@ protected function processAddressData(array $data)
     protected function getErrorMessages()
     {
         $messages = [];
-        foreach ($this->getMessageManager()->getMessages()->getItems() as $error) {
+        foreach ($this->getMessageManager()->getMessages()->getErrors() as $error) {
             $messages[] = $error->getText();
         }
         return $messages;
@@ -262,7 +269,7 @@ protected function getErrorMessages()
      */
     protected function isErrorExists()
     {
-        return (bool)$this->getMessageManager()->getMessages(true)->getCount();
+        return (bool)$this->getMessageManager()->getMessages(true)->getCountByType(MessageInterface::TYPE_ERROR);
     }
 
     /**
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
index 762b872b97b6d..a540ad9d7a70e 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
@@ -15,7 +16,7 @@
 /**
  * Class MassAssignGroup
  */
-class MassAssignGroup extends AbstractMassAction
+class MassAssignGroup extends AbstractMassAction implements HttpPostActionInterface
 {
     /**
      * @var CustomerRepositoryInterface
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
index 453585c881a05..334018a881f12 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
@@ -15,7 +16,7 @@
 /**
  * Class MassDelete
  */
-class MassDelete extends AbstractMassAction
+class MassDelete extends AbstractMassAction implements HttpPostActionInterface
 {
     /**
      * @var CustomerRepositoryInterface
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
index e6cf2aa234e09..19a16f01acfc2 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
-class NewAction extends \Magento\Customer\Controller\Adminhtml\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * Create new customer action
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
index 37c8ed5a252f8..3e6046b0d117f 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
@@ -5,10 +5,16 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\SecurityViolationException;
 
-class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index
+/**
+ * Reset password controller
+ *
+ * @package Magento\Customer\Controller\Adminhtml\Index
+ */
+class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * Reset password handler
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 44eba83d96d7e..adb420f983006 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
@@ -13,7 +14,12 @@
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\Exception\LocalizedException;
 
-class Save extends \Magento\Customer\Controller\Adminhtml\Index
+/**
+ * Save customer action.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface
 {
     /**
      * @var EmailNotificationInterface
@@ -104,6 +110,7 @@ protected function _extractData(
     /**
      * Saves default_billing and default_shipping flags for customer address
      *
+     * @deprecated must be removed because addresses are save separately for now
      * @param array $addressIdList
      * @param array $extractedCustomerData
      * @return array
@@ -146,6 +153,7 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
     /**
      * Reformat customer addresses data to be compatible with customer service interface
      *
+     * @deprecated addresses are saved separately for now
      * @param array $extractedCustomerData
      * @return array
      */
@@ -184,7 +192,6 @@ public function execute()
             try {
                 // optional fields might be set in request for future processing by observers in other modules
                 $customerData = $this->_extractCustomerData();
-                $addressesData = $this->_extractCustomerAddressData($customerData);
 
                 if ($customerId) {
                     $currentCustomer = $this->_customerRepository->getById($customerId);
@@ -202,28 +209,12 @@ public function execute()
                     $customerData,
                     \Magento\Customer\Api\Data\CustomerInterface::class
                 );
-                $addresses = [];
-                foreach ($addressesData as $addressData) {
-                    $region = isset($addressData['region']) ? $addressData['region'] : null;
-                    $regionId = isset($addressData['region_id']) ? $addressData['region_id'] : null;
-                    $addressData['region'] = [
-                        'region' => $region,
-                        'region_id' => $regionId,
-                    ];
-                    $addressDataObject = $this->addressDataFactory->create();
-                    $this->dataObjectHelper->populateWithArray(
-                        $addressDataObject,
-                        $addressData,
-                        \Magento\Customer\Api\Data\AddressInterface::class
-                    );
-                    $addresses[] = $addressDataObject;
-                }
 
                 $this->_eventManager->dispatch(
                     'adminhtml_customer_prepare_save',
                     ['customer' => $customer, 'request' => $this->getRequest()]
                 );
-                $customer->setAddresses($addresses);
+
                 if (isset($customerData['sendemail_store_id'])) {
                     $customer->setStoreId($customerData['sendemail_store_id']);
                 }
@@ -268,6 +259,15 @@ public function execute()
                 $this->_addSessionErrorMessages($messages);
                 $this->_getSession()->setCustomerFormData($originalRequestData);
                 $returnToEdit = true;
+            } catch (\Magento\Framework\Exception\AbstractAggregateException $exception) {
+                $errors = $exception->getErrors();
+                $messages = [];
+                foreach ($errors as $error) {
+                    $messages[] = $error->getMessage();
+                }
+                $this->_addSessionErrorMessages($messages);
+                $this->_getSession()->setCustomerFormData($originalRequestData);
+                $returnToEdit = true;
             } catch (LocalizedException $exception) {
                 $this->_addSessionErrorMessages($exception->getMessage());
                 $this->_getSession()->setCustomerFormData($originalRequestData);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
index 8e098a3b7ee16..d91bc7424bffe 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
@@ -5,10 +5,16 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Message\Error;
+use Magento\Customer\Controller\Adminhtml\Index as CustomerAction;
 
-class Validate extends \Magento\Customer\Controller\Adminhtml\Index
+/**
+ * Class for validation of customer
+ */
+class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Customer validation
@@ -69,40 +75,6 @@ protected function _validateCustomer($response)
         return $customer;
     }
 
-    /**
-     * Customer address validation.
-     *
-     * @param \Magento\Framework\DataObject $response
-     * @return void
-     */
-    protected function _validateCustomerAddress($response)
-    {
-        $addresses = $this->getRequest()->getPost('address');
-        if (!is_array($addresses)) {
-            return;
-        }
-        foreach (array_keys($addresses) as $index) {
-            if ($index == '_template_') {
-                continue;
-            }
-
-            $addressForm = $this->_formFactory->create('customer_address', 'adminhtml_customer_address');
-
-            $requestScope = sprintf('address/%s', $index);
-            $formData = $addressForm->extractData($this->getRequest(), $requestScope);
-
-            $errors = $addressForm->validateData($formData);
-            if ($errors !== true) {
-                $messages = $response->hasMessages() ? $response->getMessages() : [];
-                foreach ($errors as $error) {
-                    $messages[] = $error;
-                }
-                $response->setMessages($messages);
-                $response->setError(1);
-            }
-        }
-    }
-
     /**
      * AJAX customer validation action
      *
@@ -113,10 +85,7 @@ public function execute()
         $response = new \Magento\Framework\DataObject();
         $response->setError(0);
 
-        $customer = $this->_validateCustomer($response);
-        if ($customer) {
-            $this->_validateCustomerAddress($response);
-        }
+        $this->_validateCustomer($response);
         $resultJson = $this->resultJsonFactory->create();
         if ($response->getError()) {
             $response->setError(true);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 711fab9e608bf..20d330354bce4 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -132,30 +132,15 @@ public function __construct(
      */
     public function execute()
     {
-        $file = null;
-        $plain = false;
-        if ($this->getRequest()->getParam('file')) {
-            // download file
-            $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('file')
-            );
-        } elseif ($this->getRequest()->getParam('image')) {
-            // show plain image
-            $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('image')
-            );
-            $plain = true;
-        } else {
-            throw new NotFoundException(__('Page not found.'));
-        }
+        list($file, $plain) = $this->getFileParams();
 
         /** @var \Magento\Framework\Filesystem $filesystem */
         $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $fileName = CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER . '/' . ltrim($file, '/');
         $path = $directory->getAbsolutePath($fileName);
-        if (!$directory->isFile($fileName)
-            && !$this->_objectManager->get(\Magento\MediaStorage\Helper\File\Storage::class)->processStorageFile($path)
+        if (mb_strpos($path, '..') !== false || (!$directory->isFile($fileName)
+            && !$this->_objectManager->get(\Magento\MediaStorage\Helper\File\Storage::class)->processStorageFile($path))
         ) {
             throw new NotFoundException(__('Page not found.'));
         }
@@ -198,4 +183,32 @@ public function execute()
             );
         }
     }
+
+    /**
+     * Get parameters from request.
+     *
+     * @return array
+     * @throws NotFoundException
+     */
+    private function getFileParams()
+    {
+        $file = null;
+        $plain = false;
+        if ($this->getRequest()->getParam('file')) {
+            // download file
+            $file = $this->urlDecoder->decode(
+                $this->getRequest()->getParam('file')
+            );
+        } elseif ($this->getRequest()->getParam('image')) {
+            // show plain image
+            $file = $this->urlDecoder->decode(
+                $this->getRequest()->getParam('image')
+            );
+            $plain = true;
+        } else {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
+        return [$file, $plain];
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
index 3cf9a82b8b876..0262513d029f0 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Online;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class Index extends \Magento\Backend\App\Action
+class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
index 73869bc3f2958..5049c83e60f35 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Login.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Login.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Customer\Controller\Ajax;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
@@ -23,12 +24,12 @@
  * @method \Magento\Framework\App\Response\Http getResponse()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Login extends \Magento\Framework\App\Action\Action
+class Login extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
-     * @var \Magento\Framework\Session\Generic
+     * @var \Magento\Customer\Model\Session
      */
-    protected $session;
+    protected $customerSession;
 
     /**
      * @var AccountManagementInterface
@@ -106,7 +107,6 @@ public function __construct(
 
     /**
      * Get account redirect.
-     * For release backward compatibility.
      *
      * @deprecated 100.0.10
      * @return AccountRedirect
@@ -132,6 +132,8 @@ public function setAccountRedirect($value)
     }
 
     /**
+     * Initializes config dependency.
+     *
      * @deprecated 100.0.10
      * @return ScopeConfigInterface
      */
@@ -144,6 +146,8 @@ protected function getScopeConfig()
     }
 
     /**
+     * Sets config dependency.
+     *
      * @deprecated 100.0.10
      * @param ScopeConfigInterface $value
      * @return void
@@ -198,25 +202,15 @@ public function execute()
                 $response['redirectUrl'] = $this->_redirect->success($redirectRoute);
                 $this->getAccountRedirect()->clearRedirectCookie();
             }
-        } catch (EmailNotConfirmedException $e) {
-            $response = [
-                'errors' => true,
-                'message' => $e->getMessage()
-            ];
-        } catch (InvalidEmailOrPasswordException $e) {
-            $response = [
-                'errors' => true,
-                'message' => $e->getMessage()
-            ];
         } catch (LocalizedException $e) {
             $response = [
                 'errors' => true,
-                'message' => $e->getMessage()
+                'message' => $e->getMessage(),
             ];
         } catch (\Exception $e) {
             $response = [
                 'errors' => true,
-                'message' => __('Invalid login or password.')
+                'message' => __('Invalid login or password.'),
             ];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
diff --git a/app/code/Magento/Customer/Controller/Ajax/Logout.php b/app/code/Magento/Customer/Controller/Ajax/Logout.php
index 0edd41e3632b1..c9eadacd12e65 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Logout.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Logout.php
@@ -7,18 +7,20 @@
 
 namespace Magento\Customer\Controller\Ajax;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
 /**
  * Logout controller
  *
  * @method \Magento\Framework\App\RequestInterface getRequest()
  * @method \Magento\Framework\App\Response\Http getResponse()
  */
-class Logout extends \Magento\Framework\App\Action\Action
+class Logout extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
-     * @var \Magento\Framework\Session\Generic
+     * @var \Magento\Customer\Model\Session
      */
-    protected $session;
+    protected $customerSession;
 
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php
index 71775ff8f8ce1..37cd071b13623 100644
--- a/app/code/Magento/Customer/Controller/Section/Load.php
+++ b/app/code/Magento/Customer/Controller/Section/Load.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Section;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Customer\CustomerData\Section\Identifier;
 use Magento\Customer\CustomerData\SectionPoolInterface;
 use Magento\Framework\App\Action\Context;
@@ -13,7 +14,7 @@
 /**
  * Customer section controller
  */
-class Load extends \Magento\Framework\App\Action\Action
+class Load extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
      * @var JsonFactory
@@ -58,21 +59,23 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Json
+     * @inheritdoc
      */
     public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
+        $resultJson->setHeader('Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store', true);
+        $resultJson->setHeader('Pragma', 'no-cache', true);
         try {
             $sectionNames = $this->getRequest()->getParam('sections');
             $sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null;
 
-            $updateSectionId = $this->getRequest()->getParam('update_section_id');
-            if ('false' === $updateSectionId) {
-                $updateSectionId = false;
+            $forceNewSectionTimestamp = $this->getRequest()->getParam('force_new_section_timestamp');
+            if ('false' === $forceNewSectionTimestamp) {
+                $forceNewSectionTimestamp = false;
             }
-            $response = $this->sectionPool->getSectionsData($sectionNames, (bool)$updateSectionId);
+            $response = $this->sectionPool->getSectionsData($sectionNames, (bool)$forceNewSectionTimestamp);
         } catch (\Exception $e) {
             $resultJson->setStatusHeader(
                 \Zend\Http\Response::STATUS_CODE_400,
diff --git a/app/code/Magento/Customer/CustomerData/Section/Identifier.php b/app/code/Magento/Customer/CustomerData/Section/Identifier.php
index 2a770925d1c37..a8bc2c8abc11a 100644
--- a/app/code/Magento/Customer/CustomerData/Section/Identifier.php
+++ b/app/code/Magento/Customer/CustomerData/Section/Identifier.php
@@ -43,12 +43,12 @@ public function __construct(
     /**
      * Init mark(identifier) for sections
      *
-     * @param bool $forceUpdate
+     * @param bool $forceNewTimestamp
      * @return int
      */
-    public function initMark($forceUpdate)
+    public function initMark($forceNewTimestamp)
     {
-        if ($forceUpdate) {
+        if ($forceNewTimestamp) {
             $this->markId = time();
             return $this->markId;
         }
@@ -67,19 +67,19 @@ public function initMark($forceUpdate)
      * Mark sections with data id
      *
      * @param array $sectionsData
-     * @param null $sectionNames
-     * @param bool $updateIds
+     * @param array|null $sectionNames
+     * @param bool $forceNewTimestamp
      * @return array
      */
-    public function markSections(array $sectionsData, $sectionNames = null, $updateIds = false)
+    public function markSections(array $sectionsData, $sectionNames = null, $forceNewTimestamp = false)
     {
         if (!$sectionNames) {
             $sectionNames = array_keys($sectionsData);
         }
-        $markId = $this->initMark($updateIds);
+        $markId = $this->initMark($forceNewTimestamp);
 
         foreach ($sectionNames as $name) {
-            if ($updateIds || !array_key_exists(self::SECTION_KEY, $sectionsData[$name])) {
+            if ($forceNewTimestamp || !array_key_exists(self::SECTION_KEY, $sectionsData[$name])) {
                 $sectionsData[$name][self::SECTION_KEY] = $markId;
             }
         }
diff --git a/app/code/Magento/Customer/CustomerData/SectionPool.php b/app/code/Magento/Customer/CustomerData/SectionPool.php
index 26e9140c63df5..efea1762d9de6 100644
--- a/app/code/Magento/Customer/CustomerData/SectionPool.php
+++ b/app/code/Magento/Customer/CustomerData/SectionPool.php
@@ -53,12 +53,12 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function getSectionsData(array $sectionNames = null, $updateIds = false)
+    public function getSectionsData(array $sectionNames = null, $forceNewTimestamp = false)
     {
         $sectionsData = $sectionNames ? $this->getSectionDataByNames($sectionNames) : $this->getAllSectionData();
-        $sectionsData = $this->identifier->markSections($sectionsData, $sectionNames, $updateIds);
+        $sectionsData = $this->identifier->markSections($sectionsData, $sectionNames, $forceNewTimestamp);
         return $sectionsData;
     }
 
@@ -74,7 +74,7 @@ protected function getSectionDataByNames($sectionNames)
         $data = [];
         foreach ($sectionNames as $sectionName) {
             if (!isset($this->sectionSourceMap[$sectionName])) {
-                throw new LocalizedException(__('"%1" section source is not supported', $sectionName));
+                throw new LocalizedException(__('The "%1" section source isn\'t supported.', $sectionName));
             }
             $data[$sectionName] = $this->get($this->sectionSourceMap[$sectionName])->getSectionData();
         }
diff --git a/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php b/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
index c308804fd0f8d..ad73b9722b133 100644
--- a/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
+++ b/app/code/Magento/Customer/CustomerData/SectionPoolInterface.php
@@ -14,8 +14,8 @@ interface SectionPoolInterface
      * Get section data by section names. If $sectionNames is null then return all sections data
      *
      * @param array $sectionNames
-     * @param bool $updateIds
+     * @param bool $forceNewTimestamp
      * @return array
      */
-    public function getSectionsData(array $sectionNames = null, $updateIds = false);
+    public function getSectionsData(array $sectionNames = null, $forceNewTimestamp = false);
 }
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index c74c62dc6d98c..7c81e29325823 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -10,6 +10,8 @@
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Directory\Model\Country\Format;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Customer address helper
@@ -94,6 +96,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_addressConfig;
 
     /**
+     * Address constructor.
+     *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\View\Element\BlockFactory $blockFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -127,6 +131,8 @@ public function getBookUrl()
     }
 
     /**
+     * Retrieve edit url.
+     *
      * @return void
      */
     public function getEditUrl()
@@ -134,6 +140,8 @@ public function getEditUrl()
     }
 
     /**
+     * Retrieve delete url.
+     *
      * @return void
      */
     public function getDeleteUrl()
@@ -141,6 +149,8 @@ public function getDeleteUrl()
     }
 
     /**
+     * Retrieve create url.
+     *
      * @return void
      */
     public function getCreateUrl()
@@ -148,6 +158,8 @@ public function getCreateUrl()
     }
 
     /**
+     * Retrieve block renderer.
+     *
      * @param string $renderer
      * @return \Magento\Framework\View\Element\BlockInterface
      */
@@ -165,7 +177,9 @@ public function getRenderer($renderer)
      *
      * @param string $key
      * @param \Magento\Store\Model\Store|int|string $store
+     *
      * @return string|null
+     * @throws NoSuchEntityException
      */
     public function getConfig($key, $store = null)
     {
@@ -174,7 +188,7 @@ public function getConfig($key, $store = null)
         if (!isset($this->_config[$websiteId])) {
             $this->_config[$websiteId] = $this->scopeConfig->getValue(
                 'customer/address',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $store
             );
         }
@@ -185,7 +199,10 @@ public function getConfig($key, $store = null)
      * Return Number of Lines in a Street Address for store
      *
      * @param \Magento\Store\Model\Store|int|string $store
+     *
      * @return int
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getStreetLines($store = null)
     {
@@ -204,6 +221,8 @@ public function getStreetLines($store = null)
     }
 
     /**
+     * Retrieve address format.
+     *
      * @param string $code
      * @return Format|string
      */
@@ -232,7 +251,9 @@ public function getFormatTypeRenderer($code)
      * Determine if specified address config value can be shown
      *
      * @param string $key
+     *
      * @return bool
+     * @throws NoSuchEntityException
      */
     public function canShowConfig($key)
     {
@@ -243,9 +264,11 @@ public function canShowConfig($key)
      * Get string with frontend validation classes for attribute
      *
      * @param string $attributeCode
+     *
      * @return string
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAttributeValidationClass($attributeCode)
     {
@@ -313,9 +336,9 @@ public function convertStreetLines($origStreets, $toCount)
      */
     public function isVatValidationEnabled($store = null)
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_VAT_VALIDATION_ENABLED,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -327,9 +350,9 @@ public function isVatValidationEnabled($store = null)
      */
     public function isDisableAutoGroupAssignDefaultValue()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -341,9 +364,9 @@ public function isDisableAutoGroupAssignDefaultValue()
      */
     public function hasValidateOnEachTransaction($store = null)
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_VIV_ON_EACH_TRANSACTION,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -358,7 +381,7 @@ public function getTaxCalculationAddressType($store = null)
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -370,9 +393,9 @@ public function getTaxCalculationAddressType($store = null)
      */
     public function isVatAttributeVisible()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_VAT_FRONTEND_VISIBILITY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -380,7 +403,10 @@ public function isVatAttributeVisible()
      * Retrieve attribute visibility
      *
      * @param string $code
+     *
      * @return bool
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @since 100.2.0
      */
     public function isAttributeVisible($code)
@@ -391,4 +417,23 @@ public function isAttributeVisible($code)
         }
         return false;
     }
+
+    /**
+     * Retrieve attribute required
+     *
+     * @param string $code
+     * @return bool
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function isAttributeRequired($code)
+    {
+        $attributeMetadata = $this->_addressMetadataService->getAttributeMetadata($code);
+
+        if ($attributeMetadata) {
+            return $attributeMetadata->isRequired();
+        }
+
+        return false;
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Account/Redirect.php b/app/code/Magento/Customer/Model/Account/Redirect.php
index 2e8d596474e96..2ccaaea45680c 100644
--- a/app/code/Magento/Customer/Model/Account/Redirect.php
+++ b/app/code/Magento/Customer/Model/Account/Redirect.php
@@ -74,6 +74,11 @@ class Redirect
      */
     private $hostChecker;
 
+    /**
+     * @var Session
+     */
+    private $session;
+
     /**
      * @param RequestInterface $request
      * @param Session $customerSession
@@ -206,6 +211,10 @@ protected function processLoggedCustomer()
             $referer = $this->request->getParam(CustomerUrl::REFERER_QUERY_PARAM_NAME);
             if ($referer) {
                 $referer = $this->urlDecoder->decode($referer);
+                preg_match('/logoutSuccess\//', $referer, $matches, PREG_OFFSET_CAPTURE);
+                if (!empty($matches)) {
+                    $referer = str_replace('logoutSuccess/', '', $referer);
+                }
                 if ($this->hostChecker->isOwnOrigin($referer)) {
                     $this->applyRedirect($referer);
                 }
diff --git a/app/code/Magento/Customer/Model/AccountConfirmation.php b/app/code/Magento/Customer/Model/AccountConfirmation.php
new file mode 100644
index 0000000000000..f29330af25874
--- /dev/null
+++ b/app/code/Magento/Customer/Model/AccountConfirmation.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model;
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Registry;
+
+/**
+ * Class AccountConfirmation. Checks if email confirmation required for customer.
+ */
+class AccountConfirmation
+{
+    /**
+     * Configuration path for email confirmation.
+     */
+    const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * AccountConfirmation constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Registry $registry
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        Registry $registry
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->registry = $registry;
+    }
+
+    /**
+     * Check if accounts confirmation is required.
+     *
+     * @param int|null $websiteId
+     * @param int|null $customerId
+     * @param string $customerEmail
+     * @return bool
+     */
+    public function isConfirmationRequired($websiteId, $customerId, $customerEmail): bool
+    {
+        if ($this->canSkipConfirmation($customerId, $customerEmail)) {
+            return false;
+        }
+
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_IS_CONFIRM,
+            ScopeInterface::SCOPE_WEBSITES,
+            $websiteId
+        );
+    }
+
+    /**
+     * Check whether confirmation may be skipped when registering using certain email address.
+     *
+     * @param int|null $customerId
+     * @param string $customerEmail
+     * @return bool
+     */
+    private function canSkipConfirmation($customerId, $customerEmail): bool
+    {
+        if (!$customerId) {
+            return false;
+        }
+
+        /* If an email was used to start the registration process and it is the same email as the one
+           used to register, then this can skip confirmation.
+           */
+        $skipConfirmationIfEmail = $this->registry->registry("skip_confirmation_if_email");
+        if (!$skipConfirmationIfEmail) {
+            return false;
+        }
+
+        return strtolower($skipConfirmationIfEmail) === strtolower($customerEmail);
+    }
+}
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 2743585e5a2fe..d7c5d7f47a4cf 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\AccountManagementInterface;
@@ -17,8 +18,10 @@
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\Customer\CredentialsValidator;
 use Magento\Customer\Model\Metadata\Validator;
+use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
 use Magento\Eav\Model\Validator\Attribute\Backend;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
@@ -40,8 +43,11 @@
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Math\Random;
+use Magento\Framework\Phrase;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Registry;
+use Magento\Framework\Session\SaveHandlerInterface;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\StringUtils as StringHelper;
 use Magento\Store\Model\ScopeInterface;
@@ -89,6 +95,10 @@ class AccountManagement implements AccountManagementInterface
      */
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'customer/password/forgot_email_identity';
 
+    /**
+     * @deprecated
+     * @see AccountConfirmation::XML_PATH_IS_CONFIRM
+     */
     const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
 
     /**
@@ -238,6 +248,21 @@ class AccountManagement implements AccountManagementInterface
      */
     private $transportBuilder;
 
+    /**
+     * @var SessionManagerInterface
+     */
+    private $sessionManager;
+
+    /**
+     * @var SaveHandlerInterface
+     */
+    private $saveHandler;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $visitorCollectionFactory;
+
     /**
      * @var DataObjectProcessor
      */
@@ -298,6 +323,21 @@ class AccountManagement implements AccountManagementInterface
      */
     private $dateTimeFactory;
 
+    /**
+     * @var AccountConfirmation
+     */
+    private $accountConfirmation;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param ManagerInterface $eventManager
@@ -323,8 +363,15 @@ class AccountManagement implements AccountManagementInterface
      * @param ObjectFactory $objectFactory
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param CredentialsValidator|null $credentialsValidator
-     * @param DateTimeFactory $dateTimeFactory
+     * @param DateTimeFactory|null $dateTimeFactory
+     * @param AccountConfirmation|null $accountConfirmation
+     * @param SessionManagerInterface|null $sessionManager
+     * @param SaveHandlerInterface|null $saveHandler
+     * @param CollectionFactory|null $visitorCollectionFactory
+     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param AddressRegistry|null $addressRegistry
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(
         CustomerFactory $customerFactory,
@@ -351,7 +398,13 @@ public function __construct(
         ObjectFactory $objectFactory,
         ExtensibleDataObjectConverter $extensibleDataObjectConverter,
         CredentialsValidator $credentialsValidator = null,
-        DateTimeFactory $dateTimeFactory = null
+        DateTimeFactory $dateTimeFactory = null,
+        AccountConfirmation $accountConfirmation = null,
+        SessionManagerInterface $sessionManager = null,
+        SaveHandlerInterface $saveHandler = null,
+        CollectionFactory $visitorCollectionFactory = null,
+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        AddressRegistry $addressRegistry = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -379,6 +432,18 @@ public function __construct(
         $this->credentialsValidator =
             $credentialsValidator ?: ObjectManager::getInstance()->get(CredentialsValidator::class);
         $this->dateTimeFactory = $dateTimeFactory ?: ObjectManager::getInstance()->get(DateTimeFactory::class);
+        $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
+            ->get(AccountConfirmation::class);
+        $this->sessionManager = $sessionManager
+            ?: ObjectManager::getInstance()->get(SessionManagerInterface::class);
+        $this->saveHandler = $saveHandler
+            ?: ObjectManager::getInstance()->get(SaveHandlerInterface::class);
+        $this->visitorCollectionFactory = $visitorCollectionFactory
+            ?: ObjectManager::getInstance()->get(CollectionFactory::class);
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder
+            ?: ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
+        $this->addressRegistry = $addressRegistry
+            ?: ObjectManager::getInstance()->get(AddressRegistry::class);
     }
 
     /**
@@ -398,13 +463,13 @@ private function getAuthentication()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
     {
         $customer = $this->customerRepository->get($email, $websiteId);
         if (!$customer->getConfirmation()) {
-            throw new InvalidTransitionException(__('No confirmation needed.'));
+            throw new InvalidTransitionException(__("Confirmation isn't needed."));
         }
 
         try {
@@ -421,7 +486,7 @@ public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function activate($email, $confirmationKey)
     {
@@ -430,7 +495,7 @@ public function activate($email, $confirmationKey)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function activateById($customerId, $confirmationKey)
     {
@@ -451,11 +516,11 @@ private function activateCustomer($customer, $confirmationKey)
     {
         // check if customer is inactive
         if (!$customer->getConfirmation()) {
-            throw new InvalidTransitionException(__('Account already active'));
+            throw new InvalidTransitionException(__('The account is already active.'));
         }
 
         if ($customer->getConfirmation() !== $confirmationKey) {
-            throw new InputMismatchException(__('Invalid confirmation token'));
+            throw new InputMismatchException(__('The confirmation token is invalid. Verify the token and try again.'));
         }
 
         $customer->setConfirmation(null);
@@ -470,7 +535,7 @@ private function activateCustomer($customer, $confirmationKey)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function authenticate($username, $password)
     {
@@ -490,7 +555,7 @@ public function authenticate($username, $password)
             throw new InvalidEmailOrPasswordException(__('Invalid login or password.'));
         }
         if ($customer->getConfirmation() && $this->isConfirmationRequired($customer)) {
-            throw new EmailNotConfirmedException(__('This account is not confirmed.'));
+            throw new EmailNotConfirmedException(__("This account isn't confirmed. Verify and try again."));
         }
 
         $customerModel = $this->customerFactory->create()->updateData($customer);
@@ -505,7 +570,7 @@ public function authenticate($username, $password)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken)
     {
@@ -514,7 +579,7 @@ public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkTo
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function initiatePasswordReset($email, $template, $websiteId = null)
     {
@@ -524,6 +589,9 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
         // load customer by email
         $customer = $this->customerRepository->get($email, $websiteId);
 
+        // No need to validate customer address while saving customer reset password token
+        $this->disableAddressValidation($customer);
+
         $newPasswordToken = $this->mathRandom->getUniqueHash();
         $this->changeResetPasswordLinkToken($customer, $newPasswordToken);
 
@@ -547,6 +615,43 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
         return false;
     }
 
+    /**
+     * Match a customer by their RP token.
+     *
+     * @param string $rpToken
+     * @throws ExpiredException
+     * @throws NoSuchEntityException
+     *
+     * @return CustomerInterface
+     * @throws LocalizedException
+     */
+    private function matchCustomerByRpToken(string $rpToken): CustomerInterface
+    {
+        $this->searchCriteriaBuilder->addFilter(
+            'rp_token',
+            $rpToken
+        );
+        $this->searchCriteriaBuilder->setPageSize(1);
+        $found = $this->customerRepository->getList(
+            $this->searchCriteriaBuilder->create()
+        );
+        if ($found->getTotalCount() > 1) {
+            //Failed to generated unique RP token
+            throw new ExpiredException(
+                new Phrase('Reset password token expired.')
+            );
+        }
+        if ($found->getTotalCount() === 0) {
+            //Customer with such token not found.
+            throw NoSuchEntityException::singleField(
+                'rp_token',
+                $rpToken
+            );
+        }
+        //Unique customer found.
+        return $found->getItems()[0];
+    }
+
     /**
      * Handle not supported template
      *
@@ -567,20 +672,36 @@ private function handleUnknownTemplate($template)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resetPassword($email, $resetToken, $newPassword)
     {
-        $customer = $this->customerRepository->get($email);
+        if (!$email) {
+            $customer = $this->matchCustomerByRpToken($resetToken);
+            $email = $customer->getEmail();
+        } else {
+            $customer = $this->customerRepository->get($email);
+        }
+
+        // No need to validate customer address while saving customer reset password token
+        $this->disableAddressValidation($customer);
+
         //Validate Token and new password strength
         $this->validateResetPasswordToken($customer->getId(), $resetToken);
+        $this->credentialsValidator->checkPasswordDifferentFromEmail(
+            $email,
+            $newPassword
+        );
         $this->checkPasswordStrength($newPassword);
         //Update secure data
         $customerSecure = $this->customerRegistry->retrieveSecureData($customer->getId());
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
+        $this->destroyCustomerSessions($customer->getId());
+        $this->sessionManager->destroy();
         $this->customerRepository->save($customer);
+
         return true;
     }
 
@@ -606,13 +727,15 @@ protected function checkPasswordStrength($password)
         if ($length < $configMinPasswordLength) {
             throw new InputException(
                 __(
-                    'Please enter a password with at least %1 characters.',
+                    'The password needs at least %1 characters. Create a new password and try again.',
                     $configMinPasswordLength
                 )
             );
         }
         if ($this->stringHelper->strlen(trim($password)) != $length) {
-            throw new InputException(__('The password can\'t begin or end with a space.'));
+            throw new InputException(
+                __("The password can't begin or end with a space. Verify the password and try again.")
+            );
         }
 
         $requiredCharactersCheck = $this->makeRequiredCharactersCheck($password);
@@ -670,7 +793,7 @@ protected function getMinPasswordLength()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfirmationStatus($customerId)
     {
@@ -686,9 +809,9 @@ public function getConfirmationStatus($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
+    public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '', $extensions = [])
     {
         if ($password !== null) {
             $this->checkPasswordStrength($password);
@@ -696,22 +819,28 @@ public function createAccount(CustomerInterface $customer, $password = null, $re
             try {
                 $this->credentialsValidator->checkPasswordDifferentFromEmail($customerEmail, $password);
             } catch (InputException $e) {
-                throw new LocalizedException(__('Password cannot be the same as email address.'));
+                throw new LocalizedException(
+                    __("The password can't be the same as the email address. Create a new password and try again.")
+                );
             }
             $hash = $this->createPasswordHash($password);
         } else {
             $hash = null;
         }
-        return $this->createAccountWithPasswordHash($customer, $hash, $redirectUrl);
+        return $this->createAccountWithPasswordHash($customer, $hash, $redirectUrl, $extensions);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function createAccountWithPasswordHash(CustomerInterface $customer, $hash, $redirectUrl = '')
-    {
+    public function createAccountWithPasswordHash(
+        CustomerInterface $customer,
+        $hash,
+        $redirectUrl = '',
+        $extensions = []
+    ) {
         // This logic allows an existing customer to be added to a different store.  No new account is created.
         // The plan is to move this logic into a new method called something like 'registerAccountWithStore'
         if ($customer->getId()) {
@@ -729,6 +858,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             if ($customer->getWebsiteId()) {
                 $storeId = $this->storeManager->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
             } else {
+                $this->storeManager->setCurrentStore(null);
                 $storeId = $this->storeManager->getStore()->getId();
             }
             $customer->setStoreId($storeId);
@@ -742,6 +872,11 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
 
         // Update 'created_in' value with actual store name
         if ($customer->getId() === null) {
+            $websiteId = $customer->getWebsiteId();
+            if ($websiteId && !$this->isCustomerInStore($websiteId, $customer->getStoreId())) {
+                throw new LocalizedException(__('The store view is not in the associated website.'));
+            }
+
             $storeName = $this->storeManager->getStore($customer->getStoreId())->getName();
             $customer->setCreatedIn($storeName);
         }
@@ -753,7 +888,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             $customer = $this->customerRepository->save($customer, $hash);
         } catch (AlreadyExistsException $e) {
             throw new InputMismatchException(
-                __('A customer with the same email already exists in an associated website.')
+                __('A customer with the same email address already exists in an associated website.')
             );
         } catch (LocalizedException $e) {
             throw $e;
@@ -778,13 +913,13 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         $customer = $this->customerRepository->getById($customer->getId());
         $newLinkToken = $this->mathRandom->getUniqueHash();
         $this->changeResetPasswordLinkToken($customer, $newLinkToken);
-        $this->sendEmailConfirmation($customer, $redirectUrl);
+        $this->sendEmailConfirmation($customer, $redirectUrl, $extensions);
 
         return $customer;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultBillingAddress($customerId)
     {
@@ -793,7 +928,7 @@ public function getDefaultBillingAddress($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultShippingAddress($customerId)
     {
@@ -806,9 +941,12 @@ public function getDefaultShippingAddress($customerId)
      *
      * @param CustomerInterface $customer
      * @param string $redirectUrl
+     * @param array $extensions
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
-    protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl)
+    protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl, $extensions = [])
     {
         try {
             $hash = $this->customerRegistry->retrieveSecureData($customer->getId())->getPasswordHash();
@@ -818,15 +956,24 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
             } elseif ($hash == '') {
                 $templateType = self::NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD;
             }
-            $this->getEmailNotification()->newAccount($customer, $templateType, $redirectUrl, $customer->getStoreId());
+            $this->getEmailNotification()->newAccount(
+                $customer,
+                $templateType,
+                $redirectUrl,
+                $customer->getStoreId(),
+                null,
+                $extensions
+            );
         } catch (MailException $e) {
             // If we are not able to send a new account email, this should be ignored
             $this->logger->critical($e);
+        } catch (\UnexpectedValueException $e) {
+            $this->logger->error($e);
         }
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function changePassword($email, $currentPassword, $newPassword)
     {
@@ -839,7 +986,7 @@ public function changePassword($email, $currentPassword, $newPassword)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function changePasswordById($customerId, $currentPassword, $newPassword)
     {
@@ -859,7 +1006,10 @@ public function changePasswordById($customerId, $currentPassword, $newPassword)
      * @param string $newPassword
      * @return bool true on success
      * @throws InputException
+     * @throws InputMismatchException
      * @throws InvalidEmailOrPasswordException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @throws UserLockedException
      */
     private function changePasswordForCustomer($customer, $currentPassword, $newPassword)
@@ -867,7 +1017,9 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
         try {
             $this->getAuthentication()->authenticate($customer->getId(), $currentPassword);
         } catch (InvalidEmailOrPasswordException $e) {
-            throw new InvalidEmailOrPasswordException(__('The password doesn\'t match this account.'));
+            throw new InvalidEmailOrPasswordException(
+                __("The password doesn't match this account. Verify the password and try again.")
+            );
         }
         $customerEmail = $customer->getEmail();
         $this->credentialsValidator->checkPasswordDifferentFromEmail($customerEmail, $newPassword);
@@ -876,7 +1028,9 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
         $customerSecure->setRpTokenCreatedAt(null);
         $this->checkPasswordStrength($newPassword);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
+        $this->destroyCustomerSessions($customer->getId());
         $this->customerRepository->save($customer);
+
         return true;
     }
 
@@ -892,6 +1046,8 @@ protected function createPasswordHash($password)
     }
 
     /**
+     * Get EAV validator
+     *
      * @return Backend
      */
     private function getEavValidator()
@@ -903,7 +1059,7 @@ private function getEavValidator()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(CustomerInterface $customer)
     {
@@ -928,7 +1084,7 @@ public function validate(CustomerInterface $customer)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isEmailAvailable($customerEmail, $websiteId = null)
     {
@@ -944,7 +1100,7 @@ public function isEmailAvailable($customerEmail, $websiteId = null)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function isCustomerInStore($customerWebsiteId, $storeId)
     {
@@ -970,10 +1126,11 @@ public function isCustomerInStore($customerWebsiteId, $storeId)
      * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
      * @throws \Magento\Framework\Exception\InputException If token or customer id is invalid
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
+     * @throws LocalizedException
      */
     private function validateResetPasswordToken($customerId, $resetPasswordLinkToken)
     {
-        if (empty($customerId) || $customerId < 0) {
+        if ($customerId !== null && $customerId <= 0) {
             throw new InputException(
                 __(
                     'Invalid value of "%value" provided for the %fieldName field.',
@@ -981,21 +1138,24 @@ private function validateResetPasswordToken($customerId, $resetPasswordLinkToken
                 )
             );
         }
+
+        if ($customerId === null) {
+            //Looking for the customer.
+            $customerId = $this->matchCustomerByRpToken($resetPasswordLinkToken)
+                ->getId();
+        }
         if (!is_string($resetPasswordLinkToken) || empty($resetPasswordLinkToken)) {
             $params = ['fieldName' => 'resetPasswordLinkToken'];
-            throw new InputException(__('%fieldName is a required field.', $params));
+            throw new InputException(__('"%fieldName" is required. Enter and try again.', $params));
         }
-
         $customerSecureData = $this->customerRegistry->retrieveSecureData($customerId);
         $rpToken = $customerSecureData->getRpToken();
         $rpTokenCreatedAt = $customerSecureData->getRpTokenCreatedAt();
-
         if (!Security::compareStrings($rpToken, $resetPasswordLinkToken)) {
-            throw new InputMismatchException(__('Reset password token mismatch.'));
+            throw new InputMismatchException(__('The password token is mismatched. Reset and try again.'));
         } elseif ($this->isResetPasswordLinkTokenExpired($rpToken, $rpTokenCreatedAt)) {
-            throw new ExpiredException(__('Reset password token expired.'));
+            throw new ExpiredException(__('The password token is expired. Reset and try again.'));
         }
-
         return true;
     }
 
@@ -1035,7 +1195,9 @@ protected function sendNewAccountEmail(
         $types = $this->getTemplateTypes();
 
         if (!isset($types[$type])) {
-            throw new LocalizedException(__('Please correct the transactional account email type.'));
+            throw new LocalizedException(
+                __('The transactional account email type is incorrect. Verify and try again.')
+            );
         }
 
         if (!$storeId) {
@@ -1062,6 +1224,8 @@ protected function sendNewAccountEmail(
      *
      * @param CustomerInterface $customer
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     protected function sendPasswordResetNotificationEmail($customer)
@@ -1076,6 +1240,7 @@ protected function sendPasswordResetNotificationEmail($customer)
      * @param int|string|null $defaultStoreId
      * @return int
      * @deprecated 100.1.0
+     * @throws LocalizedException
      */
     protected function getWebsiteStoreId($customer, $defaultStoreId = null)
     {
@@ -1088,6 +1253,8 @@ protected function getWebsiteStoreId($customer, $defaultStoreId = null)
     }
 
     /**
+     * Get template types
+     *
      * @return array
      * @deprecated 100.1.0
      */
@@ -1121,6 +1288,7 @@ protected function getTemplateTypes()
      * @param int|null $storeId
      * @param string $email
      * @return $this
+     * @throws MailException
      * @deprecated 100.1.0
      */
     protected function sendEmailTemplate(
@@ -1161,17 +1329,15 @@ protected function sendEmailTemplate(
      *
      * @param CustomerInterface $customer
      * @return bool
+     * @deprecated
+     * @see AccountConfirmation::isConfirmationRequired
      */
     protected function isConfirmationRequired($customer)
     {
-        if ($this->canSkipConfirmation($customer)) {
-            return false;
-        }
-
-        return (bool)$this->scopeConfig->getValue(
-            self::XML_PATH_IS_CONFIRM,
-            ScopeInterface::SCOPE_WEBSITES,
-            $customer->getWebsiteId()
+        return $this->accountConfirmation->isConfirmationRequired(
+            $customer->getWebsiteId(),
+            $customer->getId(),
+            $customer->getEmail()
         );
     }
 
@@ -1180,6 +1346,8 @@ protected function isConfirmationRequired($customer)
      *
      * @param CustomerInterface $customer
      * @return bool
+     * @deprecated
+     * @see AccountConfirmation::isConfirmationRequired
      */
     protected function canSkipConfirmation($customer)
     {
@@ -1236,6 +1404,9 @@ public function isResetPasswordLinkTokenExpired($rpToken, $rpTokenCreatedAt)
      * @param string $passwordLinkToken
      * @return bool
      * @throws InputException
+     * @throws InputMismatchException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
     {
@@ -1253,6 +1424,7 @@ public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
             $customerSecure->setRpTokenCreatedAt(
                 $this->dateTimeFactory->create()->format(DateTime::DATETIME_PHP_FORMAT)
             );
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
         }
         return true;
@@ -1263,6 +1435,8 @@ public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
      *
      * @param CustomerInterface $customer
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     public function sendPasswordReminderEmail($customer)
@@ -1290,6 +1464,8 @@ public function sendPasswordReminderEmail($customer)
      *
      * @param CustomerInterface $customer
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     public function sendPasswordResetConfirmationEmail($customer)
@@ -1334,6 +1510,7 @@ protected function getAddressById(CustomerInterface $customer, $addressId)
      *
      * @param CustomerInterface $customer
      * @return Data\CustomerSecure
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     protected function getFullCustomerObject($customer)
@@ -1361,6 +1538,20 @@ public function getPasswordHash($password)
         return $this->encryptor->getHash($password);
     }
 
+    /**
+     * Disable Customer Address Validation
+     *
+     * @param CustomerInterface $customer
+     * @throws NoSuchEntityException
+     */
+    private function disableAddressValidation($customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
+
     /**
      * Get email notification
      *
@@ -1377,4 +1568,44 @@ private function getEmailNotification()
             return $this->emailNotification;
         }
     }
+
+    /**
+     * Destroy all active customer sessions by customer id (current session will not be destroyed).
+     * Customer sessions which should be deleted are collecting from the "customer_visitor" table considering
+     * configured session lifetime.
+     *
+     * @param string|int $customerId
+     * @return void
+     */
+    private function destroyCustomerSessions($customerId)
+    {
+        $sessionLifetime = $this->scopeConfig->getValue(
+            \Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        $dateTime = $this->dateTimeFactory->create();
+        $activeSessionsTime = $dateTime->setTimestamp($dateTime->getTimestamp() - $sessionLifetime)
+            ->format(DateTime::DATETIME_PHP_FORMAT);
+        /** @var \Magento\Customer\Model\ResourceModel\Visitor\Collection $visitorCollection */
+        $visitorCollection = $this->visitorCollectionFactory->create();
+        $visitorCollection->addFieldToFilter('customer_id', $customerId);
+        $visitorCollection->addFieldToFilter('last_visit_at', ['from' => $activeSessionsTime]);
+        $visitorCollection->addFieldToFilter('session_id', ['neq' => $this->sessionManager->getSessionId()]);
+        /** @var \Magento\Customer\Model\Visitor $visitor */
+        foreach ($visitorCollection->getItems() as $visitor) {
+            $sessionId = $visitor->getSessionId();
+            $this->saveHandler->destroy($sessionId);
+        }
+    }
+
+    /**
+     * Set ignore_validation_flag for reset password flow to skip unnecessary address and customer validation
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag($customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 1dcd8516af69f..4976ec546609f 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -122,6 +122,8 @@ public function __construct(
     }
 
     /**
+     * Init model
+     *
      * @return void
      */
     protected function _construct()
@@ -154,9 +156,6 @@ public function updateData(AddressInterface $address)
         // Need to explicitly set this due to discrepancy in the keys between model and data object
         $this->setIsDefaultBilling($address->isDefaultBilling());
         $this->setIsDefaultShipping($address->isDefaultShipping());
-        if (!$this->getAttributeSetId()) {
-            $this->setAttributeSetId(AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS);
-        }
         $customAttributes = $address->getCustomAttributes();
         if ($customAttributes !== null) {
             foreach ($customAttributes as $attribute) {
@@ -168,7 +167,7 @@ public function updateData(AddressInterface $address)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
@@ -261,6 +260,8 @@ public function getDefaultAttributeCodes()
     }
 
     /**
+     * Clone object handler
+     *
      * @return void
      */
     public function __clone()
@@ -301,6 +302,8 @@ public function setRegionId($regionId)
     }
 
     /**
+     * Create customer model
+     *
      * @return Customer
      */
     protected function _createCustomer()
@@ -356,7 +359,7 @@ public function reindex()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.0.6
      */
     protected function getCustomAttributesCodes()
@@ -366,6 +369,7 @@ protected function getCustomAttributesCodes()
 
     /**
      * Get new AttributeList dependency for application code.
+     *
      * @return \Magento\Customer\Model\Address\CustomAttributeListInterface
      * @deprecated 100.0.6
      */
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 521e233d9cfbb..146fec4c79f46 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -12,6 +12,7 @@
 use Magento\Customer\Api\Data\RegionInterface;
 use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Customer\Model\Data\Address as AddressData;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
@@ -22,7 +23,7 @@
  * @method string getFirstname()
  * @method string getMiddlename()
  * @method string getLastname()
- * @method int getCountryId()
+ * @method string getCountryId()
  * @method string getCity()
  * @method string getTelephone()
  * @method string getCompany()
@@ -118,6 +119,9 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      */
     protected $dataObjectHelper;
 
+    /** @var CompositeValidator */
+    private $compositeValidator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -135,6 +139,8 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param CompositeValidator $compositeValidator
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -153,7 +159,8 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        CompositeValidator $compositeValidator = null
     ) {
         $this->_directoryData = $directoryData;
         $data = $this->_implodeArrayField($data);
@@ -165,6 +172,8 @@ public function __construct(
         $this->addressDataFactory = $addressDataFactory;
         $this->regionDataFactory = $regionDataFactory;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->compositeValidator = $compositeValidator ?: ObjectManager::getInstance()
+            ->get(CompositeValidator::class);
         parent::__construct(
             $context,
             $registry,
@@ -221,7 +230,7 @@ public function getStreet()
     public function getStreetLine($number)
     {
         $lines = $this->getStreet();
-        return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
+        return $lines[$number - 1] ?? '';
     }
 
     /**
@@ -262,7 +271,8 @@ public function setStreet($street)
      * Enforce format of the street field or other multiline custom attributes
      *
      * @param array|string $key
-     * @param null $value
+     * @param array|string|null $value
+     *
      * @return \Magento\Framework\DataObject
      */
     public function setData($key, $value = null)
@@ -277,6 +287,7 @@ public function setData($key, $value = null)
 
     /**
      * Check that address can have multiline attribute by this code (as street or some custom attribute)
+     *
      * @param string $code
      * @return bool
      */
@@ -394,6 +405,8 @@ public function getRegionCode()
     }
 
     /**
+     * Return Region ID
+     *
      * @return int
      */
     public function getRegionId()
@@ -416,7 +429,9 @@ public function getRegionId()
     }
 
     /**
-     * @return int
+     * Get country
+     *
+     * @return string
      */
     public function getCountry()
     {
@@ -493,6 +508,8 @@ public function getConfig()
     }
 
     /**
+     * Processing object before save data
+     *
      * @return $this
      */
     public function beforeSave()
@@ -507,10 +524,12 @@ public function beforeSave()
      *
      * @param int|null $defaultBillingAddressId
      * @param int|null $defaultShippingAddressId
+     *
      * @return AddressInterface
      * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
      * the instance of Api/Data/AddressInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
@@ -562,88 +581,28 @@ public function getDataModel($defaultBillingAddressId = null, $defaultShippingAd
     }
 
     /**
-     * Validate address attribute values
-     *
+     * Validate address attribute values.
      *
-     *
-     * @return bool|array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @return array|bool
      */
     public function validate()
     {
         if ($this->getShouldIgnoreValidation()) {
             return true;
         }
-        
-        $errors = [];
-        if (!\Zend_Validate::is($this->getFirstname(), 'NotEmpty')) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'firstname']);
-        }
-
-        if (!\Zend_Validate::is($this->getLastname(), 'NotEmpty')) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'lastname']);
-        }
 
-        if (!\Zend_Validate::is($this->getStreetLine(1), 'NotEmpty')) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'street']);
-        }
-
-        if (!\Zend_Validate::is($this->getCity(), 'NotEmpty')) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'city']);
-        }
-
-        if ($this->isTelephoneRequired()) {
-            if (!\Zend_Validate::is($this->getTelephone(), 'NotEmpty')) {
-                $errors[] = __('%fieldName is a required field.', ['fieldName' => 'telephone']);
-            }
-        }
-
-        if ($this->isFaxRequired()) {
-            if (!\Zend_Validate::is($this->getFax(), 'NotEmpty')) {
-                $errors[] = __('%fieldName is a required field.', ['fieldName' => 'fax']);
-            }
-        }
-
-        if ($this->isCompanyRequired()) {
-            if (!\Zend_Validate::is($this->getCompany(), 'NotEmpty')) {
-                $errors[] = __('%fieldName is a required field.', ['fieldName' => 'company']);
-            }
-        }
-
-        $_havingOptionalZip = $this->_directoryData->getCountriesWithOptionalZip();
-        if (!in_array(
-            $this->getCountryId(),
-            $_havingOptionalZip
-        ) && !\Zend_Validate::is(
-            $this->getPostcode(),
-            'NotEmpty'
-        )
-        ) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'postcode']);
-        }
-
-        if (!\Zend_Validate::is($this->getCountryId(), 'NotEmpty')) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'countryId']);
-        }
-
-        if ($this->getCountryModel()->getRegionCollection()->getSize() && !\Zend_Validate::is(
-            $this->getRegionId(),
-            'NotEmpty'
-        ) && $this->_directoryData->isRegionRequired(
-            $this->getCountryId()
-        )
-        ) {
-            $errors[] = __('%fieldName is a required field.', ['fieldName' => 'regionId']);
-        }
+        $errors = $this->compositeValidator->validate($this);
 
         if (empty($errors)) {
             return true;
         }
+
         return $errors;
     }
 
     /**
+     * Create region instance
+     *
      * @return \Magento\Directory\Model\Region
      */
     protected function _createRegionInstance()
@@ -652,6 +611,8 @@ protected function _createRegionInstance()
     }
 
     /**
+     * Create country instance
+     *
      * @return \Magento\Directory\Model\Country
      */
     protected function _createCountryInstance()
@@ -661,6 +622,7 @@ protected function _createCountryInstance()
 
     /**
      * Unset Region from address
+     *
      * @return $this
      * @since 100.2.0
      */
@@ -670,8 +632,11 @@ public function unsRegion()
     }
 
     /**
+     * Is company required
+     *
      * @return bool
      * @since 100.2.0
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isCompanyRequired()
     {
@@ -679,8 +644,11 @@ protected function isCompanyRequired()
     }
 
     /**
+     * Is telephone required
+     *
      * @return bool
      * @since 100.2.0
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isTelephoneRequired()
     {
@@ -688,8 +656,11 @@ protected function isTelephoneRequired()
     }
 
     /**
+     * Is fax required
+     *
      * @return bool
      * @since 100.2.0
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isFaxRequired()
     {
diff --git a/app/code/Magento/Customer/Model/Address/CompositeValidator.php b/app/code/Magento/Customer/Model/Address/CompositeValidator.php
new file mode 100644
index 0000000000000..1d16a929532f5
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Address/CompositeValidator.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Model\Address;
+
+/**
+ * Address composite validator.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * @param array $validators
+     */
+    public function __construct(
+        array $validators = []
+    ) {
+        $this->validators = $validators;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(AbstractAddress $address)
+    {
+        $errors = [];
+        foreach ($this->validators as $validator) {
+            $errors = array_merge($errors, $validator->validate($address));
+        }
+
+        return $errors;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Address/DataProvider.php b/app/code/Magento/Customer/Model/Address/DataProvider.php
new file mode 100644
index 0000000000000..e1dd68207cae5
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Address/DataProvider.php
@@ -0,0 +1,233 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Address;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\FileUploaderDataResolver;
+use Magento\Customer\Model\AttributeMetadataResolver;
+use Magento\Ui\Component\Form\Element\Multiline;
+
+/**
+ * Dataprovider of customer addresses for customer address grid.
+ * @property \Magento\Customer\Model\ResourceModel\Address\Collection $collection
+ */
+class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var array
+     */
+    private $loadedData;
+
+    /**
+     * Allow to manage attributes, even they are hidden on storefront
+     *
+     * @var bool
+     */
+    private $allowToShowHiddenAttributes;
+
+    /*
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * @var array
+     */
+    private $bannedInputTypes = ['media_image'];
+
+    /**
+     * @var array
+     */
+    private static $attributesToEliminate = [
+        'region',
+        'vat_is_valid',
+        'vat_request_date',
+        'vat_request_id',
+        'vat_request_success'
+    ];
+
+    /**
+     * @var FileUploaderDataResolver
+     */
+    private $fileUploaderDataResolver;
+
+    /**
+     * @var AttributeMetadataResolver
+     */
+    private $attributeMetadataResolver;
+
+    /**
+     * DataProvider constructor.
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $addressCollectionFactory
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param Config $eavConfig
+     * @param ContextInterface $context
+     * @param FileUploaderDataResolver $fileUploaderDataResolver
+     * @param AttributeMetadataResolver $attributeMetadataResolver
+     * @param array $meta
+     * @param array $data
+     * @param bool $allowToShowHiddenAttributes
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        CollectionFactory $addressCollectionFactory,
+        CustomerRepositoryInterface $customerRepository,
+        Config $eavConfig,
+        ContextInterface $context,
+        FileUploaderDataResolver $fileUploaderDataResolver,
+        AttributeMetadataResolver $attributeMetadataResolver,
+        array $meta = [],
+        array $data = [],
+        $allowToShowHiddenAttributes = true
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->collection = $addressCollectionFactory->create();
+        $this->collection->addAttributeToSelect('*');
+        $this->customerRepository = $customerRepository;
+        $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
+        $this->context = $context;
+        $this->fileUploaderDataResolver = $fileUploaderDataResolver;
+        $this->attributeMetadataResolver = $attributeMetadataResolver;
+        $this->meta['general']['children'] = $this->getAttributesMeta(
+            $eavConfig->getEntityType('customer_address')
+        );
+    }
+
+    /**
+     * Get Addresses data and process customer default billing & shipping addresses
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getData(): array
+    {
+        if (null !== $this->loadedData) {
+            return $this->loadedData;
+        }
+        $items = $this->collection->getItems();
+        /** @var Address $item */
+        foreach ($items as $item) {
+            $addressId = $item->getEntityId();
+            $item->load($addressId);
+            $this->loadedData[$addressId] = $item->getData();
+            $customerId = $this->loadedData[$addressId]['parent_id'];
+            /** @var \Magento\Customer\Model\Customer $customer */
+            $customer = $this->customerRepository->getById($customerId);
+            $defaultBilling = $customer->getDefaultBilling();
+            $defaultShipping = $customer->getDefaultShipping();
+            $this->prepareAddressData($addressId, $this->loadedData, $defaultBilling, $defaultShipping);
+            $this->fileUploaderDataResolver->overrideFileUploaderData($item, $this->loadedData[$addressId]);
+        }
+
+        if (null === $this->loadedData) {
+            $this->loadedData[''] = $this->getDefaultData();
+        }
+
+        return $this->loadedData;
+    }
+
+    /**
+     * Prepare address data
+     *
+     * @param int $addressId
+     * @param array $addresses
+     * @param string|null $defaultBilling
+     * @param string|null $defaultShipping
+     * @return void
+     */
+    private function prepareAddressData($addressId, array &$addresses, $defaultBilling, $defaultShipping): void
+    {
+        if (null !== $defaultBilling && $addressId === $defaultBilling) {
+            $addresses[$addressId]['default_billing'] = '1';
+        }
+        if (null !== $defaultShipping && $addressId === $defaultShipping) {
+            $addresses[$addressId]['default_shipping'] = '1';
+        }
+        foreach ($this->meta['general']['children'] as $attributeName => $attributeMeta) {
+            if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
+                && isset($this->loadedData[$addressId][$attributeName])
+                && !\is_array($this->loadedData[$addressId][$attributeName])
+            ) {
+                $this->loadedData[$addressId][$attributeName] = explode(
+                    "\n",
+                    $this->loadedData[$addressId][$attributeName]
+                );
+            }
+        }
+    }
+
+    /**
+     * Get default customer data for adding new address
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @return array
+     */
+    private function getDefaultData(): array
+    {
+        $parentId = $this->context->getRequestParam('parent_id');
+        $customer = $this->customerRepository->getById($parentId);
+        $data = [
+            'parent_id' => $parentId,
+            'firstname' => $customer->getFirstname(),
+            'lastname' => $customer->getLastname()
+        ];
+
+        return $data;
+    }
+
+    /**
+     * Get attributes meta
+     *
+     * @param Type $entityType
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAttributesMeta(Type $entityType): array
+    {
+        $meta = [];
+        $attributes = $entityType->getAttributeCollection();
+        /* @var AbstractAttribute $attribute */
+        foreach ($attributes as $attribute) {
+            if (\in_array($attribute->getFrontendInput(), $this->bannedInputTypes, true)) {
+                continue;
+            }
+            if (\in_array($attribute->getAttributeCode(), self::$attributesToEliminate, true)) {
+                continue;
+            }
+
+            $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
+                $attribute,
+                $entityType,
+                $this->allowToShowHiddenAttributes,
+                $this->getRequestFieldName()
+            );
+        }
+        $this->attributeMetadataResolver->processWebsiteMeta($meta);
+
+        return $meta;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Address/Validator/Country.php b/app/code/Magento/Customer/Model/Address/Validator/Country.php
new file mode 100644
index 0000000000000..fdc5510d1d2e0
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Address/Validator/Country.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Address\Validator;
+
+use Magento\Customer\Model\Address\AbstractAddress;
+use Magento\Customer\Model\Address\ValidatorInterface;
+use Magento\Directory\Helper\Data;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Address country and region validator.
+ */
+class Country implements ValidatorInterface
+{
+    /**
+     * @var Data
+     */
+    private $directoryData;
+
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountriesReader;
+
+    /**
+     * @param Data $directoryData
+     * @param AllowedCountries $allowedCountriesReader
+     */
+    public function __construct(
+        Data $directoryData,
+        AllowedCountries $allowedCountriesReader
+    ) {
+        $this->directoryData = $directoryData;
+        $this->allowedCountriesReader = $allowedCountriesReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(AbstractAddress $address)
+    {
+        $errors = $this->validateCountry($address);
+        if (empty($errors)) {
+            $errors = $this->validateRegion($address);
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validate country existence.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     */
+    private function validateCountry(AbstractAddress $address)
+    {
+        $countryId = $address->getCountryId();
+        $errors = [];
+        if (!\Zend_Validate::is($countryId, 'NotEmpty')) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'countryId']);
+        } elseif (!in_array($countryId, $this->getWebsiteAllowedCountries($address), true)) {
+            //Checking if such country exists.
+            $errors[] = __(
+                'Invalid value of "%value" provided for the %fieldName field.',
+                ['fieldName' => 'countryId', 'value' => htmlspecialchars($countryId)]
+            );
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validate region existence.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     * @throws \Zend_Validate_Exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function validateRegion(AbstractAddress $address)
+    {
+        $errors = [];
+        $countryId = $address->getCountryId();
+        $countryModel = $address->getCountryModel();
+        $regionCollection = $countryModel->getRegionCollection();
+        $region = $address->getRegion();
+        $regionId = (string)$address->getRegionId();
+        $allowedRegions = $regionCollection->getAllIds();
+        $isRegionRequired = $this->directoryData->isRegionRequired($countryId);
+        if ($isRegionRequired && empty($allowedRegions) && !\Zend_Validate::is($region, 'NotEmpty')) {
+            //If region is required for country and country doesn't provide regions list
+            //region must be provided.
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'region']);
+        } elseif ($allowedRegions && !\Zend_Validate::is($regionId, 'NotEmpty') && $isRegionRequired) {
+            //If country actually has regions and requires you to
+            //select one then it must be selected.
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'regionId']);
+        } elseif ($allowedRegions && $regionId && !in_array($regionId, $allowedRegions, true)) {
+            //If a region is selected then checking if it exists.
+            $errors[] = __(
+                'Invalid value of "%value" provided for the %fieldName field.',
+                ['fieldName' => 'regionId', 'value' => htmlspecialchars($regionId)]
+            );
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Return allowed counties per website.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     */
+    private function getWebsiteAllowedCountries(AbstractAddress $address): array
+    {
+        $storeId = $address->getData('store_id');
+        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Address/Validator/General.php b/app/code/Magento/Customer/Model/Address/Validator/General.php
new file mode 100644
index 0000000000000..679f288712b4b
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Address/Validator/General.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Address\Validator;
+
+use Magento\Customer\Model\Address\AbstractAddress;
+use Magento\Customer\Model\Address\ValidatorInterface;
+
+/**
+ * Address general fields validator.
+ */
+class General implements ValidatorInterface
+{
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    private $directoryData;
+
+    /**
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Directory\Helper\Data $directoryData
+     */
+    public function __construct(
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Directory\Helper\Data $directoryData
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->directoryData = $directoryData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(AbstractAddress $address)
+    {
+        $errors = array_merge(
+            $this->checkRequredFields($address),
+            $this->checkOptionalFields($address)
+        );
+
+        return $errors;
+    }
+
+    /**
+     * Check fields that are generally required.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     * @throws \Zend_Validate_Exception
+     */
+    private function checkRequredFields(AbstractAddress $address)
+    {
+        $errors = [];
+        if (!\Zend_Validate::is($address->getFirstname(), 'NotEmpty')) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'firstname']);
+        }
+
+        if (!\Zend_Validate::is($address->getLastname(), 'NotEmpty')) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'lastname']);
+        }
+
+        if (!\Zend_Validate::is($address->getStreetLine(1), 'NotEmpty')) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'street']);
+        }
+
+        if (!\Zend_Validate::is($address->getCity(), 'NotEmpty')) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'city']);
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Check fields that are conditionally required.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Validate_Exception
+     */
+    private function checkOptionalFields(AbstractAddress $address)
+    {
+        $errors = [];
+        if ($this->isTelephoneRequired()
+            && !\Zend_Validate::is($address->getTelephone(), 'NotEmpty')
+        ) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'telephone']);
+        }
+
+        if ($this->isFaxRequired()
+            && !\Zend_Validate::is($address->getFax(), 'NotEmpty')
+        ) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'fax']);
+        }
+
+        if ($this->isCompanyRequired()
+            && !\Zend_Validate::is($address->getCompany(), 'NotEmpty')
+        ) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'company']);
+        }
+
+        $havingOptionalZip = $this->directoryData->getCountriesWithOptionalZip();
+        if (!in_array($address->getCountryId(), $havingOptionalZip)
+            && !\Zend_Validate::is($address->getPostcode(), 'NotEmpty')
+        ) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'postcode']);
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Check if company field required in configuration.
+     *
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function isCompanyRequired()
+    {
+        return $this->eavConfig->getAttribute('customer_address', 'company')->getIsRequired();
+    }
+
+    /**
+     * Check if telephone field required in configuration.
+     *
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function isTelephoneRequired()
+    {
+        return $this->eavConfig->getAttribute('customer_address', 'telephone')->getIsRequired();
+    }
+
+    /**
+     * Check if fax field required in configuration.
+     *
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function isFaxRequired()
+    {
+        return $this->eavConfig->getAttribute('customer_address', 'fax')->getIsRequired();
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Address/ValidatorInterface.php b/app/code/Magento/Customer/Model/Address/ValidatorInterface.php
new file mode 100644
index 0000000000000..8468f28e70e70
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Address/ValidatorInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Model\Address;
+
+/**
+ * Interface for address validator.
+ *
+ * @api
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate address instance.
+     * Return array of errors if not valid.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     */
+    public function validate(AbstractAddress $address);
+}
diff --git a/app/code/Magento/Customer/Model/AttributeMetadataResolver.php b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
new file mode 100644
index 0000000000000..c22cc9a4f23f4
--- /dev/null
+++ b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
@@ -0,0 +1,241 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model;
+
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Ui\DataProvider\EavValidationRules;
+use Magento\Ui\Component\Form\Field;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Config\Share as ShareConfig;
+
+/**
+ * Class to build meta data of the customer or customer address attribute
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AttributeMetadataResolver
+{
+    /**
+     * EAV attribute properties to fetch from meta storage
+     * @var array
+     */
+    private static $metaProperties = [
+        'dataType' => 'frontend_input',
+        'visible' => 'is_visible',
+        'required' => 'is_required',
+        'label' => 'frontend_label',
+        'sortOrder' => 'sort_order',
+        'notice' => 'note',
+        'default' => 'default_value',
+        'size' => 'multiline_count',
+    ];
+
+    /**
+     * Form element mapping
+     *
+     * @var array
+     */
+    private static $formElement = [
+        'text' => 'input',
+        'hidden' => 'input',
+        'boolean' => 'checkbox',
+    ];
+
+    /**
+     * @var CountryWithWebsites
+     */
+    private $countryWithWebsiteSource;
+
+    /**
+     * @var EavValidationRules
+     */
+    private $eavValidationRules;
+
+    /**
+     * @var FileUploaderDataResolver
+     */
+    private $fileUploaderDataResolver;
+
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * @var ShareConfig
+     */
+    private $shareConfig;
+
+    /**
+     * @param CountryWithWebsites $countryWithWebsiteSource
+     * @param EavValidationRules $eavValidationRules
+     * @param \Magento\Customer\Model\FileUploaderDataResolver $fileUploaderDataResolver
+     * @param ContextInterface $context
+     * @param ShareConfig $shareConfig
+     */
+    public function __construct(
+        CountryWithWebsites $countryWithWebsiteSource,
+        EavValidationRules $eavValidationRules,
+        fileUploaderDataResolver $fileUploaderDataResolver,
+        ContextInterface $context,
+        ShareConfig $shareConfig
+    ) {
+        $this->countryWithWebsiteSource = $countryWithWebsiteSource;
+        $this->eavValidationRules = $eavValidationRules;
+        $this->fileUploaderDataResolver = $fileUploaderDataResolver;
+        $this->context = $context;
+        $this->shareConfig = $shareConfig;
+    }
+
+    /**
+     * Get meta data of the customer or customer address attribute
+     *
+     * @param AbstractAttribute $attribute
+     * @param Type $entityType
+     * @param bool $allowToShowHiddenAttributes
+     * @param string $requestFieldName
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getAttributesMeta(
+        AbstractAttribute $attribute,
+        Type $entityType,
+        bool $allowToShowHiddenAttributes,
+        string $requestFieldName
+    ): array {
+        $meta = $this->modifyBooleanAttributeMeta($attribute);
+        // use getDataUsingMethod, since some getters are defined and apply additional processing of returning value
+        foreach (self::$metaProperties as $metaName => $origName) {
+            $value = $attribute->getDataUsingMethod($origName);
+            $meta['arguments']['data']['config'][$metaName] = ($metaName === 'label') ? __($value) : $value;
+            if ('frontend_input' === $origName) {
+                $meta['arguments']['data']['config']['formElement'] = self::$formElement[$value] ?? $value;
+            }
+        }
+
+        if ($attribute->usesSource()) {
+            if ($attribute->getAttributeCode() === AddressInterface::COUNTRY_ID) {
+                $meta['arguments']['data']['config']['options'] = $this->countryWithWebsiteSource
+                    ->getAllOptions();
+            } else {
+                $meta['arguments']['data']['config']['options'] = $attribute->getSource()->getAllOptions();
+            }
+        }
+
+        $rules = $this->eavValidationRules->build($attribute, $meta['arguments']['data']['config']);
+        if (!empty($rules)) {
+            $meta['arguments']['data']['config']['validation'] = $rules;
+        }
+
+        $meta['arguments']['data']['config']['componentType'] = Field::NAME;
+        $meta['arguments']['data']['config']['visible'] = $this->canShowAttribute(
+            $attribute,
+            $requestFieldName,
+            $allowToShowHiddenAttributes
+        );
+
+        $this->fileUploaderDataResolver->overrideFileUploaderMetadata(
+            $entityType,
+            $attribute,
+            $meta['arguments']['data']['config']
+        );
+
+        return $meta;
+    }
+
+    /**
+     * Detect can we show attribute on specific form or not
+     *
+     * @param AbstractAttribute $customerAttribute
+     * @param string $requestFieldName
+     * @param bool $allowToShowHiddenAttributes
+     * @return bool
+     */
+    private function canShowAttribute(
+        AbstractAttribute $customerAttribute,
+        string $requestFieldName,
+        bool $allowToShowHiddenAttributes
+    ) {
+        $userDefined = (bool)$customerAttribute->getIsUserDefined();
+        if (!$userDefined) {
+            return $customerAttribute->getIsVisible();
+        }
+
+        $canShowOnForm = $this->canShowAttributeInForm($customerAttribute, $requestFieldName);
+
+        return ($allowToShowHiddenAttributes && $canShowOnForm) ||
+            (!$allowToShowHiddenAttributes && $canShowOnForm && $customerAttribute->getIsVisible());
+    }
+
+    /**
+     * Check whether the specific attribute can be shown in form: customer registration, customer edit, etc...
+     *
+     * @param AbstractAttribute $customerAttribute
+     * @param string $requestFieldName
+     * @return bool
+     */
+    private function canShowAttributeInForm(AbstractAttribute $customerAttribute, string $requestFieldName): bool
+    {
+        $isRegistration = $this->context->getRequestParam($requestFieldName) === null;
+
+        if ($customerAttribute->getEntityType()->getEntityTypeCode() === 'customer') {
+            return \is_array($customerAttribute->getUsedInForms()) &&
+                (
+                    (\in_array('customer_account_create', $customerAttribute->getUsedInForms(), true)
+                        && $isRegistration) ||
+                    (\in_array('customer_account_edit', $customerAttribute->getUsedInForms(), true)
+                        && !$isRegistration)
+                );
+        }
+        return \is_array($customerAttribute->getUsedInForms()) &&
+            \in_array('customer_address_edit', $customerAttribute->getUsedInForms(), true);
+    }
+
+    /**
+     * Modify boolean attribute meta data
+     *
+     * @param AttributeInterface $attribute
+     * @return array
+     */
+    private function modifyBooleanAttributeMeta(AttributeInterface $attribute): array
+    {
+        $meta = [];
+        if ($attribute->getFrontendInput() === 'boolean') {
+            $meta['arguments']['data']['config']['prefer'] = 'toggle';
+            $meta['arguments']['data']['config']['valueMap'] = [
+                'true' => '1',
+                'false' => '0',
+            ];
+        }
+
+        return $meta;
+    }
+
+    /**
+     * Add global scope parameter and filter options to website meta
+     *
+     * @param array $meta
+     * @return void
+     */
+    public function processWebsiteMeta(&$meta): void
+    {
+        if (isset($meta[CustomerInterface::WEBSITE_ID]) && $this->shareConfig->isGlobalScope()) {
+            $meta[CustomerInterface::WEBSITE_ID]['arguments']['data']['config']['isGlobalScope'] = 1;
+        }
+
+        if (isset($meta[AddressInterface::COUNTRY_ID]) && !$this->shareConfig->isGlobalScope()) {
+            $meta[AddressInterface::COUNTRY_ID]['arguments']['data']['config']['filterBy'] = [
+                'target' => 'customer_form.customer_form_data_source:data.customer.website_id',
+                'field' => 'website_ids'
+            ];
+        }
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Authentication.php b/app/code/Magento/Customer/Model/Authentication.php
index 0967f1a0189e3..9a9a463062077 100644
--- a/app/code/Magento/Customer/Model/Authentication.php
+++ b/app/code/Magento/Customer/Model/Authentication.php
@@ -83,7 +83,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function processAuthenticationFailure($customerId)
     {
@@ -120,7 +120,7 @@ public function processAuthenticationFailure($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function unlock($customerId)
     {
@@ -152,7 +152,7 @@ protected function getMaxFailures()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isLocked($customerId)
     {
@@ -161,12 +161,12 @@ public function isLocked($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function authenticate($customerId, $password)
     {
         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
-        $hash = $customerSecure->getPasswordHash();
+        $hash = $customerSecure->getPasswordHash() ?? '';
         if (!$this->encryptor->validateHash($password, $hash)) {
             $this->processAuthenticationFailure($customerId);
             if ($this->isLocked($customerId)) {
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 2e2260f16ff91..972cb63ed452e 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\CustomerMetadataInterface;
@@ -18,6 +19,7 @@
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Customer model
@@ -58,6 +60,10 @@ class Customer extends \Magento\Framework\Model\AbstractModel
 
     const XML_PATH_RESET_PASSWORD_TEMPLATE = 'customer/password/reset_password_template';
 
+    /**
+     * @deprecated
+     * @see AccountConfirmation::XML_PATH_IS_CONFIRM
+     */
     const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
 
     const XML_PATH_CONFIRM_EMAIL_TEMPLATE = 'customer/create_account/email_confirmation_template';
@@ -208,6 +214,11 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      */
     protected $indexerRegistry;
 
+    /**
+     * @var AccountConfirmation
+     */
+    private $accountConfirmation;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -229,6 +240,7 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param AccountConfirmation|null $accountConfirmation
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -252,7 +264,8 @@ public function __construct(
         \Magento\Customer\Api\CustomerMetadataInterface $metadataService,
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        AccountConfirmation $accountConfirmation = null
     ) {
         $this->metadataService = $metadataService;
         $this->_scopeConfig = $scopeConfig;
@@ -269,6 +282,8 @@ public function __construct(
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->indexerRegistry = $indexerRegistry;
+        $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
+            ->get(AccountConfirmation::class);
         parent::__construct(
             $context,
             $registry,
@@ -344,13 +359,6 @@ public function updateData($customer)
             $this->setId($customerId);
         }
 
-        // Need to use attribute set or future updates can cause data loss
-        if (!$this->getAttributeSetId()) {
-            $this->setAttributeSetId(
-                CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER
-            );
-        }
-
         return $this;
     }
 
@@ -378,7 +386,7 @@ public function authenticate($login, $password)
         $this->loadByEmail($login);
         if ($this->getConfirmation() && $this->isConfirmationRequired()) {
             throw new EmailNotConfirmedException(
-                __('This account is not confirmed.')
+                __("This account isn't confirmed. Verify and try again.")
             );
         }
         if (!$this->validatePassword($password)) {
@@ -748,7 +756,7 @@ public function sendNewAccountEmail($type = 'registered', $backUrl = '', $storeI
 
         if (!isset($types[$type])) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Please correct the transactional account email type.')
+                __('The transactional account email type is incorrect. Verify and try again.')
             );
         }
 
@@ -770,20 +778,14 @@ public function sendNewAccountEmail($type = 'registered', $backUrl = '', $storeI
      * Check if accounts confirmation is required in config
      *
      * @return bool
+     * @deprecated
+     * @see AccountConfirmation::isConfirmationRequired
      */
     public function isConfirmationRequired()
     {
-        if ($this->canSkipConfirmation()) {
-            return false;
-        }
-
         $websiteId = $this->getWebsiteId() ? $this->getWebsiteId() : null;
 
-        return (bool)$this->_scopeConfig->getValue(
-            self::XML_PATH_IS_CONFIRM,
-            ScopeInterface::SCOPE_WEBSITES,
-            $websiteId
-        );
+        return $this->accountConfirmation->isConfirmationRequired($websiteId, $this->getId(), $this->getEmail());
     }
 
     /**
@@ -952,6 +954,16 @@ public function getSharedWebsiteIds()
         return $ids;
     }
 
+    /**
+     * Retrieve attribute set id for customer.
+     *
+     * @return int
+     */
+    public function getAttributeSetId()
+    {
+        return parent::getAttributeSetId() ?: CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER;
+    }
+
     /**
      * Set store to customer
      *
@@ -1156,6 +1168,8 @@ public function setIsReadonly($value)
      * Check whether confirmation may be skipped when registering using certain email address
      *
      * @return bool
+     * @deprecated
+     * @see AccountConfirmation::isConfirmationRequired
      */
     protected function canSkipConfirmation()
     {
@@ -1230,7 +1244,7 @@ public function changeResetPasswordLinkToken($passwordLinkToken)
     {
         if (!is_string($passwordLinkToken) || empty($passwordLinkToken)) {
             throw new AuthenticationException(
-                __('Please enter a valid password reset token.')
+                __('A valid password reset token is missing. Enter and try again.')
             );
         }
         $this->_getResource()->changeResetPasswordLinkToken($this, $passwordLinkToken);
@@ -1281,6 +1295,8 @@ public function getResetPasswordLinkExpirationPeriod()
     }
 
     /**
+     * Create address instance
+     *
      * @return Address
      */
     protected function _createAddressInstance()
@@ -1289,6 +1305,8 @@ protected function _createAddressInstance()
     }
 
     /**
+     * Create address collection instance
+     *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
      */
     protected function _createAddressCollection()
@@ -1297,6 +1315,8 @@ protected function _createAddressCollection()
     }
 
     /**
+     * Returns templates types
+     *
      * @return array
      */
     protected function getTemplateTypes()
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
index abdec5535e86b..a74838a1a7812 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\Customer\Attribute\Backend;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -50,12 +51,17 @@ public function beforeSave($object)
         if ($length > 0) {
             if ($length < self::MIN_PASSWORD_LENGTH) {
                 throw new LocalizedException(
-                    __('Please enter a password with at least %1 characters.', self::MIN_PASSWORD_LENGTH)
+                    __(
+                        'The password needs at least %1 characters. Create a new password and try again.',
+                        self::MIN_PASSWORD_LENGTH
+                    )
                 );
             }
 
             if (trim($password) !== $password) {
-                throw new LocalizedException(__('The password can not begin or end with a space.'));
+                throw new LocalizedException(
+                    __("The password can't begin or end with a space. Verify the password and try again.")
+                );
             }
 
             $object->setPasswordHash($object->hashPassword($password));
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
index e70fc30d7a528..e590e5e213acd 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
@@ -42,9 +42,9 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $groups = $this->_groupManagement->getLoggedInGroups();
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
index f70d0a91f35fb..85c23c98975a7 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
@@ -40,9 +40,9 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $collection = $this->_createStoresCollection();
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
index d670ed73db654..43c68f06d5f6c 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
@@ -32,9 +32,9 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $this->_options = $this->_store->getWebsiteValuesForForm();
diff --git a/app/code/Magento/Customer/Model/Customer/CredentialsValidator.php b/app/code/Magento/Customer/Model/Customer/CredentialsValidator.php
index b8adeec2f8017..a7682bde905b6 100644
--- a/app/code/Magento/Customer/Model/Customer/CredentialsValidator.php
+++ b/app/code/Magento/Customer/Model/Customer/CredentialsValidator.php
@@ -25,7 +25,9 @@ class CredentialsValidator
     public function checkPasswordDifferentFromEmail($email, $password)
     {
         if (strcasecmp($password, $email) == 0) {
-            throw new InputException(__('Password cannot be the same as email address.'));
+            throw new InputException(
+                __("The password can't be the same as the email address. Create a new password and try again.")
+            );
         }
     }
 }
diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
index ce976d3f62c74..5bad0a41aadc3 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProvider.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProvider.php
@@ -5,14 +5,11 @@
  */
 namespace Magento\Customer\Model\Customer;
 
-use Magento\Customer\Api\AddressMetadataInterface;
-use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Address;
 use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\Customer;
-use Magento\Customer\Model\FileProcessor;
 use Magento\Customer\Model\FileProcessorFactory;
 use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
 use Magento\Customer\Model\ResourceModel\Customer\Collection;
@@ -25,12 +22,18 @@
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
+use Magento\Ui\Component\Form\Element\Multiline;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
+use Magento\Customer\Model\FileUploaderDataResolver;
 
 /**
+ * Supplies the data for the customer UI component
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  *
+ * @deprecated \Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses is used instead
  * @api
  * @since 100.0.2
  */
@@ -108,21 +111,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      */
     protected $session;
 
-    /**
-     * @var FileProcessorFactory
-     */
-    private $fileProcessorFactory;
-
-    /**
-     * File types allowed for file_uploader UI component
-     *
-     * @var array
-     */
-    private $fileUploaderTypes = [
-        'image',
-        'file',
-    ];
-
     /**
      * Customer fields that must be removed
      *
@@ -146,6 +134,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      */
     private $allowToShowHiddenAttributes;
 
+    /**
+     * @var FileUploaderDataResolver
+     */
+    private $fileUploaderDataResolver;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -155,11 +148,13 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param Config $eavConfig
      * @param FilterPool $filterPool
      * @param FileProcessorFactory $fileProcessorFactory
-     * @param ContextInterface $context
      * @param array $meta
      * @param array $data
+     * @param ContextInterface $context
      * @param bool $allowToShowHiddenAttributes
+     * @param FileUploaderDataResolver|null $fileUploaderDataResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         $name,
@@ -173,7 +168,8 @@ public function __construct(
         array $meta = [],
         array $data = [],
         ContextInterface $context = null,
-        $allowToShowHiddenAttributes = true
+        $allowToShowHiddenAttributes = true,
+        $fileUploaderDataResolver = null
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->eavValidationRules = $eavValidationRules;
@@ -181,9 +177,10 @@ public function __construct(
         $this->collection->addAttributeToSelect('*');
         $this->eavConfig = $eavConfig;
         $this->filterPool = $filterPool;
-        $this->fileProcessorFactory = $fileProcessorFactory ?: $this->getFileProcessorFactory();
         $this->context = $context ?: ObjectManager::getInstance()->get(ContextInterface::class);
         $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
+        $this->fileUploaderDataResolver = $fileUploaderDataResolver
+            ?: ObjectManager::getInstance()->get(FileUploaderDataResolver::class);
         $this->meta['customer']['children'] = $this->getAttributesMeta(
             $this->eavConfig->getEntityType('customer')
         );
@@ -224,7 +221,7 @@ public function getData()
         foreach ($items as $customer) {
             $result['customer'] = $customer->getData();
 
-            $this->overrideFileUploaderData($customer, $result['customer']);
+            $this->fileUploaderDataResolver->overrideFileUploaderData($customer, $result['customer']);
 
             $result['customer'] = array_diff_key(
                 $result['customer'],
@@ -239,7 +236,7 @@ public function getData()
                 $result['address'][$addressId] = $address->getData();
                 $this->prepareAddressData($addressId, $result['address'], $result['customer']);
 
-                $this->overrideFileUploaderData($address, $result['address'][$addressId]);
+                $this->fileUploaderDataResolver->overrideFileUploaderData($address, $result['address'][$addressId]);
             }
             $this->loadedData[$customer->getId()] = $result;
         }
@@ -254,75 +251,6 @@ public function getData()
         return $this->loadedData;
     }
 
-    /**
-     * Override file uploader UI component data
-     *
-     * Overrides data for attributes with frontend_input equal to 'image' or 'file'.
-     *
-     * @param Customer|Address $entity
-     * @param array $entityData
-     * @return void
-     */
-    private function overrideFileUploaderData($entity, array &$entityData)
-    {
-        $attributes = $entity->getAttributes();
-        foreach ($attributes as $attribute) {
-            /** @var Attribute $attribute */
-            if (in_array($attribute->getFrontendInput(), $this->fileUploaderTypes)) {
-                $entityData[$attribute->getAttributeCode()] = $this->getFileUploaderData(
-                    $entity->getEntityType(),
-                    $attribute,
-                    $entityData
-                );
-            }
-        }
-    }
-
-    /**
-     * Retrieve array of values required by file uploader UI component
-     *
-     * @param Type $entityType
-     * @param Attribute $attribute
-     * @param array $customerData
-     * @return array
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    private function getFileUploaderData(
-        Type $entityType,
-        Attribute $attribute,
-        array $customerData
-    ) {
-        $attributeCode = $attribute->getAttributeCode();
-
-        $file = isset($customerData[$attributeCode])
-            ? $customerData[$attributeCode]
-            : '';
-
-        /** @var FileProcessor $fileProcessor */
-        $fileProcessor = $this->getFileProcessorFactory()->create([
-            'entityTypeCode' => $entityType->getEntityTypeCode(),
-        ]);
-
-        if (!empty($file)
-            && $fileProcessor->isExist($file)
-        ) {
-            $stat = $fileProcessor->getStat($file);
-            $viewUrl = $fileProcessor->getViewUrl($file, $attribute->getFrontendInput());
-
-            return [
-                [
-                    'file' => $file,
-                    'size' => isset($stat) ? $stat['size'] : 0,
-                    'url' => isset($viewUrl) ? $viewUrl : '',
-                    'name' => basename($file),
-                    'type' => $fileProcessor->getMimeType($file),
-                ],
-            ];
-        }
-
-        return [];
-    }
-
     /**
      * Get attributes meta
      *
@@ -368,7 +296,11 @@ protected function getAttributesMeta(Type $entityType)
             $meta[$code]['arguments']['data']['config']['componentType'] = Field::NAME;
             $meta[$code]['arguments']['data']['config']['visible'] = $this->canShowAttribute($attribute);
 
-            $this->overrideFileUploaderMetadata($entityType, $attribute, $meta[$code]['arguments']['data']['config']);
+            $this->fileUploaderDataResolver->overrideFileUploaderMetadata(
+                $entityType,
+                $attribute,
+                $meta[$code]['arguments']['data']['config']
+            );
         }
 
         $this->processWebsiteMeta($meta);
@@ -466,97 +398,6 @@ private function processWebsiteMeta(&$meta)
         }
     }
 
-    /**
-     * Override file uploader UI component metadata
-     *
-     * Overrides metadata for attributes with frontend_input equal to 'image' or 'file'.
-     *
-     * @param Type $entityType
-     * @param AbstractAttribute $attribute
-     * @param array $config
-     * @return void
-     */
-    private function overrideFileUploaderMetadata(
-        Type $entityType,
-        AbstractAttribute $attribute,
-        array &$config
-    ) {
-        if (in_array($attribute->getFrontendInput(), $this->fileUploaderTypes)) {
-            $maxFileSize = self::MAX_FILE_SIZE;
-
-            if (isset($config['validation']['max_file_size'])) {
-                $maxFileSize = (int)$config['validation']['max_file_size'];
-            }
-
-            $allowedExtensions = [];
-
-            if (isset($config['validation']['file_extensions'])) {
-                $allowedExtensions = explode(',', $config['validation']['file_extensions']);
-                array_walk($allowedExtensions, function (&$value) {
-                    $value = strtolower(trim($value));
-                });
-            }
-
-            $allowedExtensions = implode(' ', $allowedExtensions);
-
-            $entityTypeCode = $entityType->getEntityTypeCode();
-            $url = $this->getFileUploadUrl($entityTypeCode);
-
-            $config = [
-                'formElement' => 'fileUploader',
-                'componentType' => 'fileUploader',
-                'maxFileSize' => $maxFileSize,
-                'allowedExtensions' => $allowedExtensions,
-                'uploaderConfig' => [
-                    'url' => $url,
-                ],
-                'label' => $this->getMetadataValue($config, 'label'),
-                'sortOrder' => $this->getMetadataValue($config, 'sortOrder'),
-                'required' => $this->getMetadataValue($config, 'required'),
-                'visible' => $this->getMetadataValue($config, 'visible'),
-                'validation' => $this->getMetadataValue($config, 'validation'),
-            ];
-        }
-    }
-
-    /**
-     * Retrieve metadata value
-     *
-     * @param array $config
-     * @param string $name
-     * @param mixed $default
-     * @return mixed
-     */
-    private function getMetadataValue($config, $name, $default = null)
-    {
-        $value = isset($config[$name]) ? $config[$name] : $default;
-        return $value;
-    }
-
-    /**
-     * Retrieve URL to file upload
-     *
-     * @param string $entityTypeCode
-     * @return string
-     */
-    private function getFileUploadUrl($entityTypeCode)
-    {
-        switch ($entityTypeCode) {
-            case CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER:
-                $url = 'customer/file/customer_upload';
-                break;
-
-            case AddressMetadataInterface::ENTITY_TYPE_ADDRESS:
-                $url = 'customer/file/address_upload';
-                break;
-
-            default:
-                $url = '';
-                break;
-        }
-        return $url;
-    }
-
     /**
      * Process attributes by frontend input type
      *
@@ -596,23 +437,14 @@ protected function prepareAddressData($addressId, array &$addresses, array $cust
         ) {
             $addresses[$addressId]['default_shipping'] = $customer['default_shipping'];
         }
-        if (isset($addresses[$addressId]['street']) && !is_array($addresses[$addressId]['street'])) {
-            $addresses[$addressId]['street'] = explode("\n", $addresses[$addressId]['street']);
-        }
-    }
 
-    /**
-     * Get FileProcessorFactory instance
-     *
-     * @return FileProcessorFactory
-     * @deprecated 100.1.3
-     */
-    private function getFileProcessorFactory()
-    {
-        if ($this->fileProcessorFactory === null) {
-            $this->fileProcessorFactory = ObjectManager::getInstance()
-                ->get(\Magento\Customer\Model\FileProcessorFactory::class);
+        foreach ($this->meta['address']['children'] as $attributeName => $attributeMeta) {
+            if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
+                && isset($addresses[$addressId][$attributeName])
+                && !is_array($addresses[$addressId][$attributeName])
+            ) {
+                $addresses[$addressId][$attributeName] = explode("\n", $addresses[$addressId][$attributeName]);
+            }
         }
-        return $this->fileProcessorFactory;
     }
 }
diff --git a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
new file mode 100644
index 0000000000000..4d1bb2e6b9e99
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
@@ -0,0 +1,200 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Customer;
+
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Customer\Model\FileUploaderDataResolver;
+use Magento\Customer\Model\AttributeMetadataResolver;
+
+/**
+ * Refactored version of Magento\Customer\Model\Customer\DataProvider with eliminated usage of addresses collection.
+ */
+class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\AbstractDataProvider
+{
+    /**
+     * @var array
+     */
+    private $loadedData = [];
+
+    /**
+     * @var SessionManagerInterface
+     */
+    private $session;
+
+    /**
+     * Customer fields that must be removed
+     *
+     * @var array
+     */
+    private static $forbiddenCustomerFields = [
+        'password_hash',
+        'rp_token',
+        'confirmation',
+    ];
+
+    /**
+     * Allow to manage attributes, even they are hidden on storefront
+     *
+     * @var bool
+     */
+    private $allowToShowHiddenAttributes;
+
+    /**
+     * @var \Magento\Directory\Model\CountryFactory
+     */
+    private $countryFactory;
+
+    /**
+     * @var FileUploaderDataResolver
+     */
+    private $fileUploaderDataResolver;
+
+    /**
+     * @var AttributeMetadataResolver
+     */
+    private $attributeMetadataResolver;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CustomerCollectionFactory $customerCollectionFactory
+     * @param Config $eavConfig
+     * @param \Magento\Directory\Model\CountryFactory $countryFactory
+     * @param SessionManagerInterface $session
+     * @param FileUploaderDataResolver $fileUploaderDataResolver
+     * @param AttributeMetadataResolver $attributeMetadataResolver
+     * @param bool $allowToShowHiddenAttributes
+     * @param array $meta
+     * @param array $data
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
+        CustomerCollectionFactory $customerCollectionFactory,
+        Config $eavConfig,
+        \Magento\Directory\Model\CountryFactory $countryFactory,
+        SessionManagerInterface $session,
+        FileUploaderDataResolver $fileUploaderDataResolver,
+        AttributeMetadataResolver $attributeMetadataResolver,
+        $allowToShowHiddenAttributes = true,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->collection = $customerCollectionFactory->create();
+        $this->collection->addAttributeToSelect('*');
+        $this->allowToShowHiddenAttributes = $allowToShowHiddenAttributes;
+        $this->session = $session;
+        $this->countryFactory = $countryFactory;
+        $this->fileUploaderDataResolver = $fileUploaderDataResolver;
+        $this->attributeMetadataResolver = $attributeMetadataResolver;
+        $this->meta['customer']['children'] = $this->getAttributesMeta(
+            $eavConfig->getEntityType('customer')
+        );
+    }
+
+    /**
+     * Get data
+     *
+     * @return array
+     */
+    public function getData(): array
+    {
+        if (!empty($this->loadedData)) {
+            return $this->loadedData;
+        }
+        $items = $this->collection->getItems();
+        /** @var Customer $customer */
+        foreach ($items as $customer) {
+            $result['customer'] = $customer->getData();
+
+            $this->fileUploaderDataResolver->overrideFileUploaderData($customer, $result['customer']);
+
+            $result['customer'] = array_diff_key(
+                $result['customer'],
+                array_flip(self::$forbiddenCustomerFields)
+            );
+            unset($result['address']);
+
+            $result['default_billing_address'] = $this->prepareDefaultAddress(
+                $customer->getDefaultBillingAddress()
+            );
+            $result['default_shipping_address'] = $this->prepareDefaultAddress(
+                $customer->getDefaultShippingAddress()
+            );
+            $result['customer_id'] = $customer->getId();
+
+            $this->loadedData[$customer->getId()] = $result;
+        }
+
+        $data = $this->session->getCustomerFormData();
+        if (!empty($data)) {
+            $customerId = $data['customer']['entity_id'] ?? null;
+            $this->loadedData[$customerId] = $data;
+            $this->session->unsCustomerFormData();
+        }
+
+        return $this->loadedData;
+    }
+
+    /**
+     * Prepare default address data.
+     *
+     * @param Address|false $address
+     * @return array
+     */
+    private function prepareDefaultAddress($address): array
+    {
+        $addressData = [];
+
+        if (!empty($address)) {
+            $addressData = $address->getData();
+            if (isset($addressData['street']) && !\is_array($address['street'])) {
+                $addressData['street'] = explode("\n", $addressData['street']);
+            }
+            $addressData['country'] = $this->countryFactory->create()
+                ->loadByCode($addressData['country_id'])->getName();
+        }
+
+        return $addressData;
+    }
+
+    /**
+     * Get attributes meta
+     *
+     * @param Type $entityType
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAttributesMeta(Type $entityType): array
+    {
+        $meta = [];
+        $attributes = $entityType->getAttributeCollection();
+        /* @var AbstractAttribute $attribute */
+        foreach ($attributes as $attribute) {
+            $meta[$attribute->getAttributeCode()] = $this->attributeMetadataResolver->getAttributesMeta(
+                $attribute,
+                $entityType,
+                $this->allowToShowHiddenAttributes,
+                $this->getRequestFieldName()
+            );
+        }
+        $this->attributeMetadataResolver->processWebsiteMeta($meta);
+
+        return $meta;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Customer/NotificationStorage.php b/app/code/Magento/Customer/Model/Customer/NotificationStorage.php
index 7054324851f34..11e0b9b916559 100644
--- a/app/code/Magento/Customer/Model/Customer/NotificationStorage.php
+++ b/app/code/Magento/Customer/Model/Customer/NotificationStorage.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model\Customer;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
@@ -18,21 +19,21 @@ class NotificationStorage
     private $cache;
 
     /**
-     * @param FrontendInterface $cache
-     */
-
-    /**
-     * @param FrontendInterface $cache
+     * @var SerializerInterface
      */
     private $serializer;
 
     /**
      * NotificationStorage constructor.
      * @param FrontendInterface $cache
+     * @param SerializerInterface $serializer
      */
-    public function __construct(FrontendInterface $cache)
-    {
+    public function __construct(
+        FrontendInterface $cache,
+        SerializerInterface $serializer = null
+    ) {
         $this->cache = $cache;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
     }
 
     /**
@@ -45,7 +46,7 @@ public function __construct(FrontendInterface $cache)
     public function add($notificationType, $customerId)
     {
         $this->cache->save(
-            $this->getSerializer()->serialize([
+            $this->serializer->serialize([
                 'customer_id' => $customerId,
                 'notification_type' => $notificationType
             ]),
@@ -88,19 +89,4 @@ private function getCacheKey($notificationType, $customerId)
     {
         return 'notification_' . $notificationType . '_' . $customerId;
     }
-
-    /**
-     * Get serializer
-     *
-     * @return SerializerInterface
-     * @deprecated 100.2.0
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(SerializerInterface::class);
-        }
-        return $this->serializer;
-    }
 }
diff --git a/app/code/Magento/Customer/Model/Delegation/AccountDelegation.php b/app/code/Magento/Customer/Model/Delegation/AccountDelegation.php
new file mode 100644
index 0000000000000..85c67213c4613
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Delegation/AccountDelegation.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Delegation;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\AccountDelegationInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class AccountDelegation implements AccountDelegationInterface
+{
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactory;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @param RedirectFactory $redirectFactory
+     * @param Storage $storage
+     */
+    public function __construct(
+        RedirectFactory $redirectFactory,
+        Storage $storage
+    ) {
+        $this->redirectFactory = $redirectFactory;
+        $this->storage = $storage;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createRedirectForNew(
+        CustomerInterface $customer,
+        array $mixedData = null
+    ): Redirect {
+        $this->storage->storeNewOperation($customer, $mixedData);
+
+        return $this->redirectFactory->create()->setPath('customer/account/create');
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Delegation/Data/NewOperation.php b/app/code/Magento/Customer/Model/Delegation/Data/NewOperation.php
new file mode 100644
index 0000000000000..5dcefc2326794
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Delegation/Data/NewOperation.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Delegation\Data;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+
+/**
+ * Data required for delegated new-account operation.
+ */
+class NewOperation
+{
+    /**
+     * @var CustomerInterface
+     */
+    private $customer;
+
+    /**
+     * @var array
+     */
+    private $additionalData;
+
+    /**
+     * @param CustomerInterface $customer
+     * @param array $additionalData
+     */
+    public function __construct(
+        CustomerInterface $customer,
+        array $additionalData
+    ) {
+        $this->customer = $customer;
+        $this->additionalData = $additionalData;
+    }
+
+    /**
+     * @return CustomerInterface
+     */
+    public function getCustomer(): CustomerInterface
+    {
+        return $this->customer;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAdditionalData(): array
+    {
+        return $this->additionalData;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Delegation/Storage.php b/app/code/Magento/Customer/Model/Delegation/Storage.php
new file mode 100644
index 0000000000000..71a61d59057cb
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Delegation/Storage.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Delegation;
+
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\RegionInterface;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Customer\Model\Delegation\Data\NewOperation;
+use Magento\Customer\Model\Data\Customer;
+use Magento\Customer\Model\Data\Address;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Session\Proxy as SessionProxy;
+use Magento\Customer\Model\Delegation\Data\NewOperationFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Store data for delegated operations.
+ */
+class Storage
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var NewOperationFactory
+     */
+    private $newFactory;
+
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var RegionInterfaceFactory
+     */
+    private $regionFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param NewOperationFactory $newFactory
+     * @param CustomerInterfaceFactory $customerFactory
+     * @param AddressInterfaceFactory $addressFactory
+     * @param RegionInterfaceFactory $regionFactory
+     * @param LoggerInterface $logger
+     * @param SessionProxy $session
+     */
+    public function __construct(
+        NewOperationFactory $newFactory,
+        CustomerInterfaceFactory $customerFactory,
+        AddressInterfaceFactory $addressFactory,
+        RegionInterfaceFactory $regionFactory,
+        LoggerInterface $logger,
+        SessionProxy $session
+    ) {
+        $this->newFactory = $newFactory;
+        $this->customerFactory = $customerFactory;
+        $this->addressFactory = $addressFactory;
+        $this->regionFactory = $regionFactory;
+        $this->logger = $logger;
+        $this->session = $session;
+    }
+
+    /**
+     * Store data for new account operation.
+     *
+     * @param CustomerInterface $customer
+     * @param array $delegatedData
+     *
+     * @return void
+     */
+    public function storeNewOperation(CustomerInterface $customer, array $delegatedData): void
+    {
+        /** @var Customer $customer */
+        $customerData = $customer->__toArray();
+        $addressesData = [];
+        if ($customer->getAddresses()) {
+            /** @var Address $address */
+            foreach ($customer->getAddresses() as $address) {
+                $addressesData[] = $address->__toArray();
+            }
+        }
+        $this->session->setCustomerFormData($customerData);
+        $this->session->setDelegatedNewCustomerData([
+            'customer' => $customerData,
+            'addresses' => $addressesData,
+            'delegated_data' => $delegatedData,
+        ]);
+    }
+
+    /**
+     * Retrieve delegated new operation data and mark it as used.
+     *
+     * @return NewOperation|null
+     */
+    public function consumeNewOperation()
+    {
+        try {
+            $serialized = $this->session->getDelegatedNewCustomerData(true);
+        } catch (\Throwable $exception) {
+            $this->logger->error($exception);
+            $serialized = null;
+        }
+        if ($serialized === null) {
+            return null;
+        }
+
+        /** @var AddressInterface[] $addresses */
+        $addresses = [];
+        foreach ($serialized['addresses'] as $addressData) {
+            if (isset($addressData['region'])) {
+                /** @var RegionInterface $region */
+                $region = $this->regionFactory->create(
+                    ['data' => $addressData['region']]
+                );
+                $addressData['region'] = $region;
+            }
+            $addresses[] = $this->addressFactory->create(
+                ['data' => $addressData]
+            );
+        }
+        $customerData = $serialized['customer'];
+        $customerData['addresses'] = $addresses;
+
+        return $this->newFactory->create([
+            'customer' => $this->customerFactory->create(
+                ['data' => $customerData]
+            ),
+            'additionalData' => $serialized['delegated_data'],
+        ]);
+    }
+}
diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
index 14ae9a885c7b1..30a9dbedde8d0 100644
--- a/app/code/Magento/Customer/Model/EmailNotification.php
+++ b/app/code/Magento/Customer/Model/EmailNotification.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Mail\Template\SenderResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Customer\Helper\View as CustomerViewHelper;
@@ -14,6 +17,8 @@
 use Magento\Framework\Exception\LocalizedException;
 
 /**
+ * Class for notification customer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailNotification implements EmailNotificationInterface
@@ -60,6 +65,8 @@ class EmailNotification implements EmailNotificationInterface
         self::NEW_ACCOUNT_EMAIL_CONFIRMATION => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
     ];
 
+    const CUSTOMER_CONFIRM_URL = 'customer/account/confirm/';
+
     /**#@-*/
 
     /**#@-*/
@@ -90,6 +97,11 @@ class EmailNotification implements EmailNotificationInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var SenderResolverInterface
+     */
+    private $senderResolver;
+
     /**
      * @param CustomerRegistry $customerRegistry
      * @param StoreManagerInterface $storeManager
@@ -97,6 +109,7 @@ class EmailNotification implements EmailNotificationInterface
      * @param CustomerViewHelper $customerViewHelper
      * @param DataObjectProcessor $dataProcessor
      * @param ScopeConfigInterface $scopeConfig
+     * @param SenderResolverInterface|null $senderResolver
      */
     public function __construct(
         CustomerRegistry $customerRegistry,
@@ -104,7 +117,8 @@ public function __construct(
         TransportBuilder $transportBuilder,
         CustomerViewHelper $customerViewHelper,
         DataObjectProcessor $dataProcessor,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        SenderResolverInterface $senderResolver = null
     ) {
         $this->customerRegistry = $customerRegistry;
         $this->storeManager = $storeManager;
@@ -112,6 +126,7 @@ public function __construct(
         $this->customerViewHelper = $customerViewHelper;
         $this->dataProcessor = $dataProcessor;
         $this->scopeConfig = $scopeConfig;
+        $this->senderResolver = $senderResolver ?: ObjectManager::getInstance()->get(SenderResolverInterface::class);
     }
 
     /**
@@ -230,6 +245,7 @@ private function passwordReset(CustomerInterface $customer)
      * @param int|null $storeId
      * @param string $email
      * @return void
+     * @throws \Magento\Framework\Exception\MailException
      */
     private function sendEmailTemplate(
         $customer,
@@ -243,10 +259,17 @@ private function sendEmailTemplate(
         if ($email === null) {
             $email = $customer->getEmail();
         }
+
+        /** @var array $from */
+        $from = $this->senderResolver->resolve(
+            $this->scopeConfig->getValue($sender, 'store', $storeId),
+            $storeId
+        );
+
         $transport = $this->transportBuilder->setTemplateIdentifier($templateId)
             ->setTemplateOptions(['area' => 'frontend', 'store' => $storeId])
             ->setTemplateVars($templateParams)
-            ->setFrom($this->scopeConfig->getValue($sender, 'store', $storeId))
+            ->setFrom($from)
             ->addTo($email, $this->customerViewHelper->getCustomerName($customer))
             ->getTransport();
 
@@ -295,9 +318,9 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
      */
     public function passwordReminder(CustomerInterface $customer)
     {
-        $storeId = $this->getWebsiteStoreId($customer);
+        $storeId = $customer->getStoreId();
         if (!$storeId) {
-            $storeId = $this->storeManager->getStore()->getId();
+            $storeId = $this->getWebsiteStoreId($customer);
         }
 
         $customerEmailData = $this->getFullCustomerObject($customer);
@@ -343,6 +366,7 @@ public function passwordResetConfirmation(CustomerInterface $customer)
      * @param string $backUrl
      * @param string $storeId
      * @param string $sendemailStoreId
+     * @param array $extensions
      * @return void
      * @throws LocalizedException
      */
@@ -351,12 +375,15 @@ public function newAccount(
         $type = self::NEW_ACCOUNT_EMAIL_REGISTERED,
         $backUrl = '',
         $storeId = 0,
-        $sendemailStoreId = null
+        $sendemailStoreId = null,
+        $extensions = []
     ) {
         $types = self::TEMPLATE_TYPES;
 
         if (!isset($types[$type])) {
-            throw new LocalizedException(__('Please correct the transactional account email type.'));
+            throw new LocalizedException(
+                __('The transactional account email type is incorrect. Verify and try again.')
+            );
         }
 
         if (!$storeId) {
@@ -367,11 +394,26 @@ public function newAccount(
 
         $customerEmailData = $this->getFullCustomerObject($customer);
 
+        $templateVars = [
+            'customer' => $customerEmailData,
+            'back_url' => $backUrl,
+            'store' => $store
+        ];
+        if ($type == self::NEW_ACCOUNT_EMAIL_CONFIRMATION) {
+            if (empty($extensions)) {
+                $templateVars['url'] = self::CUSTOMER_CONFIRM_URL;
+                $templateVars['extensions'] = $extensions;
+            } else {
+                $templateVars['url'] = $extensions['url'];
+                $templateVars['extensions'] = $extensions['extension_info'];
+            }
+        }
+
         $this->sendEmailTemplate(
             $customer,
             $types[$type],
             self::XML_PATH_REGISTER_EMAIL_IDENTITY,
-            ['customer' => $customerEmailData, 'back_url' => $backUrl, 'store' => $store],
+            $templateVars,
             $storeId
         );
     }
diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index 2d6917efdaf56..6a8472758c169 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -202,7 +202,7 @@ public function moveTemporaryFile($fileName)
     {
         $fileName = ltrim($fileName, '/');
 
-        $dispersionPath = \Magento\MediaStorage\Model\File\Uploader::getDispretionPath($fileName);
+        $dispersionPath = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
         $destinationPath = $this->entityTypeCode . $dispersionPath;
 
         if (!$this->mediaDirectory->create($destinationPath)) {
diff --git a/app/code/Magento/Customer/Model/FileUploaderDataResolver.php b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
new file mode 100644
index 0000000000000..535bfe97bc457
--- /dev/null
+++ b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
@@ -0,0 +1,204 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model;
+
+use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Customer\Api\CustomerMetadataInterface;
+
+/**
+ * Class to retrieve file uploader data for customer and customer address file & image attributes
+ */
+class FileUploaderDataResolver
+{
+    /**
+     * Maximum file size allowed for file_uploader UI component
+     * This constant was copied from deprecated data provider \Magento\Customer\Model\Customer\DataProvider
+     */
+    private const MAX_FILE_SIZE = 2097152;
+
+    /**
+     * @var FileProcessorFactory
+     */
+    private $fileProcessorFactory;
+
+    /**
+     * File types allowed for file_uploader UI component
+     *
+     * @var array
+     */
+    private $fileUploaderTypes = [
+        'image',
+        'file',
+    ];
+
+    /**
+     * @param FileProcessorFactory $fileProcessorFactory
+     */
+    public function __construct(
+        FileProcessorFactory $fileProcessorFactory
+    ) {
+        $this->fileProcessorFactory = $fileProcessorFactory;
+    }
+
+    /**
+     * Override file uploader UI component data
+     *
+     * Overrides data for attributes with frontend_input equal to 'image' or 'file'.
+     *
+     * @param Customer|Address $entity
+     * @param array $entityData
+     * @return void
+     */
+    public function overrideFileUploaderData($entity, array &$entityData): void
+    {
+        $attributes = $entity->getAttributes();
+        foreach ($attributes as $attribute) {
+            /** @var Attribute $attribute */
+            if (\in_array($attribute->getFrontendInput(), $this->fileUploaderTypes, true)) {
+                $entityData[$attribute->getAttributeCode()] = $this->getFileUploaderData(
+                    $entity->getEntityType(),
+                    $attribute,
+                    $entityData
+                );
+            }
+        }
+    }
+
+    /**
+     * Retrieve array of values required by file uploader UI component
+     *
+     * @param Type $entityType
+     * @param Attribute $attribute
+     * @param array $customerData
+     * @return array
+     */
+    private function getFileUploaderData(
+        Type $entityType,
+        Attribute $attribute,
+        array $customerData
+    ): array {
+        $attributeCode = $attribute->getAttributeCode();
+
+        $file = $customerData[$attributeCode] ?? null;
+
+        /** @var FileProcessor $fileProcessor */
+        $fileProcessor = $this->fileProcessorFactory->create([
+            'entityTypeCode' => $entityType->getEntityTypeCode(),
+        ]);
+
+        if (!empty($file)
+            && $fileProcessor->isExist($file)
+        ) {
+            $stat = $fileProcessor->getStat($file);
+            $viewUrl = $fileProcessor->getViewUrl($file, $attribute->getFrontendInput());
+
+            return [
+                [
+                    'file' => $file,
+                    'size' => null !== $stat ? $stat['size'] : 0,
+                    'url' => $viewUrl ?? '',
+                    'name' => basename($file),
+                    'type' => $fileProcessor->getMimeType($file),
+                ],
+            ];
+        }
+
+        return [];
+    }
+
+    /**
+     * Override file uploader UI component metadata
+     *
+     * Overrides metadata for attributes with frontend_input equal to 'image' or 'file'.
+     *
+     * @param Type $entityType
+     * @param AbstractAttribute $attribute
+     * @param array $config
+     * @return void
+     */
+    public function overrideFileUploaderMetadata(
+        Type $entityType,
+        AbstractAttribute $attribute,
+        array &$config
+    ): void {
+        if (\in_array($attribute->getFrontendInput(), $this->fileUploaderTypes, true)) {
+            $maxFileSize = self::MAX_FILE_SIZE;
+
+            if (isset($config['validation']['max_file_size'])) {
+                $maxFileSize = (int)$config['validation']['max_file_size'];
+            }
+
+            $allowedExtensions = [];
+
+            if (isset($config['validation']['file_extensions'])) {
+                $allowedExtensions = explode(',', $config['validation']['file_extensions']);
+                array_walk($allowedExtensions, function (&$value) {
+                    $value = strtolower(trim($value));
+                });
+            }
+
+            $allowedExtensions = implode(' ', $allowedExtensions);
+
+            $entityTypeCode = $entityType->getEntityTypeCode();
+            $url = $this->getFileUploadUrl($entityTypeCode);
+
+            $config = [
+                'formElement' => 'fileUploader',
+                'componentType' => 'fileUploader',
+                'maxFileSize' => $maxFileSize,
+                'allowedExtensions' => $allowedExtensions,
+                'uploaderConfig' => [
+                    'url' => $url,
+                ],
+                'label' => $this->getMetadataValue($config, 'label'),
+                'sortOrder' => $this->getMetadataValue($config, 'sortOrder'),
+                'required' => $this->getMetadataValue($config, 'required'),
+                'visible' => $this->getMetadataValue($config, 'visible'),
+                'validation' => $this->getMetadataValue($config, 'validation'),
+            ];
+        }
+    }
+
+    /**
+     * Retrieve metadata value
+     *
+     * @param array $config
+     * @param string $name
+     * @param mixed $default
+     * @return mixed
+     */
+    private function getMetadataValue($config, $name, $default = null)
+    {
+        return $config[$name] ?? $default;
+    }
+
+    /**
+     * Retrieve URL to file upload
+     *
+     * @param string $entityTypeCode
+     * @return string
+     */
+    private function getFileUploadUrl($entityTypeCode): string
+    {
+        switch ($entityTypeCode) {
+            case CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER:
+                $url = 'customer/file/customer_upload';
+                break;
+
+            case AddressMetadataInterface::ENTITY_TYPE_ADDRESS:
+                $url = 'customer/file/address_upload';
+                break;
+
+            default:
+                $url = '';
+                break;
+        }
+        return $url;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 47d7d7ad1ac41..48cb5d55061c5 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -8,16 +8,19 @@
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\Data\GroupInterfaceFactory;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Api\GroupRepositoryInterface;
-use Magento\Customer\Api\Data\GroupInterfaceFactory;
-use Magento\Customer\Model\GroupFactory;
 
 /**
+ * The class contains methods for getting information about a customer group
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
@@ -65,6 +68,11 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      */
     protected $filterBuilder;
 
+    /**
+     * @var SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
     /**
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
@@ -73,6 +81,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      * @param GroupInterfaceFactory $groupDataFactory
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FilterBuilder $filterBuilder
+     * @param SortOrderBuilder $sortOrderBuilder
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -81,7 +90,8 @@ public function __construct(
         GroupRepositoryInterface $groupRepository,
         GroupInterfaceFactory $groupDataFactory,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        FilterBuilder $filterBuilder
+        FilterBuilder $filterBuilder,
+        SortOrderBuilder $sortOrderBuilder = null
     ) {
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
@@ -90,10 +100,12 @@ public function __construct(
         $this->groupDataFactory = $groupDataFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->filterBuilder = $filterBuilder;
+        $this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
+            ->get(SortOrderBuilder::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isReadonly($groupId)
     {
@@ -107,7 +119,7 @@ public function isReadonly($groupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultGroup($storeId = null)
     {
@@ -133,7 +145,7 @@ public function getDefaultGroup($storeId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getNotLoggedInGroup()
     {
@@ -141,7 +153,7 @@ public function getNotLoggedInGroup()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLoggedInGroups()
     {
@@ -155,15 +167,20 @@ public function getLoggedInGroups()
             ->setConditionType('neq')
             ->setValue(self::CUST_GROUP_ALL)
             ->create();
+        $groupNameSortOrder = $this->sortOrderBuilder
+            ->setField('customer_group_code')
+            ->setAscendingDirection()
+            ->create();
         $searchCriteria = $this->searchCriteriaBuilder
             ->addFilters($notLoggedInFilter)
             ->addFilters($groupAll)
+            ->addSortOrder($groupNameSortOrder)
             ->create();
         return $this->groupRepository->getList($searchCriteria)->getItems();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllCustomersGroup()
     {
diff --git a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
new file mode 100644
index 0000000000000..d4e0c5cce3401
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Indexer;
+
+use Magento\Customer\Model\ResourceModel\Group\CollectionFactory as CustomerGroupCollectionFactory;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Indexer\DimensionProviderInterface;
+
+class CustomerGroupDimensionProvider implements DimensionProviderInterface
+{
+    /**
+     * Name for customer group dimension for multidimensional indexer
+     * 'cg' - stands for 'customer_group'
+     */
+    const DIMENSION_NAME = 'cg';
+
+    /**
+     * @var CustomerGroupCollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var \SplFixedArray
+     */
+    private $customerGroupsDataIterator;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    public function __construct(CustomerGroupCollectionFactory $collectionFactory, DimensionFactory $dimensionFactory)
+    {
+        $this->dimensionFactory = $dimensionFactory;
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    public function getIterator(): \Traversable
+    {
+        foreach ($this->getCustomerGroups() as $customerGroup) {
+            yield $this->dimensionFactory->create(self::DIMENSION_NAME, (string)$customerGroup);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getCustomerGroups(): array
+    {
+        if ($this->customerGroupsDataIterator === null) {
+            $customerGroups = $this->collectionFactory->create()->getAllIds();
+            $this->customerGroupsDataIterator = is_array($customerGroups) ? $customerGroups : [];
+        }
+
+        return $this->customerGroupsDataIterator;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Indexer/Source.php b/app/code/Magento/Customer/Model/Indexer/Source.php
index e4bf03e08a9ad..a8878e2084ea0 100644
--- a/app/code/Magento/Customer/Model/Indexer/Source.php
+++ b/app/code/Magento/Customer/Model/Indexer/Source.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model\Indexer;
 
+use Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory;
 use Magento\Customer\Model\ResourceModel\Customer\Indexer\Collection;
 use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
 use Traversable;
@@ -25,11 +26,11 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
     private $batchSize;
 
     /**
-     * @param \Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory $collection
+     * @param CollectionFactory $collectionFactory
      * @param int $batchSize
      */
     public function __construct(
-        \Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory $collectionFactory,
+        CollectionFactory $collectionFactory,
         $batchSize = 10000
     ) {
         $this->customerCollection = $collectionFactory->create();
@@ -37,7 +38,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMainTable()
     {
@@ -45,7 +46,7 @@ public function getMainTable()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIdFieldName()
     {
@@ -53,7 +54,7 @@ public function getIdFieldName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addFieldToSelect($fieldName, $alias = null)
     {
@@ -62,7 +63,7 @@ public function addFieldToSelect($fieldName, $alias = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSelect()
     {
@@ -70,7 +71,7 @@ public function getSelect()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addFieldToFilter($attribute, $condition = null)
     {
@@ -79,7 +80,7 @@ public function addFieldToFilter($attribute, $condition = null)
     }
 
     /**
-     * @return int
+     * @inheritdoc
      */
     public function count()
     {
@@ -105,4 +106,28 @@ public function getIterator()
             $pageNumber++;
         } while ($pageNumber <= $lastPage);
     }
+
+    /**
+     * Joins Attribute
+     *
+     * @param string $alias alias for the joined attribute
+     * @param string|\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
+     * @param string $bind attribute of the main entity to link with joined $filter
+     * @param string|null $filter primary key for the joined entity (entity_id default)
+     * @param string $joinType inner|left
+     * @param int|null $storeId
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @see Collection::joinAttribute()
+     */
+    public function joinAttribute(
+        string $alias,
+        $attribute,
+        string $bind,
+        ?string $filter = null,
+        string $joinType = 'inner',
+        ?int $storeId = null
+    ): void {
+        $this->customerCollection->joinAttribute($alias, $attribute, $bind, $filter, $joinType, $storeId);
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php
index 190a3a38e0bf0..f61f064e3f97e 100644
--- a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php
+++ b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php
@@ -11,6 +11,7 @@
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterface;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
+use Magento\Customer\Model\Data\AttributeMetadata;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
@@ -120,7 +121,7 @@ public function extract($attributeMetadata)
     {
         return $this->dataObjectProcessor->buildOutputDataArray(
             $attributeMetadata,
-            AttributeMetadataInterface::class
+            AttributeMetadata::class
         );
     }
 }
diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
index 7ed806e657e82..38f3fbcbdbded 100644
--- a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
@@ -33,20 +33,30 @@ class CustomerMetadata implements CustomerMetadataInterface
      */
     private $attributeMetadataDataProvider;
 
+    /**
+     * List of system attributes which should be available to the clients.
+     *
+     * @var string[]
+     */
+    private $systemAttributes;
+
     /**
      * @param AttributeMetadataConverter $attributeMetadataConverter
      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
+     * @param string[] $systemAttributes
      */
     public function __construct(
         AttributeMetadataConverter $attributeMetadataConverter,
-        AttributeMetadataDataProvider $attributeMetadataDataProvider
+        AttributeMetadataDataProvider $attributeMetadataDataProvider,
+        array $systemAttributes = []
     ) {
         $this->attributeMetadataConverter = $attributeMetadataConverter;
         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
+        $this->systemAttributes = $systemAttributes;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributes($formCode)
     {
@@ -67,7 +77,7 @@ public function getAttributes($formCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeMetadata($attributeCode)
     {
@@ -92,7 +102,7 @@ public function getAttributeMetadata($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllAttributesMetadata()
     {
@@ -116,7 +126,7 @@ public function getAllAttributesMetadata()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_INTERFACE_NAME)
     {
@@ -134,9 +144,10 @@ public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_IN
             $isDataObjectMethod = isset($this->customerDataObjectMethods['get' . $camelCaseKey])
                 || isset($this->customerDataObjectMethods['is' . $camelCaseKey]);
 
-            /** Even though disable_auto_group_change is system attribute, it should be available to the clients */
             if (!$isDataObjectMethod
-                && (!$attributeMetadata->isSystem() || $attributeCode == 'disable_auto_group_change')
+                && (!$attributeMetadata->isSystem()
+                    || in_array($attributeCode, $this->systemAttributes)
+                )
             ) {
                 $customAttributes[] = $attributeMetadata;
             }
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Date.php b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
index b27f6627439e4..6f14b2e6f1dad 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Date.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
@@ -12,7 +12,7 @@
 class Date extends AbstractData
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -21,7 +21,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -95,21 +95,15 @@ public function validateValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function compactValue($value)
     {
-        if ($value !== false) {
-            if (empty($value)) {
-                $value = null;
-            }
-            return $value;
-        }
-        return false;
+        return $value;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function restoreValue($value)
     {
@@ -117,7 +111,7 @@ public function restoreValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index e6e9c2b50c068..227e85ed98f91 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Filesystem;
 
 /**
+ * Processes files that are save for customer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class File extends AbstractData
@@ -66,7 +68,7 @@ class File extends AbstractData
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param null $value
+     * @param string|array $value
      * @param string $entityTypeCode
      * @param bool $isAjax
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
@@ -101,7 +103,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
@@ -109,7 +111,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
         $extend = $this->_getRequestValue($request);
 
         $attrCode = $this->getAttribute()->getAttributeCode();
-        if ($this->_requestScope) {
+        if ($this->_requestScope || !isset($_FILES[$attrCode])) {
             $value = [];
             if (strpos($this->_requestScope, '/') !== false) {
                 $scopes = explode('/', $this->_requestScope);
@@ -160,8 +162,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * Validate file by attribute validate rules
-     * Return array of errors
+     * Validate file by attribute validate rules. Returns array of errors.
      *
      * @param array $value
      * @return string[]
@@ -232,7 +233,7 @@ protected function _isUploadedFile($filename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -273,7 +274,7 @@ public function validateValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return ImageContentInterface|array|string|null
      */
@@ -358,7 +359,7 @@ protected function processInputFieldValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function restoreValue($value)
     {
@@ -366,7 +367,7 @@ public function restoreValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
index 2104f941a6bc2..33bdf827f80fa 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Image.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
@@ -16,6 +16,8 @@
 use Magento\Framework\Filesystem;
 
 /**
+ * Metadata for form image field
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Image extends File
@@ -32,7 +34,7 @@ class Image extends File
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param null $value
+     * @param null|string $value
      * @param string $entityTypeCode
      * @param bool $isAjax
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
@@ -78,6 +80,7 @@ public function __construct(
 
     /**
      * Validate file by attribute validate rules
+     *
      * Return array of errors
      *
      * @param array $value
@@ -133,7 +136,7 @@ protected function _validateByRules($value)
 
         $maxImageHeight = ArrayObjectSearch::getArrayElementByName(
             $rules,
-            'max_image_heght'
+            'max_image_height'
         );
         if ($maxImageHeight !== null) {
             if ($maxImageHeight < $imageProp[1]) {
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index 9ef6df0a6d36e..c639b607e279f 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -5,10 +5,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\Metadata\Form;
 
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Framework\Api\ArrayObjectSearch;
 
+/**
+ * Form Text metadata
+ */
 class Text extends AbstractData
 {
     /**
@@ -19,7 +24,7 @@ class Text extends AbstractData
     /**
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
+     * @param AttributeMetadataInterface $attribute
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param string $value
      * @param string $entityTypeCode
@@ -29,7 +34,7 @@ class Text extends AbstractData
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute,
+        AttributeMetadataInterface $attribute,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         $value,
         $entityTypeCode,
@@ -41,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function extractValue(\Magento\Framework\App\RequestInterface $request)
     {
@@ -49,9 +54,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @inheritdoc
      */
     public function validateValue($value)
     {
@@ -64,39 +67,21 @@ public function validateValue($value)
             $value = $this->_value;
         }
 
-        if ($attribute->isRequired() && empty($value) && $value !== '0') {
-            $errors[] = __('"%1" is a required value.', $label);
-        }
-
-        if (!$errors && !$attribute->isRequired() && empty($value)) {
+        if (!$attribute->isRequired() && empty($value)) {
             return true;
         }
 
-        // validate length
-        $length = $this->_string->strlen(trim($value));
-
-        $validateRules = $attribute->getValidationRules();
-
-        $minTextLength = ArrayObjectSearch::getArrayElementByName(
-            $validateRules,
-            'min_text_length'
-        );
-        if ($minTextLength !== null && $length < $minTextLength) {
-            $errors[] = __('"%1" length must be equal or greater than %2 characters.', $label, $minTextLength);
+        if (empty($value) && $value !== '0') {
+            $errors[] = __('"%1" is a required value.', $label);
         }
 
-        $maxTextLength = ArrayObjectSearch::getArrayElementByName(
-            $validateRules,
-            'max_text_length'
-        );
-        if ($maxTextLength !== null && $length > $maxTextLength) {
-            $errors[] = __('"%1" length must be equal or less than %2 characters.', $label, $maxTextLength);
-        }
+        $errors = $this->validateLength($value, $attribute, $errors);
 
         $result = $this->_validateInputRule($value);
         if ($result !== true) {
             $errors = array_merge($errors, $result);
         }
+
         if (count($errors) == 0) {
             return true;
         }
@@ -105,7 +90,7 @@ public function validateValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function compactValue($value)
     {
@@ -113,7 +98,7 @@ public function compactValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function restoreValue($value)
     {
@@ -121,10 +106,48 @@ public function restoreValue($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function outputValue($format = \Magento\Customer\Model\Metadata\ElementFactory::OUTPUT_FORMAT_TEXT)
     {
         return $this->_applyOutputFilter($this->_value);
     }
+
+    /**
+     * Length validation
+     *
+     * @param mixed $value
+     * @param AttributeMetadataInterface $attribute
+     * @param array $errors
+     * @return array
+     */
+    private function validateLength($value, AttributeMetadataInterface $attribute, array $errors): array
+    {
+        // validate length
+        $label = __($attribute->getStoreLabel());
+
+        $length = $this->_string->strlen(trim($value));
+
+        $validateRules = $attribute->getValidationRules();
+
+        if (!empty(ArrayObjectSearch::getArrayElementByName($validateRules, 'input_validation'))) {
+            $minTextLength = ArrayObjectSearch::getArrayElementByName(
+                $validateRules,
+                'min_text_length'
+            );
+            if ($minTextLength !== null && $length < $minTextLength) {
+                $errors[] = __('"%1" length must be equal or greater than %2 characters.', $label, $minTextLength);
+            }
+
+            $maxTextLength = ArrayObjectSearch::getArrayElementByName(
+                $validateRules,
+                'max_text_length'
+            );
+            if ($maxTextLength !== null && $length > $maxTextLength) {
+                $errors[] = __('"%1" length must be equal or less than %2 characters.', $label, $maxTextLength);
+            }
+        }
+
+        return $errors;
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index ee109dac08104..7747e309d82a6 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model;
 
+use Magento\Config\Model\Config\Source\Nooptreq as NooptreqSource;
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Framework\Escaper;
 
@@ -42,7 +43,10 @@ public function __construct(
      */
     public function getNamePrefixOptions($store = null)
     {
-        return $this->_prepareNamePrefixSuffixOptions($this->addressHelper->getConfig('prefix_options', $store));
+        return $this->prepareNamePrefixSuffixOptions(
+            $this->addressHelper->getConfig('prefix_options', $store),
+            $this->addressHelper->getConfig('prefix_show', $store) == NooptreqSource::VALUE_OPTIONAL
+        );
     }
 
     /**
@@ -53,16 +57,34 @@ public function getNamePrefixOptions($store = null)
      */
     public function getNameSuffixOptions($store = null)
     {
-        return $this->_prepareNamePrefixSuffixOptions($this->addressHelper->getConfig('suffix_options', $store));
+        return $this->prepareNamePrefixSuffixOptions(
+            $this->addressHelper->getConfig('suffix_options', $store),
+            $this->addressHelper->getConfig('suffix_show', $store) == NooptreqSource::VALUE_OPTIONAL
+        );
+    }
+
+    /**
+     * @param $options
+     * @param bool $isOptional
+     * @return array|bool
+     *
+     * @deprecated
+     * @see prepareNamePrefixSuffixOptions()
+     */
+    protected function _prepareNamePrefixSuffixOptions($options, $isOptional = false)
+    {
+        return $this->prepareNamePrefixSuffixOptions($options, $isOptional);
     }
 
     /**
      * Unserialize and clear name prefix or suffix options
+     * If field is optional, add an empty first option.
      *
      * @param string $options
+     * @param bool $isOptional
      * @return array|bool
      */
-    protected function _prepareNamePrefixSuffixOptions($options)
+    private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
     {
         $options = trim($options);
         if (empty($options)) {
@@ -74,6 +96,10 @@ protected function _prepareNamePrefixSuffixOptions($options)
             $value = $this->escaper->escapeHtml(trim($value));
             $result[$value] = $value;
         }
+        if ($isOptional && trim(current($options))) {
+            $result = array_merge([' ' => ' '], $result);
+        }
+
         return $result;
     }
 }
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php b/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
index b7b462b3cc317..2d000ccfb4b93 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
@@ -45,7 +45,7 @@ public function aroundExecute(FlushFormKey $subject, callable $proceed, ...$args
         $currentFormKey = $this->dataFormKey->getFormKey();
         $proceed(...$args);
         $beforeParams = $this->session->getBeforeRequestParams();
-        if ($beforeParams['form_key'] == $currentFormKey) {
+        if (isset($beforeParams['form_key']) && $beforeParams['form_key'] === $currentFormKey) {
             $beforeParams['form_key'] = $this->dataFormKey->getFormKey();
             $this->session->setBeforeRequestParams($beforeParams);
         }
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php b/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
index 040ffb8f3baba..517aef5690ee6 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
@@ -12,6 +12,8 @@
 use Magento\Framework\App\Area;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Psr\Log\LoggerInterface;
 
 class CustomerNotification
 {
@@ -35,6 +37,11 @@ class CustomerNotification
      */
     private $state;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Initialize dependencies.
      *
@@ -42,17 +49,20 @@ class CustomerNotification
      * @param NotificationStorage $notificationStorage
      * @param State $state
      * @param CustomerRepositoryInterface $customerRepository
+     * @param LoggerInterface $logger
      */
     public function __construct(
         Session $session,
         NotificationStorage $notificationStorage,
         State $state,
-        CustomerRepositoryInterface $customerRepository
+        CustomerRepositoryInterface $customerRepository,
+        LoggerInterface $logger
     ) {
         $this->session = $session;
         $this->notificationStorage = $notificationStorage;
         $this->state = $state;
         $this->customerRepository = $customerRepository;
+        $this->logger = $logger;
     }
 
     /**
@@ -63,17 +73,23 @@ public function __construct(
      */
     public function beforeDispatch(AbstractAction $subject, RequestInterface $request)
     {
+        $customerId = $this->session->getCustomerId();
+
         if ($this->state->getAreaCode() == Area::AREA_FRONTEND && $request->isPost()
             && $this->notificationStorage->isExists(
                 NotificationStorage::UPDATE_CUSTOMER_SESSION,
-                $this->session->getCustomerId()
+                $customerId
             )
         ) {
-            $customer = $this->customerRepository->getById($this->session->getCustomerId());
-            $this->session->setCustomerData($customer);
-            $this->session->setCustomerGroupId($customer->getGroupId());
-            $this->session->regenerateId();
-            $this->notificationStorage->remove(NotificationStorage::UPDATE_CUSTOMER_SESSION, $customer->getId());
+            try {
+                $customer = $this->customerRepository->getById($customerId);
+                $this->session->setCustomerData($customer);
+                $this->session->setCustomerGroupId($customer->getGroupId());
+                $this->session->regenerateId();
+                $this->notificationStorage->remove(NotificationStorage::UPDATE_CUSTOMER_SESSION, $customer->getId());
+            } catch (NoSuchEntityException $e) {
+                $this->logger->error($e);
+            }
         }
     }
 }
diff --git a/app/code/Magento/Customer/Model/Renderer/Region.php b/app/code/Magento/Customer/Model/Renderer/Region.php
index 5c7fcd38d6c52..a26cfb96fe02a 100644
--- a/app/code/Magento/Customer/Model/Renderer/Region.php
+++ b/app/code/Magento/Customer/Model/Renderer/Region.php
@@ -54,6 +54,8 @@ public function __construct(
     }
 
     /**
+     * Render element
+     *
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -80,7 +82,7 @@ public function render(AbstractElement $element)
             $regionCollection = self::$_regionCollections[$countryId];
         }
 
-        $regionId = intval($element->getForm()->getElement('region_id')->getValue());
+        $regionId = (int)$element->getForm()->getElement('region_id')->getValue();
 
         $htmlAttributes = $element->getHtmlAttributes();
         foreach ($htmlAttributes as $key => $attribute) {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
index cf7105c1519af..37b3b1af0a42d 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
@@ -45,11 +45,9 @@ public function __construct(
     }
 
     /**
-     * Retrieve all options
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $this->_options = $this->_createCountriesCollection()->loadByStore(
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
index 3f45993a3e143..ce6278b446302 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
@@ -67,11 +67,9 @@ public function __construct(
     }
 
     /**
-     * Retrieve all options
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->options) {
             $allowedCountries = [];
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
index 8e45e4a91ecd4..2cafdab077d67 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
@@ -33,11 +33,9 @@ public function __construct(
     }
 
     /**
-     * Retrieve all region options
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $this->_options = $this->_createRegionsCollection()->load()->toOptionArray();
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
new file mode 100644
index 0000000000000..4e0347059086f
--- /dev/null
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -0,0 +1,143 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\ResourceModel\Address\Grid;
+
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Api\Search\AggregationInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
+/**
+ * Class getting collection of addresses assigned to customer
+ */
+class Collection extends AbstractCollection implements SearchResultInterface
+{
+    /**
+     * @var AggregationInterface
+     */
+    private $aggregations;
+
+    /**
+     * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param string $mainTable
+     * @param string $eventPrefix
+     * @param string $eventObject
+     * @param string $resourceModel
+     * @param string $model
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
+     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        $mainTable,
+        $eventPrefix,
+        $eventObject,
+        $resourceModel,
+        $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
+        $connection = null,
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+    ) {
+        $this->_eventPrefix = $eventPrefix;
+        $this->_eventObject = $eventObject;
+        $this->_init($model, $resourceModel);
+        $this->setMainTable($mainTable);
+        $this->_idFieldName = 'entity_id';
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $connection,
+            $resource
+        );
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @return AggregationInterface
+     */
+    public function getAggregations()
+    {
+        return $this->aggregations;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @param AggregationInterface $aggregations
+     * @return $this
+     */
+    public function setAggregations($aggregations)
+    {
+        $this->aggregations = $aggregations;
+        return $this;
+    }
+
+    /**
+     * Get search criteria.
+     *
+     * @return \Magento\Framework\Api\SearchCriteriaInterface|null
+     */
+    public function getSearchCriteria()
+    {
+        return null;
+    }
+
+    /**
+     * Set search criteria.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
+    {
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        return $this;
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setItems(array $items = null)
+    {
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
index d473a4dc01891..ae342a1b10dd8 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Address;
 
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface;
 
 /**
@@ -36,19 +38,14 @@ public function __construct(\Magento\Customer\Model\CustomerFactory $customerFac
     public function processRelation(\Magento\Framework\Model\AbstractModel $object)
     {
         /**
-         * @var $object \Magento\Customer\Model\Address
+         * @var $object Address
          */
-        if (!$object->getIsCustomerSaveTransaction() && $this->isAddressDefault($object)) {
+        if (!$object->getIsCustomerSaveTransaction() && $object->getId()) {
             $customer = $this->customerFactory->create()->load($object->getCustomerId());
-            $changedAddresses = [];
-
-            if ($object->getIsDefaultBilling()) {
-                $changedAddresses['default_billing'] = $object->getId();
-            }
 
-            if ($object->getIsDefaultShipping()) {
-                $changedAddresses['default_shipping'] = $object->getId();
-            }
+            $changedAddresses = [];
+            $changedAddresses = $this->getDefaultBillingChangedAddress($object, $customer, $changedAddresses);
+            $changedAddresses = $this->getDefaultShippingChangedAddress($object, $customer, $changedAddresses);
 
             if ($changedAddresses) {
                 $customer->getResource()->getConnection()->update(
@@ -60,9 +57,62 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
         }
     }
 
+    /**
+     * Get default billing changed address
+     *
+     * @param Address $object
+     * @param Customer $customer
+     * @param array $changedAddresses
+     * @return array
+     */
+    private function getDefaultBillingChangedAddress(
+        Address $object,
+        Customer $customer,
+        array $changedAddresses
+    ): array {
+        if ($object->getIsDefaultBilling()) {
+            $changedAddresses['default_billing'] = $object->getId();
+        } elseif ($customer->getDefaultBillingAddress()
+            && $object->getIsDefaultBilling() === false
+            && (int)$customer->getDefaultBillingAddress()->getId() === (int)$object->getId()
+        ) {
+            $changedAddresses['default_billing'] = null;
+        }
+
+        return $changedAddresses;
+    }
+
+    /**
+     * Get default shipping changed address
+     *
+     * @param Address $object
+     * @param Customer $customer
+     * @param array $changedAddresses
+     * @return array
+     */
+    private function getDefaultShippingChangedAddress(
+        Address $object,
+        Customer $customer,
+        array $changedAddresses
+    ): array {
+        if ($object->getIsDefaultShipping()) {
+            $changedAddresses['default_shipping'] = $object->getId();
+        } elseif ($customer->getDefaultShippingAddress()
+            && $object->getIsDefaultShipping() === false
+            && (int)$customer->getDefaultShippingAddress()->getId() === (int)$object->getId()
+        ) {
+            $changedAddresses['default_shipping'] = null;
+        }
+
+        return $changedAddresses;
+    }
+
     /**
      * Checks if address has chosen as default and has had an id
      *
+     * @deprecated Is not used anymore due to changes in logic of save of address.
+     *             If address was default and becomes not default than default address id for customer must be
+     *             set to null
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return bool
      */
diff --git a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
index 2c7b778f5f485..3fe61785de897 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
@@ -7,6 +7,7 @@
  */
 namespace Magento\Customer\Model\ResourceModel;
 
+use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Model\Address as CustomerAddressModel;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\ResourceModel\Address\Collection;
@@ -16,6 +17,8 @@
 use Magento\Framework\Exception\InputException;
 
 /**
+ * Address repository.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterface
@@ -92,7 +95,7 @@ public function __construct(
         $this->addressFactory = $addressFactory;
         $this->addressRegistry = $addressRegistry;
         $this->customerRegistry = $customerRegistry;
-        $this->addressResource = $addressResourceModel;
+        $this->addressResourceModel = $addressResourceModel;
         $this->directoryData = $directoryData;
         $this->addressSearchResultsFactory = $addressSearchResultsFactory;
         $this->addressCollectionFactory = $addressCollectionFactory;
@@ -123,6 +126,7 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address)
         } else {
             $addressModel->updateData($address);
         }
+        $addressModel->setStoreId($customerModel->getStoreId());
 
         $errors = $addressModel->validate();
         if ($errors !== true) {
@@ -143,6 +147,8 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address)
     }
 
     /**
+     * Update address collection.
+     *
      * @param Customer $customer
      * @param Address $address
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -236,7 +242,7 @@ public function delete(\Magento\Customer\Api\Data\AddressInterface $address)
         $address = $this->addressRegistry->retrieve($addressId);
         $customerModel = $this->customerRegistry->retrieve($address->getCustomerId());
         $customerModel->getAddressesCollection()->clear();
-        $this->addressResource->delete($address);
+        $this->addressResourceModel->delete($address);
         $this->addressRegistry->remove($addressId);
         return true;
     }
@@ -254,7 +260,7 @@ public function deleteById($addressId)
         $address = $this->addressRegistry->retrieve($addressId);
         $customerModel = $this->customerRegistry->retrieve($address->getCustomerId());
         $customerModel->getAddressesCollection()->removeItemByKey($addressId);
-        $this->addressResource->delete($address);
+        $this->addressResourceModel->delete($address);
         $this->addressRegistry->remove($addressId);
         return true;
     }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
index 7e5f9d51549ec..2eb1ef897e70e 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\ResourceModel;
 
 use Magento\Customer\Model\Customer\NotificationStorage;
@@ -111,7 +112,7 @@ protected function _beforeSave(\Magento\Framework\DataObject $customer)
         parent::_beforeSave($customer);
 
         if (!$customer->getEmail()) {
-            throw new ValidatorException(__('Please enter a customer email.'));
+            throw new ValidatorException(__('The customer email is missing. Enter and try again.'));
         }
 
         $connection = $this->getConnection();
@@ -135,7 +136,7 @@ protected function _beforeSave(\Magento\Framework\DataObject $customer)
         $result = $connection->fetchOne($select, $bind);
         if ($result) {
             throw new AlreadyExistsException(
-                __('A customer with the same email already exists in an associated website.')
+                __('A customer with the same email address already exists in an associated website.')
             );
         }
 
@@ -150,7 +151,9 @@ protected function _beforeSave(\Magento\Framework\DataObject $customer)
             $customer->setConfirmation(null);
         }
 
-        $this->_validate($customer);
+        if (!$customer->getData('ignore_validation_flag')) {
+            $this->_validate($customer);
+        }
 
         return $this;
     }
@@ -242,7 +245,7 @@ public function loadByEmail(\Magento\Customer\Model\Customer $customer, $email)
         if ($customer->getSharingConfig()->isWebsiteScope()) {
             if (!$customer->hasData('website_id')) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('A customer website ID must be specified when using the website scope.')
+                    __("A customer website ID wasn't specified. The ID must be specified to use the website scope.")
                 );
             }
             $bind['website_id'] = (int)$customer->getWebsiteId();
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
index e55c5d443c9d1..96f47154e874e 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
@@ -23,41 +23,43 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $customer
         $defaultBillingId = $customer->getData('default_billing');
         $defaultShippingId = $customer->getData('default_shipping');
 
-        /** @var \Magento\Customer\Model\Address $address */
-        foreach ($customer->getAddresses() as $address) {
-            if ($address->getData('_deleted')) {
-                if ($address->getId() == $defaultBillingId) {
-                    $customer->setData('default_billing', null);
-                }
+        if (!$customer->getData('ignore_validation_flag')) {
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($customer->getAddresses() as $address) {
+                if ($address->getData('_deleted')) {
+                    if ($address->getId() == $defaultBillingId) {
+                        $customer->setData('default_billing', null);
+                    }
 
-                if ($address->getId() == $defaultShippingId) {
-                    $customer->setData('default_shipping', null);
-                }
+                    if ($address->getId() == $defaultShippingId) {
+                        $customer->setData('default_shipping', null);
+                    }
 
-                $removedAddressId = $address->getId();
-                $address->delete();
+                    $removedAddressId = $address->getId();
+                    $address->delete();
 
-                // Remove deleted address from customer address collection
-                $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
-            } else {
-                $address->setParentId(
-                    $customer->getId()
-                )->setStoreId(
-                    $customer->getStoreId()
-                )->setIsCustomerSaveTransaction(
-                    true
-                )->save();
+                    // Remove deleted address from customer address collection
+                    $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
+                } else {
+                    $address->setParentId(
+                        $customer->getId()
+                    )->setStoreId(
+                        $customer->getStoreId()
+                    )->setIsCustomerSaveTransaction(
+                        true
+                    )->save();
 
-                if (($address->getIsPrimaryBilling() ||
-                        $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
-                ) {
-                    $customer->setData('default_billing', $address->getId());
-                }
+                    if (($address->getIsPrimaryBilling() ||
+                            $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
+                    ) {
+                        $customer->setData('default_billing', $address->getId());
+                    }
 
-                if (($address->getIsPrimaryShipping() ||
-                        $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
-                ) {
-                    $customer->setData('default_shipping', $address->getId());
+                    if (($address->getIsPrimaryShipping() ||
+                            $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
+                    ) {
+                        $customer->setData('default_shipping', $address->getId());
+                    }
                 }
             }
         }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 1a15b55a1e7e3..b25838e245488 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -7,64 +7,81 @@
 namespace Magento\Customer\Model\ResourceModel;
 
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\Data\CustomerSecureFactory;
+use Magento\Customer\Model\Customer\NotificationStorage;
+use Magento\Customer\Model\Delegation\Data\NewOperation;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\ImageProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\FilterGroup;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Customer\Model\Delegation\Storage as DelegatedStorage;
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Customer repository.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
-class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInterface
+class CustomerRepository implements CustomerRepositoryInterface
 {
     /**
-     * @var \Magento\Customer\Model\CustomerFactory
+     * @var CustomerFactory
      */
     protected $customerFactory;
 
     /**
-     * @var \Magento\Customer\Model\Data\CustomerSecureFactory
+     * @var CustomerSecureFactory
      */
     protected $customerSecureFactory;
 
     /**
-     * @var \Magento\Customer\Model\CustomerRegistry
+     * @var CustomerRegistry
      */
     protected $customerRegistry;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\AddressRepository
+     * @var AddressRepository
      */
     protected $addressRepository;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer
+     * @var Customer
      */
     protected $customerResourceModel;
 
     /**
-     * @var \Magento\Customer\Api\CustomerMetadataInterface
+     * @var CustomerMetadataInterface
      */
     protected $customerMetadata;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory
+     * @var CustomerSearchResultsInterfaceFactory
      */
     protected $searchResultsFactory;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface
+     * @var ManagerInterface
      */
     protected $eventManager;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
+     * @var ExtensibleDataObjectConverter
      */
     protected $extensibleDataObjectConverter;
 
@@ -79,7 +96,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
     protected $imageProcessor;
 
     /**
-     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
+     * @var JoinProcessorInterface
      */
     protected $extensionAttributesJoinProcessor;
 
@@ -89,37 +106,51 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
     private $collectionProcessor;
 
     /**
-     * @param \Magento\Customer\Model\CustomerFactory $customerFactory
-     * @param \Magento\Customer\Model\Data\CustomerSecureFactory $customerSecureFactory
-     * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
-     * @param \Magento\Customer\Model\ResourceModel\AddressRepository $addressRepository
-     * @param \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
-     * @param \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata
-     * @param \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory $searchResultsFactory
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+     * @var NotificationStorage
+     */
+    private $notificationStorage;
+
+    /**
+     * @var DelegatedStorage
+     */
+    private $delegatedStorage;
+
+    /**
+     * @param CustomerFactory $customerFactory
+     * @param CustomerSecureFactory $customerSecureFactory
+     * @param CustomerRegistry $customerRegistry
+     * @param AddressRepository $addressRepository
+     * @param Customer $customerResourceModel
+     * @param CustomerMetadataInterface $customerMetadata
+     * @param CustomerSearchResultsInterfaceFactory $searchResultsFactory
+     * @param ManagerInterface $eventManager
+     * @param StoreManagerInterface $storeManager
+     * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param DataObjectHelper $dataObjectHelper
      * @param ImageProcessorInterface $imageProcessor
-     * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
+     * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param NotificationStorage $notificationStorage
+     * @param DelegatedStorage|null $delegatedStorage
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Customer\Model\CustomerFactory $customerFactory,
-        \Magento\Customer\Model\Data\CustomerSecureFactory $customerSecureFactory,
-        \Magento\Customer\Model\CustomerRegistry $customerRegistry,
-        \Magento\Customer\Model\ResourceModel\AddressRepository $addressRepository,
-        \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel,
-        \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata,
-        \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory $searchResultsFactory,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
+        CustomerFactory $customerFactory,
+        CustomerSecureFactory $customerSecureFactory,
+        CustomerRegistry $customerRegistry,
+        AddressRepository $addressRepository,
+        Customer $customerResourceModel,
+        CustomerMetadataInterface $customerMetadata,
+        CustomerSearchResultsInterfaceFactory $searchResultsFactory,
+        ManagerInterface $eventManager,
+        StoreManagerInterface $storeManager,
+        ExtensibleDataObjectConverter $extensibleDataObjectConverter,
         DataObjectHelper $dataObjectHelper,
         ImageProcessorInterface $imageProcessor,
-        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
-        CollectionProcessorInterface $collectionProcessor = null
+        JoinProcessorInterface $extensionAttributesJoinProcessor,
+        CollectionProcessorInterface $collectionProcessor,
+        NotificationStorage $notificationStorage,
+        DelegatedStorage $delegatedStorage = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->customerSecureFactory = $customerSecureFactory;
@@ -134,16 +165,20 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->imageProcessor = $imageProcessor;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
-        $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
+        $this->collectionProcessor = $collectionProcessor;
+        $this->notificationStorage = $notificationStorage;
+        $this->delegatedStorage = $delegatedStorage ?? ObjectManager::getInstance()->get(DelegatedStorage::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
+    public function save(CustomerInterface $customer, $passwordHash = null)
     {
+        /** @var NewOperation|null $delegatedNewOperation */
+        $delegatedNewOperation = !$customer->getId() ? $this->delegatedStorage->consumeNewOperation() : null;
         $prevCustomerData = null;
         $prevCustomerDataArr = null;
         if ($customer->getId()) {
@@ -157,57 +192,51 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
             $prevCustomerData
         );
-
         $origAddresses = $customer->getAddresses();
         $customer->setAddresses([]);
-        $customerData = $this->extensibleDataObjectConverter->toNestedArray(
-            $customer,
-            [],
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        );
-
+        $customerData = $this->extensibleDataObjectConverter->toNestedArray($customer, [], CustomerInterface::class);
         $customer->setAddresses($origAddresses);
+        /** @var Customer $customerModel */
         $customerModel = $this->customerFactory->create(['data' => $customerData]);
+        //Model's actual ID field maybe different than "id" so "id" field from $customerData may be ignored.
+        $customerModel->setId($customer->getId());
         $storeId = $customerModel->getStoreId();
         if ($storeId === null) {
             $customerModel->setStoreId($this->storeManager->getStore()->getId());
         }
-        $customerModel->setId($customer->getId());
-
         // Need to use attribute set or future updates can cause data loss
         if (!$customerModel->getAttributeSetId()) {
-            $customerModel->setAttributeSetId(
-                \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER
-            );
+            $customerModel->setAttributeSetId(CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
         }
         $this->populateCustomerWithSecureData($customerModel, $passwordHash);
-
         // If customer email was changed, reset RpToken info
-        if ($prevCustomerData
-            && $prevCustomerData->getEmail() !== $customerModel->getEmail()
-        ) {
+        if ($prevCustomerData && $prevCustomerData->getEmail() !== $customerModel->getEmail()) {
             $customerModel->setRpToken(null);
             $customerModel->setRpTokenCreatedAt(null);
         }
-        if (!array_key_exists('default_billing', $customerArr) &&
-            null !== $prevCustomerDataArr &&
-            array_key_exists('default_billing', $prevCustomerDataArr)
+        if (!array_key_exists('addresses', $customerArr)
+            && null !== $prevCustomerDataArr
+            && array_key_exists('default_billing', $prevCustomerDataArr)
         ) {
             $customerModel->setDefaultBilling($prevCustomerDataArr['default_billing']);
         }
-
-        if (!array_key_exists('default_shipping', $customerArr) &&
-            null !== $prevCustomerDataArr &&
-            array_key_exists('default_shipping', $prevCustomerDataArr)
+        if (!array_key_exists('addresses', $customerArr)
+            && null !== $prevCustomerDataArr
+            && array_key_exists('default_shipping', $prevCustomerDataArr)
         ) {
             $customerModel->setDefaultShipping($prevCustomerDataArr['default_shipping']);
         }
-
+        $this->setValidationFlag($customerArr, $customerModel);
         $customerModel->save();
         $this->customerRegistry->push($customerModel);
         $customerId = $customerModel->getId();
-
-        if ($customer->getAddresses() !== null) {
+        if (!$customer->getAddresses()
+            && $delegatedNewOperation
+            && $delegatedNewOperation->getCustomer()->getAddresses()
+        ) {
+            $customer->setAddresses($delegatedNewOperation->getCustomer()->getAddresses());
+        }
+        if ($customer->getAddresses() !== null && !$customerModel->getData('ignore_validation_flag')) {
             if ($customer->getId()) {
                 $existingAddresses = $this->getById($customer->getId())->getAddresses();
                 $getIdFunc = function ($address) {
@@ -217,7 +246,6 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             } else {
                 $existingAddressIds = [];
             }
-
             $savedAddressIds = [];
             foreach ($customer->getAddresses() as $address) {
                 $address->setCustomerId($customerId)
@@ -227,7 +255,6 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
                     $savedAddressIds[] = $address->getId();
                 }
             }
-
             $addressIdsToDelete = array_diff($existingAddressIds, $savedAddressIds);
             foreach ($addressIdsToDelete as $addressId) {
                 $this->addressRepository->deleteById($addressId);
@@ -237,8 +264,13 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
         $savedCustomer = $this->get($customer->getEmail(), $customer->getWebsiteId());
         $this->eventManager->dispatch(
             'customer_save_after_data_object',
-            ['customer_data_object' => $savedCustomer, 'orig_customer_data_object' => $prevCustomerData]
+            [
+                'customer_data_object' => $savedCustomer,
+                'orig_customer_data_object' => $prevCustomerData,
+                'delegate_data' => $delegatedNewOperation ? $delegatedNewOperation->getAdditionalData() : [],
+            ]
         );
+
         return $savedCustomer;
     }
 
@@ -272,7 +304,7 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($email, $websiteId = null)
     {
@@ -281,7 +313,7 @@ public function get($email, $websiteId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getById($customerId)
     {
@@ -290,7 +322,7 @@ public function getById($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -300,7 +332,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         $collection = $this->customerFactory->create()->getCollection();
         $this->extensionAttributesJoinProcessor->process(
             $collection,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         // This is needed to make sure all the attributes are properly loaded
         foreach ($this->customerMetadata->getAllAttributesMetadata() as $metadata) {
@@ -314,7 +346,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
             ->joinAttribute('billing_telephone', 'customer_address/telephone', 'default_billing', null, 'left')
             ->joinAttribute('billing_region', 'customer_address/region', 'default_billing', null, 'left')
             ->joinAttribute('billing_country_id', 'customer_address/country_id', 'default_billing', null, 'left')
-            ->joinAttribute('company', 'customer_address/company', 'default_billing', null, 'left');
+            ->joinAttribute('billing_company', 'customer_address/company', 'default_billing', null, 'left');
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
@@ -330,21 +362,23 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
+    public function delete(CustomerInterface $customer)
     {
         return $this->deleteById($customer->getId());
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);
         $customerModel->delete();
         $this->customerRegistry->remove($customerId);
+        $this->notificationStorage->remove(NotificationStorage::UPDATE_CUSTOMER_SESSION, $customerId);
+
         return true;
     }
 
@@ -352,15 +386,12 @@ public function deleteById($customerId)
      * Helper function that adds a FilterGroup to the collection.
      *
      * @deprecated 100.2.0
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
-     * @param \Magento\Customer\Model\ResourceModel\Customer\Collection $collection
+     * @param FilterGroup $filterGroup
+     * @param Collection $collection
      * @return void
-     * @throws \Magento\Framework\Exception\InputException
      */
-    protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
-        \Magento\Customer\Model\ResourceModel\Customer\Collection $collection
-    ) {
+    protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
+    {
         $fields = [];
         foreach ($filterGroup->getFilters() as $filter) {
             $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
@@ -372,18 +403,16 @@ protected function addFilterGroupToCollection(
     }
 
     /**
-     * Retrieve collection processor
+     * Set ignore_validation_flag to skip model validation
      *
-     * @deprecated 100.2.0
-     * @return CollectionProcessorInterface
+     * @param array $customerArray
+     * @param Customer $customerModel
+     * @return void
      */
-    private function getCollectionProcessor()
+    private function setValidationFlag($customerArray, $customerModel)
     {
-        if (!$this->collectionProcessor) {
-            $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                'Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor'
-            );
+        if (isset($customerArray['ignore_validation_flag'])) {
+            $customerModel->setData('ignore_validation_flag', true);
         }
-        return $this->collectionProcessor;
     }
 }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
index 48710c46a5f1d..6e93210d04c3c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
@@ -12,6 +12,11 @@
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
+    /**
+     * @var string
+     */
+    protected $_idFieldName = 'customer_group_id';
+
     /**
      * Resource initialization
      *
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
index bf3400c3a2f68..f264245b30c4a 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
@@ -7,8 +7,62 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Group\Grid;
 
-class Collection extends \Magento\Customer\Model\ResourceModel\Group\Collection
+use Magento\Customer\Model\ResourceModel\Group\Collection as GroupCollection;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Search\AggregationInterface;
+
+/**
+ * Collection for displaying grid of customer groups
+ */
+class Collection extends GroupCollection implements SearchResultInterface
 {
+    /**
+     * @var AggregationInterface
+     */
+    protected $aggregations;
+
+    /**
+     * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param string $mainTable
+     * @param string $eventPrefix
+     * @param string $eventObject
+     * @param string $resourceModel
+     * @param string $model
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
+     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        $mainTable,
+        $eventPrefix,
+        $eventObject,
+        $resourceModel,
+        $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
+        $connection = null,
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+    ) {
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $connection,
+            $resource
+        );
+        $this->_eventPrefix = $eventPrefix;
+        $this->_eventObject = $eventObject;
+        $this->_init($model, $resourceModel);
+        $this->setMainTable($mainTable);
+    }
+
     /**
      * Resource initialization
      * @return $this
@@ -19,4 +73,78 @@ protected function _initSelect()
         $this->addTaxClass();
         return $this;
     }
+
+    /**
+     * @return AggregationInterface
+     */
+    public function getAggregations()
+    {
+        return $this->aggregations;
+    }
+
+    /**
+     * @param AggregationInterface $aggregations
+     * @return $this
+     */
+    public function setAggregations($aggregations)
+    {
+        $this->aggregations = $aggregations;
+        return $this;
+    }
+
+    /**
+     * Get search criteria.
+     *
+     * @return \Magento\Framework\Api\SearchCriteriaInterface|null
+     */
+    public function getSearchCriteria()
+    {
+        return null;
+    }
+
+    /**
+     * Set search criteria.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
+    {
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        return $this;
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setItems(array $items = null)
+    {
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
index d004b99c5a3c9..31e0e2727436b 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
@@ -156,6 +156,11 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
             ->setCode($groupModel->getCode())
             ->setTaxClassId($groupModel->getTaxClassId())
             ->setTaxClassName($groupModel->getTaxClassName());
+
+        if ($group->getExtensionAttributes()) {
+            $groupDataObject->setExtensionAttributes($group->getExtensionAttributes());
+        }
+
         return $groupDataObject;
     }
 
@@ -305,7 +310,7 @@ private function _validate($group)
     {
         $exception = new InputException();
         if (!\Zend_Validate::is($group->getCode(), 'NotEmpty')) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'code']));
+            $exception->addError(__('"%fieldName" is required. Enter and try again.', ['fieldName' => 'code']));
         }
 
         if ($exception->wasErrorAdded()) {
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
index 71b0297fdd114..5900fed218edf 100644
--- a/app/code/Magento/Customer/Model/Session.php
+++ b/app/code/Magento/Customer/Model/Session.php
@@ -487,7 +487,7 @@ public function authenticate($loginUrl = null)
             $this->response->setRedirect($loginUrl);
         } else {
             $arguments = $this->_customerUrl->getLoginUrlParams();
-            if ($this->_session->getCookieShouldBeReceived() && $this->_createUrl()->getUseSession()) {
+            if ($this->_createUrl()->getUseSession()) {
                 $arguments += [
                     '_query' => [
                         $this->sidResolver->getSessionIdQueryParam($this->_session) => $this->_session->getSessionId(),
@@ -555,7 +555,7 @@ public function setAfterAuthUrl($url)
     }
 
     /**
-     * Reset core session hosts after reseting session ID
+     * Reset core session hosts after resetting session ID
      *
      * @return $this
      */
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 9822e2ad1b80e..f608a6cf4c11c 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -184,10 +184,15 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
 
             $requestParams = [];
             $requestParams['countryCode'] = $countryCode;
-            $requestParams['vatNumber'] = str_replace([' ', '-'], ['', ''], $vatNumber);
+            $vatNumberSanitized = $this->isCountryInEU($countryCode)
+                ? str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber)
+                : str_replace([' ', '-'], ['', ''], $vatNumber);
+            $requestParams['vatNumber'] = $vatNumberSanitized;
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
-            $requestParams['requesterVatNumber'] = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
-
+            $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode)
+                ? str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber)
+                : str_replace([' ', '-'], ['', ''], $requesterVatNumber);
+            $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
             // Send request to service
             $result = $soapClient->checkVatApprox($requestParams);
 
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index b4bad240bc825..9caa2988c5a94 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Customer\Model;
 
-use Magento\Framework\Indexer\StateInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestSafetyInterface;
 
 /**
  * Class Visitor
+ *
  * @package Magento\Customer\Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -67,6 +69,11 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
      */
     protected $indexerRegistry;
 
+    /**
+     * @var RequestSafetyInterface
+     */
+    private $requestSafety;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -80,6 +87,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
      * @param array $ignoredUserAgents
      * @param array $ignores
      * @param array $data
+     * @param RequestSafetyInterface|null $requestSafety
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -95,7 +103,8 @@ public function __construct(
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $ignoredUserAgents = [],
         array $ignores = [],
-        array $data = []
+        array $data = [],
+        RequestSafetyInterface $requestSafety = null
     ) {
         $this->session = $session;
         $this->httpHeader = $httpHeader;
@@ -105,6 +114,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->dateTime = $dateTime;
         $this->indexerRegistry = $indexerRegistry;
+        $this->requestSafety = $requestSafety ?? ObjectManager::getInstance()->get(RequestSafetyInterface::class);
     }
 
     /**
@@ -151,10 +161,17 @@ public function initByRequest($observer)
 
         if ($this->session->getVisitorData()) {
             $this->setData($this->session->getVisitorData());
+            if ($this->getSessionId() != $this->session->getSessionId()) {
+                $this->setSessionId($this->session->getSessionId());
+            }
         }
 
         $this->setLastVisitAt((new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT));
 
+        // prevent saving Visitor for safe methods, e.g. GET request
+        if ($this->requestSafety->isSafeMethod()) {
+            return $this;
+        }
         if (!$this->getId()) {
             $this->setSessionId($this->session->getSessionId());
             $this->save();
@@ -174,7 +191,8 @@ public function initByRequest($observer)
      */
     public function saveByRequest($observer)
     {
-        if ($this->skipRequestLogging || $this->isModuleIgnored($observer)) {
+        // prevent saving Visitor for safe methods, e.g. GET request
+        if ($this->skipRequestLogging || $this->requestSafety->isSafeMethod() || $this->isModuleIgnored($observer)) {
             return $this;
         }
 
@@ -261,6 +279,7 @@ public function bindQuoteCreate($observer)
 
     /**
      * Destroy binding of checkout quote
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return  \Magento\Customer\Model\Visitor
      */
@@ -304,11 +323,9 @@ public function clean()
      */
     public function getOnlineInterval()
     {
-        $configValue = intval(
-            $this->scopeConfig->getValue(
-                static::XML_PATH_ONLINE_INTERVAL,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
+        $configValue = (int)$this->scopeConfig->getValue(
+            static::XML_PATH_ONLINE_INTERVAL,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $configValue ?: static::DEFAULT_ONLINE_MINUTES_INTERVAL;
     }
diff --git a/app/code/Magento/Customer/Setup/CustomerSetup.php b/app/code/Magento/Customer/Setup/CustomerSetup.php
index b1f07e4872fd8..c074285765e59 100644
--- a/app/code/Magento/Customer/Setup/CustomerSetup.php
+++ b/app/code/Magento/Customer/Setup/CustomerSetup.php
@@ -489,4 +489,23 @@ public function getEavConfig()
     {
         return $this->eavConfig;
     }
+
+    /**
+     * Update attributes for customer.
+     *
+     * @param array $entityAttributes
+     * @return void
+     */
+    public function upgradeAttributes(array $entityAttributes)
+    {
+        foreach ($entityAttributes as $entityType => $attributes) {
+            foreach ($attributes as $attributeCode => $attributeData) {
+                $attribute = $this->getEavConfig()->getAttribute($entityType, $attributeCode);
+                foreach ($attributeData as $key => $value) {
+                    $attribute->setData($key, $value);
+                }
+                $attribute->save();
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Setup/InstallData.php b/app/code/Magento/Customer/Setup/InstallData.php
deleted file mode 100644
index 0bc4b19db9d1c..0000000000000
--- a/app/code/Magento/Customer/Setup/InstallData.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Customer\Setup;
-
-use Magento\Framework\Module\Setup\Migration;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Customer setup factory
-     *
-     * @var CustomerSetupFactory
-     */
-    private $customerSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param CustomerSetupFactory $customerSetupFactory
-     */
-    public function __construct(CustomerSetupFactory $customerSetupFactory)
-    {
-        $this->customerSetupFactory = $customerSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var CustomerSetup $customerSetup */
-        $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]);
-
-        $setup->startSetup();
-
-        // insert default customer groups
-        $setup->getConnection()->insertForce(
-            $setup->getTable('customer_group'),
-            ['customer_group_id' => 0, 'customer_group_code' => 'NOT LOGGED IN', 'tax_class_id' => 3]
-        );
-        $setup->getConnection()->insertForce(
-            $setup->getTable('customer_group'),
-            ['customer_group_id' => 1, 'customer_group_code' => 'General', 'tax_class_id' => 3]
-        );
-        $setup->getConnection()->insertForce(
-            $setup->getTable('customer_group'),
-            ['customer_group_id' => 2, 'customer_group_code' => 'Wholesale', 'tax_class_id' => 3]
-        );
-        $setup->getConnection()->insertForce(
-            $setup->getTable('customer_group'),
-            ['customer_group_id' => 3, 'customer_group_code' => 'Retailer', 'tax_class_id' => 3]
-        );
-
-        $customerSetup->installEntities();
-
-        $customerSetup->installCustomerForms();
-
-        $disableAGCAttribute = $customerSetup->getEavConfig()->getAttribute('customer', 'disable_auto_group_change');
-        $disableAGCAttribute->setData('used_in_forms', ['adminhtml_customer']);
-        $disableAGCAttribute->save();
-
-        $attributesInfo = [
-            'vat_id' => [
-                'label' => 'VAT number',
-                'type' => 'static',
-                'input' => 'text',
-                'position' => 140,
-                'visible' => true,
-                'required' => false,
-            ],
-            'vat_is_valid' => [
-                'label' => 'VAT number validity',
-                'visible' => false,
-                'required' => false,
-                'type' => 'static',
-            ],
-            'vat_request_id' => [
-                'label' => 'VAT number validation request ID',
-                'type' => 'static',
-                'visible' => false,
-                'required' => false,
-            ],
-            'vat_request_date' => [
-                'label' => 'VAT number validation request date',
-                'type' => 'static',
-                'visible' => false,
-                'required' => false,
-            ],
-            'vat_request_success' => [
-                'label' => 'VAT number validation request success',
-                'visible' => false,
-                'required' => false,
-                'type' => 'static',
-            ],
-        ];
-
-        foreach ($attributesInfo as $attributeCode => $attributeParams) {
-            $customerSetup->addAttribute('customer_address', $attributeCode, $attributeParams);
-        }
-
-        $vatIdAttribute = $customerSetup->getEavConfig()->getAttribute('customer_address', 'vat_id');
-        $vatIdAttribute->setData(
-            'used_in_forms',
-            ['adminhtml_customer_address', 'customer_address_edit', 'customer_register_address']
-        );
-        $vatIdAttribute->save();
-
-        $entities = $customerSetup->getDefaultEntities();
-        foreach ($entities as $entityName => $entity) {
-            $customerSetup->addEntityType($entityName, $entity);
-        }
-
-        $customerSetup->updateAttribute(
-            'customer_address',
-            'street',
-            'backend_model',
-            \Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class
-        );
-
-        $migrationSetup = $setup->createMigrationSetup();
-
-        $migrationSetup->appendClassAliasReplace(
-            'customer_eav_attribute',
-            'data_model',
-            Migration::ENTITY_TYPE_MODEL,
-            Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['attribute_id']
-        );
-        $migrationSetup->doUpdateClassAliases();
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Customer/Setup/InstallSchema.php b/app/code/Magento/Customer/Setup/InstallSchema.php
deleted file mode 100644
index 64257ea992be5..0000000000000
--- a/app/code/Magento/Customer/Setup/InstallSchema.php
+++ /dev/null
@@ -1,1277 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Customer\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'customer_entity'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_entity')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Website Id'
-        )->addColumn(
-            'email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Email'
-        )->addColumn(
-            'group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Group Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Is Active'
-        )->addColumn(
-            'disable_auto_group_change',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Disable automatic group change based on VAT ID'
-        )->addColumn(
-            'created_in',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Created From'
-        )->addColumn(
-            'prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true, 'default' => null],
-            'Name Prefix'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'First Name'
-        )->addColumn(
-            'middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Middle Name/Initial'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Last Name'
-        )->addColumn(
-            'suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true, 'default' => null],
-            'Name Suffix'
-        )->addColumn(
-            'dob',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Date of Birth'
-        )->addColumn(
-            'password_hash',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128
-        )->addColumn(
-            'rp_token',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            ['nullable' => true, 'default' => null],
-            'Reset password token'
-        )->addColumn(
-            'rp_token_created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Reset password token creation time'
-        )->addColumn(
-            'default_billing',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'Default Billing Address'
-        )->addColumn(
-            'default_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'Default Shipping Address'
-        )->addColumn(
-            'taxvat',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Tax/VAT Number'
-        )->addColumn(
-            'confirmation',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            ['nullable' => true, 'default' => null],
-            'Is Confirmed'
-        )->addColumn(
-            'gender',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Gender'
-        )->addIndex(
-            $installer->getIdxName('customer_entity', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_entity',
-                ['email', 'website_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['email', 'website_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_entity', ['website_id']),
-            ['website_id']
-        )->addIndex(
-            $installer->getIdxName('customer_entity', ['firstname']),
-            ['firstname']
-        )->addIndex(
-            $installer->getIdxName('customer_entity', ['lastname']),
-            ['lastname']
-        )->addForeignKey(
-            $installer->getFkName('customer_entity', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->addForeignKey(
-            $installer->getFkName('customer_entity', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Customer Entity'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_address_entity'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_address_entity')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Parent Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Is Active'
-        )->addColumn(
-            'city',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'City'
-        )->addColumn(
-            'company',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Company'
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Country'
-        )->addColumn(
-            'fax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Fax'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'First Name'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Last Name'
-        )->addColumn(
-            'middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Middle Name'
-        )->addColumn(
-            'postcode',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Zip/Postal Code'
-        )->addColumn(
-            'prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true, 'default' => null],
-            'Name Prefix'
-        )->addColumn(
-            'region',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'State/Province'
-        )->addColumn(
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'State/Province'
-        )->addColumn(
-            'street',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            ['nullable' => false],
-            'Street Address'
-        )->addColumn(
-            'suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true, 'default' => null],
-            'Name Suffix'
-        )->addColumn(
-            'telephone',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Phone Number'
-        )->addColumn(
-            'vat_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'VAT number'
-        )->addColumn(
-            'vat_is_valid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'VAT number validity'
-        )->addColumn(
-            'vat_request_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'VAT number validation request date'
-        )->addColumn(
-            'vat_request_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'VAT number validation request ID'
-        )->addColumn(
-            'vat_request_success',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'VAT number validation request success'
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity', 'parent_id', 'customer_entity', 'entity_id'),
-            'parent_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Address Entity'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_address_entity_datetime'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_address_entity_datetime')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_address_entity_datetime',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_datetime', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_datetime', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_datetime', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'customer_address_entity_datetime',
-                'entity_id',
-                'customer_address_entity',
-                'entity_id'
-            ),
-            'entity_id',
-            $installer->getTable('customer_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Address Entity Datetime'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_address_entity_decimal'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_address_entity_decimal')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_address_entity_decimal',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_decimal', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_decimal', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_decimal', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'customer_address_entity_decimal',
-                'entity_id',
-                'customer_address_entity',
-                'entity_id'
-            ),
-            'entity_id',
-            $installer->getTable('customer_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Address Entity Decimal'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_address_entity_int'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_address_entity_int')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_address_entity_int',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_int', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_int', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_int', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_int', 'entity_id', 'customer_address_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Address Entity Int'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_address_entity_text'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_address_entity_text')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => false],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_address_entity_text',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_text', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_text', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_text', 'entity_id', 'customer_address_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Address Entity Text'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_address_entity_varchar'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_address_entity_varchar')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_address_entity_varchar',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_varchar', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_address_entity_varchar', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_address_entity_varchar', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'customer_address_entity_varchar',
-                'entity_id',
-                'customer_address_entity',
-                'entity_id'
-            ),
-            'entity_id',
-            $installer->getTable('customer_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Address Entity Varchar'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_entity_datetime'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_entity_datetime')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_entity_datetime',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_entity_datetime', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_entity_datetime', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_datetime', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_datetime', 'entity_id', 'customer_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Entity Datetime'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_entity_decimal'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_entity_decimal')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_entity_decimal',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_entity_decimal', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_entity_decimal', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_decimal', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_decimal', 'entity_id', 'customer_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Entity Decimal'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_entity_int'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_entity_int')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_entity_int',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_entity_int', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_entity_int', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_int', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_int', 'entity_id', 'customer_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Entity Int'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_entity_text'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_entity_text')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => false],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_entity_text',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_entity_text', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_text', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_text', 'entity_id', 'customer_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Entity Text'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_entity_varchar'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_entity_varchar')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'customer_entity_varchar',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('customer_entity_varchar', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('customer_entity_varchar', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_varchar', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_entity_varchar', 'entity_id', 'customer_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Entity Varchar'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_group'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_group')
-        )->addColumn(
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Customer Group Id'
-        )->addColumn(
-            'customer_group_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Customer Group Code'
-        )->addColumn(
-            'tax_class_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Tax Class Id'
-        )->setComment(
-            'Customer Group'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_eav_attribute'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_eav_attribute')
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Id'
-        )->addColumn(
-            'is_visible',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Is Visible'
-        )->addColumn(
-            'input_filter',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Input Filter'
-        )->addColumn(
-            'multiline_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Multiline Count'
-        )->addColumn(
-            'validate_rules',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Validate Rules'
-        )->addColumn(
-            'is_system',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is System'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addColumn(
-            'data_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Data Model'
-        )->addForeignKey(
-            $installer->getFkName('customer_eav_attribute', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Eav Attribute'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_form_attribute'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_form_attribute')
-        )->addColumn(
-            'form_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => true],
-            'Form Code'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Id'
-        )->addIndex(
-            $installer->getIdxName('customer_form_attribute', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('customer_form_attribute', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Form Attribute'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_eav_attribute_website'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_eav_attribute_website')
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Website Id'
-        )->addColumn(
-            'is_visible',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Visible'
-        )->addColumn(
-            'is_required',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Required'
-        )->addColumn(
-            'default_value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Default Value'
-        )->addColumn(
-            'multiline_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Multiline Count'
-        )->addIndex(
-            $installer->getIdxName('customer_eav_attribute_website', ['website_id']),
-            ['website_id']
-        )->addForeignKey(
-            $installer->getFkName('customer_eav_attribute_website', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('customer_eav_attribute_website', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Customer Eav Attribute Website'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'customer_visitor'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('customer_visitor')
-        )->addColumn(
-            'visitor_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Visitor ID'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Customer Id'
-        )->addColumn(
-            'session_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            ['nullable' => true, 'default' => null],
-            'Session ID'
-        )->addColumn(
-            'last_visit_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false],
-            'Last Visit Time'
-        )->addIndex(
-            $installer->getIdxName('customer_visitor', ['customer_id']),
-            ['customer_id']
-        )->setComment(
-            'Visitor Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $table = $installer->getConnection()
-            ->newTable(
-                $installer->getTable('customer_log')
-            )
-            ->addColumn(
-                'log_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [
-                    'nullable' => false,
-                    'identity' => true,
-                    'primary' => true
-                ],
-                'Log ID'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [
-                    'nullable' => false
-                ],
-                'Customer ID'
-            )
-            ->addColumn(
-                'last_login_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [
-                    'nullable' => true,
-                    'default' => null
-                ],
-                'Last Login Time'
-            )
-            ->addColumn(
-                'last_logout_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [
-                    'nullable' => true,
-                    'default' => null
-                ],
-                'Last Logout Time'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    $installer->getTable('customer_log'),
-                    ['customer_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['customer_id'],
-                [
-                    'type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ]
-            )
-            ->setComment('Customer Log Table');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
new file mode 100644
index 0000000000000..bad5735bc3e3a
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddCustomerUpdatedAtAttribute
+ * @package Magento\Customer\Setup\Patch
+ */
+class AddCustomerUpdatedAtAttribute implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * AddCustomerUpdatedAtAttribute constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $customerSetup->addAttribute(
+            Customer::ENTITY,
+            'updated_at',
+            [
+                'type' => 'static',
+                'label' => 'Updated At',
+                'input' => 'date',
+                'required' => false,
+                'sort_order' => 87,
+                'visible' => false,
+                'system' => false,
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateIdentifierCustomerAttributesVisibility::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
new file mode 100644
index 0000000000000..ba50f6e17dd87
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Setup\SetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddNonSpecifiedGenderAttributeOption
+ * @package Magento\Customer\Setup\Patch
+ */
+class AddNonSpecifiedGenderAttributeOption implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * AddNonSpecifiedGenderAttributeOption constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $entityTypeId = $customerSetup->getEntityTypeId(Customer::ENTITY);
+        $attributeId = $customerSetup->getAttributeId($entityTypeId, 'gender');
+
+        $option = ['attribute_id' => $attributeId, 'values' => [3 => 'Not Specified']];
+        $customerSetup->addAttributeOption($option);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateCustomerAttributesMetadata::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
new file mode 100644
index 0000000000000..b066d14a3c63e
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddSecurityTrackingAttributes
+ * @package Magento\Customer\Setup\Patch
+ */
+class AddSecurityTrackingAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * AddSecurityTrackingAttributes constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $customerSetup->addAttribute(
+            Customer::ENTITY,
+            'failures_num',
+            [
+                'type' => 'static',
+                'label' => 'Failures Number',
+                'input' => 'hidden',
+                'required' => false,
+                'sort_order' => 100,
+                'visible' => false,
+                'system' => true,
+            ]
+        );
+
+        $customerSetup->addAttribute(
+            Customer::ENTITY,
+            'first_failure',
+            [
+                'type' => 'static',
+                'label' => 'First Failure Date',
+                'input' => 'date',
+                'required' => false,
+                'sort_order' => 110,
+                'visible' => false,
+                'system' => true,
+            ]
+        );
+
+        $customerSetup->addAttribute(
+            Customer::ENTITY,
+            'lock_expires',
+            [
+                'type' => 'static',
+                'label' => 'Failures Number',
+                'input' => 'date',
+                'required' => false,
+                'sort_order' => 120,
+                'visible' => false,
+                'system' => true,
+            ]
+        );
+        $configTable = $this->moduleDataSetup->getTable('core_config_data');
+
+        $this->moduleDataSetup->getConnection()->update(
+            $configTable,
+            ['value' => new \Zend_Db_Expr('value*24')],
+            ['path = ?' => \Magento\Customer\Model\Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            RemoveCheckoutRegisterAndUpdateAttributes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.7';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
new file mode 100644
index 0000000000000..83c5fe7ae6d1e
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertValidationRulesFromSerializedToJson
+ * @package Magento\Customer\Setup\Patch
+ */
+class ConvertValidationRulesFromSerializedToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * ConvertValidationRulesFromSerializedToJson constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        FieldDataConverterFactory $fieldDataConverterFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('customer_eav_attribute'),
+            'attribute_id',
+            'validate_rules'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            MigrateStoresAllowedCountriesToWebsite::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.11';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
new file mode 100644
index 0000000000000..6e61b66f3c9db
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Setup\CustomerSetup;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\Module\Setup\Migration;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class DefaultCustomerGroupsAndAttributes
+ * @package Magento\Customer\Setup\Patch
+ */
+class DefaultCustomerGroupsAndAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * DefaultCustomerGroupsAndAttributes constructor.
+     * @param CustomerSetupFactory $customerSetupFactory
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        CustomerSetupFactory $customerSetupFactory,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->customerSetupFactory = $customerSetupFactory;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        /** @var CustomerSetup $customerSetup */
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        // insert default customer groups
+        $this->moduleDataSetup->getConnection()->insertForce(
+            $this->moduleDataSetup->getTable('customer_group'),
+            ['customer_group_id' => 0, 'customer_group_code' => 'NOT LOGGED IN', 'tax_class_id' => 3]
+        );
+        $this->moduleDataSetup->getConnection()->insertForce(
+            $this->moduleDataSetup->getTable('customer_group'),
+            ['customer_group_id' => 1, 'customer_group_code' => 'General', 'tax_class_id' => 3]
+        );
+        $this->moduleDataSetup->getConnection()->insertForce(
+            $this->moduleDataSetup->getTable('customer_group'),
+            ['customer_group_id' => 2, 'customer_group_code' => 'Wholesale', 'tax_class_id' => 3]
+        );
+        $this->moduleDataSetup->getConnection()->insertForce(
+            $this->moduleDataSetup->getTable('customer_group'),
+            ['customer_group_id' => 3, 'customer_group_code' => 'Retailer', 'tax_class_id' => 3]
+        );
+
+        $customerSetup->installEntities();
+
+        $customerSetup->installCustomerForms();
+
+        $disableAGCAttribute = $customerSetup->getEavConfig()->getAttribute('customer', 'disable_auto_group_change');
+        $disableAGCAttribute->setData('used_in_forms', ['adminhtml_customer']);
+        $disableAGCAttribute->save();
+
+        $attributesInfo = [
+            'vat_id' => [
+                'label' => 'VAT number',
+                'type' => 'static',
+                'input' => 'text',
+                'position' => 140,
+                'visible' => true,
+                'required' => false,
+            ],
+            'vat_is_valid' => [
+                'label' => 'VAT number validity',
+                'visible' => false,
+                'required' => false,
+                'type' => 'static',
+            ],
+            'vat_request_id' => [
+                'label' => 'VAT number validation request ID',
+                'type' => 'static',
+                'visible' => false,
+                'required' => false,
+            ],
+            'vat_request_date' => [
+                'label' => 'VAT number validation request date',
+                'type' => 'static',
+                'visible' => false,
+                'required' => false,
+            ],
+            'vat_request_success' => [
+                'label' => 'VAT number validation request success',
+                'visible' => false,
+                'required' => false,
+                'type' => 'static',
+            ],
+        ];
+
+        foreach ($attributesInfo as $attributeCode => $attributeParams) {
+            $customerSetup->addAttribute('customer_address', $attributeCode, $attributeParams);
+        }
+
+        $vatIdAttribute = $customerSetup->getEavConfig()->getAttribute('customer_address', 'vat_id');
+        $vatIdAttribute->setData(
+            'used_in_forms',
+            ['adminhtml_customer_address', 'customer_address_edit', 'customer_register_address']
+        );
+        $vatIdAttribute->save();
+
+        $entities = $customerSetup->getDefaultEntities();
+        foreach ($entities as $entityName => $entity) {
+            $customerSetup->addEntityType($entityName, $entity);
+        }
+
+        $customerSetup->updateAttribute(
+            'customer_address',
+            'street',
+            'backend_model',
+            \Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class
+        );
+
+        $migrationSetup = $this->moduleDataSetup->createMigrationSetup();
+
+        $migrationSetup->appendClassAliasReplace(
+            'customer_eav_attribute',
+            'data_model',
+            Migration::ENTITY_TYPE_MODEL,
+            Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['attribute_id']
+        );
+        $migrationSetup->doUpdateClassAliases();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
new file mode 100644
index 0000000000000..7488f3fd4a920
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Directory\Model\AllowedCountriesFactory;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var AllowedCountriesFactory
+     */
+    private $allowedCountries;
+
+    /**
+     * MigrateStoresAllowedCountriesToWebsite constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param StoreManagerInterface $storeManager
+     * @param AllowedCountries $allowedCountries
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Directory\Model\AllowedCountries $allowedCountries
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->storeManager = $storeManager;
+        $this->allowedCountries = $allowedCountries;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->beginTransaction();
+
+        try {
+            $this->migrateStoresAllowedCountriesToWebsite();
+            $this->moduleDataSetup->getConnection()->commit();
+        } catch (\Exception $e) {
+            $this->moduleDataSetup->getConnection()->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Merge allowed countries from stores to websites
+     *
+     * @return void
+     */
+    private function migrateStoresAllowedCountriesToWebsite()
+    {
+        $allowedCountries = [];
+        //Process Websites
+        foreach ($this->storeManager->getStores() as $store) {
+            $allowedCountries = $this->mergeAllowedCountries(
+                $allowedCountries,
+                $this->getAllowedCountries(ScopeInterface::SCOPE_STORE, $store->getId()),
+                $store->getWebsiteId()
+            );
+        }
+        //Process stores
+        foreach ($this->storeManager->getWebsites() as $website) {
+            $allowedCountries = $this->mergeAllowedCountries(
+                $allowedCountries,
+                $this->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $website->getId()),
+                $website->getId()
+            );
+        }
+
+        $connection = $this->moduleDataSetup->getConnection();
+
+        //Remove everything from stores scope
+        $connection->delete(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            [
+                'path = ?' => AllowedCountries::ALLOWED_COUNTRIES_PATH,
+                'scope = ?' => ScopeInterface::SCOPE_STORES
+            ]
+        );
+
+        //Update websites
+        foreach ($allowedCountries as $scopeId => $countries) {
+            $connection->update(
+                $this->moduleDataSetup->getTable('core_config_data'),
+                [
+                    'value' => implode(',', $countries)
+                ],
+                [
+                    'path = ?' => AllowedCountries::ALLOWED_COUNTRIES_PATH,
+                    'scope_id = ?' => $scopeId,
+                    'scope = ?' => ScopeInterface::SCOPE_WEBSITES
+                ]
+            );
+        }
+    }
+
+    /**
+     * Retrieve countries not depending on global scope
+     *
+     * @param string $scope
+     * @param int $scopeCode
+     * @return array
+     */
+    private function getAllowedCountries($scope, $scopeCode)
+    {
+        return $this->allowedCountries->makeCountriesUnique(
+            $this->allowedCountries->getCountriesFromConfig($scope, $scopeCode)
+        );
+    }
+
+    /**
+     * Merge allowed countries between different scopes
+     *
+     * @param array $countries
+     * @param array $newCountries
+     * @param string $identifier
+     * @return array
+     */
+    private function mergeAllowedCountries(array $countries, array $newCountries, $identifier)
+    {
+        if (!isset($countries[$identifier])) {
+            $countries[$identifier] = $newCountries;
+        } else {
+            $countries[$identifier] = array_replace($countries[$identifier], $newCountries);
+        }
+
+        return $countries;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateAutocompleteOnStorefrontConfigPath::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.9';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
new file mode 100644
index 0000000000000..51f54dc4a432c
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Setup\SetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class RemoveCheckoutRegisterAndUpdateAttributes
+ * @package Magento\Customer\Setup\Patch
+ */
+class RemoveCheckoutRegisterAndUpdateAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * RemoveCheckoutRegisterAndUpdateAttributes constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->delete(
+            $this->moduleDataSetup->getTable('customer_form_attribute'),
+            ['form_code = ?' => 'checkout_register']
+        );
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $customerSetup->updateEntityType(
+            \Magento\Customer\Model\Customer::ENTITY,
+            'entity_model',
+            \Magento\Customer\Model\ResourceModel\Customer::class
+        );
+        $customerSetup->updateEntityType(
+            \Magento\Customer\Model\Customer::ENTITY,
+            'increment_model',
+            \Magento\Eav\Model\Entity\Increment\NumericValue::class
+        );
+        $customerSetup->updateEntityType(
+            \Magento\Customer\Model\Customer::ENTITY,
+            'entity_attribute_collection',
+            \Magento\Customer\Model\ResourceModel\Attribute\Collection::class
+        );
+        $customerSetup->updateEntityType(
+            'customer_address',
+            'entity_model',
+            \Magento\Customer\Model\ResourceModel\Address::class
+        );
+        $customerSetup->updateEntityType(
+            'customer_address',
+            'entity_attribute_collection',
+            \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection::class
+        );
+        $customerSetup->updateAttribute(
+            'customer_address',
+            'country_id',
+            'source_model',
+            \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country::class
+        );
+        $customerSetup->updateAttribute(
+            'customer_address',
+            'region',
+            'backend_model',
+            \Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region::class
+        );
+        $customerSetup->updateAttribute(
+            'customer_address',
+            'region_id',
+            'source_model',
+            \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region::class
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpgradePasswordHashAndAddress::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.6';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
new file mode 100644
index 0000000000000..30435ace54d46
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateAutocompleteOnStorefrontCOnfigPath
+ * @package Magento\Customer\Setup\Patch
+ */
+class UpdateAutocompleteOnStorefrontConfigPath implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * UpdateAutocompleteOnStorefrontCOnfigPath constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->update(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            ['path' => \Magento\Customer\Model\Form::XML_PATH_ENABLE_AUTOCOMPLETE],
+            ['path = ?' => 'general/restriction/autocomplete_on_storefront']
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddSecurityTrackingAttributes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.8';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
new file mode 100644
index 0000000000000..938cd3cd52e73
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateCustomerAttributeInputFilters
+ * @package Magento\Customer\Setup\Patch
+ */
+class UpdateCustomerAttributeInputFilters implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * UpdateCustomerAttributeInputFilters constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $entityAttributes = [
+            'customer_address' => [
+                'firstname' => [
+                    'input_filter' => 'trim'
+                ],
+                'lastname' => [
+                    'input_filter' => 'trim'
+                ],
+                'middlename' => [
+                    'input_filter' => 'trim'
+                ],
+            ],
+            'customer' => [
+                'firstname' => [
+                    'input_filter' => 'trim'
+                ],
+                'lastname' => [
+                    'input_filter' => 'trim'
+                ],
+                'middlename' => [
+                    'input_filter' => 'trim'
+                ],
+            ],
+        ];
+        $customerSetup->upgradeAttributes($entityAttributes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateVATNumber::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.13';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php
new file mode 100644
index 0000000000000..5f4d9952590ba
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Setup\CustomerSetup;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateCustomerAttributesMetadata
+ * @package Magento\Customer\Setup\Patch
+ */
+class UpdateCustomerAttributesMetadata implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * UpdateCustomerAttributesMetadata constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var CustomerSetup $customerSetup */
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $this->updateCustomerAttributesMetadata($customerSetup);
+    }
+
+    /**
+     * @param CustomerSetup $customerSetup
+     * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    private function updateCustomerAttributesMetadata($customerSetup)
+    {
+        $entityAttributes = [
+            'customer' => [
+                'website_id' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'created_in' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'email' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => true,
+                ],
+                'group_id' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'dob' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'taxvat' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'confirmation' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'created_at' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'gender' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+            ],
+            'customer_address' => [
+                'company' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'street' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'city' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'country_id' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'region' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'region_id' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => false,
+                ],
+                'postcode' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => true,
+                ],
+                'telephone' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => true,
+                    'is_filterable_in_grid' => true,
+                    'is_searchable_in_grid' => true,
+                ],
+                'fax' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+            ],
+        ];
+        $customerSetup->upgradeAttributes($entityAttributes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            DefaultCustomerGroupsAndAttributes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
new file mode 100644
index 0000000000000..7d0cad768d6b0
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateIdentifierCustomerAttributesVisibility
+ * @package Magento\Customer\Setup\Patch
+ */
+class UpdateIdentifierCustomerAttributesVisibility implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * UpdateIdentifierCustomerAttributesVisibility constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $entityAttributes = [
+            'customer_address' => [
+                'region_id' => [
+                    'is_used_in_grid' => false,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => false,
+                ],
+                'firstname' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+                'lastname' => [
+                    'is_used_in_grid' => true,
+                    'is_visible_in_grid' => false,
+                    'is_filterable_in_grid' => false,
+                    'is_searchable_in_grid' => true,
+                ],
+            ],
+        ];
+        $customerSetup->upgradeAttributes($entityAttributes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddNonSpecifiedGenderAttributeOption::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
new file mode 100644
index 0000000000000..d31301eedf4b1
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Setup\SetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class UpdateVATNumber implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * UpdateVATNumber constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $customerSetup = $this->customerSetupFactory->create(['resourceConnection' => $this->moduleDataSetup]);
+        $customerSetup->updateAttribute('customer_address', 'vat_id', 'frontend_label', 'VAT Number');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            ConvertValidationRulesFromSerializedToJson::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.12';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
new file mode 100644
index 0000000000000..3b8f96a037343
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpgradePasswordHashAndAddress
+ * @package Magento\Customer\Setup\Patch
+ */
+class UpgradePasswordHashAndAddress implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CustomerSetupFactory
+     */
+    private $customerSetupFactory;
+
+    /**
+     * UpgradePasswordHashAndAddress constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CustomerSetupFactory $customerSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CustomerSetupFactory $customerSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->customerSetupFactory = $customerSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->upgradeHash();
+        $entityAttributes = [
+            'customer_address' => [
+                'fax' => [
+                    'is_visible' => false,
+                    'is_system' => false,
+                ],
+            ],
+        ];
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $customerSetup->upgradeAttributes($entityAttributes);
+    }
+
+    /**
+     * @return void
+     */
+    private function upgradeHash()
+    {
+        $customerEntityTable = $this->moduleDataSetup->getTable('customer_entity');
+
+        $select = $this->moduleDataSetup->getConnection()->select()->from(
+            $customerEntityTable,
+            ['entity_id', 'password_hash']
+        );
+
+        $customers = $this->moduleDataSetup->getConnection()->fetchAll($select);
+        foreach ($customers as $customer) {
+            if ($customer['password_hash'] === null) {
+                continue;
+            }
+            list($hash, $salt) = explode(Encryptor::DELIMITER, $customer['password_hash']);
+
+            $newHash = $customer['password_hash'];
+            if (strlen($hash) === 32) {
+                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_MD5]);
+            } elseif (strlen($hash) === 64) {
+                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_SHA256]);
+            }
+
+            $bind = ['password_hash' => $newHash];
+            $where = ['entity_id = ?' => (int)$customer['entity_id']];
+            $this->moduleDataSetup->getConnection()->update($customerEntityTable, $bind, $where);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddCustomerUpdatedAtAttribute::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.5';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/RecurringData.php b/app/code/Magento/Customer/Setup/RecurringData.php
new file mode 100644
index 0000000000000..fbef4c05d126d
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/RecurringData.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Setup;
+
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Setup\InstallDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Customer\Model\Customer;
+
+/**
+ * Upgrade registered themes.
+ */
+class RecurringData implements InstallDataInterface
+{
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
+    /**
+     * Init
+     *
+     * @param IndexerRegistry $indexerRegistry
+     */
+    public function __construct(IndexerRegistry $indexerRegistry)
+    {
+        $this->indexerRegistry = $indexerRegistry;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
+        $indexer->reindexAll();
+    }
+}
diff --git a/app/code/Magento/Customer/Setup/UpgradeData.php b/app/code/Magento/Customer/Setup/UpgradeData.php
deleted file mode 100644
index b5aba18a92f28..0000000000000
--- a/app/code/Magento/Customer/Setup/UpgradeData.php
+++ /dev/null
@@ -1,666 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Customer\Setup;
-
-use Magento\Customer\Model\Customer;
-use Magento\Directory\Model\AllowedCountries;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-
-/**
- * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * Customer setup factory
-     *
-     * @var CustomerSetupFactory
-     */
-    protected $customerSetupFactory;
-
-    /**
-     * @var AllowedCountries
-     */
-    private $allowedCountriesReader;
-
-    /**
-     * @var IndexerRegistry
-     */
-    protected $indexerRegistry;
-
-    /**
-     * @var \Magento\Eav\Model\Config
-     */
-    protected $eavConfig;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * @param CustomerSetupFactory $customerSetupFactory
-     * @param IndexerRegistry $indexerRegistry
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param FieldDataConverterFactory|null $fieldDataConverterFactory
-     */
-    public function __construct(
-        CustomerSetupFactory $customerSetupFactory,
-        IndexerRegistry $indexerRegistry,
-        \Magento\Eav\Model\Config $eavConfig,
-        FieldDataConverterFactory $fieldDataConverterFactory = null
-    ) {
-        $this->customerSetupFactory = $customerSetupFactory;
-        $this->indexerRegistry = $indexerRegistry;
-        $this->eavConfig = $eavConfig;
-
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory ?: ObjectManager::getInstance()->get(
-            FieldDataConverterFactory::class
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        /** @var CustomerSetup $customerSetup */
-        $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]);
-
-        if (version_compare($context->getVersion(), '2.0.6', '<')) {
-            $this->upgradeVersionTwoZeroSix($customerSetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->upgradeVersionTwoZeroOne($customerSetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2') < 0) {
-            $this->upgradeVersionTwoZeroTwo($customerSetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $this->upgradeVersionTwoZeroThree($customerSetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.4', '<')) {
-            $this->upgradeVersionTwoZeroFour($customerSetup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.5', '<')) {
-            $this->upgradeVersionTwoZeroFive($customerSetup, $setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.6', '<')) {
-            $setup->getConnection()->delete(
-                $setup->getTable('customer_form_attribute'),
-                ['form_code = ?' => 'checkout_register']
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.8', '<')) {
-            $setup->getConnection()->update(
-                $setup->getTable('core_config_data'),
-                ['path' => \Magento\Customer\Model\Form::XML_PATH_ENABLE_AUTOCOMPLETE],
-                ['path = ?' => 'general/restriction/autocomplete_on_storefront']
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.7', '<')) {
-            $this->upgradeVersionTwoZeroSeven($customerSetup);
-            $this->upgradeCustomerPasswordResetlinkExpirationPeriodConfig($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.9', '<')) {
-            $setup->getConnection()->beginTransaction();
-
-            try {
-                $this->migrateStoresAllowedCountriesToWebsite($setup);
-                $setup->getConnection()->commit();
-            } catch (\Exception $e) {
-                $setup->getConnection()->rollBack();
-                throw $e;
-            }
-        }
-        if (version_compare($context->getVersion(), '2.0.11', '<')) {
-            $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-            $fieldDataConverter->convert(
-                $setup->getConnection(),
-                $setup->getTable('customer_eav_attribute'),
-                'attribute_id',
-                'validate_rules'
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.12', '<')) {
-            $this->upgradeVersionTwoZeroTwelve($customerSetup);
-        }
-
-        $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
-        $indexer->reindexAll();
-        $this->eavConfig->clear();
-        $setup->endSetup();
-    }
-
-    /**
-     * Retrieve Store Manager
-     *
-     * @deprecated 100.1.3
-     * @return StoreManagerInterface
-     */
-    private function getStoreManager()
-    {
-        if (!$this->storeManager) {
-            $this->storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
-        }
-
-        return $this->storeManager;
-    }
-
-    /**
-     * Retrieve Allowed Countries Reader
-     *
-     * @deprecated 100.1.3
-     * @return AllowedCountries
-     */
-    private function getAllowedCountriesReader()
-    {
-        if (!$this->allowedCountriesReader) {
-            $this->allowedCountriesReader = ObjectManager::getInstance()->get(AllowedCountries::class);
-        }
-
-        return $this->allowedCountriesReader;
-    }
-
-    /**
-     * Merge allowed countries between different scopes
-     *
-     * @param array $countries
-     * @param array $newCountries
-     * @param string $identifier
-     * @return array
-     */
-    private function mergeAllowedCountries(array $countries, array $newCountries, $identifier)
-    {
-        if (!isset($countries[$identifier])) {
-            $countries[$identifier] = $newCountries;
-        } else {
-            $countries[$identifier] =
-                array_replace($countries[$identifier], $newCountries);
-        }
-
-        return $countries;
-    }
-
-    /**
-     * Retrieve countries not depending on global scope
-     *
-     * @param string $scope
-     * @param int $scopeCode
-     * @return array
-     */
-    private function getAllowedCountries($scope, $scopeCode)
-    {
-        $reader = $this->getAllowedCountriesReader();
-        return $reader->makeCountriesUnique($reader->getCountriesFromConfig($scope, $scopeCode));
-    }
-
-    /**
-     * Merge allowed countries from stores to websites
-     *
-     * @param SetupInterface $setup
-     * @return void
-     */
-    private function migrateStoresAllowedCountriesToWebsite(SetupInterface $setup)
-    {
-        $allowedCountries = [];
-        //Process Websites
-        foreach ($this->getStoreManager()->getStores() as $store) {
-            $allowedCountries = $this->mergeAllowedCountries(
-                $allowedCountries,
-                $this->getAllowedCountries(ScopeInterface::SCOPE_STORE, $store->getId()),
-                $store->getWebsiteId()
-            );
-        }
-        //Process stores
-        foreach ($this->getStoreManager()->getWebsites() as $website) {
-            $allowedCountries = $this->mergeAllowedCountries(
-                $allowedCountries,
-                $this->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $website->getId()),
-                $website->getId()
-            );
-        }
-
-        $connection = $setup->getConnection();
-
-        //Remove everything from stores scope
-        $connection->delete(
-            $setup->getTable('core_config_data'),
-            [
-                'path = ?' => AllowedCountries::ALLOWED_COUNTRIES_PATH,
-                'scope = ?' => ScopeInterface::SCOPE_STORES
-            ]
-        );
-
-        //Update websites
-        foreach ($allowedCountries as $scopeId => $countries) {
-            $connection->update(
-                $setup->getTable('core_config_data'),
-                [
-                    'value' => implode(',', $countries)
-                ],
-                [
-                    'path = ?' => AllowedCountries::ALLOWED_COUNTRIES_PATH,
-                    'scope_id = ?' => $scopeId,
-                    'scope = ?' => ScopeInterface::SCOPE_WEBSITES
-                ]
-            );
-        }
-    }
-
-    /**
-     * @param array $entityAttributes
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    protected function upgradeAttributes(array $entityAttributes, CustomerSetup $customerSetup)
-    {
-        foreach ($entityAttributes as $entityType => $attributes) {
-            foreach ($attributes as $attributeCode => $attributeData) {
-                $attribute = $customerSetup->getEavConfig()->getAttribute($entityType, $attributeCode);
-                foreach ($attributeData as $key => $value) {
-                    $attribute->setData($key, $value);
-                }
-                $attribute->save();
-            }
-        }
-    }
-
-    /**
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeHash($setup)
-    {
-        $customerEntityTable = $setup->getTable('customer_entity');
-
-        $select = $setup->getConnection()->select()->from(
-            $customerEntityTable,
-            ['entity_id', 'password_hash']
-        );
-
-        $customers = $setup->getConnection()->fetchAll($select);
-        foreach ($customers as $customer) {
-            if ($customer['password_hash'] === null) {
-                continue;
-            }
-            list($hash, $salt) = explode(Encryptor::DELIMITER, $customer['password_hash']);
-
-            $newHash = $customer['password_hash'];
-            if (strlen($hash) === 32) {
-                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_MD5]);
-            } elseif (strlen($hash) === 64) {
-                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_SHA256]);
-            }
-
-            $bind = ['password_hash' => $newHash];
-            $where = ['entity_id = ?' => (int)$customer['entity_id']];
-            $setup->getConnection()->update($customerEntityTable, $bind, $where);
-        }
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    private function upgradeVersionTwoZeroOne($customerSetup)
-    {
-        $entityAttributes = [
-            'customer' => [
-                'website_id' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'created_in' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'email' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => true,
-                ],
-                'group_id' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'dob' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'taxvat' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'confirmation' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'created_at' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'gender' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-            ],
-            'customer_address' => [
-                'company' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'street' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'city' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'country_id' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'region' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'region_id' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => false,
-                ],
-                'postcode' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => true,
-                ],
-                'telephone' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => true,
-                    'is_filterable_in_grid' => true,
-                    'is_searchable_in_grid' => true,
-                ],
-                'fax' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-            ],
-        ];
-        $this->upgradeAttributes($entityAttributes, $customerSetup);
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroTwo($customerSetup)
-    {
-        $entityTypeId = $customerSetup->getEntityTypeId(Customer::ENTITY);
-        $attributeId = $customerSetup->getAttributeId($entityTypeId, 'gender');
-
-        $option = ['attribute_id' => $attributeId, 'values' => [3 => 'Not Specified']];
-        $customerSetup->addAttributeOption($option);
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroThree($customerSetup)
-    {
-        $entityAttributes = [
-            'customer_address' => [
-                'region_id' => [
-                    'is_used_in_grid' => false,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => false,
-                ],
-                'firstname' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-                'lastname' => [
-                    'is_used_in_grid' => true,
-                    'is_visible_in_grid' => false,
-                    'is_filterable_in_grid' => false,
-                    'is_searchable_in_grid' => true,
-                ],
-            ],
-        ];
-        $this->upgradeAttributes($entityAttributes, $customerSetup);
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroFour($customerSetup)
-    {
-        $customerSetup->addAttribute(
-            Customer::ENTITY,
-            'updated_at',
-            [
-                'type' => 'static',
-                'label' => 'Updated At',
-                'input' => 'date',
-                'required' => false,
-                'sort_order' => 87,
-                'visible' => false,
-                'system' => false,
-            ]
-        );
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroFive($customerSetup, $setup)
-    {
-        $this->upgradeHash($setup);
-        $entityAttributes = [
-            'customer_address' => [
-                'fax' => [
-                    'is_visible' => false,
-                    'is_system' => false,
-                ],
-            ],
-        ];
-        $this->upgradeAttributes($entityAttributes, $customerSetup);
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroSix($customerSetup)
-    {
-        $customerSetup->updateEntityType(
-            \Magento\Customer\Model\Customer::ENTITY,
-            'entity_model',
-            \Magento\Customer\Model\ResourceModel\Customer::class
-        );
-        $customerSetup->updateEntityType(
-            \Magento\Customer\Model\Customer::ENTITY,
-            'increment_model',
-            \Magento\Eav\Model\Entity\Increment\NumericValue::class
-        );
-        $customerSetup->updateEntityType(
-            \Magento\Customer\Model\Customer::ENTITY,
-            'entity_attribute_collection',
-            \Magento\Customer\Model\ResourceModel\Attribute\Collection::class
-        );
-        $customerSetup->updateEntityType(
-            'customer_address',
-            'entity_model',
-            \Magento\Customer\Model\ResourceModel\Address::class
-        );
-        $customerSetup->updateEntityType(
-            'customer_address',
-            'entity_attribute_collection',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection::class
-        );
-        $customerSetup->updateAttribute(
-            'customer_address',
-            'country_id',
-            'source_model',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country::class
-        );
-        $customerSetup->updateAttribute(
-            'customer_address',
-            'region',
-            'backend_model',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region::class
-        );
-        $customerSetup->updateAttribute(
-            'customer_address',
-            'region_id',
-            'source_model',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region::class
-        );
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroSeven($customerSetup)
-    {
-        $customerSetup->addAttribute(
-            Customer::ENTITY,
-            'failures_num',
-            [
-                'type' => 'static',
-                'label' => 'Failures Number',
-                'input' => 'hidden',
-                'required' => false,
-                'sort_order' => 100,
-                'visible' => false,
-                'system' => true,
-            ]
-        );
-
-        $customerSetup->addAttribute(
-            Customer::ENTITY,
-            'first_failure',
-            [
-                'type' => 'static',
-                'label' => 'First Failure Date',
-                'input' => 'date',
-                'required' => false,
-                'sort_order' => 110,
-                'visible' => false,
-                'system' => true,
-            ]
-        );
-
-        $customerSetup->addAttribute(
-            Customer::ENTITY,
-            'lock_expires',
-            [
-                'type' => 'static',
-                'label' => 'Failures Number',
-                'input' => 'date',
-                'required' => false,
-                'sort_order' => 120,
-                'visible' => false,
-                'system' => true,
-            ]
-        );
-    }
-
-    /**
-     * @param CustomerSetup $customerSetup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroTwelve(CustomerSetup $customerSetup)
-    {
-        $customerSetup->updateAttribute('customer_address', 'vat_id', 'frontend_label', 'VAT Number');
-    }
-
-    /**
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeCustomerPasswordResetlinkExpirationPeriodConfig($setup)
-    {
-        $configTable = $setup->getTable('core_config_data');
-
-        $setup->getConnection()->update(
-            $configTable,
-            ['value' => new \Zend_Db_Expr('value*24')],
-            ['path = ?' => \Magento\Customer\Model\Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD]
-        );
-    }
-}
diff --git a/app/code/Magento/Customer/Setup/UpgradeSchema.php b/app/code/Magento/Customer/Setup/UpgradeSchema.php
deleted file mode 100755
index 11aea7d578dd0..0000000000000
--- a/app/code/Magento/Customer/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Customer\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.0.1') < 0) {
-            $connection = $setup->getConnection();
-
-            $connection->addIndex(
-                $setup->getTable('customer_visitor'),
-                $setup->getIdxName('customer_visitor', ['last_visit_at']),
-                ['last_visit_at']
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_eav_attribute'),
-                'is_used_in_grid',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Is Used in Grid'
-                ]
-            );
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_eav_attribute'),
-                'is_visible_in_grid',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Is Visible in Grid'
-                ]
-            );
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_eav_attribute'),
-                'is_filterable_in_grid',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Is Filterable in Grid'
-                ]
-            );
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_eav_attribute'),
-                'is_searchable_in_grid',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Is Searchable in Grid'
-                ]
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.7', '<')) {
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_entity'),
-                'failures_num',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'nullable' => true,
-                    'default' => '0',
-                    'comment' => 'Failure Number'
-                ]
-            );
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_entity'),
-                'first_failure',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    'comment' => 'First Failure'
-                ]
-            );
-            $setup->getConnection()->addColumn(
-                $setup->getTable('customer_entity'),
-                'lock_expires',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    'comment' => 'Lock Expiration Date'
-                ]
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.10', '<')) {
-            $foreignKeys = $this->getForeignKeys($setup);
-            $this->dropForeignKeys($setup, $foreignKeys);
-            $this->alterTables($setup, $foreignKeys);
-            $this->createForeignKeys($setup, $foreignKeys);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @param array $keys
-     * @return void
-     */
-    private function alterTables(SchemaSetupInterface $setup, array $keys)
-    {
-        $setup->getConnection()->modifyColumn(
-            $setup->getTable('customer_group'),
-            'customer_group_id',
-            [
-                'type' => 'integer',
-                'unsigned' => true,
-                'identity' => true,
-                'nullable' => false
-            ]
-        );
-        foreach ($keys as $key) {
-            $description = $setup->getConnection()->describeTable($key['TABLE_NAME'])[$key['COLUMN_NAME']];
-            $description['DATA_TYPE'] = 'int';
-            $setup->getConnection()->modifyColumnByDdl(
-                $key['TABLE_NAME'],
-                $key['COLUMN_NAME'],
-                $description
-            );
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @param array $keys
-     * @return void
-     */
-    private function dropForeignKeys(SchemaSetupInterface $setup, array $keys)
-    {
-        foreach ($keys as $key) {
-            $setup->getConnection()->dropForeignKey($key['TABLE_NAME'], $key['FK_NAME']);
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @param array $keys
-     * @return void
-     */
-    private function createForeignKeys(SchemaSetupInterface $setup, array $keys)
-    {
-        foreach ($keys as $key) {
-            $setup->getConnection()->addForeignKey(
-                $key['FK_NAME'],
-                $key['TABLE_NAME'],
-                $key['COLUMN_NAME'],
-                $key['REF_TABLE_NAME'],
-                $key['REF_COLUMN_NAME'],
-                $key['ON_DELETE']
-            );
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @return array
-     */
-    private function getForeignKeys(SchemaSetupInterface $setup)
-    {
-        $foreignKeys = [];
-        $keysTree = $setup->getConnection()->getForeignKeysTree();
-        foreach ($keysTree as $indexes) {
-            foreach ($indexes as $index) {
-                if ($index['REF_TABLE_NAME'] == $setup->getTable('customer_group')
-                    && $index['REF_COLUMN_NAME'] == 'customer_group_id'
-                ) {
-                    $foreignKeys[] = $index;
-                }
-            }
-        }
-        return $foreignKeys;
-    }
-}
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminConfigCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminConfigCustomerActionGroup.xml
new file mode 100644
index 0000000000000..8a3ab7068696c
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminConfigCustomerActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetCustomerDataLifetimeActionGroup">
+        <arguments>
+            <argument name="minutes" defaultValue="60" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerConfigPage.url('#customer_online_customers-link')}}" stepKey="openCustomerConfigPage"/>
+        <fillField userInput="{{minutes}}" selector="{{AdminCustomerConfigSection.customerDataLifetime}}" stepKey="fillCustomerDataLifetime"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml
new file mode 100644
index 0000000000000..ba984a4d82562
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerGroupActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateCustomerGroupActionGroup">
+        <arguments>
+            <argument name="groupName" type="string"/>
+            <argument name="taxClass" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminNewCustomerGroupPage.url}}" stepKey="goToNewCustomerGroupPage"/>
+        <waitForPageLoad stepKey="waitForNewCustomerGroupPageLoad"/>
+
+        <!--Set tax class for customer group-->
+        <fillField stepKey="fillGroupName" selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{groupName}}"/>
+        <selectOption selector="{{AdminNewCustomerGroupSection.taxClass}}" userInput="{{taxClass}}" stepKey="selectTaxClassOption"/>
+        <click selector="{{AdminNewCustomerGroupSection.saveCustomerGroup}}" stepKey="clickToSaveCustomerGroup"/>
+        <waitForPageLoad stepKey="waitForCustomerGroupSaved"/>
+        <see stepKey="seeCustomerGroupSaveMessage" userInput="You saved the customer group."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..4c458c66ca65b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateCustomerWithWebsiteAndStoreViewActionGroup">
+        <arguments>
+            <argument name="customerData"/>
+            <argument name="address"/>
+            <argument name="website" type="string"/>
+            <argument name="storeView" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <click stepKey="saveCustomer" selector="{{AdminCustomerAccountInformationSection.saveCustomerAndContinueEdit}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
+        <click stepKey="goToAddresses" selector="{{AdminCustomerAccountInformationSection.addressesButton}}"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <click stepKey="clickOnAddNewAddress" selector="{{AdminCustomerAddressesSection.addNewAddress}}"/>
+        <waitForPageLoad stepKey="waitForAddressFields"/>
+        <click stepKey="thickBillingAddress" selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}"/>
+        <click stepKey="thickShippingAddress" selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}"/>
+        <fillField stepKey="fillFirstNameForAddress" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" userInput="{{address.firstname}}"/>
+        <fillField stepKey="fillLastNameForAddress" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" userInput="{{address.lastname}}"/>
+        <fillField stepKey="fillStreetAddress" selector="{{AdminCustomerAddressesSection.streetAddress}}" userInput="{{address.street[0]}}"/>
+        <fillField stepKey="fillCity" selector="{{AdminCustomerAddressesSection.city}}" userInput="{{address.city}}"/>
+        <selectOption stepKey="selectCountry" selector="{{AdminCustomerAddressesSection.country}}" userInput="{{address.country}}"/>
+        <selectOption stepKey="selectState" selector="{{AdminCustomerAddressesSection.state}}" userInput="{{address.state}}"/>
+        <fillField stepKey="fillZip" selector="{{AdminCustomerAddressesSection.zip}}" userInput="{{address.postcode}}"/>
+        <fillField stepKey="fillPhoneNumber" selector="{{AdminCustomerAddressesSection.phoneNumber}}" userInput="{{address.telephone}}"/>
+        <click stepKey="saveAddress" selector="{{AdminCustomerAddressesSection.saveAddress}}"/>
+        <waitForPageLoad stepKey="waitForAddressSave"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
new file mode 100644
index 0000000000000..d08f10b22419d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCustomerActionGroup">
+        <arguments>
+            <argument name="customerEmail"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
+        <click stepKey="chooseCustomer" selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}"/>
+        <click stepKey="openActions" selector="{{AdminCustomerGridMainActionsSection.actions}}"/>
+        <waitForPageLoad stepKey="waitActions"/>
+        <click stepKey="delete" selector="{{AdminCustomerGridMainActionsSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForConfirmationAlert"/>
+        <click stepKey="accept" selector="{{AdminCustomerGridMainActionsSection.ok}}"/>
+        <see stepKey="seeSuccessMessage" userInput="were deleted."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
new file mode 100644
index 0000000000000..2609f0ab5c0d6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCustomerGroupActionGroup">
+        <arguments>
+            <argument name="customerGroupName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerGroupsIndexPage.url}}" stepKey="goToAdminCustomerGroupIndexPage"/>
+        <waitForPageLoad time="30" stepKey="waitForCustomerGroupIndexPageLoad"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
+        <fillField userInput="{{customerGroupName}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('customer_group_code')}}" stepKey="fillNameFieldOnFiltersSection"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCustomerGroupGridActionsSection.selectButton('customerGroupName')}}" stepKey="clickSelectButton"/>
+        <click selector="{{AdminCustomerGroupGridActionsSection.deleteAction('customerGroupName')}}" stepKey="clickOnDeleteItem"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDeleteCustomerGroup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml
new file mode 100644
index 0000000000000..1681a8e850ca2
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFilterCustomerGroupByNameActionGroup">
+        <arguments>
+            <argument name="customerGroupName" type="string"/>
+        </arguments>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
+        <fillField userInput="{{customerGroupName}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('customer_group_code')}}" stepKey="fillNameFieldOnFiltersSection"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
new file mode 100644
index 0000000000000..7be36ffbd9bc4
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="LoginToStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer"/>
+        </arguments>
+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
new file mode 100755
index 0000000000000..914cebe99ac5f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenEditCustomerFromAdminActionGroup">
+        <arguments>
+            <argument name="customer"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
+        <fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
+    <actionGroup name="OpenEditCustomerAddressFromAdminActionGroup">
+        <arguments>
+            <argument name="address"/>
+        </arguments>
+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="openAddressesTab"/>
+        <waitForElementVisible selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="waitForComponentLoad"/>
+        <click selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="openAddressesFilter"/>
+        <fillField userInput="{{address.firstname}}" selector="{{AdminCustomerAddressFiltersSection.firstnameInput}}" stepKey="fillFirstname"/>
+        <fillField userInput="{{address.lastname}}" selector="{{AdminCustomerAddressFiltersSection.lastnameInput}}" stepKey="fillLastname"/>
+        <fillField userInput="{{address.telephone}}" selector="{{AdminCustomerAddressFiltersSection.telephoneInput}}" stepKey="fillCountry"/>
+        <fillField userInput="{{address.postcode}}" selector="{{AdminCustomerAddressFiltersSection.postcodeInput}}" stepKey="fillPostcode"/>
+        <click selector="{{AdminCustomerAddressFiltersSection.applyFilter}}" stepKey="applyAddressesFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <click selector="{{AdminCustomerAddressGridSection.firstRowSelectActionLink}}" stepKey="clickAction"/>
+        <click selector="{{AdminCustomerAddressGridSection.firstRowEditActionLink}}" stepKey="clickEdit"/>
+        <waitForPageLoad stepKey="waitForModalWindow" />
+    </actionGroup>
+    <actionGroup name="DeleteCustomerFromAdminActionGroup">
+        <arguments>
+            <argument name="customer"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{customer.email}}" stepKey="fillSearch"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickSubmit"/>
+        <waitForAjaxLoad stepKey="waitForLoadAjax"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.multicheck}}" stepKey="selectAll"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="clickActions"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
+        <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
+    </actionGroup>
+    <actionGroup name="AdminClearCustomersFiltersActionGroup">
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
+        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
new file mode 100644
index 0000000000000..227085fce9de4
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SignUpNewUserFromStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer"/>
+        </arguments>
+        <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
+        <waitForPageLoad stepKey="waitForStorefrontPage"/>
+        <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
+        <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
+        <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
+        <fillField  stepKey="fillConfirmPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
+        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
+        <see stepKey="seeFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+    </actionGroup>
+    
+    <actionGroup name="EnterCustomerAddressInfo">
+        <arguments>
+            <argument name="Address"/>
+        </arguments>
+        
+        <amOnPage url="customer/address/new/" stepKey="goToAddressPage"/>
+        <waitForPageLoad stepKey="waitForAddressPage"/>
+        <fillField stepKey="fillFirstName" selector="{{StorefrontCustomerAddressSection.firstName}}" userInput="{{Address.firstname}}"/>
+        <fillField stepKey="fillLastName" selector="{{StorefrontCustomerAddressSection.lastName}}" userInput="{{Address.lastname}}"/>
+        <fillField stepKey="fillCompany" selector="{{StorefrontCustomerAddressSection.company}}" userInput="{{Address.company}}"/>
+        <fillField stepKey="fillPhoneNumber" selector="{{StorefrontCustomerAddressSection.phoneNumber}}" userInput="{{Address.telephone}}"/>
+        <fillField stepKey="fillStreetAddress1" selector="{{StorefrontCustomerAddressSection.streetAddress1}}" userInput="{{Address.street[0]}}"/>
+        <fillField stepKey="fillStreetAddress2" selector="{{StorefrontCustomerAddressSection.streetAddress2}}" userInput="{{Address.street[1]}}"/>
+        <fillField stepKey="fillCityName" selector="{{StorefrontCustomerAddressSection.city}}" userInput="{{Address.city}}"/>
+        <selectOption stepKey="selectState" selector="{{StorefrontCustomerAddressSection.stateProvince}}" userInput="{{Address.state}}"/>
+        <fillField stepKey="fillZip" selector="{{StorefrontCustomerAddressSection.zip}}" userInput="{{Address.postcode}}"/>
+        <selectOption stepKey="selectCounty" selector="{{StorefrontCustomerAddressSection.country}}" userInput="{{Address.country_id}}"/>
+        
+        <click stepKey="saveAddress" selector="{{StorefrontCustomerAddressSection.saveAddress}}"/>
+    </actionGroup>
+
+    <actionGroup name="SignUpNewCustomerStorefrontActionGroup" extends="SignUpNewUserFromStorefrontActionGroup">
+        <waitForPageLoad stepKey="waitForRegistered" after="clickCreateAccountButton"/>
+        <remove keyForRemoval="seeThankYouMessage" after="waitForRegistered"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml
new file mode 100644
index 0000000000000..de97bb47de796
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontCustomerLogoutActionGroup">
+        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="storefrontSignOut"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontSignOutActionGroup">
+        <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
+        <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You are signed out" stepKey="signOut"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
new file mode 100755
index 0000000000000..c7335f9024218
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomerAddressSimple" type="address">
+        <data key="id">0</data>
+        <data key="customer_id">12</data>
+        <requiredEntity type="region">CustomerRegionOne</requiredEntity>
+        <data key="region_id">0</data>
+        <data key="country_id">US</data>
+        <array key="street">
+            <item>7700 W Parmer Ln</item>
+            <item>Bld D</item>
+        </array>
+        <data key="company">Magento</data>
+        <data key="telephone">1234568910</data>
+        <data key="fax">1234568910</data>
+        <data key="postcode">78729</data>
+        <data key="city">Austin</data>
+        <data key="state">Texas</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="middlename">string</data>
+        <data key="prefix">Mr</data>
+        <data key="suffix">Sr</data>
+        <data key="vat_id">vatData</data>
+        <data key="default_shipping">true</data>
+        <data key="default_billing">true</data>
+        <data key="region_qty">66</data>
+    </entity>
+    <entity name="US_Address_TX" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>7700 West Parmer Lane</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="state">Texas</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78729</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="default_billing">Yes</data>
+        <data key="default_shipping">Yes</data>
+        <requiredEntity type="region">RegionTX</requiredEntity>
+    </entity>
+    <entity name="US_Address_NY" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">368</data>
+        <array key="street">
+            <item>368 Broadway St.</item>
+            <item>113</item>
+        </array>
+        <data key="city">New York</data>
+        <data key="state">New York</data>
+        <data key="country_id">US</data>
+        <data key="postcode">10001</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="default_billing">Yes</data>
+        <data key="default_shipping">Yes</data>
+        <requiredEntity type="region">RegionNY</requiredEntity>
+        <data key="country">United States</data>
+    </entity>
+    <entity name="US_Address_NY_Not_Default_Address" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">368</data>
+        <array key="street">
+            <item>368 Broadway St.</item>
+            <item>Apt. 113</item>
+        </array>
+        <data key="city">New York</data>
+        <data key="state">New York</data>
+        <data key="country_id">US</data>
+        <data key="postcode">10001</data>
+        <data key="telephone">512-345-6789</data>
+        <requiredEntity type="region">RegionNY</requiredEntity>
+        <data key="country">United States</data>
+    </entity>
+    <entity name="US_Address_CA" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>7700 West Parmer Lane</item>
+            <item>113</item>
+        </array>
+        <data key="city">Los Angeles</data>
+        <data key="state">California</data>
+        <data key="country_id">US</data>
+        <data key="postcode">90001</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="default_billing">Yes</data>
+        <data key="default_shipping">Yes</data>
+        <requiredEntity type="region">RegionCA</requiredEntity>
+    </entity>
+    <!--If required other field can be added to UK_Address entity, dont modify any existing data-->
+    <entity name="UK_Address" type="address">
+        <array key="street">
+        <item>7700 xyz street</item>
+        <item>113</item>
+        </array>
+        <data key="city">London</data>
+        <data key="country_id">GB</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="province">JS</data>
+    </entity>
+    <entity name="UK_Not_Default_Address" type="address">
+        <data key="firstname">Jane</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>172, Westminster Bridge Rd</item>
+        </array>
+        <data key="city">London</data>
+        <data key="postcode">SE1 7RW</data>
+        <data key="country_id">GB</data>
+        <data key="telephone">444-44-444-44</data>
+    </entity>
+    <entity name="US_Address_Utah" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>1234 Some Utah address</item>
+        </array>
+        <data key="city">Provo</data>
+        <data key="state">Utah</data>
+        <data key="country_id">US</data>
+        <data key="country">United States</data>
+        <data key="postcode">84001</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="default_billing">Yes</data>
+        <data key="default_shipping">Yes</data>
+        <requiredEntity type="region">RegionUT</requiredEntity>
+    </entity>
+    <entity name="UK_Simple_Address" extends="UK_Not_Default_Address">
+        <array key="street">
+            <item>172, Westminster Bridge Rd</item>
+            <item>7700 xyz street</item>
+        </array>
+        <data key="state">California</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
new file mode 100644
index 0000000000000..3cbd70d342824
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomerAccountSharingDefault" type="customer_account_sharing_config">
+        <requiredEntity type="account_share_scope_value">CustomerAccountSharingPerWebsite</requiredEntity>
+    </entity>
+    <entity name="CustomerAccountSharingPerWebsite" type="account_share_scope_value">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="CustomerAccountSharingGlobal" type="customer_account_sharing_config">
+        <requiredEntity type="account_share_scope_value">GlobalCustomerAccountSharing</requiredEntity>
+    </entity>
+    <entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml
new file mode 100644
index 0000000000000..60d8b13887ec9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigurationData.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SetCustomerCreateNewAccountOptionsConfig" type="customer_create_new_account_config">
+        <requiredEntity type="auto_group_assign">EnableAutomaticAssignmentCustomerGroup</requiredEntity>
+        <requiredEntity type="viv_on_each_transaction">EnableValidateEachTransaction</requiredEntity>
+        <requiredEntity type="vat_frontend_visibility">EnableShowVATNumberStorefront</requiredEntity>
+    </entity>
+    <entity name="EnableAutomaticAssignmentCustomerGroup" type="auto_group_assign">
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableValidateEachTransaction" type="viv_on_each_transaction">
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableShowVATNumberStorefront" type="vat_frontend_visibility">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="SetCustomerCreateNewAccountOptionsDefaultConfig" type="customer_create_new_account_config">
+        <requiredEntity type="auto_group_assign">DefaultAutomaticAssignmentCustomerGroup</requiredEntity>
+        <requiredEntity type="viv_on_each_transaction">DefaultValidateEachTransaction</requiredEntity>
+        <requiredEntity type="vat_frontend_visibility">DefaultShowVATNumberStorefront</requiredEntity>
+    </entity>
+    <entity name="DefaultAutomaticAssignmentCustomerGroup" type="auto_group_assign">
+        <data key="value">0</data>
+    </entity>
+    <entity name="DefaultValidateEachTransaction" type="viv_on_each_transaction">
+        <data key="value">0</data>
+    </entity>
+    <entity name="DefaultShowVATNumberStorefront" type="vat_frontend_visibility">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
new file mode 100644
index 0000000000000..44ac0981d9577
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomerEntityOne" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">defaultBillingValue</data>
+        <data key="default_shipping">defaultShippingValue</data>
+        <data key="confirmation">confirmationData</data>
+        <data key="created_at">12:00</data>
+        <data key="updated_at">12:00</data>
+        <data key="created_in">createdInData</data>
+        <data key="dob">01-01-1970</data>
+        <data key="email" unique="prefix">test@email.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="middlename">S</data>
+        <data key="password">pwdTest123!</data>
+        <data key="prefix">Mr</data>
+        <data key="suffix">Sr</data>
+        <data key="gender">0</data>
+        <data key="store_id">0</data>
+        <data key="taxvat">taxValue</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">CustomerAddressSimple</requiredEntity>
+        <data key="disable_auto_group_change">0</data>
+        <!--requiredEntity type="extension_attribute">ExtensionAttributeSimple</requiredEntity-->
+    </entity>
+    <entity name="Simple_US_Customer" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_TX</requiredEntity>
+    </entity>
+    <entity name="Simple_US_Customer_Multiple_Addresses" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_NY</requiredEntity>
+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
+    </entity>
+    <entity name="Simple_US_Customer_Multiple_Addresses_No_Default_Address" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
+    </entity>
+    <entity name="Simple_US_Customer_NY" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_NY</requiredEntity>
+    </entity>
+    <entity name="Simple_US_Customer_CA" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_CA</requiredEntity>
+    </entity>
+    <entity name="Simple_US_Customer_For_Update" type="customer">
+        <var key="id" entityKey="id" entityType="customer"/>
+        <data key="firstname">Jane</data>
+    </entity>
+    <entity name="Simple_US_CA_Customer" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_CA</requiredEntity>
+    </entity>
+    <entity name="Simple_US_Utah_Customer" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_Utah</requiredEntity>
+    </entity>
+    <entity name="Simple_GB_Customer" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">Jane.Doe@example.com</data>
+        <data key="firstname">Jane</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">Jane Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
new file mode 100644
index 0000000000000..c1f11c9e9c390
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="GeneralCustomerGroup" type="customerGroup">
+        <data key="code">General</data>
+        <data key="tax_class_id">3</data>
+        <data key="tax_class_name">Retail Customer</data>
+    </entity>
+    <entity name="DefaultCustomerGroup" type="customerGroup">
+        <array key="group_names">
+            <item>General</item>
+        </array>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml b/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
new file mode 100644
index 0000000000000..90540251877d5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ExtensionAttributeSimple" type="extension_attribute">
+        <data key="is_subscribed">true</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
new file mode 100644
index 0000000000000..280bae7de411a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomerRegionOne" type="region">
+        <data key="region_code">100</data>
+        <data key="region_id">12</data>
+    </entity>
+    <entity name="RegionTX" type="region">
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">57</data>
+    </entity>
+    <entity name="RegionCA" type="region">
+        <data key="region">California</data>
+        <data key="region_code">CA</data>
+        <data key="region_id">12</data>
+    </entity>
+    <entity name="RegionNY" type="region">
+        <data key="region">New York</data>
+        <data key="region_code">NY</data>
+        <data key="region_id">43</data>
+    </entity>
+    <entity name="RegionUT" type="region">
+        <data key="region">Utah</data>
+        <data key="region_code">UT</data>
+        <data key="region_id">58</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE.txt b/app/code/Magento/Customer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE.txt
rename to app/code/Magento/Customer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE_AFL.txt b/app/code/Magento/Customer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE_AFL.txt
rename to app/code/Magento/Customer/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/address-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/address-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
index 6c2b1c002ff99..10f63a5a2a820 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/address-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateAddress" dataType="address" type="create">
         <field key="region">region</field>
         <field key="country_id">string</field>
@@ -59,4 +59,4 @@
             <value>custom_attribute</value>
         </array>
     </operation>
-</config>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
index 908b5daa9cc61..0d8aeb6614bf4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
@@ -6,8 +6,8 @@
   */
 -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCustomer" dataType="customer" type="create" auth="adminOauth" url="/V1/customers" method="POST">
         <contentType>application/json</contentType>
         <object dataType="customer" key="customer">
@@ -44,4 +44,4 @@
     <operation name="DeleteCustomer" dataType="customer" type="delete" auth="adminOauth" url="/V1/customers/{id}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
new file mode 100644
index 0000000000000..41701bfac11ad
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CustomerAccountShareConfig" dataType="customer_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
+               successRegex="/messages-message-success/" returnRegex="" method="POST">
+        <object key="groups" dataType="customer_account_sharing_config">
+            <object key="account_share" dataType="customer_account_sharing_config">
+                <object key="fields" dataType="customer_account_sharing_config">
+                    <object key="scope" dataType="account_share_scope_value">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml
new file mode 100644
index 0000000000000..89ed477cb32d1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_create_new_account-meta.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CustomerCreateNewAccountOptionsConfigState" dataType="customer_create_new_account_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/" method="POST">
+        <object key="groups" dataType="customer_create_new_account_config">
+            <object key="create_account" dataType="customer_create_new_account_config">
+                <object key="fields" dataType="customer_create_new_account_config">
+                    <object key="auto_group_assign" dataType="auto_group_assign">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="viv_on_each_transaction" dataType="viv_on_each_transaction">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="vat_frontend_visibility" dataType="vat_frontend_visibility">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
new file mode 100644
index 0000000000000..06c7b74aef002
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
+        <field key="is_subscribed">boolean</field>
+        <field key="extension_attribute">customer_nested_extension_attribute</field>
+    </operation>
+    <operation name="UpdateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="update">
+        <field key="is_subscribed">boolean</field>
+        <field key="extension_attribute">customer_nested_extension_attribute</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
new file mode 100644
index 0000000000000..a2741b7817b16
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateNestedExtensionAttribute" dataType="customer_nested_extension_attribute" type="create">
+        <field key="id">integer</field>
+        <field key="customer_id">integer</field>
+        <field key="value">string</field>
+    </operation>
+    <operation name="UpdateNestedExtensionAttribute" dataType="customer_nested_extension_attribute" type="update">
+        <field key="id">integer</field>
+        <field key="customer_id">integer</field>
+        <field key="value">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
new file mode 100644
index 0000000000000..5c21c5318e58b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateRegion" dataType="region" type="create">
+        <field key="region_code">string</field>
+        <field key="region">string</field>
+        <field key="region_id">string</field>
+        <field key="extension_attributes">extension_attributes</field>
+    </operation>
+    <operation name="UpdateRegion" dataType="region" type="update">
+        <field key="region_code">string</field>
+        <field key="region">string</field>
+        <field key="region_id">string</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml
new file mode 100644
index 0000000000000..282f9bb6fdeb5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCustomerConfigPage" url="admin/system_config/edit/section/customer/{{tabLink}}" area="admin" parameterized="true" module="Magento_Customer">
+        <section name="AdminCustomerConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml
new file mode 100644
index 0000000000000..9adda6a74ba99
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCustomerGroupPage" url="/customer/group/" area="admin" module="Magento_Customer">
+        <section name="AdminCustomerGroupMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupsIndexPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupsIndexPage.xml
new file mode 100644
index 0000000000000..5981fb7c907c3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerGroupsIndexPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCustomerGroupsIndexPage" url="/customer/group/" area="admin" module="Magento_Customer">
+        <section name="AdminCustomerGroupGridActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
new file mode 100644
index 0000000000000..114c737e361ed
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Magento_Customer">
+        <section name="AdminCustomerGridMainActionsSection"/>
+        <section name="AdminCustomerMessagesSection"/>
+        <section name="AdminCustomerGridSection"/>
+        <section name="AdminCustomerFiltersSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
new file mode 100644
index 0000000000000..d662c5cef6032
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminEditCustomerPage" url="/customer/index/edit/id/{{var1}}" area="admin" module="Magento_Customer" parameterized="true">
+        <section name="AdminCustomerAccountInformationSection"/>
+        <section name="AdminCustomerAddressesGridSection"/>
+        <section name="AdminCustomerAddressesGridActionsSection"/>
+        <section name="AdminCustomerAddressesSection"/>
+        <section name="AdminCustomerMainActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml
new file mode 100644
index 0000000000000..2c52b3ec05c2e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerGroupPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewCustomerGroupPage" url="/customer/group/new/" area="admin" module="Magento_Customer">
+        <section name="AdminNewCustomerGroupSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
new file mode 100644
index 0000000000000..57a30d6f98921
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewCustomerPage" url="/customer/index/new" area="admin" module="Magento_Customer">
+        <section name="AdminCustomerAccountInformationSection"/>
+        <section name="AdminCustomerMainActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressesPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressesPage.xml
new file mode 100644
index 0000000000000..b9bede5133060
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressesPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerAddressesPage" url="/customer/address/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerAddressesSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
new file mode 100644
index 0000000000000..e2ebf638934c6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerCreatePage" url="/customer/account/create/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerCreateFormSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
new file mode 100644
index 0000000000000..eaca1c820e49e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerDashboardPage" url="/customer/account/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerDashboardAccountInformationSection" />
+        <section name="StorefrontCustomerSidebarSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml
new file mode 100644
index 0000000000000..b3cea8f2c2939
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerLogoutPage" url="customer/account/logout/" area="storefront" module="Magento_Customer"/>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
new file mode 100644
index 0000000000000..05c4c71a61e94
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerOrderPage" url="sales/order/view/order_id/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerOrderViewSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
new file mode 100644
index 0000000000000..2305bd3a9b82f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerOrderViewPage" url="sales/order/view/order_id/{{var1}}" area="storefront" module="Magento_Customer" parameterized="true">
+        <section name="StorefrontCustomerOrderSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
new file mode 100644
index 0000000000000..0d4fef8f6e967
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerSignInPage" url="/customer/account/login/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerSignInFormSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
new file mode 100644
index 0000000000000..a466ceab2f7ed
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontHomePage" url="/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontPanelHeader" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/README.md b/app/code/Magento/Customer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f9fe1cd5b4a39
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Functional Tests
+
+The Functional Test Module for **Magento Customer** module.
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..d5a410164a6f1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAccountInformationSection">
+        <element name="statusInactive" type="button" selector=".admin__actions-switch-label"/>
+        <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
+        <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>
+        <element name="addressesButton" type="select" selector="//a//span[contains(text(), 'Addresses')]"/>
+        <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
+        <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
+        <element name="email" type="input" selector="input[name='customer[email]']"/>
+        <element name="group" type="select" selector="[name='customer[group_id]']"/>
+        <element name="groupValue" type="button" selector="//span[text()='{{groupValue}}']" parameterized="true"/>
+        <element name="associateToWebsite" type="select" selector="//select[@name='customer[website_id]']"/>
+        <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
+        <element name="saveCustomerAndContinueEdit" type="button" selector="//button[@title='Save and Continue Edit']"/>
+        <element name="storeView" type="select" selector="//select[@name='customer[sendemail_store_id]']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
new file mode 100644
index 0000000000000..b9a3839ff9894
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressFiltersSection">
+        <element name="filtersButton" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="firstnameInput" type="input" selector="input[name=firstname]"/>
+        <element name="lastnameInput" type="input" selector="input[name=lastname]"/>
+        <element name="streetInput" type="input" selector="input[name=street]"/>
+        <element name="cityInput" type="input" selector="input[name=city]"/>
+        <element name="stateSelector" type="select" selector="input[name=input]"/>
+        <element name="postcodeInput" type="input" selector="input[name=postcode]"/>
+        <element name="countryInput" type="input" selector="select[name=country_id]"/>
+        <element name="telephoneInput" type="input" selector="input[name=telephone]"/>
+        <element name="applyFilter" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml
new file mode 100644
index 0000000000000..f226d49e3bf54
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerGridMainActionsSection">
+        <element name="addNewAddress" type="button" selector=".add-new-address-button" timeout="30"/>
+        <element name="actions" type="text" selector=".admin__data-grid-header-row .action-select"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
new file mode 100644
index 0000000000000..fb153a7c102a5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressGridSection">
+        <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
+        <element name="firstRowSelectActionLink" type="text" selector="tr[data-repeat-index='0'] .action-select" timeout="30"/>
+        <element name="firstRowEditActionLink" type="text" selector="tr[data-repeat-index='0'] [data-action='item-edit']" timeout="30"/>
+
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultBillingSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultBillingSection.xml
new file mode 100644
index 0000000000000..a85c12fda1064
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultBillingSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressesDefaultBillingSection">
+        <element name="addressDetails" type="text" selector="//div[@class='customer-default-billing-address-content']//div[@class='address_details']"/>
+        <element name="address" type="text" selector="//div[@class='customer-default-billing-address-content']//address//span"/>
+        <element name="editButton" type="text" selector="//button[@data-index='edit_billing_address']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultShippingSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultShippingSection.xml
new file mode 100644
index 0000000000000..610bb16874b8a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesDefaultShippingSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressesDefaultShippingSection">
+        <element name="addressDetails" type="text" selector="//div[@class='customer-default-shipping-address-content']//div[@class='address_details']"/>
+        <element name="address" type="text" selector="//div[@class='customer-default-shipping-address-content']//address//span"/>
+        <element name="editButton" type="text" selector="//button[@data-index='edit_shipping_address']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
new file mode 100644
index 0000000000000..d8d93814333ca
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressesGridActionsSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
+        <element name="actions" type="text" selector="//div[@class='admin__data-grid-header']//button[@class='action-select']"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
new file mode 100644
index 0000000000000..85c086d01848b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressesGridSection">
+        <element name="customerAddressGrid" type="text" selector="table[data-role='grid']"/>
+        <element name="firstRowSelectLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//button[@class='action-select']"/>
+        <element name="firstRowEditLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-edit')]" timeout="30"/>
+        <element name="firstRowSetAsDefaultBillingLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-setDefaultBilling')]" timeout="30"/>
+        <element name="firstRowSetAsDefaultShippingLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-setDefaultShipping')]" timeout="30"/>
+        <element name="firstRowDeleteLink" type="text" selector="//tr[contains(@data-repeat-index, '0')]//a[contains(@data-action,'item-delete')]" timeout="30"/>
+        <element name="firstRowCheckbox" type="checkbox" selector="//tr[contains(@data-repeat-index, '0')]//input[contains(@data-action, 'select-row')]"/>
+        <element name="secondRowCheckbox" type="checkbox" selector="//tr[contains(@data-repeat-index, '1')]//input[contains(@data-action, 'select-row')]"/>
+        <element name="checkboxByName" type="checkbox" selector="//div[contains(text(),'{{customer}}')]/ancestor::tr[contains(@class, 'data-row')]//input[@class='admin__control-checkbox']" parameterized="true" />
+        <element name="rowsInGrid" type="text" selector="//tr[contains(@class,'data-row')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
new file mode 100644
index 0000000000000..8068f94032730
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressesSection">
+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
+        <element name="defaultBillingAddress" type="button" selector="div[data-index=default_billing] .admin__actions-switch-label"/>
+        <element name="defaultBillingAddressCheckBox" type="input" selector="//div[@class='admin__field-control']//input[@name='default_billing']"/>
+        <element name="defaultShippingAddress" type="button" selector="div[data-index=default_shipping] .admin__actions-switch-label"/>
+        <element name="defaultShippingAddressCheckBox" type="input" selector="//div[@class='admin__field-control']//input[@name='default_shipping']"/>
+        <element name="firstNameForAddress" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'firstname')]"/>
+        <element name="lastNameForAddress" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'lastname')]"/>
+        <element name="streetAddress" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'street')]"/>
+        <element name="city" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'city')]"/>
+        <element name="company" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'company')]"/>
+        <element name="region" type="select" selector="//div[@class='admin__field-control']//select[@name='region_id']"/>
+        <element name="regionId" type="select" selector="//div[@class='admin__field-control']//select[@name='region_id']//option[@data-title='{{regionName}}']" parameterized="true"/>
+        <element name="country" type="select" selector="//div[@class='admin__field-control']//select[contains(@name, 'country_id')]"/>
+        <element name="countryId" type="input" selector="//div[@class='admin__field-control']//select[contains(@name, 'country_id')]//option[@value='{{countryName}}']" parameterized="true"/>
+        <element name="state" type="select" selector="//div[@class='admin__field-control']//select[contains(@name, 'region_id')]"/>
+        <element name="zip" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'postcode')]"/>
+        <element name="phoneNumber" type="input" selector="//div[@class='admin__field-control']//input[contains(@name, 'telephone')]"/>
+        <element name="saveAddress" type="button" selector="//button[@title='Save']"/>
+        <element name="customerAddressRow" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="deleteButton" type="button" selector="//button[@id='delete']"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
new file mode 100644
index 0000000000000..9e104eb52cf90
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerConfigSection">
+        <element name="customerDataLifetime" type="input" selector="#customer_online_customers_section_data_lifetime"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
new file mode 100644
index 0000000000000..02d9bc2eb5f12
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerFiltersSection">
+        <element name="customerStatus" type="button" selector="select[name='status']"/>
+        <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
+        <element name="nameInput" type="input" selector="input[name=name]"/>
+        <element name="emailInput" type="input" selector="input[name=email]"/>
+        <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="clearAllFilters" type="text" selector=".admin__current-filters-actions-wrap.action-clear"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
new file mode 100755
index 0000000000000..d644b581088bc
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerGridMainActionsSection">
+        <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
+        <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
+        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
+        <element name="actions" type="text" selector=".action-select"/>
+        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
new file mode 100644
index 0000000000000..d9d3bfe7f737c
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerGridSection">
+        <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
+        <element name="firstRowEditLink" type="text" selector="tr[data-repeat-index='0'] .action-menu-item" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml
new file mode 100644
index 0000000000000..391292ca7fa31
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerGroupGridActionsSection">
+        <element name="selectButton" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" timeout="30" parameterized="true"/>
+        <element name="deleteAction" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" timeout="30" parameterized="true"/>
+        <element name="actionsMenuButton" type="text" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='{{selectItem}}']" timeout="30" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
new file mode 100644
index 0000000000000..1fdb15f189ace
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerGroupMainSection">
+        <element name="filterBtn" type="button" selector="//button[text()='Filters']"/>
+        <element name="groupField" type="input" selector="//*[@name='customer_group_code']"/>
+        <element name="applyFiltersBtn" type="button" selector="//*[text()='Apply Filters']"/>
+        <element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
+        <element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
+        <element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
new file mode 100644
index 0000000000000..3ff880c64e6d6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerMainActionsSection">
+        <element name="saveButton" type="button" selector="#save" timeout="30"/>
+        <element name="resetPassword" type="button" selector="#resetPassword" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
new file mode 100644
index 0000000000000..b11142fd1ce2e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerMessagesSection">
+        <element name="successMessage" type="text" selector=".message-success"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
new file mode 100644
index 0000000000000..f5bbb84eaa593
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditCustomerInformationSection">
+        <element name="orders" type="button" selector="#tab_orders_content" timeout="30"/>
+        <element name="addresses" type="button" selector="//a[@id='tab_address']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
new file mode 100644
index 0000000000000..89fed43184b84
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditCustomerOrdersSection">
+        <element name="orderGrid" type="text" selector="#customer_orders_grid_table"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml
new file mode 100644
index 0000000000000..ec4a64b01467b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminNewCustomerGroupSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewCustomerGroupSection">
+        <element name="groupName" type="input" selector="#customer_group_code"/>
+        <element name="taxClass" type="select" selector="#tax_class_id"/>
+        <element name="saveCustomerGroup" type="button" selector="#save"/>
+        <element name="resetBtn" type="button" selector="#reset"/>
+        <element name="backBtn" type="button" selector="#back"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StoreFrontSignOutSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StoreFrontSignOutSection.xml
new file mode 100644
index 0000000000000..29c1c9c01be70
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StoreFrontSignOutSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StoreFrontSignOutSection">
+        <element name="customerAccount" type="button" selector=".customer-name"/>
+        <element name="signOut" type="button" selector="div.customer-menu  li.authorization-link"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
new file mode 100644
index 0000000000000..05bbc559defac
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerAddressesSection">
+        <element name="addressesList" type="text" selector=".block-addresses-list" />
+        <element name="deleteAdditionalAddress" type="button" selector="//ol[@class='items addresses']/li[@class='item'][{{var}}]//a[@class='action delete']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
new file mode 100644
index 0000000000000..2b5662cdd623e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerCreateFormSection">
+        <element name="firstnameField" type="input" selector="#firstname"/>
+        <element name="lastnameField" type="input" selector="#lastname"/>
+        <element name="emailField" type="input" selector="#email_address"/>
+        <element name="passwordField" type="input" selector="#password"/>
+        <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
+        <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
new file mode 100644
index 0000000000000..70d1bb6675db5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerDashboardAccountInformationSection">
+        <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
+    </section>
+    <section name="StorefrontCustomerAddressSection">
+        <element name="firstName" type="input" selector="#firstname"/>
+        <element name="lastName" type="input" selector="#lastname"/>
+        <element name="company" type="input" selector="#company"/>
+        <element name="phoneNumber" type="input" selector="#telephone"/>
+        <element name="streetAddress1" type="input" selector="#street_1"/>
+        <element name="streetAddress2" type="input" selector="#street_2"/>
+        <element name="city" type="input" selector="#city"/>
+        <element name="stateProvince" type="select" selector="#region_id"/>
+        <element name="zip" type="input" selector="#zip"/>
+        <element name="country" type="select" selector="#country"/>
+        <element name="saveAddress" type="button" selector="[data-action='save-address']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
new file mode 100644
index 0000000000000..e8b11b27ddc70
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerOrderSection">
+        <element name="isMyOrdersSection" type="text" selector="//*[@class='page-title']//*[contains(text(), 'My Orders')]"/>
+        <element name="productCustomOptions" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[normalize-space(.)='{{var3}}']" parameterized="true"/>
+        <element name="productCustomOptionsFile" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[contains(.,'{{var3}}')]" parameterized="true"/>
+        <element name="productCustomOptionsLink" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd//a[text() = '{{var3}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
new file mode 100644
index 0000000000000..f831aabddd4ee
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerOrderViewSection">
+        <element name="reorder" type="text" selector="a.action.order" timeout="30"/>
+        <element name="orderTitle" type="text" selector=".page-title span"/>
+        <element name="myOrdersTable" type="text" selector="#my-orders-table"/>
+        <element name="subtotal" type="text" selector=".subtotal .amount"/>
+        <element name="paymentMethod" type="text" selector=".payment-method dt"/>
+        <element name="printOrderLink" type="text" selector="a.action.print" timeout="30"/>
+        <element name="shippingAddress" type="text" selector=".box.box-order-shipping-address"/>
+        <element name="billingAddress" type="text" selector=".box.box-order-billing-address"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
new file mode 100644
index 0000000000000..7482193031091
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerSidebarSection">
+        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{var1}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
new file mode 100644
index 0000000000000..25c07ca9cb3c9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerSignInFormSection">
+        <element name="emailField" type="input" selector="#email"/>
+        <element name="passwordField" type="input" selector="#pass"/>
+        <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
+    </section>
+    <section name="StorefrontCustomerSignInPopupFormSection">
+        <element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>
+        <element name="email" type="input" selector="#customer-email"/>
+        <element name="password" type="input" selector="#pass"/>
+        <element name="signIn" type="button" selector="#send2" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
new file mode 100644
index 0000000000000..a0c83f5bc491b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontPanelHeaderSection">
+        <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
+        <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)" timeout="30"/>
+        <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
new file mode 100644
index 0000000000000..01f35439f23b8
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AddingProductWithExpiredSessionTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AddingProductWithExpiredSessionTest">
+        <annotations>
+            <title value="Adding a product to cart from category page with an expired session"/>
+            <description value="Adding a product to cart from category page with an expired session"/>
+            <features value="Module/ Catalog"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93289"/>
+            <stories value="MAGETWO-66666: Adding a product to cart from category page with an expired session does not allow product to be added"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!--Navigate to a category page -->
+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Remove PHPSESSID and form_key to replicate an expired session-->
+        <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+        <resetCookie userInput="form_key" stepKey="resetCookieForCart2"/>
+
+        <!-- "Add to Cart" any product-->
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
+        <see stepKey="assertErrorMessage" userInput="Your session has expired"/>
+        <after>
+            <!--Delete created product-->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
new file mode 100644
index 0000000000000..fba7ebd2d4d5e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddNewDefaultBillingShippingCustomerAddressTest">
+        <annotations>
+            <stories value="Add new default billing/shipping customer address"/>
+            <title value="Add new default billing/shipping customer address"/>
+            <description value="Add new default billing/shipping customer address on customer addresses tab"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94814"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses_No_Default_Address" stepKey="customer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customers.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <seeElement selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="seeDefaultBillingAddressSectionBeforeChangingDefaultAddress"/>
+        <see userInput="The customer does not have default billing address" selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="assertThereIsNoDefaultBillingAddressSet"/>
+        <seeElement selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="seeDefaultShippingAddressSectionBeforeChangingDefaultAddress"/>
+        <see userInput="The customer does not have default shipping address" selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="assertThereIsNoDefaultShippingAddressSet"/>
+        <click selector="{{AdminCustomerAddressesSection.addNewAddress}}" stepKey="clickAddNewAddressButton"/>
+        <waitForPageLoad stepKey="waitForAddUpdateCustomerAddressForm"/>
+        <!--Step4. Fill all the fields with test data and press *Save* button-->
+        <click selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="enableDefaultBillingAddress"/>
+        <click selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}" stepKey="enableDefaultShippingAddress"/>
+        <fillField userInput="{{US_Address_TX.firstname}}" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{US_Address_TX.lastname}}" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" stepKey="fillLastName"/>
+        <fillField userInput="{{US_Address_TX.company}}" selector="{{AdminCustomerAddressesSection.company}}" stepKey="fillCompany"/>
+        <fillField userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesSection.streetAddress}}" stepKey="fillStreet"/>
+        <fillField userInput="{{US_Address_TX.city}}" selector="{{AdminCustomerAddressesSection.city}}" stepKey="fillCity"/>
+        <click selector="{{AdminCustomerAddressesSection.country}}" stepKey="clickCountryToOpenListOfCountries"/>
+        <click selector="{{AdminCustomerAddressesSection.countryId(US_Address_TX.country_id)}}" stepKey="fillCountry"/>
+        <fillField userInput="{{US_Address_TX.postcode}}" selector="{{AdminCustomerAddressesSection.zip}}" stepKey="fillPostcode"/>
+        <fillField userInput="{{US_Address_TX.telephone}}" selector="{{AdminCustomerAddressesSection.phoneNumber}}" stepKey="fillTelephone"/>
+        <click selector="{{AdminCustomerAddressesSection.region}}" stepKey="clickRegionToOpenListOfRegions"/>
+        <click selector="{{AdminCustomerAddressesSection.regionId(US_Address_TX.state)}}" stepKey="fillRegion"/>
+        <click selector="{{AdminCustomerAddressesSection.saveAddress}}" stepKey="clickSaveCustomerAddressOnAddUpdateAddressForm"/>
+        <waitForPageLoad stepKey="waitForNewAddressIsCreated"/>
+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsChanged"/>
+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsChanged"/>
+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultBillingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultBillingIsEnabledCustomerAddressAddUpdateForm"/>
+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultShippingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultShippingIsEnabledOnCustomerAddressAddUpdateForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
new file mode 100644
index 0000000000000..78bae7ad60dd8
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Create a Customer via the Admin"/>
+            <title value="Admin should be able to create a customer"/>
+            <description value="Admin should be able to create a customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-72095"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <waitForPageLoad stepKey="waitForLoad1"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForLoad2"/>
+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
new file mode 100644
index 0000000000000..4f501c27352bf
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteCustomerAddressesFromTheGridTest">
+        <annotations>
+            <title value="Admin delete customer addresses from the grid"/>
+            <description value="Admin delete customer addresses from the grid"/>
+            <features value="Module/ Customer"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94850"/>
+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customerts.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <!--Step4. Click *Select* link in *Actions* column for target additional address-->
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickOnSelectLinkInFirstRow"/>
+        <!--Step5. Click *Delete*-->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowDeleteLink}}" stepKey="chooseDeleteOptionInFirstRow"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad1"/>
+        <!--Step6. Press *Ok* button on the pop-up-->
+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad2"/>
+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
+        <!--Step7. Delete last customer address-->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickOnSelectLinkInFirstRow2"/>
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowDeleteLink}}" stepKey="chooseDeleteOptionInFirstRow2"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad3"/>
+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup2"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad4"/>
+        <see userInput="We couldn't find any records." selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" stepKey="checkThatCustomerAddressesGridHasNoRecords"/>
+</test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
new file mode 100644
index 0000000000000..a703c5a7c5d92
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest">
+        <annotations>
+            <title value="Admin delete customer addresses from the grid via mass actions"/>
+            <description value="Admin delete customer addresses from the grid via mass actions"/>
+            <features value="Module/ Customer"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94951"/>
+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customerts.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <!-- -
+        Step4. Check checkboxes for several addresses open *Actions* dropdown at the top of addresses grid and select action *Delete*
+        Step5. Press *Ok* button on the pop-up
+        <!- -->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowCheckbox}}" stepKey="tickFirstRowCustomerAddressCheckbox"/>
+        <click selector="{{AdminCustomerAddressesGridSection.secondRowCheckbox}}" stepKey="tickSecondRowCustomerAddressCheckbox"/>
+        <click selector="{{AdminCustomerAddressesGridActionsSection.actions}}" stepKey="openActionsDropdown"/>
+        <click selector="{{AdminCustomerAddressesGridActionsSection.delete}}" stepKey="chooseDeleteOption"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad1"/>
+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad2"/>
+        <see userInput="We couldn't find any records." selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" stepKey="checkThatCustomerAddressesGridHasNoRecords"/>
+</test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
new file mode 100644
index 0000000000000..bb455677d5e94
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteDefaultBillingCustomerAddressTest">
+        <annotations>
+            <title value="Admin delete default billing customer address"/>
+            <description value="Admin delete default billing customer address"/>
+            <features value="Module/ Customer"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94816"/>
+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customers.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
+        </actionGroup>
+        <!--Step3. Open *Addresses* tab on edit customer page and click *edit* link near *Default Billing Address* block-->
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <seeNumberOfElements userInput="2" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeTwoCustomerAddressesInGrid"/>
+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditNearDefaultBillingAddress"/>
+        <waitForPageLoad stepKey="waitForDefaultBillingAddressPopupLoad"/>
+        <!--Step4. Press *Delete* button-->
+        <click selector="{{AdminCustomerAddressesSection.deleteButton}}" stepKey="clickDeleteButton"/>
+        <waitForPageLoad stepKey="waitForConfirmationPopupLoad"/>
+        <click selector="{{AdminCustomerAddressesSection.ok}}" stepKey="clickOkOnPopup"/>
+        <waitForPageLoad stepKey="waitForDefaultBillingAddressPopupLoad2"/>
+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
+        <dontSee userInput="{{US_Address_NY.street[0]}}" stepKey="assertDefaultBillingIsSet"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
new file mode 100644
index 0000000000000..df317c8bf7012
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEditDefaultBillingShippingCustomerAddressTest">
+        <annotations>
+            <stories value="Edit default billing/shipping customer address"/>
+            <title value="Edit default billing/shipping customer address"/>
+            <description value="Edit default billing/shipping customer address on customer addresses tab"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94815"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="customer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customers.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <seeElement selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="seeDefaultBillingAddressSectionBeforeChangingDefaultAddress"/>
+        <see userInput="{{US_Address_NY.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsSetBeforeChangingDefaultAddress"/>
+        <seeElement selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="seeDefaultShippingAddressSectionBeforeChangingDefaultAddress"/>
+        <see userInput="{{US_Address_NY.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsSetBeforeChangingDefaultAddress"/>
+        <click selector="{{AdminCustomerAddressesSection.addNewAddress}}" stepKey="clickAddNewAddressButton"/>
+        <waitForPageLoad stepKey="waitForAddUpdateCustomerAddressForm"/>
+        <!--Step4. Fill all the fields with test data and press *Save* button-->
+        <click selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="enableDefaultBillingAddress"/>
+        <click selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}" stepKey="enableDefaultShippingAddress"/>
+        <fillField userInput="{{US_Address_TX.firstname}}" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{US_Address_TX.lastname}}" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" stepKey="fillLastName"/>
+        <fillField userInput="{{US_Address_TX.company}}" selector="{{AdminCustomerAddressesSection.company}}" stepKey="fillCompany"/>
+        <fillField userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesSection.streetAddress}}" stepKey="fillStreet"/>
+        <fillField userInput="{{US_Address_TX.city}}" selector="{{AdminCustomerAddressesSection.city}}" stepKey="fillCity"/>
+        <click selector="{{AdminCustomerAddressesSection.country}}" stepKey="clickCountryToOpenListOfCountries"/>
+        <click selector="{{AdminCustomerAddressesSection.countryId(US_Address_TX.country_id)}}" stepKey="fillCountry"/>
+        <fillField userInput="{{US_Address_TX.postcode}}" selector="{{AdminCustomerAddressesSection.zip}}" stepKey="fillPostcode"/>
+        <fillField userInput="{{US_Address_TX.telephone}}" selector="{{AdminCustomerAddressesSection.phoneNumber}}" stepKey="fillTelephone"/>
+        <click selector="{{AdminCustomerAddressesSection.region}}" stepKey="clickRegionToOpenListOfRegions"/>
+        <click selector="{{AdminCustomerAddressesSection.regionId(US_Address_TX.state)}}" stepKey="fillRegion"/>
+        <click selector="{{AdminCustomerAddressesSection.saveAddress}}" stepKey="clickSaveCustomerAddressOnAddUpdateAddressForm"/>
+        <waitForPageLoad stepKey="waitForNewAddressIsCreated"/>
+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsChanged"/>
+        <see userInput="{{US_Address_TX.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsChanged"/>
+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultBillingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultBillingIsEnabledCustomerAddressAddUpdateForm"/>
+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultShippingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultShippingIsEnabledOnCustomerAddressAddUpdateForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
new file mode 100644
index 0000000000000..fb67838e941b6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminResetCustomerPasswordTest">
+        <annotations>
+            <stories value="Reset password"/>
+            <title value="Admin should be able to reset customer password"/>
+            <description value="Admin should be able to reset customer password"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-30875"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Edit customer info-->
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <click selector="{{AdminCustomerMainActionsSection.resetPassword}}" stepKey="resetPassword"/>
+        <see userInput="The customer will receive an email with a link to reset password." stepKey="messageThatLinkToPasswordResetIsSent"/>
+    </test>
+</tests>
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
new file mode 100644
index 0000000000000..9f1c5e8cd923a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSearchCustomerAddressByKeywordTest">
+        <annotations>
+            <title value="Admin search customer address by keyword"/>
+            <description value="Admin search customer address by keyword"/>
+            <features value="Module/ Customer"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94954"/>
+            <stories value="MAGETWO-94346: Implement handling of large number of addresses on admin edit customer page"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customerts.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <!--Step4. Fill *Search by keyword* filed with the query and press enter or clock on the magnifier icon-->
+        <fillField userInput="{{US_Address_NY.street[0]}}" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="FillCustomerAddressStreetInSearchByKeyword"/>
+        <pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="pressEnterKey"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
new file mode 100644
index 0000000000000..db8d4e1ee1eea
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSetCustomerDefaultBillingAddressTest">
+        <annotations>
+            <stories value="Set customer default billing address"/>
+            <title value="Admin should be able to set customer default billing address"/>
+            <description value="Admin should be able to set customer default billing address from customer addresses grid row actions"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94952"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses_No_Default_Address" stepKey="customer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customers.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <fillField userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="fillCustomerAddressStreetInSearchByKeyword"/>
+        <pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="pressEnterKey"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
+        <see userInput="The customer does not have default billing address" selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="assertThatThereIsNoDefaultBillingAddress"/>
+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
+        <!--Step4. Click *Select* link in *Actions* column for target additional address-->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickSelectElementFromRow" />
+        <!--Step4. Click *Set as default billing*-->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSetAsDefaultBillingLink}}" stepKey="clickOnSetAddressAsDefaultBilling"/>
+        <!--Step5. Press *Ok* button on the pop-up-->
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmSetAddressAsDefaultBilling"/>
+        <seeElement selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="seeDefaultBillingAddressSection"/>
+        <see userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="assertDefaultBillingAddressIsSet"/>
+        <click selector="{{AdminCustomerAddressesDefaultBillingSection.editButton}}" stepKey="clickEditDefaultBillingAddress"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultBillingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultBillingCheckboxIsCheckedOnCustomerAddressAddUpdateForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
new file mode 100644
index 0000000000000..6e83218176904
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSetCustomerDefaultShippingAddressTest">
+        <annotations>
+            <stories value="Set customer default shipping address"/>
+            <title value="Admin should be able to set customer default shipping address"/>
+            <description value="Admin should be able to set customer default shipping address from customer addresses grid row actions"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94953"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses_No_Default_Address" stepKey="customer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- -
+        Step1. Login to admin and go to Customers > All Customers.
+        Step2. On *Customers* page choose customer from preconditions and open it to edit
+        Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
+        <!- -->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
+            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
+        </actionGroup>
+        <click selector="{{AdminEditCustomerInformationSection.addresses}}" stepKey="openAddressesTab"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <fillField userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="fillCustomerAddressStreetInSearchByKeyword"/>
+        <pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCustomerAddressesGridActionsSection.search}}" stepKey="pressEnterKey"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
+        <see userInput="The customer does not have default shipping address" selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="assertThatThereIsNoDefaultShippingAddress"/>
+        <seeNumberOfElements userInput="1" selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" stepKey="seeOnlyOneCustomerAddressesInGrid"/>
+        <!--Step4. Click *Select* link in *Actions* column for target additional address-->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSelectLink}}" stepKey="clickSelectElementFromRow" />
+        <!--Step4. Click *Set as default shipping*-->
+        <click selector="{{AdminCustomerAddressesGridSection.firstRowSetAsDefaultShippingLink}}" stepKey="clickOnSetAddressAsDefaultShipping"/>
+        <!--Step5. Press *Ok* button on the pop-up-->
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmSetAddressAsDefaultShipping"/>
+        <seeElement selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="seeDefaultShippingAddressSection"/>
+        <see userInput="{{US_Address_NY_Not_Default_Address.street[0]}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="assertDefaultShippingAddressIsSet"/>
+        <click selector="{{AdminCustomerAddressesDefaultShippingSection.editButton}}" stepKey="clickEditDefaultShippingAddress"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressAddUpdateFormLoad"/>
+        <assertElementContainsAttribute selector="{{AdminCustomerAddressesSection.defaultShippingAddressCheckBox}}" attribute="value" expectedValue="1" stepKey="assertDefaultShippingCheckboxIsCheckedOnCustomerAddressAddUpdateForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..901018c2fd074
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <annotations>
+            <features value="End to End scenarios"/>
+            <stories value="B2C logged in user - MAGETWO-72524"/>
+            <group value="e2e"/>
+            <title value="You should be able to pass End to End B2C Logged In User scenario"/>
+            <description value="New user signup and browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-87653"/>
+        </annotations>
+        <before>
+            <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Step 0: User signs up an account -->
+        <comment userInput="Start of signing up user account" stepKey="startOfSigningUpUserAccount" />
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <comment userInput="End of signing up user account" stepKey="endOfSigningUpUserAccount" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
new file mode 100644
index 0000000000000..229e81e877292
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckTaxAddingValidVATIdTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="MAGETWO-91639: Tax is added despite customer group changes"/>
+            <title value="Check tax adding when it's changed to 'Valid VAT ID - Intra-Union'"/>
+            <description value="Tax should be applied"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95028"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <!--Log In-->
+            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!--Add new tax rates. Go to tax rule page -->
+        <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addFirstTaxRuleActionGroup"/>
+        <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{TaxRule.name}}"/>
+
+        <!-- Add NY and CA tax rules -->
+        <actionGroup ref="addNewTaxRateNoZip" stepKey="addSimpleTaxUK">
+            <argument name="taxCode" value="SimpleTaxUK"/>
+        </actionGroup>
+        <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForNewTaxRuleCreated"/>
+
+        <!-- Go to tax rule page to create second Tax Rule-->
+        <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addSecondTaxRuleActionGroup"/>
+        <fillField stepKey="fillSecondRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{TaxRuleZeroRate.name}}"/>
+        <actionGroup ref="addNewTaxRateNoZip" stepKey="addSimpleTaxUKZeroRate">
+            <argument name="taxCode" value="SimpleTaxUKZeroRate"/>
+        </actionGroup>
+        <actionGroup ref="addCustomerTaxClass" stepKey="addCustomerTaxClass">
+            <argument name="customerTaxClassName" value="UK_zero"/>
+        </actionGroup>
+        <click stepKey="disableDefaultProdTaxClass" selector="{{AdminTaxRulesSection.defaultCustomerTaxClass}}"/>
+        <wait stepKey="waitForDisableDefaultProdTaxClass" time="2"/>
+        <click stepKey="clickSaveBtn" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForSecondTaxRuleCreated"/>
+
+        <!--Create a Customer Group (CUSTOMERS > Customer Groups)-->
+        <actionGroup ref="AdminCreateCustomerGroupActionGroup" stepKey="createCustomerGroup">
+            <argument name="groupName" value="test_UK"/>
+            <argument name="taxClass" value="UK_zero"/>
+        </actionGroup>
+
+        <!--Set Customer Create New Account Options Config-->
+        <createData entity="SetCustomerCreateNewAccountOptionsConfig" stepKey="setCustomerCreateNewAccountOptionsConfig"/>
+        <actionGroup ref="SetGroupForValidVATIdIntraUnionActionGroup" stepKey="setGroupForValidVATIdIntraUnionActionGroup" after="setCustomerCreateNewAccountOptionsConfig">
+            <argument name="value" value="test_UK"/>
+        </actionGroup>
+
+        <!--Register customer on storefront-->
+        <actionGroup ref="SignUpNewCustomerStorefrontActionGroup" stepKey="createAnAccount">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+
+        <!--Go to My account > Address book-->
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="UK_Simple_Address"/>
+        </actionGroup>
+
+        <!-- Go to product visible -->
+        <amOnPage url="$$createProduct.name$$.html" stepKey="navigateToProductPageOnDefaultStore"/>
+        <see userInput="$$createProduct.name$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertFirstProductNameTitle"/>
+
+        <!--Add a product to the cart-->
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddProductToCart"/>
+        <!--Proceed to checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
+        <!-- Click next button to open payment section -->
+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
+
+        <!-- Check order summary in checkout -->
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <!--Verify that Tax 50% is applied -->
+        <see userInput="$123.00" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="$5.00" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
+        <see userInput="Flat Rate - Fixed" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
+        <see userInput="$61.50" selector="{{CheckoutPaymentSection.tax}}" stepKey="assertTax"/>
+        <see userInput="$189.50" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
+
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="{{TaxRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteSecondRule">
+                <argument name="name" value="{{TaxRuleZeroRate.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxUK.state}}-{{SimpleTaxUK.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxUKZeroRate.state}}-{{SimpleTaxUKZeroRate.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!--Delete created customer group-->
+            <actionGroup ref="AdminDeleteCustomerGroupActionGroup" stepKey="deleteCustomerGroup">
+                <argument name="customerGroupName" value="test_UK"/>
+            </actionGroup>
+
+            <createData entity="SetCustomerCreateNewAccountOptionsDefaultConfig" stepKey="setCustomerCreateNewAccountOptionsDefaultConfig"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategoryFirst"/>
+
+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteFirstProductTaxClass">
+                <argument name="taxClassName" value="UK_zero"/>
+            </actionGroup>
+
+           <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
new file mode 100644
index 0000000000000..97c932f0cb28a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCreateCustomerTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Create a Customer via the Storefront"/>
+            <title value="Admin should be able to create a customer via the storefront"/>
+            <description value="Admin should be able to create a customer via the storefront"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-23546"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
new file mode 100644
index 0000000000000..7a96616885468
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontDeleteCustomerAddressTest">
+        <annotations>
+            <stories value="Delete customer address from storefront"/>
+            <title value="User should be able to delete Customer address successfully from storefront"/>
+            <description value="User should be able to delete Customer address successfully from storefront"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5713"/>
+            <group value="Customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <fillField  stepKey="fillEmail" userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+        <see userInput="You saved the address." stepKey="verifyAddressCreated"/>
+        <click selector="{{StorefrontCustomerAddressesSection.deleteAdditionalAddress('1')}}" stepKey="deleteAdditionalAddress"/>
+        <waitForElementVisible selector="{{ModalConfirmationSection.modalContent}}" stepKey="waitFortheConfirmationModal"/>
+        <see selector="{{ModalConfirmationSection.modalContent}}" userInput="Are you sure you want to delete this address?" stepKey="seeAddressDeleteConfirmationMessage"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+        <see userInput="You deleted the address." stepKey="verifyDeleteAddress"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
new file mode 100644
index 0000000000000..250da68786688
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontPersistedCustomerLoginTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Login"/>
+            <title value="Persisted customer should be able to login from storefront"/>
+            <description value="Persisted customer should be able to login from storefront"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-72103"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData stepKey="customer" entity="Simple_US_Customer"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
+        </after>
+
+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
index b43b1d1aa39a9..618173e886e66 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
@@ -128,6 +128,9 @@ public function testGetConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUr
         $this->assertEquals($result, $this->model->getConfig());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetConfig()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/CustomerTest.php
index 6489fea91e43e..793975c0b3191 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/CustomerTest.php
@@ -22,6 +22,9 @@ protected function setUp()
             ->getObject(\Magento\Customer\Block\Account\Customer::class, ['httpContext' => $this->httpContext]);
     }
 
+    /**
+     * @return array
+     */
     public function customerLoggedInDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
index 66c686239e974..f04c10fa31576 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
@@ -184,6 +184,9 @@ public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
         $this->assertEquals($expectedValue, $this->_block->isNewsletterEnabled());
     }
 
+    /**
+     * @return array
+     */
     public function isNewsletterEnabledProvider()
     {
         return [[true, true], [false, false]];
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php
new file mode 100644
index 0000000000000..7b0da3bd422a6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Address/DeleteButtonTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Block\Adminhtml\Edit\Address;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class for \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton unit tests
+ */
+class DeleteButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Customer\Model\AddressFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressFactory;
+
+    /**
+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlBuilder;
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressResourceModel;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $request;
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\AddressRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressRepository;
+
+    /**
+     * @var \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton
+     */
+    private $deleteButton;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->addressFactory = $this->getMockBuilder(\Magento\Customer\Model\AddressFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
+        $this->addressResourceModel = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+        $this->addressRepository = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\AddressRepository::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->deleteButton = $objectManagerHelper->getObject(
+            \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton::class,
+            [
+                'addressFactory' => $this->addressFactory,
+                'urlBuilder' => $this->urlBuilder,
+                'addressResourceModel' => $this->addressResourceModel,
+                'request' => $this->request,
+                'addressRepository' => $this->addressRepository,
+            ]
+        );
+    }
+
+    /**
+     * Unit test for \Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton::getButtonData() method
+     */
+    public function testGetButtonData()
+    {
+        $addressId = 1;
+        $customerId = 2;
+
+        /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $address */
+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $address->expects($this->atLeastOnce())->method('getEntityId')->willReturn($addressId);
+        $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
+        $this->addressFactory->expects($this->atLeastOnce())->method('create')->willReturn($address);
+        $this->request->expects($this->atLeastOnce())->method('getParam')->with('entity_id')
+            ->willReturn($addressId);
+        $this->addressResourceModel->expects($this->atLeastOnce())->method('load')->with($address, $addressId);
+        $this->addressRepository->expects($this->atLeastOnce())->method('getById')->with($addressId)
+            ->willReturn($address);
+        $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
+            ->with(
+                \Magento\Customer\Ui\Component\Listing\Address\Column\Actions::CUSTOMER_ADDRESS_PATH_DELETE,
+                ['parent_id' => $customerId, 'id' => $addressId]
+            )->willReturn('url');
+
+        $buttonData = $this->deleteButton->getButtonData();
+        $this->assertEquals('Delete', (string)$buttonData['label']);
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php
index c12da66cdc616..92c2bcfeb8e59 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/Grid/Renderer/ItemTest.php
@@ -14,6 +14,10 @@ class ItemTest extends \PHPUnit\Framework\TestCase
     /** @var  \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Grid\Renderer\Item */
     protected $itemBlock;
 
+    /**
+     * @param $amountOption
+     * @param bool $withoutOptions
+     */
     public function configure($amountOption, $withoutOptions = false)
     {
         $options = [];
@@ -95,6 +99,9 @@ public function testRender($amountOption, $expectedHtml)
         $this->assertXmlStringEqualsXmlString($expectedHtml, $realHtml);
     }
 
+    /**
+     * @return array
+     */
     public function optionHtmlProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 81d9a144bec5e..6926eee4f28f2 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -31,7 +31,7 @@ class DobTest extends \PHPUnit\Framework\TestCase
     const YEAR = '2014';
 
     // Value of date('Y', strtotime(self::DATE))
-    const DATE_FORMAT = 'M/d/yy';
+    const DATE_FORMAT = 'M/d/Y';
 
     /** Constants used by Dob::setDateInput($code, $html) */
     const DAY_HTML =
@@ -57,6 +57,16 @@ class DobTest extends \PHPUnit\Framework\TestCase
      */
     protected $filterFactory;
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var \Magento\Framework\View\Element\Template\Context
+     */
+    private $context;
+
     protected function setUp()
     {
         $zendCacheCore = new \Zend_Cache_Core();
@@ -82,8 +92,13 @@ protected function setUp()
             ['localeResolver' => $localeResolver]
         );
 
-        $context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
-        $context->expects($this->any())->method('getLocaleDate')->will($this->returnValue($timezone));
+        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
+        $this->context->expects($this->any())->method('getLocaleDate')->will($this->returnValue($timezone));
+        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['escapeHtml'])
+            ->getMock();
+        $this->context->expects($this->any())->method('getEscaper')->will($this->returnValue($this->escaper));
 
         $this->attribute = $this->getMockBuilder(\Magento\Customer\Api\Data\AttributeMetadataInterface::class)
             ->getMockForAbstractClass();
@@ -100,7 +115,7 @@ protected function setUp()
             ->getMock();
 
         $this->_block = new \Magento\Customer\Block\Widget\Dob(
-            $context,
+            $this->context,
             $this->createMock(\Magento\Customer\Helper\Address::class),
             $this->customerMetadata,
             $this->createMock(\Magento\Framework\View\Element\Html\Date::class),
@@ -454,14 +469,22 @@ public function testGetMaxDateRangeWithException()
             );
         $this->assertNull($this->_block->getMaxDateRange());
     }
-    
+
     public function testGetHtmlExtraParamsWithoutRequiredOption()
     {
+        $this->escaper->expects($this->any())
+            ->method('escapeHtml')
+            ->with('{"validate-date":{"dateFormat":"M\/d\/Y"}}')
+            ->will($this->returnValue('{"validate-date":{"dateFormat":"M\/d\/Y"}}'));
+
         $this->attribute->expects($this->once())
             ->method("isRequired")
             ->willReturn(false);
 
-        $this->assertEquals($this->_block->getHtmlExtraParams(), 'data-validate="{\'validate-date-au\':true}"');
+        $this->assertEquals(
+            $this->_block->getHtmlExtraParams(),
+            'data-validate="{"validate-date":{"dateFormat":"M\/d\/Y"}}"'
+        );
     }
 
     public function testGetHtmlExtraParamsWithRequiredOption()
@@ -469,10 +492,16 @@ public function testGetHtmlExtraParamsWithRequiredOption()
         $this->attribute->expects($this->once())
             ->method("isRequired")
             ->willReturn(true);
+        $this->escaper->expects($this->any())
+            ->method('escapeHtml')
+            ->with('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}')
+            ->will($this->returnValue('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}'));
+
+        $this->context->expects($this->any())->method('getEscaper')->will($this->returnValue($this->escaper));
 
         $this->assertEquals(
-            $this->_block->getHtmlExtraParams(),
-            'data-validate="{\'validate-date-au\':true, required:true}"'
+            'data-validate="{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}"',
+            $this->_block->getHtmlExtraParams()
         );
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
index aff9aeeb59cf8..11222635d210d 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
@@ -157,6 +157,9 @@ public function testMethodWithNoSuchEntityException($method)
         $this->assertFalse($this->_block->{$method}());
     }
 
+    /**
+     * @return array
+     */
     public function methodDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php
new file mode 100644
index 0000000000000..113f8c104a4ea
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Controller\Account;
+
+use Magento\Customer\Controller\Account\Confirmation;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ConfirmationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Confirmation
+     */
+    private $model;
+    
+    /**
+     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultPageFactoryMock;
+
+    /**
+     * @var \Magento\Customer\Model\Url|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerUrlMock;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    public function setUp()
+    {
+        $this->customerSessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isLoggedIn'])
+            ->getMock();
+        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRequest'])
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPost', 'getParam'])
+            ->getMock();
+        $this->contextMock->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($this->requestMock);
+        
+        $this->resultPageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->customerUrlMock = $this->getMockBuilder(\Magento\Customer\Model\Url::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLoginUrl'])
+            ->getMock();
+        $this->model = (new ObjectManagerHelper($this))->getObject(
+            Confirmation::class,
+            [
+                'context' => $this->contextMock,
+                'customerSession' => $this->customerSessionMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'customerUrl' => $this->customerUrlMock,
+            ]
+        );
+    }
+
+    public function testGetLoginUrl()
+    {
+        $this->customerSessionMock->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        
+        $this->requestMock->expects($this->once())->method('getPost')->with('email')->willReturn(null);
+
+        $resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLayout'])
+            ->getMock();
+
+        $this->resultPageFactoryMock->expects($this->once())->method('create')->willReturn($resultPageMock);
+
+        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBlock'])
+            ->getMock();
+
+        $resultPageMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
+
+        $blockMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setEmail', 'setLoginUrl'])
+            ->getMock();
+
+        $layoutMock->expects($this->once())->method('getBlock')->with('accountConfirmation')->willReturn($blockMock);
+
+        $blockMock->expects($this->once())->method('setEmail')->willReturnSelf();
+        $blockMock->expects($this->once())->method('setLoginUrl')->willReturnSelf();
+
+        $this->model->execute();
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php
deleted file mode 100644
index 77f41024ba02f..0000000000000
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Customer\Test\Unit\Controller\Account;
-
-use Magento\Framework\Controller\Result\Redirect;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class CreatePasswordTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Customer\Controller\Account\CreatePassword */
-    protected $model;
-
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
-
-    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sessionMock;
-
-    /** @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $pageFactoryMock;
-
-    /** @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $accountManagementMock;
-
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
-
-    /** @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirectFactoryMock;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManagerMock;
-
-    protected function setUp()
-    {
-        $this->sessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setRpToken', 'setRpCustomerId', 'getRpToken', 'getRpCustomerId'])
-            ->getMock();
-        $this->pageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->accountManagementMock = $this->getMockBuilder(\Magento\Customer\Api\AccountManagementInterface::class)
-            ->getMockForAbstractClass();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->getMockForAbstractClass();
-        $this->redirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Customer\Controller\Account\CreatePassword::class,
-            [
-                'customerSession' => $this->sessionMock,
-                'resultPageFactory' => $this->pageFactoryMock,
-                'accountManagement' => $this->accountManagementMock,
-                'request' => $this->requestMock,
-                'resultRedirectFactory' => $this->redirectFactoryMock,
-                'messageManager' => $this->messageManagerMock,
-            ]
-        );
-    }
-
-    public function testExecuteWithLink()
-    {
-        $token = 'token';
-        $customerId = '11';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['token', null, $token],
-                    ['id', null, $customerId],
-                ]
-            );
-
-        $this->accountManagementMock->expects($this->once())
-            ->method('validateResetPasswordLinkToken')
-            ->with($customerId, $token)
-            ->willReturn(true);
-
-        $this->sessionMock->expects($this->once())
-            ->method('setRpToken')
-            ->with($token);
-        $this->sessionMock->expects($this->once())
-            ->method('setRpCustomerId')
-            ->with($customerId);
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/createpassword', [])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    public function testExecuteWithSession()
-    {
-        $token = 'token';
-        $customerId = '11';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['token', null, null],
-                    ['id', null, $customerId],
-                ]
-            );
-
-        $this->sessionMock->expects($this->once())
-            ->method('getRpToken')
-            ->willReturn($token);
-        $this->sessionMock->expects($this->once())
-            ->method('getRpCustomerId')
-            ->willReturn($customerId);
-
-        $this->accountManagementMock->expects($this->once())
-            ->method('validateResetPasswordLinkToken')
-            ->with($customerId, $token)
-            ->willReturn(true);
-
-        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
-        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->pageFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(false, [])
-            ->willReturn($pageMock);
-
-        /** @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
-        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pageMock->expects($this->once())
-            ->method('getLayout')
-            ->willReturn($layoutMock);
-
-        /** @var \Magento\Customer\Block\Account\Resetpassword|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
-        $blockMock = $this->getMockBuilder(\Magento\Customer\Block\Account\Resetpassword::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setCustomerId', 'setResetPasswordLinkToken'])
-            ->getMock();
-
-        $layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->with('resetPassword')
-            ->willReturn($blockMock);
-
-        $blockMock->expects($this->once())
-            ->method('setCustomerId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $blockMock->expects($this->once())
-            ->method('setResetPasswordLinkToken')
-            ->with($token)
-            ->willReturnSelf();
-
-        $this->assertEquals($pageMock, $this->model->execute());
-    }
-
-    public function testExecuteWithException()
-    {
-        $token = 'token';
-        $customerId = '11';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['token', null, $token],
-                    ['id', null, null],
-                ]
-            );
-
-        $this->sessionMock->expects($this->once())
-            ->method('getRpToken')
-            ->willReturn($token);
-        $this->sessionMock->expects($this->once())
-            ->method('getRpCustomerId')
-            ->willReturn($customerId);
-
-        $this->accountManagementMock->expects($this->once())
-            ->method('validateResetPasswordLinkToken')
-            ->with($customerId, $token)
-            ->willThrowException(new \Exception('Exception.'));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Your password reset link has expired.'))
-            ->willReturnSelf();
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/forgotpassword', [])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
index 2205bcd6f0a24..f8f47eedba3ef 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
@@ -533,6 +533,9 @@ public function testSuccessRedirect(
         $this->model->execute();
     }
 
+    /**
+     * @return array
+     */
     public function getSuccessRedirectDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
deleted file mode 100644
index f2860725dbbae..0000000000000
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
+++ /dev/null
@@ -1,793 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Customer\Test\Unit\Controller\Account;
-
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Controller\Account\EditPost;
-use Magento\Customer\Model\AuthenticationInterface;
-use Magento\Customer\Model\CustomerExtractor;
-use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Customer\Model\Session;
-use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\Request\Http;
-use Magento\Framework\Controller\Result\Redirect;
-use Magento\Framework\Controller\Result\RedirectFactory;
-use Magento\Framework\Data\Form\FormKey\Validator;
-use Magento\Framework\Message\ManagerInterface;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class EditPostTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var EditPost
-     */
-    protected $model;
-
-    /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $context;
-
-    /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerSession;
-
-    /**
-     * @var \Magento\Customer\Model\AccountManagement|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerAccountManagement;
-
-    /**
-     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerRepository;
-
-    /**
-     * @var Validator|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $validator;
-
-    /**
-     * @var CustomerExtractor|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerExtractor;
-
-    /**
-     * @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $emailNotification;
-
-    /**
-     * @var RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectFactory;
-
-    /**
-     * @var Redirect|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirect;
-
-    /**
-     * @var Http|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $request;
-
-    /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageManager;
-
-    /**
-     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $eventManager;
-
-    /**
-     * @var AuthenticationInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $authenticationMock;
-
-    /**
-     * @var \Magento\Customer\Model\Customer\Mapper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $customerMapperMock;
-
-    protected function setUp()
-    {
-        $this->prepareContext();
-
-        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getCustomerId', 'setCustomerFormData', 'logout', 'start'])
-            ->getMock();
-
-        $this->customerAccountManagement = $this->getMockBuilder(\Magento\Customer\Model\AccountManagement::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->validator = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerExtractor = $this->getMockBuilder(\Magento\Customer\Model\CustomerExtractor::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->emailNotification = $this->getMockBuilder(EmailNotificationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->authenticationMock = $this->getMockBuilder(AuthenticationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerMapperMock = $this->getMockBuilder(\Magento\Customer\Model\Customer\Mapper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->model = new EditPost(
-            $this->context,
-            $this->customerSession,
-            $this->customerAccountManagement,
-            $this->customerRepository,
-            $this->validator,
-            $this->customerExtractor
-        );
-
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'emailNotification',
-            $this->emailNotification
-        );
-
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'authentication',
-            $this->authenticationMock
-        );
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'customerMapper',
-            $this->customerMapperMock
-        );
-    }
-
-    public function testInvalidFormKey()
-    {
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(false);
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    public function testNoPostValues()
-    {
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(false);
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    public function testGeneralSave()
-    {
-        $customerId = 1;
-        $currentPassword = '1234567';
-        $customerEmail = 'customer@example.com';
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $currentCustomerMock->expects($this->any())
-            ->method('getEmail')
-            ->willReturn($customerEmail);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getParam')
-            ->withConsecutive(
-                ['change_email'],
-                ['change_email'],
-                ['change_password']
-            )
-            ->willReturnOnConsecutiveCalls(true, true, false);
-
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->with('current_password')
-            ->willReturn($currentPassword);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->customerRepository->expects($this->once())
-            ->method('save')
-            ->with($newCustomerMock)
-            ->willReturnSelf();
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->emailNotification->expects($this->once())
-            ->method('credentialsChanged')
-            ->with($currentCustomerMock, $customerEmail, false)
-            ->willReturnSelf();
-
-        $newCustomerMock->expects($this->once())
-            ->method('getEmail')
-            ->willReturn($customerEmail);
-
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with(
-                'customer_account_edited',
-                ['email' => $customerEmail]
-            );
-
-        $this->messageManager->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('You saved the account information.'))
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('customer/account')
-            ->willReturnSelf();
-
-        $this->authenticationMock->expects($this->once())
-            ->method('authenticate')
-            ->willReturn(true);
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @param int $testNumber
-     * @param string $exceptionClass
-     * @param string $errorMessage
-     *
-     * @dataProvider changeEmailExceptionDataProvider
-     */
-    public function testChangeEmailException($testNumber, $exceptionClass, $errorMessage)
-    {
-        $customerId = 1;
-        $password = '1234567';
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->request->expects($this->any())
-            ->method('getParam')
-            ->with('change_email')
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->with('current_password')
-            ->willReturn($password);
-
-        $exception = new $exceptionClass($errorMessage);
-        $this->authenticationMock->expects($this->once())
-            ->method('authenticate')
-            ->willThrowException($exception);
-
-        $this->messageManager->expects($this->once())
-            ->method('addError')
-            ->with($errorMessage)
-            ->willReturnSelf();
-
-        if ($testNumber==1) {
-            $this->resultRedirect->expects($this->once())
-                ->method('setPath')
-                ->with('*/*/edit')
-                ->willReturnSelf();
-        }
-
-        if ($testNumber==2) {
-            $this->customerSession->expects($this->once())
-                ->method('logout');
-
-            $this->customerSession->expects($this->once())
-                ->method('start');
-
-            $this->resultRedirect->expects($this->once())
-                ->method('setPath')
-                ->with('customer/account/login')
-                ->willReturnSelf();
-        }
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @return array
-     */
-    public function changeEmailExceptionDataProvider()
-    {
-        return [
-            [
-                'testNumber' => 1,
-                'exceptionClass' => \Magento\Framework\Exception\InvalidEmailOrPasswordException::class,
-                'errorMessage' => __('The password doesn\'t match this account.')
-            ],
-            [
-                'testNumber' => 2,
-                'exceptionClass' => \Magento\Framework\Exception\State\UserLockedException::class,
-                'errorMessage' => __('You did not sign in correctly or your account is temporarily disabled.')
-            ]
-        ];
-    }
-
-    /**
-     * @param string $currentPassword
-     * @param string $newPassword
-     * @param string $confirmationPassword
-     * @param [] $errors
-     *
-     * @dataProvider changePasswordDataProvider
-     */
-    public function testChangePassword(
-        $currentPassword,
-        $newPassword,
-        $confirmationPassword,
-        $errors
-    ) {
-        $customerId = 1;
-        $customerEmail = 'user1@example.com';
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getParam')
-            ->withConsecutive(
-                ['change_email'],
-                ['change_email'],
-                ['change_password']
-            )
-            ->willReturnOnConsecutiveCalls(false, false, true);
-
-        $this->request->expects($this->any())
-            ->method('getPostValue')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getPost')
-            ->willReturnMap([
-                ['current_password', null, $currentPassword],
-                ['password', null, $newPassword],
-                ['password_confirmation', null, $confirmationPassword],
-            ]);
-
-        $currentCustomerMock->expects($this->any())
-            ->method('getEmail')
-            ->willReturn($customerEmail);
-
-        // Prepare errors processing
-        if ($errors['counter'] > 0) {
-            $this->mockChangePasswordErrors($currentPassword, $newPassword, $errors, $customerEmail);
-        } else {
-            $this->customerAccountManagement->expects($this->once())
-                ->method('changePassword')
-                ->with($customerEmail, $currentPassword, $newPassword)
-                ->willReturnSelf();
-
-            $this->customerRepository->expects($this->once())
-                ->method('save')
-                ->with($newCustomerMock)
-                ->willReturnSelf();
-
-            $this->messageManager->expects($this->once())
-                ->method('addSuccess')
-                ->with(__('You saved the account information.'))
-                ->willReturnSelf();
-
-            $this->resultRedirect->expects($this->once())
-                ->method('setPath')
-                ->with('customer/account')
-                ->willReturnSelf();
-        }
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @return array
-     */
-    public function changePasswordDataProvider()
-    {
-        return [
-            [
-                'current_password' => '',
-                'new_password' => '',
-                'confirmation_password' => '',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => __('Please enter new password.'),
-                ]
-            ],
-            [
-                'current_password' => '',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user3@example.com',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => __('Password confirmation doesn\'t match entered password.'),
-                ]
-            ],
-            [
-                'current_password' => 'user1@example.com',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user2@example.com',
-                'errors' => [
-                    'counter' => 0,
-                    'message' => '',
-                ]
-            ],
-            [
-                'current_password' => 'user1@example.com',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user2@example.com',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => 'AuthenticationException',
-                    'exception' => \Magento\Framework\Exception\AuthenticationException::class,
-                ]
-            ],
-            [
-                'current_password' => 'user1@example.com',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user2@example.com',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => 'Exception',
-                    'exception' => '\Exception',
-                ]
-            ]
-        ];
-    }
-
-    /**
-     * @param string $message
-     * @param string $exception
-     *
-     * @dataProvider exceptionDataProvider
-     */
-    public function testGeneralException(
-        $message,
-        $exception
-    ) {
-        $customerId = 1;
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $exception = new $exception(__($message));
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getParam')
-            ->withConsecutive(
-                ['change_email'],
-                ['change_email'],
-                ['change_password']
-            )
-            ->willReturn(false);
-
-        $this->request->expects($this->any())
-            ->method('getPostValue')
-            ->willReturn(true);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-        $this->customerSession->expects($this->once())
-            ->method('setCustomerFormData')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-        $this->customerRepository->expects($this->once())
-            ->method('save')
-            ->with($newCustomerMock)
-            ->willThrowException($exception);
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @return array
-     */
-    public function exceptionDataProvider()
-    {
-        return [
-            [
-                'message' => 'LocalizedException',
-                'exception' => \Magento\Framework\Exception\LocalizedException::class,
-            ],
-            [
-                'message' => 'Exception',
-                'exception' => '\Exception',
-            ],
-        ];
-    }
-
-    protected function prepareContext()
-    {
-        $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultRedirectFactory = $this->getMockBuilder(
-            \Magento\Framework\Controller\Result\RedirectFactory::class
-        )
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->context->expects($this->any())
-            ->method('getResultRedirectFactory')
-            ->willReturn($this->resultRedirectFactory);
-
-        $this->context->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($this->request);
-
-        $this->context->expects($this->any())
-            ->method('getMessageManager')
-            ->willReturn($this->messageManager);
-
-        $this->eventManager = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->context->expects($this->any())
-            ->method('getEventManager')
-            ->willReturn($this->eventManager);
-
-        $this->resultRedirectFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->resultRedirect);
-    }
-
-    /**
-     * @param int $customerId
-     * @param \PHPUnit_Framework_MockObject_MockObject $address
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getNewCustomerMock($customerId, $address)
-    {
-        $newCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $newCustomerMock->expects($this->once())
-            ->method('setId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $newCustomerMock->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn(null);
-        $newCustomerMock->expects($this->once())
-            ->method('setAddresses')
-            ->with([$address])
-            ->willReturn(null);
-
-        return $newCustomerMock;
-    }
-
-    /**
-     * @param int $customerId
-     * @param \PHPUnit_Framework_MockObject_MockObject $address
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getCurrentCustomerMock($customerId, $address)
-    {
-        $currentCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn([$address]);
-
-        $currentCustomerMock->expects($this->any())
-            ->method('getId')
-            ->willReturn($customerId);
-
-        return $currentCustomerMock;
-    }
-
-    /**
-     * @param string $currentPassword
-     * @param string $newPassword
-     * @param [] $errors
-     * @param string $customerEmail
-     * @return void
-     */
-    protected function mockChangePasswordErrors($currentPassword, $newPassword, $errors, $customerEmail)
-    {
-        if (!empty($errors['exception'])) {
-            $exception = new $errors['exception'](__($errors['message']));
-
-            $this->customerAccountManagement->expects($this->once())
-                ->method('changePassword')
-                ->with($customerEmail, $currentPassword, $newPassword)
-                ->willThrowException($exception);
-
-            $this->messageManager->expects($this->any())
-                ->method('addException')
-                ->with($exception, __('We can\'t save the customer.'))
-                ->willReturnSelf();
-        }
-
-        $this->customerSession->expects($this->once())
-            ->method('setCustomerFormData')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->messageManager->expects($this->any())
-            ->method('addError')
-            ->with($errors['message'])
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->any())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-    }
-}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
index 8e07f41cff5a7..762c76b695dee 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Controller\Account;
 
 use Magento\Customer\Api\AccountManagementInterface;
@@ -563,7 +564,12 @@ protected function mockExceptions($exception, $username)
             case \Magento\Framework\Exception\AuthenticationException::class:
                 $this->messageManager->expects($this->once())
                     ->method('addError')
-                    ->with(__('You did not sign in correctly or your account is temporarily disabled.'))
+                    ->with(
+                        __(
+                            'The account sign-in was incorrect or your account is disabled temporarily. '
+                            . 'Please wait and try again later.'
+                        )
+                    )
                     ->willReturnSelf();
 
                 $this->session->expects($this->once())
@@ -581,7 +587,8 @@ protected function mockExceptions($exception, $username)
 
             case \Magento\Framework\Exception\State\UserLockedException::class:
                 $message = __(
-                    'You did not sign in correctly or your account is temporarily disabled.'
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
                 );
                 $this->messageManager->expects($this->once())
                     ->method('addError')
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php
deleted file mode 100644
index b79ad008e5e44..0000000000000
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Customer\Test\Unit\Controller\Account;
-
-use Magento\Framework\Controller\Result\Redirect;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ResetPasswordPostTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Customer\Controller\Account\ResetPasswordPost */
-    protected $model;
-
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
-
-    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sessionMock;
-
-    /** @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $pageFactoryMock;
-
-    /** @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $accountManagementMock;
-
-    /** @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerRepositoryMock;
-
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
-
-    /** @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirectFactoryMock;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManagerMock;
-
-    protected function setUp()
-    {
-        $this->sessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['unsRpToken', 'unsRpCustomerId'])
-            ->getMock();
-        $this->pageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->accountManagementMock = $this->getMockBuilder(\Magento\Customer\Api\AccountManagementInterface::class)
-            ->getMockForAbstractClass();
-        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-            ->getMockForAbstractClass();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->setMethods(['getQuery', 'getPost'])
-            ->getMockForAbstractClass();
-        $this->redirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Customer\Controller\Account\ResetPasswordPost::class,
-            [
-                'customerSession' => $this->sessionMock,
-                'resultPageFactory' => $this->pageFactoryMock,
-                'accountManagement' => $this->accountManagementMock,
-                'customerRepository' => $this->customerRepositoryMock,
-                'request' => $this->requestMock,
-                'resultRedirectFactory' => $this->redirectFactoryMock,
-                'messageManager' => $this->messageManagerMock,
-            ]
-        );
-    }
-
-    public function testExecute()
-    {
-        $token = 'token';
-        $customerId = '11';
-        $password = 'password';
-        $passwordConfirmation = 'password';
-        $email = 'email@email.com';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getQuery')
-            ->willReturnMap(
-                [
-                    ['token', $token],
-                    ['id', $customerId],
-                ]
-            );
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['password', $password],
-                    ['password_confirmation', $passwordConfirmation],
-                ]
-            );
-
-        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($customerMock);
-
-        $customerMock->expects($this->once())
-            ->method('getEmail')
-            ->willReturn($email);
-
-        $this->accountManagementMock->expects($this->once())
-            ->method('resetPassword')
-            ->with($email, $token, $password)
-            ->willReturn(true);
-
-        $this->sessionMock->expects($this->once())
-            ->method('unsRpToken');
-        $this->sessionMock->expects($this->once())
-            ->method('unsRpCustomerId');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('You updated your password.'))
-            ->willReturnSelf();
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/login', [])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    public function testExecuteWithException()
-    {
-        $token = 'token';
-        $customerId = '11';
-        $password = 'password';
-        $passwordConfirmation = 'password';
-        $email = 'email@email.com';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getQuery')
-            ->willReturnMap(
-                [
-                    ['token', $token],
-                    ['id', $customerId],
-                ]
-            );
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['password', $password],
-                    ['password_confirmation', $passwordConfirmation],
-                ]
-            );
-
-        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($customerMock);
-
-        $customerMock->expects($this->once())
-            ->method('getEmail')
-            ->willReturn($email);
-
-        $this->accountManagementMock->expects($this->once())
-            ->method('resetPassword')
-            ->with($email, $token, $password)
-            ->willThrowException(new \Exception('Exception.'));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Something went wrong while saving the new password.'))
-            ->willReturnSelf();
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * Test for InputException
-     */
-    public function testExecuteWithInputException()
-    {
-        $token = 'token';
-        $customerId = '11';
-        $password = 'password';
-        $passwordConfirmation = 'password';
-        $email = 'email@email.com';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getQuery')
-            ->willReturnMap(
-                [
-                    ['token', $token],
-                    ['id', $customerId],
-                ]
-            );
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['password', $password],
-                    ['password_confirmation', $passwordConfirmation],
-                ]
-            );
-
-        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($customerMock);
-
-        $customerMock->expects($this->once())
-            ->method('getEmail')
-            ->willReturn($email);
-
-        $this->accountManagementMock->expects($this->once())
-            ->method('resetPassword')
-            ->with($email, $token, $password)
-            ->willThrowException(new \Magento\Framework\Exception\InputException(__('InputException.')));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('InputException.'))
-            ->willReturnSelf();
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    public function testExecuteWithWrongConfirmation()
-    {
-        $token = 'token';
-        $customerId = '11';
-        $password = 'password';
-        $passwordConfirmation = 'wrong_password';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getQuery')
-            ->willReturnMap(
-                [
-                    ['token', $token],
-                    ['id', $customerId],
-                ]
-            );
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['password', $password],
-                    ['password_confirmation', $passwordConfirmation],
-                ]
-            );
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('New Password and Confirm New Password values didn\'t match.'))
-            ->willReturnSelf();
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    public function testExecuteWithEmptyPassword()
-    {
-        $token = 'token';
-        $customerId = '11';
-        $password = '';
-        $passwordConfirmation = '';
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getQuery')
-            ->willReturnMap(
-                [
-                    ['token', $token],
-                    ['id', $customerId],
-                ]
-            );
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['password', $password],
-                    ['password_confirmation', $passwordConfirmation],
-                ]
-            );
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Please enter a new password.'))
-            ->willReturnSelf();
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->with([])
-            ->willReturn($redirectMock);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
index 2b5438991b113..c2a795fc95016 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Controller\Address;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
@@ -162,6 +163,9 @@ class FormPostTest extends \PHPUnit\Framework\TestCase
      */
     private $customerAddressMapper;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         $this->prepareContext();
@@ -230,7 +234,10 @@ protected function setUp()
         );
     }
 
-    protected function prepareContext()
+    /**
+     * Prepares context
+     */
+    protected function prepareContext(): void
     {
         $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
             ->disableOriginalConstructor()
@@ -284,7 +291,10 @@ protected function prepareContext()
             ->willReturn($this->messageManager);
     }
 
-    protected function prepareAddress()
+    /**
+     * Prepare address
+     */
+    protected function prepareAddress(): void
     {
         $this->addressRepository = $this->getMockBuilder(\Magento\Customer\Api\AddressRepositoryInterface::class)
             ->getMockForAbstractClass();
@@ -303,7 +313,10 @@ protected function prepareAddress()
             ->willReturn($this->addressData);
     }
 
-    protected function prepareRegion()
+    /**
+     * Prepare region
+     */
+    protected function prepareRegion(): void
     {
         $this->region = $this->getMockBuilder(\Magento\Directory\Model\Region::class)
             ->disableOriginalConstructor()
@@ -335,7 +348,10 @@ protected function prepareRegion()
             ->willReturn($this->regionData);
     }
 
-    protected function prepareForm()
+    /**
+     * Prepare form
+     */
+    protected function prepareForm(): void
     {
         $this->form = $this->getMockBuilder(\Magento\Customer\Model\Metadata\Form::class)
             ->disableOriginalConstructor()
@@ -346,7 +362,10 @@ protected function prepareForm()
             ->getMock();
     }
 
-    public function testExecuteNoFormKey()
+    /**
+     * Test form without formKey
+     */
+    public function testExecuteNoFormKey(): void
     {
         $this->formKeyValidator->expects($this->once())
             ->method('validate')
@@ -361,7 +380,10 @@ public function testExecuteNoFormKey()
         $this->assertEquals($this->resultRedirect, $this->model->execute());
     }
 
-    public function testExecuteNoPostData()
+    /**
+     * Test executing without post data
+     */
+    public function testExecuteNoPostData(): void
     {
         $postValue = 'post_value';
         $url = 'url';
@@ -409,10 +431,11 @@ public function testExecuteNoPostData()
     }
 
     /**
+     * Tests executing
+     *
      * @param int $addressId
      * @param int $countryId
      * @param int $customerId
-     * @param bool $isRegionRequired
      * @param int $regionId
      * @param string $region
      * @param string $regionCode
@@ -433,7 +456,7 @@ public function testExecute(
         $newRegionId,
         $newRegion,
         $newRegionCode
-    ) {
+    ): void {
         $existingAddressData = [
             'country_id' => $countryId,
             'region_id' => $regionId,
@@ -517,7 +540,8 @@ public function testExecute(
             ->willReturnMap([
                 [
                     $this->regionData,
-                    $regionData, \Magento\Customer\Api\Data\RegionInterface::class,
+                    $regionData,
+                    \Magento\Customer\Api\Data\RegionInterface::class,
                     $this->dataObjectHelper,
                 ],
                 [
@@ -549,7 +573,7 @@ public function testExecute(
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the address.'))
             ->willReturnSelf();
 
@@ -578,7 +602,10 @@ public function testExecute(
         $this->assertEquals($this->resultRedirect, $this->model->execute());
     }
 
-    public function dataProviderTestExecute()
+    /**
+     * @return array
+     */
+    public function dataProviderTestExecute(): array
     {
         return [
             [1, 1, 1, null, '', null, '', null, ''],
@@ -609,7 +636,10 @@ public function dataProviderTestExecute()
         ];
     }
 
-    public function testExecuteInputException()
+    /**
+     * Tests input exception
+     */
+    public function testExecuteInputException(): void
     {
         $addressId = 1;
         $postValue = 'post_value';
@@ -637,7 +667,7 @@ public function testExecuteInputException()
             ->willThrowException(new InputException(__('InputException')));
 
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('InputException')
             ->willReturnSelf();
 
@@ -671,7 +701,10 @@ public function testExecuteInputException()
         $this->assertEquals($this->resultRedirect, $this->model->execute());
     }
 
-    public function testExecuteException()
+    /**
+     * Tests exception
+     */
+    public function testExecuteException(): void
     {
         $addressId = 1;
         $postValue = 'post_value';
@@ -700,7 +733,7 @@ public function testExecuteException()
             ->willThrowException($exception);
 
         $this->messageManager->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, __('We can\'t save the address.'))
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php
new file mode 100644
index 0000000000000..1bf881ff0a933
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/SaveTest.php
@@ -0,0 +1,213 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Controller\Address;
+
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SaveTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Customer\Controller\Adminhtml\Address\Save
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressRepositoryMock;
+
+    /**
+     * @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formFactoryMock;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataObjectHelperMock;
+
+    /**
+     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressDataFactoryMock;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var AddressInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $address;
+
+    /**
+     * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $json;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
+        $this->formFactoryMock = $this->createMock(\Magento\Customer\Model\Metadata\FormFactory::class);
+        $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $this->dataObjectHelperMock = $this->createMock(\Magento\Framework\Api\DataObjectHelper ::class);
+        $this->addressDataFactoryMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->address = $this->getMockBuilder(AddressInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resultJsonFactory = $this->getMockBuilder(JsonFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->json = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Customer\Controller\Adminhtml\Address\Save::class,
+            [
+                'addressRepository'     => $this->addressRepositoryMock,
+                'formFactory'           => $this->formFactoryMock,
+                'customerRepository'    => $this->customerRepositoryMock,
+                'dataObjectHelper'      => $this->dataObjectHelperMock,
+                'addressDataFactory'    => $this->addressDataFactoryMock,
+                'logger'            => $this->loggerMock,
+                'request'               => $this->requestMock,
+                'resultJsonFactory' => $this->resultJsonFactory
+            ]
+        );
+    }
+
+    public function testExecute(): void
+    {
+        $addressId = 11;
+        $customerId = 22;
+
+        $addressExtractedData = [
+            'entity_id' => $addressId,
+            'code'      => 'value',
+            'coolness'  => false,
+            'region'    => 'region',
+            'region_id' => 'region_id',
+        ];
+
+        $addressCompactedData = [
+            'entity_id'        => $addressId,
+            'default_billing'  => 'true',
+            'default_shipping' => 'true',
+            'code'             => 'value',
+            'coolness'         => false,
+            'region'           => 'region',
+            'region_id'        => 'region_id',
+        ];
+
+        $mergedAddressData = [
+            'entity_id'        => $addressId,
+            'default_billing'  => true,
+            'default_shipping' => true,
+            'code'             => 'value',
+            'region'           => [
+                'region'    => 'region',
+                'region_id' => 'region_id',
+            ],
+            'region_id'        => 'region_id',
+            'id'               => $addressId,
+        ];
+
+        $this->requestMock->method('getParam')
+            ->withConsecutive(['parent_id'], ['entity_id'])
+            ->willReturnOnConsecutiveCalls(22, 1);
+
+        $customerMock = $this->getMockBuilder(
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        )->disableOriginalConstructor()->getMock();
+
+        $this->customerRepositoryMock->expects($this->atLeastOnce())
+            ->method('getById')
+            ->with($customerId)
+            ->willReturn($customerMock);
+
+        $customerAddressFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
+        $customerAddressFormMock->expects($this->atLeastOnce())
+            ->method('extractData')
+            ->with($this->requestMock)
+            ->willReturn($addressExtractedData);
+        $customerAddressFormMock->expects($this->once())
+            ->method('compactData')
+            ->with($addressExtractedData)
+            ->willReturn($addressCompactedData);
+
+        $this->formFactoryMock->expects($this->exactly(1))
+            ->method('create')
+            ->willReturn($customerAddressFormMock);
+
+        $addressMock = $this->getMockBuilder(AddressInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->addressDataFactoryMock->expects($this->once())->method('create')->willReturn($addressMock);
+
+        $this->dataObjectHelperMock->expects($this->atLeastOnce())
+            ->method('populateWithArray')
+            ->willReturn(
+                [
+                    $addressMock,
+                    $mergedAddressData, AddressInterface::class,
+                    $this->dataObjectHelperMock,
+                ]
+            );
+        $this->addressRepositoryMock->expects($this->once())->method('save')->willReturn($this->address);
+        $this->address->expects($this->once())->method('getId')->willReturn($addressId);
+
+        $this->resultJsonFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->json);
+        $this->json->expects($this->once())
+            ->method('setData')
+            ->with(
+                [
+                    'message' => __('Customer address has been updated.'),
+                    'error' => false,
+                    'data' => [
+                        'entity_id' => $addressId
+                    ]
+                ]
+            )->willReturnSelf();
+
+        $this->assertEquals($this->json, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php
new file mode 100644
index 0000000000000..a724bdd24959b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/ValidateTest.php
@@ -0,0 +1,118 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Controller\Address;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ValidateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Customer\Controller\Adminhtml\Address\Validate
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJsonFactoryMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->formFactoryMock = $this->createMock(\Magento\Customer\Model\Metadata\FormFactory::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->resultJsonFactoryMock = $this->createMock(\Magento\Framework\Controller\Result\JsonFactory::class);
+        $this->resultRedirectFactoryMock = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Customer\Controller\Adminhtml\Address\Validate::class,
+            [
+                'formFactory'           => $this->formFactoryMock,
+                'request'               => $this->requestMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
+                'resultJsonFactory'     => $this->resultJsonFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Test method \Magento\Customer\Controller\Adminhtml\Address\Save::execute
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testExecute()
+    {
+        $addressId = 11;
+        $errors = ['Error Message 1', 'Error Message 2'];
+
+        $addressExtractedData = [
+            'entity_id'        => $addressId,
+            'default_billing'  => true,
+            'default_shipping' => true,
+            'code'             => 'value',
+            'region'           => [
+                'region'    => 'region',
+                'region_id' => 'region_id',
+            ],
+            'region_id'        => 'region_id',
+            'id'               => $addressId,
+        ];
+
+        $customerAddressFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
+
+        $customerAddressFormMock->expects($this->atLeastOnce())
+            ->method('extractData')
+            ->with($this->requestMock)
+            ->willReturn($addressExtractedData);
+        $customerAddressFormMock->expects($this->once())
+            ->method('validateData')
+            ->with($addressExtractedData)
+            ->willReturn($errors);
+
+        $this->formFactoryMock->expects($this->exactly(1))
+            ->method('create')
+            ->willReturn($customerAddressFormMock);
+
+        $resultJson = $this->createMock(\Magento\Framework\Controller\Result\Json::class);
+        $this->resultJsonFactoryMock->method('create')
+            ->willReturn($resultJson);
+
+        $validateResponseMock = $this->createPartialMock(
+            \Magento\Framework\DataObject::class,
+            ['getError', 'setMessages']
+        );
+        $validateResponseMock->method('setMessages')->willReturnSelf();
+        $validateResponseMock->method('getError')->willReturn(1);
+
+        $resultJson->method('setData')->willReturnSelf();
+
+        $this->assertEquals($resultJson, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
index 20177ab0b0db6..8f8ed0e37a46b 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/File/Address/UploadTest.php
@@ -70,7 +70,8 @@ protected function setUp()
             $this->context,
             $this->fileUploaderFactory,
             $this->addressMetadataService,
-            $this->logger
+            $this->logger,
+            'address'
         );
     }
 
@@ -104,27 +105,27 @@ public function testExecuteEmptyFiles()
 
     public function testExecute()
     {
-        $attributeCode = 'attribute_code';
+        $attributeCode = 'file_address_attribute';
+        $resultFileSize = 20000;
+        $resultFileName = 'text.txt';
+        $resultType = 'text/plain';
 
         $_FILES = [
-            'address' => [
-                'name' => [
-                    'new_0' => [
-                        $attributeCode => 'filename',
-                    ],
-                ],
+            $attributeCode => [
+                'name' => $resultFileName,
+                'type' => $resultType,
+                'size' => $resultFileSize
             ],
         ];
 
-        $resultFileName = '/filename.ext1';
         $resultFilePath = 'filepath';
         $resultFileUrl = 'viewFileUrl';
 
         $result = [
             'name' => $resultFileName,
-            'file' => $resultFileName,
-            'path' => $resultFilePath,
-            'tmp_name' => $resultFilePath . $resultFileName,
+            'type' => $resultType,
+            'size' => $resultFileSize,
+            'tmp_name' => $resultFilePath . '/' . $resultFileName,
             'url' => $resultFileUrl,
         ];
 
@@ -173,15 +174,16 @@ public function testExecute()
 
     public function testExecuteWithErrors()
     {
-        $attributeCode = 'attribute_code';
+        $attributeCode = 'file_address_attribute';
+        $resultFileSize = 20000;
+        $resultFileName = 'text.txt';
+        $resultType = 'text/plain';
 
         $_FILES = [
-            'address' => [
-                'name' => [
-                    'new_0' => [
-                        $attributeCode => 'filename',
-                    ],
-                ],
+            $attributeCode => [
+                'name' => $resultFileName,
+                'type' => $resultType,
+                'size' => $resultFileSize
             ],
         ];
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
index 22c5003544bed..78d9dd7003522 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\Message\MessageInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -164,6 +165,9 @@ protected function setUp()
         ];
     }
 
+    /**
+     * @param int $populateSequence
+     */
     protected function prepareMocksForTesting($populateSequence = 0)
     {
         $this->resultJsonFactory->expects($this->once())
@@ -239,10 +243,11 @@ protected function prepareMocksForErrorMessagesProcessing()
             ->method('getMessages')
             ->willReturn($this->messageCollection);
         $this->messageCollection->expects($this->once())
-            ->method('getItems')
+            ->method('getErrors')
             ->willReturn([$this->message]);
         $this->messageCollection->expects($this->once())
-            ->method('getCount')
+            ->method('getCountByType')
+            ->with(MessageInterface::TYPE_ERROR)
             ->willReturn(1);
         $this->message->expects($this->once())
             ->method('getText')
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index 5372bb11a89b5..c52d5b2fb370f 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
-use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
@@ -281,7 +280,6 @@ protected function setUp()
     public function testExecuteWithExistentCustomer()
     {
         $customerId = 22;
-        $addressId = 11;
         $subscription = 'true';
         $postValue = [
             'customer' => [
@@ -290,18 +288,6 @@ public function testExecuteWithExistentCustomer()
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
             ],
-            'address' => [
-                '_template_' => '_template_',
-                $addressId => [
-                    'entity_id' => $addressId,
-                    'default_billing' => 'true',
-                    'default_shipping' => 'true',
-                    'code' => 'value',
-                    'coolness' => false,
-                    'region' => 'region',
-                    'region_id' => 'region_id',
-                ],
-            ],
             'subscription' => $subscription,
         ];
         $extractedData = [
@@ -318,22 +304,6 @@ public function testExecuteWithExistentCustomer()
             CustomerInterface::DEFAULT_BILLING => 2,
             CustomerInterface::DEFAULT_SHIPPING => 2
         ];
-        $addressExtractedData = [
-            'entity_id' => $addressId,
-            'code' => 'value',
-            'coolness' => false,
-            'region' => 'region',
-            'region_id' => 'region_id',
-        ];
-        $addressCompactedData = [
-            'entity_id' => $addressId,
-            'default_billing' => 'true',
-            'default_shipping' => 'true',
-            'code' => 'value',
-            'coolness' => false,
-            'region' => 'region',
-            'region_id' => 'region_id',
-        ];
         $savedData = [
             'entity_id' => $customerId,
             'darkness' => true,
@@ -341,61 +311,40 @@ public function testExecuteWithExistentCustomer()
             CustomerInterface::DEFAULT_BILLING => false,
             CustomerInterface::DEFAULT_SHIPPING => false,
         ];
-        $savedAddressData = [
-            'entity_id' => $addressId,
-            'default_billing' => true,
-            'default_shipping' => true,
-        ];
         $mergedData = [
             'entity_id' => $customerId,
             'darkness' => true,
             'name' => 'Name',
             'code' => 'value',
             'disable_auto_group_change' => 0,
-            CustomerInterface::DEFAULT_BILLING => $addressId,
-            CustomerInterface::DEFAULT_SHIPPING => $addressId,
             'confirmation' => false,
             'sendemail_store_id' => '1',
             'id' => $customerId,
         ];
-        $mergedAddressData = [
-            'entity_id' => $addressId,
-            'default_billing' => true,
-            'default_shipping' => true,
-            'code' => 'value',
-            'region' => [
-                    'region' => 'region',
-                    'region_id' => 'region_id',
-                ],
-            'region_id' => 'region_id',
-            'id' => $addressId,
-        ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
-        $attributeMock->expects($this->exactly(2))
+        $attributeMock->expects($this->atLeastOnce())
             ->method('getAttributeCode')
             ->willReturn('coolness');
-        $attributeMock->expects($this->exactly(2))
+        $attributeMock->expects($this->atLeastOnce())
             ->method('getFrontendInput')
             ->willReturn('int');
         $attributes = [$attributeMock];
 
-        $this->requestMock->expects($this->any())
+        $this->requestMock->expects($this->atLeastOnce())
             ->method('getPostValue')
             ->willReturnMap([
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
-                ['address/' . $addressId, null, $postValue['address'][$addressId]],
             ]);
-        $this->requestMock->expects($this->exactly(3))
+        $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address', null, $postValue['address']],
                     ['subscription', null, $subscription],
                 ]
             );
@@ -404,16 +353,15 @@ public function testExecuteWithExistentCustomer()
         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectMock->expects($this->exactly(2))
+        $objectMock->expects($this->atLeastOnce())
             ->method('getData')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address/' . $addressId, null, $postValue['address'][$addressId]],
                 ]
             );
 
-        $this->objectFactoryMock->expects($this->exactly(2))
+        $this->objectFactoryMock->expects($this->exactly(1))
             ->method('create')
             ->with(['data' => $postValue])
             ->willReturn($objectMock);
@@ -432,23 +380,7 @@ public function testExecuteWithExistentCustomer()
         $customerFormMock->expects($this->once())
             ->method('getAttributes')
             ->willReturn($attributes);
-
-        $customerAddressFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
-        )->disableOriginalConstructor()->getMock();
-        $customerAddressFormMock->expects($this->once())
-            ->method('extractData')
-            ->with($this->requestMock, 'address/' . $addressId)
-            ->willReturn($addressExtractedData);
-        $customerAddressFormMock->expects($this->once())
-            ->method('compactData')
-            ->with($addressExtractedData)
-            ->willReturn($addressCompactedData);
-        $customerAddressFormMock->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn($attributes);
-
-        $this->formFactoryMock->expects($this->exactly(2))
+        $this->formFactoryMock->expects($this->exactly(1))
             ->method('create')
             ->willReturnMap(
                 [
@@ -461,15 +393,6 @@ public function testExecuteWithExistentCustomer()
                         [],
                         $customerFormMock
                     ],
-                    [
-                        AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
-                        'adminhtml_customer_address',
-                        $savedAddressData,
-                        false,
-                        Form::DONT_IGNORE_INVISIBLE,
-                        [],
-                        $customerAddressFormMock
-                    ],
                 ]
             );
 
@@ -492,25 +415,7 @@ public function testExecuteWithExistentCustomer()
             ->with($customerMock)
             ->willReturn($savedData);
 
-        $addressMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerAddressRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($addressId)
-            ->willReturn($addressMock);
-
-        $this->customerAddressMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($addressMock)
-            ->willReturn($savedAddressData);
-
-        $this->addressDataFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($addressMock);
-
-        $this->dataHelperMock->expects($this->exactly(2))
+        $this->dataHelperMock->expects($this->atLeastOnce())
             ->method('populateWithArray')
             ->willReturnMap(
                 [
@@ -519,19 +424,9 @@ public function testExecuteWithExistentCustomer()
                         $mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
                         $this->dataHelperMock
                     ],
-                    [
-                        $addressMock,
-                        $mergedAddressData, \Magento\Customer\Api\Data\AddressInterface::class,
-                        $this->dataHelperMock
-                    ],
                 ]
             );
 
-        $customerMock->expects($this->once())
-            ->method('setAddresses')
-            ->with([$addressMock])
-            ->willReturnSelf();
-
         $this->customerRepositoryMock->expects($this->once())
             ->method('save')
             ->with($customerMock)
@@ -608,63 +503,33 @@ public function testExecuteWithExistentCustomer()
     public function testExecuteWithNewCustomer()
     {
         $customerId = 22;
-        $addressId = 11;
+
         $subscription = '0';
         $postValue = [
             'customer' => [
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
             ],
-            'address' => [
-                '_template_' => '_template_',
-                $addressId => [
-                    'entity_id' => $addressId,
-                    'code' => 'value',
-                    'coolness' => false,
-                    'region' => 'region',
-                    'region_id' => 'region_id',
-                ],
-            ],
             'subscription' => $subscription,
         ];
         $extractedData = [
             'coolness' => false,
             'disable_auto_group_change' => 'false',
         ];
-        $addressExtractedData = [
-            'entity_id' => $addressId,
-            'code' => 'value',
-            'coolness' => false,
-            'region' => 'region',
-            'region_id' => 'region_id',
-        ];
         $mergedData = [
             'disable_auto_group_change' => 0,
             CustomerInterface::DEFAULT_BILLING => null,
             CustomerInterface::DEFAULT_SHIPPING => null,
             'confirmation' => false,
         ];
-        $mergedAddressData = [
-            'entity_id' => $addressId,
-            'default_billing' => false,
-            'default_shipping' => false,
-            'code' => 'value',
-            'region' => [
-                    'region' => 'region',
-                    'region_id' => 'region_id',
-                ],
-            'region_id' => 'region_id',
-            'id' => $addressId,
-        ];
-
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
-        $attributeMock->expects($this->exactly(2))
+        $attributeMock->expects($this->atLeastOnce())
             ->method('getAttributeCode')
             ->willReturn('coolness');
-        $attributeMock->expects($this->exactly(2))
+        $attributeMock->expects($this->atLeastOnce())
             ->method('getFrontendInput')
             ->willReturn('int');
         $attributes = [$attributeMock];
@@ -674,14 +539,12 @@ public function testExecuteWithNewCustomer()
             ->willReturnMap([
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
-                ['address/' . $addressId, null, $postValue['address'][$addressId]],
             ]);
-        $this->requestMock->expects($this->exactly(3))
+        $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address', null, $postValue['address']],
                     ['subscription', null, $subscription],
                 ]
             );
@@ -690,16 +553,15 @@ public function testExecuteWithNewCustomer()
         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectMock->expects($this->exactly(2))
+        $objectMock->expects($this->atLeastOnce())
             ->method('getData')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address/' . $addressId, null, $postValue['address'][$addressId]],
                 ]
             );
 
-        $this->objectFactoryMock->expects($this->exactly(2))
+        $this->objectFactoryMock->expects($this->atLeastOnce())
             ->method('create')
             ->with(['data' => $postValue])
             ->willReturn($objectMock);
@@ -719,22 +581,7 @@ public function testExecuteWithNewCustomer()
             ->method('getAttributes')
             ->willReturn($attributes);
 
-        $customerAddressFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
-        )->disableOriginalConstructor()->getMock();
-        $customerAddressFormMock->expects($this->once())
-            ->method('extractData')
-            ->with($this->requestMock, 'address/' . $addressId)
-            ->willReturn($addressExtractedData);
-        $customerAddressFormMock->expects($this->once())
-            ->method('compactData')
-            ->with($addressExtractedData)
-            ->willReturn($addressExtractedData);
-        $customerAddressFormMock->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn($attributes);
-
-        $this->formFactoryMock->expects($this->exactly(2))
+        $this->formFactoryMock->expects($this->exactly(1))
             ->method('create')
             ->willReturnMap(
                 [
@@ -747,15 +594,6 @@ public function testExecuteWithNewCustomer()
                         [],
                         $customerFormMock
                     ],
-                    [
-                        AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
-                        'adminhtml_customer_address',
-                        [],
-                        false,
-                        Form::DONT_IGNORE_INVISIBLE,
-                        [],
-                        $customerAddressFormMock
-                    ],
                 ]
             );
 
@@ -768,25 +606,7 @@ public function testExecuteWithNewCustomer()
             ->method('create')
             ->willReturn($customerMock);
 
-        $addressMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->addressDataFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($addressMock);
-
-        $this->customerAddressRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($addressId)
-            ->willReturn($addressMock);
-
-        $this->customerAddressMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($addressMock)
-            ->willReturn([]);
-
-        $this->dataHelperMock->expects($this->exactly(2))
+        $this->dataHelperMock->expects($this->atLeastOnce())
             ->method('populateWithArray')
             ->willReturnMap(
                 [
@@ -795,11 +615,6 @@ public function testExecuteWithNewCustomer()
                         $mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
                         $this->dataHelperMock
                     ],
-                    [
-                        $addressMock,
-                        $mergedAddressData, \Magento\Customer\Api\Data\AddressInterface::class,
-                        $this->dataHelperMock
-                    ],
                 ]
             );
 
@@ -904,12 +719,11 @@ public function testExecuteWithNewCustomerAndValidationException()
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
             ]);
-        $this->requestMock->expects($this->exactly(2))
+        $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address', null, null],
                 ]
             );
 
@@ -1047,12 +861,11 @@ public function testExecuteWithNewCustomerAndLocalizedException()
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
             ]);
-        $this->requestMock->expects($this->exactly(2))
+        $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address', null, null],
                 ]
             );
 
@@ -1190,12 +1003,11 @@ public function testExecuteWithNewCustomerAndException()
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
             ]);
-        $this->requestMock->expects($this->exactly(2))
+        $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
             ->willReturnMap(
                 [
                     ['customer', null, $postValue['customer']],
-                    ['address', null, null],
                 ]
             );
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
index 7209ac9fd24b0..5adb902601630 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
@@ -141,12 +141,6 @@ protected function setUp()
 
     public function testExecute()
     {
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->willReturn([
-                '_template_' => null,
-                'address_index' => null
-            ]);
         $customerEntityId = 2;
         $this->request->expects($this->once())
             ->method('getParam')
@@ -162,11 +156,6 @@ public function testExecute()
         $this->form->expects($this->once())->method('setInvisibleIgnored');
         $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
 
-        $error = $this->createMock(\Magento\Framework\Message\Error::class);
-        $this->form->expects($this->once())
-            ->method('validateData')
-            ->willReturn([$error]);
-
         $validationResult = $this->getMockForAbstractClass(
             \Magento\Customer\Api\Data\ValidationResultsInterface::class,
             [],
@@ -188,9 +177,6 @@ public function testExecute()
 
     public function testExecuteWithoutAddresses()
     {
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->willReturn(null);
         $this->form->expects($this->once())
             ->method('setInvisibleIgnored');
         $this->form->expects($this->atLeastOnce())
@@ -223,9 +209,6 @@ public function testExecuteWithoutAddresses()
 
     public function testExecuteWithException()
     {
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->willReturn(null);
         $this->form->expects($this->once())
             ->method('setInvisibleIgnored');
         $this->form->expects($this->atLeastOnce())
@@ -265,12 +248,6 @@ public function testExecuteWithException()
 
     public function testExecuteWithNewCustomerAndNoEntityId()
     {
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->willReturn([
-                '_template_' => null,
-                'address_index' => null
-            ]);
         $this->request->expects($this->once())
             ->method('getParam')
             ->with('customer')
@@ -282,11 +259,6 @@ public function testExecuteWithNewCustomerAndNoEntityId()
         $this->form->expects($this->once())->method('setInvisibleIgnored');
         $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
 
-        $error = $this->createMock(\Magento\Framework\Message\Error::class);
-        $this->form->expects($this->once())
-            ->method('validateData')
-            ->willReturn([$error]);
-
         $validationResult = $this->getMockForAbstractClass(
             \Magento\Customer\Api\Data\ValidationResultsInterface::class,
             [],
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
index 59c940bb85297..8e1aeaa87a10e 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
@@ -206,4 +206,53 @@ public function testExecuteGetParamImage()
         );
         $this->assertSame($this->resultRawMock, $controller->execute());
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     * @expectedExceptionMessage Page not found.
+     */
+    public function testExecuteInvalidFile()
+    {
+        $file = '../../../app/etc/env.php';
+        $decodedFile = base64_encode($file);
+        $fileName = 'customer/' . $file;
+        $path = 'path';
+
+        $this->requestMock->expects($this->atLeastOnce())->method('getParam')->with('file')->willReturn($decodedFile);
+
+        $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($fileName)->willReturn($path);
+
+        $this->fileSystemMock->expects($this->once())->method('getDirectoryRead')
+            ->with(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA)
+            ->willReturn($this->directoryMock);
+
+        $this->storage->expects($this->once())->method('processStorageFile')->with($path)->willReturn(false);
+
+        $this->objectManagerMock->expects($this->any())->method('get')
+            ->willReturnMap(
+                [
+                    [\Magento\Framework\Filesystem::class, $this->fileSystemMock],
+                    [\Magento\MediaStorage\Helper\File\Storage::class, $this->storage],
+                ]
+            );
+
+        $this->urlDecoderMock->expects($this->once())->method('decode')->with($decodedFile)->willReturn($file);
+        $fileFactoryMock = $this->createMock(
+            \Magento\Framework\App\Response\Http\FileFactory::class,
+            [],
+            [],
+            '',
+            false
+        );
+
+        $controller = $this->objectManager->getObject(
+            \Magento\Customer\Controller\Adminhtml\Index\Viewfile::class,
+            [
+                'context' => $this->contextMock,
+                'urlDecoder' => $this->urlDecoderMock,
+                'fileFactory' => $fileFactoryMock,
+            ]
+        );
+        $controller->execute();
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
index aaaa799a5e26d..14ed09f73325b 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
@@ -3,13 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Test customer ajax login controller
- */
 namespace Magento\Customer\Test\Unit\Controller\Ajax;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Controller\Ajax\Login;
+use Magento\Customer\Model\Account\Redirect;
+use Magento\Customer\Model\AccountManagement;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\Result\Raw;
+use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\ObjectManager\ObjectManager as FakeObjectManager;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,223 +36,190 @@
 class LoginTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Customer\Controller\Ajax\Login
+     * @var Login
      */
-    protected $object;
+    private $controller;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var Http|MockObject
      */
-    protected $request;
+    private $request;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|MockObject
      */
-    protected $response;
+    private $response;
 
     /**
-     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    protected $customerSession;
+    private $customerSession;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var FakeObjectManager|MockObject
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
-     * @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AccountManagement|MockObject
      */
-    protected $customerAccountManagementMock;
+    private $accountManagement;
 
     /**
-     * @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    protected $jsonHelperMock;
+    private $jsonHelper;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject
+     * @var Json|MockObject
      */
-    protected $resultJson;
+    private $resultJson;
 
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory| \PHPUnit_Framework_MockObject_MockObject
+     * @var JsonFactory|MockObject
      */
-    protected $resultJsonFactory;
+    private $resultJsonFactory;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Raw| \PHPUnit_Framework_MockObject_MockObject
+     * @var Raw|MockObject
      */
-    protected $resultRaw;
+    private $resultRaw;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectInterface|MockObject
      */
-    protected $redirectMock;
+    private $redirect;
 
     /**
-     * @var \Magento\Framework\Stdlib\CookieManagerInterface| \PHPUnit_Framework_MockObject_MockObject
+     * @var CookieManagerInterface|MockObject
      */
     private $cookieManager;
 
     /**
-     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory| \PHPUnit_Framework_MockObject_MockObject
+     * @var CookieMetadataFactory|MockObject
      */
     private $cookieMetadataFactory;
 
     /**
-     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadata| \PHPUnit_Framework_MockObject_MockObject
+     * @inheritdoc
      */
-    private $cookieMetadata;
-
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()->getMock();
+        $this->request = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->response = $this->createPartialMock(
-            \Magento\Framework\App\ResponseInterface::class,
+            ResponseInterface::class,
             ['setRedirect', 'sendResponse', 'representJson', 'setHttpResponseCode']
         );
         $this->customerSession = $this->createPartialMock(
-            \Magento\Customer\Model\Session::class,
+            Session::class,
             [
                 'isLoggedIn',
                 'getLastCustomerId',
                 'getBeforeAuthUrl',
                 'setBeforeAuthUrl',
                 'setCustomerDataAsLoggedIn',
-                'regenerateId'
+                'regenerateId',
+                'getData'
             ]
         );
-        $this->objectManager = $this->createPartialMock(\Magento\Framework\ObjectManager\ObjectManager::class, ['get']);
-        $this->customerAccountManagementMock =
-            $this->createPartialMock(\Magento\Customer\Model\AccountManagement::class, ['authenticate']);
+        $this->objectManager = $this->createPartialMock(FakeObjectManager::class, ['get']);
+        $this->accountManagement = $this->createPartialMock(AccountManagement::class, ['authenticate']);
 
-        $this->jsonHelperMock = $this->createPartialMock(\Magento\Framework\Json\Helper\Data::class, ['jsonDecode']);
+        $this->jsonHelper = $this->createPartialMock(Data::class, ['jsonDecode']);
 
-        $this->resultJson = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+        $this->resultJson = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
+        $this->resultJsonFactory = $this->getMockBuilder(JsonFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->cookieManager = $this->getMockBuilder(\Magento\Framework\Stdlib\CookieManagerInterface::class)
+        $this->cookieManager = $this->getMockBuilder(CookieManagerInterface::class)
             ->setMethods(['getCookie', 'deleteCookie'])
             ->getMockForAbstractClass();
-        $this->cookieMetadataFactory = $this->getMockBuilder(
-            \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class
-        )->disableOriginalConstructor()->getMock();
-        $this->cookieMetadata = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadata::class)
+        $this->cookieMetadataFactory = $this->getMockBuilder(CookieMetadataFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->resultRaw = $this->getMockBuilder(\Magento\Framework\Controller\Result\Raw::class)
+        $this->resultRaw = $this->getMockBuilder(Raw::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $resultRawFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\RawFactory::class)
+        $resultRawFactory = $this->getMockBuilder(RawFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $resultRawFactory->expects($this->atLeastOnce())
-            ->method('create')
+        $resultRawFactory->method('create')
             ->willReturn($this->resultRaw);
 
-        $contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
-        $this->redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $contextMock->expects($this->atLeastOnce())->method('getRedirect')->willReturn($this->redirectMock);
-        $contextMock->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->request);
-
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->object = $objectManager->getObject(
-            \Magento\Customer\Controller\Ajax\Login::class,
+        /** @var Context|MockObject $context */
+        $context = $this->createMock(Context::class);
+        $this->redirect = $this->createMock(RedirectInterface::class);
+        $context->method('getRedirect')
+            ->willReturn($this->redirect);
+        $context->method('getRequest')
+            ->willReturn($this->request);
+
+        $objectManager = new ObjectManager($this);
+        $this->controller = $objectManager->getObject(
+            Login::class,
             [
-                'context' => $contextMock,
+                'context' => $context,
                 'customerSession' => $this->customerSession,
-                'helper' => $this->jsonHelperMock,
+                'helper' => $this->jsonHelper,
                 'response' => $this->response,
                 'resultRawFactory' => $resultRawFactory,
                 'resultJsonFactory' => $this->resultJsonFactory,
                 'objectManager' => $this->objectManager,
-                'customerAccountManagement' => $this->customerAccountManagementMock,
+                'customerAccountManagement' => $this->accountManagement,
                 'cookieManager' => $this->cookieManager,
                 'cookieMetadataFactory' => $this->cookieMetadataFactory
             ]
         );
     }
 
-    public function testLogin()
+    /**
+     * Checks successful login.
+     */
+    public function testLogin(): void
     {
         $jsonRequest = '{"username":"customer@example.com", "password":"password"}';
         $loginSuccessResponse = '{"errors": false, "message":"Login successful."}';
+        $this->withRequest($jsonRequest);
 
-        $this->request
-            ->expects($this->any())
-            ->method('getContent')
-            ->willReturn($jsonRequest);
-
-        $this->request
-            ->expects($this->any())
-            ->method('getMethod')
-            ->willReturn('POST');
-
-        $this->request
-            ->expects($this->any())
-            ->method('isXmlHttpRequest')
-            ->willReturn(true);
-
-        $this->resultJsonFactory->expects($this->atLeastOnce())
-            ->method('create')
+        $this->resultJsonFactory->method('create')
             ->willReturn($this->resultJson);
 
-        $this->jsonHelperMock
-            ->expects($this->any())
-            ->method('jsonDecode')
+        $this->jsonHelper->method('jsonDecode')
             ->with($jsonRequest)
             ->willReturn(['username' => 'customer@example.com', 'password' => 'password']);
 
-        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $this->customerAccountManagementMock
-            ->expects($this->any())
-            ->method('authenticate')
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->getMockForAbstractClass(CustomerInterface::class);
+        $this->accountManagement->method('authenticate')
             ->with('customer@example.com', 'password')
-            ->willReturn($customerMock);
+            ->willReturn($customer);
 
-        $this->customerSession->expects($this->once())
-            ->method('setCustomerDataAsLoggedIn')
-            ->with($customerMock);
+        $this->customerSession->method('setCustomerDataAsLoggedIn')
+            ->with($customer);
+        $this->customerSession->method('regenerateId');
 
-        $this->customerSession->expects($this->once())->method('regenerateId');
+        /** @var Redirect|MockObject $redirect */
+        $redirect = $this->createMock(Redirect::class);
+        $this->controller->setAccountRedirect($redirect);
+        $redirect->method('getRedirectCookie')
+            ->willReturn('some_url1');
 
-        $redirectMock = $this->createMock(\Magento\Customer\Model\Account\Redirect::class);
-        $this->object->setAccountRedirect($redirectMock);
-        $redirectMock->expects($this->once())->method('getRedirectCookie')->willReturn('some_url1');
+        $this->withCookieManager();
 
-        $this->cookieManager->expects($this->once())
-            ->method('getCookie')
-            ->with('mage-cache-sessid')
-            ->willReturn(true);
-        $this->cookieMetadataFactory->expects($this->once())
-            ->method('createCookieMetadata')
-            ->willReturn($this->cookieMetadata);
-        $this->cookieMetadata->expects($this->once())
-            ->method('setPath')
-            ->with('/')
-            ->willReturnSelf();
-        $this->cookieManager->expects($this->once())
-            ->method('deleteCookie')
-            ->with('mage-cache-sessid', $this->cookieMetadata)
-            ->willReturnSelf();
+        $this->withScopeConfig();
 
-        $scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->object->setScopeConfig($scopeConfigMock);
-        $scopeConfigMock->expects($this->once())->method('getValue')
-            ->with('customer/startup/redirect_dashboard')
-            ->willReturn(0);
-
-        $this->redirectMock->expects($this->once())->method('success')->willReturn('some_url2');
-        $this->resultRaw->expects($this->never())->method('setHttpResponseCode');
+        $this->redirect->method('success')
+            ->willReturn('some_url2');
+        $this->resultRaw->expects(self::never())
+            ->method('setHttpResponseCode');
 
         $result = [
             'errors' => false,
@@ -241,67 +227,99 @@ public function testLogin()
             'redirectUrl' => 'some_url2',
         ];
 
-        $this->resultJson
-            ->expects($this->once())
-            ->method('setData')
+        $this->resultJson->method('setData')
             ->with($result)
             ->willReturn($loginSuccessResponse);
-        $this->assertEquals($loginSuccessResponse, $this->object->execute());
+        self::assertEquals($loginSuccessResponse, $this->controller->execute());
     }
 
-    public function testLoginFailure()
+    /**
+     * Checks unsuccessful login.
+     */
+    public function testLoginFailure(): void
     {
         $jsonRequest = '{"username":"invalid@example.com", "password":"invalid"}';
         $loginFailureResponse = '{"message":"Invalid login or password."}';
+        $this->withRequest($jsonRequest);
 
-        $this->request
-            ->expects($this->any())
-            ->method('getContent')
-            ->willReturn($jsonRequest);
-
-        $this->request
-            ->expects($this->any())
-            ->method('getMethod')
-            ->willReturn('POST');
-
-        $this->request
-            ->expects($this->any())
-            ->method('isXmlHttpRequest')
-            ->willReturn(true);
-
-        $this->resultJsonFactory->expects($this->once())
-            ->method('create')
+        $this->resultJsonFactory->method('create')
             ->willReturn($this->resultJson);
 
-        $this->jsonHelperMock
-            ->expects($this->any())
-            ->method('jsonDecode')
+        $this->jsonHelper->method('jsonDecode')
             ->with($jsonRequest)
             ->willReturn(['username' => 'invalid@example.com', 'password' => 'invalid']);
 
-        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $this->customerAccountManagementMock
-            ->expects($this->any())
-            ->method('authenticate')
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->getMockForAbstractClass(CustomerInterface::class);
+        $this->accountManagement->method('authenticate')
             ->with('invalid@example.com', 'invalid')
             ->willThrowException(new InvalidEmailOrPasswordException(__('Invalid login or password.')));
 
-        $this->customerSession->expects($this->never())
+        $this->customerSession->expects(self::never())
             ->method('setCustomerDataAsLoggedIn')
-            ->with($customerMock);
-
-        $this->customerSession->expects($this->never())->method('regenerateId');
+            ->with($customer);
+        $this->customerSession->expects(self::never())
+            ->method('regenerateId');
 
         $result = [
             'errors' => true,
             'message' => __('Invalid login or password.')
         ];
-        $this->resultJson
-            ->expects($this->once())
-            ->method('setData')
+        $this->resultJson->method('setData')
             ->with($result)
             ->willReturn($loginFailureResponse);
 
-        $this->assertEquals($loginFailureResponse, $this->object->execute());
+        self::assertEquals($loginFailureResponse, $this->controller->execute());
+    }
+
+    /**
+     * Emulates request behavior.
+     *
+     * @param string $jsonRequest
+     */
+    private function withRequest(string $jsonRequest): void
+    {
+        $this->request->method('getContent')
+            ->willReturn($jsonRequest);
+
+        $this->request->method('getMethod')
+            ->willReturn('POST');
+
+        $this->request->method('isXmlHttpRequest')
+            ->willReturn(true);
+    }
+
+    /**
+     * Emulates cookie manager behavior.
+     */
+    private function withCookieManager(): void
+    {
+        $this->cookieManager->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(true);
+        $cookieMetadata = $this->getMockBuilder(CookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cookieMetadataFactory->method('createCookieMetadata')
+            ->willReturn($cookieMetadata);
+        $cookieMetadata->method('setPath')
+            ->with('/')
+            ->willReturnSelf();
+        $this->cookieManager->method('deleteCookie')
+            ->with('mage-cache-sessid', $cookieMetadata)
+            ->willReturnSelf();
+    }
+
+    /**
+     * Emulates config behavior.
+     */
+    private function withScopeConfig(): void
+    {
+        /** @var ScopeConfigInterface|MockObject $scopeConfig */
+        $scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->controller->setScopeConfig($scopeConfig);
+        $scopeConfig->method('getValue')
+            ->with('customer/startup/redirect_dashboard')
+            ->willReturn(0);
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
new file mode 100644
index 0000000000000..5a7cf42be2c7e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * 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;
+use Magento\Customer\CustomerData\Section\Identifier;
+use Magento\Customer\CustomerData\SectionPoolInterface;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Escaper;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+class LoadTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Load
+     */
+    private $loadAction;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var JsonFactory|MockObject
+     */
+    private $resultJsonFactoryMock;
+
+    /**
+     * @var Identifier|MockObject
+     */
+    private $sectionIdentifierMock;
+
+    /**
+     * @var SectionPoolInterface|MockObject
+     */
+    private $sectionPoolMock;
+
+    /**
+     * @var \Magento\Framework\Escaper|MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @var Json|MockObject
+     */
+    private $resultJsonMock;
+
+    /**
+     * @var HttpRequest|MockObject
+     */
+    private $httpRequestMock;
+
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->resultJsonFactoryMock = $this->createMock(JsonFactory::class);
+        $this->sectionIdentifierMock = $this->createMock(Identifier::class);
+        $this->sectionPoolMock = $this->getMockForAbstractClass(SectionPoolInterface::class);
+        $this->escaperMock = $this->createMock(Escaper::class);
+        $this->httpRequestMock = $this->createMock(HttpRequest::class);
+        $this->resultJsonMock = $this->createMock(Json::class);
+
+        $this->contextMock->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->httpRequestMock);
+
+        $this->loadAction = new Load(
+            $this->contextMock,
+            $this->resultJsonFactoryMock,
+            $this->sectionIdentifierMock,
+            $this->sectionPoolMock,
+            $this->escaperMock
+        );
+    }
+
+    /**
+     * @param string $sectionNames
+     * @param bool $forceNewSectionTimestamp
+     * @param string[] $sectionNamesAsArray
+     * @param bool $forceNewTimestamp
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute($sectionNames, $forceNewSectionTimestamp, $sectionNamesAsArray, $forceNewTimestamp)
+    {
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJsonMock);
+        $this->resultJsonMock->expects($this->exactly(2))
+            ->method('setHeader')
+            ->withConsecutive(
+                ['Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store'],
+                ['Pragma', 'no-cache']
+            );
+
+        $this->httpRequestMock->expects($this->exactly(2))
+            ->method('getParam')
+            ->withConsecutive(['sections'], ['force_new_section_timestamp'])
+            ->willReturnOnConsecutiveCalls($sectionNames, $forceNewSectionTimestamp);
+
+        $this->sectionPoolMock->expects($this->once())
+            ->method('getSectionsData')
+            ->with($sectionNamesAsArray, $forceNewTimestamp)
+            ->willReturn([
+                'message' => 'some message',
+                'someKey' => 'someValue'
+            ]);
+
+        $this->resultJsonMock->expects($this->once())
+            ->method('setData')
+            ->with([
+                'message' => 'some message',
+                'someKey' => 'someValue'
+            ])
+            ->willReturn($this->resultJsonMock);
+
+        $this->loadAction->execute();
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                'sectionNames' => 'sectionName1,sectionName2,sectionName3',
+                'forceNewSectionTimestamp' => 'forceNewSectionTimestamp',
+                'sectionNamesAsArray' => ['sectionName1', 'sectionName2', 'sectionName3'],
+                'forceNewTimestamp' => true
+            ],
+            [
+                'sectionNames' => null,
+                'forceNewSectionTimestamp' => null,
+                'sectionNamesAsArray' => null,
+                'forceNewTimestamp' => false
+            ],
+        ];
+    }
+
+    public function testExecuteWithThrowException()
+    {
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJsonMock);
+        $this->resultJsonMock->expects($this->exactly(2))
+            ->method('setHeader')
+            ->withConsecutive(
+                ['Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store'],
+                ['Pragma', 'no-cache']
+            );
+
+        $this->httpRequestMock->expects($this->once())
+            ->method('getParam')
+            ->with('sections')
+            ->willThrowException(new \Exception('Some Message'));
+
+        $this->resultJsonMock->expects($this->once())
+            ->method('setStatusHeader')
+            ->with(
+                \Zend\Http\Response::STATUS_CODE_400,
+                \Zend\Http\AbstractMessage::VERSION_11,
+                'Bad Request'
+            );
+
+        $this->escaperMock->expects($this->once())
+            ->method('escapeHtml')
+            ->with('Some Message')
+            ->willReturn('Some Message');
+
+        $this->resultJsonMock->expects($this->once())
+            ->method('setData')
+            ->with(['message' => 'Some Message'])
+            ->willReturn($this->resultJsonMock);
+
+        $this->loadAction->execute();
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php
index a4246b6398fd1..5beea22bda3d7 100644
--- a/app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php
@@ -86,6 +86,9 @@ public function testBeforeStart($result, $callCount)
         $this->plugin->beforeStart($this->sessionManager);
     }
 
+    /**
+     * @return array
+     */
     public function beforeStartDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php
index 98fee70e335f7..2b67df1aee292 100644
--- a/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php
+++ b/app/code/Magento/Customer/Test/Unit/CustomerData/SectionPoolTest.php
@@ -63,7 +63,7 @@ public function testGetSectionsDataAllSections()
 
         $this->identifierMock->expects($this->once())
             ->method('markSections')
-            //check also default value for $updateIds = false
+            //check also default value for $forceTimestamp = false
             ->with($allSectionsData, $sectionNames, false)
             ->willReturn($identifierResult);
         $modelResult = $this->model->getSectionsData($sectionNames);
diff --git a/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
index e41831a1ced60..2c49a81676c1e 100644
--- a/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php
@@ -78,6 +78,9 @@ public function testGetStreetLines($numLines, $expectedNumLines)
         $this->assertEquals($expectedNumLines, $this->helper->getStreetLines());
     }
 
+    /**
+     * @return array
+     */
     public function providerGetStreetLines()
     {
         return [
@@ -190,6 +193,9 @@ public function testConvertStreetLines($origStreets, $toCount, $result)
         $this->assertEquals($result, $this->helper->convertStreetLines($origStreets, $toCount));
     }
 
+    /**
+     * @return array
+     */
     public function getConvertStreetLinesDataProvider()
     {
         return [
@@ -206,7 +212,7 @@ public function getConvertStreetLinesDataProvider()
     public function testIsVatValidationEnabled($store, $result)
     {
         $this->scopeConfig->expects($this->once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VAT_VALIDATION_ENABLED,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -236,7 +242,7 @@ public function getVatValidationEnabledDataProvider()
     public function testHasValidateOnEachTransaction($store, $result)
     {
         $this->scopeConfig->expects($this->once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VIV_ON_EACH_TRANSACTION,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -291,7 +297,7 @@ public function getTaxCalculationAddressTypeDataProvider()
     public function testIsDisableAutoGroupAssignDefaultValue()
     {
         $this->scopeConfig->expects($this->once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -303,7 +309,7 @@ public function testIsDisableAutoGroupAssignDefaultValue()
     public function testIsVatAttributeVisible()
     {
         $this->scopeConfig->expects($this->once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VAT_FRONTEND_VISIBILITY,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -328,6 +334,9 @@ public function testGetFormatTypeRenderer($code, $result)
         $this->assertEquals($result, $this->helper->getFormatTypeRenderer($code));
     }
 
+    /**
+     * @return array
+     */
     public function getFormatTypeRendererDataProvider()
     {
         $renderer = $this->getMockBuilder(\Magento\Customer\Block\Address\Renderer\RendererInterface::class)
@@ -362,6 +371,9 @@ public function testGetFormat($code, $result)
         $this->assertEquals($result, $this->helper->getFormat($code));
     }
 
+    /**
+     * @return array
+     */
     public function getFormatDataProvider()
     {
         return [
@@ -392,6 +404,9 @@ public function testIsAttributeVisible($attributeCode, $isMetadataExists)
         $this->assertEquals($isMetadataExists, $this->helper->isAttributeVisible($attributeCode));
     }
 
+    /**
+     * @return array
+     */
     public function isAttributeVisibleDataProvider()
     {
         return [
@@ -399,4 +414,43 @@ public function isAttributeVisibleDataProvider()
             ['invalid_code', false]
         ];
     }
+
+    /**
+     * Test is required filed by attribute code
+     *
+     * @param string $attributeCode
+     * @param bool $isMetadataExists
+     * @dataProvider isAttributeRequiredDataProvider
+     * @covers \Magento\Customer\Helper\Address::isAttributeRequired()
+     * @return void
+     */
+    public function testIsAttributeRequired($attributeCode, $isMetadataExists)
+    {
+        $attributeMetadata = null;
+        if ($isMetadataExists) {
+            $attributeMetadata = $this->getMockBuilder(\Magento\Customer\Api\Data\AttributeMetadataInterface::class)
+                ->getMockForAbstractClass();
+            $attributeMetadata->expects($this->once())
+                ->method('isRequired')
+                ->willReturn(true);
+        }
+        $this->addressMetadataService->expects($this->once())
+            ->method('getAttributeMetadata')
+            ->with($attributeCode)
+            ->willReturn($attributeMetadata);
+        $this->assertEquals($isMetadataExists, $this->helper->isAttributeRequired($attributeCode));
+    }
+
+    /**
+     * Data provider for test  testIsAttributeRequire
+     *
+     * @return array
+     */
+    public function isAttributeRequiredDataProvider()
+    {
+        return [
+            ['fax', true],
+            ['invalid_code', false]
+        ];
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
index e9b1bf14f39d7..0138c6c709b7c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
@@ -11,9 +11,9 @@
 use Magento\Customer\Model\Account\Redirect;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url\HostChecker;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -147,15 +147,15 @@ protected function setUp()
         $this->model = $objectManager->getObject(
             \Magento\Customer\Model\Account\Redirect::class,
             [
-                'request'               => $this->request,
-                'customerSession'       => $this->customerSession,
-                'scopeConfig'           => $this->scopeConfig,
-                'storeManager'          => $this->storeManager,
-                'url'                   => $this->url,
-                'urlDecoder'            => $this->urlDecoder,
-                'customerUrl'           => $this->customerUrl,
-                'resultFactory'         => $this->resultFactory,
-                'hostChecker' => $this->hostChecker
+                'request' => $this->request,
+                'customerSession' => $this->customerSession,
+                'scopeConfig' => $this->scopeConfig,
+                'storeManager' => $this->storeManager,
+                'url' => $this->url,
+                'urlDecoder' => $this->urlDecoder,
+                'customerUrl' => $this->customerUrl,
+                'resultFactory' => $this->resultFactory,
+                'hostChecker' => $this->hostChecker,
             ]
         );
     }
@@ -191,57 +191,31 @@ public function testGetRedirect(
         $redirectToDashboard
     ) {
         // Preparations for method updateLastCustomerId()
-        $this->customerSession->expects($this->once())
-            ->method('getLastCustomerId')
-            ->willReturn($customerId);
-        $this->customerSession->expects($this->any())
-            ->method('isLoggedIn')
-            ->willReturn($customerLoggedIn);
-        $this->customerSession->expects($this->any())
-            ->method('getId')
-            ->willReturn($lastCustomerId);
-        $this->customerSession->expects($this->any())
-            ->method('unsBeforeAuthUrl')
-            ->willReturnSelf();
+        $this->customerSession->expects($this->once())->method('getLastCustomerId')->willReturn($customerId);
+        $this->customerSession->expects($this->any())->method('isLoggedIn')->willReturn($customerLoggedIn);
+        $this->customerSession->expects($this->any())->method('getId')->willReturn($lastCustomerId);
+        $this->customerSession->expects($this->any())->method('unsBeforeAuthUrl')->willReturnSelf();
         $this->customerSession->expects($this->any())
             ->method('setLastCustomerId')
             ->with($lastCustomerId)
             ->willReturnSelf();
 
         // Preparations for method prepareRedirectUrl()
-        $this->store->expects($this->once())
-            ->method('getBaseUrl')
-            ->willReturn($baseUrl);
+        $this->store->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
 
-        $this->customerSession->expects($this->any())
-            ->method('getBeforeAuthUrl')
-            ->willReturn($beforeAuthUrl);
-        $this->customerSession->expects($this->any())
-            ->method('setBeforeAuthUrl')
-            ->willReturnSelf();
-        $this->customerSession->expects($this->any())
-            ->method('getAfterAuthUrl')
-            ->willReturn($afterAuthUrl);
+        $this->customerSession->expects($this->any())->method('getBeforeAuthUrl')->willReturn($beforeAuthUrl);
+        $this->customerSession->expects($this->any())->method('setBeforeAuthUrl')->willReturnSelf();
+        $this->customerSession->expects($this->any())->method('getAfterAuthUrl')->willReturn($afterAuthUrl);
         $this->customerSession->expects($this->any())
             ->method('setAfterAuthUrl')
             ->with($beforeAuthUrl)
             ->willReturnSelf();
-        $this->customerSession->expects($this->any())
-            ->method('getBeforeRequestParams')
-            ->willReturn(false);
-
-        $this->customerUrl->expects($this->any())
-            ->method('getAccountUrl')
-            ->willReturn($accountUrl);
-        $this->customerUrl->expects($this->any())
-            ->method('getLoginUrl')
-            ->willReturn($loginUrl);
-        $this->customerUrl->expects($this->any())
-            ->method('getLogoutUrl')
-            ->willReturn($logoutUrl);
-        $this->customerUrl->expects($this->any())
-            ->method('getDashboardUrl')
-            ->willReturn($dashboardUrl);
+        $this->customerSession->expects($this->any())->method('getBeforeRequestParams')->willReturn(false);
+
+        $this->customerUrl->expects($this->any())->method('getAccountUrl')->willReturn($accountUrl);
+        $this->customerUrl->expects($this->any())->method('getLoginUrl')->willReturn($loginUrl);
+        $this->customerUrl->expects($this->any())->method('getLogoutUrl')->willReturn($logoutUrl);
+        $this->customerUrl->expects($this->any())->method('getDashboardUrl')->willReturn($dashboardUrl);
 
         $this->scopeConfig->expects($this->any())
             ->method('isSetFlag')
@@ -253,25 +227,19 @@ public function testGetRedirect(
             ->with(CustomerUrl::REFERER_QUERY_PARAM_NAME)
             ->willReturn($referer);
 
-        $this->urlDecoder->expects($this->any())
-            ->method('decode')
-            ->with($referer)
-            ->willReturn($referer);
+        $this->urlDecoder->expects($this->any())->method('decode')->with($referer)->willReturn($referer);
 
-        $this->url->expects($this->any())
-            ->method('isOwnOriginUrl')
-            ->willReturn(true);
+        $this->url->expects($this->any())->method('isOwnOriginUrl')->willReturn(true);
 
-        $this->resultRedirect->expects($this->once())
-            ->method('setUrl')
-            ->with($beforeAuthUrl)
-            ->willReturnSelf();
+        $this->resultRedirect->expects($this->once())->method('setUrl')->with($beforeAuthUrl)->willReturnSelf();
 
         $this->resultFactory->expects($this->once())
             ->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($this->resultRedirect);
 
+        $this->hostChecker->expects($this->any())->method('isOwnOrigin')->willReturn(true);
+
         $this->model->getRedirect();
     }
 
@@ -295,10 +263,10 @@ public function getRedirectDataProvider()
          * Redirect to Dashboard flag
          */
         return [
-            // Loggend In, Redirect by Referer
+            // Logged In, Redirect by Referer
             [1, 2, 'referer', 'base', '', '', 'account', '', '', '', true, false],
             [1, 2, 'http://referer.com/', 'http://base.com/', '', '', 'account', '', '', 'dashboard', true, false],
-            // Loggend In, Redirect by AfterAuthUrl
+            // Logged In, Redirect by AfterAuthUrl
             [1, 2, 'referer', 'base', '', 'defined', 'account', '', '', '', true, true],
             // Not logged In, Redirect by LoginUrl
             [1, 2, 'referer', 'base', '', '', 'account', 'login', '', '', false, true],
@@ -306,6 +274,21 @@ public function getRedirectDataProvider()
             [1, 2, 'referer', 'base', 'logout', '', 'account', 'login', 'logout', 'dashboard', false, true],
             // Default redirect
             [1, 2, 'referer', 'base', 'defined', '', 'account', 'login', 'logout', 'dashboard', true, true],
+            // Logout, Without Redirect to Dashboard
+            [
+                'customer_id' => 1,
+                'last_customer_id' => 2,
+                'referer' => 'http://base.com/customer/account/logoutSuccess/',
+                'base_url' => 'http://base.com/',
+                'before_auth_url' => 'http://base.com/',
+                'after_auth_url' => 'http://base.com/customer/account/',
+                'account_url' => 'account',
+                'login_url' => 'login',
+                'logout_url' => 'logout',
+                'dashboard_url' => 'dashboard',
+                'is_customer_logged_id_flag' => true,
+                'redirect_to_dashboard_flag' => false,
+            ],
         ];
     }
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
new file mode 100644
index 0000000000000..1ce80d9d1e99b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Model;
+
+use Magento\Customer\Model\AccountConfirmation;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Registry;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AccountConfirmationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AccountConfirmation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $accountConfirmation;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Registry|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $registry;
+
+    protected function setUp()
+    {
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->registry = $this->createMock(Registry::class);
+
+        $this->accountConfirmation = new AccountConfirmation(
+            $this->scopeConfig,
+            $this->registry
+        );
+    }
+
+    /**
+     * @param $customerId
+     * @param $customerEmail
+     * @param $skipConfirmationIfEmail
+     * @param $isConfirmationEnabled
+     * @param $expected
+     * @dataProvider dataProviderIsConfirmationRequired
+     */
+    public function testIsConfirmationRequired(
+        $customerId,
+        $customerEmail,
+        $skipConfirmationIfEmail,
+        $isConfirmationEnabled,
+        $expected
+    ) {
+        $websiteId = 1;
+
+        $this->scopeConfig->expects($this->any())
+            ->method('isSetFlag')
+            ->with(
+                $this->accountConfirmation::XML_PATH_IS_CONFIRM,
+                ScopeInterface::SCOPE_WEBSITES,
+                $websiteId
+            )->willReturn($isConfirmationEnabled);
+
+        $this->registry->expects($this->any())
+            ->method('registry')
+            ->with('skip_confirmation_if_email')
+            ->willReturn($skipConfirmationIfEmail);
+
+        self::assertEquals(
+            $expected,
+            $this->accountConfirmation->isConfirmationRequired($websiteId, $customerId, $customerEmail)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderIsConfirmationRequired()
+    {
+        return [
+            [null, 'customer@example.com', null, true, true],
+            [null, 'customer@example.com', null, false, false],
+            [1, 'customer@example.com', 'customer@example.com', true, false],
+            [1, 'customer@example.com', 'customer1@example.com', false, false],
+            [1, 'customer@example.com', 'customer1@example.com', true, true],
+        ];
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index 2a6b9fe6fd4ea..0273c445bdd2a 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AccountConfirmation;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\AuthenticationInterface;
+use Magento\Customer\Model\Data\Customer;
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Area;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Intl\DateTimeFactory;
@@ -120,6 +125,36 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $dateTimeFactory;
 
+    /**
+     * @var AccountConfirmation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $accountConfirmation;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Session\SessionManagerInterface
+     */
+    private $sessionManager;
+
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory
+     */
+    private $visitorCollectionFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Session\SaveHandlerInterface
+     */
+    private $saveHandler;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Model\AddressRegistry
+     */
+    private $addressRegistryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilderMock;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -154,6 +189,7 @@ protected function setUp()
         $this->dateTime = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
         $this->customer = $this->createMock(\Magento\Customer\Model\Customer::class);
         $this->objectFactory = $this->createMock(\Magento\Framework\DataObjectFactory::class);
+        $this->addressRegistryMock = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
         $this->extensibleDataObjectConverter = $this->createMock(
             \Magento\Framework\Api\ExtensibleDataObjectConverter::class
         );
@@ -170,6 +206,21 @@ protected function setUp()
             ->getMock();
 
         $this->dateTimeFactory = $this->createMock(DateTimeFactory::class);
+        $this->accountConfirmation = $this->createMock(AccountConfirmation::class);
+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+
+        $this->visitorCollectionFactory = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->saveHandler = $this->getMockBuilder(\Magento\Framework\Session\SaveHandlerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->accountManagement = $this->objectManagerHelper->getObject(
@@ -199,15 +250,24 @@ protected function setUp()
                 'objectFactory' => $this->objectFactory,
                 'extensibleDataObjectConverter' => $this->extensibleDataObjectConverter,
                 'dateTimeFactory' => $this->dateTimeFactory,
+                'accountConfirmation' => $this->accountConfirmation,
+                'sessionManager' => $this->sessionManager,
+                'saveHandler' => $this->saveHandler,
+                'visitorCollectionFactory' => $this->visitorCollectionFactory,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+                'addressRegistry' => $this->addressRegistryMock,
             ]
         );
-        $reflection = new \ReflectionClass(get_class($this->accountManagement));
-        $reflectionProperty = $reflection->getProperty('authentication');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->accountManagement, $this->authenticationMock);
-        $reflectionProperty = $reflection->getProperty('emailNotification');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->accountManagement, $this->emailNotificationMock);
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->accountManagement,
+            'authentication',
+            $this->authenticationMock
+        );
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->accountManagement,
+            'emailNotification',
+            $this->emailNotificationMock
+        );
     }
 
     /**
@@ -225,7 +285,7 @@ public function testCreateAccountWithPasswordHashWithExistingCustomer()
         $website->expects($this->once())
             ->method('getStoreIds')
             ->willReturn([1, 2, 3]);
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer->expects($this->once())
             ->method('getId')
             ->willReturn($customerId);
@@ -275,13 +335,13 @@ public function testCreateAccountWithPasswordHashWithCustomerWithoutStoreId()
             ->method('getId')
             ->willReturn($defaultStoreId);
         $website = $this->getMockBuilder(\Magento\Store\Model\Website::class)->disableOriginalConstructor()->getMock();
-        $website->expects($this->once())
+        $website->expects($this->atLeastOnce())
             ->method('getStoreIds')
             ->willReturn([1, 2, 3]);
         $website->expects($this->once())
             ->method('getDefaultStore')
             ->willReturn($store);
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -311,7 +371,7 @@ public function testCreateAccountWithPasswordHashWithCustomerWithoutStoreId()
             ->with($customerEmail)
             ->willReturn($customer);
         $this->share
-            ->expects($this->once())
+            ->expects($this->atLeastOnce())
             ->method('isWebsiteScope')
             ->willReturn(true);
         $this->storeManager
@@ -357,7 +417,7 @@ public function testCreateAccountWithPasswordHashWithLocalizedException()
         $website->expects($this->once())
             ->method('getDefaultStore')
             ->willReturn($store);
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -436,7 +496,7 @@ public function testCreateAccountWithPasswordHashWithAddressException()
         $website->expects($this->once())
             ->method('getDefaultStore')
             ->willReturn($store);
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -502,10 +562,12 @@ public function testCreateAccountWithPasswordHashWithNewCustomerAndLocalizedExce
     {
         $storeId = 1;
         $storeName = 'store_name';
+        $websiteId = 1;
         $hash = '4nj54lkj5jfi03j49f8bgujfgsd';
 
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
+        $customerMock = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $customerMock->expects($this->atLeastOnce())
             ->method('getId')
@@ -513,6 +575,9 @@ public function testCreateAccountWithPasswordHashWithNewCustomerAndLocalizedExce
         $customerMock->expects($this->atLeastOnce())
             ->method('getStoreId')
             ->willReturn($storeId);
+        $customerMock->expects($this->atLeastOnce())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
         $customerMock->expects($this->once())
             ->method('setCreatedIn')
             ->with($storeName)
@@ -524,6 +589,19 @@ public function testCreateAccountWithPasswordHashWithNewCustomerAndLocalizedExce
             ->method('setAddresses')
             ->with(null)
             ->willReturnSelf();
+        $this->share
+            ->expects($this->once())
+            ->method('isWebsiteScope')
+            ->willReturn(true);
+        $website = $this->getMockBuilder(\Magento\Store\Model\Website::class)->disableOriginalConstructor()->getMock();
+        $website->expects($this->once())
+            ->method('getStoreIds')
+            ->willReturn([1, 2, 3]);
+        $this->storeManager
+            ->expects($this->atLeastOnce())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($website);
 
         $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
@@ -533,7 +611,7 @@ public function testCreateAccountWithPasswordHashWithNewCustomerAndLocalizedExce
             ->method('getName')
             ->willReturn($storeName);
 
-        $this->storeManager->expects($this->exactly(2))
+        $this->storeManager->expects($this->exactly(1))
             ->method('getStore')
             ->with($storeId)
             ->willReturn($storeMock);
@@ -580,7 +658,7 @@ public function testCreateAccountWithoutPassword()
         $website->expects($this->once())
             ->method('getDefaultStore')
             ->willReturn($store);
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -663,14 +741,14 @@ public function dataProviderCheckPasswordStrength()
                 'testNumber' => 1,
                 'password' => 'qwer',
                 'minPasswordLength' => 5,
-                'minCharacterSetsNum' => 1
+                'minCharacterSetsNum' => 1,
             ],
             [
                 'testNumber' => 2,
                 'password' => 'wrfewqedf1',
                 'minPasswordLength' => 5,
-                'minCharacterSetsNum' => 3
-            ]
+                'minCharacterSetsNum' => 3,
+            ],
         ];
     }
 
@@ -702,7 +780,8 @@ public function testCreateAccountWithPasswordInputException(
                             AccountManagement::XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER,
                             'default',
                             null,
-                            $minCharacterSetsNum],
+                            $minCharacterSetsNum,
+                        ],
                     ]
                 )
             );
@@ -713,24 +792,24 @@ public function testCreateAccountWithPasswordInputException(
             ->willReturn(iconv_strlen($password, 'UTF-8'));
 
         if ($testNumber == 1) {
-            $this->expectException(
-                \Magento\Framework\Exception\InputException::class,
-                'Please enter a password with at least ' . $minPasswordLength . ' characters.'
-            );
+            $this->expectException(\Magento\Framework\Exception\InputException::class);
+            $this->expectExceptionMessage('The password needs at least ' . $minPasswordLength . ' characters. '
+                . 'Create a new password and try again.');
         }
 
         if ($testNumber == 2) {
-            $this->expectException(
-                \Magento\Framework\Exception\InputException::class,
-                'Minimum of different classes of characters in password is ' . $minCharacterSetsNum .
-                '. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.'
-            );
+            $this->expectException(\Magento\Framework\Exception\InputException::class);
+            $this->expectExceptionMessage('Minimum of different classes of characters in password is ' .
+                $minCharacterSetsNum . '. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.');
         }
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $this->accountManagement->createAccount($customer, $password);
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testCreateAccountInputExceptionExtraLongPassword()
     {
         $password = '257*chars*************************************************************************************'
@@ -742,12 +821,10 @@ public function testCreateAccountInputExceptionExtraLongPassword()
             ->with($password)
             ->willReturn(iconv_strlen($password, 'UTF-8'));
 
-        $this->expectException(
-            \Magento\Framework\Exception\InputException::class,
-            'Please enter a password with at most 256 characters.'
-        );
+        $this->expectException(\Magento\Framework\Exception\InputException::class);
+        $this->expectExceptionMessage('Please enter a password with at most 256 characters.');
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $this->accountManagement->createAccount($customer, $password);
     }
 
@@ -785,7 +862,8 @@ public function testCreateAccountWithPassword()
                         AccountManagement::XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER,
                         'default',
                         null,
-                        $minCharacterSetsNum],
+                        $minCharacterSetsNum,
+                    ],
                     [
                         AccountManagement::XML_PATH_REGISTER_EMAIL_TEMPLATE,
                         ScopeInterface::SCOPE_STORE,
@@ -796,8 +874,8 @@ public function testCreateAccountWithPassword()
                         AccountManagement::XML_PATH_REGISTER_EMAIL_IDENTITY,
                         ScopeInterface::SCOPE_STORE,
                         1,
-                        $sender
-                    ]
+                        $sender,
+                    ],
                 ]
             );
         $this->string->expects($this->any())
@@ -825,7 +903,7 @@ public function testCreateAccountWithPassword()
         $website->expects($this->once())
             ->method('getDefaultStore')
             ->willReturn($store);
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -909,7 +987,8 @@ public function testSendPasswordReminderEmail()
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        $customer = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $customer->expects($this->any())
             ->method('getStoreId')
@@ -941,7 +1020,7 @@ public function testSendPasswordReminderEmail()
 
         $this->dataObjectProcessor->expects($this->once())
             ->method('buildOutputDataArray')
-            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($customer, CustomerInterface::class)
             ->willReturn($customerData);
 
         $this->customerViewHelper->expects($this->any())
@@ -1011,9 +1090,8 @@ public function testSendPasswordReminderEmail()
     protected function prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash)
     {
         $websiteId = 1;
-
+        $addressId = 5;
         $datetime = $this->prepareDateTimeFactory();
-
         $customerData = ['key' => 'value'];
         $customerName = 'Customer Name';
 
@@ -1023,12 +1101,23 @@ protected function prepareInitiatePasswordReset($email, $templateIdentifier, $se
         $this->store->expects($this->any())
             ->method('getId')
             ->willReturn($storeId);
-
         $this->storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($this->store);
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $addressModel */
+        $addressModel = $this->getMockBuilder(\Magento\Customer\Model\Address::class)->disableOriginalConstructor()
+            ->setMethods(['setShouldIgnoreValidation'])->getMock();
+
+        /** @var \Magento\Customer\Api\Data\AddressInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $address = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
+        $address->expects($this->once())
+            ->method('getId')
+            ->willReturn($addressId);
+
+        /** @var Customer|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $customer->expects($this->any())
             ->method('getEmail')
@@ -1039,7 +1128,19 @@ protected function prepareInitiatePasswordReset($email, $templateIdentifier, $se
         $customer->expects($this->any())
             ->method('getStoreId')
             ->willReturn($storeId);
-
+        $customer->expects($this->any())
+            ->method('getAddresses')
+            ->willReturn([$address]);
+        $this->customerRepository->expects($this->once())
+            ->method('get')
+            ->willReturn($customer);
+        $this->addressRegistryMock->expects($this->once())
+            ->method('retrieve')
+            ->with($addressId)
+            ->willReturn($addressModel);
+        $addressModel->expects($this->once())
+            ->method('setShouldIgnoreValidation')
+            ->with(true);
         $this->customerRepository->expects($this->once())
             ->method('get')
             ->with($email, $websiteId)
@@ -1048,16 +1149,13 @@ protected function prepareInitiatePasswordReset($email, $templateIdentifier, $se
             ->method('save')
             ->with($customer)
             ->willReturnSelf();
-
         $this->random->expects($this->once())
             ->method('getUniqueHash')
             ->willReturn($hash);
-
         $this->customerViewHelper->expects($this->any())
             ->method('getCustomerName')
             ->with($customer)
             ->willReturn($customerName);
-
         $this->customerSecure->expects($this->any())
             ->method('setRpToken')
             ->with($hash)
@@ -1074,26 +1172,24 @@ protected function prepareInitiatePasswordReset($email, $templateIdentifier, $se
             ->method('setData')
             ->with('name', $customerName)
             ->willReturnSelf();
-
         $this->customerRegistry->expects($this->any())
             ->method('retrieveSecureData')
             ->with($customerId)
             ->willReturn($this->customerSecure);
-
         $this->dataObjectProcessor->expects($this->any())
             ->method('buildOutputDataArray')
-            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($customer, Customer::class)
             ->willReturn($customerData);
 
         $this->prepareEmailSend($email, $templateIdentifier, $sender, $storeId, $customerName);
     }
 
     /**
-     * @param $email
-     * @param $templateIdentifier
-     * @param $sender
-     * @param $storeId
-     * @param $customerName
+     * @param string $email
+     * @param int $templateIdentifier
+     * @param string $sender
+     * @param int $storeId
+     * @param string $customerName
      */
     protected function prepareEmailSend($email, $templateIdentifier, $sender, $storeId, $customerName)
     {
@@ -1128,6 +1224,9 @@ protected function prepareEmailSend($email, $templateIdentifier, $sender, $store
             ->method('sendMessage');
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testInitiatePasswordResetEmailReminder()
     {
         $customerId = 1;
@@ -1151,6 +1250,9 @@ public function testInitiatePasswordResetEmailReminder()
         $this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testInitiatePasswordResetEmailReset()
     {
         $storeId = 1;
@@ -1173,6 +1275,9 @@ public function testInitiatePasswordResetEmailReset()
         $this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testInitiatePasswordResetNoTemplate()
     {
         $storeId = 1;
@@ -1197,16 +1302,16 @@ public function testInitiatePasswordResetNoTemplate()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Invalid value of "" provided for the customerId field
+     * @expectedExceptionMessage Invalid value of "0" provided for the customerId field
      */
     public function testValidateResetPasswordTokenBadCustomerId()
     {
-        $this->accountManagement->validateResetPasswordLinkToken(null, '');
+        $this->accountManagement->validateResetPasswordLinkToken(0, '');
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage resetPasswordLinkToken is a required field
+     * @expectedExceptionMessage "resetPasswordLinkToken" is required. Enter and try again.
      */
     public function testValidateResetPasswordTokenBadResetPasswordLinkToken()
     {
@@ -1215,7 +1320,7 @@ public function testValidateResetPasswordTokenBadResetPasswordLinkToken()
 
     /**
      * @expectedException \Magento\Framework\Exception\State\InputMismatchException
-     * @expectedExceptionMessage Reset password token mismatch
+     * @expectedExceptionMessage The password token is mismatched. Reset and try again.
      */
     public function testValidateResetPasswordTokenTokenMismatch()
     {
@@ -1228,7 +1333,7 @@ public function testValidateResetPasswordTokenTokenMismatch()
 
     /**
      * @expectedException \Magento\Framework\Exception\State\ExpiredException
-     * @expectedExceptionMessage Reset password token expired
+     * @expectedExceptionMessage The password token is expired. Reset and try again.
      */
     public function testValidateResetPasswordTokenTokenExpired()
     {
@@ -1266,27 +1371,66 @@ private function reInitModel()
     {
         $this->customerSecure = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getRpToken', 'getRpTokenCreatedAt'])
+            ->setMethods(
+                [
+                    'getRpToken',
+                    'getRpTokenCreatedAt',
+                    'getPasswordHash',
+                    'setPasswordHash',
+                    'setRpToken',
+                    'setRpTokenCreatedAt',
+                ]
+            )
             ->getMock();
-
-        $this->customerSecure
-            ->expects($this->any())
+        $this->customerSecure->expects($this->any())
             ->method('getRpToken')
             ->willReturn('newStringToken');
-
         $pastDateTime = '2016-10-25 00:00:00';
-
-        $this->customerSecure
-            ->expects($this->any())
+        $this->customerSecure->expects($this->any())
             ->method('getRpTokenCreatedAt')
             ->willReturn($pastDateTime);
-
         $this->customer = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
             ->disableOriginalConstructor()
             ->setMethods(['getResetPasswordLinkExpirationPeriod'])
             ->getMock();
 
         $this->prepareDateTimeFactory();
+        $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->visitorCollectionFactory = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->saveHandler = $this->getMockBuilder(\Magento\Framework\Session\SaveHandlerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['destroy'])
+            ->getMockForAbstractClass();
+
+        $dateTime = '2017-10-25 18:57:08';
+        $timestamp = '1508983028';
+        $dateTimeMock = $this->getMockBuilder(\DateTime::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['format', 'getTimestamp', 'setTimestamp'])
+            ->getMock();
+
+        $dateTimeMock->expects($this->any())
+            ->method('format')
+            ->with(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT)
+            ->willReturn($dateTime);
+        $dateTimeMock->expects($this->any())
+            ->method('getTimestamp')
+            ->willReturn($timestamp);
+        $dateTimeMock->expects($this->any())
+            ->method('setTimestamp')
+            ->willReturnSelf();
+        $dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $dateTimeFactory->expects($this->any())->method('create')->willReturn($dateTimeMock);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->accountManagement = $this->objectManagerHelper->getObject(
@@ -1296,13 +1440,24 @@ private function reInitModel()
                 'customerRegistry' => $this->customerRegistry,
                 'customerRepository' => $this->customerRepository,
                 'customerModel' => $this->customer,
-                'dateTimeFactory' => $this->dateTimeFactory,
+                'dateTimeFactory' => $dateTimeFactory,
+                'stringHelper' => $this->string,
+                'scopeConfig' => $this->scopeConfig,
+                'sessionManager' => $this->sessionManager,
+                'visitorCollectionFactory' => $this->visitorCollectionFactory,
+                'saveHandler' => $this->saveHandler,
+                'encryptor' => $this->encryptor,
+                'dataProcessor' => $this->dataObjectProcessor,
+                'storeManager' => $this->storeManager,
+                'addressRegistry' => $this->addressRegistryMock,
+                'transportBuilder' => $this->transportBuilder,
             ]
         );
-        $reflection = new \ReflectionClass(get_class($this->accountManagement));
-        $reflectionProperty = $reflection->getProperty('authentication');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->accountManagement, $this->authenticationMock);
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->accountManagement,
+            'authentication',
+            $this->authenticationMock
+        );
     }
 
     /**
@@ -1316,7 +1471,9 @@ public function testChangePassword()
         $newPassword = 'abcdefg';
         $passwordHash = '1a2b3f4c';
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        $this->reInitModel();
+        $customer = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $customer->expects($this->any())
             ->method('getId')
@@ -1331,24 +1488,20 @@ public function testChangePassword()
         $this->authenticationMock->expects($this->once())
             ->method('authenticate');
 
-        $customerSecure = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
-            ->setMethods(['setRpToken', 'setRpTokenCreatedAt', 'getPasswordHash'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $customerSecure->expects($this->once())
+        $this->customerSecure->expects($this->once())
             ->method('setRpToken')
             ->with(null);
-        $customerSecure->expects($this->once())
+        $this->customerSecure->expects($this->once())
             ->method('setRpTokenCreatedAt')
             ->willReturnSelf();
-        $customerSecure->expects($this->any())
+        $this->customerSecure->expects($this->any())
             ->method('getPasswordHash')
             ->willReturn($passwordHash);
 
         $this->customerRegistry->expects($this->any())
             ->method('retrieveSecureData')
             ->with($customerId)
-            ->willReturn($customerSecure);
+            ->willReturn($this->customerSecure);
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
@@ -1364,7 +1517,7 @@ public function testChangePassword()
                         AccountManagement::XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER,
                         'default',
                         null,
-                        1
+                        1,
                     ],
                 ]
             );
@@ -1378,9 +1531,106 @@ public function testChangePassword()
             ->method('save')
             ->with($customer);
 
+        $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
+
+        $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getSessionId'])
+            ->getMock();
+        $visitor->expects($this->atLeastOnce())->method('getSessionId')
+            ->willReturnOnConsecutiveCalls('session_id_1', 'session_id_2');
+        $visitorCollection = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
+        )
+            ->disableOriginalConstructor()->setMethods(['addFieldToFilter', 'getItems'])->getMock();
+        $visitorCollection->expects($this->atLeastOnce())->method('addFieldToFilter')->willReturnSelf();
+        $visitorCollection->expects($this->atLeastOnce())->method('getItems')->willReturn([$visitor, $visitor]);
+        $this->visitorCollectionFactory->expects($this->atLeastOnce())->method('create')
+            ->willReturn($visitorCollection);
+        $this->saveHandler->expects($this->atLeastOnce())->method('destroy')
+            ->withConsecutive(
+                ['session_id_1'],
+                ['session_id_2']
+            );
+
         $this->assertTrue($this->accountManagement->changePassword($email, $currentPassword, $newPassword));
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testResetPassword()
+    {
+        $customerEmail = 'customer@example.com';
+        $customerId = '1';
+        $addressId = 5;
+        $resetToken = 'newStringToken';
+        $newPassword = 'new_password';
+
+        $this->reInitModel();
+        /** @var \Magento\Customer\Model\Address|\PHPUnit_Framework_MockObject_MockObject $addressModel */
+        $addressModel = $this->getMockBuilder(\Magento\Customer\Model\Address::class)->disableOriginalConstructor()
+            ->setMethods(['setShouldIgnoreValidation'])->getMock();
+
+        /** @var \Magento\Customer\Api\Data\AddressInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $address = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
+        $address->expects($this->any())
+            ->method('getId')
+            ->willReturn($addressId);
+
+        /** @var Customer|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
+        $customer->expects($this->any())->method('getId')->willReturn($customerId);
+        $customer->expects($this->any())
+            ->method('getAddresses')
+            ->willReturn([$address]);
+        $this->addressRegistryMock->expects($this->once())
+            ->method('retrieve')
+            ->with($addressId)
+            ->willReturn($addressModel);
+        $addressModel->expects($this->once())
+            ->method('setShouldIgnoreValidation')
+            ->with(true);
+        $this->customerRepository->expects($this->atLeastOnce())->method('get')->with($customerEmail)
+            ->willReturn($customer);
+        $this->customer->expects($this->atLeastOnce())->method('getResetPasswordLinkExpirationPeriod')
+            ->willReturn(100000);
+        $this->string->expects($this->any())->method('strlen')->willReturnCallback(
+            function ($string) {
+                return strlen($string);
+            }
+        );
+        $this->customerRegistry->expects($this->atLeastOnce())->method('retrieveSecureData')
+            ->willReturn($this->customerSecure);
+
+        $this->customerSecure->expects($this->once())->method('setRpToken')->with(null);
+        $this->customerSecure->expects($this->once())->method('setRpTokenCreatedAt')->with(null);
+        $this->customerSecure->expects($this->any())->method('setPasswordHash')->willReturn(null);
+
+        $this->sessionManager->expects($this->atLeastOnce())->method('destroy');
+        $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
+        $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getSessionId'])
+            ->getMock();
+        $visitor->expects($this->atLeastOnce())->method('getSessionId')
+            ->willReturnOnConsecutiveCalls('session_id_1', 'session_id_2');
+        $visitorCollection = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
+        )
+            ->disableOriginalConstructor()->setMethods(['addFieldToFilter', 'getItems'])->getMock();
+        $visitorCollection->expects($this->atLeastOnce())->method('addFieldToFilter')->willReturnSelf();
+        $visitorCollection->expects($this->atLeastOnce())->method('getItems')->willReturn([$visitor, $visitor]);
+        $this->visitorCollectionFactory->expects($this->atLeastOnce())->method('create')
+            ->willReturn($visitorCollection);
+        $this->saveHandler->expects($this->atLeastOnce())->method('destroy')
+            ->withConsecutive(
+                ['session_id_1'],
+                ['session_id_2']
+            );
+        $this->assertTrue($this->accountManagement->resetPassword($customerEmail, $resetToken, $newPassword));
+    }
+
     /**
      * @return void
      */
@@ -1399,10 +1649,8 @@ public function testChangePasswordException()
             ->with($email)
             ->willThrowException($exception);
 
-        $this->expectException(
-            \Magento\Framework\Exception\InvalidEmailOrPasswordException::class,
-            'Invalid login or password.'
-        );
+        $this->expectException(\Magento\Framework\Exception\InvalidEmailOrPasswordException::class);
+        $this->expectExceptionMessage('Invalid login or password.');
 
         $this->accountManagement->changePassword($email, $currentPassword, $newPassword);
     }
@@ -1416,7 +1664,8 @@ public function testAuthenticate()
         $password = '1234567';
         $passwordHash = '1a2b3f4c';
 
-        $customerData = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        $customerData = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $customerModel = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
@@ -1456,10 +1705,10 @@ public function testAuthenticate()
             ->withConsecutive(
                 [
                     'customer_customer_authenticated',
-                    ['model' => $customerModel, 'password' => $password]
+                    ['model' => $customerModel, 'password' => $password],
                 ],
                 [
-                    'customer_data_object_login', ['customer' => $customerData]
+                    'customer_data_object_login', ['customer' => $customerData],
                 ]
             );
 
@@ -1467,14 +1716,12 @@ public function testAuthenticate()
     }
 
     /**
-     * @param string|null $skipConfirmationIfEmail
      * @param int $isConfirmationRequired
      * @param string|null $confirmation
      * @param string $expected
      * @dataProvider dataProviderGetConfirmationStatus
      */
     public function testGetConfirmationStatus(
-        $skipConfirmationIfEmail,
         $isConfirmationRequired,
         $confirmation,
         $expected
@@ -1483,7 +1730,7 @@ public function testGetConfirmationStatus(
         $customerId = 1;
         $customerEmail = 'test1@example.com';
 
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        $customerMock = $this->getMockBuilder(Customer::class)
             ->disableOriginalConstructor()
             ->getMock();
         $customerMock->expects($this->once())
@@ -1492,21 +1739,16 @@ public function testGetConfirmationStatus(
         $customerMock->expects($this->any())
             ->method('getConfirmation')
             ->willReturn($confirmation);
-        $customerMock->expects($this->any())
+        $customerMock->expects($this->once())
             ->method('getEmail')
             ->willReturn($customerEmail);
-        $customerMock->expects($this->any())
+        $customerMock->expects($this->once())
             ->method('getWebsiteId')
             ->willReturn($websiteId);
 
-        $this->registry->expects($this->once())
-            ->method('registry')
-            ->with('skip_confirmation_if_email')
-            ->willReturn($skipConfirmationIfEmail);
-
-        $this->scopeConfig->expects($this->any())
-            ->method('getValue')
-            ->with(AccountManagement::XML_PATH_IS_CONFIRM, ScopeInterface::SCOPE_WEBSITES, $websiteId)
+        $this->accountConfirmation->expects($this->once())
+            ->method('isConfirmationRequired')
+            ->with($websiteId, $customerId, $customerEmail)
             ->willReturn($isConfirmationRequired);
 
         $this->customerRepository->expects($this->once())
@@ -1523,11 +1765,11 @@ public function testGetConfirmationStatus(
     public function dataProviderGetConfirmationStatus()
     {
         return [
-            [null, 0, null, AccountManagement::ACCOUNT_CONFIRMATION_NOT_REQUIRED],
-            ['test1@example.com', 0, null, AccountManagement::ACCOUNT_CONFIRMATION_NOT_REQUIRED],
-            ['test2@example.com', 0, null, AccountManagement::ACCOUNT_CONFIRMATION_NOT_REQUIRED],
-            ['test2@example.com', 1, null, AccountManagement::ACCOUNT_CONFIRMED],
-            ['test2@example.com', 1, 'test', AccountManagement::ACCOUNT_CONFIRMATION_REQUIRED],
+            [0, null, AccountManagement::ACCOUNT_CONFIRMATION_NOT_REQUIRED],
+            [0, null, AccountManagement::ACCOUNT_CONFIRMATION_NOT_REQUIRED],
+            [0, null, AccountManagement::ACCOUNT_CONFIRMATION_NOT_REQUIRED],
+            [1, null, AccountManagement::ACCOUNT_CONFIRMED],
+            [1, 'test', AccountManagement::ACCOUNT_CONFIRMATION_REQUIRED],
         ];
     }
 
@@ -1558,15 +1800,16 @@ public function testCreateAccountWithPasswordHashForGuest()
             ->method('getStore')
             ->willReturn($storeMock);
 
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
+        $customerMock = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $customerMock->expects($this->exactly(2))
             ->method('getId')
             ->willReturn(null);
         $customerMock->expects($this->exactly(3))
             ->method('getStoreId')
             ->willReturn(null);
-        $customerMock->expects($this->exactly(2))
+        $customerMock->expects($this->exactly(3))
             ->method('getWebsiteId')
             ->willReturn(null);
         $customerMock->expects($this->once())
@@ -1598,6 +1841,9 @@ public function testCreateAccountWithPasswordHashForGuest()
         $this->accountManagement->createAccountWithPasswordHash($customerMock, $hash);
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testCreateAccountWithPasswordHashWithCustomerAddresses()
     {
         $websiteId = 1;
@@ -1639,7 +1885,7 @@ public function testCreateAccountWithPasswordHashWithCustomerAddresses()
             ->method("setId")
             ->with(null);
         //Handle Customer calls
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock();
+        $customer = $this->getMockBuilder(Customer::class)->disableOriginalConstructor()->getMock();
         $customer
             ->expects($this->atLeastOnce())
             ->method('getWebsiteId')
@@ -1692,6 +1938,19 @@ public function testCreateAccountWithPasswordHashWithCustomerAddresses()
             ->expects($this->atLeastOnce())
             ->method('getStore')
             ->willReturn($store);
+        $this->share
+            ->expects($this->once())
+            ->method('isWebsiteScope')
+            ->willReturn(true);
+        $website = $this->getMockBuilder(\Magento\Store\Model\Website::class)->disableOriginalConstructor()->getMock();
+        $website->expects($this->once())
+            ->method('getStoreIds')
+            ->willReturn([1, 2, 3]);
+        $this->storeManager
+            ->expects($this->atLeastOnce())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($website);
 
         $this->assertSame($customer, $this->accountManagement->createAccountWithPasswordHash($customer, $hash));
     }
@@ -1721,4 +1980,141 @@ private function prepareDateTimeFactory()
 
         return $dateTime;
     }
+
+    /**
+     * @return void
+     */
+    public function testCreateAccountUnexpectedValueException(): void
+    {
+        $websiteId = 1;
+        $storeId = null;
+        $defaultStoreId = 1;
+        $customerId = 1;
+        $customerEmail = 'email@email.com';
+        $newLinkToken = '2jh43j5h2345jh23lh452h345hfuzasd96ofu';
+        $exception = new \UnexpectedValueException('Template file was not found');
+
+        $datetime = $this->prepareDateTimeFactory();
+
+        $address = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
+        $address->expects($this->once())
+            ->method('setCustomerId')
+            ->with($customerId);
+        $store = $this->createMock(\Magento\Store\Model\Store::class);
+        $store->expects($this->once())
+            ->method('getId')
+            ->willReturn($defaultStoreId);
+        $website = $this->createMock(\Magento\Store\Model\Website::class);
+        $website->expects($this->atLeastOnce())
+            ->method('getStoreIds')
+            ->willReturn([1, 2, 3]);
+        $website->expects($this->once())
+            ->method('getDefaultStore')
+            ->willReturn($store);
+        $customer = $this->createMock(Customer::class);
+        $customer->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->atLeastOnce())
+            ->method('getEmail')
+            ->willReturn($customerEmail);
+        $customer->expects($this->atLeastOnce())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
+        $customer->expects($this->atLeastOnce())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $customer->expects($this->once())
+            ->method('setStoreId')
+            ->with($defaultStoreId);
+        $customer->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([$address]);
+        $customer->expects($this->once())
+            ->method('setAddresses')
+            ->with(null);
+        $this->customerRepository->expects($this->once())
+            ->method('get')
+            ->with($customerEmail)
+            ->willReturn($customer);
+        $this->share->expects($this->once())
+            ->method('isWebsiteScope')
+            ->willReturn(true);
+        $this->storeManager->expects($this->atLeastOnce())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($website);
+        $this->customerRepository->expects($this->atLeastOnce())
+            ->method('save')
+            ->willReturn($customer);
+        $this->addressRepository->expects($this->atLeastOnce())
+            ->method('save')
+            ->with($address);
+        $this->customerRepository->expects($this->once())
+            ->method('getById')
+            ->with($customerId)
+            ->willReturn($customer);
+        $this->random->expects($this->once())
+            ->method('getUniqueHash')
+            ->willReturn($newLinkToken);
+        $customerSecure = $this->createPartialMock(
+            \Magento\Customer\Model\Data\CustomerSecure::class,
+            ['setRpToken', 'setRpTokenCreatedAt', 'getPasswordHash']
+        );
+        $customerSecure->expects($this->any())
+            ->method('setRpToken')
+            ->with($newLinkToken);
+        $customerSecure->expects($this->any())
+            ->method('setRpTokenCreatedAt')
+            ->with($datetime)
+            ->willReturnSelf();
+        $customerSecure->expects($this->any())
+            ->method('getPasswordHash')
+            ->willReturn(null);
+        $this->customerRegistry->expects($this->atLeastOnce())
+            ->method('retrieveSecureData')
+            ->willReturn($customerSecure);
+        $this->emailNotificationMock->expects($this->once())
+            ->method('newAccount')
+            ->willThrowException($exception);
+        $this->logger->expects($this->once())->method('error')->with($exception);
+
+        $this->accountManagement->createAccount($customer);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCreateAccountWithStoreNotInWebsite()
+    {
+        $storeId = 1;
+        $websiteId = 1;
+        $hash = '4nj54lkj5jfi03j49f8bgujfgsd';
+        $customerMock = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customerMock->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(null);
+        $customerMock->expects($this->atLeastOnce())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $customerMock->expects($this->atLeastOnce())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
+        $this->share
+            ->expects($this->once())
+            ->method('isWebsiteScope')
+            ->willReturn(true);
+        $website = $this->getMockBuilder(\Magento\Store\Model\Website::class)->disableOriginalConstructor()->getMock();
+        $website->expects($this->once())
+            ->method('getStoreIds')
+            ->willReturn([2, 3]);
+        $this->storeManager
+            ->expects($this->atLeastOnce())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($website);
+        $this->accountManagement->createAccountWithPasswordHash($customerMock, $hash);
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
index 2eef9a44cab74..0fc3d01673c47 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Customer\Test\Unit\Model\Address;
 
+use Magento\Customer\Model\Address\CompositeValidator;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -41,6 +43,12 @@ class AbstractAddressTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Customer\Model\Address\AbstractAddress  */
     protected $model;
 
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
+    /** @var \Magento\Customer\Model\Address\CompositeValidator|\PHPUnit_Framework_MockObject_MockObject  */
+    private $compositeValidatorMock;
+
     protected function setUp()
     {
         $this->contextMock = $this->createMock(\Magento\Framework\Model\Context::class);
@@ -69,8 +77,9 @@ protected function setUp()
         $this->resourceCollectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $objectManager->getObject(
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->compositeValidatorMock = $this->createMock(CompositeValidator::class);
+        $this->model = $this->objectManager->getObject(
             \Magento\Customer\Model\Address\AbstractAddress::class,
             [
                 'context' => $this->contextMock,
@@ -81,7 +90,8 @@ protected function setUp()
                 'regionFactory' => $this->regionFactoryMock,
                 'countryFactory' => $this->countryFactoryMock,
                 'resource' => $this->resourceMock,
-                'resourceCollection' => $this->resourceCollectionMock
+                'resourceCollection' => $this->resourceCollectionMock,
+                'compositeValidator' => $this->compositeValidatorMock,
             ]
         );
     }
@@ -275,28 +285,15 @@ public function testSetDataWithObject()
     }
 
     /**
-     * @param $data
-     * @param $expected
+     * @param array $data
+     * @param array|bool $expected
+     * @return void
      *
      * @dataProvider validateDataProvider
      */
-    public function testValidate($data, $expected)
+    public function testValidate(array $data, $expected)
     {
-        $attributeMock = $this->createMock(\Magento\Eav\Model\Entity\Attribute::class);
-        $attributeMock->expects($this->any())
-            ->method('getIsRequired')
-            ->willReturn(true);
-
-        $this->eavConfigMock->expects($this->any())
-            ->method('getAttribute')
-            ->will($this->returnValue($attributeMock));
-
-        $this->directoryDataMock->expects($this->once())
-            ->method('getCountriesWithOptionalZip')
-            ->will($this->returnValue([]));
-
-        $this->directoryDataMock->expects($this->never())
-            ->method('isRegionRequired');
+        $this->compositeValidatorMock->method('validate')->with($this->model)->willReturn($expected);
 
         foreach ($data as $key => $value) {
             $this->model->setData($key, $value);
@@ -327,31 +324,35 @@ public function validateDataProvider()
         return [
             'firstname' => [
                 array_merge(array_diff_key($data, ['firstname' => '']), ['country_id' => $countryId++]),
-                ['firstname is a required field.'],
+                ['"firstname" is required. Enter and try again.'],
             ],
             'lastname' => [
                 array_merge(array_diff_key($data, ['lastname' => '']), ['country_id' => $countryId++]),
-                ['lastname is a required field.'],
+                ['"lastname" is required. Enter and try again.'],
             ],
             'street' => [
                 array_merge(array_diff_key($data, ['street' => '']), ['country_id' => $countryId++]),
-                ['street is a required field.'],
+                ['"street" is required. Enter and try again.'],
             ],
             'city' => [
                 array_merge(array_diff_key($data, ['city' => '']), ['country_id' => $countryId++]),
-                ['city is a required field.'],
+                ['"city" is required. Enter and try again.'],
             ],
             'telephone' => [
                 array_merge(array_diff_key($data, ['telephone' => '']), ['country_id' => $countryId++]),
-                ['telephone is a required field.'],
+                ['"telephone" is required. Enter and try again.'],
             ],
             'postcode' => [
                 array_merge(array_diff_key($data, ['postcode' => '']), ['country_id' => $countryId++]),
-                ['postcode is a required field.'],
+                ['"postcode" is required. Enter and try again.'],
+            ],
+            'region_id' => [
+                array_merge($data, ['country_id' => $countryId++, 'region_id' => 2]),
+                ['Invalid value of "2" provided for the regionId field.'],
             ],
             'country_id' => [
                 array_diff_key($data, ['country_id' => '']),
-                ['countryId is a required field.'],
+                ['"countryId" is required. Enter and try again.'],
             ],
             'validated' => [array_merge($data, ['country_id' => $countryId++]), true],
         ];
@@ -388,4 +389,13 @@ public function getStreetFullDataProvider()
             ['single line', 'single line'],
         ];
     }
+
+    protected function tearDown()
+    {
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            '_countryModels',
+            []
+        );
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php
index 1b013a913b9f8..c64f7aca96fe6 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php
@@ -39,6 +39,9 @@ public function testExemplarXml($fixtureXml, array $expectedErrors)
         $this->assertEquals($expectedErrors, $actualErrors);
     }
 
+    /**
+     * @return array
+     */
     public function exemplarXmlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php
new file mode 100644
index 0000000000000..4dafd305d619d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/DataProviderTest.php
@@ -0,0 +1,351 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Model\Address;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Address\DataProvider;
+use Magento\Customer\Model\AttributeMetadataResolver;
+use Magento\Customer\Model\FileUploaderDataResolver;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
+use Magento\Customer\Model\ResourceModel\Address\Collection as AddressCollection;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Customer\Model\Address as AddressModel;
+use Magento\Ui\Component\Form\Element\Multiline;
+use Magento\Ui\Component\Form\Field;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DataProviderTest extends \PHPUnit\Framework\TestCase
+{
+    private const ATTRIBUTE_CODE = 'street';
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * @var AddressCollection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collection;
+
+    /**
+     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerRepository;
+
+    /**
+     * @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customer;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfig;
+
+    /*
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var AddressModel|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $address;
+
+    /**
+     * @var FileUploaderDataResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileUploaderDataResolver;
+
+    /**
+     * @var AttributeMetadataResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMetadataResolver;
+
+    /**
+     * @var DataProvider
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->fileUploaderDataResolver = $this->getMockBuilder(FileUploaderDataResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->attributeMetadataResolver = $this->getMockBuilder(AttributeMetadataResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->collection = $this->getMockBuilder(AddressCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerRepository = $this->getMockForAbstractClass(CustomerRepositoryInterface::class);
+        $this->context = $this->getMockForAbstractClass(ContextInterface::class);
+        $this->addressCollectionFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->collection);
+        $this->eavConfig = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->eavConfig->expects($this->once())
+            ->method('getEntityType')
+            ->with('customer_address')
+            ->willReturn($this->getTypeAddressMock([]));
+        $this->customer = $this->getMockForAbstractClass(CustomerInterface::class);
+        $this->address = $this->getMockBuilder(AddressModel::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->attributeMetadataResolver->expects($this->at(0))
+            ->method('getAttributesMeta')
+            ->willReturn(
+                [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'dataType' => Multiline::NAME,
+                                'formElement' => 'frontend_input',
+                                'options' => 'test-options',
+                                'visible' => null,
+                                'required' => 'is_required',
+                                'label' => __('Street'),
+                                'sortOrder' => 'sort_order',
+                                'default' => 'default_value',
+                                'size' => 'multiline_count',
+                                'componentType' => Field::NAME,
+                            ],
+                        ],
+                    ],
+                ]
+            );
+        $this->attributeMetadataResolver->expects($this->at(1))
+            ->method('getAttributesMeta')
+            ->willReturn(
+                [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'dataType' => 'frontend_input',
+                                'formElement' => 'frontend_input',
+                                'visible' => null,
+                                'required' => 'is_required',
+                                'label' => __('frontend_label'),
+                                'sortOrder' => 'sort_order',
+                                'default' => 'default_value',
+                                'size' => 'multiline_count',
+                                'componentType' => Field::NAME,
+                                'prefer' => 'toggle',
+                                'valueMap' => [
+                                    'true' => 1,
+                                    'false' => 0,
+                                ],
+                            ],
+                        ],
+                    ],
+                ]
+            );
+        $this->model = $objectManagerHelper->getObject(
+            DataProvider::class,
+            [
+                'name'                      => 'test-name',
+                'primaryFieldName'          => 'primary-field-name',
+                'requestFieldName'          => 'request-field-name',
+                'addressCollectionFactory' => $this->addressCollectionFactory,
+                'customerRepository' => $this->customerRepository,
+                'eavConfig' => $this->eavConfig,
+                'context' => $this->context,
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver,
+                'attributeMetadataResolver' => $this->attributeMetadataResolver,
+                [],
+                [],
+                true
+            ]
+        );
+    }
+
+    public function testGetDefaultData(): void
+    {
+        $expectedData = [
+            '' => [
+                'parent_id' => 1,
+                'firstname' => 'John',
+                'lastname' => 'Doe'
+            ]
+        ];
+
+        $this->collection->expects($this->once())
+            ->method('getItems')
+            ->willReturn([]);
+
+        $this->context->expects($this->once())
+            ->method('getRequestParam')
+            ->willReturn(1);
+        $this->customerRepository->expects($this->once())
+            ->method('getById')
+            ->willReturn($this->customer);
+        $this->customer->expects($this->once())
+            ->method('getFirstname')
+            ->willReturn('John');
+        $this->customer->expects($this->once())
+            ->method('getLastname')
+            ->willReturn('Doe');
+
+        $this->assertEquals($expectedData, $this->model->getData());
+    }
+
+    public function testGetData(): void
+    {
+        $expectedData = [
+            '1' => [
+                'parent_id' => '1',
+                'default_billing' => '1',
+                'default_shipping' => '1',
+                'firstname' => 'John',
+                'lastname' => 'Doe',
+                'street' => [
+                    '42000 Ave W 55 Cedar City',
+                    'Apt. 33'
+                ]
+            ]
+        ];
+
+        $this->collection->expects($this->once())
+            ->method('getItems')
+            ->willReturn([
+                $this->address
+            ]);
+
+        $this->customerRepository->expects($this->once())
+            ->method('getById')
+            ->willReturn($this->customer);
+        $this->customer->expects($this->once())
+            ->method('getDefaultBilling')
+            ->willReturn('1');
+        $this->customer->expects($this->once())
+            ->method('getDefaultShipping')
+            ->willReturn('1');
+
+        $this->address->expects($this->once())
+            ->method('getEntityId')
+            ->willReturn('1');
+        $this->address->expects($this->once())
+            ->method('load')
+            ->with('1')
+            ->willReturnSelf();
+        $this->address->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'parent_id' => '1',
+                'firstname' => 'John',
+                'lastname' => 'Doe',
+                'street' => "42000 Ave W 55 Cedar City\nApt. 33"
+            ]);
+        $this->fileUploaderDataResolver->expects($this->once())
+            ->method('overrideFileUploaderData')
+            ->willReturnSelf();
+
+        $this->assertEquals($expectedData, $this->model->getData());
+    }
+
+    /**
+     * Get customer address type mock
+     *
+     * @param array $customerAttributes
+     * @return Type|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getTypeAddressMock($customerAttributes = [])
+    {
+        $typeAddressMock = $this->getMockBuilder(Type::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributesCollection = !empty($customerAttributes) ? $customerAttributes : $this->getAttributeMock();
+        foreach ($attributesCollection as $attribute) {
+            $attribute->expects($this->any())
+                ->method('getEntityType')
+                ->willReturn($typeAddressMock);
+        }
+
+        $typeAddressMock->expects($this->once())
+            ->method('getAttributeCollection')
+            ->willReturn($attributesCollection);
+
+        return $typeAddressMock;
+    }
+
+    /**
+     * Get attribute mock
+     *
+     * @param array $options
+     * @return AbstractAttribute[]|\PHPUnit_Framework_MockObject_MockObject[]
+     */
+    protected function getAttributeMock($options = []): array
+    {
+        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataUsingMethod',
+                    'getFrontendInput',
+                    'getIsVisible',
+                    'getSource',
+                    'getIsUserDefined',
+                    'getUsedInForms',
+                    'getEntityType',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $attributeCode = self::ATTRIBUTE_CODE;
+        if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
+            $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
+        }
+
+        $attributeMock->expects($this->exactly(2))
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+
+        $attributeBooleanMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataUsingMethod',
+                    'getFrontendInput',
+                    'getIsVisible',
+                    'getIsUserDefined',
+                    'getUsedInForms',
+                    'getSource',
+                    'getEntityType',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $booleanAttributeCode = 'test-code-boolean';
+        if (isset($options['test-code-boolean']['specific_code_prefix'])) {
+            $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
+        }
+
+        $attributeBooleanMock->expects($this->exactly(2))
+            ->method('getAttributeCode')
+            ->willReturn($booleanAttributeCode);
+
+        $mocks = [$attributeMock, $attributeBooleanMock];
+        return $mocks;
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php
new file mode 100644
index 0000000000000..f26a5ba2dbb76
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Model\Address\Validator;
+
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Magento\Customer\Model\Address\Validator\Country tests.
+ */
+class CountryTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Directory\Helper\Data|\PHPUnit_Framework_MockObject_MockObject  */
+    private $directoryDataMock;
+
+    /** @var \Magento\Customer\Model\Address\Validator\Country  */
+    private $model;
+
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Directory\Model\AllowedCountries|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $allowedCountriesReaderMock;
+
+    protected function setUp()
+    {
+        $this->directoryDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->allowedCountriesReaderMock = $this->createPartialMock(
+            \Magento\Directory\Model\AllowedCountries::class,
+            ['getAllowedCountries']
+        );
+        $this->model = $this->objectManager->getObject(
+            \Magento\Customer\Model\Address\Validator\Country::class,
+            [
+                'directoryData' => $this->directoryDataMock,
+                'allowedCountriesReader' => $this->allowedCountriesReaderMock,
+            ]
+        );
+    }
+
+    /**
+     * @param array $data
+     * @param array $countryIds
+     * @param array $allowedRegions
+     * @param array $expected
+     * @return void
+     *
+     * @dataProvider validateDataProvider
+     */
+    public function testValidate(array $data, array $countryIds, array $allowedRegions, array $expected)
+    {
+        $addressMock = $this
+            ->getMockBuilder(\Magento\Customer\Model\Address\AbstractAddress::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getCountryId',
+                    'getRegion',
+                    'getRegionId',
+                    'getCountryModel',
+                ]
+            )->getMock();
+
+        $this->directoryDataMock->expects($this->any())
+            ->method('isRegionRequired')
+            ->willReturn($data['regionRequired']);
+
+        $this->allowedCountriesReaderMock
+            ->method('getAllowedCountries')
+            ->with(ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($countryIds);
+
+        $addressMock->method('getCountryId')->willReturn($data['country_id']);
+
+        $countryModelMock = $this->getMockBuilder(\Magento\Directory\Model\Country::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRegionCollection'])
+            ->getMock();
+
+        $addressMock->method('getCountryModel')->willReturn($countryModelMock);
+
+        $regionCollectionMock = $this->getMockBuilder(\Magento\Directory\Model\ResourceModel\Region\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllIds'])
+            ->getMock();
+        $countryModelMock
+            ->expects($this->any())
+            ->method('getRegionCollection')
+            ->willReturn($regionCollectionMock);
+        $regionCollectionMock->expects($this->any())->method('getAllIds')->willReturn($allowedRegions);
+
+        $addressMock->method('getRegionId')->willReturn($data['region_id']);
+        $addressMock->method('getRegion')->willReturn(null);
+
+        $actual = $this->model->validate($addressMock);
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateDataProvider()
+    {
+        $countryId = 1;
+        $data = [
+            'firstname' => 'First Name',
+            'lastname' => 'Last Name',
+            'street' => "Street 1\nStreet 2",
+            'city' => 'Odessa',
+            'telephone' => '555-55-55',
+            'country_id' => $countryId,
+            'postcode' => 07201,
+            'region_id' => 1,
+            'region' => '',
+            'regionRequired' => false,
+            'company' => 'Magento',
+            'fax' => '222-22-22',
+        ];
+        $result = [
+            'country_id1' => [
+                array_merge($data, ['country_id' => null]),
+                [],
+                [1],
+                ['"countryId" is required. Enter and try again.'],
+            ],
+            'country_id2' => [
+                $data,
+                [],
+                [1],
+                ['Invalid value of "' . $countryId . '" provided for the countryId field.'],
+            ],
+            'region' => [
+                array_merge($data, ['country_id' => $countryId, 'regionRequired' => true]),
+                [$countryId++],
+                [],
+                ['"region" is required. Enter and try again.'],
+            ],
+            'region_id1' => [
+                array_merge($data, ['country_id' => $countryId, 'regionRequired' => true, 'region_id' => '']),
+                [$countryId++],
+                [1],
+                ['"regionId" is required. Enter and try again.'],
+            ],
+            'region_id2' => [
+                array_merge($data, ['country_id' => $countryId, 'region_id' => 2]),
+                [$countryId++],
+                [],
+                [],
+            ],
+            'region_id3' => [
+                array_merge($data, ['country_id' => $countryId, 'region_id' => 2]),
+                [$countryId++],
+                [1, 3],
+                ['Invalid value of "2" provided for the regionId field.'],
+            ],
+            'validated' => [
+                array_merge($data, ['country_id' => $countryId]),
+                [$countryId],
+                ['1'],
+                [],
+            ],
+        ];
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/GeneralTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/GeneralTest.php
new file mode 100644
index 0000000000000..058a69e86b43a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/Validator/GeneralTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Model\Address\Validator;
+
+/**
+ * Magento\Customer\Model\Address\Validator\General tests.
+ */
+class GeneralTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Directory\Helper\Data|\PHPUnit_Framework_MockObject_MockObject  */
+    private $directoryDataMock;
+
+    /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject  */
+    private $eavConfigMock;
+
+    /** @var \Magento\Customer\Model\Address\Validator\General  */
+    private $model;
+
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->directoryDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
+        $this->eavConfigMock = $this->createMock(\Magento\Eav\Model\Config::class);
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->model = $this->objectManager->getObject(
+            \Magento\Customer\Model\Address\Validator\General::class,
+            [
+                'eavConfig' => $this->eavConfigMock,
+                'directoryData' => $this->directoryDataMock,
+            ]
+        );
+    }
+
+    /**
+     * @param array $data
+     * @param array $expected
+     * @return void
+     *
+     * @dataProvider validateDataProvider
+     */
+    public function testValidate(array $data, array $expected)
+    {
+        $addressMock = $this
+            ->getMockBuilder(\Magento\Customer\Model\Address\AbstractAddress::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getFirstname',
+                    'getLastname',
+                    'getStreetLine',
+                    'getCity',
+                    'getTelephone',
+                    'getFax',
+                    'getCompany',
+                    'getPostcode',
+                    'getCountryId',
+                ]
+            )->getMock();
+
+        $attributeMock = $this->createMock(\Magento\Eav\Model\Entity\Attribute::class);
+        $attributeMock->expects($this->any())
+            ->method('getIsRequired')
+            ->willReturn(true);
+
+        $this->eavConfigMock->expects($this->any())
+            ->method('getAttribute')
+            ->will($this->returnValue($attributeMock));
+
+        $this->directoryDataMock->expects($this->once())
+            ->method('getCountriesWithOptionalZip')
+            ->will($this->returnValue([]));
+
+        $addressMock->method('getFirstName')->willReturn($data['firstname']);
+        $addressMock->method('getLastname')->willReturn($data['lastname']);
+        $addressMock->method('getStreetLine')->with(1)->willReturn($data['street']);
+        $addressMock->method('getCity')->willReturn($data['city']);
+        $addressMock->method('getTelephone')->willReturn($data['telephone']);
+        $addressMock->method('getFax')->willReturn($data['fax']);
+        $addressMock->method('getCompany')->willReturn($data['company']);
+        $addressMock->method('getPostcode')->willReturn($data['postcode']);
+        $addressMock->method('getCountryId')->willReturn($data['country_id']);
+
+        $actual = $this->model->validate($addressMock);
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateDataProvider()
+    {
+        $countryId = 1;
+        $data = [
+            'firstname' => 'First Name',
+            'lastname' => 'Last Name',
+            'street' => "Street 1\nStreet 2",
+            'city' => 'Odessa',
+            'telephone' => '555-55-55',
+            'country_id' => $countryId,
+            'postcode' => 07201,
+            'company' => 'Magento',
+            'fax' => '222-22-22',
+        ];
+        $result = [
+            'firstname' => [
+                array_merge(array_merge($data, ['firstname' => '']), ['country_id' => $countryId++]),
+                ['"firstname" is required. Enter and try again.'],
+            ],
+            'lastname' => [
+                array_merge(array_merge($data, ['lastname' => '']), ['country_id' => $countryId++]),
+                ['"lastname" is required. Enter and try again.'],
+            ],
+            'street' => [
+                array_merge(array_merge($data, ['street' => '']), ['country_id' => $countryId++]),
+                ['"street" is required. Enter and try again.'],
+            ],
+            'city' => [
+                array_merge(array_merge($data, ['city' => '']), ['country_id' => $countryId++]),
+                ['"city" is required. Enter and try again.'],
+            ],
+            'telephone' => [
+                array_merge(array_merge($data, ['telephone' => '']), ['country_id' => $countryId++]),
+                ['"telephone" is required. Enter and try again.'],
+            ],
+            'postcode' => [
+                array_merge(array_merge($data, ['postcode' => '']), ['country_id' => $countryId++]),
+                ['"postcode" is required. Enter and try again.'],
+            ],
+            'validated' => [array_merge($data, ['country_id' => $countryId++]), []],
+        ];
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AuthenticationTest.php b/app/code/Magento/Customer/Test/Unit/Model/AuthenticationTest.php
index ee788913373e5..14adc7bcf8795 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AuthenticationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AuthenticationTest.php
@@ -196,6 +196,9 @@ public function testProcessAuthenticationFailureFirstAttempt(
         $this->authentication->processAuthenticationFailure($customerId);
     }
 
+    /**
+     * @return array
+     */
     public function processAuthenticationFailureDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
index 9a9449a64ecbd..368e7cfd47f2f 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
@@ -39,6 +39,9 @@ public function testValidatePositive()
         $this->assertTrue($this->testable->validate($object));
     }
 
+    /**
+     * @return array
+     */
     public function passwordNegativeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/CredentialsValidatorTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/CredentialsValidatorTest.php
index 07aef85e92d08..36667e0ccf6c3 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/CredentialsValidatorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/CredentialsValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Model\Customer;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -29,7 +30,6 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Password cannot be the same as email address.
      */
     public function testCheckPasswordDifferentFromEmail()
     {
@@ -37,5 +37,9 @@ public function testCheckPasswordDifferentFromEmail()
         $password = strtoupper($email); // for case-insensitive check
 
         $this->object->checkPasswordDifferentFromEmail($email, $password);
+
+        $this->expectExceptionMessage(
+            "The password can't be the same as the email address. Create a new password and try again."
+        );
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
index 029949c5f35b0..ac87e2e336e3d 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
@@ -49,14 +49,14 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
     protected $sessionMock;
 
     /**
-     * @var \Magento\Customer\Model\FileProcessorFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Customer\Model\FileProcessor|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $fileProcessorFactory;
+    protected $fileProcessor;
 
     /**
-     * @var \Magento\Customer\Model\FileProcessor|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Customer\Model\FileUploaderDataResolver|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $fileProcessor;
+    private $fileUploaderDataResolver;
 
     /**
      * Set up
@@ -84,10 +84,9 @@ protected function setUp()
         $this->fileProcessor = $this->getMockBuilder(\Magento\Customer\Model\FileProcessor::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->fileProcessorFactory = $this->getMockBuilder(\Magento\Customer\Model\FileProcessorFactory::class)
+        $this->fileUploaderDataResolver = $this->getMockBuilder(\Magento\Customer\Model\FileUploaderDataResolver::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->setMethods(['overrideFileUploaderMetadata', 'overrideFileUploaderData'])
             ->getMock();
     }
 
@@ -111,16 +110,11 @@ public function testGetAttributesMetaWithOptions(array $expected)
                 'requestFieldName' => 'request-field-name',
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->getCustomerCollectionFactoryMock(),
-                'eavConfig' => $this->getEavConfigMock()
+                'eavConfig' => $this->getEavConfigMock(),
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
             ]
         );
 
-        $helper->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
-
         $meta = $dataProvider->getMeta();
         $this->assertNotEmpty($meta);
         $this->assertEquals($expected, $meta);
@@ -493,6 +487,9 @@ private function attributeGetUsingMethodCallback()
         };
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getCountryAttrMock()
     {
         $countryByWebsiteMock = $this->getMockBuilder(CountryWithWebsites::class)
@@ -588,10 +585,6 @@ public function testGetData()
         $customer->expects($this->once())
             ->method('getAddresses')
             ->willReturn([$address]);
-        $customer->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn([]);
-
         $address->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn(2);
@@ -602,9 +595,6 @@ public function testGetData()
         $address->expects($this->once())
             ->method('getData')
             ->willReturn($addressData);
-        $address->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn([]);
 
         $helper = new ObjectManager($this);
         $dataProvider = $helper->getObject(
@@ -615,7 +605,8 @@ public function testGetData()
                 'requestFieldName' => 'request-field-name',
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-                'eavConfig' => $this->getEavConfigMock()
+                'eavConfig' => $this->getEavConfigMock(),
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
             ]
         );
 
@@ -628,12 +619,6 @@ public function testGetData()
             ->method('getCustomerFormData')
             ->willReturn(null);
 
-        $helper->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
-
         $this->assertEquals(
             [
                 '' => [
@@ -646,10 +631,8 @@ public function testGetData()
                         2 => [
                             'firstname' => 'firstname',
                             'lastname' => 'lastname',
-                            'street' => [
-                                'street',
-                                'street',
-                            ],
+                            // Won't be an array because it isn't defined as a multiline field in this test
+                            'street' => "street\nstreet",
                             'default_billing' => 2,
                             'default_shipping' => 2,
                         ]
@@ -722,10 +705,6 @@ public function testGetDataWithCustomerFormData()
         $customer->expects($this->once())
             ->method('getAddresses')
             ->willReturn([$address]);
-        $customer->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn([]);
-
         $address->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn(2);
@@ -740,10 +719,6 @@ public function testGetDataWithCustomerFormData()
                 'lastname' => 'lastname',
                 'street' => "street\nstreet",
             ]);
-        $address->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn([]);
-
         $helper = new ObjectManager($this);
         $dataProvider = $helper->getObject(
             \Magento\Customer\Model\Customer\DataProvider::class,
@@ -753,7 +728,8 @@ public function testGetDataWithCustomerFormData()
                 'requestFieldName' => 'request-field-name',
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-                'eavConfig' => $this->getEavConfigMock()
+                'eavConfig' => $this->getEavConfigMock(),
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
             ]
         );
 
@@ -768,12 +744,6 @@ public function testGetDataWithCustomerFormData()
         $this->sessionMock->expects($this->once())
             ->method('unsCustomerFormData');
 
-        $helper->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
-
         $this->assertEquals([$customerId => $customerFormData], $dataProvider->getData());
     }
 
@@ -787,42 +757,6 @@ public function testGetDataWithCustomAttributeImage()
         $customerEmail = 'user1@example.com';
 
         $filename = '/filename.ext1';
-        $viewUrl = 'viewUrl';
-        $mime = 'image/png';
-
-        $expectedData = [
-            $customerId => [
-                'customer' => [
-                    'email' => $customerEmail,
-                    'img1' => [
-                        [
-                            'file' => $filename,
-                            'size' => 1,
-                            'url' => $viewUrl,
-                            'name' => 'filename.ext1',
-                            'type' => $mime,
-                        ],
-                    ],
-                ],
-            ],
-        ];
-
-        $attributeMock = $this->getMockBuilder(\Magento\Customer\Model\Attribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attributeMock->expects($this->exactly(2))
-            ->method('getFrontendInput')
-            ->willReturn('image');
-        $attributeMock->expects($this->exactly(2))
-            ->method('getAttributeCode')
-            ->willReturn('img1');
-
-        $entityTypeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $entityTypeMock->expects($this->once())
-            ->method('getEntityTypeCode')
-            ->willReturn(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
 
         $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
             ->disableOriginalConstructor()
@@ -839,13 +773,6 @@ public function testGetDataWithCustomAttributeImage()
         $customerMock->expects($this->once())
             ->method('getId')
             ->willReturn($customerId);
-        $customerMock->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn([$attributeMock]);
-        $customerMock->expects($this->once())
-            ->method('getEntityType')
-            ->willReturn($entityTypeMock);
-
         $collectionMock = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -861,30 +788,6 @@ public function testGetDataWithCustomAttributeImage()
             ->method('getCustomerFormData')
             ->willReturn([]);
 
-        $this->fileProcessorFactory->expects($this->any())
-            ->method('create')
-            ->with([
-                'entityTypeCode' => CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-            ])
-            ->willReturn($this->fileProcessor);
-
-        $this->fileProcessor->expects($this->once())
-            ->method('isExist')
-            ->with($filename)
-            ->willReturn(true);
-        $this->fileProcessor->expects($this->once())
-            ->method('getStat')
-            ->with($filename)
-            ->willReturn(['size' => 1]);
-        $this->fileProcessor->expects($this->once())
-            ->method('getViewUrl')
-            ->with('/filename.ext1', 'image')
-            ->willReturn($viewUrl);
-        $this->fileProcessor->expects($this->once())
-            ->method('getMimeType')
-            ->with($filename)
-            ->willReturn($mime);
-
         $objectManager = new ObjectManager($this);
         $dataProvider = $objectManager->getObject(
             \Magento\Customer\Model\Customer\DataProvider::class,
@@ -894,7 +797,8 @@ public function testGetDataWithCustomAttributeImage()
                 'requestFieldName' => 'request-field-name',
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-                'eavConfig' => $this->getEavConfigMock()
+                'eavConfig' => $this->getEavConfigMock(),
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
             ]
         );
 
@@ -904,108 +808,15 @@ public function testGetDataWithCustomAttributeImage()
             $this->sessionMock
         );
 
-        $objectManager->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
-
-        $this->assertEquals($expectedData, $dataProvider->getData());
-    }
-
-    public function testGetDataWithCustomAttributeImageNoData()
-    {
-        $customerId = 1;
-        $customerEmail = 'user1@example.com';
-
-        $expectedData = [
-            $customerId => [
-                'customer' => [
+        $this->fileUploaderDataResolver->expects($this->atLeastOnce())->method('overrideFileUploaderData')
+            ->with(
+                $customerMock,
+                [
                     'email' => $customerEmail,
-                    'img1' => [],
-                ],
-            ],
-        ];
-
-        $attributeMock = $this->getMockBuilder(\Magento\Customer\Model\Attribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getFrontendInput')
-            ->willReturn('image');
-        $attributeMock->expects($this->exactly(2))
-            ->method('getAttributeCode')
-            ->willReturn('img1');
-
-        $entityTypeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $entityTypeMock->expects($this->once())
-            ->method('getEntityTypeCode')
-            ->willReturn(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
-
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $customerMock->expects($this->once())
-            ->method('getData')
-            ->willReturn([
-                'email' => $customerEmail,
-            ]);
-        $customerMock->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn([]);
-        $customerMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($customerId);
-        $customerMock->expects($this->once())
-            ->method('getAttributes')
-            ->willReturn([$attributeMock]);
-        $customerMock->expects($this->once())
-            ->method('getEntityType')
-            ->willReturn($entityTypeMock);
-
-        $collectionMock = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $collectionMock->expects($this->once())
-            ->method('getItems')
-            ->willReturn([$customerMock]);
-
-        $this->customerCollectionFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($collectionMock);
-
-        $this->sessionMock->expects($this->once())
-            ->method('getCustomerFormData')
-            ->willReturn([]);
-
-        $objectManager = new ObjectManager($this);
-        $dataProvider = $objectManager->getObject(
-            \Magento\Customer\Model\Customer\DataProvider::class,
-            [
-                'name' => 'test-name',
-                'primaryFieldName' => 'primary-field-name',
-                'requestFieldName' => 'request-field-name',
-                'eavValidationRules' => $this->eavValidationRulesMock,
-                'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-                'eavConfig' => $this->getEavConfigMock()
-            ]
-        );
-
-        $objectManager->setBackwardCompatibleProperty(
-            $dataProvider,
-            'session',
-            $this->sessionMock
-        );
-
-        $objectManager->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
-
-        $this->assertEquals($expectedData, $dataProvider->getData());
+                    'img1' => $filename,
+                ]
+            );
+        $dataProvider->getData();
     }
 
     /**
@@ -1096,13 +907,6 @@ function ($origName) {
                 'file_extensions' => 'ext1, eXt2 ', // Added spaces and upper-cases
             ]);
 
-        $this->fileProcessorFactory->expects($this->any())
-            ->method('create')
-            ->with([
-                'entityTypeCode' => CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-            ])
-            ->willReturn($this->fileProcessor);
-
         $objectManager = new ObjectManager($this);
         $dataProvider = $objectManager->getObject(
             \Magento\Customer\Model\Customer\DataProvider::class,
@@ -1112,8 +916,7 @@ function ($origName) {
                 'requestFieldName' => 'request-field-name',
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-                'eavConfig' => $this->eavConfigMock,
-                'fileProcessorFactory' => $this->fileProcessorFactory,
+                'eavConfig' => $this->eavConfigMock
             ]
         );
 
@@ -1208,16 +1011,11 @@ public function testGetDataWithVisibleAttributes()
                 'requestFieldName' => 'request-field-name',
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->getCustomerCollectionFactoryMock(),
-                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle))
+                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle)),
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
             ]
         );
 
-        $helper->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
-
         $meta = $dataProvider->getMeta();
         $this->assertNotEmpty($meta);
         $this->assertEquals($this->getExpectationForVisibleAttributes(), $meta);
@@ -1266,7 +1064,7 @@ public function testGetDataWithVisibleAttributesWithAccountEdit()
         $helper = new ObjectManager($this);
         $context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
             ->setMethods(['getRequestParam'])
-            ->getMockforAbstractClass();
+            ->getMockForAbstractClass();
         $context->expects($this->any())
             ->method('getRequestParam')
             ->with('request-field-name')
@@ -1281,14 +1079,11 @@ public function testGetDataWithVisibleAttributesWithAccountEdit()
                 'eavValidationRules' => $this->eavValidationRulesMock,
                 'customerCollectionFactory' => $this->getCustomerCollectionFactoryMock(),
                 'context' => $context,
-                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle))
+                'eavConfig' => $this->getEavConfigMock(array_merge($firstAttributesBundle, $secondAttributesBundle)),
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver
+
             ]
         );
-        $helper->setBackwardCompatibleProperty(
-            $dataProvider,
-            'fileProcessorFactory',
-            $this->fileProcessorFactory
-        );
 
         $meta = $dataProvider->getMeta();
         $this->assertNotEmpty($meta);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
new file mode 100644
index 0000000000000..2fc3cdb927723
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
@@ -0,0 +1,422 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Model\Customer;
+
+use Magento\Customer\Model\AttributeMetadataResolver;
+use Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses;
+use Magento\Customer\Model\FileUploaderDataResolver;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
+use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Ui\Component\Form\Field;
+
+/**
+ * Test for class \Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DataProviderWithDefaultAddressesTest extends \PHPUnit\Framework\TestCase
+{
+    private const ATTRIBUTE_CODE = 'test-code';
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfigMock;
+
+    /**
+     * @var CustomerCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerCollectionFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionMock;
+
+    /**
+     * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $countryFactoryMock;
+
+    /**
+     * @var \Magento\Customer\Model\Customer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerMock;
+
+    /**
+     * @var CustomerCollection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerCollectionMock;
+
+    /**
+     * @var FileUploaderDataResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileUploaderDataResolver;
+
+    /**
+     * @var AttributeMetadataResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMetadataResolver;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->eavConfigMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
+        $this->customerCollectionFactoryMock = $this->createPartialMock(CustomerCollectionFactory::class, ['create']);
+        $this->sessionMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManagerInterface::class)
+            ->setMethods(['getCustomerFormData', 'unsCustomerFormData'])
+            ->getMockForAbstractClass();
+        $this->countryFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create', 'loadByCode', 'getName'])
+            ->getMock();
+        $this->customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerCollectionMock = $this->getMockBuilder(CustomerCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerCollectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
+        $this->customerCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->customerCollectionMock);
+        $this->eavConfigMock->expects($this->atLeastOnce())
+            ->method('getEntityType')
+            ->with('customer')
+            ->willReturn($this->getTypeCustomerMock([]));
+        $this->fileUploaderDataResolver = $this->getMockBuilder(FileUploaderDataResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->attributeMetadataResolver = $this->getMockBuilder(AttributeMetadataResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributesMeta'])
+            ->getMock();
+        $this->attributeMetadataResolver->expects($this->at(0))
+            ->method('getAttributesMeta')
+            ->willReturn(
+                [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'dataType' => 'frontend_input',
+                                'formElement' => 'frontend_input',
+                                'options' => 'test-options',
+                                'visible' => null,
+                                'required' => 'is_required',
+                                'label' => __('frontend_label'),
+                                'sortOrder' => 'sort_order',
+                                'notice' => 'note',
+                                'default' => 'default_value',
+                                'size' => 'multiline_count',
+                                'componentType' => Field::NAME,
+                            ],
+                        ],
+                    ],
+                ]
+            );
+        $this->attributeMetadataResolver->expects($this->at(1))
+            ->method('getAttributesMeta')
+            ->willReturn(
+                [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'dataType' => 'frontend_input',
+                                'formElement' => 'frontend_input',
+                                'visible' => null,
+                                'required' => 'is_required',
+                                'label' => __('frontend_label'),
+                                'sortOrder' => 'sort_order',
+                                'notice' => 'note',
+                                'default' => 'default_value',
+                                'size' => 'multiline_count',
+                                'componentType' => Field::NAME,
+                                'prefer' => 'toggle',
+                                'valueMap' => [
+                                    'true' => 1,
+                                    'false' => 0,
+                                ],
+                            ],
+                        ],
+                    ],
+                ]
+            );
+        $helper = new ObjectManager($this);
+        $this->dataProvider = $helper->getObject(
+            DataProviderWithDefaultAddresses::class,
+            [
+                'name'                      => 'test-name',
+                'primaryFieldName'          => 'primary-field-name',
+                'requestFieldName'          => 'request-field-name',
+                'customerCollectionFactory' => $this->customerCollectionFactoryMock,
+                'eavConfig'                 => $this->eavConfigMock,
+                'countryFactory'            => $this->countryFactoryMock,
+                'session'                   => $this->sessionMock,
+                'fileUploaderDataResolver'  => $this->fileUploaderDataResolver,
+                'attributeMetadataResolver' => $this->attributeMetadataResolver,
+                true
+            ]
+        );
+    }
+
+    /**
+     * Run test getAttributesMeta method
+     *
+     * @param array $expected
+     * @return void
+     *
+     * @dataProvider getAttributesMetaDataProvider
+     */
+    public function testGetAttributesMetaWithOptions(array $expected): void
+    {
+        $meta = $this->dataProvider->getMeta();
+        $this->assertNotEmpty($meta);
+        $this->assertEquals($expected, $meta);
+    }
+
+    /**
+     * Data provider for testGetAttributesMeta
+     *
+     * @return array
+     */
+    public function getAttributesMetaDataProvider(): array
+    {
+        return [
+            [
+                'expected' => [
+                    'customer' => [
+                        'children' => [
+                            self::ATTRIBUTE_CODE => [
+                                'arguments' => [
+                                    'data' => [
+                                        'config' => [
+                                            'dataType' => 'frontend_input',
+                                            'formElement' => 'frontend_input',
+                                            'options' => 'test-options',
+                                            'visible' => null,
+                                            'required' => 'is_required',
+                                            'label' => __('frontend_label'),
+                                            'sortOrder' => 'sort_order',
+                                            'notice' => 'note',
+                                            'default' => 'default_value',
+                                            'size' => 'multiline_count',
+                                            'componentType' => Field::NAME,
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            'test-code-boolean' => [
+                                'arguments' => [
+                                    'data' => [
+                                        'config' => [
+                                            'dataType' => 'frontend_input',
+                                            'formElement' => 'frontend_input',
+                                            'visible' => null,
+                                            'required' => 'is_required',
+                                            'label' => __('frontend_label'),
+                                            'sortOrder' => 'sort_order',
+                                            'notice' => 'note',
+                                            'default' => 'default_value',
+                                            'size' => 'multiline_count',
+                                            'componentType' => Field::NAME,
+                                            'prefer' => 'toggle',
+                                            'valueMap' => [
+                                                'true' => 1,
+                                                'false' => 0,
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @param array $customerAttributes
+     * @return Type|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getTypeCustomerMock($customerAttributes = [])
+    {
+        $typeCustomerMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributesCollection = !empty($customerAttributes) ? $customerAttributes : $this->getAttributeMock();
+        foreach ($attributesCollection as $attribute) {
+            $attribute->expects($this->any())
+                ->method('getEntityType')
+                ->willReturn($typeCustomerMock);
+        }
+
+        $typeCustomerMock->expects($this->atLeastOnce())
+            ->method('getAttributeCollection')
+            ->willReturn($attributesCollection);
+
+        return $typeCustomerMock;
+    }
+
+    /**
+     * @param array $options
+     * @return AbstractAttribute[]|\PHPUnit_Framework_MockObject_MockObject[]
+     */
+    protected function getAttributeMock($options = []): array
+    {
+        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataUsingMethod',
+                    'getFrontendInput',
+                    'getIsVisible',
+                    'getSource',
+                    'getIsUserDefined',
+                    'getUsedInForms',
+                    'getEntityType',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $attributeCode = self::ATTRIBUTE_CODE;
+        if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
+            $attributeCode .= $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
+        }
+
+        $attributeMock->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+
+        $attributeBooleanMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataUsingMethod',
+                    'getFrontendInput',
+                    'getIsVisible',
+                    'getIsUserDefined',
+                    'getUsedInForms',
+                    'getSource',
+                    'getEntityType',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $booleanAttributeCode = 'test-code-boolean';
+        if (isset($options['test-code-boolean']['specific_code_prefix'])) {
+            $booleanAttributeCode .= $options['test-code-boolean']['specific_code_prefix'];
+        }
+
+        $attributeBooleanMock->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn($booleanAttributeCode);
+
+        $mocks = [$attributeMock, $attributeBooleanMock];
+        return $mocks;
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetData(): void
+    {
+        $customerData = [
+            'email' => 'test@test.ua',
+            'default_billing' => 2,
+            'default_shipping' => 2,
+            'password_hash' => 'password_hash',
+            'rp_token' => 'rp_token',
+            'confirmation' => 'confirmation',
+        ];
+
+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
+        $this->customerMock->expects($this->once())->method('getData')->willReturn($customerData);
+        $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
+
+        $this->customerMock->expects($this->once())->method('getDefaultBillingAddress')->willReturn($address);
+        $this->countryFactoryMock->expects($this->once())->method('create')->willReturnSelf();
+        $this->countryFactoryMock->expects($this->once())->method('loadByCode')->willReturnSelf();
+        $this->countryFactoryMock->expects($this->once())->method('getName')->willReturn('Ukraine');
+
+        $this->sessionMock->expects($this->once())
+            ->method('getCustomerFormData')
+            ->willReturn(null);
+
+        $this->assertEquals(
+            [
+                1 => [
+                    'customer' => [
+                        'email' => 'test@test.ua',
+                        'default_billing' => 2,
+                        'default_shipping' => 2,
+                    ],
+                    'default_billing_address' => [
+                        'country' => 'Ukraine',
+                    ],
+                    'default_shipping_address' => [],
+                    'customer_id' => 1
+                ]
+            ],
+            $this->dataProvider->getData()
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetDataWithCustomerFormData(): void
+    {
+        $customerId = 11;
+        $customerFormData = [
+            'customer' => [
+                'email' => 'test1@test1.ua',
+                'default_billing' => 3,
+                'default_shipping' => 3,
+                'entity_id' => $customerId,
+            ],
+            'address' => [
+                3 => [
+                    'firstname' => 'firstname1',
+                    'lastname' => 'lastname1',
+                    'street' => [
+                        'street1',
+                        'street2',
+                    ],
+                    'default_billing' => 3,
+                    'default_shipping' => 3,
+                ],
+            ],
+        ];
+
+        $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
+        $this->customerMock->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'email' => 'test@test.ua',
+                'default_billing' => 2,
+                'default_shipping' => 2,
+            ]);
+        $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+
+        $this->sessionMock->expects($this->once())->method('getCustomerFormData')->willReturn($customerFormData);
+        $this->sessionMock->expects($this->once())->method('unsCustomerFormData');
+
+        $this->assertEquals([$customerId => $customerFormData], $this->dataProvider->getData());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index 8b3f7875e3c97..cb396e32509b7 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -12,7 +12,7 @@
 namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Model\Customer;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Customer\Model\AccountConfirmation;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -63,6 +63,11 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
      */
     private $dataObjectProcessor;
 
+    /**
+     * @var AccountConfirmation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $accountConfirmation;
+
     protected function setUp()
     {
         $this->_website = $this->createMock(\Magento\Store\Model\Website::class);
@@ -94,6 +99,7 @@ protected function setUp()
         $this->registryMock = $this->createPartialMock(\Magento\Framework\Registry::class, ['registry']);
         $this->_encryptor = $this->createMock(\Magento\Framework\Encryption\EncryptorInterface::class);
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->accountConfirmation = $this->createMock(AccountConfirmation::class);
         $this->_model = $helper->getObject(
             \Magento\Customer\Model\Customer::class,
             [
@@ -105,7 +111,8 @@ protected function setUp()
                 'attributeFactory' => $this->attributeFactoryMock,
                 'registry' => $this->registryMock,
                 'resource' => $this->resourceMock,
-                'dataObjectProcessor' => $this->dataObjectProcessor
+                'dataObjectProcessor' => $this->dataObjectProcessor,
+                'accountConfirmation' => $this->accountConfirmation
             ]
         );
     }
@@ -127,7 +134,7 @@ public function testHashPassword()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please correct the transactional account email type.
+     * @expectedExceptionMessage The transactional account email type is incorrect. Verify and try again.
      */
     public function testSendNewAccountEmailException()
     {
@@ -215,32 +222,27 @@ public function isCustomerLockedDataProvider()
     /**
      * @param int $customerId
      * @param int $websiteId
-     * @param string|null $skipConfirmationIfEmail
+     * @param bool $isConfirmationRequired
      * @param bool $expected
      * @dataProvider dataProviderIsConfirmationRequired
      */
     public function testIsConfirmationRequired(
         $customerId,
         $websiteId,
-        $skipConfirmationIfEmail,
+        $isConfirmationRequired,
         $expected
     ) {
         $customerEmail = 'test1@example.com';
 
-        $this->registryMock->expects($this->any())
-            ->method('registry')
-            ->with('skip_confirmation_if_email')
-            ->willReturn($skipConfirmationIfEmail);
-
-        $this->_scopeConfigMock->expects($this->any())
-            ->method('getValue')
-            ->with(Customer::XML_PATH_IS_CONFIRM, ScopeInterface::SCOPE_WEBSITES, $websiteId)
-            ->willReturn($expected);
-
         $this->_model->setData('id', $customerId);
         $this->_model->setData('website_id', $websiteId);
         $this->_model->setData('email', $customerEmail);
 
+        $this->accountConfirmation->expects($this->once())
+            ->method('isConfirmationRequired')
+            ->with($websiteId, $customerId, $customerEmail)
+            ->willReturn($isConfirmationRequired);
+
         $this->assertEquals($expected, $this->_model->isConfirmationRequired());
     }
 
@@ -250,12 +252,9 @@ public function testIsConfirmationRequired(
     public function dataProviderIsConfirmationRequired()
     {
         return [
-            [null, null, null, false],
-            [1, 1, null, false],
-            [1, 1, 'test1@example.com', false],
-            [1, 1, 'test2@example.com', true],
-            [1, 0, 'test2@example.com', true],
-            [1, null, 'test2@example.com', true],
+            [null, null, false, false],
+            [1, 1, true, true],
+            [1, null, true, true],
         ];
     }
 
@@ -308,8 +307,6 @@ public function testUpdateData()
         }
 
         $expectedResult[$attribute->getAttributeCode()] = $attribute->getValue();
-        $expectedResult['attribute_set_id'] =
-            \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER;
 
         $this->assertEquals($this->_model->getData(), $expectedResult);
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
index 0240b7ab29ab7..318023d8068c5 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\EmailNotification;
 use Magento\Framework\App\Area;
+use Magento\Framework\Mail\Template\SenderResolverInterface;
 use Magento\Store\Model\ScopeInterface;
 
 /**
@@ -47,7 +50,7 @@ class EmailNotificationTest extends \PHPUnit\Framework\TestCase
     private $customerSecureMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $scopeConfigMock;
 
@@ -61,6 +64,11 @@ class EmailNotificationTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var SenderResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $senderResolverMock;
+
     public function setUp()
     {
         $this->customerRegistryMock = $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
@@ -88,17 +96,23 @@ public function setUp()
 
         $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class);
 
+        $this->senderResolverMock = $this->getMockBuilder(SenderResolverInterface::class)
+            ->setMethods(['resolve'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->model = $objectManager->getObject(
             EmailNotification::class,
             [
-                'customerRegistry' =>  $this->customerRegistryMock,
+                'customerRegistry' => $this->customerRegistryMock,
                 'storeManager' => $this->storeManagerMock,
                 'transportBuilder' => $this->transportBuilderMock,
                 'customerViewHelper' => $this->customerViewHelperMock,
                 'dataProcessor' => $this->dataProcessorMock,
-                'scopeConfig' => $this->scopeConfigMock
+                'scopeConfig' => $this->scopeConfigMock,
+                'senderResolver' => $this->senderResolverMock,
             ]
         );
     }
@@ -121,7 +135,10 @@ public function testCredentialsChanged($testNumber, $oldEmail, $newEmail, $isPas
         $customerName = 'Customer Name';
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
 
+        $expects = $this->once();
+        $xmlPathTemplate = EmailNotification::XML_PATH_RESET_PASSWORD_TEMPLATE;
         switch ($testNumber) {
             case 1:
                 $xmlPathTemplate = EmailNotification::XML_PATH_RESET_PASSWORD_TEMPLATE;
@@ -137,7 +154,14 @@ public function testCredentialsChanged($testNumber, $oldEmail, $newEmail, $isPas
                 break;
         }
 
-        $origCustomer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->senderResolverMock
+            ->expects($expects)
+            ->method('resolve')
+            ->with($sender, $customerStoreId)
+            ->willReturn($senderValues);
+
+        /** @var \PHPUnit_Framework_MockObject_MockObject $origCustomer */
+        $origCustomer = $this->createMock(CustomerInterface::class);
         $origCustomer->expects($this->any())
             ->method('getStoreId')
             ->willReturn(0);
@@ -175,7 +199,7 @@ public function testCredentialsChanged($testNumber, $oldEmail, $newEmail, $isPas
 
         $this->dataProcessorMock->expects(clone $expects)
             ->method('buildOutputDataArray')
-            ->with($origCustomer, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($origCustomer, CustomerInterface::class)
             ->willReturn($customerData);
 
         $this->customerViewHelperMock->expects($this->any())
@@ -192,6 +216,7 @@ public function testCredentialsChanged($testNumber, $oldEmail, $newEmail, $isPas
             ->with('name', $customerName)
             ->willReturnSelf();
 
+        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $savedCustomer */
         $savedCustomer = clone $origCustomer;
 
         $origCustomer->expects($this->any())
@@ -234,7 +259,7 @@ public function testCredentialsChanged($testNumber, $oldEmail, $newEmail, $isPas
             ->willReturnSelf();
         $this->transportBuilderMock->expects(clone $expects)
             ->method('setFrom')
-            ->with($sender)
+            ->with($senderValues)
             ->willReturnSelf();
 
         $this->transportBuilderMock->expects(clone $expects)
@@ -287,14 +312,27 @@ public function sendNotificationEmailsDataProvider()
     public function testPasswordReminder()
     {
         $customerId = 1;
+        $customerWebsiteId = 1;
         $customerStoreId = 2;
         $customerEmail = 'email@email.com';
         $customerData = ['key' => 'value'];
         $customerName = 'Customer Name';
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
+        $storeIds = [1, 2];
+
+        $this->senderResolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $customerStoreId)
+            ->willReturn($senderValues);
 
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($customerWebsiteId);
         $customer->expects($this->any())
             ->method('getStoreId')
             ->willReturn($customerStoreId);
@@ -313,10 +351,15 @@ public function testPasswordReminder()
             ->method('getStore')
             ->willReturn($this->storeMock);
 
-        $this->storeManagerMock->expects($this->at(1))
-            ->method('getStore')
-            ->with($customerStoreId)
-            ->willReturn($this->storeMock);
+        $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $websiteMock->expects($this->any())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getWebsite')
+            ->with($customerWebsiteId)
+            ->willReturn($websiteMock);
 
         $this->customerRegistryMock->expects($this->once())
             ->method('retrieveSecureData')
@@ -325,7 +368,7 @@ public function testPasswordReminder()
 
         $this->dataProcessorMock->expects($this->once())
             ->method('buildOutputDataArray')
-            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($customer, CustomerInterface::class)
             ->willReturn($customerData);
 
         $this->customerViewHelperMock->expects($this->any())
@@ -351,35 +394,108 @@ public function testPasswordReminder()
             ->with(EmailNotification::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $customerStoreId)
             ->willReturn($sender);
 
-        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
+        $this->mockDefaultTransportBuilder(
+            $templateIdentifier,
+            $customerStoreId,
+            $senderValues,
+            $customerEmail,
+            $customerName,
+            ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
+        );
 
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->with($templateIdentifier)
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateOptions')
-            ->with(['area' => Area::AREA_FRONTEND, 'store' => $customerStoreId])
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateVars')
-            ->with(['customer' => $this->customerSecureMock, 'store' => $this->storeMock])
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setFrom')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('addTo')
-            ->with($customerEmail, $customerName)
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('getTransport')
-            ->willReturn($transport);
+        $this->model->passwordReminder($customer);
+    }
 
-        $transport->expects($this->once())
-            ->method('sendMessage');
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPasswordReminderCustomerWithoutStoreId()
+    {
+        $customerId = 1;
+        $customerWebsiteId = 1;
+        $customerStoreId = null;
+        $customerEmail = 'email@email.com';
+        $customerData = ['key' => 'value'];
+        $customerName = 'Customer Name';
+        $templateIdentifier = 'Template Identifier';
+        $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
+        $storeIds = [1, 2];
+        $defaultStoreId = reset($storeIds);
+        $this->senderResolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $defaultStoreId)
+            ->willReturn($senderValues);
+        /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($customerWebsiteId);
+        $customer->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($customerStoreId);
+        $customer->expects($this->any())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->any())
+            ->method('getEmail')
+            ->willReturn($customerEmail);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($defaultStoreId);
+        $this->storeManagerMock->expects($this->at(0))
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeManagerMock->expects($this->at(1))
+            ->method('getStore')
+            ->with($defaultStoreId)
+            ->willReturn($this->storeMock);
+        $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $websiteMock->expects($this->any())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getWebsite')
+            ->with($customerWebsiteId)
+            ->willReturn($websiteMock);
 
+        $this->customerRegistryMock->expects($this->once())
+            ->method('retrieveSecureData')
+            ->with($customerId)
+            ->willReturn($this->customerSecureMock);
+        $this->dataProcessorMock->expects($this->once())
+            ->method('buildOutputDataArray')
+            ->with($customer, CustomerInterface::class)
+            ->willReturn($customerData);
+        $this->customerViewHelperMock->expects($this->any())
+            ->method('getCustomerName')
+            ->with($customer)
+            ->willReturn($customerName);
+        $this->customerSecureMock->expects($this->once())
+            ->method('addData')
+            ->with($customerData)
+            ->willReturnSelf();
+        $this->customerSecureMock->expects($this->once())
+            ->method('setData')
+            ->with('name', $customerName)
+            ->willReturnSelf();
+        $this->scopeConfigMock->expects($this->at(0))
+            ->method('getValue')
+            ->with(EmailNotification::XML_PATH_REMIND_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $defaultStoreId)
+            ->willReturn($templateIdentifier);
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('getValue')
+            ->with(EmailNotification::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $defaultStoreId)
+            ->willReturn($sender);
+        $this->mockDefaultTransportBuilder(
+            $templateIdentifier,
+            $defaultStoreId,
+            $senderValues,
+            $customerEmail,
+            $customerName,
+            ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
+        );
         $this->model->passwordReminder($customer);
     }
 
@@ -395,8 +511,16 @@ public function testPasswordResetConfirmation()
         $customerName = 'Customer Name';
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
 
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->senderResolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $customerStoreId)
+            ->willReturn($senderValues);
+
+        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
         $customer->expects($this->any())
             ->method('getStoreId')
             ->willReturn($customerStoreId);
@@ -427,7 +551,7 @@ public function testPasswordResetConfirmation()
 
         $this->dataProcessorMock->expects($this->once())
             ->method('buildOutputDataArray')
-            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($customer, CustomerInterface::class)
             ->willReturn($customerData);
 
         $this->customerViewHelperMock->expects($this->any())
@@ -453,34 +577,14 @@ public function testPasswordResetConfirmation()
             ->with(EmailNotification::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $customerStoreId)
             ->willReturn($sender);
 
-        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
-
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->with($templateIdentifier)
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateOptions')
-            ->with(['area' => Area::AREA_FRONTEND, 'store' => $customerStoreId])
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateVars')
-            ->with(['customer' => $this->customerSecureMock, 'store' => $this->storeMock])
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setFrom')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('addTo')
-            ->with($customerEmail, $customerName)
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('getTransport')
-            ->willReturn($transport);
-
-        $transport->expects($this->once())
-            ->method('sendMessage');
+        $this->mockDefaultTransportBuilder(
+            $templateIdentifier,
+            $customerStoreId,
+            $senderValues,
+            $customerEmail,
+            $customerName,
+            ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
+        );
 
         $this->model->passwordResetConfirmation($customer);
     }
@@ -497,8 +601,16 @@ public function testNewAccount()
         $customerName = 'Customer Name';
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
+
+        $this->senderResolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $customerStoreId)
+            ->willReturn($senderValues);
 
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
         $customer->expects($this->any())
             ->method('getStoreId')
             ->willReturn($customerStoreId);
@@ -525,7 +637,7 @@ public function testNewAccount()
 
         $this->dataProcessorMock->expects($this->once())
             ->method('buildOutputDataArray')
-            ->with($customer, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($customer, CustomerInterface::class)
             ->willReturn($customerData);
 
         $this->customerViewHelperMock->expects($this->any())
@@ -551,6 +663,38 @@ public function testNewAccount()
             ->with(EmailNotification::XML_PATH_REGISTER_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $customerStoreId)
             ->willReturn($sender);
 
+        $this->mockDefaultTransportBuilder(
+            $templateIdentifier,
+            $customerStoreId,
+            $senderValues,
+            $customerEmail,
+            $customerName,
+            ['customer' => $this->customerSecureMock, 'back_url' => '', 'store' => $this->storeMock]
+        );
+
+        $this->model->newAccount($customer, EmailNotification::NEW_ACCOUNT_EMAIL_REGISTERED, '', $customerStoreId);
+    }
+
+    /**
+     * Create default mock for $this->transportBuilderMock.
+     *
+     * @param string $templateIdentifier
+     * @param int $customerStoreId
+     * @param array $senderValues
+     * @param string $customerEmail
+     * @param string $customerName
+     * @param array $templateVars
+     *
+     * @return void
+     */
+    private function mockDefaultTransportBuilder(
+        string $templateIdentifier,
+        int $customerStoreId,
+        array $senderValues,
+        string $customerEmail,
+        string $customerName,
+        array $templateVars = []
+    ): void {
         $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
 
         $this->transportBuilderMock->expects($this->once())
@@ -563,11 +707,11 @@ public function testNewAccount()
             ->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())
             ->method('setTemplateVars')
-            ->with(['customer' => $this->customerSecureMock, 'back_url' => '', 'store' => $this->storeMock])
+            ->with($templateVars)
             ->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())
             ->method('setFrom')
-            ->with($sender)
+            ->with($senderValues)
             ->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())
             ->method('addTo')
@@ -579,7 +723,5 @@ public function testNewAccount()
 
         $transport->expects($this->once())
             ->method('sendMessage');
-
-        $this->model->newAccount($customer, EmailNotification::NEW_ACCOUNT_EMAIL_REGISTERED, '', $customerStoreId);
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php b/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
index f2db8c6cab6be..ea400933ea4c2 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
@@ -71,6 +71,11 @@ protected function setUp()
             ->getMock();
     }
 
+    /**
+     * @param $entityTypeCode
+     * @param array $allowedExtensions
+     * @return FileProcessor
+     */
     private function getModel($entityTypeCode, array $allowedExtensions = [])
     {
         $model = new FileProcessor(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
index 4cea7ee22837d..408389182ae49 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
@@ -71,7 +71,8 @@ public function testLog($customerId, $data)
         $data = array_filter($data);
 
         if (!$data) {
-            $this->expectException('\InvalidArgumentException', 'Log data is empty');
+            $this->expectException('\InvalidArgumentException');
+            $this->expectExceptionMessage('Log data is empty');
             $this->logger->log($customerId, $data);
             return;
         }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataHydratorTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataHydratorTest.php
index ec9831dde081e..248cae999065c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataHydratorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataHydratorTest.php
@@ -205,7 +205,7 @@ public function testExtract()
             ->method('buildOutputDataArray')
             ->with(
                 $this->attributeMetadataMock,
-                AttributeMetadataInterface::class
+                AttributeMetadata::class
             )
             ->willReturn($data);
         $this->assertSame(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
index b9f8564d3616a..e4dc22ba40e31 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
@@ -94,6 +94,9 @@ public function testSetRequestScopeOnly($bool)
         $this->assertSame($bool, $this->_model->isRequestScopeOnly());
     }
 
+    /**
+     * @return array
+     */
     public function trueFalseDataProvider()
     {
         return [[true], [false]];
@@ -122,6 +125,9 @@ public function testApplyInputFilter($input, $output, $filter)
         $this->assertEquals($output, $this->_model->applyInputFilter($input));
     }
 
+    /**
+     * @return array
+     */
     public function applyInputFilterProvider()
     {
         return [
@@ -160,6 +166,9 @@ public function testDateFilterFormat($format, $output)
         $this->assertEquals($output, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function dateFilterFormatProvider()
     {
         return [[null, 'Whatever I put'], [false, self::MODEL], ['something else', self::MODEL]];
@@ -231,6 +240,9 @@ public function testValidateInputRule($value, $label, $inputValidation, $expecte
         $this->assertEquals($expectedOutput, $this->_model->validateInputRule($value));
     }
 
+    /**
+     * @return array
+     */
     public function validateInputRuleDataProvider()
     {
         return [
@@ -319,6 +331,9 @@ public function testGetRequestValue($request, $attributeCode, $requestScope, $re
         $this->assertEquals($expectedValue, $this->_model->getRequestValue($request));
     }
 
+    /**
+     * @return array
+     */
     public function getRequestValueDataProvider()
     {
         $expectedValue = 'EXPECTED_VALUE';
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/BooleanTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/BooleanTest.php
index 4315340d65bff..d9f101b922cc8 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/BooleanTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/BooleanTest.php
@@ -28,6 +28,9 @@ public function testGetOptionText($value, $expected)
         $this->assertSame($expected, (string)$boolean->outputValue());
     }
 
+    /**
+     * @return array
+     */
     public function getOptionTextDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
index 2c09555374aef..553efea38a82b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
@@ -12,6 +12,9 @@ class DateTest extends AbstractFormTestCase
     /** @var \Magento\Customer\Model\Metadata\Form\Date */
     protected $date;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -46,6 +49,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test extractValue
+     */
     public function testExtractValue()
     {
         $requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
@@ -112,6 +118,9 @@ public function testValidateValue($value, $validation, $required, $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function validateValueDataProvider()
     {
         return [
@@ -163,12 +172,15 @@ public function testCompactValue($value, $expected)
         $this->assertSame($expected, $this->date->compactValue($value));
     }
 
+    /**
+     * @return array
+     */
     public function compactAndRestoreValueDataProvider()
     {
         return [
             [1, 1],
             [false, false],
-            ['', null],
+            [null, null],
             ['test', 'test'],
             [['element1', 'element2'], ['element1', 'element2']]
         ];
@@ -185,6 +197,9 @@ public function testRestoreValue($value, $expected)
         $this->assertSame($expected, $this->date->restoreValue($value));
     }
 
+    /**
+     * Test outputValue
+     */
     public function testOutputValue()
     {
         $this->assertEquals(null, $this->date->outputValue());
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php
index 97452b995ba0b..1cffaa6fe0379 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php
@@ -118,6 +118,9 @@ public function testExtractValueNoRequestScope($expected, $attributeCode = '', $
         }
     }
 
+    /**
+     * @return array
+     */
     public function extractValueNoRequestScopeDataProvider()
     {
         return [
@@ -178,6 +181,9 @@ public function testExtractValueWithRequestScope($expected, $requestScope, $main
         }
     }
 
+    /**
+     * @return array
+     */
     public function extractValueWithRequestScopeDataProvider()
     {
         return [
@@ -228,6 +234,9 @@ public function testValidateValueNotToUpload($expected, $value, $isAjax = false,
         $this->assertEquals($expected, $model->validateValue($value));
     }
 
+    /**
+     * @return array
+     */
     public function validateValueNotToUploadDataProvider()
     {
         return [
@@ -285,6 +294,9 @@ public function testValidateValueToUpload($expected, $value, $parameters = [])
         $this->assertEquals($expected, $model->validateValue($value));
     }
 
+    /**
+     * @return array
+     */
     public function validateValueToUploadDataProvider()
     {
         return [
@@ -429,6 +441,9 @@ public function testOutputValueNonJson($format)
         $this->assertSame('', $model->outputValue($format));
     }
 
+    /**
+     * @return array
+     */
     public function outputValueDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
index 0278e2b2d791d..31d2a31ceae4c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -259,7 +259,7 @@ public function testValidateMaxImageHeight()
         )->getMockForAbstractClass();
         $validationRuleMock->expects($this->any())
             ->method('getName')
-            ->willReturn('max_image_heght');
+            ->willReturn('max_image_height');
         $validationRuleMock->expects($this->any())
             ->method('getValue')
             ->willReturn($maxImageHeight);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultilineTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultilineTest.php
index 25f10d7bb93c6..e74ddebdb597b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultilineTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/MultilineTest.php
@@ -42,6 +42,9 @@ public function testValidateValueRequired($value, $expected)
         parent::testValidateValueRequired($value, $expected);
     }
 
+    /**
+     * @return array
+     */
     public function validateValueRequiredDataProvider()
     {
         return array_merge(
@@ -66,6 +69,9 @@ public function testValidateValueLength($value, $expected)
         parent::testValidateValueLength($value, $expected);
     }
 
+    /**
+     * @return array
+     */
     public function validateValueLengthDataProvider()
     {
         return array_merge(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/SelectTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/SelectTest.php
index c8564df6b086f..5861ef1f93784 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/SelectTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/SelectTest.php
@@ -42,6 +42,9 @@ public function testValidateValue($value, $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function validateValueDataProvider()
     {
         return [
@@ -74,6 +77,9 @@ public function testValidateValueRequired($value, $expected)
         }
     }
 
+    /**
+     * @return array
+     */
     public function validateValueRequiredDataProvider()
     {
         return [
@@ -145,6 +151,9 @@ public function testOutputValue($value, $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function outputValueDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/TextTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/TextTest.php
index 9a3e1c1d8a7cb..7987bdc79ed98 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/TextTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/TextTest.php
@@ -5,8 +5,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Model\Metadata\Form;
 
+use Magento\Customer\Api\Data\ValidationRuleInterface;
 use Magento\Customer\Model\Metadata\Form\Text;
 
 class TextTest extends AbstractFormTestCase
@@ -14,6 +16,9 @@ class TextTest extends AbstractFormTestCase
     /** @var \Magento\Framework\Stdlib\StringUtils */
     protected $stringHelper;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -52,6 +57,9 @@ public function testValidateValue($value, $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function validateValueDataProvider()
     {
         return [
@@ -84,6 +92,9 @@ public function testValidateValueRequired($value, $expected)
         }
     }
 
+    /**
+     * @return array
+     */
     public function validateValueRequiredDataProvider()
     {
         return [
@@ -105,7 +116,7 @@ public function validateValueRequiredDataProvider()
      */
     public function testValidateValueLength($value, $expected)
     {
-        $minTextLengthRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
+        $minTextLengthRule = $this->getMockBuilder(ValidationRuleInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getName', 'getValue'])
             ->getMockForAbstractClass();
@@ -116,7 +127,7 @@ public function testValidateValueLength($value, $expected)
             ->method('getValue')
             ->will($this->returnValue(4));
 
-        $maxTextLengthRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
+        $maxTextLengthRule = $this->getMockBuilder(ValidationRuleInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getName', 'getValue'])
             ->getMockForAbstractClass();
@@ -127,7 +138,19 @@ public function testValidateValueLength($value, $expected)
             ->method('getValue')
             ->will($this->returnValue(8));
 
+        $inputValidationRule = $this->getMockBuilder(ValidationRuleInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName', 'getValue'])
+            ->getMockForAbstractClass();
+        $inputValidationRule->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('input_validation'));
+        $inputValidationRule->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValue('other'));
+
         $validationRules = [
+            'input_validation' => $inputValidationRule,
             'min_text_length' => $minTextLengthRule,
             'max_text_length' => $maxTextLengthRule,
         ];
@@ -150,6 +173,9 @@ public function testValidateValueLength($value, $expected)
         }
     }
 
+    /**
+     * @return array
+     */
     public function validateValueLengthDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/ValidatorTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/ValidatorTest.php
index bef2db9bf2694..354932b0ede0b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/ValidatorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/ValidatorTest.php
@@ -79,6 +79,9 @@ public function testIsValid($isValid)
         $this->assertEquals($isValid, $this->validator->isValid(new \Magento\Framework\DataObject($data)));
     }
 
+    /**
+     * @return array
+     */
     public function trueFalseDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerNotificationTest.php b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerNotificationTest.php
index 14a95dda76f61..c3c853bca1469 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerNotificationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerNotificationTest.php
@@ -5,82 +5,119 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Plugin;
 
+use Magento\Backend\App\AbstractAction;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Customer\NotificationStorage;
 use Magento\Customer\Model\Plugin\CustomerNotification;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Psr\Log\LoggerInterface;
 
 class CustomerNotificationTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $session;
+    /** @var Session|\PHPUnit_Framework_MockObject_MockObject */
+    private $sessionMock;
 
-    /** @var \Magento\Customer\Model\Customer\NotificationStorage|\PHPUnit_Framework_MockObject_MockObject */
-    protected $notificationStorage;
+    /** @var NotificationStorage|\PHPUnit_Framework_MockObject_MockObject */
+    private $notificationStorageMock;
 
-    /** @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerRepository;
+    /** @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerRepositoryMock;
 
-    /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
-    protected $appState;
+    /** @var State|\PHPUnit_Framework_MockObject_MockObject */
+    private $appStateMock;
 
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
+    /** @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $requestMock;
 
-    /** @var \Magento\Backend\App\AbstractAction|\PHPUnit_Framework_MockObject_MockObject */
-    protected $abstractAction;
+    /** @var AbstractAction|\PHPUnit_Framework_MockObject_MockObject */
+    private $abstractActionMock;
+
+    /** @var LoggerInterface */
+    private $loggerMock;
 
     /** @var CustomerNotification */
-    protected $plugin;
+    private $plugin;
+
+    /** @var int */
+    private static $customerId = 1;
 
     protected function setUp()
     {
-        $this->session = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+        $this->sessionMock = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'setCustomerData', 'setCustomerGroupId', 'regenerateId'])
             ->getMock();
-        $this->notificationStorage = $this->getMockBuilder(\Magento\Customer\Model\Customer\NotificationStorage::class)
+        $this->notificationStorageMock = $this->getMockBuilder(NotificationStorage::class)
             ->disableOriginalConstructor()
+            ->setMethods(['isExists', 'remove'])
             ->getMock();
-        $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepositoryMock = $this->getMockBuilder(CustomerRepositoryInterface::class)
             ->getMockForAbstractClass();
-        $this->abstractAction = $this->getMockBuilder(\Magento\Backend\App\AbstractAction::class)
+        $this->abstractActionMock = $this->getMockBuilder(AbstractAction::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->setMethods(['isPost'])
             ->getMockForAbstractClass();
-        $this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
-            ->disableOriginalConstructor()->getMock();
+        $this->appStateMock = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAreaCode'])
+            ->getMock();
+
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->appStateMock->method('getAreaCode')->willReturn(Area::AREA_FRONTEND);
+        $this->requestMock->method('isPost')->willReturn(true);
+        $this->sessionMock->method('getCustomerId')->willReturn(self::$customerId);
+        $this->notificationStorageMock->expects($this->any())
+            ->method('isExists')
+            ->with(NotificationStorage::UPDATE_CUSTOMER_SESSION, self::$customerId)
+            ->willReturn(true);
+
         $this->plugin = new CustomerNotification(
-            $this->session,
-            $this->notificationStorage,
-            $this->appState,
-            $this->customerRepository
+            $this->sessionMock,
+            $this->notificationStorageMock,
+            $this->appStateMock,
+            $this->customerRepositoryMock,
+            $this->loggerMock
         );
     }
 
     public function testBeforeDispatch()
     {
-        $customerId = 1;
         $customerGroupId =1;
-        $this->appState->expects($this->any())
-            ->method('getAreaCode')
-            ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
-        $this->request->expects($this->any())->method('isPost')->willReturn(true);
-        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-        $customerMock->expects($this->any())->method('getGroupId')->willReturn($customerGroupId);
-        $this->customerRepository->expects($this->any())
+
+        $customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
+        $customerMock->method('getGroupId')->willReturn($customerGroupId);
+        $customerMock->method('getId')->willReturn(self::$customerId);
+
+        $this->customerRepositoryMock->expects($this->once())
             ->method('getById')
-            ->with($customerId)
+            ->with(self::$customerId)
             ->willReturn($customerMock);
-        $this->session->expects($this->any())->method('getCustomerId')->willReturn($customerId);
-        $this->session->expects($this->any())->method('setCustomerData')->with($customerMock);
-        $this->session->expects($this->any())->method('setCustomerGroupId')->with($customerGroupId);
-        $this->session->expects($this->once())->method('regenerateId');
-        $this->notificationStorage->expects($this->any())
-            ->method('isExists')
-            ->with(NotificationStorage::UPDATE_CUSTOMER_SESSION, $customerId)
-            ->willReturn(true);
+        $this->notificationStorageMock->expects($this->once())
+            ->method('remove')
+            ->with(NotificationStorage::UPDATE_CUSTOMER_SESSION, self::$customerId);
+
+        $this->sessionMock->expects($this->once())->method('setCustomerData')->with($customerMock);
+        $this->sessionMock->expects($this->once())->method('setCustomerGroupId')->with($customerGroupId);
+        $this->sessionMock->expects($this->once())->method('regenerateId');
+
+        $this->plugin->beforeDispatch($this->abstractActionMock, $this->requestMock);
+    }
+
+    public function testBeforeDispatchWithNoCustomerFound()
+    {
+        $this->customerRepositoryMock->method('getById')
+            ->with(self::$customerId)
+            ->willThrowException(new NoSuchEntityException());
+        $this->loggerMock->expects($this->once())
+            ->method('error');
 
-        $this->plugin->beforeDispatch($this->abstractAction, $this->request);
+        $this->plugin->beforeDispatch($this->abstractActionMock, $this->requestMock);
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
index 759c823eec7f9..c655ff7056ed6 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
@@ -90,6 +90,9 @@ public function testRender($regionCollection)
         $this->assertContains('required-entry', $html);
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
index e81637cfb23b2..319179c5e279a 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/RelationTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Test\Unit\Model\ResourceModel\Address;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\Model\Address;
 
 /**
  * Class AddressTest
@@ -40,7 +41,7 @@ protected function setUp()
      */
     public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShipping)
     {
-        $addressModel = $this->createPartialMock(\Magento\Framework\Model\AbstractModel::class, [
+        $addressModel = $this->createPartialMock(Address::class, [
                 '__wakeup',
                 'getId',
                 'getEntityTypeId',
@@ -55,7 +56,17 @@ public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShi
             ]);
         $customerModel = $this->createPartialMock(
             \Magento\Customer\Model\Customer::class,
-            ['__wakeup', 'setDefaultBilling', 'setDefaultShipping', 'save', 'load', 'getResource', 'getId']
+            [
+                '__wakeup',
+                'setDefaultBilling',
+                'setDefaultShipping',
+                'save',
+                'load',
+                'getResource',
+                'getId',
+                'getDefaultShippingAddress',
+                'getDefaultBillingAddress'
+            ]
         );
         $customerResource = $this->getMockForAbstractClass(
             \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
@@ -88,6 +99,7 @@ public function testProcessRelation($addressId, $isDefaultBilling, $isDefaultShi
         $this->customerFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($customerModel);
+
         if ($addressId && ($isDefaultBilling || $isDefaultShipping)) {
             $customerId = 1;
             $customerResource->expects($this->exactly(2))->method('getConnection')->willReturn($connectionMock);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php
index f2ccc50dc68d0..070e5e59e3f99 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php
@@ -275,13 +275,13 @@ public function testSaveWithInvalidRegion()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage regionId is a required field.
+     * @expectedExceptionMessage "regionId" is required. Enter and try again.
      */
     public function testSaveWithInvalidRegionId()
     {
         $customerId = 34;
         $addressId = 53;
-        $errors[] = __('regionId is a required field.');
+        $errors[] = __('"regionId" is required. Enter and try again.');
         $customerAddress = $this->getMockForAbstractClass(
             \Magento\Customer\Api\Data\AddressInterface::class,
             [],
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
index 87cfb092997e8..f1bc0b402c615 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
@@ -242,6 +242,9 @@ protected function prepareValidatorFactory()
         return $validatorFactory;
     }
 
+    /**
+     * @return \Magento\Customer\Model\CustomerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
     protected function prepareCustomerFactory()
     {
         $this->customerFactory = $this->createPartialMock(\Magento\Customer\Model\CustomerFactory::class, ['create']);
@@ -264,16 +267,26 @@ class SubResourceModelAddress extends \Magento\Customer\Model\ResourceModel\Addr
 {
     protected $attributeLoader;
 
+    /**
+     * @param null $object
+     * @return \Magento\Customer\Model\ResourceModel\Address|\Magento\Eav\Model\Entity\AbstractEntity
+     */
     public function loadAllAttributes($object = null)
     {
         return $this->getAttributeLoader()->loadAllAttributes($this, $object);
     }
 
+    /**
+     * @param $attributeLoader
+     */
     public function setAttributeLoader($attributeLoader)
     {
         $this->attributeLoader = $attributeLoader;
     }
 
+    /**
+     * @return \Magento\Eav\Model\Entity\AttributeLoaderInterface
+     */
     protected function getAttributeLoader()
     {
         return $this->attributeLoader;
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
index a05e9e23ef94f..05953b09b8c04 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Customer\Test\Unit\Model\ResourceModel;
 
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Model\Customer\NotificationStorage;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 
 /**
@@ -18,82 +19,87 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Customer\Model\CustomerFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerFactory;
+    private $customerFactory;
 
     /**
      * @var \Magento\Customer\Model\Data\CustomerSecureFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerSecureFactory;
+    private $customerSecureFactory;
 
     /**
      * @var \Magento\Customer\Model\CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerRegistry;
+    private $customerRegistry;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\AddressRepository|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $addressRepository;
+    private $addressRepository;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerResourceModel;
+    private $customerResourceModel;
 
     /**
      * @var \Magento\Customer\Api\CustomerMetadataInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerMetadata;
+    private $customerMetadata;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $searchResultsFactory;
+    private $searchResultsFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $eventManager;
+    private $eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $extensibleDataObjectConverter;
+    private $extensibleDataObjectConverter;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $dataObjectHelper;
+    private $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\Api\ImageProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imageProcessor;
+    private $imageProcessor;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $extensionAttributesJoinProcessor;
+    private $extensionAttributesJoinProcessor;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customer;
+    private $customer;
 
     /**
      * @var CollectionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $collectionProcessorMock;
 
+    /**
+     * @var NotificationStorage|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notificationStorage;
+
     /**
      * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
      */
-    protected $model;
+    private $model;
 
     protected function setUp()
     {
@@ -158,6 +164,10 @@ protected function setUp()
         );
         $this->collectionProcessorMock = $this->getMockBuilder(CollectionProcessorInterface::class)
             ->getMock();
+        $this->notificationStorage = $this->getMockBuilder(NotificationStorage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = new \Magento\Customer\Model\ResourceModel\CustomerRepository(
             $this->customerFactory,
             $this->customerSecureFactory,
@@ -172,7 +182,8 @@ protected function setUp()
             $this->dataObjectHelper,
             $this->imageProcessor,
             $this->extensionAttributesJoinProcessor,
-            $this->collectionProcessorMock
+            $this->collectionProcessorMock,
+            $this->notificationStorage
         );
     }
 
@@ -184,35 +195,6 @@ public function testSave()
         $customerId = 1;
         $storeId = 2;
 
-        $region = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\RegionInterface::class, [], '', false);
-        $address = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
-        $address2 = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
         $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
                 'getId',
                 'setId',
@@ -232,10 +214,6 @@ public function testSave()
 
         $origCustomer = $this->customer;
 
-        $this->customer->expects($this->atLeastOnce())
-            ->method('__toArray')
-            ->willReturn(['default_billing', 'default_shipping']);
-
         $customerAttributesMetaData = $this->getMockForAbstractClass(
             \Magento\Framework\Api\CustomAttributesDataInterface::class,
             [],
@@ -262,6 +240,9 @@ public function testSave()
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
+        $this->customer->expects($this->atLeastOnce())
+            ->method('__toArray')
+            ->willReturn([]);
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('retrieve')
             ->with($customerId)
@@ -276,28 +257,6 @@ public function testSave()
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method("remove")
             ->with($customerId);
-        $address->expects($this->once())
-            ->method('setCustomerId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $address->expects($this->once())
-            ->method('getRegion')
-            ->willReturn($region);
-        $address->expects($this->atLeastOnce())
-            ->method('getId')
-            ->willReturn(7);
-        $address->expects($this->once())
-            ->method('setRegion')
-            ->with($region);
-        $customerAttributesMetaData->expects($this->atLeastOnce())
-            ->method('getAddresses')
-            ->willReturn([$address]);
-        $customerAttributesMetaData->expects($this->at(1))
-            ->method('setAddresses')
-            ->with([]);
-        $customerAttributesMetaData->expects($this->at(2))
-            ->method('setAddresses')
-            ->with([$address]);
         $this->extensibleDataObjectConverter->expects($this->once())
             ->method('toNestedArray')
             ->with($customerAttributesMetaData, [], \Magento\Customer\Api\Data\CustomerInterface::class)
@@ -323,12 +282,6 @@ public function testSave()
         $customerModel->expects($this->once())
             ->method('setId')
             ->with($customerId);
-        $customerModel->expects($this->once())
-            ->method('getAttributeSetId')
-            ->willReturn(null);
-        $customerModel->expects($this->once())
-            ->method('setAttributeSetId')
-            ->with(\Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
         $customerAttributesMetaData->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -388,12 +341,6 @@ public function testSave()
         $this->customerRegistry->expects($this->once())
             ->method('push')
             ->with($customerModel);
-        $this->customer->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn([$address, $address2]);
-        $this->addressRepository->expects($this->once())
-            ->method('save')
-            ->with($address);
         $customerAttributesMetaData->expects($this->once())
             ->method('getEmail')
             ->willReturn('example@example.com');
@@ -408,7 +355,11 @@ public function testSave()
             ->method('dispatch')
             ->with(
                 'customer_save_after_data_object',
-                ['customer_data_object' => $this->customer, 'orig_customer_data_object' => $origCustomer]
+                [
+                    'customer_data_object' => $this->customer,
+                    'orig_customer_data_object' => $origCustomer,
+                    'delegate_data' => [],
+                ]
             );
 
         $this->model->save($this->customer);
@@ -431,47 +382,8 @@ public function testSaveWithPasswordHash()
                 'getFirstFailure',
                 'getLockExpires',
             ]);
-        $region = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\RegionInterface::class,
-            [],
-            '',
-            false
-        );
-        $address = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
-        $address2 = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
-
         $origCustomer = $this->customer;
 
-        $this->customer->expects($this->atLeastOnce())
-            ->method('__toArray')
-            ->willReturn(['default_billing', 'default_shipping']);
-
         $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
                 'getId',
                 'setId',
@@ -539,6 +451,9 @@ public function testSaveWithPasswordHash()
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
+        $this->customer->expects($this->atLeastOnce())
+            ->method('__toArray')
+            ->willReturn([]);
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('retrieve')
             ->with($customerId)
@@ -550,28 +465,6 @@ public function testSaveWithPasswordHash()
             ->method('save')
             ->with($this->customer, CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, $this->customer)
             ->willReturn($customerAttributesMetaData);
-        $address->expects($this->once())
-            ->method('setCustomerId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $address->expects($this->once())
-            ->method('getRegion')
-            ->willReturn($region);
-        $address->expects($this->atLeastOnce())
-            ->method('getId')
-            ->willReturn(7);
-        $address->expects($this->once())
-            ->method('setRegion')
-            ->with($region);
-        $customerAttributesMetaData->expects($this->any())
-            ->method('getAddresses')
-            ->willReturn([$address]);
-        $customerAttributesMetaData->expects($this->at(1))
-            ->method('setAddresses')
-            ->with([]);
-        $customerAttributesMetaData->expects($this->at(2))
-            ->method('setAddresses')
-            ->with([$address]);
         $customerAttributesMetaData
             ->expects($this->atLeastOnce())
             ->method('getId')
@@ -601,12 +494,6 @@ public function testSaveWithPasswordHash()
         $customerModel->expects($this->once())
             ->method('setId')
             ->with($customerId);
-        $customerModel->expects($this->once())
-            ->method('getAttributeSetId')
-            ->willReturn(null);
-        $customerModel->expects($this->once())
-            ->method('setAttributeSetId')
-            ->with(\Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
         $customerModel->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -615,12 +502,6 @@ public function testSaveWithPasswordHash()
         $this->customerRegistry->expects($this->once())
             ->method('push')
             ->with($customerModel);
-        $this->customer->expects($this->any())
-            ->method('getAddresses')
-            ->willReturn([$address, $address2]);
-        $this->addressRepository->expects($this->once())
-            ->method('save')
-            ->with($address);
         $customerAttributesMetaData->expects($this->once())
             ->method('getEmail')
             ->willReturn('example@example.com');
@@ -635,7 +516,11 @@ public function testSaveWithPasswordHash()
             ->method('dispatch')
             ->with(
                 'customer_save_after_data_object',
-                ['customer_data_object' => $this->customer, 'orig_customer_data_object' => $origCustomer]
+                [
+                    'customer_data_object' => $this->customer,
+                    'orig_customer_data_object' => $origCustomer,
+                    'delegate_data' => [],
+                ]
             );
 
         $this->model->save($this->customer, $passwordHash);
@@ -733,7 +618,7 @@ public function testGetList()
             ->willReturnSelf();
         $collection->expects($this->at(7))
             ->method('joinAttribute')
-            ->with('company', 'customer_address/company', 'default_billing', null, 'left')
+            ->with('billing_company', 'customer_address/company', 'default_billing', null, 'left')
             ->willReturnSelf();
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')
@@ -793,6 +678,9 @@ public function testDelete()
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('remove')
             ->with($customerId);
+        $this->notificationStorage->expects($this->atLeastOnce())
+            ->method('remove')
+            ->with(NotificationStorage::UPDATE_CUSTOMER_SESSION, $customerId);
 
         $this->assertTrue($this->model->delete($this->customer));
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
new file mode 100644
index 0000000000000..fc4f762afb0bb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model\ResourceModel\Group\Grid;
+
+use Magento\Customer\Model\ResourceModel\Group\Grid\Collection;
+use Magento\Framework\Api\Search\AggregationInterface;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\DB\Select;
+
+/**
+ * CollectionTest contains unit tests for \Magento\Customer\Model\ResourceModel\Group\Grid\Collection class
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var EntityFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityFactoryMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $loggerMock;
+
+    /**
+     * @var FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fetchStrategyMock;
+
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $eventManagerMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /**
+     * @var AggregationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $aggregationsMock;
+
+    /**
+     * @var Select
+     */
+    protected $selectMock;
+
+    /**
+     * @var Collection
+     */
+    protected $model;
+
+    /**
+     * SetUp method
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->entityFactoryMock = $this->getMockBuilder(EntityFactoryInterface::class)
+            ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
+        $this->fetchStrategyMock = $this->getMockBuilder(FetchStrategyInterface::class)
+            ->getMockForAbstractClass();
+        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->resourceMock = $this->getMockBuilder(AbstractDb::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->aggregationsMock = $this->getMockBuilder(AggregationInterface::class)
+            ->getMockForAbstractClass();
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->getMockForAbstractClass();
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resourceMock->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->selectMock);
+
+        $this->model = (new ObjectManager($this))->getObject(Collection::class, [
+            'entityFactory' => $this->entityFactoryMock,
+            'logger' => $this->loggerMock,
+            'fetchStrategy' => $this->fetchStrategyMock,
+            'eventManager' => $this->eventManagerMock,
+            'mainTable' => null,
+            'eventPrefix' => 'test_event_prefix',
+            'eventObject' => 'test_event_object',
+            'resourceModel' => null,
+            'resource' => $this->resourceMock,
+        ]);
+    }
+
+    /**
+     * @covers \Magento\Customer\Model\ResourceModel\Group\Grid\Collection::setSearchCriteria
+     * @covers \Magento\Customer\Model\ResourceModel\Group\Grid\Collection::getAggregations
+     */
+    public function testSetGetAggregations()
+    {
+        $this->model->setAggregations($this->aggregationsMock);
+        $this->assertInstanceOf(AggregationInterface::class, $this->model->getAggregations());
+    }
+
+    /**
+     * @covers \Magento\Customer\Model\ResourceModel\Group\Grid\Collection::setSearchCriteria
+     */
+    public function testSetSearchCriteria()
+    {
+        $this->assertEquals($this->model, $this->model->setSearchCriteria());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
index 61081e1aaf224..31646437bfc4c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
@@ -219,7 +219,7 @@ public function testGetSearchCriteriaAnd()
      * @param array $conditions
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage When passing in a field array there must be a matching condition array
+     * @expectedExceptionMessage The field array failed to pass. The array must have a matching condition array.
      * @dataProvider addFieldToFilterInconsistentArraysDataProvider
      */
     public function testAddFieldToFilterInconsistentArrays($fields, $conditions)
@@ -227,6 +227,9 @@ public function testAddFieldToFilterInconsistentArrays($fields, $conditions)
         $this->serviceCollection->addFieldToFilter($fields, $conditions);
     }
 
+    /**
+     * @return array
+     */
     public function addFieldToFilterInconsistentArraysDataProvider()
     {
         return [
@@ -243,7 +246,7 @@ public function addFieldToFilterInconsistentArraysDataProvider()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage When passing an array of fields there must be at least one field in the array.
+     * @expectedExceptionMessage The array of fields failed to pass. The array must include at one field.
      * @dataProvider addFieldToFilterInconsistentArraysDataProvider
      */
     public function testAddFieldToFilterEmptyArrays()
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php
index 98cf8c212a784..9e8440b500989 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php
@@ -38,6 +38,11 @@ class GroupRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     protected $group;
 
+    /**
+     * @var \Magento\Customer\Api\Data\GroupInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $factoryCreatedGroup;
+
     /**
      * @var \Magento\Customer\Model\ResourceModel\Group|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -153,6 +158,12 @@ private function setupGroupObjects()
             'group',
             false
         );
+        $this->factoryCreatedGroup = $this->getMockForAbstractClass(
+            \Magento\Customer\Api\Data\GroupInterface::class,
+            [],
+            'group',
+            false
+        );
 
         $this->groupResourceModel = $this->createMock(\Magento\Customer\Model\ResourceModel\Group::class);
     }
@@ -162,16 +173,22 @@ public function testSave()
         $groupId = 0;
 
         $taxClass = $this->getMockForAbstractClass(\Magento\Tax\Api\Data\TaxClassInterface::class, [], '', false);
+        $extensionAttributes = $this->getMockForAbstractClass(
+            \Magento\Customer\Api\Data\GroupExtensionInterface::class
+        );
 
-        $this->group->expects($this->once())
+        $this->group->expects($this->atLeastOnce())
             ->method('getCode')
             ->willReturn('Code');
         $this->group->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($groupId);
-        $this->group->expects($this->once())
+        $this->group->expects($this->atLeastOnce())
             ->method('getTaxClassId')
             ->willReturn(17);
+        $this->group->expects($this->atLeastOnce())
+            ->method('getExtensionAttributes')
+            ->willReturn($extensionAttributes);
 
         $this->groupModel->expects($this->atLeastOnce())
             ->method('getId')
@@ -185,22 +202,33 @@ public function testSave()
         $this->groupModel->expects($this->atLeastOnce())
             ->method('getTaxClassName')
             ->willReturn('Tax class name');
-        $this->group->expects($this->once())
+
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setId')
             ->with($groupId)
             ->willReturnSelf();
-        $this->group->expects($this->once())
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setCode')
             ->with('Code')
             ->willReturnSelf();
-        $this->group->expects($this->once())
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setTaxClassId')
             ->with(234)
             ->willReturnSelf();
-        $this->group->expects($this->once())
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setTaxClassName')
             ->with('Tax class name')
             ->willReturnSelf();
+        $this->factoryCreatedGroup->expects($this->once())
+            ->method('setExtensionAttributes')
+            ->with($extensionAttributes)
+            ->willReturnSelf();
+        $this->factoryCreatedGroup->expects($this->atLeastOnce())
+            ->method('getCode')
+            ->willReturn('Code');
+        $this->factoryCreatedGroup->expects($this->atLeastOnce())
+            ->method('getTaxClassId')
+            ->willReturn(17);
 
         $this->taxClassRepository->expects($this->once())
             ->method('get')
@@ -229,9 +257,12 @@ public function testSave()
             ->with($groupId);
         $this->groupDataFactory->expects($this->once())
             ->method('create')
-            ->willReturn($this->group);
+            ->willReturn($this->factoryCreatedGroup);
+
+        $updatedGroup = $this->model->save($this->group);
 
-        $this->assertSame($this->group, $this->model->save($this->group));
+        $this->assertSame($this->group->getCode(), $updatedGroup->getCode());
+        $this->assertSame($this->group->getTaxClassId(), $updatedGroup->getTaxClassId());
     }
 
     /**
diff --git a/app/code/Magento/Customer/Test/Unit/Model/SessionTest.php b/app/code/Magento/Customer/Test/Unit/Model/SessionTest.php
index 7a6807562f906..7efc61af800d3 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/SessionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/SessionTest.php
@@ -52,6 +52,9 @@ class SessionTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->_storageMock = $this->createPartialMock(
@@ -82,6 +85,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testSetCustomerAsLoggedIn()
     {
         $customer = $this->createMock(\Magento\Customer\Model\Customer::class);
@@ -102,6 +108,9 @@ public function testSetCustomerAsLoggedIn()
         $this->assertSame($customer, $this->_model->getCustomer());
     }
 
+    /**
+     * @return void
+     */
     public function testSetCustomerDataAsLoggedIn()
     {
         $customer = $this->createMock(\Magento\Customer\Model\Customer::class);
@@ -126,27 +135,36 @@ public function testSetCustomerDataAsLoggedIn()
         $this->assertSame($customer, $this->_model->getCustomer());
     }
 
+    /**
+     * @return void
+     */
     public function testAuthenticate()
     {
         $urlMock = $this->createMock(\Magento\Framework\Url::class);
         $urlMock->expects($this->exactly(2))
             ->method('getUrl')
-            ->will($this->returnValue(''));
+            ->willReturn('');
         $urlMock->expects($this->once())
             ->method('getRebuiltUrl')
-            ->will($this->returnValue(''));
-        $this->urlFactoryMock->expects($this->exactly(3))
+            ->willReturn('');
+        $this->urlFactoryMock->expects($this->exactly(4))
             ->method('create')
-            ->will($this->returnValue($urlMock));
+            ->willReturn($urlMock);
+        $urlMock->expects($this->once())
+            ->method('getUseSession')
+            ->willReturn(false);
 
         $this->responseMock->expects($this->once())
             ->method('setRedirect')
             ->with('')
-            ->will($this->returnValue(''));
+            ->willReturn('');
 
         $this->assertFalse($this->_model->authenticate());
     }
 
+    /**
+     * @return void
+     */
     public function testLoginById()
     {
         $customerId = 1;
@@ -162,7 +180,7 @@ public function testLoginById()
     }
 
     /**
-     * @param $customerId
+     * @param int $customerId
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
     protected function prepareLoginDataMock($customerId)
@@ -239,6 +257,9 @@ public function getIsLoggedInDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testSetCustomerRemovesFlagThatShowsIfCustomerIsEmulated()
     {
         $customerMock = $this->createMock(\Magento\Customer\Model\Customer::class);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/VisitorTest.php b/app/code/Magento/Customer/Test/Unit/Model/VisitorTest.php
index ca6b8708f695c..ec787b9d3c873 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/VisitorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/VisitorTest.php
@@ -60,15 +60,15 @@ protected function setUp()
                 'commit',
                 'clean',
             ])->disableOriginalConstructor()->getMock();
-        $this->resource->expects($this->any())->method('getIdFieldName')->will($this->returnValue('visitor_id'));
-        $this->resource->expects($this->any())->method('addCommitCallback')->will($this->returnSelf());
+        $this->resource->expects($this->any())->method('getIdFieldName')->willReturn('visitor_id');
+        $this->resource->expects($this->any())->method('addCommitCallback')->willReturnSelf();
 
         $arguments = $this->objectManagerHelper->getConstructArguments(
             \Magento\Customer\Model\Visitor::class,
             [
                 'registry' => $this->registry,
                 'session' => $this->session,
-                'resource' => $this->resource
+                'resource' => $this->resource,
             ]
         );
 
@@ -77,14 +77,13 @@ protected function setUp()
 
     public function testInitByRequest()
     {
-        $this->session->expects($this->once())->method('getSessionId')
-            ->will($this->returnValue('asdfhasdfjhkj2198sadf8sdf897'));
-        $this->visitor->initByRequest(null);
-        $this->assertEquals('asdfhasdfjhkj2198sadf8sdf897', $this->visitor->getSessionId());
-
-        $this->visitor->setData(['visitor_id' => 1]);
+        $oldSessionId = 'asdfhasdfjhkj2198sadf8sdf897';
+        $newSessionId = 'bsdfhasdfjhkj2198sadf8sdf897';
+        $this->session->expects($this->any())->method('getSessionId')->willReturn($newSessionId);
+        $this->session->expects($this->atLeastOnce())->method('getVisitorData')
+            ->willReturn(['session_id' => $oldSessionId]);
         $this->visitor->initByRequest(null);
-        $this->assertNull($this->visitor->getSessionId());
+        $this->assertEquals($newSessionId, $this->visitor->getSessionId());
     }
 
     public function testSaveByRequest()
@@ -101,7 +100,7 @@ public function testIsModuleIgnored()
                 'registry' => $this->registry,
                 'session' => $this->session,
                 'resource' => $this->resource,
-                'ignores' => ['test_route_name' => true]
+                'ignores' => ['test_route_name' => true],
             ]
         );
         $request = new \Magento\Framework\DataObject(['route_name' => 'test_route_name']);
@@ -164,7 +163,7 @@ public function testBindQuoteDestroy()
 
     public function testClean()
     {
-        $this->resource->expects($this->once())->method('clean')->with($this->visitor)->will($this->returnSelf());
+        $this->resource->expects($this->once())->method('clean')->with($this->visitor)->willReturnSelf();
         $this->visitor->clean();
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index 939e2856f5eaa..8592d1bda66c1 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -411,6 +411,9 @@ public function testAfterAddressSaveDefaultGroup(
         $this->model->execute($observer);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderAfterAddressSaveDefaultGroup()
     {
         return [
@@ -600,6 +603,9 @@ public function testAfterAddressSaveNewGroup(
         $this->model->execute($observer);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderAfterAddressSaveNewGroup()
     {
         return [
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
index 1d7905cca7941..a9c6de72acbef 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
@@ -175,7 +175,7 @@ public function testGetConfirmationAttribute()
         $this->document->setData('original_website_id', $websiteId);
 
         $this->scopeConfig->expects(static::once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with()
             ->willReturn(true);
 
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php
new file mode 100644
index 0000000000000..65a0443aed86f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Form/AddressFieldsetTest.php
@@ -0,0 +1,69 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Ui\Component\Form;
+
+use Magento\Customer\Ui\Component\Form\AddressFieldset;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+
+/**
+ * Test for class \Magento\Customer\Ui\Component\Form\AddressFieldset
+ */
+class AddressFieldsetTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AddressFieldset
+     */
+    protected $fieldset;
+
+    /**
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->context = $this->getMockForAbstractClass(
+            \Magento\Framework\View\Element\UiComponent\ContextInterface::class
+        );
+        $this->fieldset = new AddressFieldset(
+            $this->context,
+            [],
+            []
+        );
+    }
+
+    /**
+     * Run test for canShow() method
+     *
+     * @return void
+     *
+     */
+    public function testCanShow()
+    {
+        $this->context->expects($this->atLeastOnce())->method('getRequestParam')->with('id')
+            ->willReturn(1);
+        $this->assertTrue($this->fieldset->isComponentVisible());
+    }
+
+    /**
+     * Run test for canShow() method without customer id in context
+     *
+     * @return void
+     *
+     */
+    public function testCanShowWithoutId()
+    {
+        $this->context->expects($this->atLeastOnce())->method('getRequestParam')->with('id')
+            ->willReturn(null);
+        $this->assertEquals(false, $this->fieldset->isComponentVisible());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php
index e55cee49b5c94..b712c0f30b430 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
 
-use Magento\Customer\Model\AccountManagement;
+use Magento\Customer\Model\AccountConfirmation;
 use Magento\Customer\Ui\Component\Listing\Column\Confirmation;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Store\Model\ScopeInterface;
 
 class ConfirmationTest extends \PHPUnit\Framework\TestCase
 {
@@ -40,6 +39,11 @@ class ConfirmationTest extends \PHPUnit\Framework\TestCase
      */
     protected $processor;
 
+    /**
+     * @var AccountConfirmation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $accountConfirmation;
+
     public function setup()
     {
         $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
@@ -60,12 +64,15 @@ public function setup()
         $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->getMockForAbstractClass();
 
+        $this->accountConfirmation = $this->createMock(AccountConfirmation::class);
+
         $this->confirmation = new Confirmation(
             $this->context,
             $this->uiComponentFactory,
             $this->scopeConfig,
             [],
-            []
+            [],
+            $this->accountConfirmation
         );
     }
 
@@ -81,12 +88,17 @@ public function testPrepareDataSource(
         $expected
     ) {
         $websiteId = 1;
+        $customerId = 1;
+        $customerEmail = 'customer@example.com';
 
         $dataSource = [
             'data' => [
                 'items' => [
                     [
+                        'id_field_name' => 'entity_id',
+                        'entity_id' => $customerId,
                         'confirmation' => $confirmation,
+                        'email' => $customerEmail,
                         'website_id' => [
                             $websiteId,
                         ],
@@ -100,9 +112,9 @@ public function testPrepareDataSource(
             ->with($this->confirmation)
             ->willReturnSelf();
 
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with(AccountManagement::XML_PATH_IS_CONFIRM, ScopeInterface::SCOPE_WEBSITES, $websiteId)
+        $this->accountConfirmation->expects($this->once())
+            ->method('isConfirmationRequired')
+            ->with($websiteId, $customerId, $customerEmail)
             ->willReturn($isConfirmationRequired);
         
         $this->confirmation->setData('name', 'confirmation');
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
index a9a5c5b17744e..468a9e7946f2d 100644
--- a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
+++ b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -72,6 +72,7 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
 
     /**
      * Document constructor.
+     *
      * @param AttributeValueFactory $attributeValueFactory
      * @param GroupRepositoryInterface $groupRepository
      * @param CustomerMetadataInterface $customerMetadata
@@ -118,9 +119,10 @@ public function getCustomAttribute($attributeCode)
     }
 
     /**
-     * Update customer gender value
-     * Method set gender label instead of id value
+     * Update customer gender value. Method set gender label instead of id value
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function setGenderValue()
     {
@@ -141,9 +143,10 @@ private function setGenderValue()
     }
 
     /**
-     * Update customer group value
-     * Method set group code instead id value
+     * Update customer group value. Method set group code instead id value
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function setCustomerGroupValue()
     {
@@ -157,8 +160,8 @@ private function setCustomerGroupValue()
     }
 
     /**
-     * Update website value
-     * Method set website name instead id value
+     * Update website value. Method set website name instead id value
+     *
      * @return void
      */
     private function setWebsiteValue()
@@ -170,22 +173,22 @@ private function setWebsiteValue()
     }
 
     /**
-     * Update confirmation value
-     * Method set confirmation text value to match what is shown in grid
+     * Update confirmation value. Method set confirmation text value to match what is shown in grid
+     *
      * @return void
      */
     private function setConfirmationValue()
     {
         $value = $this->getData(self::$confirmationAttributeCode);
         $websiteId = $this->getData(self::$websiteIdAttributeCode) ?: $this->getData(self::$websiteAttributeCode);
-        $isConfirmationRequired = (bool)$this->scopeConfig->getValue(
+        $isConfirmRequired = $this->scopeConfig->isSetFlag(
             AccountManagement::XML_PATH_IS_CONFIRM,
             ScopeInterface::SCOPE_WEBSITES,
             $websiteId
         );
 
         $valueText = __('Confirmation Not Required');
-        if ($isConfirmationRequired) {
+        if ($isConfirmRequired) {
             $valueText = $value === null ? __('Confirmed') : __('Confirmation Required');
         }
 
@@ -193,8 +196,8 @@ private function setConfirmationValue()
     }
 
     /**
-     * Update lock expires value
-     * Method set account lock text value to match what is shown in grid
+     * Update lock expires value. Method set account lock text value to match what is shown in grid
+     *
      * @return void
      */
     private function setAccountLockValue()
diff --git a/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php b/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php
new file mode 100644
index 0000000000000..3e3a6e74166a1
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Form/AddressFieldset.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Ui\Component\Form;
+
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\ComponentVisibilityInterface;
+
+/**
+ * Customer addresses fieldset class
+ */
+class AddressFieldset extends \Magento\Ui\Component\Form\Fieldset implements ComponentVisibilityInterface
+{
+    /**
+     * @param ContextInterface $context
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->context = $context;
+
+        parent::__construct($context, $components, $data);
+    }
+
+    /**
+     * Can show customer addresses tab in tabs or not
+     *
+     * Will return false for not registered customer in a case when admin user created new customer account.
+     * Needed to hide addresses tab from create new customer page
+     *
+     * @return boolean
+     */
+    public function isComponentVisible(): bool
+    {
+        $customerId = $this->context->getRequestParam('id');
+        return (bool)$customerId;
+    }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php
new file mode 100644
index 0000000000000..6d1d7472a798b
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Actions.php
@@ -0,0 +1,128 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Ui\Component\Listing\Address\Column;
+
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Prepare actions column for customer addresses grid
+ */
+class Actions extends Column
+{
+    const CUSTOMER_ADDRESS_PATH_DELETE = 'customer/address/delete';
+    const CUSTOMER_ADDRESS_PATH_DEFAULT_SHIPPING = 'customer/address/defaultShippingAddress';
+    const CUSTOMER_ADDRESS_PATH_DEFAULT_BILLING = 'customer/address/defaultBillingAddress';
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UrlInterface $urlBuilder
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        UrlInterface $urlBuilder,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->urlBuilder = $urlBuilder;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource): array
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as &$item) {
+                $name = $this->getData('name');
+                if (isset($item['entity_id'])) {
+                    $item[$name]['edit'] = [
+                        'callback' => [
+                            [
+                                'provider' => 'customer_form.areas.address.address'
+                                    . '.customer_address_update_modal.update_customer_address_form_loader',
+                                'target' => 'destroyInserted',
+                            ],
+                            [
+                                'provider' => 'customer_form.areas.address.address'
+                                    . '.customer_address_update_modal',
+                                'target' => 'openModal',
+                            ],
+                            [
+                                'provider' => 'customer_form.areas.address.address'
+                                    . '.customer_address_update_modal.update_customer_address_form_loader',
+                                'target' => 'render',
+                                'params' => [
+                                    'entity_id' => $item['entity_id'],
+                                ],
+                            ]
+                        ],
+                        'href' => '#',
+                        'label' => __('Edit'),
+                        'hidden' => false,
+                    ];
+
+                    $item[$name]['setDefaultBilling'] = [
+                        'href' => $this->urlBuilder->getUrl(
+                            self::CUSTOMER_ADDRESS_PATH_DEFAULT_BILLING,
+                            ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
+                        ),
+                        'label' => __('Set as default billing'),
+                        'isAjax' => true,
+                        'confirm' => [
+                            'title' => __('Set address as default billing'),
+                            'message' => __('Are you sure you want to set the address as default billing address?')
+                        ]
+                    ];
+
+                    $item[$name]['setDefaultShipping'] = [
+                        'href' => $this->urlBuilder->getUrl(
+                            self::CUSTOMER_ADDRESS_PATH_DEFAULT_SHIPPING,
+                            ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
+                        ),
+                        'label' => __('Set as default shipping'),
+                        'isAjax' => true,
+                        'confirm' => [
+                            'title' => __('Set address as default shipping'),
+                            'message' => __('Are you sure you want to set the address as default shipping address?')
+                        ]
+                    ];
+
+                    $item[$name]['delete'] = [
+                        'href' => $this->urlBuilder->getUrl(
+                            self::CUSTOMER_ADDRESS_PATH_DELETE,
+                            ['parent_id' => $item['parent_id'], 'id' => $item['entity_id']]
+                        ),
+                        'label' => __('Delete'),
+                        'isAjax' => true,
+                        'confirm' => [
+                            'title' => __('Delete address'),
+                            'message' => __('Are you sure you want to delete the address?')
+                        ]
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php
new file mode 100644
index 0000000000000..d05d5d1c592a7
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/Column/Countries.php
@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Ui\Component\Listing\Address\Column;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Class for process countries in customer addresses grid
+ */
+class Countries implements OptionSourceInterface
+{
+    /**
+     * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory
+     */
+    private $countryCollectionFactory;
+
+    /**
+     * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $collectionFactory
+    ) {
+        $this->countryCollectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Get list of countries with country id as value and code as label
+     *
+     * @return array
+     */
+    public function toOptionArray(): array
+    {
+        /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection */
+        $countryCollection = $this->countryCollectionFactory->create();
+        return $countryCollection->toOptionArray();
+    }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
new file mode 100644
index 0000000000000..c70e25ee99ec3
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Ui\Component\Listing\Address;
+
+use Magento\Customer\Model\ResourceModel\Address\Grid\CollectionFactory;
+use Magento\Directory\Model\CountryFactory;
+use Magento\Framework\Api\Filter;
+
+/**
+ * Custom DataProvider for customer addresses listing
+ */
+class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
+{
+    /**
+     * @var \Magento\Framework\App\RequestInterface $request,
+     */
+    private $request;
+
+    /**
+     * @var CountryFactory
+     */
+    private $countryDirectory;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $collectionFactory
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param CountryFactory $countryFactory
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        CollectionFactory $collectionFactory,
+        \Magento\Framework\App\RequestInterface $request,
+        CountryFactory $countryFactory,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->collection = $collectionFactory->create();
+        $this->countryDirectory = $countryFactory->create();
+        $this->request = $request;
+    }
+
+    /**
+     * Add country key for default billing/shipping blocks on customer addresses tab
+     *
+     * @return array
+     */
+    public function getData(): array
+    {
+        $collection = $this->getCollection();
+        $data['items'] = [];
+        if ($this->request->getParam('parent_id')) {
+            $collection->addFieldToFilter('parent_id', $this->request->getParam('parent_id'));
+            $data = $collection->toArray();
+        }
+        foreach ($data['items'] as $key => $item) {
+            if (isset($item['country_id']) && !isset($item['country'])) {
+                $data['items'][$key]['country'] = $this->countryDirectory->loadByCode($item['country_id'])->getName();
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Add full text search filter to collection
+     *
+     * @param Filter $filter
+     * @return void
+     */
+    public function addFilter(Filter $filter): void
+    {
+        if ($filter->getField() !== 'fulltext') {
+            $this->collection->addFieldToFilter(
+                $filter->getField(),
+                [$filter->getConditionType() => $filter->getValue()]
+            );
+        } else {
+            $value = trim($filter->getValue());
+            $this->collection->addFieldToFilter(
+                [
+                    ['attribute' => 'firstname'],
+                    ['attribute' => 'lastname'],
+                    ['attribute' => 'street'],
+                    ['attribute' => 'city'],
+                    ['attribute' => 'region'],
+                    ['attribute' => 'postcode'],
+                    ['attribute' => 'telephone']
+                ],
+                [
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                    ['like' => "%{$value}%"],
+                ]
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php
index dcaaa665ad392..1786c52844a75 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php
@@ -5,35 +5,42 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column;
 
-use Magento\Customer\Model\AccountManagement;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Model\AccountConfirmation;
 
+/**
+ * Class Confirmation column.
+ */
 class Confirmation extends Column
 {
     /**
-     * @var ScopeConfigInterface
+     * @var AccountConfirmation
      */
-    private $scopeConfig;
+    private $accountConfirmation;
 
     /**
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
-     * @param ScopeConfigInterface $scopeConfig
+     * @param ScopeConfigInterface $scopeConfig @deprecated
      * @param array $components
      * @param array $data
+     * @param AccountConfirmation $accountConfirmation
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         ScopeConfigInterface $scopeConfig,
         array $components,
-        array $data
+        array $data,
+        AccountConfirmation $accountConfirmation = null
     ) {
-        $this->scopeConfig = $scopeConfig;
+        $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
+            ->get(AccountConfirmation::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
@@ -58,7 +65,13 @@ public function prepareDataSource(array $dataSource)
      */
     private function getFieldLabel(array $item)
     {
-        if ($this->isConfirmationRequired($item)) {
+        $isConfirmationRequired = $this->accountConfirmation->isConfirmationRequired(
+            $item['website_id'][0],
+            $item[$item['id_field_name']],
+            $item['email']
+        );
+
+        if ($isConfirmationRequired) {
             if ($item[$this->getData('name')] === null) {
                 return __('Confirmed');
             }
@@ -66,19 +79,4 @@ private function getFieldLabel(array $item)
         }
         return __('Confirmation Not Required');
     }
-
-    /**
-     * Check if confirmation is required
-     *
-     * @param array $item
-     * @return bool
-     */
-    private function isConfirmationRequired(array $item)
-    {
-        return (bool)$this->scopeConfig->getValue(
-            AccountManagement::XML_PATH_IS_CONFIRM,
-            ScopeInterface::SCOPE_WEBSITES,
-            $item['website_id'][0]
-        );
-    }
 }
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
new file mode 100644
index 0000000000000..00c5f99fab46c
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\Escaper;
+
+/**
+ * Class GroupActions
+ */
+class GroupActions extends Column
+{
+    /**
+     * Url path
+     */
+    const URL_PATH_EDIT = 'customer/group/edit';
+    const URL_PATH_DELETE = 'customer/group/delete';
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UrlInterface $urlBuilder
+     * @param Escaper $escaper
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        UrlInterface $urlBuilder,
+        Escaper $escaper,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->urlBuilder = $urlBuilder;
+        $this->escaper = $escaper;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as & $item) {
+                if (isset($item['customer_group_id'])) {
+                    $title = $this->escaper->escapeHtml($item['customer_group_code']);
+                    $item[$this->getData('name')] = [
+                        'edit' => [
+                            'href' => $this->urlBuilder->getUrl(
+                                static::URL_PATH_EDIT,
+                                [
+                                    'id' => $item['customer_group_id']
+                                ]
+                            ),
+                            'label' => __('Edit'),
+                        ],
+                    ];
+
+                    // hide delete action for 'NOT LOGGED IN' group
+                    if ($item['customer_group_id'] == 0 && $item['customer_group_code']) {
+                        continue;
+                    }
+
+                    $item[$this->getData('name')]['delete'] = [
+                        'href' => $this->urlBuilder->getUrl(
+                            static::URL_PATH_DELETE,
+                            [
+                                'id' => $item['customer_group_id']
+                            ]
+                        ),
+                        'label' => __('Delete'),
+                        'confirm' => [
+                            'title' => __('Delete %1', $title),
+                            'message' => __('Are you sure you want to delete a %1 record?', $title)
+                        ],
+                        'post' => true
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index 9dbac36146be1..b9a7aca73fe34 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -5,34 +5,33 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-integration": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-newsletter": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-review": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-wishlist": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-integration": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-review": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.3.*",
-        "magento/module-customer-sample-data": "Sample Data version:100.3.*"
+        "magento/module-cookie": "*",
+        "magento/module-customer-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Customer/etc/acl.xml b/app/code/Magento/Customer/etc/acl.xml
index a500608e1cdf5..e8e6219bef4fe 100644
--- a/app/code/Magento/Customer/etc/acl.xml
+++ b/app/code/Magento/Customer/etc/acl.xml
@@ -12,6 +12,7 @@
                 <resource id="Magento_Customer::customer" title="Customers" translate="title" sortOrder="40">
                     <resource id="Magento_Customer::manage" title="All Customers" translate="title" sortOrder="10" />
                     <resource id="Magento_Customer::online" title="Now Online" translate="title" sortOrder="20" />
+                    <resource id="Magento_Customer::group" title="Customer Groups" translate="title" sortOrder="30" />
                 </resource>
                 <resource id="Magento_Backend::stores">
                     <resource id="Magento_Backend::stores_settings">
@@ -19,10 +20,7 @@
                             <resource id="Magento_Customer::config_customer" title="Customers Section" translate="title" sortOrder="50" />
                         </resource>
                     </resource>
-                    <resource id="Magento_Backend::stores_other_settings">
-                        <resource id="Magento_Customer::group" title="Customer Groups" translate="title" sortOrder="10" />
-                    </resource>
-                </resource>
+                   </resource>
             </resource>
         </resources>
     </acl>
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index daf9240677588..86e5852d67aeb 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -26,7 +26,7 @@
             </group>
             <group id="create_account" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Create New Account Options</label>
-                <field id="auto_group_assign" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="auto_group_assign" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Automatic Assignment to Customer Group</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
@@ -170,7 +170,7 @@
                     <comment>Use 0 to disable account locking.</comment>
                     <frontend_class>required-entry validate-digits</frontend_class>
                 </field>
-                <field id="lockout_threshold" translate="label" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="lockout_threshold" translate="label comment" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lockout Time (minutes)</label>
                     <comment>Account will be unlocked after provided time.</comment>
                     <frontend_class>required-entry validate-digits</frontend_class>
@@ -198,7 +198,8 @@
                 <field id="street_lines" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Number of Lines in a Street Address</label>
                     <backend_model>Magento\Customer\Model\Config\Backend\Address\Street</backend_model>
-                    <comment>Leave empty for default (2). Valid range: 1-4</comment>
+                    <comment>Valid range: 1-4</comment>
+                    <validate>required-entry validate-digits validate-digits-range digits-range-1-4</validate>
                 </field>
                 <field id="prefix_show" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Show Prefix</label>
@@ -209,7 +210,7 @@
                 <field id="prefix_options" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Prefix Dropdown Options</label>
                     <comment>
-                        <![CDATA[Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.]]>
+                        <![CDATA[Semicolon (;) separated values.<br/>Leave empty for open text field.]]>
                     </comment>
                 </field>
                 <field id="middlename_show" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -227,7 +228,7 @@
                 <field id="suffix_options" translate="label comment" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Suffix Dropdown Options</label>
                     <comment>
-                        <![CDATA[Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.]]>
+                        <![CDATA[Semicolon (;) separated values.<br/>Leave empty for open text field.]]>
                     </comment>
                 </field>
                 <field id="dob_show" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -271,16 +272,16 @@
             </group>
             <group id="address_templates" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Address Templates</label>
-                <field id="text" type="textarea" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="text" translate="label" type="textarea" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Text</label>
                 </field>
-                <field id="oneline" type="textarea" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="oneline" translate="label" type="textarea" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Text One Line</label>
                 </field>
-                <field id="html" type="textarea" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="html" translate="label" type="textarea" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>HTML</label>
                 </field>
-                <field id="pdf" type="textarea" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="pdf" translate="label" type="textarea" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>PDF</label>
                 </field>
             </group>
diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index c35e9fa4b4c8a..da4b80536e631 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -56,7 +56,7 @@
                 <fax_show/>
             </address>
             <startup>
-                <redirect_dashboard>1</redirect_dashboard>
+                <redirect_dashboard>0</redirect_dashboard>
             </startup>
             <address_templates>
                 <text>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}
diff --git a/app/code/Magento/Customer/etc/db_schema.xml b/app/code/Magento/Customer/etc/db_schema.xml
new file mode 100644
index 0000000000000..c699db06d30dc
--- /dev/null
+++ b/app/code/Magento/Customer/etc/db_schema.xml
@@ -0,0 +1,536 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="customer_entity" resource="default" engine="innodb" comment="Customer Entity">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="varchar" name="email" nullable="true" length="255" comment="Email"/>
+        <column xsi:type="smallint" name="group_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Group ID"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Active"/>
+        <column xsi:type="smallint" name="disable_auto_group_change" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Disable automatic group change based on VAT ID"/>
+        <column xsi:type="varchar" name="created_in" nullable="true" length="255" comment="Created From"/>
+        <column xsi:type="varchar" name="prefix" nullable="true" length="40" comment="Name Prefix"/>
+        <column xsi:type="varchar" name="firstname" nullable="true" length="255" comment="First Name"/>
+        <column xsi:type="varchar" name="middlename" nullable="true" length="255" comment="Middle Name/Initial"/>
+        <column xsi:type="varchar" name="lastname" nullable="true" length="255" comment="Last Name"/>
+        <column xsi:type="varchar" name="suffix" nullable="true" length="40" comment="Name Suffix"/>
+        <column xsi:type="date" name="dob" comment="Date of Birth"/>
+        <column xsi:type="varchar" name="password_hash" nullable="true" length="128" comment="Password_hash"/>
+        <column xsi:type="varchar" name="rp_token" nullable="true" length="128" comment="Reset password token"/>
+        <column xsi:type="datetime" name="rp_token_created_at" on_update="false" nullable="true"
+                comment="Reset password token creation time"/>
+        <column xsi:type="int" name="default_billing" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Default Billing Address"/>
+        <column xsi:type="int" name="default_shipping" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Default Shipping Address"/>
+        <column xsi:type="varchar" name="taxvat" nullable="true" length="50" comment="Tax/VAT Number"/>
+        <column xsi:type="varchar" name="confirmation" nullable="true" length="64" comment="Is Confirmed"/>
+        <column xsi:type="smallint" name="gender" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Gender"/>
+        <column xsi:type="smallint" name="failures_num" padding="6" unsigned="false" nullable="true" identity="false"
+                default="0" comment="Failure Number"/>
+        <column xsi:type="timestamp" name="first_failure" on_update="false" nullable="true" comment="First Failure"/>
+        <column xsi:type="timestamp" name="lock_expires" on_update="false" nullable="true"
+                comment="Lock Expiration Date"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_STORE_ID_STORE_STORE_ID" table="customer_entity"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="customer_entity" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_EMAIL_WEBSITE_ID">
+            <column name="email"/>
+            <column name="website_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ENTITY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_FIRSTNAME" indexType="btree">
+            <column name="firstname"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_LASTNAME" indexType="btree">
+            <column name="lastname"/>
+        </index>
+    </table>
+    <table name="customer_address_entity" resource="default" engine="innodb" comment="Customer Address Entity">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent ID"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Active"/>
+        <column xsi:type="varchar" name="city" nullable="false" length="255" comment="City"/>
+        <column xsi:type="varchar" name="company" nullable="true" length="255" comment="Company"/>
+        <column xsi:type="varchar" name="country_id" nullable="false" length="255" comment="Country"/>
+        <column xsi:type="varchar" name="fax" nullable="true" length="255" comment="Fax"/>
+        <column xsi:type="varchar" name="firstname" nullable="false" length="255" comment="First Name"/>
+        <column xsi:type="varchar" name="lastname" nullable="false" length="255" comment="Last Name"/>
+        <column xsi:type="varchar" name="middlename" nullable="true" length="255" comment="Middle Name"/>
+        <column xsi:type="varchar" name="postcode" nullable="true" length="255" comment="Zip/Postal Code"/>
+        <column xsi:type="varchar" name="prefix" nullable="true" length="40" comment="Name Prefix"/>
+        <column xsi:type="varchar" name="region" nullable="true" length="255" comment="State/Province"/>
+        <column xsi:type="int" name="region_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="State/Province"/>
+        <column xsi:type="text" name="street" nullable="false" comment="Street Address"/>
+        <column xsi:type="varchar" name="suffix" nullable="true" length="40" comment="Name Suffix"/>
+        <column xsi:type="varchar" name="telephone" nullable="false" length="255" comment="Phone Number"/>
+        <column xsi:type="varchar" name="vat_id" nullable="true" length="255" comment="VAT number"/>
+        <column xsi:type="int" name="vat_is_valid" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="VAT number validity"/>
+        <column xsi:type="varchar" name="vat_request_date" nullable="true" length="255"
+                comment="VAT number validation request date"/>
+        <column xsi:type="varchar" name="vat_request_id" nullable="true" length="255"
+                comment="VAT number validation request ID"/>
+        <column xsi:type="int" name="vat_request_success" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="VAT number validation request success"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ADDRESS_ENTITY_PARENT_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="customer_address_entity" column="parent_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="customer_address_entity_datetime" resource="default" engine="innodb"
+           comment="Customer Address Entity Datetime">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="customer_address_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DTIME_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
+                    table="customer_address_entity_datetime" column="entity_id" referenceTable="customer_address_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_address_entity_decimal" resource="default" engine="innodb"
+           comment="Customer Address Entity Decimal">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="customer_address_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_DEC_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
+                    table="customer_address_entity_decimal" column="entity_id" referenceTable="customer_address_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_address_entity_int" resource="default" engine="innodb" comment="Customer Address Entity Int">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="customer_address_entity_int" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_INT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
+                    table="customer_address_entity_int" column="entity_id" referenceTable="customer_address_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_address_entity_text" resource="default" engine="innodb"
+           comment="Customer Address Entity Text">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="text" name="value" nullable="false" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="customer_address_entity_text" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_TEXT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
+                    table="customer_address_entity_text" column="entity_id" referenceTable="customer_address_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="customer_address_entity_varchar" resource="default" engine="innodb"
+           comment="Customer Address Entity Varchar">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="customer_address_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CSTR_ADDR_ENTT_VCHR_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID"
+                    table="customer_address_entity_varchar" column="entity_id" referenceTable="customer_address_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_entity_datetime" resource="default" engine="innodb" comment="Customer Entity Datetime">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_entity_datetime" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="customer_entity_datetime" column="entity_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_entity_decimal" resource="default" engine="innodb" comment="Customer Entity Decimal">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_entity_decimal" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="customer_entity_decimal" column="entity_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_entity_int" resource="default" engine="innodb" comment="Customer Entity Int">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
+                comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_INT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_entity_int" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_INT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="customer_entity_int" column="entity_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_entity_text" resource="default" engine="innodb" comment="Customer Entity Text">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="text" name="value" nullable="false" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_entity_text" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_TEXT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="customer_entity_text" column="entity_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="customer_entity_varchar" resource="default" engine="innodb" comment="Customer Entity Varchar">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value ID"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute ID"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_entity_varchar" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="customer_entity_varchar" column="entity_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="customer_group" resource="default" engine="innodb" comment="Customer Group">
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="true"/>
+        <column xsi:type="varchar" name="customer_group_code" nullable="false" length="32"
+                comment="Customer Group Code"/>
+        <column xsi:type="int" name="tax_class_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Tax Class Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="customer_group_id"/>
+        </constraint>
+    </table>
+    <table name="customer_eav_attribute" resource="default" engine="innodb" comment="Customer Eav Attribute">
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute Id"/>
+        <column xsi:type="smallint" name="is_visible" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Visible"/>
+        <column xsi:type="varchar" name="input_filter" nullable="true" length="255" comment="Input Filter"/>
+        <column xsi:type="smallint" name="multiline_count" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Multiline Count"/>
+        <column xsi:type="text" name="validate_rules" nullable="true" comment="Validate Rules"/>
+        <column xsi:type="smallint" name="is_system" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is System"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="varchar" name="data_model" nullable="true" length="255" comment="Data Model"/>
+        <column xsi:type="smallint" name="is_used_in_grid" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Used in Grid"/>
+        <column xsi:type="smallint" name="is_visible_in_grid" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible in Grid"/>
+        <column xsi:type="smallint" name="is_filterable_in_grid" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Filterable in Grid"/>
+        <column xsi:type="smallint" name="is_searchable_in_grid" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Searchable in Grid"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_eav_attribute" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+    </table>
+    <table name="customer_form_attribute" resource="default" engine="innodb" comment="Customer Form Attribute">
+        <column xsi:type="varchar" name="form_code" nullable="false" length="32" comment="Form Code"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="form_code"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="customer_form_attribute" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <index referenceId="CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="customer_eav_attribute_website" resource="default" engine="innodb"
+           comment="Customer Eav Attribute Website">
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="smallint" name="is_visible" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Visible"/>
+        <column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Required"/>
+        <column xsi:type="text" name="default_value" nullable="true" comment="Default Value"/>
+        <column xsi:type="smallint" name="multiline_count" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Multiline Count"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_EAV_ATTR_WS_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="customer_eav_attribute_website" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CSTR_EAV_ATTR_WS_WS_ID_STORE_WS_WS_ID"
+                    table="customer_eav_attribute_website" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="CUSTOMER_EAV_ATTRIBUTE_WEBSITE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="customer_visitor" resource="default" engine="innodb" comment="Visitor Table">
+        <column xsi:type="bigint" name="visitor_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Visitor ID"/>
+        <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="varchar" name="session_id" nullable="true" length="64" comment="Session ID"/>
+        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Last Visit Time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="visitor_id"/>
+        </constraint>
+        <index referenceId="CUSTOMER_VISITOR_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="CUSTOMER_VISITOR_LAST_VISIT_AT" indexType="btree">
+            <column name="last_visit_at"/>
+        </index>
+    </table>
+    <table name="customer_log" resource="default" engine="innodb" comment="Customer Log Table">
+        <column xsi:type="int" name="log_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Log ID"/>
+        <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Customer ID"/>
+        <column xsi:type="timestamp" name="last_login_at" on_update="false" nullable="true" comment="Last Login Time"/>
+        <column xsi:type="timestamp" name="last_logout_at" on_update="false" nullable="true"
+                comment="Last Logout Time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="log_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="CUSTOMER_LOG_CUSTOMER_ID">
+            <column name="customer_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Customer/etc/db_schema_whitelist.json b/app/code/Magento/Customer/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..ec7a53945aba3
--- /dev/null
+++ b/app/code/Magento/Customer/etc/db_schema_whitelist.json
@@ -0,0 +1,350 @@
+{
+    "customer_entity": {
+        "column": {
+            "entity_id": true,
+            "website_id": true,
+            "email": true,
+            "group_id": true,
+            "increment_id": true,
+            "store_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "is_active": true,
+            "disable_auto_group_change": true,
+            "created_in": true,
+            "prefix": true,
+            "firstname": true,
+            "middlename": true,
+            "lastname": true,
+            "suffix": true,
+            "dob": true,
+            "password_hash": true,
+            "rp_token": true,
+            "rp_token_created_at": true,
+            "default_billing": true,
+            "default_shipping": true,
+            "taxvat": true,
+            "confirmation": true,
+            "gender": true,
+            "failures_num": true,
+            "first_failure": true,
+            "lock_expired": true,
+            "lock_expires": true
+        },
+        "index": {
+            "CUSTOMER_ENTITY_STORE_ID": true,
+            "CUSTOMER_ENTITY_WEBSITE_ID": true,
+            "CUSTOMER_ENTITY_FIRSTNAME": true,
+            "CUSTOMER_ENTITY_LASTNAME": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ENTITY_STORE_ID_STORE_STORE_ID": true,
+            "CUSTOMER_ENTITY_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "CUSTOMER_ENTITY_EMAIL_WEBSITE_ID": true
+        }
+    },
+    "customer_address_entity": {
+        "column": {
+            "entity_id": true,
+            "increment_id": true,
+            "parent_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "is_active": true,
+            "city": true,
+            "company": true,
+            "country_id": true,
+            "fax": true,
+            "firstname": true,
+            "lastname": true,
+            "middlename": true,
+            "postcode": true,
+            "prefix": true,
+            "region": true,
+            "region_id": true,
+            "street": true,
+            "suffix": true,
+            "telephone": true,
+            "vat_id": true,
+            "vat_is_valid": true,
+            "vat_request_date": true,
+            "vat_request_id": true,
+            "vat_request_success": true
+        },
+        "index": {
+            "CUSTOMER_ADDRESS_ENTITY_PARENT_ID": true,
+            "FTI_BA70344390184AC3F063AB2EB38BC0ED": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ADDRESS_ENTITY_PARENT_ID_CUSTOMER_ENTITY_ENTITY_ID": true
+        }
+    },
+    "customer_address_entity_datetime": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ADDRESS_ENTITY_DATETIME_ATTRIBUTE_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CSTR_ADDR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CSTR_ADDR_ENTT_DTIME_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_address_entity_decimal": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ADDRESS_ENTITY_DECIMAL_ATTRIBUTE_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CSTR_ADDR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CSTR_ADDR_ENTT_DEC_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_address_entity_int": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ADDRESS_ENTITY_INT_ATTRIBUTE_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CSTR_ADDR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CSTR_ADDR_ENTT_INT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_address_entity_text": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ADDRESS_ENTITY_TEXT_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CSTR_ADDR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CSTR_ADDR_ENTT_TEXT_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_address_entity_varchar": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ADDRESS_ENTITY_VARCHAR_ATTRIBUTE_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CSTR_ADDR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CSTR_ADDR_ENTT_VCHR_ENTT_ID_CSTR_ADDR_ENTT_ENTT_ID": true,
+            "CUSTOMER_ADDRESS_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_entity_datetime": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ENTITY_DATETIME_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_DATETIME_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "CUSTOMER_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_entity_decimal": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ENTITY_DECIMAL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "CUSTOMER_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_entity_int": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ENTITY_INT_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ENTITY_INT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_INT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "CUSTOMER_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_entity_text": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ENTITY_TEXT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_TEXT_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "CUSTOMER_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_entity_varchar": {
+        "column": {
+            "value_id": true,
+            "attribute_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_ENTITY_VARCHAR_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "CUSTOMER_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_group": {
+        "column": {
+            "customer_group_id": true,
+            "customer_group_code": true,
+            "tax_class_id": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "customer_eav_attribute": {
+        "column": {
+            "attribute_id": true,
+            "is_visible": true,
+            "input_filter": true,
+            "multiline_count": true,
+            "validate_rules": true,
+            "is_system": true,
+            "sort_order": true,
+            "data_model": true,
+            "is_used_in_grid": true,
+            "is_visible_in_grid": true,
+            "is_filterable_in_grid": true,
+            "is_searchable_in_grid": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_form_attribute": {
+        "column": {
+            "form_code": true,
+            "attribute_id": true
+        },
+        "index": {
+            "CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_FORM_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true
+        }
+    },
+    "customer_eav_attribute_website": {
+        "column": {
+            "attribute_id": true,
+            "website_id": true,
+            "is_visible": true,
+            "is_required": true,
+            "default_value": true,
+            "multiline_count": true
+        },
+        "index": {
+            "CUSTOMER_EAV_ATTRIBUTE_WEBSITE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CSTR_EAV_ATTR_WS_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "CSTR_EAV_ATTR_WS_WS_ID_STORE_WS_WS_ID": true
+        }
+    },
+    "customer_visitor": {
+        "column": {
+            "visitor_id": true,
+            "customer_id": true,
+            "session_id": true,
+            "last_visit_at": true
+        },
+        "index": {
+            "CUSTOMER_VISITOR_CUSTOMER_ID": true,
+            "CUSTOMER_VISITOR_LAST_VISIT_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "customer_log": {
+        "column": {
+            "log_id": true,
+            "customer_id": true,
+            "last_login_at": true,
+            "last_logout_at": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CUSTOMER_LOG_CUSTOMER_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index 6df04c7f89656..a181d6dd217fd 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -75,6 +75,13 @@
             <argument name="addressConfig" xsi:type="object">Magento\Customer\Model\Address\Config\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Http\Context">
+        <arguments>
+            <argument name="default" xsi:type="array">
+                <item name="customer_group" xsi:type="const">Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Customer\Model\Config\Share">
         <arguments>
             <argument name="customerResource" xsi:type="object">Magento\Customer\Model\ResourceModel\Customer\Proxy</argument>
@@ -120,6 +127,13 @@
             <argument name="groupManagement" xsi:type="object">Magento\Customer\Api\GroupManagementInterface\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Model\Metadata\CustomerMetadata">
+        <arguments>
+            <argument name="systemAttributes" xsi:type="array">
+                <item name="disable_auto_group_change" xsi:type="string">disable_auto_group_change</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType name="SectionInvalidationConfigReader" type="Magento\Framework\Config\Reader\Filesystem">
         <arguments>
             <argument name="idAttributes" xsi:type="array">
@@ -215,6 +229,8 @@
             <argument name="collections" xsi:type="array">
                 <item name="customer_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Grid\Collection</item>
                 <item name="customer_online_grid_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Online\Grid\Collection</item>
+                <item name="customer_group_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Group\Grid\Collection</item>
+                <item name="customer_address_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Address\Grid\Collection</item>
             </argument>
         </arguments>
     </type>
@@ -353,9 +369,9 @@
     <virtualType name="Magento\Customer\Model\Api\SearchCriteria\CollectionProcessor\GroupFilterProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
-                <item name="code" xsi:type="string">customer_group_code</item>
-                <item name="id" xsi:type="string">customer_group_id</item>
-                <item name="tax_class_name" xsi:type="string">class_name</item>
+                <item name="code" xsi:type="string">main_table.customer_group_code</item>
+                <item name="id" xsi:type="string">main_table.customer_group_id</item>
+                <item name="tax_class_name" xsi:type="string">tax_class_table.class_name</item>
             </argument>
         </arguments>
     </virtualType>
@@ -363,9 +379,9 @@
     <virtualType name="Magento\Customer\Model\Api\SearchCriteria\CollectionProcessor\GroupSortingProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor">
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
-                <item name="code" xsi:type="string">customer_group_code</item>
-                <item name="id" xsi:type="string">customer_group_id</item>
-                <item name="tax_class_name" xsi:type="string">class_name</item>
+                <item name="code" xsi:type="string">main_table.customer_group_code</item>
+                <item name="id" xsi:type="string">main_table.customer_group_id</item>
+                <item name="tax_class_name" xsi:type="string">tax_class_table.class_name</item>
             </argument>
             <argument name="defaultOrders" xsi:type="array">
                 <item name="id" xsi:type="string">ASC</item>
@@ -420,4 +436,36 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Model\AccountManagement">
+        <arguments>
+            <argument name="sessionManager" xsi:type="object">Magento\Framework\Session\SessionManagerInterface\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Model\Address\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="general" xsi:type="object">Magento\Customer\Model\Address\Validator\General</item>
+                <item name="country" xsi:type="object">Magento\Customer\Model\Address\Validator\Country</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Model\ResourceModel\Group\Grid\Collection">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">customer_group</argument>
+            <argument name="eventPrefix" xsi:type="string">customer_group_grid_collection</argument>
+            <argument name="eventObject" xsi:type="string">customer_group_collection</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Model\ResourceModel\Address\Grid\Collection">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">customer_address_entity</argument>
+            <argument name="eventPrefix" xsi:type="string">customer_address_entity_grid_collection</argument>
+            <argument name="eventObject" xsi:type="string">customer_address_entity_grid_collection</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Address</argument>
+        </arguments>
+    </type>
+    <preference
+            for="Magento\Customer\Api\AccountDelegationInterface"
+            type="Magento\Customer\Model\Delegation\AccountDelegation" />
 </config>
diff --git a/app/code/Magento/Customer/etc/events.xml b/app/code/Magento/Customer/etc/events.xml
index 66c9a3813892c..d841d8faa9c38 100644
--- a/app/code/Magento/Customer/etc/events.xml
+++ b/app/code/Magento/Customer/etc/events.xml
@@ -10,7 +10,7 @@
         <observer name="customer_address_before_save_viv_observer" instance="Magento\Customer\Observer\BeforeAddressSaveObserver" />
     </event>
     <event name="customer_address_save_after">
-        <observer name="customer_addres_after_save_viv_observer" instance="Magento\Customer\Observer\AfterAddressSaveObserver" />
+        <observer name="customer_address_after_save_viv_observer" instance="Magento\Customer\Observer\AfterAddressSaveObserver" />
     </event>
     <event name="sales_quote_save_after">
         <observer name="customer_visitor" instance="Magento\Customer\Observer\Visitor\BindQuoteCreateObserver" />
diff --git a/app/code/Magento/Customer/etc/frontend/page_types.xml b/app/code/Magento/Customer/etc/frontend/page_types.xml
index 2c0feeac532a1..a49d735b4467e 100644
--- a/app/code/Magento/Customer/etc/frontend/page_types.xml
+++ b/app/code/Magento/Customer/etc/frontend/page_types.xml
@@ -11,7 +11,7 @@
     <type id="customer_account_createpassword" label="Reset a Password"/>
     <type id="customer_account_edit" label="Customer Account Edit Form"/>
     <type id="customer_account_forgotpassword" label="Customer Forgot Password Form"/>
-    <type id="customer_account_index" label="Customer My Account Dashboard"/>
+    <type id="customer_account_index" label="Customer My Account"/>
     <type id="customer_account_login" label="Customer Account Login Form"/>
     <type id="customer_account_logoutsuccess" label="Customer Account Logout Success"/>
     <type id="customer_address_form" label="Customer My Account Address Edit Form"/>
diff --git a/app/code/Magento/Customer/etc/module.xml b/app/code/Magento/Customer/etc/module.xml
index 3f0d42b12649a..853157fed1f5d 100644
--- a/app/code/Magento/Customer/etc/module.xml
+++ b/app/code/Magento/Customer/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Customer" setup_version="2.0.12">
+    <module name="Magento_Customer" >
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Directory"/>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 1db22ebf2d93a..578267984f985 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -479,9 +479,9 @@ Strong,Strong
 "The title that goes before name (Mr., Mrs., etc.)","The title that goes before name (Mr., Mrs., etc.)"
 "Prefix Dropdown Options","Prefix Dropdown Options"
 "
-                        Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+                        Semicolon (;) separated values.<br/>Leave empty for open text field.
                     ","
-                        Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.
+                        Semicolon (;) separated values.<br/>Leave empty for open text field.
                     "
 "Show Middle Name (initial)","Show Middle Name (initial)"
 "Always optional.","Always optional."
@@ -506,10 +506,10 @@ Strong,Strong
 "Rebuild Customer grid index","Rebuild Customer grid index"
 Group,Group
 "Add New Customer","Add New Customer"
-"Are you sure to delete selected customers?","Are you sure to delete selected customers?"
+"Are you sure you want to delete the selected customers?","Are you sure you want to delete the selected customers?"
 "Delete items","Delete items"
 "Subscribe to Newsletter","Subscribe to Newsletter"
-"Are you sure to unsubscribe selected customers from newsletter?","Are you sure to unsubscribe selected customers from newsletter?"
+"Are you sure you want to unsubscribe the selected customers from the newsletter?","Are you sure you want to unsubscribe the selected customers from the newsletter?"
 "Unsubscribe from Newsletter","Unsubscribe from Newsletter"
 "Assign a Customer Group","Assign a Customer Group"
 Phone,Phone
@@ -531,10 +531,8 @@ Type,Type
 "Send Welcome Email From","Send Welcome Email From"
 "Are you sure you want to delete this item?","Are you sure you want to delete this item?"
 Addresses,Addresses
-"Account Dashboard","Account Dashboard"
 "Edit Account Information","Edit Account Information"
 "Password forgotten","Password forgotten"
-"My Dashboard","My Dashboard"
 "You are signed out","You are signed out"
 "Associate to Website","Associate to Website"
 "Prefix","Prefix"
diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_address_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_address_edit.xml
new file mode 100644
index 0000000000000..3acae3acec8aa
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_address_edit.xml
@@ -0,0 +1,15 @@
+<?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" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="customer_address_form"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml
index ecb64711bdb94..a65ef3cd395d0 100644
--- a/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml
+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml
@@ -8,48 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Customer\Block\Adminhtml\Group" name="adminhtml.block.customer.group.grid.container">
-                <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.customer.group.grid" as="grid">
-                    <arguments>
-                        <argument name="id" xsi:type="string">customerGroupGrid</argument>
-                        <argument name="dataSource" xsi:type="object">Magento\Customer\Model\ResourceModel\Group\Grid\ServiceCollection</argument>
-                        <argument name="default_sort" xsi:type="string">type</argument>
-                        <argument name="default_dir" xsi:type="string">asc</argument>
-                        <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                    </arguments>
-                    <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.customer.group.grid.columnSet">
-                        <arguments>
-                            <argument name="rowUrl" xsi:type="array">
-                                <item name="path" xsi:type="string">customer/*/edit</item>
-                                <item name="extraParamsTemplate" xsi:type="array">
-                                    <item name="id" xsi:type="string">getId</item>
-                                </item>
-                            </argument>
-                        </arguments>
-                        <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.group.grid.columnSet.time" as="time">
-                            <arguments>
-                                <argument name="header" xsi:type="string" translate="true">ID</argument>
-                                <argument name="id" xsi:type="string">id</argument>
-                                <argument name="index" xsi:type="string">id</argument>
-                                <argument name="column_css_class" xsi:type="string">col-id</argument>
-                                <argument name="header_css_class" xsi:type="string">col-id</argument>
-                            </arguments>
-                        </block>
-                        <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.group.grid.columnSet.type" as="type">
-                            <arguments>
-                                <argument name="header" xsi:type="string" translate="true">Group</argument>
-                                <argument name="index" xsi:type="string">code</argument>
-                            </arguments>
-                        </block>
-                        <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.group.grid.columnSet.class_name" as="class_name">
-                            <arguments>
-                                <argument name="header" xsi:type="string" translate="true">Tax Class</argument>
-                                <argument name="index" xsi:type="string">tax_class_name</argument>
-                            </arguments>
-                        </block>
-                    </block>
-                </block>
-            </block>
+            <uiComponent name="customer_group_listing"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
new file mode 100644
index 0000000000000..35f0ed8f1dae2
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" component="Magento_Customer/js/form/components/form">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">customer_address_form.customer_address_form_data_source</item>
+        </item>
+        <item name="config" xsi:type="array">
+            <item name="deleteConfirmationMessage" translate="true" xsi:type="string">Are you sure you want to delete this address?</item>
+        </item>
+        <item name="label" xsi:type="string" translate="true">Update Address</item>
+        <item name="reverseMetadataMerge" xsi:type="boolean">true</item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="cancel" class="Magento\Customer\Block\Adminhtml\Edit\Address\CancelButton"/>
+            <button name="delete" class="Magento\Customer\Block\Adminhtml\Edit\Address\DeleteButton"/>
+            <button name="save" class="Magento\Customer\Block\Adminhtml\Edit\Address\SaveButton"/>
+        </buttons>
+        <namespace>customer_address_form</namespace>
+        <ajaxSave>true</ajaxSave>
+        <ajaxSaveType>simple</ajaxSaveType>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>customer_address_form.customer_address_form_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="customer_address_form_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="customer/address/save"/>
+            <validateUrl path="customer/address/validate"/>
+        </settings>
+        <aclResource>Magento_Customer::manage</aclResource>
+        <dataProvider class="Magento\Customer\Model\Address\DataProvider" name="customer_address_form_data_source">
+            <settings>
+                <requestFieldName>entity_id</requestFieldName>
+                <primaryFieldName>entity_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <container name="messages" component="Magento_Ui/js/form/components/html">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="additionalClasses" xsi:type="string">message message-error</item>
+                <item name="visible" xsi:type="boolean">false</item>
+                <item name="imports" xsi:type="array">
+                    <item name="responseData" xsi:type="string">${ $.parentName }:responseData</item>
+                </item>
+                <item name="listens" xsi:type="array">
+                    <item name="responseData.error" xsi:type="string">visible</item>
+                    <item name="responseData.messages" xsi:type="string">content</item>
+                </item>
+            </item>
+        </argument>
+    </container>
+    <fieldset name="general">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="is_collection" xsi:type="boolean">true</item>
+            </item>
+        </argument>
+        <settings>
+            <label/>
+            <dataScope/>
+        </settings>
+
+        <field name="entity_id" formElement="hidden">
+            <settings>
+                <dataType>text</dataType>
+            </settings>
+        </field>
+        <field name="default_billing" sortOrder="5" formElement="checkbox">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="default" xsi:type="number">0</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>boolean</dataType>
+                <label translate="true">Default Billing Address</label>
+                <dataScope>default_billing</dataScope>
+            </settings>
+            <formElements>
+                <checkbox>
+                    <settings>
+                        <valueMap>
+                            <map name="false" xsi:type="number">0</map>
+                            <map name="true" xsi:type="number">1</map>
+                        </valueMap>
+                        <prefer>toggle</prefer>
+                    </settings>
+                </checkbox>
+            </formElements>
+        </field>
+        <field name="default_shipping" sortOrder="7" formElement="checkbox">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="default" xsi:type="number">0</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>boolean</dataType>
+                <label translate="true">Default Shipping Address</label>
+                <dataScope>default_shipping</dataScope>
+            </settings>
+            <formElements>
+                <checkbox>
+                    <settings>
+                        <valueMap>
+                            <map name="false" xsi:type="number">0</map>
+                            <map name="true" xsi:type="number">1</map>
+                        </valueMap>
+                        <prefer>toggle</prefer>
+                    </settings>
+                </checkbox>
+            </formElements>
+        </field>
+        <field name="prefix" sortOrder="10" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Name Prefix</label>
+            </settings>
+        </field>
+        <field name="firstname" sortOrder="20" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">First Name</label>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+        </field>
+        <field name="lastname" sortOrder="30" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Last Name</label>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+        </field>
+        <field name="suffix" sortOrder="40" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Name Suffix</label>
+            </settings>
+        </field>
+        <field name="middlename" sortOrder="50" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Middle Name/Initial</label>
+            </settings>
+        </field>
+        <field name="company" sortOrder="60" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Company</label>
+            </settings>
+        </field>
+        <field name="city" sortOrder="80" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">City</label>
+                <visible>true</visible>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+        </field>
+        <field name="country_id" component="Magento_Customer/js/form/element/country" sortOrder="90" formElement="select">
+            <settings>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>text</dataType>
+            </settings>
+            <formElements>
+                <select>
+                    <settings>
+                        <options class="Magento\Directory\Model\ResourceModel\Country\Collection"/>
+                    </settings>
+                </select>
+            </formElements>
+        </field>
+        <field name="region_id" component="Magento_Customer/js/form/element/region" formElement="select">
+            <settings>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>text</dataType>
+                <label translate="true">State/Province</label>
+            </settings>
+            <formElements>
+                <select>
+                    <settings>
+                        <filterBy>
+                            <field>country_id</field>
+                            <target>${ $.provider }:${ $.parentScope }.country_id</target>
+                        </filterBy>
+                        <customEntry>region</customEntry>
+                        <options class="Magento\Directory\Model\ResourceModel\Region\Collection"/>
+                    </settings>
+                </select>
+            </formElements>
+        </field>
+        <field name="postcode" component="Magento_Ui/js/form/element/post-code" sortOrder="120" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Zip/Postal Code</label>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+        </field>
+        <field name="telephone" sortOrder="130" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <visible>true</visible>
+                <label translate="true">Phone Number</label>
+            </settings>
+        </field>
+        <field name="vat_id" sortOrder="140" formElement="input">
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">VAT Number</label>
+                <validation>
+                    <rule name="validate-alphanum" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+        </field>
+    </fieldset>
+</form>
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml
new file mode 100644
index 0000000000000..fb42a2c5a0787
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_listing.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">customer_address_listing.customer_address_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>customer_address_columns</spinner>
+        <deps>
+            <dep>customer_address_listing.customer_address_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="customer_address_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <filterUrlParams>
+                <param name="id">*</param>
+            </filterUrlParams>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">entity_id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Customer::manage</aclResource>
+        <dataProvider class="Magento\Customer\Ui\Component\Listing\Address\DataProvider" name="customer_address_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>entity_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <filterSearch name="fulltext"/>
+        <filters name="listing_filters" component="Magento_Customer/js/grid/filters/filters">
+            <settings>
+                <storageConfig>
+                    <param name="provider" xsi:type="string">customer_address_listing.customer_address_listing.listing_top.bookmarks</param>
+                    <param name="namespace" xsi:type="string">current.filters</param>
+                </storageConfig>
+                <childDefaults>
+                    <param name="provider" xsi:type="string">customer_address_listing.customer_address_listing.listing_top.listing_filters</param>
+                    <param name="imports" xsi:type="array">
+                        <item name="visible" xsi:type="string">customer_address_listing.customer_address_listing.listing_top.bookmarks:current.columns.${ $.index }.visible</item>
+                    </param>
+                </childDefaults>
+            </settings>
+        </filters>
+        <massaction name="listing_massaction" component="Magento_Customer/js/grid/massactions">
+            <action name="delete">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="isAjax" xsi:type="boolean">true</item>
+                    </item>
+                </argument>
+                <settings>
+                    <url path="customer/address/massDelete"/>
+                    <type>delete</type>
+                    <label translate="true">Delete</label>
+                    <confirm>
+                        <message translate="true">Are you sure to delete selected address?</message>
+                        <title translate="true">Delete items</title>
+                    </confirm>
+                </settings>
+            </action>
+        </massaction>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="customer_address_columns">
+        <settings>
+            <editorConfig>
+                <param name="clientConfig" xsi:type="array">
+                    <item name="saveUrl" xsi:type="url" path="customer/index/inlineEdit"/>
+                    <item name="validateBeforeSave" xsi:type="boolean">false</item>
+                </param>
+                <param name="indexField" xsi:type="string">entity_id</param>
+                <param name="enabled" xsi:type="boolean">true</param>
+                <param name="selectProvider" xsi:type="string">customer_address_listing.customer_address_listing.address_columns.ids</param>
+            </editorConfig>
+            <childDefaults>
+                <param name="fieldAction" xsi:type="array">
+                    <item name="provider" xsi:type="string">customer_address_listing.customer_address_listing.address_columns_editor</item>
+                    <item name="target" xsi:type="string">startEdit</item>
+                    <item name="params" xsi:type="array">
+                        <item name="0" xsi:type="string">${ $.$data.rowIndex }</item>
+                        <item name="1" xsi:type="boolean">true</item>
+                    </item>
+                </param>
+            </childDefaults>
+        </settings>
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>entity_id</indexField>
+            </settings>
+        </selectionsColumn>
+        <column name="firstname" sortOrder="20">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">First Name</label>
+            </settings>
+        </column>
+        <column name="lastname" sortOrder="40">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Last Name</label>
+            </settings>
+        </column>
+        <column name="street" sortOrder="80">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Street Address</label>
+            </settings>
+        </column>
+        <column name="city" sortOrder="81">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">City</label>
+            </settings>
+        </column>
+        <column name="region" sortOrder="91">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">State</label>
+            </settings>
+        </column>
+        <column name="postcode" sortOrder="92">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Zip/Postal Code</label>
+            </settings>
+        </column>
+        <column name="country_id" component="Magento_Ui/js/grid/columns/select" sortOrder="90">
+            <settings>
+                <filter>select</filter>
+                <options class="Magento\Customer\Ui\Component\Listing\Address\Column\Countries"/>
+                <dataType>select</dataType>
+                <label translate="true">Country</label>
+            </settings>
+        </column>
+        <column name="telephone" sortOrder="93">
+            <settings>
+                <filter>text</filter>
+                <editor>
+                    <editorType>text</editorType>
+                </editor>
+                <label translate="true">Phone</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Magento\Customer\Ui\Component\Listing\Address\Column\Actions" component="Magento_Customer/js/grid/columns/actions">
+            <settings>
+                <indexField>entity_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml
new file mode 100644
index 0000000000000..0787e0713aa9f
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">customer_group_listing.customer_group_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="add">
+                <url path="*/*/new"/>
+                <class>primary</class>
+                <label translate="true">Add New Customer Group</label>
+            </button>
+        </buttons>
+        <spinner>customer_group_columns</spinner>
+        <deps>
+            <dep>customer_group_listing.customer_group_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="customer_group_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">customer_group_id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Customer::group</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="customer_group_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>customer_group_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <filters name="listing_filters"/>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="customer_group_columns">
+        <column name="customer_group_id">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">ID</label>
+                <sorting>asc</sorting>
+            </settings>
+        </column>
+        <column name="customer_group_code">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Group</label>
+            </settings>
+        </column>
+        <column name="tax_class_id" component="Magento_Ui/js/grid/columns/select">
+            <settings>
+                <options class="Magento\Tax\Model\TaxClass\Source\Customer"/>
+                <filter>select</filter>
+                <dataType>select</dataType>
+                <label translate="true">Tax Class</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Magento\Customer\Ui\Component\Listing\Column\GroupActions">
+            <settings>
+                <indexField>customer_group_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
index f8aa078f45e4d..6b479ad1cb290 100644
--- a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
@@ -49,7 +49,7 @@
             <action name="delete">
                 <settings>
                     <confirm>
-                        <message translate="true">Are you sure to delete selected customers?</message>
+                        <message translate="true">Are you sure you want to delete the selected customers?</message>
                         <title translate="true">Delete items</title>
                     </confirm>
                     <url path="customer/index/massDelete"/>
@@ -67,7 +67,7 @@
             <action name="unsubscribe">
                 <settings>
                     <confirm>
-                        <message translate="true">Are you sure to unsubscribe selected customers from newsletter?</message>
+                        <message translate="true">Are you sure you want to unsubscribe the selected customers from the newsletter?</message>
                         <title translate="true">Unsubscribe from Newsletter</title>
                     </confirm>
                     <url path="customer/index/massUnsubscribe"/>
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js b/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js
new file mode 100644
index 0000000000000..07662cd9b105b
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/address/default-address.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/components/button',
+    'underscore'
+], function (Button, _) {
+    'use strict';
+
+    return Button.extend({
+        defaults: {
+            entityId: null,
+            parentId: null,
+            listens: {
+                entity: 'changeVisibility'
+            }
+        },
+
+        /**
+         * Apply action on target component,
+         * but previously create this component from template if it is not existed
+         *
+         * @param {Object} action - action configuration
+         */
+        applyAction: function (action) {
+            if (action.params && action.params[0]) {
+                action.params[0]['entity_id'] = this.entityId;
+                action.params[0]['parent_id'] = this.parentId;
+            } else {
+                action.params = [{
+                    'entity_id': this.entityId,
+                    'parent_id': this.parentId
+                }];
+            }
+
+            this._super();
+        },
+
+        /**
+         * Change visibility of the default address shipping/billing blocks
+         *
+         * @param {Object} entity - customer address
+         */
+        changeVisibility: function (entity) {
+            this.visible(!_.isEmpty(entity));
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js
new file mode 100644
index 0000000000000..812dbe5975c70
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/form.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Ui/js/modal/alert',
+    'Magento_Ui/js/modal/confirm',
+    'Magento_Ui/js/form/form',
+    'underscore',
+    'mage/translate'
+], function ($, uiAlert, uiConfirm, Form, _, $t) {
+    'use strict';
+
+    return Form.extend({
+        defaults: {
+            deleteConfirmationMessage: '',
+            ajaxSettings: {
+                method: 'POST',
+                dataType: 'json'
+            }
+        },
+
+        /**
+         * Delete customer address by provided url.
+         * Will call confirmation message to be sure that user is really wants to delete this address
+         *
+         * @param {String} url - ajax url
+         */
+        deleteAddress: function (url) {
+            var that = this;
+
+            uiConfirm({
+                content: this.deleteConfirmationMessage,
+                actions: {
+                    /** @inheritdoc */
+                    confirm: function () {
+                        that._delete(url);
+                    }
+                }
+            });
+        },
+
+        /**
+         * Perform asynchronous DELETE request to server.
+         * @param {String} url - ajax url
+         * @returns {Deferred}
+         */
+        _delete: function (url) {
+            var settings = _.extend({}, this.ajaxSettings, {
+                    url: url,
+                    data: {
+                        'form_key': window.FORM_KEY
+                    }
+                }),
+                that = this;
+
+            $('body').trigger('processStart');
+
+            return $.ajax(settings)
+                .done(function (response) {
+                    if (response.error) {
+                        uiAlert({
+                            content: response.message
+                        });
+                    } else {
+                        that.trigger('deleteAddressAction', that.source.get('data.entity_id'));
+                    }
+                })
+                .fail(function () {
+                    uiAlert({
+                        content: $t('Sorry, there has been an error processing your request. Please try again later.')
+                    });
+                })
+                .always(function () {
+                    $('body').trigger('processStop');
+                });
+
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js
new file mode 100644
index 0000000000000..a1ffbde62d4d0
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-form.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/components/insert-form'
+], function (Insert) {
+    'use strict';
+
+    return Insert.extend({
+        defaults: {
+            listens: {
+                responseData: 'onResponse'
+            },
+            modules: {
+                addressListing: '${ $.addressListingProvider }',
+                addressModal: '${ $.addressModalProvider }'
+            }
+        },
+
+        /**
+         * Close modal, reload customer address listing and save customer address
+         *
+         * @param {Object} responseData
+         */
+        onResponse: function (responseData) {
+            var data;
+
+            if (!responseData.error) {
+                this.addressModal().closeModal();
+                this.addressListing().reload({
+                    refresh: true
+                });
+                data = this.externalSource().get('data');
+                this.saveAddress(responseData, data);
+            }
+        },
+
+        /**
+         * Save customer address to customer form data source
+         *
+         * @param {Object} responseData
+         * @param {Object} data - customer address
+         */
+        saveAddress: function (responseData, data) {
+            data['entity_id'] = responseData.data['entity_id'];
+
+            if (parseFloat(data['default_billing'])) {
+                this.source.set('data.default_billing_address', data);
+            } else if (
+                parseFloat(this.source.get('data.default_billing_address')['entity_id']) === data['entity_id']
+            ) {
+                this.source.set('data.default_billing_address', []);
+            }
+
+            if (parseFloat(data['default_shipping'])) {
+                this.source.set('data.default_shipping_address', data);
+            } else if (
+                parseFloat(this.source.get('data.default_shipping_address')['entity_id']) === data['entity_id']
+            ) {
+                this.source.set('data.default_shipping_address', []);
+            }
+        },
+
+        /**
+         * Event method that closes "Edit customer address" modal and refreshes grid after customer address
+         * was removed through "Delete" button on the "Edit customer address" modal
+         *
+         * @param {String} id - customer address ID to delete
+         */
+        onAddressDelete: function (id) {
+            this.addressModal().closeModal();
+            this.addressListing().reload({
+                refresh: true
+            });
+            this.addressListing()._delete([parseFloat(id)]);
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
new file mode 100644
index 0000000000000..912d4b32130ec
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
@@ -0,0 +1,90 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/components/insert-listing',
+    'underscore'
+], function (Insert, _) {
+    'use strict';
+
+    return Insert.extend({
+
+        /**
+         * On action call
+         *
+         * @param {Object} data - customer address and actions
+         */
+        onAction: function (data) {
+            this[data.action + 'Action'].call(this, data.data);
+        },
+
+        /**
+         * On mass action call
+         *
+         * @param {Object} data - customer address
+         */
+        onMassAction: function (data) {
+            this[data.action + 'Massaction'].call(this, data.data);
+        },
+
+        /**
+         * Set default billing address
+         *
+         * @param {Object} data - customer address
+         */
+        setDefaultBillingAction: function (data) {
+            this.source.set('data.default_billing_address', data);
+        },
+
+        /**
+         * Set default shipping address
+         *
+         * @param {Object} data - customer address
+         */
+        setDefaultShippingAction: function (data) {
+            this.source.set('data.default_shipping_address', data);
+        },
+
+        /**
+         * Delete customer address
+         *
+         * @param {Object} data - customer address
+         */
+        deleteAction: function (data) {
+            this._delete([parseFloat(data[data['id_field_name']])]);
+        },
+
+        /**
+         * Mass action delete
+         *
+         * @param {Object} data - customer address
+         */
+        deleteMassaction: function (data) {
+            var ids = _.map(data, function (val) {
+                return parseFloat(val);
+            });
+
+            this._delete(ids);
+        },
+
+        /**
+         * Delete customer address by ids
+         *
+         * @param {Array} ids
+         */
+        _delete: function (ids) {
+            var defaultShippingId = parseFloat(this.source.get('data.default_shipping_address.entity_id')),
+                defaultBillingId = parseFloat(this.source.get('data.default_billing_address.entity_id'));
+
+            if (ids.indexOf(defaultShippingId) !== -1) {
+                this.source.set('data.default_shipping_address', []);
+            }
+
+            if (ids.indexOf(defaultBillingId) !== -1) {
+                this.source.set('data.default_billing_address', []);
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js
new file mode 100644
index 0000000000000..1ed30ae388b47
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/country.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/country'
+], function (Country) {
+    'use strict';
+
+    return Country.extend({
+        defaults: {
+            countryScope: 'data.country'
+        },
+
+        /**
+         * Set country to customer address form
+         *
+         * @param {String} value - country
+         */
+        setDifferedFromDefault: function (value) {
+            this._super();
+
+            if (value) {
+                this.source.set(this.countryScope, this.indexedOptions[value].label);
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js
new file mode 100644
index 0000000000000..755a8e6df3dbe
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/element/region.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/region'
+], function (Region) {
+    'use strict';
+
+    return Region.extend({
+        defaults: {
+            regionScope: 'data.region'
+        },
+
+        /**
+         * Set region to customer address form
+         *
+         * @param {String} value - region
+         */
+        setDifferedFromDefault: function (value) {
+            this._super();
+
+            if (parseFloat(value)) {
+                this.source.set(this.regionScope, this.indexedOptions[value].label);
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js
new file mode 100644
index 0000000000000..66ef89c9413c7
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/columns/actions.js
@@ -0,0 +1,103 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/grid/columns/actions',
+    'Magento_Ui/js/modal/alert',
+    'underscore',
+    'jquery',
+    'mage/translate'
+], function (Actions, uiAlert, _, $, $t) {
+    'use strict';
+
+    return Actions.extend({
+        defaults: {
+            ajaxSettings: {
+                method: 'POST',
+                dataType: 'json'
+            },
+            listens: {
+                action: 'onAction'
+            }
+        },
+
+        /**
+         * Reload customer address listing data source after customer address delete action
+         *
+         * @param {Object} data
+         */
+        onAction: function (data) {
+            if (data.action === 'delete') {
+                this.source().reload({
+                    refresh: true
+                });
+            }
+        },
+
+        /**
+         * Default action callback. Redirects to
+         * the specified in action's data url.
+         *
+         * @param {String} actionIndex - Action's identifier.
+         * @param {(Number|String)} recordId - Id of the record associated
+         *      with a specified action.
+         * @param {Object} action - Action's data.
+         */
+        defaultCallback: function (actionIndex, recordId, action) {
+            if (action.isAjax) {
+                this.request(action.href).done(function (response) {
+                    var data;
+
+                    if (!response.error) {
+                        data = _.findWhere(this.rows, {
+                            _rowIndex: action.rowIndex
+                        });
+
+                        this.trigger('action', {
+                            action: actionIndex,
+                            data: data
+                        });
+                    }
+                }.bind(this));
+
+            } else {
+                this._super();
+            }
+        },
+
+        /**
+         * Send customer address listing ajax request
+         *
+         * @param {String} href
+         */
+        request: function (href) {
+            var settings = _.extend({}, this.ajaxSettings, {
+                url: href,
+                data: {
+                    'form_key': window.FORM_KEY
+                }
+            });
+
+            $('body').trigger('processStart');
+
+            return $.ajax(settings)
+                .done(function (response) {
+                    if (response.error) {
+                        uiAlert({
+                            content: response.message
+                        });
+                    }
+                })
+                .fail(function () {
+                    uiAlert({
+                        content: $t('Sorry, there has been an error processing your request. Please try again later.')
+                    });
+                })
+                .always(function () {
+                    $('body').trigger('processStop');
+                });
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js
new file mode 100644
index 0000000000000..5dbf62a209b3b
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/chips.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/grid/filters/chips'
+], function (Chips) {
+    'use strict';
+
+    return Chips.extend({
+
+        /**
+         * Clear previous filters while initializing element to prevent filters sharing between customers
+         *
+         * @param {Object} elem
+         */
+        initElement: function (elem) {
+            this.clear();
+            this._super(elem);
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js
new file mode 100644
index 0000000000000..f8bf7d3d7ec46
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/filters/filters.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/grid/filters/filters'
+], function (Filters) {
+    'use strict';
+
+    return Filters.extend({
+        defaults: {
+            chipsConfig: {
+                name: '${ $.name }_chips',
+                provider: '${ $.chipsConfig.name }',
+                component: 'Magento_Customer/js/grid/filters/chips'
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js b/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js
new file mode 100644
index 0000000000000..384f48554a917
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/grid/massactions.js
@@ -0,0 +1,106 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/grid/massactions',
+    'Magento_Ui/js/modal/alert',
+    'underscore',
+    'jquery',
+    'mage/translate'
+], function (Massactions, uiAlert, _, $, $t) {
+    'use strict';
+
+    return Massactions.extend({
+        defaults: {
+            ajaxSettings: {
+                method: 'POST',
+                dataType: 'json'
+            },
+            listens: {
+                massaction: 'onAction'
+            }
+        },
+
+        /**
+         * Reload customer addresses listing
+         *
+         * @param {Object} data
+         */
+        onAction: function (data) {
+            if (data.action === 'delete') {
+                this.source.reload({
+                    refresh: true
+                });
+            }
+        },
+
+        /**
+         * Default action callback. Send selections data
+         * via POST request.
+         *
+         * @param {Object} action - Action data.
+         * @param {Object} data - Selections data.
+         */
+        defaultCallback: function (action, data) {
+            var itemsType, selections;
+
+            if (action.isAjax) {
+                itemsType = data.excludeMode ? 'excluded' : 'selected';
+                selections = {};
+
+                selections[itemsType] = data[itemsType];
+
+                if (!selections[itemsType].length) {
+                    selections[itemsType] = false;
+                }
+
+                _.extend(selections, data.params || {});
+
+                this.request(action.url, selections).done(function (response) {
+                    if (!response.error) {
+                        this.trigger('massaction', {
+                            action: action.type,
+                            data: selections
+                        });
+                    }
+                }.bind(this));
+            } else {
+                this._super();
+            }
+        },
+
+        /**
+         * Send customer address listing mass action ajax request
+         *
+         * @param {String} href
+         * @param {Object} data
+         */
+        request: function (href, data) {
+            var settings = _.extend({}, this.ajaxSettings, {
+                url: href,
+                data: data
+            });
+
+            $('body').trigger('processStart');
+
+            return $.ajax(settings)
+                .done(function (response) {
+                    if (response.error) {
+                        uiAlert({
+                            content: response.message
+                        });
+                    }
+                })
+                .fail(function () {
+                    uiAlert({
+                        content: $t('Sorry, there has been an error processing your request. Please try again later.')
+                    });
+                })
+                .always(function () {
+                    $('body').trigger('processStop');
+                });
+        }
+    });
+});
diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html
new file mode 100644
index 0000000000000..2af366b03342c
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address-wrapper.html
@@ -0,0 +1,7 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="customer-default-address-wrapper" each="data: elems, as: 'element'" render=""/>
diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
new file mode 100644
index 0000000000000..8d68b93445b85
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
@@ -0,0 +1,47 @@
+<div data-bind="attr: {class: contentClass}">
+    <div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
+        <address>
+            <div class="address_caption">
+                <text args="title"/>
+                <each args="data: elems, as: 'element'">
+                    <render if="hasTemplate()"/>
+                </each>
+            </div>
+            <div class="address_details" ifnot="_.isEmpty($data.address)">
+                <text args="address.prefix" if="address.prefix"/>
+                <text args="address.firstname"/>
+                <text args="address.middlename" if="address.middlename"/>
+                <text args="address.lastname"/>
+                <text args="address.suffix" if="address.suffix"/>
+                <br/>
+                <if args="address.company">
+                    <text args="address.company"/>
+                    <br/>
+                </if>
+                <if args="address.street">
+                    <text args="address.street" if="_.isString(address.street)"/>
+                    <text args="_.values(address.street).filter(value => _.isString(value)).join(', ')"
+                          ifnot="_.isString(address.street)"/>
+                    <br/>
+                </if>
+                <text args="address.city + ', '" if="address.city"/>
+                <text args="address.region + ', '" if="address.region"/>
+                <if args="address.postcode">
+                    <text args="address.postcode"/>
+                    <br/>
+                </if>
+                <text args="address.country"/>
+                <if args="address.telephone">
+                    <br/>T: <a attr="href: 'tel:' + address.telephone" text="address.telephone"/>
+                </if>
+                <if args="address.fax">
+                    <br/>F: <text args="address.fax"/>
+                </if>
+                <if args="address.vat_id">
+                    <br/>VAT: <text args="address.vat_id"/>
+                </if>
+            </div>
+            <translate args="notExistsMessage" if="_.isEmpty($data.address)"/>
+        </address>
+    </div>
+</div>
diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
index 4de6644b948fb..7e6b7bbe9cd09 100644
--- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -43,7 +43,7 @@
             <validateUrl path="customer/index/validate"/>
             <submitUrl path="customer/index/save"/>
         </settings>
-        <dataProvider class="Magento\Customer\Model\Customer\DataProvider" name="customer_form_data_source">
+        <dataProvider class="Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses" name="customer_form_data_source">
             <settings>
                 <requestFieldName>id</requestFieldName>
                 <primaryFieldName>entity_id</primaryFieldName>
@@ -303,265 +303,196 @@
             </formElements>
         </field>
     </fieldset>
-    <fieldset name="address">
-        <argument name="data" xsi:type="array">
-            <item name="config" xsi:type="array">
-                <item name="is_collection" xsi:type="boolean">true</item>
-                <item name="removeMessage" xsi:type="string" translate="true">Are you sure you want to delete this item?</item>
-            </item>
-        </argument>
+    <fieldset name="address" class="Magento\Customer\Ui\Component\Form\AddressFieldset">
         <settings>
+            <collapsible>false</collapsible>
             <label translate="true">Addresses</label>
+            <componentType>fieldset</componentType>
+            <additionalClasses>
+                <class name="customer-address-form">true</class>
+            </additionalClasses>
         </settings>
-        <field name="parent_id" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>number</dataType>
-                <visible>false</visible>
-            </settings>
-        </field>
-        <field name="prefix" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>text</dataType>
-                <visible>true</visible>
-            </settings>
-        </field>
-        <field name="firstname" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
-                <imports>
-                    <link name="default">${ $.provider }:data.customer.firstname</link>
-                </imports>
-            </settings>
-        </field>
-        <field name="middlename" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>text</dataType>
-                <visible>true</visible>
-            </settings>
-        </field>
-        <field name="lastname" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
+        <container name="customer_default_billing_address_wrapper" template="Magento_Customer/default-address-wrapper">
+            <component name="customer_default_billing_address_content" template="Magento_Customer/default-address">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="defaultAddressClass" xsi:type="string">billing-address</item>
+                        <item name="title" translate="true" xsi:type="string">Default Billing Address</item>
+                        <item name="contentClass" xsi:type="string">customer-default-billing-address-content</item>
+                        <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default billing address</item>
+                        <item name="tracks" xsi:type="array">
+                            <item name="address" xsi:type="boolean">true</item>
+                        </item>
+                    </item>
+                </argument>
+                <settings>
+                    <imports>
+                        <link name="address">${ $.provider}:data.default_billing_address</link>
+                    </imports>
+                </settings>
+            </component>
+            <button name="edit_billing_address" component="Magento_Customer/js/address/default-address">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="buttonClasses" xsi:type="string">edit-default-billing-address-button</item>
+                        <item name="actions" xsi:type="array">
+                            <item name="0" xsi:type="array">
+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
+                                <item name="actionName" xsi:type="string">destroyInserted</item>
+                            </item>
+                            <item name="1" xsi:type="array">
+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal</item>
+                                <item name="actionName" xsi:type="string">openModal</item>
+                            </item>
+                            <item name="2" xsi:type="array">
+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
+                                <item name="actionName" xsi:type="string">render</item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+                <settings>
+                    <componentType>button</componentType>
+                    <title translate="true">Edit</title>
+                    <displayAsLink>true</displayAsLink>
+                    <imports>
+                        <link name="entityId">${ $.provider}:data.default_billing_address.entity_id</link>
+                        <link name="entity">${ $.provider}:data.default_billing_address</link>
+                    </imports>
+                </settings>
+            </button>
+        </container>
+        <container name="customer_default_shipping_address_wrapper" template="Magento_Customer/default-address-wrapper">
+            <component name="customer_default_shipping_address_content" template="Magento_Customer/default-address">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="defaultAddressClass" xsi:type="string">shipping-address</item>
+                        <item name="title" xsi:type="string" translate="true">Default Shipping Address</item>
+                        <item name="contentClass" xsi:type="string">customer-default-shipping-address-content</item>
+                        <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default shipping address</item>
+                        <item name="tracks" xsi:type="array">
+                            <item name="address" xsi:type="boolean">true</item>
+                        </item>
+                    </item>
+                </argument>
+                <settings>
+                    <imports>
+                        <link name="address">${ $.provider}:data.default_shipping_address</link>
+                    </imports>
+                </settings>
+            </component>
+            <button name="edit_shipping_address" component="Magento_Customer/js/address/default-address">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="buttonClasses" xsi:type="string">edit-default-shipping-address-button</item>
+                        <item name="actions" xsi:type="array">
+                            <item name="0" xsi:type="array">
+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
+                                <item name="actionName" xsi:type="string">destroyInserted</item>
+                            </item>
+                            <item name="1" xsi:type="array">
+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal</item>
+                                <item name="actionName" xsi:type="string">openModal</item>
+                            </item>
+                            <item name="2" xsi:type="array">
+                                <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
+                                <item name="actionName" xsi:type="string">render</item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+                <settings>
+                    <componentType>button</componentType>
+                    <title translate="true">Edit</title>
+                    <displayAsLink>true</displayAsLink>
+                    <imports>
+                        <link name="entityId">${ $.provider}:data.default_shipping_address.entity_id</link>
+                        <link name="entity">${ $.provider}:data.default_shipping_address</link>
+                    </imports>
+                </settings>
+            </button>
+        </container>
+        <button name="add_address" component="Magento_Customer/js/address/default-address">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="formElement" xsi:type="string">container</item>
+                    <item name="buttonClasses" xsi:type="string">add-new-address-button</item>
+                    <item name="actions" xsi:type="array">
+                        <item name="0" xsi:type="array">
+                            <item name="targetName" xsi:type="string">${ $.parentName}.customer_address_update_modal.update_customer_address_form_loader</item>
+                            <item name="actionName" xsi:type="string">destroyInserted</item>
+                        </item>
+                        <item name="1" xsi:type="array">
+                            <item name="targetName" xsi:type="string">${ $.parentName}.customer_address_update_modal</item>
+                            <item name="actionName" xsi:type="string">openModal</item>
+                        </item>
+                        <item name="2" xsi:type="array">
+                            <item name="targetName" xsi:type="string">${ $.parentName}.customer_address_update_modal.update_customer_address_form_loader</item>
+                            <item name="actionName" xsi:type="string">render</item>
+                        </item>
+                    </item>
                 </item>
             </argument>
             <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
+                <title translate="true">Add New Address</title>
                 <imports>
-                    <link name="default">${ $.provider }:data.customer.lastname</link>
+                    <link name="parentId">${ $.provider}:data.customer_id</link>
                 </imports>
             </settings>
-        </field>
-        <field name="suffix" sortOrder="43" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>text</dataType>
-                <visible>true</visible>
-            </settings>
-        </field>
-        <field name="company" sortOrder="44" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
+        </button>
+        <modal name="customer_address_update_modal">
             <settings>
-                <validation>
-                    <rule name="min_text_length" xsi:type="number">0</rule>
-                </validation>
-                <dataType>text</dataType>
+                <options>
+                    <option name="title" xsi:type="string">Add/Update Address</option>
+                </options>
             </settings>
-        </field>
-        <field name="city" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
-            </settings>
-        </field>
-        <field name="country_id" component="Magento_Ui/js/form/element/country" formElement="select">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
+            <insertForm name="update_customer_address_form_loader" component="Magento_Customer/js/form/components/insert-form">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="addressListingProvider" xsi:type="string">ns = customer_address_listing, index = customer_address_listing</item>
+                        <item name="addressModalProvider" xsi:type="string">${ $.parentName }</item>
+                    </item>
+                </argument>
+                <settings>
+                    <formSubmitType>ajax</formSubmitType>
+                    <renderUrl path="mui/index/render_handle">
+                        <param name="handle">customer_address_edit</param>
+                        <param name="buttons">1</param>
+                    </renderUrl>
+                    <loading>false</loading>
+                    <toolbarContainer>${ $.parentName }</toolbarContainer>
+                    <externalProvider>${ $.ns }.customer_address_form_data_source</externalProvider>
+                    <ns>customer_address_form</ns>
+                    <exports>
+                        <link name="parentId">${ $.externalProvider }:data.parent_id</link>
+                    </exports>
+                    <imports>
+                        <link name="parentId">${ $.provider}:data.customer_id</link>
+                        <link name="onAddressDelete">${ $.ns }.${ $.ns }:deleteAddressAction</link>
+                    </imports>
+                </settings>
+            </insertForm>
+        </modal>
+        <insertListing name="customer_address_listing" component="Magento_Customer/js/form/components/insert-listing">
+            <settings>
+                <dataLinks>
+                    <exports>false</exports>
+                    <imports>true</imports>
+                </dataLinks>
+                <externalProvider>customer_address_listing.customer_address_listing_data_source</externalProvider>
+                <selectionsProvider>customer_address_listing.customer_address_listing.customer_address_listing_columns.ids</selectionsProvider>
+                <autoRender>true</autoRender>
+                <dataScope>customer_address_listing</dataScope>
+                <ns>customer_address_listing</ns>
+                <exports>
+                    <link name="parent_id">${ $.externalProvider }:params.parent_id</link>
+                </exports>
                 <imports>
-                    <link name="default">${ $.provider }:data.customer.website_id</link>
+                    <link name="parent_id">${ $.provider }:data.customer.entity_id</link>
+                    <link name="onAction">ns = ${ $.ns }, index = actions:action</link>
+                    <link name="onMassAction">ns = ${ $.ns }, index = listing_massaction:massaction</link>
                 </imports>
             </settings>
-        </field>
-        <field name="region" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>text</dataType>
-                <visible>false</visible>
-            </settings>
-        </field>
-        <field name="region_id" component="Magento_Ui/js/form/element/region" formElement="select">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
-            </settings>
-            <formElements>
-                <select>
-                    <settings>
-                        <filterBy>
-                            <field>country_id</field>
-                            <target>${ $.provider }:${ $.parentScope }.country_id</target>
-                        </filterBy>
-                        <customEntry>region</customEntry>
-                    </settings>
-                </select>
-            </formElements>
-        </field>
-        <field name="postcode" component="Magento_Ui/js/form/element/post-code" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
-            </settings>
-        </field>
-        <field name="telephone" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
-                <dataType>text</dataType>
-            </settings>
-        </field>
-        <field name="fax" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <validation>
-                    <rule name="min_text_length" xsi:type="number">0</rule>
-                </validation>
-                <dataType>text</dataType>
-            </settings>
-        </field>
-        <field name="vat_id" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="source" xsi:type="string">address</item>
-                </item>
-            </argument>
-            <settings>
-                <dataType>text</dataType>
-            </settings>
-        </field>
-        <field name="default_billing" component="Magento_Ui/js/form/element/boolean" displayArea="head" formElement="checkbox">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="uniqueNs" xsi:type="string">default_billing</item>
-                    <item name="uniqueProp" xsi:type="string">value</item>
-                    <item name="source" xsi:type="array">
-                        <item name="target" xsi:type="string">customer</item>
-                        <item name="targetField" xsi:type="string">default_billing</item>
-                        <item name="referencedField" xsi:type="string">entity_id</item>
-                    </item>
-                </item>
-            </argument>
-            <settings>
-                <elementTmpl>ui/form/element/checkbox</elementTmpl>
-                <dataType>boolean</dataType>
-            </settings>
-            <formElements>
-                <checkbox>
-                    <settings>
-                        <description translate="true">Default Billing Address</description>
-                    </settings>
-                </checkbox>
-            </formElements>
-        </field>
-        <field name="default_shipping" component="Magento_Ui/js/form/element/boolean" displayArea="head" formElement="checkbox">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="uniqueNs" xsi:type="string">default_shipping</item>
-                    <item name="uniqueProp" xsi:type="string">value</item>
-                    <item name="source" xsi:type="array">
-                        <item name="target" xsi:type="string">customer</item>
-                        <item name="targetField" xsi:type="string">default_shipping</item>
-                        <item name="referencedField" xsi:type="string">entity_id</item>
-                    </item>
-                </item>
-            </argument>
-            <settings>
-                <elementTmpl>ui/form/element/checkbox</elementTmpl>
-                <dataType>boolean</dataType>
-            </settings>
-            <formElements>
-                <checkbox>
-                    <settings>
-                        <description translate="true">Default Shipping Address</description>
-                    </settings>
-                </checkbox>
-            </formElements>
-        </field>
+        </insertListing>
     </fieldset>
 </form>
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
index 010087ace2d42..9b183d63471f3 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
@@ -9,7 +9,9 @@
 "var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
-"var customer.name":"Customer Name"
+"var customer.name":"Customer Name",
+"var extensions":"Extensions",
+"var url":"Url"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -23,7 +25,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
+                        <a href="{{var this.getUrl($store,$url,[_query:[id:$customer.id,key:$customer.confirmation,extensions:$extensions,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
                     </td>
                 </tr>
             </table>
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html b/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
index 6c17762a88227..59e7f16adfd51 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
@@ -21,7 +21,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
+                        <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
                     </td>
                 </tr>
             </table>
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 ac03fa7d293a4..a2a15a4166b73 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">
@@ -19,7 +22,7 @@
                     </arguments>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                             <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
index 8f65d54f458bc..fd5ecbfa7f277 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
@@ -12,6 +12,9 @@
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Customer\Block\Form\Register" name="customer_form_register" template="Magento_Customer::form/register.phtml">
+                <arguments>
+                    <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                </arguments>
                 <container name="form.additional.info" as="form_additional_info"/>
                 <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>
             </block>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
index 6384ee9c6562c..4494a5dd67103 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">My Dashboard</argument>
+                <argument translate="true" name="title" xsi:type="string">My Account</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
index 194dfd1bc7d2b..f053805409fe5 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
@@ -17,7 +17,11 @@
             </arguments>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false"/>
+            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
+                <arguments>
+                    <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js
index 20dd53ded11c9..f1bf5c1d1b67f 100644
--- a/app/code/Magento/Customer/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js
@@ -7,11 +7,13 @@ var config = {
     map: {
         '*': {
             checkoutBalance:    'Magento_Customer/js/checkout-balance',
-            address:            'Magento_Customer/address',
-            changeEmailPassword: 'Magento_Customer/change-email-password',
+            address:            'Magento_Customer/js/address',
+            changeEmailPassword: 'Magento_Customer/js/change-email-password',
             passwordStrengthIndicator: 'Magento_Customer/js/password-strength-indicator',
             zxcvbn: 'Magento_Customer/js/zxcvbn',
-            addressValidation: 'Magento_Customer/js/addressValidation'
+            addressValidation: 'Magento_Customer/js/addressValidation',
+            'Magento_Customer/address': 'Magento_Customer/js/address',
+            'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password'
         }
     }
 };
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
index 7881b7e857fd9..ac8e1298b29b9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
@@ -20,6 +20,7 @@
                     <?= $block->escapeHtml($block->getName()) ?><br>
                     <?= $block->escapeHtml($block->getCustomer()->getEmail()) ?><br>
                 </p>
+                <?= $block->getChildHtml('customer.account.dashboard.info.extra'); ?>
             </div>
             <div class="box-actions">
                 <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/account/edit')) ?>">
@@ -43,8 +44,6 @@
                             <?= $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
                         <?php endif; ?>
                     </p>
-                    <?php /* Extensions placeholder */ ?>
-                    <?= $block->getChildHtml('customer.account.dashboard.info.extra') ?>
                 </div>
                 <div class="box-actions">
                     <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index 10223df489e90..24657a6846cae 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -13,7 +13,7 @@ if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="authorization-link" data-label="<?= $block->escapeHtmlAttr(__('or')) ?>">
+<li class="authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
         <?= $block->escapeHtml($block->getLabel()) ?>
     </a>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 1f1f078504524..faa15f7240235 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -42,13 +42,13 @@
         <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
         <div class="field street required">
             <label for="street_1" class="label">
-                <span><?= $block->escapeHtml(__('Street Address')) ?></span>
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span>
             </label>
             <div class="control">
                 <input type="text"
                        name="street[]"
                        value="<?= $block->escapeHtmlAttr($block->getStreetLine(1)) ?>"
-                       title="<?= $block->escapeHtmlAttr(__('Street Address')) ?>"
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>"
                        id="street_1"
                        class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>"/>
                 <div class="nested">
@@ -74,20 +74,20 @@
         <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
             <div class="field taxvat">
                 <label class="label" for="vat_id">
-                    <span><?= $block->escapeHtml(__('VAT Number')) ?></span>
+                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
                 </label>
                 <div class="control">
                     <input type="text"
                            name="vat_id"
                            value="<?= $block->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
-                           title="<?= $block->escapeHtmlAttr(__('VAT Number')) ?>"
+                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
                            class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id')) ?>"
                            id="vat_id">
                 </div>
             </div>
         <?php endif; ?>
         <div class="field city required">
-            <label class="label" for="city"><span><?= $block->escapeHtml(__('City')) ?></span></label>
+            <label class="label" for="city"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
             <div class="control">
                 <input type="text"
                        name="city"
@@ -99,37 +99,37 @@
         </div>
         <div class="field region required">
             <label class="label" for="region_id">
-                <span><?= $block->escapeHtml(__('State/Province')) ?></span>
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span>
             </label>
             <div class="control">
                 <select id="region_id" name="region_id"
-                        title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>"
-                        class="validate-select" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
+                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
+                        class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
                     <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                 </select>
                 <input type="text"
                        id="region"
                        name="region"
                        value="<?= $block->escapeHtmlAttr($block->getRegion()) ?>"
-                       title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>"
-                       class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
+                       class="input-text validate-not-number-first <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
             </div>
         </div>
         <div class="field zip required">
             <label class="label" for="zip">
-                <span><?= $block->escapeHtml(__('Zip/Postal Code')) ?></span>
+                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
             </label>
             <div class="control">
                 <input type="text"
                        name="postcode"
                        value="<?= $block->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
-                       title="<?= $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>"
+                       title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
                        id="zip"
                        class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
             </div>
         </div>
         <div class="field country required">
-            <label class="label" for="country"><span><?= $block->escapeHtml(__('Country')) ?></span></label>
+            <label class="label" for="country"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
             <div class="control">
                 <?= $block->getCountryHtmlSelect() ?>
             </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
index 0de3d94334970..8edb21ac8e1e9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
@@ -14,7 +14,7 @@
         <div class="field email required">
             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}" data-mage-init='{"mage/trim-input":{}}'>
             </div>
         </div>
     </fieldset>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
index 5bc4a929d6d94..f8eb0bd44b681 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
@@ -20,7 +20,7 @@
         <div class="field email required">
             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <?= $block->getChildHtml('form_additional_info') ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
index 16206525aa53b..d85e76e4cbc3f 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -19,12 +19,12 @@
               id="login-form"
               data-mage-init='{"validation":{}}'>
             <?= $block->getBlockHtml('formkey') ?>
-            <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+            <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtml(__('* Required Fields')) ?>">
                 <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div>
                 <div class="field email required">
                     <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
                     <div class="control">
-                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-validate="{required:true, 'validate-email':true}">
+                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
                     </div>
                 </div>
                 <div class="field password required">
@@ -42,3 +42,4 @@
         </form>
     </div>
 </div>
+
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 43e4e92fd0904..f11177ae19f7c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -65,9 +65,9 @@
             <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
 
             <div class="field street required">
-                <label for="street_1" class="label"><span><?= $block->escapeHtml(__('Street Address')) ?></span></label>
+                <label for="street_1" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?></span></label>
                 <div class="control">
-                    <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address')) ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                    <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
                     <div class="nested">
                         <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
                         <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
@@ -85,31 +85,31 @@
             </div>
 
             <div class="field required">
-                <label for="city" class="label"><span><?= $block->escapeHtml(__('City')) ?></span></label>
+                <label for="city" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span></label>
                 <div class="control">
-                    <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= $block->escapeHtmlAttr(__('City')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
+                    <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
                 </div>
             </div>
 
             <div class="field region required">
-                <label for="region_id" class="label"><span><?= $block->escapeHtml(__('State/Province')) ?></span></label>
+                <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
                 <div class="control">
-                    <select id="region_id" name="region_id" title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>" class="validate-select" style="display:none;">
+                    <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id" style="display:none;">
                         <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                     </select>
-                    <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
+                    <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
                 </div>
             </div>
 
             <div class="field zip required">
-                <label for="zip" class="label"><span><?= $block->escapeHtml(__('Zip/Postal Code')) ?></span></label>
+                <label for="zip" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span></label>
                 <div class="control">
-                    <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+                    <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
                 </div>
             </div>
 
             <div class="field country required">
-                <label for="country" class="label"><span><?= $block->escapeHtml(__('Country')) ?></span></label>
+                <label for="country" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span></label>
                 <div class="control">
                     <?= $block->getCountryHtmlSelect() ?>
                 </div>
@@ -131,7 +131,7 @@
         <div class="field required">
             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <div class="field password required">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
index 15e570da04beb..e79cea80ac838 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -8,7 +8,7 @@
 
 /** @var \Magento\Customer\Block\Account\Resetpassword $block */
 ?>
-<form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['id' => $block->getCustomerId(), 'token' => $block->getResetPasswordLinkToken()]])) ?>"
+<form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['token' => $block->getResetPasswordLinkToken()]])) ?>"
       method="post"
       <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?>
       id="form-validate"
diff --git a/app/code/Magento/Customer/view/frontend/templates/logout.phtml b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
index 43665045ce3e2..5a99b7d931b9b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/logout.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
@@ -7,13 +7,12 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <p><?= $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p>
-<script>
-require([
-    "jquery",
-    "mage/mage"
-], function($){
-
-    $($.mage.redirect("<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000));
-
-});
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Customer/js/logout-redirect": {
+                "url": "<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>"
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
index 73e9c4fa34bb3..223e43c9bb897 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
@@ -28,9 +28,7 @@ $suffix = $block->showSuffix();
 ?>
 <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
 <div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
-    <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
-        <span><?= $block->escapeHtml(__('Name')) ?></span>
-    </label>
+    <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
     <div class="control">
         <fieldset class="fieldset fieldset-fullname">
         <div class="fields">
@@ -38,10 +36,7 @@ $suffix = $block->showSuffix();
 
     <?php if ($prefix): ?>
         <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
             <div class="control">
                 <?php if ($block->getPrefixOptions() === false): ?>
                     <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
@@ -65,10 +60,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php endif; ?>
         <div class="field field-name-firstname required">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
             <div class="control">
                 <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
@@ -80,10 +72,7 @@ $suffix = $block->showSuffix();
     <?php if ($middle): ?>
         <?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
         <div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
             <div class="control">
                 <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
@@ -94,10 +83,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php endif; ?>
         <div class="field field-name-lastname required">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
             <div class="control">
                 <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
@@ -108,10 +94,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php if ($suffix): ?>
         <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
             <div class="control">
                 <?php if ($block->getSuffixOptions() === false): ?>
                     <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
index 8bf96cd76b1a8..d75b8f70c5346 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/action/login.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -7,8 +7,9 @@ define([
     'jquery',
     'mage/storage',
     'Magento_Ui/js/model/messageList',
-    'Magento_Customer/js/customer-data'
-], function ($, storage, globalMessageList, customerData) {
+    'Magento_Customer/js/customer-data',
+    'mage/translate'
+], function ($, storage, globalMessageList, customerData, $t) {
     'use strict';
 
     var callbacks = [],
@@ -48,7 +49,7 @@ define([
                 }
             }).fail(function () {
                 messageContainer.addErrorMessage({
-                    'message': 'Could not authenticate. Please try again later'
+                    'message': $t('Could not authenticate. Please try again later')
                 });
                 callbacks.forEach(function (callback) {
                     callback(loginData);
diff --git a/app/code/Magento/Customer/view/frontend/web/address.js b/app/code/Magento/Customer/view/frontend/web/js/address.js
similarity index 100%
rename from app/code/Magento/Customer/view/frontend/web/address.js
rename to app/code/Magento/Customer/view/frontend/web/js/address.js
diff --git a/app/code/Magento/Customer/view/frontend/web/change-email-password.js b/app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
similarity index 100%
rename from app/code/Magento/Customer/view/frontend/web/change-email-password.js
rename to app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index c4672c48e1f4a..39e3f8d95ee3b 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -27,7 +27,8 @@ define([
 
     //TODO: remove global change, in this case made for initNamespaceStorage
     $.cookieStorage.setConf({
-        path: '/'
+        path: '/',
+        expires: 1
     });
 
     storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
@@ -74,17 +75,17 @@ define([
 
         /**
          * @param {Object} sectionNames
-         * @param {Number} updateSectionId
+         * @param {Boolean} forceNewSectionTimestamp
          * @return {*}
          */
-        getFromServer: function (sectionNames, updateSectionId) {
+        getFromServer: function (sectionNames, forceNewSectionTimestamp) {
             var parameters;
 
             sectionNames = sectionConfig.filterClientSideSections(sectionNames);
             parameters = _.isArray(sectionNames) ? {
                 sections: sectionNames.join(',')
             } : [];
-            parameters['update_section_id'] = updateSectionId;
+            parameters['force_new_section_timestamp'] = forceNewSectionTimestamp;
 
             return $.getJSON(options.sectionLoadUrl, parameters).fail(function (jqXHR) {
                 throw new Error(jqXHR);
@@ -198,7 +199,8 @@ define([
                 privateContent = $.cookieStorage.get(privateContentVersion),
                 localPrivateContent = $.localStorage.get(privateContentVersion),
                 needVersion = 'need_version',
-                expiredSectionNames = this.getExpiredSectionNames();
+                expiredSectionNames = this.getExpiredSectionNames(),
+                isLoading = false;
 
             if (privateContent &&
                 !$.cookieStorage.isSet(privateContentVersion) &&
@@ -207,6 +209,7 @@ define([
                 $.cookieStorage.set(privateContentVersion, needVersion);
                 $.localStorage.set(privateContentVersion, needVersion);
                 this.reload([], false);
+                isLoading = true;
             } else if (localPrivateContent !== privateContent) {
                 if (!$.cookieStorage.isSet(privateContentVersion)) {
                     privateContent = needVersion;
@@ -214,6 +217,7 @@ define([
                 }
                 $.localStorage.set(privateContentVersion, privateContent);
                 this.reload([], false);
+                isLoading = true;
             } else if (expiredSectionNames.length > 0) {
                 _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
                     buffer.notify(sectionName, sectionData);
@@ -232,7 +236,7 @@ define([
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
 
-                if (_.isEmpty(countryData())) {
+                if (_.isEmpty(countryData()) && !isLoading) {
                     customerData.reload(['directory-data'], false);
                 }
             }
@@ -322,11 +326,11 @@ define([
 
         /**
          * @param {Array} sectionNames
-         * @param {Number} updateSectionId
+         * @param {Boolean} forceNewSectionTimestamp
          * @return {*}
          */
-        reload: function (sectionNames, updateSectionId) {
-            return dataProvider.getFromServer(sectionNames, updateSectionId).done(function (sections) {
+        reload: function (sectionNames, forceNewSectionTimestamp) {
+            return dataProvider.getFromServer(sectionNames, forceNewSectionTimestamp).done(function (sections) {
                 $(document).trigger('customer-data-reload', [sectionNames]);
                 buffer.update(sections);
             });
diff --git a/app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js b/app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js
index d99574ec3dfbf..a6ae8ff043aa8 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 define([
diff --git a/app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js b/app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js
index eb7f101a6d47e..846edb2c836fa 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 define([
diff --git a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
new file mode 100644
index 0000000000000..6792626df6a08
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function ($) {
+    'use strict';
+
+    return function (data) {
+        $($.mage.redirect(data.url, 'assign', 5000));
+    };
+});
diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js b/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js
index 3fc65c266e895..c1ca395e46cbb 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js
@@ -34,7 +34,7 @@ define([
 
         /** Show login popup window */
         showModal: function () {
-            $(this.modalWindow).modal('openModal');
+            $(this.modalWindow).modal('openModal').trigger('contentUpdated');
         }
     };
 });
diff --git a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
index 71ca63f6750bb..9742e37f2df57 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
@@ -31,6 +31,8 @@ define([
             this.options.cache.label = $(this.options.passwordStrengthMeterLabelSelector, this.element);
 
             // We need to look outside the module for backward compatibility, since someone can already use the module.
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
+            // newsletter email field or any other "email" field.
             this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
             this._bind();
         },
@@ -74,12 +76,14 @@ define([
                     'password-not-equal-to-user-name': this.options.cache.email.val()
                 });
 
-                if (password.toLowerCase() === this.options.cache.email.val().toLowerCase()) {
+                // We should only perform this check in case there is an email field on screen
+                if (this.options.cache.email.length &&
+                    password.toLowerCase() === this.options.cache.email.val().toLowerCase()) {
                     displayScore = 1;
                 } else {
                     isValid = $.validator.validateSingleElement(this.options.cache.input);
                     zxcvbnScore = zxcvbn(password).score;
-                    displayScore = isValid ? zxcvbnScore : 1;
+                    displayScore = isValid && zxcvbnScore > 0 ? zxcvbnScore : 1;
                 }
             }
 
diff --git a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
index ad3d62f6c1c27..ca4f8b4f03b13 100644
--- a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
+++ b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
@@ -54,12 +54,13 @@
                   id="login-form">
                 <div class="fieldset login" data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
                     <div class="field email required">
-                        <label class="label" for="email"><span data-bind="i18n: 'Email Address'"></span></label>
+                        <label class="label" for="customer-email"><span data-bind="i18n: 'Email Address'"></span></label>
                         <div class="control">
                             <input name="username"
-                                   id="email"
+                                   id="customer-email"
                                    type="email"
                                    class="input-text"
+                                   data-mage-init='{"mage/trim-input":{}}'
                                    data-bind="attr: {autocomplete: autocomplete}"
                                    data-validate="{required:true, 'validate-email':true}">
                         </div>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE.txt b/app/code/Magento/CustomerAnalytics/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE.txt
rename to app/code/Magento/CustomerAnalytics/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE_AFL.txt b/app/code/Magento/CustomerAnalytics/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE_AFL.txt
rename to app/code/Magento/CustomerAnalytics/LICENSE_AFL.txt
diff --git a/app/code/Magento/CustomerAnalytics/README.md b/app/code/Magento/CustomerAnalytics/README.md
new file mode 100644
index 0000000000000..8c64ce97629da
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_CustomerAnalytics module
+
+The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE.txt b/app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE.txt
rename to app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE_AFL.txt b/app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE_AFL.txt
rename to app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CustomerAnalytics/Test/Mftf/README.md b/app/code/Magento/CustomerAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..85cd1aea0e5bd
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Analytics Functional Tests
+
+The Functional Test Module for **Magento Customer Analytics** module.
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
new file mode 100644
index 0000000000000..7dec4279ee280
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-customer-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-customer": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CustomerAnalytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerAnalytics/etc/analytics.xml b/app/code/Magento/CustomerAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..5e47040c2f3bd
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/etc/analytics.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="customers">
+        <providers>
+            <reportProvider name="customers" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>customers</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/CustomerAnalytics/etc/module.xml b/app/code/Magento/CustomerAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..a6a3380b3462e
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CustomerAnalytics" >
+        <sequence>
+            <module name="Magento_Customer"/>
+            <module name="Magento_Analytics"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CustomerAnalytics/etc/reports.xml b/app/code/Magento/CustomerAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..b3300b0127709
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/etc/reports.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="customers" connection="default">
+        <source name="customer_entity">
+            <attribute name="entity_id"/>
+            <attribute name="created_at"/>
+            <attribute name="email" function="sha1"/>
+            <attribute name="store_id"/>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/CustomerAnalytics/registration.php b/app/code/Magento/CustomerAnalytics/registration.php
new file mode 100644
index 0000000000000..e4c3348182877
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_CustomerAnalytics',
+    __DIR__
+);
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
new file mode 100644
index 0000000000000..65672bcd3503b
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Customer address create data validator
+ */
+class CustomerAddressCreateDataValidator
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     */
+    public function __construct(GetAllowedAddressAttributes $getAllowedAddressAttributes)
+    {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+    }
+
+    /**
+     * Validate customer address create data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validate(array $addressData): void
+    {
+        $attributes = $this->getAllowedAddressAttributes->execute();
+        $errorInput = [];
+
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))
+            ) {
+                $errorInput[] = $attributeName;
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
new file mode 100644
index 0000000000000..9640953032ac6
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Framework\Webapi\ServiceOutputProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Customer Address field data provider, used for GraphQL request processing.
+ */
+class CustomerAddressDataProvider
+{
+    /**
+     * @var ServiceOutputProcessor
+     */
+    private $serviceOutputProcessor;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var CustomerResourceModel
+     */
+    private $customerResourceModel;
+
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @param ServiceOutputProcessor $serviceOutputProcessor
+     * @param SerializerInterface $jsonSerializer
+     * @param CustomerResourceModel $customerResourceModel
+     * @param CustomerFactory $customerFactory
+     */
+    public function __construct(
+        ServiceOutputProcessor $serviceOutputProcessor,
+        SerializerInterface $jsonSerializer,
+        CustomerResourceModel $customerResourceModel,
+        CustomerFactory $customerFactory
+    ) {
+        $this->serviceOutputProcessor = $serviceOutputProcessor;
+        $this->jsonSerializer = $jsonSerializer;
+        $this->customerResourceModel = $customerResourceModel;
+        $this->customerFactory = $customerFactory;
+    }
+
+    /**
+     * Curate shipping and billing default options
+     *
+     * @param array $address
+     * @param AddressInterface $addressObject
+     * @return array
+     */
+    private function curateAddressDefaultValues(array $address, AddressInterface $addressObject) : array
+    {
+        $customerModel = $this->customerFactory->create();
+        $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
+        $address[CustomerInterface::DEFAULT_BILLING] =
+            ($customerModel->getDefaultBillingAddress()
+                && $addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId());
+        $address[CustomerInterface::DEFAULT_SHIPPING] =
+            ($customerModel->getDefaultShippingAddress()
+                && $addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId());
+        return $address;
+    }
+
+    /**
+     * Transform single customer address data from object to in array format
+     *
+     * @param AddressInterface $addressObject
+     * @return array
+     */
+    public function getAddressData(AddressInterface $addressObject): array
+    {
+        $address = $this->serviceOutputProcessor->process(
+            $addressObject,
+            AddressRepositoryInterface::class,
+            'getById'
+        );
+        $address = $this->curateAddressDefaultValues($address, $addressObject);
+
+        if (isset($address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
+            $address = array_merge($address, $address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+        }
+        $customAttributes = [];
+        if (isset($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
+            foreach ($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
+                $isArray = false;
+                if (is_array($attribute['value'])) {
+                    $isArray = true;
+                    foreach ($attribute['value'] as $attributeValue) {
+                        if (is_array($attributeValue)) {
+                            $customAttributes[$attribute['attribute_code']] = $this->jsonSerializer->serialize(
+                                $attribute['value']
+                            );
+                            continue;
+                        }
+                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
+                        continue;
+                    }
+                }
+                if ($isArray) {
+                    continue;
+                }
+                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
+            }
+        }
+        $address = array_merge($address, $customAttributes);
+
+        return $address;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
new file mode 100644
index 0000000000000..13716b491fddf
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Customer address update data validator. Patch update is allowed
+ */
+class CustomerAddressUpdateDataValidator
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     */
+    public function __construct(GetAllowedAddressAttributes $getAllowedAddressAttributes)
+    {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+    }
+
+    /**
+     * Validate customer address update data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validate(array $addressData): void
+    {
+        $attributes = $this->getAllowedAddressAttributes->execute();
+        $errorInput = [];
+
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (isset($addressData[$attributeName]) && empty($addressData[$attributeName]))
+            ) {
+                $errorInput[] = $attributeName;
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
new file mode 100644
index 0000000000000..87be760732384
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+
+/**
+ * Get allowed address attributes
+ */
+class GetAllowedAddressAttributes
+{
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @param Config $eavConfig
+     */
+    public function __construct(Config $eavConfig)
+    {
+        $this->eavConfig = $eavConfig;
+    }
+
+    /**
+     * Get allowed address attributes
+     *
+     * @return AbstractAttribute[]
+     */
+    public function execute(): array
+    {
+        $attributes = $this->eavConfig->getEntityAttributes(
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+        );
+        foreach ($attributes as $attributeCode => $attribute) {
+            if (false === $attribute->getIsVisibleOnFront()) {
+                unset($attributes[$attributeCode]);
+            }
+        }
+        return $attributes;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
new file mode 100644
index 0000000000000..f7323402a6c62
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+
+/**
+ * Get customer address for user
+ */
+class GetCustomerAddressForUser
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepository
+     */
+    public function __construct(AddressRepositoryInterface $addressRepository)
+    {
+        $this->addressRepository = $addressRepository;
+    }
+
+    /**
+     * Get customer address for user
+     *
+     * @param int $addressId
+     * @param int $userId
+     * @return AddressInterface
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(int $addressId, int $userId): AddressInterface
+    {
+        try {
+            /** @var AddressInterface $address */
+            $address = $this->addressRepository->getById($addressId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Address id %1 does not exist.', [$addressId])
+            );
+        }
+
+        if ($address->getCustomerId() != $userId) {
+            throw new GraphQlAuthorizationException(
+                __('Current customer does not have permission to address id %1', [$addressId])
+            );
+        }
+        return $address;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php
new file mode 100644
index 0000000000000..1acb418e7bba6
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Newsletter\Model\SubscriberFactory;
+
+/**
+ * Change subscription status. Subscribe OR unsubscribe if required
+ */
+class ChangeSubscriptionStatus
+{
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+
+    /**
+     * @param SubscriberFactory $subscriberFactory
+     */
+    public function __construct(
+        SubscriberFactory $subscriberFactory
+    ) {
+        $this->subscriberFactory = $subscriberFactory;
+    }
+
+    /**
+     * Change subscription status. Subscribe OR unsubscribe if required
+     *
+     * @param int $customerId
+     * @param bool $subscriptionStatus
+     * @return void
+     */
+    public function execute(int $customerId, bool $subscriptionStatus): void
+    {
+        $subscriber = $this->subscriberFactory->create()->loadByCustomerId($customerId);
+
+        if ($subscriptionStatus === true && !$subscriber->isSubscribed()) {
+            $this->subscriberFactory->create()->subscribeCustomerById($customerId);
+        } elseif ($subscriptionStatus === false && $subscriber->isSubscribed()) {
+            $this->subscriberFactory->create()->unsubscribeCustomerById($customerId);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php
new file mode 100644
index 0000000000000..030fc47d19e81
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\AuthenticationInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+
+/**
+ * Check customer account
+ */
+class CheckCustomerAccount
+{
+    /**
+     * @var AuthenticationInterface
+     */
+    private $authentication;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @param AuthenticationInterface $authentication
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param AccountManagementInterface $accountManagement
+     */
+    public function __construct(
+        AuthenticationInterface $authentication,
+        CustomerRepositoryInterface $customerRepository,
+        AccountManagementInterface $accountManagement
+    ) {
+        $this->authentication = $authentication;
+        $this->customerRepository = $customerRepository;
+        $this->accountManagement = $accountManagement;
+    }
+
+    /**
+     * Check customer account
+     *
+     * @param int|null $customerId
+     * @param int|null $customerType
+     * @return void
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlAuthenticationException
+     */
+    public function execute(?int $customerId, ?int $customerType): void
+    {
+        if (true === $this->isCustomerGuest($customerId, $customerType)) {
+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+        }
+
+        try {
+            $this->customerRepository->getById($customerId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $customerId]),
+                $e
+            );
+        }
+
+        if (true === $this->authentication->isLocked($customerId)) {
+            throw new GraphQlAuthenticationException(__('The account is locked.'));
+        }
+
+        $confirmationStatus = $this->accountManagement->getConfirmationStatus($customerId);
+        if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
+            throw new GraphQlAuthenticationException(__("This account isn't confirmed. Verify and try again."));
+        }
+    }
+
+    /**
+     * Checking if current customer is guest
+     *
+     * @param int|null $customerId
+     * @param int|null $customerType
+     * @return bool
+     */
+    private function isCustomerGuest(?int $customerId, ?int $customerType): bool
+    {
+        if (null === $customerId || null === $customerType) {
+            return true;
+        }
+        return 0 === (int)$customerId || (int)$customerType === UserContextInterface::USER_TYPE_GUEST;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
new file mode 100644
index 0000000000000..f3c03e5fc18aa
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Model\AuthenticationInterface;
+use Magento\Framework\Exception\InvalidEmailOrPasswordException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+
+/**
+ * Check customer password
+ */
+class CheckCustomerPassword
+{
+    /**
+     * @var AuthenticationInterface
+     */
+    private $authentication;
+
+    /**
+     * @param AuthenticationInterface $authentication
+     */
+    public function __construct(
+        AuthenticationInterface $authentication
+    ) {
+        $this->authentication = $authentication;
+    }
+
+    /**
+     * Check customer password
+     *
+     * @param string $password
+     * @param int $customerId
+     * @throws GraphQlAuthenticationException
+     */
+    public function execute(string $password, int $customerId)
+    {
+        try {
+            $this->authentication->authenticate($customerId, $password);
+        } catch (InvalidEmailOrPasswordException $e) {
+            throw new GraphQlAuthenticationException(
+                __('The password doesn\'t match this account. Verify the password and try again.')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
new file mode 100644
index 0000000000000..c8382593eab23
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Webapi\ServiceOutputProcessor;
+use Magento\Customer\Api\Data\CustomerInterface;
+
+/**
+ * Customer field data provider, used for GraphQL request processing.
+ */
+class CustomerDataProvider
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var ServiceOutputProcessor
+     */
+    private $serviceOutputProcessor;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param ServiceOutputProcessor $serviceOutputProcessor
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository,
+        ServiceOutputProcessor $serviceOutputProcessor,
+        SerializerInterface $serializer
+    ) {
+        $this->customerRepository = $customerRepository;
+        $this->serviceOutputProcessor = $serviceOutputProcessor;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Get customer data by Id or empty array
+     *
+     * @param int $customerId
+     * @return array
+     * @throws NoSuchEntityException|LocalizedException
+     */
+    public function getCustomerById(int $customerId): array
+    {
+        try {
+            $customer = $this->customerRepository->getById($customerId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Customer id "%customer_id" does not exist.', ['customer_id' => $customerId]),
+                $e
+            );
+        }
+        return $this->processCustomer($customer);
+    }
+
+    /**
+     * Curate default shipping and default billing keys
+     *
+     * @param array $arrayAddress
+     * @return array
+     */
+    private function curateAddressData(array $arrayAddress) : array
+    {
+        foreach ($arrayAddress as $key => $address) {
+            if (!isset($address['default_shipping'])) {
+                $arrayAddress[$key]['default_shipping'] = false;
+            }
+            if (!isset($address['default_billing'])) {
+                $arrayAddress[$key]['default_billing'] = false;
+            }
+        }
+        return $arrayAddress;
+    }
+
+    /**
+     * Transform single customer data from object to in array format
+     *
+     * @param CustomerInterface $customer
+     * @return array
+     */
+    private function processCustomer(CustomerInterface $customer): array
+    {
+        $customerData = $this->serviceOutputProcessor->process(
+            $customer,
+            CustomerRepositoryInterface::class,
+            'get'
+        );
+        $customerData['addresses'] = $this->curateAddressData($customerData['addresses']);
+        if (isset($customerData['extension_attributes'])) {
+            $customerData = array_merge($customerData, $customerData['extension_attributes']);
+        }
+        $customAttributes = [];
+        if (isset($customerData['custom_attributes'])) {
+            foreach ($customerData['custom_attributes'] as $attribute) {
+                $isArray = false;
+                if (is_array($attribute['value'])) {
+                    $isArray = true;
+                    foreach ($attribute['value'] as $attributeValue) {
+                        if (is_array($attributeValue)) {
+                            $customAttributes[$attribute['attribute_code']] = $this->serializer->serialize(
+                                $attribute['value']
+                            );
+                            continue;
+                        }
+                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
+                        continue;
+                    }
+                }
+                if ($isArray) {
+                    continue;
+                }
+                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
+            }
+        }
+        $customerData = array_merge($customerData, $customAttributes);
+
+        return $customerData;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
new file mode 100644
index 0000000000000..18510b872e64a
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Update customer data
+ */
+class UpdateCustomerData
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var CheckCustomerPassword
+     */
+    private $checkCustomerPassword;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param StoreManagerInterface $storeManager
+     * @param CheckCustomerPassword $checkCustomerPassword
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository,
+        StoreManagerInterface $storeManager,
+        CheckCustomerPassword $checkCustomerPassword
+    ) {
+        $this->customerRepository = $customerRepository;
+        $this->storeManager = $storeManager;
+        $this->checkCustomerPassword = $checkCustomerPassword;
+    }
+
+    /**
+     * Update account information
+     *
+     * @param int $customerId
+     * @param array $data
+     * @return void
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
+     * @throws GraphQlAlreadyExistsException
+     */
+    public function execute(int $customerId, array $data): void
+    {
+        $customer = $this->customerRepository->getById($customerId);
+
+        if (isset($data['firstname'])) {
+            $customer->setFirstname($data['firstname']);
+        }
+
+        if (isset($data['lastname'])) {
+            $customer->setLastname($data['lastname']);
+        }
+
+        if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
+            if (!isset($data['password']) || empty($data['password'])) {
+                throw new GraphQlInputException(__('Provide the current "password" to change "email".'));
+            }
+
+            $this->checkCustomerPassword->execute($data['password'], $customerId);
+            $customer->setEmail($data['email']);
+        }
+
+        $customer->setStoreId($this->storeManager->getStore()->getId());
+
+        try {
+            $this->customerRepository->save($customer);
+        } catch (AlreadyExistsException $e) {
+            throw new GraphQlAlreadyExistsException(
+                __('A customer with the same email address already exists in an associated website.'),
+                $e
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
new file mode 100644
index 0000000000000..78fa852a7ac59
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
+use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Change customer password resolver
+ */
+class ChangePassword implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var CheckCustomerPassword
+     */
+    private $checkCustomerPassword;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var CustomerDataProvider
+     */
+    private $customerDataProvider;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param CheckCustomerPassword $checkCustomerPassword
+     * @param AccountManagementInterface $accountManagement
+     * @param CustomerDataProvider $customerDataProvider
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        CheckCustomerPassword $checkCustomerPassword,
+        AccountManagementInterface $accountManagement,
+        CustomerDataProvider $customerDataProvider
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->checkCustomerPassword = $checkCustomerPassword;
+        $this->accountManagement = $accountManagement;
+        $this->customerDataProvider = $customerDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($args['currentPassword'])) {
+            throw new GraphQlInputException(__('Specify the "currentPassword" value.'));
+        }
+
+        if (!isset($args['newPassword'])) {
+            throw new GraphQlInputException(__('Specify the "newPassword" value.'));
+        }
+
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        $currentUserId = (int)$currentUserId;
+        $this->checkCustomerPassword->execute($args['currentPassword'], $currentUserId);
+
+        $this->accountManagement->changePasswordById($currentUserId, $args['currentPassword'], $args['newPassword']);
+
+        $data = $this->customerDataProvider->getCustomerById($currentUserId);
+        return $data;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
new file mode 100644
index 0000000000000..823444e5a2d7d
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressCreateDataValidator;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Customers address create, used for GraphQL request processing
+ */
+class CreateCustomerAddress implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressInterfaceFactory;
+
+    /**
+     * @var CustomerAddressDataProvider
+     */
+    private $customerAddressDataProvider;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var CustomerAddressCreateDataValidator
+     */
+    private $customerAddressCreateDataValidator;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param AddressRepositoryInterface $addressRepository
+     * @param AddressInterfaceFactory $addressInterfaceFactory
+     * @param CustomerAddressDataProvider $customerAddressDataProvider
+     * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        AddressRepositoryInterface $addressRepository,
+        AddressInterfaceFactory $addressInterfaceFactory,
+        CustomerAddressDataProvider $customerAddressDataProvider,
+        DataObjectHelper $dataObjectHelper,
+        CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->addressRepository = $addressRepository;
+        $this->addressInterfaceFactory = $addressInterfaceFactory;
+        $this->customerAddressDataProvider = $customerAddressDataProvider;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerAddressCreateDataValidator = $customerAddressCreateDataValidator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        $this->customerAddressCreateDataValidator->validate($args['input']);
+
+        $address = $this->createCustomerAddress((int)$currentUserId, $args['input']);
+        return $this->customerAddressDataProvider->getAddressData($address);
+    }
+
+    /**
+     * Create customer address
+     *
+     * @param int $customerId
+     * @param array $addressData
+     * @return AddressInterface
+     * @throws GraphQlInputException
+     */
+    private function createCustomerAddress(int $customerId, array $addressData) : AddressInterface
+    {
+        /** @var AddressInterface $address */
+        $address = $this->addressInterfaceFactory->create();
+        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
+        $address->setCustomerId($customerId);
+
+        try {
+            $address = $this->addressRepository->save($address);
+        } catch (InputException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+        return $address;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
new file mode 100644
index 0000000000000..c3c78a1004da6
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Customers field resolver, used for GraphQL request processing.
+ */
+class Customer implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var CustomerDataProvider
+     */
+    private $customerDataProvider;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param CustomerDataProvider $customerDataProvider
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        CustomerDataProvider $customerDataProvider
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->customerDataProvider = $customerDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        $currentUserId = (int)$currentUserId;
+        $data = $this->customerDataProvider->getCustomerById($currentUserId);
+        return $data;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
new file mode 100644
index 0000000000000..084857c84d5a4
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+
+/**
+ * Customers address delete, used for GraphQL request processing.
+ */
+class DeleteCustomerAddress implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var GetCustomerAddressForUser
+     */
+    private $getCustomerAddressForUser;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param AddressRepositoryInterface $addressRepository
+     * @param GetCustomerAddressForUser $getCustomerAddressForUser
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        AddressRepositoryInterface $addressRepository,
+        GetCustomerAddressForUser $getCustomerAddressForUser
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->addressRepository = $addressRepository;
+        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        return $this->deleteCustomerAddress((int)$currentUserId, (int)$args['id']);
+    }
+
+    /**
+     * Delete customer address
+     *
+     * @param int $customerId
+     * @param int $addressId
+     * @return bool
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function deleteCustomerAddress($customerId, $addressId)
+    {
+        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
+        if ($address->isDefaultBilling()) {
+            throw new GraphQlAuthorizationException(
+                __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
+            );
+        }
+        if ($address->isDefaultShipping()) {
+            throw new GraphQlAuthorizationException(
+                __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
+            );
+        }
+        return $this->addressRepository->delete($address);
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php
new file mode 100644
index 0000000000000..1bd77fe1cde8f
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/GenerateCustomerToken.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+/**
+ * Customers Token resolver, used for GraphQL request processing.
+ */
+class GenerateCustomerToken implements ResolverInterface
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @param CustomerTokenServiceInterface $customerTokenService
+     */
+    public function __construct(
+        CustomerTokenServiceInterface $customerTokenService
+    ) {
+        $this->customerTokenService = $customerTokenService;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($args['email'])) {
+            throw new GraphQlInputException(__('Specify the "email" value.'));
+        }
+
+        if (!isset($args['password'])) {
+            throw new GraphQlInputException(__('Specify the "password" value.'));
+        }
+
+        try {
+            $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']);
+            return ['token' => $token];
+        } catch (AuthenticationException $e) {
+            throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
new file mode 100644
index 0000000000000..c0bd864b3ee09
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
+
+/**
+ * Customer is_subscribed field resolver
+ */
+class IsSubscribed implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param SubscriberFactory $subscriberFactory
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        SubscriberFactory $subscriberFactory
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->subscriberFactory = $subscriberFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$currentUserId)->isSubscribed();
+        return (bool)$status;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
new file mode 100644
index 0000000000000..3301162dc0088
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+/**
+ * Customers Revoke Token resolver, used for GraphQL request processing.
+ */
+class RevokeCustomerToken implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param CustomerTokenServiceInterface $customerTokenService
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        CustomerTokenServiceInterface $customerTokenService
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->customerTokenService = $customerTokenService;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        return ['result' => $this->customerTokenService->revokeCustomerAccessToken((int)$currentUserId)];
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
new file mode 100644
index 0000000000000..50760d2e2e31c
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerData;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Update customer data resolver
+ */
+class UpdateCustomer implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var UpdateCustomerData
+     */
+    private $updateCustomerData;
+
+    /**
+     * @var ChangeSubscriptionStatus
+     */
+    private $changeSubscriptionStatus;
+
+    /**
+     * @var CustomerDataProvider
+     */
+    private $customerDataProvider;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param UpdateCustomerData $updateCustomerData
+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
+     * @param CustomerDataProvider $customerDataProvider
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        UpdateCustomerData $updateCustomerData,
+        ChangeSubscriptionStatus $changeSubscriptionStatus,
+        CustomerDataProvider $customerDataProvider
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->updateCustomerData = $updateCustomerData;
+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
+        $this->customerDataProvider = $customerDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
+            throw new GraphQlInputException(__('"input" value should be specified'));
+        }
+
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        $currentUserId = (int)$currentUserId;
+        $this->updateCustomerData->execute($currentUserId, $args['input']);
+
+        if (isset($args['input']['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute($currentUserId, (bool)$args['input']['is_subscribed']);
+        }
+
+        $data = $this->customerDataProvider->getCustomerById($currentUserId);
+        return ['customer' => $data];
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
new file mode 100644
index 0000000000000..7bae40e4cc5de
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressUpdateDataValidator;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Customers address update, used for GraphQL request processing
+ */
+class UpdateCustomerAddress implements ResolverInterface
+{
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var CustomerAddressDataProvider
+     */
+    private $customerAddressDataProvider;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var CustomerAddressUpdateDataValidator
+     */
+    private $customerAddressUpdateDataValidator;
+
+    /**
+     * @var GetCustomerAddressForUser
+     */
+    private $getCustomerAddressForUser;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param AddressRepositoryInterface $addressRepository
+     * @param CustomerAddressDataProvider $customerAddressDataProvider
+     * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator
+     * @param GetCustomerAddressForUser $getCustomerAddressForUser
+     */
+    public function __construct(
+        CheckCustomerAccount $checkCustomerAccount,
+        AddressRepositoryInterface $addressRepository,
+        CustomerAddressDataProvider $customerAddressDataProvider,
+        DataObjectHelper $dataObjectHelper,
+        CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator,
+        GetCustomerAddressForUser $getCustomerAddressForUser
+    ) {
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->addressRepository = $addressRepository;
+        $this->customerAddressDataProvider = $customerAddressDataProvider;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerAddressUpdateDataValidator = $customerAddressUpdateDataValidator;
+        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        $this->customerAddressUpdateDataValidator->validate($args['input']);
+
+        $address = $this->updateCustomerAddress((int)$currentUserId, (int)$args['id'], $args['input']);
+        return $this->customerAddressDataProvider->getAddressData($address);
+    }
+
+    /**
+     * Update customer address
+     *
+     * @param int $customerId
+     * @param int $addressId
+     * @param array $addressData
+     * @return AddressInterface
+     */
+    private function updateCustomerAddress(int $customerId, int $addressId, array $addressData)
+    {
+        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
+        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
+        return $this->addressRepository->save($address);
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/README.md b/app/code/Magento/CustomerGraphQl/README.md
new file mode 100644
index 0000000000000..586412e413889
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/README.md
@@ -0,0 +1,4 @@
+# CustomerGraphQl
+
+**CustomerGraphQl** provides type and resolver information for the GraphQl module
+to generate customer information endpoints.
diff --git a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ae023224f4d9b
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Customer Graph Ql** module.
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
new file mode 100644
index 0000000000000..722aba3aa0658
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -0,0 +1,30 @@
+{
+  "name": "magento/module-customer-graph-ql",
+  "description": "N/A",
+  "type": "magento2-module",
+  "require": {
+    "php": "~7.1.3||~7.2.0",
+    "magento/module-customer": "*",
+    "magento/module-authorization": "*",
+    "magento/module-eav": "*",
+    "magento/module-newsletter": "*",
+    "magento/module-integration": "*",
+    "magento/module-store": "*",
+    "magento/framework": "*"
+  },
+  "suggest": {
+    "magento/module-graph-ql": "*"
+  },
+  "license": [
+    "OSL-3.0",
+    "AFL-3.0"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Magento\\CustomerGraphQl\\": ""
+    }
+  }
+}
diff --git a/app/code/Magento/CustomerGraphQl/etc/module.xml b/app/code/Magento/CustomerGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..eeed4862bbbfd
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CustomerGraphQl"/>
+</config>
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..c92753b96225c
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -0,0 +1,368 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    customer: Customer @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Customer") @doc(description: "The customer query returns information about a customer account")
+}
+
+type Mutation {
+    generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve the customer token")
+    changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
+    updateCustomer (input: UpdateCustomerInput!): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
+    revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
+    createCustomerAddress(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomerAddress") @doc(description: "Create customer address")
+    updateCustomerAddress(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerAddress") @doc(description: "Update customer address")
+    deleteCustomerAddress(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\DeleteCustomerAddress") @doc(description: "Delete customer address")
+}
+
+input CustomerAddressInput {
+    firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
+    lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
+    company: String @doc(description: "The customer's company")
+    telephone: String @doc(description: "The telephone number")
+    street: [String] @doc(description: "An array of strings that define the street number and name")
+    city: String @doc(description: "The city or town")
+    region: CustomerAddressRegionInput @doc(description: "An object containing the region name, region code, and region ID")
+    postcode: String @doc(description: "The customer's ZIP or postal code")
+    country_id: CountryCodeEnum @doc(description: "The customer's country")
+    default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
+    default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+    fax: String @doc(description: "The fax number")
+    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+    custom_attributes: [CustomerAddressAttributeInput] @doc(description: "Address custom attributes")
+}
+
+input CustomerAddressRegionInput @doc(description: "CustomerAddressRegionInput defines the customer's state or province") {
+    region_code: String @doc(description: "The address region code")
+    region: String @doc(description: "The state or province name")
+    region_id: Int @doc(description: "Uniquely identifies the region")
+}
+
+input CustomerAddressAttributeInput {
+    attribute_code: String! @doc(description: "Attribute code")
+    value: String! @doc(description: "Attribute value")
+}
+
+type CustomerToken {
+    token: String @doc(description: "The customer token")
+}
+
+input UpdateCustomerInput {
+    firstname: String
+    lastname: String
+    email: String
+    password: String
+    is_subscribed: Boolean
+}
+
+type UpdateCustomerOutput {
+    customer: Customer!
+}
+
+type RevokeCustomerTokenOutput {
+    result: Boolean!
+}
+
+type Customer @doc(description: "Customer defines the customer name and address and other details") {
+    created_at: String @doc(description: "Timestamp indicating when the account was created")
+    group_id: Int @doc(description: "The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    firstname: String @doc(description: "The customer's first name")
+    middlename: String @doc(description: "The customer's middle name")
+    lastname: String @doc(description: "The customer's family name")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    email: String @doc(description: "The customer's email address. Required")
+    default_billing: String @doc(description: "The ID assigned to the billing address")
+    default_shipping: String @doc(description: "The ID assigned to the shipping address")
+    dob: String @doc(description: "The customer's date of birth")
+    taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+    id: Int @doc(description: "The ID assigned to the customer")
+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed")
+    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses")
+}
+
+type CustomerAddress @doc(description: "CustomerAddress contains detailed information about a customer's billing and shipping addresses"){
+    id: Int @doc(description: "The ID assigned to the address object")
+    customer_id: Int @doc(description: "The customer ID")
+    region: CustomerAddressRegion @doc(description: "An object containing the region name, region code, and region ID")
+    region_id: Int @doc(description: "A number that uniquely identifies the state, province, or other area")
+    country_id: String @doc(description: "The customer's country")
+    street: [String] @doc(description: "An array of strings that define the street number and name")
+    company: String @doc(description: "The customer's company")
+    telephone: String @doc(description: "The telephone number")
+    fax: String @doc(description: "The fax number")
+    postcode: String @doc(description: "The customer's ZIP or postal code")
+    city: String @doc(description: "The city or town")
+    firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
+    lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
+    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+    default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
+    default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+    custom_attributes: [CustomerAddressAttribute] @doc(description: "Address custom attributes")
+    extension_attributes: [CustomerAddressAttribute] @doc(description: "Address extension attributes")
+}
+
+type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the customer's state or province") {
+    region_code: String @doc(description: "The address region code")
+    region: String @doc(description: "The state or province name")
+    region_id: Int @doc(description: "Uniquely identifies the region")
+}
+
+type CustomerAddressAttribute {
+     attribute_code: String  @doc(description: "Attribute code")
+     value: String  @doc(description: "Attribute value")
+}
+
+enum CountryCodeEnum @doc(description: "The list of countries codes") {
+    AF @doc(description: "Afghanistan")
+    AX @doc(description: "Åland Islands")
+    AL @doc(description: "Albania")
+    DZ @doc(description: "Algeria")
+    AS @doc(description: "American Samoa")
+    AD @doc(description: "Andorra")
+    AO @doc(description: "Angola")
+    AI @doc(description: "Anguilla")
+    AQ @doc(description: "Antarctica")
+    AG @doc(description: "Antigua & Barbuda")
+    AR @doc(description: "Argentina")
+    AM @doc(description: "Armenia")
+    AW @doc(description: "Aruba")
+    AU @doc(description: "Australia")
+    AT @doc(description: "Austria")
+    AZ @doc(description: "Azerbaijan")
+    BS @doc(description: "Bahamas")
+    BH @doc(description: "Bahrain")
+    BD @doc(description: "Bangladesh")
+    BB @doc(description: "Barbados")
+    BY @doc(description: "Belarus")
+    BE @doc(description: "Belgium")
+    BZ @doc(description: "Belize")
+    BJ @doc(description: "Benin")
+    BM @doc(description: "Bermuda")
+    BT @doc(description: "Bhutan")
+    BO @doc(description: "Bolivia")
+    BA @doc(description: "Bosnia & Herzegovina")
+    BW @doc(description: "Botswana")
+    BV @doc(description: "Bouvet Island")
+    BR @doc(description: "Brazil")
+    IO @doc(description: "British Indian Ocean Territory")
+    VG @doc(description: "British Virgin Islands")
+    BN @doc(description: "Brunei")
+    BG @doc(description: "Bulgaria")
+    BF @doc(description: "Burkina Faso")
+    BI @doc(description: "Burundi")
+    KH @doc(description: "Cambodia")
+    CM @doc(description: "Cameroon")
+    CA @doc(description: "Canada")
+    CV @doc(description: "Cape Verde")
+    KY @doc(description: "Cayman Islands")
+    CF @doc(description: "Central African Republic")
+    TD @doc(description: "Chad")
+    CL @doc(description: "Chile")
+    CN @doc(description: "China")
+    CX @doc(description: "Christmas Island")
+    CC @doc(description: "Cocos (Keeling) Islands")
+    CO @doc(description: "Colombia")
+    KM @doc(description: "Comoros")
+    CG @doc(description: "Congo -Brazzaville")
+    CD @doc(description: "Congo - Kinshasa")
+    CK @doc(description: "Cook Islands")
+    CR @doc(description: "Costa Rica")
+    CI @doc(description: "Côte d’Ivoire")
+    HR @doc(description: "Croatia")
+    CU @doc(description: "Cuba")
+    CY @doc(description: "Cyprus")
+    CZ @doc(description: "Czech Republic")
+    DK @doc(description: "Denmark")
+    DJ @doc(description: "Djibouti")
+    DM @doc(description: "Dominica")
+    DO @doc(description: "Dominican Republic")
+    EC @doc(description: "Ecuador")
+    EG @doc(description: "Egypt")
+    SV @doc(description: "El Salvador")
+    GQ @doc(description: "Equatorial Guinea")
+    ER @doc(description: "Eritrea")
+    EE @doc(description: "Estonia")
+    ET @doc(description: "Ethiopia")
+    FK @doc(description: "Falkland Islands")
+    FO @doc(description: "Faroe Islands")
+    FJ @doc(description: "Fiji")
+    FI @doc(description: "Finland")
+    FR @doc(description: "France")
+    GF @doc(description: "French Guiana")
+    PF @doc(description: "French Polynesia")
+    TF @doc(description: "French Southern Territories")
+    GA @doc(description: "Gabon")
+    GM @doc(description: "Gambia")
+    GE @doc(description: "Georgia")
+    DE @doc(description: "Germany")
+    GH @doc(description: "Ghana")
+    GI @doc(description: "Gibraltar")
+    GR @doc(description: "Greece")
+    GL @doc(description: "Greenland")
+    GD @doc(description: "Grenada")
+    GP @doc(description: "Guadeloupe")
+    GU @doc(description: "Guam")
+    GT @doc(description: "Guatemala")
+    GG @doc(description: "Guernsey")
+    GN @doc(description: "Guinea")
+    GW @doc(description: "Guinea-Bissau")
+    GY @doc(description: "Guyana")
+    HT @doc(description: "Haiti")
+    HM @doc(description: "Heard &amp; McDonald Islands")
+    HN @doc(description: "Honduras")
+    HK @doc(description: "Hong Kong SAR China")
+    HU @doc(description: "Hungary")
+    IS @doc(description: "Iceland")
+    IN @doc(description: "India")
+    ID @doc(description: "Indonesia")
+    IR @doc(description: "Iran")
+    IQ @doc(description: "Iraq")
+    IE @doc(description: "Ireland")
+    IM @doc(description: "Isle of Man")
+    IL @doc(description: "Israel")
+    IT @doc(description: "Italy")
+    JM @doc(description: "Jamaica")
+    JP @doc(description: "Japan")
+    JE @doc(description: "Jersey")
+    JO @doc(description: "Jordan")
+    KZ @doc(description: "Kazakhstan")
+    KE @doc(description: "Kenya")
+    KI @doc(description: "Kiribati")
+    KW @doc(description: "Kuwait")
+    KG @doc(description: "Kyrgyzstan")
+    LA @doc(description: "Laos")
+    LV @doc(description: "Latvia")
+    LB @doc(description: "Lebanon")
+    LS @doc(description: "Lesotho")
+    LR @doc(description: "Liberia")
+    LY @doc(description: "Libya")
+    LI @doc(description: "Liechtenstein")
+    LT @doc(description: "Lithuania")
+    LU @doc(description: "Luxembourg")
+    MO @doc(description: "Macau SAR China")
+    MK @doc(description: "Macedonia")
+    MG @doc(description: "Madagascar")
+    MW @doc(description: "Malawi")
+    MY @doc(description: "Malaysia")
+    MV @doc(description: "Maldives")
+    ML @doc(description: "Mali")
+    MT @doc(description: "Malta")
+    MH @doc(description: "Marshall Islands")
+    MQ @doc(description: "Martinique")
+    MR @doc(description: "Mauritania")
+    MU @doc(description: "Mauritius")
+    YT @doc(description: "Mayotte")
+    MX @doc(description: "Mexico")
+    FM @doc(description: "Micronesia")
+    MD @doc(description: "Moldova")
+    MC @doc(description: "Monaco")
+    MN @doc(description: "Mongolia")
+    ME @doc(description: "Montenegro")
+    MS @doc(description: "Montserrat")
+    MA @doc(description: "Morocco")
+    MZ @doc(description: "Mozambique")
+    MM @doc(description: "Myanmar (Burma)")
+    NA @doc(description: "Namibia")
+    NR @doc(description: "Nauru")
+    NP @doc(description: "Nepal")
+    NL @doc(description: "Netherlands")
+    AN @doc(description: "Netherlands Antilles")
+    NC @doc(description: "New Caledonia")
+    NZ @doc(description: "New Zealand")
+    NI @doc(description: "Nicaragua")
+    NE @doc(description: "Niger")
+    NG @doc(description: "Nigeria")
+    NU @doc(description: "Niue")
+    NF @doc(description: "Norfolk Island")
+    MP @doc(description: "Northern Mariana Islands")
+    KP @doc(description: "North Korea")
+    NO @doc(description: "Norway")
+    OM @doc(description: "Oman")
+    PK @doc(description: "Pakistan")
+    PW @doc(description: "Palau")
+    PS @doc(description: "Palestinian Territories")
+    PA @doc(description: "Panama")
+    PG @doc(description: "Papua New Guinea")
+    PY @doc(description: "Paraguay")
+    PE @doc(description: "Peru")
+    PH @doc(description: "Philippines")
+    PN @doc(description: "Pitcairn Islands")
+    PL @doc(description: "Poland")
+    PT @doc(description: "Portugal")
+    QA @doc(description: "Qatar")
+    RE @doc(description: "Réunion")
+    RO @doc(description: "Romania")
+    RU @doc(description: "Russia")
+    RW @doc(description: "Rwanda")
+    WS @doc(description: "Samoa")
+    SM @doc(description: "San Marino")
+    ST @doc(description: "São Tomé & Príncipe")
+    SA @doc(description: "Saudi Arabia")
+    SN @doc(description: "Senegal")
+    RS @doc(description: "Serbia")
+    SC @doc(description: "Seychelles")
+    SL @doc(description: "Sierra Leone")
+    SG @doc(description: "Singapore")
+    SK @doc(description: "Slovakia")
+    SI @doc(description: "Slovenia")
+    SB @doc(description: "Solomon Islands")
+    SO @doc(description: "Somalia")
+    ZA @doc(description: "South Africa")
+    GS @doc(description: "South Georgia & South Sandwich Islands")
+    KR @doc(description: "South Korea")
+    ES @doc(description: "Spain")
+    LK @doc(description: "Sri Lanka")
+    BL @doc(description: "St. Barthélemy")
+    SH @doc(description: "St. Helena")
+    KN @doc(description: "St. Kitts & Nevis")
+    LC @doc(description: "St. Lucia")
+    MF @doc(description: "St. Martin")
+    PM @doc(description: "St. Pierre & Miquelon")
+    VC @doc(description: "St. Vincent & Grenadines")
+    SD @doc(description: "Sudan")
+    SR @doc(description: "Suriname")
+    SJ @doc(description: "Svalbard & Jan Mayen")
+    SZ @doc(description: "Swaziland")
+    SE @doc(description: "Sweden")
+    CH @doc(description: "Switzerland")
+    SY @doc(description: "Syria")
+    TW @doc(description: "Taiwan")
+    TJ @doc(description: "Tajikistan")
+    TZ @doc(description: "Tanzania")
+    TH @doc(description: "Thailand")
+    TL @doc(description: "Timor-Leste")
+    TG @doc(description: "Togo")
+    TK @doc(description: "Tokelau")
+    TO @doc(description: "Tonga")
+    TT @doc(description: "Trinidad & Tobago")
+    TN @doc(description: "Tunisia")
+    TR @doc(description: "Turkey")
+    TM @doc(description: "Turkmenistan")
+    TC @doc(description: "Turks & Caicos Islands")
+    TV @doc(description: "Tuvalu")
+    UG @doc(description: "Uganda")
+    UA @doc(description: "Ukraine")
+    AE @doc(description: "United Arab Emirates")
+    GB @doc(description: "United Kingdom")
+    US @doc(description: "United States")
+    UY @doc(description: "Uruguay")
+    UM @doc(description: "U.S. Outlying Islands")
+    VI @doc(description: "U.S. Virgin Islands")
+    UZ @doc(description: "Uzbekistan")
+    VU @doc(description: "Vanuatu")
+    VA @doc(description: "Vatican City")
+    VE @doc(description: "Venezuela")
+    VN @doc(description: "Vietnam")
+    WF @doc(description: "Wallis & Futuna")
+    EH @doc(description: "Western Sahara")
+    YE @doc(description: "Yemen")
+    ZM @doc(description: "Zambia")
+    ZW @doc(description: "Zimbabwe")
+}
\ No newline at end of file
diff --git a/app/code/Magento/CustomerGraphQl/registration.php b/app/code/Magento/CustomerGraphQl/registration.php
new file mode 100644
index 0000000000000..059a210052065
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CustomerGraphQl', __DIR__);
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
index 14f0ae324e0a4..9ea9e1e5bd93d 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -15,7 +15,7 @@
  */
 class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 {
-    /**#@+
+    /**
      * Permanent column names.
      *
      * Names that begins with underscore is not an attribute. This name convention is for
@@ -27,23 +27,19 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 
     const COLUMN_STORE = '_store';
 
-    /**#@-*/
-
-    /**#@+
+    /**
      * Attribute collection name
      */
     const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
 
-    /**#@-*/
-
-    /**#@+
+    /**
      * XML path to page size parameter
      */
     const XML_PATH_PAGE_SIZE = 'export/customer_page_size/customer';
 
-    /**#@-*/
-
-    /**#@-*/
+    /**
+     * @var array
+     */
     protected $_attributeOverrides = [
         'created_at' => ['backend_type' => 'datetime'],
         'reward_update_notification' => ['source_model' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class],
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index 1d78c4e5bc20e..cc6eebed57b1d 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CustomerImportExport\Model\Import;
 
 use Magento\ImportExport\Model\Import;
@@ -122,7 +123,10 @@ public function __construct(
         );
 
         $this->addMessageTemplate(self::ERROR_WEBSITE_IS_EMPTY, __('Please specify a website.'));
-        $this->addMessageTemplate(self::ERROR_EMAIL_IS_EMPTY, __('Please specify an email.'));
+        $this->addMessageTemplate(
+            self::ERROR_EMAIL_IS_EMPTY,
+            __("An email wasn't specified. Enter the email and try again.")
+        );
         $this->addMessageTemplate(self::ERROR_INVALID_WEBSITE, __('We found an invalid value in a website column.'));
         $this->addMessageTemplate(self::ERROR_INVALID_EMAIL, __('Please enter a valid email.'));
         $this->addMessageTemplate(self::ERROR_VALUE_IS_REQUIRED, __('Please make sure attribute "%s" is not empty.'));
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 7d44ef079d152..7a1a09efaa7b6 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -5,13 +5,20 @@
  */
 namespace Magento\CustomerImportExport\Model\Import;
 
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites as CountryWithWebsitesSource;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ObjectManager;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Store\Model\Store;
+use Magento\CustomerImportExport\Model\ResourceModel\Import\Address\Storage as AddressStorage;
+use Magento\ImportExport\Model\Import\AbstractSource;
 
 /**
  * Customer address import
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class Address extends AbstractCustomer
 {
@@ -80,20 +87,6 @@ class Address extends AbstractCustomer
      */
     protected $_permanentAttributes = [self::COLUMN_WEBSITE, self::COLUMN_EMAIL, self::COLUMN_ADDRESS_ID];
 
-    /**
-     * Existing addresses
-     *
-     * Example Array: [customer ID] => array(
-     *     address ID 1,
-     *     address ID 2,
-     *     ...
-     *     address ID N
-     * )
-     *
-     * @var array
-     */
-    protected $_addresses = [];
-
     /**
      * Attributes with index (not label) value
      *
@@ -108,6 +101,13 @@ class Address extends AbstractCustomer
      */
     protected $_entityTable;
 
+    /**
+     * Region collection instance
+     *
+     * @var \Magento\Directory\Model\ResourceModel\Region\Collection
+     */
+    private $_regionCollection;
+
     /**
      * Countries and regions
      *
@@ -175,13 +175,6 @@ class Address extends AbstractCustomer
      */
     protected $_attributeCollection;
 
-    /**
-     * Collection of existent addresses
-     *
-     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
-     */
-    protected $_addressCollection;
-
     /**
      * Store imported row primary keys
      *
@@ -235,6 +228,23 @@ class Address extends AbstractCustomer
      */
     protected $postcodeValidator;
 
+    /**
+     * @var CountryWithWebsitesSource
+     */
+    private $countryWithWebsites;
+
+    /**
+     * Options for certain attributes sorted by websites.
+     *
+     * @var array[][] With path as <attributeCode> => <websiteID> => options[].
+     */
+    private $optionsByWebsite = [];
+
+    /**
+     * @var AddressStorage
+     */
+    private $addressStorage;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -249,11 +259,12 @@ class Address extends AbstractCustomer
      * @param \Magento\Customer\Model\AddressFactory $addressFactory
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionColFactory
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
-     * @param \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressColFactory
      * @param \Magento\Customer\Model\ResourceModel\Address\Attribute\CollectionFactory $attributesFactory
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Customer\Model\Address\Validator\Postcode $postcodeValidator
      * @param array $data
+     * @param CountryWithWebsitesSource|null $countryWithWebsites
+     * @param AddressStorage|null $addressStorage
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -272,11 +283,12 @@ public function __construct(
         \Magento\Customer\Model\AddressFactory $addressFactory,
         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionColFactory,
         \Magento\Customer\Model\CustomerFactory $customerFactory,
-        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressColFactory,
         \Magento\Customer\Model\ResourceModel\Address\Attribute\CollectionFactory $attributesFactory,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Customer\Model\Address\Validator\Postcode $postcodeValidator,
-        array $data = []
+        array $data = [],
+        CountryWithWebsitesSource $countryWithWebsites = null,
+        AddressStorage $addressStorage = null
     ) {
         $this->_customerFactory = $customerFactory;
         $this->_addressFactory = $addressFactory;
@@ -284,6 +296,8 @@ public function __construct(
         $this->_resourceHelper = $resourceHelper;
         $this->dateTime = $dateTime;
         $this->postcodeValidator = $postcodeValidator;
+        $this->countryWithWebsites = $countryWithWebsites ?:
+            ObjectManager::getInstance()->get(CountryWithWebsitesSource::class);
 
         if (!isset($data['attribute_collection'])) {
             /** @var $attributeCollection \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection */
@@ -305,9 +319,6 @@ public function __construct(
             $data
         );
 
-        $this->_addressCollection = isset(
-            $data['address_collection']
-        ) ? $data['address_collection'] : $addressColFactory->create();
         $this->_entityTable = isset(
             $data['entity_table']
         ) ? $data['entity_table'] : $addressFactory->create()->getResource()->getEntityTable();
@@ -325,9 +336,66 @@ public function __construct(
             self::ERROR_DUPLICATE_PK,
             __('We found another row with this email, website and address ID combination.')
         );
+        $this->addressStorage = $addressStorage
+            ?: ObjectManager::getInstance()->get(AddressStorage::class);
 
         $this->_initAttributes();
-        $this->_initAddresses()->_initCountryRegions();
+        $this->_initCountryRegions();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAttributeOptions(AbstractAttribute $attribute, array $indexAttributes = [])
+    {
+        $standardOptions = parent::getAttributeOptions($attribute, $indexAttributes);
+
+        if ($attribute->getAttributeCode() === 'country_id') {
+            //If we want to get available options for country field then we have to use alternative source
+            // to get actual data for each website.
+            $options = $this->countryWithWebsites->getAllOptions();
+            //Available country options now will be sorted by websites.
+            $code = $attribute->getAttributeCode();
+            $websiteOptions = [Store::DEFAULT_STORE_ID => $standardOptions];
+            //Sorting options by website.
+            foreach ($options as $option) {
+                if (array_key_exists('website_ids', $option)) {
+                    foreach ($option['website_ids'] as $websiteId) {
+                        if (!array_key_exists($websiteId, $websiteOptions)) {
+                            $websiteOptions[$websiteId] = [];
+                        }
+                        $optionId = mb_strtolower($option['value']);
+                        $websiteOptions[$websiteId][$optionId] = $option['value'];
+                    }
+                }
+            }
+            //Storing sorted
+            $this->optionsByWebsite[$code] = $websiteOptions;
+        }
+
+        return $standardOptions;
+    }
+
+    /**
+     * Attributes' data may vary depending on website settings,
+     * this method adjusts an attribute's data from $this->_attributes to
+     * website-specific data.
+     *
+     * @param array $attributeData Data from $this->_attributes.
+     * @param int $websiteId
+     *
+     * @return array Adjusted data in the same format.
+     */
+    private function adjustAttributeDataForWebsite(array $attributeData, int $websiteId): array
+    {
+        if ($attributeData['code'] === 'country_id') {
+            $attributeOptions = $this->optionsByWebsite[$attributeData['code']];
+            if (array_key_exists($websiteId, $attributeOptions)) {
+                $attributeData['options'] = $attributeOptions[$websiteId];
+            }
+        }
+
+        return $attributeData;
     }
 
     /**
@@ -359,27 +427,6 @@ protected function _getNextEntityId()
         return $this->_nextEntityId++;
     }
 
-    /**
-     * Initialize existent addresses data
-     *
-     * @return $this
-     */
-    protected function _initAddresses()
-    {
-        /** @var $address \Magento\Customer\Model\Address */
-        foreach ($this->_addressCollection as $address) {
-            $customerId = $address->getParentId();
-            if (!isset($this->_addresses[$customerId])) {
-                $this->_addresses[$customerId] = [];
-            }
-            $addressId = $address->getId();
-            if (!in_array($addressId, $this->_addresses[$customerId])) {
-                $this->_addresses[$customerId][] = $addressId;
-            }
-        }
-        return $this;
-    }
-
     /**
      * Initialize country regions hash for clever recognition
      *
@@ -399,6 +446,56 @@ protected function _initCountryRegions()
         return $this;
     }
 
+    /**
+     * Pre-loading customers for existing customers checks in order
+     * to perform mass validation/import efficiently.
+     * Also loading existing addresses for requested customers.
+     *
+     * @param array|AbstractSource $rows Each row must contain data from columns email
+     * and website code.
+     *
+     * @return void
+     */
+    public function prepareCustomerData($rows): void
+    {
+        $customersPresent = [];
+        foreach ($rows as $rowData) {
+            $email = $rowData[static::COLUMN_EMAIL] ?? null;
+            $websiteId = isset($rowData[static::COLUMN_WEBSITE])
+                ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false;
+            if ($email && $websiteId !== false) {
+                $customersPresent[] = [
+                    'email' => $email,
+                    'website_id' => $websiteId,
+                ];
+            }
+        }
+        $this->getCustomerStorage()->prepareCustomers($customersPresent);
+
+        $ids = [];
+        foreach ($customersPresent as $customerData) {
+            $id = $this->getCustomerStorage()->getCustomerId(
+                $customerData['email'],
+                $customerData['website_id']
+            );
+            if ($id) {
+                $ids[] = $id;
+            }
+        }
+
+        $this->addressStorage->prepareAddresses($ids);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateData()
+    {
+        $this->prepareCustomerData($this->getSource());
+
+        return parent::validateData();
+    }
+
     /**
      * Import data rows
      *
@@ -408,6 +505,16 @@ protected function _initCountryRegions()
      */
     protected function _importData()
     {
+        //Preparing data for mass validation/import.
+        $rows = [];
+        while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+            $rows = array_merge($rows, $bunch);
+        }
+        $this->prepareCustomerData($rows);
+        unset($bunch, $rows);
+        $this->_dataSourceModel->getIterator()->rewind();
+
+        //Importing
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $newRows = [];
             $updateRows = [];
@@ -442,14 +549,9 @@ protected function _importData()
             }
             $this->updateItemsCounterStats($newRows, $updateRows, $deleteRowIds);
 
-            $this->_saveAddressEntities(
-                $newRows,
-                $updateRows
-            )->_saveAddressAttributes(
-                $attributes
-            )->_saveCustomerDefaults(
-                $defaults
-            );
+            $this->_saveAddressEntities($newRows, $updateRows)
+                ->_saveAddressAttributes($attributes)
+                ->_saveCustomerDefaults($defaults);
 
             $this->_deleteAddressEntities($deleteRowIds);
         }
@@ -483,7 +585,7 @@ protected function _mergeEntityAttributes(array $newAttributes, array $attribute
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function _prepareDataForUpdate(array $rowData)
+    protected function _prepareDataForUpdate(array $rowData):array
     {
         $multiSeparator = $this->getMultipleValueSeparator();
         $email = strtolower($rowData[self::COLUMN_EMAIL]);
@@ -497,12 +599,11 @@ protected function _prepareDataForUpdate(array $rowData)
         $defaults = [];
         $newAddress = true;
         // get address id
-        if (isset(
-            $this->_addresses[$customerId]
-        ) && in_array(
-            $rowData[self::COLUMN_ADDRESS_ID],
-            $this->_addresses[$customerId]
-        )
+        if ($rowData[self::COLUMN_ADDRESS_ID]
+            && $this->addressStorage->doesExist(
+                $rowData[self::COLUMN_ADDRESS_ID],
+                (string)$customerId
+            )
         ) {
             $newAddress = false;
             $addressId = $rowData[self::COLUMN_ADDRESS_ID];
@@ -514,8 +615,12 @@ protected function _prepareDataForUpdate(array $rowData)
             'parent_id' => $customerId,
             'updated_at' => (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
         ];
+        $websiteId = $this->_websiteCodeToId[$rowData[self::COLUMN_WEBSITE]];
+
         foreach ($this->_attributes as $attributeAlias => $attributeParams) {
             if (array_key_exists($attributeAlias, $rowData)) {
+                $attributeParams = $this->adjustAttributeDataForWebsite($attributeParams, $websiteId);
+
                 if (!strlen($rowData[$attributeAlias])) {
                     if ($newAddress) {
                         $value = null;
@@ -683,7 +788,7 @@ public static function getDefaultAddressAttributeMapping()
     }
 
     /**
-     * check if address for import is empty (for customer composite mode)
+     * Check if address for import is empty (for customer composite mode)
      *
      * @param array $rowData
      * @return array
@@ -734,6 +839,9 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 } else {
                     // check simple attributes
                     foreach ($this->_attributes as $attributeCode => $attributeParams) {
+                        $websiteId = $this->_websiteCodeToId[$website];
+                        $attributeParams = $this->adjustAttributeDataForWebsite($attributeParams, $websiteId);
+
                         if (in_array($attributeCode, $this->_ignoredAttributes)) {
                             continue;
                         }
@@ -745,12 +853,11 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                                 $rowNumber,
                                 $multiSeparator
                             );
-                        } elseif ($attributeParams['is_required'] && (!isset(
-                            $this->_addresses[$customerId]
-                        ) || !in_array(
-                            $addressId,
-                            $this->_addresses[$customerId]
-                        ))
+                        } elseif ($attributeParams['is_required']
+                            && !$this->addressStorage->doesExist(
+                                (string)$addressId,
+                                (string)$customerId
+                            )
                         ) {
                             $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
                         }
@@ -805,7 +912,10 @@ protected function _validateRowForDelete(array $rowData, $rowNumber)
             } else {
                 if (!strlen($addressId)) {
                     $this->addRowError(self::ERROR_ADDRESS_ID_IS_EMPTY, $rowNumber);
-                } elseif (!in_array($addressId, $this->_addresses[$customerId])) {
+                } elseif (!$this->addressStorage->doesExist(
+                    (string)$addressId,
+                    (string)$customerId
+                )) {
                     $this->addRowError(self::ERROR_ADDRESS_NOT_FOUND, $rowNumber);
                 }
             }
@@ -821,7 +931,10 @@ protected function _validateRowForDelete(array $rowData, $rowNumber)
      */
     protected function _checkRowDuplicate($customerId, $addressId)
     {
-        if (isset($this->_addresses[$customerId]) && in_array($addressId, $this->_addresses[$customerId])) {
+        if ($this->addressStorage->doesExist(
+            (string)$addressId,
+            (string)$customerId
+        )) {
             if (!isset($this->_importedRowPks[$customerId][$addressId])) {
                 $this->_importedRowPks[$customerId][$addressId] = true;
                 return false;
@@ -834,7 +947,7 @@ protected function _checkRowDuplicate($customerId, $addressId)
     }
 
     /**
-     * set customer attributes
+     * Set customer attributes
      *
      * @param array $customerAttributes
      * @return $this
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index bee4479526037..ab940c9e84533 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -8,6 +8,7 @@
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\ImportExport\Model\Import\AbstractSource;
 
 /**
  * Customer entity import
@@ -270,13 +271,29 @@ protected function _saveCustomerEntities(array $entitiesToCreate, array $entitie
             $this->_connection->insertOnDuplicate(
                 $this->_entityTable,
                 $entitiesToUpdate,
-                $this->customerFields
+                $this->getCustomerEntityFieldsToUpdate($entitiesToUpdate)
             );
         }
 
         return $this;
     }
 
+    /**
+     * Filter the entity that are being updated so we only change fields found in the importer file
+     *
+     * @param array $entitiesToUpdate
+     * @return array
+     */
+    private function getCustomerEntityFieldsToUpdate(array $entitiesToUpdate): array
+    {
+        $firstCustomer = reset($entitiesToUpdate);
+        $columnsToUpdate = array_keys($firstCustomer);
+        $customerFieldsToUpdate = array_filter($this->customerFields, function ($field) use ($columnsToUpdate) {
+            return in_array($field, $columnsToUpdate);
+        });
+        return $customerFieldsToUpdate;
+    }
+
     /**
      * Save customer attributes.
      *
@@ -329,6 +346,40 @@ protected function _getNextEntityId()
         return $this->_nextEntityId++;
     }
 
+    /**
+     * Prepare customers data for existing customers checks to perform mass validation/import efficiently.
+     *
+     * @param array|AbstractSource $rows
+     *
+     * @return void
+     */
+    public function prepareCustomerData($rows): void
+    {
+        $customersPresent = [];
+        foreach ($rows as $rowData) {
+            $email = $rowData[static::COLUMN_EMAIL] ?? null;
+            $websiteId = isset($rowData[static::COLUMN_WEBSITE])
+                ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false;
+            if ($email && $websiteId !== false) {
+                $customersPresent[] = [
+                    'email' => $email,
+                    'website_id' => $websiteId,
+                ];
+            }
+        }
+        $this->getCustomerStorage()->prepareCustomers($customersPresent);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateData()
+    {
+        $this->prepareCustomerData($this->getSource());
+
+        return parent::validateData();
+    }
+
     /**
      * Prepare customer data for update
      *
@@ -362,19 +413,11 @@ protected function _prepareDataForUpdate(array $rowData)
             $this->_newCustomers[$emailInLowercase][$rowData[self::COLUMN_WEBSITE]] = $entityId;
         }
 
-        $entityRow = [
-            'group_id' => empty($rowData['group_id']) ? self::DEFAULT_GROUP_ID : $rowData['group_id'],
-            'store_id' => empty($rowData[self::COLUMN_STORE]) ? 0 : $this->_storeCodeToId[$rowData[self::COLUMN_STORE]],
-            'created_at' => $createdAt->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
-            'updated_at' => $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
-            'entity_id' => $entityId,
-        ];
-
         // password change/set
         if (isset($rowData['password']) && strlen($rowData['password'])) {
             $rowData['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);
         }
-
+        $entityRow = ['entity_id' => $entityId];
         // attribute values
         foreach (array_intersect_key($rowData, $this->_attributes) as $attributeCode => $value) {
             $attributeParameters = $this->_attributes[$attributeCode];
@@ -413,12 +456,21 @@ protected function _prepareDataForUpdate(array $rowData)
 
         if ($newCustomer) {
             // create
+            $entityRow['group_id'] = empty($rowData['group_id']) ? self::DEFAULT_GROUP_ID : $rowData['group_id'];
+            $entityRow['store_id'] = empty($rowData[self::COLUMN_STORE])
+                ? \Magento\Store\Model\Store::DEFAULT_STORE_ID : $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
+            $entityRow['created_at'] = $createdAt->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+            $entityRow['updated_at'] = $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
             $entityRow['website_id'] = $this->_websiteCodeToId[$rowData[self::COLUMN_WEBSITE]];
             $entityRow['email'] = $emailInLowercase;
             $entityRow['is_active'] = 1;
             $entitiesToCreate[] = $entityRow;
         } else {
             // edit
+            $entityRow['updated_at'] = $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+            if (!empty($rowData[self::COLUMN_STORE])) {
+                $entityRow['store_id'] = $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
+            }
             $entitiesToUpdate[] = $entityRow;
         }
 
@@ -439,6 +491,7 @@ protected function _prepareDataForUpdate(array $rowData)
     protected function _importData()
     {
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+            $this->prepareCustomerData($bunch);
             $entitiesToCreate = [];
             $entitiesToUpdate = [];
             $entitiesToDelete = [];
@@ -540,6 +593,18 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 if (in_array($attributeCode, $this->_ignoredAttributes)) {
                     continue;
                 }
+
+                $isFieldRequired = $attributeParams['is_required'];
+                $isFieldNotSetAndCustomerDoesNotExist =
+                    !isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website);
+                $isFieldSetAndTrimmedValueIsEmpty
+                    = isset($rowData[$attributeCode]) && '' === trim($rowData[$attributeCode]);
+
+                if ($isFieldRequired && ($isFieldNotSetAndCustomerDoesNotExist || $isFieldSetAndTrimmedValueIsEmpty)) {
+                    $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
+                    continue;
+                }
+
                 if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
                     $this->isAttributeValid(
                         $attributeCode,
@@ -550,8 +615,6 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                             ? $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]
                             : Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
                     );
-                } elseif ($attributeParams['is_required'] && !$this->_getCustomerId($email, $website)) {
-                    $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
                 }
             }
         }
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
index c10ba026fd624..2086f41d27fa6 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
@@ -287,6 +287,28 @@ public function getEntityTypeCode()
         return 'customer_composite';
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function validateData()
+    {
+        //Preparing both customer and address imports for mass validation.
+        $source = $this->getSource();
+        $this->_customerEntity->prepareCustomerData($source);
+        $source->rewind();
+        $rows = [];
+        foreach ($source as $row) {
+            $rows[] = [
+                Address::COLUMN_EMAIL => $row[Customer::COLUMN_EMAIL] ?? null,
+                Address::COLUMN_WEBSITE => $row[Customer::COLUMN_WEBSITE] ?? null
+            ];
+        }
+        $source->rewind();
+        $this->_addressEntity->prepareCustomerData($rows);
+
+        return parent::validateData();
+    }
+
     /**
      * Validate data row
      *
@@ -308,14 +330,13 @@ public function validateRow(array $rowData, $rowNumber)
                 // Add new customer data into customer storage for address entity instance
                 $websiteId = $this->_customerEntity->getWebsiteId($this->_currentWebsiteCode);
                 if (!$this->_addressEntity->getCustomerStorage()->getCustomerId($this->_currentEmail, $websiteId)) {
-                    $customerData = new \Magento\Framework\DataObject(
+                    $this->_addressEntity->getCustomerStorage()->addCustomerByArray(
                         [
-                            'id' => $this->_nextCustomerId,
+                            'entity_id' => $this->_nextCustomerId,
                             'email' => $this->_currentEmail,
                             'website_id' => $websiteId,
                         ]
                     );
-                    $this->_addressEntity->getCustomerStorage()->addCustomer($customerData);
                     $this->_nextCustomerId++;
                 }
 
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php
new file mode 100644
index 0000000000000..6d29d7ae792ff
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerImportExport\Model\ResourceModel\Import\Address;
+
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+use Magento\ImportExport\Model\Import\AbstractEntity;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator as CollectionIterator;
+use Magento\Customer\Model\ResourceModel\Address\Collection as AddressCollection;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Storage to check existing addresses.
+ */
+class Storage
+{
+    /**
+     * IDs of addresses grouped by customer IDs.
+     *
+     * @var string[][]
+     */
+    private $addresses = [];
+
+    /**
+     * @var AddressCollectionFactory
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * For iterating over large number of addresses.
+     *
+     * @var CollectionIterator
+     */
+    private $collectionIterator;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param AddressCollectionFactory $addressCollectionFactory
+     * @param CollectionIterator $byPagesIterator
+     * @param ScopeConfigInterface $config
+     */
+    public function __construct(
+        AddressCollectionFactory $addressCollectionFactory,
+        CollectionIterator $byPagesIterator,
+        ScopeConfigInterface $config
+    ) {
+        $this->addressCollectionFactory = $addressCollectionFactory;
+        $this->collectionIterator = $byPagesIterator;
+        $this->config = $config;
+    }
+
+    /**
+     * Record existing address.
+     *
+     * @param string $customerId
+     * @param string $addressId
+     *
+     * @return void
+     */
+    private function addRecord(string $customerId, string $addressId): void
+    {
+        if (!$customerId || !$addressId) {
+            return;
+        }
+        if (!array_key_exists($customerId, $this->addresses)) {
+            $this->addresses[$customerId] = [];
+        }
+
+        if (!in_array($addressId, $this->addresses[$customerId], true)) {
+            $this->addresses[$customerId][] = $addressId;
+        }
+    }
+
+    /**
+     * Load addresses IDs for given customers.
+     *
+     * @param string[] $customerIds
+     *
+     * @return void
+     */
+    private function loadAddresses(array $customerIds): void
+    {
+        /** @var AddressCollection $collection */
+        $collection = $this->addressCollectionFactory->create();
+        $collection->removeAttributeToSelect();
+        $select = $collection->getSelect();
+        $tableId = array_keys($select->getPart(Select::FROM))[0];
+        $select->where($tableId .'.parent_id in (?)', $customerIds);
+
+        $this->collectionIterator->iterate(
+            $collection,
+            $this->config->getValue(AbstractEntity::XML_PATH_PAGE_SIZE),
+            [
+                function (DataObject $record) {
+                    $this->addRecord($record->getParentId(), $record->getId());
+                }
+            ]
+        );
+    }
+
+    /**
+     * Check if given address exists for given customer.
+     *
+     * @param string $addressId
+     * @param string $forCustomerId
+     * @return bool
+     */
+    public function doesExist(string $addressId, string $forCustomerId): bool
+    {
+        return array_key_exists($forCustomerId, $this->addresses)
+            && in_array(
+                $addressId,
+                $this->addresses[$forCustomerId],
+                true
+            );
+    }
+
+    /**
+     * Pre-load addresses for given customers.
+     *
+     * @param string[] $forCustomersIds
+     * @return void
+     */
+    public function prepareAddresses(array $forCustomersIds): void
+    {
+        if (!$forCustomersIds) {
+            return;
+        }
+
+        $forCustomersIds = array_unique($forCustomersIds);
+        $customerIdsToUse = [];
+        foreach ($forCustomersIds as $customerId) {
+            if (!array_key_exists((string)$customerId, $this->addresses)) {
+                $customerIdsToUse[] = $customerId;
+            }
+        }
+
+        $this->loadAddresses($customerIdsToUse);
+    }
+}
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
index ae88e9672c9f4..43623019c005e 100644
--- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
@@ -5,22 +5,19 @@
  */
 namespace Magento\CustomerImportExport\Model\ResourceModel\Import\Customer;
 
+use Magento\CustomerImportExport\Test\Unit\Model\Import\CustomerCompositeTest;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
+use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator;
+
+/**
+ * Storage to check existing customers.
+ */
 class Storage
 {
-    /**
-     * Flag to not load collection more than one time
-     *
-     * @var bool
-     */
-    protected $_isCollectionLoaded = false;
-
-    /**
-     * Customer collection
-     *
-     * @var \Magento\Customer\Model\ResourceModel\Customer\Collection
-     */
-    protected $_customerCollection;
-
     /**
      * Existing customers information. In form of:
      *
@@ -43,20 +40,30 @@ class Storage
     protected $_pageSize;
 
     /**
-     * Collection by pages iterator
+     * Collection by pages iterator.
      *
-     * @var \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator
+     * @var CollectionByPagesIterator
      */
     protected $_byPagesIterator;
 
     /**
-     * @param \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $collectionFactory
-     * @param \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory $colIteratorFactory
+     * @var CustomerCollectionFactory
+     */
+    private $customerCollectionFactory;
+
+    /**
+     * @var CustomerCollection
+     */
+    public $_customerCollection;
+
+    /**
+     * @param CustomerCollectionFactory $collectionFactory
+     * @param CollectionByPagesIteratorFactory $colIteratorFactory
      * @param array $data
      */
     public function __construct(
-        \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $collectionFactory,
-        \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory $colIteratorFactory,
+        CustomerCollectionFactory $collectionFactory,
+        CollectionByPagesIteratorFactory $colIteratorFactory,
         array $data = []
     ) {
         $this->_customerCollection = isset(
@@ -66,59 +73,102 @@ public function __construct(
         $this->_byPagesIterator = isset(
             $data['collection_by_pages_iterator']
         ) ? $data['collection_by_pages_iterator'] : $colIteratorFactory->create();
+        $this->customerCollectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Create new collection to load customer data with proper filters.
+     *
+     * @param array[] $customerIdentifiers With keys "email" and "website_id".
+     *
+     * @return CustomerCollection
+     */
+    private function prepareCollection(array $customerIdentifiers): CustomerCollection
+    {
+        /** @var CustomerCollection $collection */
+        $collection = $this->customerCollectionFactory->create();
+        $collection->removeAttributeToSelect();
+        $select = $collection->getSelect();
+        $customerTableId = array_keys($select->getPart(Select::FROM))[0];
+        $select->where(
+            $customerTableId .'.email in (?)',
+            array_map(
+                function (array $customer) {
+                    return $customer['email'];
+                },
+                $customerIdentifiers
+            )
+        );
+
+        return $collection;
     }
 
     /**
-     * Load needed data from customer collection
+     * Load customers' data that can be found by given identifiers.
+     *
+     * @param array $customerIdentifiers With keys "email" and "website_id".
      *
      * @return void
      */
-    public function load()
+    private function loadCustomersData(array $customerIdentifiers)
     {
-        if ($this->_isCollectionLoaded == false) {
-            $collection = clone $this->_customerCollection;
-            $collection->removeAttributeToSelect();
-            $tableName = $collection->getResource()->getEntityTable();
-            $collection->getSelect()->from($tableName, ['entity_id', 'website_id', 'email']);
-
-            $this->_byPagesIterator->iterate(
-                $this->_customerCollection,
-                $this->_pageSize,
-                [[$this, 'addCustomer']]
-            );
-
-            $this->_isCollectionLoaded = true;
-        }
+        $this->_byPagesIterator->iterate(
+            $this->prepareCollection($customerIdentifiers),
+            $this->_pageSize,
+            [[$this, 'addCustomer']]
+        );
     }
 
     /**
-     * Add customer to array
+     * Add a customer by an array
      *
-     * @param \Magento\Framework\DataObject|\Magento\Customer\Model\Customer $customer
+     * @param array $customer
      * @return $this
      */
-    public function addCustomer(\Magento\Framework\DataObject $customer)
+    public function addCustomerByArray(array $customer): Storage
     {
-        $email = strtolower(trim($customer->getEmail()));
+        $email = strtolower(trim($customer['email']));
         if (!isset($this->_customerIds[$email])) {
             $this->_customerIds[$email] = [];
         }
-        $this->_customerIds[$email][$customer->getWebsiteId()] = $customer->getId();
+        $this->_customerIds[$email][$customer['website_id']] = $customer['entity_id'];
 
         return $this;
     }
 
     /**
-     * Get customer id
+     * Add customer to array
+     *
+     * @deprecated @see addCustomerByArray
+     * @param DataObject $customer
+     * @return $this
+     */
+    public function addCustomer(DataObject $customer): Storage
+    {
+        $customerData = $customer->toArray();
+        if (!isset($customerData['entity_id']) && isset($customer['id'])) {
+            $customerData['entity_id'] = $customerData['id'];
+        }
+        $this->addCustomerByArray($customerData);
+
+        return $this;
+    }
+
+    /**
+     * Find customer ID for unique pair of email and website ID.
      *
      * @param string $email
      * @param int $websiteId
      * @return bool|int
      */
-    public function getCustomerId($email, $websiteId)
+    public function getCustomerId(string $email, int $websiteId)
     {
-        // lazy loading
-        $this->load();
+        $email = mb_strtolower($email);
+        //Trying to load the customer.
+        if (!array_key_exists($email, $this->_customerIds) || !array_key_exists($websiteId, $this->_customerIds[$email])
+        ) {
+            $this->loadCustomersData([['email' => $email, 'website_id' => $websiteId]]);
+        }
 
         if (isset($this->_customerIds[$email][$websiteId])) {
             return $this->_customerIds[$email][$websiteId];
@@ -126,4 +176,41 @@ public function getCustomerId($email, $websiteId)
 
         return false;
     }
+
+    /**
+     * Pre-load customers for future checks.
+     *
+     * @param array[] $customersToFind With keys: email, website_id.
+     * @return void
+     */
+    public function prepareCustomers(array $customersToFind): void
+    {
+        $identifiers = [];
+        foreach ($customersToFind as $customerToFind) {
+            $email = mb_strtolower($customerToFind['email']);
+            $websiteId = $customerToFind['website_id'];
+            if (!array_key_exists($email, $this->_customerIds)
+                || !array_key_exists($websiteId, $this->_customerIds[$email])
+            ) {
+                //Only looking for customers we don't already have ID for.
+                //We need unique identifiers.
+                $uniqueKey = $email .'_' .$websiteId;
+                $identifiers[$uniqueKey] = [
+                    'email' => $email,
+                    'website_id' => $websiteId,
+                ];
+                //Recording that we've searched for a customer.
+                if (!array_key_exists($email, $this->_customerIds)) {
+                    $this->_customerIds[$email] = [];
+                }
+                $this->_customerIds[$email][$websiteId] = null;
+            }
+        }
+        if (!$identifiers) {
+            return;
+        }
+
+        //Loading customers data.
+        $this->loadCustomersData($identifiers);
+    }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE.txt b/app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE.txt
rename to app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE_AFL.txt b/app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE_AFL.txt
rename to app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CustomerImportExport/Test/Mftf/README.md b/app/code/Magento/CustomerImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..65dfc18397eda
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Import Export Functional Tests
+
+The Functional Test Module for **Magento Customer Import Export** module.
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
index fe8c2dedb5744..126a9e1791779 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
@@ -6,11 +6,19 @@
 
 namespace Magento\CustomerImportExport\Test\Unit\Model\Import;
 
+use Magento\Customer\Model\ResourceModel\Address\Attribute as AddressAttribute;
 use Magento\CustomerImportExport\Model\Import\Address;
 use Magento\ImportExport\Model\Import\AbstractEntity;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
+use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage;
 
 /**
- * Class AddressTest
+ * Tests Magento\CustomerImportExport\Model\Import\Address.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddressTest extends \PHPUnit\Framework\TestCase
@@ -56,8 +64,8 @@ class AddressTest extends \PHPUnit\Framework\TestCase
      * @var array
      */
     protected $_customers = [
-        ['id' => 1, 'email' => 'test1@email.com', 'website_id' => 1],
-        ['id' => 2, 'email' => 'test2@email.com', 'website_id' => 2],
+        ['entity_id' => 1, 'email' => 'test1@email.com', 'website_id' => 1],
+        ['entity_id' => 2, 'email' => 'test2@email.com', 'website_id' => 2],
     ];
 
     /**
@@ -111,6 +119,11 @@ class AddressTest extends \PHPUnit\Framework\TestCase
      */
     protected $errorAggregator;
 
+    /**
+     * @var AddressAttribute\Source\CountryWithWebsites|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $countryWithWebsites;
+
     /**
      * Init entity adapter model
      */
@@ -125,6 +138,14 @@ protected function setUp()
         $this->_storeManager->expects($this->any())
             ->method('getWebsites')
             ->will($this->returnCallback([$this, 'getWebsites']));
+        $this->countryWithWebsites = $this
+            ->getMockBuilder(AddressAttribute\Source\CountryWithWebsites::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->countryWithWebsites
+            ->expects($this->any())
+            ->method('getAllOptions')
+            ->willReturn([]);
         $this->_model = $this->_getModelMock();
         $this->errorAggregator = $this->createPartialMock(
             \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregator::class,
@@ -233,29 +254,25 @@ protected function _createAttrCollectionMock()
      */
     protected function _createCustomerStorageMock()
     {
-        $customerStorage = $this->createPartialMock(
-            \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage::class,
-            ['load']
-        );
-        $resourceMock = $this->createPartialMock(
-            \Magento\Customer\Model\ResourceModel\Customer::class,
-            ['getIdFieldName']
-        );
-        $resourceMock->expects($this->any())->method('getIdFieldName')->will($this->returnValue('id'));
-        foreach ($this->_customers as $customerData) {
-            $data = [
-                'resource' => $resourceMock,
-                'data' => $customerData,
-                $this->createMock(\Magento\Customer\Model\Config\Share::class),
-                $this->createMock(\Magento\Customer\Model\AddressFactory::class),
-                $this->createMock(\Magento\Customer\Model\ResourceModel\Address\CollectionFactory::class),
-                $this->createMock(\Magento\Customer\Model\GroupFactory::class),
-                $this->createMock(\Magento\Customer\Model\AttributeFactory::class),
-            ];
-            /** @var $customer \Magento\Customer\Model\Customer */
-            $customer = $this->_objectManagerMock->getObject(\Magento\Customer\Model\Customer::class, $data);
-            $customerStorage->addCustomer($customer);
-        }
+        /** @var $customerStorage Storage|\PHPUnit_Framework_MockObject_MockObject */
+        $customerStorage = $this->createMock(Storage::class);
+        $customerStorage->expects($this->any())
+            ->method('getCustomerId')
+            ->willReturnCallback(
+                function ($email, $websiteId) {
+                    foreach ($this->_customers as $customerData) {
+                        if ($customerData['email'] === $email
+                            && $customerData['website_id'] === $websiteId
+                        ) {
+                            return $customerData['entity_id'];
+                        }
+                    }
+
+                    return false;
+                }
+            );
+        $customerStorage->expects($this->any())->method('prepareCustomers');
+
         return $customerStorage;
     }
 
@@ -337,7 +354,6 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
             'attributes' => [],
             'defaults' => [],
         ];
-
         // entity adapter mock
         $modelMock = $this->createPartialMock(
             \Magento\CustomerImportExport\Model\Import\Address::class,
@@ -349,21 +365,25 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
                 '_saveCustomerDefaults',
                 '_deleteAddressEntities',
                 '_mergeEntityAttributes',
-                'getErrorAggregator'
+                'getErrorAggregator',
+                'getCustomerStorage',
+                'prepareCustomerData',
             ]
         );
-
+        //Adding behaviours
         $availableBehaviors = new \ReflectionProperty($modelMock, '_availableBehaviors');
         $availableBehaviors->setAccessible(true);
         $availableBehaviors->setValue($modelMock, $this->_availableBehaviors);
-
         // mock to imitate data source model
         $dataSourceMock = $this->createPartialMock(
             \Magento\ImportExport\Model\ResourceModel\Import\Data::class,
-            ['getNextBunch', '__wakeup']
+            ['getNextBunch', '__wakeup', 'getIterator']
         );
         $dataSourceMock->expects($this->at(0))->method('getNextBunch')->will($this->returnValue($customBehaviorRows));
         $dataSourceMock->expects($this->at(1))->method('getNextBunch')->will($this->returnValue(null));
+        $dataSourceMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn($this->getMockForAbstractClass(\Iterator::class));
 
         $dataSourceModel = new \ReflectionProperty(
             \Magento\CustomerImportExport\Model\Import\Address::class,
@@ -371,15 +391,12 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         );
         $dataSourceModel->setAccessible(true);
         $dataSourceModel->setValue($modelMock, $dataSourceMock);
-
         // mock expects for entity adapter
         $modelMock->expects($this->any())->method('validateRow')->will($this->returnValue(true));
         $modelMock->expects($this->any())
             ->method('getErrorAggregator')
             ->will($this->returnValue($this->errorAggregator));
-
         $modelMock->expects($this->any())->method('_prepareDataForUpdate')->will($this->returnValue($updateResult));
-
         $modelMock->expects(
             $this->any()
         )->method(
@@ -387,11 +404,8 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         )->will(
             $this->returnCallback([$this, 'validateSaveAddressEntities'])
         );
-
         $modelMock->expects($this->any())->method('_saveAddressAttributes')->will($this->returnValue($modelMock));
-
         $modelMock->expects($this->any())->method('_saveCustomerDefaults')->will($this->returnValue($modelMock));
-
         $modelMock->expects(
             $this->any()
         )->method(
@@ -399,8 +413,10 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         )->will(
             $this->returnCallback([$this, 'validateDeleteAddressEntities'])
         );
-
         $modelMock->expects($this->any())->method('_mergeEntityAttributes')->will($this->returnValue([]));
+        $modelMock->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($this->_createCustomerStorageMock());
 
         return $modelMock;
     }
@@ -429,11 +445,11 @@ protected function _getModelMock()
             $this->createMock(\Magento\Customer\Model\AddressFactory::class),
             $this->createMock(\Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class),
             $this->createMock(\Magento\Customer\Model\CustomerFactory::class),
-            $this->createMock(\Magento\Customer\Model\ResourceModel\Address\CollectionFactory::class),
             $this->createMock(\Magento\Customer\Model\ResourceModel\Address\Attribute\CollectionFactory::class),
             new \Magento\Framework\Stdlib\DateTime(),
             $this->createMock(\Magento\Customer\Model\Address\Validator\Postcode::class),
-            $this->_getModelDependencies()
+            $this->_getModelDependencies(),
+            $this->countryWithWebsites
         );
 
         $property = new \ReflectionProperty($modelMock, '_availableBehaviors');
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
index 7fcbd1d0d06d0..1b900c2139588 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
@@ -100,24 +100,6 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
         Address::COLUMN_ADDRESS_ID => null,
     ];
 
-    /**
-     * List of mocked methods for customer and address entity adapters
-     *
-     * @var array
-     */
-    protected $_entityMockedMethods = [
-        'validateRow',
-        'getErrorMessages',
-        'getErrorsCount',
-        'getErrorsLimit',
-        'getInvalidRowsCount',
-        'getNotices',
-        'getProcessedEntitiesCount',
-        'setParameters',
-        'setSource',
-        'importData',
-    ];
-
     protected function setUp()
     {
         $translateInline = $this->createMock(\Magento\Framework\Translate\InlineInterface::class);
@@ -199,30 +181,30 @@ protected function _getModelMock()
      */
     protected function _getModelMockForPrepareRowForDb()
     {
-        $customerEntity = $this->_getCustomerEntityMock(['validateRow']);
-        $customerEntity->expects($this->any())->method('validateRow')->will($this->returnValue(true));
-
-        $customerStorage = $this->createPartialMock(\stdClass::class, ['getCustomerId']);
-        $customerStorage->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
-
-        $addressEntity = $this->_getAddressEntityMock(['validateRow', 'getCustomerStorage']);
-        $addressEntity->expects($this->any())->method('validateRow')->will($this->returnValue(true));
-        $addressEntity->expects(
-            $this->any()
-        )->method(
-            'getCustomerStorage'
-        )->will(
-            $this->returnValue($customerStorage)
+        $customerStorage = $this->createPartialMock(
+            'stdClass',
+            ['getCustomerId', 'prepareCustomers', 'addCustomer']
         );
+        $customerStorage->expects($this->any())->method('getCustomerId')->willReturn(1);
+        $customerEntity = $this->_getCustomerEntityMock();
+        $customerEntity->expects($this->any())->method('validateRow')->willReturn(true);
+        $customerEntity->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($customerStorage);
+        $customerEntity->expects($this->any())
+            ->method('getValidColumnNames')
+            ->willReturn(['cols']);
+
+        $addressEntity = $this->_getAddressEntityMock();
+        $addressEntity->expects($this->any())->method('validateRow')->willReturn(true);
+        $addressEntity->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($customerStorage);
 
         $dataSourceMock = $this->createPartialMock(\stdClass::class, ['cleanBunches', 'saveBunch']);
-        $dataSourceMock->expects(
-            $this->any()
-        )->method(
-            'saveBunch'
-        )->will(
-            $this->returnCallback([$this, 'verifyPrepareRowForDbData'])
-        );
+        $dataSourceMock->expects($this->any())
+            ->method('saveBunch')
+            ->willReturnCallback([$this, 'verifyPrepareRowForDbData']);
 
         $data = $this->_getModelDependencies();
         $data['customer_entity'] = $customerEntity;
@@ -243,14 +225,15 @@ protected function _getModelMockForPrepareRowForDb()
     protected function _getModelMockForImportData($isDeleteBehavior, $customerImport, $addressImport)
     {
         $customerEntity = $this->_getCustomerEntityMock();
-        $customerEntity->expects($this->once())->method('importData')->will($this->returnValue($customerImport));
+        $customerEntity->expects($this->once())->method('importData')->willReturn($customerImport);
 
         $addressEntity = $this->_getAddressEntityMock();
         // address import starts only if customer import finished successfully
         if ($isDeleteBehavior || !$customerImport) {
             $addressEntity->expects($this->never())->method('importData');
         } else {
-            $addressEntity->expects($this->once())->method('importData')->will($this->returnValue($addressImport));
+            $addressEntity->expects($this->once())->method('setCustomerAttributes')->willReturnSelf();
+            $addressEntity->expects($this->once())->method('importData')->willReturn($addressImport);
         }
 
         $data = $this->_getModelDependencies();
@@ -261,65 +244,39 @@ protected function _getModelMockForImportData($isDeleteBehavior, $customerImport
     }
 
     /**
-     * @param array $mockedMethods
      * @return Customer|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected function _getCustomerEntityMock(array $mockedMethods = null)
+    protected function _getCustomerEntityMock()
     {
-        if ($mockedMethods === null) {
-            $mockedMethods = $this->_entityMockedMethods;
-        }
-        $mockedMethods[] = 'getAttributeCollection';
-        $mockedMethods[] = 'getWebsiteId';
+        $customerEntity = $this->createMock(Customer::class);
 
-        $customerEntity = $this->createPartialMock(
-            \Magento\CustomerImportExport\Model\Import\Customer::class,
-            $mockedMethods
-        );
         $attributeList = [];
         foreach ($this->_customerAttributes as $code) {
             $attribute = new \Magento\Framework\DataObject(['attribute_code' => $code]);
             $attributeList[] = $attribute;
         }
-        $customerEntity->expects(
-            $this->once()
-        )->method(
-            'getAttributeCollection'
-        )->will(
-            $this->returnValue($attributeList)
-        );
+        $customerEntity->expects($this->once())
+            ->method('getAttributeCollection')
+            ->willReturn($attributeList);
 
         return $customerEntity;
     }
 
     /**
-     * @param array $mockedMethods
      * @return Address|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected function _getAddressEntityMock(array $mockedMethods = null)
+    private function _getAddressEntityMock()
     {
-        if ($mockedMethods === null) {
-            $mockedMethods = $this->_entityMockedMethods;
-        }
-        $mockedMethods[] = 'getAttributeCollection';
-
-        $addressEntity = $this->createPartialMock(
-            \Magento\CustomerImportExport\Model\Import\Address::class,
-            $mockedMethods
-        );
+        $addressEntity = $this->createMock(Address::class);
 
         $attributeList = [];
         foreach ($this->_addressAttributes as $code) {
             $attribute = new \Magento\Framework\DataObject(['attribute_code' => $code]);
             $attributeList[] = $attribute;
         }
-        $addressEntity->expects(
-            $this->once()
-        )->method(
-            'getAttributeCollection'
-        )->will(
-            $this->returnValue($attributeList)
-        );
+        $addressEntity->expects($this->once())
+            ->method('getAttributeCollection')
+            ->willReturn($attributeList);
 
         return $addressEntity;
     }
@@ -373,33 +330,26 @@ public function testIsAttributeParticular()
     public function testValidateRow(array $rows, array $calls, $validationReturn, array $expectedErrors, $behavior)
     {
         $customerEntity = $this->_getCustomerEntityMock();
-        $this->_entityMockedMethods[] = 'getCustomerStorage';
         $addressEntity = $this->_getAddressEntityMock();
 
         $customerEntity->expects($this->exactly($calls['customerValidationCalls']))
             ->method('validateRow')
-            ->will($this->returnValue($validationReturn));
-
-        $customerEntity->expects($this->any())
-            ->method('getErrorMessages')
-            ->will($this->returnValue([]));
+            ->willReturn($validationReturn);
 
         $addressEntity
             ->expects($this->exactly($calls['addressValidationCalls']))
             ->method('validateRow')
-            ->will($this->returnValue($validationReturn));
+            ->willReturn($validationReturn);
 
         $customerStorage = $this->createPartialMock(\stdClass::class, ['getCustomerId']);
-        $customerStorage->expects($this->any())->method('getCustomerId')->will($this->returnValue(true));
-        $addressEntity->expects(
-            $this->any()
-        )->method(
-            'getCustomerStorage'
-        )->will(
-            $this->returnValue($customerStorage)
-        );
+        $customerStorage->expects($this->any())->method('getCustomerId')->willReturn(true);
+        $addressEntity->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($customerStorage);
 
-        $addressEntity->expects($this->any())->method('getErrorMessages')->will($this->returnValue([]));
+        $customerEntity->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($customerStorage);
 
         $data = $this->_getModelDependencies();
         $data['customer_entity'] = $customerEntity;
@@ -419,24 +369,22 @@ public function testValidateRow(array $rows, array $calls, $validationReturn, ar
     public function testPrepareAddressRowData()
     {
         $customerEntity = $this->_getCustomerEntityMock();
-        $this->_entityMockedMethods[] = 'getCustomerStorage';
         $addressEntity = $this->_getAddressEntityMock();
 
-        $customerEntity->expects($this->once())->method('validateRow')->will($this->returnValue(true));
+        $customerEntity->expects($this->once())->method('validateRow')->willReturn(true);
 
-        $addressEntity->expects(
-            $this->once()
-        )->method(
-            'validateRow'
-        )->will(
-            $this->returnCallback([$this, 'validateAddressRowParams'])
-        );
+        $addressEntity->expects($this->once())
+            ->method('validateRow')
+            ->willReturnCallback([$this, 'validateAddressRowParams']);
 
         $customerStorage = $this->createPartialMock(\stdClass::class, ['getCustomerId']);
-        $customerStorage->expects($this->any())->method('getCustomerId')->will($this->returnValue(true));
+        $customerStorage->expects($this->any())->method('getCustomerId')->willReturn(true);
         $addressEntity->expects($this->any())
             ->method('getCustomerStorage')
-            ->will($this->returnValue($customerStorage));
+            ->willReturn($customerStorage);
+        $customerEntity->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($customerStorage);
 
         $data = $this->_getModelDependencies();
         $data['customer_entity'] = $customerEntity;
@@ -551,20 +499,12 @@ public function testSetParameters()
         $customerEntity = $this->_getCustomerEntityMock();
         $addressEntity = $this->_getAddressEntityMock();
 
-        $customerEntity->expects(
-            $this->once()
-        )->method(
-            'setParameters'
-        )->will(
-            $this->returnCallback([$this, 'callbackCheckParameters'])
-        );
-        $addressEntity->expects(
-            $this->once()
-        )->method(
-            'setParameters'
-        )->will(
-            $this->returnCallback([$this, 'callbackCheckParameters'])
-        );
+        $customerEntity->expects($this->once())
+            ->method('setParameters')
+            ->willReturnCallback([$this, 'callbackCheckParameters']);
+        $addressEntity->expects($this->once())
+            ->method('setParameters')
+            ->willReturnCallback([$this, 'callbackCheckParameters']);
         $data = $this->_getModelDependencies();
         $data['customer_entity'] = $customerEntity;
         $data['address_entity'] = $addressEntity;
@@ -730,8 +670,8 @@ protected function _getModelForGetterTest($method, $customerReturnData, $address
         $customerEntity = $this->_getCustomerEntityMock();
         $addressEntity = $this->_getAddressEntityMock();
 
-        $customerEntity->expects($this->once())->method($method)->will($this->returnValue($customerReturnData));
-        $addressEntity->expects($this->once())->method($method)->will($this->returnValue($addressReturnData));
+        $customerEntity->expects($this->once())->method($method)->willReturn($customerReturnData);
+        $addressEntity->expects($this->once())->method($method)->willReturn($addressReturnData);
 
         $data = $this->_getModelDependencies();
         $data['customer_entity'] = $customerEntity;
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php
index 5a698388da591..9a7183d5b5f72 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php
@@ -10,6 +10,7 @@
 namespace Magento\CustomerImportExport\Test\Unit\Model\Import;
 
 use Magento\CustomerImportExport\Model\Import\Customer;
+use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage;
 
 class CustomerTest extends \PHPUnit\Framework\TestCase
 {
@@ -90,6 +91,7 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
                     '_saveCustomerAttributes',
                     '_deleteCustomerEntities',
                     'getErrorAggregator',
+                    'getCustomerStorage',
                 ]
             )
             ->getMock();
@@ -153,6 +155,12 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         $modelMock->expects($this->any())
             ->method('getErrorAggregator')
             ->will($this->returnValue($errorAggregator));
+        /** @var \PHPUnit_Framework_MockObject_MockObject $storageMock */
+        $storageMock = $this->createMock(Storage::class);
+        $storageMock->expects($this->any())->method('prepareCustomers');
+        $modelMock->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($storageMock);
 
         return $modelMock;
     }
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php
index 71f8f17c85509..1f2f9f3fed583 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php
@@ -3,143 +3,136 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * Test class for \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage
+ */
 namespace Magento\CustomerImportExport\Test\Unit\Model\ResourceModel\Import\Customer;
 
 use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator;
 
 class StorageTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Storage
      */
-    protected $_model;
+    private $model;
 
     /**
-     * @var string
+     * @var CollectionByPagesIterator|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_entityTable = 'test';
+    private $iteratorMock;
 
     /**
-     * @var array
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_expectedFields = ['entity_id', 'website_id', 'email'];
+    private $collectionMock;
 
     protected function setUp()
     {
-        $this->_model = new \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage(
-            $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\CollectionFactory::class)
-                ->disableOriginalConstructor()
-                ->getMock(),
-            $this->getMockBuilder(\Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory::class)
-                ->disableOriginalConstructor()
-                ->getMock(),
-            $this->_getModelDependencies()
+        $this->iteratorMock = $this->createMock(
+            CollectionByPagesIterator::class
+        );
+        /** @var \PHPUnit_Framework_MockObject_MockObject|CollectionByPagesIteratorFactory $iteratorFactoryMock */
+        $iteratorFactoryMock = $this->createMock(
+            CollectionByPagesIteratorFactory::class
+        );
+        $iteratorFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->iteratorMock);
+        $this->collectionMock = $this->createMock(Collection::class);
+        /** @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject $collectionFactoryMock */
+        $collectionFactoryMock = $this->createMock(
+            CollectionFactory::class
+        );
+        $collectionFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->collectionMock);
+        /** @var \PHPUnit_Framework_MockObject_MockObject $selectMock */
+        $selectMock = $this->createMock(Select::class);
+        $selectMock->expects($this->any())
+            ->method('getPart')
+            ->with(Select::FROM)
+            ->willReturn(['e' => []]);
+        $this->collectionMock->expects($this->any())
+            ->method('getSelect')
+            ->willReturn($selectMock);
+
+        $this->model = new Storage(
+            $collectionFactoryMock,
+            $iteratorFactoryMock,
+            []
         );
-        $this->_model->load();
     }
 
     protected function tearDown()
     {
-        unset($this->_model);
+        unset($this->model);
     }
 
-    /**
-     * Retrieve all necessary objects mocks which used inside customer storage
-     *
-     * @return array
-     */
-    protected function _getModelDependencies()
-    {
-        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['from'])
-            ->getMock();
-        $select->expects($this->any())->method('from')->will($this->returnCallback([$this, 'validateFrom']));
-        $customerCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['load', 'removeAttributeToSelect', 'getResource', 'getSelect'])
-            ->getMock();
-
-        $resourceStub = new \Magento\Framework\DataObject();
-        $resourceStub->setEntityTable($this->_entityTable);
-        $customerCollection->expects($this->once())->method('getResource')->will($this->returnValue($resourceStub));
-
-        $customerCollection->expects($this->once())->method('getSelect')->will($this->returnValue($select));
-
-        $byPagesIterator = $this->createPartialMock(\stdClass::class, ['iterate']);
-        $byPagesIterator->expects($this->once())
-            ->method('iterate')
-            ->will($this->returnCallback([$this, 'iterate']));
-
-        return [
-            'customer_collection' => $customerCollection,
-            'collection_by_pages_iterator' => $byPagesIterator,
-            'page_size' => 10
-        ];
-    }
-
-    /**
-     * Iterate stub
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
-     * @param \Magento\Framework\Data\Collection $collection
-     * @param int $pageSize
-     * @param array $callbacks
-     */
-    public function iterate(\Magento\Framework\Data\Collection $collection, $pageSize, array $callbacks)
-    {
-        foreach ($collection as $customer) {
-            foreach ($callbacks as $callback) {
-                call_user_func($callback, $customer);
-            }
-        }
-    }
-
-    /**
-     * @param string $tableName
-     * @param array $fields
-     */
-    public function validateFrom($tableName, $fields)
-    {
-        $this->assertEquals($this->_entityTable, $tableName);
-        $this->assertEquals($this->_expectedFields, $fields);
-    }
-
-    public function testLoad()
-    {
-        $this->assertAttributeEquals(true, '_isCollectionLoaded', $this->_model);
-    }
-
-    public function testAddCustomer()
+    public function testAddCustomerByArray()
     {
         $propertyName = '_customerIds';
         $customer = $this->_addCustomerToStorage();
 
-        $this->assertAttributeCount(1, $propertyName, $this->_model);
-
-        $expectedCustomerData = [$customer->getWebsiteId() => $customer->getId()];
-        $this->assertAttributeContains($expectedCustomerData, $propertyName, $this->_model);
+        $this->assertAttributeCount(1, $propertyName, $this->model);
+        $expectedCustomerData = [$customer['website_id'] => $customer['entity_id']];
+        $this->assertAttributeContains($expectedCustomerData, $propertyName, $this->model);
     }
 
     public function testGetCustomerId()
     {
-        $customer = $this->_addCustomerToStorage();
+        $existingEmail = 'test@magento.com';
+        $existingWebsiteId = 0;
+        $existingId = 1;
+        $nonExistingEmail = 'test1@magento.com';
+        $nonExistingWebsiteId = 2;
 
+        $this->iteratorMock->expects($this->at(0))
+            ->method('iterate')
+            ->willReturnCallback(
+                function (...$args) use (
+                    $existingId,
+                    $existingEmail,
+                    $existingWebsiteId
+                ) {
+                    /** @var callable $callable */
+                    foreach ($args[2] as $callable) {
+                        $callable(
+                            new DataObject([
+                                'id' => $existingId,
+                                'email' => $existingEmail,
+                                'website_id' => $existingWebsiteId,
+                            ])
+                        );
+                    }
+                }
+            );
         $this->assertEquals(
-            $customer->getId(),
-            $this->_model->getCustomerId($customer->getEmail(), $customer->getWebsiteId())
+            $existingId,
+            $this->model->getCustomerId($existingEmail, $existingWebsiteId)
+        );
+        $this->assertFalse(
+            $this->model->getCustomerId(
+                $nonExistingEmail,
+                $nonExistingWebsiteId
+            )
         );
-        $this->assertFalse($this->_model->getCustomerId('new@test.com', $customer->getWebsiteId()));
     }
 
     /**
-     * @return \Magento\Framework\DataObject
+     * @return array
      */
     protected function _addCustomerToStorage()
     {
-        $customer = new \Magento\Framework\DataObject(['id' => 1, 'website_id' => 1, 'email' => 'test@test.com']);
-        $this->_model->addCustomer($customer);
+        $customer = ['entity_id' => 1, 'website_id' => 1, 'email' => 'test@test.com'];
+        $this->model->addCustomerByArray($customer);
 
         return $customer;
     }
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 4bb739e526194..b0d4ebed7ee27 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerImportExport/etc/module.xml b/app/code/Magento/CustomerImportExport/etc/module.xml
index 865b2e991418d..2b351d06a5ffd 100644
--- a/app/code/Magento/CustomerImportExport/etc/module.xml
+++ b/app/code/Magento/CustomerImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CustomerImportExport" setup_version="2.0.0">
+    <module name="Magento_CustomerImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index b02c8e478d639..5974297a76cc7 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -8,6 +8,8 @@
 use Magento\Deploy\Source\SourcePool;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFactory;
+use Magento\Deploy\Package\PackageFile;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 
 /**
@@ -43,6 +45,9 @@ class Collector implements CollectorInterface
      * @var PackageFactory
      */
     private $packageFactory;
+    
+    /** @var \Magento\Framework\Module\Manager */
+    private $moduleManager;
 
     /**
      * Default values for package primary identifiers
@@ -61,15 +66,19 @@ class Collector implements CollectorInterface
      * @param SourcePool $sourcePool
      * @param FileNameResolver $fileNameResolver
      * @param PackageFactory $packageFactory
+     * @param Manager|null $moduleManager
      */
     public function __construct(
         SourcePool $sourcePool,
         FileNameResolver $fileNameResolver,
-        PackageFactory $packageFactory
+        PackageFactory $packageFactory,
+        Manager $moduleManager = null
     ) {
         $this->sourcePool = $sourcePool;
         $this->fileNameResolver = $fileNameResolver;
         $this->packageFactory = $packageFactory;
+        $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Module\Manager::class);
     }
 
     /**
@@ -81,19 +90,11 @@ public function collect()
         foreach ($this->sourcePool->getAll() as $source) {
             $files = $source->get();
             foreach ($files as $file) {
-                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
-                $params = [
-                    'area' => $file->getArea(),
-                    'theme' => $file->getTheme(),
-                    'locale' => $file->getLocale(),
-                    'module' => $file->getModule(),
-                    'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
-                ];
-                foreach ($this->packageDefaultValues as $name => $value) {
-                    if (!isset($params[$name])) {
-                        $params[$name] = $value;
-                    }
+                if ($file->getModule() && !$this->moduleManager->isEnabled($file->getModule())) {
+                    continue;
                 }
+                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
+                $params = $this->getParams($file);
                 $packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}";
                 if (!isset($packages[$packagePath])) {
                     $packages[$packagePath] = $this->packageFactory->create($params);
@@ -105,4 +106,27 @@ public function collect()
         }
         return $packages;
     }
+
+    /**
+     * Retrieve package params
+     *
+     * @param PackageFile $file
+     * @return array
+     */
+    private function getParams(PackageFile $file)
+    {
+        $params = [
+            'area' => $file->getArea(),
+            'theme' => $file->getTheme(),
+            'locale' => $file->getLocale(),
+            'module' => $file->getModule(),
+            'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
+        ];
+        foreach ($this->packageDefaultValues as $name => $value) {
+            if (!isset($params[$name])) {
+                $params[$name] = $value;
+            }
+        }
+        return $params;
+    }
 }
diff --git a/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php b/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php
index 9d13c97790fa4..4eb965b21d53a 100644
--- a/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -20,6 +21,8 @@
  */
 class ApplicationDumpCommand extends Command
 {
+    const INPUT_CONFIG_TYPES = 'config-types';
+
     /**
      * @var Writer
      */
@@ -47,10 +50,10 @@ public function __construct(
         array $sources,
         Hash $configHash = null
     ) {
-        parent::__construct();
         $this->writer = $writer;
         $this->sources = $sources;
         $this->configHash = $configHash ?: ObjectManager::getInstance()->get(Hash::class);
+        parent::__construct();
     }
 
     /**
@@ -60,6 +63,13 @@ protected function configure()
     {
         $this->setName('app:config:dump');
         $this->setDescription('Create dump of application');
+
+        $configTypes = array_unique(array_column($this->sources, 'namespace'));
+        $this->addArgument(
+            self::INPUT_CONFIG_TYPES,
+            InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+            sprintf('Space-separated list of config types or omit to dump all [%s]', implode(', ', $configTypes))
+        );
         parent::configure();
     }
 
@@ -74,11 +84,14 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->groupSourcesByPool();
-
+        $dumpedTypes = [];
         foreach ($this->sources as $pool => $sources) {
             $dump = [];
             $comments = [];
             foreach ($sources as $sourceData) {
+                if ($this->skipDump($input, $sourceData)) {
+                    continue;
+                }
                 /** @var ConfigSourceInterface $source */
                 $source = $sourceData['source'];
                 $namespace = $sourceData['namespace'];
@@ -95,15 +108,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 null,
                 $comments
             );
+            $dumpedTypes = array_unique($dumpedTypes + array_keys($dump));
             if (!empty($comments)) {
                 $output->writeln($comments);
             }
         }
 
+        if (!$dumpedTypes) {
+            $output->writeln('<error>Nothing dumped. Check the config types specified and try again');
+            return Cli::RETURN_FAILURE;
+        }
+
         // Generate and save new hash of deployment configuration.
         $this->configHash->regenerate();
 
-        $output->writeln('<info>Done.</info>');
+        $output->writeln(sprintf('<info>Done. Config types dumped: %s</info>', implode(', ', $dumpedTypes)));
         return Cli::RETURN_SUCCESS;
     }
 
@@ -127,4 +146,20 @@ private function groupSourcesByPool()
 
         $this->sources = $sources;
     }
+
+    /**
+     * Check whether the dump source should be skipped
+     *
+     * @param InputInterface $input
+     * @param array $sourceData
+     * @return bool
+     */
+    private function skipDump(InputInterface $input, array $sourceData): bool
+    {
+        $allowedTypes = $input->getArgument(self::INPUT_CONFIG_TYPES);
+        if ($allowedTypes && !in_array($sourceData['namespace'], $allowedTypes)) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/app/code/Magento/Deploy/Console/Command/App/ConfigStatusCommand.php b/app/code/Magento/Deploy/Console/Command/App/ConfigStatusCommand.php
new file mode 100644
index 0000000000000..90438380e2232
--- /dev/null
+++ b/app/code/Magento/Deploy/Console/Command/App/ConfigStatusCommand.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Console\Command\App;
+
+use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Command for checking if Config propagation is up to date
+ */
+class ConfigStatusCommand extends Command
+{
+    /**
+     * Code for error when config import is required.
+     */
+    const EXIT_CODE_CONFIG_IMPORT_REQUIRED = 2;
+
+    /**
+     * @var ChangeDetector
+     */
+    private $changeDetector;
+
+    /**
+     * ConfigStatusCommand constructor.
+     * @param ChangeDetector $changeDetector
+     */
+    public function __construct(ChangeDetector $changeDetector)
+    {
+        $this->changeDetector = $changeDetector;
+        parent::__construct();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName('app:config:status')
+            ->setDescription('Checks if config propagation requires update');
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        if ($this->changeDetector->hasChanges()) {
+            $output->writeln(
+                '<info>Config files have changed. ' .
+                'Run app:config:import or setup:upgrade command to synchronize configuration.</info>'
+            );
+            return self::EXIT_CODE_CONFIG_IMPORT_REQUIRED;
+        }
+        $output->writeln('<info>Config files are up to date.</info>');
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/CollectorFactory.php b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/CollectorFactory.php
index f7c38f7c6f680..c66388ed47092 100644
--- a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/CollectorFactory.php
+++ b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/CollectorFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Console\Command\App\SensitiveConfigSet;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -64,7 +65,9 @@ public function __construct(
     public function create($type)
     {
         if (!isset($this->types[$type])) {
-            throw new LocalizedException(__('Class for type "%1" was not declared', $type));
+            throw new LocalizedException(
+                __('The class for "%1" type wasn\'t declared. Enter the class and try again.', $type)
+            );
         }
 
         $object = $this->objectManager->create($this->types[$type]);
diff --git a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php
index 0dd5930794168..53cd616604049 100644
--- a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php
+++ b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Console\Command\App\SensitiveConfigSet;
 
 use Magento\Deploy\Console\Command\App\SensitiveConfigSetCommand;
@@ -103,7 +104,7 @@ private function getConfigValueQuestion()
         ]);
         $configValueQuestion->setValidator(function ($interviewer) {
             if (empty($interviewer)) {
-                throw new LocalizedException(new Phrase('Value can\'t be empty'));
+                throw new LocalizedException(new Phrase("The value can't be empty. Enter the value and try again."));
             }
             return $interviewer;
         });
diff --git a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
index c4485656fb884..2e223f5a0dc65 100644
--- a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
@@ -101,8 +101,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         $modeController->enableProductionMode();
                     }
                     break;
+                case State::MODE_DEFAULT:
+                    $modeController->enableDefaultMode();
+                    break;
                 default:
-                    throw new LocalizedException(__('Cannot switch into given mode "%1"', $toMode));
+                    throw new LocalizedException(__('The mode can\'t be switched to "%1".', $toMode));
             }
             $output->writeln('Enabled ' . $toMode . ' mode.');
 
diff --git a/app/code/Magento/Deploy/Console/ConsoleLogger.php b/app/code/Magento/Deploy/Console/ConsoleLogger.php
index a7d3b48fde130..0ca34439c7d4f 100644
--- a/app/code/Magento/Deploy/Console/ConsoleLogger.php
+++ b/app/code/Magento/Deploy/Console/ConsoleLogger.php
@@ -82,8 +82,8 @@ class ConsoleLogger extends AbstractLogger
         LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
-        LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
+        LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
+        LogLevel::INFO => OutputInterface::VERBOSITY_VERBOSE,
         LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG
     ];
 
diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 9a73dd5d65fc7..89cb3e4b30345 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -240,7 +240,7 @@ private function getBasicOptions()
             new InputArgument(
                 self::LANGUAGES_ARGUMENT,
                 InputArgument::IS_ARRAY,
-                'Space-separated list of ISO-636 language codes for which to output static view files.'
+                'Space-separated list of ISO-639 language codes for which to output static view files.'
             ),
         ];
     }
diff --git a/app/code/Magento/Deploy/Model/DeploymentConfig/Hash.php b/app/code/Magento/Deploy/Model/DeploymentConfig/Hash.php
index 780d36ddb27e0..17f418d9457d8 100644
--- a/app/code/Magento/Deploy/Model/DeploymentConfig/Hash.php
+++ b/app/code/Magento/Deploy/Model/DeploymentConfig/Hash.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Model\DeploymentConfig;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -97,7 +98,7 @@ public function regenerate($sectionName = null)
             $flag->setFlagData($hashes);
             $this->flagResource->save($flag);
         } catch (\Exception $exception) {
-            throw new LocalizedException(__('Hash has not been saved.'), $exception);
+            throw new LocalizedException(__("The hash isn't saved."), $exception);
         }
     }
 
diff --git a/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php b/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php
index 9a987c704dea0..efcc12e089491 100644
--- a/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php
+++ b/app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Model\DeploymentConfig;
 
 use Magento\Framework\App\DeploymentConfig\ValidatorInterface;
@@ -109,6 +110,8 @@ public function __construct(
     }
 
     /**
+     * Retrieves sections names
+     *
      * Retrieves names of sections for configuration files whose data is read from these files for import
      * to appropriate application sources.
      *
@@ -148,7 +151,9 @@ public function getImporters()
 
             foreach ($this->sort($this->importers) as $section => $importer) {
                 if (empty($importer['importer_class'])) {
-                    throw new ConfigurationMismatchException(__('Parameter "importer_class" must be present.'));
+                    throw new ConfigurationMismatchException(
+                        __('The parameter "importer_class" is missing. Set the "importer_class" and try again.')
+                    );
                 }
 
                 $sortedImporters[$section] = $importer['importer_class'];
@@ -184,14 +189,7 @@ public function getValidator($section)
     private function sort(array $data)
     {
         uasort($data, function (array $a, array $b) {
-            $a['sort_order'] = $this->getSortOrder($a);
-            $b['sort_order'] = $this->getSortOrder($b);
-
-            if ($a['sort_order'] == $b['sort_order']) {
-                return 0;
-            }
-
-            return ($a['sort_order'] < $b['sort_order']) ? -1 : 1;
+            return $this->getSortOrder($a) <=> $this->getSortOrder($b);
         });
 
         return $data;
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index 3dd28f4d3e820..59880d2d669b4 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Validator\Locale;
 use Magento\User\Model\ResourceModel\User\Collection as UserCollection;
 
 /**
@@ -100,6 +101,11 @@ class Filesystem
      */
     private $userCollection;
 
+    /**
+     * @var Locale
+     */
+    private $locale;
+
     /**
      * @param \Magento\Framework\App\DeploymentConfig\Writer $writer
      * @param \Magento\Framework\App\DeploymentConfig\Reader $reader
@@ -109,6 +115,9 @@ class Filesystem
      * @param \Magento\Framework\Filesystem\Driver\File $driverFile
      * @param \Magento\Store\Model\Config\StoreView $storeView
      * @param \Magento\Framework\ShellInterface $shell
+     * @param UserCollection|null $userCollection
+     * @param Locale|null $locale
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\DeploymentConfig\Writer $writer,
@@ -118,7 +127,9 @@ public function __construct(
         \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
         \Magento\Framework\Filesystem\Driver\File $driverFile,
         \Magento\Store\Model\Config\StoreView $storeView,
-        \Magento\Framework\ShellInterface $shell
+        \Magento\Framework\ShellInterface $shell,
+        UserCollection $userCollection = null,
+        Locale $locale = null
     ) {
         $this->writer = $writer;
         $this->reader = $reader;
@@ -128,6 +139,8 @@ public function __construct(
         $this->driverFile = $driverFile;
         $this->storeView = $storeView;
         $this->shell = $shell;
+        $this->userCollection = $userCollection ?: $this->objectManager->get(UserCollection::class);
+        $this->locale = $locale ?: $this->objectManager->get(Locale::class);
         $this->functionCallPath =
             PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
     }
@@ -193,16 +206,17 @@ protected function deployStaticContent(
     private function getAdminUserInterfaceLocales()
     {
         $locales = [];
-        foreach ($this->getUserCollection() as $user) {
+        foreach ($this->userCollection as $user) {
             $locales[] = $user->getInterfaceLocale();
         }
         return $locales;
     }
 
     /**
-     * Get used store and admin user locales
+     * Get used store and admin user locales.
      *
      * @return array
+     * @throws \InvalidArgumentException if unknown locale is provided by the store configuration
      */
     private function getUsedLocales()
     {
@@ -210,25 +224,19 @@ private function getUsedLocales()
             $this->storeView->retrieveLocales(),
             $this->getAdminUserInterfaceLocales()
         );
-        return array_unique($usedLocales);
-    }
 
-    /**
-     * Get user collection
-     *
-     * @return UserCollection
-     * @deprecated 100.1.0 Added to not break backward compatibility of the constructor signature
-     * by injecting the new dependency directly.
-     * The method can be removed in a future major release, when constructor signature can be changed.
-     */
-    private function getUserCollection()
-    {
-        if (!($this->userCollection instanceof UserCollection)) {
-            return \Magento\Framework\App\ObjectManager::getInstance()->get(
-                UserCollection::class
-            );
-        }
-        return $this->userCollection;
+        return array_map(
+            function ($locale) {
+                if (!$this->locale->isValid($locale)) {
+                    throw new \InvalidArgumentException(
+                        $locale . ' argument has invalid value, run info:language:list for list of available locales'
+                    );
+                }
+
+                return $locale;
+            },
+            array_unique($usedLocales)
+        );
     }
 
     /**
diff --git a/app/code/Magento/Deploy/Model/Mode.php b/app/code/Magento/Deploy/Model/Mode.php
index ba3e8652fd443..fe24fb297e978 100644
--- a/app/code/Magento/Deploy/Model/Mode.php
+++ b/app/code/Magento/Deploy/Model/Mode.php
@@ -8,6 +8,7 @@
 
 use Magento\Deploy\App\Mode\ConfigProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -49,11 +50,6 @@ class Mode
      */
     private $reader;
 
-    /**
-     * @var MaintenanceMode
-     */
-    private $maintenanceMode;
-
     /**
      * @var Filesystem
      */
@@ -78,16 +74,24 @@ class Mode
      */
     private $emulatedAreaProcessor;
 
+    /**
+     * @var MaintenanceModeEnabler
+     */
+    private $maintenanceModeEnabler;
+
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
      * @param Writer $writer
      * @param Reader $reader
-     * @param MaintenanceMode $maintenanceMode
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param Filesystem $filesystem
      * @param ConfigProvider $configProvider
      * @param ProcessorFacadeFactory $processorFacadeFactory
      * @param EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor
+     * @param MaintenanceModeEnabler $maintenanceModeEnabler
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         InputInterface $input,
@@ -98,13 +102,13 @@ public function __construct(
         Filesystem $filesystem,
         ConfigProvider $configProvider = null,
         ProcessorFacadeFactory $processorFacadeFactory = null,
-        EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor = null
+        EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor = null,
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         $this->input = $input;
         $this->output = $output;
         $this->writer = $writer;
         $this->reader = $reader;
-        $this->maintenanceMode = $maintenanceMode;
         $this->filesystem = $filesystem;
 
         $this->configProvider =
@@ -113,6 +117,8 @@ public function __construct(
             $processorFacadeFactory ?: ObjectManager::getInstance()->get(ProcessorFacadeFactory::class);
         $this->emulatedAreaProcessor =
             $emulatedAreaProcessor ?: ObjectManager::getInstance()->get(EmulatedAdminhtmlAreaProcessor::class);
+        $this->maintenanceModeEnabler =
+            $maintenanceModeEnabler ?: ObjectManager::getInstance()->get(MaintenanceModeEnabler::class);
     }
 
     /**
@@ -123,19 +129,23 @@ public function __construct(
      */
     public function enableProductionMode()
     {
-        $this->enableMaintenanceMode($this->output);
-        $previousMode = $this->getMode();
-        try {
-            // We have to turn on production mode before generation.
-            // We need this to enable generation of the "min" files.
-            $this->setStoreMode(State::MODE_PRODUCTION);
-            $this->filesystem->regenerateStatic($this->output);
-        } catch (LocalizedException $e) {
-            // We have to return store mode to previous state in case of error.
-            $this->setStoreMode($previousMode);
-            throw $e;
-        }
-        $this->disableMaintenanceMode($this->output);
+        $this->maintenanceModeEnabler->executeInMaintenanceMode(
+            function () {
+                $previousMode = $this->getMode();
+                try {
+                    // We have to turn on production mode before generation.
+                    // We need this to enable generation of the "min" files.
+                    $this->setStoreMode(State::MODE_PRODUCTION);
+                    $this->filesystem->regenerateStatic($this->output);
+                } catch (LocalizedException $e) {
+                    // We have to return store mode to previous state in case of error.
+                    $this->setStoreMode($previousMode);
+                    throw $e;
+                }
+            },
+            $this->output,
+            false
+        );
     }
 
     /**
@@ -167,6 +177,25 @@ public function enableDeveloperMode()
         $this->setStoreMode(State::MODE_DEVELOPER);
     }
 
+    /**
+     * Enable Default mode.
+     *
+     * @return void
+     */
+    public function enableDefaultMode()
+    {
+        $this->filesystem->cleanupFilesystem(
+            [
+                DirectoryList::CACHE,
+                DirectoryList::GENERATED_CODE,
+                DirectoryList::GENERATED_METADATA,
+                DirectoryList::TMP_MATERIALIZATION_DIR,
+                DirectoryList::STATIC_VIEW,
+            ]
+        );
+        $this->setStoreMode(State::MODE_DEFAULT);
+    }
+
     /**
      * Get current mode information
      *
@@ -207,7 +236,7 @@ private function saveAppConfigs($mode)
         $configs = $this->configProvider->getConfigs($this->getMode(), $mode);
         foreach ($configs as $path => $value) {
             $this->emulatedAreaProcessor->process(function () use ($path, $value) {
-                $this->processorFacadeFactory->create()->process(
+                $this->processorFacadeFactory->create()->processWithLockTarget(
                     $path,
                     $value,
                     ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
@@ -218,28 +247,4 @@ private function saveAppConfigs($mode)
             $this->output->writeln('Config "' . $path . ' = ' . $value . '" has been saved.');
         }
     }
-
-    /**
-     * Enable maintenance mode
-     *
-     * @param OutputInterface $output
-     * @return void
-     */
-    protected function enableMaintenanceMode(OutputInterface $output)
-    {
-        $this->maintenanceMode->set(true);
-        $output->writeln('Enabled maintenance mode');
-    }
-
-    /**
-     * Disable maintenance mode
-     *
-     * @param OutputInterface $output
-     * @return void
-     */
-    protected function disableMaintenanceMode(OutputInterface $output)
-    {
-        $this->maintenanceMode->set(false);
-        $output->writeln('Disabled maintenance mode');
-    }
 }
diff --git a/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php b/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
index 6ebc208ca6a97..0642593ac5528 100644
--- a/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
+++ b/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Model\Plugin;
 
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
@@ -49,7 +50,7 @@ public function beforeDispatch(FrontControllerInterface $subject, RequestInterfa
             throw new LocalizedException(
                 __(
                     'The configuration file has changed.'
-                    . ' Run app:config:import or setup:upgrade command to synchronize configuration.'
+                    . ' Run the "app:config:import" or the "setup:upgrade" command to synchronize the configuration.'
                 )
             );
         }
diff --git a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
index 8a464ca4bc627..b5fe0c78640e5 100644
--- a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
+++ b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
@@ -188,7 +188,7 @@ private function buildMap($filePath, $packagePath, $contentType)
             if (!isset($this->map[$filePath])) {
                 $this->map[$filePath] = [];
             }
-            array_push($this->map[$filePath], $resolvedMapPath);
+            $this->map[$filePath][] = $resolvedMapPath;
             $this->buildMap($resolvedMapPath, $packagePath, $contentType);
         };
         if ($content) {
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index e5e10c8f54a19..c4c31b8ff77bf 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -161,7 +161,7 @@ public function process()
             foreach ($packages as $name => $packageJob) {
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(3);
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
@@ -187,15 +187,44 @@ private function assertAndExecute($name, array & $packages, array $packageJob)
     {
         /** @var Package $package */
         $package = $packageJob['package'];
+        $dependenciesNotFinished = false;
         if ($package->getParent() && $package->getParent() !== $package) {
             foreach ($packageJob['dependencies'] as $dependencyName => $dependency) {
                 if (!$this->isDeployed($dependency)) {
-                    $this->assertAndExecute($dependencyName, $packages, $packages[$dependencyName]);
+                    //If it's not present in $packages then it's already
+                    //in progress so just waiting...
+                    if (!array_key_exists($dependencyName, $packages)) {
+                        $dependenciesNotFinished = true;
+                    } else {
+                        $this->assertAndExecute(
+                            $dependencyName,
+                            $packages,
+                            $packages[$dependencyName]
+                        );
+                    }
                 }
             }
         }
-        if (!$this->isDeployed($package)
-            && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))) {
+        $this->executePackage($package, $name, $packages, $dependenciesNotFinished);
+    }
+
+    /**
+     * @param Package $package
+     * @param string $name
+     * @param array $packages
+     * @param bool $dependenciesNotFinished
+     * @return void
+     */
+    private function executePackage(
+        Package $package,
+        string $name,
+        array &$packages,
+        bool $dependenciesNotFinished
+    ) {
+        if (!$dependenciesNotFinished
+            && !$this->isDeployed($package)
+            && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))
+        ) {
             unset($packages[$name]);
             $this->execute($package);
         }
@@ -214,7 +243,7 @@ private function awaitForAllProcesses()
                     unset($this->inProgress[$name]);
                 }
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(5);
         }
         if ($this->isCanBeParalleled()) {
diff --git a/app/code/Magento/Deploy/Service/Bundle.php b/app/code/Magento/Deploy/Service/Bundle.php
index fe6b36619126b..95c1d7d22a09f 100644
--- a/app/code/Magento/Deploy/Service/Bundle.php
+++ b/app/code/Magento/Deploy/Service/Bundle.php
@@ -23,7 +23,7 @@
 class Bundle
 {
     /**
-     * Path to package subdirectory wher bundle files are located
+     * Path to package subdirectory where bundle files are located
      */
     const BUNDLE_JS_DIR = 'js/bundle';
 
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
index 0522702cbdc2b..3b7b5b77a0793 100644
--- a/app/code/Magento/Deploy/Service/DeployPackage.php
+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -28,7 +28,7 @@ class DeployPackage
     private $appState;
 
     /**
-     * Locale resolver inetrface
+     * Locale resolver interface
      *
      * Check if given locale code is a valid one
      *
@@ -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])
@@ -267,7 +266,7 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi
         $this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));
 
         if (!$skipLogging) {
-            $this->logger->notice($logMessage);
+            $this->logger->info($logMessage);
         }
     }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE.txt b/app/code/Magento/Deploy/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE.txt
rename to app/code/Magento/Deploy/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE_AFL.txt b/app/code/Magento/Deploy/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE_AFL.txt
rename to app/code/Magento/Deploy/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Deploy/Test/Mftf/README.md b/app/code/Magento/Deploy/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c1852362d4ca3
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Deploy Functional Tests
+
+The Functional Test Module for **Magento Deploy** module.
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigStatusCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigStatusCommandTest.php
new file mode 100644
index 0000000000000..737ad55d5e09b
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigStatusCommandTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Test\Unit\Console\Command\App;
+
+use Magento\Deploy\Console\Command\App\ConfigStatusCommand;
+use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * @inheritdoc
+ */
+class ConfigStatusCommandTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * @var ConfigStatusCommand
+     */
+    private $command;
+    /**
+     * @var ChangeDetector
+     */
+    private $changeDetector;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->changeDetector = $this->getMockBuilder(ChangeDetector::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->command = new ConfigStatusCommand($this->changeDetector);
+    }
+
+    /**
+     * @param bool $hasChanges
+     * @param string $expectedMessage
+     * @param int $expectedCode
+     *
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute(bool $hasChanges, $expectedMessage, $expectedCode)
+    {
+        $this->changeDetector->expects($this->once())
+            ->method('hasChanges')
+            ->will($this->returnValue($hasChanges));
+
+        $tester = new CommandTester($this->command);
+        $tester->execute([]);
+
+        $this->assertEquals($expectedMessage, $tester->getDisplay());
+        $this->assertSame($expectedCode, $tester->getStatusCode());
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            'Config is up to date' => [
+                false,
+                'Config files are up to date.' . PHP_EOL,
+                Cli::RETURN_SUCCESS
+            ],
+            'Config needs update' => [
+                true,
+                'Config files have changed. ' .
+                'Run app:config:import or setup:upgrade command to synchronize configuration.' . PHP_EOL,
+                ConfigStatusCommand::EXIT_CODE_CONFIG_IMPORT_REQUIRED,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/CollectorFactoryTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/CollectorFactoryTest.php
index 155acd4c785f0..6ac84b1c83424 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/CollectorFactoryTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/CollectorFactoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Test\Unit\Console\Command\App\SensitiveConfigSet;
 
 use Magento\Deploy\Console\Command\App\SensitiveConfigSet\CollectorFactory;
@@ -60,7 +61,7 @@ public function testCreate()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Class for type "dummyType" was not declared
+     * @expectedExceptionMessage The class for "dummyType" type wasn't declared. Enter the class and try again.
      */
     public function testCreateNonExisted()
     {
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/ApplicationDumpCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/ApplicationDumpCommandTest.php
index 67c3796e7c6b9..85cae275932fa 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/ApplicationDumpCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/ApplicationDumpCommandTest.php
@@ -130,7 +130,7 @@ public function testExport()
             ->method('writeln')
             ->withConsecutive(
                 [['system' => 'Some comment message']],
-                ['<info>Done.</info>']
+                ['<info>Done. Config types dumped: system</info>']
             );
 
         $method = new \ReflectionMethod(ApplicationDumpCommand::class, 'execute');
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
index caa310535f356..588dd40ad6c4b 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Test\Unit\Console\Command;
 
 use Magento\Deploy\Console\Command\SetModeCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use Magento\Framework\App\State;
 
 /**
  * @package Magento\Deploy\Test\Unit\Console\Command
@@ -67,6 +67,18 @@ public function testSetDeveloperMode()
         );
     }
 
+    public function testSetDefaultMode()
+    {
+        $this->modeMock->expects($this->once())->method('enableDefaultMode');
+
+        $tester = new CommandTester($this->command);
+        $tester->execute(['mode' => 'default']);
+        $this->assertContains(
+            "default mode",
+            $tester->getDisplay()
+        );
+    }
+
     public function testSetProductionSkipCompilation()
     {
         $this->modeMock->expects($this->once())->method('enableProductionModeMinimal');
@@ -84,7 +96,7 @@ public function testSetInvalidMode()
         $tester = new CommandTester($this->command);
         $tester->execute(['mode' => 'invalid-mode']);
         $this->assertContains(
-            "Cannot switch into given mode",
+            'The mode can\'t be switched to "invalid-mode".',
             $tester->getDisplay()
         );
     }
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/HashTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/HashTest.php
index 4afe9aa267d69..a67f32eb36457 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/HashTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/HashTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Test\Unit\Model\DeploymentConfig;
 
 use Magento\Deploy\Model\DeploymentConfig\DataCollector;
@@ -137,7 +138,7 @@ public function testRegenerate()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Hash has not been saved
+     * @expectedExceptionMessage The hash isn't saved.
      */
     public function testRegenerateWithException()
     {
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php
index c9e101ed3a9e8..8a0284eb4f775 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php
@@ -55,7 +55,7 @@ public function testCreateWithInvalidArgumentException()
         $className = 'some/class/name';
 
         /** @var \StdClass|\PHPUnit_Framework_MockObject_MockObject $importerMock */
-        $importerMock = $this->getMockBuilder(\StdClass::class)
+        $importerMock = $this->getMockBuilder(\stdClass::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterPoolTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterPoolTest.php
index 73d90b4795d04..36c5dd9e734db 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterPoolTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterPoolTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Test\Unit\Model\DeploymentConfig;
 
 use Magento\Deploy\Model\DeploymentConfig\ImporterPool;
@@ -68,7 +69,7 @@ public function testGetImporters()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\ConfigurationMismatchException
-     * @expectedExceptionMessage Parameter "importer_class" must be present.
+     * @expectedExceptionMessage The parameter "importer_class" is missing. Set the "importer_class" and try again.
      */
     public function testGetImportersEmptyParameterClass()
     {
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php
index 1da524b37ca15..50960808781ab 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php
@@ -56,7 +56,7 @@ public function testCreateWrongImplementation()
     {
         $className = 'className';
 
-        $stdMock = $this->getMockBuilder(\StdClass::class)
+        $stdMock = $this->getMockBuilder(\stdClass::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->objectManagerMock->expects($this->once())
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
index 673f31c04ffd3..00f70c6527a0d 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
@@ -5,47 +5,64 @@
  */
 namespace Magento\Deploy\Test\Unit\Model;
 
+use Magento\Deploy\Model\Filesystem as DeployFilesystem;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\ShellInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\Config\StoreView;
+use Magento\User\Model\ResourceModel\User\Collection;
+use Magento\User\Model\User;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\Validator\Locale;
+use Magento\Framework\Setup\Lists;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FilesystemTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Store\Model\Config\StoreView
+     * @var StoreView|MockObject
      */
-    private $storeViewMock;
+    private $storeView;
 
     /**
-     * @var \Magento\Framework\ShellInterface
+     * @var ShellInterface|MockObject
      */
-    private $shellMock;
+    private $shell;
 
     /**
-     * @var \Magento\User\Model\ResourceModel\User\Collection
+     * @var OutputInterface|MockObject
      */
-    private $userCollectionMock;
+    private $output;
 
     /**
-     * @var \Symfony\Component\Console\Output\OutputInterface
+     * @var Filesystem|MockObject
      */
-    private $outputMock;
+    private $filesystem;
 
     /**
-     * @var \Magento\Framework\Filesystem
+     * @var WriteInterface|MockObject
      */
-    private $filesystemMock;
+    private $directoryWrite;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     * @var Collection|MockObject
      */
-    private $directoryWriteMock;
+    private $userCollection;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface|MockObject
      */
-    private $objectManagerMock;
+    private $objectManager;
 
     /**
-     * @var \Magento\Deploy\Model\Filesystem
+     * @var DeployFilesystem
      */
-    private $filesystem;
+    private $deployFilesystem;
 
     /**
      * @var string
@@ -54,75 +71,146 @@ class FilesystemTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->storeViewMock = $this->createMock(\Magento\Store\Model\Config\StoreView::class);
-        $this->shellMock = $this->createMock(\Magento\Framework\ShellInterface::class);
-        $this->userCollectionMock = $this->createMock(\Magento\User\Model\ResourceModel\User\Collection::class);
-        $this->outputMock = $this->createMock(\Symfony\Component\Console\Output\OutputInterface::class);
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
-        $this->directoryWriteMock = $this->createMock(\Magento\Framework\Filesystem\Directory\WriteInterface::class);
-        $this->filesystemMock->expects($this->any())
-            ->method('getDirectoryWrite')
-            ->willReturn($this->directoryWriteMock);
-        $this->filesystem = $objectManager->getObject(
-            \Magento\Deploy\Model\Filesystem::class,
+        $objectManager = new ObjectManager($this);
+
+        $this->storeView = $this->getMockBuilder(StoreView::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shell = $this->getMockBuilder(ShellInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->output = $this->getMockBuilder(OutputInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filesystem = $this->getMockBuilder(Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->directoryWrite = $this->getMockBuilder(WriteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filesystem->method('getDirectoryWrite')
+            ->willReturn($this->directoryWrite);
+
+        $this->userCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $lists = $this->getMockBuilder(Lists::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $lists->method('getLocaleList')
+            ->willReturn([
+                'fr_FR' => 'France',
+                'de_DE' => 'Germany',
+                'nl_NL' => 'Netherlands',
+                'en_US' => 'USA',
+            ]);
+        $locale = $objectManager->getObject(Locale::class, ['lists' => $lists]);
+
+        $this->deployFilesystem = $objectManager->getObject(
+            DeployFilesystem::class,
             [
-                'storeView' => $this->storeViewMock,
-                'shell' => $this->shellMock,
-                'filesystem' => $this->filesystemMock
+                'storeView' => $this->storeView,
+                'shell' => $this->shell,
+                'filesystem' => $this->filesystem,
+                'userCollection' => $this->userCollection,
+                'locale' => $locale,
             ]
         );
 
-        $userCollection = new \ReflectionProperty(\Magento\Deploy\Model\Filesystem::class, 'userCollection');
-        $userCollection->setAccessible(true);
-        $userCollection->setValue($this->filesystem, $this->userCollectionMock);
-
         $this->cmdPrefix = PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
     }
 
     public function testRegenerateStatic()
     {
         $storeLocales = ['fr_FR', 'de_DE', 'nl_NL'];
-        $adminUserInterfaceLocales = ['de_DE', 'en_US'];
-        $this->storeViewMock->expects($this->once())
-            ->method('retrieveLocales')
+        $this->storeView->method('retrieveLocales')
             ->willReturn($storeLocales);
-        $userMock = $this->createMock(\Magento\User\Model\User::class);
-        $userMock->expects($this->once())
-            ->method('getInterfaceLocale')
-            ->willReturn('en_US');
-        $this->userCollectionMock->expects($this->once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator([$userMock]));
-
-        $usedLocales = array_unique(
-            array_merge($storeLocales, $adminUserInterfaceLocales)
-        );
-        $staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
-            . implode(' ', $usedLocales);
+
         $setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
-        $this->shellMock->expects($this->at(0))
+        $this->shell->expects(self::at(0))
             ->method('execute')
             ->with($setupDiCompileCmd);
-        $this->shellMock->expects($this->at(1))
+
+        $this->initAdminLocaleMock('en_US');
+
+        $usedLocales = ['fr_FR', 'de_DE', 'nl_NL', 'en_US'];
+        $staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
+            . implode(' ', $usedLocales);
+        $this->shell->expects(self::at(1))
             ->method('execute')
             ->with($staticContentDeployCmd);
 
-        $this->outputMock->expects($this->at(0))
+        $this->output->expects(self::at(0))
             ->method('writeln')
             ->with('Starting compilation');
-        $this->outputMock->expects($this->at(2))
+        $this->output->expects(self::at(2))
             ->method('writeln')
             ->with('Compilation complete');
-        $this->outputMock->expects($this->at(3))
+        $this->output->expects(self::at(3))
             ->method('writeln')
             ->with('Starting deployment of static content');
-        $this->outputMock->expects($this->at(5))
+        $this->output->expects(self::at(5))
             ->method('writeln')
             ->with('Deployment of static content complete');
 
-        $this->filesystem->regenerateStatic($this->outputMock);
+        $this->deployFilesystem->regenerateStatic($this->output);
+    }
+
+    /**
+     * Checks a case when configuration contains incorrect locale code.
+     *
+     * @return void
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage ;echo argument has invalid value, run info:language:list for list of available locales
+     */
+    public function testGenerateStaticForNotAllowedStoreViewLocale()
+    {
+        $storeLocales = ['fr_FR', 'de_DE', ';echo'];
+        $this->storeView->method('retrieveLocales')
+            ->willReturn($storeLocales);
+
+        $this->initAdminLocaleMock('en_US');
+
+        $this->deployFilesystem->regenerateStatic($this->output);
+    }
+
+    /**
+     * Checks as case when admin locale is incorrect.
+     *
+     * @return void
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage ;echo argument has invalid value, run info:language:list for list of available locales
+     */
+    public function testGenerateStaticForNotAllowedAdminLocale()
+    {
+        $storeLocales = ['fr_FR', 'de_DE', 'en_US'];
+        $this->storeView->method('retrieveLocales')
+            ->willReturn($storeLocales);
+
+        $this->initAdminLocaleMock(';echo');
+
+        $this->deployFilesystem->regenerateStatic($this->output);
+    }
+
+    /**
+     * Initializes admin user locale.
+     *
+     * @param string $locale
+     * @return void
+     */
+    private function initAdminLocaleMock($locale)
+    {
+        /** @var User|MockObject $user */
+        $user = $this->getMockBuilder(User::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $user->method('getInterfaceLocale')
+            ->willReturn($locale);
+        $this->userCollection->method('getIterator')
+            ->willReturn(new \ArrayIterator([$user]));
     }
 }
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php b/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
index f80c6cb69f1a9..5cb8a8e47bc97 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
@@ -12,6 +12,7 @@
 use Magento\Deploy\Model\Filesystem;
 use Magento\Deploy\Model\Mode;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\MaintenanceMode;
@@ -124,7 +125,8 @@ protected function setUp()
             $this->filesystemMock,
             $this->configProvider,
             $this->processorFacadeFactory,
-            $this->emulatedAreaProcessor
+            $this->emulatedAreaProcessor,
+            new MaintenanceModeEnabler($this->maintenanceMock)
         );
     }
 
@@ -226,7 +228,7 @@ public function testEnableProductionModeMinimal()
             ->method('getConfigs')
             ->with('developer', 'production')
             ->willReturn([
-                'dev/debug/debug_logging' => 0
+                'dev/debug/debug_logging' => 0,
             ]);
         $this->emulatedAreaProcessor->expects($this->once())
             ->method('process')
@@ -239,7 +241,7 @@ public function testEnableProductionModeMinimal()
             ->willReturn($this->processorFacade);
         $this->processorFacade
             ->expects($this->once())
-            ->method('process')
+            ->method('processWithLockTarget')
             ->with(
                 'dev/debug/debug_logging',
                 0,
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php b/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
index 62cb1bab3b330..a3b6cf241b708 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Test\Unit\Model\Plugin;
 
 use Magento\Deploy\Model\Plugin\ConfigChangeDetector;
@@ -63,7 +64,7 @@ public function testBeforeDispatchWithoutException()
      * @return void
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @codingStandardsIgnoreStart
-     * @expectedExceptionMessage The configuration file has changed. Run app:config:import or setup:upgrade command to synchronize configuration.
+     * @expectedExceptionMessage The configuration file has changed. Run the "app:config:import" or the "setup:upgrade" command to synchronize the configuration.
      * @codingStandardsIgnoreEnd
      */
     public function testBeforeDispatchWithException()
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 3fe1c9800a730..75edc8cb4f6ee 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -187,6 +187,9 @@ public function testDeploy($options, $expectedContentVersion)
         $this->assertEquals(null, $this->service->deploy($options));
     }
 
+    /**
+     * @return array
+     */
     public function deployDataProvider()
     {
         return [
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index 8f44709594e00..bd1a14a131404 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-require-js": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-user": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-config": "*",
+        "magento/module-require-js": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Deploy/etc/di.xml b/app/code/Magento/Deploy/etc/di.xml
index e47fca3a6b946..fd604aa1b397b 100644
--- a/app/code/Magento/Deploy/etc/di.xml
+++ b/app/code/Magento/Deploy/etc/di.xml
@@ -31,6 +31,7 @@
                 <item name="dumpApplicationCommand" xsi:type="object">\Magento\Deploy\Console\Command\App\ApplicationDumpCommand</item>
                 <item name="sensitiveConfigSetCommand" xsi:type="object">\Magento\Deploy\Console\Command\App\SensitiveConfigSetCommand</item>
                 <item name="configImportCommand" xsi:type="object">Magento\Deploy\Console\Command\App\ConfigImportCommand</item>
+                <item name="configStatusCommand" xsi:type="object">Magento\Deploy\Console\Command\App\ConfigStatusCommand</item>
             </argument>
         </arguments>
     </type>
@@ -77,6 +78,9 @@
                     <item name="production" xsi:type="array">
                         <item name="dev/debug/debug_logging" xsi:type="string">0</item>
                     </item>
+                    <item name="developer" xsi:type="array">
+                        <item name="dev/debug/debug_logging" xsi:type="null" />
+                    </item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/Deploy/etc/module.xml b/app/code/Magento/Deploy/etc/module.xml
index a61f9e1546e05..d4785cd7a3112 100644
--- a/app/code/Magento/Deploy/etc/module.xml
+++ b/app/code/Magento/Deploy/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Deploy" setup_version="2.0.0">
+    <module name="Magento_Deploy" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php b/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
index f26f0d5e79325..5b8b79ef41392 100644
--- a/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
+++ b/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -22,6 +23,12 @@ class DevTestsRunCommand extends Command
      */
     const INPUT_ARG_TYPE = 'type';
 
+    /**
+     * PHPUnit arguments parameter
+     */
+    const INPUT_OPT_COMMAND_ARGUMENTS       = 'arguments';
+    const INPUT_OPT_COMMAND_ARGUMENTS_SHORT = 'c';
+
     /**
      * command name
      */
@@ -56,7 +63,13 @@ protected function configure()
             'Type of test to run. Available types: ' . implode(', ', array_keys($this->types)),
             'default'
         );
-
+        $this->addOption(
+            self::INPUT_OPT_COMMAND_ARGUMENTS,
+            self::INPUT_OPT_COMMAND_ARGUMENTS_SHORT,
+            InputOption::VALUE_REQUIRED,
+            'Additional arguments for PHPUnit. Example: "-c\'--filter=MyTest\'" (no spaces)',
+            ''
+        );
         parent::configure();
     }
 
@@ -87,6 +100,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $dirName = realpath(BP . '/dev/tests/' . $dir);
             chdir($dirName);
             $command = PHP_BINARY . ' ' . BP . '/' . $vendorDir . '/phpunit/phpunit/phpunit ' . $options;
+            if ($commandArguments = $input->getOption(self::INPUT_OPT_COMMAND_ARGUMENTS)) {
+                $command .= ' ' . $commandArguments;
+            }
             $message = $dirName . '> ' . $command;
             $output->writeln(['', str_pad("---- {$message} ", 70, '-'), '']);
             passthru($command, $returnVal);
diff --git a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
new file mode 100644
index 0000000000000..d224c13b5a6b4
--- /dev/null
+++ b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Console\Command;
+
+use Magento\Developer\Model\Di\Information;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Helper\Table;
+
+/**
+ * Allows to generate setup patches
+ */
+class GeneratePatchCommand extends Command
+{
+    /**
+     * Command arguments and options
+     */
+    const COMMAND_NAME = 'setup:db-declaration:generate-patch';
+    const MODULE_NAME = 'module';
+    const INPUT_KEY_IS_REVERTABLE = 'revertable';
+    const INPUT_KEY_PATCH_TYPE = 'type';
+    const INPUT_KEY_PATCH_NAME = 'patch';
+
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * GeneratePatchCommand constructor.
+     * @param ComponentRegistrar $componentRegistrar
+     */
+    public function __construct(ComponentRegistrar $componentRegistrar)
+    {
+        $this->componentRegistrar = $componentRegistrar;
+        parent::__construct();
+    }
+
+    /**
+     * Configure command
+     *
+     * @inheritdoc
+     * @throws InvalidArgumentException
+     */
+    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'
+                ),
+            ]);
+
+        parent::configure();
+    }
+
+    /**
+     * Patch template
+     *
+     * @return string
+     */
+    private function getPatchTemplate() : string
+    {
+        return file_get_contents(__DIR__ . '/patch_template.php.dist');
+    }
+
+    /**
+     * @inheritdoc
+     * @throws \InvalidArgumentException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) : int
+    {
+        $moduleName = $input->getArgument(self::MODULE_NAME);
+        $patchName = $input->getArgument(self::INPUT_KEY_PATCH_NAME);
+        $type = $input->getOption(self::INPUT_KEY_PATCH_TYPE);
+        $modulePath = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        $preparedModuleName = str_replace('_', '\\', $moduleName);
+        $preparedType = ucfirst($type);
+        $patchInterface = sprintf('%sPatchInterface', $preparedType);
+        $patchTemplateData = $this->getPatchTemplate();
+        $patchTemplateData = str_replace('%moduleName%', $preparedModuleName, $patchTemplateData);
+        $patchTemplateData = str_replace('%patchType%', $preparedType, $patchTemplateData);
+        $patchTemplateData = str_replace('%patchInterface%', $patchInterface, $patchTemplateData);
+        $patchTemplateData = str_replace('%class%', $patchName, $patchTemplateData);
+        $patchDir = $patchToFile = $modulePath . '/Setup/Patch/' . $preparedType;
+
+        if (!is_dir($patchDir)) {
+            mkdir($patchDir, 0777, true);
+        }
+        $patchToFile = $patchDir . '/' . $patchName . '.php';
+        file_put_contents($patchToFile, $patchTemplateData);
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php b/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php
new file mode 100644
index 0000000000000..c6c7fd8ca1cfd
--- /dev/null
+++ b/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Console\Command;
+
+use Magento\Framework\Filesystem\Io\File;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ProfilerDisableCommand extends Command
+{
+    /**
+     * Profiler flag file
+     */
+    const PROFILER_FLAG_FILE = 'var/profiler.flag';
+
+    /**
+     * Command name
+     */
+    const COMMAND_NAME = 'dev:profiler:disable';
+
+    /**
+     * Success message
+     */
+    const SUCCESS_MESSAGE = 'Profiler disabled.';
+
+    /**
+     * @var File
+     */
+    private $filesystem;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param File $filesystem
+     * @internal param ConfigInterface $resourceConfig
+     */
+    public function __construct(File $filesystem)
+    {
+        parent::__construct();
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_NAME)
+            ->setDescription('Disable the profiler.');
+
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \InvalidArgumentException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->filesystem->rm(BP . '/' . self::PROFILER_FLAG_FILE);
+        if (!$this->filesystem->fileExists(BP . '/' . self::PROFILER_FLAG_FILE)) {
+            $output->writeln('<info>'. self::SUCCESS_MESSAGE . '</info>');
+            return;
+        }
+        $output->writeln('<error>Something went wrong while disabling the profiler.</error>');
+    }
+}
diff --git a/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php b/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php
new file mode 100644
index 0000000000000..21e2f5780c4c5
--- /dev/null
+++ b/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Console\Command;
+
+use Magento\Framework\Filesystem\Io\File;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class ProfilerEnableCommand extends Command
+{
+    /**
+     * Profiler flag file
+     */
+    const PROFILER_FLAG_FILE = 'var/profiler.flag';
+
+    /**
+     * Profiler type default setting
+     */
+    const TYPE_DEFAULT = 'html';
+
+    /**
+     * Built in profiler types
+     */
+    const BUILT_IN_TYPES = ['html', 'csvfile'];
+
+    /**
+     * Command name
+     */
+    const COMMAND_NAME = 'dev:profiler:enable';
+
+    /**
+     * Success message
+     */
+    const SUCCESS_MESSAGE = 'Profiler enabled with %s output.';
+
+    /**
+     * @var File
+     */
+    private $filesystem;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param File $filesystem
+     * @internal param ConfigInterface $resourceConfig
+     */
+    public function __construct(File $filesystem)
+    {
+        parent::__construct();
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_NAME)
+            ->setDescription('Enable the profiler.')
+            ->addArgument('type', InputArgument::OPTIONAL, 'Profiler type');
+
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \InvalidArgumentException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $type = $input->getArgument('type');
+        if (!$type) {
+            $type = self::TYPE_DEFAULT;
+        }
+
+        if (!in_array($type, self::BUILT_IN_TYPES, true)) {
+            $builtInTypes = implode(', ', self::BUILT_IN_TYPES);
+            $output->writeln(
+                '<comment>'
+                . sprintf('Type %s is not one of the built-in output types (%s).', $type, $builtInTypes) .
+                '</comment>'
+            );
+        }
+
+        $this->filesystem->write(BP . '/' . self::PROFILER_FLAG_FILE, $type);
+        if ($this->filesystem->fileExists(BP . '/' . self::PROFILER_FLAG_FILE)) {
+            $output->write('<info>'. sprintf(self::SUCCESS_MESSAGE, $type) . '</info>');
+            if ($type == 'csvfile') {
+                $output->write(
+                    '<info> ' . sprintf(
+                        'Output will be saved in %s',
+                        \Magento\Framework\Profiler\Driver\Standard\Output\Csvfile::DEFAULT_FILEPATH
+                    )
+                    . '</info>'
+                );
+            }
+            $output->write(PHP_EOL);
+
+            return;
+        }
+        $output->writeln('<error>Something went wrong while enabling the profiler.</error>');
+    }
+}
diff --git a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
index 25519e5c83054..1680aee38dcd4 100644
--- a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
+++ b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Developer\Console\Command;
 
-use Magento\Framework\App\State;
 use Magento\Framework\Validator\Locale;
 use Magento\Framework\View\Asset\Repository;
 use Symfony\Component\Console\Command\Command;
@@ -81,7 +80,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -129,7 +128,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @throws \InvalidArgumentException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
new file mode 100644
index 0000000000000..2155efa017093
--- /dev/null
+++ b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Console\Command;
+
+use Magento\Developer\Model\Setup\Declaration\Schema\WhitelistGenerator;
+use Magento\Framework\Config\FileResolverByModule;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Command that allows to generate whitelist, that will be used, when declaration data is installed.
+ *
+ * If whitelist already exists, new values will be added to existing whitelist.
+ */
+class TablesWhitelistGenerateCommand extends Command
+{
+    /**
+     * Module name key, that will be used in whitelist generate command.
+     */
+    const MODULE_NAME_KEY = 'module-name';
+
+    /**
+     * @var WhitelistGenerator
+     */
+    private $whitelistGenerator;
+
+    /**
+     * @param WhitelistGenerator $whitelistGenerator
+     * @param string|null $name
+     */
+    public function __construct(
+        WhitelistGenerator $whitelistGenerator,
+        $name = null
+    ) {
+        $this->whitelistGenerator = $whitelistGenerator;
+        parent::__construct($name);
+    }
+
+    /**
+     * Initialization of the command.
+     *
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->setName('setup:db-declaration:generate-whitelist')
+            ->setDescription(
+                'Generate whitelist of tables and columns that are allowed to be edited by declaration installer'
+            )
+            ->setDefinition(
+                [
+                    new InputOption(
+                        self::MODULE_NAME_KEY,
+                        null,
+                        InputOption::VALUE_OPTIONAL,
+                        'Name of the module where whitelist will be generated',
+                        FileResolverByModule::ALL_MODULES
+                    )
+                ]
+            );
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) : int
+    {
+        $moduleName = $input->getOption(self::MODULE_NAME_KEY);
+
+        try {
+            $this->whitelistGenerator->generate($moduleName);
+        } catch (ConfigurationMismatchException $e) {
+            $output->writeln($e->getMessage());
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        } catch (\Exception $e) {
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        }
+
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/app/code/Magento/Developer/Console/Command/patch_template.php.dist b/app/code/Magento/Developer/Console/Command/patch_template.php.dist
new file mode 100644
index 0000000000000..c1b07246e644f
--- /dev/null
+++ b/app/code/Magento/Developer/Console/Command/patch_template.php.dist
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace %moduleName%\Setup\Patch\%patchType%;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+/**
+* Patch is mechanism, that allows to do atomic upgrade data changes
+*/
+class %class% implements
+    %patchInterface%
+{
+    /**
+     * @var ModuleDataSetupInterface $moduleDataSetup
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(ModuleDataSetupInterface $moduleDataSetup)
+    {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * Do Upgrade
+     *
+     * @return void
+     */
+    public function apply()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+
+        ];
+    }
+}
diff --git a/app/code/Magento/Developer/Model/Di/PluginList.php b/app/code/Magento/Developer/Model/Di/PluginList.php
index 0a1df8a974242..fc342b5051000 100644
--- a/app/code/Magento/Developer/Model/Di/PluginList.php
+++ b/app/code/Magento/Developer/Model/Di/PluginList.php
@@ -145,7 +145,10 @@ private function addPluginToList($pluginInstance, $pluginMethod, $methodTypes, $
             if (!array_key_exists($pluginInstance, $this->pluginList[$this->pluginTypeMapping[$typeCode]])) {
                 $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance] = [];
             }
-            $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance][] = $pluginMethod ;
+
+            if (!in_array($pluginMethod, $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance])) {
+                $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance][] = $pluginMethod;
+            }
         }
     }
 }
diff --git a/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php b/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php
new file mode 100644
index 0000000000000..6dc276a696f6f
--- /dev/null
+++ b/app/code/Magento/Developer/Model/Logger/Handler/Syslog.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Model\Logger\Handler;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Enable/disable syslog logging based on the store config setting.
+ */
+class Syslog extends \Magento\Framework\Logger\Handler\Syslog
+{
+    public const CONFIG_PATH = 'dev/syslog/syslog_logging';
+
+    /**
+     * Scope config.
+     *
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Deployment config.
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig Scope config
+     * @param DeploymentConfig $deploymentConfig Deployment config
+     * @param string $ident The string ident to be added to each message
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        DeploymentConfig $deploymentConfig,
+        string $ident
+    ) {
+        parent::__construct($ident);
+
+        $this->scopeConfig = $scopeConfig;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isHandling(array $record): bool
+    {
+        return parent::isHandling($record)
+            && $this->deploymentConfig->isAvailable()
+            && $this->scopeConfig->getValue(self::CONFIG_PATH);
+    }
+}
diff --git a/app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php b/app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php
new file mode 100644
index 0000000000000..5cdcc6eb99af5
--- /dev/null
+++ b/app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Model\Setup\Declaration\Schema;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Config\FileResolverByModule;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\Module\Dir;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
+use Magento\Framework\Setup\Declaration\Schema\Diff\Diff;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
+use Magento\Framework\Setup\JsonPersistor;
+
+/**
+ * Generate whitelist declaration declarative schema.
+ */
+class WhitelistGenerator
+{
+    /**
+     * @var SchemaConfig
+     */
+    private $schemaConfig;
+
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var JsonPersistor
+     */
+    private $jsonPersistor;
+
+    /**
+     * @var ReaderComposite
+     */
+    private $readerComposite;
+
+    /**
+     * @var array
+     */
+    private $primaryDbSchema;
+
+    /**
+     * @var ElementNameResolver
+     */
+    private $elementNameResolver;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @param ComponentRegistrar $componentRegistrar
+     * @param JsonPersistor $jsonPersistor
+     * @param SchemaConfig $schemaConfig
+     * @param ReaderComposite $readerComposite
+     * @param ElementNameResolver $elementNameResolver
+     * @param DeploymentConfig $deploymentConfig
+     */
+    public function __construct(
+        ComponentRegistrar $componentRegistrar,
+        JsonPersistor $jsonPersistor,
+        SchemaConfig $schemaConfig,
+        ReaderComposite $readerComposite,
+        ElementNameResolver $elementNameResolver,
+        DeploymentConfig $deploymentConfig
+    ) {
+        $this->componentRegistrar = $componentRegistrar;
+        $this->jsonPersistor = $jsonPersistor;
+        $this->schemaConfig = $schemaConfig;
+        $this->readerComposite = $readerComposite;
+        $this->elementNameResolver = $elementNameResolver;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * Generate whitelist declaration.
+     *
+     * @param string $moduleName
+     * @throws ConfigurationMismatchException
+     */
+    public function generate(string $moduleName)
+    {
+        $this->checkMagentoInstallation();
+        $schema = $this->schemaConfig->getDeclarationConfig();
+        if ($moduleName === FileResolverByModule::ALL_MODULES) {
+            foreach (array_keys($this->componentRegistrar->getPaths('module')) as $moduleName) {
+                $this->persistModule($schema, $moduleName);
+            }
+        } else {
+            $this->persistModule($schema, $moduleName);
+        }
+    }
+
+    /**
+     * Check the configuration of the installed instance.
+     *
+     * @throws ConfigurationMismatchException
+     */
+    private function checkMagentoInstallation()
+    {
+        $tablePrefixLength = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX);
+        if ($tablePrefixLength) {
+            throw new ConfigurationMismatchException(
+                __('Magento was installed with a table prefix. Please re-install without prefix.')
+            );
+        }
+    }
+
+    /**
+     * Update whitelist tables for all modules that are enabled on the moment.
+     *
+     * @param Schema $schema
+     * @param string $moduleName
+     * @return void
+     */
+    private function persistModule(Schema $schema, string $moduleName)
+    {
+        $content = [];
+        $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
+        $whiteListFileName = $modulePath
+            . DIRECTORY_SEPARATOR
+            . Dir::MODULE_ETC_DIR
+            . DIRECTORY_SEPARATOR
+            . Diff::GENERATED_WHITELIST_FILE_NAME;
+
+        //We need to load whitelist file and update it with new revision of code.
+        if (file_exists($whiteListFileName)) {
+            $content = json_decode(file_get_contents($whiteListFileName), true);
+        }
+
+        $data = $this->filterPrimaryTables($this->readerComposite->read($moduleName));
+        if (!empty($data['table'])) {
+            foreach ($data['table'] as $tableName => $tabledata) {
+                //Do merge between what we have before, and what we have now and filter to only certain attributes.
+                $content = array_replace_recursive(
+                    $content,
+                    [$tableName => $this->getElementsWithFixedName($tabledata)],
+                    [$tableName => $this->getElementsWithAutogeneratedName(
+                        $schema,
+                        $tableName,
+                        $tabledata
+                    )]
+                );
+            }
+            if (!empty($content)) {
+                $this->jsonPersistor->persist($content, $whiteListFileName);
+            }
+        }
+    }
+
+    /**
+     * Provide immutable names of the table elements.
+     *
+     * @param array $tableData
+     * @return array
+     */
+    private function getElementsWithFixedName(array $tableData): array
+    {
+        $declaredStructure = [];
+        if (!empty($tableData['column'])) {
+            $declaredColumns = array_keys($tableData['column']);
+            $declaredStructure['column'] = array_fill_keys($declaredColumns, true);
+        }
+        return $declaredStructure;
+    }
+
+    /**
+     * Provide autogenerated names of the table elements.
+     *
+     * @param Schema $schema
+     * @param string $tableName
+     * @param array $tableData
+     * @return array
+     */
+    private function getElementsWithAutogeneratedName(Schema $schema, string $tableName, array $tableData) : array
+    {
+        $declaredStructure = [];
+        $table = $schema->getTableByName($tableName);
+
+        $elementType = 'index';
+        if (!empty($tableData[$elementType])) {
+            foreach ($tableData[$elementType] as $tableElementData) {
+                $indexName = $this->elementNameResolver->getFullIndexName(
+                    $table,
+                    $tableElementData['column'],
+                    $tableElementData['indexType'] ?? null
+                );
+                $declaredStructure[$elementType][$indexName] = true;
+            }
+        }
+
+        $elementType = 'constraint';
+        if (!empty($tableData[$elementType])) {
+            foreach ($tableData[$elementType] as $tableElementData) {
+                if ($tableElementData['type'] === 'foreign') {
+                    $referenceTable = $schema->getTableByName($tableElementData['referenceTable']);
+                    $constraintName = $this->elementNameResolver->getFullFKName(
+                        $table,
+                        $table->getColumnByName($tableElementData['column']),
+                        $referenceTable,
+                        $referenceTable->getColumnByName($tableElementData['referenceColumn'])
+                    );
+                } else {
+                    $constraintName = $this->elementNameResolver->getFullIndexName(
+                        $table,
+                        $tableElementData['column'],
+                        $tableElementData['type']
+                    );
+                }
+                $declaredStructure[$elementType][$constraintName] = true;
+            }
+        }
+
+        return $declaredStructure;
+    }
+
+    /**
+     * Load db_schema content from the primary scope app/etc/db_schema.xml.
+     *
+     * @return array
+     */
+    private function getPrimaryDbSchema(): array
+    {
+        if (!$this->primaryDbSchema) {
+            $this->primaryDbSchema = $this->readerComposite->read('primary');
+        }
+        return $this->primaryDbSchema;
+    }
+
+    /**
+     * Filter tables from module database schema as they should not contain the primary system tables.
+     *
+     * @param array $moduleDbSchema
+     * @return array
+     */
+    private function filterPrimaryTables(array $moduleDbSchema): array
+    {
+        $primaryDbSchema = $this->getPrimaryDbSchema();
+        if (isset($moduleDbSchema['table']) && isset($primaryDbSchema['table'])) {
+            foreach (array_keys($primaryDbSchema['table']) as $tableNameKey) {
+                unset($moduleDbSchema['table'][$tableNameKey]);
+            }
+        }
+        return $moduleDbSchema;
+    }
+}
diff --git a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
index 30684b7177c99..1ced906cce763 100644
--- a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
+++ b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
@@ -6,11 +6,12 @@
 
 namespace Magento\Developer\Model\XmlCatalog\Format;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DomDocument\DomDocumentFactory;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
-use Magento\Framework\Filesystem\Directory\WriteFactory;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\File\WriteFactory;
 
 /**
  * Class PhpStorm generates URN catalog for PhpStorm 9
@@ -23,20 +24,28 @@ class PhpStorm implements FormatInterface
     private $currentDirRead;
 
     /**
-     * @var \Magento\Framework\Filesystem\File\WriteFactory
+     * @var WriteFactory
      */
     private $fileWriteFactory;
 
+    /**
+     * @var DomDocumentFactory
+     */
+    private $domDocumentFactory;
+
     /**
      * @param ReadFactory $readFactory
-     * @param \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory
+     * @param WriteFactory $fileWriteFactory
+     * @param DomDocumentFactory $domDocumentFactory
      */
     public function __construct(
         ReadFactory $readFactory,
-        \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory
+        WriteFactory $fileWriteFactory,
+        DomDocumentFactory $domDocumentFactory = null
     ) {
         $this->currentDirRead = $readFactory->create(getcwd());
         $this->fileWriteFactory = $fileWriteFactory;
+        $this->domDocumentFactory = $domDocumentFactory ?: ObjectManager::getInstance()->get(DomDocumentFactory::class);
     }
 
     /**
@@ -57,26 +66,21 @@ public function generateCatalog(array $dictionary, $configFilePath)
                 \Magento\Framework\Filesystem\DriverPool::FILE,
                 'r'
             );
-            $dom = new \DOMDocument();
-            $dom->loadXML($file->readAll());
+            $dom = $this->domDocumentFactory->create();
+            $fileContent = $file->readAll();
+            if (!empty($fileContent)) {
+                $dom->loadXML($fileContent);
+            } else {
+                $this->initEmptyFile($dom);
+            }
             $xpath = new \DOMXPath($dom);
             $nodeList = $xpath->query('/project');
             $projectNode = $nodeList->item(0);
             $file->close();
         } catch (FileSystemException $f) {
             //create file if does not exists
-            $dom = new \DOMDocument();
-            $projectNode = $dom->createElement('project');
-
-            //PhpStorm 9 version for component is "4"
-            $projectNode->setAttribute('version', '4');
-            $dom->appendChild($projectNode);
-            $rootComponentNode = $dom->createElement('component');
-
-            //PhpStorm 9 version for ProjectRootManager is "2"
-            $rootComponentNode->setAttribute('version', '2');
-            $rootComponentNode->setAttribute('name', 'ProjectRootManager');
-            $projectNode->appendChild($rootComponentNode);
+            $dom = $this->domDocumentFactory->create();
+            $projectNode = $this->initEmptyFile($dom);
         }
 
         $xpath = new \DOMXPath($dom);
@@ -103,4 +107,26 @@ public function generateCatalog(array $dictionary, $configFilePath)
         $file->write($dom->saveXML());
         $file->close();
     }
+
+    /**
+     * Setup basic empty dom elements
+     *
+     * @param \DOMDocument $dom
+     * @return \DOMElement
+     */
+    private function initEmptyFile(\DOMDocument $dom)
+    {
+        $projectNode = $dom->createElement('project');
+
+        //PhpStorm 9 version for component is "4"
+        $projectNode->setAttribute('version', '4');
+        $dom->appendChild($projectNode);
+        $rootComponentNode = $dom->createElement('component');
+
+        //PhpStorm 9 version for ProjectRootManager is "2"
+        $rootComponentNode->setAttribute('version', '2');
+        $rootComponentNode->setAttribute('name', 'ProjectRootManager');
+        $projectNode->appendChild($rootComponentNode);
+        return $projectNode;
+    }
 }
diff --git a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm/DomDocumentFactory.php b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm/DomDocumentFactory.php
new file mode 100644
index 0000000000000..3363f05ac4a3c
--- /dev/null
+++ b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm/DomDocumentFactory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Developer\Model\XmlCatalog\Format\PhpStorm;
+
+use DOMDocument;
+
+class DomDocumentFactory
+{
+    /**
+     * @var \Magento\Framework\DomDocument\DomDocumentFactory
+     */
+    private $documentFactory;
+
+    /**
+     * DomDocumentFactory constructor.
+     * @param \Magento\Framework\DomDocument\DomDocumentFactory $documentFactory
+     */
+    public function __construct(\Magento\Framework\DomDocument\DomDocumentFactory $documentFactory)
+    {
+        $this->documentFactory = $documentFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(string $data = null)
+    {
+        $dom = $this->documentFactory->create($data);
+
+        if (empty($data)) {
+            $this->initializeDocument($dom);
+        }
+
+        return $dom;
+    }
+
+    /**
+     * Initialize document to be used as 'misc.xml'
+     *
+     * @param DOMDocument $document
+     * @return DOMDocument
+     */
+    private function initializeDocument(DOMDocument $document)
+    {
+        $document->xmlVersion = '1.0';
+        $projectNode = $document->createElement('project');
+
+        //PhpStorm 9 version for component is "4"
+        $projectNode->setAttribute('version', '4');
+        $document->appendChild($projectNode);
+        $rootComponentNode = $document->createElement('component');
+
+        //PhpStorm 9 version for ProjectRootManager is "2"
+        $rootComponentNode->setAttribute('version', '2');
+        $rootComponentNode->setAttribute('name', 'ProjectRootManager');
+        $projectNode->appendChild($rootComponentNode);
+
+        return $document;
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE.txt b/app/code/Magento/Developer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE.txt
rename to app/code/Magento/Developer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE_AFL.txt b/app/code/Magento/Developer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE_AFL.txt
rename to app/code/Magento/Developer/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Developer/Test/Mftf/README.md b/app/code/Magento/Developer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a3510344ff79c
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Developer Functional Tests
+
+The Functional Test Module for **Magento Developer** module.
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
index 8ba3bd50ef301..dcd79cc0521a0 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
@@ -4,34 +4,101 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Developer\Test\Unit\Console\Command;
+// @codingStandardsIgnoreStart
 
-use Magento\Developer\Console\Command\DevTestsRunCommand;
-use Symfony\Component\Console\Tester\CommandTester;
+namespace Magento\Developer\Console\Command {
+    use Symfony\Component\Console\Tester\CommandTester;
 
-/**
- * Class DevTestsRunCommandTest
- *
- * Tests dev:tests:run command.  Only tests error case because DevTestsRunCommand calls phpunit with
- * passthru, so there is no good way to mock out running the tests.
- */
-class DevTestsRunCommandTest extends \PHPUnit\Framework\TestCase
-{
+    $devTestsRunCommandTestPassthruReturnVar = null;
 
     /**
-     * @var DevTestsRunCommand
+     * Mock for PHP builtin passthtru function
+     *
+     * @param string $command
+     * @param int|null $return_var
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    private $command;
-
-    protected function setUp()
+    function passthru($command, &$return_var = null)
     {
-        $this->command = new DevTestsRunCommand();
+        global $devTestsRunCommandTestPassthruReturnVar;
+        $return_var = $devTestsRunCommandTestPassthruReturnVar;
     }
 
-    public function testExecuteBadType()
+    /**
+     * Class DevTestsRunCommandTest
+     *
+     * Tests dev:tests:run command.  Only tests error case because DevTestsRunCommand calls phpunit with
+     * passthru, so there is no good way to mock out running the tests.
+     */
+    class DevTestsRunCommandTest extends \PHPUnit\Framework\TestCase
     {
-        $commandTester = new CommandTester($this->command);
-        $commandTester->execute([DevTestsRunCommand::INPUT_ARG_TYPE => 'bad']);
-        $this->assertContains('Invalid type: "bad"', $commandTester->getDisplay());
+
+        /**
+         * @var DevTestsRunCommand
+         */
+        private $command;
+
+        protected function setUp()
+        {
+            $this->command = new DevTestsRunCommand();
+        }
+
+        public function testExecuteBadType()
+        {
+            $commandTester = new CommandTester($this->command);
+            $commandTester->execute([DevTestsRunCommand::INPUT_ARG_TYPE => 'bad']);
+            $this->assertContains('Invalid type: "bad"', $commandTester->getDisplay());
+        }
+
+        public function testPassArgumentsToPHPUnit()
+        {
+            global $devTestsRunCommandTestPassthruReturnVar;
+
+            $devTestsRunCommandTestPassthruReturnVar = 0;
+
+            $commandTester = new CommandTester($this->command);
+            $commandTester->execute(
+                [
+                    DevTestsRunCommand::INPUT_ARG_TYPE => 'unit',
+                    '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites',
+                ]
+            );
+            $this->assertContains(
+                'phpunit  --list-suites',
+                $commandTester->getDisplay(),
+                'Parameters should be passed to PHPUnit'
+            );
+            $this->assertContains(
+                'PASSED (',
+                $commandTester->getDisplay(),
+                'PHPUnit runs should have passed'
+            );
+        }
+
+        public function testPassArgumentsToPHPUnitNegative()
+        {
+            global $devTestsRunCommandTestPassthruReturnVar;
+
+            $devTestsRunCommandTestPassthruReturnVar = 255;
+
+            $commandTester = new CommandTester($this->command);
+            $commandTester->execute(
+                [
+                    DevTestsRunCommand::INPUT_ARG_TYPE => 'unit',
+                    '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites',
+                ]
+            );
+            $this->assertContains(
+                'phpunit  --list-suites',
+                $commandTester->getDisplay(),
+                'Parameters should be passed to PHPUnit'
+            );
+            $this->assertContains(
+                'FAILED - ',
+                $commandTester->getDisplay(),
+                'PHPUnit runs should have passed'
+            );
+        }
     }
 }
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/ProfilerDisableCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/ProfilerDisableCommandTest.php
new file mode 100644
index 0000000000000..785413eb10de5
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/ProfilerDisableCommandTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Test\Unit\Console\Command;
+
+use Magento\Developer\Console\Command\ProfilerDisableCommand;
+use Magento\Framework\Filesystem\Io\File;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * Class ProfilerDisableCommandTest
+ *
+ * Tests dev:profiler:disable command.
+ */
+class ProfilerDisableCommandTest extends TestCase
+{
+    /**
+     * @var File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * Test disabling the profiler by command.
+     *
+     * @param bool $fileExists
+     * @param string $expectedOutput
+     * @dataProvider commandDataProvider
+     */
+    public function testCommand(bool $fileExists, string $expectedOutput)
+    {
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('rm')
+            ->with(BP . '/' . ProfilerDisableCommand::PROFILER_FLAG_FILE);
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('fileExists')
+            ->with(BP . '/' . ProfilerDisableCommand::PROFILER_FLAG_FILE)
+            ->willReturn($fileExists);
+        /** @var ProfilerDisableCommand $command */
+        $command = new ProfilerDisableCommand($this->filesystemMock);
+        $commandTester = new CommandTester($command);
+        $commandTester->execute([]);
+
+        self::assertEquals(
+            $expectedOutput,
+            trim(str_replace(PHP_EOL, ' ', $commandTester->getDisplay()))
+        );
+    }
+
+    /**
+     * Data provider for testCommand.
+     *
+     * @return array
+     */
+    public function commandDataProvider()
+    {
+        return [
+            [true, 'Something went wrong while disabling the profiler.'],
+            [false, 'Profiler disabled.'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->filesystemMock = $this->getMockBuilder(File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+}
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/ProfilerEnableCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/ProfilerEnableCommandTest.php
new file mode 100644
index 0000000000000..3efdf2d0ef5b8
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/ProfilerEnableCommandTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Test\Unit\Console\Command;
+
+use Magento\Developer\Console\Command\ProfilerEnableCommand;
+use Magento\Framework\Filesystem\Io\File;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * Class ProfilerEnableCommandTest
+ *
+ * Tests dev:profiler:enable command.
+ */
+class ProfilerEnableCommandTest extends TestCase
+{
+    /**
+     * @var File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * Tests enabling the profiler by command.
+     *
+     * @param string $inputType
+     * @param bool $fileExists
+     * @param string $expectedOutput
+     * @dataProvider commandDataProvider
+     */
+    public function testCommand(string $inputType, bool $fileExists, string $expectedOutput)
+    {
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('write')
+            ->with(
+                BP . '/' . ProfilerEnableCommand::PROFILER_FLAG_FILE,
+                $inputType ?: ProfilerEnableCommand::TYPE_DEFAULT
+            );
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('fileExists')
+            ->with(BP . '/' . ProfilerEnableCommand::PROFILER_FLAG_FILE)
+            ->willReturn($fileExists);
+        /** @var ProfilerEnableCommand $command */
+        $command = new ProfilerEnableCommand($this->filesystemMock);
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(['type' => $inputType]);
+
+        self::assertEquals(
+            $expectedOutput,
+            trim(str_replace(PHP_EOL, ' ', $commandTester->getDisplay()))
+        );
+    }
+
+    /**
+     * Data provider for testCommand.
+     *
+     * @return array
+     */
+    public function commandDataProvider()
+    {
+        return [
+            [
+                '',
+                true,
+                'Profiler enabled with html output.'
+            ],
+            [
+                '',
+                false,
+                'Something went wrong while enabling the profiler.'
+            ],
+            [
+                'html',
+                true,
+                'Profiler enabled with html output.'
+            ],
+            [
+                'html',
+                false,
+                'Something went wrong while enabling the profiler.'
+            ],
+            [
+                'csvfile',
+                true,
+                'Profiler enabled with csvfile output. Output will be saved in /var/log/profiler.csv'
+            ],
+            [
+                'csvfile',
+                false,
+                'Something went wrong while enabling the profiler.'
+            ],
+            [
+                'xml',
+                true,
+                'Type xml is not one of the built-in output types (html, csvfile). ' .
+                'Profiler enabled with xml output.'
+            ],
+            [
+                'xml',
+                false,
+                'Type xml is not one of the built-in output types (html, csvfile). ' .
+                'Something went wrong while enabling the profiler.'
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->filesystemMock = $this->getMockBuilder(File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+}
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/_files/test.xml b/app/code/Magento/Developer/Test/Unit/Console/Command/_files/test.xml
index ce31b046500f7..8112b9e8c46db 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/_files/test.xml
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/_files/test.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Cron" setup_version="2.0.0">
+    <module name="Magento_Cron" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Developer/Test/Unit/Helper/DataTest.php b/app/code/Magento/Developer/Test/Unit/Helper/DataTest.php
index 94d7cd250adda..9b964566f6093 100644
--- a/app/code/Magento/Developer/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Helper/DataTest.php
@@ -68,6 +68,9 @@ public function testIsDevAllowed($allowedIps, $expected, $callNum = 1)
         $this->assertEquals($expected, $this->helper->isDevAllowed($storeId));
     }
 
+    /**
+     * @return array
+     */
     public function isDevAllowedDataProvider()
     {
         return [
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php
new file mode 100644
index 0000000000000..c744645b670b4
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Test\Unit\Model\Logger\Handler;
+
+use Magento\Developer\Model\Logger\Handler\Syslog;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Logger\Monolog;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+
+/**
+ * @inheritdoc
+ */
+class SyslogTest extends TestCase
+{
+    /**
+     * @var Syslog
+     */
+    private $model;
+
+    /**
+     * @var ScopeConfigInterface|Mock
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var DeploymentConfig|Mock
+     */
+    private $deploymentConfigMock;
+
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+
+        $this->model = new Syslog(
+            $this->scopeConfigMock,
+            $this->deploymentConfigMock,
+            'Magento'
+        );
+    }
+
+    public function testIsHandling(): void
+    {
+        $record = [
+            'level' => Monolog::DEBUG,
+        ];
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(Syslog::CONFIG_PATH)
+            ->willReturn('1');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
+
+        $this->assertTrue(
+            $this->model->isHandling($record)
+        );
+    }
+
+    public function testIsHandlingNotInstalled(): void
+    {
+        $record = [
+            'level' => Monolog::DEBUG,
+        ];
+
+        $this->scopeConfigMock->expects($this->never())
+            ->method('getValue');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(false);
+
+        $this->assertFalse(
+            $this->model->isHandling($record)
+        );
+    }
+
+    public function testIsHandlingDisabled(): void
+    {
+        $record = [
+            'level' => Monolog::DEBUG,
+        ];
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(Syslog::CONFIG_PATH)
+            ->willReturn('0');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
+
+        $this->assertFalse(
+            $this->model->isHandling($record)
+        );
+    }
+}
diff --git a/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php b/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php
index d23fc89acc1b3..fd2475320261a 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php
@@ -33,6 +33,9 @@ public function testRender($showBlockHints)
         $this->assertNotNull($actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return ['block hints disabled' => [false], 'block hints enabled' => [true]];
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index 4905fa22b648b..31617a8d943c9 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -5,13 +5,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Developer/etc/adminhtml/system.xml b/app/code/Magento/Developer/etc/adminhtml/system.xml
index 9663cff72bc9d..4ebc45f1a2ca2 100644
--- a/app/code/Magento/Developer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Developer/etc/adminhtml/system.xml
@@ -6,7 +6,7 @@
  */-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="dev" translate="label">
+        <section id="dev">
             <group id="front_end_development_workflow" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Frontend Development Workflow</label>
                 <field id="type" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
@@ -25,13 +25,20 @@
                     <backend_model>Magento\Developer\Model\Config\Backend\AllowedIps</backend_model>
                 </field>
             </group>
-            <group id="debug" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="debug" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <field id="debug_logging" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Log to File</label>
                     <comment>Not available in production mode.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
+            <group id="syslog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Syslog</label>
+                <field id="syslog_logging" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Log to Syslog</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml
index ca35c38a31b68..98adcbb3a8295 100644
--- a/app/code/Magento/Developer/etc/di.xml
+++ b/app/code/Magento/Developer/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\Framework\Logger\Handler\Debug" type="Magento\Developer\Model\Logger\Handler\Debug"/>
+    <preference for="Magento\Framework\Logger\Handler\Syslog" type="Magento\Developer\Model\Logger\Handler\Syslog"/>
 
     <type name="Magento\Framework\View\Result\Page">
         <arguments>
@@ -94,6 +95,7 @@
         <arguments>
             <argument name="commands" xsi:type="array">
                 <item name="dev_tests_run" xsi:type="object">Magento\Developer\Console\Command\DevTestsRunCommand</item>
+                <item name="whitelist_generation" xsi:type="object">Magento\Developer\Console\Command\TablesWhitelistGenerateCommand</item>
                 <item name="dev_source_theme_deploy" xsi:type="object">Magento\Developer\Console\Command\SourceThemeDeployCommand</item>
                 <item name="xml_converter" xsi:type="object">Magento\Developer\Console\Command\XmlConverterCommand</item>
                 <item name="xml_catalog_generator" xsi:type="object">Magento\Developer\Console\Command\XmlCatalogGenerateCommand</item>
@@ -102,6 +104,9 @@
                 <item name="dev_query_log_disable" xsi:type="object">Magento\Developer\Console\Command\QueryLogDisableCommand</item>
                 <item name="dev_template_hints_disable" xsi:type="object">Magento\Developer\Console\Command\TemplateHintsDisableCommand</item>
                 <item name="dev_template_hints_enable" xsi:type="object">Magento\Developer\Console\Command\TemplateHintsEnableCommand</item>
+                <item name="dev_profiler_disable" xsi:type="object">Magento\Developer\Console\Command\ProfilerDisableCommand</item>
+                <item name="dev_profiler_enable" xsi:type="object">Magento\Developer\Console\Command\ProfilerEnableCommand</item>
+                <item name="dev_generate_patch" xsi:type="object">Magento\Developer\Console\Command\GeneratePatchCommand</item>
             </argument>
         </arguments>
     </type>
@@ -235,4 +240,12 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
+        <arguments>
+            <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
+            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
+            <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Developer/etc/frontend/di.xml b/app/code/Magento/Developer/etc/frontend/di.xml
index 329c158d897a9..aa4b347260209 100644
--- a/app/code/Magento/Developer/etc/frontend/di.xml
+++ b/app/code/Magento/Developer/etc/frontend/di.xml
@@ -9,11 +9,4 @@
     <type name="Magento\Framework\View\TemplateEngineFactory">
         <plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
     </type>
-    <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
-        <arguments>
-            <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
-            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
-            <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/Developer/etc/module.xml b/app/code/Magento/Developer/etc/module.xml
index 96a8828b00c4b..e3cf8132e3e92 100644
--- a/app/code/Magento/Developer/etc/module.xml
+++ b/app/code/Magento/Developer/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Developer" setup_version="2.0.0">
+    <module name="Magento_Developer" >
         <sequence>
             <module name="Magento_Config"/>
         </sequence>
diff --git a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
index deeb769c808fa..bf94a3b5c89ad 100644
--- a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
+++ b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
@@ -86,7 +86,7 @@ public function _construct()
             )
         );
 
-        $this->setTemplate('unitofmeasure.phtml');
+        $this->setTemplate('Magento_Dhl::unitofmeasure.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 9a26efee744d5..d997db6ac1a3e 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -232,7 +232,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
      * @param array $data
-     * @param \Magento\Dhl\Model\Validator\XmlValidatorFactory $xmlValidatorFactory
+     * @param \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -1263,8 +1263,20 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return $this|\Magento\Framework\DataObject|boolean
+     * @deprecated
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
+    {
+        return $this->processAdditionalValidation($request);
+    }
+
+    /**
+     * Processing additional validation to check is carrier applicable.
+     *
+     * @param \Magento\Framework\DataObject $request
+     * @return $this|\Magento\Framework\DataObject|boolean
+     */
+    public function processAdditionalValidation(\Magento\Framework\DataObject $request)
     {
         //Skip by item validation if there is no items in request
         if (!count($this->getAllItems($request))) {
@@ -1409,7 +1421,9 @@ protected function _doRequest()
         if (!$originRegion) {
             $xml->addChild('RequestedPickupTime', 'N', '');
         }
-        $xml->addChild('NewShipper', 'N', '');
+        if ($originRegion !== 'AP') {
+            $xml->addChild('NewShipper', 'N', '');
+        }
         $xml->addChild('LanguageCode', 'EN', '');
         $xml->addChild('PiecesEnabled', 'Y', '');
 
@@ -1451,7 +1465,9 @@ protected function _doRequest()
         }
 
         $nodeConsignee->addChild('City', $rawRequest->getRecipientAddressCity());
-        $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
+        if ($originRegion !== 'AP') {
+            $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
+        }
         $nodeConsignee->addChild('PostalCode', $rawRequest->getRecipientAddressPostalCode());
         $nodeConsignee->addChild('CountryCode', $rawRequest->getRecipientAddressCountryCode());
         $nodeConsignee->addChild(
@@ -1500,7 +1516,9 @@ protected function _doRequest()
         $nodeShipper = $xml->addChild('Shipper', '', '');
         $nodeShipper->addChild('ShipperID', (string)$this->getConfigData('account'));
         $nodeShipper->addChild('CompanyName', $rawRequest->getShipperContactCompanyName());
-        $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
+        if ($originRegion !== 'AP') {
+            $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
+        }
 
         $address = $rawRequest->getShipperAddressStreet1() . ' ' . $rawRequest->getShipperAddressStreet2();
         $address = $this->string->split($address, 35, false, true);
@@ -1513,7 +1531,9 @@ protected function _doRequest()
         }
 
         $nodeShipper->addChild('City', $rawRequest->getShipperAddressCity());
-        $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
+        if ($originRegion !== 'AP') {
+            $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
+        }
         $nodeShipper->addChild('PostalCode', $rawRequest->getShipperAddressPostalCode());
         $nodeShipper->addChild('CountryCode', $rawRequest->getShipperAddressCountryCode());
         $nodeShipper->addChild(
@@ -1533,7 +1553,7 @@ protected function _doRequest()
 
         $responseBody = $this->_getCachedQuotes($request);
         if ($responseBody === null) {
-            $debugData = ['request' => $request];
+            $debugData = ['request' => $this->filterDebugData($request)];
             try {
                 /** @var \Magento\Framework\HTTP\ZendClient $client */
                 $client = $this->_httpClientFactory->create();
@@ -1542,7 +1562,7 @@ protected function _doRequest()
                 $client->setRawData($request);
                 $responseBody = $client->request(\Magento\Framework\HTTP\ZendClient::POST)->getBody();
                 $responseBody = utf8_decode($responseBody);
-                $debugData['result'] = $responseBody;
+                $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
             } catch (\Exception $e) {
                 $this->_errors[$e->getCode()] = $e->getMessage();
@@ -1727,7 +1747,7 @@ protected function _getXMLTracking($trackings)
 
         $responseBody = $this->_getCachedQuotes($request);
         if ($responseBody === null) {
-            $debugData = ['request' => $request];
+            $debugData = ['request' => $this->filterDebugData($request)];
             try {
                 /** @var \Magento\Framework\HTTP\ZendClient $client */
                 $client = $this->_httpClientFactory->create();
@@ -1735,7 +1755,7 @@ protected function _getXMLTracking($trackings)
                 $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
                 $client->setRawData($request);
                 $responseBody = $client->request(\Magento\Framework\HTTP\ZendClient::POST)->getBody();
-                $debugData['result'] = $responseBody;
+                $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
             } catch (\Exception $e) {
                 $this->_errors[$e->getCode()] = $e->getMessage();
@@ -1950,6 +1970,6 @@ protected function isDutiable($origCountryId, $destCountryId)
 
         return
             self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
-            && !$this->_isDomestic;
+            || !$this->_isDomestic;
     }
 }
diff --git a/app/code/Magento/Dhl/Model/Validator/XmlValidator.php b/app/code/Magento/Dhl/Model/Validator/XmlValidator.php
index a489832b47b20..762dcbe5939c2 100644
--- a/app/code/Magento/Dhl/Model/Validator/XmlValidator.php
+++ b/app/code/Magento/Dhl/Model/Validator/XmlValidator.php
@@ -49,7 +49,7 @@ public function validate($xmlResponse, $isShippingLabel = false)
     {
         if (strlen(trim($xmlResponse)) > 0 && strpos(trim($xmlResponse), '<?xml') === 0) {
             if (!$this->xmlSecurity->scan($xmlResponse)) {
-                throw new DocumentValidationException(__('Security validation of XML document has been failed.'));
+                throw new DocumentValidationException(__('The security validation of the XML document has failed.'));
             }
             $xml = simplexml_load_string($xmlResponse, \Magento\Shipping\Model\Simplexml\Element::class);
 
diff --git a/app/code/Magento/Dhl/Setup/InstallData.php b/app/code/Magento/Dhl/Setup/InstallData.php
deleted file mode 100644
index 48f359aa63659..0000000000000
--- a/app/code/Magento/Dhl/Setup/InstallData.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Dhl\Setup;
-
-use Magento\Framework\Locale\Bundle\DataBundle;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Locale list
-     *
-     * @var ResolverInterface
-     */
-    private $localeResolver;
-
-    /**
-     * Init
-     *
-     * @param ResolverInterface $localeResolver
-     */
-    public function __construct(ResolverInterface $localeResolver)
-    {
-        $this->localeResolver = $localeResolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $days = (new DataBundle())->get(
-            $this->localeResolver->getLocale()
-        )['calendar']['gregorian']['dayNames']['format']['abbreviated'];
-
-        $select = $setup->getConnection()->select()->from(
-            $setup->getTable('core_config_data'),
-            ['config_id', 'value']
-        )->where(
-            'path = ?',
-            'carriers/dhl/shipment_days'
-        );
-
-        foreach ($setup->getConnection()->fetchAll($select) as $configRow) {
-            $row = [
-                'value' => implode(
-                    ',',
-                    array_intersect_key(iterator_to_array($days), array_flip(explode(',', $configRow['value'])))
-                )
-            ];
-            $setup->getConnection()->update(
-                $setup->getTable('core_config_data'),
-                $row,
-                ['config_id = ?' => $configRow['config_id']]
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php b/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php
new file mode 100644
index 0000000000000..8b91b842c36e6
--- /dev/null
+++ b/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Dhl\Setup\Patch\Data;
+
+use Magento\Framework\Locale\Bundle\DataBundle;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class PrepareShipmentDays
+ * @package Magento\Dhl\Setup\Patch
+ */
+class PrepareShipmentDays implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * PrepareShipmentDays constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param ResolverInterface $localeResolver
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Framework\Locale\ResolverInterface $localeResolver
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->localeResolver = $localeResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $days = (new DataBundle())->get(
+            $this->localeResolver->getLocale()
+        )['calendar']['gregorian']['dayNames']['format']['abbreviated'];
+
+        $select = $this->moduleDataSetup->getConnection()->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            ['config_id', 'value']
+        )->where(
+            'path = ?',
+            'carriers/dhl/shipment_days'
+        );
+        foreach ($this->moduleDataSetup->getConnection()->fetchAll($select) as $configRow) {
+            $row = [
+                'value' => implode(
+                    ',',
+                    array_intersect_key(iterator_to_array($days), array_flip(explode(',', $configRow['value'])))
+                )
+            ];
+            $this->moduleDataSetup->getConnection()->update(
+                $this->moduleDataSetup->getTable('core_config_data'),
+                $row,
+                ['config_id = ?' => $configRow['config_id']]
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE.txt b/app/code/Magento/Dhl/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE.txt
rename to app/code/Magento/Dhl/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE_AFL.txt b/app/code/Magento/Dhl/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE_AFL.txt
rename to app/code/Magento/Dhl/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Dhl/Test/Mftf/README.md b/app/code/Magento/Dhl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..4be86fcefb775
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Dhl Functional Tests
+
+The Functional Test Module for **Magento Dhl** module.
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 6fa063d2c273b..96c76a17bc317 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -5,14 +5,34 @@
  */
 namespace Magento\Dhl\Test\Unit\Model;
 
+use Magento\Dhl\Model\Carrier;
+use Magento\Dhl\Model\Validator\XmlValidator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Module\Dir\Reader;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory;
+use Magento\Quote\Model\Quote\Address\RateResult\Method;
+use Magento\Quote\Model\Quote\Address\RateResult\MethodFactory;
+use Magento\Sales\Model\Order;
+use Magento\Shipping\Helper\Carrier as CarrierHelper;
+use Magento\Shipping\Model\Rate\Result;
+use Magento\Shipping\Model\Rate\ResultFactory;
+use Magento\Shipping\Model\Shipment\Request;
+use Magento\Shipping\Model\Simplexml\Element;
+use Magento\Shipping\Model\Simplexml\ElementFactory;
+use Magento\Store\Model\StoreManager;
+use Magento\Store\Model\Website;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Dhl\Model\Validator\XmlValidator;
+use Psr\Log\LoggerInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -30,17 +50,17 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $httpResponse;
 
     /**
-     * @var \Magento\Dhl\Model\Carrier
+     * @var Carrier
      */
     private $model;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\Error|MockObject
+     * @var Error|MockObject
      */
     private $error;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory|MockObject
+     * @var ErrorFactory|MockObject
      */
     private $errorFactory;
 
@@ -60,19 +80,23 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $xmlValidator;
 
     /**
-     * @var \Magento\Shipping\Model\Shipment\Request|MockObject
+     * @var Request|MockObject
      */
     private $request;
 
     /**
-     * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
 
-        $this->request = $this->getMockBuilder(\Magento\Shipping\Model\Shipment\Request::class)
+        $this->request = $this->getMockBuilder(Request::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -92,137 +116,39 @@ protected function setUp()
             ->getMock();
 
         $this->scope = $this->getMockForAbstractClass(ScopeConfigInterface::class);
-        $this->scope->method('getValue')
-            ->willReturnCallback([$this, 'scopeConfigGetValue']);
 
-        // xml element factory
-        $xmlElFactory = $this->getMockBuilder(
-            \Magento\Shipping\Model\Simplexml\ElementFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
-        $xmlElFactory->expects($this->any())->method('create')->will(
-            $this->returnCallback(
-                function ($data) {
-                    $helper = new ObjectManager($this);
+        $xmlElFactory = $this->getXmlFactory();
+        $rateFactory = $this->getRateFactory();
+        $rateMethodFactory = $this->getRateMethodFactory();
+        $httpClientFactory = $this->getHttpClientFactory();
+        $configReader = $this->getConfigReader();
+        $readFactory = $this->getReadFactory();
+        $storeManager = $this->getStoreManager();
 
-                    return $helper->getObject(
-                        \Magento\Shipping\Model\Simplexml\Element::class,
-                        ['data' => $data['data']]
-                    );
-                }
-            )
-        );
-
-        // rate factory
-        $rateFactory = $this->getMockBuilder(
-            \Magento\Shipping\Model\Rate\ResultFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
-        $rateResult = $this->getMockBuilder(
-            \Magento\Shipping\Model\Rate\Result::class
-        )->disableOriginalConstructor()->setMethods(
-            null
-        )->getMock();
-        $rateFactory->expects($this->any())->method('create')->will($this->returnValue($rateResult));
-
-        // rate method factory
-        $rateMethodFactory = $this->getMockBuilder(
-            \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
-        $rateMethod = $this->getMockBuilder(
-            \Magento\Quote\Model\Quote\Address\RateResult\Method::class
-        )->disableOriginalConstructor()->setMethods(
-            ['setPrice']
-        )->getMock();
-        $rateMethod->expects($this->any())->method('setPrice')->will($this->returnSelf());
-        $rateMethodFactory->expects($this->any())->method('create')->will($this->returnValue($rateMethod));
-
-        // Http mocks
-        $this->httpResponse = $this->getMockBuilder(\Zend_Http_Response::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->httpClient = $this->getMockBuilder(ZendClient::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['request'])
-            ->getMock();
-        $this->httpClient->method('request')
-            ->willReturn($this->httpResponse);
-        $httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $httpClientFactory->method('create')
-            ->willReturn($this->httpClient);
-
-        // Config reader mock
-        $configReader = $this->getMockBuilder(\Magento\Framework\Module\Dir\Reader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $configReader->method('getModuleDir')->willReturn('/etc/path');
-
-        // XML Reader mock to retrieve list of acceptable countries
-        $modulesDirectory = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\Directory\Read::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getRelativePath', 'readFile']
-        )->getMock();
-        $modulesDirectory->expects(
-            $this->any()
-        )->method(
-            'readFile'
-        )->will(
-            $this->returnValue(file_get_contents(__DIR__ . '/_files/countries.xml'))
-        );
-        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
-        $readFactory->expects($this->any())->method('create')->willReturn($modulesDirectory);
-
-        // Website Mock
-        $storeManager = $this->getMockBuilder(
-            \Magento\Store\Model\StoreManager::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getWebsite']
-        )->getMock();
-        $website = $this->getMockBuilder(
-            \Magento\Store\Model\Website::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getBaseCurrencyCode', '__wakeup']
-        )->getMock();
-        $website->expects($this->any())->method('getBaseCurrencyCode')->will($this->returnValue('USD'));
-        $storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($website));
-
-        // Error Mock
-        $this->error = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\RateResult\Error::class)
+        $this->error = $this->getMockBuilder(Error::class)
             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
             ->getMock();
-        $this->errorFactory = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory::class)
+        $this->errorFactory = $this->getMockBuilder(ErrorFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->errorFactory->expects($this->any())->method('create')->willReturn($this->error);
+        $this->errorFactory->method('create')
+            ->willReturn($this->error);
 
-        // Locale Mock
-        $localeResolver = $this->getMockForAbstractClass(\Magento\Framework\Locale\ResolverInterface::class);
-        $localeResolver->method('getLocale')->willReturn('fr_FR');
-        $carrierHelper = $this->objectManager->getObject(
-            \Magento\Shipping\Helper\Carrier::class,
-            [
-                'localeResolver' => $localeResolver
-            ]
-        );
+        $carrierHelper = $this->getCarrierHelper();
 
-        // Xml Validator Mock
-        $this->xmlValidator = $this->getMockBuilder(\Magento\Dhl\Model\Validator\XmlValidator::class)
+        $this->xmlValidator = $this->getMockBuilder(XmlValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
+
         $this->model = $this->objectManager->getObject(
-            \Magento\Dhl\Model\Carrier::class,
+            Carrier::class,
             [
                 'scopeConfig' => $this->scope,
                 'xmlSecurity' => new Security(),
+                'logger' => $this->logger,
                 'xmlElFactory' => $xmlElFactory,
                 'rateFactory' => $rateFactory,
                 'rateErrorFactory' => $this->errorFactory,
@@ -264,6 +190,7 @@ public function scopeConfigGetValue($path)
             'carriers/dhl/height' => '1.6',
             'carriers/dhl/width' => '1.6',
             'carriers/dhl/depth' => '1.6',
+            'carriers/dhl/debug' => 1,
             'shipping/origin/country_id' => 'GB',
         ];
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
@@ -314,7 +241,7 @@ public function prepareShippingLabelContentExceptionDataProvider()
      */
     protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
     {
-        $model = $this->objectManager->getObject(\Magento\Dhl\Model\Carrier::class);
+        $model = $this->objectManager->getObject(Carrier::class);
         $method = new \ReflectionMethod($model, '_prepareShippingLabelContent');
         $method->setAccessible(true);
         return $method->invoke($model, $xml);
@@ -322,12 +249,14 @@ protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
 
     public function testCollectRates()
     {
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
         $this->scope->method('isSetFlag')
             ->willReturn(true);
 
         $this->httpResponse->method('getBody')
             ->willReturn(file_get_contents(__DIR__ . '/_files/success_dhl_response_rates.xml'));
-        $this->xmlValidator->expects($this->any())->method('validate');
 
         /** @var RateRequest $request */
         $request = $this->objectManager->getObject(
@@ -339,6 +268,10 @@ public function testCollectRates()
         $rawPostData = $reflectionClass->getProperty('raw_post_data');
         $rawPostData->setAccessible(true);
 
+        $this->logger->expects($this->once())
+            ->method('debug')
+            ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
+
         self::assertNotEmpty($this->model->collectRates($request)->getAllRates());
         self::assertContains('<Weight>18.223</Weight>', $rawPostData->getValue($this->httpClient));
         self::assertContains('<Height>0.630</Height>', $rawPostData->getValue($this->httpClient));
@@ -348,6 +281,9 @@ public function testCollectRates()
 
     public function testCollectRatesErrorMessage()
     {
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
         $this->scope->expects($this->once())->method('isSetFlag')->willReturn(false);
 
         $this->error->expects($this->once())->method('setCarrier')->with('dhl');
@@ -375,9 +311,11 @@ public function testCollectRatesFail()
      */
     public function testRequestToShipment()
     {
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
         $this->httpResponse->method('getBody')
             ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
-        $this->xmlValidator->expects($this->any())->method('validate');
 
         $packages = [
             'package' => [
@@ -389,37 +327,53 @@ public function testRequestToShipment()
                     'weight_units' => 'POUND',
                     'weight' => '0.454000000001',
                     'customs_value' => '10.00',
-                    'container' => \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_NON_DOC,
+                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
                 ],
                 'items' => [
                     'item1' => [
                         'name' => 'item_name',
                     ],
                 ],
-            ]
+            ],
         ];
 
-        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+        $order = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $order->expects($this->any())->method('getSubtotal')->willReturn('10.00');
+        $order->method('getSubtotal')
+            ->willReturn('10.00');
 
-        $shipment = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+        $shipment = $this->getMockBuilder(Order\Shipment::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $shipment->expects($this->any())->method('getOrder')->willReturn($order);
-
-        $this->request->expects($this->any())->method('getPackages')->willReturn($packages);
-        $this->request->expects($this->any())->method('getOrigCountryId')->willReturn('GB');
-        $this->request->expects($this->any())->method('setPackages')->willReturnSelf();
-        $this->request->expects($this->any())->method('setPackageWeight')->willReturnSelf();
-        $this->request->expects($this->any())->method('setPackageValue')->willReturnSelf();
-        $this->request->expects($this->any())->method('setValueWithDiscount')->willReturnSelf();
-        $this->request->expects($this->any())->method('setPackageCustomsValue')->willReturnSelf();
-        $this->request->expects($this->any())->method('setFreeMethodWeight')->willReturnSelf();
-        $this->request->expects($this->any())->method('getPackageWeight')->willReturn('0.454000000001');
-        $this->request->expects($this->any())->method('getFreeMethodWeight')->willReturn('0.454000000001');
-        $this->request->expects($this->any())->method('getOrderShipment')->willReturn($shipment);
+        $shipment->method('getOrder')
+            ->willReturn($order);
+
+        $this->request->method('getPackages')
+            ->willReturn($packages);
+        $this->request->method('getOrigCountryId')
+            ->willReturn('GB');
+        $this->request->method('setPackages')
+            ->willReturnSelf();
+        $this->request->method('setPackageWeight')
+            ->willReturnSelf();
+        $this->request->method('setPackageValue')
+            ->willReturnSelf();
+        $this->request->method('setValueWithDiscount')
+            ->willReturnSelf();
+        $this->request->method('setPackageCustomsValue')
+            ->willReturnSelf();
+        $this->request->method('setFreeMethodWeight')
+            ->willReturnSelf();
+        $this->request->method('getPackageWeight')
+            ->willReturn('0.454000000001');
+        $this->request->method('getFreeMethodWeight')
+            ->willReturn('0.454000000001');
+        $this->request->method('getOrderShipment')
+            ->willReturn($shipment);
+
+        $this->logger->method('debug')
+            ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
 
         $result = $this->model->requestToShipment($this->request);
 
@@ -447,6 +401,78 @@ public function requestToShipmentDataProvider()
             ]
         ];
     }
+
+    /**
+     * Test that shipping label request for origin country from AP region doesn't contain restricted fields.
+     *
+     * @return void
+     */
+    public function testShippingLabelRequestForAsiaPacificRegion()
+    {
+        $this->scope->method('getValue')
+            ->willReturnMap(
+                [
+                    ['shipping/origin/country_id', ScopeInterface::SCOPE_STORE, null, 'SG'],
+                    ['carriers/dhl/gateway_url', ScopeInterface::SCOPE_STORE, null, 'https://xmlpi-ea.dhl.com'],
+                ]
+            );
+
+        $this->httpResponse->method('getBody')
+            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
+
+        $packages = [
+            'package' => [
+                'params' => [
+                    'width' => '1',
+                    'length' => '1',
+                    'height' => '1',
+                    'dimension_units' => 'INCH',
+                    'weight_units' => 'POUND',
+                    'weight' => '0.45',
+                    'customs_value' => '10.00',
+                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
+                ],
+                'items' => [
+                    'item1' => [
+                        'name' => 'item_name',
+                    ],
+                ],
+            ],
+        ];
+
+        $this->request->method('getPackages')->willReturn($packages);
+        $this->request->method('getOrigCountryId')->willReturn('SG');
+        $this->request->method('setPackages')->willReturnSelf();
+        $this->request->method('setPackageWeight')->willReturnSelf();
+        $this->request->method('setPackageValue')->willReturnSelf();
+        $this->request->method('setValueWithDiscount')->willReturnSelf();
+        $this->request->method('setPackageCustomsValue')->willReturnSelf();
+
+        $result = $this->model->requestToShipment($this->request);
+
+        $reflectionClass = new \ReflectionObject($this->httpClient);
+        $rawPostData = $reflectionClass->getProperty('raw_post_data');
+        $rawPostData->setAccessible(true);
+
+        $this->assertNotNull($result);
+        $requestXml = $rawPostData->getValue($this->httpClient);
+
+        $this->assertNotContains(
+            'NewShipper',
+            $requestXml,
+            'NewShipper is restricted field for AP region'
+        );
+        $this->assertNotContains(
+            'Division',
+            $requestXml,
+            'Division is restricted field for AP region'
+        );
+        $this->assertNotContains(
+            'RegisteredAccount',
+            $requestXml,
+            'RegisteredAccount is restricted field for AP region'
+        );
+    }
     
     /**
      * @dataProvider dhlProductsDataProvider
@@ -466,7 +492,7 @@ public function dhlProductsDataProvider() : array
     {
         return [
             'doc' => [
-                'docType' => \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_DOC,
+                'docType' => Carrier::DHL_CONTENT_TYPE_DOC,
                 'products' => [
                     '2' => 'Easy shop',
                     '5' => 'Sprintline',
@@ -488,10 +514,10 @@ public function dhlProductsDataProvider() : array
                     'S' => 'Same day',
                     'T' => 'Express 12:00',
                     'X' => 'Express envelope',
-                ]
+                ],
             ],
             'non-doc' => [
-                'docType' => \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_NON_DOC,
+                'docType' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
                 'products' => [
                     '1' => 'Domestic express 12:00',
                     '3' => 'Easy shop',
@@ -506,8 +532,172 @@ public function dhlProductsDataProvider() : array
                     'M' => 'Express 10:30',
                     'V' => 'Europack',
                     'Y' => 'Express 12:00',
-                ]
-            ]
+                ],
+            ],
         ];
     }
+
+    /**
+     * Creates mock for XML factory.
+     *
+     * @return ElementFactory|MockObject
+     */
+    private function getXmlFactory(): MockObject
+    {
+        $xmlElFactory = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $xmlElFactory->method('create')
+            ->willReturnCallback(
+                function ($data) {
+                    $helper = new ObjectManager($this);
+
+                    return $helper->getObject(
+                        Element::class,
+                        ['data' => $data['data']]
+                    );
+                }
+            );
+
+        return $xmlElFactory;
+    }
+
+    /**
+     * Creates mock for rate factory.
+     *
+     * @return ResultFactory|MockObject
+     */
+    private function getRateFactory(): MockObject
+    {
+        $rateFactory = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $rateResult = $this->getMockBuilder(Result::class)
+            ->disableOriginalConstructor()
+            ->setMethods(null)
+            ->getMock();
+        $rateFactory->method('create')
+            ->willReturn($rateResult);
+
+        return $rateFactory;
+    }
+
+    /**
+     * Creates mock for rate method factory.
+     *
+     * @return MethodFactory|MockObject
+     */
+    private function getRateMethodFactory(): MockObject
+    {
+        $rateMethodFactory = $this->getMockBuilder(MethodFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $rateMethod = $this->getMockBuilder(Method::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setPrice'])
+            ->getMock();
+        $rateMethod->method('setPrice')
+            ->willReturnSelf();
+        $rateMethodFactory->method('create')
+            ->willReturn($rateMethod);
+
+        return $rateMethodFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getConfigReader(): MockObject
+    {
+        $configReader = $this->getMockBuilder(Reader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configReader->method('getModuleDir')
+            ->willReturn('/etc/path');
+
+        return $configReader;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getReadFactory(): MockObject
+    {
+        $modulesDirectory = $this->getMockBuilder(Read::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRelativePath', 'readFile'])
+            ->getMock();
+        $modulesDirectory->method('readFile')
+            ->willReturn(file_get_contents(__DIR__ . '/_files/countries.xml'));
+        $readFactory = $this->createMock(ReadFactory::class);
+        $readFactory->method('create')
+            ->willReturn($modulesDirectory);
+
+        return $readFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getStoreManager(): MockObject
+    {
+        $storeManager = $this->getMockBuilder(StoreManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getWebsite'])
+            ->getMock();
+        $website = $this->getMockBuilder(Website::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseCurrencyCode', '__wakeup'])
+            ->getMock();
+        $website->method('getBaseCurrencyCode')
+            ->willReturn('USD');
+        $storeManager->method('getWebsite')
+            ->willReturn($website);
+
+        return $storeManager;
+    }
+
+    /**
+     * @return CarrierHelper
+     */
+    private function getCarrierHelper(): CarrierHelper
+    {
+        $localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $localeResolver->method('getLocale')
+            ->willReturn('fr_FR');
+        $carrierHelper = $this->objectManager->getObject(
+            CarrierHelper::class,
+            [
+                'localeResolver' => $localeResolver,
+            ]
+        );
+
+        return $carrierHelper;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getHttpClientFactory(): MockObject
+    {
+        $this->httpResponse = $this->getMockBuilder(\Zend_Http_Response::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->httpClient = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['request'])
+            ->getMock();
+        $this->httpClient->method('request')
+            ->willReturn($this->httpResponse);
+        $httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpClientFactory->method('create')
+            ->willReturn($this->httpClient);
+
+        return $httpClientFactory;
+    }
 }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php b/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php
index 3d7893fea118f..26d879422389d 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php
@@ -123,7 +123,7 @@ public function invalidXmlResponseProvider()
             [
                 [
                     'file' => 'invalidDHLResponse.xml',
-                    'errorMessage' => 'Security validation of XML document has been failed.',
+                    'errorMessage' => 'The security validation of the XML document has failed.',
                     'isGenerateXml' => false,
                 ],
             ],
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index 4f61112fbd974..a4c491e7a6cd4 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -5,24 +5,23 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-checkout": "100.3.*"
+        "magento/module-checkout": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
index c0f7e209ad61b..91ed6c6568a70 100644
--- a/app/code/Magento/Dhl/etc/adminhtml/system.xml
+++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml
@@ -94,7 +94,7 @@
                         <field id="content_type">N</field>
                     </depends>
                 </field>
-                <field id="ready_time" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="ready_time" translate="label comment" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Ready time</label>
                     <comment>Package ready time after order submission (in hours)</comment>
                 </field>
diff --git a/app/code/Magento/Dhl/etc/module.xml b/app/code/Magento/Dhl/etc/module.xml
index 4723b14763a12..b1af1baf97fc2 100644
--- a/app/code/Magento/Dhl/etc/module.xml
+++ b/app/code/Magento/Dhl/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Dhl" setup_version="2.0.0">
+    <module name="Magento_Dhl" >
     </module>
 </config>
diff --git a/app/code/Magento/Directory/Block/Currency.php b/app/code/Magento/Directory/Block/Currency.php
index 3e8afcd0ed059..00c1cc387cfe8 100644
--- a/app/code/Magento/Directory/Block/Currency.php
+++ b/app/code/Magento/Directory/Block/Currency.php
@@ -98,7 +98,7 @@ public function getCurrencies()
     }
 
     /**
-     * Retrieve Currency Swith URL
+     * Retrieve Currency Switch URL
      *
      * @return string
      */
diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
index ca2b4b95b5574..333e9e03706b9 100644
--- a/app/code/Magento/Directory/Block/Data.php
+++ b/app/code/Magento/Directory/Block/Data.php
@@ -6,6 +6,8 @@
 namespace Magento\Directory\Block;
 
 /**
+ * Directory data block
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Data extends \Magento\Framework\View\Element\Template
@@ -67,6 +69,8 @@ public function __construct(
     }
 
     /**
+     * Returns load url for regions
+     *
      * @return string
      */
     public function getLoadrRegionUrl()
@@ -75,6 +79,8 @@ public function getLoadrRegionUrl()
     }
 
     /**
+     * Returns country collection instance
+     *
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */
     public function getCountryCollection()
@@ -103,6 +109,8 @@ protected function getTopDestinations()
     }
 
     /**
+     * Returns country html select
+     *
      * @param null|string $defValue
      * @param string $name
      * @param string $id
@@ -146,6 +154,8 @@ public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id
     }
 
     /**
+     * Returns region collection
+     *
      * @return \Magento\Directory\Model\ResourceModel\Region\Collection
      */
     public function getRegionCollection()
@@ -160,6 +170,8 @@ public function getRegionCollection()
     }
 
     /**
+     * Returns region html select
+     *
      * @return string
      */
     public function getRegionHtmlSelect()
@@ -184,7 +196,7 @@ public function getRegionHtmlSelect()
         )->setClass(
             'required-entry validate-state'
         )->setValue(
-            intval($this->getRegionId())
+            (int)$this->getRegionId()
         )->setOptions(
             $options
         )->getHtml();
@@ -193,6 +205,8 @@ public function getRegionHtmlSelect()
     }
 
     /**
+     * Returns country id
+     *
      * @return string
      */
     public function getCountryId()
@@ -205,6 +219,8 @@ public function getCountryId()
     }
 
     /**
+     * Returns regions js
+     *
      * @return string
      */
     public function getRegionsJs()
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index 99e1d1ad5394e..3a5558e6d6f3d 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -6,7 +6,15 @@
 
 namespace Magento\Directory\Helper;
 
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Directory\Model\ResourceModel\Country\Collection;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
+use Magento\Framework\App\Cache\Type\Config;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Json\Helper\Data as JsonData;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Directory data helper
@@ -53,7 +61,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Country collection
      *
-     * @var \Magento\Directory\Model\ResourceModel\Country\Collection
+     * @var Collection
      */
     protected $_countryCollection;
 
@@ -86,47 +94,49 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_optZipCountries = null;
 
     /**
-     * @var \Magento\Framework\App\Cache\Type\Config
+     * @var Config
      */
     protected $_configCacheType;
 
     /**
-     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+     * @var CollectionFactory
      */
     protected $_regCollectionFactory;
 
     /**
-     * @var \Magento\Framework\Json\Helper\Data
+     * @var JsonData
      */
     protected $jsonHelper;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @var \Magento\Directory\Model\CurrencyFactory
+     * @var CurrencyFactory
      */
     protected $_currencyFactory;
 
     /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
-     * @param \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection
-     * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regCollectionFactory,
-     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
+     * Data constructor.
+     *
+     * @param Context $context
+     * @param Config $configCacheType
+     * @param Collection $countryCollection
+     * @param CollectionFactory $regCollectionFactory
+     * @param JsonData $jsonHelper
+     * @param StoreManagerInterface $storeManager
+     * @param CurrencyFactory $currencyFactory
      */
     public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Cache\Type\Config $configCacheType,
-        \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection,
-        \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regCollectionFactory,
-        \Magento\Framework\Json\Helper\Data $jsonHelper,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory
+        Context $context,
+        Config $configCacheType,
+        Collection $countryCollection,
+        CollectionFactory $regCollectionFactory,
+        JsonData $jsonHelper,
+        StoreManagerInterface $storeManager,
+        CurrencyFactory $currencyFactory
     ) {
         parent::__construct($context);
         $this->_configCacheType = $configCacheType;
@@ -155,7 +165,7 @@ public function getRegionCollection()
      * Retrieve country collection
      *
      * @param null|int|string|\Magento\Store\Model\Store $store
-     * @return \Magento\Directory\Model\ResourceModel\Country\Collection
+     * @return Collection
      */
     public function getCountryCollection($store = null)
     {
@@ -169,6 +179,7 @@ public function getCountryCollection($store = null)
      * Retrieve regions data json
      *
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getRegionJson()
     {
@@ -197,8 +208,10 @@ public function getRegionJson()
      * @param float $amount
      * @param string $from
      * @param string $to
+     *
      * @return float
      * @SuppressWarnings(PHPMD.ShortVariable)
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function currencyConvert($amount, $from, $to = null)
     {
@@ -251,7 +264,7 @@ public function isZipCodeOptional($countryCode)
      * Returns the list of countries, for which region is required
      *
      * @param boolean $asJson
-     * @return array
+     * @return array|string
      */
     public function getCountriesWithStatesRequired($asJson = false)
     {
@@ -275,7 +288,7 @@ public function getCountriesWithStatesRequired($asJson = false)
      */
     public function isShowNonRequiredState()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_ALL_STATES,
             ScopeInterface::SCOPE_STORE
         );
@@ -303,7 +316,10 @@ public function isRegionRequired($countryId)
      */
     public function getBaseCurrencyCode()
     {
-        return $this->scopeConfig->getValue(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE, 'default');
+        return $this->scopeConfig->getValue(
+            Currency::XML_PATH_CURRENCY_BASE,
+            'default'
+        );
     }
 
     /**
diff --git a/app/code/Magento/Directory/Model/AllowedCountries.php b/app/code/Magento/Directory/Model/AllowedCountries.php
index 46fa04ba22651..b9f2d829dd1a6 100644
--- a/app/code/Magento/Directory/Model/AllowedCountries.php
+++ b/app/code/Magento/Directory/Model/AllowedCountries.php
@@ -46,8 +46,8 @@ public function __construct(
     /**
      * Retrieve all allowed countries for scope or scopes
      *
-     * @param string | null $scopeCode
      * @param string $scope
+     * @param string|null $scopeCode
      * @return array
      * @since 100.1.2
      */
@@ -55,7 +55,7 @@ public function getAllowedCountries(
         $scope = ScopeInterface::SCOPE_WEBSITE,
         $scopeCode = null
     ) {
-        if (empty($scopeCode)) {
+        if ($scopeCode === null) {
             $scopeCode = $this->getDefaultScopeCode($scope);
         }
 
diff --git a/app/code/Magento/Directory/Model/Config/Source/Country.php b/app/code/Magento/Directory/Model/Config/Source/Country.php
index e807f34456e24..a38ac4b62e1ee 100644
--- a/app/code/Magento/Directory/Model/Config/Source/Country.php
+++ b/app/code/Magento/Directory/Model/Config/Source/Country.php
@@ -20,6 +20,13 @@ class Country implements \Magento\Framework\Option\ArrayInterface
      */
     protected $_countryCollection;
 
+    /**
+     * Options array
+     *
+     * @var array
+     */
+    protected $_options;
+
     /**
      * @param \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection
      */
@@ -28,13 +35,6 @@ public function __construct(\Magento\Directory\Model\ResourceModel\Country\Colle
         $this->_countryCollection = $countryCollection;
     }
 
-    /**
-     * Options array
-     *
-     * @var array
-     */
-    protected $_options;
-
     /**
      * Return options array
      *
diff --git a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
index f9b9463b16a87..e3c4e17c4bd75 100644
--- a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
+++ b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
@@ -16,11 +16,10 @@
 class Full extends \Magento\Directory\Model\Config\Source\Country implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * @param bool $isMultiselect
-     * @return array
+     * @inheritdoc
      */
-    public function toOptionArray($isMultiselect = false)
+    public function toOptionArray($isMultiselect = false, $foregroundCountries = '')
     {
-        return parent::toOptionArray(true);
+        return parent::toOptionArray(true, $foregroundCountries);
     }
 }
diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
index 4e2758b362a43..97d22633af03c 100644
--- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Directory\Model\Config\Source;
 
 /**
@@ -14,10 +15,23 @@
 class WeightUnit implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * {@inheritdoc}
+     * @var string
+     */
+    const CODE_LBS = 'lbs';
+
+    /**
+     * @var string
+     */
+    const CODE_KGS = 'kgs';
+
+    /**
+     * @inheritdoc
      */
     public function toOptionArray()
     {
-        return [['value' => 'lbs', 'label' => __('lbs')], ['value' => 'kgs', 'label' => __('kgs')]];
+        return [
+            ['value' => self::CODE_LBS, 'label' => __('lbs')],
+            ['value' => self::CODE_KGS, 'label' => __('kgs')]
+        ];
     }
 }
diff --git a/app/code/Magento/Directory/Model/CountryInformationAcquirer.php b/app/code/Magento/Directory/Model/CountryInformationAcquirer.php
index 4eaa18d9672d1..69c8f21f5a235 100644
--- a/app/code/Magento/Directory/Model/CountryInformationAcquirer.php
+++ b/app/code/Magento/Directory/Model/CountryInformationAcquirer.php
@@ -103,7 +103,7 @@ public function getCountryInfo($countryId)
         if (!$country) {
             throw new NoSuchEntityException(
                 __(
-                    'Requested country is not available.'
+                    "The country isn't available."
                 )
             );
         }
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index a8df4936b8fae..6a2ebb4531502 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Directory\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Directory\Model\Currency\Filter;
 
@@ -65,6 +66,11 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      */
     protected $_localeCurrency;
 
+    /**
+     * @var CurrencyConfig
+     */
+    private $currencyConfig;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -76,6 +82,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param CurrencyConfig $currencyConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -88,7 +95,8 @@ public function __construct(
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        CurrencyConfig $currencyConfig = null
     ) {
         parent::__construct(
             $context,
@@ -102,6 +110,7 @@ public function __construct(
         $this->_directoryHelper = $directoryHelper;
         $this->_currencyFilterFactory = $currencyFilterFactory;
         $this->_localeCurrency = $localeCurrency;
+        $this->currencyConfig = $currencyConfig ?: ObjectManager::getInstance()->get(CurrencyConfig::class);
     }
 
     /**
@@ -216,7 +225,7 @@ public function convert($price, $toCurrency = null)
         if ($toCurrency === null) {
             return $price;
         } elseif ($rate = $this->getRate($toCurrency)) {
-            return $price * $rate;
+            return (float)$price * (float)$rate;
         }
 
         throw new \Exception(__(
@@ -347,7 +356,7 @@ public function getOutputFormat()
      */
     public function getConfigAllowCurrencies()
     {
-        $allowedCurrencies = $this->_getResource()->getConfigCurrencies($this, self::XML_PATH_CURRENCY_ALLOW);
+        $allowedCurrencies = $this->currencyConfig->getConfigCurrencies(self::XML_PATH_CURRENCY_ALLOW);
         $appBaseCurrencyCode = $this->_directoryHelper->getBaseCurrencyCode();
         if (!in_array($appBaseCurrencyCode, $allowedCurrencies)) {
             $allowedCurrencies[] = $appBaseCurrencyCode;
@@ -369,8 +378,7 @@ public function getConfigAllowCurrencies()
      */
     public function getConfigDefaultCurrencies()
     {
-        $defaultCurrencies = $this->_getResource()->getConfigCurrencies($this, self::XML_PATH_CURRENCY_DEFAULT);
-        return $defaultCurrencies;
+        return $this->currencyConfig->getConfigCurrencies(self::XML_PATH_CURRENCY_DEFAULT);
     }
 
     /**
@@ -378,8 +386,7 @@ public function getConfigDefaultCurrencies()
      */
     public function getConfigBaseCurrencies()
     {
-        $defaultCurrencies = $this->_getResource()->getConfigCurrencies($this, self::XML_PATH_CURRENCY_BASE);
-        return $defaultCurrencies;
+        return $this->currencyConfig->getConfigCurrencies(self::XML_PATH_CURRENCY_BASE);
     }
 
     /**
diff --git a/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php b/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php
new file mode 100644
index 0000000000000..f52886a14264d
--- /dev/null
+++ b/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Directory\Model\Currency\Import;
+
+class CurrencyConverterApi extends AbstractImport
+{
+    /**
+     * @var string
+     */
+    const CURRENCY_CONVERTER_URL = 'http://free.currencyconverterapi.com/api/v3/convert?q={{CURRENCY_FROM}}_{{CURRENCY_TO}}&compact=ultra'; //@codingStandardsIgnoreLine
+
+    /**
+     * Http Client Factory
+     *
+     * @var \Magento\Framework\HTTP\ZendClientFactory
+     */
+    private $httpClientFactory;
+
+    /**
+     * Core scope config
+     *
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
+     */
+    public function __construct(
+        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
+    ) {
+        parent::__construct($currencyFactory);
+        $this->scopeConfig = $scopeConfig;
+        $this->httpClientFactory = $httpClientFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fetchRates()
+    {
+        $data = [];
+        $currencies = $this->_getCurrencyCodes();
+        $defaultCurrencies = $this->_getDefaultCurrencyCodes();
+
+        foreach ($defaultCurrencies as $currencyFrom) {
+            if (!isset($data[$currencyFrom])) {
+                $data[$currencyFrom] = [];
+            }
+            $data = $this->convertBatch($data, $currencyFrom, $currencies);
+            ksort($data[$currencyFrom]);
+        }
+        return $data;
+    }
+
+    /**
+     * Return currencies convert rates in batch mode
+     *
+     * @param array $data
+     * @param string $currencyFrom
+     * @param array $currenciesTo
+     * @return array
+     */
+    private function convertBatch($data, $currencyFrom, $currenciesTo)
+    {
+        foreach ($currenciesTo as $to) {
+            set_time_limit(0);
+            try {
+                $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
+                $url = str_replace('{{CURRENCY_TO}}', $to, $url);
+                $response = $this->getServiceResponse($url);
+                if ($currencyFrom == $to) {
+                    $data[$currencyFrom][$to] = $this->_numberFormat(1);
+                } else {
+                    if (empty($response)) {
+                        $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $to);
+                        $data[$currencyFrom][$to] = null;
+                    } else {
+                        $data[$currencyFrom][$to] = $this->_numberFormat(
+                            (double)$response[$currencyFrom . '_' . $to]
+                        );
+                    }
+                }
+            } finally {
+                ini_restore('max_execution_time');
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get Fixer.io service response
+     *
+     * @param string $url
+     * @param int $retry
+     * @return array
+     */
+    private function getServiceResponse($url, $retry = 0)
+    {
+        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
+        $httpClient = $this->httpClientFactory->create();
+        $response = [];
+
+        try {
+            $jsonResponse = $httpClient->setUri(
+                $url
+            )->setConfig(
+                [
+                    'timeout' => $this->scopeConfig->getValue(
+                        'currency/currencyconverterapi/timeout',
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                    ),
+                ]
+            )->request(
+                'GET'
+            )->getBody();
+
+            $response = json_decode($jsonResponse, true);
+        } catch (\Exception $e) {
+            if ($retry == 0) {
+                $response = $this->getServiceResponse($url, 1);
+            }
+        }
+        return $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _convert($currencyFrom, $currencyTo)
+    {
+        return 1;
+    }
+}
diff --git a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
index 3e0bd5368509e..af49d6daaf379 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
@@ -5,15 +5,18 @@
  */
 namespace Magento\Directory\Model\Currency\Import;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Currency rate import model (From http://fixer.io/)
  */
-class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
+class FixerIo extends AbstractImport
 {
     /**
      * @var string
      */
-    const CURRENCY_CONVERTER_URL = 'http://api.fixer.io/latest?base={{CURRENCY_FROM}}&symbols={{CURRENCY_TO}}';
+    const CURRENCY_CONVERTER_URL = 'http://data.fixer.io/api/latest?access_key={{ACCESS_KEY}}'
+        . '&base={{CURRENCY_FROM}}&symbols={{CURRENCY_TO}}';
 
     /**
      * Http Client Factory
@@ -47,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function fetchRates()
     {
@@ -65,6 +68,13 @@ public function fetchRates()
         return $data;
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _convert($currencyFrom, $currencyTo)
+    {
+    }
+
     /**
      * Return currencies convert rates in batch mode
      *
@@ -73,11 +83,21 @@ public function fetchRates()
      * @param array $currenciesTo
      * @return array
      */
-    private function convertBatch($data, $currencyFrom, $currenciesTo)
+    private function convertBatch(array $data, string $currencyFrom, array $currenciesTo): array
     {
+        $accessKey = $this->scopeConfig->getValue('currency/fixerio/api_key', ScopeInterface::SCOPE_STORE);
+        if (empty($accessKey)) {
+            $this->_messages[] = __('No API Key was specified or an invalid API Key was specified.');
+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
+            return $data;
+        }
+
         $currenciesStr = implode(',', $currenciesTo);
-        $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
-        $url = str_replace('{{CURRENCY_TO}}', $currenciesStr, $url);
+        $url = str_replace(
+            ['{{ACCESS_KEY}}', '{{CURRENCY_FROM}}', '{{CURRENCY_TO}}'],
+            [$accessKey, $currencyFrom, $currenciesStr],
+            self::CURRENCY_CONVERTER_URL
+        );
 
         set_time_limit(0);
         try {
@@ -86,6 +106,11 @@ private function convertBatch($data, $currencyFrom, $currenciesTo)
             ini_restore('max_execution_time');
         }
 
+        if (!$this->validateResponse($response, $currencyFrom)) {
+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
+            return $data;
+        }
+
         foreach ($currenciesTo as $currencyTo) {
             if ($currencyFrom == $currencyTo) {
                 $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
@@ -110,25 +135,24 @@ private function convertBatch($data, $currencyFrom, $currenciesTo)
      * @param int $retry
      * @return array
      */
-    private function getServiceResponse($url, $retry = 0)
+    private function getServiceResponse(string $url, int $retry = 0): array
     {
         /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
         $httpClient = $this->httpClientFactory->create();
         $response = [];
 
         try {
-            $jsonResponse = $httpClient->setUri(
-                $url
-            )->setConfig(
-                [
-                    'timeout' => $this->scopeConfig->getValue(
-                        'currency/fixerio/timeout',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                ]
-            )->request(
-                'GET'
-            )->getBody();
+            $jsonResponse = $httpClient->setUri($url)
+                ->setConfig(
+                    [
+                        'timeout' => $this->scopeConfig->getValue(
+                            'currency/fixerio/timeout',
+                            ScopeInterface::SCOPE_STORE
+                        ),
+                    ]
+                )
+                ->request('GET')
+                ->getBody();
 
             $response = json_decode($jsonResponse, true);
         } catch (\Exception $e) {
@@ -140,9 +164,38 @@ private function getServiceResponse($url, $retry = 0)
     }
 
     /**
-     * {@inheritdoc}
+     * Validates rates response.
+     *
+     * @param array $response
+     * @param string $baseCurrency
+     * @return bool
      */
-    protected function _convert($currencyFrom, $currencyTo)
+    private function validateResponse(array $response, string $baseCurrency): bool
+    {
+        if ($response['success']) {
+            return true;
+        }
+
+        $errorCodes = [
+            101 => __('No API Key was specified or an invalid API Key was specified.'),
+            102 => __('The account this API request is coming from is inactive.'),
+            105 => __('The "%1" is not allowed as base currency for your subscription plan.', $baseCurrency),
+            201 => __('An invalid base currency has been entered.'),
+        ];
+
+        $this->_messages[] = $errorCodes[$response['error']['code']] ?? __('Currency rates can\'t be retrieved.');
+
+        return false;
+    }
+
+    /**
+     * Creates array for provided currencies with empty rates.
+     *
+     * @param array $currenciesTo
+     * @return array
+     */
+    private function makeEmptyResponse(array $currenciesTo): array
     {
+        return array_fill_keys($currenciesTo, null);
     }
 }
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
deleted file mode 100644
index fa3c3a9018dbc..0000000000000
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Directory\Model\Currency\Import;
-
-/**
- * Currency rate import model (From www.webservicex.net)
- */
-class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImport
-{
-    /**
-     * Currency converter url
-     */
-    const CURRENCY_CONVERTER_URL = 'http://www.webservicex.net/CurrencyConvertor.asmx/ConversionRate'
-        . '?FromCurrency={{CURRENCY_FROM}}&ToCurrency={{CURRENCY_TO}}';
-
-    /**
-     * Http Client Factory
-     *
-     * @var \Magento\Framework\HTTP\ZendClientFactory
-     */
-    protected $httpClientFactory;
-
-    /**
-     * Core scope config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * Constructor
-     *
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\HTTP\ZendClientFactory|null $zendClientFactory
-     */
-    public function __construct(
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\HTTP\ZendClientFactory $zendClientFactory = null
-    ) {
-        parent::__construct($currencyFactory);
-        $this->scopeConfig = $scopeConfig;
-        $this->httpClientFactory = $zendClientFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\HTTP\ZendClientFactory::class);
-    }
-
-    /**
-     * @param string $currencyFrom
-     * @param string $currencyTo
-     * @param int $retry
-     * @return float|null
-     */
-    protected function _convert($currencyFrom, $currencyTo, $retry = 0)
-    {
-        $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
-        $url = str_replace('{{CURRENCY_TO}}', $currencyTo, $url);
-        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
-        $httpClient = $this->httpClientFactory->create();
-
-        try {
-            $response = $httpClient->setUri(
-                $url
-            )->setConfig(
-                [
-                    'timeout' => $this->scopeConfig->getValue(
-                        'currency/webservicex/timeout',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                ]
-            )->request(
-                'GET'
-            )->getBody();
-
-            $xml = simplexml_load_string($response, null, LIBXML_NOERROR);
-            if (!$xml || (isset($xml[0]) && $xml[0] == -1)) {
-                $this->_messages[] = __('We can\'t retrieve a rate from %1.', $url);
-                return null;
-            }
-            return (double)$xml;
-        } catch (\Exception $e) {
-            if ($retry == 0) {
-                $this->_convert($currencyFrom, $currencyTo, 1);
-            } else {
-                $this->_messages[] = __('We can\'t retrieve a rate from %1.', $url);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php b/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php
deleted file mode 100644
index 5f96b8627af65..0000000000000
--- a/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Directory\Model\Currency\Import;
-
-/**
- * Currency rate import model (From http://query.yahooapis.com/)
- */
-class YahooFinance extends \Magento\Directory\Model\Currency\Import\AbstractImport
-{
-    // @codingStandardsIgnoreStart
-
-    // @codingStandardsIgnoreStart
-    private $currencyConverterUrl = 'http://query.yahooapis.com/v1/public/yql?format=json&q={{YQL_STRING}}&env=store://datatables.org/alltableswithkeys';
-    // @codingStandardsIgnoreEnd
-
-    // @codingStandardsIgnoreEnd
-    private $timeoutConfigPath = 'currency/yahoofinance/timeout';
-
-    /**
-     * Http Client Factory
-     *
-     * @var \Magento\Framework\HTTP\ZendClientFactory
-     */
-    protected $httpClientFactory;
-
-    /**
-     * Core scope config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * Initialize dependencies
-     *
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
-     */
-    public function __construct(
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
-    ) {
-        parent::__construct($currencyFactory);
-        $this->scopeConfig = $scopeConfig;
-        $this->httpClientFactory = $httpClientFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchRates()
-    {
-        $data = [];
-        $currencies = $this->_getCurrencyCodes();
-        $defaultCurrencies = $this->_getDefaultCurrencyCodes();
-
-        foreach ($defaultCurrencies as $currencyFrom) {
-            if (!isset($data[$currencyFrom])) {
-                $data[$currencyFrom] = [];
-            }
-            $data = $this->convertBatch($data, $currencyFrom, $currencies);
-            ksort($data[$currencyFrom]);
-        }
-        return $data;
-    }
-
-    /**
-     * Return currencies convert rates in batch mode
-     *
-     * @param array $data
-     * @param string $currencyFrom
-     * @param array $currenciesTo
-     * @return array
-     */
-    private function convertBatch($data, $currencyFrom, $currenciesTo)
-    {
-        $url = $this->buildUrl($currencyFrom, $currenciesTo);
-        set_time_limit(0);
-        try {
-            $response = $this->getServiceResponse($url);
-        } finally {
-            ini_restore('max_execution_time');
-        }
-
-        foreach ($currenciesTo as $currencyTo) {
-            if ($currencyFrom == $currencyTo) {
-                $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
-            } else {
-                if (empty($response[$currencyFrom . $currencyTo])) {
-                    $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $currencyTo);
-                    $data[$currencyFrom][$currencyTo] = null;
-                } else {
-                    $data[$currencyFrom][$currencyTo] = $this->_numberFormat(
-                        (double)$response[$currencyFrom . $currencyTo]
-                    );
-                }
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Get Fixer.io service response
-     *
-     * @param string $url
-     * @param int $retry
-     * @return array
-     */
-    private function getServiceResponse($url, $retry = 0)
-    {
-        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
-        $httpClient = $this->httpClientFactory->create();
-        $response = [];
-        try {
-            $jsonResponse = $httpClient->setUri(
-                $url
-            )->setConfig(
-                [
-                    'timeout' => $this->scopeConfig->getValue(
-                        $this->timeoutConfigPath,
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                ]
-            )->request(
-                'GET'
-            )->getBody();
-
-            $jsonResponse = json_decode($jsonResponse, true);
-            if (!empty($jsonResponse['query']['results']['rate'])) {
-                $response = array_column($jsonResponse['query']['results']['rate'], 'Rate', 'id');
-            }
-        } catch (\Exception $e) {
-            if ($retry == 0) {
-                $response = $this->getServiceResponse($url, 1);
-            }
-        }
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function _convert($currencyFrom, $currencyTo)
-    {
-    }
-
-    /**
-     * Build url for Currency Service
-     *
-     * @param string $currencyFrom
-     * @param string[] $currenciesTo
-     * @return string
-     */
-    private function buildUrl($currencyFrom, $currenciesTo)
-    {
-        $query = urlencode('select ') . '*' . urlencode(' from yahoo.finance.xchange where pair in (');
-        $query .=
-            urlencode(
-                implode(
-                    ',',
-                    array_map(
-                        function ($currencyTo) use ($currencyFrom) {
-                            return '"' . $currencyFrom . $currencyTo . '"';
-                        },
-                        $currenciesTo
-                    )
-                )
-            );
-        $query .= ')';
-        return str_replace('{{YQL_STRING}}', $query, $this->currencyConverterUrl);
-    }
-}
diff --git a/app/code/Magento/Directory/Model/CurrencyConfig.php b/app/code/Magento/Directory/Model/CurrencyConfig.php
new file mode 100644
index 0000000000000..fdb561c224170
--- /dev/null
+++ b/app/code/Magento/Directory/Model/CurrencyConfig.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Model;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provide config values for allowed, base and default currencies.
+ */
+class CurrencyConfig
+{
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * CurrencyConfig constructor.
+     *
+     * @param State $appState
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        State $appState,
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->appState = $appState;
+        $this->config = $config;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Retrieve config currency data by config path.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getConfigCurrencies(string $path)
+    {
+        $result = $this->appState->getAreaCode() === Area::AREA_ADMINHTML
+            ? $this->getConfigForAllStores($path)
+            : $this->getConfigForCurrentStore($path);
+        sort($result);
+
+        return array_unique($result);
+    }
+
+    /**
+     * Get allowed, base and default currency codes for all stores.
+     *
+     * @param string $path
+     * @return array
+     */
+    private function getConfigForAllStores(string $path)
+    {
+        $storesResult = [[]];
+        foreach ($this->storeManager->getStores() as $store) {
+            $storesResult[] = explode(
+                ',',
+                $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode())
+            );
+        }
+
+        return array_merge(...$storesResult);
+    }
+
+    /**
+     * Get allowed, base and default currency codes for current store.
+     *
+     * @param string $path
+     * @return mixed
+     */
+    private function getConfigForCurrentStore(string $path)
+    {
+        $store = $this->storeManager->getStore();
+
+        return explode(',', $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode()));
+    }
+}
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index 8ad67ad191018..e35c2de5cee5b 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -9,6 +9,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Directory\Model;
 
 class Observer
@@ -113,7 +114,8 @@ public function scheduledUpdateCurrencyRates($schedule)
                 $rates = $importModel->fetchRates();
                 $errors = $importModel->getMessages();
             } catch (\Exception $e) {
-                $importWarnings[] = __('FATAL ERROR:') . ' ' . __('We can\'t initialize the import model.');
+                $importWarnings[] = __('FATAL ERROR:') . ' '
+                    . __("The import model can't be initialized. Verify the model and try again.");
                 throw $e;
             }
         } else {
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index a211242d377f3..08d320abd8b53 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -46,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convert($amount, $scope = null, $currency = null)
     {
@@ -58,17 +58,15 @@ public function convert($amount, $scope = null, $currency = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
-        $currentCurrency = $this->getCurrency($scope, $currency);
-        $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
-        return round($convertedValue, $precision);
+        return $this->roundPrice($this->convert($amount, $scope, $currency), $precision);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function format(
         $amount,
@@ -82,7 +80,7 @@ public function format(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convertAndFormat(
         $amount,
@@ -97,7 +95,7 @@ public function convertAndFormat(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCurrency($scope = null, $currency = null)
     {
@@ -118,6 +116,8 @@ public function getCurrency($scope = null, $currency = null)
     }
 
     /**
+     * Get currrency symbol
+     *
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return string
@@ -148,13 +148,22 @@ protected function getStore($scope = null)
     }
 
     /**
-     * Round price
+     * @inheritdoc
+     */
+    public function round($price)
+    {
+        return round($price, 2);
+    }
+
+    /**
+     * Round price with precision
      *
      * @param float $price
+     * @param int $precision
      * @return float
      */
-    public function round($price)
+    public function roundPrice($price, $precision = self::DEFAULT_PRECISION)
     {
-        return round($price, 2);
+        return round($price, $precision);
     }
 }
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country.php b/app/code/Magento/Directory/Model/ResourceModel/Country.php
index c4c0a6b95dfb4..59fb2de85c8a3 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country.php
@@ -44,7 +44,7 @@ public function loadByCode(\Magento\Directory\Model\Country $country, $code)
 
             default:
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please correct the country code: %1.', $code)
+                    __('Please correct the country code: %1.', htmlspecialchars($code))
                 );
         }
 
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
index d82a9cbc16a0d..f90a7b3b519b5 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -66,6 +66,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @since 100.1.0
      */
     protected $countriesWithNotRequiredStates;
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
 
     /**
      * Initialize dependencies.
@@ -83,6 +87,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param array $countriesWithNotRequiredStates
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -98,7 +103,8 @@ public function __construct(
         \Magento\Framework\App\Helper\AbstractHelper $helperData,
         array $countriesWithNotRequiredStates = [],
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
         $this->_scopeConfig = $scopeConfig;
@@ -108,6 +114,9 @@ public function __construct(
         $this->_arrayUtils = $arrayUtils;
         $this->helperData = $helperData;
         $this->countriesWithNotRequiredStates = $countriesWithNotRequiredStates;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        );
     }
 
     /**
@@ -120,8 +129,8 @@ public function __construct(
     /**
      * Add top destinition countries to head of option array
      *
-     * @param $emptyLabel
-     * @param $options
+     * @param string $emptyLabel
+     * @param array $options
      * @return array
      */
     private function addForegroundCountriesToOptionArray($emptyLabel, $options)
@@ -198,7 +207,7 @@ public function getItemById($countryId)
      * Add filter by country code to collection.
      * $countryCode can be either array of country codes or string representing one country code.
      * $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly.
-     * The collection will contain countries where at least one of contry $iso fields matches $countryCode.
+     * The collection will contain countries where at least one of country $iso fields matches $countryCode.
      *
      * @param string|string[] $countryCode
      * @param string|string[] $iso
@@ -273,6 +282,7 @@ public function toOptionArray($emptyLabel = ' ')
             $sort = [$name => $foregroundCountry] + $sort;
         }
         $isRegionVisible = (bool)$this->helperData->isShowNonRequiredState();
+
         $options = [];
         foreach ($sort as $label => $value) {
             $options = $this->addForegroundCountriesToOptionArray($emptyLabel, $options);
@@ -291,9 +301,36 @@ public function toOptionArray($emptyLabel = ' ')
             array_unshift($options, ['value' => '', 'label' => $emptyLabel]);
         }
 
+        $this->addDefaultCountryToOptions($options);
+
         return $options;
     }
 
+    /**
+     * Adds default country to options
+     *
+     * @param array $options
+     * @return void
+     */
+    private function addDefaultCountryToOptions(array &$options)
+    {
+        $defaultCountry = [];
+        foreach ($this->storeManager->getWebsites() as $website) {
+            $defaultCountryConfig = $this->_scopeConfig->getValue(
+                \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_COUNTRY,
+                ScopeInterface::SCOPE_WEBSITES,
+                $website
+            );
+            $defaultCountry[$defaultCountryConfig][] = $website->getId();
+        }
+
+        foreach ($options as $key => $option) {
+            if (isset($defaultCountry[$option['value']])) {
+                $options[$key]['is_default'] = $defaultCountry[$option['value']];
+            }
+        }
+    }
+
     /**
      * Set foreground countries array
      *
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Currency.php b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
index ac0716fc4e67e..ffbcce11cb4f6 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Currency.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
@@ -165,6 +165,8 @@ public function saveRates($rates)
      * @param string $path
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated because doesn't take into consideration scopes and system config values.
+     * @see \Magento\Directory\Model\CurrencyConfig::getConfigCurrencies()
      */
     public function getConfigCurrencies($model, $path)
     {
diff --git a/app/code/Magento/Directory/Setup/DataInstaller.php b/app/code/Magento/Directory/Setup/DataInstaller.php
new file mode 100644
index 0000000000000..9fccc16e1d49b
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/DataInstaller.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Setup;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Class DataInstaller
+ * @package Magento\Directory\Setup
+ */
+class DataInstaller
+{
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    private $data;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * DatInstaller constructor.
+     * @param \Magento\Directory\Helper\Data $data
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        \Magento\Directory\Helper\Data $data,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->data = $data;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Add country-region data.
+     *
+     * @param AdapterInterface $adapter
+     * @param array $data
+     */
+    public function addCountryRegions(AdapterInterface $adapter, array $data)
+    {
+        /**
+         * Fill table directory/country_region
+         * Fill table directory/country_region_name for en_US locale
+         */
+        foreach ($data as $row) {
+            $bind = ['country_id' => $row[0], 'code' => $row[1], 'default_name' => $row[2]];
+            $adapter->insert($this->resourceConnection->getTableName('directory_country_region'), $bind);
+            $regionId = $adapter->lastInsertId($this->resourceConnection->getTableName('directory_country_region'));
+            $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
+            $adapter->insert($this->resourceConnection->getTableName('directory_country_region_name'), $bind);
+        }
+        /**
+         * Upgrade core_config_data general/region/state_required field.
+         */
+        $countries = $this->data->getCountryCollection()->getCountriesWithRequiredStates();
+        $adapter->update(
+            $this->resourceConnection->getTableName('core_config_data'),
+            [
+                'value' => implode(',', array_keys($countries))
+            ],
+            [
+                'scope="default"',
+                'scope_id=0',
+                'path=?' => \Magento\Directory\Helper\Data::XML_PATH_STATES_REQUIRED
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/InstallData.php b/app/code/Magento/Directory/Setup/InstallData.php
deleted file mode 100644
index 33c3ae4558e16..0000000000000
--- a/app/code/Magento/Directory/Setup/InstallData.php
+++ /dev/null
@@ -1,857 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Setup;
-
-use Magento\Directory\Helper\Data;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Directory data
-     *
-     * @var Data
-     */
-    private $directoryData;
-
-    /**
-     * Init
-     *
-     * @param Data $directoryData
-     */
-    public function __construct(Data $directoryData)
-    {
-        $this->directoryData = $directoryData;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /**
-         * Fill table directory/country
-         */
-        $data = [
-            ['AD', 'AD', 'AND'],
-            ['AE', 'AE', 'ARE'],
-            ['AF', 'AF', 'AFG'],
-            ['AG', 'AG', 'ATG'],
-            ['AI', 'AI', 'AIA'],
-            ['AL', 'AL', 'ALB'],
-            ['AM', 'AM', 'ARM'],
-            ['AN', 'AN', 'ANT'],
-            ['AO', 'AO', 'AGO'],
-            ['AQ', 'AQ', 'ATA'],
-            ['AR', 'AR', 'ARG'],
-            ['AS', 'AS', 'ASM'],
-            ['AT', 'AT', 'AUT'],
-            ['AU', 'AU', 'AUS'],
-            ['AW', 'AW', 'ABW'],
-            ['AX', 'AX', 'ALA'],
-            ['AZ', 'AZ', 'AZE'],
-            ['BA', 'BA', 'BIH'],
-            ['BB', 'BB', 'BRB'],
-            ['BD', 'BD', 'BGD'],
-            ['BE', 'BE', 'BEL'],
-            ['BF', 'BF', 'BFA'],
-            ['BG', 'BG', 'BGR'],
-            ['BH', 'BH', 'BHR'],
-            ['BI', 'BI', 'BDI'],
-            ['BJ', 'BJ', 'BEN'],
-            ['BL', 'BL', 'BLM'],
-            ['BM', 'BM', 'BMU'],
-            ['BN', 'BN', 'BRN'],
-            ['BO', 'BO', 'BOL'],
-            ['BR', 'BR', 'BRA'],
-            ['BS', 'BS', 'BHS'],
-            ['BT', 'BT', 'BTN'],
-            ['BV', 'BV', 'BVT'],
-            ['BW', 'BW', 'BWA'],
-            ['BY', 'BY', 'BLR'],
-            ['BZ', 'BZ', 'BLZ'],
-            ['CA', 'CA', 'CAN'],
-            ['CC', 'CC', 'CCK'],
-            ['CD', 'CD', 'COD'],
-            ['CF', 'CF', 'CAF'],
-            ['CG', 'CG', 'COG'],
-            ['CH', 'CH', 'CHE'],
-            ['CI', 'CI', 'CIV'],
-            ['CK', 'CK', 'COK'],
-            ['CL', 'CL', 'CHL'],
-            ['CM', 'CM', 'CMR'],
-            ['CN', 'CN', 'CHN'],
-            ['CO', 'CO', 'COL'],
-            ['CR', 'CR', 'CRI'],
-            ['CU', 'CU', 'CUB'],
-            ['CV', 'CV', 'CPV'],
-            ['CX', 'CX', 'CXR'],
-            ['CY', 'CY', 'CYP'],
-            ['CZ', 'CZ', 'CZE'],
-            ['DE', 'DE', 'DEU'],
-            ['DJ', 'DJ', 'DJI'],
-            ['DK', 'DK', 'DNK'],
-            ['DM', 'DM', 'DMA'],
-            ['DO', 'DO', 'DOM'],
-            ['DZ', 'DZ', 'DZA'],
-            ['EC', 'EC', 'ECU'],
-            ['EE', 'EE', 'EST'],
-            ['EG', 'EG', 'EGY'],
-            ['EH', 'EH', 'ESH'],
-            ['ER', 'ER', 'ERI'],
-            ['ES', 'ES', 'ESP'],
-            ['ET', 'ET', 'ETH'],
-            ['FI', 'FI', 'FIN'],
-            ['FJ', 'FJ', 'FJI'],
-            ['FK', 'FK', 'FLK'],
-            ['FM', 'FM', 'FSM'],
-            ['FO', 'FO', 'FRO'],
-            ['FR', 'FR', 'FRA'],
-            ['GA', 'GA', 'GAB'],
-            ['GB', 'GB', 'GBR'],
-            ['GD', 'GD', 'GRD'],
-            ['GE', 'GE', 'GEO'],
-            ['GF', 'GF', 'GUF'],
-            ['GG', 'GG', 'GGY'],
-            ['GH', 'GH', 'GHA'],
-            ['GI', 'GI', 'GIB'],
-            ['GL', 'GL', 'GRL'],
-            ['GM', 'GM', 'GMB'],
-            ['GN', 'GN', 'GIN'],
-            ['GP', 'GP', 'GLP'],
-            ['GQ', 'GQ', 'GNQ'],
-            ['GR', 'GR', 'GRC'],
-            ['GS', 'GS', 'SGS'],
-            ['GT', 'GT', 'GTM'],
-            ['GU', 'GU', 'GUM'],
-            ['GW', 'GW', 'GNB'],
-            ['GY', 'GY', 'GUY'],
-            ['HK', 'HK', 'HKG'],
-            ['HM', 'HM', 'HMD'],
-            ['HN', 'HN', 'HND'],
-            ['HR', 'HR', 'HRV'],
-            ['HT', 'HT', 'HTI'],
-            ['HU', 'HU', 'HUN'],
-            ['ID', 'ID', 'IDN'],
-            ['IE', 'IE', 'IRL'],
-            ['IL', 'IL', 'ISR'],
-            ['IM', 'IM', 'IMN'],
-            ['IN', 'IN', 'IND'],
-            ['IO', 'IO', 'IOT'],
-            ['IQ', 'IQ', 'IRQ'],
-            ['IR', 'IR', 'IRN'],
-            ['IS', 'IS', 'ISL'],
-            ['IT', 'IT', 'ITA'],
-            ['JE', 'JE', 'JEY'],
-            ['JM', 'JM', 'JAM'],
-            ['JO', 'JO', 'JOR'],
-            ['JP', 'JP', 'JPN'],
-            ['KE', 'KE', 'KEN'],
-            ['KG', 'KG', 'KGZ'],
-            ['KH', 'KH', 'KHM'],
-            ['KI', 'KI', 'KIR'],
-            ['KM', 'KM', 'COM'],
-            ['KN', 'KN', 'KNA'],
-            ['KP', 'KP', 'PRK'],
-            ['KR', 'KR', 'KOR'],
-            ['KW', 'KW', 'KWT'],
-            ['KY', 'KY', 'CYM'],
-            ['KZ', 'KZ', 'KAZ'],
-            ['LA', 'LA', 'LAO'],
-            ['LB', 'LB', 'LBN'],
-            ['LC', 'LC', 'LCA'],
-            ['LI', 'LI', 'LIE'],
-            ['LK', 'LK', 'LKA'],
-            ['LR', 'LR', 'LBR'],
-            ['LS', 'LS', 'LSO'],
-            ['LT', 'LT', 'LTU'],
-            ['LU', 'LU', 'LUX'],
-            ['LV', 'LV', 'LVA'],
-            ['LY', 'LY', 'LBY'],
-            ['MA', 'MA', 'MAR'],
-            ['MC', 'MC', 'MCO'],
-            ['MD', 'MD', 'MDA'],
-            ['ME', 'ME', 'MNE'],
-            ['MF', 'MF', 'MAF'],
-            ['MG', 'MG', 'MDG'],
-            ['MH', 'MH', 'MHL'],
-            ['MK', 'MK', 'MKD'],
-            ['ML', 'ML', 'MLI'],
-            ['MM', 'MM', 'MMR'],
-            ['MN', 'MN', 'MNG'],
-            ['MO', 'MO', 'MAC'],
-            ['MP', 'MP', 'MNP'],
-            ['MQ', 'MQ', 'MTQ'],
-            ['MR', 'MR', 'MRT'],
-            ['MS', 'MS', 'MSR'],
-            ['MT', 'MT', 'MLT'],
-            ['MU', 'MU', 'MUS'],
-            ['MV', 'MV', 'MDV'],
-            ['MW', 'MW', 'MWI'],
-            ['MX', 'MX', 'MEX'],
-            ['MY', 'MY', 'MYS'],
-            ['MZ', 'MZ', 'MOZ'],
-            ['NA', 'NA', 'NAM'],
-            ['NC', 'NC', 'NCL'],
-            ['NE', 'NE', 'NER'],
-            ['NF', 'NF', 'NFK'],
-            ['NG', 'NG', 'NGA'],
-            ['NI', 'NI', 'NIC'],
-            ['NL', 'NL', 'NLD'],
-            ['NO', 'NO', 'NOR'],
-            ['NP', 'NP', 'NPL'],
-            ['NR', 'NR', 'NRU'],
-            ['NU', 'NU', 'NIU'],
-            ['NZ', 'NZ', 'NZL'],
-            ['OM', 'OM', 'OMN'],
-            ['PA', 'PA', 'PAN'],
-            ['PE', 'PE', 'PER'],
-            ['PF', 'PF', 'PYF'],
-            ['PG', 'PG', 'PNG'],
-            ['PH', 'PH', 'PHL'],
-            ['PK', 'PK', 'PAK'],
-            ['PL', 'PL', 'POL'],
-            ['PM', 'PM', 'SPM'],
-            ['PN', 'PN', 'PCN'],
-            ['PS', 'PS', 'PSE'],
-            ['PT', 'PT', 'PRT'],
-            ['PW', 'PW', 'PLW'],
-            ['PY', 'PY', 'PRY'],
-            ['QA', 'QA', 'QAT'],
-            ['RE', 'RE', 'REU'],
-            ['RO', 'RO', 'ROU'],
-            ['RS', 'RS', 'SRB'],
-            ['RU', 'RU', 'RUS'],
-            ['RW', 'RW', 'RWA'],
-            ['SA', 'SA', 'SAU'],
-            ['SB', 'SB', 'SLB'],
-            ['SC', 'SC', 'SYC'],
-            ['SD', 'SD', 'SDN'],
-            ['SE', 'SE', 'SWE'],
-            ['SG', 'SG', 'SGP'],
-            ['SH', 'SH', 'SHN'],
-            ['SI', 'SI', 'SVN'],
-            ['SJ', 'SJ', 'SJM'],
-            ['SK', 'SK', 'SVK'],
-            ['SL', 'SL', 'SLE'],
-            ['SM', 'SM', 'SMR'],
-            ['SN', 'SN', 'SEN'],
-            ['SO', 'SO', 'SOM'],
-            ['SR', 'SR', 'SUR'],
-            ['ST', 'ST', 'STP'],
-            ['SV', 'SV', 'SLV'],
-            ['SY', 'SY', 'SYR'],
-            ['SZ', 'SZ', 'SWZ'],
-            ['TC', 'TC', 'TCA'],
-            ['TD', 'TD', 'TCD'],
-            ['TF', 'TF', 'ATF'],
-            ['TG', 'TG', 'TGO'],
-            ['TH', 'TH', 'THA'],
-            ['TJ', 'TJ', 'TJK'],
-            ['TK', 'TK', 'TKL'],
-            ['TL', 'TL', 'TLS'],
-            ['TM', 'TM', 'TKM'],
-            ['TN', 'TN', 'TUN'],
-            ['TO', 'TO', 'TON'],
-            ['TR', 'TR', 'TUR'],
-            ['TT', 'TT', 'TTO'],
-            ['TV', 'TV', 'TUV'],
-            ['TW', 'TW', 'TWN'],
-            ['TZ', 'TZ', 'TZA'],
-            ['UA', 'UA', 'UKR'],
-            ['UG', 'UG', 'UGA'],
-            ['UM', 'UM', 'UMI'],
-            ['US', 'US', 'USA'],
-            ['UY', 'UY', 'URY'],
-            ['UZ', 'UZ', 'UZB'],
-            ['VA', 'VA', 'VAT'],
-            ['VC', 'VC', 'VCT'],
-            ['VE', 'VE', 'VEN'],
-            ['VG', 'VG', 'VGB'],
-            ['VI', 'VI', 'VIR'],
-            ['VN', 'VN', 'VNM'],
-            ['VU', 'VU', 'VUT'],
-            ['WF', 'WF', 'WLF'],
-            ['WS', 'WS', 'WSM'],
-            ['YE', 'YE', 'YEM'],
-            ['YT', 'YT', 'MYT'],
-            ['ZA', 'ZA', 'ZAF'],
-            ['ZM', 'ZM', 'ZMB'],
-            ['ZW', 'ZW', 'ZWE'],
-        ];
-
-        $columns = ['country_id', 'iso2_code', 'iso3_code'];
-        $setup->getConnection()->insertArray($setup->getTable('directory_country'), $columns, $data);
-
-        /**
-         * Fill table directory/country_region
-         * Fill table directory/country_region_name for en_US locale
-         */
-        $data = [
-            ['US', 'AL', 'Alabama'],
-            ['US', 'AK', 'Alaska'],
-            ['US', 'AS', 'American Samoa'],
-            ['US', 'AZ', 'Arizona'],
-            ['US', 'AR', 'Arkansas'],
-            ['US', 'AE', 'Armed Forces Africa'],
-            ['US', 'AA', 'Armed Forces Americas'],
-            ['US', 'AE', 'Armed Forces Canada'],
-            ['US', 'AE', 'Armed Forces Europe'],
-            ['US', 'AE', 'Armed Forces Middle East'],
-            ['US', 'AP', 'Armed Forces Pacific'],
-            ['US', 'CA', 'California'],
-            ['US', 'CO', 'Colorado'],
-            ['US', 'CT', 'Connecticut'],
-            ['US', 'DE', 'Delaware'],
-            ['US', 'DC', 'District of Columbia'],
-            ['US', 'FM', 'Federated States Of Micronesia'],
-            ['US', 'FL', 'Florida'],
-            ['US', 'GA', 'Georgia'],
-            ['US', 'GU', 'Guam'],
-            ['US', 'HI', 'Hawaii'],
-            ['US', 'ID', 'Idaho'],
-            ['US', 'IL', 'Illinois'],
-            ['US', 'IN', 'Indiana'],
-            ['US', 'IA', 'Iowa'],
-            ['US', 'KS', 'Kansas'],
-            ['US', 'KY', 'Kentucky'],
-            ['US', 'LA', 'Louisiana'],
-            ['US', 'ME', 'Maine'],
-            ['US', 'MH', 'Marshall Islands'],
-            ['US', 'MD', 'Maryland'],
-            ['US', 'MA', 'Massachusetts'],
-            ['US', 'MI', 'Michigan'],
-            ['US', 'MN', 'Minnesota'],
-            ['US', 'MS', 'Mississippi'],
-            ['US', 'MO', 'Missouri'],
-            ['US', 'MT', 'Montana'],
-            ['US', 'NE', 'Nebraska'],
-            ['US', 'NV', 'Nevada'],
-            ['US', 'NH', 'New Hampshire'],
-            ['US', 'NJ', 'New Jersey'],
-            ['US', 'NM', 'New Mexico'],
-            ['US', 'NY', 'New York'],
-            ['US', 'NC', 'North Carolina'],
-            ['US', 'ND', 'North Dakota'],
-            ['US', 'MP', 'Northern Mariana Islands'],
-            ['US', 'OH', 'Ohio'],
-            ['US', 'OK', 'Oklahoma'],
-            ['US', 'OR', 'Oregon'],
-            ['US', 'PW', 'Palau'],
-            ['US', 'PA', 'Pennsylvania'],
-            ['US', 'PR', 'Puerto Rico'],
-            ['US', 'RI', 'Rhode Island'],
-            ['US', 'SC', 'South Carolina'],
-            ['US', 'SD', 'South Dakota'],
-            ['US', 'TN', 'Tennessee'],
-            ['US', 'TX', 'Texas'],
-            ['US', 'UT', 'Utah'],
-            ['US', 'VT', 'Vermont'],
-            ['US', 'VI', 'Virgin Islands'],
-            ['US', 'VA', 'Virginia'],
-            ['US', 'WA', 'Washington'],
-            ['US', 'WV', 'West Virginia'],
-            ['US', 'WI', 'Wisconsin'],
-            ['US', 'WY', 'Wyoming'],
-            ['CA', 'AB', 'Alberta'],
-            ['CA', 'BC', 'British Columbia'],
-            ['CA', 'MB', 'Manitoba'],
-            ['CA', 'NL', 'Newfoundland and Labrador'],
-            ['CA', 'NB', 'New Brunswick'],
-            ['CA', 'NS', 'Nova Scotia'],
-            ['CA', 'NT', 'Northwest Territories'],
-            ['CA', 'NU', 'Nunavut'],
-            ['CA', 'ON', 'Ontario'],
-            ['CA', 'PE', 'Prince Edward Island'],
-            ['CA', 'QC', 'Quebec'],
-            ['CA', 'SK', 'Saskatchewan'],
-            ['CA', 'YT', 'Yukon Territory'],
-            ['DE', 'NDS', 'Niedersachsen'],
-            ['DE', 'BAW', 'Baden-Württemberg'],
-            ['DE', 'BAY', 'Bayern'],
-            ['DE', 'BER', 'Berlin'],
-            ['DE', 'BRG', 'Brandenburg'],
-            ['DE', 'BRE', 'Bremen'],
-            ['DE', 'HAM', 'Hamburg'],
-            ['DE', 'HES', 'Hessen'],
-            ['DE', 'MEC', 'Mecklenburg-Vorpommern'],
-            ['DE', 'NRW', 'Nordrhein-Westfalen'],
-            ['DE', 'RHE', 'Rheinland-Pfalz'],
-            ['DE', 'SAR', 'Saarland'],
-            ['DE', 'SAS', 'Sachsen'],
-            ['DE', 'SAC', 'Sachsen-Anhalt'],
-            ['DE', 'SCN', 'Schleswig-Holstein'],
-            ['DE', 'THE', 'Thüringen'],
-            ['AT', 'WI', 'Wien'],
-            ['AT', 'NO', 'Niederösterreich'],
-            ['AT', 'OO', 'Oberösterreich'],
-            ['AT', 'SB', 'Salzburg'],
-            ['AT', 'KN', 'Kärnten'],
-            ['AT', 'ST', 'Steiermark'],
-            ['AT', 'TI', 'Tirol'],
-            ['AT', 'BL', 'Burgenland'],
-            ['AT', 'VB', 'Vorarlberg'],
-            ['CH', 'AG', 'Aargau'],
-            ['CH', 'AI', 'Appenzell Innerrhoden'],
-            ['CH', 'AR', 'Appenzell Ausserrhoden'],
-            ['CH', 'BE', 'Bern'],
-            ['CH', 'BL', 'Basel-Landschaft'],
-            ['CH', 'BS', 'Basel-Stadt'],
-            ['CH', 'FR', 'Freiburg'],
-            ['CH', 'GE', 'Genf'],
-            ['CH', 'GL', 'Glarus'],
-            ['CH', 'GR', 'Graubünden'],
-            ['CH', 'JU', 'Jura'],
-            ['CH', 'LU', 'Luzern'],
-            ['CH', 'NE', 'Neuenburg'],
-            ['CH', 'NW', 'Nidwalden'],
-            ['CH', 'OW', 'Obwalden'],
-            ['CH', 'SG', 'St. Gallen'],
-            ['CH', 'SH', 'Schaffhausen'],
-            ['CH', 'SO', 'Solothurn'],
-            ['CH', 'SZ', 'Schwyz'],
-            ['CH', 'TG', 'Thurgau'],
-            ['CH', 'TI', 'Tessin'],
-            ['CH', 'UR', 'Uri'],
-            ['CH', 'VD', 'Waadt'],
-            ['CH', 'VS', 'Wallis'],
-            ['CH', 'ZG', 'Zug'],
-            ['CH', 'ZH', 'Zürich'],
-            ['ES', 'A Coruсa', 'A Coruña'],
-            ['ES', 'Alava', 'Alava'],
-            ['ES', 'Albacete', 'Albacete'],
-            ['ES', 'Alicante', 'Alicante'],
-            ['ES', 'Almeria', 'Almeria'],
-            ['ES', 'Asturias', 'Asturias'],
-            ['ES', 'Avila', 'Avila'],
-            ['ES', 'Badajoz', 'Badajoz'],
-            ['ES', 'Baleares', 'Baleares'],
-            ['ES', 'Barcelona', 'Barcelona'],
-            ['ES', 'Burgos', 'Burgos'],
-            ['ES', 'Caceres', 'Caceres'],
-            ['ES', 'Cadiz', 'Cadiz'],
-            ['ES', 'Cantabria', 'Cantabria'],
-            ['ES', 'Castellon', 'Castellon'],
-            ['ES', 'Ceuta', 'Ceuta'],
-            ['ES', 'Ciudad Real', 'Ciudad Real'],
-            ['ES', 'Cordoba', 'Cordoba'],
-            ['ES', 'Cuenca', 'Cuenca'],
-            ['ES', 'Girona', 'Girona'],
-            ['ES', 'Granada', 'Granada'],
-            ['ES', 'Guadalajara', 'Guadalajara'],
-            ['ES', 'Guipuzcoa', 'Guipuzcoa'],
-            ['ES', 'Huelva', 'Huelva'],
-            ['ES', 'Huesca', 'Huesca'],
-            ['ES', 'Jaen', 'Jaen'],
-            ['ES', 'La Rioja', 'La Rioja'],
-            ['ES', 'Las Palmas', 'Las Palmas'],
-            ['ES', 'Leon', 'Leon'],
-            ['ES', 'Lleida', 'Lleida'],
-            ['ES', 'Lugo', 'Lugo'],
-            ['ES', 'Madrid', 'Madrid'],
-            ['ES', 'Malaga', 'Malaga'],
-            ['ES', 'Melilla', 'Melilla'],
-            ['ES', 'Murcia', 'Murcia'],
-            ['ES', 'Navarra', 'Navarra'],
-            ['ES', 'Ourense', 'Ourense'],
-            ['ES', 'Palencia', 'Palencia'],
-            ['ES', 'Pontevedra', 'Pontevedra'],
-            ['ES', 'Salamanca', 'Salamanca'],
-            ['ES', 'Santa Cruz de Tenerife', 'Santa Cruz de Tenerife'],
-            ['ES', 'Segovia', 'Segovia'],
-            ['ES', 'Sevilla', 'Sevilla'],
-            ['ES', 'Soria', 'Soria'],
-            ['ES', 'Tarragona', 'Tarragona'],
-            ['ES', 'Teruel', 'Teruel'],
-            ['ES', 'Toledo', 'Toledo'],
-            ['ES', 'Valencia', 'Valencia'],
-            ['ES', 'Valladolid', 'Valladolid'],
-            ['ES', 'Vizcaya', 'Vizcaya'],
-            ['ES', 'Zamora', 'Zamora'],
-            ['ES', 'Zaragoza', 'Zaragoza'],
-            ['FR', 1, 'Ain'],
-            ['FR', 2, 'Aisne'],
-            ['FR', 3, 'Allier'],
-            ['FR', 4, 'Alpes-de-Haute-Provence'],
-            ['FR', 5, 'Hautes-Alpes'],
-            ['FR', 6, 'Alpes-Maritimes'],
-            ['FR', 7, 'Ardèche'],
-            ['FR', 8, 'Ardennes'],
-            ['FR', 9, 'Ariège'],
-            ['FR', 10, 'Aube'],
-            ['FR', 11, 'Aude'],
-            ['FR', 12, 'Aveyron'],
-            ['FR', 13, 'Bouches-du-Rhône'],
-            ['FR', 14, 'Calvados'],
-            ['FR', 15, 'Cantal'],
-            ['FR', 16, 'Charente'],
-            ['FR', 17, 'Charente-Maritime'],
-            ['FR', 18, 'Cher'],
-            ['FR', 19, 'Corrèze'],
-            ['FR', '2A', 'Corse-du-Sud'],
-            ['FR', '2B', 'Haute-Corse'],
-            ['FR', 21, 'Côte-d\'Or'],
-            ['FR', 22, 'Côtes-d\'Armor'],
-            ['FR', 23, 'Creuse'],
-            ['FR', 24, 'Dordogne'],
-            ['FR', 25, 'Doubs'],
-            ['FR', 26, 'Drôme'],
-            ['FR', 27, 'Eure'],
-            ['FR', 28, 'Eure-et-Loir'],
-            ['FR', 29, 'Finistère'],
-            ['FR', 30, 'Gard'],
-            ['FR', 31, 'Haute-Garonne'],
-            ['FR', 32, 'Gers'],
-            ['FR', 33, 'Gironde'],
-            ['FR', 34, 'Hérault'],
-            ['FR', 35, 'Ille-et-Vilaine'],
-            ['FR', 36, 'Indre'],
-            ['FR', 37, 'Indre-et-Loire'],
-            ['FR', 38, 'Isère'],
-            ['FR', 39, 'Jura'],
-            ['FR', 40, 'Landes'],
-            ['FR', 41, 'Loir-et-Cher'],
-            ['FR', 42, 'Loire'],
-            ['FR', 43, 'Haute-Loire'],
-            ['FR', 44, 'Loire-Atlantique'],
-            ['FR', 45, 'Loiret'],
-            ['FR', 46, 'Lot'],
-            ['FR', 47, 'Lot-et-Garonne'],
-            ['FR', 48, 'Lozère'],
-            ['FR', 49, 'Maine-et-Loire'],
-            ['FR', 50, 'Manche'],
-            ['FR', 51, 'Marne'],
-            ['FR', 52, 'Haute-Marne'],
-            ['FR', 53, 'Mayenne'],
-            ['FR', 54, 'Meurthe-et-Moselle'],
-            ['FR', 55, 'Meuse'],
-            ['FR', 56, 'Morbihan'],
-            ['FR', 57, 'Moselle'],
-            ['FR', 58, 'Nièvre'],
-            ['FR', 59, 'Nord'],
-            ['FR', 60, 'Oise'],
-            ['FR', 61, 'Orne'],
-            ['FR', 62, 'Pas-de-Calais'],
-            ['FR', 63, 'Puy-de-Dôme'],
-            ['FR', 64, 'Pyrénées-Atlantiques'],
-            ['FR', 65, 'Hautes-Pyrénées'],
-            ['FR', 66, 'Pyrénées-Orientales'],
-            ['FR', 67, 'Bas-Rhin'],
-            ['FR', 68, 'Haut-Rhin'],
-            ['FR', 69, 'Rhône'],
-            ['FR', 70, 'Haute-Saône'],
-            ['FR', 71, 'Saône-et-Loire'],
-            ['FR', 72, 'Sarthe'],
-            ['FR', 73, 'Savoie'],
-            ['FR', 74, 'Haute-Savoie'],
-            ['FR', 75, 'Paris'],
-            ['FR', 76, 'Seine-Maritime'],
-            ['FR', 77, 'Seine-et-Marne'],
-            ['FR', 78, 'Yvelines'],
-            ['FR', 79, 'Deux-Sèvres'],
-            ['FR', 80, 'Somme'],
-            ['FR', 81, 'Tarn'],
-            ['FR', 82, 'Tarn-et-Garonne'],
-            ['FR', 83, 'Var'],
-            ['FR', 84, 'Vaucluse'],
-            ['FR', 85, 'Vendée'],
-            ['FR', 86, 'Vienne'],
-            ['FR', 87, 'Haute-Vienne'],
-            ['FR', 88, 'Vosges'],
-            ['FR', 89, 'Yonne'],
-            ['FR', 90, 'Territoire-de-Belfort'],
-            ['FR', 91, 'Essonne'],
-            ['FR', 92, 'Hauts-de-Seine'],
-            ['FR', 93, 'Seine-Saint-Denis'],
-            ['FR', 94, 'Val-de-Marne'],
-            ['FR', 95, 'Val-d\'Oise'],
-            ['RO', 'AB', 'Alba'],
-            ['RO', 'AR', 'Arad'],
-            ['RO', 'AG', 'Argeş'],
-            ['RO', 'BC', 'Bacău'],
-            ['RO', 'BH', 'Bihor'],
-            ['RO', 'BN', 'Bistriţa-Năsăud'],
-            ['RO', 'BT', 'Botoşani'],
-            ['RO', 'BV', 'Braşov'],
-            ['RO', 'BR', 'Brăila'],
-            ['RO', 'B', 'Bucureşti'],
-            ['RO', 'BZ', 'Buzău'],
-            ['RO', 'CS', 'Caraş-Severin'],
-            ['RO', 'CL', 'Călăraşi'],
-            ['RO', 'CJ', 'Cluj'],
-            ['RO', 'CT', 'Constanţa'],
-            ['RO', 'CV', 'Covasna'],
-            ['RO', 'DB', 'Dâmboviţa'],
-            ['RO', 'DJ', 'Dolj'],
-            ['RO', 'GL', 'Galaţi'],
-            ['RO', 'GR', 'Giurgiu'],
-            ['RO', 'GJ', 'Gorj'],
-            ['RO', 'HR', 'Harghita'],
-            ['RO', 'HD', 'Hunedoara'],
-            ['RO', 'IL', 'Ialomiţa'],
-            ['RO', 'IS', 'Iaşi'],
-            ['RO', 'IF', 'Ilfov'],
-            ['RO', 'MM', 'Maramureş'],
-            ['RO', 'MH', 'Mehedinţi'],
-            ['RO', 'MS', 'Mureş'],
-            ['RO', 'NT', 'Neamţ'],
-            ['RO', 'OT', 'Olt'],
-            ['RO', 'PH', 'Prahova'],
-            ['RO', 'SM', 'Satu-Mare'],
-            ['RO', 'SJ', 'Sălaj'],
-            ['RO', 'SB', 'Sibiu'],
-            ['RO', 'SV', 'Suceava'],
-            ['RO', 'TR', 'Teleorman'],
-            ['RO', 'TM', 'Timiş'],
-            ['RO', 'TL', 'Tulcea'],
-            ['RO', 'VS', 'Vaslui'],
-            ['RO', 'VL', 'Vâlcea'],
-            ['RO', 'VN', 'Vrancea'],
-            ['FI', 'Lappi', 'Lappi'],
-            ['FI', 'Pohjois-Pohjanmaa', 'Pohjois-Pohjanmaa'],
-            ['FI', 'Kainuu', 'Kainuu'],
-            ['FI', 'Pohjois-Karjala', 'Pohjois-Karjala'],
-            ['FI', 'Pohjois-Savo', 'Pohjois-Savo'],
-            ['FI', 'Etelä-Savo', 'Etelä-Savo'],
-            ['FI', 'Etelä-Pohjanmaa', 'Etelä-Pohjanmaa'],
-            ['FI', 'Pohjanmaa', 'Pohjanmaa'],
-            ['FI', 'Pirkanmaa', 'Pirkanmaa'],
-            ['FI', 'Satakunta', 'Satakunta'],
-            ['FI', 'Keski-Pohjanmaa', 'Keski-Pohjanmaa'],
-            ['FI', 'Keski-Suomi', 'Keski-Suomi'],
-            ['FI', 'Varsinais-Suomi', 'Varsinais-Suomi'],
-            ['FI', 'Etelä-Karjala', 'Etelä-Karjala'],
-            ['FI', 'Päijät-Häme', 'Päijät-Häme'],
-            ['FI', 'Kanta-Häme', 'Kanta-Häme'],
-            ['FI', 'Uusimaa', 'Uusimaa'],
-            ['FI', 'Itä-Uusimaa', 'Itä-Uusimaa'],
-            ['FI', 'Kymenlaakso', 'Kymenlaakso'],
-            ['FI', 'Ahvenanmaa', 'Ahvenanmaa'],
-            ['EE', 'EE-37', 'Harjumaa'],
-            ['EE', 'EE-39', 'Hiiumaa'],
-            ['EE', 'EE-44', 'Ida-Virumaa'],
-            ['EE', 'EE-49', 'Jõgevamaa'],
-            ['EE', 'EE-51', 'Järvamaa'],
-            ['EE', 'EE-57', 'Läänemaa'],
-            ['EE', 'EE-59', 'Lääne-Virumaa'],
-            ['EE', 'EE-65', 'Põlvamaa'],
-            ['EE', 'EE-67', 'Pärnumaa'],
-            ['EE', 'EE-70', 'Raplamaa'],
-            ['EE', 'EE-74', 'Saaremaa'],
-            ['EE', 'EE-78', 'Tartumaa'],
-            ['EE', 'EE-82', 'Valgamaa'],
-            ['EE', 'EE-84', 'Viljandimaa'],
-            ['EE', 'EE-86', 'Võrumaa'],
-            ['LV', 'LV-DGV', 'Daugavpils'],
-            ['LV', 'LV-JEL', 'Jelgava'],
-            ['LV', 'Jēkabpils', 'Jēkabpils'],
-            ['LV', 'LV-JUR', 'Jūrmala'],
-            ['LV', 'LV-LPX', 'Liepāja'],
-            ['LV', 'LV-LE', 'Liepājas novads'],
-            ['LV', 'LV-REZ', 'Rēzekne'],
-            ['LV', 'LV-RIX', 'Rīga'],
-            ['LV', 'LV-RI', 'Rīgas novads'],
-            ['LV', 'Valmiera', 'Valmiera'],
-            ['LV', 'LV-VEN', 'Ventspils'],
-            ['LV', 'Aglonas novads', 'Aglonas novads'],
-            ['LV', 'LV-AI', 'Aizkraukles novads'],
-            ['LV', 'Aizputes novads', 'Aizputes novads'],
-            ['LV', 'Aknīstes novads', 'Aknīstes novads'],
-            ['LV', 'Alojas novads', 'Alojas novads'],
-            ['LV', 'Alsungas novads', 'Alsungas novads'],
-            ['LV', 'LV-AL', 'Alūksnes novads'],
-            ['LV', 'Amatas novads', 'Amatas novads'],
-            ['LV', 'Apes novads', 'Apes novads'],
-            ['LV', 'Auces novads', 'Auces novads'],
-            ['LV', 'Babītes novads', 'Babītes novads'],
-            ['LV', 'Baldones novads', 'Baldones novads'],
-            ['LV', 'Baltinavas novads', 'Baltinavas novads'],
-            ['LV', 'LV-BL', 'Balvu novads'],
-            ['LV', 'LV-BU', 'Bauskas novads'],
-            ['LV', 'Beverīnas novads', 'Beverīnas novads'],
-            ['LV', 'Brocēnu novads', 'Brocēnu novads'],
-            ['LV', 'Burtnieku novads', 'Burtnieku novads'],
-            ['LV', 'Carnikavas novads', 'Carnikavas novads'],
-            ['LV', 'Cesvaines novads', 'Cesvaines novads'],
-            ['LV', 'Ciblas novads', 'Ciblas novads'],
-            ['LV', 'LV-CE', 'Cēsu novads'],
-            ['LV', 'Dagdas novads', 'Dagdas novads'],
-            ['LV', 'LV-DA', 'Daugavpils novads'],
-            ['LV', 'LV-DO', 'Dobeles novads'],
-            ['LV', 'Dundagas novads', 'Dundagas novads'],
-            ['LV', 'Durbes novads', 'Durbes novads'],
-            ['LV', 'Engures novads', 'Engures novads'],
-            ['LV', 'Garkalnes novads', 'Garkalnes novads'],
-            ['LV', 'Grobiņas novads', 'Grobiņas novads'],
-            ['LV', 'LV-GU', 'Gulbenes novads'],
-            ['LV', 'Iecavas novads', 'Iecavas novads'],
-            ['LV', 'Ikšķiles novads', 'Ikšķiles novads'],
-            ['LV', 'Ilūkstes novads', 'Ilūkstes novads'],
-            ['LV', 'Inčukalna novads', 'Inčukalna novads'],
-            ['LV', 'Jaunjelgavas novads', 'Jaunjelgavas novads'],
-            ['LV', 'Jaunpiebalgas novads', 'Jaunpiebalgas novads'],
-            ['LV', 'Jaunpils novads', 'Jaunpils novads'],
-            ['LV', 'LV-JL', 'Jelgavas novads'],
-            ['LV', 'LV-JK', 'Jēkabpils novads'],
-            ['LV', 'Kandavas novads', 'Kandavas novads'],
-            ['LV', 'Kokneses novads', 'Kokneses novads'],
-            ['LV', 'Krimuldas novads', 'Krimuldas novads'],
-            ['LV', 'Krustpils novads', 'Krustpils novads'],
-            ['LV', 'LV-KR', 'Krāslavas novads'],
-            ['LV', 'LV-KU', 'Kuldīgas novads'],
-            ['LV', 'Kārsavas novads', 'Kārsavas novads'],
-            ['LV', 'Lielvārdes novads', 'Lielvārdes novads'],
-            ['LV', 'LV-LM', 'Limbažu novads'],
-            ['LV', 'Lubānas novads', 'Lubānas novads'],
-            ['LV', 'LV-LU', 'Ludzas novads'],
-            ['LV', 'Līgatnes novads', 'Līgatnes novads'],
-            ['LV', 'Līvānu novads', 'Līvānu novads'],
-            ['LV', 'LV-MA', 'Madonas novads'],
-            ['LV', 'Mazsalacas novads', 'Mazsalacas novads'],
-            ['LV', 'Mālpils novads', 'Mālpils novads'],
-            ['LV', 'Mārupes novads', 'Mārupes novads'],
-            ['LV', 'Naukšēnu novads', 'Naukšēnu novads'],
-            ['LV', 'Neretas novads', 'Neretas novads'],
-            ['LV', 'Nīcas novads', 'Nīcas novads'],
-            ['LV', 'LV-OG', 'Ogres novads'],
-            ['LV', 'Olaines novads', 'Olaines novads'],
-            ['LV', 'Ozolnieku novads', 'Ozolnieku novads'],
-            ['LV', 'LV-PR', 'Preiļu novads'],
-            ['LV', 'Priekules novads', 'Priekules novads'],
-            ['LV', 'Priekuļu novads', 'Priekuļu novads'],
-            ['LV', 'Pārgaujas novads', 'Pārgaujas novads'],
-            ['LV', 'Pāvilostas novads', 'Pāvilostas novads'],
-            ['LV', 'Pļaviņu novads', 'Pļaviņu novads'],
-            ['LV', 'Raunas novads', 'Raunas novads'],
-            ['LV', 'Riebiņu novads', 'Riebiņu novads'],
-            ['LV', 'Rojas novads', 'Rojas novads'],
-            ['LV', 'Ropažu novads', 'Ropažu novads'],
-            ['LV', 'Rucavas novads', 'Rucavas novads'],
-            ['LV', 'Rugāju novads', 'Rugāju novads'],
-            ['LV', 'Rundāles novads', 'Rundāles novads'],
-            ['LV', 'LV-RE', 'Rēzeknes novads'],
-            ['LV', 'Rūjienas novads', 'Rūjienas novads'],
-            ['LV', 'Salacgrīvas novads', 'Salacgrīvas novads'],
-            ['LV', 'Salas novads', 'Salas novads'],
-            ['LV', 'Salaspils novads', 'Salaspils novads'],
-            ['LV', 'LV-SA', 'Saldus novads'],
-            ['LV', 'Saulkrastu novads', 'Saulkrastu novads'],
-            ['LV', 'Siguldas novads', 'Siguldas novads'],
-            ['LV', 'Skrundas novads', 'Skrundas novads'],
-            ['LV', 'Skrīveru novads', 'Skrīveru novads'],
-            ['LV', 'Smiltenes novads', 'Smiltenes novads'],
-            ['LV', 'Stopiņu novads', 'Stopiņu novads'],
-            ['LV', 'Strenču novads', 'Strenču novads'],
-            ['LV', 'Sējas novads', 'Sējas novads'],
-            ['LV', 'LV-TA', 'Talsu novads'],
-            ['LV', 'LV-TU', 'Tukuma novads'],
-            ['LV', 'Tērvetes novads', 'Tērvetes novads'],
-            ['LV', 'Vaiņodes novads', 'Vaiņodes novads'],
-            ['LV', 'LV-VK', 'Valkas novads'],
-            ['LV', 'LV-VM', 'Valmieras novads'],
-            ['LV', 'Varakļānu novads', 'Varakļānu novads'],
-            ['LV', 'Vecpiebalgas novads', 'Vecpiebalgas novads'],
-            ['LV', 'Vecumnieku novads', 'Vecumnieku novads'],
-            ['LV', 'LV-VE', 'Ventspils novads'],
-            ['LV', 'Viesītes novads', 'Viesītes novads'],
-            ['LV', 'Viļakas novads', 'Viļakas novads'],
-            ['LV', 'Viļānu novads', 'Viļānu novads'],
-            ['LV', 'Vārkavas novads', 'Vārkavas novads'],
-            ['LV', 'Zilupes novads', 'Zilupes novads'],
-            ['LV', 'Ādažu novads', 'Ādažu novads'],
-            ['LV', 'Ērgļu novads', 'Ērgļu novads'],
-            ['LV', 'Ķeguma novads', 'Ķeguma novads'],
-            ['LV', 'Ķekavas novads', 'Ķekavas novads'],
-            ['LT', 'LT-AL', 'Alytaus Apskritis'],
-            ['LT', 'LT-KU', 'Kauno Apskritis'],
-            ['LT', 'LT-KL', 'Klaipėdos Apskritis'],
-            ['LT', 'LT-MR', 'Marijampolės Apskritis'],
-            ['LT', 'LT-PN', 'Panevėžio Apskritis'],
-            ['LT', 'LT-SA', 'Šiaulių Apskritis'],
-            ['LT', 'LT-TA', 'Tauragės Apskritis'],
-            ['LT', 'LT-TE', 'Telšių Apskritis'],
-            ['LT', 'LT-UT', 'Utenos Apskritis'],
-            ['LT', 'LT-VL', 'Vilniaus Apskritis'],
-            ['BR', 'AC', 'Acre'],
-            ['BR', 'AL', 'Alagoas'],
-            ['BR', 'AP', 'Amapá'],
-            ['BR', 'AM', 'Amazonas'],
-            ['BR', 'BA', 'Bahia'],
-            ['BR', 'CE', 'Ceará'],
-            ['BR', 'ES', 'Espírito Santo'],
-            ['BR', 'GO', 'Goiás'],
-            ['BR', 'MA', 'Maranhão'],
-            ['BR', 'MT', 'Mato Grosso'],
-            ['BR', 'MS', 'Mato Grosso do Sul'],
-            ['BR', 'MG', 'Minas Gerais'],
-            ['BR', 'PA', 'Pará'],
-            ['BR', 'PB', 'Paraíba'],
-            ['BR', 'PR', 'Paraná'],
-            ['BR', 'PE', 'Pernambuco'],
-            ['BR', 'PI', 'Piauí'],
-            ['BR', 'RJ', 'Rio de Janeiro'],
-            ['BR', 'RN', 'Rio Grande do Norte'],
-            ['BR', 'RS', 'Rio Grande do Sul'],
-            ['BR', 'RO', 'Rondônia'],
-            ['BR', 'RR', 'Roraima'],
-            ['BR', 'SC', 'Santa Catarina'],
-            ['BR', 'SP', 'São Paulo'],
-            ['BR', 'SE', 'Sergipe'],
-            ['BR', 'TO', 'Tocantins'],
-            ['BR', 'DF', 'Distrito Federal'],
-        ];
-
-        foreach ($data as $row) {
-            $bind = ['country_id' => $row[0], 'code' => $row[1], 'default_name' => $row[2]];
-            $setup->getConnection()->insert($setup->getTable('directory_country_region'), $bind);
-            $regionId = $setup->getConnection()->lastInsertId($setup->getTable('directory_country_region'));
-
-            $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
-            $setup->getConnection()->insert($setup->getTable('directory_country_region_name'), $bind);
-        }
-
-        /**
-         * Fill table directory/currency_rate
-         */
-        $data = [
-            ['EUR', 'EUR', 1],
-            ['EUR', 'USD', 1.415000000000],
-            ['USD', 'EUR', 0.706700000000],
-            ['USD', 'USD', 1],
-        ];
-
-        $columns = ['currency_from', 'currency_to', 'rate'];
-        $setup->getConnection()->insertArray($setup->getTable('directory_currency_rate'), $columns, $data);
-
-        $setup->getConnection()->insert(
-            $setup->getTable('core_config_data'),
-            [
-                'scope' => 'default',
-                'scope_id' => 0,
-                'path' => Data::XML_PATH_DISPLAY_ALL_STATES,
-                'value' => 1
-            ]
-        );
-
-        $countries = $this->directoryData->getCountryCollection()->getCountriesWithRequiredStates();
-        $setup->getConnection()->insert(
-            $setup->getTable('core_config_data'),
-            [
-                'scope' => 'default',
-                'scope_id' => 0,
-                'path' => Data::XML_PATH_STATES_REQUIRED,
-                'value' => implode(',', array_keys($countries))
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/Directory/Setup/InstallSchema.php b/app/code/Magento/Directory/Setup/InstallSchema.php
deleted file mode 100644
index af35806e3ce5c..0000000000000
--- a/app/code/Magento/Directory/Setup/InstallSchema.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'directory_country'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('directory_country')
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            ['nullable' => false, 'primary' => true, 'default' => false],
-            'Country Id in ISO-2'
-        )->addColumn(
-            'iso2_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            ['nullable' => true, 'default' => null],
-            'Country ISO-2 format'
-        )->addColumn(
-            'iso3_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            ['nullable' => true, 'default' => null],
-            'Country ISO-3'
-        )->setComment(
-            'Directory Country'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'directory_country_format'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('directory_country_format')
-        )->addColumn(
-            'country_format_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Country Format Id'
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            ['nullable' => true, 'default' => null],
-            'Country Id in ISO-2'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            30,
-            ['nullable' => true, 'default' => null],
-            'Country Format Type'
-        )->addColumn(
-            'format',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => false],
-            'Country Format'
-        )->addIndex(
-            $installer->getIdxName(
-                'directory_country_format',
-                ['country_id', 'type'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['country_id', 'type'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->setComment(
-            'Directory Country Format'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'directory_country_region'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('directory_country_region')
-        )->addColumn(
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Region Id'
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            4,
-            ['nullable' => false, 'default' => '0'],
-            'Country Id in ISO-2'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true, 'default' => null],
-            'Region code'
-        )->addColumn(
-            'default_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Region Name'
-        )->addIndex(
-            $installer->getIdxName('directory_country_region', ['country_id']),
-            ['country_id']
-        )->setComment(
-            'Directory Country Region'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'directory_country_region_name'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('directory_country_region_name')
-        )->addColumn(
-            'locale',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            8,
-            ['nullable' => false, 'primary' => true, 'default' => false],
-            'Locale'
-        )->addColumn(
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-            'Region Id'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Region Name'
-        )->addIndex(
-            $installer->getIdxName('directory_country_region_name', ['region_id']),
-            ['region_id']
-        )->addForeignKey(
-            $installer->getFkName(
-                'directory_country_region_name',
-                'region_id',
-                'directory_country_region',
-                'region_id'
-            ),
-            'region_id',
-            $installer->getTable('directory_country_region'),
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Directory Country Region Name'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'directory_currency_rate'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('directory_currency_rate')
-        )->addColumn(
-            'currency_from',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            ['nullable' => false, 'primary' => true, 'default' => false],
-            'Currency Code Convert From'
-        )->addColumn(
-            'currency_to',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            ['nullable' => false, 'primary' => true, 'default' => false],
-            'Currency Code Convert To'
-        )->addColumn(
-            'rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '24,12',
-            ['nullable' => false, 'default' => '0.000000000000'],
-            'Currency Conversion Rate'
-        )->addIndex(
-            $installer->getIdxName('directory_currency_rate', ['currency_to']),
-            ['currency_to']
-        )->setComment(
-            'Directory Currency Rate'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForAustralia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForAustralia.php
new file mode 100644
index 0000000000000..20306d08a292c
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForAustralia.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Adds Australian States
+ */
+class AddDataForAustralia implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Setup\DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->dataInstallerFactory = $dataInstallerFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /** @var DataInstaller $dataInstaller */
+        $dataInstaller = $this->dataInstallerFactory->create();
+        $dataInstaller->addCountryRegions(
+            $this->moduleDataSetup->getConnection(),
+            $this->getDataForAustralia()
+        );
+    }
+
+    /**
+     * Australian states data.
+     *
+     * @return array
+     */
+    private function getDataForAustralia()
+    {
+        return [
+            ['AU', 'ACT', 'Australian Capital Territory'],
+            ['AU', 'NSW', 'New South Wales'],
+            ['AU', 'VIC', 'Victoria'],
+            ['AU', 'QLD', 'Queensland'],
+            ['AU', 'SA',  'South Australia'],
+            ['AU', 'TAS', 'Tasmania'],
+            ['AU', 'WA',  'Western Australia'],
+            ['AU', 'NT',  'Northern Territory']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+            AddDataForCroatia::class,
+            AddDataForIndia::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php
new file mode 100644
index 0000000000000..eb9d4f4018b1a
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddDataForCroatia
+ * @package Magento\Directory\Setup\Patch
+ */
+class AddDataForCroatia implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Setup\DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * AddDataForCroatia constructor.
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->dataInstallerFactory = $dataInstallerFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var DataInstaller $dataInstaller */
+        $dataInstaller = $this->dataInstallerFactory->create();
+        $dataInstaller->addCountryRegions(
+            $this->moduleDataSetup->getConnection(),
+            $this->getDataForCroatia()
+        );
+    }
+
+    /**
+     * Croatian states data.
+     *
+     * @return array
+     */
+    private function getDataForCroatia()
+    {
+        return [
+            ['HR', 'HR-01', 'Zagrebačka županija'],
+            ['HR', 'HR-02', 'Krapinsko-zagorska županija'],
+            ['HR', 'HR-03', 'Sisačko-moslavačka županija'],
+            ['HR', 'HR-04', 'Karlovačka županija'],
+            ['HR', 'HR-05', 'Varaždinska županija'],
+            ['HR', 'HR-06', 'Koprivničko-križevačka županija'],
+            ['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
+            ['HR', 'HR-08', 'Primorsko-goranska županija'],
+            ['HR', 'HR-09', 'Ličko-senjska županija'],
+            ['HR', 'HR-10', 'Virovitičko-podravska županija'],
+            ['HR', 'HR-11', 'Požeško-slavonska županija'],
+            ['HR', 'HR-12', 'Brodsko-posavska županija'],
+            ['HR', 'HR-13', 'Zadarska županija'],
+            ['HR', 'HR-14', 'Osječko-baranjska županija'],
+            ['HR', 'HR-15', 'Šibensko-kninska županija'],
+            ['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
+            ['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
+            ['HR', 'HR-18', 'Istarska županija'],
+            ['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
+            ['HR', 'HR-20', 'Međimurska županija'],
+            ['HR', 'HR-21', 'Grad Zagreb']
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
new file mode 100644
index 0000000000000..69d500960d3f0
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddDataForIndia
+ * @package Magento\Directory\Setup\Patch\Data
+ */
+class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Setup\DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * AddDataForCroatia constructor.
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->dataInstallerFactory = $dataInstallerFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var DataInstaller $dataInstaller */
+        $dataInstaller = $this->dataInstallerFactory->create();
+        $dataInstaller->addCountryRegions(
+            $this->moduleDataSetup->getConnection(),
+            $this->getDataForIndia()
+        );
+    }
+
+    /**
+     * Indian states data.
+     *
+     * @return array
+     */
+    private function getDataForIndia()
+    {
+        return [
+            ['IN', 'AN', 'Andaman and Nicobar Islands'],
+            ['IN', 'AP', 'Andhra Pradesh'],
+            ['IN', 'AR', 'Arunachal Pradesh'],
+            ['IN', 'AS', 'Assam'],
+            ['IN', 'BR', 'Bihar'],
+            ['IN', 'CH', 'Chandigarh'],
+            ['IN', 'CT', 'Chhattisgarh'],
+            ['IN', 'DN', 'Dadra and Nagar Haveli'],
+            ['IN', 'DD', 'Daman and Diu'],
+            ['IN', 'DL', 'Delhi'],
+            ['IN', 'GA', 'Goa'],
+            ['IN', 'GJ', 'Gujarat'],
+            ['IN', 'HR', 'Haryana'],
+            ['IN', 'HP', 'Himachal Pradesh'],
+            ['IN', 'JK', 'Jammu and Kashmir'],
+            ['IN', 'JH', 'Jharkhand'],
+            ['IN', 'KA', 'Karnataka'],
+            ['IN', 'KL', 'Kerala'],
+            ['IN', 'LD', 'Lakshadweep'],
+            ['IN', 'MP', 'Madhya Pradesh'],
+            ['IN', 'MH', 'Maharashtra'],
+            ['IN', 'MN', 'Manipur'],
+            ['IN', 'ML', 'Meghalaya'],
+            ['IN', 'MZ', 'Mizoram'],
+            ['IN', 'NL', 'Nagaland'],
+            ['IN', 'OR', 'Odisha'],
+            ['IN', 'PY', 'Puducherry'],
+            ['IN', 'PB', 'Punjab'],
+            ['IN', 'RJ', 'Rajasthan'],
+            ['IN', 'SK', 'Sikkim'],
+            ['IN', 'TN', 'Tamil Nadu'],
+            ['IN', 'TG', 'Telangana'],
+            ['IN', 'TR', 'Tripura'],
+            ['IN', 'UP', 'Uttar Pradesh'],
+            ['IN', 'UT', 'Uttarakhand'],
+            ['IN', 'WB', 'West Bengal']
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php b/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php
new file mode 100644
index 0000000000000..79ac53d3a449f
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php
@@ -0,0 +1,899 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Helper\Data;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InitializeDirectoryData
+ * @package Magento\Directory\Setup\Patch
+ */
+class InitializeDirectoryData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Helper\DataFactory
+     */
+    private $directoryDataFactory;
+
+    /**
+     * InitializeDirectoryData constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Helper\DataFactory $directoryDataFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Helper\DataFactory $directoryDataFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->directoryDataFactory = $directoryDataFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        /**
+         * Fill table directory/country
+         */
+        $data = [
+            ['AD', 'AD', 'AND'],
+            ['AE', 'AE', 'ARE'],
+            ['AF', 'AF', 'AFG'],
+            ['AG', 'AG', 'ATG'],
+            ['AI', 'AI', 'AIA'],
+            ['AL', 'AL', 'ALB'],
+            ['AM', 'AM', 'ARM'],
+            ['AN', 'AN', 'ANT'],
+            ['AO', 'AO', 'AGO'],
+            ['AQ', 'AQ', 'ATA'],
+            ['AR', 'AR', 'ARG'],
+            ['AS', 'AS', 'ASM'],
+            ['AT', 'AT', 'AUT'],
+            ['AU', 'AU', 'AUS'],
+            ['AW', 'AW', 'ABW'],
+            ['AX', 'AX', 'ALA'],
+            ['AZ', 'AZ', 'AZE'],
+            ['BA', 'BA', 'BIH'],
+            ['BB', 'BB', 'BRB'],
+            ['BD', 'BD', 'BGD'],
+            ['BE', 'BE', 'BEL'],
+            ['BF', 'BF', 'BFA'],
+            ['BG', 'BG', 'BGR'],
+            ['BH', 'BH', 'BHR'],
+            ['BI', 'BI', 'BDI'],
+            ['BJ', 'BJ', 'BEN'],
+            ['BL', 'BL', 'BLM'],
+            ['BM', 'BM', 'BMU'],
+            ['BN', 'BN', 'BRN'],
+            ['BO', 'BO', 'BOL'],
+            ['BR', 'BR', 'BRA'],
+            ['BS', 'BS', 'BHS'],
+            ['BT', 'BT', 'BTN'],
+            ['BV', 'BV', 'BVT'],
+            ['BW', 'BW', 'BWA'],
+            ['BY', 'BY', 'BLR'],
+            ['BZ', 'BZ', 'BLZ'],
+            ['CA', 'CA', 'CAN'],
+            ['CC', 'CC', 'CCK'],
+            ['CD', 'CD', 'COD'],
+            ['CF', 'CF', 'CAF'],
+            ['CG', 'CG', 'COG'],
+            ['CH', 'CH', 'CHE'],
+            ['CI', 'CI', 'CIV'],
+            ['CK', 'CK', 'COK'],
+            ['CL', 'CL', 'CHL'],
+            ['CM', 'CM', 'CMR'],
+            ['CN', 'CN', 'CHN'],
+            ['CO', 'CO', 'COL'],
+            ['CR', 'CR', 'CRI'],
+            ['CU', 'CU', 'CUB'],
+            ['CV', 'CV', 'CPV'],
+            ['CX', 'CX', 'CXR'],
+            ['CY', 'CY', 'CYP'],
+            ['CZ', 'CZ', 'CZE'],
+            ['DE', 'DE', 'DEU'],
+            ['DJ', 'DJ', 'DJI'],
+            ['DK', 'DK', 'DNK'],
+            ['DM', 'DM', 'DMA'],
+            ['DO', 'DO', 'DOM'],
+            ['DZ', 'DZ', 'DZA'],
+            ['EC', 'EC', 'ECU'],
+            ['EE', 'EE', 'EST'],
+            ['EG', 'EG', 'EGY'],
+            ['EH', 'EH', 'ESH'],
+            ['ER', 'ER', 'ERI'],
+            ['ES', 'ES', 'ESP'],
+            ['ET', 'ET', 'ETH'],
+            ['FI', 'FI', 'FIN'],
+            ['FJ', 'FJ', 'FJI'],
+            ['FK', 'FK', 'FLK'],
+            ['FM', 'FM', 'FSM'],
+            ['FO', 'FO', 'FRO'],
+            ['FR', 'FR', 'FRA'],
+            ['GA', 'GA', 'GAB'],
+            ['GB', 'GB', 'GBR'],
+            ['GD', 'GD', 'GRD'],
+            ['GE', 'GE', 'GEO'],
+            ['GF', 'GF', 'GUF'],
+            ['GG', 'GG', 'GGY'],
+            ['GH', 'GH', 'GHA'],
+            ['GI', 'GI', 'GIB'],
+            ['GL', 'GL', 'GRL'],
+            ['GM', 'GM', 'GMB'],
+            ['GN', 'GN', 'GIN'],
+            ['GP', 'GP', 'GLP'],
+            ['GQ', 'GQ', 'GNQ'],
+            ['GR', 'GR', 'GRC'],
+            ['GS', 'GS', 'SGS'],
+            ['GT', 'GT', 'GTM'],
+            ['GU', 'GU', 'GUM'],
+            ['GW', 'GW', 'GNB'],
+            ['GY', 'GY', 'GUY'],
+            ['HK', 'HK', 'HKG'],
+            ['HM', 'HM', 'HMD'],
+            ['HN', 'HN', 'HND'],
+            ['HR', 'HR', 'HRV'],
+            ['HT', 'HT', 'HTI'],
+            ['HU', 'HU', 'HUN'],
+            ['ID', 'ID', 'IDN'],
+            ['IE', 'IE', 'IRL'],
+            ['IL', 'IL', 'ISR'],
+            ['IM', 'IM', 'IMN'],
+            ['IN', 'IN', 'IND'],
+            ['IO', 'IO', 'IOT'],
+            ['IQ', 'IQ', 'IRQ'],
+            ['IR', 'IR', 'IRN'],
+            ['IS', 'IS', 'ISL'],
+            ['IT', 'IT', 'ITA'],
+            ['JE', 'JE', 'JEY'],
+            ['JM', 'JM', 'JAM'],
+            ['JO', 'JO', 'JOR'],
+            ['JP', 'JP', 'JPN'],
+            ['KE', 'KE', 'KEN'],
+            ['KG', 'KG', 'KGZ'],
+            ['KH', 'KH', 'KHM'],
+            ['KI', 'KI', 'KIR'],
+            ['KM', 'KM', 'COM'],
+            ['KN', 'KN', 'KNA'],
+            ['KP', 'KP', 'PRK'],
+            ['KR', 'KR', 'KOR'],
+            ['KW', 'KW', 'KWT'],
+            ['KY', 'KY', 'CYM'],
+            ['KZ', 'KZ', 'KAZ'],
+            ['LA', 'LA', 'LAO'],
+            ['LB', 'LB', 'LBN'],
+            ['LC', 'LC', 'LCA'],
+            ['LI', 'LI', 'LIE'],
+            ['LK', 'LK', 'LKA'],
+            ['LR', 'LR', 'LBR'],
+            ['LS', 'LS', 'LSO'],
+            ['LT', 'LT', 'LTU'],
+            ['LU', 'LU', 'LUX'],
+            ['LV', 'LV', 'LVA'],
+            ['LY', 'LY', 'LBY'],
+            ['MA', 'MA', 'MAR'],
+            ['MC', 'MC', 'MCO'],
+            ['MD', 'MD', 'MDA'],
+            ['ME', 'ME', 'MNE'],
+            ['MF', 'MF', 'MAF'],
+            ['MG', 'MG', 'MDG'],
+            ['MH', 'MH', 'MHL'],
+            ['MK', 'MK', 'MKD'],
+            ['ML', 'ML', 'MLI'],
+            ['MM', 'MM', 'MMR'],
+            ['MN', 'MN', 'MNG'],
+            ['MO', 'MO', 'MAC'],
+            ['MP', 'MP', 'MNP'],
+            ['MQ', 'MQ', 'MTQ'],
+            ['MR', 'MR', 'MRT'],
+            ['MS', 'MS', 'MSR'],
+            ['MT', 'MT', 'MLT'],
+            ['MU', 'MU', 'MUS'],
+            ['MV', 'MV', 'MDV'],
+            ['MW', 'MW', 'MWI'],
+            ['MX', 'MX', 'MEX'],
+            ['MY', 'MY', 'MYS'],
+            ['MZ', 'MZ', 'MOZ'],
+            ['NA', 'NA', 'NAM'],
+            ['NC', 'NC', 'NCL'],
+            ['NE', 'NE', 'NER'],
+            ['NF', 'NF', 'NFK'],
+            ['NG', 'NG', 'NGA'],
+            ['NI', 'NI', 'NIC'],
+            ['NL', 'NL', 'NLD'],
+            ['NO', 'NO', 'NOR'],
+            ['NP', 'NP', 'NPL'],
+            ['NR', 'NR', 'NRU'],
+            ['NU', 'NU', 'NIU'],
+            ['NZ', 'NZ', 'NZL'],
+            ['OM', 'OM', 'OMN'],
+            ['PA', 'PA', 'PAN'],
+            ['PE', 'PE', 'PER'],
+            ['PF', 'PF', 'PYF'],
+            ['PG', 'PG', 'PNG'],
+            ['PH', 'PH', 'PHL'],
+            ['PK', 'PK', 'PAK'],
+            ['PL', 'PL', 'POL'],
+            ['PM', 'PM', 'SPM'],
+            ['PN', 'PN', 'PCN'],
+            ['PS', 'PS', 'PSE'],
+            ['PT', 'PT', 'PRT'],
+            ['PW', 'PW', 'PLW'],
+            ['PY', 'PY', 'PRY'],
+            ['QA', 'QA', 'QAT'],
+            ['RE', 'RE', 'REU'],
+            ['RO', 'RO', 'ROU'],
+            ['RS', 'RS', 'SRB'],
+            ['RU', 'RU', 'RUS'],
+            ['RW', 'RW', 'RWA'],
+            ['SA', 'SA', 'SAU'],
+            ['SB', 'SB', 'SLB'],
+            ['SC', 'SC', 'SYC'],
+            ['SD', 'SD', 'SDN'],
+            ['SE', 'SE', 'SWE'],
+            ['SG', 'SG', 'SGP'],
+            ['SH', 'SH', 'SHN'],
+            ['SI', 'SI', 'SVN'],
+            ['SJ', 'SJ', 'SJM'],
+            ['SK', 'SK', 'SVK'],
+            ['SL', 'SL', 'SLE'],
+            ['SM', 'SM', 'SMR'],
+            ['SN', 'SN', 'SEN'],
+            ['SO', 'SO', 'SOM'],
+            ['SR', 'SR', 'SUR'],
+            ['ST', 'ST', 'STP'],
+            ['SV', 'SV', 'SLV'],
+            ['SY', 'SY', 'SYR'],
+            ['SZ', 'SZ', 'SWZ'],
+            ['TC', 'TC', 'TCA'],
+            ['TD', 'TD', 'TCD'],
+            ['TF', 'TF', 'ATF'],
+            ['TG', 'TG', 'TGO'],
+            ['TH', 'TH', 'THA'],
+            ['TJ', 'TJ', 'TJK'],
+            ['TK', 'TK', 'TKL'],
+            ['TL', 'TL', 'TLS'],
+            ['TM', 'TM', 'TKM'],
+            ['TN', 'TN', 'TUN'],
+            ['TO', 'TO', 'TON'],
+            ['TR', 'TR', 'TUR'],
+            ['TT', 'TT', 'TTO'],
+            ['TV', 'TV', 'TUV'],
+            ['TW', 'TW', 'TWN'],
+            ['TZ', 'TZ', 'TZA'],
+            ['UA', 'UA', 'UKR'],
+            ['UG', 'UG', 'UGA'],
+            ['UM', 'UM', 'UMI'],
+            ['US', 'US', 'USA'],
+            ['UY', 'UY', 'URY'],
+            ['UZ', 'UZ', 'UZB'],
+            ['VA', 'VA', 'VAT'],
+            ['VC', 'VC', 'VCT'],
+            ['VE', 'VE', 'VEN'],
+            ['VG', 'VG', 'VGB'],
+            ['VI', 'VI', 'VIR'],
+            ['VN', 'VN', 'VNM'],
+            ['VU', 'VU', 'VUT'],
+            ['WF', 'WF', 'WLF'],
+            ['WS', 'WS', 'WSM'],
+            ['YE', 'YE', 'YEM'],
+            ['YT', 'YT', 'MYT'],
+            ['ZA', 'ZA', 'ZAF'],
+            ['ZM', 'ZM', 'ZMB'],
+            ['ZW', 'ZW', 'ZWE'],
+        ];
+
+        $columns = ['country_id', 'iso2_code', 'iso3_code'];
+        $this->moduleDataSetup->getConnection()->insertArray(
+            $this->moduleDataSetup->getTable('directory_country'),
+            $columns,
+            $data
+        );
+        /**
+         * Fill table directory/country_region
+         * Fill table directory/country_region_name for en_US locale
+         */
+        $data = [
+            ['US', 'AL', 'Alabama'],
+            ['US', 'AK', 'Alaska'],
+            ['US', 'AS', 'American Samoa'],
+            ['US', 'AZ', 'Arizona'],
+            ['US', 'AR', 'Arkansas'],
+            ['US', 'AE', 'Armed Forces Africa'],
+            ['US', 'AA', 'Armed Forces Americas'],
+            ['US', 'AE', 'Armed Forces Canada'],
+            ['US', 'AE', 'Armed Forces Europe'],
+            ['US', 'AE', 'Armed Forces Middle East'],
+            ['US', 'AP', 'Armed Forces Pacific'],
+            ['US', 'CA', 'California'],
+            ['US', 'CO', 'Colorado'],
+            ['US', 'CT', 'Connecticut'],
+            ['US', 'DE', 'Delaware'],
+            ['US', 'DC', 'District of Columbia'],
+            ['US', 'FM', 'Federated States Of Micronesia'],
+            ['US', 'FL', 'Florida'],
+            ['US', 'GA', 'Georgia'],
+            ['US', 'GU', 'Guam'],
+            ['US', 'HI', 'Hawaii'],
+            ['US', 'ID', 'Idaho'],
+            ['US', 'IL', 'Illinois'],
+            ['US', 'IN', 'Indiana'],
+            ['US', 'IA', 'Iowa'],
+            ['US', 'KS', 'Kansas'],
+            ['US', 'KY', 'Kentucky'],
+            ['US', 'LA', 'Louisiana'],
+            ['US', 'ME', 'Maine'],
+            ['US', 'MH', 'Marshall Islands'],
+            ['US', 'MD', 'Maryland'],
+            ['US', 'MA', 'Massachusetts'],
+            ['US', 'MI', 'Michigan'],
+            ['US', 'MN', 'Minnesota'],
+            ['US', 'MS', 'Mississippi'],
+            ['US', 'MO', 'Missouri'],
+            ['US', 'MT', 'Montana'],
+            ['US', 'NE', 'Nebraska'],
+            ['US', 'NV', 'Nevada'],
+            ['US', 'NH', 'New Hampshire'],
+            ['US', 'NJ', 'New Jersey'],
+            ['US', 'NM', 'New Mexico'],
+            ['US', 'NY', 'New York'],
+            ['US', 'NC', 'North Carolina'],
+            ['US', 'ND', 'North Dakota'],
+            ['US', 'MP', 'Northern Mariana Islands'],
+            ['US', 'OH', 'Ohio'],
+            ['US', 'OK', 'Oklahoma'],
+            ['US', 'OR', 'Oregon'],
+            ['US', 'PW', 'Palau'],
+            ['US', 'PA', 'Pennsylvania'],
+            ['US', 'PR', 'Puerto Rico'],
+            ['US', 'RI', 'Rhode Island'],
+            ['US', 'SC', 'South Carolina'],
+            ['US', 'SD', 'South Dakota'],
+            ['US', 'TN', 'Tennessee'],
+            ['US', 'TX', 'Texas'],
+            ['US', 'UT', 'Utah'],
+            ['US', 'VT', 'Vermont'],
+            ['US', 'VI', 'Virgin Islands'],
+            ['US', 'VA', 'Virginia'],
+            ['US', 'WA', 'Washington'],
+            ['US', 'WV', 'West Virginia'],
+            ['US', 'WI', 'Wisconsin'],
+            ['US', 'WY', 'Wyoming'],
+            ['CA', 'AB', 'Alberta'],
+            ['CA', 'BC', 'British Columbia'],
+            ['CA', 'MB', 'Manitoba'],
+            ['CA', 'NL', 'Newfoundland and Labrador'],
+            ['CA', 'NB', 'New Brunswick'],
+            ['CA', 'NS', 'Nova Scotia'],
+            ['CA', 'NT', 'Northwest Territories'],
+            ['CA', 'NU', 'Nunavut'],
+            ['CA', 'ON', 'Ontario'],
+            ['CA', 'PE', 'Prince Edward Island'],
+            ['CA', 'QC', 'Quebec'],
+            ['CA', 'SK', 'Saskatchewan'],
+            ['CA', 'YT', 'Yukon Territory'],
+            ['DE', 'NDS', 'Niedersachsen'],
+            ['DE', 'BAW', 'Baden-Württemberg'],
+            ['DE', 'BAY', 'Bayern'],
+            ['DE', 'BER', 'Berlin'],
+            ['DE', 'BRG', 'Brandenburg'],
+            ['DE', 'BRE', 'Bremen'],
+            ['DE', 'HAM', 'Hamburg'],
+            ['DE', 'HES', 'Hessen'],
+            ['DE', 'MEC', 'Mecklenburg-Vorpommern'],
+            ['DE', 'NRW', 'Nordrhein-Westfalen'],
+            ['DE', 'RHE', 'Rheinland-Pfalz'],
+            ['DE', 'SAR', 'Saarland'],
+            ['DE', 'SAS', 'Sachsen'],
+            ['DE', 'SAC', 'Sachsen-Anhalt'],
+            ['DE', 'SCN', 'Schleswig-Holstein'],
+            ['DE', 'THE', 'Thüringen'],
+            ['AT', 'WI', 'Wien'],
+            ['AT', 'NO', 'Niederösterreich'],
+            ['AT', 'OO', 'Oberösterreich'],
+            ['AT', 'SB', 'Salzburg'],
+            ['AT', 'KN', 'Kärnten'],
+            ['AT', 'ST', 'Steiermark'],
+            ['AT', 'TI', 'Tirol'],
+            ['AT', 'BL', 'Burgenland'],
+            ['AT', 'VB', 'Vorarlberg'],
+            ['CH', 'AG', 'Aargau'],
+            ['CH', 'AI', 'Appenzell Innerrhoden'],
+            ['CH', 'AR', 'Appenzell Ausserrhoden'],
+            ['CH', 'BE', 'Bern'],
+            ['CH', 'BL', 'Basel-Landschaft'],
+            ['CH', 'BS', 'Basel-Stadt'],
+            ['CH', 'FR', 'Freiburg'],
+            ['CH', 'GE', 'Genf'],
+            ['CH', 'GL', 'Glarus'],
+            ['CH', 'GR', 'Graubünden'],
+            ['CH', 'JU', 'Jura'],
+            ['CH', 'LU', 'Luzern'],
+            ['CH', 'NE', 'Neuenburg'],
+            ['CH', 'NW', 'Nidwalden'],
+            ['CH', 'OW', 'Obwalden'],
+            ['CH', 'SG', 'St. Gallen'],
+            ['CH', 'SH', 'Schaffhausen'],
+            ['CH', 'SO', 'Solothurn'],
+            ['CH', 'SZ', 'Schwyz'],
+            ['CH', 'TG', 'Thurgau'],
+            ['CH', 'TI', 'Tessin'],
+            ['CH', 'UR', 'Uri'],
+            ['CH', 'VD', 'Waadt'],
+            ['CH', 'VS', 'Wallis'],
+            ['CH', 'ZG', 'Zug'],
+            ['CH', 'ZH', 'Zürich'],
+            ['ES', 'A Coruсa', 'A Coruña'],
+            ['ES', 'Alava', 'Alava'],
+            ['ES', 'Albacete', 'Albacete'],
+            ['ES', 'Alicante', 'Alicante'],
+            ['ES', 'Almeria', 'Almeria'],
+            ['ES', 'Asturias', 'Asturias'],
+            ['ES', 'Avila', 'Avila'],
+            ['ES', 'Badajoz', 'Badajoz'],
+            ['ES', 'Baleares', 'Baleares'],
+            ['ES', 'Barcelona', 'Barcelona'],
+            ['ES', 'Burgos', 'Burgos'],
+            ['ES', 'Caceres', 'Caceres'],
+            ['ES', 'Cadiz', 'Cadiz'],
+            ['ES', 'Cantabria', 'Cantabria'],
+            ['ES', 'Castellon', 'Castellon'],
+            ['ES', 'Ceuta', 'Ceuta'],
+            ['ES', 'Ciudad Real', 'Ciudad Real'],
+            ['ES', 'Cordoba', 'Cordoba'],
+            ['ES', 'Cuenca', 'Cuenca'],
+            ['ES', 'Girona', 'Girona'],
+            ['ES', 'Granada', 'Granada'],
+            ['ES', 'Guadalajara', 'Guadalajara'],
+            ['ES', 'Guipuzcoa', 'Guipuzcoa'],
+            ['ES', 'Huelva', 'Huelva'],
+            ['ES', 'Huesca', 'Huesca'],
+            ['ES', 'Jaen', 'Jaen'],
+            ['ES', 'La Rioja', 'La Rioja'],
+            ['ES', 'Las Palmas', 'Las Palmas'],
+            ['ES', 'Leon', 'Leon'],
+            ['ES', 'Lleida', 'Lleida'],
+            ['ES', 'Lugo', 'Lugo'],
+            ['ES', 'Madrid', 'Madrid'],
+            ['ES', 'Malaga', 'Malaga'],
+            ['ES', 'Melilla', 'Melilla'],
+            ['ES', 'Murcia', 'Murcia'],
+            ['ES', 'Navarra', 'Navarra'],
+            ['ES', 'Ourense', 'Ourense'],
+            ['ES', 'Palencia', 'Palencia'],
+            ['ES', 'Pontevedra', 'Pontevedra'],
+            ['ES', 'Salamanca', 'Salamanca'],
+            ['ES', 'Santa Cruz de Tenerife', 'Santa Cruz de Tenerife'],
+            ['ES', 'Segovia', 'Segovia'],
+            ['ES', 'Sevilla', 'Sevilla'],
+            ['ES', 'Soria', 'Soria'],
+            ['ES', 'Tarragona', 'Tarragona'],
+            ['ES', 'Teruel', 'Teruel'],
+            ['ES', 'Toledo', 'Toledo'],
+            ['ES', 'Valencia', 'Valencia'],
+            ['ES', 'Valladolid', 'Valladolid'],
+            ['ES', 'Vizcaya', 'Vizcaya'],
+            ['ES', 'Zamora', 'Zamora'],
+            ['ES', 'Zaragoza', 'Zaragoza'],
+            ['FR', 1, 'Ain'],
+            ['FR', 2, 'Aisne'],
+            ['FR', 3, 'Allier'],
+            ['FR', 4, 'Alpes-de-Haute-Provence'],
+            ['FR', 5, 'Hautes-Alpes'],
+            ['FR', 6, 'Alpes-Maritimes'],
+            ['FR', 7, 'Ardèche'],
+            ['FR', 8, 'Ardennes'],
+            ['FR', 9, 'Ariège'],
+            ['FR', 10, 'Aube'],
+            ['FR', 11, 'Aude'],
+            ['FR', 12, 'Aveyron'],
+            ['FR', 13, 'Bouches-du-Rhône'],
+            ['FR', 14, 'Calvados'],
+            ['FR', 15, 'Cantal'],
+            ['FR', 16, 'Charente'],
+            ['FR', 17, 'Charente-Maritime'],
+            ['FR', 18, 'Cher'],
+            ['FR', 19, 'Corrèze'],
+            ['FR', '2A', 'Corse-du-Sud'],
+            ['FR', '2B', 'Haute-Corse'],
+            ['FR', 21, 'Côte-d\'Or'],
+            ['FR', 22, 'Côtes-d\'Armor'],
+            ['FR', 23, 'Creuse'],
+            ['FR', 24, 'Dordogne'],
+            ['FR', 25, 'Doubs'],
+            ['FR', 26, 'Drôme'],
+            ['FR', 27, 'Eure'],
+            ['FR', 28, 'Eure-et-Loir'],
+            ['FR', 29, 'Finistère'],
+            ['FR', 30, 'Gard'],
+            ['FR', 31, 'Haute-Garonne'],
+            ['FR', 32, 'Gers'],
+            ['FR', 33, 'Gironde'],
+            ['FR', 34, 'Hérault'],
+            ['FR', 35, 'Ille-et-Vilaine'],
+            ['FR', 36, 'Indre'],
+            ['FR', 37, 'Indre-et-Loire'],
+            ['FR', 38, 'Isère'],
+            ['FR', 39, 'Jura'],
+            ['FR', 40, 'Landes'],
+            ['FR', 41, 'Loir-et-Cher'],
+            ['FR', 42, 'Loire'],
+            ['FR', 43, 'Haute-Loire'],
+            ['FR', 44, 'Loire-Atlantique'],
+            ['FR', 45, 'Loiret'],
+            ['FR', 46, 'Lot'],
+            ['FR', 47, 'Lot-et-Garonne'],
+            ['FR', 48, 'Lozère'],
+            ['FR', 49, 'Maine-et-Loire'],
+            ['FR', 50, 'Manche'],
+            ['FR', 51, 'Marne'],
+            ['FR', 52, 'Haute-Marne'],
+            ['FR', 53, 'Mayenne'],
+            ['FR', 54, 'Meurthe-et-Moselle'],
+            ['FR', 55, 'Meuse'],
+            ['FR', 56, 'Morbihan'],
+            ['FR', 57, 'Moselle'],
+            ['FR', 58, 'Nièvre'],
+            ['FR', 59, 'Nord'],
+            ['FR', 60, 'Oise'],
+            ['FR', 61, 'Orne'],
+            ['FR', 62, 'Pas-de-Calais'],
+            ['FR', 63, 'Puy-de-Dôme'],
+            ['FR', 64, 'Pyrénées-Atlantiques'],
+            ['FR', 65, 'Hautes-Pyrénées'],
+            ['FR', 66, 'Pyrénées-Orientales'],
+            ['FR', 67, 'Bas-Rhin'],
+            ['FR', 68, 'Haut-Rhin'],
+            ['FR', 69, 'Rhône'],
+            ['FR', 70, 'Haute-Saône'],
+            ['FR', 71, 'Saône-et-Loire'],
+            ['FR', 72, 'Sarthe'],
+            ['FR', 73, 'Savoie'],
+            ['FR', 74, 'Haute-Savoie'],
+            ['FR', 75, 'Paris'],
+            ['FR', 76, 'Seine-Maritime'],
+            ['FR', 77, 'Seine-et-Marne'],
+            ['FR', 78, 'Yvelines'],
+            ['FR', 79, 'Deux-Sèvres'],
+            ['FR', 80, 'Somme'],
+            ['FR', 81, 'Tarn'],
+            ['FR', 82, 'Tarn-et-Garonne'],
+            ['FR', 83, 'Var'],
+            ['FR', 84, 'Vaucluse'],
+            ['FR', 85, 'Vendée'],
+            ['FR', 86, 'Vienne'],
+            ['FR', 87, 'Haute-Vienne'],
+            ['FR', 88, 'Vosges'],
+            ['FR', 89, 'Yonne'],
+            ['FR', 90, 'Territoire-de-Belfort'],
+            ['FR', 91, 'Essonne'],
+            ['FR', 92, 'Hauts-de-Seine'],
+            ['FR', 93, 'Seine-Saint-Denis'],
+            ['FR', 94, 'Val-de-Marne'],
+            ['FR', 95, 'Val-d\'Oise'],
+            ['RO', 'AB', 'Alba'],
+            ['RO', 'AR', 'Arad'],
+            ['RO', 'AG', 'Argeş'],
+            ['RO', 'BC', 'Bacău'],
+            ['RO', 'BH', 'Bihor'],
+            ['RO', 'BN', 'Bistriţa-Năsăud'],
+            ['RO', 'BT', 'Botoşani'],
+            ['RO', 'BV', 'Braşov'],
+            ['RO', 'BR', 'Brăila'],
+            ['RO', 'B', 'Bucureşti'],
+            ['RO', 'BZ', 'Buzău'],
+            ['RO', 'CS', 'Caraş-Severin'],
+            ['RO', 'CL', 'Călăraşi'],
+            ['RO', 'CJ', 'Cluj'],
+            ['RO', 'CT', 'Constanţa'],
+            ['RO', 'CV', 'Covasna'],
+            ['RO', 'DB', 'Dâmboviţa'],
+            ['RO', 'DJ', 'Dolj'],
+            ['RO', 'GL', 'Galaţi'],
+            ['RO', 'GR', 'Giurgiu'],
+            ['RO', 'GJ', 'Gorj'],
+            ['RO', 'HR', 'Harghita'],
+            ['RO', 'HD', 'Hunedoara'],
+            ['RO', 'IL', 'Ialomiţa'],
+            ['RO', 'IS', 'Iaşi'],
+            ['RO', 'IF', 'Ilfov'],
+            ['RO', 'MM', 'Maramureş'],
+            ['RO', 'MH', 'Mehedinţi'],
+            ['RO', 'MS', 'Mureş'],
+            ['RO', 'NT', 'Neamţ'],
+            ['RO', 'OT', 'Olt'],
+            ['RO', 'PH', 'Prahova'],
+            ['RO', 'SM', 'Satu-Mare'],
+            ['RO', 'SJ', 'Sălaj'],
+            ['RO', 'SB', 'Sibiu'],
+            ['RO', 'SV', 'Suceava'],
+            ['RO', 'TR', 'Teleorman'],
+            ['RO', 'TM', 'Timiş'],
+            ['RO', 'TL', 'Tulcea'],
+            ['RO', 'VS', 'Vaslui'],
+            ['RO', 'VL', 'Vâlcea'],
+            ['RO', 'VN', 'Vrancea'],
+            ['FI', 'Lappi', 'Lappi'],
+            ['FI', 'Pohjois-Pohjanmaa', 'Pohjois-Pohjanmaa'],
+            ['FI', 'Kainuu', 'Kainuu'],
+            ['FI', 'Pohjois-Karjala', 'Pohjois-Karjala'],
+            ['FI', 'Pohjois-Savo', 'Pohjois-Savo'],
+            ['FI', 'Etelä-Savo', 'Etelä-Savo'],
+            ['FI', 'Etelä-Pohjanmaa', 'Etelä-Pohjanmaa'],
+            ['FI', 'Pohjanmaa', 'Pohjanmaa'],
+            ['FI', 'Pirkanmaa', 'Pirkanmaa'],
+            ['FI', 'Satakunta', 'Satakunta'],
+            ['FI', 'Keski-Pohjanmaa', 'Keski-Pohjanmaa'],
+            ['FI', 'Keski-Suomi', 'Keski-Suomi'],
+            ['FI', 'Varsinais-Suomi', 'Varsinais-Suomi'],
+            ['FI', 'Etelä-Karjala', 'Etelä-Karjala'],
+            ['FI', 'Päijät-Häme', 'Päijät-Häme'],
+            ['FI', 'Kanta-Häme', 'Kanta-Häme'],
+            ['FI', 'Uusimaa', 'Uusimaa'],
+            ['FI', 'Itä-Uusimaa', 'Itä-Uusimaa'],
+            ['FI', 'Kymenlaakso', 'Kymenlaakso'],
+            ['FI', 'Ahvenanmaa', 'Ahvenanmaa'],
+            ['EE', 'EE-37', 'Harjumaa'],
+            ['EE', 'EE-39', 'Hiiumaa'],
+            ['EE', 'EE-44', 'Ida-Virumaa'],
+            ['EE', 'EE-49', 'Jõgevamaa'],
+            ['EE', 'EE-51', 'Järvamaa'],
+            ['EE', 'EE-57', 'Läänemaa'],
+            ['EE', 'EE-59', 'Lääne-Virumaa'],
+            ['EE', 'EE-65', 'Põlvamaa'],
+            ['EE', 'EE-67', 'Pärnumaa'],
+            ['EE', 'EE-70', 'Raplamaa'],
+            ['EE', 'EE-74', 'Saaremaa'],
+            ['EE', 'EE-78', 'Tartumaa'],
+            ['EE', 'EE-82', 'Valgamaa'],
+            ['EE', 'EE-84', 'Viljandimaa'],
+            ['EE', 'EE-86', 'Võrumaa'],
+            ['LV', 'LV-DGV', 'Daugavpils'],
+            ['LV', 'LV-JEL', 'Jelgava'],
+            ['LV', 'Jēkabpils', 'Jēkabpils'],
+            ['LV', 'LV-JUR', 'Jūrmala'],
+            ['LV', 'LV-LPX', 'Liepāja'],
+            ['LV', 'LV-LE', 'Liepājas novads'],
+            ['LV', 'LV-REZ', 'Rēzekne'],
+            ['LV', 'LV-RIX', 'Rīga'],
+            ['LV', 'LV-RI', 'Rīgas novads'],
+            ['LV', 'Valmiera', 'Valmiera'],
+            ['LV', 'LV-VEN', 'Ventspils'],
+            ['LV', 'Aglonas novads', 'Aglonas novads'],
+            ['LV', 'LV-AI', 'Aizkraukles novads'],
+            ['LV', 'Aizputes novads', 'Aizputes novads'],
+            ['LV', 'Aknīstes novads', 'Aknīstes novads'],
+            ['LV', 'Alojas novads', 'Alojas novads'],
+            ['LV', 'Alsungas novads', 'Alsungas novads'],
+            ['LV', 'LV-AL', 'Alūksnes novads'],
+            ['LV', 'Amatas novads', 'Amatas novads'],
+            ['LV', 'Apes novads', 'Apes novads'],
+            ['LV', 'Auces novads', 'Auces novads'],
+            ['LV', 'Babītes novads', 'Babītes novads'],
+            ['LV', 'Baldones novads', 'Baldones novads'],
+            ['LV', 'Baltinavas novads', 'Baltinavas novads'],
+            ['LV', 'LV-BL', 'Balvu novads'],
+            ['LV', 'LV-BU', 'Bauskas novads'],
+            ['LV', 'Beverīnas novads', 'Beverīnas novads'],
+            ['LV', 'Brocēnu novads', 'Brocēnu novads'],
+            ['LV', 'Burtnieku novads', 'Burtnieku novads'],
+            ['LV', 'Carnikavas novads', 'Carnikavas novads'],
+            ['LV', 'Cesvaines novads', 'Cesvaines novads'],
+            ['LV', 'Ciblas novads', 'Ciblas novads'],
+            ['LV', 'LV-CE', 'Cēsu novads'],
+            ['LV', 'Dagdas novads', 'Dagdas novads'],
+            ['LV', 'LV-DA', 'Daugavpils novads'],
+            ['LV', 'LV-DO', 'Dobeles novads'],
+            ['LV', 'Dundagas novads', 'Dundagas novads'],
+            ['LV', 'Durbes novads', 'Durbes novads'],
+            ['LV', 'Engures novads', 'Engures novads'],
+            ['LV', 'Garkalnes novads', 'Garkalnes novads'],
+            ['LV', 'Grobiņas novads', 'Grobiņas novads'],
+            ['LV', 'LV-GU', 'Gulbenes novads'],
+            ['LV', 'Iecavas novads', 'Iecavas novads'],
+            ['LV', 'Ikšķiles novads', 'Ikšķiles novads'],
+            ['LV', 'Ilūkstes novads', 'Ilūkstes novads'],
+            ['LV', 'Inčukalna novads', 'Inčukalna novads'],
+            ['LV', 'Jaunjelgavas novads', 'Jaunjelgavas novads'],
+            ['LV', 'Jaunpiebalgas novads', 'Jaunpiebalgas novads'],
+            ['LV', 'Jaunpils novads', 'Jaunpils novads'],
+            ['LV', 'LV-JL', 'Jelgavas novads'],
+            ['LV', 'LV-JK', 'Jēkabpils novads'],
+            ['LV', 'Kandavas novads', 'Kandavas novads'],
+            ['LV', 'Kokneses novads', 'Kokneses novads'],
+            ['LV', 'Krimuldas novads', 'Krimuldas novads'],
+            ['LV', 'Krustpils novads', 'Krustpils novads'],
+            ['LV', 'LV-KR', 'Krāslavas novads'],
+            ['LV', 'LV-KU', 'Kuldīgas novads'],
+            ['LV', 'Kārsavas novads', 'Kārsavas novads'],
+            ['LV', 'Lielvārdes novads', 'Lielvārdes novads'],
+            ['LV', 'LV-LM', 'Limbažu novads'],
+            ['LV', 'Lubānas novads', 'Lubānas novads'],
+            ['LV', 'LV-LU', 'Ludzas novads'],
+            ['LV', 'Līgatnes novads', 'Līgatnes novads'],
+            ['LV', 'Līvānu novads', 'Līvānu novads'],
+            ['LV', 'LV-MA', 'Madonas novads'],
+            ['LV', 'Mazsalacas novads', 'Mazsalacas novads'],
+            ['LV', 'Mālpils novads', 'Mālpils novads'],
+            ['LV', 'Mārupes novads', 'Mārupes novads'],
+            ['LV', 'Naukšēnu novads', 'Naukšēnu novads'],
+            ['LV', 'Neretas novads', 'Neretas novads'],
+            ['LV', 'Nīcas novads', 'Nīcas novads'],
+            ['LV', 'LV-OG', 'Ogres novads'],
+            ['LV', 'Olaines novads', 'Olaines novads'],
+            ['LV', 'Ozolnieku novads', 'Ozolnieku novads'],
+            ['LV', 'LV-PR', 'Preiļu novads'],
+            ['LV', 'Priekules novads', 'Priekules novads'],
+            ['LV', 'Priekuļu novads', 'Priekuļu novads'],
+            ['LV', 'Pārgaujas novads', 'Pārgaujas novads'],
+            ['LV', 'Pāvilostas novads', 'Pāvilostas novads'],
+            ['LV', 'Pļaviņu novads', 'Pļaviņu novads'],
+            ['LV', 'Raunas novads', 'Raunas novads'],
+            ['LV', 'Riebiņu novads', 'Riebiņu novads'],
+            ['LV', 'Rojas novads', 'Rojas novads'],
+            ['LV', 'Ropažu novads', 'Ropažu novads'],
+            ['LV', 'Rucavas novads', 'Rucavas novads'],
+            ['LV', 'Rugāju novads', 'Rugāju novads'],
+            ['LV', 'Rundāles novads', 'Rundāles novads'],
+            ['LV', 'LV-RE', 'Rēzeknes novads'],
+            ['LV', 'Rūjienas novads', 'Rūjienas novads'],
+            ['LV', 'Salacgrīvas novads', 'Salacgrīvas novads'],
+            ['LV', 'Salas novads', 'Salas novads'],
+            ['LV', 'Salaspils novads', 'Salaspils novads'],
+            ['LV', 'LV-SA', 'Saldus novads'],
+            ['LV', 'Saulkrastu novads', 'Saulkrastu novads'],
+            ['LV', 'Siguldas novads', 'Siguldas novads'],
+            ['LV', 'Skrundas novads', 'Skrundas novads'],
+            ['LV', 'Skrīveru novads', 'Skrīveru novads'],
+            ['LV', 'Smiltenes novads', 'Smiltenes novads'],
+            ['LV', 'Stopiņu novads', 'Stopiņu novads'],
+            ['LV', 'Strenču novads', 'Strenču novads'],
+            ['LV', 'Sējas novads', 'Sējas novads'],
+            ['LV', 'LV-TA', 'Talsu novads'],
+            ['LV', 'LV-TU', 'Tukuma novads'],
+            ['LV', 'Tērvetes novads', 'Tērvetes novads'],
+            ['LV', 'Vaiņodes novads', 'Vaiņodes novads'],
+            ['LV', 'LV-VK', 'Valkas novads'],
+            ['LV', 'LV-VM', 'Valmieras novads'],
+            ['LV', 'Varakļānu novads', 'Varakļānu novads'],
+            ['LV', 'Vecpiebalgas novads', 'Vecpiebalgas novads'],
+            ['LV', 'Vecumnieku novads', 'Vecumnieku novads'],
+            ['LV', 'LV-VE', 'Ventspils novads'],
+            ['LV', 'Viesītes novads', 'Viesītes novads'],
+            ['LV', 'Viļakas novads', 'Viļakas novads'],
+            ['LV', 'Viļānu novads', 'Viļānu novads'],
+            ['LV', 'Vārkavas novads', 'Vārkavas novads'],
+            ['LV', 'Zilupes novads', 'Zilupes novads'],
+            ['LV', 'Ādažu novads', 'Ādažu novads'],
+            ['LV', 'Ērgļu novads', 'Ērgļu novads'],
+            ['LV', 'Ķeguma novads', 'Ķeguma novads'],
+            ['LV', 'Ķekavas novads', 'Ķekavas novads'],
+            ['LT', 'LT-AL', 'Alytaus Apskritis'],
+            ['LT', 'LT-KU', 'Kauno Apskritis'],
+            ['LT', 'LT-KL', 'Klaipėdos Apskritis'],
+            ['LT', 'LT-MR', 'Marijampolės Apskritis'],
+            ['LT', 'LT-PN', 'Panevėžio Apskritis'],
+            ['LT', 'LT-SA', 'Šiaulių Apskritis'],
+            ['LT', 'LT-TA', 'Tauragės Apskritis'],
+            ['LT', 'LT-TE', 'Telšių Apskritis'],
+            ['LT', 'LT-UT', 'Utenos Apskritis'],
+            ['LT', 'LT-VL', 'Vilniaus Apskritis'],
+            ['BR', 'AC', 'Acre'],
+            ['BR', 'AL', 'Alagoas'],
+            ['BR', 'AP', 'Amapá'],
+            ['BR', 'AM', 'Amazonas'],
+            ['BR', 'BA', 'Bahia'],
+            ['BR', 'CE', 'Ceará'],
+            ['BR', 'ES', 'Espírito Santo'],
+            ['BR', 'GO', 'Goiás'],
+            ['BR', 'MA', 'Maranhão'],
+            ['BR', 'MT', 'Mato Grosso'],
+            ['BR', 'MS', 'Mato Grosso do Sul'],
+            ['BR', 'MG', 'Minas Gerais'],
+            ['BR', 'PA', 'Pará'],
+            ['BR', 'PB', 'Paraíba'],
+            ['BR', 'PR', 'Paraná'],
+            ['BR', 'PE', 'Pernambuco'],
+            ['BR', 'PI', 'Piauí'],
+            ['BR', 'RJ', 'Rio de Janeiro'],
+            ['BR', 'RN', 'Rio Grande do Norte'],
+            ['BR', 'RS', 'Rio Grande do Sul'],
+            ['BR', 'RO', 'Rondônia'],
+            ['BR', 'RR', 'Roraima'],
+            ['BR', 'SC', 'Santa Catarina'],
+            ['BR', 'SP', 'São Paulo'],
+            ['BR', 'SE', 'Sergipe'],
+            ['BR', 'TO', 'Tocantins'],
+            ['BR', 'DF', 'Distrito Federal'],
+        ];
+        foreach ($data as $row) {
+            $bind = ['country_id' => $row[0], 'code' => $row[1], 'default_name' => $row[2]];
+            $this->moduleDataSetup->getConnection()->insert(
+                $this->moduleDataSetup->getTable('directory_country_region'),
+                $bind
+            );
+            $regionId = $this->moduleDataSetup->getConnection()->lastInsertId(
+                $this->moduleDataSetup->getTable('directory_country_region')
+            );
+            $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
+            $this->moduleDataSetup->getConnection()->insert(
+                $this->moduleDataSetup->getTable('directory_country_region_name'),
+                $bind
+            );
+        }
+        /**
+         * Fill table directory/currency_rate
+         */
+        $data = [
+            ['EUR', 'EUR', 1],
+            ['EUR', 'USD', 1.415000000000],
+            ['USD', 'EUR', 0.706700000000],
+            ['USD', 'USD', 1],
+        ];
+        $columns = ['currency_from', 'currency_to', 'rate'];
+        $this->moduleDataSetup->getConnection()->insertArray(
+            $this->moduleDataSetup->getTable('directory_currency_rate'),
+            $columns,
+            $data
+        );
+        $this->moduleDataSetup->getConnection()->insert(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            [
+                'scope' => 'default',
+                'scope_id' => 0,
+                'path' => Data::XML_PATH_DISPLAY_ALL_STATES,
+                'value' => 1
+            ]
+        );
+        /** @var \Magento\Directory\Helper\Data $helper */
+        $helper = $this->directoryDataFactory->create();
+        $countries = $helper->getCountryCollection()->getCountriesWithRequiredStates();
+        $this->moduleDataSetup->getConnection()->insert(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            [
+                'scope' => 'default',
+                'scope_id' => 0,
+                'path' => Data::XML_PATH_STATES_REQUIRED,
+                'value' => implode(',', array_keys($countries))
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php
deleted file mode 100644
index 4ee9ea33673d7..0000000000000
--- a/app/code/Magento/Directory/Setup/UpgradeData.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Directory\Helper\Data;
-
-/**
- * Upgrade Data script for Directory module.
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * Directory data.
-     *
-     * @var Data
-     */
-    private $directoryData;
-
-    /**
-     * @param Data $directoryData
-     */
-    public function __construct(Data $directoryData)
-    {
-        $this->directoryData = $directoryData;
-    }
-
-    /**
-     * Upgrades data for Directry module.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->addCountryRegions($setup, $this->getDataForCroatia());
-        }
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $this->addCountryRegions($setup, $this->getDataForIndia());
-        }
-    }
-
-    /**
-     * Croatian states data.
-     *
-     * @return array
-     */
-    private function getDataForCroatia()
-    {
-        return [
-            ['HR', 'HR-01', 'Zagrebačka županija'],
-            ['HR', 'HR-02', 'Krapinsko-zagorska županija'],
-            ['HR', 'HR-03', 'Sisačko-moslavačka županija'],
-            ['HR', 'HR-04', 'Karlovačka županija'],
-            ['HR', 'HR-05', 'Varaždinska županija'],
-            ['HR', 'HR-06', 'Koprivničko-križevačka županija'],
-            ['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
-            ['HR', 'HR-08', 'Primorsko-goranska županija'],
-            ['HR', 'HR-09', 'Ličko-senjska županija'],
-            ['HR', 'HR-10', 'Virovitičko-podravska županija'],
-            ['HR', 'HR-11', 'Požeško-slavonska županija'],
-            ['HR', 'HR-12', 'Brodsko-posavska županija'],
-            ['HR', 'HR-13', 'Zadarska županija'],
-            ['HR', 'HR-14', 'Osječko-baranjska županija'],
-            ['HR', 'HR-15', 'Šibensko-kninska županija'],
-            ['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
-            ['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
-            ['HR', 'HR-18', 'Istarska županija'],
-            ['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
-            ['HR', 'HR-20', 'Međimurska županija'],
-            ['HR', 'HR-21', 'Grad Zagreb']
-        ];
-    }
-
-    /**
-     * Indian states data.
-     *
-     * @return array
-     */
-    private function getDataForIndia()
-    {
-        return [
-            ['IN', 'AN', 'Andaman and Nicobar Islands'],
-            ['IN', 'AP', 'Andhra Pradesh'],
-            ['IN', 'AR', 'Arunachal Pradesh'],
-            ['IN', 'AS', 'Assam'],
-            ['IN', 'BR', 'Bihar'],
-            ['IN', 'CH', 'Chandigarh'],
-            ['IN', 'CT', 'Chhattisgarh'],
-            ['IN', 'DN', 'Dadra and Nagar Haveli'],
-            ['IN', 'DD', 'Daman and Diu'],
-            ['IN', 'DL', 'Delhi'],
-            ['IN', 'GA', 'Goa'],
-            ['IN', 'GJ', 'Gujarat'],
-            ['IN', 'HR', 'Haryana'],
-            ['IN', 'HP', 'Himachal Pradesh'],
-            ['IN', 'JK', 'Jammu and Kashmir'],
-            ['IN', 'JH', 'Jharkhand'],
-            ['IN', 'KA', 'Karnataka'],
-            ['IN', 'KL', 'Kerala'],
-            ['IN', 'LD', 'Lakshadweep'],
-            ['IN', 'MP', 'Madhya Pradesh'],
-            ['IN', 'MH', 'Maharashtra'],
-            ['IN', 'MN', 'Manipur'],
-            ['IN', 'ML', 'Meghalaya'],
-            ['IN', 'MZ', 'Mizoram'],
-            ['IN', 'NL', 'Nagaland'],
-            ['IN', 'OR', 'Odisha'],
-            ['IN', 'PY', 'Puducherry'],
-            ['IN', 'PB', 'Punjab'],
-            ['IN', 'RJ', 'Rajasthan'],
-            ['IN', 'SK', 'Sikkim'],
-            ['IN', 'TN', 'Tamil Nadu'],
-            ['IN', 'TG', 'Telangana'],
-            ['IN', 'TR', 'Tripura'],
-            ['IN', 'UP', 'Uttar Pradesh'],
-            ['IN', 'UT', 'Uttarakhand'],
-            ['IN', 'WB', 'West Bengal']
-        ];
-    }
-
-    /**
-     * Add country regions data to appropriate tables.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param array $data
-     * @return void
-     */
-    private function addCountryRegions(ModuleDataSetupInterface $setup, array $data)
-    {
-        /**
-         * Fill table directory/country_region
-         * Fill table directory/country_region_name for en_US locale
-         */
-        foreach ($data as $row) {
-            $bind = ['country_id' => $row[0], 'code' => $row[1], 'default_name' => $row[2]];
-            $setup->getConnection()->insert($setup->getTable('directory_country_region'), $bind);
-            $regionId = $setup->getConnection()->lastInsertId($setup->getTable('directory_country_region'));
-            $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
-            $setup->getConnection()->insert($setup->getTable('directory_country_region_name'), $bind);
-        }
-        /**
-         * Upgrade core_config_data general/region/state_required field.
-         */
-        $countries = $this->directoryData->getCountryCollection()->getCountriesWithRequiredStates();
-        $setup->getConnection()->update(
-            $setup->getTable('core_config_data'),
-            [
-                'value' => implode(',', array_keys($countries))
-            ],
-            [
-                'scope="default"',
-                'scope_id=0',
-                'path=?' => Data::XML_PATH_STATES_REQUIRED
-            ]
-        );
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE.txt b/app/code/Magento/Directory/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE.txt
rename to app/code/Magento/Directory/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE_AFL.txt b/app/code/Magento/Directory/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE_AFL.txt
rename to app/code/Magento/Directory/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Directory/Test/Mftf/README.md b/app/code/Magento/Directory/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ecbb2bd265402
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Directory Functional Tests
+
+The Functional Test Module for **Magento Directory** module.
diff --git a/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php b/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
index 73e9f0f5fa1a5..6ff0f8ea0f30b 100644
--- a/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Helper/DataTest.php
@@ -46,6 +46,7 @@ protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
         $context = $this->createMock(\Magento\Framework\App\Helper\Context::class);
         $context->expects($this->any())
             ->method('getScopeConfig')
diff --git a/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php b/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php
index 5931e5a839341..c0d549ee11d6d 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php
@@ -8,7 +8,6 @@
 
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -30,6 +29,9 @@ class AllowedCountriesTest extends \PHPUnit\Framework\TestCase
      */
     private $allowedCountriesReader;
 
+    /**
+     * Test setUp
+     */
     public function setUp()
     {
         $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
@@ -41,6 +43,9 @@ public function setUp()
         );
     }
 
+    /**
+     * Test for getAllowedCountries
+     */
     public function testGetAllowedCountriesWithEmptyFilter()
     {
         $website1 = $this->createMock(WebsiteInterface::class);
@@ -58,6 +63,9 @@ public function testGetAllowedCountriesWithEmptyFilter()
         $this->assertEquals(['AM' => 'AM'], $this->allowedCountriesReader->getAllowedCountries());
     }
 
+    /**
+     * Test for getAllowedCountries
+     */
     public function testGetAllowedCountries()
     {
         $this->scopeConfigMock->expects($this->once())
@@ -70,4 +78,23 @@ public function testGetAllowedCountries()
             $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, true)
         );
     }
+
+    /**
+     * Test for getAllowedCountries
+     */
+    public function testGetAllowedCountriesDefaultScope()
+    {
+        $this->storeManagerMock->expects($this->never())
+            ->method('getStore');
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(AllowedCountries::ALLOWED_COUNTRIES_PATH, ScopeInterface::SCOPE_STORE, 0)
+            ->willReturn('AM');
+
+        $this->assertEquals(
+            ['AM' => 'AM'],
+            $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, 0)
+        );
+    }
 }
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php b/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php
index 3f963cb2b82af..a3037d6481925 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php
@@ -143,8 +143,8 @@ public function testGetCountryInfo()
     /**
      * test GetGetCountryInfoNotFound
      *
-     * @expectedException        \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested country is not available.
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage The country isn't available.
      */
     public function testGetCountryInfoNotFound()
     {
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php
index 54ec26386f3bd..7ec34f609a29f 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php
@@ -29,10 +29,14 @@ protected function setUp()
      */
     public function testConstructorException(array $configData, $expectedException)
     {
-        $this->expectException('InvalidArgumentException', $expectedException);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedException);
         new \Magento\Directory\Model\Currency\Import\Config($configData);
     }
 
+    /**
+     * @return array
+     */
     public function constructorExceptionDataProvider()
     {
         return [
@@ -78,6 +82,9 @@ public function testGetServiceClass($serviceName, $expectedResult)
         $this->assertEquals($expectedResult, $this->_model->getServiceClass($serviceName));
     }
 
+    /**
+     * @return array
+     */
     public function getServiceClassDataProvider()
     {
         return ['known' => ['service_one', 'Service_One'], 'unknown' => ['unknown', null]];
@@ -93,6 +100,9 @@ public function testGetServiceLabel($serviceName, $expectedResult)
         $this->assertEquals($expectedResult, $this->_model->getServiceLabel($serviceName));
     }
 
+    /**
+     * @return array
+     */
     public function getServiceLabelDataProvider()
     {
         return ['known' => ['service_one', 'Service One'], 'unknown' => ['unknown', null]];
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
index c1c3f2fbacb03..7efcf0d62712a 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
@@ -3,89 +3,123 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Directory\Test\Unit\Model\Currency\Import;
 
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\Currency\Import\FixerIo;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * FixerIo Test
+ */
 class FixerIoTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Directory\Model\Currency\Import\FixerIo
+     * @var FixerIo
      */
     private $model;
 
     /**
-     * @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CurrencyFactory|MockObject
      */
-    private $currencyFactoryMock;
+    private $currencyFactory;
 
     /**
-     * @var \Magento\Framework\HTTP\ZendClientFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ZendClientFactory|MockObject
      */
-    private $httpClientFactoryMock;
+    private $httpClientFactory;
 
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->currencyFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
+        $this->currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
+        $this->httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $scopeMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
 
-        $this->model = $objectManagerHelper->getObject(
-            \Magento\Directory\Model\Currency\Import\FixerIo::class,
-            [
-                'currencyFactory' => $this->currencyFactoryMock,
-                'scopeConfig' => $scopeMock,
-                'httpClientFactory' => $this->httpClientFactoryMock
-            ]
-        );
+        $this->model = new FixerIo($this->currencyFactory, $this->scopeConfig, $this->httpClientFactory);
     }
 
-    public function testFetchRates()
+    /**
+     * Test Fetch Rates
+     *
+     * @return void
+     */
+    public function testFetchRates(): void
     {
         $currencyFromList = ['USD'];
         $currencyToList = ['EUR', 'UAH'];
-        $responseBody = '{"base":"USD","date":"2015-10-07","rates":{"EUR":0.9022}}';
+        $responseBody = '{"success":"true","base":"USD","date":"2015-10-07","rates":{"EUR":0.9022}}';
         $expectedCurrencyRateList = ['USD' => ['EUR' => 0.9022, 'UAH' => null]];
-        $message = "We can't retrieve a rate from http://api.fixer.io/latest?base=USD&symbols=EUR,UAH for UAH.";
+        $message = "We can't retrieve a rate from "
+            . "http://data.fixer.io/api/latest?access_key=api_key&base=USD&symbols=EUR,UAH for UAH.";
+
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['currency/fixerio/api_key', 'store'],
+                ['currency/fixerio/timeout', 'store']
+            )
+            ->willReturnOnConsecutiveCalls('api_key', 100);
 
-        /** @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+        /** @var Currency|MockObject $currency */
+        $currency = $this->getMockBuilder(Currency::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
             ->getMock();
-        /** @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
+        /** @var ZendClient|MockObject $httpClient */
+        $httpClient = $this->getMockBuilder(ZendClient::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
             ->getMock();
-        /** @var \Zend_Http_Response|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpResponseMock = $this->getMockBuilder(\Zend_Http_Response::class)
+        /** @var DataObject|MockObject $currencyMock */
+        $httpResponse = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->setMethods(['getBody'])
             ->getMock();
-        $this->currencyFactoryMock->expects($this->any())->method('create')->willReturn($currencyMock);
-        $currencyMock->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
-        $currencyMock->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
-        $this->httpClientFactoryMock->expects($this->any())->method('create')->willReturn($httpClientMock);
-        $httpClientMock->expects($this->atLeastOnce())->method('setUri')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('setConfig')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('request')->willReturn($httpResponseMock);
-        $httpResponseMock->expects($this->any())->method('getBody')->willReturn($responseBody);
 
-        $this->assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+        $this->currencyFactory->method('create')
+            ->willReturn($currency);
+        $currency->method('getConfigBaseCurrencies')
+            ->willReturn($currencyFromList);
+        $currency->method('getConfigAllowCurrencies')
+            ->willReturn($currencyToList);
+
+        $this->httpClientFactory->method('create')
+            ->willReturn($httpClient);
+        $httpClient->method('setUri')
+            ->willReturnSelf();
+        $httpClient->method('setConfig')
+            ->willReturnSelf();
+        $httpClient->method('request')
+            ->willReturn($httpResponse);
+        $httpResponse->method('getBody')
+            ->willReturn($responseBody);
+
+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+
         $messages = $this->model->getMessages();
-        $this->assertNotEmpty($messages);
-        $this->assertTrue(is_array($messages));
-        $this->assertEquals($message, (string)$messages[0]);
+        self::assertNotEmpty($messages);
+        self::assertTrue(is_array($messages));
+        self::assertEquals($message, (string)$messages[0]);
     }
 }
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php
deleted file mode 100644
index b7b9015ffdfe6..0000000000000
--- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Test\Unit\Model\Currency\Import;
-
-class YahooFinanceTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Directory\Model\Currency\Import\YahooFinance
-     */
-    private $model;
-
-    /**
-     * @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $currencyFactoryMock;
-
-    /**
-     * @var \Magento\Framework\HTTP\ZendClientFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $httpClientFactoryMock;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->currencyFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $scopeMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
-        $this->model = $objectManagerHelper->getObject(
-            \Magento\Directory\Model\Currency\Import\YahooFinance::class,
-            [
-                'currencyFactory' => $this->currencyFactoryMock,
-                'scopeConfig' => $scopeMock,
-                'httpClientFactory' => $this->httpClientFactoryMock
-            ]
-        );
-    }
-
-    public function testFetchRates()
-    {
-        $currencyFromList = ['USD'];
-        $currencyToList = ['EUR', 'UAH'];
-        $responseBody = '{"query":{"count":7,"created":"2016-04-05T16:46:55Z","lang":"en-US","results":{"rate":'
-            . '[{"id":"USDEUR","Name":"USD/EUR","Rate":"0.9022","Date":"4/5/2016"}]}}}';
-        $expectedCurrencyRateList = ['USD' => ['EUR' => 0.9022, 'UAH' => null]];
-        $message = "We can't retrieve a rate from http://query.yahooapis.com/v1/public/yql?format=json"
-            . "&q=select+*+from+yahoo.finance.xchange+where+pair+in+%28%22USDEUR%22%2C%22USDUAH%22)"
-            . "&env=store://datatables.org/alltableswithkeys for UAH.";
-
-        /** @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        /** @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        /** @var \Zend_Http_Response|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpResponseMock = $this->getMockBuilder('Zend_Http_Response')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->currencyFactoryMock->expects($this->any())->method('create')->willReturn($currencyMock);
-        $currencyMock->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
-        $currencyMock->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
-        $this->httpClientFactoryMock->expects($this->any())->method('create')->willReturn($httpClientMock);
-        $httpClientMock->expects($this->atLeastOnce())->method('setUri')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('setConfig')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('request')->willReturn($httpResponseMock);
-        $httpResponseMock->expects($this->any())->method('getBody')->willReturn($responseBody);
-
-        $this->assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
-        $messages = $this->model->getMessages();
-        $this->assertNotEmpty($messages);
-        $this->assertTrue(is_array($messages));
-        $this->assertEquals($message, (string)$messages[0]);
-    }
-}
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php b/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
new file mode 100644
index 0000000000000..9b52bae26f90f
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Test\Unit\Model;
+
+use Magento\Config\App\Config\Type\System;
+use Magento\Directory\Model\CurrencyConfig;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for CurrencyConfig model.
+ */
+class CurrencyConfigTest extends TestCase
+{
+    /**
+     * @var CurrencyConfig
+     */
+    private $testSubject;
+
+    /**
+     * @var System|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appState;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->setMethods(['getStores', 'getWebsites'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->appState = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager = new ObjectManager($this);
+        $this->testSubject = $objectManager->getObject(
+            CurrencyConfig::class,
+            [
+                'storeManager' => $this->storeManager,
+                'appState' => $this->appState,
+                'config' => $this->config,
+            ]
+        );
+    }
+
+    /**
+     * Test get currency config for admin and storefront areas.
+     *
+     * @dataProvider getConfigCurrenciesDataProvider
+     * @return void
+     */
+    public function testGetConfigCurrencies(string $areCode)
+    {
+        $path = 'test/path';
+        $expected = ['ARS', 'AUD', 'BZD'];
+
+        $this->appState->expects(self::once())
+            ->method('getAreaCode')
+            ->willReturn($areCode);
+
+        /** @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject $store */
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getCode'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $store->expects(self::once())
+            ->method('getCode')
+            ->willReturn('testCode');
+
+        if ($areCode === Area::AREA_ADMINHTML) {
+            $this->storeManager->expects(self::once())
+                ->method('getStores')
+                ->willReturn([$store]);
+        } else {
+            $this->storeManager->expects(self::once())
+                ->method('getStore')
+                ->willReturn($store);
+        }
+
+        $this->config->expects(self::once())
+            ->method('getValue')
+            ->with(
+                self::identicalTo($path)
+            )->willReturn('ARS,AUD,BZD');
+
+        $result = $this->testSubject->getConfigCurrencies($path);
+
+        self::assertEquals($expected, $result);
+    }
+
+    /**
+     * Provide test data for getConfigCurrencies test.
+     *
+     * @return array
+     */
+    public function getConfigCurrenciesDataProvider()
+    {
+        return [
+            ['areaCode' => Area::AREA_ADMINHTML],
+            ['areaCode' => Area::AREA_FRONTEND],
+        ];
+    }
+}
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
deleted file mode 100644
index 5fb7271a411ed..0000000000000
--- a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Test\Unit\Model;
-
-use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Directory\Model\Observer;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ObserverTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
-    protected $objectManager;
-
-    /** @var Observer */
-    protected $observer;
-
-    /** @var  \Magento\Directory\Model\Currency\Import\Factory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $importFactory;
-
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $scopeConfig;
-
-    /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
-    protected $transportBuilder;
-
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManager;
-
-    /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $currencyFactory;
-
-    /** @var \Magento\Framework\Translate\Inline\StateInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $inlineTranslation;
-
-    protected function setUp()
-    {
-        $this->objectManager = new ObjectManager($this);
-
-        $this->importFactory = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Factory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\MutableScopeConfig::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getValue'])
-            ->getMock();
-        $this->transportBuilder = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManager::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->inlineTranslation = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->observer = $this->objectManager->getObject(
-            \Magento\Directory\Model\Observer::class,
-            [
-                'importFactory' => $this->importFactory,
-                'scopeConfig' => $this->scopeConfig,
-                'transportBuilder' => $this->transportBuilder,
-                'storeManager' => $this->storeManager,
-                'currencyFactory' => $this->currencyFactory,
-                'inlineTranslation' => $this->inlineTranslation
-            ]
-        );
-    }
-
-    public function testScheduledUpdateCurrencyRates()
-    {
-        $this->scopeConfig
-            ->expects($this->at(0))
-            ->method('getValue')
-            ->with(Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE)
-            ->will($this->returnValue(1));
-        $this->scopeConfig
-            ->expects($this->at(1))
-            ->method('getValue')
-            ->with(Observer::CRON_STRING_PATH, ScopeInterface::SCOPE_STORE)
-            ->will($this->returnValue('cron-path'));
-        $this->scopeConfig
-            ->expects($this->at(2))
-            ->method('getValue')
-            ->with(Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE)
-            ->will($this->returnValue('import-service'));
-        $importInterfaceMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Webservicex::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['fetchRates', 'getMessages'])
-            ->getMock();
-        $importInterfaceMock->expects($this->once())
-            ->method('fetchRates')
-            ->will($this->returnValue([]));
-        $importInterfaceMock->expects($this->once())
-            ->method('getMessages')
-            ->will($this->returnValue([]));
-
-        $this->importFactory
-            ->expects($this->once())
-            ->method('create')
-            ->with('import-service')
-            ->will($this->returnValue($importInterfaceMock));
-
-        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['saveRates', '__wakeup', '__sleep'])
-            ->getMock();
-        $currencyMock->expects($this->once())
-            ->method('saveRates')
-            ->will($this->returnValue(null));
-        $this->currencyFactory
-            ->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($currencyMock));
-
-        $this->observer->scheduledUpdateCurrencyRates(null);
-    }
-
-    /**
-     * @expectedException \Exception
-     */
-    public function testScheduledUpdateCurrencyRatesThrowsException()
-    {
-        $this->scopeConfig->expects($this->exactly(3))
-            ->method('getValue')
-            ->willReturnMap(
-                [
-                    [Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE, null, 1],
-                    [Observer::CRON_STRING_PATH, ScopeInterface::SCOPE_STORE, null, 'cron-path'],
-                    [Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE, null, 'import-service']
-                ]
-            );
-
-        $this->importFactory
-            ->expects($this->once())
-            ->method('create')
-            ->with('import-service')
-            ->willThrowException(new \Exception());
-
-        $this->observer->scheduledUpdateCurrencyRates(null);
-    }
-}
diff --git a/app/code/Magento/Directory/Test/Unit/Model/PriceCurrencyTest.php b/app/code/Magento/Directory/Test/Unit/Model/PriceCurrencyTest.php
index 915c11fe1b787..c80bc4ce62070 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/PriceCurrencyTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/PriceCurrencyTest.php
@@ -183,6 +183,9 @@ public function testGetCurrencySymbol()
         $this->assertEquals($currencySymbol, $this->priceCurrency->getCurrencySymbol($storeId, $currencyMock));
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getCurrentCurrencyMock()
     {
         $currency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
@@ -192,6 +195,10 @@ protected function getCurrentCurrencyMock()
         return $currency;
     }
 
+    /**
+     * @param $baseCurrency
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getStoreMock($baseCurrency)
     {
         $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
@@ -205,6 +212,12 @@ protected function getStoreMock($baseCurrency)
         return $store;
     }
 
+    /**
+     * @param $amount
+     * @param $convertedAmount
+     * @param $currency
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getBaseCurrencyMock($amount, $convertedAmount, $currency)
     {
         $baseCurrency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
index 1a7dc4dd62425..8eb4ad78fbe5c 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Directory\Test\Unit\Model\ResourceModel\Country;
 
+use Magento\Store\Api\Data\WebsiteInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -21,6 +23,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     protected $scopeConfigMock;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManagerMock;
+
     protected function setUp()
     {
         $connection = $this->createMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class);
@@ -51,6 +58,7 @@ protected function setUp()
         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
         $countryFactory = $this->createMock(\Magento\Directory\Model\ResourceModel\CountryFactory::class);
         $helperDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
+        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $arguments = [
             'logger' => $logger,
@@ -61,7 +69,8 @@ protected function setUp()
             'scopeConfig' => $this->scopeConfigMock,
             'countryFactory' => $countryFactory,
             'resource' => $resource,
-            'helperData' => $helperDataMock
+            'helperData' => $helperDataMock,
+            'storeManager' => $this->storeManagerMock
         ];
         $this->_model = $objectManager
             ->getObject(\Magento\Directory\Model\ResourceModel\Country\Collection::class, $arguments);
@@ -76,6 +85,14 @@ protected function setUp()
      */
     public function testToOptionArray($optionsArray, $emptyLabel, $foregroundCountries, $expectedResults)
     {
+        $website1 = $this->createMock(WebsiteInterface::class);
+        $website1->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(1);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsites')
+            ->willReturn([$website1]);
+
         foreach ($optionsArray as $itemData) {
             $this->_model->addItem(new \Magento\Framework\DataObject($itemData));
         }
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index 5cdeeea0624ac..c1de1b7bac869 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
index 21eccd5bd521e..ec5fa35b6a152 100644
--- a/app/code/Magento/Directory/etc/adminhtml/system.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -34,21 +34,20 @@
                     <can_be_empty>1</can_be_empty>
                 </field>
             </group>
-            <group id="yahoofinance" translate="label" sortOrder="33" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Yahoo Finance Exchange</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Connection Timeout in Seconds</label>
-                </field>
-            </group>
             <group id="fixerio" translate="label" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Fixer.io</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="api_key" translate="label" type="obscure" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>API Key</label>
+                    <config_path>currency/fixerio/api_key</config_path>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                </field>
+                <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
                 </field>
             </group>
-            <group id="webservicex" translate="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Webservicex</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+            <group id="currencyconverterapi" translate="label" sortOrder="45" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>Currency Converter API</label>
+                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
                 </field>
             </group>
@@ -109,6 +108,7 @@
                 <field id="state_required" translate="label" type="multiselect" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>State is Required for</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <can_be_empty>1</can_be_empty>
                 </field>
                 <field id="display_all" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Allow to Choose State if It is Optional for Country</label>
diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
index fa4e9d64d10d8..276d7088cc2ea 100644
--- a/app/code/Magento/Directory/etc/config.xml
+++ b/app/code/Magento/Directory/etc/config.xml
@@ -18,15 +18,13 @@
                 <base>USD</base>
                 <default>USD</default>
             </options>
-            <yahoofinance>
-                <timeout>100</timeout>
-            </yahoofinance>
             <fixerio>
                 <timeout>100</timeout>
+                <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
             </fixerio>
-            <webservicex>
+            <currencyconverterapi>
                 <timeout>100</timeout>
-            </webservicex>
+            </currencyconverterapi>
             <import>
                 <enabled>0</enabled>
                 <error_email />
diff --git a/app/code/Magento/Directory/etc/db_schema.xml b/app/code/Magento/Directory/etc/db_schema.xml
new file mode 100644
index 0000000000000..c11e0ee525e37
--- /dev/null
+++ b/app/code/Magento/Directory/etc/db_schema.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="directory_country" resource="default" engine="innodb" comment="Directory Country">
+        <column xsi:type="varchar" name="country_id" nullable="false" length="2" comment="Country Id in ISO-2"/>
+        <column xsi:type="varchar" name="iso2_code" nullable="true" length="2" comment="Country ISO-2 format"/>
+        <column xsi:type="varchar" name="iso3_code" nullable="true" length="3" comment="Country ISO-3"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="country_id"/>
+        </constraint>
+    </table>
+    <table name="directory_country_format" resource="default" engine="innodb" comment="Directory Country Format">
+        <column xsi:type="int" name="country_format_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Country Format Id"/>
+        <column xsi:type="varchar" name="country_id" nullable="true" length="2" comment="Country Id in ISO-2"/>
+        <column xsi:type="varchar" name="type" nullable="true" length="30" comment="Country Format Type"/>
+        <column xsi:type="text" name="format" nullable="false" comment="Country Format"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="country_format_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="DIRECTORY_COUNTRY_FORMAT_COUNTRY_ID_TYPE">
+            <column name="country_id"/>
+            <column name="type"/>
+        </constraint>
+    </table>
+    <table name="directory_country_region" resource="default" engine="innodb" comment="Directory Country Region">
+        <column xsi:type="int" name="region_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Region Id"/>
+        <column xsi:type="varchar" name="country_id" nullable="false" length="4" default="0"
+                comment="Country Id in ISO-2"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Region code"/>
+        <column xsi:type="varchar" name="default_name" nullable="true" length="255" comment="Region Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="region_id"/>
+        </constraint>
+        <index referenceId="DIRECTORY_COUNTRY_REGION_COUNTRY_ID" indexType="btree">
+            <column name="country_id"/>
+        </index>
+    </table>
+    <table name="directory_country_region_name" resource="default" engine="innodb"
+           comment="Directory Country Region Name">
+        <column xsi:type="varchar" name="locale" nullable="false" length="8" comment="Locale"/>
+        <column xsi:type="int" name="region_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Region Id"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Region Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="locale"/>
+            <column name="region_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DIR_COUNTRY_REGION_NAME_REGION_ID_DIR_COUNTRY_REGION_REGION_ID"
+                    table="directory_country_region_name" column="region_id" referenceTable="directory_country_region"
+                    referenceColumn="region_id" onDelete="CASCADE"/>
+        <index referenceId="DIRECTORY_COUNTRY_REGION_NAME_REGION_ID" indexType="btree">
+            <column name="region_id"/>
+        </index>
+    </table>
+    <table name="directory_currency_rate" resource="default" engine="innodb" comment="Directory Currency Rate">
+        <column xsi:type="varchar" name="currency_from" nullable="false" length="3"
+                comment="Currency Code Convert From"/>
+        <column xsi:type="varchar" name="currency_to" nullable="false" length="3" comment="Currency Code Convert To"/>
+        <column xsi:type="decimal" name="rate" scale="12" precision="24" unsigned="false" nullable="false" default="0"
+                comment="Currency Conversion Rate"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="currency_from"/>
+            <column name="currency_to"/>
+        </constraint>
+        <index referenceId="DIRECTORY_CURRENCY_RATE_CURRENCY_TO" indexType="btree">
+            <column name="currency_to"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Directory/etc/db_schema_whitelist.json b/app/code/Magento/Directory/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..ab2facb17428a
--- /dev/null
+++ b/app/code/Magento/Directory/etc/db_schema_whitelist.json
@@ -0,0 +1,65 @@
+{
+    "directory_country": {
+        "column": {
+            "country_id": true,
+            "iso2_code": true,
+            "iso3_code": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "directory_country_format": {
+        "column": {
+            "country_format_id": true,
+            "country_id": true,
+            "type": true,
+            "format": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DIRECTORY_COUNTRY_FORMAT_COUNTRY_ID_TYPE": true
+        }
+    },
+    "directory_country_region": {
+        "column": {
+            "region_id": true,
+            "country_id": true,
+            "code": true,
+            "default_name": true
+        },
+        "index": {
+            "DIRECTORY_COUNTRY_REGION_COUNTRY_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "directory_country_region_name": {
+        "column": {
+            "locale": true,
+            "region_id": true,
+            "name": true
+        },
+        "index": {
+            "DIRECTORY_COUNTRY_REGION_NAME_REGION_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DIR_COUNTRY_REGION_NAME_REGION_ID_DIR_COUNTRY_REGION_REGION_ID": true
+        }
+    },
+    "directory_currency_rate": {
+        "column": {
+            "currency_from": true,
+            "currency_to": true,
+            "rate": true
+        },
+        "index": {
+            "DIRECTORY_CURRENCY_RATE_CURRENCY_TO": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Directory/etc/di.xml b/app/code/Magento/Directory/etc/di.xml
index 02e16af29ea14..50cd65cc5045c 100644
--- a/app/code/Magento/Directory/etc/di.xml
+++ b/app/code/Magento/Directory/etc/di.xml
@@ -10,18 +10,14 @@
     <type name="Magento\Directory\Model\Currency\Import\Config">
         <arguments>
             <argument name="servicesConfig" xsi:type="array">
-                <item name="yahoofinance" xsi:type="array">
-                    <item name="label" xsi:type="string" translatable="true">Yahoo Finance Exchange</item>
-                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\YahooFinance</item>
-                </item>
-                <item name="webservicex" xsi:type="array">
-                    <item name="label" xsi:type="string" translatable="true">Webservicex</item>
-                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\Webservicex</item>
-                </item>
                 <item name="fixerio" xsi:type="array">
                     <item name="label" xsi:type="string" translatable="true">Fixer.io</item>
                     <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\FixerIo</item>
                 </item>
+                <item name="currencyconverterapi" xsi:type="array">
+                    <item name="label" xsi:type="string" translatable="true">Currency Converter API</item>
+                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\CurrencyConverterApi</item>
+                </item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Directory/etc/module.xml b/app/code/Magento/Directory/etc/module.xml
index a3735ca6ddde1..3a750db5e7cfd 100644
--- a/app/code/Magento/Directory/etc/module.xml
+++ b/app/code/Magento/Directory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Directory" setup_version="2.0.2">
+    <module name="Magento_Directory" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
index d70dee8abc15b..3c540f7ce0ffd 100644
--- a/app/code/Magento/Directory/etc/zip_codes.xml
+++ b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -81,6 +81,7 @@
     <zip countryCode="CA">
         <codes>
             <code id="pattern_1" active="true" example="A1B 2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}\s[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
+            <code id="pattern_2" active="true" example="A1B2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
         </codes>
     </zip>
     <zip countryCode="IC">
@@ -195,7 +196,7 @@
     </zip>
     <zip countryCode="IL">
         <codes>
-            <code id="pattern_1" active="true" example="12345">^[0-9]{5}$</code>
+            <code id="pattern_1" active="true" example="6687865">^[0-9]{7}$</code>
         </codes>
     </zip>
     <zip countryCode="IT">
@@ -206,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/Directory/i18n/en_US.csv b/app/code/Magento/Directory/i18n/en_US.csv
index 00e32ab8c8501..3dcd2ceebf134 100644
--- a/app/code/Magento/Directory/i18n/en_US.csv
+++ b/app/code/Magento/Directory/i18n/en_US.csv
@@ -30,10 +30,8 @@ Continue,Continue
                     "
 "Default Display Currency","Default Display Currency"
 "Allowed Currencies","Allowed Currencies"
-"Yahoo Finance Exchange","Yahoo Finance Exchange"
 "Connection Timeout in Seconds","Connection Timeout in Seconds"
 Fixer.io,Fixer.io
-Webservicex,Webservicex
 "Scheduled Import Settings","Scheduled Import Settings"
 Enabled,Enabled
 "Error Email Recipient","Error Email Recipient"
@@ -49,3 +47,8 @@ Service,Service
 "State is Required for","State is Required for"
 "Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
 "Weight Unit","Weight Unit"
+"No API Key was specified or an invalid API Key was specified.","No API Key was specified or an invalid API Key was specified."
+"The account this API request is coming from is inactive.","The account this API request is coming from is inactive."
+"The """%1"" is not allowed as base currency for your subscription plan.","The """%1"" is not allowed as base currency for your subscription plan."
+"An invalid base currency has been entered.","An invalid base currency has been entered."
+"Currency rates can't be retrieved.","Currency rates can't be retrieved."
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 4019def9e0cd0..e2694b3b93bb9 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -33,7 +33,7 @@ class Downloadable extends Widget implements TabInterface
     /**
      * @var string
      */
-    protected $_template = 'product/edit/downloadable.phtml';
+    protected $_template = 'Magento_Downloadable::product/edit/downloadable.phtml';
 
     /**
      * Accordion block id
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index fab33673e182d..947e6dc1e8339 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -30,7 +30,7 @@ class Links extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'product/edit/downloadable/links.phtml';
+    protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml';
 
     /**
      * Downloadable file
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 8b808c6020c5b..3c86bfb2f8d00 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -22,7 +22,7 @@ class Samples extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/downloadable/samples.phtml';
+    protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml';
 
     /**
      * Downloadable file
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index 120c7a38a8f41..859d6a53d0618 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -6,7 +6,8 @@
 
 namespace Magento\Downloadable\Block\Catalog\Product;
 
-use Magento\Downloadable\Model\ResourceModel\Sample;
+use Magento\Downloadable\Model\ResourceModel\Sample\Collection as SampleCollection;
+use Magento\Downloadable\Api\Data\SampleInterface;
 
 /**
  * Downloadable Product Samples part block
@@ -29,7 +30,7 @@ public function hasSamples()
     /**
      * Get downloadable product samples
      *
-     * @return array
+     * @return SampleCollection
      */
     public function getSamples()
     {
@@ -37,7 +38,7 @@ public function getSamples()
     }
 
     /**
-     * @param Sample $sample
+     * @param SampleInterface $sample
      * @return string
      */
     public function getSampleUrl($sample)
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
index 38444de78ab9c..83b2797050db9 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
@@ -1,14 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\File;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File
+/**
+ * Class Upload
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\File
+ */
+class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Downloadable\Model\Link
@@ -96,17 +101,10 @@ public function execute()
                 $relativePath = rtrim($tmpPath, '/') . '/' . ltrim($result['file'], '/');
                 $this->storageDatabase->saveFile($relativePath);
             }
-
-            $result['cookie'] = [
-                'name' => $this->_getSession()->getName(),
-                'value' => $this->_getSession()->getSessionId(),
-                'lifetime' => $this->_getSession()->getCookieLifetime(),
-                'path' => $this->_getSession()->getCookiePath(),
-                'domain' => $this->_getSession()->getCookieDomain(),
-            ];
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
+
         return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
     }
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
index e7b1fff27680e..85f9ad39c4df5 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrosssell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends CatalogCrosssell implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
index 8a77cb2c01011..b6c25bdec9f14 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
index 8ee93c37a7775..8d5f64e02be47 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
@@ -7,6 +7,7 @@
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Framework\App\Response\Http as HttpResponse;
 
 class Link extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
 {
@@ -42,7 +43,9 @@ protected function _processDownload($resource, $resourceType)
         $fileName = $helper->getFilename();
         $contentType = $helper->getContentType();
 
-        $this->getResponse()->setHttpResponseCode(
+        /** @var HttpResponse $response */
+        $response = $this->getResponse();
+        $response->setHttpResponseCode(
             200
         )->setHeader(
             'Pragma',
@@ -59,16 +62,22 @@ protected function _processDownload($resource, $resourceType)
         );
 
         if ($fileSize = $helper->getFileSize()) {
-            $this->getResponse()->setHeader('Content-Length', $fileSize);
+            $response->setHeader('Content-Length', $fileSize);
         }
-
-        if ($contentDisposition = $helper->getContentDisposition()) {
-            $this->getResponse()
-                ->setHeader('Content-Disposition', $contentDisposition . '; filename=' . $fileName);
+        //Setting disposition as state in the config or forcing it for HTML.
+        /** @var string|null $contentDisposition */
+        $contentDisposition = $helper->getContentDisposition();
+        if (!$contentDisposition || $contentType === 'text/html') {
+            $contentDisposition = 'attachment';
         }
-
-        $this->getResponse()->clearBody();
-        $this->getResponse()->sendHeaders();
+        $response->setHeader(
+            'Content-Disposition',
+            $contentDisposition . '; filename=' . $fileName
+        );
+        //Rendering
+        $response->clearBody();
+        $response->sendHeaders();
+        
         $helper->output();
     }
 
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
index 8c10377f74e83..0352d97bca93a 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends CatalogRelated implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
index 403b3828e39a0..11e9c4eb5e3af 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
-class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
index d712a7ec80d18..a8581f38c419b 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends CatalogUpsell implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
index 960909ca1b399..3e28a96948a77 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php
@@ -6,6 +6,16 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
-class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid as CatalogUpsellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class UpsellGrid
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class UpsellGrid extends CatalogUpsellGrid implements HttpPostActionInterface
 {
 }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
index f56b219f72db2..a283891afc406 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
@@ -11,6 +11,9 @@
 use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
 use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
 
+/**
+ * Class for initialization downloadable info from request.
+ */
 class Downloadable
 {
     /**
@@ -92,6 +95,8 @@ public function afterInitialize(
                     }
                 }
                 $extension->setDownloadableProductLinks($links);
+            } else {
+                $extension->setDownloadableProductLinks([]);
             }
             if (isset($downloadable['sample']) && is_array($downloadable['sample'])) {
                 $samples = [];
@@ -107,6 +112,8 @@ public function afterInitialize(
                     }
                 }
                 $extension->setDownloadableProductSamples($samples);
+            } else {
+                $extension->setDownloadableProductSamples([]);
             }
             $product->setExtensionAttributes($extension);
             if ($product->getLinksPurchasedSeparately()) {
diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php
index b2cf89c1af980..583b5a33c6b9c 100644
--- a/app/code/Magento/Downloadable/Controller/Download.php
+++ b/app/code/Magento/Downloadable/Controller/Download.php
@@ -6,6 +6,7 @@
 namespace Magento\Downloadable\Controller;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Framework\App\Response\Http as HttpResponse;
 
 /**
  * Download controller
@@ -14,6 +15,13 @@
  */
 abstract class Download extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var array
+     */
+    private $disallowedContentTypes = [
+        'text/html',
+    ];
+
     /**
      * Prepare response to output resource contents
      *
@@ -28,9 +36,12 @@ protected function _processDownload($path, $resourceType)
 
         $helper->setResource($path, $resourceType);
         $fileName = $helper->getFilename();
+
         $contentType = $helper->getContentType();
 
-        $this->getResponse()->setHttpResponseCode(
+        /** @var HttpResponse $response */
+        $response = $this->getResponse();
+        $response->setHttpResponseCode(
             200
         )->setHeader(
             'Pragma',
@@ -47,15 +58,19 @@ protected function _processDownload($path, $resourceType)
         );
 
         if ($fileSize = $helper->getFileSize()) {
-            $this->getResponse()->setHeader('Content-Length', $fileSize);
+            $response->setHeader('Content-Length', $fileSize);
         }
 
-        if ($contentDisposition = $helper->getContentDisposition()) {
-            $this->getResponse()->setHeader('Content-Disposition', $contentDisposition . '; filename=' . $fileName);
+        $contentDisposition = $helper->getContentDisposition();
+        if (!$contentDisposition || in_array($contentType, $this->disallowedContentTypes)) {
+            // For security reasons we force browsers to download the file instead of opening it.
+            $contentDisposition = \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT;
         }
 
-        $this->getResponse()->clearBody();
-        $this->getResponse()->sendHeaders();
+        $response->setHeader('Content-Disposition', $contentDisposition  . '; filename=' . $fileName);
+        //Rendering
+        $response->clearBody();
+        $response->sendHeaders();
 
         $helper->output();
     }
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index 96aa5bdfeffd7..e9b2a5ce44c01 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Downloadable\Helper;
 
+use Magento\Downloadable\Model\Link;
 use Magento\Downloadable\Model\Link\Purchased\Item;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Downloadable helper
@@ -17,7 +19,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Check is link shareable or not
      *
-     * @param \Magento\Downloadable\Model\Link|Item $link
+     * @param Link|Item $link
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -25,14 +27,14 @@ public function getIsShareable($link)
     {
         $shareable = false;
         switch ($link->getIsShareable()) {
-            case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_YES:
-            case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_NO:
+            case Link::LINK_SHAREABLE_YES:
+            case Link::LINK_SHAREABLE_NO:
                 $shareable = (bool)$link->getIsShareable();
                 break;
-            case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG:
-                $shareable = (bool)$this->scopeConfig->isSetFlag(
-                    \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            case Link::LINK_SHAREABLE_CONFIG:
+                $shareable = $this->scopeConfig->isSetFlag(
+                    Link::XML_PATH_CONFIG_IS_SHAREABLE,
+                    ScopeInterface::SCOPE_STORE
                 );
         }
         return $shareable;
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
index 65239ad353c3f..0898f1924e538 100644
--- a/app/code/Magento/Downloadable/Model/LinkRepository.php
+++ b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -176,20 +177,22 @@ public function save($sku, LinkInterface $link, $isGlobalScopeContent = true)
             return $this->updateLink($product, $link, $isGlobalScopeContent);
         } else {
             if ($product->getTypeId() !== \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
-                throw new InputException(__('Provided product must be type \'downloadable\'.'));
+                throw new InputException(
+                    __('The product needs to be the downloadable type. Verify the product and try again.')
+                );
             }
             $validateLinkContent = !($link->getLinkType() === 'file' && $link->getLinkFile());
             $validateSampleContent = !($link->getSampleType() === 'file' && $link->getSampleFile());
             if (!$this->contentValidator->isValid($link, $validateLinkContent, $validateSampleContent)) {
-                throw new InputException(__('Provided link information is invalid.'));
+                throw new InputException(__('The link information is invalid. Verify the link and try again.'));
             }
 
             if (!in_array($link->getLinkType(), ['url', 'file'], true)) {
-                throw new InputException(__('Invalid link type.'));
+                throw new InputException(__('The link type is invalid. Verify and try again.'));
             }
             $title = $link->getTitle();
             if (empty($title)) {
-                throw new InputException(__('Link title cannot be empty.'));
+                throw new InputException(__('The link title is empty. Enter the link title and try again.'));
             }
             return $this->saveLink($product, $link, $isGlobalScopeContent);
         }
@@ -207,7 +210,7 @@ protected function saveLink(
         $isGlobalScopeContent
     ) {
         $linkData = [
-            'link_id' => (int)$link->getid(),
+            'link_id' => (int)$link->getId(),
             'is_delete' => 0,
             'type' => $link->getLinkType(),
             'sort_order' => $link->getSortOrder(),
@@ -283,18 +286,22 @@ protected function updateLink(
         /** @var $existingLink \Magento\Downloadable\Model\Link */
         $existingLink = $this->linkFactory->create()->load($link->getId());
         if (!$existingLink->getId()) {
-            throw new NoSuchEntityException(__('There is no downloadable link with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No downloadable link with the provided ID was found. Verify the ID and try again.')
+            );
         }
         $linkFieldValue = $product->getData(
             $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField()
         );
         if ($existingLink->getProductId() != $linkFieldValue) {
-            throw new InputException(__('Provided downloadable link is not related to given product.'));
+            throw new InputException(
+                __("The downloadable link isn't related to the product. Verify the link and try again.")
+            );
         }
         $validateLinkContent = !($link->getLinkFileContent() === null);
         $validateSampleContent = !($link->getSampleFileContent() === null);
         if (!$this->contentValidator->isValid($link, $validateLinkContent, $validateSampleContent)) {
-            throw new InputException(__('Provided link information is invalid.'));
+            throw new InputException(__('The link information is invalid. Verify the link and try again.'));
         }
         if ($isGlobalScopeContent) {
             $product->setStoreId(0);
@@ -302,7 +309,7 @@ protected function updateLink(
         $title = $link->getTitle();
         if (empty($title)) {
             if ($isGlobalScopeContent) {
-                throw new InputException(__('Link title cannot be empty.'));
+                throw new InputException(__('The link title is empty. Enter the link title and try again.'));
             }
         }
 
@@ -325,12 +332,14 @@ public function delete($id)
         /** @var $link \Magento\Downloadable\Model\Link */
         $link = $this->linkFactory->create()->load($id);
         if (!$link->getId()) {
-            throw new NoSuchEntityException(__('There is no downloadable link with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No downloadable link with the provided ID was found. Verify the ID and try again.')
+            );
         }
         try {
             $link->delete();
         } catch (\Exception $exception) {
-            throw new StateException(__('Cannot delete link with id %1', $link->getId()), $exception);
+            throw new StateException(__('The link with "%1" ID can\'t be deleted.', $link->getId()), $exception);
         }
         return true;
     }
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
index dd83c28b43dff..90b458ff6348e 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php
@@ -6,72 +6,177 @@
 namespace Magento\Downloadable\Model\ResourceModel\Indexer;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
 
 /**
- * Downloadable products Price indexer resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * Downloadable Product Price Indexer Resource model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
+class Price implements DimensionalIndexerInterface
 {
     /**
-     * @param null|int|array $entityIds
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
+     * @var BaseFinalPrice
      */
-    protected function reindex($entityIds = null)
-    {
-        if ($this->hasEntity() || !empty($entityIds)) {
-            $this->_prepareFinalPriceData($entityIds);
-            $this->_applyCustomOption();
-            $this->_applyDownloadableLink();
-            $this->_movePriceDataToIndexTable();
-        }
+    private $baseFinalPrice;
 
-        return $this;
+    /**
+     * @var IndexTableStructureFactory
+     */
+    private $indexTableStructureFactory;
+
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var BasePriceModifier
+     */
+    private $basePriceModifier;
+
+    /**
+     * @param BaseFinalPrice $baseFinalPrice
+     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param TableMaintainer $tableMaintainer
+     * @param MetadataPool $metadataPool
+     * @param Config $eavConfig
+     * @param ResourceConnection $resource
+     * @param BasePriceModifier $basePriceModifier
+     * @param string $connectionName
+     */
+    public function __construct(
+        BaseFinalPrice $baseFinalPrice,
+        IndexTableStructureFactory $indexTableStructureFactory,
+        TableMaintainer $tableMaintainer,
+        MetadataPool $metadataPool,
+        Config $eavConfig,
+        ResourceConnection $resource,
+        BasePriceModifier $basePriceModifier,
+        $connectionName = 'indexer'
+    ) {
+        $this->baseFinalPrice = $baseFinalPrice;
+        $this->indexTableStructureFactory = $indexTableStructureFactory;
+        $this->tableMaintainer = $tableMaintainer;
+        $this->connectionName = $connectionName;
+        $this->metadataPool = $metadataPool;
+        $this->resource = $resource;
+        $this->eavConfig = $eavConfig;
+        $this->basePriceModifier = $basePriceModifier;
     }
 
     /**
-     * Retrieve downloadable links price temporary index table name
-     *
-     * @see _prepareDefaultFinalPriceTable()
-     *
-     * @return string
+     * {@inheritdoc}
+     * @param array $dimensions
+     * @param \Traversable $entityIds
+     * @throws \Exception
      */
-    protected function _getDownloadableLinkPriceTable()
+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
     {
-        return $this->tableStrategy->getTableName('catalog_product_index_price_downlod');
+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+            'entityField' => 'entity_id',
+            'customerGroupField' => 'customer_group_id',
+            'websiteField' => 'website_id',
+            'taxClassField' => 'tax_class_id',
+            'originalPriceField' => 'price',
+            'finalPriceField' => 'final_price',
+            'minPriceField' => 'min_price',
+            'maxPriceField' => 'max_price',
+            'tierPriceField' => 'tier_price',
+        ]);
+        $this->fillFinalPrice($dimensions, $entityIds, $temporaryPriceTable);
+        $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
+        $this->applyDownloadableLink($temporaryPriceTable, $dimensions);
     }
 
     /**
-     * Prepare downloadable links price temporary index table
+     * Calculate and apply Downloadable links price to index
      *
+     * @param IndexTableStructure $temporaryPriceTable
+     * @param array $dimensions
      * @return $this
+     * @throws \Exception
      */
-    protected function _prepareDownloadableLinkPriceTable()
-    {
-        $this->getConnection()->delete($this->_getDownloadableLinkPriceTable());
+    private function applyDownloadableLink(
+        IndexTableStructure $temporaryPriceTable,
+        array $dimensions
+    ) {
+        $temporaryDownloadableTableName = 'catalog_product_index_price_downlod_temp';
+        $this->getConnection()->createTemporaryTableLike(
+            $temporaryDownloadableTableName,
+            $this->getTable('catalog_product_index_price_downlod_tmp'),
+            true
+        );
+        $this->fillTemporaryTable($temporaryDownloadableTableName, $dimensions);
+        $this->updateTemporaryDownloadableTable($temporaryPriceTable->getTableName(), $temporaryDownloadableTableName);
+        $this->getConnection()->delete($temporaryDownloadableTableName);
         return $this;
     }
 
     /**
-     * Calculate and apply Downloadable links price to index
+     * Retrieve catalog_product attribute instance by attribute code
      *
-     * @return $this
+     * @param string $attributeCode
+     * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _applyDownloadableLink()
+    protected function getAttribute($attributeCode)
     {
-        $connection = $this->getConnection();
-        $table = $this->_getDownloadableLinkPriceTable();
-
-        $this->_prepareDownloadableLinkPriceTable();
-
-        $dlType = $this->_getAttribute('links_purchased_separately');
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        return $this->eavConfig->getAttribute(Product::ENTITY, $attributeCode);
+    }
 
-        $ifPrice = $connection->getIfNullSql('dlpw.price_id', 'dlpd.price');
+    /**
+     * Put data into catalog product price indexer Downloadable links price  temp table
+     *
+     * @param string $temporaryDownloadableTableName
+     * @param array $dimensions
+     * @return void
+     * @throws \Exception
+     */
+    private function fillTemporaryTable(string $temporaryDownloadableTableName, array $dimensions)
+    {
+        $dlType = $this->getAttribute('links_purchased_separately');
+        $ifPrice = $this->getConnection()->getIfNullSql('dlpw.price_id', 'dlpd.price');
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
 
-        $select = $connection->select()->from(
-            ['i' => $this->_getDefaultFinalPriceTable()],
+        $select = $this->getConnection()->select()->from(
+            ['i' => $this->tableMaintainer->getMainTmpTable($dimensions)],
             ['entity_id', 'customer_group_id', 'website_id']
         )->join(
             ['dl' => $dlType->getBackend()->getTable()],
@@ -100,30 +205,87 @@ protected function _applyDownloadableLink()
                 'max_price' => new \Zend_Db_Expr('SUM(' . $ifPrice . ')'),
             ]
         );
+        $query = $select->insertFromSelect($temporaryDownloadableTableName);
+        $this->getConnection()->query($query);
+    }
 
-        $query = $select->insertFromSelect($table);
-        $connection->query($query);
-
-        $ifTierPrice = $connection->getCheckSql('i.tier_price IS NOT NULL', '(i.tier_price + id.min_price)', 'NULL');
+    /**
+     * Update data in the catalog product price indexer temp table
+     *
+     * @param string $temporaryPriceTableName
+     * @param string $temporaryDownloadableTableName
+     * @return void
+     */
+    private function updateTemporaryDownloadableTable(
+        string $temporaryPriceTableName,
+        string $temporaryDownloadableTableName
+    ) {
+        $ifTierPrice = $this->getConnection()->getCheckSql(
+            'i.tier_price IS NOT NULL',
+            '(i.tier_price + id.min_price)',
+            'NULL'
+        );
 
-        $select = $connection->select()->join(
-            ['id' => $table],
+        $selectForCrossUpdate = $this->getConnection()->select()->join(
+            ['id' => $temporaryDownloadableTableName],
             'i.entity_id = id.entity_id AND i.customer_group_id = id.customer_group_id' .
             ' AND i.website_id = id.website_id',
             []
-        )->columns(
+        );
+        // adds price of custom option, that was applied in DefaultPrice::_applyCustomOption
+        $selectForCrossUpdate->columns(
             [
                 'min_price' => new \Zend_Db_Expr('i.min_price + id.min_price'),
                 'max_price' => new \Zend_Db_Expr('i.max_price + id.max_price'),
                 'tier_price' => new \Zend_Db_Expr($ifTierPrice),
             ]
         );
+        $query = $selectForCrossUpdate->crossUpdateFromSelect(['i' => $temporaryPriceTableName]);
+        $this->getConnection()->query($query);
+    }
 
-        $query = $select->crossUpdateFromSelect(['i' => $this->_getDefaultFinalPriceTable()]);
-        $connection->query($query);
+    /**
+     * Fill final price
+     *
+     * @param array $dimensions
+     * @param \Traversable $entityIds
+     * @param IndexTableStructure $temporaryPriceTable
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Select_Exception
+     */
+    private function fillFinalPrice(
+        array $dimensions,
+        \Traversable $entityIds,
+        IndexTableStructure $temporaryPriceTable
+    ) {
+        $select = $this->baseFinalPrice->getQuery($dimensions, Type::TYPE_DOWNLOADABLE, iterator_to_array($entityIds));
+        $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
+        $this->tableMaintainer->getConnection()->query($query);
+    }
 
-        $connection->delete($table);
+    /**
+     * Get connection
+     *
+     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @throws \DomainException
+     */
+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+    {
+        if ($this->connection === null) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
 
-        return $this;
+        return $this->connection;
+    }
+
+    /**
+     * Get table
+     *
+     * @param string $tableName
+     * @return string
+     */
+    private function getTable($tableName)
+    {
+        return $this->resource->getTableName($tableName, $this->connectionName);
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
index 4590d5433ed72..73ae696a85187 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
@@ -87,7 +87,7 @@ public function addProductToFilter($product)
     }
 
     /**
-     * Retrieve title for for current store
+     * Retrieve title for current store
      *
      * @param int $storeId
      * @return $this
@@ -113,7 +113,7 @@ public function addTitleToResult($storeId = 0)
     }
 
     /**
-     * Retrieve price for for current website
+     * Retrieve price for current website
      *
      * @param int $websiteId
      * @return $this
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index 633243ac2eb86..0c7d2b96f1b53 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -183,20 +184,24 @@ public function save(
             return $this->updateSample($product, $sample, $isGlobalScopeContent);
         } else {
             if ($product->getTypeId() !== Type::TYPE_DOWNLOADABLE) {
-                throw new InputException(__('Provided product must be type \'downloadable\'.'));
+                throw new InputException(
+                    __('The product needs to be the downloadable type. Verify the product and try again.')
+                );
             }
             $validateSampleContent = !($sample->getSampleType() === 'file' && $sample->getSampleFile());
             if (!$this->contentValidator->isValid($sample, $validateSampleContent)) {
-                throw new InputException(__('Provided sample information is invalid.'));
+                throw new InputException(
+                    __('The sample information is invalid. Verify the information and try again.')
+                );
             }
 
             if (!in_array($sample->getSampleType(), ['url', 'file'], true)) {
-                throw new InputException(__('Invalid sample type.'));
+                throw new InputException(__('The sample type is invalid. Verify the sample type and try again.'));
             }
 
             $title = $sample->getTitle();
             if (empty($title)) {
-                throw new InputException(__('Sample title cannot be empty.'));
+                throw new InputException(__('The sample title is empty. Enter the title and try again.'));
             }
 
             return $this->saveSample($product, $sample, $isGlobalScopeContent);
@@ -215,7 +220,7 @@ protected function saveSample(
         $isGlobalScopeContent
     ) {
         $sampleData = [
-            'sample_id' => (int)$sample->getid(),
+            'sample_id' => (int)$sample->getId(),
             'is_delete' => 0,
             'type' => $sample->getSampleType(),
             'sort_order' => $sample->getSortOrder(),
@@ -271,18 +276,22 @@ protected function updateSample(
         $existingSample = $this->sampleFactory->create()->load($sampleId);
 
         if (!$existingSample->getId()) {
-            throw new NoSuchEntityException(__('There is no downloadable sample with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No downloadable sample with the provided ID was found. Verify the ID and try again.')
+            );
         }
         $linkFieldValue = $product->getData(
             $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField()
         );
         if ($existingSample->getProductId() != $linkFieldValue) {
-            throw new InputException(__('Provided downloadable sample is not related to given product.'));
+            throw new InputException(
+                __("The downloadable sample isn't related to the product. Verify the link and try again.")
+            );
         }
 
         $validateFileContent = $sample->getSampleFileContent() === null ? false : true;
         if (!$this->contentValidator->isValid($sample, $validateFileContent)) {
-            throw new InputException(__('Provided sample information is invalid.'));
+            throw new InputException(__('The sample information is invalid. Verify the information and try again.'));
         }
         if ($isGlobalScopeContent) {
             $product->setStoreId(0);
@@ -291,7 +300,7 @@ protected function updateSample(
         $title = $sample->getTitle();
         if (empty($title)) {
             if ($isGlobalScopeContent) {
-                throw new InputException(__('Sample title cannot be empty.'));
+                throw new InputException(__('The sample title is empty. Enter the title and try again.'));
             }
             // use title from GLOBAL scope
             $existingSample->setTitle(null);
@@ -314,12 +323,14 @@ public function delete($id)
         /** @var $sample \Magento\Downloadable\Model\Sample */
         $sample = $this->sampleFactory->create()->load($id);
         if (!$sample->getId()) {
-            throw new NoSuchEntityException(__('There is no downloadable sample with provided ID.'));
+            throw new NoSuchEntityException(
+                __('No downloadable sample with the provided ID was found. Verify the ID and try again.')
+            );
         }
         try {
             $sample->delete();
         } catch (\Exception $exception) {
-            throw new StateException(__('Cannot delete sample with id %1', $sample->getId()), $exception);
+            throw new StateException(__('The sample with "%1" ID can\'t be deleted.', $sample->getId()), $exception);
         }
         return true;
     }
diff --git a/app/code/Magento/Downloadable/Setup/InstallData.php b/app/code/Magento/Downloadable/Setup/InstallData.php
deleted file mode 100644
index e015f3a23c191..0000000000000
--- a/app/code/Magento/Downloadable/Setup/InstallData.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Downloadable\Setup;
-
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        /**
-         * Add attributes to the eav/attribute table
-         */
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'links_purchased_separately',
-            [
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => 'Links can be purchased separately',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
-                'visible' => false,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'unique' => false,
-                'apply_to' => 'downloadable',
-                'used_in_product_listing' => true
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'samples_title',
-            [
-                'type' => 'varchar',
-                'backend' => '',
-                'frontend' => '',
-                'label' => 'Samples title',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'visible' => false,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'unique' => false,
-                'apply_to' => 'downloadable'
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'links_title',
-            [
-                'type' => 'varchar',
-                'backend' => '',
-                'frontend' => '',
-                'label' => 'Links title',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'visible' => false,
-                'required' => true,
-                'user_defined' => false,
-                'default' => '',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'unique' => false,
-                'apply_to' => 'downloadable'
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'links_exist',
-            [
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => '',
-                'input' => '',
-                'class' => '',
-                'source' => '',
-                'global' => true,
-                'visible' => false,
-                'required' => false,
-                'user_defined' => false,
-                'default' => '0',
-                'searchable' => false,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'unique' => false,
-                'apply_to' => 'downloadable',
-                'used_in_product_listing' => 1
-            ]
-        );
-
-        $fieldList = [
-            'price',
-            'special_price',
-            'special_from_date',
-            'special_to_date',
-            'minimal_price',
-            'cost',
-            'tier_price',
-            'weight',
-        ];
-
-        // make these attributes applicable to downloadable products
-        foreach ($fieldList as $field) {
-            $applyTo = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field, 'apply_to')
-            );
-            if (!in_array('downloadable', $applyTo)) {
-                $applyTo[] = 'downloadable';
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    $field,
-                    'apply_to',
-                    implode(',', $applyTo)
-                );
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Downloadable/Setup/InstallSchema.php b/app/code/Magento/Downloadable/Setup/InstallSchema.php
deleted file mode 100644
index e3540bf7a2b70..0000000000000
--- a/app/code/Magento/Downloadable/Setup/InstallSchema.php
+++ /dev/null
@@ -1,721 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Downloadable\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'downloadable_link'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_link'))
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Link ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sort order'
-            )
-            ->addColumn(
-                'number_of_downloads',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => true],
-                'Number of downloads'
-            )
-            ->addColumn(
-                'is_shareable',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Shareable flag'
-            )
-            ->addColumn(
-                'link_url',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link Url'
-            )
-            ->addColumn(
-                'link_file',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link File'
-            )
-            ->addColumn(
-                'link_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                20,
-                [],
-                'Link Type'
-            )
-            ->addColumn(
-                'sample_url',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Sample Url'
-            )
-            ->addColumn(
-                'sample_file',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Sample File'
-            )
-            ->addColumn(
-                'sample_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                20,
-                [],
-                'Sample Type'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link', ['product_id', 'sort_order']),
-                ['product_id', 'sort_order']
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Downloadable Link Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'downloadable_link_price'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_link_price'))
-            ->addColumn(
-                'price_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Price ID'
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Link ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Website ID'
-            )
-            ->addColumn(
-                'price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Price'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_price', 'link_id'),
-                'link_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link_price', 'link_id', 'downloadable_link', 'link_id'),
-                'link_id',
-                $installer->getTable('downloadable_link'),
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_price', 'website_id'),
-                'website_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link_price', 'website_id', 'store_website', 'website_id'),
-                'website_id',
-                $installer->getTable('store_website'),
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Downloadable Link Price Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'downloadable_link_purchased'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_link_purchased'))
-            ->addColumn(
-                'purchased_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Purchased ID'
-            )
-            ->addColumn(
-                'order_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Order ID'
-            )
-            ->addColumn(
-                'order_increment_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                [],
-                'Order Increment ID'
-            )
-            ->addColumn(
-                'order_item_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Order Item ID'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Date of creation'
-            )
-            ->addColumn(
-                'updated_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                'Date of modification'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => true, 'default' => '0'],
-                'Customer ID'
-            )
-            ->addColumn(
-                'product_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Product name'
-            )
-            ->addColumn(
-                'product_sku',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Product sku'
-            )
-            ->addColumn(
-                'link_section_title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link_section_title'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_purchased', 'order_id'),
-                'order_id'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_purchased', 'order_item_id'),
-                'order_item_id'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_purchased', 'customer_id'),
-                'customer_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link_purchased', 'customer_id', 'customer_entity', 'entity_id'),
-                'customer_id',
-                $installer->getTable('customer_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link_purchased', 'order_id', 'sales_order', 'entity_id'),
-                'order_id',
-                $installer->getTable('sales_order'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment('Downloadable Link Purchased Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'downloadable_link_purchased_item'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_link_purchased_item'))
-            ->addColumn(
-                'item_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Item ID'
-            )
-            ->addColumn(
-                'purchased_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Purchased ID'
-            )
-            ->addColumn(
-                'order_item_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Order Item ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => true, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'link_hash',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link hash'
-            )
-            ->addColumn(
-                'number_of_downloads_bought',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Number of downloads bought'
-            )
-            ->addColumn(
-                'number_of_downloads_used',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Number of downloads used'
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Link ID'
-            )
-            ->addColumn(
-                'link_title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link Title'
-            )
-            ->addColumn(
-                'is_shareable',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Shareable Flag'
-            )
-            ->addColumn(
-                'link_url',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link Url'
-            )
-            ->addColumn(
-                'link_file',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link File'
-            )
-            ->addColumn(
-                'link_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Link Type'
-            )
-            ->addColumn(
-                'status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                [],
-                'Status'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Creation Time'
-            )
-            ->addColumn(
-                'updated_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                'Update Time'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_purchased_item', 'link_hash'),
-                'link_hash'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_purchased_item', 'order_item_id'),
-                'order_item_id'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_purchased_item', 'purchased_id'),
-                'purchased_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'downloadable_link_purchased_item',
-                    'purchased_id',
-                    'downloadable_link_purchased',
-                    'purchased_id'
-                ),
-                'purchased_id',
-                $installer->getTable('downloadable_link_purchased'),
-                'purchased_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'downloadable_link_purchased_item',
-                    'order_item_id',
-                    'sales_order_item',
-                    'item_id'
-                ),
-                'order_item_id',
-                $installer->getTable('sales_order_item'),
-                'item_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment('Downloadable Link Purchased Item Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'downloadable_link_title'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_link_title'))
-            ->addColumn(
-                'title_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Title ID'
-            )
-            ->addColumn(
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Link ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Title'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'downloadable_link_title',
-                    ['link_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['link_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link_title', 'link_id', 'downloadable_link', 'link_id'),
-                'link_id',
-                $installer->getTable('downloadable_link'),
-                'link_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_link_title', 'store_id'),
-                'store_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_link_title', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Link Title Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'downloadable_sample'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_sample'))
-            ->addColumn(
-                'sample_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Sample ID'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product ID'
-            )
-            ->addColumn(
-                'sample_url',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Sample URL'
-            )
-            ->addColumn(
-                'sample_file',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Sample file'
-            )
-            ->addColumn(
-                'sample_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                20,
-                [],
-                'Sample Type'
-            )
-            ->addColumn(
-                'sort_order',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sort Order'
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_sample', 'product_id'),
-                'product_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_sample', 'product_id', 'catalog_product_entity', 'entity_id'),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Downloadable Sample Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'downloadable_sample_title'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('downloadable_sample_title'))
-            ->addColumn(
-                'title_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Title ID'
-            )
-            ->addColumn(
-                'sample_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Sample ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Title'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'downloadable_sample_title',
-                    ['sample_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['sample_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_sample_title', 'sample_id', 'downloadable_sample', 'sample_id'),
-                'sample_id',
-                $installer->getTable('downloadable_sample'),
-                'sample_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addIndex(
-                $installer->getIdxName('downloadable_sample_title', 'store_id'),
-                'store_id'
-            )
-            ->addForeignKey(
-                $installer->getFkName('downloadable_sample_title', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Downloadable Sample Title Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_downlod_idx'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_downlod_idx'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Minimum price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Maximum price'
-            )
-            ->setComment('Indexer Table for price of downloadable products');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'catalog_product_index_price_downlod_tmp'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('catalog_product_index_price_downlod_tmp'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Customer Group ID'
-            )
-            ->addColumn(
-                'website_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Website ID'
-            )
-            ->addColumn(
-                'min_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Minimum price'
-            )
-            ->addColumn(
-                'max_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Maximum price'
-            )
-            ->setOption(
-                'type',
-                \Magento\Framework\DB\Adapter\Pdo\Mysql::ENGINE_MEMORY
-            )
-            ->setComment('Temporary Indexer Table for price of downloadable products');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php b/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php
new file mode 100644
index 0000000000000..9c101425e49ae
--- /dev/null
+++ b/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Downloadable\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InstallDownloadableAttributes
+ * @package Magento\Downloadable\Setup\Patch
+ */
+class InstallDownloadableAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * InstallDownloadableAttributes constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        /**
+         * Add attributes to the eav/attribute table
+         */
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'links_purchased_separately',
+            [
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => 'Links can be purchased separately',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'visible' => false,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'unique' => false,
+                'apply_to' => 'downloadable',
+                'used_in_product_listing' => true
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'samples_title',
+            [
+                'type' => 'varchar',
+                'backend' => '',
+                'frontend' => '',
+                'label' => 'Samples title',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'visible' => false,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'unique' => false,
+                'apply_to' => 'downloadable'
+            ]
+        );
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'links_title',
+            [
+                'type' => 'varchar',
+                'backend' => '',
+                'frontend' => '',
+                'label' => 'Links title',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'visible' => false,
+                'required' => true,
+                'user_defined' => false,
+                'default' => '',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'unique' => false,
+                'apply_to' => 'downloadable'
+            ]
+        );
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'links_exist',
+            [
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => '',
+                'input' => '',
+                'class' => '',
+                'source' => '',
+                'global' => true,
+                'visible' => false,
+                'required' => false,
+                'user_defined' => false,
+                'default' => '0',
+                'searchable' => false,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'unique' => false,
+                'apply_to' => 'downloadable',
+                'used_in_product_listing' => 1
+            ]
+        );
+        $fieldList = [
+            'price',
+            'special_price',
+            'special_from_date',
+            'special_to_date',
+            'minimal_price',
+            'cost',
+            'tier_price',
+            'weight',
+        ];
+        // make these attributes applicable to downloadable products
+        foreach ($fieldList as $field) {
+            $applyTo = explode(
+                ',',
+                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field, 'apply_to')
+            );
+            if (!in_array('downloadable', $applyTo)) {
+                $applyTo[] = 'downloadable';
+                $eavSetup->updateAttribute(
+                    \Magento\Catalog\Model\Product::ENTITY,
+                    $field,
+                    'apply_to',
+                    implode(',', $applyTo)
+                );
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php b/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php
new file mode 100644
index 0000000000000..bde9accc39d79
--- /dev/null
+++ b/app/code/Magento/Downloadable/Setup/Patch/Data/UpdateLinksExistDefaultAttributeValue.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Remove default value from links exist attribute.
+ */
+class UpdateLinksExistDefaultAttributeValue implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        // remove default value
+        $eavSetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'links_exist',
+            'default_value',
+            null
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [InstallDownloadableAttributes::class];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Downloadable/Setup/UpgradeSchema.php b/app/code/Magento/Downloadable/Setup/UpgradeSchema.php
deleted file mode 100755
index 6a510e663bcf2..0000000000000
--- a/app/code/Magento/Downloadable/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Downloadable\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $tables = [
-                'catalog_product_index_price_downlod_idx',
-                'catalog_product_index_price_downlod_tmp',
-            ];
-            foreach ($tables as $table) {
-                $setup->getConnection()->modifyColumn(
-                    $setup->getTable($table),
-                    'customer_group_id',
-                    ['type' => 'integer', 'nullable' => false]
-                );
-            }
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
new file mode 100644
index 0000000000000..363911daa41ed
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Fill main fields in product form-->
+    <actionGroup name="fillMainDownloadableProductForm">
+        <arguments>
+            <argument name="product" defaultValue="DownloadableProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
+    </actionGroup>
+
+    <!--Add a downloadable link that has max downloads-->
+    <actionGroup name="addDownloadableProductLinkWithMaxDownloads">
+        <arguments>
+            <argument name="link" defaultValue="downloadableLinkWithMaxDownloads"/>
+        </arguments>
+        <click selector="{{AdminProductDownloadableSection.linksAddLinkButton}}" stepKey="clickLinkAddLinkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField userInput="{{link.title}}" selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" stepKey="fillDownloadableLinkTitle"/>
+        <fillField userInput="{{link.price}}" selector="{{AdminProductDownloadableSection.addLinkPriceInput('0')}}" stepKey="fillDownloadableLinkPrice"/>
+        <selectOption userInput="{{link.file_type}}" selector="{{AdminProductDownloadableSection.addLinkFileTypeSelector('0')}}" stepKey="selectDownloadableLinkFileType"/>
+        <selectOption userInput="{{link.sample_type}}" selector="{{AdminProductDownloadableSection.addLinkSampleTypeSelector('0')}}" stepKey="selectDownloadableLinkSampleType"/>
+        <selectOption userInput="{{link.shareable}}" selector="{{AdminProductDownloadableSection.addLinkShareableSelector('0')}}" stepKey="selectDownloadableLinkShareable"/>
+        <fillField userInput="{{link.max_downloads}}" selector="{{AdminProductDownloadableSection.addLinkMaxDownloadsInput('0')}}" stepKey="fillDownloadableLinkMaxDownloads"/>
+        <attachFile userInput="{{link.file}}" selector="{{AdminProductDownloadableSection.addLinkFileUploadFile('0')}}" stepKey="fillDownloadableLinkUploadFile"/>
+        <fillField userInput="{{link.sample}}" selector="{{AdminProductDownloadableSection.addLinkSampleUrlInput('0')}}" stepKey="fillDownloadableLinkSampleUrl"/>
+    </actionGroup>
+
+    <!--Add a downloadable link with unlimited downloads-->
+    <actionGroup name="addDownloadableProductLink">
+        <arguments>
+            <argument name="link" defaultValue="downloadableLink"/>
+        </arguments>
+        <click selector="{{AdminProductDownloadableSection.linksAddLinkButton}}" stepKey="clickLinkAddLinkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField userInput="{{link.title}}" selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" stepKey="fillDownloadableLinkTitle"/>
+        <fillField userInput="{{link.price}}" selector="{{AdminProductDownloadableSection.addLinkPriceInput('1')}}" stepKey="fillDownloadableLinkPrice"/>
+        <selectOption userInput="{{link.file_type}}" selector="{{AdminProductDownloadableSection.addLinkFileTypeSelector('1')}}" stepKey="selectDownloadableLinkFileType"/>
+        <selectOption userInput="{{link.sample_type}}" selector="{{AdminProductDownloadableSection.addLinkSampleTypeSelector('1')}}" stepKey="selectDownloadableLinkSampleType"/>
+        <selectOption userInput="{{link.shareable}}" selector="{{AdminProductDownloadableSection.addLinkShareableSelector('1')}}" stepKey="selectDownloadableLinkShareable"/>
+        <checkOption selector="{{AdminProductDownloadableSection.addLinkIsUnlimitedDownloads('1')}}" stepKey="checkDownloadableLinkUnlimited"/>
+        <fillField userInput="{{link.file}}" selector="{{AdminProductDownloadableSection.addLinkFileUrlInput('1')}}" stepKey="fillDownloadableLinkFileUrl"/>
+        <attachFile userInput="{{link.sample}}" selector="{{AdminProductDownloadableSection.addLinkSampleUploadFile('1')}}" stepKey="attachDownloadableLinkUploadSample"/>
+    </actionGroup>
+
+    <!--Add a downloadable sample file-->
+    <actionGroup name="addDownloadableSampleFile">
+        <arguments>
+            <argument name="sample" defaultValue="downloadableSampleFile"/>
+        </arguments>
+        <click selector="{{AdminProductDownloadableSection.samplesAddLinkButton}}" stepKey="clickSampleAddLinkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField userInput="{{sample.title}}" selector="{{AdminProductDownloadableSection.addSampleTitleInput('0')}}" stepKey="fillDownloadableSampleTitle"/>
+        <selectOption userInput="{{sample.file_type}}" selector="{{AdminProductDownloadableSection.addSampleFileTypeSelector('0')}}" stepKey="selectDownloadableSampleFileType"/>
+        <attachFile userInput="{{sample.file}}" selector="{{AdminProductDownloadableSection.addSampleFileUploadFile('0')}}" stepKey="selectDownloadableSampleUpload"/>
+        <waitForAjaxLoad stepKey="waitForSampleFileUpload"/>
+    </actionGroup>
+
+    <!--Add a downloadable sample URL-->
+    <actionGroup name="addDownloadableSampleUrl">
+        <arguments>
+            <argument name="sample" defaultValue="downloadableSampleUrl"/>
+        </arguments>
+        <click selector="{{AdminProductDownloadableSection.samplesAddLinkButton}}" stepKey="clickSampleAddLinkButton2"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField userInput="{{sample.title}}" selector="{{AdminProductDownloadableSection.addSampleTitleInput('1')}}" stepKey="fillDownloadableSampleTitle"/>
+        <selectOption userInput="{{sample.file_type}}" selector="{{AdminProductDownloadableSection.addSampleFileTypeSelector('1')}}" stepKey="selectDownloadableSampleFileType"/>
+        <fillField userInput="{{sample.file}}" selector="{{AdminProductDownloadableSection.addSampleFileUrlInput('1')}}" stepKey="fillDownloadableSampleFileUrl"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
new file mode 100644
index 0000000000000..38ac2c99e4756
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="downloadableData" type="downloadable_data">
+        <data key="link_title">Downloadable Links</data>
+        <data key="sample_title">Downloadable Samples</data>
+    </entity>
+    <entity name="downloadableLink" type="downloadable_link">
+        <data key="title" unique="suffix">DownloadableLink</data>
+        <data key="price">2.00</data>
+        <data key="file_type">URL</data>
+        <data key="sample_type">Upload File</data>
+        <data key="shareable">No</data>
+        <data key="file">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
+        <data key="sample">magento-logo.png</data>
+    </entity>
+    <entity name="downloadableLinkWithMaxDownloads" type="downloadable_link">
+        <data key="title" unique="suffix">Downloadable</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="sample_type">URL</data>
+        <data key="shareable">Yes</data>
+        <data key="max_downloads">100</data>
+        <data key="file">magento-logo.png</data>
+        <data key="sample">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
+    </entity>
+    <entity name="downloadableSampleFile" type="downloadable_sample">
+        <data key="title" unique="suffix">SampleFile</data>
+        <data key="file_type">Upload File</data>
+        <data key="file">magento-logo.png</data>
+    </entity>
+    <entity name="downloadableSampleUrl" type="downloadable_sample">
+        <data key="title" unique="suffix">SampleUrl</data>
+        <data key="file_type">URL</data>
+        <data key="file">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
+    </entity>
+    <entity name="ApiDownloadableLink" type="downloadable_link">
+        <data key="title" unique="suffix">Api Downloadable Link</data>
+        <data key="price">2.00</data>
+        <data key="link_type">url</data>
+        <data key="shareable">No</data>
+        <data key="number_of_downloads">1000</data>
+        <data key="sort_order">0</data>
+        <data key="link_url">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
new file mode 100644
index 0000000000000..6a91b60dcb588
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DownloadableProduct" type="product">
+        <data key="sku" unique="suffix">downloadableproduct</data>
+        <data key="type_id">downloadable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">DownloadableProduct</data>
+        <data key="price">50.99</data>
+        <data key="quantity">100</data>
+        <data key="weight">0</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">downloadableproduct</data>
+    </entity>
+    <entity name="ApiDownloadableProduct" type="product">
+        <data key="sku" unique="suffix">api-downloadable-product</data>
+        <data key="type_id">downloadable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Downloadable Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-downloadable-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+        <requiredEntity type="downloadable_link">apiDownloadableLink</requiredEntity>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE.txt b/app/code/Magento/Downloadable/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE.txt
rename to app/code/Magento/Downloadable/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE_AFL.txt b/app/code/Magento/Downloadable/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE_AFL.txt
rename to app/code/Magento/Downloadable/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
new file mode 100644
index 0000000000000..2511244d445c1
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateDownloadableLink" dataType="downloadable_link" type="create" auth="adminOauth" url="/V1/products/{sku}/downloadable-links" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="downloadable_link" key="link">
+            <field key="title">string</field>
+            <field key="sort_order">integer</field>
+            <field key="is_shareable">integer</field>
+            <field key="price">number</field>
+            <field key="number_of_downloads">integer</field>
+            <field key="link_type">string</field>
+            <field key="link_file">string</field>
+            <field key="link_file_content">link_file_content</field>
+            <field key="file_data">string</field>
+            <field key="link_url">string</field>
+            <field key="sample_type">string</field>
+            <field key="sample_file">string</field>
+            <field key="sample_file_content">sample_file_content</field>
+            <field key="sample_url">string</field>
+        </object>
+        <field key="isGlobalScopeContent">boolean</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
new file mode 100644
index 0000000000000..d5d6c16c71736
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateLinkFileContent" dataType="link_file_content" type="create">
+        <field key="file_data">string</field>
+        <field key="name">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
new file mode 100644
index 0000000000000..3da91807ceb48
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSampleFileContent" dataType="sample_file_content" type="create">
+        <field key="file_data">string</field>
+        <field key="name">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..049d6d084530f
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminProductDownloadableSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/README.md b/app/code/Magento/Downloadable/Test/Mftf/README.md
new file mode 100644
index 0000000000000..11451fafa33a7
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Downloadable Functional Tests
+
+The Functional Test Module for **Magento Downloadable** module.
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
new file mode 100644
index 0000000000000..274f26498958b
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductDownloadableSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='downloadable']" timeout="30" />
+        <element name="isDownloadableProduct" type="input" selector="input[name='is_downloadable']" />
+        <element name="linksTitleInput" type="input" selector="input[name='product[links_title]']" />
+        <element name="isLinksPurchasedSeparately" type="input" selector="input[name='product[links_purchased_separately]']" />
+        <element name="linksAddLinkButton" type="button" selector="div[data-index='container_links'] button[data-action='add_new_row']" />
+        <element name="lastLinkRow" type="text" selector="table[data-index=link] tbody tr:last-of-type"/>
+
+        <!-- Parameterized selectors for elements in an individual link row -->
+        <element name="addLinkTitleInput" type="input" selector="input[name='downloadable[link][{{var1}}][title]']" parameterized="true" />
+        <element name="addLinkPriceInput" type="input" selector="input[name='downloadable[link][{{var1}}][price]']" parameterized="true" />
+        <element name="addLinkFileTypeSelector" type="select" selector="select[name='downloadable[link][{{var1}}][type]']" parameterized="true" />
+        <element name="addLinkSampleTypeSelector" type="select" selector="select[name='downloadable[link][{{var1}}][sample][type]']" parameterized="true" />
+        <element name="addLinkShareableSelector" type="select" selector="select[name='downloadable[link][{{var1}}][is_shareable]']" parameterized="true" />
+        <element name="addLinkMaxDownloadsInput" type="input" selector="input[name='downloadable[link][{{var1}}][number_of_downloads]']" parameterized="true" />
+        <element name="addLinkIsUnlimitedDownloads" type="input" selector="input[name='downloadable[link][{{var1}}][is_unlimited]']" parameterized="true" />
+        <element name="addLinkRemoveRowButton" type="button" selector="div[data-index='container_links'] tr[data-repeat-index='{{var1}}'] button[data-action='remove_row']" parameterized="true" />
+        <!-- Only one of Upload/Url Inputs are available for File and Sample depending on the value of the corresponding TypeSelector -->
+        <element name="addLinkFileUploadFile" type="file" selector="div[data-index='container_links'] tr[data-repeat-index='{{var1}}'] fieldset[data-index='container_file'] input[type='file']" parameterized="true" />
+        <element name="addLinkFileUrlInput" type="input" selector="input[name='downloadable[link][{{var1}}][link_url]']" parameterized="true" />
+        <element name="addLinkSampleUploadFile" type="file" selector="div[data-index='container_links'] tr[data-repeat-index='{{var1}}'] fieldset[data-index='container_sample'] input[type='file']" parameterized="true" />
+        <element name="addLinkSampleUrlInput" type="input" selector="input[name='downloadable[link][{{var1}}][sample][url]']" parameterized="true" />
+        
+        <element name="samplesTitleInput" type="input" selector="input[name='product[samples_title]']"/>
+        <element name="samplesAddLinkButton" type="button" selector="div[data-index='container_samples'] button[data-action='add_new_row']" />
+
+        <!-- Parameterized selectors for elements in an individual sample row -->
+        <element name="addSampleTitleInput" type="input" selector="input[name='downloadable[sample][{{var1}}][title]']" parameterized="true" />
+        <element name="addSampleFileTypeSelector" type="select" selector="select[name='downloadable[sample][{{var1}}][type]']" parameterized="true" />
+        <element name="addSampleRemoveRowButton" type="button" selector="div[data-index='container_links'] tr[data-repeat-index='{{var1}}'] button[data-action='remove_row']" parameterized="true" />
+        <element name="addSampleFileUploadFile" type="file" selector="div[data-index='container_samples'] tr[data-repeat-index='{{var1}}'] input[type='file']" parameterized="true" />
+        <element name="addSampleFileUrlInput" type="input" selector="input[name='downloadable[sample][{{var1}}][sample_url]']" parameterized="true" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
new file mode 100644
index 0000000000000..3d779740849c5
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultImageDownloadableProductTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default images for a Downloadable Product"/>
+            <description value="Admin should be able to add default images for a Downloadable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-117"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Add downloadable links -->
+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillDownloadableLinkTitle"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkLinksPurchasedSeparately"/>
+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillDownloadableSampleTitle"/>
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableLinkWithMaxDownloads">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableLink">
+            <argument name="link" value="downloadableLink"/>
+        </actionGroup>
+
+        <!--Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
new file mode 100644
index 0000000000000..88dcca0958719
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultVideoDownloadableProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default video for a Downloadable Product"/>
+            <description value="Admin should be able to add default video for a Downloadable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-114"/>
+            <group value="Downloadable"/>
+        </annotations>
+
+        <!-- Create a downloadable product -->
+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Add downloadable links -->
+        <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
+        <conditionalClick selector="{{AdminProductDownloadableSection.sectionHeader}}" dependentSelector="{{AdminProductDownloadableSection.isDownloadableProduct}}" visible="false" stepKey="openDownloadableSection" after="scrollToSection"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkOptionIsDownloadable" after="openDownloadableSection"/>
+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillLinkTitle" after="checkOptionIsDownloadable"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately" after="fillLinkTitle"/>
+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillSampleTitle" after="checkOptionPurchaseSeparately"/>
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLinkWithMaxDownloads" after="fillSampleTitle">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableProductLink" before="saveProductForm">
+            <argument name="link" value="downloadableLink"/>
+        </actionGroup>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableProductSetEditContentTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..72cdf589bec91
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableProductSetEditContentTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDownloadableProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Create/edit downloadable product"/>
+            <title value="Admin should be able to set/edit product Content when editing a downloadable product"/>
+            <description value="Admin should be able to set/edit product Content when editing a downloadable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3426"/>
+            <group value="Downloadable"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <after>
+            <!-- Delete downloadable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="DownloadableProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!--Checking content storefront-->
+        <amOnPage url="{{DownloadableProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
new file mode 100644
index 0000000000000..f70769cdfe834
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDownloadableSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Create/edit downloadable product"/>
+            <title value="Admin should be able to set/edit Related Products information when editing a downloadable product"/>
+            <description value="Admin should be able to set/edit Related Products information when editing a downloadable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3416"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before></before>
+        <after>
+            <!-- Delete downloadable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="DownloadableProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!--See related product in storefront-->
+        <amOnPage url="{{DownloadableProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
new file mode 100644
index 0000000000000..3ee6cef47738b
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultImageDownloadableProductTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default images from a Downloadable Product"/>
+            <description value="Admin should be able to remove default images from a Downloadable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-201"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Add downloadable links -->
+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillDownloadableLinkTitle"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkLinksPurchasedSeparately"/>
+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillDownloadableSampleTitle"/>
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableLinkWithMaxDownloads">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableLink">
+            <argument name="link" value="downloadableLink"/>
+        </actionGroup>
+
+        <!--Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Remove image from product -->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
new file mode 100644
index 0000000000000..d8bbbb2b4d62b
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultVideoDownloadableProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default video from a Downloadable Product"/>
+            <description value="Admin should be able to remove default video from a Downloadable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-207"/>
+            <group value="Downloadable"/>
+        </annotations>
+
+        <!-- Create a downloadable product -->
+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Add downloadable links -->
+        <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
+        <conditionalClick selector="{{AdminProductDownloadableSection.sectionHeader}}" dependentSelector="{{AdminProductDownloadableSection.isDownloadableProduct}}" visible="false" stepKey="openDownloadableSection" after="scrollToSection"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkOptionIsDownloadable" after="openDownloadableSection"/>
+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillLinkTitle" after="checkOptionIsDownloadable"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOptionPurchaseSeparately" after="fillLinkTitle"/>
+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillSampleTitle" after="checkOptionPurchaseSeparately"/>
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableProductLinkWithMaxDownloads" after="fillSampleTitle">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableProductLink" before="saveProductForm">
+            <argument name="link" value="downloadableLink"/>
+        </actionGroup>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
new file mode 100644
index 0000000000000..af5d20b075d12
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdvanceCatalogSearchDownloadableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Downloadable product with product name"/>
+            <description value="Guest customer should be able to advance search Downloadable product with product name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-142"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchDownloadableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Downloadable product with product sku"/>
+            <description value="Guest customer should be able to advance search Downloadable product with product sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-252"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchDownloadableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Downloadable product with product description"/>
+            <description value="Guest customer should be able to advance search Downloadable product with product description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-243"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchDownloadableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Downloadable product with product short description"/>
+            <description value="Guest customer should be able to advance search Downloadable product with product short description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-245"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+        </before>
+    </test>
+    <test name="AdvanceCatalogSearchDownloadableByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Downloadable product with product price"/>
+            <description value="Guest customer should be able to advance search Downloadable product with product price"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-246"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <createData entity="ApiDownloadableProduct" stepKey="product"/>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+        </before>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..75a66cec91692
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CAdminTest">
+        <!--Create Downloadable Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitProductPageDownloadable" after="seeSimpleProductInGrid"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadDownloadable" after="visitProductPageDownloadable"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateDownloadableProduct" after="waitForProductPageLoadDownloadable">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainDownloadableProductForm" stepKey="fillMainProductFormDownloadable" after="goToCreateDownloadableProduct">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection" after="fillMainProductFormDownloadable"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable" after="openDownloadableSection"/>
+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillDownloadableLinkTitle" after="checkIsDownloadable"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkLinksPurchasedSeparately" after="fillDownloadableLinkTitle"/>
+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillDownloadableSampleTitle" after="checkLinksPurchasedSeparately"/>
+
+        <!--  Link 1 -->
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableLinkWithMaxDownloads" after="fillDownloadableSampleTitle">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+
+        <!--  Link 2 -->
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableLink" after="addDownloadableLinkWithMaxDownloads">
+            <argument name="link" value="downloadableLink"/>
+        </actionGroup>
+
+        <!--  Sample 1 -->
+        <actionGroup ref="addDownloadableSampleFile" stepKey="addDownloadSampleFile" after="addDownloadableLink">
+            <argument name="sample" value="downloadableSampleFile"/>
+        </actionGroup>
+
+        <!--  Sample 2 -->
+        <actionGroup ref="addDownloadableSampleUrl" stepKey="addDownloadableSampleUrl" after="addDownloadSampleFile">
+            <argument name="sample" value="downloadableSampleUrl"/>
+        </actionGroup>
+
+        <!--Save Product-->
+        <actionGroup ref="saveProductForm" stepKey="saveDownloadableProduct" after="addDownloadableSampleUrl"/>
+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewDownloadableProductInGrid" after="saveDownloadableProduct">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <comment userInput="Clean up downloadable product" stepKey="cleanUpDownloadableProduct" after="deleteSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteDownloadableProduct" after="cleanUpDownloadableProduct">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
new file mode 100644
index 0000000000000..4864d11c884bc
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetDownloadableProductTest" extends="NewProductsListWidgetTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set Downloadable Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set Downloadable Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-124"/>
+            <group value="Downloadable"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
+
+        <!-- Create a Downloadable product to appear in the widget -->
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProduct"/>
+        <click selector="{{AdminProductGridActionSection.addDownloadableProduct}}" stepKey="clickAddDownloadableProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{_defaultProduct.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
+        <fillField userInput="This Is A Title" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillDownloadableLinkTitle"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkLinksPurchasedSeparately"/>
+        <fillField userInput="This Is Another Title" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillDownloadableSampleTitle"/>
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableLinkWithMaxDownloads">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
+
+        <!-- Check for product on the CMS page with the New Products widget -->
+
+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPage"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/Test/Unit/Block/Catalog/Product/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Block/Catalog/Product/LinksTest.php
index 13f474e5f0bf8..c48dfc62a7d4f 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Block/Catalog/Product/LinksTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Block/Catalog/Product/LinksTest.php
@@ -156,6 +156,11 @@ public function testGetJsonConfig()
         $this->assertEquals(json_encode($config), $encodedJsonConfig);
     }
 
+    /**
+     * @param $linkPrice
+     * @param $linkId
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getLinkMock($linkPrice, $linkId)
     {
         $linkMock = $this->createPartialMock(\Magento\Downloadable\Model\Link::class, ['getPrice',
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php
index df1f127fae313..281fb571ff56f 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php
@@ -59,11 +59,6 @@ class UploadTest extends \PHPUnit\Framework\TestCase
      */
     protected $fileHelper;
 
-    /**
-     * @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Session
-     */
-    protected $session;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Controller\ResultFactory
      */
@@ -81,9 +76,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->session = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->resultFactory = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -108,9 +100,6 @@ protected function setUp()
         $this->context->expects($this->any())
             ->method('getRequest')
             ->will($this->returnValue($this->request));
-        $this->context->expects($this->any())
-            ->method('getSession')
-            ->will($this->returnValue($this->session));
         $this->context->expects($this->any())
             ->method('getResultFactory')
             ->will($this->returnValue($this->resultFactory));
@@ -154,11 +143,6 @@ public function testExecute()
         $this->uploaderFactory->expects($this->once())->method('create')->willReturn($uploader);
         $this->fileHelper->expects($this->once())->method('uploadFromTmp')->willReturn($data);
         $this->storageDatabase->expects($this->once())->method('saveFile');
-        $this->session->expects($this->once())->method('getName')->willReturn('Name');
-        $this->session->expects($this->once())->method('getSessionId')->willReturn('SessionId');
-        $this->session->expects($this->once())->method('getCookieLifetime')->willReturn('CookieLifetime');
-        $this->session->expects($this->once())->method('getCookiePath')->willReturn('CookiePath');
-        $this->session->expects($this->once())->method('getCookieDomain')->willReturn('CookieDomain');
         $this->resultFactory->expects($this->once())->method('create')->willReturn($resultJson);
         $resultJson->expects($this->once())->method('setData')->willReturnSelf();
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php
index e125ddee9c5d8..aa8b774ab5511 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php
@@ -22,7 +22,7 @@ class LinkTest extends \PHPUnit\Framework\TestCase
     protected $request;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface
+     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $response;
 
@@ -109,6 +109,8 @@ protected function setUp()
      */
     public function testExecuteFile($fileType)
     {
+        $fileSize = 58493;
+        $fileName = 'link.jpg';
         $this->request->expects($this->at(0))->method('getParam')->with('id', 0)
             ->will($this->returnValue(1));
         $this->request->expects($this->at(1))->method('getParam')->with('type', 0)
@@ -117,7 +119,20 @@ public function testExecuteFile($fileType)
             ->will($this->returnSelf());
         $this->response->expects($this->once())->method('clearBody')
             ->will($this->returnSelf());
-        $this->response->expects($this->any())->method('setHeader')
+        $this->response
+            ->expects($this->any())
+            ->method('setHeader')
+            ->withConsecutive(
+                ['Pragma', 'public', true],
+                [
+                    'Cache-Control',
+                    'must-revalidate, post-check=0, pre-check=0',
+                    true,
+                ],
+                ['Content-type', 'text/html'],
+                ['Content-Length', $fileSize],
+                ['Content-Disposition', 'attachment; filename=' . $fileName]
+            )
             ->will($this->returnSelf());
         $this->response->expects($this->once())->method('sendHeaders')
             ->will($this->returnSelf());
@@ -132,13 +147,13 @@ public function testExecuteFile($fileType)
         $this->downloadHelper->expects($this->once())->method('setResource')
             ->will($this->returnSelf());
         $this->downloadHelper->expects($this->once())->method('getFilename')
-            ->will($this->returnValue('link.jpg'));
+            ->will($this->returnValue($fileName));
         $this->downloadHelper->expects($this->once())->method('getContentType')
-            ->will($this->returnSelf('file'));
+            ->willReturn('text/html');
         $this->downloadHelper->expects($this->once())->method('getFileSize')
-            ->will($this->returnValue(null));
+            ->will($this->returnValue($fileSize));
         $this->downloadHelper->expects($this->once())->method('getContentDisposition')
-            ->will($this->returnValue(null));
+            ->will($this->returnValue('inline'));
         $this->downloadHelper->expects($this->once())->method('output')
             ->will($this->returnSelf());
         $this->linkModel->expects($this->once())->method('load')
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php
index 3b3683c6af3e7..25a5d86b0385c 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php
@@ -99,6 +99,9 @@ public function testAfterInitializeWithNoDataToSave($downloadable)
         $this->downloadablePlugin->afterInitialize($this->subjectMock, $this->productMock);
     }
 
+    /**
+     * @return array
+     */
     public function afterInitializeWithEmptyDataDataProvider()
     {
         return [
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
index 3e1255766f1f9..7e756c1790a26 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
@@ -273,7 +273,13 @@ public function testGetLinkForWrongCustomer()
         $this->assertEquals($this->response, $this->link->execute());
     }
 
-    public function testExceptionInUpdateLinkStatus()
+    /**
+     * @param string $mimeType
+     * @param string $disposition
+     * @dataProvider downloadTypesDataProvider
+     * @return void
+     */
+    public function testExceptionInUpdateLinkStatus($mimeType, $disposition)
     {
         $this->objectManager->expects($this->at(0))
             ->method('get')
@@ -303,7 +309,7 @@ public function testExceptionInUpdateLinkStatus()
         $this->linkPurchasedItem->expects($this->once())->method('getLinkType')->willReturn('url');
         $this->linkPurchasedItem->expects($this->once())->method('getLinkUrl')->willReturn('link_url');
 
-        $this->processDownload('link_url', 'url');
+        $this->processDownload('link_url', 'url', $mimeType, $disposition);
 
         $this->linkPurchasedItem->expects($this->any())->method('setNumberOfDownloadsUsed')->willReturnSelf();
         $this->linkPurchasedItem->expects($this->any())->method('setStatus')->with('expired')->willReturnSelf();
@@ -317,8 +323,18 @@ public function testExceptionInUpdateLinkStatus()
         $this->assertEquals($this->response, $this->link->execute());
     }
 
-    private function processDownload($resource, $resourceType)
+    /**
+     * @param string $resource
+     * @param string $resourceType
+     * @param string $mimeType
+     * @param string $disposition
+     * @return void
+     */
+    private function processDownload($resource, $resourceType, $mimeType, $disposition)
     {
+        $fileSize = 58493;
+        $fileName = 'link.jpg';
+
         $this->objectManager->expects($this->at(3))
             ->method('get')
             ->with(\Magento\Downloadable\Helper\Download::class)
@@ -327,30 +343,23 @@ private function processDownload($resource, $resourceType)
             ->method('setResource')
             ->with($resource, $resourceType)
             ->willReturnSelf();
-        $this->downloadHelper->expects($this->once())->method('getFilename')->willReturn('file_name');
-        $this->downloadHelper->expects($this->once())->method('getContentType')->willReturn('content_type');
+        $this->downloadHelper->expects($this->once())->method('getFilename')->willReturn($fileName);
+        $this->downloadHelper->expects($this->once())->method('getContentType')->willReturn($mimeType);
         $this->response->expects($this->once())->method('setHttpResponseCode')->with(200)->willReturnSelf();
-        $this->response->expects($this->at(1))->method('setHeader')->with('Pragma', 'public', true)->willReturnSelf();
-        $this->response->expects($this->at(2))
-            ->method('setHeader')
-            ->with('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
-            ->willReturnSelf();
-        $this->response->expects($this->at(3))
+        $this->response
+            ->expects($this->any())
             ->method('setHeader')
-            ->with('Content-type', 'content_type', true)
-            ->willReturnSelf();
-        $this->downloadHelper->expects($this->once())->method('getFileSize')->willReturn('file_size');
-        $this->response->expects($this->at(4))
-            ->method('setHeader')
-            ->with('Content-Length', 'file_size')
-            ->willReturnSelf();
-        $this->downloadHelper->expects($this->once())
-            ->method('getContentDisposition')
-            ->willReturn('content_disposition');
-        $this->response->expects($this->at(5))
-            ->method('setHeader')
-            ->with('Content-Disposition', 'content_disposition; filename=file_name')
+            ->withConsecutive(
+                ['Pragma', 'public', true],
+                ['Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true],
+                ['Content-type', $mimeType, true],
+                ['Content-Length', $fileSize],
+                ['Content-Disposition', $disposition . '; filename=' . $fileName]
+            )
             ->willReturnSelf();
+
+        $this->downloadHelper->expects($this->once())->method('getContentDisposition')->willReturn($disposition);
+        $this->downloadHelper->expects($this->once())->method('getFileSize')->willReturn($fileSize);
         $this->response->expects($this->once())->method('clearBody')->willReturnSelf();
         $this->response->expects($this->once())->method('sendHeaders')->willReturnSelf();
         $this->downloadHelper->expects($this->once())->method('output');
@@ -394,6 +403,76 @@ public function testLinkNotAvailable($messageType, $status, $notice)
         $this->assertEquals($this->response, $this->link->execute());
     }
 
+    /**
+     * @param string $mimeType
+     * @param string $disposition
+     * @dataProvider downloadTypesDataProvider
+     * @return void
+     */
+    public function testContentDisposition($mimeType, $disposition)
+    {
+        $this->objectManager->expects($this->any())
+            ->method('get')
+            ->willReturnMap([
+                [
+                    \Magento\Customer\Model\Session::class,
+                    $this->session,
+                ],
+                [
+                    \Magento\Downloadable\Helper\Data::class,
+                    $this->helperData,
+                ],
+                [
+                    \Magento\Downloadable\Helper\Download::class,
+                    $this->downloadHelper,
+                ],
+            ]);
+        
+        $this->request->expects($this->once())->method('getParam')->with('id', 0)->willReturn('some_id');
+        $this->objectManager->expects($this->at(1))
+            ->method('create')
+            ->with(\Magento\Downloadable\Model\Link\Purchased\Item::class)
+            ->willReturn($this->linkPurchasedItem);
+        $this->linkPurchasedItem->expects($this->once())
+            ->method('load')
+            ->with('some_id', 'link_hash')
+            ->willReturnSelf();
+        $this->linkPurchasedItem->expects($this->once())->method('getId')->willReturn(5);
+        $this->helperData->expects($this->once())
+            ->method('getIsShareable')
+            ->with($this->linkPurchasedItem)
+            ->willReturn(true);
+        $this->linkPurchasedItem->expects($this->any())->method('getNumberOfDownloadsBought')->willReturn(10);
+        $this->linkPurchasedItem->expects($this->any())->method('getNumberOfDownloadsUsed')->willReturn(9);
+        $this->linkPurchasedItem->expects($this->once())->method('getStatus')->willReturn('available');
+        $this->linkPurchasedItem->expects($this->once())->method('getLinkType')->willReturn('url');
+        $this->linkPurchasedItem->expects($this->once())->method('getLinkUrl')->willReturn('link_url');
+
+        $fileSize = 58493;
+        $fileName = 'link.jpg';
+
+        $this->downloadHelper->expects($this->once())
+            ->method('setResource')
+            ->with('link_url', 'url')
+            ->willReturnSelf();
+        $this->downloadHelper->expects($this->once())->method('getFilename')->willReturn($fileName);
+        $this->downloadHelper->expects($this->once())->method('getContentType')->willReturn($mimeType);
+        $this->response->expects($this->once())->method('setHttpResponseCode')->with(200)->willReturnSelf();
+        $this->response
+            ->expects($this->any())
+            ->method('setHeader')
+            ->withConsecutive(
+                ['Pragma', 'public', true],
+                ['Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true],
+                ['Content-type', $mimeType, true],
+                ['Content-Length', $fileSize],
+                ['Content-Disposition', $disposition . '; filename=' . $fileName]
+            )
+            ->willReturnSelf();
+
+        $this->assertEquals($this->response, $this->link->execute());
+    }
+
     /**
      * @return array
      */
@@ -406,4 +485,15 @@ public function linkNotAvailableDataProvider()
             ['addError', 'wrong_status', 'Something went wrong while getting the requested content.']
         ];
     }
+
+    /**
+     * @return array
+     */
+    public function downloadTypesDataProvider()
+    {
+        return [
+            ['mimeType' => 'text/html',  'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT],
+            ['mimeType' => 'image/jpeg', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_INLINE],
+        ];
+    }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
index 3142900613296..9551cfe982bd5 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
@@ -89,7 +89,7 @@ public function testSetResourceInvalidPath()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @exectedExceptionMessage Please set resource file and link type.
+     * @expectedExceptionMessage Please set resource file and link type.
      */
     public function testGetFileSizeNoResource()
     {
@@ -102,7 +102,7 @@ public function testGetFileSizeNoResource()
      */
     public function testGetFileSizeInvalidLinkType()
     {
-        $this->_helper->setResource(self::FILE_PATH, 'invalid link type');
+        $this->_helper->setResource(self::FILE_PATH, 'The link type is invalid. Verify and try again.');
         $this->_helper->getFileSize();
     }
 
@@ -155,6 +155,9 @@ public function testGetContentTypeThroughHelper($functionExistsResult, $mimeCont
         $this->assertEquals(self::MIME_TYPE, $this->_helper->getContentType());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestGetContentTypeThroughHelper()
     {
         return [[false, ''], [true, false]];
@@ -187,6 +190,11 @@ public function testGetFileNameUrlWithContentDisposition()
         $this->assertEquals($fileName, $this->_helper->getFilename());
     }
 
+    /**
+     * @param bool $doesExist
+     * @param int $size
+     * @param string $path
+     */
     protected function _setupFileMocks($doesExist = true, $size = self::FILE_SIZE, $path = self::FILE_PATH)
     {
         $this->_handleMock->expects($this->any())->method('stat')->will($this->returnValue(['size' => $size]));
@@ -199,6 +207,11 @@ protected function _setupFileMocks($doesExist = true, $size = self::FILE_SIZE, $
         $this->_helper->setResource($path, DownloadHelper::LINK_TYPE_FILE);
     }
 
+    /**
+     * @param int $size
+     * @param string $url
+     * @param array $additionalStatData
+     */
     protected function _setupUrlMocks($size = self::FILE_SIZE, $url = self::URL, $additionalStatData = [])
     {
         $this->_handleMock->expects(
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php
index d835f25523353..821f251929f8b 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Test\Unit\Model;
 
 use Magento\Downloadable\Model\LinkRepository;
@@ -259,7 +260,7 @@ public function testCreate()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Link title cannot be empty.
+     * @expectedExceptionMessage The link title is empty. Enter the link title and try again.
      */
     public function testCreateThrowsExceptionIfTitleIsEmpty()
     {
@@ -421,7 +422,7 @@ public function testUpdateWithExistingFile()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Link title cannot be empty.
+     * @expectedExceptionMessage The link title is empty. Enter the link title and try again.
      */
     public function testUpdateThrowsExceptionIfTitleIsEmptyAndScopeIsGlobal()
     {
@@ -469,7 +470,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no downloadable link with provided ID.
+     * @expectedExceptionMessage No downloadable link with the provided ID was found. Verify the ID and try again.
      */
     public function testDeleteThrowsExceptionIfLinkIdIsNotValid()
     {
@@ -539,6 +540,10 @@ public function testGetList()
         $this->assertEquals([$linkInterfaceMock], $this->service->getList($productSku));
     }
 
+    /**
+     * @param $resource
+     * @param $inputData
+     */
     protected function setLinkAssertions($resource, $inputData)
     {
         $resource->expects($this->any())->method('getId')->will($this->returnValue($inputData['id']));
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php
index 79a314cee5423..8e13bd83b039e 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Test\Unit\Model;
 
 use Magento\Downloadable\Model\SampleRepository;
@@ -206,7 +207,7 @@ public function testCreate()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Sample title cannot be empty.
+     * @expectedExceptionMessage The sample title is empty. Enter the title and try again.
      */
     public function testCreateThrowsExceptionIfTitleIsEmpty()
     {
@@ -341,7 +342,7 @@ public function testUpdateWithExistingFile()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Sample title cannot be empty.
+     * @expectedExceptionMessage The sample title is empty. Enter the title and try again.
      */
     public function testUpdateThrowsExceptionIfTitleIsEmptyAndScopeIsGlobal()
     {
@@ -388,7 +389,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no downloadable sample with provided ID.
+     * @expectedExceptionMessage No downloadable sample with the provided ID was found. Verify the ID and try again.
      */
     public function testDeleteThrowsExceptionIfSampleIdIsNotValid()
     {
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
index 5a138d83d2673..e63ce2437035b 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
@@ -104,6 +104,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function setLinkStatusPendingDataProvider()
     {
         return [
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
index 155f95874eeeb..5b04c83f4ffb7 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
@@ -156,7 +156,7 @@ protected function canShowDownloadablePanel($typeId)
      */
     protected function initModifiers()
     {
-        $this->modifierMock = $this->getMockBuilder(\StdClass::class)
+        $this->modifierMock = $this->getMockBuilder(\stdClass::class)
             ->setMethods(['modifyData', 'modifyMeta'])
             ->getMock();
         $this->modifierFactoryMock->expects($this->once())
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
index dd8e8ff38e931..93e691c931603 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
@@ -98,8 +98,8 @@ protected function setUp()
     /**
      * @param int|null $id
      * @param string $typeId
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetTitle
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetTitle
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetValue
      * @return void
      * @dataProvider getLinksTitleDataProvider
      */
diff --git a/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php b/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php
index 467e1f428206b..e634f0ffa341d 100644
--- a/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php
+++ b/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php
@@ -7,11 +7,17 @@
 
 use Magento\Downloadable\Test\Unit\Helper\DownloadTest;
 
+/**
+ * @return bool
+ */
 function function_exists()
 {
     return DownloadTest::$functionExists;
 }
 
+/**
+ * @return string
+ */
 function mime_content_type()
 {
     return DownloadTest::$mimeContentType;
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
index 2ed8ed8893dfb..a352c4bdf7bc3 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -230,6 +230,7 @@ protected function getTitleColumn()
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => __('Title'),
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $titleField['arguments']['data']['config'] = [
@@ -255,6 +256,7 @@ protected function getPriceColumn()
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => __('Price'),
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $priceField['arguments']['data']['config'] = [
@@ -288,6 +290,7 @@ protected function getFileColumn()
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => __('File'),
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $fileTypeField['arguments']['data']['config'] = [
@@ -350,6 +353,7 @@ protected function getSampleColumn()
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => __('Sample'),
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $sampleTypeField['arguments']['data']['config'] = [
@@ -425,6 +429,7 @@ protected function getMaxDownloadsColumn()
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => __('Max. Downloads'),
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $numberOfDownloadsField['arguments']['data']['config'] = [
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
index 178420c62a020..1587163ba8121 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -200,6 +200,7 @@ protected function getTitleColumn()
             'componentType' => Container::NAME,
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
+            'showLabel' => false,
             'label' => __('Title'),
             'dataScope' => '',
         ];
@@ -226,6 +227,7 @@ protected function getSampleColumn()
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => __('File'),
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $sampleType['arguments']['data']['config'] = [
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 99aee584e103b..88658b8644cad 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -5,30 +5,29 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-gift-message": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-downloadable-sample-data": "Sample Data version:100.3.*"
+        "magento/module-downloadable-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Downloadable/etc/db_schema.xml b/app/code/Magento/Downloadable/etc/db_schema.xml
new file mode 100644
index 0000000000000..89d47644661a5
--- /dev/null
+++ b/app/code/Magento/Downloadable/etc/db_schema.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="downloadable_link" resource="default" engine="innodb" comment="Downloadable Link Table">
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Link ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort order"/>
+        <column xsi:type="int" name="number_of_downloads" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Number of downloads"/>
+        <column xsi:type="smallint" name="is_shareable" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Shareable flag"/>
+        <column xsi:type="varchar" name="link_url" nullable="true" length="255" comment="Link Url"/>
+        <column xsi:type="varchar" name="link_file" nullable="true" length="255" comment="Link File"/>
+        <column xsi:type="varchar" name="link_type" nullable="true" length="20" comment="Link Type"/>
+        <column xsi:type="varchar" name="sample_url" nullable="true" length="255" comment="Sample Url"/>
+        <column xsi:type="varchar" name="sample_file" nullable="true" length="255" comment="Sample File"/>
+        <column xsi:type="varchar" name="sample_type" nullable="true" length="20" comment="Sample Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="link_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="downloadable_link" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="DOWNLOADABLE_LINK_PRODUCT_ID_SORT_ORDER" indexType="btree">
+            <column name="product_id"/>
+            <column name="sort_order"/>
+        </index>
+    </table>
+    <table name="downloadable_link_price" resource="default" engine="innodb" comment="Downloadable Link Price Table">
+        <column xsi:type="int" name="price_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Price ID"/>
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Link ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website ID"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="price_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PRICE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID"
+                    table="downloadable_link_price" column="link_id" referenceTable="downloadable_link"
+                    referenceColumn="link_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="downloadable_link_price" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="DOWNLOADABLE_LINK_PRICE_LINK_ID" indexType="btree">
+            <column name="link_id"/>
+        </index>
+        <index referenceId="DOWNLOADABLE_LINK_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="downloadable_link_purchased" resource="default" engine="innodb"
+           comment="Downloadable Link Purchased Table">
+        <column xsi:type="int" name="purchased_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Purchased ID"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="true" identity="false" default="0"
+                comment="Order ID"/>
+        <column xsi:type="varchar" name="order_increment_id" nullable="true" length="50" comment="Order Increment ID"/>
+        <column xsi:type="int" name="order_item_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Order Item ID"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Date of creation"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Date of modification"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Customer ID"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product name"/>
+        <column xsi:type="varchar" name="product_sku" nullable="true" length="255" comment="Product sku"/>
+        <column xsi:type="varchar" name="link_section_title" nullable="true" length="255" comment="Link_section_title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="purchased_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DL_LNK_PURCHASED_CSTR_ID_CSTR_ENTT_ENTT_ID"
+                    table="downloadable_link_purchased" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_PURCHASED_ORDER_ID_SALES_ORDER_ENTITY_ID"
+                    table="downloadable_link_purchased" column="order_id" referenceTable="sales_order"
+                    referenceColumn="entity_id" onDelete="SET NULL"/>
+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ORDER_ITEM_ID" indexType="btree">
+            <column name="order_item_id"/>
+        </index>
+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+    </table>
+    <table name="downloadable_link_purchased_item" resource="default" engine="innodb"
+           comment="Downloadable Link Purchased Item Table">
+        <column xsi:type="int" name="item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Item ID"/>
+        <column xsi:type="int" name="purchased_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Purchased ID"/>
+        <column xsi:type="int" name="order_item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Order Item ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="varchar" name="link_hash" nullable="true" length="255" comment="Link hash"/>
+        <column xsi:type="int" name="number_of_downloads_bought" padding="10" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Number of downloads bought"/>
+        <column xsi:type="int" name="number_of_downloads_used" padding="10" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Number of downloads used"/>
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Link ID"/>
+        <column xsi:type="varchar" name="link_title" nullable="true" length="255" comment="Link Title"/>
+        <column xsi:type="smallint" name="is_shareable" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Shareable Flag"/>
+        <column xsi:type="varchar" name="link_url" nullable="true" length="255" comment="Link Url"/>
+        <column xsi:type="varchar" name="link_file" nullable="true" length="255" comment="Link File"/>
+        <column xsi:type="varchar" name="link_type" nullable="true" length="255" comment="Link Type"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="50" comment="Status"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Creation Time"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Update Time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DL_LNK_PURCHASED_ITEM_PURCHASED_ID_DL_LNK_PURCHASED_PURCHASED_ID"
+                    table="downloadable_link_purchased_item" column="purchased_id"
+                    referenceTable="downloadable_link_purchased" referenceColumn="purchased_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="DL_LNK_PURCHASED_ITEM_ORDER_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
+                    table="downloadable_link_purchased_item" column="order_item_id" referenceTable="sales_order_item"
+                    referenceColumn="item_id" onDelete="SET NULL"/>
+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ITEM_LINK_HASH" indexType="btree">
+            <column name="link_hash"/>
+        </index>
+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ITEM_ORDER_ITEM_ID" indexType="btree">
+            <column name="order_item_id"/>
+        </index>
+        <index referenceId="DOWNLOADABLE_LINK_PURCHASED_ITEM_PURCHASED_ID" indexType="btree">
+            <column name="purchased_id"/>
+        </index>
+    </table>
+    <table name="downloadable_link_title" resource="default" engine="innodb" comment="Link Title Table">
+        <column xsi:type="int" name="title_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Title ID"/>
+        <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Link ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="title_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_TITLE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID"
+                    table="downloadable_link_title" column="link_id" referenceTable="downloadable_link"
+                    referenceColumn="link_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_LINK_TITLE_STORE_ID_STORE_STORE_ID"
+                    table="downloadable_link_title" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="DOWNLOADABLE_LINK_TITLE_LINK_ID_STORE_ID">
+            <column name="link_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="DOWNLOADABLE_LINK_TITLE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="downloadable_sample" resource="default" engine="innodb" comment="Downloadable Sample Table">
+        <column xsi:type="int" name="sample_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Sample ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="varchar" name="sample_url" nullable="true" length="255" comment="Sample URL"/>
+        <column xsi:type="varchar" name="sample_file" nullable="true" length="255" comment="Sample file"/>
+        <column xsi:type="varchar" name="sample_type" nullable="true" length="20" comment="Sample Type"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="sample_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_SAMPLE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="downloadable_sample" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="DOWNLOADABLE_SAMPLE_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="downloadable_sample_title" resource="default" engine="innodb"
+           comment="Downloadable Sample Title Table">
+        <column xsi:type="int" name="title_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Title ID"/>
+        <column xsi:type="int" name="sample_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sample ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="title_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DL_SAMPLE_TTL_SAMPLE_ID_DL_SAMPLE_SAMPLE_ID"
+                    table="downloadable_sample_title" column="sample_id" referenceTable="downloadable_sample"
+                    referenceColumn="sample_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="DOWNLOADABLE_SAMPLE_TITLE_STORE_ID_STORE_STORE_ID"
+                    table="downloadable_sample_title" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="DOWNLOADABLE_SAMPLE_TITLE_SAMPLE_ID_STORE_ID">
+            <column name="sample_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="DOWNLOADABLE_SAMPLE_TITLE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="catalog_product_index_price_downlod_idx" resource="default" engine="innodb"
+           comment="Indexer Table for price of downloadable products">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Minimum price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Maximum price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+    <table name="catalog_product_index_price_downlod_tmp" resource="default" engine="memory"
+           comment="Temporary Indexer Table for price of downloadable products">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
+                identity="false"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website ID"/>
+        <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Minimum price"/>
+        <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Maximum price"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Downloadable/etc/db_schema_whitelist.json b/app/code/Magento/Downloadable/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..61b7d439a4cd4
--- /dev/null
+++ b/app/code/Magento/Downloadable/etc/db_schema_whitelist.json
@@ -0,0 +1,170 @@
+{
+    "downloadable_link": {
+        "column": {
+            "link_id": true,
+            "product_id": true,
+            "sort_order": true,
+            "number_of_downloads": true,
+            "is_shareable": true,
+            "link_url": true,
+            "link_file": true,
+            "link_type": true,
+            "sample_url": true,
+            "sample_file": true,
+            "sample_type": true
+        },
+        "index": {
+            "DOWNLOADABLE_LINK_PRODUCT_ID_SORT_ORDER": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DOWNLOADABLE_LINK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true
+        }
+    },
+    "downloadable_link_price": {
+        "column": {
+            "price_id": true,
+            "link_id": true,
+            "website_id": true,
+            "price": true
+        },
+        "index": {
+            "DOWNLOADABLE_LINK_PRICE_LINK_ID": true,
+            "DOWNLOADABLE_LINK_PRICE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DOWNLOADABLE_LINK_PRICE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID": true,
+            "DOWNLOADABLE_LINK_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "downloadable_link_purchased": {
+        "column": {
+            "purchased_id": true,
+            "order_id": true,
+            "order_increment_id": true,
+            "order_item_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "customer_id": true,
+            "product_name": true,
+            "product_sku": true,
+            "link_section_title": true
+        },
+        "index": {
+            "DOWNLOADABLE_LINK_PURCHASED_ORDER_ID": true,
+            "DOWNLOADABLE_LINK_PURCHASED_ORDER_ITEM_ID": true,
+            "DOWNLOADABLE_LINK_PURCHASED_CUSTOMER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DL_LNK_PURCHASED_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
+            "DOWNLOADABLE_LINK_PURCHASED_ORDER_ID_SALES_ORDER_ENTITY_ID": true
+        }
+    },
+    "downloadable_link_purchased_item": {
+        "column": {
+            "item_id": true,
+            "purchased_id": true,
+            "order_item_id": true,
+            "product_id": true,
+            "link_hash": true,
+            "number_of_downloads_bought": true,
+            "number_of_downloads_used": true,
+            "link_id": true,
+            "link_title": true,
+            "is_shareable": true,
+            "link_url": true,
+            "link_file": true,
+            "link_type": true,
+            "status": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "DOWNLOADABLE_LINK_PURCHASED_ITEM_LINK_HASH": true,
+            "DOWNLOADABLE_LINK_PURCHASED_ITEM_ORDER_ITEM_ID": true,
+            "DOWNLOADABLE_LINK_PURCHASED_ITEM_PURCHASED_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DL_LNK_PURCHASED_ITEM_PURCHASED_ID_DL_LNK_PURCHASED_PURCHASED_ID": true,
+            "DL_LNK_PURCHASED_ITEM_ORDER_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID": true
+        }
+    },
+    "downloadable_link_title": {
+        "column": {
+            "title_id": true,
+            "link_id": true,
+            "store_id": true,
+            "title": true
+        },
+        "index": {
+            "DOWNLOADABLE_LINK_TITLE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DOWNLOADABLE_LINK_TITLE_LINK_ID_DOWNLOADABLE_LINK_LINK_ID": true,
+            "DOWNLOADABLE_LINK_TITLE_STORE_ID_STORE_STORE_ID": true,
+            "DOWNLOADABLE_LINK_TITLE_LINK_ID_STORE_ID": true
+        }
+    },
+    "downloadable_sample": {
+        "column": {
+            "sample_id": true,
+            "product_id": true,
+            "sample_url": true,
+            "sample_file": true,
+            "sample_type": true,
+            "sort_order": true
+        },
+        "index": {
+            "DOWNLOADABLE_SAMPLE_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DOWNLOADABLE_SAMPLE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true
+        }
+    },
+    "downloadable_sample_title": {
+        "column": {
+            "title_id": true,
+            "sample_id": true,
+            "store_id": true,
+            "title": true
+        },
+        "index": {
+            "DOWNLOADABLE_SAMPLE_TITLE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DL_SAMPLE_TTL_SAMPLE_ID_DL_SAMPLE_SAMPLE_ID": true,
+            "DOWNLOADABLE_SAMPLE_TITLE_STORE_ID_STORE_STORE_ID": true,
+            "DOWNLOADABLE_SAMPLE_TITLE_SAMPLE_ID_STORE_ID": true
+        }
+    },
+    "catalog_product_index_price_downlod_idx": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true,
+            "max_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "catalog_product_index_price_downlod_tmp": {
+        "column": {
+            "entity_id": true,
+            "customer_group_id": true,
+            "website_id": true,
+            "min_price": true,
+            "max_price": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/etc/di.xml b/app/code/Magento/Downloadable/etc/di.xml
index 932e48e880880..4e9b0b55afb0b 100644
--- a/app/code/Magento/Downloadable/etc/di.xml
+++ b/app/code/Magento/Downloadable/etc/di.xml
@@ -77,6 +77,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Order\ProductOption">
+        <arguments>
+            <argument name="processorPool" xsi:type="array">
+                <item name="downloadable" xsi:type="object">Magento\Downloadable\Model\ProductOptionProcessor</item>
+            </argument>
+        </arguments>
+    </type>
     <preference for="Magento\Downloadable\Api\LinkRepositoryInterface" type="Magento\Downloadable\Model\LinkRepository" />
     <preference for="Magento\Downloadable\Api\SampleRepositoryInterface" type="Magento\Downloadable\Model\SampleRepository" />
     <preference for="Magento\Downloadable\Api\Data\LinkInterface" type="Magento\Downloadable\Model\Link" />
diff --git a/app/code/Magento/Downloadable/etc/events.xml b/app/code/Magento/Downloadable/etc/events.xml
index e4f03ff238d4a..5a985fc33802e 100644
--- a/app/code/Magento/Downloadable/etc/events.xml
+++ b/app/code/Magento/Downloadable/etc/events.xml
@@ -6,10 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="sales_order_item_save_commit_after">
+    <event name="sales_order_item_save_after">
         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SaveDownloadableOrderItemObserver" />
     </event>
-    <event name="sales_order_save_commit_after">
+    <event name="sales_order_save_after">
         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SetLinkStatusObserver" />
     </event>
     <event name="sales_model_service_quote_submit_success">
diff --git a/app/code/Magento/Downloadable/etc/module.xml b/app/code/Magento/Downloadable/etc/module.xml
index 4c4e165feb014..72aadff621eca 100644
--- a/app/code/Magento/Downloadable/etc/module.xml
+++ b/app/code/Magento/Downloadable/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Downloadable" setup_version="2.0.2">
+    <module name="Magento_Downloadable" >
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index 2515e5e339366..3ec6010218fb6 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -21,7 +21,7 @@
     <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
         <label class="admin__field-label" for="downloadable_links_title"><span><?= /* @escapeNotVerified */ __('Title') ?></span></label>
         <div class="admin__field-control">
-            <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= /* @escapeNotVerified */ $block->getLinksTitle() ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
+            <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= $block->escapeHtml($block->getLinksTitle()) ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
                 <div class="admin__field admin__field-option">
                     <input id="link_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
@@ -158,9 +158,9 @@ require([
                         '<div id="downloadable_link_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
                             '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
-                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= /* @escapeNotVerified */ $block->getFileFieldName('links') ?>">' +
+                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('links')) ?>">' +
                             '<script>' +
-                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= /* @escapeNotVerified */ $block->getUploadUrl('links') ?>"); ' +
+                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= $block->escapeUrl($block->getUploadUrl('links')) ?>"); ' +
                             '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
@@ -184,9 +184,9 @@ require([
                         '<div id="downloadable_link_<%- data.id %>_sample_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
                         '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
-                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= /* @escapeNotVerified */ $block->getFileFieldName('link_samples') ?>">' +
+                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('link_samples'), '"') ?>">' +
                         '<script>'+
-                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= /* @escapeNotVerified */ $block->getUploadUrl('link_samples') ?>"); ' +
+                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= $block->escapeUrl($block->getUploadUrl('link_samples')) ?>"); ' +
                         '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index af4dee226f38b..3645a184df216 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -21,7 +21,7 @@ $block->getConfigJson();
     <div class="admin__field"<?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
         <label class="admin__field-label" for="downloadable_samples_title"><span><?= /* @noEscape */ __('Title') ?></span></label>
         <div class="admin__field-control">
-            <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= /* @noEscape */ $block->getSamplesTitle() ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
+            <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= $block->escapeHtml($block->getSamplesTitle()) ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
                 <div class="admin__field admin__field-option">
                     <input id="sample_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= /* @noEscape */ $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
@@ -93,7 +93,7 @@ require([
                         '<div id="downloadable_sample_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button">'+
                             '<span><?= /* @noEscape */ __('Browse Files...') ?></span>' +
-                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= /* @noEscape */ $block->getConfig()->getUrl() ?>">' +
+                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= $block->escapeHtml($block->getConfig()->getUrl()) ?>">' +
                             '<script>' +
                             '/*<![CDATA[*/' +
                                 'sampleUploader("#downloadable_sample_<%- data.id %>_file"); ' +
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index 8cc135334583f..7438275bf5874 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -14,7 +14,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?= /* @escapeNotVerified */ $_option['label'] ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= /* @escapeNotVerified */ $_option['value'] ?>
@@ -39,7 +39,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+            <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?></dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index ef7e7627b7a9c..b00c4b4b45392 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -14,7 +14,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?= /* @escapeNotVerified */ $_option['label'] ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= /* @escapeNotVerified */ $_option['value'] ?>
@@ -39,7 +39,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+            <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 5462008aab385..9e6a73263bf25 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -17,7 +17,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= /* @escapeNotVerified */ $_option['value'] ?>
@@ -42,7 +42,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?>:</dt>
+            <dt><?= $block->escapeHtml($block->getLinksTitle()) ?>:</dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
index 59d0558decd16..f615966d801f7 100644
--- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            downloadable: 'Magento_Downloadable/downloadable'
+            downloadable: 'Magento_Downloadable/js/downloadable',
+            'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
         }
     }
 };
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index fbc673ef910fb..5548279a1118b 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -13,9 +13,9 @@
     <?php $_links = $block->getLinks(); ?>
     <?php $_linksLength = 0; ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <legend class="legend links-title"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></legend><br>
+    <legend class="legend links-title"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></legend><br>
     <div class="field downloads<?php if ($_isRequired) echo ' required' ?><?php if (!$_linksPurchasedSeparately) echo ' downloads-no-separately' ?>">
-        <label class="label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
+        <label class="label"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></label>
         <div class="control" id="downloadable-links-list"
              data-mage-init='{"downloadable":{
                  "linkElement":"input:checkbox[value]",
@@ -37,7 +37,7 @@
                         <span><?= $block->escapeHtml($_link->getTitle()) ?></span>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
                             <a class="sample link"
-                               href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
+                               href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
                                 <?= /* @escapeNotVerified */ __('sample') ?>
                             </a>
                         <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
index 4371ffdfc2956..c6b2281196e69 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
@@ -15,11 +15,11 @@
 
 <?php if ($block->hasSamples()): ?>
     <dl class="items samples">
-        <dt class="item-title samples-item-title"><?= /* @escapeNotVerified */ $block->getSamplesTitle() ?></dt>
+        <dt class="item-title samples-item-title"><?= $block->escapeHtml($block->getSamplesTitle()) ?></dt>
         <?php $_samples = $block->getSamples() ?>
         <?php foreach ($_samples as $_sample): ?>
             <dd class="item samples-item">
-                <a href="<?= /* @escapeNotVerified */ $block->getSampleUrl($_sample) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
+                <a href="<?= $block->escapeHtml($block->getSampleUrl($_sample)) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
                    class="item-link samples-item-link">
                     <?= $block->escapeHtml($_sample->getTitle()) ?>
                 </a>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index 278374969e08a..49422e4d2e483 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -39,7 +39,7 @@
         <?php /* downloadable */?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
index 0cf1bf8469860..202f123a331b0 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
@@ -39,7 +39,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
index 40d965e5304ab..c10bb0db591b4 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
@@ -40,7 +40,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
similarity index 100%
rename from app/code/Magento/Downloadable/view/frontend/web/downloadable.js
rename to app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
diff --git a/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php
new file mode 100644
index 0000000000000..59c007d910764
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class DownloadableProductTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['type_id']) && $data['type_id'] == 'downloadable') {
+            return 'DownloadableProduct';
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php b/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php
new file mode 100644
index 0000000000000..a1e25663a9c3d
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Downloadable\Helper\Data as DownloadableHelper;
+use Magento\Downloadable\Model\Product\Type as Downloadable;
+use Magento\Downloadable\Model\ResourceModel\Link\Collection as LinkCollection;
+use Magento\Downloadable\Model\ResourceModel\Sample\Collection as SampleCollection;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\EnumLookup;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * @inheritdoc
+ *
+ * Format for downloadable product types
+ */
+class DownloadableOptions implements ResolverInterface
+{
+    /**
+     * @var EnumLookup
+     */
+    private $enumLookup;
+
+    /**
+     * @var DownloadableHelper
+     */
+    private $downloadableHelper;
+
+    /**
+     * @var SampleCollection
+     */
+    private $sampleCollection;
+
+    /**
+     * @var LinkCollection
+     */
+    private $linkCollection;
+
+    /**
+     * @param EnumLookup $enumLookup
+     * @param DownloadableHelper $downloadableHelper
+     * @param SampleCollection $sampleCollection
+     * @param LinkCollection $linkCollection
+     */
+    public function __construct(
+        EnumLookup $enumLookup,
+        DownloadableHelper $downloadableHelper,
+        SampleCollection $sampleCollection,
+        LinkCollection $linkCollection
+    ) {
+        $this->enumLookup = $enumLookup;
+        $this->downloadableHelper = $downloadableHelper;
+        $this->sampleCollection = $sampleCollection;
+        $this->linkCollection = $linkCollection;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * Add downloadable options to configurable types
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return null|array
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $data = null;
+        if ($product->getTypeId() === Downloadable::TYPE_DOWNLOADABLE) {
+            if ($field->getName() === 'downloadable_product_links') {
+                $links = $this->linkCollection->addTitleToResult($product->getStoreId())
+                    ->addPriceToResult($product->getStore()->getWebsiteId())
+                    ->addProductToFilter($product->getId());
+                $data = $this->formatLinks(
+                    $links
+                );
+            } elseif ($field->getName() === 'downloadable_product_samples') {
+                $samples = $this->sampleCollection->addTitleToResult($product->getStoreId())
+                    ->addProductToFilter($product->getId());
+                $data = $this->formatSamples(
+                    $samples
+                );
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Format links from collection as array
+     *
+     * @param LinkCollection $links
+     * @return array
+     */
+    private function formatLinks(LinkCollection $links) : array
+    {
+        $resultData = [];
+        foreach ($links as $linkKey => $link) {
+            /** @var \Magento\Downloadable\Model\Link $link */
+            $resultData[$linkKey]['id'] = $link->getId();
+            $resultData[$linkKey]['title'] = $link->getTitle();
+            $resultData[$linkKey]['sort_order'] = $link->getSortOrder();
+            $resultData[$linkKey]['is_shareable'] = $this->downloadableHelper->getIsShareable($link);
+            $resultData[$linkKey]['price'] = $link->getPrice();
+            $resultData[$linkKey]['number_of_downloads'] = $link->getNumberOfDownloads();
+            $sampleType = $link->getSampleType();
+            $linkType = $link->getLinkType();
+
+            if ($linkType !== null) {
+                $resultData[$linkKey]['link_type']
+                    = $this->enumLookup->getEnumValueFromField('DownloadableFileTypeEnum', $linkType);
+            }
+
+            if ($sampleType !== null) {
+                $resultData[$linkKey]['sample_type']
+                    = $this->enumLookup->getEnumValueFromField('DownloadableFileTypeEnum', $sampleType);
+            }
+
+            $resultData[$linkKey]['sample_file'] = $link->getSampleFile();
+            $resultData[$linkKey]['sample_url'] = $link->getSampleUrl();
+        }
+        return $resultData;
+    }
+
+    /**
+     * Format links from collection as array
+     *
+     * @param Collection $samples
+     * @return array
+     */
+    private function formatSamples(Collection $samples) : array
+    {
+        $resultData = [];
+        foreach ($samples as $sampleKey => $sample) {
+            /** @var \Magento\Downloadable\Model\Sample $sample */
+            $resultData[$sampleKey]['id'] = $sample->getId();
+            $resultData[$sampleKey]['title'] = $sample->getTitle();
+            $resultData[$sampleKey]['sort_order'] = $sample->getSortOrder();
+            $resultData[$sampleKey]['sample_type']
+                = $this->enumLookup->getEnumValueFromField('DownloadableFileTypeEnum', $sample->getSampleType());
+            $resultData[$sampleKey]['sample_file'] = $sample->getSampleFile();
+            $resultData[$sampleKey]['sample_url'] = $sample->getSampleUrl();
+        }
+        return $resultData;
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/README.md b/app/code/Magento/DownloadableGraphQl/README.md
new file mode 100644
index 0000000000000..5dd41e9f52c80
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/README.md
@@ -0,0 +1,4 @@
+# DownloadableGraphQl
+
+**DownloadableGraphQl** provides type and resolver information for the GraphQl module
+to generate downloadable product information.
diff --git a/app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md b/app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..621abd2f1cba5
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Downloadable Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Downloadable Graph Ql** module.
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
new file mode 100644
index 0000000000000..5c4613beabc26
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-downloadable-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-catalog": "*",
+        "magento/module-downloadable": "*",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-catalog-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\DownloadableGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..457ace068de11
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
@@ -0,0 +1,35 @@
+<?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\CatalogGraphQl\Model\ProductInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="productTypeNameResolvers" xsi:type="array">
+                <item name="downloadable_product_type_resolver" xsi:type="object">Magento\DownloadableGraphQl\Model\DownloadableProductTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Enum\DefaultDataMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="DownloadableFileTypeEnum" xsi:type="array">
+                    <item name="file" xsi:type="string">file</item>
+                    <item name="url" xsi:type="string">url</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="downloadable" xsi:type="string">DownloadableProduct</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/DownloadableGraphQl/etc/module.xml b/app/code/Magento/DownloadableGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..0431b5cbba9c3
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/etc/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_DownloadableGraphQl" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Downloadable"/>
+            <module name="Magento_GraphQl"/>
+            <module name="Magento_CatalogGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..8e877ffe8360a
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -0,0 +1,36 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type DownloadableProduct implements ProductInterface, CustomizableProductInterface @doc(description: "DownloadableProduct defines a product that the customer downloads") {
+    downloadable_product_samples: [DownloadableProductSamples] @resolver(class: "Magento\\DownloadableGraphQl\\Model\\Resolver\\Product\\DownloadableOptions") @doc(description: "An array containing information about samples of this downloadable product.")
+    downloadable_product_links: [DownloadableProductLinks] @resolver(class: "Magento\\DownloadableGraphQl\\Model\\Resolver\\Product\\DownloadableOptions") @doc(description: "An array containing information about the links for this downloadable product")
+    links_purchased_separately: Int @doc(description: "A value of 1 indicates that each link in the array must be purchased separately")
+    links_title: String @doc(description: "The heading above the list of downloadable products")
+}
+
+enum DownloadableFileTypeEnum @doc(description: "This enumeration specifies whether a link or sample is a file or URL") {
+    FILE
+    URL
+}
+
+type DownloadableProductLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
+    id: Int @doc(description: "The unique ID for the link to the downloadable product")
+    title: String @doc(description: "The display name of the link")
+    sort_order: Int @doc(description: "A number indicating the sort order")
+    is_shareable: Boolean @doc(description: "Indicates whether the link is shareable")
+    price: Float @doc(description: "The price of the downloadable product")
+    number_of_downloads: Int @doc(description: "The maximum number of times the product can be downloaded. A value of 0 means unlimited.")
+    link_type: DownloadableFileTypeEnum @doc(description: "Either FILE or URL")
+    sample_type: DownloadableFileTypeEnum @doc(description: "Either FILE or URL")
+    sample_file: String @doc(description: "The relative path to the downloadable sample")
+    sample_url: String @doc(description: "The relative URL to the downloadable sample")
+}
+
+type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {
+    id: Int @doc(description: "The unique ID for the downloadable product sample")
+    title: String @doc(description: "The display name of the sample")
+    sort_order: Int @doc(description: "A number indicating the sort order")
+    sample_type: DownloadableFileTypeEnum @doc(description: "Either FILE or URL")
+    sample_file: String @doc(description: "The relative path to the downloadable sample")
+    sample_url: String @doc(description: "The relative URL to the downloadable sample")
+}
diff --git a/app/code/Magento/DownloadableGraphQl/registration.php b/app/code/Magento/DownloadableGraphQl/registration.php
new file mode 100644
index 0000000000000..3308d79f92458
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_DownloadableGraphQl', __DIR__);
diff --git a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
index 46081f77cc66a..197250faaea91 100644
--- a/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
+++ b/app/code/Magento/DownloadableImportExport/Helper/Uploader.php
@@ -38,6 +38,11 @@ class Uploader extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $parameters = [];
 
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    public $connection;
+
     /**
      * Construct
      *
diff --git a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
index b6ae91e79e0b1..e03964bd2c386 100644
--- a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
+++ b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
@@ -407,7 +407,7 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
     }
 
     /**
-     * Get additional attributes for dowloadable product.
+     * Get additional attributes for downloadable product.
      *
      * @param array $rowData
      * @return array
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE.txt b/app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE.txt
rename to app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE_AFL.txt b/app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE_AFL.txt
rename to app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/DownloadableImportExport/Test/Mftf/README.md b/app/code/Magento/DownloadableImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..690273be9b8bc
--- /dev/null
+++ b/app/code/Magento/DownloadableImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Downloadable Import Export Functional Tests
+
+The Functional Test Module for **Magento Downloadable Import Export** module.
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index 534da4210ae1c..860303b0c86aa 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-downloadable": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-import-export": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/DownloadableImportExport/etc/module.xml b/app/code/Magento/DownloadableImportExport/etc/module.xml
index c59a8a2f6f14f..9cba501ba5da7 100644
--- a/app/code/Magento/DownloadableImportExport/etc/module.xml
+++ b/app/code/Magento/DownloadableImportExport/etc/module.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_DownloadableImportExport" setup_version="2.0.0">
+    <module name="Magento_DownloadableImportExport" >
         <sequence>
             <module name="Magento_ImportExport"/>
             <module name="Magento_CatalogImportExport"/>
diff --git a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
index aac6e2174b1ea..84aefa700a52a 100644
--- a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
@@ -20,7 +20,7 @@ interface AttributeOptionManagementInterface
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return bool
+     * @return string
      */
     public function add($entityType, $attributeCode, $option);
 
diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index 9664cabc79ba0..55d6e58b64b71 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -6,12 +6,15 @@
  */
 namespace Magento\Eav\Api\Data;
 
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Framework\Api\MetadataObjectInterface;
+
 /**
  * Interface AttributeInterface
  * @api
  * @since 100.0.2
  */
-interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
+interface AttributeInterface extends CustomAttributesDataInterface, MetadataObjectInterface
 {
     const ATTRIBUTE_ID = 'attribute_id';
 
@@ -307,4 +310,14 @@ public function setValidationRules(array $validationRules = null);
      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
      */
     public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object
+     *
+     * @param \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
+    );
 }
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 3ddfe494c7fbc..7dd6b0a19ec02 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -17,5 +17,52 @@ class Js extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'attribute/edit/js.phtml';
+  
+    protected $_template = 'Magento_Eav::attribute/edit/js.phtml';
+
+    /**
+     * @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype
+     */
+    private $inputtype;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype $inputtype,
+        array $data = []
+    ) {
+        $this->inputtype = $inputtype;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * @deprecated Misspelled method
+     * @see getCompatibleInputTypes
+     */
+    public function getComaptibleInputTypes()
+    {
+        return $this->getCompatibleInputTypes();
+    }
+
+    /**
+     * Get compatible input types.
+     *
+     * @return array
+     */
+    public function getCompatibleInputTypes()
+    {
+        return $this->inputtype->getVolatileInputTypes();
+    }
+
+    /**
+     * Get hints on input types.
+     *
+     * @return array
+     */
+    public function getInputTypeHints()
+    {
+        return $this->inputtype->getInputTypeHints();
+    }
 }
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index 4ee9b6c334ec1..c5a18a3de99c6 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -265,7 +265,7 @@ protected function _prepareForm()
     }
 
     /**
-     * Initialize form fileds values
+     * Initialize form fields values
      *
      * @return $this
      */
diff --git a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
index aece8c4972997..aa3b00126eee1 100644
--- a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
+++ b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
@@ -7,20 +7,55 @@
 
 class Inputtype implements \Magento\Framework\Option\ArrayInterface
 {
+    /**
+     * @var array
+     */
+    private $optionsArray;
+
+    /**
+     * Inputtype constructor.
+     * @param array $optionsArray
+     */
+    public function __construct(array $optionsArray = [])
+    {
+        $this->optionsArray = $optionsArray;
+    }
+
     /**
      * Return array of options
      *
      * @return array
      */
     public function toOptionArray()
+    {
+        //sort array elements using key value
+        ksort($this->optionsArray);
+        return $this->optionsArray;
+    }
+
+    /**
+     * Get volatile input types.
+     *
+     * @return array
+     */
+    public function getVolatileInputTypes()
+    {
+        return [
+            ['textarea', 'texteditor'],
+        ];
+    }
+
+    /**
+     * Get hint for input types
+     *
+     * @return array
+     */
+    public function getInputTypeHints()
     {
         return [
-            ['value' => 'text', 'label' => __('Text Field')],
-            ['value' => 'textarea', 'label' => __('Text Area')],
-            ['value' => 'date', 'label' => __('Date')],
-            ['value' => 'boolean', 'label' => __('Yes/No')],
-            ['value' => 'multiselect', 'label' => __('Multiple Select')],
-            ['value' => 'select', 'label' => __('Dropdown')]
+            'texteditor' => __(
+                'Text Editor input type requires WYSIWYG to be enabled in Stores > Configuration > Content Management.'
+            ),
         ];
     }
 }
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Date.php b/app/code/Magento/Eav/Model/Attribute/Data/Date.php
index a48885925733f..9bd155354ac0d 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Date.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Date.php
@@ -129,7 +129,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index 0364330517b88..1b2cac32598e1 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -120,8 +120,7 @@ public function extractValue(RequestInterface $request)
     }
 
     /**
-     * Validate file by attribute validate rules
-     * Return array of errors
+     * Validate file by attribute validate rules and return array of errors
      *
      * @param array $value
      * @return string[]
@@ -147,7 +146,7 @@ protected function _validateByRules($value)
             return $this->_fileValidator->getMessages();
         }
 
-        if (!is_uploaded_file($value['tmp_name'])) {
+        if (!empty($value['tmp_name']) && !is_uploaded_file($value['tmp_name'])) {
             return [__('"%1" is not a valid file.', $label)];
         }
 
@@ -174,12 +173,22 @@ public function validateValue($value)
         if ($this->getIsAjaxRequest()) {
             return true;
         }
+        $fileData = $value;
+
+        if (is_string($value) && !empty($value)) {
+            $dir = $this->_directory->getAbsolutePath($this->getAttribute()->getEntityType()->getEntityTypeCode());
+            $fileData = [
+                'size' => filesize($dir . $value),
+                'name' => $value,
+                'tmp_name' => $dir . $value
+            ];
+        }
 
         $errors = [];
         $attribute = $this->getAttribute();
 
         $toDelete = !empty($value['delete']) ? true : false;
-        $toUpload = !empty($value['tmp_name']) ? true : false;
+        $toUpload = !empty($value['tmp_name']) || is_string($value) && !empty($value) ? true : false;
 
         if (!$toUpload && !$toDelete && $this->getEntity()->getData($attribute->getAttributeCode())) {
             return true;
@@ -195,11 +204,13 @@ public function validateValue($value)
         }
 
         if ($toUpload) {
-            $errors = array_merge($errors, $this->_validateByRules($value));
+            $errors = array_merge($errors, $this->_validateByRules($fileData));
         }
 
         if (count($errors) == 0) {
             return true;
+        } elseif (is_string($value) && !empty($value)) {
+            $this->_directory->delete($dir . $value);
         }
 
         return $errors;
@@ -273,7 +284,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Image.php b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
index d04b7e9b940cf..24cd0f4fcf61f 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Image.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
@@ -14,6 +14,7 @@ class Image extends \Magento\Eav\Model\Attribute\Data\File
 {
     /**
      * Validate file by attribute validate rules
+     *
      * Return array of errors
      *
      * @param array $value
@@ -54,9 +55,9 @@ protected function _validateByRules($value)
                 $errors[] = __('"%1" width exceeds allowed value of %2 px.', $label, $r);
             }
         }
-        if (!empty($rules['max_image_heght'])) {
-            if ($rules['max_image_heght'] < $imageProp[1]) {
-                $r = $rules['max_image_heght'];
+        if (!empty($rules['max_image_height'])) {
+            if ($rules['max_image_height'] < $imageProp[1]) {
+                $r = $rules['max_image_height'];
                 $errors[] = __('"%1" height exceeds allowed value of %2 px.', $label, $r);
             }
         }
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php b/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
index 0eaa98c93067c..b5d0c59e3e9ec 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
@@ -115,7 +115,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return array|string
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php b/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php
index 1a84d5c1cbdc4..97ebff340e548 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Multiselect.php
@@ -44,7 +44,7 @@ public function compactValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return array|string
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Select.php b/app/code/Magento/Eav/Model/Attribute/Data/Select.php
index 92aa09e7ccac6..a74f4d10a5428 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Select.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Select.php
@@ -96,7 +96,7 @@ protected function _getOptionText($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index 646216a4cc31a..0a49e012690f6 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Attribute\Data;
 
 use Magento\Framework\App\RequestInterface;
@@ -50,12 +51,12 @@ public function extractValue(RequestInterface $request)
 
     /**
      * Validate data
+     *
      * Return true or array of errors
      *
      * @param array|string $value
      * @return bool|array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function validateValue($value)
     {
@@ -67,28 +68,18 @@ public function validateValue($value)
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());
         }
 
-        if ($attribute->getIsRequired() && empty($value) && $value !== '0') {
-            $label = __($attribute->getStoreLabel());
-            $errors[] = __('"%1" is a required value.', $label);
-        }
-
-        if (!$errors && !$attribute->getIsRequired() && empty($value)) {
+        if (!$attribute->getIsRequired() && empty($value)) {
             return true;
         }
 
-        // validate length
-        $length = $this->_string->strlen(trim($value));
-
-        $validateRules = $attribute->getValidateRules();
-        if (!empty($validateRules['min_text_length']) && $length < $validateRules['min_text_length']) {
+        if (empty($value) && $value !== '0') {
             $label = __($attribute->getStoreLabel());
-            $v = $validateRules['min_text_length'];
-            $errors[] = __('"%1" length must be equal or greater than %2 characters.', $label, $v);
+            $errors[] = __('"%1" is a required value.', $label);
         }
-        if (!empty($validateRules['max_text_length']) && $length > $validateRules['max_text_length']) {
-            $label = __($attribute->getStoreLabel());
-            $v = $validateRules['max_text_length'];
-            $errors[] = __('"%1" length must be equal or less than %2 characters.', $label, $v);
+
+        $result = $this->validateLength($attribute, $value);
+        if (count($result) !== 0) {
+            $errors = array_merge($errors, $result);
         }
 
         $result = $this->_validateInputRule($value);
@@ -129,7 +120,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array
@@ -142,4 +133,33 @@ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::O
 
         return $value;
     }
+
+    /**
+     * Validates value length by attribute rules
+     *
+     * @param \Magento\Eav\Model\Attribute $attribute
+     * @param string $value
+     * @return array errors
+     */
+    private function validateLength(\Magento\Eav\Model\Attribute $attribute, $value): array
+    {
+        $errors = [];
+        $length = $this->_string->strlen(trim($value));
+        $validateRules = $attribute->getValidateRules();
+
+        if (!empty($validateRules['input_validation'])) {
+            if (!empty($validateRules['min_text_length']) && $length < $validateRules['min_text_length']) {
+                $label = __($attribute->getStoreLabel());
+                $v = $validateRules['min_text_length'];
+                $errors[] = __('"%1" length must be equal or greater than %2 characters.', $label, $v);
+            }
+            if (!empty($validateRules['max_text_length']) && $length > $validateRules['max_text_length']) {
+                $label = __($attribute->getStoreLabel());
+                $v = $validateRules['max_text_length'];
+                $errors[] = __('"%1" length must be equal or less than %2 characters.', $label, $v);
+            }
+        }
+
+        return $errors;
+    }
 }
diff --git a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
index 9d0fa78668382..07ca71d95eba5 100644
--- a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
+++ b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Attribute;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -99,7 +100,7 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
             }
             if ($existingGroup->getAttributeSetId() != $group->getAttributeSetId()) {
                 throw new StateException(
-                    __('Attribute group does not belong to provided attribute set')
+                    __("The attribute group doesn't belong to the provided attribute set.")
                 );
             }
         }
@@ -107,7 +108,7 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
         try {
             $this->groupResource->save($group);
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot save attributeGroup'));
+            throw new StateException(__("The attributeGroup can't be saved."));
         }
         return $group;
     }
@@ -117,16 +118,6 @@ public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
-        $attributeSetId = $this->retrieveAttributeSetIdFromSearchCriteria($searchCriteria);
-        if (!$attributeSetId) {
-            throw InputException::requiredField('attribute_set_id');
-        }
-        try {
-            $this->setRepository->get($attributeSetId);
-        } catch (\Exception $exception) {
-            throw NoSuchEntityException::singleField('attributeSetId', $attributeSetId);
-        }
-
         /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection $collection */
         $collection = $this->groupListFactory->create();
         $this->joinProcessor->process($collection);
@@ -150,7 +141,9 @@ public function get($groupId)
         $group = $this->groupFactory->create();
         $this->groupResource->load($group, $groupId);
         if (!$group->getId()) {
-            throw new NoSuchEntityException(__('Group with id "%1" does not exist.', $groupId));
+            throw new NoSuchEntityException(
+                __('The group with the "%1" ID doesn\'t exist. Verify the ID and try again.', $groupId)
+            );
         }
         return $group;
     }
@@ -165,7 +158,7 @@ public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
         } catch (\Exception $e) {
             throw new StateException(
                 __(
-                    'Cannot delete attributeGroup with id %1',
+                    'The attribute group with id "%1" can\'t be deleted.',
                     $group->getId()
                 ),
                 $e
@@ -188,6 +181,7 @@ public function deleteById($groupId)
     /**
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
+     * @deprecated
      */
     protected function retrieveAttributeSetIdFromSearchCriteria(
         \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index ec283b8eac19b..31f962db3ee53 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model;
 
 use Magento\Framework\App\ObjectManager;
@@ -23,6 +24,7 @@ class AttributeManagement implements \Magento\Eav\Api\AttributeManagementInterfa
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
      * @deprecated 100.2.0 please use instead \Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory
+     * @see $attributeCollectionFactory
      */
     protected $attributeCollection;
 
@@ -97,19 +99,24 @@ public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $att
         try {
             $attributeSet = $this->setRepository->get($attributeSetId);
         } catch (NoSuchEntityException $ex) {
-            throw new NoSuchEntityException(__('AttributeSet with id "%1" does not exist.', $attributeSetId));
+            throw new NoSuchEntityException(
+                __(
+                    'The AttributeSet with a "%1" ID doesn\'t exist. Verify the attributeSet and try again.',
+                    $attributeSetId
+                )
+            );
         }
 
         $setEntityType = $this->entityTypeFactory->create()->getEntityType($attributeSet->getEntityTypeId());
         if ($setEntityType->getEntityTypeCode() != $entityTypeCode) {
-            throw new InputException(__('Wrong attribute set id provided'));
+            throw new InputException(__('The attribute set ID is incorrect. Verify the ID and try again.'));
         }
 
         //Check if group exists. If not - expected exception
         $attributeGroup = $this->groupRepository->get($attributeGroupId);
 
         if ($attributeGroup->getAttributeSetId() != $attributeSetId) {
-            throw new InputException(__('Attribute group does not belong to attribute set'));
+            throw new InputException(__('The attribute group doesn\'t belong to the attribute set.'));
         }
 
         /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
@@ -134,7 +141,9 @@ public function unassign($attributeSetId, $attributeCode)
         try {
             $attributeSet = $this->setRepository->get($attributeSetId);
         } catch (NoSuchEntityException $e) {
-            throw new NoSuchEntityException(__('Attribute set not found: %1', $attributeSetId));
+            throw new NoSuchEntityException(
+                __('The "%1" attribute set wasn\'t found. Verify and try again.', $attributeSetId)
+            );
         }
         $setEntityType = $this->entityTypeFactory->create()->getEntityType($attributeSet->getEntityTypeId());
 
@@ -147,11 +156,15 @@ public function unassign($attributeSetId, $attributeCode)
 
         if (!$attribute->getEntityAttributeId()) {
             throw new InputException(
-                __('Attribute "%1" not found in attribute set %2.', $attributeCode, $attributeSetId)
+                __(
+                    'The "%1" attribute wasn\'t found in the "%2" attribute set. Enter the attribute and try again.',
+                    $attributeCode,
+                    $attributeSetId
+                )
             );
         }
         if (!$attribute->getIsUserDefined()) {
-            throw new StateException(__('System attribute can not be deleted'));
+            throw new StateException(__("The system attribute can't be deleted."));
         }
         $attribute->deleteEntity();
         return true;
diff --git a/app/code/Magento/Eav/Model/AttributeRepository.php b/app/code/Magento/Eav/Model/AttributeRepository.php
index 3f20558d03d78..337ae7334486e 100644
--- a/app/code/Magento/Eav/Model/AttributeRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor;
@@ -87,7 +88,7 @@ public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute)
         try {
             $this->eavResource->save($attribute);
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot save attribute'));
+            throw new StateException(__("The attribute can't be saved."));
         }
         return $attribute;
     }
@@ -141,7 +142,16 @@ public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaIn
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($searchCriteria);
         $searchResults->setItems($attributes);
-        $searchResults->setTotalCount($attributeCollection->getSize());
+
+        // if $searchCriteria has no page size - we can use count() on $attributeCollection
+        // otherwise - we have to use getSize() on $attributeCollection
+        // with this approach we can eliminate excessive COUNT requests in case page size is empty
+        if ($searchCriteria->getPageSize()) {
+            $searchResults->setTotalCount($attributeCollection->getSize());
+        } else {
+            $searchResults->setTotalCount(count($attributeCollection));
+        }
+
         return $searchResults;
     }
 
@@ -154,7 +164,10 @@ public function get($entityTypeCode, $attributeCode)
         $attribute = $this->eavConfig->getAttribute($entityTypeCode, $attributeCode);
         if (!$attribute || !$attribute->getAttributeId()) {
             throw new NoSuchEntityException(
-                __('Attribute with attributeCode "%1" does not exist.', $attributeCode)
+                __(
+                    'The attribute with a "%1" attributeCode doesn\'t exist. Verify the attribute and try again.',
+                    $attributeCode
+                )
             );
         }
         return $attribute;
@@ -168,7 +181,7 @@ public function delete(\Magento\Eav\Api\Data\AttributeInterface $attribute)
         try {
             $this->eavResource->delete($attribute);
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot delete attribute.'));
+            throw new StateException(__("The attribute can't be deleted."));
         }
         return true;
     }
@@ -183,7 +196,9 @@ public function deleteById($attributeId)
         $this->eavResource->load($attribute, $attributeId);
 
         if (!$attribute->getAttributeId()) {
-            throw new NoSuchEntityException(__('Attribute with id "%1" does not exist.', $attributeId));
+            throw new NoSuchEntityException(
+                __('The attribute with a "%1" ID doesn\'t exist. Verify the attribute and try again.', $attributeId)
+            );
         }
 
         $this->delete($attribute);
diff --git a/app/code/Magento/Eav/Model/AttributeSetRepository.php b/app/code/Magento/Eav/Model/AttributeSetRepository.php
index d0b7ed3ccaa28..caab82da3910d 100644
--- a/app/code/Magento/Eav/Model/AttributeSetRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeSetRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model;
 
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
@@ -93,7 +94,12 @@ public function save(AttributeSetInterface $attributeSet)
         try {
             $this->attributeSetResource->save($attributeSet);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('There was an error saving attribute set.'));
+            throw new CouldNotSaveException(
+                __(
+                    'The attribute set couldn\'t be saved due to an error. '
+                    . 'Verify your information and try again. If the error persists, please try again later.'
+                )
+            );
         }
         return $attributeSet;
     }
@@ -159,9 +165,14 @@ public function delete(AttributeSetInterface $attributeSet)
         try {
             $this->attributeSetResource->delete($attributeSet);
         } catch (\Magento\Framework\Exception\StateException $exception) {
-            throw new CouldNotDeleteException(__('Default attribute set can not be deleted'));
+            throw new CouldNotDeleteException(__('The default attribute set can\'t be deleted.'));
         } catch (\Exception $exception) {
-            throw new CouldNotDeleteException(__('There was an error deleting attribute set.'));
+            throw new CouldNotDeleteException(
+                __(
+                    'The attribute set couldn\'t be deleted due to an error. '
+                    . 'Try again — if the error persists, please try again later.'
+                )
+            );
         }
         return true;
     }
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index cc68709cd3b03..0eecca21b0d54 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -503,6 +503,7 @@ public function getAttribute($entityType, $code)
         }
 
         if (isset($this->attributes[$entityTypeCode][$code])) {
+            \Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
             return $this->attributes[$entityTypeCode][$code];
         }
 
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index c94d78238a1ab..0522ea0432176 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -11,6 +11,7 @@
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Framework\App\Config\Element;
+use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\DuplicateException;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
@@ -60,6 +61,13 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      */
     protected $_attributesByCode = [];
 
+    /**
+     * Attributes stored by scope (store id and attribute set id).
+     *
+     * @var array
+     */
+    private $attributesByScope = [];
+
     /**
      * Two-dimensional array by table name and attribute name
      *
@@ -357,7 +365,7 @@ public function unsetAttributes($attributes = null)
         }
 
         if (!is_array($attributes)) {
-            throw new LocalizedException(__('Unknown parameter'));
+            throw new LocalizedException(__('This parameter is unknown. Verify and try again.'));
         }
 
         foreach ($attributes as $attrCode) {
@@ -453,15 +461,21 @@ public function getAttribute($attribute)
      * Adding attribute to entity
      *
      * @param AbstractAttribute $attribute
+     * @param DataObject|null $object
      * @return $this
      */
-    public function addAttribute(AbstractAttribute $attribute)
+    public function addAttribute(AbstractAttribute $attribute, $object = null)
     {
         $attribute->setEntity($this);
         $attributeCode = $attribute->getAttributeCode();
 
         $this->_attributesByCode[$attributeCode] = $attribute;
 
+        if ($object !== null) {
+            $suffix = $this->getAttributesCacheSuffix($object);
+            $this->attributesByScope[$suffix][$attributeCode] = $attribute;
+        }
+
         if ($attribute->isStatic()) {
             $this->_staticAttributes[$attributeCode] = $attribute;
         } else {
@@ -471,6 +485,31 @@ public function addAttribute(AbstractAttribute $attribute)
         return $this;
     }
 
+    /**
+     * Get attributes by scope
+     *
+     * @return array
+     */
+    private function getAttributesByScope($suffix)
+    {
+        return (isset($this->attributesByScope[$suffix]) && !empty($this->attributesByScope[$suffix]))
+            ? $this->attributesByScope[$suffix]
+            : $this->getAttributesByCode();
+    }
+
+    /**
+     * Get attributes cache suffix.
+     *
+     * @param DataObject $object
+     * @return string
+     */
+    private function getAttributesCacheSuffix(DataObject $object)
+    {
+        $attributeSetId = $object->getAttributeSetId() ?: 0;
+        $storeId = $object->getStoreId() ?: 0;
+        return $storeId . '-' . $attributeSetId;
+    }
+
     /**
      * Retrieve partial load flag
      *
@@ -504,7 +543,7 @@ public function isPartialSave($flag = null)
     /**
      * Retrieve configuration for all attributes
      *
-     * @param null|\Magento\Framework\DataObject $object
+     * @param null|DataObject $object
      * @return $this
      */
     public function loadAllAttributes($object = null)
@@ -552,19 +591,13 @@ public function attributesCompare($firstAttribute, $secondAttribute)
         $firstSort = $firstAttribute->getSortWeight((int) $this->_sortingSetId);
         $secondSort = $secondAttribute->getSortWeight((int) $this->_sortingSetId);
 
-        if ($firstSort > $secondSort) {
-            return 1;
-        } elseif ($firstSort < $secondSort) {
-            return -1;
-        }
-
-        return 0;
+        return $firstSort <=> $secondSort;
     }
 
     /**
      * Check whether the attribute is Applicable to the object
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   AbstractAttribute $attribute
      * @return  bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -609,7 +642,8 @@ public function walkAttributes($partMethod, array $args = [], $collectExceptionM
                 break;
         }
         $results = [];
-        foreach ($this->getAttributesByCode() as $attrCode => $attribute) {
+        $suffix = $this->getAttributesCacheSuffix($args[0]);
+        foreach ($this->getAttributesByScope($suffix) as $attrCode => $attribute) {
             if (isset($args[0]) && is_object($args[0]) && !$this->_isApplicableAttribute($args[0], $attribute)) {
                 continue;
             }
@@ -828,7 +862,7 @@ public function isAttributeStatic($attribute)
     /**
      * Validate all object's attributes against configuration
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @throws \Magento\Eav\Model\Entity\Attribute\Exception
      * @return true|array
      */
@@ -854,10 +888,10 @@ public function validate($object)
     /**
      * Set new increment id to object
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    public function setNewIncrementId(\Magento\Framework\DataObject $object)
+    public function setNewIncrementId(DataObject $object)
     {
         if ($object->getIncrementId()) {
             return $this;
@@ -876,7 +910,7 @@ public function setNewIncrementId(\Magento\Framework\DataObject $object)
      * Check attribute unique value
      *
      * @param AbstractAttribute $attribute
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return bool
      */
     public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
@@ -1048,7 +1082,7 @@ protected function _prepareLoadSelect(array $selects)
     /**
      * Retrieve select object for loading base entity row
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   string|int $rowId
      * @return  \Magento\Framework\DB\Select
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -1068,7 +1102,7 @@ protected function _getLoadRowSelect($object, $rowId)
     /**
      * Retrieve select object for loading entity attributes values
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   string $table
      * @return  \Magento\Framework\DB\Select
      */
@@ -1088,7 +1122,7 @@ protected function _getLoadAttributesSelect($object, $table)
     /**
      * Initialize attribute value for object
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   array $valueRow
      * @return $this
      */
@@ -1178,8 +1212,8 @@ protected function processSave($object)
     /**
      * Retrieve Object instance with original data
      *
-     * @param \Magento\Framework\DataObject $object
-     * @return \Magento\Framework\DataObject
+     * @param DataObject $object
+     * @return DataObject
      */
     protected function _getOrigObject($object)
     {
@@ -1419,7 +1453,7 @@ protected function _processSaveData($saveData)
         /**
          * Process base row
          */
-        $entityObject = new \Magento\Framework\DataObject($entityRow);
+        $entityObject = new DataObject($entityRow);
         $entityRow = $this->_prepareDataForTable($entityObject, $entityTable);
         if ($insertEntity) {
             if (!empty($entityId)) {
@@ -1474,7 +1508,7 @@ protected function _processSaveData($saveData)
     /**
      * Insert entity attribute value
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   AbstractAttribute $attribute
      * @param   mixed $value
      * @return $this
@@ -1487,7 +1521,7 @@ protected function _insertAttribute($object, $attribute, $value)
     /**
      * Update entity attribute value
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   AbstractAttribute $attribute
      * @param   mixed $valueId
      * @param   mixed $value
@@ -1582,10 +1616,10 @@ protected function _prepareValueForSave($value, AbstractAttribute $attribute)
     /**
      * Delete entity attribute values
      *
-     * @param   \Magento\Framework\DataObject $object
+     * @param   DataObject $object
      * @param   string $table
      * @param   array $info
-     * @return  \Magento\Framework\DataObject
+     * @return  DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _deleteAttributes($object, $table, $info)
@@ -1611,13 +1645,13 @@ protected function _deleteAttributes($object, $table, $info)
     /**
      * Save attribute
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @param string $attributeCode
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function saveAttribute(\Magento\Framework\DataObject $object, $attributeCode)
+    public function saveAttribute(DataObject $object, $attributeCode)
     {
         $attribute = $this->getAttribute($attributeCode);
         $backend = $attribute->getBackend();
@@ -1653,7 +1687,7 @@ public function saveAttribute(\Magento\Framework\DataObject $object, $attributeC
             $this->_processAttributeValues();
             $connection->commit();
         } catch (\Exception $e) {
-            $connection->rollback();
+            $connection->rollBack();
             throw $e;
         }
 
@@ -1663,8 +1697,8 @@ public function saveAttribute(\Magento\Framework\DataObject $object, $attributeC
     /**
      * Return attribute row to prepare where statement
      *
-     * @param \Magento\Framework\DataObject $entity
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $entity
+     * @param DataObject $object
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @return array
      */
@@ -1685,7 +1719,7 @@ protected function getAttributeRow($entity, $object, $attribute)
     /**
      * Delete entity using current object's data
      *
-     * @param \Magento\Framework\DataObject|int|string $object
+     * @param DataObject|int|string $object
      * @return $this
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
@@ -1727,7 +1761,7 @@ public function delete($object)
     /**
      * Evaluate Delete operations
      *
-     * @param \Magento\Framework\DataObject|int|string $object
+     * @param DataObject|int|string $object
      * @param string|int $id
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return void
@@ -1761,10 +1795,10 @@ protected function evaluateDelete($object, $id, $connection)
     /**
      * After Load Entity process
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _afterLoad(\Magento\Framework\DataObject $object)
+    protected function _afterLoad(DataObject $object)
     {
         \Magento\Framework\Profiler::start('after_load');
         $this->walkAttributes('backend/afterLoad', [$object]);
@@ -1775,10 +1809,10 @@ protected function _afterLoad(\Magento\Framework\DataObject $object)
     /**
      * Before delete Entity process
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _beforeSave(\Magento\Framework\DataObject $object)
+    protected function _beforeSave(DataObject $object)
     {
         $this->walkAttributes('backend/beforeSave', [$object]);
         return $this;
@@ -1787,10 +1821,10 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
     /**
      * After Save Entity process
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _afterSave(\Magento\Framework\DataObject $object)
+    protected function _afterSave(DataObject $object)
     {
         $this->walkAttributes('backend/afterSave', [$object]);
         return $this;
@@ -1799,10 +1833,10 @@ protected function _afterSave(\Magento\Framework\DataObject $object)
     /**
      * Before Delete Entity process
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _beforeDelete(\Magento\Framework\DataObject $object)
+    protected function _beforeDelete(DataObject $object)
     {
         $this->walkAttributes('backend/beforeDelete', [$object]);
         return $this;
@@ -1811,10 +1845,10 @@ protected function _beforeDelete(\Magento\Framework\DataObject $object)
     /**
      * After delete entity process
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _afterDelete(\Magento\Framework\DataObject $object)
+    protected function _afterDelete(DataObject $object)
     {
         $this->walkAttributes('backend/afterDelete', [$object]);
         return $this;
@@ -1884,10 +1918,10 @@ protected function getAttributeLoader()
     /**
      * Perform actions after entity load
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @since 100.1.0
      */
-    public function afterLoad(\Magento\Framework\DataObject $object)
+    public function afterLoad(DataObject $object)
     {
         $this->_afterLoad($object);
     }
@@ -1895,10 +1929,10 @@ public function afterLoad(\Magento\Framework\DataObject $object)
     /**
      * Perform actions before entity save
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @since 100.1.0
      */
-    public function beforeSave(\Magento\Framework\DataObject $object)
+    public function beforeSave(DataObject $object)
     {
         $this->_beforeSave($object);
     }
@@ -1906,10 +1940,10 @@ public function beforeSave(\Magento\Framework\DataObject $object)
     /**
      * Perform actions after entity save
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @since 100.1.0
      */
-    public function afterSave(\Magento\Framework\DataObject $object)
+    public function afterSave(DataObject $object)
     {
         $this->_afterSave($object);
     }
@@ -1917,10 +1951,10 @@ public function afterSave(\Magento\Framework\DataObject $object)
     /**
      * Perform actions before entity delete
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @since 100.1.0
      */
-    public function beforeDelete(\Magento\Framework\DataObject $object)
+    public function beforeDelete(DataObject $object)
     {
         $this->_beforeDelete($object);
     }
@@ -1928,10 +1962,10 @@ public function beforeDelete(\Magento\Framework\DataObject $object)
     /**
      * Perform actions after entity delete
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @since 100.1.0
      */
-    public function afterDelete(\Magento\Framework\DataObject $object)
+    public function afterDelete(DataObject $object)
     {
         $this->_afterDelete($object);
     }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 5b684b921efef..c605f3ce17e30 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Entity;
 
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
 
 /**
@@ -14,7 +16,6 @@
  *
  * @api
  * @method \Magento\Eav\Model\Entity\Attribute setOption($value)
- * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
@@ -252,7 +253,10 @@ public function beforeSave()
         )
         ) {
             throw new LocalizedException(
-                __('An attribute code must not be more than %1 characters.', self::ATTRIBUTE_CODE_MAX_LENGTH)
+                __(
+                    'The attribute code needs to be %1 characters or fewer. Re-enter the code and try again.',
+                    self::ATTRIBUTE_CODE_MAX_LENGTH
+                )
             );
         }
 
@@ -263,7 +267,9 @@ public function beforeSave()
             $numberFormatter = new \NumberFormatter($this->_localeResolver->getLocale(), \NumberFormatter::DECIMAL);
             $defaultValue = $numberFormatter->parse($defaultValue);
             if ($defaultValue === false) {
-                throw new LocalizedException(__('Invalid default decimal value'));
+                throw new LocalizedException(
+                    __('The default decimal value is invalid. Verify the value and try again.')
+                );
             }
             $this->setDefaultValue($defaultValue);
         }
@@ -279,14 +285,12 @@ public function beforeSave()
 
             // save default date value as timestamp
             if ($hasDefaultValue) {
-                $format = $this->_localeDate->getDateFormat(
-                    \IntlDateFormatter::SHORT
-                );
                 try {
-                    $defaultValue = $this->dateTimeFormatter->formatObject(new \DateTime($defaultValue), $format);
-                    $this->setDefaultValue($defaultValue);
+                    $locale = $this->_localeResolver->getLocale();
+                    $defaultValue = $this->_localeDate->date($defaultValue, $locale, false, false);
+                    $this->setDefaultValue($defaultValue->format(DateTime::DATETIME_PHP_FORMAT));
                 } catch (\Exception $e) {
-                    throw new LocalizedException(__('Invalid default date'));
+                    throw new LocalizedException(__('The default date is invalid. Verify the date and try again.'));
                 }
             }
         }
@@ -391,6 +395,7 @@ public function getDefaultValueByInput($type)
                 break;
 
             case 'textarea':
+            case 'texteditor':
                 $field = 'default_value_textarea';
                 break;
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 19877a51c4869..7ed455eccf4e0 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Eav\Model\Entity\Attribute;
 
@@ -119,6 +120,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var FrontendLabelFactory
+     */
+    private $frontendLabelFactory;
+
     /**
      * Serializer Instance.
      *
@@ -141,6 +147,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
         'static',
     ];
 
+    /**
+     * @var \Magento\Eav\Api\Data\AttributeExtensionFactory
+     */
+    private $eavExtensionFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -157,6 +168,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Eav\Api\Data\AttributeExtensionFactory|null $eavExtensionFactory
+     * @param FrontendLabelFactory|null $frontendLabelFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
@@ -175,7 +188,9 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Eav\Api\Data\AttributeExtensionFactory $eavExtensionFactory = null,
+        FrontendLabelFactory $frontendLabelFactory = null
     ) {
         parent::__construct(
             $context,
@@ -194,10 +209,15 @@ public function __construct(
         $this->optionDataFactory = $optionDataFactory;
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->eavExtensionFactory = $eavExtensionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Eav\Api\Data\AttributeExtensionFactory::class);
+        $this->frontendLabelFactory = $frontendLabelFactory
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FrontendLabelFactory::class);
     }
 
     /**
      * Get Serializer instance.
+     *
      * @deprecated 100.2.0
      *
      * @return Json
@@ -226,8 +246,8 @@ protected function _construct()
     /**
      * Load attribute data by code
      *
-     * @param  string|int|\Magento\Eav\Model\Entity\Type $entityType
-     * @param  string $code
+     * @param string|int|\Magento\Eav\Model\Entity\Type $entityType
+     * @param string $code
      * @return $this
      * @throws LocalizedException
      */
@@ -243,7 +263,7 @@ public function loadByCode($entityType, $code)
             $entityTypeId = $entityType->getId();
         }
         if (empty($entityTypeId)) {
-            throw new LocalizedException(__('Invalid entity supplied'));
+            throw new LocalizedException(__('The entity supplied is invalid. Verify the entity and try again.'));
         }
         $this->_getResource()->loadByCode($this, $entityTypeId, $code);
         $this->_afterLoad();
@@ -278,7 +298,7 @@ public function setAttributeId($data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function getAttributeId()
@@ -287,6 +307,8 @@ public function getAttributeId()
     }
 
     /**
+     * Set attribute code
+     *
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
@@ -297,7 +319,7 @@ public function setAttributeCode($data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function getAttributeCode()
@@ -306,6 +328,8 @@ public function getAttributeCode()
     }
 
     /**
+     * Set attribute model
+     *
      * @param array $data
      * @return $this
      * @codeCoverageIgnore
@@ -316,6 +340,8 @@ public function setAttributeModel($data)
     }
 
     /**
+     * Returns attribute model
+     *
      * @return array
      * @codeCoverageIgnore
      */
@@ -325,6 +351,8 @@ public function getAttributeModel()
     }
 
     /**
+     * Set backend type
+     *
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
@@ -335,7 +363,7 @@ public function setBackendType($data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function getBackendType()
@@ -344,6 +372,8 @@ public function getBackendType()
     }
 
     /**
+     * Set backend model
+     *
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
@@ -354,7 +384,7 @@ public function setBackendModel($data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function getBackendModel()
@@ -363,6 +393,8 @@ public function getBackendModel()
     }
 
     /**
+     * Set backend table
+     *
      * @param string $data
      * @return $this
      * @codeCoverageIgnore
@@ -373,6 +405,8 @@ public function setBackendTable($data)
     }
 
     /**
+     * Returns is visible on front
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      * @codeCoverageIgnore
@@ -383,7 +417,9 @@ public function getIsVisibleOnFront()
     }
 
     /**
-     * @return string|int|bool|float
+     * Returns default value
+     *
+     * @return string|null
      * @codeCoverageIgnore
      */
     public function getDefaultValue()
@@ -404,6 +440,8 @@ public function setDefaultValue($defaultValue)
     }
 
     /**
+     * Returns attribute set id
+     *
      * @return int
      * @codeCoverageIgnore
      */
@@ -413,6 +451,8 @@ public function getAttributeSetId()
     }
 
     /**
+     * Set attribute set id
+     *
      * @param int $id
      * @return $this
      * @codeCoverageIgnore
@@ -425,7 +465,7 @@ public function setAttributeSetId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function getEntityTypeId()
@@ -434,6 +474,8 @@ public function getEntityTypeId()
     }
 
     /**
+     * Set entity type id
+     *
      * @param int|string $id
      * @return $this
      * @codeCoverageIgnore
@@ -446,6 +488,8 @@ public function setEntityTypeId($id)
     }
 
     /**
+     * Set entity type
+     *
      * @param string $type
      * @return $this
      * @codeCoverageIgnore
@@ -477,7 +521,7 @@ public function getAlias($entity = null)
     /**
      * Set attribute name
      *
-     * @param   string $name
+     * @param string $name
      * @return $this
      * @codeCoverageIgnore
      */
@@ -550,7 +594,12 @@ public function getBackend()
             }
             $backend = $this->_universalFactory->create($this->getBackendModel());
             if (!$backend) {
-                throw new LocalizedException(__('Invalid backend model specified: %1', $this->getBackendModel()));
+                throw new LocalizedException(
+                    __(
+                        'The "%1" backend model is invalid. Verify the backend model and try again.',
+                        $this->getBackendModel()
+                    )
+                );
             }
             $this->_backend = $backend->setAttribute($this);
         }
@@ -585,9 +634,11 @@ public function getSource()
     {
         if (empty($this->_source)) {
             if (!$this->getSourceModel()) {
-                $this->setSourceModel($this->_getDefaultSourceModel());
+                $this->_source = $this->_getDefaultSourceModel();
+            } else {
+                $this->_source = $this->getSourceModel();
             }
-            $source = $this->_universalFactory->create($this->getSourceModel());
+            $source = $this->_universalFactory->create($this->_source);
             if (!$source) {
                 throw new LocalizedException(
                     __(
@@ -616,6 +667,8 @@ public function usesSource()
     }
 
     /**
+     * Returns default backend model
+     *
      * @return string
      * @codeCoverageIgnore
      */
@@ -625,6 +678,8 @@ protected function _getDefaultBackendModel()
     }
 
     /**
+     * Returns default frontend model
+     *
      * @return string
      * @codeCoverageIgnore
      */
@@ -634,6 +689,8 @@ protected function _getDefaultFrontendModel()
     }
 
     /**
+     * Returns default source model
+     *
      * @return string
      * @codeCoverageIgnore
      */
@@ -756,7 +813,7 @@ public function getBackendTable()
             if ($this->isStatic()) {
                 $this->_dataTable = $this->getEntityType()->getValueTablePrefix();
             } else {
-                $backendTable = trim($this->_getData('backend_table'));
+                $backendTable = trim((string)$this->_getData('backend_table'));
                 if (empty($backendTable)) {
                     $entityTable = [$this->getEntityType()->getEntityTablePrefix(), $this->getBackendType()];
                     $backendTable = $this->getResource()->getTable($entityTable);
@@ -868,6 +925,7 @@ public function _getFlatColumnsDdlDefinition()
 
     /**
      * Retrieve flat columns definition in old format (before MMDB support)
+     *
      * Used in database compatible mode
      *
      * @deprecated 100.2.0
@@ -1043,12 +1101,12 @@ public function getFlatUpdateSelect($store = null)
     }
 
     /**
+     * @inheritdoc
      * @codeCoverageIgnoreStart
-     * {@inheritdoc}
      */
     public function getIsUnique()
     {
-        return $this->getData(self::IS_UNIQUE);
+        return $this->_getData(self::IS_UNIQUE);
     }
 
     /**
@@ -1063,11 +1121,11 @@ public function setIsUnique($isUnique)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFrontendClass()
     {
-        return $this->getData(self::FRONTEND_CLASS);
+        return $this->_getData(self::FRONTEND_CLASS);
     }
 
     /**
@@ -1082,15 +1140,15 @@ public function setFrontendClass($frontendClass)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFrontendInput()
     {
-        return $this->getData(self::FRONTEND_INPUT);
+        return $this->_getData(self::FRONTEND_INPUT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFrontendInput($frontendInput)
     {
@@ -1098,15 +1156,15 @@ public function setFrontendInput($frontendInput)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsRequired()
     {
-        return $this->getData(self::IS_REQUIRED);
+        return $this->_getData(self::IS_REQUIRED);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsRequired($isRequired)
     {
@@ -1116,11 +1174,11 @@ public function setIsRequired($isRequired)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOptions()
     {
-        $options = $this->getData(self::OPTIONS);
+        $options = $this->_getData(self::OPTIONS);
         if (!$options) {
             $options = $this->usesSource() ? $this->getSource()->getAllOptions() : [];
         }
@@ -1177,8 +1235,8 @@ protected function convertToObjects(array $options)
     }
 
     /**
+     * @inheritdoc
      * @codeCoverageIgnoreStart
-     * {@inheritdoc}
      */
     public function getIsUserDefined()
     {
@@ -1197,11 +1255,11 @@ public function setIsUserDefined($isUserDefined)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultFrontendLabel()
     {
-        return $this->getData(self::FRONTEND_LABEL);
+        return $this->_getData(self::FRONTEND_LABEL);
     }
 
     /**
@@ -1216,11 +1274,24 @@ public function setDefaultFrontendLabel($defaultFrontendLabel)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFrontendLabels()
     {
-        return $this->getData(self::FRONTEND_LABELS);
+        if ($this->getData(self::FRONTEND_LABELS) == null) {
+            $attributeId = $this->getAttributeId();
+            $storeLabels = $this->_getResource()->getStoreLabelsByAttributeId($attributeId);
+
+            $resultFrontedLabels = [];
+            foreach ($storeLabels as $i => $label) {
+                $frontendLabel = $this->frontendLabelFactory->create();
+                $frontendLabel->setStoreId($i);
+                $frontendLabel->setLabel($label);
+                $resultFrontedLabels[] = $frontendLabel;
+            }
+            $this->setData(self::FRONTEND_LABELS, $resultFrontedLabels);
+        }
+        return $this->_getData(self::FRONTEND_LABELS);
     }
 
     /**
@@ -1235,11 +1306,11 @@ public function setFrontendLabels(array $frontendLabels = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getNote()
     {
-        return $this->getData(self::NOTE);
+        return $this->_getData(self::NOTE);
     }
 
     /**
@@ -1254,11 +1325,11 @@ public function setNote($note)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSourceModel()
     {
-        return $this->getData(self::SOURCE_MODEL);
+        return $this->_getData(self::SOURCE_MODEL);
     }
 
     /**
@@ -1275,11 +1346,11 @@ public function setSourceModel($sourceModel)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getValidationRules()
     {
-        $rules = $this->getData(self::VALIDATE_RULES);
+        $rules = $this->_getData(self::VALIDATE_RULES);
         if (is_array($rules)) {
             return $rules;
         } elseif (!empty($rules)) {
@@ -1302,18 +1373,24 @@ public function setValidationRules(array $validationRules = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
      * @codeCoverageIgnore
      */
     public function getExtensionAttributes()
     {
-        return $this->_getExtensionAttributes();
+        $extensionAttributes = $this->_getExtensionAttributes();
+        if (!($extensionAttributes instanceof \Magento\Eav\Api\Data\AttributeExtensionInterface)) {
+            /** @var \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes */
+            $extensionAttributes = $this->eavExtensionFactory->create();
+            $this->setExtensionAttributes($extensionAttributes);
+        }
+        return $extensionAttributes;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
index fab2ed182f30e..86ab6f6ea6e9f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Eav\Model\Entity\Attribute\Backend;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -203,12 +205,12 @@ public function getEntityValueId($entity)
     /**
      * Retrieve default value
      *
-     * @return mixed
+     * @return string
      */
     public function getDefaultValue()
     {
         if ($this->_defaultValue === null) {
-            if ($this->getAttribute()->getDefaultValue()) {
+            if ($this->getAttribute()->getDefaultValue() !== null) {
                 $this->_defaultValue = $this->getAttribute()->getDefaultValue();
             } else {
                 $this->_defaultValue = "";
@@ -237,7 +239,10 @@ public function validate($object)
             && $attribute->isValueEmpty($value)
             && $attribute->isValueEmpty($attribute->getDefaultValue())
         ) {
-            throw new LocalizedException(__('The value of attribute "%1" must be set', $attrCode));
+            $label = $attribute->getFrontend()->getLabel();
+            throw new LocalizedException(
+                __('The "%1" attribute value is empty. Set the attribute and try again.', $label)
+            );
         }
 
         if ($attribute->getIsUnique()
@@ -250,7 +255,9 @@ public function validate($object)
         if ($attribute->getIsUnique()) {
             if (!$attribute->getEntity()->checkAttributeUniqueValue($attribute, $object)) {
                 $label = $attribute->getFrontend()->getLabel();
-                throw new LocalizedException(__('The value of attribute "%1" must be unique', $label));
+                throw new LocalizedException(
+                    __('The value of the "%1" attribute isn\'t unique. Set a unique value and try again.', $label)
+                );
             }
         }
 
@@ -279,7 +286,7 @@ public function afterLoad($object)
     public function beforeSave($object)
     {
         $attrCode = $this->getAttribute()->getAttributeCode();
-        if (!$object->hasData($attrCode) && $this->getDefaultValue()) {
+        if (!$object->hasData($attrCode) && $this->getDefaultValue() !== '') {
             $object->setData($attrCode, $this->getDefaultValue());
         }
 
@@ -342,9 +349,8 @@ public function getAffectedFields($object)
     }
 
     /**
-     * By default attribute value is considered scalar that can be stored in a generic way
+     * By default attribute value is considered scalar that can be stored in a generic way {@inheritdoc}
      *
-     * {@inheritdoc}
      * @codeCoverageIgnore
      */
     public function isScalar()
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
index f47c73f01f238..156c0326f2b6f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
@@ -41,7 +41,7 @@ public function beforeSave($object)
     {
         // parent::beforeSave() is not called intentionally
         $attrCode = $this->getAttribute()->getAttributeCode();
-        if ($object->hasData($attrCode)) {
+        if ($object->hasData($attrCode) && !$this->isJsonEncoded($object->getData($attrCode))) {
             $object->setData($attrCode, $this->jsonSerializer->serialize($object->getData($attrCode)));
         }
         return $this;
@@ -58,7 +58,27 @@ public function afterLoad($object)
     {
         parent::afterLoad($object);
         $attrCode = $this->getAttribute()->getAttributeCode();
-        $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode)));
+        $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode) ?: '{}'));
         return $this;
     }
+
+    /**
+     * Returns true if given value is a valid json value, and false otherwise.
+     *
+     * @param string|int|float|bool|array|null $value
+     * @return bool
+     */
+    private function isJsonEncoded($value): bool
+    {
+        $result = is_string($value);
+        if ($result) {
+            try {
+                $this->jsonSerializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index cdd4fce583230..3d4c9e89a035f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -165,7 +165,7 @@ public function getValue(\Magento\Framework\DataObject $object)
                 $options = $opt->getAllOptions();
                 if ($options) {
                     foreach ($options as $option) {
-                        if ($option['value'] == $value) {
+                        if ($option['value'] === $value) {
                             $valueOption = $option['label'];
                         }
                     }
@@ -283,7 +283,7 @@ private function getTextLengthValidateClasses()
     }
 
     /**
-     * Reireive config field
+     * Retrieve config field
      *
      * @param string $fieldName
      * @return mixed
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/Entity/Attribute/Option.php
index a42087b99df4b..b510fcbe876dc 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Option.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Model\AbstractModel;
 
 /**
- * Emtity attribute option model
+ * Entity attribute option model
  *
  * @method int getAttributeId()
  * @method \Magento\Eav\Model\Entity\Attribute\Option setAttributeId(int $value)
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index b0508fd8cc626..3c3bc083fdf8f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 
+/**
+ * Eav Option Management
+ */
 class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInterface
 {
     /**
@@ -36,22 +39,23 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function add($entityType, $attributeCode, $option)
     {
         if (empty($attributeCode)) {
-            throw new InputException(__('Empty attribute code'));
+            throw new InputException(__('The attribute code is empty. Enter the code and try again.'));
         }
 
         $attribute = $this->attributeRepository->get($entityType, $attributeCode);
         if (!$attribute->usesSource()) {
-            throw new StateException(__('Attribute %1 doesn\'t work with options', $attributeCode));
+            throw new StateException(__('The "%1" attribute doesn\'t work with options.', $attributeCode));
         }
 
+        $optionLabel = $option->getLabel();
         $optionId = $this->getOptionId($option);
         $options = [];
-        $options['value'][$optionId][0] = $option->getLabel();
+        $options['value'][$optionId][0] = $optionLabel;
         $options['order'][$optionId] = $option->getSortOrder();
 
         if (is_array($option->getStoreLabels())) {
@@ -67,25 +71,28 @@ public function add($entityType, $attributeCode, $option)
         $attribute->setOption($options);
         try {
             $this->resourceModel->save($attribute);
+            if ($optionLabel && $attribute->getAttributeCode()) {
+                $this->setOptionValue($option, $attribute, $optionLabel);
+            }
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot save attribute %1', $attributeCode));
+            throw new StateException(__('The "%1" attribute can\'t be saved.', $attributeCode));
         }
 
-        return true;
+        return $this->getOptionId($option);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($entityType, $attributeCode, $optionId)
     {
         if (empty($attributeCode)) {
-            throw new InputException(__('Empty attribute code'));
+            throw new InputException(__('The attribute code is empty. Enter the code and try again.'));
         }
 
         $attribute = $this->attributeRepository->get($entityType, $attributeCode);
         if (!$attribute->usesSource()) {
-            throw new StateException(__('Attribute %1 doesn\'t have any option', $attributeCode));
+            throw new StateException(__('The "%1" attribute has no option.', $attributeCode));
         }
         $this->validateOption($attribute, $optionId);
 
@@ -99,32 +106,34 @@ public function delete($entityType, $attributeCode, $optionId)
         try {
             $this->resourceModel->save($attribute);
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot save attribute %1', $attributeCode));
+            throw new StateException(__('The "%1" attribute can\'t be saved.', $attributeCode));
         }
 
         return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems($entityType, $attributeCode)
     {
         if (empty($attributeCode)) {
-            throw new InputException(__('Empty attribute code'));
+            throw new InputException(__('The attribute code is empty. Enter the code and try again.'));
         }
         $attribute = $this->attributeRepository->get($entityType, $attributeCode);
 
         try {
             $options = $attribute->getOptions();
         } catch (\Exception $e) {
-            throw new StateException(__('Cannot load options for attribute %1', $attributeCode));
+            throw new StateException(__('The options for "%1" attribute can\'t be loaded.', $attributeCode));
         }
 
         return $options;
     }
 
     /**
+     * Validate option
+     *
      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
      * @param int $optionId
      * @throws NoSuchEntityException
@@ -132,19 +141,51 @@ public function getItems($entityType, $attributeCode)
      */
     protected function validateOption($attribute, $optionId)
     {
-        if (!$attribute->getSource()->getOptionText($optionId)) {
+        if ($attribute->getSource()->getOptionText($optionId) === false) {
             throw new NoSuchEntityException(
-                __('Attribute %1 does not contain option with Id %2', $attribute->getAttributeCode(), $optionId)
+                __(
+                    'The "%1" attribute doesn\'t include an option with "%2" ID.',
+                    $attribute->getAttributeCode(),
+                    $optionId
+                )
             );
         }
     }
 
     /**
+     * Returns option id
+     *
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @return string
      */
-    private function getOptionId($option)
+    private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $option) : string
     {
-        return $option->getValue() ?: 'new_option';
+        return 'id_' . ($option->getValue() ?: 'new_option');
+    }
+
+    /**
+     * Set option value
+     *
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
+     * @param string $optionLabel
+     * @return void
+     */
+    private function setOptionValue(
+        \Magento\Eav\Api\Data\AttributeOptionInterface $option,
+        \Magento\Eav\Api\Data\AttributeInterface $attribute,
+        string $optionLabel
+    ) {
+        $optionId = $attribute->getSource()->getOptionId($optionLabel);
+        if ($optionId) {
+            $option->setValue($attribute->getSource()->getOptionId($optionId));
+        } elseif (is_array($option->getStoreLabels())) {
+            foreach ($option->getStoreLabels() as $label) {
+                if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
+                    $option->setValue($attribute->getSource()->getOptionId($optionId));
+                    break;
+                }
+            }
+        }
     }
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
index 5434f05610467..da7d5fac089cb 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
@@ -220,7 +220,12 @@ public function organizeData($data)
             foreach ($data['not_attributes'] as $entityAttributeId) {
                 $entityAttribute = $this->_resourceAttribute->getEntityAttribute($entityAttributeId);
                 if (!$entityAttribute) {
-                    throw new LocalizedException(__('Entity attribute with id "%1" not found', $entityAttributeId));
+                    throw new LocalizedException(
+                        __(
+                            'The entity attribute with the "%1" ID isn\'t found. Reset the attribute and try again.',
+                            $entityAttributeId
+                        )
+                    );
                 }
                 $modelAttribute = $this->_eavConfig->getAttribute(
                     $this->getEntityTypeId(),
@@ -282,11 +287,13 @@ public function validate()
     {
         $attributeSetName = $this->getAttributeSetName();
         if ($attributeSetName == '') {
-            throw new LocalizedException(__('Attribute set name is empty.'));
+            throw new LocalizedException(__('The attribute set name is empty. Enter the name and try again.'));
         }
 
         if (!$this->_getResource()->validate($this, $attributeSetName)) {
-            throw new LocalizedException(__('An attribute set named "%1" already exists.', $attributeSetName));
+            throw new LocalizedException(
+                __('A "%1" attribute set name already exists. Create a new name and try again.', $attributeSetName)
+            );
         }
 
         return true;
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
index 00450088e86aa..cee4a06062d75 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
@@ -35,10 +35,9 @@ public function __construct(
 
     /**
      * Retrieve Full Option values array
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if ($this->_options === null) {
             $this->_options = $this->_storeCollectionFactory->create()->load()->toOptionArray();
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
index 8f8c39bf26040..f9aa1a9ed3ba1 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -9,6 +9,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * Eav attribute default source when values are coming from another table
+ *
  * @api
  * @since 100.0.2
  */
@@ -127,12 +129,14 @@ public function getSpecificOptions($ids, $withEmpty = true)
     }
 
     /**
+     * Add an empty option to the array
+     *
      * @param array $options
      * @return array
      */
     private function addEmptyOption(array $options)
     {
-        array_unshift($options, ['label' => $this->getAttribute()->getIsRequired() ? '' : ' ', 'value' => '']);
+        array_unshift($options, ['label' => ' ', 'value' => '']);
         return $options;
     }
 
diff --git a/app/code/Magento/Eav/Model/Entity/AttributeLoader.php b/app/code/Magento/Eav/Model/Entity/AttributeLoader.php
index a925f8e78ff33..8e22452507e24 100644
--- a/app/code/Magento/Eav/Model/Entity/AttributeLoader.php
+++ b/app/code/Magento/Eav/Model/Entity/AttributeLoader.php
@@ -67,10 +67,10 @@ public function loadAllAttributes(AbstractEntity $resource, DataObject $object =
         $resource->unsetAttributes();
 
         foreach ($defaultAttributesCodes as $attributeCode) {
-            $resource->addAttribute($this->_getDefaultAttribute($resource, $attributeCode));
+            $resource->addAttribute($this->_getDefaultAttribute($resource, $attributeCode), $object);
         }
         foreach ($attributes as $attributeCode => $attribute) {
-            $resource->addAttribute($attribute);
+            $resource->addAttribute($attribute, $object);
         }
         return $resource;
     }
diff --git a/app/code/Magento/Eav/Model/Entity/AttributeLoaderInterface.php b/app/code/Magento/Eav/Model/Entity/AttributeLoaderInterface.php
index f3f8745fc535b..2440492070c66 100644
--- a/app/code/Magento/Eav/Model/Entity/AttributeLoaderInterface.php
+++ b/app/code/Magento/Eav/Model/Entity/AttributeLoaderInterface.php
@@ -17,8 +17,8 @@ interface AttributeLoaderInterface
      * Retrieve configuration for all attributes
      *
      * @param AbstractEntity $resource
-     * @param DataObject|null $object
+     * @param DataObject|null $entity
      * @return AbstractEntity
      */
-    public function loadAllAttributes(AbstractEntity $resource, DataObject $object = null);
+    public function loadAllAttributes(AbstractEntity $resource, DataObject $entity = null);
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index bd3fd17393d7c..0eb87374f3ba3 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Entity\Collection;
 
 use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
@@ -246,7 +247,9 @@ public function setEntity($entity)
         } elseif (is_string($entity) || $entity instanceof \Magento\Framework\App\Config\Element) {
             $this->_entity = $this->_eavEntityFactory->create()->setType($entity);
         } else {
-            throw new LocalizedException(__('Invalid entity supplied: %1', print_r($entity, 1)));
+            throw new LocalizedException(
+                __('The "%1" entity supplied is invalid. Verify the entity and try again.', print_r($entity, 1))
+            );
         }
         return $this;
     }
@@ -302,7 +305,9 @@ public function setObject($object = null)
     public function addItem(\Magento\Framework\DataObject $object)
     {
         if (!$object instanceof $this->_itemObjectClass) {
-            throw new LocalizedException(__('Attempt to add an invalid object'));
+            throw new LocalizedException(
+                __("The object wasn't added because it's invalid. To continue, enter a valid object and try again.")
+            );
         }
         return parent::addItem($object);
     }
@@ -374,6 +379,7 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
 
         if (!empty($conditionSql)) {
             $this->getSelect()->where($conditionSql, null, \Magento\Framework\DB\Select::TYPE_CONDITION);
+            $this->invalidateSize();
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Invalid attribute identifier for filter (%1)', get_class($attribute))
@@ -495,7 +501,12 @@ public function addAttributeToSelect($attribute, $joinType = false)
                 $attrInstance = $this->_eavConfig->getAttribute($this->getEntity()->getType(), $attribute);
             }
             if (empty($attrInstance)) {
-                throw new LocalizedException(__('Invalid attribute requested: %1', (string)$attribute));
+                throw new LocalizedException(
+                    __(
+                        'The "%1" attribute requested is invalid. Verify the attribute and try again.',
+                        (string)$attribute
+                    )
+                );
             }
             $this->_selectAttributes[$attrInstance->getAttributeCode()] = $attrInstance->getId();
         }
@@ -642,7 +653,7 @@ public function groupByAttribute($attribute)
      * @param string $bind attribute of the main entity to link with joined $filter
      * @param string $filter primary key for the joined entity (entity_id default)
      * @param string $joinType inner|left
-     * @param null $storeId
+     * @param int|null $storeId
      * @return $this
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -662,7 +673,7 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy
         }
 
         if (!$bindAttribute || !$bindAttribute->isStatic() && !$bindAttribute->getId()) {
-            throw new LocalizedException(__('Invalid foreign key'));
+            throw new LocalizedException(__('The foreign key is invalid. Verify the foreign key and try again.'));
         }
 
         // try to explode combined entity/attribute if supplied
@@ -686,7 +697,7 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy
             }
         }
         if (!$entity || !$entity->getTypeId()) {
-            throw new LocalizedException(__('Invalid entity type'));
+            throw new LocalizedException(__('The entity type is invalid. Verify the entity type and try again.'));
         }
 
         // cache entity
@@ -699,7 +710,7 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy
             $attribute = $entity->getAttribute($attribute);
         }
         if (!$attribute) {
-            throw new LocalizedException(__('Invalid attribute type'));
+            throw new LocalizedException(__('The attribute type is invalid. Verify the attribute type and try again.'));
         }
 
         if (empty($filter)) {
@@ -803,7 +814,7 @@ public function joinTable($table, $bind, $fields = null, $cond = null, $joinType
     {
         $tableAlias = null;
         if (is_array($table)) {
-            list($tableAlias, $tableName) = each($table);
+            list($tableAlias, $tableName) = [key($table), current($table)];
         } else {
             $tableName = $table;
         }
@@ -819,7 +830,7 @@ public function joinTable($table, $bind, $fields = null, $cond = null, $joinType
         }
         foreach ($fields as $alias => $field) {
             if (isset($this->_joinFields[$alias])) {
-                throw new LocalizedException(__('A joint field with this alias (%1) is already declared.', $alias));
+                throw new LocalizedException(__('A joint field with a "%1" alias is already declared.', $alias));
             }
             $this->_joinFields[$alias] = ['table' => $tableAlias, 'field' => $field];
         }
@@ -920,6 +931,7 @@ public function load($printQuery = false, $logQuery = false)
         foreach ($this->_items as $item) {
             $item->setOrigData();
             $this->beforeAddLoadedItem($item);
+            $item->setDataChanges(false);
         }
         \Magento\Framework\Profiler::stop('set_orig_data');
 
@@ -935,8 +947,8 @@ public function load($printQuery = false, $logQuery = false)
     /**
      * Clone and reset collection
      *
-     * @param null $limit
-     * @param null $offset
+     * @param int|null $limit
+     * @param int|null $offset
      * @return Select
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
@@ -1113,7 +1125,7 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             $query = $this->getSelect();
             $rows = $this->_fetchAll($query);
         } catch (\Exception $e) {
-            $this->printLogQuery(true, true, $query);
+            $this->printLogQuery(false, true, $query);
             throw $e;
         }
 
@@ -1231,7 +1243,7 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
 
         if ($entity->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE && $entity->getTypeId()) {
             $select->where(
-                'entity_type_id =?',
+                't_d.entity_type_id =?',
                 $entity->getTypeId()
             );
         }
@@ -1255,7 +1267,7 @@ protected function _addLoadAttributesSelectValues($select, $table, $type)
     }
 
     /**
-     * Initialize entity ubject property value
+     * Initialize entity object property value
      *
      * Parameter $valueInfo is _getLoadAttributesSelect fetch result row
      *
@@ -1268,7 +1280,9 @@ protected function _setItemAttributeValue($valueInfo)
         $entityIdField = $this->getEntity()->getEntityIdField();
         $entityId = $valueInfo[$entityIdField];
         if (!isset($this->_itemsById[$entityId])) {
-            throw new LocalizedException(__('Data integrity: No header row found for attribute'));
+            throw new LocalizedException(
+                __('A header row is missing for an attribute. Verify the header row and try again.')
+            );
         }
         $attributeCode = array_search($valueInfo['attribute_id'], $this->_selectAttributes);
         if (!$attributeCode) {
@@ -1320,7 +1334,9 @@ protected function _getAttributeFieldName($attributeCode)
 
         $attribute = $this->getAttribute($attributeCode);
         if (!$attribute) {
-            throw new LocalizedException(__('Invalid attribute name: %1', $attributeCode));
+            throw new LocalizedException(
+                __('The "%1" attribute name is invalid. Reset the name and try again.', $attributeCode)
+            );
         }
 
         if ($attribute->isStatic()) {
@@ -1379,7 +1395,9 @@ protected function _addAttributeJoin($attributeCode, $joinType = 'inner')
         }
 
         if (!$attribute) {
-            throw new LocalizedException(__('Invalid attribute name: %1', $attributeCode));
+            throw new LocalizedException(
+                __('The "%1" attribute name is invalid. Reset the name and try again.', $attributeCode)
+            );
         }
 
         if ($attribute->getBackend()->isStatic()) {
@@ -1481,6 +1499,10 @@ protected function _getAttributeConditionSql($attribute, $condition, $joinType =
                 $condition
             );
         } else {
+            if (isset($condition['null'])) {
+                $joinType = 'left';
+            }
+
             $this->_addAttributeJoin($attribute, $joinType);
             if (isset($this->_joinAttributes[$attribute]['condition_alias'])) {
                 $field = $this->_joinAttributes[$attribute]['condition_alias'];
@@ -1574,6 +1596,17 @@ protected function _reset()
         return $this;
     }
 
+    /**
+     * Check whether attribute with code is already added to collection
+     *
+     * @param string $attributeCode
+     * @return bool
+     */
+    public function isAttributeAdded($attributeCode) : bool
+    {
+        return isset($this->_selectAttributes[$attributeCode]);
+    }
+
     /**
      * Returns already loaded element ids
      *
@@ -1587,6 +1620,7 @@ public function getLoadedIds()
 
     /**
      * Clear collection
+     *
      * @return $this
      */
     public function clear()
@@ -1597,6 +1631,7 @@ public function clear()
 
     /**
      * Remove all items from collection
+     *
      * @return $this
      */
     public function removeAllItems()
@@ -1620,6 +1655,7 @@ public function removeItemByKey($key)
     }
 
     /**
+     * Returns main table.
      * Returns main table name - extracted from "module/table" style and
      * validated by db adapter
      *
@@ -1667,4 +1703,16 @@ public function removeAllFieldsFromSelect()
     {
         return $this->removeAttributeToSelect();
     }
+
+    /**
+     * Invalidates "Total Records Count".
+     * Invalidates saved "Total Records Count" attribute with last counting,
+     * so a next calling of method getSize() will query new total records count.
+     *
+     * @return void
+     */
+    private function invalidateSize(): void
+    {
+        $this->_totalRecords = null;
+    }
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index aa298d7d547bf..80fcfd4ab585c 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -317,7 +317,7 @@ public function getEntityTablePrefix()
     }
 
     /**
-     * Get default attribute set identifier for etity type
+     * Get default attribute set identifier for entity type
      *
      * @return string|null
      */
diff --git a/app/code/Magento/Eav/Model/Form/Element.php b/app/code/Magento/Eav/Model/Form/Element.php
index 28b6b1433eba5..0f0b74b201a7f 100644
--- a/app/code/Magento/Eav/Model/Form/Element.php
+++ b/app/code/Magento/Eav/Model/Form/Element.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Form;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -76,10 +77,10 @@ protected function _construct()
     public function beforeSave()
     {
         if (!$this->getTypeId()) {
-            throw new LocalizedException(__('Invalid form type.'));
+            throw new LocalizedException(__('The form type is invalid. Reset the type and try again.'));
         }
         if (!$this->getAttributeId()) {
-            throw new LocalizedException(__('Invalid EAV attribute'));
+            throw new LocalizedException(__('The EAV attribute is invalid. Verify the attribute and try again.'));
         }
 
         return parent::beforeSave();
diff --git a/app/code/Magento/Eav/Model/Form/Fieldset.php b/app/code/Magento/Eav/Model/Form/Fieldset.php
index a0c706c3d03a5..f43a10f074a3a 100644
--- a/app/code/Magento/Eav/Model/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/Form/Fieldset.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Form;
 
 /**
@@ -72,7 +73,9 @@ protected function _construct()
     public function beforeSave()
     {
         if (!$this->getTypeId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Invalid form type.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('The form type is invalid. Reset the type and try again.')
+            );
         }
         if (!$this->getStoreId() && $this->getLabel()) {
             $this->setStoreLabel($this->getStoreId(), $this->getLabel());
diff --git a/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php b/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
index f3b2e0ba3e618..9c6adc0354f8d 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
@@ -144,6 +144,31 @@ public function processInserts($entityType, $context)
             return;
         }
         $metadata = $this->metadataPool->getMetadata($entityType);
+        $insertData = $this->prepareInsertDataForMultipleSave($entityType, $context);
+
+        foreach ($insertData as $table => $tableData) {
+            foreach ($tableData as $data) {
+                $metadata->getEntityConnection()->insertArray(
+                    $table,
+                    $data['columns'],
+                    $data['data'],
+                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_IGNORE
+                );
+            }
+        }
+    }
+
+    /**
+     * Prepare data for insert multiple rows
+     *
+     * @param string $entityType
+     * @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
+     * @return array
+     */
+    private function prepareInsertDataForMultipleSave($entityType, $context)
+    {
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $insertData = [];
         foreach ($this->insert[$entityType] as $link => $data) {
             foreach ($data as $attributeCode => $attributeValue) {
                 /** @var AbstractAttribute $attribute */
@@ -151,19 +176,21 @@ public function processInserts($entityType, $context)
                     $metadata->getEavEntityType(),
                     $attributeCode
                 );
-
+                $attributeTable = $attribute->getBackend()->getTable();
                 $conditions = $this->buildInsertConditions($attribute, $metadata, $context, $link);
                 $value = $this->prepareValue($entityType, $attributeValue, $attribute);
 
                 foreach ($conditions as $condition) {
                     $condition['value'] = $value;
-                    $metadata->getEntityConnection()->insertOnDuplicate(
-                        $attribute->getBackend()->getTable(),
-                        $condition
-                    );
+                    $columns = array_keys($condition);
+                    $columnsHash = implode('', $columns);
+                    $insertData[$attributeTable][$columnsHash]['columns'] = $columns;
+                    $insertData[$attributeTable][$columnsHash]['data'][] = array_values($condition);
                 }
             }
         }
+
+        return $insertData;
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
index 76a7c8c9d4ab9..9d57dc3fd919f 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
@@ -99,7 +99,7 @@ public function execute($entityType, $entityData, $arguments = [])
             $entityLinkField = $metadata->getLinkField();
             $attributeSetId = isset($entityData[AttributeLoader::ATTRIBUTE_SET_ID])
                 ? $entityData[AttributeLoader::ATTRIBUTE_SET_ID]
-                : null; // @todo verify is it normal to not have attributer_set_id
+                : null; // @todo verify is it normal to not have attribute_set_id
             /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
             foreach ($this->getAttributes($entityType, $attributeSetId) as $attribute) {
                 if ($attribute->isStatic()) {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index d64d5774fef1f..0e7a46125d872 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\ResourceModel\Entity;
 
 use Magento\Eav\Model\Config;
@@ -118,7 +119,7 @@ public function loadByCode(AbstractModel $object, $entityTypeId, $code)
      */
     private function _getMaxSortOrder(AbstractModel $object)
     {
-        if (intval($object->getAttributeGroupId()) > 0) {
+        if ((int)$object->getAttributeGroupId() > 0) {
             $connection = $this->getConnection();
             $bind = [
                 ':attribute_set_id' => $object->getAttributeSetId(),
@@ -170,10 +171,10 @@ protected function _beforeSave(AbstractModel $object)
     {
         $frontendLabel = $object->getFrontendLabel();
         if (is_array($frontendLabel)) {
-            if (!isset($frontendLabel[0]) || $frontendLabel[0] === null || $frontendLabel[0] == '') {
-                throw new \Magento\Framework\Exception\LocalizedException(__('The storefront label is not defined.'));
-            }
+            $this->checkDefaultFrontendLabelExists($frontendLabel, $frontendLabel);
             $object->setFrontendLabel($frontendLabel[0])->setStoreLabels($frontendLabel);
+        } else {
+            $this->setStoreLabels($object, $frontendLabel);
         }
 
         /**
@@ -224,6 +225,8 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
+     * Returns config instance
+     *
      * @return Config
      * @deprecated 100.0.7
      */
@@ -296,10 +299,10 @@ protected function _saveAdditionalAttributeData(AbstractModel $object)
      * Save in set including
      *
      * @param AbstractModel $object
-     * @param null $attributeEntityId
-     * @param null $attributeSetId
-     * @param null $attributeGroupId
-     * @param null $attributeSortOrder
+     * @param int|null $attributeEntityId
+     * @param int|null $attributeSetId
+     * @param int|null $attributeGroupId
+     * @param int|null $attributeSortOrder
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -393,7 +396,9 @@ protected function _processAttributeOptions($object, $option)
     protected function _checkDefaultOptionValue($values)
     {
         if (!isset($values[0])) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Default option value is not defined'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("The default option isn't defined. Set the option and try again.")
+            );
         }
     }
 
@@ -633,6 +638,7 @@ public function getAdditionalAttributeTable($entityTypeId)
 
     /**
      * Load additional attribute data.
+     *
      * Load label of current active store
      *
      * @param EntityAttribute|AbstractModel $object
@@ -739,4 +745,43 @@ public function __wakeup()
         $this->_storeManager = \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
+
+    /**
+     * This method extracts frontend labels into array and sets array values as storeLabels into an object.
+     *
+     * @param AbstractModel $object
+     * @param string|null $frontendLabel
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function setStoreLabels(AbstractModel $object, $frontendLabel)
+    {
+        $resultLabel = [];
+        $frontendLabels = $object->getFrontendLabels();
+        if (isset($frontendLabels[0])
+            && $frontendLabels[0] instanceof \Magento\Eav\Model\Entity\Attribute\FrontendLabel
+        ) {
+            foreach ($frontendLabels as $label) {
+                $resultLabel[$label->getStoreId()] = $label->getLabel();
+            }
+            $this->checkDefaultFrontendLabelExists($frontendLabel, $resultLabel);
+            $object->setStoreLabels($resultLabel);
+        }
+    }
+
+    /**
+     * This method checks whether value for default frontend label exists in attribute data.
+     *
+     * @param array|string|null $frontendLabel
+     * @param array $resultLabels
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function checkDefaultFrontendLabelExists($frontendLabel, $resultLabels)
+    {
+        $isAdminStoreLabel = (isset($resultLabels[0]) && !empty($resultLabels[0]));
+        if (empty($frontendLabel) && !$isAdminStoreLabel) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('The storefront label is not defined.'));
+        }
+    }
 }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
index 872a9b79c9ba6..cec415e513677 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -87,7 +87,7 @@ protected function _getLoadDataFields()
     }
 
     /**
-     * Specify select columns which are used for load arrtibute values
+     * Specify select columns which are used for load attribute values
      *
      * @return $this
      */
@@ -210,17 +210,19 @@ public function setAttributeSetsFilter(array $setIds)
      */
     public function setInAllAttributeSetsFilter(array $setIds)
     {
-        foreach ($setIds as $setId) {
-            $setId = (int)$setId;
-            if (!$setId) {
-                continue;
-            }
-            $alias = sprintf('entity_attribute_%d', $setId);
-            $joinCondition = $this->getConnection()->quoteInto(
-                "{$alias}.attribute_id = main_table.attribute_id AND {$alias}.attribute_set_id =?",
-                $setId
-            );
-            $this->join([$alias => 'eav_entity_attribute'], $joinCondition, 'attribute_id');
+        if (!empty($setIds)) {
+            $this->getSelect()
+                ->join(
+                    ['entity_attribute' => $this->getTable('eav_entity_attribute')],
+                    'entity_attribute.attribute_id = main_table.attribute_id',
+                    ['count' => new \Zend_Db_Expr('COUNT(*)')]
+                )
+                ->where(
+                    'entity_attribute.attribute_set_id IN (?)',
+                    $setIds
+                )
+                ->group('entity_attribute.attribute_id')
+                ->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
         }
 
         //$this->getSelect()->distinct(true);
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
index cd2e985e57ee8..79c277dcb6a82 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
@@ -44,8 +44,8 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
         );
         $valueExpr = $connection->getCheckSql(
             "{$optionTable2}.value_id IS NULL",
-            "{$optionTable1}.value",
-            "{$optionTable2}.value"
+            "{$optionTable1}.option_id",
+            "{$optionTable2}.option_id"
         );
 
         $collection->getSelect()->joinLeft(
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
index d6246c9072263..78351020064cf 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
@@ -78,7 +78,7 @@ protected function _construct()
      */
     public function setAttributeFilter($setId)
     {
-        return $this->addFieldToFilter('attribute_id', $setId);
+        return $this->addFieldToFilter('main_table.attribute_id', $setId);
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
index 02b6caa9e17c4..4e1762730a8d9 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\ResourceModel\Entity\Attribute;
 
 class Set extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
@@ -103,7 +104,7 @@ protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
             ->getDefaultAttributeSetId();
         if ($object->getAttributeSetId() == $defaultAttributeSetId) {
             throw new \Magento\Framework\Exception\StateException(
-                __('Default attribute set can not be deleted')
+                __('The default attribute set can\'t be deleted.')
             );
         }
         return parent::_beforeDelete($object);
@@ -183,7 +184,7 @@ public function getSetInfo(array $attributeIds, $setId = null)
     }
 
     /**
-     * Retrurn default attribute group id for attribute set id
+     * Return default attribute group id for attribute set id
      *
      * @param int $setId
      * @return int|null
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Helper.php b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
index 65e2fb250cecd..fc8a47994a6aa 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
@@ -46,6 +46,19 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource,
         \Magento\Framework\DB\Ddl\Table::TYPE_VARBINARY => 'blob',
     ];
 
+    /**
+     * Attribute types that can be united via UNION into one query
+     * while selecting attribute`s data from tables like `catalog_product_entity_datatype`
+     *
+     * This helps to run one query with all data types instead of one per each data type
+     *
+     * This data types are determined as 'groupable' because their tables have the same structure
+     * which means that they can be used in one UNION query
+     *
+     * @var array
+     */
+    private $_groupableTypes = ['varchar', 'text', 'decimal', 'datetime', 'int'];
+
     /**
      * Returns DDL type by column type in database
      *
@@ -72,15 +85,41 @@ public function getDdlTypeByColumnType($columnType)
     /**
      * Groups selects to separate unions depend on type
      *
+     * E.g. for input array:
+     *  [
+     *      varchar => [select1, select2],
+     *      text    => [select3],
+     *      int     => [select4],
+     *      bool    => [select5]
+     *  ]
+     *
+     * The result array will be:
+     *  [
+     *      0 => [select1, select2, select3, select4] // contains queries for varchar & text & int
+     *      1 => [select5]                            // contains queries for bool
+     *  ]
+     *
      * @param array $selects
      * @return array
      */
     public function getLoadAttributesSelectGroups($selects)
     {
         $mainGroup = [];
-        foreach ($selects as $selectGroup) {
-            $mainGroup = array_merge($mainGroup, $selectGroup);
+
+        foreach ($selects as $dataType => $selectGroup) {
+            if (in_array($dataType, $this->_groupableTypes)) {
+                $mainGroup['all'][] = $selectGroup;
+                continue;
+            }
+
+            $mainGroup[$dataType] = $selectGroup;
         }
-        return $mainGroup;
+
+        if (array_key_exists('all', $mainGroup)) {
+            // it is better to call array_merge once after loop instead of calling it on each loop
+            $mainGroup['all'] = array_merge(...$mainGroup['all']);
+        }
+
+        return array_values($mainGroup);
     }
 }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index 9febea9b7b2bf..cd2fe7477ca60 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Eav\Model\ResourceModel;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
@@ -59,13 +60,29 @@ public function __construct(
      * @param string $entityType
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
      * @throws \Exception if for unknown entity type
+     * @deprecated Not used anymore
+     * @see ReadHandler::getEntityAttributes
      */
     protected function getAttributes($entityType)
     {
         $metadata = $this->metadataPool->getMetadata($entityType);
         $eavEntityType = $metadata->getEavEntityType();
-        $attributes = (null === $eavEntityType) ? [] : $this->config->getAttributes($eavEntityType);
-        return $attributes;
+        return null === $eavEntityType ? [] : $this->config->getEntityAttributes($eavEntityType);
+    }
+
+    /**
+     * Get attribute of given entity type
+     *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @return \Magento\Eav\Api\Data\AttributeInterface[]
+     * @throws \Exception if for unknown entity type
+     */
+    private function getEntityAttributes(string $entityType, DataObject $entity): array
+    {
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $eavEntityType = $metadata->getEavEntityType();
+        return null === $eavEntityType ? [] : $this->config->getEntityAttributes($eavEntityType, $entity);
     }
 
     /**
@@ -105,7 +122,7 @@ public function execute($entityType, $entityData, $arguments = [])
         $selects = [];
 
         /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
-        foreach ($this->getAttributes($entityType) as $attribute) {
+        foreach ($this->getEntityAttributes($entityType, new DataObject($entityData)) as $attribute) {
             if (!$attribute->isStatic()) {
                 $attributeTables[$attribute->getBackend()->getTable()][] = $attribute->getAttributeId();
                 $attributesMap[$attribute->getAttributeId()] = $attribute->getAttributeCode();
diff --git a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
index cc7a0c4deb14c..d562773c6b50f 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
@@ -122,7 +122,10 @@ public function execute($entityType, $entityData, $arguments = [])
             }
             $attributeSetId = isset($entityData[AttributeLoader::ATTRIBUTE_SET_ID])
                 ? $entityData[AttributeLoader::ATTRIBUTE_SET_ID]
-                : null; // @todo verify is it normal to not have attributer_set_id
+                : null; // @todo verify is it normal to not have attribute_set_id
+            if (!isset($entityDataForSnapshot['attribute_set_id'])) {
+                $entityDataForSnapshot['attribute_set_id'] = $attributeSetId;
+            }
             $snapshot = $this->readSnapshot->execute($entityType, $entityDataForSnapshot);
             foreach ($this->getAttributes($entityType, $attributeSetId) as $attribute) {
                 $code = $attribute->getAttributeCode();
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 13f55308e6fa6..6e81ddc36e9c9 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Setup;
 
 use Magento\Eav\Model\Entity\Setup\Context;
 use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
@@ -99,7 +102,7 @@ public function __construct(
 
     /**
      * Gets setup model
-     *
+     * @deprecated
      * @return ModuleDataSetupInterface
      */
     public function getSetup()
@@ -201,7 +204,10 @@ public function addEntityType($code, array $params)
         if ($this->getEntityType($code, 'entity_type_id')) {
             $this->updateEntityType($code, $data);
         } else {
-            $this->setup->getConnection()->insert($this->setup->getTable('eav_entity_type'), $data);
+            $this->setup->getConnection()->insert(
+                $this->setup->getTable('eav_entity_type'),
+                $data
+            );
         }
 
         if (isset($params['entity_type_id'])) {
@@ -264,7 +270,7 @@ public function getEntityTypeId($entityTypeId)
             $entityTypeId = $this->getEntityType($entityTypeId, 'entity_type_id');
         }
         if (!is_numeric($entityTypeId)) {
-            throw new LocalizedException(__('Wrong entity ID'));
+            throw new LocalizedException(__('The entity ID is incorrect. Verify the ID and try again.'));
         }
 
         return $entityTypeId;
@@ -338,7 +344,10 @@ public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId
         if ($setId) {
             $this->updateAttributeSet($entityTypeId, $setId, $data);
         } else {
-            $this->setup->getConnection()->insert($this->setup->getTable('eav_attribute_set'), $data);
+            $this->setup->getConnection()->insert(
+                $this->setup->getTable('eav_attribute_set'),
+                $data
+            );
 
             $this->addAttributeGroup($entityTypeId, $name, $this->_generalGroupName);
         }
@@ -403,7 +412,7 @@ public function getAttributeSetId($entityTypeId, $setId)
             $setId = $this->getAttributeSet($entityTypeId, $setId, 'attribute_set_id');
         }
         if (!is_numeric($setId)) {
-            throw new LocalizedException(__('Wrong attribute set ID'));
+            throw new LocalizedException(__('The attribute set ID is incorrect. Verify the ID and try again.'));
         }
 
         return $setId;
@@ -549,7 +558,10 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul
                 }
                 $data['attribute_group_code'] = $attributeGroupCode;
             }
-            $this->setup->getConnection()->insert($this->setup->getTable('eav_attribute_group'), $data);
+            $this->setup->getConnection()->insert(
+                $this->setup->getTable('eav_attribute_group'),
+                $data
+            );
         }
 
         return $this;
@@ -665,7 +677,7 @@ public function getAttributeGroupId($entityTypeId, $setId, $groupId)
         }
 
         if (!is_numeric($groupId)) {
-            throw new LocalizedException(__('Wrong attribute group ID'));
+            throw new LocalizedException(__('The attribute group ID is incorrect. Verify the ID and try again.'));
         }
         return $groupId;
     }
@@ -896,13 +908,17 @@ public function addAttributeOption($option)
                     $data = [
                         'sort_order' => isset($option['order'][$optionId]) ? $option['order'][$optionId] : 0,
                     ];
-                    $this->setup->getConnection()->update($optionTable, $data, ['option_id=?' => $intOptionId]);
+                    $this->setup->getConnection()->update(
+                        $optionTable,
+                        $data,
+                        ['option_id=?' => $intOptionId]
+                    );
                 }
 
                 // Default value
                 if (!isset($values[0])) {
                     throw new \Magento\Framework\Exception\LocalizedException(
-                        __('Default option value is not defined')
+                        __("The default option isn't defined. Set the option and try again.")
                     );
                 }
                 $condition = ['option_id =?' => $intOptionId];
@@ -970,7 +986,10 @@ private function _updateAttribute($entityTypeId, $id, $field, $value = null, $so
             $bind = [];
             foreach ($field as $k => $v) {
                 if (isset($attributeFields[$k])) {
-                    $bind[$k] = $this->setup->getConnection()->prepareColumnValue($attributeFields[$k], $v);
+                    $bind[$k] = $this->setup->getConnection()->prepareColumnValue(
+                        $attributeFields[$k],
+                        $v
+                    );
                 }
             }
             if (!$bind) {
@@ -1016,16 +1035,23 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
         if (!$additionalTable) {
             return $this;
         }
-        $additionalTableExists = $this->setup->getConnection()->isTableExists($this->setup->getTable($additionalTable));
+        $additionalTableExists = $this->setup->getConnection()->isTableExists(
+            $this->setup->getTable($additionalTable)
+        );
         if (!$additionalTableExists) {
             return $this;
         }
-        $attributeFields = $this->setup->getConnection()->describeTable($this->setup->getTable($additionalTable));
+        $attributeFields = $this->setup->getConnection()->describeTable(
+            $this->setup->getTable($additionalTable)
+        );
         if (is_array($field)) {
             $bind = [];
             foreach ($field as $k => $v) {
                 if (isset($attributeFields[$k])) {
-                    $bind[$k] = $this->setup->getConnection()->prepareColumnValue($attributeFields[$k], $v);
+                    $bind[$k] = $this->setup->getConnection()->prepareColumnValue(
+                        $attributeFields[$k],
+                        $v
+                    );
                 }
             }
             if (!$bind) {
@@ -1358,7 +1384,10 @@ public function addAttributeToGroup($entityType, $setId, $groupId, $attributeId,
             }
             $sortOrder = is_numeric($sortOrder) ? $sortOrder : 1;
             $data['sort_order'] = $sortOrder;
-            $this->setup->getConnection()->insert($this->setup->getTable('eav_entity_attribute'), $data);
+            $this->setup->getConnection()->insert(
+                $this->setup->getTable('eav_entity_attribute'),
+                $data
+            );
         }
 
         return $this;
@@ -1439,7 +1468,9 @@ public function installEntities($entities = null)
      */
     private function _getAttributeTableFields()
     {
-        return $this->setup->getConnection()->describeTable($this->setup->getTable('eav_attribute'));
+        return $this->setup->getConnection()->describeTable(
+            $this->setup->getTable('eav_attribute')
+        );
     }
 
     /**
@@ -1463,8 +1494,13 @@ private function _insertAttribute(array $data)
             return $this;
         }
 
-        $this->setup->getConnection()->insert($this->setup->getTable('eav_attribute'), $bind);
-        $attributeId = $this->setup->getConnection()->lastInsertId($this->setup->getTable('eav_attribute'));
+        $this->setup->getConnection()->insert(
+            $this->setup->getTable('eav_attribute'),
+            $bind
+        );
+        $attributeId = $this->setup->getConnection()->lastInsertId(
+            $this->setup->getTable('eav_attribute')
+        );
         $this->_insertAttributeAdditionalData(
             $data['entity_type_id'],
             array_merge(['attribute_id' => $attributeId], $data)
@@ -1486,10 +1522,14 @@ private function _insertAttributeAdditionalData($entityTypeId, array $data)
         if (!$additionalTable) {
             return $this;
         }
-        $additionalTableExists = $this->setup->getConnection()->isTableExists($this->setup->getTable($additionalTable));
+        $additionalTableExists = $this->setup->getConnection()->isTableExists(
+            $this->setup->getTable($additionalTable)
+        );
         if ($additionalTable && $additionalTableExists) {
             $bind = [];
-            $fields = $this->setup->getConnection()->describeTable($this->setup->getTable($additionalTable));
+            $fields = $this->setup->getConnection()->describeTable(
+                $this->setup->getTable($additionalTable)
+            );
             foreach ($data as $k => $v) {
                 if (isset($fields[$k])) {
                     $bind[$k] = $this->setup->getConnection()->prepareColumnValue($fields[$k], $v);
@@ -1498,7 +1538,10 @@ private function _insertAttributeAdditionalData($entityTypeId, array $data)
             if (!$bind) {
                 return $this;
             }
-            $this->setup->getConnection()->insert($this->setup->getTable($additionalTable), $bind);
+            $this->setup->getConnection()->insert(
+                $this->setup->getTable($additionalTable),
+                $bind
+            );
         }
 
         return $this;
diff --git a/app/code/Magento/Eav/Setup/InstallData.php b/app/code/Magento/Eav/Setup/InstallData.php
deleted file mode 100644
index ca2156d62ee42..0000000000000
--- a/app/code/Magento/Eav/Setup/InstallData.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Eav\Setup;
-
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        /** @var \Magento\Framework\Module\Setup\Migration $migrationSetup */
-        $migrationSetup = $setup->createMigrationSetup();
-
-        $migrationSetup->appendClassAliasReplace(
-            'eav_attribute',
-            'attribute_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['attribute_id']
-        );
-        $migrationSetup->appendClassAliasReplace(
-            'eav_attribute',
-            'backend_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['attribute_id']
-        );
-        $migrationSetup->appendClassAliasReplace(
-            'eav_attribute',
-            'frontend_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['attribute_id']
-        );
-        $migrationSetup->appendClassAliasReplace(
-            'eav_attribute',
-            'source_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['attribute_id']
-        );
-
-        $migrationSetup->appendClassAliasReplace(
-            'eav_entity_type',
-            'entity_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['entity_type_id']
-        );
-        $migrationSetup->appendClassAliasReplace(
-            'eav_entity_type',
-            'attribute_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['entity_type_id']
-        );
-        $migrationSetup->appendClassAliasReplace(
-            'eav_entity_type',
-            'increment_model',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['entity_type_id']
-        );
-        $migrationSetup->appendClassAliasReplace(
-            'eav_entity_type',
-            'entity_attribute_collection',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_RESOURCE,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['entity_type_id']
-        );
-
-        $migrationSetup->doUpdateClassAliases();
-
-        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        $groups = $eavSetup->getAttributeGroupCollectionFactory();
-        foreach ($groups as $group) {
-            /** @var $group \Magento\Eav\Model\Entity\Attribute\Group*/
-            $group->save();
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Eav/Setup/InstallSchema.php b/app/code/Magento/Eav/Setup/InstallSchema.php
deleted file mode 100644
index 98ccbcbce6f05..0000000000000
--- a/app/code/Magento/Eav/Setup/InstallSchema.php
+++ /dev/null
@@ -1,1419 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Eav\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'eav_entity_type'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_type')
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Type Id'
-        )->addColumn(
-            'entity_type_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => false],
-            'Entity Type Code'
-        )->addColumn(
-            'entity_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Entity Model'
-        )->addColumn(
-            'attribute_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Attribute Model'
-        )->addColumn(
-            'entity_table',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Entity Table'
-        )->addColumn(
-            'value_table_prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Value Table Prefix'
-        )->addColumn(
-            'entity_id_field',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Entity Id Field'
-        )->addColumn(
-            'is_data_sharing',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Defines Is Data Sharing'
-        )->addColumn(
-            'data_sharing_key',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            ['default' => 'default'],
-            'Data Sharing Key'
-        )->addColumn(
-            'default_attribute_set_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Default Attribute Set Id'
-        )->addColumn(
-            'increment_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => false],
-            'Increment Model'
-        )->addColumn(
-            'increment_per_store',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Increment Per Store'
-        )->addColumn(
-            'increment_pad_length',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '8'],
-            'Increment Pad Length'
-        )->addColumn(
-            'increment_pad_char',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            1,
-            ['nullable' => false, 'default' => '0'],
-            'Increment Pad Char'
-        )->addColumn(
-            'additional_attribute_table',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => false],
-            'Additional Attribute Table'
-        )->addColumn(
-            'entity_attribute_collection',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Entity Attribute Collection'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_type', ['entity_type_code']),
-            ['entity_type_code']
-        )->setComment(
-            'Eav Entity Type'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_set_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Set Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => true, 'default' => null],
-            'Increment Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Parent Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Defines Is Entity Active'
-        )->addIndex(
-            $installer->getIdxName('eav_entity', ['entity_type_id']),
-            ['entity_type_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_entity', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_datetime'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_datetime')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Attribute Value'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_datetime', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_datetime', ['attribute_id', 'value']),
-            ['attribute_id', 'value']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_datetime', ['entity_type_id', 'value']),
-            ['entity_type_id', 'value']
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_datetime',
-                ['entity_id', 'attribute_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_datetime', 'entity_id', 'eav_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('eav_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_datetime', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_datetime', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Value Prefix'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_decimal'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_decimal')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Attribute Value'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_decimal', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_decimal', ['attribute_id', 'value']),
-            ['attribute_id', 'value']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_decimal', ['entity_type_id', 'value']),
-            ['entity_type_id', 'value']
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_decimal',
-                ['entity_id', 'attribute_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_decimal', 'entity_id', 'eav_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('eav_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_decimal', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_decimal', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Value Prefix'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_int'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_int')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Attribute Value'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_int', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_int', ['attribute_id', 'value']),
-            ['attribute_id', 'value']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_int', ['entity_type_id', 'value']),
-            ['entity_type_id', 'value']
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_int',
-                ['entity_id', 'attribute_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_int', 'entity_id', 'eav_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('eav_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_int', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_int', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Value Prefix'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_text'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_text')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => false],
-            'Attribute Value'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_text', ['entity_type_id']),
-            ['entity_type_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_text', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_text', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_text',
-                ['entity_id', 'attribute_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_text', 'entity_id', 'eav_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('eav_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_text', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_text', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Value Prefix'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_varchar'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_varchar')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Attribute Value'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_varchar', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_varchar', ['attribute_id', 'value']),
-            ['attribute_id', 'value']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_varchar', ['entity_type_id', 'value']),
-            ['entity_type_id', 'value']
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_varchar',
-                ['entity_id', 'attribute_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_varchar', 'entity_id', 'eav_entity', 'entity_id'),
-            'entity_id',
-            $installer->getTable('eav_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_varchar', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_varchar', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Value Prefix'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_attribute'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_attribute')
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Attribute Code'
-        )->addColumn(
-            'attribute_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Attribute Model'
-        )->addColumn(
-            'backend_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Backend Model'
-        )->addColumn(
-            'backend_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            8,
-            ['nullable' => false, 'default' => 'static'],
-            'Backend Type'
-        )->addColumn(
-            'backend_table',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Backend Table'
-        )->addColumn(
-            'frontend_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Frontend Model'
-        )->addColumn(
-            'frontend_input',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Frontend Input'
-        )->addColumn(
-            'frontend_label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Frontend Label'
-        )->addColumn(
-            'frontend_class',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Frontend Class'
-        )->addColumn(
-            'source_model',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Source Model'
-        )->addColumn(
-            'is_required',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Defines Is Required'
-        )->addColumn(
-            'is_user_defined',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Defines Is User Defined'
-        )->addColumn(
-            'default_value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Default Value'
-        )->addColumn(
-            'is_unique',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Defines Is Unique'
-        )->addColumn(
-            'note',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Note'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_attribute',
-                ['entity_type_id', 'attribute_code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_type_id', 'attribute_code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Attribute'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_store'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_store')
-        )->addColumn(
-            'entity_store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Store Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'increment_prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            ['nullable' => true],
-            'Increment Prefix'
-        )->addColumn(
-            'increment_last_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => true],
-            'Last Incremented Id'
-        )->addIndex(
-            $installer->getIdxName('eav_entity_store', ['entity_type_id']),
-            ['entity_type_id']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_store', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_store', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_store', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Store'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_attribute_set'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_attribute_set')
-        )->addColumn(
-            'attribute_set_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Set Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_set_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Attribute Set Name'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_attribute_set',
-                ['entity_type_id', 'attribute_set_name'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_type_id', 'attribute_set_name'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_set', ['entity_type_id', 'sort_order']),
-            ['entity_type_id', 'sort_order']
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_set', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Attribute Set'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_attribute_group'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_attribute_group')
-        )->addColumn(
-            'attribute_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Group Id'
-        )->addColumn(
-            'attribute_set_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Set Id'
-        )->addColumn(
-            'attribute_group_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Attribute Group Name'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addColumn(
-            'default_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Default Id'
-        )->addColumn(
-            'attribute_group_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Attribute Group Code'
-        )->addColumn(
-            'tab_group_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['default' => null],
-            'Tab Group Code'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_attribute_group',
-                ['attribute_set_id', 'attribute_group_name'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['attribute_set_id', 'attribute_group_name'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_group', ['attribute_set_id', 'sort_order']),
-            ['attribute_set_id', 'sort_order']
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_group', 'attribute_set_id', 'eav_attribute_set', 'attribute_set_id'),
-            'attribute_set_id',
-            $installer->getTable('eav_attribute_set'),
-            'attribute_set_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Attribute Group'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_entity_attribute'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_entity_attribute')
-        )->addColumn(
-            'entity_attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Attribute Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Type Id'
-        )->addColumn(
-            'attribute_set_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Set Id'
-        )->addColumn(
-            'attribute_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Group Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_attribute',
-                ['attribute_set_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['attribute_set_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_entity_attribute',
-                ['attribute_group_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['attribute_group_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('eav_entity_attribute', ['attribute_set_id', 'sort_order']),
-            ['attribute_set_id', 'sort_order']
-        )->addIndex(
-            $installer->getIdxName('eav_entity_attribute', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_entity_attribute', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'eav_entity_attribute',
-                'attribute_group_id',
-                'eav_attribute_group',
-                'attribute_group_id'
-            ),
-            'attribute_group_id',
-            $installer->getTable('eav_attribute_group'),
-            'attribute_group_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Entity Attributes'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_attribute_option'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_attribute_option')
-        )->addColumn(
-            'option_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Option Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_option', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_option', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Attribute Option'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_attribute_option_value'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_attribute_option_value')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'option_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Option Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_option_value', ['option_id']),
-            ['option_id']
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_option_value', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_option_value', 'option_id', 'eav_attribute_option', 'option_id'),
-            'option_id',
-            $installer->getTable('eav_attribute_option'),
-            'option_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_option_value', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Attribute Option Value'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_attribute_label'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_attribute_label')
-        )->addColumn(
-            'attribute_label_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Label Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_label', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('eav_attribute_label', ['attribute_id', 'store_id']),
-            ['attribute_id', 'store_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_label', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_attribute_label', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Attribute Label'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_form_type'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_form_type')
-        )->addColumn(
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Type Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Label'
-        )->addColumn(
-            'is_system',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is System'
-        )->addColumn(
-            'theme',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            ['nullable' => true],
-            'Theme'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Store Id'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_form_type',
-                ['code', 'theme', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['code', 'theme', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('eav_form_type', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_form_type', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Form Type'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_form_type_entity'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_form_type_entity')
-        )->addColumn(
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Type Id'
-        )->addColumn(
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Type Id'
-        )->addIndex(
-            $installer->getIdxName('eav_form_type_entity', ['entity_type_id']),
-            ['entity_type_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_form_type_entity', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-            'entity_type_id',
-            $installer->getTable('eav_entity_type'),
-            'entity_type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_form_type_entity', 'type_id', 'eav_form_type', 'type_id'),
-            'type_id',
-            $installer->getTable('eav_form_type'),
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Form Type Entity'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_form_fieldset'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_form_fieldset')
-        )->addColumn(
-            'fieldset_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Fieldset Id'
-        )->addColumn(
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Type Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_form_fieldset',
-                ['type_id', 'code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['type_id', 'code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('eav_form_fieldset', 'type_id', 'eav_form_type', 'type_id'),
-            'type_id',
-            $installer->getTable('eav_form_type'),
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Form Fieldset'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_form_fieldset_label'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_form_fieldset_label')
-        )->addColumn(
-            'fieldset_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Fieldset Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store Id'
-        )->addColumn(
-            'label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Label'
-        )->addIndex(
-            $installer->getIdxName('eav_form_fieldset_label', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_form_fieldset_label', 'fieldset_id', 'eav_form_fieldset', 'fieldset_id'),
-            'fieldset_id',
-            $installer->getTable('eav_form_fieldset'),
-            'fieldset_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_form_fieldset_label', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Form Fieldset Label'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'eav_form_element'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('eav_form_element')
-        )->addColumn(
-            'element_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Element Id'
-        )->addColumn(
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Type Id'
-        )->addColumn(
-            'fieldset_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Fieldset Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Attribute Id'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addIndex(
-            $installer->getIdxName(
-                'eav_form_element',
-                ['type_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['type_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('eav_form_element', ['fieldset_id']),
-            ['fieldset_id']
-        )->addIndex(
-            $installer->getIdxName('eav_form_element', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('eav_form_element', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('eav_form_element', 'fieldset_id', 'eav_form_fieldset', 'fieldset_id'),
-            'fieldset_id',
-            $installer->getTable('eav_form_fieldset'),
-            'fieldset_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->addForeignKey(
-            $installer->getFkName('eav_form_element', 'type_id', 'eav_form_type', 'type_id'),
-            'type_id',
-            $installer->getTable('eav_form_type'),
-            'type_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Eav Form Element'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php b/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php
new file mode 100644
index 0000000000000..5cae23f8fd1f2
--- /dev/null
+++ b/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Eav\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InitializeAttributeModels
+ * @package Magento\Eav\Setup\Patch
+ */
+class InitializeAttributeModels implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * InitializeAttributeModels constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->eavSetupFactory = $eavSetupFactory;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+        /** @var \Magento\Framework\Module\Setup\Migration $migrationSetup */
+        $migrationSetup = $this->moduleDataSetup->createMigrationSetup();
+
+        $migrationSetup->appendClassAliasReplace(
+            'eav_attribute',
+            'attribute_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['attribute_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_attribute',
+            'backend_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['attribute_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_attribute',
+            'frontend_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['attribute_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_attribute',
+            'source_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['attribute_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_entity_type',
+            'entity_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['entity_type_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_entity_type',
+            'attribute_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['entity_type_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_entity_type',
+            'increment_model',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['entity_type_id']
+        );
+        $migrationSetup->appendClassAliasReplace(
+            'eav_entity_type',
+            'entity_attribute_collection',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_RESOURCE,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['entity_type_id']
+        );
+        $migrationSetup->doUpdateClassAliases();
+        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create([
+            'setup' => $this->moduleDataSetup
+        ]);
+        $groups = $eavSetup->getAttributeGroupCollectionFactory();
+        foreach ($groups as $group) {
+            /** @var $group \Magento\Eav\Model\Entity\Attribute\Group*/
+            $group->save();
+        }
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Eav/Setup/UpgradeSchema.php b/app/code/Magento/Eav/Setup/UpgradeSchema.php
deleted file mode 100644
index 616514b3aa156..0000000000000
--- a/app/code/Magento/Eav/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Eav\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Upgrade the Eav module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.1.0', '<')) {
-            $this->addUniqueKeyToEavAttributeGroupTable($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.1.1', '<')) {
-            $this->modifyAttributeCodeColumnForNotNullable($setup);
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addUniqueKeyToEavAttributeGroupTable(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->addIndex(
-            $setup->getTable('eav_attribute_group'),
-            $setup->getIdxName(
-                'catalog_category_product',
-                ['attribute_set_id', 'attribute_group_code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['attribute_set_id', 'attribute_group_code'],
-            \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-        );
-    }
-
-    /**
-     * Column attribute_code from eav_attribute should not be nullable.
-     *
-     * @param SchemaSetupInterface $setup
-     */
-    private function modifyAttributeCodeColumnForNotNullable(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->modifyColumn(
-            $setup->getTable('eav_attribute'),
-            'attribute_code',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                'length' => 255,
-                'nullable' => false,
-                'comment' => 'Attribute Code',
-            ]
-        );
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE.txt b/app/code/Magento/Eav/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE.txt
rename to app/code/Magento/Eav/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE_AFL.txt b/app/code/Magento/Eav/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE_AFL.txt
rename to app/code/Magento/Eav/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Eav/Test/Mftf/README.md b/app/code/Magento/Eav/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fe122f3227881
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Eav Functional Tests
+
+The Functional Test Module for **Magento Eav** module.
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php
index 2d00e02adc55d..d3c221bca5787 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php
@@ -14,19 +14,30 @@ class InputtypeTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->model = new \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype();
+        $this->model = new \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype(
+            $this->getOptionsArray()
+        );
     }
 
     public function testToOptionArray()
     {
-        $expectedResult = [
+        $expectedResult = $this->getOptionsArray();
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+
+    /**
+     * @return array
+     */
+    private function getOptionsArray()
+    {
+        return [
             ['value' => 'text', 'label' => 'Text Field'],
             ['value' => 'textarea', 'label' => 'Text Area'],
+            ['value' => 'texteditor', 'label' => 'Text Editor'],
             ['value' => 'date', 'label' => 'Date'],
             ['value' => 'boolean', 'label' => 'Yes/No'],
             ['value' => 'multiselect', 'label' => 'Multiple Select'],
             ['value' => 'select', 'label' => 'Dropdown']
         ];
-        $this->assertEquals($expectedResult, $this->model->toOptionArray());
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
index c89f581daac82..2df87c39868a1 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
@@ -143,7 +143,7 @@ public function validateValueDataProvider()
                 'originalValue' => 'value',
                 'isRequired' => true,
                 'isAjaxRequest' => false,
-                'rules' => ['max_image_heght' => 2],
+                'rules' => ['max_image_height' => 2],
                 'expectedResult' => ['"Label" height exceeds allowed value of 2 px.']
             ],
             [
@@ -151,7 +151,7 @@ public function validateValueDataProvider()
                 'originalValue' => 'value',
                 'isRequired' => true,
                 'isAjaxRequest' => false,
-                'rules' => ['max_image_heght' => 2000],
+                'rules' => ['max_image_height' => 2000],
                 'expectedResult' => true
             ],
             [
@@ -159,7 +159,7 @@ public function validateValueDataProvider()
                 'originalValue' => 'value',
                 'isRequired' => true,
                 'isAjaxRequest' => false,
-                'rules' => ['max_image_heght' => 2, 'max_image_width' => 2],
+                'rules' => ['max_image_height' => 2, 'max_image_width' => 2],
                 'expectedResult' => [
                     '"Label" width exceeds allowed value of 2 px.',
                     '"Label" height exceeds allowed value of 2 px.',
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php
index f628d52f6647f..bde4a3adb9de5 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model\Attribute\Data;
 
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
 class MultilineTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -13,15 +17,21 @@ class MultilineTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Stdlib\StringUtils
      */
     protected $stringMock;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
-        $timezoneMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        /** @var TimezoneInterface $timezoneMock */
+        $timezoneMock = $this->createMock(TimezoneInterface::class);
+        /** @var \Psr\Log\LoggerInterface $loggerMock */
         $loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $localeResolverMock = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
+        /** @var ResolverInterface $localeResolverMock */
+        $localeResolverMock = $this->createMock(ResolverInterface::class);
         $this->stringMock = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
 
         $this->model = new \Magento\Eav\Model\Attribute\Data\Multiline(
@@ -33,7 +43,7 @@ protected function setUp()
     }
 
     /**
-     * @covers \Magento\Eav\Model\Attribute\Data\Multiline::extractValue
+     * @covers       \Magento\Eav\Model\Attribute\Data\Multiline::extractValue
      *
      * @param mixed $param
      * @param mixed $expectedResult
@@ -41,11 +51,15 @@ protected function setUp()
      */
     public function testExtractValue($param, $expectedResult)
     {
+        /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\RequestInterface $requestMock */
         $requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Eav\Model\Attribute $attributeMock */
         $attributeMock = $this->createMock(\Magento\Eav\Model\Attribute::class);
 
         $requestMock->expects($this->once())->method('getParam')->will($this->returnValue($param));
-        $attributeMock->expects($this->once())->method('getAttributeCode')->will($this->returnValue('attributeCode'));
+        $attributeMock->expects($this->once())
+            ->method('getAttributeCode')
+            ->will($this->returnValue('attributeCode'));
 
         $this->model->setAttribute($attributeMock);
         $this->assertEquals($expectedResult, $this->model->extractValue($requestMock));
@@ -69,7 +83,7 @@ public function extractValueDataProvider()
     }
 
     /**
-     * @covers \Magento\Eav\Model\Attribute\Data\Multiline::outputValue
+     * @covers       \Magento\Eav\Model\Attribute\Data\Multiline::outputValue
      *
      * @param string $format
      * @param mixed $expectedResult
@@ -77,9 +91,13 @@ public function extractValueDataProvider()
      */
     public function testOutputValue($format, $expectedResult)
     {
+        /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Model\AbstractModel $entityMock */
         $entityMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
-        $entityMock->expects($this->once())->method('getData')->will($this->returnValue("value1\nvalue2"));
+        $entityMock->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue("value1\nvalue2"));
 
+        /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Eav\Model\Attribute $attributeMock */
         $attributeMock = $this->createMock(\Magento\Eav\Model\Attribute::class);
 
         $this->model->setEntity($entityMock);
@@ -113,8 +131,8 @@ public function outputValueDataProvider()
     }
 
     /**
-     * @covers \Magento\Eav\Model\Attribute\Data\Multiline::validateValue
-     * @covers \Magento\Eav\Model\Attribute\Data\Text::validateValue
+     * @covers       \Magento\Eav\Model\Attribute\Data\Multiline::validateValue
+     * @covers       \Magento\Eav\Model\Attribute\Data\Text::validateValue
      *
      * @param mixed $value
      * @param bool $isAttributeRequired
@@ -124,14 +142,23 @@ public function outputValueDataProvider()
      */
     public function testValidateValue($value, $isAttributeRequired, $rules, $expectedResult)
     {
+        /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Model\AbstractModel $entityMock */
         $entityMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
-        $entityMock->expects($this->any())->method('getDataUsingMethod')->will($this->returnValue("value1\nvalue2"));
+        $entityMock->expects($this->any())
+            ->method('getDataUsingMethod')
+            ->will($this->returnValue("value1\nvalue2"));
 
+        /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Eav\Model\Attribute $attributeMock */
         $attributeMock = $this->createMock(\Magento\Eav\Model\Attribute::class);
         $attributeMock->expects($this->any())->method('getMultilineCount')->will($this->returnValue(2));
         $attributeMock->expects($this->any())->method('getValidateRules')->will($this->returnValue($rules));
-        $attributeMock->expects($this->any())->method('getStoreLabel')->will($this->returnValue('Label'));
-        $attributeMock->expects($this->any())->method('getIsRequired')->will($this->returnValue($isAttributeRequired));
+        $attributeMock->expects($this->any())
+            ->method('getStoreLabel')
+            ->will($this->returnValue('Label'));
+
+        $attributeMock->expects($this->any())
+            ->method('getIsRequired')
+            ->will($this->returnValue($isAttributeRequired));
 
         $this->stringMock->expects($this->any())->method('strlen')->will($this->returnValue(5));
 
@@ -159,7 +186,7 @@ public function validateValueDataProvider()
                 'expectedResult' => true,
             ],
             [
-                'value' => ['value1',  'value2'],
+                'value' => ['value1', 'value2'],
                 'isAttributeRequired' => false,
                 'rules' => [],
                 'expectedResult' => true,
@@ -167,13 +194,13 @@ public function validateValueDataProvider()
             [
                 'value' => 'value',
                 'isAttributeRequired' => false,
-                'rules' => ['max_text_length' => 3],
+                'rules' => ['input_validation' => 'other', 'max_text_length' => 3],
                 'expectedResult' => ['"Label" length must be equal or less than 3 characters.'],
             ],
             [
                 'value' => 'value',
                 'isAttributeRequired' => false,
-                'rules' => ['min_text_length' => 10],
+                'rules' => ['input_validation' => 'other', 'min_text_length' => 10],
                 'expectedResult' => ['"Label" length must be equal or greater than 10 characters.'],
             ],
             [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
index 36eac0bfab27b..bbbe712b2bb42 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model\Attribute\Data;
 
 class TextTest extends \PHPUnit\Framework\TestCase
@@ -12,6 +13,9 @@ class TextTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         $locale = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
@@ -19,14 +23,77 @@ protected function setUp()
         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
         $helper = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
 
-        $attributeData = [
+        $this->_model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
+        $this->_model->setAttribute(
+            $this->createAttribute(
+                [
+                    'store_label' => 'Test',
+                    'attribute_code' => 'test',
+                    'is_required' => 1,
+                    'validate_rules' => ['min_text_length' => 0, 'max_text_length' => 0, 'input_validation' => 0],
+                ]
+            )
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function tearDown()
+    {
+        $this->_model = null;
+    }
+
+    /**
+     * Test for string validation
+     */
+    public function testValidateValueString(): void
+    {
+        $inputValue = '0';
+        $expectedResult = true;
+        $this->assertEquals($expectedResult, $this->_model->validateValue($inputValue));
+    }
+
+    /**
+     * Test for integer validation
+     */
+    public function testValidateValueInteger(): void
+    {
+        $inputValue = 0;
+        $expectedResult = ['"Test" is a required value.'];
+        $result = $this->_model->validateValue($inputValue);
+        $this->assertEquals($expectedResult, [(string)$result[0]]);
+    }
+
+    /**
+     * Test without length validation
+     */
+    public function testWithoutLengthValidation(): void
+    {
+        $expectedResult = true;
+        $defaultAttributeData = [
             'store_label' => 'Test',
             'attribute_code' => 'test',
             'is_required' => 1,
             'validate_rules' => ['min_text_length' => 0, 'max_text_length' => 0, 'input_validation' => 0],
         ];
 
-        $attributeClass = \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class;
+        $defaultAttributeData['validate_rules']['min_text_length'] = 2;
+        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
+        $this->assertEquals($expectedResult, $this->_model->validateValue('t'));
+
+        $defaultAttributeData['validate_rules']['max_text_length'] = 3;
+        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
+        $this->assertEquals($expectedResult, $this->_model->validateValue('test'));
+    }
+
+    /**
+     * @param array $attributeData
+     * @return \Magento\Eav\Model\Attribute
+     */
+    protected function createAttribute($attributeData): \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+    {
+        $attributeClass = \Magento\Eav\Model\Attribute::class;
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $eavTypeFactory = $this->createMock(\Magento\Eav\Model\Entity\TypeFactory::class);
         $arguments = $objectManagerHelper->getConstructArguments(
@@ -41,27 +108,6 @@ protected function setUp()
             ->setMethods(['_init'])
             ->setConstructorArgs($arguments)
             ->getMock();
-        $this->_model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
-        $this->_model->setAttribute($attribute);
-    }
-
-    protected function tearDown()
-    {
-        $this->_model = null;
-    }
-
-    public function testValidateValueString()
-    {
-        $inputValue = '0';
-        $expectedResult = true;
-        $this->assertEquals($expectedResult, $this->_model->validateValue($inputValue));
-    }
-
-    public function testValidateValueInteger()
-    {
-        $inputValue = 0;
-        $expectedResult = ['"Test" is a required value.'];
-        $result = $this->_model->validateValue($inputValue);
-        $this->assertEquals($expectedResult, [(string)$result[0]]);
+        return $attribute;
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/GroupRepositoryTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/GroupRepositoryTest.php
index c07122e049a74..6f9dab002aa0a 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/GroupRepositoryTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/GroupRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model\Attribute;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -176,7 +177,7 @@ public function testSaveThrowExceptionIfAttributeSetDoesNotExist()
      * Test saving throws exception if cannot save group
      *
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot save attributeGroup
+     * @expectedExceptionMessage The attributeGroup can't be saved.
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
      * @return void
@@ -207,7 +208,7 @@ public function testSaveThrowExceptionIfCannotSaveGroup()
      * Test saving throws exception if group does not belong to provided set
      *
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Attribute group does not belong to provided attribute set
+     * @expectedExceptionMessage The attribute group doesn't belong to the provided attribute set.
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\StateException
      * @return void
@@ -266,8 +267,6 @@ public function testSaveThrowExceptionIfProvidedGroupDoesNotExist()
      */
     public function testGetList()
     {
-        $attributeSetId = 'filter';
-
         $filterInterfaceMock = $this->getMockBuilder(\Magento\Framework\Api\Search\FilterGroup::class)
             ->disableOriginalConstructor()
             ->setMethods([
@@ -275,24 +274,18 @@ public function testGetList()
                 'getValue',
             ])
             ->getMock();
-        $filterInterfaceMock->expects($this->once())
-            ->method('getField')
-            ->willReturn('attribute_set_id');
-        $filterInterfaceMock->expects($this->once())
-            ->method('getValue')
-            ->willReturn($attributeSetId);
 
         $filterGroupMock = $this->getMockBuilder(\Magento\Framework\Api\Search\FilterGroup::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $filterGroupMock->expects($this->once())
+        $filterGroupMock->expects($this->any())
             ->method('getFilters')
             ->willReturn([$filterInterfaceMock]);
 
         $searchCriteriaMock = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteriaInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $searchCriteriaMock->expects($this->once())
+        $searchCriteriaMock->expects($this->any())
             ->method('getFilterGroups')
             ->willReturn([$filterGroupMock]);
 
@@ -324,52 +317,6 @@ public function testGetList()
         $this->assertEquals($searchResultsMock, $this->model->getList($searchCriteriaMock));
     }
 
-    /**
-     * Test get list with invalid input exception
-     *
-     * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage attribute_set_id is a required field.
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @return void
-     */
-    public function testGetListWithInvalidInputException()
-    {
-        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
-        $searchCriteriaMock->expects($this->once())->method('getFilterGroups')->willReturn([]);
-        $this->model->getList($searchCriteriaMock);
-    }
-
-    /**
-     * Test get list with no such entity exception
-     *
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage No such entity with attributeSetId = filter
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @return void
-     */
-    public function testGetListWithNoSuchEntityException()
-    {
-        $attributeSetId = 'filter';
-        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
-        $filterGroupMock = $this->createMock(\Magento\Framework\Api\Search\FilterGroup::class);
-        $filterInterfaceMock = $this->createMock(\Magento\Framework\Api\Filter::class);
-
-        $searchCriteriaMock->expects($this->once())->method('getFilterGroups')->willReturn([$filterGroupMock]);
-
-        $filterGroupMock->expects($this->once())->method('getFilters')->willReturn([$filterInterfaceMock]);
-        $filterInterfaceMock->expects($this->once())->method('getField')->willReturn('attribute_set_id');
-        $filterInterfaceMock->expects($this->once())->method('getValue')->willReturn($attributeSetId);
-
-        $searchCriteriaMock->expects($this->once())->method('getFilterGroups')->willReturn([]);
-        $this->setRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($attributeSetId)
-            ->willThrowException(new \Exception());
-        $this->model->getList($searchCriteriaMock);
-    }
-
     /**
      * Test get
      *
@@ -390,7 +337,7 @@ public function testGet()
      * Test get throws exception if provided group does not exist
      *
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Group with id "42" does not exist.
+     * @expectedExceptionMessage The group with the "42" ID doesn't exist. Verify the ID and try again.
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return void
      */
@@ -421,7 +368,7 @@ public function testDelete()
      * Test deletion throws exception if provided group does not exist
      *
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot delete attributeGroup with id
+     * @expectedExceptionMessage The attribute group with id "42" can't be deleted.
      * @throws \Magento\Framework\Exception\StateException
      * @return void
      */
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php
index 572e7192d810e..a06e9030227e9 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeFactoryTest.php
@@ -50,6 +50,11 @@ public function testCreateAttribute()
         $this->assertEquals($this->_className, $this->_factory->createAttribute($this->_className, $this->_arguments));
     }
 
+    /**
+     * @param $className
+     * @param $arguments
+     * @return mixed
+     */
     public function getModelInstance($className, $arguments)
     {
         $this->assertInternalType('array', $arguments);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
index 21697bf1e22c7..5b78154555809 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model;
 
 use Magento\Eav\Model\AttributeManagement;
@@ -101,7 +102,7 @@ protected function setUp()
     /**
      *
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage AttributeSet with id "2" does not exist.
+     * @expectedExceptionMessage The AttributeSet with a "2" ID doesn't exist. Verify the attributeSet and try again.
      */
     public function testAssignNoSuchEntityException()
     {
@@ -128,7 +129,7 @@ public function testAssignNoSuchEntityException()
     /**
      *
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Wrong attribute set id provided
+     * @expectedExceptionMessage The attribute set ID is incorrect. Verify the ID and try again.
      */
     public function testAssignInputException()
     {
@@ -160,7 +161,7 @@ public function testAssignInputException()
     /**
      *
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Attribute group does not belong to attribute set
+     * @expectedExceptionMessage The attribute group doesn't belong to the attribute set.
      */
     public function testAssignInputExceptionGroupInSet()
     {
@@ -295,7 +296,6 @@ public function testUnassign()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Attribute "code" not found in attribute set 1.
      */
     public function testUnassignInputException()
     {
@@ -335,11 +335,15 @@ public function testUnassignInputException()
         $attributeMock->expects($this->never())->method('deleteEntity');
 
         $this->attributeManagement->unassign($attributeSetId, $attributeCode);
+
+        $this->expectExceptionMessage(
+            'The "code" attribute wasn\'t found in the "1" attribute set. Enter the attribute and try again.'
+        );
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Attribute set not found: 1
+     * @expectedExceptionMessage The "1234567" attribute set wasn't found. Verify and try again.
      */
     public function testUnassignWithWrongAttributeSet()
     {
@@ -356,7 +360,7 @@ public function testUnassignWithWrongAttributeSet()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage System attribute can not be deleted
+     * @expectedExceptionMessage The system attribute can't be deleted.
      */
     public function testUnassignStateException()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php
index c225941c9eb35..5b23bdf33a35b 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeRepositoryTest.php
@@ -100,7 +100,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage entity_type_code is a required field.
+     * @expectedExceptionMessage "entity_type_code" is required. Enter and try again.
      */
     public function testGetListInputException()
     {
@@ -124,8 +124,13 @@ public function testGetList()
         $collectionSize = 1;
 
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
+            ->setMethods(['getPageSize'])
             ->getMockForAbstractClass();
 
+        $searchCriteriaMock->expects($this->any())
+            ->method('getPageSize')
+            ->willReturn($collectionSize);
+
         $attributeMock = $this->createAttributeMock($attributeCode, $attributeId);
 
         $attributeCollectionMock = $this->getMockBuilder(Collection::class)
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeSetRepositoryTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeSetRepositoryTest.php
index b7724c9cf349d..04cd905d4ff3f 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeSetRepositoryTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeSetRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model;
 
 use Magento\Eav\Model\AttributeSetRepository;
@@ -132,7 +133,6 @@ public function testSave()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage There was an error saving attribute set.
      */
     public function testSaveThrowsExceptionIfGivenEntityCannotBeSaved()
     {
@@ -141,6 +141,11 @@ public function testSaveThrowsExceptionIfGivenEntityCannotBeSaved()
             new \Exception('Some internal exception message.')
         );
         $this->model->save($attributeSetMock);
+
+        $this->expectExceptionMessage(
+            "The attribute set couldn't be saved due to an error. Verify your information and try again. "
+            . "If the error persists, please try again later."
+        );
     }
 
     /**
@@ -156,7 +161,6 @@ public function testDelete()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage There was an error deleting attribute set.
      */
     public function testDeleteThrowsExceptionIfGivenEntityCannotBeDeleted()
     {
@@ -165,12 +169,17 @@ public function testDeleteThrowsExceptionIfGivenEntityCannotBeDeleted()
             new \Magento\Framework\Exception\CouldNotDeleteException(__('Some internal exception message.'))
         );
         $this->model->delete($attributeSetMock);
+
+        $this->expectExceptionMessage(
+            "The attribute set couldn't be deleted due to an error. "
+            . "Try again — if the error persists, please try again later."
+        );
     }
 
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Default attribute set can not be deleted
+     * @expectedExceptionMessage The default attribute set can't be deleted.
      */
     public function testDeleteThrowsExceptionIfGivenAttributeSetIsDefault()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/CustomAttributesMapperTest.php b/app/code/Magento/Eav/Test/Unit/Model/CustomAttributesMapperTest.php
index d2067bccef0bb..67cb65c21443e 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/CustomAttributesMapperTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/CustomAttributesMapperTest.php
@@ -198,6 +198,9 @@ public function testDatabaseToEntity()
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     private function getAttributes()
     {
         /* Attribute with the code we want to copy */
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AbstractEntityTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AbstractEntityTest.php
index 682907e9c0a23..1203e2cecb477 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AbstractEntityTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AbstractEntityTest.php
@@ -61,6 +61,9 @@ public function testCompareAttributes($attribute1Sort, $attribute2Sort, $expecte
         $this->assertEquals($expected, $this->_model->attributesCompare($attribute1, $attribute2));
     }
 
+    /**
+     * @return array
+     */
     public static function compareAttributesDataProvider()
     {
         return [
@@ -313,6 +316,9 @@ function ($entityType, $attributeCode) use ($attributes) {
         $model->save($object);
     }
 
+    /**
+     * @return array
+     */
     public function productAttributesDataProvider()
     {
         $attributeSetId = 10;
@@ -320,19 +326,29 @@ public function productAttributesDataProvider()
             [
                 'test_attr',
                 $attributeSetId,
-                ['test_attr' => 'test_attr', 'attribute_set_id' => $attributeSetId, 'entity_id' => null],
+                [
+                    'test_attr' => 'test_attr',
+                    'attribute_set_id' => $attributeSetId,
+                    'entity_id' => null,
+                    'store_id' => 1
+                ],
                 null,
             ],
             [
                 'test_attr',
                 $attributeSetId,
-                ['test_attr' => 'test_attr', 'attribute_set_id' => $attributeSetId, 'entity_id' => 12345],
+                [
+                    'test_attr' => 'test_attr',
+                    'attribute_set_id' => $attributeSetId,
+                    'entity_id' => 12345,
+                    'store_id' => 1
+                ],
                 ['test_attr' => 'test_attr']
             ],
             [
                 'test_attr',
                 $attributeSetId,
-                ['test_attr' => '99.99', 'attribute_set_id' => $attributeSetId, 'entity_id' => 12345],
+                ['test_attr' => '99.99', 'attribute_set_id' => $attributeSetId, 'entity_id' => 12345, 'store_id' => 1],
                 ['test_attr' => '99.9900']
             ]
         ];
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
index 5f5398c77488c..caf7bcfc895bc 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
@@ -19,12 +19,12 @@ public function testGetOptionWhenOptionsAreSet()
             false,
             true,
             [
-                'getData', 'usesSource', 'getSource', 'convertToObjects'
+                '_getData', 'usesSource', 'getSource', 'convertToObjects'
             ]
         );
 
         $model->expects($this->once())
-            ->method('getData')
+            ->method('_getData')
             ->with(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::OPTIONS)
             ->willReturn(['options']);
         $model->expects($this->never())->method('usesSource');
@@ -46,12 +46,12 @@ public function testGetOptionWhenOptionsAreEmptyWithoutSource()
             false,
             true,
             [
-                'getData', 'usesSource', 'getSource', 'convertToObjects'
+                '_getData', 'usesSource', 'getSource', 'convertToObjects'
             ]
         );
 
         $model->expects($this->once())
-            ->method('getData')
+            ->method('_getData')
             ->with(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::OPTIONS)
             ->willReturn([]);
         $model->expects($this->once())->method('usesSource')->willReturn(false);
@@ -74,12 +74,12 @@ public function testGetOptionWhenOptionsAreEmptyWithSource()
             false,
             true,
             [
-                'getData', 'usesSource', 'getSource', 'convertToObjects', 'getAllOptions'
+                '_getData', 'usesSource', 'getSource', 'convertToObjects', 'getAllOptions'
             ]
         );
 
         $model->expects($this->once())
-            ->method('getData')
+            ->method('_getData')
             ->with(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::OPTIONS)
             ->willReturn([]);
         $model->expects($this->once())->method('usesSource')->willReturn(true);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
index 3c0e304dbf628..475ffea98e90e 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
@@ -40,6 +40,9 @@ public function testValidate($data)
         $this->assertEquals(null, $product->getEmpty());
     }
 
+    /**
+     * @return array
+     */
     public static function attributeValueDataProvider()
     {
         return [[[1, 2, 3]], ['1,2,3']];
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
index 96846c0d1fe56..3388cbd3052a8 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
@@ -82,6 +82,25 @@ public function testBeforeSave()
         $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
     }
 
+    /**
+     * Test before save handler with already encoded attribute value
+     */
+    public function testBeforeSaveWithAlreadyEncodedValue()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => [1, 2, 3]
+            ]
+        );
+
+        // save twice
+        $this->model->beforeSave($product);
+        $this->model->beforeSave($product);
+        
+        // check it is encoded only once
+        $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
+    }
+
     /**
      * Test after load handler
      */
@@ -95,4 +114,18 @@ public function testAfterLoad()
         $this->model->afterLoad($product);
         $this->assertEquals([1, 2, 3], $product->getData('json_encoded'));
     }
+
+    /**
+     * Test after load handler with null attribute value
+     */
+    public function testAfterLoadWithNullAttributeValue()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => null
+            ]
+        );
+        $this->model->afterLoad($product);
+        $this->assertEquals([], $product->getData('json_encoded'));
+    }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
index 36eb78fd435e7..b63a4dd2c9ae6 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute;
 
 class OptionManagementTest extends \PHPUnit\Framework\TestCase
@@ -58,13 +59,13 @@ public function testAdd()
         $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeOptionLabelInterface::class);
         $option =
             ['value' => [
-                'new_option' => [
+                'id_new_option' => [
                     0 => 'optionLabel',
                     42 => 'labelLabel',
                 ],
             ],
             'order' => [
-                'new_option' => 'optionSortOrder',
+                'id_new_option' => 'optionSortOrder',
             ],
             ];
 
@@ -77,15 +78,15 @@ public function testAdd()
         $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
         $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
         $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
-        $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
+        $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->assertTrue($this->model->add($entityType, $attributeCode, $optionMock));
+        $this->assertEquals('id_new_option', $this->model->add($entityType, $attributeCode, $optionMock));
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Empty attribute code
+     * @expectedExceptionMessage The attribute code is empty. Enter the code and try again.
      */
     public function testAddWithEmptyAttributeCode()
     {
@@ -106,7 +107,7 @@ public function testAddWithEmptyAttributeCode()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Attribute testAttribute doesn't work with options
+     * @expectedExceptionMessage The "testAttribute" attribute doesn't work with options.
      */
     public function testAddWithWrongOptions()
     {
@@ -139,7 +140,7 @@ public function testAddWithWrongOptions()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot save attribute atrCde
+     * @expectedExceptionMessage The "atrCde" attribute can't be saved.
      */
     public function testAddWithCannotSaveException()
     {
@@ -166,13 +167,13 @@ public function testAddWithCannotSaveException()
         $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeOptionLabelInterface::class);
         $option =
             ['value' => [
-                'new_option' => [
+                'id_new_option' => [
                     0 => 'optionLabel',
                     42 => 'labelLabel',
                 ],
             ],
                 'order' => [
-                    'new_option' => 'optionSortOrder',
+                    'id_new_option' => 'optionSortOrder',
                 ],
             ];
 
@@ -185,7 +186,7 @@ public function testAddWithCannotSaveException()
         $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
         $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
         $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
-        $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
+        $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock)
             ->willThrowException(new \Exception());
@@ -225,7 +226,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot save attribute atrCode
+     * @expectedExceptionMessage The "atrCode" attribute can't be saved.
      */
     public function testDeleteWithCannotSaveException()
     {
@@ -261,7 +262,7 @@ public function testDeleteWithCannotSaveException()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Attribute atrCode does not contain option with Id option
+     * @expectedExceptionMessage The "atrCode" attribute doesn't include an option with "option" ID.
      */
     public function testDeleteWithWrongOption()
     {
@@ -290,7 +291,7 @@ public function testDeleteWithWrongOption()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Attribute atrCode doesn't have any option
+     * @expectedExceptionMessage The "atrCode" attribute has no option.
      */
     public function testDeleteWithAbsentOption()
     {
@@ -315,7 +316,7 @@ public function testDeleteWithAbsentOption()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Empty attribute code
+     * @expectedExceptionMessage The attribute code is empty. Enter the code and try again.
      */
     public function testDeleteWithEmptyAttributeCode()
     {
@@ -348,7 +349,7 @@ public function testGetItems()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot load options for attribute atrCode
+     * @expectedExceptionMessage The options for "atrCode" attribute can't be loaded.
      */
     public function testGetItemsWithCannotLoadException()
     {
@@ -371,7 +372,7 @@ public function testGetItemsWithCannotLoadException()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Empty attribute code
+     * @expectedExceptionMessage The attribute code is empty. Enter the code and try again.
      */
     public function testGetItemsWithEmptyAttributeCode()
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php
index 78465e57c6236..222a1d0193eb8 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php
@@ -44,7 +44,8 @@ public function testValidateWithExistingName($attributeSetName, $exceptionMessag
     {
         $this->_model->getResource()->expects($this->any())->method('validate')->will($this->returnValue(false));
 
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage($exceptionMessage);
         $this->_model->setAttributeSetName($attributeSetName);
         $this->_model->validate();
     }
@@ -65,8 +66,8 @@ public function testValidateWithNonexistentValidName()
     public function invalidAttributeSetDataProvider()
     {
         return [
-            ['', 'Attribute set name is empty.'],
-            ['existing_name', 'An attribute set named "existing_name" already exists.']
+            ['', 'The attribute set name is empty. Enter the name and try again.'],
+            ['existing_name', 'A "existing_name" attribute set name already exists. Create a new name and try again.']
         ];
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
index 6f79e7ed06fad..b68446d22f910 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
@@ -194,6 +194,9 @@ public function testGetSpecificOptions($optionIds, $withEmpty)
         $this->assertEquals($options, $this->model->getSpecificOptions($optionIds, $withEmpty));
     }
 
+    /**
+     * @return array
+     */
     public function specificOptionsProvider()
     {
         return [
@@ -249,6 +252,9 @@ public function testGetOptionText($optionsIds, $value, $options, $expectedResult
         $this->assertEquals($expectedResult, $this->model->getOptionText($value));
     }
 
+    /**
+     * @return array
+     */
     public function getOptionTextProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
index 3cfc3dafda3f5..6620cee4d5ddd 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
@@ -78,7 +78,6 @@ public function testLoadAllAttributes()
         $attributeMock->expects($this->once())->method('setIsGlobal')->with(1)->willReturnSelf();
         $attributeMock->expects($this->once())->method('setEntityType')->with($this->entityTypeMock)->willReturnSelf();
         $attributeMock->expects($this->once())->method('setEntityTypeId')->with($entityTypeId)->willReturnSelf();
-        $this->entityMock->expects($this->once())->method('addAttribute')->with($attributeMock)->willReturnSelf();
         $this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);
     }
 
@@ -102,8 +101,6 @@ public function testLoadAllAttributesAttributeCodesPresentInDefaultAttributes()
             ->method('getEntityAttributes')->willReturn($attributeCodes);
         $this->entityMock->expects($this->once())->method('getDefaultAttributes')->willReturn($defaultAttributes);
         $this->entityMock->expects($this->once())->method('unsetAttributes')->willReturnSelf();
-        $this->entityMock->expects($this->atLeastOnce())
-            ->method('addAttribute')->with($attributeMock)->willReturnSelf();
         $this->objectManagerMock->expects($this->never())->method('create');
         $this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);
     }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
index 27957e8090d3e..402497a1379c0 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity;
 
+/**
+ * Class AttributeTest.
+ */
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -13,11 +16,17 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->_model = $this->createPartialMock(\Magento\Eav\Model\Entity\Attribute::class, ['__wakeup']);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         $this->_model = null;
@@ -27,12 +36,16 @@ protected function tearDown()
      * @param string $givenFrontendInput
      * @param string $expectedBackendType
      * @dataProvider dataGetBackendTypeByInput
+     * @return void
      */
     public function testGetBackendTypeByInput($givenFrontendInput, $expectedBackendType)
     {
         $this->assertEquals($expectedBackendType, $this->_model->getBackendTypeByInput($givenFrontendInput));
     }
 
+    /**
+     * @return array
+     */
     public static function dataGetBackendTypeByInput()
     {
         return [
@@ -61,6 +74,9 @@ public function testGetDefaultValueByInput($givenFrontendInput, $expectedDefault
         $this->assertEquals($expectedDefaultValue, $this->_model->getDefaultValueByInput($givenFrontendInput));
     }
 
+    /**
+     * @return array
+     */
     public static function dataGetDefaultValueByInput()
     {
         return [
@@ -106,4 +122,43 @@ public function getSortWeightDataProvider()
             ]
         ];
     }
+
+    /**
+     * return void
+     */
+    public function testGetFrontendLabels()
+    {
+        $attributeId = 1;
+        $storeLabels = ['test_attribute_store1'];
+        $frontendLabelFactory = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $resource = $this->getMockBuilder(\Magento\Eav\Model\ResourceModel\Entity\Attribute::class)
+            ->setMethods(['getStoreLabelsByAttributeId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $arguments = [
+            '_resource' => $resource,
+            'frontendLabelFactory' => $frontendLabelFactory,
+        ];
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->_model = $objectManager->getObject(\Magento\Eav\Model\Entity\Attribute::class, $arguments);
+        $this->_model->setAttributeId($attributeId);
+
+        $resource->expects($this->once())
+            ->method('getStoreLabelsByAttributeId')
+            ->with($attributeId)
+            ->willReturn($storeLabels);
+        $frontendLabel = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabel::class)
+            ->setMethods(['setStoreId', 'setLabel'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $frontendLabelFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($frontendLabel);
+        $expectedFrontendLabel[] = $frontendLabel;
+
+        $this->assertEquals($expectedFrontendLabel, $this->_model->getFrontendLabels());
+    }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php
index 88185387ed398..bc4ed7d4bd9e4 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php
@@ -135,6 +135,21 @@ public function tearDown()
         $this->model = null;
     }
 
+    /**
+     * Test method \Magento\Eav\Model\Entity\Collection\AbstractCollection::load
+     */
+    public function testLoad()
+    {
+        $this->fetchStrategyMock
+            ->expects($this->once())
+            ->method('fetchAll')
+            ->will($this->returnValue([['id' => 1, 'data_changes' => true], ['id' => 2]]));
+
+        foreach ($this->model->getItems() as $item) {
+            $this->assertFalse($item->getDataChanges());
+        }
+    }
+
     /**
      * @dataProvider getItemsDataProvider
      */
@@ -178,6 +193,9 @@ public function testRemoveItemByKey($values, $count)
         $this->assertNull($this->model->getItemById($testId));
     }
 
+    /**
+     * @return array
+     */
     public function getItemsDataProvider()
     {
         return [
@@ -187,6 +205,9 @@ public function getItemsDataProvider()
         ];
     }
 
+    /**
+     * @return \Magento\Framework\DataObject
+     */
     public function getMagentoObject()
     {
         return new \Magento\Framework\DataObject();
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
index d281b8d1095f4..cce7b43786a76 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
@@ -68,6 +68,9 @@ public function testFetchItem(array $data)
         }
     }
 
+    /**
+     * @return array
+     */
     public static function fetchItemDataProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/AlphanumTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/AlphanumTest.php
index 16ba85f4905ea..50e7f185a24e5 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/AlphanumTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/AlphanumTest.php
@@ -37,6 +37,9 @@ public function testGetNextId($lastId, $prefix, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->getNextId());
     }
 
+    /**
+     * @return array
+     */
     public function getLastIdDataProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/NumericTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/NumericTest.php
index a976fc1f3e654..16767fb633028 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/NumericTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Increment/NumericTest.php
@@ -32,6 +32,9 @@ public function testGetNextId($lastId, $prefix, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->getNextId());
     }
 
+    /**
+     * @return array
+     */
     public function getLastIdDataProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Attribute/CollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Attribute/CollectionTest.php
index d988dfc63c959..f074fa22778b0 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Attribute/CollectionTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Attribute/CollectionTest.php
@@ -115,7 +115,7 @@ protected function setUp()
         $this->connectionMock->expects($this->any())->method('quoteIdentifier')->will($this->returnArgument(0));
         $this->connectionMock->expects($this->any())
             ->method('describeTable')
-            ->will($this->returnvalueMap(
+            ->will($this->returnValueMap(
                 [
                     [
                         'some_main_table',
@@ -177,6 +177,9 @@ public function testInitSelect($column, $value)
         $this->model->getSelectCountSql()->assemble();
     }
 
+    /**
+     * @return array
+     */
     public function initSelectDataProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/AttributeLoaderTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/AttributeLoaderTest.php
index 8e6fa3afd15b9..ea02ec71a7bbd 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/AttributeLoaderTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/AttributeLoaderTest.php
@@ -90,6 +90,9 @@ public function testGetAttributes($entityType, $attributeSetId, $expectedConditi
         $this->assertEquals([$attributeMock], $this->attributeLoader->getAttributes($entityType, $attributeSetId));
     }
 
+    /**
+     * @return array
+     */
     public function getAttributesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/CollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/CollectionTest.php
new file mode 100644
index 0000000000000..4a0fd5469767e
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/CollectionTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Eav\Test\Unit\Model\ResourceModel\Entity\Attribute;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityFactoryMock;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fetchStrategyMock;
+
+    /**
+     * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManagerMock;
+
+    /**
+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfigMock;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->entityFactoryMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\EntityFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fetchStrategyMock = $this->getMockBuilder(FetchStrategyInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resourceMock = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class)
+            ->setMethods(['__wakeup', 'getConnection', 'getMainTable', 'getTable'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
+        $this->resourceMock->expects($this->any())->method('getMainTable')->willReturn('eav_entity_attribute');
+
+        $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock->expects($this->any())->method('select')->willReturn($this->selectMock);
+
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::class,
+            [
+                'entityFactory' => $this->entityFactoryMock,
+                'logger'        => $this->loggerMock,
+                'fetchStrategy' => $this->fetchStrategyMock,
+                'eventManager'  => $this->eventManagerMock,
+                'eavConfig'     => $this->eavConfigMock,
+                'connection'    => $this->connectionMock,
+                'resource'      => $this->resourceMock,
+            ]
+        );
+    }
+
+    /**
+     * Test method \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::setInAllAttributeSetsFilter
+     *
+     * @return void
+     */
+    public function testSetInAllAttributeSetsFilter()
+    {
+        $setIds = [1, 2, 3];
+
+        $this->selectMock->expects($this->atLeastOnce())
+            ->method('where')
+            ->with('entity_attribute.attribute_set_id IN (?)', $setIds)
+            ->willReturnSelf();
+        $this->selectMock->expects($this->atLeastOnce())->method('join')->with(
+            ['entity_attribute' => $this->model->getTable('eav_entity_attribute')],
+            'entity_attribute.attribute_id = main_table.attribute_id',
+            ['count' => new \Zend_Db_Expr('COUNT(*)')]
+        )->willReturnSelf();
+
+        $this->selectMock->expects($this->atLeastOnce())->method('group')->with('entity_attribute.attribute_id')
+            ->willReturnSelf();
+
+        $this->selectMock->expects($this->atLeastOnce())->method('having')
+            ->with(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds))->willReturnSelf();
+
+        $this->model->setInAllAttributeSetsFilter($setIds);
+    }
+}
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php
index 1c66788f8585a..4c2ede60c8798 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Test\Unit\Model\ResourceModel\Entity\Attribute;
 
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set;
@@ -116,7 +117,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Default attribute set can not be deleted
+     * @expectedExceptionMessage The default attribute set can't be deleted.
      * @return void
      */
     public function testBeforeDeleteStateException()
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
index 60c823cadfe89..82e9033496b78 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
@@ -110,11 +110,14 @@ public function testExecute($eavEntityType, $callNum, array $expected, $isStatic
         $attributeMock->method('getAttributeCode')
             ->willReturn('attributeCode');
         $this->configMock->expects($this->exactly($callNum))
-            ->method('getAttributes')
+            ->method('getEntityAttributes')
             ->willReturn([$attributeMock]);
         $this->assertEquals($expected, $this->readHandler->execute('entity_type', $entityData));
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Eav/Test/Unit/Model/TypeLocatorTest.php b/app/code/Magento/Eav/Test/Unit/Model/TypeLocatorTest.php
index b2cf56c718e9c..63882bc76a7f6 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/TypeLocatorTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/TypeLocatorTest.php
@@ -4,10 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Eav\Test\Unit\Model;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Eav\Model\TypeLocator;
 use Magento\Eav\Model\TypeLocator\ComplexType as ComplexTypeLocator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -66,7 +65,10 @@ public function testGetType(
         $expected
     ) {
         $this->complexType->expects($this->once())->method('getType')->willReturn($expected);
-        $type = $this->customAttributeTypeLocator->getType($attributeCode, $serviceEntityTypeMapData[$serviceClass]);
+        $type = $this->customAttributeTypeLocator->getType(
+            $attributeCode,
+            $serviceEntityTypeMapData[$serviceClass]
+        );
 
         $this->assertEquals($expected, $type, 'Expected: ' . $expected . 'but got: ' . $type);
     }
@@ -79,16 +81,22 @@ public function getTypeDataProvider()
     {
         $serviceInterface = \Magento\Catalog\Api\Data\ProductInterface::class;
         $eavEntityType = 'catalog_product';
-        $mediaBackEndModelClass = \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class;
-        $mediaAttributeDataInterface = \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class;
+        $mediaBackEndModelClass = ProductAttributeMediaGalleryEntryInterface::class;
+        $mediaAttributeDataInterface = ProductAttributeMediaGalleryEntryInterface::class;
 
-        $attribute = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, ['getBackendModel']);
+        $attribute = $this->createPartialMock(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+            ['getBackendModel']
+        );
 
         $attribute->expects($this->any())
             ->method('getBackendModel')
             ->willReturn($mediaBackEndModelClass);
 
-        $attributeNoBackendModel = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, ['getBackendModel', 'getFrontendInput']);
+        $attributeNoBackendModel = $this->createPartialMock(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+            ['getBackendModel', 'getFrontendInput']
+        );
 
         $attributeNoBackendModel->expects($this->any())
             ->method('getBackendModel')
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index e6657535ecac1..80692bf37bc25 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Eav/etc/adminhtml/di.xml b/app/code/Magento/Eav/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..7e8e13465b156
--- /dev/null
+++ b/app/code/Magento/Eav/etc/adminhtml/di.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype">
+        <arguments>
+            <argument name="optionsArray" xsi:type="array">
+                <item name="100" xsi:type="array">
+                    <item name="value" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Text Field</item>
+                </item>
+                <item name="200" xsi:type="array">
+                    <item name="value" xsi:type="string">textarea</item>
+                    <item name="label" xsi:type="string" translate="true">Text Area</item>
+                </item>
+                <item name="300" xsi:type="array">
+                    <item name="value" xsi:type="string">texteditor</item>
+                    <item name="label" xsi:type="string" translate="true">Text Editor</item>
+                </item>
+                <item name="400" xsi:type="array">
+                    <item name="value" xsi:type="string">date</item>
+                    <item name="label" xsi:type="string" translate="true">Date</item>
+                </item>
+                <item name="500" xsi:type="array">
+                    <item name="value" xsi:type="string">boolean</item>
+                    <item name="label" xsi:type="string" translate="true">Yes/No</item>
+                </item>
+                <item name="600" xsi:type="array">
+                    <item name="value" xsi:type="string">multiselect</item>
+                    <item name="label" xsi:type="string" translate="true">Multiple Select</item>
+                </item>
+                <item name="700" xsi:type="array">
+                    <item name="value" xsi:type="string">select</item>
+                    <item name="label" xsi:type="string" translate="true">Dropdown</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Eav/etc/config.xml b/app/code/Magento/Eav/etc/config.xml
index b77b78a2abd09..2a86437d96abe 100644
--- a/app/code/Magento/Eav/etc/config.xml
+++ b/app/code/Magento/Eav/etc/config.xml
@@ -12,6 +12,7 @@
                 <input_types>
                     <text>text</text>
                     <textarea>textarea</textarea>
+                    <texteditor>texteditor</texteditor>
                     <date>date</date>
                     <boolean>boolean</boolean>
                     <multiselect>multiselect</multiselect>
diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
new file mode 100644
index 0000000000000..b6c42d725e5e9
--- /dev/null
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -0,0 +1,606 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="eav_entity_type" resource="default" engine="innodb" comment="Eav Entity Type">
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Entity Type Id"/>
+        <column xsi:type="varchar" name="entity_type_code" nullable="false" length="50" comment="Entity Type Code"/>
+        <column xsi:type="varchar" name="entity_model" nullable="false" length="255" comment="Entity Model"/>
+        <column xsi:type="varchar" name="attribute_model" nullable="true" length="255" comment="Attribute Model"/>
+        <column xsi:type="varchar" name="entity_table" nullable="true" length="255" comment="Entity Table"/>
+        <column xsi:type="varchar" name="value_table_prefix" nullable="true" length="255" comment="Value Table Prefix"/>
+        <column xsi:type="varchar" name="entity_id_field" nullable="true" length="255" comment="Entity ID Field"/>
+        <column xsi:type="smallint" name="is_data_sharing" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Defines Is Data Sharing"/>
+        <column xsi:type="varchar" name="data_sharing_key" nullable="true" length="100" default="default"
+                comment="Data Sharing Key"/>
+        <column xsi:type="smallint" name="default_attribute_set_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Default Attribute Set Id"/>
+        <column xsi:type="varchar" name="increment_model" nullable="true" length="255" comment="Increment Model"/>
+        <column xsi:type="smallint" name="increment_per_store" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Increment Per Store"/>
+        <column xsi:type="smallint" name="increment_pad_length" padding="5" unsigned="true" nullable="false"
+                identity="false" default="8" comment="Increment Pad Length"/>
+        <column xsi:type="varchar" name="increment_pad_char" nullable="false" length="1" default="0"
+                comment="Increment Pad Char"/>
+        <column xsi:type="varchar" name="additional_attribute_table" nullable="true" length="255"
+                comment="Additional Attribute Table"/>
+        <column xsi:type="varchar" name="entity_attribute_collection" nullable="true" length="255"
+                comment="Entity Attribute Collection"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_type_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_TYPE_ENTITY_TYPE_CODE" indexType="btree">
+            <column name="entity_type_code"/>
+        </index>
+    </table>
+    <table name="eav_entity" resource="default" engine="innodb" comment="Eav Entity">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Attribute Set Id"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Parent Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Defines Is Entity Active"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_entity" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_STORE_ID_STORE_STORE_ID" table="eav_entity" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="EAV_ENTITY_ENTITY_TYPE_ID" indexType="btree">
+            <column name="entity_type_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_entity_datetime" resource="default" engine="innodb" comment="Eav Entity Value Prefix">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Attribute Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DATETIME_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
+                    table="eav_entity_datetime" column="entity_id" referenceTable="eav_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTT_DTIME_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID"
+                    table="eav_entity_datetime" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID" table="eav_entity_datetime"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_DATETIME_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_DATETIME_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+        <index referenceId="EAV_ENTITY_DATETIME_ENTITY_TYPE_ID_VALUE" indexType="btree">
+            <column name="entity_type_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="eav_entity_decimal" resource="default" engine="innodb" comment="Eav Entity Value Prefix">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Attribute Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DECIMAL_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
+                    table="eav_entity_decimal" column="entity_id" referenceTable="eav_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_entity_decimal" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID" table="eav_entity_decimal"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_DECIMAL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_DECIMAL_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+        <index referenceId="EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_VALUE" indexType="btree">
+            <column name="entity_type_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="eav_entity_int" resource="default" engine="innodb" comment="Eav Entity Value Prefix">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
+                comment="Attribute Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_INT_ENTITY_ID_EAV_ENTITY_ENTITY_ID" table="eav_entity_int"
+                    column="entity_id" referenceTable="eav_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_INT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_entity_int" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_INT_STORE_ID_STORE_STORE_ID" table="eav_entity_int"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_INT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_INT_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+        <index referenceId="EAV_ENTITY_INT_ENTITY_TYPE_ID_VALUE" indexType="btree">
+            <column name="entity_type_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="eav_entity_text" resource="default" engine="innodb" comment="Eav Entity Value Prefix">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="text" name="value" nullable="false" comment="Attribute Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_TEXT_ENTITY_ID_EAV_ENTITY_ENTITY_ID" table="eav_entity_text"
+                    column="entity_id" referenceTable="eav_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_TEXT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_entity_text" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_TEXT_STORE_ID_STORE_STORE_ID" table="eav_entity_text"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_TEXT_ENTITY_TYPE_ID" indexType="btree">
+            <column name="entity_type_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_TEXT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_TEXT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_entity_varchar" resource="default" engine="innodb" comment="Eav Entity Value Prefix">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Attribute Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_VARCHAR_ENTITY_ID_EAV_ENTITY_ENTITY_ID"
+                    table="eav_entity_varchar" column="entity_id" referenceTable="eav_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_entity_varchar" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID" table="eav_entity_varchar"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID">
+            <column name="entity_id"/>
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_VARCHAR_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_VARCHAR_ATTRIBUTE_ID_VALUE" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="value"/>
+        </index>
+        <index referenceId="EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_VALUE" indexType="btree">
+            <column name="entity_type_id"/>
+            <column name="value"/>
+        </index>
+    </table>
+    <table name="eav_attribute" resource="default" engine="innodb" comment="Eav Attribute">
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Attribute Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="varchar" name="attribute_code" nullable="false" length="255" comment="Attribute Code"/>
+        <column xsi:type="varchar" name="attribute_model" nullable="true" length="255" comment="Attribute Model"/>
+        <column xsi:type="varchar" name="backend_model" nullable="true" length="255" comment="Backend Model"/>
+        <column xsi:type="varchar" name="backend_type" nullable="false" length="8" default="static"
+                comment="Backend Type"/>
+        <column xsi:type="varchar" name="backend_table" nullable="true" length="255" comment="Backend Table"/>
+        <column xsi:type="varchar" name="frontend_model" nullable="true" length="255" comment="Frontend Model"/>
+        <column xsi:type="varchar" name="frontend_input" nullable="true" length="50" comment="Frontend Input"/>
+        <column xsi:type="varchar" name="frontend_label" nullable="true" length="255" comment="Frontend Label"/>
+        <column xsi:type="varchar" name="frontend_class" nullable="true" length="255" comment="Frontend Class"/>
+        <column xsi:type="varchar" name="source_model" nullable="true" length="255" comment="Source Model"/>
+        <column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Defines Is Required"/>
+        <column xsi:type="smallint" name="is_user_defined" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Defines Is User Defined"/>
+        <column xsi:type="text" name="default_value" nullable="true" comment="Default Value"/>
+        <column xsi:type="smallint" name="is_unique" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Defines Is Unique"/>
+        <column xsi:type="varchar" name="note" nullable="true" length="255" comment="Note"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_attribute" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_ENTITY_TYPE_ID_ATTRIBUTE_CODE">
+            <column name="entity_type_id"/>
+            <column name="attribute_code"/>
+        </constraint>
+    </table>
+    <table name="eav_entity_store" resource="default" engine="innodb" comment="Eav Entity Store">
+        <column xsi:type="int" name="entity_store_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Store Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="varchar" name="increment_prefix" nullable="true" length="20" comment="Increment Prefix"/>
+        <column xsi:type="varchar" name="increment_last_id" nullable="true" length="50" comment="Last Incremented Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_STORE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_entity_store" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_STORE_STORE_ID_STORE_STORE_ID" table="eav_entity_store"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="EAV_ENTITY_STORE_ENTITY_TYPE_ID" indexType="btree">
+            <column name="entity_type_id"/>
+        </index>
+        <index referenceId="EAV_ENTITY_STORE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_attribute_set" resource="default" engine="innodb" comment="Eav Attribute Set">
+        <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Attribute Set Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="varchar" name="attribute_set_name" nullable="true" length="255" comment="Attribute Set Name"/>
+        <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_set_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID"
+                    table="eav_attribute_set" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_ATTRIBUTE_SET_NAME">
+            <column name="entity_type_id"/>
+            <column name="attribute_set_name"/>
+        </constraint>
+        <index referenceId="EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_SORT_ORDER" indexType="btree">
+            <column name="entity_type_id"/>
+            <column name="sort_order"/>
+        </index>
+    </table>
+    <table name="eav_attribute_group" resource="default" engine="innodb" comment="Eav Attribute Group">
+        <column xsi:type="smallint" name="attribute_group_id" padding="5" unsigned="true" nullable="false"
+                identity="true" comment="Attribute Group Id"/>
+        <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Attribute Set Id"/>
+        <column xsi:type="varchar" name="attribute_group_name" nullable="true" length="255"
+                comment="Attribute Group Name"/>
+        <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="smallint" name="default_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Default Id"/>
+        <column xsi:type="varchar" name="attribute_group_code" nullable="false" length="255"
+                comment="Attribute Group Code"/>
+        <column xsi:type="varchar" name="tab_group_code" nullable="true" length="255" comment="Tab Group Code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_group_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTR_GROUP_ATTR_SET_ID_EAV_ATTR_SET_ATTR_SET_ID"
+                    table="eav_attribute_group" column="attribute_set_id" referenceTable="eav_attribute_set"
+                    referenceColumn="attribute_set_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_NAME">
+            <column name="attribute_set_id"/>
+            <column name="attribute_group_name"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE">
+            <column name="attribute_set_id"/>
+            <column name="attribute_group_code"/>
+        </constraint>
+        <index referenceId="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_SORT_ORDER" indexType="btree">
+            <column name="attribute_set_id"/>
+            <column name="sort_order"/>
+        </index>
+    </table>
+    <table name="eav_entity_attribute" resource="default" engine="innodb" comment="Eav Entity Attributes">
+        <column xsi:type="int" name="entity_attribute_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Attribute Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity Type Id"/>
+        <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Attribute Set Id"/>
+        <column xsi:type="smallint" name="attribute_group_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Attribute Group Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="eav_entity_attribute" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ENTT_ATTR_ATTR_GROUP_ID_EAV_ATTR_GROUP_ATTR_GROUP_ID"
+                    table="eav_entity_attribute" column="attribute_group_id" referenceTable="eav_attribute_group"
+                    referenceColumn="attribute_group_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_ATTRIBUTE_ID">
+            <column name="attribute_set_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_GROUP_ID_ATTRIBUTE_ID">
+            <column name="attribute_group_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_SORT_ORDER" indexType="btree">
+            <column name="attribute_set_id"/>
+            <column name="sort_order"/>
+        </index>
+        <index referenceId="EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="eav_attribute_option" resource="default" engine="innodb" comment="Eav Attribute Option">
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="eav_attribute_option" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <index referenceId="EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="eav_attribute_option_value" resource="default" engine="innodb" comment="Eav Attribute Option Value">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Option Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTR_OPT_VAL_OPT_ID_EAV_ATTR_OPT_OPT_ID"
+                    table="eav_attribute_option_value" column="option_id" referenceTable="eav_attribute_option"
+                    referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID"
+                    table="eav_attribute_option_value" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="EAV_ATTRIBUTE_OPTION_VALUE_OPTION_ID" indexType="btree">
+            <column name="option_id"/>
+        </index>
+        <index referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_attribute_label" resource="default" engine="innodb" comment="Eav Attribute Label">
+        <column xsi:type="int" name="attribute_label_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Attribute Label Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Attribute Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="attribute_label_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="eav_attribute_label" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID" table="eav_attribute_label"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_form_type" resource="default" engine="innodb" comment="Eav Form Type">
+        <column xsi:type="smallint" name="type_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Type Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="64" comment="Code"/>
+        <column xsi:type="varchar" name="label" nullable="false" length="255" comment="Label"/>
+        <column xsi:type="smallint" name="is_system" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is System"/>
+        <column xsi:type="varchar" name="theme" nullable="true" length="64" comment="Theme"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="type_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_TYPE_STORE_ID_STORE_STORE_ID" table="eav_form_type"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_FORM_TYPE_CODE_THEME_STORE_ID">
+            <column name="code"/>
+            <column name="theme"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="EAV_FORM_TYPE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_form_type_entity" resource="default" engine="innodb" comment="Eav Form Type Entity">
+        <column xsi:type="smallint" name="type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Type Id"/>
+        <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Entity Type Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="type_id"/>
+            <column name="entity_type_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_TYPE_ENTT_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID"
+                    table="eav_form_type_entity" column="entity_type_id" referenceTable="eav_entity_type"
+                    referenceColumn="entity_type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_TYPE_ENTITY_TYPE_ID_EAV_FORM_TYPE_TYPE_ID"
+                    table="eav_form_type_entity" column="type_id" referenceTable="eav_form_type"
+                    referenceColumn="type_id" onDelete="CASCADE"/>
+        <index referenceId="EAV_FORM_TYPE_ENTITY_ENTITY_TYPE_ID" indexType="btree">
+            <column name="entity_type_id"/>
+        </index>
+    </table>
+    <table name="eav_form_fieldset" resource="default" engine="innodb" comment="Eav Form Fieldset">
+        <column xsi:type="smallint" name="fieldset_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Fieldset Id"/>
+        <column xsi:type="smallint" name="type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Type Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="64" comment="Code"/>
+        <column xsi:type="int" name="sort_order" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="fieldset_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_FIELDSET_TYPE_ID_EAV_FORM_TYPE_TYPE_ID" table="eav_form_fieldset"
+                    column="type_id" referenceTable="eav_form_type" referenceColumn="type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_FORM_FIELDSET_TYPE_ID_CODE">
+            <column name="type_id"/>
+            <column name="code"/>
+        </constraint>
+    </table>
+    <table name="eav_form_fieldset_label" resource="default" engine="innodb" comment="Eav Form Fieldset Label">
+        <column xsi:type="smallint" name="fieldset_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Fieldset Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="label" nullable="false" length="255" comment="Label"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="fieldset_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_FSET_LBL_FSET_ID_EAV_FORM_FSET_FSET_ID"
+                    table="eav_form_fieldset_label" column="fieldset_id" referenceTable="eav_form_fieldset"
+                    referenceColumn="fieldset_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_FIELDSET_LABEL_STORE_ID_STORE_STORE_ID"
+                    table="eav_form_fieldset_label" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="EAV_FORM_FIELDSET_LABEL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="eav_form_element" resource="default" engine="innodb" comment="Eav Form Element">
+        <column xsi:type="int" name="element_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Element Id"/>
+        <column xsi:type="smallint" name="type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Type Id"/>
+        <column xsi:type="smallint" name="fieldset_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Fieldset Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute Id"/>
+        <column xsi:type="int" name="sort_order" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="element_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_ELEMENT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="eav_form_element" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_ELEMENT_FIELDSET_ID_EAV_FORM_FIELDSET_FIELDSET_ID"
+                    table="eav_form_element" column="fieldset_id" referenceTable="eav_form_fieldset"
+                    referenceColumn="fieldset_id" onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="EAV_FORM_ELEMENT_TYPE_ID_EAV_FORM_TYPE_TYPE_ID" table="eav_form_element"
+                    column="type_id" referenceTable="eav_form_type" referenceColumn="type_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID">
+            <column name="type_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <index referenceId="EAV_FORM_ELEMENT_FIELDSET_ID" indexType="btree">
+            <column name="fieldset_id"/>
+        </index>
+        <index referenceId="EAV_FORM_ELEMENT_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Eav/etc/db_schema_whitelist.json b/app/code/Magento/Eav/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b3f1aca50df01
--- /dev/null
+++ b/app/code/Magento/Eav/etc/db_schema_whitelist.json
@@ -0,0 +1,390 @@
+{
+    "eav_entity_type": {
+        "column": {
+            "entity_type_id": true,
+            "entity_type_code": true,
+            "entity_model": true,
+            "attribute_model": true,
+            "entity_table": true,
+            "value_table_prefix": true,
+            "entity_id_field": true,
+            "is_data_sharing": true,
+            "data_sharing_key": true,
+            "default_attribute_set_id": true,
+            "increment_model": true,
+            "increment_per_store": true,
+            "increment_pad_length": true,
+            "increment_pad_char": true,
+            "additional_attribute_table": true,
+            "entity_attribute_collection": true
+        },
+        "index": {
+            "EAV_ENTITY_TYPE_ENTITY_TYPE_CODE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "eav_entity": {
+        "column": {
+            "entity_id": true,
+            "entity_type_id": true,
+            "attribute_set_id": true,
+            "increment_id": true,
+            "parent_id": true,
+            "store_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "is_active": true
+        },
+        "index": {
+            "EAV_ENTITY_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "eav_entity_datetime": {
+        "column": {
+            "value_id": true,
+            "entity_type_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ENTITY_DATETIME_STORE_ID": true,
+            "EAV_ENTITY_DATETIME_ATTRIBUTE_ID_VALUE": true,
+            "EAV_ENTITY_DATETIME_ENTITY_TYPE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_DATETIME_ENTITY_ID_EAV_ENTITY_ENTITY_ID": true,
+            "EAV_ENTT_DTIME_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID": true,
+            "EAV_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "eav_entity_decimal": {
+        "column": {
+            "value_id": true,
+            "entity_type_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ENTITY_DECIMAL_STORE_ID": true,
+            "EAV_ENTITY_DECIMAL_ATTRIBUTE_ID_VALUE": true,
+            "EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_DECIMAL_ENTITY_ID_EAV_ENTITY_ENTITY_ID": true,
+            "EAV_ENTITY_DECIMAL_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "eav_entity_int": {
+        "column": {
+            "value_id": true,
+            "entity_type_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ENTITY_INT_STORE_ID": true,
+            "EAV_ENTITY_INT_ATTRIBUTE_ID_VALUE": true,
+            "EAV_ENTITY_INT_ENTITY_TYPE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_INT_ENTITY_ID_EAV_ENTITY_ENTITY_ID": true,
+            "EAV_ENTITY_INT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_INT_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "eav_entity_text": {
+        "column": {
+            "value_id": true,
+            "entity_type_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ENTITY_TEXT_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_TEXT_ATTRIBUTE_ID": true,
+            "EAV_ENTITY_TEXT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_TEXT_ENTITY_ID_EAV_ENTITY_ENTITY_ID": true,
+            "EAV_ENTITY_TEXT_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_TEXT_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "eav_entity_varchar": {
+        "column": {
+            "value_id": true,
+            "entity_type_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "entity_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ENTITY_VARCHAR_STORE_ID": true,
+            "EAV_ENTITY_VARCHAR_ATTRIBUTE_ID_VALUE": true,
+            "EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_VARCHAR_ENTITY_ID_EAV_ENTITY_ENTITY_ID": true,
+            "EAV_ENTITY_VARCHAR_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID": true
+        }
+    },
+    "eav_attribute": {
+        "column": {
+            "attribute_id": true,
+            "entity_type_id": true,
+            "attribute_code": true,
+            "attribute_model": true,
+            "backend_model": true,
+            "backend_type": true,
+            "backend_table": true,
+            "frontend_model": true,
+            "frontend_input": true,
+            "frontend_label": true,
+            "frontend_class": true,
+            "source_model": true,
+            "is_required": true,
+            "is_user_defined": true,
+            "default_value": true,
+            "is_unique": true,
+            "note": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTRIBUTE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ATTRIBUTE_ENTITY_TYPE_ID_ATTRIBUTE_CODE": true
+        }
+    },
+    "eav_entity_store": {
+        "column": {
+            "entity_store_id": true,
+            "entity_type_id": true,
+            "store_id": true,
+            "increment_prefix": true,
+            "increment_last_id": true
+        },
+        "index": {
+            "EAV_ENTITY_STORE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_STORE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_STORE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ENTITY_STORE_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "eav_attribute_set": {
+        "column": {
+            "attribute_set_id": true,
+            "entity_type_id": true,
+            "attribute_set_name": true,
+            "sort_order": true
+        },
+        "index": {
+            "EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_SORT_ORDER": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
+            "EAV_ATTRIBUTE_SET_ENTITY_TYPE_ID_ATTRIBUTE_SET_NAME": true
+        }
+    },
+    "eav_attribute_group": {
+        "column": {
+            "attribute_group_id": true,
+            "attribute_set_id": true,
+            "attribute_group_name": true,
+            "sort_order": true,
+            "default_id": true,
+            "attribute_group_code": true,
+            "tab_group_code": true
+        },
+        "index": {
+            "EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_SORT_ORDER": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTR_GROUP_ATTR_SET_ID_EAV_ATTR_SET_ATTR_SET_ID": true,
+            "EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_NAME": true,
+            "EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE": true,
+            "CATALOG_CATEGORY_PRODUCT_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE": true
+        }
+    },
+    "eav_entity_attribute": {
+        "column": {
+            "entity_attribute_id": true,
+            "entity_type_id": true,
+            "attribute_set_id": true,
+            "attribute_group_id": true,
+            "attribute_id": true,
+            "sort_order": true
+        },
+        "index": {
+            "EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_SORT_ORDER": true,
+            "EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "EAV_ENTT_ATTR_ATTR_GROUP_ID_EAV_ATTR_GROUP_ATTR_GROUP_ID": true,
+            "EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_SET_ID_ATTRIBUTE_ID": true,
+            "EAV_ENTITY_ATTRIBUTE_ATTRIBUTE_GROUP_ID_ATTRIBUTE_ID": true
+        }
+    },
+    "eav_attribute_option": {
+        "column": {
+            "option_id": true,
+            "attribute_id": true,
+            "sort_order": true
+        },
+        "index": {
+            "EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTRIBUTE_OPTION_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true
+        }
+    },
+    "eav_attribute_option_value": {
+        "column": {
+            "value_id": true,
+            "option_id": true,
+            "store_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ATTRIBUTE_OPTION_VALUE_OPTION_ID": true,
+            "EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTR_OPT_VAL_OPT_ID_EAV_ATTR_OPT_OPT_ID": true,
+            "EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "eav_attribute_label": {
+        "column": {
+            "attribute_label_id": true,
+            "attribute_id": true,
+            "store_id": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ATTRIBUTE_LABEL_STORE_ID": true,
+            "EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "eav_form_type": {
+        "column": {
+            "type_id": true,
+            "code": true,
+            "label": true,
+            "is_system": true,
+            "theme": true,
+            "store_id": true
+        },
+        "index": {
+            "EAV_FORM_TYPE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_FORM_TYPE_STORE_ID_STORE_STORE_ID": true,
+            "EAV_FORM_TYPE_CODE_THEME_STORE_ID": true
+        }
+    },
+    "eav_form_type_entity": {
+        "column": {
+            "type_id": true,
+            "entity_type_id": true
+        },
+        "index": {
+            "EAV_FORM_TYPE_ENTITY_ENTITY_TYPE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_FORM_TYPE_ENTT_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID": true,
+            "EAV_FORM_TYPE_ENTITY_TYPE_ID_EAV_FORM_TYPE_TYPE_ID": true
+        }
+    },
+    "eav_form_fieldset": {
+        "column": {
+            "fieldset_id": true,
+            "type_id": true,
+            "code": true,
+            "sort_order": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_FORM_FIELDSET_TYPE_ID_EAV_FORM_TYPE_TYPE_ID": true,
+            "EAV_FORM_FIELDSET_TYPE_ID_CODE": true
+        }
+    },
+    "eav_form_fieldset_label": {
+        "column": {
+            "fieldset_id": true,
+            "store_id": true,
+            "label": true
+        },
+        "index": {
+            "EAV_FORM_FIELDSET_LABEL_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_FORM_FSET_LBL_FSET_ID_EAV_FORM_FSET_FSET_ID": true,
+            "EAV_FORM_FIELDSET_LABEL_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "eav_form_element": {
+        "column": {
+            "element_id": true,
+            "type_id": true,
+            "fieldset_id": true,
+            "attribute_id": true,
+            "sort_order": true
+        },
+        "index": {
+            "EAV_FORM_ELEMENT_FIELDSET_ID": true,
+            "EAV_FORM_ELEMENT_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_FORM_ELEMENT_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "EAV_FORM_ELEMENT_FIELDSET_ID_EAV_FORM_FIELDSET_FIELDSET_ID": true,
+            "EAV_FORM_ELEMENT_TYPE_ID_EAV_FORM_TYPE_TYPE_ID": true,
+            "EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Eav/etc/module.xml b/app/code/Magento/Eav/etc/module.xml
index acd5807a29f90..97655bd4e1e35 100644
--- a/app/code/Magento/Eav/etc/module.xml
+++ b/app/code/Magento/Eav/etc/module.xml
@@ -6,9 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Eav" setup_version="2.1.1">
+    <module name="Magento_Eav" >
         <sequence>
             <module name="Magento_Store"/>
+            <module name="Magento_Theme"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Eav/view/adminhtml/requirejs-config.js b/app/code/Magento/Eav/view/adminhtml/requirejs-config.js
new file mode 100644
index 0000000000000..6e3835852fd2d
--- /dev/null
+++ b/app/code/Magento/Eav/view/adminhtml/requirejs-config.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            eavInputTypes: 'Magento_Eav/js/input-types'
+        }
+    }
+};
diff --git a/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml b/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
index 223b3e9888eea..b7b29d7cdcd10 100644
--- a/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
+++ b/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
@@ -2,4 +2,19 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */;
+ */
+
+/** @var \Magento\Eav\Block\Adminhtml\Attribute\Edit\Js $block */
+
+// @codingStandardsIgnoreFile
+?>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "eavInputTypes": {
+                "inputTypes": <?= /* @escapeNotVerified */ json_encode($block->getComaptibleInputTypes())?>,
+                "hints": <?= /* @escapeNotVerified */ json_encode($block->getInputTypeHints())?>
+            }
+        }
+    }
+</script>
diff --git a/app/code/Magento/Eav/view/adminhtml/web/js/input-types.js b/app/code/Magento/Eav/view/adminhtml/web/js/input-types.js
new file mode 100644
index 0000000000000..250bea09adf4b
--- /dev/null
+++ b/app/code/Magento/Eav/view/adminhtml/web/js/input-types.js
@@ -0,0 +1,84 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    return function (config) {
+        $('select#frontend_input').each(function () {
+            var select = $(this),
+                currentValue = select.find('option:selected').val(),
+                compatibleTypes = config.inputTypes,
+                enabledTypes = [],
+                iterator,
+                warning = $('<label>')
+                    .hide()
+                    .text($.mage.__('These changes affect all related products.'))
+                    .addClass('mage-error')
+                    .attr({
+                        generated: true, for: select.attr('id')
+                    }),
+                hint = $('<p>')
+                    .hide()
+                    .addClass('note')
+                    .attr({
+                        generated: true
+                    }),
+                hints = config.hints,
+
+            /**
+             * Toggle hint about changes types
+             */
+            toggleWarning = function () {
+                if (select.find('option:selected').val() === currentValue) {
+                    warning.hide();
+                } else {
+                    warning.show();
+                }
+            },
+
+            /**
+             * Toggle hint
+             */
+            toggleHint = function () {
+                if (typeof hints[select.find('option:selected').val()] !== 'undefined') {
+                    select.after(hint.show().text(hints[select.find('option:selected').val()]));
+                } else {
+                    hint.hide();
+                }
+            },
+
+            /**
+             * Remove unsupported options
+             */
+            removeOption = function () {
+                if (!~enabledTypes.indexOf($(this).val())) {
+                    $(this).remove();
+                }
+            };
+
+            // find enabled types for switching dor current input type
+            for (iterator = 0; iterator < compatibleTypes.length; iterator++) {
+                if (compatibleTypes[iterator].indexOf(currentValue) >= 0) {
+                    enabledTypes = compatibleTypes[iterator];
+                }
+            }
+
+            // Check current type (allow only compatible types)
+            if (~enabledTypes.indexOf(currentValue)) {
+                // Enable select and keep only available options (all other will be removed)
+                select.removeAttr('disabled').find('option').each(removeOption);
+                // Add warning on page and event for show/hide it
+                select.after(warning).on('change', toggleWarning);
+            }
+            //bind hint toggling on change event
+            select.on('change', toggleHint);
+            //show hint for currently selected value
+            toggleHint();
+        });
+    };
+});
diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/AttributeOptions.php b/app/code/Magento/EavGraphQl/Model/Resolver/AttributeOptions.php
new file mode 100644
index 0000000000000..e4c27adc60247
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Model/Resolver/AttributeOptions.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\EavGraphQl\Model\Resolver;
+
+use Magento\EavGraphQl\Model\Resolver\DataProvider\AttributeOptions as AttributeOptionsDataProvider;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolve attribute options data for custom attribute.
+ */
+class AttributeOptions implements ResolverInterface
+{
+    /**
+     * @var AttributeOptionsDataProvider
+     */
+    private $attributeOptionsDataProvider;
+
+    /**
+     * @var AttributeOptions
+     */
+    private $valueFactory;
+
+    /**
+     * @param AttributeOptionsDataProvider $attributeOptionsDataProvider
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        AttributeOptionsDataProvider $attributeOptionsDataProvider,
+        ValueFactory $valueFactory
+    ) {
+        $this->attributeOptionsDataProvider = $attributeOptionsDataProvider;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) : Value {
+
+        return $this->valueFactory->create(function () use ($value) {
+            $entityType = $this->getEntityType($value);
+            $attributeCode = $this->getAttributeCode($value);
+
+            $optionsData = $this->getAttributeOptionsData($entityType, $attributeCode);
+            return $optionsData;
+        });
+    }
+
+    /**
+     * Get entity type
+     *
+     * @param array $value
+     * @return int
+     * @throws LocalizedException
+     */
+    private function getEntityType(array $value): int
+    {
+        if (!isset($value['entity_type'])) {
+            throw new LocalizedException(__('"Entity type should be specified'));
+        }
+
+        return (int)$value['entity_type'];
+    }
+
+    /**
+     * Get attribute code
+     *
+     * @param array $value
+     * @return string
+     * @throws LocalizedException
+     */
+    private function getAttributeCode(array $value): string
+    {
+        if (!isset($value['attribute_code'])) {
+            throw new LocalizedException(__('"Attribute code should be specified'));
+        }
+
+        return $value['attribute_code'];
+    }
+
+    /**
+     * Get attribute options data
+     *
+     * @param int $entityType
+     * @param string $attributeCode
+     * @return array
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getAttributeOptionsData(int $entityType, string $attributeCode): array
+    {
+        try {
+            $optionsData = $this->attributeOptionsDataProvider->getData($entityType, $attributeCode);
+        } catch (InputException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        } catch (StateException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        }
+        return $optionsData;
+    }
+}
diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php b/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php
new file mode 100644
index 0000000000000..62e3f01836619
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\EavGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\EavGraphQl\Model\Resolver\Query\Type;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Resolve data for custom attribute metadata requests
+ */
+class CustomAttributeMetadata implements ResolverInterface
+{
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @param Type $type
+     */
+    public function __construct(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $attributes['items'] = null;
+        $attributeInputs = $args['attributes'];
+        foreach ($attributeInputs as $attribute) {
+            if (!isset($attribute['attribute_code']) || !isset($attribute['entity_type'])) {
+                $attributes['items'][] = $this->createInputException($attribute);
+                continue;
+            }
+            try {
+                $type = $this->type->getType($attribute['attribute_code'], $attribute['entity_type']);
+            } catch (InputException $exception) {
+                $attributes['items'][] = new GraphQlNoSuchEntityException(
+                    __(
+                        'Attribute code %1 of entity type %2 not configured to have a type.',
+                        [$attribute['attribute_code'], $attribute['entity_type']]
+                    )
+                );
+                continue;
+            } catch (LocalizedException $exception) {
+                $attributes['items'][] = new GraphQlInputException(
+                    __(
+                        'Invalid entity_type specified: %1',
+                        [$attribute['entity_type']]
+                    )
+                );
+                continue;
+            }
+
+            if (empty($type)) {
+                continue;
+            }
+
+            $attributes['items'][] = [
+                'attribute_code' => $attribute['attribute_code'],
+                'entity_type' => $attribute['entity_type'],
+                'attribute_type' => ucfirst($type)
+            ];
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Create GraphQL input exception for an invalid attribute input
+     *
+     * @param array $attribute
+     * @return GraphQlInputException
+     */
+    private function createInputException(array $attribute) : GraphQlInputException
+    {
+        $isCodeSet = isset($attribute['attribute_code']);
+        $isEntitySet = isset($attribute['entity_type']);
+        $messagePart = !$isCodeSet ? 'attribute_code' : 'entity_type';
+        $messagePart .= !$isCodeSet && !$isEntitySet ? '/entity_type' : '';
+        $identifier = "Empty AttributeInput";
+        if ($isCodeSet) {
+            $identifier = 'attribute_code: ' . $attribute['attribute_code'];
+        } elseif ($isEntitySet) {
+            $identifier = 'entity_type: ' . $attribute['entity_type'];
+        }
+
+        return new GraphQlInputException(
+            __(
+                'Missing %1 for the input %2.',
+                [$messagePart, $identifier]
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/DataProvider/AttributeOptions.php b/app/code/Magento/EavGraphQl/Model/Resolver/DataProvider/AttributeOptions.php
new file mode 100644
index 0000000000000..900a31c1093ed
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Model/Resolver/DataProvider/AttributeOptions.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\EavGraphQl\Model\Resolver\DataProvider;
+
+use Magento\Eav\Api\AttributeOptionManagementInterface;
+
+/**
+ * Attribute Options data provider
+ */
+class AttributeOptions
+{
+    /**
+     * @var AttributeOptionManagementInterface
+     */
+    private $optionManager;
+
+    /**
+     * @param AttributeOptionManagementInterface $optionManager
+     */
+    public function __construct(
+        AttributeOptionManagementInterface $optionManager
+    ) {
+        $this->optionManager = $optionManager;
+    }
+
+    /**
+     * @param int $entityType
+     * @param string $attributeCode
+     * @return array
+     */
+    public function getData(int $entityType, string $attributeCode): array
+    {
+        $options = $this->optionManager->getItems($entityType, $attributeCode);
+
+        $optionsData = [];
+        foreach ($options as $option) {
+            // without empty option @see \Magento\Eav\Model\Entity\Attribute\Source\Table::getAllOptions
+            if ($option->getValue() === '') {
+                continue;
+            }
+
+            $optionsData[] = [
+                'label' => $option->getLabel(),
+                'value' => $option->getValue()
+            ];
+        }
+        return $optionsData;
+    }
+}
diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php b/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
new file mode 100644
index 0000000000000..ef21a26f1f62e
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\EavGraphQl\Model\Resolver\Query;
+
+use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Translate type names found by the custom type locator to GraphQL type names.
+ *
+ * @api
+ */
+class Type
+{
+    /**
+     * @var CustomAttributeTypeLocatorInterface
+     */
+    private $typeLocator;
+
+    /**
+     * @var TypeProcessor
+     */
+    private $typeProcessor;
+
+    /**
+     * @var array
+     */
+    private $customTypes;
+
+    /**
+     * @param CustomAttributeTypeLocatorInterface $typeLocator
+     * @param TypeProcessor $typeProcessor
+     * @param array $customTypes
+     */
+    public function __construct(
+        CustomAttributeTypeLocatorInterface $typeLocator,
+        TypeProcessor $typeProcessor,
+        array $customTypes = []
+    ) {
+        $this->typeLocator = $typeLocator;
+        $this->typeProcessor = $typeProcessor;
+        $this->customTypes = $customTypes;
+    }
+
+    /**
+     * Get type name if located, otherwise return blank/configured type if type found is `mixed`
+     *
+     * @param string $attributeCode
+     * @param string $entityType
+     * @return string
+     * @throws GraphQlInputException
+     */
+    public function getType(string $attributeCode, string $entityType) : string
+    {
+        $type = $this->typeLocator->getType($attributeCode, $entityType);
+
+        $isComplexType = strpos($type, '\\') !== false;
+        if ($type === TypeProcessor::NORMALIZED_ANY_TYPE) {
+            $type = isset($this->customTypes[$attributeCode]) ? $this->customTypes[$attributeCode] : $type;
+            return $type;
+        } elseif ($type === TypeProcessor::ANY_TYPE) {
+            return "";
+        } elseif ($isComplexType) {
+            try {
+                $type = $this->typeProcessor->translateTypeName($type);
+            } catch (\InvalidArgumentException $exception) {
+                throw new GraphQlInputException(__('Cannot resolve EAV type'));
+            }
+        } else {
+            $type = $type === 'double' ? 'float' : $type;
+        }
+
+        return $type;
+    }
+}
diff --git a/app/code/Magento/EavGraphQl/README.md b/app/code/Magento/EavGraphQl/README.md
new file mode 100644
index 0000000000000..d0121a19f2562
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/README.md
@@ -0,0 +1,3 @@
+# EavGraphQl
+
+**EavGraphQl** primarily provides the GraphQl module information to generate metadata for Eav attributes.
diff --git a/app/code/Magento/EavGraphQl/Test/Mftf/README.md b/app/code/Magento/EavGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c8fb8f834c6b6
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Eav Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Eav Graph Ql** module.
diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json
new file mode 100644
index 0000000000000..a2c2d025a3d9d
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-eav-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-eav": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\EavGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/EavGraphQl/etc/module.xml b/app/code/Magento/EavGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..795acfaf647af
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_EavGraphQl" >
+        <sequence>
+            <module name="Magento_Eav"/>
+            <module name="Magento_GraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/EavGraphQl/etc/schema.graphqls b/app/code/Magento/EavGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..adada3030f501
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/etc/schema.graphqls
@@ -0,0 +1,27 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    customAttributeMetadata(attributes: [AttributeInput!]!): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata")  @doc(description: "The customAttributeMetadata query returns the attribute type, given an attribute code and entity type")
+}
+
+type CustomAttributeMetadata @doc(description: "CustomAttributeMetadata defines an array of attribute_codes and entity_types") {
+    items: [Attribute] @doc(description: "An array of attributes")
+}
+
+type Attribute @doc(description: "Attribute contains the attribute_type of the specified attribute_code and entity_type") {
+    attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
+    entity_type: String @doc(description: "The type of entity that defines the attribute")
+    attribute_type: String @doc(description: "The data type of the attribute")
+    attribute_options: [AttributeOption] @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributeOptions") @doc(description: "Attribute options list.")
+}
+
+type AttributeOption @doc(description: "Attribute option.") {
+    label: String @doc(description: "Attribute option label.")
+    value: String @doc(description: "Attribute option value.")
+}
+
+input AttributeInput @doc(description: "AttributeInput specifies the attribute_code and entity_type to search") {
+    attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
+    entity_type: String @doc(description: "The type of entity that defines the attribute")
+}
diff --git a/app/code/Magento/EavGraphQl/registration.php b/app/code/Magento/EavGraphQl/registration.php
new file mode 100644
index 0000000000000..a4e3f3e274bee
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_EavGraphQl', __DIR__);
diff --git a/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php
new file mode 100644
index 0000000000000..aa40928ce2b16
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Block\Adminhtml\System\Config\Elasticsearch5;
+
+/**
+ * Elasticsearch 5x test connection block
+ * @codeCoverageIgnore
+ */
+class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getFieldMapping()
+    {
+        $fields = [
+            'engine' => 'catalog_search_engine',
+            'hostname' => 'catalog_search_elasticsearch5_server_hostname',
+            'port' => 'catalog_search_elasticsearch5_server_port',
+            'index' => 'catalog_search_elasticsearch5_index_prefix',
+            'enableAuth' => 'catalog_search_elasticsearch5_enable_auth',
+            'username' => 'catalog_search_elasticsearch5_username',
+            'password' => 'catalog_search_elasticsearch5_password',
+            'timeout' => 'catalog_search_elasticsearch5_server_timeout',
+        ];
+        return array_merge(parent::_getFieldMapping(), $fields);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php
new file mode 100644
index 0000000000000..5dc4476794da7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Block\Adminhtml\System\Config;
+
+/**
+ * Elasticsearch test connection block
+ * @codeCoverageIgnore
+ */
+class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getFieldMapping()
+    {
+        $fields = [
+            'engine' => 'catalog_search_engine',
+            'hostname' => 'catalog_search_elasticsearch_server_hostname',
+            'port' => 'catalog_search_elasticsearch_server_port',
+            'index' => 'catalog_search_elasticsearch_index_prefix',
+            'enableAuth' => 'catalog_search_elasticsearch_enable_auth',
+            'username' => 'catalog_search_elasticsearch_username',
+            'password' => 'catalog_search_elasticsearch_password',
+            'timeout' => 'catalog_search_elasticsearch_server_timeout',
+        ];
+        return array_merge(parent::_getFieldMapping(), $fields);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
new file mode 100644
index 0000000000000..eb7874a936140
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper;
+
+use Magento\Elasticsearch\Model\ResourceModel\Index;
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Provide data mapping for categories fields
+ */
+class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
+{
+    /**
+     * @var Index
+     */
+    private $resourceIndex;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @param Index $resourceIndex
+     * @param AttributeProvider|null $attributeAdapterProvider
+     * @param ResolverInterface|null $fieldNameResolver
+     */
+    public function __construct(
+        Index $resourceIndex,
+        AttributeProvider $attributeAdapterProvider = null,
+        ResolverInterface $fieldNameResolver = null
+    ) {
+        $this->resourceIndex = $resourceIndex;
+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
+            ->get(ResolverInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFields(array $productIds, $storeId)
+    {
+        $categoryData = $this->resourceIndex->getFullCategoryProductIndexData($storeId, $productIds);
+
+        $fields = [];
+        foreach ($productIds as $productId) {
+            $fields[$productId] = $this->getProductCategoryData($productId, $categoryData);
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Prepare category index data for product
+     *
+     * @param int $productId
+     * @param array $categoryIndexData
+     * @return array
+     */
+    private function getProductCategoryData($productId, array $categoryIndexData)
+    {
+        $result = [];
+
+        if (array_key_exists($productId, $categoryIndexData)) {
+            $indexData = $categoryIndexData[$productId];
+            $categoryIds = array_column($indexData, 'id');
+
+            if (count($categoryIds)) {
+                $result = ['category_ids' => $categoryIds];
+                $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
+                $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
+                foreach ($indexData as $data) {
+                    $categoryPositionKey = $this->fieldNameResolver->getFieldName(
+                        $positionAttribute,
+                        ['categoryId' => $data['id']]
+                    );
+                    $categoryNameKey = $this->fieldNameResolver->getFieldName(
+                        $categoryNameAttribute,
+                        ['categoryId' => $data['id']]
+                    );
+                    $result[$categoryPositionKey] = $data['position'];
+                    $result[$categoryNameKey] = $data['name'];
+                }
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php
new file mode 100644
index 0000000000000..58f7029cd16e1
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper;
+
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+
+/**
+ * Proxy for data mapping of categories fields
+ */
+class CategoryFieldsProviderProxy implements AdditionalFieldsProviderInterface
+{
+    /**
+     * @var ClientResolver
+     */
+    private $clientResolver;
+
+    /**
+     * @var AdditionalFieldsProviderInterface[]
+     */
+    private $categoryFieldsProviders;
+
+    /**
+     * CategoryFieldsProviderProxy constructor.
+     * @param ClientResolver $clientResolver
+     * @param AdditionalFieldsProviderInterface[] $categoryFieldsProviders
+     */
+    public function __construct(
+        ClientResolver $clientResolver,
+        array $categoryFieldsProviders
+    ) {
+        $this->clientResolver = $clientResolver;
+        $this->categoryFieldsProviders = $categoryFieldsProviders;
+    }
+
+    /**
+     * @return AdditionalFieldsProviderInterface
+     */
+    private function getCategoryFieldsProvider()
+    {
+        return $this->categoryFieldsProviders[$this->clientResolver->getCurrentEngine()];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFields(array $productIds, $storeId)
+    {
+        return $this->getCategoryFieldsProvider()->getFields($productIds, $storeId);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php
new file mode 100644
index 0000000000000..f0b7380397235
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php
@@ -0,0 +1,454 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper;
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer;
+use Magento\Elasticsearch\Model\Adapter\Document\Builder;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Elasticsearch\Model\ResourceModel\Index;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Don't use this product data mapper class.
+ *
+ * @deprecated 100.2.0
+ * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
+ */
+class ProductDataMapper implements DataMapperInterface
+{
+    /**
+     * Attribute code for image
+     */
+    const MEDIA_ROLE_IMAGE = 'image';
+
+    /**
+     * Attribute code for small image
+     */
+    const MEDIA_ROLE_SMALL_IMAGE = 'small_image';
+
+    /**
+     * Attribute code for thumbnail
+     */
+    const MEDIA_ROLE_THUMBNAIL = 'thumbnail';
+
+    /**
+     * Attribute code for swatches
+     */
+    const MEDIA_ROLE_SWATCH_IMAGE = 'swatch_image';
+
+    /**
+     * @var Builder
+     */
+    private $builder;
+
+    /**
+     * @var AttributeContainer
+     */
+    private $attributeContainer;
+
+    /**
+     * @var Index
+     */
+    private $resourceIndex;
+
+    /**
+     * @var FieldMapperInterface
+     */
+    private $fieldMapper;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var DateFieldType
+     */
+    private $dateFieldType;
+
+    /**
+     * Media gallery roles
+     *
+     * @var array
+     */
+    protected $mediaGalleryRoles;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $fieldNameResolver;
+
+    /**
+     * Construction for DocumentDataMapper
+     *
+     * @param Builder $builder
+     * @param AttributeContainer $attributeContainer
+     * @param Index $resourceIndex
+     * @param FieldMapperInterface $fieldMapper
+     * @param StoreManagerInterface $storeManager
+     * @param DateFieldType $dateFieldType
+     * @param AttributeProvider|null $attributeAdapterProvider
+     * @param ResolverInterface|null $fieldNameResolver
+     */
+    public function __construct(
+        Builder $builder,
+        AttributeContainer $attributeContainer,
+        Index $resourceIndex,
+        FieldMapperInterface $fieldMapper,
+        StoreManagerInterface $storeManager,
+        DateFieldType $dateFieldType,
+        AttributeProvider $attributeAdapterProvider = null,
+        ResolverInterface $fieldNameResolver = null
+    ) {
+        $this->builder = $builder;
+        $this->attributeContainer = $attributeContainer;
+        $this->resourceIndex = $resourceIndex;
+        $this->fieldMapper = $fieldMapper;
+        $this->storeManager = $storeManager;
+        $this->dateFieldType = $dateFieldType;
+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
+            ->get(ResolverInterface::class);
+
+        $this->mediaGalleryRoles = [
+            self::MEDIA_ROLE_IMAGE,
+            self::MEDIA_ROLE_SMALL_IMAGE,
+            self::MEDIA_ROLE_THUMBNAIL,
+            self::MEDIA_ROLE_SWATCH_IMAGE
+        ];
+    }
+
+    /**
+     * Prepare index data for using in search engine metadata.
+     *
+     * @param int $productId
+     * @param array $indexData
+     * @param int $storeId
+     * @param array $context
+     * @return array|false
+     */
+    public function map($productId, array $indexData, $storeId, $context = [])
+    {
+        $this->builder->addField('store_id', $storeId);
+        if (count($indexData)) {
+            $productIndexData = $this->resourceIndex->getFullProductIndexData($productId, $indexData);
+        }
+
+        foreach ($productIndexData as $attributeCode => $value) {
+            // Prepare processing attribute info
+            if (strpos($attributeCode, '_value') !== false) {
+                $this->builder->addField($attributeCode, $value);
+                continue;
+            }
+            $attribute = $this->attributeContainer->getAttribute($attributeCode);
+            if (!$attribute ||
+                in_array(
+                    $attributeCode,
+                    [
+                        'price',
+                        'media_gallery',
+                        'tier_price',
+                        'quantity_and_stock_status',
+                        'media_gallery',
+                        'giftcard_amounts'
+                    ]
+                )
+            ) {
+                continue;
+            }
+            $attribute->setStoreId($storeId);
+            $value = $this->checkValue($value, $attribute, $storeId);
+            $this->builder->addField(
+                $this->fieldMapper->getFieldName(
+                    $attributeCode,
+                    $context
+                ),
+                $value
+            );
+        }
+        $this->processAdvancedAttributes($productId, $productIndexData, $storeId);
+
+        return $this->builder->build();
+    }
+
+    /**
+     * Process advanced attribute values
+     *
+     * @param int $productId
+     * @param array $productIndexData
+     * @param int $storeId
+     * @return void
+     */
+    protected function processAdvancedAttributes($productId, array $productIndexData, $storeId)
+    {
+        $mediaGalleryRoles = array_fill_keys($this->mediaGalleryRoles, '');
+        $productPriceIndexData = $this->attributeContainer->getAttribute('price')
+            ? $this->resourceIndex->getPriceIndexData([$productId], $storeId)
+            : [];
+        $productCategoryIndexData = $this->resourceIndex->getFullCategoryProductIndexData(
+            $storeId,
+            [$productId => $productId]
+        );
+        foreach ($productIndexData as $attributeCode => $value) {
+            if (in_array($attributeCode, $this->mediaGalleryRoles)) {
+                $mediaGalleryRoles[$attributeCode] = $value;
+            } elseif ($attributeCode == 'tier_price') {
+                $this->builder->addFields($this->getProductTierPriceData($value));
+            } elseif ($attributeCode == 'quantity_and_stock_status') {
+                $this->builder->addFields($this->getQtyAndStatus($value));
+            } elseif ($attributeCode == 'media_gallery') {
+                $this->builder->addFields(
+                    $this->getProductMediaGalleryData(
+                        $value,
+                        $mediaGalleryRoles
+                    )
+                );
+            }
+        }
+        $this->builder->addFields($this->getProductPriceData($productId, $storeId, $productPriceIndexData));
+        $this->builder->addFields($this->getProductCategoryData($productId, $productCategoryIndexData));
+    }
+
+    /**
+     * Check value.
+     *
+     * @param mixed $value
+     * @param Attribute $attribute
+     * @param string $storeId
+     * @return array|mixed|null|string
+     */
+    protected function checkValue($value, $attribute, $storeId)
+    {
+        if (in_array($attribute->getBackendType(), ['datetime', 'timestamp'])
+            || $attribute->getFrontendInput() === 'date') {
+            return $this->dateFieldType->formatDate($storeId, $value);
+        } elseif ($attribute->getFrontendInput() === 'multiselect') {
+            return str_replace(',', ' ', $value);
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * Prepare tier price data for product
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function getProductTierPriceData($data)
+    {
+        $result = [];
+        if (!empty($data)) {
+            $i = 0;
+            foreach ($data as $tierPrice) {
+                $result['tier_price_id_' . $i] = $tierPrice['price_id'];
+                $result['tier_website_id_' . $i] = $tierPrice['website_id'];
+                $result['tier_all_groups_' . $i] = $tierPrice['all_groups'];
+                $result['tier_cust_group_' . $i] = $tierPrice['cust_group'] == GroupInterface::CUST_GROUP_ALL
+                    ? '' : $tierPrice['cust_group'];
+                $result['tier_price_qty_' . $i] = $tierPrice['price_qty'];
+                $result['tier_website_price_' . $i] = $tierPrice['website_price'];
+                $result['tier_price_' . $i] = $tierPrice['price'];
+                $i++;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Prepare media gallery data for product
+     *
+     * @param array $media
+     * @param array $roles
+     * @return array
+     */
+    protected function getProductMediaGalleryData($media, $roles)
+    {
+        $result = [];
+
+        if (!empty($media['images'])) {
+            $i = 0;
+            foreach ($media['images'] as $data) {
+                if ($data['media_type'] === 'image') {
+                    $result['image_file_' . $i] = $data['file'];
+                    $result['image_position_' . $i] = $data['position'];
+                    $result['image_disabled_' . $i] = $data['disabled'];
+                    $result['image_label_' . $i] = $data['label'];
+                    $result['image_title_' . $i] = $data['label'];
+                    $result['image_base_image_' . $i] = $this->getMediaRoleImage($data['file'], $roles);
+                    $result['image_small_image_' . $i] = $this->getMediaRoleSmallImage($data['file'], $roles);
+                    $result['image_thumbnail_' . $i] = $this->getMediaRoleThumbnail($data['file'], $roles);
+                    $result['image_swatch_image_' . $i] = $this->getMediaRoleSwatchImage($data['file'], $roles);
+                } else {
+                    $result['video_file_' . $i] = $data['file'];
+                    $result['video_position_' . $i] = $data['position'];
+                    $result['video_disabled_' . $i] = $data['disabled'];
+                    $result['video_label_' . $i] = $data['label'];
+                    $result['video_title_' . $i] = $data['video_title'];
+                    $result['video_base_image_' . $i] = $this->getMediaRoleImage($data['file'], $roles);
+                    $result['video_small_image_' . $i] = $this->getMediaRoleSmallImage($data['file'], $roles);
+                    $result['video_thumbnail_' . $i] = $this->getMediaRoleThumbnail($data['file'], $roles);
+                    $result['video_swatch_image_' . $i] = $this->getMediaRoleSwatchImage($data['file'], $roles);
+                    $result['video_url_' . $i] = $data['video_url'];
+                    $result['video_description_' . $i] = $data['video_description'];
+                    $result['video_metadata_' . $i] = $data['video_metadata'];
+                    $result['video_provider_' . $i] = $data['video_provider'];
+                }
+                $i++;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Get media role image.
+     *
+     * @param string $file
+     * @param array $roles
+     * @return string
+     */
+    protected function getMediaRoleImage($file, $roles)
+    {
+        return $file == $roles[self::MEDIA_ROLE_IMAGE] ? '1' : '0';
+    }
+
+    /**
+     * Get media role small image.
+     *
+     * @param string $file
+     * @param array $roles
+     * @return string
+     */
+    protected function getMediaRoleSmallImage($file, $roles)
+    {
+        return $file == $roles[self::MEDIA_ROLE_SMALL_IMAGE] ? '1' : '0';
+    }
+
+    /**
+     * Get media role thumbnail.
+     *
+     * @param string $file
+     * @param array $roles
+     * @return string
+     */
+    protected function getMediaRoleThumbnail($file, $roles)
+    {
+        return $file == $roles[self::MEDIA_ROLE_THUMBNAIL] ? '1' : '0';
+    }
+
+    /**
+     * Get media role swatch image.
+     *
+     * @param string $file
+     * @param array $roles
+     * @return string
+     */
+    protected function getMediaRoleSwatchImage($file, $roles)
+    {
+        return $file == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] ? '1' : '0';
+    }
+
+    /**
+     * Prepare quantity and stock status for product
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function getQtyAndStatus($data)
+    {
+        $result = [];
+        if (!is_array($data)) {
+            $result['is_in_stock'] = $data ? 1 : 0;
+            $result['qty'] = $data;
+        } else {
+            $result['is_in_stock'] = $data['is_in_stock'] ? 1 : 0;
+            $result['qty'] = $data['qty'];
+        }
+        return $result;
+    }
+
+    /**
+     * Prepare price index for product
+     *
+     * @param int $productId
+     * @param int $storeId
+     * @param array $priceIndexData
+     * @return array
+     */
+    protected function getProductPriceData($productId, $storeId, array $priceIndexData)
+    {
+        $result = [];
+        if (array_key_exists($productId, $priceIndexData)) {
+            $productPriceIndexData = $priceIndexData[$productId];
+            foreach ($productPriceIndexData as $customerGroupId => $price) {
+                $fieldName = $this->fieldMapper->getFieldName(
+                    'price',
+                    ['customerGroupId' => $customerGroupId, 'websiteId' => $storeId]
+                );
+                $result[$fieldName] = sprintf('%F', $price);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Prepare category index data for product
+     *
+     * @param int $productId
+     * @param array $categoryIndexData
+     * @return array
+     */
+    protected function getProductCategoryData($productId, array $categoryIndexData)
+    {
+        $result = [];
+        $categoryIds = [];
+
+        if (array_key_exists($productId, $categoryIndexData)) {
+            $indexData = $categoryIndexData[$productId];
+            $result = $indexData;
+        }
+
+        if (array_key_exists($productId, $categoryIndexData)) {
+            $indexData = $categoryIndexData[$productId];
+            foreach ($indexData as $categoryData) {
+                $categoryIds[] = (int)$categoryData['id'];
+            }
+            if (count($categoryIds)) {
+                $result = ['category_ids' => implode(' ', $categoryIds)];
+                $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
+                $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
+                foreach ($indexData as $data) {
+                    $categoryPositionKey = $this->fieldNameResolver->getFieldName(
+                        $positionAttribute,
+                        ['categoryId' => $data['id']]
+                    );
+                    $categoryNameKey = $this->fieldNameResolver->getFieldName(
+                        $categoryNameAttribute,
+                        ['categoryId' => $data['id']]
+                    );
+                    $result[$categoryPositionKey] = $data['position'];
+                    $result[$categoryNameKey] = $data['name'];
+                }
+            }
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php
new file mode 100644
index 0000000000000..0fc6100979f21
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper;
+
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
+
+/**
+ * Proxy for product data mappers
+ */
+class ProductDataMapperProxy implements DataMapperInterface
+{
+    /**
+     * @var ClientResolver
+     */
+    private $clientResolver;
+
+    /**
+     * @var DataMapperInterface[]
+     */
+    private $dataMappers;
+
+    /**
+     * CategoryFieldsProviderProxy constructor.
+     * @param ClientResolver $clientResolver
+     * @param DataMapperInterface[] $dataMappers
+     */
+    public function __construct(
+        ClientResolver $clientResolver,
+        array $dataMappers
+    ) {
+        $this->clientResolver = $clientResolver;
+        $this->dataMappers = $dataMappers;
+    }
+
+    /**
+     * @return DataMapperInterface
+     */
+    private function getDataMapper()
+    {
+        return $this->dataMappers[$this->clientResolver->getCurrentEngine()];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function map($entityId, array $entityIndexData, $storeId, $context = [])
+    {
+        return $this->getDataMapper()->map($entityId, $entityIndexData, $storeId, $context);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
new file mode 100644
index 0000000000000..b7f21696162dd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
+
+/**
+ * Field type converter from internal index type to elastic service.
+ */
+class Converter implements ConverterInterface
+{
+    /**
+     * Text flags for Elasticsearch index value
+     */
+    private const ES_NO_INDEX = false;
+
+    /**
+     * Mapping between internal data types and elastic service.
+     *
+     * @var array
+     */
+    private $mapping = [
+        'no_index' => self::ES_NO_INDEX,
+    ];
+
+    /**
+     * Get service field index type for elasticsearch 5.
+     *
+     * @param string $internalType
+     * @return string|boolean
+     * @throws \DomainException
+     */
+    public function convert(string $internalType)
+    {
+        if (!isset($this->mapping[$internalType])) {
+            throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));
+        }
+        return $this->mapping[$internalType];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
new file mode 100644
index 0000000000000..954deaec639ef
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+
+/**
+ * Field index resolver that provides index type for the attribute in mapping.
+ * For example, we need to set ‘no’/false in the case when attribute must be present in index data,
+ * but stay as not indexable.
+ */
+class IndexResolver implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * @param ConverterInterface $converter
+     * @param FieldTypeConverterInterface $fieldTypeConverter
+     * @param FieldTypeResolver $fieldTypeResolver
+     */
+    public function __construct(
+        ConverterInterface $converter,
+        FieldTypeConverterInterface $fieldTypeConverter,
+        FieldTypeResolver $fieldTypeResolver
+    ) {
+        $this->converter = $converter;
+        $this->fieldTypeConverter = $fieldTypeConverter;
+        $this->fieldTypeResolver = $fieldTypeResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFieldIndex(AttributeAdapter $attribute)
+    {
+        $index = null;
+        if (!$attribute->isSearchable()
+            && !$attribute->isAlwaysIndexable()
+            && ($this->isStringServiceFieldType($attribute) || $attribute->isComplexType())
+            && !(($attribute->isIntegerType() || $attribute->isBooleanType())
+                && !$attribute->isUserDefined())
+            && !$attribute->isFloatType()
+        ) {
+            $index = $this->converter->convert(ConverterInterface::INTERNAL_NO_INDEX_VALUE);
+        }
+
+        return $index;
+    }
+
+    /**
+     * Check if service field type for field set as 'string'
+     *
+     * @param AttributeAdapter $attribute
+     * @return bool
+     */
+    private function isStringServiceFieldType(AttributeAdapter $attribute): bool
+    {
+        $serviceFieldType = $this->fieldTypeResolver->getFieldType($attribute);
+        $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
+
+        return $serviceFieldType === $stringTypeKey;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
new file mode 100644
index 0000000000000..1f6e05c9e02fc
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+
+/**
+ * Field type converter from internal data types to elastic service.
+ */
+class Converter implements ConverterInterface
+{
+    /**#@+
+     * Text flags for Elasticsearch field types
+     */
+    private const ES_DATA_TYPE_TEXT = 'text';
+    private const ES_DATA_TYPE_KEYWORD = 'keyword';
+    private const ES_DATA_TYPE_FLOAT = 'float';
+    private const ES_DATA_TYPE_INT = 'integer';
+    private const ES_DATA_TYPE_DATE = 'date';
+    /**#@-*/
+
+    /**
+     * Mapping between internal data types and elastic service.
+     *
+     * @var array
+     */
+    private $mapping = [
+        self::INTERNAL_DATA_TYPE_STRING => self::ES_DATA_TYPE_TEXT,
+        self::INTERNAL_DATA_TYPE_KEYWORD => self::ES_DATA_TYPE_KEYWORD,
+        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_FLOAT,
+        self::INTERNAL_DATA_TYPE_INT => self::ES_DATA_TYPE_INT,
+        self::INTERNAL_DATA_TYPE_DATE => self::ES_DATA_TYPE_DATE,
+    ];
+
+    /**
+     * Get service field type for elasticsearch 5.
+     *
+     * @param string $internalType
+     * @return string
+     * @throws \DomainException
+     */
+    public function convert(string $internalType): string
+    {
+        if (!isset($this->mapping[$internalType])) {
+            throw new \DomainException(sprintf('Unsupported internal field type: %s', $internalType));
+        }
+        return $this->mapping[$internalType];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
new file mode 100644
index 0000000000000..fed36ff6b1c8f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Composite resolver for resolving field type.
+ */
+class CompositeResolver implements ResolverInterface
+{
+    /**
+     * @var ResolverInterface[]
+     */
+    private $items;
+
+    /**
+     * @param ResolverInterface[] $items
+     */
+    public function __construct(array $items)
+    {
+        foreach ($items as $item) {
+            if (!$item instanceof ResolverInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field type resolver is expected, got %s instead.', get_class($item))
+                );
+            }
+        }
+        $this->items = $items;
+    }
+
+    /**
+     * Get field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        $result = null;
+        foreach ($this->items as $item) {
+            $result = $item->getFieldType($attribute);
+            if (null !== $result) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
new file mode 100644
index 0000000000000..e5c8dd48c7af3
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Integer type resolver.
+ */
+class IntegerType implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var array
+     */
+    private $integerTypeAttributes;
+
+    /**
+     * @param ConverterInterface $fieldTypeConverter
+     * @param array $integerTypeAttributes
+     */
+    public function __construct(ConverterInterface $fieldTypeConverter, $integerTypeAttributes = ['category_ids'])
+    {
+        $this->fieldTypeConverter = $fieldTypeConverter;
+        $this->integerTypeAttributes = $integerTypeAttributes;
+    }
+
+    /**
+     * Get integer field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        if (in_array($attribute->getAttributeCode(), $this->integerTypeAttributes, true)
+            || (($attribute->isIntegerType() || $attribute->isBooleanType())
+                && !$attribute->isUserDefined())
+        ) {
+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_INT);
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php
new file mode 100644
index 0000000000000..e522d4ae5e070
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Keyword type resolver.
+ */
+class KeywordType implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @param ConverterInterface $fieldTypeConverter
+     */
+    public function __construct(ConverterInterface $fieldTypeConverter)
+    {
+        $this->fieldTypeConverter = $fieldTypeConverter;
+    }
+
+    /**
+     * Get field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        if ($attribute->isComplexType()
+            || (!$attribute->isSearchable() && !$attribute->isAlwaysIndexable() && $attribute->isFilterable())
+        ) {
+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_KEYWORD);
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php
new file mode 100644
index 0000000000000..5aea87e5e6ae1
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper;
+
+use Magento\Eav\Model\Config;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use \Magento\Customer\Model\Session as CustomerSession;
+
+/**
+ * Class ProductFieldMapper
+ */
+class ProductFieldMapper implements FieldMapperInterface
+{
+    /**
+     * @deprecated
+     * @var Config
+     */
+    protected $eavConfig;
+
+    /**
+     * @deprecated
+     * @var FieldType
+     */
+    protected $fieldType;
+
+    /**
+     * @deprecated
+     * @var CustomerSession
+     */
+    protected $customerSession;
+
+    /**
+     * @deprecated
+     * @var StoreManager
+     */
+    protected $storeManager;
+
+    /**
+     * @deprecated
+     * @var Registry
+     */
+    protected $coreRegistry;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @var FieldProviderInterface
+     */
+    private $fieldProvider;
+
+    /**
+     * @param Config $eavConfig
+     * @param FieldType $fieldType
+     * @param CustomerSession $customerSession
+     * @param StoreManager $storeManager
+     * @param Registry $coreRegistry
+     * @param ResolverInterface|null $fieldNameResolver
+     * @param AttributeProvider|null $attributeAdapterProvider
+     * @param FieldProviderInterface|null $fieldProvider
+     */
+    public function __construct(
+        Config $eavConfig,
+        FieldType $fieldType,
+        CustomerSession $customerSession,
+        StoreManager $storeManager,
+        Registry $coreRegistry,
+        ResolverInterface $fieldNameResolver = null,
+        AttributeProvider $attributeAdapterProvider = null,
+        FieldProviderInterface $fieldProvider = null
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->fieldType = $fieldType;
+        $this->customerSession = $customerSession;
+        $this->storeManager = $storeManager;
+        $this->coreRegistry = $coreRegistry;
+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
+            ->get(ResolverInterface::class);
+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldProvider = $fieldProvider ?: ObjectManager::getInstance()
+            ->get(FieldProviderInterface::class);
+    }
+
+    /**
+     * Get field name.
+     *
+     * @param string $attributeCode
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName($attributeCode, $context = [])
+    {
+        $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attributeCode);
+        return $this->fieldNameResolver->getFieldName($attributeAdapter, $context);
+    }
+
+    /**
+     * Get all attributes types.
+     *
+     * @param array $context
+     * @return array
+     */
+    public function getAllAttributesTypes($context = [])
+    {
+        return $this->fieldProvider->getFields($context);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php
new file mode 100644
index 0000000000000..b912446acd63e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper;
+
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+
+/**
+ * Proxy for product fields mappers
+ */
+class ProductFieldMapperProxy implements FieldMapperInterface
+{
+    /**
+     * @var ClientResolver
+     */
+    private $clientResolver;
+
+    /**
+     * @var FieldMapperInterface[]
+     */
+    private $productFieldMappers;
+
+    /**
+     * CategoryFieldsProviderProxy constructor.
+     * @param ClientResolver $clientResolver
+     * @param FieldMapperInterface[] $productFieldMappers
+     */
+    public function __construct(
+        ClientResolver $clientResolver,
+        array $productFieldMappers
+    ) {
+        $this->clientResolver = $clientResolver;
+        $this->productFieldMappers = $productFieldMappers;
+    }
+
+    /**
+     * @return FieldMapperInterface
+     */
+    private function getProductFieldMapper()
+    {
+        return $this->productFieldMappers[$this->clientResolver->getCurrentEngine()];
+    }
+
+    /**
+     * Get field name
+     *
+     * @param string $attributeCode
+     * @param array $context
+     * @return string
+     * @since 100.1.0
+     */
+    public function getFieldName($attributeCode, $context = [])
+    {
+        return $this->getProductFieldMapper()->getFieldName($attributeCode, $context);
+    }
+
+    /**
+     * Get all entity attribute types
+     *
+     * @param array $context
+     * @return array
+     * @since 100.1.0
+     */
+    public function getAllAttributesTypes($context = [])
+    {
+        return $this->getProductFieldMapper()->getAllAttributesTypes($context);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php
new file mode 100644
index 0000000000000..6891b8c693624
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Class FieldType
+ *
+ * @api
+ * @since 100.1.0
+ *
+ * @deprecated This class provide not full data about field type. Only basic rules apply on this class.
+ * @see ResolverInterface
+ */
+class FieldType
+{
+    /**#@+
+     * @deprecated
+     * @see \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+     *
+     * Text flags for Elasticsearch field types
+     */
+    const ES_DATA_TYPE_TEXT = 'text';
+    const ES_DATA_TYPE_KEYWORD = 'keyword';
+    const ES_DATA_TYPE_FLOAT = 'float';
+    const ES_DATA_TYPE_INT = 'integer';
+    const ES_DATA_TYPE_DATE = 'date';
+
+    /** @deprecated */
+    const ES_DATA_TYPE_ARRAY = 'array';
+    /**#@-*/
+
+    /**
+     * Get field type.
+     *
+     * @deprecated
+     * @see ResolverInterface::getFieldType
+     *
+     * @param AbstractAttribute $attribute
+     * @return string
+     * @since 100.1.0
+     */
+    public function getFieldType($attribute)
+    {
+        trigger_error('Class is deprecated', E_USER_DEPRECATED);
+        $backendType = $attribute->getBackendType();
+        $frontendInput = $attribute->getFrontendInput();
+
+        if ($backendType === 'timestamp') {
+            $fieldType = self::ES_DATA_TYPE_DATE;
+        } elseif ((in_array($backendType, ['int', 'smallint'], true)
+            || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar'))
+            && !$attribute->getIsUserDefined()
+        ) {
+            $fieldType = self::ES_DATA_TYPE_INT;
+        } elseif ($backendType === 'decimal') {
+            $fieldType = self::ES_DATA_TYPE_FLOAT;
+        } else {
+            $fieldType = self::ES_DATA_TYPE_TEXT;
+        }
+
+        return $fieldType;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/ClientFactoryProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/ClientFactoryProxy.php
new file mode 100644
index 0000000000000..1371e8eb1ccab
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/ClientFactoryProxy.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Client;
+
+use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface;
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+
+/**
+ * Proxy for client factories
+ */
+class ClientFactoryProxy implements ClientFactoryInterface
+{
+    /**
+     * @var ClientResolver
+     */
+    private $clientResolver;
+
+    /**
+     * @var ClientFactoryInterface[]
+     */
+    private $clientFactories;
+
+    /**
+     * CategoryFieldsProviderProxy constructor.
+     * @param ClientResolver $clientResolver
+     * @param ClientFactoryInterface[] $clientFactories
+     */
+    public function __construct(
+        ClientResolver $clientResolver,
+        array $clientFactories
+    ) {
+        $this->clientResolver = $clientResolver;
+        $this->clientFactories = $clientFactories;
+    }
+
+    /**
+     * @return ClientFactoryInterface
+     */
+    private function getClientFactory()
+    {
+        return $this->clientFactories[$this->clientResolver->getCurrentEngine()];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function create(array $options = [])
+    {
+        return $this->getClientFactory()->create($options);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
new file mode 100644
index 0000000000000..c05e8a441604d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -0,0 +1,395 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\Model\Client;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\AdvancedSearch\Model\Client\ClientInterface;
+
+/**
+ * Elasticsearch client
+ */
+class Elasticsearch implements ClientInterface
+{
+    /**
+     * Elasticsearch Client instances
+     *
+     * @var \Elasticsearch\Client[]
+     */
+    private $client;
+
+    /**
+     * @var array
+     */
+    private $clientOptions;
+
+    /**
+     * @var bool
+     */
+    private $pingResult;
+
+    /**
+     * @var string
+     */
+    private $serverVersion;
+
+    /**
+     * Initialize Elasticsearch Client
+     *
+     * @param array $options
+     * @param \Elasticsearch\Client|null $elasticsearchClient
+     * @throws LocalizedException
+     */
+    public function __construct(
+        $options = [],
+        $elasticsearchClient = null
+    ) {
+        if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
+                    ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
+            throw new LocalizedException(
+                __('The search failed because of a search engine misconfiguration.')
+            );
+        }
+
+        if (!($elasticsearchClient instanceof \Elasticsearch\Client)) {
+            $config = $this->buildConfig($options);
+            $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config, true);
+        }
+        $this->client[getmypid()] = $elasticsearchClient;
+        $this->clientOptions = $options;
+    }
+
+    /**
+     * Get Elasticsearch Client
+     *
+     * @return \Elasticsearch\Client
+     */
+    private function getClient()
+    {
+        $pid = getmypid();
+        if (!isset($this->client[$pid])) {
+            $config = $this->buildConfig($this->clientOptions);
+            $this->client[$pid] = \Elasticsearch\ClientBuilder::fromConfig($config, true);
+        }
+        return $this->client[$pid];
+    }
+
+    /**
+     * Ping the Elasticsearch client
+     *
+     * @return bool
+     */
+    public function ping()
+    {
+        if ($this->pingResult === null) {
+            $this->pingResult = $this->getClient()->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
+        }
+
+        return $this->pingResult;
+    }
+
+    /**
+     * Validate connection params
+     *
+     * @return bool
+     */
+    public function testConnection()
+    {
+        return $this->ping();
+    }
+
+    /**
+     * Build config.
+     *
+     * @param array $options
+     * @return array
+     */
+    private function buildConfig($options = [])
+    {
+        $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
+        $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
+        if (!$protocol) {
+            $protocol = 'http';
+        }
+        if (!empty($options['port'])) {
+            $host .= ':' . $options['port'];
+        }
+        if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) {
+            $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host);
+        }
+
+        $options['hosts'] = [$host];
+        return $options;
+    }
+
+    /**
+     * Performs bulk query over Elasticsearch index
+     *
+     * @param array $query
+     * @return void
+     */
+    public function bulkQuery($query)
+    {
+        $this->getClient()->bulk($query);
+    }
+
+    /**
+     * Creates an Elasticsearch index.
+     *
+     * @param string $index
+     * @param array $settings
+     * @return void
+     */
+    public function createIndex($index, $settings)
+    {
+        $this->getClient()->indices()->create([
+            'index' => $index,
+            'body' => $settings,
+        ]);
+    }
+
+    /**
+     * Delete an Elasticsearch index.
+     *
+     * @param string $index
+     * @return void
+     */
+    public function deleteIndex($index)
+    {
+        $this->getClient()->indices()->delete(['index' => $index]);
+    }
+
+    /**
+     * Check if index is empty.
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function isEmptyIndex($index)
+    {
+        $stats = $this->getClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
+        if ($stats['indices'][$index]['primaries']['docs']['count'] == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Updates alias.
+     *
+     * @param string $alias
+     * @param string $newIndex
+     * @param string $oldIndex
+     * @return void
+     */
+    public function updateAlias($alias, $newIndex, $oldIndex = '')
+    {
+        $params['body'] = ['actions' => []];
+        if ($oldIndex) {
+            $params['body']['actions'][] = ['remove' => ['alias' => $alias, 'index' => $oldIndex]];
+        }
+        if ($newIndex) {
+            $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
+        }
+
+        $this->getClient()->indices()->updateAliases($params);
+    }
+
+    /**
+     * Checks whether Elasticsearch index exists
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function indexExists($index)
+    {
+        return $this->getClient()->indices()->exists(['index' => $index]);
+    }
+
+    /**
+     * Exists alias.
+     *
+     * @param string $alias
+     * @param string $index
+     * @return bool
+     */
+    public function existsAlias($alias, $index = '')
+    {
+        $params = ['name' => $alias];
+        if ($index) {
+            $params['index'] = $index;
+        }
+        return $this->getClient()->indices()->existsAlias($params);
+    }
+
+    /**
+     * Get alias.
+     *
+     * @param string $alias
+     * @return array
+     */
+    public function getAlias($alias)
+    {
+        return $this->getClient()->indices()->getAlias(['name' => $alias]);
+    }
+
+    /**
+     * Add mapping to Elasticsearch index
+     *
+     * @param array $fields
+     * @param string $index
+     * @param string $entityType
+     * @return void
+     */
+    public function addFieldsMapping(array $fields, $index, $entityType)
+    {
+        $params = [
+            'index' => $index,
+            'type' => $entityType,
+            'body' => [
+                $entityType => [
+                    '_all' => $this->prepareFieldInfo([
+                        'enabled' => true,
+                        'type' => 'text',
+                    ]),
+                    'properties' => [],
+                    'dynamic_templates' => [
+                        [
+                            'price_mapping' => [
+                                'match' => 'price_*',
+                                'match_mapping_type' => 'string',
+                                'mapping' => [
+                                    'type' => 'float',
+                                    'store' => true,
+                                ],
+                            ],
+                        ],
+                        [
+                            'string_mapping' => [
+                                'match' => '*',
+                                'match_mapping_type' => 'string',
+                                'mapping' => $this->prepareFieldInfo([
+                                    'type' => 'text',
+                                    'index' => false,
+                                ]),
+                            ],
+                        ],
+                        [
+                            'position_mapping' => [
+                                'match' => 'position_*',
+                                'match_mapping_type' => 'string',
+                                'mapping' => [
+                                    'type' => 'int',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        foreach ($fields as $field => $fieldInfo) {
+            $params['body'][$entityType]['properties'][$field] = $this->prepareFieldInfo($fieldInfo);
+        }
+
+        $this->getClient()->indices()->putMapping($params);
+    }
+
+    /**
+     * Fix backward compatibility of field definition. Allow to run both 2.x and 5.x servers.
+     *
+     * @param array $fieldInfo
+     *
+     * @return array
+     */
+    private function prepareFieldInfo($fieldInfo)
+    {
+
+        if (strcmp($this->getServerVersion(), '5') < 0) {
+            if ($fieldInfo['type'] == 'keyword') {
+                $fieldInfo['type'] = 'string';
+                $fieldInfo['index'] = isset($fieldInfo['index']) ? $fieldInfo['index'] : 'not_analyzed';
+            }
+
+            if ($fieldInfo['type'] == 'text') {
+                $fieldInfo['type'] = 'string';
+            }
+        }
+
+        return $fieldInfo;
+    }
+
+    /**
+     * Delete mapping in Elasticsearch index
+     *
+     * @param string $index
+     * @param string $entityType
+     * @return void
+     */
+    public function deleteMapping($index, $entityType)
+    {
+        $this->getClient()->indices()->deleteMapping([
+            'index' => $index,
+            'type' => $entityType,
+        ]);
+    }
+
+    /**
+     * Execute search by $query
+     *
+     * @param array $query
+     * @return array
+     */
+    public function query($query)
+    {
+        $query = $this->prepareSearchQuery($query);
+
+        return $this->getClient()->search($query);
+    }
+
+    /**
+     * Fix backward compatibility of the search queries. Allow to run both 2.x and 5.x servers.
+     *
+     * @param array $query
+     *
+     * @return array
+     */
+    private function prepareSearchQuery($query)
+    {
+        if (strcmp($this->getServerVersion(), '5') < 0) {
+            if (isset($query['body']) && isset($query['body']['stored_fields'])) {
+                $query['body']['fields'] = $query['body']['stored_fields'];
+                unset($query['body']['stored_fields']);
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Execute suggest query
+     *
+     * @param array $query
+     * @return array
+     */
+    public function suggest($query)
+    {
+        return $this->getClient()->suggest($query);
+    }
+
+    /**
+     * Retrieve ElasticSearch server current version.
+     *
+     * @return string
+     */
+    private function getServerVersion()
+    {
+        if ($this->serverVersion === null) {
+            $info = $this->getClient()->info();
+            $this->serverVersion = $info['version']['number'];
+        }
+
+        return $this->serverVersion;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
new file mode 100644
index 0000000000000..a6838d831b4bc
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Search\AdapterInterface;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\Search\Response\QueryResponse;
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder as AggregationBuilder;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use \Magento\Elasticsearch\SearchAdapter\ResponseFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Elasticsearch Search Adapter
+ */
+class Adapter implements AdapterInterface
+{
+    /**
+     * Mapper instance
+     *
+     * @var Mapper
+     */
+    protected $mapper;
+
+    /**
+     * Response Factory
+     *
+     * @var ResponseFactory
+     */
+    protected $responseFactory;
+
+    /**
+     * @var ConnectionManager
+     */
+    protected $connectionManager;
+
+    /**
+     * @var AggregationBuilder
+     */
+    protected $aggregationBuilder;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory
+     */
+    private $queryContainerFactory;
+
+    /**
+     * Empty response from Elasticsearch.
+     *
+     * @var array
+     */
+    private static $emptyRawResponse = [
+        "hits" =>
+            [
+                "hits" => []
+            ],
+        "aggregations" =>
+            [
+                "price_bucket" => [],
+                "category_bucket" =>
+                    [
+                        "buckets" => []
+
+                    ]
+            ]
+    ];
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param ConnectionManager $connectionManager
+     * @param Mapper $mapper
+     * @param ResponseFactory $responseFactory
+     * @param AggregationBuilder $aggregationBuilder
+     * @param \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ConnectionManager $connectionManager,
+        Mapper $mapper,
+        ResponseFactory $responseFactory,
+        AggregationBuilder $aggregationBuilder,
+        \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory,
+        LoggerInterface $logger = null
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->mapper = $mapper;
+        $this->responseFactory = $responseFactory;
+        $this->aggregationBuilder = $aggregationBuilder;
+        $this->queryContainerFactory = $queryContainerFactory;
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
+    }
+
+    /**
+     * Search query
+     *
+     * @param RequestInterface $request
+     * @return QueryResponse
+     */
+    public function query(RequestInterface $request)
+    {
+        $client = $this->connectionManager->getConnection();
+        $aggregationBuilder = $this->aggregationBuilder;
+        $query = $this->mapper->buildQuery($request);
+        $aggregationBuilder->setQuery($this->queryContainerFactory->create(['query' => $query]));
+
+        try {
+            $rawResponse = $client->query($query);
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            // return empty search result in case an exception is thrown from Elasticsearch
+            $rawResponse = self::$emptyRawResponse;
+        }
+
+        $rawDocuments = isset($rawResponse['hits']['hits']) ? $rawResponse['hits']['hits'] : [];
+        $queryResponse = $this->responseFactory->create(
+            [
+                'documents' => $rawDocuments,
+                'aggregations' => $aggregationBuilder->build($request, $rawResponse),
+            ]
+        );
+        return $queryResponse;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Aggregation/Interval.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Aggregation/Interval.php
new file mode 100644
index 0000000000000..a1fcbeb061481
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Aggregation/Interval.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Aggregation;
+
+use Magento\Framework\Search\Dynamic\IntervalInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+
+/**
+ * Aggregate price intervals for search query result.
+ */
+class Interval implements IntervalInterface
+{
+    /**
+     * Minimal possible value
+     */
+    const DELTA = 0.005;
+
+    /**
+     * @var ConnectionManager
+     */
+    private $connectionManager;
+
+    /**
+     * @var FieldMapperInterface
+     */
+    private $fieldMapper;
+
+    /**
+     * @var Config
+     */
+    private $clientConfig;
+
+    /**
+     * @var string
+     */
+    private $fieldName;
+
+    /**
+     * @var string
+     */
+    private $storeId;
+
+    /**
+     * @var array
+     */
+    private $entityIds;
+
+    /**
+     * @var SearchIndexNameResolver
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * @param ConnectionManager $connectionManager
+     * @param FieldMapperInterface $fieldMapper
+     * @param Config $clientConfig
+     * @param SearchIndexNameResolver $searchIndexNameResolver
+     * @param string $fieldName
+     * @param string $storeId
+     * @param array $entityIds
+     */
+    public function __construct(
+        ConnectionManager $connectionManager,
+        FieldMapperInterface $fieldMapper,
+        Config $clientConfig,
+        SearchIndexNameResolver $searchIndexNameResolver,
+        string $fieldName,
+        string $storeId,
+        array $entityIds
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->fieldMapper = $fieldMapper;
+        $this->clientConfig = $clientConfig;
+        $this->fieldName = $fieldName;
+        $this->storeId = $storeId;
+        $this->entityIds = $entityIds;
+        $this->searchIndexNameResolver = $searchIndexNameResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($limit, $offset = null, $lower = null, $upper = null)
+    {
+        $from = $to = [];
+        if ($lower) {
+            $from = ['gte' => $lower - self::DELTA];
+        }
+        if ($upper) {
+            $to = ['lt' => $upper - self::DELTA];
+        }
+
+        $requestQuery = $this->prepareBaseRequestQuery($from, $to);
+        $requestQuery = array_merge_recursive(
+            $requestQuery,
+            ['body' => ['stored_fields' => [$this->fieldName], 'size' => $limit]]
+        );
+
+        if ($offset) {
+            $requestQuery['body']['from'] = $offset;
+        }
+
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($requestQuery);
+
+        return $this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadPrevious($data, $index, $lower = null)
+    {
+        if ($lower) {
+            $from = ['gte' => $lower - self::DELTA];
+        }
+        if ($data) {
+            $to = ['lt' => $data - self::DELTA];
+        }
+
+        $requestQuery = $this->prepareBaseRequestQuery($from, $to);
+        $requestQuery = array_merge_recursive(
+            $requestQuery,
+            ['size' => 0]
+        );
+
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($requestQuery);
+
+        $offset = $queryResult['hits']['total'];
+        if (!$offset) {
+            return false;
+        }
+
+        return $this->load($index - $offset + 1, $offset - 1, $lower);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadNext($data, $rightIndex, $upper = null)
+    {
+        $from = ['gt' => $data + self::DELTA];
+        $to = ['lt' => $data - self::DELTA];
+
+        $requestCountQuery = $this->prepareBaseRequestQuery($from, $to);
+        $requestCountQuery = array_merge_recursive(
+            $requestCountQuery,
+            ['size' => 0]
+        );
+
+        $queryCountResult = $this->connectionManager->getConnection()
+            ->query($requestCountQuery);
+
+        $offset = $queryCountResult['hits']['total'];
+        if (!$offset) {
+            return false;
+        }
+
+        $from = ['gte' => $data - self::DELTA];
+        if ($upper !== null) {
+            $to = ['lt' => $data - self::DELTA];
+        }
+
+        $requestQuery = $requestCountQuery;
+
+        $requestCountQuery['body']['query']['bool']['filter']['bool']['must']['range'] =
+            [$this->fieldName => array_merge($from, $to)];
+        $requestCountQuery['body']['from'] = $offset - 1;
+        $requestCountQuery['body']['size'] = $rightIndex - $offset + 1;
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($requestQuery);
+
+        return array_reverse($this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName));
+    }
+
+    /**
+     * Conver array values to float type.
+     *
+     * @param array $hits
+     * @param string $fieldName
+     *
+     * @return float[]
+     */
+    private function arrayValuesToFloat(array $hits, string $fieldName): array
+    {
+        $returnPrices = [];
+        foreach ($hits as $hit) {
+            $returnPrices[] = (float)$hit['fields'][$fieldName][0];
+        }
+
+        return $returnPrices;
+    }
+
+    /**
+     * Prepare base query for search.
+     *
+     * @param array|null $from
+     * @param array|null $to
+     * @return array
+     */
+    private function prepareBaseRequestQuery($from = null, $to = null): array
+    {
+        $requestQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'stored_fields' => [
+                    '_id',
+                ],
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            'match_all' => new \stdClass(),
+                        ],
+                        'filter' => [
+                            'bool' => [
+                                'must' => [
+                                    [
+                                        'terms' => [
+                                            '_id' => $this->entityIds,
+                                        ],
+                                    ],
+                                    [
+                                        'range' => [
+                                            $this->fieldName => array_merge($from, $to),
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'sort' => [
+                    $this->fieldName,
+                ],
+            ],
+        ];
+
+        return $requestQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php
new file mode 100644
index 0000000000000..abd27abdac8a7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter;
+
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
+use Magento\Framework\Search\Request\Query\BoolExpression as BoolQuery;
+use Magento\Framework\Search\Request\Query\Filter as FilterQuery;
+use Magento\Framework\Search\Request\Query\Match as MatchQuery;
+use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as QueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder;
+
+/**
+ * Mapper class
+ * @api
+ * @since 100.1.0
+ */
+class Mapper
+{
+    /**
+     * @var QueryBuilder
+     * @since 100.1.0
+     */
+    protected $queryBuilder;
+
+    /**
+     * @var MatchQueryBuilder
+     * @since 100.1.0
+     */
+    protected $matchQueryBuilder;
+
+    /**
+     * @var FilterBuilder
+     * @since 100.1.0
+     */
+    protected $filterBuilder;
+
+    /**
+     * @param QueryBuilder $queryBuilder
+     * @param MatchQueryBuilder $matchQueryBuilder
+     * @param FilterBuilder $filterBuilder
+     */
+    public function __construct(
+        QueryBuilder $queryBuilder,
+        MatchQueryBuilder $matchQueryBuilder,
+        FilterBuilder $filterBuilder
+    ) {
+        $this->queryBuilder = $queryBuilder;
+        $this->matchQueryBuilder = $matchQueryBuilder;
+        $this->filterBuilder = $filterBuilder;
+    }
+
+    /**
+     * Build adapter dependent query
+     *
+     * @param RequestInterface $request
+     * @return array
+     * @since 100.1.0
+     */
+    public function buildQuery(RequestInterface $request)
+    {
+        $searchQuery = $this->queryBuilder->initQuery($request);
+        $searchQuery['body']['query'] = array_merge(
+            $searchQuery['body']['query'],
+            $this->processQuery(
+                $request->getQuery(),
+                [],
+                BoolQuery::QUERY_CONDITION_MUST
+            )
+        );
+
+        if (isset($searchQuery['body']['query']['bool']['should'])) {
+            $searchQuery['body']['query']['bool']['minimum_should_match'] = 1;
+        }
+
+        $searchQuery = $this->queryBuilder->initAggregations($request, $searchQuery);
+        return $searchQuery;
+    }
+
+    /**
+     * Process query
+     *
+     * @param RequestQueryInterface $requestQuery
+     * @param array $selectQuery
+     * @param string $conditionType
+     * @return array
+     * @throws \InvalidArgumentException
+     * @since 100.1.0
+     */
+    protected function processQuery(
+        RequestQueryInterface $requestQuery,
+        array $selectQuery,
+        $conditionType
+    ) {
+        switch ($requestQuery->getType()) {
+            case RequestQueryInterface::TYPE_MATCH:
+                /** @var MatchQuery $requestQuery */
+                $selectQuery = $this->matchQueryBuilder->build(
+                    $selectQuery,
+                    $requestQuery,
+                    $conditionType
+                );
+                break;
+            case RequestQueryInterface::TYPE_BOOL:
+                /** @var BoolQuery $requestQuery */
+                $selectQuery = $this->processBoolQuery($requestQuery, $selectQuery);
+                break;
+            case RequestQueryInterface::TYPE_FILTER:
+                /** @var FilterQuery $requestQuery */
+                $selectQuery = $this->processFilterQuery($requestQuery, $selectQuery, $conditionType);
+                break;
+            default:
+                throw new \InvalidArgumentException(sprintf('Unknown query type \'%s\'', $requestQuery->getType()));
+        }
+
+        return $selectQuery;
+    }
+
+    /**
+     * Process bool query
+     *
+     * @param BoolQuery $query
+     * @param array $selectQuery
+     * @return array
+     * @since 100.1.0
+     */
+    protected function processBoolQuery(
+        BoolQuery $query,
+        array $selectQuery
+    ) {
+        $selectQuery = $this->processBoolQueryCondition(
+            $query->getMust(),
+            $selectQuery,
+            BoolQuery::QUERY_CONDITION_MUST
+        );
+
+        $selectQuery = $this->processBoolQueryCondition(
+            $query->getShould(),
+            $selectQuery,
+            BoolQuery::QUERY_CONDITION_SHOULD
+        );
+
+        $selectQuery = $this->processBoolQueryCondition(
+            $query->getMustNot(),
+            $selectQuery,
+            BoolQuery::QUERY_CONDITION_NOT
+        );
+
+        return $selectQuery;
+    }
+
+    /**
+     * Process bool query condition (must, should, must_not)
+     *
+     * @param RequestQueryInterface[] $subQueryList
+     * @param array $selectQuery
+     * @param string $conditionType
+     * @return array
+     * @since 100.1.0
+     */
+    protected function processBoolQueryCondition(
+        array $subQueryList,
+        array $selectQuery,
+        $conditionType
+    ) {
+        foreach ($subQueryList as $subQuery) {
+            $selectQuery = $this->processQuery($subQuery, $selectQuery, $conditionType);
+        }
+
+        return $selectQuery;
+    }
+
+    /**
+     * Process filter query
+     *
+     * @param FilterQuery $query
+     * @param array $selectQuery
+     * @param string $conditionType
+     * @return array
+     */
+    private function processFilterQuery(
+        FilterQuery $query,
+        array $selectQuery,
+        $conditionType
+    ) {
+        switch ($query->getReferenceType()) {
+            case FilterQuery::REFERENCE_QUERY:
+                $selectQuery = $this->processQuery($query->getReference(), $selectQuery, $conditionType);
+                break;
+            case FilterQuery::REFERENCE_FILTER:
+                $conditionType = $conditionType === BoolQuery::QUERY_CONDITION_NOT ?
+                    MatchQueryBuilder::QUERY_CONDITION_MUST_NOT : $conditionType;
+                $filterQuery = $this->filterBuilder->build($query->getReference(), $conditionType);
+                foreach ($filterQuery['bool'] as $condition => $filter) {
+                    $selectQuery['bool'][$condition]= array_merge(
+                        isset($selectQuery['bool'][$condition]) ? $selectQuery['bool'][$condition] : [],
+                        $filter
+                    );
+                }
+                break;
+        }
+
+        return $selectQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
new file mode 100644
index 0000000000000..db961d86962e9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query;
+
+use Magento\Framework\Search\RequestInterface;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder;
+use Magento\Framework\App\ScopeResolverInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class Builder
+{
+    /**
+     * @var Config
+     * @since 100.1.0
+     */
+    protected $clientConfig;
+
+    /**
+     * @var SearchIndexNameResolver
+     * @since 100.1.0
+     */
+    protected $searchIndexNameResolver;
+
+    /**
+     * @var AggregationBuilder
+     * @since 100.1.0
+     */
+    protected $aggregationBuilder;
+
+    /**
+     * @var ScopeResolverInterface
+     * @since 100.1.0
+     */
+    protected $scopeResolver;
+
+    /**
+     * @param Config $clientConfig
+     * @param SearchIndexNameResolver $searchIndexNameResolver
+     * @param AggregationBuilder $aggregationBuilder
+     * @param ScopeResolverInterface $scopeResolver
+     */
+    public function __construct(
+        Config $clientConfig,
+        SearchIndexNameResolver $searchIndexNameResolver,
+        AggregationBuilder $aggregationBuilder,
+        ScopeResolverInterface $scopeResolver
+    ) {
+        $this->clientConfig = $clientConfig;
+        $this->searchIndexNameResolver = $searchIndexNameResolver;
+        $this->aggregationBuilder = $aggregationBuilder;
+        $this->scopeResolver = $scopeResolver;
+    }
+
+    /**
+     * Set initial settings for query
+     *
+     * @param RequestInterface $request
+     * @return array
+     * @since 100.1.0
+     */
+    public function initQuery(RequestInterface $request)
+    {
+        $dimension = current($request->getDimensions());
+        $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $searchQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'from' => $request->getFrom(),
+                'size' => $request->getSize(),
+                'stored_fields' => ['_id', '_score'],
+                'query' => [],
+            ],
+        ];
+        return $searchQuery;
+    }
+
+    /**
+     * Add aggregations settings to query
+     *
+     * @param RequestInterface $request
+     * @param array $searchQuery
+     * @return array
+     * @since 100.1.0
+     */
+    public function initAggregations(
+        RequestInterface $request,
+        array $searchQuery
+    ) {
+        return $this->aggregationBuilder->build($request, $searchQuery);
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE.txt b/app/code/Magento/Elasticsearch/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE.txt
rename to app/code/Magento/Elasticsearch/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE_AFL.txt b/app/code/Magento/Elasticsearch/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/Elasticsearch/LICENSE_AFL.txt
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
new file mode 100644
index 0000000000000..0e130c24e79d3
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
+
+use Magento\Elasticsearch\Model\ResourceModel\Index;
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Provide data mapping for categories fields
+ */
+class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
+{
+    /**
+     * @var Index
+     */
+    private $resourceIndex;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @param Index $resourceIndex
+     * @param AttributeProvider|null $attributeAdapterProvider
+     * @param ResolverInterface|null $fieldNameResolver
+     */
+    public function __construct(
+        Index $resourceIndex,
+        AttributeProvider $attributeAdapterProvider = null,
+        ResolverInterface $fieldNameResolver = null
+    ) {
+        $this->resourceIndex = $resourceIndex;
+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
+            ->get(ResolverInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFields(array $productIds, $storeId)
+    {
+        $categoryData = $this->resourceIndex->getFullCategoryProductIndexData($storeId, $productIds);
+
+        $fields = [];
+        foreach ($productIds as $productId) {
+            $fields[$productId] = $this->getProductCategoryData($productId, $categoryData);
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Prepare category index data for product
+     *
+     * @param int $productId
+     * @param array $categoryIndexData
+     * @return array
+     */
+    private function getProductCategoryData($productId, array $categoryIndexData)
+    {
+        $result = [];
+
+        if (array_key_exists($productId, $categoryIndexData)) {
+            $indexData = $categoryIndexData[$productId];
+            $categoryIds = array_column($indexData, 'id');
+
+            if (count($categoryIds)) {
+                $result = ['category_ids' => implode(' ', $categoryIds)];
+                $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
+                $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
+                foreach ($indexData as $data) {
+                    $categoryPositionKey = $this->fieldNameResolver->getFieldName(
+                        $positionAttribute,
+                        ['categoryId' => $data['id']]
+                    );
+                    $categoryNameKey = $this->fieldNameResolver->getFieldName(
+                        $categoryNameAttribute,
+                        ['categoryId' => $data['id']]
+                    );
+                    $result[$categoryPositionKey] = $data['position'];
+                    $result[$categoryNameKey] = $data['name'];
+                }
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperFactory.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperFactory.php
new file mode 100644
index 0000000000000..29bdb036e206d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperFactory.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
+
+/**
+ * Data mapper factory
+ */
+class DataMapperFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string[]
+     */
+    private $dataMappers;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param string[] $dataMappers
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $dataMappers = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->dataMappers = $dataMappers;
+    }
+
+    /**
+     * Create instance of data mapper for specified entity type
+     *
+     * @param string $entityType
+     * @return BatchDataMapperInterface
+     * @throws NoSuchEntityException
+     * @throws ConfigurationMismatchException
+     */
+    public function create($entityType)
+    {
+        if (!isset($this->dataMappers[$entityType])) {
+            throw new NoSuchEntityException(
+                __(
+                    'There is no such data mapper "%1" for interface %2',
+                    $entityType,
+                    BatchDataMapperInterface::class
+                )
+            );
+        }
+        $dataMapperClass = $this->dataMappers[$entityType];
+        $dataMapperEntity = $this->objectManager->create($dataMapperClass);
+        if (!$dataMapperEntity instanceof BatchDataMapperInterface) {
+            throw new ConfigurationMismatchException(
+                __(
+                    'Data mapper "%1" must implement interface %2',
+                    $dataMapperClass,
+                    BatchDataMapperInterface::class
+                )
+            );
+        }
+
+        return $dataMapperEntity;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperResolver.php
new file mode 100644
index 0000000000000..fd7a64eb0c9b7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperResolver.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
+use Magento\Elasticsearch\Model\Config;
+
+/**
+ * Map index data to search engine metadata
+ */
+class DataMapperResolver implements BatchDataMapperInterface
+{
+    /**
+     * @var BatchDataMapperInterface
+     */
+    private $dataMapperEntity;
+
+    /**
+     * @var DataMapperFactory
+     */
+    private $dataMapperFactory;
+
+    /**
+     * @param DataMapperFactory $dataMapperFactory
+     */
+    public function __construct(DataMapperFactory $dataMapperFactory)
+    {
+        $this->dataMapperFactory = $dataMapperFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function map(array $documentData, $storeId, array $context = [])
+    {
+        $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT;
+        return $this->getDataMapper($entityType)->map($documentData, $storeId, $context);
+    }
+
+    /**
+     * Get instance of data mapper for specified entity type
+     *
+     * @param string $entityType
+     * @return BatchDataMapperInterface
+     * @throws NoSuchEntityException
+     * @throws ConfigurationMismatchException
+     */
+    private function getDataMapper($entityType)
+    {
+        if (!isset($this->dataMapperEntity[$entityType])) {
+            $this->dataMapperEntity[$entityType] = $this->dataMapperFactory->create($entityType);
+        }
+
+        return $this->dataMapperEntity[$entityType];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
new file mode 100644
index 0000000000000..875d384a20596
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
+
+use Magento\Elasticsearch\Model\ResourceModel\Index;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Provide data mapping for price fields
+ */
+class PriceFieldsProvider implements AdditionalFieldsProviderInterface
+{
+    /**
+     * @var Index
+     */
+    private $resourceIndex;
+
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @param Index $resourceIndex
+     * @param DataProvider $dataProvider
+     * @param StoreManagerInterface $storeManager
+     * @param AttributeProvider|null $attributeAdapterProvider
+     * @param ResolverInterface|null $fieldNameResolver
+     */
+    public function __construct(
+        Index $resourceIndex,
+        DataProvider $dataProvider,
+        StoreManagerInterface $storeManager,
+        AttributeProvider $attributeAdapterProvider = null,
+        ResolverInterface $fieldNameResolver = null
+    ) {
+        $this->resourceIndex = $resourceIndex;
+        $this->dataProvider = $dataProvider;
+        $this->storeManager = $storeManager;
+        $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
+            ->get(ResolverInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFields(array $productIds, $storeId)
+    {
+        $priceData = $this->dataProvider->getSearchableAttribute('price')
+            ? $this->resourceIndex->getPriceIndexData($productIds, $storeId)
+            : [];
+
+        $fields = [];
+        foreach ($productIds as $productId) {
+            $fields[$productId] = $this->getProductPriceData($productId, $storeId, $priceData);
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Prepare price index for product
+     *
+     * @param int $productId
+     * @param int $websiteId
+     * @param array $priceIndexData
+     * @return array
+     */
+    private function getProductPriceData($productId, $websiteId, array $priceIndexData)
+    {
+        $result = [];
+        if (array_key_exists($productId, $priceIndexData)) {
+            $productPriceIndexData = $priceIndexData[$productId];
+            $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
+            foreach ($productPriceIndexData as $customerGroupId => $price) {
+                $fieldName = $this->fieldNameResolver->getFieldName(
+                    $priceAttribute,
+                    ['customerGroupId' => $customerGroupId, 'websiteId' => $websiteId]
+                );
+                $result[$fieldName] = sprintf('%F', $price);
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
new file mode 100644
index 0000000000000..e4f5de46c4c86
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
+
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Elasticsearch\Model\Adapter\Document\Builder;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+
+/**
+ * Map product index data to search engine metadata
+ */
+class ProductDataMapper implements BatchDataMapperInterface
+{
+    /**
+     * @var Builder
+     */
+    private $builder;
+
+    /**
+     * @var FieldMapperInterface
+     */
+    private $fieldMapper;
+
+    /**
+     * @var DateFieldType
+     */
+    private $dateFieldType;
+
+    /**
+     * @var array
+     */
+    private $excludedAttributes;
+
+    /**
+     * @var AdditionalFieldsProviderInterface
+     */
+    private $additionalFieldsProvider;
+
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * List of attributes which will be skipped during mapping
+     *
+     * @var string[]
+     */
+    private $defaultExcludedAttributes = [
+        'price',
+        'media_gallery',
+        'tier_price',
+        'quantity_and_stock_status',
+        'media_gallery',
+        'giftcard_amounts',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $attributesExcludedFromMerge = [
+        'status',
+        'visibility',
+        'tax_class_id'
+    ];
+
+    /**
+     * Construction for DocumentDataMapper
+     *
+     * @param Builder $builder
+     * @param FieldMapperInterface $fieldMapper
+     * @param DateFieldType $dateFieldType
+     * @param AdditionalFieldsProviderInterface $additionalFieldsProvider
+     * @param DataProvider $dataProvider
+     * @param array $excludedAttributes
+     */
+    public function __construct(
+        Builder $builder,
+        FieldMapperInterface $fieldMapper,
+        DateFieldType $dateFieldType,
+        AdditionalFieldsProviderInterface $additionalFieldsProvider,
+        DataProvider $dataProvider,
+        array $excludedAttributes = []
+    ) {
+        $this->builder = $builder;
+        $this->fieldMapper = $fieldMapper;
+        $this->dateFieldType = $dateFieldType;
+        $this->excludedAttributes = array_merge($this->defaultExcludedAttributes, $excludedAttributes);
+        $this->additionalFieldsProvider = $additionalFieldsProvider;
+        $this->dataProvider = $dataProvider;
+    }
+
+    /**
+     * Map index data for using in search engine metadata
+     *
+     * @param array $documentData
+     * @param int $storeId
+     * @param array $context
+     * @return array
+     */
+    public function map(array $documentData, $storeId, array $context = [])
+    {
+        $documents = [];
+
+        foreach ($documentData as $productId => $indexData) {
+            $this->builder->addField('store_id', $storeId);
+            $productIndexData = $this->convertToProductData($productId, $indexData, $storeId);
+            foreach ($productIndexData as $attributeCode => $value) {
+                // Prepare processing attribute info
+                if (strpos($attributeCode, '_value') !== false) {
+                    $this->builder->addField($attributeCode, $value);
+                    continue;
+                }
+
+                $this->builder->addField(
+                    $this->fieldMapper->getFieldName(
+                        $attributeCode,
+                        $context
+                    ),
+                    $value
+                );
+            }
+            $documents[$productId] = $this->builder->build();
+        }
+
+        $productIds = array_keys($documentData);
+        foreach ($this->additionalFieldsProvider->getFields($productIds, $storeId) as $productId => $fields) {
+            $documents[$productId] = array_merge_recursive(
+                $documents[$productId],
+                $this->builder->addFields($fields)->build()
+            );
+        }
+
+        return $documents;
+    }
+
+    /**
+     * Convert raw data retrieved from source tables to human-readable format.
+     *
+     * @param int $productId
+     * @param array $indexData
+     * @param int $storeId
+     * @return array
+     */
+    private function convertToProductData(int $productId, array $indexData, int $storeId): array
+    {
+        $productAttributes = [];
+
+        if (isset($indexData['options'])) {
+            // cover case with "options"
+            // see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::prepareProductIndex
+            $productAttributes['options'] = $indexData['options'];
+            unset($indexData['options']);
+        }
+
+        foreach ($indexData as $attributeId => $attributeValues) {
+            $attribute = $this->dataProvider->getSearchableAttribute($attributeId);
+            if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
+                continue;
+            }
+
+            if (!\is_array($attributeValues)) {
+                $attributeValues = [$productId => $attributeValues];
+            }
+            $attributeValues = $this->prepareAttributeValues($productId, $attribute, $attributeValues, $storeId);
+            $productAttributes += $this->convertAttribute($attribute, $attributeValues);
+        }
+
+        return $productAttributes;
+    }
+
+    /**
+     * Convert data for attribute, add {attribute_code}_value for searchable attributes, that contain actual value.
+     *
+     * @param Attribute $attribute
+     * @param array $attributeValues
+     * @return array
+     */
+    private function convertAttribute(Attribute $attribute, array $attributeValues): array
+    {
+        $productAttributes = [];
+
+        $retrievedValue = $this->retrieveFieldValue($attributeValues);
+        if ($retrievedValue) {
+            $productAttributes[$attribute->getAttributeCode()] = $retrievedValue;
+
+            if ($attribute->getIsSearchable()) {
+                $attributeLabels = $this->getValuesLabels($attribute, $attributeValues);
+                $retrievedLabel = $this->retrieveFieldValue($attributeLabels);
+                if ($retrievedLabel) {
+                    $productAttributes[$attribute->getAttributeCode() . '_value'] = $retrievedLabel;
+                }
+            }
+        }
+
+        return $productAttributes;
+    }
+
+    /**
+     * Prepare attribute values.
+     *
+     * @param int $productId
+     * @param Attribute $attribute
+     * @param array $attributeValues
+     * @param int $storeId
+     * @return array
+     */
+    private function prepareAttributeValues(
+        int $productId,
+        Attribute $attribute,
+        array $attributeValues,
+        int $storeId
+    ): array {
+        if (in_array($attribute->getAttributeCode(), $this->attributesExcludedFromMerge, true)) {
+            $attributeValues = [
+                $productId => $attributeValues[$productId] ?? '',
+            ];
+        }
+
+        if ($attribute->getFrontendInput() === 'multiselect') {
+            $attributeValues = $this->prepareMultiselectValues($attributeValues);
+        }
+
+        if ($this->isAttributeDate($attribute)) {
+            foreach ($attributeValues as $key => $attributeValue) {
+                $attributeValues[$key] = $this->dateFieldType->formatDate($storeId, $attributeValue);
+            }
+        }
+
+        return $attributeValues;
+    }
+
+    /**
+     * Prepare multiselect values.
+     *
+     * @param array $values
+     * @return array
+     */
+    private function prepareMultiselectValues(array $values): array
+    {
+        return \array_merge(...\array_map(function (string $value) {
+            return \explode(',', $value);
+        }, $values));
+    }
+
+    /**
+     * Is attribute date.
+     *
+     * @param Attribute $attribute
+     * @return bool
+     */
+    private function isAttributeDate(Attribute $attribute): bool
+    {
+        return $attribute->getFrontendInput() === 'date'
+            || in_array($attribute->getBackendType(), ['datetime', 'timestamp'], true);
+    }
+
+    /**
+     * Get values labels.
+     *
+     * @param Attribute $attribute
+     * @param array $attributeValues
+     * @return array
+     */
+    private function getValuesLabels(Attribute $attribute, array $attributeValues): array
+    {
+        $attributeLabels = [];
+        foreach ($attribute->getOptions() as $option) {
+            if (\in_array($option->getValue(), $attributeValues)) {
+                $attributeLabels[] = $option->getLabel();
+            }
+        }
+
+        return $attributeLabels;
+    }
+
+    /**
+     * Retrieve value for field. If field have only one value this method return it.
+     * Otherwise will be returned array of these values.
+     * Note: array of values must have index keys, not as associative array.
+     *
+     * @param array $values
+     * @return array|string
+     */
+    private function retrieveFieldValue(array $values)
+    {
+        $values = \array_filter(\array_unique($values));
+
+        return count($values) === 1 ? \array_shift($values) : \array_values($values);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapperInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapperInterface.php
new file mode 100644
index 0000000000000..fcc5a32d339e9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapperInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter;
+
+/**
+ * Map index data to search engine metadata
+ * Convert array [[attribute_id => [entity_id => value], ... ]] to applicable for search engine [[attribute => value],]
+ * @api
+ * @since 100.2.0
+ */
+interface BatchDataMapperInterface
+{
+    /**
+     * Map index data for using in search engine metadata
+     *
+     * @param array $documentData
+     * @param int $storeId
+     * @param array $context
+     * @return array
+     * @since 100.2.0
+     */
+    public function map(array $documentData, $storeId, array $context = []);
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Container/Attribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/Container/Attribute.php
new file mode 100644
index 0000000000000..12ca1e1a741ff
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Container/Attribute.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Container;
+
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
+
+/**
+ * @deprecated 100.2.0
+ * This class is used only in deprecated \Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper
+ * and must not be used for new code
+ */
+class Attribute
+{
+    /**
+     * @var string[]
+     */
+    private $idToCodeMap = [];
+
+    /**
+     * @var Collection
+     */
+    private $attributeCollection;
+
+    /**
+     * @var EavAttribute[]
+     */
+    private $attributes = [];
+
+    /**
+     * @param Collection $attributeCollection
+     */
+    public function __construct(Collection $attributeCollection)
+    {
+        $this->attributeCollection = $attributeCollection;
+    }
+
+    /**
+     * @param int $attributeId
+     * @return string
+     */
+    public function getAttributeCodeById($attributeId)
+    {
+        if (!array_key_exists($attributeId, $this->idToCodeMap)) {
+            $code = $attributeId === 'options'
+                ? 'options'
+                : $this->attributeCollection->getItemById($attributeId)->getAttributeCode();
+            $this->idToCodeMap[$attributeId] = $code;
+        }
+        return $this->idToCodeMap[$attributeId];
+    }
+
+    /**
+     * @param string $attributeCode
+     * @return int
+     */
+    public function getAttributeIdByCode($attributeCode)
+    {
+        if (!array_key_exists($attributeCode, array_flip($this->idToCodeMap))) {
+            $attributeId = $attributeCode === 'options'
+                ? 'options'
+                : $this->attributeCollection->getItemByColumnValue('attribute_code', $attributeCode)->getId();
+            $this->idToCodeMap[$attributeId] = $attributeCode;
+        }
+        $codeToIdMap = array_flip($this->idToCodeMap);
+        return $codeToIdMap[$attributeCode];
+    }
+
+    /**
+     * @param string $attributeCode
+     * @return EavAttribute|null
+     */
+    public function getAttribute($attributeCode)
+    {
+        $searchableAttributes = $this->getAttributes();
+        return array_key_exists($attributeCode, $searchableAttributes)
+            ? $searchableAttributes[$attributeCode]
+            : null;
+    }
+
+    /**
+     * @return EavAttribute[]
+     */
+    public function getAttributes()
+    {
+        if (0 === count($this->attributes)) {
+            /** @var Collection $attributesCollection */
+            $attributesCollection = $this->attributeCollection;
+            foreach ($attributesCollection as $attribute) {
+                /** @var EavAttribute $attribute */
+                $this->attributes[$attribute->getAttributeCode()] = $attribute;
+            }
+        }
+        return $this->attributes;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/DataMapperResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/DataMapperResolver.php
new file mode 100644
index 0000000000000..dbb37f3363b3d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/DataMapperResolver.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\DataMapper;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
+use Magento\Elasticsearch\Model\Config;
+
+/**
+ * @deprecated 100.2.0
+ * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
+ */
+class DataMapperResolver implements DataMapperInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string[]
+     */
+    private $dataMappers;
+
+    /**
+     * Data Mapper instance
+     *
+     * @var DataMapperInterface
+     */
+    private $dataMapperEntity;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param string[] $dataMappers
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $dataMappers = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->dataMappers = $dataMappers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function map(
+        $entityId,
+        array $entityIndexData,
+        $storeId,
+        $context = []
+    ) {
+        $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT;
+        return $this->getEntity($entityType)->map($entityId, $entityIndexData, $storeId, $context);
+    }
+
+    /**
+     * Get instance of current data mapper
+     *
+     * @param string $entityType
+     * @return DataMapperInterface
+     * @throws \Exception
+     */
+    private function getEntity($entityType = '')
+    {
+        if (empty($this->dataMapperEntity)) {
+            if (empty($entityType)) {
+                throw new \Exception(
+                    'No entity type given'
+                );
+            }
+            if (!isset($this->dataMappers[$entityType])) {
+                throw new \LogicException(
+                    'There is no such data mapper: ' . $entityType
+                );
+            }
+            $dataMapperClass = $this->dataMappers[$entityType];
+            $this->dataMapperEntity = $this->objectManager->create($dataMapperClass);
+            if (!($this->dataMapperEntity instanceof DataMapperInterface)) {
+                throw new \InvalidArgumentException(
+                    'Data mapper must implement \Magento\Elasticsearch\Model\Adapter\DataMapperInterface'
+                );
+            }
+        }
+        return $this->dataMapperEntity;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php
new file mode 100644
index 0000000000000..24b740b554fcb
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\DataMapper;
+
+use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper as ElasticSearch5ProductDataMapper;
+
+/**
+ * Don't use this product data mapper class.
+ *
+ * @deprecated 100.2.0
+ * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
+ */
+class ProductDataMapper extends ElasticSearch5ProductDataMapper implements DataMapperInterface
+{
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/DataMapperInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapperInterface.php
new file mode 100644
index 0000000000000..e43a4da065314
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapperInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter;
+
+/**
+ * @deprecated 100.2.0
+ * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
+ */
+interface DataMapperInterface
+{
+    /**
+     * Prepare index data for using in search engine metadata
+     *
+     * @param int $entityId
+     * @param array $entityIndexData
+     * @param int $storeId
+     * @param array $context
+     * @return array
+     */
+    public function map($entityId, array $entityIndexData, $storeId, $context = []);
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Document/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Document/Builder.php
new file mode 100644
index 0000000000000..943261bca2790
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Document/Builder.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Document;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class Builder
+{
+    /**
+     * @var array
+     */
+    private $fields = [];
+
+    /**
+     * @return array
+     * @since 100.1.0
+     */
+    public function build()
+    {
+        $document = [];
+        foreach ($this->fields as $field => $value) {
+            $document = $this->addFieldToDocument($document, $field, $value);
+        }
+        $this->clear();
+        return $document;
+    }
+
+    /**
+     * @return void
+     */
+    private function clear()
+    {
+        $this->fields = [];
+    }
+
+    /**
+     * @param array $document
+     * @param string $field
+     * @param string|int|float $value
+     * @return array
+     */
+    private function addFieldToDocument($document, $field, $value)
+    {
+        if (is_array($value)) {
+            if (count($value) == 0) {
+                $document = array_merge($document, [$field => $value]);
+            } else {
+                $fields = [];
+                foreach ($value as $key => $val) {
+                    $fields[$field][$key] = $val;
+                }
+                $document = array_merge($document, $fields);
+            }
+        } else {
+            $field = [$field => $value];
+            $document = array_merge($document, $field);
+        }
+        return $document;
+    }
+
+    /**
+     * @param string $field
+     * @param string|array|int|float $value
+     * @return $this
+     * @since 100.1.0
+     */
+    public function addField($field, $value)
+    {
+        $this->fields[$field] = $value;
+        return $this;
+    }
+
+    /**
+     * @param array $fields
+     * @return $this
+     * @since 100.1.0
+     */
+    public function addFields(array $fields)
+    {
+        $this->fields = array_merge($this->fields, $fields);
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
new file mode 100644
index 0000000000000..97a76de4b995a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -0,0 +1,384 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Adapter;
+
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Elasticsearch adapter
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Elasticsearch
+{
+    /**#@+
+     * Text flags for Elasticsearch bulk actions
+     */
+    const BULK_ACTION_INDEX = 'index';
+    const BULK_ACTION_CREATE = 'create';
+    const BULK_ACTION_DELETE = 'delete';
+    const BULK_ACTION_UPDATE = 'update';
+    /**#@-*/
+
+    /**
+     * Buffer for total fields limit in mapping.
+     */
+    private const MAPPING_TOTAL_FIELDS_BUFFER_LIMIT = 1000;
+
+    /**#@-*/
+    protected $connectionManager;
+
+    /**
+     * @var DataMapperInterface
+     * @deprecated 100.2.0 Will be replaced with BatchDataMapperInterface
+     */
+    protected $documentDataMapper;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver
+     */
+    protected $indexNameResolver;
+
+    /**
+     * @var FieldMapperInterface
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Config
+     */
+    protected $clientConfig;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Client\Elasticsearch
+     */
+    protected $client;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface
+     */
+    protected $indexBuilder;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * @var array
+     */
+    protected $preparedIndex = [];
+
+    /**
+     * @var BatchDataMapperInterface
+     */
+    private $batchDocumentDataMapper;
+
+    /**
+     * Constructor for Elasticsearch adapter.
+     *
+     * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager
+     * @param DataMapperInterface $documentDataMapper
+     * @param FieldMapperInterface $fieldMapper
+     * @param \Magento\Elasticsearch\Model\Config $clientConfig
+     * @param \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver
+     * @param array $options
+     * @param BatchDataMapperInterface $batchDocumentDataMapper
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function __construct(
+        \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager,
+        DataMapperInterface $documentDataMapper,
+        FieldMapperInterface $fieldMapper,
+        \Magento\Elasticsearch\Model\Config $clientConfig,
+        \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver,
+        $options = [],
+        BatchDataMapperInterface $batchDocumentDataMapper = null
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->documentDataMapper = $documentDataMapper;
+        $this->fieldMapper = $fieldMapper;
+        $this->clientConfig = $clientConfig;
+        $this->indexBuilder = $indexBuilder;
+        $this->logger = $logger;
+        $this->indexNameResolver = $indexNameResolver;
+        $this->batchDocumentDataMapper = $batchDocumentDataMapper ?:
+            ObjectManager::getInstance()->get(BatchDataMapperInterface::class);
+
+        try {
+            $this->client = $this->connectionManager->getConnection($options);
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('The search failed because of a search engine misconfiguration.')
+            );
+        }
+    }
+
+    /**
+     * Retrieve Elasticsearch server status
+     *
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function ping()
+    {
+        try {
+            $response = $this->client->ping();
+        } catch (\Exception $e) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Could not ping search engine: %1', $e->getMessage())
+            );
+        }
+        return $response;
+    }
+
+    /**
+     * Create Elasticsearch documents by specified data
+     *
+     * @param array $documentData
+     * @param int $storeId
+     * @return array
+     */
+    public function prepareDocsPerStore(array $documentData, $storeId)
+    {
+        $documents = [];
+        if (count($documentData)) {
+            $documents = $this->batchDocumentDataMapper->map(
+                $documentData,
+                $storeId
+            );
+        }
+        return $documents;
+    }
+
+    /**
+     * Add prepared Elasticsearch documents to Elasticsearch index
+     *
+     * @param array $documents
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return $this
+     * @throws \Exception
+     */
+    public function addDocs(array $documents, $storeId, $mappedIndexerId)
+    {
+        if (count($documents)) {
+            try {
+                $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
+                $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName);
+                $this->client->bulkQuery($bulkIndexDocuments);
+            } catch (\Exception $e) {
+                $this->logger->critical($e);
+                throw $e;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes all documents from Elasticsearch index
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return $this
+     */
+    public function cleanIndex($storeId, $mappedIndexerId)
+    {
+        $this->checkIndex($storeId, $mappedIndexerId, true);
+        $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
+        if ($this->client->isEmptyIndex($indexName)) {
+            // use existing index if empty
+            return $this;
+        }
+
+        // prepare new index name and increase version
+        $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $mappedIndexerId);
+        $version = (int)(str_replace($indexPattern, '', $indexName));
+        $newIndexName = $indexPattern . ++$version;
+
+        // remove index if already exists
+        if ($this->client->indexExists($newIndexName)) {
+            $this->client->deleteIndex($newIndexName);
+        }
+
+        // prepare new index
+        $this->prepareIndex($storeId, $newIndexName, $mappedIndexerId);
+
+        return $this;
+    }
+
+    /**
+     * Delete documents from Elasticsearch index by Ids
+     *
+     * @param array $documentIds
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return $this
+     * @throws \Exception
+     */
+    public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId)
+    {
+        try {
+            $this->checkIndex($storeId, $mappedIndexerId, false);
+            $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
+            $bulkDeleteDocuments = $this->getDocsArrayInBulkIndexFormat(
+                $documentIds,
+                $indexName,
+                self::BULK_ACTION_DELETE
+            );
+            $this->client->bulkQuery($bulkDeleteDocuments);
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            throw $e;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Reformat documents array to bulk format
+     *
+     * @param array $documents
+     * @param string $indexName
+     * @param string $action
+     * @return array
+     */
+    protected function getDocsArrayInBulkIndexFormat(
+        $documents,
+        $indexName,
+        $action = self::BULK_ACTION_INDEX
+    ) {
+        $bulkArray = [
+            'index' => $indexName,
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [],
+            'refresh' => true,
+        ];
+
+        foreach ($documents as $id => $document) {
+            $bulkArray['body'][] = [
+                $action => [
+                    '_id' => $id,
+                    '_type' => $this->clientConfig->getEntityType(),
+                    '_index' => $indexName
+                ]
+            ];
+            if ($action == self::BULK_ACTION_INDEX) {
+                $bulkArray['body'][] = $document;
+            }
+        }
+
+        return $bulkArray;
+    }
+
+    /**
+     * Checks whether Elasticsearch index and alias exists.
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @param bool $checkAlias
+     *
+     * @return $this
+     */
+    public function checkIndex(
+        $storeId,
+        $mappedIndexerId,
+        $checkAlias = true
+    ) {
+        // create new index for store
+        $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
+        if (!$this->client->indexExists($indexName)) {
+            $this->prepareIndex($storeId, $indexName, $mappedIndexerId);
+        }
+
+        // add index to alias
+        if ($checkAlias) {
+            $namespace = $this->indexNameResolver->getIndexNameForAlias($storeId, $mappedIndexerId);
+            if (!$this->client->existsAlias($namespace, $indexName)) {
+                $this->client->updateAlias($namespace, $indexName);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Update Elasticsearch alias for new index.
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return $this
+     */
+    public function updateAlias($storeId, $mappedIndexerId)
+    {
+        if (!isset($this->preparedIndex[$storeId])) {
+            return $this;
+        }
+
+        $oldIndex = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
+        if ($oldIndex == $this->preparedIndex[$storeId]) {
+            $oldIndex = '';
+        }
+
+        $this->client->updateAlias(
+            $this->indexNameResolver->getIndexNameForAlias($storeId, $mappedIndexerId),
+            $this->preparedIndex[$storeId],
+            $oldIndex
+        );
+
+        // remove obsolete index
+        if ($oldIndex) {
+            $this->client->deleteIndex($oldIndex);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Create new index with mapping.
+     *
+     * @param int $storeId
+     * @param string $indexName
+     * @param string $mappedIndexerId
+     * @return $this
+     */
+    protected function prepareIndex($storeId, $indexName, $mappedIndexerId)
+    {
+        $this->indexBuilder->setStoreId($storeId);
+        $settings = $this->indexBuilder->build();
+        $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes([
+            'entityType' => $mappedIndexerId,
+            // Use store id instead of website id from context for save existing fields mapping.
+            // In future websiteId will be eliminated due to index stored per store
+            'websiteId' => $storeId
+        ]);
+        $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
+        $this->client->createIndex($indexName, ['settings' => $settings]);
+        $this->client->addFieldsMapping(
+            $allAttributeTypes,
+            $indexName,
+            $this->clientConfig->getEntityType()
+        );
+        $this->preparedIndex[$storeId] = $indexName;
+        return $this;
+    }
+
+    /**
+     * Get total fields limit for mapping.
+     *
+     * @param array $allAttributeTypes
+     * @return int
+     */
+    private function getMappingTotalFieldsLimit(array $allAttributeTypes): int
+    {
+        return count($allAttributeTypes) + self::MAPPING_TOTAL_FIELDS_BUFFER_LIMIT;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/FieldMapperResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/FieldMapperResolver.php
new file mode 100644
index 0000000000000..4d341905b9926
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/FieldMapperResolver.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Config;
+
+class FieldMapperResolver implements FieldMapperInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string[]
+     */
+    private $fieldMappers;
+
+    /**
+     * Field Mapper instance
+     *
+     * @var FieldMapperInterface
+     */
+    private $fieldMapperEntity;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param string[] $fieldMappers
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $fieldMappers = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->fieldMappers = $fieldMappers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFieldName($attributeCode, $context = [])
+    {
+        $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT;
+        return $this->getEntity($entityType)->getFieldName($attributeCode, $context);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllAttributesTypes($context = [])
+    {
+        $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT;
+        return $this->getEntity($entityType)->getAllAttributesTypes($context);
+    }
+
+    /**
+     * Get instance of current field mapper
+     *
+     * @param string $entityType
+     * @return FieldMapperInterface
+     * @throws \Exception
+     */
+    private function getEntity($entityType)
+    {
+        if (empty($this->fieldMapperEntity)) {
+            if (empty($entityType)) {
+                throw new \Exception(
+                    'No entity type given'
+                );
+            }
+            if (!isset($this->fieldMappers[$entityType])) {
+                throw new \LogicException(
+                    'There is no such field mapper: ' . $entityType
+                );
+            }
+            $fieldMapperClass = $this->fieldMappers[$entityType];
+            $this->fieldMapperEntity = $this->objectManager->create($fieldMapperClass);
+            if (!($this->fieldMapperEntity instanceof FieldMapperInterface)) {
+                throw new \InvalidArgumentException(
+                    'Field mapper must implement \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface'
+                );
+            }
+        }
+        return $this->fieldMapperEntity;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
new file mode 100644
index 0000000000000..17ebf9c83903e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
+
+use Magento\Framework\Api\CustomAttributesDataInterface;
+
+/**
+ * Product attribute adapter for elasticsearch context.
+ */
+class AttributeAdapter
+{
+    /**
+     * @var CustomAttributesDataInterface
+     */
+    private $attribute;
+
+    /**
+     * @var string
+     */
+    private $attributeCode;
+
+    /**
+     * @param CustomAttributesDataInterface $attribute
+     * @param string $attributeCode
+     */
+    public function __construct(
+        CustomAttributesDataInterface $attribute,
+        string $attributeCode
+    ) {
+        $this->attribute = $attribute;
+        $this->attributeCode = $attributeCode;
+    }
+
+    /**
+     * Check if attribute is filterable.
+     *
+     * @return bool
+     */
+    public function isFilterable(): bool
+    {
+        return $this->getAttribute()->getIsFilterable() || $this->getAttribute()->getIsFilterableInSearch();
+    }
+
+    /**
+     * Check if attribute is searchable.
+     *
+     * @return bool
+     */
+    public function isSearchable(): bool
+    {
+        return $this->getAttribute()->getIsSearchable()
+            || ($this->getAttribute()->getIsVisibleInAdvancedSearch()
+                || $this->isFilterable());
+    }
+
+    /**
+     * Check if attribute is need to index always.
+     *
+     * @return bool
+     */
+    public function isAlwaysIndexable(): bool
+    {
+        // List of attributes which are required to be indexable
+        $alwaysIndexableAttributes = [
+            'category_ids',
+            'visibility',
+        ];
+
+        return in_array($this->getAttributeCode(), $alwaysIndexableAttributes, true);
+    }
+
+    /**
+     * Check if attribute has date/time type.
+     *
+     * @return bool
+     */
+    public function isDateTimeType(): bool
+    {
+        return in_array($this->getAttribute()->getBackendType(), ['timestamp', 'datetime'], true);
+    }
+
+    /**
+     * Check if attribute has float type.
+     *
+     * @return bool
+     */
+    public function isFloatType(): bool
+    {
+        return $this->getAttribute()->getBackendType() === 'decimal';
+    }
+
+    /**
+     * Check if attribute has integer type.
+     *
+     * @return bool
+     */
+    public function isIntegerType(): bool
+    {
+        return in_array($this->getAttribute()->getBackendType(), ['int', 'smallint'], true);
+    }
+
+    /**
+     * Check if attribute has boolean type.
+     *
+     * @return bool
+     */
+    public function isBooleanType(): bool
+    {
+        return in_array($this->getAttribute()->getFrontendInput(), ['select', 'boolean'], true)
+            && $this->getAttribute()->getBackendType() !== 'varchar';
+    }
+
+    /**
+     * Check if attribute has boolean type.
+     *
+     * @return bool
+     */
+    public function isComplexType(): bool
+    {
+        return in_array($this->getAttribute()->getFrontendInput(), ['select', 'multiselect'], true)
+            || $this->getAttribute()->usesSource();
+    }
+
+    /**
+     * Check if product attribute is EAV.
+     *
+     * @return bool
+     */
+    public function isEavAttribute(): bool
+    {
+        return $this->getAttribute() instanceof \Magento\Eav\Api\Data\AttributeInterface;
+    }
+
+    /**
+     * Get attribute code.
+     *
+     * @return string
+     */
+    public function getAttributeCode(): string
+    {
+        return $this->attributeCode;
+    }
+
+    /**
+     * Check if attribute is defined by user.
+     *
+     * @return string
+     */
+    public function isUserDefined(): string
+    {
+        return $this->getAttribute()->getIsUserDefined();
+    }
+
+    /**
+     * Frontend HTML for input element.
+     *
+     * @return string
+     */
+    public function getFrontendInput()
+    {
+        return $this->getAttribute()->getFrontendInput();
+    }
+
+    /**
+     * Get product attribute instance.
+     *
+     * @return CustomAttributesDataInterface|\Magento\Eav\Api\Data\AttributeInterface
+     */
+    private function getAttribute(): CustomAttributesDataInterface
+    {
+        return $this->attribute;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
new file mode 100644
index 0000000000000..b8c0da53c53e0
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+
+use Magento\Framework\Api\CustomAttributesDataInterface;
+
+/**
+ * Dummy class for Not EAV attribute.
+ * @SuppressWarnings(PHPMD)
+ */
+class DummyAttribute implements CustomAttributesDataInterface
+{
+    /**
+     * Get an attribute value.
+     *
+     * @param string $attributeCode
+     * @return \Magento\Framework\Api\AttributeInterface|null
+     */
+    public function getCustomAttribute($attributeCode)
+    {
+        return null;
+    }
+
+    /**
+     * Set an attribute value for a given attribute code
+     *
+     * @param string $attributeCode
+     * @param mixed $attributeValue
+     * @return $this
+     */
+    public function setCustomAttribute($attributeCode, $attributeValue)
+    {
+        return $this;
+    }
+
+    /**
+     * Retrieve custom attributes values.
+     *
+     * @return \Magento\Framework\Api\AttributeInterface[]|null
+     */
+    public function getCustomAttributes()
+    {
+        return null;
+    }
+
+    /**
+     * Set array of custom attributes
+     *
+     * @param \Magento\Framework\Api\AttributeInterface[] $attributes
+     * @return $this
+     * @throws \LogicException
+     */
+    public function setCustomAttributes(array $attributes)
+    {
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
new file mode 100644
index 0000000000000..89c98d29ae03e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
+
+use Magento\Eav\Model\Config;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter\DummyAttribute;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Provide attribute adapter.
+ */
+class AttributeProvider
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var array
+     */
+    private $cachedPool = [];
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param Config $eavConfig
+     * @param LoggerInterface $logger
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        Config $eavConfig,
+        LoggerInterface $logger,
+        $instanceName = AttributeAdapter::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+        $this->eavConfig = $eavConfig;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getByAttributeCode(string $attributeCode): AttributeAdapter
+    {
+        if (!isset($this->cachedPool[$attributeCode])) {
+            $attribute = $this->eavConfig->getAttribute(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $attributeCode
+            );
+            if (null === $attribute) {
+                $attribute = $this->objectManager->create(DummyAttribute::class);
+            }
+            $this->cachedPool[$attributeCode] = $this->objectManager->create(
+                $this->instanceName,
+                ['attribute' => $attribute, 'attributeCode' => $attributeCode]
+            );
+        }
+
+        return $this->cachedPool[$attributeCode];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
new file mode 100644
index 0000000000000..8038c8c05bc1c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
+
+/**
+ * Provide fields for product.
+ */
+class CompositeFieldProvider implements FieldProviderInterface
+{
+    /**
+     * @var FieldProviderInterface[]
+     */
+    private $providers;
+
+    /**
+     * @param FieldProviderInterface[] $providers
+     */
+    public function __construct(array $providers)
+    {
+        foreach ($providers as $provider) {
+            if (!$provider instanceof FieldProviderInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field provider is expected, got %s instead.', get_class($provider))
+                );
+            }
+        }
+        $this->providers = $providers;
+    }
+
+    /**
+     * Get fields.
+     *
+     * @param array $context
+     * @return array
+     */
+    public function getFields(array $context = []): array
+    {
+        $allAttributes = [];
+
+        foreach ($this->providers as $provider) {
+            $allAttributes = array_merge($allAttributes, $provider->getFields($context));
+        }
+
+        return $allAttributes;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
new file mode 100644
index 0000000000000..c7e2a4beabb5c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
+
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
+    as IndexTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
+    as FieldNameResolver;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Provide dynamic fields for product.
+ */
+class DynamicField implements FieldProviderInterface
+{
+    /**
+     * Category list.
+     *
+     * @var CategoryListInterface
+     */
+    private $categoryList;
+
+    /**
+     * Customer group repository.
+     *
+     * @var GroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * Search criteria builder.
+     *
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var IndexTypeConverterInterface
+     */
+    private $indexTypeConverter;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var FieldNameResolver
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @param FieldTypeConverterInterface $fieldTypeConverter
+     * @param IndexTypeConverterInterface $indexTypeConverter
+     * @param GroupRepositoryInterface $groupRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param CategoryListInterface $categoryList
+     * @param FieldNameResolver $fieldNameResolver
+     * @param AttributeProvider $attributeAdapterProvider
+     */
+    public function __construct(
+        FieldTypeConverterInterface $fieldTypeConverter,
+        IndexTypeConverterInterface $indexTypeConverter,
+        GroupRepositoryInterface $groupRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        CategoryListInterface $categoryList,
+        FieldNameResolver $fieldNameResolver,
+        AttributeProvider $attributeAdapterProvider
+    ) {
+        $this->groupRepository = $groupRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->fieldTypeConverter = $fieldTypeConverter;
+        $this->indexTypeConverter = $indexTypeConverter;
+        $this->categoryList = $categoryList;
+        $this->fieldNameResolver = $fieldNameResolver;
+        $this->attributeAdapterProvider = $attributeAdapterProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFields(array $context = []): array
+    {
+        $allAttributes = [];
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        $categories = $this->categoryList->getList($searchCriteria)->getItems();
+        $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
+        $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
+        foreach ($categories as $category) {
+            $categoryPositionKey = $this->fieldNameResolver->getFieldName(
+                $positionAttribute,
+                ['categoryId' => $category->getId()]
+            );
+            $categoryNameKey = $this->fieldNameResolver->getFieldName(
+                $categoryNameAttribute,
+                ['categoryId' => $category->getId()]
+            );
+            $allAttributes[$categoryPositionKey] = [
+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
+                'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE)
+            ];
+            $allAttributes[$categoryNameKey] = [
+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
+                'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE)
+            ];
+        }
+
+        $groups = $this->groupRepository->getList($searchCriteria)->getItems();
+        $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
+        foreach ($groups as $group) {
+            $groupPriceKey = $this->fieldNameResolver->getFieldName(
+                $priceAttribute,
+                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+            );
+            $allAttributes[$groupPriceKey] = [
+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
+                'store' => true
+            ];
+        }
+
+        return $allAttributes;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
new file mode 100644
index 0000000000000..5abe4972e34d0
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+/**
+ * Field type converter from internal index type to elastic service.
+ */
+class Converter implements ConverterInterface
+{
+    /**
+     * Text flags for Elasticsearch index value
+     */
+    private const ES_NO_INDEX = 'no';
+
+    /**
+     * Mapping between internal data types and elastic service.
+     *
+     * @var array
+     */
+    private $mapping = [
+        'no_index' => self::ES_NO_INDEX,
+    ];
+
+    /**
+     * Get service field index type for elasticsearch 2.
+     *
+     * @param string $internalType
+     * @return string|boolean
+     * @throws \DomainException
+     */
+    public function convert(string $internalType)
+    {
+        if (!isset($this->mapping[$internalType])) {
+            throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));
+        }
+        return $this->mapping[$internalType];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
new file mode 100644
index 0000000000000..02c4d29558dad
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+/**
+ * Field type converter from internal index value to elastic service.
+ */
+interface ConverterInterface
+{
+    /**#@+
+     * Text flags for internal no index value.
+     */
+    public const INTERNAL_NO_INDEX_VALUE = 'no_index';
+    public const INTERNAL_INDEX_VALUE = 'index';
+
+    /**
+     * Get service field index type.
+     *
+     * @param string $internalType
+     * @return string|boolean
+     */
+    public function convert(string $internalType);
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
new file mode 100644
index 0000000000000..590430a7e2431
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+
+/**
+ * Field index resolver that provides index type for the attribute in mapping.
+ * For example, we need to set ‘no’/false in the case when attribute must be present in index data,
+ * but stay as not indexable.
+ */
+class IndexResolver implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * @param ConverterInterface $converter
+     */
+    public function __construct(ConverterInterface $converter)
+    {
+        $this->converter = $converter;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFieldIndex(AttributeAdapter $attribute)
+    {
+        $index = null;
+        if (!($attribute->isSearchable() || $attribute->isAlwaysIndexable())) {
+            $index = $this->converter->convert(ConverterInterface::INTERNAL_NO_INDEX_VALUE);
+        }
+
+        return $index;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ResolverInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ResolverInterface.php
new file mode 100644
index 0000000000000..663b1d865fb52
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ResolverInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+
+/**
+ * Field index type resolver interface.
+ */
+interface ResolverInterface
+{
+    /**
+     * Get field index.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string|boolean
+     */
+    public function getFieldIndex(AttributeAdapter $attribute);
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php
new file mode 100644
index 0000000000000..5824aca6cdd54
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Resolver field name for Category name attribute.
+ */
+class CategoryName implements ResolverInterface
+{
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * @var Registry
+     */
+    private $coreRegistry;
+
+    /**
+     * @param StoreManager $storeManager
+     * @param Registry $coreRegistry
+     */
+    public function __construct(
+        StoreManager $storeManager = null,
+        Registry $coreRegistry = null
+    ) {
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManager::class);
+        $this->coreRegistry = $coreRegistry ?: ObjectManager::getInstance()
+            ->get(Registry::class);
+    }
+
+    /**
+     * Get field name.
+     *
+     * @param AttributeAdapter $attribute
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        if ($attribute->getAttributeCode() === 'category_name') {
+            return 'name_category_' . $this->resolveCategoryId($context);
+        }
+
+        return null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    private function resolveCategoryId($context): int
+    {
+        if (isset($context['categoryId'])) {
+            $id = $context['categoryId'];
+        } else {
+            $id = $this->coreRegistry->registry('current_category')
+                ? $this->coreRegistry->registry('current_category')->getId()
+                : $this->storeManager->getStore()->getRootCategoryId();
+        }
+
+        return (int)$id;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php
new file mode 100644
index 0000000000000..f1fed3f06fe35
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Composite class for resolving field name.
+ */
+class CompositeResolver implements ResolverInterface
+{
+    /**
+     * @var ResolverInterface[]
+     */
+    private $items;
+
+    /**
+     * @param ResolverInterface[] $items
+     */
+    public function __construct(array $items)
+    {
+        foreach ($items as $item) {
+            if (!$item instanceof ResolverInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field name resolver is expected, got %s instead.', get_class($item))
+                );
+            }
+        }
+        $this->items = $items;
+    }
+
+    /**
+     * Get field name.
+     *
+     * @param AttributeAdapter $attribute
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        $result = null;
+        foreach ($this->items as $item) {
+            $result = $item->getFieldName($attribute, $context);
+            if (null !== $result) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
new file mode 100644
index 0000000000000..3208ca7fc6171
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+
+/**
+ * Default name resolver.
+ */
+class DefaultResolver implements ResolverInterface
+{
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @param FieldTypeResolver $fieldTypeResolver
+     * @param FieldTypeConverterInterface $fieldTypeConverter
+     */
+    public function __construct(
+        FieldTypeResolver $fieldTypeResolver,
+        FieldTypeConverterInterface $fieldTypeConverter
+    ) {
+        $this->fieldTypeResolver = $fieldTypeResolver;
+        $this->fieldTypeConverter = $fieldTypeConverter;
+    }
+
+    /**
+     * Get field name.
+     *
+     * @param AttributeAdapter $attribute
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        $fieldType = $this->fieldTypeResolver->getFieldType($attribute);
+        $attributeCode = $attribute->getAttributeCode();
+        $frontendInput = $attribute->getFrontendInput();
+        if (empty($context['type'])) {
+            $fieldName = $attributeCode;
+        } elseif ($context['type'] === FieldMapperInterface::TYPE_FILTER) {
+            if ($this->isStringServiceFieldType($fieldType)) {
+                return $this->getFieldName(
+                    $attribute,
+                    array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY])
+                );
+            }
+            $fieldName = $attributeCode;
+        } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) {
+            $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
+        } else {
+            $fieldName = 'sort_' . $attributeCode;
+        }
+
+        return $fieldName;
+    }
+
+    /**
+     * Check if service field type for field set as 'string'
+     *
+     * @param string $serviceFieldType
+     * @return bool
+     */
+    private function isStringServiceFieldType(string $serviceFieldType): bool
+    {
+        $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
+
+        return $serviceFieldType === $stringTypeKey;
+    }
+
+    /**
+     * Get field name for query type fields.
+     *
+     * @param string $frontendInput
+     * @param string $fieldType
+     * @param string $attributeCode
+     * @return string
+     */
+    private function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode)
+    {
+        if ($attributeCode === '*') {
+            $fieldName = '_all';
+        } else {
+            $fieldName = $this->getRefinedFieldName($frontendInput, $fieldType, $attributeCode);
+        }
+        return $fieldName;
+    }
+
+    /**
+     * Prepare field name for complex fields.
+     *
+     * @param string $frontendInput
+     * @param string $fieldType
+     * @param string $attributeCode
+     * @return string
+     */
+    private function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
+    {
+        $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
+        switch ($frontendInput) {
+            case 'select':
+            case 'multiselect':
+                return in_array($fieldType, [$stringTypeKey, 'integer'], true)
+                    ? $attributeCode . '_value'
+                    : $attributeCode;
+            case 'boolean':
+                return $fieldType === 'integer' ? $attributeCode . '_value' : $attributeCode;
+            default:
+                return $attributeCode;
+        }
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttribute.php
new file mode 100644
index 0000000000000..cbbd15083ee60
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttribute.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Resolver field name for not EAV attribute.
+ */
+class NotEavAttribute implements ResolverInterface
+{
+    /**
+     * Get field name for not EAV attributes.
+     *
+     * @param AttributeAdapter $attribute
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        if (!$attribute->isEavAttribute()) {
+            return $attribute->getAttributeCode();
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php
new file mode 100644
index 0000000000000..044d5d8da9a6c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Resolver field name for position attribute.
+ */
+class Position implements ResolverInterface
+{
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * @var Registry
+     */
+    private $coreRegistry;
+
+    /**
+     * @param StoreManager $storeManager
+     * @param Registry $coreRegistry
+     */
+    public function __construct(
+        StoreManager $storeManager = null,
+        Registry $coreRegistry = null
+    ) {
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManager::class);
+        $this->coreRegistry = $coreRegistry ?: ObjectManager::getInstance()
+            ->get(Registry::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        if ($attribute->getAttributeCode() === 'position') {
+            return 'position_category_' . $this->resolveCategoryId($context);
+        }
+
+        return null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    private function resolveCategoryId($context)
+    {
+        if (isset($context['categoryId'])) {
+            $id = $context['categoryId'];
+        } else {
+            $id = $this->coreRegistry->registry('current_category')
+                ? $this->coreRegistry->registry('current_category')->getId()
+                : $this->storeManager->getStore()->getRootCategoryId();
+        }
+
+        return $id;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php
new file mode 100644
index 0000000000000..12e53ca2bd714
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Resolver field name for price attribute.
+ */
+class Price implements ResolverInterface
+{
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * @param CustomerSession $customerSession
+     * @param StoreManager $storeManager
+     */
+    public function __construct(
+        CustomerSession $customerSession = null,
+        StoreManager $storeManager = null
+    ) {
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManager::class);
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()
+            ->get(CustomerSession::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        if ($attribute->getAttributeCode() === 'price') {
+            $customerGroupId = !empty($context['customerGroupId'])
+                ? $context['customerGroupId']
+                : $this->customerSession->getCustomerGroupId();
+            $websiteId = !empty($context['websiteId'])
+                ? $context['websiteId']
+                : $this->storeManager->getStore()->getWebsiteId();
+
+            return 'price_' . $customerGroupId . '_' . $websiteId;
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
new file mode 100644
index 0000000000000..4fa16db98639e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
+
+/**
+ * Resolver field name for not special attribute.
+ */
+class SpecialAttribute implements ResolverInterface
+{
+    /**
+     * Get field name for special list of attributes.
+     *
+     * @param AttributeAdapter $attribute
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
+    {
+        if (in_array($attribute->getAttributeCode(), ['id', 'sku', 'store_id', 'visibility'], true)) {
+            return $attribute->getAttributeCode();
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/ResolverInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/ResolverInterface.php
new file mode 100644
index 0000000000000..3d36e026f70db
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/ResolverInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+
+/**
+ * Field name resolver for preparing field key for elasticsearch mapping by attribute.
+ */
+interface ResolverInterface
+{
+    /**
+     * Get field name.
+     *
+     * @param AttributeAdapter $attribute
+     * @param array $context
+     * @return string
+     */
+    public function getFieldName(AttributeAdapter $attribute, $context = []): ?string;
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
new file mode 100644
index 0000000000000..88dab83698794
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
+
+/**
+ * Field type converter from internal data types to elastic service.
+ */
+class Converter implements ConverterInterface
+{
+    /**#@+
+     * Text flags for Elasticsearch field types
+     */
+    private const ES_DATA_TYPE_STRING = 'string';
+    private const ES_DATA_TYPE_FLOAT = 'float';
+    private const ES_DATA_TYPE_INT = 'integer';
+    private const ES_DATA_TYPE_DATE = 'date';
+    /**#@-*/
+
+    /**
+     * Mapping between internal data types and elastic service.
+     *
+     * @var array
+     */
+    private $mapping = [
+        self::INTERNAL_DATA_TYPE_STRING => self::ES_DATA_TYPE_STRING,
+        self::INTERNAL_DATA_TYPE_KEYWORD => self::ES_DATA_TYPE_STRING,
+        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_FLOAT,
+        self::INTERNAL_DATA_TYPE_INT => self::ES_DATA_TYPE_INT,
+        self::INTERNAL_DATA_TYPE_DATE => self::ES_DATA_TYPE_DATE,
+    ];
+
+    /**
+     * Get service field type for elasticsearch 2.
+     *
+     * @param string $internalType
+     * @return string
+     * @throws \DomainException
+     */
+    public function convert(string $internalType): string
+    {
+        if (!isset($this->mapping[$internalType])) {
+            throw new \DomainException(sprintf('Unsupported internal field type: %s', $internalType));
+        }
+        return $this->mapping[$internalType];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
new file mode 100644
index 0000000000000..3e7c3e9b592bd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
+
+/**
+ * @api
+ * Field type converter from internal data types to elastic service.
+ */
+interface ConverterInterface
+{
+    /**#@+
+     * Text flags for internal field types
+     */
+    public const INTERNAL_DATA_TYPE_STRING = 'string';
+    public const INTERNAL_DATA_TYPE_FLOAT = 'float';
+    public const INTERNAL_DATA_TYPE_INT = 'integer';
+    public const INTERNAL_DATA_TYPE_DATE = 'date';
+    public const INTERNAL_DATA_TYPE_KEYWORD = 'keyword';
+    /**#@-*/
+
+    /**
+     * Get service field type.
+     *
+     * @param string $internalType
+     * @return string
+     */
+    public function convert(string $internalType): string;
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
new file mode 100644
index 0000000000000..e83502e4fe32e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Composite resolver for resolving field type.
+ */
+class CompositeResolver implements ResolverInterface
+{
+    /**
+     * @var ResolverInterface[]
+     */
+    private $items;
+
+    /**
+     * @param ResolverInterface[] $items
+     */
+    public function __construct(array $items)
+    {
+        foreach ($items as $item) {
+            if (!$item instanceof ResolverInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field type resolver is expected, got %s instead.', get_class($item))
+                );
+            }
+        }
+        $this->items = $items;
+    }
+
+    /**
+     * Get field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        $result = null;
+        foreach ($this->items as $item) {
+            $result = $item->getFieldType($attribute);
+            if (null !== $result) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeType.php
new file mode 100644
index 0000000000000..a4e3c634ce717
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeType.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Date/Time type resolver.
+ */
+class DateTimeType implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @param ConverterInterface $fieldTypeConverter
+     */
+    public function __construct(ConverterInterface $fieldTypeConverter)
+    {
+        $this->fieldTypeConverter = $fieldTypeConverter;
+    }
+
+    /**
+     * Get datetime field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        if ($attribute->isDateTimeType()) {
+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_DATE);
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolver.php
new file mode 100644
index 0000000000000..be4a8cca28814
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolver.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Default field type resolver.
+ */
+class DefaultResolver implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @param ConverterInterface $fieldTypeConverter
+     */
+    public function __construct(ConverterInterface $fieldTypeConverter)
+    {
+        $this->fieldTypeConverter = $fieldTypeConverter;
+    }
+
+    /**
+     * Get default field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_STRING);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatType.php
new file mode 100644
index 0000000000000..a6681a7f676ba
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatType.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Float type resolver.
+ */
+class FloatType implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @param ConverterInterface $fieldTypeConverter
+     */
+    public function __construct(ConverterInterface $fieldTypeConverter)
+    {
+        $this->fieldTypeConverter = $fieldTypeConverter;
+    }
+
+    /**
+     * Get float field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        if ($attribute->isFloatType()) {
+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_FLOAT);
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
new file mode 100644
index 0000000000000..7793f60cd1efc
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Integer type resolver.
+ */
+class IntegerType implements ResolverInterface
+{
+    /**
+     * @var ConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @param ConverterInterface $fieldTypeConverter
+     */
+    public function __construct(ConverterInterface $fieldTypeConverter)
+    {
+        $this->fieldTypeConverter = $fieldTypeConverter;
+    }
+
+    /**
+     * Get integer field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string
+    {
+        if (($attribute->isIntegerType() || $attribute->isBooleanType())
+                && !$attribute->isUserDefined()
+        ) {
+            return $this->fieldTypeConverter->convert(ConverterInterface::INTERNAL_DATA_TYPE_INT);
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ResolverInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ResolverInterface.php
new file mode 100644
index 0000000000000..43e512ecb025b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ResolverInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+
+/**
+ * Field type resolver interface.
+ */
+interface ResolverInterface
+{
+    /**
+     * Get field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
+     */
+    public function getFieldType(AttributeAdapter $attribute): ?string;
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
new file mode 100644
index 0000000000000..b5c78cbc28f45
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
+
+use Magento\Eav\Model\Config;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
+    as IndexTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface
+    as FieldIndexResolver;
+
+/**
+ * Provide static fields for mapping of product.
+ */
+class StaticField implements FieldProviderInterface
+{
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var IndexTypeConverterInterface
+     */
+    private $indexTypeConverter;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * @var FieldIndexResolver
+     */
+    private $fieldIndexResolver;
+
+    /**
+     * @param Config $eavConfig
+     * @param FieldTypeConverterInterface $fieldTypeConverter
+     * @param IndexTypeConverterInterface $indexTypeConverter
+     * @param FieldTypeResolver $fieldTypeResolver
+     * @param FieldIndexResolver $fieldIndexResolver
+     * @param AttributeProvider $attributeAdapterProvider
+     */
+    public function __construct(
+        Config $eavConfig,
+        FieldTypeConverterInterface $fieldTypeConverter,
+        IndexTypeConverterInterface $indexTypeConverter,
+        FieldTypeResolver $fieldTypeResolver,
+        FieldIndexResolver $fieldIndexResolver,
+        AttributeProvider $attributeAdapterProvider
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->fieldTypeConverter = $fieldTypeConverter;
+        $this->indexTypeConverter = $indexTypeConverter;
+        $this->fieldTypeResolver = $fieldTypeResolver;
+        $this->fieldIndexResolver = $fieldIndexResolver;
+        $this->attributeAdapterProvider = $attributeAdapterProvider;
+    }
+
+    /**
+     * Get static fields.
+     *
+     * @param array $context
+     * @return array
+     */
+    public function getFields(array $context = []): array
+    {
+        $attributes = $this->eavConfig->getEntityAttributes(ProductAttributeInterface::ENTITY_TYPE_CODE);
+        $allAttributes = [];
+
+        foreach ($attributes as $attribute) {
+            $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
+            $code = $attributeAdapter->getAttributeCode();
+
+            $allAttributes[$code] = [
+                'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
+            ];
+
+            $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
+            if (null !== $index) {
+                $allAttributes[$code]['index'] = $index;
+            }
+
+            if ($attributeAdapter->isComplexType()) {
+                $allAttributes[$code . '_value'] = [
+                    'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
+                ];
+            }
+        }
+
+        $allAttributes['store_id'] = [
+            'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
+            'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
+        ];
+
+        return $allAttributes;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProviderInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProviderInterface.php
new file mode 100644
index 0000000000000..aaafb699b33bd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProviderInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product;
+
+/**
+ * Product fields provider.
+ * Provide fields mapping configuration for elasticsearch service of internal product attributes.
+ */
+interface FieldProviderInterface
+{
+    /**
+     * Get fields.
+     *
+     * @param array $context
+     * @return array
+     */
+    public function getFields(array $context = []): array;
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php
new file mode 100644
index 0000000000000..657605bbd019b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\FieldMapper;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper
+    as Elasticsearch5ProductFieldMapper;
+
+/**
+ * Class ProductFieldMapper
+ */
+class ProductFieldMapper extends Elasticsearch5ProductFieldMapper implements FieldMapperInterface
+{
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapperInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapperInterface.php
new file mode 100644
index 0000000000000..0c73a3a206942
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapperInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface FieldMapperInterface
+{
+    /**#@+
+     * Text flags for field mapping context
+     */
+    const TYPE_QUERY = 'text';
+    const TYPE_SORT = 'sort';
+    const TYPE_FILTER = 'default';
+    /**#@-*/
+
+    /**
+     * Get field name
+     *
+     * @param string $attributeCode
+     * @param array $context
+     * @return string
+     * @since 100.1.0
+     */
+    public function getFieldName($attributeCode, $context = []);
+
+    /**
+     * Get all entity attribute types
+     *
+     * @param array $context
+     * @return array
+     * @since 100.1.0
+     */
+    public function getAllAttributesTypes($context = []);
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
new file mode 100644
index 0000000000000..e7d8d0672aaf0
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface;
+
+/**
+ * Class FieldType
+ *
+ * @api
+ * @since 100.1.0
+ *
+ * @deprecated This class provide not full data about field type. Only basic rules apply in this class.
+ * @see ResolverInterface
+ */
+class FieldType
+{
+    /**#@+
+     * @deprecated
+     * @see \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+     *
+     * Text flags for Elasticsearch field types
+     */
+    const ES_DATA_TYPE_STRING = 'string';
+    const ES_DATA_TYPE_FLOAT = 'float';
+    const ES_DATA_TYPE_INT = 'integer';
+    const ES_DATA_TYPE_DATE = 'date';
+
+    /** @deprecated */
+    const ES_DATA_TYPE_ARRAY = 'array';
+    /**#@-*/
+
+    /**
+     * Get field type.
+     *
+     * @deprecated
+     * @see ResolverInterface::getFieldType
+     *
+     * @param AbstractAttribute $attribute
+     * @return string
+     */
+    public function getFieldType($attribute)
+    {
+        trigger_error('Class is deprecated', E_USER_DEPRECATED);
+        $backendType = $attribute->getBackendType();
+        $frontendInput = $attribute->getFrontendInput();
+
+        if ($backendType === 'timestamp') {
+            $fieldType = self::ES_DATA_TYPE_DATE;
+        } elseif ((in_array($backendType, ['int', 'smallint'], true)
+            || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar'))
+            && !$attribute->getIsUserDefined()
+        ) {
+            $fieldType = self::ES_DATA_TYPE_INT;
+        } elseif ($backendType === 'decimal') {
+            $fieldType = self::ES_DATA_TYPE_FLOAT;
+        } else {
+            $fieldType = self::ES_DATA_TYPE_STRING;
+        }
+
+        return $fieldType;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldType/Date.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType/Date.php
new file mode 100644
index 0000000000000..ecae1a4ccca91
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType/Date.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\FieldType;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
+class Date
+{
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var TimezoneInterface
+     */
+    private $localeDate;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Construct
+     *
+     * @param DateTime $dateTime
+     * @param TimezoneInterface $localeDate
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        DateTime $dateTime,
+        TimezoneInterface $localeDate,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->dateTime = $dateTime;
+        $this->localeDate = $localeDate;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Retrieve date value in elasticsearch format (ISO 8601)
+     * Example: 1995-12-31T23:59:59
+     *
+     * @param int $storeId
+     * @param string|null $date
+     * @return string|null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function formatDate($storeId, $date = null)
+    {
+        if ($this->dateTime->isEmptyDate($date)) {
+            return null;
+        }
+        $dateObj = new \DateTime($date, new \DateTimeZone('UTC'));
+        return $dateObj->format('c');
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
new file mode 100644
index 0000000000000..773faf49f8fda
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Index;
+
+use Magento\Framework\Locale\Resolver as LocaleResolver;
+use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
+
+class Builder implements BuilderInterface
+{
+    /**
+     * @var LocaleResolver
+     */
+    protected $localeResolver;
+
+    /**
+     * @var EsConfigInterface
+     */
+    protected $esConfig;
+
+    /**
+     * Current store ID.
+     *
+     * @var int
+     */
+    protected $storeId;
+
+    /**
+     * @param LocaleResolver $localeResolver
+     * @param EsConfigInterface $esConfig
+     */
+    public function __construct(
+        LocaleResolver $localeResolver,
+        EsConfigInterface $esConfig
+    ) {
+        $this->localeResolver = $localeResolver;
+        $this->esConfig = $esConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build()
+    {
+        $tokenizer = $this->getTokenizer();
+        $filter = $this->getFilter();
+        $charFilter = $this->getCharFilter();
+
+        $settings = [
+            'analysis' => [
+                'analyzer' => [
+                    'default' => [
+                        'type' => 'custom',
+                        'tokenizer' => key($tokenizer),
+                        'filter' => array_merge(
+                            ['lowercase', 'keyword_repeat'],
+                            array_keys($filter)
+                        ),
+                        'char_filter' => array_keys($charFilter)
+                    ]
+                ],
+                'tokenizer' => $tokenizer,
+                'filter' => $filter,
+                'char_filter' => $charFilter,
+            ],
+        ];
+
+        return $settings;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setStoreId($storeId)
+    {
+        $this->storeId = $storeId;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getTokenizer()
+    {
+        $tokenizer = [
+            'default_tokenizer' => [
+                'type' => 'standard',
+            ],
+        ];
+        return $tokenizer;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getFilter()
+    {
+        $filter = [
+            'default_stemmer' => $this->getStemmerConfig(),
+            'unique_stem' => [
+                'type' => 'unique',
+                'only_on_same_position' => true
+            ]
+        ];
+        return $filter;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getCharFilter()
+    {
+        $charFilter = [
+            'default_char_filter' => [
+                'type' => 'html_strip',
+            ],
+        ];
+        return $charFilter;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getStemmerConfig()
+    {
+        $stemmerInfo = $this->esConfig->getStemmerInfo();
+        $this->localeResolver->emulate($this->storeId);
+        $locale = $this->localeResolver->getLocale();
+        if (isset($stemmerInfo[$locale])) {
+            return [
+                'type' => $stemmerInfo['type'],
+                'language' => $stemmerInfo[$locale],
+            ];
+        }
+        return [
+            'type' => $stemmerInfo['type'],
+            'language' => $stemmerInfo['default'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/BuilderInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/BuilderInterface.php
new file mode 100644
index 0000000000000..d185fb25c9703
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/BuilderInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Index;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface BuilderInterface
+{
+    /**
+     * @return array
+     * @since 100.1.0
+     */
+    public function build();
+
+    /**
+     * @param int $storeId
+     * @return void
+     * @since 100.1.0
+     */
+    public function setStoreId($storeId);
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php
new file mode 100644
index 0000000000000..54400b3ea72d7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
+
+use Magento\Framework\Config\ConverterInterface;
+
+class Converter implements ConverterInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function convert($source)
+    {
+        $stemmer = $source->getElementsByTagName('stemmer');
+        $stemmerInfo = [];
+        foreach ($stemmer as $stemmerItem) {
+            foreach ($stemmerItem->childNodes as $childNode) {
+                if ($childNode->nodeType === XML_ELEMENT_NODE) {
+                    $stemmerInfo[$childNode->localName]= $childNode->textContent;
+                }
+            }
+        }
+
+        $stopwords = $source->getElementsByTagName('stopwords_file');
+        $stopwordsInfo = [];
+        foreach ($stopwords as $stopwordsItem) {
+            foreach ($stopwordsItem->childNodes as $childNode) {
+                if ($childNode->nodeType === XML_ELEMENT_NODE) {
+                    $stopwordsInfo[$childNode->localName]= $childNode->textContent;
+                }
+            }
+        }
+
+        return ['stemmerInfo' => $stemmerInfo, 'stopwordsInfo' => $stopwordsInfo];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfig.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfig.php
new file mode 100644
index 0000000000000..f3c9e34d6076e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfig.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
+
+use Magento\Framework\Config\Data;
+use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+
+class EsConfig extends Data implements EsConfigInterface
+{
+    /**
+     * @param ReaderInterface $reader
+     * @param CacheInterface $cache
+     * @param string $cacheId
+     * @param SerializerInterface|null $serializer
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        CacheInterface $cache,
+        $cacheId,
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStemmerInfo()
+    {
+        return $this->get('stemmerInfo');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStopwordsInfo()
+    {
+        return $this->get('stopwordsInfo');
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php
new file mode 100644
index 0000000000000..61cdf89d348c6
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface EsConfigInterface
+{
+    /**
+     * @return array
+     * @since 100.1.0
+     */
+    public function getStemmerInfo();
+
+    /**
+     * @return array
+     * @since 100.1.0
+     */
+    public function getStopwordsInfo();
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/SchemaLocator.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/SchemaLocator.php
new file mode 100644
index 0000000000000..182523042e07a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/SchemaLocator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
+
+use Magento\Framework\Config\SchemaLocatorInterface;
+use Magento\Framework\Module\Dir;
+
+class SchemaLocator implements SchemaLocatorInterface
+{
+    /**
+     * XML schema for config file.
+     */
+    const CONFIG_FILE_SCHEMA = 'esconfig.xsd';
+
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema = null;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     * @var string
+     */
+    protected $perFileSchema = null;
+
+    /**
+     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     */
+    public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
+    {
+        $configDir = $moduleReader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_Elasticsearch');
+        $this->schema = $configDir . DIRECTORY_SEPARATOR . self::CONFIG_FILE_SCHEMA;
+        $this->perFileSchema = $configDir . DIRECTORY_SEPARATOR . self::CONFIG_FILE_SCHEMA;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php
new file mode 100644
index 0000000000000..742af4247524e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Adapter\Index;
+
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Config;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+
+/**
+ * Index name resolver
+ * @api
+ * @since 100.1.0
+ */
+class IndexNameResolver
+{
+    /**
+     * @var ConnectionManager
+     * @since 100.1.0
+     */
+    protected $connectionManager;
+
+    /**
+     * @var Config
+     * @since 100.1.0
+     */
+    protected $clientConfig;
+
+    /**
+     * @var ElasticsearchClient
+     * @since 100.1.0
+     */
+    protected $client;
+
+    /**
+     * @var LoggerInterface
+     * @since 100.1.0
+     */
+    protected $logger;
+
+    /**
+     * Constructor for Index Name Resolver
+     *
+     * @param ConnectionManager $connectionManager
+     * @param Config $clientConfig
+     * @param LoggerInterface $logger
+     * @param array $options
+     * @throws LocalizedException
+     */
+    public function __construct(
+        ConnectionManager $connectionManager,
+        Config $clientConfig,
+        LoggerInterface $logger,
+        $options = []
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->clientConfig = $clientConfig;
+        $this->logger = $logger;
+
+        try {
+            $this->client = $this->connectionManager->getConnection($options);
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            throw new LocalizedException(
+                __('The search failed because of a search engine misconfiguration.')
+            );
+        }
+    }
+
+    /**
+     * Get index namespace from config
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    protected function getIndexNamespace()
+    {
+        return $this->clientConfig->getIndexPrefix();
+    }
+
+    /**
+     * Get index namespace from config
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexNameForAlias($storeId, $mappedIndexerId)
+    {
+        return $this->clientConfig->getIndexPrefix() . '_' . $mappedIndexerId . '_' . $storeId;
+    }
+
+    /**
+     * Returns the index name
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @param array $preparedIndex
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexName($storeId, $mappedIndexerId, array $preparedIndex)
+    {
+        if (isset($preparedIndex[$storeId])) {
+            return $preparedIndex[$storeId];
+        } else {
+            $indexName = $this->getIndexFromAlias($storeId, $mappedIndexerId);
+            if (empty($indexName)) {
+                $indexName = $this->getIndexPattern($storeId, $mappedIndexerId) . 1;
+            }
+        }
+        return $indexName;
+    }
+
+    /**
+     * Returns index pattern.
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexPattern($storeId, $mappedIndexerId)
+    {
+        return $this->getIndexNamespace() . '_' . $mappedIndexerId . '_' . $storeId . '_v';
+    }
+
+    /**
+     * Returns index for store in alias definition.
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexFromAlias($storeId, $mappedIndexerId)
+    {
+        $storeIndex = '';
+        $indexPattern = $this->getIndexPattern($storeId, $mappedIndexerId);
+        $namespace = $this->getIndexNamespace() . '_' . $mappedIndexerId . '_' . $storeId;
+        if ($this->client->existsAlias($namespace)) {
+            $alias = $this->client->getAlias($namespace);
+            $indices = array_keys($alias);
+            foreach ($indices as $index) {
+                if (strpos($index, $indexPattern) === 0) {
+                    $storeIndex = $index;
+                    break;
+                }
+            }
+        }
+        return $storeIndex;
+    }
+
+    /**
+     * Taking index name by indexer ID
+     *
+     * @param string $indexerId
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexMapping($indexerId)
+    {
+        if ($indexerId == Fulltext::INDEXER_ID) {
+            $mappedIndexerId = 'product';
+        } else {
+            $mappedIndexerId = $indexerId;
+        }
+        return $mappedIndexerId;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
new file mode 100644
index 0000000000000..44ab0dbc4d46c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Client;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\AdvancedSearch\Model\Client\ClientInterface;
+
+/**
+ * Elasticsearch client
+ */
+class Elasticsearch implements ClientInterface
+{
+    /**
+     * Elasticsearch Client instances
+     *
+     * @var \Elasticsearch\Client[]
+     */
+    private $client;
+
+    /**
+     * @var array
+     */
+    private $clientOptions;
+
+    /**
+     * @var bool
+     */
+    private $pingResult;
+
+    /**
+     * Initialize Elasticsearch Client
+     *
+     * @param array $options
+     * @param \Elasticsearch\Client|null $elasticsearchClient
+     * @throws LocalizedException
+     */
+    public function __construct(
+        $options = [],
+        $elasticsearchClient = null
+    ) {
+        if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
+            ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
+            throw new LocalizedException(
+                __('The search failed because of a search engine misconfiguration.')
+            );
+        }
+
+        if (!($elasticsearchClient instanceof \Elasticsearch\Client)) {
+            $config = $this->buildConfig($options);
+            $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config, true);
+        }
+        $this->client[getmypid()] = $elasticsearchClient;
+        $this->clientOptions = $options;
+    }
+
+    /**
+     * Get Elasticsearch Client
+     *
+     * @return \Elasticsearch\Client
+     */
+    private function getClient()
+    {
+        $pid = getmypid();
+        if (!isset($this->client[$pid])) {
+            $config = $this->buildConfig($this->clientOptions);
+            $this->client[$pid] = \Elasticsearch\ClientBuilder::fromConfig($config, true);
+        }
+        return $this->client[$pid];
+    }
+
+    /**
+     * Ping the Elasticsearch client
+     *
+     * @return bool
+     */
+    public function ping()
+    {
+        if ($this->pingResult === null) {
+            $this->pingResult = $this->getClient()->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
+        }
+        return $this->pingResult;
+    }
+
+    /**
+     * Validate connection params
+     *
+     * @return bool
+     */
+    public function testConnection()
+    {
+        return $this->ping();
+    }
+
+    /**
+     * @param array $options
+     * @return array
+     */
+    private function buildConfig($options = [])
+    {
+        $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
+        $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
+        if (!$protocol) {
+            $protocol = 'http';
+        }
+        if (!empty($options['port'])) {
+            $host .= ':' . $options['port'];
+        }
+        if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) {
+            $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host);
+        }
+
+        $options['hosts'] = [$host];
+        return $options;
+    }
+
+    /**
+     * Performs bulk query over Elasticsearch index
+     *
+     * @param array $query
+     * @return void
+     */
+    public function bulkQuery($query)
+    {
+        $this->getClient()->bulk($query);
+    }
+
+    /**
+     * Creates an Elasticsearch index.
+     *
+     * @param string $index
+     * @param array $settings
+     * @return void
+     */
+    public function createIndex($index, $settings)
+    {
+        $this->getClient()->indices()->create([
+            'index' => $index,
+            'body' => $settings,
+        ]);
+    }
+
+    /**
+     * Delete an Elasticsearch index.
+     *
+     * @param string $index
+     * @return void
+     */
+    public function deleteIndex($index)
+    {
+        $this->getClient()->indices()->delete(['index' => $index]);
+    }
+
+    /**
+     * Check if index is empty.
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function isEmptyIndex($index)
+    {
+        $stats = $this->getClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
+        if ($stats['indices'][$index]['primaries']['docs']['count'] == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Updates alias.
+     *
+     * @param string $alias
+     * @param string $newIndex
+     * @param string $oldIndex
+     * @return void
+     */
+    public function updateAlias($alias, $newIndex, $oldIndex = '')
+    {
+        $params['body'] = ['actions' => []];
+        if ($oldIndex) {
+            $params['body']['actions'][] = ['remove' => ['alias' => $alias, 'index' => $oldIndex]];
+        }
+        if ($newIndex) {
+            $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
+        }
+
+        $this->getClient()->indices()->updateAliases($params);
+    }
+
+    /**
+     * Checks whether Elasticsearch index exists
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function indexExists($index)
+    {
+        return $this->getClient()->indices()->exists(['index' => $index]);
+    }
+
+    /**
+     * @param string $alias
+     * @param string $index
+     *
+     * @return bool
+     */
+    public function existsAlias($alias, $index = '')
+    {
+        $params = ['name' => $alias];
+        if ($index) {
+            $params['index'] = $index;
+        }
+        return $this->getClient()->indices()->existsAlias($params);
+    }
+
+    /**
+     * @param string $alias
+     *
+     * @return array
+     */
+    public function getAlias($alias)
+    {
+        return $this->getClient()->indices()->getAlias(['name' => $alias]);
+    }
+
+    /**
+     * Add mapping to Elasticsearch index
+     *
+     * @param array $fields
+     * @param string $index
+     * @param string $entityType
+     * @return void
+     */
+    public function addFieldsMapping(array $fields, $index, $entityType)
+    {
+        $params = [
+            'index' => $index,
+            'type' => $entityType,
+            'body' => [
+                $entityType => [
+                    '_all' => [
+                        'enabled' => true,
+                        'type' => 'string'
+                    ],
+                    'properties' => [],
+                    'dynamic_templates' => [
+                        [
+                            'price_mapping' => [
+                                'match' => 'price_*',
+                                'match_mapping' => 'string',
+                                'mapping' => [
+                                    'type' => 'float'
+                                ],
+                            ],
+                        ],
+                        [
+                            'string_mapping' => [
+                                'match' => '*',
+                                'match_mapping' => 'string',
+                                'mapping' => [
+                                    'type' => 'string',
+                                    'index' => 'no'
+                                ],
+                            ],
+                        ],
+                        [
+                            'position_mapping' => [
+                                'match' => 'position_*',
+                                'match_mapping' => 'string',
+                                'mapping' => [
+                                    'type' => 'int'
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        foreach ($fields as $field => $fieldInfo) {
+            $params['body'][$entityType]['properties'][$field] = $fieldInfo;
+        }
+        $this->getClient()->indices()->putMapping($params);
+    }
+
+    /**
+     * Delete mapping in Elasticsearch index
+     *
+     * @param string $index
+     * @param string $entityType
+     * @return void
+     */
+    public function deleteMapping($index, $entityType)
+    {
+        $this->getClient()->indices()->deleteMapping([
+            'index' => $index,
+            'type' => $entityType,
+        ]);
+    }
+
+    /**
+     * Execute search by $query
+     *
+     * @param array $query
+     * @return array
+     */
+    public function query($query)
+    {
+        return $this->getClient()->search($query);
+    }
+
+    /**
+     * Execute suggest query
+     *
+     * @param array $query
+     * @return array
+     */
+    public function suggest($query)
+    {
+        return $this->getClient()->suggest($query);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
new file mode 100644
index 0000000000000..dc08a72a9feb3
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\EngineResolver;
+use Magento\Store\Model\ScopeInterface;
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Elasticsearch config model
+ * @api
+ * @since 100.1.0
+ */
+class Config implements ClientOptionsInterface
+{
+    /**
+     * Search engine name
+     */
+    const ENGINE_NAME = 'elasticsearch';
+
+    private const ENGINE_NAME_5 = 'elasticsearch5';
+
+    /**
+     * Elasticsearch Entity type
+     */
+    const ELASTICSEARCH_TYPE_DOCUMENT = 'document';
+
+    /**
+     * Elasticsearch default Entity type
+     */
+    const ELASTICSEARCH_TYPE_DEFAULT = 'product';
+
+    /**
+     * Default Elasticsearch server timeout
+     */
+    const ELASTICSEARCH_DEFAULT_TIMEOUT = 15;
+
+    /**
+     * @var ScopeConfigInterface
+     * @since 100.1.0
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var string
+     */
+    private $prefix;
+
+    /**
+     * @var ClientResolver
+     */
+    private $clientResolver;
+
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * Constructor
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param ClientResolver|null $clientResolver
+     * @param EngineResolverInterface|null $engineResolver
+     * @param string|null $prefix
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        ClientResolver $clientResolver = null,
+        EngineResolverInterface $engineResolver = null,
+        $prefix = null
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
+        $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
+        $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @since 100.1.0
+     */
+    public function prepareClientOptions($options = [])
+    {
+        $defaultOptions = [
+            'hostname' => $this->getElasticsearchConfigData('server_hostname'),
+            'port' => $this->getElasticsearchConfigData('server_port'),
+            'index' => $this->getElasticsearchConfigData('index_prefix'),
+            'enableAuth' => $this->getElasticsearchConfigData('enable_auth'),
+            'username' => $this->getElasticsearchConfigData('username'),
+            'password' => $this->getElasticsearchConfigData('password'),
+            'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT,
+        ];
+        $options = array_merge($defaultOptions, $options);
+        return $options;
+    }
+
+    /**
+     * Retrieve information from Elasticsearch search engine configuration
+     *
+     * @param string $field
+     * @param int $storeId
+     * @return string|int
+     * @since 100.1.0
+     */
+    public function getElasticsearchConfigData($field, $storeId = null)
+    {
+        return $this->getSearchConfigData($this->prefix . '_' . $field, $storeId);
+    }
+
+    /**
+     * Retrieve information from search engine configuration
+     *
+     * @param string $field
+     * @param int|null $storeId
+     * @return string|int
+     * @since 100.1.0
+     */
+    public function getSearchConfigData($field, $storeId = null)
+    {
+        $path = 'catalog/search/' . $field;
+        return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);
+    }
+
+    /**
+     * Return true if third party search engine is used
+     *
+     * @return bool
+     * @since 100.1.0
+     */
+    public function isElasticsearchEnabled()
+    {
+        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME, self::ENGINE_NAME_5]);
+    }
+
+    /**
+     * Get Elasticsearch index prefix
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexPrefix()
+    {
+        return $this->getElasticsearchConfigData('index_prefix');
+    }
+
+    /**
+     * Get Elasticsearch entity type
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    public function getEntityType()
+    {
+        return self::ELASTICSEARCH_TYPE_DOCUMENT;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
new file mode 100644
index 0000000000000..c4fab39dfde61
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\DataProvider;
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Search\Model\QueryInterface;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Search\Model\QueryResultFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+
+/**
+ * Class Suggestions
+ */
+class Suggestions implements SuggestedQueriesInterface
+{
+    /**
+     * @deprecated
+     * @see SuggestedQueriesInterface::SEARCH_SUGGESTION_COUNT
+     */
+    const CONFIG_SUGGESTION_COUNT = 'catalog/search/search_suggestion_count';
+
+    /**
+     * @deprecated
+     * @see SuggestedQueriesInterface::SEARCH_SUGGESTION_COUNT_RESULTS_ENABLED
+     */
+    const CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED = 'catalog/search/search_suggestion_count_results_enabled';
+
+    /**
+     * @deprecated
+     * @see SuggestedQueriesInterface::SEARCH_SUGGESTION_ENABLED
+     */
+    const CONFIG_SUGGESTION_ENABLED = 'catalog/search/search_suggestion_enabled';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var QueryResultFactory
+     */
+    private $queryResultFactory;
+
+    /**
+     * @var ConnectionManager
+     */
+    private $connectionManager;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var SearchIndexNameResolver
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * Suggestions constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Config $config
+     * @param QueryResultFactory $queryResultFactory
+     * @param ConnectionManager $connectionManager
+     * @param SearchIndexNameResolver $searchIndexNameResolver
+     * @param StoreManager $storeManager
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        Config $config,
+        QueryResultFactory $queryResultFactory,
+        ConnectionManager $connectionManager,
+        SearchIndexNameResolver $searchIndexNameResolver,
+        StoreManager $storeManager
+    ) {
+        $this->queryResultFactory = $queryResultFactory;
+        $this->connectionManager = $connectionManager;
+        $this->scopeConfig = $scopeConfig;
+        $this->config = $config;
+        $this->searchIndexNameResolver = $searchIndexNameResolver;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems(QueryInterface $query)
+    {
+        $result = [];
+        if ($this->isSuggestionsAllowed()) {
+            $isResultsCountEnabled = $this->isResultsCountEnabled();
+
+            foreach ($this->getSuggestions($query) as $suggestion) {
+                $count = null;
+                if ($isResultsCountEnabled) {
+                    $count = isset($suggestion['freq']) ? $suggestion['freq'] : null;
+                }
+                $result[] = $this->queryResultFactory->create(
+                    [
+                        'queryText' => $suggestion['text'],
+                        'resultsCount' => $count,
+                    ]
+                );
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isResultsCountEnabled()
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Get Suggestions
+     *
+     * @param QueryInterface $query
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getSuggestions(QueryInterface $query)
+    {
+        $suggestions = [];
+        $searchSuggestionsCount = $this->getSearchSuggestionsCount();
+
+        $suggestRequest = [
+            'index' => $this->searchIndexNameResolver->getIndexName(
+                $this->storeManager->getStore()->getId(),
+                Config::ELASTICSEARCH_TYPE_DEFAULT
+            ),
+            'body' => [
+                'suggestions' => [
+                    'text' => $query->getQueryText(),
+                    'phrase' => [
+                        'field' => '_all',
+                        'analyzer' => 'standard',
+                        'size' => $searchSuggestionsCount,
+                        'max_errors' => 2,
+                        'direct_generator' => [
+                            [
+                                'field' => '_all',
+                                'min_word_length' => 3,
+                                'min_doc_freq' => 1
+                            ]
+                        ],
+                    ]
+                ]
+            ]
+        ];
+
+        $result = $this->fetchQuery($suggestRequest);
+
+        if (is_array($result)) {
+            foreach ($result['suggestions'] as $token) {
+                foreach ($token['options'] as $key => $suggestion) {
+                    $suggestions[$suggestion['score'] . '_' . $key] = $suggestion;
+                }
+            }
+            ksort($suggestions);
+            $suggestions = array_slice($suggestions, 0, $searchSuggestionsCount);
+        }
+
+        return $suggestions;
+    }
+
+    /**
+     * Fetch Query
+     *
+     * @param array $query
+     * @return array
+     */
+    private function fetchQuery(array $query)
+    {
+        return $this->connectionManager->getConnection()->suggest($query);
+    }
+
+    /**
+     * Get search suggestions Max Count from config
+     *
+     * @return int
+     */
+    private function getSearchSuggestionsCount()
+    {
+        return (int)$this->scopeConfig->getValue(
+            self::CONFIG_SUGGESTION_COUNT,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Is Search Suggestions Allowed
+     *
+     * @return bool
+     */
+    private function isSuggestionsAllowed()
+    {
+        $isSuggestionsEnabled = $this->scopeConfig->isSetFlag(
+            self::CONFIG_SUGGESTION_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+        $isEnabled = $this->config->isElasticsearchEnabled();
+        $isSuggestionsAllowed = ($isEnabled && $isSuggestionsEnabled);
+        return $isSuggestionsAllowed;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexStructure.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexStructure.php
new file mode 100644
index 0000000000000..5a31b3d81d0cc
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexStructure.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Indexer;
+
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
+use Magento\Framework\App\ScopeResolverInterface;
+
+class IndexStructure implements IndexStructureInterface
+{
+    /**
+     * @var ElasticsearchAdapter
+     */
+    private $adapter;
+
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
+    /**
+     * @param ElasticsearchAdapter $adapter
+     * @param ScopeResolverInterface $scopeResolver
+     */
+    public function __construct(
+        ElasticsearchAdapter $adapter,
+        ScopeResolverInterface $scopeResolver
+    ) {
+        $this->adapter = $adapter;
+        $this->scopeResolver = $scopeResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(
+        $indexerId,
+        array $dimensions = []
+    ) {
+        $dimension = current($dimensions);
+        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $this->adapter->cleanIndex($scopeId, $indexerId);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     */
+    public function create(
+        $indexerId,
+        array $fields,
+        array $dimensions = []
+    ) {
+        $dimension = current($dimensions);
+        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $this->adapter->checkIndex($scopeId, $indexerId, false);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
new file mode 100644
index 0000000000000..847710eaa445a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Indexer;
+
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
+use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
+use Magento\Framework\App\ScopeResolverInterface;
+
+/**
+ * Indexer Handler for Elasticsearch engine.
+ */
+class IndexerHandler implements IndexerInterface
+{
+    /**
+     * Default batch size
+     */
+    const DEFAULT_BATCH_SIZE = 500;
+
+    /**
+     * @var IndexStructureInterface
+     */
+    private $indexStructure;
+
+    /**
+     * @var ElasticsearchAdapter
+     */
+    private $adapter;
+
+    /**
+     * @var IndexNameResolver
+     */
+    private $indexNameResolver;
+
+    /**
+     * @var Batch
+     */
+    private $batch;
+
+    /**
+     * @var array
+     */
+    private $data;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
+    /**
+     * @param IndexStructureInterface $indexStructure
+     * @param ElasticsearchAdapter $adapter
+     * @param IndexNameResolver $indexNameResolver
+     * @param Batch $batch
+     * @param ScopeResolverInterface $scopeResolver
+     * @param array $data
+     * @param int $batchSize
+     */
+    public function __construct(
+        IndexStructureInterface $indexStructure,
+        ElasticsearchAdapter $adapter,
+        IndexNameResolver $indexNameResolver,
+        Batch $batch,
+        ScopeResolverInterface $scopeResolver,
+        array $data = [],
+        $batchSize = self::DEFAULT_BATCH_SIZE
+    ) {
+        $this->indexStructure = $indexStructure;
+        $this->adapter = $adapter;
+        $this->indexNameResolver = $indexNameResolver;
+        $this->batch = $batch;
+        $this->data = $data;
+        $this->batchSize = $batchSize;
+        $this->scopeResolver = $scopeResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function saveIndex($dimensions, \Traversable $documents)
+    {
+        $dimension = current($dimensions);
+        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) {
+            $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $scopeId);
+            $this->adapter->addDocs($docs, $scopeId, $this->getIndexerId());
+        }
+        $this->adapter->updateAlias($scopeId, $this->getIndexerId());
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteIndex($dimensions, \Traversable $documents)
+    {
+        $dimension = current($dimensions);
+        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $documentIds = [];
+        foreach ($documents as $document) {
+            $documentIds[$document] = $document;
+        }
+        $this->adapter->deleteDocs($documentIds, $scopeId, $this->getIndexerId());
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function cleanIndex($dimensions)
+    {
+        $this->indexStructure->delete($this->getIndexerId(), $dimensions);
+        $this->indexStructure->create($this->getIndexerId(), [], $dimensions);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isAvailable($dimensions = [])
+    {
+        return $this->adapter->ping();
+    }
+
+    /**
+     * Returns indexer id.
+     *
+     * @return string
+     */
+    private function getIndexerId()
+    {
+        return $this->indexNameResolver->getIndexMapping($this->data['indexer_id']);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php
new file mode 100644
index 0000000000000..f1b153c98b2af
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Indexer\Plugin;
+
+use Magento\Elasticsearch\Model\Config;
+use Magento\Framework\Indexer\Config\DependencyInfoProvider as Provider;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer;
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor as CatalogInventoryStockIndexer;
+
+/**
+ * Plugin for maintenance catalog search index dependency on stock index.
+ * If elasticsearch is used as search engine catalog search index becomes dependent on stock index. Elasticsearch
+ * module declares this dependence. But in case when elasticsearch module is enabled and elasticsearch engine isn`t
+ * used as search engine other search engines don`t need this dependency.
+ * This plugin remove catalog search index dependency on stock index when elasticsearch isn`t used as search engine
+ * except full reindexing. During full reindexing this dependency doesn`t make overhead.
+ */
+class DependencyUpdaterPlugin
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param Config $config
+     */
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Remove index dependency, if it needed, on run reindexing by specifics indexes.
+     *
+     * @param Provider $provider
+     * @param array $dependencies
+     * @param string $indexerId
+     * @return array
+     * @see \Magento\Indexer\Console\Command\IndexerReindexCommand::getIndexers()
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetIndexerIdsToRunBefore(Provider $provider, array $dependencies, string $indexerId): array
+    {
+        if ($this->isFilteringNeeded($indexerId, CatalogSearchFulltextIndexer::INDEXER_ID)) {
+            $dependencies = array_diff($dependencies, [CatalogInventoryStockIndexer::INDEXER_ID]);
+        }
+
+        return $dependencies;
+    }
+
+    /**
+     * Remove index dependency, if it needed, on reindex triggers.
+     *
+     * @param Provider $provider
+     * @param array $dependencies
+     * @param string $indexerId
+     * @return array
+     * @see \Magento\Indexer\Model\Indexer\DependencyDecorator
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetIndexerIdsToRunAfter(Provider $provider, array $dependencies, string $indexerId): array
+    {
+        if ($this->isFilteringNeeded($indexerId, CatalogInventoryStockIndexer::INDEXER_ID)) {
+            $dependencies = array_diff($dependencies, [CatalogSearchFulltextIndexer::INDEXER_ID]);
+        }
+
+        return $dependencies;
+    }
+
+    /**
+     * @param string $currentIndexerId
+     * @param string $targetIndexerId
+     * @return bool
+     */
+    private function isFilteringNeeded(string $currentIndexerId, string $targetIndexerId): bool
+    {
+        return (!$this->config->isElasticsearchEnabled() && $targetIndexerId === $currentIndexerId);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php
new file mode 100644
index 0000000000000..ec18b955a2917
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Indexer\Plugin;
+
+use Magento\Elasticsearch\Model\Config;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+
+/**
+ * Plugin for filtering child products that are out of stock for preventing their saving to catalog search index.
+ */
+class StockedProductsFilterPlugin
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var StockStatusRepositoryInterface
+     */
+    private $stockStatusRepository;
+
+    /**
+     * @var StockStatusCriteriaInterfaceFactory
+     */
+    private $stockStatusCriteriaFactory;
+
+    /**
+     * @param Config $config
+     * @param StockConfigurationInterface $stockConfiguration
+     * @param StockStatusRepositoryInterface $stockStatusRepository
+     * @param StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory
+     */
+    public function __construct(
+        Config $config,
+        StockConfigurationInterface $stockConfiguration,
+        StockStatusRepositoryInterface $stockStatusRepository,
+        StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory
+    ) {
+        $this->config = $config;
+        $this->stockConfiguration = $stockConfiguration;
+        $this->stockStatusRepository = $stockStatusRepository;
+        $this->stockStatusCriteriaFactory = $stockStatusCriteriaFactory;
+    }
+
+    /**
+     * Filter out of stock options for configurable product.
+     *
+     * @param DataProvider $dataProvider
+     * @param array $indexData
+     * @param array $productData
+     * @param int $storeId
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforePrepareProductIndex(
+        DataProvider $dataProvider,
+        array $indexData,
+        array $productData,
+        int $storeId
+    ): array {
+        if ($this->config->isElasticsearchEnabled() && !$this->stockConfiguration->isShowOutOfStock($storeId)) {
+            $productIds = array_keys($indexData);
+            $stockStatusCriteria = $this->stockStatusCriteriaFactory->create();
+            $stockStatusCriteria->setProductsFilter($productIds);
+            $stockStatusCollection = $this->stockStatusRepository->getList($stockStatusCriteria);
+            $stockStatuses = $stockStatusCollection->getItems();
+            $stockStatuses = array_filter($stockStatuses, function (StockStatusInterface $stockStatus) {
+                return StockStatusInterface::STATUS_IN_STOCK == $stockStatus->getStockStatus();
+            });
+            $indexData = array_intersect_key($indexData, $stockStatuses);
+        }
+
+        return [
+            $indexData,
+            $productData,
+            $storeId,
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php
new file mode 100644
index 0000000000000..0f6c674bcda73
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\ResourceModel;
+
+use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+
+/**
+ * Search engine resource model
+ */
+class Engine implements EngineInterface
+{
+    /**
+     * Catalog product visibility
+     *
+     * @var Visibility
+     */
+    protected $catalogProductVisibility;
+
+    /**
+     * @var IndexScopeResolver
+     */
+    private $indexScopeResolver;
+
+    /**
+     * Construct
+     *
+     * @param Visibility $catalogProductVisibility
+     * @param IndexScopeResolver $indexScopeResolver
+     */
+    public function __construct(
+        Visibility $catalogProductVisibility,
+        IndexScopeResolver $indexScopeResolver
+    ) {
+        $this->catalogProductVisibility = $catalogProductVisibility;
+        $this->indexScopeResolver = $indexScopeResolver;
+    }
+
+    /**
+     * Retrieve allowed visibility values for current engine
+     *
+     * @return int[]
+     */
+    public function getAllowedVisibility()
+    {
+        return $this->catalogProductVisibility->getVisibleInSiteIds();
+    }
+
+    /**
+     * Define if current search engine supports advanced index
+     *
+     * @return bool
+     */
+    public function allowAdvancedIndex()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processAttributeValue($attribute, $value)
+    {
+        return $value;
+    }
+
+    /**
+     * Prepare index array as a string glued by separator
+     * Support 2 level array gluing
+     *
+     * @param array $index
+     * @param string $separator
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function prepareEntityIndex($index, $separator = ' ')
+    {
+        return $index;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAvailable()
+    {
+        return true;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php
new file mode 100644
index 0000000000000..d75bb9c8ccd34
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\ResourceModel;
+
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Eav\Model\Config;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+
+/**
+ * Elasticsearch index resource model
+ * @api
+ * @since 100.1.0
+ */
+class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index
+{
+    /**
+     * @var ProductRepositoryInterface
+     * @since 100.1.0
+     */
+    protected $productRepository;
+
+    /**
+     * @var CategoryRepositoryInterface
+     * @since 100.1.0
+     */
+    protected $categoryRepository;
+
+    /**
+     * @var Config
+     * @since 100.1.0
+     */
+    protected $eavConfig;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param StoreManagerInterface $storeManager
+     * @param MetadataPool $metadataPool
+     * @param ProductRepositoryInterface $productRepository
+     * @param CategoryRepositoryInterface $categoryRepository
+     * @param Config $eavConfig
+     * @param null $connectionName
+     * @param TableResolver|null $tableResolver
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
+     * @SuppressWarnings(Magento.TypeDuplication)
+     */
+    public function __construct(
+        Context $context,
+        StoreManagerInterface $storeManager,
+        MetadataPool $metadataPool,
+        ProductRepositoryInterface $productRepository,
+        CategoryRepositoryInterface $categoryRepository,
+        Config $eavConfig,
+        $connectionName = null,
+        TableResolver $tableResolver = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null
+    ) {
+        $this->productRepository = $productRepository;
+        $this->categoryRepository = $categoryRepository;
+        $this->eavConfig = $eavConfig;
+        parent::__construct(
+            $context,
+            $storeManager,
+            $metadataPool,
+            $connectionName,
+            $tableResolver,
+            $dimensionCollectionFactory
+        );
+    }
+
+    /**
+     * Retrieve all attributes for given product ids
+     *
+     * @param int $productId
+     * @param array $indexData
+     * @return array
+     * @since 100.1.0
+     */
+    public function getFullProductIndexData($productId, $indexData)
+    {
+        $productAttributes = [];
+        $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE);
+        $product = $this->productRepository->getById($productId);
+        foreach ($attributeCodes as $attributeCode) {
+            $value = $product->getData($attributeCode);
+            $attribute = $this->eavConfig->getAttribute(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $attributeCode
+            );
+            $frontendInput = $attribute->getFrontendInput();
+            if (in_array($attribute->getAttributeId(), array_keys($indexData))) {
+                if (is_array($indexData[$attribute->getAttributeId()])) {
+                    if (isset($indexData[$attribute->getAttributeId()][$productId])) {
+                        $value = $indexData[$attribute->getAttributeId()][$productId];
+                    } else {
+                        $value = implode(' ', $indexData[$attribute->getAttributeId()]);
+                    }
+                } else {
+                    $value = $indexData[$attribute->getAttributeId()];
+                }
+            }
+            if ($value) {
+                $productAttributes[$attributeCode] = $value;
+                if ($frontendInput == 'select') {
+                    foreach ($attribute->getOptions() as $option) {
+                        if ($option->getValue() == $value) {
+                            $productAttributes[$attributeCode . '_value'] = $option->getLabel();
+                        }
+                    }
+                }
+            }
+        }
+        return $productAttributes;
+    }
+
+    /**
+     * Prepare full category index data for products.
+     *
+     * @param int $storeId
+     * @param null|array $productIds
+     * @return array
+     * @since 100.1.0
+     */
+    public function getFullCategoryProductIndexData($storeId = null, $productIds = null)
+    {
+        $categoryPositions = $this->getCategoryProductIndexData($storeId, $productIds);
+        $categoryData = [];
+
+        foreach ($categoryPositions as $productId => $positions) {
+            foreach ($positions as $categoryId => $position) {
+                $category = $this->categoryRepository->get($categoryId, $storeId);
+                $categoryName = $category->getName();
+                $categoryData[$productId][] = [
+                    'id' => $categoryId,
+                    'name' => $categoryName,
+                    'position' => $position
+                ];
+            }
+        }
+        return $categoryData;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php b/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
new file mode 100644
index 0000000000000..fd2734bb713b3
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Observer;
+
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Checks if a category has changed products and depends on indexer configuration.
+ */
+class CategoryProductIndexer implements ObserverInterface
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Processor
+     */
+    private $processor;
+
+    /**
+     * @param Config $config
+     * @param Processor $processor
+     */
+    public function __construct(Config $config, Processor $processor)
+    {
+        $this->processor = $processor;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(Observer $observer): void
+    {
+        if (!$this->config->isElasticsearchEnabled()) {
+            return;
+        }
+
+        $productIds = $observer->getEvent()->getProductIds();
+        if (!empty($productIds) && $this->processor->isIndexerScheduled()) {
+            $this->processor->markIndexerAsInvalid();
+        }
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/README.md b/app/code/Magento/Elasticsearch/README.md
new file mode 100644
index 0000000000000..280ca29f8337b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/README.md
@@ -0,0 +1,2 @@
+Magento\Elasticsearch module allows to use Elastic search engine for product searching capabilities.
+The module implements Magento\Search library interfaces.
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
new file mode 100644
index 0000000000000..43b2bfe553a98
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Search\AdapterInterface;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\Search\Response\QueryResponse;
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder as AggregationBuilder;
+
+/**
+ * Elasticsearch Search Adapter
+ */
+class Adapter implements AdapterInterface
+{
+    /**
+     * Mapper instance
+     *
+     * @var Mapper
+     */
+    protected $mapper;
+
+    /**
+     * Response Factory
+     *
+     * @var ResponseFactory
+     */
+    protected $responseFactory;
+
+    /**
+     * @var ConnectionManager
+     */
+    protected $connectionManager;
+
+    /**
+     * @var AggregationBuilder
+     */
+    protected $aggregationBuilder;
+
+    /**
+     * @var QueryContainerFactory
+     */
+    private $queryContainerFactory;
+
+    /**
+     * @param ConnectionManager $connectionManager
+     * @param Mapper $mapper
+     * @param ResponseFactory $responseFactory
+     * @param AggregationBuilder $aggregationBuilder
+     * @param QueryContainerFactory $queryContainerFactory
+     */
+    public function __construct(
+        ConnectionManager $connectionManager,
+        Mapper $mapper,
+        ResponseFactory $responseFactory,
+        AggregationBuilder $aggregationBuilder,
+        QueryContainerFactory $queryContainerFactory = null
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->mapper = $mapper;
+        $this->responseFactory = $responseFactory;
+        $this->aggregationBuilder = $aggregationBuilder;
+        $this->queryContainerFactory = $queryContainerFactory
+            ?: ObjectManager::getInstance()->get(QueryContainerFactory::class);
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @return QueryResponse
+     */
+    public function query(RequestInterface $request)
+    {
+        $client = $this->connectionManager->getConnection();
+        $aggregationBuilder = $this->aggregationBuilder;
+
+        $query = $this->mapper->buildQuery($request);
+        $aggregationBuilder->setQuery($this->queryContainerFactory->create(['query' => $query]));
+        $rawResponse = $client->query($query);
+
+        $rawDocuments = isset($rawResponse['hits']['hits']) ? $rawResponse['hits']['hits'] : [];
+
+        $queryResponse = $this->responseFactory->create(
+            [
+                'documents' => $rawDocuments,
+                'aggregations' => $aggregationBuilder->build($request, $rawResponse),
+            ]
+        );
+        return $queryResponse;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder.php
new file mode 100644
index 0000000000000..1e9b60da74a5b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\SearchAdapter\Aggregation;
+
+use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface;
+
+class Builder
+{
+    /**
+     * @var DataProviderInterface[]
+     */
+    protected $dataProviderContainer;
+
+    /**
+     * @var BucketBuilderInterface[]
+     */
+    protected $aggregationContainer;
+
+    /**
+     * @var DataProviderFactory
+     */
+    private $dataProviderFactory;
+
+    /**
+     * @var QueryContainer
+     */
+    private $query = null;
+
+    /**
+     * @param  DataProviderInterface[] $dataProviderContainer
+     * @param  BucketBuilderInterface[] $aggregationContainer
+     * @param DataProviderFactory|null $dataProviderFactory
+     */
+    public function __construct(
+        array $dataProviderContainer,
+        array $aggregationContainer,
+        DataProviderFactory $dataProviderFactory = null
+    ) {
+        $this->dataProviderContainer = array_map(
+            function (DataProviderInterface $dataProvider) {
+                return $dataProvider;
+            },
+            $dataProviderContainer
+        );
+        $this->aggregationContainer = array_map(
+            function (BucketBuilderInterface $bucketBuilder) {
+                return $bucketBuilder;
+            },
+            $aggregationContainer
+        );
+        $this->dataProviderFactory = $dataProviderFactory
+            ?: ObjectManager::getInstance()->get(DataProviderFactory::class);
+    }
+
+    /**
+     * Builds aggregations from the search request.
+     *
+     * This method iterates through buckets and builds all aggregations one by one, passing buckets and relative
+     * data into bucket aggregation builders which are responsible for aggregation calculation.
+     *
+     * @param RequestInterface $request
+     * @param array $queryResult
+     * @return array
+     * @throws \LogicException thrown by DataProviderFactory for validation issues
+     * @see \Magento\Elasticsearch\SearchAdapter\Aggregation\DataProviderFactory
+     */
+    public function build(RequestInterface $request, array $queryResult)
+    {
+        $aggregations = [];
+        $buckets = $request->getAggregation();
+
+        $dataProvider = $this->dataProviderFactory->create(
+            $this->dataProviderContainer[$request->getIndex()],
+            $this->query
+        );
+        foreach ($buckets as $bucket) {
+            $bucketAggregationBuilder = $this->aggregationContainer[$bucket->getType()];
+            $aggregations[$bucket->getName()] = $bucketAggregationBuilder->build(
+                $bucket,
+                $request->getDimensions(),
+                $queryResult,
+                $dataProvider
+            );
+        }
+
+        $this->query = null;
+
+        return $aggregations;
+    }
+
+    /**
+     * Sets the QueryContainer instance to the internal property in order to use it in build process
+     *
+     * @param QueryContainer $query
+     * @return $this
+     */
+    public function setQuery(QueryContainer $query)
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php
new file mode 100644
index 0000000000000..7577114140c7d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Aggregation\Builder;
+
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
+use Magento\Framework\Search\Request\Dimension;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface BucketBuilderInterface
+{
+    /**
+     * @param RequestBucketInterface $bucket
+     * @param Dimension[] $dimensions
+     * @param array $queryResult
+     * @param DataProviderInterface $dataProvider
+     * @return array
+     * @since 100.1.0
+     */
+    public function build(
+        RequestBucketInterface $bucket,
+        array $dimensions,
+        array $queryResult,
+        DataProviderInterface $dataProvider
+    );
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
new file mode 100644
index 0000000000000..1e106023ea00d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Aggregation\Builder;
+
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+use Magento\Framework\Search\Dynamic\Algorithm\Repository;
+use Magento\Framework\Search\Dynamic\EntityStorage;
+use Magento\Framework\Search\Dynamic\EntityStorageFactory;
+use Magento\Framework\Search\Request\Aggregation\DynamicBucket;
+use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
+
+class Dynamic implements BucketBuilderInterface
+{
+    /**
+     * @var Repository
+     */
+    private $algorithmRepository;
+
+    /**
+     * @var EntityStorageFactory
+     */
+    private $entityStorageFactory;
+
+    /**
+     * @param Repository $algorithmRepository
+     * @param EntityStorageFactory $entityStorageFactory
+     */
+    public function __construct(Repository $algorithmRepository, EntityStorageFactory $entityStorageFactory)
+    {
+        $this->algorithmRepository = $algorithmRepository;
+        $this->entityStorageFactory = $entityStorageFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build(
+        RequestBucketInterface $bucket,
+        array $dimensions,
+        array $queryResult,
+        DataProviderInterface $dataProvider
+    ) {
+        /** @var DynamicBucket $bucket */
+        $algorithm = $this->algorithmRepository->get($bucket->getMethod(), ['dataProvider' => $dataProvider]);
+        $data = $algorithm->getItems($bucket, $dimensions, $this->getEntityStorage($queryResult));
+        $resultData = $this->prepareData($data);
+
+        return $resultData;
+    }
+
+    /**
+     * Extract Document ids
+     *
+     * @param array $queryResult
+     * @return EntityStorage
+     */
+    private function getEntityStorage(array $queryResult)
+    {
+        $ids = [];
+        foreach ($queryResult['hits']['hits'] as $document) {
+            $ids[] = $document['_id'];
+        }
+
+        return $this->entityStorageFactory->create($ids);
+    }
+
+    /**
+     * Prepare result data
+     *
+     * @param array $data
+     * @return array
+     */
+    private function prepareData($data)
+    {
+        $resultData = [];
+        foreach ($data as $value) {
+            $from = is_numeric($value['from']) ? $value['from'] : '*';
+            $to = is_numeric($value['to']) ? $value['to'] : '*';
+            unset($value['from'], $value['to']);
+
+            $rangeName = "{$from}_{$to}";
+            $resultData[$rangeName] = array_merge(['value' => $rangeName], $value);
+        }
+
+        return $resultData;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
new file mode 100644
index 0000000000000..bcfb7f5565b86
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Aggregation\Builder;
+
+use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+
+class Term implements BucketBuilderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function build(
+        RequestBucketInterface $bucket,
+        array $dimensions,
+        array $queryResult,
+        DataProviderInterface $dataProvider
+    ) {
+        $values = [];
+        foreach ($queryResult['aggregations'][$bucket->getName()]['buckets'] as $resultBucket) {
+            $values[$resultBucket['key']] = [
+                'value' => $resultBucket['key'],
+                'count' => $resultBucket['doc_count'],
+            ];
+        }
+        return $values;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/DataProviderFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/DataProviderFactory.php
new file mode 100644
index 0000000000000..eca3dcdf86970
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/DataProviderFactory.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\SearchAdapter\Aggregation;
+
+use Magento\Elasticsearch\SearchAdapter\QueryAwareInterface;
+use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+
+/**
+ * It's a factory which allows to override instance of DataProviderInterface
+ * with the instance of the same class but with injected search query.
+ */
+class DataProviderFactory
+{
+    /**
+     * Object Manager
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Recreates an instance of the DataProviderInterface in order to support QueryAware interface
+     * and add a QueryContainer to the DataProvider
+     *
+     * The Query is an optional argument as it's not required to pass the QueryContainer for data providers
+     * who not implementing QueryAwareInterface, but the method is also responsible for checking
+     * if the query is passed for those who expects it.
+     *
+     * IMPORTANT: This code will not work correctly with virtual types,
+     * so please avoid usage of virtual types and QueryAwareInterface for the same object.
+     *
+     * This happens as virtual type ain't create its own class,
+     * and therefore get_class will return a name of the original class
+     * which will be recreated with its default configuration.
+     *
+     * @param DataProviderInterface $dataProvider
+     * @param QueryContainer $query
+     * @return DataProviderInterface
+     * @throws \LogicException when the query is missing but it required according to the QueryAwareInterface
+     */
+    public function create(DataProviderInterface $dataProvider, QueryContainer $query = null)
+    {
+        $result = $dataProvider;
+        if ($dataProvider instanceof QueryAwareInterface) {
+            if (null === $query) {
+                throw new \LogicException(
+                    'Instance of ' . QueryAwareInterface::class . ' must be configured with a search query,'
+                    . ' but the query is empty'
+                );
+            }
+
+            $className = get_class($dataProvider);
+            $result = $this->objectManager->create($className, ['queryContainer' => $query]);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Interval.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Interval.php
new file mode 100644
index 0000000000000..33ab1a4071560
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Interval.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Aggregation;
+
+use Magento\Framework\Search\Dynamic\IntervalInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+
+class Interval implements IntervalInterface
+{
+    /**
+     * Minimal possible value
+     */
+    const DELTA = 0.005;
+
+    /**
+     * @var ConnectionManager
+     */
+    protected $connectionManager;
+
+    /**
+     * @var FieldMapperInterface
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var Config
+     */
+    protected $clientConfig;
+
+    /**
+     * @var string
+     */
+    private $fieldName;
+
+    /**
+     * @var string
+     */
+    private $storeId;
+
+    /**
+     * @var array
+     */
+    private $entityIds;
+
+    /**
+     * @var SearchIndexNameResolver
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * @param ConnectionManager $connectionManager
+     * @param FieldMapperInterface $fieldMapper
+     * @param Config $clientConfig
+     * @param SearchIndexNameResolver $searchIndexNameResolver
+     * @param string $fieldName
+     * @param string $storeId
+     * @param array $entityIds
+     */
+    public function __construct(
+        ConnectionManager $connectionManager,
+        FieldMapperInterface $fieldMapper,
+        Config $clientConfig,
+        SearchIndexNameResolver $searchIndexNameResolver,
+        $fieldName,
+        $storeId,
+        $entityIds
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->fieldMapper = $fieldMapper;
+        $this->clientConfig = $clientConfig;
+        $this->fieldName = $fieldName;
+        $this->storeId = $storeId;
+        $this->entityIds = $entityIds;
+        $this->searchIndexNameResolver = $searchIndexNameResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($limit, $offset = null, $lower = null, $upper = null)
+    {
+        $from = $to = [];
+        if ($lower) {
+            $from = ['gte' => $lower - self::DELTA];
+        }
+        if ($upper) {
+            $to = ['lt' => $upper - self::DELTA];
+        }
+
+        $requestQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'fields' => [
+                    '_id',
+                    $this->fieldName,
+                ],
+                'query' => [
+                    'filtered' => [
+                        'query' => [
+                            'match_all' => [],
+                        ],
+                        'filter' => [
+                            'bool' => [
+                                'must' => [
+                                    [
+                                        'terms' => [
+                                            '_id' => $this->entityIds,
+                                        ],
+                                    ],
+                                    [
+                                        'range' => [
+                                            $this->fieldName => array_merge($from, $to),
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'sort' => [
+                    $this->fieldName,
+                ],
+                'size' => $limit,
+            ],
+        ];
+        if ($offset) {
+            $requestQuery['body']['from'] = $offset;
+        }
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($requestQuery);
+
+        return $this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadPrevious($data, $index, $lower = null)
+    {
+        if ($lower) {
+            $from = ['gte' => $lower - self::DELTA];
+        }
+        if ($data) {
+            $to = ['lt' => $data - self::DELTA];
+        }
+
+        $requestQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID),
+            'type' => $this->clientConfig->getEntityType(),
+            'search_type' => 'count',
+            'body' => [
+                'fields' => [
+                    '_id'
+                ],
+                'query' => [
+                    'filtered' => [
+                        'query' => [
+                            'match_all' => [],
+                        ],
+                        'filter' => [
+                            'bool' => [
+                                'must' => [
+                                    [
+                                        'terms' => [
+                                            '_id' => $this->entityIds,
+                                        ],
+                                    ],
+                                    [
+                                        'range' => [
+                                            $this->fieldName => array_merge($from, $to),
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'sort' => [
+                    $this->fieldName,
+                ],
+            ],
+        ];
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($requestQuery);
+
+        $offset = $queryResult['hits']['total'];
+        if (!$offset) {
+            return false;
+        }
+
+        return $this->load($index - $offset + 1, $offset - 1, $lower);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadNext($data, $rightIndex, $upper = null)
+    {
+        $from = ['gt' => $data + self::DELTA];
+        $to = ['lt' => $data - self::DELTA];
+
+        $requestCountQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID),
+            'type' => $this->clientConfig->getEntityType(),
+            'search_type' => 'count',
+            'body' => [
+                'fields' => [
+                    '_id'
+                ],
+                'query' => [
+                    'filtered' => [
+                        'query' => [
+                            'match_all' => [],
+                        ],
+                        'filter' => [
+                            'bool' => [
+                                'must' => [
+                                    [
+                                        'terms' => [
+                                            '_id' => $this->entityIds,
+                                        ],
+                                    ],
+                                    [
+                                        'range' => [
+                                            $this->fieldName => array_merge($from, $to),
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'sort' => [
+                    $this->fieldName,
+                ],
+            ],
+        ];
+        $queryCountResult = $this->connectionManager->getConnection()
+            ->query($requestCountQuery);
+
+        $offset = $queryCountResult['hits']['total'];
+        if (!$offset) {
+            return false;
+        }
+
+        $from = ['gte' => $data - self::DELTA];
+        if ($upper !== null) {
+            $to = ['lt' => $data - self::DELTA];
+        }
+
+        $requestQuery = $requestCountQuery;
+        $requestCountQuery['body']['query']['filtered']['filter']['bool']['must']['range'] =
+            [$this->fieldName => array_merge($from, $to)];
+
+        $requestCountQuery['body']['from'] = $offset - 1;
+        $requestCountQuery['body']['size'] = $rightIndex - $offset + 1;
+
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($requestQuery);
+
+        return array_reverse($this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName));
+    }
+
+    /**
+     * @param array $hits
+     * @param string $fieldName
+     *
+     * @return float[]
+     */
+    private function arrayValuesToFloat($hits, $fieldName)
+    {
+        $returnPrices = [];
+        foreach ($hits as $hit) {
+            $returnPrices[] = (float) $hit['fields'][$fieldName][0];
+        }
+
+        return $returnPrices;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/AggregationFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/AggregationFactory.php
new file mode 100644
index 0000000000000..f46e72223bfec
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/AggregationFactory.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Aggregation Factory
+ * @api
+ * @since 100.1.0
+ */
+class AggregationFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     * @since 100.1.0
+     */
+    protected $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create Aggregation instance
+     *
+     * @param array $rawAggregation
+     * @return \Magento\Framework\Search\Response\Aggregation
+     * @since 100.1.0
+     */
+    public function create(array $rawAggregation)
+    {
+        $buckets = [];
+        foreach ($rawAggregation as $rawBucketName => $rawBucket) {
+            /** @var \Magento\Framework\Search\Response\Bucket[] $buckets */
+            $buckets[$rawBucketName] = $this->objectManager->create(
+                \Magento\Framework\Search\Response\Bucket::class,
+                [
+                    'name' => $rawBucketName,
+                    'values' => $this->prepareValues($rawBucket)
+                ]
+            );
+        }
+        return $this->objectManager->create(
+            \Magento\Framework\Search\Response\Aggregation::class,
+            ['buckets' => $buckets]
+        );
+    }
+
+    /**
+     * Prepare values list
+     *
+     * @param array $values
+     * @return \Magento\Framework\Search\Response\Aggregation\Value[]
+     */
+    private function prepareValues(array $values)
+    {
+        $valuesObjects = [];
+        foreach ($values as $name => $value) {
+            $valuesObjects[] = $this->objectManager->create(
+                \Magento\Framework\Search\Response\Aggregation\Value::class,
+                [
+                    'value' => $name,
+                    'metrics' => $value,
+                ]
+            );
+        }
+        return $valuesObjects;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/ConnectionManager.php b/app/code/Magento/Elasticsearch/SearchAdapter/ConnectionManager.php
new file mode 100644
index 0000000000000..77c42077323d4
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/ConnectionManager.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface;
+use Magento\Elasticsearch\Model\Client\Elasticsearch;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class ConnectionManager
+{
+    /**
+     * @var Elasticsearch
+     * @since 100.1.0
+     */
+    protected $client;
+
+    /**
+     * @var LoggerInterface
+     * @since 100.1.0
+     */
+    protected $logger;
+
+    /**
+     * @var ClientFactoryInterface
+     * @since 100.1.0
+     */
+    protected $clientFactory;
+
+    /**
+     * @var ClientOptionsInterface
+     * @since 100.1.0
+     */
+    protected $clientConfig;
+
+    /**
+     * @param ClientFactoryInterface $clientFactory
+     * @param ClientOptionsInterface $clientConfig
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ClientFactoryInterface $clientFactory,
+        ClientOptionsInterface $clientConfig,
+        LoggerInterface $logger
+    ) {
+        $this->logger = $logger;
+        $this->clientFactory = $clientFactory;
+        $this->clientConfig = $clientConfig;
+    }
+
+    /**
+     * Get shared connection
+     *
+     * @param array $options
+     * @throws \RuntimeException
+     * @return Elasticsearch
+     * @since 100.1.0
+     */
+    public function getConnection($options = [])
+    {
+        if (!$this->client) {
+            $this->connect($options);
+        }
+
+        return $this->client;
+    }
+
+    /**
+     * Connect to Elasticsearch client with default options
+     *
+     * @param array $options
+     * @throws \RuntimeException
+     * @return void
+     */
+    private function connect($options)
+    {
+        try {
+            $this->client = $this->clientFactory->create($this->clientConfig->prepareClientOptions($options));
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            throw new \RuntimeException('Elasticsearch client is not set.');
+        }
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/DocumentFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/DocumentFactory.php
new file mode 100644
index 0000000000000..83652e08d4246
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/DocumentFactory.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EntityMetadata;
+use Magento\Framework\Api\AttributeInterface;
+use Magento\Framework\Api\AttributeValue;
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Framework\Api\Search\Document;
+use Magento\Framework\Api\Search\DocumentInterface;
+
+/**
+ * Document Factory
+ * @api
+ * @since 100.1.0
+ */
+class DocumentFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     * @deprecated 100.1.0
+     * @since 100.1.0
+     */
+    protected $objectManager;
+
+    /**
+     * @var EntityMetadata
+     */
+    private $entityMetadata;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param EntityMetadata $entityMetadata
+     */
+    public function __construct(ObjectManagerInterface $objectManager, EntityMetadata $entityMetadata)
+    {
+        $this->objectManager = $objectManager;
+        $this->entityMetadata = $entityMetadata;
+    }
+
+    /**
+     * Create Search Document instance
+     *
+     * @param array $rawDocument
+     * @return Document
+     * @since 100.1.0
+     */
+    public function create($rawDocument)
+    {
+        /** @var AttributeValue[] $fields */
+        $attributes = [];
+        $documentId = null;
+        $entityId = $this->entityMetadata->getEntityId();
+        foreach ($rawDocument as $fieldName => $value) {
+            if ($fieldName === $entityId) {
+                $documentId = $value;
+            } elseif ($fieldName === '_score') {
+                $attributes['score'] = new AttributeValue(
+                    [
+                        AttributeInterface::ATTRIBUTE_CODE => $fieldName,
+                        AttributeInterface::VALUE => $value,
+                    ]
+                );
+            }
+        }
+
+        return new Document(
+            [
+                DocumentInterface::ID => $documentId,
+                CustomAttributesDataInterface::CUSTOM_ATTRIBUTES => $attributes,
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
new file mode 100644
index 0000000000000..cfdab2463311e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Dynamic;
+
+use Magento\Elasticsearch\SearchAdapter\QueryAwareInterface;
+use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+
+/**
+ * Elastic search data provider
+ *
+ * @api
+ * @since 100.1.0
+ */
+class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInterface, QueryAwareInterface
+{
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager
+     * @since 100.1.0
+     */
+    protected $connectionManager;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface
+     * @since 100.1.0
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Catalog\Model\Layer\Filter\Price\Range
+     * @since 100.1.0
+     */
+    protected $range;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\IntervalFactory
+     * @since 100.1.0
+     */
+    protected $intervalFactory;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Config
+     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
+     * and should only modify existing query
+     * @since 100.1.0
+     */
+    protected $clientConfig;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
+     * and should only modify existing query
+     * @since 100.1.0
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver
+     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
+     * and should only modify existing query
+     * @since 100.1.0
+     */
+    protected $searchIndexNameResolver;
+
+    /**
+     * @var string
+     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
+     * and should only modify existing query
+     * @since 100.1.0
+     */
+    protected $indexerId;
+
+    /**
+     * @var \Magento\Framework\App\ScopeResolverInterface
+     * @since 100.1.0
+     */
+    protected $scopeResolver;
+
+    /**
+     * @var QueryContainer
+     */
+    private $queryContainer;
+
+    /**
+     * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager
+     * @param \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface $fieldMapper
+     * @param \Magento\Catalog\Model\Layer\Filter\Price\Range $range
+     * @param \Magento\Framework\Search\Dynamic\IntervalFactory $intervalFactory
+     * @param \Magento\Elasticsearch\Model\Config $clientConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver
+     * @param string $indexerId
+     * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
+     * @param QueryContainer|null $queryContainer
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager,
+        \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface $fieldMapper,
+        \Magento\Catalog\Model\Layer\Filter\Price\Range $range,
+        \Magento\Framework\Search\Dynamic\IntervalFactory $intervalFactory,
+        \Magento\Elasticsearch\Model\Config $clientConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver,
+        $indexerId,
+        \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
+        QueryContainer $queryContainer = null
+    ) {
+        $this->connectionManager = $connectionManager;
+        $this->fieldMapper = $fieldMapper;
+        $this->range = $range;
+        $this->intervalFactory = $intervalFactory;
+        $this->clientConfig = $clientConfig;
+        $this->storeManager = $storeManager;
+        $this->searchIndexNameResolver = $searchIndexNameResolver;
+        $this->indexerId = $indexerId;
+        $this->scopeResolver = $scopeResolver;
+        $this->queryContainer = $queryContainer;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.1.0
+     */
+    public function getRange()
+    {
+        return $this->range->getPriceRange();
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.1.0
+     */
+    public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage $entityStorage)
+    {
+        $aggregations = [
+            'count' => 0,
+            'max' => 0,
+            'min' => 0,
+            'std' => 0,
+        ];
+
+        $query = $this->getBasicSearchQuery($entityStorage);
+
+        $fieldName = $this->fieldMapper->getFieldName('price');
+        $query['body']['aggregations'] = [
+            'prices' => [
+                'extended_stats' => [
+                    'field' => $fieldName,
+                ],
+            ],
+        ];
+
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($query);
+
+        if (isset($queryResult['aggregations']['prices'])) {
+            $aggregations = [
+                'count' => $queryResult['aggregations']['prices']['count'],
+                'max' => $queryResult['aggregations']['prices']['max'],
+                'min' => $queryResult['aggregations']['prices']['min'],
+                'std' => $queryResult['aggregations']['prices']['std_deviation'],
+            ];
+        }
+
+        return $aggregations;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.1.0
+     */
+    public function getInterval(
+        \Magento\Framework\Search\Request\BucketInterface $bucket,
+        array $dimensions,
+        \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage
+    ) {
+        $entityIds = $entityStorage->getSource();
+        $fieldName = $this->fieldMapper->getFieldName('price');
+        $dimension = current($dimensions);
+        $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+
+        return $this->intervalFactory->create(
+            [
+                'entityIds' => $entityIds,
+                'storeId' => $storeId,
+                'fieldName' => $fieldName,
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.1.0
+     */
+    public function getAggregation(
+        \Magento\Framework\Search\Request\BucketInterface $bucket,
+        array $dimensions,
+        $range,
+        \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage
+    ) {
+        $result = [];
+
+        $query = $this->getBasicSearchQuery($entityStorage);
+
+        $fieldName = $this->fieldMapper->getFieldName($bucket->getField());
+        $query['body']['aggregations'] = [
+            'prices' => [
+                'histogram' => [
+                    'field' => $fieldName,
+                    'interval' => (float)$range,
+                ],
+            ],
+        ];
+
+        $queryResult = $this->connectionManager->getConnection()
+            ->query($query);
+        foreach ($queryResult['aggregations']['prices']['buckets'] as $bucket) {
+            $key = (int)($bucket['key'] / $range + 1);
+            $result[$key] = $bucket['doc_count'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.1.0
+     */
+    public function prepareData($range, array $dbRanges)
+    {
+        $data = [];
+        if (!empty($dbRanges)) {
+            $lastIndex = array_keys($dbRanges);
+            $lastIndex = $lastIndex[count($lastIndex) - 1];
+            foreach ($dbRanges as $index => $count) {
+                $fromPrice = $index == 1 ? '' : ($index - 1) * $range;
+                $toPrice = $index == $lastIndex ? '' : $index * $range;
+                $data[] = [
+                    'from' => $fromPrice,
+                    'to' => $toPrice,
+                    'count' => $count,
+                ];
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Returns a basic search query which can be used for aggregations calculation
+     *
+     * The query may be requested from a query container if it has been set
+     * or may be build by entity storage and dimensions.
+     *
+     * Building a query by entity storage is actually deprecated as the query
+     * built in this way may cause ElasticSearch's TooManyClauses exception.
+     *
+     * The code which is responsible for building query in-place should be removed someday,
+     * but for now it's a question of backward compatibility as this class may be used somewhere else
+     * by extension developers and we can't guarantee that they'll pass a query into constructor.
+     *
+     * @param \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage
+     * @param array $dimensions
+     * @return array
+     */
+    private function getBasicSearchQuery(
+        \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage,
+        array $dimensions = []
+    ) {
+        if (null !== $this->queryContainer) {
+            return $this->queryContainer->getQuery();
+        }
+
+        $entityIds = $entityStorage->getSource();
+
+        $dimension = current($dimensions);
+        $storeId = false !== $dimension
+            ? $this->scopeResolver->getScope($dimension->getValue())->getId()
+            : $this->storeManager->getStore()->getId();
+
+        $query = [
+            'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'fields' => [
+                    '_id',
+                    '_score',
+                ],
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            [
+                                'terms' => [
+                                    '_id' => $entityIds,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        return $query;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder.php
new file mode 100644
index 0000000000000..8efc342d26452
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Filter;
+
+use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
+use Magento\Framework\Search\Request\Query\BoolExpression;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\FilterInterface;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard;
+
+class Builder implements BuilderInterface
+{
+    /**
+     * Text flag for Elasticsearch filter query condition types
+     *
+     * @deprecated
+     * @see BuilderInterface::FILTER_QUERY_CONDITION_MUST
+     */
+    const QUERY_CONDITION_MUST = 'must';
+
+    /**
+     * @deprecated
+     * @see BuilderInterface::FILTER_QUERY_CONDITION_SHOULD
+     */
+    const QUERY_CONDITION_SHOULD = 'should';
+
+    /**
+     * @deprecated
+     * @see BuilderInterface::FILTER_QUERY_CONDITION_MUST_NOT
+     */
+    const QUERY_CONDITION_MUST_NOT = 'must_not';
+
+    /**
+     * @var FilterInterface[]
+     */
+    protected $filters;
+
+    /**
+     * @param Range $range
+     * @param Term $term
+     * @param Wildcard $wildcard
+     */
+    public function __construct(
+        Range $range,
+        Term $term,
+        Wildcard $wildcard
+    ) {
+        $this->filters = [
+            RequestFilterInterface::TYPE_RANGE => $range,
+            RequestFilterInterface::TYPE_TERM => $term,
+            RequestFilterInterface::TYPE_WILDCARD => $wildcard,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build(RequestFilterInterface $filter, $conditionType)
+    {
+        return $this->processFilter($filter, $conditionType);
+    }
+
+    /**
+     * @param RequestFilterInterface $filter
+     * @param string $conditionType
+     * @return array
+     */
+    protected function processFilter(RequestFilterInterface $filter, $conditionType)
+    {
+        if (RequestFilterInterface::TYPE_BOOL == $filter->getType()) {
+            $query = $this->processBoolFilter($filter, $this->isNegation($conditionType));
+        } else {
+            if (!array_key_exists($filter->getType(), $this->filters)) {
+                throw new \InvalidArgumentException('Unknown filter type ' . $filter->getType());
+            }
+            $query = [
+                'bool' => [
+                    $conditionType => $this->filters[$filter->getType()]->buildFilter($filter),
+                ]
+            ];
+        }
+
+        return $query;
+    }
+
+    /**
+     * @param RequestFilterInterface|BoolExpression $filter
+     * @param bool $isNegation
+     * @return array
+     */
+    protected function processBoolFilter(RequestFilterInterface $filter, $isNegation)
+    {
+        $must = $this->buildFilters(
+            $filter->getMust(),
+            $this->mapConditionType(self::QUERY_CONDITION_MUST, $isNegation)
+        );
+        $should = $this->buildFilters($filter->getShould(), self::QUERY_CONDITION_SHOULD);
+        $mustNot = $this->buildFilters(
+            $filter->getMustNot(),
+            $this->mapConditionType(self::QUERY_CONDITION_MUST_NOT, $isNegation)
+        );
+
+        $queries = [
+            'bool' => array_merge(
+                isset($must['bool']) ? $must['bool'] : [],
+                isset($should['bool']) ? $should['bool'] : [],
+                isset($mustNot['bool']) ? $mustNot['bool'] : []
+            ),
+        ];
+
+        return $queries;
+    }
+
+    /**
+     * @param RequestFilterInterface[] $filters
+     * @param string $conditionType
+     * @return string
+     */
+    private function buildFilters(array $filters, $conditionType)
+    {
+        $queries = [];
+        foreach ($filters as $filter) {
+            $filterQuery = $this->processFilter($filter, $conditionType);
+            if (isset($filterQuery['bool'][$conditionType])) {
+                $queries['bool'][$conditionType] = array_merge(
+                    isset($queries['bool'][$conditionType]) ? $queries['bool'][$conditionType] : [],
+                    $filterQuery['bool'][$conditionType]
+                );
+            }
+        }
+        return $queries;
+    }
+
+    /**
+     * @param string $conditionType
+     * @return bool
+     */
+    protected function isNegation($conditionType)
+    {
+        return self::QUERY_CONDITION_MUST_NOT === $conditionType;
+    }
+
+    /**
+     * @param string $conditionType
+     * @param bool $isNegation
+     * @return string
+     */
+    private function mapConditionType($conditionType, $isNegation)
+    {
+        if ($isNegation) {
+            if ($conditionType == self::QUERY_CONDITION_MUST) {
+                $conditionType = self::QUERY_CONDITION_MUST_NOT;
+            } elseif ($conditionType == self::QUERY_CONDITION_MUST_NOT) {
+                $conditionType = self::QUERY_CONDITION_MUST;
+            }
+        }
+        return $conditionType;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/FilterInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/FilterInterface.php
new file mode 100644
index 0000000000000..095d65f7aef2c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/FilterInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Filter\Builder;
+
+use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface FilterInterface
+{
+    /**
+     * @param RequestFilterInterface $filter
+     * @return array
+     * @since 100.1.0
+     */
+    public function buildFilter(RequestFilterInterface $filter);
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Range.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Range.php
new file mode 100644
index 0000000000000..a2cab32ea4e69
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Range.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Filter\Builder;
+
+use Magento\Framework\Search\Request\Filter\Range as RangeFilterRequest;
+use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+
+class Range implements FilterInterface
+{
+    /**
+     * @var FieldMapperInterface
+     */
+    protected $fieldMapper;
+
+    /**
+     * @param FieldMapperInterface $fieldMapper
+     */
+    public function __construct(
+        FieldMapperInterface $fieldMapper
+    ) {
+        $this->fieldMapper = $fieldMapper;
+    }
+
+    /**
+     * @param RequestFilterInterface|RangeFilterRequest $filter
+     * @return array
+     */
+    public function buildFilter(RequestFilterInterface $filter)
+    {
+        $filterQuery = [];
+        $fieldName = $this->fieldMapper->getFieldName($filter->getField());
+        if ($filter->getFrom()) {
+            $filterQuery['range'][$fieldName]['gte'] = $filter->getFrom();
+        }
+        if ($filter->getTo()) {
+            $filterQuery['range'][$fieldName]['lte'] = $filter->getTo();
+        }
+        return [$filterQuery];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php
new file mode 100644
index 0000000000000..ed8cd049d2915
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Filter\Builder;
+
+use Magento\Framework\Search\Request\Filter\Term as TermFilterRequest;
+use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+
+class Term implements FilterInterface
+{
+    /**
+     * @var FieldMapperInterface
+     */
+    protected $fieldMapper;
+
+    /**
+     * @param FieldMapperInterface $fieldMapper
+     */
+    public function __construct(FieldMapperInterface $fieldMapper)
+    {
+        $this->fieldMapper = $fieldMapper;
+    }
+
+    /**
+     * @param RequestFilterInterface|TermFilterRequest $filter
+     * @return array
+     */
+    public function buildFilter(RequestFilterInterface $filter)
+    {
+        $filterQuery = [];
+        if ($filter->getValue()) {
+            $operator = is_array($filter->getValue()) ? 'terms' : 'term';
+            $filterQuery []= [
+                $operator => [
+                    $this->fieldMapper->getFieldName($filter->getField()) => $filter->getValue(),
+                ],
+            ];
+        }
+        return $filterQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Wildcard.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Wildcard.php
new file mode 100644
index 0000000000000..14237152244fa
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Wildcard.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Filter\Builder;
+
+use Magento\Framework\Search\Request\Filter\Wildcard as WildcardFilterRequest;
+use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+
+class Wildcard implements FilterInterface
+{
+    /**
+     * @var FieldMapperInterface
+     */
+    protected $fieldMapper;
+
+    /**
+     * @param FieldMapperInterface $fieldMapper
+     */
+    public function __construct(FieldMapperInterface $fieldMapper)
+    {
+        $this->fieldMapper = $fieldMapper;
+    }
+
+    /**
+     * @param RequestFilterInterface|WildcardFilterRequest $filter
+     * @return array
+     */
+    public function buildFilter(RequestFilterInterface $filter)
+    {
+        $fieldName = $this->fieldMapper->getFieldName($filter->getField());
+        return [
+            [
+                'wildcard' => [
+                    $fieldName => '*' . $filter->getValue() . '*',
+                ],
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/BuilderInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/BuilderInterface.php
new file mode 100644
index 0000000000000..b4885a8f8a2f4
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/BuilderInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Filter;
+
+use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface BuilderInterface
+{
+    const FILTER_QUERY_CONDITION_MUST = 'must';
+
+    const FILTER_QUERY_CONDITION_SHOULD = 'should';
+
+    const FILTER_QUERY_CONDITION_MUST_NOT = 'must_not';
+
+    /**
+     * @param RequestFilterInterface $filter
+     * @param string $conditionType
+     * @return string
+     * @since 100.1.0
+     */
+    public function build(RequestFilterInterface $filter, $conditionType);
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php b/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php
new file mode 100644
index 0000000000000..fd6ae3424b9da
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
+use Magento\Framework\Search\Request\Query\BoolExpression as BoolQuery;
+use Magento\Framework\Search\Request\Query\Filter as FilterQuery;
+use Magento\Framework\Search\Request\Query\Match as MatchQuery;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder as QueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder;
+use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Mapper as Elasticsearch5Mapper;
+
+/**
+ * Mapper class
+ * @api
+ * @since 100.1.0
+ */
+class Mapper extends Elasticsearch5Mapper
+{
+    /**
+     * @param QueryBuilder $queryBuilder
+     * @param MatchQueryBuilder $matchQueryBuilder
+     * @param FilterBuilder $filterBuilder
+     */
+    public function __construct(
+        QueryBuilder $queryBuilder,
+        MatchQueryBuilder $matchQueryBuilder,
+        FilterBuilder $filterBuilder
+    ) {
+        $this->queryBuilder = $queryBuilder;
+        $this->matchQueryBuilder = $matchQueryBuilder;
+        $this->filterBuilder = $filterBuilder;
+    }
+
+    /**
+     * Build adapter dependent query
+     *
+     * @param RequestInterface $request
+     * @return array
+     * @since 100.1.0
+     */
+    public function buildQuery(RequestInterface $request)
+    {
+        $searchQuery = $this->queryBuilder->initQuery($request);
+        $searchQuery['body']['query'] = array_merge(
+            $searchQuery['body']['query'],
+            $this->processQuery(
+                $request->getQuery(),
+                [],
+                BoolQuery::QUERY_CONDITION_MUST
+            )
+        );
+
+        $searchQuery['body']['query']['bool']['minimum_should_match'] = 1;
+
+        $searchQuery = $this->queryBuilder->initAggregations($request, $searchQuery);
+        return $searchQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
new file mode 100644
index 0000000000000..cf75366b9b25e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Query;
+
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as Elasticsearch5Builder;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class Builder extends Elasticsearch5Builder
+{
+
+    /**
+     * Set initial settings for query
+     *
+     * @param RequestInterface $request
+     * @return array
+     * @since 100.1.0
+     */
+    public function initQuery(RequestInterface $request)
+    {
+        $dimension = current($request->getDimensions());
+        $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $searchQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'from' => $request->getFrom(),
+                'size' => $request->getSize(),
+                'fields' => ['_id', '_score'],
+                'query' => [],
+            ],
+        ];
+        return $searchQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Aggregation.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Aggregation.php
new file mode 100644
index 0000000000000..7ba2ef47c77d8
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Aggregation.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
+
+use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class Aggregation
+{
+    /**
+     * Max number of results returned per single term bucket, i.e. limit of options for layered navigation filter.
+     * Default ElasticSearch limit is 10
+     *
+     * @var int
+     */
+    private static $maxTermBacketSize = 500;
+
+    /**
+     * @var FieldMapperInterface
+     * @since 100.1.0
+     */
+    protected $fieldMapper;
+
+    /**
+     * @param FieldMapperInterface $fieldMapper
+     */
+    public function __construct(
+        FieldMapperInterface $fieldMapper
+    ) {
+        $this->fieldMapper = $fieldMapper;
+    }
+
+    /**
+     * Build aggregation query for request
+     *
+     * @param RequestInterface $request
+     * @param array $searchQuery
+     * @return array
+     * @since 100.1.0
+     */
+    public function build(
+        RequestInterface $request,
+        array $searchQuery
+    ) {
+        $buckets = $request->getAggregation();
+        foreach ($buckets as $bucket) {
+            $searchQuery = $this->buildBucket($searchQuery, $bucket);
+        }
+        return $searchQuery;
+    }
+
+    /**
+     * Build aggregation query for bucket
+     *
+     * @param array $searchQuery
+     * @param BucketInterface $bucket
+     * @return array
+     * @since 100.1.0
+     */
+    protected function buildBucket(
+        array $searchQuery,
+        BucketInterface $bucket
+    ) {
+        $field = $this->fieldMapper->getFieldName($bucket->getField());
+        switch ($bucket->getType()) {
+            case BucketInterface::TYPE_TERM:
+                $searchQuery['body']['aggregations'][$bucket->getName()]= [
+                    'terms' => [
+                        'field' => $field,
+                        'size' => self::$maxTermBacketSize,
+                    ],
+                ];
+                break;
+            case BucketInterface::TYPE_DYNAMIC:
+                $searchQuery['body']['aggregations'][$bucket->getName()]= [
+                    'extended_stats' => [
+                        'field' => $field,
+                    ],
+                ];
+                break;
+        }
+        return $searchQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
new file mode 100644
index 0000000000000..f1c3451482bab
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
+
+use Magento\Framework\Search\Request\Query\BoolExpression;
+use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+
+class Match implements QueryInterface
+{
+    /**
+     * Elasticsearch condition for case when query must not appear in the matching documents.
+     */
+    const QUERY_CONDITION_MUST_NOT = 'must_not';
+
+    /**
+     * @var FieldMapperInterface
+     */
+    private $fieldMapper;
+
+    /**
+     * @var PreprocessorInterface[]
+     */
+    protected $preprocessorContainer;
+
+    /**
+     * @param FieldMapperInterface $fieldMapper
+     * @param PreprocessorInterface[] $preprocessorContainer
+     */
+    public function __construct(
+        FieldMapperInterface $fieldMapper,
+        array $preprocessorContainer
+    ) {
+        $this->fieldMapper = $fieldMapper;
+        $this->preprocessorContainer = $preprocessorContainer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build(array $selectQuery, RequestQueryInterface $requestQuery, $conditionType)
+    {
+        $queryValue = $this->prepareQuery($requestQuery->getValue(), $conditionType);
+        $queries = $this->buildQueries($requestQuery->getMatches(), $queryValue);
+        $requestQueryBoost = $requestQuery->getBoost() ?: 1;
+        foreach ($queries as $query) {
+            $queryBody = $query['body'];
+            $matchKey = isset($queryBody['match_phrase']) ? 'match_phrase' : 'match';
+            foreach ($queryBody[$matchKey] as $field => $matchQuery) {
+                $matchQuery['boost'] = $requestQueryBoost + $matchQuery['boost'];
+                $queryBody[$matchKey][$field] = $matchQuery;
+            }
+            $selectQuery['bool'][$query['condition']][] = $queryBody;
+        }
+
+        return $selectQuery;
+    }
+
+    /**
+     * @param string $queryValue
+     * @param string $conditionType
+     * @return array
+     */
+    protected function prepareQuery($queryValue, $conditionType)
+    {
+        $queryValue = $this->escape($queryValue);
+        foreach ($this->preprocessorContainer as $preprocessor) {
+            $queryValue = $preprocessor->process($queryValue);
+        }
+        $condition = $conditionType === BoolExpression::QUERY_CONDITION_NOT ?
+            self::QUERY_CONDITION_MUST_NOT : $conditionType;
+        return [
+            'condition' => $condition,
+            'value' => $queryValue,
+        ];
+    }
+
+    /**
+     * Creates valid ElasticSearch search conditions from Match queries.
+     *
+     * The purpose of this method is to create a structure which represents valid search query
+     * for a full-text search.
+     * It sets search query condition, the search query itself, and sets the search query boost.
+     *
+     * The search query boost is an optional in the search query and therefore it will be set to 1 by default
+     * if none passed with a match query.
+     *
+     * @param array $matches
+     * @param array $queryValue
+     * @return array
+     */
+    protected function buildQueries(array $matches, array $queryValue)
+    {
+        $conditions = [];
+
+        // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found
+        $count = 0;
+        $value = preg_replace('#^\\\\"(.*)\\\\"$#m', '$1', $queryValue['value'], -1, $count);
+        $condition = ($count) ? 'match_phrase' : 'match';
+
+        foreach ($matches as $match) {
+            $resolvedField = $this->fieldMapper->getFieldName(
+                $match['field'],
+                ['type' => FieldMapperInterface::TYPE_QUERY]
+            );
+            $conditions[] = [
+                'condition' => $queryValue['condition'],
+                'body' => [
+                    $condition => [
+                        $resolvedField => [
+                            'query' => $value,
+                            'boost' => isset($match['boost']) ? $match['boost'] : 1,
+                        ],
+                    ],
+                ],
+            ];
+        }
+
+        return $conditions;
+    }
+
+    /**
+     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
+     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
+     *
+     * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
+     *
+     * @param string $value
+     * @return string
+     */
+    protected function escape($value)
+    {
+        $value = preg_replace('/@+|[@+-]+$/', '', $value);
+
+        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
+        $replace = '\\\$1';
+
+        return preg_replace($pattern, $replace, $value);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/QueryInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/QueryInterface.php
new file mode 100644
index 0000000000000..df1e0c304185b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/QueryInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
+
+use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+interface QueryInterface
+{
+    /**
+     * @param array $selectQuery
+     * @param RequestQueryInterface $requestQuery
+     * @param string $conditionType
+     * @return array
+     * @since 100.1.0
+     */
+    public function build(
+        array $selectQuery,
+        RequestQueryInterface $requestQuery,
+        $conditionType
+    );
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Preprocessor/Stopwords.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Preprocessor/Stopwords.php
new file mode 100644
index 0000000000000..d8d1a071611c1
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Preprocessor/Stopwords.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter\Query\Preprocessor;
+
+use Magento\Framework\Filesystem\Directory\ReadFactory;
+use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+use Magento\Framework\Module\Dir;
+
+/**
+ * @api
+ * @since 100.1.0
+ */
+class Stopwords implements PreprocessorInterface
+{
+    /**
+     * Cache id for elasticsearch stopwords
+     */
+    const CACHE_ID = 'elasticsearch_stopwords';
+
+    /**
+     * Stopwords file modification time gap, seconds
+     */
+    const STOPWORDS_FILE_MODIFICATION_TIME_GAP = 900;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     * @since 100.1.0
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Framework\Locale\Resolver
+     * @since 100.1.0
+     */
+    protected $localeResolver;
+
+    /**
+     * @var ReadFactory
+     * @since 100.1.0
+     */
+    protected $readFactory;
+
+    /**
+     * @var \Magento\Framework\App\Cache\Type\Config
+     * @since 100.1.0
+     */
+    protected $configCache;
+
+    /**
+     * @var EsConfigInterface
+     * @since 100.1.0
+     */
+    protected $esConfig;
+
+    /**
+     * @var \Magento\Framework\Module\Dir\Reader
+     * @since 100.1.0
+     */
+    protected $moduleDirReader;
+
+    /**
+     * @var string
+     */
+    private $stopwordsModule;
+
+    /**
+     * @var string
+     */
+    private $stopwordsDirectory;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Locale\Resolver $localeResolver
+     * @param ReadFactory $readFactory
+     * @param \Magento\Framework\App\Cache\Type\Config $configCache
+     * @param EsConfigInterface $esConfig
+     * @param \Magento\Framework\Module\Dir\Reader $moduleDirReader
+     * @param string $stopwordsModule
+     * @param string $stopwordsDirectory
+     */
+    public function __construct(
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Locale\Resolver $localeResolver,
+        ReadFactory $readFactory,
+        \Magento\Framework\App\Cache\Type\Config $configCache,
+        EsConfigInterface $esConfig,
+        \Magento\Framework\Module\Dir\Reader $moduleDirReader,
+        $stopwordsModule = '',
+        $stopwordsDirectory = ''
+    ) {
+        $this->storeManager = $storeManager;
+        $this->localeResolver = $localeResolver;
+        $this->readFactory = $readFactory;
+        $this->configCache = $configCache;
+        $this->esConfig = $esConfig;
+        $this->moduleDirReader = $moduleDirReader;
+        $this->stopwordsModule = $stopwordsModule;
+        $this->stopwordsDirectory = $stopwordsDirectory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.1.0
+     */
+    public function process($query)
+    {
+        $stopwords = $this->getStopwordsList();
+        $queryParts = explode(' ', $query);
+        $query = implode(' ', array_diff($queryParts, $stopwords));
+        return trim($query);
+    }
+
+    /**
+     * Get stopwords list for current locale
+     *
+     * @return array
+     * @since 100.1.0
+     */
+    protected function getStopwordsList()
+    {
+        $filename = $this->getStopwordsFile();
+        $fileDir = $this->moduleDirReader->getModuleDir(Dir::MODULE_ETC_DIR, $this->stopwordsModule)
+            . '/' . $this->stopwordsDirectory;
+        $source = $this->readFactory->create($fileDir);
+        $fileStats = $source->stat($filename);
+        if (((time() - $fileStats['mtime']) > self::STOPWORDS_FILE_MODIFICATION_TIME_GAP)
+            && ($cachedValue = $this->configCache->load(self::CACHE_ID))) {
+            $stopwords = $this->getSerializer()->unserialize($cachedValue);
+        } else {
+            $fileContent = $source->readFile($filename);
+            $stopwords = explode("\n", $fileContent);
+            $this->configCache->save($this->getSerializer()->serialize($stopwords), self::CACHE_ID);
+        }
+        return $stopwords;
+    }
+
+    /**
+     * Get stopwords file for current locale
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    protected function getStopwordsFile()
+    {
+        $stopwordsInfo = $this->esConfig->getStopwordsInfo();
+        $storeId = $this->storeManager->getStore()->getId();
+        $this->localeResolver->emulate($storeId);
+        $locale = $this->localeResolver->getLocale();
+        $stopwordsFile = isset($stopwordsInfo[$locale]) ? $stopwordsInfo[$locale] : $stopwordsInfo['default'];
+        return $stopwordsFile;
+    }
+
+    /**
+     * Get serializer
+     *
+     * @return \Magento\Framework\Serialize\SerializerInterface
+     * @deprecated 100.2.0
+     */
+    private function getSerializer()
+    {
+        if (null === $this->serializer) {
+            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\Serialize\SerializerInterface::class);
+        }
+        return $this->serializer;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/QueryAwareInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/QueryAwareInterface.php
new file mode 100644
index 0000000000000..bcc47e932baaa
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/QueryAwareInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\SearchAdapter;
+
+/**
+ * QueryAwareInterface is a marker interface for those objects who expects the QueryContainer
+ * to be passed to their constructor
+ *
+ * Its goal is to mark the fact that a class which implements this interface requires
+ * the QueryContainer object to be passed as constructor argument
+ * with the name 'queryContainer' to work properly
+ */
+interface QueryAwareInterface
+{
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/QueryContainer.php b/app/code/Magento/Elasticsearch/SearchAdapter/QueryContainer.php
new file mode 100644
index 0000000000000..aed7f8f4da642
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/QueryContainer.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\SearchAdapter;
+
+/**
+ * The purpose of this class to be a container for the array with ElasticSearch query.
+ * @codeCoverageIgnore
+ */
+class QueryContainer
+{
+    /**
+     * @var array
+     */
+    private $query;
+
+    /**
+     * @param array $query
+     */
+    public function __construct(array $query)
+    {
+        $this->query = $query;
+    }
+
+    /**
+     * Returns a query
+     *
+     * @return array
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
new file mode 100644
index 0000000000000..33fda48f4af57
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Response Factory
+ * @api
+ * @since 100.1.0
+ */
+class ResponseFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     * @since 100.1.0
+     */
+    protected $objectManager;
+
+    /**
+     * Document Factory
+     *
+     * @var DocumentFactory
+     * @since 100.1.0
+     */
+    protected $documentFactory;
+
+    /**
+     * Aggregation Factory
+     *
+     * @var AggregationFactory
+     * @since 100.1.0
+     */
+    protected $aggregationFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param DocumentFactory $documentFactory
+     * @param AggregationFactory $aggregationFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        DocumentFactory $documentFactory,
+        AggregationFactory $aggregationFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->documentFactory = $documentFactory;
+        $this->aggregationFactory = $aggregationFactory;
+    }
+
+    /**
+     * Create Query Response instance
+     *
+     * @param array $response
+     * @return \Magento\Framework\Search\Response\QueryResponse
+     * @since 100.1.0
+     */
+    public function create($response)
+    {
+        $documents = [];
+        foreach ($response['documents'] as $rawDocument) {
+            /** @var \Magento\Framework\Api\Search\Document[] $documents */
+            $documents[] = $this->documentFactory->create(
+                $rawDocument
+            );
+        }
+        /** @var \Magento\Framework\Search\Response\Aggregation $aggregations */
+        $aggregations = $this->aggregationFactory->create($response['aggregations']);
+        return $this->objectManager->create(
+            \Magento\Framework\Search\Response\QueryResponse::class,
+            [
+                'documents' => $documents,
+                'aggregations' => $aggregations,
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/SearchIndexNameResolver.php b/app/code/Magento/Elasticsearch/SearchAdapter/SearchIndexNameResolver.php
new file mode 100644
index 0000000000000..24e8eb069c7d0
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/SearchIndexNameResolver.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Elasticsearch\Model\Config;
+
+/**
+ * Alias name resolver
+ * @api
+ * @since 100.1.0
+ */
+class SearchIndexNameResolver
+{
+    /**
+     * @var Config
+     */
+    private $clientConfig;
+
+    /**
+     * @param Config $clientConfig
+     */
+    public function __construct(
+        Config $clientConfig
+    ) {
+        $this->clientConfig = $clientConfig;
+    }
+
+    /**
+     * Returns the index (alias) name
+     *
+     * @param int $storeId
+     * @param string $indexerId
+     * @return string
+     * @since 100.1.0
+     */
+    public function getIndexName($storeId, $indexerId)
+    {
+        $mappedIndexerId = $this->getIndexMapping($indexerId);
+        return $this->clientConfig->getIndexPrefix() . '_' . $mappedIndexerId . '_' . $storeId;
+    }
+
+    /**
+     * Get index name by indexer ID
+     *
+     * @param string $indexerId
+     * @return string
+     */
+    private function getIndexMapping($indexerId)
+    {
+        if ($indexerId == Fulltext::INDEXER_ID) {
+            $mappedIndexerId = 'product';
+        } else {
+            $mappedIndexerId = $indexerId;
+        }
+        return $mappedIndexerId;
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE.txt b/app/code/Magento/Elasticsearch/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE.txt
rename to app/code/Magento/Elasticsearch/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE_AFL.txt b/app/code/Magento/Elasticsearch/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE_AFL.txt
rename to app/code/Magento/Elasticsearch/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/README.md b/app/code/Magento/Elasticsearch/Test/Mftf/README.md
new file mode 100644
index 0000000000000..de5e558e91cad
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Elasticsearch Functional Tests
+
+The Functional Test Module for **Magento Elasticsearch** module.
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
new file mode 100644
index 0000000000000..d8ce091fba76f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ProductQuickSearchUsingElasticSearchTest">
+        <annotations>
+            <features value="Search"/>
+            <stories value="Quick Search of products on Storefront when ES 5.0+ is enabled"/>
+            <title value="Product quick search doesn't throw exception after ES is chosen as search engine"/>
+            <description value="Verify no elastic search exception is thrown when searching for product before catalogsearch reindexing"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94995"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="categoryFirst"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="categoryFirst" stepKey="deleteCategory"/>
+            <actionGroup ref="ResetSearchEngineConfiguration" stepKey="resetCatalogSearchConfiguration"/>
+            <actionGroup ref="updateIndexerOnSave" stepKey="resetIndexerBackToOriginalState">
+                <argument name="indexerName" value="catalogsearch_fulltext"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <comment userInput="Change Catalog search engine option to Elastic Search 5.0+" stepKey="chooseElasticSearch5"/>
+        <actionGroup ref="ChooseElasticSearchAsSearchEngine" stepKey="chooseES5"/>
+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
+        <actionGroup ref="updateIndexerBySchedule" stepKey="updateAnIndexerBySchedule">
+            <argument name="indexerName" value="catalogsearch_fulltext"/>
+        </actionGroup>
+        <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        <!--Navigate to storefront and do a quick search for the product -->
+        <comment userInput="Navigate to Storefront to check if quick search works" stepKey="commentCheckQuickSearch" />
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+
+        <waitForPageLoad stepKey="waitForHomePageToLoad" time="30"/>
+        <fillField userInput="Simple" selector="{{StorefrontQuickSearchSection.searchPhrase}}" stepKey="fillSearchBar"/>
+        <waitForPageLoad stepKey="wait2" time="30"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Search results for: 'Simple'" stepKey="assertQuickSearchTitle"/>
+        <see userInput="Search results for: 'Simple'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
+        <comment userInput="End of searching products" stepKey="endOfSearchingProducts"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
+        </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
new file mode 100644
index 0000000000000..98284e49ad85d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class IndexResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IndexResolver
+     */
+    private $resolver;
+
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->converter = $this->getMockBuilder(ConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldType'])
+            ->getMockForAbstractClass();
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            IndexResolver::class,
+            [
+                'converter' => $this->converter,
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+                'fieldTypeResolver' => $this->fieldTypeResolver,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldIndexProvider
+     * @param $isSearchable
+     * @param $isAlwaysIndexable
+     * @param $isComplexType
+     * @param $isIntegerType
+     * @param $isBooleanType
+     * @param $isUserDefined
+     * @param $isFloatType
+     * @param $serviceFieldType
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName(
+        $isSearchable,
+        $isAlwaysIndexable,
+        $isComplexType,
+        $isIntegerType,
+        $isBooleanType,
+        $isUserDefined,
+        $isFloatType,
+        $serviceFieldType,
+        $expected
+    ) {
+        $this->converter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+        $this->fieldTypeResolver->expects($this->any())
+            ->method('getFieldType')
+            ->willReturn($serviceFieldType);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('string');
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'isSearchable',
+                'isAlwaysIndexable',
+                'isComplexType',
+                'isIntegerType',
+                'isBooleanType',
+                'isUserDefined',
+                'isFloatType',
+            ])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isSearchable')
+            ->willReturn($isSearchable);
+        $attributeMock->expects($this->any())
+            ->method('isAlwaysIndexable')
+            ->willReturn($isAlwaysIndexable);
+        $attributeMock->expects($this->any())
+            ->method('isComplexType')
+            ->willReturn($isComplexType);
+        $attributeMock->expects($this->any())
+            ->method('isIntegerType')
+            ->willReturn($isIntegerType);
+        $attributeMock->expects($this->any())
+            ->method('isBooleanType')
+            ->willReturn($isBooleanType);
+        $attributeMock->expects($this->any())
+            ->method('isUserDefined')
+            ->willReturn($isUserDefined);
+        $attributeMock->expects($this->any())
+            ->method('isFloatType')
+            ->willReturn($isFloatType);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldIndex($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldIndexProvider()
+    {
+        return [
+            [true, true, true, true, true, true, true, 'string', null],
+            [false, false, true, false, false, false, false, 'string', 'something'],
+            [false, false, true, false, false, false, false, 'string', 'something'],
+            [false, false, false, false, false, false, false, 'string', 'something'],
+            [false, false, false, false, false, false, false, 'int', null],
+            [false, false, true, true, false, true, false, 'string', 'something'],
+            [false, false, true, false, true, true, false, 'string', 'something'],
+            [false, false, true, false, true, false, false, 'string', null],
+            [false, false, true, false, true, true, true, 'string', null],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
new file mode 100644
index 0000000000000..39155e4f4fe02
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace
+Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class IntegerTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IntegerType
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            IntegerType::class,
+            [
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldTypeProvider
+     * @param $attributeCode
+     * @param $isIntegerType
+     * @param $isBooleanType
+     * @param $isUserDefined
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldType($attributeCode, $isIntegerType, $isBooleanType, $isUserDefined, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode', 'isIntegerType', 'isBooleanType', 'isUserDefined'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $attributeMock->expects($this->any())
+            ->method('isIntegerType')
+            ->willReturn($isIntegerType);
+        $attributeMock->expects($this->any())
+            ->method('isBooleanType')
+            ->willReturn($isBooleanType);
+        $attributeMock->expects($this->any())
+            ->method('isUserDefined')
+            ->willReturn($isUserDefined);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldType($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            ['category_ids', true, true, true, 'something'],
+            ['category_ids', false, false, false, 'something'],
+            ['type', true, false, false, 'something'],
+            ['type', false, true, false, 'something'],
+            ['type', true, true, true, ''],
+            ['type', false, false, true, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php
new file mode 100644
index 0000000000000..0e33498a16fba
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace
+Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class KeywordTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var KeywordType
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            KeywordType::class,
+            [
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldTypeProvider
+     * @param $isComplexType
+     * @param $isSearchable
+     * @param $isAlwaysIndexable
+     * @param $isFilterable
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldType($isComplexType, $isSearchable, $isAlwaysIndexable, $isFilterable, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isComplexType', 'isSearchable', 'isAlwaysIndexable', 'isFilterable'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isComplexType')
+            ->willReturn($isComplexType);
+        $attributeMock->expects($this->any())
+            ->method('isSearchable')
+            ->willReturn($isSearchable);
+        $attributeMock->expects($this->any())
+            ->method('isAlwaysIndexable')
+            ->willReturn($isAlwaysIndexable);
+        $attributeMock->expects($this->any())
+            ->method('isFilterable')
+            ->willReturn($isFilterable);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldType($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            [true, true, true, true, 'something'],
+            [true, false, false, false, 'something'],
+            [true, false, false, true, 'something'],
+            [false, false, false, true, 'something'],
+            [false, false, false, false, ''],
+            [false, false, true, false, ''],
+            [false, true, false, false, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
new file mode 100644
index 0000000000000..8fbd183441b6d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
@@ -0,0 +1,562 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Client;
+
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ElasticsearchTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ElasticsearchClient
+     */
+    protected $model;
+
+    /**
+     * @var \Elasticsearch\Client|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $elasticsearchClientMock;
+
+    /**
+     * @var \Elasticsearch\Namespaces\IndicesNamespace|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $indicesMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManager;
+
+    /**
+     * Setup
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
+            ->setMethods([
+                'indices',
+                'ping',
+                'bulk',
+                'search',
+                'scroll',
+                'suggest',
+                'info',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class)
+            ->setMethods([
+                'exists',
+                'getSettings',
+                'create',
+                'delete',
+                'putMapping',
+                'deleteMapping',
+                'stats',
+                'updateAliases',
+                'existsAlias',
+                'getAlias',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->elasticsearchClientMock->expects($this->any())
+            ->method('indices')
+            ->willReturn($this->indicesMock);
+        $this->elasticsearchClientMock->expects($this->any())
+            ->method('ping')
+            ->willReturn(true);
+        $this->elasticsearchClientMock->expects($this->any())
+            ->method('info')
+            ->willReturn(['version' => ['number' => '5.0.0']]);
+
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->model = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch::class,
+            [
+                'options' => $this->getOptions(),
+                'elasticsearchClient' => $this->elasticsearchClientMock
+            ]
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testConstructorOptionsException()
+    {
+        $result = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Client\Elasticsearch::class,
+            [
+                'options' => []
+            ]
+        );
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * Test client creation from the list of options
+     */
+    public function testConstructorWithOptions()
+    {
+        $result = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Client\Elasticsearch::class,
+            [
+                'options' => $this->getOptions()
+            ]
+        );
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * Test ping functionality
+     */
+    public function testPing()
+    {
+        $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true);
+        $this->assertEquals(true, $this->model->ping());
+    }
+
+    /**
+     * Test validation of connection parameters
+     */
+    public function testTestConnection()
+    {
+        $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true);
+        $this->assertEquals(true, $this->model->testConnection());
+    }
+
+    /**
+     * Test validation of connection parameters returns false
+     */
+    public function testTestConnectionFalse()
+    {
+        $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(false);
+        $this->assertEquals(true, $this->model->testConnection());
+    }
+
+    /**
+     * Test validation of connection parameters
+     */
+    public function testTestConnectionPing()
+    {
+        $this->model = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Client\Elasticsearch::class,
+            [
+                'options' => $this->getEmptyIndexOption(),
+                'elasticsearchClient' => $this->elasticsearchClientMock
+            ]
+        );
+
+        $this->model->ping();
+        $this->assertEquals(true, $this->model->testConnection());
+    }
+
+    /**
+     * Test bulkQuery() method
+     */
+    public function testBulkQuery()
+    {
+        $this->elasticsearchClientMock->expects($this->once())
+            ->method('bulk')
+            ->with([]);
+        $this->model->bulkQuery([]);
+    }
+
+    /**
+     * Test createIndex() method, case when such index exists
+     */
+    public function testCreateIndexExists()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('create')
+            ->with([
+                'index' => 'indexName',
+                'body' => [],
+            ]);
+        $this->model->createIndex('indexName', []);
+    }
+
+    /**
+     * Test deleteIndex() method.
+     */
+    public function testDeleteIndex()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('delete')
+            ->with(['index' => 'indexName']);
+        $this->model->deleteIndex('indexName');
+    }
+
+    /**
+     * Test isEmptyIndex() method.
+     */
+    public function testIsEmptyIndex()
+    {
+        $indexName = 'magento2_index';
+        $stats['indices'][$indexName]['primaries']['docs']['count'] = 0;
+
+        $this->indicesMock->expects($this->once())
+            ->method('stats')
+            ->with(['index' => $indexName, 'metric' => 'docs'])
+            ->willReturn($stats);
+        $this->assertTrue($this->model->isEmptyIndex($indexName));
+    }
+
+    /**
+     * Test isEmptyIndex() method returns false.
+     */
+    public function testIsEmptyIndexFalse()
+    {
+        $indexName = 'magento2_index';
+        $stats['indices'][$indexName]['primaries']['docs']['count'] = 1;
+
+        $this->indicesMock->expects($this->once())
+            ->method('stats')
+            ->with(['index' => $indexName, 'metric' => 'docs'])
+            ->willReturn($stats);
+        $this->assertFalse($this->model->isEmptyIndex($indexName));
+    }
+
+    /**
+     * Test updateAlias() method with new index.
+     */
+    public function testUpdateAlias()
+    {
+        $alias = 'alias1';
+        $index = 'index1';
+
+        $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $index]];
+
+        $this->indicesMock->expects($this->once())
+            ->method('updateAliases')
+            ->with($params);
+        $this->model->updateAlias($alias, $index);
+    }
+
+    /**
+     * Test updateAlias() method with new and old index.
+     */
+    public function testUpdateAliasRemoveOldIndex()
+    {
+        $alias = 'alias1';
+        $newIndex = 'index1';
+        $oldIndex = 'indexOld';
+
+        $params['body']['actions'][] = ['remove' => ['alias' => $alias, 'index' => $oldIndex]];
+        $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
+
+        $this->indicesMock->expects($this->once())
+            ->method('updateAliases')
+            ->with($params);
+        $this->model->updateAlias($alias, $newIndex, $oldIndex);
+    }
+
+    /**
+     * Test indexExists() method, case when no such index exists
+     */
+    public function testIndexExists()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('exists')
+            ->with([
+                'index' => 'indexName',
+            ])
+            ->willReturn(true);
+        $this->model->indexExists('indexName');
+    }
+
+    /**
+     * Tests existsAlias() method checking for alias.
+     */
+    public function testExistsAlias()
+    {
+        $alias = 'alias1';
+        $params = ['name' => $alias];
+        $this->indicesMock->expects($this->once())
+            ->method('existsAlias')
+            ->with($params)
+            ->willReturn(true);
+        $this->assertTrue($this->model->existsAlias($alias));
+    }
+
+    /**
+     * Tests existsAlias() method checking for alias and index.
+     */
+    public function testExistsAliasWithIndex()
+    {
+        $alias = 'alias1';
+        $index = 'index1';
+        $params = ['name' => $alias, 'index' => $index];
+        $this->indicesMock->expects($this->once())
+            ->method('existsAlias')
+            ->with($params)
+            ->willReturn(true);
+        $this->assertTrue($this->model->existsAlias($alias, $index));
+    }
+
+    /**
+     * Test getAlias() method.
+     */
+    public function testGetAlias()
+    {
+        $alias = 'alias1';
+        $params = ['name' => $alias];
+        $this->indicesMock->expects($this->once())
+            ->method('getAlias')
+            ->with($params)
+            ->willReturn([]);
+        $this->assertEquals([], $this->model->getAlias($alias));
+    }
+
+    /**
+     * Test createIndexIfNotExists() method, case when operation fails
+     * @expectedException \Exception
+     */
+    public function testCreateIndexFailure()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('create')
+            ->with([
+                'index' => 'indexName',
+                'body' => [],
+            ])
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->createIndex('indexName', []);
+    }
+
+    /**
+     * Test testAddFieldsMapping() method
+     */
+    public function testAddFieldsMapping()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('putMapping')
+            ->with([
+                'index' => 'indexName',
+                'type' => 'product',
+                'body' => [
+                    'product' => [
+                        '_all' => [
+                            'enabled' => true,
+                            'type' => 'text',
+                        ],
+                        'properties' => [
+                            'name' => [
+                                'type' => 'text',
+                            ],
+                        ],
+                        'dynamic_templates' => [
+                            [
+                                'price_mapping' => [
+                                    'match' => 'price_*',
+                                    'match_mapping_type' => 'string',
+                                    'mapping' => [
+                                        'type' => 'float',
+                                        'store' => true,
+                                    ],
+                                ],
+                            ],
+                            [
+                                'string_mapping' => [
+                                    'match' => '*',
+                                    'match_mapping_type' => 'string',
+                                    'mapping' => [
+                                        'type' => 'text',
+                                        'index' => false,
+                                    ],
+                                ],
+                            ],
+                            [
+                                'position_mapping' => [
+                                    'match' => 'position_*',
+                                    'match_mapping_type' => 'string',
+                                    'mapping' => [
+                                        'type' => 'int',
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+        $this->model->addFieldsMapping(
+            [
+                'name' => [
+                    'type' => 'text',
+                ],
+            ],
+            'indexName',
+            'product'
+        );
+    }
+
+    /**
+     * Test testAddFieldsMapping() method
+     * @expectedException \Exception
+     */
+    public function testAddFieldsMappingFailure()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('putMapping')
+            ->with([
+                'index' => 'indexName',
+                'type' => 'product',
+                'body' => [
+                    'product' => [
+                        '_all' => [
+                            'enabled' => true,
+                            'type' => 'text',
+                        ],
+                        'properties' => [
+                            'name' => [
+                                'type' => 'text',
+                            ],
+                        ],
+                        'dynamic_templates' => [
+                            [
+                                'price_mapping' => [
+                                    'match' => 'price_*',
+                                    'match_mapping_type' => 'string',
+                                    'mapping' => [
+                                        'type' => 'float',
+                                        'store' => true,
+                                    ],
+                                ],
+                            ],
+                            [
+                                'string_mapping' => [
+                                    'match' => '*',
+                                    'match_mapping_type' => 'string',
+                                    'mapping' => [
+                                        'type' => 'text',
+                                        'index' => false,
+                                    ],
+                                ],
+                            ],
+                            [
+                                'position_mapping' => [
+                                    'match' => 'position_*',
+                                    'match_mapping_type' => 'string',
+                                    'mapping' => [
+                                        'type' => 'int',
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->addFieldsMapping(
+            [
+                'name' => [
+                    'type' => 'text',
+                ],
+            ],
+            'indexName',
+            'product'
+        );
+    }
+
+    /**
+     * Test deleteMapping() method
+     */
+    public function testDeleteMapping()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('deleteMapping')
+            ->with([
+                'index' => 'indexName',
+                'type' => 'product',
+            ]);
+        $this->model->deleteMapping(
+            'indexName',
+            'product'
+        );
+    }
+
+    /**
+     * Test deleteMapping() method
+     * @expectedException \Exception
+     */
+    public function testDeleteMappingFailure()
+    {
+        $this->indicesMock->expects($this->once())
+            ->method('deleteMapping')
+            ->with([
+                'index' => 'indexName',
+                'type' => 'product',
+            ])
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->deleteMapping(
+            'indexName',
+            'product'
+        );
+    }
+
+    /**
+     * Test query() method
+     * @return void
+     */
+    public function testQuery()
+    {
+        $query = 'test phrase query';
+        $this->elasticsearchClientMock->expects($this->once())
+            ->method('search')
+            ->with($query)
+            ->willReturn([]);
+        $this->assertEquals([], $this->model->query($query));
+    }
+
+    /**
+     * Test suggest() method
+     * @return void
+     */
+    public function testSuggest()
+    {
+        $query = 'query';
+        $this->elasticsearchClientMock->expects($this->once())
+            ->method('suggest')
+            ->willReturn([]);
+        $this->assertEquals([], $this->model->suggest($query));
+    }
+
+    /**
+     * Get elasticsearch client options
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [
+            'hostname' => 'localhost',
+            'port' => '9200',
+            'timeout' => 15,
+            'index' => 'magento2',
+            'enableAuth' => 1,
+            'username' => 'user',
+            'password' => 'passwd',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function getEmptyIndexOption()
+    {
+        return [
+            'hostname' => 'localhost',
+            'port' => '9200',
+            'index' => '',
+            'timeout' => 15,
+            'enableAuth' => 1,
+            'username' => 'user',
+            'password' => 'passwd',
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/SearchAdapter/Aggregation/IntervalTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/SearchAdapter/Aggregation/IntervalTest.php
new file mode 100644
index 0000000000000..4030d2dfaf0c5
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/SearchAdapter/Aggregation/IntervalTest.php
@@ -0,0 +1,323 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\SearchAdapter\Aggregation;
+
+use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Aggregation\Interval;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+
+/**
+ * Test for Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Aggregation\Interval class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IntervalTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Interval
+     */
+    private $model;
+
+    /**
+     * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionManager;
+
+    /**
+     * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fieldMapper;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $clientConfig;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var CustomerSession|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSession;
+
+    /**
+     * @var ElasticsearchClient|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $clientMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->connectionManager = $this->getMockBuilder(ConnectionManager::class)
+            ->setMethods(['getConnection'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldMapper = $this->getMockBuilder(FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientConfig = $this->getMockBuilder(Config::class)
+            ->setMethods([
+                'getIndexName',
+                'getEntityType',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerSession = $this->getMockBuilder(CustomerSession::class)
+            ->setMethods(['getCustomerGroupId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerSession->expects($this->any())
+            ->method('getCustomerGroupId')
+            ->willReturn(1);
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver = $this
+            ->getMockBuilder(SearchIndexNameResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('indexName');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('product');
+        $this->clientMock = $this->getMockBuilder(ElasticsearchClient::class)
+            ->setMethods(['query'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->clientMock);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            Interval::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'fieldMapper' => $this->fieldMapper,
+                'clientConfig' => $this->clientConfig,
+                'searchIndexNameResolver' => $this->searchIndexNameResolver,
+                'fieldName' => 'price_0_1',
+                'storeId' => 1,
+                'entityIds' => [265, 313, 281],
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider loadParamsProvider
+     * @param string $limit
+     * @param string $offset
+     * @param string $lower
+     * @param string $upper
+     * @param array $queryResult
+     * @param array $expected
+     * @return void
+     */
+    public function testLoad(
+        string $limit,
+        string $offset,
+        string $lower,
+        string $upper,
+        array $queryResult,
+        array $expected
+    ): void {
+        $this->processQuery($queryResult);
+
+        $this->assertEquals(
+            $expected,
+            $this->model->load($limit, $offset, $lower, $upper)
+        );
+    }
+
+    /**
+     * @dataProvider loadPrevParamsProvider
+     * @param string $data
+     * @param string $index
+     * @param string $lower
+     * @param array $queryResult
+     * @param array|bool $expected
+     * @return void
+     */
+    public function testLoadPrev(string $data, string $index, string $lower, array $queryResult, $expected): void
+    {
+        $this->processQuery($queryResult);
+
+        $this->assertEquals(
+            $expected,
+            $this->model->loadPrevious($data, $index, $lower)
+        );
+    }
+
+    /**
+     * @dataProvider loadNextParamsProvider
+     * @param string $data
+     * @param string $rightIndex
+     * @param string $upper
+     * @param array $queryResult
+     * @param array|bool $expected
+     * @return void
+     */
+    public function testLoadNext(string $data, string $rightIndex, string $upper, array $queryResult, $expected): void
+    {
+        $this->processQuery($queryResult);
+
+        $this->assertEquals(
+            $expected,
+            $this->model->loadNext($data, $rightIndex, $upper)
+        );
+    }
+
+    /**
+     * @param array $queryResult
+     * @return void
+     */
+    private function processQuery(array $queryResult): void
+    {
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('document');
+        $this->clientMock->expects($this->any())
+            ->method('query')
+            ->willReturn($queryResult);
+    }
+
+    /**
+     * @return array
+     */
+    public function loadParamsProvider(): array
+    {
+        return [
+            [
+                'limit' => '6',
+                'offset' => '2',
+                'lower' => '24',
+                'upper' => '42',
+                'queryResult' => [
+                    'hits' => [
+                        'hits' => [
+                            [
+                                'fields' => [
+                                    'price_0_1' => [25],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'expected' => [25],
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function loadPrevParamsProvider(): array
+    {
+        return [
+            [
+                'data' => '24',
+                'rightIndex' => '1',
+                'upper' => '24',
+                'queryResult' => [
+                    'hits' => [
+                        'total'=> '1',
+                        'hits' => [
+                            [
+                                'fields' => [
+                                    'price_0_1' => ['25'],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'expected' => ['25.0'],
+            ],
+            [
+                'data' => '24',
+                'rightIndex' => '1',
+                'upper' => '24',
+                'queryResult' => [
+                    'hits' => ['total'=> '0'],
+                ],
+                'expected' => false,
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function loadNextParamsProvider(): array
+    {
+        return [
+            [
+                'data' => '24',
+                'rightIndex' => '2',
+                'upper' => '42',
+                'queryResult' => [
+                    'hits' => [
+                        'total'=> '1',
+                        'hits' => [
+                            [
+                                'fields' => [
+                                    'price_0_1' => ['25'],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'expected' => ['25.0'],
+            ],
+            [
+                'data' => '24',
+                'rightIndex' => '2',
+                'upper' => '42',
+                'queryResult' => [
+                    'hits' => ['total'=> '0'],
+                ],
+                'expected' => false,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php
new file mode 100644
index 0000000000000..5a370ca4c2087
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\BatchDataMapper;
+
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperFactory;
+use Magento\Framework\ObjectManagerInterface;
+
+class DataMapperFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataMapperFactory
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var string[]
+     */
+    private $dataMappers;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataMappers = [
+            'product' => 'productDataMapper',
+        ];
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            DataMapperFactory::class,
+            [
+                'objectManager' => $this->objectManagerMock,
+                'dataMappers' => $this->dataMappers
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testCreateEmpty()
+    {
+        $this->model->create('');
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testCreateWrongType()
+    {
+        $this->model->create('wrong');
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ConfigurationMismatchException
+     */
+    public function testCreateFailure()
+    {
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn(new \stdClass());
+        $this->model->create('product');
+    }
+
+    /**
+     * @return void
+     */
+    public function testCreate()
+    {
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->createMock(BatchDataMapperInterface::class));
+        $this->assertInstanceOf(BatchDataMapperInterface::class, $this->model->create('product'));
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php
new file mode 100644
index 0000000000000..f9610ff21967a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\BatchDataMapper;
+
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperFactory;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver;
+
+class DataMapperResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataMapperResolver
+     */
+    private $model;
+
+    /**
+     * @var DataMapperFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataMapperFactoryMock;
+
+    /**
+     * @var BatchDataMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataMapperEntity;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->dataMapperFactoryMock = $this->getMockBuilder(DataMapperFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataMapperEntity = $this->getMockBuilder(BatchDataMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = (new ObjectManagerHelper($this))->getObject(
+            \Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver::class,
+            [
+                'dataMapperFactory' => $this->dataMapperFactoryMock
+            ]
+        );
+    }
+
+    public function testMapWithDefaultEntityType()
+    {
+        $this->dataMapperEntity->expects($this->once())->method('map')->withAnyParameters();
+        $this->dataMapperFactoryMock->expects($this->once())->method('create')
+            ->with('product')
+            ->willReturn($this->dataMapperEntity);
+
+        $this->model->map(['data'], 1, []);
+    }
+
+    public function testMapWithSpecifiedEntityType()
+    {
+        $this->dataMapperEntity->expects($this->once())->method('map')->withAnyParameters();
+        $this->dataMapperFactoryMock->expects($this->once())->method('create')
+            ->with('specific-type')
+            ->willReturn($this->dataMapperEntity);
+
+        $this->model->map(['data'], 1, ['entityType' => 'specific-type']);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
new file mode 100644
index 0000000000000..cfa048fc26c92
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
@@ -0,0 +1,429 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\BatchDataMapper;
+
+use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper;
+use Magento\Elasticsearch\Model\Adapter\Document\Builder;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class ProductDataMapperTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductDataMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductDataMapper
+     */
+    private $model;
+
+    /**
+     * @var Builder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $builderMock;
+
+    /**
+     * @var Attribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attribute;
+
+    /**
+     * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fieldMapperMock;
+
+    /**
+     * @var Date|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateFieldTypeMock;
+
+    /**
+     * @var AdditionalFieldsProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $additionalFieldsProvider;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataProvider;
+
+    /**
+     * Set up test environment.
+     */
+    protected function setUp()
+    {
+        $this->builderMock = $this->createTestProxy(Builder::class);
+        $this->fieldMapperMock = $this->createMock(FieldMapperInterface::class);
+        $this->dataProvider = $this->createMock(DataProvider::class);
+        $this->attribute = $this->createMock(Attribute::class);
+        $this->additionalFieldsProvider = $this->createMock(AdditionalFieldsProviderInterface::class);
+        $this->dateFieldTypeMock = $this->createMock(Date::class);
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            ProductDataMapper::class,
+            [
+                'builder' => $this->builderMock,
+                'fieldMapper' => $this->fieldMapperMock,
+                'dateFieldType' => $this->dateFieldTypeMock,
+                'dataProvider' => $this->dataProvider,
+                'additionalFieldsProvider' => $this->additionalFieldsProvider,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetMapAdditionalFieldsOnly()
+    {
+        $storeId = 1;
+        $productId = 42;
+        $additionalFields = ['some data'];
+        $this->builderMock->expects($this->once())
+            ->method('addField')
+            ->with('store_id', $storeId);
+
+        $this->builderMock->expects($this->any())
+            ->method('addFields')
+            ->withConsecutive([$additionalFields])
+            ->will($this->returnSelf());
+        $this->builderMock->expects($this->any())
+            ->method('build')
+            ->will($this->returnValue([]));
+        $this->additionalFieldsProvider->expects($this->once())
+            ->method('getFields')
+            ->with([$productId], $storeId)
+            ->willReturn([$productId => $additionalFields]);
+
+        $documents = $this->model->map([$productId => []], $storeId, []);
+        $this->assertEquals([$productId], array_keys($documents));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetMapEmptyData()
+    {
+        $storeId = 1;
+
+        $this->builderMock->expects($this->never())->method('addField');
+        $this->builderMock->expects($this->never())->method('build');
+        $this->additionalFieldsProvider->expects($this->once())
+            ->method('getFields')
+            ->with([], $storeId)
+            ->willReturn([]);
+
+        $documents = $this->model->map([], $storeId, []);
+        $this->assertEquals([], $documents);
+    }
+
+    /**
+     * @param int $productId
+     * @param array $attributeData
+     * @param array|string $attributeValue
+     * @param array $returnAttributeData
+     * @dataProvider mapProvider
+     */
+    public function testGetMap(int $productId, array $attributeData, $attributeValue, array $returnAttributeData)
+    {
+        $storeId = 1;
+        $attributeId = 5;
+        $context = [];
+
+        $this->dataProvider->method('getSearchableAttribute')
+            ->with($attributeId)
+            ->willReturn($this->getAttribute($attributeData));
+        $this->fieldMapperMock->method('getFieldName')
+            ->willReturnArgument(0);
+        $this->dateFieldTypeMock->method('formatDate')
+            ->willReturnArgument(1);
+        $this->additionalFieldsProvider->expects($this->once())
+            ->method('getFields')
+            ->willReturn([]);
+
+        $documentData = [
+            $productId => [$attributeId => $attributeValue],
+        ];
+        $documents = $this->model->map($documentData, $storeId, $context);
+        $returnAttributeData['store_id'] = $storeId;
+        $this->assertEquals($returnAttributeData, $documents[$productId]);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetMapWithOptions()
+    {
+        $storeId = 1;
+        $productId = 10;
+        $context = [];
+        $attributeValue = ['o1', 'o2'];
+        $returnAttributeData = [
+            'store_id' => $storeId,
+            'options' => $attributeValue,
+        ];
+
+        $this->dataProvider->expects($this->never())
+            ->method('getSearchableAttribute');
+        $this->fieldMapperMock->method('getFieldName')
+            ->willReturnArgument(0);
+        $this->additionalFieldsProvider->expects($this->once())
+            ->method('getFields')
+            ->willReturn([]);
+
+        $documentData = [
+            $productId => ['options' => $attributeValue],
+        ];
+        $documents = $this->model->map($documentData, $storeId, $context);
+        $this->assertEquals($returnAttributeData, $documents[$productId]);
+    }
+
+    /**
+     * Return attribute mock
+     *
+     * @param array attributeData
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getAttribute(array $attributeData): \PHPUnit_Framework_MockObject_MockObject
+    {
+        $attributeMock = $this->createMock(Attribute::class);
+        $attributeMock->method('getAttributeCode')->willReturn($attributeData['code']);
+        $attributeMock->method('getBackendType')->willReturn($attributeData['backendType']);
+        $attributeMock->method('getFrontendInput')->willReturn($attributeData['frontendInput']);
+        $attributeMock->method('getIsSearchable')->willReturn($attributeData['is_searchable']);
+        $options = [];
+        foreach ($attributeData['options'] as $option) {
+            $optionMock = $this->createMock(AttributeOptionInterface::class);
+            $optionMock->method('getValue')->willReturn($option['value']);
+            $optionMock->method('getLabel')->willReturn($option['label']);
+            $options[] = $optionMock;
+        }
+        $attributeMock->method('getOptions')->willReturn($options);
+
+        return $attributeMock;
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public static function mapProvider(): array
+    {
+        return [
+            'text' => [
+                10,
+                [
+                    'code' => 'description',
+                    'backendType' => 'text',
+                    'frontendInput' => 'text',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                'some text',
+                ['description' => 'some text'],
+            ],
+            'datetime' => [
+                10,
+                [
+                    'code' => 'created_at',
+                    'backendType' => 'datetime',
+                    'frontendInput' => 'date',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                '00-00-00 00:00:00',
+                ['created_at' => '00-00-00 00:00:00'],
+
+            ],
+            'array single value' => [
+                10,
+                [
+                    'code' => 'attribute_array',
+                    'backendType' => 'text',
+                    'frontendInput' => 'text',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                [10 => 'one'],
+                ['attribute_array' => 'one'],
+            ],
+            'array multiple value' => [
+                10,
+                [
+                    'code' => 'attribute_array',
+                    'backendType' => 'text',
+                    'frontendInput' => 'text',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                [10 => 'one', 11 => 'two', 12 => 'three'],
+                ['attribute_array' => ['one', 'two', 'three']],
+            ],
+            'array multiple decimal value' => [
+                10,
+                [
+                    'code' => 'decimal_array',
+                    'backendType' => 'decimal',
+                    'frontendInput' => 'text',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                [10 => '0.1', 11 => '0.2', 12 => '0.3'],
+                ['decimal_array' => ['0.1', '0.2', '0.3']],
+            ],
+            'array excluded from merge' => [
+                10,
+                [
+                    'code' => 'status',
+                    'backendType' => 'int',
+                    'frontendInput' => 'select',
+                    'is_searchable' => false,
+                    'options' => [
+                        ['value' => '1', 'label' => 'Enabled'],
+                        ['value' => '2', 'label' => 'Disabled'],
+                    ],
+                ],
+                [10  => '1', 11 => '2'],
+                ['status' => '1'],
+            ],
+            'select without options' => [
+                10,
+                [
+                    'code' => 'color',
+                    'backendType' => 'text',
+                    'frontendInput' => 'select',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                '44',
+                ['color' => '44'],
+            ],
+            'unsearchable select with options' => [
+                10,
+                [
+                    'code' => 'color',
+                    'backendType' => 'text',
+                    'frontendInput' => 'select',
+                    'is_searchable' => false,
+                    'options' => [
+                        ['value' => '44', 'label' => 'red'],
+                        ['value' => '45', 'label' => 'black'],
+                    ],
+                ],
+                '44',
+                ['color' => '44'],
+            ],
+            'searchable select with options' => [
+                10,
+                [
+                    'code' => 'color',
+                    'backendType' => 'text',
+                    'frontendInput' => 'select',
+                    'is_searchable' => true,
+                    'options' => [
+                        ['value' => '44', 'label' => 'red'],
+                        ['value' => '45', 'label' => 'black'],
+                    ],
+                ],
+                '44',
+                ['color' => '44', 'color_value' => 'red'],
+            ],
+            'composite select with options' => [
+                10,
+                [
+                    'code' => 'color',
+                    'backendType' => 'text',
+                    'frontendInput' => 'select',
+                    'is_searchable' => true,
+                    'options' => [
+                        ['value' => '44', 'label' => 'red'],
+                        ['value' => '45', 'label' => 'black'],
+                    ],
+                ],
+                [10 => '44', 11 => '45'],
+                ['color' => ['44', '45'], 'color_value' => ['red', 'black']],
+            ],
+            'multiselect without options' => [
+                10,
+                [
+                    'code' => 'multicolor',
+                    'backendType' => 'text',
+                    'frontendInput' => 'multiselect',
+                    'is_searchable' => false,
+                    'options' => [],
+                ],
+                '44,45',
+                ['multicolor' => [44, 45]],
+            ],
+            'unsearchable multiselect with options' => [
+                10,
+                [
+                    'code' => 'multicolor',
+                    'backendType' => 'text',
+                    'frontendInput' => 'multiselect',
+                    'is_searchable' => false,
+                    'options' => [
+                        ['value' => '44', 'label' => 'red'],
+                        ['value' => '45', 'label' => 'black'],
+                    ],
+                ],
+                '44,45',
+                ['multicolor' => [44, 45]],
+            ],
+            'searchable multiselect with options' => [
+                10,
+                [
+                    'code' => 'multicolor',
+                    'backendType' => 'text',
+                    'frontendInput' => 'multiselect',
+                    'is_searchable' => true,
+                    'options' => [
+                        ['value' => '44', 'label' => 'red'],
+                        ['value' => '45', 'label' => 'black'],
+                    ],
+                ],
+                '44,45',
+                ['multicolor' => [44, 45], 'multicolor_value' => ['red', 'black']],
+            ],
+            'composite multiselect with options' => [
+                10,
+                [
+                    'code' => 'multicolor',
+                    'backendType' => 'text',
+                    'frontendInput' => 'multiselect',
+                    'is_searchable' => true,
+                    'options' => [
+                        ['value' => '44', 'label' => 'red'],
+                        ['value' => '45', 'label' => 'black'],
+                        ['value' => '46', 'label' => 'green'],
+                    ],
+                ],
+                [10 => '44,45', 11 => '45,46'],
+                ['multicolor' => [44, 45, 46], 'multicolor_value' => ['red', 'black', 'green']],
+            ],
+            'excluded attribute' => [
+                10,
+                [
+                    'code' => 'price',
+                    'backendType' => 'int',
+                    'frontendInput' => 'int',
+                    'is_searchable' => false,
+                    'options' => []
+                ],
+                15,
+                []
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Container/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Container/AttributeTest.php
new file mode 100644
index 0000000000000..ca5d570d735f5
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Container/AttributeTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Container;
+
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for Magento\Elasticsearch\Model\Adapter\Container\Attribute
+ */
+class AttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Container\Attribute
+     */
+    private $attribute;
+
+    /**
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->attribute = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Container\Attribute::class,
+            [
+                'attributeCollection' => $this->collectionMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAttributeCodeById()
+    {
+        $attributeId = 555;
+        $attributeCode = 'test_attr_code1';
+        $expected = 'test_attr_code1';
+        $this->mockAttributeById($attributeId, $attributeCode);
+        $result = $this->attribute->getAttributeCodeById($attributeId);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetOptionsAttributeCodeById()
+    {
+        $attributeId = 'options';
+        $expected = 'options';
+        $result = $this->attribute->getAttributeCodeById($attributeId);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAttributeIdByCode()
+    {
+        $attributeId = 100;
+        $attributeCode = 'test_attribute_code';
+        $this->mockAttributeByCode($attributeId, $attributeCode);
+        $result = $this->attribute->getAttributeIdByCode($attributeCode);
+        $this->assertEquals($attributeId, $result);
+    }
+
+    /**
+     * Test getAttributeIdByCode() method.
+     */
+    public function testGetOptionsAttributeIdByCode()
+    {
+        $attributeCode = 'options';
+        $expected = 'options';
+        $result = $this->attribute->getAttributeIdByCode($attributeCode);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetMultipleAttributeIdsByCode()
+    {
+        $firstAttributeId = 100;
+        $firstAttributeCode = 'test_attribute_code_100';
+        $this->mockAttributeByCode($firstAttributeId, $firstAttributeCode, 0);
+        $this->assertEquals($firstAttributeId, $this->attribute->getAttributeIdByCode($firstAttributeCode));
+
+        $secondAttributeId = 200;
+        $secondAttributeCode = 'test_attribute_code_200';
+        $this->mockAttributeByCode($secondAttributeId, $secondAttributeCode, 0);
+        $this->assertEquals($secondAttributeId, $this->attribute->getAttributeIdByCode($secondAttributeCode));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAttributeByIdTwice()
+    {
+        $attributeId = 555;
+        $attributeCode = 'test_attr_code2';
+        $expected = 'test_attr_code2';
+        $this->mockAttributeById($attributeId, $attributeCode, 0);
+        $this->assertEquals($expected, $this->attribute->getAttributeCodeById($attributeId));
+        $this->assertEquals($expected, $this->attribute->getAttributeCodeById($attributeId));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAttributeByIdCachedInGetAttributeByCode()
+    {
+        $attributeId = 100;
+        $attributeCode = 'test_attribute_code';
+        $this->mockAttributeByCode($attributeId, $attributeCode);
+        $this->assertEquals($attributeId, $this->attribute->getAttributeIdByCode($attributeCode));
+        $this->assertEquals($attributeCode, $this->attribute->getAttributeCodeById($attributeId));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAttribute()
+    {
+        $attributeCode = 'attr_code_120';
+        $attribute = $this->createAttributeMock(120, $attributeCode);
+        $attributes = [
+            $attribute
+        ];
+        $this->mockAttributes($attributes);
+        $this->assertEquals($attribute, $this->attribute->getAttribute($attributeCode));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetUnknownAttribute()
+    {
+        $attributeCode = 'attr_code_120';
+        $attributes = [
+            $this->createAttributeMock(120, 'attribute_code')
+        ];
+        $this->mockAttributes($attributes);
+        $this->assertEquals(null, $this->attribute->getAttribute($attributeCode));
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAttributes()
+    {
+        $attributes = [
+            'attr_1_mock' => $this->createAttributeMock(1, 'attr_1_mock'),
+            'attr_20_mock' => $this->createAttributeMock(20, 'attr_20_mock'),
+            'attr_25_mock' => $this->createAttributeMock(25, 'attr_25_mock'),
+            'attr_40_mock' => $this->createAttributeMock(40, 'attr_40_mock'),
+            'attr_73_mock' => $this->createAttributeMock(73, 'attr_73_mock'),
+            'attr_52_mock' => $this->createAttributeMock(52, 'attr_52_mock'),
+            'attr_97_mock' => $this->createAttributeMock(97, 'attr_97_mock'),
+        ];
+        $this->mockAttributes($attributes);
+        $this->assertEquals($attributes, $this->attribute->getAttributes());
+    }
+
+    /**
+     * @param array $attributes
+     * @return void
+     */
+    private function mockAttributes(array $attributes)
+    {
+        $this->collectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($attributes));
+    }
+
+    /**
+     * @param int $attributeId
+     * @param string $attributeCode
+     * @param int $sequence
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function mockAttributeById($attributeId, $attributeCode, $sequence = 0)
+    {
+        $attribute = $this->createAttributeMock($attributeId, $attributeCode);
+        $this->collectionMock->expects($this->at($sequence))
+            ->method('getItemById')
+            ->with($attributeId)
+            ->willReturn($attribute);
+        return $attribute;
+    }
+
+    /**
+     * @param int $attributeId
+     * @param string $attributeCode
+     * @param int $sequence
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function mockAttributeByCode($attributeId, $attributeCode, $sequence = 0)
+    {
+        $attribute = $this->createAttributeMock($attributeId, $attributeCode);
+        $this->collectionMock->expects($this->at($sequence))
+            ->method('getItemByColumnValue')
+            ->with('attribute_code', $attributeCode)
+            ->willReturn($attribute);
+        return $attribute;
+    }
+
+    /**
+     * @param int $attributeId
+     * @param string $attributeCode
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createAttributeMock($attributeId, $attributeCode)
+    {
+        $attribute = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->setMethods(['getAttributeCode', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attribute->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $attribute->method('getId')
+            ->willReturn($attributeId);
+        return $attribute;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php
new file mode 100644
index 0000000000000..ced529660af06
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php
@@ -0,0 +1,400 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\DataMapper;
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer;
+use Magento\Elasticsearch\Model\Adapter\Document\Builder;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper;
+use Magento\Elasticsearch\Model\ResourceModel\Index;
+use Magento\AdvancedSearch\Model\ResourceModel\Index as AdvancedSearchIndex;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Class ProductDataMapperTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductDataMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductDataMapper
+     */
+    protected $model;
+
+    /**
+     * @var Builder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $builderMock;
+
+    /**
+     * @var AttributeContainer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeContainerMock;
+
+    /**
+     * @var Attribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attribute;
+
+    /**
+     * @var Index|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceIndex;
+
+    /**
+     * @var AdvancedSearchIndex|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $advancedSearchIndex;
+
+    /**
+     * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fieldMapperMock;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeDateMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeInterface;
+
+    /**
+     * Set up test environment.
+     */
+    protected function setUp()
+    {
+        $this->builderMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Document\Builder::class)
+            ->setMethods(['addField', 'addFields', 'build'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->attributeContainerMock = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\Container\Attribute::class
+        )->setMethods(['getAttribute', 'setStoreId', 'getBackendType', 'getFrontendInput'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resourceIndex = $this->getMockBuilder(\Magento\Elasticsearch\Model\ResourceModel\Index::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getPriceIndexData',
+                'getFullCategoryProductIndexData',
+                'getFullProductIndexData',
+            ])
+            ->getMock();
+
+        $this->fieldMapperMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->setMethods(['getFieldName', 'getAllAttributesTypes'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class)
+            ->setMethods(['isEmptyDate', 'setTimezone', 'format'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->advancedSearchIndex = $this->getMockBuilder(\Magento\AdvancedSearch\Model\ResourceModel\Index::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->attribute = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper::class,
+            [
+                'builder' => $this->builderMock,
+                'attributeContainer' => $this->attributeContainerMock,
+                'resourceIndex' => $this->resourceIndex,
+                'fieldMapper' => $this->fieldMapperMock,
+                'dateTime' => $this->dateTimeMock,
+                'localeDate' => $this->localeDateMock,
+                'scopeConfig' => $this->scopeConfigMock,
+                'storeManager' => $this->storeManagerMock
+            ]
+        );
+    }
+
+    /**
+     * Tests modules data returns array
+     *
+     * @dataProvider mapProvider
+     * @param int $productId
+     * @param array $productData
+     * @param int $storeId
+     * @param bool $emptyDate
+     * @param string $type
+     * @param string $frontendInput
+     *
+     * @return void
+     */
+    public function testGetMap($productId, $productData, $storeId, $emptyDate, $type, $frontendInput)
+    {
+        $this->attributeContainerMock->expects($this->any())->method('getAttribute')->will(
+            $this->returnValue($this->attribute)
+        );
+        $this->resourceIndex->expects($this->any())
+            ->method('getPriceIndexData')
+            ->with([1, ], 1)
+            ->willReturn([
+                1 => [1]
+            ]);
+        $this->resourceIndex->expects($this->any())
+            ->method('getFullCategoryProductIndexData')
+            ->willReturn([
+                1 => [
+                    0 => [
+                        'id' => 2,
+                        'name' => 'Default Category',
+                        'position' => '1',
+                    ],
+                    1 => [
+                        'id' => 3,
+                        'name' => 'Gear',
+                        'position' => '1',
+                    ],
+                    2 => [
+                        'id' => 4,
+                        'name' => 'Bags',
+                        'position' => '1',
+                    ],
+                ],
+            ]);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->storeInterface);
+        $this->storeInterface->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+        $this->attributeContainerMock->expects($this->any())->method('setStoreId')->will(
+            $this->returnValue($this->attributeContainerMock)
+        );
+        $this->attribute->expects($this->any())->method('getBackendType')->will(
+            $this->returnValue($type)
+        );
+        $this->attribute->expects($this->any())->method('getFrontendInput')->will(
+            $this->returnValue($frontendInput)
+        );
+        $this->dateTimeMock->expects($this->any())->method('isEmptyDate')->will(
+            $this->returnValue($emptyDate)
+        );
+        $this->scopeConfigMock->expects($this->any())->method('getValue')->will(
+            $this->returnValue('Europe/London')
+        );
+        $this->builderMock->expects($this->any())->method('addField')->will(
+            $this->returnValue([])
+        );
+        $this->builderMock->expects($this->any())->method('addFields')->will(
+            $this->returnValue([])
+        );
+        $this->builderMock->expects($this->any())->method('build')->will(
+            $this->returnValue([])
+        );
+
+        $this->resourceIndex->expects($this->once())
+            ->method('getFullProductIndexData')
+            ->willReturn($productData);
+
+        $this->assertInternalType(
+            'array',
+            $this->model->map($productId, $productData, $storeId)
+        );
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public static function mapProvider()
+    {
+        return [
+            [
+                '1',
+                ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'],
+                '1',
+                false,
+                'datetime',
+                'select',
+            ],
+            [
+                '1',
+                ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'],
+                '1',
+                false,
+                'time',
+                'multiselect',
+            ],
+            [
+                '1',
+                ['price'=>'11','created_at'=>null,'color_value'=>'11', ],
+                '1',
+                true,
+                'datetime',
+                'select',
+            ],
+            [
+                '1',
+                [
+                    'tier_price'=>
+                        [[
+                            'price_id'=>'1',
+                            'website_id'=>'1',
+                            'all_groups'=>'1',
+                            'cust_group'=>'1',
+                            'price_qty'=>'1',
+                            'website_price'=>'1',
+                            'price'=>'1'
+                        ]],
+                        'created_at'=>'00-00-00 00:00:00'
+                ],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+            [
+                '1',
+                ['image'=>'11','created_at'=>'00-00-00 00:00:00'],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+            [
+                '1',
+                [
+                    'image' => '1',
+                    'small_image' => '1',
+                    'thumbnail' => '1',
+                    'swatch_image' => '1',
+                    'media_gallery'=>
+                        [
+                            'images' =>
+                                [[
+                                    'file'=>'1',
+                                    'media_type'=>'image',
+                                    'position'=>'1',
+                                    'disabled'=>'1',
+                                    'label'=>'1',
+                                    'title'=>'1',
+                                    'base_image'=>'1',
+                                    'small_image'=>'1',
+                                    'thumbnail'=>'1',
+                                    'swatch_image'=>'1'
+                                ]]
+                        ],
+                        'created_at'=>'00-00-00 00:00:00'
+                ],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+            [
+                '1',
+                [
+                    'image' => '1',
+                    'small_image' => '1',
+                    'thumbnail' => '1',
+                    'swatch_image' => '1',
+                    'media_gallery'=>
+                        [
+                            'images' =>
+                                [[
+                                    'file'=>'1',
+                                    'media_type'=>'video',
+                                    'position'=>'1',
+                                    'disabled'=>'1',
+                                    'label'=>'1',
+                                    'title'=>'1',
+                                    'base_image'=>'1',
+                                    'small_image'=>'1',
+                                    'thumbnail'=>'1',
+                                    'swatch_image'=>'1',
+                                    'video_title'=>'1',
+                                    'video_url'=>'1',
+                                    'video_description'=>'1',
+                                    'video_metadata'=>'1',
+                                    'video_provider'=>'1'
+                                ]]
+                        ],
+                        'created_at'=>'00-00-00 00:00:00'
+                ],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+            [
+                '1',
+                ['quantity_and_stock_status'=>'11','created_at'=>'00-00-00 00:00:00'],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+            [
+                '1',
+                ['quantity_and_stock_status'=>['is_in_stock' => '1', 'qty' => '12'],'created_at'=>'00-00-00 00:00:00'],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+            [
+                '1',
+                ['price'=>'11','created_at'=>'1995-12-31 23:59:59','options'=>['value1','value2']],
+                '1',
+                false,
+                'string',
+                'select',
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Document/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Document/BuilderTest.php
new file mode 100644
index 0000000000000..e6c4728940a6e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Document/BuilderTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Document;
+
+use Magento\Elasticsearch\Model\Adapter\Document\Builder;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for Magento\Elasticsearch\Model\Adapter\Document\Builder
+ */
+class BuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Builder
+     */
+    protected $builder;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $this->builder = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Document\Builder::class
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testBuildWithSimpleField()
+    {
+        $document = [ 'fieldName' => 'fieldValue'];
+        $field = 'fieldName';
+        $value = 'fieldValue';
+
+        $this->builder->addField($field, $value);
+        $result = $this->builder->build();
+        $this->assertEquals($document, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testBuildWithTwoSimpleFields()
+    {
+        $document = [
+            'fieldNameOne' => 'fieldValueOne',
+            'fieldNameTwo' => 'fieldValueTwo'
+        ];
+
+        $fieldOne = 'fieldNameOne';
+        $valueOne = 'fieldValueOne';
+
+        $fieldTwo = 'fieldNameTwo';
+        $valueTwo = 'fieldValueTwo';
+
+        $this->builder->addField($fieldOne, $valueOne);
+        $this->builder->addField($fieldTwo, $valueTwo);
+        $result = $this->builder->build();
+        $this->assertEquals($document, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testBuildWithSimpleFieldAndFieldsArray()
+    {
+        $document = [
+            'fieldNameOne' => 'fieldValueOne',
+            'fieldNameTwo' => 'changedFieldValueTwo',
+            'fieldThree' => 'fieldValueThree',
+            'fieldFour' => 'fieldValueFour'
+        ];
+        $this->builder->addField('fieldNameOne', 'fieldValueOne');
+        $this->builder->addField('fieldNameTwo', 'fieldValueTwo');
+
+        $this->builder->addFields(
+            [
+                'fieldThree' => 'fieldValueThree',
+                'fieldNameTwo' => 'changedFieldValueTwo',
+                'fieldFour' => 'fieldValueFour',
+            ]
+        );
+
+        $result = $this->builder->build();
+        $this->assertEquals($document, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testBuildWithArrayField()
+    {
+        $document = [
+            'nameOfField' => [
+                'value1','value2'
+            ]
+        ];
+        $field = 'nameOfField';
+        $values = ['value1', 'value2'];
+
+        $this->builder->addField($field, $values);
+
+        $result = $this->builder->build();
+        $this->assertEquals($document, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testBuildWithEmptyArrayField()
+    {
+        $document = [
+            'nameOfField' => []
+        ];
+        $field = 'nameOfField';
+        $values = [];
+
+        $this->builder->addField($field, $values);
+
+        $result = $this->builder->build();
+        $this->assertEquals($document, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testBuildTwoDocuments()
+    {
+        $documentOne = [
+            'docOneFieldOne' => 'docOneValueOne',
+            'docOneFieldTwo' => 'docOneValueTwo'
+        ];
+        $documentTwo = [
+            'docTwoFieldOne' => 'docTwoValueOne',
+            'docTwoFieldTwo' => 'docTwoValueTwo'
+        ];
+
+        $docOneFieldOne = 'docOneFieldOne';
+        $docOneValueOne = 'docOneValueOne';
+        $docOneFieldTwo = 'docOneFieldTwo';
+        $docOneValueTwo = 'docOneValueTwo';
+
+        $docTwoFieldOne = 'docTwoFieldOne';
+        $docTwoValueOne = 'docTwoValueOne';
+        $docTwoFieldTwo = 'docTwoFieldTwo';
+        $docTwoValueTwo = 'docTwoValueTwo';
+
+        $this->builder->addField($docOneFieldOne, $docOneValueOne);
+        $this->builder->addField($docOneFieldTwo, $docOneValueTwo);
+        $resultOne = $this->builder->build();
+
+        $this->builder->addField($docTwoFieldOne, $docTwoValueOne);
+        $this->builder->addField($docTwoFieldTwo, $docTwoValueTwo);
+        $resultTwo = $this->builder->build();
+
+        $this->assertEquals($documentOne, $resultOne);
+        $this->assertEquals($documentTwo, $resultTwo);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
new file mode 100644
index 0000000000000..ec50ba7b3d5df
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -0,0 +1,482 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter;
+
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface;
+use Psr\Log\LoggerInterface;
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
+
+/**
+ * Class ElasticsearchTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ElasticsearchTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ElasticsearchAdapter
+     */
+    protected $model;
+
+    /**
+     * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionManager;
+
+    /**
+     * @var BatchDataMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $batchDocumentDataMapper;
+
+    /**
+     * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var ClientOptionsInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientConfig;
+
+    /**
+     * @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $indexBuilder;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $logger;
+
+    /**
+     * @var ElasticsearchClient|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $client;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManager;
+
+    /**
+     * @var IndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $indexNameResolver;
+
+    /**
+     * Setup
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getConnection'])
+            ->getMock();
+        $this->documentDataMapper = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\DataMapperInterface::class
+        )->disableOriginalConstructor()->getMock();
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getIndexPrefix',
+                'getEntityType',
+            ])->getMock();
+        $this->indexBuilder = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
+            ->setMethods([
+                'indices',
+                'ping',
+                'bulk',
+                'search',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class)
+            ->setMethods([
+                'exists',
+                'getSettings',
+                'create',
+                'putMapping',
+                'deleteMapping',
+                'existsAlias',
+                'updateAliases',
+                'stats'
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $elasticsearchClientMock->expects($this->any())
+            ->method('indices')
+            ->willReturn($indicesMock);
+        $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->setConstructorArgs([
+                'options' => $this->getClientOptions(),
+                'elasticsearchClient' => $elasticsearchClientMock
+            ])
+            ->getMock();
+        $this->connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->client);
+        $this->fieldMapper->expects($this->any())
+            ->method('getAllAttributesTypes')
+            ->willReturn([
+                'name' => 'string',
+            ]);
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexPrefix')
+            ->willReturn('indexName');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('product');
+        $this->indexNameResolver = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class
+        )
+            ->setMethods([
+                'getIndexName',
+                'getIndexNamespace',
+                'getIndexFromAlias',
+                'getIndexNameForAlias',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->batchDocumentDataMapper = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface::class
+        )->disableOriginalConstructor()
+            ->getMock();
+        $this->model = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'batchDocumentDataMapper' => $this->batchDocumentDataMapper,
+                'fieldMapper' => $this->fieldMapper,
+                'clientConfig' => $this->clientConfig,
+                'indexBuilder' => $this->indexBuilder,
+                'logger' => $this->logger,
+                'indexNameResolver' => $this->indexNameResolver,
+                'options' => [],
+            ]
+        );
+    }
+
+    /**
+     * Test ping() method
+     */
+    public function testPing()
+    {
+        $this->client->expects($this->once())
+            ->method('ping')
+            ->willReturn(true);
+        $this->assertEquals(true, $this->model->ping());
+    }
+
+    /**
+     * Test ping() method
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testPingFailure()
+    {
+        $this->client->expects($this->once())
+            ->method('ping')
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->ping();
+    }
+
+    /**
+     * Test prepareDocsPerStore() method
+     */
+    public function testPrepareDocsPerStoreEmpty()
+    {
+        $this->assertEquals([], $this->model->prepareDocsPerStore([], 1));
+    }
+
+    /**
+     * Test prepareDocsPerStore() method
+     */
+    public function testPrepareDocsPerStore()
+    {
+        $this->batchDocumentDataMapper->expects($this->once())
+            ->method('map')
+            ->willReturn([
+                'name' => 'Product Name',
+            ]);
+        $this->assertInternalType(
+            'array',
+            $this->model->prepareDocsPerStore(
+                [
+                    '1' => [
+                        'name' => 'Product Name',
+                    ],
+                ],
+                1
+            )
+        );
+    }
+
+    /**
+     * Test addDocs() method
+     */
+    public function testAddDocs()
+    {
+        $this->client->expects($this->once())
+            ->method('bulkQuery');
+        $this->assertSame(
+            $this->model,
+            $this->model->addDocs(
+                [
+                    '1' => [
+                        'name' => 'Product Name',
+                    ],
+                ],
+                1,
+                'product'
+            )
+        );
+    }
+
+    /**
+     * Test addDocs() method
+     * @expectedException \Exception
+     */
+    public function testAddDocsFailure()
+    {
+        $this->client->expects($this->once())
+            ->method('bulkQuery')
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->addDocs(
+            [
+                '1' => [
+                    'name' => 'Product Name',
+                ],
+            ],
+            1,
+            'product'
+        );
+    }
+
+    /**
+     * Test cleanIndex() method
+     */
+    public function testCleanIndex()
+    {
+        $this->indexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->with(1, 'product', [])
+            ->willReturn('indexName_product_1_v');
+
+        $this->client->expects($this->once())
+            ->method('isEmptyIndex')
+            ->with('indexName_product_1_v')
+            ->willReturn(false);
+        $this->client->expects($this->atLeastOnce())
+            ->method('indexExists')
+            ->willReturn(true);
+        $this->client->expects($this->once())
+            ->method('deleteIndex')
+            ->with('_product_1_v1');
+        $this->assertSame(
+            $this->model,
+            $this->model->cleanIndex(1, 'product')
+        );
+    }
+
+    /**
+     * Test cleanIndex() method isEmptyIndex is true
+     */
+    public function testCleanIndexTrue()
+    {
+        $this->indexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('indexName_product_1_v');
+
+        $this->client->expects($this->once())
+            ->method('isEmptyIndex')
+            ->with('indexName_product_1_v')
+            ->willReturn(true);
+
+        $this->assertSame(
+            $this->model,
+            $this->model->cleanIndex(1, 'product')
+        );
+    }
+
+    /**
+     * Test deleteDocs() method
+     */
+    public function testDeleteDocs()
+    {
+        $this->client->expects($this->once())
+            ->method('bulkQuery');
+        $this->assertSame(
+            $this->model,
+            $this->model->deleteDocs(['1' => 1], 1, 'product')
+        );
+    }
+
+    /**
+     * Test deleteDocs() method
+     * @expectedException \Exception
+     */
+    public function testDeleteDocsFailure()
+    {
+        $this->client->expects($this->once())
+            ->method('bulkQuery')
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->deleteDocs(['1' => 1], 1, 'product');
+    }
+
+    /**
+     * Test updateAlias() method
+     */
+    public function testUpdateAliasEmpty()
+    {
+        $model = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'batchDocumentDataMapper' => $this->batchDocumentDataMapper,
+                'fieldMapper' => $this->fieldMapper,
+                'clientConfig' => $this->clientConfig,
+                'indexBuilder' => $this->indexBuilder,
+                'logger' => $this->logger,
+                'indexNameResolver' => $this->indexNameResolver,
+                'options' => []
+            ]
+        );
+
+        $this->client->expects($this->never())
+            ->method('updateAlias');
+
+        $this->assertEquals($model, $model->updateAlias(1, 'product'));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testConnectException()
+    {
+        $connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getConnection',
+            ])
+            ->getMock();
+
+        $connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willThrowException(new \Exception('Something went wrong'));
+
+        $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class,
+            [
+                'connectionManager' => $connectionManager,
+                'batchDocumentDataMapper' => $this->batchDocumentDataMapper,
+                'fieldMapper' => $this->fieldMapper,
+                'clientConfig' => $this->clientConfig,
+                'indexBuilder' => $this->indexBuilder,
+                'logger' => $this->logger,
+                'indexNameResolver' => $this->indexNameResolver,
+                'options' => []
+            ]
+        );
+    }
+
+    /**
+     * Test updateAlias() method
+     */
+    public function testUpdateAlias()
+    {
+        $this->client->expects($this->atLeastOnce())
+            ->method('updateAlias');
+        $this->indexNameResolver->expects($this->any())
+            ->method('getIndexFromAlias')
+            ->willReturn('_product_1_v1');
+
+        $this->model->cleanIndex(1, 'product');
+        $this->assertEquals($this->model, $this->model->updateAlias(1, 'product'));
+    }
+
+    /**
+     * Test updateAlias() method
+     */
+    public function testUpdateAliasWithOldIndex()
+    {
+        $this->model->cleanIndex(1, 'product');
+
+        $this->indexNameResolver->expects($this->any())
+            ->method('getIndexFromAlias')
+            ->willReturn('_product_1_v2');
+
+        $this->indexNameResolver->expects($this->any())
+            ->method('getIndexNameForAlias')
+            ->willReturn('_product_1_v2');
+
+        $this->client->expects($this->any())
+            ->method('existsAlias')
+            ->with('indexName')
+            ->willReturn(true);
+
+        $this->client->expects($this->any())
+            ->method('getAlias')
+            ->with('indexName')
+            ->willReturn(['indexName_product_1_v' => 'indexName_product_1_v']);
+
+        $this->assertEquals($this->model, $this->model->updateAlias(1, 'product'));
+    }
+
+    /**
+     * Test updateAlias() method
+     */
+    public function testUpdateAliasWithoutOldIndex()
+    {
+        $this->model->cleanIndex(1, 'product');
+        $this->client->expects($this->any())
+            ->method('existsAlias')
+            ->with('indexName')
+            ->willReturn(true);
+
+        $this->client->expects($this->any())
+            ->method('getAlias')
+            ->with('indexName')
+            ->willReturn(['indexName_product_1_v2' => 'indexName_product_1_v2']);
+
+        $this->assertEquals($this->model, $this->model->updateAlias(1, 'product'));
+    }
+
+    /**
+     * Get elasticsearch client options
+     *
+     * @return array
+     */
+    protected function getClientOptions()
+    {
+        return [
+            'hostname' => 'localhost',
+            'port' => '9200',
+            'timeout' => 15,
+            'index' => 'magento2',
+            'enableAuth' => 1,
+            'username' => 'user',
+            'password' => 'my-password',
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php
new file mode 100644
index 0000000000000..d1092e40fa9a2
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver;
+use Magento\Framework\ObjectManagerInterface;
+
+class FieldMapperResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FieldMapperResolver
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var string[]
+     */
+    private $fieldMappers;
+
+    /**
+     * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fieldMapperEntity;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldMapperEntity = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldMappers = [
+            'product' => 'productFieldMapper',
+        ];
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver::class,
+            [
+                'objectManager' => $this->objectManagerMock,
+                'fieldMappers' => $this->fieldMappers
+            ]
+        );
+    }
+
+    /**
+     * Test getFieldName() with Exception
+     * @return void
+     * @expectedException \Exception
+     */
+    public function testGetFieldNameEmpty()
+    {
+        $this->model->getFieldName('attribute', ['entityType' => '']);
+    }
+
+    /**
+     * Test getFieldName() with Exception
+     * @return void
+     * @expectedException \LogicException
+     */
+    public function testGetFieldNameWrongType()
+    {
+        $this->model->getFieldName('attribute', ['entityType' => 'error']);
+    }
+
+    /**
+     * Test getFieldName() with Exception
+     * @return void
+     * @expectedException \InvalidArgumentException
+     */
+    public function testGetFieldNameFailure()
+    {
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn(false);
+        $this->model->getFieldName('attribute', ['entityType' => 'product']);
+    }
+
+    /**
+     * Test getFieldName() method
+     * @return void
+     */
+    public function testGetFieldName()
+    {
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->fieldMapperEntity);
+        $this->model->getFieldName('attribute', []);
+    }
+
+    /**
+     * Test getAllAttributesTypes() method
+     * @return void
+     */
+    public function testGetAllAttributesTypes()
+    {
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->fieldMapperEntity);
+        $this->model->getAllAttributesTypes([]);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php
new file mode 100644
index 0000000000000..9ca65d8e675b9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php
@@ -0,0 +1,387 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product;
+
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class AttributeAdapterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter
+     */
+    private $adapter;
+
+    /**
+     * @var AbstractExtensibleModel
+     */
+    private $attribute;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->attribute = $this->getMockBuilder(CustomAttributesDataInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getIsFilterable',
+                'getIsFilterableInSearch',
+                'getIsSearchable',
+                'getIsVisibleInAdvancedSearch',
+                'getBackendType',
+                'getFrontendInput',
+                'usesSource',
+            ])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->adapter = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter::class,
+            [
+                'attribute' => $this->attribute,
+                'attributeCode' => 'code',
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider isFilterableProvider
+     * @param $isFilterable
+     * @param $isFilterableInSearch
+     * @param $expected
+     * @return void
+     */
+    public function testIsFilterable($isFilterable, $isFilterableInSearch, $expected)
+    {
+        $this->attribute
+            ->method('getIsFilterable')
+            ->willReturn($isFilterable);
+        $this->attribute
+            ->method('getIsFilterableInSearch')
+            ->willReturn($isFilterableInSearch);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isFilterable()
+        );
+    }
+
+    /**
+     * @dataProvider isSearchableProvider
+     * @param $isSearchable
+     * @param $isVisibleInAdvancedSearch
+     * @param $isFilterable
+     * @param $isFilterableInSearch
+     * @param $expected
+     * @return void
+     */
+    public function testIsSearchable(
+        $isSearchable,
+        $isVisibleInAdvancedSearch,
+        $isFilterable,
+        $isFilterableInSearch,
+        $expected
+    ) {
+        $this->attribute
+            ->method('getIsSearchable')
+            ->willReturn($isSearchable);
+        $this->attribute
+            ->method('getIsVisibleInAdvancedSearch')
+            ->willReturn($isVisibleInAdvancedSearch);
+        $this->attribute
+            ->method('getIsFilterable')
+            ->willReturn($isFilterable);
+        $this->attribute
+            ->method('getIsFilterableInSearch')
+            ->willReturn($isFilterableInSearch);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isSearchable()
+        );
+    }
+
+    /**
+     * @dataProvider isAlwaysIndexableProvider
+     * @param $expected
+     * @return void
+     */
+    public function testIsAlwaysIndexable($expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isAlwaysIndexable()
+        );
+    }
+
+    /**
+     * @dataProvider isDateTimeTypeProvider
+     * @param $backendType
+     * @param $expected
+     * @return void
+     */
+    public function testIsDateTimeType($backendType, $expected)
+    {
+        $this->attribute
+            ->method('getBackendType')
+            ->willReturn($backendType);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isDateTimeType()
+        );
+    }
+
+    /**
+     * @dataProvider isFloatTypeProvider
+     * @param $backendType
+     * @param $expected
+     * @return void
+     */
+    public function testIsFloatType($backendType, $expected)
+    {
+        $this->attribute
+            ->method('getBackendType')
+            ->willReturn($backendType);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isFloatType()
+        );
+    }
+
+    /**
+     * @dataProvider isIntegerTypeProvider
+     * @param $backendType
+     * @param $expected
+     * @return void
+     */
+    public function testIsIntegerType($backendType, $expected)
+    {
+        $this->attribute
+            ->method('getBackendType')
+            ->willReturn($backendType);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isIntegerType()
+        );
+    }
+
+    /**
+     * @dataProvider isBooleanTypeProvider
+     * @param $frontendInput
+     * @param $backendType
+     * @param $expected
+     * @return void
+     */
+    public function testIsBooleanType($frontendInput, $backendType, $expected)
+    {
+        $this->attribute
+            ->method('getBackendType')
+            ->willReturn($backendType);
+        $this->attribute
+            ->method('getFrontendInput')
+            ->willReturn($frontendInput);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isBooleanType()
+        );
+    }
+
+    /**
+     * @dataProvider isComplexTypeProvider
+     * @param $frontendInput
+     * @param $usesSource
+     * @param $expected
+     * @return void
+     */
+    public function testIsComplexType($frontendInput, $usesSource, $expected)
+    {
+        $this->attribute
+            ->method('usesSource')
+            ->willReturn($usesSource);
+        $this->attribute
+            ->method('getFrontendInput')
+            ->willReturn($frontendInput);
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isComplexType()
+        );
+    }
+
+    /**
+     * @dataProvider isEavAttributeProvider
+     * @param $expected
+     * @return void
+     */
+    public function testIsEavAttribute($expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->adapter->isEavAttribute()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function isEavAttributeProvider()
+    {
+        return [
+            [false],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isComplexTypeProvider()
+    {
+        return [
+            ['select', true, true],
+            ['multiselect', true, true],
+            ['multiselect', false, true],
+            ['int', false, false],
+            ['int', true, true],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isBooleanTypeProvider()
+    {
+        return [
+            ['select', 'int', true],
+            ['boolean', 'int', true],
+            ['boolean', 'varchar', false],
+            ['select', 'varchar', false],
+            ['int', 'varchar', false],
+            ['int', 'int', false],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isIntegerTypeProvider()
+    {
+        return [
+            ['smallint', true],
+            ['int', true],
+            ['string', false],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isFloatTypeProvider()
+    {
+        return [
+            ['decimal', true],
+            ['int', false],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isDateTimeTypeProvider()
+    {
+        return [
+            ['timestamp', true],
+            ['datetime', true],
+            ['int', false],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isAlwaysIndexableProvider()
+    {
+        return [
+            [false]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isSearchableProvider()
+    {
+        return [
+            [true, false, false, false, true],
+            [false, false, false, false, false],
+            [false, true, false, false, true],
+            [false, false, true, false, true],
+            [true, true, true, false, true],
+            [true, true, false, false, true],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isFilterableProvider()
+    {
+        return [
+            [true, false, true,],
+            [true, false, true,],
+            [false, false, false,]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function isStringServiceFieldTypeProvider()
+    {
+        return [
+            ['string', 'text', false,],
+            ['text', 'text', true,]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['name', [], 'name']
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            ['type', 'type']
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldIndexProvider()
+    {
+        return [
+            ['type', 'no', 'no']
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
new file mode 100644
index 0000000000000..ba5e97aa14b54
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
+    as IndexTypeConverterInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Customer\Api\Data\GroupSearchResultsInterface;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
+    as FieldNameResolver;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class DynamicFieldTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField
+     */
+    private $provider;
+
+    /**
+     * @var GroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var IndexTypeConverterInterface
+     */
+    private $indexTypeConverter;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var CategoryListInterface
+     */
+    private $categoryList;
+
+    /**
+     * @var FieldNameResolver
+     */
+    private $fieldNameResolver;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->groupRepository = $this->getMockBuilder(GroupRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->indexTypeConverter = $this->getMockBuilder(IndexTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->attributeAdapterProvider = $this->getMockBuilder(AttributeProvider::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getByAttributeCode', 'getByAttribute'])
+            ->getMock();
+        $this->fieldNameResolver = $this->getMockBuilder(FieldNameResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldName'])
+            ->getMock();
+        $this->categoryList = $this->getMockBuilder(CategoryListInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->provider = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField::class,
+            [
+                'groupRepository' => $this->groupRepository,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+                'indexTypeConverter' => $this->indexTypeConverter,
+                'attributeAdapterProvider' => $this->attributeAdapterProvider,
+                'categoryList' => $this->categoryList,
+                'fieldNameResolver' => $this->fieldNameResolver,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider attributeProvider
+     * @param $complexType
+     * @param $categoryId
+     * @param $groupId
+     * @param array $expected
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testGetAllAttributesTypes(
+        $complexType,
+        $categoryId,
+        $groupId,
+        $expected
+    ) {
+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchCriteriaBuilder->expects($this->any())
+            ->method('create')
+            ->willReturn($searchCriteria);
+        $categorySearchResults = $this->getMockBuilder(CategorySearchResultsInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getItems'])
+            ->getMockForAbstractClass();
+        $groupSearchResults = $this->getMockBuilder(GroupSearchResultsInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getItems'])
+            ->getMockForAbstractClass();
+        $group = $this->getMockBuilder(GroupInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $group->expects($this->any())
+            ->method('getId')
+            ->willReturn($groupId);
+        $groupSearchResults->expects($this->any())
+            ->method('getItems')
+            ->willReturn([$group]);
+        $category = $this->getMockBuilder(CategoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $category->expects($this->any())
+            ->method('getId')
+            ->willReturn($categoryId);
+        $categorySearchResults->expects($this->any())
+            ->method('getItems')
+            ->willReturn([$category]);
+        $this->categoryList->expects($this->any())
+            ->method('getList')
+            ->willReturn($categorySearchResults);
+
+        $categoryAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $categoryAttributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn('category');
+        $positionAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $positionAttributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn('position');
+
+        $this->fieldNameResolver->expects($this->any())
+            ->method('getFieldName')
+            ->will($this->returnCallback(
+                function ($attribute) use ($categoryId) {
+                    static $callCount = [];
+                    $attributeCode = $attribute->getAttributeCode();
+                    $callCount[$attributeCode] = !isset($callCount[$attributeCode]) ? 1 : ++$callCount[$attributeCode];
+
+                    if ($attributeCode === 'category') {
+                        return 'category_name_' . $categoryId;
+                    } elseif ($attributeCode === 'position') {
+                        return 'position_' . $categoryId;
+                    } elseif ($attributeCode === 'price') {
+                        return 'price_' . $categoryId . '_1';
+                    }
+                }
+            ));
+        $priceAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $priceAttributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn('price');
+        $this->indexTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('no_index');
+        $this->groupRepository->expects($this->any())
+            ->method('getList')
+            ->willReturn($groupSearchResults);
+        $this->attributeAdapterProvider->expects($this->any())
+            ->method('getByAttributeCode')
+            ->with($this->anything())
+            ->will($this->returnCallback(
+                function ($code) use (
+                    $categoryAttributeMock,
+                    $positionAttributeMock,
+                    $priceAttributeMock
+                ) {
+                    static $callCount = [];
+                    $callCount[$code] = !isset($callCount[$code]) ? 1 : ++$callCount[$code];
+
+                    if ($code === 'position') {
+                        return $positionAttributeMock;
+                    } elseif ($code === 'category_name') {
+                        return $categoryAttributeMock;
+                    } elseif ($code === 'price') {
+                        return $priceAttributeMock;
+                    }
+                }
+            ));
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->with($this->anything())
+            ->will($this->returnCallback(
+                function ($type) use ($complexType) {
+                    static $callCount = [];
+                    $callCount[$type] = !isset($callCount[$type]) ? 1 : ++$callCount[$type];
+
+                    if ($type === 'string') {
+                        return 'string';
+                    }
+                    if ($type === 'string') {
+                        return 'string';
+                    } elseif ($type === 'float') {
+                        return 'float';
+                    } else {
+                        return $complexType;
+                    }
+                }
+            ));
+
+        $this->assertEquals(
+            $expected,
+            $this->provider->getFields(['websiteId' => 1])
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeProvider()
+    {
+        return [
+            [
+                'text',
+                1,
+                1,
+                [
+                    'category_name_1' => [
+                        'type' => 'string',
+                        'index' => 'no_index'
+                    ],
+                    'position_1' => [
+                        'type' => 'string',
+                        'index' => 'no_index'
+                    ],
+                    'price_1_1' => [
+                        'type' => 'float',
+                        'store' => true
+                    ]
+                ]
+            ],
+            [
+                null,
+                1,
+                1,
+                [
+                    'category_name_1' => [
+                        'type' => 'string',
+                        'index' => 'no_index'
+                    ],
+                    'position_1' => [
+                        'type' => 'string',
+                        'index' => 'no_index'
+                    ],
+                    'price_1_1' => [
+                        'type' => 'float',
+                        'store' => true
+                    ]
+                ],
+            ],
+            [
+                null,
+                1,
+                1,
+                [
+                    'category_name_1' => [
+                        'type' => 'string',
+                        'index' => 'no_index'
+                    ],
+                    'position_1' => [
+                        'type' => 'string',
+                        'index' => 'no_index'
+                    ],
+                    'price_1_1' => [
+                        'type' => 'float',
+                        'store' => true
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
new file mode 100644
index 0000000000000..86bcfeb06480e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class IndexResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver
+     */
+    private $resolver;
+
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->converter = $this->getMockBuilder(ConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver::class,
+            [
+                'converter' => $this->converter
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldIndexProvider
+     * @param $isSearchable
+     * @param $isAlwaysIndexable
+     * @param $serviceFieldType
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName(
+        $isSearchable,
+        $isAlwaysIndexable,
+        $serviceFieldType,
+        $expected
+    ) {
+        $this->converter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'isSearchable',
+                'isAlwaysIndexable',
+            ])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isSearchable')
+            ->willReturn($isSearchable);
+        $attributeMock->expects($this->any())
+            ->method('isAlwaysIndexable')
+            ->willReturn($isAlwaysIndexable);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldIndex($attributeMock, $serviceFieldType)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldIndexProvider()
+    {
+        return [
+            [true, true, 'string', null],
+            [false, false, 'string', 'something'],
+            [true, false, 'string', null],
+            [false, true, 'string', null],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryNameTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryNameTest.php
new file mode 100644
index 0000000000000..5ebeac2284435
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryNameTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class CategoryNameTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CategoryName
+     */
+    private $resolver;
+
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * @var Registry
+     */
+    private $coreRegistry;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->coreRegistry = $this->getMockBuilder(Registry::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['registry'])
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            CategoryName::class,
+            [
+                'storeManager' => $this->storeManager,
+                'coreRegistry' => $this->coreRegistry,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldNameProvider
+     * @param $attributeCode
+     * @param $context
+     * @param $fromRegistry
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName($attributeCode, $context, $fromRegistry, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRootCategoryId'])
+            ->getMockForAbstractClass();
+        $store->expects($this->any())
+            ->method('getRootCategoryId')
+            ->willReturn(2);
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($store);
+        $category = null;
+        if ($fromRegistry) {
+            $category = $this->getMockBuilder(CategoryInterface::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['getId'])
+                ->getMockForAbstractClass();
+            $category->expects($this->any())
+                ->method('getId')
+                ->willReturn(1);
+        }
+        $this->coreRegistry->expects($this->any())
+            ->method('registry')
+            ->willReturn($category);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldName($attributeMock, $context)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['category_name', [], true, 'name_category_1'],
+            ['category_name', [], false, 'name_category_2'],
+            ['category_name', ['categoryId' => 3], false, 'name_category_3'],
+            ['price', ['categoryId' => 3], false, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
new file mode 100644
index 0000000000000..4fa99f3bf834d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class DefaultResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DefaultResolver
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldType'])
+            ->getMockForAbstractClass();
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $this->resolver = $objectManager->getObject(
+            DefaultResolver::class,
+            [
+                'fieldTypeResolver' => $this->fieldTypeResolver,
+                'fieldTypeConverter' => $this->fieldTypeConverter
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldNameProvider
+     * @param $fieldType
+     * @param $attributeCode
+     * @param $frontendInput
+     * @param $context
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName(
+        $fieldType,
+        $attributeCode,
+        $frontendInput,
+        $context,
+        $expected
+    ) {
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('string');
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode', 'getFrontendInput'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $attributeMock->expects($this->any())
+            ->method('getFrontendInput')
+            ->willReturn($frontendInput);
+        $this->fieldTypeResolver->expects($this->any())
+            ->method('getFieldType')
+            ->willReturn($fieldType);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldName($attributeMock, $context)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['', 'code', '', [], 'code'],
+            ['', 'code', '', ['type' => 'default'], 'code'],
+            ['string', '*', '', ['type' => 'default'], '_all'],
+            ['', 'code', '', ['type' => 'default'], 'code'],
+            ['', 'code', 'select', ['type' => 'default'], 'code'],
+            ['', 'code', 'boolean', ['type' => 'default'], 'code'],
+            ['', 'code', '', ['type' => 'type'], 'sort_code'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php
new file mode 100644
index 0000000000000..cdd8dde585a5a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class NotEavAttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var NotEavAttribute
+     */
+    private $resolver;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            NotEavAttribute::class
+        );
+    }
+
+    /**
+     * @dataProvider getFieldNameProvider
+     * @param $attributeCode
+     * @param $isEavAttribute
+     * @param $context
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName($attributeCode, $isEavAttribute, $context, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isEavAttribute', 'getAttributeCode'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isEavAttribute')
+            ->willReturn($isEavAttribute);
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldName($attributeMock, $context)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['code', true, [], ''],
+            ['code', false, [], 'code'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PositionTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PositionTest.php
new file mode 100644
index 0000000000000..dcfd4d02988da
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PositionTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class PositionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position
+     */
+    private $resolver;
+
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * @var Registry
+     */
+    private $coreRegistry;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->coreRegistry = $this->getMockBuilder(Registry::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['registry'])
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position::class,
+            [
+                'storeManager' => $this->storeManager,
+                'coreRegistry' => $this->coreRegistry,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldNameProvider
+     * @param $attributeCode
+     * @param $context
+     * @param $fromRegistry
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName($attributeCode, $context, $fromRegistry, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRootCategoryId'])
+            ->getMockForAbstractClass();
+        $store->expects($this->any())
+            ->method('getRootCategoryId')
+            ->willReturn(2);
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($store);
+        $category = null;
+        if ($fromRegistry) {
+            $category = $this->getMockBuilder(CategoryInterface::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['getId'])
+                ->getMockForAbstractClass();
+            $category->expects($this->any())
+                ->method('getId')
+                ->willReturn(1);
+        }
+        $this->coreRegistry->expects($this->any())
+            ->method('registry')
+            ->willReturn($category);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldName($attributeMock, $context)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['position', [], true, 'position_category_1'],
+            ['position', [], false, 'position_category_2'],
+            ['position', ['categoryId' => 2], false, 'position_category_2'],
+            ['price', ['categoryId' => 2], false, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PriceTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PriceTest.php
new file mode 100644
index 0000000000000..244da5a42e00a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/PriceTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class PriceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price
+     */
+    private $resolver;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var StoreManager
+     */
+    private $storeManager;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->customerSession = $this->getMockBuilder(CustomerSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerGroupId'])
+            ->getMock();
+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price::class,
+            [
+                'customerSession' => $this->customerSession,
+                'storeManager' => $this->storeManager,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldNameProvider
+     * @param $attributeCode
+     * @param $context
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName($attributeCode, $context, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $this->customerSession->expects($this->any())
+            ->method('getCustomerGroupId')
+            ->willReturn(1);
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getWebsiteId'])
+            ->getMockForAbstractClass();
+        $store->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn(2);
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($store);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldName($attributeMock, $context)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['price', [], 'price_1_2'],
+            ['price', ['customerGroupId' => 2, 'websiteId' => 3], 'price_2_3'],
+            ['price', ['customerGroupId' => 2], 'price_2_2'],
+            ['sku', ['customerGroupId' => 2], ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttributeTest.php
new file mode 100644
index 0000000000000..dcbf64bbb2005
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttributeTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class SpecialAttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SpecialAttribute
+     */
+    private $resolver;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            SpecialAttribute::class
+        );
+    }
+
+    /**
+     * @dataProvider getFieldNameProvider
+     * @param $attributeCode
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldName($attributeCode, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldName($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldNameProvider()
+    {
+        return [
+            ['id', 'id'],
+            ['sku', 'sku'],
+            ['store_id', 'store_id'],
+            ['visibility', 'visibility'],
+            ['price', ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
new file mode 100644
index 0000000000000..842007aee294e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter
+     */
+    private $converter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->converter = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter::class
+        );
+    }
+
+    /**
+     * @dataProvider convertProvider
+     * @param $internalType
+     * @param $expected
+     * @return void
+     */
+    public function testConvert($internalType, $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->converter->convert($internalType)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function convertProvider()
+    {
+        return [
+            ['string', 'string'],
+            ['float', 'float'],
+            ['integer', 'integer'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeTypeTest.php
new file mode 100644
index 0000000000000..ca474c4bee17d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DateTimeTypeTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class DateTimeTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DateTimeType
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            DateTimeType::class,
+            [
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldTypeProvider
+     * @param $isDateTimeType
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldType($isDateTimeType, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isDateTimeType'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isDateTimeType')
+            ->willReturn($isDateTimeType);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldType($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            [true, 'something'],
+            [false, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolverTest.php
new file mode 100644
index 0000000000000..72b5320a050bd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/DefaultResolverTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class DefaultResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DefaultResolver
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            DefaultResolver::class,
+            [
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldTypeProvider
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldType($expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldType($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            ['something'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatTypeTest.php
new file mode 100644
index 0000000000000..c69a6f35b1eb4
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/FloatTypeTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class FloatTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType::class,
+            [
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldTypeProvider
+     * @param $isFloatType
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldType($isFloatType, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isFloatType'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isFloatType')
+            ->willReturn($isFloatType);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldType($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            [true, 'something'],
+            [false, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
new file mode 100644
index 0000000000000..7570c8971b27b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class IntegerTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IntegerType
+     */
+    private $resolver;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->resolver = $objectManager->getObject(
+            IntegerType::class,
+            [
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getFieldTypeProvider
+     * @param $attributeCode
+     * @param $isIntegerType
+     * @param $isBooleanType
+     * @param $isUserDefined
+     * @param $expected
+     * @return void
+     */
+    public function testGetFieldType($attributeCode, $isIntegerType, $isBooleanType, $isUserDefined, $expected)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode', 'isIntegerType', 'isBooleanType', 'isUserDefined'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $attributeMock->expects($this->any())
+            ->method('isIntegerType')
+            ->willReturn($isIntegerType);
+        $attributeMock->expects($this->any())
+            ->method('isBooleanType')
+            ->willReturn($isBooleanType);
+        $attributeMock->expects($this->any())
+            ->method('isUserDefined')
+            ->willReturn($isUserDefined);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('something');
+
+        $this->assertEquals(
+            $expected,
+            $this->resolver->getFieldType($attributeMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getFieldTypeProvider()
+    {
+        return [
+            ['category_ids', true, true, true, null],
+            ['category_ids', false, false, false, null],
+            ['type', true, false, false, 'something'],
+            ['type', false, true, false, 'something'],
+            ['type', true, true, true, ''],
+            ['type', false, false, true, ''],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
new file mode 100644
index 0000000000000..bf8b601ed43ab
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Eav\Model\Config;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface
+    as FieldTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
+    as IndexTypeConverterInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface
+    as FieldIndexResolver;
+
+/**
+ * @SuppressWarnings(PHPMD)
+ */
+class StaticFieldTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField
+     */
+    private $provider;
+
+    /**
+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfig;
+
+    /**
+     * @var FieldTypeConverterInterface
+     */
+    private $fieldTypeConverter;
+
+    /**
+     * @var IndexTypeConverterInterface
+     */
+    private $indexTypeConverter;
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var FieldIndexResolver
+     */
+    private $fieldIndexResolver;
+
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->eavConfig = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityAttributes'])
+            ->getMock();
+        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->indexTypeConverter = $this->getMockBuilder(IndexTypeConverterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->attributeAdapterProvider = $this->getMockBuilder(AttributeProvider::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getByAttributeCode'])
+            ->getMock();
+        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldType'])
+            ->getMock();
+        $this->fieldIndexResolver = $this->getMockBuilder(FieldIndexResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldIndex'])
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->provider = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField::class,
+            [
+                'eavConfig' => $this->eavConfig,
+                'fieldTypeConverter' => $this->fieldTypeConverter,
+                'indexTypeConverter' => $this->indexTypeConverter,
+                'attributeAdapterProvider' => $this->attributeAdapterProvider,
+                'fieldIndexResolver' => $this->fieldIndexResolver,
+                'fieldTypeResolver' => $this->fieldTypeResolver,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider attributeProvider
+     * @param string $attributeCode
+     * @param string $inputType
+     * @param $indexType
+     * @param $isComplexType
+     * @param $complexType
+     * @param array $expected
+     * @return void
+     */
+    public function testGetAllAttributesTypes(
+        $attributeCode,
+        $inputType,
+        $indexType,
+        $isComplexType,
+        $complexType,
+        $expected
+    ) {
+        $this->fieldTypeResolver->expects($this->any())
+            ->method('getFieldType')
+            ->willReturn($inputType);
+        $this->fieldIndexResolver->expects($this->any())
+            ->method('getFieldIndex')
+            ->willReturn($indexType);
+        $this->indexTypeConverter->expects($this->any())
+            ->method('convert')
+            ->willReturn('no');
+
+        $productAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(['getAttributeCode'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $productAttributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $this->eavConfig->expects($this->any())->method('getEntityAttributes')
+            ->willReturn([$productAttributeMock]);
+
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isComplexType', 'getAttributeCode'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isComplexType')
+            ->willReturn($isComplexType);
+        $attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $this->attributeAdapterProvider->expects($this->any())
+            ->method('getByAttributeCode')
+            ->with($this->anything())
+            ->willReturn($attributeMock);
+        $this->fieldTypeConverter->expects($this->any())
+            ->method('convert')
+            ->with($this->anything())
+            ->will($this->returnCallback(
+                function ($type) use ($complexType) {
+                    static $callCount = [];
+                    $callCount[$type] = !isset($callCount[$type]) ? 1 : ++$callCount[$type];
+
+                    if ($type === 'string') {
+                        return 'string';
+                    }
+                    if ($type === 'string') {
+                        return 'string';
+                    } elseif ($type === 'float') {
+                        return 'float';
+                    } else {
+                        return $complexType;
+                    }
+                }
+            ));
+
+        $this->assertEquals(
+            $expected,
+            $this->provider->getFields(['storeId' => 1])
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeProvider()
+    {
+        return [
+            [
+                'category_ids',
+                'select',
+                true,
+                true,
+                'text',
+                [
+                    'category_ids' => [
+                        'type' => 'select',
+                        'index' => true
+                    ],
+                    'category_ids_value' => [
+                        'type' => 'string'
+                    ],
+                    'store_id' => [
+                        'type' => 'string',
+                        'index' => 'no'
+                    ]
+                ]
+            ],
+            [
+                'attr_code',
+                'text',
+                'no',
+                false,
+                null,
+                [
+                    'attr_code' => [
+                        'type' => 'text',
+                        'index' => 'no'
+                    ],
+                    'store_id' => [
+                        'type' => 'string',
+                        'index' => 'no'
+                    ]
+                ],
+            ],
+            [
+                'attr_code',
+                'text',
+                null,
+                false,
+                null,
+                [
+                    'attr_code' => [
+                        'type' => 'text'
+                    ],
+                    'store_id' => [
+                        'type' => 'string',
+                        'index' => 'no'
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldType/DateTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldType/DateTest.php
new file mode 100644
index 0000000000000..10d57def43daf
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldType/DateTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldType;
+
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateField;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
+class DateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DateField
+     */
+    private $model;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTime;
+
+    /**
+     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeDate;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->dateTime = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isEmptyDate'])
+            ->getMock();
+
+        $this->localeDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\FieldType\Date::class,
+            [
+                'dateTime' => $this->dateTime,
+                'localeDate' => $this->localeDate,
+                'scopeConfig' => $this->scopeConfig
+            ]
+        );
+    }
+
+    /**
+     * Test formatDate() method
+     */
+    public function testFormatDateEmpty()
+    {
+        $this->dateTime->expects($this->once())
+            ->method('isEmptyDate')
+            ->willReturn(true);
+        $this->assertNull($this->model->formatDate(1, null));
+    }
+
+    /**
+     * Test formatDate() method
+     */
+    public function testFormatDate()
+    {
+        $this->dateTime->expects($this->once())
+            ->method('isEmptyDate')
+            ->willReturn(false);
+        $this->assertEquals('1997-12-31T00:00:00+00:00', $this->model->formatDate(1, '1997-12-31'));
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/BuilderTest.php
new file mode 100644
index 0000000000000..b13c7827f945f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/BuilderTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index;
+
+use Magento\Elasticsearch\Model\Adapter\Index\Builder;
+use Magento\Framework\Locale\Resolver as LocaleResolver;
+use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class BuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Builder
+     */
+    protected $model;
+
+    /**
+     * @var LocaleResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeResolver;
+
+    /**
+     * @var EsConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $esConfig;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\Resolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'emulate',
+                'getLocale'
+            ])
+            ->getMock();
+        $this->esConfig = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Index\Builder::class,
+            [
+                'localeResolver' => $this->localeResolver,
+                'esConfig' => $this->esConfig
+            ]
+        );
+    }
+
+    /**
+     * Test build() method
+     *
+     * @param string $locale
+     * @dataProvider buildDataProvider
+     */
+    public function testBuild($locale)
+    {
+        $this->localeResolver->expects($this->once())
+            ->method('getLocale')
+            ->willReturn($locale);
+
+        $this->esConfig->expects($this->once())
+            ->method('getStemmerInfo')
+            ->willReturn([
+                'type' => 'stemmer',
+                'default' => 'english',
+                'en_US' => 'english',
+            ]);
+
+        $result = $this->model->build();
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * Test setStoreId() method
+     */
+    public function testSetStoreId()
+    {
+        $result = $this->model->setStoreId(1);
+        $this->assertNull($result);
+    }
+
+    /**
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        return [
+            ['en_US'],
+            ['de_DE'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php
new file mode 100644
index 0000000000000..145fb70c6c308
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index\Config;
+
+use Magento\Elasticsearch\Model\Adapter\Index\Config\Converter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for Magento\Elasticsearch\Model\Adapter\Index\Config\Converter
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    protected $converter;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $this->converter = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Index\Config\Converter::class
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testConvert()
+    {
+        $xmlFile = __DIR__ . '/_files/esconfig_test.xml';
+        $dom = new \DOMDocument();
+        $dom->loadXML(file_get_contents($xmlFile));
+        $result = $this->converter->convert($dom);
+
+        $this->assertInternalType(
+            'array',
+            $result
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php
new file mode 100644
index 0000000000000..325a09d58965c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index\Config;
+
+use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Config\Data;
+
+/**
+ * Unit test for Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigTest
+ */
+class EsConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @var EsConfig
+     */
+    protected $config;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Index\Config\Reader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reader;
+
+    /**
+     * @var \Magento\Framework\Config\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cache;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->reader = $this->getMockBuilder(\Magento\Framework\Config\ReaderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cache = $this->getMockBuilder(\Magento\Framework\Config\CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cache->expects($this->any())
+            ->method('load')
+            ->willReturn('serializedData');
+
+        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class);
+
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with('serializedData')
+            ->willReturn(['unserializedData']);
+
+        $this->config = $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig::class,
+            [
+                'reader' => $this->reader,
+                'cache' => $this->cache,
+                'serializer' => $this->serializerMock,
+            ]
+        );
+    }
+
+    /**
+     * @return array|mixed|null
+     */
+    public function testGetStemmerInfo()
+    {
+        $this->config->getStemmerInfo();
+    }
+
+    /**
+     * @return array|mixed|null
+     */
+    public function testGetStopwordsInfo()
+    {
+        $this->config->getStopwordsInfo();
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php
new file mode 100644
index 0000000000000..f690376f64672
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index\Config;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $moduleReaderMock;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator
+     */
+    protected $model;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->moduleReaderMock = $this->createMock(\Magento\Framework\Module\Dir\Reader::class);
+        $this->moduleReaderMock->expects(
+            $this->any()
+        )->method(
+            'getModuleDir'
+        )->with(
+            'etc',
+            'Magento_Elasticsearch'
+        )->will(
+            $this->returnValue('schema_dir')
+        );
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator::class,
+            [
+                'moduleReader' => $this->moduleReaderMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSchema() method.
+     */
+    public function testGetSchema()
+    {
+        $this->assertEquals('schema_dir' . DIRECTORY_SEPARATOR . 'esconfig.xsd', $this->model->getSchema());
+    }
+
+    /**
+     * Test getPerFileSchema() method.
+     */
+    public function testGetPerFileSchema()
+    {
+        $this->assertEquals('schema_dir' . DIRECTORY_SEPARATOR . 'esconfig.xsd', $this->model->getPerFileSchema());
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml
new file mode 100644
index 0000000000000..f419331a33b69
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Elasticsearch:etc/esconfig.xsd">
+    <stemmer>
+        <type>stemmer</type>
+        <default>english</default>
+        <en_US>english</en_US>
+        <de_DE>german</de_DE>
+    </stemmer>
+    <stopwords_file>
+        <default>stopwords.csv</default>
+        <en_US>stopwords_en_US.csv</en_US>
+    </stopwords_file>
+</config>
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php
new file mode 100644
index 0000000000000..3a294ba20e206
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php
@@ -0,0 +1,294 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index;
+
+use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
+use Psr\Log\LoggerInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IndexNameResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IndexNameResolver
+     */
+    protected $model;
+
+    /**
+     * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionManager;
+
+    /**
+     * @var ClientOptionsInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientConfig;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $logger;
+
+    /**
+     * @var ElasticsearchClient|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $client;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManager;
+
+    /**
+     * @var string
+     */
+    protected $entityType;
+
+    /**
+     * @var int
+     */
+    protected $storeId;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+
+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getConnection',
+            ])
+            ->getMock();
+
+        $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getIndexPrefix',
+                'getEntityType',
+                'getIndexSettings',
+            ])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
+            ->setMethods([
+                'indices',
+                'ping',
+                'bulk',
+                'search',
+                'scroll',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class)
+            ->setMethods([
+                'exists',
+                'getSettings',
+                'create',
+                'putMapping',
+                'deleteMapping',
+                'existsAlias',
+                'updateAliases',
+                'stats'
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $elasticsearchClientMock->expects($this->any())
+            ->method('indices')
+            ->willReturn($indicesMock);
+        $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->setConstructorArgs([
+                'options' => $this->getClientOptions(),
+                'elasticsearchClient' => $elasticsearchClientMock
+            ])
+            ->getMock();
+
+        $this->connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->client);
+
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexPrefix')
+            ->willReturn('indexName');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('product');
+        $this->entityType = 'product';
+        $this->storeId = 1;
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'clientConfig' => $this->clientConfig,
+                'logger' => $this->logger,
+                'options' => [],
+            ]
+        );
+    }
+
+    /**
+     * Test getIndexNameForAlias() method
+     */
+    public function testGetIndexNameForAlias()
+    {
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexPrefix')
+            ->willReturn('indexName');
+
+        $this->assertEquals(
+            'indexName_product_1',
+            $this->model->getIndexNameForAlias($this->storeId, $this->entityType)
+        );
+    }
+
+    /**
+     * Test getIndexName() method with prepared index
+     */
+    public function testGetIndexNameWithPreparedIndex()
+    {
+        $preparedIndex = ['1' => 'product'];
+
+        $this->assertEquals(
+            'product',
+            $this->model->getIndexName($this->storeId, $this->entityType, $preparedIndex)
+        );
+    }
+
+    /**
+     * Test getIndexName() method without prepared index
+     */
+    public function testGetIndexNameWithoutPreparedIndexWithIndexName()
+    {
+        $preparedIndex = [];
+
+        $this->assertEquals(
+            'indexName_product_1_v1',
+            $this->model->getIndexName($this->storeId, $this->entityType, $preparedIndex)
+        );
+    }
+
+    /**
+     * Test getIndexPattern() method
+     */
+    public function testGetIndexPattern()
+    {
+        $this->assertEquals(
+            'indexName_product_1_v',
+            $this->model->getIndexPattern($this->storeId, $this->entityType)
+        );
+    }
+
+    /**
+     * Test getIndexFromAlias() method
+     */
+    public function testUpdateAliasWithOldIndex()
+    {
+        $this->client->expects($this->any())
+            ->method('getAlias')
+            ->with('indexName_product_1')
+            ->willReturn(
+                [
+                    'indexName_product_1_v2' => [
+                        'aliases' => [
+                            'indexName_product_1' => [],
+                        ],
+                    ],
+                ]
+            );
+
+        $this->client->expects($this->any())
+            ->method('existsAlias')
+            ->with('indexName_product_1')
+            ->willReturn(true);
+
+        $this->assertEquals(
+            'indexName_product_1_v2',
+            $this->model->getIndexFromAlias($this->storeId, $this->entityType)
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testConnectException()
+    {
+        $connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getConnection',
+            ])
+            ->getMock();
+
+        $connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willThrowException(new \Exception('Something went wrong'));
+
+        $this->objectManager->getObject(
+            \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class,
+            [
+                'connectionManager' => $connectionManager,
+                'clientConfig' => $this->clientConfig,
+                'logger' => $this->logger,
+                'options' => []
+            ]
+        );
+    }
+
+    /**
+     * Test getIndexName() indexerId 'catalogsearch_fulltext'
+     */
+    public function testGetIndexNameCatalogSearchFullText()
+    {
+        $this->assertEquals(
+            'product',
+            $this->model->getIndexMapping('catalogsearch_fulltext')
+        );
+    }
+
+    /**
+     * Test getIndexName() with any ndex
+     */
+    public function testGetIndexName()
+    {
+        $this->assertEquals(
+            'else_index_id',
+            $this->model->getIndexMapping('else_index_id')
+        );
+    }
+
+    /**
+     * Get elasticsearch client options
+     *
+     * @return array
+     */
+    protected function getClientOptions()
+    {
+        return [
+            'hostname' => 'localhost',
+            'port' => '9200',
+            'timeout' => 15,
+            'index' => 'magento2',
+            'enableAuth' => 1,
+            'username' => 'user',
+            'password' => 'my-password',
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
new file mode 100644
index 0000000000000..3829a2f9280c1
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model;
+
+use Magento\Elasticsearch\Model\Config;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class ConfigTest
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Config
+     */
+    protected $model;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeConfig;
+
+    /**
+     * Setup
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Config::class,
+            [
+                'scopeConfig' => $this->scopeConfig
+            ]
+        );
+    }
+
+    /**
+     * Test prepareClientOptions() method
+     */
+    public function testPrepareClientOptions()
+    {
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn('');
+        $options = [
+            'hostname' => 'localhost',
+            'port' => '9200',
+            'index' => 'magento2',
+            'enableAuth' => '1',
+            'username' => 'user',
+            'password' => 'pass',
+            'timeout' => 1,
+        ];
+        $this->assertEquals($options, $this->model->prepareClientOptions($options));
+    }
+
+    /**
+     * Test getIndexPrefix() method
+     */
+    public function testGetIndexPrefix()
+    {
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn('indexPrefix');
+        $this->assertEquals('indexPrefix', $this->model->getIndexPrefix());
+    }
+
+    /**
+     * Test getEntityType() method
+     */
+    public function testGetEntityType()
+    {
+        $this->assertInternalType('string', $this->model->getEntityType());
+    }
+
+    /**
+     * Test getEntityType() method
+     */
+    public function testIsElasticsearchEnabled()
+    {
+        $this->assertFalse($this->model->isElasticsearchEnabled());
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/SuggestionsTest.php
new file mode 100644
index 0000000000000..584b89545499d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/SuggestionsTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\DataProvider;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\DataProvider\Suggestions;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Search\Model\QueryResultFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Search\Model\QueryInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SuggestionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Suggestions
+     */
+    private $model;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * @var QueryResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryResultFactory;
+
+    /**
+     * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionManager;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * @var StoreManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var QueryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $query;
+
+    /**
+     * Set up test environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isElasticsearchEnabled'])
+            ->getMock();
+
+        $this->queryResultFactory = $this->getMockBuilder(\Magento\Search\Model\QueryResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getConnection'])
+            ->getMock();
+
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->searchIndexNameResolver = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIndexName'])
+            ->getMock();
+
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->query = $this->getMockBuilder(\Magento\Search\Model\QueryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\DataProvider\Suggestions::class,
+            [
+                'queryResultFactory' => $this->queryResultFactory,
+                'connectionManager' => $this->connectionManager,
+                'scopeConfig' => $this->scopeConfig,
+                'config' => $this->config,
+                'searchIndexNameResolver' => $this->searchIndexNameResolver,
+                'storeManager' => $this->storeManager
+            ]
+        );
+    }
+
+    /**
+     * Test getItems() method
+     */
+    public function testGetItems()
+    {
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn(1);
+
+        $this->config->expects($this->any())
+            ->method('isElasticsearchEnabled')
+            ->willReturn(1);
+
+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($store);
+
+        $store->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+
+        $this->query->expects($this->any())
+            ->method('getQueryText')
+            ->willReturn('query');
+
+        $client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($client);
+
+        $client->expects($this->any())
+            ->method('suggest')
+            ->willReturn([
+                'suggestions' => [
+                    [
+                        'options' => [
+                            'query' => [
+                                'text' => 'query',
+                                'score' => 1,
+                                'freq' => 1,
+                            ],
+                        ]
+                    ],
+                ],
+            ]);
+
+        $query = $this->getMockBuilder(\Magento\Search\Model\QueryResult::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->queryResultFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($query);
+
+        $this->assertInternalType('array', $this->model->getItems($this->query));
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexStructureTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexStructureTest.php
new file mode 100644
index 0000000000000..9146f32a9c13a
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexStructureTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Indexer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Indexer\IndexStructure;
+
+class IndexStructureTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IndexStructure
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Elasticsearch|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeInterface;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->adapter = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeResolver = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeResolverInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $this->scopeInterface = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Indexer\IndexStructure::class,
+            [
+                'adapter' => $this->adapter,
+                'scopeResolver' => $this->scopeResolver
+            ]
+        );
+    }
+
+    public function testDelete()
+    {
+        $scopeId = 9;
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->adapter->expects($this->any())
+            ->method('cleanIndex');
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn($scopeId);
+
+        $this->model->delete('product', [$dimension]);
+    }
+
+    public function testCreate()
+    {
+        $scopeId = 9;
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter->expects($this->any())
+            ->method('checkIndex');
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn($scopeId);
+
+        $this->model->create('product', [], [$dimension]);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
new file mode 100644
index 0000000000000..7b86a13563b1e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\Indexer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\Model\Indexer\IndexerHandler;
+
+class IndexerHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var IndexerHandler
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Elasticsearch|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var \Magento\Framework\Indexer\SaveHandler\Batch|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $batch;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterFactory;
+
+    /**
+     * @var \Magento\Framework\Indexer\IndexStructureInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexStructure;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexNameResolver;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Client\Elasticsearch|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $client;
+
+    /**
+     * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeInterface;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->adapter = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->adapterFactory = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->adapterFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->adapter);
+
+        $this->batch = $this->getMockBuilder(\Magento\Framework\Indexer\SaveHandler\Batch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->indexStructure = $this->getMockBuilder(\Magento\Framework\Indexer\IndexStructureInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->indexNameResolver = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->setMethods(['ping'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeResolver = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeResolverInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $this->scopeInterface = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Indexer\IndexerHandler::class,
+            [
+                'indexStructure' => $this->indexStructure,
+                'adapter' => $this->adapter,
+                'indexNameResolver' => $this->indexNameResolver,
+                'batch' => $this->batch,
+                'data' => ['indexer_id' => 'catalogsearch_fulltext'],
+                500,
+                'scopeResolver' => $this->scopeResolver
+            ]
+        );
+    }
+
+    public function testIsAvailable()
+    {
+        $this->adapter->expects($this->any())
+            ->method('ping')
+            ->willReturn(true);
+
+        $this->client->expects($this->any())
+            ->method('ping')
+            ->willReturn(true);
+
+        $result = $this->model->isAvailable();
+
+        $this->assertTrue($result);
+    }
+
+    public function testDeleteIndex()
+    {
+        $dimensionValue = 3;
+        $documentId = 123;
+
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension->expects($this->once())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn($dimensionValue);
+
+        $result = $this->model->deleteIndex([$dimension], new \ArrayIterator([$documentId]));
+
+        $this->assertEquals($this->model, $result);
+    }
+
+    public function testSaveIndex()
+    {
+        $dimensionValue = 3;
+        $documentId = 123;
+        $documents = new \ArrayIterator([$documentId]);
+
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension->expects($this->once())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+
+        $this->batch->expects($this->once())
+            ->method('getItems')
+            ->with($documents, 500)
+            ->willReturn([[]]);
+
+        $this->adapter->expects($this->once())
+            ->method('prepareDocsPerStore')
+            ->with([], $dimensionValue)
+            ->willReturn([$documentId]);
+        $this->adapter->expects($this->once())
+            ->method('addDocs')
+            ->with([$documentId]);
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn($dimensionValue);
+
+        $result = $this->model->saveIndex([$dimension], $documents);
+
+        $this->assertEquals($this->model, $result);
+    }
+
+    /**
+     * Test cleanIndex() method.
+     */
+    public function testCleanIndexCatalogSearchFullText()
+    {
+        $dimensionValue = 'SomeDimension';
+
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension->expects($this->any())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+
+        $this->adapter->expects($this->any())
+            ->method('cleanIndex');
+
+        $result = $this->model->cleanIndex([$dimension]);
+
+        $this->assertEquals($this->model, $result);
+    }
+
+    /**
+     * Test cleanIndex() method.
+     */
+    public function testCleanIndex()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\Indexer\IndexerHandler::class,
+            [
+                'adapterFactory' => $this->adapterFactory,
+                'batch' => $this->batch,
+                'data' => ['indexer_id' => 'else_indexer_id'],
+            ]
+        );
+        $dimensionValue = 'SomeDimension';
+
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension->expects($this->any())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+
+        $this->adapter->expects($this->any())
+            ->method('cleanIndex');
+
+        $result = $model->cleanIndex([$dimension]);
+
+        $this->assertEquals($model, $result);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php
new file mode 100644
index 0000000000000..15510843b0e60
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Indexer\Plugin;
+
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin;
+use Magento\Framework\Indexer\Config\DependencyInfoProvider;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer;
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor as CatalogInventoryStockIndexer;
+
+/**
+ * Test for Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin class.
+ */
+class DependencyUpdaterPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var DependencyUpdaterPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var DependencyInfoProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $providerMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configMock->expects($this->exactly(2))
+            ->method('isElasticsearchEnabled')
+            ->willReturnOnConsecutiveCalls(true, false);
+        $this->providerMock = $this->getMockBuilder(DependencyInfoProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->plugin = new DependencyUpdaterPlugin($this->configMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterGetIndexerIdsToRunBefore(): void
+    {
+        $dependencies = [
+            CatalogInventoryStockIndexer::INDEXER_ID,
+        ];
+        $indexerId = CatalogSearchFulltextIndexer::INDEXER_ID;
+
+        $indexerIds = $this->plugin->afterGetIndexerIdsToRunBefore($this->providerMock, $dependencies, $indexerId);
+        $this->assertContains(CatalogInventoryStockIndexer::INDEXER_ID, $indexerIds);
+
+        $indexerIds = $this->plugin->afterGetIndexerIdsToRunBefore($this->providerMock, $dependencies, $indexerId);
+        $this->assertNotContains(CatalogInventoryStockIndexer::INDEXER_ID, $indexerIds);
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterGetIndexerIdsToRunAfter(): void
+    {
+        $dependencies = [
+            CatalogSearchFulltextIndexer::INDEXER_ID,
+        ];
+        $indexerId = CatalogInventoryStockIndexer::INDEXER_ID;
+
+        $indexerIds = $this->plugin->afterGetIndexerIdsToRunAfter($this->providerMock, $dependencies, $indexerId);
+        $this->assertContains(CatalogSearchFulltextIndexer::INDEXER_ID, $indexerIds);
+
+        $indexerIds = $this->plugin->afterGetIndexerIdsToRunAfter($this->providerMock, $dependencies, $indexerId);
+        $this->assertNotContains(CatalogSearchFulltextIndexer::INDEXER_ID, $indexerIds);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php
new file mode 100644
index 0000000000000..f66d2532b32ae
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Indexer\Plugin;
+
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\Indexer\Plugin\StockedProductsFilterPlugin;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterface;
+use Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+
+/**
+ * Test for Magento\Elasticsearch\Model\Indexer\Plugin\StockedProductsFilterPlugin class.
+ */
+class StockedProductsFilterPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @var StockStatusRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockStatusRepositoryMock;
+
+    /**
+     * @var StockStatusCriteriaInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockStatusCriteriaFactoryMock;
+
+    /**
+     * @var StockedProductsFilterPlugin
+     */
+    private $plugin;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockStatusRepositoryMock = $this->getMockBuilder(StockStatusRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockStatusCriteriaFactoryMock = $this->getMockBuilder(StockStatusCriteriaInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->plugin = new StockedProductsFilterPlugin(
+            $this->configMock,
+            $this->stockConfigurationMock,
+            $this->stockStatusRepositoryMock,
+            $this->stockStatusCriteriaFactoryMock
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testBeforePrepareProductIndex(): void
+    {
+        /** @var DataProvider|\PHPUnit_Framework_MockObject_MockObject $dataProviderMock */
+        $dataProviderMock = $this->getMockBuilder(DataProvider::class)->disableOriginalConstructor()->getMock();
+        $indexData = [
+            1 => [],
+            2 => [],
+        ];
+        $productData = [];
+        $storeId = 1;
+
+        $this->configMock
+            ->expects($this->once())
+            ->method('isElasticsearchEnabled')
+            ->willReturn(true);
+        $this->stockConfigurationMock
+            ->expects($this->once())
+            ->method('isShowOutOfStock')
+            ->willReturn(false);
+
+        $stockStatusCriteriaMock = $this->getMockBuilder(StockStatusCriteriaInterface::class)->getMock();
+        $stockStatusCriteriaMock
+            ->expects($this->once())
+            ->method('setProductsFilter')
+            ->willReturn(true);
+        $this->stockStatusCriteriaFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($stockStatusCriteriaMock);
+
+        $stockStatusMock = $this->getMockBuilder(StockStatusInterface::class)->getMock();
+        $stockStatusMock->expects($this->atLeastOnce())
+            ->method('getStockStatus')
+            ->willReturnOnConsecutiveCalls(Stock::STOCK_IN_STOCK, Stock::STOCK_OUT_OF_STOCK);
+        $stockStatusCollectionMock = $this->getMockBuilder(StockStatusCollectionInterface::class)->getMock();
+        $stockStatusCollectionMock
+            ->expects($this->once())
+            ->method('getItems')
+            ->willReturn([
+                1 => $stockStatusMock,
+                2 => $stockStatusMock,
+            ]);
+        $this->stockStatusRepositoryMock
+            ->expects($this->once())
+            ->method('getList')
+            ->willReturn($stockStatusCollectionMock);
+
+        list ($indexData, $productData, $storeId) = $this->plugin->beforePrepareProductIndex(
+            $dataProviderMock,
+            $indexData,
+            $productData,
+            $storeId
+        );
+
+        $this->assertEquals([1], array_keys($indexData));
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/EngineTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/EngineTest.php
new file mode 100644
index 0000000000000..f5f4752d6d6a4
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/EngineTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\ResourceModel;
+
+use Magento\Elasticsearch\Model\ResourceModel\Engine;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class EngineTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Engine
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Visibility|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $catalogProductVisibility;
+
+    /**
+     * @var \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexScopeResolver;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connection;
+
+    /**
+     * Setup
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIfNullSql'])
+            ->getMockForAbstractClass();
+        $resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getConnection', 'getTableName'])
+            ->getMock();
+        $resource->expects($this->any())
+            ->method('getConnection')
+            ->will($this->returnValue($this->connection));
+
+        $resource->expects($this->any())
+            ->method('getTableName')
+            ->will($this->returnArgument(0));
+
+        $this->catalogProductVisibility = $this->getMockBuilder(\Magento\Catalog\Model\Product\Visibility::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getVisibleInSiteIds'])
+            ->getMock();
+
+        $this->indexScopeResolver = $this->getMockBuilder(
+            \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['getVisibleInSiteIds'])
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\ResourceModel\Engine::class,
+            [
+                'catalogProductVisibility' => $this->catalogProductVisibility,
+                'indexScopeResolver' => $this->indexScopeResolver
+            ]
+        );
+    }
+
+    /**
+     * @param null|string $expected
+     * @param array $data
+     * @dataProvider prepareEntityIndexDataProvider
+     */
+    public function testPrepareEntityIndex($expected, array $data)
+    {
+        $this->assertEquals($expected, $this->model->prepareEntityIndex($data['index'], $data['separator']));
+    }
+
+    /**
+     *  Test allowAdvancedIndex method
+     */
+    public function testAllowAdvancedIndex()
+    {
+        $this->assertEquals(false, $this->model->allowAdvancedIndex());
+    }
+
+    /**
+     *  Test isAvailable method
+     */
+    public function testIsAvailable()
+    {
+        $this->assertEquals(true, $this->model->isAvailable());
+    }
+
+    /**
+     *  Test getAllowedVisibility method
+     *  Will return getVisibleInSiteIds array
+     */
+    public function testGetAllowedVisibility()
+    {
+        $this->catalogProductVisibility->expects($this->once())
+            ->method('getVisibleInSiteIds')
+            ->willReturn([3, 2, 4]);
+
+        $this->assertEquals([3, 2, 4], $this->model->getAllowedVisibility());
+    }
+
+    /**
+     *  Test processAttributeValue method
+     */
+    public function testProcessAttributeValue()
+    {
+        $this->assertEquals(1, $this->model->processAttributeValue('attribute', 1));
+    }
+
+    /**
+     * @return array
+     */
+    public function prepareEntityIndexDataProvider()
+    {
+        return [
+            [
+                [],
+                [
+                    'index' => [],
+                    'separator' => ' ',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
new file mode 100644
index 0000000000000..bac2b7ea28908
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
@@ -0,0 +1,578 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ */
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Model\ResourceModel\Index
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productRepository;
+
+    /**
+     * @var \Magento\Catalog\Api\CategoryRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $categoryRepository;
+
+    /**
+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $eavConfig;
+
+    /**
+     * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fullText;
+
+    /**
+     * @var \Magento\Framework\Model\ResourceModel\Db\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $context;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $eventManager;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $metadataPool;
+
+    /**
+     * @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $product;
+
+    /**
+     * @var \Magento\Catalog\Api\Data\CategoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $category;
+
+    /**
+     * @var \Magento\Catalog\Api\Data\ProductAttributeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productAttributeInterface;
+
+    /**
+     * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connection;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $select;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resources;
+
+    /**
+     * @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeInterface;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tableResolver;
+
+    /**
+     * Setup
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getStore',
+            ])
+            ->getMockForAbstractClass();
+
+        $this->storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getWebsiteId',
+            ])
+            ->getMockForAbstractClass();
+
+        $this->productRepository = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->categoryRepository = $this->getMockBuilder(\Magento\Catalog\Api\CategoryRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getEntityAttributeCodes',
+                'getAttribute',
+            ])
+            ->getMock();
+
+        $this->fullText = $this->getMockBuilder(\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->context = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getTransactionManager',
+                'getResources',
+                'getObjectRelationProcessor',
+            ])
+            ->getMock();
+
+        $this->eventManager = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
+            ->setMethods(['dispatch'])
+            ->getMock();
+
+        $this->product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getData',
+            ])
+            ->getMockForAbstractClass();
+
+        $this->category = $this->getMockBuilder(\Magento\Catalog\Api\Data\CategoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getName',
+            ])
+            ->getMockForAbstractClass();
+
+        $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'distinct',
+                'from',
+                'join',
+                'where',
+                'orWhere',
+            ])
+            ->getMock();
+
+        $this->resources = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getConnection',
+                'getTableName',
+                'getTablePrefix',
+            ])
+            ->getMock();
+
+        $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getMetadata',
+                'getIdentifierField'
+            ])
+            ->getMock();
+
+        $this->context->expects($this->any())
+            ->method('getResources')
+            ->willReturn($this->resources);
+
+        $this->resources->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connection);
+
+        $this->resources->expects($this->any())
+            ->method('getTablePrefix')
+            ->willReturn('');
+
+        $this->metadataPool->method('getMetadata')
+            ->willReturnSelf();
+        $this->metadataPool->method('getIdentifierField')
+            ->willReturn('entity_id');
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->setMethods([
+                'getConnection',
+                'getTableName'
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $resource->expects($this->any())->method('getTableName')->willReturnArgument(0);
+
+        $this->tableResolver = $objectManager->getObject(
+            \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class,
+            [
+                'resource' => $resource
+            ]
+        );
+
+        $traversableMock = $this->createMock(\Traversable::class);
+        $dimensionsMock = $this->createMock(\Magento\Framework\Indexer\MultiDimensionProvider::class);
+        $dimensionsMock->method('getIterator')->willReturn($traversableMock);
+
+        $indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Search\Request\IndexScopeResolverInterface::class
+        );
+
+        $dimensionFactoryMock = $this->createMock(
+            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+        );
+        $dimensionFactoryMock->method('create')->willReturn($dimensionsMock);
+        $indexScopeResolverMock->method('resolve')->willReturn('catalog_product_index_price');
+
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\Model\ResourceModel\Index::class,
+            [
+                'context' => $this->context,
+                'storeManager' => $this->storeManager,
+                'metadataPool' => $this->metadataPool,
+                'productRepository' => $this->productRepository,
+                'categoryRepository' => $this->categoryRepository,
+                'eavConfig' => $this->eavConfig,
+                'connectionName' => 'default',
+                'tableResolver' => $this->tableResolver,
+                'dimensionCollectionFactory' => $dimensionFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Test getPriceIndexDataEmpty method which return empty array
+     */
+    public function testGetPriceIndexData()
+    {
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('from')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([[
+                'website_id' => 1,
+                'entity_id' => 1,
+                'customer_group_id' => 1,
+                'min_price' => 1,
+            ]]);
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeInterface);
+
+        $this->storeInterface->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+
+        $this->assertEquals(
+            [
+                1 => [
+                    1 => 1,
+                ],
+            ],
+            $this->model->getPriceIndexData([1 ], 1)
+        );
+    }
+
+    /**
+     * Test getPriceIndexDataEmpty method which return empty array
+     */
+    public function testGetPriceIndexDataEmpty()
+    {
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('from')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([]);
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeInterface);
+
+        $this->storeInterface->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+
+        $this->assertEquals(
+            [],
+            $this->model->getPriceIndexData([1 ], 1)
+        );
+    }
+
+    /**
+     * Test getCategoryProductIndexData method
+     */
+    public function testGetCategoryProductIndexData()
+    {
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('from')
+            ->with(
+                ['catalog_category_product_index_store1'],
+                ['category_id', 'product_id', 'position', 'store_id']
+            )->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('where')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([[
+                'product_id' => 1,
+                'category_id' => 1,
+                'position' => 1,
+            ]]);
+
+        $this->assertEquals(
+            [
+                1 => [
+                    1 => 1,
+                ],
+            ],
+            $this->model->getCategoryProductIndexData(1, [1, ])
+        );
+    }
+
+    /**
+     * Test getMovedCategoryProductIds method
+     */
+    public function testGetMovedCategoryProductIds()
+    {
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('distinct')
+            ->willReturnSelf();
+
+        $this->resources->expects($this->exactly(2))
+            ->method('getTableName');
+
+        $select->expects($this->any())
+            ->method('from')
+            ->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('join')
+            ->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('where')
+            ->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('orWhere')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchCol')
+            ->with($select)
+            ->willReturn([1, ]);
+
+        $this->assertEquals([1, ], $this->model->getMovedCategoryProductIds(1));
+    }
+
+    /**
+     * Test getFullProductIndexData method
+     *
+     * @param string $frontendInput
+     * @param mixed $indexData
+     * @return void
+     * @dataProvider attributeCodeProvider
+     */
+    public function testGetFullProductIndexData($frontendInput, $indexData)
+    {
+        $this->productRepository->expects($this->once())
+            ->method('getById')
+            ->willReturn($this->product);
+
+        $this->product->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'name' => 'Product Name'
+            ]);
+
+        $this->eavConfig->expects($this->once())
+            ->method('getEntityAttributeCodes')
+            ->with('catalog_product')
+            ->willReturn([
+                'name',
+            ]);
+
+        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getFrontendInput',
+                'getOptions',
+                'getData',
+                'getAttributeId',
+            ])
+            ->getMock();
+
+        $this->eavConfig->expects($this->once())
+            ->method('getAttribute')
+            ->with('catalog_product', 'name')
+            ->willReturn($attributeMock);
+
+        $attributeMock->expects($this->any())
+            ->method('getAttributeId')
+            ->willReturn(1);
+
+        $attributeMock->expects($this->any())
+            ->method('getFrontendInput')
+            ->willReturn($frontendInput);
+
+        $attributeOption = $this->createMock(\Magento\Eav\Model\Entity\Attribute\Option::class);
+        $attributeOption->expects($this->any())->method('getValue')->willReturn('240-LV04');
+        $attributeOption->expects($this->any())->method('getLabel')->willReturn('label');
+
+        $attributeMock->expects($this->any())
+            ->method('getOptions')
+            ->willReturn([$attributeOption]);
+
+        $this->assertInternalType(
+            'array',
+            $this->model->getFullProductIndexData(
+                1,
+                [
+                    1 => $indexData
+                ]
+            )
+        );
+    }
+
+    /**
+     * Test getFullCategoryProductIndexData method
+     */
+    public function testGetFullCategoryProductIndexData()
+    {
+        $this->categoryRepository->expects($this->once())
+            ->method('get')
+            ->willReturn($this->category);
+
+        $this->category->expects($this->once())
+            ->method('getName')
+            ->willReturn([
+                'name' => 'Category Name',
+            ]);
+
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('from')
+            ->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('where')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([[
+                'product_id' => 1,
+                'category_id' => 1,
+                'position' => 1,
+            ]]);
+
+        $this->assertInternalType(
+            'array',
+            $this->model->getFullCategoryProductIndexData(1, [1, ])
+        );
+    }
+
+    /**
+     * Provides data for testGetFullProductIndexData method.
+     *
+     * @return array
+     */
+    public static function attributeCodeProvider()
+    {
+        return [
+            [
+                'string',
+                '240-LV04',
+            ],
+            [
+                'select',
+                '240-LV04',
+            ],
+            [
+                'select',
+                [1, ],
+            ],
+            [
+                'select',
+                [
+                    1 => 1,
+                ],
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
new file mode 100644
index 0000000000000..adebee0d591ab
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Observer;
+
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Observer\CategoryProductIndexer;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class CategoryProductIndexerTest
+ */
+class CategoryProductIndexerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CategoryProductIndexer
+     */
+    private $observer;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var Processor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $processorMock;
+
+    /**
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $observerMock;
+
+    /**
+     * Set Up method
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->configMock = $this->createMock(Config::class);
+        $this->processorMock = $this->createMock(Processor::class);
+        $this->observerMock = $this->createMock(Observer::class);
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->observer = $objectManager->getObject(
+            CategoryProductIndexer::class,
+            [
+                'config' => $this->configMock,
+                'processor' => $this->processorMock,
+            ]
+        );
+    }
+
+    /**
+     * Test if a category has changed products
+     *
+     * @return void
+     */
+    public function testExecuteIfCategoryHasChangedProducts()
+    {
+        $this->getProductIdsWithEnabledElasticSearch();
+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(true);
+        $this->processorMock->expects($this->once())->method('markIndexerAsInvalid');
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Test if a category has changed products and not scheduled indexer
+     *
+     * @return void
+     */
+    public function testExecuteIfCategoryHasChangedProductsAndNotScheduledIndexer(): void
+    {
+        $this->getProductIdsWithEnabledElasticSearch();
+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(false);
+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Test if a category has none changed products
+     *
+     * @return void
+     */
+    public function testExecuteIfCategoryHasNoneChangedProducts(): void
+    {
+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
+        $eventMock = $this->createPartialMock(Event::class, ['getProductIds']);
+        $this->configMock->expects($this->once())->method('isElasticsearchEnabled')->willReturn(true);
+
+        $eventMock->expects($this->once())->method('getProductIds')->willReturn([]);
+        $this->observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+
+        $this->processorMock->expects($this->never())->method('isIndexerScheduled');
+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
+
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Test if ElasticSearch is disabled
+     *
+     * @return void
+     */
+    public function testExecuteIfElasticSearchIsDisabled(): void
+    {
+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
+        $eventMock = $this->createPartialMock(Event::class, ['getProductIds']);
+        $this->configMock->expects($this->once())->method('isElasticsearchEnabled')->willReturn(false);
+        $eventMock->expects($this->never())->method('getProductIds')->willReturn([]);
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Get product ids with enabled ElasticSearch
+     *
+     * @return void
+     */
+    private function getProductIdsWithEnabledElasticSearch(): void
+    {
+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
+        $eventMock = $this->createPartialMock(Event::class, ['getProductIds']);
+        $this->configMock->expects($this->once())->method('isElasticsearchEnabled')->willReturn(true);
+        $eventMock->expects($this->once())->method('getProductIds')->willReturn([1]);
+        $this->observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AdapterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AdapterTest.php
new file mode 100644
index 0000000000000..424edd4768a81
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AdapterTest.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\Elasticsearch\SearchAdapter\Adapter;
+use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+use Magento\Elasticsearch\SearchAdapter\QueryContainerFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class AdapterTest
+ */
+class AdapterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var QueryContainerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryContainerFactory;
+
+    /**
+     * @var Adapter
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionManager;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\Mapper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $mapper;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\ResponseFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $responseFactory;
+
+    /**
+     * @var \Magento\Framework\Search\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $aggregationBuilder;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->mapper = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Mapper::class)
+            ->setMethods([
+                'buildQuery',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->responseFactory = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ResponseFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->aggregationBuilder = $this->getMockBuilder(
+            \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder::class
+        )
+            ->setMethods([
+                'build',
+                'setQuery'
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->queryContainerFactory = $this->getMockBuilder(QueryContainerFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Adapter::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'mapper' => $this->mapper,
+                'responseFactory' => $this->responseFactory,
+                'aggregationBuilder' => $this->aggregationBuilder,
+                'queryContainerFactory' => $this->queryContainerFactory,
+            ]
+        );
+    }
+
+    /**
+     * Test query() method
+     *
+     * @return void
+     */
+    public function testQuery()
+    {
+        $searchQuery = [
+            'index' => 'indexName',
+            'type' => 'product',
+            'body' => [
+                'from' => 0,
+                'size' => 1000,
+                'fields' => ['_id', '_score'],
+                'query' => [],
+            ],
+        ];
+
+        $client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->setMethods(['query'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionManager->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($client);
+
+        $queryContainer = $this->getMockBuilder(QueryContainer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->queryContainerFactory->expects($this->once())
+            ->method('create')
+            ->with(['query' => $searchQuery])
+            ->willReturn($queryContainer);
+
+        $this->aggregationBuilder->expects($this->once())
+            ->method('setQuery')
+            ->with($queryContainer);
+
+        $this->mapper->expects($this->once())
+            ->method('buildQuery')
+            ->with($this->request)
+            ->willReturn($searchQuery);
+
+        $client->expects($this->once())
+            ->method('query')
+            ->willReturn([
+                'hits' => [
+                    'total' => 1,
+                    'hits' => [
+                        [
+                            '_index' => 'indexName',
+                            '_type' => 'product',
+                            '_id' => 1,
+                            '_score' => 1.0,
+                        ],
+                    ],
+                ],
+            ]);
+        $this->aggregationBuilder->expects($this->once())
+            ->method('build')
+            ->willReturn($client);
+
+        $this->model->query($this->request);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php
new file mode 100644
index 0000000000000..3020da9dcdda1
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Aggregation\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class DynamicTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Dynamic
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Search\Request\BucketInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestBuckedInterface;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $dataProviderContainer;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $algorithmRepository;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\EntityStorageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityStorageFactory;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $algorithmInterface;
+
+    /**
+     * @var \Magento\Framework\Search\Request\Aggregation\DynamicBucket|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $bucket;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\EntityStorage|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityStorage;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->requestBuckedInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataProviderContainer = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->algorithmRepository = $this->getMockBuilder(
+            \Magento\Framework\Search\Dynamic\Algorithm\Repository::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->entityStorageFactory = $this->getMockBuilder(
+            \Magento\Framework\Search\Dynamic\EntityStorageFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->algorithmInterface = $this
+            ->getMockBuilder(\Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\Aggregation\DynamicBucket::class)
+            ->setMethods(['getMethod'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->entityStorage = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\EntityStorage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->entityStorageFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->entityStorage);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic::class,
+            [
+                'algorithmRepository' => $this->algorithmRepository,
+                'entityStorageFactory' => $this->entityStorageFactory,
+            ]
+        );
+    }
+
+    /**
+     * Test build() method
+     */
+    public function testBuild()
+    {
+        $dimensions = [
+            'scope' => [
+                'name' => 'scope',
+                'value' => 1,
+            ],
+        ];
+
+        $queryResult = [
+            'took' => 1,
+            'timed_out' => false,
+            '_shards' => [],
+            'hits' => [
+                'total' => 1,
+                'max_score' => 1,
+                'hits' => [
+                    [
+                        '_id' => 1,
+                    ]
+                ],
+            ],
+            'aggregations' => [],
+        ];
+
+        $this->bucket->expects($this->once())
+            ->method('getMethod')
+            ->willReturn('auto');
+
+        $this->algorithmRepository->expects($this->any())
+            ->method('get')
+            ->with('auto', ['dataProvider' => $this->dataProviderContainer])
+            ->willReturn($this->algorithmInterface);
+
+        $this->algorithmInterface->expects($this->once())
+            ->method('getItems')
+            ->with(
+                $this->bucket,
+                $dimensions,
+                $this->entityStorage
+            )
+            ->willReturn([
+                0 => [
+                    'from' => '',
+                    'to' => 22,
+                    'count' => 2,
+                ],
+                1 => [
+                    'from' => 22,
+                    'to' => 24,
+                    'count' => 4,
+                ],
+                2 => [
+                    'from' => 24,
+                    'to' => '',
+                    'count' => 6,
+                ],
+            ]);
+
+        $this->model->build(
+            $this->bucket,
+            $dimensions,
+            $queryResult,
+            $this->dataProviderContainer
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php
new file mode 100644
index 0000000000000..cf9ef94c78456
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Aggregation\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class TermTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Term
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Search\Request\BucketInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestBuckedInterface;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $dataProviderContainer;
+
+    /**
+     * @var \Magento\Framework\Search\Request\Aggregation\TermBucket|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $bucket;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->requestBuckedInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataProviderContainer = $this->getMockBuilder(
+            \Magento\Framework\Search\Dynamic\DataProviderInterface::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\Aggregation\TermBucket::class)
+            ->setMethods(['getName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term::class,
+            []
+        );
+    }
+
+    /**
+     * Test build() method
+     */
+    public function testBuild()
+    {
+        $dimensions = [
+            'scope' => [
+                'name' => 'scope',
+                'value' => 1,
+            ],
+        ];
+
+        $queryResult = [
+            'took' => 1,
+            'timed_out' => false,
+            '_shards' => [],
+            'hits' => [
+                'total' => 1,
+                'max_score' => 1,
+                'hits' => [],
+            ],
+            'aggregations' => [
+                'category_bucket' => [
+                    'buckets' => [
+                        [
+                            'key' => '23',
+                            'doc_count' => 12,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->bucket->expects($this->once())
+            ->method('getName')
+            ->willReturn('category_bucket');
+
+        $this->model->build(
+            $this->bucket,
+            $dimensions,
+            $queryResult,
+            $this->dataProviderContainer
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php
new file mode 100644
index 0000000000000..42bb62cd14de2
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Aggregation;
+
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder;
+use Magento\Elasticsearch\SearchAdapter\Aggregation\DataProviderFactory;
+use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface;
+
+class BuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataProviderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataProviderFactory;
+
+    /**
+     * @var Builder
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Search\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestInterface;
+
+    /**
+     * @var \Magento\Framework\Search\Request\BucketInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestBuckedInterface;
+
+    /**
+     * @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $dataProviderContainer;
+
+    /**
+     * @var BucketBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $aggregationContainer;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->dataProviderContainer = $this->getMockBuilder(
+            \Magento\Framework\Search\Dynamic\DataProviderInterface::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->aggregationContainer = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataProviderFactory = $this->getMockBuilder(
+            \Magento\Elasticsearch\SearchAdapter\Aggregation\DataProviderFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder::class,
+            [
+                'dataProviderContainer' => ['indexName' => $this->dataProviderContainer],
+                'aggregationContainer' => ['bucketType' => $this->aggregationContainer],
+                'dataProviderFactory' => $this->dataProviderFactory,
+            ]
+        );
+    }
+
+    /**
+     * Test build() method
+     */
+    public function testBuild()
+    {
+        $this->requestInterface = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->requestBuckedInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->requestInterface->expects($this->once())
+            ->method('getIndex')
+            ->willReturn('indexName');
+
+        $dimensionMock = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+            
+        $this->requestInterface->expects($this->once())
+            ->method('getDimensions')
+            ->willReturn([$dimensionMock]);
+
+        $this->requestInterface->expects($this->once())
+            ->method('getAggregation')
+            ->willReturn([$this->requestBuckedInterface]);
+
+        $this->requestBuckedInterface->expects($this->any())
+            ->method('getName')
+            ->willReturn('price_bucket');
+
+        $this->requestBuckedInterface->expects($this->any())
+            ->method('getType')
+            ->willReturn('bucketType');
+
+        $this->aggregationContainer->expects($this->any())
+            ->method('build')
+            ->willReturn([]);
+
+        $this->dataProviderFactory->expects($this->once())
+            ->method('create')
+            ->willReturnArgument(0);
+
+        $queryContainer = $this->getMockBuilder(QueryContainer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model->setQuery($queryContainer);
+
+        $this->assertEquals(
+            [
+                'price_bucket' => [],
+            ],
+            $this->model->build($this->requestInterface, [])
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php
new file mode 100644
index 0000000000000..af22e22af6f20
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Aggregation;
+
+use Magento\Elasticsearch\SearchAdapter\Aggregation\DataProviderFactory;
+use Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider;
+use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+
+class DataProviderFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManager;
+
+    /**
+     * @var DataProviderFactory
+     */
+    private $factory;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+        $this->factory = $objectManager->getObject(
+            DataProviderFactory::class,
+            ['objectManager' => $this->objectManager]
+        );
+    }
+
+    public function testCreateDataProviderWithoutQuery()
+    {
+        $this->objectManager->expects($this->never())->method('create');
+        /** @var DataProviderInterface $dataProvider */
+        $dataProvider = $this->getMockBuilder(DataProviderInterface::class)
+            ->getMockForAbstractClass();
+        $this->assertSame($dataProvider, $this->factory->create($dataProvider));
+    }
+
+    public function testCreateDataProviderWithEmptyQuery()
+    {
+        $this->objectManager->expects($this->never())->method('create');
+        /** @var DataProviderInterface $dataProvider */
+        $dataProvider = $this->getMockBuilder(DataProviderInterface::class)
+            ->getMockForAbstractClass();
+        $this->assertSame($dataProvider, $this->factory->create($dataProvider, null));
+    }
+
+    public function testCreateDataProviderWithQuery()
+    {
+        $this->objectManager->expects($this->never())->method('create');
+        /** @var DataProviderInterface $dataProvider */
+        $dataProvider = $this->getMockBuilder(DataProviderInterface::class)
+            ->getMockForAbstractClass();
+        /** @var \PHPUnit_Framework_MockObject_MockObject $queryContainerMock */
+        $queryContainerMock = $this->getMockBuilder(QueryContainer::class)
+            ->setMethods(['getQuery'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $queryContainerMock->expects($this->never())->method('getQuery');
+        $this->assertSame($dataProvider, $this->factory->create($dataProvider, $queryContainerMock));
+    }
+
+    public function testCreateQueryAwareDataProvider()
+    {
+        /** @var DataProviderInterface $dataProvider */
+        $dataProvider = $this->getMockBuilder(DataProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var \PHPUnit_Framework_MockObject_MockObject $queryContainer */
+        $queryContainer = $this->getMockBuilder(QueryContainer::class)
+            ->setMethods(['getQuery'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $queryContainer->expects($this->never())->method('getQuery');
+        /** @var DataProviderInterface $recreatedDataProvider */
+        $recreatedDataProvider = $this->getMockBuilder(DataProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager->expects($this->once())
+            ->method('create')
+            ->with($this->isType('string'), ['queryContainer' => $queryContainer])
+            ->willReturn($recreatedDataProvider);
+        $result = $this->factory->create($dataProvider, $queryContainer);
+        $this->assertNotSame($dataProvider, $result);
+        $this->assertSame($recreatedDataProvider, $result);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage must be configured with a search query, but the query is empty
+     */
+    public function testCreateContainerAwareDataProviderWithoutQuery()
+    {
+        $this->objectManager->expects($this->never())->method('create');
+        /** @var DataProviderInterface $dataProvider */
+        $dataProvider = $this->getMockBuilder(DataProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->factory->create($dataProvider, null);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php
new file mode 100644
index 0000000000000..169c6d71062ba
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php
@@ -0,0 +1,358 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Aggregation;
+
+use Magento\Elasticsearch\SearchAdapter\Aggregation\Interval;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IntervalTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Interval
+     */
+    protected $model;
+
+    /**
+     * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionManager;
+
+    /**
+     * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientConfig;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManager;
+
+    /**
+     * @var CustomerSession|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerSession;
+
+    /**
+     * @var ElasticsearchClient|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
+    /**
+     * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchIndexNameResolver;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->setMethods(['getConnection'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->setMethods([
+                'getIndexName',
+                'getEntityType',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+            ->setMethods(['getCustomerGroupId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerSession->expects($this->any())
+            ->method('getCustomerGroupId')
+            ->willReturn(1);
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('indexName');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('product');
+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->setMethods(['query'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->clientMock);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Aggregation\Interval::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'fieldMapper' => $this->fieldMapper,
+                'clientConfig' => $this->clientConfig,
+                'searchIndexNameResolver' => $this->searchIndexNameResolver,
+                'fieldName' => 'price_0_1',
+                'storeId' => 1,
+                'entityIds' => [265, 313, 281]
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider loadParamsProvider
+     * @param string $limit
+     * @param string $offset
+     * @param string $lower
+     * @param string $upper
+     * Test load() method
+     */
+    public function testLoad($limit, $offset, $lower, $upper)
+    {
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('document');
+
+        $expectedResult = [25];
+
+        $this->clientMock->expects($this->once())
+            ->method('query')
+            ->willReturn([
+                'hits' => [
+                    'hits' => [
+                        [
+                            'fields' => [
+
+                                'price_0_1' => [25],
+
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+        $this->assertEquals(
+            $expectedResult,
+            $this->model->load($limit, $offset, $lower, $upper)
+        );
+    }
+
+    /**
+     * @dataProvider loadPrevParamsProvider
+     * @param string $data
+     * @param string $index
+     * @param string $lower
+     * Test loadPrevious() method with offset
+     */
+    public function testLoadPrevArray($data, $index, $lower)
+    {
+        $queryResult = [
+            'hits' => [
+                'total'=> '1',
+                'hits' => [
+                    [
+                        'fields' => [
+                            'price_0_1' => ['25']
+                        ]
+                    ],
+                ],
+            ],
+        ];
+
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('document');
+
+        $expectedResult = ['25.0'];
+
+        $this->clientMock->expects($this->any())
+            ->method('query')
+            ->willReturn($queryResult);
+        $this->assertEquals(
+            $expectedResult,
+            $this->model->loadPrevious($data, $index, $lower)
+        );
+    }
+
+    /**
+     * @dataProvider loadPrevParamsProvider
+     * @param string $data
+     * @param string $index
+     * @param string $lower
+     * Test loadPrevious() method without offset
+     */
+    public function testLoadPrevFalse($data, $index, $lower)
+    {
+        $queryResult = ['hits' => ['total'=> '0']];
+
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('document');
+
+        $this->clientMock->expects($this->any())
+            ->method('query')
+            ->willReturn($queryResult);
+        $this->assertFalse(
+            $this->model->loadPrevious($data, $index, $lower)
+        );
+    }
+
+    /**
+     * @dataProvider loadNextParamsProvider
+     * @param string $data
+     * @param string $rightIndex
+     * @param string $upper
+     * Test loadNext() method with offset
+     */
+    public function testLoadNextArray($data, $rightIndex, $upper)
+    {
+        $queryResult = [
+            'hits' => [
+                'total'=> '1',
+                'hits' => [
+                    [
+                        'fields' => [
+                            'price_0_1' => ['25']
+                        ]
+                    ],
+                ],
+            ]
+        ];
+
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('document');
+
+        $expectedResult = ['25.0'];
+
+        $this->clientMock->expects($this->any())
+            ->method('query')
+            ->willReturn($queryResult);
+        $this->assertEquals(
+            $expectedResult,
+            $this->model->loadNext($data, $rightIndex, $upper)
+        );
+    }
+
+    /**
+     * @dataProvider loadNextParamsProvider
+     * @param string $data
+     * @param string $rightIndex
+     * @param string $upper
+     * Test loadNext() method without offset
+     */
+    public function testLoadNextFalse($data, $rightIndex, $upper)
+    {
+        $queryResult = ['hits' => ['total'=> '0']];
+
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('magento2_product_1');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('document');
+
+        $this->clientMock->expects($this->any())
+            ->method('query')
+            ->willReturn($queryResult);
+        $this->assertFalse(
+            $this->model->loadNext($data, $rightIndex, $upper)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public static function loadParamsProvider()
+    {
+        return [
+            ['6', '2', '24', '42'],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public static function loadPrevParamsProvider()
+    {
+        return [
+            ['24', '1', '24'],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public static function loadNextParamsProvider()
+    {
+        return [
+            ['24', '2', '42'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AggregationFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AggregationFactoryTest.php
new file mode 100644
index 0000000000000..bf926968e2fe8
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AggregationFactoryTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\Elasticsearch\SearchAdapter\AggregationFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class AggregationFactoryTest
+ */
+class AggregationFactoryTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * @var AggregationFactory
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManager;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->objectManager->expects($this->any())
+            ->method('create')
+            ->willReturn($this->createMock(\Magento\Framework\Search\Response\Aggregation::class));
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\AggregationFactory::class,
+            [
+                'objectManager' => $this->objectManager
+            ]
+        );
+    }
+
+    /**
+     * Test create() method.
+     *
+     * @return void
+     */
+    public function testCreate()
+    {
+        $object = $this->model->create(
+            [
+                'price_bucket' => [
+                    'name' => 1,
+                ],
+                'category_bucket' => [],
+            ]
+        );
+        $this->assertNotNull($object);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ConnectionManagerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ConnectionManagerTest.php
new file mode 100644
index 0000000000000..5d80ef62a5d20
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ConnectionManagerTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class ConnectionManagerTest
+ */
+class ConnectionManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConnectionManager
+     */
+    protected $model;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $logger;
+
+    /**
+     * @var ClientFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $clientFactory;
+
+    /**
+     * @var ClientOptionsInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $clientConfig;
+
+    /**
+     * Setup
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientFactory = $this->getMockBuilder(\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->clientConfig = $this->getMockBuilder(ClientOptionsInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->clientConfig->expects($this->any())
+            ->method('prepareClientOptions')
+            ->willReturn([
+                'hostname' => 'localhost',
+                'port' => '9200',
+                'timeout' => 15,
+                'enableAuth' => 1,
+                'username' => 'user',
+                'password' => 'passwd',
+            ]);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\ConnectionManager::class,
+            [
+                'clientFactory' => $this->clientFactory,
+                'clientConfig' => $this->clientConfig,
+                'logger' => $this->logger
+            ]
+        );
+    }
+
+    /**
+     * Test getConnection() method without errors
+     */
+    public function testGetConnectionSuccessfull()
+    {
+        $client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($client);
+
+        $this->model->getConnection();
+    }
+
+    /**
+     * Test getConnection() method with errors
+     * @expectedException \RuntimeException
+     */
+    public function testGetConnectionFailure()
+    {
+        $this->clientFactory->expects($this->any())
+            ->method('create')
+            ->willThrowException(new \Exception('Something went wrong'));
+        $this->model->getConnection();
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php
new file mode 100644
index 0000000000000..b3ce00f76ad21
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\Elasticsearch\SearchAdapter\DocumentFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class DocumentFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DocumentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\AggregationFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $aggregationFactory;
+
+    /**
+     * @var \Magento\Framework\Search\EntityMetadata|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityMetadata;
+
+    /**
+     * Instance name
+     *
+     * @var string
+     */
+    protected $instanceName;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->entityMetadata = $this->getMockBuilder(\Magento\Framework\Search\EntityMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+
+        $this->instanceName = \Magento\Framework\Api\Search\Document::class;
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\DocumentFactory::class,
+            [
+                'objectManager' => $this->objectManager,
+                'entityMetadata' => $this->entityMetadata
+            ]
+        );
+    }
+
+    /**
+     *  Test Create method
+     */
+    public function testCreate()
+    {
+        $documents = [
+            '_id' => 2,
+            '_score' => 1.00,
+            '_index' => 'indexName',
+            '_type' => 'product',
+        ];
+
+        $this->entityMetadata->expects($this->once())
+            ->method('getEntityId')
+            ->willReturn('_id');
+
+        $result = $this->model->create($documents);
+        $this->assertInstanceOf($this->instanceName, $result);
+        $this->assertEquals($documents['_id'], $result->getId());
+        $this->assertEquals($documents['_score'], $result->getCustomAttribute('score')->getValue());
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
new file mode 100644
index 0000000000000..9c717ea240a5d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
@@ -0,0 +1,383 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Dynamic;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DataProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\QueryContainer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryContainer;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionManager;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Catalog\Model\Layer\Filter\Price\Range|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $range;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\IntervalFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $intervalFactory;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientConfig;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerSession;
+
+    /**
+     * @var \Magento\Framework\Search\Dynamic\EntityStorage|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityStorage;
+
+    /**
+     * @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Client\Elasticsearch|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientMock;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchIndexNameResolver;
+
+    /**
+     * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeInterface;
+
+    /**
+     * A private helper for setUp method.
+     * @return void
+     */
+    private function setUpMockObjects()
+    {
+        $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->setMethods(['getConnection'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->range = $this->getMockBuilder(\Magento\Catalog\Model\Layer\Filter\Price\Range::class)
+            ->setMethods(['getPriceRange'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->intervalFactory = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\IntervalFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->setMethods([
+                'getIndexName',
+                'getEntityType',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+            ->setMethods(['getCustomerGroupId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->entityStorage = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\EntityStorage::class)
+            ->setMethods(['getSource'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->entityStorage->expects($this->any())
+            ->method('getSource')
+            ->willReturn([1]);
+        $this->customerSession->expects($this->any())
+            ->method('getCustomerGroupId')
+            ->willReturn(1);
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexName')
+            ->willReturn('indexName');
+        $this->clientConfig->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('product');
+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->setMethods(['query'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionManager->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->clientMock);
+
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->searchIndexNameResolver = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeResolver = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeResolverInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $this->scopeInterface = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $this->queryContainer = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\QueryContainer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuery'])
+            ->getMock();
+    }
+
+    /**
+     * Setup method
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->setUpMockObjects();
+
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider::class,
+            [
+                'connectionManager' => $this->connectionManager,
+                'fieldMapper' => $this->fieldMapper,
+                'range' => $this->range,
+                'intervalFactory' => $this->intervalFactory,
+                'clientConfig' => $this->clientConfig,
+                'storeManager' => $this->storeManager,
+                'customerSession' => $this->customerSession,
+                'searchIndexNameResolver' => $this->searchIndexNameResolver,
+                'indexerId' => 'catalogsearch_fulltext',
+                'scopeResolver' => $this->scopeResolver,
+                'queryContainer' => $this->queryContainer,
+            ]
+        );
+    }
+
+    /**
+     * Test getRange() method
+     */
+    public function testGetRange()
+    {
+        $this->range->expects($this->once())
+            ->method('getPriceRange')
+            ->willReturn([]);
+        $this->assertEquals(
+            [],
+            $this->model->getRange()
+        );
+    }
+
+    /**
+     * Test getAggregations() method
+     */
+    public function testGetAggregations()
+    {
+        $expectedResult = [
+            'count' => 1,
+            'max' => 1,
+            'min' => 1,
+            'std' => 1,
+        ];
+        $this->clientMock->expects($this->once())
+            ->method('query')
+            ->willReturn([
+                'aggregations' => [
+                    'prices' => [
+                        'count' => 1,
+                        'max' => 1,
+                        'min' => 1,
+                        'std_deviation' => 1,
+                    ],
+                ],
+            ]);
+
+        $this->queryContainer->expects($this->once())
+            ->method('getQuery')
+            ->willReturn([]);
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->model->getAggregations($this->entityStorage)
+        );
+    }
+
+    /**
+     * Test getInterval() method
+     */
+    public function testGetInterval()
+    {
+        $dimensionValue = 1;
+        $bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $interval = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\IntervalInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension->expects($this->once())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn($dimensionValue);
+        $this->intervalFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($interval);
+
+        $this->assertEquals(
+            $interval,
+            $this->model->getInterval(
+                $bucket,
+                [$dimension],
+                $this->entityStorage
+            )
+        );
+    }
+
+    /**
+     * Test getAggregation() method
+     */
+    public function testGetAggregation()
+    {
+        $expectedResult = [
+            1 => 1,
+        ];
+        $bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dimension->expects($this->never())
+            ->method('getValue');
+        $this->scopeResolver->expects($this->never())
+            ->method('getScope');
+        $this->scopeInterface->expects($this->never())
+            ->method('getId');
+
+        $this->clientMock->expects($this->once())
+            ->method('query')
+            ->with($this->callback(function ($query) {
+                // Assert the interval is queried as a float. See MAGETWO-95471
+                return $query['body']['aggregations']['prices']['histogram']['interval'] === 10.0;
+            }))
+            ->willReturn([
+                'aggregations' => [
+                    'prices' => [
+                        'buckets' => [
+                            [
+                                'key' => 1,
+                                'doc_count' => 1,
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+
+        $this->queryContainer->expects($this->once())
+            ->method('getQuery')
+            ->willReturn([]);
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->model->getAggregation(
+                $bucket,
+                [$dimension],
+                10,
+                $this->entityStorage
+            )
+        );
+    }
+
+    /**
+     * Test prepareData() method
+     */
+    public function testPrepareData()
+    {
+        $expectedResult = [
+            [
+                'from' => '',
+                'to' => 10,
+                'count' => 1,
+            ],
+            [
+                'from' => 10,
+                'to' => '',
+                'count' => 1,
+            ],
+        ];
+        $this->assertEquals(
+            $expectedResult,
+            $this->model->prepareData(
+                10,
+                [
+                    1 => 1,
+                    2 => 1,
+                ]
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php
new file mode 100644
index 0000000000000..6bd91e5069899
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Filter\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @see \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range
+ */
+class RangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Range
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Framework\Search\Request\Filter\Wildcard|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterInterface;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filterInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\Filter\Range::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getField',
+                'getFrom',
+                'getTo',
+            ])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range::class,
+            [
+                'fieldMapper' => $this->fieldMapper
+            ]
+        );
+    }
+
+    /**
+     *  Test buildFilter method
+     */
+    public function testBuildFilter()
+    {
+        $this->fieldMapper->expects($this->any())
+            ->method('getFieldName')
+            ->willReturn('field');
+
+        $this->filterInterface->expects($this->any())
+            ->method('getField')
+            ->willReturn('field');
+
+        $this->filterInterface->expects($this->any())
+            ->method('getFrom')
+            ->willReturn('field');
+
+        $this->filterInterface->expects($this->any())
+            ->method('getTo')
+            ->willReturn('field');
+
+        $result = $this->model->buildFilter($this->filterInterface);
+        $this->assertNotNull($result);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php
new file mode 100644
index 0000000000000..51673097342d4
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Filter\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @see \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term
+ */
+class TermTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Term
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Framework\Search\Request\Filter\Term|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterInterface;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filterInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\Filter\Term::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getValue',
+                'getField',
+            ])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term::class,
+            [
+                'fieldMapper' => $this->fieldMapper
+            ]
+        );
+    }
+
+    /**
+     *  Test buildFilter method
+     */
+    public function testBuildFilter()
+    {
+        $this->filterInterface->expects($this->any())
+            ->method('getValue')
+            ->willReturn('value');
+
+        $this->filterInterface->expects($this->any())
+            ->method('getField')
+            ->willReturn('field');
+
+        $this->fieldMapper->expects($this->any())
+            ->method('getFieldName')
+            ->willReturn('field');
+
+        $result = $this->model->buildFilter($this->filterInterface);
+        $this->assertNotNull($result);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php
new file mode 100644
index 0000000000000..c035b5ad8279e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Filter\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @see \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard
+ */
+class WildcardTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Wildcard
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Framework\Search\Request\Filter\Wildcard|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterInterface;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filterInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\Filter\Wildcard::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getField',
+                'getValue',
+            ])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard::class,
+            [
+                'fieldMapper' => $this->fieldMapper
+            ]
+        );
+    }
+
+    public function testBuildFilter()
+    {
+        $this->fieldMapper->expects($this->any())
+            ->method('getFieldName')
+            ->willReturn('field');
+
+        $this->filterInterface->expects($this->any())
+            ->method('getField')
+            ->willReturn('field');
+
+        $result = $this->model->buildFilter($this->filterInterface);
+        $this->assertNotNull($result);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/BuilderTest.php
new file mode 100644
index 0000000000000..c84a9e5b6b3f3
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/BuilderTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Filter;
+
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class BuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Builder
+     */
+    protected $model;
+
+    /**
+     * @var Range|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $range;
+
+    /**
+     * @var Term|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $term;
+
+    /**
+     * @var Wildcard|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $wildcard;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->range = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->term = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->wildcard = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->term->expects($this->any())
+            ->method('buildFilter')
+            ->willReturn([]);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Filter\Builder::class,
+            [
+                'range' => $this->range,
+                'term' => $this->term,
+                'wildcard' => $this->wildcard
+            ]
+        );
+    }
+
+    /**
+     * Test build() method failure
+     * @expectedException \InvalidArgumentException
+     */
+    public function testBuildFailure()
+    {
+        $filter = $this->getMockBuilder(\Magento\Framework\Search\Request\FilterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $filter->expects($this->any())
+            ->method('getType')
+            ->willReturn('unknown');
+
+        $this->model->build($filter, 'must');
+    }
+
+    /**
+     * Test build() method
+     * @param string $filterMock
+     * @param string $filterType
+     * @dataProvider buildDataProvider
+     */
+    public function testBuild($filterMock, $filterType)
+    {
+        $filter = $this->getMockBuilder($filterMock)
+            ->setMethods(['getMust', 'getType', 'getShould', 'getMustNot'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $filter->expects($this->any())
+            ->method('getType')
+            ->willReturn($filterType);
+        $childFilter = $this->getMockBuilder(\Magento\Framework\Search\Request\FilterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $childFilter->expects($this->any())
+            ->method('getType')
+            ->willReturn('termFilter');
+        $filter->expects($this->any())
+            ->method('getMust')
+            ->willReturn([$childFilter]);
+        $filter->expects($this->any())
+            ->method('getShould')
+            ->willReturn([$childFilter]);
+        $filter->expects($this->any())
+            ->method('getMustNot')
+            ->willReturn([$childFilter]);
+
+        $result = $this->model->build($filter, 'must');
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * Test build() method with negation
+     * @param string $filterMock
+     * @param string $filterType
+     * @dataProvider buildDataProvider
+     */
+    public function testBuildNegation($filterMock, $filterType)
+    {
+        $filter = $this->getMockBuilder($filterMock)
+            ->setMethods(['getMust', 'getType', 'getShould', 'getMustNot'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $filter->expects($this->any())
+            ->method('getType')
+            ->willReturn($filterType);
+        $childFilter = $this->getMockBuilder(\Magento\Framework\Search\Request\FilterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $childFilter->expects($this->any())
+            ->method('getType')
+            ->willReturn('termFilter');
+        $filter->expects($this->any())
+            ->method('getMust')
+            ->willReturn([$childFilter]);
+        $filter->expects($this->any())
+            ->method('getShould')
+            ->willReturn([$childFilter]);
+        $filter->expects($this->any())
+            ->method('getMustNot')
+            ->willReturn([$childFilter]);
+
+        $result = $this->model->build($filter, 'must_not');
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        return [
+            [\Magento\Framework\Search\Request\FilterInterface::class,
+                'termFilter'
+            ],
+            [\Magento\Framework\Search\Request\Filter\BoolExpression::class,
+                'boolFilter'
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/MapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/MapperTest.php
new file mode 100644
index 0000000000000..845e1acb2d646
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/MapperTest.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\Elasticsearch\SearchAdapter\Mapper;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder as QueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Mapper
+     */
+    protected $model;
+
+    /**
+     * @var QueryBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $queryBuilder;
+
+    /**
+     * @var MatchQueryBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $matchQueryBuilder;
+
+    /**
+     * @var FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterBuilder;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->queryBuilder = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Query\Builder::class)
+            ->setMethods([
+                'initQuery',
+                'initAggregations',
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->matchQueryBuilder = $this->getMockBuilder(
+            \Magento\Elasticsearch\SearchAdapter\Query\Builder\Match::class
+        )
+            ->setMethods(['build'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filterBuilder = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->queryBuilder->expects($this->any())
+            ->method('initQuery')
+            ->willReturn([
+                'body' => [
+                    'query' => [],
+                ],
+            ]);
+        $this->queryBuilder->expects($this->any())
+            ->method('initAggregations')
+            ->willReturn([
+                'body' => [
+                    'query' => [],
+                ],
+            ]);
+        $this->matchQueryBuilder->expects($this->any())
+            ->method('build')
+            ->willReturn([]);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Mapper::class,
+            [
+                'queryBuilder' => $this->queryBuilder,
+                'matchQueryBuilder' => $this->matchQueryBuilder,
+                'filterBuilder' => $this->filterBuilder
+            ]
+        );
+    }
+
+    /**
+     * Test buildQuery() method with exception
+     * @expectedException \InvalidArgumentException
+     */
+    public function testBuildQueryFailure()
+    {
+        $request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $query = $this->getMockBuilder(\Magento\Framework\Search\Request\QueryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $request->expects($this->once())
+            ->method('getQuery')
+            ->willReturn($query);
+        $query->expects($this->atLeastOnce())
+            ->method('getType')
+            ->willReturn('unknown');
+
+        $this->model->buildQuery($request);
+    }
+
+    /**
+     * Test buildQuery() method
+     *
+     * @param string $queryType
+     * @param string $queryMock
+     * @param string $referenceType
+     * @param string $filterMock
+     * @dataProvider buildQueryDataProvider
+     */
+    public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMock)
+    {
+        $request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $query = $this->getMockBuilder($queryMock)
+            ->setMethods(['getMust', 'getMustNot', 'getType', 'getShould', 'getReferenceType', 'getReference'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $matchQuery = $this->getMockBuilder(\Magento\Framework\Search\Request\Query\Match::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $filterQuery = $this->getMockBuilder($filterMock)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $request->expects($this->once())
+            ->method('getQuery')
+            ->willReturn($query);
+
+        $query->expects($this->atLeastOnce())
+            ->method('getType')
+            ->willReturn($queryType);
+        $query->expects($this->any())
+            ->method('getMust')
+            ->willReturn([$matchQuery]);
+        $query->expects($this->any())
+            ->method('getShould')
+            ->willReturn([]);
+        $query->expects($this->any())
+            ->method('getMustNot')
+            ->willReturn([]);
+        $query->expects($this->any())
+            ->method('getReferenceType')
+            ->willReturn($referenceType);
+        $query->expects($this->any())
+            ->method('getReference')
+            ->willReturn($filterQuery);
+        $matchQuery->expects($this->any())
+            ->method('getType')
+            ->willReturn('matchQuery');
+        $filterQuery->expects($this->any())
+            ->method('getType')
+            ->willReturn('matchQuery');
+        $filterQuery->expects($this->any())
+            ->method('getType')
+            ->willReturn('matchQuery');
+        $this->filterBuilder->expects(($this->any()))
+            ->method('build')
+            ->willReturn([
+                'bool' => [
+                    'must' => [],
+                ],
+            ]);
+
+        $this->model->buildQuery($request);
+    }
+
+    /**
+     * @return array
+     */
+    public function buildQueryDataProvider()
+    {
+        return [
+            [
+                'matchQuery', \Magento\Framework\Search\Request\Query\Match::class,
+                'query', \Magento\Framework\Search\Request\QueryInterface::class,
+            ],
+            [
+                'boolQuery', \Magento\Framework\Search\Request\Query\BoolExpression::class,
+                'query', \Magento\Framework\Search\Request\QueryInterface::class,
+            ],
+            [
+                'filteredQuery', \Magento\Framework\Search\Request\Query\Filter::class,
+                'query', \Magento\Framework\Search\Request\QueryInterface::class,
+            ],
+            [
+                'filteredQuery', \Magento\Framework\Search\Request\Query\Filter::class,
+                'filter', \Magento\Framework\Search\Request\FilterInterface::class,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php
new file mode 100644
index 0000000000000..03724caf74dbd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation;
+use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class AggregationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Aggregation
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fieldMapper;
+
+    /**
+     * @var \Magento\Framework\Search\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestInterface;
+
+    /**
+     * @var BucketInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestBucketInterface;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $helper = new ObjectManager($this);
+
+        $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->requestInterface = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->requestBucketInterface = $this->getMockBuilder(BucketInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $helper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation::class,
+            [
+                'fieldMapper' =>$this->fieldMapper,
+            ]
+        );
+    }
+
+    /**
+     * Test build() method "dynamicBucket" with field "price"
+     */
+    public function testBuildDynamicPrice()
+    {
+        $query = [
+            'index' => 'magento2',
+            'type' => 'product',
+            'body' => [],
+        ];
+
+        $this->requestInterface->expects($this->any())
+            ->method('getAggregation')
+            ->willReturn([$this->requestBucketInterface]);
+
+        $this->fieldMapper->expects($this->any())
+            ->method('getFieldName')
+            ->willReturn('price');
+
+        $this->requestBucketInterface->expects($this->any())
+            ->method('getField')
+            ->willReturn('price');
+
+        $this->requestBucketInterface->expects($this->any())
+            ->method('getType')
+            ->willReturn('dynamicBucket');
+
+        $this->requestBucketInterface->expects($this->any())
+            ->method('getName')
+            ->willReturn('price_bucket');
+
+        $result = $this->model->build($this->requestInterface, $query);
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * Test build() method "dynamicBucket"
+     */
+    public function testBuildDynamic()
+    {
+        $query = [
+            'index' => 'magento2',
+            'type' => 'product',
+            'body' => [],
+        ];
+
+        $this->requestInterface->expects($this->any())
+            ->method('getAggregation')
+            ->willReturn([$this->requestBucketInterface]);
+
+        $this->fieldMapper->expects($this->any())
+            ->method('getFieldName')
+            ->willReturn('field');
+
+        $this->requestBucketInterface->expects($this->any())
+            ->method('getField')
+            ->willReturn('field');
+
+        $this->requestBucketInterface->expects($this->any())
+            ->method('getType')
+            ->willReturn('dynamicBucket');
+
+        $this->requestBucketInterface->expects($this->any())
+            ->method('getName')
+            ->willReturn('price_bucket');
+
+        $result = $this->model->build($this->requestInterface, $query);
+        $this->assertNotNull($result);
+    }
+
+    /**
+     * Test build() method "dynamicBucket"
+     */
+    public function testBuildTerm()
+    {
+        $query = [
+            'index' => 'magento2',
+            'type' => 'product',
+            'body' => [],
+        ];
+        $bucketName = 'price_bucket';
+
+        $this->requestInterface
+            ->method('getAggregation')
+            ->willReturn([$this->requestBucketInterface]);
+
+        $this->fieldMapper
+            ->method('getFieldName')
+            ->willReturn('price');
+
+        $this->requestBucketInterface
+            ->method('getField')
+            ->willReturn('price');
+
+        $this->requestBucketInterface
+            ->method('getType')
+            ->willReturn(BucketInterface::TYPE_TERM);
+
+        $this->requestBucketInterface
+            ->method('getName')
+            ->willReturn($bucketName);
+
+        $result = $this->model->build($this->requestInterface, $query);
+
+        $this->assertNotNull($result);
+        $this->assertTrue(
+            isset($result['body']['aggregations'][$bucketName]['terms']['size']),
+            'The size have to be specified since by default, ' .
+            'the terms aggregation will return only the buckets for the top ten terms ordered by the doc_count'
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
new file mode 100644
index 0000000000000..8114feb09d35d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
+use Magento\Framework\Search\Request\Query\Match as MatchRequestQuery;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class MatchTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var MatchQueryBuilder
+     */
+    private $matchQueryBuilder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->matchQueryBuilder = (new ObjectManager($this))->getObject(
+            MatchQueryBuilder::class,
+            [
+                'fieldMapper' => $this->getFieldMapper(),
+                'preprocessorContainer' => [],
+            ]
+        );
+    }
+
+    /**
+     * Tests that method constructs a correct select query.
+     * @see MatchQueryBuilder::build
+     *
+     * @dataProvider queryValuesInvariantsProvider
+     *
+     * @param string $rawQueryValue
+     * @param string $errorMessage
+     */
+    public function testBuild($rawQueryValue, $errorMessage)
+    {
+        $this->assertSelectQuery(
+            $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not'),
+            $errorMessage
+        );
+    }
+
+    /**
+     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
+     *
+     * @return array
+     */
+    public function queryValuesInvariantsProvider()
+    {
+        return [
+            ['query_value', 'Select query field must match simple raw query value.'],
+            ['query_value+', 'Specifying a trailing plus sign causes InnoDB to report a syntax error.'],
+            ['query_value-', 'Specifying a trailing minus sign causes InnoDB to report a syntax error.'],
+            ['query_@value', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
+            ['query_value+@', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
+        ];
+    }
+
+    /**
+     * Tests that method constructs a correct "match" query depending on query value.
+     *
+     * @dataProvider matchProvider
+     *
+     * @param string $rawQueryValue
+     * @param string $queryValue
+     * @param string $match
+     */
+    public function testBuildMatchQuery($rawQueryValue, $queryValue, $match)
+    {
+        $query = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'should');
+
+        $expectedSelectQuery = [
+            'bool' => [
+                'should' => [
+                    [
+                        $match => [
+                            'some_field' => [
+                                'query' => $queryValue,
+                                'boost' => 43,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->assertEquals(
+            $expectedSelectQuery,
+            $query,
+            sprintf('Wrong "match" query. Should be processed with "%s"', $match)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function matchProvider()
+    {
+        return [
+            ['query_value', 'query_value', 'match'],
+            ['"query value"', 'query value', 'match_phrase'],
+        ];
+    }
+
+    /**
+     * @param array $selectQuery
+     * @param string $errorMessage
+     */
+    private function assertSelectQuery($selectQuery, $errorMessage)
+    {
+        $expectedSelectQuery = [
+            'bool' => [
+                'must_not' => [
+                    [
+                        'match' => [
+                            'some_field' => [
+                                'query' => 'query_value',
+                                'boost' => 43,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expectedSelectQuery, $selectQuery, $errorMessage);
+    }
+
+    /**
+     * Gets fieldMapper mock object.
+     *
+     * @return FieldMapperInterface|MockObject
+     */
+    private function getFieldMapper()
+    {
+        $fieldMapper = $this->getMockBuilder(FieldMapperInterface::class)
+            ->getMockForAbstractClass();
+
+        $fieldMapper->method('getFieldName')
+            ->with('some_field', ['type' => FieldMapperInterface::TYPE_QUERY])
+            ->willReturnArgument(0);
+
+        return $fieldMapper;
+    }
+
+    /**
+     * Gets RequestQuery mock object.
+     *
+     * @param string $rawQueryValue
+     * @return MatchRequestQuery|MockObject
+     */
+    private function getMatchRequestQuery($rawQueryValue)
+    {
+        $matchRequestQuery = $this->getMockBuilder(MatchRequestQuery::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $matchRequestQuery->method('getValue')
+            ->willReturn($rawQueryValue);
+        $matchRequestQuery->method('getMatches')
+            ->willReturn([['field' => 'some_field', 'boost' => 42]]);
+
+        return $matchRequestQuery;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/BuilderTest.php
new file mode 100644
index 0000000000000..508a0ad6a6f12
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/BuilderTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query;
+
+use Magento\Elasticsearch\SearchAdapter\Query\Builder;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Builder
+     */
+    protected $model;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientConfig;
+
+    /**
+     * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchIndexNameResolver;
+
+    /**
+     * @var AggregationBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $aggregationBuilder;
+
+    /**
+     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeInterface;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->setMethods(['getEntityType'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchIndexNameResolver = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class)
+            ->setMethods(['getIndexName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->aggregationBuilder = $this
+            ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation::class)
+            ->setMethods(['build'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeResolver = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeResolverInterface::class,
+            [],
+            '',
+            false
+        );
+        $this->scopeInterface = $this->getMockForAbstractClass(
+            \Magento\Framework\App\ScopeInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\Query\Builder::class,
+            [
+                'clientConfig' => $this->clientConfig,
+                'searchIndexNameResolver' => $this->searchIndexNameResolver,
+                'aggregationBuilder' => $this->aggregationBuilder,
+                'scopeResolver' => $this->scopeResolver
+            ]
+        );
+    }
+
+    /**
+     * Test initQuery() method
+     */
+    public function testInitQuery()
+    {
+        $dimensionValue = 1;
+        $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->request->expects($this->once())
+            ->method('getDimensions')
+            ->willReturn([$dimension]);
+        $dimension->expects($this->once())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn($dimensionValue);
+        $this->request->expects($this->once())
+            ->method('getFrom')
+            ->willReturn(0);
+        $this->request->expects($this->once())
+            ->method('getSize')
+            ->willReturn(10);
+        $this->request->expects($this->once())
+            ->method('getIndex')
+            ->willReturn('catalogsearch_fulltext');
+        $this->searchIndexNameResolver->expects($this->once())
+            ->method('getIndexName')
+            ->willReturn('indexName');
+        $this->clientConfig->expects($this->once())
+            ->method('getEntityType')
+            ->willReturn('document');
+        $this->model->initQuery($this->request);
+    }
+
+    /**
+     * Test initQuery() method
+     */
+    public function testInitAggregations()
+    {
+        $this->aggregationBuilder->expects($this->any())
+            ->method('build')
+            ->willReturn([]);
+        $result = $this->model->initAggregations($this->request, []);
+        $this->assertNotNull($result);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php
new file mode 100644
index 0000000000000..d33f971ebaf9b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Preprocessor;
+
+use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords as StopwordsPreprocessor;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Locale\Resolver as LocaleResolver;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
+use Magento\Framework\App\Cache\Type\Config as ConfigCache;
+use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class StopwordsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var StopwordsPreprocessor
+     */
+    protected $model;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManager;
+
+    /**
+     * @var LocaleResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeResolver;
+
+    /**
+     * @var ReadFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $readFactory;
+
+    /**
+     * @var ConfigCache|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configCache;
+
+    /**
+     * @var EsConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $esConfig;
+
+    /**
+     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\Resolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'emulate',
+                'getLocale',
+            ])
+            ->getMock();
+        $this->readFactory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->configCache = $this->getMockBuilder(\Magento\Framework\App\Cache\Type\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->esConfig = $this->getMockBuilder(
+            \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface::class
+        )->disableOriginalConstructor()->getMock();
+
+        $this->serializerMock = $this->createMock(SerializerInterface::class);
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            Stopwords::class,
+            [
+                'storeManager' => $this->storeManager,
+                'localeResolver' => $this->localeResolver,
+                'readFactory' => $this->readFactory,
+                'configCache' => $this->configCache,
+                'esConfig' => $this->esConfig,
+                'stopwordsModule' => '',
+                'stopwordsDirectory' => ''
+            ]
+        );
+        $objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'serializer',
+            $this->serializerMock
+        );
+    }
+
+    /**
+     * Test process() method
+     */
+    public function testProcess()
+    {
+        $stopWordsFromFile = "a\nthe\nof";
+        $stopWords = ['a', 'the', 'of'];
+        $serializedStopWords = 'serialized stop words';
+        $this->esConfig->expects($this->once())
+            ->method('getStopwordsInfo')
+            ->willReturn([
+                'default' => 'default.csv',
+            ]);
+        $storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeInterface);
+        $storeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->localeResolver->expects($this->once())
+            ->method('getLocale')
+            ->willReturn('en_US');
+
+        $read = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Read::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->readFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($read);
+        $read->expects($this->once())
+            ->method('stat')
+            ->willReturn([
+                'mtime' => 0,
+            ]);
+        $this->configCache->expects($this->once())
+            ->method('load')
+            ->willReturn(false);
+
+        $read->expects($this->once())
+            ->method('readFile')
+            ->willReturn($stopWordsFromFile);
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->with($stopWords)
+            ->willReturn($serializedStopWords);
+        $this->configCache->expects($this->once())
+            ->method('save')
+            ->with(
+                $serializedStopWords,
+                Stopwords::CACHE_ID
+            );
+
+        $this->assertEquals(
+            'test query',
+            $this->model->process('the test of a query')
+        );
+    }
+
+    /**
+     * Test process() method, load stopwords from cache
+     */
+    public function testProcessFromCache()
+    {
+        $serializedStopWords = 'serialized stop words';
+        $this->esConfig->expects($this->once())
+            ->method('getStopwordsInfo')
+            ->willReturn([
+                'default' => 'default.csv',
+            ]);
+        $storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeInterface);
+        $storeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->localeResolver->expects($this->once())
+            ->method('getLocale')
+            ->willReturn('en_US');
+
+        $read = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Read::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->readFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($read);
+        $read->expects($this->once())
+            ->method('stat')
+            ->willReturn([
+                'mtime' => 0,
+            ]);
+        $this->configCache->expects($this->once())
+            ->method('load')
+            ->willReturn($serializedStopWords);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedStopWords)
+            ->willReturn(['a', 'the', 'of']);
+
+        $this->assertEquals(
+            'test query',
+            $this->model->process('the test of a query')
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
new file mode 100644
index 0000000000000..9ea241b2fbf5c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\Elasticsearch\SearchAdapter\ResponseFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ResponseFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResponseFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\DocumentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $documentFactory;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\AggregationFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $aggregationFactory;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManager;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->documentFactory = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\DocumentFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->aggregationFactory = $this->getMockBuilder(
+            \Magento\Elasticsearch\SearchAdapter\AggregationFactory::class
+        )
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Elasticsearch\SearchAdapter\ResponseFactory::class,
+            [
+                'objectManager' => $this->objectManager,
+                'documentFactory' => $this->documentFactory,
+                'aggregationFactory' => $this->aggregationFactory
+            ]
+        );
+    }
+
+    public function testCreate()
+    {
+        $documents = [
+            ['title' => 'oneTitle', 'description' => 'oneDescription'],
+            ['title' => 'twoTitle', 'description' => 'twoDescription'],
+        ];
+        $aggregations = [
+            'aggregation1' => [
+                'itemOne' => 10,
+                'itemTwo' => 20,
+            ],
+            'aggregation2' => [
+                'itemOne' => 5,
+                'itemTwo' => 45,
+            ]
+        ];
+        $rawResponse = ['documents' => $documents, 'aggregations' => $aggregations];
+
+        $exceptedResponse = [
+            'documents' => [
+                [
+                    ['name' => 'title', 'value' => 'oneTitle'],
+                    ['name' => 'description', 'value' => 'oneDescription'],
+                ],
+                [
+                    ['name' => 'title', 'value' => 'twoTitle'],
+                    ['name' => 'description', 'value' => 'twoDescription'],
+                ],
+            ],
+            'aggregations' => [
+                'aggregation1' => [
+                    'itemOne' => 10,
+                    'itemTwo' => 20
+                ],
+                'aggregation2' => [
+                    'itemOne' => 5,
+                    'itemTwo' => 45
+                ],
+            ],
+        ];
+
+        $this->documentFactory->expects($this->at(0))->method('create')
+            ->with($this->equalTo($documents[0]))
+            ->will($this->returnValue('document1'));
+        $this->documentFactory->expects($this->at(1))->method('create')
+            ->with($documents[1])
+            ->will($this->returnValue('document2'));
+
+        $this->aggregationFactory->expects($this->at(0))->method('create')
+            ->with($this->equalTo($exceptedResponse['aggregations']))
+            ->will($this->returnValue('aggregationsData'));
+
+        $this->objectManager->expects($this->once())->method('create')
+            ->with(
+                $this->equalTo(\Magento\Framework\Search\Response\QueryResponse::class),
+                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => 'aggregationsData'])
+            )
+            ->will($this->returnValue('QueryResponseObject'));
+
+        $result = $this->model->create($rawResponse);
+        $this->assertEquals('QueryResponseObject', $result);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php
new file mode 100644
index 0000000000000..45abfcfb2164f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter;
+
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class SearchIndexNameResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SearchIndexNameResolver
+     */
+    protected $model;
+
+    /**
+     * @var ClientOptionsInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $clientConfig;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManager;
+
+    /**
+     * @var string
+     */
+    protected $indexId;
+
+    /**
+     * @var int
+     */
+    protected $storeId;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getIndexPrefix',
+                'getEntityType',
+                'getIndexSettings',
+            ])
+            ->getMock();
+
+        $this->clientConfig->expects($this->any())
+            ->method('getIndexPrefix')
+            ->willReturn('indexName');
+
+        $this->indexId = 'catalogsearch_fulltext';
+        $this->storeId = 1;
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class,
+            [
+                'clientConfig' => $this->clientConfig,
+            ]
+        );
+    }
+
+    /**
+     * Test getIndexName() indexerId 'catalogsearch_fulltext'
+     */
+    public function testGetIndexNameCatalogSearchFullText()
+    {
+        $this->assertEquals(
+            'indexName_product_1',
+            $this->model->getIndexName($this->storeId, $this->indexId)
+        );
+    }
+
+    /**
+     * Test getIndexName() with any ndex
+     */
+    public function testGetIndexName()
+    {
+        $this->assertEquals(
+            'indexName_else_index_id_1',
+            $this->model->getIndexName($this->storeId, 'else_index_id')
+        );
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
new file mode 100644
index 0000000000000..a821506f5ef6e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/module-elasticsearch",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-advanced-search": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/framework": "*",
+        "elasticsearch/elasticsearch": "~2.0|~5.1"
+    },
+    "suggest": {
+        "magento/module-config": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\Elasticsearch\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/etc/adminhtml/events.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/events.xml
new file mode 100644
index 0000000000000..a9b60aee1e69c
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/adminhtml/events.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:Event/etc/events.xsd">
+    <event name="catalog_category_change_products">
+        <observer name="category_product_elasticsearch_indexer" instance="Magento\Elasticsearch\Observer\CategoryProductIndexer"/>
+    </event>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..dd42b408ff75e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="catalog">
+            <group id="search">
+                <!-- Elasticsearch 2.0+ -->
+                <field id="elasticsearch_server_hostname" translate="label" type="text" sortOrder="61" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Server Hostname</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_server_port" translate="label" type="text" sortOrder="62" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Server Port</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_index_prefix" translate="label" type="text" sortOrder="63" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Index Prefix</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_enable_auth" translate="label" type="select" sortOrder="64" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Elasticsearch HTTP Auth</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_username" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch HTTP Username</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                        <field id="elasticsearch_enable_auth">1</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_password" translate="label" type="text" sortOrder="66" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch HTTP Password</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                        <field id="elasticsearch_enable_auth">1</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_server_timeout" translate="label" type="text" sortOrder="67" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Server Timeout</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch_test_connect_wizard" translate="button_label" sortOrder="68" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label/>
+                    <button_label>Test Connection</button_label>
+                    <frontend_model>Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection</frontend_model>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                </field>
+                <!-- Elasticsearch 5.0+ -->
+                <field id="elasticsearch5_server_hostname" translate="label" type="text" sortOrder="61" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Server Hostname</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_server_port" translate="label" type="text" sortOrder="62" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Server Port</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_index_prefix" translate="label" type="text" sortOrder="63" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Index Prefix</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_enable_auth" translate="label" type="select" sortOrder="64" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Elasticsearch HTTP Auth</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_username" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch HTTP Username</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                        <field id="elasticsearch5_enable_auth">1</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_password" translate="label" type="text" sortOrder="66" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch HTTP Password</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                        <field id="elasticsearch5_enable_auth">1</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_server_timeout" translate="label" type="text" sortOrder="67" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Elasticsearch Server Timeout</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                </field>
+                <field id="elasticsearch5_test_connect_wizard" translate="button_label" sortOrder="68" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label/>
+                    <button_label>Test Connection</button_label>
+                    <frontend_model>Magento\Elasticsearch\Block\Adminhtml\System\Config\Elasticsearch5\TestConnection</frontend_model>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/config.xml b/app/code/Magento/Elasticsearch/etc/config.xml
new file mode 100644
index 0000000000000..0e01aba5ed857
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <catalog>
+            <search>
+                <elasticsearch_server_hostname>localhost</elasticsearch_server_hostname>
+                <elasticsearch_server_port>9200</elasticsearch_server_port>
+                <elasticsearch_index_prefix>magento2</elasticsearch_index_prefix>
+                <elasticsearch_enable_auth>0</elasticsearch_enable_auth>
+                <elasticsearch_server_timeout>15</elasticsearch_server_timeout>
+
+                <elasticsearch5_server_hostname>localhost</elasticsearch5_server_hostname>
+                <elasticsearch5_server_port>9200</elasticsearch5_server_port>
+                <elasticsearch5_index_prefix>magento2</elasticsearch5_index_prefix>
+                <elasticsearch5_enable_auth>0</elasticsearch5_enable_auth>
+                <elasticsearch5_server_timeout>15</elasticsearch5_server_timeout>
+            </search>
+        </catalog>
+    </default>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
new file mode 100644
index 0000000000000..6a42e4b3c9fe2
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -0,0 +1,424 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapperInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver">
+        <arguments>
+            <argument name="fieldMappers" xsi:type="array">
+                <item name="product" xsi:type="string">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Elasticsearch\Model\Adapter\DataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\DataMapper\DataMapperResolver" />
+    <virtualType name="AdditionalFieldsForElasticsearchDataMapper" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider">
+        <arguments>
+            <argument name="fieldsProviders" xsi:type="array">
+                <item name="categories" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy</item>
+                <item name="prices" xsi:type="object">Magento\Elasticsearch\Model\Adapter\BatchDataMapper\PriceFieldsProvider</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper">
+        <arguments>
+            <argument name="additionalFieldsProvider" xsi:type="object">AdditionalFieldsForElasticsearchDataMapper</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver" />
+    <type name="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperFactory">
+        <arguments>
+            <argument name="dataMappers" xsi:type="array">
+                <item name="product" xsi:type="string">Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface" type="Magento\Elasticsearch\Model\Adapter\Index\Builder" />
+    <preference for="Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface" type="Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig" />
+    <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
+        <arguments>
+            <argument name="engines" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">Elasticsearch 5.0+</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy">
+        <arguments>
+            <argument name="categoryFieldsProviders" xsi:type="array">
+                <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Adapter\BatchDataMapper\CategoryFieldsProvider</item>
+                <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapperProxy">
+        <arguments>
+            <argument name="dataMappers" xsi:type="array">
+                <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper</item>
+                <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
+        <arguments>
+            <argument name="productFieldMappers" xsi:type="array">
+                <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper</item>
+                <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\AdvancedSearch\Model\Client\ClientResolver">
+        <arguments>
+            <argument name="clientFactories" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">\Magento\Elasticsearch\Model\Client\ElasticsearchFactory</item>
+                <item name="elasticsearch5" xsi:type="string">\Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory</item>
+            </argument>
+            <argument name="clientOptions" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
+                <item name="elasticsearch5" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexerHandler</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexerHandler</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Indexer\IndexStructureFactory">
+        <arguments>
+            <argument name="structures" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexStructure</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Model\Indexer\IndexStructure</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\ResourceModel\EngineProvider">
+        <arguments>
+            <argument name="engines" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Engine</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Engine</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Search\Model\AdapterFactory">
+        <arguments>
+            <argument name="adapters" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\SearchAdapter\Adapter</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Search\Model\EngineResolver">
+        <arguments>
+            <argument name="engines" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Elasticsearch\SearchAdapter\ProductEntityMetadata" type="Magento\Framework\Search\EntityMetadata">
+        <arguments>
+            <argument name="entityId" xsi:type="string">_id</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Elasticsearch\SearchAdapter\DocumentFactory">
+        <arguments>
+            <argument name="entityMetadata" xsi:type="object">Magento\Elasticsearch\SearchAdapter\ProductEntityMetadata</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\ConnectionManager">
+        <arguments>
+            <argument name="clientFactory" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Client\ClientFactoryProxy</argument>
+            <argument name="clientConfig" xsi:type="object">Magento\Elasticsearch\Model\Config</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Elasticsearch\Elasticsearch5\SearchAdapter\ConnectionManager" type="Magento\Elasticsearch\SearchAdapter\ConnectionManager">
+        <arguments>
+            <argument name="clientFactory" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory</argument>
+            <argument name="clientConfig" xsi:type="object">Magento\Elasticsearch\Model\Config</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory" type="Magento\AdvancedSearch\Model\Client\ClientFactory">
+        <arguments>
+            <argument name="clientClass" xsi:type="string">Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Client\ClientFactoryProxy">
+        <arguments>
+            <argument name="clientFactories" xsi:type="array">
+                <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Client\ElasticsearchFactory</item>
+                <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter">
+        <arguments>
+            <argument name="connectionManager" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\SearchAdapter\ConnectionManager</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Search\Dynamic\IntervalFactory">
+        <arguments>
+            <argument name="intervals" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\SearchAdapter\Aggregation\Interval</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Aggregation\Interval</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Search\Dynamic\DataProviderFactory">
+        <arguments>
+            <argument name="dataProviders" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Aggregation\Builder">
+        <arguments>
+            <argument name="dataProviderContainer" xsi:type="array">
+                <item name="catalogsearch_fulltext" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider</item>
+            </argument>
+            <argument name="aggregationContainer" xsi:type="array">
+                <item name="termBucket" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term</item>
+                <item name="dynamicBucket" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider">
+        <plugin name="stockedProductsFilterPlugin" type="Magento\Elasticsearch\Model\Indexer\Plugin\StockedProductsFilterPlugin"/>
+    </type>
+    <type name="Magento\Framework\Indexer\Config\DependencyInfoProvider">
+        <plugin name="indexerDependencyUpdaterPlugin" type="Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin"/>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\Builder\Match">
+        <arguments>
+            <argument name="preprocessorContainer" xsi:type="array">
+                <item name="stopwordsPreprocessor" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords</item>
+                <item name="synonymsPreprocessor" xsi:type="object">Magento\Search\Adapter\Query\Preprocessor\Synonyms</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords">
+        <arguments>
+            <argument name="stopwordsModule" xsi:type="string">Magento_Elasticsearch</argument>
+            <argument name="stopwordsDirectory" xsi:type="string">stopwords</argument>
+        </arguments>
+    </type>
+    <!-- @api -->
+    <virtualType name="Magento\Elasticsearch\Model\Adapter\Index\Config\Reader" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Elasticsearch\Model\Adapter\Index\Config\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">esconfig.xml</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Elasticsearch\Model\Adapter\Index\Config\Reader</argument>
+            <argument name="cacheId" xsi:type="string">elasticsearch_index_config</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Elasticsearch\Model\Client\ElasticsearchFactory" type="Magento\AdvancedSearch\Model\Client\ClientFactory">
+        <arguments>
+            <argument name="clientClass" xsi:type="string">Magento\Elasticsearch\Model\Client\Elasticsearch</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\AdvancedSearch\Model\SuggestedQueries">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">Magento\Elasticsearch\Model\DataProvider\Suggestions</item>
+                <item name="elasticsearch5" xsi:type="string">Magento\Elasticsearch\Model\DataProvider\Suggestions</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider">
+        <arguments>
+            <argument name="indexerId" xsi:type="const">\Magento\CatalogSearch\Model\Indexer\Fulltext::INDEXER_ID</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Model\Config\TypePool">
+        <arguments>
+            <argument name="sensitive" xsi:type="array">
+                <item name="catalog/search/elasticsearch_password" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_server_hostname" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_username" xsi:type="string">1</item>
+
+                <item name="catalog/search/elasticsearch5_password" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_server_hostname" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_username" xsi:type="string">1</item>
+            </argument>
+            <argument name="environment" xsi:type="array">
+                <item name="catalog/search/elasticsearch_enable_auth" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_index_prefix" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_password" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_server_hostname" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_server_port" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_username" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch_server_timeout" xsi:type="string">1</item>
+
+                <item name="catalog/search/elasticsearch5_enable_auth" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_index_prefix" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_password" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_server_hostname" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_server_port" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_username" xsi:type="string">1</item>
+                <item name="catalog/search/elasticsearch5_server_timeout" xsi:type="string">1</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProvider">
+        <arguments>
+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper">
+        <arguments>
+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
+        </arguments>
+    </type>
+    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
+        <arguments>
+            <argument name="items" xsi:type="array">
+                <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
+                <item name="special" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute</item>
+                <item name="price" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
+                <item name="categoryName" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
+                <item name="position" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
+                <item name="default" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="elasticsearch5FieldNameResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
+        <arguments>
+            <argument name="items" xsi:type="array">
+                <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
+                <item name="special" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\SpecialAttribute</item>
+                <item name="price" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
+                <item name="categoryName" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
+                <item name="position" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
+                <item name="default" xsi:type="object">elasticsearch5FieldNameDefaultResolver</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearch5FieldNameDefaultResolver" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver">
+        <arguments>
+            <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+        </arguments>
+    </virtualType>
+    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
+        <arguments>
+            <argument name="items" xsi:type="array">
+                <item name="integer" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType</item>
+                <item name="datetime" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType</item>
+                <item name="float" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType</item>
+                <item name="default" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
+        <arguments>
+            <argument name="items" xsi:type="array">
+                <item name="keyword" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType</item>
+                <item name="integer" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType</item>
+                <item name="datetime" xsi:type="object">elasticsearch5FieldTypeDateTimeResolver</item>
+                <item name="float" xsi:type="object">elasticsearch5FieldTypeFloatResolver</item>
+                <item name="default" xsi:type="object">elasticsearch5FieldTypeDefaultResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="static" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField</item>
+                <item name="dynamic" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="elasticsearch5FieldProvider" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="static" xsi:type="object">elasticsearch5StaticFieldProvider</item>
+                <item name="dynamic" xsi:type="object">elasticsearch5DynamicFieldProvider</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearch5StaticFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+            <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
+            <argument name="fieldIndexResolver" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver</argument>
+            <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearch5DynamicFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+            <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
+        </arguments>
+    </virtualType>
+    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+        </arguments>
+    </type>
+    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+        </arguments>
+    </type>
+    <virtualType name="elasticsearch5FieldTypeDateTimeResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DateTimeType">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearch5FieldTypeFloatResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\FloatType">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearch5FieldTypeDefaultResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\DefaultResolver">
+        <arguments>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+        </arguments>
+    </virtualType>
+    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
+        <arguments>
+            <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
+            <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
+        </arguments>
+    </type>
+    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper">
+        <arguments>
+            <argument name="attributeAdapterProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider</argument>
+            <argument name="fieldProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface</argument>
+            <argument name="fieldNameResolver" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
+            <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
+            <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Search\Model\Search\PageSizeProvider">
+        <arguments>
+            <argument name="pageSizeBySearchEngine" xsi:type="array">
+                <item name="elasticsearch" xsi:type="number">10000</item>
+                <item name="elasticsearch5" xsi:type="number">2147483647</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/esconfig.xml b/app/code/Magento/Elasticsearch/etc/esconfig.xml
new file mode 100644
index 0000000000000..e540251a3c726
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/esconfig.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Elasticsearch:etc/esconfig.xsd">
+    <stemmer>
+        <type>stemmer</type>
+        <default>english</default>
+        <de_DE>german</de_DE>
+        <en_US>english</en_US>
+        <es_ES>spanish</es_ES>
+        <fr_FR>french</fr_FR>
+        <nl_NL>dutch</nl_NL>
+        <pt_BR>portuguese</pt_BR>
+    </stemmer>
+    <stopwords_file>
+        <default>stopwords.csv</default>
+        <de_DE>stopwords_de_DE.csv</de_DE>
+        <en_US>stopwords_en_US.csv</en_US>
+        <es_ES>stopwords_es_ES.csv</es_ES>
+        <fr_FR>stopwords_fr_FR.csv</fr_FR>
+        <nl_NL>stopwords_nl_NL.csv</nl_NL>
+        <pt_BR>stopwords_pt_BR.csv</pt_BR>
+    </stopwords_file>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/esconfig.xsd b/app/code/Magento/Elasticsearch/etc/esconfig.xsd
new file mode 100644
index 0000000000000..d1442b074ac80
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/esconfig.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * This schema must be used to validate esconfig.xml 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="config" type="configType" />
+<xs:complexType name="configType" mixed="true">
+    <xs:choice maxOccurs="unbounded" minOccurs="1">
+        <xs:element name="stemmer" type="mixedDataType" />
+        <xs:element name="stopwords_file" type="mixedDataType" />
+    </xs:choice>
+</xs:complexType>
+<xs:complexType name="mixedDataType">
+    <xs:choice maxOccurs="unbounded" minOccurs="1">
+        <xs:element type="xs:string" name="default" minOccurs="1" maxOccurs="1" />
+        <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+    </xs:choice>
+</xs:complexType>
+</xs:schema>
diff --git a/app/code/Magento/Elasticsearch/etc/indexer.xml b/app/code/Magento/Elasticsearch/etc/indexer.xml
new file mode 100644
index 0000000000000..f22eb8f0bd39b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/indexer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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:Indexer/etc/indexer.xsd">
+    <indexer id="catalogsearch_fulltext">
+        <dependencies>
+            <indexer id="catalog_category_product" />
+            <indexer id="cataloginventory_stock" />
+            <indexer id="catalog_product_price" />
+        </dependencies>
+    </indexer>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/module.xml b/app/code/Magento/Elasticsearch/etc/module.xml
new file mode 100644
index 0000000000000..3a0f229713bc0
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/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_Elasticsearch">
+        <sequence>
+            <module name="Magento_CatalogSearch"/>
+            <module name="Magento_Search"/>
+            <module name="Magento_AdvancedSearch"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/Elasticsearch/etc/search_engine.xml b/app/code/Magento/Elasticsearch/etc/search_engine.xml
new file mode 100644
index 0000000000000..34b6432b15c03
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/search_engine.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<engines xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Search/etc/search_engine.xsd">
+    <engine name="elasticsearch">
+        <feature name="synonyms" support="true" />
+    </engine>
+</engines>
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords.csv
new file mode 100644
index 0000000000000..2d59246d51aa9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords.csv
@@ -0,0 +1,35 @@
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_de_DE.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_de_DE.csv
new file mode 100644
index 0000000000000..4dd6c27dceac4
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_de_DE.csv
@@ -0,0 +1,129 @@
+aber
+als
+am
+an
+auch
+auf
+aus
+bei
+bin
+bis
+bist
+da
+dadurch
+daher
+darum
+das
+daß
+dass
+dein
+deine
+dem
+den
+der
+des
+dessen
+deshalb
+die
+dies
+dieser
+dieses
+doch
+dort
+du
+durch
+ein
+eine
+einem
+einen
+einer
+eines
+er
+es
+euer
+eure
+für
+hatte
+hatten
+hattest
+hattet
+hier
+hinter
+ich
+ihr
+ihre
+im
+in
+ist
+ja
+jede
+jedem
+jeden
+jeder
+jedes
+jener
+jenes
+jetzt
+kann
+kannst
+können
+könnt
+machen
+mein
+meine
+mit
+muß
+mußt
+musst
+müssen
+müßt
+nach
+nachdem
+nein
+nicht
+nun
+oder
+seid
+sein
+seine
+sich
+sie
+sind
+soll
+sollen
+sollst
+sollt
+sonst
+soweit
+sowie
+und
+unser
+unsere
+unter
+vom
+von
+vor
+wann
+warum
+was
+weiter
+weitere
+wenn
+wer
+werde
+werden
+werdet
+weshalb
+wie
+wieder
+wieso
+wir
+wird
+wirst
+wo
+woher
+wohin
+zu
+zum
+zur
+über
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_en_US.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_en_US.csv
new file mode 100644
index 0000000000000..2d59246d51aa9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_en_US.csv
@@ -0,0 +1,35 @@
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_es_ES.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_es_ES.csv
new file mode 100644
index 0000000000000..c369aaa3a686e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_es_ES.csv
@@ -0,0 +1,178 @@
+un
+una
+unas
+unos
+uno
+sobre
+todo
+también
+tras
+otro
+algún
+alguno
+alguna
+algunos
+algunas
+ser
+es
+soy
+eres
+somos
+sois
+estoy
+esta
+estamos
+estais
+estan
+como
+en
+para
+atras
+porque
+por qué
+estado
+estaba
+ante
+antes
+siendo
+ambos
+pero
+por
+poder
+puede
+puedo
+podemos
+podeis
+pueden
+fui
+fue
+fuimos
+fueron
+hacer
+hago
+hace
+hacemos
+haceis
+hacen
+cada
+fin
+incluso
+primero
+desde
+conseguir
+consigo
+consigue
+consigues
+conseguimos
+consiguen
+ir
+voy
+va
+vamos
+vais
+van
+vaya
+gueno
+ha
+tener
+tengo
+tiene
+tenemos
+teneis
+tienen
+el
+la
+lo
+las
+los
+su
+aqui
+mio
+tuyo
+ellos
+ellas
+nos
+nosotros
+vosotros
+vosotras
+si
+dentro
+solo
+solamente
+saber
+sabes
+sabe
+sabemos
+sabeis
+saben
+ultimo
+largo
+bastante
+haces
+muchos
+aquellos
+aquellas
+sus
+entonces
+tiempo
+verdad
+verdadero
+verdadera
+cierto
+ciertos
+cierta
+ciertas
+intentar
+intento
+intenta
+intentas
+intentamos
+intentais
+intentan
+dos
+bajo
+arriba
+encima
+usar
+uso
+usas
+usa
+usamos
+usais
+usan
+emplear
+empleo
+empleas
+emplean
+ampleamos
+empleais
+valor
+muy
+era
+eras
+eramos
+eran
+modo
+bien
+cual
+cuando
+donde
+mientras
+quien
+con
+entre
+sin
+trabajo
+trabajar
+trabajas
+trabaja
+trabajamos
+trabajais
+trabajan
+podria
+podrias
+podriamos
+podrian
+podriais
+yo
+aquel
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_fr_FR.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_fr_FR.csv
new file mode 100644
index 0000000000000..f01d72c2606ef
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_fr_FR.csv
@@ -0,0 +1,116 @@
+alors
+au
+aucuns
+aussi
+autre
+avant
+avec
+avoir
+bon
+car
+ce
+cela
+ces
+ceux
+chaque
+ci
+comme
+comment
+dans
+des
+du
+dedans
+dehors
+depuis
+devrait
+doit
+donc
+dos
+début
+elle
+elles
+en
+encore
+essai
+est
+et
+eu
+fait
+faites
+fois
+font
+hors
+ici
+il
+ils
+je
+juste
+la
+le
+les
+leur
+là
+ma
+maintenant
+mais
+mes
+mine
+moins
+mon
+mot
+même
+ni
+nommés
+notre
+nous
+ou
+où
+par
+parce
+pas
+peut
+peu
+plupart
+pour
+pourquoi
+quand
+que
+quel
+quelle
+quelles
+quels
+qui
+sa
+sans
+ses
+seulement
+si
+sien
+son
+sont
+sous
+soyez
+sujet
+sur
+ta
+tandis
+tellement
+tels
+tes
+ton
+tous
+tout
+trop
+très
+tu
+voient
+vont
+votre
+vous
+vu
+ça
+étaient
+état
+étions
+été
+être
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_nl_NL.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_nl_NL.csv
new file mode 100644
index 0000000000000..50839d97dea60
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_nl_NL.csv
@@ -0,0 +1,104 @@
+aan
+af
+al
+alles
+als
+altijd
+andere
+ben
+bij
+daar
+dan
+dat
+de
+der
+deze
+die
+dit
+doch
+doen
+door
+dus
+een
+eens
+en
+er
+ge
+geen
+geweest
+haar
+had
+heb
+hebben
+heeft
+hem
+het
+hier
+hij
+hoe
+hun
+iemand
+iets
+ik
+in
+is
+ja
+je
+kan
+kon
+kunnen
+maar
+me
+meer
+men
+met
+mij
+mijn
+moet
+na
+naar
+niet
+niets
+nog
+nu
+of
+om
+omdat
+ons
+ook
+op
+over
+reeds
+te
+tegen
+toch
+toen
+tot
+u
+uit
+uw
+van
+veel
+voor
+want
+waren
+was
+wat
+we
+wel
+werd
+wezen
+wie
+wij
+wil
+worden
+zal
+ze
+zei
+zelf
+zich
+zij
+zijn
+zo
+zonder
+zou
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_pt_BR.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_pt_BR.csv
new file mode 100644
index 0000000000000..d926132e62891
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_pt_BR.csv
@@ -0,0 +1,147 @@
+último
+é
+acerca
+agora
+algmas
+alguns
+ali
+ambos
+antes
+apontar
+aquela
+aquelas
+aquele
+aqueles
+aqui
+atrás
+bem
+bom
+cada
+caminho
+cima
+com
+como
+comprido
+conhecido
+corrente
+das
+debaixo
+dentro
+desde
+desligado
+deve
+devem
+deverá
+direita
+diz
+dizer
+dois
+dos
+e
+ela
+ele
+eles
+em
+enquanto
+então
+está
+estão
+estado
+estar
+estará
+este
+estes
+esteve
+estive
+estivemos
+estiveram
+eu
+fará
+faz
+fazer
+fazia
+fez
+fim
+foi
+fora
+horas
+iniciar
+inicio
+ir
+irá
+ista
+iste
+isto
+ligado
+maioria
+maiorias
+mais
+mas
+mesmo
+meu
+muito
+muitos
+nós
+não
+nome
+nosso
+novo
+o
+onde
+os
+ou
+outro
+para
+parte
+pegar
+pelo
+pessoas
+pode
+poderá
+podia
+por
+porque
+povo
+promeiro
+quê
+qual
+qualquer
+quando
+quem
+quieto
+são
+saber
+sem
+ser
+seu
+somente
+têm
+tal
+também
+tem
+tempo
+tenho
+tentar
+tentaram
+tente
+tentei
+teu
+teve
+tipo
+tive
+todos
+trabalhar
+trabalho
+tu
+um
+uma
+umas
+uns
+usa
+usar
+valor
+veja
+ver
+verdade
+verdadeiro
+você
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch/i18n/en_US.csv b/app/code/Magento/Elasticsearch/i18n/en_US.csv
new file mode 100644
index 0000000000000..85c9aefdb9f25
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/i18n/en_US.csv
@@ -0,0 +1,12 @@
+"There is no such data mapper ""%1"" for interface %2","There is no such data mapper ""%1"" for interface %2"
+"Data mapper ""%1"" must implement interface %2","Data mapper ""%1"" must implement interface %2"
+"We were unable to perform the search because of a search engine misconfiguration.","We were unable to perform the search because of a search engine misconfiguration."
+"Could not ping search engine: %1","Could not ping search engine: %1"
+"Elasticsearch Server Hostname","Elasticsearch Server Hostname"
+"Elasticsearch Server Port","Elasticsearch Server Port"
+"Elasticsearch Index Prefix","Elasticsearch Index Prefix"
+"Enable Elasticsearch HTTP Auth","Enable Elasticsearch HTTP Auth"
+"Elasticsearch HTTP Username","Elasticsearch HTTP Username"
+"Elasticsearch HTTP Password","Elasticsearch HTTP Password"
+"Elasticsearch Server Timeout","Elasticsearch Server Timeout"
+"Test Connection","Test Connection"
diff --git a/app/code/Magento/Elasticsearch/registration.php b/app/code/Magento/Elasticsearch/registration.php
new file mode 100644
index 0000000000000..9fc806c12e403
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_Elasticsearch',
+    __DIR__
+);
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index e12a5f15ad624..25348f9638f3e 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -22,7 +22,7 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe
      *
      * @var string
      */
-    protected $_template = 'template/list.phtml';
+    protected $_template = 'Magento_Email::template/list.phtml';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index 1a28a299cc177..112813c3b096c 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -44,7 +44,7 @@ class Edit extends Widget implements ContainerInterface
      *
      * @var string
      */
-    protected $_template = 'template/edit.phtml';
+    protected $_template = 'Magento_Email::template/edit.phtml';
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
index 9f248f2cebc3d..eedcf5009ccfa 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
@@ -22,21 +22,21 @@ public function execute()
                 if (count($template->getSystemConfigPathsWhereCurrentlyUsed()) == 0) {
                     $template->delete();
                     // display success message
-                    $this->messageManager->addSuccess(__('You deleted the email template.'));
+                    $this->messageManager->addSuccessMessage(__('You deleted the email template.'));
                     $this->_objectManager->get(\Magento\Framework\App\ReinitableConfig::class)->reinit();
                     // go to grid
                     $this->_redirect('adminhtml/*/');
                     return;
                 }
                 // display error  message
-                $this->messageManager->addError(__('The email template is currently being used.'));
+                $this->messageManager->addErrorMessage(__('The email template is currently being used.'));
                 // redirect to edit form
                 $this->_redirect('adminhtml/*/edit', ['id' => $template->getId()]);
                 return;
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('We can\'t delete email template data right now. Please review log and try again.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -52,7 +52,7 @@ public function execute()
             }
         }
         // display error message
-        $this->messageManager->addError(__('We can\'t find an email template to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find an email template to delete.'));
         // go to grid
         $this->_redirect('adminhtml/*/');
     }
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
index 240b688402b7e..998cf62a83abd 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
-class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
 {
     /**
      * Edit transactional email action
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
index 11b38ae8e503a..013f97b9ad318 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
-class Index extends \Magento\Email\Controller\Adminhtml\Email\Template
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
 {
     /**
      * Index action
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
index f5024943e833a..87f5470440db7 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
-class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
 {
     /**
      * New transactional email action
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
index e23cd6cf17eb2..404f97c937167 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
@@ -21,7 +21,9 @@ public function execute()
             $this->_view->renderLayout();
             $this->getResponse()->setHeader('Content-Security-Policy', "script-src 'none'");
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('An error occurred. The email template can not be opened for preview.'));
+            $this->messageManager->addErrorMessage(
+                __('An error occurred. The email template can not be opened for preview.')
+            );
             $this->_redirect('adminhtml/*/');
         }
     }
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
index cf31259b7885d..135506f4068a8 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php
@@ -22,7 +22,7 @@ public function execute()
 
         $template = $this->_initTemplate('id');
         if (!$template->getId() && $id) {
-            $this->messageManager->addError(__('This email template no longer exists.'));
+            $this->messageManager->addErrorMessage(__('This email template no longer exists.'));
             $this->_redirect('adminhtml/*/');
             return;
         }
@@ -55,7 +55,7 @@ public function execute()
 
             $template->save();
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData(false);
-            $this->messageManager->addSuccess(__('You saved the email template.'));
+            $this->messageManager->addSuccessMessage(__('You saved the email template.'));
             $this->_redirect('adminhtml/*');
         } catch (\Exception $e) {
             $this->_objectManager->get(
@@ -64,7 +64,7 @@ public function execute()
                 'email_template_form_data',
                 $request->getParams()
             );
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_forward('new');
         }
     }
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index e6a2f74a0d1a8..a6ecdaf24ebbb 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Email\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -530,14 +531,13 @@ protected function cancelDesignConfig()
      *
      * @param string $templateId
      * @return $this
-     * @throws \Magento\Framework\Exception\MailException
      */
     public function setForcedArea($templateId)
     {
-        if ($this->area) {
-            throw new \LogicException(__('Area is already set'));
+        if ($this->area === null) {
+            $this->area = $this->emailConfig->getTemplateArea($templateId);
         }
-        $this->area = $this->emailConfig->getTemplateArea($templateId);
+
         return $this;
     }
 
@@ -605,7 +605,9 @@ public function getDesignConfig()
     public function setDesignConfig(array $config)
     {
         if (!isset($config['area']) || !isset($config['store'])) {
-            throw new LocalizedException(__('Design config must have area and store.'));
+            throw new LocalizedException(
+                __('The design config needs an area and a store. Verify that both are set and try again.')
+            );
         }
         $this->getDesignConfig()->setData($config);
         return $this;
diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php
index bdd9054e7969b..9b45f509d97e5 100644
--- a/app/code/Magento/Email/Model/Template/Config.php
+++ b/app/code/Magento/Email/Model/Template/Config.php
@@ -205,8 +205,9 @@ public function getTemplateFilename($templateId, $designParams = [])
         $designParams['module'] = $module;
 
         $file = $this->_getInfo($templateId, 'file');
+        $filename = $this->getFilename($file, $designParams, $module);
 
-        return $this->viewFileSystem->getEmailTemplateFileName($file, $designParams, $module);
+        return $filename;
     }
 
     /**
@@ -230,4 +231,26 @@ protected function _getInfo($templateId, $fieldName)
         }
         return $data[$templateId][$fieldName];
     }
+
+    /**
+     * Retrieve template file path.
+     *
+     * @param string $file
+     * @param array $designParams
+     * @param string $module
+     *
+     * @return string
+     *
+     * @throws \UnexpectedValueException
+     */
+    private function getFilename(string $file, array $designParams, string $module): string
+    {
+        $filename = $this->viewFileSystem->getEmailTemplateFileName($file, $designParams, $module);
+
+        if ($filename === false) {
+            throw new \UnexpectedValueException("Template file '{$file}' is not found.");
+        }
+
+        return $filename;
+    }
 }
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 11a7416f79e7a..1d8218f90a0b2 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -516,7 +516,7 @@ public function viewDirective($construction)
      */
     public function mediaDirective($construction)
     {
-        $params = $this->getParameters($construction[2]);
+        $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
diff --git a/app/code/Magento/Email/Model/Transport.php b/app/code/Magento/Email/Model/Transport.php
index 5a4d64e6d6c0e..90a4e6571c9b6 100644
--- a/app/code/Magento/Email/Model/Transport.php
+++ b/app/code/Magento/Email/Model/Transport.php
@@ -31,6 +31,23 @@ class Transport implements TransportInterface
      */
     const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
 
+    /**
+     * Whether return path should be set or no.
+     *
+     * Possible values are:
+     * 0 - no
+     * 1 - yes (set value as FROM address)
+     * 2 - use custom value
+     *
+     * @var int
+     */
+    private $isSetReturnPath;
+
+    /**
+     * @var string|null
+     */
+    private $returnPathValue;
+
     /**
      * @var Sendmail
      */
@@ -51,25 +68,15 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         $parameters = null
     ) {
-        /* configuration of whether return path should be set or no. Possible values are:
-             * 0 - no
-             * 1 - yes (set value as FROM address)
-             * 2 - use custom value
-             * @see Magento\Config\Model\Config\Source\Yesnocustom
-             */
-        $isSetReturnPath = $scopeConfig->getValue(
+        $this->isSetReturnPath = (int) $scopeConfig->getValue(
             self::XML_PATH_SENDING_SET_RETURN_PATH,
             ScopeInterface::SCOPE_STORE
         );
-        $returnPathValue = $scopeConfig->getValue(
+        $this->returnPathValue = $scopeConfig->getValue(
             self::XML_PATH_SENDING_RETURN_PATH_EMAIL,
             ScopeInterface::SCOPE_STORE
         );
 
-        if ($isSetReturnPath == '2' && $returnPathValue !== null) {
-            $parameters .= ' -f' . \escapeshellarg($returnPathValue);
-        }
-
         $this->zendTransport = new Sendmail($parameters);
         $this->message = $message;
     }
@@ -80,9 +87,16 @@ public function __construct(
     public function sendMessage()
     {
         try {
-            $this->zendTransport->send(
-                Message::fromString($this->message->getRawMessage())
-            );
+            $zendMessage = Message::fromString($this->message->getRawMessage())->setEncoding('utf-8');
+            if (2 === $this->isSetReturnPath && $this->returnPathValue) {
+                $zendMessage->setSender($this->returnPathValue);
+            } elseif (1 === $this->isSetReturnPath && $zendMessage->getFrom()->count()) {
+                $fromAddressList = $zendMessage->getFrom();
+                $fromAddressList->rewind();
+                $zendMessage->setSender($fromAddressList->current()->getEmail());
+            }
+
+            $this->zendTransport->send($zendMessage);
         } catch (\Exception $e) {
             throw new MailException(new Phrase($e->getMessage()), $e);
         }
diff --git a/app/code/Magento/Email/Setup/InstallSchema.php b/app/code/Magento/Email/Setup/InstallSchema.php
deleted file mode 100644
index 1193df3f8597d..0000000000000
--- a/app/code/Magento/Email/Setup/InstallSchema.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Email\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        /**
-         * Create table 'email_template'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('email_template')
-        )->addColumn(
-            'template_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Template ID'
-        )->addColumn(
-            'template_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            150,
-            ['nullable' => false],
-            'Template Name'
-        )->addColumn(
-            'template_text',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => false],
-            'Template Content'
-        )->addColumn(
-            'template_styles',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Templste Styles'
-        )->addColumn(
-            'template_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Template Type'
-        )->addColumn(
-            'template_subject',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            200,
-            ['nullable' => false],
-            'Template Subject'
-        )->addColumn(
-            'template_sender_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            200,
-            [],
-            'Template Sender Name'
-        )->addColumn(
-            'template_sender_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            200,
-            [],
-            'Template Sender Email'
-        )->addColumn(
-            'added_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Date of Template Creation'
-        )->addColumn(
-            'modified_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Date of Template Modification'
-        )->addColumn(
-            'orig_template_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            200,
-            [],
-            'Original Template Code'
-        )->addColumn(
-            'orig_template_variables',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Original Template Variables'
-        )->addIndex(
-            $installer->getIdxName(
-                'email_template',
-                ['template_code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['template_code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('email_template', ['added_at']),
-            ['added_at']
-        )->addIndex(
-            $installer->getIdxName('email_template', ['modified_at']),
-            ['modified_at']
-        )->setComment(
-            'Email Templates'
-        );
-
-        $installer->getConnection()->createTable($table);
-    }
-}
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
new file mode 100644
index 0000000000000..d299acd28fc1c
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <!--Create New Template -->
+    <actionGroup name="CreateNewTemplate">
+        <!--Click "Add New Template" button-->
+        <click stepKey="clickAddNewTemplateButton" selector="{{EmailTemplatesSection.addNewTemplateButton}}"/>
+        <waitForPageLoad stepKey="waitForNewEmailTemplatesPageLoaded"/>
+        <!--Select value for "Template" drop-down menu in "Load default template" tab-->
+        <selectOption selector="{{EmailTemplatesSection.templateDropDown}}" stepKey="selectValueFromTemplateDropDown" userInput="Registry Update"/>
+
+        <!--Fill in required fields in "Template Information" tab and click "Save Template" button-->
+        <click stepKey="clickLoadTemplateButton" selector="{{EmailTemplatesSection.loadTemplateButton}}" after="selectValueFromTemplateDropDown"/>
+        <fillField stepKey="fillTemplateNameField" selector="{{EmailTemplatesSection.templateNameField}}" userInput="{{EmailTemplate.templateName}}" after="clickLoadTemplateButton"/>
+        <waitForLoadingMaskToDisappear stepKey="wait1"/>
+        <click stepKey="clickSaveTemplateButton" selector="{{EmailTemplatesSection.saveTemplateButton}}"/>
+        <waitForPageLoad stepKey="waitForNewTemplateCreated"/>
+    </actionGroup>
+
+    <!--Delete created Template-->
+    <actionGroup name="DeleteCreatedTemplate">
+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
+        <seeInCurrentUrl stepKey="seeCreatedTemplateUrl" url="email_template/edit/id"/>
+        <click stepKey="clickDeleteTemplateButton" selector="{{EmailTemplatesSection.deleteTemplateButton}}"/>
+        <acceptPopup stepKey="acceptDeletingTemplatePopUp"/>
+        <see stepKey="SeeSuccessfulMessage" userInput="You deleted the email template."/>
+        <click stepKey="clickResetFilterButton" selector="{{EmailTemplatesSection.resetFilterButton}}"/>
+        <waitForElementNotVisible selector="{{MarketingEmailTemplateSection.clearSearchTemplate(EmailTemplate.templateName)}}" stepKey="waitForSearchFieldCleared"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
new file mode 100644
index 0000000000000..04e597244833a
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EmailTemplate" type="template">
+        <data key="templateName" unique="suffix">Template</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE.txt b/app/code/Magento/Email/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE.txt
rename to app/code/Magento/Email/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE_AFL.txt b/app/code/Magento/Email/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE_AFL.txt
rename to app/code/Magento/Email/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml b/app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml
new file mode 100644
index 0000000000000..9636986dda8fa
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
+    <page name="AdminEmailTemplatePage" url="/admin/email_template/" area="admin" module="Email">
+        <section name="AdminEmailTemplatePageActionSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Email/Test/Mftf/README.md b/app/code/Magento/Email/Test/Mftf/README.md
new file mode 100644
index 0000000000000..217c24a18afd4
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Email Functional Tests
+
+The Functional Test Module for **Magento Email** module.
diff --git a/app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml b/app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml
new file mode 100644
index 0000000000000..4e877bd24239e
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+
+    <section name="MarketingEmailTemplateSection">
+        <element name="searchTemplateField" type="input" selector="#systemEmailTemplateGrid_filter_code"/>
+        <element name="searchButton" type="button" selector="//*[@title='Search' and @class='action-default scalable action-secondary']"/>
+        <element name="createdTemplate" type="button" selector="//*[normalize-space() ='{{arg}}']" parameterized="true"/>
+        <element name="clearSearchTemplate" type="input" selector="//*[@id='systemEmailTemplateGrid_filter_code' and @value='{{arg2}}']" parameterized="true"/>
+    </section>
+
+    <section name="EmailTemplatesSection">
+        <element name="addNewTemplateButton" type="button" selector="#add"/>
+        <element name="templateDropDown" type="select" selector="#template_select"/>
+        <element name="loadTemplateButton" type="button" selector="#load"/>
+        <element name="templateNameField" type="input" selector="#template_code"/>
+        <element name="saveTemplateButton" type="button" selector="#save"/>
+        <element name="previewTemplateButton" type="button" selector="#preview"/>
+        <element name="deleteTemplateButton" type="button" selector="#delete"/>
+        <element name="resetFilterButton" type="button" selector="//span[contains(text(),'Reset Filter')]"/>
+    </section>
+
+</sections>
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
index 6adabaccb33ea..05e4986a79382 100644
--- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
@@ -60,7 +60,7 @@ protected function setUp()
             ['getFilesystem', '__wakeup', 'getPath', 'getDirectoryRead']
         );
 
-        $viewFilesystem = $this->getMockBuilder(\Magento\Framework\View\Filesystem::class)
+        $viewFilesystem = $this->getMockBuilder(\Magento\Framework\View\FileSystem::class)
             ->setMethods(['getTemplateFileName'])
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
index 46f3fecfb8848..0a0e9f780351d 100644
--- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
@@ -117,10 +117,11 @@ protected function setUp()
     /**
      * Return the model under test with additional methods mocked.
      *
-     * @param $mockedMethods array
+     * @param array $mockedMethods
+     * @param array $data
      * @return \Magento\Email\Model\Template|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getModelMock(array $mockedMethods = [])
+    protected function getModelMock(array $mockedMethods = [], array $data = [])
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         return $this->getMockForAbstractClass(
@@ -136,7 +137,8 @@ protected function getModelMock(array $mockedMethods = [])
                     'scopeConfig' => $this->scopeConfig,
                     'emailConfig' => $this->emailConfig,
                     'filterFactory' => $this->filterFactory,
-                    'templateFactory' => $this->templateFactory
+                    'templateFactory' => $this->templateFactory,
+                    'data' => $data,
                 ]
             ),
             '',
@@ -376,6 +378,9 @@ public function testSetDesignConfigWithValidInputParametersReturnsSuccess()
         $this->assertEquals($config, $model->getDesignConfig()->getData());
     }
 
+    /**
+     * @return array
+     */
     public function invalidInputParametersDataProvider()
     {
         return [[[]], [['area' => 'some_area']], [['store' => 'any_store']]];
@@ -431,4 +436,33 @@ public function testGetDesignConfig()
         $expectedConfig = ['area' => 'test_area', 'store' => 2];
         $this->assertEquals($expectedConfig, $model->getDesignConfig()->getData());
     }
+
+    /**
+     * @return void
+     */
+    public function testSetForcedAreaWhenAreaIsNotSet(): void
+    {
+        $templateId = 'test_template';
+        $model = $this->getModelMock([], ['area' => null]);
+
+        $this->emailConfig->expects($this->once())
+            ->method('getTemplateArea')
+            ->with($templateId);
+
+        $model->setForcedArea($templateId);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSetForcedAreaWhenAreaIsSet(): void
+    {
+        $templateId = 'test_template';
+        $model = $this->getModelMock([], ['area' => 'frontend']);
+
+        $this->emailConfig->expects($this->never())
+            ->method('getTemplateArea');
+
+        $model->setForcedArea($templateId);
+    }
 }
diff --git a/app/code/Magento/Email/Test/Unit/Model/Plugin/WindowsSmtpConfigTest.php b/app/code/Magento/Email/Test/Unit/Model/Plugin/WindowsSmtpConfigTest.php
new file mode 100644
index 0000000000000..5f7c44b988c66
--- /dev/null
+++ b/app/code/Magento/Email/Test/Unit/Model/Plugin/WindowsSmtpConfigTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Email\Test\Unit\Model\Plugin;
+
+use Magento\Email\Model\Plugin\WindowsSmtpConfig;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Mail\TransportInterface;
+use Magento\Framework\OsInfo;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ *  WindowsSmtpConfigTest
+ */
+class WindowsSmtpConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var WindowsSmtpConfig
+     */
+    private $windowsSmtpConfig;
+
+    /**
+     * @var OsInfo|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $osInfoMock;
+
+    /**
+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var TransportInterface
+     */
+    private $transportMock;
+
+    /**
+     * setUp
+     *
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->osInfoMock = $this->createMock(OsInfo::class);
+        $this->configMock = $this->createMock(ReinitableConfigInterface::class);
+        $this->transportMock = $this->createMock(TransportInterface::class);
+
+        $this->windowsSmtpConfig = $objectManager->getObject(
+            WindowsSmtpConfig::class,
+            [
+                'config' => $this->configMock,
+                'osInfo' => $this->osInfoMock
+            ]
+        );
+    }
+
+    /**
+     * Test if SMTP settings if windows server
+     *
+     * @return void
+     */
+    public function testBeforeSendMessageOsWindows(): void
+    {
+        $this->osInfoMock->expects($this->once())
+            ->method('isWindows')
+            ->willReturn(true);
+
+        $this->configMock->expects($this->exactly(2))
+            ->method('getValue')
+            ->willReturnMap([
+                [WindowsSmtpConfig::XML_SMTP_HOST, '127.0.0.1'],
+                [WindowsSmtpConfig::XML_SMTP_PORT, '80']
+            ]);
+
+        $this->windowsSmtpConfig->beforeSendMessage($this->transportMock);
+    }
+
+    /**
+     * Test if SMTP settings if not windows server
+     *
+     * @return void
+     */
+    public function testBeforeSendMessageOsIsWindows(): void
+    {
+        $this->osInfoMock->expects($this->once())
+            ->method('isWindows')
+            ->willReturn(false);
+
+        $this->configMock->expects($this->never())
+            ->method('getValue');
+
+        $this->windowsSmtpConfig->beforeSendMessage($this->transportMock);
+    }
+}
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php
index 38429328b4432..c5165cc16793c 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php
@@ -93,10 +93,8 @@ public function testIteratorNegative()
     {
         $filePath = $this->filePaths[0];
 
-        $this->expectException(
-            'UnexpectedValueException',
-            sprintf("Unable to determine a module, file '%s' belongs to.", $filePath)
-        );
+        $this->expectException('UnexpectedValueException');
+        $this->expectExceptionMessage(sprintf("Unable to determine a module, file '%s' belongs to.", $filePath));
 
         $this->moduleDirResolverMock->expects($this->at(0))
             ->method('getModuleName')
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
index bb7ac6934106a..9851649c05e0c 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
@@ -27,6 +27,9 @@ public function testMergedXml($fixtureXml, array $expectedErrors)
         $this->_testXmlAgainstXsd($fixtureXml, $schemaFile, $expectedErrors);
     }
 
+    /**
+     * @return array
+     */
     public function mergedXmlDataProvider()
     {
         // @codingStandardsIgnoreStart
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php
index 6ec3905fe4633..b0e181c4ac54c 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php
@@ -190,6 +190,9 @@ public function testParseTemplateIdParts($input, $expectedOutput)
         $this->assertEquals($this->model->parseTemplateIdParts($input), $expectedOutput);
     }
 
+    /**
+     * @return array
+     */
     public function parseTemplateCodePartsDataProvider()
     {
         return [
@@ -272,6 +275,20 @@ public function testGetTemplateFilenameWithNoParams()
         $this->assertEquals('_files/Fixture/ModuleOne/view/frontend/email/one.html', $actualResult);
     }
 
+    /**
+     * @expectedException \UnexpectedValueException
+     * @expectedExceptionMessage Template file 'one.html' is not found
+     * @return void
+     */
+    public function testGetTemplateFilenameWrongFileName(): void
+    {
+        $this->viewFileSystem->expects($this->once())->method('getEmailTemplateFileName')
+            ->with('one.html', $this->designParams, 'Fixture_ModuleOne')
+            ->willReturn(false);
+
+        $this->model->getTemplateFilename('template_one', $this->designParams);
+    }
+
     /**
      * @param string $getterMethod
      * @param $argument
@@ -288,6 +305,9 @@ public function testGetterMethodUnknownTemplate($getterMethod, $argument = null)
         }
     }
 
+    /**
+     * @return array
+     */
     public function getterMethodUnknownTemplateDataProvider()
     {
         return [
@@ -311,7 +331,8 @@ public function testGetterMethodUnknownField(
         array $fixtureFields = [],
         $argument = null
     ) {
-        $this->expectException('UnexpectedValueException', $expectedException);
+        $this->expectException('UnexpectedValueException');
+        $this->expectExceptionMessage($expectedException);
         $dataStorage = $this->createPartialMock(\Magento\Email\Model\Template\Config\Data::class, ['get']);
         $dataStorage->expects(
             $this->atLeastOnce()
@@ -334,6 +355,9 @@ public function testGetterMethodUnknownField(
         }
     }
 
+    /**
+     * @return array
+     */
     public function getterMethodUnknownFieldDataProvider()
     {
         return [
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/SenderResolverTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/SenderResolverTest.php
new file mode 100644
index 0000000000000..fb25290f9d27b
--- /dev/null
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/SenderResolverTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Email\Test\Unit\Model\Template;
+
+use Magento\Email\Model\Template\SenderResolver;
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ *  SenderResolverTest
+ */
+class SenderResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SenderResolver
+     */
+    private $senderResolver;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+
+        $this->senderResolver = $objectManager->getObject(
+            SenderResolver::class,
+            [
+                'scopeConfig' => $this->scopeConfig
+            ]
+        );
+    }
+
+    /**
+     * Test returned information for given sender's name and email
+     *
+     * @return void
+     */
+    public function testResolve(): void
+    {
+        $sender = 'general';
+        $scopeId = null;
+
+        $this->scopeConfig->expects($this->exactly(2))
+            ->method('getValue')
+            ->willReturnMap([
+               [
+                   'trans_email/ident_' . $sender . '/name',
+                   \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                   $scopeId,
+                   'Test Name'
+               ],
+               [
+                   'trans_email/ident_' . $sender . '/email',
+                   \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                   $scopeId,
+                   'test@email.com'
+               ]
+            ]);
+
+        $result = $this->senderResolver->resolve($sender);
+
+        $this->assertTrue(isset($result['name']));
+        $this->assertEquals('Test Name', $result['name']);
+
+        $this->assertTrue(isset($result['email']));
+        $this->assertEquals('test@email.com', $result['email']);
+    }
+
+    /**
+     * Test if exception is thrown in case there is no name or email in result
+     *
+     * @dataProvider dataProvidedSenderArray
+     * @param array $sender
+     *
+     * @return void
+     */
+    public function testResolveThrowException(array $sender): void
+    {
+        $this->expectExceptionMessage('Invalid sender data');
+        $this->expectException(MailException::class);
+        $this->senderResolver->resolve($sender);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProvidedSenderArray()
+    {
+        return [
+            [
+                ['name' => 'Name']
+            ],
+            [
+                ['email' => 'test@email.com']
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
index 7b22798eac49b..5464ca51cbe35 100644
--- a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
@@ -299,6 +299,9 @@ public function testLoadDefault(
         $this->assertEquals($expectedTemplateStyles, $model->getTemplateStyles());
     }
 
+    /**
+     * @return array
+     */
     public function loadDefaultDataProvider()
     {
         return [
@@ -454,6 +457,9 @@ public function testIsValidForSend($senderName, $senderEmail, $templateSubject,
         $this->assertEquals($expectedValue, $model->isValidForSend());
     }
 
+    /**
+     * @return array
+     */
     public function isValidForSendDataProvider()
     {
         return [
@@ -549,6 +555,9 @@ public function testGetVariablesOptionArray($withGroup, $templateVariables, $exp
         $this->assertEquals($expectedResult, $model->getVariablesOptionArray($withGroup));
     }
 
+    /**
+     * @return array
+     */
     public function getVariablesOptionArrayDataProvider()
     {
         return [
@@ -649,6 +658,9 @@ public function testProcessTemplate($templateId, $expectedResult)
         $this->assertTrue($model->getUseAbsoluteLinks());
     }
 
+    /**
+     * @return array
+     */
     public function processTemplateVariable()
     {
         return [
@@ -745,6 +757,9 @@ public function testGetType($templateType, $expectedResult)
         $this->assertEquals($expectedResult, $model->getType());
     }
 
+    /**
+     * @return array
+     */
     public function getTypeDataProvider()
     {
         return [['text', 1], ['html', 2]];
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index ad03fd37bcd76..1011b16f8537d 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -5,20 +5,19 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-variable": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-variable": "*"
     },
     "suggest": {
-        "magento/module-theme": "100.3.*"
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Email/etc/db_schema.xml b/app/code/Magento/Email/etc/db_schema.xml
new file mode 100644
index 0000000000000..dbb8855e9e57e
--- /dev/null
+++ b/app/code/Magento/Email/etc/db_schema.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="email_template" resource="default" engine="innodb" comment="Email Templates">
+        <column xsi:type="int" name="template_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Template ID"/>
+        <column xsi:type="varchar" name="template_code" nullable="false" length="150" comment="Template Name"/>
+        <column xsi:type="text" name="template_text" nullable="false" comment="Template Content"/>
+        <column xsi:type="text" name="template_styles" nullable="true" comment="Templste Styles"/>
+        <column xsi:type="int" name="template_type" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Template Type"/>
+        <column xsi:type="varchar" name="template_subject" nullable="false" length="200" comment="Template Subject"/>
+        <column xsi:type="varchar" name="template_sender_name" nullable="true" length="200"
+                comment="Template Sender Name"/>
+        <column xsi:type="varchar" name="template_sender_email" nullable="true" length="200"
+                comment="Template Sender Email"/>
+        <column xsi:type="timestamp" name="added_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Date of Template Creation"/>
+        <column xsi:type="timestamp" name="modified_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Date of Template Modification"/>
+        <column xsi:type="varchar" name="orig_template_code" nullable="true" length="200"
+                comment="Original Template Code"/>
+        <column xsi:type="text" name="orig_template_variables" nullable="true" comment="Original Template Variables"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="template_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="EMAIL_TEMPLATE_TEMPLATE_CODE">
+            <column name="template_code"/>
+        </constraint>
+        <index referenceId="EMAIL_TEMPLATE_ADDED_AT" indexType="btree">
+            <column name="added_at"/>
+        </index>
+        <index referenceId="EMAIL_TEMPLATE_MODIFIED_AT" indexType="btree">
+            <column name="modified_at"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Email/etc/db_schema_whitelist.json b/app/code/Magento/Email/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..471a51771b854
--- /dev/null
+++ b/app/code/Magento/Email/etc/db_schema_whitelist.json
@@ -0,0 +1,26 @@
+{
+    "email_template": {
+        "column": {
+            "template_id": true,
+            "template_code": true,
+            "template_text": true,
+            "template_styles": true,
+            "template_type": true,
+            "template_subject": true,
+            "template_sender_name": true,
+            "template_sender_email": true,
+            "added_at": true,
+            "modified_at": true,
+            "orig_template_code": true,
+            "orig_template_variables": true
+        },
+        "index": {
+            "EMAIL_TEMPLATE_ADDED_AT": true,
+            "EMAIL_TEMPLATE_MODIFIED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EMAIL_TEMPLATE_TEMPLATE_CODE": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Email/etc/module.xml b/app/code/Magento/Email/etc/module.xml
index e3e0632c641e0..60c11ad2f0d2b 100644
--- a/app/code/Magento/Email/etc/module.xml
+++ b/app/code/Magento/Email/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Email" setup_version="2.0.0">
+    <module name="Magento_Email" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Cms"/>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
index 630034650b6db..05a873f8ddd5a 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -61,7 +61,7 @@ use Magento\Framework\App\TemplateTypesInterface;
 <script>
 require([
     "jquery",
-    "tinymceDeprecated",
+    "wysiwygAdapter",
     "Magento_Ui/js/modal/alert",
     "mage/mage",
     "Magento_Email/js/variables",
@@ -150,10 +150,10 @@ require([
             } else {
                 $('preview_type').value = <?= (int) $block->getTemplateType() ?>;
             }
-            if (typeof tinyMCE == 'undefined' || !tinyMCE.getInstanceById('template_text')) {
+            if (typeof tinyMCE == 'undefined' || !tinyMCE.get('template_text')) {
                 $('preview_text').value = $('template_text').value;
             } else {
-                $('preview_text').value = tinyMCE.getInstanceById('template_text').getHTML();
+                $('preview_text').value = tinyMCE.get('template_text').getHTML();
             }
 
             if ($('template_styles') != undefined) {
diff --git a/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml
index b63f79233383a..91c38c92dc754 100644
--- a/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml
@@ -15,12 +15,12 @@
             </settings>
             <field name="email_logo" formElement="fileUploader">
                 <settings>
-                    <notice translate="true">Allowed file types: jpg, jpeg, gif, png. To optimize logo for high-resolution displays, upload an image that is 3x normal size and then specify 1x dimensions in the width/height fields below.</notice>
+                    <notice translate="true">To optimize logo for high-resolution displays, upload an image that is 3x normal size and then specify 1x dimensions in the width/height fields below.</notice>
                     <label translate="true">Logo Image</label>
-                    <componentType>fileUploader</componentType>
+                    <componentType>imageUploader</componentType>
                 </settings>
                 <formElements>
-                    <fileUploader>
+                    <imageUploader>
                         <settings>
                             <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                             <maxFileSize>2097152</maxFileSize>
@@ -28,7 +28,7 @@
                                 <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                             </uploaderConfig>
                         </settings>
-                    </fileUploader>
+                    </imageUploader>
                 </formElements>
             </field>
             <field name="email_logo_alt" formElement="input">
diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html
index a6895f629b641..c4f49698dc69b 100644
--- a/app/code/Magento/Email/view/frontend/email/header.html
+++ b/app/code/Magento/Email/view/frontend/email/header.html
@@ -43,8 +43,6 @@
 
                                 {{if logo_height}}
                                     height="{{var logo_height}}"
-                                {{else}}
-                                    height="52"
                                 {{/if}}
 
                                 src="{{var logo_url}}"
diff --git a/app/code/Magento/Email/view/frontend/web/logo_email.png b/app/code/Magento/Email/view/frontend/web/logo_email.png
index d01b530456e81..215e9d06edcdc 100644
Binary files a/app/code/Magento/Email/view/frontend/web/logo_email.png and b/app/code/Magento/Email/view/frontend/web/logo_email.png differ
diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
index 8e42e0c1313c4..86fc0082f7a5a 100644
--- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
+++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php
@@ -6,10 +6,12 @@
  */
 namespace Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
 /**
  * Key Index action
  */
-class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key
+class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key implements HttpGetActionInterface
 {
     /**
      * Render main page with form
diff --git a/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php b/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
new file mode 100644
index 0000000000000..9331b68675b67
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatch.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\EncryptionKey\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Migrate encrypted configuration values to the latest cipher
+ */
+class SodiumChachaPatch implements DataPatchInterface
+{
+    /**
+     * @var \Magento\Framework\Config\ScopeInterface
+     */
+    private $scope;
+
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Config\Model\Config\Structure
+     */
+    private $structure;
+
+    /**
+     * @var \Magento\Framework\Encryption\EncryptorInterface
+     */
+    private $encryptor;
+
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $state;
+
+    /**
+     * SodiumChachaPatch constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Config\Model\Config\Structure\Proxy $structure
+     * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
+     * @param \Magento\Framework\App\State $state
+     * @param \Magento\Framework\Config\ScopeInterface|null $scope
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Config\Model\Config\Structure\Proxy $structure,
+        \Magento\Framework\Encryption\EncryptorInterface $encryptor,
+        \Magento\Framework\App\State $state,
+        \Magento\Framework\Config\ScopeInterface $scope = null
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->structure = $structure;
+        $this->encryptor = $encryptor;
+        $this->state = $state;
+        $this->scope = $scope ?? ObjectManager::getInstance()->get(\Magento\Framework\Config\ScopeInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+
+        $this->reEncryptSystemConfigurationValues();
+
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Re encrypt sensitive data in the system configuration
+     */
+    private function reEncryptSystemConfigurationValues()
+    {
+        $table = $this->moduleDataSetup->getTable('core_config_data');
+        $hasEncryptedData = $this->moduleDataSetup->getConnection()->fetchOne(
+            $this->moduleDataSetup->getConnection()
+                ->select()
+                ->from($table, [new \Zend_Db_Expr('count(value)')])
+                ->where('value LIKE ?', '0:2%')
+        );
+        if ($hasEncryptedData !== '0') {
+            $currentScope = $this->scope->getCurrentScope();
+            $structure = $this->structure;
+            $paths = $this->state->emulateAreaCode(
+                \Magento\Framework\App\Area::AREA_ADMINHTML,
+                function () use ($structure) {
+                    $this->scope->setCurrentScope(\Magento\Framework\App\Area::AREA_ADMINHTML);
+                    /** Returns list of structure paths to be re encrypted */
+                    $paths = $structure->getFieldPathsByAttribute(
+                        'backend_model',
+                        \Magento\Config\Model\Config\Backend\Encrypted::class
+                    );
+                    /** Returns list of mapping between configPath => [structurePaths] */
+                    $mappedPaths = $structure->getFieldPaths();
+                    foreach ($mappedPaths as $mappedPath => $data) {
+                        foreach ($data as $structurePath) {
+                            if ($structurePath !== $mappedPath && $key = array_search($structurePath, $paths)) {
+                                $paths[$key] = $mappedPath;
+                            }
+                        }
+                    }
+
+                    return array_unique($paths);
+                }
+            );
+            $this->scope->setCurrentScope($currentScope);
+            // walk through found data and re-encrypt it
+            if ($paths) {
+                $values = $this->moduleDataSetup->getConnection()->fetchPairs(
+                    $this->moduleDataSetup->getConnection()
+                        ->select()
+                        ->from($table, ['config_id', 'value'])
+                        ->where('path IN (?)', $paths)
+                        ->where('value NOT LIKE ?', '')
+                );
+                foreach ($values as $configId => $value) {
+                    $this->moduleDataSetup->getConnection()->update(
+                        $table,
+                        ['value' => $this->encryptor->encrypt($this->encryptor->decrypt($value))],
+                        ['config_id = ?' => (int)$configId]
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE.txt b/app/code/Magento/EncryptionKey/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE.txt
rename to app/code/Magento/EncryptionKey/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE_AFL.txt b/app/code/Magento/EncryptionKey/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE_AFL.txt
rename to app/code/Magento/EncryptionKey/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/README.md b/app/code/Magento/EncryptionKey/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ba2ec0103b0b3
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Encryption Key Functional Tests
+
+The Functional Test Module for **Magento Encryption Key** module.
diff --git a/app/code/Magento/EncryptionKey/Test/Unit/Model/ResourceModel/Key/ChangeTest.php b/app/code/Magento/EncryptionKey/Test/Unit/Model/ResourceModel/Key/ChangeTest.php
index 35af094b0e15c..60dc9c7228cbe 100644
--- a/app/code/Magento/EncryptionKey/Test/Unit/Model/ResourceModel/Key/ChangeTest.php
+++ b/app/code/Magento/EncryptionKey/Test/Unit/Model/ResourceModel/Key/ChangeTest.php
@@ -35,7 +35,7 @@ class ChangeTest extends \PHPUnit\Framework\TestCase
     protected $selectMock;
 
     /** @var \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface */
-    protected $tansactionMock;
+    protected $transactionMock;
 
     /** @var |\PHPUnit_Framework_MockObject_MockObject */
     protected $objRelationMock;
@@ -77,7 +77,7 @@ protected function setUp()
             ->setMethods(['from', 'where', 'update'])
             ->getMock();
         $translationClassName = \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface::class;
-        $this->tansactionMock = $this->getMockBuilder($translationClassName)
+        $this->transactionMock = $this->getMockBuilder($translationClassName)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
@@ -99,7 +99,7 @@ protected function setUp()
                 'writer' => $this->writerMock,
                 'adapterInterface' => $this->adapterMock,
                 'resource' => $this->resourceMock,
-                'transactionManager' => $this->tansactionMock,
+                'transactionManager' => $this->transactionMock,
                 'relationProcessor' => $this->objRelationMock,
                 'random' => $this->randomMock
             ]
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 0f69af3cc1de9..4a140c4b1315e 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -5,15 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-config": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/EncryptionKey/etc/module.xml b/app/code/Magento/EncryptionKey/etc/module.xml
index 48ab3e51ba03d..1a70ce0ddfb72 100644
--- a/app/code/Magento/EncryptionKey/etc/module.xml
+++ b/app/code/Magento/EncryptionKey/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_EncryptionKey" setup_version="2.0.0">
+    <module name="Magento_EncryptionKey" >
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_User"/>
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index 6726175c9118e..955345851e67a 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -7,8 +7,10 @@
 namespace Magento\Fedex\Model;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 use Magento\Framework\Module\Dir;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Webapi\Soap\ClientFactory;
 use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
@@ -17,7 +19,6 @@
 /**
  * Fedex shipping implementation
  *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -143,6 +144,11 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      */
     private $serializer;
 
+    /**
+     * @var ClientFactory
+     */
+    private $soapClientFactory;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -164,7 +170,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
      * @param array $data
      * @param Json|null $serializer
-     *
+     * @param ClientFactory|null $soapClientFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -187,7 +193,8 @@ public function __construct(
         \Magento\Framework\Module\Dir\Reader $configReader,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         array $data = [],
-        Json $serializer = null
+        Json $serializer = null,
+        ClientFactory $soapClientFactory = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_productCollectionFactory = $productCollectionFactory;
@@ -214,6 +221,7 @@ public function __construct(
         $this->_rateServiceWsdl = $wsdlBasePath . 'RateService_v10.wsdl';
         $this->_trackServiceWsdl = $wsdlBasePath . 'TrackService_v' . self::$trackServiceVersion . '.wsdl';
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->soapClientFactory = $soapClientFactory ?: ObjectManager::getInstance()->get(ClientFactory::class);
     }
 
     /**
@@ -225,7 +233,7 @@ public function __construct(
      */
     protected function _createSoapClient($wsdl, $trace = false)
     {
-        $client = new \SoapClient($wsdl, ['trace' => $trace]);
+        $client = $this->soapClientFactory->create($wsdl, ['trace' => $trace]);
         $client->__setLocation(
             $this->getConfigFlag(
                 'sandbox_mode'
@@ -716,7 +724,7 @@ protected function _getXmlQuotes()
 
         $responseBody = $this->_getCachedQuotes($request);
         if ($responseBody === null) {
-            $debugData = ['request' => $request];
+            $debugData = ['request' => $this->filterDebugData($request)];
             try {
                 $url = $this->getConfigData('gateway_url');
                 if (!$url) {
@@ -731,7 +739,7 @@ protected function _getXmlQuotes()
                 $responseBody = curl_exec($ch);
                 curl_close($ch);
 
-                $debugData['result'] = $responseBody;
+                $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
             } catch (\Exception $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
@@ -978,6 +986,7 @@ public function getCode($type, $code = '')
      * Return FeDex currency ISO code by Magento Base Currency Code
      *
      * @return string 3-digit currency code
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getCurrencyCode()
     {
@@ -1000,7 +1009,7 @@ public function getCurrencyCode()
         ];
         $currencyCode = $this->_storeManager->getStore()->getBaseCurrencyCode();
 
-        return isset($codes[$currencyCode]) ? $codes[$currencyCode] : $currencyCode;
+        return $codes[$currencyCode] ?? $currencyCode;
     }
 
     /**
@@ -1071,7 +1080,7 @@ protected function _getXMLTracking($tracking)
         ];
         $requestString = $this->serializer->serialize($trackRequest);
         $response = $this->_getCachedQuotes($requestString);
-        $debugData = ['request' => $trackRequest];
+        $debugData = ['request' => $this->filterDebugData($trackRequest)];
         if ($response === null) {
             try {
                 $client = $this->_createTrackSoapClient();
@@ -1263,7 +1272,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
             $countriesOfManufacture[] = $product->getCountryOfManufacture();
         }
 
-        $paymentType = $request->getIsReturn() ? 'RECIPIENT' : 'SENDER';
+        $paymentType = $this->getPaymentType($request);
         $optionType = $request->getShippingMethod() == self::RATE_REQUEST_SMARTPOST
             ? 'SERVICE_DEFAULT' : $packageParams->getDeliveryConfirmation();
         $requestClient = [
@@ -1398,6 +1407,7 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
         $result = new \Magento\Framework\DataObject();
         $client = $this->_createShipSoapClient();
         $requestClient = $this->_formShipmentRequest($request);
+        $debugData['request'] = $this->filterDebugData($requestClient);
         $response = $client->processShipment($requestClient);
 
         if ($response->HighestSeverity != 'FAILURE' && $response->HighestSeverity != 'ERROR') {
@@ -1407,13 +1417,10 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
             );
             $result->setShippingLabelContent($shippingLabelContent);
             $result->setTrackingNumber($trackingNumber);
-            $debugData = ['request' => $client->__getLastRequest(), 'result' => $client->__getLastResponse()];
+            $debugData['result'] = $client->__getLastResponse();
             $this->_debug($debugData);
         } else {
-            $debugData = [
-                'request' => $client->__getLastRequest(),
-                'result' => ['error' => '', 'code' => '', 'xml' => $client->__getLastResponse()],
-            ];
+            $debugData['result'] = ['error' => '', 'code' => '', 'xml' => $client->__getLastResponse()];
             if (is_array($response->Notifications)) {
                 foreach ($response->Notifications as $notification) {
                     $debugData['result']['code'] .= $notification->Code . '; ';
@@ -1432,6 +1439,8 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     }
 
     /**
+     * Return Tracking Number
+     *
      * @param array|object $trackingIds
      * @return string
      */
@@ -1446,10 +1455,10 @@ function ($val) {
     }
 
     /**
-     * For multi package shipments. Delete requested shipments if the current shipment
-     * request is failed
+     * For multi package shipments. Delete requested shipments if the current shipment request is failed
      *
      * @param array $data
+     *
      * @return bool
      */
     public function rollBack($data)
@@ -1469,6 +1478,7 @@ public function rollBack($data)
      * Return container types of carrier
      *
      * @param \Magento\Framework\DataObject|null $params
+     *
      * @return array|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -1536,6 +1546,7 @@ public function getContainerTypesFilter()
      * Return delivery confirmation types of carrier
      *
      * @param \Magento\Framework\DataObject|null $params
+     *
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -1546,6 +1557,7 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
 
     /**
      * Recursive replace sensitive fields in debug data by the mask
+     *
      * @param string $data
      * @return string
      */
@@ -1563,6 +1575,7 @@ protected function filterDebugData($data)
 
     /**
      * Parse track details response from Fedex
+     *
      * @param \stdClass $trackInfo
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -1633,6 +1646,7 @@ private function processTrackingDetails(\stdClass $trackInfo)
 
     /**
      * Parse delivery datetime from tracking details
+     *
      * @param \stdClass $trackInfo
      * @return \Datetime|null
      */
@@ -1649,8 +1663,7 @@ private function getDeliveryDateTime(\stdClass $trackInfo)
     }
 
     /**
-     * Get delivery address details in string representation
-     * Return City, State, Country Code
+     * Get delivery address details in string representation Return City, State, Country Code
      *
      * @param \stdClass $address
      * @return \Magento\Framework\Phrase|string
@@ -1712,6 +1725,7 @@ private function processTrackDetailsEvents(array $events)
 
     /**
      * Append error message to rate result instance
+     *
      * @param string $trackingValue
      * @param string $errorMessage
      */
@@ -1751,4 +1765,17 @@ private function parseDate($timestamp)
 
         return false;
     }
+
+    /**
+     * Defines payment type by request. Two values are available: RECIPIENT or SENDER.
+     *
+     * @param DataObject $request
+     * @return string
+     */
+    private function getPaymentType(DataObject $request): string
+    {
+        return $request->getIsReturn() && $request->getShippingMethod() !== self::RATE_REQUEST_SMARTPOST
+            ? 'RECIPIENT'
+            : 'SENDER';
+    }
 }
diff --git a/app/code/Magento/Fedex/Setup/InstallData.php b/app/code/Magento/Fedex/Setup/InstallData.php
deleted file mode 100644
index 1591aaa3abf70..0000000000000
--- a/app/code/Magento/Fedex/Setup/InstallData.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Fedex\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * Class InstallData
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $codes = [
-            'method' => [
-                'EUROPEFIRSTINTERNATIONALPRIORITY' => 'EUROPE_FIRST_INTERNATIONAL_PRIORITY',
-                'FEDEX1DAYFREIGHT' => 'FEDEX_1_DAY_FREIGHT',
-                'FEDEX2DAYFREIGHT' => 'FEDEX_2_DAY_FREIGHT',
-                'FEDEX2DAY' => 'FEDEX_2_DAY',
-                'FEDEX3DAYFREIGHT' => 'FEDEX_3_DAY_FREIGHT',
-                'FEDEXEXPRESSSAVER' => 'FEDEX_EXPRESS_SAVER',
-                'FEDEXGROUND' => 'FEDEX_GROUND',
-                'FIRSTOVERNIGHT' => 'FIRST_OVERNIGHT',
-                'GROUNDHOMEDELIVERY' => 'GROUND_HOME_DELIVERY',
-                'INTERNATIONALECONOMY' => 'INTERNATIONAL_ECONOMY',
-                'INTERNATIONALECONOMY FREIGHT' => 'INTERNATIONAL_ECONOMY_FREIGHT',
-                'INTERNATIONALFIRST' => 'INTERNATIONAL_FIRST',
-                'INTERNATIONALGROUND' => 'INTERNATIONAL_GROUND',
-                'INTERNATIONALPRIORITY' => 'INTERNATIONAL_PRIORITY',
-                'INTERNATIONALPRIORITY FREIGHT' => 'INTERNATIONAL_PRIORITY_FREIGHT',
-                'PRIORITYOVERNIGHT' => 'PRIORITY_OVERNIGHT',
-                'SMARTPOST' => 'SMART_POST',
-                'STANDARDOVERNIGHT' => 'STANDARD_OVERNIGHT',
-                'FEDEXFREIGHT' => 'FEDEX_FREIGHT',
-                'FEDEXNATIONALFREIGHT' => 'FEDEX_NATIONAL_FREIGHT',
-            ],
-            'dropoff' => [
-                'REGULARPICKUP' => 'REGULAR_PICKUP',
-                'REQUESTCOURIER' => 'REQUEST_COURIER',
-                'DROPBOX' => 'DROP_BOX',
-                'BUSINESSSERVICECENTER' => 'BUSINESS_SERVICE_CENTER',
-                'STATION' => 'STATION',
-            ],
-            'packaging' => [
-                'FEDEXENVELOPE' => 'FEDEX_ENVELOPE',
-                'FEDEXPAK' => 'FEDEX_PAK',
-                'FEDEXBOX' => 'FEDEX_BOX',
-                'FEDEXTUBE' => 'FEDEX_TUBE',
-                'FEDEX10KGBOX' => 'FEDEX_10KG_BOX',
-                'FEDEX25KGBOX' => 'FEDEX_25KG_BOX',
-                'YOURPACKAGING' => 'YOUR_PACKAGING',
-            ],
-        ];
-
-        $installer = $setup;
-        $configDataTable = $installer->getTable('core_config_data');
-        $conn = $installer->getConnection();
-
-        $select = $conn->select()->from(
-            $configDataTable
-        )->where(
-            'path IN (?)',
-            [
-                'carriers/fedex/packaging',
-                'carriers/fedex/dropoff',
-                'carriers/fedex/free_method',
-                'carriers/fedex/allowed_methods'
-            ]
-        );
-        $mapsOld = $conn->fetchAll($select);
-        foreach ($mapsOld as $mapOld) {
-            $mapNew = '';
-            if (stripos($mapOld['path'], 'packaging') !== false && isset($codes['packaging'][$mapOld['value']])) {
-                $mapNew = $codes['packaging'][$mapOld['value']];
-            } elseif (stripos($mapOld['path'], 'dropoff') !== false && isset($codes['dropoff'][$mapOld['value']])) {
-                $mapNew = $codes['dropoff'][$mapOld['value']];
-            } elseif (stripos($mapOld['path'], 'free_method') !== false && isset($codes['method'][$mapOld['value']])) {
-                $mapNew = $codes['method'][$mapOld['value']];
-            } elseif (stripos($mapOld['path'], 'allowed_methods') !== false) {
-                foreach (explode(',', $mapOld['value']) as $shippingMethod) {
-                    if (isset($codes['method'][$shippingMethod])) {
-                        $mapNew[] = $codes['method'][$shippingMethod];
-                    } else {
-                        $mapNew[] = $shippingMethod;
-                    }
-                }
-                $mapNew = implode(',', $mapNew);
-            } else {
-                continue;
-            }
-
-            if (!empty($mapNew) && $mapNew != $mapOld['value']) {
-                $whereConfigId = $conn->quoteInto('config_id = ?', $mapOld['config_id']);
-                $conn->update($configDataTable, ['value' => $mapNew], $whereConfigId);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php b/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php
new file mode 100644
index 0000000000000..c4e41ad722981
--- /dev/null
+++ b/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Fedex\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class ConfigureFedexDefaults implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * ConfigureFedexDefaults constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function apply()
+    {
+        $codes = [
+            'method' => [
+                'EUROPEFIRSTINTERNATIONALPRIORITY' => 'EUROPE_FIRST_INTERNATIONAL_PRIORITY',
+                'FEDEX1DAYFREIGHT' => 'FEDEX_1_DAY_FREIGHT',
+                'FEDEX2DAYFREIGHT' => 'FEDEX_2_DAY_FREIGHT',
+                'FEDEX2DAY' => 'FEDEX_2_DAY',
+                'FEDEX3DAYFREIGHT' => 'FEDEX_3_DAY_FREIGHT',
+                'FEDEXEXPRESSSAVER' => 'FEDEX_EXPRESS_SAVER',
+                'FEDEXGROUND' => 'FEDEX_GROUND',
+                'FIRSTOVERNIGHT' => 'FIRST_OVERNIGHT',
+                'GROUNDHOMEDELIVERY' => 'GROUND_HOME_DELIVERY',
+                'INTERNATIONALECONOMY' => 'INTERNATIONAL_ECONOMY',
+                'INTERNATIONALECONOMY FREIGHT' => 'INTERNATIONAL_ECONOMY_FREIGHT',
+                'INTERNATIONALFIRST' => 'INTERNATIONAL_FIRST',
+                'INTERNATIONALGROUND' => 'INTERNATIONAL_GROUND',
+                'INTERNATIONALPRIORITY' => 'INTERNATIONAL_PRIORITY',
+                'INTERNATIONALPRIORITY FREIGHT' => 'INTERNATIONAL_PRIORITY_FREIGHT',
+                'PRIORITYOVERNIGHT' => 'PRIORITY_OVERNIGHT',
+                'SMARTPOST' => 'SMART_POST',
+                'STANDARDOVERNIGHT' => 'STANDARD_OVERNIGHT',
+                'FEDEXFREIGHT' => 'FEDEX_FREIGHT',
+                'FEDEXNATIONALFREIGHT' => 'FEDEX_NATIONAL_FREIGHT',
+            ],
+            'dropoff' => [
+                'REGULARPICKUP' => 'REGULAR_PICKUP',
+                'REQUESTCOURIER' => 'REQUEST_COURIER',
+                'DROPBOX' => 'DROP_BOX',
+                'BUSINESSSERVICECENTER' => 'BUSINESS_SERVICE_CENTER',
+                'STATION' => 'STATION',
+            ],
+            'packaging' => [
+                'FEDEXENVELOPE' => 'FEDEX_ENVELOPE',
+                'FEDEXPAK' => 'FEDEX_PAK',
+                'FEDEXBOX' => 'FEDEX_BOX',
+                'FEDEXTUBE' => 'FEDEX_TUBE',
+                'FEDEX10KGBOX' => 'FEDEX_10KG_BOX',
+                'FEDEX25KGBOX' => 'FEDEX_25KG_BOX',
+                'YOURPACKAGING' => 'YOUR_PACKAGING',
+            ],
+        ];
+
+        $conn = $this->moduleDataSetup->getConnection();
+        $configDataTable = $this->moduleDataSetup->getTable('core_config_data');
+        $select = $conn->select()->from(
+            $configDataTable
+        )->where(
+            'path IN (?)',
+            [
+                'carriers/fedex/packaging',
+                'carriers/fedex/dropoff',
+                'carriers/fedex/free_method',
+                'carriers/fedex/allowed_methods'
+            ]
+        );
+        $mapsOld = $conn->fetchAll($select);
+        foreach ($mapsOld as $mapOld) {
+            $mapNew = '';
+            if (stripos($mapOld['path'], 'packaging') !== false && isset($codes['packaging'][$mapOld['value']])) {
+                $mapNew = $codes['packaging'][$mapOld['value']];
+            } elseif (stripos($mapOld['path'], 'dropoff') !== false && isset($codes['dropoff'][$mapOld['value']])) {
+                $mapNew = $codes['dropoff'][$mapOld['value']];
+            } elseif (stripos($mapOld['path'], 'free_method') !== false && isset($codes['method'][$mapOld['value']])) {
+                $mapNew = $codes['method'][$mapOld['value']];
+            } elseif (stripos($mapOld['path'], 'allowed_methods') !== false) {
+                foreach (explode(',', $mapOld['value']) as $shippingMethod) {
+                    if (isset($codes['method'][$shippingMethod])) {
+                        $mapNew[] = $codes['method'][$shippingMethod];
+                    } else {
+                        $mapNew[] = $shippingMethod;
+                    }
+                }
+                $mapNew = implode(',', $mapNew);
+            } else {
+                continue;
+            }
+            if (!empty($mapNew) && $mapNew != $mapOld['value']) {
+                $whereConfigId = $conn->quoteInto('config_id = ?', $mapOld['config_id']);
+                $conn->update($configDataTable, ['value' => $mapNew], $whereConfigId);
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE.txt b/app/code/Magento/Fedex/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE.txt
rename to app/code/Magento/Fedex/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE_AFL.txt b/app/code/Magento/Fedex/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE_AFL.txt
rename to app/code/Magento/Fedex/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Fedex/Test/Mftf/README.md b/app/code/Magento/Fedex/Test/Mftf/README.md
new file mode 100644
index 0000000000000..eeba819913c94
--- /dev/null
+++ b/app/code/Magento/Fedex/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Fedex Functional Tests
+
+The Functional Test Module for **Magento Fedex** module.
diff --git a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
index d2f660d01868a..65aae284ea444 100644
--- a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
@@ -16,6 +16,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Module\Dir\Reader;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
@@ -87,13 +88,18 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \SoapClient|MockObject
      */
-    private $soapClientMock;
+    private $soapClient;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json|MockObject
+     * @var Json|MockObject
      */
     private $serializer;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
     protected function setUp()
     {
         $this->helper = new ObjectManager($this);
@@ -151,17 +157,19 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->serializer = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+        $this->serializer = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
+
         $this->carrier = $this->getMockBuilder(Carrier::class)
             ->setMethods(['_createSoapClient'])
             ->setConstructorArgs(
                 [
                     'scopeConfig' => $this->scope,
                     'rateErrorFactory' => $this->errorFactory,
-                    'logger' => $this->createMock(LoggerInterface::class),
+                    'logger' => $this->logger,
                     'xmlSecurity' => new Security(),
                     'xmlElFactory' => $elementFactory,
                     'rateFactory' => $rateFactory,
@@ -181,12 +189,12 @@ protected function setUp()
                     'serializer' => $this->serializer,
                 ]
             )->getMock();
-        $this->soapClientMock = $this->getMockBuilder(\SoapClient::class)
+        $this->soapClient = $this->getMockBuilder(\SoapClient::class)
             ->disableOriginalConstructor()
             ->setMethods(['getRates', 'track'])
             ->getMock();
         $this->carrier->method('_createSoapClient')
-            ->willReturn($this->soapClientMock);
+            ->willReturn($this->soapClient);
     }
 
     public function testSetRequestWithoutCity()
@@ -214,21 +222,20 @@ public function testSetRequestWithCity()
     }
 
     /**
-     * Callback function, emulates getValue function
-     * @param $path
-     * @return null|string
+     * Callback function, emulates getValue function.
+     *
+     * @param string $path
+     * @return string|null
      */
-    public function scopeConfigGetValue($path)
+    public function scopeConfigGetValue(string $path)
     {
-        switch ($path) {
-            case 'carriers/fedex/showmethod':
-                return 1;
-                break;
-            case 'carriers/fedex/allowed_methods':
-                return 'ServiceType';
-                break;
-        }
-        return null;
+        $pathMap = [
+            'carriers/fedex/showmethod' => 1,
+            'carriers/fedex/allowed_methods' => 'ServiceType',
+            'carriers/fedex/debug' => 1,
+        ];
+
+        return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
 
     /**
@@ -271,7 +278,7 @@ public function testCollectRatesRateAmountOriginBased($amount, $rateType, $expec
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->soapClientMock->expects($this->exactly($callNum))
+        $this->soapClient->expects($this->exactly($callNum))
             ->method('getRates')
             ->willReturn($response);
 
@@ -447,7 +454,7 @@ public function testGetTracking($tracking, $shipTimeStamp, $expectedDate, $expec
         $response->CompletedTrackDetails->TrackDetails = [$trackDetails];
         // @codingStandardsIgnoreEnd
 
-        $this->soapClientMock->expects($this->exactly($callNum))
+        $this->soapClient->expects($this->exactly($callNum))
             ->method('track')
             ->willReturn($response);
 
@@ -570,7 +577,7 @@ public function testGetTrackingWithEvents($tracking, $shipTimeStamp, $expectedDa
         $response->CompletedTrackDetails->TrackDetails = $trackDetails;
         // @codingStandardsIgnoreEnd
 
-        $this->soapClientMock->expects($this->exactly($callNum))
+        $this->soapClient->expects($this->exactly($callNum))
             ->method('track')
             ->willReturn($response);
 
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 4135887fc51e4..9bc0c8b217a57 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -5,20 +5,19 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Fedex/etc/module.xml b/app/code/Magento/Fedex/etc/module.xml
index 8e7afc1c5075d..7eec2b39bb20e 100644
--- a/app/code/Magento/Fedex/etc/module.xml
+++ b/app/code/Magento/Fedex/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Fedex" setup_version="2.0.0">
+    <module name="Magento_Fedex" >
     </module>
 </config>
diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
index 6ae04ccee0775..62795f07239a6 100644
--- a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
@@ -355,7 +355,7 @@
           </xs:element>
           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
@@ -473,7 +473,7 @@
         <xs:annotation>
           <xs:documentation>
             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
-            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+            If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
         <xs:sequence>
@@ -916,7 +916,7 @@
           </xs:element>
           <xs:element name="SecondaryBarcode" type="ns:SecondaryBarcodeType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the corect SCNC.</xs:documentation>
+              <xs:documentation>For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the correct SCNC.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="TermsAndConditionsLocalization" type="ns:Localization" minOccurs="0">
@@ -1006,7 +1006,7 @@
             <xs:annotation>
               <xs:documentation>
                 For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
-                If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+                If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
               </xs:documentation>
             </xs:annotation>
           </xs:element>
@@ -1151,7 +1151,7 @@
       </xs:simpleType>
       <xs:complexType name="DestinationControlDetail">
         <xs:annotation>
-          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="0" maxOccurs="unbounded"/>
@@ -2278,7 +2278,7 @@
           </xs:element>
           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
@@ -2780,7 +2780,7 @@
       </xs:simpleType>
       <xs:complexType name="Party">
         <xs:annotation>
-          <xs:documentation>The descriptive data for a person or company entitiy doing business with FedEx.</xs:documentation>
+          <xs:documentation>The descriptive data for a person or company entity doing business with FedEx.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="AccountNumber" type="xs:string" minOccurs="0">
@@ -3069,7 +3069,7 @@
           </xs:element>
           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
@@ -3195,7 +3195,7 @@
       </xs:simpleType>
       <xs:complexType name="RatedPackageDetail">
         <xs:annotation>
-          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.</xs:documentation>
+          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also returned in this element.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="TrackingIds" type="ns:TrackingId" minOccurs="0" maxOccurs="unbounded">
@@ -3416,7 +3416,7 @@
           </xs:element>
           <xs:element name="TotalWeight" type="ns:Weight" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Identifies the total weight of the shipment being conveyed to FedEx.This is only applicable to International shipments and should only be used on the first package of a mutiple piece shipment.This value contains 1 explicit decimal position</xs:documentation>
+              <xs:documentation>Identifies the total weight of the shipment being conveyed to FedEx.This is only applicable to International shipments and should only be used on the first package of a multiple piece shipment.This value contains 1 explicit decimal position</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="TotalInsuredValue" type="ns:Money" minOccurs="0">
@@ -3582,7 +3582,7 @@
         <xs:sequence>
           <xs:element name="ReturnType" type="ns:ReturnType" minOccurs="1">
             <xs:annotation>
-              <xs:documentation>The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
+              <xs:documentation>The type of return shipment that is being requested. At present the only type of return shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="Rma" type="ns:Rma" minOccurs="0">
@@ -3655,7 +3655,7 @@
       </xs:simpleType>
       <xs:simpleType name="ServiceOptionType">
         <xs:annotation>
-          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparision transaction.</xs:documentation>
+          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparison transaction.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="FREIGHT_GUARANTEE"/>
@@ -4731,7 +4731,7 @@
           </xs:element>
           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
index efbf75076c2cb..17a6f74cc09b8 100644
--- a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
@@ -354,7 +354,7 @@
           </xs:element>
           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
@@ -472,7 +472,7 @@
         <xs:annotation>
           <xs:documentation>
             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
-            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+            If this shipment commitment more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
         <xs:sequence>
@@ -1006,7 +1006,7 @@
             <xs:annotation>
               <xs:documentation>
                 For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
-                If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+                If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
               </xs:documentation>
             </xs:annotation>
           </xs:element>
@@ -1148,7 +1148,7 @@
       </xs:simpleType>
       <xs:complexType name="DestinationControlDetail">
         <xs:annotation>
-          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="0" maxOccurs="unbounded"/>
@@ -2313,7 +2313,7 @@
           </xs:element>
           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
@@ -3099,7 +3099,7 @@
           </xs:element>
           <xs:element name="AppliedOptions" type="ns:ServiceOptionType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
+              <xs:documentation>Shows the specific combination of service options combined with the service type that produced this commitment in the set returned to the caller.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
@@ -3216,7 +3216,7 @@
       </xs:simpleType>
       <xs:complexType name="RatedPackageDetail">
         <xs:annotation>
-          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.</xs:documentation>
+          <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also returned in this element.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="TrackingIds" type="ns:TrackingId" minOccurs="0" maxOccurs="unbounded">
@@ -3622,7 +3622,7 @@
         <xs:sequence>
           <xs:element name="ReturnType" type="ns:ReturnType">
             <xs:annotation>
-              <xs:documentation>The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
+              <xs:documentation>The type of return shipment that is being requested. At present the only type of return shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="Rma" type="ns:Rma" minOccurs="0">
@@ -3687,7 +3687,7 @@
       </xs:complexType>
       <xs:simpleType name="ServiceOptionType">
         <xs:annotation>
-          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparision transaction.</xs:documentation>
+          <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparison transaction.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="FREIGHT_GUARANTEE"/>
@@ -4611,7 +4611,7 @@
           </xs:element>
           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
index 6c43af98ef682..54bb57d490c76 100644
--- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
@@ -498,7 +498,7 @@
         <xs:annotation>
           <xs:documentation>
             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
-            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+            If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
         <xs:sequence>
@@ -1515,12 +1515,12 @@
       </xs:simpleType>
       <xs:complexType name="DestinationControlDetail">
         <xs:annotation>
-          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="1" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>List of applicable Statment types.</xs:documentation>
+              <xs:documentation>List of applicable Statement types.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="DestinationCountries" type="xs:string" minOccurs="0">
@@ -2524,7 +2524,7 @@
           </xs:element>
           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
@@ -5225,7 +5225,7 @@
           </xs:element>
           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
index 8c11a5f660351..d8dc0fdfed4ab 100644
--- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
@@ -498,7 +498,7 @@
         <xs:annotation>
           <xs:documentation>
             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
-            If this shipment cotains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
+            If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
         <xs:sequence>
@@ -1515,12 +1515,12 @@
       </xs:simpleType>
       <xs:complexType name="DestinationControlDetail">
         <xs:annotation>
-          <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
+          <xs:documentation>Data required to complete the Destination Control Statement for US exports.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="StatementTypes" type="ns:DestinationControlStatementType" minOccurs="1" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>List of applicable Statment types.</xs:documentation>
+              <xs:documentation>List of applicable Statement types.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="DestinationCountries" type="xs:string" minOccurs="0">
@@ -2524,7 +2524,7 @@
           </xs:element>
           <xs:element name="LabelStockType" type="ns:LabelStockType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>For thermal printer lables this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
+              <xs:documentation>For thermal printer labels this indicates the size of the label and the location of the doc tab if present.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="LabelPrintingOrientation" type="ns:LabelPrintingOrientationType" minOccurs="0">
@@ -5225,7 +5225,7 @@
           </xs:element>
           <xs:element name="TotalCustomerCharge" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The calculated varibale handling charge plus the net charge.</xs:documentation>
+              <xs:documentation>The calculated variable handling charge plus the net charge.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index 9e2747cf97fc1..4a9311c1b4ba2 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -33,7 +33,7 @@ class Inline extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'inline.phtml';
+    protected $_template = 'Magento_GiftMessage::inline.phtml';
 
     /**
      * Gift message message
@@ -139,7 +139,7 @@ public function getType()
     /**
      * Define checkout type
      *
-     * @param $type string
+     * @param string $type
      * @return $this
      * @codeCoverageIgnore
      */
@@ -238,7 +238,7 @@ public function getMessage($entity = null)
      */
     public function getItems()
     {
-        if (!$this->getData('items')) {
+        if (!$this->hasData('items')) {
             $items = [];
 
             $entityItems = $this->getEntity()->getAllItems();
@@ -277,13 +277,24 @@ public function countItems()
         return count($this->getItems());
     }
 
+    /**
+     * Call method getItemsHasMessages
+     *
+     * @deprecated Misspelled method
+     * @see getItemsHasMessages
+     */
+    public function getItemsHasMesssages()
+    {
+        return $this->getItemsHasMessages();
+    }
+
     /**
      * Check if items has messages
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
-    public function getItemsHasMesssages()
+    public function getItemsHasMessages()
     {
         foreach ($this->getItems() as $item) {
             if ($item->getGiftMessageId()) {
@@ -316,6 +327,20 @@ public function getEscaped($value, $defaultValue = '')
         return $this->escapeHtml(trim($value) != '' ? $value : $defaultValue);
     }
 
+    /**
+     * Check availability of order level functionality
+     *
+     * @return bool
+     */
+    public function isMessagesOrderAvailable()
+    {
+        $entity = $this->getEntity();
+        if (!$entity->hasIsGiftOptionsAvailable()) {
+            $this->_eventManager->dispatch('gift_options_prepare', ['entity' => $entity]);
+        }
+        return $entity->getIsGiftOptionsAvailable();
+    }
+
     /**
      * Check availability of giftmessages on order level
      *
@@ -346,7 +371,7 @@ public function isItemMessagesAvailable($item)
     protected function _toHtml()
     {
         // render HTML when messages are allowed for order or for items only
-        if ($this->isItemsAvailable() || $this->isMessagesAvailable()) {
+        if ($this->isItemsAvailable() || $this->isMessagesAvailable() || $this->isMessagesOrderAvailable()) {
             return parent::_toHtml();
         }
         return '';
@@ -362,9 +387,6 @@ protected function _toHtml()
      */
     public function getImage($product, $imageId, $attributes = [])
     {
-        return $this->imageBuilder->setProduct($product)
-            ->setImageId($imageId)
-            ->setAttributes($attributes)
-            ->create();
+        return $this->imageBuilder->create($product, $imageId, $attributes);
     }
 }
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
index eeab05f01d09f..f6577d1e1237b 100644
--- a/app/code/Magento/GiftMessage/Model/CartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -101,15 +101,15 @@ public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $gi
         $quote = $this->quoteRepository->getActive($cartId);
 
         if (0 == $quote->getItemsCount()) {
-            throw new InputException(__('Gift Messages are not applicable for empty cart'));
+            throw new InputException(__("Gift messages can't be used for an empty cart. Add an item and try again."));
         }
 
         if ($quote->isVirtual()) {
-            throw new InvalidTransitionException(__('Gift Messages are not applicable for virtual products'));
+            throw new InvalidTransitionException(__("Gift messages can't be used for virtual products."));
         }
         $messageText = $giftMessage->getMessage();
         if ($messageText && !$this->helper->isMessagesAllowed('quote', $quote, $this->storeManager->getStore())) {
-            throw new CouldNotSaveException(__('Gift Message is not available'));
+            throw new CouldNotSaveException(__("The gift message isn't available."));
         }
         $this->giftMessageManager->setMessage($quote, 'quote', $giftMessage);
         return true;
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
index c7f145eaddbb4..b124897770b6f 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Locale\FormatInterface as LocaleFormat;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Configuration provider for GiftMessage rendering on "Checkout cart" page.
@@ -41,6 +42,11 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
      */
     protected $checkoutSession;
 
+    /**
+     * @var HttpContext
+     */
+    protected $httpContext;
+
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -57,6 +63,8 @@ class GiftMessageConfigProvider implements ConfigProviderInterface
     protected $formKey;
 
     /**
+     * GiftMessageConfigProvider constructor.
+     *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\GiftMessage\Api\CartRepositoryInterface $cartRepository
      * @param \Magento\GiftMessage\Api\ItemRepositoryInterface $itemRepository
@@ -87,28 +95,28 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
         $configuration = [];
         $configuration['giftMessage'] = [];
-        $orderLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
+        $orderLevelGiftMsg = $this->scopeConfiguration->isSetFlag(
             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
-        $itemLevelGiftMessageConfiguration = (bool)$this->scopeConfiguration->getValue(
+        $itemLevelGiftMessage = $this->scopeConfiguration->isSetFlag(
             GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
-        if ($orderLevelGiftMessageConfiguration) {
+        if ($orderLevelGiftMsg) {
             $orderMessages = $this->getOrderLevelGiftMessages();
             $configuration['isOrderLevelGiftOptionsEnabled'] = (bool)$this->isQuoteVirtual() ? false : true;
             $configuration['giftMessage']['orderLevel'] = $orderMessages === null ? true : $orderMessages->getData();
         }
 
         $itemMessages = $this->getItemLevelGiftMessages();
-        $configuration['isItemLevelGiftOptionsEnabled'] = $itemLevelGiftMessageConfiguration;
+        $configuration['isItemLevelGiftOptionsEnabled'] = $itemLevelGiftMessage;
         $configuration['giftMessage']['itemLevel'] = $itemMessages === null ? true : $itemMessages;
 
         $configuration['priceFormat'] = $this->localeFormat->getPriceFormat(
@@ -168,6 +176,7 @@ protected function getOrderLevelGiftMessages()
      * Load already specified item level gift messages and related configuration.
      *
      * @return \Magento\GiftMessage\Api\Data\MessageInterface[]|null
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function getItemLevelGiftMessages()
     {
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
index e01da4c526252..605fd221462d9 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Model;
 
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -98,7 +99,7 @@ public function add($giftMessages, $quote)
      * @param \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage The gift message.
      * @param null|int $entityId The entity ID.
      * @return void
-     * @throws \Magento\Framework\Exception\CouldNotSaveException The specified gift message is not available.
+     * @throws \Magento\Framework\Exception\CouldNotSaveException The gift message isn't available.
      */
     public function setMessage(\Magento\Quote\Model\Quote $quote, $type, $giftMessage, $entityId = null)
     {
@@ -111,7 +112,7 @@ public function setMessage(\Magento\Quote\Model\Quote $quote, $type, $giftMessag
         try {
             $this->add($message, $quote);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not add gift message to shopping cart'));
+            throw new CouldNotSaveException(__("The gift message couldn't be added to Cart."));
         }
     }
 }
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index 6d369e083b135..aa65bf94f361a 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -74,7 +74,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function get($cartId, $itemId)
     {
@@ -85,8 +85,10 @@ public function get($cartId, $itemId)
          */
         $quote = $this->quoteRepository->getActive($cartId);
         if (!$item = $quote->getItemById($itemId)) {
-            throw new NoSuchEntityException(__('There is no item with provided id in the cart'));
-        };
+            throw new NoSuchEntityException(
+                __('No item with the provided ID was found in the Cart. Verify the ID and try again.')
+            );
+        }
         $messageId = $item->getGiftMessageId();
         if (!$messageId) {
             return null;
@@ -101,7 +103,7 @@ public function get($cartId, $itemId)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage, $itemId)
     {
@@ -114,16 +116,19 @@ public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $gi
 
         if (!$item = $quote->getItemById($itemId)) {
             throw new NoSuchEntityException(
-                __('There is no product with provided  itemId: %1 in the cart', $itemId)
+                __(
+                    'No product with the "%1" itemId exists in the Cart. Verify your information and try again.',
+                    $itemId
+                )
             );
-        };
+        }
 
         if ($item->getIsVirtual()) {
-            throw new InvalidTransitionException(__('Gift Messages are not applicable for virtual products'));
+            throw new InvalidTransitionException(__('Gift messages can\'t be used for virtual products.'));
         }
         $messageText = $giftMessage->getMessage();
         if ($messageText && !$this->helper->isMessagesAllowed('items', $quote, $this->storeManager->getStore())) {
-            throw new CouldNotSaveException(__('Gift Message is not available'));
+            throw new CouldNotSaveException(__("The gift message isn't available."));
         }
         $this->giftMessageManager->setMessage($quote, 'quote_item', $giftMessage, $itemId);
         return true;
diff --git a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
index 4be7483dfe672..445ba54ac4d9c 100644
--- a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
@@ -80,31 +80,38 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function get($orderId, $orderItemId)
     {
         /** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */
         if (!$orderItem = $this->getItemById($orderId, $orderItemId)) {
-            throw new NoSuchEntityException(__('There is no item with provided id in the order'));
-        };
+            throw new NoSuchEntityException(
+                __('No item with the provided ID was found in the Order. Verify the ID and try again.')
+            );
+        }
 
         if (!$this->helper->isMessagesAllowed('order_item', $orderItem, $this->storeManager->getStore())) {
             throw new NoSuchEntityException(
-                __('There is no item with provided id in the order or gift message isn\'t allowed')
+                __(
+                    "No item with the provided ID was found in the Order, or a gift message isn't allowed. "
+                    . "Verify and try again."
+                )
             );
         }
 
         $messageId = $orderItem->getGiftMessageId();
         if (!$messageId) {
-            throw new NoSuchEntityException(__('There is no item with provided id in the order'));
+            throw new NoSuchEntityException(
+                __('No item with the provided ID was found in the Order. Verify the ID and try again.')
+            );
         }
 
         return $this->messageFactory->create()->load($messageId);
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
     {
@@ -113,14 +120,16 @@ public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\Messa
 
         /** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */
         if (!$orderItem = $this->getItemById($orderId, $orderItemId)) {
-            throw new NoSuchEntityException(__('There is no item with provided id in the order'));
-        };
+            throw new NoSuchEntityException(
+                __('No item with the provided ID was found in the Order. Verify the ID and try again.')
+            );
+        }
 
         if ($order->getIsVirtual()) {
-            throw new InvalidTransitionException(__('Gift Messages are not applicable for virtual products'));
+            throw new InvalidTransitionException(__("Gift messages can't be used for virtual products."));
         }
         if (!$this->helper->isMessagesAllowed('order_item', $orderItem, $this->storeManager->getStore())) {
-            throw new CouldNotSaveException(__('Gift Message is not available'));
+            throw new CouldNotSaveException(__("The gift message isn't available."));
         }
 
         $message = [];
@@ -136,7 +145,10 @@ public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\Messa
             $this->giftMessageSaveModel->saveAllInOrder();
             unset($this->orders[$orderId]);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not add gift message to order: "%1"', $e->getMessage()), $e);
+            throw new CouldNotSaveException(
+                __('The gift message couldn\'t be added to the "%1" order.', $e->getMessage()),
+                $e
+            );
         }
         return true;
     }
diff --git a/app/code/Magento/GiftMessage/Model/OrderRepository.php b/app/code/Magento/GiftMessage/Model/OrderRepository.php
index 1960281367e3a..e943fa2a3b084 100644
--- a/app/code/Magento/GiftMessage/Model/OrderRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderRepository.php
@@ -74,7 +74,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function get($orderId)
     {
@@ -83,38 +83,42 @@ public function get($orderId)
 
         if (!$this->helper->isMessagesAllowed('order', $order, $this->storeManager->getStore())) {
             throw new NoSuchEntityException(
-                __('There is no order with provided id or gift message isn\'t allowed')
+                __("Either no order exists with this ID or gift message isn't allowed.")
             );
         }
 
         $messageId = $order->getGiftMessageId();
         if (!$messageId) {
-            throw new NoSuchEntityException(__('There is no item with provided id in the order'));
+            throw new NoSuchEntityException(
+                __('No item with the provided ID was found in the Order. Verify the ID and try again.')
+            );
         }
 
         return $this->messageFactory->create()->load($messageId);
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function save($orderId, \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage)
     {
         /** @var \Magento\Sales\Api\Data\OrderInterface $order */
         $order = $this->orderFactory->create()->load($orderId);
         if (!$order->getEntityId()) {
-            throw new NoSuchEntityException(__('There is no order with provided id'));
-        };
+            throw new NoSuchEntityException(__('No order exists with this ID. Verify your information and try again.'));
+        }
 
         if (0 == $order->getTotalItemCount()) {
-            throw new InputException(__('Gift Messages are not applicable for empty order'));
+            throw new InputException(
+                __("Gift messages can't be used for an empty order. Create an order, add an item, and try again.")
+            );
         }
 
         if ($order->getIsVirtual()) {
-            throw new InvalidTransitionException(__('Gift Messages are not applicable for virtual products'));
+            throw new InvalidTransitionException(__("Gift messages can't be used for virtual products."));
         }
         if (!$this->helper->isMessagesAllowed('order', $order, $this->storeManager->getStore())) {
-            throw new CouldNotSaveException(__('Gift Message is not available'));
+            throw new CouldNotSaveException(__("The gift message isn't available."));
         }
 
         $message = [];
@@ -130,7 +134,10 @@ public function save($orderId, \Magento\GiftMessage\Api\Data\MessageInterface $g
         try {
             $this->giftMessageSaveModel->saveAllInOrder();
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not add gift message to order: "%1"', $e->getMessage()), $e);
+            throw new CouldNotSaveException(
+                __('The gift message couldn\'t be added to the "%1" order.', $e->getMessage()),
+                $e
+            );
         }
         return true;
     }
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
new file mode 100644
index 0000000000000..2c097cc9a6653
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Model\Plugin;
+
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\Processor;
+
+class MergeQuoteItems
+{
+    /**
+     * Resolves gift message to be
+     * applied to merged quote items.
+     *
+     * @param Processor $subject
+     * @param Item $result
+     * @param Item $source
+     * @return Item
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterMerge(Processor $subject, Item $result, Item $source): Item
+    {
+        $giftMessageId = $source->getGiftMessageId();
+
+        if ($giftMessageId) {
+            $result->setGiftMessageId($giftMessageId);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
index 260780828faba..8cddc0582f13f 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
@@ -74,7 +74,7 @@ protected function saveOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $
                 $this->giftMessageOrderRepository->save($order->getEntityId(), $giftMessage);
             } catch (\Exception $e) {
                 throw new CouldNotSaveException(
-                    __('Could not add gift message to order: "%1"', $e->getMessage()),
+                    __('The gift message couldn\'t be added to the "%1" order.', $e->getMessage()),
                     $e
                 );
             }
@@ -109,7 +109,7 @@ protected function saveOrderItemGiftMessage(\Magento\Sales\Api\Data\OrderInterfa
                         );
                     } catch (\Exception $e) {
                         throw new CouldNotSaveException(
-                            __('Could not add gift message to order\'s item: "%1"', $e->getMessage()),
+                            __('The gift message couldn\'t be added to the "%1" order item.', $e->getMessage()),
                             $e
                         );
                     }
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
new file mode 100644
index 0000000000000..044a0bf91c982
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Gift Message Observer Model
+ */
+class SalesEventQuoteMerge implements ObserverInterface
+{
+    /**
+     * Sets gift message to customer quote from guest quote.
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return $this
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        /** @var  Quote $targetQuote */
+        $targetQuote = $observer->getData('quote');
+        /** @var  Quote $sourceQuote */
+        $sourceQuote = $observer->getData('source');
+
+        $giftMessageId = $sourceQuote->getGiftMessageId();
+        if ($giftMessageId) {
+            $targetQuote->setGiftMessageId($giftMessageId);
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Setup/InstallData.php b/app/code/Magento/GiftMessage/Setup/InstallData.php
deleted file mode 100644
index cc181bce56dc1..0000000000000
--- a/app/code/Magento/GiftMessage/Setup/InstallData.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GiftMessage\Setup;
-
-use Magento\Catalog\Setup\CategorySetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Quote\Setup\QuoteSetupFactory;
-use Magento\Sales\Setup\SalesSetupFactory;
-
-/**
- * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Category setup factory
-     *
-     * @var CategorySetupFactory
-     */
-    protected $categorySetupFactory;
-
-    /**
-     * Quote setup factory
-     *
-     * @var QuoteSetupFactory
-     */
-    protected $quoteSetupFactory;
-
-    /**
-     * Sales setup factory
-     *
-     * @var SalesSetupFactory
-     */
-    protected $salesSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param CategorySetupFactory $categorySetupFactory
-     * @param QuoteSetupFactory $quoteSetupFactory
-     * @param SalesSetupFactory $salesSetupFactory
-     */
-    public function __construct(
-        CategorySetupFactory $categorySetupFactory,
-        QuoteSetupFactory $quoteSetupFactory,
-        SalesSetupFactory $salesSetupFactory
-    ) {
-        $this->categorySetupFactory = $categorySetupFactory;
-        $this->quoteSetupFactory = $quoteSetupFactory;
-        $this->salesSetupFactory = $salesSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /**
-         * Add 'gift_message_id' attributes for entities
-         */
-        $options = ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, 'visible' => false, 'required' => false];
-        $entities = ['quote', 'quote_address', 'quote_item', 'quote_address_item'];
-        /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
-        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
-        foreach ($entities as $entity) {
-            $quoteSetup->addAttribute($entity, 'gift_message_id', $options);
-        }
-
-        /** @var \Magento\Sales\Setup\SalesSetup $salesSetup */
-        $salesSetup = $this->salesSetupFactory->create(['setup' => $setup]);
-        $salesSetup->addAttribute('order', 'gift_message_id', $options);
-        $salesSetup->addAttribute('order_item', 'gift_message_id', $options);
-        /**
-         * Add 'gift_message_available' attributes for entities
-         */
-        $salesSetup->addAttribute('order_item', 'gift_message_available', $options);
-
-        /** @var \Magento\Catalog\Setup\CategorySetup $catalogSetup */
-        $catalogSetup = $this->categorySetupFactory->create(['setup' => $setup]);
-        $catalogSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'gift_message_available',
-            [
-                'group' => 'Gift Options',
-                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Boolean::class,
-                'frontend' => '',
-                'label' => 'Allow Gift Message',
-                'input' => 'select',
-                'class' => '',
-                'source' => \Magento\Catalog\Model\Product\Attribute\Source\Boolean::class,
-                'global' => true,
-                'visible' => true,
-                'required' => false,
-                'user_defined' => false,
-                'default' => '',
-                'apply_to' => '',
-                'input_renderer' => \Magento\GiftMessage\Block\Adminhtml\Product\Helper\Form\Config::class,
-                'visible_on_front' => false,
-                'is_used_in_grid' => true,
-                'is_visible_in_grid' => false,
-                'is_filterable_in_grid' => false,
-            ]
-        );
-
-        $groupName = 'Autosettings';
-        $entityTypeId = $catalogSetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-        $attributeSetId = $catalogSetup->getAttributeSetId($entityTypeId, 'Default');
-
-        $attribute = $catalogSetup->getAttribute($entityTypeId, 'gift_message_available');
-        if ($attribute) {
-            $catalogSetup->addAttributeToGroup(
-                $entityTypeId,
-                $attributeSetId,
-                $groupName,
-                $attribute['attribute_id'],
-                60
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/GiftMessage/Setup/InstallSchema.php b/app/code/Magento/GiftMessage/Setup/InstallSchema.php
deleted file mode 100644
index 1fa900773b011..0000000000000
--- a/app/code/Magento/GiftMessage/Setup/InstallSchema.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GiftMessage\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'gift_message'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('gift_message')
-        )->addColumn(
-            'gift_message_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'GiftMessage Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Customer id'
-        )->addColumn(
-            'sender',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sender'
-        )->addColumn(
-            'recipient',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Registrant'
-        )->addColumn(
-            'message',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Message'
-        )->setComment(
-            'Gift Message'
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php b/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php
new file mode 100644
index 0000000000000..bbaa9a883d8a5
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GiftMessage\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class AddGiftMessageAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * AddGiftMessageAttributes constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     * @param QuoteSetupFactory $quoteSetupFactory
+     * @param SalesSetupFactory $salesSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory,
+        QuoteSetupFactory $quoteSetupFactory,
+        SalesSetupFactory $salesSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+        $this->quoteSetupFactory = $quoteSetupFactory;
+        $this->salesSetupFactory = $salesSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /**
+         * Add 'gift_message_id' attributes for entities
+         */
+        $options = ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, 'visible' => false, 'required' => false];
+        $entities = ['quote', 'quote_address', 'quote_item', 'quote_address_item'];
+        /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
+        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        foreach ($entities as $entity) {
+            $quoteSetup->addAttribute($entity, 'gift_message_id', $options);
+        }
+
+        /** @var \Magento\Sales\Setup\SalesSetup $salesSetup */
+        $salesSetup = $this->salesSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $salesSetup->addAttribute('order', 'gift_message_id', $options);
+        $salesSetup->addAttribute('order_item', 'gift_message_id', $options);
+        /**
+         * Add 'gift_message_available' attributes for entities
+         */
+        $salesSetup->addAttribute('order_item', 'gift_message_available', $options);
+        /** @var \Magento\Catalog\Setup\CategorySetup $catalogSetup */
+        $catalogSetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $catalogSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'gift_message_available',
+            [
+                'group' => 'Gift Options',
+                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Boolean::class,
+                'frontend' => '',
+                'label' => 'Allow Gift Message',
+                'input' => 'select',
+                'class' => '',
+                'source' => \Magento\Catalog\Model\Product\Attribute\Source\Boolean::class,
+                'global' => true,
+                'visible' => true,
+                'required' => false,
+                'user_defined' => false,
+                'default' => '',
+                'apply_to' => '',
+                'input_renderer' => \Magento\GiftMessage\Block\Adminhtml\Product\Helper\Form\Config::class,
+                'visible_on_front' => false,
+                'is_used_in_grid' => true,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => false,
+            ]
+        );
+        $groupName = 'Autosettings';
+        $entityTypeId = $catalogSetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $attributeSetId = $catalogSetup->getAttributeSetId($entityTypeId, 'Default');
+        $attribute = $catalogSetup->getAttribute($entityTypeId, 'gift_message_available');
+        if ($attribute) {
+            $catalogSetup->addAttributeToGroup(
+                $entityTypeId,
+                $attributeSetId,
+                $groupName,
+                $attribute['attribute_id'],
+                60
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php b/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php
new file mode 100644
index 0000000000000..1f2c533a978fb
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GiftMessage\Setup\Patch\Data;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class MoveGiftMessageToGiftOptionsGroup implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * MoveGiftMessageToGiftOptionsGroup constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
+        $attributeSetId = $categorySetup->getDefaultAttributeSetId(Product::ENTITY);
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
+
+        $groupName = 'Gift Options';
+
+        if (!$categorySetup->getAttributeGroup(Product::ENTITY, $attributeSetId, $groupName)) {
+            $categorySetup->addAttributeGroup(Product::ENTITY, $attributeSetId, $groupName, 60);
+        }
+        $categorySetup->addAttributeToGroup(
+            $entityTypeId,
+            $attributeSetId,
+            $groupName,
+            $attribute['attribute_id'],
+            10
+        );
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddGiftMessageAttributes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php b/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php
new file mode 100644
index 0000000000000..dacd86a05c6f5
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GiftMessage\Setup\Patch\Data;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateGiftMessageAttribute
+ * @package Magento\GiftMessage\Setup\Patch
+ */
+class UpdateGiftMessageAttribute implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * UpdateGiftMessageAttribute constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
+            $categorySetup->updateAttribute(
+                $entityTypeId,
+                $attribute['attribute_id'],
+                'source_model',
+                \Magento\Catalog\Model\Product\Attribute\Source\Boolean::class
+            );
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            MoveGiftMessageToGiftOptionsGroup::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.1.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Setup/UpgradeData.php b/app/code/Magento/GiftMessage/Setup/UpgradeData.php
deleted file mode 100644
index 36ceb94961608..0000000000000
--- a/app/code/Magento/GiftMessage/Setup/UpgradeData.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GiftMessage\Setup;
-
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Setup\CategorySetupFactory;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var CategorySetupFactory
-     */
-    protected $categorySetupFactory;
-
-    /**
-     * UpgradeData constructor
-     *
-     * @param CategorySetupFactory $categorySetupFactory
-     */
-    public function __construct(CategorySetupFactory $categorySetupFactory)
-    {
-        $this->categorySetupFactory = $categorySetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
-        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-        $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
-        $attributeSetId = $categorySetup->getDefaultAttributeSetId(Product::ENTITY);
-        $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $groupName = 'Gift Options';
-
-            if (!$categorySetup->getAttributeGroup(Product::ENTITY, $attributeSetId, $groupName)) {
-                $categorySetup->addAttributeGroup(Product::ENTITY, $attributeSetId, $groupName, 60);
-            }
-
-            $categorySetup->addAttributeToGroup(
-                $entityTypeId,
-                $attributeSetId,
-                $groupName,
-                $attribute['attribute_id'],
-                10
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.1.0', '<')) {
-            $categorySetup->updateAttribute(
-                $entityTypeId,
-                $attribute['attribute_id'],
-                'source_model',
-                \Magento\Catalog\Model\Product\Attribute\Source\Boolean::class
-            );
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
new file mode 100644
index 0000000000000..f81877006c7a6
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <actionGroup name="CheckingGiftOptionsActionGroup">
+        <click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{MultishippingSection.checkoutWithMultipleAddresses}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click stepKey="goToShippingInformation" selector="{{AdminShipmentAddressInformationSection.goToShippingInformation}}"/>
+        <waitForPageLoad stepKey="waitForGiftOption"/>
+        <click stepKey="thickAddGiftOptions" selector="{{GiftOptionsOnFrontSection.giftOptionCheckbox}}"/>
+        <waitForPageLoad stepKey="waitForOptions"/>
+        <see stepKey="seeAddGiftOptionsForIndividualItems" userInput="Add Gift Options for Individual Items"/>
+        <dontSee stepKey="dontSeeOtherElement1" userInput="Send Gift Receipt"/>
+        <dontSee stepKey="dontSeeOtherElement2" userInput="Add Printed Card"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
new file mode 100644
index 0000000000000..bb3f566f1cbc6
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableGiftMessageForOrder" type="gift_message_config_state">
+        <requiredEntity type="allow_order">AllowGiftMessageForOrder</requiredEntity>
+    </entity>
+    <entity name="AllowGiftMessageForOrder" type="allow_order">
+        <data key="value">1</data>
+    </entity>
+    <entity name="DefaultConfigGiftMessageOptions" type="gift_message_config_state">
+        <requiredEntity type="allow_order">OrderDefault</requiredEntity>
+        <requiredEntity type="allow_items">ItemsDefault</requiredEntity>
+    </entity>
+    <entity name="OrderDefault" type="allow_order">
+        <data key="value">0</data>
+    </entity>
+    <entity name="ItemsDefault" type="allow_items">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE.txt b/app/code/Magento/GiftMessage/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE.txt
rename to app/code/Magento/GiftMessage/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE_AFL.txt b/app/code/Magento/GiftMessage/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE_AFL.txt
rename to app/code/Magento/GiftMessage/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
new file mode 100644
index 0000000000000..d4b7997e77d15
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SalesGiftMessageConfigState" dataType="gift_message_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="gift_message_config_state">
+            <object key="gift_options" dataType="gift_message_config_state">
+                <object key="fields" dataType="gift_message_config_state">
+                    <object key="allow_order" dataType="allow_order">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="allow_items" dataType="allow_items">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/README.md b/app/code/Magento/GiftMessage/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ebc0422df170d
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Gift Message Functional Tests
+
+The Functional Test Module for **Magento Gift Message** module.
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
new file mode 100644
index 0000000000000..63243030682bf
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="GiftOptionsOnFrontSection">
+        <element name="giftOptionCheckbox" type="text" selector="//span[text()='Add Gift Options']"/>
+        <element name="addGiftOptionsForIndividualItems" type="text" selector="//dt[@class='order-title individual']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Block/Cart/Item/Renderer/Actions/ItemIdProcessorTest.php b/app/code/Magento/GiftMessage/Test/Unit/Block/Cart/Item/Renderer/Actions/ItemIdProcessorTest.php
index 35759f4d3f44a..f83f2304143a1 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Block/Cart/Item/Renderer/Actions/ItemIdProcessorTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Block/Cart/Item/Renderer/Actions/ItemIdProcessorTest.php
@@ -39,6 +39,9 @@ public function testProcess($itemId, array $jsLayout, array $result)
         $this->assertEquals($result, $this->model->process($jsLayout, $itemMock));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderProcess()
     {
         return [
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Block/Message/InlineTest.php b/app/code/Magento/GiftMessage/Test/Unit/Block/Message/InlineTest.php
deleted file mode 100644
index e3167fc60f99b..0000000000000
--- a/app/code/Magento/GiftMessage/Test/Unit/Block/Message/InlineTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GiftMessage\Test\Unit\Block\Message;
-
-class InlineTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\GiftMessage\Block\Message\Inline
-     */
-    protected $block;
-
-    /**
-     * @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $context;
-
-    /**
-     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $session;
-
-    /**
-     * @var \Magento\GiftMessage\Helper\Message|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageHelper;
-
-    /**
-     * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $imageBuilder;
-
-    /**
-     * @var \Magento\Framework\App\Http\Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $httpContext;
-
-    protected function setUp()
-    {
-        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->session = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->messageHelper = $this->getMockBuilder(\Magento\GiftMessage\Helper\Message::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageBuilder = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->httpContext = $this->getMockBuilder(\Magento\Framework\App\Http\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->block = new \Magento\GiftMessage\Block\Message\Inline(
-            $this->context,
-            $this->session,
-            $this->messageHelper,
-            $this->imageBuilder,
-            $this->httpContext
-        );
-    }
-
-    public function testGetImage()
-    {
-        $imageId = 'test_image_id';
-        $attributes = [];
-
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->imageBuilder->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setImageId')
-            ->with($imageId)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setAttributes')
-            ->with($attributes)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('create')
-            ->willReturn($imageMock);
-
-        $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\Image::class,
-            $this->block->getImage($productMock, $imageId, $attributes)
-        );
-    }
-}
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
index b013b4a6de7b4..e41cb48550176 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Test\Unit\Model;
 
 use Magento\GiftMessage\Model\CartRepository;
@@ -134,7 +135,7 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Gift Messages are not applicable for empty cart
+     * @expectedExceptionMessage Gift messages can't be used for an empty cart. Add an item and try again.
      */
     public function testSaveWithInputException()
     {
@@ -144,7 +145,7 @@ public function testSaveWithInputException()
 
     /**
      * @expectedException \Magento\Framework\Exception\State\InvalidTransitionException
-     * @expectedExceptionMessage Gift Messages are not applicable for virtual products
+     * @expectedExceptionMessage Gift messages can't be used for virtual products.
      */
     public function testSaveWithInvalidTransitionException()
     {
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
index a5580606134b4..08ebefb68d724 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
@@ -111,7 +111,7 @@ public function testGetConfig()
         );
         $messageMock = $this->createMock(\Magento\GiftMessage\Model\Message::class);
 
-        $this->scopeConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturnMap(
+        $this->scopeConfigMock->expects($this->atLeastOnce())->method('isSetFlag')->willReturnMap(
             [
                 [GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, Scope::SCOPE_STORE, null, $orderLevel],
                 [GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, Scope::SCOPE_STORE, null, $itemLevel]
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php
index a70a946e77fe5..5956a4f5a1f15 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php
@@ -312,7 +312,7 @@ public function testAddWithQuoteAddressItem()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not add gift message to shopping cart
+     * @expectedExceptionMessage The gift message couldn't be added to Cart.
      */
     public function testSetMessageCouldNotAddGiftMessageException()
     {
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php
index f9985a1f92daa..fab9f961f1e4c 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Test\Unit\Model;
 
 use Magento\GiftMessage\Model\ItemRepository;
@@ -115,7 +116,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no item with provided id in the cart
+     * @expectedExceptionMessage No item with the provided ID was found in the Cart. Verify the ID and try again.
      */
     public function testGetWithNoSuchEntityException()
     {
@@ -163,20 +164,22 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no product with provided  itemId: 1 in the cart
      */
     public function testSaveWithNoSuchEntityException()
     {
         $itemId = 1;
 
         $this->quoteMock->expects($this->once())->method('getItemById')->with($itemId)->will($this->returnValue(null));
-
         $this->itemRepository->save($this->cartId, $this->messageMock, $itemId);
+
+        $this->expectExceptionMessage(
+            'No product with the "1" itemId exists in the Cart. Verify your information and try again.'
+        );
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\State\InvalidTransitionException
-     * @expectedExceptionMessage Gift Messages are not applicable for virtual products
+     * @expectedExceptionMessage Gift messages can't be used for virtual products.
      */
     public function testSaveWithInvalidTransitionException()
     {
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php
index 9b0970a3ae2ea..589dcaf2154fc 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Test\Unit\Model;
 
 use Magento\GiftMessage\Model\ItemRepository;
@@ -115,7 +116,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no item with provided id in the cart
+     * @expectedExceptionMessage No item with the provided ID was found in the Cart. Verify the ID and try again.
      */
     public function testGetWithNoSuchEntityException()
     {
@@ -163,20 +164,22 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no product with provided  itemId: 1 in the cart
      */
     public function testSaveWithNoSuchEntityException()
     {
         $itemId = 1;
 
         $this->quoteMock->expects($this->once())->method('getItemById')->with($itemId)->will($this->returnValue(null));
-
         $this->itemRepository->save($this->cartId, $this->messageMock, $itemId);
+
+        $this->expectExceptionMessage(
+            'No product with the "1" itemId exists in the Cart. Verify your information and try again.'
+        );
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\State\InvalidTransitionException
-     * @expectedExceptionMessage Gift Messages are not applicable for virtual products
+     * @expectedExceptionMessage Gift messages can't be used for virtual products.
      */
     public function testSaveWithInvalidTransitionException()
     {
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php
index d6847259dbe5c..ae85e32eceeb6 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Test\Unit\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -169,7 +170,10 @@ public function testGetNoSuchEntityExceptionOnGetItemById()
             $this->orderItemRepository->get($orderId, $orderItemId);
             $this->fail('Expected NoSuchEntityException not caught');
         } catch (NoSuchEntityException $exception) {
-            $this->assertEquals('There is no item with provided id in the order', $exception->getMessage());
+            $this->assertEquals(
+                'No item with the provided ID was found in the Order. Verify the ID and try again.',
+                $exception->getMessage()
+            );
         }
     }
 
@@ -206,7 +210,8 @@ public function testGetNoSuchEntityExceptionOnIsMessageAllowed()
             $this->fail('Expected NoSuchEntityException not caught');
         } catch (NoSuchEntityException $exception) {
             $this->assertEquals(
-                'There is no item with provided id in the order or gift message isn\'t allowed',
+                "No item with the provided ID was found in the Order, or a gift message isn't allowed. "
+                . "Verify and try again.",
                 $exception->getMessage()
             );
         }
@@ -248,7 +253,10 @@ public function testGetNoSuchEntityExceptionOnGetGiftMessageId()
             $this->orderItemRepository->get($orderId, $orderItemId);
             $this->fail('Expected NoSuchEntityException not caught');
         } catch (NoSuchEntityException $exception) {
-            $this->assertEquals('There is no item with provided id in the order', $exception->getMessage());
+            $this->assertEquals(
+                'No item with the provided ID was found in the Order. Verify the ID and try again.',
+                $exception->getMessage()
+            );
         }
     }
 
@@ -336,7 +344,10 @@ public function testSaveNoSuchEntityException()
             $this->orderItemRepository->save($orderId, $orderItemId, $messageMock);
             $this->fail('Expected NoSuchEntityException not caught');
         } catch (NoSuchEntityException $exception) {
-            $this->assertEquals('There is no item with provided id in the order', $exception->getMessage());
+            $this->assertEquals(
+                'No item with the provided ID was found in the Order. Verify the ID and try again.',
+                $exception->getMessage()
+            );
         }
     }
 
@@ -375,7 +386,7 @@ public function testSaveInvalidTransitionException()
             $this->orderItemRepository->save($orderId, $orderItemId, $messageMock);
             $this->fail('Expected InvalidTransitionException not caught');
         } catch (InvalidTransitionException $exception) {
-            $this->assertEquals('Gift Messages are not applicable for virtual products', $exception->getMessage());
+            $this->assertEquals("Gift messages can't be used for virtual products.", $exception->getMessage());
         }
     }
 
@@ -418,7 +429,7 @@ public function testSaveCouldNotSaveException()
             $this->orderItemRepository->save($orderId, $orderItemId, $messageMock);
             $this->fail('Expected CouldNotSaveException not caught');
         } catch (CouldNotSaveException $exception) {
-            $this->assertEquals('Gift Message is not available', $exception->getMessage());
+            $this->assertEquals("The gift message isn't available.", $exception->getMessage());
         }
     }
 
@@ -482,7 +493,7 @@ public function testSaveCouldNotSaveExceptionOnSaveAllInOrder()
             $this->fail('Expected CouldNotSaveException not caught');
         } catch (CouldNotSaveException $exception) {
             $this->assertEquals(
-                'Could not add gift message to order: "' . $excep->getMessage() . '"',
+                'The gift message couldn\'t be added to the "' . $excep->getMessage() . '" order.',
                 $exception->getMessage()
             );
         }
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
index ec8a8841f6477..f3e060ad5fc72 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -128,7 +128,7 @@ public function testAfterSaveGiftMessages()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedMessage Could not add gift message to order:Test message
+     * @expectedExceptionMessage The gift message couldn't be added to the "Test message" order.
      */
     public function testAfterSaveIfGiftMessagesNotExist()
     {
@@ -146,7 +146,7 @@ public function testAfterSaveIfGiftMessagesNotExist()
         $this->giftMessageOrderRepositoryMock
             ->expects($this->once())
             ->method('save')
-            ->willThrowException(new \Exception('TestMessage'));
+            ->willThrowException(new \Exception('Test message'));
 
         // save Gift Messages on item level
         $this->orderMock->expects($this->never())->method('getItems');
@@ -155,7 +155,7 @@ public function testAfterSaveIfGiftMessagesNotExist()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedMessage Could not add gift message to order:Test message
+     * @expectedExceptionMessage The gift message couldn't be added to the "Test message" order item.
      */
     public function testAfterSaveIfItemGiftMessagesNotExist()
     {
@@ -185,7 +185,7 @@ public function testAfterSaveIfItemGiftMessagesNotExist()
         $this->giftMessageOrderItemRepositoryMock
             ->expects($this->once())->method('save')
             ->with($orderId, $orderItemId, $this->giftMessageMock)
-            ->willThrowException(new \Exception('TestMessage'));
+            ->willThrowException(new \Exception('Test message'));
         $this->plugin->afterSave($this->orderRepositoryMock, $this->orderMock);
     }
 }
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
new file mode 100644
index 0000000000000..7a3000f7c0743
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Test\Unit\Observer;
+
+use Magento\GiftMessage\Observer\SalesEventQuoteMerge;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Event\Observer;
+use Magento\Quote\Model\Quote;
+
+/**
+ *  SalesEventQuoteMergeTest
+ */
+class SalesEventQuoteMergeTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * @var SalesEventQuoteMerge
+     */
+    private $salesEventQuoteMerge;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $objectManger = new ObjectManager($this);
+        $this->salesEventQuoteMerge = $objectManger->getObject(SalesEventQuoteMerge::class);
+    }
+
+    /**
+     * @dataProvider dataProviderGiftMessageId
+     *
+     * @param null|int $giftMessageId
+     *
+     * @return void
+     */
+    public function testExecute($giftMessageId): void
+    {
+        $sourceQuoteMock = $this->createPartialMock(Quote::class, ['getGiftMessageId']);
+        $sourceQuoteMock->expects($this->once())
+            ->method('getGiftMessageId')
+            ->willReturn($giftMessageId);
+
+        $targetQuoteMock = $this->createPartialMock(Quote::class, ['setGiftMessageId']);
+
+        if ($giftMessageId) {
+            $targetQuoteMock->expects($this->once())
+                ->method('setGiftMessageId');
+        } else {
+            $targetQuoteMock->expects($this->never())
+                ->method('setGiftMessageId');
+        }
+
+        $observer = $this->createMock(Observer::class);
+        $observer->expects($this->exactly(2))
+            ->method('getData')
+            ->willReturnMap([
+                ['quote', null, $targetQuoteMock],
+                ['source', null, $sourceQuoteMock]
+            ]);
+
+        $this->salesEventQuoteMerge->execute($observer);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderGiftMessageId(): array
+    {
+        return [
+            [null],
+            [1]
+        ];
+    }
+}
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index e46aa25c4027b..6efc7c6ca231f 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -5,22 +5,21 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-multishipping": "100.3.*"
+        "magento/module-multishipping": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftMessage/etc/db_schema.xml b/app/code/Magento/GiftMessage/etc/db_schema.xml
new file mode 100644
index 0000000000000..4ae98799df0c2
--- /dev/null
+++ b/app/code/Magento/GiftMessage/etc/db_schema.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="gift_message" resource="default" engine="innodb" comment="Gift Message">
+        <column xsi:type="int" name="gift_message_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="GiftMessage Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer id"/>
+        <column xsi:type="varchar" name="sender" nullable="true" length="255" comment="Sender"/>
+        <column xsi:type="varchar" name="recipient" nullable="true" length="255" comment="Registrant"/>
+        <column xsi:type="text" name="message" nullable="true" comment="Message"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="gift_message_id"/>
+        </constraint>
+    </table>
+    <table name="quote" resource="checkout" comment="Sales Flat Quote">
+        <column xsi:type="int" name="gift_message_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Gift Message Id"/>
+    </table>
+    <table name="quote_address" resource="checkout" comment="Sales Flat Quote Address">
+        <column xsi:type="int" name="gift_message_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Gift Message Id"/>
+    </table>
+    <table name="quote_item" resource="checkout" comment="Sales Flat Quote Item">
+        <column xsi:type="int" name="gift_message_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Gift Message Id"/>
+    </table>
+    <table name="quote_address_item" resource="checkout" comment="Sales Flat Quote Address Item">
+        <column xsi:type="int" name="gift_message_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Gift Message Id"/>
+    </table>
+    <table name="sales_order" resource="sales" comment="Sales Flat Order">
+        <column xsi:type="int" name="gift_message_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Gift Message Id"/>
+    </table>
+    <table name="sales_order_item" resource="sales" comment="Sales Flat Order Item">
+        <column xsi:type="int" name="gift_message_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Gift Message Id"/>
+        <column xsi:type="int" name="gift_message_available" padding="11" unsigned="false" nullable="true"
+                identity="false" comment="Gift Message Available"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/GiftMessage/etc/db_schema_whitelist.json b/app/code/Magento/GiftMessage/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..e3fed1cadd1da
--- /dev/null
+++ b/app/code/Magento/GiftMessage/etc/db_schema_whitelist.json
@@ -0,0 +1,45 @@
+{
+    "gift_message": {
+        "column": {
+            "gift_message_id": true,
+            "customer_id": true,
+            "sender": true,
+            "recipient": true,
+            "message": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "quote": {
+        "column": {
+            "gift_message_id": true
+        }
+    },
+    "quote_address": {
+        "column": {
+            "gift_message_id": true
+        }
+    },
+    "quote_item": {
+        "column": {
+            "gift_message_id": true
+        }
+    },
+    "quote_address_item": {
+        "column": {
+            "gift_message_id": true
+        }
+    },
+    "sales_order": {
+        "column": {
+            "gift_message_id": true
+        }
+    },
+    "sales_order_item": {
+        "column": {
+            "gift_message_id": true,
+            "gift_message_available": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/GiftMessage/etc/frontend/di.xml b/app/code/Magento/GiftMessage/etc/frontend/di.xml
index 1566c51ee9df3..a4837e0180c0b 100644
--- a/app/code/Magento/GiftMessage/etc/frontend/di.xml
+++ b/app/code/Magento/GiftMessage/etc/frontend/di.xml
@@ -43,4 +43,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item\Processor">
+        <plugin name="mergeQuoteItems" type="Magento\GiftMessage\Model\Plugin\MergeQuoteItems"/>
+    </type>
 </config>
diff --git a/app/code/Magento/GiftMessage/etc/frontend/events.xml b/app/code/Magento/GiftMessage/etc/frontend/events.xml
index 3af69730838ad..c786373b2094f 100644
--- a/app/code/Magento/GiftMessage/etc/frontend/events.xml
+++ b/app/code/Magento/GiftMessage/etc/frontend/events.xml
@@ -12,6 +12,9 @@
     <event name="sales_convert_order_to_quote">
         <observer name="giftmessage" instance="Magento\GiftMessage\Observer\SalesEventOrderToQuoteObserver" shared="false" />
     </event>
+    <event name="sales_quote_merge_after">
+        <observer name="giftmessage" instance="Magento\GiftMessage\Observer\SalesEventQuoteMerge" shared="false" />
+    </event>
     <event name="checkout_type_multishipping_create_orders_single">
         <observer name="giftmessage" instance="Magento\GiftMessage\Observer\MultishippingEventCreateOrdersObserver" shared="false" />
     </event>
diff --git a/app/code/Magento/GiftMessage/etc/module.xml b/app/code/Magento/GiftMessage/etc/module.xml
index bb4ea1dbc2ee6..893045cb0c649 100644
--- a/app/code/Magento/GiftMessage/etc/module.xml
+++ b/app/code/Magento/GiftMessage/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GiftMessage" setup_version="2.0.1">
+    <module name="Magento_GiftMessage" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Sales"/>
diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
index db33efeba1a94..f8a463bec37f9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
+++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
@@ -6,8 +6,10 @@
 var config = {
     map: {
         '*': {
-            giftOptions:    'Magento_GiftMessage/gift-options',
-            extraOptions:   'Magento_GiftMessage/extra-options'
+            giftOptions:    'Magento_GiftMessage/js/gift-options',
+            extraOptions:   'Magento_GiftMessage/js/extra-options',
+            'Magento_GiftMessage/gift-options':    'Magento_GiftMessage/js/gift-options',
+            'Magento_GiftMessage/extra-options':   'Magento_GiftMessage/js/extra-options'
         }
     }
 };
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index dec54cfeb9df9..640ef1ba16486 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -152,6 +152,7 @@
         </div>
 
         <dl class="options-items" id="allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
+            <?php if ($block->isMessagesOrderAvailable() || $block->isMessagesAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
@@ -192,7 +193,7 @@
                     </div>
                  <?php endif; ?>
             </dd>
-
+            <?php endif; ?>
             <?php if ($block->isItemsAvailable()): ?>
             <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/extra-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
similarity index 100%
rename from app/code/Magento/GiftMessage/view/frontend/web/extra-options.js
rename to app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/gift-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
similarity index 100%
rename from app/code/Magento/GiftMessage/view/frontend/web/gift-options.js
rename to app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js b/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
index d025f6974f35e..4c455c83a77a9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
+++ b/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
@@ -31,8 +31,9 @@ define([
 
             this.itemId = this.itemId || 'orderLevel';
             model = new GiftMessage(this.itemId);
-            giftOptions.addOption(model);
             this.model = model;
+            this.isResultBlockVisible();
+            giftOptions.addOption(model);
 
             this.model.getObservable('isClear').subscribe(function (value) {
                 if (value == true) { //eslint-disable-line eqeqeq
@@ -40,8 +41,6 @@ define([
                     self.model.getObservable('alreadyAdded')(true);
                 }
             });
-
-            this.isResultBlockVisible();
         },
 
         /**
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
index 20739f621ecff..15a36cc0e977a 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
@@ -12,26 +12,24 @@
     <div class="gift-options-content">
         <fieldset class="fieldset">
             <div class="field field-to">
-                <label for="gift-message-whole-to" class="label">
+                <label data-bind="attr: {for: 'gift-message-whole-to-' + index }" class="label">
                     <span data-bind="i18n: 'To:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
-                           id="gift-message-whole-to"
                            class="input-text"
-                           data-bind="value: getObservable('recipient')">
+                           data-bind="value: getObservable('recipient'), attr: { id: 'gift-message-whole-to-' + index }">
                 </div>
             </div>
 
             <div class="field field-from">
-                <label for="gift-message-whole-from" class="label">
+                <label data-bind="attr: {for: 'gift-message-whole-from-' + index }" class="label">
                     <span data-bind="i18n: 'From:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
-                           id="gift-message-whole-from"
                            class="input-text"
-                           data-bind="value: getObservable('sender')">
+                           data-bind="value: getObservable('sender'), attr: { id: 'gift-message-whole-from-' + index }">
                 </div>
             </div>
             <div class="field text">
@@ -46,7 +44,6 @@
                 </div>
             </div>
         </fieldset>
-
     </div>
 </div>
 <!-- /ko -->
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE.txt b/app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE.txt
rename to app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE_AFL.txt b/app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE_AFL.txt
rename to app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GoogleAdwords/Test/Mftf/README.md b/app/code/Magento/GoogleAdwords/Test/Mftf/README.md
new file mode 100644
index 0000000000000..37f70104c1d28
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Google Adwords Functional Tests
+
+The Functional Test Module for **Magento Google Adwords** module.
diff --git a/app/code/Magento/GoogleAdwords/Test/Unit/Helper/DataTest.php b/app/code/Magento/GoogleAdwords/Test/Unit/Helper/DataTest.php
index e45ff12a9e206..55811191affbf 100644
--- a/app/code/Magento/GoogleAdwords/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/GoogleAdwords/Test/Unit/Helper/DataTest.php
@@ -91,6 +91,9 @@ public function testGetLanguageCodes()
         $this->assertEquals($languages, $this->_helper->getLanguageCodes());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestConvertLanguage()
     {
         return [
diff --git a/app/code/Magento/GoogleAdwords/Test/Unit/Model/Filter/UppercaseTitleTest.php b/app/code/Magento/GoogleAdwords/Test/Unit/Model/Filter/UppercaseTitleTest.php
index cf013780105a7..76a746ea77b92 100644
--- a/app/code/Magento/GoogleAdwords/Test/Unit/Model/Filter/UppercaseTitleTest.php
+++ b/app/code/Magento/GoogleAdwords/Test/Unit/Model/Filter/UppercaseTitleTest.php
@@ -17,6 +17,9 @@ protected function setUp()
         $this->_model = new \Magento\GoogleAdwords\Model\Filter\UppercaseTitle();
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForFilterValues()
     {
         return [['some name', 'Some Name'], ['test', 'Test']];
diff --git a/app/code/Magento/GoogleAdwords/Test/Unit/Observer/SetConversionValueObserverTest.php b/app/code/Magento/GoogleAdwords/Test/Unit/Observer/SetConversionValueObserverTest.php
index 4e8d8e34fbea7..a514787660559 100644
--- a/app/code/Magento/GoogleAdwords/Test/Unit/Observer/SetConversionValueObserverTest.php
+++ b/app/code/Magento/GoogleAdwords/Test/Unit/Observer/SetConversionValueObserverTest.php
@@ -58,6 +58,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForDisabled()
     {
         return [[false, false], [false, true], [true, false]];
@@ -90,6 +93,9 @@ function () use ($isDynamic) {
         $this->assertSame($this->_model, $this->_model->execute($this->_eventObserverMock));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForOrdersIds()
     {
         return [[[]], ['']];
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index 6d12aa26acdee..8aa1428652144 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -5,13 +5,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleAdwords/etc/module.xml b/app/code/Magento/GoogleAdwords/etc/module.xml
index ee582ec6304c6..90399bd1c3cfb 100644
--- a/app/code/Magento/GoogleAdwords/etc/module.xml
+++ b/app/code/Magento/GoogleAdwords/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GoogleAdwords" setup_version="2.0.0">
+    <module name="Magento_GoogleAdwords" >
         <sequence>
             <module name="Magento_Checkout"/>
         </sequence>
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 177ceb56d68b3..7d065ea50b369 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -128,8 +128,8 @@ public function getOrdersTrackingCode()
                         'price': '%s',
                         'quantity': %s
                     });",
-                    $this->escapeJs($item->getSku()),
-                    $this->escapeJs($item->getName()),
+                    $this->escapeJsQuote($item->getSku()),
+                    $this->escapeJsQuote($item->getName()),
                     $item->getPrice(),
                     $item->getQtyOrdered()
                 );
@@ -144,7 +144,7 @@ public function getOrdersTrackingCode()
                     'shipping': '%s'
                 });",
                 $order->getIncrementId(),
-                $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
+                $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
                 $order->getGrandTotal(),
                 $order->getTaxAmount(),
                 $order->getShippingAmount()
@@ -234,15 +234,15 @@ public function getOrdersTrackingData()
         foreach ($collection as $order) {
             foreach ($order->getAllVisibleItems() as $item) {
                 $result['products'][] = [
-                    'id' => $this->escapeJs($item->getSku()),
-                    'name' =>  $this->escapeJs($item->getName()),
+                    'id' => $this->escapeJsQuote($item->getSku()),
+                    'name' =>  $this->escapeJsQuote($item->getName()),
                     'price' => $item->getPrice(),
                     'quantity' => $item->getQtyOrdered(),
                 ];
             }
             $result['orders'][] = [
                 'id' =>  $order->getIncrementId(),
-                'affiliation' => $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
+                'affiliation' => $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
                 'revenue' => $order->getGrandTotal(),
                 'tax' => $order->getTaxAmount(),
                 'shipping' => $order->getShippingAmount(),
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE.txt b/app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE.txt
rename to app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE_AFL.txt b/app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE_AFL.txt
rename to app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GoogleAnalytics/Test/Mftf/README.md b/app/code/Magento/GoogleAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..d711849909d43
--- /dev/null
+++ b/app/code/Magento/GoogleAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Google Analytics Functional Tests
+
+The Functional Test Module for **Magento Google Analytics** module.
diff --git a/app/code/Magento/GoogleAnalytics/Test/Unit/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest.php b/app/code/Magento/GoogleAnalytics/Test/Unit/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest.php
new file mode 100644
index 0000000000000..a883b0dab8c3b
--- /dev/null
+++ b/app/code/Magento/GoogleAnalytics/Test/Unit/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GoogleAnalytics\Test\Unit\Observer;
+
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\View\LayoutInterface;
+use Magento\GoogleAnalytics\Helper\Data as GaDataHelper;
+use Magento\GoogleAnalytics\Observer\SetGoogleAnalyticsOnOrderSuccessPageViewObserver;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+
+class SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest extends TestCase
+{
+    /**
+     * @var Event|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventMock;
+
+    /**
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $observerMock;
+
+    /**
+     * @var GaDataHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $googleAnalyticsDataMock;
+
+    /**
+     * @var LayoutInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $layoutMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var SetGoogleAnalyticsOnOrderSuccessPageViewObserver
+     */
+    private $orderSuccessObserver;
+
+    /**
+     * Test setUp
+     */
+    protected function setUp()
+    {
+        $this->googleAnalyticsDataMock = $this->getMockBuilder(GaDataHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->observerMock = $this->getMockBuilder(Observer::class)->getMock();
+        $this->eventMock = $this->getMockBuilder(Event::class)->getMock();
+
+        $objectManager = new ObjectManager($this);
+
+        $this->orderSuccessObserver = $objectManager->getObject(
+            SetGoogleAnalyticsOnOrderSuccessPageViewObserver::class,
+            [
+                'storeManager' => $this->storeManagerMock,
+                'layout' => $this->layoutMock,
+                'googleAnalyticsData' => $this->googleAnalyticsDataMock
+            ]
+        );
+    }
+
+    /**
+     * Observer test
+     */
+    public function testExecuteWithNoOrderIds()
+    {
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+        $this->eventMock->expects($this->once())
+            ->method('__call')
+            ->with(
+                $this->equalTo('getOrderIds')
+            )
+            ->willReturn([]);
+        $this->layoutMock->expects($this->never())
+            ->method('getBlock');
+
+        $this->orderSuccessObserver->execute($this->observerMock);
+    }
+
+    /**
+     * Observer test
+     */
+    public function testExecuteWithOrderIds()
+    {
+        $blockMock = $this->getMockBuilder(AbstractBlock::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $orderIds = [8];
+
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+        $this->eventMock->expects($this->once())
+            ->method('__call')
+            ->with(
+                $this->equalTo('getOrderIds')
+            )
+            ->willReturn($orderIds);
+        $this->layoutMock->expects($this->once())
+            ->method('getBlock')
+            ->willReturn($blockMock);
+        $blockMock->expects($this->once())
+            ->method('__call')
+            ->with(
+                $this->equalTo('setOrderIds'),
+                $this->equalTo([$orderIds])
+            );
+
+        $this->orderSuccessObserver->execute($this->observerMock);
+    }
+}
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index 1e1eb5b99fad4..9c86005706e83 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-cookie": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-cookie": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml b/app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml
index 712260f616765..3491b4d456b81 100644
--- a/app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml
+++ b/app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml
@@ -23,11 +23,10 @@
                         <field id="*/*/active">1</field>
                     </depends>
                 </field>
-
-		<field id="anonymize" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="anonymize" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Anonymize IP</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-		    <depends>
+                    <depends>
                         <field id="*/*/active">1</field>
                     </depends>
                 </field>
diff --git a/app/code/Magento/GoogleAnalytics/etc/module.xml b/app/code/Magento/GoogleAnalytics/etc/module.xml
index bd401c26f391a..494ec7a23425d 100644
--- a/app/code/Magento/GoogleAnalytics/etc/module.xml
+++ b/app/code/Magento/GoogleAnalytics/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GoogleAnalytics" setup_version="2.0.0">
+    <module name="Magento_GoogleAnalytics" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml
index 04f91526bd95c..c3f34c5abc1df 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml
@@ -7,8 +7,8 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="after.body.start">
+        <referenceBlock name="head.additional">
             <block class="Magento\GoogleAnalytics\Block\Ga" name="google_analytics" as="google_analytics" template="Magento_GoogleAnalytics::ga.phtml"/>
-        </referenceContainer>
+        </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/web/js/google-analytics.js b/app/code/Magento/GoogleAnalytics/view/frontend/web/js/google-analytics.js
index 42f2745060026..a8b8303d47cdd 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/web/js/google-analytics.js
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/web/js/google-analytics.js
@@ -51,10 +51,9 @@ define([
             if (config.pageTrackingData.isAnonymizedIpActive) {
                 ga('set', 'anonymizeIp', true);
             }
-            ga('send', 'pageview' + config.pageTrackingData.optPageUrl);
 
             // Process orders data
-            if (config.ordersTrackingData) {
+            if (config.ordersTrackingData.hasOwnProperty('currency')) {
                 ga('require', 'ec', 'ec.js');
 
                 ga('set', 'currencyCode', config.ordersTrackingData.currency);
@@ -74,6 +73,9 @@ define([
                 }
 
                 ga('send', 'pageview');
+            } else {
+                // Process Data if not orders
+                ga('send', 'pageview' + config.pageTrackingData.optPageUrl);
             }
         }
     }
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
index 4fcfc1bec016f..eb101f8d705b8 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Google Optmizer Product Block
+ * Google Optimizer Product Block
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index 5b0291eb1435d..7138a7729fe0e 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -11,6 +11,8 @@
 use \Magento\Store\Model\ScopeInterface;
 
 /**
+ * Class Data
+ *
  * @api
  * @since 100.0.2
  */
@@ -32,6 +34,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_analyticsHelper;
 
     /**
+     * Data constructor.
+     *
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\GoogleAnalytics\Helper\Data $analyticsHelper
      */
@@ -51,7 +55,7 @@ public function __construct(
      */
     public function isGoogleExperimentEnabled($store = null)
     {
-        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
deleted file mode 100644
index 44837316fed2d..0000000000000
--- a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GoogleOptimizer\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'googleoptimizer_code'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('googleoptimizer_code'))
-            ->addColumn(
-                'code_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Google experiment code id'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Optimized entity id product id or catalog id'
-            )
-            ->addColumn(
-                'entity_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                [],
-                'Optimized entity type'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Store id'
-            )
-            ->addColumn(
-                'experiment_script',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Google experiment script'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'googleoptimizer_code',
-                    ['store_id', 'entity_id', 'entity_type'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['store_id', 'entity_id', 'entity_type'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $installer->getFkName('googleoptimizer_code', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Google Experiment code');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE.txt b/app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE.txt
rename to app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE_AFL.txt b/app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE_AFL.txt
rename to app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GoogleOptimizer/Test/Mftf/README.md b/app/code/Magento/GoogleOptimizer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c0338246ba9fd
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Google Optimizer Functional Tests
+
+The Functional Test Module for **Magento Google Optimizer** module.
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index d86e804f3851d..51036562857f2 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-google-analytics": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-cms": "*",
+        "magento/module-google-analytics": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
index f0c703b7693c7..3c91c30c5cfa6 100644
--- a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="google" translate="label">
+        <section id="google">
             <group id="analytics">
                 <field id="experiments" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Content Experiments</label>
diff --git a/app/code/Magento/GoogleOptimizer/etc/db_schema.xml b/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
new file mode 100644
index 0000000000000..76c377544cfb3
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="googleoptimizer_code" resource="default" engine="innodb" comment="Google Experiment code">
+        <column xsi:type="int" name="code_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Google experiment code id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Optimized entity id product id or catalog id"/>
+        <column xsi:type="varchar" name="entity_type" nullable="true" length="50" comment="Optimized entity type"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store id"/>
+        <column xsi:type="text" name="experiment_script" nullable="true" comment="Google experiment script"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="code_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="GOOGLEOPTIMIZER_CODE_STORE_ID_STORE_STORE_ID" table="googleoptimizer_code"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="GOOGLEOPTIMIZER_CODE_STORE_ID_ENTITY_ID_ENTITY_TYPE">
+            <column name="store_id"/>
+            <column name="entity_id"/>
+            <column name="entity_type"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/GoogleOptimizer/etc/db_schema_whitelist.json b/app/code/Magento/GoogleOptimizer/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..20d2d1404a047
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/etc/db_schema_whitelist.json
@@ -0,0 +1,16 @@
+{
+    "googleoptimizer_code": {
+        "column": {
+            "code_id": true,
+            "entity_id": true,
+            "entity_type": true,
+            "store_id": true,
+            "experiment_script": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "GOOGLEOPTIMIZER_CODE_STORE_ID_STORE_STORE_ID": true,
+            "GOOGLEOPTIMIZER_CODE_STORE_ID_ENTITY_ID_ENTITY_TYPE": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/GoogleOptimizer/etc/module.xml b/app/code/Magento/GoogleOptimizer/etc/module.xml
index 25d7462587cb6..2ceff61f59dbd 100644
--- a/app/code/Magento/GoogleOptimizer/etc/module.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GoogleOptimizer" setup_version="2.0.0">
+    <module name="Magento_GoogleOptimizer" >
         <sequence>
             <module name="Magento_GoogleAnalytics"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml
index 735de2bd7b177..cc9249b2d3d38 100644
--- a/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml
+++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml
@@ -13,7 +13,12 @@
         </settings>
         <container name="google_experiment_container" sortOrder="250">
             <htmlContent name="html_content">
-                <block name="googleOptimizerBlockAdminhtmlFormCmsPage" class="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage" />
+                <block name="googleOptimizerBlockAdminhtmlFormCmsPage" class="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage">
+                    <arguments>
+                        <argument name="code-entity" xsi:type="string">Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page\EntityCmsPage</argument>
+                        <argument name="form-name" xsi:type="string">cms_page_form</argument>
+                    </arguments>
+                </block>
             </htmlContent>
         </container>
     </fieldset>
diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index f73d20ae8ea99..c4a0b55de9bfc 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\GraphQl\Controller;
 
@@ -10,16 +11,18 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
+use Magento\Framework\GraphQl\Query\QueryProcessor;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\Response;
-use Magento\GraphQl\Model\SchemaGeneratorInterface;
-use Magento\Framework\GraphQl\RequestProcessor;
-use Magento\Framework\GraphQl\ExceptionFormatter;
-use Magento\GraphQl\Model\ResolverContext;
+use Magento\Framework\GraphQl\Query\Fields as QueryFields;
 
 /**
  * Front controller for web API GraphQL area.
+ *
+ * @api
  */
 class GraphQl implements FrontControllerInterface
 {
@@ -39,38 +42,58 @@ class GraphQl implements FrontControllerInterface
     private $jsonSerializer;
 
     /**
-     * @var RequestProcessor
+     * @var QueryProcessor
      */
-    private $requestProcessor;
+    private $queryProcessor;
 
-    /** @var ExceptionFormatter */
+    /**
+     * @var \Magento\Framework\GraphQl\Exception\ExceptionFormatter
+     */
     private $graphQlError;
 
-    /** @var ResolverContext */
-    private $context;
+    /**
+     * @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface
+     */
+    private $resolverContext;
+
+    /**
+     * @var HttpRequestProcessor
+     */
+    private $requestProcessor;
+
+    /**
+     * @var QueryFields
+     */
+    private $queryFields;
 
     /**
      * @param Response $response
      * @param SchemaGeneratorInterface $schemaGenerator
      * @param SerializerInterface $jsonSerializer
-     * @param RequestProcessor $requestProcessor
-     * @param ExceptionFormatter $graphQlError
-     * @param ResolverContext $context
+     * @param QueryProcessor $queryProcessor
+     * @param \Magento\Framework\GraphQl\Exception\ExceptionFormatter $graphQlError
+     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $resolverContext
+     * @param HttpRequestProcessor $requestProcessor
+     * @param QueryFields $queryFields
      */
     public function __construct(
         Response $response,
         SchemaGeneratorInterface $schemaGenerator,
         SerializerInterface $jsonSerializer,
-        RequestProcessor $requestProcessor,
+        QueryProcessor $queryProcessor,
         ExceptionFormatter $graphQlError,
-        ResolverContext $context
+        ContextInterface $resolverContext,
+        HttpRequestProcessor $requestProcessor,
+        QueryFields $queryFields
     ) {
         $this->response = $response;
         $this->schemaGenerator = $schemaGenerator;
         $this->jsonSerializer = $jsonSerializer;
-        $this->requestProcessor = $requestProcessor;
+        $this->queryProcessor = $queryProcessor;
         $this->graphQlError = $graphQlError;
-        $this->context = $context;
+        $this->resolverContext = $resolverContext;
+        $this->requestProcessor = $requestProcessor;
+        $this->queryFields = $queryFields;
     }
 
     /**
@@ -79,33 +102,36 @@ public function __construct(
      * @param RequestInterface $request
      * @return ResponseInterface
      */
-    public function dispatch(RequestInterface $request)
+    public function dispatch(RequestInterface $request) : ResponseInterface
     {
+        $statusCode = 200;
         try {
-            /** @var $request Http */
-            if ($request->getHeader('Content-Type')
-                && strpos($request->getHeader('Content-Type'), 'application/json') !== false
-            ) {
-                $content = $request->getContent();
-                $data = $this->jsonSerializer->unserialize($content);
-            } else {
-                throw new LocalizedException(__('Request content type must be application/json'));
-            }
+            /** @var Http $request */
+            $this->requestProcessor->processHeaders($request);
+            $data = $this->jsonSerializer->unserialize($request->getContent());
+
+            $query = isset($data['query']) ? $data['query'] : '';
+
+            // We have to extract queried field names to avoid instantiation of non necessary fields in webonyx schema
+            // Temporal coupling is required for performance optimization
+            $this->queryFields->setQuery($query);
             $schema = $this->schemaGenerator->generate();
-            $result = $this->requestProcessor->process(
+
+            $result = $this->queryProcessor->process(
                 $schema,
-                isset($data['query']) ? $data['query'] : '',
-                null,
-                $this->context,
+                $query,
+                $this->resolverContext,
                 isset($data['variables']) ? $data['variables'] : []
             );
         } catch (\Exception $error) {
-            $result['extensions']['exception'] = $this->graphQlError->create($error);
+            $result['errors'] = isset($result) && isset($result['errors']) ? $result['errors'] : [];
+            $result['errors'][] = $this->graphQlError->create($error);
+            $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
         }
         $this->response->setBody($this->jsonSerializer->serialize($result))->setHeader(
             'Content-Type',
             'application/json'
-        );
+        )->setHttpResponseCode($statusCode);
         return $this->response;
     }
 }
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
new file mode 100644
index 0000000000000..2270f2616e67b
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
+
+/**
+ * Processes the "Content-Type" header entry
+ */
+class ContentTypeProcessor implements HttpHeaderProcessorInterface
+{
+    /**
+     * Handle the mandatory application/json header
+     *
+     * {@inheritDoc}
+     * @throws LocalizedException
+     */
+    public function processHeaderValue(string $headerValue) : void
+    {
+        if (!$headerValue || strpos($headerValue, 'application/json') === false) {
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase('Request content type must be application/json')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
new file mode 100644
index 0000000000000..be359eafdf246
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Process the "Store" header entry
+ */
+class StoreProcessor implements HttpHeaderProcessorInterface
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * StoreProcessor constructor.
+     *
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Handle the value of the store and set the scope
+     *
+     * {@inheritDoc}
+     * @throws NoSuchEntityException
+     */
+    public function processHeaderValue(string $headerValue) : void
+    {
+        if ($headerValue) {
+            $storeCode = ltrim(rtrim($headerValue));
+            $stores = $this->storeManager->getStores(false, true);
+            if (isset($stores[$storeCode])) {
+                $this->storeManager->setCurrentStore($storeCode);
+            } elseif (strtolower($storeCode) !== 'default') {
+                throw new GraphQlInputException(
+                    new \Magento\Framework\Phrase('Store code %1 does not exist', [$storeCode])
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
new file mode 100644
index 0000000000000..a20f88a4ef995
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller;
+
+/**
+ * Use this interface to implement a processor for each entry of a header in an HTTP GraphQL request.
+ */
+interface HttpHeaderProcessorInterface
+{
+    /**
+     * Perform processing on a list of headers, iteratively.
+     *
+     * This method should be called even if a header entry is not present on a request
+     * to enforce required headers like "application/json"
+     *
+     * @param string $headerValue
+     * @return void
+     */
+    public function processHeaderValue(string $headerValue) : void;
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
new file mode 100644
index 0000000000000..5e42b81a61981
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller;
+
+use Magento\Framework\App\Request\Http;
+
+/**
+ * Hold information about all http processors objects that can handle a header entry
+ */
+class HttpRequestProcessor
+{
+    /**
+     * @var HttpHeaderProcessorInterface[]
+     */
+    private $headerProcessors = [];
+
+    /**
+     * @param HttpHeaderProcessorInterface[] $graphQlHeaders
+     */
+    public function __construct(array $graphQlHeaders = [])
+    {
+        $this->headerProcessors = $graphQlHeaders;
+    }
+
+    /**
+     * Process the headers from a request given from usually the controller
+     *
+     * @param Http $request
+     * @return void
+     */
+    public function processHeaders(Http $request) : void
+    {
+        foreach ($this->headerProcessors as $headerName => $headerClass) {
+            $headerClass->processHeaderValue((string)$request->getHeader($headerName));
+        }
+    }
+}
diff --git a/app/code/Magento/GraphQl/Model/ArgumentConfig.php b/app/code/Magento/GraphQl/Model/ArgumentConfig.php
deleted file mode 100644
index 4cae06b5517f1..0000000000000
--- a/app/code/Magento/GraphQl/Model/ArgumentConfig.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-use Magento\Framework\GraphQl\Argument\ValueParserInterface;
-use Magento\Framework\GraphQl\Argument\ArgumentValueInterface;
-
-/**
- * Data object that holds the configuration for a argument of a field
- */
-class ArgumentConfig
-{
-    /**
-     * @var ArgumentValueInterface|int|string|float|bool
-     */
-
-    private $defaultValue;
-
-    /**
-     * @var ValueParserInterface
-     */
-    private $valueParser;
-
-    /**
-     * @param ArgumentValueInterface|int|string|float|bool|null $defaultValue
-     * @param ValueParserInterface|null $valueParser
-     */
-    public function __construct(
-        $defaultValue = null,
-        ValueParserInterface $valueParser = null
-    ) {
-        $this->defaultValue = $defaultValue;
-        $this->valueParser = $valueParser;
-    }
-
-    /**
-     * Return the default value
-     *
-     * @return ArgumentValueInterface|int|string|float|bool|null $defaultValue
-     */
-    public function getDefaultValue()
-    {
-        return $this->defaultValue;
-    }
-
-    /**
-     * Return a value parser if one is set
-     *
-     * @return ValueParserInterface|null
-     */
-    public function getValueParser()
-    {
-        return $this->valueParser;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/EntityAttributeList.php b/app/code/Magento/GraphQl/Model/EntityAttributeList.php
index 6a00f4d7f4d1d..3802b74f3ec13 100644
--- a/app/code/Magento/GraphQl/Model/EntityAttributeList.php
+++ b/app/code/Magento/GraphQl/Model/EntityAttributeList.php
@@ -3,46 +3,113 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\GraphQl\Model;
 
 use Magento\Eav\Api\AttributeManagementInterface;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\MetadataServiceInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
+/**
+ * Iterate through all attribute sets to retrieve attributes for any given entity type
+ */
 class EntityAttributeList
 {
     /**
      * @var AttributeManagementInterface
      */
-    private $management;
+    private $attributeManagement;
 
     /**
-     * @var EavSetupFactory
+     * @var AttributeSetRepositoryInterface
      */
-    private $eavSetupFactory;
+    private $attributeSetRepository;
 
     /**
-     * @var EavSetup
+     * @var SearchCriteriaBuilder
      */
-    private $eavSetup;
+    private $searchCriteriaBuilder;
 
     /**
-     * @param AttributeManagementInterface $management
-     * @param EavSetupFactory $eavSetupFactory
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @param AttributeManagementInterface $attributeManagement
+     * @param AttributeSetRepositoryInterface $attributeSetRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterBuilder $filterBuilder
      */
     public function __construct(
-        AttributeManagementInterface $management,
-        EavSetupFactory $eavSetupFactory
+        AttributeManagementInterface $attributeManagement,
+        AttributeSetRepositoryInterface $attributeSetRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterBuilder $filterBuilder
     ) {
-        $this->management =  $management;
-        $this->eavSetupFactory = $eavSetupFactory;
-        $this->eavSetup = $this->eavSetupFactory->create();
+        $this->attributeManagement =  $attributeManagement;
+        $this->attributeSetRepository = $attributeSetRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
     }
 
-    public function getDefaultEntityAttributes(string $entityCode)
-    {
-        $defaultAttributeSetId = $this->eavSetup->getDefaultAttributeSetId($entityCode);
-        return $this->management->getAttributes($entityCode, $defaultAttributeSetId);
+    /**
+     * Retrieve all EAV and custom attribute codes from all attribute sets for given entity code.
+     *
+     * Returned in the format [$attributeCode => $isSortable] with $isSortable being a boolean value where an attribute
+     * can be sorted with in a search criteria expression. The metadata service parameter is only required if type has
+     * custom attributes.
+     *
+     * @param string $entityCode
+     * @param MetadataServiceInterface $metadataService
+     * @return boolean[]
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function getDefaultEntityAttributes(
+        string $entityCode,
+        MetadataServiceInterface $metadataService = null
+    ) : array {
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder
+                    ->setField('entity_type_code')
+                    ->setValue($entityCode)
+                    ->setConditionType('eq')
+                    ->create(),
+            ]
+        );
+        $attributeSetList = $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create())->getItems();
+        $attributes = [];
+        foreach ($attributeSetList as $attributeSet) {
+            try {
+                $attributes = array_merge(
+                    $attributes,
+                    $this->attributeManagement->getAttributes($entityCode, $attributeSet->getAttributeSetId())
+                );
+            } catch (NoSuchEntityException $exception) {
+                throw new GraphQlNoSuchEntityException(__('Entity code %1 does not exist.', [$entityCode]));
+            }
+        }
+        $attributeCodes = [];
+        $metadata = $metadataService ? $metadataService->getCustomAttributesMetadata() : [];
+        foreach ($metadata as $customAttribute) {
+            if (!array_key_exists($customAttribute->getAttributeCode(), $attributeCodes)) {
+                $attributeCodes[$customAttribute->getAttributeCode()] = false;
+            }
+        }
+        /** @var AttributeInterface $attribute */
+        foreach ($attributes as $attribute) {
+            if (!array_key_exists($attribute->getAttributeCode(), $attributeCodes)) {
+                $attributeCodes[$attribute->getAttributeCode()]
+                    = ((! $attribute->getIsUserDefined()) && !is_array($attribute));
+            }
+        }
+        return $attributeCodes;
     }
 }
diff --git a/app/code/Magento/GraphQl/Model/FieldConfig.php b/app/code/Magento/GraphQl/Model/FieldConfig.php
deleted file mode 100644
index 49ce2632024dd..0000000000000
--- a/app/code/Magento/GraphQl/Model/FieldConfig.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-/**
- * Class that stores configuration for processing value of arguments for GraphQl fields
- */
-class FieldConfig
-{
-    /**
-     * Map as array for classes that represent field arguments
-     *
-     * @var array
-     */
-    private $config = [];
-
-    /**
-     * @var array
-     */
-    private $instances = [];
-
-    /**
-     * @var ArgumentConfigFactory
-     */
-    private $argumentConfigFactory;
-
-    /**
-     * @param ArgumentConfigFactory $argumentConfigFactory
-     * @param array $config
-     */
-    public function __construct(ArgumentConfigFactory $argumentConfigFactory, array $config = [])
-    {
-        $this->config = $config;
-        $this->argumentConfigFactory = $argumentConfigFactory;
-    }
-
-    /**
-     * Returns a field configuration that is configured through DI
-     *
-     * @param string $fieldName
-     * @param array $arguments
-     * @return ArgumentConfig[]
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     */
-    public function getFieldConfig(string $fieldName, array $arguments)
-    {
-        if (isset($this->instances[$fieldName])) {
-            return $this->instances[$fieldName];
-        }
-        if (isset($this->config[$fieldName])) {
-            $this->processConfiguredField($fieldName, $arguments);
-        } else {
-            foreach (array_keys($arguments) as $argument) {
-                $this->instances[$fieldName][$argument] = $this->argumentConfigFactory->create([
-                    'defaultValue' => null,
-                    'valueParser' => null
-                ]);
-            }
-        }
-        //not all fields have arguments
-        if (isset($this->instances[$fieldName])) {
-            return $this->instances[$fieldName];
-        } else {
-            return [];
-        }
-    }
-
-    private function processConfiguredField(string $fieldName, array $arguments)
-    {
-        $this->instances[$fieldName] = [];
-        foreach ($this->config[$fieldName] as $argumentName => $fieldConfig) {
-            $this->instances[$fieldName][$argumentName] = $this->argumentConfigFactory->create(
-                [
-                    'defaultValue' => isset($fieldConfig['defaultValue']) ? $fieldConfig['defaultValue'] : null,
-                    'valueParser'=> isset($fieldConfig['valueParser'])
-                        ? $fieldConfig['valueParser']
-                        : null
-                ]
-            );
-        }
-        foreach (array_keys($arguments) as $argumentName) {
-            if (!isset($this->instances[$fieldName][$argumentName])) {
-                $this->instances[$fieldName][$argumentName] = $this->argumentConfigFactory->create(
-                    [
-                        'defaultValue' => null,
-                        'valueParser'=> null
-                    ]
-                );
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php b/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
new file mode 100644
index 0000000000000..1eae619967ef5
--- /dev/null
+++ b/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Model\Query\Resolver;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+
+/**
+ * Concrete implementation for @see ContextInterface
+ *
+ * The purpose for this that GraphQL specification wants to make use of such object where multiple modules can
+ * participate with data through extension attributes.
+ */
+class Context extends \Magento\Framework\Model\AbstractExtensibleModel implements ContextInterface
+{
+    /**#@+
+     * Constants defined for type of context
+     */
+    const USER_TYPE_ID  = 'user_type';
+    const USER_ID = 'user_id';
+    /**#@-*/
+
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param ExtensionAttributesFactory $extensionFactory
+     * @param AttributeValueFactory $customAttributeFactory
+     * @param UserContextInterface|null $userContext
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        ExtensionAttributesFactory $extensionFactory,
+        AttributeValueFactory $customAttributeFactory,
+        UserContextInterface $userContext,
+        array $data = []
+    ) {
+        parent::__construct(
+            $context,
+            $registry,
+            $extensionFactory,
+            $customAttributeFactory
+        );
+        if (isset($data['id'])) {
+            $this->setId($data['id']);
+        }
+        if (isset($data['type'])) {
+            $this->setId($data['type']);
+        }
+        $this->userContext = $userContext;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface
+     */
+    public function getExtensionAttributes() : \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
+     * @return ContextInterface
+     */
+    public function setExtensionAttributes(
+        \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
+    ) : ContextInterface {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserId() : int
+    {
+        if (!$this->getData(self::USER_ID)) {
+            $this->setUserId((int) $this->userContext->getUserId());
+        }
+        return (int) $this->getData(self::USER_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUserId(int $userId) : ContextInterface
+    {
+        return $this->setData(self::USER_ID, $userId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserType() : int
+    {
+        if (!$this->getData(self::USER_TYPE_ID)) {
+            $this->setUserType($this->userContext->getUserType());
+        }
+        return (int) $this->getData(self::USER_TYPE_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUserType(int $typeId) : ContextInterface
+    {
+        return $this->setData(self::USER_TYPE_ID, $typeId);
+    }
+}
diff --git a/app/code/Magento/GraphQl/Model/QueryConfig.php b/app/code/Magento/GraphQl/Model/QueryConfig.php
deleted file mode 100644
index 022651efa16cc..0000000000000
--- a/app/code/Magento/GraphQl/Model/QueryConfig.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-use Magento\GraphQl\Model\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-
-/**
- * Contains high level structure for the composition of GraphQL query endpoints, and their arguments and resolvers.
- */
-class QueryConfig
-{
-    /**
-     * @var array
-     */
-    private $queryStructure;
-
-    /**
-     * @param array $queryStructure
-     */
-    public function __construct(array $queryStructure = [])
-    {
-        $this->queryStructure = $queryStructure;
-    }
-
-    /**
-     * Retrieve field structure definitions for GraphQL queries
-     *
-     * @return array
-     */
-    public function getQueryFields()
-    {
-        return $this->queryStructure;
-    }
-
-    /**
-     * Retrieves resolver instance configured by type name.
-     *
-     * @param string $type
-     * @return ResolverInterface
-     * @throws GraphQlInputException
-     */
-    public function getResolverClass($type)
-    {
-        if (!isset($this->queryStructure[$type]) || !isset($this->queryStructure[$type]['resolver'])) {
-            throw new GraphQlInputException(__('A resolver is not defined for the type %1', $type));
-        }
-
-        return $this->queryStructure[$type]['resolver'];
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/ResolverContext.php b/app/code/Magento/GraphQl/Model/ResolverContext.php
deleted file mode 100644
index 880fac8e12d8b..0000000000000
--- a/app/code/Magento/GraphQl/Model/ResolverContext.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\Api\ExtensionAttributesFactory;
-
-/**
- * Concrete implementation for @see ResolverContextInterface
- *
- * The purpose for this that GraphQL specification wants to make use of such object where multiple modules can
- * participate with data through extension attributes.
- */
-class ResolverContext extends \Magento\Framework\Model\AbstractExtensibleModel implements ResolverContextInterface
-{
-    /**#@+
-     * Constants defined for type of context
-     */
-    const USER_TYPE_ID   = 'user_type';
-    const USER_ID = 'user_id';
-    /**#@-*/
-
-    /**
-     * @var UserContextInterface
-     */
-    private $userContext;
-
-    /**
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param ExtensionAttributesFactory $extensionFactory
-     * @param AttributeValueFactory $customAttributeFactory
-     * @param UserContextInterface|null $userContext
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        ExtensionAttributesFactory $extensionFactory,
-        AttributeValueFactory $customAttributeFactory,
-        UserContextInterface $userContext,
-        array $data = []
-    ) {
-        parent::__construct(
-            $context,
-            $registry,
-            $extensionFactory,
-            $customAttributeFactory
-        );
-        if (isset($data['id'])) {
-            $this->setId($data['id']);
-        }
-        if (isset($data['type'])) {
-            $this->setId($data['type']);
-        }
-        $this->userContext = $userContext;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\GraphQl\Model\ResolverContextExtensionInterface||null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\GraphQl\Model\ResolverContextExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\GraphQl\Model\ResolverContextExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getUserId()
-    {
-        if (!$this->getData(self::USER_ID)) {
-            $this->setUserId((int) $this->userContext->getUserId());
-        }
-        return (int) $this->getData(self::USER_ID);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setUserId(int $userId)
-    {
-        return $this->setData(self::USER_ID, $userId);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getUserType()
-    {
-        if (!$this->getData(self::USER_TYPE_ID)) {
-            $this->setUserType($this->userContext->getUserType());
-        }
-        return (int) $this->getData(self::USER_TYPE_ID);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setUserType(int $typeId)
-    {
-        return $this->setData(self::USER_TYPE_ID, $typeId);
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/ResolverContextInterface.php b/app/code/Magento/GraphQl/Model/ResolverContextInterface.php
deleted file mode 100644
index 53f1406ffcb94..0000000000000
--- a/app/code/Magento/GraphQl/Model/ResolverContextInterface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-use Magento\Framework\Api\ExtensibleDataInterface;
-
-/**
- * Resolver Context is used as a shared data extensible object in all resolvers that implement @see ResolverInterface.
- *
- * GraphQL will pass the same instance of this interface in each field resolver for, so these resolvers could have
- * shared access to the same data for ease of implementation purposes.
- */
-interface ResolverContextInterface extends ExtensibleDataInterface
-{
-    /**
-     * Get the type of a user
-     *
-     * @see \Magento\Authorization\Model\UserContextInterface for corespondent values
-     *
-     * @return int
-     */
-    public function getUserType();
-
-    /**
-     * Set type of a user
-     *
-     * @see \Magento\Authorization\Model\UserContextInterface for corespondent values
-     *
-     * @param int $typeId
-     * @return $this
-     */
-    public function setUserType(int $typeId);
-
-    /**
-     * Get id of the user
-     *
-     * @return int
-     */
-    public function getUserId();
-
-    /**
-     * Set id of a user
-     *
-     * @param int $userId
-     * @return $this
-     */
-    public function setUserId(int $userId);
-
-    /**
-     * Retrieve existing extension attributes object or create a new one.
-     *
-     * @return \Magento\GraphQl\Model\ResolverContextExtensionInterface|null
-     */
-    public function getExtensionAttributes();
-
-    /**
-     * Set an extension attributes object.
-     *
-     * @param \Magento\GraphQl\Model\ResolverContextExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\GraphQl\Model\ResolverContextExtensionInterface $extensionAttributes
-    );
-}
diff --git a/app/code/Magento/GraphQl/Model/ResolverFactory.php b/app/code/Magento/GraphQl/Model/ResolverFactory.php
deleted file mode 100644
index 9507452a4ed27..0000000000000
--- a/app/code/Magento/GraphQl/Model/ResolverFactory.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Create configured resolver class to resolve requested field data.
- */
-class ResolverFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var QueryConfig
-     */
-    private $config;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     * @param QueryConfig $config
-     */
-    public function __construct(ObjectManagerInterface $objectManager, QueryConfig $config)
-    {
-        $this->objectManager = $objectManager;
-        $this->config = $config;
-    }
-
-    /**
-     * Instantiate resolver class from class name
-     *
-     * @param string $resolverName
-     * @return ResolverInterface
-     * @throws GraphQlInputException
-     */
-    public function create($resolverName)
-    {
-        return $this->config->getResolverClass($resolverName);
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/ResolverInterface.php b/app/code/Magento/GraphQl/Model/ResolverInterface.php
deleted file mode 100644
index c6ea2d0e2a2e2..0000000000000
--- a/app/code/Magento/GraphQl/Model/ResolverInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-/**
- * Data retriever for field with arguments used in a GraphQL resolver when a query is processed
- */
-interface ResolverInterface
-{
-    /**
-     * Parse arguments of a field and convert them to an array structure
-     *
-     * @param \Magento\Framework\GraphQl\ArgumentInterface[] $args
-     * @param \Magento\GraphQl\Model\ResolverContextInterface $context
-     * @return array|null
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException|\Exception
-     */
-    public function resolve(array $args, \Magento\GraphQl\Model\ResolverContextInterface $context);
-}
diff --git a/app/code/Magento/GraphQl/Model/SchemaGenerator.php b/app/code/Magento/GraphQl/Model/SchemaGenerator.php
deleted file mode 100644
index d4c662c5e4d05..0000000000000
--- a/app/code/Magento/GraphQl/Model/SchemaGenerator.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-use GraphQl\Type\Definition\ResolveInfo;
-use Magento\Framework\GraphQl\Type\SchemaFactory;
-use Magento\GraphQl\Model\Type\Generator;
-use Magento\Framework\GraphQl\ArgumentFactory;
-use Magento\Framework\GraphQl\TypeFactory;
-
-/**
- * Generate a query field and concrete types for GraphQL schema
- */
-class SchemaGenerator implements SchemaGeneratorInterface
-{
-    /**
-     * @var Generator
-     */
-    private $typeGenerator;
-
-    /**
-     * @var ResolverFactory
-     */
-    private $resolverFactory;
-
-    /**
-     * @var ArgumentFactory
-     */
-    private $argumentFactory;
-
-    /**
-     * @var FieldConfig
-     */
-    private $fieldConfig;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @var SchemaFactory
-     */
-    private $schemaFactory;
-
-    /**
-     * @param Generator $typeGenerator
-     * @param ResolverFactory $resolverFactory
-     * @param ArgumentFactory $argumentFactory
-     * @param FieldConfig $fieldConfig
-     * @param TypeFactory $typeFactory
-     * @param SchemaFactory $schemaFactory
-     */
-    public function __construct(
-        Generator $typeGenerator,
-        ResolverFactory $resolverFactory,
-        ArgumentFactory $argumentFactory,
-        FieldConfig $fieldConfig,
-        TypeFactory $typeFactory,
-        SchemaFactory $schemaFactory
-    ) {
-        $this->typeGenerator = $typeGenerator;
-        $this->resolverFactory = $resolverFactory;
-        $this->argumentFactory = $argumentFactory;
-        $this->fieldConfig = $fieldConfig;
-        $this->typeFactory = $typeFactory;
-        $this->schemaFactory = $schemaFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     */
-    public function generate()
-    {
-        $schemaConfig = $this->typeGenerator->generateTypes('Query');
-
-        $config = $this->typeFactory->createObject([
-            'name' => 'Query',
-            'fields' => $schemaConfig['fields'],
-            'resolveField' => function ($value, $args, $context, ResolveInfo $info) {
-                $fieldName = $info->fieldName;
-                $fieldNodes = $info->fieldNodes;
-                $selections = [];
-//                foreach ($fieldNodes as $fieldNode) {
-//                    foreach ($fieldNode->selectionSet->selections as $field) {
-//                        $name = $field->name;
-//                        if (isset($field->selectionSet)) {
-//                            $selections[$name] = $this->getFields;
-//                        }
-//                        foreach ($field->selectionSet->selections as $selection) {
-//                            $selections[$name] = $selection->name;
-//                        }
-//                    }
-//                }
-                $resolver = $this->resolverFactory->create($fieldName);
-
-                $fieldArguments = [];
-                $declaredArguments = $this->fieldConfig->getFieldConfig($fieldName, $args);
-
-                foreach ($declaredArguments as $argumentName => $declaredArgument) {
-                    $argumentValue = isset($args[$argumentName])
-                        ? $args[$argumentName]
-                        : $declaredArgument->getDefaultValue();
-                    if ($declaredArgument->getValueParser() && $argumentValue !== null) {
-                        $argumentValue = $declaredArgument->getValueParser()->parse($argumentValue);
-                    }
-
-                    if ($argumentValue !== null) {
-                        $fieldArguments[$argumentName] = $this->argumentFactory->create(
-                            $argumentName,
-                            $argumentValue
-                        );
-                    }
-                }
-
-                return $resolver->resolve($fieldArguments, $context);
-            }
-        ]);
-        $schema = $this->schemaFactory->create(['query' => $config, 'types' => $schemaConfig['types']]);
-        return $schema;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/SchemaGeneratorInterface.php b/app/code/Magento/GraphQl/Model/SchemaGeneratorInterface.php
deleted file mode 100644
index 9eaac118982c8..0000000000000
--- a/app/code/Magento/GraphQl/Model/SchemaGeneratorInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model;
-
-/**
- * GraphQL schema generator interface.
- */
-interface SchemaGeneratorInterface
-{
-    /**
-     * Generate GraphQL schema.
-     *
-     * @return \Magento\Framework\GraphQl\Type\Schema
-     */
-    public function generate();
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/Generator.php b/app/code/Magento/GraphQl/Model/Type/Generator.php
deleted file mode 100644
index f60a56b93a26d..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/Generator.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-use Magento\GraphQl\Model\QueryConfig;
-
-/**
- * {@inheritdoc}
- */
-class Generator implements GeneratorInterface
-{
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var HandlerConfig
-     */
-    private $typeConfig;
-
-    /**
-     * @var QueryConfig
-     */
-    private $queryConfig;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @var HandlerFactory
-     */
-    private $handlerFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param HandlerConfig $typeConfig
-     * @param QueryConfig $queryConfig
-     * @param TypeFactory $typeFactory
-     * @param HandlerFactory $handlerFactory
-     */
-    public function __construct(
-        Pool $typePool,
-        HandlerConfig $typeConfig,
-        QueryConfig $queryConfig,
-        TypeFactory $typeFactory,
-        HandlerFactory $handlerFactory
-    ) {
-        $this->typePool = $typePool;
-        $this->typeConfig = $typeConfig;
-        $this->queryConfig = $queryConfig;
-        $this->typeFactory = $typeFactory;
-        $this->handlerFactory = $handlerFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function generateTypes(string $typeName)
-    {
-        $types = [];
-        /** @var string $handlerName */
-        foreach ($this->typeConfig->getTypes() as $typeName => $handlerName) {
-            $handler = $this->handlerFactory->create($handlerName);
-            $type = $handler->getType();
-            if (!$this->typePool->isTypeRegistered($typeName)) {
-                $this->typePool->registerType($type);
-                $types[] = $type;
-            } else {
-                $types[] = $this->typePool->getType($typeName);
-            }
-        }
-
-        $fields = [];
-        foreach ($this->queryConfig->getQueryFields() as $fieldName => $values) {
-            $arguments = [];
-            if (!isset($values['args'])) {
-                $values['args'] = [];
-            }
-            foreach ($values['args'] as $argName => $argType) {
-                // Replace '[]' with an 's' to express plurality
-                $realArgName = str_replace('!', '', str_replace('[]', 's', $argName));
-                $arguments[$realArgName] = ['type' => $this->decorateType($argName, $argType)];
-            }
-
-            $fields[$fieldName] = ['type' => $this->typePool->getType($values['type']), 'args' => $arguments];
-        }
-
-        return ['fields' => $fields, 'types' => $types];
-    }
-
-    /**
-     * Decorate type as non-null or as a list if formatted (with a '!' or '[]' appended, respectively)
-     *
-     * @param string $argumentName
-     * @param string $argumentType
-     * @return TypeInterface|\GraphQL\Type\Definition\Type
-     * @throws GraphQlInputException
-     */
-    private function decorateType(string $argumentName, string $argumentType)
-    {
-        $type = $this->typePool->getType($argumentType);
-        $type = strpos($argumentName, '[]') !== false ? $this->typeFactory->createList($type) : $type;
-        $type = strpos($argumentName, '!') !== false ? $this->typeFactory->createNonNull($type) : $type;
-
-        return $type;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/GeneratorInterface.php b/app/code/Magento/GraphQl/Model/Type/GeneratorInterface.php
deleted file mode 100644
index d3333bdfea4f3..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/GeneratorInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type;
-
-/**
- * Generate configured GraphQL type schema and top-level fields of base query object
- */
-interface GeneratorInterface
-{
-    /**
-     * Generate type definitions for all fields of given GraphQl query or mutation name
-     *
-     * @param string $typeName
-     * @return array Represented as ['fields' => ['fieldName' => Type, {...}], 'types' => Types[]]
-     */
-    public function generateTypes(string $typeName);
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/Pool.php b/app/code/Magento/GraphQl/Model/Type/Handler/Pool.php
deleted file mode 100644
index 4858d067a3cfc..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/Handler/Pool.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type\Handler;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-use Magento\GraphQl\Model\Type\Handler\Pool\Complex;
-use Magento\GraphQl\Model\Type\HandlerFactory;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\HandlerConfig;
-
-/**
- * Retrieve type's registered in pool, or generate types yet to be instantiated and register them
- */
-class Pool
-{
-    const TYPE_STRING = 'String';
-    const TYPE_INT = 'Int';
-    const TYPE_BOOLEAN = 'Boolean';
-    const TYPE_FLOAT = 'Float';
-    const TYPE_ID = 'ID';
-
-    /**
-     * @var HandlerFactory
-     */
-    private $typeHandlerFactory;
-
-    /**
-     * @var \Magento\Framework\GraphQl\TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @var HandlerConfig
-     */
-    private $typeConfig;
-
-    /**
-     * @var Complex
-     */
-    private $complexType;
-
-    /**
-     * @var TypeInterface[]
-     */
-    private $typeRegistry = [];
-
-    /**
-     * @param HandlerFactory $typeHandlerFactory
-     * @param \Magento\Framework\GraphQl\TypeFactory $typeFactory
-     * @param HandlerConfig $typeConfig
-     * @param Complex $complexType
-     */
-    public function __construct(
-        HandlerFactory $typeHandlerFactory,
-        TypeFactory $typeFactory,
-        HandlerConfig $typeConfig,
-        Complex $complexType
-    ) {
-        $this->typeHandlerFactory = $typeHandlerFactory;
-        $this->typeFactory = $typeFactory;
-        $this->typeConfig = $typeConfig;
-        $this->complexType = $complexType;
-    }
-
-    /**
-     * Get a type of @see TypeInterface or scalar native GraphQL
-     *
-     * @param string $typeName
-     * @return TypeInterface|\GraphQL\Type\Definition\Type
-     * @throws \LogicException
-     * @throws GraphQlInputException
-     */
-    public function getType(string $typeName)
-    {
-        if ($this->isTypeRegistered($typeName)) {
-            return $this->typeRegistry[$typeName];
-        }
-
-        if ($this->isScalar($typeName)) {
-            $this->typeRegistry[$typeName] = $this->typeFactory->createScalar($typeName);
-        } else {
-            $this->typeRegistry[$typeName] = $this->complexType->getComplexType($typeName);
-        }
-
-        return $this->typeRegistry[$typeName];
-    }
-
-    /**
-     * Register type to Pool's type registry.
-     *
-     * @param TypeInterface|\GraphQL\Type\Definition\Type $type
-     * @throws \LogicException
-     */
-    public function registerType(TypeInterface $type)
-    {
-        if (isset($this->typeRegistry[$type->name])) {
-            throw new \LogicException('Type name already exists in registry');
-        }
-        $this->typeRegistry[$type->name] = $type;
-    }
-
-    /**
-     * Check Pool's type registry and returns true if type has been previously generated
-     *
-     * @param string $typeName
-     * @return bool
-     */
-    public function isTypeRegistered(string $typeName)
-    {
-        return isset($this->typeRegistry[$typeName]);
-    }
-
-    /**
-     * If type is a scalar type
-     *
-     * @param string $typeName
-     * @return bool
-     */
-    private function isScalar(string $typeName)
-    {
-        $type = new \ReflectionClass(self::class);
-        $constants =  $type->getConstants();
-        if (in_array($typeName, $constants)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/Pool/Complex.php b/app/code/Magento/GraphQl/Model/Type/Handler/Pool/Complex.php
deleted file mode 100644
index 3c977bd93c52e..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/Handler/Pool/Complex.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type\Handler\Pool;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-use Magento\GraphQl\Model\Type\HandlerConfig;
-use Magento\GraphQl\Model\Type\HandlerFactory;
-
-/**
- * Retrieves complex type definitions from their handlers and registers them to the pool.
- */
-class Complex
-{
-    /**
-     * @var HandlerConfig
-     */
-    private $typeConfig;
-
-    /**
-     * @var HandlerFactory
-     */
-    private $typeHandlerFactory;
-
-    /**
-     * Retrieve type's configuration based off name
-     *
-     * @param string $typeName
-     * @return TypeInterface
-     * @throws \LogicException Type Handler could not be found, and type does not exist in registry
-     * @throws GraphQlInputException
-     */
-    public function getComplexType(string $typeName)
-    {
-        $typeHandlerName = $this->typeConfig->getHandlerNameForType($typeName);
-        $typeHandler = $this->typeHandlerFactory->create($typeHandlerName);
-
-        return $typeHandler->getType();
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SearchCriteriaExpression.php b/app/code/Magento/GraphQl/Model/Type/Handler/SearchCriteriaExpression.php
deleted file mode 100644
index 3fcfd31f114ab..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/Handler/SearchCriteriaExpression.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-
-/**
- * Define SearchCriteriaExpression GraphQL type
- */
-class SearchCriteriaExpression implements HandlerInterface
-{
-    const SEARCH_CRITERIA_EXPRESSION_TYPE_NAME = 'SearchCriteriaExpression';
-
-    /**
-     * @var Pool
-     */
-    private $pool;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $pool
-     * @param \Magento\Framework\GraphQl\TypeFactory $typeFactory
-     */
-    public function __construct(Pool $pool, TypeFactory $typeFactory)
-    {
-        $this->pool = $pool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createInputObject(
-            [
-                'name' => self::SEARCH_CRITERIA_EXPRESSION_TYPE_NAME,
-                'fields' => $this->getFields()
-            ]
-        );
-    }
-
-    /**
-     * Retrieve fields
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        $stringType = $this->pool->getType('String');
-        $stringListType = $this->typeFactory->createList($stringType);
-        
-        $fields = [
-            'eq' => $stringType,
-            'finset' => $stringListType,
-            'from' => $stringType,
-            'gt' => $stringType,
-            'gteq' => $stringType,
-            'in' => $stringListType,
-            'like' => $stringType,
-            'lt' => $stringType,
-            'lteq' => $stringType,
-            'moreq' => $stringType,
-            'neq' => $stringType,
-            'nin' => $stringListType,
-            'notnull' => $stringType,
-            'null' => $stringType,
-            'to' => $stringType,
-        ];
-
-        return $fields;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SearchResultPageInfo.php b/app/code/Magento/GraphQl/Model/Type/Handler/SearchResultPageInfo.php
deleted file mode 100644
index f2cadca319292..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/Handler/SearchResultPageInfo.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator;
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-
-/**
- * Define SearchResultPageInfo GraphQL type
- */
-class SearchResultPageInfo implements HandlerInterface
-{
-    const SEARCH_RESULT_PAGE_INFO_TYPE_NAME = 'SearchResultPageInfo';
-
-    /**
-     * @var Pool
-     */
-    private $pool;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $pool
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(Pool $pool, TypeFactory $typeFactory)
-    {
-        $this->pool = $pool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createObject(
-            [
-                'name' => self::SEARCH_RESULT_PAGE_INFO_TYPE_NAME,
-                'fields' => $this->getFields()
-            ]
-        );
-    }
-
-    /**
-     * Retrieve fields
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        $intType = $this->pool->getType('Int');
-        $result = [
-            'page_size' => $intType,
-            'current_page' => $intType
-        ];
-
-        return $result;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SortEnum.php b/app/code/Magento/GraphQl/Model/Type/Handler/SortEnum.php
deleted file mode 100644
index 882ffbd5c018f..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/Handler/SortEnum.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\Generator;
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-
-/**
- * Define SortEnum GraphQL Type
- */
-class SortEnum implements HandlerInterface
-{
-    const SORT_ENUM_TYPE_NAME = 'SortEnum';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var Generator
-     */
-    private $typeGenerator;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param Generator $typeGenerator
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(
-        Pool $typePool,
-        Generator $typeGenerator,
-        TypeFactory $typeFactory
-    ) {
-        $this->typePool = $typePool;
-        $this->typeGenerator = $typeGenerator;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createEnum(
-            [
-                'name' => self::SORT_ENUM_TYPE_NAME,
-                'values' => ['ASC', 'DESC'],
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/HandlerConfig.php b/app/code/Magento/GraphQl/Model/Type/HandlerConfig.php
deleted file mode 100644
index ac047c4d9981d..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/HandlerConfig.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-
-/**
- * Holds handler names for configured GraphQL types
- */
-class HandlerConfig
-{
-    /**
-     * @var string[]
-     */
-    private $handlers;
-
-    /**
-     * @param string[] $handlers
-     */
-    public function __construct(array $handlers = [])
-    {
-        $this->handlers = $handlers;
-    }
-
-    /**
-     * Return all configured [type name => handler name] pairs.
-     *
-     * @return string[]
-     */
-    public function getTypes()
-    {
-        return $this->handlers;
-    }
-
-    /**
-     * Return specific handler name for configured type name
-     *
-     * @param string $typeName
-     * @return string
-     * @throws GraphQlInputException
-     */
-    public function getHandlerNameForType(string $typeName)
-    {
-        if (!isset($this->handlers[$typeName])) {
-            throw new GraphQlInputException(__('The %1 type has not been defined or configured', $typeName));
-        }
-
-        return $this->handlers[$typeName];
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/HandlerFactory.php b/app/code/Magento/GraphQl/Model/Type/HandlerFactory.php
deleted file mode 100644
index 6d537edf05732..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/HandlerFactory.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Create type handler from its name
- */
-class HandlerFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(ObjectManagerInterface $objectManager)
-    {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Instantiate type handler class
-     *
-     * @param string $typeClassName
-     * @return HandlerInterface
-     * @throws \LogicException
-     */
-    public function create($typeClassName)
-    {
-        $typeHandlerClass = $this->objectManager->create($typeClassName);
-        if (!($typeHandlerClass instanceof HandlerInterface)) {
-            throw new \LogicException('Invalid type name. Type handler does not exist.');
-        }
-
-        return $typeHandlerClass;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/HandlerInterface.php b/app/code/Magento/GraphQl/Model/Type/HandlerInterface.php
deleted file mode 100644
index a715520ae5dca..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/HandlerInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type;
-
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-
-/**
- * Define a method for generating or retrieving a type for GraphQL
- */
-interface HandlerInterface
-{
-    /**
-     * Return GraphQL configuration of type.
-     *
-     * @return TypeInterface
-     * @throws \InvalidArgumentException No implementation found or type not implemented for interface with resolve type
-     */
-    public function getType();
-}
diff --git a/app/code/Magento/GraphQl/Model/Type/ServiceContract/TypeGenerator.php b/app/code/Magento/GraphQl/Model/Type/ServiceContract/TypeGenerator.php
deleted file mode 100644
index 35f791e57cc9b..0000000000000
--- a/app/code/Magento/GraphQl/Model/Type/ServiceContract/TypeGenerator.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Model\Type\ServiceContract;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Type\Definition\InterfaceType;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-use Magento\Framework\Reflection\TypeProcessor;
-use Magento\Webapi\Model\ServiceMetadata;
-use Magento\Framework\Api\SimpleDataObjectConverter;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-
-/**
- * Translate web API service contract layer from array-style schema to GraphQL types
- */
-class TypeGenerator
-{
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeProcessor
-     */
-    private $typeProcessor;
-
-    /**
-     * @var ServiceMetadata
-     */
-    private $metadata;
-
-    /**
-     * @var SimpleDataObjectConverter
-     */
-    private $simpleDataConverter;
-
-    /**
-     * @var \Magento\Framework\GraphQl\TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeProcessor $typeProcessor
-     * @param ServiceMetadata $metadata
-     * @param SimpleDataObjectConverter $simpleDataConverter
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(
-        Pool $typePool,
-        TypeProcessor $typeProcessor,
-        ServiceMetadata $metadata,
-        SimpleDataObjectConverter $simpleDataConverter,
-        TypeFactory $typeFactory
-    ) {
-        $this->typePool = $typePool;
-        $this->typeProcessor = $typeProcessor;
-        $metadata->getServicesConfig();
-        $this->metadata = $metadata;
-        $this->simpleDataConverter = $simpleDataConverter;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * Convert service contract data schema array to ObjectType
-     *
-     * Format of input array should be [
-     *     'NameOfType' => [
-     *         'scalar_field_name' => 'scalarTypeString',
-     *         'complex_type_name' => [...]
-     *     ]
-     * ]
-     *
-     * @param string $typeName
-     * @param array $schema
-     * @return TypeInterface|\GraphQL\Type\Definition\Type
-     */
-    public function generate(
-        string $typeName,
-        array $schema
-    ) {
-        if ($this->typePool->isTypeRegistered($typeName)) {
-            return $this->typePool->getType($typeName);
-        }
-
-        return $this->generateNestedTypes($typeName, $schema);
-    }
-
-    /**
-     * Get service contract type data from associative service contract name
-     *
-     * @param string $type
-     * @return array
-     * @throws \LogicException
-     */
-    public function getTypeData(string $type)
-    {
-        $typesData = $this->typeProcessor->getTypeData($type);
-
-        $result = [];
-        if (isset($typesData['parameters'])) {
-            foreach ($typesData['parameters'] as $attributeCode => $parameter) {
-                $snakeAttributeCode = $this->simpleDataConverter->camelCaseToSnakeCase(
-                    $attributeCode
-                );
-
-                if ($snakeAttributeCode == 'custom_attributes') {
-                    continue;
-                }
-
-                if ($this->typeProcessor->isTypeAny($parameter['type'])) {
-                    throw new \LogicException("Mixed type detected");
-                } elseif ($this->typeProcessor->isArrayType($parameter['type'])) {
-                    $arrayItemType = $this->typeProcessor->getArrayItemType($parameter['type']);
-                    if ($this->typeProcessor->isTypeSimple($arrayItemType)) {
-                        $result[$snakeAttributeCode][] = $arrayItemType;
-                    } else {
-                        $result[$snakeAttributeCode][] = $this->getTypeData($arrayItemType);
-                    }
-                } elseif ($this->typeProcessor->isTypeSimple($parameter['type'])) {
-                    $result[$snakeAttributeCode] = $parameter['type'];
-                } else {
-                    if ($snakeAttributeCode == 'extension_attributes') {
-                        $extensionAttributes = $this->getTypeData($parameter['type']);
-                        $result = array_merge($result, $extensionAttributes);
-                    } else {
-                        $result[$snakeAttributeCode] = $this->getTypeData($parameter['type']);
-                    }
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Iterate through array-style schema gathered from Service Contract metadata to translate to GraphQL types
-     *
-     * @param string $typeName
-     * @param array $schema
-     * @param bool $skipField
-     * @param string|null $parentField
-     * @return InterfaceType|\GraphQL\Type\Definition\Type|mixed|null
-     * @throws GraphQlInputException
-     */
-    private function generateNestedTypes(
-        string $typeName,
-        array $schema,
-        bool $skipField = false,
-        string $parentField = null
-    ) {
-        if (!$skipField) {
-            $generatedType = ['name' => $typeName];
-        }
-        $generatedFields = [];
-        $callableFields = [];
-
-        foreach ($schema as $field => $type) {
-            if (is_array($type)) {
-                $isAssociativeArray = $this->isAssociativeArray($type);
-                if ($isAssociativeArray) {
-                    $parentField = ucfirst($this->underscoreToCamelCase($parentField));
-                    $subTypeName = $parentField ?: ucfirst($this->underscoreToCamelCase($field));
-                    $generatedTypeName = $typeName . $subTypeName;
-                    if ($this->typePool->isTypeRegistered($generatedTypeName)) {
-                        return $this->typePool->getType($generatedTypeName);
-                    }
-                    $generated = $this->generateNestedTypes($generatedTypeName, $type);
-                    $this->typePool->registerType($generated);
-                    $generatedFields[$field] = ['type' => $generated];
-                } else {
-                    $convertedField = $this->generateNestedTypes(
-                        $typeName,
-                        $type,
-                        !$isAssociativeArray,
-                        $field
-                    );
-                    $generatedFields[$field] = ['type' => $this->typeFactory->createList($convertedField)];
-                }
-            } else {
-                if (strpos($typeName, $type) !== false) {
-                    $callableFields[$field] = $type;
-                    continue;
-                }
-                $generated = $this->typePool->getType(ucfirst($type));
-                $generatedFields[$field] = ['type' => $generated];
-            }
-            if ($skipField) {
-                return $generated;
-            }
-        }
-        $generatedType['fields'] = $this->processGeneratedFields($generatedFields, $callableFields);
-
-        return $this->typeFactory->createObject($generatedType);
-    }
-
-    /**
-     * Check if array is associative
-     *
-     * @param $arr
-     * @return bool
-     */
-    private function isAssociativeArray($arr)
-    {
-        return array_keys($arr) !== range(0, count($arr) - 1);
-    }
-
-    /**
-     * Transform string from underscore to camelcase
-     *
-     * @param string $value
-     * @return string
-     */
-    private function underscoreToCamelCase($value)
-    {
-        return lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $value))));
-    }
-
-    /**
-     * @param array $generatedFields
-     * @param string[] $callableFields
-     * @return array|\Closure
-     */
-    private function processGeneratedFields($generatedFields, $callableFields)
-    {
-        if (empty($callableFields)) {
-            return $generatedFields;
-        } else {
-            return function () use ($generatedFields, $callableFields) {
-                foreach ($callableFields as $name => $type) {
-                    $callableFields[$name] = $this->typePool->getType($type);
-                }
-
-                return array_merge($callableFields, $generatedFields);
-            };
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQl/Test/Mftf/README.md b/app/code/Magento/GraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..34fee7717fd31
--- /dev/null
+++ b/app/code/Magento/GraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Graph Ql** module.
diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
index dedf0f1399233..3e821b0909444 100644
--- a/app/code/Magento/GraphQl/composer.json
+++ b/app/code/Magento/GraphQl/composer.json
@@ -2,13 +2,15 @@
     "name": "magento/module-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "version": "100.0.0-dev",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-webapi": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-authorization": "*",
+        "magento/module-store": "*",
+        "magento/module-eav": "*",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-webapi": "*"
     },
     "license": [
         "OSL-3.0",
diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
index 324da2eb5a403..b2083ea758e56 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -6,10 +6,11 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\GraphQl\Model\SchemaGeneratorInterface" type="Magento\GraphQl\Model\SchemaGenerator" />
-    <preference for="Magento\GraphQl\Model\Type\GeneratorInterface" type="Magento\GraphQl\Model\Type\Generator" />
-    <preference for="Magento\Framework\GraphQl\ArgumentInterface" type="Magento\Framework\GraphQl\Argument" />
-    <preference for="Magento\GraphQl\Model\ResolverContextInterface" type="Magento\GraphQl\Model\ResolverContext" />
+    <preference for="Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface" type="Magento\Framework\GraphQl\Schema\SchemaGenerator" />
+    <preference for="Magento\Framework\GraphQl\Query\Resolver\ContextInterface" type="Magento\GraphQl\Model\Query\Resolver\Context" />
+    <preference for="Magento\Framework\GraphQl\Schema\Type\Entity\MapperInterface" type="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper"/>
+    <preference for="Magento\Framework\GraphQl\Schema\Type\Enum\DataMapperInterface" type="Magento\Framework\GraphQl\Schema\Type\Enum\DefaultDataMapper"/>
+    <preference for="Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface" type="Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite"/>
     <type name="Magento\Framework\App\AreaList">
         <arguments>
             <argument name="areas" xsi:type="array">
@@ -19,4 +20,87 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\Framework\GraphQl\ConfigInterface" type="Magento\Framework\GraphQl\Config"/>
+    <preference for="Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface" type="Magento\Framework\GraphQl\Config\ConfigElementFactory"/>
+    <type name="Magento\Framework\GraphQl\Config\ConfigElementFactory">
+        <arguments>
+            <argument name="factoryMapByConfigElementType" xsi:type="array">
+                <item name="graphql_interface" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InterfaceFactory</item>
+                <item name="graphql_type" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
+                <item name="graphql_input" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
+                <item name="graphql_enum" xsi:type="object">Magento\Framework\GraphQl\Config\Element\EnumFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Config">
+        <arguments>
+            <argument name="data" xsi:type="object">Magento\Framework\GraphQl\Config\Data</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\GraphQl\Config\Data" type="Magento\Framework\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\Reader</argument>
+            <argument name="cacheId" xsi:type="string">Magento_Framework_GraphQlSchemaStitching_Config_Data</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Framework\GraphQl\Config\SchemaLocator" type="Magento\Framework\Config\SchemaLocator">
+        <arguments>
+            <argument name="realPath" xsi:type="string">urn:magento:module:Magento_GraphQl:etc/graphql.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Framework\GraphQlSchemaStitching\Reader" type="Magento\Framework\GraphQlSchemaStitching\Common\Reader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="graphql_reader" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Output\OutputFactory">
+        <arguments>
+            <argument name="prototypes" xsi:type="array">
+                <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputTypeObject</item>
+                <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputInterfaceObject</item>
+                <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Input\InputFactory">
+        <arguments>
+            <argument name="prototypes" xsi:type="array">
+                <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
+                <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
+                <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper">
+        <arguments>
+            <argument name="formatter" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterComposite</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterComposite">
+        <arguments>
+            <argument name="formatters" xsi:type="array">
+                <item name="fields" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Fields</item>
+                <item name="interfaces" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Interfaces</item>
+                <item name="resolveType" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\ResolveType</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite">
+        <arguments>
+            <argument name="typeReaders" xsi:type="array">
+                <item name="enum_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\EnumType</item>
+                <item name="object_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\ObjectType</item>
+                <item name="input_object_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InputObjectType</item>
+                <item name="interface_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InterfaceType</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Query\QueryComplexityLimiter">
+        <arguments>
+            <argument name="queryDepth" xsi:type="number">20</argument>
+            <argument name="queryComplexity" xsi:type="number">300</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index 1b80f38fd4daf..f4e6ca59364b2 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -7,15 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Framework\App\FrontControllerInterface" type="Magento\GraphQl\Controller\GraphQl" />
-    <type name="Magento\GraphQl\Model\Type\HandlerConfig">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="SearchCriteriaExpression" xsi:type="string">Magento\GraphQl\Model\Type\Handler\SearchCriteriaExpression</item>
-                <item name="SearchResultPageInfo" xsi:type="string">Magento\GraphQl\Model\Type\Handler\SearchResultPageInfo</item>
-                <item name="SortEnum" xsi:type="string">Magento\GraphQl\Model\Type\Handler\SortEnum</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Authorization\Model\CompositeUserContext">
         <arguments>
             <argument name="userContexts" xsi:type="array">
@@ -34,4 +25,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\GraphQl\Controller\HttpRequestProcessor">
+        <arguments>
+            <argument name="graphQlHeaders" xsi:type="array">
+                <item name="Content-Type" xsi:type="object">Magento\GraphQl\Controller\HttpHeaderProcessor\ContentTypeProcessor</item>
+                <item name="Store" xsi:type="object">Magento\GraphQl\Controller\HttpHeaderProcessor\StoreProcessor</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GraphQl/etc/module.xml b/app/code/Magento/GraphQl/etc/module.xml
index fc3376bd01256..4d8b2090a8514 100644
--- a/app/code/Magento/GraphQl/etc/module.xml
+++ b/app/code/Magento/GraphQl/etc/module.xml
@@ -6,9 +6,11 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GraphQl" setup_version="2.0.0">
+    <module name="Magento_GraphQl" >
         <sequence>
-            <module name="Magento_Webapi"/>
+            <module name="Magento_Authorization"/>
+            <module name="Magento_Store"/>
+            <module name="Magento_Eav"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..2281495d059e1
--- /dev/null
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -0,0 +1,42 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+}
+
+type Mutation {
+    placeholderMutation: String @doc(description: "Mutation type cannot be declared without fields. The placeholder will be removed when at least one mutation field is declared.")
+}
+
+input FilterTypeInput @doc(description: "FilterTypeInput specifies which action will be performed in a query ") {
+    eq: String @doc(description: "Equals")
+    finset: [String] @doc(description: "Find in set. The value can contain a set of comma-separated values")
+    from: String @doc(description: "From. Must be used with 'to'")
+    gt: String @doc(description: "Greater than")
+    gteq: String @doc(description: "Greater than or equal to")
+    in: [String] @doc(description: "In. The value can contain a set of comma-separated values")
+    like: String @doc(description: "Like. The specified value can contain % (percent signs) to allow matching of 0 or more characters")
+    lt: String @doc(description: "Less than")
+    lteq: String @doc(description: "Less than or equal to")
+    moreq: String @doc(description: "More than or equal to")
+    neq: String @doc(description: "Not equal to")
+    notnull: String @doc(description: "Not null")
+    null: String @doc(description: "Is null")
+    to: String@doc(description: "To. Must be used with 'from'")
+    nin: [String] @doc(description: "Not in. The value can contain a set of comma-separated values")
+}
+
+type SearchResultPageInfo @doc(description: "SearchResultPageInfo provides navigation for the query response") {
+    page_size: Int @doc(description: "Specifies the maximum number of items to return")
+    current_page: Int @doc(description: "Specifies which page of results to return")
+    total_pages: Int @doc(description: "Total pages")
+}
+
+enum SortEnum @doc(description: "This enumeration indicates whether to return results in ascending or descending order") {
+    ASC
+    DESC
+}
+
+type ComplexTextValue {
+    html: String! @doc(description: "HTML format")
+}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products.php
deleted file mode 100644
index 2c7aa030cc7c6..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver;
-
-use Magento\Framework\Api\Search\SearchCriteriaInterfaceFactory;
-use Magento\GraphQl\Model\ResolverContextInterface;
-use Magento\GraphQl\Model\ResolverInterface;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\Builder;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\GraphQl\Model\ContextInterface;
-use Magento\GraphQlCatalog\Model\Resolver\Products\Query\Filter;
-use Magento\GraphQlCatalog\Model\Resolver\Products\Query\Search;
-
-/**
- * Products field resolver, used for GraphQL request processing.
- */
-class Products implements ResolverInterface
-{
-    /**
-     * @var Builder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var Search
-     */
-    private $searchQuery;
-
-    /**
-     * @var Filter
-     */
-    private $filterQuery;
-
-    /**
-     * @param Builder $searchCriteriaBuilder
-     * @param Search $searchQuery
-     * @param Filter $filterQuery
-     */
-    public function __construct(
-        Builder $searchCriteriaBuilder,
-        Search $searchQuery,
-        Filter $filterQuery
-    ) {
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->searchQuery = $searchQuery;
-        $this->filterQuery = $filterQuery;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function resolve(array $args, ResolverContextInterface $context)
-    {
-        $searchCriteria = $this->searchCriteriaBuilder->build($args);
-
-        if (isset($args['search'])) {
-            $searchResult = $this->searchQuery->getResult($searchCriteria);
-        } else {
-            $searchResult = $this->filterQuery->getResult($searchCriteria);
-        }
-
-        $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
-        if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
-            throw new GraphQlInputException(
-                __(
-                    'The value specified in the currentPage attribute is greater than the number'
-                    . ' of pages available (%1).',
-                    [$maxPages]
-                )
-            );
-        }
-
-        return [
-            'total_count' => $searchResult->getTotalCount(),
-            'items' => $searchResult->getProductsSearchResult(),
-            'page_info' => [
-                'page_size' => $searchCriteria->getPageSize(),
-                'current_page' => $searchCriteria->getCurrentPage()
-            ]
-        ];
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product.php
deleted file mode 100644
index be743f6d22f64..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider;
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product\Option;
-use Magento\Catalog\Model\Product\TierPrice;
-use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Data\SearchResultInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Webapi\ServiceOutputProcessor;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
-use Magento\GraphQl\Model\EntityAttributeList;
-
-/**
- * Product field data provider, used for GraphQL resolver processing.
- */
-class Product
-{
-    /**
-     * @var CollectionFactory
-     */
-    private $collectionFactory;
-
-    /**
-     * @var JoinProcessorInterface
-     */
-    private $joinProcessor;
-
-    /**
-     * @var CollectionProcessorInterface
-     */
-    private $collectionProcessor;
-
-    /**
-     * @var ProductSearchResultsInterfaceFactory
-     */
-    private $searchResultsFactory;
-
-    /**
-     * @param CollectionFactory $collectionFactory
-     * @param JoinProcessorInterface $joinProcessor
-     * @param CollectionProcessorInterface $collectionProcessor
-     * @param ProductSearchResultsInterfaceFactory $searchResultsFactory
-     */
-    public function __construct(
-        CollectionFactory $collectionFactory,
-        JoinProcessorInterface $joinProcessor,
-        CollectionProcessorInterface $collectionProcessor,
-        ProductSearchResultsInterfaceFactory $searchResultsFactory
-    ) {
-        $this->collectionFactory = $collectionFactory;
-        $this->joinProcessor = $joinProcessor;
-        $this->collectionProcessor = $collectionProcessor;
-        $this->searchResultsFactory = $searchResultsFactory;
-    }
-
-    /**
-     * Gets list of product data with full data set
-     *
-     * @param SearchCriteriaInterface $searchCriteria
-     * @return SearchResultInterface
-     */
-    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
-    {
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
-        $collection = $this->collectionFactory->create();
-        $this->joinProcessor->process($collection);
-
-        $collection->addAttributeToSelect('*');
-        $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
-        $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
-
-        $this->collectionProcessor->process($searchCriteria, $collection);
-
-        $collection->load();
-
-        $collection->addCategoryIds();
-        $collection->addFinalPrice();
-        $collection->addMediaGalleryData();
-        $collection->addMinimalPrice();
-        $collection->addPriceData();
-        $collection->addWebsiteNamesToResult();
-        $collection->addOptionsToResult();
-        $collection->addTaxPercents();
-        $collection->addWebsiteNamesToResult();
-        $searchResult = $this->searchResultsFactory->create();
-        $searchResult->setSearchCriteria($searchCriteria);
-        $searchResult->setItems($collection->getItems());
-        $searchResult->setTotalCount($collection->getSize());
-
-        return $searchResult;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter.php
deleted file mode 100644
index 6b3f7c3c9cf9b..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product;
-
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Option;
-use Magento\Catalog\Model\Product\TierPrice;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\MediaGalleryEntries;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\Options;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\TierPrices;
-
-class Formatter
-{
-    /**
-     * @var MediaGalleryEntries
-     */
-    private $mediaGalleryEntriesFormatter;
-
-    /**
-     * @var Options
-     */
-    private $optionsFormatter;
-
-    /**
-     * @var TierPrices
-     */
-    private $tierPricesFormatter;
-
-    /**
-     * @param MediaGalleryEntries $mediaGalleryEntriesFormatter
-     * @param Options $optionsFormatter
-     * @param TierPrices $tierPricesFormatter
-     */
-    public function __construct(
-        MediaGalleryEntries $mediaGalleryEntriesFormatter,
-        Options $optionsFormatter,
-        TierPrices $tierPricesFormatter
-    ) {
-        $this->mediaGalleryEntriesFormatter = $mediaGalleryEntriesFormatter;
-        $this->optionsFormatter = $optionsFormatter;
-        $this->tierPricesFormatter = $tierPricesFormatter;
-    }
-
-    /**
-     * Format single product data from object to an array
-     *
-     * @param Product $product
-     * @return array
-     */
-    public function format(Product $product)
-    {
-        $productData = $product->getData();
-        $productData['id'] = $product->getId();
-        unset($productData['entity_id']);
-
-        $productData = $this->mediaGalleryEntriesFormatter->format($product, $productData);
-        $productData = $this->optionsFormatter->format($productData);
-        $productData = $this->tierPricesFormatter->format($product, $productData);
-
-        return $productData;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/MediaGalleryEntries.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/MediaGalleryEntries.php
deleted file mode 100644
index cb744841f6a6e..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/MediaGalleryEntries.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
-
-use Magento\Catalog\Model\Product;
-
-/**
- * Format a product's media gallery information to conform to GraphQL schema representation
- */
-class MediaGalleryEntries
-{
-    /**
-     * Format product's media gallery entry data to conform to GraphQL schema
-     *
-     * @param Product $product
-     * @param array $productData
-     * @return array
-     */
-    public function format(Product $product, array $productData)
-    {
-        $productData['media_gallery_entries'] = $product->getMediaGalleryEntries();
-        if (isset($productData['media_gallery_entries'])) {
-            foreach ($productData['media_gallery_entries'] as $key => $entry) {
-                if ($entry->getExtensionAttributes() && $entry->getExtensionAttributes()->getVideoContent()) {
-                    $productData['media_gallery_entries'][$key]['video_content']
-                        = $entry->getExtensionAttributes()->getVideoContent()->getData();
-                }
-            }
-        }
-
-        return $productData;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/Options.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/Options.php
deleted file mode 100644
index fd08683a87e37..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/Options.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
-
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Option;
-
-/**
- * Format a product's option information to conform to GraphQL schema representation
- */
-class Options
-{
-    /**
-     * Format product's option data to conform to GraphQL schema
-     *
-     * @param array $productData
-     * @return array
-     */
-    public function format(array $productData)
-    {
-        if (isset($productData['options'])) {
-            /** @var Option $option */
-            foreach ($productData['options'] as $key => $option) {
-                $productData['options'][$key] = $option->getData();
-                $productData['options'][$key]['product_sku'] = $option->getProductSku();
-                $values = $option->getValues() ?: [];
-                /** @var Option\Value $value */
-                foreach ($values as $value) {
-                    $productData['options'][$key]['values'][] = $value->getData();
-                }
-            }
-        }
-
-        return $productData;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/TierPrices.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/TierPrices.php
deleted file mode 100644
index 4fc0373e94219..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/TierPrices.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
-
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\TierPrice;
-
-/**
- * Format a product's tier price information to conform to GraphQL schema representation
- */
-class TierPrices
-{
-    /**
-     * Format product's tier price data to conform to GraphQL schema
-     *
-     * @param Product $product
-     * @param array $productData
-     * @return array
-     */
-    public function format(Product $product, array $productData)
-    {
-        $tierPrices = $product->getTierPrices();
-        if ($tierPrices) {
-            /** @var TierPrice $tierPrice */
-            foreach ($tierPrices as $tierPrice) {
-                $productData['tier_prices'][] = $tierPrice->getData();
-            }
-        } else {
-            $productData['tier_prices'] = null;
-        }
-
-        return $productData;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/FilterArgument/AstConverter.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/FilterArgument/AstConverter.php
deleted file mode 100644
index ee0e019592d75..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/FilterArgument/AstConverter.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\FilterArgument;
-
-use Magento\GraphQl\Model\EntityAttributeList;
-use Magento\Framework\GraphQl\Argument\Filter\Clause\ReferenceTypeFactory;
-use Magento\Framework\GraphQl\Argument\Filter\Clause\ReferenceType;
-use Magento\Framework\GraphQl\Argument\Filter\ClauseFactory;
-use Magento\Framework\GraphQl\Argument\Filter\ConnectiveFactory;
-use Magento\Framework\GraphQl\Argument\Filter\Connective;
-use Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator;
-
-/**
- * Converts the input value for "find" to a @see Connective format
- */
-class AstConverter
-{
-    /**
-     * @var ClauseFactory
-     */
-    private $clauseFactory;
-
-    /**
-     * @var ConnectiveFactory
-     */
-    private $connectiveFactory;
-
-    /**
-     * @var ReferenceTypeFactory
-     */
-    private $referenceTypeFactory;
-
-    /**
-     * @var \Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator
-     */
-    private $typeGenerator;
-
-    /**
-     * @var EntityAttributeList
-     */
-    private $entityAttributeList;
-
-    /**
-     * @param ClauseFactory $clauseFactory
-     * @param ConnectiveFactory $connectiveFactory
-     * @param ReferenceTypeFactory $referenceTypeFactory
-     * @param \Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator $typeGenerator
-     * @param EntityAttributeList $entityAttributeList
-     */
-    public function __construct(
-        ClauseFactory $clauseFactory,
-        ConnectiveFactory $connectiveFactory,
-        ReferenceTypeFactory $referenceTypeFactory,
-        TypeGenerator $typeGenerator,
-        EntityAttributeList $entityAttributeList
-    ) {
-        $this->clauseFactory = $clauseFactory;
-        $this->connectiveFactory = $connectiveFactory;
-        $this->referenceTypeFactory = $referenceTypeFactory;
-        $this->typeGenerator = $typeGenerator;
-        $this->entityAttributeList = $entityAttributeList;
-    }
-
-    /**
-     * Get a clause from an AST
-     *
-     * @param ReferenceType $referenceType
-     * @param array $arguments
-     * @return array
-     */
-    private function getClausesFromAst(ReferenceType $referenceType, array $arguments)
-    {
-        $entityInfo = ['attributes' => $this->getCatalogProductFields()];
-        $attributes = array_keys($entityInfo['attributes']);
-        $conditions = [];
-        foreach ($arguments as $argumentName => $argument) {
-            if (in_array($argumentName, $attributes)) {
-                foreach ($argument as $clauseType => $clause) {
-                    if (is_array($clause)) {
-                        $value = [];
-                        foreach ($clause as $item) {
-                            $value[] = $item;
-                        }
-                    } else {
-                        $value = $clause;
-                    }
-                    $conditions[] = $this->clauseFactory->create(
-                        $referenceType,
-                        $argumentName,
-                        $clauseType,
-                        $value
-                    );
-                }
-            } else {
-                $conditions[] =
-                    $this->connectiveFactory->create(
-                        $this->getClausesFromAst($referenceType, $argument),
-                        $argumentName
-                    );
-            }
-        }
-        return $conditions;
-    }
-
-    /**
-     * Get the fields from catalog product
-     *
-     * @return array
-     */
-    private function getCatalogProductFields()
-    {
-        $result = [];
-        $attributes = $this->entityAttributeList->getDefaultEntityAttributes(\Magento\Catalog\Model\Product::ENTITY);
-        foreach ($attributes as $attribute) {
-            if ((!$attribute->getIsUserDefined()) && !is_array($attribute)) {
-                $result[$attribute->getAttributeCode()] = 'String';
-            }
-        }
-
-        $staticAttributes = $this->typeGenerator->getTypeData('CatalogDataProductInterface');
-        foreach ($staticAttributes as $attributeKey => $attribute) {
-            if (is_array($attribute)) {
-                unset($staticAttributes[$attributeKey]);
-            } else {
-                $staticAttributes[$attributeKey] = 'String';
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Get a connective filter from an AST input
-     *
-     * @param string $entityType
-     * @param array $arguments
-     * @return Connective
-     */
-    public function getFilterFromAst(string $entityType, $arguments)
-    {
-        $filters =  $this->getClausesFromAst(
-            $this->referenceTypeFactory->create($entityType),
-            $arguments
-        );
-        return $this->connectiveFactory->create($filters);
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/FilterArgument/ValueParser.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/FilterArgument/ValueParser.php
deleted file mode 100644
index f51a4349350c7..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/FilterArgument/ValueParser.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\FilterArgument;
-
-use Magento\Framework\GraphQl\Argument\Filter\FilterArgumentValueFactory;
-use Magento\Framework\GraphQl\Argument\ValueParserInterface;
-
-/**
- * Parses a mixed value to a FindArgumentValue
- */
-class ValueParser implements ValueParserInterface
-{
-    /** @var AstConverter */
-    private $clauseConverter;
-
-    /** @var FilterArgumentValueFactory */
-    private $filterArgumentValueFactory;
-
-    /**
-     * @param AstConverter $clauseConverter
-     * @param FilterArgumentValueFactory $filterArgumentValueFactory
-     */
-    public function __construct(
-        AstConverter $clauseConverter,
-        FilterArgumentValueFactory $filterArgumentValueFactory
-    ) {
-        $this->clauseConverter = $clauseConverter;
-        $this->filterArgumentValueFactory = $filterArgumentValueFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parse($value)
-    {
-        $filters = $this->clauseConverter->getFilterFromAst(\Magento\Catalog\Model\Product::ENTITY, $value);
-        return $this->filterArgumentValueFactory->create($filters);
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/Filter.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/Filter.php
deleted file mode 100644
index d7ff2397322a9..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/Filter.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\Query;
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product;
-use Magento\GraphQlCatalog\Model\Resolver\Products\SearchResult;
-use Magento\GraphQlCatalog\Model\Resolver\Products\SearchResultFactory;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
-
-/**
- * Retrieve filtered product data based off given search criteria in a format that GraphQL can interpret.
- */
-class Filter
-{
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
-    /**
-     * @var SearchResultFactory
-     */
-    private $searchResultFactory;
-
-    /**
-     * @var Product
-     */
-    private $productDataProvider;
-
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var Formatter
-     */
-    private $formatter;
-
-    /**
-     * @var PostFetchProcessorInterface[]
-     */
-    private $postProcessors;
-
-    /**
-     * @param ProductRepositoryInterface $productRepository
-     * @param SearchResultFactory $searchResultFactory
-     * @param Product $productDataProvider
-     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param Formatter $formatter
-     * @param PostFetchProcessorInterface[] $postProcessors
-     */
-    public function __construct(
-        ProductRepositoryInterface $productRepository,
-        SearchResultFactory $searchResultFactory,
-        Product $productDataProvider,
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        Formatter $formatter,
-        array $postProcessors
-    ) {
-        $this->productRepository = $productRepository;
-        $this->searchResultFactory = $searchResultFactory;
-        $this->productDataProvider = $productDataProvider;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->postProcessors = $postProcessors;
-        $this->formatter = $formatter;
-    }
-
-    /**
-     * Filter catalog product data based off given search criteria
-     *
-     * @param SearchCriteriaInterface $searchCriteria
-     * @return SearchResult
-     */
-    public function getResult(SearchCriteriaInterface $searchCriteria)
-    {
-        $realPageSize = $searchCriteria->getPageSize();
-        $realCurrentPage = $searchCriteria->getCurrentPage();
-        // Current page must be set to 0 and page size to max for search to grab all ID's as temporary workaround for
-        // inaccurate search
-        $searchCriteria->setPageSize(PHP_INT_MAX);
-        $searchCriteria->setCurrentPage(1);
-        $products = $this->productDataProvider->getList($searchCriteria);
-        $productArray = [];
-        $searchCriteria->setPageSize($realPageSize);
-        $searchCriteria->setCurrentPage($realCurrentPage);
-        $paginatedProducts = $this->paginateList($products->getItems(), $searchCriteria);
-        /** @var \Magento\Catalog\Model\Product $product */
-        foreach ($paginatedProducts as $product) {
-            $productArray[] = $this->formatter->format($product);
-        }
-
-        foreach ($this->postProcessors as $postProcessor) {
-            $productArray = $postProcessor->process($productArray);
-        }
-
-        return $this->searchResultFactory->create($products->getTotalCount(), $productArray);
-    }
-
-    /**
-     * Paginates array of Ids pulled back in search based off search criteria and total count.
-     *
-     * @param array $ids
-     * @param SearchCriteriaInterface $searchCriteria
-     * @return int[]
-     */
-    private function paginateList(array $ids, SearchCriteriaInterface $searchCriteria)
-    {
-        $length = $searchCriteria->getPageSize();
-        // Search starts pages from 0
-        $offset = $length * ($searchCriteria->getCurrentPage() - 1);
-        return array_slice($ids, $offset, $length);
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/PostFetchProcessorInterface.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/PostFetchProcessorInterface.php
deleted file mode 100644
index 7b7070dcf1c96..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/PostFetchProcessorInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\Query;
-
-/**
- * Processor or processors to re-format and add additional data outside of the scope of the query's fetch.
- */
-interface PostFetchProcessorInterface
-{
-    /**
-     * Process data by formatting and add any necessary additional attributes.
-     *
-     * @param array $productData
-     * @return array
-     */
-    public function process(array $productData);
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/Search.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/Search.php
deleted file mode 100644
index 0e740a8d67cf9..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/Query/Search.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\Query;
-
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\GraphQlCatalog\Model\Resolver\Products\SearchCriteria\Helper\Filter as FilterHelper;
-use Magento\GraphQlCatalog\Model\Resolver\Products\SearchResult;
-use Magento\GraphQlCatalog\Model\Resolver\Products\SearchResultFactory;
-use Magento\Search\Api\SearchInterface;
-
-/**
- * Full text search for catalog using given search criteria.
- */
-class Search
-{
-    /**
-     * @var SearchInterface
-     */
-    private $search;
-
-    /**
-     * @var FilterHelper
-     */
-    private $filterHelper;
-
-    /**
-     * @var Filter
-     */
-    private $filterQuery;
-
-    /**
-     * @var SearchResultFactory
-     */
-    private $searchResultFactory;
-
-    /**
-     * @param SearchInterface $search
-     * @param FilterHelper $filterHelper
-     * @param Filter $filterQuery
-     * @param SearchResultFactory $searchResultFactory
-     */
-    public function __construct(
-        SearchInterface $search,
-        FilterHelper $filterHelper,
-        Filter $filterQuery,
-        SearchResultFactory $searchResultFactory
-    ) {
-        $this->search = $search;
-        $this->filterHelper = $filterHelper;
-        $this->filterQuery = $filterQuery;
-        $this->searchResultFactory = $searchResultFactory;
-    }
-
-    /**
-     * Return results of full text catalog search of given term, and will return filtered results if filter is specified
-     *
-     * @param SearchCriteriaInterface $searchCriteria
-     * @return SearchResult
-     */
-    public function getResult(SearchCriteriaInterface $searchCriteria)
-    {
-        $realPageSize = $searchCriteria->getPageSize();
-        $realCurrentPage = $searchCriteria->getCurrentPage();
-        // Current page must be set to 0 and page size to max for search to grab all ID's as temporary workaround
-        // for MAGETWO-85611
-        $searchCriteria->setPageSize(PHP_INT_MAX);
-        $searchCriteria->setCurrentPage(0);
-        $itemsResults = $this->search->search($searchCriteria);
-
-        $ids = [];
-        $searchIds = [];
-        foreach ($itemsResults->getItems() as $item) {
-            $ids[$item->getId()] = null;
-            $searchIds[] = $item->getId();
-        }
-        $searchCriteria->setPageSize($realPageSize);
-        $searchCriteria->setCurrentPage($realCurrentPage);
-
-        $filter = $this->filterHelper->generate('entity_id', 'in', $searchIds);
-        $searchCriteria = $this->filterHelper->remove($searchCriteria, 'search_term');
-        $searchCriteria = $this->filterHelper->add($searchCriteria, $filter);
-        $searchResult = $this->filterQuery->getResult($searchCriteria);
-
-        $products = [];
-        if (!isset($searchCriteria->getSortOrders()[0])) {
-            foreach ($searchResult->getProductsSearchResult() as $product) {
-                if (in_array($product['id'], $searchIds)) {
-                    $ids[$product['id']] = $product;
-                }
-            }
-            $products = array_filter($ids);
-        } else {
-            foreach ($searchResult->getProductsSearchResult() as $product) {
-                if (in_array($product['id'], $searchIds)) {
-                    $products[] = $product;
-                }
-            }
-        }
-
-        return $this->searchResultFactory->create($searchResult->getTotalCount(), $products);
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchCriteria/Helper/Filter.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchCriteria/Helper/Filter.php
deleted file mode 100644
index c506c518f3bcb..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchCriteria/Helper/Filter.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products\SearchCriteria\Helper;
-
-use Magento\Framework\Api\Filter as Item;
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Api\Search\FilterGroupBuilder;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-
-/**
- * Generate, add, and remove filters and their groups to and from a given Search Criteria object in a simple way.
- */
-class Filter
-{
-    /**
-     * @var FilterGroupBuilder
-     */
-    private $filterGroupBuilder;
-
-    /**
-     * @var FilterBuilder
-     */
-    private $filterBuilder;
-
-    /**
-     * @param FilterGroupBuilder $filterGroupBuilder
-     * @param FilterBuilder $filterBuilder
-     */
-    public function __construct(FilterGroupBuilder $filterGroupBuilder, FilterBuilder $filterBuilder)
-    {
-        $this->filterGroupBuilder = $filterGroupBuilder;
-        $this->filterBuilder = $filterBuilder;
-    }
-
-    /**
-     * Generate filter based off given field name, condition type, and value
-     *
-     * @param string $field
-     * @param string $condition
-     * @param string|array $value
-     * @return Item
-     */
-    public function generate(string $field, string $condition, $value)
-    {
-        $this->filterBuilder->setField($field);
-        $this->filterBuilder->setConditionType($condition);
-        $this->filterBuilder->setValue($value);
-
-        return $this->filterBuilder->create();
-    }
-
-    /**
-     * Add a filter to a newly created filter group on a search criteria object
-     *
-     * @param SearchCriteriaInterface $searchCriteria
-     * @param Item $filter
-     * @return SearchCriteriaInterface
-     */
-    public function add(SearchCriteriaInterface $searchCriteria, Item $filter)
-    {
-        $filterGroups = $searchCriteria->getFilterGroups();
-        $filterGroups[] = $this->filterGroupBuilder->addFilter($filter)->create();
-        $searchCriteria->setFilterGroups($filterGroups);
-
-        return $searchCriteria;
-    }
-
-    /**
-     * Remove a filter and its enclosing group when its name matches the given string
-     *
-     * @param SearchCriteriaInterface $searchCriteria
-     * @param string $filterName
-     * @return SearchCriteriaInterface
-     */
-    public function remove(SearchCriteriaInterface $searchCriteria, string $filterName)
-    {
-        $filterGroups = [];
-        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
-            $isMatch = false;
-            foreach ($filterGroup->getFilters() as $filter) {
-                if ($filter->getField() == $filterName) {
-                    $isMatch = true;
-                }
-            }
-            if ($isMatch) {
-                continue;
-            }
-
-            $filterGroups[] = $filterGroup;
-        }
-        $searchCriteria->setFilterGroups($filterGroups);
-
-        return $searchCriteria;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchResult.php b/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchResult.php
deleted file mode 100644
index b6af9dcebd7a6..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Resolver/Products/SearchResult.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Resolver\Products;
-
-use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
-use Magento\Framework\Api\SearchResultsInterface;
-
-/**
- * Container for a product search holding the item result and the array in the GraphQL-readable product type format.
- */
-class SearchResult
-{
-    /**
-     * @var SearchResultsInterface
-     */
-    private $totalCount;
-
-    /**
-     * @var array
-     */
-    private $productsSearchResult;
-
-    /**
-     * @param int $totalCount
-     * @param array $productsSearchResult
-     */
-    public function __construct(int $totalCount, array $productsSearchResult)
-    {
-        $this->totalCount = $totalCount;
-        $this->productsSearchResult = $productsSearchResult;
-    }
-
-    /**
-     * Return total count of search and filtered result
-     *
-     * @return int
-     */
-    public function getTotalCount()
-    {
-        return $this->totalCount;
-    }
-
-    /**
-     * Retrieve an array in the format of GraphQL-readable type containing product data.
-     *
-     * @return array
-     */
-    public function getProductsSearchResult()
-    {
-        return $this->productsSearchResult;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/Product.php b/app/code/Magento/GraphQlCatalog/Model/Type/Handler/Product.php
deleted file mode 100644
index cb833360b51be..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/Product.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Type\Handler;
-
-use Magento\GraphQl\Model\EntityAttributeList;
-use Magento\Framework\Exception\InputException;
-use Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator;
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-
-/**
- * Define product's GraphQL type
- */
-class Product implements HandlerInterface
-{
-    const PRODUCT_TYPE_NAME = 'Product';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeGenerator
-     */
-    private $typeGenerator;
-
-    /**
-     * @var EntityAttributeList
-     */
-    private $entityAttributeList;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeGenerator $typeGenerator
-     * @param EntityAttributeList $entityAttributeList
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(
-        Pool $typePool,
-        TypeGenerator $typeGenerator,
-        EntityAttributeList $entityAttributeList,
-        TypeFactory $typeFactory
-    ) {
-        $this->typePool = $typePool;
-        $this->typeGenerator = $typeGenerator;
-        $this->entityAttributeList = $entityAttributeList;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getType()
-    {
-        $reflector = new \ReflectionClass($this);
-        return  $this->typeFactory->createInterface(
-            [
-                'name' => $reflector->getShortName(),
-                'fields' => $this->getFields($reflector->getShortName()),
-                'resolveType' => function ($value) {
-                    $typeId = $value['type_id'];
-                    if (!in_array($typeId, ['simple', 'configurable'])) {
-                        throw new InputException(
-                            __('Type %1 does not implement %2 interface', $typeId, self::PRODUCT_TYPE_NAME)
-                        );
-                    }
-                    $resolvedType = $this->typePool->getType(ucfirst($typeId) . self::PRODUCT_TYPE_NAME);
-
-                    if (!$resolvedType) {
-                        throw new InputException(
-                            __('Type %1 not implemented', $typeId)
-                        );
-                    }
-
-                    return $resolvedType;
-                }
-            ]
-        );
-    }
-
-    /**
-     * Retrieve Product base fields
-     *
-     * @param string $typeName
-     * @return array
-     * @throws \LogicException Schema failed to generate from service contract type name
-     */
-    private function getFields(string $typeName)
-    {
-        $result = [];
-        $attributes = $this->entityAttributeList->getDefaultEntityAttributes(\Magento\Catalog\Model\Product::ENTITY);
-        foreach ($attributes as $attribute) {
-            $result[$attribute->getAttributeCode()] = 'string';
-        }
-
-        $staticAttributes = $this->typeGenerator->getTypeData('CatalogDataProductInterface');
-        $result = array_merge($result, $staticAttributes);
-
-        unset($result['stock_item']);
-        unset($result['bundle_product_options']);
-        unset($result['downloadable_product_links']);
-        unset($result['downloadable_product_samples']);
-        unset($result['configurable_product_links']);
-        unset($result['quantity_and_stock_status']);
-        unset($result['sku_type']);
-
-        $mediaGalleryEntries = current($result['media_gallery_entries']);
-        $videoContent = $mediaGalleryEntries['video_content'];
-        $content = $mediaGalleryEntries['content'];
-        $result['media_gallery_entries'][0]['video_content'] = $videoContent;
-        $result['media_gallery_entries'][0]['content'] = $content;
-        $result['category_ids'] = ['int'];
-        $result['media_gallery'] =
-            [
-                'images' => [
-                    0 => [
-                        'value_id' => 'string',
-                        'file' => 'string',
-                        'media_type' => 'string',
-                        'entity_id' => 'string',
-                        'label' => 'string',
-                        'position' => 'string',
-                        'disabled' => 'string',
-                        'label_default' => 'string',
-                        'position_default' => 'string',
-                        'disabled_default' => 'string',
-                        'video_provider' => 'string',
-                        'video_url' => 'string',
-                        'video_description' => 'string',
-                        'video_metadata' => 'string',
-                        'video_provider_default' => 'string',
-                        'video_url_default' => 'string',
-                        'video_title_default' => 'string',
-                        'video_description_default' => 'string',
-                        'video_metadata_default' => 'string'
-                    ]
-                ]
-            ];
-
-        $resolvedTypes = $this->typeGenerator->generate($typeName, $result);
-        $fields = $resolvedTypes->config['fields'];
-
-        return $fields;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/ProductAttributeSearchCriteria.php b/app/code/Magento/GraphQlCatalog/Model/Type/Handler/ProductAttributeSearchCriteria.php
deleted file mode 100644
index a6c52b1e4881e..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/ProductAttributeSearchCriteria.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Type\Handler;
-
-use Magento\GraphQl\Model\EntityAttributeList;
-use Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator;
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-use Magento\GraphQl\Model\Type\Handler\SearchCriteriaExpression;
-
-/**
- * Define ProductAttributeSearchCriteria's GraphQL type
- */
-class ProductAttributeSearchCriteria implements HandlerInterface
-{
-    const PRODUCT_ATTRIBUTE_SEARCH_CRITERIA_TYPE_NAME = 'ProductAttributeSearchCriteria';
-
-    /**
-     * @var TypeGenerator
-     */
-    private $pool;
-
-    /**
-     * @var EntityAttributeList
-     */
-    private $entityAttributeList;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $pool
-     * @param EntityAttributeList $entityAttributeList
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(
-        Pool $pool,
-        EntityAttributeList $entityAttributeList,
-        TypeFactory $typeFactory
-    ) {
-        $this->pool = $pool;
-        $this->entityAttributeList = $entityAttributeList;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        $reflector = new \ReflectionClass($this);
-        return $this->typeFactory->createInputObject(
-            [
-                'name' => $reflector->getShortName(),
-                'fields' => $this->getFields()
-            ]
-        );
-    }
-
-    /**
-     * Retrieve fields
-     *
-     * @return \Closure|array
-     */
-    private function getFields()
-    {
-        $productAttributeSearchCriteriaClassName = self::PRODUCT_ATTRIBUTE_SEARCH_CRITERIA_TYPE_NAME;
-        $attributes = $this->entityAttributeList->getDefaultEntityAttributes(\Magento\Catalog\Model\Product::ENTITY);
-        $schema = [];
-        foreach ($attributes as $attribute) {
-            $schema[$attribute->getAttributeCode()] = $this->pool->getType(
-                SearchCriteriaExpression::SEARCH_CRITERIA_EXPRESSION_TYPE_NAME
-            );
-        }
-
-        $fields = function () use ($schema, $productAttributeSearchCriteriaClassName) {
-            $schema = array_merge($schema, ['or' => $this->pool->getType($productAttributeSearchCriteriaClassName)]);
-
-            return $schema;
-        };
-
-        return $fields;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/ProductSort.php b/app/code/Magento/GraphQlCatalog/Model/Type/Handler/ProductSort.php
deleted file mode 100644
index f6f7dfec4b107..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/ProductSort.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Type\Handler;
-
-use Magento\GraphQl\Model\EntityAttributeList;
-use Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator as Generator;
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-use Magento\GraphQl\Model\Type\Handler\SortEnum;
-
-/**
- * Define ProductSort GraphQL type
- */
-class ProductSort implements HandlerInterface
-{
-    const PRODUCTS_SORT_TYPE_NAME = 'ProductSort';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var Generator
-     */
-    private $typeGenerator;
-
-    /**
-     * @var EntityAttributeList
-     */
-    private $entityAttributeList;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param Generator $typeGenerator
-     * @param EntityAttributeList $entityAttributeList
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(
-        Pool $typePool,
-        Generator $typeGenerator,
-        EntityAttributeList $entityAttributeList,
-        TypeFactory $typeFactory
-    ) {
-        $this->typePool = $typePool;
-        $this->typeGenerator = $typeGenerator;
-        $this->entityAttributeList = $entityAttributeList;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createInputObject(
-            [
-                'name' => self::PRODUCTS_SORT_TYPE_NAME,
-                'fields' => $this->getFields(),
-            ]
-        );
-    }
-
-    /**
-     * Retrieve fields
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        $attributes = $this->entityAttributeList->getDefaultEntityAttributes(\Magento\Catalog\Model\Product::ENTITY);
-        $result = [];
-        foreach ($attributes as $attribute) {
-            if ((!$attribute->getIsUserDefined()) && !is_array($attribute)) {
-                $result[$attribute->getAttributeCode()] = $this->typePool->getType(SortEnum::SORT_ENUM_TYPE_NAME);
-            }
-        }
-
-        $staticAttributes = $this->typeGenerator->getTypeData('CatalogDataProductInterface');
-        foreach ($staticAttributes as $attributeKey => $attribute) {
-            if (is_array($attribute)) {
-                unset($staticAttributes[$attributeKey]);
-            } else {
-                $staticAttributes[$attributeKey] = $this->typePool->getType(SortEnum::SORT_ENUM_TYPE_NAME);
-            }
-        }
-
-        $result = array_merge($result, $staticAttributes);
-
-        return $result;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/Products.php b/app/code/Magento/GraphQlCatalog/Model/Type/Handler/Products.php
deleted file mode 100644
index 30d131249bf47..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/Products.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-use Magento\GraphQl\Model\Type\Handler\SearchResultPageInfo;
-
-/**
- * Define GraphQL type for search result of Products
- */
-class Products implements HandlerInterface
-{
-    const PRODUCTS_TYPE_NAME = 'Products';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(Pool $typePool, TypeFactory $typeFactory)
-    {
-        $this->typePool = $typePool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createObject(
-            [
-                'name' => self::PRODUCTS_TYPE_NAME,
-                'fields' => $this->getFields(),
-            ]
-        );
-    }
-
-    /**
-     * Retrieve the result fields
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        $fields = [
-            'items' => $this->typeFactory->createList($this->typePool->getType(Product::PRODUCT_TYPE_NAME)),
-            'page_info' => $this->typePool->getType(SearchResultPageInfo::SEARCH_RESULT_PAGE_INFO_TYPE_NAME),
-            'total_count' => $this->typePool->getType('Int')
-        ];
-        return $fields;
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/SimpleProduct.php b/app/code/Magento/GraphQlCatalog/Model/Type/Handler/SimpleProduct.php
deleted file mode 100644
index 8c482e18cd871..0000000000000
--- a/app/code/Magento/GraphQlCatalog/Model/Type/Handler/SimpleProduct.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCatalog\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-
-/**
- * Define SimpleProduct GraphQL type
- */
-class SimpleProduct implements HandlerInterface
-{
-    const SIMPLE_PRODUCT_TYPE_NAME = 'SimpleProduct';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(Pool $typePool, TypeFactory $typeFactory)
-    {
-        $this->typePool = $typePool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        $fields = [];
-        $interface = $this->typePool->getType(Product::PRODUCT_TYPE_NAME);
-        $fields = array_merge($fields, $interface->config['fields']);
-        return $this->typeFactory->createObject(
-            [
-                'name' => self::SIMPLE_PRODUCT_TYPE_NAME,
-                'fields' => $fields,
-                'interfaces' => [$interface]
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/README.md b/app/code/Magento/GraphQlCatalog/README.md
deleted file mode 100644
index b5f631a4dac2b..0000000000000
--- a/app/code/Magento/GraphQlCatalog/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# GraphQlCatalog
-
-**GraphQlCatalog** provides type and resolver information for the GraphQl module
-to generate catalog and product information endpoints.
diff --git a/app/code/Magento/GraphQlCatalog/composer.json b/app/code/Magento/GraphQlCatalog/composer.json
deleted file mode 100644
index f3145a5c29b6c..0000000000000
--- a/app/code/Magento/GraphQlCatalog/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "magento/module-graph-ql-catalog",
-    "description": "N/A",
-    "type": "magento2-module",
-    "version": "100.0.0-dev",
-    "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-eav": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-graph-ql": "100.0.*",
-        "magento/module-search": "100.3.*",
-        "magento/framework": "100.3.*"
-    },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\GraphQlCatalog\\": ""
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQlCatalog/etc/di.xml b/app/code/Magento/GraphQlCatalog/etc/di.xml
deleted file mode 100644
index 99b6db883bf77..0000000000000
--- a/app/code/Magento/GraphQlCatalog/etc/di.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product">
-        <arguments>
-            <argument name="collectionProcessor" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor</argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GraphQlCatalog/etc/graphql/di.xml b/app/code/Magento/GraphQlCatalog/etc/graphql/di.xml
deleted file mode 100644
index 9664783f7828a..0000000000000
--- a/app/code/Magento/GraphQlCatalog/etc/graphql/di.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQl\Model\Type\HandlerConfig">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="Product" xsi:type="string">Magento\GraphQlCatalog\Model\Type\Handler\Product</item>
-                <item name="SimpleProduct" xsi:type="string">Magento\GraphQlCatalog\Model\Type\Handler\SimpleProduct</item>
-                <item name="Products" xsi:type="string">Magento\GraphQlCatalog\Model\Type\Handler\Products</item>
-                <item name="ProductAttributeSearchCriteria" xsi:type="string">Magento\GraphQlCatalog\Model\Type\Handler\ProductAttributeSearchCriteria</item>
-                <item name="ProductSort" xsi:type="string">Magento\GraphQlCatalog\Model\Type\Handler\ProductSort</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Model\QueryConfig">
-        <arguments>
-            <argument name="queryStructure" xsi:type="array">
-                <item name="products" xsi:type="array">
-                    <item name="type" xsi:type="string">Products</item>
-                    <item name="resolver" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products</item>
-                    <item name="args" xsi:type="array">
-                        <item name="search" xsi:type="string">String</item>
-                        <item name="filter" xsi:type="string">ProductAttributeSearchCriteria</item>
-                        <item name="pageSize" xsi:type="string">Int</item>
-                        <item name="currentPage" xsi:type="string">Int</item>
-                        <item name="sort" xsi:type="string">ProductSort</item>
-                    </item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Model\FieldConfig">
-        <arguments>
-            <argument name="config" xsi:type="array">
-                <item name="products" xsi:type="array">
-                    <item name="filter" xsi:type="array">
-                        <item name="valueParser" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products\FilterArgument\ValueParser</item>
-                    </item>
-                    <item name="pageSize" xsi:type="array">
-                        <item name="defaultValue" xsi:type="string">20</item>
-                    </item>
-                    <item name="currentPage" xsi:type="array">
-                        <item name="defaultValue" xsi:type="string">1</item>
-                    </item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GraphQlCatalog/etc/module.xml b/app/code/Magento/GraphQlCatalog/etc/module.xml
deleted file mode 100644
index d723f51199673..0000000000000
--- a/app/code/Magento/GraphQlCatalog/etc/module.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GraphQlCatalog" setup_version="2.0.0">
-        <sequence>
-            <module name="Magento_Catalog"/>
-            <module name="Magento_GraphQl"/>
-        </sequence>
-    </module>
-</config>
diff --git a/app/code/Magento/GraphQlCatalog/registration.php b/app/code/Magento/GraphQlCatalog/registration.php
deleted file mode 100644
index fef04604de536..0000000000000
--- a/app/code/Magento/GraphQlCatalog/registration.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GraphQlCatalog', __DIR__);
diff --git a/app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/Product/FormatterPlugin.php b/app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/Product/FormatterPlugin.php
deleted file mode 100644
index f782471e2ced7..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/Product/FormatterPlugin.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlConfigurableProduct\Model\Plugin\Model\Resolver\Products\DataProvider\Product;
-
-use Magento\Catalog\Model\Product;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
-
-/**
- * Post formatting plugin to continue formatting data for configurable type products
- */
-class FormatterPlugin
-{
-    /**
-     * Add configurable links and options to configurable types
-     *
-     * @param Formatter $subject
-     * @param array $productData
-     * @param Product $product
-     * @return array
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterFormat(Formatter $subject, array $productData, Product $product)
-    {
-        if ($product->getTypeId() === Configurable::TYPE_CODE) {
-            $extensionAttributes = $product->getExtensionAttributes();
-            $productData['configurable_product_options'] = $extensionAttributes->getConfigurableProductOptions();
-            $productData['configurable_product_links'] = $extensionAttributes->getConfigurableProductLinks();
-        }
-
-        return $productData;
-    }
-}
diff --git a/app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/ProductPlugin.php b/app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/ProductPlugin.php
deleted file mode 100644
index 110d12b197b97..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/Model/Plugin/Model/Resolver/Products/DataProvider/ProductPlugin.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlConfigurableProduct\Model\Plugin\Model\Resolver\Products\DataProvider;
-
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
-    as AttributeCollection;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Api\SearchResultsInterface;
-use Magento\Framework\Api\SearchResultsInterfaceFactory;
-use Magento\Framework\DataObject;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
-
-class ProductPlugin
-{
-    /**
-     * @var Configurable
-     */
-    private $configurable;
-
-    /**
-     * @var AttributeCollection
-     */
-    private $attributeCollection;
-
-    /**
-     * @var ProductCollection
-     */
-    private $productCollection;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var MetadataPool
-     */
-    private $metadataPool;
-
-    /**
-     * ProductPlugin constructor.
-     *
-     * @param Configurable $configurable
-     * @param AttributeCollection $attributeCollection
-     * @param ProductCollection $productCollection
-     * @param ProductRepositoryInterface $productRepository
-     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param MetadataPool $metadataPool
-     */
-    public function __construct(
-        Configurable $configurable,
-        AttributeCollection $attributeCollection,
-        ProductCollection $productCollection,
-        ProductRepositoryInterface $productRepository,
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        MetadataPool $metadataPool
-    ) {
-        $this->configurable = $configurable;
-        $this->attributeCollection = $attributeCollection;
-        $this->productCollection = $productCollection;
-        $this->productRepository = $productRepository;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->metadataPool = $metadataPool;
-    }
-
-    /**
-     * Intercept GraphQLCatalog getList, and add any necessary configurable fields
-     *
-     * @param Product $subject
-     * @param SearchResultsInterface $result
-     * @return SearchResultsInterface
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterGetList(Product $subject, SearchResultsInterface $result)
-    {
-        $processConfigurableData = false;
-        /** @var ProductInterface $product */
-        foreach ($result->getItems() as $product) {
-            if ($product->getTypeId() === Configurable::TYPE_CODE) {
-                $this->productCollection->setProductFilter($product);
-                $this->attributeCollection->setProductFilter($product);
-                $processConfigurableData = true;
-            }
-        }
-
-        if ($processConfigurableData) {
-            /** @var \Magento\Catalog\Model\Product[] $children */
-            $children = $this->productCollection->getItems();
-            /** @var Attribute[] $attributes */
-            $attributes = $this->attributeCollection->getItems();
-            $result = $this->addConfigurableData($result, $children, $attributes);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Add configurable data to any configurable products in result set
-     *
-     * @param SearchResultsInterface $result
-     * @param DataObject[] $children
-     * @param DataObject[] $attributes
-     * @return SearchResultsInterface
-     */
-    private function addConfigurableData($result, $children, $attributes)
-    {
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-        foreach ($result->getItems() as $product) {
-            if ($product->getTypeId() === Configurable::TYPE_CODE) {
-                $extensionAttributes = $product->getExtensionAttributes();
-                $childrenIds = [];
-                foreach ($children as $child) {
-                    if ($child->getParentId() === $product->getData($linkField)) {
-                        $childrenIds[] = $child->getId();
-                    }
-                }
-                $productAttributes = [];
-                foreach ($attributes as $attribute) {
-                    if ($attribute->getProductId() === $product->getId()) {
-                        $productAttributes[] = $attribute;
-                    }
-                }
-                $extensionAttributes->setConfigurableProductLinks($childrenIds);
-                $extensionAttributes->setConfigurableProductOptions($productAttributes);
-                $product->setExtensionAttributes($extensionAttributes);
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/app/code/Magento/GraphQlConfigurableProduct/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php b/app/code/Magento/GraphQlConfigurableProduct/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php
deleted file mode 100644
index 9812e097d50f9..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlConfigurableProduct\Model\Resolver\Products\Query;
-
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product;
-use Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter;
-use Magento\GraphQlCatalog\Model\Resolver\Products\Query\PostFetchProcessorInterface;
-
-/**
- * Retrieves simple product data for child products, and formats configurable data
- */
-class ConfigurableProductPostProcessor implements PostFetchProcessorInterface
-{
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var Product
-     */
-    private $productDataProvider;
-
-    /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product
-     */
-    private $productResource;
-
-    /**
-     * @var Formatter
-     */
-    private $formatter;
-
-    /**
-     * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param Product $productDataProvider
-     * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
-     * @param Formatter $formatter
-     */
-    public function __construct(
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        Product $productDataProvider,
-        \Magento\Catalog\Model\ResourceModel\Product $productResource,
-        Formatter $formatter
-    ) {
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->productDataProvider = $productDataProvider;
-        $this->productResource = $productResource;
-        $this->formatter = $formatter;
-    }
-
-    /**
-     * Process all configurable product data, including adding simple product data and formatting relevant attributes.
-     *
-     * @param array $productData
-     * @return array
-     */
-    public function process(array $productData)
-    {
-        $childrenIds = [];
-        foreach ($productData as $key => $product) {
-            if ($product['type_id'] === Configurable::TYPE_CODE) {
-                $formattedChildIds = [];
-                foreach ($product['configurable_product_links'] as $childId) {
-                    $childrenIds[] = (int)$childId;
-                    $formattedChildIds[$childId] = null;
-                }
-                $productData[$key]['configurable_product_links'] = $formattedChildIds;
-            }
-        }
-
-        $this->searchCriteriaBuilder->addFilter('entity_id', $childrenIds, 'in');
-        $childProducts = $this->productDataProvider->getList($this->searchCriteriaBuilder->create());
-        /** @var \Magento\Catalog\Model\Product $childProduct */
-        foreach ($childProducts->getItems() as $childProduct) {
-            $childData = $this->formatter->format($childProduct);
-            $childId = (int)$childProduct->getId();
-            foreach ($productData as $key => $item) {
-                if (isset($item['configurable_product_links'])
-                    && array_key_exists($childId, $item['configurable_product_links'])
-                ) {
-                    $productData[$key]['configurable_product_links'][$childId] = $childData;
-                    $categoryLinks = $this->productResource->getCategoryIds($childProduct);
-                    foreach ($categoryLinks as $position => $link) {
-                        $productData[$key]['configurable_product_links'][$childId]['category_links'][] =
-                            ['position' => $position, 'category_id' => $link];
-                    }
-                }
-            }
-        }
-
-        return $productData;
-    }
-}
diff --git a/app/code/Magento/GraphQlConfigurableProduct/Model/Type/Handler/ConfigurableProduct.php b/app/code/Magento/GraphQlConfigurableProduct/Model/Type/Handler/ConfigurableProduct.php
deleted file mode 100644
index b39df19db22ca..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/Model/Type/Handler/ConfigurableProduct.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlConfigurableProduct\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-use Magento\GraphQlCatalog\Model\Type\Handler\Product;
-use Magento\GraphQlCatalog\Model\Type\Handler\SimpleProduct;
-
-/**
- * Define ConfigurableProduct's GraphQL type
- */
-class ConfigurableProduct implements HandlerInterface
-{
-    const CONFIGURABLE_PRODUCT_TYPE_NAME = 'ConfigurableProduct';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var \Magento\Framework\GraphQl\TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param \Magento\Framework\GraphQl\TypeFactory $typeFactory
-     */
-    public function __construct(Pool $typePool, TypeFactory $typeFactory)
-    {
-        $this->typePool = $typePool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        $fields = [];
-        $interface = $this->typePool->getType(Product::PRODUCT_TYPE_NAME);
-        $fields = array_merge($fields, $interface->config['fields']);
-        $fields['configurable_product_links'] =  $this->typeFactory->createList(
-            $this->typePool->getType(SimpleProduct::SIMPLE_PRODUCT_TYPE_NAME)
-        );
-
-        return $this->typeFactory->createObject(
-            [
-                'name' => self::CONFIGURABLE_PRODUCT_TYPE_NAME,
-                'fields' => $fields,
-                'interfaces' => [$interface]
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/GraphQlConfigurableProduct/README.md b/app/code/Magento/GraphQlConfigurableProduct/README.md
deleted file mode 100644
index 579ac2cd9f693..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# GraphQlConfigurableProduct
-
-**GraphQlConfigurableProduct** provides type and resolver information for the GraphQl module
-to generate configurable product information.
diff --git a/app/code/Magento/GraphQlConfigurableProduct/composer.json b/app/code/Magento/GraphQlConfigurableProduct/composer.json
deleted file mode 100644
index c382f90a2758e..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "magento/module-graph-ql-configurable-product",
-    "description": "N/A",
-    "type": "magento2-module",
-    "version": "100.0.0-dev",
-    "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-configurable-product": "100.2.*",
-        "magento/module-graph-ql": "100.0.*",
-        "magento/module-graph-ql-catalog": "100.0.*",
-        "magento/framework": "100.3.*"
-    },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\GraphQlConfigurableProduct\\": ""
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQlConfigurableProduct/etc/di.xml b/app/code/Magento/GraphQlConfigurableProduct/etc/di.xml
deleted file mode 100644
index ffdac3aa65506..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/etc/di.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product">
-        <plugin name="add_configurable_data" type="Magento\GraphQlConfigurableProduct\Model\Plugin\Model\Resolver\Products\DataProvider\ProductPlugin"/>
-    </type>
-    <type name="Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter">
-        <plugin name="add_configurable_data" type="Magento\GraphQlConfigurableProduct\Model\Plugin\Model\Resolver\Products\DataProvider\Product\FormatterPlugin"/>
-    </type>
-    <type name="Magento\GraphQlCatalog\Model\Resolver\Products\Query\Filter">
-        <arguments>
-            <argument name="postProcessors" xsi:type="array">
-                <item name="configurableProcessor" xsi:type="object">Magento\GraphQlConfigurableProduct\Model\Resolver\Products\Query\ConfigurableProductPostProcessor</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GraphQlConfigurableProduct/etc/graphql/di.xml b/app/code/Magento/GraphQlConfigurableProduct/etc/graphql/di.xml
deleted file mode 100644
index 76863f937b9e2..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/etc/graphql/di.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQl\Model\Type\HandlerConfig">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="ConfigurableProduct" xsi:type="string">Magento\GraphQlConfigurableProduct\Model\Type\Handler\ConfigurableProduct</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GraphQlConfigurableProduct/etc/module.xml b/app/code/Magento/GraphQlConfigurableProduct/etc/module.xml
deleted file mode 100644
index a7d98d0339695..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/etc/module.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GraphQlConfigurableProduct" setup_version="2.0.0">
-        <sequence>
-            <module name="Magento_Catalog"/>
-            <module name="Magento_ConfigurableProduct"/>
-            <module name="Magento_GraphQl"/>
-            <module name="Magento_GraphQlCatalog"/>
-        </sequence>
-    </module>
-</config>
diff --git a/app/code/Magento/GraphQlConfigurableProduct/registration.php b/app/code/Magento/GraphQlConfigurableProduct/registration.php
deleted file mode 100644
index 78ae48c2a8a6b..0000000000000
--- a/app/code/Magento/GraphQlConfigurableProduct/registration.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GraphQlConfigurableProduct', __DIR__);
diff --git a/app/code/Magento/GraphQlCustomer/Model/Resolver/Customer.php b/app/code/Magento/GraphQlCustomer/Model/Resolver/Customer.php
deleted file mode 100644
index b4fff1de5b5de..0000000000000
--- a/app/code/Magento/GraphQlCustomer/Model/Resolver/Customer.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCustomer\Model\Resolver;
-
-use Magento\GraphQl\Model\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\GraphQl\Model\ResolverContextInterface;
-
-/**
- * Customers field resolver, used for GraphQL request processing.
- */
-class Customer implements ResolverInterface
-{
-    /**
-     * @var Customer\CustomerDataProvider
-     */
-    private $customerResolver;
-
-    /**
-     * @param \Magento\GraphQlCustomer\Model\Resolver\Customer\CustomerDataProvider $customerResolver
-     */
-    public function __construct(
-        \Magento\GraphQlCustomer\Model\Resolver\Customer\CustomerDataProvider $customerResolver
-    ) {
-        $this->customerResolver = $customerResolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function resolve(array $args, ResolverContextInterface $context)
-    {
-        if ((!$context->getUserId()) || $context->getUserType() == 4) {
-            throw new GraphQlInputException(
-                __('Current customer does not have access to the resource "%1"', 'customer')
-            );
-        }
-
-        return $this->customerResolver->getCustomerById($context->getUserId());
-    }
-}
diff --git a/app/code/Magento/GraphQlCustomer/Model/Resolver/Customer/CustomerDataProvider.php b/app/code/Magento/GraphQlCustomer/Model/Resolver/Customer/CustomerDataProvider.php
deleted file mode 100644
index 6d749299ca4ec..0000000000000
--- a/app/code/Magento/GraphQlCustomer/Model/Resolver/Customer/CustomerDataProvider.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCustomer\Model\Resolver\Customer;
-
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Webapi\ServiceOutputProcessor;
-
-/**
- * Customer field data provider, used for GraphQL request processing.
- */
-class CustomerDataProvider
-{
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
-    /**
-     * @var ServiceOutputProcessor
-     */
-    private $serviceOutputProcessor;
-
-    /**
-     * @var SerializerInterface
-     */
-    private $jsonSerializer;
-
-    /**
-     * @param CustomerRepositoryInterface $customerRepository
-     * @param ServiceOutputProcessor $serviceOutputProcessor
-     * @param SerializerInterface $jsonSerializer
-     */
-    public function __construct(
-        CustomerRepositoryInterface $customerRepository,
-        ServiceOutputProcessor $serviceOutputProcessor,
-        SerializerInterface $jsonSerializer
-    ) {
-        $this->customerRepository = $customerRepository;
-        $this->serviceOutputProcessor = $serviceOutputProcessor;
-        $this->jsonSerializer = $jsonSerializer;
-    }
-
-    /**
-     * Get customer data by Id
-     *
-     * @param int $customerId
-     * @return array|null
-     */
-    public function getCustomerById(int $customerId)
-    {
-        try {
-            $customerObject = $this->customerRepository->getById($customerId);
-        } catch (NoSuchEntityException $e) {
-            // No error should be thrown, null result should be returned
-            return null;
-        }
-        return $this->processCustomer($customerObject);
-    }
-
-    /**
-     * Transform single customer data from object to in array format
-     *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customerObject
-     * @return array|null
-     */
-    private function processCustomer(\Magento\Customer\Api\Data\CustomerInterface $customerObject)
-    {
-        $customer = $this->serviceOutputProcessor->process(
-            $customerObject,
-            CustomerRepositoryInterface::class,
-            'get'
-        );
-        if (isset($customer['extension_attributes'])) {
-            $customer = array_merge($customer, $customer['extension_attributes']);
-        }
-        $customAttributes = [];
-        if (isset($customer['custom_attributes'])) {
-            foreach ($customer['custom_attributes'] as $attribute) {
-                $isArray = false;
-                if (is_array($attribute['value'])) {
-                    $isArray = true;
-                    foreach ($attribute['value'] as $attributeValue) {
-                        if (is_array($attributeValue)) {
-                            $customAttributes[$attribute['attribute_code']] = $this->jsonSerializer->serialize(
-                                $attribute['value']
-                            );
-                            continue;
-                        }
-                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
-                        continue;
-                    }
-                }
-                if ($isArray) {
-                    continue;
-                }
-                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
-            }
-        }
-        $customer = array_merge($customer, $customAttributes);
-
-        return $customer;
-    }
-}
diff --git a/app/code/Magento/GraphQlCustomer/Model/Type/Handler/Customer.php b/app/code/Magento/GraphQlCustomer/Model/Type/Handler/Customer.php
deleted file mode 100644
index 87efbc65d2846..0000000000000
--- a/app/code/Magento/GraphQlCustomer/Model/Type/Handler/Customer.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlCustomer\Model\Type\Handler;
-
-use Magento\GraphQl\Model\EntityAttributeList;
-use Magento\GraphQl\Model\Type\ServiceContract\TypeGenerator;
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-
-/**
- * Define Customer GraphQL type
- */
-class Customer implements HandlerInterface
-{
-    const CUSTOMER_TYPE_NAME = 'Customer';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeGenerator
-     */
-    private $typeGenerator;
-
-    /**
-     * @var EntityAttributeList
-     */
-    private $entityAttributeList;
-
-    /**
-     * @var \Magento\Framework\GraphQl\TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeGenerator $typeGenerator
-     * @param EntityAttributeList $entityAttributeList
-     * @param \Magento\Framework\GraphQl\TypeFactory $typeFactory
-     */
-    public function __construct(
-        Pool $typePool,
-        TypeGenerator $typeGenerator,
-        EntityAttributeList $entityAttributeList,
-        TypeFactory $typeFactory
-    ) {
-        $this->typePool = $typePool;
-        $this->typeGenerator = $typeGenerator;
-        $this->entityAttributeList = $entityAttributeList;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createObject(
-            [
-                'name' => self::CUSTOMER_TYPE_NAME,
-                'fields' => $this->getFields(self::CUSTOMER_TYPE_NAME),
-            ]
-        );
-    }
-
-    /**
-     * Retrieve the customer base fields
-     *
-     * @param string $typeName
-     * @return array
-     * @throws \LogicException Schema failed to generate from service contract type name
-     */
-    private function getFields(string $typeName)
-    {
-        $result = [];
-        $attributes = $this->entityAttributeList->getDefaultEntityAttributes(\Magento\Customer\Model\Customer::ENTITY);
-        foreach ($attributes as $attribute) {
-            $result[$attribute->getAttributeCode()] = 'string';
-        }
-
-        $staticAttributes = $this->typeGenerator->getTypeData('CustomerDataCustomerInterface');
-        $result = array_merge($result, $staticAttributes);
-
-        //customer secure filtering according to @see \Magento\Customer\Model\Data\CustomerSecure
-        unset($result['rp_token']);
-        unset($result['rp_token_created_at']);
-        unset($result['password_hash']);
-        unset($result['deleteable']);
-
-        //additional filtering that we don't need in the schema
-        unset($result['first_failure']);
-        unset($result['lock_expires']);
-        unset($result['failures_num']);
-        unset($result['extension_attribute']);
-
-        unset($result['confirmation']);
-        unset($result['website_id']);
-        unset($result['store_id']);
-        unset($result['created_in']);
-        unset($result['disable_auto_group_change']);
-        unset($result['updated_at']);
-        unset($result['gender']);
-        
-        $resolvedTypes = $this->typeGenerator->generate($typeName, $result);
-        $fields = $resolvedTypes->config['fields'];
-
-        return $fields;
-    }
-}
diff --git a/app/code/Magento/GraphQlCustomer/README.md b/app/code/Magento/GraphQlCustomer/README.md
deleted file mode 100644
index 6bfe286e2024e..0000000000000
--- a/app/code/Magento/GraphQlCustomer/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# GraphQlCustomer
-
-**GraphQlCustomer** provides type and resolver information for the GraphQl module
-to generate customer information endpoints.
diff --git a/app/code/Magento/GraphQlCustomer/composer.json b/app/code/Magento/GraphQlCustomer/composer.json
deleted file mode 100644
index 17de9f2937e4e..0000000000000
--- a/app/code/Magento/GraphQlCustomer/composer.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "magento/module-graph-ql-customer",
-  "description": "N/A",
-  "type": "magento2-module",
-  "version": "100.0.0-dev",
-  "require": {
-    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-    "magento/module-customer": "100.2.*",
-    "magento/module-graph-ql": "100.0.*",
-    "magento/framework": "100.3.*"
-  },
-  "license": [
-    "OSL-3.0",
-    "AFL-3.0"
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Magento\\GraphQlCustomer\\": ""
-    }
-  }
-}
diff --git a/app/code/Magento/GraphQlCustomer/etc/graphql/di.xml b/app/code/Magento/GraphQlCustomer/etc/graphql/di.xml
deleted file mode 100644
index 2a0135fb0d267..0000000000000
--- a/app/code/Magento/GraphQlCustomer/etc/graphql/di.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQl\Model\Type\HandlerConfig">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="Customer" xsi:type="string">Magento\GraphQlCustomer\Model\Type\Handler\Customer</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Model\QueryConfig">
-        <arguments>
-            <argument name="queryStructure" xsi:type="array">
-                <item name="customer" xsi:type="array">
-                    <item name="type" xsi:type="string">Customer</item>
-                    <item name="resolver" xsi:type="object">Magento\GraphQlCustomer\Model\Resolver\Customer</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GraphQlCustomer/etc/module.xml b/app/code/Magento/GraphQlCustomer/etc/module.xml
deleted file mode 100644
index 7d0991cf332f5..0000000000000
--- a/app/code/Magento/GraphQlCustomer/etc/module.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GraphQlCustomer" setup_version="2.0.0">
-        <sequence>
-            <module name="Magento_Customer"/>
-            <module name="Magento_GraphQl"/>
-        </sequence>
-    </module>
-</config>
diff --git a/app/code/Magento/GraphQlCustomer/registration.php b/app/code/Magento/GraphQlCustomer/registration.php
deleted file mode 100644
index 3980c9765c986..0000000000000
--- a/app/code/Magento/GraphQlCustomer/registration.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GraphQlCustomer', __DIR__);
diff --git a/app/code/Magento/GraphQlEav/Model/Resolver/CustomAttributeMetadata.php b/app/code/Magento/GraphQlEav/Model/Resolver/CustomAttributeMetadata.php
deleted file mode 100644
index e7e4c4197f1e7..0000000000000
--- a/app/code/Magento/GraphQlEav/Model/Resolver/CustomAttributeMetadata.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlEav\Model\Resolver;
-
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Reflection\TypeProcessor;
-use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\GraphQl\Model\ResolverInterface;
-use Magento\Framework\Exception\InputException;
-use \Magento\GraphQl\Model\ResolverContextInterface;
-
-/**
- * Resolve data for custom attribute metadata requests
- */
-class CustomAttributeMetadata implements ResolverInterface
-{
-    /**
-     * @var CustomAttributeTypeLocatorInterface
-     */
-    private $typeLocator;
-
-    /**
-     * @var TypeProcessor
-     */
-    private $typeProcessor;
-
-    /**
-     * @param CustomAttributeTypeLocatorInterface $typeLocator
-     * @param TypeProcessor $typeProcessor
-     */
-    public function __construct(
-        CustomAttributeTypeLocatorInterface $typeLocator,
-        TypeProcessor $typeProcessor
-    ) {
-        $this->typeLocator = $typeLocator;
-        $this->typeProcessor = $typeProcessor;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function resolve(array $args, ResolverContextInterface $context)
-    {
-        if (!isset($args['attributes']) || empty($args['attributes'])) {
-            throw new InputException(__('Missing arguments for correct type resolution.'));
-        }
-
-        $attributes['items'] = null;
-        /** @var ArgumentInterface $attributeInputs */
-        $attributeInputs = $args['attributes'];
-        foreach ($attributeInputs->getValue() as $attribute) {
-            try {
-                $type = $this->typeLocator->getType($attribute['attribute_code'], $attribute['entity_type']);
-            } catch (LocalizedException $e) {
-                throw new GraphQlInputException(__($e->getMessage()));
-            }
-
-            $isComplexType = strpos($type, '\\') !== false;
-            if ($type === TypeProcessor::ANY_TYPE) {
-                continue;
-            } elseif ($isComplexType) {
-                try {
-                    $type = $this->typeProcessor->translateTypeName($type);
-                } catch (\InvalidArgumentException $exception) {
-                    throw new GraphQlInputException(
-                        __('Type %1 has no internal representation declared.', $type),
-                        null,
-                        0,
-                        false
-                    );
-                }
-            }
-
-            $attributes['items'][] = [
-                'attribute_code' => $attribute['attribute_code'],
-                'entity_type' => $attribute['entity_type'],
-                'attribute_type' => ucfirst($type)
-            ];
-        }
-
-        return $attributes;
-    }
-}
diff --git a/app/code/Magento/GraphQlEav/Model/Type/Handler/AttributeInput.php b/app/code/Magento/GraphQlEav/Model/Type/Handler/AttributeInput.php
deleted file mode 100644
index c6ccd40651823..0000000000000
--- a/app/code/Magento/GraphQlEav/Model/Type/Handler/AttributeInput.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlEav\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-
-/**
- * Defines input type for attributes in ['attribute_code' => 'value', 'entity_type' => 'value'] format
- */
-class AttributeInput implements HandlerInterface
-{
-    const ATTRIBUTE_INPUT_TYPE_NAME = 'AttributeInput';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(Pool $typePool, TypeFactory $typeFactory)
-    {
-        $this->typePool = $typePool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createInputObject(
-            [
-                'name' => self::ATTRIBUTE_INPUT_TYPE_NAME,
-                'fields' => [
-                    'attribute_code' => $this->typePool->getType('String'),
-                    'entity_type' => $this->typePool->getType('String')
-                ],
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/GraphQlEav/Model/Type/Handler/CustomAttributeMetadata.php b/app/code/Magento/GraphQlEav/Model/Type/Handler/CustomAttributeMetadata.php
deleted file mode 100644
index 20fef5acdd502..0000000000000
--- a/app/code/Magento/GraphQlEav/Model/Type/Handler/CustomAttributeMetadata.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQlEav\Model\Type\Handler;
-
-use Magento\GraphQl\Model\Type\HandlerInterface;
-use Magento\Framework\GraphQl\TypeFactory;
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-use Magento\GraphQl\Model\Type\Handler\Pool;
-
-/**
- * Defines type information for custom attribute metadata
- */
-class CustomAttributeMetadata implements HandlerInterface
-{
-    const CUSTOM_ATTRIBUTE_METADATA_TYPE_NAME = 'CustomAttributeMetadata';
-
-    const ATTRIBUTE_TYPE_NAME = 'Attribute';
-
-    /**
-     * @var Pool
-     */
-    private $typePool;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @param Pool $typePool
-     * @param TypeFactory $typeFactory
-     */
-    public function __construct(Pool $typePool, TypeFactory $typeFactory)
-    {
-        $this->typePool = $typePool;
-        $this->typeFactory = $typeFactory;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getType()
-    {
-        return $this->typeFactory->createObject(
-            [
-                'name' => self::CUSTOM_ATTRIBUTE_METADATA_TYPE_NAME,
-                'fields' => $this->getFields()
-            ]
-        );
-    }
-
-    /**
-     * Get and register array of fields for CustomAttributeMetadata type
-     *
-     * @return TypeInterface[]
-     */
-    private function getFields(): array
-    {
-        if (!$this->typePool->isTypeRegistered(self::ATTRIBUTE_TYPE_NAME)) {
-            $attributeType = $this->typeFactory->createObject([
-                'name' => self::ATTRIBUTE_TYPE_NAME,
-                'fields' => [
-                    'attribute_code' => $this->typePool->getType('String'),
-                    'entity_type' => $this->typePool->getType('String'),
-                    'attribute_type' => $this->typePool->getType('String')
-                ]
-            ]);
-            $this->typePool->registerType($attributeType);
-        }
-
-        return ['items' => $this->typeFactory->createList($this->typePool->getType(self::ATTRIBUTE_TYPE_NAME))];
-    }
-}
diff --git a/app/code/Magento/GraphQlEav/README.md b/app/code/Magento/GraphQlEav/README.md
deleted file mode 100644
index b3adda2a563b4..0000000000000
--- a/app/code/Magento/GraphQlEav/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# GraphQlEav
-
-**GraphQlEav** primarily provides the GraphQl module information to generate metadata for Eav attributes.
diff --git a/app/code/Magento/GraphQlEav/composer.json b/app/code/Magento/GraphQlEav/composer.json
deleted file mode 100644
index 4592d3cb7d145..0000000000000
--- a/app/code/Magento/GraphQlEav/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "magento/module-graph-ql-eav",
-    "description": "N/A",
-    "type": "magento2-module",
-    "version": "100.0.0-dev",
-    "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-graph-ql": "100.0.*",
-        "magento/framework": "100.3.*"
-    },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\GraphQlEav\\": ""
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQlEav/etc/graphql/di.xml b/app/code/Magento/GraphQlEav/etc/graphql/di.xml
deleted file mode 100644
index 08722cdfaba0a..0000000000000
--- a/app/code/Magento/GraphQlEav/etc/graphql/di.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQl\Model\Type\HandlerConfig">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="CustomAttributeMetadata" xsi:type="string">Magento\GraphQlEav\Model\Type\Handler\CustomAttributeMetadata</item>
-                <item name="AttributeInput" xsi:type="string">Magento\GraphQlEav\Model\Type\Handler\AttributeInput</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Model\QueryConfig">
-        <arguments>
-            <argument name="queryStructure" xsi:type="array">
-                <item name="customAttributeMetadata" xsi:type="array">
-                    <item name="type" xsi:type="string">CustomAttributeMetadata</item>
-                    <item name="resolver" xsi:type="object">Magento\GraphQlEav\Model\Resolver\CustomAttributeMetadata</item>
-                    <item name="args" xsi:type="array">
-                        <item name="attribute[]!" xsi:type="string">AttributeInput</item>
-                    </item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GraphQlEav/etc/module.xml b/app/code/Magento/GraphQlEav/etc/module.xml
deleted file mode 100644
index 42d81bc9eaf6a..0000000000000
--- a/app/code/Magento/GraphQlEav/etc/module.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GraphQlEav" setup_version="2.0.0">
-        <sequence>
-            <module name="Magento_Eav"/>
-            <module name="Magento_GraphQl"/>
-        </sequence>
-    </module>
-</config>
diff --git a/app/code/Magento/GraphQlEav/registration.php b/app/code/Magento/GraphQlEav/registration.php
deleted file mode 100644
index 8c2e3346b2d9b..0000000000000
--- a/app/code/Magento/GraphQlEav/registration.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GraphQlEav', __DIR__);
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE.txt b/app/code/Magento/GroupedCatalogInventory/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE.txt
rename to app/code/Magento/GroupedCatalogInventory/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE_AFL.txt b/app/code/Magento/GroupedCatalogInventory/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE_AFL.txt
rename to app/code/Magento/GroupedCatalogInventory/LICENSE_AFL.txt
diff --git a/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php b/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php
new file mode 100644
index 0000000000000..599f40deddde0
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/Plugin/OutOfStockFilter.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GroupedCatalogInventory\Plugin;
+
+use Magento\Catalog\Model\Product;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+
+/**
+ * Removes out of stock products from cart candidates when appropriate
+ */
+class OutOfStockFilter
+{
+    /**
+     * @var StockStatusRepositoryInterface
+     */
+    private $stockStatusRepository;
+
+    /**
+     * @var StockStatusCriteriaInterfaceFactory
+     */
+    private $criteriaInterfaceFactory;
+
+    /**
+     * @param StockStatusRepositoryInterface $stockStatusRepository
+     * @param StockStatusCriteriaInterfaceFactory $criteriaInterfaceFactory
+     */
+    public function __construct(
+        StockStatusRepositoryInterface $stockStatusRepository,
+        StockStatusCriteriaInterfaceFactory $criteriaInterfaceFactory
+    ) {
+        $this->stockStatusRepository = $stockStatusRepository;
+        $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
+    }
+
+    /**
+     * Removes out of stock products for requests that don't specify the super group
+     *
+     * @param Grouped $subject
+     * @param array|string $result
+     * @param \Magento\Framework\DataObject $buyRequest
+     * @return string|array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterPrepareForCartAdvanced(
+        Grouped $subject,
+        $result,
+        \Magento\Framework\DataObject $buyRequest
+    ) {
+        if (!is_array($result) && $result instanceof Product) {
+            $result = [$result];
+        }
+
+        // Only remove out-of-stock products if no quantities were specified
+        if (is_array($result) && !empty($result) && !$buyRequest->getData('super_group')) {
+            $productIds = [];
+            $productIdMap = [];
+
+            foreach ($result as $index => $cartItem) {
+                $productIds[] = $cartItem->getId();
+                $productIdMap[$cartItem->getId()] = $index;
+            }
+
+            $criteria = $this->criteriaInterfaceFactory->create();
+            $criteria->setProductsFilter($productIds);
+
+            $stockStatusCollection = $this->stockStatusRepository->getList($criteria);
+            foreach ($stockStatusCollection->getItems() as $status) {
+                /** @var $status StockStatusInterface */
+                if ($status->getStockStatus() == StockStatusInterface::STATUS_OUT_OF_STOCK) {
+                    unset($result[$productIdMap[$status->getProductId()]]);
+                }
+            }
+
+            unset($productIdMap);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/GroupedCatalogInventory/README.md b/app/code/Magento/GroupedCatalogInventory/README.md
new file mode 100644
index 0000000000000..c229c7e9919ad
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/README.md
@@ -0,0 +1 @@
+Magento_GroupedCatalogInventory contains behavior related to the inventory status of items within grouped products.
diff --git a/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php b/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php
new file mode 100644
index 0000000000000..07877938e36ae
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/Test/Unit/Plugin/OutOfStockFilterTest.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GroupedCatalogInventory\Test\Unit\Plugin;
+
+use Magento\Catalog\Model\Product;
+use Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterface;
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
+use Magento\Framework\DataObject;
+use Magento\GroupedCatalogInventory\Plugin\OutOfStockFilter;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class OutOfStockFilterTest extends TestCase
+{
+    /**
+     * @var MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @var MockObject
+     */
+    private $stockStatusRepositoryMock;
+
+    /**
+     * @var MockObject
+     */
+    private $searchCriteriaMock;
+
+    /**
+     * @var MockObject
+     */
+    private $searchCriteriaFactoryMock;
+
+    /**
+     * @var MockObject
+     */
+    private $stockStatusCollectionMock;
+
+    /**
+     * @param $nonArrayResult
+     * @dataProvider nonArrayResults
+     */
+    public function testFilterOnlyProcessesArray($nonArrayResult)
+    {
+        $this->searchCriteriaMock->expects($this->never())->method('setProductsFilter');
+        $this->stockStatusRepositoryMock->expects($this->never())->method('getList');
+
+        $plugin = $this->getPluginInstance();
+
+        $result = $plugin->afterPrepareForCartAdvanced(
+            $this->subjectMock,
+            $nonArrayResult,
+            new DataObject()
+        );
+
+        $this->assertSame($nonArrayResult, $result);
+    }
+
+    public function testFilterIgnoresResultIfSuperGroupIsPresent()
+    {
+        $this->searchCriteriaMock->expects($this->never())->method('setProductsFilter');
+        $this->stockStatusRepositoryMock->expects($this->never())->method('getList');
+
+        $plugin = $this->getPluginInstance();
+
+        $product = $this->createProductMock();
+
+        $result = $plugin->afterPrepareForCartAdvanced(
+            $this->subjectMock,
+            [$product],
+            new DataObject(['super_group' => [123 => '1']])
+        );
+
+        $this->assertSame([$product], $result);
+    }
+
+    /**
+     * @param $originalResult
+     * @param $stockStatusCollection
+     * @param $expectedResult
+     * @dataProvider outOfStockProductData
+     */
+    public function testFilterRemovesOutOfStockProductsWhenSuperGroupIsNotPresent(
+        $originalResult,
+        $stockStatusCollection,
+        $expectedResult
+    ) {
+        $this->stockStatusRepositoryMock
+            ->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($stockStatusCollection);
+
+        $plugin = $this->getPluginInstance();
+
+        $result = $plugin->afterPrepareForCartAdvanced(
+            $this->subjectMock,
+            $originalResult,
+            new DataObject()
+        );
+
+        $this->assertSame($expectedResult, $result);
+    }
+
+    public function outOfStockProductData()
+    {
+        $product1 = $this->createProductMock();
+        $product1->method('getId')->willReturn(123);
+
+        $product2 = $this->createProductMock();
+        $product2->method('getId')->willReturn(321);
+
+        return [
+            [[$product1, $product2], $this->createStatusResult([123 => false, 321 => true]), [1 => $product2]],
+            [[$product1], $this->createStatusResult([123 => true]), [0 => $product1]],
+            [$product1, $this->createStatusResult([123 => true]), [0 => $product1]]
+        ];
+    }
+
+    public function nonArrayResults()
+    {
+        return [
+            [123],
+            ['abc'],
+            [new \stdClass()]
+        ];
+    }
+
+    protected function setUp()
+    {
+        $this->subjectMock = $this->getMockBuilder(Grouped::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->stockStatusRepositoryMock = $this->getMockBuilder(StockStatusRepositoryInterface::class)
+            ->getMock();
+
+        $this->searchCriteriaFactoryMock = $this->getMockBuilder(StockStatusCriteriaInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->searchCriteriaMock = $this->getMockBuilder(StockStatusCriteriaInterface::class)
+            ->getMock();
+
+        $this->stockStatusCollectionMock = $this->getMockBuilder(StockStatusCollectionInterface::class)
+            ->getMock();
+
+        $this->searchCriteriaFactoryMock
+            ->expects($this->any())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+    }
+
+    private function createProductMock()
+    {
+        return $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @return OutOfStockFilter
+     */
+    private function getPluginInstance()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        /** @var OutOfStockFilter $filter */
+        $filter = $objectManager->getObject(OutOfStockFilter::class, [
+            'stockStatusRepository' => $this->stockStatusRepositoryMock,
+            'criteriaInterfaceFactory' => $this->searchCriteriaFactoryMock
+        ]);
+
+        return $filter;
+    }
+
+    private function createStatusResult(array $productStatuses)
+    {
+        $result = [];
+
+        foreach ($productStatuses as $productId => $status) {
+            $mock = $this->getMockBuilder(StockStatusInterface::class)
+                ->getMock();
+
+            $mock->expects($this->any())
+                ->method('getProductId')
+                ->willReturn($productId);
+
+            $mock->expects($this->any())
+                ->method('getStockStatus')
+                ->willReturn(
+                    $status
+                    ? StockStatusInterface::STATUS_IN_STOCK
+                    : StockStatusInterface::STATUS_OUT_OF_STOCK
+                );
+
+            $result[] = $mock;
+        }
+
+        $stockStatusCollection = $this->getMockBuilder(StockStatusCollectionInterface::class)
+            ->getMock();
+
+        $stockStatusCollection
+            ->expects($this->once())
+            ->method('getItems')
+            ->willReturn($result);
+
+        return $stockStatusCollection;
+    }
+}
diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
new file mode 100644
index 0000000000000..c9946bc3f36ac
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-grouped-catalog-inventory",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-grouped-product": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\GroupedCatalogInventory\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/GroupedCatalogInventory/etc/di.xml b/app/code/Magento/GroupedCatalogInventory/etc/di.xml
new file mode 100644
index 0000000000000..f38a9e845a159
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/etc/di.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:ObjectManager/etc/config.xsd">
+    <type name="Magento\GroupedProduct\Model\Product\Type\Grouped">
+        <plugin name="outOfStockFilter" type="Magento\GroupedCatalogInventory\Plugin\OutOfStockFilter" />
+    </type>
+</config>
diff --git a/app/code/Magento/GroupedCatalogInventory/etc/module.xml b/app/code/Magento/GroupedCatalogInventory/etc/module.xml
new file mode 100644
index 0000000000000..246f10ff67934
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_GroupedCatalogInventory" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_GroupedProduct"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/GroupedCatalogInventory/registration.php b/app/code/Magento/GroupedCatalogInventory/registration.php
new file mode 100644
index 0000000000000..8899a48edf6d5
--- /dev/null
+++ b/app/code/Magento/GroupedCatalogInventory/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GroupedCatalogInventory', __DIR__);
diff --git a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
index 5547a59d291b7..b76f026872b81 100644
--- a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
@@ -89,7 +89,7 @@ public function saveData()
                 foreach ($associatedSkusAndQtyPairs as $associatedSkuAndQty) {
                     ++$position;
                     $associatedSkuAndQty = explode(self::SKU_QTY_DELIMITER, $associatedSkuAndQty);
-                    $associatedSku = isset($associatedSkuAndQty[0]) ? trim($associatedSkuAndQty[0]) : null;
+                    $associatedSku = isset($associatedSkuAndQty[0]) ? strtolower(trim($associatedSkuAndQty[0])) : null;
                     if (isset($newSku[$associatedSku])) {
                         $linkedProductId = $newSku[$associatedSku][$this->getProductEntityIdentifierField()];
                     } elseif (isset($oldSku[$associatedSku])) {
@@ -99,7 +99,7 @@ public function saveData()
                     }
                     $scope = $this->_entityModel->getRowScope($rowData);
                     if (Product::SCOPE_DEFAULT == $scope) {
-                        $productData = $newSku[$rowData[Product::COL_SKU]];
+                        $productData = $newSku[strtolower($rowData[Product::COL_SKU])];
                     } else {
                         $colAttrSet = Product::COL_ATTR_SET;
                         $rowData[$colAttrSet] = $productData['attr_set_code'];
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE.txt b/app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE.txt
rename to app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE_AFL.txt b/app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE_AFL.txt
rename to app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GroupedImportExport/Test/Mftf/README.md b/app/code/Magento/GroupedImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f15893e5138d0
--- /dev/null
+++ b/app/code/Magento/GroupedImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Grouped Import Export Functional Tests
+
+The Functional Test Module for **Magento Grouped Import Export** module.
diff --git a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php
index ffcfa5c0a90d7..9a4ddeb4f55f5 100644
--- a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php
+++ b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php
@@ -57,6 +57,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function linksDataProvider()
     {
         return [
@@ -107,6 +110,9 @@ public function testSaveLinksDataWithProductsAttrs($linksData)
         $this->links->saveLinksData($linksData);
     }
 
+    /**
+     * @return array
+     */
     public function attributesDataProvider()
     {
         return [
@@ -135,6 +141,9 @@ public function attributesDataProvider()
         ];
     }
 
+    /**
+     * @param $dbAttributes
+     */
     protected function processAttributeGetter($dbAttributes)
     {
         $select = $this->createMock(\Magento\Framework\DB\Select::class);
@@ -162,6 +171,9 @@ public function testGetAttributes($dbAttributes, $returnedAttributes)
         $this->assertEquals($returnedAttributes, $actualAttributes);
     }
 
+    /**
+     * @param $behavior
+     */
     protected function processBehaviorGetter($behavior)
     {
         $dataSource = $this->createMock(\Magento\ImportExport\Model\ResourceModel\Import\Data::class);
diff --git a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php
index b2201aa59f4f3..17e8e4c519ccb 100644
--- a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php
+++ b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php
@@ -192,26 +192,26 @@ public function saveDataProvider()
                 'skus' => [
                     'newSku' => [
                         'sku_assoc1' => ['entity_id' => 1],
-                        'productSku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
+                        'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
                     ],
                     'oldSku' => ['sku_assoc2' => ['entity_id' => 2]]
                 ],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'grouped'
                 ]
             ],
             [
                 'skus' => [
                     'newSku' => [
-                        'productSku' => ['entity_id' => 1, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
+                        'productsku' => ['entity_id' => 1, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
                     ],
                     'oldSku' => []
                 ],
                 'bunch' => [
                     'associated_skus' => '',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'grouped'
                 ]
             ],
@@ -219,7 +219,7 @@ public function saveDataProvider()
                 'skus' => ['newSku' => [],'oldSku' => []],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'grouped'
                 ]
             ],
@@ -227,13 +227,13 @@ public function saveDataProvider()
                 'skus' => [
                     'newSku' => [
                         'sku_assoc1' => ['entity_id' => 1],
-                        'productSku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
+                        'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
                     ],
                     'oldSku' => []
                 ],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'simple'
                 ]
             ]
@@ -247,7 +247,7 @@ public function testSaveDataScopeStore()
     {
         $this->entityModel->expects($this->once())->method('getNewSku')->will($this->returnValue([
             'sku_assoc1' => ['entity_id' => 1],
-            'productSku' => ['entity_id' => 2, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
+            'productsku' => ['entity_id' => 2, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
         ]));
         $this->entityModel->expects($this->once())->method('getOldSku')->will($this->returnValue([
             'sku_assoc2' => ['entity_id' => 3]
@@ -257,7 +257,7 @@ public function testSaveDataScopeStore()
 
         $bunch = [[
             'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
-            'sku' => 'productSku',
+            'sku' => 'productsku',
             'product_type' => 'grouped'
         ]];
         $this->entityModel->expects($this->at(2))->method('getNextBunch')->will($this->returnValue($bunch));
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 8c03d3035eca9..b7674e2157021 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-grouped-product": "100.3.*",
-        "magento/module-import-export": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-import-export": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedImportExport/etc/module.xml b/app/code/Magento/GroupedImportExport/etc/module.xml
index a0518abc4660e..4274acded9f22 100644
--- a/app/code/Magento/GroupedImportExport/etc/module.xml
+++ b/app/code/Magento/GroupedImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GroupedImportExport" setup_version="2.0.0">
+    <module name="Magento_GroupedImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index a97b1c246741e..e85d4eeca730a 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -19,6 +19,8 @@ class Grouped extends Renderer implements IdentityInterface
 {
     /**
      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     * @deprecated moved to model because of class refactoring
+     * @see \Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver::CONFIG_THUMBNAIL_SOURCE
      */
     const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/grouped_product_image';
 
@@ -36,28 +38,6 @@ public function getGroupedProduct()
         return $this->getProduct();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProductForThumbnail()
-    {
-        /**
-         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
-         * or if child product thumbnail is not available
-         */
-        if ($this->_scopeConfig->getValue(
-            self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            !($this->getProduct()->getThumbnail() && $this->getProduct()->getThumbnail() != 'no_selection')
-        ) {
-            $product = $this->getGroupedProduct();
-        } else {
-            $product = $this->getProduct();
-        }
-        return $product;
-    }
-
     /**
      * Return identifiers for produced content
      *
diff --git a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
deleted file mode 100644
index 028fe15edc9f8..0000000000000
--- a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GroupedProduct\CustomerData;
-
-use Magento\Catalog\Model\Config\Source\Product\Thumbnail as ThumbnailSource;
-use Magento\Checkout\CustomerData\DefaultItem;
-
-class GroupedItem extends DefaultItem
-{
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Msrp\Helper\Data $msrpHelper
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
-     * @param \Magento\Checkout\Helper\Data $checkoutHelper
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Msrp\Helper\Data $msrpHelper,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
-        \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        parent::__construct(
-            $imageHelper,
-            $msrpHelper,
-            $urlBuilder,
-            $configurationPool,
-            $checkoutHelper
-        );
-        $this->_scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getProductForThumbnail()
-    {
-        /**
-         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
-         * or if child product thumbnail is not available
-         */
-        $config = $this->_scopeConfig->getValue(
-            \Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $product = $config == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            (!$this->getProduct()->getThumbnail() || $this->getProduct()->getThumbnail() == 'no_selection')
-            ? $this->getGroupedProduct()
-            : $this->getProduct();
-        return $product;
-    }
-
-    /**
-     * Get item grouped product
-     *
-     * @return \Magento\Catalog\Model\Product
-     */
-    protected function getGroupedProduct()
-    {
-        $option = $this->item->getOptionByCode('product_type');
-        if ($option) {
-            return $option->getProduct();
-        }
-        return $this->getProduct();
-    }
-}
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php
new file mode 100644
index 0000000000000..207d9853f8c6b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemProductResolver implements ItemResolverInterface
+{
+    /**
+     * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     */
+    const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/grouped_product_image';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface
+    {
+        /**
+         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
+         * or if child product thumbnail is not available.
+         */
+
+        $childProduct = $item->getProduct();
+        $finalProduct = $childProduct;
+        $parentProduct = $this->getParentProduct($item);
+        if ($childProduct !== $parentProduct) {
+            $configValue = $this->scopeConfig->getValue(
+                self::CONFIG_THUMBNAIL_SOURCE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+            $childThumb = $childProduct->getData('thumbnail');
+
+            $finalProduct =
+                ($configValue == Thumbnail::OPTION_USE_PARENT_IMAGE) || (!$childThumb || $childThumb == 'no_selection')
+                    ? $parentProduct
+                    : $childProduct;
+        }
+        return $finalProduct;
+    }
+
+    /**
+     * Get grouped product.
+     *
+     * @param ItemInterface $item
+     * @return Product
+     */
+    private function getParentProduct(ItemInterface $item) : Product
+    {
+        $option = $item->getOptionByCode('product_type');
+        $product = $item->getProduct();
+        if ($option) {
+            $product = $option->getProduct();
+        }
+        return $product;
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
index 6cdcfd248e798..a1dc903364278 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
@@ -8,6 +8,8 @@
 use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SimpleDataObjectConverter;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped;
 
 /**
@@ -60,6 +62,9 @@ public function __construct(
      * @param array $links
      *
      * @return \Magento\Catalog\Model\Product
+     *
+     * @throws NoSuchEntityException
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -70,7 +75,7 @@ public function beforeInitializeLinks(
         array $links
     ) {
         if ($product->getTypeId() === TypeGrouped::TYPE_CODE && !$product->getGroupedReadonly()) {
-            $links = (isset($links[self::TYPE_NAME])) ? $links[self::TYPE_NAME] : $product->getGroupedLinkData();
+            $links = $links[self::TYPE_NAME] ?? $product->getGroupedLinkData();
             if (!is_array($links)) {
                 $links = [];
             }
@@ -107,7 +112,7 @@ public function beforeInitializeLinks(
                     foreach ($linkRaw['custom_attributes'] as $option) {
                         $name = $option['attribute_code'];
                         $value = $option['value'];
-                        $setterName = 'set' . ucfirst($name);
+                        $setterName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($name);
                         // Check if setter exists
                         if (method_exists($productLinkExtension, $setterName)) {
                             call_user_func([$productLinkExtension, $setterName], $value);
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index e1c97c8912cf8..f67c9c57ee034 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -10,6 +10,8 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
+ * Grouped product type model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
@@ -226,13 +228,15 @@ public function getAssociatedProducts($product)
     }
 
     /**
+     * Flush Associated Products Cache
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
      * @since 100.1.0
      */
     public function flushAssociatedProductsCache($product)
     {
-        return $product->unsData($this->_keyAssociatedProducts);
+        return $product->unsetData($this->_keyAssociatedProducts);
     }
 
     /**
@@ -323,6 +327,8 @@ public function getAssociatedProductCollection($product)
     }
 
     /**
+     * Returns product info
+     *
      * @param \Magento\Framework\DataObject $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @param bool $isStrictProcessMode
@@ -341,7 +347,7 @@ protected function getProductInfo(\Magento\Framework\DataObject $buyRequest, $pr
                 if ($isStrictProcessMode && !$subProduct->getQty()) {
                     return __('Please specify the quantity of product(s).')->render();
                 }
-                $productsInfo[$subProduct->getId()] = intval($subProduct->getQty());
+                $productsInfo[$subProduct->getId()] = $subProduct->isSalable() ? (float)$subProduct->getQty() : 0;
             }
         }
 
@@ -350,6 +356,7 @@ protected function getProductInfo(\Magento\Framework\DataObject $buyRequest, $pr
 
     /**
      * Prepare product and its configuration to be added to some products list.
+     *
      * Perform standard preparation process and add logic specific to Grouped product type.
      *
      * @param \Magento\Framework\DataObject $buyRequest
@@ -423,6 +430,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
 
     /**
      * Retrieve products divided into groups required to purchase
+     *
      * At least one product in each group has to be purchased
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -436,8 +444,8 @@ public function getProductsToPurchaseByReqGroups($product)
     /**
      * Prepare selected qty for grouped product's options
      *
-     * @param  \Magento\Catalog\Model\Product $product
-     * @param  \Magento\Framework\DataObject $buyRequest
+     * @param \Magento\Catalog\Model\Product $product
+     * @param \Magento\Framework\DataObject $buyRequest
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -473,7 +481,7 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function beforeSave($product)
     {
@@ -486,6 +494,8 @@ public function beforeSave($product)
     }
 
     /**
+     * Returns msrp for children products
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return int
      */
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
index cbbb58d3c24c8..e1599dc772c2c 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
@@ -7,140 +7,211 @@
  */
 namespace Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price;
 
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
+use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedType;
 
-class Grouped extends DefaultPrice implements GroupedInterface
+/**
+ * Calculate minimal and maximal prices for Grouped products
+ * Use calculated price for relation products
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Grouped implements DimensionalIndexerInterface
 {
     /**
-     * Prefix for temporary table support.
+     * @var IndexTableStructureFactory
      */
-    const TRANSIT_PREFIX = 'transit_';
+    private $indexTableStructureFactory;
 
     /**
-     * @inheritdoc
+     * @var TableMaintainer
      */
-    protected function reindex($entityIds = null)
-    {
-        $this->_prepareGroupedProductPriceData($entityIds);
+    private $tableMaintainer;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var bool
+     */
+    private $fullReindexAction;
+
+    /**
+     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param TableMaintainer $tableMaintainer
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resource
+     * @param string $connectionName
+     * @param bool $fullReindexAction
+     */
+    public function __construct(
+        IndexTableStructureFactory $indexTableStructureFactory,
+        TableMaintainer $tableMaintainer,
+        MetadataPool $metadataPool,
+        ResourceConnection $resource,
+        $connectionName = 'indexer',
+        $fullReindexAction = false
+    ) {
+        $this->indexTableStructureFactory = $indexTableStructureFactory;
+        $this->tableMaintainer = $tableMaintainer;
+        $this->connectionName = $connectionName;
+        $this->metadataPool = $metadataPool;
+        $this->resource = $resource;
+        $this->fullReindexAction = $fullReindexAction;
     }
 
     /**
-     * Calculate minimal and maximal prices for Grouped products
-     * Use calculated price for relation products
-     *
-     * @param int|array $entityIds  the parent entity ids limitation
-     * @return $this
+     * {@inheritdoc}
+     * @param array $dimensions
+     * @param \Traversable $entityIds
+     * @throws \Exception
      */
-    protected function _prepareGroupedProductPriceData($entityIds = null)
+    public function executeByDimensions(array $dimensions, \Traversable $entityIds)
     {
-        if (!$this->hasEntity() && empty($entityIds)) {
-            return $this;
-        }
-
-        $connection = $this->getConnection();
-        $table = $this->getIdxTable();
-
-        if (!$this->tableStrategy->getUseIdxTable()) {
-            $additionalIdxTable = $connection->getTableName(self::TRANSIT_PREFIX . $this->getIdxTable());
-            $connection->createTemporaryTableLike($additionalIdxTable, $table);
-            $query = $connection->insertFromSelect(
-                $this->_prepareGroupedProductPriceDataSelect($entityIds),
-                $additionalIdxTable,
-                []
-            );
-            $connection->query($query);
-
-            $select = $connection->select()->from($additionalIdxTable);
-            $query = $connection->insertFromSelect(
-                $select,
-                $table,
-                [],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
-            );
-            $connection->query($query);
-            $connection->dropTemporaryTable($additionalIdxTable);
-        } else {
-            $query = $this->_prepareGroupedProductPriceDataSelect($entityIds)->insertFromSelect($table);
-            $connection->query($query);
-        }
-        return $this;
+        /** @var IndexTableStructure $temporaryPriceTable */
+        $temporaryPriceTable = $this->indexTableStructureFactory->create([
+            'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
+            'entityField' => 'entity_id',
+            'customerGroupField' => 'customer_group_id',
+            'websiteField' => 'website_id',
+            'taxClassField' => 'tax_class_id',
+            'originalPriceField' => 'price',
+            'finalPriceField' => 'final_price',
+            'minPriceField' => 'min_price',
+            'maxPriceField' => 'max_price',
+            'tierPriceField' => 'tier_price',
+        ]);
+        $query = $this->prepareGroupedProductPriceDataSelect($dimensions, iterator_to_array($entityIds))
+            ->insertFromSelect($temporaryPriceTable->getTableName());
+        $this->getConnection()->query($query);
     }
 
     /**
      * Prepare data index select for Grouped products prices
      *
-     * @param int|array $entityIds  the parent entity ids limitation
+     * @param array $dimensions
+     * @param array $entityIds the parent entity ids limitation
      * @return \Magento\Framework\DB\Select
+     * @throws \Exception
      */
-    protected function _prepareGroupedProductPriceDataSelect($entityIds = null)
+    private function prepareGroupedProductPriceDataSelect(array $dimensions, array $entityIds)
     {
-        $connection = $this->getConnection();
-        $table = $this->getIdxTable();
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-        $select = $connection->select()->from(
+        $select = $this->getConnection()->select();
+
+        $select->from(
             ['e' => $this->getTable('catalog_product_entity')],
             'entity_id'
-        )->joinLeft(
+        );
+
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $select->joinLeft(
             ['l' => $this->getTable('catalog_product_link')],
-            'e.' . $linkField . ' = l.product_id AND l.link_type_id=' .
-            \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
+            'e.' . $linkField . ' = l.product_id AND l.link_type_id=' . Link::LINK_TYPE_GROUPED,
             []
-        )->join(
-            ['cg' => $this->getTable('customer_group')],
-            '',
-            ['customer_group_id']
         );
-        $this->_addWebsiteJoinToSelect($select, true);
-        $this->_addProductWebsiteJoinToSelect($select, 'cw.website_id', 'e.entity_id');
-        $minCheckSql = $connection->getCheckSql('le.required_options = 0', 'i.min_price', 0);
-        $maxCheckSql = $connection->getCheckSql('le.required_options = 0', 'i.max_price', 0);
-        $select->columns(
-            'website_id',
-            'cw'
-        )->joinLeft(
+        //additional information about inner products
+        $select->joinLeft(
             ['le' => $this->getTable('catalog_product_entity')],
             'le.entity_id = l.linked_product_id',
             []
-        )->joinLeft(
-            ['i' => $table],
-            'i.entity_id = l.linked_product_id AND i.website_id = cw.website_id' .
-            ' AND i.customer_group_id = cg.customer_group_id',
+        );
+        $select->columns(
+            [
+                'i.customer_group_id',
+                'i.website_id',
+            ]
+        );
+        $taxClassId = $this->getConnection()->getCheckSql('MIN(i.tax_class_id) IS NULL', '0', 'MIN(i.tax_class_id)');
+        $minCheckSql = $this->getConnection()->getCheckSql('le.required_options = 0', 'i.min_price', 0);
+        $maxCheckSql = $this->getConnection()->getCheckSql('le.required_options = 0', 'i.max_price', 0);
+        $select->join(
+            ['i' => $this->getMainTable($dimensions)],
+            'i.entity_id = l.linked_product_id',
             [
-                'tax_class_id' => $this->getConnection()->getCheckSql(
-                    'MIN(i.tax_class_id) IS NULL',
-                    '0',
-                    'MIN(i.tax_class_id)'
-                ),
+                'tax_class_id' => $taxClassId,
                 'price' => new \Zend_Db_Expr('NULL'),
                 'final_price' => new \Zend_Db_Expr('NULL'),
                 'min_price' => new \Zend_Db_Expr('MIN(' . $minCheckSql . ')'),
                 'max_price' => new \Zend_Db_Expr('MAX(' . $maxCheckSql . ')'),
                 'tier_price' => new \Zend_Db_Expr('NULL'),
             ]
-        )->group(
-            ['e.entity_id', 'cg.customer_group_id', 'cw.website_id']
-        )->where(
+        );
+        $select->group(
+            ['e.entity_id', 'i.customer_group_id', 'i.website_id']
+        );
+        $select->where(
             'e.type_id=?',
-            $this->getTypeId()
+            GroupedType::TYPE_CODE
         );
 
         if ($entityIds !== null) {
             $select->where('e.entity_id IN(?)', $entityIds);
         }
 
-        /**
-         * Add additional external limitation
-         */
-        $this->_eventManager->dispatch(
-            'catalog_product_prepare_index_select',
-            [
-                'select' => $select,
-                'entity_field' => new \Zend_Db_Expr('e.entity_id'),
-                'website_field' => new \Zend_Db_Expr('cw.website_id'),
-                'store_field' => new \Zend_Db_Expr('cs.store_id')
-            ]
-        );
         return $select;
     }
+
+    /**
+     * Get main table
+     *
+     * @param array $dimensions
+     * @return string
+     */
+    private function getMainTable($dimensions)
+    {
+        if ($this->fullReindexAction) {
+            return $this->tableMaintainer->getMainReplicaTable($dimensions);
+        }
+        return $this->tableMaintainer->getMainTable($dimensions);
+    }
+
+    /**
+     * Get connection
+     *
+     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @throws \DomainException
+     */
+    private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
+    {
+        if ($this->connection === null) {
+            $this->connection = $this->resource->getConnection($this->connectionName);
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Get table
+     *
+     * @param string $tableName
+     * @return string
+     */
+    private function getTable($tableName)
+    {
+        return $this->resource->getTableName($tableName, $this->connectionName);
+    }
 }
diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
new file mode 100644
index 0000000000000..6a6b35557100a
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\Pricing\Price;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+
+/**
+ * Configured regular price model.
+ */
+class ConfiguredRegularPrice extends AbstractPrice implements ConfiguredPriceInterface
+{
+    /**
+     * Price type configured
+     */
+    const PRICE_CODE = ConfiguredPriceInterface::CONFIGURED_REGULAR_PRICE_CODE;
+
+    /**
+     * @var null|ItemInterface
+     */
+    private $item;
+
+    /**
+     * @param ItemInterface $item
+     * @return $this
+     */
+    public function setItem(ItemInterface $item): ConfiguredRegularPrice
+    {
+        $this->item = $item;
+
+        return $this;
+    }
+
+    /**
+     * Calculate configured price.
+     *
+     * @return float
+     */
+    protected function calculatePrice(): float
+    {
+        $value = 0.;
+        /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $typeInstance */
+        $typeInstance = $this->getProduct()->getTypeInstance();
+        $associatedProducts = $typeInstance
+            ->setStoreFilter($this->getProduct()->getStore(), $this->getProduct())
+            ->getAssociatedProducts($this->getProduct());
+
+        foreach ($associatedProducts as $product) {
+            /** @var Product $product */
+            /** @var \Magento\Wishlist\Model\Item\Option $customOption */
+            $customOption = $this->getProduct()
+                ->getCustomOption('associated_product_' . $product->getId());
+            if (!$customOption) {
+                continue;
+            }
+            $finalPrice = $product->getPriceInfo()
+                ->getPrice(\Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE)
+                ->getValue();
+            $value += $finalPrice * ($customOption->getValue() ?: 1);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Price value of product with configured options.
+     *
+     * @return bool|float
+     */
+    public function getValue()
+    {
+        if ($this->item) {
+            return $this->calculatePrice();
+        } else {
+            if ($this->value === null) {
+                $price = $this->product->getPrice();
+                $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
+                $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : false;
+            }
+
+            return $this->value;
+        }
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Setup/InstallData.php b/app/code/Magento/GroupedProduct/Setup/InstallData.php
deleted file mode 100644
index f58cd65785420..0000000000000
--- a/app/code/Magento/GroupedProduct/Setup/InstallData.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GroupedProduct\Setup;
-
-use Magento\Catalog\Model\Product;
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /**
-         * Install grouped product link type
-         */
-        $data = [
-            'link_type_id' => \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
-            'code' => 'super',
-        ];
-        $setup->getConnection()
-            ->insertOnDuplicate($setup->getTable('catalog_product_link_type'), $data);
-
-        /**
-         * Install grouped product link attributes
-         */
-        $select = $setup->getConnection()
-            ->select()
-            ->from(
-                ['c' => $setup->getTable('catalog_product_link_attribute')]
-            )
-            ->where(
-                "c.link_type_id=?",
-                \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED
-            );
-        $result = $setup->getConnection()->fetchAll($select);
-
-        if (!$result) {
-            $data = [
-                [
-                    'link_type_id' => \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
-                    'product_link_attribute_code' => 'position',
-                    'data_type' => 'int',
-                ],
-                [
-                    'link_type_id' => \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
-                    'product_link_attribute_code' => 'qty',
-                    'data_type' => 'decimal'
-                ],
-            ];
-
-            $setup->getConnection()->insertMultiple($setup->getTable('catalog_product_link_attribute'), $data);
-        }
-
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        $field = 'country_of_manufacture';
-        $applyTo = explode(',', $eavSetup->getAttribute(Product::ENTITY, $field, 'apply_to'));
-        if (!in_array('grouped', $applyTo)) {
-            $applyTo[] = 'grouped';
-            $eavSetup->updateAttribute(Product::ENTITY, $field, 'apply_to', implode(',', $applyTo));
-        }
-    }
-}
diff --git a/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php b/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php
new file mode 100644
index 0000000000000..9f3e1a58267ad
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GroupedProduct\Setup\Patch\Data;
+
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InitializeGroupedProductLinks
+ * @package Magento\GroupedProduct\Setup\Patch
+ */
+class InitializeGroupedProductLinks implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * InitializeGroupedProductLinks constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /**
+         * Install grouped product link type
+         */
+        $data = [
+            'link_type_id' => \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
+            'code' => 'super',
+        ];
+        $this->moduleDataSetup->getConnection()->insertOnDuplicate(
+            $this->moduleDataSetup->getTable('catalog_product_link_type'),
+            $data
+        );
+
+        /**
+         * Install grouped product link attributes
+         */
+        $select = $this->moduleDataSetup->getConnection()
+            ->select()
+            ->from(
+                ['c' => $this->moduleDataSetup->getTable('catalog_product_link_attribute')]
+            )
+            ->where(
+                "c.link_type_id=?",
+                \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED
+            );
+        $result = $this->moduleDataSetup->getConnection()->fetchAll($select);
+        if (!$result) {
+            $data = [
+                [
+                    'link_type_id' => \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
+                    'product_link_attribute_code' => 'position',
+                    'data_type' => 'int',
+                ],
+                [
+                    'link_type_id' => \Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED,
+                    'product_link_attribute_code' => 'qty',
+                    'data_type' => 'decimal'
+                ],
+            ];
+            $this->moduleDataSetup->getConnection()->insertMultiple(
+                $this->moduleDataSetup->getTable('catalog_product_link_attribute'),
+                $data
+            );
+        }
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $field = 'country_of_manufacture';
+        $applyTo = explode(',', $eavSetup->getAttribute(Product::ENTITY, $field, 'apply_to'));
+        if (!in_array('grouped', $applyTo)) {
+            $applyTo[] = 'grouped';
+            $eavSetup->updateAttribute(Product::ENTITY, $field, 'apply_to', implode(',', $applyTo));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php b/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php
new file mode 100644
index 0000000000000..65a75099fffd2
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GroupedProduct\Setup\Patch\Data;
+
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateProductRelations
+ * @package Magento\GroupedProduct\Setup\Patch
+ */
+class UpdateProductRelations implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var Relation
+     */
+    private $relationProcessor;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Catalog\Model\ResourceModel\Product\Relation $relationProcessor
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->relationProcessor = $relationProcessor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+            $connection = $this->moduleDataSetup->getConnection();
+            $select = $connection->select()
+                ->from(
+                    $this->relationProcessor->getTable('catalog_product_link'),
+                    ['product_id', 'linked_product_id']
+                )
+                ->where('link_type_id = ?', Link::LINK_TYPE_GROUPED);
+
+            $connection->query(
+                $connection->insertFromSelect(
+                    $select,
+                    $this->relationProcessor->getMainTable(),
+                    ['parent_id', 'child_id'],
+                    AdapterInterface::INSERT_IGNORE
+                )
+            );
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeGroupedProductLinks::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Setup/UpgradeData.php b/app/code/Magento/GroupedProduct/Setup/UpgradeData.php
deleted file mode 100644
index 85abe8c414eb0..0000000000000
--- a/app/code/Magento/GroupedProduct/Setup/UpgradeData.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GroupedProduct\Setup;
-
-use Magento\Catalog\Model\ResourceModel\Product\Relation;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var Relation
-     */
-    private $relationProcessor;
-
-    /**
-     * UpgradeData constructor
-     * @param Relation $relationProcessor
-     */
-    public function __construct(Relation $relationProcessor)
-    {
-        $this->relationProcessor = $relationProcessor;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $connection = $setup->getConnection();
-            $select = $connection->select()
-                ->from(
-                    $this->relationProcessor->getTable('catalog_product_link'),
-                    ['product_id', 'linked_product_id']
-                )
-                ->where('link_type_id = ?', Link::LINK_TYPE_GROUPED);
-
-            $connection->query(
-                $connection->insertFromSelect(
-                    $select,
-                    $this->relationProcessor->getMainTable(),
-                    ['parent_id', 'child_id'],
-                    AdapterInterface::INSERT_IGNORE
-                )
-            );
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
new file mode 100644
index 0000000000000..9360ed6e42792
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Check that required fields are actually required-->
+    <actionGroup name="checkRequiredFieldsInGroupedProductForm">
+        <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
+        <clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductName"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeStillOnEditPage"/>
+        <see selector="{{AdminProductFormSection.fieldError('name')}}" userInput="This is a required field." stepKey="seeNameRequired"/>
+        <see selector="{{AdminProductFormSection.fieldError('sku')}}" userInput="This is a required field." stepKey="seeSkuRequired"/>
+    </actionGroup>
+
+    <!--Fill main fields in grouped product form-->
+    <actionGroup name="fillGroupedProductForm">
+        <arguments>
+            <argument name="product" defaultValue="GroupedProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductName"/>
+    </actionGroup>
+
+    <!--Filter product grid and see expected grouped product-->
+    <actionGroup name="viewGroupedProductInAdminGrid">
+        <arguments>
+            <argument name="product" defaultValue="GroupedProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{product.type_id}}" stepKey="selectionProductType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.name}}"  stepKey="seeProductNameInGrid"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
+    </actionGroup>
+
+    <!--Fill product min quantity in group products grid-->
+    <actionGroup name="fillDefaultQuantityForLinkedToGroupProductInGrid">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="qty" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminAddedProductsToGroupGrid.inputByProductName(productName)}}" userInput="{{qty}}" stepKey="fillDefaultQtyForLinkedProduct"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
new file mode 100644
index 0000000000000..4d979953a934e
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="GroupedProduct" type="product">
+        <data key="sku" unique="suffix">groupedproduct</data>
+        <data key="type_id">grouped</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">GroupedProduct</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">groupedproduct</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
+    <entity name="ApiGroupedProduct" type="product3">
+        <data key="sku" unique="suffix">api-grouped-product</data>
+        <data key="type_id">grouped</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">Api Grouped Product</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">api-grouped-product</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
new file mode 100644
index 0000000000000..882275d0060b4
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductLinkSimple1" type="product_link">
+        <var key="sku" entityKey="sku" entityType="product3"/>
+        <var key="linked_product_sku" entityKey="sku" entityType="product"/>
+        <data key="link_type">associated</data>
+        <data key="linked_product_type">simple</data>
+        <data key="position">1</data>
+        <requiredEntity type="product_link_extension_attribute">Qty1000</requiredEntity>
+    </entity>
+    <entity name="ProductLinkSimple2" type="product_link">
+        <var key="sku" entityKey="sku" entityType="product3"/>
+        <var key="linked_product_sku" entityKey="sku" entityType="product"/>
+        <data key="link_type">associated</data>
+        <data key="linked_product_type">simple</data>
+        <data key="position">2</data>
+        <requiredEntity type="product_link_extension_attribute">Qty1000</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
new file mode 100644
index 0000000000000..b580c876a6f30
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Qty1000" type="product_link_extension_attribute">
+        <data key="qty">1000</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
new file mode 100644
index 0000000000000..68c95e856e2f8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="OneSimpleProductLink" type="product_links">
+        <requiredEntity type="product_link">ProductLinkSimple1</requiredEntity>
+    </entity>
+    <entity name="OneMoreSimpleProductLink" type="product_links">
+        <requiredEntity type="product_link">ProductLinkSimple2</requiredEntity>
+    </entity>
+    <entity name="TwoSimpleProductLinks" type="product_links">
+        <array key="items">
+            <item>ProductLinkSimple1</item>
+            <item>ProductLinkSimple2</item>
+        </array>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE.txt b/app/code/Magento/GroupedProduct/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE.txt
rename to app/code/Magento/GroupedProduct/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE_AFL.txt b/app/code/Magento/GroupedProduct/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE_AFL.txt
rename to app/code/Magento/GroupedProduct/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..7cf998cff3eea
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminProductFormGroupedProductsSection"/>
+        <section name="AdminAddProductsToGroupPanel"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/README.md b/app/code/Magento/GroupedProduct/Test/Mftf/README.md
new file mode 100644
index 0000000000000..471745bd46e36
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Grouped Product Functional Tests
+
+The Functional Test Module for **Magento Grouped Product** module.
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
new file mode 100644
index 0000000000000..e2c4286135d2e
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminAddProductsToGroupPanel">
+        <element name="addSelectedProducts" type="button" selector=".product_form_product_form_grouped_grouped_products_modal button.action-primary" timeout="30"/>
+        <element name="filters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-expand']" timeout="30"/>
+        <element name="applyFilters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-apply']" timeout="30"/>
+        <element name="nameFilter" type="input" selector=".product_form_product_form_grouped_grouped_products_modal [name='name']"/>
+        <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
+        <element name="nThCheckbox" type="input" selector="tr[data-repeat-index='{{n}}'] .admin__control-checkbox" parameterized="true"/>
+    </section>
+
+    <section name="AdminAddedProductsToGroupGrid">
+        <element name="inputByProductName" type="input" selector="//div[@data-index='grouped']//table//tr[td[@data-index='name']//span[text()='{{productName}}']]//td[@data-index='qty']//input" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
new file mode 100644
index 0000000000000..547c856d144c8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormGroupedProductsSection">
+        <element name="toggleGroupedProduct" type="button" selector="div[data-index=grouped] .admin__collapsible-title"/>
+        <element name="addProductsToGroup" type="button" selector="button[data-index='grouped_products_button']" timeout="30"/>
+        <element name="nextActionButton" type="button" selector="//*[@data-index='grouped']//*[@class='action-next']"/>
+        <element name="previousActionButton" type="button" selector="//*[@data-index='grouped']//*[@class='action-previous']"/>
+        <element name="positionProduct" type="input" selector="//tbody/tr[{{arg}}][contains(@class,'data-row')]/td[10]//input[@class='position-widget-input']" parameterized="true"/>
+        <element name="nameProductFromGrid" type="text" selector="//tbody/tr[{{arg}}][contains(@class,'data-row')]/td[4]//*[@class='admin__field-control']//span" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
new file mode 100644
index 0000000000000..5d65f82690235
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultImageGroupedProductTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default images for a Grouped Product"/>
+            <description value="Admin should be able to add default images for a Grouped Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-106"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
+        <click selector="body" stepKey="clickBodyToCorrectFocusGrouped"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
+            <argument name="sku" value="api-simple-product"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="checkFilterResult1"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('1')}}" stepKey="checkFilterResult2"/>
+
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
new file mode 100644
index 0000000000000..8634fc3f6f9dc
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultVideoGroupedProductTest"  extends="AdminAddDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to add default video for a Grouped Product"/>
+            <description value="Admin should be able to add default video for a Grouped Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-108"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a grouped product -->
+        <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!-- Add two simple products to grouped product -->
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductSection" after="scrollToSection"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup" after="openGroupedProductSection"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForFilter" after="clickAddProductsToGroup"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForFilter">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts" before="saveProductForm"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductSetEditContentTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductSetEditContentTest.xml
new file mode 100644
index 0000000000000..3938d91c515f1
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductSetEditContentTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminGroupedProductSetEditContentTest" extends="AdminSimpleProductSetEditContentTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Create/edit grouped product"/>
+            <title value="Admin should be able to set/edit product Content when editing a grouped product"/>
+            <description value="Admin should be able to set/edit product Content when editing a grouped product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3423"/>
+            <group value="GroupedProduct"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <after>
+            <!-- Delete grouped product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="GroupedProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!--Checking content storefront-->
+        <amOnPage url="{{GroupedProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
new file mode 100644
index 0000000000000..b59cf1e2175d8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminGroupedProductsAreListedWhenOutOfStock">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="MAGETWO-93181: Grouped product doesn't take care about his Linked Products when SalableQuantity &lt; ProductLink.ExtensionAttributes.Qty after Source Deduction"/>
+            <title value="Products in group should show in admin list even when they are out of stock"/>
+            <description value="Products in group should show in admin list even when they are out of stock"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93181"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category1"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="category1"/>
+            </createData>
+            <!--Out of Stock-->
+            <createData entity="SimpleProduct4" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="category1"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="category1" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <!-- Add two simple products to grouped product -->
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductSection"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForFilter"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption1"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption2"/>
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+
+        <!-- Save product -->
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToProducts"/>
+
+        <waitForText userInput="$$simpleProduct1.name$$" stepKey="assertProductIsInTheList"/>
+        <waitForText userInput="$$simpleProduct2.name$$" stepKey="assertProduct2IsInTheList"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
new file mode 100644
index 0000000000000..8117d627a370c
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminGroupedSetEditRelatedProductsTest" extends="AdminSimpleSetEditRelatedProductsTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Create/edit grouped product"/>
+            <title value="Admin should be able to set/edit Related Products information when editing a grouped product"/>
+            <description value="Admin should be able to set/edit Related Products information when editing a grouped product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3755"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before></before>
+        <after>
+            <!-- Delete grouped product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="GroupedProduct"/>
+            </actionGroup>
+        </after>
+
+        <!-- Create product -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!--See related product in storefront-->
+        <amOnPage url="{{GroupedProduct.sku}}.html" stepKey="goToStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
new file mode 100644
index 0000000000000..da7cfaeb71566
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultImageGroupedProductTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default images from a Grouped Product"/>
+            <description value="Admin should be able to remove default images from a Grouped Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-198"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
+        <click selector="body" stepKey="clickBodyToCorrectFocusGrouped"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
+            <argument name="sku" value="api-simple-product"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="checkFilterResult1"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('1')}}" stepKey="checkFilterResult2"/>
+
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Remove image from product -->
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
new file mode 100644
index 0000000000000..25c45abdfe047
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminRemoveDefaultVideoGroupedProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin should be able to remove default video from a Grouped Product"/>
+            <description value="Admin should be able to remove default video from a Grouped Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-203"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a grouped product -->
+        <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!-- Add two simple products to grouped product -->
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToSection" after="addProductVideo"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductSection" after="scrollToSection"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup" after="openGroupedProductSection"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForFilter" after="clickAddProductsToGroup"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku1" after="waitForFilter">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption1" after="filterProductGridBySku1"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku2" after="checkOption1">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkOption2" after="filterProductGridBySku2"/>
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts" before="saveProductForm"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
new file mode 100644
index 0000000000000..ad5fbbb30edeb
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSortingAssociatedProductsTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="MAGETWO-91633: Grouped Products: Associated Products Can't Be Sorted Between Pages"/>
+            <title value="Grouped Products: Sorting Associated Products Between Pages"/>
+            <description value="Make sure that products in grid were recalculated when sorting associated products between pages"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95085"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <!-- Create 23 products so that grid can have more than one page -->
+            <createData entity="ApiSimpleProduct" stepKey="product1">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product2">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product3">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product4">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product5">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product6">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product7">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product8">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product9">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product10">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product11">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product12">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product13">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product14">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product15">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product16">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product17">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product18">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product19">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product20">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product21">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product22">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product23">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+        </before>
+        <after>
+            <!--Delete created grouped product-->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="GroupedProduct"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="product3" stepKey="deleteProduct3"/>
+            <deleteData createDataKey="product4" stepKey="deleteProduct4"/>
+            <deleteData createDataKey="product5" stepKey="deleteProduct5"/>
+            <deleteData createDataKey="product6" stepKey="deleteProduct6"/>
+            <deleteData createDataKey="product7" stepKey="deleteProduct7"/>
+            <deleteData createDataKey="product8" stepKey="deleteProduct8"/>
+            <deleteData createDataKey="product9" stepKey="deleteProduct9"/>
+            <deleteData createDataKey="product10" stepKey="deleteProduct10"/>
+            <deleteData createDataKey="product11" stepKey="deleteProduct11"/>
+            <deleteData createDataKey="product12" stepKey="deleteProduct12"/>
+            <deleteData createDataKey="product13" stepKey="deleteProduct13"/>
+            <deleteData createDataKey="product14" stepKey="deleteProduct14"/>
+            <deleteData createDataKey="product15" stepKey="deleteProduct15"/>
+            <deleteData createDataKey="product16" stepKey="deleteProduct16"/>
+            <deleteData createDataKey="product17" stepKey="deleteProduct17"/>
+            <deleteData createDataKey="product18" stepKey="deleteProduct18"/>
+            <deleteData createDataKey="product19" stepKey="deleteProduct19"/>
+            <deleteData createDataKey="product20" stepKey="deleteProduct20"/>
+            <deleteData createDataKey="product21" stepKey="deleteProduct21"/>
+            <deleteData createDataKey="product22" stepKey="deleteProduct22"/>
+            <deleteData createDataKey="product23" stepKey="deleteProduct23"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create grouped Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
+        <click selector="body" stepKey="clickBodyToCorrectFocusGrouped"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
+            <argument name="sku" value="api-simple-product"/>
+        </actionGroup>
+
+        <!-- Select all, then start the bulk update attributes flow -->
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+        <waitForPageLoad stepKey="waitForProductsAdded"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Open created Product group-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfExist"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchProductGridForm">
+            <argument name="keyword" value="GroupedProduct.name"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(GroupedProduct.name)}}" stepKey="openGroupedProduct"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection2"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection2"/>
+
+        <!--Change position value for the Product Position 0-->
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('1')}}" stepKey="grabNameProductPosition0"/>
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPositionFirst"/>
+        <fillField selector="{{AdminProductFormGroupedProductsSection.positionProduct('1')}}" userInput="21" stepKey="fillFieldProductPosition0"/>
+        <doubleClick selector="{{AdminProductFormGroupedProductsSection.nextActionButton}}" stepKey="clickButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax1"/>
+
+        <!--Go to next page and verify that Products in grid were recalculated-->
+        <doubleClick selector="{{AdminProductFormGroupedProductsSection.nextActionButton}}" stepKey="clickNextActionButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax2"/>
+
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPosition21"/>
+        <assertEquals stepKey="assertProductsRecalculated">
+            <actualResult type="string">$grabNameProductPosition0</actualResult>
+            <expectedResult type="string">$grabNameProductPosition21</expectedResult>
+        </assertEquals>
+
+        <!--Change position value for the product to 1-->
+        <fillField selector="{{AdminProductFormGroupedProductsSection.positionProduct('2')}}" userInput="1" stepKey="fillFieldProductPosition1"/>
+        <doubleClick selector="{{AdminProductFormGroupedProductsSection.previousActionButton}}" stepKey="clickButton2"/>
+        <waitForAjaxLoad stepKey="waitForAjax3"/>
+
+        <!--Go to previous page and verify that Products in grid were recalculated-->
+        <click selector="{{AdminProductFormGroupedProductsSection.previousActionButton}}" stepKey="clickPreviousActionButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax4"/>
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPosition2"/>
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('1')}}" stepKey="grabNameProductPositionZero"/>
+        <assertEquals stepKey="assertProductsRecalculated2">
+            <actualResult type="string">$grabNameProductPosition2</actualResult>
+            <expectedResult type="string">$grabNameProductPosition0</expectedResult>
+        </assertEquals>
+        <assertEquals stepKey="assertProductsRecalculated3">
+            <actualResult type="string">$grabNameProductPositionFirst</actualResult>
+            <expectedResult type="string">$grabNameProductPositionZero</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
new file mode 100644
index 0000000000000..0fd52ac4a65a4
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
@@ -0,0 +1,170 @@
+<?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="AdvanceCatalogSearchGroupedProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Grouped product with product name"/>
+            <description value="Guest customer should be able to advance search Grouped product with product name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-141"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiGroupedProduct" stepKey="product"/>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple2"/>
+            </updateData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Grouped product with product sku"/>
+            <description value="Guest customer should be able to advance search Grouped product with product sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-146"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiGroupedProduct" stepKey="product"/>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple2"/>
+            </updateData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Grouped product with product description"/>
+            <description value="Guest customer should be able to advance search Grouped product with product description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-282"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiGroupedProduct" stepKey="product"/>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple2"/>
+            </updateData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Grouped product with product short description"/>
+            <description value="Guest customer should be able to advance search Grouped product with product short description"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-283"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiGroupedProduct" stepKey="product"/>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple2"/>
+            </updateData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Advanced Catalog Product Search for all product types"/>
+            <title value="Guest customer should be able to advance search Grouped product with product price"/>
+            <description value="Guest customer should be able to advance search Grouped product with product price"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-284"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiGroupedProduct" stepKey="product"/>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addProductOne" stepKey="addProductTwo">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="simple2"/>
+            </updateData>
+            <getData entity="GetProduct3" stepKey="arg1">
+                <requiredEntity createDataKey="product"/>
+            </getData>
+            <getData entity="GetProduct" stepKey="arg2">
+                <requiredEntity createDataKey="simple1"/>
+            </getData>
+            <getData entity="GetProduct" stepKey="arg3">
+                <requiredEntity createDataKey="simple2"/>
+            </getData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..dbe3dddfca81b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CAdminTest">
+        <!--Create Grouped Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageGrouped" after="seeSimpleProductInGrid"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadGrouped" after="visitAdminProductPageGrouped"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateGroupedProduct" after="waitForProductPageLoadGrouped">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="checkRequiredFieldsInGroupedProductForm" stepKey="checkRequiredFieldsProductGrouped" after="goToCreateGroupedProduct"/>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillGroupedProductForm" after="checkRequiredFieldsProductGrouped">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection" after="fillGroupedProductForm"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection" after="scrollToGroupedSection"/>
+        <click selector="body" stepKey="clickBodyToCorrectFocusGrouped" after="openGroupedProductsSection"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup" after="clickBodyToCorrectFocusGrouped"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal" after="clickAddProductsToGroup"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions" after="waitForGroupedProductModal">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkFilterResult" after="filterGroupedProductOptions"/>
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts" after="checkFilterResult"/>
+        <actionGroup ref="saveProductForm" stepKey="saveGroupedProduct" after="clickAddSelectedGroupProducts"/>
+        <actionGroup ref="viewGroupedProductInAdminGrid" stepKey="viewGroupedProductInGrid" after="saveGroupedProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <comment userInput="Clean up grouped product" stepKey="cleanUpGroupedProduct" after="deleteSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteGroupedProduct" after="cleanUpGroupedProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
new file mode 100644
index 0000000000000..a56512f84a9b8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetGroupedProductTest" extends="NewProductsListWidgetTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set Grouped Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set Grouped Product as new so that it shows up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-121"/>
+            <group value="GroupedProduct"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- A Cms page containing the New Products Widget gets created here via extends -->
+
+        <!-- Create a grouped product to appear in the widget -->
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
+        <click selector="{{AdminProductGridActionSection.addGroupedProduct}}" stepKey="clickAddGroupedProduct"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
+        <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="scrollToAddProductsToGroup"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
+            <argument name="sku" value="api-simple-product"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="checkFilterResult1"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('1')}}" stepKey="checkFilterResult2"/>
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+
+        <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
+
+        <!-- Check for product on the CMS page with the New Products widget -->
+
+        <amOnPage url="{{_newDefaultCmsPage.identifier}}" stepKey="amOnCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPage"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
index 5dc12fe39c46a..9302706342f13 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
@@ -11,128 +11,22 @@
 class GroupedTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /** @var Renderer */
-    protected $_renderer;
+    private $renderer;
 
     protected function setUp()
     {
         parent::setUp();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped::class,
-            ['scopeConfig' => $this->_scopeConfig]
+            ['scopeConfig' => $this->scopeConfig]
         );
     }
 
-    /**
-     * Child thumbnail is available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnail()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['childProduct'],
-            $productForThumbnail,
-            'Child product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is not available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailChildThumbnailNotAvailable()
-    {
-        $childHasThumbnail = false;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is available and config option is set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailConfigUseParent()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = true;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned ' .
-            'if "checkout/cart/grouped_product_image" is set to "parent" in system config.'
-        );
-    }
-
-    /**
-     * Initialize parent grouped product and child product.
-     *
-     * @param bool $childHasThumbnail
-     * @param bool $useParentThumbnail
-     * @return \Magento\Catalog\Model\Product[]|\PHPUnit_Framework_MockObject_MockObject[]
-     */
-    protected function _initProducts($childHasThumbnail = true, $useParentThumbnail = false)
-    {
-        /** Set option which can force usage of parent product thumbnail when grouped product is displayed */
-        $thumbnailToBeUsed = $useParentThumbnail
-            ? ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            : ThumbnailSource::OPTION_USE_OWN_IMAGE;
-        $this->_scopeConfig->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->with(
-            Renderer::CONFIG_THUMBNAIL_SOURCE
-        )->will(
-            $this->returnValue($thumbnailToBeUsed)
-        );
-
-        /** Initialized parent product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $parentProduct */
-        $parentProduct = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        /** Initialize child product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $childProduct */
-        $childProduct = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getThumbnail', '__wakeup']);
-        $childThumbnail = $childHasThumbnail ? 'thumbnail.jpg' : 'no_selection';
-        $childProduct->expects($this->any())->method('getThumbnail')->will($this->returnValue($childThumbnail));
-
-        /** Mock methods which return parent and child products */
-        /** @var \Magento\Quote\Model\Quote\Item\Option|\PHPUnit_Framework_MockObject_MockObject $itemOption */
-        $itemOption = $this->createMock(\Magento\Quote\Model\Quote\Item\Option::class);
-        $itemOption->expects($this->any())->method('getProduct')->will($this->returnValue($parentProduct));
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $item */
-        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($childProduct));
-        $item->expects(
-            $this->any()
-        )->method(
-            'getOptionByCode'
-        )->with(
-            'product_type'
-        )->will(
-            $this->returnValue($itemOption)
-        );
-        $this->_renderer->setItem($item);
-
-        return ['parentProduct' => $parentProduct, 'childProduct' => $childProduct];
-    }
-
     public function testGetIdentities()
     {
         $productTags = ['catalog_product_1'];
@@ -140,7 +34,7 @@ public function testGetIdentities()
         $product->expects($this->exactly(2))->method('getIdentities')->will($this->returnValue($productTags));
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $item->expects($this->exactly(2))->method('getProduct')->will($this->returnValue($product));
-        $this->_renderer->setItem($item);
-        $this->assertEquals(array_merge($productTags, $productTags), $this->_renderer->getIdentities());
+        $this->renderer->setItem($item);
+        $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/View/Type/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/View/Type/GroupedTest.php
index 77ffb200f84e0..e8ed2e5d6f880 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/View/Type/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Product/View/Type/GroupedTest.php
@@ -111,6 +111,9 @@ public function testSetPreconfiguredValue($id)
         $this->groupedView->setPreconfiguredValue();
     }
 
+    /**
+     * @return array
+     */
     public function setPreconfiguredValueDataProvider()
     {
         return ['item_id_exist_in_config' => ['id_one'], 'item_id_not_exist_in_config' => ['id_two']];
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Initialization/Helper/ProductLinks/Plugin/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Initialization/Helper/ProductLinks/Plugin/GroupedTest.php
index 309794a6cc37d..2dbdbb551f97a 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Initialization/Helper/ProductLinks/Plugin/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Initialization/Helper/ProductLinks/Plugin/GroupedTest.php
@@ -92,6 +92,9 @@ public function testBeforeInitializeLinksRequestDoesNotHaveGrouped($productType)
         $this->model->beforeInitializeLinks($this->subjectMock, $this->productMock, []);
     }
 
+    /**
+     * @return array
+     */
     public function productTypeDataProvider()
     {
         return [
@@ -141,6 +144,9 @@ public function testBeforeInitializeLinksRequestHasGrouped($linksData)
         $this->model->beforeInitializeLinks($this->subjectMock, $this->productMock, ['associated' => $linksData]);
     }
 
+    /**
+     * @return array
+     */
     public function linksDataProvider()
     {
         return [
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
index 06c07a8dc34a8..e50d6491a6aca 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
@@ -611,9 +611,9 @@ public function testPrepareForCartAdvancedZeroQty()
 
     public function testFlushAssociatedProductsCache()
     {
-        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['unsData']);
+        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['unsetData']);
         $productMock->expects($this->once())
-            ->method('unsData')
+            ->method('unsetData')
             ->with('_cache_instance_associated_products')
             ->willReturnSelf();
         $this->assertEquals($productMock, $this->_model->flushAssociatedProductsCache($productMock));
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/FinalPriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/FinalPriceTest.php
index 13e1dde0c526c..97727b286c9cb 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/FinalPriceTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/FinalPriceTest.php
@@ -102,6 +102,10 @@ public function testGetValueWithoutMinProduct()
         $this->assertEquals(0.00, $this->finalPrice->getValue());
     }
 
+    /**
+     * @param $price
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getProductMock($price)
     {
         $priceTypeMock = $this->createMock(\Magento\Catalog\Pricing\Price\FinalPrice::class);
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
index 6ef87117deae2..327b47d4a75d8 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
@@ -34,6 +34,7 @@ class GroupedTest extends AbstractModifierTest
     const LINKED_PRODUCT_NAME = 'linked';
     const LINKED_PRODUCT_QTY = '0';
     const LINKED_PRODUCT_POSITION = 1;
+    const LINKED_PRODUCT_POSITION_CALCULATED = 1;
     const LINKED_PRODUCT_PRICE = '1';
 
     /**
@@ -212,6 +213,7 @@ public function testModifyData()
                             'price' => null,
                             'qty' => self::LINKED_PRODUCT_QTY,
                             'position' => self::LINKED_PRODUCT_POSITION,
+                            'positionCalculated' => self::LINKED_PRODUCT_POSITION_CALCULATED,
                             'thumbnail' => null,
                             'type_id' => null,
                             'status' => null,
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php
index 8dc8fc0483d41..9a4662ffa42cc 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php
@@ -75,6 +75,9 @@ protected function setUp()
             ->getMockForAbstractClass();
     }
 
+    /**
+     * @return object
+     */
     protected function getModel()
     {
         return $this->objectManager->getObject(GroupedProductDataProvider::class, [
diff --git a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
index 2d1a1d19757e2..57d9bc78aaf28 100644
--- a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
@@ -133,7 +133,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -143,12 +143,17 @@ public function modifyData(array $data)
         if ($modelId) {
             $storeId = $this->locator->getStore()->getId();
             $data[$product->getId()]['links'][self::LINK_TYPE] = [];
-            foreach ($this->productLinkRepository->getList($product) as $linkItem) {
+            $linkedItems = $this->productLinkRepository->getList($product);
+            usort($linkedItems, function ($a, $b) {
+                return $a->getPosition() <=> $b->getPosition();
+            });
+            foreach ($linkedItems as $index => $linkItem) {
                 if ($linkItem->getLinkType() !== self::LINK_TYPE) {
                     continue;
                 }
                 /** @var \Magento\Catalog\Api\Data\ProductInterface $linkedProduct */
                 $linkedProduct = $this->productRepository->get($linkItem->getLinkedProductSku(), false, $storeId);
+                $linkItem->setPosition($index);
                 $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkedProduct, $linkItem);
             }
             $data[$modelId][self::DATA_SOURCE_DEFAULT]['current_store_id'] = $storeId;
@@ -175,6 +180,7 @@ protected function fillData(ProductInterface $linkedProduct, ProductLinkInterfac
             'price' => $currency->toCurrency(sprintf("%f", $linkedProduct->getPrice())),
             'qty' => $linkItem->getExtensionAttributes()->getQty(),
             'position' => $linkItem->getPosition(),
+            'positionCalculated' => $linkItem->getPosition(),
             'thumbnail' => $this->imageHelper->init($linkedProduct, 'product_listing_thumbnail')->getUrl(),
             'type_id' => $linkedProduct->getTypeId(),
             'status' => $this->status->getOptionText($linkedProduct->getStatus()),
@@ -185,7 +191,7 @@ protected function fillData(ProductInterface $linkedProduct, ProductLinkInterfac
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
@@ -454,7 +460,7 @@ protected function getGrid()
                         'label' => null,
                         'renderDefaultRecord' => false,
                         'template' => 'ui/dynamic-rows/templates/grid',
-                        'component' => 'Magento_Ui/js/dynamic-rows/dynamic-rows-grid',
+                        'component' => 'Magento_GroupedProduct/js/grouped-product-grid',
                         'addButton' => false,
                         'itemTemplate' => 'record',
                         'dataScope' => 'data.links',
@@ -555,6 +561,22 @@ protected function fillMeta()
                     ],
                 ],
             ],
+            'positionCalculated' => [
+                'arguments' => [
+                    'data' => [
+                        'config' => [
+                            'label' => __('Position'),
+                            'dataType' => Form\Element\DataType\Number::NAME,
+                            'formElement' => Form\Element\Input::NAME,
+                            'componentType' => Form\Field::NAME,
+                            'elementTmpl' => 'Magento_GroupedProduct/components/position',
+                            'sortOrder' => 90,
+                            'fit' => true,
+                            'dataScope' => 'positionCalculated'
+                        ],
+                    ],
+                ],
+            ],
             'actionDelete' => [
                 'arguments' => [
                     'data' => [
@@ -563,7 +585,7 @@ protected function fillMeta()
                             'componentType' => 'actionDelete',
                             'dataType' => Form\Element\DataType\Text::NAME,
                             'label' => __('Actions'),
-                            'sortOrder' => 90,
+                            'sortOrder' => 100,
                             'fit' => true,
                         ],
                     ],
@@ -577,7 +599,7 @@ protected function fillMeta()
                             'formElement' => Form\Element\Input::NAME,
                             'componentType' => Form\Field::NAME,
                             'dataScope' => 'position',
-                            'sortOrder' => 100,
+                            'sortOrder' => 110,
                             'visible' => false,
                         ],
                     ],
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 7dd450c857129..19509ae3ce084 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -5,26 +5,25 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-msrp": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-msrp": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-grouped-product-sample-data": "Sample Data version:100.3.*"
+        "magento/module-grouped-product-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml b/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
index bbb2054abb14f..5854928afc2fd 100644
--- a/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
+++ b/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
@@ -9,7 +9,7 @@
     <system>
         <section id="checkout" translate="label" type="text" sortOrder="305" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="cart" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                <field id="grouped_product_image" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="grouped_product_image" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Grouped Product Image</label>
                     <source_model>Magento\Catalog\Model\Config\Source\Product\Thumbnail</source_model>
                 </field>
diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml
index f39bcfa01453c..43678d0ad7a82 100644
--- a/app/code/Magento/GroupedProduct/etc/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/di.xml
@@ -48,6 +48,7 @@
             <argument name="prices" xsi:type="array">
                 <item name="final_price" xsi:type="string">Magento\GroupedProduct\Pricing\Price\FinalPrice</item>
                 <item name="configured_price" xsi:type="string">Magento\GroupedProduct\Pricing\Price\ConfiguredPrice</item>
+                <item name="configured_regular_price" xsi:type="string">Magento\GroupedProduct\Pricing\Price\ConfiguredRegularPrice</item>
             </argument>
             <argument name="target" xsi:type="object">Magento\Catalog\Pricing\Price\Pool</argument>
         </arguments>
@@ -87,8 +88,6 @@
             </argument>
         </arguments>
     </type>
-    <preference for="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\GroupedInterface"
-                type="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\Grouped"/>
     <type name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator">
         <arguments>
             <argument name="estimators" xsi:type="array">
@@ -99,4 +98,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array">
+                <item name="grouped" xsi:type="string">Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GroupedProduct/etc/frontend/di.xml b/app/code/Magento/GroupedProduct/etc/frontend/di.xml
deleted file mode 100644
index 755d53f46bfdd..0000000000000
--- a/app/code/Magento/GroupedProduct/etc/frontend/di.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="grouped" xsi:type="string">Magento\GroupedProduct\CustomerData\GroupedItem</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/GroupedProduct/etc/module.xml b/app/code/Magento/GroupedProduct/etc/module.xml
index b5aa60db102a2..c1c1e902faab0 100644
--- a/app/code/Magento/GroupedProduct/etc/module.xml
+++ b/app/code/Magento/GroupedProduct/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_GroupedProduct" setup_version="2.0.1">
+    <module name="Magento_GroupedProduct" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_CatalogInventory"/>
diff --git a/app/code/Magento/GroupedProduct/etc/product_types.xml b/app/code/Magento/GroupedProduct/etc/product_types.xml
index 8f41611353a32..9f8f0534ff34f 100644
--- a/app/code/Magento/GroupedProduct/etc/product_types.xml
+++ b/app/code/Magento/GroupedProduct/etc/product_types.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/product_types.xsd">
     <type name="grouped" label="Grouped Product" modelInstance="Magento\GroupedProduct\Model\Product\Type\Grouped" composite='true' indexPriority="50" sortOrder="30">
         <priceModel instance="Magento\GroupedProduct\Model\Product\Type\Grouped\Price" />
-        <indexerModel instance="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\GroupedInterface" />
+        <indexerModel instance="Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price\Grouped" />
         <stockIndexerModel instance="Magento\GroupedProduct\Model\ResourceModel\Indexer\Stock\Grouped" />
         <customAttributes>
             <attribute name="is_real_product" value="false"/>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css b/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
index 3d723387d23b0..9142eaf90899e 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
@@ -66,3 +66,49 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
+
+.position {
+    width: 100px;
+}
+
+.icon-rearrange-position > span {
+    border: 0;
+    clip: rect(0, 0, 0, 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+}
+
+.icon-forward,
+.icon-backward {
+    -webkit-font-smoothing: antialiased;
+    font-family: 'Admin Icons';
+    font-size: 17px;
+    speak: none;
+}
+
+.position > * {
+    float: left;
+    margin: 3px;
+}
+
+.position-widget-input {
+    text-align: center;
+    width: 40px;
+}
+
+.icon-forward:before {
+    content: '\e618';
+}
+
+.icon-backward:before {
+    content: '\e619';
+}
+
+.icon-rearrange-position, .icon-rearrange-position:hover   {
+    color: #d9d9d9;
+    text-decoration: none;
+}
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js
new file mode 100644
index 0000000000000..0ac3b58d6e3a7
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js
@@ -0,0 +1,219 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/dynamic-rows/dynamic-rows-grid'
+], function (_, registry, dynamicRowsGrid) {
+    'use strict';
+
+    return dynamicRowsGrid.extend({
+
+        /**
+         * Set max element position
+         *
+         * @param {Number} position - element position
+         * @param {Object} elem - instance
+         */
+        setMaxPosition: function (position, elem) {
+
+            if (position || position === 0) {
+                this.checkMaxPosition(position);
+                this.sort(position, elem);
+
+                if (~~position === this.maxPosition && ~~position > this.getDefaultPageBoundary() + 1) {
+                    this.shiftNextPagesPositions(position);
+                }
+            } else {
+                this.maxPosition += 1;
+            }
+        },
+
+        /**
+         * Shift positions for next page elements
+         *
+         * @param {Number} position
+         */
+        shiftNextPagesPositions: function (position) {
+
+            var recordData = this.recordData(),
+                startIndex = ~~this.currentPage() * this.pageSize,
+                offset = position - startIndex + 1,
+                index = startIndex;
+
+            if (~~this.currentPage() === this.pages()) {
+                return false;
+            }
+
+            for (index; index < recordData.length; index++) {
+                recordData[index].position = index + offset;
+            }
+            this.recordData(recordData);
+        },
+
+        /**
+         * Update position for element after position from another page is entered
+         *
+         * @param {Object} data
+         * @param {Object} event
+         */
+        updateGridPosition: function (data, event) {
+            var inputValue = parseInt(event.target.value, 10),
+                recordData = this.recordData(),
+                record,
+                previousValue,
+                updatedRecord;
+
+            record = this.elems().find(function (obj) {
+                return obj.dataScope === data.parentScope;
+            });
+
+            previousValue = this.getCalculatedPosition(record);
+
+            if (isNaN(inputValue) || inputValue < 0 || inputValue === previousValue) {
+                return false;
+            }
+
+            this.elems([]);
+
+            updatedRecord = this.getUpdatedRecordIndex(recordData, record.data().id);
+
+            if (inputValue >= this.recordData().size() - 1) {
+                recordData[updatedRecord].position = this.getGlobalMaxPosition() + 1;
+            } else {
+                recordData.forEach(function (value, index) {
+                    if (~~value.id === ~~record.data().id) {
+                        recordData[index].position = inputValue;
+                    } else if (inputValue > previousValue && index <= inputValue) {
+                        recordData[index].position = index - 1;
+                    } else if (inputValue < previousValue && index >= inputValue) {
+                        recordData[index].position = index + 1;
+                    }
+                });
+            }
+
+            this.reloadGridData(recordData);
+
+        },
+
+        /**
+         * Get updated record index
+         *
+         * @param  {Array} recordData
+         * @param {Number} recordId
+         * @return {Number}
+         */
+        getUpdatedRecordIndex: function (recordData, recordId) {
+            return recordData.map(function (o) {
+                return ~~o.id;
+            }).indexOf(~~recordId);
+        },
+
+        /**
+         *
+         * @param {Array} recordData - to reprocess
+         */
+        reloadGridData: function (recordData) {
+            this.recordData(recordData.sort(function (a, b) {
+                return ~~a.position - ~~b.position;
+            }));
+            this._updateCollection();
+            this.reload();
+        },
+
+        /**
+         * Event handler for "Send to bottom" button
+         *
+         * @param {Object} positionObj
+         * @return {Boolean}
+         */
+        sendToBottom: function (positionObj) {
+
+            var objectToUpdate = this.getObjectToUpdate(positionObj),
+                recordData = this.recordData(),
+                updatedRecord;
+
+            if (~~this.currentPage() === this.pages) {
+                objectToUpdate.position = this.maxPosition;
+            } else {
+                this.elems([]);
+                updatedRecord = this.getUpdatedRecordIndex(recordData, objectToUpdate.data().id);
+                recordData[updatedRecord].position = this.getGlobalMaxPosition() + 1;
+                this.reloadGridData(recordData);
+            }
+
+            return false;
+        },
+
+        /**
+         * Event handler for "Send to top" button
+         *
+         * @param {Object} positionObj
+         * @return {Boolean}
+         */
+        sendToTop: function (positionObj) {
+            var objectToUpdate = this.getObjectToUpdate(positionObj),
+                recordData = this.recordData(),
+                updatedRecord;
+
+            //isFirst
+            if (~~this.currentPage() === 1) {
+                objectToUpdate.position = 0;
+            } else {
+                this.elems([]);
+                updatedRecord = this.getUpdatedRecordIndex(recordData, objectToUpdate.data().id);
+                recordData.forEach(function (value, index) {
+                    recordData[index].position = index === updatedRecord ? 0 : value.position + 1;
+                });
+                this.reloadGridData(recordData);
+            }
+
+            return false;
+        },
+
+        /**
+         * Get element from grid for update
+         *
+         * @param {Object} object
+         * @return {*}
+         */
+        getObjectToUpdate: function (object) {
+            return this.elems().filter(function (item) {
+                return item.name === object.parentName;
+            })[0];
+        },
+
+        /**
+         * Value function for position input
+         *
+         * @param {Object} data
+         * @return {Number}
+         */
+        getCalculatedPosition: function (data) {
+            return (~~this.currentPage() - 1) * this.pageSize + this.elems().pluck('name').indexOf(data.name);
+        },
+
+        /**
+         * Return Page Boundary
+         *
+         * @return {Number}
+         */
+        getDefaultPageBoundary: function () {
+            return ~~this.currentPage() * this.pageSize - 1;
+        },
+
+        /**
+         * Returns position for last element to be moved after
+         *
+         * @return {Number}
+         */
+        getGlobalMaxPosition: function () {
+            return _.max(this.recordData().map(function (r) {
+                return ~~r.position;
+            }));
+        }
+    });
+});
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html b/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html
new file mode 100644
index 0000000000000..050fb3c2898ce
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html
@@ -0,0 +1,19 @@
+<div class="position">
+    <a href="#" class="move-top icon-backward icon-rearrange-position"
+       data-bind="
+            click: $parent.sendToTop.bind($parent)
+            ">
+        <span>Top</span>
+    </a>
+    <input type="text" class="position-widget-input"
+           data-bind="
+                value: $parent.getCalculatedPosition($record()),
+                event: {blur: $parent.updateGridPosition.bind($parent)}
+            "/>
+    <a href="#" class="move-bottom icon-forward icon-rearrange-position"
+       data-bind="
+            click: $parent.sendToBottom.bind($parent)
+            ">
+        <span>Bottom</span>
+    </a>
+</div>
diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
index 34de1a18cf28a..d9238e9794d7e 100644
--- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
@@ -26,7 +26,7 @@ if ($minProduct) {
         );
 }
 ?>
-<div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+<div class="price-box">
     <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()): ?>
     <p class="minimal-price">
         <span class="price-label"><?= /* @escapeNotVerified */ __('Starting at') ?></span><?= $amountRender->toHtml() ?>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index 7fad5635f8690..900d4a1bd5bbc 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -19,7 +19,9 @@
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
 
 <div class="table-wrapper grouped">
-    <table class="table data grouped" id="super-product-table">
+    <table class="table data grouped"
+           id="super-product-table"
+           data-mage-init='{ "Magento_GroupedProduct/js/product-ids-resolver": {} }'>
         <caption class="table-caption"><?= /* @escapeNotVerified */ __('Grouped product items') ?></caption>
         <thead>
         <tr>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js
new file mode 100644
index 0000000000000..e6294d8043a50
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Catalog/js/product/view/product-ids'
+], function ($, productIds) {
+    'use strict';
+
+    /**
+     * Returns id's of products in form.
+     *
+     * @param {Object} config
+     * @param {HTMLElement} element
+     * @return {Array}
+     */
+    return function (config, element) {
+        $(element).find('div[data-product-id]').each(function () {
+            productIds.push($(this).data('productId').toString());
+        });
+
+        return productIds();
+    };
+});
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php
new file mode 100644
index 0000000000000..92cfb375fea41
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProductGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class GroupedProductLinksTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @var string[]
+     */
+    private $linkTypes = ['associated'];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['link_type'])) {
+            $linkType = $data['link_type'];
+            if (in_array($linkType, $this->linkTypes)) {
+                return 'GroupedProductLinks';
+            }
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php
new file mode 100644
index 0000000000000..087cf10c8d6bb
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductTypeResolver.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProductGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class GroupedProductTypeResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['type_id']) && $data['type_id'] == 'grouped') {
+            return 'GroupedProduct';
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php b/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php
new file mode 100644
index 0000000000000..d51b22ffe21df
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/Model/Resolver/GroupedItems.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProductGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\GroupedProduct\Model\Product\Initialization\Helper\ProductLinks\Plugin\Grouped;
+
+/**
+ * @inheritdoc
+ */
+class GroupedItems implements ResolverInterface
+{
+    /**
+     * @var Product
+     */
+    private $productResolver;
+
+    /**
+     * @param Product $productResolver
+     */
+    public function __construct(
+        Product $productResolver
+    ) {
+        $this->productResolver = $productResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $data = [];
+        $productModel = $value['model'];
+        $links = $productModel->getProductLinks();
+        foreach ($links as $link) {
+            if ($link->getLinkType() !== Grouped::TYPE_NAME) {
+                continue;
+            }
+
+            $data[] = [
+                'position' => (int)$link->getPosition(),
+                'qty' => $link->getExtensionAttributes()->getQty(),
+                'sku' => $link->getLinkedProductSku()
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/GroupedProductGraphQl/README.md b/app/code/Magento/GroupedProductGraphQl/README.md
new file mode 100644
index 0000000000000..48df094991a8b
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/README.md
@@ -0,0 +1,4 @@
+# GroupedProductGraphQl
+
+**GroupedProductGraphQl** provides type and resolver information for the GraphQl module
+to generate grouped product information.
diff --git a/app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md b/app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1c950e855cac0
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Grouped Product Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Grouped Product Graph Ql** module.
diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json
new file mode 100644
index 0000000000000..bf6745370b4be
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/module-grouped-product-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/module-grouped-product": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/framework": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\GroupedProductGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/di.xml b/app/code/Magento/GroupedProductGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..35b63370baf2f
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter">
+        <arguments>
+            <argument name="postProcessors" xsi:type="array">
+                <item name="grouped_processor" xsi:type="object">Magento\GroupedProductGraphQl\Model\Resolver\Products\Query\GroupedItemsPostProcessor</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/graphql/di.xml b/app/code/Magento/GroupedProductGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..5c41fc26e615b
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/etc/graphql/di.xml
@@ -0,0 +1,32 @@
+<?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\CatalogGraphQl\Model\ProductInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="productTypeNameResolvers" xsi:type="array">
+                <item name="grouped_product_type_resolver" xsi:type="object">Magento\GroupedProductGraphQl\Model\GroupedProductTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\ProductLinkTypeResolverComposite">
+        <arguments>
+            <argument name="productLinksTypeNameResolvers" xsi:type="array">
+                <item name="grouped_product_link__type_resolver" xsi:type="object">\Magento\GroupedProductGraphQl\Model\GroupedProductLinksTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\GraphQl\Schema\Type\Entity\DefaultMapper">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="grouped" xsi:type="string">GroupedProduct</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/module.xml b/app/code/Magento/GroupedProductGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..e764d7c076b59
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/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_GroupedProductGraphQl" >
+        <sequence>
+            <module name="Magento_GroupedProduct"/>
+            <module name="Magento_GraphQl"/>
+            <module name="Magento_CatalogGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/schema.graphqls b/app/code/Magento/GroupedProductGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..6c649843b9d4d
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/etc/schema.graphqls
@@ -0,0 +1,12 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type GroupedProduct implements ProductInterface, PhysicalProductInterface @doc(description: "GroupedProduct defines a grouped product") {
+    items: [GroupedProductItem] @doc(description: "An array containing grouped product items") @resolver(class: "Magento\\GroupedProductGraphQl\\Model\\Resolver\\GroupedItems")
+}
+
+type GroupedProductItem @doc(description: "GroupedProductItem contains information about an individual grouped product item"){
+    qty: Float @doc(description: "The quantity of this grouped product item")
+    position: Int @doc(description: "The relative position of this item compared to the other group items")
+    product: ProductInterface @doc(description: "The ProductInterface object, which contains details about this product option") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
+}
diff --git a/app/code/Magento/GroupedProductGraphQl/registration.php b/app/code/Magento/GroupedProductGraphQl/registration.php
new file mode 100644
index 0000000000000..e4557269f5dca
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GroupedProductGraphQl', __DIR__);
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 94dc0ee7493b0..8721dd05a0fa6 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(
@@ -243,13 +244,13 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
             $options = $attribute->getSource()->getAllOptions(false);
         }
         if ($size = count($options)) {
-            // add empty vaue option
+            // add empty value option
             $firstOption = reset($options);
 
             if ('' === $firstOption['value']) {
                 $options[key($options)]['label'] = '';
             } else {
-                array_unshift($options, ['value' => '', 'label' => '']);
+                array_unshift($options, ['value' => '', 'label' => __('-- Not Selected --')]);
             }
             $arguments = [
                 'name' => $this->getFilterElementName($attribute->getAttributeCode()),
@@ -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/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index 822795abb0b44..68b4d849099c1 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -113,6 +113,7 @@ protected function _prepareForm()
                     'class' => $behaviorCode,
                     'onchange' => 'varienImport.handleImportBehaviorSelector();',
                     'note' => ' ',
+                    'after_element_html' => $this->getImportBehaviorTooltip(),
                 ]
             );
             $fieldsets[$behaviorCode]->addField(
@@ -174,6 +175,19 @@ protected function _prepareForm()
                     'value' => Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
                 ]
             );
+            $fieldsets[$behaviorCode]->addField(
+                $behaviorCode . \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+                'text',
+                [
+                    'name' => \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+                    'label' => __('Empty attribute value constant'),
+                    'title' => __('Empty attribute value constant'),
+                    'required' => true,
+                    'disabled' => true,
+                    'class' => $behaviorCode,
+                    'value' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+                ]
+            );
             $fieldsets[$behaviorCode]->addField(
                 $behaviorCode . \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE,
                 'checkbox',
@@ -199,7 +213,10 @@ protected function _prepareForm()
                 'label' => __('Select File to Import'),
                 'title' => __('Select File to Import'),
                 'required' => true,
-                'class' => 'input-file'
+                'class' => 'input-file',
+                'note' => __(
+                    'File must be saved in UTF-8 encoding for proper import'
+                ),
             ]
         );
         $fieldsets['upload']->addField(
@@ -236,4 +253,19 @@ protected function getDownloadSampleFileHtml()
             . '</a></span>';
         return $html;
     }
+
+    /**
+     * Get Import Behavior field tooltip
+     *
+     * @return string
+     */
+    private function getImportBehaviorTooltip()
+    {
+        $html = '<div class="admin__field-tooltip tooltip">
+            <a class="admin__field-tooltip-action action-help" target="_blank" title="What is this?" 
+                href="https://docs.magento.com/m2/ce/user_guide/system/data-import.html"><span>'
+            . __('What is this?')
+            . '</span></a></div>';
+        return $html;
+    }
 }
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index 06d8610a247cc..38bfbd88b0c12 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Backend\App\Action\Context;
@@ -13,7 +14,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 
-class Export extends ExportController
+class Export extends ExportController implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
index 05475b5161977..722d32c9eb21a 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Controller\ResultFactory;
 
-class GetFilter extends ExportController
+class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Get grid-filter of entity attributes action.
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
index d2ca99f1a7973..3dd5bfd550a38 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Index extends ExportController
+class Index extends ExportController implements HttpGetActionInterface
 {
     /**
      * Index action.
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
index 91cfbefbd57a2..ba37cc8aacff9 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php
@@ -1,20 +1,28 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ImportExport\Controller\Adminhtml\History;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class Download extends \Magento\ImportExport\Controller\Adminhtml\History
+/**
+ * Download history controller
+ */
+class Download extends \Magento\ImportExport\Controller\Adminhtml\History implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
      */
     protected $resultRawFactory;
 
+    /**
+     * @var \Magento\Framework\App\Response\Http\FileFactory
+     */
+    private $fileFactory;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
@@ -39,7 +47,7 @@ public function __construct(
      */
     public function execute()
     {
-        $fileName = $this->getRequest()->getParam('filename');
+        $fileName = basename($this->getRequest()->getParam('filename'));
 
         /** @var \Magento\ImportExport\Helper\Report $reportHelper */
         $reportHelper = $this->_objectManager->get(\Magento\ImportExport\Helper\Report::class);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 33dbba8320051..7c119e1dd683d 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/Controller/Adminhtml/Import/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
index df32d61cceb7f..3cca7ae7ccce2 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Index extends ImportController
+class Index extends ImportController implements HttpGetActionInterface
 {
     /**
      * Index action
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
index 695a0e61709f1..e850f6af86cf9 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
@@ -5,10 +5,15 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Model\Import;
 
-class Start extends ImportResultController
+/**
+ * Controller responsible for initiating the import process
+ */
+class Start extends ImportResultController implements HttpPostActionInterface
 {
     /**
      * @var \Magento\ImportExport\Model\Import
@@ -62,6 +67,11 @@ public function execute()
 
             $this->importModel->setData($data);
             $errorAggregator = $this->importModel->getErrorAggregator();
+            $errorAggregator->initValidationStrategy(
+                $this->importModel->getData(Import::FIELD_NAME_VALIDATION_STRATEGY),
+                $this->importModel->getData(Import::FIELD_NAME_ALLOWED_ERROR_COUNT)
+            );
+
             try {
                 $this->importModel->importSource();
             } catch (\Exception $e) {
@@ -83,6 +93,20 @@ public function execute()
                 $this->addErrorMessages($resultBlock, $errorAggregator);
             } else {
                 $this->importModel->invalidateIndex();
+
+                $noticeHtml = $this->historyModel->getSummary();
+
+                if ($this->historyModel->getErrorFile()) {
+                    $noticeHtml .=  '<div class="import-error-wrapper">' . __('Only the first 100 errors are shown. ')
+                                    . '<a href="'
+                                    . $this->createDownloadUrlImportHistoryFile($this->historyModel->getErrorFile())
+                                    . '">' . __('Download full report') . '</a></div>';
+                }
+
+                $resultBlock->addNotice(
+                    $noticeHtml
+                );
+
                 $this->addErrorMessages($resultBlock, $errorAggregator);
                 $resultBlock->addSuccess(__('Import successfully done'));
             }
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index df9f63e79b75e..a0992e28bb2cd 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -5,15 +5,19 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
-class Validate extends ImportResultController
+/**
+ * Import validate controller action.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Validate extends ImportResultController implements HttpPostActionInterface
 {
     /**
      * @var Import
@@ -24,6 +28,7 @@ class Validate extends ImportResultController
      * Validate uploaded files action
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @SuppressWarnings(PHPMD.Superglobals)
      */
     public function execute()
     {
@@ -42,12 +47,7 @@ public function execute()
             /** @var $import \Magento\ImportExport\Model\Import */
             $import = $this->getImport()->setData($data);
             try {
-                $source = ImportAdapter::findAdapterFor(
-                    $import->uploadSource(),
-                    $this->_objectManager->create(\Magento\Framework\Filesystem::class)
-                        ->getDirectoryWrite(DirectoryList::ROOT),
-                    $data[$import::FIELD_FIELD_SEPARATOR]
-                );
+                $source = $import->uploadFileAndGetSource();
                 $this->processValidationResult($import->validateSource($source), $resultBlock);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $resultBlock->addError($e->getMessage());
@@ -72,6 +72,7 @@ public function execute()
      * @param bool $validationResult
      * @param Result $resultBlock
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function processValidationResult($validationResult, $resultBlock)
     {
@@ -109,6 +110,8 @@ private function processValidationResult($validationResult, $resultBlock)
     }
 
     /**
+     * Provides import model.
+     *
      * @return Import
      * @deprecated 100.1.0
      */
@@ -128,6 +131,7 @@ private function getImport()
      *
      * @param Result $resultBlock
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function addMessageToSkipErrors(Result $resultBlock)
     {
@@ -148,6 +152,7 @@ private function addMessageToSkipErrors(Result $resultBlock)
      *
      * @param Result $resultBlock
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function addMessageForValidResult(Result $resultBlock)
     {
@@ -161,11 +166,12 @@ private function addMessageForValidResult(Result $resultBlock)
     /**
      * Collect errors and add error messages to Result block
      *
-     * Get all errors from ProcessingErrorAggregatorInterface and add appropriated error messages
+     * Get all errors from Error Aggregator and add appropriated error messages
      * to Result block.
      *
      * @param Result $resultBlock
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function collectErrors(Result $resultBlock)
     {
diff --git a/app/code/Magento/ImportExport/Files/Sample/customer.csv b/app/code/Magento/ImportExport/Files/Sample/customer.csv
index 64c09574aea73..522e59f566739 100644
--- a/app/code/Magento/ImportExport/Files/Sample/customer.csv
+++ b/app/code/Magento/ImportExport/Files/Sample/customer.csv
@@ -1,2 +1,2 @@
-email,_website,_store,confirmation,created_at,created_in,disable_auto_group_change,dob,firstname,gender,group_id,lastname,middlename,password_hash,prefix,reward_update_notification,reward_warning_notification,rp_token,rp_token_created_at,store_id,suffix,taxvat,updated_at,website_id,password
-jondoe@example.com,base,default,,"2015-10-30 12:49:47","Default Store View",0,,Jon,,1,Doe,,d708be3fe0fe0120840e8b13c8faae97424252c6374227ff59c05814f1aecd79:mgLqkqgTwLPLlCljzvF8hp67fNOOvOZb:1,,,,07e71459c137f4da15292134ff459cba,"2015-10-30 12:49:48",1,,,"2015-10-30 12:49:48",1,
+email,_website,_store,confirmation,created_at,created_in,disable_auto_group_change,dob,firstname,gender,group_id,lastname,middlename,password_hash,prefix,rp_token,rp_token_created_at,store_id,suffix,taxvat,updated_at,website_id,password
+jondoe@example.com,base,default,,"2015-10-30 12:49:47","Default Store View",0,,Jon,,1,Doe,,d708be3fe0fe0120840e8b13c8faae97424252c6374227ff59c05814f1aecd79:mgLqkqgTwLPLlCljzvF8hp67fNOOvOZb:1,,07e71459c137f4da15292134ff459cba,"2015-10-30 12:49:48",1,,,"2015-10-30 12:49:48",1,
diff --git a/app/code/Magento/ImportExport/Helper/Report.php b/app/code/Magento/ImportExport/Helper/Report.php
index 708aa2e39df9a..012aeefd8bf94 100644
--- a/app/code/Magento/ImportExport/Helper/Report.php
+++ b/app/code/Magento/ImportExport/Helper/Report.php
@@ -7,7 +7,6 @@
 namespace Magento\ImportExport\Helper;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\ImportExport\Model\Import;
 
 /**
@@ -53,9 +52,9 @@ public function __construct(
      */
     public function getExecutionTime($time)
     {
-        $reportTime = $this->timeZone->date($time, $this->timeZone->getConfigTimezone());
+        $reportTime = $this->timeZone->date($time);
         $timeDiff = $reportTime->diff($this->timeZone->date());
-        return $timeDiff->format('%H:%M:%S');
+        return $timeDiff->format('%H:%I:%S');
     }
 
     /**
@@ -98,6 +97,8 @@ public function getReportOutput($filename)
     }
 
     /**
+     * Get report absolute path.
+     *
      * @param string $fileName
      * @return string
      */
@@ -122,9 +123,24 @@ public function getReportSize($filename)
      *
      * @param string $filename
      * @return string
+     * @throws \InvalidArgumentException
      */
     protected function getFilePath($filename)
     {
+        if (preg_match('/\.\.(\\\|\/)/', $filename)) {
+            throw new \InvalidArgumentException('Filename has not permitted symbols in it');
+        }
+
         return $this->varDirectory->getRelativePath(Import::IMPORT_HISTORY_DIR . $filename);
     }
+
+    /**
+     * Get csv delimiter from request.
+     *
+     * @return string
+     */
+    public function getDelimiter()
+    {
+        return $this->_request->getParam(Import::FIELD_FIELD_SEPARATOR, ',');
+    }
 }
diff --git a/app/code/Magento/ImportExport/Model/AbstractModel.php b/app/code/Magento/ImportExport/Model/AbstractModel.php
index 07a766887c779..87fde3fbb68a3 100644
--- a/app/code/Magento/ImportExport/Model/AbstractModel.php
+++ b/app/code/Magento/ImportExport/Model/AbstractModel.php
@@ -15,7 +15,7 @@
 abstract class AbstractModel extends \Magento\Framework\DataObject
 {
     /**
-     * Enable loging
+     * Enable logging
      *
      * @var bool
      */
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index 9b0139ff911ce..695df18fd1030 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/Adapter/Csv.php b/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
index 4d116aa8c35f0..25081b5797c25 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
@@ -56,7 +56,7 @@ public function destruct()
     }
 
     /**
-     * Method called as last step of object instance creation. Can be overrided in child classes.
+     * Method called as last step of object instance creation. Can be overridden in child classes.
      *
      * @return $this
      */
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 5ade67bbf894e..df556e961d2ce 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 5cac5e46ffaf0..d9e3879b4be13 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/History.php b/app/code/Magento/ImportExport/Model/History.php
index 3138f150d5fc5..b85bf7da81a35 100644
--- a/app/code/Magento/ImportExport/Model/History.php
+++ b/app/code/Magento/ImportExport/Model/History.php
@@ -42,6 +42,11 @@ class History extends \Magento\Framework\Model\AbstractModel
      */
     protected $reportHelper;
 
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    protected $session;
+
     /**
      * Class constructor
      *
@@ -293,6 +298,8 @@ public function setSummary($summary)
     }
 
     /**
+     * Load the last inserted item
+     *
      * @return $this
      */
     public function loadLastInsertItem()
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 569aec83dfaf3..1372322ee5855 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\HTTP\Adapter\FileTransferFactory;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
@@ -19,6 +20,7 @@
  * @method string getBehavior() getBehavior()
  * @method \Magento\ImportExport\Model\Import setEntity() setEntity(string $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @since 100.0.2
  */
 class Import extends \Magento\ImportExport\Model\AbstractModel
@@ -77,6 +79,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     const FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR = '_import_multiple_value_separator';
 
+    /**
+     * Import empty attribute value constant.
+     */
+    const FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '_import_empty_attribute_value_constant';
+
     /**
      * Allow multiple values wrapping in double quotes for additional attributes.
      */
@@ -89,6 +96,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
 
+    /**
+     * default empty attribute value constant
+     */
+    const DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '__EMPTY__VALUE__';
+
     /**#@+
      * Import constants
      */
@@ -157,6 +169,16 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_filesystem;
 
+    /**
+     * @var History
+     */
+    private $importHistoryModel;
+
+    /**
+     * @var DateTime
+     */
+    private $localeDate;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
@@ -171,7 +193,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param Source\Import\Behavior\Factory $behaviorFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param History $importHistoryModel
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime
+     * @param DateTime $localeDate
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -189,7 +211,7 @@ public function __construct(
         \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory,
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\ImportExport\Model\History $importHistoryModel,
-        \Magento\Framework\Stdlib\DateTime\DateTime $localeDate,
+        DateTime $localeDate,
         array $data = []
     ) {
         $this->_importExportData = $importExportData;
@@ -258,6 +280,7 @@ protected function _getEntityAdapter()
      *
      * @param string $sourceFile Full path to source file
      * @return \Magento\ImportExport\Model\Import\AbstractSource
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     protected function _getSourceAdapter($sourceFile)
     {
@@ -273,6 +296,7 @@ protected function _getSourceAdapter($sourceFile)
      *
      * @param ProcessingErrorAggregatorInterface $validationResult
      * @return string[]
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getOperationResultMessages(ProcessingErrorAggregatorInterface $validationResult)
     {
@@ -369,6 +393,7 @@ public function getEntity()
      * Returns number of checked entities.
      *
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getProcessedEntitiesCount()
     {
@@ -379,6 +404,7 @@ public function getProcessedEntitiesCount()
      * Returns number of checked rows.
      *
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getProcessedRowsCount()
     {
@@ -433,6 +459,8 @@ public function importSource()
     }
 
     /**
+     * Process import.
+     *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -445,6 +473,7 @@ protected function processImport()
      * Import possibility getter.
      *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function isImportAllowed()
     {
@@ -452,6 +481,8 @@ public function isImportAllowed()
     }
 
     /**
+     * Get error aggregator instance.
+     *
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -461,7 +492,7 @@ public function getErrorAggregator()
     }
 
     /**
-     * Move uploaded file and create source adapter instance.
+     * Move uploaded file.
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return string Source file path
@@ -513,14 +544,27 @@ public function uploadSource()
         }
         $this->_removeBom($sourceFile);
         $this->createHistoryReport($sourceFileRelative, $entity, $extension, $result);
-        // trying to create source adapter for file and catch possible exception to be convinced in its adequacy
+        return $sourceFile;
+    }
+
+    /**
+     * Move uploaded file and provide source instance.
+     *
+     * @return Import\AbstractSource
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function uploadFileAndGetSource()
+    {
+        $sourceFile = $this->uploadSource();
         try {
-            $this->_getSourceAdapter($sourceFile);
+            $source = $this->_getSourceAdapter($sourceFile);
         } catch (\Exception $e) {
-            $this->_varDirectory->delete($sourceFileRelative);
+            $this->_varDirectory->delete($this->_varDirectory->getRelativePath($sourceFile));
             throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()));
         }
-        return $sourceFile;
+
+        return $source;
     }
 
     /**
@@ -528,6 +572,7 @@ public function uploadSource()
      *
      * @param string $sourceFile
      * @return $this
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     protected function _removeBom($sourceFile)
     {
@@ -547,6 +592,7 @@ protected function _removeBom($sourceFile)
      *
      * @param \Magento\ImportExport\Model\Import\AbstractSource $source
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource $source)
     {
@@ -567,7 +613,6 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
                 ProcessingError::ERROR_LEVEL_CRITICAL,
                 null,
                 null,
-                null,
                 $e->getMessage()
             );
         }
@@ -576,6 +621,11 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         $this->addLogComment($messages);
 
         $result = !$errorAggregator->getErrorsCount();
+        $validationStrategy = $this->getData(self::FIELD_NAME_VALIDATION_STRATEGY);
+        if ($validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS) {
+            $result = true;
+        }
+
         if ($result) {
             $this->addLogComment(__('Import data validation is complete.'));
         }
@@ -586,6 +636,7 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
      * Invalidate indexes by process codes.
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function invalidateIndex()
     {
@@ -652,6 +703,7 @@ public function getEntityBehaviors()
      * )
      *
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getUniqueEntityBehaviors()
     {
@@ -701,9 +753,9 @@ public function isReportEntityType($entity = null)
     /**
      * Create history report
      *
+     * @param string $sourceFileRelative
      * @param string $entity
      * @param string $extension
-     * @param string $sourceFileRelative
      * @param array $result
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -742,6 +794,7 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension
      * Get count of created items
      *
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getCreatedItemsCount()
     {
@@ -752,6 +805,7 @@ public function getCreatedItemsCount()
      * Get count of updated items
      *
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getUpdatedItemsCount()
     {
@@ -762,6 +816,7 @@ public function getUpdatedItemsCount()
      * Get count of deleted items
      *
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getDeletedItemsCount()
     {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index c61292f7c34f7..1fc3257ff2c1e 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\ImportExport\Model\Import\AbstractSource;
 use Magento\ImportExport\Model\Import as ImportExport;
@@ -310,7 +311,7 @@ public function __construct(
     protected function _getSource()
     {
         if (!$this->_source) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a source.'));
+            throw new LocalizedException(__('Please specify a source.'));
         }
         return $this->_source;
     }
@@ -378,7 +379,7 @@ protected function addErrors($code, $errors)
     /**
      * Validate data rows and save bunches to DB.
      *
-     * @return $this|void
+     * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _saveValidatedBunches()
@@ -390,6 +391,7 @@ protected function _saveValidatedBunches()
         $nextRowBackup = [];
         $maxDataSize = $this->_resourceHelper->getMaxDataSize();
         $bunchSize = $this->_importExportData->getBunchSize();
+        $skuSet = [];
 
         $source->rewind();
         $this->_dataSourceModel->cleanBunches();
@@ -406,6 +408,7 @@ protected function _saveValidatedBunches()
             if ($source->valid()) {
                 try {
                     $rowData = $source->current();
+                    $skuSet[$rowData['sku']] = true;
                 } catch (\InvalidArgumentException $e) {
                     $this->addRowError($e->getMessage(), $this->_processedRowsCount);
                     $this->_processedRowsCount++;
@@ -433,6 +436,8 @@ protected function _saveValidatedBunches()
                 $source->next();
             }
         }
+        $this->_processedEntitiesCount = count($skuSet);
+
         return $this;
     }
 
@@ -548,11 +553,13 @@ public function getBehavior()
         if (!isset(
             $this->_parameters['behavior']
         ) ||
-            $this->_parameters['behavior'] != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND &&
-            $this->_parameters['behavior'] != \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE &&
-            $this->_parameters['behavior'] != \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE
+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_APPEND &&
+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_ADD_UPDATE &&
+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_REPLACE &&
+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_CUSTOM &&
+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_DELETE
         ) {
-            return \Magento\ImportExport\Model\Import::getDefaultBehavior();
+            return ImportExport::getDefaultBehavior();
         }
         return $this->_parameters['behavior'];
     }
@@ -604,7 +611,7 @@ public function getProcessedRowsCount()
     public function getSource()
     {
         if (!$this->_source) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('The source is not set.'));
+            throw new LocalizedException(__('The source is not set.'));
         }
         return $this->_source;
     }
@@ -823,6 +830,8 @@ public function validateData()
     }
 
     /**
+     * Get error aggregator object
+     *
      * @return ProcessingErrorAggregatorInterface
      */
     public function getErrorAggregator()
@@ -879,7 +888,7 @@ public function getValidColumnNames()
     protected function getMetadataPool()
     {
         if (!$this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
+            $this->metadataPool = ObjectManager::getInstance()
                 ->get(\Magento\Framework\EntityManager\MetadataPool::class);
         }
         return $this->metadataPool;
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index 079b2e60c4785..7f49e2022c410 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -77,7 +77,7 @@ public function addError(
         $errorMessage = null,
         $errorDescription = null
     ) {
-        if ($this->isErrorAlreadyAdded($rowNumber, $errorCode)) {
+        if ($this->isErrorAlreadyAdded($rowNumber, $errorCode, $columnName)) {
             return $this;
         }
         $this->processErrorStatistics($errorLevel);
@@ -333,13 +333,14 @@ public function clear()
     /**
      * @param int $rowNum
      * @param string $errorCode
+     * @param string $columnName
      * @return bool
      */
-    protected function isErrorAlreadyAdded($rowNum, $errorCode)
+    protected function isErrorAlreadyAdded($rowNum, $errorCode, $columnName = null)
     {
         $errors = $this->getErrorsByCode([$errorCode]);
         foreach ($errors as $error) {
-            if ($rowNum == $error->getRowNumber()) {
+            if ($rowNum == $error->getRowNumber() && $columnName == $error->getColumnName()) {
                 return true;
             }
         }
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 0000000000000..e69564a0eebc4
--- /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/Model/Import/Source/Zip.php b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
index b7fafc43ca4ed..6fa87ab5d5c4d 100644
--- a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
+++ b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Import\Source;
 
+use Magento\Framework\Exception\ValidatorException;
+
 /**
  * Zip import adapter.
  */
@@ -14,6 +16,8 @@ class Zip extends Csv
      * @param string $file
      * @param \Magento\Framework\Filesystem\Directory\Write $directory
      * @param string $options
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function __construct(
         $file,
@@ -21,10 +25,14 @@ public function __construct(
         $options
     ) {
         $zip = new \Magento\Framework\Archive\Zip();
-        $file = $zip->unpack(
-            $directory->getRelativePath($file),
-            $directory->getRelativePath(preg_replace('/\.zip$/i', '.csv', $file))
+        $csvFile = $zip->unpack(
+            $file,
+            preg_replace('/\.zip$/i', '.csv', $file)
         );
-        parent::__construct($file, $directory, $options);
+        if (!$csvFile) {
+            throw new ValidatorException(__('Sorry, but the data is invalid or the file is not uploaded.'));
+        }
+        $directory->delete($directory->getRelativePath($file));
+        parent::__construct($csvFile, $directory, $options);
     }
 }
diff --git a/app/code/Magento/ImportExport/Model/Report/Csv.php b/app/code/Magento/ImportExport/Model/Report/Csv.php
index f45910e519847..7279092265cbb 100644
--- a/app/code/Magento/ImportExport/Model/Report/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Report/Csv.php
@@ -77,7 +77,7 @@ public function createReport(
         $outputCsv = $this->createOutputCsvModel($outputFileName);
 
         $columnsName = $sourceCsv->getColNames();
-        array_push($columnsName, self::REPORT_ERROR_COLUMN_NAME);
+        $columnsName[] = self::REPORT_ERROR_COLUMN_NAME;
         $outputCsv->setHeaderCols($columnsName);
 
         foreach ($sourceCsv as $rowNum => $rowData) {
@@ -130,7 +130,8 @@ protected function createSourceCsvModel($sourceFile)
         return $this->sourceCsvFactory->create(
             [
                 'file' => $sourceFile,
-                'directory' => $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR)
+                'directory' => $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR),
+                'delimiter' => $this->reportHelper->getDelimiter(),
             ]
         );
     }
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php b/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
index 65bc4fcf18723..6e77016adf361 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php
@@ -159,9 +159,17 @@ public function getNextBunch()
      */
     public function saveBunch($entity, $behavior, array $data)
     {
+        $encodedData = $this->jsonHelper->jsonEncode($data);
+
+        if (json_last_error()!==JSON_ERROR_NONE && empty($encodedData)) {
+            throw new \Magento\Framework\Exception\ValidatorException(
+                __('Error in CSV: ' . json_last_error_msg())
+            );
+        }
+
         return $this->getConnection()->insert(
             $this->getMainTable(),
-            ['behavior' => $behavior, 'entity' => $entity, 'data' => $this->jsonHelper->jsonEncode($data)]
+            ['behavior' => $behavior, 'entity' => $entity, 'data' => $encodedData]
         );
     }
 }
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
index f28aae9f8ae1c..e0002474e1917 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/Behavior/Basic.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Source\Import\Behavior;
 
+use Magento\ImportExport\Model\Import;
+
 /**
  * Import behavior source model used for defining the behaviour during the import.
  *
@@ -14,19 +16,19 @@
 class Basic extends \Magento\ImportExport\Model\Source\Import\AbstractBehavior
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toArray()
     {
         return [
-            \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND => __('Add/Update'),
-            \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __('Replace'),
-            \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE => __('Delete')
+            Import::BEHAVIOR_APPEND => __('Add/Update'),
+            Import::BEHAVIOR_REPLACE => __('Replace'),
+            Import::BEHAVIOR_DELETE => __('Delete')
         ];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCode()
     {
@@ -34,12 +36,23 @@ public function getCode()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getNotes($entityCode)
     {
         $messages = ['catalog_product' => [
-            \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => __("Note: Product IDs will be regenerated.")
+            Import::BEHAVIOR_APPEND => __(
+                "New product data is added to the existing product data for the existing entries in the database. "
+                . "All fields except sku can be updated."
+            ),
+            Import::BEHAVIOR_REPLACE => __(
+                "The existing product data is replaced with new data. <b>Exercise caution when replacing data "
+                . "because the existing product data will be completely cleared and all references "
+                . "in the system will be lost.</b>"
+            ),
+            Import::BEHAVIOR_DELETE => __(
+                "Any entities in the import data that already exist in the database are deleted from the database."
+            ),
         ]];
         return isset($messages[$entityCode]) ? $messages[$entityCode] : [];
     }
diff --git a/app/code/Magento/ImportExport/Setup/InstallSchema.php b/app/code/Magento/ImportExport/Setup/InstallSchema.php
deleted file mode 100644
index e40f1212f6f09..0000000000000
--- a/app/code/Magento/ImportExport/Setup/InstallSchema.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ImportExport\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'importexport_importdata'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('importexport_importdata'))
-            ->addColumn(
-                'id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Id'
-            )
-            ->addColumn(
-                'entity',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                50,
-                ['nullable' => false],
-                'Entity'
-            )
-            ->addColumn(
-                'behavior',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                10,
-                ['nullable' => false, 'default' => 'append'],
-                'Behavior'
-            )
-            ->addColumn(
-                'data',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '4G',
-                ['default' => false],
-                'Data'
-            )
-            ->setComment('Import Data Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create 'import_history' table.
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('import_history'))
-            ->addColumn(
-                'history_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'History record Id'
-            )
-            ->addColumn(
-                'started_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Started at'
-            )
-            ->addColumn(
-                'user_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'User ID'
-            )
-            ->addColumn(
-                'imported_file',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Imported file'
-            )
-            ->addColumn(
-                'execution_time',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Execution time'
-            )
-            ->addColumn(
-                'summary',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Summary'
-            )
-            ->setComment('Import history table');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/ImportExport/Setup/UpgradeSchema.php b/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
deleted file mode 100644
index f02ca7c738150..0000000000000
--- a/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ImportExport\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-
-        $installer = $setup;
-        $installer->startSetup();
-        $installer->getConnection()->addColumn(
-            $installer->getTable('import_history'),
-            'error_file',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                'length' => 255,
-                'nullable' => false,
-                'comment' => 'Imported file with errors'
-            ]
-        );
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE.txt b/app/code/Magento/ImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE.txt
rename to app/code/Magento/ImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE_AFL.txt b/app/code/Magento/ImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE_AFL.txt
rename to app/code/Magento/ImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ImportExport/Test/Mftf/README.md b/app/code/Magento/ImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f226f9e433316
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Import Export Functional Tests
+
+The Functional Test Module for **Magento Import Export** module.
diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php
index 73b97dfc67751..f81521d9a78dd 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php
@@ -72,8 +72,9 @@ class DownloadTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->request = $this->createPartialMock(\Magento\Framework\App\Request\Http::class, ['getParam']);
-        $this->request->expects($this->any())->method('getParam')->with('filename')->willReturn('filename');
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->reportHelper = $this->createPartialMock(
             \Magento\ImportExport\Helper\Report::class,
             ['importFileExists', 'getReportSize', 'getReportOutput']
@@ -126,21 +127,44 @@ protected function setUp()
     }
 
     /**
-     * Test execute()
+     * Tests download controller with different file names in request.
+     *
+     * @param string $requestFilename
+     * @param string $processedFilename
+     * @dataProvider executeDataProvider
      */
-    public function testExecute()
+    public function testExecute($requestFilename, $processedFilename)
     {
-        $this->reportHelper->expects($this->any())->method('importFileExists')->willReturn(true);
+        $this->request->method('getParam')
+            ->with('filename')
+            ->willReturn($requestFilename);
+
+        $this->reportHelper->method('importFileExists')
+            ->with($processedFilename)
+            ->willReturn(true);
         $this->resultRaw->expects($this->once())->method('setContents');
         $this->downloadController->execute();
     }
 
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            'Normal file name' => ['filename.csv', 'filename.csv'],
+            'Relative file name' => ['../../../../../../../../etc/passwd', 'passwd'],
+            'Empty file name' => ['', ''],
+        ];
+    }
+
     /**
      * Test execute() with not found file
      */
     public function testExecuteFileNotFound()
     {
-        $this->reportHelper->expects($this->any())->method('importFileExists')->willReturn(false);
+        $this->request->method('getParam')->with('filename')->willReturn('filename');
+        $this->reportHelper->method('importFileExists')->willReturn(false);
         $this->resultRaw->expects($this->never())->method('setContents');
         $this->downloadController->execute();
     }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php b/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
index baaf0071e54ea..679b726d8e521 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
@@ -44,12 +44,21 @@ class ReportTest extends \PHPUnit\Framework\TestCase
      */
     protected $report;
 
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
     /**
      * Set up
      */
     protected function setUp()
     {
         $this->context = $this->createMock(\Magento\Framework\App\Helper\Context::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
         $this->timezone = $this->createPartialMock(
             \Magento\Framework\Stdlib\DateTime\Timezone::class,
             ['date', 'getConfigTimezone', 'diff', 'format']
@@ -80,12 +89,17 @@ protected function setUp()
      */
     public function testGetExecutionTime()
     {
-        $time = '01:02:03';
-        $this->timezone->expects($this->any())->method('date')->willReturnSelf();
-        $this->timezone->expects($this->any())->method('getConfigTimezone')->willReturn('America/Los_Angeles');
-        $this->timezone->expects($this->any())->method('diff')->willReturnSelf();
-        $this->timezone->expects($this->any())->method('format')->willReturn($time);
-        $this->assertEquals($time, $this->report->getExecutionTime($time));
+        $startDate = '2000-01-01 01:01:01';
+        $endDate = '2000-01-01 02:03:04';
+        $executionTime = '01:02:03';
+
+        $startDateMock = $this->createTestProxy(\DateTime::class, ['time' => $startDate]);
+        $endDateMock = $this->createTestProxy(\DateTime::class, ['time' => $endDate]);
+        $this->timezone->method('date')
+            ->withConsecutive([$startDate], [])
+            ->willReturnOnConsecutiveCalls($startDateMock, $endDateMock);
+
+        $this->assertEquals($executionTime, $this->report->getExecutionTime($startDate));
     }
 
     /**
@@ -138,9 +152,41 @@ public function testGetSummaryStats()
         $this->assertInstanceOf(\Magento\Framework\Phrase::class, $message);
     }
 
+    /**
+     * @dataProvider importFileExistsDataProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Filename has not permitted symbols in it
+     * @param string $fileName
+     * @return void
+     */
+    public function testImportFileExistsException($fileName)
+    {
+        $this->report->importFileExists($fileName);
+    }
+
+    /**
+     * Test importFileExists()
+     */
     public function testImportFileExists()
     {
-        $this->assertEquals($this->report->importFileExists('file'), true);
+        $this->assertEquals($this->report->importFileExists('..file..name'), true);
+    }
+
+    /**
+     * Dataprovider for testImportFileExistsException()
+     *
+     * @return array
+     */
+    public function importFileExistsDataProvider()
+    {
+        return [
+            [
+                'fileName' => 'some_folder/../another_folder',
+            ],
+            [
+                'fileName' => 'some_folder\..\another_folder',
+            ],
+        ];
     }
 
     /**
@@ -159,4 +205,20 @@ public function testGetReportSize()
         $result = $this->report->getReportSize('file');
         $this->assertNull($result);
     }
+
+    /**
+     * Test getDelimiter() take into consideration request param '_import_field_separator'.
+     */
+    public function testGetDelimiter()
+    {
+        $testDelimiter = 'some delimiter';
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->with($this->identicalTo(\Magento\ImportExport\Model\Import::FIELD_FIELD_SEPARATOR))
+            ->willReturn($testDelimiter);
+        $this->assertEquals(
+            $testDelimiter,
+            $this->report->getDelimiter()
+        );
+    }
 }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/ConfigTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/ConfigTest.php
index 953f76f6cf702..f9d0cf11179dc 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/ConfigTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/ConfigTest.php
@@ -65,6 +65,9 @@ public function testGetEntities($value, $expected)
         $this->assertEquals($expected, $this->model->getEntities('entities'));
     }
 
+    /**
+     * @return array
+     */
     public function getEntitiesDataProvider()
     {
         return [
@@ -100,6 +103,9 @@ public function testGetEntityTypes($configData, $entity, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->getEntityTypes($entity));
     }
 
+    /**
+     * @return array
+     */
     public function getEntityTypesDataProvider()
     {
         return [
@@ -154,6 +160,9 @@ public function testGetFileFormats($value, $expected)
         $this->assertEquals($expected, $this->model->getFileFormats('fileFormats'));
     }
 
+    /**
+     * @return array
+     */
     public function getFileFormatsDataProvider()
     {
         return [
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ConfigTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ConfigTest.php
index 688e3a2659c6d..aa37551034a25 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ConfigTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ConfigTest.php
@@ -65,6 +65,9 @@ public function testGetEntities($value, $expected)
         $this->assertEquals($expected, $this->model->getEntities('entities'));
     }
 
+    /**
+     * @return array
+     */
     public function getEntitiesDataProvider()
     {
         return [
@@ -100,6 +103,9 @@ public function testGetEntityTypes($configData, $entity, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->getEntityTypes($entity));
     }
 
+    /**
+     * @return array
+     */
     public function getEntityTypesDataProvider()
     {
         return [
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
index a4c380d51ebe3..b81b9f9093d1f 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
@@ -191,7 +191,7 @@ public function testInitValidationStrategyExceed()
     }
 
     /**
-     * Test for method initValidationStrategy. Expected exeption due null incoming parameter
+     * Test for method initValidationStrategy. Expected exception due null incoming parameter
      */
     public function testInitValidationStrategyException()
     {
@@ -316,7 +316,7 @@ public function testAddTheSameErrorTwice()
     }
 
     /**
-     * Test for method getErrorsByCode. Expects receive errors with code, which present in incomming parameter.
+     * Test for method getErrorsByCode. Expects receive errors with code, which present in incoming parameter.
      */
     public function testGetErrorsByCodeInArray()
     {
@@ -328,7 +328,7 @@ public function testGetErrorsByCodeInArray()
     }
 
     /**
-     * Test for method getErrorsByCode. Unexpects receive errors with code, which present in incomming parameter.
+     * Test for method getErrorsByCode. Unexpects receive errors with code, which present in incoming parameter.
      */
     public function testGetErrorsByCodeNotInArray()
     {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php
index 6ef2ef02865f1..7fb9457c2d704 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php
@@ -39,6 +39,9 @@ public function testConstructorFileDestinationMatch($fileName, $expectedfileName
         $this->_invokeConstructor($fileName);
     }
 
+    /**
+     * @return array
+     */
     public function constructorFileDestinationMatchDataProvider()
     {
         return [
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
index 06d2292dfb1a0..ba65677d53b95 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
@@ -57,7 +57,7 @@ public function testIteratorInterface()
         )->method(
             '_getNextRow'
         )->will(
-            $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8])
+            $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8], [])
         );
         $data = [];
         foreach ($this->_model as $key => $value) {
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php
index a305127f8461b..cf961d033946e 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php
@@ -45,8 +45,10 @@ class CsvTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $testDelimiter = 'some_delimiter';
 
         $this->reportHelperMock = $this->createMock(\Magento\ImportExport\Helper\Report::class);
+        $this->reportHelperMock->expects($this->any())->method('getDelimiter')->willReturn($testDelimiter);
 
         $this->outputCsvFactoryMock = $this->createPartialMock(
             \Magento\ImportExport\Model\Export\Adapter\CsvFactory::class,
@@ -65,7 +67,17 @@ protected function setUp()
             [23 => 'first error'],
             [27 => 'second error']
         );
-        $this->sourceCsvFactoryMock->expects($this->any())->method('create')->willReturn($this->sourceCsvMock);
+        $this->sourceCsvFactoryMock
+            ->expects($this->any())
+            ->method('create')
+            ->with(
+                [
+                    'file' => 'some_file_name',
+                    'directory' => null,
+                    'delimiter' => $testDelimiter
+                ]
+            )
+            ->willReturn($this->sourceCsvMock);
 
         $this->filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
 
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
index d073f3866bfe6..73b4f10b3b0f0 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Source/Import/Behavior/CustomTest.php
@@ -32,7 +32,7 @@ class CustomTest extends \Magento\ImportExport\Test\Unit\Model\Source\Import\Abs
     protected function setUp()
     {
         parent::setUp();
-        $this->_model = new \Magento\ImportExport\Model\Source\Import\Behavior\Custom([]);
+        $this->_model = new \Magento\ImportExport\Model\Source\Import\Behavior\Custom();
     }
 
     /**
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index f54981cdb8bb7..b0ba04f5aa0eb 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "ext-ctype": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ImportExport/etc/db_schema.xml b/app/code/Magento/ImportExport/etc/db_schema.xml
new file mode 100644
index 0000000000000..df45131848519
--- /dev/null
+++ b/app/code/Magento/ImportExport/etc/db_schema.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="importexport_importdata" resource="default" engine="innodb" comment="Import Data Table">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="varchar" name="entity" nullable="false" length="50" comment="Entity"/>
+        <column xsi:type="varchar" name="behavior" nullable="false" length="10" default="append" comment="Behavior"/>
+        <column xsi:type="longtext" name="data" nullable="true" comment="Data"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+    </table>
+    <table name="import_history" resource="default" engine="innodb" comment="Import history table">
+        <column xsi:type="int" name="history_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="History record Id"/>
+        <column xsi:type="timestamp" name="started_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Started at"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="User ID"/>
+        <column xsi:type="varchar" name="imported_file" nullable="true" length="255" comment="Imported file"/>
+        <column xsi:type="varchar" name="execution_time" nullable="true" length="255" comment="Execution time"/>
+        <column xsi:type="varchar" name="summary" nullable="true" length="255" comment="Summary"/>
+        <column xsi:type="varchar" name="error_file" nullable="false" length="255" comment="Imported file with errors"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="history_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/ImportExport/etc/db_schema_whitelist.json b/app/code/Magento/ImportExport/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..e78535d2c7585
--- /dev/null
+++ b/app/code/Magento/ImportExport/etc/db_schema_whitelist.json
@@ -0,0 +1,27 @@
+{
+    "importexport_importdata": {
+        "column": {
+            "id": true,
+            "entity": true,
+            "behavior": true,
+            "data": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "import_history": {
+        "column": {
+            "history_id": true,
+            "started_at": true,
+            "user_id": true,
+            "imported_file": true,
+            "execution_time": true,
+            "summary": true,
+            "error_file": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/ImportExport/etc/di.xml b/app/code/Magento/ImportExport/etc/di.xml
index 47acf7a356d93..36c76022a41c7 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/ImportExport/etc/module.xml b/app/code/Magento/ImportExport/etc/module.xml
index 1ade855bc3a8d..afbe57df9558b 100644
--- a/app/code/Magento/ImportExport/etc/module.xml
+++ b/app/code/Magento/ImportExport/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ImportExport" setup_version="2.0.1">
+    <module name="Magento_ImportExport" >
     </module>
 </config>
diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
index 60c9ee4c5a960..cae4d6e19868d 100644
--- a/app/code/Magento/ImportExport/i18n/en_US.csv
+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
@@ -119,3 +119,6 @@ User,User
 "Error File","Error File"
 "Execution Time","Execution Time"
 Summary,Summary
+"New product data is added to existing product data entries in the database. All fields except SKU can be updated.","New product data is added to existing product data entries in the database. All fields except SKU can be updated."
+"All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>","All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>"
+"Any entities in the import data that match existing entities in the database are deleted from the database.","Any entities in the import data that match existing entities in the database are deleted from the database."
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
index 093830d6fdb1c..fbdd394783608 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
@@ -64,6 +64,7 @@ require([
                     this.modifyFilterGrid();
                 }
             } else {
+                this.previousGridEntity = '';
                 $('export_filter_container').hide();
             }
         }
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index 73b013fdb8df4..8a52f4ca88e75 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -178,9 +178,13 @@ require([
                 .loader('show');
             var form = jQuery('#edit_form')
                 .one('invalid-form.validate', function(e){jQuery('body').loader('hide')});
-            newActionUrl = (newActionUrl ? newActionUrl : form.attr('action')) +
-                (form.attr('action').lastIndexOf('?') != -1 ? '&' : '?')+
-                'form_key=' + encodeURIComponent(form.find('[name="form_key"]').val());
+
+            newActionUrl = (newActionUrl ? newActionUrl : form.attr('action'));
+            if (newActionUrl.lastIndexOf('form_key') === -1) {
+                newActionUrl = newActionUrl +
+                    (newActionUrl.lastIndexOf('?') !== -1 ? '&' : '?') +
+                    'form_key=' + encodeURIComponent(form.find('[name="form_key"]').val());
+            }
 
             form.trigger('save', [{
                 action: newActionUrl,
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 43065ada77271..fffa4503e14a7 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Framework\Console\Cli;
@@ -57,7 +58,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -69,7 +70,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -104,7 +105,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * {@inheritdoc} Returns the ordered list of specified indexers and related indexers.
+     * @inheritdoc
+     *
+     * Returns the ordered list of specified indexers and related indexers.
      */
     protected function getIndexers(InputInterface $input)
     {
@@ -186,7 +189,7 @@ private function getDependentIndexerIds(string $indexerId)
                     $this->getDependentIndexerIds($id)
                 );
             }
-        };
+        }
 
         return array_unique($dependentIndexerIds);
     }
@@ -237,7 +240,9 @@ private function getIndexerIdsBySharedIndex($sharedIndex)
     private function validateSharedIndex($sharedIndex)
     {
         if (empty($sharedIndex)) {
-            throw new \InvalidArgumentException('sharedIndex must be a valid shared index identifier');
+            throw new \InvalidArgumentException(
+                'The sharedIndex is an invalid shared index identifier. Verify the identifier and try again.'
+            );
         }
         $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
         if (empty($indexerIds)) {
@@ -269,6 +274,8 @@ private function getConfig()
     }
 
     /**
+     * Get indexer registry
+     *
      * @return IndexerRegistry
      * @deprecated 100.2.0
      */
@@ -281,6 +288,8 @@ private function getIndexerRegistry()
     }
 
     /**
+     * Get dependency info provider
+     *
      * @return DependencyInfoProvider
      * @deprecated 100.2.0
      */
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand.php
new file mode 100644
index 0000000000000..51d67e2116a06
--- /dev/null
+++ b/app/code/Magento/Indexer/Console/Command/IndexerSetDimensionsModeCommand.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Console\Command;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Magento\Framework\App\ObjectManagerFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Console\Cli;
+use Magento\Indexer\Model\ModeSwitcherInterface;
+
+/**
+ * Command to set indexer dimensions mode
+ */
+class IndexerSetDimensionsModeCommand extends AbstractIndexerCommand
+{
+    const INPUT_KEY_MODE = 'mode';
+    const INPUT_KEY_INDEXER = 'indexer';
+    const DIMENSION_MODE_NONE = 'none';
+    const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
+
+    /**
+     * @var string
+     */
+    private $commandName = 'indexer:set-dimensions-mode';
+
+    /**
+     * ScopeConfigInterface
+     *
+     * @var ScopeConfigInterface
+     */
+    private $configReader;
+
+    /**
+     * @var ModeSwitcherInterface[]
+     */
+    private $dimensionProviders;
+
+    /**
+     * @param ObjectManagerFactory $objectManagerFactory
+     * @param ScopeConfigInterface $configReader
+     * @param ModeSwitcherInterface[] $dimensionSwitchers
+     */
+    public function __construct(
+        ObjectManagerFactory $objectManagerFactory,
+        ScopeConfigInterface $configReader,
+        array $dimensionSwitchers
+    ) {
+        $this->configReader = $configReader;
+        $this->dimensionProviders = $dimensionSwitchers;
+        parent::__construct($objectManagerFactory);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName($this->commandName)
+            ->setDescription('Set Indexer Dimensions Mode')
+            ->setDefinition($this->getInputList());
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $errors = $this->validate($input);
+        if ($errors) {
+            throw new \InvalidArgumentException(implode(PHP_EOL, $errors));
+        }
+        $returnValue = Cli::RETURN_SUCCESS;
+        /** @var \Magento\Indexer\Model\Indexer $indexer */
+        $indexer = $this->getObjectManager()->get(\Magento\Indexer\Model\Indexer::class);
+        try {
+            $selectedIndexer = (string)$input->getArgument(self::INPUT_KEY_INDEXER);
+            if (!$selectedIndexer) {
+                $this->showAvailableModes($output);
+            } else {
+                $indexer->load($selectedIndexer);
+                $currentMode = $input->getArgument(self::INPUT_KEY_MODE);
+                $configPath = sprintf(self::XML_PATH_DIMENSIONS_MODE_MASK, $selectedIndexer);
+                $previousMode = $this->configReader->getValue($configPath) ?: self::DIMENSION_MODE_NONE;
+                if ($previousMode !== $currentMode) {
+                    /** @var ModeSwitcherInterface $modeSwitcher */
+                    $modeSwitcher = $this->dimensionProviders[$selectedIndexer];
+                    // Switch dimensions mode
+                    $modeSwitcher->switchMode($currentMode, $previousMode);
+                    $output->writeln(
+                        'Dimensions mode for indexer "' . $indexer->getTitle() . '" was changed from \''
+                        . $previousMode . '\' to \'' . $currentMode . '\''
+                    );
+                } else {
+                    $output->writeln('Dimensions mode for indexer "' . $indexer->getTitle() . '" has not been changed');
+                }
+            }
+        } catch (\Exception $e) {
+            $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
+            $output->writeln($e->getMessage() . PHP_EOL);
+            // we must have an exit code higher than zero to indicate something was wrong
+            $returnValue = Cli::RETURN_FAILURE;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Display all available indexers and modes
+     *
+     * @param OutputInterface $output
+     * @return void
+     */
+    private function showAvailableModes(OutputInterface $output)
+    {
+        $output->writeln(sprintf('%-50s', 'Indexer') . 'Available modes');
+        foreach ($this->dimensionProviders as $indexer => $provider) {
+            $availableModes = implode(',', array_keys($provider->getDimensionModes()->getDimensions()));
+            $output->writeln(sprintf('%-50s', $indexer) . $availableModes);
+        }
+    }
+
+    /**
+     * Get list of arguments for the command
+     *
+     * @return InputArgument[]
+     */
+    private function getInputList(): array
+    {
+        $dimensionProvidersList = array_keys($this->dimensionProviders);
+        $indexerOptionDescription = 'Indexer name [' . implode('|', $dimensionProvidersList) . ']';
+        $arguments[] = new InputArgument(
+            self::INPUT_KEY_INDEXER,
+            InputArgument::OPTIONAL,
+            $indexerOptionDescription
+        );
+        $modeOptionDescription = 'Indexer dimension modes' . PHP_EOL;
+        foreach ($this->dimensionProviders as $indexer => $provider) {
+            $availableModes = implode(',', array_keys($provider->getDimensionModes()->getDimensions()));
+            $modeOptionDescription .= sprintf('%-30s ', $indexer) . $availableModes . PHP_EOL;
+        }
+        $arguments[] = new InputArgument(
+            self::INPUT_KEY_MODE,
+            InputArgument::OPTIONAL,
+            $modeOptionDescription
+        );
+
+        return $arguments;
+    }
+
+    /**
+     * Check if all arguments are provided
+     *
+     * @param InputInterface $input
+     * @return string[]
+     */
+    private function validate(InputInterface $input): array
+    {
+        $errors = [];
+        $inputIndexer = (string)$input->getArgument(self::INPUT_KEY_INDEXER);
+        if ($inputIndexer) {
+            $acceptedValues = array_keys($this->dimensionProviders);
+            $errors = $this->validateArgument(self::INPUT_KEY_INDEXER, $inputIndexer, $acceptedValues);
+            if (!$errors) {
+                $inputIndexerDimensionMode = (string)$input->getArgument(self::INPUT_KEY_MODE);
+                /** @var ModeSwitcherInterface $modeSwitcher */
+                $modeSwitcher = $this->dimensionProviders[$inputIndexer];
+                $acceptedValues = array_keys($modeSwitcher->getDimensionModes()->getDimensions());
+                $errors = $this->validateArgument(self::INPUT_KEY_MODE, $inputIndexerDimensionMode, $acceptedValues);
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validate command argument and return errors in case if argument is invalid
+     *
+     * @param string $inputKey
+     * @param string $inputIndexer
+     * @param array $acceptedValues
+     * @return string[]
+     */
+    private function validateArgument(string $inputKey, string $inputIndexer, array $acceptedValues): array
+    {
+        $errors = [];
+        $acceptedIndexerValues = ' Accepted values for "<' . $inputKey . '>" are \'' .
+            implode(',', $acceptedValues) . '\'';
+        if (!$inputIndexer) {
+            $errors[] = 'Missing argument "<' . $inputKey . '>".' . $acceptedIndexerValues;
+        } elseif (!\in_array($inputIndexer, $acceptedValues)) {
+            $errors[] = 'Invalid value for "<' . $inputKey . '>" argument.' . $acceptedIndexerValues;
+        }
+
+        return $errors;
+    }
+}
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php
new file mode 100644
index 0000000000000..44fff0bca6802
--- /dev/null
+++ b/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Console\Command;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\ObjectManagerFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * Command to show indexers dimension modes
+ */
+class IndexerShowDimensionsModeCommand extends AbstractIndexerCommand
+{
+    const INPUT_KEY_INDEXER = 'indexer';
+    const DIMENSION_MODE_NONE = 'none';
+    const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
+    /**
+     * @var string
+     */
+    private $commandName = 'indexer:show-dimensions-mode';
+    /**
+     * ScopeConfigInterface
+     *
+     * @var ScopeConfigInterface
+     */
+    private $configReader;
+    /**
+     * @var string[]
+     */
+    private $indexers;
+
+    /**
+     * @param ObjectManagerFactory $objectManagerFactory
+     * @param ScopeConfigInterface $configReader
+     * @param array $indexers
+     */
+    public function __construct(
+        ObjectManagerFactory $objectManagerFactory,
+        ScopeConfigInterface $configReader,
+        array $indexers
+    ) {
+        $this->configReader = $configReader;
+        $this->indexers = $indexers;
+        parent::__construct($objectManagerFactory);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName($this->commandName)
+            ->setDescription('Shows Indexer Dimension Mode')
+            ->setDefinition($this->getInputList());
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $errors = $this->validate($input);
+        if ($errors) {
+            throw new \InvalidArgumentException(implode(PHP_EOL, $errors));
+        }
+        $returnValue = Cli::RETURN_SUCCESS;
+        /** @var \Magento\Indexer\Model\Indexer $indexer */
+        $indexer = $this->getObjectManager()->get(\Magento\Indexer\Model\Indexer::class);
+        try {
+            $selectedIndexers = $input->getArgument(self::INPUT_KEY_INDEXER);
+            if ($selectedIndexers) {
+                $indexersList = (array)$selectedIndexers;
+            } else {
+                $indexersList = $this->indexers;
+            }
+            foreach ($indexersList as $indexerId) {
+                $indexer->load($indexerId);
+                $configPath = sprintf(self::XML_PATH_DIMENSIONS_MODE_MASK, $indexerId);
+                $mode = $this->configReader->getValue($configPath) ?: self::DIMENSION_MODE_NONE;
+                $output->writeln(sprintf('%-50s ', $indexer->getTitle() . ':') . $mode);
+            }
+        } catch (\Exception $e) {
+            $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
+            $output->writeln($e->getMessage() . PHP_EOL);
+            // we must have an exit code higher than zero to indicate something was wrong
+            $returnValue = Cli::RETURN_FAILURE;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Get list of arguments for the command
+     *
+     * @return InputArgument[]
+     */
+    private function getInputList(): array
+    {
+        $optionDescription = 'Space-separated list of index types or omit to apply to all indexes';
+        $arguments[] = new InputArgument(
+            self::INPUT_KEY_INDEXER,
+            InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+            $optionDescription . ' (' . implode($this->indexers) . ')'
+        );
+
+        return $arguments;
+    }
+
+    /**
+     * Check if all arguments are provided
+     *
+     * @param InputInterface $input
+     * @return string[]
+     */
+    private function validate(InputInterface $input): array
+    {
+        $inputIndexer = (array)$input->getArgument(self::INPUT_KEY_INDEXER);
+        $acceptedValues = array_keys($this->indexers);
+        $errors = $this->validateArgument(self::INPUT_KEY_INDEXER, $inputIndexer, $acceptedValues);
+
+        return $errors;
+    }
+
+    /**
+     * Validate command argument and return errors in case if argument is invalid
+     *
+     * @param string $inputKey
+     * @param array $inputIndexer
+     * @param array $acceptedValues
+     * @return array
+     */
+    private function validateArgument(string $inputKey, array $inputIndexer, array $acceptedValues): array
+    {
+        $errors = [];
+        $acceptedIndexerValues = ' Accepted values for "<' . $inputKey . '>" are \'' .
+            implode(',', $acceptedValues) . '\'';
+        if (!empty($inputIndexer) && !\array_intersect($inputIndexer, $acceptedValues)) {
+            $errors[] = 'Invalid value for "<' . $inputKey . '>" argument.' . $acceptedIndexerValues;
+        }
+
+        return $errors;
+    }
+}
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
index 22acdc6f82bbc..cefb070f60b74 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
@@ -9,6 +9,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Indexer;
 use Magento\Framework\Mview;
+use Symfony\Component\Console\Helper\Table;
 
 /**
  * Command for displaying status of indexers.
@@ -32,7 +33,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
+        $table = new Table($output);
         $table->setHeaders(['Title', 'Status', 'Update On', 'Schedule Status', 'Schedule Updated']);
 
         $rows = [];
@@ -63,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         });
 
         $table->addRows($rows);
-        $table->render($output);
+        $table->render();
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
index 02e600dbd939f..35cefbcda43e7 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Indexer\Controller\Adminhtml\Indexer;
 
-class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpGetActionInterface
 {
     /**
      * Display processes grid action
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
index b4a4d9f06ae48..3dffd514218d6 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Indexer\Controller\Adminhtml\Indexer;
 
-class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpPostActionInterface
 {
     /**
      * Turn mview on for the given indexers
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
index 7ace4a64d3829..9f7faff8843a3 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Indexer\Controller\Adminhtml\Indexer;
 
-class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpPostActionInterface
 {
     /**
      * Turn mview off for the given indexers
diff --git a/app/code/Magento/Indexer/Model/DimensionMode.php b/app/code/Magento/Indexer/Model/DimensionMode.php
new file mode 100644
index 0000000000000..5e67f70663bac
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/DimensionMode.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model;
+
+/**
+ * DTO to work with dimension mode
+ */
+class DimensionMode
+{
+    /**
+     * @var array
+     */
+    private $name;
+
+    /**
+     * @var array
+     */
+    private $dimensions;
+
+    /**
+     * @param string $name
+     * @param array $dimensions
+     */
+    public function __construct(string $name, array $dimensions)
+    {
+        $this->dimensions = (function (string ...$dimensions) {
+            return $dimensions;
+        })(...$dimensions);
+        $this->name = $name;
+    }
+
+    /**
+     * Returns dimension name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns dimension modes
+     *
+     * @return string[]
+     */
+    public function getDimensions(): array
+    {
+        return $this->dimensions;
+    }
+}
diff --git a/app/code/Magento/Indexer/Model/DimensionModes.php b/app/code/Magento/Indexer/Model/DimensionModes.php
new file mode 100644
index 0000000000000..a9507a6f4d358
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/DimensionModes.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model;
+
+/**
+ * DTO to work with dimension modes
+ */
+class DimensionModes
+{
+    /**
+     * @var DimensionMode[]
+     */
+    private $dimensions;
+
+    /**
+     * @param DimensionMode[] $dimensions
+     */
+    public function __construct(array $dimensions)
+    {
+        $this->dimensions = (function (DimensionMode ...$dimensions) {
+            $result = [];
+            foreach ($dimensions as $dimension) {
+                $result[$dimension->getName()] = $dimension;
+            }
+            return $result;
+        })(...$dimensions);
+    }
+
+    /**
+     * Returns dimensions and their modes
+     *
+     * @return array
+     */
+    public function getDimensions(): array
+    {
+        return $this->dimensions;
+    }
+}
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 412611d1dffd6..87a7cce58e1a5 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()
     {
@@ -397,7 +398,7 @@ protected function getStructureInstance()
      * Regenerate full index
      *
      * @return void
-     * @throws \Exception
+     * @throws \Throwable
      */
     public function reindexAll()
     {
@@ -413,7 +414,7 @@ public function reindexAll()
                 $state->setStatus(StateInterface::STATUS_VALID);
                 $state->save();
                 $this->getView()->resume();
-            } catch (\Exception $exception) {
+            } catch (\Throwable $exception) {
                 $state->setStatus(StateInterface::STATUS_INVALID);
                 $state->save();
                 $this->getView()->resume();
diff --git a/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php b/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php
index d22795f127138..829df74a1b0ed 100644
--- a/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php
+++ b/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php
@@ -256,7 +256,10 @@ public function reindexRow($id)
         $this->indexer->reindexRow($id);
         $dependentIndexerIds = $this->dependencyInfoProvider->getIndexerIdsToRunAfter($this->indexer->getId());
         foreach ($dependentIndexerIds as $indexerId) {
-            $this->indexerRegistry->get($indexerId)->reindexRow($id);
+            $dependentIndexer = $this->indexerRegistry->get($indexerId);
+            if (!$dependentIndexer->isScheduled()) {
+                $dependentIndexer->reindexRow($id);
+            }
         }
     }
 
@@ -268,7 +271,10 @@ public function reindexList($ids)
         $this->indexer->reindexList($ids);
         $dependentIndexerIds = $this->dependencyInfoProvider->getIndexerIdsToRunAfter($this->indexer->getId());
         foreach ($dependentIndexerIds as $indexerId) {
-            $this->indexerRegistry->get($indexerId)->reindexList($ids);
+            $dependentIndexer = $this->indexerRegistry->get($indexerId);
+            if (!$dependentIndexer->isScheduled()) {
+                $dependentIndexer->reindexList($ids);
+            }
         }
     }
 }
diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
index e13a5709e2362..5a3f879b0ad80 100644
--- a/app/code/Magento/Indexer/Model/Message/Invalid.php
+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -71,7 +71,7 @@ public function getText()
         return __(
             'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
             $url,
-            'http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands-cron.html#config-cli-cron-bkg'
+            'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
         );
         //@codingStandardsIgnoreEnd
     }
diff --git a/app/code/Magento/Indexer/Model/ModeSwitcherInterface.php b/app/code/Magento/Indexer/Model/ModeSwitcherInterface.php
new file mode 100644
index 0000000000000..8984b05365fb9
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ModeSwitcherInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model;
+
+/**
+ * Interface to switch indexer mode
+ */
+interface ModeSwitcherInterface
+{
+    /**
+     * Returns data object that contains dimension modes
+     *
+     * @return DimensionModes
+     */
+    public function getDimensionModes(): DimensionModes;
+
+    /**
+     * Switch dimension mode
+     *
+     * @param string $currentMode
+     * @param string $previousMode
+     * @throws \InvalidArgumentException
+     * @throws \Zend_Db_Exception
+     * @return void
+     */
+    public function switchMode(string $currentMode, string $previousMode);
+}
diff --git a/app/code/Magento/Indexer/Model/ProcessManager.php b/app/code/Magento/Indexer/Model/ProcessManager.php
new file mode 100644
index 0000000000000..04cd713fffb11
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ProcessManager.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model;
+
+/**
+ * Provide functionality for executing user functions in multi-thread mode.
+ */
+class ProcessManager
+{
+    /**
+     * Threads count environment variable name
+     */
+    const THREADS_COUNT = 'MAGE_INDEXER_THREADS_COUNT';
+
+    /** @var bool */
+    private $failInChildProcess = false;
+
+    /** @var \Magento\Framework\App\ResourceConnection */
+    private $resource;
+
+    /** @var \Magento\Framework\Registry */
+    private $registry;
+
+    /** @var int|null */
+    private $threadsCount;
+
+    /**
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param \Magento\Framework\Registry $registry
+     * @param int|null $threadsCount
+     */
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Framework\Registry $registry = null,
+        int $threadsCount = null
+    ) {
+        $this->resource = $resource;
+        if (null === $registry) {
+            $registry = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Registry::class
+            );
+        }
+        $this->registry = $registry;
+        $this->threadsCount = (int)$threadsCount;
+    }
+
+    /**
+     * Execute user functions
+     *
+     * @param \Traversable $userFunctions
+     */
+    public function execute($userFunctions)
+    {
+        if ($this->threadsCount > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
+            $this->multiThreadsExecute($userFunctions);
+        } else {
+            $this->simpleThreadExecute($userFunctions);
+        }
+    }
+
+    /**
+     * Execute user functions in singleThreads mode
+     *
+     * @param \Traversable $userFunctions
+     */
+    private function simpleThreadExecute($userFunctions)
+    {
+        foreach ($userFunctions as $userFunction) {
+            call_user_func($userFunction);
+        }
+    }
+
+    /**
+     * Execute user functions in multiThreads mode
+     *
+     * @param \Traversable $userFunctions
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function multiThreadsExecute($userFunctions)
+    {
+        $this->resource->closeConnection(null);
+        $threadNumber = 0;
+        foreach ($userFunctions as $userFunction) {
+            $pid = pcntl_fork();
+            if ($pid == -1) {
+                throw new \RuntimeException('Unable to fork a new process');
+            } elseif ($pid) {
+                $this->executeParentProcess($threadNumber);
+            } else {
+                $this->startChildProcess($userFunction);
+            }
+        }
+        while (pcntl_waitpid(0, $status) != -1) {
+            //Waiting for the completion of child processes
+        }
+
+        if ($this->failInChildProcess) {
+            throw new \RuntimeException('Fail in child process');
+        }
+    }
+
+    /**
+     * Is process can be paralleled
+     *
+     * @return bool
+     */
+    private function isCanBeParalleled(): bool
+    {
+        return function_exists('pcntl_fork');
+    }
+
+    /**
+     * Is setup mode
+     *
+     * @return bool
+     */
+    private function isSetupMode(): bool
+    {
+        return $this->registry->registry('setup-mode-enabled') ?: false;
+    }
+
+    /**
+     * Start child process
+     *
+     * @param callable $userFunction
+     * @SuppressWarnings(PHPMD.ExitExpression)
+     */
+    private function startChildProcess(callable $userFunction)
+    {
+        $status = call_user_func($userFunction);
+        $status = is_integer($status) ? $status : 0;
+        exit($status);
+    }
+
+    /**
+     * Execute parent process
+     *
+     * @param int $threadNumber
+     */
+    private function executeParentProcess(int &$threadNumber)
+    {
+        $threadNumber++;
+        if ($threadNumber >= $this->threadsCount) {
+            pcntl_wait($status);
+            if (pcntl_wexitstatus($status) !== 0) {
+                $this->failInChildProcess = true;
+            }
+            $threadNumber--;
+        }
+    }
+}
diff --git a/app/code/Magento/Indexer/Setup/InstallData.php b/app/code/Magento/Indexer/Setup/InstallData.php
deleted file mode 100644
index 98a49d6799b13..0000000000000
--- a/app/code/Magento/Indexer/Setup/InstallData.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Indexer\Setup;
-
-use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Encryption\EncryptorInterface;
-use Magento\Framework\Indexer\StateInterface;
-use Magento\Framework\Json\EncoderInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Indexer\ConfigInterface;
-use Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory;
-use Magento\Indexer\Model\Indexer\State;
-use Magento\Indexer\Model\Indexer\StateFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-
-/**
- * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Indexer collection factory
-     *
-     * @var CollectionFactory
-     */
-    private $statesFactory;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @var EncryptorInterface
-     */
-    private $encryptor;
-
-    /**
-     * @var EncoderInterface
-     */
-    private $encoder;
-
-    /**
-     * @var StateFactory
-     */
-    private $stateFactory;
-
-    /**
-     * Init
-     *
-     * @param CollectionFactory $statesFactory
-     * @param StateFactory $stateFactory
-     * @param ConfigInterface $config
-     * @param EncryptorInterface $encryptor
-     * @param EncoderInterface $encoder
-     * @internal param StateFactory $stateFactory
-     */
-    public function __construct(
-        CollectionFactory $statesFactory,
-        StateFactory $stateFactory,
-        ConfigInterface $config,
-        EncryptorInterface $encryptor,
-        EncoderInterface $encoder
-    ) {
-        $this->statesFactory = $statesFactory;
-        $this->config = $config;
-        $this->encryptor = $encryptor;
-        $this->encoder = $encoder;
-        $this->stateFactory = $stateFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var State[] $stateIndexers */
-        $stateIndexers = [];
-        $states = $this->statesFactory->create();
-        foreach ($states->getItems() as $state) {
-            /** @var State $state */
-            $stateIndexers[$state->getIndexerId()] = $state;
-        }
-
-        foreach ($this->config->getIndexers() as $indexerId => $indexerConfig) {
-            $hash = $this->encryptor->hash($this->encoder->encode($indexerConfig), Encryptor::HASH_VERSION_MD5);
-            if (isset($stateIndexers[$indexerId])) {
-                $stateIndexers[$indexerId]->setHashConfig($hash);
-                $stateIndexers[$indexerId]->save();
-            } else {
-                /** @var State $state */
-                $state = $this->stateFactory->create();
-                $state->loadByIndexer($indexerId);
-                $state->setHashConfig($hash);
-                $state->setStatus(StateInterface::STATUS_INVALID);
-                $state->save();
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Indexer/Setup/InstallSchema.php b/app/code/Magento/Indexer/Setup/InstallSchema.php
deleted file mode 100644
index 7e20fe78e1eb4..0000000000000
--- a/app/code/Magento/Indexer/Setup/InstallSchema.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Indexer\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'indexer_state'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('indexer_state'))
-            ->addColumn(
-                'state_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Indexer State Id'
-            )
-            ->addColumn(
-                'indexer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Indexer Id'
-            )
-            ->addColumn(
-                'status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                16,
-                ['default' => 'invalid'],
-                'Indexer Status'
-            )
-            ->addColumn(
-                'updated',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-                null,
-                [],
-                'Indexer Status'
-            )
-            ->addColumn(
-                'hash_config',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => false],
-                'Hash of indexer config'
-            )
-            ->addIndex(
-                $installer->getIdxName('indexer_state', ['indexer_id']),
-                ['indexer_id']
-            )
-            ->setComment('Indexer State');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'mview_state'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('mview_state'))
-            ->addColumn(
-                'state_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [
-                    'identity' => true,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'primary' => true,
-                ],
-                'View State Id'
-            )
-            ->addColumn(
-                'view_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'View Id'
-            )
-            ->addColumn(
-                'mode',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                16,
-                ['default' => 'disabled'],
-                'View Mode'
-            )
-            ->addColumn(
-                'status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                16,
-                ['default' => 'idle'],
-                'View Status'
-            )
-            ->addColumn(
-                'updated',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-                null,
-                [],
-                'View updated time'
-            )
-            ->addColumn(
-                'version_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'View Version Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('mview_state', ['view_id']),
-                ['view_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('mview_state', ['mode']),
-                ['mode']
-            )
-            ->setComment('View State');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php b/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php
new file mode 100644
index 0000000000000..887f3311ee99a
--- /dev/null
+++ b/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Indexer\Setup\Patch\Data;
+
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Indexer\StateInterface;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Indexer\ConfigInterface;
+use Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory;
+use Magento\Indexer\Model\Indexer\State;
+use Magento\Indexer\Model\Indexer\StateFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InitializeIndexerState
+ * @package Magento\Indexer\Setup\Patch
+ */
+class InitializeIndexerState implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $statesFactory;
+
+    /**
+     * @var StateFactory
+     */
+    private $stateFactory;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var EncryptorInterface
+     */
+    private $encryptor;
+
+    /**
+     * @var EncoderInterface
+     */
+    private $encoder;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        CollectionFactory $statesFactory,
+        StateFactory $stateFactory,
+        ConfigInterface $config,
+        EncryptorInterface $encryptor,
+        EncoderInterface $encoder
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->statesFactory = $statesFactory;
+        $this->stateFactory = $stateFactory;
+        $this->config = $config;
+        $this->encryptor = $encryptor;
+        $this->encoder = $encoder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var State[] $stateIndexers */
+        $stateIndexers = [];
+        $states = $this->statesFactory->create();
+        foreach ($states->getItems() as $state) {
+            /** @var State $state */
+            $stateIndexers[$state->getIndexerId()] = $state;
+        }
+
+        foreach ($this->config->getIndexers() as $indexerId => $indexerConfig) {
+            $hash = $this->encryptor->hash($this->encoder->encode($indexerConfig), Encryptor::HASH_VERSION_MD5);
+            if (isset($stateIndexers[$indexerId])) {
+                $stateIndexers[$indexerId]->setHashConfig($hash);
+                $stateIndexers[$indexerId]->save();
+            } else {
+                /** @var State $state */
+                $state = $this->stateFactory->create();
+                $state->loadByIndexer($indexerId);
+                $state->setHashConfig($hash);
+                $state->setStatus(StateInterface::STATUS_INVALID);
+                $state->save();
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.1.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml
new file mode 100644
index 0000000000000..52444e0c26ab0
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="updateIndexerBySchedule">
+        <arguments>
+            <argument name="indexerName" type="string"/>
+        </arguments>
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexManagementPageToLoad"/>
+        <click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer1"/>
+        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_changelog" stepKey="selectUpdateBySchedule"/>
+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm"/>
+        <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
+        <waitForPageLoad stepKey="waitForSave"/>
+    </actionGroup>
+    <actionGroup name="updateIndexerOnSave">
+        <arguments>
+            <argument name="indexerName" type="string"/>
+        </arguments>
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage2"/>
+        <waitForPageLoad stepKey="waitForIndexManagementPageToLoad2"/>
+        <click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer2"/>
+        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_onthefly" stepKey="selectUpdateOnSave"/>
+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm2"/>
+        <!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
+        <waitForPageLoad stepKey="waitForSave2"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE.txt b/app/code/Magento/Indexer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE.txt
rename to app/code/Magento/Indexer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE_AFL.txt b/app/code/Magento/Indexer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE_AFL.txt
rename to app/code/Magento/Indexer/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Indexer/Test/Mftf/README.md b/app/code/Magento/Indexer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..df1044b36de0c
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Indexer Functional Tests
+
+The Functional Test Module for **Magento Indexer** module.
diff --git a/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
new file mode 100644
index 0000000000000..db98116c224dd
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminIndexManagementSection">
+        <!--<element name="catalogSearchCheckbox" type="checkbox" selector="input[value='catalogsearch_fulltext']"/>-->
+        <element name="indexerCheckbox" type="checkbox" selector="input[value='{{var1}}']" parameterized="true"/>
+        <element name="massActionSelect" type="select" selector="#gridIndexer_massaction-select"/>
+        <element name="massActionSubmit" type="button" selector="#gridIndexer_massaction-form button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Indexer/Test/Unit/App/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/App/IndexerTest.php
index 5bc20e0633191..490d9437941f6 100644
--- a/app/code/Magento/Indexer/Test/Unit/App/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/App/IndexerTest.php
@@ -62,6 +62,9 @@ public function testExecute($isExist, $callCount)
         $this->assertEquals(0, $this->entryPoint->launch()->getCode());
     }
 
+    /**
+     * @return array
+     */
     public function executeProvider()
     {
         return [
diff --git a/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/ScheduledTest.php b/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/ScheduledTest.php
index 6ae005efa0550..1a226e073ca5e 100644
--- a/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/ScheduledTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/ScheduledTest.php
@@ -31,6 +31,9 @@ public function testRender($rowValue, $class, $text)
         $this->assertEquals($result, $html);
     }
 
+    /**
+     * @return array
+     */
     public function typeProvider()
     {
         return [
diff --git a/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/StatusTest.php b/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/StatusTest.php
index e419a010ad96d..705a9e3998ae8 100644
--- a/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/StatusTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/StatusTest.php
@@ -33,6 +33,9 @@ public function testRender($indexValues, $expectedResult)
         );
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/UpdatedTest.php b/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/UpdatedTest.php
index e1ad5c50f3c91..369a4d46abf49 100644
--- a/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/UpdatedTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/UpdatedTest.php
@@ -27,6 +27,9 @@ public function testRender($defaultValue, $assert)
         $this->assertEquals($result, $assert);
     }
 
+    /**
+     * @return array
+     */
     public function renderProvider()
     {
         return [
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetDimensionsModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetDimensionsModeCommandTest.php
new file mode 100644
index 0000000000000..3d913ee2860d2
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetDimensionsModeCommandTest.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Test\Unit\Console\Command;
+
+use Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand;
+use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Test for class \Magento\Indexer\Model\ModeSwitcherInterface.
+ */
+class IndexerSetDimensionsModeCommandTest extends AbstractIndexerCommandCommonSetup
+{
+    /**
+     * Command being tested
+     *
+     * @var IndexerSetDimensionsModeCommand|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $command;
+
+    /**
+     * ScopeConfigInterface
+     *
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configReaderMock;
+
+    /**
+     * @var \Magento\Indexer\Model\ModeSwitcherInterface[]
+     */
+    private $dimensionProviders;
+
+    /**
+     * @var \Magento\Indexer\Model\ModeSwitcherInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dimensionModeSwitcherMock;
+
+    /**
+     * @var \Magento\Indexer\Model\Indexer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexerMock;
+
+    /**
+     * @var \Magento\Indexer\Model\DimensionModes|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dimensionModes;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->configReaderMock = $this->createMock(ScopeConfigInterface::class);
+        $this->dimensionModeSwitcherMock =
+            $this->createMock(\Magento\Indexer\Model\ModeSwitcherInterface::class);
+        $this->dimensionProviders = [
+            'indexer_title' => $this->dimensionModeSwitcherMock,
+        ];
+        $this->dimensionModes = $this->createMock(\Magento\Indexer\Model\DimensionModes::class);
+        $this->command = $objectManagerHelper->getObject(
+            IndexerSetDimensionsModeCommand::class,
+            [
+                'objectManagerFactory' => $this->objectManagerFactory,
+                'configReader'         => $this->configReaderMock,
+                'dimensionSwitchers'   => $this->dimensionProviders,
+            ]
+        );
+    }
+
+    /**
+     * Get return value map for object manager
+     *
+     * @return array
+     */
+    protected function getObjectManagerReturnValueMap()
+    {
+        $result = parent::getObjectManagerReturnValueMap();
+        $this->indexerMock = $this->createMock(\Magento\Indexer\Model\Indexer::class);
+        $result[] = [\Magento\Indexer\Model\Indexer::class, $this->indexerMock];
+
+        return $result;
+    }
+
+    /**
+     * Tests method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
+     *
+     * @param string $indexerTitle
+     * @param string $previousMode
+     * @param string $command
+     * @param string $consoleOutput
+     * @dataProvider dimensionModesDataProvider
+     * @return void
+     */
+    public function testExecuteWithAttributes($indexerTitle, $previousMode, $command, $consoleOutput)
+    {
+        $this->configureAdminArea();
+        $commandTester = new CommandTester($this->command);
+        $this->dimensionModes->method('getDimensions')->willReturn([
+            $previousMode    => 'dimension1',
+            $command['mode'] => 'dimension2',
+        ]);
+        $this->dimensionModeSwitcherMock->method('getDimensionModes')->willReturn($this->dimensionModes);
+        $this->indexerMock->method('load')->willReturnSelf();
+        $this->indexerMock->method('getTitle')->willReturn($indexerTitle);
+        $commandTester->execute($command);
+        $actualValue = $commandTester->getDisplay();
+        $this->assertEquals(
+            $consoleOutput,
+            $actualValue
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function dimensionModesDataProvider(): array
+    {
+        return [
+            'was_changed'     => [
+                'indexer_title' => 'indexer_title',
+                'previousMode'  => 'none',
+                'command'       => [
+                    'indexer' => 'indexer_title',
+                    'mode'    => 'store',
+                ],
+                'output'        =>
+                    sprintf(
+                        'Dimensions mode for indexer "%s" was changed from \'%s\' to \'%s\'',
+                        'indexer_title',
+                        'none',
+                        'store'
+                    ) . PHP_EOL
+                ,
+            ],
+            'was_not_changed' => [
+                'indexer_title' => 'indexer_title',
+                'previousMode'  => 'none',
+                'command'       => [
+                    'indexer' => 'indexer_title',
+                    'mode'    => 'none',
+                ],
+                'output'        =>
+                    sprintf(
+                        'Dimensions mode for indexer "%s" has not been changed',
+                        'indexer_title'
+                    ) . PHP_EOL
+                ,
+            ],
+        ];
+    }
+
+    /**
+     * Tests indexer exception of method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage
+     *      Invalid value for "<indexer>" argument. Accepted values for "<indexer>" are 'indexer_title'
+     * @return void
+     */
+    public function testExecuteWithIndxerException()
+    {
+        $commandTester = new CommandTester($this->command);
+        $this->indexerMock->method('getTitle')->willReturn('indexer_title');
+        $commandTester->execute(['indexer' => 'non_existing_title']);
+    }
+
+    /**
+     * Tests indexer exception of method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Missing argument "<mode>". Accepted values for "<mode>" are 'store,website'
+     * @return void
+     */
+    public function testExecuteWithModeException()
+    {
+        $commandTester = new CommandTester($this->command);
+        $this->dimensionModes->method('getDimensions')->willReturn([
+            'store'   => 'dimension1',
+            'website' => 'dimension2',
+        ]);
+        $this->dimensionModeSwitcherMock->method('getDimensionModes')->willReturn($this->dimensionModes);
+        $this->indexerMock->method('getTitle')->willReturn('indexer_title');
+        $commandTester->execute([
+            'indexer' => 'indexer_title',
+        ]);
+    }
+
+    /**
+     * Test execution of command without any arguments
+     *
+     * @return void
+     */
+    public function testExecuteWithNoArguments()
+    {
+        $indexerTitle = 'indexer_title';
+        $modesConfig = [
+            'store'   => 'dimension1',
+            'website' => 'dimension2',
+        ];
+        $this->configureAdminArea();
+        $commandTester = new CommandTester($this->command);
+        $this->indexerMock->method('getTitle')->willReturn($indexerTitle);
+        $this->dimensionModes->method('getDimensions')->willReturn($modesConfig);
+        $this->dimensionModeSwitcherMock->method('getDimensionModes')->willReturn($this->dimensionModes);
+        $commandTester->execute([]);
+        $actualValue = $commandTester->getDisplay();
+        $consoleOutput = sprintf('%-50s', 'Indexer') . 'Available modes' . PHP_EOL
+            . sprintf('%-50s', $indexerTitle) . 'store,website' . PHP_EOL;
+        $this->assertEquals(
+            $consoleOutput,
+            $actualValue
+        );
+    }
+}
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php
new file mode 100644
index 0000000000000..53a84b96b9713
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Test\Unit\Console\Command;
+
+use Magento\Indexer\Console\Command\IndexerShowDimensionsModeCommand;
+use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class IndexerShowDimensionsModeCommandTest extends AbstractIndexerCommandCommonSetup
+{
+    /**
+     * Command being tested
+     *
+     * @var IndexerShowDimensionsModeCommand|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $command;
+
+    /**
+     * ScopeConfigInterface
+     *
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configReaderMock;
+
+    /**
+     * @var \Magento\Indexer\Model\ModeSwitcherInterface[]
+     */
+    private $indexers;
+
+    /**
+     * @var \Magento\Indexer\Model\Indexer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexerMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->configReaderMock = $this->createMock(ScopeConfigInterface::class);
+        $this->indexers = ['indexer_1' => 'indexer_1', 'indexer_2' => 'indexer_2'];
+        $this->command = $objectManagerHelper->getObject(
+            IndexerShowDimensionsModeCommand::class,
+            [
+                'objectManagerFactory' => $this->objectManagerFactory,
+                'configReader'         => $this->configReaderMock,
+                'indexers'             => $this->indexers,
+            ]
+        );
+    }
+
+    /**
+     * Get return value map for object manager
+     *
+     * @return array
+     */
+    protected function getObjectManagerReturnValueMap(): array
+    {
+        $result = parent::getObjectManagerReturnValueMap();
+        $this->indexerMock = $this->createMock(\Magento\Indexer\Model\Indexer::class);
+        $result[] = [\Magento\Indexer\Model\Indexer::class, $this->indexerMock];
+
+        return $result;
+    }
+
+    /**
+     * Tests method \Magento\Indexer\Console\Command\IndexerDimensionsModeCommand::execute
+     *
+     * @param string $command
+     * @param string $consoleOutput
+     * @dataProvider dimensionModesDataProvider
+     */
+    public function testExecuteWithAttributes($command, $consoleOutput)
+    {
+        $indexers = [['indexer_1'], ['indexer_2']];
+        $indexerTitles = ['indexer_title1', 'indexer_title2'];
+        $this->configureAdminArea();
+        /** @var CommandTester $commandTester */
+        $commandTester = new CommandTester($this->command);
+        $this->indexerMock->method('load')->withConsecutive(...$indexers);
+        $this->indexerMock->method('getTitle')->willReturnOnConsecutiveCalls(...$indexerTitles);
+        $commandTester->execute($command);
+        $actualValue = $commandTester->getDisplay();
+        $this->assertEquals(
+            $consoleOutput,
+            $actualValue
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function dimensionModesDataProvider(): array
+    {
+        return [
+            'get_all'                => [
+                'command' => [],
+                'output'  =>
+                    sprintf(
+                        '%-50s ',
+                        'indexer_title1' . ':'
+                    ) . 'none' . PHP_EOL .
+                    sprintf(
+                        '%-50s ',
+                        'indexer_title2' . ':'
+                    ) . 'none' . PHP_EOL
+                ,
+            ],
+            'get_by_index'           => [
+                'command' => [
+                    'indexer' => ['indexer_1'],
+                ],
+                'output'  =>
+                    sprintf(
+                        '%-50s ',
+                        'indexer_title1' . ':'
+                    ) . 'none' . PHP_EOL
+                ,
+            ],
+            'get_by_several_indexes' => [
+                'command' => [
+                    'indexer' => ['indexer_1', 'indexer_2'],
+                ],
+                'output'  =>
+                    sprintf(
+                        '%-50s ',
+                        'indexer_title1' . ':'
+                    ) . 'none' . PHP_EOL .
+                    sprintf(
+                        '%-50s ',
+                        'indexer_title2' . ':'
+                    ) . 'none' . PHP_EOL
+                ,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
index a79c9cc47a1bc..8498bd183af21 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
@@ -8,8 +8,6 @@
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Indexer\Console\Command\IndexerStatusCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Helper\TableHelper;
 
 class IndexerStatusCommandTest extends AbstractIndexerCommandCommonSetup
 {
@@ -93,15 +91,6 @@ public function testExecuteAll(array $indexers)
         $this->initIndexerCollectionByItems($indexerMocks);
         $this->command = new IndexerStatusCommand($this->objectManagerFactory);
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->command->setHelperSet(
-            $objectManager->getObject(
-                HelperSet::class,
-                ['helpers' => [$objectManager->getObject(TableHelper::class)]]
-            )
-        );
-
         $commandTester = new CommandTester($this->command);
         $commandTester->execute([]);
 
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index 2c25c698dd425..6b7cc12218990 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -273,6 +273,59 @@ function () {
         $this->model->reindexAll();
     }
 
+    /**
+     * @expectedException \Error
+     * @expectedExceptionMessage Test Engine Error
+     */
+    public function testReindexAllWithError()
+    {
+
+        $indexId = 'indexer_internal_name';
+        $this->loadIndexer($indexId);
+
+        $stateMock = $this->createPartialMock(
+            \Magento\Indexer\Model\Indexer\State::class,
+            ['load', 'getId', 'setIndexerId', '__wakeup', 'getStatus', 'setStatus', 'save']
+        );
+        $stateMock->expects($this->once())->method('load')->with($indexId, 'indexer_id')->will($this->returnSelf());
+        $stateMock->expects($this->never())->method('setIndexerId');
+        $stateMock->expects($this->once())->method('getId')->will($this->returnValue(1));
+        $stateMock->expects($this->exactly(2))->method('setStatus')->will($this->returnSelf());
+        $stateMock->expects($this->once())->method('getStatus')->will($this->returnValue('idle'));
+        $stateMock->expects($this->exactly(2))->method('save')->will($this->returnSelf());
+        $this->stateFactoryMock->expects($this->once())->method('create')->will($this->returnValue($stateMock));
+
+        $this->viewMock->expects($this->once())->method('isEnabled')->will($this->returnValue(false));
+        $this->viewMock->expects($this->never())->method('suspend');
+        $this->viewMock->expects($this->once())->method('resume');
+
+        $actionMock = $this->createPartialMock(
+            \Magento\Framework\Indexer\ActionInterface::class,
+            ['executeFull', 'executeList', 'executeRow']
+        );
+        $actionMock->expects($this->once())->method('executeFull')->will(
+            $this->returnCallback(
+                function () {
+                     throw new \Error('Test Engine Error');
+                }
+            )
+        );
+        $this->actionFactoryMock->expects(
+            $this->once()
+        )->method(
+            'create'
+        )->with(
+            'Some\Class\Name'
+        )->will(
+            $this->returnValue($actionMock)
+        );
+
+        $this->model->reindexAll();
+    }
+
+    /**
+     * @return array
+     */
     protected function getIndexerData()
     {
         return [
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php b/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
index f7b99fdb8d23f..46ae79fc92f4a 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
@@ -165,6 +165,9 @@ public function testInsertFromTable($readToIndex)
         );
     }
 
+    /**
+     * @return array
+     */
     public function insertFromTableData()
     {
         return [[false], [true]];
diff --git a/app/code/Magento/Indexer/Ui/DataProvider/Indexer/DataCollection.php b/app/code/Magento/Indexer/Ui/DataProvider/Indexer/DataCollection.php
index 5ba4521791c50..6f8f10c93bf9f 100644
--- a/app/code/Magento/Indexer/Ui/DataProvider/Indexer/DataCollection.php
+++ b/app/code/Magento/Indexer/Ui/DataProvider/Indexer/DataCollection.php
@@ -23,6 +23,11 @@ class DataCollection extends Collection
      */
     private $indexerRegistry;
 
+    /**
+     * @param EntityFactoryInterface $entityFactory
+     * @param ConfigInterface $config
+     * @param IndexerRegistry $indexerRegistry
+     */
     public function __construct(
         EntityFactoryInterface $entityFactory,
         ConfigInterface $config,
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 82b041b2073af..6aefa433495af 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Indexer/etc/cron_groups.xml b/app/code/Magento/Indexer/etc/cron_groups.xml
index 7afabee1949c0..076e73009ec21 100644
--- a/app/code/Magento/Indexer/etc/cron_groups.xml
+++ b/app/code/Magento/Indexer/etc/cron_groups.xml
@@ -11,8 +11,8 @@
         <schedule_ahead_for>4</schedule_ahead_for>
         <schedule_lifetime>2</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>10080</history_success_lifetime>
-        <history_failure_lifetime>10080</history_failure_lifetime>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>4320</history_failure_lifetime>
         <use_separate_process>1</use_separate_process>
     </group>
 </config>
diff --git a/app/code/Magento/Indexer/etc/db_schema.xml b/app/code/Magento/Indexer/etc/db_schema.xml
new file mode 100644
index 0000000000000..d7cb006a2cf45
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/db_schema.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="indexer_state" resource="default" engine="innodb" comment="Indexer State">
+        <column xsi:type="int" name="state_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Indexer State Id"/>
+        <column xsi:type="varchar" name="indexer_id" nullable="true" length="255" comment="Indexer Id"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="16" default="invalid"
+                comment="Indexer Status"/>
+        <column xsi:type="datetime" name="updated" on_update="false" nullable="true" comment="Indexer Status"/>
+        <column xsi:type="varchar" name="hash_config" nullable="false" length="32" comment="Hash of indexer config"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="state_id"/>
+        </constraint>
+        <index referenceId="INDEXER_STATE_INDEXER_ID" indexType="btree">
+            <column name="indexer_id"/>
+        </index>
+    </table>
+    <table name="mview_state" resource="default" engine="innodb" comment="View State">
+        <column xsi:type="int" name="state_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="View State Id"/>
+        <column xsi:type="varchar" name="view_id" nullable="true" length="255" comment="View Id"/>
+        <column xsi:type="varchar" name="mode" nullable="true" length="16" default="disabled" comment="View Mode"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="16" default="idle" comment="View Status"/>
+        <column xsi:type="datetime" name="updated" on_update="false" nullable="true" comment="View updated time"/>
+        <column xsi:type="int" name="version_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="View Version Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="state_id"/>
+        </constraint>
+        <index referenceId="MVIEW_STATE_VIEW_ID" indexType="btree">
+            <column name="view_id"/>
+        </index>
+        <index referenceId="MVIEW_STATE_MODE" indexType="btree">
+            <column name="mode"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Indexer/etc/db_schema_whitelist.json b/app/code/Magento/Indexer/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8c9b55729a737
--- /dev/null
+++ b/app/code/Magento/Indexer/etc/db_schema_whitelist.json
@@ -0,0 +1,34 @@
+{
+    "indexer_state": {
+        "column": {
+            "state_id": true,
+            "indexer_id": true,
+            "status": true,
+            "updated": true,
+            "hash_config": true
+        },
+        "index": {
+            "INDEXER_STATE_INDEXER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "mview_state": {
+        "column": {
+            "state_id": true,
+            "view_id": true,
+            "mode": true,
+            "status": true,
+            "updated": true,
+            "version_id": true
+        },
+        "index": {
+            "MVIEW_STATE_VIEW_ID": true,
+            "MVIEW_STATE_MODE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
index 610f08fac3a05..c7603191e8606 100644
--- a/app/code/Magento/Indexer/etc/di.xml
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -42,7 +42,11 @@
         <plugin name="page-cache-indexer-reindex-clean-cache"
                 type="Magento\Indexer\Model\Processor\CleanCache" sortOrder="10"/>
     </type>
-
+    <type name="\Magento\Indexer\Model\ProcessManager">
+        <arguments>
+            <argument name="threadsCount" xsi:type="init_parameter">Magento\Indexer\Model\ProcessManager::THREADS_COUNT</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
@@ -52,6 +56,8 @@
                 <item name="show-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerShowModeCommand</item>
                 <item name="status" xsi:type="object">Magento\Indexer\Console\Command\IndexerStatusCommand</item>
                 <item name="reset" xsi:type="object">Magento\Indexer\Console\Command\IndexerResetStateCommand</item>
+                <item name="set-dimensions-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand</item>
+                <item name="show-dimensions-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerShowDimensionsModeCommand</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Indexer/etc/module.xml b/app/code/Magento/Indexer/etc/module.xml
index 914e2835c0a61..cd84bb9cf2157 100644
--- a/app/code/Magento/Indexer/etc/module.xml
+++ b/app/code/Magento/Indexer/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Indexer" setup_version="2.1.0">
+    <module name="Magento_Indexer" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_AdminNotification"/>
diff --git a/app/code/Magento/InstantPurchase/Controller/Button/PlaceOrder.php b/app/code/Magento/InstantPurchase/Controller/Button/PlaceOrder.php
index 56ed9ca583a2b..a7e983dda0f80 100644
--- a/app/code/Magento/InstantPurchase/Controller/Button/PlaceOrder.php
+++ b/app/code/Magento/InstantPurchase/Controller/Button/PlaceOrder.php
@@ -76,6 +76,16 @@ class PlaceOrder extends Action
      */
     private $orderRepository;
 
+    /**
+     * @param Context $context
+     * @param StoreManagerInterface $storeManager
+     * @param Session $customerSession
+     * @param FormKeyValidator $formKeyValidator
+     * @param InstantPurchaseOptionLoadingFactory $instantPurchaseOptionLoadingFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param PlaceOrderModel $placeOrder
+     * @param OrderRepositoryInterface $orderRepository
+     */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php
index 3d9c06e76ea08..7ded5373dc735 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/InstantPurchase/Model/InstantPurchaseOption.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
index a780d9716bd94..0748c5818c857 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\InstantPurchase\Model;
 
 use Magento\Customer\Model\Address;
@@ -19,22 +20,22 @@
 class InstantPurchaseOption
 {
     /**
-     * @var PaymentTokenInterface
+     * @var PaymentTokenInterface|null
      */
     private $paymentToken;
 
     /**
-     * @var AddressIn
+     * @var Address|null
      */
     private $shippingAddress;
 
     /**
-     * @var Address
+     * @var Address|null
      */
     private $billingAddress;
 
     /**
-     * @var ShippingMethodInterface
+     * @var ShippingMethodInterface|null
      */
     private $shippingMethod;
 
@@ -101,7 +102,9 @@ public function isAvailable(): bool
     public function getPaymentToken(): PaymentTokenInterface
     {
         if (!isset($this->paymentToken)) {
-            throw new LocalizedException(__('Payment method is not defined for instance purchase.'));
+            throw new LocalizedException(
+                __("A payment method isn't defined for instance purchase. Verify and try again.")
+            );
         }
         return $this->paymentToken;
     }
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php
index d1dc71b80d5d1..b203cfdad2221 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php
@@ -100,7 +100,7 @@ public function create(
     /**
      * Loads customer address model by identifier.
      *
-     * @param $addressId
+     * @param int $addressId
      * @return Address
      */
     private function getAddress($addressId): Address
diff --git a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
index 3129739ea0937..2ad56a8859cf3 100644
--- a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
+++ b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
@@ -13,7 +13,9 @@
 use Magento\InstantPurchase\Model\QuoteManagement\QuoteCreation;
 use Magento\InstantPurchase\Model\QuoteManagement\QuoteFilling;
 use Magento\InstantPurchase\Model\QuoteManagement\ShippingConfiguration;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Store\Model\Store;
+use \Throwable;
 
 /**
  * Place an order using instant purchase option.
@@ -22,6 +24,11 @@
  */
 class PlaceOrder
 {
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @var QuoteCreation
      */
@@ -49,6 +56,7 @@ class PlaceOrder
 
     /**
      * PlaceOrder constructor.
+     * @param CartRepositoryInterface $quoteRepository
      * @param QuoteCreation $quoteCreation
      * @param QuoteFilling $quoteFilling
      * @param ShippingConfiguration $shippingConfiguration
@@ -56,12 +64,14 @@ class PlaceOrder
      * @param Purchase $purchase
      */
     public function __construct(
+        CartRepositoryInterface $quoteRepository,
         QuoteCreation $quoteCreation,
         QuoteFilling $quoteFilling,
         ShippingConfiguration $shippingConfiguration,
         PaymentConfiguration $paymentConfiguration,
         Purchase $purchase
     ) {
+        $this->quoteRepository = $quoteRepository;
         $this->quoteCreation = $quoteCreation;
         $this->quoteFilling = $quoteFilling;
         $this->shippingConfiguration = $shippingConfiguration;
@@ -79,6 +89,7 @@ public function __construct(
      * @param array $productRequest
      * @return int order identifier
      * @throws LocalizedException if order can not be placed.
+     * @throws Throwable if unpredictable error occurred.
      */
     public function placeOrder(
         Store $store,
@@ -98,17 +109,28 @@ public function placeOrder(
             $product,
             $productRequest
         );
-        $quote = $this->shippingConfiguration->configureShippingMethod(
-            $quote,
-            $instantPurchaseOption->getShippingMethod()
-        );
-        $quote = $this->paymentConfiguration->configurePayment(
-            $quote,
-            $instantPurchaseOption->getPaymentToken()
-        );
-        $orderId = $this->purchase->purchase(
-            $quote
-        );
-        return $orderId;
+
+        $quote->collectTotals();
+        $this->quoteRepository->save($quote);
+        $quote = $this->quoteRepository->get($quote->getId());
+
+        try {
+            $quote = $this->shippingConfiguration->configureShippingMethod(
+                $quote,
+                $instantPurchaseOption->getShippingMethod()
+            );
+            $quote = $this->paymentConfiguration->configurePayment(
+                $quote,
+                $instantPurchaseOption->getPaymentToken()
+            );
+            $orderId = $this->purchase->purchase(
+                $quote
+            );
+            return $orderId;
+        } catch (Throwable $e) {
+            $quote->setIsActive(false);
+            $this->quoteRepository->save($quote);
+            throw $e;
+        }
     }
 }
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CarrierFinder.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CarrierFinder.php
new file mode 100644
index 0000000000000..d3e84083e5b42
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CarrierFinder.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\InstantPurchase\Model\ShippingMethodChoose;
+
+use Magento\Customer\Model\Address;
+use Magento\Framework\DataObject;
+use Magento\Shipping\Model\Config as CarriersConfig;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Collect shipping rates for customer address without packaging estimation.
+ */
+class CarrierFinder
+{
+    /**
+     * @var CarriersConfig
+     */
+    private $carriersConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * CarrierFinder constructor.
+     * @param CarriersConfig $carriersConfig
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        CarriersConfig $carriersConfig,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->carriersConfig = $carriersConfig;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Finds carriers delivering to customer address
+     *
+     * @param Address $address
+     * @return array
+     */
+    public function getCarriersForCustomerAddress(Address $address): array
+    {
+        $request = new DataObject([
+            'dest_country_id' => $address->getCountryId()
+        ]);
+
+        $carriers = [];
+        foreach ($this->carriersConfig->getActiveCarriers($this->storeManager->getStore()->getId()) as $carrier) {
+            $checked = $carrier->checkAvailableShipCountries($request);
+            if (false !== $checked && null === $checked->getErrorMessage() && !empty($checked->getAllowedMethods())) {
+                $carriers[] = $checked;
+            }
+        }
+
+        return $carriers;
+    }
+}
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CheapestMethodChooser.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CheapestMethodChooser.php
index a9abf09c8b22c..f01bde29cbc7d 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CheapestMethodChooser.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CheapestMethodChooser.php
@@ -6,7 +6,6 @@
 namespace Magento\InstantPurchase\Model\ShippingMethodChoose;
 
 use Magento\Customer\Model\Address;
-use Magento\Quote\Api\Data\ShippingMethodInterface;
 use Magento\Quote\Api\Data\ShippingMethodInterfaceFactory;
 
 /**
@@ -20,21 +19,21 @@ class CheapestMethodChooser implements ShippingMethodChooserInterface
     private $shippingMethodFactory;
 
     /**
-     * @var ShippingRateFinder
+     * @var CarrierFinder
      */
-    private $shippingRateFinder;
+    private $carrierFinder;
 
     /**
      * CheapestMethodChooser constructor.
      * @param ShippingMethodInterfaceFactory $shippingMethodFactory
-     * @param ShippingRateFinder $shippingRateFinder
+     * @param CarrierFinder $carrierFinder
      */
     public function __construct(
         ShippingMethodInterfaceFactory $shippingMethodFactory,
-        ShippingRateFinder $shippingRateFinder
+        CarrierFinder $carrierFinder
     ) {
         $this->shippingMethodFactory = $shippingMethodFactory;
-        $this->shippingRateFinder = $shippingRateFinder;
+        $this->carrierFinder = $carrierFinder;
     }
 
     /**
@@ -58,7 +57,7 @@ public function choose(Address $address)
      */
     private function areShippingMethodsAvailable(Address $address): bool
     {
-        $shippingRatesForAddress = $this->shippingRateFinder->getRatesForCustomerAddress($address);
-        return !empty($shippingRatesForAddress);
+        $carriersForAddress = $this->carrierFinder->getCarriersForCustomerAddress($address);
+        return !empty($carriersForAddress);
     }
 }
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
index b3ec44888c981..ca0e9351967ad 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
@@ -15,6 +15,9 @@ class DeferredShippingMethodChooserPool
 {
     private $choosers;
 
+    /**
+     * @param DeferredShippingMethodChooserInterface[] $choosers
+     */
     public function __construct(array $choosers)
     {
         foreach ($choosers as $chooser) {
@@ -28,11 +31,15 @@ public function __construct(array $choosers)
         $this->choosers = $choosers;
     }
 
+    /**
+     * @param string $type
+     * @return DeferredShippingMethodChooserInterface
+     */
     public function get($type) : DeferredShippingMethodChooserInterface
     {
         if (!isset($this->choosers[$type])) {
             throw new \InvalidArgumentException(sprintf(
-                'Deferred shipping method chooser is not registered.',
+                'Deferred shipping method %s is not registered.',
                 $type
             ));
         }
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingRateFinder.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingRateFinder.php
deleted file mode 100644
index 065f3fe946e71..0000000000000
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingRateFinder.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\InstantPurchase\Model\ShippingMethodChoose;
-
-use Magento\Customer\Model\Address;
-use Magento\Quote\Model\Quote\Address\RateCollectorInterfaceFactory;
-use Magento\Quote\Model\Quote\Address\RateRequest;
-use Magento\Quote\Model\Quote\Address\RateRequestFactory;
-use Magento\Store\Model\StoreManagerInterface;
-
-/**
- * Collect shipping rates for customer address without packaging estiamtion.
- */
-class ShippingRateFinder
-{
-    /**
-     * @var RateRequestFactory
-     */
-    private $rateRequestFactory;
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-    /**
-     * @var RateCollectorInterfaceFactory
-     */
-    private $rateCollectorFactory;
-
-    /**
-     * RateCheck constructor.
-     * @param RateRequestFactory $rateRequestFactory
-     * @param RateCollectorInterfaceFactory $rateCollectorFactory
-     * @param StoreManagerInterface $storeManager
-     */
-    public function __construct(
-        RateRequestFactory $rateRequestFactory,
-        RateCollectorInterfaceFactory $rateCollectorFactory,
-        StoreManagerInterface $storeManager
-    ) {
-        $this->rateRequestFactory = $rateRequestFactory;
-        $this->storeManager = $storeManager;
-        $this->rateCollectorFactory = $rateCollectorFactory;
-    }
-
-    /**
-     * Finds shipping rates for an address.
-     *
-     * @param Address $address
-     * @return array
-     */
-    public function getRatesForCustomerAddress(Address $address): array
-    {
-        /** @var $request RateRequest */
-        $request = $this->rateRequestFactory->create();
-        $request->setDestCountryId($address->getCountryId());
-        $request->setDestRegionId($address->getRegionId());
-        $request->setDestRegionCode($address->getRegionCode());
-        $request->setDestStreet($address->getStreetFull());
-        $request->setDestCity($address->getCity());
-        $request->setDestPostcode($address->getPostcode());
-        $request->setStoreId($this->storeManager->getStore()->getId());
-        $request->setWebsiteId($this->storeManager->getWebsite()->getId());
-        $request->setBaseCurrency($this->storeManager->getStore()->getBaseCurrency());
-        $request->setPackageCurrency($this->storeManager->getStore()->getCurrentCurrency());
-        // Because of wrong compare operator in \Magento\OfflineShipping\Model\Carrier\Tablerate on line: 167
-        $request->setPackageQty(-1);
-
-        $result = $this->rateCollectorFactory->create()->collectRates($request)->getResult();
-
-        $shippingRates = [];
-
-        if ($result) {
-            $shippingRates = $result->getAllRates();
-        }
-
-        return $shippingRates;
-    }
-}
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
index cdca81ed98b7a..0b698afea1de3 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationFactory.php
@@ -65,13 +65,13 @@ public function create(VaultPaymentInterface $paymentMethod, int $storeId): Inte
     /**
      * Reads value from config.
      *
-     * @param $config
+     * @param array $config
      * @param string $field
      * @param string $default
      * @return string
      */
     private function extractFromConfig($config, string $field, string $default): string
     {
-        return isset($config[$field]) ? $config[$field] : $default;
+        return $config[$field] ?? $default;
     }
 }
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php
index 9c93febe0db36..3ad2e000e97d3 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php
@@ -146,7 +146,7 @@ private function findIntegrations(int $storeId): array
      *    </instant_purchase>
      *
      * @param VaultPaymentInterface $paymentMethod
-     * @param $storeId
+     * @param int|string|null|\Magento\Store\Model\Store $storeId
      * @return bool
      */
     private function isIntegrationAvailable(VaultPaymentInterface $paymentMethod, $storeId): bool
diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/README.md b/app/code/Magento/InstantPurchase/Test/Mftf/README.md
new file mode 100644
index 0000000000000..b6fd2db87500b
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Instant Purchase Functional Tests
+
+The Functional Test Module for **Magento Instant Purchase** module.
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 3132d0529caee..2b39920fefc6e 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -2,20 +2,20 @@
   "name": "magento/module-instant-purchase",
   "description": "N/A",
   "type": "magento2-module",
-  "version": "100.3.0-dev",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
   ],
   "require": {
-    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-    "magento/module-store": "100.3.*",
-    "magento/module-catalog": "101.2.*",
-    "magento/module-customer": "100.3.*",
-    "magento/module-sales": "100.3.*",
-    "magento/module-quote": "100.3.*",
-    "magento/module-vault": "100.3.*",
-    "magento/framework": "100.3.*"
+    "php": "~7.1.3||~7.2.0",
+    "magento/module-store": "*",
+    "magento/module-catalog": "*",
+    "magento/module-customer": "*",
+    "magento/module-sales": "*",
+    "magento/module-shipping": "*",
+    "magento/module-quote": "*",
+    "magento/module-vault": "*",
+    "magento/framework": "*"
   },
   "autoload": {
     "files": [
@@ -25,4 +25,4 @@
       "Magento\\InstantPurchase\\": ""
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
index 4b7a6029507b4..76785c023ed0b 100644
--- a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
+++ b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="sales">
             <group id="instant_purchase" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Instant Purchase</label>
-                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="active" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Payment method with vault and instant purchase support should be enabled.</comment>
diff --git a/app/code/Magento/InstantPurchase/etc/module.xml b/app/code/Magento/InstantPurchase/etc/module.xml
index 462786b2d6ae6..ec647edf6f220 100644
--- a/app/code/Magento/InstantPurchase/etc/module.xml
+++ b/app/code/Magento/InstantPurchase/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_InstantPurchase" setup_version="1.0.0"/>
+    <module name="Magento_InstantPurchase" />
 </config>
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js b/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js
index 5e09b27b5fa88..533cd8ea90e3e 100644
--- a/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js
+++ b/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js
@@ -1,110 +1,115 @@
-/*jshint browser:true*/
-/*global define*/
-define(
-    [
-        'uiComponent',
-        'ko',
-        'Magento_Ui/js/modal/confirm',
-        'jquery',
-        'Magento_Customer/js/customer-data',
-        'mage/url',
-        'mage/template',
-        'jquery/ui',
-        'mage/translate'
-    ], function (
-        Component,
-        ko,
-        confirm,
-        $,
-        customerData,
-        urlBuilder,
-        mageTemplate
-    ) {
-        'use strict';
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'ko',
+    'jquery',
+    'underscore',
+    'uiComponent',
+    'Magento_Ui/js/modal/confirm',
+    'Magento_Customer/js/customer-data',
+    'mage/url',
+    'mage/template',
+    'mage/translate',
+    'text!Magento_InstantPurchase/template/confirmation.html',
+    'mage/validation'
+], function (ko, $, _, Component, confirm, customerData, urlBuilder, mageTemplate, $t, confirmationTemplate) {
+    'use strict';
 
-        return Component.extend({
-            showButton: ko.observable(false),
-            paymentToken: ko.observable(null),
-            shippingAddress: ko.observable(null),
-            billingAddress: ko.observable(null),
-            shippingMethod: ko.observable(null),
-            defaults: {
-                template: 'Magento_InstantPurchase/instant-purchase',
-                buttonText: $.mage.__('Instant Purchase'),
-                purchaseUrl: urlBuilder.build('instantpurchase/button/placeOrder')
-            },
-            options: {
-                message: $.mage.__('Are you sure you want to place order and pay?'),
-                formSelector: '#product_addtocart_form',
-                confirmTemplate: '<p class="message"><%- data.message %></p>' +
-                                 '<strong>' + $.mage.__('Shipping Address') + ':</strong>' +
-                                 '<p><%- data.shippingAddress().summary %></p>' +
-                                 '<strong>' + $.mage.__('Billing Address') + ':</strong>' +
-                                 '<p><%- data.billingAddress().summary %></p>' +
-                                 '<strong>' + $.mage.__('Payment Method') + ':</strong>\n' +
-                                 '<p><%- data.paymentToken().summary %></p>' +
-                                 '<strong>' + $.mage.__('Shipping Method') + ':</strong>\n' +
-                                 '<p><%- data.shippingMethod().summary %></p>'
-            },
+    return Component.extend({
+        defaults: {
+            template: 'Magento_InstantPurchase/instant-purchase',
+            buttonText: $t('Instant Purchase'),
+            purchaseUrl: urlBuilder.build('instantpurchase/button/placeOrder'),
+            showButton: false,
+            paymentToken: null,
+            shippingAddress: null,
+            billingAddress: null,
+            shippingMethod: null,
+            productFormSelector: '#product_addtocart_form',
+            confirmationTitle: $t('Instant Purchase Confirmation'),
+            confirmationData: {
+                message: $t('Are you sure you want to place order and pay?'),
+                shippingAddressTitle: $t('Shipping Address'),
+                billingAddressTitle: $t('Billing Address'),
+                paymentMethodTitle: $t('Payment Method'),
+                shippingMethodTitle: $t('Shipping Method')
+            }
+        },
 
-            /** @inheritdoc */
-            initialize: function () {
-                var self = this,
-                    data = customerData.get('instant-purchase')();
+        /** @inheritdoc */
+        initialize: function () {
+            var instantPurchase = customerData.get('instant-purchase');
 
-                this._super();
-                self.showButton(data.available);
-                self.paymentToken(data.paymentToken);
-                self.shippingAddress(data.shippingAddress);
-                self.billingAddress(data.billingAddress);
-                self.shippingMethod(data.shippingMethod);
-            },
+            this._super();
 
-            /**
-             * Confirmation method
-             */
-            instantPurchase: function () {
-                var self = this,
-                    form = $(self.options.formSelector),
-                    confirmTemplate = mageTemplate(this.options.confirmTemplate);
+            this.setPurchaseData(instantPurchase());
+            instantPurchase.subscribe(this.setPurchaseData, this);
+        },
 
-                if (!(form.validation() && form.validation('isValid'))) {
-                    return;
-                }
+        /** @inheritdoc */
+        initObservable: function () {
+            this._super()
+                .observe('showButton paymentToken shippingAddress billingAddress shippingMethod');
 
-                confirm({
-                    title: $.mage.__('Instant Purchase Confirmation'),
-                    content: confirmTemplate(
-                        {
-                            data: {
-                                message: self.options.message,
-                                paymentToken: self.paymentToken,
-                                shippingAddress: self.shippingAddress,
-                                billingAddress: self.billingAddress,
-                                shippingMethod: self.shippingMethod
-                            }
-                        }
-                    ),
-                    actions: {
-                        /** @inheritdoc */
-                        confirm: function () {
-                            $.ajax({
-                                url: self.purchaseUrl,
-                                data: form.serialize(),
-                                type: 'post',
-                                dataType: 'json',
+            return this;
+        },
 
-                                /** Show loader before send */
-                                beforeSend: function () {
-                                    $('body').trigger('processStart');
-                                }
-                            }).always(function () {
-                                $('body').trigger('processStop');
-                            });
-                        }
-                    }
+        /**
+         * Set data from customerData.
+         *
+         * @param {Object} data
+         */
+        setPurchaseData: function (data) {
+            this.showButton(data.available);
+            this.paymentToken(data.paymentToken);
+            this.shippingAddress(data.shippingAddress);
+            this.billingAddress(data.billingAddress);
+            this.shippingMethod(data.shippingMethod);
+        },
+
+        /**
+         * Confirmation method
+         */
+        instantPurchase: function () {
+            var form = $(this.productFormSelector),
+                confirmTemplate = mageTemplate(confirmationTemplate),
+                confirmData = _.extend({}, this.confirmationData, {
+                    paymentToken: this.paymentToken().summary,
+                    shippingAddress: this.shippingAddress().summary,
+                    billingAddress: this.billingAddress().summary,
+                    shippingMethod: this.shippingMethod().summary
                 });
+
+            if (!(form.validation() && form.validation('isValid'))) {
+                return;
             }
-        });
-    }
-);
+
+            confirm({
+                title: this.confirmationTitle,
+                content: confirmTemplate({
+                    data: confirmData
+                }),
+                actions: {
+                    /** @inheritdoc */
+                    confirm: function () {
+                        $.ajax({
+                            url: this.purchaseUrl,
+                            data: form.serialize(),
+                            type: 'post',
+                            dataType: 'json',
+
+                            /** Show loader before send */
+                            beforeSend: function () {
+                                $('body').trigger('processStart');
+                            }
+                        }).always(function () {
+                            $('body').trigger('processStop');
+                        });
+                    }.bind(this)
+                }
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html b/app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html
new file mode 100644
index 0000000000000..883cf1c2fd8f9
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<p class="message"><%- data.message %></p>
+<strong><%- data.shippingAddressTitle %>:</strong>
+<p><%- data.shippingAddress %></p>
+<strong><%- data.billingAddressTitle %>:</strong>
+<p><%- data.billingAddress %></p>
+<strong><%- data.paymentMethodTitle %>:</strong>
+<p><%- data.paymentToken %></p>
+<strong><%- data.shippingMethodTitle %>:</strong>
+<p><%- data.shippingMethod %></p>
\ No newline at end of file
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html b/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
index 058b09e16a687..0373b25c9c523 100644
--- a/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
+++ b/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
@@ -1,29 +1,34 @@
-<!-- ko if: showButton -->
-<button type="button"
-        class="action primary instant-purchase"
-        data-bind="click: instantPurchase, attr:{title: buttonText}">
-    <span data-bind="text: buttonText"></span>
-</button>
-<!-- ko if: paymentToken -->
-<input type="hidden"
-       name="instant_purchase_payment_token"
-       data-bind="value: paymentToken().publicHash">
-<!-- /ko -->
-<!-- ko if: shippingAddress -->
-<input type="hidden"
-       name="instant_purchase_shipping_address"
-       data-bind="value: shippingAddress().id">
-<!-- /ko -->
-<!-- ko if: billingAddress -->
-<input type="hidden"
-       name="instant_purchase_billing_address"
-       data-bind="value: billingAddress().id">
-<!-- ko if: shippingMethod -->
-<input type="hidden"
-       name="instant_purchase_carrier"
-       data-bind="value: shippingMethod().carrier">
-<input type="hidden"
-       name="instant_purchase_shipping"
-       data-bind="value: shippingMethod().method">
-<!-- /ko -->
-<!-- /ko -->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<if args="showButton()">
+    <button type="button"
+            class="action primary instant-purchase"
+            click="instantPurchase"
+            attr="title: $t(buttonText)">
+        <span translate="buttonText" />
+    </button>
+    <input if="paymentToken()"
+           type="hidden"
+           name="instant_purchase_payment_token"
+           ko-value="paymentToken().publicHash" />
+    <input if="shippingAddress()"
+           type="hidden"
+           name="instant_purchase_shipping_address"
+           ko-value="shippingAddress().id" />
+    <input if="billingAddress()"
+           type="hidden"
+           name="instant_purchase_billing_address"
+           ko-value="billingAddress().id" />
+    <if args="shippingMethod()">
+        <input type="hidden"
+               name="instant_purchase_carrier"
+               ko-value="shippingMethod().carrier" />
+        <input type="hidden"
+               name="instant_purchase_shipping"
+               ko-value="shippingMethod().method" />
+    </if>
+</if>
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
index cc08796d98e28..d8684e635b943 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
@@ -78,7 +78,7 @@ public function getTabTitle()
     }
 
     /**
-     * Returns status flag about this tab can be showen or not
+     * Returns status flag about this tab can be shown or not
      *
      * @return true
      */
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
index 36073af56327a..4ce462bb44c89 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Controller\ResultFactory;
 
-class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
+class Delete extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface
 {
     /**
      * Delete the integration.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
index 97cd7b46e086f..599b6017059e1 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
 
-class Edit extends \Magento\Integration\Controller\Adminhtml\Integration
+class Edit extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
 {
     /**
      * Edit integration action.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
index bd10873a59f3b..f3ad4306db5a5 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
-class Grid extends \Magento\Integration\Controller\Adminhtml\Integration
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Integration\Controller\Adminhtml\Integration as IntegrationAction;
+
+class Grid extends IntegrationAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * AJAX integrations grid.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
index 2caf9054ce356..131e1e149473f 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
-class Index extends \Magento\Integration\Controller\Adminhtml\Integration
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
 {
     /**
      * Integrations grid.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
index d53564630ae6a..0e171fb6f3661 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/Controller/Adminhtml/Integration/NewAction.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
index e05d559aa1cd9..7354b22ccf469 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
-class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
 {
     /**
      * New integration action.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
index 8c2e10ebf1f32..8b2a94da01d70 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Exception\IntegrationException;
 
-class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration
+class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
 {
     /**
      * Show permissions popup.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index dfddd8b954bd3..8bcbb45653494 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\LocalizedException;
@@ -17,7 +18,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Integration\Controller\Adminhtml\Integration
+class Save extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface
 {
     /**
      * @var SecurityCookie
@@ -56,7 +57,7 @@ public function execute()
                     return;
                 }
                 if ($integrationData[Info::DATA_SETUP_TYPE] == IntegrationModel::TYPE_CONFIG) {
-                    throw new LocalizedException(__('Cannot edit integrations created via config file.'));
+                    throw new LocalizedException(__("The integrations created in the config file can't be edited."));
                 }
             }
             $this->validateUser();
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
index dcea6da321281..4c99dafb1d997 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Integration\Model\Integration as IntegrationModel;
 
-class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration
+class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface
 {
     /**
      * Set success message based on Integration activation or re-authorization.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
index e295198766501..a49561dd95ade 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
 use Magento\Integration\Model\Integration as IntegrationModel;
@@ -57,7 +58,10 @@ public function execute()
             $consumer = $this->_oauthService->loadConsumer($integration->getConsumerId());
             if (!$consumer->getId()) {
                 throw new \Magento\Framework\Oauth\Exception(
-                    __('A consumer with ID %1 does not exist', $integration->getConsumerId())
+                    __(
+                        'A consumer with "%1" ID doesn\'t exist. Verify the ID and try again.',
+                        $integration->getConsumerId()
+                    )
                 );
             }
             /** Initialize response body */
diff --git a/app/code/Magento/Integration/Controller/Token/Access.php b/app/code/Magento/Integration/Controller/Token/Access.php
index 88d5029a724c7..5b75643f51b50 100644
--- a/app/code/Magento/Integration/Controller/Token/Access.php
+++ b/app/code/Magento/Integration/Controller/Token/Access.php
@@ -6,11 +6,15 @@
  */
 namespace Magento\Integration\Controller\Token;
 
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Integration\Model\Integration as IntegrationModel;
 use Magento\Integration\Api\IntegrationServiceInterface as IntegrationService;
 use Magento\Integration\Api\OauthServiceInterface as IntegrationOauthService;
+use Magento\Framework\App\Action\Action;
 
-class Access extends \Magento\Framework\App\Action\Action
+class Access extends Action implements CsrfAwareActionInterface
 {
     /**
      * @var \Magento\Framework\Oauth\OauthInterface
@@ -53,6 +57,23 @@ public function __construct(
         $this->helper = $helper;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * Initiate AccessToken request operation
      *
diff --git a/app/code/Magento/Integration/Controller/Token/Request.php b/app/code/Magento/Integration/Controller/Token/Request.php
index 104a36e8ae8fe..04f368fc9f9fd 100644
--- a/app/code/Magento/Integration/Controller/Token/Request.php
+++ b/app/code/Magento/Integration/Controller/Token/Request.php
@@ -6,7 +6,12 @@
  */
 namespace Magento\Integration\Controller\Token;
 
-class Request extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+class Request extends Action implements CsrfAwareActionInterface
 {
     /**
      * @var  \Magento\Framework\Oauth\OauthInterface
@@ -33,6 +38,23 @@ public function __construct(
         $this->helper = $helper;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      *  Initiate RequestToken request operation
      *
diff --git a/app/code/Magento/Integration/Model/AdminTokenService.php b/app/code/Magento/Integration/Model/AdminTokenService.php
index 080181b5d8d61..5a030325e9fbd 100644
--- a/app/code/Magento/Integration/Model/AdminTokenService.php
+++ b/app/code/Magento/Integration/Model/AdminTokenService.php
@@ -87,7 +87,10 @@ public function createAdminAccessToken($username, $password)
              * Need to make sure that this is refactored once exception handling is updated in Auth Model.
              */
             throw new AuthenticationException(
-                __('You did not sign in correctly or your account is temporarily disabled.')
+                __(
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                )
             );
         }
         $this->getRequestThrottler()->resetAuthenticationFailuresCount($username, RequestThrottler::USER_TYPE_ADMIN);
@@ -114,7 +117,7 @@ public function revokeAdminAccessToken($adminId)
                 $token->delete();
             }
         } catch (\Exception $e) {
-            throw new LocalizedException(__('The tokens could not be revoked.'));
+            throw new LocalizedException(__("The tokens couldn't be revoked."));
         }
         return true;
     }
diff --git a/app/code/Magento/Integration/Model/AuthorizationService.php b/app/code/Magento/Integration/Model/AuthorizationService.php
index 1375116bd96d4..b51f1a773b8a7 100644
--- a/app/code/Magento/Integration/Model/AuthorizationService.php
+++ b/app/code/Magento/Integration/Model/AuthorizationService.php
@@ -104,7 +104,7 @@ public function grantPermissions($integrationId, $resources)
         } catch (\Exception $e) {
             $this->_logger->critical($e);
             throw new LocalizedException(
-                __('Sorry, something went wrong granting permissions. You can find out more in the exceptions log.')
+                __('An error occurred during the attempt to grant permissions. For details, see the exceptions log.')
             );
         }
     }
diff --git a/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php b/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
index 674a97a68d065..c10759d602748 100644
--- a/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
+++ b/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
@@ -36,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convert($source)
     {
@@ -80,9 +80,16 @@ public function convert($source)
                     $result[$integrationName][self::API_RESOURCES][] = $name;
                 }
             }
+
+            // Add root resource if any child has been added
+            if (!empty($result[$integrationName][self::API_RESOURCES])) {
+                array_unshift($result[$integrationName][self::API_RESOURCES], $allResources[1]['id']);
+            }
+
             // Remove any duplicates added parents
-            $result[$integrationName][self::API_RESOURCES] =
-                array_values(array_unique($result[$integrationName][self::API_RESOURCES]));
+            $result[$integrationName][self::API_RESOURCES] = array_values(
+                array_unique($result[$integrationName][self::API_RESOURCES])
+            );
         }
         return $result;
     }
diff --git a/app/code/Magento/Integration/Model/CredentialsValidator.php b/app/code/Magento/Integration/Model/CredentialsValidator.php
index d736a1f490063..f058d5ac77bd8 100644
--- a/app/code/Magento/Integration/Model/CredentialsValidator.php
+++ b/app/code/Magento/Integration/Model/CredentialsValidator.php
@@ -25,10 +25,10 @@ public function validate($username, $password)
     {
         $exception = new InputException();
         if (!is_string($username) || strlen($username) == 0) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'username']));
+            $exception->addError(__('"%fieldName" is required. Enter and try again.', ['fieldName' => 'username']));
         }
         if (!is_string($password) || strlen($password) == 0) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'password']));
+            $exception->addError(__('"%fieldName" is required. Enter and try again.', ['fieldName' => 'password']));
         }
         if ($exception->wasErrorAdded()) {
             throw $exception;
diff --git a/app/code/Magento/Integration/Model/CustomerTokenService.php b/app/code/Magento/Integration/Model/CustomerTokenService.php
index 947ca6f9f8821..7c2c444a734eb 100644
--- a/app/code/Magento/Integration/Model/CustomerTokenService.php
+++ b/app/code/Magento/Integration/Model/CustomerTokenService.php
@@ -14,7 +14,11 @@
 use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory as TokenCollectionFactory;
 use Magento\Integration\Model\Oauth\Token\RequestThrottler;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Event\ManagerInterface;
 
+/**
+ * @inheritdoc
+ */
 class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServiceInterface
 {
     /**
@@ -24,6 +28,11 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      */
     private $tokenModelFactory;
 
+    /**
+     * @var Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * Customer Account Service
      *
@@ -55,21 +64,25 @@ class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServ
      * @param AccountManagementInterface $accountManagement
      * @param TokenCollectionFactory $tokenModelCollectionFactory
      * @param \Magento\Integration\Model\CredentialsValidator $validatorHelper
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
      */
     public function __construct(
         TokenModelFactory $tokenModelFactory,
         AccountManagementInterface $accountManagement,
         TokenCollectionFactory $tokenModelCollectionFactory,
-        CredentialsValidator $validatorHelper
+        CredentialsValidator $validatorHelper,
+        ManagerInterface $eventManager = null
     ) {
         $this->tokenModelFactory = $tokenModelFactory;
         $this->accountManagement = $accountManagement;
         $this->tokenModelCollectionFactory = $tokenModelCollectionFactory;
         $this->validatorHelper = $validatorHelper;
+        $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ManagerInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createCustomerAccessToken($username, $password)
     {
@@ -80,9 +93,13 @@ public function createCustomerAccessToken($username, $password)
         } catch (\Exception $e) {
             $this->getRequestThrottler()->logAuthenticationFailure($username, RequestThrottler::USER_TYPE_CUSTOMER);
             throw new AuthenticationException(
-                __('You did not sign in correctly or your account is temporarily disabled.')
+                __(
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                )
             );
         }
+        $this->eventManager->dispatch('customer_login', ['customer' => $customerDataObject]);
         $this->getRequestThrottler()->resetAuthenticationFailuresCount($username, RequestThrottler::USER_TYPE_CUSTOMER);
         return $this->tokenModelFactory->create()->createCustomerToken($customerDataObject->getId())->getToken();
     }
@@ -107,7 +124,7 @@ public function revokeCustomerAccessToken($customerId)
                 $token->delete();
             }
         } catch (\Exception $e) {
-            throw new LocalizedException(__('The tokens could not be revoked.'));
+            throw new LocalizedException(__("The tokens couldn't be revoked."));
         }
         return true;
     }
diff --git a/app/code/Magento/Integration/Model/IntegrationService.php b/app/code/Magento/Integration/Model/IntegrationService.php
index 6acb692273957..9818d76c94456 100644
--- a/app/code/Magento/Integration/Model/IntegrationService.php
+++ b/app/code/Magento/Integration/Model/IntegrationService.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Model;
 
 use Magento\Integration\Model\Integration as IntegrationModel;
@@ -129,7 +130,7 @@ private function _checkIntegrationByName($name)
     {
         $integration = $this->_integrationFactory->create()->load($name, 'name');
         if ($integration->getId()) {
-            throw new IntegrationException(__('Integration with name \'%1\' exists.', $name));
+            throw new IntegrationException(__('The integration with name "%1" exists.', $name));
         }
     }
 
@@ -144,7 +145,7 @@ protected function _loadIntegrationById($integrationId)
     {
         $integration = $this->_integrationFactory->create()->load($integrationId);
         if (!$integration->getId()) {
-            throw new IntegrationException(__('Integration with ID \'%1\' does not exist.', $integrationId));
+            throw new IntegrationException(__('The integration with ID "%1" doesn\'t exist.', $integrationId));
         }
         return $integration;
     }
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
index f896f92d5768b..e697d2594bded 100644
--- a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
+++ b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
@@ -39,7 +39,7 @@ class KeyLength extends \Zend_Validate_StringLength
      * Default encoding is set to utf-8 if none provided
      * New option name added to allow adding key name in validation error messages
      *
-     * @param  integer|array|\Zend_Config $options
+     * @inheritdoc
      */
     public function __construct($options = [])
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
index c43118b4f76d6..cc8c40be4bc63 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
@@ -258,7 +258,7 @@ protected function _getToken($token)
     {
         if (!$this->validateOauthToken($token)) {
             throw new \Magento\Framework\Oauth\Exception(
-                __('Token is not the correct length')
+                __('The token length is invalid. Check the length and try again.')
             );
         }
 
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php b/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
index 9af6510d0930e..9ec907a657c92 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Model\Oauth\Token;
 
 use Magento\Integration\Model\Oauth\Token\RequestLog\ReaderInterface as RequestLogReader;
@@ -65,7 +66,10 @@ public function throttle($userName, $userType)
         $count = $this->requestLogReader->getFailuresCount($userName, $userType);
         if ($count >= $this->requestLogConfig->getMaxFailuresCount()) {
             throw new AuthenticationException(
-                __('You did not sign in correctly or your account is temporarily disabled.')
+                __(
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                )
             );
         }
     }
diff --git a/app/code/Magento/Integration/Model/OauthService.php b/app/code/Magento/Integration/Model/OauthService.php
index 859f3815d0702..03aaf27319c0c 100644
--- a/app/code/Magento/Integration/Model/OauthService.php
+++ b/app/code/Magento/Integration/Model/OauthService.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Model;
 
 use Magento\Framework\Oauth\Helper\Oauth as OauthHelper;
@@ -129,7 +130,9 @@ public function createConsumer($consumerData)
             throw $exception;
         } catch (\Exception $exception) {
             throw new \Magento\Framework\Oauth\Exception(
-                __('Unexpected error. Unable to create oAuth consumer account.')
+                __(
+                    "The oAuth consumer account couldn't be created due to an unexpected error. Please try again later."
+                )
             );
         }
     }
@@ -186,7 +189,7 @@ public function loadConsumer($consumerId)
             throw $exception;
         } catch (\Exception $exception) {
             throw new \Magento\Framework\Oauth\Exception(
-                __('Unexpected error. Unable to load oAuth consumer account.')
+                __("The oAuth consumer account couldn't be loaded due to an unexpected error. Please try again later.")
             );
         }
     }
@@ -202,7 +205,7 @@ public function loadConsumerByKey($key)
             throw $exception;
         } catch (\Exception $exception) {
             throw new \Magento\Framework\Oauth\Exception(
-                __('Unexpected error. Unable to load oAuth consumer account.')
+                __("The oAuth consumer account couldn't be loaded due to an unexpected error. Please try again later.")
             );
         }
     }
@@ -218,7 +221,7 @@ public function postToConsumer($consumerId, $endpointUrl)
             $consumer->save();
             if (!$consumer->getId()) {
                 throw new \Magento\Framework\Oauth\Exception(
-                    __('A consumer with ID %1 does not exist', $consumerId)
+                    __('A consumer with "%1" ID doesn\'t exist. Verify the ID and try again.', $consumerId)
                 );
             }
             $consumerData = $consumer->getData();
@@ -245,7 +248,7 @@ public function postToConsumer($consumerId, $endpointUrl)
         } catch (\Exception $exception) {
             $this->_logger->critical($exception);
             throw new \Magento\Framework\Oauth\Exception(
-                __('Unable to post data to consumer due to an unexpected error')
+                __('The attempt to post data to consumer failed due to an unexpected error. Please try again later.')
             );
         }
     }
@@ -287,7 +290,9 @@ protected function _loadConsumerById($consumerId)
     {
         $consumer = $this->_consumerFactory->create()->load($consumerId);
         if (!$consumer->getId()) {
-            throw new IntegrationException(__('Consumer with ID \'%1\' does not exist.', $consumerId));
+            throw new IntegrationException(
+                __('A consumer with ID "%1" doesn\'t exist. Verify the ID and try again.', $consumerId)
+            );
         }
         return $consumer;
     }
diff --git a/app/code/Magento/Integration/Plugin/Model/AdminUser.php b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
index df3766250caa7..7b2fa1981bce3 100644
--- a/app/code/Magento/Integration/Plugin/Model/AdminUser.php
+++ b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Plugin\Model;
 
 use Magento\Integration\Model\AdminTokenService;
@@ -31,14 +32,15 @@ public function __construct(
      *
      * @param \Magento\User\Model\User $subject
      * @param \Magento\Framework\DataObject $object
-     * @return $this
+     * @return \Magento\User\Model\User
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function afterSave(
         \Magento\User\Model\User $subject,
         \Magento\Framework\DataObject $object
-    ) {
+    ): \Magento\User\Model\User {
         $isActive = $object->getIsActive();
-        if (isset($isActive) && $isActive == 0) {
+        if ($isActive !== null && $isActive == 0) {
             $this->adminTokenService->revokeAdminAccessToken($object->getId());
         }
         return $subject;
diff --git a/app/code/Magento/Integration/Setup/InstallSchema.php b/app/code/Magento/Integration/Setup/InstallSchema.php
deleted file mode 100644
index 11ec675782174..0000000000000
--- a/app/code/Magento/Integration/Setup/InstallSchema.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Integration\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'oauth_consumer'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('oauth_consumer')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Name of consumer'
-        )->addColumn(
-            'key',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Key code'
-        )->addColumn(
-            'secret',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Secret code'
-        )->addColumn(
-            'callback_url',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            512,
-            [],
-            'Callback URL'
-        )->addColumn(
-            'rejected_callback_url',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            512,
-            ['nullable' => false],
-            'Rejected callback URL'
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('oauth_consumer'),
-                ['key'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['key'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('oauth_consumer'),
-                ['secret'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['secret'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('oauth_consumer', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('oauth_consumer', ['updated_at']),
-            ['updated_at']
-        )->setComment(
-            'OAuth Consumers'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $adminTable = $installer->getTable('admin_user');
-        $customerTable = $installer->getTable('customer_entity');
-
-        /**
-         * Create table 'oauth_token'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('oauth_token')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity ID'
-        )->addColumn(
-            'consumer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Oauth Consumer ID'
-        )->addColumn(
-            'admin_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Admin user ID'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Customer user ID'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            16,
-            ['nullable' => false],
-            'Token Type'
-        )->addColumn(
-            'token',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Token'
-        )->addColumn(
-            'secret',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Token Secret'
-        )->addColumn(
-            'verifier',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true],
-            'Token Verifier'
-        )->addColumn(
-            'callback_url',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            512,
-            ['nullable' => false],
-            'Token Callback URL'
-        )->addColumn(
-            'revoked',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => 0],
-            'Is Token revoked'
-        )->addColumn(
-            'authorized',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => 0],
-            'Is Token authorized'
-        )->addColumn(
-            'user_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'User type'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Token creation timestamp'
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('oauth_token'),
-                ['consumer_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-            ),
-            ['consumer_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('oauth_token'),
-                ['token'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['token'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('oauth_token', 'admin_id', 'admin_user', 'user_id'),
-            'admin_id',
-            $adminTable,
-            'user_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('oauth_token', 'consumer_id', 'oauth_consumer', 'entity_id'),
-            'consumer_id',
-            $installer->getTable('oauth_consumer'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('oauth_token', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $customerTable,
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'OAuth Tokens'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'oauth_nonce'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('oauth_nonce')
-        )->addColumn(
-            'nonce',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Nonce String'
-        )->addColumn(
-            'timestamp',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            10,
-            ['unsigned' => true, 'nullable' => false],
-            'Nonce Timestamp'
-        )->addColumn(
-            'consumer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Consumer ID'
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('oauth_nonce'),
-                ['nonce', 'consumer_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['nonce', 'consumer_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('oauth_nonce', 'consumer_id', 'oauth_consumer', 'entity_id'),
-            'consumer_id',
-            $installer->getTable('oauth_consumer'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'OAuth Nonce'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('integration')
-        )->addColumn(
-            'integration_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Integration ID'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Integration name is displayed in the admin interface'
-        )->addColumn(
-            'email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Email address of the contact person'
-        )->addColumn(
-            'endpoint',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Endpoint for posting consumer credentials'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Integration status'
-        )->addColumn(
-            'consumer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Oauth consumer'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Creation Time'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Update Time'
-        )->addColumn(
-            'setup_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => 0],
-            'Integration type - manual or config file'
-        )->addColumn(
-            'identity_link_url',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Identity linking Url'
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('integration'),
-                ['name'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['name'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName(
-                $installer->getTable('integration'),
-                ['consumer_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['consumer_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('integration', 'consumer_id', $installer->getTable('oauth_consumer'), 'entity_id'),
-            'consumer_id',
-            $installer->getTable('oauth_consumer'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php b/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php
new file mode 100644
index 0000000000000..c6d8d58d3e65c
--- /dev/null
+++ b/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Integration\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class RemoveInactiveTokens
+ * @package Magento\Integration\Setup\Patch
+ */
+class RemoveInactiveTokens implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        $this->removeRevokedTokens();
+        $this->removeTokensFromInactiveAdmins();
+        $this->removeTokensFromInactiveCustomers();
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.2.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Remove revoked tokens.
+     *
+     * @return void
+     */
+    private function removeRevokedTokens()
+    {
+        $oauthTokenTable = $this->moduleDataSetup->getTable('oauth_token');
+
+        $where = ['revoked = ?' => 1];
+        $this->moduleDataSetup->getConnection()->delete($oauthTokenTable, $where);
+    }
+
+    /**
+     * Remove inactive admin users tokens
+     *
+     * @return void
+     */
+    private function removeTokensFromInactiveAdmins()
+    {
+        $oauthTokenTable = $this->moduleDataSetup->getTable('oauth_token');
+        $adminUserTable = $this->moduleDataSetup->getTable('admin_user');
+
+        $select = $this->moduleDataSetup->getConnection()->select()->from(
+            $adminUserTable,
+            ['user_id', 'is_active']
+        );
+
+        $admins = $this->moduleDataSetup->getConnection()->fetchAll($select);
+        foreach ($admins as $admin) {
+            if ($admin['is_active'] == 0) {
+                $where = ['admin_id = ?' => (int)$admin['user_id']];
+                $this->moduleDataSetup->getConnection()->delete($oauthTokenTable, $where);
+            }
+        }
+    }
+
+    /**
+     * Remove tokens for inactive customers
+     *
+     * @return void
+     */
+    private function removeTokensFromInactiveCustomers()
+    {
+        $oauthTokenTable = $this->moduleDataSetup->getTable('oauth_token');
+        $adminUserTable = $this->moduleDataSetup->getTable('customer_entity');
+
+        $select = $this->moduleDataSetup->getConnection()->select()->from(
+            $adminUserTable,
+            ['entity_id', 'is_active']
+        );
+
+        $admins = $this->moduleDataSetup->getConnection()->fetchAll($select);
+        foreach ($admins as $admin) {
+            if ($admin['is_active'] == 0) {
+                $where = ['customer_id = ?' => (int)$admin['entity_id']];
+                $this->moduleDataSetup->getConnection()->delete($oauthTokenTable, $where);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Integration/Setup/UpgradeData.php b/app/code/Magento/Integration/Setup/UpgradeData.php
deleted file mode 100644
index b376d6a2b8b1e..0000000000000
--- a/app/code/Magento/Integration/Setup/UpgradeData.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Integration\Setup;
-
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * Upgrade data script for Integration module
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.2.0', '<')) {
-            $this->removeRevokedTokens($setup);
-            $this->removeTokensFromInactiveAdmins($setup);
-            $this->removeTokensFromInactiveCustomers($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Remove any revoked tokens from oauth_token table
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function removeRevokedTokens($setup)
-    {
-        $oauthTokenTable = $setup->getTable('oauth_token');
-
-        $where = ['revoked = ?' => 1];
-        $setup->getConnection()->delete($oauthTokenTable, $where);
-    }
-
-    /**
-     * Remove any tokens from oauth_token table where admin is inactive
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function removeTokensFromInactiveAdmins($setup)
-    {
-        $oauthTokenTable = $setup->getTable('oauth_token');
-        $adminUserTable = $setup->getTable('admin_user');
-
-        $select = $setup->getConnection()->select()->from(
-            $adminUserTable,
-            ['user_id', 'is_active']
-        );
-
-        $admins = $setup->getConnection()->fetchAll($select);
-        foreach ($admins as $admin) {
-            if ($admin['is_active'] == 0) {
-                $where = ['admin_id = ?' => (int)$admin['user_id']];
-                $setup->getConnection()->delete($oauthTokenTable, $where);
-            }
-        }
-    }
-
-    /**
-     * Remove any tokens from oauth_token table where customer is inactive
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function removeTokensFromInactiveCustomers($setup)
-    {
-        $oauthTokenTable = $setup->getTable('oauth_token');
-        $adminUserTable = $setup->getTable('customer_entity');
-
-        $select = $setup->getConnection()->select()->from(
-            $adminUserTable,
-            ['entity_id', 'is_active']
-        );
-
-        $admins = $setup->getConnection()->fetchAll($select);
-        foreach ($admins as $admin) {
-            if ($admin['is_active'] == 0) {
-                $where = ['customer_id = ?' => (int)$admin['entity_id']];
-                $setup->getConnection()->delete($oauthTokenTable, $where);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Integration/Setup/UpgradeSchema.php b/app/code/Magento/Integration/Setup/UpgradeSchema.php
deleted file mode 100644
index 6173a359329b0..0000000000000
--- a/app/code/Magento/Integration/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Integration\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * Class for integration tables schema upgrades
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            /**
-             * Create table 'oauth_token_request_log'
-             */
-            $table = $setup->getConnection()->newTable(
-                $setup->getTable('oauth_token_request_log')
-            )->addColumn(
-                'log_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Log Id'
-            )->addColumn(
-                'user_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Customer email or admin login'
-            )->addColumn(
-                'user_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'User type (admin or customer)'
-            )->addColumn(
-                'failures_count',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => true, 'default' => 0],
-                'Number of failed authentication attempts in a row'
-            )->addColumn(
-                'lock_expires_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false],
-                'Lock expiration time'
-            )->addIndex(
-                $setup->getIdxName(
-                    'oauth_token_request_log',
-                    ['user_name', 'user_type'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['user_name', 'user_type'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )->setComment(
-                'Log of token request authentication failures.'
-            );
-            $setup->getConnection()->createTable($table);
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE.txt b/app/code/Magento/Integration/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE.txt
rename to app/code/Magento/Integration/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE_AFL.txt b/app/code/Magento/Integration/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE_AFL.txt
rename to app/code/Magento/Integration/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Integration/Test/Mftf/README.md b/app/code/Magento/Integration/Test/Mftf/README.md
new file mode 100644
index 0000000000000..bee16720d3c4a
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Integration Functional Tests
+
+The Functional Test Module for **Magento Integration** module.
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php
index b5f2b22186187..7738e9939fcdd 100644
--- a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php
@@ -83,6 +83,9 @@ public function testCanShowTab($integrationData, $expectedValue)
         $this->assertEquals($expectedValue, $this->webapiBlock->canShowTab());
     }
 
+    /**
+     * @return array
+     */
     public function canShowTabProvider()
     {
         return [
@@ -127,6 +130,9 @@ public function testIsEverythingAllowed($rootResourceId, $integrationData, $sele
         $this->assertEquals($expectedValue, $this->webapiBlock->isEverythingAllowed());
     }
 
+    /**
+     * @return array
+     */
     public function isEverythingAllowedProvider()
     {
         return [
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php
index 91f56279a89e5..30f1dc1d90bdc 100644
--- a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php
@@ -87,6 +87,9 @@ public function testRender($endpoint, $name, $expectedResult)
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function endpointDataProvider()
     {
         return [
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
index e0fba2a85d776..dcb0ddccf6f83 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
@@ -156,7 +156,7 @@ public function testDeleteActionForServiceIntegrationException()
             ->willReturn(self::INTEGRATION_ID);
         // Use real translate model
         $this->_translateModelMock = null;
-        $exceptionMessage = __("Integration with ID '%1' doesn't exist.", $intData[Info::DATA_ID]);
+        $exceptionMessage = __('The integration with ID "%1" doesn\'t exist.', $intData[Info::DATA_ID]);
         $invalidIdException = new IntegrationException($exceptionMessage);
         $this->_integrationSvcMock->expects($this->once())
             ->method('delete')
@@ -178,7 +178,7 @@ public function testDeleteActionForServiceGenericException()
             ->willReturn(self::INTEGRATION_ID);
         // Use real translate model
         $this->_translateModelMock = null;
-        $exceptionMessage = __("Integration with ID '%1' doesn't exist.", $intData[Info::DATA_ID]);
+        $exceptionMessage = __('The integration with ID "%1" doesn\'t exist.', $intData[Info::DATA_ID]);
         $invalidIdException = new \Exception($exceptionMessage);
         $this->_integrationSvcMock->expects($this->once())
             ->method('delete')
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
index 739af68173642..63026cb99e0a0 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
@@ -181,7 +181,7 @@ public function testSaveActionExceptionDuringServiceCreation()
 
     public function testSaveActionExceptionOnIntegrationsCreatedFromConfigFile()
     {
-        $exceptionMessage = 'Cannot edit integrations created via config file.';
+        $exceptionMessage = "The integrations created in the config file can't be edited.";
         $intData = new \Magento\Framework\DataObject(
             [
                 Info::DATA_NAME => 'nameTest',
@@ -215,7 +215,7 @@ public function testSaveActionExceptionOnIntegrationsCreatedFromConfigFile()
      */
     public function testSaveActionUserLockedException()
     {
-        $exceptionMessage = __('Your account is temporarily disabled.');
+        $exceptionMessage = __('Your account is temporarily disabled. Please try again later.');
         $passwordString = '1234567';
 
         $this->_requestMock->expects($this->exactly(2))
@@ -254,7 +254,8 @@ public function testSaveActionUserLockedException()
     public function testSaveActionAuthenticationException()
     {
         $passwordString = '1234567';
-        $exceptionMessage = __('You have entered an invalid password for current user.');
+        $exceptionMessage =
+            __('The password entered for the current user is invalid. Verify the password and try again.');
 
         $this->_requestMock->expects($this->any())
             ->method('getParam')
diff --git a/app/code/Magento/Integration/Test/Unit/Helper/DataTest.php b/app/code/Magento/Integration/Test/Unit/Helper/DataTest.php
index ca79393efb113..0cb550913ba60 100644
--- a/app/code/Magento/Integration/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Helper/DataTest.php
@@ -33,6 +33,9 @@ public function testIsConfigType($integrationsData, $expectedResult)
         $this->assertEquals($expectedResult, $this->dataHelper->isConfigType($integrationsData));
     }
 
+    /**
+     * @return array
+     */
     public function integrationDataProvider()
     {
         return [
diff --git a/app/code/Magento/Integration/Test/Unit/Helper/Oauth/ConsumerTest.php b/app/code/Magento/Integration/Test/Unit/Helper/Oauth/ConsumerTest.php
index ebdac167d257c..10bd5689a7c30 100644
--- a/app/code/Magento/Integration/Test/Unit/Helper/Oauth/ConsumerTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Helper/Oauth/ConsumerTest.php
@@ -197,6 +197,10 @@ public function testPostToConsumer()
         $this->assertEquals($oauthVerifier, $verifier, 'Checking Oauth Verifier');
     }
 
+    /**
+     * @param $length
+     * @return bool|string
+     */
     private function _generateRandomString($length)
     {
         return substr(
diff --git a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
index 6fd8799045292..e0b1113e80d8d 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Integration\Model\Oauth\Token;
@@ -116,7 +117,7 @@ public function testRevokeAdminAccessTokenWithoutAdminId()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The tokens could not be revoked.
+     * @expectedExceptionMessage The tokens couldn't be revoked.
      */
     public function testRevokeAdminAccessTokenCannotRevoked()
     {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/AuthorizationServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/AuthorizationServiceTest.php
index 475fb75d68517..230cb1e94fec8 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/AuthorizationServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/AuthorizationServiceTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Authorization\Model\ResourceModel\Rules;
@@ -177,7 +178,6 @@ public function testGrantPermissionsNoRole()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Sorry, something went wrong granting permissions.
      */
     public function testGrantPermissionsException()
     {
@@ -197,6 +197,10 @@ public function testGrantPermissionsException()
         $this->rulesMock->expects($this->any())->method('saveRel')->will($this->throwException(new \Exception()));
 
         $this->integrationAuthorizationService->grantPermissions(self::INTEGRATION_ID, $this->resources);
+
+        $this->expectExceptionMessage(
+            'An error occurred during the attempt to grant permissions. For details, see the exceptions log.'
+        );
     }
 
     public function testGrantAllPermissions()
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
index 5b7bbace5a65d..42b62acaba5b4 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
@@ -6,6 +6,8 @@
 return [
     [],
     [
+        'id' => 'Magento_Backend::admin',
+        'title' => 'Magento Admin (Root)',
         'children' =>
             [
                 [
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
index 54e05d5ef9017..0293492c77658 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
@@ -9,6 +9,7 @@
         'endpoint_url' => 'http://endpoint.com',
         'identity_link_url' => 'http://www.example.com/identity',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Customer::manageParent',
             'Magento_Customer::manage',
             'Magento_SalesRule::quoteParent',
@@ -17,6 +18,9 @@
     ],
     'TestIntegration2' => [
         'email' => 'test-integration2@magento.com',
-        'resource' => ['Magento_Sales::sales']
+        'resource' => [
+            'Magento_Backend::admin',
+            'Magento_Sales::sales'
+        ]
     ]
 ];
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
index 585fabc24299d..f8bcf3fc4a2ce 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
@@ -18,6 +18,7 @@
     <integration name="TestIntegration2">
         <email>test-integration2@magento.com</email>
         <resources>
+            <resource name="Magento_Backend::admin" />
             <resource name="Magento_Sales::sales" />
         </resources>
     </integration>
diff --git a/app/code/Magento/Integration/Test/Unit/Model/CredentialsValidatorTest.php b/app/code/Magento/Integration/Test/Unit/Model/CredentialsValidatorTest.php
index cd9e2657fa324..94d72b47c24e2 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/CredentialsValidatorTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/CredentialsValidatorTest.php
@@ -22,7 +22,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage username is a required field.
+     * @expectedExceptionMessage "username" is required. Enter and try again.
      */
     public function testValidateNoUsername()
     {
@@ -34,7 +34,7 @@ public function testValidateNoUsername()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage password is a required field.
+     * @expectedExceptionMessage "password" is required. Enter and try again.
      */
     public function testValidateNoPassword()
     {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
index ecd4788545c0a..1bc7d4247080f 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
@@ -32,6 +32,9 @@ class CustomerTokenServiceTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Integration\Model\Oauth\Token|\PHPUnit_Framework_MockObject_MockObject */
     private $_tokenMock;
 
+    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $manager;
+
     protected function setUp()
     {
         $this->_tokenFactoryMock = $this->getMockBuilder(\Magento\Integration\Model\Oauth\TokenFactory::class)
@@ -67,11 +70,14 @@ protected function setUp()
             \Magento\Integration\Model\CredentialsValidator::class
         )->disableOriginalConstructor()->getMock();
 
+        $this->manager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+
         $this->_tokenService = new \Magento\Integration\Model\CustomerTokenService(
             $this->_tokenFactoryMock,
             $this->_accountManagementMock,
             $this->_tokenModelCollectionFactoryMock,
-            $this->validatorHelperMock
+            $this->validatorHelperMock,
+            $this->manager
         );
     }
 
@@ -117,7 +123,7 @@ public function testRevokeCustomerAccessTokenWithoutCustomerId()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The tokens could not be revoked.
+     * @expectedExceptionMessage The tokens couldn't be revoked.
      */
     public function testRevokeCustomerAccessTokenCannotRevoked()
     {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/IntegrationServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/IntegrationServiceTest.php
index 60c7d43193344..09b02419fb0e8 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/IntegrationServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/IntegrationServiceTest.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Integration\Model\Integration;
@@ -149,7 +150,7 @@ public function testCreateSuccess()
 
     /**
      * @expectedException \Magento\Framework\Exception\IntegrationException
-     * @expectedExceptionMessage Integration with name 'Integration Name' exists.
+     * @expectedExceptionMessage The integration with name "Integration Name" exists.
      */
     public function testCreateIntegrationAlreadyExistsException()
     {
@@ -244,7 +245,7 @@ public function testUpdateSuccessNameChanged()
 
     /**
      * @expectedException \Magento\Framework\Exception\IntegrationException
-     * @expectedExceptionMessage Integration with name 'Another Integration Name' exists.
+     * @expectedExceptionMessage The integration with name "Another Integration Name" exists.
      */
     public function testUpdateException()
     {
@@ -297,7 +298,7 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\IntegrationException
-     * @expectedExceptionMessage Integration with ID '1' does not exist.
+     * @expectedExceptionMessage The integration with ID "1" doesn't exist.
      */
     public function testGetException()
     {
@@ -385,7 +386,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\IntegrationException
-     * @expectedExceptionMessage Integration with ID '1' does not exist.
+     * @expectedExceptionMessage The integration with ID "1" doesn't exist.
      */
     public function testDeleteException()
     {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php
index 73fab59176c40..c6b7ce22fc39c 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Integration\Test\Unit\Model\Oauth;
 
 use Magento\Framework\Url\Validator as UrlValidator;
+use Zend\Validator\Uri as ZendUriValidator;
 use Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength;
 
 /**
@@ -84,7 +85,7 @@ protected function setUp()
 
         $this->keyLengthValidator = new KeyLength();
 
-        $this->urlValidator = new UrlValidator();
+        $this->urlValidator = new UrlValidator(new ZendUriValidator());
 
         $this->oauthDataMock = $this->createPartialMock(
             \Magento\Integration\Helper\Oauth\Data::class,
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php
index b7a5193f443ff..2fe0632a0ae69 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php
@@ -340,7 +340,7 @@ public function testValidateRequestTokenNotExistentToken()
 
     /**
      * @expectedException \Magento\Framework\Oauth\Exception
-     * @expectedExceptionMessage Token is not the correct length
+     * @expectedExceptionMessage The token length is invalid. Check the length and try again.
      */
     public function testValidateRequestTokenIncorrectLengthToken()
     {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
index 36b0d77d1e1ae..badb69aa19fe4 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
@@ -384,7 +384,8 @@ public function testValidateIfNotCallbackEstablishedAndNotValid()
         $this->validatorMock->expects($this->once())->method('isValid')->willReturn(false);
         $this->validatorMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
 
-        $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Oauth\Exception::class);
+        $this->expectExceptionMessage($exceptionMessage);
 
         $this->tokenModel->validate();
     }
@@ -402,7 +403,8 @@ public function testValidateIfSecretNotValid()
         $this->validatorKeyLengthMock->expects($this->once())->method('isValid')->willReturn(false);
         $this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
 
-        $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Oauth\Exception::class);
+        $this->expectExceptionMessage($exceptionMessage);
 
         $this->tokenModel->validate();
     }
@@ -429,7 +431,8 @@ public function testValidateIfTokenNotValid()
             ]
         );
         $this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
-        $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Oauth\Exception::class);
+        $this->expectExceptionMessage($exceptionMessage);
 
         $this->tokenModel->validate();
     }
@@ -459,7 +462,8 @@ public function testValidateIfVerifierNotValid()
             ]
         );
         $this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
-        $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Oauth\Exception::class);
+        $this->expectExceptionMessage($exceptionMessage);
 
         $this->tokenModel->validate();
     }
diff --git a/app/code/Magento/Integration/Test/Unit/Model/OauthServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/OauthServiceTest.php
index 85d8b50097aed..9b8293c285c04 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/OauthServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/OauthServiceTest.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Integration\Model\Oauth\Token;
@@ -141,7 +142,7 @@ public function testDelete()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\IntegrationException
-     * @expectedExceptionMessage Consumer with ID '1' does not exist.
+     * @expectedExceptionMessage A consumer with ID "1" doesn't exist. Verify the ID and try again.
      */
     public function testDeleteException()
     {
@@ -288,7 +289,6 @@ public function testLoadConsumer()
     /**
      * @return void
      * @expectedException \Magento\Framework\Oauth\Exception
-     * @expectedExceptionMessage Unexpected error. Unable to load oAuth consumer account.
      */
     public function testLoadConsumerException()
     {
@@ -298,10 +298,19 @@ public function testLoadConsumerException()
             'load'
         )->will(
             $this->throwException(
-                new \Magento\Framework\Oauth\Exception(__('Unexpected error. Unable to load oAuth consumer account.'))
+                new \Magento\Framework\Oauth\Exception(
+                    __(
+                        "The oAuth consumer account couldn't be loaded due to an unexpected error. "
+                        . "Please try again later."
+                    )
+                )
             )
         );
         $this->_service->loadConsumer(self::VALUE_CONSUMER_ID);
+
+        $this->expectExceptionMessage(
+            "The oAuth consumer account couldn't be loaded due to an unexpected error. Please try again later."
+        );
     }
 
     /**
@@ -328,7 +337,6 @@ public function testLoadConsumerByKey()
     /**
      * @return void
      * @expectedException \Magento\Framework\Oauth\Exception
-     * @expectedExceptionMessage Unexpected error. Unable to load oAuth consumer account.
      */
     public function testLoadConsumerByKeyException()
     {
@@ -338,10 +346,19 @@ public function testLoadConsumerByKeyException()
             'load'
         )->will(
             $this->throwException(
-                new \Magento\Framework\Oauth\Exception(__('Unexpected error. Unable to load oAuth consumer account.'))
+                new \Magento\Framework\Oauth\Exception(
+                    __(
+                        "The oAuth consumer account couldn't be loaded due to an unexpected error. "
+                        . "Please try again later."
+                    )
+                )
             )
         );
         $this->_service->loadConsumerByKey(self::VALUE_CONSUMER_KEY);
+
+        $this->expectExceptionMessage(
+            "The oAuth consumer account couldn't be loaded due to an unexpected error. Please try again later."
+        );
     }
 
     /**
diff --git a/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php b/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php
index 4e928985b7ae4..7af2b3563478a 100644
--- a/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php
@@ -154,6 +154,10 @@ public function tearDown()
         unset($this->_oauth);
     }
 
+    /**
+     * @param array $amendments
+     * @return array
+     */
     protected function _getRequestTokenParams($amendments = [])
     {
         $requiredParams = [
@@ -231,6 +235,9 @@ public function testGetRequestTokenOutdatedConsumerKey()
         $this->_oauth->getRequestToken($this->_getRequestTokenParams(), self::REQUEST_URL);
     }
 
+    /**
+     * @param bool $isLoadable
+     */
     protected function _setupConsumer($isLoadable = true)
     {
         $this->_consumerMock->expects($this->any())->method('loadByKey')->will($this->returnSelf());
@@ -291,6 +298,9 @@ public function testGetRequestTokenOauthTimestampRefused($timestamp)
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForGetRequestTokenNonceTimestampRefusedTest()
     {
         return [
@@ -300,6 +310,10 @@ public function dataProviderForGetRequestTokenNonceTimestampRefusedTest()
         ];
     }
 
+    /**
+     * @param bool $isUsed
+     * @param int $timestamp
+     */
     protected function _setupNonce($isUsed = false, $timestamp = 0)
     {
         $nonceMock = $this->getMockBuilder(
@@ -359,6 +373,13 @@ public function testGetRequestTokenNoConsumer()
         $this->_oauth->getRequestToken($this->_getRequestTokenParams(), self::REQUEST_URL);
     }
 
+    /**
+     * @param bool $doesExist
+     * @param string $type
+     * @param int $consumerId
+     * @param null $verifier
+     * @param bool $isRevoked
+     */
     protected function _setupToken(
         $doesExist = true,
         $type = \Magento\Integration\Model\Oauth\Token::TYPE_VERIFIER,
@@ -505,7 +526,7 @@ public function testGetAccessTokenVersionRejected()
      * \Magento\Framework\Oauth\OauthInterface::ERR_PARAMETER_ABSENT
      *
      * @expectedException \Magento\Framework\Oauth\OauthInputException
-     * @expectedExceptionMessage oauth_verifier is a required field.
+     * @expectedExceptionMessage "oauth_verifier" is required. Enter and try again.
      */
     public function testGetAccessTokenParameterAbsent()
     {
@@ -602,10 +623,13 @@ public function testGetAccessTokenVerifierInvalid($verifier, $verifierFromToken)
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForGetAccessTokenVerifierInvalidTest()
     {
         // Verifier is not a string
-        return [[3, 3], ['wrong_length', 'wrong_length'], ['verifier', 'doesnt match']];
+        return [[3, 3], ['wrong_length', 'wrong_length'], ['verifier', 'doesn\'t match']];
     }
 
     public function testGetAccessToken()
@@ -777,16 +801,17 @@ public function testBuildAuthorizationHeader()
      */
     public function testMissingParamForBuildAuthorizationHeader($expectedMessage, $request)
     {
-        $this->expectException(
-            \Magento\Framework\Oauth\OauthInputException::class,
-            $expectedMessage,
-            0
-        );
+        $this->expectException(\Magento\Framework\Oauth\OauthInputException::class);
+        $this->expectExceptionMessage($expectedMessage);
+        $this->expectExceptionCode(0);
 
         $requestUrl = 'http://www.example.com/endpoint';
         $this->_oauth->buildAuthorizationHeader($request, $requestUrl);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderMissingParamForBuildAuthorizationHeaderTest()
     {
         return [
@@ -836,6 +861,10 @@ public function dataProviderMissingParamForBuildAuthorizationHeaderTest()
         ];
     }
 
+    /**
+     * @param array $amendments
+     * @return array
+     */
     protected function _getAccessTokenRequiredParams($amendments = [])
     {
         $requiredParams = [
@@ -853,6 +882,10 @@ protected function _getAccessTokenRequiredParams($amendments = [])
         return array_merge($requiredParams, $amendments);
     }
 
+    /**
+     * @param $length
+     * @return bool|string
+     */
     private function _generateRandomString($length)
     {
         return substr(
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 662112431ad08..6a63854775ac3 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-security": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-user": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-security": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Integration/etc/acl.xml b/app/code/Magento/Integration/etc/acl.xml
new file mode 100644
index 0000000000000..51eb078bd1df7
--- /dev/null
+++ b/app/code/Magento/Integration/etc/acl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Integration::extensions" title="System Extensions" translate="title" sortOrder="30">
+                        <resource id="Magento_Integration::integrations" title="System Integrations" translate="title" sortOrder="40" />
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
index 97aec083e7abb..fe80fe105493a 100644
--- a/app/code/Magento/Integration/etc/adminhtml/system.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/system.xml
@@ -13,48 +13,48 @@
             <resource>Magento_Integration::config_oauth</resource>
             <group id="access_token_lifetime" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Access Token Expiration</label>
-                <field id="customer" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="customer" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Customer Token Lifetime (hours)</label>
                     <comment>We will disable this feature if the value is empty.</comment>
                 </field>
-                <field id="admin" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="admin" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Admin Token Lifetime (hours)</label>
                     <comment>We will disable this feature if the value is empty.</comment>
                 </field>
             </group>
             <group id="cleanup" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Cleanup Settings</label>
-                <field id="cleanup_probability" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="cleanup_probability" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Cleanup Probability</label>
                     <comment>Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup</comment>
                 </field>
-                <field id="expiration_period" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="expiration_period" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Expiration Period</label>
                     <comment>Cleanup entries older than X minutes.</comment>
                 </field>
             </group>
             <group id="consumer" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Consumer Settings</label>
-                <field id="expiration_period" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="expiration_period" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Expiration Period</label>
                     <comment>Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts.</comment>
                 </field>
-                <field id="post_maxredirects" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="post_maxredirects" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>OAuth consumer credentials HTTP Post maxredirects</label>
                     <comment>Number of maximum redirects for OAuth consumer credentials Post request.</comment>
                 </field>
-                <field id="post_timeout" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="post_timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>OAuth consumer credentials HTTP Post timeout</label>
                     <comment>Timeout for OAuth consumer credentials Post request within X seconds.</comment>
                 </field>
             </group>
             <group id="authentication_lock" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Authentication Locks</label>
-                <field id="max_failures_count" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="max_failures_count" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Maximum Login Failures to Lock Out Account</label>
                     <comment>Maximum Number of authentication failures to lock out account.</comment>
                 </field>
-                <field id="timeout" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lockout Time (seconds)</label>
                     <comment>Period of time in seconds after which account will be unlocked.</comment>
                 </field>
diff --git a/app/code/Magento/Integration/etc/db_schema.xml b/app/code/Magento/Integration/etc/db_schema.xml
new file mode 100644
index 0000000000000..f1824fadb97fd
--- /dev/null
+++ b/app/code/Magento/Integration/etc/db_schema.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="oauth_consumer" resource="default" engine="innodb" comment="OAuth Consumers">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="true" default="0"
+                comment="Updated At"/>
+        <column xsi:type="varchar" name="name" nullable="false" length="255" comment="Name of consumer"/>
+        <column xsi:type="varchar" name="key" nullable="false" length="32" comment="Key code"/>
+        <column xsi:type="varchar" name="secret" nullable="false" length="32" comment="Secret code"/>
+        <column xsi:type="text" name="callback_url" nullable="true" comment="Callback URL"/>
+        <column xsi:type="text" name="rejected_callback_url" nullable="false" comment="Rejected callback URL"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="OAUTH_CONSUMER_KEY">
+            <column name="key"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="OAUTH_CONSUMER_SECRET">
+            <column name="secret"/>
+        </constraint>
+        <index referenceId="OAUTH_CONSUMER_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="OAUTH_CONSUMER_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+    </table>
+    <table name="oauth_token" resource="default" engine="innodb" comment="OAuth Tokens">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="consumer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Oauth Consumer ID"/>
+        <column xsi:type="int" name="admin_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Admin user ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer user ID"/>
+        <column xsi:type="varchar" name="type" nullable="false" length="16" comment="Token Type"/>
+        <column xsi:type="varchar" name="token" nullable="false" length="32" comment="Token"/>
+        <column xsi:type="varchar" name="secret" nullable="false" length="32" comment="Token Secret"/>
+        <column xsi:type="varchar" name="verifier" nullable="true" length="32" comment="Token Verifier"/>
+        <column xsi:type="text" name="callback_url" nullable="false" comment="Token Callback URL"/>
+        <column xsi:type="smallint" name="revoked" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Token revoked"/>
+        <column xsi:type="smallint" name="authorized" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Token authorized"/>
+        <column xsi:type="int" name="user_type" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="User type"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Token creation timestamp"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="OAUTH_TOKEN_ADMIN_ID_ADMIN_USER_USER_ID" table="oauth_token"
+                    column="admin_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="OAUTH_TOKEN_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="oauth_token"
+                    column="consumer_id" referenceTable="oauth_consumer" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="OAUTH_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="oauth_token"
+                    column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="OAUTH_TOKEN_TOKEN">
+            <column name="token"/>
+        </constraint>
+        <index referenceId="OAUTH_TOKEN_CONSUMER_ID" indexType="btree">
+            <column name="consumer_id"/>
+        </index>
+    </table>
+    <table name="oauth_nonce" resource="default" engine="innodb" comment="OAuth Nonce">
+        <column xsi:type="varchar" name="nonce" nullable="false" length="32" comment="Nonce String"/>
+        <column xsi:type="int" name="timestamp" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Nonce Timestamp"/>
+        <column xsi:type="int" name="consumer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Consumer ID"/>
+        <constraint xsi:type="foreign" referenceId="OAUTH_NONCE_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="oauth_nonce"
+                    column="consumer_id" referenceTable="oauth_consumer" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="OAUTH_NONCE_NONCE_CONSUMER_ID">
+            <column name="nonce"/>
+            <column name="consumer_id"/>
+        </constraint>
+        <index referenceId="OAUTH_NONCE_TIMESTAMP" indexType="btree">
+            <column name="timestamp"/>
+        </index>
+    </table>
+    <table name="integration" resource="default" engine="innodb" comment="integration">
+        <column xsi:type="int" name="integration_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Integration ID"/>
+        <column xsi:type="varchar" name="name" nullable="false" length="255"
+                comment="Integration name is displayed in the admin interface"/>
+        <column xsi:type="varchar" name="email" nullable="false" length="255"
+                comment="Email address of the contact person"/>
+        <column xsi:type="varchar" name="endpoint" nullable="true" length="255"
+                comment="Endpoint for posting consumer credentials"/>
+        <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Integration status"/>
+        <column xsi:type="int" name="consumer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Oauth consumer"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Creation Time"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
+                comment="Update Time"/>
+        <column xsi:type="smallint" name="setup_type" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Integration type - manual or config file"/>
+        <column xsi:type="varchar" name="identity_link_url" nullable="true" length="255"
+                comment="Identity linking Url"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="integration_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="INTEGRATION_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID" table="integration"
+                    column="consumer_id" referenceTable="oauth_consumer" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="INTEGRATION_NAME">
+            <column name="name"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="INTEGRATION_CONSUMER_ID">
+            <column name="consumer_id"/>
+        </constraint>
+    </table>
+    <table name="oauth_token_request_log" resource="default" engine="innodb"
+           comment="Log of token request authentication failures.">
+        <column xsi:type="int" name="log_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Log Id"/>
+        <column xsi:type="varchar" name="user_name" nullable="false" length="255"
+                comment="Customer email or admin login"/>
+        <column xsi:type="smallint" name="user_type" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="User type (admin or customer)"/>
+        <column xsi:type="smallint" name="failures_count" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Number of failed authentication attempts in a row"/>
+        <column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Lock expiration time"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="log_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="OAUTH_TOKEN_REQUEST_LOG_USER_NAME_USER_TYPE">
+            <column name="user_name"/>
+            <column name="user_type"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Integration/etc/db_schema_whitelist.json b/app/code/Magento/Integration/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..a7649eeb4ee1e
--- /dev/null
+++ b/app/code/Magento/Integration/etc/db_schema_whitelist.json
@@ -0,0 +1,97 @@
+{
+    "oauth_consumer": {
+        "column": {
+            "entity_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "name": true,
+            "key": true,
+            "secret": true,
+            "callback_url": true,
+            "rejected_callback_url": true
+        },
+        "index": {
+            "OAUTH_CONSUMER_CREATED_AT": true,
+            "OAUTH_CONSUMER_UPDATED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "OAUTH_CONSUMER_KEY": true,
+            "OAUTH_CONSUMER_SECRET": true
+        }
+    },
+    "oauth_token": {
+        "column": {
+            "entity_id": true,
+            "consumer_id": true,
+            "admin_id": true,
+            "customer_id": true,
+            "type": true,
+            "token": true,
+            "secret": true,
+            "verifier": true,
+            "callback_url": true,
+            "revoked": true,
+            "authorized": true,
+            "user_type": true,
+            "created_at": true
+        },
+        "index": {
+            "OAUTH_TOKEN_CONSUMER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "OAUTH_TOKEN_ADMIN_ID_ADMIN_USER_USER_ID": true,
+            "OAUTH_TOKEN_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID": true,
+            "OAUTH_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "OAUTH_TOKEN_TOKEN": true
+        }
+    },
+    "oauth_nonce": {
+        "column": {
+            "nonce": true,
+            "timestamp": true,
+            "consumer_id": true
+        },
+        "constraint": {
+            "OAUTH_NONCE_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID": true,
+            "OAUTH_NONCE_NONCE_CONSUMER_ID": true
+        },
+        "index": {
+            "OAUTH_NONCE_TIMESTAMP": true
+        }
+    },
+    "integration": {
+        "column": {
+            "integration_id": true,
+            "name": true,
+            "email": true,
+            "endpoint": true,
+            "status": true,
+            "consumer_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "setup_type": true,
+            "identity_link_url": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "INTEGRATION_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID": true,
+            "INTEGRATION_NAME": true,
+            "INTEGRATION_CONSUMER_ID": true
+        }
+    },
+    "oauth_token_request_log": {
+        "column": {
+            "log_id": true,
+            "user_name": true,
+            "user_type": true,
+            "failures_count": true,
+            "lock_expires_at": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "OAUTH_TOKEN_REQUEST_LOG_USER_NAME_USER_TYPE": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Integration/etc/module.xml b/app/code/Magento/Integration/etc/module.xml
index c5e2aa75a8d05..abd407c981d6f 100644
--- a/app/code/Magento/Integration/etc/module.xml
+++ b/app/code/Magento/Integration/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Integration" setup_version="2.2.0">
+    <module name="Magento_Integration" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_User"/>
diff --git a/app/code/Magento/Integration/etc/webapi_rest/events.xml b/app/code/Magento/Integration/etc/webapi_rest/events.xml
new file mode 100644
index 0000000000000..e978698734277
--- /dev/null
+++ b/app/code/Magento/Integration/etc/webapi_rest/events.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:Event/etc/events.xsd">
+    <event name="customer_login">
+        <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
+    </event>
+</config>
diff --git a/app/code/Magento/Integration/etc/webapi_soap/events.xml b/app/code/Magento/Integration/etc/webapi_soap/events.xml
new file mode 100644
index 0000000000000..e978698734277
--- /dev/null
+++ b/app/code/Magento/Integration/etc/webapi_soap/events.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:Event/etc/events.xsd">
+    <event name="customer_login">
+        <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
+    </event>
+</config>
diff --git a/app/code/Magento/Integration/i18n/en_US.csv b/app/code/Magento/Integration/i18n/en_US.csv
index 6fb5d2e071205..b225ad2766fff 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 6faeee56ba692..ae16da1760f62 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
@@ -15,7 +15,8 @@
         "jquery",
         'Magento_Ui/js/modal/confirm',
         "jquery/ui",
-        "Magento_Integration/js/integration"
+        "Magento_Integration/js/integration",
+        'mage/dataPost'
     ], function ($, Confirm) {
 
         window.integration = new Integration(
@@ -33,11 +34,11 @@
             $('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');
+                            $.mage.dataPost().postData({action: $(e.target).data('url'), data: {}});
                         }
                     }
                 });
@@ -47,14 +48,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/Integration/view/adminhtml/web/js/integration.js b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
index 0bd7df8c0fa10..a2acc40c6b86e 100644
--- a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
+++ b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
@@ -187,7 +187,7 @@ define([
             },
 
             /**
-             * Function to check the location of the child popoup window.
+             * Function to check the location of the child popup window.
              * Once detected if the callback is successful, parent window will be reloaded
              */
             fnCheckLocation: function () {
@@ -200,7 +200,7 @@ define([
                     if (IdentityLogin.win.closed ||
                         IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
                     ) {
-                        //Stop the the polling
+                        //Stop the polling
                         clearInterval(IdentityLogin.checker);
                         $('body').trigger('processStart');
                         //Check for window closed
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
index ff3ab124a65ad..1f868a5b71754 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
@@ -18,7 +18,7 @@ class State extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'layer/state.phtml';
+    protected $_template = 'Magento_LayeredNavigation::layer/state.phtml';
 
     /**
      * Catalog layer
diff --git a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
index 6b64610caf5ed..ce618f97883b0 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Observer for Product Attribute Form
+ */
 class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
 {
     /**
@@ -34,6 +37,8 @@ public function __construct(Manager $moduleManager, Source\Yesno $optionList)
     }
 
     /**
+     * Execute
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      */
@@ -54,8 +59,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             [
                 'name' => 'is_filterable',
                 'label' => __("Use in Layered Navigation"),
-                'title' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
-                'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price.'),
+                'title' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price'),
+                'note' => __(
+                    'Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price.
+                    <br>Price is not compatible with <b>\'Filterable (no results)\'</b> option - 
+                     it will make no affect on Price filter.'
+                ),
                 'values' => [
                     ['value' => '0', 'label' => __('No')],
                     ['value' => '1', 'label' => __('Filterable (with results)')],
@@ -70,8 +79,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             [
                 'name' => 'is_filterable_in_search',
                 'label' => __("Use in Search Results Layered Navigation"),
-                'title' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
-                'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price.'),
+                'title' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price'),
+                'note' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price.'),
                 'values' => $this->optionList->toOptionArray(),
             ]
         );
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE.txt b/app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE.txt
rename to app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE_AFL.txt b/app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE_AFL.txt
rename to app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/README.md b/app/code/Magento/LayeredNavigation/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6a6f97798b13c
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Layered Navigation Functional Tests
+
+The Functional Test Module for **Magento Layered Navigation** module.
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
new file mode 100644
index 0000000000000..ad94d44d636e9
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LayeredNavigationSection">
+        <element name="layeredNavigation" type="select" selector="#catalog_layered_navigation-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#catalog_layered_navigation-head:not(.open)"/>
+        <element name="NavigationStepCalculation" type="button" selector="#catalog_layered_navigation_price_range_calculation"/>
+        <element name="NavigationStepCalculationSystemValue" type="button" selector="#catalog_layered_navigation_price_range_calculation_inherit"/>
+        <element name="PriceNavigationStep" type="button" selector="#catalog_layered_navigation_price_range_step"/>
+        <element name="PriceNavigationStepSystemValue" type="button" selector="#catalog_layered_navigation_price_range_step_inherit"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml
new file mode 100644
index 0000000000000..0a09f17d66f62
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSpecifyLayerNavigationConfigurationTest">
+        <annotations>
+            <features value="LayerNavigation"/>
+            <group value="LayerNavigation"/>
+            <stories value="Magento_LayeredNavigation"/>
+            <title value="Admin should be able to uncheck Default Value checkbox for dependent field"/>
+            <description value="Admin should be able to uncheck Default Value checkbox for dependent field"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-94872"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+        </before>
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPage" />
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick stepKey="expandLayeredNavigationTab" selector="{{LayeredNavigationSection.layeredNavigation}}" dependentSelector="{{LayeredNavigationSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible  selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
+        <uncheckOption selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{LayeredNavigationSection.NavigationStepCalculation}}" userInput="Manual" stepKey="selectOption1"/>
+        <uncheckOption selector="{{LayeredNavigationSection.PriceNavigationStepSystemValue}}" stepKey="uncheckUseSystemValue2"/>
+        <fillField selector="{{LayeredNavigationSection.PriceNavigationStep}}" userInput="102" stepKey="fillAdmin1"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
+        <waitForElementVisible selector="#catalog_layered_navigation" stepKey="waitForLayeredNav" />
+        <scrollTo selector="#catalog_layered_navigation" x="0" y="-80" stepKey="scrollToLayeredNavigation" />
+        <seeInField stepKey="seeThatValueWasSaved" selector="{{LayeredNavigationSection.PriceNavigationStep}}" userInput="102"/>
+        <checkOption selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="setToDefaultValue1"/>
+        <checkOption selector="{{LayeredNavigationSection.PriceNavigationStepSystemValue}}" stepKey="setToDefaultValue2"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2" />
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration2"/>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
new file mode 100644
index 0000000000000..28b937f61ee95
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ShopByButtonInMobile">
+        <annotations>
+            <features value="Layered Navigation"/>
+            <stories value="Shop By button is not working in a mobile theme"/>
+            <title value="Layered Navigation"/>
+            <description value="Storefront Shop By collapsible button works in a mobile theme"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94873"/>
+            <group value="LayeredNavigation"/>
+        </annotations>
+        <before>
+            <createData entity="productDropDownAttribute" stepKey="attribute"/>
+            <createData entity="productAttributeOption1" stepKey="option1">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="attributeSet">
+                <requiredEntity createDataKey="attribute"/>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        </after>
+        <!-- Go to default attribute set edit page and add the product attribute to the set -->
+        <comment userInput="Go to default attribute set edit page and add the product attribute to the set" stepKey="commentAttributeSetEdit" />
+        <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/{{AddToDefaultSet.attributeSetId}}/" stepKey="onAttributeSetEdit"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$attribute.attribute[attribute_code]$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('Product Details')}}" stepKey="assignTestAttributes"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickAttributeSetSave"/>
+        <!-- Go to simple product edit page and set the product attribute to a value -->
+        <comment userInput="Go to simple product edit page and set the product attribute to a value" stepKey="commentProductAttributeEdit" />
+        <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1.id$$)}}" stepKey="goToEditPage"/>
+        <selectOption selector="{{AdminProductFormSection.customSelectField($$attribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="selectAttribute"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+        <!-- Check storefront mobile view for shop by button is functioning as expected -->
+        <comment userInput="Check storefront mobile view for shop by button is functioning as expected" stepKey="commentCheckShopByButton" />
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageToLoad"/>
+        <submitForm selector="#search_mini_form" parameterArray="['q' => 'Test Simple Product']" stepKey="fillSearchBar" />
+        <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
+        <waitForPageLoad stepKey="waitForHomePageToLoad2"/>
+        <seeElement selector="{{StorefrontCategorySidebarMobileSection.shopByButton}}" stepKey="seeShopByButton"/>
+        <click selector="{{StorefrontCategorySidebarMobileSection.shopByButton}}" stepKey="clickShopByButton"/>
+        <seeElement selector="{{StorefrontCategorySidebarSection.filterOptionsTitle('$$attribute.attribute[default_label]$$')}}" stepKey="seeShopByOption"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index 8239a80529b3e..6d322fc3ab50c 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -5,13 +5,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
index e9bf7933b94a9..de4637847456e 100644
--- a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
+++ b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="catalog" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="layered_navigation" translate="label" sortOrder="490" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Layered Navigation</label>
                 <field id="display_product_count" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/app/code/Magento/LayeredNavigation/etc/module.xml b/app/code/Magento/LayeredNavigation/etc/module.xml
index 5cc794c622aaf..0fcfcba834c3b 100644
--- a/app/code/Magento/LayeredNavigation/etc/module.xml
+++ b/app/code/Magento/LayeredNavigation/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_LayeredNavigation" setup_version="2.0.0">
+    <module name="Magento_LayeredNavigation" >
     </module>
 </config>
diff --git a/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml
index 000e10197af1b..0d7476081d19e 100644
--- a/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml
+++ b/app/code/Magento/LayeredNavigation/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -11,6 +11,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="valuesForEnable" xsi:type="array">
+                        <item name="boolean" xsi:type="string">boolean</item>
                         <item name="select" xsi:type="string">select</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
                         <item name="price" xsi:type="string">price</item>
@@ -19,7 +20,7 @@
                 </item>
             </argument>
             <settings>
-                <notice translate="true">Can be used only with catalog input type Dropdown, Multiple Select and Price.</notice>
+                <notice translate="true">Can be used only with catalog input type Yes/No (Boolean), Dropdown, Multiple Select and Price.</notice>
                 <dataType>string</dataType>
                 <label translate="true">Use in Layered Navigation</label>
                 <dataScope>is_filterable</dataScope>
@@ -36,6 +37,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="valuesForEnable" xsi:type="array">
+                        <item name="boolean" xsi:type="string">boolean</item>
                         <item name="select" xsi:type="string">select</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
                         <item name="price" xsi:type="string">price</item>
@@ -45,7 +47,7 @@
                 </item>
             </argument>
             <settings>
-                <notice translate="true">Can be used only with catalog input type Dropdown, Multiple Select and Price.</notice>
+                <notice translate="true">Can be used only with catalog input type Yes/No (Boolean), Dropdown, Multiple Select and Price.</notice>
                 <label translate="true">Use in Search Results Layered Navigation</label>
                 <dataScope>is_filterable_in_search</dataScope>
                 <imports>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
index ab9aa485aeea2..3bb21ed09a01c 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
+        <attribute name="class" value="page-with-filter"/>
         <referenceContainer name="sidebar.main">
             <block class="Magento\LayeredNavigation\Block\Navigation\Search" name="catalogsearch.leftnav" before="-" template="Magento_LayeredNavigation::layer/view.phtml">
                 <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalogsearch.navigation.state" as="state" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE.txt b/app/code/Magento/Marketplace/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE.txt
rename to app/code/Magento/Marketplace/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE_AFL.txt b/app/code/Magento/Marketplace/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE_AFL.txt
rename to app/code/Magento/Marketplace/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Marketplace/Test/Mftf/README.md b/app/code/Magento/Marketplace/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3612b519cb5be
--- /dev/null
+++ b/app/code/Magento/Marketplace/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Marketplace Functional Tests
+
+The Functional Test Module for **Magento Marketplace** module.
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index bcaf453cd73b9..b52d507f825fc 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Marketplace/etc/adminhtml/menu.xml b/app/code/Magento/Marketplace/etc/adminhtml/menu.xml
index 084ca708d5825..ae9e629f95364 100644
--- a/app/code/Magento/Marketplace/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Marketplace/etc/adminhtml/menu.xml
@@ -7,7 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_Marketplace::partners" title="Find Partners &amp; Extensions" module="Magento_Marketplace" sortOrder="80"
-             action="marketplace/index" resource="Magento_Marketplace::partners"/>
+        <add id="Magento_Marketplace::partners" title="Find Partners &amp; Extensions" translate="title" module="Magento_Marketplace" sortOrder="80" action="marketplace/index" resource="Magento_Marketplace::partners"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Marketplace/etc/module.xml b/app/code/Magento/Marketplace/etc/module.xml
index b696e5206e524..8490bd835110d 100644
--- a/app/code/Magento/Marketplace/etc/module.xml
+++ b/app/code/Magento/Marketplace/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Marketplace" setup_version="1.0.0"/>
+    <module name="Magento_Marketplace" />
 </config>
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
index ec74b837e1077..a37306bf1eed7 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
@@ -46,9 +46,9 @@
         </div>
         <div class="col-m-3">
             <img
-                class="magento-connect-logo"
+                class="magento-marketplace-logo"
                 src="<?php /* @escapeNotVerified */ echo $block
-                    ->getViewFileUrl('Magento_Marketplace::partners/images/magento-connect.png');
+                    ->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg');
                 ?>"
                 alt="Partner"/>
         </div>
@@ -61,7 +61,7 @@
                 ); ?>
             </p>
             <a class="action-secondary" target="_blank"
-               href="http://www.magentocommerce.com/magento-connect/">
+               href="https://marketplace.magento.com/">
                 <?= /* @escapeNotVerified */ __('Visit Magento Marketplaces') ?>
             </a>
         </div>
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
index 309df6f883a49..b63bf9ebd50eb 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
@@ -11,7 +11,7 @@
 $partners = $block->getPartners();
 ?>
 <?php if ($partners) : ?>
-    <?php foreach ($block->getPartners() as $partner) : ?>
+    <?php foreach ($partners as $partner) : ?>
         <div class="partner">
             <img
                 class="partner-image"
diff --git a/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png b/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png
deleted file mode 100644
index 575563f341b35..0000000000000
Binary files a/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png and /dev/null differ
diff --git a/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-marketplace.svg b/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-marketplace.svg
new file mode 100644
index 0000000000000..388544d5d7f3d
--- /dev/null
+++ b/app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-marketplace.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 273.37 35.85"><defs><style>.cls-1{fill:#f26322;}.cls-2{fill:#4d4d4d;}</style></defs><title>Artboard 1</title><g id="Logo"><polygon class="cls-1" points="15.54 0 0 8.97 0 26.89 4.43 29.45 4.41 11.53 15.51 5.12 26.61 11.53 26.61 29.44 31.05 26.89 31.05 8.95 15.54 0"/><polygon class="cls-1" points="17.74 29.45 15.52 30.73 13.3 29.46 13.3 11.53 8.86 14.09 8.87 32.01 15.52 35.85 22.18 32.01 22.18 14.09 17.74 11.53 17.74 29.45"/><path class="cls-2" d="M41.21,9.08l6.1,15.41h0l6-15.41h2.32V26.74H54V11.35h0q-.12.42-.27.84l-.28.77c-.11.28-.2.54-.28.79L48,26.74H46.57l-5.16-13q-.15-.35-.3-.75t-.27-.78l-.3-.86h0V26.74H39V9.08Z"/><path class="cls-2" d="M60.3,26.81A3.76,3.76,0,0,1,59,26.14,3.14,3.14,0,0,1,58.1,25a3.54,3.54,0,0,1-.32-1.56,3.64,3.64,0,0,1,.42-1.85,3.24,3.24,0,0,1,1.14-1.15A5.74,5.74,0,0,1,61,19.82a17.86,17.86,0,0,1,2-.35q.94-.1,1.59-.21A4.84,4.84,0,0,0,65.69,19a1.27,1.27,0,0,0,.59-.46,1.41,1.41,0,0,0,.19-.78V17.5a2.33,2.33,0,0,0-.79-1.94,3.57,3.57,0,0,0-2.27-.63q-3.41,0-3.58,2.84H58.32a4.17,4.17,0,0,1,1.37-3,5.44,5.44,0,0,1,3.72-1.11,5.32,5.32,0,0,1,3.31.93,3.57,3.57,0,0,1,1.21,3v6.94a1.31,1.31,0,0,0,.21.83.83.83,0,0,0,.63.28l.26,0,.31-.07h.07v1.11a2.9,2.9,0,0,1-.42.14,2.61,2.61,0,0,1-.62.06A2,2,0,0,1,67,26.48a1.87,1.87,0,0,1-.54-1.37v-.27h-.07a7.46,7.46,0,0,1-.65.77,4.41,4.41,0,0,1-.93.72,5.18,5.18,0,0,1-1.26.52A6.14,6.14,0,0,1,62,27a5.92,5.92,0,0,1-1.65-.22m3.77-1.35a4.33,4.33,0,0,0,1.35-.85,3.46,3.46,0,0,0,1.09-2.49v-2.3a5.29,5.29,0,0,1-1.49.53q-.88.19-1.82.31t-1.51.26a3.8,3.8,0,0,0-1.2.43,2.21,2.21,0,0,0-.8.8,2.6,2.6,0,0,0-.3,1.32,2.36,2.36,0,0,0,.23,1.11,2,2,0,0,0,.62.72,2.42,2.42,0,0,0,.9.38,5.18,5.18,0,0,0,1.09.11,4.75,4.75,0,0,0,1.84-.33"/><path class="cls-2" d="M72,30.26a3.4,3.4,0,0,1-1.46-2.38h1.48a2.08,2.08,0,0,0,1.2,1.59,5.45,5.45,0,0,0,2.38.48,4.13,4.13,0,0,0,3-1,3.62,3.62,0,0,0,1-2.68v-2h-.07a5.28,5.28,0,0,1-1.65,1.65,4.56,4.56,0,0,1-2.4.57A5.35,5.35,0,0,1,73.24,26a5,5,0,0,1-1.73-1.31,5.87,5.87,0,0,1-1.1-2A8.28,8.28,0,0,1,70,20.12a7.9,7.9,0,0,1,.44-2.75,6.14,6.14,0,0,1,1.19-2,4.89,4.89,0,0,1,1.74-1.23,5.4,5.4,0,0,1,2.11-.42A4.52,4.52,0,0,1,78,14.3a5,5,0,0,1,1.61,1.64h.07V14h1.51V26.24A4.92,4.92,0,0,1,80,29.68a5.62,5.62,0,0,1-4.27,1.53,6.06,6.06,0,0,1-3.66-1m6.69-6.46a6.2,6.2,0,0,0,1-3.7A8.14,8.14,0,0,0,79.49,18a4.52,4.52,0,0,0-.77-1.62,3.5,3.5,0,0,0-1.3-1A4.18,4.18,0,0,0,75.61,15a3.47,3.47,0,0,0-3,1.41,6.13,6.13,0,0,0-1,3.75,7.81,7.81,0,0,0,.25,2,4.82,4.82,0,0,0,.74,1.61,3.49,3.49,0,0,0,1.23,1.06,3.78,3.78,0,0,0,1.75.38,3.6,3.6,0,0,0,3.14-1.41"/><path class="cls-2" d="M86.45,26.55a5.21,5.21,0,0,1-1.86-1.41A6.29,6.29,0,0,1,83.44,23a8.58,8.58,0,0,1-.4-2.65,8.12,8.12,0,0,1,.42-2.66,6.63,6.63,0,0,1,1.17-2.12,5.3,5.3,0,0,1,1.83-1.41,5.57,5.57,0,0,1,2.41-.51,5.27,5.27,0,0,1,2.58.58,4.83,4.83,0,0,1,1.7,1.56A6.38,6.38,0,0,1,94.08,18a12.26,12.26,0,0,1,.27,2.59H84.62a7.4,7.4,0,0,0,.31,2,5.06,5.06,0,0,0,.82,1.62,3.7,3.7,0,0,0,1.35,1.09,4.31,4.31,0,0,0,1.9.4A3.62,3.62,0,0,0,91.48,25a4.26,4.26,0,0,0,1.25-2.09H94.2a5.44,5.44,0,0,1-1.73,3A5.13,5.13,0,0,1,89,27.06a6.07,6.07,0,0,1-2.54-.51m6-8.89a4.34,4.34,0,0,0-.72-1.43,3.28,3.28,0,0,0-1.19-1,3.88,3.88,0,0,0-1.7-.35,4.07,4.07,0,0,0-1.72.35,3.67,3.67,0,0,0-1.27,1,4.74,4.74,0,0,0-.83,1.42,7,7,0,0,0-.41,1.78h8.1a6.75,6.75,0,0,0-.27-1.77"/><path class="cls-2" d="M97.78,14v2h0a5.25,5.25,0,0,1,1.69-1.59,4.93,4.93,0,0,1,2.58-.63,4.23,4.23,0,0,1,2.93,1,3.75,3.75,0,0,1,1.15,3v9.06h-1.53V17.82a2.69,2.69,0,0,0-.78-2.14,3.14,3.14,0,0,0-2.14-.68,4.28,4.28,0,0,0-1.53.27,4,4,0,0,0-1.26.75,3.46,3.46,0,0,0-.85,1.15,3.42,3.42,0,0,0-.31,1.46v8.1H96.25V14Z"/><path class="cls-2" d="M110.13,26.3a2.13,2.13,0,0,1-.67-1.77V15.23h-1.93V14h1.93V10H111V14h2.37v1.26H111v9.06a1.2,1.2,0,0,0,.31,1,1.41,1.41,0,0,0,.93.26,2.62,2.62,0,0,0,.56-.06,2.55,2.55,0,0,0,.46-.14h.07v1.31a4.28,4.28,0,0,1-1.41.22,2.77,2.77,0,0,1-1.78-.53"/><path class="cls-2" d="M117.9,26.55A5.35,5.35,0,0,1,116,25.14,6.33,6.33,0,0,1,114.86,23a8.85,8.85,0,0,1,0-5.31A6.34,6.34,0,0,1,116,15.59a5.36,5.36,0,0,1,1.86-1.41,5.87,5.87,0,0,1,2.48-.51,5.79,5.79,0,0,1,2.47.51,5.39,5.39,0,0,1,1.85,1.41,6.17,6.17,0,0,1,1.16,2.12,9.11,9.11,0,0,1,0,5.31,6.17,6.17,0,0,1-1.16,2.12,5.38,5.38,0,0,1-1.85,1.41,5.78,5.78,0,0,1-2.47.51,5.86,5.86,0,0,1-2.48-.51m4.36-1.2a3.85,3.85,0,0,0,1.36-1.16,5.24,5.24,0,0,0,.82-1.73,8.23,8.23,0,0,0,0-4.2,5.23,5.23,0,0,0-.82-1.73,3.84,3.84,0,0,0-1.36-1.16,4.43,4.43,0,0,0-3.77,0,4,4,0,0,0-1.36,1.16,5.1,5.1,0,0,0-.83,1.73,8.25,8.25,0,0,0,0,4.2,5.11,5.11,0,0,0,.83,1.73,4.22,4.22,0,0,0,5.13,1.16"/><path class="cls-2" d="M128.22,16.09a1.54,1.54,0,0,1-1.6-1.64,1.61,1.61,0,1,1,3.21,0,1.56,1.56,0,0,1-1.61,1.64m0-3.1a1.34,1.34,0,0,0-1.37,1.46,1.38,1.38,0,1,0,2.75,0A1.34,1.34,0,0,0,128.22,13m.47,2.34-.54-.78H128v.75h-.31V13.48h.55c.38,0,.64.19.64.53a.49.49,0,0,1-.37.5l.52.74Zm-.48-1.56H128v.54h.23c.2,0,.33-.08.33-.27s-.11-.27-.32-.27"/></g><path class="cls-2" d="M134.39,9.93h4.27l4.51,11.7,4.41-11.7h4.22V27.07H148.6V14.13L143.5,27.07h-1l-5.2-12.95V27.07h-2.88Z"/><path class="cls-2" d="M154.45,23.59c0-2.92,2.83-4,6.42-4h1.56V19c0-1.68-.58-2.52-2.28-2.52a2.09,2.09,0,0,0-2.4,2H155c.24-2.92,2.56-4.15,5.37-4.15s5,1.15,5,4.58v8.22h-2.85V25.54a4.36,4.36,0,0,1-3.84,1.77C156.35,27.31,154.45,26.21,154.45,23.59Zm8-.91V21.44H161c-2.21,0-3.62.5-3.62,2,0,1.05.58,1.75,2,1.75C161.12,25.22,162.44,24.29,162.44,22.68Z"/><path class="cls-2" d="M168.67,14.53h2.9v2.35a4.18,4.18,0,0,1,4.08-2.54v2.71c-2.54,0-4.08.84-4.08,3.5v6.52h-2.9Z"/><path class="cls-2" d="M178.19,8.73h2.9V20l4.48-5.51h3.16l-4.87,5.75,5.27,6.78h-3.36l-4.7-6.16v6.16h-2.9Z"/><path class="cls-2" d="M189.7,20.93v-.19a6.1,6.1,0,0,1,6.23-6.47c3.12,0,5.92,1.85,5.92,6.33v.84h-9.18c.1,2.37,1.29,3.71,3.45,3.71,1.75,0,2.66-.7,2.88-1.92h2.8c-.41,2.64-2.54,4.08-5.75,4.08A6,6,0,0,1,189.7,20.93ZM199,19.5c-.14-2.16-1.25-3.12-3-3.12s-2.92,1.17-3.21,3.12Z"/><path class="cls-2" d="M204.92,23.57V16.72h-1.68V14.53h1.68V11.78h2.9v2.76h2.76v2.18h-2.76v6.59c0,1.1.53,1.61,1.44,1.61a3.58,3.58,0,0,0,1.41-.24V27a5.57,5.57,0,0,1-2,.31C206.22,27.29,204.92,25.94,204.92,23.57Z"/><path class="cls-2" d="M213.29,14.53h2.9v2a4.84,4.84,0,0,1,4.1-2.28c3.14,0,5.56,2.33,5.56,6.38v.19c0,4-2.33,6.47-5.56,6.47a4.53,4.53,0,0,1-4.1-2.21v6.26h-2.9Zm9.59,6.35v-.19c0-2.78-1.44-4.15-3.33-4.15s-3.45,1.37-3.45,4.15v.19c0,2.8,1.37,4.12,3.48,4.12S222.88,23.57,222.88,20.89Z"/><path class="cls-2" d="M228.54,8.73h2.9V27.07h-2.9Z"/><path class="cls-2" d="M234,23.59c0-2.92,2.83-4,6.42-4H242V19c0-1.68-.58-2.52-2.28-2.52a2.09,2.09,0,0,0-2.4,2h-2.8c.24-2.92,2.56-4.15,5.37-4.15s5,1.15,5,4.58v8.22h-2.85V25.54a4.36,4.36,0,0,1-3.84,1.77C235.94,27.31,234,26.21,234,23.59Zm8-.91V21.44h-1.49c-2.21,0-3.62.5-3.62,2,0,1.05.58,1.75,2,1.75C240.71,25.22,242,24.29,242,22.68Z"/><path class="cls-2" d="M247.43,21v-.19a6.18,6.18,0,0,1,6.33-6.5c2.78,0,5.39,1.25,5.73,4.7h-2.8a2.59,2.59,0,0,0-2.88-2.37c-2,0-3.4,1.53-3.4,4.12v.19c0,2.73,1.34,4.17,3.48,4.17a2.85,2.85,0,0,0,3-2.68h2.66c-.22,2.88-2.4,4.91-5.8,4.91A6,6,0,0,1,247.43,21Z"/><path class="cls-2" d="M261.21,20.93v-.19a6.1,6.1,0,0,1,6.23-6.47c3.12,0,5.92,1.85,5.92,6.33v.84h-9.18c.1,2.37,1.29,3.71,3.45,3.71,1.75,0,2.66-.7,2.88-1.92h2.8c-.41,2.64-2.54,4.08-5.75,4.08A6,6,0,0,1,261.21,20.93Zm9.28-1.44c-.14-2.16-1.25-3.12-3-3.12s-2.92,1.17-3.21,3.12Z"/></svg>
\ No newline at end of file
diff --git a/app/code/Magento/MediaStorage/App/Media.php b/app/code/Magento/MediaStorage/App/Media.php
index bff4b0d194518..e1644ebaf5a48 100644
--- a/app/code/Magento/MediaStorage/App/Media.php
+++ b/app/code/Magento/MediaStorage/App/Media.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\MediaStorage\App;
 
+use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
+use Magento\Framework\App\State;
 use Magento\Framework\Filesystem;
 use Magento\MediaStorage\Model\File\Storage\ConfigFactory;
 use Magento\MediaStorage\Model\File\Storage\Response;
@@ -14,6 +16,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\AppInterface;
 use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
+use Magento\Framework\App\Area;
+use Magento\MediaStorage\Model\File\Storage\Config;
+use Magento\MediaStorage\Service\ImageResize;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -68,6 +73,21 @@ class Media implements AppInterface
      */
     private $syncFactory;
 
+    /**
+     * @var PlaceholderFactory
+     */
+    private $placeholderFactory;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var ImageResize
+     */
+    private $imageResize;
+
     /**
      * @param ConfigFactory $configFactory
      * @param SynchronizationFactory $syncFactory
@@ -77,6 +97,10 @@ class Media implements AppInterface
      * @param string $configCacheFile
      * @param string $relativeFileName
      * @param Filesystem $filesystem
+     * @param PlaceholderFactory $placeholderFactory
+     * @param State $state
+     * @param ImageResize $imageResize
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ConfigFactory $configFactory,
@@ -86,11 +110,14 @@ public function __construct(
         $mediaDirectory,
         $configCacheFile,
         $relativeFileName,
-        Filesystem $filesystem
+        Filesystem $filesystem,
+        PlaceholderFactory $placeholderFactory,
+        State $state,
+        ImageResize $imageResize
     ) {
         $this->response = $response;
         $this->isAllowed = $isAllowed;
-        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::PUB);
         $mediaDirectory = trim($mediaDirectory);
         if (!empty($mediaDirectory)) {
             $this->mediaDirectoryPath = str_replace('\\', '/', realpath($mediaDirectory));
@@ -99,6 +126,9 @@ public function __construct(
         $this->relativeFileName = $relativeFileName;
         $this->configFactory = $configFactory;
         $this->syncFactory = $syncFactory;
+        $this->placeholderFactory = $placeholderFactory;
+        $this->appState = $state;
+        $this->imageResize = $imageResize;
     }
 
     /**
@@ -109,9 +139,11 @@ public function __construct(
      */
     public function launch()
     {
+        $this->appState->setAreaCode(Area::AREA_GLOBAL);
+
         if ($this->mediaDirectoryPath !== $this->directory->getAbsolutePath()) {
             // Path to media directory changed or absent - update the config
-            /** @var \Magento\MediaStorage\Model\File\Storage\Config $config */
+            /** @var Config $config */
             $config = $this->configFactory->create(['cacheFile' => $this->configCacheFile]);
             $config->save();
             $this->mediaDirectoryPath = $config->getMediaDirectory();
@@ -122,18 +154,40 @@ public function launch()
             }
         }
 
-        /** @var \Magento\MediaStorage\Model\File\Storage\Synchronization $sync */
-        $sync = $this->syncFactory->create(['directory' => $this->directory]);
-        $sync->synchronize($this->relativeFileName);
-
-        if ($this->directory->isReadable($this->relativeFileName)) {
-            $this->response->setFilePath($this->directory->getAbsolutePath($this->relativeFileName));
-        } else {
-            $this->response->setHttpResponseCode(404);
+        try {
+            /** @var \Magento\MediaStorage\Model\File\Storage\Synchronization $sync */
+            $sync = $this->syncFactory->create(['directory' => $this->directory]);
+            $sync->synchronize($this->relativeFileName);
+            $this->imageResize->resizeFromImageName($this->getOriginalImage($this->relativeFileName));
+            if ($this->directory->isReadable($this->relativeFileName)) {
+                $this->response->setFilePath($this->directory->getAbsolutePath($this->relativeFileName));
+            } else {
+                $this->setPlaceholderImage();
+            }
+        } catch (\Exception $e) {
+            $this->setPlaceholderImage();
         }
+
         return $this->response;
     }
 
+    private function setPlaceholderImage()
+    {
+        $placeholder = $this->placeholderFactory->create(['type' => 'image']);
+        $this->response->setFilePath($placeholder->getPath());
+    }
+
+    /**
+     * Find the path to the original image of the cache path
+     *
+     * @param string $resizedImagePath
+     * @return string
+     */
+    private function getOriginalImage(string $resizedImagePath): string
+    {
+        return preg_replace('|^.*((?:/[^/]+){3})$|', '$1', $resizedImagePath);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php b/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
new file mode 100644
index 0000000000000..a4b78287df012
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Console\Command;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Magento\MediaStorage\Service\ImageResize;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Magento\Framework\ObjectManagerInterface;
+
+class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
+{
+    /**
+     * @var ImageResize
+     */
+    private $resize;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param State $appState
+     * @param ImageResize $resize
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        State $appState,
+        ImageResize $resize,
+        ObjectManagerInterface $objectManager
+    ) {
+        parent::__construct();
+        $this->resize = $resize;
+        $this->appState = $appState;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName('catalog:images:resize')
+            ->setDescription('Creates resized product images');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            $this->appState->setAreaCode(Area::AREA_GLOBAL);
+            $generator = $this->resize->resizeFromThemes();
+
+            /** @var ProgressBar $progress */
+            $progress = $this->objectManager->create(ProgressBar::class, [
+                'output' => $output,
+                'max' => $generator->current()
+            ]);
+            $progress->setFormat(
+                "%current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s% \t| <info>%message%</info>"
+            );
+
+            if ($output->getVerbosity() !== OutputInterface::VERBOSITY_NORMAL) {
+                $progress->setOverwrite(false);
+            }
+
+            for (; $generator->valid(); $generator->next()) {
+                $progress->setMessage($generator->key());
+                $progress->advance();
+            }
+        } catch (\Exception $e) {
+            $output->writeln("<error>{$e->getMessage()}</error>");
+            // we must have an exit code higher than zero to indicate something was wrong
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        }
+
+        $output->write(PHP_EOL);
+        $output->writeln("<info>Product images resized successfully</info>");
+    }
+}
diff --git a/app/code/Magento/MediaStorage/Helper/File/Media.php b/app/code/Magento/MediaStorage/Helper/File/Media.php
index 72b99728a99cc..0bacd44bdc13f 100644
--- a/app/code/Magento/MediaStorage/Helper/File/Media.php
+++ b/app/code/Magento/MediaStorage/Helper/File/Media.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\MediaStorage\Helper\File;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -61,7 +62,9 @@ public function collectFileInfo($mediaDirectory, $path)
         $dir = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $relativePath = $dir->getRelativePath($fullPath);
         if (!$dir->isFile($relativePath)) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('File %1 does not exist', $fullPath));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('The "%1" file doesn\'t exist. Verify the file and try again.', $fullPath)
+            );
         }
         if (!$dir->isReadable($relativePath)) {
             throw new \Magento\Framework\Exception\LocalizedException(__('File %1 is not readable', $fullPath));
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/File.php b/app/code/Magento/MediaStorage/Model/File/Storage/File.php
index 149d829e2acbe..ffbc2e3e90aad 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/File.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/File.php
@@ -286,11 +286,10 @@ public function saveDir($dir)
      */
     public function saveFile($file, $overwrite = true)
     {
-        if (isset(
-            $file['filename']
-        ) && !empty($file['filename']) && isset(
-            $file['content']
-        ) && !empty($file['content'])
+        if (isset($file['filename'])
+            && !empty($file['filename'])
+            && isset($file['content'])
+            && !empty($file['content'])
         ) {
             try {
                 $filename = isset(
@@ -307,8 +306,6 @@ public function saveFile($file, $overwrite = true)
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(__('Wrong file info format'));
         }
-
-        return false;
     }
 
     /**
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
index 216068c9fc32a..1125dfd81ad84 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
@@ -56,7 +56,11 @@ public function __construct(
     public function sendResponse()
     {
         if ($this->_filePath && $this->getHttpResponseCode() == 200) {
-            $this->_transferAdapter->send($this->_filePath);
+            $options = [
+                'filepath' => $this->_filePath,
+                'headers' => $this->getHeaders(),
+            ];
+            $this->_transferAdapter->send($options);
         } else {
             parent::sendResponse();
         }
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
index d744afb0fad9f..09f269e0ebddf 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
@@ -7,7 +7,9 @@
 
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWrite;
-use Magento\Framework\Filesystem\File\Write;
+use Magento\Framework\Filesystem\File\WriteInterface;
+use Magento\MediaStorage\Service\ImageResize;
+use Magento\MediaStorage\Model\File\Storage\Database;
 
 /**
  * Class Synchronization
@@ -17,7 +19,7 @@ class Synchronization
     /**
      * Database storage factory
      *
-     * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
+     * @var DatabaseFactory
      */
     protected $storageFactory;
 
@@ -29,11 +31,11 @@ class Synchronization
     protected $mediaDirectory;
 
     /**
-     * @param \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageFactory
+     * @param DatabaseFactory $storageFactory
      * @param DirectoryWrite $directory
      */
     public function __construct(
-        \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageFactory,
+        DatabaseFactory $storageFactory,
         DirectoryWrite $directory
     ) {
         $this->storageFactory = $storageFactory;
@@ -49,14 +51,14 @@ public function __construct(
      */
     public function synchronize($relativeFileName)
     {
-        /** @var $storage \Magento\MediaStorage\Model\File\Storage\Database */
+        /** @var $storage Database */
         $storage = $this->storageFactory->create();
         try {
             $storage->loadByFilename($relativeFileName);
         } catch (\Exception $e) {
         }
         if ($storage->getId()) {
-            /** @var \Magento\Framework\Filesystem\File\WriteInterface $file */
+            /** @var WriteInterface $file */
             $file = $this->mediaDirectory->openFile($relativeFileName, 'w');
             try {
                 $file->lock();
diff --git a/app/code/Magento/MediaStorage/Service/ImageResize.php b/app/code/Magento/MediaStorage/Service/ImageResize.php
new file mode 100644
index 0000000000000..6e3929296e252
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Service/ImageResize.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Service;
+
+use Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
+use Magento\Catalog\Model\View\Asset\ImageFactory as AssertImageFactory;
+use Magento\Framework\App\Area;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Image;
+use Magento\Framework\Image\Factory as ImageFactory;
+use Magento\Catalog\Model\Product\Media\ConfigInterface as MediaConfig;
+use Magento\Framework\App\State;
+use Magento\Framework\View\ConfigInterface as ViewConfig;
+use \Magento\Catalog\Model\ResourceModel\Product\Image as ProductImage;
+use Magento\Theme\Model\Config\Customization as ThemeCustomizationConfig;
+use Magento\Theme\Model\ResourceModel\Theme\Collection;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ImageResize
+{
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var MediaConfig
+     */
+    private $imageConfig;
+
+    /**
+     * @var ProductImage
+     */
+    private $productImage;
+
+    /**
+     * @var ImageFactory
+     */
+    private $imageFactory;
+
+    /**
+     * @var ParamsBuilder
+     */
+    private $paramsBuilder;
+
+    /**
+     * @var ViewConfig
+     */
+    private $viewConfig;
+
+    /**
+     * @var AssertImageFactory
+     */
+    private $assertImageFactory;
+
+    /**
+     * @var ThemeCustomizationConfig
+     */
+    private $themeCustomizationConfig;
+
+    /**
+     * @var Collection
+     */
+    private $themeCollection;
+
+    /**
+     * @var Filesystem
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param State $appState
+     * @param MediaConfig $imageConfig
+     * @param ProductImage $productImage
+     * @param ImageFactory $imageFactory
+     * @param ParamsBuilder $paramsBuilder
+     * @param ViewConfig $viewConfig
+     * @param AssertImageFactory $assertImageFactory
+     * @param ThemeCustomizationConfig $themeCustomizationConfig
+     * @param Collection $themeCollection
+     * @param Filesystem $filesystem
+     * @internal param ProductImage $gallery
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        State $appState,
+        MediaConfig $imageConfig,
+        ProductImage $productImage,
+        ImageFactory $imageFactory,
+        ParamsBuilder $paramsBuilder,
+        ViewConfig $viewConfig,
+        AssertImageFactory $assertImageFactory,
+        ThemeCustomizationConfig $themeCustomizationConfig,
+        Collection $themeCollection,
+        Filesystem $filesystem
+    ) {
+        $this->appState = $appState;
+        $this->imageConfig = $imageConfig;
+        $this->productImage = $productImage;
+        $this->imageFactory = $imageFactory;
+        $this->paramsBuilder = $paramsBuilder;
+        $this->viewConfig = $viewConfig;
+        $this->assertImageFactory = $assertImageFactory;
+        $this->themeCustomizationConfig = $themeCustomizationConfig;
+        $this->themeCollection = $themeCollection;
+        $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Create resized images of different sizes from an original image
+     * @param string $originalImageName
+     * @throws NotFoundException
+     */
+    public function resizeFromImageName(string $originalImageName)
+    {
+        $originalImagePath = $this->mediaDirectory->getAbsolutePath(
+            $this->imageConfig->getMediaPath($originalImageName)
+        );
+        if (!$this->mediaDirectory->isFile($originalImagePath)) {
+            throw new NotFoundException(__('Cannot resize image "%1" - original image not found', $originalImagePath));
+        }
+        foreach ($this->getViewImages($this->getThemesInUse()) as $viewImage) {
+            $this->resize($viewImage, $originalImagePath, $originalImageName);
+        }
+    }
+
+    /**
+     * Create resized images of different sizes from themes
+     * @param array|null $themes
+     * @return \Generator
+     * @throws NotFoundException
+     */
+    public function resizeFromThemes(array $themes = null): \Generator
+    {
+        $count = $this->productImage->getCountAllProductImages();
+        if (!$count) {
+            throw new NotFoundException(__('Cannot resize images - product images not found'));
+        }
+
+        $productImages = $this->productImage->getAllProductImages();
+        $viewImages = $this->getViewImages($themes ?? $this->getThemesInUse());
+
+        foreach ($productImages as $image) {
+            $originalImageName = $image['filepath'];
+            $originalImagePath = $this->mediaDirectory->getAbsolutePath(
+                $this->imageConfig->getMediaPath($originalImageName)
+            );
+            foreach ($viewImages as $viewImage) {
+                $this->resize($viewImage, $originalImagePath, $originalImageName);
+            }
+            yield $originalImageName => $count;
+        }
+    }
+
+    /**
+     * Search the current theme
+     * @return array
+     */
+    private function getThemesInUse(): array
+    {
+        $themesInUse = [];
+        $registeredThemes = $this->themeCollection->loadRegisteredThemes();
+        $storesByThemes = $this->themeCustomizationConfig->getStoresByThemes();
+        $keyType = is_integer(key($storesByThemes)) ? 'getId' : 'getCode';
+        foreach ($registeredThemes as $registeredTheme) {
+            if (array_key_exists($registeredTheme->$keyType(), $storesByThemes)) {
+                $themesInUse[] = $registeredTheme;
+            }
+        }
+        return $themesInUse;
+    }
+
+    /**
+     * Get view images data from themes
+     * @param array $themes
+     * @return array
+     */
+    private function getViewImages(array $themes): array
+    {
+        $viewImages = [];
+        /** @var \Magento\Theme\Model\Theme $theme */
+        foreach ($themes as $theme) {
+            $config = $this->viewConfig->getViewConfig([
+                'area' => Area::AREA_FRONTEND,
+                'themeModel' => $theme,
+            ]);
+            $images = $config->getMediaEntities('Magento_Catalog', ImageHelper::MEDIA_TYPE_CONFIG_NODE);
+            foreach ($images as $imageId => $imageData) {
+                $uniqIndex = $this->getUniqueImageIndex($imageData);
+                $imageData['id'] = $imageId;
+                $viewImages[$uniqIndex] = $imageData;
+            }
+        }
+        return $viewImages;
+    }
+
+    /**
+     * Get unique image index
+     * @param array $imageData
+     * @return string
+     */
+    private function getUniqueImageIndex(array $imageData): string
+    {
+        ksort($imageData);
+        unset($imageData['type']);
+        return md5(json_encode($imageData));
+    }
+
+    /**
+     * Make image
+     * @param string $originalImagePath
+     * @param array $imageParams
+     * @return Image
+     */
+    private function makeImage(string $originalImagePath, array $imageParams): Image
+    {
+        $image = $this->imageFactory->create($originalImagePath);
+        $image->keepAspectRatio($imageParams['keep_aspect_ratio']);
+        $image->keepFrame($imageParams['keep_frame']);
+        $image->keepTransparency($imageParams['keep_transparency']);
+        $image->constrainOnly($imageParams['constrain_only']);
+        $image->backgroundColor($imageParams['background']);
+        $image->quality($imageParams['quality']);
+        return $image;
+    }
+
+    /**
+     * Resize image
+     * @param array $viewImage
+     * @param string $originalImagePath
+     * @param string $originalImageName
+     */
+    private function resize(array $viewImage, string $originalImagePath, string $originalImageName)
+    {
+        $imageParams = $this->paramsBuilder->build($viewImage);
+        $image = $this->makeImage($originalImagePath, $imageParams);
+        $imageAsset = $this->assertImageFactory->create(
+            [
+                'miscParams' => $imageParams,
+                'filePath' => $originalImageName,
+            ]
+        );
+
+        if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
+            $image->resize($imageParams['image_width'], $imageParams['image_height']);
+        }
+        $image->save($imageAsset->getPath());
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE.txt b/app/code/Magento/MediaStorage/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE.txt
rename to app/code/Magento/MediaStorage/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE_AFL.txt b/app/code/Magento/MediaStorage/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE_AFL.txt
rename to app/code/Magento/MediaStorage/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/MediaStorage/Test/Mftf/README.md b/app/code/Magento/MediaStorage/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f4a5cd473414a
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Media Storage Functional Tests
+
+The Functional Test Module for **Magento Media Storage** module.
diff --git a/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php b/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
index 46becd82343e9..90075d11c6af3 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
@@ -5,7 +5,10 @@
  */
 namespace Magento\MediaStorage\Test\Unit\App;
 
+use Magento\Catalog\Model\View\Asset\Placeholder;
+use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class MediaTest
@@ -91,20 +94,30 @@ protected function setUp()
 
         $this->filesystemMock->expects($this->any())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::MEDIA)
+            ->with(DirectoryList::PUB)
             ->will($this->returnValue($this->directoryMock));
 
         $this->responseMock = $this->createMock(\Magento\MediaStorage\Model\File\Storage\Response::class);
 
-        $this->model = new \Magento\MediaStorage\App\Media(
-            $this->configFactoryMock,
-            $this->syncFactoryMock,
-            $this->responseMock,
-            $this->closure,
-            self::MEDIA_DIRECTORY,
-            self::CACHE_FILE_PATH,
-            self::RELATIVE_FILE_PATH,
-            $this->filesystemMock
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            \Magento\MediaStorage\App\Media::class,
+            [
+                'configFactory' => $this->configFactoryMock,
+                'syncFactory' => $this->syncFactoryMock,
+                'response' => $this->responseMock,
+                'isAllowed' => $this->closure,
+                'mediaDirectory' => false,
+                'configCacheFile' => self::CACHE_FILE_PATH,
+                'relativeFileName' => self::RELATIVE_FILE_PATH,
+                'filesystem' => $this->filesystemMock,
+                'placeholderFactory' => $this->createConfiguredMock(
+                    PlaceholderFactory::class,
+                    [
+                        'create' => $this->createMock(Placeholder::class)
+                    ]
+                ),
+            ]
         );
     }
 
@@ -115,15 +128,19 @@ protected function tearDown()
 
     public function testProcessRequestCreatesConfigFileMediaDirectoryIsNotProvided()
     {
-        $this->model = new \Magento\MediaStorage\App\Media(
-            $this->configFactoryMock,
-            $this->syncFactoryMock,
-            $this->responseMock,
-            $this->closure,
-            false,
-            self::CACHE_FILE_PATH,
-            self::RELATIVE_FILE_PATH,
-            $this->filesystemMock
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            \Magento\MediaStorage\App\Media::class,
+            [
+                'configFactory' => $this->configFactoryMock,
+                'syncFactory' => $this->syncFactoryMock,
+                'response' => $this->responseMock,
+                'isAllowed' => $this->closure,
+                'mediaDirectory' => false,
+                'configCacheFile' => self::CACHE_FILE_PATH,
+                'relativeFileName' => self::RELATIVE_FILE_PATH,
+                'filesystem' => $this->filesystemMock
+            ]
         );
         $filePath = '/absolute/path/to/test/file.png';
         $this->directoryMock->expects($this->any())
@@ -144,33 +161,6 @@ public function testProcessRequestCreatesConfigFileMediaDirectoryIsNotProvided()
         $this->model->launch();
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage The specified path is not allowed.
-     */
-    public function testProcessRequestReturnsNotFoundResponseIfResourceIsNotAllowed()
-    {
-        $this->closure = function () {
-            return false;
-        };
-        $this->model = new \Magento\MediaStorage\App\Media(
-            $this->configFactoryMock,
-            $this->syncFactoryMock,
-            $this->responseMock,
-            $this->closure,
-            false,
-            self::CACHE_FILE_PATH,
-            self::RELATIVE_FILE_PATH,
-            $this->filesystemMock
-        );
-        $this->directoryMock->expects($this->once())
-            ->method('getAbsolutePath')
-            ->with()
-            ->will($this->returnValue(self::MEDIA_DIRECTORY));
-        $this->configMock->expects($this->once())->method('getAllowedResources')->will($this->returnValue(false));
-        $this->model->launch();
-    }
-
     public function testProcessRequestReturnsFileIfItsProperlySynchronized()
     {
         $filePath = '/absolute/path/to/test/file.png';
@@ -202,7 +192,6 @@ public function testProcessRequestReturnsNotFoundIfFileIsNotSynchronized()
             ->method('isReadable')
             ->with(self::RELATIVE_FILE_PATH)
             ->will($this->returnValue(false));
-        $this->responseMock->expects($this->once())->method('setHttpResponseCode')->with(404);
         $this->assertSame($this->responseMock, $this->model->launch());
     }
 
@@ -229,6 +218,9 @@ public function testCatchException($isDeveloper, $setBodyCalls)
         $this->model->catchException($bootstrap, $exception);
     }
 
+    /**
+     * @return array
+     */
     public function catchExceptionDataProvider()
     {
         return [
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/MediaTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/MediaTest.php
index 0c50b6e130484..d29d49eadb64b 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/MediaTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/MediaTest.php
@@ -87,6 +87,9 @@ public function testCollectFileInfo($path, $expectedDir, $expectedFile)
         $this->assertEquals($expected, $this->helper->collectFileInfo($mediaDirectory, $path));
     }
 
+    /**
+     * @return array
+     */
     public function pathDataProvider()
     {
         return [
@@ -97,7 +100,7 @@ public function pathDataProvider()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage File mediaDir/path does not exist
+     * @expectedExceptionMessage The "mediaDir/path" file doesn't exist. Verify the file and try again.
      */
     public function testCollectFileInfoNotFile()
     {
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
index 6ff2397f543fa..56f57a9d32c1f 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
@@ -75,6 +75,9 @@ public function testCheckDbUsage($storage, $expected)
         $this->assertEquals($expected, $this->helper->checkDbUsage());
     }
 
+    /**
+     * @return array
+     */
     public function checkDbUsageDataProvider()
     {
         return [
@@ -144,6 +147,9 @@ public function testSaveFile($storage, $callNum)
         $this->helper->saveFile('media-dir/filename');
     }
 
+    /**
+     * @return array
+     */
     public function updateFileDataProvider()
     {
         return [
@@ -226,6 +232,9 @@ public function testFileExists($storage, $callNum, $expected)
         $this->assertEquals($expected, $this->helper->fileExists('media-dir/file'));
     }
 
+    /**
+     * @return array
+     */
     public function fileExistsDataProvider()
     {
         return [
@@ -264,6 +273,9 @@ public function testGetUniqueFilename($storage, $callNum, $expected)
         $this->assertSame($expected, $this->helper->getUniqueFilename('media-dir/directory/', 'filename.ext'));
     }
 
+    /**
+     * @return array
+     */
     public function getUniqueFilenameDataProvider()
     {
         return [
@@ -308,6 +320,9 @@ public function testSaveFileToFileSystem($expected, $storage, $callNum, $id = 0,
         $this->assertEquals($expected, $this->helper->saveFileToFilesystem('media-dir/filename'));
     }
 
+    /**
+     * @return array
+     */
     public function saveFileToFileSystemDataProvider()
     {
         return [
@@ -430,6 +445,9 @@ public function testSaveUploadedFile($result, $expected, $expectedFullPath, $sto
         $this->assertEquals($expected, $this->helper->saveUploadedFile($result));
     }
 
+    /**
+     * @return array
+     */
     public function saveUploadedFileDataProvider()
     {
         return [
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php
index 8725bf1f0f02f..d1ae631a351c3 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php
@@ -77,6 +77,9 @@ public function testIsInternalStorage($storage, $callNum, $expected)
         $this->assertEquals($expected, $this->helper->isInternalStorage($storage));
     }
 
+    /**
+     * @return array
+     */
     public function isInternalStorageDataProvider()
     {
         return [
@@ -146,6 +149,9 @@ public function testProcessStorageFile($expected, $storage, $callNum, $callSaveF
         $this->assertEquals($expected, $this->helper->processStorageFile($filename));
     }
 
+    /**
+     * @return array
+     */
     public function processStorageFileDataProvider()
     {
         return [
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php
new file mode 100644
index 0000000000000..cdeb47d2b8490
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Test\Unit\Model\File\Storage;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/** Unit tests for \Magento\MediaStorage\Model\File\Storage\Response class */
+class ResponseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\MediaStorage\Model\File\Storage\Response
+     */
+    private $response;
+
+    /**
+     * @var \Magento\Framework\File\Transfer\Adapter\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $transferAdapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->transferAdapter = $this->getMockBuilder(\Magento\Framework\File\Transfer\Adapter\Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['send'])
+            ->getMock();
+        $this->response = $objectManager->getObject(
+            \Magento\MediaStorage\Model\File\Storage\Response::class,
+            [
+                'transferAdapter' => $this->transferAdapter,
+                'statusCode' => 200,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendResponse(): void
+    {
+        $filePath = 'file_path';
+        $headers = $this->getMockBuilder(\Zend\Http\Headers::class)->getMock();
+        $this->response->setFilePath($filePath);
+        $this->response->setHeaders($headers);
+        $this->transferAdapter
+            ->expects($this->atLeastOnce())
+            ->method('send')
+            ->with(
+                [
+                    'filepath' => $filePath,
+                    'headers' => $headers,
+                ]
+            );
+
+        $this->response->sendResponse();
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendResponseWithoutFilePath(): void
+    {
+        $this->transferAdapter->expects($this->never())->method('send');
+        $this->response->sendResponse();
+    }
+}
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php
index f58a11540dc8b..f3ebf57546950 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\MediaStorage\Test\Unit\Model\File\Storage;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class SynchronizationTest extends \PHPUnit\Framework\TestCase
 {
     public function testSynchronize()
@@ -40,7 +42,11 @@ public function testSynchronize()
             ->with($relativeFileName)
             ->will($this->returnValue($file));
 
-        $model = new \Magento\MediaStorage\Model\File\Storage\Synchronization($storageFactoryMock, $directory);
+        $objectManager = new ObjectManager($this);
+        $model = $objectManager->getObject(\Magento\MediaStorage\Model\File\Storage\Synchronization::class, [
+            'storageFactory' => $storageFactoryMock,
+            'directory' => $directory,
+        ]);
         $model->synchronize($relativeFileName);
     }
 }
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index 085719974ddea..7d27c88b3dcb2 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -5,14 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
index 09b6b23744053..d7244a5d4fd01 100644
--- a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
+++ b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="system" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="system" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="media_storage_configuration" translate="label" type="text" sortOrder="900" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Storage Configuration for Media</label>
                 <field id="media_storage" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
diff --git a/app/code/Magento/MediaStorage/etc/di.xml b/app/code/Magento/MediaStorage/etc/di.xml
index 8f491f5b84644..2b9317787463d 100644
--- a/app/code/Magento/MediaStorage/etc/di.xml
+++ b/app/code/Magento/MediaStorage/etc/di.xml
@@ -19,4 +19,11 @@
     <type name="Magento\Framework\View\Asset\MergeService">
         <plugin name="cleanMergedJsCss" type="Magento\MediaStorage\Model\Asset\Plugin\CleanMergedJsCss"/>
     </type>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="imagesResizeCommand" xsi:type="object">Magento\MediaStorage\Console\Command\ImagesResizeCommand</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/MediaStorage/etc/module.xml b/app/code/Magento/MediaStorage/etc/module.xml
index 84a749721f50f..df4acf8904fbc 100644
--- a/app/code/Magento/MediaStorage/etc/module.xml
+++ b/app/code/Magento/MediaStorage/etc/module.xml
@@ -6,5 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_MediaStorage" setup_version="2.0.0"/>
+    <module name="Magento_MediaStorage" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Theme"/>
+        </sequence>
+    </module>
 </config>
diff --git a/app/code/Magento/MessageQueue/Console/ConsumerListCommand.php b/app/code/Magento/MessageQueue/Console/ConsumerListCommand.php
new file mode 100644
index 0000000000000..9248d50ee78de
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Console/ConsumerListCommand.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Console;
+
+use Symfony\Component\Console\Command\Command;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+
+/**
+ * Command for starting MessageQueue consumers.
+ */
+class ConsumerListCommand extends Command
+{
+    const COMMAND_QUEUE_CONSUMERS_LIST = 'queue:consumers:list';
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     * @param string|null $name
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(QueueConfig $queueConfig, $name = null)
+    {
+        parent::__construct($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $consumers = $this->getConsumers();
+        $output->writeln($consumers);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_QUEUE_CONSUMERS_LIST);
+        $this->setDescription('List of MessageQueue consumers');
+        $this->setHelp(
+            <<<HELP
+This command shows list of MessageQueue consumers.
+HELP
+        );
+        parent::configure();
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getConsumers()
+    {
+        $consumerNames = [];
+        foreach ($this->getConsumerConfig()->getConsumers() as $consumer) {
+            $consumerNames[] = $consumer->getName();
+        }
+        return $consumerNames;
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
new file mode 100644
index 0000000000000..571b725e7335c
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Console;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\MessageQueue\ConsumerFactory;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+
+/**
+ * Command for starting MessageQueue consumers.
+ */
+class StartConsumerCommand extends Command
+{
+    const ARGUMENT_CONSUMER = 'consumer';
+    const OPTION_NUMBER_OF_MESSAGES = 'max-messages';
+    const OPTION_BATCH_SIZE = 'batch-size';
+    const OPTION_AREACODE = 'area-code';
+    const PID_FILE_PATH = 'pid-file-path';
+    const COMMAND_QUEUE_CONSUMERS_START = 'queue:consumers:start';
+
+    /**
+     * @var ConsumerFactory
+     */
+    private $consumerFactory;
+
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $appState;
+
+    /**
+     * @var PidConsumerManager
+     */
+    private $pidConsumerManager;
+
+    /**
+     * StartConsumerCommand constructor.
+     * {@inheritdoc}
+     *
+     * @param \Magento\Framework\App\State $appState
+     * @param ConsumerFactory $consumerFactory
+     * @param string $name
+     * @param PidConsumerManager $pidConsumerManager
+     */
+    public function __construct(
+        \Magento\Framework\App\State $appState,
+        ConsumerFactory $consumerFactory,
+        $name = null,
+        PidConsumerManager $pidConsumerManager = null
+    ) {
+        $this->appState = $appState;
+        $this->consumerFactory = $consumerFactory;
+        $this->pidConsumerManager = $pidConsumerManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(PidConsumerManager::class);
+        parent::__construct($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $consumerName = $input->getArgument(self::ARGUMENT_CONSUMER);
+        $numberOfMessages = $input->getOption(self::OPTION_NUMBER_OF_MESSAGES);
+        $batchSize = (int)$input->getOption(self::OPTION_BATCH_SIZE);
+        $areaCode = $input->getOption(self::OPTION_AREACODE);
+        $pidFilePath = $input->getOption(self::PID_FILE_PATH);
+
+        if ($pidFilePath && $this->pidConsumerManager->isRun($pidFilePath)) {
+            $output->writeln('<error>Consumer with the same PID is running</error>');
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        }
+
+        if ($pidFilePath) {
+            $this->pidConsumerManager->savePid($pidFilePath);
+        }
+
+        if ($areaCode !== null) {
+            $this->appState->setAreaCode($areaCode);
+        } else {
+            $this->appState->setAreaCode('global');
+        }
+
+        $consumer = $this->consumerFactory->get($consumerName, $batchSize);
+        $consumer->process($numberOfMessages);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_QUEUE_CONSUMERS_START);
+        $this->setDescription('Start MessageQueue consumer');
+        $this->addArgument(
+            self::ARGUMENT_CONSUMER,
+            InputArgument::REQUIRED,
+            'The name of the consumer to be started.'
+        );
+        $this->addOption(
+            self::OPTION_NUMBER_OF_MESSAGES,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The number of messages to be processed by the consumer before process termination. '
+            . 'If not specified - terminate after processing all queued messages.'
+        );
+        $this->addOption(
+            self::OPTION_BATCH_SIZE,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The number of messages per batch. Applicable for the batch consumer only.'
+        );
+        $this->addOption(
+            self::OPTION_AREACODE,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The preferred area (global, adminhtml, etc...) '
+            . 'default is global.'
+        );
+        $this->addOption(
+            self::PID_FILE_PATH,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The file path for saving PID'
+        );
+        $this->setHelp(
+            <<<HELP
+This command starts MessageQueue consumer by its name.
+
+To start consumer which will process all queued messages and terminate execution:
+
+    <comment>%command.full_name% someConsumer</comment>
+
+To specify the number of messages which should be processed by consumer before its termination:
+
+    <comment>%command.full_name% someConsumer --max-messages=50</comment>
+
+To specify the number of messages per batch for the batch consumer:
+
+    <comment>%command.full_name% someConsumer --batch-size=500</comment>
+
+To specify the preferred area:
+
+    <comment>%command.full_name% someConsumer --area-code='adminhtml'</comment>
+
+To save PID enter path:
+
+    <comment>%command.full_name% someConsumer --pid-file-path='/var/someConsumer.pid'</comment>
+HELP
+        );
+        parent::configure();
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE.txt b/app/code/Magento/MessageQueue/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE.txt
rename to app/code/Magento/MessageQueue/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE_AFL.txt b/app/code/Magento/MessageQueue/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE_AFL.txt
rename to app/code/Magento/MessageQueue/LICENSE_AFL.txt
diff --git a/app/code/Magento/MessageQueue/Model/ConsumerRunner.php b/app/code/Magento/MessageQueue/Model/ConsumerRunner.php
new file mode 100644
index 0000000000000..92a0dcd4d77d9
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/ConsumerRunner.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model;
+
+use Magento\Framework\MessageQueue\ConsumerFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Consumer runner class is used to run consumer, which name matches the magic method invoked on this class.
+ *
+ * Is used to schedule consumers execution in crontab.xml as follows:
+ * <code>
+ * <job name="consumerConsumerName" instance="Magento\MessageQueue\Model\ConsumerRunner" method="consumerName">
+ * </code>
+ * Where <i>consumerName</i> should be a valid name of consumer registered in some queue.xml
+ *
+ * @api
+ * @since 100.0.2
+ */
+class ConsumerRunner
+{
+    /**
+     * @var ConsumerFactory
+     */
+    private $consumerFactory;
+
+    /**
+     * @var MaintenanceMode
+     */
+    private $maintenanceMode;
+
+    /**
+     * @var integer
+     */
+    private $maintenanceSleepInterval;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConsumerFactory $consumerFactory
+     * @param MaintenanceMode $maintenanceMode
+     * @param integer $maintenanceSleepInterval
+     */
+    public function __construct(
+        ConsumerFactory $consumerFactory,
+        MaintenanceMode $maintenanceMode = null,
+        $maintenanceSleepInterval = 30
+    ) {
+        $this->consumerFactory = $consumerFactory;
+        $this->maintenanceMode = $maintenanceMode ?: ObjectManager::getInstance()->get(MaintenanceMode::class);
+        $this->maintenanceSleepInterval = $maintenanceSleepInterval;
+    }
+
+    /**
+     * Process messages in queue using consumer, which name is equal to the current magic method name.
+     *
+     * @param string $name
+     * @param array $arguments
+     * @throws LocalizedException
+     * @return void
+     */
+    public function __call($name, $arguments)
+    {
+        try {
+            $consumer = $this->consumerFactory->get($name);
+        } catch (\Exception $e) {
+            $errorMsg = '"%callbackMethod" callback method specified in crontab.xml '
+                . 'must have corresponding consumer declared in some queue.xml.';
+            throw new LocalizedException(__($errorMsg, ['callbackMethod' => $name]));
+        }
+        if (!$this->maintenanceMode->isOn()) {
+            $consumer->process();
+        } else {
+            sleep($this->maintenanceSleepInterval);
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
new file mode 100644
index 0000000000000..f5011248d7772
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\MessageQueue\ConnectionTypeResolver;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+use Magento\Framework\ShellInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+
+/**
+ * Class for running consumers processes by cron
+ */
+class ConsumersRunner
+{
+    /**
+     * Extension of PID file
+     */
+    const PID_FILE_EXT = '.pid';
+
+    /**
+     * Shell command line wrapper for executing command in background
+     *
+     * @var ShellInterface
+     */
+    private $shellBackground;
+
+    /**
+     * Consumer config provider
+     *
+     * @var ConsumerConfigInterface
+     */
+    private $consumerConfig;
+
+    /**
+     * Application deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * The executable finder specifically designed for the PHP executable
+     *
+     * @var PhpExecutableFinder
+     */
+    private $phpExecutableFinder;
+
+    /**
+     * The class for checking status of process by PID
+     *
+     * @var PidConsumerManager
+     */
+    private $pidConsumerManager;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $mqConnectionTypeResolver;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param PhpExecutableFinder $phpExecutableFinder The executable finder specifically designed
+     *        for the PHP executable
+     * @param ConsumerConfigInterface $consumerConfig The consumer config provider
+     * @param DeploymentConfig $deploymentConfig The application deployment configuration
+     * @param ShellInterface $shellBackground The shell command line wrapper for executing command in background
+     * @param PidConsumerManager $pidConsumerManager The class for checking status of process by PID
+     * @param ConnectionTypeResolver $mqConnectionTypeResolver Consumer connection resolver
+     * @param LoggerInterface $logger Logger
+     */
+    public function __construct(
+        PhpExecutableFinder $phpExecutableFinder,
+        ConsumerConfigInterface $consumerConfig,
+        DeploymentConfig $deploymentConfig,
+        ShellInterface $shellBackground,
+        PidConsumerManager $pidConsumerManager,
+        ConnectionTypeResolver $mqConnectionTypeResolver = null,
+        LoggerInterface $logger = null
+    ) {
+        $this->phpExecutableFinder = $phpExecutableFinder;
+        $this->consumerConfig = $consumerConfig;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->shellBackground = $shellBackground;
+        $this->pidConsumerManager = $pidConsumerManager;
+        $this->mqConnectionTypeResolver = $mqConnectionTypeResolver
+            ?: ObjectManager::getInstance()->get(ConnectionTypeResolver::class);
+        $this->logger = $logger
+            ?: ObjectManager::getInstance()->get(LoggerInterface::class);
+    }
+
+    /**
+     * Runs consumers processes
+     */
+    public function run()
+    {
+        $runByCron = $this->deploymentConfig->get('cron_consumers_runner/cron_run', true);
+
+        if (!$runByCron) {
+            return;
+        }
+
+        $maxMessages = (int) $this->deploymentConfig->get('cron_consumers_runner/max_messages', 10000);
+        $allowedConsumers = $this->deploymentConfig->get('cron_consumers_runner/consumers', []);
+        $php = $this->phpExecutableFinder->find() ?: 'php';
+
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            if (!$this->canBeRun($consumer, $allowedConsumers)) {
+                continue;
+            }
+
+            $consumerName = $consumer->getName();
+
+            $arguments = [
+                $consumerName,
+                '--pid-file-path=' . $this->getPidFilePath($consumerName),
+            ];
+
+            if ($maxMessages) {
+                $arguments[] = '--max-messages=' . $maxMessages;
+            }
+
+            $command = $php . ' ' . BP . '/bin/magento queue:consumers:start %s %s'
+                . ($maxMessages ? ' %s' : '');
+
+            $this->shellBackground->execute($command, $arguments);
+        }
+    }
+
+    /**
+     * Checks that the consumer can be run
+     *
+     * @param ConsumerConfigItemInterface $consumerConfig The consumer config
+     * @param array $allowedConsumers The list of allowed consumers
+     *        If $allowedConsumers is empty it means that all consumers are allowed
+     * @return bool Returns true if the consumer can be run
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    private function canBeRun(ConsumerConfigItemInterface $consumerConfig, array $allowedConsumers = []): bool
+    {
+        $consumerName = $consumerConfig->getName();
+        if (!empty($allowedConsumers) && !in_array($consumerName, $allowedConsumers)) {
+            return false;
+        }
+
+        if ($this->pidConsumerManager->isRun($this->getPidFilePath($consumerName))) {
+            return false;
+        }
+
+        $connectionName = $consumerConfig->getConnection();
+        try {
+            $this->mqConnectionTypeResolver->getConnectionType($connectionName);
+        } catch (\LogicException $e) {
+            $this->logger->info(sprintf(
+                'Consumer "%s" skipped as required connection "%s" is not configured. %s',
+                $consumerName,
+                $connectionName,
+                $e->getMessage()
+            ));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns default path to file with PID by consumers name
+     *
+     * @param string $consumerName The consumers name
+     * @return string The path to file with PID
+     */
+    private function getPidFilePath($consumerName)
+    {
+        $sanitizedHostname = preg_replace('/[^a-z0-9]/i', '', gethostname());
+
+        return $consumerName . '-' . $sanitizedHostname . static::PID_FILE_EXT;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner/PidConsumerManager.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner/PidConsumerManager.php
new file mode 100644
index 0000000000000..d5f827320ac74
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner/PidConsumerManager.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron\ConsumersRunner;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Exception\FileSystemException;
+
+/**
+ * The class for checking status of process by PID
+ */
+class PidConsumerManager
+{
+    /**
+     * Extension of PID file
+     * @deprecated Moved to the correct responsibility area
+     * @see \Magento\MessageQueue\Model\Cron\ConsumersRunner::PID_FILE_EXT
+     */
+    const PID_FILE_EXT = '.pid';
+
+    /**
+     * The class for working with FS
+     *
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param Filesystem $filesystem The class for working with FS
+     */
+    public function __construct(Filesystem $filesystem)
+    {
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Checks if consumer process is run by pid from pidFile
+     *
+     * @param string $pidFilePath The path to file with PID
+     * @return bool Returns true if consumer process is run
+     * @throws FileSystemException
+     */
+    public function isRun($pidFilePath)
+    {
+        $pid = $this->getPid($pidFilePath);
+        if ($pid) {
+            if (function_exists('posix_getpgid')) {
+                return (bool) posix_getpgid($pid);
+            } else {
+                return $this->checkIsProcessExists($pid);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks that process is running
+     *
+     * If php function exec is not available throws RuntimeException
+     * If shell command returns non-zero code and this code is not 1 throws RuntimeException
+     *
+     * @param int $pid A pid of process
+     * @return bool Returns true if consumer process is run
+     * @throws \RuntimeException
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function checkIsProcessExists($pid)
+    {
+        if (!function_exists('exec')) {
+            throw new \RuntimeException('Function exec is not available');
+        }
+
+        exec(escapeshellcmd('ps -p ' . $pid), $output, $code);
+
+        $code = (int) $code;
+
+        switch ($code) {
+            case 0:
+                return true;
+                break;
+            case 1:
+                return false;
+                break;
+            default:
+                throw new \RuntimeException('Exec returned non-zero code', $code);
+                break;
+        }
+    }
+
+    /**
+     * Returns pid by pidFile path
+     *
+     * @param string $pidFilePath The path to file with PID
+     * @return int Returns pid if pid file exists for consumer else returns 0
+     * @throws FileSystemException
+     */
+    public function getPid($pidFilePath)
+    {
+        /** @var ReadInterface $directory */
+        $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
+
+        if ($directory->isExist($pidFilePath)) {
+            return (int) $directory->readFile($pidFilePath);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Saves pid of current process to file
+     *
+     * @param string $pidFilePath The path to file with pid
+     * @throws FileSystemException
+     */
+    public function savePid($pidFilePath)
+    {
+        /** @var WriteInterface $directory */
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $directory->writeFile($pidFilePath, function_exists('posix_getpid') ? posix_getpid() : getmypid(), 'w');
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Lock.php b/app/code/Magento/MessageQueue/Model/Lock.php
new file mode 100644
index 0000000000000..e63a04fd1b023
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Lock.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model;
+
+/**
+ * Class Lock to handle message lock transactions.
+ */
+class Lock extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * Class constructor
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MessageQueue\Model\ResourceModel\Lock::class);
+    }
+
+    /**
+     * Get message code
+     *
+     * @return string
+     */
+    public function getMessageCode()
+    {
+        return $this->_getData('message_code');
+    }
+
+    /**
+     * Set message code
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setMessageCode($value)
+    {
+        return $this->setData('message_code', $value);
+    }
+
+    /**
+     * Get lock date
+     *
+     * @return string
+     */
+    public function getCreatedAt()
+    {
+        return $this->_getData('created_at');
+    }
+
+    /**
+     * Set lock date
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setCreatedAt($value)
+    {
+        return $this->setData('created_at', $value);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Plugin/ResourceModel/Lock.php b/app/code/Magento/MessageQueue/Model/Plugin/ResourceModel/Lock.php
new file mode 100644
index 0000000000000..30f275520febb
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Plugin/ResourceModel/Lock.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Model\Plugin\ResourceModel;
+
+/**
+ * Lock plugin to clear queue upon maintenance mode turning off.
+ */
+class Lock
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\WriterInterface
+     */
+    private $lock;
+
+    /**
+     * Lock constructor.
+     *
+     * @param \Magento\Framework\MessageQueue\Lock\WriterInterface $lock
+     */
+    public function __construct(\Magento\Framework\MessageQueue\Lock\WriterInterface $lock)
+    {
+        $this->lock = $lock;
+    }
+
+    /**
+     * When maintenance mode is turned off, lock queue should be cleared
+     *
+     * @param \Magento\Framework\App\MaintenanceMode $subject
+     * @param boolean $result
+     * @return void
+     */
+    public function afterSet(\Magento\Framework\App\MaintenanceMode $subject, $result)
+    {
+        if (!$subject->isOn() && $result) {
+            $this->lock->releaseOutdatedLocks();
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/Lock.php b/app/code/Magento/MessageQueue/Model/ResourceModel/Lock.php
new file mode 100644
index 0000000000000..16c02a7505664
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/Lock.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\ResourceModel;
+
+use \Magento\Framework\MessageQueue\Lock\ReaderInterface;
+use \Magento\Framework\MessageQueue\Lock\WriterInterface;
+
+/**
+ * Class Lock to handle database lock table db transactions.
+ */
+class Lock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements ReaderInterface, WriterInterface
+{
+    /**#@+
+     * Constants
+     */
+    const QUEUE_LOCK_TABLE = 'queue_lock';
+    /**#@-*/
+
+    /**#@-*/
+    private $dateTime;
+
+    /**
+     * @var \Magento\MessageQueue\Model\LockFactory
+     */
+    private $lockFactory;
+
+    /**
+     * @var integer
+     */
+    private $interval;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Magento\MessageQueue\Model\LockFactory $lockFactory
+     * @param null $connectionName
+     * @param integer $interval
+     */
+    public function __construct(
+        \Magento\Framework\Model\ResourceModel\Db\Context $context,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Magento\MessageQueue\Model\LockFactory $lockFactory,
+        $connectionName = null,
+        $interval = 86400
+    ) {
+        $this->lockFactory = $lockFactory;
+        $this->interval = $interval;
+        $this->dateTime = $dateTime;
+        parent::__construct($context, $connectionName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(self::QUEUE_LOCK_TABLE, 'id');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function read(\Magento\Framework\MessageQueue\LockInterface $lock, $code)
+    {
+        $object = $this->lockFactory->create();
+        $object->load($code, 'message_code');
+        $lock->setId($object->getId());
+        $lock->setMessageCode($object->getMessageCode() ?: $code);
+        $lock->setCreatedAt($object->getCreatedAt());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function saveLock(\Magento\Framework\MessageQueue\LockInterface $lock)
+    {
+        $object = $this->lockFactory->create();
+        $object->setMessageCode($lock->getMessageCode());
+        $object->setCreatedAt($this->dateTime->gmtTimestamp());
+        $object->save();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function releaseOutdatedLocks()
+    {
+        $date = (new \DateTime())->setTimestamp($this->dateTime->gmtTimestamp());
+        $date->add(new \DateInterval('PT' . $this->interval . 'S'));
+        $this->getConnection()->delete($this->getTable(self::QUEUE_LOCK_TABLE), ['created_at <= ?' => $date]);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/README.md b/app/code/Magento/MessageQueue/README.md
new file mode 100644
index 0000000000000..78bb794473529
--- /dev/null
+++ b/app/code/Magento/MessageQueue/README.md
@@ -0,0 +1,3 @@
+# MessageQueue
+
+**MessageQueue** provides support of Advanced Message Queuing Protocol
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE.txt b/app/code/Magento/MessageQueue/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE.txt
rename to app/code/Magento/MessageQueue/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE_AFL.txt b/app/code/Magento/MessageQueue/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE_AFL.txt
rename to app/code/Magento/MessageQueue/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/README.md b/app/code/Magento/MessageQueue/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9f6fb3cb1caa5
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Message Queue Functional Tests
+
+The Functional Test Module for **Magento Message Queue** module.
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
new file mode 100644
index 0000000000000..922da3bfc8773
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Test\Unit\Console;
+
+use Magento\MessageQueue\Console\StartConsumerCommand;
+use Magento\Framework\Filesystem\File\WriteFactory;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+
+/**
+ * Unit tests for StartConsumerCommand.
+ */
+class StartConsumerCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerFactory;
+
+    /**
+     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appState;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var WriteFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $writeFactoryMock;
+
+    /**
+     * @var PidConsumerManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pidConsumerManagerMock;
+
+    /**
+     * @var StartConsumerCommand
+     */
+    private $command;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->pidConsumerManagerMock = $this->getMockBuilder(PidConsumerManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consumerFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerFactory::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->writeFactoryMock = $this->getMockBuilder(WriteFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->command = $this->objectManager->getObject(
+            \Magento\MessageQueue\Console\StartConsumerCommand::class,
+            [
+                'consumerFactory' => $this->consumerFactory,
+                'appState' => $this->appState,
+                'writeFactory' => $this->writeFactoryMock,
+                'pidConsumerManager' => $this->pidConsumerManagerMock,
+            ]
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Test for execute method.
+     *
+     * @param string|null $pidFilePath
+     * @param int $savePidExpects
+     * @param int $isRunExpects
+     * @param bool $isRun
+     * @param int $runProcessExpects
+     * @param int $expectedReturn
+     * @return void
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute(
+        $pidFilePath,
+        $savePidExpects,
+        $isRunExpects,
+        $isRun,
+        $runProcessExpects,
+        $expectedReturn
+    ) {
+        $areaCode = 'area_code';
+        $numberOfMessages = 10;
+        $batchSize = null;
+        $consumerName = 'consumer_name';
+        $input = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $output = $this->getMockBuilder(\Symfony\Component\Console\Output\OutputInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $input->expects($this->once())->method('getArgument')
+            ->with(\Magento\MessageQueue\Console\StartConsumerCommand::ARGUMENT_CONSUMER)
+            ->willReturn($consumerName);
+        $input->expects($this->exactly(4))->method('getOption')
+            ->withConsecutive(
+                [\Magento\MessageQueue\Console\StartConsumerCommand::OPTION_NUMBER_OF_MESSAGES],
+                [\Magento\MessageQueue\Console\StartConsumerCommand::OPTION_BATCH_SIZE],
+                [\Magento\MessageQueue\Console\StartConsumerCommand::OPTION_AREACODE],
+                [\Magento\MessageQueue\Console\StartConsumerCommand::PID_FILE_PATH]
+            )->willReturnOnConsecutiveCalls(
+                $numberOfMessages,
+                $batchSize,
+                $areaCode,
+                $pidFilePath
+            );
+        $this->appState->expects($this->exactly($runProcessExpects))->method('setAreaCode')->with($areaCode);
+        $consumer = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->consumerFactory->expects($this->exactly($runProcessExpects))
+            ->method('get')->with($consumerName, $batchSize)->willReturn($consumer);
+        $consumer->expects($this->exactly($runProcessExpects))->method('process')->with($numberOfMessages);
+
+        $this->pidConsumerManagerMock->expects($this->exactly($isRunExpects))
+            ->method('isRun')
+            ->with($pidFilePath)
+            ->willReturn($isRun);
+
+        $this->pidConsumerManagerMock->expects($this->exactly($savePidExpects))
+            ->method('savePid')
+            ->with($pidFilePath);
+
+        $this->assertEquals(
+            $expectedReturn,
+            $this->command->run($input, $output)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                'pidFilePath' => null,
+                'savePidExpects' => 0,
+                'isRunExpects' => 0,
+                'isRun' => false,
+                'runProcessExpects' => 1,
+                'expectedReturn' => \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            ],
+            [
+                'pidFilePath' => '/var/consumer.pid',
+                'savePidExpects' => 1,
+                'isRunExpects' => 1,
+                'isRun' => false,
+                'runProcessExpects' => 1,
+                'expectedReturn' => \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            ],
+            [
+                'pidFilePath' => '/var/consumer.pid',
+                'savePidExpects' => 0,
+                'isRunExpects' => 1,
+                'isRun' => true,
+                'runProcessExpects' => 0,
+                'expectedReturn' => \Magento\Framework\Console\Cli::RETURN_FAILURE,
+            ],
+        ];
+    }
+
+    /**
+     * Test configure() method implicitly via construct invocation.
+     *
+     * @return void
+     */
+    public function testConfigure()
+    {
+        $this->assertEquals(StartConsumerCommand::COMMAND_QUEUE_CONSUMERS_START, $this->command->getName());
+        $this->assertEquals('Start MessageQueue consumer', $this->command->getDescription());
+        /** Exception will be thrown if argument is not declared */
+        $this->command->getDefinition()->getArgument(StartConsumerCommand::ARGUMENT_CONSUMER);
+        $this->command->getDefinition()->getOption(StartConsumerCommand::OPTION_NUMBER_OF_MESSAGES);
+        $this->command->getDefinition()->getOption(StartConsumerCommand::OPTION_AREACODE);
+        $this->command->getDefinition()->getOption(StartConsumerCommand::PID_FILE_PATH);
+        $this->assertContains('To start consumer which will process', $this->command->getHelp());
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/ConsumerRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/ConsumerRunnerTest.php
new file mode 100644
index 0000000000000..46a142bf488be
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/ConsumerRunnerTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Test\Unit\Model;
+
+use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\MessageQueue\Model\ConsumerRunner;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Unit tests for consumer runner
+ */
+class ConsumerRunnerTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
+    /**
+     * @var ConsumerRunner
+     */
+    private $consumerRunner;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $maintenanceModeMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->consumerFactoryMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->maintenanceModeMock = $this->getMockBuilder(\Magento\Framework\App\MaintenanceMode::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consumerRunner = $this->objectManager->getObject(
+            \Magento\MessageQueue\Model\ConsumerRunner::class,
+            [
+                'consumerFactory' => $this->consumerFactoryMock,
+                'maintenanceMode' => $this->maintenanceModeMock
+            ]
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Ensure that consumer, with name equal to invoked magic method name, is run.
+     *
+     * @return void
+     */
+    public function testMagicMethod()
+    {
+        $isMaintenanceModeOn = false;
+        /** @var ConsumerInterface|\PHPUnit_Framework_MockObject_MockObject $consumerMock */
+        $consumerMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)->getMock();
+        $consumerMock->expects($this->once())->method('process');
+        $consumerName = 'someConsumerName';
+        $this->consumerFactoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($consumerName)
+            ->willReturn($consumerMock);
+        $this->maintenanceModeMock->expects($this->once())->method('isOn')->willReturn($isMaintenanceModeOn);
+
+        $this->consumerRunner->$consumerName();
+    }
+
+    /**
+     * Ensure that exception will be thrown if requested magic method does not correspond to any declared consumer.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage "nonDeclaredConsumer" callback method specified in crontab.xml must
+     * @return void
+     */
+    public function testMagicMethodNoRelatedConsumer()
+    {
+        $consumerName = 'nonDeclaredConsumer';
+        $this->consumerFactoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($consumerName)
+            ->willThrowException(new LocalizedException(new Phrase("Some exception")));
+
+        $this->consumerRunner->$consumerName();
+    }
+
+    /**
+     * Ensure that process method will not be invoked if maintenance mode isOn returns true
+     *
+     * @return void
+     */
+    public function testMagicMethodMaintenanceModeIsOn()
+    {
+        $isMaintenanceModeOn = true;
+        /** @var ConsumerInterface|\PHPUnit_Framework_MockObject_MockObject $consumerMock */
+        $consumerMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)->getMock();
+        $consumerMock->expects($this->never())->method('process');
+        $consumerName = 'someConsumerName';
+        $this->consumerFactoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($consumerName)
+            ->willReturn($consumerMock);
+        $this->maintenanceModeMock->expects($this->once())->method('isOn')->willReturn($isMaintenanceModeOn);
+
+        $this->consumerRunner->$consumerName();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunner/PidConsumerManagerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunner/PidConsumerManagerTest.php
new file mode 100644
index 0000000000000..3d48e0b19ef2c
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunner/PidConsumerManagerTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Test\Unit\Model\Cron\ConsumersRunner;
+
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class PidConsumerManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Filesystem|MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var PidConsumerManager
+     */
+    private $pidConsumerManager;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        require_once __DIR__ . '/../../../_files/pid_consumer_functions_mocks.php';
+
+        $this->filesystemMock = $this->getMockBuilder(Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pidConsumerManager = new PidConsumerManager($this->filesystemMock);
+    }
+
+    /**
+     * @param bool $fileExists
+     * @param int|null $pid
+     * @param bool $expectedResult
+     * @dataProvider isRunDataProvider
+     */
+    public function testIsRun($fileExists, $pid, $expectedResult)
+    {
+        $pidFilePath = 'somepath/consumerName.pid';
+
+        /** @var ReadInterface|MockObject $directoryMock */
+        $directoryMock = $this->getMockBuilder(ReadInterface::class)
+            ->getMockForAbstractClass();
+        $directoryMock->expects($this->once())
+            ->method('isExist')
+            ->willReturn($fileExists);
+        $directoryMock->expects($this->any())
+            ->method('readFile')
+            ->with($pidFilePath)
+            ->willReturn($pid);
+
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::VAR_DIR)
+            ->willReturn($directoryMock);
+
+        $this->assertSame($expectedResult, $this->pidConsumerManager->isRun($pidFilePath));
+    }
+
+    /**
+     * @return array
+     */
+    public function isRunDataProvider()
+    {
+        return [
+            ['fileExists' => false, 'pid' => null, false],
+            ['fileExists' => false, 'pid' => 11111, false],
+            ['fileExists' => true, 'pid' => 11111, true],
+            ['fileExists' => true, 'pid' => 77777, false],
+        ];
+    }
+
+    public function testSavePid()
+    {
+        $pidFilePath = '/var/somePath/pidfile.pid';
+
+        /** @var WriteInterface|MockObject $writeMock */
+        $writeMock = $this->getMockBuilder(WriteInterface::class)
+            ->getMockForAbstractClass();
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::VAR_DIR)
+            ->willReturn($writeMock);
+        $writeMock->expects($this->once())
+            ->method('writeFile')
+            ->with(
+                $pidFilePath,
+                function_exists('posix_getpid') ? posix_getpid() : getmypid(),
+                'w'
+            );
+
+        $this->pidConsumerManager->savePid($pidFilePath);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
new file mode 100644
index 0000000000000..006354b997d3a
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Test\Unit\Model\Cron;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolver;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\ShellInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+use Symfony\Component\Process\PhpExecutableFinder;
+
+class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PidConsumerManager|MockObject
+     */
+    private $pidConsumerManagerMock;
+
+    /**
+     * @var ShellInterface|MockObject
+     */
+    private $shellBackgroundMock;
+
+    /**
+     * @var ConsumerConfigInterface|MockObject
+     */
+    private $consumerConfigMock;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var PhpExecutableFinder|MockObject
+     */
+    private $phpExecutableFinderMock;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResover;
+
+    /**
+     * @var ConsumersRunner
+     */
+    private $consumersRunner;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        require_once __DIR__ . '/../../_files/consumers_runner_functions_mocks.php';
+
+        $this->phpExecutableFinderMock = $this->getMockBuilder(phpExecutableFinder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->pidConsumerManagerMock = $this->getMockBuilder(PidConsumerManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shellBackgroundMock = $this->getMockBuilder(ShellInterface::class)
+            ->getMockForAbstractClass();
+        $this->consumerConfigMock = $this->getMockBuilder(ConsumerConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionTypeResover = $this->getMockBuilder(ConnectionTypeResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionTypeResover->method('getConnectionType')->willReturn('something');
+
+        $this->consumersRunner = new ConsumersRunner(
+            $this->phpExecutableFinderMock,
+            $this->consumerConfigMock,
+            $this->deploymentConfigMock,
+            $this->shellBackgroundMock,
+            $this->pidConsumerManagerMock,
+            $this->connectionTypeResover
+        );
+    }
+
+    public function testRunDisabled()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->willReturnMap([
+                ['cron_consumers_runner/cron_run', true, false],
+                ['cron_consumers_runner/max_messages', 10000, 10000],
+                ['cron_consumers_runner/consumers', [], []],
+            ]);
+
+        $this->consumerConfigMock->expects($this->never())
+            ->method('getConsumers');
+        $this->pidConsumerManagerMock->expects($this->never())
+            ->method('isRun');
+        $this->shellBackgroundMock->expects($this->never())
+            ->method('execute');
+
+        $this->consumersRunner->run();
+    }
+
+    /**
+     * @param int $maxMessages
+     * @param bool $isRun
+     * @param string $php
+     * @param string $command
+     * @param array $arguments
+     * @param array $allowedConsumers
+     * @param int $shellBackgroundExpects
+     * @param int $isRunExpects
+     * @dataProvider runDataProvider
+     */
+    public function testRun(
+        $maxMessages,
+        $isRun,
+        $php,
+        $command,
+        $arguments,
+        array $allowedConsumers,
+        $shellBackgroundExpects,
+        $isRunExpects
+    ) {
+        $consumerName = 'consumerName';
+        $pidFilePath = 'consumerName-myHostName.pid';
+
+        $this->deploymentConfigMock->expects($this->exactly(3))
+            ->method('get')
+            ->willReturnMap([
+                ['cron_consumers_runner/cron_run', true, true],
+                ['cron_consumers_runner/max_messages', 10000, $maxMessages],
+                ['cron_consumers_runner/consumers', [], $allowedConsumers],
+            ]);
+
+        /** @var ConsumerConfigInterface|MockObject $firstCunsumer */
+        $consumer = $this->getMockBuilder(ConsumerConfigItemInterface::class)
+            ->getMockForAbstractClass();
+        $consumer->expects($this->any())
+            ->method('getName')
+            ->willReturn($consumerName);
+
+        $this->phpExecutableFinderMock->expects($this->once())
+            ->method('find')
+            ->willReturn($php);
+
+        $this->consumerConfigMock->expects($this->once())
+            ->method('getConsumers')
+            ->willReturn([$consumer]);
+
+        $this->pidConsumerManagerMock->expects($this->exactly($isRunExpects))
+            ->method('isRun')
+            ->with($pidFilePath)
+            ->willReturn($isRun);
+
+        $this->shellBackgroundMock->expects($this->exactly($shellBackgroundExpects))
+            ->method('execute')
+            ->with($command, $arguments);
+
+        $this->consumersRunner->run();
+    }
+
+    /**
+     * @return array
+     */
+    public function runDataProvider()
+    {
+        return [
+            [
+                'maxMessages' => 20000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=20000'],
+                'allowedConsumers' => [],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=10000'],
+                'allowedConsumers' => [],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['someConsumer'],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 0,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => true,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['someConsumer'],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 0,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => true,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=10000'],
+                'allowedConsumers' => [],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => true,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['consumerName'],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['consumerName'],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 0,
+                'isRun' => false,
+                'php' => '/bin/php',
+                'command' => '/bin/php '. BP . '/bin/magento queue:consumers:start %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName-myHostName.pid'],
+                'allowedConsumers' => ['consumerName'],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/ResourceModel/LockTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/ResourceModel/LockTest.php
new file mode 100644
index 0000000000000..547b54b895bee
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/ResourceModel/LockTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MessageQueue\Model\LockFactory;
+use Magento\MessageQueue\Model\ResourceModel\Lock as LockResourceModel;
+
+/**
+ * Unit tests for lock resource model
+ */
+class LockTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var ObjectManager */
+    private $objectManager;
+
+    /**
+     * @var LockResourceModel
+     */
+    private $lockResourceModel;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var LockFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockFactoryMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->dateTimeMock = $this->getMockBuilder(DateTime::class)->disableOriginalConstructor()->getMock();
+        $this->lockFactoryMock = $this->getMockBuilder(LockFactory::class)->disableOriginalConstructor()->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->lockResourceModel = $this->objectManager->getObject(
+            LockResourceModel::class,
+            [
+                'resources' => $this->resourceConnectionMock,
+                'dateTime' => $this->dateTimeMock,
+                'lockFactory' => $this->lockFactoryMock,
+            ]
+        );
+        parent::setUp();
+    }
+
+    public function testReleaseOutdatedLocks()
+    {
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $adapterMock */
+        $adapterMock = $this->getMockBuilder(AdapterInterface::class)->disableOriginalConstructor()->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $tableName = 'queue_lock_mock';
+        $this->resourceConnectionMock->expects($this->once())->method('getTableName')->willReturn($tableName);
+        $this->dateTimeMock->expects($this->once())->method('gmtTimestamp')->willReturn(1000000000);
+        /** Date for timestamp 1000000000 + 86400 */
+        $date = new \DateTime('2001-09-09T18:46:40-0700');
+
+        $adapterMock->expects($this->once())->method('delete')->with($tableName, ['created_at <= ?' => $date]);
+        $this->lockResourceModel->releaseOutdatedLocks();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/_files/consumers_runner_functions_mocks.php b/app/code/Magento/MessageQueue/Test/Unit/_files/consumers_runner_functions_mocks.php
new file mode 100644
index 0000000000000..788a8464a0ce4
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/_files/consumers_runner_functions_mocks.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model\Cron;
+
+/**
+ * @return string
+ */
+function gethostname()
+{
+    return 'myHost@Name';
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/_files/pid_consumer_functions_mocks.php b/app/code/Magento/MessageQueue/Test/Unit/_files/pid_consumer_functions_mocks.php
new file mode 100644
index 0000000000000..33cd2757e4f5a
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/_files/pid_consumer_functions_mocks.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron\ConsumersRunner;
+
+/**
+ * @param $pid
+ * @return bool|int
+ */
+function posix_getpgid($pid)
+{
+    if ($pid === 11111) {
+        return 22222;
+    }
+
+    return false;
+}
+
+/**
+ * @param $command
+ * @param array|null $output
+ * @param null $return_var
+ */
+function exec($command, array &$output = null, &$return_var = null)
+{
+    $output = ['PID TTY TIME CMD'];
+    $return_var = 1;
+
+    if ($command === 'ps -p 11111') {
+        $output[] = ['11111 ?? 25:49.42 /php'];
+        $return_var = 0;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
new file mode 100644
index 0000000000000..9d3c77fa0184a
--- /dev/null
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-message-queue",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "magento/magento-composer-installer": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MessageQueue\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/etc/cron_groups.xml b/app/code/Magento/MessageQueue/etc/cron_groups.xml
new file mode 100644
index 0000000000000..c3f234687281f
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/cron_groups.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/cron_groups.xsd">
+    <group id="consumers">
+        <schedule_generate_every>15</schedule_generate_every>
+        <schedule_ahead_for>20</schedule_ahead_for>
+        <schedule_lifetime>15</schedule_lifetime>
+        <history_cleanup_every>10</history_cleanup_every>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>600</history_failure_lifetime>
+        <use_separate_process>1</use_separate_process>
+    </group>
+</config>
diff --git a/app/code/Magento/MessageQueue/etc/crontab.xml b/app/code/Magento/MessageQueue/etc/crontab.xml
new file mode 100644
index 0000000000000..14c831a9c76e3
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/crontab.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright © Magento, Inc. All rights reserved.
+  ~ See COPYING.txt for license details.
+  -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="messagequeue_clean_outdated_locks" instance="Magento\Framework\MessageQueue\Lock\WriterInterface" method="releaseOutdatedLocks">
+            <schedule>0 * * * *</schedule>
+        </job>
+    </group>
+    <group id="consumers">
+        <job name="consumers_runner" instance="Magento\MessageQueue\Model\Cron\ConsumersRunner" method="run">
+            <schedule>* * * * *</schedule>
+        </job>
+    </group>
+</config>
diff --git a/app/code/Magento/MessageQueue/etc/db_schema.xml b/app/code/Magento/MessageQueue/etc/db_schema.xml
new file mode 100644
index 0000000000000..7a20d2bd4df5d
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/db_schema.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="queue_lock" resource="default" engine="innodb"
+           comment="Messages that were processed are inserted here to be locked.">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Message ID"/>
+        <column xsi:type="varchar" name="message_code" nullable="false" length="255" default="" comment="Message Code"/>
+        <column xsi:type="timestamp" name="created_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="QUEUE_LOCK_MESSAGE_CODE">
+            <column name="message_code"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..f31981d2ec40f
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
@@ -0,0 +1,13 @@
+{
+    "queue_lock": {
+        "column": {
+            "id": true,
+            "message_code": true,
+            "created_at": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUEUE_LOCK_MESSAGE_CODE": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
new file mode 100644
index 0000000000000..c8f2edb862613
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\MessageQueue\ConfigInterface" type="Magento\Framework\MessageQueue\Config\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" />
+    <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
+    <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
+    <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="startConsumerCommand" xsi:type="object">Magento\MessageQueue\Console\StartConsumerCommand\Proxy</item>
+                <item name="consumerListCommand" xsi:type="object">Magento\MessageQueue\Console\ConsumerListCommand\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\MessageProcessorLoader">
+        <arguments>
+            <argument name="mergedMessageProcessor" xsi:type="object">Magento\Framework\MessageQueue\MergedMessageProcessor</argument>
+            <argument name="defaultMessageProcessor" xsi:type="object">Magento\Framework\MessageQueue\MessageProcessor</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\MaintenanceMode">
+        <plugin name="amqp_maintenance_mode" type="Magento\MessageQueue\Model\Plugin\ResourceModel\Lock"/>
+    </type>
+    <virtualType name="RefreshLock" type="Magento\MessageQueue\Model\ResourceModel\Lock">
+        <arguments>
+            <argument name="interval" xsi:type="number">0</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\MessageQueue\Model\Plugin\ResourceModel\Lock">
+        <arguments>
+            <argument name="lock" xsi:type="object">RefreshLock</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MessageQueue\Model\Cron\ConsumersRunner">
+        <arguments>
+            <argument name="shellBackground" xsi:type="object">shellBackground</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MessageQueue/etc/module.xml b/app/code/Magento/MessageQueue/etc/module.xml
new file mode 100644
index 0000000000000..0bb5f9d40da5a
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_MessageQueue" />
+</config>
diff --git a/app/code/Magento/MessageQueue/registration.php b/app/code/Magento/MessageQueue/registration.php
new file mode 100644
index 0000000000000..e27fa71517427
--- /dev/null
+++ b/app/code/Magento/MessageQueue/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MessageQueue', __DIR__);
diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
index 2ee9f41870a5a..3662a2cef8d20 100644
--- a/app/code/Magento/Msrp/Model/Config.php
+++ b/app/code/Magento/Msrp/Model/Config.php
@@ -10,6 +10,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Escaper;
 
+/**
+ * Class Config
+ */
 class Config
 {
     /**#@+
@@ -40,6 +43,8 @@ class Config
     protected $storeId;
 
     /**
+     * Config constructor.
+     *
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreManagerInterface $storeManager
      * @param Escaper $escaper
@@ -74,7 +79,7 @@ public function setStoreId($store)
      */
     public function isEnabled()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_MSRP_ENABLED,
             ScopeInterface::SCOPE_STORE,
             $this->storeId
diff --git a/app/code/Magento/Msrp/Setup/InstallData.php b/app/code/Magento/Msrp/Setup/InstallData.php
deleted file mode 100644
index 02bcc9d465f9a..0000000000000
--- a/app/code/Magento/Msrp/Setup/InstallData.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Msrp\Setup;
-
-use Magento\Eav\Setup\EavSetup;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-
-        $productTypes = [
-            \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE,
-            \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL,
-            \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE,
-            \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE,
-        ];
-        $productTypes = join(',', $productTypes);
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'msrp',
-            [
-                'group' => 'Advanced Pricing',
-                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Price::class,
-                'frontend' => '',
-                'label' => 'Manufacturer\'s Suggested Retail Price',
-                'type' => 'decimal',
-                'input' => 'price',
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
-                'visible' => true,
-                'required' => false,
-                'user_defined' => false,
-                'apply_to' => $productTypes,
-                'input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type::class,
-                'frontend_input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type::class,
-                'visible_on_front' => false,
-                'used_in_product_listing' => true,
-                'is_used_in_grid' => true,
-                'is_visible_in_grid' => false,
-                'is_filterable_in_grid' => true,
-            ]
-        );
-
-        $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'msrp_display_actual_price_type',
-            [
-                'group' => 'Advanced Pricing',
-                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Boolean::class,
-                'frontend' => '',
-                'label' => 'Display Actual Price',
-                'input' => 'select',
-                'source' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::class,
-                'source_model' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::class,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
-                'visible' => true,
-                'required' => false,
-                'user_defined' => false,
-                'default' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::TYPE_USE_CONFIG,
-                'default_value' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::TYPE_USE_CONFIG,
-                'apply_to' => $productTypes,
-                'input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type\Price::class,
-                'frontend_input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type\Price::class,
-                'visible_on_front' => false,
-                'used_in_product_listing' => true
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php b/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
new file mode 100644
index 0000000000000..085c617a9dc86
--- /dev/null
+++ b/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Msrp\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class ChangePriceAttributeDefaultScope implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create();
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $this->changePriceAttributeDefaultScope($categorySetup, $entityTypeId);
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeMsrpAttributes::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.1.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Change default scope for price attribute.
+     *
+     * @param \Magento\Catalog\Setup\CategorySetup $categorySetup
+     * @param int $entityTypeId
+     */
+    private function changePriceAttributeDefaultScope($categorySetup, $entityTypeId)
+    {
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'msrp');
+        $categorySetup->updateAttribute(
+            $entityTypeId,
+            $attribute['attribute_id'],
+            'is_global',
+            \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
+        );
+    }
+}
diff --git a/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php b/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php
new file mode 100644
index 0000000000000..5dc461860cd70
--- /dev/null
+++ b/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Msrp\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Setup\InstallDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class InitializeMsrpAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        $productTypes = [
+            \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE,
+            \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL,
+            \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE,
+            \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE,
+        ];
+        $productTypes = join(',', $productTypes);
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'msrp',
+            [
+                'group' => 'Advanced Pricing',
+                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Price::class,
+                'frontend' => '',
+                'label' => 'Manufacturer\'s Suggested Retail Price',
+                'type' => 'decimal',
+                'input' => 'price',
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                'visible' => true,
+                'required' => false,
+                'user_defined' => false,
+                'apply_to' => $productTypes,
+                'input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type::class,
+                'frontend_input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type::class,
+                'visible_on_front' => false,
+                'used_in_product_listing' => true,
+                'is_used_in_grid' => true,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => true,
+            ]
+        );
+        $eavSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'msrp_display_actual_price_type',
+            [
+                'group' => 'Advanced Pricing',
+                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\Boolean::class,
+                'frontend' => '',
+                'label' => 'Display Actual Price',
+                'input' => 'select',
+                'source' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::class,
+                'source_model' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::class,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                'visible' => true,
+                'required' => false,
+                'user_defined' => false,
+                'default' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::TYPE_USE_CONFIG,
+                'default_value' => \Magento\Msrp\Model\Product\Attribute\Source\Type\Price::TYPE_USE_CONFIG,
+                'apply_to' => $productTypes,
+                'input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type\Price::class,
+                'frontend_input_renderer' => \Magento\Msrp\Block\Adminhtml\Product\Helper\Form\Type\Price::class,
+                'visible_on_front' => false,
+                'used_in_product_listing' => true
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Msrp/Setup/UpgradeData.php b/app/code/Magento/Msrp/Setup/UpgradeData.php
deleted file mode 100644
index 326cefb364f44..0000000000000
--- a/app/code/Magento/Msrp/Setup/UpgradeData.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Msrp\Setup;
-
-use Magento\Catalog\Setup\CategorySetupFactory;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var CategorySetupFactory
-     */
-    private $categorySetupFactory;
-
-    /**
-     * @param CategorySetupFactory $categorySetupFactory
-     */
-    public function __construct(
-        CategorySetupFactory $categorySetupFactory
-    ) {
-        $this->categorySetupFactory = $categorySetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
-        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
-        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
-
-        if (version_compare($context->getVersion(), '2.1.3', '<')) {
-            $this->changePriceAttributeDefaultScope($categorySetup, $entityTypeId);
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * @param \Magento\Catalog\Setup\CategorySetup $categorySetup
-     * @param int $entityTypeId
-     * @return void
-     */
-    private function changePriceAttributeDefaultScope($categorySetup, $entityTypeId)
-    {
-        $attribute = $categorySetup->getAttribute($entityTypeId, 'msrp');
-        $categorySetup->updateAttribute(
-            $entityTypeId,
-            $attribute['attribute_id'],
-            'is_global',
-            \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
-        );
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE.txt b/app/code/Magento/Msrp/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE.txt
rename to app/code/Magento/Msrp/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE_AFL.txt b/app/code/Magento/Msrp/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE_AFL.txt
rename to app/code/Magento/Msrp/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Msrp/Test/Mftf/README.md b/app/code/Magento/Msrp/Test/Mftf/README.md
new file mode 100644
index 0000000000000..731a425ac7450
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Msrp Functional Tests
+
+The Functional Test Module for **Magento Msrp** module.
diff --git a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
index b096fe760ffbc..adf2a5b4a0e9e 100644
--- a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
@@ -50,6 +50,9 @@ class MsrpPriceTest extends \PHPUnit\Framework\TestCase
      */
     private $priceInfoExtensionFactory;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->priceCurrencyMock = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
@@ -86,6 +89,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testCollect()
     {
         $product = $this->getMockBuilder(Product::class)
@@ -97,11 +103,11 @@ public function testCollect()
         $productRenderInfoDto->expects($this->once())
             ->method('getPriceInfo')
             ->willReturn($productPriceInfo);
-        $extensionAttirbutes = $this->getMockBuilder(
+        $extensionAttributes = $this->getMockBuilder(
             \Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface::class
         )
             ->setMethods(['setMsrp'])
-            ->getMock();
+            ->getMockForAbstractClass();
 
         $priceInfo = $this->getMockBuilder(MsrpPriceInfoInterface::class)
             ->setMethods(['getPrice', 'getExtensionAttributes'])
@@ -113,14 +119,14 @@ public function testCollect()
         $this->adjustmentCalculator->expects($this->once())
             ->method('getAmount')
             ->willReturn($amountInterface);
-        $extensionAttirbutes->expects($this->once())
+        $extensionAttributes->expects($this->once())
             ->method('setMsrp');
         $this->msrpPriceInfoFactory->expects($this->once())
             ->method('create')
             ->willReturn($priceInfo);
         $this->priceInfoExtensionFactory->expects($this->once())
             ->method('create')
-            ->willReturn($extensionAttirbutes);
+            ->willReturn($extensionAttributes);
         $price = $this->getMockBuilder(\Magento\Msrp\Pricing\Price\MsrpPrice::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 7d7059ecd5e9b..6e7bf61063a2a 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -5,21 +5,20 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-downloadable": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-grouped-product": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*"
     },
     "suggest": {
-        "magento/module-bundle": "100.3.*",
-        "magento/module-msrp-sample-data": "Sample Data version:100.3.*"
+        "magento/module-bundle": "*",
+        "magento/module-msrp-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Msrp/etc/module.xml b/app/code/Magento/Msrp/etc/module.xml
index 8d6c0e61a44f0..e0d98fbb28c20 100644
--- a/app/code/Magento/Msrp/etc/module.xml
+++ b/app/code/Magento/Msrp/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Msrp" setup_version="2.1.3">
+    <module name="Magento_Msrp" >
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
new file mode 100644
index 0000000000000..b60bc71e9e70d
--- /dev/null
+++ b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
@@ -0,0 +1,11 @@
+<?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" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="msrp_popup"/>
+    <body/>
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 869d81563645a..dd5abd433073d 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -72,6 +72,8 @@ if ($product->isSaleable()) {
         } else {
             $data['addToCart']['addToCartButton'] = sprintf(
                 'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
+                (int) $productId) . ',' .
+                sprintf('.block.widget .price-box[data-product-id=%s]+.product-item-actions button.tocart',
                 (int) $productId
             );
         }
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
index 7ccd606b8f113..e0b3dd77dedcb 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -30,12 +30,11 @@
                         <span id="map-popup-price" class="actual-price"></span>
                     </div>
                 </div>
-                <form action="" method="POST" id="product_addtocart_form_from_popup" class="map-form-addtocart">
-                    <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
+                <form action="" method="POST" class="map-form-addtocart">
+                    <input type="hidden" name="product" class="product_id" value="" />
                     <button type="button"
                             title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
-                            class="action tocart primary"
-                            id="map-popup-button">
+                            class="action tocart primary">
                         <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                     </button>
                     <div class="additional-addtocart-box">
diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
index 0de66ccd505a4..d3c17a8d7c8de 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * Mustishipping checkout base abstract block
+ * Multishipping checkout base abstract block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index c62226dc8d063..5963e62e948f9 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -120,11 +120,7 @@ public function getPaymentHtml()
      */
     public function getPayment()
     {
-        if (!$this->hasData('payment')) {
-            $payment = new \Magento\Framework\DataObject($this->getRequest()->getPost('payment'));
-            $this->setData('payment', $payment);
-        }
-        return $this->_getData('payment');
+        return $this->getCheckout()->getQuote()->getPayment();
     }
 
     /**
@@ -200,9 +196,9 @@ public function formatPrice($price)
 
     /**
      * @param Address $address
-     * @return mixed
+     * @return array
      */
-    public function getShippingAddressItems($address)
+    public function getShippingAddressItems($address): array
     {
         return $address->getAllVisibleItems();
     }
@@ -309,16 +305,7 @@ public function getVirtualProductEditUrl()
      */
     public function getVirtualItems()
     {
-        $items = [];
-        foreach ($this->getBillingAddress()->getItemsCollection() as $_item) {
-            if ($_item->isDeleted()) {
-                continue;
-            }
-            if ($_item->getProduct()->getIsVirtual() && !$_item->getParentItemId()) {
-                $items[] = $_item;
-            }
-        }
-        return $items;
+        return $this->getBillingAddress()->getAllVisibleItems();
     }
 
     /**
@@ -332,9 +319,19 @@ public function getQuote()
     }
 
     /**
+     * @deprecated
+     * typo in method name, see getBillingAddressTotals()
      * @return mixed
      */
     public function getBillinAddressTotals()
+    {
+        return $this->getBillingAddressTotals();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getBillingAddressTotals()
     {
         $address = $this->getQuote()->getBillingAddress();
         return $this->getShippingAddressTotals($address);
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Results.php b/app/code/Magento/Multishipping/Block/Checkout/Results.php
new file mode 100644
index 0000000000000..35c050d5ff8c1
--- /dev/null
+++ b/app/code/Magento/Multishipping/Block/Checkout/Results.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Block\Checkout;
+
+use Magento\Customer\Model\Address\Config as AddressConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Theme\Block\Html\Title;
+
+/**
+ * Multi-shipping checkout results information
+ *
+ * @api
+ */
+class Results extends Success
+{
+    /**
+     * @var AddressConfig
+     */
+    private $addressConfig;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var SessionManagerInterface
+     */
+    private $session;
+
+    /**
+     * @param Context $context
+     * @param Multishipping $multishipping
+     * @param AddressConfig $addressConfig
+     * @param OrderRepositoryInterface $orderRepository
+     * @param SessionManagerInterface $session
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Multishipping $multishipping,
+        AddressConfig $addressConfig,
+        OrderRepositoryInterface $orderRepository,
+        SessionManagerInterface $session,
+        array $data = []
+    ) {
+        parent::__construct($context, $multishipping, $data);
+
+        $this->addressConfig = $addressConfig;
+        $this->orderRepository = $orderRepository;
+        $this->session = $session;
+    }
+
+    /**
+     * Returns shipping addresses from quote.
+     *
+     * @return array
+     */
+    public function getQuoteShippingAddresses(): array
+    {
+        return $this->_multishipping->getQuote()->getAllShippingAddresses();
+    }
+
+    /**
+     * Returns all failed addresses from quote.
+     *
+     * @return array
+     */
+    public function getFailedAddresses(): array
+    {
+        $addresses = $this->getQuoteShippingAddresses();
+        if ($this->getAddressError($this->getQuoteBillingAddress())) {
+            $addresses[] = $this->getQuoteBillingAddress();
+        }
+        return $addresses;
+    }
+
+    /**
+     * Retrieve order shipping address.
+     *
+     * @param int $orderId
+     * @return OrderAddress|null
+     */
+    public function getOrderShippingAddress(int $orderId)
+    {
+        return $this->orderRepository->get($orderId)->getShippingAddress();
+    }
+
+    /**
+     * Retrieve quote billing address.
+     *
+     * @return QuoteAddress
+     */
+    public function getQuoteBillingAddress(): QuoteAddress
+    {
+        return $this->getCheckout()->getQuote()->getBillingAddress();
+    }
+
+    /**
+     * Returns formatted shipping address from placed order.
+     *
+     * @param OrderAddress $address
+     * @return string
+     */
+    public function formatOrderShippingAddress(OrderAddress $address): string
+    {
+        return $this->getAddressOneline($address->getData());
+    }
+
+    /**
+     * Returns formatted shipping address from quote.
+     *
+     * @param QuoteAddress $address
+     * @return string
+     */
+    public function formatQuoteShippingAddress(QuoteAddress $address): string
+    {
+        return $this->getAddressOneline($address->getData());
+    }
+
+    /**
+     * Checks if address type is shipping.
+     *
+     * @param QuoteAddress $address
+     * @return bool
+     */
+    public function isShippingAddress(QuoteAddress $address): bool
+    {
+        return $address->getAddressType() === QuoteAddress::ADDRESS_TYPE_SHIPPING;
+    }
+
+    /**
+     * Get unescaped address formatted as one line string.
+     *
+     * @param array $address
+     * @return string
+     */
+    private function getAddressOneline(array $address): string
+    {
+        $renderer = $this->addressConfig->getFormatByCode('oneline')->getRenderer();
+
+        return $renderer->renderArray($address);
+    }
+
+    /**
+     * Returns address error.
+     *
+     * @param QuoteAddress $address
+     * @return string
+     */
+    public function getAddressError(QuoteAddress $address): string
+    {
+        $errors = $this->session->getAddressErrors();
+
+        return $errors[$address->getId()] ?? '';
+    }
+
+    /**
+     * Add title to block head.
+     *
+     * @throws LocalizedException
+     * @return Success
+     */
+    protected function _prepareLayout(): Success
+    {
+        /** @var Title $pageTitle */
+        $pageTitle = $this->getLayout()->getBlock('page.main.title');
+        if ($pageTitle) {
+            $title = $this->getOrderIds() ? $pageTitle->getPartlySuccessTitle() : $pageTitle->getFailedTitle();
+            $pageTitle->setPageTitle($title);
+        }
+
+        return parent::_prepareLayout();
+    }
+}
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Success.php b/app/code/Magento/Multishipping/Block/Checkout/Success.php
index 3f18132d04a45..0f39e03c56c63 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Success.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Success.php
@@ -36,7 +36,7 @@ public function __construct(
      */
     public function getOrderIds()
     {
-        $ids = $this->_session->getOrderIds(true);
+        $ids = $this->_session->getOrderIds();
         if ($ids && is_array($ids)) {
             return $ids;
         }
diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Billing.php b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php
new file mode 100644
index 0000000000000..684ed32d9f112
--- /dev/null
+++ b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Block\DataProviders;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Checkout\Model\CompositeConfigProvider;
+use Magento\Customer\Model\Address\Config as AddressConfig;
+use Magento\Framework\Serialize\Serializer\Json as Serializer;
+use Magento\Quote\Model\Quote\Address;
+
+/**
+ * Provides additional data for multishipping checkout billing step
+ *
+ * @see \Magento\Multishipping\view\frontend\templates\checkout\billing.phtml
+ */
+class Billing implements ArgumentInterface
+{
+    /**
+     * @var AddressConfig
+     */
+    private $addressConfig;
+
+    /**
+     * @var CompositeConfigProvider
+     */
+    private $configProvider;
+
+    /**
+     * @var Serializer
+     */
+    private $serializer;
+
+    /**
+     * @param AddressConfig $addressConfig
+     * @param CompositeConfigProvider $configProvider
+     * @param Serializer $serializer
+     */
+    public function __construct(
+        AddressConfig $addressConfig,
+        CompositeConfigProvider $configProvider,
+        Serializer $serializer
+    ) {
+        $this->addressConfig = $addressConfig;
+        $this->configProvider = $configProvider;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Get address formatted as html string.
+     *
+     * @param Address $address
+     * @return string
+     */
+    public function getAddressHtml(Address $address): string
+    {
+        $renderer = $this->addressConfig->getFormatByCode('html')->getRenderer();
+
+        return $renderer->renderArray($address->getData());
+    }
+
+    /**
+     * Returns serialized checkout config.
+     *
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    public function getSerializedCheckoutConfigs(): string
+    {
+        return $this->serializer->serialize($this->configProvider->getConfig());
+    }
+}
diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php
new file mode 100644
index 0000000000000..e630f14f61c79
--- /dev/null
+++ b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Block\DataProviders;
+
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Quote\Model\Quote\Address;
+
+/**
+ * Provides additional data for multishipping checkout overview step.
+ */
+class Overview implements ArgumentInterface
+{
+    /**
+     * @var SessionManagerInterface
+     */
+    private $session;
+
+    /**
+     * @var array
+     */
+    private $addressErrors = [];
+
+    /**
+     * @param SessionManagerInterface $session
+     */
+    public function __construct(
+        SessionManagerInterface $session
+    ) {
+        $this->session = $session;
+    }
+
+    /**
+     * Returns address error.
+     *
+     * @param Address $address
+     * @return string
+     */
+    public function getAddressError(Address $address): string
+    {
+        $addressErrors = $this->getAddressErrors();
+
+        return $addressErrors[$address->getId()] ?? '';
+    }
+
+    /**
+     * Returns all stored errors.
+     *
+     * @return array
+     */
+    public function getAddressErrors(): array
+    {
+        if (empty($this->addressErrors)) {
+            $this->addressErrors = $this->session->getAddressErrors(true);
+        }
+
+        return $this->addressErrors ?? [];
+    }
+
+    /**
+     * Creates anchor name for address Id.
+     *
+     * @param int $addressId
+     * @return string
+     */
+    public function getAddressAnchorName(int $addressId): string
+    {
+        return 'a' . $addressId;
+    }
+}
diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Success.php b/app/code/Magento/Multishipping/Block/DataProviders/Success.php
new file mode 100644
index 0000000000000..4b7543c9f72fd
--- /dev/null
+++ b/app/code/Magento/Multishipping/Block/DataProviders/Success.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Block\DataProviders;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Multishipping\Block\Checkout\Results;
+
+/**
+ * Provides additional data for multishipping checkout success step.
+ */
+class Success extends Results implements ArgumentInterface
+{
+
+}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index 1870736a0efd9..92417c7cb3a18 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -8,6 +8,7 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\StateException;
 
 /**
  * Multishipping checkout controller
@@ -84,6 +85,7 @@ protected function _getCheckoutSession()
      *
      * @param RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -152,7 +154,15 @@ public function dispatch(RequestInterface $request)
             return parent::dispatch($request);
         }
 
-        $quote = $this->_getCheckout()->getQuote();
+        try {
+            $checkout = $this->_getCheckout();
+        } catch (StateException $e) {
+            $this->getResponse()->setRedirect($this->_getHelper()->getMSNewShippingUrl());
+            $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
+            return parent::dispatch($request);
+        }
+
+        $quote = $checkout->getQuote();
         if (!$quote->hasItems() || $quote->getHasError() || $quote->isVirtual()) {
             $this->getResponse()->setRedirect($this->_getHelper()->getCartUrl());
             $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
index 78ea9fc1d2b88..f97589342bc38 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
-class Addresses extends \Magento\Multishipping\Controller\Checkout
+class Addresses extends \Magento\Multishipping\Controller\Checkout implements HttpGetActionInterface
 {
     /**
      * Multishipping checkout select address page
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/CheckItems.php b/app/code/Magento/Multishipping/Controller/Checkout/CheckItems.php
new file mode 100644
index 0000000000000..e9a46f1cf00f7
--- /dev/null
+++ b/app/code/Magento/Multishipping/Controller/Checkout/CheckItems.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Controller\Checkout;
+
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Multishipping\Controller\Checkout;
+use Magento\Multishipping\Helper\Data as MultishippingHelper;
+use Magento\Quote\Model\Quote\Item;
+use Psr\Log\LoggerInterface;
+
+class CheckItems extends Checkout
+{
+    /**
+     * @var CheckoutSession
+     */
+    private $checkoutSession;
+
+    /**
+     * @var MultishippingHelper
+     */
+    private $helper;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context,
+     * @param CustomerSession $customerSession
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param AccountManagementInterface $accountManagement
+     * @param CheckoutSession $checkoutSession
+     * @param MultishippingHelper $helper
+     * @param Json $json
+     * @param LoggerInterface $logger
+     */
+
+    public function __construct(
+        Context $context,
+        CustomerSession $customerSession,
+        CustomerRepositoryInterface $customerRepository,
+        AccountManagementInterface $accountManagement,
+        CheckoutSession $checkoutSession,
+        MultishippingHelper $helper,
+        Json $json,
+        LoggerInterface $logger
+    ) {
+        $this->checkoutSession = $checkoutSession;
+        $this->helper = $helper;
+        $this->json = $json;
+        $this->logger = $logger;
+
+        parent::__construct(
+            $context,
+            $customerSession,
+            $customerRepository,
+            $accountManagement
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function execute()
+    {
+        try {
+            $shippingInfo = $this->getRequest()->getPost('ship');
+            if (!\is_array($shippingInfo)) {
+                throw new LocalizedException(
+                    __('We are unable to process your request. Please, try again later.')
+                );
+            }
+
+            $itemsInfo = $this->collectItemsInfo($shippingInfo);
+            $totalQuantity = array_sum($itemsInfo);
+
+            $maxQuantity = $this->helper->getMaximumQty();
+            if ($totalQuantity > $maxQuantity) {
+                throw new LocalizedException(
+                    __('Maximum qty allowed for Shipping to multiple addresses is %1', $maxQuantity)
+                );
+            }
+
+            $quote = $this->checkoutSession->getQuote();
+            foreach ($quote->getAllItems() as $item) {
+                if (isset($itemsInfo[$item->getId()])) {
+                    $this->updateItemQuantity($item, $itemsInfo[$item->getId()]);
+                }
+            }
+
+            if ($quote->getHasError()) {
+                throw new LocalizedException(__($quote->getMessage()));
+            }
+
+            $this->jsonResponse();
+        } catch (LocalizedException $e) {
+            $this->jsonResponse($e->getMessage());
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $this->jsonResponse('We are unable to process your request. Please, try again later.');
+        }
+    }
+
+    /**
+     * Updates quote item quantity.
+     *
+     * @param Item $item
+     * @param float $quantity
+     * @throws LocalizedException
+     */
+    private function updateItemQuantity(Item $item, float $quantity)
+    {
+        if ($quantity > 0) {
+            $item->setQty($quantity);
+            if ($item->getHasError()) {
+                throw new LocalizedException(__($item->getMessage()));
+            }
+        }
+    }
+
+    /**
+     * Group posted items.
+     *
+     * @param array $shippingInfo
+     * @return array
+     */
+    private function collectItemsInfo(array $shippingInfo): array
+    {
+        $itemsInfo = [];
+        foreach ($shippingInfo as $itemData) {
+            if (!\is_array($itemData)) {
+                continue;
+            }
+            foreach ($itemData as $quoteItemId => $data) {
+                if (!isset($itemsInfo[$quoteItemId])) {
+                    $itemsInfo[$quoteItemId] = 0;
+                }
+                $itemsInfo[$quoteItemId] += (double)$data['qty'];
+            }
+        }
+
+        return $itemsInfo;
+    }
+
+    /**
+     * JSON response builder.
+     *
+     * @param string $error
+     * @return void
+     */
+    private function jsonResponse(string $error = '')
+    {
+        $this->getResponse()->representJson(
+            $this->json->serialize($this->getResponseData($error))
+        );
+    }
+
+    /**
+     * Returns response data.
+     *
+     * @param string $error
+     * @return array
+     */
+    private function getResponseData(string $error = ''): array
+    {
+        $response = [
+            'success' => true,
+        ];
+
+        if (!empty($error)) {
+            $response = [
+                'success' => false,
+                'error_message' => $error,
+            ];
+        }
+
+        return $response;
+    }
+}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Index.php b/app/code/Magento/Multishipping/Controller/Checkout/Index.php
index 1fa96cfab8a1a..a4314d6d51883 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Index.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
-class Index extends \Magento\Multishipping\Controller\Checkout
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Multishipping\Controller\Checkout implements HttpGetActionInterface
 {
     /**
      * Index action of Multishipping checkout
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
index f88b1c22d532f..d97226a393c25 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
@@ -6,7 +6,10 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
+use Magento\Payment\Model\Method\AbstractMethod;
+use Psr\Log\LoggerInterface;
 
 class Overview extends \Magento\Multishipping\Controller\Checkout
 {
@@ -25,23 +28,24 @@ public function execute()
 
         try {
             $payment = $this->getRequest()->getPost('payment', []);
-            $payment['checks'] = [
-                \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_COUNTRY,
-                \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_CURRENCY,
-                \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
-                \Magento\Payment\Model\Method\AbstractMethod::CHECK_ZERO_TOTAL,
-            ];
-            $this->_getCheckout()->setPaymentMethod($payment);
-
+            if (!empty($payment)) {
+                $payment['checks'] = [
+                    AbstractMethod::CHECK_USE_FOR_COUNTRY,
+                    AbstractMethod::CHECK_USE_FOR_CURRENCY,
+                    AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
+                    AbstractMethod::CHECK_ZERO_TOTAL,
+                ];
+                $this->_getCheckout()->setPaymentMethod($payment);
+            }
             $this->_getState()->setCompleteStep(State::STEP_BILLING);
 
             $this->_view->loadLayout();
             $this->_view->renderLayout();
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
             $this->_redirect('*/*/billing');
         } catch (\Exception $e) {
-            $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+            $this->_objectManager->get(LoggerInterface::class)->critical($e);
             $this->messageManager->addException($e, __('We cannot open the overview page.'));
             $this->_redirect('*/*/billing');
         }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index d23f8863d0728..f05a7f43b8118 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\PaymentException;
+use Magento\Framework\Session\SessionManagerInterface;
 
 /**
  * Class OverviewPost
@@ -32,6 +33,11 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      */
     protected $agreementsValidator;
 
+    /**
+     * @var SessionManagerInterface
+     */
+    private $session;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -40,6 +46,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
+     * @param SessionManagerInterface $session
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -48,11 +55,14 @@ public function __construct(
         AccountManagementInterface $accountManagement,
         \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
+        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
+        SessionManagerInterface $session
     ) {
         $this->formKeyValidator = $formKeyValidator;
         $this->logger = $logger;
         $this->agreementsValidator = $agreementValidator;
+        $this->session = $session;
+
         parent::__construct(
             $context,
             $customerSession,
@@ -95,11 +105,17 @@ public function execute()
                 $paymentInstance->setCcCid($payment['cc_cid']);
             }
             $this->_getCheckout()->createOrders();
-            $this->_getState()->setActiveStep(State::STEP_SUCCESS);
             $this->_getState()->setCompleteStep(State::STEP_OVERVIEW);
-            $this->_getCheckout()->getCheckoutSession()->clearQuote();
-            $this->_getCheckout()->getCheckoutSession()->setDisplaySuccess(true);
-            $this->_redirect('*/*/success');
+
+            if ($this->session->getAddressErrors()) {
+                $this->_getState()->setActiveStep(State::STEP_RESULTS);
+                $this->_redirect('*/*/results');
+            } else {
+                $this->_getState()->setActiveStep(State::STEP_SUCCESS);
+                $this->_getCheckout()->getCheckoutSession()->clearQuote();
+                $this->_getCheckout()->getCheckoutSession()->setDisplaySuccess(true);
+                $this->_redirect('*/*/success');
+            }
         } catch (PaymentException $e) {
             $message = $e->getMessage();
             if (!empty($message)) {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Results.php b/app/code/Magento/Multishipping/Controller/Checkout/Results.php
new file mode 100644
index 0000000000000..1a18daf02ebd8
--- /dev/null
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Results.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Controller\Checkout;
+
+/**
+ * Multishipping checkout results controller.
+ */
+class Results extends Success
+{
+
+}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Success.php b/app/code/Magento/Multishipping/Controller/Checkout/Success.php
index 24a0f2a701cc0..e277d0de44636 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Success.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Success.php
@@ -6,10 +6,42 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
-class Success extends \Magento\Multishipping\Controller\Checkout
+/**
+ * Multishipping checkout success controller.
+ */
+class Success extends Action
 {
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @var Multishipping
+     */
+    private $multishipping;
+
+    /**
+     * @param Context $context
+     * @param State $state
+     * @param Multishipping $multishipping
+     */
+    public function __construct(
+        Context $context,
+        State $state,
+        Multishipping $multishipping
+    ) {
+        $this->state = $state;
+        $this->multishipping = $multishipping;
+
+        parent::__construct($context);
+    }
+
     /**
      * Multishipping checkout success page
      *
@@ -17,13 +49,13 @@ class Success extends \Magento\Multishipping\Controller\Checkout
      */
     public function execute()
     {
-        if (!$this->_getState()->getCompleteStep(State::STEP_OVERVIEW)) {
+        if (!$this->state->getCompleteStep(State::STEP_OVERVIEW)) {
             $this->_redirect('*/*/addresses');
             return;
         }
 
         $this->_view->loadLayout();
-        $ids = $this->_getCheckout()->getOrderIds();
+        $ids = $this->multishipping->getOrderIds();
         $this->_eventManager->dispatch('multishipping_checkout_controller_success_action', ['order_ids' => $ids]);
         $this->_view->renderLayout();
     }
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index c9b36e34cb304..c7f552ac9236a 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -11,16 +11,19 @@
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    /**#@+
+    /*
      * Xml paths for multishipping checkout
+     *
      **/
     const XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE = 'multishipping/options/checkout_multiple';
 
     const XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY = 'multishipping/options/checkout_multiple_maximum_qty';
 
-    /**#@-*/
-
-    /**#@-*/
+    /**
+     * Checkout session
+     *
+     * @var \Magento\Checkout\Model\Session
+     */
     protected $checkoutSession;
 
     /**
diff --git a/app/code/Magento/Multishipping/Helper/Url.php b/app/code/Magento/Multishipping/Helper/Url.php
index e293e3d4d7121..eaefa8fe8bee3 100644
--- a/app/code/Magento/Multishipping/Helper/Url.php
+++ b/app/code/Magento/Multishipping/Helper/Url.php
@@ -63,6 +63,16 @@ public function getMSShippingAddressSavedUrl()
         return $this->_getUrl('multishipping/checkout_address/shippingSaved');
     }
 
+    /**
+     * Retrieve register url
+     *
+     * @return string
+     */
+    public function getMSNewShippingUrl()
+    {
+        return $this->_getUrl('multishipping/checkout_address/newShipping');
+    }
+
     /**
      * Retrieve register url
      *
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index a3edd57d54e05..d1df064f57140 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -3,14 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Multishipping\Model\Checkout\Type;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ObjectManager;
 use Magento\Directory\Model\AllowedCountries;
+use Psr\Log\LoggerInterface;
 
 /**
  * Multishipping checkout model
@@ -157,8 +161,21 @@ class Multishipping extends \Magento\Framework\DataObject
     private $shippingAssignmentProcessor;
 
     /**
-     * Constructor
-     *
+     * @var Multishipping\PlaceOrderFactory
+     */
+    private $placeOrderFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
@@ -183,6 +200,9 @@ class Multishipping extends \Magento\Framework\DataObject
      * @param array $data
      * @param \Magento\Quote\Api\Data\CartExtensionFactory|null $cartExtensionFactory
      * @param AllowedCountries|null $allowedCountryReader
+     * @param Multishipping\PlaceOrderFactory|null $placeOrderFactory
+     * @param LoggerInterface|null $logger
+     * @param \Magento\Framework\Api\DataObjectHelper|null $dataObjectHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -209,7 +229,10 @@ public function __construct(
         \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
         array $data = [],
         \Magento\Quote\Api\Data\CartExtensionFactory $cartExtensionFactory = null,
-        AllowedCountries $allowedCountryReader = null
+        AllowedCountries $allowedCountryReader = null,
+        Multishipping\PlaceOrderFactory $placeOrderFactory = null,
+        LoggerInterface $logger = null,
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper = null
     ) {
         $this->_eventManager = $eventManager;
         $this->_scopeConfig = $scopeConfig;
@@ -236,12 +259,19 @@ public function __construct(
             ->get(\Magento\Quote\Api\Data\CartExtensionFactory::class);
         $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
             ->get(AllowedCountries::class);
+        $this->placeOrderFactory = $placeOrderFactory ?: ObjectManager::getInstance()
+            ->get(Multishipping\PlaceOrderFactory::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
+        $this->dataObjectHelper = $dataObjectHelper ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Api\DataObjectHelper::class);
         parent::__construct($data);
         $this->_init();
     }
 
     /**
      * Initialize multishipping checkout.
+     *
      * Split virtual/not virtual items between default billing/shipping addresses
      *
      * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
@@ -307,6 +337,7 @@ protected function _init()
 
     /**
      * Get quote items assigned to different quote addresses populated per item qty.
+     *
      * Based on result array we can display each item separately
      *
      * @return array
@@ -367,7 +398,7 @@ public function removeAddressItem($addressId, $itemId)
     /**
      * Assign quote items to addresses and specify items qty
      *
-     * array structure:
+     * Array structure:
      * array(
      *      $quoteItemId => array(
      *          'qty'       => $qty,
@@ -396,7 +427,11 @@ public function setShippingItemsInformation($info)
             $maxQty = $this->helper->getMaximumQty();
             if ($allQty > $maxQty) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Maximum qty allowed for Shipping to multiple addresses is %1', $maxQty)
+                    __(
+                        "The maximum quantity can't be more than %1 when shipping to multiple addresses. "
+                        . "Change the quantity and try again.",
+                        $maxQty
+                    )
                 );
             }
             $quote = $this->getQuote();
@@ -478,7 +513,7 @@ protected function _addShippingItem($quoteItemId, $data)
 
         if ($addressId && $quoteItem) {
             if (!$this->isAddressIdApplicable($addressId)) {
-                throw new LocalizedException(__('Please check shipping address information.'));
+                throw new LocalizedException(__('Verify the shipping address information and continue.'));
             }
 
             /**
@@ -526,7 +561,7 @@ protected function _addShippingItem($quoteItemId, $data)
     public function updateQuoteCustomerShippingAddress($addressId)
     {
         if (!$this->isAddressIdApplicable($addressId)) {
-            throw new LocalizedException(__('Please check shipping address information.'));
+            throw new LocalizedException(__('Verify the shipping address information and continue.'));
         }
         try {
             $address = $this->addressRepository->getById($addressId);
@@ -553,7 +588,7 @@ public function updateQuoteCustomerShippingAddress($addressId)
     public function setQuoteCustomerBillingAddress($addressId)
     {
         if (!$this->isAddressIdApplicable($addressId)) {
-            throw new LocalizedException(__('Please check billing address information.'));
+            throw new LocalizedException(__('Verify the billing address information and continue.'));
         }
         try {
             $address = $this->addressRepository->getById($addressId);
@@ -588,7 +623,7 @@ public function setShippingMethods($methods)
                 $address->setShippingMethod($methods[$addressId]);
             } elseif (!$address->getShippingMethod()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please select shipping methods for all addresses.')
+                    __('Set shipping methods for all addresses. Verify the shipping methods and try again.')
                 );
             }
         }
@@ -608,12 +643,15 @@ public function setPaymentMethod($payment)
     {
         if (!isset($payment['method'])) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('A payment method is not defined.')
+                __("A payment method isn't defined. Verify and try again.")
             );
         }
         if (!$this->paymentSpecification->isSatisfiedBy($payment['method'])) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('The requested payment method is not available for multishipping.')
+                __(
+                    "This payment method can't be used for shipping to multiple addresses. "
+                    . "Change the payment method and try again."
+                )
             );
         }
         $quote = $this->getQuote();
@@ -641,7 +679,14 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
         $quote->reserveOrderId();
         $quote->collectTotals();
 
-        $order = $this->quoteAddressToOrder->convert($address);
+        $order = $this->_orderFactory->create();
+
+        $this->dataObjectHelper->mergeDataObjects(
+            \Magento\Sales\Api\Data\OrderInterface::class,
+            $order,
+            $this->quoteAddressToOrder->convert($address)
+        );
+
         $order->setQuote($quote);
         $order->setBillingAddress($this->quoteAddressToOrderAddress->convert($quote->getBillingAddress()));
 
@@ -649,6 +694,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
             $order->setIsVirtual(1);
         } else {
             $order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address));
+            $order->setShippingMethod($address->getShippingMethod());
         }
 
         $order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment()));
@@ -660,7 +706,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
             $_quoteItem = $item->getQuoteItem();
             if (!$_quoteItem) {
                 throw new \Magento\Checkout\Exception(
-                    __('Item not found or already ordered')
+                    __("The item isn't found, or it's already ordered.")
                 );
             }
             $item->setProductType(
@@ -692,7 +738,7 @@ protected function _validate()
         $paymentMethod = $quote->getPayment()->getMethodInstance();
         if (!$paymentMethod->isAvailable($quote)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Please specify a payment method.')
+                __("The payment method isn't selected. Enter the payment method and try again.")
             );
         }
 
@@ -701,27 +747,29 @@ protected function _validate()
             $addressValidation = $address->validate();
             if ($addressValidation !== true) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please check shipping addresses information.')
+                    __('Verify the shipping address information and continue.')
                 );
             }
             $method = $address->getShippingMethod();
             $rate = $address->getShippingRateByCode($method);
             if (!$method || !$rate) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please specify shipping methods for all addresses.')
+                    __('Set shipping methods for all addresses. Verify the shipping methods and try again.')
                 );
             }
 
             // Checks if a country id present in the allowed countries list.
             if (!in_array($address->getCountryId(), $this->allowedCountryReader->getAllowedCountries())) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Some addresses cannot be used due to country-specific configurations.')
+                    __("Some addresses can't be used due to the configurations for specific countries.")
                 );
             }
         }
         $addressValidation = $quote->getBillingAddress()->validate();
         if ($addressValidation !== true) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please check billing address information.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Verify the billing address information and continue.')
+            );
         }
         return $this;
     }
@@ -754,21 +802,48 @@ public function createOrders()
                 );
             }
 
+            $paymentProviderCode = $this->getQuote()->getPayment()->getMethod();
+            $placeOrderService = $this->placeOrderFactory->create($paymentProviderCode);
+            $exceptionList = $placeOrderService->place($orders);
+            $this->logExceptions($exceptionList);
+
+            /** @var OrderInterface[] $failedOrders */
+            $failedOrders = [];
+            /** @var OrderInterface[] $successfulOrders */
+            $successfulOrders = [];
             foreach ($orders as $order) {
-                $order->place();
-                $order->save();
+                if (isset($exceptionList[$order->getIncrementId()])) {
+                    $failedOrders[] = $order;
+                } else {
+                    $successfulOrders[] = $order;
+                }
+            }
+
+            $placedAddressItems = [];
+            foreach ($successfulOrders as $order) {
+                $orderIds[$order->getId()] = $order->getIncrementId();
                 if ($order->getCanSendNewEmailFlag()) {
                     $this->orderSender->send($order);
                 }
-                $orderIds[$order->getId()] = $order->getIncrementId();
+                $placedAddressItems = array_merge($placedAddressItems, $this->getQuoteAddressItems($order));
             }
 
-            $this->_session->setOrderIds($orderIds);
-            $this->_checkoutSession->setLastQuoteId($this->getQuote()->getId());
-
-            $this->getQuote()->setIsActive(false);
-            $this->quoteRepository->save($this->getQuote());
+            $addressErrors = [];
+            if (!empty($failedOrders)) {
+                $this->removePlacedItemsFromQuote($shippingAddresses, $placedAddressItems);
+                $addressErrors = $this->getQuoteAddressErrors(
+                    $failedOrders,
+                    $shippingAddresses,
+                    $exceptionList
+                );
+            } else {
+                $this->_checkoutSession->setLastQuoteId($this->getQuote()->getId());
+                $this->getQuote()->setIsActive(false);
+                $this->quoteRepository->save($this->getQuote());
+            }
 
+            $this->_session->setOrderIds($orderIds);
+            $this->_session->setAddressErrors($addressErrors);
             $this->_eventManager->dispatch(
                 'checkout_submit_all_after',
                 ['orders' => $orders, 'quote' => $this->getQuote()]
@@ -781,6 +856,19 @@ public function createOrders()
         }
     }
 
+    /**
+     * Logs exceptions.
+     *
+     * @param \Exception[] $exceptionList
+     * @return void
+     */
+    private function logExceptions(array $exceptionList)
+    {
+        foreach ($exceptionList as $exception) {
+            $this->logger->critical($exception);
+        }
+    }
+
     /**
      * Collect quote totals and save quote object
      *
@@ -788,7 +876,7 @@ public function createOrders()
      */
     public function save()
     {
-        $this->getQuote()->collectTotals();
+        $this->getQuote()->setTotalsCollectedFlag(false)->collectTotals();
         $this->quoteRepository->save($this->getQuote());
         return $this;
     }
@@ -811,13 +899,23 @@ public function reset()
      */
     public function validateMinimumAmount()
     {
-        return !($this->_scopeConfig->isSetFlag(
+        $minimumOrderActive = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/active',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) && $this->_scopeConfig->isSetFlag(
+        );
+
+        $minimumOrderMultiFlag = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/multi_address',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) && !$this->getQuote()->validateMinimumAmount());
+        );
+
+        if ($minimumOrderMultiFlag) {
+            $result = !($minimumOrderActive && !$this->getQuote()->validateMinimumAmount());
+        } else {
+            $result = !($minimumOrderActive && !$this->validateMinimumAmountForAddressItems());
+        }
+
+        return $result;
     }
 
     /**
@@ -841,6 +939,8 @@ public function getMinimumAmountDescription()
     }
 
     /**
+     * Get minimum amount error.
+     *
      * @return string
      */
     public function getMinimumAmountError()
@@ -867,7 +967,10 @@ public function getMinimumAmountError()
     public function getOrderIds($asAssoc = false)
     {
         $idsAssoc = $this->_session->getOrderIds();
-        return $asAssoc ? $idsAssoc : array_keys($idsAssoc);
+        if ($idsAssoc !== null) {
+            return $asAssoc ? $idsAssoc : array_keys($idsAssoc);
+        }
+        return [];
     }
 
     /**
@@ -906,7 +1009,7 @@ private function getDefaultAddressByDataKey($key, $defaultAddressIdFromCustomer)
             $addressId = $defaultAddressIdFromCustomer;
             if (!$addressId) {
                 /** Default address is not available, try to find any customer address */
-                $filter =  $this->filterBuilder->setField('parent_id')
+                $filter = $this->filterBuilder->setField('parent_id')
                     ->setValue($this->getCustomer()->getId())
                     ->setConditionType('eq')
                     ->create();
@@ -982,7 +1085,7 @@ public function getCustomer()
     /**
      * Check if specified address ID belongs to customer.
      *
-     * @param $addressId
+     * @param mixed $addressId
      * @return bool
      */
     protected function isAddressIdApplicable($addressId)
@@ -995,6 +1098,8 @@ protected function isAddressIdApplicable($addressId)
     }
 
     /**
+     * Prepare shipping assignment.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return \Magento\Quote\Model\Quote
      */
@@ -1015,6 +1120,8 @@ private function prepareShippingAssignment($quote)
     }
 
     /**
+     * Get shipping assignment processor.
+     *
      * @return \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor
      */
     private function getShippingAssignmentProcessor()
@@ -1025,4 +1132,151 @@ private function getShippingAssignmentProcessor()
         }
         return $this->shippingAssignmentProcessor;
     }
+
+    /**
+     * Validate minimum amount for "Checkout with Multiple Addresses" when
+     * "Validate Each Address Separately in Multi-address Checkout" is No.
+     *
+     * @return bool
+     */
+    private function validateMinimumAmountForAddressItems()
+    {
+        $result = true;
+        $storeId = $this->getQuote()->getStoreId();
+
+        $minAmount = $this->_scopeConfig->getValue(
+            'sales/minimum_order/amount',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        $taxInclude = $this->_scopeConfig->getValue(
+            'sales/minimum_order/tax_including',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        $this->getQuote()->collectTotals();
+        $addresses = $this->getQuote()->getAllAddresses();
+
+        $baseTotal = 0;
+        foreach ($addresses as $address) {
+            $taxes = $taxInclude ? $address->getBaseTaxAmount() : 0;
+            $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
+        }
+
+        if ($baseTotal < $minAmount) {
+            $result = false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove successfully placed items from quote.
+     *
+     * @param \Magento\Quote\Model\Quote\Address[] $shippingAddresses
+     * @param int[] $placedAddressItems
+     * @return void
+     */
+    private function removePlacedItemsFromQuote(array $shippingAddresses, array $placedAddressItems)
+    {
+        foreach ($shippingAddresses as $address) {
+            foreach ($address->getAllItems() as $addressItem) {
+                if (in_array($addressItem->getId(), $placedAddressItems)) {
+                    if ($addressItem->getProduct()->getIsVirtual()) {
+                        $addressItem->isDeleted(true);
+                    } else {
+                        $address->isDeleted(true);
+                    }
+
+                    $this->decreaseQuoteItemQty($addressItem->getQuoteItemId(), $addressItem->getQty());
+                }
+            }
+        }
+        $this->save();
+    }
+
+    /**
+     * Decrease quote item quantity.
+     *
+     * @param int $quoteItemId
+     * @param int $qty
+     * @return void
+     */
+    private function decreaseQuoteItemQty(int $quoteItemId, int $qty)
+    {
+        $quoteItem = $this->getQuote()->getItemById($quoteItemId);
+        if ($quoteItem) {
+            $newItemQty = $quoteItem->getQty() - $qty;
+            if ($newItemQty > 0) {
+                $quoteItem->setQty($newItemQty);
+            } else {
+                $this->getQuote()->removeItem($quoteItem->getId());
+                $this->getQuote()->setIsMultiShipping(1);
+            }
+        }
+    }
+
+    /**
+     * Returns quote address id that was assigned to order.
+     *
+     * @param OrderInterface $order
+     * @param \Magento\Quote\Model\Quote\Address[] $addresses
+     *
+     * @return int
+     * @throws NotFoundException
+     */
+    private function searchQuoteAddressId(OrderInterface $order, array $addresses): int
+    {
+        $items = $order->getItems();
+        $item = array_pop($items);
+        foreach ($addresses as $address) {
+            foreach ($address->getAllItems() as $addressItem) {
+                if ($addressItem->getId() == $item->getQuoteItemId()) {
+                    return (int)$address->getId();
+                }
+            }
+        }
+
+        throw new NotFoundException(__('Quote address for failed order not found.'));
+    }
+
+    /**
+     * Get quote address errors.
+     *
+     * @param OrderInterface[] $orders
+     * @param \Magento\Quote\Model\Quote\Address[] $addresses
+     * @param \Exception[] $exceptionList
+     * @return string[]
+     * @throws NotFoundException
+     */
+    private function getQuoteAddressErrors(array $orders, array $addresses, array $exceptionList): array
+    {
+        $addressErrors = [];
+        foreach ($orders as $failedOrder) {
+            if (!isset($exceptionList[$failedOrder->getIncrementId()])) {
+                throw new NotFoundException(__('Exception for failed order not found.'));
+            }
+            $addressId = $this->searchQuoteAddressId($failedOrder, $addresses);
+            $addressErrors[$addressId] = $exceptionList[$failedOrder->getIncrementId()]->getMessage();
+        }
+
+        return $addressErrors;
+    }
+
+    /**
+     * Returns quote address item id.
+     *
+     * @param OrderInterface $order
+     * @return array
+     */
+    private function getQuoteAddressItems(OrderInterface $order): array
+    {
+        $placedAddressItems = [];
+        foreach ($order->getItems() as $orderItem) {
+            $placedAddressItems[] = $orderItem->getQuoteItemId();
+        }
+
+        return $placedAddressItems;
+    }
 }
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php
new file mode 100644
index 0000000000000..584003fcf9abb
--- /dev/null
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
+
+use Magento\Sales\Api\OrderManagementInterface;
+
+/**
+ * Default implementation for OrderPlaceInterface.
+ */
+class PlaceOrderDefault implements PlaceOrderInterface
+{
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
+    /**
+     * @param OrderManagementInterface $orderManagement
+     */
+    public function __construct(
+        OrderManagementInterface $orderManagement
+    ) {
+        $this->orderManagement = $orderManagement;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function place(array $orderList): array
+    {
+        $errorList = [];
+        foreach ($orderList as $order) {
+            try {
+                $this->orderManagement->place($order);
+            } catch (\Exception $e) {
+                $incrementId = $order->getIncrementId();
+                $errorList[$incrementId] = $e;
+            }
+        }
+
+        return $errorList;
+    }
+}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php
new file mode 100644
index 0000000000000..cf672d2898820
--- /dev/null
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Creates instance of place order service according to payment provider.
+ */
+class PlaceOrderFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var PlaceOrderPool
+     */
+    private $placeOrderPool;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param PlaceOrderPool $placeOrderPool
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        PlaceOrderPool $placeOrderPool
+    ) {
+        $this->objectManager = $objectManager;
+        $this->placeOrderPool = $placeOrderPool;
+    }
+
+    /**
+     * @param string $paymentProviderCode
+     * @return PlaceOrderInterface
+     */
+    public function create(string $paymentProviderCode): PlaceOrderInterface
+    {
+        $service = $this->placeOrderPool->get($paymentProviderCode);
+        if ($service === null) {
+            $service = $this->objectManager->get(PlaceOrderDefault::class);
+        }
+
+        return $service;
+    }
+}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php
new file mode 100644
index 0000000000000..5d384a5373d5e
--- /dev/null
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
+
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Place orders during multishipping checkout flow.
+ *
+ * @api
+ */
+interface PlaceOrderInterface
+{
+    /**
+     * Place orders.
+     *
+     * @param OrderInterface[] $orderList
+     * @return array
+     */
+    public function place(array $orderList): array;
+}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php
new file mode 100644
index 0000000000000..1105d4b888be2
--- /dev/null
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
+
+use Magento\Framework\ObjectManager\TMap;
+use Magento\Framework\ObjectManager\TMapFactory;
+
+/**
+ * Contains place order services according to payment provider.
+ *
+ * Can be used as extension point for changing order placing logic during multishipping checkout flow.
+ */
+class PlaceOrderPool
+{
+    /**
+     * @var PlaceOrderInterface[] | TMap
+     */
+    private $services;
+
+    /**
+     * @param TMapFactory $tmapFactory
+     * @param array $services
+     */
+    public function __construct(
+        TMapFactory $tmapFactory,
+        array $services = []
+    ) {
+        $this->services = $tmapFactory->createSharedObjectsMap(
+            [
+                'array' => $services,
+                'type' => PlaceOrderInterface::class
+            ]
+        );
+    }
+
+    /**
+     * Returns place order service for defined payment provider.
+     *
+     * @param string $paymentProviderCode
+     * @return PlaceOrderInterface|null
+     */
+    public function get(string $paymentProviderCode)
+    {
+        if (!isset($this->services[$paymentProviderCode])) {
+            return null;
+        }
+
+        return $this->services[$paymentProviderCode];
+    }
+}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
index 2615ad1b540c8..2e53817351d3c 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
@@ -25,6 +25,8 @@ class State extends \Magento\Framework\DataObject
 
     const STEP_SUCCESS = 'multishipping_success';
 
+    const STEP_RESULTS = 'multishipping_results';
+
     /**
      * Allow steps array
      *
@@ -61,6 +63,7 @@ public function __construct(Session $checkoutSession, Multishipping $multishippi
             self::STEP_BILLING => new \Magento\Framework\DataObject(['label' => __('Billing Information')]),
             self::STEP_OVERVIEW => new \Magento\Framework\DataObject(['label' => __('Place Order')]),
             self::STEP_SUCCESS => new \Magento\Framework\DataObject(['label' => __('Order Success')]),
+            self::STEP_RESULTS => new \Magento\Framework\DataObject(['label' => __('Order Results')]),
         ];
 
         foreach ($this->_steps as $step) {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE.txt b/app/code/Magento/Multishipping/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE.txt
rename to app/code/Magento/Multishipping/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE_AFL.txt b/app/code/Magento/Multishipping/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE_AFL.txt
rename to app/code/Magento/Multishipping/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Page/NewMultishippingAddressPage.xml b/app/code/Magento/Multishipping/Test/Mftf/Page/NewMultishippingAddressPage.xml
new file mode 100644
index 0000000000000..f25687a012ec5
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Page/NewMultishippingAddressPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="NewMultishippingAddressPage" url="/multishipping/checkout_address/newShipping" module="Multishipping" area="storefront">
+    </page>
+</pages>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/README.md b/app/code/Magento/Multishipping/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8349d39c5522b
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Multishipping Functional Tests
+
+The Functional Test Module for **Magento Multishipping** module.
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
new file mode 100644
index 0000000000000..e7d57af1172c6
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <section name="MultishippingSection">
+        <element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
index 7d7307da05cf1..9fe5125eb8a53 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
@@ -114,6 +114,9 @@ public function testIsAddressDefaultShipping($id, $expectedValue)
         $this->assertEquals($expectedValue, $this->block->isAddressDefaultShipping($this->addressMock));
     }
 
+    /**
+     * @return array
+     */
     public function isDefaultAddressDataProvider()
     {
         return [
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
index a5074dbebf7fa..273ee41854cc5 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
@@ -73,14 +73,14 @@ protected function setUp()
 
     public function testGetOrderIdsWithoutId()
     {
-        $this->sessionMock->expects($this->once())->method('getOrderIds')->with(true)->will($this->returnValue(null));
+        $this->sessionMock->method('getOrderIds')->willReturn(null);
 
         $this->assertFalse($this->model->getOrderIds());
     }
 
     public function testGetOrderIdsWithEmptyIdsArray()
     {
-        $this->sessionMock->expects($this->once())->method('getOrderIds')->with(true)->will($this->returnValue([]));
+        $this->sessionMock->method('getOrderIds')->willReturn([]);
 
         $this->assertFalse($this->model->getOrderIds());
     }
@@ -88,7 +88,7 @@ public function testGetOrderIdsWithEmptyIdsArray()
     public function testGetOrderIds()
     {
         $ids = [100, 102, 103];
-        $this->sessionMock->expects($this->once())->method('getOrderIds')->with(true)->will($this->returnValue($ids));
+        $this->sessionMock->method('getOrderIds')->willReturn($ids);
 
         $this->assertEquals($ids, $this->model->getOrderIds());
     }
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
index 00940c426a6ac..9ffef2832a6bc 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
@@ -163,6 +163,9 @@ public function testExecute($backUrl, $shippingAddress, $url)
         $this->controller->execute();
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php
new file mode 100644
index 0000000000000..1878b5edb17ac
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping;
+
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderManagementInterface;
+
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault.
+ */
+class PlaceOrderDefaultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var OrderManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderManagement;
+
+    /**
+     * @var PlaceOrderDefault
+     */
+    private $placeOrderDefault;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->orderManagement = $this->getMockForAbstractClass(OrderManagementInterface::class);
+
+        $this->placeOrderDefault = new PlaceOrderDefault($this->orderManagement);
+    }
+
+    public function testPlace()
+    {
+        $incrementId = '000000001';
+
+        $order = $this->getMockForAbstractClass(OrderInterface::class);
+        $order->method('getIncrementId')->willReturn($incrementId);
+        $orderList = [$order];
+
+        $this->orderManagement->expects($this->once())
+            ->method('place')
+            ->with($order)
+            ->willReturn($order);
+        $errors = $this->placeOrderDefault->place($orderList);
+
+        $this->assertEmpty($errors);
+    }
+
+    public function testPlaceWithErrors()
+    {
+        $incrementId = '000000001';
+
+        $order = $this->getMockForAbstractClass(OrderInterface::class);
+        $order->method('getIncrementId')->willReturn($incrementId);
+        $orderList = [$order];
+
+        $exception = new \Exception('error');
+        $this->orderManagement->method('place')->willThrowException($exception);
+        $errors = $this->placeOrderDefault->place($orderList);
+
+        $this->assertEquals(
+            [$incrementId => $exception],
+            $errors
+        );
+    }
+}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php
new file mode 100644
index 0000000000000..d6363e0acbd35
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderFactory;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool;
+
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderFactory.
+ */
+class PlaceOrderFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManager;
+
+    /**
+     * @var PlaceOrderPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $placeOrderPool;
+
+    /**
+     * @var PlaceOrderFactory
+     */
+    private $placeOrderFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+
+        $this->placeOrderPool = $this->getMockBuilder(PlaceOrderPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->placeOrderFactory = new PlaceOrderFactory($this->objectManager, $this->placeOrderPool);
+    }
+
+    /**
+     * Checks instantiation of place order service.
+     *
+     * @return void
+     */
+    public function testCreate()
+    {
+        $paymentProviderCode = 'code';
+
+        $placeOrder = $this->getMockForAbstractClass(PlaceOrderInterface::class);
+        $this->placeOrderPool->method('get')
+            ->with($paymentProviderCode)
+            ->willReturn($placeOrder);
+
+        $instance = $this->placeOrderFactory->create($paymentProviderCode);
+
+        $this->assertInstanceOf(PlaceOrderInterface::class, $instance);
+    }
+
+    /**
+     * Checks that default place order service is created when place order pull returns null.
+     *
+     * @return void
+     */
+    public function testCreateWithDefault()
+    {
+        $paymentProviderCode = 'code';
+
+        $this->placeOrderPool->method('get')
+            ->with($paymentProviderCode)
+            ->willReturn(null);
+        $placeOrder = $this->getMockBuilder(PlaceOrderDefault::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager->method('get')
+            ->with(PlaceOrderDefault::class)
+            ->willReturn($placeOrder);
+
+        $instance = $this->placeOrderFactory->create($paymentProviderCode);
+
+        $this->assertInstanceOf(PlaceOrderDefault::class, $instance);
+    }
+}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php
new file mode 100644
index 0000000000000..083160b10fda9
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping;
+
+use Magento\Framework\ObjectManager\TMapFactory;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool;
+
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool.
+ */
+class PlaceOrderPoolTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @param string $paymentProviderCode
+     * @param PlaceOrderInterface[] $placeOrderList
+     * @param PlaceOrderInterface|null $expectedResult
+     * @return void
+     *
+     * @dataProvider getDataProvider
+     */
+    public function testGet(string $paymentProviderCode, array $placeOrderList, $expectedResult)
+    {
+        /** @var TMapFactory|\PHPUnit_Framework_MockObject_MockObject $tMapFactory */
+        $tMapFactory = $this->getMockBuilder(TMapFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tMapFactory->method('createSharedObjectsMap')->willReturn($placeOrderList);
+
+        $placeOrderPool = new PlaceOrderPool($tMapFactory);
+        $result = $placeOrderPool->get($paymentProviderCode);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataProvider(): array
+    {
+        $placeOrder = $this->getMockForAbstractClass(PlaceOrderInterface::class);
+        $placeOrderList = ['payment_code' => $placeOrder];
+
+        return [
+            'code exists in pool' => ['payment_code', $placeOrderList, $placeOrder],
+            'no code in pool' => ['some_code', $placeOrderList, null],
+        ];
+    }
+}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
index 1d779c11d5935..02bc966873774 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type;
 
 use Magento\Checkout\Model\Session;
@@ -10,7 +11,9 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\AddressSearchResultsInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Model\Data\Address;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderFactory;
+use Magento\Quote\Model\Quote\Address;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteria;
@@ -50,6 +53,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class MultishippingTest extends \PHPUnit\Framework\TestCase
 {
@@ -118,24 +122,74 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
      */
     private $quoteRepositoryMock;
 
+    /**
+     * @var OrderFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataObjectHelperMock;
+
+    /**
+     * @var ToOrder|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $toOrderMock;
+
+    /**
+     * @var ToOrderAddress|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $toOrderAddressMock;
+
+    /**
+     * @var ToOrderPayment|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $toOrderPaymentMock;
+
+    /**
+     * @var PriceCurrencyInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $priceMock;
+
+    /**
+     * @var ToOrderItem|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $toOrderItemMock;
+
+    /**
+     * @var PlaceOrderFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $placeOrderFactoryMock;
+
+    /**
+     * @var Generic|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionMock;
+
+    /**
+     * @var PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
     protected function setUp()
     {
         $this->checkoutSessionMock = $this->createSimpleMock(Session::class);
         $this->customerSessionMock = $this->createSimpleMock(CustomerSession::class);
-        $orderFactoryMock = $this->createSimpleMock(OrderFactory::class);
+        $this->orderFactoryMock = $this->createSimpleMock(OrderFactory::class);
         $eventManagerMock = $this->createSimpleMock(ManagerInterface::class);
-        $scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
-        $sessionMock = $this->createSimpleMock(Generic::class);
+        $this->scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
+        $this->sessionMock = $this->createSimpleMock(Generic::class);
         $addressFactoryMock = $this->createSimpleMock(AddressFactory::class);
-        $toOrderMock = $this->createSimpleMock(ToOrder::class);
-        $toOrderAddressMock = $this->createSimpleMock(ToOrderAddress::class);
-        $toOrderPaymentMock = $this->createSimpleMock(ToOrderPayment::class);
-        $toOrderItemMock = $this->createSimpleMock(ToOrderItem::class);
+        $this->toOrderMock = $this->createSimpleMock(ToOrder::class);
+        $this->toOrderAddressMock = $this->createSimpleMock(ToOrderAddress::class);
+        $this->toOrderPaymentMock = $this->createSimpleMock(ToOrderPayment::class);
+        $this->toOrderItemMock = $this->createSimpleMock(ToOrderItem::class);
         $storeManagerMock = $this->createSimpleMock(StoreManagerInterface::class);
         $paymentSpecMock = $this->createSimpleMock(SpecificationInterface::class);
         $this->helperMock = $this->createSimpleMock(Data::class);
         $orderSenderMock = $this->createSimpleMock(OrderSender::class);
-        $priceMock = $this->createSimpleMock(PriceCurrencyInterface::class);
+        $this->priceMock = $this->createSimpleMock(PriceCurrencyInterface::class);
         $this->quoteRepositoryMock = $this->createSimpleMock(CartRepositoryInterface::class);
         $this->filterBuilderMock = $this->createSimpleMock(FilterBuilder::class);
         $this->searchCriteriaBuilderMock = $this->createSimpleMock(SearchCriteriaBuilder::class);
@@ -159,32 +213,44 @@ protected function setUp()
             ->getMock();
         $allowedCountryReaderMock->method('getAllowedCountries')
             ->willReturn(['EN'=>'EN']);
+        $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['mergeDataObjects'])
+            ->getMock();
+        $this->placeOrderFactoryMock = $this->getMockBuilder(PlaceOrderFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $logger = $this->createSimpleMock(\Psr\Log\LoggerInterface::class);
 
         $this->model = new Multishipping(
             $this->checkoutSessionMock,
             $this->customerSessionMock,
-            $orderFactoryMock,
+            $this->orderFactoryMock,
             $this->addressRepositoryMock,
             $eventManagerMock,
-            $scopeConfigMock,
-            $sessionMock,
+            $this->scopeConfigMock,
+            $this->sessionMock,
             $addressFactoryMock,
-            $toOrderMock,
-            $toOrderAddressMock,
-            $toOrderPaymentMock,
-            $toOrderItemMock,
+            $this->toOrderMock,
+            $this->toOrderAddressMock,
+            $this->toOrderPaymentMock,
+            $this->toOrderItemMock,
             $storeManagerMock,
             $paymentSpecMock,
             $this->helperMock,
             $orderSenderMock,
-            $priceMock,
+            $this->priceMock,
             $this->quoteRepositoryMock,
             $this->searchCriteriaBuilderMock,
             $this->filterBuilderMock,
             $this->totalsCollectorMock,
             $data,
             $this->cartExtensionFactoryMock,
-            $allowedCountryReaderMock
+            $allowedCountryReaderMock,
+            $this->placeOrderFactoryMock,
+            $logger,
+            $this->dataObjectHelperMock
         );
 
         $this->shippingAssignmentProcessorMock = $this->createSimpleMock(ShippingAssignmentProcessor::class);
@@ -216,6 +282,10 @@ public function testSetShippingItemsInformation()
             ->willReturn(null);
 
         $this->quoteMock->expects($this->atLeastOnce())->method('getAllItems')->willReturn([]);
+        $this->quoteMock->expects($this->once())
+            ->method('__call')
+            ->with('setTotalsCollectedFlag', [false])
+            ->willReturnSelf();
 
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setField')->willReturnSelf();
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
@@ -242,7 +312,7 @@ public function testSetShippingItemsInformation()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please check shipping address information.
+     * @expectedExceptionMessage Verify the shipping address information and continue.
      */
     public function testSetShippingItemsInformationForAddressLeak()
     {
@@ -271,7 +341,7 @@ public function testSetShippingItemsInformationForAddressLeak()
         $this->assertEquals($this->model, $this->model->setShippingItemsInformation($info));
     }
 
-    public function testupdateQuoteCustomerShippingAddress()
+    public function testUpdateQuoteCustomerShippingAddress()
     {
         $addressId = 42;
         $customerAddressId = 42;
@@ -288,9 +358,9 @@ public function testupdateQuoteCustomerShippingAddress()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please check shipping address information.
+     * @expectedExceptionMessage Verify the shipping address information and continue.
      */
-    public function testupdateQuoteCustomerShippingAddressForAddressLeak()
+    public function testUpdateQuoteCustomerShippingAddressForAddressLeak()
     {
         $addressId = 43;
         $customerAddressId = 42;
@@ -318,7 +388,7 @@ public function testSetQuoteCustomerBillingAddress()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please check billing address information.
+     * @expectedExceptionMessage Verify the billing address information and continue.
      */
     public function testSetQuoteCustomerBillingAddressForAddressLeak()
     {
@@ -355,6 +425,10 @@ public function testSetShippingMethods()
         $addressMock->expects($this->once())->method('getId')->willReturn($addressId);
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([$addressMock]);
         $addressMock->expects($this->once())->method('setShippingMethod')->with($methodsArray[$addressId]);
+        $this->quoteMock->expects($this->once())
+            ->method('__call')
+            ->with('setTotalsCollectedFlag', [false])
+            ->willReturnSelf();
 
         $this->mockShippingAssignment();
 
@@ -364,11 +438,262 @@ public function testSetShippingMethods()
         $this->model->setShippingMethods($methodsArray);
     }
 
+    /**
+     * @return void
+     */
+    public function testCreateOrders(): void
+    {
+        $addressTotal = 5;
+        $productType = \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE;
+        $infoBuyRequest = [
+            'info_buyRequest' => [
+                'product' => '1',
+                'qty' => 1,
+            ],
+        ];
+        $quoteItemId = 1;
+        $paymentProviderCode = 'checkmo';
+
+        $simpleProductTypeMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\Simple::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOrderOptions'])
+            ->getMock();
+        $productMock = $this->getProductMock($simpleProductTypeMock);
+        $simpleProductTypeMock->method('getOrderOptions')->with($productMock)->willReturn($infoBuyRequest);
+
+        $quoteItemMock = $this->getQuoteItemMock($productType, $productMock);
+        $quoteAddressItemMock = $this->getQuoteAddressItemMock($quoteItemMock, $productType, $infoBuyRequest);
+        list($shippingAddressMock, $billingAddressMock) =
+            $this->getQuoteAddressesMock($quoteAddressItemMock, $addressTotal);
+        $this->setQuoteMockData($paymentProviderCode, $shippingAddressMock, $billingAddressMock);
+
+        $orderAddressMock = $this->createSimpleMock(\Magento\Sales\Api\Data\OrderAddressInterface::class);
+        $orderPaymentMock = $this->createSimpleMock(\Magento\Sales\Api\Data\OrderPaymentInterface::class);
+        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuoteItemId'])
+            ->getMock();
+        $orderItemMock->method('getQuoteItemId')->willReturn($quoteItemId);
+        $orderMock = $this->getOrderMock($orderAddressMock, $orderPaymentMock, $orderItemMock);
+
+        $this->orderFactoryMock->expects($this->once())->method('create')->willReturn($orderMock);
+        $this->dataObjectHelperMock->expects($this->once())->method('mergeDataObjects')
+            ->with(
+                \Magento\Sales\Api\Data\OrderInterface::class,
+                $orderMock,
+                $orderMock
+            )->willReturnSelf();
+        $this->priceMock->expects($this->once())->method('round')->with($addressTotal)->willReturn($addressTotal);
+
+        $this->toOrderMock
+            ->expects($this->once())
+            ->method('convert')
+            ->with($shippingAddressMock)
+            ->willReturn($orderMock);
+        $this->toOrderAddressMock->expects($this->exactly(2))->method('convert')
+            ->withConsecutive(
+                [$billingAddressMock, []],
+                [$shippingAddressMock, []]
+            )->willReturn($orderAddressMock);
+        $this->toOrderPaymentMock->method('convert')->willReturn($orderPaymentMock);
+        $this->toOrderItemMock->method('convert')->with($quoteAddressItemMock)->willReturn($orderItemMock);
+
+        $placeOrderServiceMock = $this->getMockBuilder(PlaceOrderDefault::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['place'])
+            ->getMock();
+        $placeOrderServiceMock->method('place')->with([$orderMock])->willReturn([]);
+        $this->placeOrderFactoryMock->method('create')->with($paymentProviderCode)->willReturn($placeOrderServiceMock);
+        $this->quoteRepositoryMock->method('save')->with($this->quoteMock);
+
+        $this->model->createOrders();
+    }
+
+    /**
+     * @param string $paymentProviderCode
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getPaymentMock(string $paymentProviderCode): PHPUnit_Framework_MockObject_MockObject
+    {
+        $abstractMethod = $this->getMockBuilder(AbstractMethod::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAvailable'])
+            ->getMockForAbstractClass();
+        $abstractMethod->method('isAvailable')->willReturn(true);
+
+        $paymentMock = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMethodInstance', 'getMethod'])
+            ->getMock();
+        $paymentMock->method('getMethodInstance')->willReturn($abstractMethod);
+        $paymentMock->method('getMethod')->willReturn($paymentProviderCode);
+
+        return $paymentMock;
+    }
+
+    /**
+     * @param \Magento\Catalog\Model\Product\Type\Simple|PHPUnit_Framework_MockObject_MockObject $simpleProductTypeMock
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getProductMock($simpleProductTypeMock): PHPUnit_Framework_MockObject_MockObject
+    {
+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTypeInstance'])
+            ->getMock();
+        $productMock->method('getTypeInstance')->willReturn($simpleProductTypeMock);
+
+        return $productMock;
+    }
+
+    /**
+     * @param string $productType
+     * @param \Magento\Catalog\Model\Product|PHPUnit_Framework_MockObject_MockObject $productMock
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getQuoteItemMock($productType, $productMock): PHPUnit_Framework_MockObject_MockObject
+    {
+        $quoteItemMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProductType', 'getProduct'])
+            ->getMock();
+        $quoteItemMock->method('getProductType')->willReturn($productType);
+        $quoteItemMock->method('getProduct')->willReturn($productMock);
+
+        return $quoteItemMock;
+    }
+
+    /**
+     * @param \Magento\Quote\Model\Quote\Item|PHPUnit_Framework_MockObject_MockObject $quoteItemMock
+     * @param string $productType
+     * @param array $infoBuyRequest
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getQuoteAddressItemMock(
+        $quoteItemMock,
+        string $productType,
+        array $infoBuyRequest
+    ): PHPUnit_Framework_MockObject_MockObject {
+        $quoteAddressItemMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuoteItem', 'setProductType', 'setProductOptions', 'getParentItem'])
+            ->getMock();
+        $quoteAddressItemMock->method('getQuoteItem')->willReturn($quoteItemMock);
+        $quoteAddressItemMock->method('setProductType')->with($productType)->willReturnSelf();
+        $quoteAddressItemMock->method('setProductOptions')->willReturn($infoBuyRequest);
+        $quoteAddressItemMock->method('getParentItem')->willReturn(false);
+
+        return $quoteAddressItemMock;
+    }
+
+    /**
+     * @param \Magento\Quote\Model\Quote\Address\Item|PHPUnit_Framework_MockObject_MockObject $quoteAddressItemMock
+     * @param int $addressTotal
+     * @return array
+     */
+    private function getQuoteAddressesMock($quoteAddressItemMock, int $addressTotal): array
+    {
+        $shippingAddressMock = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'validate',
+                    'getShippingMethod',
+                    'getShippingRateByCode',
+                    'getCountryId',
+                    'getAddressType',
+                    'getGrandTotal',
+                    'getAllItems',
+                ]
+            )->getMock();
+        $shippingAddressMock->method('validate')->willReturn(true);
+        $shippingAddressMock->method('getShippingMethod')->willReturn('carrier');
+        $shippingAddressMock->method('getShippingRateByCode')->willReturn('code');
+        $shippingAddressMock->method('getCountryId')->willReturn('EN');
+        $shippingAddressMock->method('getAllItems')->willReturn([$quoteAddressItemMock]);
+        $shippingAddressMock->method('getAddressType')->willReturn('shipping');
+        $shippingAddressMock->method('getGrandTotal')->willReturn($addressTotal);
+
+        $billingAddressMock = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['validate'])
+            ->getMock();
+        $billingAddressMock->method('validate')->willReturn(true);
+
+        return [$shippingAddressMock, $billingAddressMock];
+    }
+
+    /**
+     * @param string $paymentProviderCode
+     * @param Address|PHPUnit_Framework_MockObject_MockObject $shippingAddressMock
+     * @param Address|PHPUnit_Framework_MockObject_MockObject $billingAddressMock
+     *
+     * @return void
+     */
+    private function setQuoteMockData(string $paymentProviderCode, $shippingAddressMock, $billingAddressMock): void
+    {
+        $quoteId = 1;
+        $paymentMock = $this->getPaymentMock($paymentProviderCode);
+        $this->quoteMock->method('getPayment')
+            ->willReturn($paymentMock);
+        $this->quoteMock->method('getAllShippingAddresses')
+            ->willReturn([$shippingAddressMock]);
+        $this->quoteMock->method('getBillingAddress')
+            ->willReturn($billingAddressMock);
+        $this->quoteMock->method('hasVirtualItems')
+            ->willReturn(false);
+        $this->quoteMock->expects($this->once())->method('reserveOrderId')->willReturnSelf();
+        $this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
+        $this->quoteMock->method('getId')->willReturn($quoteId);
+        $this->quoteMock->method('setIsActive')->with(false)->willReturnSelf();
+    }
+
+    /**
+     * @param \Magento\Sales\Api\Data\OrderAddressInterface|PHPUnit_Framework_MockObject_MockObject $orderAddressMock
+     * @param \Magento\Sales\Api\Data\OrderPaymentInterface|PHPUnit_Framework_MockObject_MockObject $orderPaymentMock
+     * @param \Magento\Sales\Model\Order\Item|PHPUnit_Framework_MockObject_MockObject $orderItemMock
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getOrderMock(
+        $orderAddressMock,
+        $orderPaymentMock,
+        $orderItemMock
+    ): PHPUnit_Framework_MockObject_MockObject {
+        $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'setQuote',
+                    'setBillingAddress',
+                    'setShippingAddress',
+                    'setPayment',
+                    'addItem',
+                    'getIncrementId',
+                    'getId',
+                    'getCanSendNewEmailFlag',
+                    'getItems',
+                    'setShippingMethod',
+                ]
+            )->getMock();
+        $orderMock->method('setQuote')->with($this->quoteMock);
+        $orderMock->method('setBillingAddress')->with($orderAddressMock)->willReturnSelf();
+        $orderMock->method('setShippingAddress')->with($orderAddressMock)->willReturnSelf();
+        $orderMock->expects($this->once())->method('setShippingMethod')->with('carrier')->willReturnSelf();
+        $orderMock->method('setPayment')->with($orderPaymentMock)->willReturnSelf();
+        $orderMock->method('addItem')->with($orderItemMock)->willReturnSelf();
+        $orderMock->method('getIncrementId')->willReturn('1');
+        $orderMock->method('getId')->willReturn('1');
+        $orderMock->method('getCanSendNewEmailFlag')->willReturn(false);
+        $orderMock->method('getItems')->willReturn([$orderItemMock]);
+
+        return $orderMock;
+    }
+
     /**
      * Tests exception for addresses with country id not in the allowed countries list.
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Some addresses cannot be used due to country-specific configurations.
+     * @expectedExceptionMessage Some addresses can't be used due to the configurations for specific countries.
      */
     public function testCreateOrdersCountryNotPresentInAllowedListException()
     {
@@ -497,4 +822,37 @@ private function createSimpleMock($className)
             ->disableOriginalConstructor()
             ->getMock();
     }
+
+    public function testValidateMinimumAmountMultiAddressTrue()
+    {
+        $this->scopeConfigMock->expects($this->exactly(2))->method('isSetFlag')->withConsecutive(
+            ['sales/minimum_order/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+            ['sales/minimum_order/multi_address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
+        )->willReturnOnConsecutiveCalls(true, true);
+
+        $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
+        $this->quoteMock->expects($this->once())->method('validateMinimumAmount')->willReturn(false);
+        $this->assertFalse($this->model->validateMinimumAmount());
+    }
+
+    public function testValidateMinimumAmountMultiAddressFalse()
+    {
+        $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $this->scopeConfigMock->expects($this->exactly(2))->method('isSetFlag')->withConsecutive(
+            ['sales/minimum_order/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+            ['sales/minimum_order/multi_address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
+        )->willReturnOnConsecutiveCalls(true, false);
+
+        $this->scopeConfigMock->expects($this->exactly(2))->method('getValue')->withConsecutive(
+            ['sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+            ['sales/minimum_order/tax_including', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
+        )->willReturnOnConsecutiveCalls(100, false);
+
+        $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn(1);
+        $this->quoteMock->expects($this->once())->method('getAllAddresses')->willReturn([$addressMock]);
+        $addressMock->expects($this->once())->method('getBaseSubtotalWithDiscount')->willReturn(101);
+
+        $this->assertTrue($this->model->validateMinimumAmount());
+    }
 }
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index b483c4e3b0431..0d7982518d2c8 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -5,22 +5,19 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*"
-    },
-    "suggest": {
-        "magento/module-theme": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
index 5968e3324e309..0c2daaf45043e 100644
--- a/app/code/Magento/Multishipping/etc/frontend/di.xml
+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
@@ -43,6 +43,6 @@
         <plugin name="multishipping_session_mapper" type="Magento\Multishipping\Model\Checkout\Type\Multishipping\Plugin" sortOrder="50" />
     </type>
     <type name="Magento\Checkout\Controller\Cart">
-        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" />
+        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" sortOrder="50" />
     </type>
 </config>
diff --git a/app/code/Magento/Multishipping/etc/module.xml b/app/code/Magento/Multishipping/etc/module.xml
index f77de32c24a2f..c2ad47e4ccab5 100644
--- a/app/code/Magento/Multishipping/etc/module.xml
+++ b/app/code/Magento/Multishipping/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Multishipping" setup_version="2.0.0">
+    <module name="Magento_Multishipping" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv
index 1e3e1880758ee..43615e697b931 100644
--- a/app/code/Magento/Multishipping/i18n/en_US.csv
+++ b/app/code/Magento/Multishipping/i18n/en_US.csv
@@ -88,3 +88,6 @@ Options,Options
 "Review Order","Review Order"
 "Select Shipping Method","Select Shipping Method"
 "We received your order!","We received your order!"
+"Ship to:","Ship to:"
+"Error:","Error:"
+"We are unable to process your request. Please, try again later.","We are unable to process your request. Please, try again later."
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml
index 8d78bad7a9ecc..5fcca5d9214a6 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml
@@ -15,6 +15,9 @@
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Multishipping\Block\Checkout\Billing" name="checkout_billing" template="Magento_Multishipping::checkout/billing.phtml" cacheable="false">
+                <arguments>
+                    <argument name="checkout_data" xsi:type="object">Magento\Multishipping\Block\DataProviders\Billing</argument>
+                </arguments>
                 <container name="payment_methods_before" label="Payment Methods Before"/>
                 <container name="payment_methods_after" label="Payment Methods After"/>
             </block>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
index 51e9e6352cfd5..c6bcdeb7b0413 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
@@ -9,7 +9,11 @@
     <update handle="customer_form_template_handle"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false"/>
+            <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
+                <arguments>
+                    <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
index f6584d2dcb2fd..376bc7b7d8ca8 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
@@ -17,6 +17,7 @@
         <referenceContainer name="content">
             <block class="Magento\Multishipping\Block\Checkout\Overview" name="checkout_overview" template="Magento_Multishipping::checkout/overview.phtml" cacheable="false">
                 <arguments>
+                    <argument name="checkout_data" xsi:type="object">Magento\Multishipping\Block\DataProviders\Overview</argument>
                     <argument name="renderer_template" xsi:type="string">Magento_Multishipping::checkout/item/default.phtml</argument>
                     <argument name="row_renderer_template" xsi:type="string">Magento_Multishipping::checkout/overview/item.phtml</argument>
                 </arguments>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml
new file mode 100644
index 0000000000000..90f13ea28e02f
--- /dev/null
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml
@@ -0,0 +1,23 @@
+<?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" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Order results</title>
+    </head>
+    <body>
+        <referenceBlock name="page.main.title">
+            <arguments>
+                <argument translate="true" name="partly_success_title" xsi:type="string">We could only complete part of your order.</argument>
+                <argument translate="true" name="failed_title" xsi:type="string">We were unable to complete your order.</argument>
+            </arguments>
+        </referenceBlock>
+        <referenceContainer name="content">
+            <block class="Magento\Multishipping\Block\Checkout\Results" name="checkout_results" template="Magento_Multishipping::checkout/results.phtml" cacheable="false"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
index 98dd6e21910f8..d03282e551b9e 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
@@ -12,11 +12,15 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">We received your order!</argument>
+                <argument translate="true" name="title" xsi:type="string">Thank you for your purchase!</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\Multishipping\Block\Checkout\Success" name="checkout_success" template="Magento_Multishipping::checkout/success.phtml" cacheable="false"/>
+            <block class="Magento\Multishipping\Block\Checkout\Success" name="checkout_success" template="Magento_Multishipping::checkout/success.phtml" cacheable="false">
+                <arguments>
+                    <argument name="checkout_data" xsi:type="object">Magento\Multishipping\Block\DataProviders\Success</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Multishipping/view/frontend/requirejs-config.js b/app/code/Magento/Multishipping/view/frontend/requirejs-config.js
index c00005138eee4..0235d8b848154 100644
--- a/app/code/Magento/Multishipping/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Multishipping/view/frontend/requirejs-config.js
@@ -8,7 +8,9 @@ var config = {
         '*': {
             multiShipping: 'Magento_Multishipping/js/multi-shipping',
             orderOverview: 'Magento_Multishipping/js/overview',
-            payment: 'Magento_Multishipping/js/payment'
+            payment: 'Magento_Multishipping/js/payment',
+            billingLoader: 'Magento_Checkout/js/checkout-loader',
+            cartUpdate: 'Magento_Checkout/js/action/update-shopping-cart'
         }
     }
 };
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
index 30e7218285642..ab49788d8dc1b 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
@@ -10,41 +10,49 @@
 ?>
 <div class="multicheckout">
     <div class="block block-billing">
-    <?php foreach ($block->getAddress() as $_address): ?>
+    <?php foreach ($block->getAddress() as $address): ?>
         <div class="box box-billing-address">
             <div class="box-content">
                 <address>
-                    <?= $block->getAddressAsHtml($_address) ?>
-                    <?php if ($block->isAddressDefaultBilling($_address)): ?>
-                        <br /><strong><?= /* @escapeNotVerified */ __('Default Billing') ?></strong>
+                    <?= $block->getAddressAsHtml($address) ?>
+                    <?php if ($block->isAddressDefaultBilling($address)): ?>
+                        <br /><strong><?= $block->escapeHtml(__('Default Billing')); ?></strong>
                     <?php endif; ?>
-                    <?php if ($block->isAddressDefaultShipping($_address)): ?>
-                        <br /><strong><?= /* @escapeNotVerified */ __('Default Shipping') ?></strong>
+                    <?php if ($block->isAddressDefaultShipping($address)): ?>
+                        <br /><strong><?= $block->escapeHtml(__('Default Shipping')); ?></strong>
                     <?php endif; ?>
                 </address>
             </div>
             <div class="box-actions">
-                <a href="<?= /* @escapeNotVerified */ $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Address') ?></span></a>
-                <a href="<?= /* @escapeNotVerified */ $block->getSetAddressUrl($_address) ?>" class="action select"><span><?= /* @escapeNotVerified */ __('Select Address') ?></span></a>
+                <a href="<?= $block->escapeUrl($block->getEditAddressUrl($address)); ?>" class="action edit">
+                    <span><?= $block->escapeHtml(__('Edit Address')); ?></span>
+                </a>
+                <a href="<?= $block->escapeUrl($block->getSetAddressUrl($address)); ?>" class="action select">
+                    <span><?= $block->escapeHtml(__('Select Address')); ?></span>
+                </a>
             </div>
         </div>
     <?php endforeach; ?>
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="button" class="action add primary" role="add-address" title="<?= /* @escapeNotVerified */ __('Add New Address') ?>"><span><?= /* @escapeNotVerified */ __('Add New Address') ?></span></button>
+            <button type="button" class="action add primary" role="add-address" title="<?= $block->escapeHtml(__('Add New Address')); ?>">
+                <span><?= $block->escapeHtml(__('Add New Address')); ?></span>
+            </button>
         </div>
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
+                <span><?= $block->escapeHtml(__('Back to Billing Information')); ?></span>
+            </a>
         </div>
     </div>
 </div>
 <script type="text/x-magento-init">
     {
-        ".actions": {
+        ".action": {
             "address": {
                 "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?= /* @escapeNotVerified */ $block->getAddNewUrl() ?>"
+                "addAddressLocation": "<?= $block->escapeUrl($block->getAddNewUrl()); ?>"
             }
         }
     }
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index a55b84c0a2d8a..a29013cc71722 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -14,20 +14,31 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Addresses
  */
 ?>
-<form id="checkout_multishipping_form" data-mage-init='{"multiShipping":{}, "validation":{}}' action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" class="multicheckout address form">
+<form id="checkout_multishipping_form"
+      data-mage-init='{
+          "multiShipping":{},
+          "cartUpdate": {
+               "validationURL": "/multishipping/checkout/checkItems",
+               "eventName": "updateMulticartItemQty"
+          }}'
+      action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
+      method="post"
+      class="multicheckout address form">
     <div class="title">
-        <strong><?= /* @escapeNotVerified */ __('Please select a shipping address for applicable items.') ?></strong>
+        <strong><?= $block->escapeHtml(__('Please select a shipping address for applicable items.')) ?></strong>
     </div>
     <input type="hidden" name="continue" value="0" id="can_continue_flag"/>
     <input type="hidden" name="new_address" value="0" id="add_new_address_flag"/>
     <div class="table-wrapper">
         <table class="items data table" id="multiship-addresses-table">
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Please select a shipping address for applicable items.') ?></caption>
+            <caption class="table-caption">
+                <?= $block->escapeHtml(__('Please select a shipping address for applicable items.')) ?>
+            </caption>
             <thead>
             <tr>
-                <th class="col product" scope="col"><?= /* @escapeNotVerified */ __('Product') ?></th>
-                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-                <th class="col address" scope="col"><?= /* @escapeNotVerified */ __('Send To') ?></th>
+                <th class="col product" scope="col"><?= $block->escapeHtml(__('Product')) ?></th>
+                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
+                <th class="col address" scope="col"><?= $block->escapeHtml(__('Send To')) ?></th>
                 <th class="col actions" scope="col">&nbsp;</th>
             </tr>
             </thead>
@@ -35,24 +46,37 @@
             <?php foreach ($block->getItems() as $_index => $_item): ?>
                 <?php if ($_item->getQuoteItem()) : ?>
                     <tr>
-                        <td class="col product" data-th="<?= $block->escapeHtml(__('Product')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
+                        <td class="col product" data-th="<?= $block->escapeHtml(__('Product')) ?>">
+                            <?= $block->getItemHtml($_item->getQuoteItem()) ?>
+                        </td>
                         <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
                             <div class="field qty">
-                                <label for="ship-<?= /* @escapeNotVerified */ $_index ?>-<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>-qty" class="label">
-                                    <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
+                                <label for="ship-<?= $block->escapeHtml($_index) ?>-<?= $block->escapeHtml($_item->getQuoteItemId()) ?>-qty"
+                                       class="label">
+                                    <span><?= $block->escapeHtml(__('Qty')) ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="number" data-multiship-item-id="<?= /* @escapeNotVerified */ $_item->getSku() ?>" id="ship-<?= /* @escapeNotVerified */ $_index ?>-<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>-qty" name="ship[<?= /* @escapeNotVerified */ $_index ?>][<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>][qty]" value="<?= $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
+                                    <input type="number"
+                                           data-multiship-item-id="<?= $block->escapeHtml($_item->getSku()) ?>"
+                                           id="ship-<?= $block->escapeHtml($_index) ?>-<?= $block->escapeHtml($_item->getQuoteItemId()) ?>-qty"
+                                           name="ship[<?= $block->escapeHtml($_index) ?>][<?= $block->escapeHtml($_item->getQuoteItemId()) ?>][qty]"
+                                           value="<?= $block->escapeHtml($_item->getQty()) ?>"
+                                           size="2"
+                                           class="input-text qty"
+                                           data-validate="{number: true}"/>
                                 </div>
                             </div>
                         </td>
                         <td class="col address" data-th="<?= $block->escapeHtml(__('Send To')) ?>">
                             <?php if ($_item->getProduct()->getIsVirtual()): ?>
-                                <div class="applicable"><?= /* @escapeNotVerified */ __('A shipping selection is not applicable.') ?></div>
+                                <div class="applicable">
+                                    <?= $block->escapeHtml(__('A shipping selection is not applicable.')) ?>
+                                </div>
                             <?php else: ?>
                                 <div class="field address">
-                                    <label for="ship_<?= /* @escapeNotVerified */ $_index ?>_<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>_address" class="label">
-                                        <span><?= /* @escapeNotVerified */ __('Send To') ?></span>
+                                    <label for="ship_<?= $block->escapeHtml($_index) ?>_<?= $block->escapeHtml($_item->getQuoteItemId()) ?>_address"
+                                           class="label">
+                                        <span><?= $block->escapeHtml(__('Send To')) ?></span>
                                     </label>
                                     <div class="control">
                                         <?= $block->getAddressesHtmlSelect($_item, $_index) ?>
@@ -61,8 +85,11 @@
                             <?php endif; ?>
                         </td>
                         <td class="col actions" data-th="<?= $block->escapeHtml(__('Actions')) ?>">
-                            <a href="<?= /* @escapeNotVerified */ $block->getItemDeleteUrl($_item) ?>" title="<?= /* @escapeNotVerified */ __('Remove Item') ?>" class="action delete" data-multiship-item-update="">
-                                <span><?= /* @escapeNotVerified */ __('Remove item') ?></span>
+                            <a href="<?= $block->escapeUrl($block->getItemDeleteUrl($_item)) ?>"
+                               title="<?= $block->escapeHtml(__('Remove Item')) ?>"
+                               class="action delete"
+                               data-multiship-item-remove="">
+                                <span><?= $block->escapeHtml(__('Remove item')) ?></span>
                             </a>
                         </td>
                     </tr>
@@ -73,12 +100,35 @@
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" title="<?= /* @escapeNotVerified */ __('Go to Shipping Information') ?>" class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($block->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?= /* @escapeNotVerified */ __('Go to Shipping Information') ?></span></button>
+            <button type="submit"
+                    title="<?= $block->escapeHtml(__('Go to Shipping Information')) ?>"
+                    class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>"
+                    data-role="can-continue"
+                    data-flag="1"
+                <?php if ($block->isContinueDisabled()):?>
+                    disabled="disabled"
+                <?php endif; ?>>
+                <span><?= $block->escapeHtml(__('Go to Shipping Information')) ?></span>
+            </button>
         </div>
         <div class="secondary">
-            <button type="submit" data-multiship-item-update="" class="action update" data-role="can-continue" data-flag="0"><span><?= /* @escapeNotVerified */ __('Update Qty &amp; Addresses') ?></span></button>
-            <button type="button" title="<?= /* @escapeNotVerified */ __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?= /* @escapeNotVerified */ __('Enter a New Address') ?></span></button>
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Shopping Cart') ?></span></a>
+            <button type="submit"
+                    data-multiship-item-update=""
+                    class="action update"
+                    data-role="can-continue"
+                    data-flag="0">
+                <span><?= $block->escapeHtml(__('Update Qty &amp; Addresses')) ?></span>
+            </button>
+            <button type="button"
+                    title="<?= $block->escapeHtml(__('Enter a New Address')) ?>"
+                    class="action add"
+                    data-role="add-new-address">
+                <span><?= $block->escapeHtml(__('Enter a New Address')) ?></span>
+            </button>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>"
+               class="action back">
+                <span><?= $block->escapeHtml(__('Back to Shopping Cart')) ?></span>
+            </a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index 277328c1b5b2a..da553b7823da9 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -4,52 +4,109 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * Multishipping checkout billing information
  *
  * @var $block \Magento\Multishipping\Block\Checkout\Billing
  */
 ?>
-<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="multishipping-billing-form" class="form multicheckout billing">
+<div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"billingLoader": {}}'>
+    <div class="loader">
+        <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
+             alt="<?= $block->escapeHtml(__('Loading...')); ?>"
+             style="position: absolute;">
+    </div>
+</div>
+<script>
+    window.checkoutConfig = <?= /* @noEscape */ $block->getCheckoutData()->getSerializedCheckoutConfigs(); ?>;
+    window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
+    window.customerData = window.checkoutConfig.customerData;
+</script>
+<div id="checkout" data-bind="scope:'checkoutMessages'">
+    <!-- ko template: getTemplate() --><!-- /ko -->
+    <script type="text/x-magento-init">
+        {
+            "#checkout": {
+                "Magento_Ui/js/core/app": {
+                   "components": {
+                        "checkoutMessages": {
+                            "component": "Magento_Ui/js/view/messages",
+                            "displayArea": "messages"
+                        }
+                    }
+                }
+            }
+        }
+    </script>
+</div>
+<form action="<?= $block->escapeUrl($block->getPostActionUrl()); ?>"
+      method="post"
+      id="multishipping-billing-form"
+      class="form multicheckout billing">
     <div class="block block-billing">
         <div class="block-content">
             <div class="box box-billing-address">
                 <strong class="box-title">
-                    <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
-                    <a href="<?= /* @escapeNotVerified */ $block->getSelectAddressUrl() ?>" class="action"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
+                    <span><?= $block->escapeHtml(__('Billing Address')); ?></span>
+                    <a href="<?= $block->escapeUrl($block->getSelectAddressUrl()); ?>" class="action">
+                        <span><?= $block->escapeHtml(__('Change')); ?></span>
+                    </a>
                 </strong>
                 <div class="box-content">
-                    <?php $_address = $block->getAddress() ?>
-                    <address><?= /* @escapeNotVerified */ $_address->format('html') ?></address>
+                    <address>
+                        <?= /* @noEscape */ $block->getCheckoutData()->getAddressHtml($block->getAddress()); ?>
+                    </address>
                 </div>
             </div>
             <div class="box box-billing-method">
                 <fieldset class="fieldset">
-                    <legend class="legend box-title"><span><?= /* @escapeNotVerified */ __('Payment Method') ?></span></legend><br>
+                    <legend class="legend box-title">
+                        <span><?= $block->escapeHtml(__('Payment Method')); ?></span>
+                    </legend><br>
                     <div class="box-content">
                         <?= $block->getChildHtml('payment_methods_before') ?>
                         <?php /* Payment methods forms list */ ?>
-                        <dl class="items methods-payment" id="payment-methods">
+                        <dl class="checkout-payment-method" id="payment-methods">
                             <?php
-                            $_methods       = $block->getMethods();
-                            $_methodsCount  = count($_methods);
-                            ?>
-                            <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
-                                <dt class="item-title">
-                                    <?php if ($_methodsCount > 1): ?>
-                                        <input type="radio" id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" name="payment[method]" title="<?= $block->escapeHtml($_method->getTitle()) ?>" <?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio"/>
-                                    <?php else : ?>
-                                        <input type="radio" id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/>
-                                    <?php endif; ?>
-                                    <label for="p_method_<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_method->getTitle()) ?></label>
-                                </dt>
-                                <?php if ($html = $block->getChildHtml('payment.method.' . $_code)) : ?>
-                                    <dd class="item-content">
-                                        <?= /* @escapeNotVerified */ $html ?>
+                            $methods = $block->getMethods();
+                            $methodsCount = count($methods);
+                            $methodsForms = $block->hasFormTemplates() ? $block->getFormTemplates(): [];
+
+                            foreach ($methods as $_method) :
+                                    $code = $_method->getCode();
+                                    $checked = $block->getSelectedMethodCode() === $code;
+
+                                if (isset($methodsForms[$code])) {
+                                    $block->setMethodFormTemplate($code, $methodsForms[$code]);
+                                }
+                                ?>
+                            <dt class="item-title">
+                                <?php if ($methodsCount > 1) : ?>
+                                    <input type="radio"
+                                           id="p_method_<?= $block->escapeHtml($code); ?>"
+                                           value="<?= $block->escapeHtml($code); ?>"
+                                           name="payment[method]"
+                                           title="<?= $block->escapeHtml($_method->getTitle()) ?>"
+                                        <?php if ($checked) : ?>
+                                           checked="checked"
+                                        <?php endif; ?>
+                                           class="radio"/>
+                                <?php else : ?>
+                                    <input type="radio"
+                                           id="p_method_<?= $block->escapeHtml($code); ?>"
+                                           value="<?= $block->escapeHtml($code); ?>"
+                                           name="payment[method]"
+                                           checked="checked"
+                                           class="radio solo method" />
+                                <?php endif; ?>
+                                    <label for="p_method_<?= $block->escapeHtml($code); ?>">
+                                        <?= $block->escapeHtml($_method->getTitle()) ?>
+                                    </label>
+                            </dt>
+                                <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
+                                    <dd class="item-content <?= $checked ? '' : 'no-display'; ?>"
+                                        data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
+                                        <?= /* @noEscape */ $html; ?>
                                     </dd>
                                 <?php endif; ?>
                             <?php endforeach; ?>
@@ -63,29 +120,35 @@
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button id="payment-continue" type="submit" class="action primary continue"><span><?= /* @escapeNotVerified */ __('Go to Review Your Order') ?></span></button>
+            <button id="payment-continue"
+                    type="button"
+                    class="action primary continue">
+                <span><?= $block->escapeHtml(__('Go to Review Your Order')); ?></span>
+            </button>
         </div>
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Shipping Information') ?></span></a>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
+                <span><?= $block->escapeHtml(__('Back to Shipping Information')); ?></span>
+            </a>
         </div>
     </div>
 </form>
 <script>
-require(['jquery', 'mage/mage'], function(jQuery){
+    require(['jquery', 'mage/mage'], function(jQuery) {
+        var addtocartForm = jQuery('#multishipping-billing-form');
 
-    var addtocartForm = jQuery('#multishipping-billing-form');
-    addtocartForm.mage('payment', {
-        checkoutPrice: <?= (float)$block->getQuoteBaseGrandTotal() ?>
-    });
-    addtocartForm.mage('validation', {
-        errorPlacement: function(error, element) {
-            if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-cc-ukss') >= 0) {
-                 element.parents('form').find('[data-validation-msg="validate-cc-ukss"]').html(error);
-            } else {
-                 element.after(error);
+        addtocartForm.mage('payment', {
+            checkoutPrice: <?= (float)$block->getQuoteBaseGrandTotal() ?>
+        });
+
+        addtocartForm.mage('validation', {
+            errorPlacement: function(error, element) {
+                if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-cc-ukss') >= 0) {
+                    element.parents('form').find('[data-validation-msg="validate-cc-ukss"]').html(error);
+                } else {
+                    element.after(error);
+                }
             }
-        }
+        });
     });
-
-});
 </script>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index 2549eff3aca7d..4590b7c584085 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -4,105 +4,146 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Multishipping\Block\Checkout\Overview $block */
 ?>
-<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}, "validation":{}}' class="form multicheckout order-review">
-    <?= $block->getBlockHtml('formkey') ?>
+<?php $errors = $block->getCheckoutData()->getAddressErrors(); ?>
+<?php foreach ($errors as $addressId => $error) : ?>
+    <div class="message message-error error">
+        <?= $block->escapeHtml($error); ?>
+        <?= $block->escapeHtml(__('Please see')); ?>
+        <a href="#<?= $block->escapeHtml($block->getCheckoutData()->getAddressAnchorName($addressId)); ?>">
+            <?= $block->escapeHtml(__('details below')); ?></a>.
+    </div>
+<?php endforeach;?>
+<form action="<?= $block->escapeUrl($block->getPostActionUrl()); ?>"
+      method="post"
+      id="review-order-form"
+      data-mage-init='{"orderOverview": {}, "validation":{}}'
+      class="form multicheckout order-review">
+    <?= /* @noEscape */ $block->getBlockHtml('formkey'); ?>
     <div class="block block-billing">
-        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Billing Information') ?></strong></div>
+        <div class="block-title"><strong><?= $block->escapeHtml(__('Billing Information')); ?></strong></div>
         <div class="block-content">
             <div class="box box-billing-address">
-                <?php $_address = $block->getBillingAddress() ?>
+                <?php $address = $block->getBillingAddress() ?>
                 <strong class="box-title">
-                    <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
-                    <a href="<?= /* @escapeNotVerified */ $block->getEditBillingAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
+                    <span><?= $block->escapeHtml(__('Billing Address')); ?></span>
+                    <a href="<?= $block->escapeUrl($block->getEditBillingAddressUrl($address)); ?>"
+                       class="action edit"><span><?= $block->escapeHtml(__('Change')); ?></span></a>
                 </strong>
                 <div class="box-content">
                     <address>
-                        <?= /* @escapeNotVerified */ $_address->format('html') ?>
+                        <?= /* @noEscape */ $address->format('html') ?>
                     </address>
                 </div>
             </div>
             <div class="box box-billing-method">
                 <strong class="box-title">
-                    <span><?= /* @escapeNotVerified */ __('Payment Method') ?></span>
-                    <a href="<?= /* @escapeNotVerified */ $block->getEditBillingUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
+                    <span><?= $block->escapeHtml(__('Payment Method')); ?></span>
+                    <a href="<?= $block->escapeUrl($block->getEditBillingUrl()); ?>"
+                       class="action edit"><span><?= $block->escapeHtml(__('Change')); ?></span></a>
                 </strong>
                 <div class="box-content">
-                    <input type="hidden" name="payment[cc_number]" value="<?= $block->escapeHtml($block->getPayment()->getCcNumber()) ?>" />
-                    <input type="hidden" name="payment[cc_cid]" value="<?= $block->escapeHtml($block->getPayment()->getCcCid()) ?>" />
-                    <?= $block->getPaymentHtml() ?>
+                    <input type="hidden"
+                           name="payment[cc_number]"
+                           value="<?= $block->escapeHtml($block->getPayment()->getCcNumber()) ?>" />
+                    <input type="hidden"
+                           name="payment[cc_cid]"
+                           value="<?= $block->escapeHtml($block->getPayment()->getCcCid()) ?>" />
+                    <?= /* @noEscape */ $block->getPaymentHtml() ?>
                 </div>
             </div>
         </div>
     </div>
     <div class="block block-shipping">
-        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Shipping Information') ?></strong></div>
-        <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
-        <?php foreach ($block->getShippingAddresses() as $_index => $_address): ?>
+        <div class="block-title"><strong><?= $block->escapeHtml(__('Shipping Information')); ?></strong></div>
+        <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
+        <?php foreach ($block->getShippingAddresses() as $index => $address) : ?>
             <div class="block-content">
+                <a name="<?= $block->escapeHtml($block->getCheckoutData()
+                    ->getAddressAnchorName($address->getId())); ?>"></a>
                 <div class="title">
-                    <strong><?= /* @escapeNotVerified */ __('Address %1 <span>of %2</span>', ($_index+1), $block->getShippingAddressCount()) ?></strong>
+                    <strong><?= $block->escapeHtml(__('Address')); ?> <?= $block->escapeHtml($index + 1); ?>
+                        <span>
+                            <?= $block->escapeHtml(__('of')); ?>
+                            <?= $block->escapeHtml($block->getShippingAddressCount())?>
+                        </span>
+                    </strong>
                 </div>
+                <?php if ($error = $block->getCheckoutData()->getAddressError($address)) : ?>
+                    <div class="error-description"><?= $block->escapeHtml($error); ?></div>
+                <?php endif;?>
                 <div class="box box-shipping-address">
                     <strong class="box-title">
-                        <span><?= /* @escapeNotVerified */ __('Shipping To') ?></span>
-                        <a href="<?= /* @escapeNotVerified */ $block->getEditShippingAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
+                        <span><?= $block->escapeHtml(__('Shipping To')); ?></span>
+                        <a href="<?= $block->escapeUrl($block->getEditShippingAddressUrl($address)); ?>"
+                           class="action edit"><span><?= $block->escapeHtml(__('Change')); ?></span></a>
                     </strong>
                     <div class="box-content">
                         <address>
-                            <?= /* @escapeNotVerified */ $_address->format('html') ?>
+                            <?= /* @noEscape */ $address->format('html') ?>
                         </address>
                     </div>
                 </div>
                 <div class="box box-shipping-method">
                     <strong class="box-title">
-                        <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
-                        <a href="<?= /* @escapeNotVerified */ $block->getEditShippingUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
+                        <span><?= $block->escapeHtml(__('Shipping Method')); ?></span>
+                        <a href="<?= $block->escapeUrl($block->getEditShippingUrl()); ?>"
+                           class="action edit"><span><?= $block->escapeHtml(__('Change')); ?></span></a>
                     </strong>
-                    <?php if ($_rate = $block->getShippingAddressRate($_address)): ?>
+                    <?php if ($_rate = $block->getShippingAddressRate($address)) : ?>
                         <div class="box-content">
-                            <?= $block->escapeHtml($_rate->getCarrierTitle()) ?> (<?= $block->escapeHtml($_rate->getMethodTitle()) ?>)
-                            <?php $_excl = $block->getShippingPriceExclTax($_address); ?>
-                            <?php $_incl = $block->getShippingPriceInclTax($_address); ?>
-
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
-                            <?php endif; ?>
-                                <?= /* @escapeNotVerified */ $_incl ?>
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            </span>
-                            <?php endif; ?>
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><?= /* @escapeNotVerified */ $_excl ?></span>
-                            <?php endif; ?>
+                            <?= $block->escapeHtml($_rate->getCarrierTitle()) ?>
+                            (<?= $block->escapeHtml($_rate->getMethodTitle()) ?>)
+                            <?php
+                            $exclTax = $block->getShippingPriceExclTax($address);
+                            $inclTax = $block->getShippingPriceInclTax($address);
+                            $displayBothPrices = $this->helper(Magento\Tax\Helper\Data::class)
+                                ->displayShippingBothPrices() && $inclTax !== $exclTax;
+                            ?>
+                            <?php if ($displayBothPrices) : ?>
+                                <span class="price-including-tax"
+                                      data-label="<?= $block->escapeHtml(__('Incl. Tax')); ?>">
+                                    <?= /* @noEscape */ $inclTax ?>
+                                </span>
+                                <span class="price-excluding-tax"
+                                      data-label="<?= $block->escapeHtml(__('Excl. Tax')); ?>">
+                                    <?= /* @noEscape */ $exclTax; ?>
+                                </span>
+                            <?php else : ?>
+                                <?= /* @noEscape */ $inclTax ?>
+                            <?php  endif; ?>
                         </div>
                     <?php endif; ?>
                 </div>
                 <div class="box box-items">
                     <div class="box-content">
                         <div class="order-review-wrapper table-wrapper">
-                            <table class="items data table table-order-review" id="overview-table-<?= /* @escapeNotVerified */ $_address->getId() ?>">
-                                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Order Review') ?></caption>
+                            <table class="items data table table-order-review"
+                                   id="overview-table-<?= $block->escapeHtml($address->getId()); ?>">
+                                <caption class="table-caption"><?= $block->escapeHtml(__('Order Review')); ?></caption>
                                 <thead>
                                 <tr>
-                                    <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Item') ?>
-                                        <a href="<?= /* @escapeNotVerified */ $block->getAddressesEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit') ?></span></a>
+                                    <th class="col item" scope="col"><?= $block->escapeHtml(__('Item')); ?>
+                                        <a href="<?= $block->escapeUrl($block->getAddressesEditUrl()); ?>"
+                                           class="action edit">
+                                            <span><?= $block->escapeHtml(__('Edit')); ?></span>
+                                        </a>
                                     </th>
-                                    <th class="col price" scope="col"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                                    <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-                                    <th class="col subtotal" scope="col"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
+                                    <th class="col price" scope="col"><?= $block->escapeHtml(__('Price')); ?></th>
+                                    <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')); ?></th>
+                                    <th class="col subtotal" scope="col"><?= $block->escapeHtml(__('Subtotal')); ?></th>
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php foreach ($block->getShippingAddressItems($_address) as $_item): ?>
-                                    <?= $block->getRowItemHtml($_item) ?>
+                                <?php foreach ($block->getShippingAddressItems($address) as $item) : ?>
+                                    <?= /* @noEscape */ $block->getRowItemHtml($item) ?>
                                 <?php endforeach; ?>
                                 </tbody>
                                 <tfoot>
-                                    <?= /* @escapeNotVerified */ $block->renderTotals($block->getShippingAddressTotals($_address)) ?>
+                                    <?= /* @noEscape */ $block->renderTotals(
+                                        $block->getShippingAddressTotals($address)
+                                    ); ?>
                                 </tfoot>
                             </table>
                         </div>
@@ -112,33 +153,40 @@
         <?php endforeach; ?>
     </div>
 
-    <?php if ($block->getQuote()->hasVirtualItems()): ?>
+    <?php if ($block->getQuote()->hasVirtualItems()) : ?>
     <div class="block block-other">
-        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Other items in your order') ?></strong></div>
+        <?php $billingAddress = $block->getQuote()->getBillingAddress(); ?>
+        <a name="<?= $block->escapeHtml($block->getCheckoutData()
+            ->getAddressAnchorName($billingAddress->getId())); ?>"></a>
+        <div class="block-title"><strong><?= $block->escapeHtml(__('Other items in your order')); ?></strong></div>
+        <?php if ($error = $block->getCheckoutData()->getAddressError($billingAddress)) :?>
+                <div class="error-description"><?= $block->escapeHtml($error); ?></div>
+        <?php endif;?>
         <div class="block-content">
             <strong class="subtitle">
-                <span><?= /* @escapeNotVerified */ __('Items') ?></span>
-                <a href="<?= /* @escapeNotVerified */ $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
+                <span><?= $block->escapeHtml(__('Items')); ?></span>
+                <a href="<?= $block->escapeUrl($block->getVirtualProductEditUrl()); ?>"
+                   class="action edit"><span><?= $block->escapeHtml(__('Edit Items')); ?></span></a>
             </strong>
-            <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
+            <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
             <div class="order-review-wrapper table-wrapper">
                 <table class="items data table table-order-review" id="virtual-overview-table">
-                    <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items') ?></caption>
+                    <caption class="table-caption"><?= $block->escapeHtml(__('Items')); ?></caption>
                     <thead>
                         <tr>
-                            <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                            <th class="col price" scope="col"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                            <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-                            <th class="col subtotal" scope="col"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
+                            <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')); ?></th>
+                            <th class="col price" scope="col"><?= $block->escapeHtml(__('Price')); ?></th>
+                            <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')); ?></th>
+                            <th class="col subtotal" scope="col"><?= $block->escapeHtml(__('Subtotal')); ?></th>
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach ($block->getVirtualItems() as $_item): ?>
-                            <?= $block->getRowItemHtml($_item) ?>
+                        <?php foreach ($block->getVirtualItems() as $_item) : ?>
+                            <?= /* @noEscape */ $block->getRowItemHtml($_item) ?>
                         <?php endforeach; ?>
                     </tbody>
                     <tfoot>
-                    <?= /* @escapeNotVerified */ $block->renderTotals($block->getBillinAddressTotals()) ?>
+                    <?= /* @noEscape */ $block->renderTotals($block->getBillingAddressTotals()); ?>
                     </tfoot>
                 </table>
             </div>
@@ -146,23 +194,34 @@
     </div>
     <?php endif; ?>
 
-    <?= $block->getChildHtml('items_after') ?>
+    <?= /* @noEscape */ $block->getChildHtml('items_after') ?>
 
     <div id="checkout-review-submit" class="checkout-review">
-        <?= $block->getChildHtml('agreements') ?>
+        <?= /* @noEscape */ $block->getChildHtml('agreements') ?>
         <div class="grand totals">
-            <strong class="mark"><?= /* @escapeNotVerified */ __('Grand Total:') ?></strong>
-            <strong class="amount"><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()) ?></strong>
+            <strong class="mark"><?= $block->escapeHtml(__('Grand Total:')); ?></strong>
+            <strong class="amount">
+                <?= /* @noEscape */ $this->helper(Magento\Checkout\Helper\Data::class)
+                    ->formatPrice($block->getTotal()); ?>
+            </strong>
         </div>
         <div class="actions-toolbar" id="review-buttons-container">
             <div class="primary">
-                <button type="submit" class="action primary submit" id="review-button"><span><?= /* @escapeNotVerified */ __('Place Order') ?></span></button>
+                <button type="submit"
+                        class="action primary submit"
+                        id="review-button"><span><?= $block->escapeHtml(__('Place Order')); ?></span>
+                </button>
             </div>
             <div class="secondary">
-                <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
+                <a href="<?= $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
+                    <span><?= $block->escapeHtml(__('Back to Billing Information')); ?></span>
+                </a>
             </div>
-            <span id="review-please-wait" class="please-wait load indicator" style="display: none;" data-text="<?= /* @escapeNotVerified */ __('Submitting order information...') ?>">
-                <span><?= /* @escapeNotVerified */ __('Submitting order information...') ?></span>
+            <span id="review-please-wait"
+                  class="please-wait load indicator"
+                  style="display: none;"
+                  data-text="<?= $block->escapeHtml(__('Submitting order information...')); ?>">
+                <span><?= $block->escapeHtml(__('Submitting order information...')); ?></span>
             </span>
         </div>
     </div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
new file mode 100644
index 0000000000000..68ff49b7b0dbb
--- /dev/null
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Multishipping\Block\Checkout\Results $block */
+
+$orderIds = $block->getOrderIds();
+?>
+<div class="multicheckout results">
+    <p class="block-content">
+        <?php if (!empty($orderIds)) : ?>
+            <?= $block->escapeHtml(__('Not all items were included.')); ?>
+        <?php endif; ?>
+        <?= $block->escapeHtml(__('For details, see')); ?>
+        <a href="#failed"><?= $block->escapeHtml(__('Failed to Order')); ?></a>
+        <?= $block->escapeHtml(__('section below')); ?>
+    </p>
+    <?php if (!empty($orderIds)) : ?>
+    <p class="block-content">
+        <?= $block->escapeHtml(__('For successfully ordered items, you\'ll receive a confirmation email '.
+            'including order numbers, tracking information, and more details.')); ?>
+    </p>
+    <div class="orders-succeed">
+        <h3 class="subtitle"><?= $block->escapeHtml(__('Successfully Ordered')); ?></h3>
+        <ul class="orders-list">
+            <?php foreach ($orderIds as $orderId => $incrementId) : ?>
+                <li class="shipping-list">
+                    <div class="order-id"><a href="<?= $block->escapeUrl($block->getViewOrderUrl($orderId)); ?>">
+                    <?= $block->escapeHtml($incrementId); ?></a></div>
+                    <?php $shippingAddress = $block->getOrderShippingAddress($orderId); ?>
+                    <div class="shipping-item">
+                        <?php if ($shippingAddress) : ?>
+                        <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
+                        <span class="shipping-address">
+                            <?= $block->escapeHtml($block->formatOrderShippingAddress($shippingAddress)); ?>
+                        </span>
+                        <?php else : ?>
+                            <span class="shipping-address">
+                                <?= $block->escapeHtml(__('No shipping required.')); ?>
+                            </span>
+                        <?php endif; ?>
+                    </div>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
+    <?php endif; ?>
+    <div class="orders-failed">
+        <h3 class="subtitle"><a name="failed"><?= $block->escapeHtml(__('Failed to Order')); ?></a></h3>
+        <div class="message message-error error">
+            <div>
+                <?= $block->escapeHtml(__('To purchase these items: Return to the')); ?>
+                <a href="<?= $block->escapeUrl($block->getUrl('*/*/overview')) ?>">
+                    <?= $block->escapeHtml(__('Review page in Checkout')); ?></a>,
+                <?= $block->escapeHtml(__('resolve any errors, and place a new order.'))?>
+            </div>
+        </div>
+        <?php $failedAddresses = $block->getFailedAddresses() ?>
+        <?php if (!empty($failedAddresses)) : ?>
+            <ol class="orders-list">
+                <?php foreach ($failedAddresses as $address) : ?>
+                <li class="shipping-list">
+                    <dl class="shipping-item">
+                        <dt class="shipping-block">
+                            <?php if ($block->isShippingAddress($address)) : ?>
+                            <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
+                            <span class="shipping-address">
+                                <?= $block->escapeHtml($block->formatQuoteShippingAddress($address)); ?>
+                            </span>
+                            <?php else : ?>
+                            <span class="shipping-address">
+                                <?= $block->escapeHtml(__('No shipping required.')); ?>
+                            </span>
+                            <?php endif; ?>
+                        </dt>
+                        <dd class="error-block">
+                            <span class="error-label"><?= $block->escapeHtml(__('Error:')); ?></span>
+                            <span class="error-description">
+                                <?= /* @noEscape */ $block->getAddressError($address); ?>
+                            </span>
+                        </dd>
+                    </dl>
+                </li>
+                <?php endforeach; ?>
+            </ol>
+        <?php endif;?>
+    </div>
+</div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
index 3403c745e6495..0fe046800a80d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -4,27 +4,48 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Multishipping\Block\Checkout\Success $block */
 ?>
-<div class="multicheckout success">
-    <h2 class="subtitle"><?= $block->escapeHtml(__('Thank you for your purchase!')) ?></h2>
-    <p><?= $block->escapeHtml(__('Thanks for your order. We\'ll email you order details and tracking information.')) ?></p>
-    <?php if ($_orderIds = $block->getOrderIds()): ?>
-    <p class="order-number">
-        <?php $flag = false ?>
-        <span>
-            <?php if (count($_orderIds) > 1): ?>
-                <?= $block->escapeHtml(__('Your order numbers are: ')) ?>
-            <?php else : ?>
-                <?= $block->escapeHtml(__('Your order number is: ')) ?>
-            <?php endif; ?>
-        </span>
-        <?php foreach ($_orderIds as $orderId => $incrementId): ?><?php if ($flag): ?><?= ', ' ?><?php endif; ?><?php $flag = true ?><a href="<?= /* @escapeNotVerified */ $block->getViewOrderUrl($orderId) ?>"><?= /* @escapeNotVerified */ $incrementId ?></a><?php endforeach; ?>
-    </p>
-    <?php endif; ?>
-    <?= $block->getChildHtml() ?>
-    <div class="actions">
-        <a class="action continue" title="<?= $block->escapeHtml(__('Continue Shopping')) ?>" href="<?= /* @escapeNotVerified */ $block->getContinueUrl() ?>"><span><?= $block->escapeHtml(__('Continue Shopping')) ?></span></a>
+<form action="<?= $block->escapeUrl($block->getContinueUrl()); ?>" method="post">
+    <div class="multicheckout success">
+        <p><?= $block->escapeHtml(__('For successfully order items, you\'ll receive a confirmation email including '.
+                'order numbers, tracking information and more details.')) ?></p>
+        <?php if ($orderIds = $block->getOrderIds()) : ?>
+            <h3><?= $block->escapeHtml(__('Successfully ordered'))?></h3>
+            <div class="orders-succeed">
+            <ul class="orders-list">
+            <?php foreach ($orderIds as $orderId => $incrementId) : ?>
+                <li class="shipping-list">
+                    <div class="order-id"><a href="<?= $block->escapeUrl($block->getViewOrderUrl($orderId)); ?>">
+                        <?= $block->escapeHtml($incrementId); ?></a>
+                    </div>
+                <?php $shippingAddress = $block->getCheckoutData()->getOrderShippingAddress($orderId); ?>
+                    <div class="shipping-item">
+                        <?php if ($shippingAddress) : ?>
+                        <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
+                        <span class="shipping-address">
+                            <?= $block->escapeHtml(
+                                $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
+                            ); ?>
+                        </span>
+                        <?php else : ?>
+                            <span class="shipping-address">
+                                <?= $block->escapeHtml(__('No shipping required.')); ?>
+                            </span>
+                        <?php endif; ?>
+                    </div>
+                </li>
+            <?php endforeach; ?>
+            </ul>
+            </div>
+        <?php endif; ?>
+        <?= $block->getChildHtml() ?>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button type="submit"
+                        class="action primary submit"><span><?= $block->escapeHtml(__('Continue Shopping')); ?></span>
+                </button>
+            </div>
+        </div>
     </div>
-</div>
+</form>
diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/payment.js b/app/code/Magento/Multishipping/view/frontend/web/js/payment.js
index 94987328bb278..da24b99597d42 100644
--- a/app/code/Magento/Multishipping/view/frontend/web/js/payment.js
+++ b/app/code/Magento/Multishipping/view/frontend/web/js/payment.js
@@ -63,9 +63,12 @@ define([
                 parentsDl = element.closest('dl');
 
             parentsDl.find('dt input:radio').prop('checked', false);
-            parentsDl.find('.items').hide().find('[name^="payment["]').prop('disabled', true);
+            parentsDl.find('dd').addClass('no-display').end()
+                .find('.items').hide()
+                .find('[name^="payment["]').prop('disabled', true);
             element.prop('checked', true).parent()
-                .nextUntil('dt').find('.items').show().find('[name^="payment["]').prop('disabled', false);
+                .next('dd').removeClass('no-display')
+                .find('.items').show().find('[name^="payment["]').prop('disabled', false);
         },
 
         /**
@@ -122,16 +125,35 @@ define([
             this.element.find(this.options.methodsContainer).show();
         },
 
+        /**
+         * Returns checked payment method.
+         *
+         * @private
+         */
+        _getSelectedPaymentMethod: function () {
+            return this.element.find('input[name=\'payment[method]\']:checked');
+        },
+
         /**
          * Validate  before form submit
          * @private
          * @param {EventObject} e
          */
         _submitHandler: function (e) {
+            var currentMethod,
+                submitButton;
+
             e.preventDefault();
 
             if (this._validatePaymentMethod()) {
-                this.element.submit();
+                currentMethod = this._getSelectedPaymentMethod();
+                submitButton = currentMethod.parent().next('dd').find('button[type=submit]');
+
+                if (submitButton.length) {
+                    submitButton.first().trigger('click');
+                } else {
+                    this.element.submit();
+                }
             }
         }
     });
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE.txt b/app/code/Magento/MysqlMq/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE.txt
rename to app/code/Magento/MysqlMq/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE_AFL.txt b/app/code/Magento/MysqlMq/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE_AFL.txt
rename to app/code/Magento/MysqlMq/LICENSE_AFL.txt
diff --git a/app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php b/app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php
new file mode 100644
index 0000000000000..d58c708770acd
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolverInterface;
+
+/**
+ * DB connection type resolver.
+ */
+class ConnectionTypeResolver implements ConnectionTypeResolverInterface
+{
+    /**
+     * DB connection names.
+     *
+     * @var string[]
+     */
+    private $dbConnectionNames;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param string[] $dbConnectionNames
+     */
+    public function __construct(array $dbConnectionNames = [])
+    {
+        $this->dbConnectionNames = $dbConnectionNames;
+        $this->dbConnectionNames[] = 'db';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionType($connectionName)
+    {
+        return in_array($connectionName, $this->dbConnectionNames) ? 'db' : null;
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php b/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
new file mode 100644
index 0000000000000..247a44667be06
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver\Bulk;
+
+use Magento\Framework\MessageQueue\Bulk\ExchangeInterface;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\MysqlMq\Model\QueueManagement;
+
+/**
+ * Used to send messages in bulk in MySQL queue.
+ */
+class Exchange implements ExchangeInterface
+{
+    /**
+     * @var MessageQueueConfig
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @var QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param QueueManagement $queueManagement
+     */
+    public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagement $queueManagement)
+    {
+        $this->messageQueueConfig = $messageQueueConfig;
+        $this->queueManagement = $queueManagement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue($topic, array $envelopes)
+    {
+        $queueNames = $this->messageQueueConfig->getQueuesByTopic($topic);
+        $messages = array_map(
+            function ($envelope) {
+                return $envelope->getBody();
+            },
+            $envelopes
+        );
+        $this->queueManagement->addMessagesToQueues($topic, $messages, $queueNames);
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Exchange.php b/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
new file mode 100644
index 0000000000000..b6050c6b3d0b6
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\ExchangeInterface;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\MysqlMq\Model\QueueManagement;
+
+class Exchange implements ExchangeInterface
+{
+    /**
+     * @var MessageQueueConfig
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @var QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param QueueManagement $queueManagement
+     */
+    public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagement $queueManagement)
+    {
+        $this->messageQueueConfig = $messageQueueConfig;
+        $this->queueManagement = $queueManagement;
+    }
+
+    /**
+     * Send message
+     *
+     * @param string $topic
+     * @param EnvelopeInterface $envelope
+     * @return mixed
+     */
+    public function enqueue($topic, EnvelopeInterface $envelope)
+    {
+        $queueNames = $this->messageQueueConfig->getQueuesByTopic($topic);
+        $this->queueManagement->addMessageToQueues($topic, $envelope->getBody(), $queueNames);
+        return null;
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/ExchangeFactory.php b/app/code/Magento/MysqlMq/Model/Driver/ExchangeFactory.php
new file mode 100644
index 0000000000000..8b9d08a2ed403
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/ExchangeFactory.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+/**
+ * Factory class for @see \Magento\MysqlMq\Model\Driver\Exchange
+ */
+class ExchangeFactory implements \Magento\Framework\MessageQueue\ExchangeFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\MysqlMq\Model\Driver\Exchange::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function create($connectionName, array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Queue.php b/app/code/Magento/MysqlMq/Model/Driver/Queue.php
new file mode 100644
index 0000000000000..b8dab6fac7b24
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/Queue.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use Magento\MysqlMq\Model\QueueManagement;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Queue based on MessageQueue protocol
+ */
+class Queue implements QueueInterface
+{
+    /**
+     * @var QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var string
+     */
+    private $queueName;
+
+    /**
+     * @var int
+     */
+    private $interval;
+
+    /**
+     * @var int
+     */
+    private $maxNumberOfTrials;
+
+    /**
+     * @var LoggerInterface $logger
+     */
+    private $logger;
+
+    /**
+     * Queue constructor.
+     *
+     * @param QueueManagement $queueManagement
+     * @param EnvelopeFactory $envelopeFactory
+     * @param LoggerInterface $logger
+     * @param string $queueName
+     * @param int $interval
+     * @param int $maxNumberOfTrials
+     */
+    public function __construct(
+        QueueManagement $queueManagement,
+        EnvelopeFactory $envelopeFactory,
+        LoggerInterface $logger,
+        $queueName,
+        $interval = 5,
+        $maxNumberOfTrials = 3
+    ) {
+        $this->queueManagement = $queueManagement;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->queueName = $queueName;
+        $this->interval = $interval;
+        $this->maxNumberOfTrials = $maxNumberOfTrials;
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dequeue()
+    {
+        $envelope = null;
+        $messages = $this->queueManagement->readMessages($this->queueName, 1);
+        if (isset($messages[0])) {
+            $properties = $messages[0];
+
+            $body = $properties[QueueManagement::MESSAGE_BODY];
+            unset($properties[QueueManagement::MESSAGE_BODY]);
+
+            $envelope = $this->envelopeFactory->create(['body' => $body, 'properties' => $properties]);
+        }
+
+        return $envelope;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function acknowledge(EnvelopeInterface $envelope)
+    {
+        $properties = $envelope->getProperties();
+        $relationId = $properties[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+
+        $this->queueManagement->changeStatus($relationId, QueueManagement::MESSAGE_STATUS_COMPLETE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function subscribe($callback)
+    {
+        while (true) {
+            while ($envelope = $this->dequeue()) {
+                try {
+                    call_user_func($callback, $envelope);
+                    $this->acknowledge($envelope);
+                } catch (\Exception $e) {
+                    $this->reject($envelope);
+                }
+            }
+            sleep($this->interval);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
+    {
+        $properties = $envelope->getProperties();
+        $relationId = $properties[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+
+        if ($properties[QueueManagement::MESSAGE_NUMBER_OF_TRIALS] < $this->maxNumberOfTrials && $requeue) {
+            $this->queueManagement->pushToQueueForRetry($relationId);
+        } else {
+            $this->queueManagement->changeStatus([$relationId], QueueManagement::MESSAGE_STATUS_ERROR);
+            if ($rejectionMessage !== null) {
+                $this->logger->critical(__('Message has been rejected: %1', $rejectionMessage));
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function push(EnvelopeInterface $envelope)
+    {
+        $properties = $envelope->getProperties();
+        $this->queueManagement->addMessageToQueues(
+            $properties[QueueManagement::MESSAGE_TOPIC],
+            $envelope->getBody(),
+            [$this->queueName]
+        );
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/QueueFactory.php b/app/code/Magento/MysqlMq/Model/Driver/QueueFactory.php
new file mode 100644
index 0000000000000..72188a6873f96
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/QueueFactory.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+/**
+ * Factory class for @see \Magento\MysqlMq\Model\Driver\Queue
+ */
+class QueueFactory implements \Magento\Framework\MessageQueue\QueueFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\MysqlMq\Model\Driver\Queue::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($queueName, $connectionName)
+    {
+        return $this->objectManager->create(
+            $this->instanceName,
+            [
+                'queueName' => $queueName,
+                'connectionName' => $connectionName
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Message.php b/app/code/Magento/MysqlMq/Model/Message.php
new file mode 100644
index 0000000000000..27668f99a9073
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Message.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Message model
+ *
+ * @api
+ * @since 100.0.2
+ */
+class Message extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\ResourceModel\Message::class);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/MessageStatus.php b/app/code/Magento/MysqlMq/Model/MessageStatus.php
new file mode 100644
index 0000000000000..17ce2ab974df9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/MessageStatus.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Message model for message status
+ *
+ * @api
+ * @since 100.0.2
+ */
+class MessageStatus extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\ResourceModel\MessageStatus::class);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Observer.php b/app/code/Magento/MysqlMq/Model/Observer.php
new file mode 100644
index 0000000000000..523b2b95b87a3
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Observer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Observer class to monitor outdated messages.
+ */
+class Observer
+{
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement
+     */
+    protected $queueManagement;
+
+    /**
+     * Create Observer
+     * @param QueueManagement $queueManagement
+     */
+    public function __construct(
+        \Magento\MysqlMq\Model\QueueManagement $queueManagement
+    ) {
+        $this->queueManagement = $queueManagement;
+    }
+
+    /**
+     * Clean up old messages from database
+     * @return void
+     */
+    public function cleanupMessages()
+    {
+        $this->queueManagement->markMessagesForDelete();
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Queue.php b/app/code/Magento/MysqlMq/Model/Queue.php
new file mode 100644
index 0000000000000..0ab2c33e573b7
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Queue.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Message model for queue based on MySQL.
+ *
+ * @api
+ * @since 100.0.2
+ */
+class Queue extends \Magento\Framework\Model\AbstractModel
+{
+    const KEY_NAME = 'name';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\ResourceModel\Queue::class);
+    }
+
+    /**
+     * Set queue name.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->setData(self::KEY_NAME, $name);
+        return $this;
+    }
+
+    /**
+     * Get queue name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->getData(self::KEY_NAME);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/QueueManagement.php b/app/code/Magento/MysqlMq/Model/QueueManagement.php
new file mode 100644
index 0000000000000..74d2154a36b0a
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/QueueManagement.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Main class for managing MySQL implementation of message queue.
+ *
+ * @api
+ * @since 100.0.2
+ */
+class QueueManagement
+{
+    const MESSAGE_TOPIC = 'topic_name';
+    const MESSAGE_BODY = 'body';
+    const MESSAGE_ID = 'message_id';
+    const MESSAGE_STATUS = 'status';
+    const MESSAGE_UPDATED_AT = 'updated_at';
+    const MESSAGE_QUEUE_ID = 'queue_id';
+    const MESSAGE_QUEUE_NAME = 'queue_name';
+    const MESSAGE_QUEUE_RELATION_ID = 'relation_id';
+    const MESSAGE_NUMBER_OF_TRIALS = 'retries';
+
+    const MESSAGE_STATUS_NEW = 2;
+    const MESSAGE_STATUS_IN_PROGRESS = 3;
+    const MESSAGE_STATUS_COMPLETE= 4;
+    const MESSAGE_STATUS_RETRY_REQUIRED = 5;
+    const MESSAGE_STATUS_ERROR = 6;
+    const MESSAGE_STATUS_TO_BE_DELETED = 7;
+
+    /**#@+
+     * Cleanup configuration XML nodes
+     */
+    const XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME = 'system/mysqlmq/successful_messages_lifetime';
+    const XML_PATH_FAILED_MESSAGES_LIFETIME = 'system/mysqlmq/failed_messages_lifetime';
+    const XML_PATH_RETRY_IN_PROGRESS_AFTER = 'system/mysqlmq/retry_inprogress_after';
+    const XML_PATH_NEW_MESSAGES_LIFETIME = 'system/mysqlmq/new_messages_lifetime';
+    /**#@-*/
+
+    /**#@-*/
+    private $messageResource;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory
+     */
+    private $messageStatusCollectionFactory;
+
+    /**
+     * @param \Magento\MysqlMq\Model\ResourceModel\Queue $messageResource
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     */
+    public function __construct(
+        \Magento\MysqlMq\Model\ResourceModel\Queue $messageResource,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+    ) {
+        $this->messageResource = $messageResource;
+        $this->scopeConfig = $scopeConfig;
+        $this->dateTime = $dateTime;
+        $this->messageStatusCollectionFactory = $messageStatusCollectionFactory;
+    }
+
+    /**
+     * Add message to all specified queues.
+     *
+     * @param string $topic
+     * @param string $message
+     * @param string[] $queueNames
+     * @return $this
+     */
+    public function addMessageToQueues($topic, $message, $queueNames)
+    {
+        $messageId = $this->messageResource->saveMessage($topic, $message);
+        $this->messageResource->linkQueues($messageId, $queueNames);
+        return $this;
+    }
+
+    /**
+     * Add messages to all specified queues.
+     *
+     * @param string $topic
+     * @param array $messages
+     * @param string[] $queueNames
+     * @return $this
+     * @since 100.2.0
+     */
+    public function addMessagesToQueues($topic, $messages, $queueNames)
+    {
+        $messageIds = $this->messageResource->saveMessages($topic, $messages);
+        $this->messageResource->linkMessagesWithQueues($messageIds, $queueNames);
+        return $this;
+    }
+
+    /**
+     * Delete marked messages
+     *
+     * Mark messages to be deleted if sufficient amount of time passed since last update
+     *
+     * @return void
+     */
+    public function markMessagesForDelete()
+    {
+        $collection = $this->messageStatusCollectionFactory->create()
+            ->addFieldToFilter(
+                'status',
+                ['in' => $this->getStatusesToClear()]
+            );
+
+        /**
+         * Update messages if lifetime is expired
+         */
+        foreach ($collection as $messageStatus) {
+            $this->processMessagePerStatus($messageStatus);
+        }
+
+        /**
+         * Delete all messages which has To BE DELETED status in all the queues
+         */
+        $this->messageResource->deleteMarkedMessages();
+    }
+
+    /**
+     * Based on message status, updated date and timeout for the status, move it to next state
+     *
+     * @param MessageStatus $messageStatus
+     * @return void
+     */
+    private function processMessagePerStatus($messageStatus)
+    {
+        $now = $this->dateTime->gmtTimestamp();
+
+        if ($messageStatus->getStatus() == self::MESSAGE_STATUS_COMPLETE
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getCompletedMessageLifetime())) {
+            $messageStatus->setStatus(self::MESSAGE_STATUS_TO_BE_DELETED)
+                ->save();
+        } elseif ($messageStatus->getStatus() == self::MESSAGE_STATUS_ERROR
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getErrorMessageLifetime())) {
+            $messageStatus->setStatus(self::MESSAGE_STATUS_TO_BE_DELETED)
+                ->save();
+        } elseif ($messageStatus->getStatus() == self::MESSAGE_STATUS_IN_PROGRESS
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getInProgressRetryAfter())
+        ) {
+            $this->pushToQueueForRetry($messageStatus->getId());
+        } elseif ($messageStatus->getStatus() == self::MESSAGE_STATUS_NEW
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getNewMessageLifetime())
+        ) {
+            $messageStatus->setStatus(self::MESSAGE_STATUS_TO_BE_DELETED)
+                ->save();
+        }
+    }
+
+    /**
+     * Compose a set of statuses to track for deletion based on configuration.
+     *
+     * @return array
+     */
+    private function getStatusesToClear()
+    {
+        /**
+         * Do not mark messages for deletion if configuration has 0 lifetime configured.
+         */
+        $statusesToDelete = [];
+        if ($this->getCompletedMessageLifetime() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_COMPLETE;
+        }
+
+        if ($this->getErrorMessageLifetime() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_ERROR;
+        }
+
+        if ($this->getNewMessageLifetime() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_NEW;
+        }
+
+        if ($this->getInProgressRetryAfter() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_IN_PROGRESS;
+        }
+        return $statusesToDelete;
+    }
+
+    /**
+     * Completed message lifetime
+     *
+     * Indicates how long message in COMPLETE state will stay in table with statuses
+     *
+     * @return int
+     */
+    private function getCompletedMessageLifetime()
+    {
+        return 60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Failure message life time
+     *
+     * Indicates how long message in ERROR state will stay in table with statuses
+     *
+     * @return int
+     */
+    private function getErrorMessageLifetime()
+    {
+        return  60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_FAILED_MESSAGES_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * In progress message delay before retry
+     *
+     * Indicates how long message will stay in IN PROGRESS status before attempted to retry
+     *
+     * @return int
+     */
+    private function getInProgressRetryAfter()
+    {
+        return 60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_RETRY_IN_PROGRESS_AFTER,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * New message life time
+     *
+     * Indicates how long message in NEW state will stay in table with statuses
+     *
+     * @return int
+     */
+    private function getNewMessageLifetime()
+    {
+        return  60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_NEW_MESSAGES_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Read the specified number of messages from the specified queue.
+     *
+     * If queue does not contain enough messages, method is not waiting for more messages.
+     *
+     * @param string $queue
+     * @param int|null $maxMessagesNumber
+     * @return array <pre>
+     * [
+     *     [
+     *          self::MESSAGE_ID => $messageId,
+     *          self::MESSAGE_QUEUE_ID => $queuId,
+     *          self::MESSAGE_TOPIC => $topic,
+     *          self::MESSAGE_BODY => $body,
+     *          self::MESSAGE_STATUS => $status,
+     *          self::MESSAGE_UPDATED_AT => $updatedAt,
+     *          self::MESSAGE_QUEUE_NAME => $queueName
+     *          self::MESSAGE_QUEUE_RELATION_ID => $relationId
+     *     ],
+     *     ...
+     * ]</pre>
+     */
+    public function readMessages($queue, $maxMessagesNumber = null)
+    {
+        $selectedMessages = $this->messageResource->getMessages($queue, $maxMessagesNumber);
+        /* The logic below allows to prevent the same message being processed by several consumers in parallel */
+        $selectedMessagesRelatedIds = [];
+        foreach ($selectedMessages as &$message) {
+            /* Set message status here to avoid extra reading from DB after it is updated */
+            $message[self::MESSAGE_STATUS] = self::MESSAGE_STATUS_IN_PROGRESS;
+            $selectedMessagesRelatedIds[] = $message[self::MESSAGE_QUEUE_RELATION_ID];
+        }
+        $takenMessagesRelationIds = $this->messageResource->takeMessagesInProgress($selectedMessagesRelatedIds);
+        if (count($selectedMessages) == count($takenMessagesRelationIds)) {
+            return $selectedMessages;
+        } else {
+            $selectedMessages = array_combine($selectedMessagesRelatedIds, array_values($selectedMessages));
+            return array_intersect_key($selectedMessages, array_flip($takenMessagesRelationIds));
+        }
+    }
+
+    /**
+     * Push message back to queue for one more processing trial. Affects message in particular queue only.
+     *
+     * @param int $messageRelationId
+     * @return void
+     */
+    public function pushToQueueForRetry($messageRelationId)
+    {
+        $this->messageResource->pushBackForRetry($messageRelationId);
+    }
+
+    /**
+     * Change status of messages.
+     *
+     * @param int[] $messageRelationIds
+     * @param int $status
+     * @return void
+     */
+    public function changeStatus($messageRelationIds, $status)
+    {
+        $this->messageResource->changeStatus($messageRelationIds, $status);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/Message.php b/app/code/Magento/MysqlMq/Model/ResourceModel/Message.php
new file mode 100644
index 0000000000000..516a6d361947d
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/Message.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Resource model for queue messages.
+ */
+class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Model initialization
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('queue_message', 'id');
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/MessageCollection.php b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageCollection.php
new file mode 100644
index 0000000000000..cf77102319a19
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageCollection.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Message collection.
+ */
+class MessageCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Resource collection initialization.
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\Message::class, \Magento\MysqlMq\Model\ResourceModel\Message::class);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatus.php b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatus.php
new file mode 100644
index 0000000000000..c736277c279ec
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatus.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Resource model for message status.
+ */
+class MessageStatus extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Model initialization
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('queue_message_status', 'id');
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatusCollection.php b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatusCollection.php
new file mode 100644
index 0000000000000..bdbfc68ec48e1
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatusCollection.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Message Status collection.
+ *
+ * @api
+ * @since 100.0.2
+ */
+class MessageStatusCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Resource collection initialization.
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Magento\MysqlMq\Model\MessageStatus::class,
+            \Magento\MysqlMq\Model\ResourceModel\MessageStatus::class
+        );
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php b/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
new file mode 100644
index 0000000000000..d50ed851b64a9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+use Magento\MysqlMq\Model\QueueManagement;
+
+/**
+ * Resource model for queue.
+ */
+class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Model initialization
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('queue', 'id');
+    }
+
+    /**
+     * Save message to 'queue_message' table.
+     *
+     * @param string $messageTopic
+     * @param string $messageBody
+     * @return int ID of the inserted record
+     */
+    public function saveMessage($messageTopic, $messageBody)
+    {
+        $this->getConnection()->insert(
+            $this->getMessageTable(),
+            ['topic_name' => $messageTopic, 'body' => $messageBody]
+        );
+        return $this->getConnection()->lastInsertId($this->getMessageTable());
+    }
+
+    /**
+     * Save messages in bulk to 'queue_message' table.
+     *
+     * @param string $messageTopic
+     * @param array $messages
+     * @return array List of IDs of inserted records
+     */
+    public function saveMessages($messageTopic, array $messages)
+    {
+        $data = [];
+        foreach ($messages as $message) {
+            $data[] = ['topic_name' => $messageTopic, 'body' => $message];
+        }
+        $rowCount = $this->getConnection()->insertMultiple($this->getMessageTable(), $data);
+        $firstId = $this->getConnection()->lastInsertId($this->getMessageTable());
+        $select = $this->getConnection()->select()
+            ->from(['qm' => $this->getMessageTable()], ['id'])
+            ->where('qm.id >= ?', $firstId)
+            ->limit($rowCount);
+        return $this->getConnection()->fetchCol($select);
+    }
+
+    /**
+     * Add associations between the specified message and queues.
+     *
+     * @param int $messageId
+     * @param string[] $queueNames
+     * @return $this
+     */
+    public function linkQueues($messageId, $queueNames)
+    {
+        return $this->linkMessagesWithQueues([$messageId], $queueNames);
+    }
+
+    /**
+     * Add associations between the specified messages and queues.
+     *
+     * @param array $messageIds
+     * @param string[] $queueNames
+     * @return $this
+     */
+    public function linkMessagesWithQueues(array $messageIds, array $queueNames)
+    {
+        $connection = $this->getConnection();
+        $queueIds = $this->getQueueIdsByNames($queueNames);
+        $data = [];
+        foreach ($messageIds as $messageId) {
+            foreach ($queueIds as $queueId) {
+                $data[] = [
+                    $queueId,
+                    $messageId,
+                    QueueManagement::MESSAGE_STATUS_NEW
+                ];
+            }
+        }
+        if (!empty($data)) {
+            $connection->insertArray(
+                $this->getMessageStatusTable(),
+                ['queue_id', 'message_id', 'status'],
+                $data
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve array of queue IDs corresponding to the specified array of queue names.
+     *
+     * @param string[] $queueNames
+     * @return int[]
+     */
+    protected function getQueueIdsByNames($queueNames)
+    {
+        $selectObject = $this->getConnection()->select();
+        $selectObject->from(['queue' => $this->getQueueTable()])
+            ->columns(['id'])
+            ->where('queue.name IN (?)', $queueNames);
+        return $this->getConnection()->fetchCol($selectObject);
+    }
+
+    /**
+     * Retrieve messages from the specified queue.
+     *
+     * @param string $queueName
+     * @param int|null $limit
+     * @return array
+     */
+    public function getMessages($queueName, $limit = null)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()
+            ->from(
+                ['queue_message' => $this->getMessageTable()],
+                [QueueManagement::MESSAGE_TOPIC => 'topic_name', QueueManagement::MESSAGE_BODY => 'body']
+            )->join(
+                ['queue_message_status' => $this->getMessageStatusTable()],
+                'queue_message.id = queue_message_status.message_id',
+                [
+                    QueueManagement::MESSAGE_QUEUE_RELATION_ID => 'id',
+                    QueueManagement::MESSAGE_QUEUE_ID => 'queue_id',
+                    QueueManagement::MESSAGE_ID => 'message_id',
+                    QueueManagement::MESSAGE_STATUS => 'status',
+                    QueueManagement::MESSAGE_UPDATED_AT => 'updated_at',
+                    QueueManagement::MESSAGE_NUMBER_OF_TRIALS => 'number_of_trials'
+                ]
+            )->join(
+                ['queue' => $this->getQueueTable()],
+                'queue.id = queue_message_status.queue_id',
+                [QueueManagement::MESSAGE_QUEUE_NAME => 'name']
+            )->where(
+                'queue_message_status.status IN (?)',
+                [QueueManagement::MESSAGE_STATUS_NEW, QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED]
+            )->where('queue.name = ?', $queueName)
+            ->order('queue_message_status.updated_at ASC');
+
+        if ($limit) {
+            $select->limit($limit);
+        }
+
+        return $connection->fetchAll($select);
+    }
+
+    /**
+     * Delete messages if there is no queue whrere the message is not in status TO BE DELETED
+     *
+     * @return void
+     */
+    public function deleteMarkedMessages()
+    {
+        $connection = $this->getConnection();
+
+        $select = $connection->select()
+            ->from(['queue_message_status' => $this->getMessageStatusTable()], ['message_id'])
+            ->where('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->distinct();
+        $messageIds = $connection->fetchCol($select);
+
+        $condition = count($messageIds) > 0 ? ['id NOT IN (?)' => $messageIds] : null;
+        $connection->delete($this->getMessageTable(), $condition);
+    }
+
+    /**
+     * Mark specified messages with 'in progress' status.
+     *
+     * @param int[] $relationIds
+     * @return int[] IDs of messages which should be taken in progress by current process.
+     */
+    public function takeMessagesInProgress($relationIds)
+    {
+        $takenMessagesRelationIds = [];
+        foreach ($relationIds as $relationId) {
+            $affectedRows = $this->getConnection()->update(
+                $this->getMessageStatusTable(),
+                ['status' => QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+                ['id = ?' => $relationId]
+            );
+            if ($affectedRows) {
+                /**
+                 * If status was set to 'in progress' by some other process (due to race conditions),
+                 * current process should not process the same message.
+                 * So message will be processed only if current process was able to change its status.
+                 */
+                $takenMessagesRelationIds[] = $relationId;
+            }
+        }
+        return $takenMessagesRelationIds;
+    }
+
+    /**
+     * Set status of message to 'retry required' and increment number of processing trials.
+     *
+     * @param int $relationId
+     * @return void
+     */
+    public function pushBackForRetry($relationId)
+    {
+        $this->getConnection()->update(
+            $this->getMessageStatusTable(),
+            [
+                'status' => QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED,
+                'number_of_trials' => new \Zend_Db_Expr('number_of_trials+1')
+            ],
+            ['id = ?' => $relationId]
+        );
+    }
+
+    /**
+     * Change message status.
+     *
+     * @param int[] $relationIds
+     * @param int $status
+     * @return void
+     */
+    public function changeStatus($relationIds, $status)
+    {
+        $this->getConnection()->update(
+            $this->getMessageStatusTable(),
+            ['status' => $status],
+            ['id IN (?)' => $relationIds]
+        );
+    }
+
+    /**
+     * Get name of table storing message statuses and associations to queues.
+     *
+     * @return string
+     */
+    protected function getMessageStatusTable()
+    {
+        return $this->getTable('queue_message_status');
+    }
+
+    /**
+     * Get name of table storing declared queues.
+     *
+     * @return string
+     */
+    protected function getQueueTable()
+    {
+        return $this->getTable('queue');
+    }
+
+    /**
+     * Get name of table storing message body and topic.
+     *
+     * @return string
+     */
+    protected function getMessageTable()
+    {
+        return $this->getTable('queue_message');
+    }
+}
diff --git a/app/code/Magento/MysqlMq/README.md b/app/code/Magento/MysqlMq/README.md
new file mode 100644
index 0000000000000..3ebc6a10d104d
--- /dev/null
+++ b/app/code/Magento/MysqlMq/README.md
@@ -0,0 +1,3 @@
+# MysqlMq
+
+**MysqlMq** provides message queue implementation based on MySQL.
diff --git a/app/code/Magento/MysqlMq/Setup/Recurring.php b/app/code/Magento/MysqlMq/Setup/Recurring.php
new file mode 100644
index 0000000000000..db3a39bf5fbd0
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Setup/Recurring.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+
+/**
+ * Class Recurring
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var MessageQueueConfig
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @param MessageQueueConfig $messageQueueConfig
+     */
+    public function __construct(MessageQueueConfig $messageQueueConfig)
+    {
+        $this->messageQueueConfig = $messageQueueConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $setup->startSetup();
+
+        $binds = $this->messageQueueConfig->getBinds();
+        $queues = [];
+        foreach ($binds as $bind) {
+            $queues[] = $bind[MessageQueueConfig::BIND_QUEUE];
+        }
+        $connection = $setup->getConnection();
+        $existingQueues = $connection->fetchCol($connection->select()->from($setup->getTable('queue'), 'name'));
+        $queues = array_unique(array_diff($queues, $existingQueues));
+        /** Populate 'queue' table */
+        if (!empty($queues)) {
+            $connection->insertArray($setup->getTable('queue'), ['name'], $queues);
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE.txt b/app/code/Magento/MysqlMq/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE.txt
rename to app/code/Magento/MysqlMq/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE_AFL.txt b/app/code/Magento/MysqlMq/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE_AFL.txt
rename to app/code/Magento/MysqlMq/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/MysqlMq/Test/Mftf/README.md b/app/code/Magento/MysqlMq/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ddedc2d14946d
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Mysql Mq Functional Tests
+
+The Functional Test Module for **Magento Mysql Mq** module.
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/ConnectionTypeResolverTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/ConnectionTypeResolverTest.php
new file mode 100644
index 0000000000000..68dbea2f7a9ab
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/ConnectionTypeResolverTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Test\Unit\Model;
+
+use Magento\MysqlMq\Model\ConnectionTypeResolver;
+
+/**
+ * Unit tests for Mysql connection type resolver
+ */
+class ConnectionTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnectionTypeWithDefaultValues()
+    {
+        $model = new ConnectionTypeResolver();
+        $this->assertEquals('db', $model->getConnectionType('db'));
+        $this->assertEquals(null, $model->getConnectionType('non-db'));
+    }
+
+    public function testGetConnectionTypeWithCustomValues()
+    {
+        $model = new ConnectionTypeResolver(['test-connection']);
+        $this->assertEquals('db', $model->getConnectionType('db'));
+        $this->assertEquals('db', $model->getConnectionType('test-connection'));
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php
new file mode 100644
index 0000000000000..452825058c9d8
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Model\Driver\Bulk;
+
+/**
+ * Unit test for bulk Exchange model.
+ */
+class ExchangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueManagement;
+
+    /**
+     * @var \Magento\MysqlMq\Model\Driver\Bulk\Exchange
+     */
+    private $exchange;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageQueueConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueManagement = $this->getMockBuilder(\Magento\MysqlMq\Model\QueueManagement::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->exchange = $objectManager->getObject(
+            \Magento\MysqlMq\Model\Driver\Bulk\Exchange::class,
+            [
+                'messageQueueConfig' => $this->messageQueueConfig,
+                'queueManagement' => $this->queueManagement,
+            ]
+        );
+    }
+
+    /**
+     * Test for enqueue model.
+     *
+     * @return void
+     */
+    public function testEnqueue()
+    {
+        $topicName = 'topic.name';
+        $queueNames = ['queue0', 'queue1'];
+        $envelopeBody = 'serializedMessage';
+        $this->messageQueueConfig->expects($this->once())
+            ->method('getQueuesByTopic')->with($topicName)->willReturn($queueNames);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $envelope->expects($this->once())->method('getBody')->willReturn($envelopeBody);
+        $this->queueManagement->expects($this->once())
+            ->method('addMessagesToQueues')->with($topicName, [$envelopeBody], $queueNames);
+        $this->assertNull($this->exchange->enqueue($topicName, [$envelope]));
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/QueueManagementTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/QueueManagementTest.php
new file mode 100644
index 0000000000000..906feb2b46cfd
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/QueueManagementTest.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Model;
+
+/**
+ * Unit test for QueueManagement model.
+ */
+class QueueManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\Queue|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageResource;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTime;
+
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory
+     *      |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageStatusCollectionFactory;
+
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageResource = $this->getMockBuilder(\Magento\MysqlMq\Model\ResourceModel\Queue::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->dateTime = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageStatusCollectionFactory = $this
+            ->getMockBuilder(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->queueManagement = $objectManager->getObject(
+            \Magento\MysqlMq\Model\QueueManagement::class,
+            [
+                'messageResource' => $this->messageResource,
+                'scopeConfig' => $this->scopeConfig,
+                'dateTime' => $this->dateTime,
+                'messageStatusCollectionFactory' => $this->messageStatusCollectionFactory,
+            ]
+        );
+    }
+
+    /**
+     * Test for addMessageToQueues method.
+     *
+     * @return void
+     */
+    public function testAddMessageToQueues()
+    {
+        $topicName = 'topic.name';
+        $queueNames = ['queue0', 'queue1'];
+        $message = 'test_message';
+        $messageId = 1;
+        $this->messageResource->expects($this->once())
+            ->method('saveMessage')->with($topicName, $message)->willReturn($messageId);
+        $this->messageResource->expects($this->once())
+            ->method('linkQueues')->with($messageId, $queueNames)->willReturnSelf();
+        $this->assertEquals(
+            $this->queueManagement,
+            $this->queueManagement->addMessageToQueues($topicName, $message, $queueNames)
+        );
+    }
+
+    /**
+     * Test for addMessagesToQueues method.
+     *
+     * @return void
+     */
+    public function testAddMessagesToQueues()
+    {
+        $topicName = 'topic.name';
+        $queueNames = ['queue0', 'queue1'];
+        $messages = ['test_message0', 'test_message1'];
+        $messageIds = [1, 2];
+        $this->messageResource->expects($this->once())
+            ->method('saveMessages')->with($topicName, $messages)->willReturn($messageIds);
+        $this->messageResource->expects($this->once())
+            ->method('linkMessagesWithQueues')->with($messageIds, $queueNames)->willReturnSelf();
+        $this->assertEquals(
+            $this->queueManagement,
+            $this->queueManagement->addMessagesToQueues($topicName, $messages, $queueNames)
+        );
+    }
+
+    /**
+     * Test for markMessagesForDelete method.
+     *
+     * @return void
+     */
+    public function testMarkMessagesForDelete()
+    {
+        $messageId = 99;
+        $collection = $this->getMockBuilder(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageStatusCollectionFactory->expects($this->once())->method('create')->willReturn($collection);
+        $this->scopeConfig->expects($this->exactly(8))->method('getValue')
+            ->withConsecutive(
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_FAILED_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_NEW_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_RETRY_IN_PROGRESS_AFTER,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_FAILED_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_NEW_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_RETRY_IN_PROGRESS_AFTER,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ]
+            )->willReturn(1);
+        $collection->expects($this->once())->method('addFieldToFilter')
+            ->with(
+                'status',
+                [
+                    'in' => [
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE,
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_ERROR,
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW,
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+                    ]
+                ]
+            )->willReturnSelf();
+        $messageStatuses =
+            [
+                $this->getMessageStatusMock(),
+                $this->getMessageStatusMock(),
+                $this->getMessageStatusMock(),
+                $this->getMessageStatusMock(),
+            ];
+        $this->dateTime->expects($this->exactly(4))->method('gmtTimestamp')->willReturn(1486741063);
+        $messageStatuses[0]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE
+        );
+        $messageStatuses[1]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_ERROR
+        );
+        $messageStatuses[2]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW
+        );
+        $messageStatuses[3]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS
+        );
+        $messageStatuses[0]->expects($this->once())->method('setStatus')
+            ->with(\Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)->willReturnSelf();
+        $messageStatuses[1]->expects($this->once())->method('setStatus')
+            ->with(\Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)->willReturnSelf();
+        $messageStatuses[2]->expects($this->once())->method('setStatus')
+            ->with(\Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)->willReturnSelf();
+        $messageStatuses[0]->expects($this->once())->method('save')->willReturnSelf();
+        $messageStatuses[1]->expects($this->once())->method('save')->willReturnSelf();
+        $messageStatuses[2]->expects($this->once())->method('save')->willReturnSelf();
+        $messageStatuses[3]->expects($this->once())->method('getId')->willReturn($messageId);
+        $collection->expects($this->once())->method('getIterator')->willReturn(new \ArrayIterator($messageStatuses));
+        $this->messageResource->expects($this->once())->method('pushBackForRetry')->with($messageId);
+        $this->messageResource->expects($this->once())->method('deleteMarkedMessages');
+        $this->queueManagement->markMessagesForDelete();
+    }
+
+    /**
+     * Create mock of MessageStatus method.
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getMessageStatusMock()
+    {
+        $messageStatus = $this->getMockBuilder(\Magento\MysqlMq\Model\MessageStatus::class)
+            ->setMethods(['getStatus', 'setStatus', 'save', 'getId', 'getUpdatedAt'])
+            ->disableOriginalConstructor()->getMock();
+        $messageStatus->expects($this->once())->method('getUpdatedAt')->willReturn('2010-01-01 00:00:00');
+        return $messageStatus;
+    }
+
+    /**
+     * Test for changeStatus method.
+     */
+    public function testChangeStatus()
+    {
+        $messageIds = [1, 2];
+        $status = \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED;
+        $this->messageResource->expects($this->once())->method('changeStatus')->with($messageIds, $status);
+        $this->queueManagement->changeStatus($messageIds, $status);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
new file mode 100644
index 0000000000000..d3fe09a712945
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Model\ResourceModel;
+
+/**
+ * Unit test for Queue resource model.
+ */
+class QueueTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resources;
+
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\Queue
+     */
+    private $queue;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resources = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->queue = $objectManager->getObject(
+            \Magento\MysqlMq\Model\ResourceModel\Queue::class,
+            [
+                '_resources' => $this->resources,
+            ]
+        );
+    }
+
+    /**
+     * Test for saveMessage method.
+     *
+     * @return void
+     */
+    public function testSaveMessage()
+    {
+        $messageTopic = 'topic.name';
+        $message = 'messageBody';
+        $tableName = 'queue_message';
+        $messageId = 2;
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->setMethods(['insert', 'lastInsertId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resources->expects($this->exactly(2))->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())
+            ->method('getTableName')->with($tableName, 'default')->willReturn($tableName);
+        $connection->expects($this->once())->method('insert')
+            ->with($tableName, ['topic_name' => $messageTopic, 'body' => $message])->willReturn(1);
+        $connection->expects($this->once())->method('lastInsertId')->with($tableName)->willReturn($messageId);
+        $this->assertEquals($messageId, $this->queue->saveMessage($messageTopic, $message));
+    }
+
+    /**
+     * Test for saveMessages method.
+     *
+     * @return void
+     */
+    public function testSaveMessages()
+    {
+        $messageTopic = 'topic.name';
+        $messages = ['messageBody0', 'messageBody1'];
+        $tableName = 'queue_message';
+        $messageIds = [3, 4];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->setMethods(['insertMultiple', 'lastInsertId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())
+            ->method('getTableName')->with($tableName, 'default')->willReturn($tableName);
+        $connection->expects($this->once())->method('insertMultiple')
+            ->with(
+                $tableName,
+                [
+                    ['topic_name' => $messageTopic, 'body' => $messages[0]],
+                    ['topic_name' => $messageTopic, 'body' => $messages[1]],
+                ]
+            )->willReturn(2);
+        $connection->expects($this->once())->method('lastInsertId')->with($tableName)->willReturn($messageIds[0]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with(['qm' => $tableName], ['id'])->willReturnSelf();
+        $select->expects($this->once())->method('where')->with('qm.id >= ?', $messageIds[0])->willReturnSelf();
+        $select->expects($this->once())->method('limit')->with(2)->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($messageIds);
+        $this->assertEquals($messageIds, $this->queue->saveMessages($messageTopic, $messages));
+    }
+
+    /**
+     * Test for linkQueues method.
+     *
+     * @return void
+     */
+    public function testLinkQueues()
+    {
+        $messageId = 3;
+        $queueNames = ['queueName0', 'queueName1'];
+        $queueIds = [5, 6];
+        $tableNames = ['queue', 'queue_message_status'];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->exactly(2))->method('getTableName')
+            ->withConsecutive([$tableNames[0], 'default'], [$tableNames[1], 'default'])
+            ->willReturnOnConsecutiveCalls($tableNames[0], $tableNames[1]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with(['queue' => $tableNames[0]])->willReturnSelf();
+        $select->expects($this->once())->method('columns')->with(['id'])->willReturnSelf();
+        $select->expects($this->once())->method('where')->with('queue.name IN (?)', $queueNames)->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($queueIds);
+        $connection->expects($this->once())->method('insertArray')->with(
+            $tableNames[1],
+            ['queue_id', 'message_id', 'status'],
+            [
+                [
+                    $queueIds[0],
+                    $messageId,
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW
+                ],
+                [
+                    $queueIds[1],
+                    $messageId,
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW
+                ],
+            ]
+        )->willReturn(4);
+        $this->assertEquals($this->queue, $this->queue->linkQueues($messageId, $queueNames));
+    }
+
+    /**
+     * Test for getMessages method.
+     *
+     * @return void
+     */
+    public function testGetMessages()
+    {
+        $limit = 100;
+        $queueName = 'queueName0';
+        $tableNames = ['queue_message', 'queue_message_status', 'queue'];
+        $messages = [['message0_data'], ['message1_data']];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->exactly(3))->method('getTableName')
+            ->withConsecutive([$tableNames[0], 'default'], [$tableNames[1], 'default'], [$tableNames[2], 'default'])
+            ->willReturnOnConsecutiveCalls($tableNames[0], $tableNames[1], $tableNames[2]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with(
+            ['queue_message' => $tableNames[0]],
+            [
+                \Magento\MysqlMq\Model\QueueManagement::MESSAGE_TOPIC => 'topic_name',
+                \Magento\MysqlMq\Model\QueueManagement::MESSAGE_BODY => 'body'
+            ]
+        )->willReturnSelf();
+        $select->expects($this->exactly(2))->method('join')->withConsecutive(
+            [
+                ['queue_message_status' => $tableNames[1]],
+                'queue_message.id = queue_message_status.message_id',
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_QUEUE_RELATION_ID => 'id',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_QUEUE_ID => 'queue_id',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_ID => 'message_id',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS => 'status',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_UPDATED_AT => 'updated_at',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_NUMBER_OF_TRIALS => 'number_of_trials'
+                ]
+            ],
+            [
+                ['queue' => $tableNames[2]],
+                'queue.id = queue_message_status.queue_id',
+                [\Magento\MysqlMq\Model\QueueManagement::MESSAGE_QUEUE_NAME => 'name']
+            ]
+        )->willReturnSelf();
+        $select->expects($this->exactly(2))->method('where')->withConsecutive(
+            [
+                'queue_message_status.status IN (?)',
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW,
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED
+                ]
+            ],
+            [
+                'queue.name = ?', $queueName
+            ]
+        )->willReturnSelf();
+        $select->expects($this->once())
+            ->method('order')->with('queue_message_status.updated_at ASC')->willReturnSelf();
+        $select->expects($this->once())->method('limit')->with($limit)->willReturnSelf();
+        $connection->expects($this->once())->method('fetchAll')->with($select)->willReturn($messages);
+        $this->assertEquals($messages, $this->queue->getMessages($queueName, $limit));
+    }
+
+    /**
+     * Test for deleteMarkedMessages method.
+     *
+     * @return void
+     */
+    public function testDeleteMarkedMessages()
+    {
+        $messageIds = [1, 2];
+        $tableNames = ['queue_message_status', 'queue_message'];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->exactly(2))->method('getTableName')
+            ->withConsecutive([$tableNames[0], 'default'], [$tableNames[1], 'default'])
+            ->willReturnOnConsecutiveCalls($tableNames[0], $tableNames[1]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())
+            ->method('from')->with(['queue_message_status' => $tableNames[0]], ['message_id'])->willReturnSelf();
+        $select->expects($this->once())->method('where')
+            ->with('status <> ?', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->willReturnSelf();
+        $select->expects($this->once())->method('distinct')->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($messageIds);
+        $connection->expects($this->once())->method('delete')
+            ->with($tableNames[1], ['id NOT IN (?)' => $messageIds])->willReturn(2);
+        $this->queue->deleteMarkedMessages();
+    }
+
+    /**
+     * Test for takeMessagesInProgress method.
+     *
+     * @return void
+     */
+    public function testTakeMessagesInProgress()
+    {
+        $relationIds = [1, 2];
+        $tableName = 'queue_message_status';
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())->method('getTableName')->with($tableName)->willReturn($tableName);
+        $connection->expects($this->exactly(2))->method('update')->withConsecutive(
+            [
+                $tableName,
+                ['status' => \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+                ['id = ?' => $relationIds[0]]
+            ],
+            [
+                $tableName,
+                ['status' => \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+                ['id = ?' => $relationIds[1]]
+            ]
+        )->willReturnOnConsecutiveCalls(1, 0);
+        $this->assertEquals([$relationIds[0]], $this->queue->takeMessagesInProgress($relationIds));
+    }
+
+    /**
+     * Test for pushBackForRetry method.
+     *
+     * @return void
+     */
+    public function testPushBackForRetry()
+    {
+        $relationId = 1;
+        $tableName = 'queue_message_status';
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())->method('getTableName')->with($tableName)->willReturn($tableName);
+        $connection->expects($this->once())->method('update')->with(
+            $tableName,
+            [
+                'status' => \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED,
+                'number_of_trials' => new \Zend_Db_Expr('number_of_trials+1')
+            ],
+            ['id = ?' => $relationId]
+        )->willReturn(1);
+        $this->queue->pushBackForRetry($relationId);
+    }
+
+    /**
+     * Test for changeStatus method.
+     *
+     * @return void
+     */
+    public function testChangeStatus()
+    {
+        $relationIds = [1, 2];
+        $status = \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED;
+        $tableName = 'queue_message_status';
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())->method('getTableName')->with($tableName)->willReturn($tableName);
+        $connection->expects($this->once())
+            ->method('update')->with($tableName, ['status' => $status], ['id IN (?)' => $relationIds])->willReturn(1);
+        $this->queue->changeStatus($relationIds, $status);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php b/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
new file mode 100644
index 0000000000000..e2e7ad3c4c92d
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Setup;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Class RecurringTest
+ */
+class RecurringTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\MysqlMq\Setup\Recurring
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageQueueConfig;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->messageQueueConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->model = $this->objectManager->getObject(
+            \Magento\MysqlMq\Setup\Recurring::class,
+            [
+                'messageQueueConfig' => $this->messageQueueConfig,
+            ]
+        );
+    }
+
+    /**
+     * Test for install method
+     */
+    public function testInstall()
+    {
+        $binds = [
+            'first_bind' => [
+                'queue' => 'queue_name_1',
+                'exchange' => 'magento-db',
+                'topic' => 'queue.topic.1'
+            ],
+            'second_bind' => [
+                'queue' => 'queue_name_2',
+                'exchange' => 'magento-db',
+                'topic' => 'queue.topic.2'
+            ],
+            'third_bind' => [
+                'queue' => 'queue_name_3',
+                'exchange' => 'magento-db',
+                'topic' => 'queue.topic.3'
+            ]
+        ];
+        $dbQueues = [
+            'queue_name_1',
+            'queue_name_2',
+        ];
+        $queuesToInsert = [
+            2 => 'queue_name_3'
+        ];
+        $queueTableName = 'queue_table';
+
+        $setup = $this->getMockBuilder(\Magento\Framework\Setup\SchemaSetupInterface::class)
+            ->getMockForAbstractClass();
+        $context = $this->getMockBuilder(\Magento\Framework\Setup\ModuleContextInterface::class)
+            ->getMockForAbstractClass();
+
+        $setup->expects($this->once())->method('startSetup')->willReturnSelf();
+        $this->messageQueueConfig->expects($this->once())->method('getBinds')->willReturn($binds);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->getMockForAbstractClass();
+        $setup->expects($this->once())->method('getConnection')->willReturn($connection);
+        $setup->expects($this->any())->method('getTable')->with('queue')->willReturn($queueTableName);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with($queueTableName, 'name')->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($dbQueues);
+        $connection->expects($this->once())->method('insertArray')->with($queueTableName, ['name'], $queuesToInsert);
+        $setup->expects($this->once())->method('endSetup')->willReturnSelf();
+
+        $this->model->install($setup, $context);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
new file mode 100644
index 0000000000000..d9bcf307a5bf9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-mysql-mq",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "magento/magento-composer-installer": "*",
+        "magento/module-store": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MysqlMq\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MysqlMq/etc/adminhtml/system.xml b/app/code/Magento/MysqlMq/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..2684f2e0c98bf
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/adminhtml/system.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="system">
+            <group id="mysqlmq" translate="label comment" type="text" sortOrder="15" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>MySQL Message Queue Cleanup</label>
+                <comment>All the times are in minutes. Use "0" if you want to skip automatic clearance.</comment>
+                <field id="retry_inprogress_after" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Retry Messages In Progress After</label>
+                </field>
+                <field id="successful_messages_lifetime" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Successful Messages Lifetime</label>
+                </field>
+                <field id="failed_messages_lifetime" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Failed Messages Lifetime</label>
+                </field>
+                <field id="new_messages_lifetime" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>New Messages Lifetime</label>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/config.xml b/app/code/Magento/MysqlMq/etc/config.xml
new file mode 100644
index 0000000000000..f1a59c5375a98
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <mysqlmq>
+                <retry_inprogress_after>1440</retry_inprogress_after>
+                <new_messages_lifetime>10080</new_messages_lifetime>
+                <successful_messages_lifetime>10080</successful_messages_lifetime>
+                <failed_messages_lifetime>10080</failed_messages_lifetime>
+            </mysqlmq>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/crontab.xml b/app/code/Magento/MysqlMq/etc/crontab.xml
new file mode 100644
index 0000000000000..9f4546206eaff
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/crontab.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="mysqlmq_clean_messages" instance="Magento\MysqlMq\Model\Observer" method="cleanupMessages">
+            <schedule>30 6,15 * * *</schedule>
+        </job>
+    </group>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/db_schema.xml b/app/code/Magento/MysqlMq/etc/db_schema.xml
new file mode 100644
index 0000000000000..3850a6749a3d6
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/db_schema.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="queue" resource="default" engine="innodb" comment="Table storing unique queues">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Queue ID"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Queue name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="QUEUE_NAME">
+            <column name="name"/>
+        </constraint>
+    </table>
+    <table name="queue_message" resource="default" engine="innodb" comment="Queue messages">
+        <column xsi:type="bigint" name="id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Message ID"/>
+        <column xsi:type="varchar" name="topic_name" nullable="true" length="255" comment="Message topic"/>
+        <column xsi:type="longtext" name="body" nullable="true" comment="Message body"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+    </table>
+    <table name="queue_message_status" resource="default" engine="innodb"
+           comment="Relation table to keep associations between queues and messages">
+        <column xsi:type="bigint" name="id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Relation ID"/>
+        <column xsi:type="int" name="queue_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Queue ID"/>
+        <column xsi:type="bigint" name="message_id" padding="20" unsigned="true" nullable="false" identity="false"
+                comment="Message ID"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Message status in particular queue"/>
+        <column xsi:type="smallint" name="number_of_trials" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Number of trials to processed failed message processing"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUEUE_MESSAGE_STATUS_MESSAGE_ID_QUEUE_MESSAGE_ID"
+                    table="queue_message_status" column="message_id" referenceTable="queue_message" referenceColumn="id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="QUEUE_MESSAGE_STATUS_QUEUE_ID_QUEUE_ID" table="queue_message_status"
+                    column="queue_id" referenceTable="queue" referenceColumn="id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID">
+            <column name="queue_id"/>
+            <column name="message_id"/>
+        </constraint>
+        <index referenceId="QUEUE_MESSAGE_STATUS_STATUS_UPDATED_AT" indexType="btree">
+            <column name="status"/>
+            <column name="updated_at"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/MysqlMq/etc/db_schema_whitelist.json b/app/code/Magento/MysqlMq/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..711d19345f408
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/db_schema_whitelist.json
@@ -0,0 +1,43 @@
+{
+    "queue": {
+        "column": {
+            "id": true,
+            "name": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUEUE_NAME": true
+        }
+    },
+    "queue_message": {
+        "column": {
+            "id": true,
+            "topic_name": true,
+            "body": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "queue_message_status": {
+        "column": {
+            "id": true,
+            "queue_id": true,
+            "message_id": true,
+            "updated_at": true,
+            "status": true,
+            "number_of_trials": true
+        },
+        "index": {
+            "QUEUE_MESSAGE_STATUS_STATUS_UPDATED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUEUE_MESSAGE_STATUS_MESSAGE_ID_QUEUE_MESSAGE_ID": true,
+            "QUEUE_MESSAGE_ID_QUEUE_MESSAGE_STATUS_MESSAGE_ID": true,
+            "QUEUE_MESSAGE_STATUS_QUEUE_ID_QUEUE_ID": true,
+            "QUEUE_ID_QUEUE_MESSAGE_STATUS_QUEUE_ID": true,
+            "QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/MysqlMq/etc/di.xml b/app/code/Magento/MysqlMq/etc/di.xml
new file mode 100644
index 0000000000000..958ffb5281618
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/di.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\MessageQueue\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="db" xsi:type="object">Magento\Framework\MessageQueue\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="db" xsi:type="object">Magento\Framework\MessageQueue\Bulk\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ConnectionTypeResolver">
+        <arguments>
+            <argument name="resolvers" xsi:type="array">
+                <item name="db" xsi:type="object">Magento\MysqlMq\Model\ConnectionTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="db" xsi:type="object">\Magento\MysqlMq\Model\Driver\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="db" xsi:type="object">\Magento\MysqlMq\Model\Driver\Bulk\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\QueueFactory">
+        <arguments>
+            <argument name="queueFactories" xsi:type="array">
+                <item name="db" xsi:type="object">Magento\MysqlMq\Model\Driver\QueueFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\MysqlMq\Model\Driver\Bulk\ExchangeFactory" type="Magento\MysqlMq\Model\Driver\ExchangeFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\MysqlMq\Model\Driver\Bulk\Exchange</argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/module.xml b/app/code/Magento/MysqlMq/etc/module.xml
new file mode 100644
index 0000000000000..deac621ad1ccf
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_MysqlMq" />
+</config>
diff --git a/app/code/Magento/MysqlMq/i18n/en_US.csv b/app/code/Magento/MysqlMq/i18n/en_US.csv
new file mode 100644
index 0000000000000..8a124eb6c7c8e
--- /dev/null
+++ b/app/code/Magento/MysqlMq/i18n/en_US.csv
@@ -0,0 +1,7 @@
+"Message has been rejected: %1","Message has been rejected: %1"
+"MySQL Message Queue Cleanup","MySQL Message Queue Cleanup"
+"All the times are in minutes. Use ""0"" if you want to skip automatic clearance.","All the times are in minutes. Use ""0"" if you want to skip automatic clearance."
+"Retry Messages In Progress After","Retry Messages In Progress After"
+"Successful Messages Lifetime","Successful Messages Lifetime"
+"Failed Messages Lifetime","Failed Messages Lifetime"
+"New Messages Lifetime","New Messages Lifetime"
diff --git a/app/code/Magento/MysqlMq/registration.php b/app/code/Magento/MysqlMq/registration.php
new file mode 100644
index 0000000000000..e13a38b468005
--- /dev/null
+++ b/app/code/Magento/MysqlMq/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MysqlMq', __DIR__);
diff --git a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
new file mode 100644
index 0000000000000..7a8419d57c865
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\NewRelicReporting\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Magento\NewRelicReporting\Model\Apm\DeploymentsFactory;
+use Magento\NewRelicReporting\Model\ServiceShellUser;
+
+class DeployMarker extends Command
+{
+    /**
+     * @var DeploymentsFactory
+     */
+    private $deploymentsFactory;
+
+    /**
+     * @var ServiceShellUser
+     */
+    private $serviceShellUser;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DeploymentsFactory $deploymentsFactory
+     * @param ServiceShellUser $serviceShellUser
+     * @param null $name
+     */
+    public function __construct(
+        DeploymentsFactory $deploymentsFactory,
+        ServiceShellUser $serviceShellUser,
+        $name = null
+    ) {
+        $this->deploymentsFactory = $deploymentsFactory;
+        $this->serviceShellUser = $serviceShellUser;
+        parent::__construct($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    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'
+            );
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->deploymentsFactory->create()->setDeployment(
+            $input->getArgument('message'),
+            $input->getArgument('change_log'),
+            $this->serviceShellUser->get($input->getArgument('user'))
+        );
+        $output->writeln('<info>NewRelic deployment information sent</info>');
+    }
+}
diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php
index 32e1078c01c9d..6f3ff1df57448 100644
--- a/app/code/Magento/NewRelicReporting/Model/Config.php
+++ b/app/code/Magento/NewRelicReporting/Model/Config.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\NewRelicReporting\Model;
 
+/**
+ * NewRelic configuration model
+ */
 class Config
 {
     /**#@+
@@ -88,7 +91,7 @@ public function __construct(
      */
     public function isNewRelicEnabled()
     {
-        return (bool)$this->scopeConfig->getValue('newrelicreporting/general/enable');
+        return $this->scopeConfig->isSetFlag('newrelicreporting/general/enable');
     }
 
     /**
@@ -161,6 +164,16 @@ public function getNewRelicAppName()
         return (string)$this->scopeConfig->getValue('newrelicreporting/general/app_name');
     }
 
+    /**
+     * Returns configured separate apps value
+     *
+     * @return bool
+     */
+    public function isSeparateApps()
+    {
+        return (bool)$this->scopeConfig->getValue('newrelicreporting/general/separate_apps');
+    }
+
     /**
      * Returns config setting for overall cron to be enabled
      *
@@ -168,7 +181,7 @@ public function getNewRelicAppName()
      */
     public function isCronEnabled()
     {
-        return (bool)$this->scopeConfig->getValue('newrelicreporting/cron/enable_cron');
+        return $this->scopeConfig->isSetFlag('newrelicreporting/cron/enable_cron');
     }
 
     /**
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
index 9cdc90bc46b2a..78c485c5bb6f5 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportModulesInfo.php
@@ -64,6 +64,7 @@ public function report()
             $moduleData = $this->collect->getModuleData();
             if (count($moduleData['changes']) > 0) {
                 foreach ($moduleData['changes'] as $change) {
+                    $modelData = [];
                     switch ($change['type']) {
                         case Config::ENABLED:
                             $modelData = [
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
index a4a7d30b44f5b..6b2bd50dc456b 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
@@ -175,7 +175,6 @@ protected function reportCounts()
     public function report()
     {
         if ($this->config->isNewRelicEnabled()) {
-            $this->reportModules();
             $this->reportCounts();
         }
 
diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
index c4818c38cd9c6..9882a1ce9b0b8 100644
--- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
+++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
@@ -28,6 +28,32 @@ public function addCustomParameter($param, $value)
         return false;
     }
 
+    /**
+     * Wrapper for 'newrelic_notice_error' function
+     *
+     * @param  \Exception $exception
+     * @return void
+     */
+    public function reportError($exception)
+    {
+        if (extension_loaded('newrelic')) {
+            newrelic_notice_error($exception->getMessage(), $exception);
+        }
+    }
+
+    /**
+     * Wrapper for 'newrelic_set_appname'
+     *
+     * @param string $appName
+     * @return void
+     */
+    public function setAppName(string $appName)
+    {
+        if (extension_loaded('newrelic')) {
+            newrelic_set_appname($appName);
+        }
+    }
+
     /**
      * Checks whether newrelic-php5 agent is installed
      *
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php
new file mode 100644
index 0000000000000..ce7e95950c937
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\NewRelicReporting\Model\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\NewRelicReporting\Model\Config;
+use Magento\NewRelicReporting\Model\NewRelicWrapper;
+
+/**
+ * Class ReportApplicationHandledExceptionToNewRelic
+ */
+class ReportApplicationHandledExceptionToNewRelic implements ObserverInterface
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var NewRelicWrapper
+     */
+    private $newRelicWrapper;
+
+    /**
+     * @param Config $config
+     * @param NewRelicWrapper $newRelicWrapper
+     */
+    public function __construct(
+        Config $config,
+        NewRelicWrapper $newRelicWrapper
+    ) {
+        $this->config = $config;
+        $this->newRelicWrapper = $newRelicWrapper;
+    }
+
+    /**
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer)
+    {
+        if ($this->config->isNewRelicEnabled()) {
+            $exception = $observer->getEvent()->getException();
+            $this->newRelicWrapper->reportError($exception);
+        }
+    }
+}
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
index 615c80633cb0f..9dfd0e1e3319a 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
@@ -66,8 +66,8 @@ public function execute(Observer $observer)
                 $user = $this->backendAuthSession->getUser();
                 $jsonData = [
                     'id' => $user->getId(),
-                    'username' => $user->getUsername(),
-                    'name' => $user->getFirstname() . ' ' . $user->getLastname(),
+                    'username' => $user->getUserName(),
+                    'name' => $user->getFirstName() . ' ' . $user->getLastName(),
                 ];
 
                 $modelData = [
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
index cff1b159d481d..2f142f6ac8124 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
@@ -58,10 +58,10 @@ public function execute(Observer $observer)
             if ($this->backendAuthSession->isLoggedIn()) {
                 $user = $this->backendAuthSession->getUser();
                 $this->newRelicWrapper->addCustomParameter(Config::ADMIN_USER_ID, $user->getId());
-                $this->newRelicWrapper->addCustomParameter(Config::ADMIN_USER, $user->getUsername());
+                $this->newRelicWrapper->addCustomParameter(Config::ADMIN_USER, $user->getUserName());
                 $this->newRelicWrapper->addCustomParameter(
                     Config::ADMIN_NAME,
-                    $user->getFirstname() . ' ' . $user->getLastname()
+                    $user->getFirstName() . ' ' . $user->getLastName()
                 );
             }
         }
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
index 0e3ad1605f948..5500aba195936 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
@@ -58,8 +58,8 @@ public function execute(Observer $observer)
             if ($user->getId()) {
                 $this->deploymentsFactory->create()->setDeployment(
                     'Cache Flush',
-                    $user->getUsername() . ' flushed the cache.',
-                    $user->getUsername()
+                    $user->getUserName() . ' flushed the cache.',
+                    $user->getUserName()
                 );
             }
         }
diff --git a/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php b/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php
new file mode 100644
index 0000000000000..1eced70950e99
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\NewRelicReporting\Model;
+
+class ServiceShellUser
+{
+    /**
+     * Default user name;
+     */
+    const DEFAULT_USER = 'cron';
+
+    /**
+     * Get use name.
+     *
+     * @param bool $userFromArgument
+     * @return string
+     */
+    public function get($userFromArgument = false)
+    {
+        if ($userFromArgument) {
+            return $userFromArgument;
+        }
+
+        $user = "echo \$USER";
+        if ($user) {
+            return $user;
+        }
+
+        return self::DEFAULT_USER;
+    }
+}
diff --git a/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php
new file mode 100644
index 0000000000000..a37d93329d43a
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\NewRelicReporting\Plugin;
+
+use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\Http;
+use Magento\NewRelicReporting\Model\Config;
+use Magento\NewRelicReporting\Model\NewRelicWrapper;
+
+class HttpPlugin
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var NewRelicWrapper
+     */
+    private $newRelicWrapper;
+
+    /**
+     * @param Config $config
+     * @param NewRelicWrapper $newRelicWrapper
+     */
+    public function __construct(
+        Config $config,
+        NewRelicWrapper $newRelicWrapper
+    ) {
+        $this->config = $config;
+        $this->newRelicWrapper = $newRelicWrapper;
+    }
+
+    /**
+     * Report exception to New Relic
+     *
+     * @param Http $subject
+     * @param Bootstrap $bootstrap
+     * @param \Exception $exception
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeCatchException(Http $subject, Bootstrap $bootstrap, \Exception $exception)
+    {
+        if ($this->config->isNewRelicEnabled()) {
+            $this->newRelicWrapper->reportError($exception);
+        }
+    }
+}
diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php
new file mode 100644
index 0000000000000..8be29fa6db9d9
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\NewRelicReporting\Plugin;
+
+use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\NewRelicReporting\Model\Config;
+use Magento\NewRelicReporting\Model\NewRelicWrapper;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Handles setting which, when enabled, reports frontend and adminhtml as separate apps to New Relic.
+ */
+class StatePlugin
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var NewRelicWrapper
+     */
+    private $newRelicWrapper;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Config $config
+     * @param NewRelicWrapper $newRelicWrapper
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Config $config,
+        NewRelicWrapper $newRelicWrapper,
+        LoggerInterface $logger
+    ) {
+        $this->config = $config;
+        $this->newRelicWrapper = $newRelicWrapper;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Set separate appname
+     *
+     * @param State $subject
+     * @param mixed $result
+     * @return mixed
+     */
+    public function afterSetAreaCode(State $subject, $result)
+    {
+        if (!$this->shouldSetAppName()) {
+            return $result;
+        }
+
+        try {
+            $this->newRelicWrapper->setAppName($this->appName($subject));
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e);
+            return $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Format appName.
+     *
+     * @param State $state
+     * @return string
+     * @throws LocalizedException
+     */
+    private function appName(State $state): string
+    {
+        $code = $state->getAreaCode();
+        $current = $this->config->getNewRelicAppName();
+
+        return $current . ';' . $current . '_' . $code;
+    }
+
+    /**
+     * Check if app name should be set.
+     *
+     * @return bool
+     */
+    private function shouldSetAppName(): bool
+    {
+        return (
+            $this->config->isSeparateApps() &&
+            $this->config->getNewRelicAppName() &&
+            $this->config->isNewRelicEnabled()
+        );
+    }
+}
diff --git a/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php b/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
deleted file mode 100644
index aa6c8d1058f4b..0000000000000
--- a/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\NewRelicReporting\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        /**
-         * Prepare database for install
-         */
-        $installer->startSetup();
-
-        /**
-         * Create table 'reporting_counts'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('reporting_counts')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Item Reported'
-        )->addColumn(
-            'count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Count Value'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->setComment(
-            'Reporting for all count related events generated via the cron job'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'reporting_module_status'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('reporting_module_status')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Module Id'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Module Name'
-        )->addColumn(
-            'active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Module Active Status'
-        )->addColumn(
-            'setup_version',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Module Version'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Module State'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->setComment(
-            'Module Status Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'reporting_orders'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('reporting_orders')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Customer Id'
-        )->addColumn(
-            'total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '20,2',
-            ['unsigned' => true],
-            'Total From Store'
-        )->addColumn(
-            'total_base',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '20,2',
-            ['unsigned' => true],
-            'Total From Base Currency'
-        )->addColumn(
-            'item_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Line Item Count'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Updated At'
-        )->setComment(
-            'Reporting for all orders'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'reporting_users'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('reporting_users')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'User Type'
-        )->addColumn(
-            'action',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Action Performed'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Updated At'
-        )->setComment(
-            'Reporting for user actions'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'reporting_system_updates'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('reporting_system_updates')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Update Type'
-        )->addColumn(
-            'action',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Action Performed'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Updated At'
-        )->setComment(
-            'Reporting for system updates'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Prepare database after install
-         */
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/NewRelicReporting/Setup/UpgradeSchema.php b/app/code/Magento/NewRelicReporting/Setup/UpgradeSchema.php
deleted file mode 100644
index f79770e7c9f2f..0000000000000
--- a/app/code/Magento/NewRelicReporting/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\NewRelicReporting\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * Upgrade the NewRelicReporting module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            // The following fields are not 'unsigned' as they should after upgrade from 2.1
-            $setup->getConnection()->modifyColumn(
-                $setup->getTable('reporting_orders'),
-                'total',
-                ['unsigned' => true, 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL]
-            );
-            $setup->getConnection()->modifyColumn(
-                $setup->getTable('reporting_orders'),
-                'total_base',
-                ['unsigned' => true, 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL]
-            );
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE.txt b/app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE.txt
rename to app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE_AFL.txt b/app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/README.md b/app/code/Magento/NewRelicReporting/Test/Mftf/README.md
new file mode 100644
index 0000000000000..911d92102a572
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# New Relic Reporting Functional Tests
+
+The Functional Test Module for **Magento New Relic Reporting** module.
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
index eb665773d5f4b..1193ac088633f 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
@@ -252,6 +252,9 @@ public function testSetDeploymentRequestFail()
         );
     }
 
+    /**
+     * @return array
+     */
     private function getDataVariables()
     {
         $description = 'Event description';
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
index 70fdcd0b6191c..400bcefa9828b 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
@@ -144,24 +144,10 @@ public function testReportNewRelicCronModuleDisabledFromConfig()
      */
     public function testReportNewRelicCron()
     {
-        $testModuleData = [
-            'changes' => [
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'enabled'],
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'disabled'],
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'installed'],
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'uninstalled'],
-            ],
-            'enabled' => 1,
-            'disabled' => 1,
-            'installed' => 1,
-        ];
 
         $this->config->expects($this->once())
             ->method('isNewRelicEnabled')
             ->willReturn(true);
-        $this->collect->expects($this->once())
-            ->method('getModuleData')
-            ->willReturn($testModuleData);
         $this->counter->expects($this->once())
             ->method('getAllProductsCount');
         $this->counter->expects($this->once())
@@ -198,24 +184,10 @@ public function testReportNewRelicCron()
      */
     public function testReportNewRelicCronRequestFailed()
     {
-        $testModuleData = [
-            'changes' => [
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'enabled'],
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'disabled'],
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'installed'],
-                ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'uninstalled'],
-            ],
-            'enabled' => 1,
-            'disabled' => 1,
-            'installed' => 1,
-        ];
 
         $this->config->expects($this->once())
             ->method('isNewRelicEnabled')
             ->willReturn(true);
-        $this->collect->expects($this->once())
-            ->method('getModuleData')
-            ->willReturn($testModuleData);
         $this->counter->expects($this->once())
             ->method('getAllProductsCount');
         $this->counter->expects($this->once())
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
index 1c3b9e08f2e7e..8d8e6255ab8d3 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
@@ -360,6 +360,9 @@ public function testGetModuleDataRefreshOrStatement($data)
         );
     }
 
+    /**
+     * @return array
+     */
     public function itemDataProvider()
     {
         return [
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/ReportProductSavedToNewRelicTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/ReportProductSavedToNewRelicTest.php
index 20791511324bf..ba5f13d247fe0 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/ReportProductSavedToNewRelicTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/ReportProductSavedToNewRelicTest.php
@@ -140,6 +140,9 @@ public function testReportProductUpdatedToNewRelic($isNewObject)
         $this->model->execute($eventObserver);
     }
 
+    /**
+     * @return array
+     */
     public function actionDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index 43d2b69816a26..25e7193ce0e2f 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-configurable-product": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
index 582b7c752386a..98f9c55adbdf0 100644
--- a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
+++ b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
@@ -46,6 +46,11 @@
                     <label>New Relic Application Name</label>
                     <comment>This is located by navigating to Settings from the New Relic APM website</comment>
                 </field>
+                <field id="separate_apps" translate="label comment" type="select" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Send Adminhtml and Frontend as Separate Apps</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set.</comment>
+                </field>
             </group>
             <group id="cron" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Cron</label>
diff --git a/app/code/Magento/NewRelicReporting/etc/db_schema.xml b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
new file mode 100644
index 0000000000000..b5db533f90c75
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reporting_counts" resource="default" engine="innodb"
+           comment="Reporting for all count related events generated via the cron job">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Item Reported"/>
+        <column xsi:type="int" name="count" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Count Value"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+    <table name="reporting_module_status" resource="default" engine="innodb" comment="Module Status Table">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Module Id"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Module Name"/>
+        <column xsi:type="varchar" name="active" nullable="true" length="255" comment="Module Active Status"/>
+        <column xsi:type="varchar" name="setup_version" nullable="true" length="255" comment="Module Version"/>
+        <column xsi:type="varchar" name="state" nullable="true" length="255" comment="Module State"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+    <table name="reporting_orders" resource="default" engine="innodb" comment="Reporting for all orders">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer ID"/>
+        <column xsi:type="decimal" name="total" scale="0" precision="10" unsigned="true" nullable="true"/>
+        <column xsi:type="decimal" name="total_base" scale="0" precision="10" unsigned="true" nullable="true"/>
+        <column xsi:type="int" name="item_count" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Line Item Count"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+    <table name="reporting_users" resource="default" engine="innodb" comment="Reporting for user actions">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="type" nullable="true" length="255" comment="User Type"/>
+        <column xsi:type="varchar" name="action" nullable="true" length="255" comment="Action Performed"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+    <table name="reporting_system_updates" resource="default" engine="innodb" comment="Reporting for system updates">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Update Type"/>
+        <column xsi:type="varchar" name="action" nullable="true" length="255" comment="Action Performed"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/NewRelicReporting/etc/db_schema_whitelist.json b/app/code/Magento/NewRelicReporting/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..aa59e6cf831ea
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/etc/db_schema_whitelist.json
@@ -0,0 +1,61 @@
+{
+    "reporting_counts": {
+        "column": {
+            "entity_id": true,
+            "type": true,
+            "count": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "reporting_module_status": {
+        "column": {
+            "entity_id": true,
+            "name": true,
+            "active": true,
+            "setup_version": true,
+            "state": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "reporting_orders": {
+        "column": {
+            "entity_id": true,
+            "customer_id": true,
+            "total": true,
+            "total_base": true,
+            "item_count": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "reporting_users": {
+        "column": {
+            "entity_id": true,
+            "type": true,
+            "action": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "reporting_system_updates": {
+        "column": {
+            "entity_id": true,
+            "type": true,
+            "action": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml
index a0d06105dd3fe..bab7d6611f14b 100644
--- a/app/code/Magento/NewRelicReporting/etc/di.xml
+++ b/app/code/Magento/NewRelicReporting/etc/di.xml
@@ -27,4 +27,17 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Http">
+        <plugin name="framework-http-newrelic" type="Magento\NewRelicReporting\Plugin\HttpPlugin"/>
+    </type>
+    <type name="Magento\Framework\App\State">
+        <plugin name="framework-state-newrelic" type="Magento\NewRelicReporting\Plugin\StatePlugin"/>
+    </type>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="newrelicreporting_deploy_marker" xsi:type="object">Magento\NewRelicReporting\Console\Command\DeployMarker</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/NewRelicReporting/etc/module.xml b/app/code/Magento/NewRelicReporting/etc/module.xml
index 84092d710d002..4a824c622fe05 100644
--- a/app/code/Magento/NewRelicReporting/etc/module.xml
+++ b/app/code/Magento/NewRelicReporting/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_NewRelicReporting" setup_version="2.0.1">
+    <module name="Magento_NewRelicReporting" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Customer"/>
diff --git a/app/code/Magento/NewRelicReporting/i18n/en_US.csv b/app/code/Magento/NewRelicReporting/i18n/en_US.csv
index 433b1b22fcddd..5ea64d3d43439 100644
--- a/app/code/Magento/NewRelicReporting/i18n/en_US.csv
+++ b/app/code/Magento/NewRelicReporting/i18n/en_US.csv
@@ -21,3 +21,5 @@ General,General
 "This is located by navigating to Settings from the New Relic APM website","This is located by navigating to Settings from the New Relic APM website"
 Cron,Cron
 "Enable Cron","Enable Cron"
+"Send Adminhtml and Frontend as Separate Apps","Send Adminhtml and Frontend as Separate Apps"
+"In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set.","In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set."
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index c5f4dc68d4dd2..61a17d7ad5e51 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -19,7 +19,7 @@ class Problem extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'problem/list.phtml';
+    protected $_template = 'Magento_Newsletter::problem/list.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\ResourceModel\Problem\Collection
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index f085b0f6c9c8b..ca90b5d84a10f 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'queue/edit.phtml';
+    protected $_template = 'Magento_Newsletter::queue/edit.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
index 86e7e7ee4756d..4d5165db68736 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
@@ -29,7 +29,7 @@ class Subscriber extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'subscriber/list.phtml';
+    protected $_template = 'Magento_Newsletter::subscriber/list.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 02b60e049f254..92ae6e6c3db04 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -16,7 +16,7 @@ class Template extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'template/list.phtml';
+    protected $_template = 'Magento_Newsletter::template/list.phtml';
 
     /**
      * @return $this
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 79db83e7a49b8..236101745b98e 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -67,12 +67,6 @@ public function getModel()
      */
     protected function _prepareLayout()
     {
-        // Load Wysiwyg on demand and Prepare layout
-//        $block = $this->getLayout()->getBlock('head');
-//        if ($this->_wysiwygConfig->isEnabled() && $block) {
-//            $block->setCanLoadTinyMce(true);
-//        }
-
         $this->getToolbar()->addChild(
             'back_button',
             \Magento\Backend\Block\Widget\Button::class,
@@ -216,7 +210,7 @@ public function getForm()
     }
 
     /**
-     * Return return template name for JS
+     * Return template name for JS
      *
      * @return string
      */
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index fcad9a10a0526..04fb07d1261b6 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -14,7 +14,7 @@
 class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * Renderer for "Action" column in Newsletter templates grid
+     * Renderer for "Action" column in Newsletter templates grid.
      *
      * @param \Magento\Framework\DataObject $row
      * @return string
@@ -26,11 +26,12 @@ public function render(\Magento\Framework\DataObject $row)
             $str .= htmlspecialchars($row->getTemplateSenderName()) . ' ';
         }
         if ($row->getTemplateSenderEmail()) {
-            $str .= '[' . $row->getTemplateSenderEmail() . ']';
+            $str .= '[' . htmlspecialchars($row->getTemplateSenderEmail()) . ']';
         }
         if ($str == '') {
             $str .= '---';
         }
+        
         return $str;
     }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
index 7ea3b2cb90951..453a42def61fe 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Problem;
 
-class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem implements HttpGetActionInterface
 {
     /**
      * Newsletter problems report page
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
index b012979a11ac9..f99c22a474396 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Queue;
 
-class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpGetActionInterface
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
index c992fe6c37701..4f734c09e475e 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Queue;
 
-class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Newsletter\Controller\Adminhtml\Queue as QueueAction;
+
+class Grid extends QueueAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Queue list Ajax action
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
index 22c7adc5255cc..2d07ffabe3839 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php
@@ -6,7 +6,14 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Queue;
 
-class Index extends \Magento\Newsletter\Controller\Adminhtml\Queue
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Newsletter\Controller\Adminhtml\Queue as QueueAction;
+
+/**
+ * Show newsletter queue. Needs to be accessible by POST because of filtering.
+ */
+class Index extends QueueAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Queue list action
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index d3b091976e922..2dbe10bf1bdc9 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -7,7 +7,9 @@
 
 namespace Magento\Newsletter\Controller\Adminhtml\Queue;
 
-class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpPostActionInterface
 {
     /**
      * Save Newsletter queue
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php
index 31f823b72407f..f2846ad7db1b7 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php
@@ -17,7 +17,7 @@ public function execute()
     {
         // Todo: put it somewhere in config!
         $countOfQueue = 3;
-        $countOfSubscritions = 20;
+        $countOfSubscriptions = 20;
 
         $collection = $this->_objectManager->create(
             \Magento\Newsletter\Model\ResourceModel\Queue\Collection::class
@@ -27,6 +27,6 @@ public function execute()
             1
         )->addOnlyForSendingFilter()->load();
 
-        $collection->walk('sendPerSubscriber', [$countOfSubscritions]);
+        $collection->walk('sendPerSubscriber', [$countOfSubscriptions]);
     }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
index a730b8a21a154..09cf1ae7959fb 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Newsletter\Controller\Adminhtml\Subscriber as SubscriberAction;
+
+class Index extends SubscriberAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Newsletter subscribers page
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
index 0dd2e5c4b387f..7f02e4ea13445 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
@@ -6,8 +6,32 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-class MassDelete extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Framework\App\ObjectManager;
+
+class MassDelete extends Subscriber
 {
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+    
+    /**
+     * @param Context $context
+     * @param FileFactory $fileFactory
+     */
+    public function __construct(
+        Context $context,
+        FileFactory $fileFactory,
+        SubscriberFactory $subscriberFactory = null
+    ) {
+        $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class);
+        parent::__construct($context, $fileFactory);
+    }
+    
     /**
      * Delete one or more subscribers action
      *
@@ -21,9 +45,7 @@ public function execute()
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
-                    $subscriber = $this->_objectManager->create(
-                        \Magento\Newsletter\Model\Subscriber::class
-                    )->load(
+                    $subscriber = $this->subscriberFactory->create()->load(
                         $subscriberId
                     );
                     $subscriber->delete();
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index f294d23f46ece..b61494f795905 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -6,8 +6,33 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-class MassUnsubscribe extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Framework\App\ObjectManager;
+
+class MassUnsubscribe extends Subscriber
 {
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+    
+    /**
+     * @param Context $context
+     * @param FileFactory $fileFactory
+     * @param SubscriberFactory $subscriberFactory
+     */
+    public function __construct(
+        Context $context,
+        FileFactory $fileFactory,
+        SubscriberFactory $subscriberFactory = null
+    ) {
+        $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class);
+        parent::__construct($context, $fileFactory);
+    }
+    
     /**
      * Unsubscribe one or more subscribers action
      *
@@ -21,9 +46,7 @@ public function execute()
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
-                    $subscriber = $this->_objectManager->create(
-                        \Magento\Newsletter\Model\Subscriber::class
-                    )->load(
+                    $subscriber = $this->subscriberFactory->create()->load(
                         $subscriberId
                     );
                     $subscriber->unsubscribe();
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
index 52d46065ad05b..2d167d4ccf5f3 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
-class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface
 {
     /**
      * Drop Newsletter Template
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
index a1126be35af39..e60b865003f44 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
-class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
index 5fcce53c6abbd..12cdb7e262db9 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
-class Index extends \Magento\Newsletter\Controller\Adminhtml\Template
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
 {
     /**
      * View Templates list
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
index 054e9025a4ffa..c739d6ba26b17 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
-class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
 {
     /**
      * Create new Newsletter Template
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
index fbce319a75fc1..9fd9f4335b5c5 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
@@ -6,7 +6,12 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
-class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * View a rendered template.
+ */
+class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
 {
     /**
      * Preview Newsletter template
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
index c9db0d62e2e24..8fc729ea34078 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
@@ -6,10 +6,11 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Exception\LocalizedException;
 
-class Save extends \Magento\Newsletter\Controller\Adminhtml\Template
+class Save extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface
 {
     /**
      * Save Newsletter Template
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 75ef8b26f50a9..419cbac10ffd1 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -4,9 +4,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Manage;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Newsletter\Model\Subscriber;
 
 class Save extends \Magento\Newsletter\Controller\Manage
 {
@@ -74,13 +76,28 @@ public function execute()
                 $customer = $this->customerRepository->getById($customerId);
                 $storeId = $this->storeManager->getStore()->getId();
                 $customer->setStoreId($storeId);
-                $this->customerRepository->save($customer);
-                if ((boolean)$this->getRequest()->getParam('is_subscribed', false)) {
-                    $this->subscriberFactory->create()->subscribeCustomerById($customerId);
-                    $this->messageManager->addSuccess(__('We saved the subscription.'));
+                $isSubscribedState = $customer->getExtensionAttributes()
+                    ->getIsSubscribed();
+                $isSubscribedParam = (boolean)$this->getRequest()
+                    ->getParam('is_subscribed', false);
+                if ($isSubscribedParam !== $isSubscribedState) {
+                    $this->customerRepository->save($customer);
+                    if ($isSubscribedParam) {
+                        $subscribeModel = $this->subscriberFactory->create()
+                            ->subscribeCustomerById($customerId);
+                        $subscribeStatus = $subscribeModel->getStatus();
+                        if ($subscribeStatus == Subscriber::STATUS_SUBSCRIBED) {
+                            $this->messageManager->addSuccess(__('We have saved your subscription.'));
+                        } else {
+                            $this->messageManager->addSuccess(__('A confirmation request has been sent.'));
+                        }
+                    } else {
+                        $this->subscriberFactory->create()
+                            ->unsubscribeCustomerById($customerId);
+                        $this->messageManager->addSuccess(__('We have removed your newsletter subscription.'));
+                    }
                 } else {
-                    $this->subscriberFactory->create()->unsubscribeCustomerById($customerId);
-                    $this->messageManager->addSuccess(__('We removed the subscription.'));
+                    $this->messageManager->addSuccess(__('We have updated your subscription.'));
                 }
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('Something went wrong while saving your subscription.'));
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
index 004677b899cd0..4e338c2d1df34 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -32,6 +32,8 @@ public function execute()
             }
         }
 
-        $this->getResponse()->setRedirect($this->_storeManager->getStore()->getBaseUrl());
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
+        return $resultRedirect;
     }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 13ab40665e591..4f46c84894f12 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -10,19 +10,35 @@
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\Validator\EmailAddress as EmailValidator;
+use Magento\Newsletter\Controller\Subscriber as SubscriberController;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Newsletter\Model\SubscriberFactory;
 
 /**
+ * New newsletter subscription action
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class NewAction extends \Magento\Newsletter\Controller\Subscriber
+class NewAction extends SubscriberController implements HttpPostActionInterface
 {
     /**
      * @var CustomerAccountManagement
      */
     protected $customerAccountManagement;
 
+    /**
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
     /**
      * Initialize dependencies.
      *
@@ -32,6 +48,7 @@ class NewAction extends \Magento\Newsletter\Controller\Subscriber
      * @param StoreManagerInterface $storeManager
      * @param CustomerUrl $customerUrl
      * @param CustomerAccountManagement $customerAccountManagement
+     * @param EmailValidator $emailValidator
      */
     public function __construct(
         Context $context,
@@ -39,9 +56,11 @@ public function __construct(
         Session $customerSession,
         StoreManagerInterface $storeManager,
         CustomerUrl $customerUrl,
-        CustomerAccountManagement $customerAccountManagement
+        CustomerAccountManagement $customerAccountManagement,
+        EmailValidator $emailValidator = null
     ) {
         $this->customerAccountManagement = $customerAccountManagement;
+        $this->emailValidator = $emailValidator ?: ObjectManager::getInstance()->get(EmailValidator::class);
         parent::__construct(
             $context,
             $subscriberFactory,
@@ -55,16 +74,17 @@ public function __construct(
      * Validates that the email address isn't being used by a different account.
      *
      * @param string $email
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return void
      */
     protected function validateEmailAvailable($email)
     {
         $websiteId = $this->_storeManager->getStore()->getWebsiteId();
-        if ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
-            && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId)
+        if ($this->_customerSession->isLoggedIn()
+            && ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
+            && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId))
         ) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('This email address is already assigned to another user.')
             );
         }
@@ -73,19 +93,19 @@ protected function validateEmailAvailable($email)
     /**
      * Validates that if the current user is a guest, that they can subscribe to a newsletter.
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return void
      */
     protected function validateGuestSubscription()
     {
-        if ($this->_objectManager->get(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+        if ($this->_objectManager->get(ScopeConfigInterface::class)
                 ->getValue(
-                    \Magento\Newsletter\Model\Subscriber::XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG,
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                    Subscriber::XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG,
+                    ScopeInterface::SCOPE_STORE
                 ) != 1
             && !$this->_customerSession->isLoggedIn()
         ) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __(
                     'Sorry, but the administrator denied subscription for guests. Please <a href="%1">register</a>.',
                     $this->_customerUrl->getRegisterUrl()
@@ -98,20 +118,19 @@ protected function validateGuestSubscription()
      * Validates the format of the email address
      *
      * @param string $email
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return void
      */
     protected function validateEmailFormat($email)
     {
-        if (!\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a valid email address.'));
+        if (!$this->emailValidator->isValid($email)) {
+            throw new LocalizedException(__('Please enter a valid email address.'));
         }
     }
 
     /**
      * New subscription action
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      */
     public function execute()
@@ -126,28 +145,36 @@ public function execute()
 
                 $subscriber = $this->_subscriberFactory->create()->loadByEmail($email);
                 if ($subscriber->getId()
-                    && $subscriber->getSubscriberStatus() == \Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED
+                    && (int) $subscriber->getSubscriberStatus() === Subscriber::STATUS_SUBSCRIBED
                 ) {
-                    throw new \Magento\Framework\Exception\LocalizedException(
+                    throw new LocalizedException(
                         __('This email address is already subscribed.')
                     );
                 }
 
-                $status = $this->_subscriberFactory->create()->subscribe($email);
-                if ($status == \Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE) {
-                    $this->messageManager->addSuccess(__('The confirmation request has been sent.'));
-                } else {
-                    $this->messageManager->addSuccess(__('Thank you for your subscription.'));
-                }
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addException(
-                    $e,
-                    __('There was a problem with the subscription: %1', $e->getMessage())
-                );
+                $status = (int) $this->_subscriberFactory->create()->subscribe($email);
+                $this->messageManager->addSuccessMessage($this->getSuccessMessage($status));
+            } catch (LocalizedException $e) {
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong with the subscription.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
             }
         }
         $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
     }
+
+    /**
+     * Get success message
+     *
+     * @param int $status
+     * @return Phrase
+     */
+    private function getSuccessMessage(int $status): Phrase
+    {
+        if ($status === Subscriber::STATUS_NOT_ACTIVE) {
+            return __('The confirmation request has been sent.');
+        }
+
+        return __('Thank you for your subscription.');
+    }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
index efc469e15deaa..88fa128162700 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
@@ -1,16 +1,21 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Newsletter\Controller\Subscriber;
 
-class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+/**
+ * Controller for unsubscribing customers.
+ */
+class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
 {
     /**
-     * Unsubscribe newsletter
-     * @return void
+     * Unsubscribe newsletter.
+     *
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -27,6 +32,9 @@ public function execute()
                 $this->messageManager->addException($e, __('Something went wrong while unsubscribing you.'));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+        /** @var \Magento\Backend\Model\View\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_redirect->getRedirectUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 }
diff --git a/app/code/Magento/Newsletter/Helper/Data.php b/app/code/Magento/Newsletter/Helper/Data.php
index 099651b940626..cdf675f711c09 100644
--- a/app/code/Magento/Newsletter/Helper/Data.php
+++ b/app/code/Magento/Newsletter/Helper/Data.php
@@ -27,7 +27,7 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
     }
 
     /**
-     * Retrieve subsription confirmation url
+     * Retrieve subscription confirmation url
      *
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
      * @return string
@@ -43,7 +43,7 @@ public function getConfirmationUrl($subscriber)
     }
 
     /**
-     * Retrieve unsubsription url
+     * Retrieve unsubscription url
      *
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
      * @return string
diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index b82d6fe06918f..035013e572833 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -6,9 +6,17 @@
 namespace Magento\Newsletter\Model\Plugin;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Newsletter\Model\ResourceModel\Subscriber;
 use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Newsletter Plugin for customer
+ */
 class CustomerPlugin
 {
     /**
@@ -18,14 +26,44 @@ class CustomerPlugin
      */
     private $subscriberFactory;
 
+    /**
+     * @var ExtensionAttributesFactory
+     */
+    private $extensionFactory;
+
+    /**
+     * @var Subscriber
+     */
+    private $subscriberResource;
+
+    /**
+     * @var array
+     */
+    private $customerSubscriptionStatus = [];
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Initialize dependencies.
      *
      * @param SubscriberFactory $subscriberFactory
+     * @param ExtensionAttributesFactory $extensionFactory
+     * @param Subscriber $subscriberResource
+     * @param StoreManagerInterface|null $storeManager
      */
-    public function __construct(SubscriberFactory $subscriberFactory)
-    {
+    public function __construct(
+        SubscriberFactory $subscriberFactory,
+        ExtensionAttributesFactory $extensionFactory,
+        Subscriber $subscriberResource,
+        StoreManagerInterface $storeManager = null
+    ) {
         $this->subscriberFactory = $subscriberFactory;
+        $this->extensionFactory = $extensionFactory;
+        $this->subscriberResource = $subscriberResource;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -41,14 +79,34 @@ public function __construct(SubscriberFactory $subscriberFactory)
      */
     public function afterSave(CustomerRepository $subject, CustomerInterface $result, CustomerInterface $customer)
     {
-        $this->subscriberFactory->create()->updateSubscription($result->getId());
-        if ($result->getId() && $customer->getExtensionAttributes()) {
-            if ($customer->getExtensionAttributes()->getIsSubscribed() === true) {
-                $this->subscriberFactory->create()->subscribeCustomerById($result->getId());
-            } elseif ($customer->getExtensionAttributes()->getIsSubscribed() === false) {
-                $this->subscriberFactory->create()->unsubscribeCustomerById($result->getId());
+        $resultId = $result->getId();
+        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
+        $subscriber = $this->subscriberFactory->create();
+
+        $subscriber->updateSubscription($resultId);
+        // update the result only if the original customer instance had different value.
+        $initialExtensionAttributes = $result->getExtensionAttributes();
+        if ($initialExtensionAttributes === null) {
+            /** @var CustomerExtensionInterface $initialExtensionAttributes */
+            $initialExtensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
+            $result->setExtensionAttributes($initialExtensionAttributes);
+        }
+
+        $newExtensionAttributes = $customer->getExtensionAttributes();
+        if ($newExtensionAttributes
+            && $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed()
+        ) {
+            if ($newExtensionAttributes->getIsSubscribed()) {
+                $subscriber->subscribeCustomerById($resultId);
+            } else {
+                $subscriber->unsubscribeCustomerById($resultId);
             }
         }
+
+        $isSubscribed = $subscriber->isSubscribed();
+        $this->customerSubscriptionStatus[$resultId] = $isSubscribed;
+        $initialExtensionAttributes->setIsSubscribed($isSubscribed);
+
         return $result;
     }
 
@@ -94,4 +152,48 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf
         }
         return $result;
     }
+
+    /**
+     * Plugin after getById customer that obtains newsletter subscription status for given customer.
+     *
+     * @param CustomerRepository $subject
+     * @param CustomerInterface $customer
+     * @return CustomerInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
+    {
+        $extensionAttributes = $customer->getExtensionAttributes();
+        $storeId = $this->storeManager->getStore()->getId();
+        $customer->setStoreId($storeId);
+        if ($extensionAttributes === null) {
+            /** @var CustomerExtensionInterface $extensionAttributes */
+            $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
+            $customer->setExtensionAttributes($extensionAttributes);
+        }
+        if ($extensionAttributes->getIsSubscribed() === null) {
+            $isSubscribed = $this->isSubscribed($customer);
+            $extensionAttributes->setIsSubscribed($isSubscribed);
+        }
+
+        return $customer;
+    }
+
+    /**
+     * This method returns newsletters subscription status for given customer.
+     *
+     * @param CustomerInterface $customer
+     * @return bool
+     */
+    private function isSubscribed(CustomerInterface $customer)
+    {
+        $customerId = $customer->getId();
+        if (!isset($this->customerSubscriptionStatus[$customerId])) {
+            $subscriber = $this->subscriberResource->loadByCustomerData($customer);
+            $this->customerSubscriptionStatus[$customerId] = isset($subscriber['subscriber_status'])
+                && $subscriber['subscriber_status'] == 1;
+        }
+
+        return $this->customerSubscriptionStatus[$customerId];
+    }
 }
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index efb68fd4243d1..a3279f8c83699 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverterInterface;
 
 /**
  * Newsletter queue model.
@@ -117,6 +118,11 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      */
     private $timezone;
 
+    /**
+     * @var LocalizedDateToUtcConverterInterface
+     */
+    private $utcConverter;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -130,6 +136,7 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param TimezoneInterface $timezone
+     * @param LocalizedDateToUtcConverterInterface $utcConverter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -144,7 +151,8 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        TimezoneInterface $timezone = null
+        TimezoneInterface $timezone = null,
+        LocalizedDateToUtcConverterInterface $utcConverter = null
     ) {
         parent::__construct(
             $context,
@@ -159,9 +167,10 @@ public function __construct(
         $this->_problemFactory = $problemFactory;
         $this->_subscribersCollection = $subscriberCollectionFactory->create();
         $this->_transportBuilder = $transportBuilder;
-        $this->timezone = $timezone ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            TimezoneInterface::class
-        );
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->timezone = $timezone ?: $objectManager->get(TimezoneInterface::class);
+        $this->utcConverter = $utcConverter ?? $objectManager->get(LocalizedDateToUtcConverterInterface::class);
     }
 
     /**
@@ -196,7 +205,7 @@ public function setQueueStartAtByString($startAt)
         if ($startAt === null || $startAt == '') {
             $this->setQueueStartAt(null);
         } else {
-            $this->setQueueStartAt($this->timezone->convertConfigTimeToUtc($startAt));
+            $this->setQueueStartAt($this->utcConverter->convertLocalizedDateToUtc($startAt));
         }
         return $this;
     }
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
index 6854b90a8888c..0d7ebd74f724f 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
@@ -165,8 +165,8 @@ protected function _addCustomersData()
                     $customerName = $this->_customerView->getCustomerName($customer);
                     foreach ($problems as $problem) {
                         $problem->setCustomerName($customerName)
-                            ->setCustomerFirstName($customer->getFirstName())
-                            ->setCustomerLastName($customer->getLastName());
+                            ->setCustomerFirstName($customer->getFirstname())
+                            ->setCustomerLastName($customer->getLastname());
                     }
                 } catch (NoSuchEntityException $e) {
                     // do nothing if customer is not found by id
@@ -176,7 +176,7 @@ protected function _addCustomersData()
     }
 
     /**
-     * Loads collecion and adds customers info
+     * Loads collection and adds customers info
      *
      * @param bool $printQuery
      * @param bool $logQuery
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
index 3e221047ec40a..52009dad6614b 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
@@ -70,7 +70,7 @@ protected function _construct()
     }
 
     /**
-     * Joines templates information
+     * Joins templates information
      *
      * @return $this
      */
@@ -86,7 +86,7 @@ public function addTemplateInfo()
     }
 
     /**
-     * Adds subscribers info to selelect
+     * Adds subscribers info to select
      *
      * @return $this
      */
@@ -130,7 +130,7 @@ public function load($printQuery = false, $logQuery = false)
     }
 
     /**
-     * Joines subscribers information
+     * Joins subscribers information
      *
      * @return $this
      */
@@ -141,8 +141,7 @@ public function addSubscribersInfo()
     }
 
     /**
-     * Checks if field is 'subscribers_total', 'subscribers_sent'
-     * to add specific filter or adds reguler filter
+     * Checks if field is 'subscribers_total', 'subscribers_sent' to add specific filter or adds regular filter
      *
      * @param string $field
      * @param null|string|array $condition
@@ -210,7 +209,7 @@ public function addSubscriberFilter($subscriberId)
     }
 
     /**
-     * Add filter by only ready fot sending item
+     * Add filter by only ready for sending item
      *
      * @return $this
      */
@@ -221,7 +220,7 @@ public function addOnlyForSendingFilter()
             [\Magento\Newsletter\Model\Queue::STATUS_SENDING, \Magento\Newsletter\Model\Queue::STATUS_NEVER]
         )->where(
             'main_table.queue_start_at < ?',
-            $this->_date->gmtdate()
+            $this->_date->gmtDate()
         )->where(
             'main_table.queue_start_at IS NOT NULL'
         );
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index c72ae42031001..f9e9d57bf4b40 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Newsletter\Model\ResourceModel;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Newsletter subscriber resource model
  *
@@ -48,6 +51,13 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $mathRandom;
 
+    /**
+     * Store manager
+     *
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Construct
      *
@@ -55,21 +65,23 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param string $connectionName
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
         \Magento\Framework\Math\Random $mathRandom,
-        $connectionName = null
+        $connectionName = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->_date = $date;
         $this->mathRandom = $mathRandom;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
         parent::__construct($context, $connectionName);
     }
 
     /**
-     * Initialize resource model
-     * Get tablename from config
+     * Initialize resource model. Get tablename from config
      *
      * @return void
      */
@@ -118,20 +130,36 @@ public function loadByEmail($subscriberEmail)
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
-        $select = $this->connection->select()->from($this->getMainTable())->where('customer_id=:customer_id');
+        $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
+
+        if ($customer->getId()) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('customer_id = ?', $customer->getId())
+                ->where('store_id IN (?)', $storeIds)
+                ->limit(1);
 
-        $result = $this->connection->fetchRow($select, ['customer_id' => $customer->getId()]);
+            $result = $this->connection->fetchRow($select);
 
-        if ($result) {
-            return $result;
+            if ($result) {
+                return $result;
+            }
         }
 
-        $select = $this->connection->select()->from($this->getMainTable())->where('subscriber_email=:subscriber_email');
+        if ($customer->getEmail()) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('subscriber_email = ?', $customer->getEmail())
+                ->where('store_id IN (?)', $storeIds)
+                ->limit(1);
 
-        $result = $this->connection->fetchRow($select, ['subscriber_email' => $customer->getEmail()]);
+            $result = $this->connection->fetchRow($select);
 
-        if ($result) {
-            return $result;
+            if ($result) {
+                return $result;
+            }
         }
 
         return [];
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 595c728117749..e7e5d5f202811 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -9,6 +9,9 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Subscriber model
@@ -94,6 +97,12 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      */
     protected $_customerSession;
 
+    /**
+     * Date
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
     /**
      * Store manager
      *
@@ -121,6 +130,16 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      */
     protected $inlineTranslation;
 
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
     /**
      * Initialize dependencies.
      *
@@ -134,9 +153,12 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime|null $dateTime
+     * @param CustomerInterfaceFactory|null $customerFactory
+     * @param DataObjectHelper|null $dataObjectHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -152,13 +174,23 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null,
+        CustomerInterfaceFactory $customerFactory = null,
+        DataObjectHelper $dataObjectHelper = null
     ) {
         $this->_newsletterData = $newsletterData;
         $this->_scopeConfig = $scopeConfig;
         $this->_transportBuilder = $transportBuilder;
         $this->_storeManager = $storeManager;
         $this->_customerSession = $customerSession;
+        $this->dateTime = $dateTime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Stdlib\DateTime\DateTime::class
+        );
+        $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()
+            ->get(CustomerInterfaceFactory::class);
+        $this->dataObjectHelper = $dataObjectHelper ?: ObjectManager::getInstance()
+            ->get(DataObjectHelper::class);
         $this->customerRepository = $customerRepository;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->inlineTranslation = $inlineTranslation;
@@ -335,7 +367,17 @@ public function isSubscribed()
      */
     public function loadByEmail($subscriberEmail)
     {
-        $this->addData($this->getResource()->loadByEmail($subscriberEmail));
+        $storeId = $this->_storeManager->getStore()->getId();
+        $customerData = ['store_id' => $storeId, 'email'=> $subscriberEmail];
+
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->addData($this->getResource()->loadByCustomerData($customer));
         return $this;
     }
 
@@ -349,6 +391,10 @@ public function loadByCustomerId($customerId)
     {
         try {
             $customerData = $this->customerRepository->getById($customerId);
+            $customerData->setStoreId($this->_storeManager->getStore()->getId());
+            if ($customerData->getWebsiteId() === null) {
+                $customerData->setWebsiteId($this->_storeManager->getStore()->getWebsiteId());
+            }
             $data = $this->getResource()->loadByCustomerData($customerData);
             $this->addData($data);
             if (!empty($data) && $customerData->getId() && !$this->getCustomerId()) {
@@ -407,7 +453,6 @@ public function subscribe($email)
             self::XML_PATH_CONFIRMATION_FLAG,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == 1 ? true : false;
-        $isOwnSubscribes = false;
 
         $isSubscribeOwnEmail = $this->_customerSession->isLoggedIn()
             && $this->_customerSession->getCustomerDataObject()->getEmail() == $email;
@@ -416,13 +461,7 @@ public function subscribe($email)
             || $this->getStatus() == self::STATUS_NOT_ACTIVE
         ) {
             if ($isConfirmNeed === true) {
-                // if user subscribes own login email - confirmation is not needed
-                $isOwnSubscribes = $isSubscribeOwnEmail;
-                if ($isOwnSubscribes == true) {
-                    $this->setStatus(self::STATUS_SUBSCRIBED);
-                } else {
-                    $this->setStatus(self::STATUS_NOT_ACTIVE);
-                }
+                $this->setStatus(self::STATUS_NOT_ACTIVE);
             } else {
                 $this->setStatus(self::STATUS_SUBSCRIBED);
             }
@@ -448,9 +487,7 @@ public function subscribe($email)
         try {
             /* Save model before sending out email */
             $this->save();
-            if ($isConfirmNeed === true
-                && $isOwnSubscribes === false
-            ) {
+            if ($isConfirmNeed === true) {
                 $this->sendConfirmationRequestEmail();
             } else {
                 $this->sendConfirmationSuccessEmail();
@@ -494,7 +531,7 @@ public function subscribeCustomerById($customerId)
     }
 
     /**
-     * unsubscribe the customer with the id provided
+     * Unsubscribe the customer with the id provided
      *
      * @param int $customerId
      * @return $this
@@ -554,13 +591,22 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
             if (AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED
                 == $this->customerAccountManagement->getConfirmationStatus($customerId)
             ) {
-                $status = self::STATUS_UNCONFIRMED;
+                if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
+                    // if a customer was already subscribed then keep the subscribed
+                    $status = self::STATUS_SUBSCRIBED;
+                } else {
+                    $status = self::STATUS_UNCONFIRMED;
+                }
             } elseif ($isConfirmNeed) {
-                $status = self::STATUS_NOT_ACTIVE;
+                if ($this->getStatus() != self::STATUS_SUBSCRIBED) {
+                    $status = self::STATUS_NOT_ACTIVE;
+                }
             }
         } elseif (($this->getStatus() == self::STATUS_UNCONFIRMED) && ($customerData->getConfirmation() === null)) {
             $status = self::STATUS_SUBSCRIBED;
             $sendInformationEmail = true;
+        } elseif (($this->getStatus() == self::STATUS_NOT_ACTIVE) && ($customerData->getConfirmation() === null)) {
+            $status = self::STATUS_NOT_ACTIVE;
         } else {
             $status = self::STATUS_UNSUBSCRIBED;
         }
@@ -577,29 +623,36 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
 
         $this->setStatus($status);
 
+        $storeId = $customerData->getStoreId();
+        if ((int)$customerData->getStoreId() === 0) {
+            $storeId = $this->_storeManager->getWebsite($customerData->getWebsiteId())->getDefaultStore()->getId();
+        }
+
         if (!$this->getId()) {
-            $storeId = $customerData->getStoreId();
-            if ($customerData->getStoreId() == 0) {
-                $storeId = $this->_storeManager->getWebsite($customerData->getWebsiteId())->getDefaultStore()->getId();
-            }
             $this->setStoreId($storeId)
                 ->setCustomerId($customerData->getId())
                 ->setEmail($customerData->getEmail());
         } else {
-            $this->setStoreId($customerData->getStoreId())
+            $this->setStoreId($storeId)
                 ->setEmail($customerData->getEmail());
         }
 
         $this->save();
         $sendSubscription = $sendInformationEmail;
-        if ($sendSubscription === null xor $sendSubscription) {
+        if ($sendSubscription === null xor $sendSubscription && $this->isStatusChanged()) {
             try {
-                if ($isConfirmNeed) {
-                    $this->sendConfirmationRequestEmail();
-                } elseif ($this->isStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
-                    $this->sendUnsubscriptionEmail();
-                } elseif ($this->isStatusChanged() && $status == self::STATUS_SUBSCRIBED) {
-                    $this->sendConfirmationSuccessEmail();
+                switch ($status) {
+                    case self::STATUS_UNSUBSCRIBED:
+                        $this->sendUnsubscriptionEmail();
+                        break;
+                    case self::STATUS_SUBSCRIBED:
+                        $this->sendConfirmationSuccessEmail();
+                        break;
+                    case self::STATUS_NOT_ACTIVE:
+                        if ($isConfirmNeed) {
+                            $this->sendConfirmationRequestEmail();
+                        }
+                        break;
                 }
             } catch (MailException $e) {
                 // If we are not able to send a new account email, this should be ignored
@@ -812,4 +865,18 @@ public function getSubscriberFullName()
         }
         return $name;
     }
+
+    /**
+     * Set date of last changed status
+     *
+     * @return $this
+     */
+    public function beforeSave()
+    {
+        parent::beforeSave();
+        if ($this->dataHasChangedFor('subscriber_status')) {
+            $this->setChangeStatusAt($this->dateTime->gmtDate());
+        }
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Newsletter/Setup/InstallSchema.php b/app/code/Magento/Newsletter/Setup/InstallSchema.php
deleted file mode 100644
index 80e1bf0a76aeb..0000000000000
--- a/app/code/Magento/Newsletter/Setup/InstallSchema.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Newsletter\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'newsletter_subscriber'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('newsletter_subscriber'))
-            ->addColumn(
-                'subscriber_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Subscriber Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Store Id'
-            )
-            ->addColumn(
-                'change_status_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Change Status At'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Customer Id'
-            )
-            ->addColumn(
-                'subscriber_email',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                150,
-                ['nullable' => true, 'default' => null],
-                'Subscriber Email'
-            )
-            ->addColumn(
-                'subscriber_status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Subscriber Status'
-            )
-            ->addColumn(
-                'subscriber_confirm_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['default' => 'NULL'],
-                'Subscriber Confirm Code'
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_subscriber', ['customer_id']),
-                ['customer_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_subscriber', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_subscriber', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment('Newsletter Subscriber');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'newsletter_template'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('newsletter_template'))
-            ->addColumn(
-                'template_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Template ID'
-            )
-            ->addColumn(
-                'template_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                150,
-                [],
-                'Template Code'
-            )
-            ->addColumn(
-                'template_text',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Template Text'
-            )
-            ->addColumn(
-                'template_styles',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Template Styles'
-            )
-            ->addColumn(
-                'template_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Template Type'
-            )
-            ->addColumn(
-                'template_subject',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Template Subject'
-            )
-            ->addColumn(
-                'template_sender_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Template Sender Name'
-            )
-            ->addColumn(
-                'template_sender_email',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Template Sender Email'
-            )
-            ->addColumn(
-                'template_actual',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '1'],
-                'Template Actual'
-            )
-            ->addColumn(
-                'added_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Added At'
-            )
-            ->addColumn(
-                'modified_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Modified At'
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_template', ['template_actual']),
-                ['template_actual']
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_template', ['added_at']),
-                ['added_at']
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_template', ['modified_at']),
-                ['modified_at']
-            )
-            ->setComment('Newsletter Template');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'newsletter_queue'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('newsletter_queue'))
-            ->addColumn(
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Queue Id'
-            )
-            ->addColumn(
-                'template_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Template ID'
-            )
-            ->addColumn(
-                'newsletter_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [],
-                'Newsletter Type'
-            )
-            ->addColumn(
-                'newsletter_text',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Newsletter Text'
-            )
-            ->addColumn(
-                'newsletter_styles',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Newsletter Styles'
-            )
-            ->addColumn(
-                'newsletter_subject',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Newsletter Subject'
-            )
-            ->addColumn(
-                'newsletter_sender_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Newsletter Sender Name'
-            )
-            ->addColumn(
-                'newsletter_sender_email',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Newsletter Sender Email'
-            )
-            ->addColumn(
-                'queue_status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Queue Status'
-            )
-            ->addColumn(
-                'queue_start_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Queue Start At'
-            )
-            ->addColumn(
-                'queue_finish_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Queue Finish At'
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_queue', ['template_id']),
-                ['template_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_queue', 'template_id', 'newsletter_template', 'template_id'),
-                'template_id',
-                $installer->getTable('newsletter_template'),
-                'template_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Newsletter Queue');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'newsletter_queue_link'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('newsletter_queue_link'))
-            ->addColumn(
-                'queue_link_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Queue Link Id'
-            )
-            ->addColumn(
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Queue Id'
-            )
-            ->addColumn(
-                'subscriber_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Subscriber Id'
-            )
-            ->addColumn(
-                'letter_sent_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                [],
-                'Letter Sent At'
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_queue_link', ['subscriber_id']),
-                ['subscriber_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_queue_link', ['queue_id', 'letter_sent_at']),
-                ['queue_id', 'letter_sent_at']
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_queue_link', 'queue_id', 'newsletter_queue', 'queue_id'),
-                'queue_id',
-                $installer->getTable('newsletter_queue'),
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'newsletter_queue_link',
-                    'subscriber_id',
-                    'newsletter_subscriber',
-                    'subscriber_id'
-                ),
-                'subscriber_id',
-                $installer->getTable('newsletter_subscriber'),
-                'subscriber_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Newsletter Queue Link');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'newsletter_queue_store_link'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('newsletter_queue_store_link'))
-            ->addColumn(
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Queue Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true, 'default' => '0'],
-                'Store Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_queue_store_link', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_queue_store_link', 'queue_id', 'newsletter_queue', 'queue_id'),
-                'queue_id',
-                $installer->getTable('newsletter_queue'),
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_queue_store_link', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Newsletter Queue Store Link');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'newsletter_problem'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('newsletter_problem'))
-            ->addColumn(
-                'problem_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Problem Id'
-            )
-            ->addColumn(
-                'subscriber_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Subscriber Id'
-            )
-            ->addColumn(
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Queue Id'
-            )
-            ->addColumn(
-                'problem_error_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Problem Error Code'
-            )
-            ->addColumn(
-                'problem_error_text',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                200,
-                [],
-                'Problem Error Text'
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_problem', ['subscriber_id']),
-                ['subscriber_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('newsletter_problem', ['queue_id']),
-                ['queue_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_problem', 'queue_id', 'newsletter_queue', 'queue_id'),
-                'queue_id',
-                $installer->getTable('newsletter_queue'),
-                'queue_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('newsletter_problem', 'subscriber_id', 'newsletter_subscriber', 'subscriber_id'),
-                'subscriber_id',
-                $installer->getTable('newsletter_subscriber'),
-                'subscriber_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Newsletter Problems');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
new file mode 100644
index 0000000000000..92d17e9d71e2f
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <!--Create an Account. Check Sign Up for Newsletter checkbox -->
+    <actionGroup name="StorefrontCreateNewAccountNewsletterChecked" extends="SignUpNewUserFromStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer"/>
+        </arguments>
+        <click selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="selectSignUpForNewsletterCheckbox" after="fillLastName"/>
+        <see stepKey="seeDescriptionNewsletter" userInput='You are subscribed to "General Subscription".' selector="{{CustomerMyAccountPage.DescriptionNewsletter}}" />
+    </actionGroup>
+
+    <!--Create an Account. Uncheck Sign Up for Newsletter checkbox -->
+    <actionGroup name="StorefrontCreateNewAccountNewsletterUnchecked" extends="SignUpNewUserFromStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer"/>
+            <argument name="Store"/>
+        </arguments>
+        <amOnPage stepKey="amOnStorefrontPage" url="{{Store.code}}"/>
+        <see stepKey="seeDescriptionNewsletter" userInput="You aren't subscribed to our newsletter." selector="{{CustomerMyAccountPage.DescriptionNewsletter}}" />
+        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with NewStore."/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
new file mode 100644
index 0000000000000..fe2deed9a279f
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultNewsletter" type="cms_page">
+        <data key="name" unique="suffix">Test Newsletter Template</data>
+        <data key="subject">Test Newsletter Subject</data>
+        <data key="senderName">Admin</data>
+        <data key="senderEmail">admin@magento.com</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE.txt b/app/code/Magento/Newsletter/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE.txt
rename to app/code/Magento/Newsletter/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE_AFL.txt b/app/code/Magento/Newsletter/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE_AFL.txt
rename to app/code/Magento/Newsletter/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml b/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
new file mode 100644
index 0000000000000..fa655fadab551
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="NewsletterTemplateForm" url="/newsletter/template/new/" area="admin" module="Magento_Cms">
+        <section name="StorefrontNewsletterSection"/>
+        <section name="StorefrontNewsletterSection"/>
+    </page>
+    <page name="NewsletterTemplateGrid" url="/newsletter/template/" area="admin" module="Magento_Cms">
+        <section name="StorefrontNewsletterSection"/>
+        <section name="NewsletterTemplateSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/README.md b/app/code/Magento/Newsletter/Test/Mftf/README.md
new file mode 100644
index 0000000000000..266c5c5723f63
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Newsletter Functional Tests
+
+The Functional Test Module for **Magento Newsletter** module.
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
new file mode 100644
index 0000000000000..d0dfd21cc2e1f
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="BasicFieldNewsletterSection">
+        <element name="templateName" type="input" selector="#code"/>
+        <element name="templateSubject" type="input" selector="#subject"/>
+        <element name="senderName" type="input" selector="#sender_name"/>
+        <element name="senderEmail" type="input" selector="#sender_email"/>
+        <element name="save" type="button" selector="button[data-role='template-save']"/>
+        <element name="searchButton" type="button" selector=".admin__filter-actions button[title=Search]"/>
+        <element name="searchInput" type="input" selector="input[name=code]"/>
+    </section>
+    <section name="NewsletterWYSIWYGSection">
+        <element name="TextArea" type="text" selector="#text" />
+        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
+        <element name="ShowHideBtn" type="button" selector="#toggletext"/>
+        <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
+        <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
+        <element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
+        <element name="InsertVariableBtn" type="button" selector=".add-variable"/>
+        <element name="InsertImageBtn" type="button" selector=".action-add-image"/>
+        <element name="InsertImageIcon" type="button" selector="div[aria-label='Insert/edit image']"/>
+        <element name="Browse" type="button" selector=".mce-i-browse"/>
+        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
+        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
+        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
+        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
+        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
+        <element name="UploadImage" type="file" selector=".fileupload" />
+        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
+        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="CreateFolder" type="button" selector="#new_folder" />
+        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
+        <element name="CancelBtn" type="button" selector="#cancel" />
+        <element name="Style" type="button" selector=".mce-txt" />
+        <element name="Bold" type="button" selector=".mce-i-bold" />
+        <element name="Italic" type="button" selector=".mce-i-italic" />
+        <element name="Underline" type="button" selector=".mce-i-underline" />
+        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
+        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
+        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
+        <element name="Bullet" type="button" selector=".mce-i-bullist" />
+        <element name="Numlist" type="button" selector=".mce-i-numlist" />
+        <element name="InsertLink" type="button" selector=".mce-i-link" />
+        <element name="InsertImage" type="button" selector=".mce-i-image" />
+        <element name="InsertTable" type="button" selector=".mce-i-table" />
+        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
+        <element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
new file mode 100644
index 0000000000000..ed2f5c316055c
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontNewsletterSection">
+        <element name="mediaDescription" type="text" selector="body>p>img" />
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
new file mode 100644
index 0000000000000..06f762900436e
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+    <section name="StorefrontCustomerCreateFormSection">
+        <element name="signUpForNewsletter" type="checkbox" selector="//span[contains(text(), 'Sign Up for Newsletter')]"/>
+    </section>
+
+    <section name="CustomerMyAccountPage">
+        <element name="DescriptionNewsletter" type="text" selector=".box-newsletter p"/>
+    </section>
+
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
new file mode 100644
index 0000000000000..f69f94dbd79e3
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddImageToWYSIWYGNewsletterTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="MAGETWO-47309-Apply new WYSIWYG in Newsletter"/>
+            <group value="Newsletter"/>
+            <title value="Admin should be able to add image to WYSIWYG content of Newsletter"/>
+            <description value="Admin should be able to add image to WYSIWYG content Newsletter"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84377"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Create a newsletter template that contains an image-->
+        <amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{_defaultNewsletter.name}}" stepKey="fillTemplateName" />
+        <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
+        <waitForElementVisible selector="{{NewsletterWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
+        <actionGroup ref="attachImage" stepKey="attachImage1">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
+        <click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSaveTemplate"/>
+        <waitForPageLoad stepKey="waitForPageLoad10" />
+        <!--Preview the newsletter template-->
+        <fillField selector="{{BasicFieldNewsletterSection.searchInput}}" userInput="{{_defaultNewsletter.name}}" stepKey="fillSearch"/>
+        <click selector="{{BasicFieldNewsletterSection.searchButton}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForPageLoad11"/>
+        <click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview"/>
+        <switchToWindow stepKey="switchToWindow" userInput="action_window"/>
+        <switchToIFrame  userInput="preview_iframe" stepKey="switchToIframe" />
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <!--Verify that the text and image are present-->
+        <seeElement selector="{{StorefrontNewsletterSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontNewsletterSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
+        <closeTab stepKey="closeTab"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
new file mode 100644
index 0000000000000..e3d73fb57333e
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddVariableToWYSIWYGNewsletterTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
+            <group value="Newsletter"/>
+            <title value="Admin should be able to add variable to WYSIWYG Editor of Newsletter"/>
+            <description value="Admin should be able to add variable to WYSIWYG Editor Newsletter"/>
+            <testCaseId value="MAGETWO-84379"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <!--Create Custom Variable-->
+        <actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />
+        <!--Setup Store information-->
+        <waitForPageLoad stepKey="wait" />
+        <amOnPage url="/admin/admin/system_config/" stepKey="goToConfigStoreInformation" />
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <conditionalClick selector="{{StoreConfigSection.StoreInformation}}" dependentSelector="{{StoreConfigSection.CheckIfTabExpand}}" stepKey="checkIfTabOpen" visible="true"/>
+        <fillField selector="{{StoreConfigSection.City}}" userInput="{{_defaultVariable.city}}" stepKey="fillCity" />
+        <click selector="{{StoreConfigSection.Save}}" stepKey="saveConfig"/>
+        <!--Main test-->
+        <amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{_defaultNewsletter.name}}" stepKey="fillTemplateName" />
+        <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
+        <waitForPageLoad time="10" stepKey="waitForPageLoad21"/>
+        <conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
+        <waitForElementVisible selector="{{NewsletterWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>
+        <seeElement selector="{{NewsletterWYSIWYGSection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />
+        <click selector="{{NewsletterWYSIWYGSection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon1" />
+        <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
+        <!--see Insert Variable button disabled-->
+        <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
+        <!--see Cancel button enabed-->
+        <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+        <!--see 4 colums-->
+        <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
+        <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
+        <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
+        <see selector="{{VariableSection.ColName('Code')}}" userInput="Code" stepKey="codeCol" />
+        <!--select default variable-->
+        <click selector="{{VariableSection.Radio('city')}}" stepKey="selectDefaultVariable"/>
+        <see selector="{{VariableSection.InsertVariableBtnEnabled}}" userInput="Insert Variable" stepKey="seeInsertVarialeEnabled" />
+        <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save1" />
+        <waitForPageLoad stepKey="waitForPageLoad10" />
+        <click selector="{{NewsletterWYSIWYGSection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon2" />
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <!--see custom variable-->
+        <see userInput="{{customVariable.code}}"  stepKey="seeCustomVariable"/>
+        <seeElement selector="{{VariableSection.SearchTxtbox}}"  stepKey="searchBox"/>
+        <!--press Enter-->
+        <pressKey selector="{{VariableSection.SearchTxtbox}}" parameterArray="['Test Variable',\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
+        <waitForPageLoad stepKey="waitForPageLoad5" />
+        <!--see result-->
+        <see selector="{{VariableSection.searchResult(customVariable.code)}}" userInput="{{customVariable.code}}" stepKey="seeResult" />
+        <!--Insert custom variable-->
+        <click selector="{{VariableSection.VariableRadio(customVariable.code)}}" stepKey="selectCustomVariable1"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
+        <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
+        <click selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn"/>
+        <waitForElementVisible selector="{{NewsletterWYSIWYGSection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
+        <seeElement selector="{{NewsletterWYSIWYGSection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
+        <click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSaveTemplate"/>
+        <waitForPageLoad stepKey="waitForPageLoad9" />
+        <click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview1" />
+        <switchToWindow userInput="action_window" stepKey="switchToWindow1"/>
+        <switchToIFrame  userInput="preview_iframe" stepKey="switchToIframe1" />
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <!--see Default Variable on Storefront-->
+        <see userInput="{{_defaultVariable.city}}" stepKey="seeDefaultVariable" />
+        <!--see Custom Variable on Storefront-->
+        <see userInput="{{customVariable.html}}" stepKey="seeCustomVariable2" />
+        <!--Delete Custom Variable-->
+        <actionGroup ref="DeleteCustomVariableActionGroup" stepKey="deleteCustomVariable" />
+        <!--Refresh Storefront-->
+        <amOnPage url="{{NewsletterTemplateGrid.url}}" stepKey="amOnTemplateGrid" />
+        <click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview2" />
+        <switchToWindow userInput="action_window" stepKey="switchToWindow2"/>
+        <switchToIFrame  userInput="preview_iframe" stepKey="switchToIframe2" />
+        <wait time="10" stepKey="waitForPageLoad8"/>
+        <!--see custom variable blank-->
+        <dontSee userInput="{{customVariable.html}}" stepKey="dontSeeCustomVariableName" />
+        <closeTab stepKey="closeTab"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
new file mode 100644
index 0000000000000..50a6b74a67233
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGNewsletterTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="MAGETWO-47309-Apply new WYSIWYG in Newsletter"/>
+            <group value="Newsletter"/>
+            <title value="Admin should be able to add widget to WYSIWYG Editor of Newsletter"/>
+            <description value="Admin should be able to add widget to WYSIWYG Editor Newsletter"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84682"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{_defaultNewsletter.name}}" stepKey="fillTemplateName" />
+        <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <click selector="{{NewsletterWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
+        <wait time="10" stepKey="waitForPageLoad" />
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+        <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
+        <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Page Link Block Template" stepKey="selectTemplate" />
+        <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
+        <waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
+        <click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
+        <waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
+        <click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSaveTemplate"/>
+        <waitForPageLoad stepKey="waitForPageLoad10" />
+        <click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview" />
+        <switchToWindow stepKey="switchToWindow" userInput="action_window"/>
+        <switchToIFrame  userInput="preview_iframe" stepKey="switchToIframe" />
+        <waitForText userInput="Home page" stepKey="waitForPageLoad9"/>
+        <see userInput="Home page" stepKey="seeHomePageCMSPage"/>
+        <closeTab stepKey="closeTab"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
new file mode 100644
index 0000000000000..faed8b1af952e
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="VerifySubscribedNewsletterDisplayedTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="MAGETWO-91701: Newsletter subscription is not correctly updated when user is registered on 2 stores"/>
+            <group value="Newsletter"/>
+            <title value="Newsletter subscription when user is registered on 2 stores"/>
+            <description value="Newsletter subscription when user is registered on 2 stores"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93836"/>
+        </annotations>
+
+        <before>
+            <!--Log in to Magento as admin.-->
+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="Second"/>
+                <argument name="websiteCode" value="Base2"/>
+            </actionGroup>
+
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="Second"/>
+                <argument name="storeGroupName" value="NewStore"/>
+                <argument name="storeGroupCode" value="Base12"/>
+            </actionGroup>
+
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="StoreGroup" value="staticStoreGroup"/>
+                <argument name="customStore" value="staticStore"/>
+            </actionGroup>
+            <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        </before>
+        <after>
+            <!--Delete created data and set Default Configuration-->
+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="Second"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Go to store front (default) and click Create an Account.-->
+        <actionGroup ref="StorefrontCreateNewAccountNewsletterChecked" stepKey="SignUpNewUser">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <!--Sign Out-->
+        <amOnPage url="customer/account/logout/" stepKey="customerOnLogoutPage"/>
+        <waitForPageLoad stepKey="waitLogoutCustomer"/>
+        <!--Create new Account with the same email address. (unchecked Sign Up for Newsletter checkbox)-->
+        <actionGroup ref="StorefrontCreateNewAccountNewsletterUnchecked" stepKey="createNewAccountNewsletterUnchecked">
+            <argument name="Customer" value="CustomerEntityOne"/>
+            <argument name="Store" value="staticStore"/>
+        </actionGroup>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
new file mode 100644
index 0000000000000..3c19a3fa99d3c
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="MAGETWO-47309-Apply new WYSIWYG in Newsletter"/>
+            <group value="Newsletter"/>
+            <title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Newsletter"/>
+            <description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Newsletter"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-84683"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        </before>
+        <amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{_defaultNewsletter.name}}" stepKey="fillTemplateName" />
+        <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
+        <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
+        <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
+        <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>
+        <click selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2" />
+        <waitForElementVisible selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="waitForInsertWidget" />
+        <see selector="{{NewsletterWYSIWYGSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="assertInf17"/>
+        <see selector="{{NewsletterWYSIWYGSection.InsertWidgetBtn}}" userInput="Insert Widget..." stepKey="assertInfo18"/>
+        <see selector="{{NewsletterWYSIWYGSection.InsertVariableBtn}}" userInput="Insert Variable..." stepKey="assertInfo19"/>
+        <!--Go to Storefront-->
+        <click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSavePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad3" />
+        <click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview" />
+        <switchToWindow stepKey="switchToWindow" userInput="action_window"/>
+        <switchToIFrame  userInput="preview_iframe" stepKey="switchToIframe" />
+        <waitForText userInput="Hello World From Newsletter Template!" stepKey="waitForPageLoad2"/>
+        <see userInput="Hello World From Newsletter Template!" stepKey="seeContent" />
+        <closeTab stepKey="closeTab"/>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
new file mode 100644
index 0000000000000..8d760100d1469
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Newsletter\Test\Unit\Block\Adminhtml\Template\Grid\Renderer;
+
+/**
+ * Test for \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender.
+ */
+class SenderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender
+     */
+    private $sender;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->sender = $this->objectManagerHelper->getObject(
+            \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender::class
+        );
+    }
+
+    /**
+     * @dataProvider rendererDataProvider
+     * @param array $expectedSender
+     * @param array $passedSender
+     *
+     * @return void
+     */
+    public function testRender(array $passedSender, array $expectedSender)
+    {
+        $row = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+            ->setMethods(['getTemplateSenderName', 'getTemplateSenderEmail'])
+            ->getMock();
+        $row->expects($this->atLeastOnce())->method('getTemplateSenderName')
+            ->willReturn($passedSender['sender']);
+        $row->expects($this->atLeastOnce())->method('getTemplateSenderEmail')
+            ->willReturn($passedSender['sender_email']);
+        $this->assertEquals(
+            $expectedSender['sender'] . ' [' . $expectedSender['sender_email'] . ']',
+            $this->sender->render($row)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function rendererDataProvider()
+    {
+        return [
+            [
+                [
+                    'sender' => 'Sender',
+                    'sender_email' => 'sender@example.com',
+                ],
+                [
+                    'sender' => 'Sender',
+                    'sender_email' => 'sender@example.com',
+                ],
+            ],
+            [
+                [
+                    'sender' => "<br>'Sender'</br>",
+                    'sender_email' => "<br>'email@example.com'</br>",
+                ],
+                [
+                    'sender' => "&lt;br&gt;'Sender'&lt;/br&gt;",
+                    'sender_email' => "&lt;br&gt;'email@example.com'&lt;/br&gt;",
+                ],
+            ],
+            [
+                [
+                    'sender' => '"<script>alert(document.domain)</script>"@example.com',
+                    'sender_email' => '"<script>alert(document.domain)</script>"@example.com',
+                ],
+                [
+                    'sender' => '&quot;&lt;script&gt;alert(document.domain)&lt;/script&gt;&quot;@example.com',
+                    'sender_email' => '&quot;&lt;script&gt;alert(document.domain)&lt;/script&gt;&quot;@example.com',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
index 47d4584857bde..3be28cacc93e0 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
@@ -7,13 +7,18 @@
 
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\ResourceModel\CustomerRepository;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Newsletter\Model\ResourceModel\Subscriber;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 class CustomerPluginTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Newsletter\Model\Plugin\CustomerPlugin
      */
-    protected $plugin;
+    private $plugin;
 
     /**
      * @var \Magento\Newsletter\Model\SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject
@@ -28,7 +33,32 @@ class CustomerPluginTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
-    protected $objectManager;
+    private $objectManager;
+
+    /**
+     * @var ExtensionAttributesFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $extensionFactoryMock;
+
+    /**
+     * @var CustomerExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerExtensionMock;
+
+    /**
+     * @var Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriberResourceMock;
+
+    /**
+     * @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
 
     protected function setUp()
     {
@@ -44,92 +74,105 @@ protected function setUp()
                     'delete',
                     'updateSubscription',
                     'subscribeCustomerById',
-                    'unsubscribeCustomerById'
+                    'unsubscribeCustomerById',
+                    'isSubscribed',
                 ]
             )->disableOriginalConstructor()
             ->getMock();
-        $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
+        $this->extensionFactoryMock = $this->getMockBuilder(ExtensionAttributesFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->customerExtensionMock = $this->getMockBuilder(CustomerExtensionInterface::class)
+            ->setMethods(['getIsSubscribed', 'setIsSubscribed'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->subscriberResourceMock = $this->getMockBuilder(Subscriber::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerMock = $this->getMockBuilder(CustomerInterface::class)
+            ->setMethods(['getExtensionAttributes'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
 
+        $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->plugin = $this->objectManager->getObject(
             \Magento\Newsletter\Model\Plugin\CustomerPlugin::class,
             [
-                'subscriberFactory' => $this->subscriberFactory
+                'subscriberFactory' => $this->subscriberFactory,
+                'extensionFactory' => $this->extensionFactoryMock,
+                'subscriberResource' => $this->subscriberResourceMock,
+                'storeManager' => $this->storeManagerMock,
             ]
         );
     }
 
-    public function testAfterSaveWithoutIsSubscribed()
+    /**
+     * @param bool $subscriptionOriginalValue
+     * @param bool $subscriptionNewValue
+     * @dataProvider afterSaveDataProvider
+     * @return void
+     */
+    public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue)
     {
         $customerId = 1;
-        /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $result */
+        $result = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
         /** @var CustomerRepository | \PHPUnit_Framework_MockObject_MockObject $subject */
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
 
-        $customer->expects($this->atLeastOnce())
-            ->method("getId")
-            ->willReturn($customerId);
+        /** @var CustomerExtensionInterface|\PHPUnit_Framework_MockObject_MockObject $resultExtensionAttributes */
+        $resultExtensionAttributes = $this->getMockBuilder(CustomerExtensionInterface::class)
+            ->setMethods(['getIsSubscribed', 'setIsSubscribed'])
+            ->getMockForAbstractClass();
+        $result->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+        $result->expects($this->any())->method('getExtensionAttributes')->willReturn(null);
+        $this->extensionFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($resultExtensionAttributes);
+        $result->expects($this->once())
+            ->method('setExtensionAttributes')
+            ->with($resultExtensionAttributes)
+            ->willReturnSelf();
+        $this->customerMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->customerExtensionMock);
+        $resultExtensionAttributes->expects($this->any())
+            ->method('getIsSubscribed')
+            ->willReturn($subscriptionOriginalValue);
+        $this->customerExtensionMock->expects($this->any())
+            ->method('getIsSubscribed')
+            ->willReturn($subscriptionNewValue);
+
+        if ($subscriptionOriginalValue !== $subscriptionNewValue) {
+            if ($subscriptionNewValue) {
+                $this->subscriber->expects($this->once())->method('subscribeCustomerById')->with($customerId);
+            } else {
+                $this->subscriber->expects($this->once())->method('unsubscribeCustomerById')->with($customerId);
+            }
+            $this->subscriber->expects($this->once())->method('isSubscribed')->willReturn($subscriptionNewValue);
+            $resultExtensionAttributes->expects($this->once())->method('setIsSubscribed')->with($subscriptionNewValue);
+        }
 
-        $this->assertEquals($customer, $this->plugin->afterSave($subject, $customer, $customer));
+        $this->assertEquals($result, $this->plugin->afterSave($subject, $result, $this->customerMock));
     }
 
     /**
      * @return array
      */
-    public function afterSaveExtensionAttributeDataProvider()
+    public function afterSaveDataProvider()
     {
         return [
             [true, true],
-            [false, false]
+            [false, false],
+            [true, false],
+            [false, true],
         ];
     }
 
-    /**
-     * @param boolean $isSubscribed
-     * @param boolean $subscribeIsCreated
-     * @dataProvider afterSaveExtensionAttributeDataProvider
-     */
-    public function testAfterSaveWithIsSubscribed($isSubscribed, $subscribeIsCreated)
-    {
-        $customerId = 1;
-        /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $extensionAttributes = $this
-            ->getMockBuilder(\Magento\Customer\Api\Data\CustomerExtensionInterface::class)
-            ->setMethods(["getIsSubscribed", "setIsSubscribed"])
-            ->getMockForAbstractClass();
-
-        $extensionAttributes
-            ->expects($this->atLeastOnce())
-            ->method("getIsSubscribed")
-            ->willReturn($isSubscribed);
-
-        $customer->expects($this->atLeastOnce())
-            ->method("getExtensionAttributes")
-            ->willReturn($extensionAttributes);
-
-        if ($subscribeIsCreated) {
-            $this->subscriber->expects($this->once())
-                ->method("subscribeCustomerById")
-                ->with($customerId);
-        } else {
-            $this->subscriber->expects($this->once())
-                ->method("unsubscribeCustomerById")
-                ->with($customerId);
-        }
-
-        /** @var CustomerRepository | \PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-
-        $customer->expects($this->atLeastOnce())
-            ->method("getId")
-            ->willReturn($customerId);
-
-        $this->assertEquals($customer, $this->plugin->afterSave($subject, $customer, $customer));
-    }
-
     public function testAfterDelete()
     {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
@@ -158,4 +201,95 @@ public function testAroundDeleteById()
 
         $this->assertEquals(true, $this->plugin->aroundDeleteById($subject, $deleteCustomerById, $customerId));
     }
+
+    /**
+     * @param int|null $subscriberStatusKey
+     * @param int|null $subscriberStatusValue
+     * @param bool $isSubscribed
+     * @dataProvider afterGetByIdDataProvider
+     * @return void
+     */
+    public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
+        $subscriberStatusKey,
+        $subscriberStatusValue,
+        $isSubscribed
+    ) {
+        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $subscriber = [$subscriberStatusKey => $subscriberStatusValue];
+        $this->prepareStoreData();
+
+        $this->extensionFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->customerExtensionMock);
+        $this->customerMock->expects($this->once())
+            ->method('setExtensionAttributes')
+            ->with($this->customerExtensionMock)
+            ->willReturnSelf();
+        $this->customerMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+        $this->subscriberResourceMock->expects($this->once())
+            ->method('loadByCustomerData')
+            ->with($this->customerMock)
+            ->willReturn($subscriber);
+        $this->customerExtensionMock->expects($this->once())->method('setIsSubscribed')->with($isSubscribed);
+
+        $this->assertEquals(
+            $this->customerMock,
+            $this->plugin->afterGetById($subject, $this->customerMock)
+        );
+    }
+
+    public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet()
+    {
+        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $subscriber = ['subscriber_id' => 1, 'subscriber_status' => 1];
+        $this->prepareStoreData();
+
+        $this->customerMock->expects($this->any())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->customerExtensionMock);
+        $this->customerExtensionMock->expects($this->any())
+            ->method('getIsSubscribed')
+            ->willReturn(null);
+        $this->subscriberResourceMock->expects($this->once())
+            ->method('loadByCustomerData')
+            ->with($this->customerMock)
+            ->willReturn($subscriber);
+        $this->customerExtensionMock->expects($this->once())
+            ->method('setIsSubscribed')
+            ->willReturnSelf();
+
+        $this->assertEquals(
+            $this->customerMock,
+            $this->plugin->afterGetById($subject, $this->customerMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function afterGetByIdDataProvider()
+    {
+        return [
+            ['subscriber_status', 1, true],
+            ['subscriber_status', 2, false],
+            ['subscriber_status', 3, false],
+            ['subscriber_status', 4, false],
+            [null, null, false],
+        ];
+    }
+
+    /**
+     * Prepare store information
+     *
+     * @return void
+     */
+    private function prepareStoreData()
+    {
+        $storeId = 1;
+        $storeMock = $this->createMock(Store::class);
+        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
+    }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php
new file mode 100644
index 0000000000000..8ee6de1e44476
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Test\Unit\Model;
+
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Newsletter\Model\Problem as ProblemModel;
+use Magento\Newsletter\Model\Queue;
+use Magento\Newsletter\Model\ResourceModel\Problem as ProblemResource;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
+
+/**
+ * Class ProblemTest
+ */
+class ProblemTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Registry|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $registryMock;
+
+    /**
+     * @var SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriberFactoryMock;
+
+    /**
+     * @var Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subscriberMock;
+
+    /**
+     * @var ProblemResource|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceModelMock;
+
+    /**
+     * @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $abstractDbMock;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var ProblemModel
+     */
+    private $problemModel;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->registryMock = $this->getMockBuilder(Registry::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->subscriberFactoryMock = $this->getMockBuilder(SubscriberFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->subscriberMock = $this->getMockBuilder(Subscriber::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceModelMock = $this->getMockBuilder(ProblemResource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->abstractDbMock = $this->getMockBuilder(AbstractDb::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resourceModelMock->expects($this->any())
+            ->method('getIdFieldName')
+            ->willReturn('id');
+
+        $this->objectManager = new ObjectManager($this);
+
+        $this->problemModel = $this->objectManager->getObject(
+            ProblemModel::class,
+            [
+                'context' => $this->contextMock,
+                'registry' => $this->registryMock,
+                'subscriberFactory' => $this->subscriberFactoryMock,
+                'resource' => $this->resourceModelMock,
+                'resourceCollection' => $this->abstractDbMock,
+                'data' => [],
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testAddSubscriberData()
+    {
+        $subscriberId = 1;
+        $this->subscriberMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($subscriberId);
+
+        $result = $this->problemModel->addSubscriberData($this->subscriberMock);
+
+        self::assertEquals($result, $this->problemModel);
+        self::assertEquals($subscriberId, $this->problemModel->getSubscriberId());
+    }
+
+    /**
+     * @return void
+     */
+    public function testAddQueueData()
+    {
+        $queueId = 1;
+        $queueMock =  $this->getMockBuilder(Queue::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $queueMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($queueId);
+
+        $result = $this->problemModel->addQueueData($queueMock);
+
+        self::assertEquals($result, $this->problemModel);
+        self::assertEquals($queueId, $this->problemModel->getQueueId());
+    }
+
+    /**
+     * @return void
+     */
+    public function testAddErrorData()
+    {
+        $exceptionMessage = 'Some message';
+        $exceptionCode = 111;
+        $exception = new \Exception($exceptionMessage, $exceptionCode);
+
+        $result = $this->problemModel->addErrorData($exception);
+
+        self::assertEquals($result, $this->problemModel);
+        self::assertEquals($exceptionMessage, $this->problemModel->getProblemErrorText());
+        self::assertEquals($exceptionCode, $this->problemModel->getProblemErrorCode());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetSubscriberWithNoSubscriberId()
+    {
+        self::assertNull($this->problemModel->getSubscriber());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetSubscriber()
+    {
+        $this->setSubscriber();
+        self::assertEquals($this->subscriberMock, $this->problemModel->getSubscriber());
+    }
+
+    /**
+     * @return void
+     */
+    public function testUnsubscribeWithNoSubscriber()
+    {
+        $this->subscriberMock->expects($this->never())
+            ->method('__call')
+            ->with($this->equalTo('setSubscriberStatus'));
+
+        $result = $this->problemModel->unsubscribe();
+
+        self::assertEquals($this->problemModel, $result);
+    }
+
+    /**
+     * @return void
+     */
+    public function testUnsubscribe()
+    {
+        $this->setSubscriber();
+        $this->subscriberMock->expects($this->at(1))
+            ->method('__call')
+            ->with($this->equalTo('setSubscriberStatus'), $this->equalTo([Subscriber::STATUS_UNSUBSCRIBED]))
+            ->willReturnSelf();
+        $this->subscriberMock->expects($this->at(2))
+            ->method('__call')
+            ->with($this->equalTo('setIsStatusChanged'))
+            ->willReturnSelf();
+        $this->subscriberMock->expects($this->once())
+            ->method('save');
+
+        $result = $this->problemModel->unsubscribe();
+
+        self::assertEquals($this->problemModel, $result);
+    }
+
+    /**
+     * Sets subscriber to the Problem model
+     */
+    private function setSubscriber()
+    {
+        $subscriberId = 1;
+        $this->problemModel->setSubscriberId($subscriberId);
+        $this->subscriberFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->subscriberMock);
+        $this->subscriberMock->expects($this->once())
+            ->method('load')
+            ->with($subscriberId)
+            ->willReturnSelf();
+    }
+}
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
index 86d40187de845..e8b141a24c9e8 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
@@ -45,6 +45,11 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
      */
     protected $mailTransportFactoryMock;
 
+    /**
+     * @var \Magento\Framework\Mail\MessageInterfaceFactory | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageFactoryMock;
+
     /**
      * @return void
      */
@@ -52,7 +57,10 @@ public function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->templateFactoryMock = $this->createMock(\Magento\Framework\Mail\Template\FactoryInterface::class);
-        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
+        $this->messageMock = $this->getMockBuilder(\Magento\Framework\Mail\MessageInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setBodyHtml', 'setSubject'])
+            ->getMockForAbstractClass();
         $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
         $this->mailTransportFactoryMock = $this->getMockBuilder(
@@ -60,6 +68,11 @@ public function setUp()
         )->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
+        $this->messageFactoryMock = $this->getMockBuilder(\Magento\Framework\Mail\MessageInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+        $this->messageFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($this->messageMock);
         $this->builder = $objectManagerHelper->getObject(
             $this->builderClassName,
             [
@@ -67,7 +80,8 @@ public function setUp()
                 'message' => $this->messageMock,
                 'objectManager' => $this->objectManagerMock,
                 'senderResolver' => $this->senderResolverMock,
-                'mailTransportFactory' => $this->mailTransportFactoryMock
+                'mailTransportFactory' => $this->mailTransportFactoryMock,
+                'messageFactory' => $this->messageFactoryMock
             ]
         );
     }
@@ -108,7 +122,7 @@ public function testGetTransport(
         $template->expects($this->once())
             ->method('getProcessedTemplate')
             ->with($vars)
-            ->will($this->returnValue($bodyText));
+            ->willReturn($bodyText);
         $template->expects($this->once())
             ->method('setTemplateFilter')
             ->with($filter);
@@ -123,46 +137,8 @@ public function testGetTransport(
             $this->returnValue($template)
         );
 
-        $this->messageMock->expects(
-            $this->once()
-        )->method(
-            'setSubject'
-        )->with(
-            $this->equalTo('Email Subject')
-        )->will(
-            $this->returnSelf()
-        );
-        $this->messageMock->expects(
-            $this->once()
-        )->method(
-            'setBodyHtml'
-        )->with(
-            $this->equalTo($bodyText)
-        )->will(
-            $this->returnSelf()
-        );
-
-        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
-
-        $this->mailTransportFactoryMock->expects(
-            $this->at(0)
-        )->method(
-            'create'
-        )->with(
-            $this->equalTo(['message' => $this->messageMock])
-        )->will(
-            $this->returnValue($transport)
-        );
-
-        $this->objectManagerMock->expects(
-            $this->at(0)
-        )->method(
-            'create'
-        )->with(
-            $this->equalTo(\Magento\Framework\Mail\Message::class)
-        )->will(
-            $this->returnValue($transport)
-        );
+        $this->messageMock->expects($this->once())->method('setBodyHtml')->willReturnSelf();
+        $this->messageMock->expects($this->once())->method('setSubject')->willReturnSelf();
 
         $this->builder->setTemplateIdentifier(
             'identifier'
@@ -174,8 +150,6 @@ public function testGetTransport(
             $data
         );
 
-        $result = $this->builder->getTransport();
-
-        $this->assertInstanceOf(\Magento\Framework\Mail\TransportInterface::class, $result);
+        $this->builder->getTransport();
     }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index 7716f4744a922..6ccbba9f8828b 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Newsletter\Test\Unit\Model;
 
+use Magento\Newsletter\Model\Subscriber;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -60,6 +62,16 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerFactory;
+
     /**
      * @var \Magento\Newsletter\Model\Subscriber
      */
@@ -95,6 +107,14 @@ protected function setUp()
             ]);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
+        $this->customerFactory = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->subscriber = $this->objectManager->getObject(
             \Magento\Newsletter\Model\Subscriber::class,
             [
@@ -106,7 +126,9 @@ protected function setUp()
                 'customerRepository' => $this->customerRepository,
                 'customerAccountManagement' => $this->customerAccountManagement,
                 'inlineTranslation' => $this->inlineTranslation,
-                'resource' => $this->resource
+                'resource' => $this->resource,
+                'customerFactory' => $this->customerFactory,
+                'dataObjectHelper' => $this->dataObjectHelper
             ]
         );
     }
@@ -114,9 +136,23 @@ protected function setUp()
     public function testSubscribe()
     {
         $email = 'subscriber_email@magento.com';
-        $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
+        $storeId = 1;
+        $customerData = ['store_id' => $storeId, 'email' => $email];
+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+        $storeModel->expects($this->any())->method('getId')->willReturn($storeId);
+        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->customerFactory->expects($this->once())->method('create')->willReturn($customer);
+        $this->dataObjectHelper->expects($this->once())->method('populateWithArray')->with(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
             [
-                'subscriber_status' => 3,
+                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
                 'name' => 'subscriber_name'
             ]
@@ -128,20 +164,34 @@ public function testSubscribe()
         $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(1);
         $customerDataModel->expects($this->any())->method('getEmail')->willReturn($email);
         $this->customerRepository->expects($this->any())->method('getById')->willReturn($customerDataModel);
-        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn(1);
+        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn($storeId);
         $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
 
-        $this->assertEquals(1, $this->subscriber->subscribe($email));
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
     public function testSubscribeNotLoggedIn()
     {
         $email = 'subscriber_email@magento.com';
-        $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
+        $storeId = 1;
+        $customerData = ['store_id' => $storeId, 'email' => $email];
+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+        $storeModel->expects($this->any())->method('getId')->willReturn($storeId);
+        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->customerFactory->expects($this->once())->method('create')->willReturn($customer);
+        $this->dataObjectHelper->expects($this->once())->method('populateWithArray')->with(
+            $customer,
+            $customerData,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
             [
-                'subscriber_status' => 3,
+                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
                 'name' => 'subscriber_name'
             ]
@@ -153,16 +203,17 @@ public function testSubscribeNotLoggedIn()
         $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(1);
         $customerDataModel->expects($this->any())->method('getEmail')->willReturn($email);
         $this->customerRepository->expects($this->any())->method('getById')->willReturn($customerDataModel);
-        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn(1);
+        $customerDataModel->expects($this->any())->method('getStoreId')->willReturn($storeId);
         $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
 
-        $this->assertEquals(2, $this->subscriber->subscribe($email));
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
     public function testUpdateSubscription()
     {
+        $storeId = 2;
         $customerId = 1;
         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMock();
@@ -175,7 +226,7 @@ public function testUpdateSubscription()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 1
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -184,14 +235,21 @@ public function testUpdateSubscription()
             ->method('getConfirmationStatus')
             ->with($customerId)
             ->willReturn('account_confirmation_required');
-        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
 
+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMock();
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+
         $this->assertEquals($this->subscriber, $this->subscriber->updateSubscription($customerId));
     }
 
     public function testUnsubscribeCustomerById()
     {
+        $storeId = 2;
         $customerId = 1;
         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMock();
@@ -204,12 +262,12 @@ public function testUnsubscribeCustomerById()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 1
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
         $this->sendEmailCheck();
 
@@ -218,6 +276,7 @@ public function testUnsubscribeCustomerById()
 
     public function testSubscribeCustomerById()
     {
+        $storeId = 2;
         $customerId = 1;
         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMock();
@@ -230,12 +289,12 @@ public function testSubscribeCustomerById()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 3
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
         $this->sendEmailCheck();
 
@@ -244,6 +303,7 @@ public function testSubscribeCustomerById()
 
     public function testSubscribeCustomerById1()
     {
+        $storeId = 2;
         $customerId = 1;
         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMock();
@@ -256,12 +316,12 @@ public function testSubscribeCustomerById1()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 3
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
         $this->sendEmailCheck();
         $this->customerAccountManagement->expects($this->once())
@@ -270,11 +330,12 @@ public function testSubscribeCustomerById1()
         $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
 
         $this->subscriber->subscribeCustomerById($customerId);
-        $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
     }
 
     public function testSubscribeCustomerByIdAfterConfirmation()
     {
+        $storeId = 2;
         $customerId = 1;
         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMock();
@@ -287,19 +348,19 @@ public function testSubscribeCustomerByIdAfterConfirmation()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 4
+                    'subscriber_status' => Subscriber::STATUS_UNCONFIRMED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
+        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
         $this->sendEmailCheck();
         $this->customerAccountManagement->expects($this->never())->method('getConfirmationStatus');
         $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
 
         $this->subscriber->updateSubscription($customerId);
-        $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
     }
 
     public function testUnsubscribe()
@@ -357,6 +418,9 @@ public function testReceived()
         $this->assertEquals($this->subscriber, $this->subscriber->received($queue));
     }
 
+    /**
+     * @return $this
+     */
     protected function sendEmailCheck()
     {
         $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
index 5773c77c5f7f9..52bb803dd377f 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
@@ -401,6 +401,9 @@ public function testIsValidForSend($senderName, $senderEmail, $templateSubject,
         $this->assertEquals($expectedValue, $model->isValidForSend());
     }
 
+    /**
+     * @return array
+     */
     public function isValidForSendDataProvider()
     {
         return [
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index eaa4f37a1c540..dc1334af295c8 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -5,19 +5,18 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-email": "100.3.*",
-        "magento/module-require-js": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-widget": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cms": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-email": "*",
+        "magento/module-require-js": "*",
+        "magento/module-store": "*",
+        "magento/module-widget": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Newsletter/etc/adminhtml/system.xml b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
index 1173f64310304..277005240eabc 100644
--- a/app/code/Magento/Newsletter/etc/adminhtml/system.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
@@ -11,39 +11,39 @@
             <label>Newsletter</label>
             <tab>customer</tab>
             <resource>Magento_Newsletter::newsletter</resource>
-            <group id="subscription" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="subscription" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Subscription Options</label>
-                <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Allow Guest Subscription</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="confirm" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="confirm" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Need to Confirm</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="confirm_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="confirm_email_identity" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Confirmation Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="confirm_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="confirm_email_template" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Confirmation Email Template</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
-                <field id="success_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="success_email_identity" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Success Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="success_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="success_email_template" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Success Email Template</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
-                <field id="un_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="un_email_identity" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Unsubscription Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="un_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="un_email_template" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Unsubscription Email Template</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
diff --git a/app/code/Magento/Newsletter/etc/db_schema.xml b/app/code/Magento/Newsletter/etc/db_schema.xml
new file mode 100644
index 0000000000000..5cb572f41b6be
--- /dev/null
+++ b/app/code/Magento/Newsletter/etc/db_schema.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="newsletter_subscriber" resource="default" engine="innodb" comment="Newsletter Subscriber">
+        <column xsi:type="int" name="subscriber_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Subscriber Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="timestamp" name="change_status_at" on_update="false" nullable="true"
+                comment="Change Status At"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Id"/>
+        <column xsi:type="varchar" name="subscriber_email" nullable="true" length="150" comment="Subscriber Email"/>
+        <column xsi:type="int" name="subscriber_status" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Subscriber Status"/>
+        <column xsi:type="varchar" name="subscriber_confirm_code" nullable="true" length="32" default="NULL"
+                comment="Subscriber Confirm Code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="subscriber_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_SUBSCRIBER_STORE_ID_STORE_STORE_ID"
+                    table="newsletter_subscriber" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="SET NULL"/>
+        <index referenceId="NEWSLETTER_SUBSCRIBER_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="NEWSLETTER_SUBSCRIBER_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="NEWSLETTER_SUBSCRIBER_SUBSCRIBER_EMAIL" indexType="btree">
+            <column name="subscriber_email"/>
+        </index>
+    </table>
+    <table name="newsletter_template" resource="default" engine="innodb" comment="Newsletter Template">
+        <column xsi:type="int" name="template_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Template ID"/>
+        <column xsi:type="varchar" name="template_code" nullable="true" length="150" comment="Template Code"/>
+        <column xsi:type="text" name="template_text" nullable="true" comment="Template Text"/>
+        <column xsi:type="text" name="template_styles" nullable="true" comment="Template Styles"/>
+        <column xsi:type="int" name="template_type" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Template Type"/>
+        <column xsi:type="varchar" name="template_subject" nullable="true" length="200" comment="Template Subject"/>
+        <column xsi:type="varchar" name="template_sender_name" nullable="true" length="200"
+                comment="Template Sender Name"/>
+        <column xsi:type="varchar" name="template_sender_email" nullable="true" length="200"
+                comment="Template Sender Email"/>
+        <column xsi:type="smallint" name="template_actual" padding="5" unsigned="true" nullable="true" identity="false"
+                default="1" comment="Template Actual"/>
+        <column xsi:type="timestamp" name="added_at" on_update="false" nullable="true" comment="Added At"/>
+        <column xsi:type="timestamp" name="modified_at" on_update="false" nullable="true" comment="Modified At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="template_id"/>
+        </constraint>
+        <index referenceId="NEWSLETTER_TEMPLATE_TEMPLATE_ACTUAL" indexType="btree">
+            <column name="template_actual"/>
+        </index>
+        <index referenceId="NEWSLETTER_TEMPLATE_ADDED_AT" indexType="btree">
+            <column name="added_at"/>
+        </index>
+        <index referenceId="NEWSLETTER_TEMPLATE_MODIFIED_AT" indexType="btree">
+            <column name="modified_at"/>
+        </index>
+    </table>
+    <table name="newsletter_queue" resource="default" engine="innodb" comment="Newsletter Queue">
+        <column xsi:type="int" name="queue_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Queue Id"/>
+        <column xsi:type="int" name="template_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Template ID"/>
+        <column xsi:type="int" name="newsletter_type" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Newsletter Type"/>
+        <column xsi:type="text" name="newsletter_text" nullable="true" comment="Newsletter Text"/>
+        <column xsi:type="text" name="newsletter_styles" nullable="true" comment="Newsletter Styles"/>
+        <column xsi:type="varchar" name="newsletter_subject" nullable="true" length="200" comment="Newsletter Subject"/>
+        <column xsi:type="varchar" name="newsletter_sender_name" nullable="true" length="200"
+                comment="Newsletter Sender Name"/>
+        <column xsi:type="varchar" name="newsletter_sender_email" nullable="true" length="200"
+                comment="Newsletter Sender Email"/>
+        <column xsi:type="int" name="queue_status" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Queue Status"/>
+        <column xsi:type="timestamp" name="queue_start_at" on_update="false" nullable="true" comment="Queue Start At"/>
+        <column xsi:type="timestamp" name="queue_finish_at" on_update="false" nullable="true"
+                comment="Queue Finish At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="queue_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_TEMPLATE_ID_NEWSLETTER_TEMPLATE_TEMPLATE_ID"
+                    table="newsletter_queue" column="template_id" referenceTable="newsletter_template"
+                    referenceColumn="template_id" onDelete="CASCADE"/>
+        <index referenceId="NEWSLETTER_QUEUE_TEMPLATE_ID" indexType="btree">
+            <column name="template_id"/>
+        </index>
+    </table>
+    <table name="newsletter_queue_link" resource="default" engine="innodb" comment="Newsletter Queue Link">
+        <column xsi:type="int" name="queue_link_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Queue Link Id"/>
+        <column xsi:type="int" name="queue_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Queue Id"/>
+        <column xsi:type="int" name="subscriber_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Subscriber Id"/>
+        <column xsi:type="timestamp" name="letter_sent_at" on_update="false" nullable="true" comment="Letter Sent At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="queue_link_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
+                    table="newsletter_queue_link" column="queue_id" referenceTable="newsletter_queue"
+                    referenceColumn="queue_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="NLTTR_QUEUE_LNK_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID"
+                    table="newsletter_queue_link" column="subscriber_id" referenceTable="newsletter_subscriber"
+                    referenceColumn="subscriber_id" onDelete="CASCADE"/>
+        <index referenceId="NEWSLETTER_QUEUE_LINK_SUBSCRIBER_ID" indexType="btree">
+            <column name="subscriber_id"/>
+        </index>
+        <index referenceId="NEWSLETTER_QUEUE_LINK_QUEUE_ID_LETTER_SENT_AT" indexType="btree">
+            <column name="queue_id"/>
+            <column name="letter_sent_at"/>
+        </index>
+    </table>
+    <table name="newsletter_queue_store_link" resource="default" engine="innodb" comment="Newsletter Queue Store Link">
+        <column xsi:type="int" name="queue_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Queue Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="queue_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_STORE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
+                    table="newsletter_queue_store_link" column="queue_id" referenceTable="newsletter_queue"
+                    referenceColumn="queue_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_QUEUE_STORE_LINK_STORE_ID_STORE_STORE_ID"
+                    table="newsletter_queue_store_link" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="NEWSLETTER_QUEUE_STORE_LINK_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="newsletter_problem" resource="default" engine="innodb" comment="Newsletter Problems">
+        <column xsi:type="int" name="problem_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Problem Id"/>
+        <column xsi:type="int" name="subscriber_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Subscriber Id"/>
+        <column xsi:type="int" name="queue_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Queue Id"/>
+        <column xsi:type="int" name="problem_error_code" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Problem Error Code"/>
+        <column xsi:type="varchar" name="problem_error_text" nullable="true" length="200" comment="Problem Error Text"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="problem_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="NEWSLETTER_PROBLEM_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID"
+                    table="newsletter_problem" column="queue_id" referenceTable="newsletter_queue"
+                    referenceColumn="queue_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="NLTTR_PROBLEM_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID"
+                    table="newsletter_problem" column="subscriber_id" referenceTable="newsletter_subscriber"
+                    referenceColumn="subscriber_id" onDelete="CASCADE"/>
+        <index referenceId="NEWSLETTER_PROBLEM_SUBSCRIBER_ID" indexType="btree">
+            <column name="subscriber_id"/>
+        </index>
+        <index referenceId="NEWSLETTER_PROBLEM_QUEUE_ID" indexType="btree">
+            <column name="queue_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Newsletter/etc/db_schema_whitelist.json b/app/code/Magento/Newsletter/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..27666096e426e
--- /dev/null
+++ b/app/code/Magento/Newsletter/etc/db_schema_whitelist.json
@@ -0,0 +1,116 @@
+{
+    "newsletter_subscriber": {
+        "column": {
+            "subscriber_id": true,
+            "store_id": true,
+            "change_status_at": true,
+            "customer_id": true,
+            "subscriber_email": true,
+            "subscriber_status": true,
+            "subscriber_confirm_code": true
+        },
+        "index": {
+            "NEWSLETTER_SUBSCRIBER_CUSTOMER_ID": true,
+            "NEWSLETTER_SUBSCRIBER_STORE_ID": true,
+            "NEWSLETTER_SUBSCRIBER_SUBSCRIBER_EMAIL": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "NEWSLETTER_SUBSCRIBER_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "newsletter_template": {
+        "column": {
+            "template_id": true,
+            "template_code": true,
+            "template_text": true,
+            "template_styles": true,
+            "template_type": true,
+            "template_subject": true,
+            "template_sender_name": true,
+            "template_sender_email": true,
+            "template_actual": true,
+            "added_at": true,
+            "modified_at": true
+        },
+        "index": {
+            "NEWSLETTER_TEMPLATE_TEMPLATE_ACTUAL": true,
+            "NEWSLETTER_TEMPLATE_ADDED_AT": true,
+            "NEWSLETTER_TEMPLATE_MODIFIED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "newsletter_queue": {
+        "column": {
+            "queue_id": true,
+            "template_id": true,
+            "newsletter_type": true,
+            "newsletter_text": true,
+            "newsletter_styles": true,
+            "newsletter_subject": true,
+            "newsletter_sender_name": true,
+            "newsletter_sender_email": true,
+            "queue_status": true,
+            "queue_start_at": true,
+            "queue_finish_at": true
+        },
+        "index": {
+            "NEWSLETTER_QUEUE_TEMPLATE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "NEWSLETTER_QUEUE_TEMPLATE_ID_NEWSLETTER_TEMPLATE_TEMPLATE_ID": true
+        }
+    },
+    "newsletter_queue_link": {
+        "column": {
+            "queue_link_id": true,
+            "queue_id": true,
+            "subscriber_id": true,
+            "letter_sent_at": true
+        },
+        "index": {
+            "NEWSLETTER_QUEUE_LINK_SUBSCRIBER_ID": true,
+            "NEWSLETTER_QUEUE_LINK_QUEUE_ID_LETTER_SENT_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "NEWSLETTER_QUEUE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID": true,
+            "NLTTR_QUEUE_LNK_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID": true
+        }
+    },
+    "newsletter_queue_store_link": {
+        "column": {
+            "queue_id": true,
+            "store_id": true
+        },
+        "index": {
+            "NEWSLETTER_QUEUE_STORE_LINK_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "NEWSLETTER_QUEUE_STORE_LINK_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID": true,
+            "NEWSLETTER_QUEUE_STORE_LINK_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "newsletter_problem": {
+        "column": {
+            "problem_id": true,
+            "subscriber_id": true,
+            "queue_id": true,
+            "problem_error_code": true,
+            "problem_error_text": true
+        },
+        "index": {
+            "NEWSLETTER_PROBLEM_SUBSCRIBER_ID": true,
+            "NEWSLETTER_PROBLEM_QUEUE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "NEWSLETTER_PROBLEM_QUEUE_ID_NEWSLETTER_QUEUE_QUEUE_ID": true,
+            "NLTTR_PROBLEM_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Newsletter/etc/module.xml b/app/code/Magento/Newsletter/etc/module.xml
index f338445225222..23e9d84b203cf 100644
--- a/app/code/Magento/Newsletter/etc/module.xml
+++ b/app/code/Magento/Newsletter/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Newsletter" setup_version="2.0.0">
+    <module name="Magento_Newsletter" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Customer"/>
diff --git a/app/code/Magento/Newsletter/i18n/en_US.csv b/app/code/Magento/Newsletter/i18n/en_US.csv
index c49fdc80da810..388b583f990b1 100644
--- a/app/code/Magento/Newsletter/i18n/en_US.csv
+++ b/app/code/Magento/Newsletter/i18n/en_US.csv
@@ -67,8 +67,8 @@ Subscribers,Subscribers
 "Something went wrong while saving this template.","Something went wrong while saving this template."
 "Newsletter Subscription","Newsletter Subscription"
 "Something went wrong while saving your subscription.","Something went wrong while saving your subscription."
-"We saved the subscription.","We saved the subscription."
-"We removed the subscription.","We removed the subscription."
+"We have saved your subscription.","We have saved your subscription."
+"We have removed your newsletter subscription.","We have removed your newsletter subscription."
 "Your subscription has been confirmed.","Your subscription has been confirmed."
 "This is an invalid subscription confirmation code.","This is an invalid subscription confirmation code."
 "This is an invalid subscription ID.","This is an invalid subscription ID."
@@ -76,7 +76,7 @@ Subscribers,Subscribers
 "Sorry, but the administrator denied subscription for guests. Please <a href=""%1"">register</a>.","Sorry, but the administrator denied subscription for guests. Please <a href=""%1"">register</a>."
 "Please enter a valid email address.","Please enter a valid email address."
 "This email address is already subscribed.","This email address is already subscribed."
-"The confirmation request has been sent.","The confirmation request has been sent."
+"A confirmation request has been sent.","A confirmation request has been sent."
 "Thank you for your subscription.","Thank you for your subscription."
 "There was a problem with the subscription: %1","There was a problem with the subscription: %1"
 "Something went wrong with the subscription.","Something went wrong with the subscription."
@@ -151,3 +151,4 @@ Unconfirmed,Unconfirmed
 Store,Store
 "Store View","Store View"
 "Newsletter Subscriptions","Newsletter Subscriptions"
+"We have updated your subscription.","We have updated your subscription."
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
index 7355c06bdd655..279afe2c28e7a 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -19,8 +19,7 @@ use Magento\Framework\App\TemplateTypesInterface;
     </div>
     <?= /* @noEscape */ $block->getForm() ?>
 </form>
-<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_template_preview_form" target="_blank">
-    <?= $block->getBlockHtml('formkey') ?>
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="get" id="newsletter_template_preview_form" target="_blank">
     <div class="no-display">
         <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
         <input type="hidden" id="preview_text" name="text" value="" />
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
index b633c61d9dc35..c1a526ee95148 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -22,8 +22,9 @@
                 <label class="label" for="newsletter"><span><?= $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?></span></label>
                 <div class="control">
                     <input name="email" type="email" id="newsletter"
-                                placeholder="<?= $block->escapeHtmlAttr(__('Enter your email address')) ?>"
-                                data-validate="{required:true, 'validate-email':true}"/>
+                           placeholder="<?= $block->escapeHtml(__('Enter your email address')) ?>"
+                           data-mage-init='{"mage/trim-input":{}}'
+                           data-validate="{required:true, 'validate-email':true}"/>
                 </div>
             </div>
             <div class="actions">
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
index c4fe10c386645..d60348d9dc1c7 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
      *
      * @var string
      */
-    protected $_template = 'form/banktransfer.phtml';
+    protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
index 4e0f7d48ce09b..de0f7a57bae62 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
      *
      * @var string
      */
-    protected $_template = 'form/cashondelivery.phtml';
+    protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
index 2e0e58060c757..464142df5b996 100644
--- a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\OfflinePayments\Model;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Class Purchaseorder
  *
@@ -46,11 +48,29 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
      *
      * @param \Magento\Framework\DataObject|mixed $data
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
         $this->getInfoInstance()->setPoNumber($data->getPoNumber());
         return $this;
     }
+
+    /**
+     * Validate payment method information object
+     *
+     * @return $this
+     * @throws LocalizedException
+     * @api
+     */
+    public function validate()
+    {
+        parent::validate();
+
+        if (empty($this->getInfoInstance()->getPoNumber())) {
+            throw new LocalizedException(__('Purchase order number is a required field.'));
+        }
+
+        return $this;
+    }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE.txt b/app/code/Magento/OfflinePayments/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE.txt
rename to app/code/Magento/OfflinePayments/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE_AFL.txt b/app/code/Magento/OfflinePayments/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE_AFL.txt
rename to app/code/Magento/OfflinePayments/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/OfflinePayments/Test/Mftf/README.md b/app/code/Magento/OfflinePayments/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f12b3518c5672
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Offline Payments Functional Tests
+
+The Functional Test Module for **Magento Offline Payments** module.
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
index 7509ff03c3780..8d65146ec102b 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
@@ -63,6 +63,9 @@ public function testGetConfig($isAvailable, $mailingAddress, $payableTo, $result
         $this->assertEquals($result, $this->model->getConfig());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetConfig()
     {
         $checkmoCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Model/InstructionsConfigProviderTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Model/InstructionsConfigProviderTest.php
index 120a7eb6ed88f..97a64d8ab59b9 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Model/InstructionsConfigProviderTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Model/InstructionsConfigProviderTest.php
@@ -82,6 +82,9 @@ public function testGetConfig($isOneAvailable, $instructionsOne, $isTwoAvailable
         $this->assertEquals($result, $this->model->getConfig());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetConfig()
     {
         $oneCode = Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE;
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
index 548e1d5fb1874..2eb204651fcf4 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
@@ -5,10 +5,21 @@
  */
 namespace Magento\OfflinePayments\Test\Unit\Model;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\OfflinePayments\Model\Purchaseorder;
+use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Payment\Model\Info as PaymentInfo;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order\Payment;
+
 class PurchaseorderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\OfflinePayments\Model\Purchaseorder
+     * @var Purchaseorder
      */
     protected $_object;
 
@@ -19,15 +30,15 @@ class PurchaseorderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
+        $objectManagerHelper = new ObjectManager($this);
+        $eventManager = $this->createMock(EventManagerInterface::class);
+        $paymentDataMock = $this->createMock(PaymentHelper::class);
         $this->_scopeConfig = $this->createPartialMock(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class,
+            ScopeConfigInterface::class,
             ['getValue', 'isSetFlag']
         );
         $this->_object = $objectManagerHelper->getObject(
-            \Magento\OfflinePayments\Model\Purchaseorder::class,
+            Purchaseorder::class,
             [
                 'eventManager' => $eventManager,
                 'paymentData' => $paymentDataMock,
@@ -38,13 +49,37 @@ protected function setUp()
 
     public function testAssignData()
     {
-        $data = new \Magento\Framework\DataObject([
+        $data = new DataObject([
             'po_number' => '12345'
         ]);
 
-        $instance = $this->createMock(\Magento\Payment\Model\Info::class);
+        $instance = $this->createMock(PaymentInfo::class);
         $this->_object->setData('info_instance', $instance);
         $result = $this->_object->assignData($data);
         $this->assertEquals($result, $this->_object);
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Purchase order number is a required field.
+     */
+    public function testValidate()
+    {
+        $data = new DataObject([]);
+
+        $addressMock = $this->createMock(OrderAddressInterface::class);
+        $addressMock->expects($this->once())->method('getCountryId')->willReturn('UY');
+
+        $orderMock = $this->createMock(OrderInterface::class);
+        $orderMock->expects($this->once())->method('getBillingAddress')->willReturn($addressMock);
+
+        $instance = $this->createMock(Payment::class);
+
+        $instance->expects($this->once())->method('getOrder')->willReturn($orderMock);
+
+        $this->_object->setData('info_instance', $instance);
+        $this->_object->assignData($data);
+
+        $this->_object->validate();
+    }
 }
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index d9791f9f63428..aa2e45b01e9f2 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-payment": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-payment": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
index b47bd8f749040..89cc4d0986a00 100644
--- a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
+++ b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="payment" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="payment" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="checkmo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Check / Money Order</label>
                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
diff --git a/app/code/Magento/OfflinePayments/etc/module.xml b/app/code/Magento/OfflinePayments/etc/module.xml
index dfea6036c2e92..7388b5631aeb9 100644
--- a/app/code/Magento/OfflinePayments/etc/module.xml
+++ b/app/code/Magento/OfflinePayments/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_OfflinePayments" setup_version="2.0.0">
+    <module name="Magento_OfflinePayments" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/OfflinePayments/i18n/en_US.csv b/app/code/Magento/OfflinePayments/i18n/en_US.csv
index 43a743b29e3dd..5a180f7af4944 100644
--- a/app/code/Magento/OfflinePayments/i18n/en_US.csv
+++ b/app/code/Magento/OfflinePayments/i18n/en_US.csv
@@ -11,6 +11,7 @@ Enabled,Enabled
 "New Order Status","New Order Status"
 "Sort Order","Sort Order"
 Title,Title
+"Purchase order number is a required field.","Purchase order number is a required field."
 "Payment from Applicable Countries","Payment from Applicable Countries"
 "Payment from Specific Countries","Payment from Specific Countries"
 "Make Check Payable to","Make Check Payable to"
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
index a258223e06777..1bd55cf5f1720 100644
--- a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
+++ b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php
@@ -21,7 +21,7 @@ class Export extends \Magento\Framework\Data\Form\Element\AbstractElement
      * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Backend\Helper\Data $helper
+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param array $data
      */
     public function __construct(
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index b546237b82565..26f3274688977 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -97,8 +97,18 @@ public function collectRates(RateRequest $request)
             $method->setCost('0.00');
 
             $result->append($method);
+        } elseif ($this->getConfigData('showmethod')) {
+            $error = $this->_rateErrorFactory->create();
+            $error->setCarrier($this->_code);
+            $error->setCarrierTitle($this->getConfigData('title'));
+            $errorMsg = $this->getConfigData('specificerrmsg');
+            $error->setErrorMessage(
+                $errorMsg ? $errorMsg : __(
+                    'Sorry, but we can\'t deliver to the destination country with this shipping module.'
+                )
+            );
+            return $error;
         }
-
         return $result;
     }
 
@@ -128,6 +138,8 @@ protected function _updateFreeMethodQuote($request)
     }
 
     /**
+     * Returns allowed shipping methods
+     *
      * @return array
      */
     public function getAllowedMethods()
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index b12691ad16245..bb81f9ebb475f 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\OfflineShipping\Model\Carrier;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -60,6 +61,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
      * @param \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory $resultMethodFactory
      * @param \Magento\OfflineShipping\Model\ResourceModel\Carrier\TablerateFactory $tablerateFactory
      * @param array $data
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function __construct(
@@ -81,6 +83,8 @@ public function __construct(
     }
 
     /**
+     * Collect rates.
+     *
      * @param RateRequest $request
      * @return \Magento\Shipping\Model\Rate\Result
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -113,8 +117,9 @@ public function collectRates(RateRequest $request)
 
         // Free shipping by qty
         $freeQty = 0;
+        $freePackageValue = 0;
+
         if ($request->getAllItems()) {
-            $freePackageValue = 0;
             foreach ($request->getAllItems() as $item) {
                 if ($item->getProduct()->isVirtual() || $item->getParentItem()) {
                     continue;
@@ -127,8 +132,10 @@ public function collectRates(RateRequest $request)
                             $freeQty += $item->getQty() * ($child->getQty() - $freeShipping);
                         }
                     }
-                } elseif ($item->getFreeShipping()) {
-                    $freeShipping = is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0;
+                } elseif ($item->getFreeShipping() || $item->getAddress()->getFreeShipping()) {
+                    $freeShipping = $item->getFreeShipping() ?
+                        $item->getFreeShipping() : $item->getAddress()->getFreeShipping();
+                    $freeShipping = is_numeric($freeShipping) ? $freeShipping : 0;
                     $freeQty += $item->getQty() - $freeShipping;
                     $freePackageValue += $item->getBaseRowTotal();
                 }
@@ -197,6 +204,8 @@ public function collectRates(RateRequest $request)
     }
 
     /**
+     * Get rate.
+     *
      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
      * @return array|bool
      */
@@ -206,6 +215,8 @@ public function getRate(\Magento\Quote\Model\Quote\Address\RateRequest $request)
     }
 
     /**
+     * Get code.
+     *
      * @param string $type
      * @param string $code
      * @return array
@@ -227,7 +238,9 @@ public function getCode($type, $code = '')
         ];
 
         if (!isset($codes[$type])) {
-            throw new LocalizedException(__('Please correct Table Rate code type: %1.', $type));
+            throw new LocalizedException(
+                __('The "%1" code type for Table Rate is incorrect. Verify the type and try again.', $type)
+            );
         }
 
         if ('' === $code) {
@@ -235,7 +248,9 @@ public function getCode($type, $code = '')
         }
 
         if (!isset($codes[$type][$code])) {
-            throw new LocalizedException(__('Please correct Table Rate code for type %1: %2.', $type, $code));
+            throw new LocalizedException(
+                __('The "%1: %2" code type for Table Rate is incorrect. Verify the type and try again.', $type, $code)
+            );
         }
 
         return $codes[$type][$code];
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
index e1397dc6e097b..c6234a1247a53 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
@@ -3,27 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\OfflineShipping\Model\Quote\Address;
 
-class FreeShipping implements \Magento\Quote\Model\Quote\Address\FreeShippingInterface
+use Magento\OfflineShipping\Model\SalesRule\Calculator;
+use Magento\OfflineShipping\Model\SalesRule\ExtendedCalculator;
+use Magento\Quote\Model\Quote\Address\FreeShippingInterface;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Store\Model\StoreManagerInterface;
+
+class FreeShipping implements FreeShippingInterface
 {
     /**
-     * @var \Magento\OfflineShipping\Model\SalesRule\Calculator
+     * @var ExtendedCalculator
      */
     protected $calculator;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
+     * @param StoreManagerInterface $storeManager
+     * @param Calculator $calculator
      */
     public function __construct(
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
+        StoreManagerInterface $storeManager,
+        Calculator $calculator
     ) {
         $this->storeManager = $storeManager;
         $this->calculator = $calculator;
@@ -39,6 +47,7 @@ public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items)
             return false;
         }
 
+        $result = false;
         $addressFreeShipping = true;
         $store = $this->storeManager->getStore($quote->getStoreId());
         $this->calculator->init(
@@ -62,21 +71,24 @@ public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items)
             }
 
             $this->calculator->processFreeShipping($item);
-            $itemFreeShipping = (bool)$item->getFreeShipping();
-            $addressFreeShipping = $addressFreeShipping && $itemFreeShipping;
-
-            if ($addressFreeShipping && !$item->getAddress()->getFreeShipping()) {
-                $item->getAddress()->setFreeShipping(true);
+            // at least one item matches to the rule and the rule mode is not a strict
+            if ((bool)$item->getAddress()->getFreeShipping()) {
+                $result = true;
+                break;
             }
 
-            /** Parent free shipping we apply to all children*/
-            $this->applyToChildren($item, $itemFreeShipping);
+            $itemFreeShipping = (bool)$item->getFreeShipping();
+            $addressFreeShipping = $addressFreeShipping && $itemFreeShipping;
+            $result = $addressFreeShipping;
         }
-        return (bool)$shippingAddress->getFreeShipping();
+
+        $shippingAddress->setFreeShipping((int)$result);
+        $this->applyToItems($items, $result);
+        return $result;
     }
 
     /**
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * @param AbstractItem $item
      * @param bool $isFreeShipping
      * @return void
      */
@@ -91,4 +103,20 @@ protected function applyToChildren(\Magento\Quote\Model\Quote\Item\AbstractItem
             }
         }
     }
+
+    /**
+     * Sets free shipping availability to the quote items.
+     *
+     * @param array $items
+     * @param bool $freeShipping
+     */
+    private function applyToItems(array $items, bool $freeShipping)
+    {
+        /** @var AbstractItem $item */
+        foreach ($items as $item) {
+            $item->getAddress()
+                ->setFreeShipping((int)$freeShipping);
+            $this->applyToChildren($item, $freeShipping);
+        }
+    }
 }
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
index 6dab0849673dc..0c4718245928b 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
@@ -231,10 +231,10 @@ private function importData(array $fields, array $values)
                 $this->_importedRows += count($values);
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $connection->rollback();
+            $connection->rollBack();
             throw new \Magento\Framework\Exception\LocalizedException(__('Unable to import data'), $e);
         } catch (\Exception $e) {
-            $connection->rollback();
+            $connection->rollBack();
             $this->logger->critical($e);
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Something went wrong while importing table rates.')
@@ -320,7 +320,7 @@ public function getConditionName(\Magento\Framework\DataObject $object)
      */
     private function getCsvFile($filePath)
     {
-        $pathInfo = pathInfo($filePath);
+        $pathInfo = pathinfo($filePath);
         $dirName = isset($pathInfo['dirname']) ? $pathInfo['dirname'] : '';
         $fileName = isset($pathInfo['basename']) ? $pathInfo['basename'] : '';
 
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
index 4d2e11ebb8a1e..f7b487d37bfc6 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Phrase;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\LocationDirectory;
 
+/**
+ * Row parser.
+ */
 class RowParser
 {
     /**
@@ -26,6 +29,8 @@ public function __construct(LocationDirectory $locationDirectory)
     }
 
     /**
+     * Retrieve columns.
+     *
      * @return array
      */
     public function getColumns()
@@ -42,6 +47,8 @@ public function getColumns()
     }
 
     /**
+     * Parse provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param int $websiteId
@@ -62,27 +69,39 @@ public function parse(
     ) {
         // validate row
         if (count($rowData) < 5) {
-            throw new RowException(__('Please correct Table Rates format in the Row #%1.', $rowNumber));
+            throw new RowException(
+                __(
+                    'The Table Rates File Format is incorrect in row number "%1". Verify the format and try again.',
+                    $rowNumber
+                )
+            );
         }
 
         $countryId = $this->getCountryId($rowData, $rowNumber, $columnResolver);
-        $regionId = $this->getRegionId($rowData, $rowNumber, $columnResolver, $countryId);
+        $regionIds = $this->getRegionIds($rowData, $rowNumber, $columnResolver, $countryId);
         $zipCode = $this->getZipCode($rowData, $columnResolver);
         $conditionValue = $this->getConditionValue($rowData, $rowNumber, $conditionFullName, $columnResolver);
         $price = $this->getPrice($rowData, $rowNumber, $columnResolver);
 
-        return [
-            'website_id' => $websiteId,
-            'dest_country_id' => $countryId,
-            'dest_region_id' => $regionId,
-            'dest_zip' => $zipCode,
-            'condition_name' => $conditionShortName,
-            'condition_value' => $conditionValue,
-            'price' => $price,
-        ];
+        $rates = [];
+        foreach ($regionIds as $regionId) {
+            $rates[] = [
+                'website_id' => $websiteId,
+                'dest_country_id' => $countryId,
+                'dest_region_id' => $regionId,
+                'dest_zip' => $zipCode,
+                'condition_name' => $conditionShortName,
+                'condition_value' => $conditionValue,
+                'price' => $price,
+            ];
+        }
+
+        return $rates;
     }
 
     /**
+     * Get country id from provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param ColumnResolver $columnResolver
@@ -99,34 +118,51 @@ private function getCountryId(array $rowData, $rowNumber, ColumnResolver $column
         } elseif ($countryCode === '*' || $countryCode === '') {
             $countryId = '0';
         } else {
-            throw new RowException(__('Please correct Country "%1" in the Row #%2.', $countryCode, $rowNumber));
+            throw new RowException(
+                __(
+                    'The "%1" country in row number "%2" is incorrect. Verify the country and try again.',
+                    $countryCode,
+                    $rowNumber
+                )
+            );
         }
         return $countryId;
     }
 
     /**
+     * Retrieve region id from provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param ColumnResolver $columnResolver
      * @param int $countryId
-     * @return int|string
+     * @return array
      * @throws ColumnNotFoundException
      * @throws RowException
      */
-    private function getRegionId(array $rowData, $rowNumber, ColumnResolver $columnResolver, $countryId)
+    private function getRegionIds(array $rowData, $rowNumber, ColumnResolver $columnResolver, $countryId)
     {
         $regionCode = $columnResolver->getColumnValue(ColumnResolver::COLUMN_REGION, $rowData);
         if ($countryId !== '0' && $this->locationDirectory->hasRegionId($countryId, $regionCode)) {
-            $regionId = $this->locationDirectory->getRegionId($countryId, $regionCode);
+            $regionIds = $this->locationDirectory->getRegionIds($countryId, $regionCode);
         } elseif ($regionCode === '*' || $regionCode === '') {
-            $regionId = 0;
+            $regionIds = [0];
         } else {
-            throw new RowException(__('Please correct Region/State "%1" in the Row #%2.', $regionCode, $rowNumber));
+            throw new RowException(
+                __(
+                    'The "%1" region or state in row number "%2" is incorrect. '
+                    . 'Verify the region or state and try again.',
+                    $regionCode,
+                    $rowNumber
+                )
+            );
         }
-        return $regionId;
+        return $regionIds;
     }
 
     /**
+     * Retrieve zip code from provided row data.
+     *
      * @param array $rowData
      * @param ColumnResolver $columnResolver
      * @return float|int|null|string
@@ -142,6 +178,8 @@ private function getZipCode(array $rowData, ColumnResolver $columnResolver)
     }
 
     /**
+     * Get condition value form provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param string $conditionFullName
@@ -169,6 +207,8 @@ private function getConditionValue(array $rowData, $rowNumber, $conditionFullNam
     }
 
     /**
+     * Retrieve price from provided row data.
+     *
      * @param array $rowData
      * @param int $rowNumber
      * @param ColumnResolver $columnResolver
@@ -181,13 +221,20 @@ private function getPrice(array $rowData, $rowNumber, ColumnResolver $columnReso
         $priceValue = $columnResolver->getColumnValue(ColumnResolver::COLUMN_PRICE, $rowData);
         $price = $this->_parseDecimalValue($priceValue);
         if ($price === false) {
-            throw new RowException(__('Please correct Shipping Price "%1" in the Row #%2.', $priceValue, $rowNumber));
+            throw new RowException(
+                __(
+                    'The "%1" shipping price in row number "%2" is incorrect. Verify the shipping price and try again.',
+                    $priceValue,
+                    $rowNumber
+                )
+            );
         }
         return $price;
     }
 
     /**
      * Parse and validate positive decimal value
+     *
      * Return false if value is not decimal or is not positive
      *
      * @param string $value
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php
index 1012394f22fcb..7735f8ce8999c 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php
@@ -16,6 +16,10 @@
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV\RowParser;
 use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Import offline shipping.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Import
 {
     /**
@@ -84,6 +88,8 @@ public function __construct(
     }
 
     /**
+     * Check if there are errors.
+     *
      * @return bool
      */
     public function hasErrors()
@@ -92,6 +98,8 @@ public function hasErrors()
     }
 
     /**
+     * Get errors.
+     *
      * @return array
      */
     public function getErrors()
@@ -100,6 +108,8 @@ public function getErrors()
     }
 
     /**
+     * Retrieve columns.
+     *
      * @return array
      */
     public function getColumns()
@@ -108,6 +118,8 @@ public function getColumns()
     }
 
     /**
+     * Get data from file.
+     *
      * @param ReadInterface $file
      * @param int $websiteId
      * @param string $conditionShortName
@@ -132,7 +144,7 @@ public function getData(ReadInterface $file, $websiteId, $conditionShortName, $c
                 if (empty($csvLine)) {
                     continue;
                 }
-                $rowData = $this->rowParser->parse(
+                $rowsData = $this->rowParser->parse(
                     $csvLine,
                     $rowNumber,
                     $websiteId,
@@ -141,20 +153,25 @@ public function getData(ReadInterface $file, $websiteId, $conditionShortName, $c
                     $columnResolver
                 );
 
-                // protect from duplicate
-                $hash = $this->dataHashGenerator->getHash($rowData);
-                if (array_key_exists($hash, $this->uniqueHash)) {
-                    throw new RowException(
-                        __(
-                            'Duplicate Row #%1 (duplicates row #%2)',
-                            $rowNumber,
-                            $this->uniqueHash[$hash]
-                        )
-                    );
+                foreach ($rowsData as $rowData) {
+                    // protect from duplicate
+                    $hash = $this->dataHashGenerator->getHash($rowData);
+                    if (array_key_exists($hash, $this->uniqueHash)) {
+                        throw new RowException(
+                            __(
+                                'Duplicate Row #%1 (duplicates row #%2)',
+                                $rowNumber,
+                                $this->uniqueHash[$hash]
+                            )
+                        );
+                    }
+                    $this->uniqueHash[$hash] = $rowNumber;
+
+                    $items[] = $rowData;
+                }
+                if (count($rowsData) > 1) {
+                    $bunchSize += count($rowsData) - 1;
                 }
-                $this->uniqueHash[$hash] = $rowNumber;
-
-                $items[] = $rowData;
                 if (count($items) === $bunchSize) {
                     yield $items;
                     $items = [];
@@ -169,6 +186,8 @@ public function getData(ReadInterface $file, $websiteId, $conditionShortName, $c
     }
 
     /**
+     * Retrieve column headers.
+     *
      * @param ReadInterface $file
      * @return array|bool
      * @throws LocalizedException
@@ -178,7 +197,9 @@ private function getHeaders(ReadInterface $file)
         // check and skip headers
         $headers = $file->readCsv();
         if ($headers === false || count($headers) < 5) {
-            throw new LocalizedException(__('Please correct Table Rates File Format.'));
+            throw new LocalizedException(
+                __('The Table Rates File Format is incorrect. Verify the format and try again.')
+            );
         }
         return $headers;
     }
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
index 1a311f3658a0a..e015f7b54637d 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
@@ -6,6 +6,9 @@
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
 
+/**
+ * Location directory.
+ */
 class LocationDirectory
 {
     /**
@@ -13,6 +16,11 @@ class LocationDirectory
      */
     protected $regions;
 
+    /**
+     * @var array
+     */
+    private $regionsByCode;
+
     /**
      * @var array
      */
@@ -47,6 +55,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve country id.
+     *
      * @param string $countryCode
      * @return null|string
      */
@@ -88,6 +98,8 @@ protected function loadCountries()
     }
 
     /**
+     * Check if there is country id with provided country code.
+     *
      * @param string $countryCode
      * @return bool
      */
@@ -98,6 +110,8 @@ public function hasCountryId($countryCode)
     }
 
     /**
+     * Check if there is region id with provided region code and country id.
+     *
      * @param string $countryId
      * @param string $regionCode
      * @return bool
@@ -115,29 +129,50 @@ public function hasRegionId($countryId, $regionCode)
      */
     protected function loadRegions()
     {
-        if ($this->regions !== null) {
+        if ($this->regions !== null && $this->regionsByCode !== null) {
             return $this;
         }
 
         $this->regions = [];
+        $this->regionsByCode = [];
 
         /** @var $collection \Magento\Directory\Model\ResourceModel\Region\Collection */
         $collection = $this->_regionCollectionFactory->create();
         foreach ($collection->getData() as $row) {
             $this->regions[$row['country_id']][$row['code']] = (int)$row['region_id'];
+            if (empty($this->regionsByCode[$row['country_id']][$row['code']])) {
+                $this->regionsByCode[$row['country_id']][$row['code']] = [];
+            }
+            $this->regionsByCode[$row['country_id']][$row['code']][] = (int)$row['region_id'];
         }
 
         return $this;
     }
 
     /**
+     * Retrieve region id.
+     *
      * @param int $countryId
      * @param string $regionCode
      * @return string
+     * @deprecated
      */
     public function getRegionId($countryId, $regionCode)
     {
         $this->loadRegions();
         return $this->regions[$countryId][$regionCode];
     }
+
+    /**
+     * Return region ids for country and region
+     *
+     * @param int $countryId
+     * @param string $regionCode
+     * @return array
+     */
+    public function getRegionIds($countryId, $regionCode)
+    {
+        $this->loadRegions();
+        return $this->regionsByCode[$countryId][$regionCode];
+    }
 }
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
index 5a3ad76f0410f..f7105b8e54767 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php
@@ -6,6 +6,9 @@
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
 
+/**
+ * Query builder for table rate
+ */
 class RateQuery
 {
     /**
@@ -24,6 +27,8 @@ public function __construct(
     }
 
     /**
+     * Prepare select
+     *
      * @param \Magento\Framework\DB\Select $select
      * @return \Magento\Framework\DB\Select
      */
@@ -42,6 +47,7 @@ public function prepareSelect(\Magento\Framework\DB\Select $select)
             ') OR (',
             [
                 "dest_country_id = :country_id AND dest_region_id = :region_id AND dest_zip = :postcode",
+                "dest_country_id = :country_id AND dest_region_id = :region_id AND dest_zip = :postcode_prefix",
                 "dest_country_id = :country_id AND dest_region_id = :region_id AND dest_zip = ''",
 
                 // Handle asterisk in dest_zip field
@@ -51,7 +57,7 @@ public function prepareSelect(\Magento\Framework\DB\Select $select)
                 "dest_country_id = '0' AND dest_region_id = 0 AND dest_zip = '*'",
                 "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = ''",
                 "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = :postcode",
-                "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = '*'"
+                "dest_country_id = :country_id AND dest_region_id = 0 AND dest_zip = :postcode_prefix"
             ]
         ) . ')';
         $select->where($orWhere);
@@ -76,6 +82,8 @@ public function prepareSelect(\Magento\Framework\DB\Select $select)
     }
 
     /**
+     * Returns query bindings
+     *
      * @return array
      */
     public function getBindings()
@@ -85,6 +93,7 @@ public function getBindings()
             ':country_id' => $this->request->getDestCountryId(),
             ':region_id' => (int)$this->request->getDestRegionId(),
             ':postcode' => $this->request->getDestPostcode(),
+            ':postcode_prefix' => $this->getDestPostcodePrefix()
         ];
 
         // Render condition by condition name
@@ -99,17 +108,33 @@ public function getBindings()
             }
         } else {
             $bind[':condition_name'] = $this->request->getConditionName();
-            $bind[':condition_value'] = $this->request->getData($this->request->getConditionName());
+            $bind[':condition_value'] = round($this->request->getData($this->request->getConditionName()), 4);
         }
 
         return $bind;
     }
 
     /**
+     * Returns rate request
+     *
      * @return \Magento\Quote\Model\Quote\Address\RateRequest
      */
     public function getRequest()
     {
         return $this->request;
     }
+
+    /**
+     * Returns the entire postcode if it contains no dash or the part of it prior to the dash in the other case
+     *
+     * @return string
+     */
+    private function getDestPostcodePrefix()
+    {
+        if (!preg_match("/^(.+)-(.+)$/", $this->request->getDestPostcode(), $zipParts)) {
+            return $this->request->getDestPostcode();
+        }
+
+        return $zipParts[1];
+    }
 }
diff --git a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php b/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
deleted file mode 100644
index 433c2049d96f0..0000000000000
--- a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\OfflineShipping\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private static $quoteConnectionName = 'checkout';
-
-    /**
-     * @var string
-     */
-    private static $salesConnectionName = 'sales';
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'shipping_tablerate'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('shipping_tablerate')
-        )->addColumn(
-            'pk',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Primary key'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Website Id'
-        )->addColumn(
-            'dest_country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            4,
-            ['nullable' => false, 'default' => '0'],
-            'Destination coutry ISO/2 or ISO/3 code'
-        )->addColumn(
-            'dest_region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Destination Region Id'
-        )->addColumn(
-            'dest_zip',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            10,
-            ['nullable' => false, 'default' => '*'],
-            'Destination Post Code (Zip)'
-        )->addColumn(
-            'condition_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            ['nullable' => false],
-            'Rate Condition name'
-        )->addColumn(
-            'condition_value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Rate condition value'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Price'
-        )->addColumn(
-            'cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Cost'
-        )->addIndex(
-            $installer->getIdxName(
-                'shipping_tablerate',
-                ['website_id', 'dest_country_id', 'dest_region_id', 'dest_zip', 'condition_name', 'condition_value'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['website_id', 'dest_country_id', 'dest_region_id', 'dest_zip', 'condition_name', 'condition_value'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->setComment(
-            'Shipping Tablerate'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->getConnection()->addColumn(
-            $installer->getTable('salesrule'),
-            'simple_free_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Simple Free Shipping'
-        );
-        $installer->getConnection(self::$salesConnectionName)->addColumn(
-            $installer->getTable('sales_order_item', self::$salesConnectionName),
-            'free_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Free Shipping'
-        );
-        $installer->getConnection(self::$quoteConnectionName)->addColumn(
-            $installer->getTable('quote_address', self::$quoteConnectionName),
-            'free_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Free Shipping'
-        );
-        $installer->getConnection(self::$quoteConnectionName)->addColumn(
-            $installer->getTable('quote_item', self::$quoteConnectionName),
-            'free_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Free Shipping'
-        );
-        $installer->getConnection(self::$quoteConnectionName)->addColumn(
-            $installer->getTable('quote_address_item', self::$quoteConnectionName),
-            'free_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Free Shipping'
-        );
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php
new file mode 100644
index 0000000000000..b89942230c50c
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\OfflineShipping\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class UpdateQuoteShippingAddresses implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        // setup default
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $connection = $this->moduleDataSetup->getConnection();
+        $salesConnection = $this->moduleDataSetup->getConnection('sales');
+        $checkoutConnection = $this->moduleDataSetup->getConnection('checkout');
+        $connection->update(
+            $this->moduleDataSetup->getTable('salesrule'),
+            ['simple_free_shipping' => 0],
+            [new \Zend_Db_Expr('simple_free_shipping IS NULL')]
+        );
+        $this->moduleDataSetup->getConnection()->endSetup();
+
+        // setup sales
+        $salesConnection->startSetup();
+        $salesConnection->update(
+            $this->moduleDataSetup->getTable('sales_order_item'),
+            ['free_shipping' => 0],
+            [new \Zend_Db_Expr('free_shipping IS NULL')]
+        );
+        $salesConnection->endSetup();
+
+        // setup checkout
+        $checkoutConnection->startSetup();
+        $checkoutConnection->update(
+            $this->moduleDataSetup->getTable('quote_address'),
+            ['free_shipping' => 0],
+            [new \Zend_Db_Expr('free_shipping IS NULL')]
+        );
+        $checkoutConnection->update(
+            $this->moduleDataSetup->getTable('quote_item'),
+            ['free_shipping' => 0],
+            [new \Zend_Db_Expr('free_shipping IS NULL')]
+        );
+        $checkoutConnection->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/OfflineShipping/Setup/UpgradeData.php b/app/code/Magento/OfflineShipping/Setup/UpgradeData.php
deleted file mode 100644
index f0a11c66ca6de..0000000000000
--- a/app/code/Magento/OfflineShipping/Setup/UpgradeData.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\OfflineShipping\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-/**
- * Upgrade Data script.
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var string
-     */
-    private $quoteConnectionName = 'checkout';
-
-    /**
-     * @var string
-     */
-    private $salesConnectionName = 'sales';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        if ($context->getVersion() && version_compare($context->getVersion(), '2.0.1') < 0) {
-            $this->updateQuoteShippingAddresses($setup);
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * Replace Null with '0' for 'free_shipping' and 'simple_free_shipping' accordingly to upgraded schema.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function updateQuoteShippingAddresses(ModuleDataSetupInterface $setup)
-    {
-        $setup->getConnection()->update(
-            $setup->getTable('salesrule'),
-            ['simple_free_shipping' => 0],
-            [new \Zend_Db_Expr('simple_free_shipping IS NULL')]
-        );
-        $setup->getConnection($this->salesConnectionName)->update(
-            $setup->getTable('sales_order_item'),
-            ['free_shipping' => 0],
-            [new \Zend_Db_Expr('free_shipping IS NULL')]
-        );
-        $setup->getConnection($this->quoteConnectionName)->update(
-            $setup->getTable('quote_address'),
-            ['free_shipping' => 0],
-            [new \Zend_Db_Expr('free_shipping IS NULL')]
-        );
-        $setup->getConnection($this->quoteConnectionName)->update(
-            $setup->getTable('quote_item'),
-            ['free_shipping' => 0],
-            [new \Zend_Db_Expr('free_shipping IS NULL')]
-        );
-    }
-}
diff --git a/app/code/Magento/OfflineShipping/Setup/UpgradeSchema.php b/app/code/Magento/OfflineShipping/Setup/UpgradeSchema.php
deleted file mode 100644
index b8eedbe3ba91c..0000000000000
--- a/app/code/Magento/OfflineShipping/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\OfflineShipping\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * Upgrade schema DB for OfflineShipping module.
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private $quoteConnectionName = 'checkout';
-
-    /**
-     * @var string
-     */
-    private $salesConnectionName = 'sales';
-
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->updateFreeShippingColumns($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Modify 'free_shipping' and 'simple_free_shipping' columns added incorrectly in InstallSchema.
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function updateFreeShippingColumns(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->modifyColumn(
-            $setup->getTable('salesrule'),
-            'simple_free_shipping',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '0',
-                'comment' => 'Simple Free Shipping',
-            ]
-        );
-        $setup->getConnection($this->salesConnectionName)->modifyColumn(
-            $setup->getTable('sales_order_item', $this->salesConnectionName),
-            'free_shipping',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '0',
-                'comment' => 'Free Shipping',
-            ]
-        );
-        $setup->getConnection($this->quoteConnectionName)->modifyColumn(
-            $setup->getTable('quote_address', $this->quoteConnectionName),
-            'free_shipping',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '0',
-                'comment' => 'Free Shipping',
-            ]
-        );
-        $setup->getConnection($this->quoteConnectionName)->modifyColumn(
-            $setup->getTable('quote_item', $this->quoteConnectionName),
-            'free_shipping',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '0',
-                'comment' => 'Free Shipping',
-            ]
-        );
-        $setup->getConnection($this->quoteConnectionName)->modifyColumn(
-            $setup->getTable('quote_address_item', $this->quoteConnectionName),
-            'free_shipping',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                'unsigned' => true,
-                'comment' => 'Free Shipping',
-            ]
-        );
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE.txt b/app/code/Magento/OfflineShipping/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE.txt
rename to app/code/Magento/OfflineShipping/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE_AFL.txt b/app/code/Magento/OfflineShipping/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE_AFL.txt
rename to app/code/Magento/OfflineShipping/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/README.md b/app/code/Magento/OfflineShipping/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3928af293d336
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Offline Shipping Functional Tests
+
+The Functional Test Module for **Magento Offline Shipping** module.
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php
index cc164e504b665..3e2c7df9087da 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php
@@ -37,7 +37,7 @@ public function testGetElementHtml()
         $requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $requestMock->expects($this->once())->method('getParam')->with('website')->will($this->returnValue(1));
 
-        $mockData = $this->createPartialMock(\StdClass::class, ['toHtml']);
+        $mockData = $this->createPartialMock(\stdClass::class, ['toHtml']);
         $mockData->expects($this->once())->method('toHtml')->will($this->returnValue($expected));
 
         $blockMock->expects($this->once())->method('getRequest')->will($this->returnValue($requestMock));
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
index 185f393ad4d0b..5f0894874ca3c 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -52,6 +52,9 @@ public function testAfterGetStateActive($scopeConfigMockReturnValue, $result, $a
         $this->assertEquals($assertResult, $this->model->afterIsStateActive($subjectMock, $result));
     }
 
+    /**
+     * @return array
+     */
     public function afterGetStateActiveDataProvider()
     {
         return [
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
index 5a8b1afa786bb..8266a39bbbb6d 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
@@ -3,94 +3,193 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\OfflineShipping\Test\Unit\Model\Quote\Address;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\OfflineShipping\Model\Quote\Address\FreeShipping;
+use Magento\OfflineShipping\Model\SalesRule\Calculator;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class FreeShippingTest extends \PHPUnit\Framework\TestCase
 {
+    private static $websiteId = 1;
+
+    private static $customerGroupId = 2;
+
+    private static $couponCode = 3;
+
+    private static $storeId = 1;
+
     /**
-     * @var \Magento\OfflineShipping\Model\Quote\Address\FreeShipping
+     * @var FreeShipping
      */
     private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+     * @var MockObject|StoreManagerInterface
      */
-    private $storeManagerMock;
+    private $storeManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\OfflineShipping\Model\SalesRule\Calculator
+     * @var MockObject|Calculator
      */
-    private $calculatorMock;
+    private $calculator;
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->calculatorMock = $this->createMock(\Magento\OfflineShipping\Model\SalesRule\Calculator::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->calculator = $this->createMock(Calculator::class);
 
-        $this->model = new \Magento\OfflineShipping\Model\Quote\Address\FreeShipping(
-            $this->storeManagerMock,
-            $this->calculatorMock
+        $this->model = new FreeShipping(
+            $this->storeManager,
+            $this->calculator
         );
     }
 
-    public function testIsFreeShippingIfNoItems()
+    /**
+     * Checks free shipping availability based on quote items and cart rule calculations.
+     *
+     * @param int $addressFree
+     * @param int $fItemFree
+     * @param int $sItemFree
+     * @param bool $expected
+     * @dataProvider itemsDataProvider
+     */
+    public function testIsFreeShipping(int $addressFree, int $fItemFree, int $sItemFree, bool $expected)
     {
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->assertFalse($this->model->isFreeShipping($quoteMock, []));
+        $address = $this->getShippingAddress();
+        $this->withStore();
+        $quote = $this->getQuote($address);
+        $fItem = $this->getItem($quote);
+        $sItem = $this->getItem($quote);
+        $items = [$fItem, $sItem];
+
+        $this->calculator->method('init')
+            ->with(self::$websiteId, self::$customerGroupId, self::$couponCode);
+        $this->calculator->method('processFreeShipping')
+            ->withConsecutive(
+                [$fItem],
+                [$sItem]
+            )
+            ->willReturnCallback(function () use ($fItem, $sItem, $addressFree, $fItemFree, $sItemFree) {
+                // emulate behavior of cart rule calculator
+                $fItem->getAddress()->setFreeShipping($addressFree);
+                $fItem->setFreeShipping($fItemFree);
+                $sItem->setFreeShipping($sItemFree);
+            });
+
+        $actual = $this->model->isFreeShipping($quote, $items);
+        self::assertEquals($expected, $actual);
+        self::assertEquals($expected, $address->getFreeShipping());
     }
 
-    public function testIsFreeShipping()
+    /**
+     * Gets list of variations with free shipping availability.
+     *
+     * @return array
+     */
+    public function itemsDataProvider(): array
     {
-        $storeId = 100;
-        $websiteId = 200;
-        $customerGroupId = 300;
-        $objectManagerMock = new ObjectManagerHelper($this);
-        $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['getShippingAddress', 'getStoreId', 'getCustomerGroupId', 'getCouponCode']
-        );
-        $itemMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, [
-                'getNoDiscount',
-                'getParentItemId',
-                'getFreeShipping',
-                'getAddress',
-                'isChildrenCalculated',
-                'getHasChildren',
-                'getChildren'
-            ]);
-
-        $quoteMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
-        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
-        $this->storeManagerMock->expects($this->once())->method('getStore')->with($storeId)->willReturn($storeMock);
-
-        $quoteMock->expects($this->once())->method('getCustomerGroupId')->willReturn($customerGroupId);
-        $quoteMock->expects($this->once())->method('getCouponCode')->willReturn(null);
-
-        $this->calculatorMock->expects($this->once())
-            ->method('init')
-            ->with($websiteId, $customerGroupId, null)
-            ->willReturnSelf();
-
-        $itemMock->expects($this->once())->method('getNoDiscount')->willReturn(false);
-        $itemMock->expects($this->once())->method('getParentItemId')->willReturn(false);
-        $this->calculatorMock->expects($this->exactly(2))->method('processFreeShipping')->willReturnSelf();
-        $itemMock->expects($this->once())->method('getFreeShipping')->willReturn(true);
-
-        $addressMock = $objectManagerMock->getObject(\Magento\Quote\Model\Quote\Address::class);
-        $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($addressMock);
-        $itemMock->expects($this->exactly(2))->method('getAddress')->willReturn($addressMock);
-
-        $itemMock->expects($this->once())->method('getHasChildren')->willReturn(true);
-        $itemMock->expects($this->once())->method('isChildrenCalculated')->willReturn(true);
-
-        $childMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['setFreeShipping']);
-        $childMock->expects($this->once())->method('setFreeShipping')->with(true)->willReturnSelf();
-        $itemMock->expects($this->once())->method('getChildren')->willReturn([$childMock]);
-
-        $this->assertTrue($this->model->isFreeShipping($quoteMock, [$itemMock]));
+        return [
+            ['addressFree' => 1, 'fItemFree' => 0, 'sItemFree' => 0, 'expected' => true],
+            ['addressFree' => 0, 'fItemFree' => 1, 'sItemFree' => 0, 'expected' => false],
+            ['addressFree' => 0, 'fItemFree' => 0, 'sItemFree' => 1, 'expected' => false],
+            ['addressFree' => 0, 'fItemFree' => 1, 'sItemFree' => 1, 'expected' => true],
+        ];
+    }
+
+    /**
+     * Creates mock object for store entity.
+     */
+    private function withStore()
+    {
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager->method('getStore')
+            ->with(self::$storeId)
+            ->willReturn($store);
+
+        $store->method('getWebsiteId')
+            ->willReturn(self::$websiteId);
+    }
+
+    /**
+     * Get mock object for quote entity.
+     *
+     * @param Address $address
+     * @return Quote
+     */
+    private function getQuote(Address $address): Quote
+    {
+        /** @var Quote|MockObject $quote */
+        $quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getCouponCode', 'getCustomerGroupId', 'getShippingAddress', 'getStoreId', 'getItemsQty',
+                    'getVirtualItemsQty'
+                ]
+            )
+            ->getMock();
+
+        $quote->method('getStoreId')
+            ->willReturn(self::$storeId);
+        $quote->method('getCustomerGroupId')
+            ->willReturn(self::$customerGroupId);
+        $quote->method('getCouponCode')
+            ->willReturn(self::$couponCode);
+        $quote->method('getShippingAddress')
+            ->willReturn($address);
+        $quote->method('getItemsQty')
+            ->willReturn(2);
+        $quote->method('getVirtualItemsQty')
+            ->willReturn(0);
+
+        return $quote;
+    }
+
+    /**
+     * Gets stub object for shipping address.
+     *
+     * @return Address|MockObject
+     */
+    private function getShippingAddress(): Address
+    {
+        /** @var Address|MockObject $address */
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['beforeSave'])
+            ->getMock();
+
+        return $address;
+    }
+
+    /**
+     * Gets stub object for quote item.
+     *
+     * @param Quote $quote
+     * @return Item
+     */
+    private function getItem(Quote $quote): Item
+    {
+        /** @var Item|MockObject $item */
+        $item = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getHasChildren'])
+            ->getMock();
+        $item->setQuote($quote);
+        $item->setNoDiscount(0);
+        $item->setParentItemId(0);
+        $item->method('getHasChildren')
+            ->willReturn(0);
+
+        return $item;
     }
 }
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php
index 2f6c5ca600bd3..683790c531265 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/RowParserTest.php
@@ -37,7 +37,7 @@ class RowParserTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->locationDirectoryMock = $this->getMockBuilder(LocationDirectory::class)
-            ->setMethods(['hasCountryId', 'getCountryId', 'hasRegionId', 'getRegionId'])
+            ->setMethods(['hasCountryId', 'getCountryId', 'hasRegionId', 'getRegionIds'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->columnResolverMock = $this->getMockBuilder(ColumnResolver::class)
@@ -92,7 +92,7 @@ public function testParse()
             $conditionShortName,
             $columnValueMap
         );
-        $this->assertEquals($expectedResult, $result);
+        $this->assertEquals([$expectedResult], $result);
     }
 
     /**
@@ -128,6 +128,9 @@ public function testParseWithException(array $rowData, $conditionFullName, array
         throw $exception;
     }
 
+    /**
+     * @return array
+     */
     public function parseWithExceptionDataProvider()
     {
         $rowData = ['a', 'b', 'c', 'd', 'e'];
@@ -143,7 +146,7 @@ public function parseWithExceptionDataProvider()
                     [$conditionFullName, $rowData, 40],
                     [ColumnResolver::COLUMN_PRICE, $rowData, 350],
                 ],
-                'Please correct Country "XX" in the Row #120.',
+                'The "XX" country in row number "120" is incorrect. Verify the country and try again.',
             ],
             [
                 $rowData,
@@ -155,7 +158,7 @@ public function parseWithExceptionDataProvider()
                     [$conditionFullName, $rowData, 40],
                     [ColumnResolver::COLUMN_PRICE, $rowData, 350],
                 ],
-                'Please correct Region/State "AA" in the Row #120.',
+                'The "AA" region or state in row number "120" is incorrect. Verify the region or state and try again.',
             ],
             [
                 $rowData,
@@ -179,7 +182,7 @@ public function parseWithExceptionDataProvider()
                     [$conditionFullName, $rowData, 40],
                     [ColumnResolver::COLUMN_PRICE, $rowData, 'BBB'],
                 ],
-                'Please correct Shipping Price "BBB" in the Row #120.',
+                'The "BBB" shipping price in row number "120" is incorrect. Verify the shipping price and try again.',
             ],
         ];
     }
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
index 14fa8129532fa..722683decb4c2 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
@@ -77,9 +77,6 @@ protected function setUp()
             ->getMock();
         $this->dataHashGeneratorMock = $this->getMockBuilder(DataHashGenerator::class)
             ->getMock();
-        $this->rowParserMock->expects($this->any())
-            ->method('parse')
-            ->willReturnArgument(0);
         $this->dataHashGeneratorMock->expects($this->any())
             ->method('getHash')
             ->willReturnCallback(
@@ -124,6 +121,15 @@ public function testGetData()
             ['a4', 'b4', 'c4', 'd4', 'e4'],
             ['a5', 'b5', 'c5', 'd5', 'e5'],
         ];
+        $this->rowParserMock->expects($this->any())
+            ->method('parse')
+            ->willReturn(
+                [['a1', 'b1', 'c1', 'd1', 'e1']],
+                [['a2', 'b2', 'c2', 'd2', 'e2']],
+                [['a3', 'b3', 'c3', 'd3', 'e3']],
+                [['a4', 'b4', 'c4', 'd4', 'e4']],
+                [['a5', 'b5', 'c5', 'd5', 'e5']]
+            );
         $file = $this->createFileMock($lines);
         $expectedResult = [
             [
@@ -167,6 +173,13 @@ public function testGetDataWithDuplicatedLine()
             [],
             ['a2', 'b2', 'c2', 'd2', 'e2'],
         ];
+        $this->rowParserMock->expects($this->any())
+            ->method('parse')
+            ->willReturn(
+                [['a1', 'b1', 'c1', 'd1', 'e1']],
+                [['a1', 'b1', 'c1', 'd1', 'e1']],
+                [['a2', 'b2', 'c2', 'd2', 'e2']]
+            );
         $file = $this->createFileMock($lines);
         $expectedResult = [
             [
@@ -193,7 +206,7 @@ public function testGetDataWithDuplicatedLine()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please correct Table Rates File Format.
+     * @expectedExceptionMessage The Table Rates File Format is incorrect. Verify the format and try again.
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function testGetDataFromEmptyFile()
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/SalesRule/CalculatorTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/SalesRule/CalculatorTest.php
index b13a46a8fcdf0..2a886f20c42a7 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/SalesRule/CalculatorTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/SalesRule/CalculatorTest.php
@@ -20,6 +20,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return bool
+     */
     public function testProcessFreeShipping()
     {
         $addressMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index d07f9303137c2..a3e1dad5de854 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -5,24 +5,23 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-sales-rule": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-checkout": "100.3.*",
-        "magento/module-offline-shipping-sample-data": "Sample Data version:100.3.*"
+        "magento/module-checkout": "*",
+        "magento/module-offline-shipping-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
index 306aac1769913..4db5f489aa4a2 100644
--- a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
+++ b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="carriers" translate="label" type="text" sortOrder="320" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="carriers" type="text" sortOrder="320" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="flatrate" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Flat Rate</label>
                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
diff --git a/app/code/Magento/OfflineShipping/etc/db_schema.xml b/app/code/Magento/OfflineShipping/etc/db_schema.xml
new file mode 100644
index 0000000000000..0510ce9b9b8eb
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/etc/db_schema.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="shipping_tablerate" resource="default" engine="innodb" comment="Shipping Tablerate">
+        <column xsi:type="int" name="pk" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Primary key"/>
+        <column xsi:type="int" name="website_id" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <column xsi:type="varchar" name="dest_country_id" nullable="false" length="4" default="0"
+                comment="Destination coutry ISO/2 or ISO/3 code"/>
+        <column xsi:type="int" name="dest_region_id" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Destination Region Id"/>
+        <column xsi:type="varchar" name="dest_zip" nullable="false" length="10" default="*"
+                comment="Destination Post Code (Zip)"/>
+        <column xsi:type="varchar" name="condition_name" nullable="false" length="20" comment="Rate Condition name"/>
+        <column xsi:type="decimal" name="condition_value" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Rate condition value"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <column xsi:type="decimal" name="cost" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Cost"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="pk"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="UNQ_D60821CDB2AFACEE1566CFC02D0D4CAA">
+            <column name="website_id"/>
+            <column name="dest_country_id"/>
+            <column name="dest_region_id"/>
+            <column name="dest_zip"/>
+            <column name="condition_name"/>
+            <column name="condition_value"/>
+        </constraint>
+    </table>
+    <table name="salesrule" resource="default" comment="Salesrule">
+        <column xsi:type="smallint" name="simple_free_shipping" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Simple Free Shipping"/>
+    </table>
+    <table name="sales_order_item" resource="sales" comment="Sales Flat Order Item">
+        <column xsi:type="smallint" name="free_shipping" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Free Shipping"/>
+    </table>
+    <table name="quote_address" resource="checkout" comment="Sales Flat Quote Address">
+        <column xsi:type="smallint" name="free_shipping" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Free Shipping"/>
+    </table>
+    <table name="quote_item" resource="checkout" comment="Sales Flat Quote Item">
+        <column xsi:type="smallint" name="free_shipping" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Free Shipping"/>
+    </table>
+    <table name="quote_address_item" resource="checkout" comment="Sales Flat Quote Address Item">
+        <column xsi:type="int" name="free_shipping" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Free Shipping"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/OfflineShipping/etc/db_schema_whitelist.json b/app/code/Magento/OfflineShipping/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..72da62b8159c6
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/etc/db_schema_whitelist.json
@@ -0,0 +1,44 @@
+{
+    "shipping_tablerate": {
+        "column": {
+            "pk": true,
+            "website_id": true,
+            "dest_country_id": true,
+            "dest_region_id": true,
+            "dest_zip": true,
+            "condition_name": true,
+            "condition_value": true,
+            "price": true,
+            "cost": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "UNQ_D60821CDB2AFACEE1566CFC02D0D4CAA": true
+        }
+    },
+    "salesrule": {
+        "column": {
+            "simple_free_shipping": true
+        }
+    },
+    "sales_order_item": {
+        "column": {
+            "free_shipping": true
+        }
+    },
+    "quote_address": {
+        "column": {
+            "free_shipping": true
+        }
+    },
+    "quote_item": {
+        "column": {
+            "free_shipping": true
+        }
+    },
+    "quote_address_item": {
+        "column": {
+            "free_shipping": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/OfflineShipping/etc/module.xml b/app/code/Magento/OfflineShipping/etc/module.xml
index 7df8c8cc0db75..c65f99d59c9c5 100644
--- a/app/code/Magento/OfflineShipping/etc/module.xml
+++ b/app/code/Magento/OfflineShipping/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_OfflineShipping" setup_version="2.0.1">
+    <module name="Magento_OfflineShipping" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Sales"/>
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 6debbdf3e728a..83db8c0dec3b1 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -113,7 +113,6 @@ public function __construct(
      *
      * @return int
      * @api
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function getType()
     {
@@ -125,7 +124,6 @@ public function getType()
      *
      * @return int
      * @api
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function getTtl()
     {
@@ -255,7 +253,6 @@ protected function _getDesignExceptions()
      *
      * @return bool
      * @api
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function isEnabled()
     {
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
new file mode 100644
index 0000000000000..e16584b0b17f8
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Model\System\Config\Backend;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Access List config field.
+ */
+class AccessList extends Varnish
+{
+    /**
+     * @inheritDoc
+     */
+    public function beforeSave()
+    {
+        parent::beforeSave();
+
+        $value = $this->getValue();
+        if (!is_string($value) || !preg_match('/^[\w\s\.\-\,\:]+$/', $value)) {
+            throw new LocalizedException(
+                new Phrase(
+                    'Access List value "%1" is not valid. '
+                    .'Please use only IP addresses and host names.',
+                    [$value]
+                )
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
index dab8d7be16dd7..d9d26d0848c24 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
@@ -6,6 +6,10 @@
 
 namespace Magento\PageCache\Model\System\Config\Backend;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Backend model for processing Public content cache lifetime settings
  *
@@ -13,6 +17,36 @@
  */
 class Ttl extends \Magento\Framework\App\Config\Value
 {
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * Ttl constructor.
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param ScopeConfigInterface $config
+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param array $data
+     * @param Escaper|null $escaper
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        ScopeConfigInterface $config,
+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
+        ?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        ?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = [],
+        ?Escaper $escaper = null
+    ) {
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->create(Escaper::class);
+    }
+
     /**
      * Throw exception if Ttl data is invalid or empty
      *
@@ -24,7 +58,10 @@ public function beforeSave()
         $value = $this->getValue();
         if ($value < 0 || !preg_match('/^[0-9]+$/', $value)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Ttl value "%1" is not valid. Please use only numbers equal or greater than zero.', $value)
+                __(
+                    'Ttl value "%1" is not valid. Please use only numbers equal or greater than zero.',
+                    $this->escaper->escapeHtml($value)
+                )
             );
         }
         return $this;
diff --git a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
deleted file mode 100644
index 4b51a9cf233a1..0000000000000
--- a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\PageCache\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-class RegisterFormKeyFromCookie implements ObserverInterface
-{
-    /**
-     * @var \Magento\Framework\App\PageCache\FormKey
-     */
-    private $cookieFormKey;
-
-    /**
-     * @var \Magento\Framework\Escaper
-     */
-    private $escaper;
-
-    /**
-     * @var \Magento\Framework\Data\Form\FormKey
-     */
-    private $sessionFormKey;
-
-    /**
-     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     */
-    private $cookieMetadataFactory;
-
-    /**
-     * @var \Magento\Framework\Session\Config\ConfigInterface
-     */
-    private $sessionConfig;
-
-    /**
-     * @param \Magento\Framework\App\PageCache\FormKey $formKey
-     * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\Data\Form\FormKey $sessionFormKey
-     * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
-     * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\PageCache\FormKey $formKey,
-        \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\Data\Form\FormKey $sessionFormKey,
-        \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
-        \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
-    ) {
-        $this->cookieFormKey = $formKey;
-        $this->escaper = $escaper;
-        $this->sessionFormKey = $sessionFormKey;
-        $this->cookieMetadataFactory = $cookieMetadataFactory;
-        $this->sessionConfig = $sessionConfig;
-    }
-
-    /**
-     * Register form key in session from cookie value
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        if ($this->cookieFormKey->get()) {
-            $this->updateCookieFormKey($this->cookieFormKey->get());
-
-            $this->sessionFormKey->set(
-                $this->escaper->escapeHtml($this->cookieFormKey->get())
-            );
-        }
-    }
-
-    /**
-     * @param string $formKey
-     * @return void
-     */
-    private function updateCookieFormKey($formKey)
-    {
-        $cookieMetadata = $this->cookieMetadataFactory
-            ->createPublicCookieMetadata();
-        $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
-        $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
-        $lifetime = $this->sessionConfig->getCookieLifetime();
-        if ($lifetime !== 0) {
-            $cookieMetadata->setDuration($lifetime);
-        }
-
-        $this->cookieFormKey->set(
-            $formKey,
-            $cookieMetadata
-        );
-    }
-}
diff --git a/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
new file mode 100644
index 0000000000000..6cdc500aaf33c
--- /dev/null
+++ b/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Plugin;
+
+use Magento\Framework\App\PageCache\FormKey as CacheFormKey;
+use Magento\Framework\Escaper;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Session\Config\ConfigInterface;
+
+/**
+ * Allow for registration of a form key through cookies.
+ */
+class RegisterFormKeyFromCookie
+{
+    /**
+     * @var CacheFormKey
+     */
+    private $cookieFormKey;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $sessionConfig;
+
+    /**
+     * @param CacheFormKey $formKey
+     * @param Escaper $escaper
+     * @param FormKey $formKey
+     * @param CookieMetadataFactory $cookieMetadataFactory
+     * @param ConfigInterface $sessionConfig
+     */
+    public function __construct(
+        CacheFormKey $cacheFormKey,
+        Escaper $escaper,
+        FormKey $formKey,
+        CookieMetadataFactory $cookieMetadataFactory,
+        ConfigInterface $sessionConfig
+    ) {
+        $this->cookieFormKey = $cacheFormKey;
+        $this->escaper = $escaper;
+        $this->formKey = $formKey;
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
+        $this->sessionConfig = $sessionConfig;
+    }
+
+    /**
+     * Set form key from the cookie.
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeDispatch(): void
+    {
+        if ($this->cookieFormKey->get()) {
+            $this->updateCookieFormKey($this->cookieFormKey->get());
+
+            $this->formKey->set(
+                $this->escaper->escapeHtml($this->cookieFormKey->get())
+            );
+        }
+    }
+
+    /**
+     * @param string $formKey
+     * @return void
+     */
+    private function updateCookieFormKey(string $formKey): void
+    {
+        $cookieMetadata = $this->cookieMetadataFactory
+            ->createPublicCookieMetadata();
+        $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
+        $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
+        $lifetime = $this->sessionConfig->getCookieLifetime();
+        if ($lifetime !== 0) {
+            $cookieMetadata->setDuration($lifetime);
+        }
+
+        $this->cookieFormKey->set(
+            $formKey,
+            $cookieMetadata
+        );
+    }
+}
diff --git a/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
new file mode 100644
index 0000000000000..510dfc3554ce5
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+         /**
+          * Copyright © Magento, Inc. All rights reserved.
+          * See COPYING.txt for license details.
+          */
+        -->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ClearCacheActionGroup">
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToNewCustomVarialePage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminCacheManagementSection.FlushMagentoCache}}" stepKey="clickFlushMagentoCache" />
+        <waitForPageLoad stepKey="waitForCacheFlush"/>
+    </actionGroup>
+    <actionGroup name="clearPageCache">
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="amOnCacheManagementPage"/>
+        <waitForPageLoad stepKey="waitForCacheManagement"/>
+        <selectOption selector="{{AdminCacheManagementSection.massActionSelect}}" userInput="refresh" stepKey="selectRefresh"/>
+        <click selector="{{AdminCacheManagementSection.pageCacheCheckbox}}" stepKey="selectPageCache"/>
+        <click selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="submitCacheForm"/>
+        <waitForPageLoad stepKey="waitForCacheFlush"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
new file mode 100644
index 0000000000000..35d5234e47c3a
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ClearPageCacheActionGroup">
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToCacheManagementPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminCacheManagementSection.actionDropDown}}" stepKey="actionSelection"/>
+        <click selector="{{AdminCacheManagementSection.refreshOption}}" stepKey="selectRefreshOption"/>
+        <click selector="{{AdminCacheManagementSection.pageCacheRowCheckbox}}" stepKey="selectPageCacheRowCheckbox"/>
+        <click selector="{{AdminCacheManagementSection.submit}}" stepKey="clickSubmit"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE.txt b/app/code/Magento/PageCache/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE.txt
rename to app/code/Magento/PageCache/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE_AFL.txt b/app/code/Magento/PageCache/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/PageCache/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml b/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml
new file mode 100644
index 0000000000000..24fc5ffb04cb7
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCacheManagementPage" url="/admin/cache" area="admin" module="PageCache">
+        <section name="AdminCacheManagementSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/PageCache/Test/Mftf/README.md b/app/code/Magento/PageCache/Test/Mftf/README.md
new file mode 100644
index 0000000000000..01c6ae4e4f483
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Page Cache Functional Tests
+
+The Functional Test Module for **Magento Page Cache** module.
diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
new file mode 100644
index 0000000000000..34a77095d524d
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCacheManagementSection">
+        <element name="FlushMagentoCache" type="button" selector="#flush_magento"/>
+        <element name="actionDropDown" type="multiselect" selector="//*[@id='cache_grid_massaction-select']//option[contains(., 'Action')]" timeout="30"/>
+        <element name="refreshOption" type="multiselect" selector="//*[@id='cache_grid_massaction-select']//option[@value='refresh']" timeout="30"/>
+        <element name="pageCacheRowCheckbox" type="checkbox" selector="//td[contains(., 'Page Cache')]/..//input[@type='checkbox']"/>
+        <element name="submit" type="button" selector="//button[@title='Submit']" timeout="30"/>
+        <element name="massActionSelect" type="select" selector="#cache_grid_massaction-form #cache_grid_massaction-select"/>
+        <element name="massActionSubmit" type="button" selector="#cache_grid_massaction-form button"/>
+        <element name="configurationCheckbox" type="checkbox" selector="input[value='config']"/>
+        <element name="layoutsCheckbox" type="checkbox" selector="input[value='layout']"/>
+        <element name="blocksHtmlCheckbox" type="checkbox" selector="input[value='block_html']"/>
+        <element name="collectionsDataCheckbox" type="checkbox" selector="input[value='collections']"/>
+        <element name="reflectionDataCheckbox" type="checkbox" selector="input[value='reflection']"/>
+        <element name="databaseDdlCheckbox" type="checkbox" selector="input[value='db_ddl']"/>
+        <element name="compiledConfigCheckbox" type="checkbox" selector="input[value='compiled_config']"/>
+        <element name="eavTypesAndAttrsCheckbox" type="checkbox" selector="input[value='eav']"/>
+        <element name="customerNotificationCheckbox" type="checkbox" selector="input[value='customer_notification']"/>
+        <element name="integrationsConfigCheckbox" type="checkbox" selector="input[value='config_integration']"/>
+        <element name="integrationsApiCheckbox" type="checkbox" selector="input[value='config_integration_api']"/>
+        <element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
+        <element name="webServicesConfigCheckbox" type="checkbox" selector="input[value='config_webservice']"/>
+        <element name="translationsCheckbox" type="checkbox" selector="input[value='translate']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
new file mode 100644
index 0000000000000..c5871ddc3a373
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NewProductsListWidgetSimpleProductTest">
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+    </test>
+    <test name="NewProductsListWidgetConfigurableProductTest">
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+    </test>
+    <test name="NewProductsListWidgetGroupedProductTest">
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+    </test>
+    <test name="NewProductsListWidgetVirtualProductTest">
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+    </test>
+    <test name="NewProductsListWidgetBundleProductTest">
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+    </test>
+    <test name="NewProductsListWidgetDownloadableProductTest">
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php b/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
index a1c66c67b5524..42a9086daa442 100644
--- a/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
@@ -130,6 +130,9 @@ public function testGetScriptOptions($isSecure, $url, $expectedResult)
         $this->assertRegExp($expectedResult, $this->blockJavascript->getScriptOptions());
     }
 
+    /**
+     * @return array
+     */
     public function getScriptOptionsDataProvider()
     {
         return [
@@ -193,6 +196,9 @@ public function testGetScriptOptionsPrivateContent($url, $route, $controller, $a
         $this->assertRegExp($expectedResult, $this->blockJavascript->getScriptOptions());
     }
 
+    /**
+     * @return array
+     */
     public function getScriptOptionsPrivateContentDataProvider()
     {
         // @codingStandardsIgnoreStart
diff --git a/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php b/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php
index 387b3d031b70e..32964a3564999 100644
--- a/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php
@@ -143,6 +143,9 @@ public function testExecute($blockClass, $shouldSetHeaders)
         $this->action->execute();
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php
index 2811cb5316dc6..db0edfa6bd779 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php
@@ -226,6 +226,9 @@ public function testAroundDispatchDisabled($state)
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/App/PageCachePluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/App/PageCachePluginTest.php
index 033eb2501865b..2e69fdaf47910 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/App/PageCachePluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/App/PageCachePluginTest.php
@@ -57,6 +57,9 @@ public function testAfterSaveDecompression($data, $initResult)
         $this->assertSame($data, $this->plugin->afterLoad($this->subjectMock, $initResult));
     }
 
+    /**
+     * @return array
+     */
     public function afterSaveDataProvider()
     {
         return [
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php
index c9231f118fc75..59591c8ee957f 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php
@@ -26,6 +26,9 @@ public function testBeforeSendResponse($responseInstanceClass, $sendVaryCalled)
         $plugin->beforeSendResponse($responseMock);
     }
 
+    /**
+     * @return array
+     */
     public function beforeSendResponseDataProvider()
     {
         return [
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php
index 2321a951aafe8..a57effe1f31ad 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php
@@ -90,6 +90,9 @@ public function testGetUris(
         $this->assertEquals($uris, $this->model->getUris());
     }
 
+    /**
+     * @return array
+     */
     public function getUrisDataProvider()
     {
         return [
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
index 8c04db7cb8390..6c39fe1e7979c 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
@@ -70,6 +70,9 @@ public function testAfterGenerateXml($cacheState, $layoutIsCacheable)
         $this->assertSame($result, $output);
     }
 
+    /**
+     * @return array
+     */
     public function afterGenerateXmlDataProvider()
     {
         return [
@@ -112,6 +115,9 @@ public function testAfterGetOutput($cacheState, $layoutIsCacheable, $expectedTag
         $this->assertSame($output, $html);
     }
 
+    /**
+     * @return array
+     */
     public function afterGetOutputDataProvider()
     {
         $tags = 'identity1,identity2';
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php
new file mode 100644
index 0000000000000..e84b412beb8a5
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Test\Unit\Model\System\Config\Backend;
+
+use Magento\PageCache\Model\System\Config\Backend\AccessList;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class AccessListTest extends TestCase
+{
+    /**
+     * @var AccessList
+     */
+    private $accessList;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $configMock = $this->getMockForAbstractClass(
+            ScopeConfigInterface::class
+        );
+        $configMock->expects($this->any())
+            ->method('getValue')
+            ->with('system/full_page_cache/default')
+            ->willReturn(['access_list' => 'localhost']);
+        $this->accessList = $objectManager->getObject(
+            AccessList::class,
+            [
+                'config' => $configMock,
+                'data' => ['field' => 'access_list']
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getValidValues(): array
+    {
+        return [
+            ['localhost', 'localhost'],
+            [null, 'localhost'],
+            ['127.0.0.1', '127.0.0.1'],
+            ['127.0.0.1, localhost, ::2', '127.0.0.1, localhost, ::2'],
+        ];
+    }
+
+    /**
+     * @param mixed $value
+     * @param mixed $expectedValue
+     * @dataProvider getValidValues
+     */
+    public function testBeforeSave($value, $expectedValue)
+    {
+        $this->accessList->setValue($value);
+        $this->accessList->beforeSave();
+        $this->assertEquals($expectedValue, $this->accessList->getValue());
+    }
+
+    /**
+     * @return array
+     */
+    public function getInvalidValues(): array
+    {
+        return [
+            ['\\bull val\\'],
+            ['{*I am not an IP*}'],
+            ['{*I am not an IP*}, 127.0.0.1'],
+        ];
+    }
+
+    /**
+     * @param mixed $value
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @dataProvider getInvalidValues
+     */
+    public function testBeforeSaveInvalid($value)
+    {
+        $this->accessList->setValue($value);
+        $this->accessList->beforeSave();
+    }
+}
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php
index 924c30439fddd..8019c6b2e810f 100644
--- a/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php
@@ -81,6 +81,9 @@ public function testExecute($cacheState)
         $this->assertNull($result);
     }
 
+    /**
+     * @return array
+     */
     public function flushCacheByTagsDataProvider()
     {
         return [
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/RegisterFormKeyFromCookieTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/RegisterFormKeyFromCookieTest.php
deleted file mode 100644
index 7bdea2e427c0b..0000000000000
--- a/app/code/Magento/PageCache/Test/Unit/Observer/RegisterFormKeyFromCookieTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\PageCache\Test\Unit\Observer;
-
-use Magento\Framework\App\PageCache\FormKey;
-use Magento\Framework\Escaper;
-use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
-use Magento\PageCache\Observer\RegisterFormKeyFromCookie;
-
-class RegisterFormKeyFromCookieTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var RegisterFormKeyFromCookie */
-    protected $observer;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject|FormKey */
-    protected $cookieFormKey;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Data\Form\FormKey */
-    protected $sessionFormKey;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|CookieMetadataFactory
-     */
-    protected $cookieMetadataFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ConfigInterface
-     */
-    protected $sessionConfig;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Escaper */
-    protected $escaper;
-
-    /**
-     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject|
-     */
-    protected $observerMock;
-
-    /**
-     * Set up all mocks and data for test
-     */
-    protected function setUp()
-    {
-        $this->cookieFormKey = $this->getMockBuilder(
-            \Magento\Framework\App\PageCache\FormKey::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->escaper = $this->getMockBuilder(
-            \Magento\Framework\Escaper::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sessionFormKey = $this->getMockBuilder(
-            \Magento\Framework\Data\Form\FormKey::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->cookieMetadataFactory = $this->getMockBuilder(
-            \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sessionConfig = $this->createMock(
-            \Magento\Framework\Session\Config\ConfigInterface::class
-        );
-
-        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
-
-        $this->observer = new RegisterFormKeyFromCookie(
-            $this->cookieFormKey,
-            $this->escaper,
-            $this->sessionFormKey,
-            $this->cookieMetadataFactory,
-            $this->sessionConfig
-        );
-    }
-
-    public function testExecuteNoCookie()
-    {
-        $this->cookieFormKey->expects(static::once())
-            ->method('get')
-            ->willReturn(null);
-        $this->cookieFormKey->expects(static::never())
-            ->method('set');
-        $this->sessionFormKey->expects(static::never())
-            ->method('set');
-
-        $this->observer->execute($this->observerMock);
-    }
-
-    public function testExecute()
-    {
-        $formKey = 'form_key';
-        $escapedFormKey = 'escaped_form_key';
-        $cookieDomain = 'example.com';
-        $cookiePath = '/';
-        $cookieLifetime = 3600;
-
-        $cookieMetadata = $this->getMockBuilder(
-            \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->cookieFormKey->expects(static::any())
-            ->method('get')
-            ->willReturn($formKey);
-        $this->cookieMetadataFactory->expects(static::once())
-            ->method('createPublicCookieMetadata')
-            ->willReturn(
-                $cookieMetadata
-            );
-
-        $this->sessionConfig->expects(static::once())
-            ->method('getCookieDomain')
-            ->willReturn(
-                $cookieDomain
-            );
-        $cookieMetadata->expects(static::once())
-            ->method('setDomain')
-            ->with(
-                $cookieDomain
-            );
-        $this->sessionConfig->expects(static::once())
-            ->method('getCookiePath')
-            ->willReturn(
-                $cookiePath
-            );
-        $cookieMetadata->expects(static::once())
-            ->method('setPath')
-            ->with(
-                $cookiePath
-            );
-        $this->sessionConfig->expects(static::once())
-            ->method('getCookieLifetime')
-            ->willReturn(
-                $cookieLifetime
-            );
-        $cookieMetadata->expects(static::once())
-            ->method('setDuration')
-            ->with(
-                $cookieLifetime
-            );
-
-        $this->cookieFormKey->expects(static::once())
-            ->method('set')
-            ->with(
-                $formKey,
-                $cookieMetadata
-            );
-
-        $this->escaper->expects(static::once())
-            ->method('escapeHtml')
-            ->with($formKey)
-            ->willReturn($escapedFormKey);
-
-        $this->sessionFormKey->expects(static::once())
-            ->method('set')
-            ->with($escapedFormKey);
-
-        $this->observer->execute($this->observerMock);
-    }
-}
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index c4232235f5dab..56385fcc528de 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PageCache/etc/adminhtml/system.xml b/app/code/Magento/PageCache/etc/adminhtml/system.xml
index 1d6c0d890737b..2a4439ac6a9cf 100644
--- a/app/code/Magento/PageCache/etc/adminhtml/system.xml
+++ b/app/code/Magento/PageCache/etc/adminhtml/system.xml
@@ -20,7 +20,7 @@
                         <label>Access list</label>
                         <comment>IPs access list separated with ',' that can purge Varnish configuration for config file generation.
                             If field is empty default value localhost will be saved.</comment>
-                        <backend_model>Magento\PageCache\Model\System\Config\Backend\Varnish</backend_model>
+                        <backend_model>Magento\PageCache\Model\System\Config\Backend\AccessList</backend_model>
                         <depends>
                             <field id="caching_application">1</field>
                         </depends>
@@ -49,7 +49,7 @@
                             <field id="caching_application">1</field>
                         </depends>
                     </field>
-                    <field id="export_button_version4" type="button" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <field id="export_button_version4" translate="label" type="button" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
                         <label>Export Configuration</label>
                         <frontend_model>Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4</frontend_model>
                         <depends>
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
index 2a9abbb860805..adf9526fc1108 100644
--- a/app/code/Magento/PageCache/etc/di.xml
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -37,6 +37,9 @@
             <argument name="layoutCacheKey" xsi:type="object">Magento\Framework\View\Layout\LayoutCacheKeyInterface</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
+    </type>
     <preference for="Magento\PageCache\Model\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
     <preference for="Magento\PageCache\Model\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
 </config>
diff --git a/app/code/Magento/PageCache/etc/frontend/events.xml b/app/code/Magento/PageCache/etc/frontend/events.xml
deleted file mode 100644
index ce2c1c823e835..0000000000000
--- a/app/code/Magento/PageCache/etc/frontend/events.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="controller_action_predispatch">
-        <observer name="register_form_key" instance="Magento\PageCache\Observer\RegisterFormKeyFromCookie" />
-    </event>
-</config>
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
index 53420ac17d93e..17e83e7cff7d4 100644
--- a/app/code/Magento/PageCache/etc/module.xml
+++ b/app/code/Magento/PageCache/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_PageCache" setup_version="2.0.0">
+    <module name="Magento_PageCache" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index 3e8acfba18762..8068447e5ca99 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -86,7 +86,7 @@ sub vcl_recv {
         } elsif (req.http.Accept-Encoding ~ "deflate" && req.http.user-agent !~ "MSIE") {
             set req.http.Accept-Encoding = "deflate";
         } else {
-            # unkown algorithm
+            # unknown algorithm
             unset req.http.Accept-Encoding;
         }
     }
@@ -141,6 +141,10 @@ sub vcl_backend_response {
         set beresp.do_gzip = true;
     }
 
+    if (beresp.http.X-Magento-Debug) {
+        set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
+    }
+
     # cache only successfully responses and 404s
     if (beresp.status != 200 && beresp.status != 404) {
         set beresp.ttl = 0s;
@@ -152,10 +156,6 @@ sub vcl_backend_response {
         return (deliver);
     }
 
-    if (beresp.http.X-Magento-Debug) {
-        set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
-    }
-
     # validate if we need to cache it and prevent from setting cookie
     if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
         unset beresp.http.set-cookie;
@@ -163,12 +163,15 @@ sub vcl_backend_response {
 
    # If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass
    if (beresp.ttl <= 0s ||
-        beresp.http.Surrogate-control ~ "no-store" ||
-        (!beresp.http.Surrogate-Control && beresp.http.Vary == "*")) {
-        # Mark as Hit-For-Pass for the next 2 minutes
+       beresp.http.Surrogate-control ~ "no-store" ||
+       (!beresp.http.Surrogate-Control &&
+       beresp.http.Cache-Control ~ "no-cache|no-store") ||
+       beresp.http.Vary == "*") {
+       # Mark as Hit-For-Pass for the next 2 minutes
         set beresp.ttl = 120s;
         set beresp.uncacheable = true;
     }
+
     return (deliver);
 }
 
@@ -184,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 c060090aa91ed..6c8414a5cb641 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -87,7 +87,7 @@ sub vcl_recv {
         } elsif (req.http.Accept-Encoding ~ "deflate" && req.http.user-agent !~ "MSIE") {
             set req.http.Accept-Encoding = "deflate";
         } else {
-            # unkown algorithm
+            # unknown algorithm
             unset req.http.Accept-Encoding;
         }
     }
@@ -142,6 +142,10 @@ sub vcl_backend_response {
         set beresp.do_gzip = true;
     }
 
+    if (beresp.http.X-Magento-Debug) {
+        set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
+    }
+
     # cache only successfully responses and 404s
     if (beresp.status != 200 && beresp.status != 404) {
         set beresp.ttl = 0s;
@@ -153,10 +157,6 @@ sub vcl_backend_response {
         return (deliver);
     }
 
-    if (beresp.http.X-Magento-Debug) {
-        set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
-    }
-
     # validate if we need to cache it and prevent from setting cookie
     if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
         unset beresp.http.set-cookie;
@@ -164,12 +164,15 @@ sub vcl_backend_response {
 
    # If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass
    if (beresp.ttl <= 0s ||
-        beresp.http.Surrogate-control ~ "no-store" ||
-        (!beresp.http.Surrogate-Control && beresp.http.Vary == "*")) {
+       beresp.http.Surrogate-control ~ "no-store" ||
+       (!beresp.http.Surrogate-Control &&
+       beresp.http.Cache-Control ~ "no-cache|no-store") ||
+       beresp.http.Vary == "*") {
         # Mark as Hit-For-Pass for the next 2 minutes
         set beresp.ttl = 120s;
         set beresp.uncacheable = true;
     }
+
     return (deliver);
 }
 
@@ -185,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/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
index fccc8510ffc70..2e8a4769be10b 100644
--- a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
+++ b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
@@ -6,9 +6,10 @@
 define([
     'jquery',
     'domReady',
+    'consoleLogger',
     'jquery/ui',
     'mage/cookies'
-], function ($, domReady) {
+], function ($, domReady, consoleLogger) {
     'use strict';
 
     /**
@@ -35,7 +36,9 @@ define([
      * @returns {Array}
      */
     $.fn.comments = function () {
-        var elements = [];
+        var elements = [],
+            contents,
+            elementContents;
 
         /**
          * @param {jQuery} element - Comment holder
@@ -46,14 +49,35 @@ define([
             // prevent cross origin iframe content reading
             if ($(element).prop('tagName') === 'IFRAME') {
                 iframeHostName = $('<a>').prop('href', $(element).prop('src'))
-                                             .prop('hostname');
+                    .prop('hostname');
 
                 if (window.location.hostname !== iframeHostName) {
                     return [];
                 }
             }
 
-            $(element).contents().each(function (index, el) {
+            /**
+             * Rewrite jQuery contents().
+             *
+             * @param {jQuery} elem
+             */
+            contents = function (elem) {
+                return $.map(elem, function (el) {
+                    try {
+                        return $.nodeName(el, 'iframe') ?
+                            el.contentDocument || (el.contentWindow ? el.contentWindow.document : []) :
+                            $.merge([], el.childNodes);
+                    } catch (e) {
+                        consoleLogger.error(e);
+
+                        return [];
+                    }
+                });
+            };
+
+            elementContents = contents($(element));
+
+            $.each(elementContents, function (index, el) {
                 switch (el.nodeType) {
                     case 1: // ELEMENT_NODE
                         lookup(el);
diff --git a/app/code/Magento/Payment/Block/Info.php b/app/code/Magento/Payment/Block/Info.php
index e18e60f624cae..d9605e20bbdb5 100644
--- a/app/code/Magento/Payment/Block/Info.php
+++ b/app/code/Magento/Payment/Block/Info.php
@@ -6,7 +6,7 @@
 namespace Magento\Payment\Block;
 
 /**
- * Base payment iformation block
+ * Base payment information block
  *
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index e3c74e020f8f6..687c6b54a2f4f 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -23,7 +23,7 @@ class Instructions extends \Magento\Payment\Block\Info
     /**
      * @var string
      */
-    protected $_template = 'info/instructions.phtml';
+    protected $_template = 'Magento_Payment::info/instructions.phtml';
 
     /**
      * Get instructions text from order payment
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandManagerPool.php b/app/code/Magento/Payment/Gateway/Command/CommandManagerPool.php
index b1de33b6dad7b..6561fd42dc3c5 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandManagerPool.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandManagerPool.php
@@ -50,7 +50,7 @@ public function get($paymentProviderCode)
     {
         if (!isset($this->executors[$paymentProviderCode])) {
             throw new NotFoundException(
-                __('Command Executor for %1 is not defined.', $paymentProviderCode)
+                __('The "%1" command executor isn\'t defined. Verify the executor and try again.', $paymentProviderCode)
             );
         }
 
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandPool.php b/app/code/Magento/Payment/Gateway/Command/CommandPool.php
index f866914463d4d..9c90147b2850d 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandPool.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandPool.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Payment\Gateway\Command;
 
 use Magento\Framework\ObjectManager\TMap;
@@ -48,7 +49,9 @@ public function __construct(
     public function get($commandCode)
     {
         if (!isset($this->commands[$commandCode])) {
-            throw new NotFoundException(__('Command %1 does not exist.', $commandCode));
+            throw new NotFoundException(
+                __('The "%1" command doesn\'t exist. Verify the command and try again.', $commandCode)
+            );
         }
 
         return $this->commands[$commandCode];
diff --git a/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php b/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php
index a6f9d4383918c..2ba3034072a52 100644
--- a/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php
+++ b/app/code/Magento/Payment/Gateway/Command/GatewayCommand.php
@@ -5,14 +5,15 @@
  */
 namespace Magento\Payment\Gateway\Command;
 
-use Magento\Framework\Phrase;
 use Magento\Payment\Gateway\CommandInterface;
+use Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapperInterface;
+use Magento\Payment\Gateway\Http\ClientException;
 use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\ConverterException;
 use Magento\Payment\Gateway\Http\TransferFactoryInterface;
-use Magento\Payment\Gateway\Request;
 use Magento\Payment\Gateway\Request\BuilderInterface;
-use Magento\Payment\Gateway\Response;
 use Magento\Payment\Gateway\Response\HandlerInterface;
+use Magento\Payment\Gateway\Validator\ResultInterface;
 use Magento\Payment\Gateway\Validator\ValidatorInterface;
 use Psr\Log\LoggerInterface;
 
@@ -54,6 +55,11 @@ class GatewayCommand implements CommandInterface
      */
     private $logger;
 
+    /**
+     * @var ErrorMessageMapperInterface
+     */
+    private $errorMessageMapper;
+
     /**
      * @param BuilderInterface $requestBuilder
      * @param TransferFactoryInterface $transferFactory
@@ -61,6 +67,7 @@ class GatewayCommand implements CommandInterface
      * @param LoggerInterface $logger
      * @param HandlerInterface $handler
      * @param ValidatorInterface $validator
+     * @param ErrorMessageMapperInterface|null $errorMessageMapper
      */
     public function __construct(
         BuilderInterface $requestBuilder,
@@ -68,7 +75,8 @@ public function __construct(
         ClientInterface $client,
         LoggerInterface $logger,
         HandlerInterface $handler = null,
-        ValidatorInterface $validator = null
+        ValidatorInterface $validator = null,
+        ErrorMessageMapperInterface $errorMessageMapper = null
     ) {
         $this->requestBuilder = $requestBuilder;
         $this->transferFactory = $transferFactory;
@@ -76,6 +84,7 @@ public function __construct(
         $this->handler = $handler;
         $this->validator = $validator;
         $this->logger = $logger;
+        $this->errorMessageMapper = $errorMessageMapper;
     }
 
     /**
@@ -84,6 +93,8 @@ public function __construct(
      * @param array $commandSubject
      * @return void
      * @throws CommandException
+     * @throws ClientException
+     * @throws ConverterException
      */
     public function execute(array $commandSubject)
     {
@@ -98,10 +109,7 @@ public function execute(array $commandSubject)
                 array_merge($commandSubject, ['response' => $response])
             );
             if (!$result->isValid()) {
-                $this->logExceptions($result->getFailsDescription());
-                throw new CommandException(
-                    __('Transaction has been declined. Please try again later.')
-                );
+                $this->processErrors($result);
             }
         }
 
@@ -114,13 +122,34 @@ public function execute(array $commandSubject)
     }
 
     /**
-     * @param Phrase[] $fails
-     * @return void
+     * Tries to map error messages from validation result and logs processed message.
+     * Throws an exception with mapped message or default error.
+     *
+     * @param ResultInterface $result
+     * @throws CommandException
      */
-    private function logExceptions(array $fails)
+    private function processErrors(ResultInterface $result)
     {
-        foreach ($fails as $failPhrase) {
-            $this->logger->critical((string) $failPhrase);
+        $messages = [];
+        $errorsSource = array_merge($result->getErrorCodes(), $result->getFailsDescription());
+        foreach ($errorsSource as $errorCodeOrMessage) {
+            $errorCodeOrMessage = (string) $errorCodeOrMessage;
+
+            // error messages mapper can be not configured if payment method doesn't have custom error messages.
+            if ($this->errorMessageMapper !== null) {
+                $mapped = (string) $this->errorMessageMapper->getMessage($errorCodeOrMessage);
+                if (!empty($mapped)) {
+                    $messages[] = $mapped;
+                    $errorCodeOrMessage = $mapped;
+                }
+            }
+            $this->logger->critical('Payment Error: ' . $errorCodeOrMessage);
         }
+
+        throw new CommandException(
+            !empty($messages)
+                ? __(implode(PHP_EOL, $messages))
+                : __('Transaction has been declined. Please try again later.')
+        );
     }
 }
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php
new file mode 100644
index 0000000000000..2072615a39b92
--- /dev/null
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Gateway\ErrorMapper;
+
+use Magento\Framework\Config\DataInterface;
+
+/**
+ * This class can be used for payment integrations which can validate different type of
+ * error messages per one request.
+ * For example, during authorization payment operation the payment integration can validate error messages
+ * related to credit card details and customer address data.
+ * In that case, this implementation can be extended via di.xml and configured with appropriate mappers.
+ *
+ * @api
+ */
+class ErrorMessageMapper implements ErrorMessageMapperInterface
+{
+    /**
+     * @var DataInterface
+     */
+    private $messageMapping;
+
+    /**
+     * @param DataInterface $messageMapping
+     */
+    public function __construct(DataInterface $messageMapping)
+    {
+        $this->messageMapping = $messageMapping;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMessage(string $code)
+    {
+        $message = $this->messageMapping->get($code);
+        return $message ? __($message) : null;
+    }
+}
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php
new file mode 100644
index 0000000000000..f09f49b7f8100
--- /dev/null
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Gateway\ErrorMapper;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Interface to provide customization for payment validation errors.
+ *
+ * @api
+ */
+interface ErrorMessageMapperInterface
+{
+    /**
+     * Returns customized error message by provided code.
+     * If message not found `null` will be returned.
+     *
+     * @param string $code
+     * @return Phrase|null
+     */
+    public function getMessage(string $code);
+}
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/MappingData.php b/app/code/Magento/Payment/Gateway/ErrorMapper/MappingData.php
new file mode 100644
index 0000000000000..34b11be752469
--- /dev/null
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/MappingData.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Gateway\ErrorMapper;
+
+use Magento\Framework\Config\Data\Scoped;
+
+/**
+ * Extends Scoped class to override `_scopePriorityScheme` property.
+ * It allows to load and merge config files from `global` scope and current scope to a single structure.
+ */
+class MappingData extends Scoped
+{
+    /**
+     * @inheritdoc
+     */
+    protected $_scopePriorityScheme = ['global'];
+}
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/NullMappingData.php b/app/code/Magento/Payment/Gateway/ErrorMapper/NullMappingData.php
new file mode 100644
index 0000000000000..a226c4fc89157
--- /dev/null
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/NullMappingData.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Gateway\ErrorMapper;
+
+use Magento\Framework\Config\DataInterface;
+
+/**
+ * Stub implementation of DataInterface which is used by default for ErrorMessageMapper, because
+ * each payment method should provide own mapping data source.
+ */
+class NullMappingData implements DataInterface
+{
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function get($path = null, $default = null)
+    {
+        return null;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function merge(array $config)
+    {
+    }
+}
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/XmlToArrayConverter.php b/app/code/Magento/Payment/Gateway/ErrorMapper/XmlToArrayConverter.php
new file mode 100644
index 0000000000000..aa263ccd3641b
--- /dev/null
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/XmlToArrayConverter.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Gateway\ErrorMapper;
+
+use Magento\Framework\Config\ConverterInterface;
+
+/**
+ * Reads xml in `<message code="code">message</message>` format and converts it to [code => message] array format.
+ */
+class XmlToArrayConverter implements ConverterInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function convert($source)
+    {
+        $result = [];
+        $messageList = $source->getElementsByTagName('message');
+        foreach ($messageList as $messageNode) {
+            $result[(string) $messageNode->getAttribute('code')] = (string) $messageNode->nodeValue;
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php b/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php
index 82b6e8de8b068..e10d3e6693751 100644
--- a/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php
+++ b/app/code/Magento/Payment/Gateway/Http/Converter/HtmlFormConverter.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Payment\Gateway\Http\Converter;
 
 use Magento\Payment\Gateway\Http\ConverterException;
@@ -29,7 +30,9 @@ public function convert($response)
 
         libxml_use_internal_errors(true);
         if (!$document->loadHTML($response)) {
-            throw new ConverterException(__('Wrong gateway response format.'));
+            throw new ConverterException(
+                __('The gateway response format was incorrect. Verify the format and try again.')
+            );
         }
         libxml_use_internal_errors(false);
 
diff --git a/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php b/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
index 45c6d61baeee6..f1a8950514152 100644
--- a/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
+++ b/app/code/Magento/Payment/Gateway/Validator/AbstractValidator.php
@@ -32,14 +32,16 @@ public function __construct(
      *
      * @param bool $isValid
      * @param array $fails
-     * @return ResultInterface
+     * @param array $errorCodes
+     * @return void
      */
-    protected function createResult($isValid, array $fails = [])
+    protected function createResult($isValid, array $fails = [], array $errorCodes = [])
     {
         return $this->resultInterfaceFactory->create(
             [
                 'isValid' => (bool)$isValid,
-                'failsDescription' => $fails
+                'failsDescription' => $fails,
+                'errorCodes' => $errorCodes
             ]
         );
     }
diff --git a/app/code/Magento/Payment/Gateway/Validator/Result.php b/app/code/Magento/Payment/Gateway/Validator/Result.php
index 7266e4745d633..2567414473045 100644
--- a/app/code/Magento/Payment/Gateway/Validator/Result.php
+++ b/app/code/Magento/Payment/Gateway/Validator/Result.php
@@ -19,35 +19,47 @@ class Result implements ResultInterface
      */
     private $failsDescription;
 
+    /**
+     * @var string[]
+     */
+    private $errorCodes;
+
     /**
      * @param bool $isValid
      * @param array $failsDescription
+     * @param array $errorCodes
      */
     public function __construct(
         $isValid,
-        array $failsDescription = []
+        array $failsDescription = [],
+        array $errorCodes = []
     ) {
         $this->isValid = (bool)$isValid;
         $this->failsDescription = $failsDescription;
+        $this->errorCodes = $errorCodes;
     }
 
     /**
-     * Returns validation result
-     *
-     * @return bool
+     * {@inheritdoc}
      */
-    public function isValid()
+    public function isValid(): bool
     {
         return $this->isValid;
     }
 
     /**
-     * Returns list of fails description
-     *
-     * @return Phrase[]
+     * {@inheritdoc}
      */
-    public function getFailsDescription()
+    public function getFailsDescription(): array
     {
         return $this->failsDescription;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getErrorCodes(): array
+    {
+        return $this->errorCodes;
+    }
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php b/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
index 9c93efe73f344..c1ad947e49c5b 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
@@ -28,4 +28,11 @@ public function isValid();
      * @return Phrase[]
      */
     public function getFailsDescription();
+
+    /**
+     * Returns list of error codes.
+     *
+     * @return string[]
+     */
+    public function getErrorCodes();
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
index 91503734277f3..3a6c65a7145a1 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Payment\Gateway\Validator;
 
 use Magento\Framework\Exception\NotFoundException;
@@ -48,7 +49,7 @@ public function __construct(
     public function get($code)
     {
         if (!isset($this->validators[$code])) {
-            throw new NotFoundException(__('Validator for field %1 does not exist.', $code));
+            throw new NotFoundException(__('The validator for the "%1" field doesn\'t exist.', $code));
         }
 
         return $this->validators[$code];
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index e3122913d5dfa..0a4990313fa82 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -151,15 +151,7 @@ public function getStoreMethods($store = null, $quote = null)
         @uasort(
             $res,
             function (MethodInterface $a, MethodInterface $b) {
-                if ((int)$a->getConfigData('sort_order') < (int)$b->getConfigData('sort_order')) {
-                    return -1;
-                }
-
-                if ((int)$a->getConfigData('sort_order') > (int)$b->getConfigData('sort_order')) {
-                    return 1;
-                }
-
-                return 0;
+                return (int)$a->getConfigData('sort_order') <=> (int)$b->getConfigData('sort_order');
             }
         );
 
@@ -293,6 +285,9 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
             foreach ($methods as $code => $title) {
                 if (isset($groups[$code])) {
                     $labelValues[$code]['label'] = $title;
+                    if (!isset($labelValues[$code]['value'])) {
+                        $labelValues[$code]['value'] = null;
+                    }
                 } elseif (isset($groupRelations[$code])) {
                     unset($labelValues[$code]);
                     $labelValues[$groupRelations[$code]]['value'][$code] = ['value' => $code, 'label' => $title];
diff --git a/app/code/Magento/Payment/Model/CcConfig.php b/app/code/Magento/Payment/Model/CcConfig.php
index 6d6a076688cd5..d478e004b1c16 100644
--- a/app/code/Magento/Payment/Model/CcConfig.php
+++ b/app/code/Magento/Payment/Model/CcConfig.php
@@ -85,7 +85,7 @@ public function getSsStartYears()
     }
 
     /**
-     * Retrieve availables credit card types
+     * Retrieve available credit card types
      *
      * @return array
      */
diff --git a/app/code/Magento/Payment/Model/CcGenericConfigProvider.php b/app/code/Magento/Payment/Model/CcGenericConfigProvider.php
index 2de229bfd6609..adbf6555fe7b7 100644
--- a/app/code/Magento/Payment/Model/CcGenericConfigProvider.php
+++ b/app/code/Magento/Payment/Model/CcGenericConfigProvider.php
@@ -110,7 +110,7 @@ protected function getCvvImageUrl()
     }
 
     /**
-     * Retrieve availables credit card types
+     * Retrieve available credit card types
      *
      * @param string $methodCode
      * @return array
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 00ada033f2210..33200014c7ec1 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -6,12 +6,14 @@
 
 namespace Magento\Payment\Model\Method;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentMethodInterface;
 use Magento\Sales\Model\Order\Payment;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 /**
  * Payment method abstract model
@@ -29,12 +31,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
     MethodInterface,
     PaymentMethodInterface
 {
-    const ACTION_ORDER = 'order';
-
-    const ACTION_AUTHORIZE = 'authorize';
-
-    const ACTION_AUTHORIZE_CAPTURE = 'authorize_capture';
-
     const STATUS_UNKNOWN = 'UNKNOWN';
 
     const STATUS_APPROVED = 'APPROVED';
@@ -47,23 +43,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
 
     const STATUS_SUCCESS = 'SUCCESS';
 
-    /**
-     * Different payment method checks.
-     */
-    const CHECK_USE_FOR_COUNTRY = 'country';
-
-    const CHECK_USE_FOR_CURRENCY = 'currency';
-
-    const CHECK_USE_CHECKOUT = 'checkout';
-
-    const CHECK_USE_INTERNAL = 'internal';
-
-    const CHECK_ORDER_TOTAL_MIN_MAX = 'total';
-
-    const CHECK_ZERO_TOTAL = 'zero_total';
-
-    const GROUP_OFFLINE = 'offline';
-
     /**
      * @var string
      */
@@ -217,6 +196,11 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      */
     protected $logger;
 
+    /**
+     * @var DirectoryHelper
+     */
+    private $directory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -228,6 +212,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param DirectoryHelper $directory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -240,7 +225,8 @@ public function __construct(
         \Magento\Payment\Model\Method\Logger $logger,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        DirectoryHelper $directory = null
     ) {
         parent::__construct(
             $context,
@@ -254,6 +240,7 @@ public function __construct(
         $this->_paymentData = $paymentData;
         $this->_scopeConfig = $scopeConfig;
         $this->logger = $logger;
+        $this->directory = $directory ?: ObjectManager::getInstance()->get(DirectoryHelper::class);
         $this->initializeData($data);
     }
 
@@ -607,11 +594,14 @@ public function validate()
         } else {
             $billingCountry = $paymentInfo->getQuote()->getBillingAddress()->getCountryId();
         }
+        $billingCountry = $billingCountry ?: $this->directory->getDefaultCountry();
+
         if (!$this->canUseForCountry($billingCountry)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('You can\'t use the payment type you selected to make payments to the billing country.')
             );
         }
+
         return $this;
     }
 
diff --git a/app/code/Magento/Payment/Model/Method/Adapter.php b/app/code/Magento/Payment/Model/Method/Adapter.php
index 85c1584eb44f8..6c7ef372a8854 100644
--- a/app/code/Magento/Payment/Model/Method/Adapter.php
+++ b/app/code/Magento/Payment/Model/Method/Adapter.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Payment\Model\Method;
 
 use Magento\Framework\App\ObjectManager;
@@ -538,7 +539,7 @@ private function executeCommand($commandCode, array $arguments = [])
         }
 
         if ($this->commandPool === null) {
-            throw new \DomainException('Command pool is not configured for use.');
+            throw new \DomainException("The command pool isn't configured for use.");
         }
 
         $command = $this->commandPool->get($commandCode);
diff --git a/app/code/Magento/Payment/Model/Method/ConfigInterface.php b/app/code/Magento/Payment/Model/Method/ConfigInterface.php
index d7344a08bb11f..06afde4657f26 100644
--- a/app/code/Magento/Payment/Model/Method/ConfigInterface.php
+++ b/app/code/Magento/Payment/Model/Method/ConfigInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface for payment methods config
  *
- * @deprectated This interface has no semantic meaning and all it implementations has no joint points.
+ * @deprecated This interface has no semantic meaning and all it implementations has no joint points.
  */
 interface ConfigInterface extends \Magento\Payment\Gateway\ConfigInterface
 {
diff --git a/app/code/Magento/Payment/Model/Method/Logger.php b/app/code/Magento/Payment/Model/Method/Logger.php
index 74068c3b6fef0..9bf84ef4e4775 100644
--- a/app/code/Magento/Payment/Model/Method/Logger.php
+++ b/app/code/Magento/Payment/Model/Method/Logger.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Payment\Model\Method;
 
+use Magento\Payment\Gateway\ConfigInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * Class Logger for payment related information (request, response, etc.) which is used for debug
- *
- * @author     Magento Core Team <core@magentocommerce.com>
+ * Class Logger for payment related information (request, response, etc.) which is used for debug.
  *
  * @api
  * @since 100.0.2
@@ -25,17 +24,17 @@ class Logger
     protected $logger;
 
     /**
-     * @var \Magento\Payment\Gateway\ConfigInterface
+     * @var ConfigInterface
      */
     private $config;
 
     /**
      * @param LoggerInterface $logger
-     * @param \Magento\Payment\Gateway\ConfigInterface $config
+     * @param ConfigInterface|null $config
      */
     public function __construct(
         LoggerInterface $logger,
-        \Magento\Payment\Gateway\ConfigInterface $config = null
+        ConfigInterface $config = null
     ) {
         $this->logger = $logger;
         $this->config = $config;
@@ -69,7 +68,7 @@ public function debug(array $data, array $maskKeys = null, $forceDebug = null)
      */
     private function getDebugReplaceFields()
     {
-        if ($this->config and $this->config->getValue('debugReplaceKeys')) {
+        if ($this->config && $this->config->getValue('debugReplaceKeys')) {
             return explode(',', $this->config->getValue('debugReplaceKeys'));
         }
         return [];
@@ -82,7 +81,7 @@ private function getDebugReplaceFields()
      */
     private function isDebugOn()
     {
-        return $this->config and (bool)$this->config->getValue('debug');
+        return $this->config && (bool)$this->config->getValue('debug');
     }
 
     /**
diff --git a/app/code/Magento/Payment/Model/MethodInterface.php b/app/code/Magento/Payment/Model/MethodInterface.php
index f756ed564c066..fe80bb25c77ee 100644
--- a/app/code/Magento/Payment/Model/MethodInterface.php
+++ b/app/code/Magento/Payment/Model/MethodInterface.php
@@ -15,6 +15,32 @@
  */
 interface MethodInterface
 {
+    /**
+     * Different payment actions.
+     */
+    const ACTION_ORDER = 'order';
+
+    const ACTION_AUTHORIZE = 'authorize';
+
+    const ACTION_AUTHORIZE_CAPTURE = 'authorize_capture';
+
+    /**
+     * Different payment method checks.
+     */
+    const CHECK_USE_FOR_COUNTRY = 'country';
+
+    const CHECK_USE_FOR_CURRENCY = 'currency';
+
+    const CHECK_USE_CHECKOUT = 'checkout';
+
+    const CHECK_USE_INTERNAL = 'internal';
+
+    const CHECK_ORDER_TOTAL_MIN_MAX = 'total';
+
+    const CHECK_ZERO_TOTAL = 'zero_total';
+
+    const GROUP_OFFLINE = 'offline';
+
     /**
      * Retrieve payment method code
      *
diff --git a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
index ed8185e6dedeb..62c1cc15bad85 100644
--- a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
+++ b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Verify order payment observer
+ */
 class SalesOrderBeforeSaveObserver implements ObserverInterface
 {
     /**
@@ -15,12 +18,19 @@ class SalesOrderBeforeSaveObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException in case order has no payment specified.
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var \Magento\Sales\Model\Order $order */
         $order = $observer->getEvent()->getOrder();
 
+        if (!$order->getPayment()) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Please provide payment for the order.')
+            );
+        }
+
         if ($order->getPayment()->getMethodInstance()->getCode() != 'free') {
             return $this;
         }
diff --git a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
new file mode 100644
index 0000000000000..14c8bd0fecde7
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="PaymentMethodCheckMoneyOrder" type="payment_method">
+        <data key="method">checkmo</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE.txt b/app/code/Magento/Payment/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE.txt
rename to app/code/Magento/Payment/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE_AFL.txt b/app/code/Magento/Payment/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE_AFL.txt
rename to app/code/Magento/Payment/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
new file mode 100644
index 0000000000000..39506a682038f
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreatePaymentMethod" dataType="payment_method" type="create">
+        <field key="method">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Payment/Test/Mftf/README.md b/app/code/Magento/Payment/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fc489cbb253a0
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Payment Functional Tests
+
+The Functional Test Module for **Magento Payment** module.
diff --git a/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php b/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
index 469d7971e21a9..5f9238ca4360a 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
@@ -83,6 +83,9 @@ public function testGetIsSecureMode($isSecureMode, $methodInstance, $store, $sto
         $this->assertEquals($result, $expectedResult);
     }
 
+    /**
+     * @return array
+     */
     public function getIsSecureModeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
index eb1e3d3a91b92..dd18d9f256d93 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
@@ -290,10 +290,8 @@ public function testGetMethodSuccess()
 
     public function testGetMethodNotTransparentInterface()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            __('We cannot retrieve the transparent payment method model object.')
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage((string)__('We cannot retrieve the transparent payment method model object.'));
 
         $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
             ->getMockForAbstractClass();
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php
index df8bdc9bca54b..7acb595384332 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Command/GatewayCommandTest.php
@@ -6,11 +6,15 @@
 namespace Magento\Payment\Test\Unit\Gateway\Command;
 
 use Magento\Payment\Gateway\Command\GatewayCommand;
+use Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapperInterface;
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Payment\Gateway\Http\TransferFactoryInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Gateway\Response\HandlerInterface;
+use Magento\Payment\Gateway\Validator\ResultInterface;
 use Magento\Payment\Gateway\Validator\ValidatorInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -18,175 +22,186 @@
  */
 class GatewayCommandTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var GatewayCommand */
-    protected $command;
+    /**
+     * @var GatewayCommand
+     */
+    private $command;
 
     /**
-     * @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var BuilderInterface|MockObject
      */
-    protected $requestBuilderMock;
+    private $requestBuilder;
 
     /**
-     * @var TransferFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TransferFactoryInterface|MockObject
      */
-    protected $transferFactoryMock;
+    private $transferFactory;
 
     /**
-     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ClientInterface|MockObject
      */
-    protected $clientMock;
+    private $client;
 
     /**
-     * @var HandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var HandlerInterface|MockObject
      */
-    protected $responseHandlerMock;
+    private $responseHandler;
 
     /**
-     * @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ValidatorInterface|MockObject
      */
-    protected $validatorMock;
+    private $validator;
 
     /**
-     * @var LoggerInterface |\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|MockObject
      */
     private $logger;
 
+    /**
+     * @var ErrorMessageMapperInterface|MockObject
+     */
+    private $errorMessageMapper;
+
     protected function setUp()
     {
-        $this->requestBuilderMock = $this->createMock(
-            BuilderInterface::class
-        );
-        $this->transferFactoryMock = $this->createMock(
-            TransferFactoryInterface::class
-        );
-        $this->clientMock = $this->createMock(
-            ClientInterface::class
-        );
-        $this->responseHandlerMock = $this->createMock(
-            HandlerInterface::class
-        );
-        $this->validatorMock = $this->createMock(
-            ValidatorInterface::class
-        );
+        $this->requestBuilder = $this->createMock(BuilderInterface::class);
+        $this->transferFactory = $this->createMock(TransferFactoryInterface::class);
+        $this->client = $this->createMock(ClientInterface::class);
+        $this->responseHandler = $this->createMock(HandlerInterface::class);
+        $this->validator = $this->createMock(ValidatorInterface::class);
         $this->logger = $this->createMock(LoggerInterface::class);
+        $this->errorMessageMapper = $this->createMock(ErrorMessageMapperInterface::class);
 
         $this->command = new GatewayCommand(
-            $this->requestBuilderMock,
-            $this->transferFactoryMock,
-            $this->clientMock,
+            $this->requestBuilder,
+            $this->transferFactory,
+            $this->client,
             $this->logger,
-            $this->responseHandlerMock,
-            $this->validatorMock
+            $this->responseHandler,
+            $this->validator,
+            $this->errorMessageMapper
         );
     }
 
     public function testExecute()
     {
         $commandSubject = ['authorize'];
-        $request = [
-            'request_field1' => 'request_value1',
-            'request_field2' => 'request_value2'
-        ];
-        $response = ['response_field1' => 'response_value1'];
-        $validationResult = $this->getMockBuilder(
-            \Magento\Payment\Gateway\Validator\ResultInterface::class
-        )
-            ->getMockForAbstractClass();
+        $this->processRequest($commandSubject, true);
 
-        $transferO = $this->getMockBuilder(
-            \Magento\Payment\Gateway\Http\TransferInterface::class
-        )
-            ->getMockForAbstractClass();
+        $this->responseHandler->method('handle')
+            ->with($commandSubject, ['response_field1' => 'response_value1']);
 
-        $this->requestBuilderMock->expects(static::once())
-            ->method('build')
-            ->with($commandSubject)
-            ->willReturn($request);
+        $this->command->execute($commandSubject);
+    }
 
-        $this->transferFactoryMock->expects(static::once())
-            ->method('create')
-            ->with($request)
-            ->willReturn($transferO);
+    /**
+     * Checks a case when request fails.
+     *
+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
+     * @expectedExceptionMessage Transaction has been declined. Please try again later.
+     */
+    public function testExecuteValidationFail()
+    {
+        $commandSubject = ['authorize'];
+        $validationFailures = [
+            __('Failure #1'),
+            __('Failure #2'),
+        ];
 
-        $this->clientMock->expects(static::once())
-            ->method('placeRequest')
-            ->with($transferO)
-            ->willReturn($response);
-        $this->validatorMock->expects(static::once())
-            ->method('validate')
-            ->with(array_merge($commandSubject, ['response' =>$response]))
-            ->willReturn($validationResult);
-        $validationResult->expects(static::once())
-            ->method('isValid')
-            ->willReturn(true);
+        $this->processRequest($commandSubject, false, $validationFailures);
 
-        $this->responseHandlerMock->expects(static::once())
-            ->method('handle')
-            ->with($commandSubject, $response);
+        $this->logger->expects(self::exactly(count($validationFailures)))
+            ->method('critical')
+            ->withConsecutive(
+                [self::equalTo('Payment Error: ' . $validationFailures[0])],
+                [self::equalTo('Payment Error: ' . $validationFailures[1])]
+            );
 
         $this->command->execute($commandSubject);
     }
 
-    public function testExecuteValidationFail()
+    /**
+     * Checks a case when request fails and response errors are mapped.
+     *
+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
+     * @expectedExceptionMessage Failure Mapped
+     */
+    public function testExecuteValidationFailWithMappedErrors()
     {
-        $this->expectException(
-            \Magento\Payment\Gateway\Command\CommandException::class
-        );
-
         $commandSubject = ['authorize'];
-        $request = [
-            'request_field1' => 'request_value1',
-            'request_field2' => 'request_value2'
-        ];
-        $response = ['response_field1' => 'response_value1'];
         $validationFailures = [
             __('Failure #1'),
             __('Failure #2'),
         ];
-        $validationResult = $this->getMockBuilder(
-            \Magento\Payment\Gateway\Validator\ResultInterface::class
-        )
-            ->getMockForAbstractClass();
+        $errorCodes = ['401'];
+
+        $this->processRequest($commandSubject, false, $validationFailures, $errorCodes);
+
+        $this->errorMessageMapper->method('getMessage')
+            ->willReturnMap(
+                [
+                    ['401', 'Unauthorized'],
+                    ['Failure #1', 'Failure Mapped'],
+                    ['Failure #2', null]
+                ]
+            );
+
+        $this->logger->expects(self::exactly(count(array_merge($validationFailures, $errorCodes))))
+            ->method('critical')
+            ->withConsecutive(
+                [self::equalTo('Payment Error: Unauthorized')],
+                [self::equalTo('Payment Error: Failure Mapped')],
+                [self::equalTo('Payment Error: Failure #2')]
+            );
 
-        $transferO = $this->getMockBuilder(
-            \Magento\Payment\Gateway\Http\TransferInterface::class
-        )
+        $this->command->execute($commandSubject);
+    }
+
+    /**
+     * Performs command actions like request, response and validation.
+     *
+     * @param array $commandSubject
+     * @param bool $validationResult
+     * @param array $validationFailures
+     * @param array $errorCodes
+     */
+    private function processRequest(
+        array $commandSubject,
+        bool $validationResult,
+        array $validationFailures = [],
+        array $errorCodes = []
+    ) {
+        $request = [
+            'request_field1' => 'request_value1',
+            'request_field2' => 'request_value2'
+        ];
+        $response = ['response_field1' => 'response_value1'];
+        $transferO = $this->getMockBuilder(TransferInterface::class)
             ->getMockForAbstractClass();
 
-        $this->requestBuilderMock->expects(static::once())
-            ->method('build')
+        $this->requestBuilder->method('build')
             ->with($commandSubject)
             ->willReturn($request);
 
-        $this->transferFactoryMock->expects(static::once())
-            ->method('create')
+        $this->transferFactory->method('create')
             ->with($request)
             ->willReturn($transferO);
 
-        $this->clientMock->expects(static::once())
-            ->method('placeRequest')
+        $this->client->method('placeRequest')
             ->with($transferO)
             ->willReturn($response);
-        $this->validatorMock->expects(static::once())
-            ->method('validate')
-            ->with(array_merge($commandSubject, ['response' =>$response]))
-            ->willReturn($validationResult);
-        $validationResult->expects(static::once())
-            ->method('isValid')
-            ->willReturn(false);
-        $validationResult->expects(static::once())
-            ->method('getFailsDescription')
-            ->willReturn(
-                $validationFailures
-            );
 
-        $this->logger->expects(static::exactly(count($validationFailures)))
-            ->method('critical')
-            ->withConsecutive(
-                [$validationFailures[0]],
-                [$validationFailures[1]]
-            );
+        $result = $this->getMockBuilder(ResultInterface::class)
+            ->getMockForAbstractClass();
 
-        $this->command->execute($commandSubject);
+        $this->validator->method('validate')
+            ->with(array_merge($commandSubject, ['response' => $response]))
+            ->willReturn($result);
+        $result->method('isValid')
+            ->willReturn($validationResult);
+        $result->method('getFailsDescription')
+            ->willReturn($validationFailures);
+        $result->method('getErrorCodes')
+            ->willReturn($errorCodes);
     }
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
index 1cf19ff9292e9..faf4818965386 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
@@ -54,6 +54,9 @@ public function testStreetLine1($street, $expected)
         $this->assertEquals($expected, $this->model->getStreetLine1());
     }
 
+    /**
+     * @return array
+     */
     public function streetLine1DataProvider()
     {
         return [
@@ -73,6 +76,9 @@ public function testStreetLine2($street, $expected)
         $this->assertEquals($expected, $this->model->getStreetLine2());
     }
 
+    /**
+     * @return array
+     */
     public function streetLine2DataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
index 751d8c51b4410..1f5b1c2d87053 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
@@ -54,6 +54,9 @@ public function testStreetLine1($street, $expected)
         $this->assertEquals($expected, $this->model->getStreetLine1());
     }
 
+    /**
+     * @return array
+     */
     public function streetLine1DataProvider()
     {
         return [
@@ -73,6 +76,9 @@ public function testStreetLine2($street, $expected)
         $this->assertEquals($expected, $this->model->getStreetLine2());
     }
 
+    /**
+     * @return array
+     */
     public function streetLine2DataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
index 198cf5e52f068..d7956b02d38e1 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
@@ -43,7 +43,7 @@ protected function setUp()
     public function testGetCurrencyCode()
     {
         $expected = 'USD';
-        /** @var \Magento\Quote\Api\Data\CurrencyInterface $currencyrMock */
+        /** @var \Magento\Quote\Api\Data\CurrencyInterface $currencyMock */
         $currencyMock = $this->getMockBuilder(
             \Magento\Quote\Api\Data\CurrencyInterface::class
         )->getMockForAbstractClass();
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php
index 0c808cb7c1faa..7259c59e5a1a5 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/CountryValidatorTest.php
@@ -62,12 +62,15 @@ public function testValidateAllowspecificTrue($storeId, $country, $allowspecific
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(['isValid' => $isValid, 'failsDescription' => []])
+            ->with(['isValid' => $isValid, 'failsDescription' => [], 'errorCodes' => []])
             ->willReturn($this->resultMock);
 
         $this->assertSame($this->resultMock, $this->model->validate($validationSubject));
     }
 
+    /**
+     * @return array
+     */
     public function validateAllowspecificTrueDataProvider()
     {
         return [
@@ -90,12 +93,15 @@ public function testValidateAllowspecificFalse($storeId, $allowspecific, $isVali
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(['isValid' => $isValid, 'failsDescription' => []])
+            ->with(['isValid' => $isValid, 'failsDescription' => [], 'errorCodes' => []])
             ->willReturn($this->resultMock);
 
         $this->assertSame($this->resultMock, $this->model->validate($validationSubject));
     }
 
+    /**
+     * @return array
+     */
     public function validateAllowspecificFalseDataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php
index fb81137dea42b..562835e3199f1 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ResultTest.php
@@ -29,6 +29,9 @@ public function testResult($isValid, $failsDescription, $expectedIsValid, $expec
         $this->assertEquals($expectedFailsDescription, $this->model->getFailsDescription());
     }
 
+    /**
+     * @return array
+     */
     public function resultDataProvider()
     {
         $phraseMock = $this->getMockBuilder(\Magento\Framework\Phrase::class)->disableOriginalConstructor()->getMock();
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
index 7b86db369b977..7352cb7a4ac6d 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Validator/ValidatorCompositeTest.php
@@ -75,7 +75,8 @@ public function testValidate()
             ->with(
                 [
                     'isValid' => false,
-                    'failsDescription' => ['Fail']
+                    'failsDescription' => ['Fail'],
+                    'errorCodes' => []
                 ]
             )
             ->willReturn($compositeResult);
diff --git a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
index 931c2b5fd93d5..3752e82fd1e5b 100644
--- a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
@@ -253,6 +253,9 @@ public function testGetInfoBlockHtml()
         $this->assertEquals($blockHtml, $this->helper->getInfoBlockHtml($infoMock, $storeId));
     }
 
+    /**
+     * @return array
+     */
     public function getSortMethodsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php
index c49f3da315908..64069ff4a1941 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/FactoryTest.php
@@ -40,6 +40,9 @@ public function testCreate($salesModelClass, $expectedType)
         $this->assertEquals('some value', $this->_model->create($salesModel));
     }
 
+    /**
+     * @return array
+     */
     public function createDataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php
index 7594d9ce501ac..3e3c4226d4fbe 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/OrderTest.php
@@ -19,6 +19,9 @@ protected function setUp()
         $this->_model = new \Magento\Payment\Model\Cart\SalesModel\Order($this->_orderMock);
     }
 
+    /**
+     * @return array
+     */
     public function gettersDataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php
index 95271569e994e..bdcc89840ac19 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Cart/SalesModel/QuoteTest.php
@@ -84,6 +84,9 @@ public function testGetAllItems($pItem, $name, $qty, $price)
         $this->assertEquals($expected, $this->_model->getAllItems());
     }
 
+    /**
+     * @return array
+     */
     public function getAllItemsDataProvider()
     {
         return [
@@ -135,6 +138,9 @@ public function testGetter($isVirtual, $getterMethod)
         $this->assertEquals($getterMethod, $model->{$getterMethod}());
     }
 
+    /**
+     * @return array
+     */
     public function getterDataProvider()
     {
         return [
diff --git a/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php
index 8ac5bb61e7f8f..584da622b1aad 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/ConfigTest.php
@@ -142,6 +142,9 @@ public function testGetActiveMethods($isActive)
         static::assertEquals($isActive ? ['active_method' => $adapter] : [], $this->config->getActiveMethods());
     }
 
+    /**
+     * @return array
+     */
     public function getActiveMethodsDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php
deleted file mode 100644
index f0cb19ef0fa0f..0000000000000
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/FactoryTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Payment\Test\Unit\Model\Method;
-
-class FactoryTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_objectManagerMock;
-
-    /**
-     * @var \Magento\Payment\Model\Method\Factory
-     */
-    protected $_factory;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->_objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->_factory = $objectManagerHelper->getObject(
-            \Magento\Payment\Model\Method\Factory::class,
-            ['objectManager' => $this->_objectManagerMock]
-        );
-    }
-
-    public function testCreateMethod()
-    {
-        $className = \Magento\Payment\Model\Method\AbstractMethod::class;
-        $methodMock = $this->createMock($className);
-        $this->_objectManagerMock->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->with(
-            $className,
-            []
-        )->will(
-            $this->returnValue($methodMock)
-        );
-
-        $this->assertEquals($methodMock, $this->_factory->create($className));
-    }
-
-    public function testCreateMethodWithArguments()
-    {
-        $className = \Magento\Payment\Model\Method\AbstractMethod::class;
-        $data = ['param1', 'param2'];
-        $methodMock = $this->createMock($className);
-        $this->_objectManagerMock->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->with(
-            $className,
-            $data
-        )->will(
-            $this->returnValue($methodMock)
-        );
-
-        $this->assertEquals($methodMock, $this->_factory->create($className, $data));
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage WrongClass class doesn't implement \Magento\Payment\Model\MethodInterface
-     */
-    public function testWrongTypeException()
-    {
-        $className = 'WrongClass';
-        $methodMock = $this->createMock($className);
-        $this->_objectManagerMock->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->with(
-            $className,
-            []
-        )->will(
-            $this->returnValue($methodMock)
-        );
-
-        $this->_factory->create($className);
-    }
-}
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php
deleted file mode 100644
index 9bdc90829f6fe..0000000000000
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/Specification/FactoryTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Payment\Test\Unit\Model\Method\Specification;
-
-/**
- * Factory Test
- */
-class FactoryTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectManagerMock;
-
-    /**
-     * @var \Magento\Payment\Model\Method\Specification\Factory
-     */
-    protected $factory;
-
-    protected function setUp()
-    {
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->factory = $objectManagerHelper->getObject(
-            \Magento\Payment\Model\Method\Specification\Factory::class,
-            ['objectManager' => $this->objectManagerMock]
-        );
-    }
-
-    public function testCreateMethod()
-    {
-        $className = \Magento\Payment\Model\Method\SpecificationInterface::class;
-        $methodMock = $this->createMock($className);
-        $this->objectManagerMock->expects(
-            $this->once()
-        )->method(
-            'get'
-        )->with(
-            $className
-        )->will(
-            $this->returnValue($methodMock)
-        );
-
-        $this->assertEquals($methodMock, $this->factory->create($className));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Specification must implement SpecificationInterface
-     */
-    public function testWrongTypeException()
-    {
-        $className = 'WrongClass';
-        $methodMock = $this->createMock($className);
-        $this->objectManagerMock->expects(
-            $this->once()
-        )->method(
-            'get'
-        )->with(
-            $className
-        )->will(
-            $this->returnValue($methodMock)
-        );
-
-        $this->factory->create($className);
-    }
-}
diff --git a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
index b86fbc6b18263..75916dd2ea99b 100644
--- a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
@@ -61,7 +61,7 @@ public function testSalesOrderBeforeSaveCantUnhold()
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
@@ -86,7 +86,7 @@ public function testSalesOrderBeforeSaveIsCanceled()
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
@@ -114,7 +114,7 @@ public function testSalesOrderBeforeSaveIsClosed()
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
@@ -156,6 +156,29 @@ public function testSalesOrderBeforeSaveSetForced()
         $this->salesOrderBeforeSaveObserver->execute($this->observerMock);
     }
 
+    /**
+     * The method should check that the payment is available, as this is not always the case.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Please provide payment for the order.
+     */
+    public function testDoesNothingWhenNoPaymentIsAvailable()
+    {
+        $this->_prepareEventMockWithMethods(['getOrder']);
+
+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)->disableOriginalConstructor()->setMethods(
+            array_merge(['__wakeup', 'getPayment'])
+        )->getMock();
+
+        $this->eventMock->expects($this->once())->method('getOrder')->will(
+            $this->returnValue($order)
+        );
+
+        $order->expects($this->exactly(1))->method('getPayment')->willReturn(null);
+
+        $this->salesOrderBeforeSaveObserver->execute($this->observerMock);
+    }
+
     /**
      * Prepares EventMock with set of methods
      *
@@ -184,7 +207,7 @@ private function _getPreparedOrderMethod($methodCode, $orderMethods = [])
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index c8b4266f3116d..293d36e093954 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Payment/etc/config.xml b/app/code/Magento/Payment/etc/config.xml
index 9fe859c96a941..663734fb066c7 100644
--- a/app/code/Magento/Payment/etc/config.xml
+++ b/app/code/Magento/Payment/etc/config.xml
@@ -13,6 +13,7 @@
                 <model>Magento\Payment\Model\Method\Free</model>
                 <order_status>pending</order_status>
                 <title>No Payment Information Required</title>
+                <payment_action>authorize</payment_action>
                 <allowspecific>0</allowspecific>
                 <sort_order>1</sort_order>
             </free>
diff --git a/app/code/Magento/Payment/etc/di.xml b/app/code/Magento/Payment/etc/di.xml
index e2de2244bff89..74f553cc64094 100644
--- a/app/code/Magento/Payment/etc/di.xml
+++ b/app/code/Magento/Payment/etc/di.xml
@@ -12,6 +12,7 @@
     <preference for="Magento\Payment\Gateway\ConfigFactoryInterface" type="Magento\Payment\Gateway\Config\ConfigFactory" />
     <preference for="Magento\Payment\Gateway\Command\CommandManagerPoolInterface" type="Magento\Payment\Gateway\Command\CommandManagerPool" />
     <preference for="Magento\Payment\Gateway\Data\PaymentDataObjectFactoryInterface" type="Magento\Payment\Gateway\Data\PaymentDataObjectFactory" />
+    <preference for="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapperInterface" type="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper" />
 
     <type name="Magento\Payment\Model\Config\Reader">
         <arguments>
@@ -36,4 +37,47 @@
             <argument name="config" xsi:type="object">Magento\Payment\Gateway\Config\Config</argument>
         </arguments>
     </type>
+
+    <virtualType name="Magento\Payment\Gateway\ErrorMapper\VirtualSchemaLocator" type="Magento\Framework\Config\GenericSchemaLocator">
+        <arguments>
+            <argument name="moduleName" xsi:type="string">Magento_Payment</argument>
+            <argument name="schema" xsi:type="string">error_mapping.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Payment\Gateway\ErrorMapper\VirtualConfigReader" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Payment\Gateway\ErrorMapper\XmlToArrayConverter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Payment\Gateway\ErrorMapper\VirtualSchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">error_mapping.xml</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Payment\Gateway\ErrorMapper\MappingData">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Payment\Gateway\ErrorMapper\VirtualConfigReader</argument>
+            <argument name="cacheId" xsi:type="string">payment_error_mapper</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper">
+        <arguments>
+            <argument name="messageMapping" xsi:type="object">Magento\Payment\Gateway\ErrorMapper\NullMappingData</argument>
+        </arguments>
+    </type>
+
+    <virtualType name="Magento\Payment\Model\Method\VirtualDebug" type="Magento\Framework\Logger\Handler\Base">
+        <arguments>
+            <argument name="fileName" xsi:type="string">/var/log/payment.log</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Payment\Model\Method\VirtualLogger" type="Magento\Framework\Logger\Monolog">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="debug" xsi:type="object">Magento\Payment\Model\Method\VirtualDebug</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Payment\Model\Method\Logger">
+        <arguments>
+            <argument name="logger" xsi:type="object">Magento\Payment\Model\Method\VirtualLogger</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Payment/etc/error_mapping.xsd b/app/code/Magento/Payment/etc/error_mapping.xsd
new file mode 100644
index 0000000000000..97f3c181beb37
--- /dev/null
+++ b/app/code/Magento/Payment/etc/error_mapping.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="mapping">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="message_list" type="message_list" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="message_list">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="message" type="message" />
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="message">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="code" type="xs:string" use="required" />
+                <xs:attribute name="translate" type="xs:boolean" use="optional" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/app/code/Magento/Payment/etc/module.xml b/app/code/Magento/Payment/etc/module.xml
index 5593a94ca0d91..ece160e6ae3eb 100644
--- a/app/code/Magento/Payment/etc/module.xml
+++ b/app/code/Magento/Payment/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Payment" setup_version="2.0.0">
+    <module name="Magento_Payment" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
index ad24b113ffdea..582b8ca8a24be 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
@@ -10,6 +10,8 @@
  */
 ?>
 <div>
-    <?php $block->escapeHtml($block->getMethod()->getTitle());?>
+    <?= $block->getMethod()->getTitle()
+        ? $block->escapeHtml($block->getMethod()->getTitle())
+        : $block->escapeHtml(__('Payment method')); ?>
     <?= $block->escapeHtml(__(' is not available. You still can process offline actions.')) ?>
 </div>
diff --git a/app/code/Magento/Payment/view/adminhtml/web/transparent.js b/app/code/Magento/Payment/view/adminhtml/web/js/transparent.js
similarity index 100%
rename from app/code/Magento/Payment/view/adminhtml/web/transparent.js
rename to app/code/Magento/Payment/view/adminhtml/web/js/transparent.js
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
index 8fb12093e36e4..785b636d5832f 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
@@ -36,7 +36,7 @@ define([
             return resultWrapper(null, false, false);
         }
 
-        value = value.replace(/\-|\s/g, '');
+        value = value.replace(/|\s/g, '');
 
         if (!/^\d*$/.test(value)) {
             return resultWrapper(null, false, false);
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
index c22121622d264..7651fba1090c1 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js
@@ -21,7 +21,7 @@ define([], function () {
 
     /**
      * CVV number validation.
-     * Validate digit count fot CVV code.
+     * Validate digit count for CVV code.
      *
      * @param {*} value
      * @param {Number} maxLength
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
index c6f1bad31fc07..c41be40cba144 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
@@ -23,6 +23,12 @@
 }(function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
     'use strict';
 
+    $('.payment-method-content input[type="number"]').on('keyup', function () {
+        if ($(this).val() < 0) {
+            $(this).val($(this).val().replace(/^-/, ''));
+        }
+    });
+
     $.each({
         'validate-card-type': [
             function (number, item, allowedTypes) {
diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js
index 70f93854ead4b..949b1554a6f7d 100644
--- a/app/code/Magento/Payment/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            creditCardType: 'Magento_Payment/cc-type'
+            creditCardType: 'Magento_Payment/js/cc-type',
+            'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type'
         }
     }
 };
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index cb28c0ed69bbb..afa71fe591495 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -40,10 +40,22 @@ $params = $block->getParams();
                     $(parent).trigger('clearTimeout');
                     fullScreenLoader.stopLoader();
                     globalMessageList.addErrorMessage({
-                        message: $t('An error occurred on the server. Please try to place the order again.')
+                        message: $t(<?= /* @escapeNotVerified */ json_encode($params['error_msg'])?>)
                     });
                 }
             );
+        <?php elseif (isset($params['multishipping'])): ?>
+            var require = window.top.require;
+            require(
+                [
+                    'jquery'
+                ],
+                function($) {
+                    var parent = window.top;
+                    $(parent).trigger('clearTimeout');
+                    $(parent.document).find('#multishipping-billing-form').submit();
+                }
+            );
         <?php elseif (isset($params['order_success'])): ?>
             window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
         <?php else: ?>
@@ -53,9 +65,10 @@ $params = $block->getParams();
                     'jquery',
                     'Magento_Checkout/js/model/quote',
                     'Magento_Checkout/js/action/place-order',
-                    'Magento_Checkout/js/action/redirect-on-success'
+                    'Magento_Checkout/js/action/redirect-on-success',
+                    'Magento_Checkout/js/model/full-screen-loader'
                 ],
-                function($, quote, placeOrderAction, redirectOnSuccessAction) {
+                function($, quote, placeOrderAction, redirectOnSuccessAction, fullScreenLoader) {
                     var parent = window.top;
 
                     $(parent).trigger('clearTimeout');
@@ -65,6 +78,12 @@ $params = $block->getParams();
                         function () {
                             redirectOnSuccessAction.execute();
                         }
+                    ).fail(
+                        function () {
+                            var parent = window.top;
+                            $(parent).trigger('clearTimeout');
+                            fullScreenLoader.stopLoader();
+                        }
                     );
                 }
             );
diff --git a/app/code/Magento/Payment/view/frontend/web/cc-type.js b/app/code/Magento/Payment/view/frontend/web/js/cc-type.js
similarity index 100%
rename from app/code/Magento/Payment/view/frontend/web/cc-type.js
rename to app/code/Magento/Payment/view/frontend/web/js/cc-type.js
diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/js/transparent.js
similarity index 100%
rename from app/code/Magento/Payment/view/frontend/web/transparent.js
rename to app/code/Magento/Payment/view/frontend/web/js/transparent.js
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
index 31b3e0c1d6b6f..396c66d4e748e 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
@@ -13,5 +13,5 @@ class Form extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'billing/agreement/view/form.phtml';
+    protected $_template = 'Magento_Paypal::billing/agreement/view/form.phtml';
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
index d133d19f9c202..39373017fa09a 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
@@ -15,7 +15,7 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
     /**
      * @var string
      */
-    protected $_template = 'billing/agreement/view/tab/info.phtml';
+    protected $_template = 'Magento_Paypal::billing/agreement/view/tab/info.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php
new file mode 100644
index 0000000000000..0cbd82798a2c1
--- /dev/null
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Block\Adminhtml\Order;
+
+use Magento\Backend\Block\Widget\Context;
+use Magento\Framework\Registry;
+use Magento\Paypal\Model\Adminhtml\Express;
+use Magento\Sales\Block\Adminhtml\Order\View as OrderView;
+use Magento\Sales\Helper\Reorder;
+use Magento\Sales\Model\Config;
+use Magento\Sales\Model\Order;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Adminhtml sales order view.
+ * @api
+ */
+class View extends OrderView
+{
+    /**
+     * @var Express
+     */
+    private $express;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param Config $salesConfig
+     * @param Reorder $reorderHelper
+     * @param Express $express
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        Config $salesConfig,
+        Reorder $reorderHelper,
+        Express $express,
+        array $data = []
+    ) {
+        $this->express = $express;
+
+        parent::__construct(
+            $context,
+            $registry,
+            $salesConfig,
+            $reorderHelper,
+            $data
+        );
+    }
+
+    /**
+     * Constructor.
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    protected function _construct()
+    {
+        parent::_construct();
+
+        $order = $this->getOrder();
+        if ($order === null) {
+            return;
+        }
+        $message = __('Are you sure you want to authorize full order amount?');
+        if ($this->_isAllowedAction('Magento_Paypal::authorization') && $this->canAuthorize($order)) {
+            $this->addButton(
+                'order_authorize',
+                [
+                    'label' => __('Authorize'),
+                    'class' => 'authorize',
+                    'onclick' => "confirmSetLocation('{$message}', '{$this->getPaymentAuthorizationUrl()}')",
+                ]
+            );
+        }
+    }
+
+    /**
+     * Returns URL for authorization of full order amount.
+     *
+     * @return string
+     */
+    private function getPaymentAuthorizationUrl(): string
+    {
+        return $this->getUrl('paypal/express/authorization');
+    }
+
+    /**
+     * Checks if order available for payment authorization.
+     *
+     * @param Order $order
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function canAuthorize(Order $order): bool
+    {
+        if ($order->canUnhold() || $order->isPaymentReview()) {
+            return false;
+        }
+
+        $state = $order->getState();
+        if ($order->isCanceled() || $state === Order::STATE_COMPLETE || $state === Order::STATE_CLOSED) {
+            return false;
+        }
+
+        return $this->express->isOrderAuthorizationAllowed($order->getPayment());
+    }
+}
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
index a1cfabd48440f..afa80892487a5 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
@@ -13,7 +13,7 @@ class ApiWizard extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Path to block template
      */
-    const WIZARD_TEMPLATE = 'system/config/api_wizard.phtml';
+    const WIZARD_TEMPLATE = 'Magento_Paypal::system/config/api_wizard.phtml';
 
     /**
      * Set template to itself
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
index bdca98e089e7b..c481871e1fb0f 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
@@ -11,7 +11,7 @@ class BmlApiWizard extends ApiWizard
     /**
      * Path to block template
      */
-    const WIZARD_TEMPLATE = 'system/config/bml_api_wizard.phtml';
+    const WIZARD_TEMPLATE = 'Magento_Paypal::system/config/bml_api_wizard.phtml';
 
     /**
      * Get the button and scripts contents
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
index fe4f6ee1f6757..793fad152bc7e 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
@@ -16,5 +16,5 @@ class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink
      *
      * @var string
      */
-    protected $_template = 'system/config/payflowlink/advanced.phtml';
+    protected $_template = 'Magento_Paypal::system/config/payflowlink/advanced.phtml';
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
index 30119063f5b5b..405de1ec03185 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
@@ -16,7 +16,7 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
      *
      * @var string
      */
-    protected $_template = 'system/config/payflowlink/info.phtml';
+    protected $_template = 'Magento_Paypal::system/config/payflowlink/info.phtml';
 
     /**
      * Render fieldset html
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
index 92281d3058eef..70eff8f83ba99 100644
--- a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
+++ b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
@@ -15,5 +15,5 @@ class Form extends \Magento\Payment\Block\Form
     /**
      * @var string
      */
-    protected $_template = 'hss/info.phtml';
+    protected $_template = 'Magento_Paypal::hss/info.phtml';
 }
diff --git a/app/code/Magento/Paypal/Block/Iframe.php b/app/code/Magento/Paypal/Block/Iframe.php
index d6edb1ed25231..bcdfae6b86dbe 100644
--- a/app/code/Magento/Paypal/Block/Iframe.php
+++ b/app/code/Magento/Paypal/Block/Iframe.php
@@ -44,7 +44,7 @@ class Iframe extends \Magento\Payment\Block\Form
     /**
      * @var string
      */
-    protected $_template = 'hss/js.phtml';
+    protected $_template = 'Magento_Paypal::hss/js.phtml';
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
@@ -110,13 +110,13 @@ protected function _construct()
         if (in_array($paymentCode, $this->_hssHelper->getHssMethods())) {
             $this->_paymentMethodCode = $paymentCode;
             $templatePath = str_replace('_', '', $paymentCode);
-            $templateFile = "{$templatePath}/iframe.phtml";
+            $templateFile = "Magento_Paypal::{$templatePath}/iframe.phtml";
             $directory = $this->readFactory->create($this->reader->getModuleDir('', 'Magento_Paypal'));
             $file = $this->resolver->getTemplateFileName($templateFile, ['module' => 'Magento_Paypal']);
             if ($file && $directory->isExist($directory->getRelativePath($file))) {
                 $this->setTemplate($templateFile);
             } else {
-                $this->setTemplate('hss/iframe.phtml');
+                $this->setTemplate('Magento_Paypal::hss/iframe.phtml');
             }
         }
     }
@@ -198,7 +198,7 @@ protected function _beforeToHtml()
     protected function _toHtml()
     {
         if ($this->_isAfterPaymentSave()) {
-            $this->setTemplate('hss/js.phtml');
+            $this->setTemplate('Magento_Paypal::hss/js.phtml');
             return parent::_toHtml();
         }
         if (!$this->_shouldRender) {
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
index d777279ad47a8..159abd4e2f1bb 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
@@ -15,7 +15,7 @@ class Form extends \Magento\Paypal\Block\Payflow\Link\Form
     /**
      * @var string
      */
-    protected $_template = 'payflowadvanced/info.phtml';
+    protected $_template = 'Magento_Paypal::payflowadvanced/info.phtml';
 
     /**
      * Get frame action URL
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
index f414a63d69046..fc880f494c859 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
@@ -15,7 +15,7 @@ class Form extends \Magento\Payment\Block\Form
     /**
      * @var string
      */
-    protected $_template = 'payflowlink/info.phtml';
+    protected $_template = 'Magento_Paypal::payflowlink/info.phtml';
 
     /**
      * Get frame action URL
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
index b4c68df6e29e0..ca92b6a044fa7 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Paypal\Controller\Adminhtml\Billing\Agreement;
 
-class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php b/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php
new file mode 100644
index 0000000000000..c6744734ded61
--- /dev/null
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Controller\Adminhtml\Express;
+
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Registry;
+use Magento\Framework\Translate\InlineInterface;
+use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Paypal\Model\Adminhtml\Express;
+use Magento\Backend\App\Action;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Controller\Adminhtml\Order;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Makes a payment authorization for Paypal Express
+ * when payment action is order.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Authorization extends Order
+{
+    /**
+     * Authorization level of a basic admin session.
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Paypal::authorization';
+
+    /**
+     * @var Express
+     */
+    private $express;
+
+    /**
+     * @param Action\Context $context
+     * @param Registry $coreRegistry
+     * @param FileFactory $fileFactory
+     * @param InlineInterface $translateInline
+     * @param PageFactory $resultPageFactory
+     * @param JsonFactory $resultJsonFactory
+     * @param LayoutFactory $resultLayoutFactory
+     * @param RawFactory $resultRawFactory
+     * @param OrderManagementInterface $orderManagement
+     * @param OrderRepositoryInterface $orderRepository
+     * @param LoggerInterface $logger
+     * @param Express $express
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        Action\Context $context,
+        Registry $coreRegistry,
+        FileFactory $fileFactory,
+        InlineInterface $translateInline,
+        PageFactory $resultPageFactory,
+        JsonFactory $resultJsonFactory,
+        LayoutFactory $resultLayoutFactory,
+        RawFactory $resultRawFactory,
+        OrderManagementInterface $orderManagement,
+        OrderRepositoryInterface $orderRepository,
+        LoggerInterface $logger,
+        Express $express
+    ) {
+        $this->express = $express;
+
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+    }
+
+    /**
+     * Authorize full order payment amount.
+     *
+     * @return Redirect
+     */
+    public function execute(): Redirect
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $order = $this->_initOrder();
+        if ($order !== false) {
+            try {
+                $this->express->authorizeOrder($order);
+                $this->orderRepository->save($order);
+                $this->messageManager->addSuccessMessage(__('Payment authorization has been successfully created.'));
+            } catch (LocalizedException $e) {
+                $this->messageManager->addErrorMessage($e->getMessage());
+            } catch (\Throwable $e) {
+                $this->messageManager->addErrorMessage(__('Unable to make payment authorization.'));
+            }
+
+            $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
+        } else {
+            $resultRedirect->setPath('sales/order/index');
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
index 91f3e8d9065b9..c2cee0ffbc67a 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Paypal\Controller\Adminhtml\Paypal\Reports;
 
-class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
index 571d73d07b68e..fa131f9591fa9 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
@@ -7,12 +7,17 @@
 
 use Magento\Checkout\Controller\Express\RedirectLoginInterface;
 use Magento\Framework\App\Action\Action as AppAction;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Abstract Express Checkout Controller
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-abstract class AbstractExpress extends AppAction implements RedirectLoginInterface
+abstract class AbstractExpress extends AppAction implements
+    RedirectLoginInterface,
+    HttpGetActionInterface,
+    HttpPostActionInterface
 {
     /**
      * @var \Magento\Paypal\Model\Express\Checkout
@@ -137,6 +142,14 @@ protected function _initCheckout()
             $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
             throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
         }
+        if (!(float)$quote->getGrandTotal()) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __(
+                    'PayPal can\'t process orders with a zero balance due. '
+                    . 'To finish your purchase, please go through the standard checkout process.'
+                )
+            );
+        }
         if (!isset($this->_checkoutTypes[$this->_checkoutType])) {
             $parameters = [
                 'params' => [
@@ -151,6 +164,8 @@ protected function _initCheckout()
     }
 
     /**
+     * Get Proper Checkout Token
+     *
      * Search for proper checkout token in request or session or (un)set specified one
      * Combined getter/setter
      *
@@ -221,8 +236,7 @@ protected function _getQuote()
     }
 
     /**
-     * Returns before_auth_url redirect parameter for customer session
-     * @return null
+     * @inheritdoc
      */
     public function getCustomerBeforeAuthUrl()
     {
@@ -230,8 +244,7 @@ public function getCustomerBeforeAuthUrl()
     }
 
     /**
-     * Returns a list of action flags [flag_key] => boolean
-     * @return array
+     * @inheritdoc
      */
     public function getActionFlagList()
     {
@@ -240,6 +253,7 @@ public function getActionFlagList()
 
     /**
      * Returns login url parameter for redirect
+     *
      * @return string
      */
     public function getLoginUrl()
@@ -249,6 +263,7 @@ public function getLoginUrl()
 
     /**
      * Returns action name which requires redirect
+     *
      * @return string
      */
     public function getRedirectActionName()
@@ -269,4 +284,9 @@ public function redirectLogin()
             $this->_urlHelper->addRequestParam($this->_customerUrl->getLoginUrl(), ['context' => 'checkout'])
         );
     }
+
+    /**
+     * @inheritdoc
+     */
+    abstract public function execute();
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
index 1222679593f36..055af4162d5f3 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
@@ -4,8 +4,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Paypal\Controller\Express\AbstractExpress;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 
 /**
@@ -19,6 +21,11 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress
      */
     protected $agreementsValidator;
 
+    /**
+     * @var \Magento\Sales\Api\PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -29,6 +36,8 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
+     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -39,9 +48,9 @@ public function __construct(
         \Magento\Framework\Session\Generic $paypalSession,
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Customer\Model\Url $customerUrl,
-        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
+        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
     ) {
-        $this->agreementsValidator = $agreementValidator;
         parent::__construct(
             $context,
             $customerSession,
@@ -52,6 +61,11 @@ public function __construct(
             $urlHelper,
             $customerUrl
         );
+
+        $this->agreementsValidator = $agreementValidator;
+        $this->paymentFailures = $paymentFailures ? : $this->_objectManager->get(
+            \Magento\Sales\Api\PaymentFailuresInterface::class
+        );
     }
 
     /**
@@ -66,7 +80,10 @@ public function execute()
             !$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))
         ) {
             $e = new \Magento\Framework\Exception\LocalizedException(
-                __('Please agree to all the terms and conditions before placing the order.')
+                __(
+                    "The order wasn't placed. "
+                    . "First, agree to the terms and conditions, then try placing your order again."
+                )
             );
             $this->messageManager->addExceptionMessage(
                 $e,
@@ -114,15 +131,27 @@ public function execute()
             return;
         } catch (ApiProcessableException $e) {
             $this->_processPaypalApiError($e);
+        } catch (LocalizedException $e) {
+            $this->processException($e, $e->getRawMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addExceptionMessage(
-                $e,
-                __('We can\'t place the order.')
-            );
-            $this->_redirect('*/*/review');
+            $this->processException($e, 'We can\'t place the order.');
         }
     }
 
+    /**
+     * Process exception.
+     *
+     * @param \Exception $exception
+     * @param string $message
+     *
+     * @return void
+     */
+    private function processException(\Exception $exception, string $message): void
+    {
+        $this->messageManager->addExceptionMessage($exception, __($message));
+        $this->_redirect('*/*/review');
+    }
+
     /**
      * Process PayPal API's processable errors
      *
@@ -131,6 +160,8 @@ public function execute()
      */
     protected function _processPaypalApiError($exception)
     {
+        $this->paymentFailures->handle((int)$this->_getCheckoutSession()->getQuoteId(), $exception->getMessage());
+
         switch ($exception->getCode()) {
             case ApiProcessableException::API_MAX_PAYMENT_ATTEMPTS_EXCEEDED:
             case ApiProcessableException::API_TRANSACTION_EXPIRED:
@@ -205,6 +236,6 @@ private function redirectToOrderReviewPageAndShowError($errorMessage)
     protected function isValidationRequired()
     {
         return is_array($this->getRequest()->getBeforeForwardInfo())
-        && empty($this->getRequest()->getBeforeForwardInfo());
+            && empty($this->getRequest()->getBeforeForwardInfo());
     }
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/GetToken.php b/app/code/Magento/Paypal/Controller/Express/GetToken.php
index 7c127803cb0b1..93e9abb4c097e 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetToken.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetToken.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Controller\Express;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Checkout\Helper\Data;
 use Magento\Checkout\Helper\ExpressRedirect;
 use Magento\Checkout\Model\Type\Onepage;
@@ -19,7 +20,7 @@
  * Class GetToken
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class GetToken extends AbstractExpress
+class GetToken extends AbstractExpress implements HttpGetActionInterface
 {
     /**
      * Config mode type
diff --git a/app/code/Magento/Paypal/Controller/Express/Start.php b/app/code/Magento/Paypal/Controller/Express/Start.php
index e0a3c5381be59..b381c413071a7 100644
--- a/app/code/Magento/Paypal/Controller/Express/Start.php
+++ b/app/code/Magento/Paypal/Controller/Express/Start.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Paypal\Controller\Express;
 
-class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start implements HttpGetActionInterface
 {
     /**
      * Config mode type
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
index ca2670292ec8a..4bcc3a9b3606c 100644
--- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -7,12 +7,17 @@
 
 namespace Magento\Paypal\Controller\Ipn;
 
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\RemoteServiceUnavailableException;
+use Magento\Sales\Model\OrderFactory;
 
 /**
  * Unified IPN controller for all supported PayPal methods
  */
-class Index extends \Magento\Framework\App\Action\Action
+class Index extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
 {
     /**
      * @var \Psr\Log\LoggerInterface
@@ -24,21 +29,46 @@ class Index extends \Magento\Framework\App\Action\Action
      */
     protected $_ipnFactory;
 
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Paypal\Model\IpnFactory $ipnFactory
      * @param \Psr\Log\LoggerInterface $logger
+     * @param OrderFactory $orderFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Paypal\Model\IpnFactory $ipnFactory,
-        \Psr\Log\LoggerInterface $logger
+        \Psr\Log\LoggerInterface $logger,
+        OrderFactory $orderFactory = null
     ) {
         $this->_logger = $logger;
         $this->_ipnFactory = $ipnFactory;
+        $this->orderFactory = $orderFactory ?: ObjectManager::getInstance()->get(OrderFactory::class);
         parent::__construct($context);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * Instantiate IPN model and pass IPN request to it
      *
@@ -54,6 +84,13 @@ public function execute()
         try {
             $data = $this->getRequest()->getPostValue();
             $this->_ipnFactory->create(['data' => $data])->processIpnRequest();
+            $incrementId = $this->getRequest()->getPostValue()['invoice'];
+            $this->_eventManager->dispatch(
+                'paypal_checkout_success',
+                [
+                    'order' => $this->orderFactory->create()->loadByIncrementId($incrementId)
+                ]
+            );
         } catch (RemoteServiceUnavailableException $e) {
             $this->_logger->critical($e);
             $this->getResponse()->setStatusHeader(503, '1.1', 'Service Unavailable')->sendResponse();
diff --git a/app/code/Magento/Paypal/Controller/Payflow.php b/app/code/Magento/Paypal/Controller/Payflow.php
index ab21986bde3ba..78c0536e393ac 100644
--- a/app/code/Magento/Paypal/Controller/Payflow.php
+++ b/app/code/Magento/Paypal/Controller/Payflow.php
@@ -41,6 +41,11 @@ abstract class Payflow extends \Magento\Framework\App\Action\Action
      */
     protected $_redirectBlockName = 'payflow.link.iframe';
 
+    /**
+     * @var \Magento\Sales\Api\PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
@@ -48,6 +53,7 @@ abstract class Payflow extends \Magento\Framework\App\Action\Action
      * @param \Magento\Paypal\Model\PayflowlinkFactory $payflowModelFactory
      * @param \Magento\Paypal\Helper\Checkout $checkoutHelper
      * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -55,14 +61,19 @@ public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
         \Magento\Paypal\Model\PayflowlinkFactory $payflowModelFactory,
         \Magento\Paypal\Helper\Checkout $checkoutHelper,
-        \Psr\Log\LoggerInterface $logger
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
     ) {
+        parent::__construct($context);
+
         $this->_checkoutSession = $checkoutSession;
         $this->_orderFactory = $orderFactory;
         $this->_logger = $logger;
         $this->_payflowModelFactory = $payflowModelFactory;
         $this->_checkoutHelper = $checkoutHelper;
-        parent::__construct($context);
+        $this->paymentFailures = $paymentFailures ?: $this->_objectManager->get(
+            \Magento\Sales\Api\PaymentFailuresInterface::class
+        );
     }
 
     /**
@@ -74,6 +85,10 @@ public function __construct(
     protected function _cancelPayment($errorMsg = '')
     {
         $errorMsg = trim(strip_tags($errorMsg));
+        $order = $this->_checkoutSession->getLastRealOrder();
+        if ($order->getId()) {
+            $this->paymentFailures->handle((int)$order->getQuoteId(), $errorMsg);
+        }
 
         $gotoSection = false;
         $this->_checkoutHelper->cancelCurrentOrder($errorMsg);
diff --git a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
index 39cc02942cf76..71ae6d4975fbe 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php
@@ -6,8 +6,29 @@
  */
 namespace Magento\Paypal\Controller\Payflow;
 
-class CancelPayment extends \Magento\Paypal\Controller\Payflow
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+class CancelPayment extends \Magento\Paypal\Controller\Payflow implements CsrfAwareActionInterface
 {
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * When a customer cancel payment from payflow gateway.
      *
diff --git a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
index a370eeb40eafd..d2a14febe54dd 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
@@ -1,16 +1,22 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Paypal\Controller\Payflow;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Paypal\Controller\Payflow;
 use Magento\Paypal\Model\Config;
 use Magento\Sales\Model\Order;
 
-class ReturnUrl extends Payflow
+/**
+ * Paypal Payflow ReturnUrl controller class
+ */
+class ReturnUrl extends Payflow implements CsrfAwareActionInterface, HttpGetActionInterface
 {
     /**
      * @var array of allowed order states on frontend
@@ -30,6 +36,23 @@ class ReturnUrl extends Payflow
         Config::METHOD_PAYFLOWLINK
     ];
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * When a customer return to website from payflow gateway.
      *
@@ -50,7 +73,7 @@ public function execute()
                     $redirectBlock->setData('goto_success_page', true);
                 } else {
                     if ($this->checkPaymentMethod($order)) {
-                        $gotoSection = $this->_cancelPayment(strval($this->getRequest()->getParam('RESPMSG')));
+                        $gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));
                         $redirectBlock->setData('goto_section', $gotoSection);
                         $redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
                     } else {
diff --git a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
index e686c91fd4c9f..2d6a8f80bafd8 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php
@@ -6,8 +6,29 @@
  */
 namespace Magento\Paypal\Controller\Payflow;
 
-class SilentPost extends \Magento\Paypal\Controller\Payflow
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+class SilentPost extends \Magento\Paypal\Controller\Payflow implements CsrfAwareActionInterface
 {
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * Get response from PayPal by silent post method
      *
diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
index a6fbcfd0239b4..4615320c9455f 100644
--- a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
+++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Paypal\Controller\Payflowexpress;
 
-class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start implements HttpGetActionInterface
 {
     /**
      * Config mode type
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index 2efae34a96459..85907c9d371ab 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Controller\Transparent;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
@@ -21,7 +22,7 @@
  * @package Magento\Paypal\Controller\Transparent
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class RequestSecureToken extends \Magento\Framework\App\Action\Action
+class RequestSecureToken extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
      * @var JsonFactory
diff --git a/app/code/Magento/Paypal/Controller/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Transparent/Response.php
index 23ac20ca8c87b..4a4177822737d 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/Response.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/Response.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Paypal\Controller\Transparent;
 
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\LayoutFactory;
@@ -14,11 +17,13 @@
 use Magento\Paypal\Model\Payflow\Service\Response\Transaction;
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Sales\Api\PaymentFailuresInterface;
+use Magento\Framework\Session\Generic as Session;
 
 /**
- * Class Response
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Response extends \Magento\Framework\App\Action\Action
+class Response extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
 {
     /**
      * Core registry
@@ -47,6 +52,16 @@ class Response extends \Magento\Framework\App\Action\Action
      */
     private $transparent;
 
+    /**
+     * @var PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
+    /**
+     * @var Session
+     */
+    private $sessionTransparent;
+
     /**
      * Constructor
      *
@@ -56,6 +71,8 @@ class Response extends \Magento\Framework\App\Action\Action
      * @param ResponseValidator $responseValidator
      * @param LayoutFactory $resultLayoutFactory
      * @param Transparent $transparent
+     * @param Session|null $sessionTransparent
+     * @param PaymentFailuresInterface|null $paymentFailures
      */
     public function __construct(
         Context $context,
@@ -63,7 +80,9 @@ public function __construct(
         Transaction $transaction,
         ResponseValidator $responseValidator,
         LayoutFactory $resultLayoutFactory,
-        Transparent $transparent
+        Transparent $transparent,
+        Session $sessionTransparent = null,
+        PaymentFailuresInterface $paymentFailures = null
     ) {
         parent::__construct($context);
         $this->coreRegistry = $coreRegistry;
@@ -71,6 +90,25 @@ public function __construct(
         $this->responseValidator = $responseValidator;
         $this->resultLayoutFactory = $resultLayoutFactory;
         $this->transparent = $transparent;
+        $this->sessionTransparent = $sessionTransparent ?: $this->_objectManager->get(Session::class);
+        $this->paymentFailures = $paymentFailures ?: $this->_objectManager->get(PaymentFailuresInterface::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
     }
 
     /**
@@ -86,6 +124,7 @@ public function execute()
         } catch (LocalizedException $exception) {
             $parameters['error'] = true;
             $parameters['error_msg'] = $exception->getMessage();
+            $this->paymentFailures->handle((int)$this->sessionTransparent->getQuoteId(), $parameters['error_msg']);
         }
 
         $this->coreRegistry->register(Iframe::REGISTRY_KEY, $parameters);
diff --git a/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php b/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php
index 2ce757cfa65d9..1dbafaf5ff0c2 100644
--- a/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php
+++ b/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Paypal\Gateway\Payflowpro\Command;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -73,7 +74,7 @@ public function execute(array $commandSubject)
         } catch (LocalizedException $exception) {
             $payment->setParentTransactionId($response->getData(Transparent::PNREF));
             $this->payflowFacade->void($payment);
-            throw new LocalizedException(__('Error processing payment, please try again later.'));
+            throw new LocalizedException(__("The payment couldn't be processed at this time. Please try again later."));
         }
 
         $this->payflowFacade->setTransStatus($payment, $response);
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index 3b0f7b974829c..e5beddac3b189 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -134,7 +134,7 @@ public function setStoreId($storeId)
      * Returns payment configuration value
      *
      * @param string $key
-     * @param null $storeId
+     * @param null|int $storeId
      * @return null|string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -224,15 +224,26 @@ protected function _prepareValue($key, $value)
      */
     public function shouldUseUnilateralPayments()
     {
-        return $this->getValue('business_account') && !$this->isWppApiAvailabe();
+        return $this->getValue('business_account') && !$this->isWppApiAvailable();
     }
 
     /**
      * Check whether WPP API credentials are available for this method
      *
+     * @deprecated
      * @return bool
      */
     public function isWppApiAvailabe()
+    {
+        return $this->isWppApiAvailable();
+    }
+
+    /**
+     * Check whether WPP API credentials are available for this method
+     *
+     * @return bool
+     */
+    public function isWppApiAvailable()
     {
         return $this->getValue('api_username')
         && $this->getValue('api_password')
@@ -243,7 +254,7 @@ public function isWppApiAvailabe()
     /**
      * Check whether method available for checkout or not
      *
-     * @param null $methodCode
+     * @param null|string $methodCode
      *
      * @return bool
      */
diff --git a/app/code/Magento/Paypal/Model/Adminhtml/Express.php b/app/code/Magento/Paypal/Model/Adminhtml/Express.php
new file mode 100644
index 0000000000000..6724f115dc8a7
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/Adminhtml/Express.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Model\Adminhtml;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedExceptionFactory;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\UrlInterface;
+use Magento\Payment\Helper\Data;
+use Magento\Payment\Model\Method\Logger;
+use Magento\Paypal\Model\CartFactory;
+use Magento\Paypal\Model\Express as PaypalExpress;
+use Magento\Paypal\Model\ProFactory;
+use Magento\Sales\Api\TransactionRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Payment\Transaction;
+use Magento\Sales\Model\Order\Payment\State\AuthorizeCommand;
+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Paypal\Model\Config;
+use Magento\Payment\Model\Method\AbstractMethod;
+
+/**
+ * Provides ability to make an authorization calls to Paypal API from admin.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Express extends PaypalExpress
+{
+    /**
+     * @var AuthorizeCommand
+     */
+    private $authCommand;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param ExtensionAttributesFactory $extensionFactory
+     * @param AttributeValueFactory $customAttributeFactory
+     * @param Data $paymentData
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Logger $logger
+     * @param ProFactory $proFactory
+     * @param StoreManagerInterface $storeManager
+     * @param UrlInterface $urlBuilder
+     * @param CartFactory $cartFactory
+     * @param Session $checkoutSession
+     * @param LocalizedExceptionFactory $exception
+     * @param TransactionRepositoryInterface $transactionRepository
+     * @param BuilderInterface $transactionBuilder
+     * @param AuthorizeCommand $authCommand
+     * @param AbstractResource $resource
+     * @param AbstractDb $resourceCollection
+     * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        ExtensionAttributesFactory $extensionFactory,
+        AttributeValueFactory $customAttributeFactory,
+        Data $paymentData,
+        ScopeConfigInterface $scopeConfig,
+        Logger $logger,
+        ProFactory $proFactory,
+        StoreManagerInterface $storeManager,
+        UrlInterface $urlBuilder,
+        CartFactory $cartFactory,
+        Session $checkoutSession,
+        LocalizedExceptionFactory $exception,
+        TransactionRepositoryInterface $transactionRepository,
+        BuilderInterface $transactionBuilder,
+        AuthorizeCommand $authCommand,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
+        $data = []
+    ) {
+        $this->authCommand = $authCommand;
+
+        parent::__construct(
+            $context,
+            $registry,
+            $extensionFactory,
+            $customAttributeFactory,
+            $paymentData,
+            $scopeConfig,
+            $logger,
+            $proFactory,
+            $storeManager,
+            $urlBuilder,
+            $cartFactory,
+            $checkoutSession,
+            $exception,
+            $transactionRepository,
+            $transactionBuilder,
+            $resource,
+            $resourceCollection,
+            $data
+        );
+    }
+
+    /**
+     * Creates an authorization of requested amount.
+     *
+     * @param OrderInterface $order
+     * @return $this
+     * @throws LocalizedException
+     */
+    public function authorizeOrder(OrderInterface $order)
+    {
+        $baseTotalDue = $order->getBaseTotalDue();
+
+        /** @var $payment Payment */
+        $payment = $order->getPayment();
+        if (!$payment || !$this->isOrderAuthorizationAllowed($payment)) {
+            throw new LocalizedException(__('Authorization is not allowed.'));
+        }
+
+        $orderTransaction = $this->getOrderTransaction($payment);
+
+        $api = $this->_callDoAuthorize($baseTotalDue, $payment, $orderTransaction->getTxnId());
+        $this->_pro->importPaymentInfo($api, $payment);
+
+        $payment->resetTransactionAdditionalInfo()
+            ->setIsTransactionClosed(false)
+            ->setTransactionId($api->getTransactionId())
+            ->setParentTransactionId($orderTransaction->getTxnId());
+
+        $transaction = $payment->addTransaction(Transaction::TYPE_AUTH, null, true);
+        $message = $this->authCommand->execute($payment, $baseTotalDue, $payment->getOrder());
+        $message = $payment->prependMessage($message);
+
+        $payment->addTransactionCommentsToOrder($transaction, $message);
+        $payment->setAmountAuthorized($order->getTotalDue());
+        $payment->setBaseAmountAuthorized($baseTotalDue);
+
+        return $this;
+    }
+
+    /**
+     * Checks if payment has authorization transactions.
+     *
+     * @param Payment $payment
+     * @return bool
+     */
+    private function hasAuthorization(Payment $payment): bool
+    {
+        return (bool) ($payment->getAmountAuthorized() ?? 0);
+    }
+
+    /**
+     * Checks if payment authorization allowed.
+     *
+     * @param Payment $payment
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function isOrderAuthorizationAllowed(Payment $payment): bool
+    {
+        if ($payment->getMethod() === Config::METHOD_EXPRESS &&
+            $payment->getMethodInstance()->getConfigPaymentAction() === AbstractMethod::ACTION_ORDER
+        ) {
+            return !$this->hasAuthorization($payment);
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/Api/AbstractApi.php b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
index 0d1cd44639e93..73a4f69147990 100644
--- a/app/code/Magento/Paypal/Model/Api/AbstractApi.php
+++ b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Model\Api;
 
 use Magento\Payment\Helper\Formatter;
@@ -427,6 +429,7 @@ protected function _exportLineItems(array &$request, $i = 0)
                 if (isset($this->_lineItemTotalExportMap[$key])) {
                     // !empty($total)
                     $privateKey = $this->_lineItemTotalExportMap[$key];
+                    $total = round($total, 2);
                     $request[$privateKey] = $this->formatPrice($total);
                 }
             }
@@ -451,6 +454,7 @@ protected function _exportLineItems(array &$request, $i = 0)
 
     /**
      * Prepare shipping options request
+     *
      * Returns false if there are no shipping options
      *
      * @param array &$request
@@ -517,7 +521,7 @@ protected function _getDataOrConfig($key, $default = null)
     }
 
     /**
-     * region_id workaround: PayPal requires state code, try to find one in the address
+     * Region_id workaround: PayPal requires state code, try to find one in the address
      *
      * @param \Magento\Framework\DataObject $address
      * @return string
@@ -574,6 +578,7 @@ protected function _buildQuery($request)
 
     /**
      * Filter qty in API calls
+     *
      * Paypal note: The value for quantity must be a positive integer. Null, zero, or negative numbers are not allowed.
      *
      * @param float|string|int $value
@@ -581,7 +586,7 @@ protected function _buildQuery($request)
      */
     protected function _filterQty($value)
     {
-        return intval($value);
+        return (int)$value;
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index 6933c613ef748..624068395394d 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -844,7 +844,7 @@ public function callGetExpressCheckoutDetails()
         $request = $this->_exportToRequest($this->_getExpressCheckoutDetailsRequest);
         $response = $this->call(self::GET_EXPRESS_CHECKOUT_DETAILS, $request);
         $this->_importFromResponse($this->_paymentInformationResponse, $response);
-        $this->_exportAddressses($response);
+        $this->_exportAddresses($response);
     }
 
     /**
@@ -1025,7 +1025,7 @@ public function callGetPalDetails()
     }
 
     /**
-     * Set Customer BillingA greement call
+     * Set Customer BillingAgreement call
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement
@@ -1425,7 +1425,7 @@ protected function _deformatNVP($nvpstr)
         $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr;
 
         while (strlen($nvpstr)) {
-            //postion of Key
+            //position of Key
             $keypos = strpos($nvpstr, '=');
             //position of value
             $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
@@ -1433,7 +1433,7 @@ protected function _deformatNVP($nvpstr)
             /*getting the Key and Value values and storing in a Associative Array*/
             $keyval = substr($nvpstr, $intial, $keypos);
             $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
-            //decoding the respose
+            //decoding the response
             $nvpArray[urldecode($keyval)] = urldecode($valval);
             $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
         }
@@ -1461,8 +1461,21 @@ protected function _exportLineItems(array &$request, $i = 0)
      *
      * @param array $data
      * @return void
+     * @deprecated 100.2.2 typo in method name
+     * @see _exportAddresses
      */
     protected function _exportAddressses($data)
+    {
+        $this->_exportAddresses($data);
+    }
+
+    /**
+     * Create billing and shipping addresses basing on response data
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function _exportAddresses($data)
     {
         $address = new \Magento\Framework\DataObject();
         \Magento\Framework\DataObject\Mapper::accumulateByMap($data, $address, $this->_billingAddressMap);
diff --git a/app/code/Magento/Paypal/Model/Api/PayflowNvp.php b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
index 6373c6d99fb16..b769cbe43645e 100644
--- a/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
+++ b/app/code/Magento/Paypal/Model/Api/PayflowNvp.php
@@ -136,6 +136,9 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
         'CVV2MATCH' => 'cvv2_check_result',
 
         'USERSELECTEDFUNDINGSOURCE' => 'funding_source',
+
+        'NOSHIPPING' => 'suppress_shipping',
+        'REQBILLINGADDRESS' => 'require_billing_address',
     ];
 
     /**
@@ -248,6 +251,8 @@ class PayflowNvp extends \Magento\Paypal\Model\Api\Nvp
         'PAYFLOWCOLOR',
         'LOCALECODE',
         'USERSELECTEDFUNDINGSOURCE',
+        'NOSHIPPING',
+        'REQBILLINGADDRESS',
     ];
 
     /**
@@ -727,6 +732,7 @@ protected function _prepareExpressCheckoutCallRequest(&$requestFields)
 
     /**
      * Additional response processing.
+     *
      * Hack to cut off length from API type response params.
      *
      * @param  array $response
@@ -784,7 +790,8 @@ protected function _exportLineItems(array &$request, $i = 0)
     }
 
     /**
-     * Set specific data when negative line item case
+     * Set specific data when negative line item case.
+     *
      * @return void
      */
     protected function _setSpecificForNegativeLineItems()
diff --git a/app/code/Magento/Paypal/Model/Cart.php b/app/code/Magento/Paypal/Model/Cart.php
index c8e4a6acf4649..cef17fab8d916 100644
--- a/app/code/Magento/Paypal/Model/Cart.php
+++ b/app/code/Magento/Paypal/Model/Cart.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Model;
 
 /**
@@ -177,7 +179,7 @@ protected function _applyDiscountTaxCompensationWorkaround(
     ) {
         $dataContainer = $salesEntity->getTaxContainer();
         $this->addTax((double)$dataContainer->getBaseDiscountTaxCompensationAmount());
-        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
+        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmount());
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 64a2a2943359c..b058ba129a33f 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -10,6 +10,7 @@
 
 /**
  * Config model that is aware of all \Magento\Paypal payment methods
+ *
  * Works with PayPal-specific system configuration
 
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
@@ -224,6 +225,7 @@ class Config extends AbstractConfig
         'TWD',
         'THB',
         'USD',
+        'INR',
     ];
 
     /**
@@ -631,6 +633,7 @@ public function __construct(
 
     /**
      * Check whether method available for checkout or not
+     *
      * Logic based on merchant country, methods dependence
      *
      * @param string|null $methodCode
@@ -676,7 +679,7 @@ public function isMethodAvailable($methodCode = null)
                 }
                 break;
             case self::METHOD_BILLING_AGREEMENT:
-                $result = $this->isWppApiAvailabe();
+                $result = $this->isWppApiAvailable();
                 break;
         }
         return $result;
@@ -722,6 +725,7 @@ public function getMerchantCountry()
 
     /**
      * Check whether method supported for specified country or not
+     *
      * Use $_methodCode and merchant country by default
      *
      * @param string|null $method
@@ -895,6 +899,7 @@ public function getExpressCheckoutEditUrl($token)
 
     /**
      * Get url for additional actions that PayPal may require customer to do after placing the order.
+     *
      * For instance, redirecting customer to bank for payment confirmation.
      *
      * @param string $token
@@ -956,6 +961,7 @@ public function areButtonsDynamic()
 
     /**
      * Express checkout shortcut pic URL getter
+     *
      * PayPal will ignore "pal", if there is no total amount specified
      *
      * @param string $localeCode
@@ -995,6 +1001,7 @@ public function getExpressCheckoutInContextImageUrl($localeCode)
 
     /**
      * Get PayPal "mark" image URL
+     *
      * Supposed to be used on payment methods selection
      * $staticSize is applicable for static images only
      *
@@ -1031,6 +1038,7 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n
 
     /**
      * Get "What Is PayPal" localized URL
+     *
      * Supposed to be used with "mark" as popup window
      *
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
@@ -1261,6 +1269,7 @@ public function getExpressCheckoutBASignupOptions()
 
     /**
      * Whether to ask customer to create billing agreements
+     *
      * Unilateral payments are incompatible with the billing agreements
      *
      * @return bool
@@ -1375,6 +1384,7 @@ public function exportExpressCheckoutStyleSettings(\Magento\Framework\DataObject
 
     /**
      * Dynamic PayPal image URL getter
+     *
      * Also can render dynamic Acceptance Mark
      *
      * @param string $type
@@ -1724,6 +1734,7 @@ public function getBmlPublisherId()
 
     /**
      * Get Display option from stored config
+     *
      * @param string $section
      *
      * @return mixed
@@ -1751,6 +1762,7 @@ public function getBmlDisplay($section)
 
     /**
      * Get Position option from stored config
+     *
      * @param string $section
      *
      * @return mixed
@@ -1766,6 +1778,7 @@ public function getBmlPosition($section)
 
     /**
      * Get Size option from stored config
+     *
      * @param string $section
      *
      * @return mixed
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php b/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
index d98620e27b43b..f1c414e6faa9b 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
@@ -28,7 +28,7 @@ class PaymentSectionModifier
      * Payment configuration has predefined special blocks:
      *  - Account information (id = account),
      *  - Recommended Solutions (id = recommended_solutions),
-     *  - Other PayPal paymnt solution (id = other_paypal_payment_solutions),
+     *  - Other PayPal payment solution (id = other_paypal_payment_solutions),
      *  - Other payment methods (id = other_payment_methods).
      * All payment methods configuration should be moved to one of this group.
      * To move payment method to specific configuration group specify "displayIn"
diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
index 8ba8adcede511..33fe5ec33002b 100644
--- a/app/code/Magento/Paypal/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/Express.php
@@ -10,6 +10,7 @@
 use Magento\Paypal\Model\Express\Checkout as ExpressCheckout;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Quote\Model\Quote;
@@ -274,6 +275,7 @@ protected function _setApiProcessableErrors()
 
     /**
      * Store setter
+     *
      * Also updates store ID in config object
      *
      * @param \Magento\Store\Model\Store|int $store
@@ -333,6 +335,7 @@ public function getConfigPaymentAction()
 
     /**
      * Check whether payment method can be used
+     *
      * @param \Magento\Quote\Api\Data\CartInterface|Quote|null $quote
      * @return bool
      */
@@ -363,7 +366,6 @@ public function getConfigData($field, $storeId = null)
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment
      * @param float $amount
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -375,63 +377,12 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
         }
 
         $payment->setAdditionalInformation($this->_isOrderPaymentActionKey, true);
-
         if ($payment->getIsFraudDetected()) {
             return $this;
         }
 
-        $order = $payment->getOrder();
-        $orderTransactionId = $payment->getTransactionId();
-
-        $api = $this->_callDoAuthorize($amount, $payment, $orderTransactionId);
-
-        $state = \Magento\Sales\Model\Order::STATE_PROCESSING;
-        $status = true;
-
-        $formattedPrice = $order->getBaseCurrency()->formatTxt($amount);
-        if ($payment->getIsTransactionPending()) {
-            $message = __('The ordering amount of %1 is pending approval on the payment gateway.', $formattedPrice);
-            $state = \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW;
-        } else {
-            $message = __('Ordered amount of %1', $formattedPrice);
-        }
-
-        $transaction = $this->transactionBuilder->setPayment($payment)
-            ->setOrder($order)
-            ->setTransactionId($payment->getTransactionId())
-            ->build(Transaction::TYPE_ORDER);
-        $payment->addTransactionCommentsToOrder($transaction, $message);
-
-        $this->_pro->importPaymentInfo($api, $payment);
-
-        if ($payment->getIsTransactionPending()) {
-            $message = __(
-                'We\'ll authorize the amount of %1 as soon as the payment gateway approves it.',
-                $formattedPrice
-            );
-            $state = \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW;
-            if ($payment->getIsFraudDetected()) {
-                $status = \Magento\Sales\Model\Order::STATUS_FRAUD;
-            }
-        } else {
-            $message = __('The authorized amount is %1.', $formattedPrice);
-        }
-
-        $payment->resetTransactionAdditionalInfo();
-
-        $payment->setTransactionId($api->getTransactionId());
-        $payment->setParentTransactionId($orderTransactionId);
-
-        $transaction = $this->transactionBuilder->setPayment($payment)
-            ->setOrder($order)
-            ->setTransactionId($payment->getTransactionId())
-            ->build(Transaction::TYPE_AUTH);
-        $payment->addTransactionCommentsToOrder($transaction, $message);
+        $payment->getOrder()->setActionFlag(Order::ACTION_FLAG_INVOICE, false);
 
-        $order->setState($state)
-            ->setStatus($status);
-
-        $payment->setSkipOrderProcessing(true);
         return $this;
     }
 
@@ -483,8 +434,8 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
         $authorizationTransaction = $payment->getAuthorizationTransaction();
-        $authorizationPeriod = abs(intval($this->getConfigData('authorization_honor_period')));
-        $maxAuthorizationNumber = abs(intval($this->getConfigData('child_authorization_number')));
+        $authorizationPeriod = abs((int)$this->getConfigData('authorization_honor_period'));
+        $maxAuthorizationNumber = abs((int)$this->getConfigData('child_authorization_number'));
         $order = $payment->getOrder();
         $isAuthorizationCreated = false;
 
@@ -596,6 +547,7 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
 
     /**
      * Whether payment can be reviewed
+     *
      * @return bool
      */
     public function canReviewPayment()
@@ -652,6 +604,8 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
     }
 
     /**
+     * Returns api instance
+     *
      * @return Api\Nvp
      */
     public function getApi()
@@ -669,7 +623,7 @@ public function getApi()
     public function assignData(\Magento\Framework\DataObject $data)
     {
         parent::assignData($data);
-        
+
         $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
 
         if (!is_array($additionalData)) {
@@ -677,6 +631,11 @@ public function assignData(\Magento\Framework\DataObject $data)
         }
 
         foreach ($additionalData as $key => $value) {
+            // Skip extension attributes
+            if ($key === \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) {
+                continue;
+            }
+
             $this->getInfoInstance()->setAdditionalInformation($key, $value);
         }
         return $this;
@@ -763,6 +722,7 @@ protected function _importToPayment($api, $payment)
 
     /**
      * Check void availability
+     *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      * @internal param \Magento\Framework\DataObject $payment
@@ -796,7 +756,7 @@ public function canCapture()
                 return false;
             }
 
-            $orderValidPeriod = abs(intval($this->getConfigData('order_valid_period')));
+            $orderValidPeriod = abs((int)$this->getConfigData('order_valid_period'));
 
             $dateCompass = new \DateTime($orderTransaction->getCreatedAt());
             $dateCompass->modify('+' . $orderValidPeriod . ' days');
@@ -851,7 +811,7 @@ protected function _callDoAuthorize($amount, $payment, $parentTransactionId)
      */
     protected function _isTransactionExpired(Transaction $transaction, $period)
     {
-        $period = intval($period);
+        $period = (int)$period;
         if (0 == $period) {
             return true;
         }
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index e9f2c1b8415a8..856e01f7353f2 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Model\Express;
 
 use Magento\Customer\Api\Data\CustomerInterface as CustomerDataObject;
@@ -15,7 +17,7 @@
 
 /**
  * Wrapper that performs Paypal Express and Checkout communication
- * Use current Paypal Express method instance
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -24,6 +26,7 @@ class Checkout
 {
     /**
      * Cache ID prefix for "pal" lookup
+     *
      * @var string
      */
     const PAL_CACHE_ID = 'paypal_express_checkout_pal';
@@ -365,6 +368,7 @@ public function __construct(
 
     /**
      * Checkout with PayPal image URL getter
+     *
      * Spares API calls of getting "pal" variable, by putting it into cache per store view
      *
      * @return string
@@ -498,7 +502,8 @@ public function start($returnUrl, $cancelUrl, $button = null)
         $solutionType = $this->_config->getMerchantCountry() == 'DE'
             ? \Magento\Paypal\Model\Config::EC_SOLUTION_TYPE_MARK
             : $this->_config->getValue('solutionType');
-        $this->_getApi()->setAmount($this->_quote->getBaseGrandTotal())
+        $totalAmount = round($this->_quote->getBaseGrandTotal(), 2);
+        $this->_getApi()->setAmount($totalAmount)
             ->setCurrencyCode($this->_quote->getBaseCurrencyCode())
             ->setInvNum($this->_quote->getReservedOrderId())
             ->setReturnUrl($returnUrl)
@@ -596,8 +601,8 @@ public function canSkipOrderReviewStep()
 
     /**
      * Update quote when returned from PayPal
-     * rewrite billing address by paypal
-     * save old billing address for new customer
+     *
+     * Rewrite billing address by paypal, save old billing address for new customer, and
      * export shipping address in case address absence
      *
      * @param string $token
@@ -613,14 +618,15 @@ public function returnFromPaypal($token)
 
         $this->ignoreAddressValidation();
 
+        // check if we came from the Express Checkout button
+        $isButton = (bool)$quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
+
         // import shipping address
         $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress();
         if (!$quote->getIsVirtual()) {
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingAddress) {
-                if ($exportedShippingAddress
-                    && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
-                ) {
+                if ($exportedShippingAddress && $isButton) {
                     $this->_setExportedAddressData($shippingAddress, $exportedShippingAddress);
                     // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix
                     $shippingAddress->setPrefix(null);
@@ -648,12 +654,11 @@ public function returnFromPaypal($token)
         }
 
         // import billing address
-        $portBillingFromShipping = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
-            && $this->_config->getValue(
-                'requireBillingAddress'
-            ) != \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL
-            && !$quote->isVirtual();
-        if ($portBillingFromShipping) {
+        $requireBillingAddress = (int)$this->_config->getValue(
+            'requireBillingAddress'
+        ) === \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+
+        if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) {
             $billingAddress = clone $shippingAddress;
             $billingAddress->unsAddressId()->unsAddressType()->setCustomerAddressId(null);
             $data = $billingAddress->getData();
@@ -661,11 +666,17 @@ public function returnFromPaypal($token)
             $quote->getBillingAddress()->addData($data);
             $quote->getShippingAddress()->setSameAsBilling(1);
         } else {
-            $billingAddress = $quote->getBillingAddress();
+            $billingAddress = $quote->getBillingAddress()->setCustomerAddressId(null);
         }
         $exportedBillingAddress = $this->_getApi()->getExportedBillingAddress();
 
-        $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
+        // Since country is required field for billing and shipping address,
+        // we consider the address information to be empty if country is empty.
+        $isEmptyAddress = ($billingAddress->getCountryId() === null);
+
+        if ($requireBillingAddress || $isEmptyAddress) {
+            $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
+        }
         $billingAddress->setCustomerNote($exportedBillingAddress->getData('note'));
         $quote->setBillingAddress($billingAddress);
         $quote->setCheckoutMethod($this->getCheckoutMethod());
@@ -809,7 +820,13 @@ public function place($token, $shippingMethodCode = null)
             case \Magento\Sales\Model\Order::STATE_PROCESSING:
             case \Magento\Sales\Model\Order::STATE_COMPLETE:
             case \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW:
-                $this->orderSender->send($order);
+                try {
+                    if (!$order->getEmailSent()) {
+                        $this->orderSender->send($order);
+                    }
+                } catch (\Exception $e) {
+                    $this->_logger->critical($e);
+                }
                 $this->_checkoutSession->start();
                 break;
             default:
@@ -895,12 +912,6 @@ public function getCheckoutMethod()
      */
     protected function _setExportedAddressData($address, $exportedAddress)
     {
-        // Exported data is more priority if we came from Express Checkout button
-        $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
-        if (!$isButton) {
-            return;
-        }
-
         foreach ($exportedAddress->getExportedKeys() as $key) {
             $data = $exportedAddress->getData($key);
             if (!empty($data)) {
@@ -937,6 +948,8 @@ protected function _setBillingAgreementRequest()
     }
 
     /**
+     * Get api
+     *
      * @return \Magento\Paypal\Model\Api\Nvp
      */
     protected function _getApi()
@@ -949,8 +962,9 @@ protected function _getApi()
 
     /**
      * Attempt to collect address shipping rates and return them for further usage in instant update API
-     * Returns empty array if it was impossible to obtain any shipping rate
-     * If there are shipping rates obtained, the method must return one of them as default.
+     *
+     * Returns empty array if it was impossible to obtain any shipping rate and
+     * if there are shipping rates obtained, the method must return one of them as default.
      *
      * @param Address $address
      * @param bool $mayReturnEmpty
@@ -1034,22 +1048,20 @@ protected function _prepareShippingOptions(Address $address, $mayReturnEmpty = f
      * Compare two shipping options based on their amounts
      *
      * This function is used as a callback comparison function in shipping options sorting process
-     * @see self::_prepareShippingOptions()
      *
+     * @see self::_prepareShippingOptions()
      * @param \Magento\Framework\DataObject $option1
      * @param \Magento\Framework\DataObject $option2
      * @return int
      */
     protected static function cmpShippingOptions(DataObject $option1, DataObject $option2)
     {
-        if ($option1->getAmount() == $option2->getAmount()) {
-            return 0;
-        }
-        return ($option1->getAmount() < $option2->getAmount()) ? -1 : 1;
+        return $option1->getAmount() <=> $option2->getAmount();
     }
 
     /**
      * Try to find whether the code provided by PayPal corresponds to any of possible shipping rates
+     *
      * This method was created only because PayPal has issues with returning the selected code.
      * If in future the issue is fixed, we don't need to attempt to match it. It would be enough to set the method code
      * before collecting shipping rates
@@ -1075,6 +1087,7 @@ protected function _matchShippingMethodCode(Address $address, $selectedCode)
 
     /**
      * Create payment redirect url
+     *
      * @param bool|null $button
      * @param string $token
      * @return void
@@ -1098,6 +1111,7 @@ public function getCustomerSession()
 
     /**
      * Set shipping options to api
+     *
      * @param \Magento\Paypal\Model\Cart $cart
      * @param \Magento\Quote\Model\Quote\Address|null $address
      * @return void
diff --git a/app/code/Magento/Paypal/Model/Ipn.php b/app/code/Magento/Paypal/Model/Ipn.php
index 0b12a9f26c8a2..9107762c54b69 100644
--- a/app/code/Magento/Paypal/Model/Ipn.php
+++ b/app/code/Magento/Paypal/Model/Ipn.php
@@ -7,9 +7,9 @@
 namespace Magento\Paypal\Model;
 
 use Exception;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
-use Magento\Paypal\Model\Info;
 
 /**
  * PayPal Instant Payment Notification processor model
@@ -106,7 +106,7 @@ protected function _getConfig()
         $parameters = ['params' => [$methodCode, $order->getStoreId()]];
         $this->_config = $this->_configFactory->create($parameters);
         if (!$this->_config->isMethodActive($methodCode) || !$this->_config->isMethodAvailable()) {
-            throw new Exception(sprintf('Method "%s" is not available.', $methodCode));
+            throw new Exception(sprintf('The "%s" method isn\'t available.', $methodCode));
         }
         /** @link https://cms.paypal.com/cgi-bin/marketingweb?cmd=_render-content&content_ID=
          * developer/e_howto_admin_IPNIntro */
@@ -118,7 +118,11 @@ protected function _getConfig()
         $receiver = $this->getRequestData('business') ?: $this->getRequestData('receiver_email');
         if (strtolower($merchantEmail) != strtolower($receiver)) {
             throw new Exception(
-                sprintf('The requested %s and configured %s merchant emails do not match.', $receiver, $merchantEmail)
+                sprintf(
+                    'The requested "%s" and the configured "%s" merchant emails don\'t match.',
+                    $receiver,
+                    $merchantEmail
+                )
             );
         }
 
@@ -136,7 +140,7 @@ protected function _getOrder()
         $incrementId = $this->getRequestData('invoice');
         $this->_order = $this->_orderFactory->create()->loadByIncrementId($incrementId);
         if (!$this->_order->getId()) {
-            throw new Exception(sprintf('Wrong order ID: "%s".', $incrementId));
+            throw new Exception(sprintf('The "%s" order ID is incorrect. Verify the ID and try again.', $incrementId));
         }
         return $this->_order;
     }
@@ -160,11 +164,11 @@ protected function _processOrder()
                 case Info::TXN_TYPE_NEW_CASE:
                     $this->_registerDispute();
                     break;
-                    // handle new adjustment is created
+                // handle new adjustment is created
                 case Info::TXN_TYPE_ADJUSTMENT:
                     $this->_registerAdjustment();
                     break;
-                    //handle new transaction created
+                //handle new transaction created
                 default:
                     $this->_registerTransaction();
                     break;
@@ -235,16 +239,16 @@ protected function _registerTransaction()
             case Info::PAYMENTSTATUS_COMPLETED:
                 $this->_registerPaymentCapture(true);
                 break;
-                // the holded payment was denied on paypal side
+            // the holded payment was denied on paypal side
             case Info::PAYMENTSTATUS_DENIED:
                 $this->_registerPaymentDenial();
                 break;
-                // customer attempted to pay via bank account, but failed
+            // customer attempted to pay via bank account, but failed
             case Info::PAYMENTSTATUS_FAILED:
                 // cancel order
                 $this->_registerPaymentFailure();
                 break;
-                // payment was obtained, but money were not captured yet
+            // payment was obtained, but money were not captured yet
             case Info::PAYMENTSTATUS_PENDING:
                 $this->_registerPaymentPending();
                 break;
@@ -259,14 +263,14 @@ protected function _registerTransaction()
             case Info::PAYMENTSTATUS_REFUNDED:
                 $this->_registerPaymentRefund();
                 break;
-                // authorization expire/void
+            // authorization expire/void
             case Info::PAYMENTSTATUS_EXPIRED:
                 // break is intentionally omitted
             case Info::PAYMENTSTATUS_VOIDED:
                 $this->_registerPaymentVoid();
                 break;
             default:
-                throw new Exception("Cannot handle payment status '{$paymentStatus}'.");
+                throw new Exception("The '{$paymentStatus}' payment status couldn't be handled.");
         }
     }
 
@@ -284,24 +288,12 @@ protected function _registerPaymentCapture($skipFraudDetection = false)
         $parentTransactionId = $this->getRequestData('parent_txn_id');
         $this->_importPaymentInformation();
         $payment = $this->_order->getPayment();
-        $payment->setTransactionId(
-            $this->getRequestData('txn_id')
-        );
-        $payment->setCurrencyCode(
-            $this->getRequestData('mc_currency')
-        );
-        $payment->setPreparedMessage(
-            $this->_createIpnComment('')
-        );
-        $payment->setParentTransactionId(
-            $parentTransactionId
-        );
-        $payment->setShouldCloseParentTransaction(
-            'Completed' === $this->getRequestData('auth_status')
-        );
-        $payment->setIsTransactionClosed(
-            0
-        );
+        $payment->setTransactionId($this->getRequestData('txn_id'));
+        $payment->setCurrencyCode($this->getRequestData('mc_currency'));
+        $payment->setPreparedMessage($this->_createIpnComment(''));
+        $payment->setParentTransactionId($parentTransactionId);
+        $payment->setShouldCloseParentTransaction('Completed' === $this->getRequestData('auth_status'));
+        $payment->setIsTransactionClosed(0);
         $payment->registerCaptureNotification(
             $this->getRequestData('mc_gross'),
             $skipFraudDetection && $parentTransactionId
@@ -314,9 +306,9 @@ protected function _registerPaymentCapture($skipFraudDetection = false)
             $this->orderSender->send($this->_order);
             $this->_order->addStatusHistoryComment(
                 __('You notified customer about invoice #%1.', $invoice->getIncrementId())
-            )->setIsCustomerNotified(
-                true
-            )->save();
+            )
+                ->setIsCustomerNotified(true)
+                ->save();
         }
     }
 
@@ -330,15 +322,13 @@ protected function _registerPaymentDenial()
     {
         try {
             $this->_importPaymentInformation();
-            $this->_order->getPayment()->setTransactionId(
-                $this->getRequestData('txn_id')
-            )->setNotificationResult(
-                true
-            )->setIsTransactionClosed(
-                true
-            )->deny(false);
+            $this->_order->getPayment()
+                ->setTransactionId($this->getRequestData('txn_id'))
+                ->setNotificationResult(true)
+                ->setIsTransactionClosed(true)
+                ->deny(false);
             $this->_order->save();
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             if ($e->getMessage() != __('We cannot cancel this order.')) {
                 throw $e;
             }
@@ -370,7 +360,7 @@ public function _registerPaymentPending()
             return;
         }
         if ('order' === $reason) {
-            throw new Exception('The "order" authorizations are not implemented.');
+            throw new Exception('The "order" authorizations aren\'t implemented.');
         }
         // case when was placed using PayPal standard
         if (\Magento\Sales\Model\Order::STATE_PENDING_PAYMENT == $this->_order->getState()
@@ -382,13 +372,11 @@ public function _registerPaymentPending()
 
         $this->_importPaymentInformation();
 
-        $this->_order->getPayment()->setPreparedMessage(
-            $this->_createIpnComment($this->_paypalInfo->explainPendingReason($reason))
-        )->setTransactionId(
-            $this->getRequestData('txn_id')
-        )->setIsTransactionClosed(
-            0
-        )->update(false);
+        $this->_order->getPayment()
+            ->setPreparedMessage($this->_createIpnComment($this->_paypalInfo->explainPendingReason($reason)))
+            ->setTransactionId($this->getRequestData('txn_id'))
+            ->setIsTransactionClosed(0)
+            ->update(false);
         $this->_order->save();
     }
 
@@ -405,19 +393,12 @@ protected function _registerPaymentAuthorization()
             $payment->update(true);
         } else {
             $this->_importPaymentInformation();
-            $payment->setPreparedMessage(
-                $this->_createIpnComment('')
-            )->setTransactionId(
-                $this->getRequestData('txn_id')
-            )->setParentTransactionId(
-                $this->getRequestData('parent_txn_id')
-            )->setCurrencyCode(
-                $this->getRequestData('mc_currency')
-            )->setIsTransactionClosed(
-                0
-            )->registerAuthorizationNotification(
-                $this->getRequestData('mc_gross')
-            );
+            $payment->setPreparedMessage($this->_createIpnComment(''))
+                ->setTransactionId($this->getRequestData('txn_id'))
+                ->setParentTransactionId($this->getRequestData('parent_txn_id'))
+                ->setCurrencyCode($this->getRequestData('mc_currency'))
+                ->setIsTransactionClosed(0)
+                ->registerAuthorizationNotification($this->getRequestData('mc_gross'));
         }
         if (!$this->_order->getEmailSent()) {
             $this->orderSender->send($this->_order);
@@ -445,12 +426,13 @@ protected function _registerPaymentReversal()
     {
         $reasonCode = $this->getRequestData('reason_code');
         $reasonComment = $this->_paypalInfo->explainReasonCode($reasonCode);
-        $notificationAmount = $this->_order->getBaseCurrency()->formatTxt(
-            $this->getRequestData('mc_gross') + $this->getRequestData('mc_fee')
-        );
+        $notificationAmount = $this->_order->getBaseCurrency()
+            ->formatTxt(
+                $this->getRequestData('mc_gross') + $this->getRequestData('mc_fee')
+            );
         $paymentStatus = $this->_filterPaymentStatus($this->getRequestData('payment_status'));
         $orderStatus = $paymentStatus ==
-            Info::PAYMENTSTATUS_REVERSED ? Info::ORDER_STATUS_REVERSED : Info::ORDER_STATUS_CANCELED_REVERSAL;
+        Info::PAYMENTSTATUS_REVERSED ? Info::ORDER_STATUS_REVERSED : Info::ORDER_STATUS_CANCELED_REVERSAL;
         //Change order status to PayPal Reversed/PayPal Cancelled Reversal if it is possible.
         $message = __(
             'IPN "%1". %2 Transaction amount %3. Transaction ID: "%4"',
@@ -460,8 +442,9 @@ protected function _registerPaymentReversal()
             $this->getRequestData('txn_id')
         );
         $this->_order->setStatus($orderStatus);
-        $this->_order->save();
-        $this->_order->addStatusHistoryComment($message, $orderStatus)->setIsCustomerNotified(false)->save();
+        $this->_order->addStatusHistoryComment($message, $orderStatus)
+            ->setIsCustomerNotified(false)
+            ->save();
     }
 
     /**
@@ -474,17 +457,12 @@ protected function _registerPaymentRefund()
         $this->_importPaymentInformation();
         $reason = $this->getRequestData('reason_code');
         $isRefundFinal = !$this->_paypalInfo->isReversalDisputable($reason);
-        $payment = $this->_order->getPayment()->setPreparedMessage(
-            $this->_createIpnComment($this->_paypalInfo->explainReasonCode($reason))
-        )->setTransactionId(
-            $this->getRequestData('txn_id')
-        )->setParentTransactionId(
-            $this->getRequestData('parent_txn_id')
-        )->setIsTransactionClosed(
-            $isRefundFinal
-        )->registerRefundNotification(
-            -1 * $this->getRequestData('mc_gross')
-        );
+        $payment = $this->_order->getPayment()
+            ->setPreparedMessage($this->_createIpnComment($this->_paypalInfo->explainReasonCode($reason)))
+            ->setTransactionId($this->getRequestData('txn_id'))
+            ->setParentTransactionId($this->getRequestData('parent_txn_id'))
+            ->setIsTransactionClosed($isRefundFinal)
+            ->registerRefundNotification(-1 * $this->getRequestData('mc_gross'));
         $this->_order->save();
 
         // TODO: there is no way to close a capture right now
@@ -494,9 +472,9 @@ protected function _registerPaymentRefund()
             $this->creditmemoSender->send($creditMemo);
             $this->_order->addStatusHistoryComment(
                 __('You notified customer about creditmemo #%1.', $creditMemo->getIncrementId())
-            )->setIsCustomerNotified(
-                true
-            )->save();
+            )
+                ->setIsCustomerNotified(true)
+                ->save();
         }
     }
 
@@ -509,19 +487,14 @@ protected function _registerPaymentVoid()
     {
         $this->_importPaymentInformation();
 
-        $parentTxnId = $this->getRequestData(
-            'transaction_entity'
-        ) == 'auth' ? $this->getRequestData(
-            'txn_id'
-        ) : $this->getRequestData(
-            'parent_txn_id'
-        );
+        $parentTxnId = $this->getRequestData('transaction_entity') == 'auth'
+            ? $this->getRequestData('txn_id')
+            : $this->getRequestData('parent_txn_id');
 
-        $this->_order->getPayment()->setPreparedMessage(
-            $this->_createIpnComment('')
-        )->setParentTransactionId(
-            $parentTxnId
-        )->registerVoidNotification();
+        $this->_order->getPayment()
+            ->setPreparedMessage($this->_createIpnComment(''))
+            ->setParentTransactionId($parentTxnId)
+            ->registerVoidNotification();
 
         $this->_order->save();
     }
@@ -542,14 +515,14 @@ protected function _importPaymentInformation()
         // collect basic information
         $from = [];
         foreach ([
-            Info::PAYER_ID,
-            'payer_email' => Info::PAYER_EMAIL,
-            Info::PAYER_STATUS,
-            Info::ADDRESS_STATUS,
-            Info::PROTECTION_EL,
-            Info::PAYMENT_STATUS,
-            Info::PENDING_REASON,
-        ] as $privateKey => $publicKey) {
+                     Info::PAYER_ID,
+                     'payer_email' => Info::PAYER_EMAIL,
+                     Info::PAYER_STATUS,
+                     Info::ADDRESS_STATUS,
+                     Info::PROTECTION_EL,
+                     Info::PAYMENT_STATUS,
+                     Info::PENDING_REASON,
+                 ] as $privateKey => $publicKey) {
             if (is_int($privateKey)) {
                 $privateKey = $publicKey;
             }
diff --git a/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php b/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php
index 661d1f3814a0b..1ec7f4832bcb2 100644
--- a/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php
+++ b/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php
@@ -24,7 +24,7 @@ class AvsEmsCodeMapper implements PaymentVerificationInterface
      *
      * @var string
      */
-    private static $unavailableCode = 'U';
+    private static $unavailableCode = '';
 
     /**
      * List of mapping AVS codes
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
index 9d215ca6cbe17..da5599984b701 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -11,7 +11,6 @@
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Paypal\Model\Payflowpro;
 use Magento\Quote\Model\Quote;
-use Magento\Sales\Model\Order\Payment;
 
 /**
  * Class SecureToken
@@ -59,6 +58,7 @@ public function __construct(
      */
     public function requestToken(Quote $quote)
     {
+        $this->transparent->setStore($quote->getStoreId());
         $request = $this->transparent->buildBasicRequest();
 
         $request->setTrxtype(Payflowpro::TRXTYPE_AUTH_ONLY);
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index c161580c1b7f1..c308731c69527 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Paypal\Model\Payflow;
 
 use Magento\Payment\Helper\Formatter;
@@ -177,7 +178,7 @@ public function authorize(InfoInterface $payment, $amount)
         } catch (LocalizedException $exception) {
             $payment->setParentTransactionId($response->getData(self::PNREF));
             $this->void($payment);
-            throw new LocalizedException(__('Error processing payment. Please try again later.'));
+            throw new LocalizedException(__("The payment couldn't be processed at this time. Please try again later."));
         }
 
         $this->setTransStatus($payment, $response);
diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
index 792309bd76cf9..1955ef3c67661 100644
--- a/app/code/Magento/Paypal/Model/Payflowlink.php
+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
@@ -10,6 +10,7 @@
 use Magento\Payment\Model\Method\ConfigInterfaceFactory;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 
 /**
@@ -239,11 +240,13 @@ public function initialize($paymentAction, $stateObject)
             case \Magento\Paypal\Model\Config::PAYMENT_ACTION_AUTH:
             case \Magento\Paypal\Model\Config::PAYMENT_ACTION_SALE:
                 $payment = $this->getInfoInstance();
+                /** @var Order $order */
                 $order = $payment->getOrder();
                 $order->setCanSendNewEmailFlag(false);
                 $payment->setAmountAuthorized($order->getTotalDue());
                 $payment->setBaseAmountAuthorized($order->getBaseTotalDue());
                 $this->_generateSecureSilentPostHash($payment);
+                $this->setStore($order->getStoreId());
                 $request = $this->_buildTokenRequest($payment);
                 $response = $this->postRequest($request, $this->getConfig());
                 $this->_processTokenErrors($response, $payment);
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
index 0e8d6db5e9a28..aeea4c75933b5 100644
--- a/app/code/Magento/Paypal/Model/Payflowpro.php
+++ b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Paypal\Model;
 
 use Magento\Framework\DataObject;
@@ -419,6 +420,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $request->setTrxtype(self::TRXTYPE_SALE);
             $request->setOrigid($payment->getAdditionalInformation(self::PNREF));
             $payment->unsAdditionalInformation(self::PNREF);
+            $request->setData('currency', $payment->getOrder()->getBaseCurrencyCode());
         } elseif ($payment->getParentTransactionId()) {
             $request = $this->buildBasicRequest();
             $request->setOrigid($payment->getParentTransactionId());
@@ -471,6 +473,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
 
     /**
      * Check void availability
+     *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -583,7 +586,7 @@ public function getConfig()
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function postRequest(DataObject $request, ConfigInterface $config)
     {
@@ -646,21 +649,21 @@ public function buildBasicRequest()
      *
      * @param DataObject $response
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Payment\Gateway\Command\CommandException
      * @throws \Magento\Framework\Exception\State\InvalidTransitionException
      */
     public function processErrors(DataObject $response)
     {
         if ($response->getResultCode() == self::RESPONSE_CODE_VOID_ERROR) {
             throw new \Magento\Framework\Exception\State\InvalidTransitionException(
-                __('You cannot void a verification transaction.')
+                __("The verification transaction can't be voided. ")
             );
         } elseif ($response->getResultCode() != self::RESPONSE_CODE_APPROVED &&
             $response->getResultCode() != self::RESPONSE_CODE_FRAUDSERVICE_FILTER
         ) {
-            throw new \Magento\Framework\Exception\LocalizedException(__($response->getRespmsg()));
+            throw new \Magento\Payment\Gateway\Command\CommandException(__($response->getRespmsg()));
         } elseif ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_FILTER) {
-            throw new \Magento\Framework\Exception\LocalizedException(__($response->getRespmsg()));
+            throw new \Magento\Payment\Gateway\Command\CommandException(__($response->getRespmsg()));
         }
     }
 
@@ -718,6 +721,8 @@ public function reviewPayment(InfoInterface $payment, $action)
     }
 
     /**
+     * Set billing address
+     *
      * @param DataObject $request
      * @param DataObject $billing
      *
@@ -744,6 +749,8 @@ public function setBilling(DataObject $request, $billing)
     }
 
     /**
+     * Set shipping address
+     *
      * @param DataObject $request
      * @param DataObject $shipping
      *
@@ -814,6 +821,8 @@ public function mapGatewayResponse(array $postData, DataObject $response)
     }
 
     /**
+     * Set transaction status
+     *
      * @param DataObject $payment
      * @param DataObject $response
      *
@@ -847,6 +856,8 @@ public function setTransStatus($payment, $response)
     }
 
     /**
+     * Fill customer contacts
+     *
      * @param DataObject $order
      * @param DataObject $request
      * @return DataObject
@@ -868,6 +879,7 @@ public function fillCustomerContacts(DataObject $order, DataObject $request)
 
     /**
      * Add order details to payment request
+     *
      * @param DataObject $request
      * @param Order $order
      * @return void
@@ -916,6 +928,8 @@ public function assignData(DataObject $data)
     }
 
     /**
+     * Make a transaction Inquiry Request
+     *
      * @param InfoInterface $payment
      * @param string $transactionId
      * @return DataObject
diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php
index dfd4415983ffb..5e9159bd2c243 100644
--- a/app/code/Magento/Paypal/Model/Pro.php
+++ b/app/code/Magento/Paypal/Model/Pro.php
@@ -123,7 +123,7 @@ public function setMethod($code, $storeId = null)
     /**
      * Config instance setter
      *
-     * @param \Magento\Paypal\Model\Config $instace
+     * @param \Magento\Paypal\Model\Config $instance
      * @param int|null $storeId
      * @return $this
      */
@@ -256,7 +256,7 @@ public function capture(\Magento\Framework\DataObject $payment, $amount)
         }
         $api = $this->getApi()
             ->setAuthorizationId($authTransactionId)
-            ->setIsCaptureComplete($payment->getShouldCloseParentTransaction())
+            ->setIsCaptureComplete($payment->isCaptureFinal($amount))
             ->setAmount($amount);
 
         $order = $payment->getOrder();
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement.php b/app/code/Magento/Paypal/Model/Report/Settlement.php
index 12307977d7e36..462ca2f979420 100644
--- a/app/code/Magento/Paypal/Model/Report/Settlement.php
+++ b/app/code/Magento/Paypal/Model/Report/Settlement.php
@@ -237,6 +237,7 @@ public function beforeSave()
 
     /**
      * Goes to specified host/path and fetches reports from there.
+     *
      * Save reports to database.
      *
      * @param \Magento\Framework\Filesystem\Io\Sftp $connection
@@ -369,7 +370,8 @@ public function parseCsv($localCsv, $format = 'new')
                     // Section columns.
                     // In case ever the column order is changed, we will have the items recorded properly
                     // anyway. We have named, not numbered columns.
-                    for ($i = 1; $i < count($line); $i++) {
+                    $count = count($line);
+                    for ($i = 1; $i < $count; $i++) {
                         $sectionColumns[$line[$i]] = $i;
                     }
                     $flippedSectionColumns = array_flip($sectionColumns);
@@ -445,11 +447,11 @@ private function formatDateTimeColumns($lineItem)
      */
     private function formatAmountColumn($lineItem)
     {
-        return intval($lineItem) / 100;
+        return (int)$lineItem / 100;
     }
 
     /**
-     * Load report by unique key (accoutn + report date)
+     * Load report by unique key (account + report date)
      *
      * @return $this
      */
@@ -516,6 +518,7 @@ public function getFieldLabel($field)
 
     /**
      * Iterate through website configurations and collect all SFTP configurations
+     *
      * Filter config values if necessary
      *
      * @param bool $automaticMode Whether to skip settings with disabled Automatic Fetching or not
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
index d9d69e5b489c8..6af182cac2a42 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
@@ -88,7 +88,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
                 }
                 $connection->commit();
             } catch (\Exception $e) {
-                $connection->rollback();
+                $connection->rollBack();
             }
         }
 
diff --git a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
new file mode 100644
index 0000000000000..edb50acc5ee76
--- /dev/null
+++ b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Plugin;
+
+use Magento\Paypal\Model\Adminhtml\Express;
+use Magento\Sales\Model\Order;
+
+/**
+ * Decorates Order::canInvoice method for PayPal Express payments.
+ */
+class OrderCanInvoice
+{
+    /**
+     * @var Express
+     */
+    private $express;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Express $express
+     */
+    public function __construct(Express $express)
+    {
+        $this->express = $express;
+    }
+
+    /**
+     * Checks a possibility to invoice of PayPal Express payments when payment action is "order".
+     *
+     * @param Order $order
+     * @param bool $result
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function afterCanInvoice(Order $order, bool $result): bool
+    {
+        if (!$order->getPayment()) {
+            return false;
+        }
+
+        if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php
new file mode 100644
index 0000000000000..d8582b25c7be8
--- /dev/null
+++ b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Plugin;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Paypal\Model\Adminhtml\Express;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order\Validation\CanInvoice;
+
+/**
+ * Decorates order canInvoice validator method for PayPal Express payments
+ * when payment action set to "Order".
+ */
+class ValidatorCanInvoice
+{
+    /**
+     * @var Express
+     */
+    private $express;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Express $express
+     */
+    public function __construct(Express $express)
+    {
+        $this->express = $express;
+    }
+
+    /**
+     * Checks a possibility to invoice of PayPal Express payments when payment action is "order".
+     *
+     * @param CanInvoice $subject
+     * @param array $result
+     * @param OrderInterface $order
+     * @return array
+     * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterValidate(CanInvoice $subject, array $result, OrderInterface $order): array
+    {
+        if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) {
+            $result[] = __('An invoice cannot be created when none of authorization transactions available.');
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Paypal/Setup/InstallData.php b/app/code/Magento/Paypal/Setup/InstallData.php
deleted file mode 100644
index 688d7dabb2ceb..0000000000000
--- a/app/code/Magento/Paypal/Setup/InstallData.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Paypal\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Quote\Setup\QuoteSetupFactory;
-use Magento\Sales\Setup\SalesSetupFactory;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * @var SalesSetupFactory
-     */
-    protected $salesSetupFactory;
-
-    /**
-     * @var QuoteSetupFactory
-     */
-    protected $quoteSetupFactory;
-
-    /**
-     * @param SalesSetupFactory $salesSetupFactory
-     * @param QuoteSetupFactory $quoteSetupFactory
-     */
-    public function __construct(SalesSetupFactory $salesSetupFactory, QuoteSetupFactory $quoteSetupFactory)
-    {
-        $this->salesSetupFactory = $salesSetupFactory;
-        $this->quoteSetupFactory = $quoteSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /**
-         * Prepare database for install
-         */
-        $setup->startSetup();
-
-        $quoteInstaller = $this->quoteSetupFactory->create(['resourceName' => 'quote_setup', 'setup' => $setup]);
-        $salesInstaller = $this->salesSetupFactory->create(['resourceName' => 'sales_setup', 'setup' => $setup]);
-        /**
-         * Add paypal attributes to the:
-         *  - sales/flat_quote_payment_item table
-         *  - sales/flat_order table
-         */
-        $quoteInstaller->addAttribute('quote_payment', 'paypal_payer_id', []);
-        $quoteInstaller->addAttribute('quote_payment', 'paypal_payer_status', []);
-        $quoteInstaller->addAttribute('quote_payment', 'paypal_correlation_id', []);
-        $salesInstaller->addAttribute(
-            'order',
-            'paypal_ipn_customer_notified',
-            ['type' => 'int', 'visible' => false, 'default' => 0]
-        );
-
-        $data = [];
-        $statuses = [
-            'pending_paypal' => __('Pending PayPal'),
-            'paypal_reversed' => __('PayPal Reversed'),
-            'paypal_canceled_reversal'  => __('PayPal Canceled Reversal'),
-        ];
-        foreach ($statuses as $code => $info) {
-            $data[] = ['status' => $code, 'label' => $info];
-        }
-        $setup->getConnection()
-            ->insertArray($setup->getTable('sales_order_status'), ['status', 'label'], $data);
-
-        /**
-         * Prepare database after install
-         */
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Paypal/Setup/InstallSchema.php b/app/code/Magento/Paypal/Setup/InstallSchema.php
deleted file mode 100644
index cf885981783fa..0000000000000
--- a/app/code/Magento/Paypal/Setup/InstallSchema.php
+++ /dev/null
@@ -1,425 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Paypal\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        /**
-         * Prepare database for install
-         */
-        $installer->startSetup();
-
-        /**
-         * Create table 'paypal_billing_agreement'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('paypal_billing_agreement')
-        )->addColumn(
-            'agreement_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Agreement Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Customer Id'
-        )->addColumn(
-            'method_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Method Code'
-        )->addColumn(
-            'reference_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Reference Id'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            ['nullable' => false],
-            'Status'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Updated At'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'agreement_label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Agreement Label'
-        )->addIndex(
-            $installer->getIdxName('paypal_billing_agreement', ['customer_id']),
-            ['customer_id']
-        )->addIndex(
-            $installer->getIdxName('paypal_billing_agreement', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('paypal_billing_agreement', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('paypal_billing_agreement', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Billing Agreement'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'paypal_billing_agreement_order'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('paypal_billing_agreement_order')
-        )->addColumn(
-            'agreement_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Agreement Id'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Order Id'
-        )->addIndex(
-            $installer->getIdxName('paypal_billing_agreement_order', ['order_id']),
-            ['order_id']
-        )->addForeignKey(
-            $installer->getFkName(
-                'paypal_billing_agreement_order',
-                'agreement_id',
-                'paypal_billing_agreement',
-                'agreement_id'
-            ),
-            'agreement_id',
-            $installer->getTable('paypal_billing_agreement'),
-            'agreement_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('paypal_billing_agreement_order', 'order_id', 'sales_order', 'entity_id'),
-            'order_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Billing Agreement Order'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'paypal_settlement_report'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('paypal_settlement_report')
-        )->addColumn(
-            'report_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Report Id'
-        )->addColumn(
-            'report_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Report Date'
-        )->addColumn(
-            'account_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            [],
-            'Account Id'
-        )->addColumn(
-            'filename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            24,
-            [],
-            'Filename'
-        )->addColumn(
-            'last_modified',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Last Modified'
-        )->addIndex(
-            $installer->getIdxName(
-                'paypal_settlement_report',
-                ['report_date', 'account_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['report_date', 'account_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->setComment(
-            'Paypal Settlement Report Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'paypal_settlement_report_row'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('paypal_settlement_report_row')
-        )->addColumn(
-            'row_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Row Id'
-        )->addColumn(
-            'report_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Report Id'
-        )->addColumn(
-            'transaction_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            19,
-            [],
-            'Transaction Id'
-        )->addColumn(
-            'invoice_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            127,
-            [],
-            'Invoice Id'
-        )->addColumn(
-            'paypal_reference_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            19,
-            [],
-            'Paypal Reference Id'
-        )->addColumn(
-            'paypal_reference_id_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Paypal Reference Id Type'
-        )->addColumn(
-            'transaction_event_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            5,
-            [],
-            'Transaction Event Code'
-        )->addColumn(
-            'transaction_initiation_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Transaction Initiation Date'
-        )->addColumn(
-            'transaction_completion_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Transaction Completion Date'
-        )->addColumn(
-            'transaction_debit_or_credit',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            ['nullable' => false, 'default' => 'CR'],
-            'Transaction Debit Or Credit'
-        )->addColumn(
-            'gross_transaction_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '20,6',
-            ['nullable' => false, 'default' => '0.000000'],
-            'Gross Transaction Amount'
-        )->addColumn(
-            'gross_transaction_currency',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            ['default' => false],
-            'Gross Transaction Currency'
-        )->addColumn(
-            'fee_debit_or_credit',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            [],
-            'Fee Debit Or Credit'
-        )->addColumn(
-            'fee_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '20,6',
-            ['nullable' => false, 'default' => '0.000000'],
-            'Fee Amount'
-        )->addColumn(
-            'fee_currency',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Fee Currency'
-        )->addColumn(
-            'custom_field',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Custom Field'
-        )->addColumn(
-            'consumer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            127,
-            [],
-            'Consumer Id'
-        )->addColumn(
-            'payment_tracking_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Payment Tracking ID'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Store ID'
-        )->addIndex(
-            $installer->getIdxName('paypal_settlement_report_row', ['report_id']),
-            ['report_id']
-        )->addForeignKey(
-            $installer->getFkName('paypal_settlement_report_row', 'report_id', 'paypal_settlement_report', 'report_id'),
-            'report_id',
-            $installer->getTable('paypal_settlement_report'),
-            'report_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Paypal Settlement Report Row Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'paypal_cert'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('paypal_cert')
-        )->addColumn(
-            'cert_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Cert Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website Id'
-        )->addColumn(
-            'content',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64K',
-            [],
-            'Content'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Updated At'
-        )->addIndex(
-            $installer->getIdxName('paypal_cert', ['website_id']),
-            ['website_id']
-        )->addForeignKey(
-            $installer->getFkName('paypal_cert', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Paypal Certificate Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'paypal_payment_transaction'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('paypal_payment_transaction')
-        )->addColumn(
-            'transaction_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'txn_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            [],
-            'Txn Id'
-        )->addColumn(
-            'additional_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
-            '64K',
-            [],
-            'Additional Information'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Created At'
-        )->addIndex(
-            $installer->getIdxName(
-                'paypal_payment_transaction',
-                ['txn_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['txn_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->setComment(
-            'PayPal Payflow Link Payment Transaction'
-        );
-        $installer->getConnection()->createTable($table);
-        /**
-         * Prepare database after install
-         */
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php b/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php
new file mode 100644
index 0000000000000..495b7618cce49
--- /dev/null
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Setup\Patch\Data;
+
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddPaypalOrderStates
+ * @package Magento\Paypal\Setup\Patch
+ */
+class AddPaypalOrderStatuses implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * AddPaypalOrderStates constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param QuoteSetupFactory $quoteSetupFactory
+     * @param SalesSetupFactory $salesSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        QuoteSetupFactory $quoteSetupFactory,
+        SalesSetupFactory $salesSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->quoteSetupFactory = $quoteSetupFactory;
+        $this->salesSetupFactory = $salesSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /**
+         * Prepare database for install
+         */
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        $quoteInstaller = $this->quoteSetupFactory->create();
+        $salesInstaller = $this->salesSetupFactory->create();
+        /**
+         * Add paypal attributes to the:
+         *  - sales/flat_quote_payment_item table
+         *  - sales/flat_order table
+         */
+        $quoteInstaller->addAttribute('quote_payment', 'paypal_payer_id', []);
+        $quoteInstaller->addAttribute('quote_payment', 'paypal_payer_status', []);
+        $quoteInstaller->addAttribute('quote_payment', 'paypal_correlation_id', []);
+        $salesInstaller->addAttribute(
+            'order',
+            'paypal_ipn_customer_notified',
+            ['type' => 'int', 'visible' => false, 'default' => 0]
+        );
+        $data = [];
+        $statuses = [
+            'pending_paypal' => __('Pending PayPal'),
+            'paypal_reversed' => __('PayPal Reversed'),
+            'paypal_canceled_reversal'  => __('PayPal Canceled Reversal'),
+        ];
+        foreach ($statuses as $code => $info) {
+            $data[] = ['status' => $code, 'label' => $info];
+        }
+        $this->moduleDataSetup->getConnection()->insertArray(
+            $this->moduleDataSetup->getTable('sales_order_status'),
+            ['status', 'label'],
+            $data
+        );
+        /**
+         * Prepare database after install
+         */
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Paypal/Setup/UpgradeSchema.php b/app/code/Magento/Paypal/Setup/UpgradeSchema.php
deleted file mode 100644
index c32b9ac2ba49a..0000000000000
--- a/app/code/Magento/Paypal/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Paypal\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * Upgrade the Paypal module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $setup->getConnection()->modifyColumn(
-                $setup->getTable('paypal_settlement_report'),
-                'report_date',
-                [
-                    'type' => Table::TYPE_DATE,
-                    'comment' => 'Report Date'
-                ]
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
new file mode 100644
index 0000000000000..6d5f80e30dc7f
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SamplePaypalConfig" type="paypal_config_state">
+        <requiredEntity type="business_account">SampleBusinessAccount</requiredEntity>
+        <requiredEntity type="api_username">SampleApiUsername</requiredEntity>
+        <requiredEntity type="api_password">SampleApiPassword</requiredEntity>
+        <requiredEntity type="api_signature">SampleApiSignature</requiredEntity>
+        <requiredEntity type="api_authentication">SampleApiAuthentication</requiredEntity>
+        <requiredEntity type="sandbox_flag">SampleSandboxFlag</requiredEntity>
+        <requiredEntity type="use_proxy">SampleUseProxy</requiredEntity>
+    </entity>
+    <entity name="SampleBusinessAccount" type="business_account">
+        <data key="value">myBusinessAccount@magento.com</data>
+    </entity>
+    <entity name="SampleApiUsername" type="api_username">
+        <data key="value">myApiUsername.magento.com</data>
+    </entity>
+    <entity name="SampleApiPassword" type="api_password">
+        <data key="value">somePassword</data>
+    </entity>
+    <entity name="SampleApiSignature" type="api_signature">
+        <data key="value">someApiSignature</data>
+    </entity>
+    <entity name="SampleApiAuthentication" type="api_authentication">
+        <data key="value">0</data>
+    </entity>
+    <entity name="SampleSandboxFlag" type="sandbox_flag">
+        <data key="value">0</data>
+    </entity>
+    <entity name="SampleUseProxy" type="use_proxy">
+        <data key="value">0</data>
+    </entity>
+
+    <!-- default configuration used to restore Magento config -->
+    <entity name="DefaultPayPalConfig" type="paypal_config_state">
+        <requiredEntity type="business_account">DefaultBusinessAccount</requiredEntity>
+        <requiredEntity type="api_username">DefaultApiUsername</requiredEntity>
+        <requiredEntity type="api_password">DefaultApiPassword</requiredEntity>
+        <requiredEntity type="api_signature">DefaultApiSignature</requiredEntity>
+    </entity>
+    <entity name="DefaultBusinessAccount" type="business_account">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultApiUsername" type="api_username">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultApiPassword" type="api_password">
+        <data key="value"/>
+    </entity>
+    <entity name="DefaultApiSignature" type="api_signature">
+        <data key="value"/>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE.txt b/app/code/Magento/Paypal/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE.txt
rename to app/code/Magento/Paypal/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE_AFL.txt b/app/code/Magento/Paypal/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE_AFL.txt
rename to app/code/Magento/Paypal/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml b/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml
rename to app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
index 043287868cf35..7457a90150a0f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
@@ -5,8 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreatePaypalConfigState" dataType="paypal_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
         <object key="groups" dataType="paypal_config_state">
             <object key="paypal_alternative_payment_methods" dataType="paypal_config_state">
@@ -48,4 +48,4 @@
             </object>
         </object>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml b/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
new file mode 100644
index 0000000000000..28e77e82d91f1
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigPaymentMethodsPage" url="admin/system_config/edit/section/payment/" area="admin" module="Magento_Config">
+        <section name="OtherPaymentsConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Paypal/Test/Mftf/README.md b/app/code/Magento/Paypal/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8059d5d010526
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Paypal Functional Tests
+
+The Functional Test Module for **Magento Paypal** module.
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
new file mode 100644
index 0000000000000..bca6f963058e4
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OtherPaymentsConfigSection">
+        <element name="expandedTab" type="button" selector="#payment_us_other_payment_methods-head.open"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
new file mode 100644
index 0000000000000..ac752e8412ff9
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigPaymentsSectionState">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Other Payment Methods section in Admin expanded by default"/>
+            <description value="Other Payment Methods section in Admin expanded by default"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-92043"/>
+        </annotations>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{OtherPaymentsConfigSection.expandedTab}}" stepKey="seeSectionExpanded"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php
new file mode 100644
index 0000000000000..c08d83ac00505
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Test\Unit\Block\Adminhtml\Order;
+
+use Magento\Paypal\Model\Adminhtml\Express;
+use Magento\Paypal\Block\Adminhtml\Order\View;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\Exception\LocalizedException;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test adminhtml sales order view.
+ */
+class ViewTest extends TestCase
+{
+    /**
+     * @var View
+     */
+    private $view;
+
+    /**
+     * @var Express|MockObject
+     */
+    private $express;
+
+    /**
+     * @var Payment|MockObject
+     */
+    private $payment;
+
+    /**
+     * @var Order|MockObject
+     */
+    private $order;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->order = $this->createPartialMock(
+            Order::class,
+            ['canUnhold', 'isPaymentReview', 'getState', 'isCanceled', 'getPayment']
+        );
+
+        $this->express = $this->createPartialMock(
+            Express::class,
+            ['isOrderAuthorizationAllowed']
+        );
+
+        $this->payment = $this->createMock(Payment::class);
+
+        $this->view = $objectManager->getObject(
+            View::class,
+            [
+                'express' => $this->express,
+                'data' => [],
+            ]
+        );
+    }
+
+    /**
+     * Tests if authorization action is allowed for order.
+     *
+     * @param bool $canUnhold
+     * @param bool $isPaymentReview
+     * @param bool $isCanceled
+     * @param bool $authAllowed
+     * @param string $orderState
+     * @param bool $canAuthorize
+     * @throws LocalizedException
+     * @dataProvider orderDataProvider
+     */
+    public function testIsOrderAuthorizationAllowed(
+        bool $canUnhold,
+        bool $isPaymentReview,
+        bool $isCanceled,
+        bool $authAllowed,
+        string $orderState,
+        bool $canAuthorize
+    ) {
+        $this->order->method('canUnhold')
+            ->willReturn($canUnhold);
+
+        $this->order->method('isPaymentReview')
+            ->willReturn($isPaymentReview);
+
+        $this->order->method('isCanceled')
+            ->willReturn($isCanceled);
+
+        $this->order->method('getState')
+            ->willReturn($orderState);
+
+        $this->order->method('getPayment')
+            ->willReturn($this->payment);
+
+        $this->express->method('isOrderAuthorizationAllowed')
+            ->with($this->payment)
+            ->willReturn($authAllowed);
+
+        $this->assertEquals($canAuthorize, $this->view->canAuthorize($this->order));
+    }
+
+    /**
+     * Data provider for order methods call.
+     *
+     * @return array
+     */
+    public function orderDataProvider(): array
+    {
+        return [
+            [true, false, false, true, Order::STATE_PROCESSING, false],
+            [false, true, false, true, Order::STATE_PROCESSING, false],
+            [false, false, true, true, Order::STATE_PROCESSING, false],
+            [false, false, false, false, Order::STATE_PROCESSING, false],
+            [false, false, false, true, Order::STATE_COMPLETE, false],
+            [false, false, false, true, Order::STATE_CLOSED, false],
+            [false, false, false, true, Order::STATE_PROCESSING, true],
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
index 39fc0c2dae5eb..d8487e63c6eca 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
@@ -114,6 +114,9 @@ public function testRender($requestCountry, $requestDefaultCountry, $canUseDefau
         $this->_model->render($this->_element);
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
index 461847771febd..cfdfe17b1e004 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
@@ -91,6 +91,9 @@ public function testIsCollapseState($expanded, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function isCollapseStateDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php
index d9ddd277a7df1..df9638ef47135 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php
@@ -85,6 +85,9 @@ public function testIsPaymentEnabled($groupConfig, $expected)
         $this->assertContains($expected, $html);
     }
 
+    /**
+     * @return array
+     */
     public function isPaymentEnabledDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Express/ReviewTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Express/ReviewTest.php
index 9a7a87b366fcf..27ed799a4adb7 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Express/ReviewTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Express/ReviewTest.php
@@ -84,6 +84,9 @@ public function testGetViewFileUrl($isSecure)
         $this->assertEquals('result url', $this->model->getViewFileUrl('some file'));
     }
 
+    /**
+     * @return array
+     */
     public function getViewFileUrlDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Express/PlaceOrderTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Express/PlaceOrderTest.php
index 54d5acfce9f5f..f915dca23735d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Express/PlaceOrderTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Express/PlaceOrderTest.php
@@ -36,6 +36,9 @@ protected function _expectRedirect($path = '*/*/review')
             ->with($this->anything(), $path, []);
     }
 
+    /**
+     * @return array
+     */
     public function trueFalseDataProvider()
     {
         return [[true], [false]];
@@ -79,6 +82,9 @@ public function testExecuteProcessableException($code, $paymentAction = null)
         $this->model->execute();
     }
 
+    /**
+     * @return array
+     */
     public function executeProcessableExceptionDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Express/ReturnActionTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Express/ReturnActionTest.php
index fd0182bb88c06..65250ccce08bd 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Express/ReturnActionTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Express/ReturnActionTest.php
@@ -34,6 +34,9 @@ public function testExecuteAuthorizationRetrial()
         $this->model->execute();
     }
 
+    /**
+     * @return array
+     */
     public function trueFalseDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Express/StartTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Express/StartTest.php
index 5ca7156b6f01f..36a9ae3bd5cf9 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Express/StartTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Express/StartTest.php
@@ -37,6 +37,9 @@ public function testStartAction($buttonParam)
         $this->model->execute();
     }
 
+    /**
+     * @return array
+     */
     public function startActionDataProvider()
     {
         return [['1'], [null]];
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php
index 1c7d25e37a6dd..890261c6522f1 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php
@@ -6,44 +6,105 @@
 
 namespace Magento\Paypal\Test\Unit\Controller\Ipn;
 
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Paypal\Controller\Ipn\Index;
+use Magento\Paypal\Model\IpnFactory;
+use Magento\Paypal\Model\IpnInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class IndexTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Index */
-    protected $model;
+    private $model;
 
     /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $logger;
+    private $loggerMock;
 
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
+    private $requestMock;
 
     /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $response;
+    private $responseMock;
+
+    /**
+     * @var IpnFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ipnFactoryMock;
+
+    /**
+     * @var OrderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderFactoryMock;
+
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManagerMock;
 
     protected function setUp()
     {
-        $this->logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
+        $this->ipnFactoryMock = $this->createMock(IpnFactory::class);
+        $this->orderFactoryMock = $this->createMock(OrderFactory::class);
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
-            \Magento\Paypal\Controller\Ipn\Index::class,
+            Index::class,
             [
-                'logger' => $this->logger,
-                'request' => $this->request,
-                'response' => $this->response,
+                'logger' => $this->loggerMock,
+                'request' => $this->requestMock,
+                'response' => $this->responseMock,
+                'ipnFactory' => $this->ipnFactoryMock,
+                'orderFactory' => $this->orderFactoryMock,
+                'eventManager' => $this->eventManagerMock
             ]
         );
     }
 
     public function testIndexActionException()
     {
-        $this->request->expects($this->once())->method('isPost')->will($this->returnValue(true));
+        $this->requestMock->expects($this->once())->method('isPost')->will($this->returnValue(true));
         $exception = new \Exception();
-        $this->request->expects($this->once())->method('getPostValue')->will($this->throwException($exception));
-        $this->logger->expects($this->once())->method('critical')->with($this->identicalTo($exception));
-        $this->response->expects($this->once())->method('setHttpResponseCode')->with(500);
+        $this->requestMock->expects($this->once())->method('getPostValue')->will($this->throwException($exception));
+        $this->loggerMock->expects($this->once())->method('critical')->with($this->identicalTo($exception));
+        $this->responseMock->expects($this->once())->method('setHttpResponseCode')->with(500);
+        $this->model->execute();
+    }
+
+    public function testIndexAction()
+    {
+        $this->requestMock->expects($this->once())->method('isPost')->will($this->returnValue(true));
+        $incrementId = 'incrementId';
+        $data = [
+            'invoice' => $incrementId,
+            'other' => 'other data'
+        ];
+        $this->requestMock->expects($this->exactly(2))->method('getPostValue')->willReturn($data);
+        $ipnMock = $this->createMock(IpnInterface::class);
+        $this->ipnFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(['data' => $data])
+            ->willReturn($ipnMock);
+        $ipnMock->expects($this->once())
+            ->method('processIpnRequest');
+        $orderMock = $this->createMock(Order::class);
+        $this->orderFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($orderMock);
+        $orderMock->expects($this->once())
+            ->method('loadByIncrementId')
+            ->with($incrementId)
+            ->willReturn($orderMock);
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('paypal_checkout_success', ['order' => $orderMock]);
         $this->model->execute();
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
index e25864bbc2f3c..32d3f2c73b159 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Test\Unit\Controller\Payflow;
 
+use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Checkout\Block\Onepage\Success;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Action\Context;
@@ -90,6 +91,11 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentFailures;
+
     /**
      * @inheritdoc
      */
@@ -138,17 +144,29 @@ protected function setUp()
             ->setMethods(['getLastRealOrderId', 'getLastRealOrder', 'restoreQuote'])
             ->getMock();
 
+        $this->quote = $this->getMockBuilder(CartInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->context->method('getView')
             ->willReturn($this->view);
         $this->context->method('getRequest')
             ->willReturn($this->request);
 
-        $this->returnUrl = $this->objectManager->getObject(ReturnUrl::class, [
-            'context' => $this->context,
-            'checkoutSession' => $this->checkoutSession,
-            'orderFactory' => $this->orderFactory,
-            'checkoutHelper' => $this->checkoutHelper,
-        ]);
+        $this->returnUrl = $this->objectManager->getObject(
+            ReturnUrl::class,
+            [
+                'context' => $this->context,
+                'checkoutSession' => $this->checkoutSession,
+                'orderFactory' => $this->orderFactory,
+                'checkoutHelper' => $this->checkoutHelper,
+                'paymentFailures' => $this->paymentFailures,
+            ]
+        );
     }
 
     /**
@@ -321,6 +339,7 @@ public function testCheckAdvancedAcceptingByPaymentMethod()
             'checkoutSession' => $this->checkoutSession,
             'orderFactory' => $this->orderFactory,
             'checkoutHelper' => $this->checkoutHelper,
+            'paymentFailures' => $this->paymentFailures,
         ]);
 
         $returnUrl->execute();
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php
index a10d103860c65..acefebb779200 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php
@@ -8,16 +8,16 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Registry;
+use Magento\Framework\Session\Generic as Session;
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\View\Result\LayoutFactory;
 use Magento\Paypal\Controller\Transparent\Response;
 use Magento\Paypal\Model\Payflow\Service\Response\Transaction;
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Sales\Api\PaymentFailuresInterface;
 
 /**
- * Class ResponseTest
- *
  * Test for class \Magento\Paypal\Controller\Transparent\Response
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -53,6 +53,19 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
      */
     private $payflowFacade;
 
+    /**
+     * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentFailures;
+
+    /**
+     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionTransparent;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
@@ -97,6 +110,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
+        $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['handle'])
+            ->getMock();
+        $this->sessionTransparent = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuoteId'])
+            ->getMock();
 
         $this->object = new Response(
             $this->contextMock,
@@ -104,7 +125,9 @@ protected function setUp()
             $this->transactionMock,
             $this->responseValidatorMock,
             $this->resultLayoutFactoryMock,
-            $this->payflowFacade
+            $this->payflowFacade,
+            $this->sessionTransparent,
+            $this->paymentFailures
         );
     }
 
@@ -131,6 +154,8 @@ public function testExecute()
         $this->resultLayoutMock->expects($this->once())
             ->method('getLayout')
             ->willReturn($this->getLayoutMock());
+        $this->paymentFailures->expects($this->never())
+            ->method('handle');
 
         $this->assertInstanceOf(\Magento\Framework\Controller\ResultInterface::class, $this->object->execute());
     }
@@ -156,6 +181,12 @@ public function testExecuteWithException()
         $this->resultLayoutMock->expects($this->once())
             ->method('getLayout')
             ->willReturn($this->getLayoutMock());
+        $this->sessionTransparent->method('getQuoteId')
+            ->willReturn(1);
+        $this->paymentFailures->expects($this->once())
+            ->method('handle')
+            ->with(1)
+            ->willReturnSelf();
 
         $this->assertInstanceOf(\Magento\Framework\Controller\ResultInterface::class, $this->object->execute());
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php b/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
index fd8a8a3c41f11..ffa1bf027ab57 100644
--- a/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
@@ -92,6 +92,9 @@ public function testGetConfigurationCountryCodeFromConfig($request)
         $this->configurationCountryCodeAssertResult('GB');
     }
 
+    /**
+     * @return array
+     */
     public function getConfigurationCountryCodeFromConfigDataProvider()
     {
         return [
@@ -116,6 +119,9 @@ public function testGetConfigurationCountryCodeFromDefault($request, $config, $d
         $this->configurationCountryCodeAssertResult($default);
     }
 
+    /**
+     * @return array
+     */
     public function getConfigurationCountryCodeFromDefaultDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
index bb25bea63a8bc..78bd269403b83 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -189,14 +189,14 @@ public function getValueDataProvider()
      *
      * @dataProvider isWppApiAvailabeDataProvider
      */
-    public function testIsWppApiAvailabe($returnMap, $expectedValue)
+    public function testIsWppApiAvailable($returnMap, $expectedValue)
     {
         $this->config->setMethod('paypal_express');
         $this->scopeConfigMock->expects($this->any())
             ->method('getValue')
             ->willReturnMap($returnMap);
 
-        $this->assertEquals($expectedValue, $this->config->isWppApiAvailabe());
+        $this->assertEquals($expectedValue, $this->config->isWppApiAvailable());
     }
 
     /**
@@ -273,6 +273,9 @@ public function testIsMethodAvailable($methodCode, $expectedFlag)
         $this->config->isMethodAvailable($methodCode);
     }
 
+    /**
+     * @return array
+     */
     public function isMethodAvailableDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php
new file mode 100644
index 0000000000000..0b7b9aeb2a7bb
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Test\Unit\Model\Adminhtml;
+
+use Magento\Payment\Model\MethodInterface;
+use Magento\Paypal\Model\Adminhtml\Express;
+use Magento\Paypal\Model\Api\Nvp;
+use Magento\Paypal\Model\Pro;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\Order\Payment\Transaction\Repository as TransactionRepository;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Model\Order\Payment\Transaction;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test ability to make an authorization calls to Paypal API from admin.
+ */
+class ExpressTest extends TestCase
+{
+    /**
+     * @var Express
+     */
+    private $express;
+
+    /**
+     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $payment;
+
+    /**
+     * @var MethodInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentInstance;
+
+    /**
+     * @var Pro|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pro;
+
+    /**
+     * @var Nvp|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nvp;
+
+    /**
+     * @var Order|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $order;
+
+    /**
+     * @var TransactionRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $transactionRepository;
+
+    /**
+     * @var TransactionInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $transaction;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->nvp = $this->createPartialMock(
+            Nvp::class,
+            ['getData','setProcessableErrors', 'callDoAuthorization']
+        );
+        $this->nvp->method('getData')->willReturn([]);
+        $this->nvp->method('setProcessableErrors')->willReturnSelf();
+
+        $this->pro = $this->createPartialMock(
+            Pro::class,
+            ['setMethod', 'getApi', 'importPaymentInfo']
+        );
+        $this->pro->method('getApi')->willReturn($this->nvp);
+
+        $this->transaction = $this->getMockForAbstractClass(TransactionInterface::class);
+        $this->transactionRepository = $this->createPartialMock(
+            TransactionRepository::class,
+            ['getByTransactionType']
+        );
+        $this->transactionRepository->method('getByTransactionType')->willReturn($this->transaction);
+
+        $this->express = $objectManager->getObject(
+            Express::class,
+            [
+                'data' => [$this->pro],
+                'transactionRepository' => $this->transactionRepository,
+            ]
+        );
+
+        $this->paymentInstance = $this->getMockForAbstractClass(MethodInterface::class);
+        $this->payment = $this->createPartialMock(
+            Payment::class,
+            [
+                'getAmountAuthorized',
+                'getMethod',
+                'getMethodInstance',
+                'getId',
+                'getOrder',
+                'addTransaction',
+                'addTransactionCommentsToOrder',
+                'setAmountAuthorized',
+            ]
+        );
+        $this->payment->method('getMethodInstance')
+            ->willReturn($this->paymentInstance);
+
+        $this->payment->method('addTransaction')
+            ->willReturn($this->transaction);
+    }
+
+    /**
+     * Tests payment authorization flow for order.
+     *
+     * @throws LocalizedException
+     */
+    public function testAuthorizeOrder()
+    {
+        $this->order = $this->createPartialMock(
+            Order::class,
+            ['getId', 'getPayment', 'getTotalDue', 'getBaseTotalDue']
+        );
+        $this->order->method('getPayment')
+            ->willReturn($this->payment);
+        $this->order->method('getId')
+            ->willReturn(1);
+
+        $totalDue = 15;
+        $baseTotalDue = 10;
+
+        $this->order->method('getTotalDue')
+            ->willReturn($totalDue);
+        $this->order->method('getBaseTotalDue')
+            ->willReturn($baseTotalDue);
+
+        $this->payment->method('getMethod')
+            ->willReturn('paypal_express');
+        $this->payment->method('getId')
+            ->willReturn(1);
+        $this->payment->method('getOrder')
+            ->willReturn($this->order);
+        $this->payment->method('getAmountAuthorized')
+            ->willReturn(0);
+
+        $this->paymentInstance->method('getConfigPaymentAction')
+            ->willReturn('order');
+
+        $this->nvp->expects(static::once())
+            ->method('callDoAuthorization')
+            ->willReturnSelf();
+
+        $this->payment->expects(static::once())
+            ->method('addTransaction')
+            ->with(Transaction::TYPE_AUTH)
+            ->willReturn($this->transaction);
+
+        $this->payment->method('addTransactionCommentsToOrder')
+            ->with($this->transaction);
+
+        $this->payment->method('setAmountAuthorized')
+            ->with($totalDue);
+
+        $this->express->authorizeOrder($this->order);
+    }
+
+    /**
+     * Checks if payment authorization is allowed.
+     *
+     * @param string $method
+     * @param string $action
+     * @param float $authorizedAmount
+     * @param bool $isAuthAllowed
+     * @throws LocalizedException
+     * @dataProvider paymentDataProvider
+     */
+    public function testIsOrderAuthorizationAllowed(
+        string $method,
+        string $action,
+        float $authorizedAmount,
+        bool $isAuthAllowed
+    ) {
+        $this->payment->method('getMethod')
+            ->willReturn($method);
+
+        $this->paymentInstance->method('getConfigPaymentAction')
+            ->willReturn($action);
+
+        $this->payment->method('getAmountAuthorized')
+            ->willReturn($authorizedAmount);
+
+        static::assertEquals($isAuthAllowed, $this->express->isOrderAuthorizationAllowed($this->payment));
+    }
+
+    /**
+     * Data provider for payment methods call.
+     *
+     * @return array
+     */
+    public function paymentDataProvider(): array
+    {
+        return [
+            ['paypal_express', 'sale', 10, false],
+            ['paypal_express', 'order', 50, false],
+            ['paypal_express', 'capture', 0, false],
+            ['paypal_express', 'order', 0, true],
+            ['braintree', 'authorize', 10, false],
+            ['braintree', 'authorize', 0, false],
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
index 10c432da77202..fcc7766ec298b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -132,7 +132,9 @@ protected function _invokeNvpProperty(\Magento\Paypal\Model\Api\Nvp $nvpObject,
     public function testCall($response, $processableErrors, $exception, $exceptionMessage = '', $exceptionCode = null)
     {
         if (isset($exception)) {
-            $this->expectException($exception, $exceptionMessage, $exceptionCode);
+            $this->expectException($exception);
+            $this->expectExceptionMessage($exceptionMessage);
+            $this->expectExceptionCode($exceptionCode);
         }
         $this->curl->expects($this->once())
             ->method('read')
@@ -143,6 +145,9 @@ public function testCall($response, $processableErrors, $exception, $exceptionMe
         $this->model->call('some method', ['data' => 'some data']);
     }
 
+    /**
+     * @return array
+     */
     public function callDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
index f9bb74dba5b53..28837727533d2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
@@ -70,7 +70,7 @@ protected function setUp()
     public function testInvalidGetAllItems($items)
     {
         $taxContainer = new \Magento\Framework\DataObject(
-            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amnt' => 0.1]
+            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amount' => 0.1]
         );
         $this->_salesModel->expects($this->once())->method('getTaxContainer')->will($this->returnValue($taxContainer));
         $this->_salesModel->expects($this->once())->method('getAllItems')->will($this->returnValue($items));
@@ -85,6 +85,9 @@ public function testInvalidGetAllItems($items)
         $this->assertEquals(0.3, $this->_model->getDiscount());
     }
 
+    /**
+     * @return array
+     */
     public function invalidGetAllItemsDataProvider()
     {
         return [
@@ -143,20 +146,23 @@ public function testInvalidTotalsGetAllItems($values, $transferDiscount)
         $this->assertEquals(
             $values['base_tax_amount'] +
             $values['base_discount_tax_compensation_amount'] +
-            $values['base_shipping_discount_tax_compensation_amnt'],
+            $values['base_shipping_discount_tax_compensation_amount'],
             $this->_model->getTax()
         );
         $this->assertEquals($values['base_shipping_amount'], $this->_model->getShipping());
         $this->assertEquals($transferDiscount ? 0.0 : $values['base_discount_amount'], $this->_model->getDiscount());
     }
 
+    /**
+     * @return array
+     */
     public function invalidTotalsGetAllItemsDataProvider()
     {
         return [
             [
                 [
                     'base_discount_tax_compensation_amount' => 0,
-                    'base_shipping_discount_tax_compensation_amnt' => 0,
+                    'base_shipping_discount_tax_compensation_amount' => 0,
                     'base_subtotal' => 0,
                     'base_tax_amount' => 0,
                     'base_shipping_amount' => 0,
@@ -168,7 +174,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 1,
-                    'base_shipping_discount_tax_compensation_amnt' => 2,
+                    'base_shipping_discount_tax_compensation_amount' => 2,
                     'base_subtotal' => 3,
                     'base_tax_amount' => 4,
                     'base_shipping_amount' => 5,
@@ -222,6 +228,9 @@ public function testInvalidGetAmounts($values, $transferDiscount, $transferShipp
         $this->assertEquals([Cart::AMOUNT_SUBTOTAL => $expectedSubtotal], $result);
     }
 
+    /**
+     * @return array
+     */
     public function invalidGetAmountsDataProvider()
     {
         $data = [];
@@ -246,8 +255,8 @@ protected function _prepareInvalidModelData($values, $transferDiscount)
             [
                 'base_discount_tax_compensation_amount' =>
                     $values['base_discount_tax_compensation_amount'],
-                'base_shipping_discount_tax_compensation_amnt' =>
-                    $values['base_shipping_discount_tax_compensation_amnt'],
+                'base_shipping_discount_tax_compensation_amount' =>
+                    $values['base_shipping_discount_tax_compensation_amount'],
             ]
         );
         $expectedSubtotal = $values['base_subtotal'];
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
index 6a5b2676014cb..57534345f2541 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
@@ -175,6 +175,9 @@ private function fetchAllAvailableGroups($structure)
         return $availableGroups;
     }
 
+    /**
+     * @return mixed
+     */
     public function caseProvider()
     {
         return include __DIR__ . '/_files/payment_section_structure_variations.php';
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
index 6a2d33d010190..abedc573558f1 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
@@ -5,13 +5,21 @@
  */
 namespace Magento\Paypal\Test\Unit\Model;
 
+use Magento\Checkout\Model\Session;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Paypal\Model\Api\Nvp;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 use Magento\Paypal\Model\Express;
+use Magento\Paypal\Model\Pro;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class ExpressTest
@@ -38,151 +46,159 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Express
      */
-    protected $_model;
+    private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    protected $_checkoutSession;
+    private $checkoutSession;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Pro|MockObject
      */
-    protected $_pro;
+    private $pro;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Nvp|MockObject
      */
-    protected $_nvp;
+    private $nvp;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
-    protected $_helper;
+    private $helper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var BuilderInterface|MockObject
      */
-    protected $transactionBuilder;
+    private $transactionBuilder;
 
     /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
-    private $eventManagerMock;
+    private $eventManager;
 
     protected function setUp()
     {
-        $this->_checkoutSession = $this->createPartialMock(
-            \Magento\Checkout\Model\Session::class,
+        $this->checkoutSession = $this->createPartialMock(
+            Session::class,
             ['getPaypalTransactionData', 'setPaypalTransactionData']
         );
         $this->transactionBuilder = $this->getMockForAbstractClass(
-            \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface::class,
+            BuilderInterface::class,
             [],
             '',
             false,
             false
         );
-        $this->_nvp = $this->createPartialMock(
-            \Magento\Paypal\Model\Api\Nvp::class,
-            ['setProcessableErrors', 'setAmount', 'setCurrencyCode', 'setTransactionId', 'callDoAuthorization']
+        $this->nvp = $this->createPartialMock(
+            Nvp::class,
+            [
+                'setProcessableErrors',
+                'setAmount',
+                'setCurrencyCode',
+                'setTransactionId',
+                'callDoAuthorization',
+                'setData',
+            ]
         );
-        $this->_pro = $this->createPartialMock(
-            \Magento\Paypal\Model\Pro::class,
+        $this->pro = $this->createPartialMock(
+            Pro::class,
             ['setMethod', 'getApi', 'importPaymentInfo', 'resetApi']
         );
-        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+        $this->eventManager = $this->getMockBuilder(ManagerInterface::class)
             ->setMethods(['dispatch'])
             ->getMockForAbstractClass();
 
-        $this->_pro->expects($this->any())->method('getApi')->will($this->returnValue($this->_nvp));
-        $this->_helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->pro->expects($this->any())->method('getApi')->will($this->returnValue($this->nvp));
+        $this->helper = new ObjectManager($this);
     }
 
     public function testSetApiProcessableErrors()
     {
-        $this->_nvp->expects($this->once())->method('setProcessableErrors')->with($this->errorCodes);
+        $this->nvp->expects($this->once())->method('setProcessableErrors')->with($this->errorCodes);
 
-        $this->_model = $this->_helper->getObject(
+        $this->model = $this->helper->getObject(
             \Magento\Paypal\Model\Express::class,
             [
-                'data' => [$this->_pro],
-                'checkoutSession' => $this->_checkoutSession,
-                'transactionBuilder' => $this->transactionBuilder
+                'data' => [$this->pro],
+                'checkoutSession' => $this->checkoutSession,
+                'transactionBuilder' => $this->transactionBuilder,
             ]
         );
     }
 
+    /**
+     * Tests order payment action.
+     *
+     * @return void
+     */
     public function testOrder()
     {
-        $this->_nvp->expects($this->any())->method('setProcessableErrors')->will($this->returnSelf());
-        $this->_nvp->expects($this->any())->method('setAmount')->will($this->returnSelf());
-        $this->_nvp->expects($this->any())->method('setCurrencyCode')->will($this->returnSelf());
-        $this->_nvp->expects($this->any())->method('setTransactionId')->will($this->returnSelf());
-        $this->_nvp->expects($this->any())->method('callDoAuthorization')->will($this->returnSelf());
-
-        $this->_checkoutSession->expects($this->once())->method('getPaypalTransactionData')->will(
-            $this->returnValue([])
-        );
-        $this->_checkoutSession->expects($this->once())->method('setPaypalTransactionData')->with([]);
-
-        $currency = $this->createPartialMock(\Magento\Directory\Model\Currency::class, ['__wakeup', 'formatTxt']);
-        $paymentModel = $this->createPartialMock(\Magento\Sales\Model\Order\Payment::class, [
-                '__wakeup',
-                'getBaseCurrency',
-                'getOrder',
-                'getIsTransactionPending',
-                'addStatusHistoryComment',
-                'addTransactionCommentsToOrder'
-            ]);
-        $order = $this->createPartialMock(
-            \Magento\Sales\Model\Order::class,
-            ['setState', 'getBaseCurrency', 'getBaseCurrencyCode', 'setStatus']
-        );
-        $paymentModel->expects($this->any())->method('getOrder')->willReturn($order);
-        $order->expects($this->any())->method('getBaseCurrency')->willReturn($currency);
-        $order->expects($this->any())->method('setState')->with('payment_review')->willReturnSelf();
-        $paymentModel->expects($this->any())->method('getIsTransactionPending')->will($this->returnSelf());
-        $this->transactionBuilder->expects($this->any())->method('setOrder')->with($order)->will($this->returnSelf());
-        $this->transactionBuilder->expects($this->any())->method('setPayment')->will($this->returnSelf());
-        $this->transactionBuilder->expects($this->any())->method('setTransactionId')->will($this->returnSelf());
-        $this->_model = $this->_helper->getObject(
+        $transactionData = ['TOKEN' => 'EC-7NJ4634216284232D'];
+        $this->checkoutSession
+            ->method('getPaypalTransactionData')
+            ->willReturn($transactionData);
+
+        $order = $this->createPartialMock(Order::class, ['setActionFlag']);
+        $order->method('setActionFlag')
+            ->with(Order::ACTION_FLAG_INVOICE, false)
+            ->willReturnSelf();
+
+        $paymentModel = $this->createPartialMock(Payment::class, ['getOrder']);
+        $paymentModel->method('getOrder')
+            ->willReturn($order);
+
+        $this->model = $this->helper->getObject(
             \Magento\Paypal\Model\Express::class,
             [
-                'data' => [$this->_pro],
-                'checkoutSession' => $this->_checkoutSession,
-                'transactionBuilder' => $this->transactionBuilder
+                'data' => [$this->pro],
+                'checkoutSession' => $this->checkoutSession,
             ]
         );
-        $this->assertEquals($this->_model, $this->_model->order($paymentModel, 12.3));
+
+        $this->nvp->method('setData')
+            ->with($transactionData)
+            ->willReturnSelf();
+
+        static::assertEquals($this->model, $this->model->order($paymentModel, 12.3));
     }
 
     public function testAssignData()
     {
         $transportValue = 'something';
 
+        $extensionAttribute = $this->getMockForAbstractClass(
+            \Magento\Quote\Api\Data\PaymentExtensionInterface::class,
+            [],
+            '',
+            false,
+            false
+        );
+
         $data = new DataObject(
             [
                 PaymentInterface::KEY_ADDITIONAL_DATA => [
                     Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue,
                     Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID => $transportValue,
-                    Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue
+                    Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue,
+                    \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => $extensionAttribute
                 ]
             ]
         );
 
-        $this->_model = $this->_helper->getObject(
+        $this->model = $this->helper->getObject(
             \Magento\Paypal\Model\Express::class,
             [
-                'data' => [$this->_pro],
-                'checkoutSession' => $this->_checkoutSession,
+                'data' => [$this->pro],
+                'checkoutSession' => $this->checkoutSession,
                 'transactionBuilder' => $this->transactionBuilder,
-                'eventDispatcher' => $this->eventManagerMock,
+                'eventDispatcher' => $this->eventManager,
             ]
         );
 
         $paymentInfo = $this->createMock(InfoInterface::class);
-        $this->_model->setInfoInstance($paymentInfo);
+        $this->model->setInfoInstance($paymentInfo);
 
         $this->parentAssignDataExpectation($data);
 
@@ -194,7 +210,7 @@ public function testAssignData()
                 [Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN, $transportValue]
             );
 
-        $this->_model->assignData($data);
+        $this->model->assignData($data);
     }
 
     /**
@@ -204,21 +220,21 @@ private function parentAssignDataExpectation(DataObject $data)
     {
         $eventData = [
             AbstractDataAssignObserver::METHOD_CODE => $this,
-            AbstractDataAssignObserver::MODEL_CODE => $this->_model->getInfoInstance(),
+            AbstractDataAssignObserver::MODEL_CODE => $this->model->getInfoInstance(),
             AbstractDataAssignObserver::DATA_CODE => $data
         ];
 
-        $this->eventManagerMock->expects(static::exactly(2))
+        $this->eventManager->expects(static::exactly(2))
             ->method('dispatch')
             ->willReturnMap(
                 [
                     [
-                        'payment_method_assign_data_' . $this->_model->getCode(),
-                        $eventData
+                        'payment_method_assign_data_' . $this->model->getCode(),
+                        $eventData,
                     ],
                     [
                         'payment_method_assign_data',
-                        $eventData
+                        $eventData,
                     ]
                 ]
             );
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Hostedpro/RequestTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Hostedpro/RequestTest.php
index 2a3ac1adbc07a..ed834ae2b9c01 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Hostedpro/RequestTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Hostedpro/RequestTest.php
@@ -371,6 +371,9 @@ public function amountWithoutTaxDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function amountWithoutTaxZeroSubtotalDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php
index eb259043a2d4f..ea86a04206f7b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php
@@ -85,17 +85,17 @@ public function testGetCodeWithException()
     public function getCodeDataProvider()
     {
         return [
-            ['avsZip' => null, 'avsStreet' => null, 'expected' => 'U'],
-            ['avsZip' => null, 'avsStreet' => 'Y', 'expected' => 'U'],
-            ['avsZip' => 'Y', 'avsStreet' => null, 'expected' => 'U'],
+            ['avsZip' => null, 'avsStreet' => null, 'expected' => ''],
+            ['avsZip' => null, 'avsStreet' => 'Y', 'expected' => ''],
+            ['avsZip' => 'Y', 'avsStreet' => null, 'expected' => ''],
             ['avsZip' => 'Y', 'avsStreet' => 'Y', 'expected' => 'Y'],
             ['avsZip' => 'N', 'avsStreet' => 'Y', 'expected' => 'A'],
             ['avsZip' => 'Y', 'avsStreet' => 'N', 'expected' => 'Z'],
             ['avsZip' => 'N', 'avsStreet' => 'N', 'expected' => 'N'],
-            ['avsZip' => 'X', 'avsStreet' => 'Y', 'expected' => 'U'],
-            ['avsZip' => 'N', 'avsStreet' => 'X', 'expected' => 'U'],
-            ['avsZip' => '', 'avsStreet' => 'Y', 'expected' => 'U'],
-            ['avsZip' => 'N', 'avsStreet' => '', 'expected' => 'U']
+            ['avsZip' => 'X', 'avsStreet' => 'Y', 'expected' => ''],
+            ['avsZip' => 'N', 'avsStreet' => 'X', 'expected' => ''],
+            ['avsZip' => '', 'avsStreet' => 'Y', 'expected' => ''],
+            ['avsZip' => 'N', 'avsStreet' => '', 'expected' => '']
         ];
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php
index d4a7db25cae89..d8e54ad28fcc8 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php
@@ -10,6 +10,9 @@
 use Magento\Framework\UrlInterface;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Paypal\Model\PayflowConfig;
+use Magento\Quote\Model\Quote;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Test class for \Magento\Paypal\Model\Payflow\Service\Request\SecureToken
@@ -19,23 +22,26 @@ class SecureTokenTest extends \PHPUnit\Framework\TestCase
     /**
      * @var SecureToken
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Transparent
+     * @var Transparent|MockObject
      */
-    protected $transparent;
+    private $transparent;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Random
+     * @var Random|MockObject
      */
-    protected $mathRandom;
+    private $mathRandom;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|UrlInterface
+     * @var UrlInterface|MockObject
      */
-    protected $url;
+    private $url;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
@@ -52,11 +58,29 @@ protected function setUp()
     public function testRequestToken()
     {
         $request = new DataObject();
+        $storeId = 1;
         $secureTokenID = 'Sdj46hDokds09c8k2klaGJdKLl032ekR';
+        $response = new DataObject([
+            'result' => '0',
+            'respmsg' => 'Approved',
+            'securetoken' => '80IgSbabyj0CtBDWHZZeQN3',
+            'securetokenid' => $secureTokenID,
+            'result_code' => '0',
+        ]);
+
+        $quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quote->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
 
         $this->transparent->expects($this->once())
             ->method('buildBasicRequest')
             ->willReturn($request);
+        $this->transparent->expects($this->once())
+            ->method('setStore')
+            ->with($storeId);
         $this->transparent->expects($this->once())
             ->method('fillCustomerContacts');
         $this->transparent->expects($this->once())
@@ -64,7 +88,7 @@ public function testRequestToken()
             ->willReturn($this->createMock(\Magento\Paypal\Model\PayflowConfig::class));
         $this->transparent->expects($this->once())
             ->method('postRequest')
-            ->willReturn(new DataObject());
+            ->willReturn($response);
 
         $this->mathRandom->expects($this->once())
             ->method('getUniqueHash')
@@ -73,8 +97,6 @@ public function testRequestToken()
         $this->url->expects($this->exactly(3))
             ->method('getUrl');
 
-        $quote = $this->createMock(\Magento\Quote\Model\Quote::class);
-
         $this->model->requestToken($quote);
 
         $this->assertEquals($secureTokenID, $request->getSecuretokenid());
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php
index b24ca640dea2d..dd1b4c3242732 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php
@@ -23,8 +23,8 @@ public function testConstructorSuccess()
 
     public function testConstructorException()
     {
-        $this->expectException(
-            'LogicException',
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage(
             'Type mismatch. Expected type: HandlerInterface. Actual: string, Code: weird_handler'
         );
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
index f5c9ab9a3d9f1..93a1072782448 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
@@ -67,7 +67,7 @@ public function gatewayResponseInvariants()
     {
         return [
             "Input data is a string" => ['testInput'],
-            "Input data is an object" => [new \StdClass],
+            "Input data is an object" => [new \stdClass],
             "Input data is an array" => [['test' => 'input']]
         ];
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
index 9b67cedb47885..e6a994cba78c3 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Paypal\Test\Unit\Model\Payflow;
 
 use Magento\Paypal\Block\Payment\Info;
@@ -277,7 +278,7 @@ public function testAuthorizeException()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Error processing payment. Please try again later.
+     * @expectedExceptionMessage The payment couldn't be processed at this time. Please try again later.
      */
     public function testAuthorizeValidationException()
     {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
index 362615e965d1b..80c8194e07654 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
@@ -101,16 +101,20 @@ protected function setUp()
 
     public function testInitialize()
     {
+        $storeId = 1;
         $order = $this->createMock(\Magento\Sales\Model\Order::class);
+        $order->expects($this->exactly(2))
+            ->method('getStoreId')
+            ->willReturn($storeId);
         $this->infoInstance->expects($this->any())
             ->method('getOrder')
-            ->will($this->returnValue($order));
+            ->willReturn($order);
         $this->infoInstance->expects($this->any())
             ->method('setAdditionalInformation')
-            ->will($this->returnSelf());
+            ->willReturnSelf();
         $this->paypalConfig->expects($this->once())
             ->method('getBuildNotationCode')
-            ->will($this->returnValue('build notation code'));
+            ->willReturn('build notation code');
 
         $response = new \Magento\Framework\DataObject(
             [
@@ -148,6 +152,7 @@ public function testInitialize()
 
         $stateObject = new \Magento\Framework\DataObject();
         $this->model->initialize(\Magento\Paypal\Model\Config::PAYMENT_ACTION_AUTH, $stateObject);
+        self::assertEquals($storeId, $this->model->getStore(), '{Store} should be set');
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
index c9689c8601a02..3e8af6b2ee766 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
@@ -179,6 +179,9 @@ public function testSetTransStatus($response, $paymentExpected)
         $this->assertEquals($paymentExpected->getData(), $payment->getData());
     }
 
+    /**
+     * @return array
+     */
     public function setTransStatusDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
index b0bc3d641743c..c8998f0c24129 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
@@ -119,6 +119,9 @@ public function testCapture()
             ->method('getOrder')
             ->willReturn($orderMock);
 
+        $paymentMock->method('isCaptureFinal')
+            ->willReturn(true);
+
         $this->apiMock->expects(static::once())
             ->method('getTransactionId')
             ->willReturn(45);
@@ -236,16 +239,14 @@ protected function getPaymentMock()
         $paymentMock = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
             ->disableOriginalConstructor()
             ->setMethods([
-                'getParentTransactionId', 'getOrder', 'getShouldCloseParentTransaction'
+                'getParentTransactionId', 'getOrder', 'getShouldCloseParentTransaction', 'isCaptureFinal',
             ])
             ->getMock();
         $parentTransactionId = 43;
         $paymentMock->expects(static::once())
             ->method('getParentTransactionId')
             ->willReturn($parentTransactionId);
-        $paymentMock->expects(static::once())
-            ->method('getShouldCloseParentTransaction')
-            ->willReturn(true);
+
         return $paymentMock;
     }
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddBillingAgreementToSessionObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddBillingAgreementToSessionObserverTest.php
index c1947c522b118..8e18b680ce9cd 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/AddBillingAgreementToSessionObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddBillingAgreementToSessionObserverTest.php
@@ -166,6 +166,9 @@ public function testAddBillingAgreementToSession($isValid)
         $this->_model->execute($this->_observer);
     }
 
+    /**
+     * @return array
+     */
     public function addBillingAgreementToSessionDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php
index b61e66167661e..3e68f42fd5a66 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php
@@ -46,6 +46,9 @@ protected function setUp()
         $this->_model = new \Magento\Paypal\Observer\RestrictAdminBillingAgreementUsageObserver($this->_authorization);
     }
 
+    /**
+     * @return array
+     */
     public function restrictAdminBillingAgreementUsageDataProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 65a6952e55600..b62985e8b8b70 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -5,33 +5,33 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-instant-purchase": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-vault": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-instant-purchase": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-vault": "*"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "100.3.*"
+        "magento/module-checkout-agreements": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Paypal/etc/acl.xml b/app/code/Magento/Paypal/etc/acl.xml
index 0344af13519e5..4373ebc4c12bf 100644
--- a/app/code/Magento/Paypal/etc/acl.xml
+++ b/app/code/Magento/Paypal/etc/acl.xml
@@ -33,6 +33,11 @@
                                 <resource id="Magento_Paypal::use" title="Place Order Using Billing Agreements" translate="title" sortOrder="15" />
                             </resource>
                         </resource>
+                        <resource id="Magento_Sales::sales_order"  title="Orders" translate="title" sortOrder="10">
+                            <resource id="Magento_Sales::actions" title="Actions" translate="title" sortOrder="10">
+                                <resource id="Magento_Paypal::authorization" title="Payment Amount Authorization" translate="title" sortOrder="160" />
+                            </resource>
+                        </resource>
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 1c8da8127f8fe..26ec9b3152e4b 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -32,6 +32,7 @@
             </group>
             <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other Payment Methods:</label>
+                <attribute type="expanded">1</attribute>
                 <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
                 <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
@@ -76,7 +77,7 @@
                     <group id="configuration_details">
                         <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
                     </group>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <group id="paypal_payflow_required" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <field id="enable_paypal_payflow">
                             <attribute type="shared">0</attribute>
                             <config_path>payment/paypal_payment_pro/active</config_path>
@@ -89,7 +90,7 @@
                         <label>Basic Settings - PayPal Payments Pro</label>
                     </group>
                 </group>
-                <group id="wps_express" extends="payment_all_paypal/express_checkout">
+                <group id="wps_express" translate="label comment" extends="payment_all_paypal/express_checkout">
                     <label>Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
@@ -109,7 +110,7 @@
                             <config_path>payment/wps_express_bml/active</config_path>
                         </field>
                     </group>
-                    <group id="settings_ec">
+                    <group id="settings_ec" translate="label">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
                     </group>
                 </group>
@@ -123,7 +124,7 @@
                 <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
             </group>
         </section>
-        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
+        <section id="payment_gb" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
             <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
                 <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>PayPal Express Checkout</label>
@@ -157,7 +158,7 @@
                     </group>
                 </group>
                 <include path="Magento_Paypal::system/payments_pro_hosted_solution_with_express_checkout.xml"/>
-                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
+                <group id="wps_express" translate="label comment" extends="payment_all_paypal/express_checkout" sortOrder="50">
                     <label>Website Payments Standard</label>
                     <comment>Accept credit card and PayPal payments securely.</comment>
                     <attribute type="activity_path">payment/wps_express/active</attribute>
@@ -165,7 +166,7 @@
                         <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
                     </group>
                     <group id="express_checkout_required">
-                        <group id="express_checkout_required_express_checkout">
+                        <group id="express_checkout_required_express_checkout" translate="label">
                             <label>Website Payments Standard</label>
                         </group>
                         <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
@@ -177,7 +178,7 @@
                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
                     </group>
-                    <group id="settings_ec">
+                    <group id="settings_ec" translate="label">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
                     </group>
                 </group>
@@ -226,7 +227,7 @@
                 <comment>Choose a secure bundled payment solution for your business.</comment>
                 <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
                 <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="wps_other" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Website Payments Standard</label>
                     <fieldset_css>complex</fieldset_css>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
@@ -236,7 +237,7 @@
                         <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
                     </group>
                     <group id="express_checkout_required">
-                        <group id="express_checkout_required_express_checkout">
+                        <group id="express_checkout_required_express_checkout" translate="label">
                             <label>Website Payments Standard</label>
                         </group>
                         <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
@@ -270,7 +271,7 @@
             <group id="paypal_group_all_in_one">
                 <group id="wps_other" sortOrder="20"/>
             </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="paypal_payment_gateways" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                 <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 920c612021a1a..bff076aad9cb5 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -162,7 +162,7 @@
                 <label>Enable PayPal Credit</label>
                 <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                 </comment>
                 <config_path>payment/paypal_express_bml/active</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -184,12 +184,12 @@
             <group id="advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="30">
                 <label>Advertise PayPal Credit</label>
                 <comment>
-                    <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                    <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                         from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                        or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                 </comment>
                 <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Publisher ID</label>
@@ -198,9 +198,8 @@
                     <attribute type="shared">1</attribute>
                 </field>
                 <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
-                    <label></label>
                     <button_label>Get Publisher ID from PayPal</button_label>
-                    <button_url><![CDATA[https:/financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
+                    <button_url><![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
                 </field>
                 <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index 3012ff4361483..5eb596c9c4f45 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -100,7 +100,7 @@
             <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
                 <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                 </comment>
                 <config_path>payment/payflow_express_bml/active</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index 60a4d670e8a18..d27dde02c579e 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -109,7 +109,7 @@
             <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
                 <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                 </comment>
                 <config_path>payment/payflow_express_bml/active</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
@@ -130,12 +130,12 @@
             <group id="payflow_link_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="60">
                 <label>Advertise PayPal Credit</label>
                 <comment>
-                    <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                    <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                         from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                        or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                 </comment>
                 <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
                 <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
index 80ba1c3ac03a2..77acff48c247e 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -49,7 +49,7 @@
             <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
                 <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                 </comment>
                 <requires>
                     <field id="pphs_enable"/>
@@ -58,12 +58,12 @@
             <group id="pphs_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="22">
                 <label>Advertise PayPal Credit</label>
                 <comment>
-                    <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                    <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                             from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                            or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                            or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                 </comment>
                 <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
                 <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
index 90ffeddbb812e..6090025024dd7 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
@@ -34,7 +34,7 @@
                 <label>Enable PayPal Credit</label>
                 <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                 </comment>
                 <config_path>payment/payflow_express_bml/active</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -53,12 +53,12 @@
             <group id="paypal_payflow_advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="40">
                 <label>Advertise PayPal Credit</label>
                 <comment>
-                    <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                    <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                                or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                 </comment>
                 <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
                 <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
diff --git a/app/code/Magento/Paypal/etc/db_schema.xml b/app/code/Magento/Paypal/etc/db_schema.xml
new file mode 100644
index 0000000000000..4dc283fcb48ce
--- /dev/null
+++ b/app/code/Magento/Paypal/etc/db_schema.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="paypal_billing_agreement" resource="default" engine="innodb" comment="Sales Billing Agreement">
+        <column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Agreement Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="varchar" name="method_code" nullable="false" length="32" comment="Method Code"/>
+        <column xsi:type="varchar" name="reference_id" nullable="false" length="32" comment="Reference Id"/>
+        <column xsi:type="varchar" name="status" nullable="false" length="20" comment="Status"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="agreement_label" nullable="true" length="255" comment="Agreement Label"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="agreement_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="paypal_billing_agreement" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGREEMENT_STORE_ID_STORE_STORE_ID"
+                    table="paypal_billing_agreement" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="SET NULL"/>
+        <index referenceId="PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="PAYPAL_BILLING_AGREEMENT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="paypal_billing_agreement_order" resource="default" engine="innodb"
+           comment="Sales Billing Agreement Order">
+        <column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Agreement Id"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="agreement_id"/>
+            <column name="order_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGRT_ORDER_AGRT_ID_PAYPAL_BILLING_AGRT_AGRT_ID"
+                    table="paypal_billing_agreement_order" column="agreement_id"
+                    referenceTable="paypal_billing_agreement" referenceColumn="agreement_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID"
+                    table="paypal_billing_agreement_order" column="order_id" referenceTable="sales_order"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+    </table>
+    <table name="paypal_settlement_report" resource="default" engine="innodb" comment="Paypal Settlement Report Table">
+        <column xsi:type="int" name="report_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Report Id"/>
+        <column xsi:type="date" name="report_date" comment="Report Date"/>
+        <column xsi:type="varchar" name="account_id" nullable="true" length="64" comment="Account Id"/>
+        <column xsi:type="varchar" name="filename" nullable="true" length="24" comment="Filename"/>
+        <column xsi:type="timestamp" name="last_modified" on_update="false" nullable="true" comment="Last Modified"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="report_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="PAYPAL_SETTLEMENT_REPORT_REPORT_DATE_ACCOUNT_ID">
+            <column name="report_date"/>
+            <column name="account_id"/>
+        </constraint>
+    </table>
+    <table name="paypal_settlement_report_row" resource="default" engine="innodb"
+           comment="Paypal Settlement Report Row Table">
+        <column xsi:type="int" name="row_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Row Id"/>
+        <column xsi:type="int" name="report_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Report Id"/>
+        <column xsi:type="varchar" name="transaction_id" nullable="true" length="19" comment="Transaction Id"/>
+        <column xsi:type="varchar" name="invoice_id" nullable="true" length="127" comment="Invoice Id"/>
+        <column xsi:type="varchar" name="paypal_reference_id" nullable="true" length="19"
+                comment="Paypal Reference Id"/>
+        <column xsi:type="varchar" name="paypal_reference_id_type" nullable="true" length="3"
+                comment="Paypal Reference Id Type"/>
+        <column xsi:type="varchar" name="transaction_event_code" nullable="true" length="5"
+                comment="Transaction Event Code"/>
+        <column xsi:type="timestamp" name="transaction_initiation_date" on_update="false" nullable="true"
+                comment="Transaction Initiation Date"/>
+        <column xsi:type="timestamp" name="transaction_completion_date" on_update="false" nullable="true"
+                comment="Transaction Completion Date"/>
+        <column xsi:type="varchar" name="transaction_debit_or_credit" nullable="false" length="2" default="CR"
+                comment="Transaction Debit Or Credit"/>
+        <column xsi:type="decimal" name="gross_transaction_amount" scale="6" precision="20" unsigned="false"
+                nullable="false" default="0" comment="Gross Transaction Amount"/>
+        <column xsi:type="varchar" name="gross_transaction_currency" nullable="true" length="3"
+                comment="Gross Transaction Currency"/>
+        <column xsi:type="varchar" name="fee_debit_or_credit" nullable="true" length="2" comment="Fee Debit Or Credit"/>
+        <column xsi:type="decimal" name="fee_amount" scale="6" precision="20" unsigned="false" nullable="false"
+                default="0" comment="Fee Amount"/>
+        <column xsi:type="varchar" name="fee_currency" nullable="true" length="3" comment="Fee Currency"/>
+        <column xsi:type="varchar" name="custom_field" nullable="true" length="255" comment="Custom Field"/>
+        <column xsi:type="varchar" name="consumer_id" nullable="true" length="127" comment="Consumer Id"/>
+        <column xsi:type="varchar" name="payment_tracking_id" nullable="true" length="255"
+                comment="Payment Tracking ID"/>
+        <column xsi:type="varchar" name="store_id" nullable="true" length="50" comment="Store ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="row_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="FK_E183E488F593E0DE10C6EBFFEBAC9B55" table="paypal_settlement_report_row"
+                    column="report_id" referenceTable="paypal_settlement_report" referenceColumn="report_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="PAYPAL_SETTLEMENT_REPORT_ROW_REPORT_ID" indexType="btree">
+            <column name="report_id"/>
+        </index>
+    </table>
+    <table name="paypal_cert" resource="default" engine="innodb" comment="Paypal Certificate Table">
+        <column xsi:type="smallint" name="cert_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Cert Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <column xsi:type="text" name="content" nullable="true" comment="Content"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="cert_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="PAYPAL_CERT_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="paypal_cert"
+                    column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="PAYPAL_CERT_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="paypal_payment_transaction" resource="default" engine="innodb"
+           comment="PayPal Payflow Link Payment Transaction">
+        <column xsi:type="int" name="transaction_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="txn_id" nullable="true" length="100" comment="Txn Id"/>
+        <column xsi:type="blob" name="additional_information" nullable="true" comment="Additional Information"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="transaction_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="PAYPAL_PAYMENT_TRANSACTION_TXN_ID">
+            <column name="txn_id"/>
+        </constraint>
+    </table>
+    <table name="quote_payment" resource="checkout" comment="Sales Flat Quote Payment">
+        <column xsi:type="varchar" name="paypal_payer_id" nullable="true" length="255" comment="Paypal Payer Id"/>
+        <column xsi:type="varchar" name="paypal_payer_status" nullable="true" length="255"
+                comment="Paypal Payer Status"/>
+        <column xsi:type="varchar" name="paypal_correlation_id" nullable="true" length="255"
+                comment="Paypal Correlation Id"/>
+    </table>
+    <table name="sales_order" resource="sales" comment="Sales Flat Order">
+        <column xsi:type="int" name="paypal_ipn_customer_notified" padding="11" unsigned="false" nullable="true"
+                identity="false" default="0" comment="Paypal Ipn Customer Notified"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/Paypal/etc/db_schema_whitelist.json b/app/code/Magento/Paypal/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8caacbf308232
--- /dev/null
+++ b/app/code/Magento/Paypal/etc/db_schema_whitelist.json
@@ -0,0 +1,120 @@
+{
+    "paypal_billing_agreement": {
+        "column": {
+            "agreement_id": true,
+            "customer_id": true,
+            "method_code": true,
+            "reference_id": true,
+            "status": true,
+            "created_at": true,
+            "updated_at": true,
+            "store_id": true,
+            "agreement_label": true
+        },
+        "index": {
+            "PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID": true,
+            "PAYPAL_BILLING_AGREEMENT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PAYPAL_BILLING_AGREEMENT_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "PAYPAL_BILLING_AGREEMENT_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "paypal_billing_agreement_order": {
+        "column": {
+            "agreement_id": true,
+            "order_id": true
+        },
+        "index": {
+            "PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PAYPAL_BILLING_AGRT_ORDER_AGRT_ID_PAYPAL_BILLING_AGRT_AGRT_ID": true,
+            "PAYPAL_BILLING_AGREEMENT_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID": true
+        }
+    },
+    "paypal_settlement_report": {
+        "column": {
+            "report_id": true,
+            "report_date": true,
+            "account_id": true,
+            "filename": true,
+            "last_modified": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PAYPAL_SETTLEMENT_REPORT_REPORT_DATE_ACCOUNT_ID": true
+        }
+    },
+    "paypal_settlement_report_row": {
+        "column": {
+            "row_id": true,
+            "report_id": true,
+            "transaction_id": true,
+            "invoice_id": true,
+            "paypal_reference_id": true,
+            "paypal_reference_id_type": true,
+            "transaction_event_code": true,
+            "transaction_initiation_date": true,
+            "transaction_completion_date": true,
+            "transaction_debit_or_credit": true,
+            "gross_transaction_amount": true,
+            "gross_transaction_currency": true,
+            "fee_debit_or_credit": true,
+            "fee_amount": true,
+            "fee_currency": true,
+            "custom_field": true,
+            "consumer_id": true,
+            "payment_tracking_id": true,
+            "store_id": true
+        },
+        "index": {
+            "PAYPAL_SETTLEMENT_REPORT_ROW_REPORT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_E183E488F593E0DE10C6EBFFEBAC9B55": true
+        }
+    },
+    "paypal_cert": {
+        "column": {
+            "cert_id": true,
+            "website_id": true,
+            "content": true,
+            "updated_at": true
+        },
+        "index": {
+            "PAYPAL_CERT_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PAYPAL_CERT_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "paypal_payment_transaction": {
+        "column": {
+            "transaction_id": true,
+            "txn_id": true,
+            "additional_information": true,
+            "created_at": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PAYPAL_PAYMENT_TRANSACTION_TXN_ID": true
+        }
+    },
+    "quote_payment": {
+        "column": {
+            "paypal_payer_id": true,
+            "paypal_payer_status": true,
+            "paypal_correlation_id": true
+        }
+    },
+    "sales_order": {
+        "column": {
+            "paypal_ipn_customer_notified": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/etc/di.xml b/app/code/Magento/Paypal/etc/di.xml
index 3071907af4717..c0141bbb3215e 100644
--- a/app/code/Magento/Paypal/etc/di.xml
+++ b/app/code/Magento/Paypal/etc/di.xml
@@ -67,6 +67,12 @@
     <type name="Magento\Payment\Model\Checks\Composite">
         <plugin name="paypal_specification" type="Magento\Paypal\Model\Method\Checks\SpecificationPlugin"/>
     </type>
+    <type name="Magento\Sales\Model\Order">
+        <plugin name="express_order_invoice" type="Magento\Paypal\Plugin\OrderCanInvoice"/>
+    </type>
+    <type name="Magento\Sales\Model\Order\Validation\CanInvoice">
+        <plugin name="express_order_invoice" type="Magento\Paypal\Plugin\ValidatorCanInvoice"/>
+    </type>
     <virtualType name="Magento\Paypal\Block\Payflow\Bml\Shortcut" type="Magento\Paypal\Block\Bml\Shortcut">
         <arguments>
             <argument name="paymentMethodCode" xsi:type="const">Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS</argument>
diff --git a/app/code/Magento/Paypal/etc/module.xml b/app/code/Magento/Paypal/etc/module.xml
index 056fc1a80e8ac..3049d9a2891b4 100644
--- a/app/code/Magento/Paypal/etc/module.xml
+++ b/app/code/Magento/Paypal/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Paypal" setup_version="2.0.1">
+    <module name="Magento_Paypal" >
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 797edbf8bfa1e..c3f3e38fa03b4 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -1,17 +1,17 @@
 "
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                                Use PayPal’ s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
+                                Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                                or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 ","
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                                or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
 payflowpro,"Payflow Pro"
 "Billing Agreements","Billing Agreements"
@@ -484,27 +484,27 @@ Manage,Manage
 "Enable PayPal Credit","Enable PayPal Credit"
 "PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+                        <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
                 ","PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href=""https:/www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
+                        <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
                 "
 "Sort Order PayPal Credit","Sort Order PayPal Credit"
 "Advertise PayPal Credit","Advertise PayPal Credit"
 "
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                         from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                        or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 ","
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                         from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                        or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
 "Publisher ID","Publisher ID"
 "Required to display a banner","Required to display a banner"
@@ -645,19 +645,19 @@ User,User
 "Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)","Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)"
 "Payments Pro Hosted Solution","Payments Pro Hosted Solution"
 "
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                             from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                            or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                            or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 ","
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                             from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                            or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                            or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
 "Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
 "Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
@@ -683,17 +683,17 @@ User,User
 "Card Security Code Does Not Match","Card Security Code Does Not Match"
 "Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
 "
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                                or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 ","
-                    <a href=""https:/financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
+                    <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
+                                or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml
new file mode 100644
index 0000000000000..3c11109b7fd63
--- /dev/null
+++ b/app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml
@@ -0,0 +1,14 @@
+<?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" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Paypal\Block\Adminhtml\Order\View" name="paypal_order_view"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
index cdd4779a2fd87..532fa88c4986a 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
@@ -135,7 +135,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
-                <span><?= $block->escapeHtml('Save for later use.') ?></span>
+                <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js
index 8edc38dce6f60..8c4c90bf111de 100644
--- a/app/code/Magento/Paypal/view/base/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/base/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
index 4f514806eeb89..73c44faff5a57 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
@@ -44,6 +44,15 @@
                                                                         <item name="paypal_billing_agreement" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="paypal_express" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
+                                                                        </item>
+                                                                        <item name="paypal_express_bml" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
+                                                                        </item>
+                                                                        <item name="payflow_express_bml" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
+                                                                        </item>
                                                                     </item>
                                                                 </item>
                                                             </item>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
index a671c066fb6c3..5eef537198139 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <title>Billing Agreements</title>
-    </head>
     <body>
         <referenceBlock name="customer_account_navigation">
             <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-billing-agreements-link">
diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
index d2cf3f9a0ce7d..223ade43d86e5 100644
--- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            orderReview: 'Magento_Paypal/order-review',
+            orderReview: 'Magento_Paypal/js/order-review',
+            'Magento_Paypal/order-review': 'Magento_Paypal/js/order-review',
             paypalCheckout: 'Magento_Paypal/js/paypal-checkout'
         }
     },
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js b/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js
index a994f9defd583..63e34437c6f90 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js
@@ -4,48 +4,12 @@
  */
 
 define([
-    'jquery',
     'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/url-builder',
-    'mage/storage',
-    'Magento_Checkout/js/model/error-processor',
-    'Magento_Customer/js/model/customer',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function ($, quote, urlBuilder, storage, errorProcessor, customer, fullScreenLoader) {
+    'Magento_Checkout/js/action/set-payment-information'
+], function (quote, setPaymentInformation) {
     'use strict';
 
     return function (messageContainer) {
-        var serviceUrl,
-            payload,
-            paymentData = quote.paymentMethod();
-
-        /**
-         * Checkout for guest and registered customer.
-         */
-        if (!customer.isLoggedIn()) {
-            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
-                cartId: quote.getQuoteId()
-            });
-            payload = {
-                cartId: quote.getQuoteId(),
-                email: quote.guestEmail,
-                paymentMethod: paymentData
-            };
-        } else {
-            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-            payload = {
-                cartId: quote.getQuoteId(),
-                paymentMethod: paymentData
-            };
-        }
-        fullScreenLoader.startLoader();
-
-        return storage.post(
-            serviceUrl, JSON.stringify(payload)
-        ).fail(function (response) {
-            errorProcessor.process(response, messageContainer);
-        }).always(function () {
-            fullScreenLoader.stopLoader();
-        });
+        return setPaymentInformation(messageContainer, quote.paymentMethod());
     };
 });
diff --git a/app/code/Magento/Paypal/view/frontend/web/order-review.js b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js
similarity index 99%
rename from app/code/Magento/Paypal/view/frontend/web/order-review.js
rename to app/code/Magento/Paypal/view/frontend/web/js/order-review.js
index 566c9c8da06dc..2155b52f4081b 100644
--- a/app/code/Magento/Paypal/view/frontend/web/order-review.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js
@@ -108,7 +108,7 @@ define([
         },
 
         /**
-         * trigger change for the update of shippping methods from server
+         * trigger change for the update of shipping methods from server
          */
         _updateOrderHandler: function () {
             $(this.options.shippingSelector).trigger('change');
@@ -297,7 +297,7 @@ define([
                 this._updateOrderSubmit(true);
                 this._toggleButton(this.options.updateOrderSelector, true);
 
-                // form data and callBack updated based on the shippping Form element
+                // form data and callBack updated based on the shipping Form element
                 if (this.isShippingSubmitForm) {
                     formData = $(this.options.shippingSubmitFormSelector).serialize() + '&isAjax=true';
 
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index 39a9ce7a8ef43..9a547c0032492 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -13,6 +13,8 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
+ * Helper for persistence
+ *
  * @api
  * @since 100.0.2
  */
@@ -136,12 +138,10 @@ public function isShoppingCartPersist($store = null)
      */
     public function getLifeTime($store = null)
     {
-        $lifeTime = intval(
-            $this->scopeConfig->getValue(
-                self::XML_PATH_LIFE_TIME,
-                ScopeInterface::SCOPE_STORE,
-                $store
-            )
+        $lifeTime = (int)$this->scopeConfig->getValue(
+            self::XML_PATH_LIFE_TIME,
+            ScopeInterface::SCOPE_STORE,
+            $store
         );
         return $lifeTime < 0 ? 0 : $lifeTime;
     }
diff --git a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
index 2c0259bd12b00..2641102ca4d72 100644
--- a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
@@ -108,8 +108,8 @@ public function beforeSavePaymentInformationAndPlaceOrder(
             $this->customerSession->setCustomerId(null);
             $this->customerSession->setCustomerGroupId(null);
             $this->quoteManager->convertCustomerCartToGuest();
-            /** @var \Magento\Quote\Api\Data\CartInterface $quote */
-            $quote = $this->cartRepository->get($this->checkoutSession->getQuote()->getId());
+            $quoteId = $this->checkoutSession->getQuoteId();
+            $quote = $this->cartRepository->get($quoteId);
             $quote->setCustomerEmail($email);
             $quote->getAddressesCollection()->walk('setEmail', ['email' => $email]);
             $this->cartRepository->save($quote);
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 8937a4920cb23..35c2c70be30dc 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -108,8 +108,9 @@ public function setGuest($checkQuote = false)
      */
     public function convertCustomerCartToGuest()
     {
+        $quoteId = $this->checkoutSession->getQuoteId();
         /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->quoteRepository->get($this->checkoutSession->getQuote()->getId());
+        $quote = $this->quoteRepository->get($quoteId);
         if ($quote && $quote->getId()) {
             $this->_setQuotePersistent = false;
             $quote->setIsActive(true)
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index abc344671ab70..701b4fc21d29a 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -197,6 +197,7 @@ public function getExpiredBefore($store = null)
 
     /**
      * Serialize info for Resource Model to save
+     *
      * For new model check and set available cookie key
      *
      * @return $this
@@ -354,7 +355,7 @@ public function deleteExpired($websiteId = null)
         $lifetime = $this->_coreConfig->getValue(
             \Magento\Persistent\Helper\Data::XML_PATH_LIFE_TIME,
             'website',
-            intval($websiteId)
+            (int)$websiteId
         );
 
         if ($lifetime) {
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index 2aaf0f30fe71d..f3720960ca6e5 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
@@ -50,6 +50,20 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      */
     protected $_persistentData = null;
 
+    /**
+     * Request
+     *
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * Checkout Page path
+     *
+     * @var string
+     */
+    private $checkoutPagePath = 'checkout';
+
     /**
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Helper\Data $persistentData
@@ -57,6 +71,7 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\App\RequestInterface $request
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -64,7 +79,8 @@ public function __construct(
         \Magento\Persistent\Model\QuoteManager $quoteManager,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Checkout\Model\Session $checkoutSession
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Framework\App\RequestInterface $request
     ) {
         $this->_persistentSession = $persistentSession;
         $this->quoteManager = $quoteManager;
@@ -72,6 +88,7 @@ public function __construct(
         $this->_checkoutSession = $checkoutSession;
         $this->_eventManager = $eventManager;
         $this->_persistentData = $persistentData;
+        $this->request = $request;
     }
 
     /**
@@ -90,12 +107,32 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             !$this->_persistentSession->isPersistent() &&
             !$this->_customerSession->isLoggedIn() &&
             $this->_checkoutSession->getQuoteId() &&
-            !$observer->getControllerAction() instanceof \Magento\Checkout\Controller\Onepage
-            // persistent session does not expire on onepage checkout page to not spoil customer group id
+            !$this->isRequestFromCheckoutPage($this->request)
+            // persistent session does not expire on onepage checkout page
         ) {
             $this->_eventManager->dispatch('persistent_session_expired');
             $this->quoteManager->expire();
             $this->_customerSession->setCustomerId(null)->setCustomerGroupId(null);
         }
     }
+
+    /**
+     * Check current request is coming from onepage checkout page.
+     *
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @return bool
+     */
+    private function isRequestFromCheckoutPage(\Magento\Framework\App\RequestInterface $request): bool
+    {
+        $requestUri = (string)$request->getRequestUri();
+        $refererUri = (string)$request->getServer('HTTP_REFERER');
+
+        /** @var bool $isCheckoutPage */
+        $isCheckoutPage = (
+            false !== strpos($requestUri, $this->checkoutPagePath) ||
+            false !== strpos($refererUri, $this->checkoutPagePath)
+        );
+
+        return $isCheckoutPage;
+    }
 }
diff --git a/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
new file mode 100644
index 0000000000000..e89a09c0d2a9c
--- /dev/null
+++ b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Class SetCheckoutSessionPersistentDataObserver
+ */
+class SetCheckoutSessionPersistentDataObserver implements ObserverInterface
+{
+    /**
+     * Persistent session
+     *
+     * @var \Magento\Persistent\Helper\Session
+     */
+    private $persistentSession = null;
+
+    /**
+     * Customer session
+     *
+     * @var \Magento\Customer\Model\Session
+     */
+    private $customerSession;
+
+    /**
+     * Persistent data
+     *
+     * @var \Magento\Persistent\Helper\Data
+     */
+    private $persistentData = null;
+
+    /**
+     * Customer Repository
+     *
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository = null;
+
+    /**
+     * @param \Magento\Persistent\Helper\Session $persistentSession
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Persistent\Helper\Data $persistentData
+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        \Magento\Persistent\Helper\Session $persistentSession,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Persistent\Helper\Data $persistentData,
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->persistentSession = $persistentSession;
+        $this->customerSession = $customerSession;
+        $this->persistentData = $persistentData;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Pass customer data from persistent session to checkout session and set quote to be loaded even if not active
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        /** @var $checkoutSession \Magento\Checkout\Model\Session */
+        $checkoutSession = $observer->getEvent()->getData('checkout_session');
+        if ($this->persistentData->isShoppingCartPersist() && $this->persistentSession->isPersistent()) {
+            $checkoutSession->setCustomerData(
+                $this->customerRepository->getById($this->persistentSession->getSession()->getCustomerId())
+            );
+        }
+        if (!(($this->persistentSession->isPersistent() && !$this->customerSession->isLoggedIn())
+            && !$this->persistentData->isShoppingCartPersist()
+        )) {
+            return;
+        }
+        if ($checkoutSession) {
+            $checkoutSession->setLoadInactive();
+        }
+    }
+}
diff --git a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
deleted file mode 100644
index 6eeab94a91cca..0000000000000
--- a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Persistent\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-class SetLoadPersistentQuoteObserver implements ObserverInterface
-{
-    /**
-     * Customer session
-     *
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $_customerSession;
-
-    /**
-     * Checkout session
-     *
-     * @var \Magento\Checkout\Model\Session
-     */
-    protected $_checkoutSession;
-
-    /**
-     * Persistent session
-     *
-     * @var \Magento\Persistent\Helper\Session
-     */
-    protected $_persistentSession = null;
-
-    /**
-     * Persistent data
-     *
-     * @var \Magento\Persistent\Helper\Data
-     */
-    protected $_persistentData = null;
-
-    /**
-     * @param \Magento\Persistent\Helper\Session $persistentSession
-     * @param \Magento\Persistent\Helper\Data $persistentData
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     */
-    public function __construct(
-        \Magento\Persistent\Helper\Session $persistentSession,
-        \Magento\Persistent\Helper\Data $persistentData,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Checkout\Model\Session $checkoutSession
-    ) {
-        $this->_persistentSession = $persistentSession;
-        $this->_customerSession = $customerSession;
-        $this->_checkoutSession = $checkoutSession;
-        $this->_persistentData = $persistentData;
-    }
-
-    /**
-     * Set quote to be loaded even if not active
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        if (!(($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
-            && !$this->_persistentData->isShoppingCartPersist()
-        )) {
-            return;
-        }
-
-        if ($this->_checkoutSession) {
-            $this->_checkoutSession->setLoadInactive();
-        }
-    }
-}
diff --git a/app/code/Magento/Persistent/Setup/InstallSchema.php b/app/code/Magento/Persistent/Setup/InstallSchema.php
deleted file mode 100644
index c961dabfcda3e..0000000000000
--- a/app/code/Magento/Persistent/Setup/InstallSchema.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Persistent\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private static $connectionName = 'checkout';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'persistent_session'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('persistent_session')
-        )->addColumn(
-            'persistent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'primary' => true, 'nullable' => false, 'unsigned' => true],
-            'Session id'
-        )->addColumn(
-            'key',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => false],
-            'Unique cookie key'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website ID'
-        )->addColumn(
-            'info',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Session Data'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addIndex(
-            $installer->getIdxName('persistent_session', ['key']),
-            ['key'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('persistent_session', ['customer_id']),
-            ['customer_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('persistent_session', ['updated_at']),
-            ['updated_at']
-        )->addForeignKey(
-            $installer->getFkName('persistent_session', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('persistent_session', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Persistent Session'
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Alter quote table with is_persistent flag
-         *
-         */
-        $installer->getConnection(self::$connectionName)->addColumn(
-            $installer->getTable('quote', self::$connectionName),
-            'is_persistent',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                'unsigned' => true,
-                'default' => '0',
-                'comment' => 'Is Quote Persistent'
-            ]
-        );
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
new file mode 100644
index 0000000000000..39e55693811e9
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="PersistentConfigDefault" type="persistent_config_state">
+        <requiredEntity type="persistent_options_enabled">persistentDefaultState</requiredEntity>
+    </entity>
+    <entity name="persistentDefaultState" type="persistent_options_enabled">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="PersistentConfigEnabled" type="persistent_config_state">
+        <requiredEntity type="persistent_options_enabled">persistentEnabledState</requiredEntity>
+    </entity>
+    <entity name="persistentEnabledState" type="persistent_options_enabled">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="PersistentLogoutClearEnabled" type="persistent_config_state">
+        <requiredEntity type="persistent_options_logout_clear">PersistentEnabledLogoutClear</requiredEntity>
+    </entity>
+    <entity name="PersistentEnabledLogoutClear" type="logout_clear">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="PersistentLogoutClearDisable" type="persistent_config_state">
+        <requiredEntity type="persistent_options_logout_clear">PersistentDisableLogoutClear</requiredEntity>
+    </entity>
+    <entity name="PersistentDisableLogoutClear" type="logout_clear">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE.txt b/app/code/Magento/Persistent/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE.txt
rename to app/code/Magento/Persistent/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE_AFL.txt b/app/code/Magento/Persistent/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE_AFL.txt
rename to app/code/Magento/Persistent/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml b/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
new file mode 100644
index 0000000000000..7f0e12f8bef93
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreatePersistentConfigState" dataType="persistent_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/persistent/" method="POST">
+        <object key="groups" dataType="persistent_config_state">
+            <object key="options" dataType="persistent_config_state">
+                <object key="fields" dataType="persistent_config_state">
+                    <object key="enabled" dataType="persistent_options_enabled">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="logout_clear" dataType="persistent_options_logout_clear">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Persistent/Test/Mftf/README.md b/app/code/Magento/Persistent/Test/Mftf/README.md
new file mode 100644
index 0000000000000..14b4ba423ba0b
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Persistent Functional Tests
+
+The Functional Test Module for **Magento Persistent** module.
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
new file mode 100644
index 0000000000000..c66a2979aa7f5
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckShoppingCartBehaviorAfterSessionExpiredTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="MAGETWO-91733 - Unusual behavior with the persistent shopping cart after the session is expired"/>
+            <title value="Checking behavior with the persistent shopping cart after the session is expired"/>
+            <description value="Checking behavior with the persistent shopping cart after the session is expired"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95118"/>
+            <group value="persistent"/>
+        </annotations>
+        <before>
+            <!--Enable Persistence-->
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <!--Create product-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create new customer -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+            <!--Add shipping information-->
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Roll back configuration-->
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <!--Delete product-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--Reset cookies and refresh the page-->
+        <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--Check product exists in cart-->
+        <see userInput="$$createProduct.name$$" stepKey="ProductExistsInCart"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
new file mode 100644
index 0000000000000..a383fd4505bd6
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="GuestCheckoutWithEnabledPersistentTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Guest checkout"/>
+            <title value="Guest Checkout with Enabled Persistent"/>
+            <description value="Checkout data must be restored after page checkout reload."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-92453"/>
+            <group value="persistent"/>
+        </annotations>
+        <before>
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!-- Navigate to checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutFromMinicart"/>
+        <!-- Fill Shipping Address form -->
+        <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingGuestInfoSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <!-- Check that have the same values after page reload -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="amOnCheckoutShippingInfoPage"/>
+        <waitForPageLoad stepKey="waitForShippingPageReload"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeEmailOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstName}}" stepKey="seeFirstnameOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastName}}" stepKey="seeLastnameOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeStreetOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="seeCityOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="seeStateOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="seePostcodeOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seePhoneOnCheckout" />
+        <!-- Click next button to open payment section -->
+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
+        <!-- Reload payment section -->
+        <amOnPage url="{{GuestCheckoutReviewAndPaymentsPage.url}}" stepKey="amOnCheckoutPaymentsPage"/>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
+        <!-- Check that address block contains correct information -->
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.firstName}}" stepKey="seeBilllingFirstName" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.lastName}}" stepKey="seeBilllingLastName" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeBilllingStreet" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.city}}" stepKey="seeBilllingCity" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.state}}" stepKey="seeBilllingState" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="seeBilllingPostcode" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seeBilllingTelephone" />
+        <!-- Check that "Ship To" block contains correct information -->
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.firstName}}" stepKey="seeShipToFirstName" />
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.lastName}}" stepKey="seeShipToLastName" />
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeShipToStreet" />
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.city}}" stepKey="seeShipToCity" />
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.state}}" stepKey="seeShipToState" />
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="seeShipToPostcode" />
+        <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seeShipToTelephone" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/ConfigProviderPluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/ConfigProviderPluginTest.php
index a632bc58efb96..778015d87d150 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/ConfigProviderPluginTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/ConfigProviderPluginTest.php
@@ -64,17 +64,17 @@ protected function setUp()
     }
 
     /**
-     * @param bool $persitenceEnabled
+     * @param bool $persistenceEnabled
      * @param bool $isPersistent
      * @param bool $isLoggedIn
      *
      * @dataProvider configDataProvider
      */
-    public function testAfterGetConfigNegative($persitenceEnabled, $isPersistent, $isLoggedIn)
+    public function testAfterGetConfigNegative($persistenceEnabled, $isPersistent, $isLoggedIn)
     {
         $result = [40, 30, 50];
 
-        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn($persitenceEnabled);
+        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn($persistenceEnabled);
         $this->persistentSessionMock->expects($this->any())->method('isPersistent')->willReturn($isPersistent);
         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn($isLoggedIn);
         $this->maskFactoryMock->expects($this->never())->method('create');
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
index b9285715146a5..c7f84b476fa7e 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
@@ -102,8 +102,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderCartConvertsToGuest
             ['setCustomerEmail', 'getAddressesCollection'],
             false
         );
-        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
+        $this->checkoutSessionMock->method('getQuoteId')->willReturn($cartId);
         $this->cartRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('setCustomerEmail')->with($email);
         /** @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index 5b96acae1d747..e5de8e7d4aade 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -245,8 +245,8 @@ public function testConvertCustomerCartToGuest()
         $emailArgs = ['email' => null];
 
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->exactly(2))->method('getId')->willReturn($quoteId);
+            ->method('getQuoteId')->willReturn($quoteId);
+        $this->quoteMock->expects($this->once())->method('getId')->willReturn($quoteId);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($quoteId)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setIsActive')->with(true)->willReturn($this->quoteMock);
@@ -286,21 +286,19 @@ public function testConvertCustomerCartToGuest()
     public function testConvertCustomerCartToGuestWithEmptyQuote()
     {
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('getId')->willReturn(null);
+            ->method('getQuoteId')->willReturn(null);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(null)->willReturn(null);
-
         $this->model->convertCustomerCartToGuest();
     }
 
     public function testConvertCustomerCartToGuestWithEmptyQuoteId()
     {
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('getId')->willReturn(1);
+            ->method('getQuoteId')->willReturn(1);
         $quoteWithNoId = $this->quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
         $quoteWithNoId->expects($this->once())->method('getId')->willReturn(null);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(1)->willReturn($quoteWithNoId);
+        $this->quoteMock->expects($this->once())->method('getId')->willReturn(1);
         $this->model->convertCustomerCartToGuest();
     }
 }
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index a52e22a960e0b..46dda1be365d4 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -49,24 +49,39 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $eventManagerMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\RequestInterface
+     */
+    private $requestMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->sessionMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
         $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
         $this->persistentHelperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
-        $this->observerMock
-            = $this->createPartialMock(\Magento\Framework\Event\Observer::class, ['getControllerAction',
-                '__wakeUp']);
+        $this->observerMock = $this->createPartialMock(
+            \Magento\Framework\Event\Observer::class,
+            ['getControllerAction','__wakeUp']
+        );
         $this->quoteManagerMock = $this->createMock(\Magento\Persistent\Model\QuoteManager::class);
         $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
         $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRequestUri', 'getServer'])
+            ->getMockForAbstractClass();
+
         $this->model = new \Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver(
             $this->sessionMock,
             $this->persistentHelperMock,
             $this->quoteManagerMock,
             $this->eventManagerMock,
             $this->customerSessionMock,
-            $this->checkoutSessionMock
+            $this->checkoutSessionMock,
+            $this->requestMock
         );
     }
 
@@ -76,7 +91,7 @@ public function testExecuteWhenCanNotApplyPersistentData()
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
-            ->will($this->returnValue(false));
+            ->willReturn(false);
         $this->persistentHelperMock->expects($this->never())->method('isEnabled');
         $this->model->execute($this->observerMock);
     }
@@ -87,31 +102,97 @@ public function testExecuteWhenPersistentIsNotEnabled()
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
-            ->will($this->returnValue(true));
-        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->will($this->returnValue(false));
+            ->willReturn(true);
+        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(false);
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->model->execute($this->observerMock);
     }
 
-    public function testExecuteWhenPersistentIsEnabled()
-    {
+    /**
+     * Test method \Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver::execute when persistent is enabled.
+     *
+     * @param string $refererUri
+     * @param string $requestUri
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expireCounter
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $dispatchCounter
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCustomerIdCounter
+     * @return void
+     * @dataProvider requestDataProvider
+     */
+    public function testExecuteWhenPersistentIsEnabled(
+        string $refererUri,
+        string $requestUri,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expireCounter,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $dispatchCounter,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCustomerIdCounter
+    ): void {
         $this->persistentHelperMock
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
-            ->will($this->returnValue(true));
-        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
-        $this->sessionMock->expects($this->once())->method('isPersistent')->will($this->returnValue(false));
-        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
-        $this->checkoutSessionMock->expects($this->once())->method('getQuoteId')->will($this->returnValue(10));
-        $this->observerMock->expects($this->once())->method('getControllerAction');
-        $this->eventManagerMock->expects($this->once())->method('dispatch');
-        $this->quoteManagerMock->expects($this->once())->method('expire');
+            ->willReturn(true);
+        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(true);
+        $this->sessionMock->expects($this->once())->method('isPersistent')->willReturn(false);
         $this->customerSessionMock
-            ->expects($this->once())
+            ->expects($this->atLeastOnce())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $this->checkoutSessionMock
+            ->expects($this->atLeastOnce())
+            ->method('getQuoteId')
+            ->willReturn(10);
+        $this->eventManagerMock->expects($dispatchCounter)->method('dispatch');
+        $this->quoteManagerMock->expects($expireCounter)->method('expire');
+        $this->customerSessionMock
+            ->expects($setCustomerIdCounter)
             ->method('setCustomerId')
             ->with(null)
-            ->will($this->returnSelf());
+            ->willReturnSelf();
+        $this->requestMock->expects($this->atLeastOnce())->method('getRequestUri')->willReturn($refererUri);
+        $this->requestMock
+            ->expects($this->atLeastOnce())
+            ->method('getServer')
+            ->with('HTTP_REFERER')
+            ->willReturn($requestUri);
         $this->model->execute($this->observerMock);
     }
+
+    /**
+     * Request Data Provider
+     *
+     * @return array
+     */
+    public function requestDataProvider()
+    {
+        return [
+            [
+                'refererUri'           => 'checkout',
+                'requestUri'           => 'index',
+                'expireCounter'        => $this->never(),
+                'dispatchCounter'      => $this->never(),
+                'setCustomerIdCounter' => $this->never(),
+            ],
+            [
+                'refererUri'           => 'checkout',
+                'requestUri'           => 'checkout',
+                'expireCounter'        => $this->never(),
+                'dispatchCounter'      => $this->never(),
+                'setCustomerIdCounter' => $this->never(),
+            ],
+            [
+                'refererUri'           => 'index',
+                'requestUri'           => 'checkout',
+                'expireCounter'        => $this->never(),
+                'dispatchCounter'      => $this->never(),
+                'setCustomerIdCounter' => $this->never(),
+            ],
+            [
+                'refererUri'           => 'index',
+                'requestUri'           => 'index',
+                'expireCounter'        => $this->once(),
+                'dispatchCounter'      => $this->once(),
+                'setCustomerIdCounter' => $this->once(),
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/RefreshCustomerDataTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/RefreshCustomerDataTest.php
index da60f8a3162ac..ca415a8fab5b3 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/RefreshCustomerDataTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/RefreshCustomerDataTest.php
@@ -80,6 +80,9 @@ public function testBeforeStart($result, $callCount)
         $this->observer->execute($observerMock);
     }
 
+    /**
+     * @return array
+     */
     public function beforeStartDataProvider()
     {
         return [
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php
new file mode 100644
index 0000000000000..01c217c1c5cd4
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Test\Unit\Observer;
+
+/**
+ * Class SetCheckoutSessionPersistentDataObserverTest
+ */
+class SetCheckoutSessionPersistentDataObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Persistent\Helper\Data| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * @var \Magento\Persistent\Helper\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionHelperMock;
+
+    /**
+     * @var \Magento\Checkout\Model\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $checkoutSessionMock;
+
+    /**
+     * @var \Magento\Customer\Model\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var \Magento\Persistent\Model\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $persistentSessionMock;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $observerMock;
+
+    /**
+     * @var \Magento\Framework\Event|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->helperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
+        $this->sessionHelperMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
+        $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
+        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
+        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
+        $this->eventMock = $this->createPartialMock(\Magento\Framework\Event::class, ['getData']);
+        $this->persistentSessionMock = $this->createPartialMock(
+            \Magento\Persistent\Model\Session::class,
+            ['getCustomerId']
+        );
+        $this->customerRepositoryMock = $this->createMock(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
+        $this->model = new \Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver(
+            $this->sessionHelperMock,
+            $this->customerSessionMock,
+            $this->helperMock,
+            $this->customerRepositoryMock
+        );
+    }
+
+    /**
+     * Test execute method when session is not persistent
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testExecuteWhenSessionIsNotPersistent()
+    {
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->will($this->returnValue($this->eventMock));
+        $this->eventMock->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue($this->checkoutSessionMock));
+        $this->sessionHelperMock->expects($this->once())
+            ->method('isPersistent')
+            ->will($this->returnValue(false));
+        $this->checkoutSessionMock->expects($this->never())
+            ->method('setLoadInactive');
+        $this->checkoutSessionMock->expects($this->never())
+            ->method('setCustomerData');
+        $this->model->execute($this->observerMock);
+    }
+
+    /**
+     * Test execute method when session is persistent
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testExecute()
+    {
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->will($this->returnValue($this->eventMock));
+        $this->eventMock->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue($this->checkoutSessionMock));
+        $this->sessionHelperMock->expects($this->exactly(2))
+            ->method('isPersistent')
+            ->will($this->returnValue(true));
+        $this->customerSessionMock->expects($this->once())
+            ->method('isLoggedIn')
+            ->will($this->returnValue(false));
+        $this->helperMock->expects($this->exactly(2))
+            ->method('isShoppingCartPersist')
+            ->will($this->returnValue(true));
+        $this->persistentSessionMock->expects($this->once())
+            ->method('getCustomerId')
+            ->will($this->returnValue(123));
+        $this->sessionHelperMock->expects($this->once())
+            ->method('getSession')
+            ->will($this->returnValue($this->persistentSessionMock));
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->will($this->returnValue(true)); //?
+        $this->checkoutSessionMock->expects($this->never())
+            ->method('setLoadInactive');
+        $this->checkoutSessionMock->expects($this->once())
+            ->method('setCustomerData');
+        $this->model->execute($this->observerMock);
+    }
+}
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php
deleted file mode 100644
index fd78a6852ea59..0000000000000
--- a/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Persistent\Test\Unit\Observer;
-
-class SetLoadPersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver
-     */
-    protected $model;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $helperMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionHelperMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $checkoutSessionMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerSessionMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $observerMock;
-
-    protected function setUp()
-    {
-        $this->helperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
-        $this->sessionHelperMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
-        $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
-        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
-        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
-
-        $this->model = new \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver(
-            $this->sessionHelperMock,
-            $this->helperMock,
-            $this->customerSessionMock,
-            $this->checkoutSessionMock
-        );
-    }
-
-    public function testExecuteWhenSessionIsNotPersistent()
-    {
-        $this->sessionHelperMock->expects($this->once())->method('isPersistent')->will($this->returnValue(false));
-        $this->checkoutSessionMock->expects($this->never())->method('setLoadInactive');
-        $this->model->execute($this->observerMock);
-    }
-
-    public function testExecute()
-    {
-        $this->sessionHelperMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
-        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
-        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
-        $this->checkoutSessionMock->expects($this->never())->method('setLoadInactive');
-        $this->model->execute($this->observerMock);
-    }
-}
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 83a9655c6a647..4a304c549b760 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-cron": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-cron": "*",
+        "magento/module-customer": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Persistent/etc/db_schema.xml b/app/code/Magento/Persistent/etc/db_schema.xml
new file mode 100644
index 0000000000000..5021d240417b2
--- /dev/null
+++ b/app/code/Magento/Persistent/etc/db_schema.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="persistent_session" resource="default" engine="innodb" comment="Persistent Session">
+        <column xsi:type="int" name="persistent_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Session id"/>
+        <column xsi:type="varchar" name="key" nullable="false" length="50" comment="Unique cookie key"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website ID"/>
+        <column xsi:type="text" name="info" nullable="true" comment="Session Data"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="persistent_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="PERSISTENT_SESSION_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="persistent_session" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PERSISTENT_SESSION_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="persistent_session" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="PERSISTENT_SESSION_KEY">
+            <column name="key"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="PERSISTENT_SESSION_CUSTOMER_ID">
+            <column name="customer_id"/>
+        </constraint>
+        <index referenceId="PERSISTENT_SESSION_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+    </table>
+    <table name="quote" resource="checkout" comment="Sales Flat Quote">
+        <column xsi:type="smallint" name="is_persistent" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Is Quote Persistent"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/Persistent/etc/db_schema_whitelist.json b/app/code/Magento/Persistent/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..50a4567d4a6f1
--- /dev/null
+++ b/app/code/Magento/Persistent/etc/db_schema_whitelist.json
@@ -0,0 +1,27 @@
+{
+    "persistent_session": {
+        "column": {
+            "persistent_id": true,
+            "key": true,
+            "customer_id": true,
+            "website_id": true,
+            "info": true,
+            "updated_at": true
+        },
+        "index": {
+            "PERSISTENT_SESSION_UPDATED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "PERSISTENT_SESSION_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "PERSISTENT_SESSION_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "PERSISTENT_SESSION_KEY": true,
+            "PERSISTENT_SESSION_CUSTOMER_ID": true
+        }
+    },
+    "quote": {
+        "column": {
+            "is_persistent": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Persistent/etc/frontend/events.xml b/app/code/Magento/Persistent/etc/frontend/events.xml
index 193b9a10818e4..79720695ea6f6 100644
--- a/app/code/Magento/Persistent/etc/frontend/events.xml
+++ b/app/code/Magento/Persistent/etc/frontend/events.xml
@@ -49,7 +49,7 @@
         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
     </event>
     <event name="custom_quote_process">
-        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
     </event>
     <event name="customer_register_success">
         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
diff --git a/app/code/Magento/Persistent/etc/module.xml b/app/code/Magento/Persistent/etc/module.xml
index 452130810c4bb..4f6e0744ce6ef 100644
--- a/app/code/Magento/Persistent/etc/module.xml
+++ b/app/code/Magento/Persistent/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Persistent" setup_version="2.0.0">
+    <module name="Magento_Persistent" >
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_PageCache"/>
diff --git a/app/code/Magento/Persistent/etc/webapi_rest/events.xml b/app/code/Magento/Persistent/etc/webapi_rest/events.xml
index 1eff845386bf4..79dffa1834563 100644
--- a/app/code/Magento/Persistent/etc/webapi_rest/events.xml
+++ b/app/code/Magento/Persistent/etc/webapi_rest/events.xml
@@ -22,7 +22,7 @@
         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
     </event>
     <event name="custom_quote_process">
-        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
     </event>
     <event name="customer_register_success">
         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
diff --git a/app/code/Magento/Persistent/etc/webapi_soap/events.xml b/app/code/Magento/Persistent/etc/webapi_soap/events.xml
index 1eff845386bf4..79dffa1834563 100644
--- a/app/code/Magento/Persistent/etc/webapi_soap/events.xml
+++ b/app/code/Magento/Persistent/etc/webapi_soap/events.xml
@@ -22,7 +22,7 @@
         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
     </event>
     <event name="custom_quote_process">
-        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
     </event>
     <event name="customer_register_success">
         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
index 982b0f7f63375..0430a21dc8bfd 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
     /**
      * @var string
      */
-    protected $_template = 'email/price.phtml';
+    protected $_template = 'Magento_ProductAlert::email/price.phtml';
 
     /**
      * Retrieve unsubscribe url for product
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index f424e7d7125c4..d01960b8eb855 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -15,7 +15,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
     /**
      * @var string
      */
-    protected $_template = 'email/stock.phtml';
+    protected $_template = 'Magento_ProductAlert::email/stock.phtml';
 
     /**
      * Retrieve unsubscribe url for product
diff --git a/app/code/Magento/ProductAlert/Block/Product/ImageProvider.php b/app/code/Magento/ProductAlert/Block/Product/ImageProvider.php
index 0971dd4c27664..61d8d1987c2d7 100644
--- a/app/code/Magento/ProductAlert/Block/Product/ImageProvider.php
+++ b/app/code/Magento/ProductAlert/Block/Product/ImageProvider.php
@@ -60,10 +60,7 @@ public function getImage(Product $product, $imageId, $attributes = [])
         $this->appEmulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
 
         try {
-            $image = $this->imageBuilder->setProduct($product)
-                ->setImageId($imageId)
-                ->setAttributes($attributes)
-                ->create();
+            $image = $this->imageBuilder->create($product, $imageId, $attributes);
         } catch (\Exception $exception) {
             $this->appEmulation->stopEnvironmentEmulation();
             throw $exception;
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index 6effaacd9624d..fbaff109fd15a 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductAlert\Controller\Add;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\ProductAlert\Controller\Add as AddController;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session as CustomerSession;
@@ -15,7 +17,10 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-class Price extends AddController
+/**
+ * Controller for notifying about price.
+ */
+class Price extends AddController implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -61,6 +66,8 @@ protected function isInternal($url)
     }
 
     /**
+     * Method for adding info about product alert price.
+     *
      * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
@@ -74,6 +81,7 @@ public function execute()
             return $resultRedirect;
         }
 
+        $store = $this->storeManager->getStore();
         try {
             /* @var $product \Magento\Catalog\Model\Product */
             $product = $this->productRepository->getById($productId);
@@ -82,11 +90,8 @@ public function execute()
                 ->setCustomerId($this->customerSession->getCustomerId())
                 ->setProductId($product->getId())
                 ->setPrice($product->getFinalPrice())
-                ->setWebsiteId(
-                    $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-                        ->getStore()
-                        ->getWebsiteId()
-                );
+                ->setWebsiteId($store->getWebsiteId())
+                ->setStoreId($store->getId());
             $model->save();
             $this->messageManager->addSuccess(__('You saved the alert subscription.'));
         } catch (NoSuchEntityException $noEntityException) {
@@ -98,7 +103,10 @@ public function execute()
             }
             return $resultRedirect;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the alert subscription right now.'));
+            $this->messageManager->addException(
+                $e,
+                __("The alert subscription couldn't update at this time. Please try again later.")
+            );
         }
         $resultRedirect->setUrl($this->_redirect->getRedirectUrl());
         return $resultRedirect;
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 5b89b4b327ee0..24cab39d544fc 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductAlert\Controller\Add;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\ProductAlert\Controller\Add as AddController;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session as CustomerSession;
@@ -12,29 +14,44 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
-class Stock extends AddController
+/**
+ * Controller for notifying about stock.
+ */
+class Stock extends AddController implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
      */
     protected $productRepository;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         Context $context,
         CustomerSession $customerSession,
-        ProductRepositoryInterface $productRepository
+        ProductRepositoryInterface $productRepository,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->productRepository = $productRepository;
         parent::__construct($context, $customerSession);
+        $this->storeManager = $storeManager ?: $this->_objectManager
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
+     * Method for adding info about product alert stock.
+     *
      * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
@@ -51,15 +68,13 @@ public function execute()
         try {
             /* @var $product \Magento\Catalog\Model\Product */
             $product = $this->productRepository->getById($productId);
+            $store = $this->storeManager->getStore();
             /** @var \Magento\ProductAlert\Model\Stock $model */
             $model = $this->_objectManager->create(\Magento\ProductAlert\Model\Stock::class)
                 ->setCustomerId($this->customerSession->getCustomerId())
                 ->setProductId($product->getId())
-                ->setWebsiteId(
-                    $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-                        ->getStore()
-                        ->getWebsiteId()
-                );
+                ->setWebsiteId($store->getWebsiteId())
+                ->setStoreId($store->getId());
             $model->save();
             $this->messageManager->addSuccess(__('Alert subscription has been saved.'));
         } catch (NoSuchEntityException $noEntityException) {
@@ -67,7 +82,10 @@ public function execute()
             $resultRedirect->setUrl($backUrl);
             return $resultRedirect;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the alert subscription right now.'));
+            $this->messageManager->addException(
+                $e,
+                __("The alert subscription couldn't update at this time. Please try again later.")
+            );
         }
         $resultRedirect->setUrl($this->_redirect->getRedirectUrl());
         return $resultRedirect;
diff --git a/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php b/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php
deleted file mode 100644
index 74f03220e59d3..0000000000000
--- a/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\ProductAlert\Controller\Add;
-
-use Magento\ProductAlert\Controller\Add as AddController;
-use Magento\Framework\DataObject;
-
-class TestObserver extends AddController
-{
-    /**
-     * @return void
-     */
-    public function execute()
-    {
-        $object = new DataObject();
-        /** @var \Magento\ProductAlert\Model\Observer $observer */
-        $observer = $this->_objectManager->get(\Magento\ProductAlert\Model\Observer::class);
-        $observer->process($object);
-    }
-}
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 9adf15a2e1347..2077b1ff2794b 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
 use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
@@ -68,11 +69,14 @@ public function execute()
 
             $this->messageManager->addSuccess(__('You deleted the alert subscription.'));
         } catch (NoSuchEntityException $noEntityException) {
-            $this->messageManager->addError(__('We can\'t find the product.'));
+            $this->messageManager->addError(__("The product wasn't found. Verify the product and try again."));
             $resultRedirect->setPath('customer/account/');
             return $resultRedirect;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the alert subscription right now.'));
+            $this->messageManager->addException(
+                $e,
+                __("The alert subscription couldn't update at this time. Please try again later.")
+            );
         }
         $resultRedirect->setUrl($product->getProductUrl());
         return $resultRedirect;
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
index 84ebbaecaaf69..7a6aeb40eb5b7 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
 use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
@@ -70,7 +71,10 @@ public function execute()
             $resultRedirect->setPath('customer/account/');
             return $resultRedirect;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the alert subscription right now.'));
+            $this->messageManager->addException(
+                $e,
+                __("The alert subscription couldn't update at this time. Please try again later.")
+            );
         }
         $resultRedirect->setUrl($product->getProductUrl());
         return $resultRedirect;
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 7bc4aba351546..7aee4ca01240d 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -1,10 +1,36 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ProductAlert\Model;
 
+use Magento\Catalog\Model\Product;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Helper\View;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\ProductAlert\Block\Email\AbstractEmail;
+use Magento\ProductAlert\Block\Email\Price;
+use Magento\ProductAlert\Block\Email\Stock;
+use Magento\ProductAlert\Helper\Data;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\App\Emulation;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
+
 /**
  * ProductAlert Email processor
  *
@@ -14,7 +40,7 @@
  * @api
  * @since 100.0.2
  */
-class Email extends \Magento\Framework\Model\AbstractModel
+class Email extends AbstractModel
 {
     const XML_PATH_EMAIL_PRICE_TEMPLATE = 'catalog/productalert/email_price_template';
 
@@ -32,14 +58,14 @@ class Email extends \Magento\Framework\Model\AbstractModel
     /**
      * Website Model
      *
-     * @var \Magento\Store\Model\Website
+     * @var Website
      */
     protected $_website;
 
     /**
      * Customer model
      *
-     * @var \Magento\Customer\Api\Data\CustomerInterface
+     * @var CustomerInterface
      */
     protected $_customer;
 
@@ -60,83 +86,88 @@ class Email extends \Magento\Framework\Model\AbstractModel
     /**
      * Price block
      *
-     * @var \Magento\ProductAlert\Block\Email\Price
+     * @var Price
      */
     protected $_priceBlock;
 
     /**
      * Stock block
      *
-     * @var \Magento\ProductAlert\Block\Email\Stock
+     * @var Stock
      */
     protected $_stockBlock;
 
     /**
      * Product alert data
      *
-     * @var \Magento\ProductAlert\Helper\Data
+     * @var Data
      */
     protected $_productAlertData = null;
 
     /**
      * Core store config
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     * @var CustomerRepositoryInterface
      */
     protected $customerRepository;
 
     /**
-     * @var \Magento\Store\Model\App\Emulation
+     * @var Emulation
      */
     protected $_appEmulation;
 
     /**
-     * @var \Magento\Framework\Mail\Template\TransportBuilder
+     * @var TransportBuilder
      */
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Customer\Helper\View
+     * @var View
      */
     protected $_customerHelper;
 
     /**
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\ProductAlert\Helper\Data $productAlertData
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-     * @param \Magento\Customer\Helper\View $customerHelper
-     * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @var int
+     */
+    private $storeId = null;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param Data $productAlertData
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param View $customerHelper
+     * @param Emulation $appEmulation
+     * @param TransportBuilder $transportBuilder
+     * @param AbstractResource $resource
+     * @param AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\ProductAlert\Helper\Data $productAlertData,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
-        \Magento\Customer\Helper\View $customerHelper,
-        \Magento\Store\Model\App\Emulation $appEmulation,
-        \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        Context $context,
+        Registry $registry,
+        Data $productAlertData,
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        CustomerRepositoryInterface $customerRepository,
+        View $customerHelper,
+        Emulation $appEmulation,
+        TransportBuilder $transportBuilder,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->_productAlertData = $productAlertData;
@@ -153,6 +184,7 @@ public function __construct(
      * Set model type
      *
      * @param string $type
+     *
      * @return void
      */
     public function setType($type)
@@ -173,7 +205,8 @@ public function getType()
     /**
      * Set website model
      *
-     * @param \Magento\Store\Model\Website $website
+     * @param Website $website
+     *
      * @return $this
      */
     public function setWebsite(\Magento\Store\Model\Website $website)
@@ -182,11 +215,25 @@ public function setWebsite(\Magento\Store\Model\Website $website)
         return $this;
     }
 
+    /**
+     * Set store id from product alert.
+     *
+     * @param int $storeId
+     * @return $this
+     */
+    public function setStoreId(int $storeId)
+    {
+        $this->storeId = $storeId;
+        return $this;
+    }
+
     /**
      * Set website id
      *
      * @param int $websiteId
+     *
      * @return $this
+     * @throws LocalizedException
      */
     public function setWebsiteId($websiteId)
     {
@@ -198,7 +245,10 @@ public function setWebsiteId($websiteId)
      * Set customer by id
      *
      * @param int $customerId
+     *
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function setCustomerId($customerId)
     {
@@ -209,7 +259,8 @@ public function setCustomerId($customerId)
     /**
      * Set customer model
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param CustomerInterface $customer
+     *
      * @return $this
      */
     public function setCustomerData($customer)
@@ -235,7 +286,8 @@ public function clean()
     /**
      * Add product (price change) to collection
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
+     *
      * @return $this
      */
     public function addPriceProduct(\Magento\Catalog\Model\Product $product)
@@ -247,7 +299,8 @@ public function addPriceProduct(\Magento\Catalog\Model\Product $product)
     /**
      * Add product (back in stock) to collection
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
+     *
      * @return $this
      */
     public function addStockProduct(\Magento\Catalog\Model\Product $product)
@@ -259,12 +312,13 @@ public function addStockProduct(\Magento\Catalog\Model\Product $product)
     /**
      * Retrieve price block
      *
-     * @return \Magento\ProductAlert\Block\Email\Price
+     * @return Price
+     * @throws LocalizedException
      */
     protected function _getPriceBlock()
     {
         if ($this->_priceBlock === null) {
-            $this->_priceBlock = $this->_productAlertData->createBlock(\Magento\ProductAlert\Block\Email\Price::class);
+            $this->_priceBlock = $this->_productAlertData->createBlock(Price::class);
         }
         return $this->_priceBlock;
     }
@@ -272,12 +326,13 @@ protected function _getPriceBlock()
     /**
      * Retrieve stock block
      *
-     * @return \Magento\ProductAlert\Block\Email\Stock
+     * @return Stock
+     * @throws LocalizedException
      */
     protected function _getStockBlock()
     {
         if ($this->_stockBlock === null) {
-            $this->_stockBlock = $this->_productAlertData->createBlock(\Magento\ProductAlert\Block\Email\Stock::class);
+            $this->_stockBlock = $this->_productAlertData->createBlock(Stock::class);
         }
         return $this->_stockBlock;
     }
@@ -286,110 +341,131 @@ protected function _getStockBlock()
      * Send customer email
      *
      * @return bool
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws MailException
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
      */
     public function send()
     {
-        if ($this->_website === null || $this->_customer === null) {
-            return false;
-        }
-        if ($this->_type == 'price' && count(
-            $this->_priceProducts
-        ) == 0 || $this->_type == 'stock' && count(
-            $this->_stockProducts
-        ) == 0
-        ) {
+        if ($this->_website === null || $this->_customer === null || !$this->isExistDefaultStore()) {
             return false;
         }
-        if (!$this->_website->getDefaultGroup() || !$this->_website->getDefaultGroup()->getDefaultStore()) {
-            return false;
-        }
-
-        if ($this->_customer->getStoreId() > 0) {
-            $store = $this->_storeManager->getStore($this->_customer->getStoreId());
-        } else {
-            $store = $this->_website->getDefaultStore();
-        }
-        $storeId = $store->getId();
 
-        if ($this->_type == 'price' && !$this->_scopeConfig->getValue(
-            self::XML_PATH_EMAIL_PRICE_TEMPLATE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $storeId
-        )
-        ) {
-            return false;
-        } elseif ($this->_type == 'stock' && !$this->_scopeConfig->getValue(
-            self::XML_PATH_EMAIL_STOCK_TEMPLATE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $storeId
-        )
-        ) {
+        $products = $this->getProducts();
+        $templateConfigPath = $this->getTemplateConfigPath();
+        if (!in_array($this->_type, ['price', 'stock']) || count($products) === 0 || !$templateConfigPath) {
             return false;
         }
 
-        if ($this->_type != 'price' && $this->_type != 'stock') {
-            return false;
-        }
+        $storeId = $this->storeId ?: (int) $this->_customer->getStoreId();
+        $store = $this->getStore($storeId);
 
         $this->_appEmulation->startEnvironmentEmulation($storeId);
 
-        if ($this->_type == 'price') {
-            $this->_getPriceBlock()->setStore($store)->reset();
-            foreach ($this->_priceProducts as $product) {
-                $product->setCustomerGroupId($this->_customer->getGroupId());
-                $this->_getPriceBlock()->addProduct($product);
-            }
-            $block = $this->_getPriceBlock();
-            $templateId = $this->_scopeConfig->getValue(
-                self::XML_PATH_EMAIL_PRICE_TEMPLATE,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                $storeId
-            );
-        } else {
-            $this->_getStockBlock()->setStore($store)->reset();
-            foreach ($this->_stockProducts as $product) {
-                $product->setCustomerGroupId($this->_customer->getGroupId());
-                $this->_getStockBlock()->addProduct($product);
-            }
-            $block = $this->_getStockBlock();
-            $templateId = $this->_scopeConfig->getValue(
-                self::XML_PATH_EMAIL_STOCK_TEMPLATE,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                $storeId
-            );
+        $block = $this->getBlock();
+        $block->setStore($store)->reset();
+
+        // Add products to the block
+        foreach ($products as $product) {
+            $product->setCustomerGroupId($this->_customer->getGroupId());
+            $block->addProduct($product);
         }
 
+        $templateId = $this->_scopeConfig->getValue(
+            $templateConfigPath,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
         $alertGrid = $this->_appState->emulateAreaCode(
-            \Magento\Framework\App\Area::AREA_FRONTEND,
+            Area::AREA_FRONTEND,
             [$block, 'toHtml']
         );
         $this->_appEmulation->stopEnvironmentEmulation();
 
-        $transport = $this->_transportBuilder->setTemplateIdentifier(
+        $customerName = $this->_customerHelper->getCustomerName($this->_customer);
+        $this->_transportBuilder->setTemplateIdentifier(
             $templateId
         )->setTemplateOptions(
-            ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
+            ['area' => Area::AREA_FRONTEND, 'store' => $storeId]
         )->setTemplateVars(
             [
-                'customerName' => $this->_customerHelper->getCustomerName($this->_customer),
+                'customerName' => $customerName,
                 'alertGrid' => $alertGrid,
             ]
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_IDENTITY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $storeId
             )
         )->addTo(
             $this->_customer->getEmail(),
-            $this->_customerHelper->getCustomerName($this->_customer)
-        )->getTransport();
+            $customerName
+        )->getTransport()->sendMessage();
+
+        return true;
+    }
+
+    /**
+     * Retrieve the store for the email
+     *
+     * @param int $storeId
+     * @return StoreInterface
+     * @throws NoSuchEntityException
+     */
+    private function getStore(int $storeId): StoreInterface
+    {
+        return $this->_storeManager->getStore($storeId);
+    }
+
+    /**
+     * Retrieve the block for the email based on type
+     *
+     * @return Price|Stock
+     * @throws LocalizedException
+     */
+    private function getBlock(): AbstractEmail
+    {
+        return $this->_type === 'price'
+            ? $this->_getPriceBlock()
+            : $this->_getStockBlock();
+    }
+
+    /**
+     * Retrieve the products for the email based on type
+     *
+     * @return array
+     */
+    private function getProducts(): array
+    {
+        return $this->_type === 'price'
+            ? $this->_priceProducts
+            : $this->_stockProducts;
+    }
 
-        $transport->sendMessage();
+    /**
+     * Retrieve template config path based on type
+     *
+     * @return string
+     */
+    private function getTemplateConfigPath(): string
+    {
+        return $this->_type === 'price'
+            ? self::XML_PATH_EMAIL_PRICE_TEMPLATE
+            : self::XML_PATH_EMAIL_STOCK_TEMPLATE;
+    }
 
+    /**
+     * Check if exists default store.
+     *
+     * @return bool
+     */
+    private function isExistDefaultStore(): bool
+    {
+        if (!$this->_website->getDefaultGroup() || !$this->_website->getDefaultGroup()->getDefaultStore()) {
+            return false;
+        }
         return true;
     }
 }
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index df046c4e4af8f..addc61d2f49a9 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);
     }
 
     /**
@@ -209,6 +218,7 @@ protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
             $previousCustomer = null;
             $email->setWebsite($website);
             foreach ($collection as $alert) {
+                $this->setAlertStoreId($alert, $email);
                 try {
                     if (!$previousCustomer || $previousCustomer->getId() != $alert->getCustomerId()) {
                         $customer = $this->customerRepository->getById($alert->getCustomerId());
@@ -302,6 +312,7 @@ protected function _processStock(\Magento\ProductAlert\Model\Email $email)
             $previousCustomer = null;
             $email->setWebsite($website);
             foreach ($collection as $alert) {
+                $this->setAlertStoreId($alert, $email);
                 try {
                     if (!$previousCustomer || $previousCustomer->getId() != $alert->getCustomerId()) {
                         $customer = $this->customerRepository->getById($alert->getCustomerId());
@@ -326,7 +337,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());
@@ -418,4 +429,21 @@ public function process()
 
         return $this;
     }
+
+    /**
+     * Set alert store id.
+     *
+     * @param \Magento\ProductAlert\Model\Price|\Magento\ProductAlert\Model\Stock $alert
+     * @param Email $email
+     * @return Observer
+     */
+    private function setAlertStoreId($alert, \Magento\ProductAlert\Model\Email $email) : Observer
+    {
+        $alertStoreId = $alert->getStoreId();
+        if ($alertStoreId) {
+            $email->setStoreId((int)$alertStoreId);
+        }
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/ProductAlert/Model/Price.php b/app/code/Magento/ProductAlert/Model/Price.php
index 0c12b7cfb489e..ecdf4578838aa 100644
--- a/app/code/Magento/ProductAlert/Model/Price.php
+++ b/app/code/Magento/ProductAlert/Model/Price.php
@@ -26,6 +26,8 @@
  * @method \Magento\ProductAlert\Model\Price setSendCount(int $value)
  * @method int getStatus()
  * @method \Magento\ProductAlert\Model\Price setStatus(int $value)
+ * @method int getStoreId()
+ * @method \Magento\ProductAlert\Model\Stock setStoreId(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  *
@@ -60,6 +62,8 @@ public function __construct(
     }
 
     /**
+     * Create customer collection.
+     *
      * @return void
      */
     protected function _construct()
@@ -68,6 +72,8 @@ protected function _construct()
     }
 
     /**
+     * Create customer collection.
+     *
      * @return Collection
      */
     public function getCustomerCollection()
@@ -76,6 +82,8 @@ public function getCustomerCollection()
     }
 
     /**
+     * Load by param.
+     *
      * @return $this
      */
     public function loadByParam()
@@ -87,6 +95,8 @@ public function loadByParam()
     }
 
     /**
+     * Method for deleting customer from website.
+     *
      * @param int $customerId
      * @param int $websiteId
      * @return $this
diff --git a/app/code/Magento/ProductAlert/Model/ProductSalability.php b/app/code/Magento/ProductAlert/Model/ProductSalability.php
new file mode 100644
index 0000000000000..dffb69ee092d8
--- /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/Model/Stock.php b/app/code/Magento/ProductAlert/Model/Stock.php
index 4d4dea5c2fe7e..99ba95e633904 100644
--- a/app/code/Magento/ProductAlert/Model/Stock.php
+++ b/app/code/Magento/ProductAlert/Model/Stock.php
@@ -24,6 +24,8 @@
  * @method \Magento\ProductAlert\Model\Stock setSendCount(int $value)
  * @method int getStatus()
  * @method \Magento\ProductAlert\Model\Stock setStatus(int $value)
+ * @method int getStoreId()
+ * @method \Magento\ProductAlert\Model\Stock setStoreId(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  *
@@ -58,6 +60,8 @@ public function __construct(
     }
 
     /**
+     * Class constructor.
+     *
      * @return void
      */
     protected function _construct()
@@ -66,6 +70,8 @@ protected function _construct()
     }
 
     /**
+     * Create customer collection.
+     *
      * @return Collection
      */
     public function getCustomerCollection()
@@ -74,6 +80,8 @@ public function getCustomerCollection()
     }
 
     /**
+     * Load by param.
+     *
      * @return $this
      */
     public function loadByParam()
@@ -85,6 +93,8 @@ public function loadByParam()
     }
 
     /**
+     * Method for deleting customer from website.
+     *
      * @param int $customerId
      * @param int $websiteId
      * @return $this
diff --git a/app/code/Magento/ProductAlert/Setup/InstallSchema.php b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
deleted file mode 100644
index 8db92a7d0a0b1..0000000000000
--- a/app/code/Magento/ProductAlert/Setup/InstallSchema.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ProductAlert\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-        /**
-         * Create table 'product_alert_price'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('product_alert_price')
-        )->addColumn(
-            'alert_price_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Product alert price id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Customer id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Product id'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Price amount'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website id'
-        )->addColumn(
-            'add_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Product alert add date'
-        )->addColumn(
-            'last_send_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Product alert last send date'
-        )->addColumn(
-            'send_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Product alert send count'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Product alert status'
-        )->addIndex(
-            $installer->getIdxName('product_alert_price', ['customer_id']),
-            ['customer_id']
-        )->addIndex(
-            $installer->getIdxName('product_alert_price', ['product_id']),
-            ['product_id']
-        )->addIndex(
-            $installer->getIdxName('product_alert_price', ['website_id']),
-            ['website_id']
-        )->addForeignKey(
-            $installer->getFkName('product_alert_price', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('product_alert_price', 'product_id', 'catalog_product_entity', 'entity_id'),
-            'product_id',
-            $installer->getTable('catalog_product_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('product_alert_price', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Product Alert Price'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'product_alert_stock'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('product_alert_stock')
-        )->addColumn(
-            'alert_stock_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Product alert stock id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Customer id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Product id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website id'
-        )->addColumn(
-            'add_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Product alert add date'
-        )->addColumn(
-            'send_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Product alert send date'
-        )->addColumn(
-            'send_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Send Count'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Product alert status'
-        )->addIndex(
-            $installer->getIdxName('product_alert_stock', ['customer_id']),
-            ['customer_id']
-        )->addIndex(
-            $installer->getIdxName('product_alert_stock', ['product_id']),
-            ['product_id']
-        )->addIndex(
-            $installer->getIdxName('product_alert_stock', ['website_id']),
-            ['website_id']
-        )->addForeignKey(
-            $installer->getFkName('product_alert_stock', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('product_alert_stock', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('product_alert_stock', 'product_id', 'catalog_product_entity', 'entity_id'),
-            'product_id',
-            $installer->getTable('catalog_product_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Product Alert Stock'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE.txt b/app/code/Magento/ProductAlert/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE.txt
rename to app/code/Magento/ProductAlert/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE_AFL.txt b/app/code/Magento/ProductAlert/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE_AFL.txt
rename to app/code/Magento/ProductAlert/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ProductAlert/Test/Mftf/README.md b/app/code/Magento/ProductAlert/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c842458d761a1
--- /dev/null
+++ b/app/code/Magento/ProductAlert/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Product Alert Functional Tests
+
+The Functional Test Module for **Magento Product Alert** module.
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Block/Email/StockTest.php b/app/code/Magento/ProductAlert/Test/Unit/Block/Email/StockTest.php
index c948ceabd7a29..c5872701ef9c8 100644
--- a/app/code/Magento/ProductAlert/Test/Unit/Block/Email/StockTest.php
+++ b/app/code/Magento/ProductAlert/Test/Unit/Block/Email/StockTest.php
@@ -65,6 +65,9 @@ public function testGetFilteredContent($contentToFilter, $contentFiltered)
         $this->assertEquals($contentFiltered, $this->_block->getFilteredContent($contentToFilter));
     }
 
+    /**
+     * @return array
+     */
     public function getFilteredContentDataProvider()
     {
         return [
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Block/Product/ImageProviderTest.php b/app/code/Magento/ProductAlert/Test/Unit/Block/Product/ImageProviderTest.php
index 39b07161934f8..172e5f486f30b 100644
--- a/app/code/Magento/ProductAlert/Test/Unit/Block/Product/ImageProviderTest.php
+++ b/app/code/Magento/ProductAlert/Test/Unit/Block/Product/ImageProviderTest.php
@@ -54,23 +54,16 @@ public function testGetImage()
         $imageId = 'test_image_id';
         $attributes = [];
 
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $imageMock = $this->createMock(\Magento\Catalog\Block\Product\Image::class);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
 
         $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
-        $storeMock->expects($this->atLeastOnce())->method('getId')->willReturn(42);
         $this->emulationMock->expects($this->once())->method('startEnvironmentEmulation');
-        $this->imageBuilderMock->expects($this->once())->method('setProduct')->with($productMock)->willReturnSelf();
-        $this->imageBuilderMock->expects($this->once())->method('setImageId')->with($imageId)->willReturnSelf();
-        $this->imageBuilderMock->expects($this->once())->method('setAttributes')->with($attributes)->willReturnSelf();
-        $this->imageBuilderMock->expects($this->once())->method('create')->willReturn($imageMock);
+        $this->imageBuilderMock->expects($this->once())
+            ->method('create')
+            ->with($productMock, $imageId, $attributes)
+            ->willReturn($imageMock);
         $this->emulationMock->expects($this->once())->method('stopEnvironmentEmulation');
 
         $this->assertEquals($imageMock, $this->model->getImage($productMock, $imageId, $attributes));
@@ -84,6 +77,7 @@ public function testGetImage()
      */
     public function testGetImageThrowsAnException()
     {
+        $imageId = 1;
         $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -93,13 +87,13 @@ public function testGetImageThrowsAnException()
 
         $this->emulationMock->expects($this->once())->method('startEnvironmentEmulation');
         $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
-        $storeMock->expects($this->atLeastOnce())->method('getId')->willReturn(42);
 
         $this->imageBuilderMock->expects($this->once())
-            ->method('setProduct')
+            ->method('create')
+            ->with($productMock, $imageId)
             ->willThrowException(new \Exception("Image Builder Exception"));
 
         $this->emulationMock->expects($this->once())->method('stopEnvironmentEmulation');
-        $this->model->getImage($productMock, 1);
+        $this->model->getImage($productMock, $imageId);
     }
 }
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Block/Product/View/StockTest.php b/app/code/Magento/ProductAlert/Test/Unit/Block/Product/View/StockTest.php
index 886ed6eb3fe27..b9f28bde15d07 100644
--- a/app/code/Magento/ProductAlert/Test/Unit/Block/Product/View/StockTest.php
+++ b/app/code/Magento/ProductAlert/Test/Unit/Block/Product/View/StockTest.php
@@ -126,6 +126,9 @@ public function testSetTemplateStockUrlNotAllowed($stockAlertAllowed, $productAv
         $this->assertNull($this->_block->getSignupUrl());
     }
 
+    /**
+     * @return array
+     */
     public function setTemplateStockUrlNotAllowedDataProvider()
     {
         return [
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
index 54376caa653cc..e3a2056a89ec0 100644
--- a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\ProductAlert\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\ProductAlert\Model\ProductSalability;
 
 /**
  * Class ObserverTest
@@ -109,6 +111,14 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManagerMock;
 
+    /**
+     * @var ProductSalability|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productSalabilityMock;
+
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
@@ -170,10 +180,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 +198,8 @@ protected function setUp()
                 'priceColFactory' => $this->priceColFactoryMock,
                 'stockColFactory' => $this->stockColFactoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
-                'productRepository' => $this->productRepositoryMock
+                'productRepository' => $this->productRepositoryMock,
+                'productSalability' => $this->productSalabilityMock
             ]
         );
     }
@@ -288,8 +300,8 @@ public function testProcessPriceEmailThrowsException()
             ->method('setCustomerOrder')
             ->willReturn(new \ArrayIterator($items));
 
-        $customer = new \Magento\Framework\DataObject(['group_id' => $id]);
-        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customer);
+        $customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
+        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customerMock);
 
         $this->productMock->expects($this->once())->method('setCustomerGroupId')->willReturnSelf();
         $this->productMock->expects($this->once())->method('getFinalPrice')->willReturn('655.99');
@@ -360,7 +372,6 @@ public function testProcessStockCustomerRepositoryThrowsException()
      */
     public function testProcessStockEmailThrowsException()
     {
-        $id = 1;
         $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
 
         $this->emailFactoryMock->expects($this->once())->method('create')->willReturn($this->emailMock);
@@ -387,11 +398,11 @@ public function testProcessStockEmailThrowsException()
             ->method('setCustomerOrder')
             ->willReturn(new \ArrayIterator($items));
 
-        $customer = new \Magento\Framework\DataObject(['group_id' => $id]);
-        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customer);
+        $customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
+        $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customerMock);
 
         $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/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index be3c30aa94626..e8488187f839a 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -5,18 +5,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ProductAlert/etc/db_schema.xml b/app/code/Magento/ProductAlert/etc/db_schema.xml
new file mode 100644
index 0000000000000..820a8029e2d95
--- /dev/null
+++ b/app/code/Magento/ProductAlert/etc/db_schema.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="product_alert_price" resource="default" engine="innodb" comment="Product Alert Price">
+        <column xsi:type="int" name="alert_price_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Product alert price id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product id"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price amount"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Store id"/>
+        <column xsi:type="timestamp" name="add_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Product alert add date"/>
+        <column xsi:type="timestamp" name="last_send_date" on_update="false" nullable="true"
+                comment="Product alert last send date"/>
+        <column xsi:type="smallint" name="send_count" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product alert send count"/>
+        <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product alert status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="alert_price_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="product_alert_price" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="product_alert_price" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="product_alert_price" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_PRICE_STORE_ID_STORE_STORE_ID"
+                    table="product_alert_stock" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="PRODUCT_ALERT_PRICE_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="PRODUCT_ALERT_PRICE_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="PRODUCT_ALERT_PRICE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="PRODUCT_ALERT_PRICE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="product_alert_stock" resource="default" engine="innodb" comment="Product Alert Stock">
+        <column xsi:type="int" name="alert_stock_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Product alert stock id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Store id"/>
+        <column xsi:type="timestamp" name="add_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Product alert add date"/>
+        <column xsi:type="timestamp" name="send_date" on_update="false" nullable="true"
+                comment="Product alert send date"/>
+        <column xsi:type="smallint" name="send_count" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Send Count"/>
+        <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product alert status"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="alert_stock_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="product_alert_stock" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="product_alert_stock" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="product_alert_stock" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="PRODUCT_ALERT_STOCK_STORE_ID_STORE_STORE_ID"
+                    table="product_alert_stock" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="PRODUCT_ALERT_STOCK_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="PRODUCT_ALERT_STOCK_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="PRODUCT_ALERT_STOCK_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="PRODUCT_ALERT_STOCK_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json b/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..94c9d07c85015
--- /dev/null
+++ b/app/code/Magento/ProductAlert/etc/db_schema_whitelist.json
@@ -0,0 +1,57 @@
+{
+    "product_alert_price": {
+        "column": {
+            "store_id": true,
+            "alert_price_id": true,
+            "customer_id": true,
+            "product_id": true,
+            "price": true,
+            "website_id": true,
+            "add_date": true,
+            "last_send_date": true,
+            "send_count": true,
+            "status": true
+        },
+        "index": {
+            "PRODUCT_ALERT_PRICE_STORE_ID": true,
+            "PRODUCT_ALERT_PRICE_CUSTOMER_ID": true,
+            "PRODUCT_ALERT_PRICE_PRODUCT_ID": true,
+            "PRODUCT_ALERT_PRICE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRODUCT_ALERT_PRICE_STORE_ID_STORE_STORE_ID": true,
+            "PRIMARY": true,
+            "PRODUCT_ALERT_PRICE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "PRODUCT_ALERT_PRICE_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
+            "PRODUCT_ALERT_PRICE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "PRODUCT_ALERT_PRICE_PRODUCT_ID_SEQUENCE_PRODUCT_SEQUENCE_VALUE": true
+        }
+    },
+    "product_alert_stock": {
+        "column": {
+            "store_id": true,
+            "alert_stock_id": true,
+            "customer_id": true,
+            "product_id": true,
+            "website_id": true,
+            "add_date": true,
+            "send_date": true,
+            "send_count": true,
+            "status": true
+        },
+        "index": {
+            "PRODUCT_ALERT_STOCK_STORE_ID": true,
+            "PRODUCT_ALERT_STOCK_CUSTOMER_ID": true,
+            "PRODUCT_ALERT_STOCK_PRODUCT_ID": true,
+            "PRODUCT_ALERT_STOCK_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRODUCT_ALERT_STOCK_STORE_ID_STORE_STORE_ID": true,
+            "PRIMARY": true,
+            "PRODUCT_ALERT_STOCK_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "PRODUCT_ALERT_STOCK_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "PRODUCT_ALERT_STOCK_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
+            "PRODUCT_ALERT_STOCK_PRODUCT_ID_SEQUENCE_PRODUCT_SEQUENCE_VALUE": true
+        }
+    }
+}
diff --git a/app/code/Magento/ProductAlert/etc/module.xml b/app/code/Magento/ProductAlert/etc/module.xml
index 699faf4b9133b..4d519294ae7ab 100644
--- a/app/code/Magento/ProductAlert/etc/module.xml
+++ b/app/code/Magento/ProductAlert/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ProductAlert" setup_version="2.0.0">
+    <module name="Magento_ProductAlert" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Customer"/>
diff --git a/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php b/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php
index 78730d625e44c..45c4925640a0c 100644
--- a/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php
+++ b/app/code/Magento/ProductVideo/Block/Product/View/Gallery.php
@@ -9,6 +9,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\ProductVideo\Block\Product\View;
 
 /**
@@ -28,7 +29,7 @@ class Gallery extends \Magento\Catalog\Block\Product\View\Gallery
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\ProductVideo\Helper\Media $mediaHelper
      * @param array $data
-     * @param \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface $imagesConfigFactory
+     * @param \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface|null $imagesConfigFactory
      * @param array $galleryImagesConfig
      */
     public function __construct(
@@ -91,6 +92,6 @@ public function getVideoSettingsJson()
      */
     public function getOptionsMediaGalleryDataJson()
     {
-        return  $this->jsonEncoder->encode([]);
+        return $this->jsonEncoder->encode([]);
     }
 }
diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
index 3658e36a82ec3..914b5fa271717 100644
--- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
+++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductVideo\Controller\Adminhtml\Product\Gallery;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\Uploader;
@@ -12,7 +14,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class RetrieveImage extends \Magento\Backend\App\Action
+class RetrieveImage extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -110,7 +112,7 @@ public function execute()
             $remoteFileUrl = $this->getRequest()->getParam('remote_image');
             $this->validateRemoteFile($remoteFileUrl);
             $localFileName = Uploader::getCorrectFileName(basename($remoteFileUrl));
-            $localTmpFileName = Uploader::getDispretionPath($localFileName) . DIRECTORY_SEPARATOR . $localFileName;
+            $localTmpFileName = Uploader::getDispersionPath($localFileName) . DIRECTORY_SEPARATOR . $localFileName;
             $localFilePath = $baseTmpMediaPath . ($localTmpFileName);
             $localUniqFilePath = $this->appendNewFileName($localFilePath);
             $this->validateRemoteFileExtensions($localUniqFilePath);
@@ -174,7 +176,7 @@ private function validateRemoteFileExtensions($filePath)
     protected function appendResultSaveRemoteImage($fileName)
     {
         $fileInfo = pathinfo($fileName);
-        $tmpFileName = Uploader::getDispretionPath($fileInfo['basename']) . DIRECTORY_SEPARATOR . $fileInfo['basename'];
+        $tmpFileName = Uploader::getDispersionPath($fileInfo['basename']) . DIRECTORY_SEPARATOR . $fileInfo['basename'];
         $result['name'] = $fileInfo['basename'];
         $result['type'] = $this->imageAdapter->getMimeType();
         $result['error'] = 0;
@@ -199,7 +201,7 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)
         $image = $this->curl->read();
         if (empty($image)) {
             throw new LocalizedException(
-                __('Could not get preview image information. Please check your connection and try again.')
+                __('The preview image information is unavailable. Check your connection and try again.')
             );
         }
         $this->fileUtility->saveFile($localFilePath, $image);
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
index c06ce8355d024..ce1493b349a85 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductVideo\Model\Plugin\Catalog\Product\Gallery;
 
 use Magento\ProductVideo\Model\Product\Attribute\Media\ExternalVideoEntryConverter;
-use Magento\ProductVideo\Setup\InstallSchema;
 
 /**
  * Plugin for catalog product gallery create/update handlers.
@@ -30,6 +30,7 @@ public function beforeExecute(
         \Magento\Catalog\Model\Product $product,
         array $arguments = []
     ) {
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
         $attribute = $mediaGalleryCreateHandler->getAttribute();
         $mediaCollection = $this->getMediaEntriesDataCollection($product, $attribute);
         if (!empty($mediaCollection)) {
@@ -37,7 +38,7 @@ public function beforeExecute(
             $mediaCollection = $this->addAdditionalStoreData($mediaCollection, $storeDataCollection);
             $product->setData(
                 $attribute->getAttributeCode(),
-                $mediaCollection + $product->getData($attribute->getAttributeCode())
+                $mediaCollection
             );
         }
     }
@@ -57,6 +58,9 @@ public function afterExecute(
         );
 
         if (!empty($mediaCollection)) {
+            $newVideoCollection = $this->collectNewVideos($mediaCollection);
+            $this->saveVideoData($newVideoCollection, 0);
+
             $videoDataCollection = $this->collectVideoData($mediaCollection);
             $this->saveVideoData($videoDataCollection, $product->getStoreId());
             $this->saveAdditionalStoreData($videoDataCollection);
@@ -101,7 +105,7 @@ protected function saveAdditionalStoreData(array $videoDataCollection)
     protected function saveVideoValuesItem(array $item)
     {
         $this->resourceModel->saveDataRow(
-            InstallSchema::GALLERY_VALUE_VIDEO_TABLE,
+            'catalog_product_entity_media_gallery_value_video',
             $this->prepareVideoRowDataForSave($item)
         );
     }
@@ -149,7 +153,7 @@ protected function loadStoreViewVideoData(array $mediaCollection, $excludedStore
         $result = [];
         if (!empty($ids)) {
             $result = $this->resourceModel->loadDataFromTableByValueId(
-                InstallSchema::GALLERY_VALUE_VIDEO_TABLE,
+                'catalog_product_entity_media_gallery_value_video',
                 $ids,
                 null,
                 $this->videoPropertiesDbMapping
@@ -168,10 +172,7 @@ protected function collectVideoData(array $mediaCollection)
     {
         $videoDataCollection = [];
         foreach ($mediaCollection as $item) {
-            if (!empty($item['media_type'])
-                && empty($item['removed'])
-                && $item['media_type'] == ExternalVideoEntryConverter::MEDIA_TYPE_CODE
-            ) {
+            if ($this->isVideoItem($item)) {
                 $videoData = $this->extractVideoDataFromRowData($item);
                 $videoDataCollection[] = $videoData;
             }
@@ -200,11 +201,7 @@ protected function collectVideoEntriesIdsToAdditionalLoad(array $mediaCollection
     {
         $ids = [];
         foreach ($mediaCollection as $item) {
-            if (!empty($item['media_type'])
-                && empty($item['removed'])
-                && $item['media_type'] == ExternalVideoEntryConverter::MEDIA_TYPE_CODE
-                && isset($item['save_data_from'])
-            ) {
+            if ($this->isVideoItem($item) && isset($item['save_data_from'])) {
                 $ids[] = $item['save_data_from'];
             }
         }
@@ -216,18 +213,19 @@ protected function collectVideoEntriesIdsToAdditionalLoad(array $mediaCollection
      * @param array $data
      * @return array
      */
-    protected function addAdditionalStoreData(array $mediaCollection, array $data)
+    protected function addAdditionalStoreData(array $mediaCollection, array $data): array
     {
-        foreach ($mediaCollection as &$mediaItem) {
+        $return = [];
+        foreach ($mediaCollection as $key => $mediaItem) {
             if (!empty($mediaItem['save_data_from'])) {
                 $additionalData = $this->createAdditionalStoreDataCollection($data, $mediaItem['save_data_from']);
                 if (!empty($additionalData)) {
                     $mediaItem[self::ADDITIONAL_STORE_DATA_KEY] = $additionalData;
                 }
             }
+            $return[$key] = $mediaItem;
         }
-
-        return ['images' => $mediaCollection];
+        return ['images' => $return];
     }
 
     /**
@@ -235,7 +233,7 @@ protected function addAdditionalStoreData(array $mediaCollection, array $data)
      * @param int $valueId
      * @return array
      */
-    protected function createAdditionalStoreDataCollection(array $storeData, $valueId)
+    protected function createAdditionalStoreDataCollection(array $storeData, $valueId): array
     {
         $result = [];
         foreach ($storeData as $item) {
@@ -247,4 +245,41 @@ protected function createAdditionalStoreDataCollection(array $storeData, $valueI
 
         return $result;
     }
+
+    /**
+     * @param array $mediaCollection
+     * @return array
+     */
+    private function collectNewVideos(array $mediaCollection): array
+    {
+        $return = [];
+        foreach ($mediaCollection as $item) {
+            if ($this->isVideoItem($item) && $this->isNewVideo($item)) {
+                $return[] = $this->extractVideoDataFromRowData($item);
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * @param array $item
+     * @return bool
+     */
+    private function isVideoItem(array $item): bool
+    {
+        return !empty($item['media_type'])
+            && empty($item['removed'])
+            && $item['media_type'] == ExternalVideoEntryConverter::MEDIA_TYPE_CODE;
+    }
+
+    /**
+     * @param array $item
+     * @return bool
+     */
+    private function isNewVideo(array $item): bool
+    {
+        return !isset($item['video_url_default'], $item['video_title_default'])
+            || empty($item['video_url_default'])
+            || empty($item['video_title_default']);
+    }
 }
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php
index a6225fa40c1b3..31d63efcf8cb0 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductVideo\Model\Plugin\Catalog\Product\Gallery;
 
 use Magento\ProductVideo\Model\Product\Attribute\Media\ExternalVideoEntryConverter;
-use Magento\ProductVideo\Setup\InstallSchema;
 
 /**
  * Plugin for catalog product gallery read handler.
@@ -56,8 +56,8 @@ protected function collectVideoEntriesIds(array $mediaCollection)
     {
         $ids = [];
         foreach ($mediaCollection as $item) {
-            if ($item['media_type'] == ExternalVideoEntryConverter::MEDIA_TYPE_CODE
-                && !array_key_exists('video_url', $item)
+            if ($item['media_type'] === ExternalVideoEntryConverter::MEDIA_TYPE_CODE
+                && !isset($item['video_url'])
             ) {
                 $ids[] = $item['value_id'];
             }
@@ -73,7 +73,7 @@ protected function collectVideoEntriesIds(array $mediaCollection)
     protected function loadVideoDataById(array $ids, $storeId = null)
     {
         $mainTableAlias = $this->resourceModel->getMainTableAlias();
-        $joinConditions = $mainTableAlias.'.value_id = store_value.value_id';
+        $joinConditions = $mainTableAlias . '.value_id = store_value.value_id';
         if (null !== $storeId) {
             $joinConditions = implode(
                 ' AND ',
@@ -85,13 +85,17 @@ protected function loadVideoDataById(array $ids, $storeId = null)
         }
         $joinTable = [
             [
-                ['store_value' => $this->resourceModel->getTable(InstallSchema::GALLERY_VALUE_VIDEO_TABLE)],
+                [
+                    'store_value' => $this->resourceModel->getTable(
+                        'catalog_product_entity_media_gallery_value_video'
+                    )
+                ],
                 $joinConditions,
                 $this->getVideoProperties()
             ]
         ];
         $result = $this->resourceModel->loadDataFromTableByValueId(
-            InstallSchema::GALLERY_VALUE_VIDEO_TABLE,
+            'catalog_product_entity_media_gallery_value_video',
             $ids,
             \Magento\Store\Model\Store::DEFAULT_STORE_ID,
             [
@@ -135,10 +139,10 @@ protected function addVideoDataToMediaEntries(array $mediaCollection, array $dat
     protected function substituteNullsWithDefaultValues(array $rowData)
     {
         foreach ($this->getVideoProperties(false) as $key) {
-            if (empty($rowData[$key]) && !empty($rowData[$key.'_default'])) {
-                $rowData[$key] = $rowData[$key.'_default'];
+            if (empty($rowData[$key]) && !empty($rowData[$key . '_default'])) {
+                $rowData[$key] = $rowData[$key . '_default'];
             }
-            unset($rowData[$key.'_default']);
+            unset($rowData[$key . '_default']);
         }
 
         return $rowData;
@@ -151,8 +155,7 @@ protected function substituteNullsWithDefaultValues(array $rowData)
     protected function getVideoProperties($withDbMapping = true)
     {
         $properties = $this->videoPropertiesDbMapping;
-        unset($properties['value_id']);
-        unset($properties['store_id']);
+        unset($properties['value_id'], $properties['store_id']);
 
         return $withDbMapping ? $properties : array_keys($properties);
     }
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php b/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
index a46a90f24d9fa..04a3d868d14a6 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php
@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\DB\Select;
-use Magento\ProductVideo\Setup\InstallSchema;
 
 /**
  * Media Resource decorator
@@ -28,6 +27,8 @@ public function __construct(\Magento\ProductVideo\Model\ResourceModel\Video $vid
     }
 
     /**
+     * Plugin for after duplicate action
+     *
      * @param Gallery $originalResourceModel
      * @param array $valueIdMap
      * @return array
@@ -46,6 +47,8 @@ public function afterDuplicate(Gallery $originalResourceModel, array $valueIdMap
     }
 
     /**
+     * Plugin for after create batch base select action
+     *
      * @param Gallery $originalResourceModel
      * @param Select $select
      * @return Select
@@ -53,7 +56,7 @@ public function afterDuplicate(Gallery $originalResourceModel, array $valueIdMap
     public function afterCreateBatchBaseSelect(Gallery $originalResourceModel, Select $select)
     {
         $select = $select->joinLeft(
-            ['value_video' => $originalResourceModel->getTable(InstallSchema::GALLERY_VALUE_VIDEO_TABLE)],
+            ['value_video' => $originalResourceModel->getTable('catalog_product_entity_media_gallery_value_video')],
             implode(
                 ' AND ',
                 [
@@ -61,15 +64,13 @@ public function afterCreateBatchBaseSelect(Gallery $originalResourceModel, Selec
                     'value.store_id = value_video.store_id',
                 ]
             ),
-            [
-                'video_provider' => 'provider',
-                'video_url' => 'url',
-                'video_title' => 'title',
-                'video_description' => 'description',
-                'video_metadata' => 'metadata'
-            ]
+            []
         )->joinLeft(
-            ['default_value_video' => $originalResourceModel->getTable(InstallSchema::GALLERY_VALUE_VIDEO_TABLE)],
+            [
+                'default_value_video' => $originalResourceModel->getTable(
+                    'catalog_product_entity_media_gallery_value_video'
+                )
+            ],
             implode(
                 ' AND ',
                 [
@@ -77,14 +78,24 @@ public function afterCreateBatchBaseSelect(Gallery $originalResourceModel, Selec
                     'default_value.store_id = default_value_video.store_id',
                 ]
             ),
-            [
-                'video_provider_default' => 'provider',
-                'video_url_default' => 'url',
-                'video_title_default' => 'title',
-                'video_description_default' => 'description',
-                'video_metadata_default' => 'metadata',
-            ]
-        );
+            []
+        )->columns([
+            'video_provider' => $originalResourceModel->getConnection()
+                ->getIfNullSql('`value_video`.`provider`', '`default_value_video`.`provider`'),
+            'video_url' => $originalResourceModel->getConnection()
+                ->getIfNullSql('`value_video`.`url`', '`default_value_video`.`url`'),
+            'video_title' => $originalResourceModel->getConnection()
+                ->getIfNullSql('`value_video`.`title`', '`default_value_video`.`title`'),
+            'video_description' => $originalResourceModel->getConnection()
+                ->getIfNullSql('`value_video`.`description`', '`default_value_video`.`description`'),
+            'video_metadata' => $originalResourceModel->getConnection()
+                ->getIfNullSql('`value_video`.`metadata`', '`default_value_video`.`metadata`'),
+            'video_provider_default' => 'default_value_video.provider',
+            'video_url_default' => 'default_value_video.url',
+            'video_title_default' => 'default_value_video.title',
+            'video_description_default' => 'default_value_video.description',
+            'video_metadata_default' => 'default_value_video.metadata',
+        ]);
 
         return $select;
     }
diff --git a/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php b/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php
index ce485e7c81c79..68b593f335797 100644
--- a/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php
+++ b/app/code/Magento/ProductVideo/Model/ResourceModel/Video.php
@@ -14,7 +14,7 @@ class Video extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     public function _construct()
     {
-        $this->_init(\Magento\ProductVideo\Setup\InstallSchema::GALLERY_VALUE_VIDEO_TABLE, 'value_id');
+        $this->_init('catalog_product_entity_media_gallery_value_video', 'value_id');
     }
 
     /**
diff --git a/app/code/Magento/ProductVideo/Setup/InstallSchema.php b/app/code/Magento/ProductVideo/Setup/InstallSchema.php
deleted file mode 100644
index 09da12c93d80b..0000000000000
--- a/app/code/Magento/ProductVideo/Setup/InstallSchema.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\ProductVideo\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Gallery;
-
-/**
- * Class InstallSchema adds new table `catalog_product_entity_media_gallery_value_video`
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * Video Data Table name
-     */
-    const GALLERY_VALUE_VIDEO_TABLE = 'catalog_product_entity_media_gallery_value_video';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $contextInterface)
-    {
-        $setup->startSetup();
-
-        /**
-         * Create table 'catalog_product_entity_media_gallery_value_video'
-         */
-        $table = $setup->getConnection()
-            ->newTable($setup->getTable(self::GALLERY_VALUE_VIDEO_TABLE))
-            ->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Media Entity ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'provider',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => true, 'default' => null],
-                'Video provider ID'
-            )
-            ->addColumn(
-                'url',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                null,
-                ['nullable' => true, 'default' => null],
-                'Video URL'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true, 'default' => null],
-                'Title'
-            )
-            ->addColumn(
-                'description',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                null,
-                ['nullable' => true, 'default' => null],
-                'Page Meta Description'
-            )
-            ->addColumn(
-                'metadata',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                null,
-                ['nullable' => true, 'default' => null],
-                'Video meta data'
-            )
-            ->addIndex(
-                $setup->getIdxName(
-                    self::GALLERY_VALUE_VIDEO_TABLE,
-                    ['value_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['value_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $setup->getFkName(
-                    self::GALLERY_VALUE_VIDEO_TABLE,
-                    'value_id',
-                    Gallery::GALLERY_TABLE,
-                    'value_id'
-                ),
-                'value_id',
-                $setup->getTable(Gallery::GALLERY_TABLE),
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $setup->getFkName(
-                    self::GALLERY_VALUE_VIDEO_TABLE,
-                    'store_id',
-                    $setup->getTable('store'),
-                    'store_id'
-                ),
-                'store_id',
-                $setup->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Catalog Product Video Table');
-
-        $setup->getConnection()->createTable($table);
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
new file mode 100644
index 0000000000000..1ef18d5f34ecd
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add video in Admin Product page -->
+    <actionGroup name="addProductVideo">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible" time="30"/>
+        <click selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="addVideo"/>
+        <waitForElementVisible selector=".modal-slide.mage-new-video-dialog.form-inline._show" stepKey="waitForUrlElementVisibleslide" time="30"/>
+        <waitForElementVisible selector="{{AdminProductNewVideoSection.videoUrlTextField}}" stepKey="waitForUrlElementVisible" time="60"/>
+        <fillField selector="{{AdminProductNewVideoSection.videoUrlTextField}}" userInput="{{video.videoUrl}}" stepKey="fillFieldVideoUrl"/>
+        <fillField selector="{{AdminProductNewVideoSection.videoTitleTextField}}" userInput="{{video.videoTitle}}" stepKey="fillFieldVideoTitle"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementNotVisible selector="{{AdminProductNewVideoSection.saveButtonDisabled}}" stepKey="waitForSaveButtonVisible" time="30"/>
+        <click selector="{{AdminProductNewVideoSection.saveButton}}" stepKey="saveVideo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+
+    <!-- Remove video in Admin Product page -->
+    <actionGroup name="removeProductVideo">
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible" time="30"/>
+        <click selector="{{AdminProductImagesSection.removeVideoButton}}" stepKey="removeVideo"/>
+    </actionGroup>
+
+    <!-- Assert product video in Admin Product page -->
+    <actionGroup name="assertProductVideoAdminProductPage">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
+        <seeElementInDOM selector="{{AdminProductImagesSection.videoUrlHiddenField(video.videoUrl)}}" stepKey="seeVideoItem"/>
+    </actionGroup>
+
+    <!-- Assert product video not in Admin Product page -->
+    <actionGroup name="assertProductVideoNotInAdminProductPage">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
+        <dontSeeElementInDOM selector="{{AdminProductImagesSection.videoUrlHiddenField(video.videoUrl)}}" stepKey="seeVideoItem"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
new file mode 100644
index 0000000000000..8f0d41f8c2153
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Assert product video in Storefront Product page -->
+    <actionGroup name="assertProductVideoStorefrontProductPage">
+        <arguments>
+            <argument name="dataTypeAttribute" defaultValue="'youtube'"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productVideo(dataTypeAttribute)}}" stepKey="seeProductVideoDataType"/>
+    </actionGroup>
+
+    <!--Assert product video not in Storefront Product page -->
+    <actionGroup name="assertProductVideoNotInStorefrontProductPage">
+        <arguments>
+            <argument name="dataTypeAttribute" defaultValue="'youtube'"/>
+        </arguments>
+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.productVideo(dataTypeAttribute)}}" stepKey="dontSeeProductVideoDataType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
new file mode 100644
index 0000000000000..8fe5899e91ef8
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- mftf test youtube api key configuration -->
+    <entity name="ProductVideoYoutubeApiKeyConfig" type="product_video_config">
+        <requiredEntity type="youtube_api_key_config">YouTubeApiKey</requiredEntity>
+    </entity>
+    <entity name="YouTubeApiKey" type="youtube_api_key_config">
+        <data key="value">AIzaSyDwqDWuw1lra-LnpJL2Mr02DYuFmkuRSns</data>
+    </entity>
+
+    <!-- default configuration used to restore Magento config -->
+    <entity name="DefaultProductVideoConfig" type="product_video_config">
+        <requiredEntity type="youtube_api_key_config">DefaultYouTubeApiKey</requiredEntity>
+    </entity>
+    <entity name="DefaultYouTubeApiKey" type="youtube_api_key_config">
+        <data key="value"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
new file mode 100644
index 0000000000000..5bc4ad86e0f06
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="mftfTestProductVideo" type="product_video">
+        <data key="videoUrl">https://youtu.be/bpOSxM0rNPM</data>
+        <data key="videoTitle">Arctic Monkeys - Do I Wanna Know? (Official Video)</data>
+        <data key="videoShortTitle">Arctic Monkeys</data>
+    </entity>
+</entities>
diff --git a/app/design/frontend/Magento/rush/LICENSE.txt b/app/code/Magento/ProductVideo/Test/Mftf/LICENSE.txt
similarity index 100%
rename from app/design/frontend/Magento/rush/LICENSE.txt
rename to app/code/Magento/ProductVideo/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE_AFL.txt b/app/code/Magento/ProductVideo/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE_AFL.txt
rename to app/code/Magento/ProductVideo/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
new file mode 100644
index 0000000000000..2525c3a3d0ff6
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductVideoYouTubeApiKeyConfig" dataType="product_video_config" type="create" auth="adminFormKey" url="admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="product_video_config">
+            <object key="product_video" dataType="product_video_config">
+                <object key="fields" dataType="product_video_config">
+                    <object key="youtube_api_key" dataType="youtube_api_key_config">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/README.md b/app/code/Magento/ProductVideo/Test/Mftf/README.md
new file mode 100644
index 0000000000000..b2243ad32074c
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Product Video Functional Tests
+
+The Functional Test Module for **Magento Product Video** module.
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
new file mode 100644
index 0000000000000..5db86267f7d7b
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductImagesSection">
+        <element name="addVideoButton" type="button" selector="#add_video_button" timeout="60"/>
+        <element name="removeVideoButton" type="button" selector="//*[@id='media_gallery_content']//button[@class='action-remove']" timeout="60"/>
+        <element name="videoUrlHiddenField" type="text" selector="//*[@id='media_gallery_content']//input[@value='{{url}}']" parameterized="true"/>
+        <element name="videoTitleText" type="text" selector="//*[@id='media_gallery_content']//div[contains(text(), '{{title}}')]" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
new file mode 100644
index 0000000000000..71dad6a24f148
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductNewVideoSection">
+        <element name="saveButton" type="button" selector=".action-primary.video-create-button" timeout="30"/>
+        <element name="saveButtonDisabled" type="text" selector="//button[@class='action-primary video-create-button' and @disabled='disabled']"/>
+        <element name="cancelButton" type="button" selector=".video-cancel-button" timeout="30"/>
+        <element name="videoUrlTextField" type="input" selector="#video_url"/>
+        <element name="videoTitleTextField" type="input" selector="#video_title"/>
+        <element name="videoDescriptionTextField" type="input" selector="#video_description"/>
+        <element name="baseCheckbox" type="checkbox" selector="#video_image"/>
+        <element name="smallCheckbox" type="checkbox" selector="#video_small_image"/>
+        <element name="swatchCheckbox" type="checkbox" selector="#video_swatch_image"/>
+        <element name="thumbnailCheckbox" type="checkbox" selector="#video_thumbnail"/>
+        <element name="hideFromProductPageCheckbox" type="checkbox" selector="#new_video_disabled"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..c8e1ebcf12d94
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="productVideo" type="text" selector="//*[@class='product-video' and @data-type='{{videoType}}']" parameterized="true"/>
+        <element name="clickInVideo" type="video" selector="//*[@class='fotorama__stage__shaft']"/>
+        <element name="videoPausedMode" type="video" selector="//*[contains(@class, 'paused-mode')]"/>
+        <element name="videoPlayedMode" type="video" selector="//*[contains(@class,'playing-mode')]"/>
+        <element name="frameVideo" type="video" selector="widget2"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
new file mode 100644
index 0000000000000..bd7cc0cdf5b4a
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddDefaultVideoSimpleProductTest">
+        <annotations>
+            <group value="ProductVideo"/>
+        </annotations>
+        <before>
+            <!-- Set product video Youtube api key configuration -->
+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig" after="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Set product video configuration to default -->
+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig" before="amOnLogoutPage"/>
+        </after>
+
+        <!-- Add product video -->
+        <actionGroup ref="addProductVideo" stepKey="addProductVideo" after="fillMainProductForm"/>
+
+        <!-- Assert product video in admin product form -->
+        <actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertProductVideoAdminProductPage" after="saveProductForm"/>
+
+        <!-- Assert product video in storefront product page -->
+        <actionGroup ref="assertProductVideoStorefrontProductPage" stepKey="assertProductVideoStorefrontProductPage" after="AssertProductInStorefrontProductPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
new file mode 100644
index 0000000000000..f5a7886fed45c
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminRemoveDefaultVideoSimpleProductTest">
+        <annotations>
+            <group value="ProductVideo"/>
+        </annotations>
+        <before>
+            <!-- Set product video Youtube api key configuration -->
+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig" after="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Set product video configuration to default -->
+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig" before="amOnLogoutPage"/>
+        </after>
+
+        <!-- Add product video -->
+        <actionGroup ref="addProductVideo" stepKey="addProductVideo" after="fillMainProductForm"/>
+
+        <!-- Remove product video -->
+        <actionGroup ref="removeProductVideo" stepKey="removeProductVideo" after="saveProductForm"/>
+
+        <!-- Assert product video not in admin product form -->
+        <actionGroup ref="assertProductVideoNotInAdminProductPage" stepKey="assertProductVideoNotInAdminProductPage" after="saveProductFormAfterRemove"/>
+
+        <!-- Assert product video not in storefront product page -->
+        <actionGroup ref="assertProductVideoNotInStorefrontProductPage" stepKey="assertProductVideoNotInStorefrontProductPage" after="AssertProductInStorefrontProductPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
new file mode 100644
index 0000000000000..7249a4223503e
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="YoutubeVideoWindowOnProductPageTest">
+        <annotations>
+            <features value="ProductVideo"/>
+            <stories value="MAGETWO-91707: [Sigma Beauty]Cannot pause Youtube video in IE 11"/>
+            <testCaseId value="MAGETWO-95254"/>
+            <title value="Youtube video window on the product page"/>
+            <description value="Check Youtube video window on the product page"/>
+            <severity value="MAJOR"/>
+            <group value="ProductVideo"/>
+        </annotations>
+
+        <before>
+            <!--Log In-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Set product video Youtube api key configuration -->
+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig" after="loginAsAdmin"/>
+        </before>
+
+        <!--Open simple product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openFirstProductForEdit"/>
+
+        <!-- Add product video -->
+        <actionGroup ref="addProductVideo" stepKey="addProductVideo" after="openFirstProductForEdit"/>
+        <!-- Assert product video in admin product form -->
+        <actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertProductVideoAdminProductPage" after="addProductVideo"/>
+
+        <!-- Save the product -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveFirstProduct"/>
+        <waitForPageLoad stepKey="waitForFirstProductSaved"/>
+
+        <!-- Assert product video in storefront product page -->
+        <amOnPage url="$$createProduct.name$$.html" stepKey="goToStorefrontCategoryPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoaded"/>
+        <actionGroup ref="assertProductVideoStorefrontProductPage" stepKey="assertProductVideoStorefrontProductPage" after="waitForStorefrontPageLoaded"/>
+
+        <!--Click Play video button-->
+        <click stepKey="clickToPlayVideo" selector="{{StorefrontProductInfoMainSection.clickInVideo}}"/>
+        <wait stepKey="waitFiveSecondToPlayVideo" time="5"/>
+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="waitForVideoPlayed"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="AssertVideoIsPlayed"/>
+        <switchToIFrame stepKey="switchBack1"/>
+
+        <!--Click Pause button-->
+        <click stepKey="clickToStopVideo" selector="{{StorefrontProductInfoMainSection.clickInVideo}}"/>
+        <wait stepKey="waitFiveSecondToStopVideo" time="5"/>
+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame2"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPausedMode}}" stepKey="waitForVideoPaused"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPausedMode}}" stepKey="AssertVideoIsPaused"/>
+        <switchToIFrame stepKey="switchBack2"/>
+
+        <!--Click Play video button again. Make sure that Video continued playing-->
+        <click stepKey="clickAgainToPlayVideo" selector="{{StorefrontProductInfoMainSection.clickInVideo}}"/>
+        <wait stepKey="waitAgainFiveSecondToPlayVideo" time="5"/>
+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame3"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="waitForVideoPlayedAgain"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="AssertVideoIsPlayedAgain"/>
+        <switchToIFrame stepKey="switchBack3"/>
+
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategoryFirst"/>
+            <!-- Set product video configuration to default -->
+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig" before="logout"/>
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Model/Plugin/Catalog/Product/Gallery/CreateHandlerTest.php b/app/code/Magento/ProductVideo/Test/Unit/Model/Plugin/Catalog/Product/Gallery/CreateHandlerTest.php
index 5770ea8b5689d..57ad71997dad7 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Model/Plugin/Catalog/Product/Gallery/CreateHandlerTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Model/Plugin/Catalog/Product/Gallery/CreateHandlerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ProductVideo\Test\Unit\Model\Plugin\Catalog\Product\Gallery;
 
 /**
@@ -37,6 +38,9 @@ class CreateHandlerTest extends \PHPUnit\Framework\TestCase
      */
     protected $mediaGalleryCreateHandler;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         $this->product = $this->createMock(\Magento\Catalog\Model\Product::class);
@@ -62,72 +66,18 @@ protected function setUp()
         );
     }
 
-    public function testAfterExecute()
+    /**
+     * @dataProvider provideImageForAfterExecute
+     * @param array $image
+     * @param array $expectedSave
+     * @param int $rowSaved
+     */
+    public function testAfterExecute($image, $expectedSave, $rowSaved): void
     {
-        $mediaData = [
-            'images' => [
-                '72mljfhmasfilp9cuq' => [
-                    'position' => '3',
-                    'media_type' => 'external-video',
-                    'file' => '/i/n/index111111.jpg',
-                    'value_id' => '4',
-                    'label' => '',
-                    'disabled' => '0',
-                    'removed' => '',
-                    'video_provider' => 'youtube',
-                    'video_url' => 'https://www.youtube.com/watch?v=ab123456',
-                    'video_title' => 'Some second title',
-                    'video_description' => 'Description second',
-                    'video_metadata' => 'meta two',
-                    'role' => '',
-                ],
-                'w596fi79hv1p6wj21u' => [
-                    'position' => '4',
-                    'media_type' => 'image',
-                    'video_provider' => '',
-                    'file' => '/h/d/hd_image.jpg',
-                    'value_id' => '7',
-                    'label' => '',
-                    'disabled' => '0',
-                    'removed' => '',
-                    'video_url' => '',
-                    'video_title' => '',
-                    'video_description' => '',
-                    'video_metadata' => '',
-                    'role' => '',
-                ],
-                'tcodwd7e0dirifr64j' => [
-                    'position' => '4',
-                    'media_type' => 'external-video',
-                    'file' => '/s/a/sample_3.jpg',
-                    'value_id' => '5',
-                    'label' => '',
-                    'disabled' => '0',
-                    'removed' => '',
-                    'video_provider' => 'youtube',
-                    'video_url' => 'https://www.youtube.com/watch?v=ab123456',
-                    'video_title' => 'Some second title',
-                    'video_description' => 'Description second',
-                    'video_metadata' => 'meta two',
-                    'role' => '',
-                    'additional_store_data' => [
-                        0 => [
-                                'store_id' => '0',
-                                'video_provider' => null,
-                                'video_url' => 'https://www.youtube.com/watch?v=ab123456',
-                                'video_title' => 'New Title',
-                                'video_description' => 'New Description',
-                                'video_metadata' => 'New metadata',
-                            ],
-                    ]
-                ],
-            ],
-        ];
-
         $this->product->expects($this->once())
             ->method('getData')
             ->with('media_gallery')
-            ->willReturn($mediaData);
+            ->willReturn(['images' => $image]);
         $this->product->expects($this->once())
             ->method('getStoreId')
             ->willReturn(0);
@@ -136,13 +86,150 @@ public function testAfterExecute()
             ->method('getAttribute')
             ->willReturn($this->attribute);
 
-        $this->subject->afterExecute(
-            $this->mediaGalleryCreateHandler,
-            $this->product
-        );
+        $this->resourceModel->expects($this->exactly($rowSaved))
+            ->method('saveDataRow')
+            ->with('catalog_product_entity_media_gallery_value_video', $expectedSave)
+            ->willReturn(1);
+
+        $this->subject->afterExecute($this->mediaGalleryCreateHandler, $this->product);
+    }
+
+    /**
+     * DataProvider for testAfterExecute
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
+    public function provideImageForAfterExecute(): array
+    {
+        return [
+            'new_video' => [
+                [
+                    '72mljfhmasfilp9cuq' => [
+                        'position' => '3',
+                        'media_type' => 'external-video',
+                        'file' => '/i/n/index111111.jpg',
+                        'value_id' => '4',
+                        'label' => '',
+                        'disabled' => '0',
+                        'removed' => '',
+                        'video_provider' => 'youtube',
+                        'video_url' => 'https://www.youtube.com/watch?v=ab123456',
+                        'video_title' => 'Some second title',
+                        'video_description' => 'Description second',
+                        'video_metadata' => 'meta two',
+                        'role' => '',
+                    ],
+                ],
+                [
+                    'value_id' => '4',
+                    'store_id' => 0,
+                    'provider' => 'youtube',
+                    'url' => 'https://www.youtube.com/watch?v=ab123456',
+                    'title' => 'Some second title',
+                    'description' => 'Description second',
+                    'metadata' => 'meta two',
+                ],
+                2
+            ],
+            'image' => [
+                [
+                    'w596fi79hv1p6wj21u' => [
+                        'position' => '4',
+                        'media_type' => 'image',
+                        'video_provider' => '',
+                        'file' => '/h/d/hd_image.jpg',
+                        'value_id' => '7',
+                        'label' => '',
+                        'disabled' => '0',
+                        'removed' => '',
+                        'video_url' => '',
+                        'video_title' => '',
+                        'video_description' => '',
+                        'video_metadata' => '',
+                        'role' => '',
+                    ],
+                ],
+                [],
+                0
+            ],
+            'new_video_with_additional_data' => [
+                [
+                    'tcodwd7e0dirifr64j' => [
+                        'position' => '4',
+                        'media_type' => 'external-video',
+                        'file' => '/s/a/sample_3.jpg',
+                        'value_id' => '5',
+                        'label' => '',
+                        'disabled' => '0',
+                        'removed' => '',
+                        'video_provider' => 'youtube',
+                        'video_url' => 'https://www.youtube.com/watch?v=ab123456',
+                        'video_title' => 'Some second title',
+                        'video_description' => 'Description second',
+                        'video_metadata' => 'meta two',
+                        'role' => '',
+                        'additional_store_data' => [
+                            0 => [
+                                'store_id' => 0,
+                                'video_provider' => 'youtube',
+                                'video_url' => 'https://www.youtube.com/watch?v=ab123456',
+                                'video_title' => 'Some second title',
+                                'video_description' => 'Description second',
+                                'video_metadata' => 'meta two',
+                            ],
+                        ]
+                    ],
+                ],
+                [
+                    'value_id' => '5',
+                    'store_id' => 0,
+                    'provider' => 'youtube',
+                    'url' => 'https://www.youtube.com/watch?v=ab123456',
+                    'title' => 'Some second title',
+                    'description' => 'Description second',
+                    'metadata' => 'meta two',
+                ],
+                3
+            ],
+            'not_new_video' => [
+                [
+                    '72mljfhmasfilp9cuq' => [
+                        'position' => '3',
+                        'media_type' => 'external-video',
+                        'file' => '/i/n/index111111.jpg',
+                        'value_id' => '4',
+                        'label' => '',
+                        'disabled' => '0',
+                        'removed' => '',
+                        'video_provider' => 'youtube',
+                        'video_url' => 'https://www.youtube.com/watch?v=ab123456',
+                        'video_url_default' => 'https://www.youtube.com/watch?v=ab123456',
+                        'video_title' => 'Some second title',
+                        'video_title_default' => 'Some second title',
+                        'video_description' => 'Description second',
+                        'video_metadata' => 'meta two',
+                        'role' => '',
+                    ],
+                ],
+                [
+                    'value_id' => '4',
+                    'store_id' => 0,
+                    'provider' => 'youtube',
+                    'url' => 'https://www.youtube.com/watch?v=ab123456',
+                    'title' => 'Some second title',
+                    'description' => 'Description second',
+                    'metadata' => 'meta two',
+                ],
+                1
+            ],
+        ];
     }
 
-    public function testAfterExecuteEmpty()
+    /**
+     * Tests empty media gallery
+     */
+    public function testAfterExecuteEmpty(): void
     {
         $this->product->expects($this->once())
             ->method('getData')
@@ -162,7 +249,7 @@ public function testAfterExecuteEmpty()
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testBeforeExecute()
+    public function testBeforeExecute(): void
     {
         $mediaData = [
             'images' => [
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index 5292eaab2311f..24497f891db43 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -5,23 +5,23 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-customer": "100.3.*",
-        "magento/module-config": "100.3.*"
+        "magento/module-customer": "*",
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/ProductVideo/etc/db_schema.xml b/app/code/Magento/ProductVideo/etc/db_schema.xml
new file mode 100644
index 0000000000000..bfe087d9a5769
--- /dev/null
+++ b/app/code/Magento/ProductVideo/etc/db_schema.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_product_entity_media_gallery_value_video" resource="default" engine="innodb"
+           comment="Catalog Product Video Table">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Media Entity ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="varchar" name="provider" nullable="true" length="32" comment="Video provider ID"/>
+        <column xsi:type="text" name="url" nullable="true" comment="Video URL"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Page Meta Description"/>
+        <column xsi:type="text" name="metadata" nullable="true" comment="Video meta data"/>
+        <constraint xsi:type="foreign" referenceId="FK_6FDF205946906B0E653E60AA769899F8"
+                    table="catalog_product_entity_media_gallery_value_video" column="value_id"
+                    referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_STORE_ID_STORE_STORE_ID"
+                    table="catalog_product_entity_media_gallery_value_video" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_VAL_ID_STORE_ID">
+            <column name="value_id"/>
+            <column name="store_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/ProductVideo/etc/db_schema_whitelist.json b/app/code/Magento/ProductVideo/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..78fa6538da07c
--- /dev/null
+++ b/app/code/Magento/ProductVideo/etc/db_schema_whitelist.json
@@ -0,0 +1,18 @@
+{
+    "catalog_product_entity_media_gallery_value_video": {
+        "column": {
+            "value_id": true,
+            "store_id": true,
+            "provider": true,
+            "url": true,
+            "title": true,
+            "description": true,
+            "metadata": true
+        },
+        "constraint": {
+            "FK_6FDF205946906B0E653E60AA769899F8": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_STORE_ID_STORE_STORE_ID": true,
+            "CAT_PRD_ENTT_MDA_GLR_VAL_VIDEO_VAL_ID_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/etc/module.xml b/app/code/Magento/ProductVideo/etc/module.xml
index f1f37374ceec5..ac3b6b4f7326b 100644
--- a/app/code/Magento/ProductVideo/etc/module.xml
+++ b/app/code/Magento/ProductVideo/etc/module.xml
@@ -6,7 +6,7 @@
 */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ProductVideo" setup_version="2.0.0.2">
+    <module name="Magento_ProductVideo">
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Backend"/>
diff --git a/app/code/Magento/ProductVideo/i18n/de_DE.csv b/app/code/Magento/ProductVideo/i18n/de_DE.csv
index 7047317396999..ca24668bb8d16 100644
--- a/app/code/Magento/ProductVideo/i18n/de_DE.csv
+++ b/app/code/Magento/ProductVideo/i18n/de_DE.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/en_US.csv b/app/code/Magento/ProductVideo/i18n/en_US.csv
index 3277843424bcf..debcab151cc91 100644
--- a/app/code/Magento/ProductVideo/i18n/en_US.csv
+++ b/app/code/Magento/ProductVideo/i18n/en_US.csv
@@ -40,4 +40,4 @@ Delete,Delete
 "Autostart base video","Autostart base video"
 "Show related video","Show related video"
 "Auto restart video","Auto restart video"
-"Images And Videos","Images And Videos"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/es_ES.csv b/app/code/Magento/ProductVideo/i18n/es_ES.csv
index 7047317396999..ca24668bb8d16 100644
--- a/app/code/Magento/ProductVideo/i18n/es_ES.csv
+++ b/app/code/Magento/ProductVideo/i18n/es_ES.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/fr_FR.csv b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
index 7047317396999..ca24668bb8d16 100644
--- a/app/code/Magento/ProductVideo/i18n/fr_FR.csv
+++ b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/nl_NL.csv b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
index 7047317396999..5ad8386573040 100644
--- a/app/code/Magento/ProductVideo/i18n/nl_NL.csv
+++ b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/pt_BR.csv b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
index 7047317396999..5ad8386573040 100644
--- a/app/code/Magento/ProductVideo/i18n/pt_BR.csv
+++ b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
index 7047317396999..5ad8386573040 100644
--- a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
+++ b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
@@ -7,3 +7,4 @@
 "Preview Image","Preview Image"
 "Get Video Information","Get Video Information"
 "Youtube or Vimeo supported","Youtube or Vimeo supported"
+"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
index f5a22c50e6d0d..63bd5321ad30b 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/layout/catalog_product_new.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Magento_ProductVideo::css/gallery-delete-tooltip.css"/>
+    </head>
     <body>
         <referenceContainer name="content">
 
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
index f0ae057bc724d..6dff53211892f 100755
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -34,7 +34,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
      class="gallery"
      data-mage-init='{"openVideoModal":{}}'
      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
-     data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
+     data-images="<?= $block->escapeHtmlAttr($block->getImagesJson()) ?>"
      data-types="<?= $block->escapeHtml(
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
      ) ?>"
@@ -140,30 +140,37 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                      alt="<%- data.label %>"/>
 
                 <div class="actions">
-                    <button type="button"
-                            class="action-remove"
-                            data-role="delete-button"
-                            title="<% if (data.media_type == 'external-video') {%>
+                    <div class="tooltip">
+                        <span class="delete-tooltiptext">
+                            <?= $block->escapeHtml(
+                                __('Delete image in all store views')
+                            ); ?>
+                        </span>
+                        <button type="button"
+                                class="action-remove"
+                                data-role="delete-button"
+                                title="<% if (data.media_type == 'external-video') {%>
+                                <?= $block->escapeHtml(
+                                    __('Delete video')
+                                ); ?>
+                            <%} else {%>
+                                <?= $block->escapeHtml(
+                                    __('Delete image')
+                                ); ?>
+                            <%}%>">
+                        <span>
+                            <% if (data.media_type == 'external-video') { %>
                             <?= $block->escapeHtml(
                                 __('Delete video')
                             ); ?>
-                        <%} else {%>
+                            <% } else {%>
                             <?= $block->escapeHtml(
                                 __('Delete image')
                             ); ?>
-                        <%}%>">
-                    <span>
-                        <% if (data.media_type == 'external-video') { %>
-                        <?= $block->escapeHtml(
-                            __('Delete video')
-                        ); ?>
-                        <% } else {%>
-                        <?= $block->escapeHtml(
-                            __('Delete image')
-                        ); ?>
-                        <%} %>
-                    </span>
-                    </button>
+                            <%} %>
+                        </span>
+                        </button>
+                    </div>
                     <div class="draggable-handle"></div>
                 </div>
                 <div class="image-fade"><span><?= $block->escapeHtml(
@@ -329,4 +336,4 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
 </div>
 <script>
     jQuery('body').trigger('contentUpdated');
-</script>
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css b/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css
new file mode 100644
index 0000000000000..ad779c3f29bf8
--- /dev/null
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/css/gallery-delete-tooltip.css
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+.gallery .tooltip .delete-tooltiptext {
+    visibility: hidden;
+    width: 112px;
+    background-color: #373330;
+    color: #F7F3EB;
+    text-align: center;
+    padding: 5px 0;
+    position: absolute;
+    z-index: 1;
+    left: 30px;
+    top: 91px;
+}
+
+.gallery .tooltip:hover .delete-tooltiptext {
+    visibility: visible;
+}
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
index 13b0e43a84d81..653434f1008ca 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -86,6 +86,7 @@ define([
                 this._height = this.element.data('height');
                 this._autoplay = !!this.element.data('autoplay');
                 this._playing = this._autoplay || false;
+                this.useYoutubeNocookie = this.element.data('youtubenocookie') || false;
 
                 this._responsive = this.element.data('responsive') !== false;
 
@@ -163,6 +164,12 @@ define([
                      * @private
                      */
                     'youtubeapiready': function () {
+                        var host = 'https://www.youtube.com';
+
+                        if (self.useYoutubeNocookie) {
+                            host = 'https://www.youtube-nocookie.com';
+                        }
+
                         if (self._player !== undefined) {
                             return;
                         }
@@ -177,6 +184,7 @@ define([
                             width: self._width,
                             videoId: self._code,
                             playerVars: self._params,
+                            host: host,
                             events: {
 
                                 /**
@@ -469,7 +477,8 @@ define([
                         description: tmp.snippet.description,
                         thumbnail: tmp.snippet.thumbnails.high.url,
                         videoId: videoInfo.id,
-                        videoProvider: videoInfo.type
+                        videoProvider: videoInfo.type,
+                        useYoutubeNocookie: videoInfo.useYoutubeNocookie
                     };
                     this._videoInformation = respData;
                     this.element.trigger(this._UPDATE_VIDEO_INFORMATION_TRIGGER, respData);
@@ -600,7 +609,8 @@ define([
                 var id,
                     type,
                     ampersandPosition,
-                    vimeoRegex;
+                    vimeoRegex,
+                    useYoutubeNocookie = false;
 
                 if (typeof href !== 'string') {
                     return href;
@@ -620,9 +630,13 @@ define([
                         id = id.substring(0, ampersandPosition);
                     }
 
-                } else if (href.host.match(/youtube\.com|youtu\.be/)) {
+                } else if (href.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
                     id = href.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
                     type = 'youtube';
+
+                    if (href.host.match(/youtube-nocookie.com/)) {
+                        useYoutubeNocookie = true;
+                    }
                 } else if (href.host.match(/vimeo\.com/)) {
                     type = 'vimeo';
                     vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
@@ -640,7 +654,7 @@ define([
                 }
 
                 return id ? {
-                    id: id, type: type, s: href.search.replace(/^\?/, '')
+                    id: id, type: type, s: href.search.replace(/^\?/, ''), useYoutubeNocookie: useYoutubeNocookie
                 } : false;
             }
         });
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
index 1ab10c95a51bc..e9b234c5f1160 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -21,6 +21,7 @@ define([
             container: '.video-player-container',
             videoClass: 'product-video',
             reset: false,
+            useYoutubeNocookie: false,
             metaData: {
                 DOM: {
                     title: '.video-information.title span',
@@ -86,34 +87,36 @@ define([
          * @private
          */
         _doUpdate: function () {
+            var uploaderLinkUrl,
+                uploaderLink;
+
             this.reset();
-            this.element.find(this.options.container).append('<div class="' +
-            this.options.videoClass +
-            '" data-type="' +
-            this.options.videoProvider +
-            '" data-code="' +
-            this.options.videoId +
-            '" data-width="100%" data-height="100%"></div>');
+            this.element.find(this.options.container).append(
+                '<div class="' +
+                this.options.videoClass +
+                '" data-type="' +
+                this.options.videoProvider +
+                '" data-code="' +
+                this.options.videoId +
+                '" data-youtubenocookie="' +
+                this.options.useYoutubeNocookie +
+                '" data-width="100%" data-height="100%"></div>'
+            );
             this.element.find(this.options.metaData.DOM.wrapper).show();
             this.element.find(this.options.metaData.DOM.title).text(this.options.metaData.data.title);
             this.element.find(this.options.metaData.DOM.uploaded).text(this.options.metaData.data.uploaded);
             this.element.find(this.options.metaData.DOM.duration).text(this.options.metaData.data.duration);
 
             if (this.options.videoProvider === 'youtube') {
-                this.element.find(this.options.metaData.DOM.uploader).html(
-                    '<a href="https://youtube.com/channel/' +
-                    this.options.metaData.data.uploaderUrl +
-                    '" target="_blank">' +
-                    this.options.metaData.data.uploader +
-                    '</a>'
-                );
+                uploaderLinkUrl = 'https://youtube.com/channel/' + this.options.metaData.data.uploaderUrl;
             } else if (this.options.videoProvider === 'vimeo') {
-                this.element.find(this.options.metaData.DOM.uploader).html(
-                    '<a href="' +
-                    this.options.metaData.data.uploaderUrl +
-                    '" target="_blank">' + this.options.metaData.data.uploader +
-                    '</a>');
+                uploaderLinkUrl = this.options.metaData.data.uploaderUrl;
             }
+            uploaderLink = document.createElement('a');
+            uploaderLink.setAttribute('href', uploaderLinkUrl);
+            uploaderLink.setAttribute('target', '_blank');
+            uploaderLink.innerText = this.options.metaData.data.uploader;
+            this.element.find(this.options.metaData.DOM.uploader)[0].appendChild(uploaderLink);
             this.element.find('.' + this.options.videoClass).productVideoLoader();
 
         },
@@ -337,6 +340,7 @@ define([
                 .createVideoPlayer({
                     videoId: data.videoId,
                     videoProvider: data.videoProvider,
+                    useYoutubeNocookie: data.useYoutubeNocookie,
                     reset: false,
                     metaData: {
                         DOM: {
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index 9bb4b9996e3ad..20deba5b9b46a 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -34,7 +34,8 @@ define([
         var id,
             type,
             ampersandPosition,
-            vimeoRegex;
+            vimeoRegex,
+            useYoutubeNocookie = false;
 
         /**
          * Get youtube ID
@@ -68,9 +69,13 @@ define([
                 id = _getYoutubeId(id);
                 type = 'youtube';
             }
-        } else if (href.host.match(/youtube\.com|youtu\.be/)) {
+        } else if (href.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
             id = href.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
             type = 'youtube';
+
+            if (href.host.match(/youtube-nocookie.com/)) {
+                useYoutubeNocookie = true;
+            }
         } else if (href.host.match(/vimeo\.com/)) {
             type = 'vimeo';
             vimeoRegex = new RegExp(['https?:\\/\\/(?:www\\.|player\\.)?vimeo.com\\/(?:channels\\/(?:\\w+\\/)',
@@ -85,7 +90,7 @@ define([
         }
 
         return id ? {
-            id: id, type: type, s: href.search.replace(/^\?/, '')
+            id: id, type: type, s: href.search.replace(/^\?/, ''), useYoutubeNocookie: useYoutubeNocookie
         } : false;
     }
 
@@ -281,6 +286,7 @@ define([
                     tmpVideoData.id = dataUrl.id;
                     tmpVideoData.provider = dataUrl.type;
                     tmpVideoData.videoUrl = tmpInputData.videoUrl;
+                    tmpVideoData.useYoutubeNocookie = dataUrl.useYoutubeNocookie;
                 }
 
                 videoData.push(tmpVideoData);
@@ -442,7 +448,7 @@ define([
                 scriptTag = document.getElementsByTagName('script')[0];
 
             element.async = true;
-            element.src = 'https://secure-a.vimeocdn.com/js/froogaloop2.min.js';
+            element.src = 'https://f.vimeocdn.com/js/froogaloop2.min.js';
 
             /**
              * Vimeo js framework on load callback.
@@ -629,6 +635,8 @@ define([
                 videoData.provider +
                 '" data-code="' +
                 videoData.id +
+                '"  data-youtubenocookie="' +
+                videoData.useYoutubeNocookie +
                 '" data-width="100%" data-height="100%"></div>'
             );
         },
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
index 3519d538e523a..75a2c1d75da15 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
@@ -88,6 +88,7 @@ define(['jquery', 'jquery/ui'], function ($) {
             this._playing = this._autoplay || false;
             this._loop = this.element.data('loop');
             this._rel = this.element.data('related');
+            this.useYoutubeNocookie = this.element.data('youtubenocookie') || false;
 
             this._responsive = this.element.data('responsive') !== false;
 
@@ -164,6 +165,12 @@ define(['jquery', 'jquery/ui'], function ($) {
                  * Handle event
                  */
                 'youtubeapiready': function () {
+                    var host = 'https://www.youtube.com';
+
+                    if (self.useYoutubeNocookie) {
+                        host = 'https://www.youtube-nocookie.com';
+                    }
+
                     if (self._player !== undefined) {
                         return;
                     }
@@ -182,6 +189,7 @@ define(['jquery', 'jquery/ui'], function ($) {
                         width: self._width,
                         videoId: self._code,
                         playerVars: self._params,
+                        host: host,
                         events: {
 
                             /**
diff --git a/app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php b/app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php
new file mode 100644
index 0000000000000..4212b289c4bcf
--- /dev/null
+++ b/app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Quote\Api;
+
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Service checks if the user has ability to change the quote.
+ */
+interface ChangeQuoteControlInterface
+{
+    /**
+     * Checks if user is allowed to change the quote.
+     *
+     * @param CartInterface $quote
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote): bool;
+}
diff --git a/app/code/Magento/Quote/Api/Data/CartInterface.php b/app/code/Magento/Quote/Api/Data/CartInterface.php
index 551833e3effb1..b87869de6b3df 100644
--- a/app/code/Magento/Quote/Api/Data/CartInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CartInterface.php
@@ -223,14 +223,14 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $bill
     /**
      * Returns the reserved order ID for the cart.
      *
-     * @return int|null Reserved order ID. Otherwise, null.
+     * @return string|null Reserved order ID. Otherwise, null.
      */
     public function getReservedOrderId();
 
     /**
      * Sets the reserved order ID for the cart.
      *
-     * @param int $reservedOrderId
+     * @param string $reservedOrderId
      * @return $this
      */
     public function setReservedOrderId($reservedOrderId);
diff --git a/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
index 143b9638835e5..29baac025282c 100644
--- a/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php
@@ -18,7 +18,7 @@ interface GuestShippingMethodManagementInterface
      * @param string $cartId The shopping cart ID.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified quote does not exist.
-     * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
+     * @throws \Magento\Framework\Exception\StateException The shipping address is missing.
      */
     public function getList($cartId);
 
diff --git a/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php b/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php
index 21905ecabf57f..c6d51857a8d54 100644
--- a/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Api;
 
 /**
@@ -37,7 +38,7 @@ public function estimateByAddressId($cartId, $addressId);
      * @param int $cartId The shopping cart ID.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified quote does not exist.
-     * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
+     * @throws \Magento\Framework\Exception\StateException The shipping address is missing.
      */
     public function getList($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
index 2cbca917c26a1..bc055e71c662e 100644
--- a/app/code/Magento/Quote/Model/BillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model;
 
 use Magento\Framework\Exception\InputException;
@@ -13,7 +14,6 @@
 
 /**
  * Quote billing address write service object.
- *
  */
 class BillingAddressManagement implements BillingAddressManagementInterface
 {
@@ -69,13 +69,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address, $useForShipping = false)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $this->quoteRepository->getActive($cartId);
+        $address->setCustomerId($quote->getCustomerId());
         $quote->removeAddress($quote->getBillingAddress()->getId());
         $quote->setBillingAddress($address);
         try {
@@ -84,13 +85,13 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            throw new InputException(__('Unable to save address. Please check input data.'));
+            throw new InputException(__('The address failed to save. Verify the address and try again.'));
         }
         return $quote->getBillingAddress()->getId();
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function get($cartId)
     {
@@ -99,6 +100,8 @@ public function get($cartId)
     }
 
     /**
+     * Get shipping address assignment
+     *
      * @return \Magento\Quote\Model\ShippingAddressAssignment
      * @deprecated 100.2.0
      */
diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
index 9fe69b691424d..e18ab8587fc71 100644
--- a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
@@ -10,6 +10,7 @@
 use Magento\Quote\Api\CartTotalRepositoryInterface;
 use Magento\Catalog\Helper\Product\ConfigurationPool;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Quote\Model\Cart\Totals\ItemConverter;
 use Magento\Quote\Api\CouponManagementInterface;
 
@@ -94,6 +95,7 @@ public function get($cartId)
             $addressTotalsData = $quote->getShippingAddress()->getData();
             $addressTotals = $quote->getShippingAddress()->getTotals();
         }
+        unset($addressTotalsData[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
 
         /** @var \Magento\Quote\Api\Data\TotalsInterface $quoteTotals */
         $quoteTotals = $this->totalsFactory->create();
diff --git a/app/code/Magento/Quote/Model/ChangeQuoteControl.php b/app/code/Magento/Quote/Model/ChangeQuoteControl.php
new file mode 100644
index 0000000000000..b88898a816d66
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ChangeQuoteControl.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Quote\Api\ChangeQuoteControlInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ChangeQuoteControl implements ChangeQuoteControlInterface
+{
+    /**
+     * @var UserContextInterface $userContext
+     */
+    private $userContext;
+
+    /**
+     * @param UserContextInterface $userContext
+     */
+    public function __construct(UserContextInterface $userContext)
+    {
+        $this->userContext = $userContext;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAllowed(CartInterface $quote): bool
+    {
+        switch ($this->userContext->getUserType()) {
+            case UserContextInterface::USER_TYPE_CUSTOMER:
+                $isAllowed = ($quote->getCustomerId() == $this->userContext->getUserId());
+                break;
+            case UserContextInterface::USER_TYPE_GUEST:
+                $isAllowed = ($quote->getCustomerId() === null);
+                break;
+            case UserContextInterface::USER_TYPE_ADMIN:
+            case UserContextInterface::USER_TYPE_INTEGRATION:
+                $isAllowed = true;
+                break;
+            default:
+                $isAllowed = false;
+        }
+
+        return $isAllowed;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/CouponManagement.php b/app/code/Magento/Quote/Model/CouponManagement.php
index 7701e41e0b55a..55c21c974d6dd 100644
--- a/app/code/Magento/Quote/Model/CouponManagement.php
+++ b/app/code/Magento/Quote/Model/CouponManagement.php
@@ -53,7 +53,10 @@ public function set($cartId, $couponCode)
         /** @var  \Magento\Quote\Model\Quote $quote */
         $quote = $this->quoteRepository->getActive($cartId);
         if (!$quote->getItemsCount()) {
-            throw new NoSuchEntityException(__('Cart %1 doesn\'t contain products', $cartId));
+            throw new NoSuchEntityException(__('The "%1" Cart doesn\'t contain products.', $cartId));
+        }
+        if (!$quote->getStoreId()) {
+            throw new NoSuchEntityException(__('Cart isn\'t assigned to correct store'));
         }
         $quote->getShippingAddress()->setCollectShippingRates(true);
 
@@ -61,10 +64,12 @@ public function set($cartId, $couponCode)
             $quote->setCouponCode($couponCode);
             $this->quoteRepository->save($quote->collectTotals());
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not apply coupon code'));
+            throw new CouldNotSaveException(
+                __("The coupon code couldn't be applied. Verify the coupon code and try again.")
+            );
         }
         if ($quote->getCouponCode() != $couponCode) {
-            throw new NoSuchEntityException(__('Coupon code is not valid'));
+            throw new NoSuchEntityException(__("The coupon code isn't valid. Verify the code and try again."));
         }
         return true;
     }
@@ -77,17 +82,21 @@ public function remove($cartId)
         /** @var  \Magento\Quote\Model\Quote $quote */
         $quote = $this->quoteRepository->getActive($cartId);
         if (!$quote->getItemsCount()) {
-            throw new NoSuchEntityException(__('Cart %1 doesn\'t contain products', $cartId));
+            throw new NoSuchEntityException(__('The "%1" Cart doesn\'t contain products.', $cartId));
         }
         $quote->getShippingAddress()->setCollectShippingRates(true);
         try {
             $quote->setCouponCode('');
             $this->quoteRepository->save($quote->collectTotals());
         } catch (\Exception $e) {
-            throw new CouldNotDeleteException(__('Could not delete coupon code'));
+            throw new CouldNotDeleteException(
+                __("The coupon code couldn't be deleted. Verify the coupon code and try again.")
+            );
         }
         if ($quote->getCouponCode() != '') {
-            throw new CouldNotDeleteException(__('Could not delete coupon code'));
+            throw new CouldNotDeleteException(
+                __("The coupon code couldn't be deleted. Verify the coupon code and try again.")
+            );
         }
         return true;
     }
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php
index e8109a0ac0cee..1cc1a3c8fcbfd 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingMethodManagementInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model\GuestCart;
 
 /**
@@ -20,7 +21,7 @@ interface GuestShippingMethodManagementInterface
      * @return bool
      * @throws \Magento\Framework\Exception\InputException The shipping method is not valid for an empty cart.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The shipping method could not be saved.
-     * @throws \Magento\Framework\Exception\StateException The billing or shipping address is not set.
+     * @throws \Magento\Framework\Exception\StateException The billing or shipping address is missing.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart contains only virtual products
      * so the shipping method does not apply.
      */
@@ -32,7 +33,7 @@ public function set($cartId, $carrierCode, $methodCode);
      * @param string $cartId The shopping cart ID.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified shopping cart does not exist.
-     * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
+     * @throws \Magento\Framework\Exception\StateException The shipping address is missing.
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/GuestCartManagement/Plugin/Authorization.php b/app/code/Magento/Quote/Model/GuestCartManagement/Plugin/Authorization.php
index e8aeed63e74a2..5d83757321f7d 100644
--- a/app/code/Magento/Quote/Model/GuestCartManagement/Plugin/Authorization.php
+++ b/app/code/Magento/Quote/Model/GuestCartManagement/Plugin/Authorization.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model\GuestCartManagement\Plugin;
 
 use Magento\Framework\Exception\StateException;
@@ -40,7 +41,7 @@ public function beforeAssignCustomer(
     ) {
         if ($customerId !== (int)$this->userContext->getUserId()) {
             throw new StateException(
-                __('Cannot assign customer to the given cart. You don\'t have permission for this operation.')
+                __("You don't have the correct permissions to assign the customer to the cart.")
             );
         }
     }
diff --git a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php
new file mode 100644
index 0000000000000..37a8fcd494fba
--- /dev/null
+++ b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource;
+
+/**
+ * MaskedQuoteId to QuoteId resolver
+ */
+class MaskedQuoteIdToQuoteId implements MaskedQuoteIdToQuoteIdInterface
+{
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var QuoteIdMaskResource
+     */
+    private $quoteIdMaskResource;
+
+    /**
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param CartRepositoryInterface $cartRepository
+     * @param QuoteIdMaskResource $quoteIdMaskResource
+     */
+    public function __construct(
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        CartRepositoryInterface $cartRepository,
+        QuoteIdMaskResource $quoteIdMaskResource
+    ) {
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->cartRepository = $cartRepository;
+        $this->quoteIdMaskResource = $quoteIdMaskResource;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(string $maskedQuoteId): int
+    {
+        $quoteIdMask = $this->quoteIdMaskFactory->create();
+        $this->quoteIdMaskResource->load($quoteIdMask, $maskedQuoteId, 'masked_id');
+
+        $cart = $this->cartRepository->get($quoteIdMask->getQuoteId());
+
+        return (int)$cart->getId();
+    }
+}
diff --git a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
new file mode 100644
index 0000000000000..152d575e059c8
--- /dev/null
+++ b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Converts masked quote id to the quote id (entity id)
+ * @api
+ */
+interface MaskedQuoteIdToQuoteIdInterface
+{
+    /**
+     * @param string $maskedQuoteId
+     * @return int
+     * @throws NoSuchEntityException
+     */
+    public function execute(string $maskedQuoteId): int;
+}
diff --git a/app/code/Magento/Quote/Model/PaymentMethodManagement.php b/app/code/Magento/Quote/Model/PaymentMethodManagement.php
index f12b9e5d1fb7f..b6e4bcf5ccc8f 100644
--- a/app/code/Magento/Quote/Model/PaymentMethodManagement.php
+++ b/app/code/Magento/Quote/Model/PaymentMethodManagement.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
 use Magento\Framework\Exception\State\InvalidTransitionException;
@@ -51,36 +53,37 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $this->quoteRepository->get($cartId);
-
+        $quote->setTotalsCollectedFlag(false);
         $method->setChecks([
             \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_CHECKOUT,
             \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_COUNTRY,
             \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_CURRENCY,
             \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
         ]);
-        $payment = $quote->getPayment();
-
-        $data = $method->getData();
-        $payment->importData($data);
 
         if ($quote->isVirtual()) {
-            $quote->getBillingAddress()->setPaymentMethod($payment->getMethod());
+            $address = $quote->getBillingAddress();
         } else {
+            $address = $quote->getShippingAddress();
             // check if shipping address is set
-            if ($quote->getShippingAddress()->getCountryId() === null) {
-                throw new InvalidTransitionException(__('Shipping address is not set'));
+            if ($address->getCountryId() === null) {
+                throw new InvalidTransitionException(
+                    __('The shipping address is missing. Set the address and try again.')
+                );
             }
-            $quote->getShippingAddress()->setPaymentMethod($payment->getMethod());
-        }
-        if (!$quote->isVirtual() && $quote->getShippingAddress()) {
-            $quote->getShippingAddress()->setCollectShippingRates(true);
+            $address->setCollectShippingRates(true);
         }
 
+        $paymentData = $method->getData();
+        $payment = $quote->getPayment();
+        $payment->importData($paymentData);
+        $address->setPaymentMethod($payment->getMethod());
+
         if (!$this->zeroTotalValidator->isApplicable($payment->getMethodInstance(), $quote)) {
             throw new InvalidTransitionException(__('The requested Payment Method is not available.'));
         }
 
-        $quote->setTotalsCollectedFlag(false)->collectTotals()->save();
+        $quote->save();
         return $quote->getPayment()->getId();
     }
 
diff --git a/app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php b/app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php
new file mode 100644
index 0000000000000..f18bb46fa63fb
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Product/Plugin/MarkQuotesRecollectMassDisabled.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Product\Plugin;
+
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Action as ProductAction;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+/**
+ * Remove quote items after mass disabling products
+ */
+class MarkQuotesRecollectMassDisabled
+{
+    /** @var QuoteResource$quoteResource */
+    private $quoteResource;
+
+    /**
+     * @param QuoteResource $quoteResource
+     */
+    public function __construct(
+        QuoteResource $quoteResource
+    ) {
+        $this->quoteResource = $quoteResource;
+    }
+
+    /**
+     * Clean quote items after mass disabling product
+     *
+     * @param \Magento\Catalog\Model\Product\Action $subject
+     * @param \Magento\Catalog\Model\Product\Action $result
+     * @param int[] $productIds
+     * @param int[] $attrData
+     * @param int $storeId
+     * @return \Magento\Catalog\Model\Product\Action
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUpdateAttributes(
+        ProductAction $subject,
+        ProductAction $result,
+        $productIds,
+        $attrData,
+        $storeId
+    ): ProductAction {
+        if (isset($attrData['status']) && $attrData['status'] === Status::STATUS_DISABLED) {
+            $this->quoteResource->markQuotesRecollect($productIds);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 18fa41e2beb58..3f04519713687 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -14,6 +14,7 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Total as AddressTotal;
 use Magento\Sales\Model\Status;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Quote model
@@ -353,6 +354,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      */
     protected $shippingAddressesItems;
 
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $orderIncrementIdChecker;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -394,6 +400,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param \Magento\Sales\Model\OrderIncrementIdChecker|null $orderIncrementIdChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -436,7 +443,8 @@ public function __construct(
         \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Sales\Model\OrderIncrementIdChecker $orderIncrementIdChecker = null
     ) {
         $this->quoteValidator = $quoteValidator;
         $this->_catalogProduct = $catalogProduct;
@@ -471,6 +479,8 @@ public function __construct(
         $this->totalsReader = $totalsReader;
         $this->shippingFactory = $shippingFactory;
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
+        $this->orderIncrementIdChecker = $orderIncrementIdChecker ?: ObjectManager::getInstance()
+            ->get(\Magento\Sales\Model\OrderIncrementIdChecker::class);
         parent::__construct(
             $context,
             $registry,
@@ -493,9 +503,10 @@ protected function _construct()
     }
 
     /**
-     * @codeCoverageIgnoreStart
+     * Returns information about quote currency, such as code, exchange rate, and so on.
      *
-     * {@inheritdoc}
+     * @return \Magento\Quote\Api\Data\CurrencyInterface|null Quote currency information. Otherwise, null.
+     * @codeCoverageIgnoreStart
      */
     public function getCurrency()
     {
@@ -516,7 +527,7 @@ public function getCurrency()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency = null)
     {
@@ -524,7 +535,7 @@ public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems()
     {
@@ -532,7 +543,7 @@ public function getItems()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItems(array $items = null)
     {
@@ -540,7 +551,7 @@ public function setItems(array $items = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCreatedAt()
     {
@@ -548,7 +559,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -556,7 +567,7 @@ public function setCreatedAt($createdAt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUpdatedAt()
     {
@@ -564,7 +575,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($updatedAt)
     {
@@ -572,7 +583,7 @@ public function setUpdatedAt($updatedAt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConvertedAt()
     {
@@ -580,7 +591,7 @@ public function getConvertedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setConvertedAt($convertedAt)
     {
@@ -588,7 +599,7 @@ public function setConvertedAt($convertedAt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsActive()
     {
@@ -596,7 +607,7 @@ public function getIsActive()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsActive($isActive)
     {
@@ -604,7 +615,7 @@ public function setIsActive($isActive)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsVirtual($isVirtual)
     {
@@ -612,7 +623,7 @@ public function setIsVirtual($isVirtual)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItemsCount()
     {
@@ -620,7 +631,7 @@ public function getItemsCount()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItemsCount($itemsCount)
     {
@@ -628,7 +639,7 @@ public function setItemsCount($itemsCount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItemsQty()
     {
@@ -636,7 +647,7 @@ public function getItemsQty()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItemsQty($itemsQty)
     {
@@ -644,7 +655,7 @@ public function setItemsQty($itemsQty)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOrigOrderId()
     {
@@ -652,7 +663,7 @@ public function getOrigOrderId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrigOrderId($origOrderId)
     {
@@ -660,7 +671,7 @@ public function setOrigOrderId($origOrderId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getReservedOrderId()
     {
@@ -668,7 +679,7 @@ public function getReservedOrderId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setReservedOrderId($reservedOrderId)
     {
@@ -676,7 +687,7 @@ public function setReservedOrderId($reservedOrderId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerIsGuest()
     {
@@ -684,7 +695,7 @@ public function getCustomerIsGuest()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerIsGuest($customerIsGuest)
     {
@@ -692,7 +703,7 @@ public function setCustomerIsGuest($customerIsGuest)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerNote()
     {
@@ -700,7 +711,7 @@ public function getCustomerNote()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerNote($customerNote)
     {
@@ -708,7 +719,7 @@ public function setCustomerNote($customerNote)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerNoteNotify()
     {
@@ -716,7 +727,7 @@ public function getCustomerNoteNotify()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerNoteNotify($customerNoteNotify)
     {
@@ -726,7 +737,7 @@ public function setCustomerNoteNotify($customerNoteNotify)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStoreId()
     {
@@ -737,7 +748,7 @@ public function getStoreId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($storeId)
     {
@@ -1046,7 +1057,7 @@ public function addCustomerAddress(\Magento\Customer\Api\Data\AddressInterface $
     public function updateCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
         $quoteCustomer = $this->getCustomer();
-        $this->dataObjectHelper->mergeDataObjects(get_class($quoteCustomer), $quoteCustomer, $customer);
+        $this->dataObjectHelper->mergeDataObjects(CustomerInterface::class, $quoteCustomer, $customer);
         $this->setCustomer($quoteCustomer);
         return $this;
     }
@@ -1068,7 +1079,7 @@ public function getCustomerGroupId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerTaxClassId()
     {
@@ -1087,7 +1098,7 @@ public function getCustomerTaxClassId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerTaxClassId($customerTaxClassId)
     {
@@ -1153,6 +1164,8 @@ public function getShippingAddress()
     }
 
     /**
+     * Get all shipping addresses.
+     *
      * @return array
      */
     public function getAllShippingAddresses()
@@ -1183,6 +1196,7 @@ public function getAllAddresses()
     }
 
     /**
+     * Get address by id.
      *
      * @param int $addressId
      * @return Address|false
@@ -1198,6 +1212,8 @@ public function getAddressById($addressId)
     }
 
     /**
+     * Get address by customer address id.
+     *
      * @param int|string $addressId
      * @return Address|false
      */
@@ -1232,6 +1248,8 @@ public function getShippingAddressByCustomerAddressId($addressId)
     }
 
     /**
+     * Remove address.
+     *
      * @param int|string $addressId
      * @return $this
      */
@@ -1284,6 +1302,8 @@ public function removeAllAddresses()
     }
 
     /**
+     * Add address.
+     *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
      */
@@ -1297,18 +1317,21 @@ public function addAddress(\Magento\Quote\Api\Data\AddressInterface $address)
     }
 
     /**
+     * Set billing address.
+     *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
      */
     public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address = null)
     {
-        $old = $this->getBillingAddress();
-
+        $old = $this->getAddressesCollection()->getItemById($address->getId())
+            ?? $this->getBillingAddress();
         if (!empty($old)) {
             $old->addData($address->getData());
         } else {
             $this->addAddress($address->setAddressType(Address::TYPE_BILLING));
         }
+
         return $this;
     }
 
@@ -1323,17 +1346,21 @@ public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
         if ($this->getIsMultiShipping()) {
             $this->addAddress($address->setAddressType(Address::TYPE_SHIPPING));
         } else {
-            $old = $this->getShippingAddress();
+            $old = $this->getAddressesCollection()->getItemById($address->getId())
+                ?? $this->getShippingAddress();
             if (!empty($old)) {
                 $old->addData($address->getData());
             } else {
                 $this->addAddress($address->setAddressType(Address::TYPE_SHIPPING));
             }
         }
+
         return $this;
     }
 
     /**
+     * Add shipping address.
+     *
      * @param \Magento\Quote\Api\Data\AddressInterface $address
      * @return $this
      */
@@ -1389,7 +1416,7 @@ public function getAllVisibleItems()
     {
         $items = [];
         foreach ($this->getItemsCollection() as $item) {
-            if (!$item->isDeleted() && !$item->getParentItemId()) {
+            if (!$item->isDeleted() && !$item->getParentItemId() && !$item->getParentItem()) {
                 $items[] = $item;
             }
         }
@@ -1558,8 +1585,7 @@ public function addItem(\Magento\Quote\Model\Quote\Item $item)
     }
 
     /**
-     * Advanced func to add product to quote - processing mode can be specified there.
-     * Returns error message if product type instance can't prepare product.
+     * Add product. Returns error message if product type instance can't prepare product.
      *
      * @param mixed $product
      * @param null|float|\Magento\Framework\DataObject $request
@@ -1598,7 +1624,7 @@ public function addProduct(
          * Error message
          */
         if (is_string($cartCandidates) || $cartCandidates instanceof \Magento\Framework\Phrase) {
-            return strval($cartCandidates);
+            return (string)$cartCandidates;
         }
 
         /**
@@ -1795,6 +1821,8 @@ public function getItemByProduct($product)
     }
 
     /**
+     * Get items summary qty.
+     *
      * @return int
      */
     public function getItemsSummaryQty()
@@ -1822,6 +1850,8 @@ public function getItemsSummaryQty()
     }
 
     /**
+     * Get item virtual qty.
+     *
      * @return int
      */
     public function getItemVirtualQty()
@@ -1855,6 +1885,8 @@ public function getItemVirtualQty()
     /*********************** PAYMENTS ***************************/
 
     /**
+     * Get payments collection.
+     *
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
      */
     public function getPaymentsCollection()
@@ -1872,6 +1904,8 @@ public function getPaymentsCollection()
     }
 
     /**
+     * Get payment.
+     *
      * @return \Magento\Quote\Model\Quote\Payment
      */
     public function getPayment()
@@ -1926,6 +1960,8 @@ public function setPayment(PaymentInterface $payment)
     }
 
     /**
+     * Remove payment.
+     *
      * @return $this
      */
     public function removePayment()
@@ -1963,6 +1999,8 @@ public function getTotals()
     }
 
     /**
+     * Add message.
+     *
      * @param string $message
      * @param string $index
      * @return $this
@@ -2011,7 +2049,7 @@ public function getErrors()
         foreach ($this->getMessages() as $message) {
             /* @var $error \Magento\Framework\Message\AbstractMessage */
             if ($message->getType() == \Magento\Framework\Message\MessageInterface::TYPE_ERROR) {
-                array_push($errors, $message);
+                $errors[] = $message;
             }
         }
         return $errors;
@@ -2051,8 +2089,7 @@ public function setHasError($flag)
     }
 
     /**
-     * Clears list of errors, associated with this quote.
-     * Also automatically removes error-flag from oneself.
+     * Clears list of errors, associated with this quote. Also automatically removes error-flag from oneself.
      *
      * @return $this
      */
@@ -2064,8 +2101,7 @@ protected function _clearErrorInfo()
     }
 
     /**
-     * Adds error information to the quote.
-     * Automatically sets error flag.
+     * Adds error information to the quote. Automatically sets error flag.
      *
      * @param string $type An internal error type ('error', 'qty', etc.), passed then to adding messages routine
      * @param string|null $origin Usually a name of module, that embeds error
@@ -2184,7 +2220,7 @@ public function reserveOrderId()
         } else {
             //checking if reserved order id was already used for some order
             //if yes reserving new one if not using old one
-            if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
+            if ($this->orderIncrementIdChecker->isIncrementIdUsed($this->getReservedOrderId())) {
                 $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
             }
         }
@@ -2192,6 +2228,8 @@ public function reserveOrderId()
     }
 
     /**
+     * Validate minimum amount.
+     *
      * @param bool $multishipping
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -2291,7 +2329,7 @@ public function isVirtual()
      */
     public function getIsVirtual()
     {
-        return intval($this->isVirtual());
+        return (int)$this->isVirtual();
     }
 
     /**
@@ -2331,6 +2369,7 @@ public function merge(Quote $quote)
             foreach ($this->getAllItems() as $quoteItem) {
                 if ($quoteItem->compare($item)) {
                     $quoteItem->setQty($quoteItem->getQty() + $item->getQty());
+                    $this->itemProcessor->merge($item, $quoteItem);
                     $found = true;
                     break;
                 }
@@ -2378,8 +2417,9 @@ protected function _afterLoad()
     {
         // collect totals and save me, if required
         if (1 == $this->getTriggerRecollect()) {
-            $this->collectTotals()->save();
-            $this->setTriggerRecollect(0);
+            $this->collectTotals()
+                ->setTriggerRecollect(0)
+                ->save();
         }
         return parent::_afterLoad();
     }
@@ -2440,7 +2480,6 @@ public function getCheckoutMethod($originalMethod = false)
 
     /**
      * Get quote items assigned to different quote addresses populated per item qty.
-     * Based on result array we can display each item separately
      *
      * @return array
      */
@@ -2529,7 +2568,7 @@ public function isMultipleShippingAddresses()
     }
 
     /**
-     * {@inheritdoc}
+     * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Quote\Api\Data\CartExtensionInterface|null
      */
@@ -2539,7 +2578,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * Set an extension attributes object.
      *
      * @param \Magento\Quote\Api\Data\CartExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 109ca91cb2ae8..bafd6634a94c3 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -28,8 +28,8 @@
  * @method Address setAddressType(string $value)
  * @method int getFreeShipping()
  * @method Address setFreeShipping(int $value)
- * @method int getCollectShippingRates()
- * @method Address setCollectShippingRates(int $value)
+ * @method bool getCollectShippingRates()
+ * @method Address setCollectShippingRates(bool $value)
  * @method Address setShippingMethod(string $value)
  * @method string getShippingDescription()
  * @method Address setShippingDescription(string $value)
@@ -872,13 +872,7 @@ public function getGroupedAllShippingRates()
      */
     protected function _sortRates($firstItem, $secondItem)
     {
-        if ((int)$firstItem[0]->carrier_sort_order < (int)$secondItem[0]->carrier_sort_order) {
-            return -1;
-        } elseif ((int)$firstItem[0]->carrier_sort_order > (int)$secondItem[0]->carrier_sort_order) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return (int) $firstItem[0]->carrier_sort_order <=> (int) $secondItem[0]->carrier_sort_order;
     }
 
     /**
@@ -971,6 +965,7 @@ public function collectShippingRates()
 
     /**
      * Request shipping rates for entire address or specified address item
+     *
      * Returns true if current selected shipping method code corresponds to one of the found rates
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
@@ -1008,8 +1003,14 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         /**
          * Store and website identifiers specified from StoreManager
          */
-        $request->setStoreId($this->storeManager->getStore()->getId());
-        $request->setWebsiteId($this->storeManager->getWebsite()->getId());
+        if ($this->getQuote()->getStoreId()) {
+            $storeId = $this->getQuote()->getStoreId();
+            $request->setStoreId($storeId);
+            $request->setWebsiteId($this->storeManager->getStore($storeId)->getWebsiteId());
+        } else {
+            $request->setStoreId($this->storeManager->getStore()->getId());
+            $request->setWebsiteId($this->storeManager->getWebsite()->getId());
+        }
         $request->setFreeShipping($this->getFreeShipping());
         /**
          * Currencies need to convert in free shipping
@@ -1170,7 +1171,8 @@ public function validateMinimumAmount()
      */
     public function getAppliedTaxes()
     {
-        return $this->serializer->unserialize($this->getData('applied_taxes'));
+        $taxes = $this->getData('applied_taxes');
+        return $taxes ? $this->serializer->unserialize($taxes) : [];
     }
 
     /**
@@ -1353,7 +1355,7 @@ public function getAllBaseTotalAmounts()
     /******************************* End Total Collector Interface *******************************************/
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -1361,7 +1363,7 @@ protected function _getValidationRulesBeforeSave()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCountryId()
     {
@@ -1369,7 +1371,7 @@ public function getCountryId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCountryId($countryId)
     {
@@ -1377,7 +1379,7 @@ public function setCountryId($countryId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStreet()
     {
@@ -1386,7 +1388,7 @@ public function getStreet()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStreet($street)
     {
@@ -1394,7 +1396,7 @@ public function setStreet($street)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompany()
     {
@@ -1402,7 +1404,7 @@ public function getCompany()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCompany($company)
     {
@@ -1410,7 +1412,7 @@ public function setCompany($company)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTelephone()
     {
@@ -1418,7 +1420,7 @@ public function getTelephone()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTelephone($telephone)
     {
@@ -1426,7 +1428,7 @@ public function setTelephone($telephone)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFax()
     {
@@ -1434,7 +1436,7 @@ public function getFax()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFax($fax)
     {
@@ -1442,7 +1444,7 @@ public function setFax($fax)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPostcode()
     {
@@ -1450,7 +1452,7 @@ public function getPostcode()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPostcode($postcode)
     {
@@ -1458,7 +1460,7 @@ public function setPostcode($postcode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCity()
     {
@@ -1466,7 +1468,7 @@ public function getCity()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCity($city)
     {
@@ -1474,7 +1476,7 @@ public function setCity($city)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFirstname()
     {
@@ -1482,7 +1484,7 @@ public function getFirstname()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFirstname($firstname)
     {
@@ -1490,7 +1492,7 @@ public function setFirstname($firstname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLastname()
     {
@@ -1498,7 +1500,7 @@ public function getLastname()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastname($lastname)
     {
@@ -1506,7 +1508,7 @@ public function setLastname($lastname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMiddlename()
     {
@@ -1514,7 +1516,7 @@ public function getMiddlename()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMiddlename($middlename)
     {
@@ -1522,7 +1524,7 @@ public function setMiddlename($middlename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPrefix()
     {
@@ -1530,7 +1532,7 @@ public function getPrefix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrefix($prefix)
     {
@@ -1538,7 +1540,7 @@ public function setPrefix($prefix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSuffix()
     {
@@ -1546,7 +1548,7 @@ public function getSuffix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSuffix($suffix)
     {
@@ -1554,7 +1556,7 @@ public function setSuffix($suffix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getVatId()
     {
@@ -1562,7 +1564,7 @@ public function getVatId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatId($vatId)
     {
@@ -1570,7 +1572,7 @@ public function setVatId($vatId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerId()
     {
@@ -1578,7 +1580,7 @@ public function getCustomerId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($customerId)
     {
@@ -1586,7 +1588,7 @@ public function setCustomerId($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getEmail()
     {
@@ -1599,7 +1601,7 @@ public function getEmail()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmail($email)
     {
@@ -1607,7 +1609,7 @@ public function setEmail($email)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegion($region)
     {
@@ -1615,7 +1617,7 @@ public function setRegion($region)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionId($regionId)
     {
@@ -1623,7 +1625,7 @@ public function setRegionId($regionId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionCode($regionCode)
     {
@@ -1631,7 +1633,7 @@ public function setRegionCode($regionCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSameAsBilling()
     {
@@ -1639,7 +1641,7 @@ public function getSameAsBilling()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSameAsBilling($sameAsBilling)
     {
@@ -1647,7 +1649,7 @@ public function setSameAsBilling($sameAsBilling)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerAddressId()
     {
@@ -1655,7 +1657,7 @@ public function getCustomerAddressId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerAddressId($customerAddressId)
     {
@@ -1686,7 +1688,7 @@ public function setSaveInAddressBook($saveInAddressBook)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
      */
@@ -1696,7 +1698,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
      * @return $this
@@ -1717,7 +1719,7 @@ public function getShippingMethod()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getCustomAttributesCodes()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php
index 11f87a198b6ab..1156c044e81e5 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeList.php
@@ -8,7 +8,7 @@
 class CustomAttributeList implements CustomAttributeListInterface
 {
     /**
-     * Retrieve list of quote addresss custom attributes
+     * Retrieve list of quote address custom attributes
      *
      * @return array
      */
diff --git a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
index 4d642c31ae16f..313ad23f2215b 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/CustomAttributeListInterface.php
@@ -12,7 +12,7 @@
 interface CustomAttributeListInterface
 {
     /**
-     * Retrieve list of quote addresss custom attributes
+     * Retrieve list of quote address custom attributes
      *
      * @return array
      */
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
index 6e6aa27ec5f30..e9a63dad6e169 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -6,8 +6,12 @@
 namespace Magento\Quote\Model\Quote\Address\Total;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address\FreeShippingInterface;
 
+/**
+ * Collect totals for shipping.
+ */
 class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
     /**
@@ -40,7 +44,6 @@ public function __construct(
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -54,13 +57,6 @@ public function collect(
         $address = $shippingAssignment->getShipping()->getAddress();
         $method = $shippingAssignment->getShipping()->getMethod();
 
-        $address->setWeight(0);
-        $address->setFreeMethodWeight(0);
-
-        $addressWeight = $address->getWeight();
-        $freeMethodWeight = $address->getFreeMethodWeight();
-        $addressFreeShipping = $address->getFreeShipping();
-
         $total->setTotalAmount($this->getCode(), 0);
         $total->setBaseTotalAmount($this->getCode(), 0);
 
@@ -68,97 +64,20 @@ public function collect(
             return $this;
         }
 
-        $addressQty = 0;
-        foreach ($shippingAssignment->getItems() as $item) {
-            /**
-             * Skip if this item is virtual
-             */
-            if ($item->getProduct()->isVirtual()) {
-                continue;
-            }
-
-            /**
-             * Children weight we calculate for parent
-             */
-            if ($item->getParentItem()) {
-                continue;
-            }
-
-            if ($item->getHasChildren() && $item->isShipSeparately()) {
-                foreach ($item->getChildren() as $child) {
-                    if ($child->getProduct()->isVirtual()) {
-                        continue;
-                    }
-                    $addressQty += $child->getTotalQty();
-
-                    if (!$item->getProduct()->getWeightType()) {
-                        $itemWeight = $child->getWeight();
-                        $itemQty = $child->getTotalQty();
-                        $rowWeight = $itemWeight * $itemQty;
-                        $addressWeight += $rowWeight;
-                        if ($addressFreeShipping || $child->getFreeShipping() === true) {
-                            $rowWeight = 0;
-                        } elseif (is_numeric($child->getFreeShipping())) {
-                            $freeQty = $child->getFreeShipping();
-                            if ($itemQty > $freeQty) {
-                                $rowWeight = $itemWeight * ($itemQty - $freeQty);
-                            } else {
-                                $rowWeight = 0;
-                            }
-                        }
-                        $freeMethodWeight += $rowWeight;
-                        $item->setRowWeight($rowWeight);
-                    }
-                }
-                if ($item->getProduct()->getWeightType()) {
-                    $itemWeight = $item->getWeight();
-                    $rowWeight = $itemWeight * $item->getQty();
-                    $addressWeight += $rowWeight;
-                    if ($addressFreeShipping || $item->getFreeShipping() === true) {
-                        $rowWeight = 0;
-                    } elseif (is_numeric($item->getFreeShipping())) {
-                        $freeQty = $item->getFreeShipping();
-                        if ($item->getQty() > $freeQty) {
-                            $rowWeight = $itemWeight * ($item->getQty() - $freeQty);
-                        } else {
-                            $rowWeight = 0;
-                        }
-                    }
-                    $freeMethodWeight += $rowWeight;
-                    $item->setRowWeight($rowWeight);
-                }
-            } else {
-                if (!$item->getProduct()->isVirtual()) {
-                    $addressQty += $item->getQty();
-                }
-                $itemWeight = $item->getWeight();
-                $rowWeight = $itemWeight * $item->getQty();
-                $addressWeight += $rowWeight;
-                if ($addressFreeShipping || $item->getFreeShipping() === true) {
-                    $rowWeight = 0;
-                } elseif (is_numeric($item->getFreeShipping())) {
-                    $freeQty = $item->getFreeShipping();
-                    if ($item->getQty() > $freeQty) {
-                        $rowWeight = $itemWeight * ($item->getQty() - $freeQty);
-                    } else {
-                        $rowWeight = 0;
-                    }
-                }
-                $freeMethodWeight += $rowWeight;
-                $item->setRowWeight($rowWeight);
-            }
-        }
-
-        if (isset($addressQty)) {
-            $address->setItemQty($addressQty);
+        $data = $this->getAssignmentWeightData($address, $shippingAssignment->getItems());
+        $address->setItemQty($data['addressQty']);
+        $address->setWeight($data['addressWeight']);
+        $address->setFreeMethodWeight($data['freeMethodWeight']);
+        $addressFreeShipping = (bool)$address->getFreeShipping();
+        $isFreeShipping = $this->freeShipping->isFreeShipping($quote, $shippingAssignment->getItems());
+        $address->setFreeShipping($isFreeShipping);
+        if (!$addressFreeShipping && $isFreeShipping) {
+            $data = $this->getAssignmentWeightData($address, $shippingAssignment->getItems());
+            $address->setItemQty($data['addressQty']);
+            $address->setWeight($data['addressWeight']);
+            $address->setFreeMethodWeight($data['freeMethodWeight']);
         }
 
-        $address->setWeight($addressWeight);
-        $address->setFreeMethodWeight($freeMethodWeight);
-        $address->setFreeShipping(
-            $this->freeShipping->isFreeShipping($quote, $shippingAssignment->getItems())
-        );
-
         $address->collectShippingRates();
 
         if ($method) {
@@ -195,7 +114,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
     {
         $amount = $total->getShippingAmount();
         $shippingDescription = $total->getShippingDescription();
-        $title = ($amount != 0 && $shippingDescription)
+        $title = ($shippingDescription)
             ? __('Shipping & Handling (%1)', $shippingDescription)
             : __('Shipping & Handling');
 
@@ -215,4 +134,122 @@ public function getLabel()
     {
         return __('Shipping');
     }
+
+    /**
+     * Gets shipping assignments data like items weight, address weight, items quantity.
+     *
+     * @param AddressInterface $address
+     * @param array $items
+     * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function getAssignmentWeightData(AddressInterface $address, array $items): array
+    {
+        $address->setWeight(0);
+        $address->setFreeMethodWeight(0);
+        $addressWeight = $address->getWeight();
+        $freeMethodWeight = $address->getFreeMethodWeight();
+        $addressFreeShipping = (bool)$address->getFreeShipping();
+        $addressQty = 0;
+        foreach ($items as $item) {
+            /**
+             * Skip if this item is virtual
+             */
+            if ($item->getProduct()->isVirtual()) {
+                continue;
+            }
+
+            /**
+             * Children weight we calculate for parent
+             */
+            if ($item->getParentItem()) {
+                continue;
+            }
+
+            $itemQty = (float)$item->getQty();
+            $itemWeight = (float)$item->getWeight();
+
+            if ($item->getHasChildren() && $item->isShipSeparately()) {
+                foreach ($item->getChildren() as $child) {
+                    if ($child->getProduct()->isVirtual()) {
+                        continue;
+                    }
+                    $addressQty += $child->getTotalQty();
+
+                    if (!$item->getProduct()->getWeightType()) {
+                        $itemWeight = (float)$child->getWeight();
+                        $itemQty = (float)$child->getTotalQty();
+                        $addressWeight += ($itemWeight * $itemQty);
+                        $rowWeight = $this->getItemRowWeight(
+                            $addressFreeShipping,
+                            $itemWeight,
+                            $itemQty,
+                            $child->getFreeShipping()
+                        );
+                        $freeMethodWeight += $rowWeight;
+                        $item->setRowWeight($rowWeight);
+                    }
+                }
+                if ($item->getProduct()->getWeightType()) {
+                    $addressWeight += ($itemWeight * $itemQty);
+                    $rowWeight = $this->getItemRowWeight(
+                        $addressFreeShipping,
+                        $itemWeight,
+                        $itemQty,
+                        $item->getFreeShipping()
+                    );
+                    $freeMethodWeight += $rowWeight;
+                    $item->setRowWeight($rowWeight);
+                }
+            } else {
+                if (!$item->getProduct()->isVirtual()) {
+                    $addressQty += $itemQty;
+                }
+                $addressWeight += ($itemWeight * $itemQty);
+                $rowWeight = $this->getItemRowWeight(
+                    $addressFreeShipping,
+                    $itemWeight,
+                    $itemQty,
+                    $item->getFreeShipping()
+                );
+                $freeMethodWeight += $rowWeight;
+                $item->setRowWeight($rowWeight);
+            }
+        }
+
+        return [
+            'addressQty' => $addressQty,
+            'addressWeight' => $addressWeight,
+            'freeMethodWeight' => $freeMethodWeight
+        ];
+    }
+
+    /**
+     * Calculates item row weight.
+     *
+     * @param bool $addressFreeShipping
+     * @param float $itemWeight
+     * @param float $itemQty
+     * @param bool $freeShipping
+     * @return float
+     */
+    private function getItemRowWeight(
+        bool $addressFreeShipping,
+        float $itemWeight,
+        float $itemQty,
+        $freeShipping
+    ): float {
+        $rowWeight = $itemWeight * $itemQty;
+        if ($addressFreeShipping || $freeShipping === true) {
+            $rowWeight = 0;
+        } elseif (is_numeric($freeShipping)) {
+            $freeQty = $freeShipping;
+            if ($itemQty > $freeQty) {
+                $rowWeight = $itemWeight * ($itemQty - $freeQty);
+            } else {
+                $rowWeight = 0;
+            }
+        }
+        return (float)$rowWeight;
+    }
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
index d8177ddfe5236..fe6d712500bcd 100644
--- a/app/code/Magento/Quote/Model/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Item.php
@@ -745,6 +745,9 @@ public function saveItemOptions()
                 unset($this->_options[$index]);
                 unset($this->_optionsByCode[$option->getCode()]);
             } else {
+                if (!$option->getItem() || !$option->getItem()->getId()) {
+                    $option->setItem($this);
+                }
                 $option->save();
             }
         }
diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
index a9c4d97760536..a6fa6828a04e7 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
@@ -16,7 +16,7 @@
  *  - original_price - product price before any calculations
  *  - calculation_price - prices for item totals calculation
  *  - custom_price - new price that can be declared by user and recalculated during calculation process
- *  - original_custom_price - original defined value of custom price without any convertion
+ *  - original_custom_price - original defined value of custom price without any conversion
  *
  * @api
  * @method float getDiscountAmount()
@@ -418,6 +418,7 @@ public function calcRowTotal()
 
     /**
      * Get item price used for quote calculation process.
+     *
      * This method get custom price (if it is defined) or original product final price
      *
      * @return float
@@ -438,6 +439,7 @@ public function getCalculationPrice()
 
     /**
      * Get item price used for quote calculation process.
+     *
      * This method get original custom price applied before tax calculation
      *
      * @return float
@@ -502,6 +504,7 @@ public function getBaseCalculationPriceOriginal()
 
     /**
      * Get original price (retrieved from product) for item.
+     *
      * Original price value is in quote selected currency
      *
      * @return float
@@ -519,8 +522,8 @@ public function getOriginalPrice()
     /**
      * Set original price to item (calculation price will be refreshed too)
      *
-     * @param   float $price
-     * @return  \Magento\Quote\Model\Quote\Item\AbstractItem
+     * @param float $price
+     * @return \Magento\Quote\Model\Quote\Item\AbstractItem
      */
     public function setOriginalPrice($price)
     {
@@ -538,10 +541,10 @@ public function getBaseOriginalPrice()
     }
 
     /**
-     * Specify custom item price (used in case whe we have apply not product price to item)
+     * Specify custom item price (used in case when we have apply not product price to item)
      *
-     * @param   float $value
-     * @return  \Magento\Quote\Model\Quote\Item\AbstractItem
+     * @param float $value
+     * @return \Magento\Quote\Model\Quote\Item\AbstractItem
      */
     public function setCustomPrice($value)
     {
@@ -563,8 +566,8 @@ public function getPrice()
     /**
      * Specify item price (base calculation price and converted price will be refreshed too)
      *
-     * @param   float $value
-     * @return  $this
+     * @param float $value
+     * @return $this
      */
     public function setPrice($value)
     {
@@ -575,6 +578,7 @@ public function setPrice($value)
 
     /**
      * Get item price converted to quote currency
+     *
      * @return float
      */
     public function getConvertedPrice()
@@ -589,6 +593,7 @@ public function getConvertedPrice()
 
     /**
      * Set new value for converted price
+     *
      * @param float $value
      * @return $this
      */
@@ -614,8 +619,7 @@ public function __clone()
     }
 
     /**
-     * Checking if there children calculated or parent item
-     * when we have parent quote item and its children
+     * Checking if there children calculated or parent item when we have parent quote item and its children
      *
      * @return bool
      */
@@ -636,6 +640,8 @@ public function isChildrenCalculated()
     }
 
     /**
+     * Checking can we ship product separately
+     *
      * Checking can we ship product separately (each child separately)
      * or each parent product item can be shipped only like one item
      *
@@ -658,8 +664,9 @@ public function isShipSeparately()
     }
 
     /**
-     * Returns the total discount amounts of all the child items.  If there are no children, returns the discount
-     * amount of this item.
+     * Returns the total discount amounts of all the child items.
+     *
+     * If there are no children, returns the discount amount of this item.
      *
      * @return float
      */
diff --git a/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php b/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php
index e29364d41b498..9b5f5c9a126df 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model\Quote\Item;
 
 use Magento\Quote\Api\Data\CartInterface;
@@ -62,7 +63,7 @@ public function save(CartInterface $quote, CartItemInterface $item)
                 $currentItem = $quote->getItemById($itemId);
                 if (!$currentItem) {
                     throw new NoSuchEntityException(
-                        __('Cart %1 does not contain item %2', $cartId, $itemId)
+                        __('The %1 Cart doesn\'t contain the %2 item.', $cartId, $itemId)
                     );
                 }
                 $productType = $currentItem->getProduct()->getTypeId();
@@ -99,7 +100,7 @@ public function save(CartInterface $quote, CartItemInterface $item)
         } catch (LocalizedException $e) {
             throw $e;
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save quote'));
+            throw new CouldNotSaveException(__("The quote couldn't be saved."));
         }
         $itemId = $item->getId();
         foreach ($quote->getAllItems() as $quoteItem) {
@@ -109,6 +110,6 @@ public function save(CartInterface $quote, CartItemInterface $item)
                 return $this->cartItemOptionProcessor->applyCustomOptions($item);
             }
         }
-        throw new CouldNotSaveException(__('Could not save quote'));
+        throw new CouldNotSaveException(__("The quote couldn't be saved."));
     }
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index f34591cfad143..2577008ecbae3 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Quote\Model\Quote\Item;
 
-use \Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product;
 use Magento\Quote\Model\Quote\ItemFactory;
 use Magento\Quote\Model\Quote\Item;
 use Magento\Store\Model\StoreManagerInterface;
@@ -53,12 +53,12 @@ public function __construct(
     /**
      * Initialize quote item object
      *
-     * @param \Magento\Framework\DataObject $request
+     * @param DataObject $request
      * @param Product $product
      *
-     * @return \Magento\Quote\Model\Quote\Item
+     * @return Item
      */
-    public function init(Product $product, $request)
+    public function init(Product $product, DataObject $request): Item
     {
         $item = $this->quoteItemFactory->create();
 
@@ -82,11 +82,11 @@ public function init(Product $product, $request)
      * Set qty and custom price for quote item
      *
      * @param Item $item
-     * @param \Magento\Framework\DataObject $request
+     * @param DataObject $request
      * @param Product $candidate
      * @return void
      */
-    public function prepare(Item $item, DataObject $request, Product $candidate)
+    public function prepare(Item $item, DataObject $request, Product $candidate): void
     {
         /**
          * We specify qty after we know about parent (for stock)
@@ -103,13 +103,27 @@ public function prepare(Item $item, DataObject $request, Product $candidate)
         }
     }
 
+    /**
+     * Merge two quote items.
+     *
+     * @param Item $source
+     * @param Item $target
+     * @return Item
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function merge(Item $source, Item $target): Item
+    {
+        return $target;
+    }
+
     /**
      * Set store_id value to quote item
      *
      * @param Item $item
      * @return void
      */
-    protected function setItemStoreId(Item $item)
+    protected function setItemStoreId(Item $item): void
     {
         if ($this->appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
             $storeId = $this->storeManager->getStore($this->storeManager->getStore()->getId())
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Repository.php b/app/code/Magento/Quote/Model/Quote/Item/Repository.php
index d8238628e0eaa..1fb0a2d7107f1 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Repository.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Repository.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model\Quote\Item;
 
 use Magento\Framework\App\ObjectManager;
@@ -103,14 +104,14 @@ public function deleteById($cartId, $itemId)
         $quoteItem = $quote->getItemById($itemId);
         if (!$quoteItem) {
             throw new NoSuchEntityException(
-                __('Cart %1 doesn\'t contain item  %2', $cartId, $itemId)
+                __('The %1 Cart doesn\'t contain the %2 item.', $cartId, $itemId)
             );
         }
         try {
             $quote->removeItem($itemId);
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not remove item from quote'));
+            throw new CouldNotSaveException(__("The item couldn't be removed from the quote."));
         }
 
         return true;
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Updater.php b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
index 6a7a3c1c1839e..9865ae82ac3d6 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Updater.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
@@ -60,6 +60,7 @@ public function __construct(
 
     /**
      * Update quote item qty.
+     *
      * Custom price is updated in case 'custom_price' value exists
      *
      * @param Item $item
@@ -145,8 +146,8 @@ protected function unsetCustomPrice(Item $item)
             $item->addOption($infoBuyRequest);
         }
 
-        $item->unsetData('custom_price');
-        $item->unsetData('original_custom_price');
+        $item->setData('custom_price', null);
+        $item->setData('original_custom_price', null);
     }
 
     /**
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
index 8fa03232a0e8d..9442cf2f5f1cb 100644
--- a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
+++ b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
@@ -103,6 +103,8 @@ public function __construct(
     }
 
     /**
+     * Collect quote totals.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return Address\Total
      */
@@ -115,6 +117,8 @@ public function collectQuoteTotals(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Collect quote.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return \Magento\Quote\Model\Quote\Address\Total
      */
@@ -172,6 +176,8 @@ public function collect(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Validate coupon code.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      */
@@ -203,11 +209,12 @@ protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
      */
     protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     {
+        $quoteItems = $quote->getAllVisibleItems();
         $quote->setItemsCount(0);
         $quote->setItemsQty(0);
         $quote->setVirtualItemsQty(0);
 
-        foreach ($quote->getAllVisibleItems() as $item) {
+        foreach ($quoteItems as $item) {
             if ($item->getParentItem()) {
                 continue;
             }
@@ -231,6 +238,8 @@ protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Collect address total.
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address $address
      * @return Address\Total
diff --git a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
index 3113721f8a597..38bfcbf1d30ca 100644
--- a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
+++ b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
@@ -19,22 +19,32 @@ class ValidationMessage
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
+     * @deprecated since 101.0.0
      */
     private $currency;
 
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    private $priceHelper;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\CurrencyInterface $currency
+     * @param \Magento\Framework\Pricing\Helper\Data $priceHelper
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Locale\CurrencyInterface $currency
+        \Magento\Framework\Locale\CurrencyInterface $currency,
+        \Magento\Framework\Pricing\Helper\Data $priceHelper = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
         $this->currency = $currency;
+        $this->priceHelper = $priceHelper ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Pricing\Helper\Data::class);
     }
 
     /**
@@ -50,13 +60,11 @@ public function getMessage()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$message) {
-            $currencyCode = $this->storeManager->getStore()->getCurrentCurrencyCode();
-            $minimumAmount = $this->currency->getCurrency($currencyCode)->toCurrency(
-                $this->scopeConfig->getValue(
-                    'sales/minimum_order/amount',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                )
-            );
+            $minimumAmount =  $this->priceHelper->currency($this->scopeConfig->getValue(
+                'sales/minimum_order/amount',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ), true, false);
+
             $message = __('Minimum order amount is %1', $minimumAmount);
         } else {
             //Added in order to address the issue: https://github.com/magento/magento2/issues/8287
diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
new file mode 100644
index 0000000000000..2e802f47cfefe
--- /dev/null
+++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource;
+
+/**
+ * QuoteId to MaskedQuoteId resolver
+ */
+class QuoteIdToMaskedQuoteId implements QuoteIdToMaskedQuoteIdInterface
+{
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var QuoteIdMaskResource
+     */
+    private $quoteIdMaskResource;
+
+    /**
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param CartRepositoryInterface $cartRepository
+     * @param QuoteIdMaskResource $quoteIdMaskResource
+     */
+    public function __construct(
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        CartRepositoryInterface $cartRepository,
+        QuoteIdMaskResource $quoteIdMaskResource
+    ) {
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->cartRepository = $cartRepository;
+        $this->quoteIdMaskResource = $quoteIdMaskResource;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(int $quoteId): string
+    {
+        /* Check the quote exists to avoid database constraint issues */
+        $this->cartRepository->get($quoteId);
+
+        $quoteIdMask = $this->quoteIdMaskFactory->create();
+        $this->quoteIdMaskResource->load($quoteIdMask, $quoteId, 'quote_id');
+        $maskedId = $quoteIdMask->getMaskedId() ?? '';
+
+        return $maskedId;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
new file mode 100644
index 0000000000000..4d2a8ce877d8c
--- /dev/null
+++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Converts quote id to the masked quote id
+ * @api
+ */
+interface QuoteIdToMaskedQuoteIdInterface
+{
+    /**
+     * @param int $quoteId
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    public function execute(int $quoteId): string;
+}
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index febeffb5c9c2b..6ed8393f80658 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -159,7 +159,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Model\CustomerFactory $customerModelFactory
-     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
+     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param StoreManagerInterface $storeManager
      * @param \Magento\Checkout\Model\Session $checkoutSession
@@ -221,7 +221,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createEmptyCart()
     {
@@ -232,15 +232,16 @@ public function createEmptyCart()
         $quote->setShippingAddress($this->quoteAddressFactory->create());
 
         try {
+            $quote->getShippingAddress()->setCollectShippingRates(true);
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Cannot create quote'));
+            throw new CouldNotSaveException(__("The quote can't be created."));
         }
         return $quote->getId();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createEmptyCartForCustomer($customerId)
     {
@@ -250,13 +251,13 @@ public function createEmptyCartForCustomer($customerId)
         try {
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Cannot create quote'));
+            throw new CouldNotSaveException(__("The quote can't be created."));
         }
-        return $quote->getId();
+        return (int)$quote->getId();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function assignCustomer($cartId, $customerId, $storeId)
     {
@@ -266,18 +267,18 @@ public function assignCustomer($cartId, $customerId, $storeId)
 
         if (!in_array($storeId, $customerModel->load($customerId)->getSharedStoreIds())) {
             throw new StateException(
-                __('Cannot assign customer to the given cart. The cart belongs to different store.')
+                __("The customer can't be assigned to the cart. The cart belongs to a different store.")
             );
         }
         if ($quote->getCustomerId()) {
             throw new StateException(
-                __('Cannot assign customer to the given cart. The cart is not anonymous.')
+                __("The customer can't be assigned to the cart because the cart isn't anonymous.")
             );
         }
         try {
             $this->quoteRepository->getForCustomer($customerId);
             throw new StateException(
-                __('Cannot assign customer to the given cart. Customer already has active cart.')
+                __("The customer can't be assigned to the cart because the customer already has an active cart.")
             );
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         }
@@ -331,7 +332,7 @@ protected function createCustomerCart($customerId, $storeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     {
@@ -348,6 +349,8 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
 
             $data = $paymentMethod->getData();
             $quote->getPayment()->importData($data);
+        } else {
+            $quote->collectTotals();
         }
 
         if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
@@ -363,7 +366,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
 
         if (null == $order) {
             throw new LocalizedException(
-                __('An error occurred on the server. Please try to place the order again.')
+                __('A server error stopped your order from being placed. Please try to place your order again.')
             );
         }
 
@@ -378,7 +381,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCartForCustomer($customerId)
     {
@@ -405,22 +408,31 @@ public function submit(QuoteEntity $quote, $orderData = [])
     }
 
     /**
+     * Convert quote items to order items for quote
+     *
      * @param Quote $quote
      * @return array
      */
     protected function resolveItems(QuoteEntity $quote)
     {
-        $quoteItems = [];
-        foreach ($quote->getAllItems() as $quoteItem) {
-            /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $quoteItem */
-            $quoteItems[$quoteItem->getId()] = $quoteItem;
-        }
         $orderItems = [];
-        foreach ($quoteItems as $quoteItem) {
-            $parentItem = (isset($orderItems[$quoteItem->getParentItemId()])) ?
-                $orderItems[$quoteItem->getParentItemId()] : null;
-            $orderItems[$quoteItem->getId()] =
-                $this->quoteItemToOrderItem->convert($quoteItem, ['parent_item' => $parentItem]);
+        foreach ($quote->getAllItems() as $quoteItem) {
+            $itemId = $quoteItem->getId();
+
+            if (!empty($orderItems[$itemId])) {
+                continue;
+            }
+
+            $parentItemId = $quoteItem->getParentItemId();
+            /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $parentItem */
+            if ($parentItemId && !isset($orderItems[$parentItemId])) {
+                $orderItems[$parentItemId] = $this->quoteItemToOrderItem->convert(
+                    $quoteItem->getParentItem(),
+                    ['parent_item' => null]
+                );
+            }
+            $parentItem = isset($orderItems[$parentItemId]) ? $orderItems[$parentItemId] : null;
+            $orderItems[$itemId] = $this->quoteItemToOrderItem->convert($quoteItem, ['parent_item' => $parentItem]);
         }
         return array_values($orderItems);
     }
@@ -556,6 +568,10 @@ protected function _prepareCustomerQuote($quote)
                 //Make provided address as default shipping address
                 $shippingAddress->setIsDefaultShipping(true);
                 $hasDefaultShipping = true;
+                if (!$hasDefaultBilling && !$billing->getSaveInAddressBook()) {
+                    $shippingAddress->setIsDefaultBilling(true);
+                    $hasDefaultBilling = true;
+                }
             }
             //save here new customer address
             $shippingAddress->setCustomerId($quote->getCustomerId());
diff --git a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
index 3eff09faac1f5..79b518fc54534 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model\QuoteRepository\Plugin;
 
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\ChangeQuoteControlInterface;
 use Magento\Framework\Exception\StateException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
@@ -17,24 +17,23 @@
 class AccessChangeQuoteControl
 {
     /**
-     * @var UserContextInterface
+     * @var ChangeQuoteControlInterface $changeQuoteControl
      */
-    private $userContext;
+    private $changeQuoteControl;
 
     /**
-     * @param UserContextInterface $userContext
+     * @param ChangeQuoteControlInterface $changeQuoteControl
      */
-    public function __construct(
-        UserContextInterface $userContext
-    ) {
-        $this->userContext = $userContext;
+    public function __construct(ChangeQuoteControlInterface $changeQuoteControl)
+    {
+        $this->changeQuoteControl = $changeQuoteControl;
     }
 
     /**
      * Checks if change quote's customer id is allowed for current user.
      *
      * @param CartRepositoryInterface $subject
-     * @param Quote $quote
+     * @param CartInterface $quote
      * @throws StateException if Guest has customer_id or Customer's customer_id not much with user_id
      * or unknown user's type
      * @return void
@@ -42,34 +41,8 @@ public function __construct(
      */
     public function beforeSave(CartRepositoryInterface $subject, CartInterface $quote)
     {
-        if (!$this->isAllowed($quote)) {
+        if (! $this->changeQuoteControl->isAllowed($quote)) {
             throw new StateException(__("Invalid state change requested"));
         }
     }
-
-    /**
-     * Checks if user is allowed to change the quote.
-     *
-     * @param Quote $quote
-     * @return bool
-     */
-    private function isAllowed(Quote $quote)
-    {
-        switch ($this->userContext->getUserType()) {
-            case UserContextInterface::USER_TYPE_CUSTOMER:
-                $isAllowed = ($quote->getCustomerId() == $this->userContext->getUserId());
-                break;
-            case UserContextInterface::USER_TYPE_GUEST:
-                $isAllowed = ($quote->getCustomerId() === null);
-                break;
-            case UserContextInterface::USER_TYPE_ADMIN:
-            case UserContextInterface::USER_TYPE_INTEGRATION:
-                $isAllowed = true;
-                break;
-            default:
-                $isAllowed = false;
-        }
-
-        return $isAllowed;
-    }
 }
diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php
index 8d46832df8db2..062cf76bcaa1a 100644
--- a/app/code/Magento/Quote/Model/QuoteValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteValidator.php
@@ -6,13 +6,17 @@
 
 namespace Magento\Quote\Model;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\Error;
+use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage;
+use Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface;
 
 /**
+ * Class to validate the quote
+ *
  * @api
  * @since 100.0.2
  */
@@ -33,20 +37,29 @@ class QuoteValidator
      */
     private $minimumAmountMessage;
 
+    /**
+     * @var QuoteValidationRuleInterface
+     */
+    private $quoteValidationRule;
+
     /**
      * QuoteValidator constructor.
      *
      * @param AllowedCountries|null $allowedCountryReader
      * @param OrderAmountValidationMessage|null $minimumAmountMessage
+     * @param QuoteValidationRuleInterface|null $quoteValidationRule
      */
     public function __construct(
         AllowedCountries $allowedCountryReader = null,
-        OrderAmountValidationMessage $minimumAmountMessage = null
+        OrderAmountValidationMessage $minimumAmountMessage = null,
+        QuoteValidationRuleInterface $quoteValidationRule = null
     ) {
         $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
             ->get(AllowedCountries::class);
         $this->minimumAmountMessage = $minimumAmountMessage ?: ObjectManager::getInstance()
             ->get(OrderAmountValidationMessage::class);
+        $this->quoteValidationRule = $quoteValidationRule ?: ObjectManager::getInstance()
+            ->get(QuoteValidationRuleInterface::class);
     }
 
     /**
@@ -62,59 +75,57 @@ public function validateQuoteAmount(QuoteEntity $quote, $amount)
             $quote->setHasError(true);
             $quote->addMessage(__('This item price or quantity is not valid for checkout.'));
         }
+
         return $this;
     }
 
     /**
-     * Validate quote before submit
+     * Validates quote before submit.
      *
      * @param Quote $quote
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function validateBeforeSubmit(QuoteEntity $quote)
     {
-        if (!$quote->isVirtual()) {
-            if ($quote->getShippingAddress()->validate() !== true) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __(
-                        'Please check the shipping address information. %1',
-                        implode(' ', $quote->getShippingAddress()->validate())
-                    )
-                );
-            }
+        if ($quote->getHasError()) {
+            $errors = $this->getQuoteErrors($quote);
+            throw new LocalizedException(__($errors ?: 'Something went wrong. Please try to place the order again.'));
+        }
 
-            // Checks if country id present in the allowed countries list.
-            if (!in_array(
-                $quote->getShippingAddress()->getCountryId(),
-                $this->allowedCountryReader->getAllowedCountries()
-            )) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Some addresses cannot be used due to country-specific configurations.')
-                );
+        foreach ($this->quoteValidationRule->validate($quote) as $validationResult) {
+            if ($validationResult->isValid()) {
+                continue;
             }
 
-            $method = $quote->getShippingAddress()->getShippingMethod();
-            $rate = $quote->getShippingAddress()->getShippingRateByCode($method);
-            if (!$method || !$rate) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a shipping method.'));
+            $messages = $validationResult->getErrors();
+            $defaultMessage = array_shift($messages);
+            if ($defaultMessage && !empty($messages)) {
+                $defaultMessage .= ' %1';
+            }
+            if ($defaultMessage) {
+                throw new LocalizedException(__($defaultMessage, implode(' ', $messages)));
             }
-        }
-        if ($quote->getBillingAddress()->validate() !== true) {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __(
-                    'Please check the billing address information. %1',
-                    implode(' ', $quote->getBillingAddress()->validate())
-                )
-            );
-        }
-        if (!$quote->getPayment()->getMethod()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a valid payment method.'));
-        }
-        if (!$quote->validateMinimumAmount($quote->getIsMultiShipping())) {
-            throw new LocalizedException($this->minimumAmountMessage->getMessage());
         }
 
         return $this;
     }
+
+    /**
+     * Parses quote error messages and concatenates them into single string.
+     *
+     * @param Quote $quote
+     * @return string
+     */
+    private function getQuoteErrors(QuoteEntity $quote): string
+    {
+        $errors = array_map(
+            function (Error $error) {
+                return $error->getText();
+            },
+            $quote->getErrors()
+        );
+
+        return implode(PHP_EOL, $errors);
+    }
 }
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 43660c3512881..946c0e0c5f3b8 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -165,34 +165,11 @@ public function getReservedOrderId($quote)
     {
         return $this->sequenceManager->getSequence(
             \Magento\Sales\Model\Order::ENTITY,
-            $quote->getStore()->getGroup()->getDefaultStoreId()
+            $quote->getStoreId()
         )
         ->getNextValue();
     }
 
-    /**
-     * Check if order increment ID is already used.
-     * Method can be used to avoid collisions of order IDs.
-     *
-     * @param int $orderIncrementId
-     * @return bool
-     */
-    public function isOrderIncrementIdUsed($orderIncrementId)
-    {
-        /** @var  \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
-        $adapter = $this->getConnection();
-        $bind = [':increment_id' => $orderIncrementId];
-        /** @var \Magento\Framework\DB\Select $select */
-        $select = $adapter->select();
-        $select->from($this->getTable('sales_order'), 'entity_id')->where('increment_id = :increment_id');
-        $entity_id = $adapter->fetchOne($select, $bind);
-        if ($entity_id > 0) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Mark quotes - that depend on catalog price rules - to be recollected on demand
      *
@@ -232,7 +209,7 @@ public function markQuotesRecollectOnCatalogRules()
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      */
-    public function substractProductFromQuotes($product)
+    public function subtractProductFromQuotes($product)
     {
         $productId = (int)$product->getId();
         if (!$productId) {
@@ -272,6 +249,21 @@ public function substractProductFromQuotes($product)
         return $this;
     }
 
+    /**
+     * Subtract product from all quotes quantities
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     *
+     * @deprecated 101.0.1
+     * @see \Magento\Quote\Model\ResourceModel\Quote::subtractProductFromQuotes
+     *
+     * @return $this
+     */
+    public function substractProductFromQuotes($product)
+    {
+        return $this->subtractProductFromQuotes($product);
+    }
+
     /**
      * Mark recollect contain product(s) quotes
      *
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 52c33e98bbc73..abecec395865d 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -3,9 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model\ResourceModel\Quote\Item;
 
-use \Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\ResourceModel\Quote\Item as ResourceQuoteItem;
 
 /**
  * Quote item resource collection
@@ -45,6 +52,16 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      */
     protected $_quoteConfig;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|null
+     */
+    private $storeManager;
+
+    /**
+     * @var bool $recollectQuote
+     */
+    private $recollectQuote = false;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -56,6 +73,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * @param \Magento\Quote\Model\Quote\Config $quoteConfig
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -68,7 +86,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\Quote\Model\Quote\Config $quoteConfig,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct(
             $entityFactory,
@@ -82,6 +101,10 @@ public function __construct(
         $this->_itemOptionCollectionFactory = $itemOptionCollectionFactory;
         $this->_productCollectionFactory = $productCollectionFactory;
         $this->_quoteConfig = $quoteConfig;
+
+        // Backward compatibility constructor parameters
+        $this->storeManager = $storeManager ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -91,7 +114,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Quote\Model\Quote\Item::class, \Magento\Quote\Model\ResourceModel\Quote\Item::class);
+        $this->_init(QuoteItem::class, ResourceQuoteItem::class);
     }
 
     /**
@@ -99,18 +122,21 @@ protected function _construct()
      *
      * @return int
      */
-    public function getStoreId()
+    public function getStoreId(): int
     {
-        return (int)$this->_quote->getStoreId();
+        // Fallback to current storeId if no quote is provided
+        // (see https://github.com/magento/magento2/commit/9d3be732a88884a66d667b443b3dc1655ddd0721)
+        return $this->_quote === null ?
+            (int) $this->storeManager->getStore()->getId() : (int) $this->_quote->getStoreId();
     }
 
     /**
-     * Set Quote object to Collection
+     * Set Quote object to Collection.
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param Quote $quote
      * @return $this
      */
-    public function setQuote($quote)
+    public function setQuote($quote): self
     {
         $this->_quote = $quote;
         $quoteId = $quote->getId();
@@ -124,14 +150,15 @@ public function setQuote($quote)
     }
 
     /**
-     * Reset the collection and inner join it to quotes table
+     * Reset the collection and inner join it to quotes table.
+     *
      * Optionally can select items with specified product id only
      *
      * @param string $quotesTableName
      * @param int $productId
      * @return $this
      */
-    public function resetJoinQuotes($quotesTableName, $productId = null)
+    public function resetJoinQuotes($quotesTableName, $productId = null): self
     {
         $this->getSelect()->reset()->from(
             ['qi' => $this->getResource()->getMainTable()],
@@ -148,26 +175,28 @@ public function resetJoinQuotes($quotesTableName, $productId = null)
     }
 
     /**
-     * After load processing
+     * After load processing.
      *
      * @return $this
      */
-    protected function _afterLoad()
+    protected function _afterLoad(): self
     {
         parent::_afterLoad();
 
-        /**
-         * Assign parent items
-         */
+        $productIds = [];
         foreach ($this as $item) {
+            // Assign parent items
             if ($item->getParentItemId()) {
                 $item->setParentItem($this->getItemById($item->getParentItemId()));
             }
             if ($this->_quote) {
                 $item->setQuote($this->_quote);
             }
+            // Collect quote products ids
+            $productIds[] = (int)$item->getProductId();
         }
-
+        $this->_productIds = array_merge($this->_productIds, $productIds);
+        $this->removeItemsWithAbsentProducts();
         /**
          * Assign options and products
          */
@@ -179,11 +208,11 @@ protected function _afterLoad()
     }
 
     /**
-     * Add options to items
+     * Add options to items.
      *
      * @return $this
      */
-    protected function _assignOptions()
+    protected function _assignOptions(): self
     {
         $itemIds = array_keys($this->_items);
         $optionCollection = $this->_itemOptionCollectionFactory->create()->addItemFilter($itemIds);
@@ -197,20 +226,14 @@ protected function _assignOptions()
     }
 
     /**
-     * Add products to items and item options
+     * Add products to items and item options.
      *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _assignProducts()
+    protected function _assignProducts(): self
     {
         \Magento\Framework\Profiler::start('QUOTE:' . __METHOD__, ['group' => 'QUOTE', 'method' => __METHOD__]);
-        $productIds = [];
-        foreach ($this as $item) {
-            $productIds[] = (int)$item->getProductId();
-        }
-        $this->_productIds = array_merge($this->_productIds, $productIds);
-
         $productCollection = $this->_productCollectionFactory->create()->setStoreId(
             $this->getStoreId()
         )->addIdFilter(
@@ -220,7 +243,6 @@ protected function _assignProducts()
         );
         $this->skipStockStatusFilter($productCollection);
         $productCollection->addOptionsToResult()->addStoreFilter()->addUrlRewrite();
-        $this->addTierPriceData($productCollection);
 
         $this->_eventManager->dispatch(
             'prepare_catalog_product_collection_prices',
@@ -231,46 +253,30 @@ protected function _assignProducts()
             ['collection' => $productCollection]
         );
 
-        $recollectQuote = false;
         foreach ($this as $item) {
+            /** @var ProductInterface $product */
             $product = $productCollection->getItemById($item->getProductId());
-            if ($product) {
+            $isValidProduct = $this->isValidProduct($product);
+            $qtyOptions = [];
+            if ($isValidProduct) {
                 $product->setCustomOptions([]);
-                $qtyOptions = [];
-                $optionProductIds = [];
-                foreach ($item->getOptions() as $option) {
-                    /**
-                     * Call type-specific logic for product associated with quote item
-                     */
-                    $product->getTypeInstance()->assignProductToOption(
-                        $productCollection->getItemById($option->getProductId()),
-                        $option,
-                        $product
-                    );
-
-                    if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
-                        $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
-                    }
-                }
-
-                if ($optionProductIds) {
-                    foreach ($optionProductIds as $optionProductId) {
-                        $qtyOption = $item->getOptionByCode('product_qty_' . $optionProductId);
-                        if ($qtyOption) {
-                            $qtyOptions[$optionProductId] = $qtyOption;
-                        }
+                $optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
+                foreach ($optionProductIds as $optionProductId) {
+                    $qtyOption = $item->getOptionByCode('product_qty_' . $optionProductId);
+                    if ($qtyOption) {
+                        $qtyOptions[$optionProductId] = $qtyOption;
                     }
                 }
-
-                $item->setQtyOptions($qtyOptions)->setProduct($product);
             } else {
                 $item->isDeleted(true);
-                $recollectQuote = true;
+                $this->recollectQuote = true;
+            }
+            if (!$item->isDeleted()) {
+                $item->setQtyOptions($qtyOptions)->setProduct($product);
+                $item->checkData();
             }
-            $item->checkData();
         }
-
-        if ($recollectQuote && $this->_quote) {
+        if ($this->recollectQuote && $this->_quote) {
             $this->_quote->collectTotals();
         }
         \Magento\Framework\Profiler::stop('QUOTE:' . __METHOD__);
@@ -278,6 +284,57 @@ protected function _assignProducts()
         return $this;
     }
 
+    /**
+     * Get product Ids from option.
+     *
+     * @param QuoteItem $item
+     * @param ProductInterface $product
+     * @param ProductCollection $productCollection
+     * @return array
+     */
+    private function getOptionProductIds(
+        QuoteItem $item,
+        ProductInterface $product,
+        ProductCollection $productCollection
+    ): array {
+        $optionProductIds = [];
+        foreach ($item->getOptions() as $option) {
+            /**
+             * Call type-specific logic for product associated with quote item
+             */
+            $product->getTypeInstance()->assignProductToOption(
+                $productCollection->getItemById($option->getProductId()),
+                $option,
+                $product
+            );
+
+            if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
+                $isValidProduct = $this->isValidProduct($option->getProduct());
+                if (!$isValidProduct && !$item->isDeleted()) {
+                    $item->isDeleted(true);
+                    $this->recollectQuote = true;
+                    continue;
+                }
+                $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
+            }
+        }
+
+        return $optionProductIds;
+    }
+
+    /**
+     * Check is valid product.
+     *
+     * @param ProductInterface $product
+     * @return bool
+     */
+    private function isValidProduct(ProductInterface $product): bool
+    {
+        $result = ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED);
+
+        return $result;
+    }
+
     /**
      * Prevents adding stock status filter to the collection of products.
      *
@@ -286,23 +343,32 @@ protected function _assignProducts()
      *
      * @see \Magento\CatalogInventory\Helper\Stock::addIsInStockFilterToCollection
      */
-    private function skipStockStatusFilter(ProductCollection $productCollection)
+    private function skipStockStatusFilter(ProductCollection $productCollection): void
     {
         $productCollection->setFlag('has_stock_status_filter', true);
     }
 
     /**
-     * Add tier prices to product collection.
+     * Find and remove quote items with non existing products
      *
-     * @param ProductCollection $productCollection
      * @return void
      */
-    private function addTierPriceData(ProductCollection $productCollection)
+    private function removeItemsWithAbsentProducts(): void
     {
-        if (empty($this->_quote)) {
-            $productCollection->addTierPriceData();
-        } else {
-            $productCollection->addTierPriceDataByGroupId($this->_quote->getCustomerGroupId());
+        if (count($this->_productIds) === 0) {
+            return;
+        }
+
+        $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
+        $existingProductsIds = $productCollection->getAllIds();
+        $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
+        // Remove not existing products from items collection
+        if (!empty($absentProductsIds)) {
+            foreach ($absentProductsIds as $productIdToExclude) {
+                /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
+                $quoteItem = $this->getItemByColumnValue('product_id', $productIdToExclude);
+                $this->removeItemByKey($quoteItem->getId());
+            }
         }
     }
 }
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php
index 9b097f5e7bce8..d4b827a9e3544 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Payment.php
@@ -13,7 +13,7 @@
 class Payment extends AbstractDb
 {
     /**
-     * Serializeable field: additional_information
+     * Serializable field: additional_information
      *
      * @var array
      */
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index 0e2be5c9e3692..d8e70c68ba33f 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model;
 
 use Magento\Framework\App\ObjectManager;
@@ -87,7 +88,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $quote = $this->quoteRepository->getActive($cartId);
         if ($quote->isVirtual()) {
             throw new NoSuchEntityException(
-                __('Cart contains virtual product(s) only. Shipping address is not applicable.')
+                __('The Cart includes virtual product(s) only, so a shipping address is not used.')
             );
         }
 
@@ -116,7 +117,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
             $address->save();
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            throw new InputException(__('Unable to save address. Please check input data.'));
+            throw new InputException(__('The address failed to save. Verify the address and try again.'));
         }
         return $quote->getShippingAddress()->getId();
     }
@@ -130,7 +131,7 @@ public function get($cartId)
         $quote = $this->quoteRepository->getActive($cartId);
         if ($quote->isVirtual()) {
             throw new NoSuchEntityException(
-                __('Cart contains virtual product(s) only. Shipping address is not applicable.')
+                __('The Cart includes virtual product(s) only, so a shipping address is not used.')
             );
         }
         /** @var \Magento\Quote\Model\Quote\Address $address */
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagement.php b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
index 5d7160d8c384a..f62866539c6cc 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model;
 
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
@@ -15,6 +16,7 @@
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\EstimateAddressInterface;
 use Magento\Quote\Api\ShipmentEstimationInterface;
+use Magento\Quote\Model\ResourceModel\Quote\Address as QuoteAddressResource;
 
 /**
  * Shipping method read service
@@ -62,6 +64,11 @@ class ShippingMethodManagement implements
      */
     private $addressFactory;
 
+    /**
+     * @var QuoteAddressResource
+     */
+    private $quoteAddressResource;
+
     /**
      * Constructor
      *
@@ -70,13 +77,15 @@ class ShippingMethodManagement implements
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param Quote\TotalsCollector $totalsCollector
      * @param AddressInterfaceFactory|null $addressFactory
+     * @param QuoteAddressResource|null $quoteAddressResource
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
         Cart\ShippingMethodConverter $converter,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
-        AddressInterfaceFactory $addressFactory = null
+        AddressInterfaceFactory $addressFactory = null,
+        QuoteAddressResource $quoteAddressResource = null
     ) {
         $this->quoteRepository = $quoteRepository;
         $this->converter = $converter;
@@ -84,6 +93,8 @@ public function __construct(
         $this->totalsCollector = $totalsCollector;
         $this->addressFactory = $addressFactory ?: ObjectManager::getInstance()
             ->get(AddressInterfaceFactory::class);
+        $this->quoteAddressResource = $quoteAddressResource ?: ObjectManager::getInstance()
+            ->get(QuoteAddressResource::class);
     }
 
     /**
@@ -97,7 +108,7 @@ public function get($cartId)
         /** @var \Magento\Quote\Model\Quote\Address $shippingAddress */
         $shippingAddress = $quote->getShippingAddress();
         if (!$shippingAddress->getCountryId()) {
-            throw new StateException(__('Shipping address not set.'));
+            throw new StateException(__('The shipping address is missing. Set the address and try again.'));
         }
 
         $shippingMethod = $shippingAddress->getShippingMethod();
@@ -131,7 +142,7 @@ public function getList($cartId)
 
         $shippingAddress = $quote->getShippingAddress();
         if (!$shippingAddress->getCountryId()) {
-            throw new StateException(__('Shipping address not set.'));
+            throw new StateException(__('The shipping address is missing. Set the address and try again.'));
         }
         $shippingAddress->collectShippingRates();
         $shippingRates = $shippingAddress->getGroupedAllShippingRates();
@@ -159,7 +170,7 @@ public function set($cartId, $carrierCode, $methodCode)
         try {
             $this->quoteRepository->save($quote->collectTotals());
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Cannot set shipping method. %1', $e->getMessage()));
+            throw new CouldNotSaveException(__('The shipping method can\'t be set. %1', $e->getMessage()));
         }
         return true;
     }
@@ -170,25 +181,29 @@ public function set($cartId, $carrierCode, $methodCode)
      * @param string $methodCode The shipping method code.
      * @return void
      * @throws InputException The shipping method is not valid for an empty cart.
-     * @throws CouldNotSaveException The shipping method could not be saved.
-     * @throws NoSuchEntityException Cart contains only virtual products. Shipping method is not applicable.
+     * @throws NoSuchEntityException CThe Cart includes virtual product(s) only, so a shipping address is not used.
      * @throws StateException The billing or shipping address is not set.
+     * @throws \Exception
      */
     public function apply($cartId, $carrierCode, $methodCode)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $this->quoteRepository->getActive($cartId);
         if (0 == $quote->getItemsCount()) {
-            throw new InputException(__('Shipping method is not applicable for empty cart'));
+            throw new InputException(
+                __('The shipping method can\'t be set for an empty cart. Add an item to cart and try again.')
+            );
         }
         if ($quote->isVirtual()) {
             throw new NoSuchEntityException(
-                __('Cart contains virtual product(s) only. Shipping method is not applicable.')
+                __('The Cart includes virtual product(s) only, so a shipping address is not used.')
             );
         }
         $shippingAddress = $quote->getShippingAddress();
         if (!$shippingAddress->getCountryId()) {
-            throw new StateException(__('Shipping address is not set'));
+            // Remove empty quote address
+            $this->quoteAddressResource->delete($shippingAddress);
+            throw new StateException(__('The shipping address is missing. Set the address and try again.'));
         }
         $shippingAddress->setShippingMethod($carrierCode . '_' . $methodCode);
     }
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php b/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php
index eef2dc3abf09f..64dc7be46d2a1 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagementInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model;
 
 /**
@@ -20,7 +21,7 @@ interface ShippingMethodManagementInterface
      * @return bool
      * @throws \Magento\Framework\Exception\InputException The shipping method is not valid for an empty cart.
      * @throws \Magento\Framework\Exception\CouldNotSaveException The shipping method could not be saved.
-     * @throws \Magento\Framework\Exception\StateException The billing or shipping address is not set.
+     * @throws \Magento\Framework\Exception\StateException The billing or shipping address is missing.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified cart contains only virtual products
      * so the shipping method does not apply.
      */
@@ -32,7 +33,7 @@ public function set($cartId, $carrierCode, $methodCode);
      * @param int $cartId The shopping cart ID.
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified shopping cart does not exist.
-     * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
+     * @throws \Magento\Framework\Exception\StateException The shipping address is missing.
      */
     public function get($cartId);
 }
diff --git a/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php
new file mode 100644
index 0000000000000..2498e9976f009
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * @inheritdoc
+ */
+class AllowedCountryValidationRule implements QuoteValidationRuleInterface
+{
+    /**
+     * @var string
+     */
+    private $generalMessage;
+
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountryReader;
+
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param AllowedCountries $allowedCountryReader
+     * @param ValidationResultFactory $validationResultFactory
+     * @param string $generalMessage
+     */
+    public function __construct(
+        AllowedCountries $allowedCountryReader,
+        ValidationResultFactory $validationResultFactory,
+        string $generalMessage = ''
+    ) {
+        $this->allowedCountryReader = $allowedCountryReader;
+        $this->validationResultFactory = $validationResultFactory;
+        $this->generalMessage = $generalMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Quote $quote): array
+    {
+        $validationErrors = [];
+
+        if (!$quote->isVirtual()) {
+            $shippingAddress = $quote->getShippingAddress();
+            $shippingAddress->setStoreId($quote->getStoreId());
+            $validationResult =
+                in_array(
+                    $shippingAddress->getCountryId(),
+                    $this->allowedCountryReader->getAllowedCountries(
+                        ScopeInterface::SCOPE_STORE,
+                        $quote->getStoreId()
+                    )
+                );
+            if (!$validationResult) {
+                $validationErrors = [__($this->generalMessage)];
+            }
+        }
+
+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+    }
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php
new file mode 100644
index 0000000000000..465aebdc418ed
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+
+/**
+ * @inheritdoc
+ */
+class BillingAddressValidationRule implements QuoteValidationRuleInterface
+{
+    /**
+     * @var string
+     */
+    private $generalMessage;
+
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param ValidationResultFactory $validationResultFactory
+     * @param string $generalMessage
+     */
+    public function __construct(
+        ValidationResultFactory $validationResultFactory,
+        string $generalMessage = ''
+    ) {
+        $this->validationResultFactory = $validationResultFactory;
+        $this->generalMessage = $generalMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Quote $quote): array
+    {
+        $validationErrors = [];
+        $billingAddress = $quote->getBillingAddress();
+        $billingAddress->setStoreId($quote->getStoreId());
+        $validationResult = $billingAddress->validate();
+        if ($validationResult !== true) {
+            $validationErrors = [__($this->generalMessage)];
+        }
+        if (is_array($validationResult)) {
+            $validationErrors = array_merge($validationErrors, $validationResult);
+        }
+
+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+    }
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php
new file mode 100644
index 0000000000000..34e953be43c74
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage;
+
+/**
+ * @inheritdoc
+ */
+class MinimumAmountValidationRule implements QuoteValidationRuleInterface
+{
+    /**
+     * @var string
+     */
+    private $generalMessage;
+
+    /**
+     * @var ValidationMessage
+     */
+    private $amountValidationMessage;
+
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param ValidationMessage $amountValidationMessage
+     * @param ValidationResultFactory $validationResultFactory
+     * @param string $generalMessage
+     */
+    public function __construct(
+        ValidationMessage $amountValidationMessage,
+        ValidationResultFactory $validationResultFactory,
+        string $generalMessage = ''
+    ) {
+        $this->amountValidationMessage = $amountValidationMessage;
+        $this->validationResultFactory = $validationResultFactory;
+        $this->generalMessage = $generalMessage;
+    }
+
+    /**
+     * @inheritdoc
+     * @throws \Zend_Currency_Exception
+     */
+    public function validate(Quote $quote): array
+    {
+        $validationErrors = [];
+        $validationResult = $quote->validateMinimumAmount($quote->getIsMultiShipping());
+        if (!$validationResult) {
+            if (!$this->generalMessage) {
+                $this->generalMessage = $this->amountValidationMessage->getMessage();
+            }
+            $validationErrors = [__($this->generalMessage)];
+        }
+
+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+    }
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php
new file mode 100644
index 0000000000000..bf2b813541fb0
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+
+/**
+ * @inheritdoc
+ */
+class PaymentMethodValidationRule implements QuoteValidationRuleInterface
+{
+    /**
+     * @var string
+     */
+    private $generalMessage;
+
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param ValidationResultFactory $validationResultFactory
+     * @param string $generalMessage
+     */
+    public function __construct(
+        ValidationResultFactory $validationResultFactory,
+        string $generalMessage = ''
+    ) {
+        $this->validationResultFactory = $validationResultFactory;
+        $this->generalMessage = $generalMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Quote $quote): array
+    {
+        $validationErrors = [];
+        $validationResult = $quote->getPayment()->getMethod();
+        if (!$validationResult) {
+            $validationErrors = [__($this->generalMessage)];
+        }
+
+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+    }
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php
new file mode 100644
index 0000000000000..6a75be3acce89
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Quote\Model\Quote;
+
+/**
+ * @inheritdoc
+ */
+class QuoteValidationComposite implements QuoteValidationRuleInterface
+{
+    /**
+     * @var QuoteValidationRuleInterface[]
+     */
+    private $validationRules = [];
+
+    /**
+     * @param QuoteValidationRuleInterface[] $validationRules
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(array $validationRules)
+    {
+        foreach ($validationRules as $validationRule) {
+            if (!($validationRule instanceof QuoteValidationRuleInterface)) {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Instance of the ValidationRuleInterface is expected, got %s instead.',
+                        get_class($validationRule)
+                    )
+                );
+            }
+        }
+        $this->validationRules = $validationRules;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Quote $quote): array
+    {
+        $aggregateResult = [];
+
+        foreach ($this->validationRules as $validationRule) {
+            $ruleValidationResult = $validationRule->validate($quote);
+            foreach ($ruleValidationResult as $item) {
+                if (!$item->isValid()) {
+                    array_push($aggregateResult, $item);
+                }
+            }
+        }
+
+        return $aggregateResult;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php
new file mode 100644
index 0000000000000..1a777e3f1a5fe
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Framework\Validation\ValidationResult;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Provides validation of Quote model.
+ */
+interface QuoteValidationRuleInterface
+{
+    /**
+     * Validate Quote model.
+     *
+     * @param Quote $quote
+     * @return ValidationResult[]
+     */
+    public function validate(Quote $quote): array;
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php
new file mode 100644
index 0000000000000..2f215c17e6d73
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+
+/**
+ * @inheritdoc
+ */
+class ShippingAddressValidationRule implements QuoteValidationRuleInterface
+{
+    /**
+     * @var string
+     */
+    private $generalMessage;
+
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param ValidationResultFactory $validationResultFactory
+     * @param string $generalMessage
+     */
+    public function __construct(
+        ValidationResultFactory $validationResultFactory,
+        string $generalMessage = ''
+    ) {
+        $this->validationResultFactory = $validationResultFactory;
+        $this->generalMessage = $generalMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Quote $quote): array
+    {
+        $validationErrors = [];
+
+        if (!$quote->isVirtual()) {
+            $shippingAddress = $quote->getShippingAddress();
+            $shippingAddress->setStoreId($quote->getStoreId());
+            $validationResult = $shippingAddress->validate();
+            if ($validationResult !== true) {
+                $validationErrors = [__($this->generalMessage)];
+            }
+            if (is_array($validationResult)) {
+                $validationErrors = array_merge($validationErrors, $validationResult);
+            }
+        }
+
+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+    }
+}
diff --git a/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php
new file mode 100644
index 0000000000000..3ef079f5a019a
--- /dev/null
+++ b/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ValidationRules;
+
+use Magento\Framework\Validation\ValidationResultFactory;
+use Magento\Quote\Model\Quote;
+
+/**
+ * @inheritdoc
+ */
+class ShippingMethodValidationRule implements QuoteValidationRuleInterface
+{
+    /**
+     * @var string
+     */
+    private $generalMessage;
+
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param ValidationResultFactory $validationResultFactory
+     * @param string $generalMessage
+     */
+    public function __construct(
+        ValidationResultFactory $validationResultFactory,
+        string $generalMessage = ''
+    ) {
+        $this->validationResultFactory = $validationResultFactory;
+        $this->generalMessage = $generalMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Quote $quote): array
+    {
+        $validationErrors = [];
+
+        if (!$quote->isVirtual()) {
+            $shippingAddress = $quote->getShippingAddress();
+            $shippingAddress->setStoreId($quote->getStoreId());
+            $shippingMethod = $shippingAddress->getShippingMethod();
+            $shippingRate = $shippingAddress->getShippingRateByCode($shippingMethod);
+            $validationResult = $shippingMethod && $shippingRate;
+            if (!$validationResult) {
+                $validationErrors = [__($this->generalMessage)];
+            }
+        }
+
+        return [$this->validationResultFactory->create(['errors' => $validationErrors])];
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
index a13a2dc590def..ae6c82629c437 100644
--- a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
+++ b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
@@ -56,7 +56,7 @@ public function getOverriddenValue()
                 }
             }
         } catch (NoSuchEntityException $e) {
-            /* do nothing and just return null */
+            throw new NoSuchEntityException(__('Current customer does not have an active cart.'));
         }
         return null;
     }
diff --git a/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php b/app/code/Magento/Quote/Observer/SubmitObserver.php
similarity index 94%
rename from app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
rename to app/code/Magento/Quote/Observer/SubmitObserver.php
index 4f1e66dcc724b..1213636e5966b 100644
--- a/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
+++ b/app/code/Magento/Quote/Observer/SubmitObserver.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Quote\Observer\Webapi;
+namespace Magento\Quote\Observer;
 
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Framework\Event\ObserverInterface;
@@ -13,12 +13,12 @@ class SubmitObserver implements ObserverInterface
     /**
      * @var \Psr\Log\LoggerInterface
      */
-    protected $logger;
+    private $logger;
 
     /**
      * @var OrderSender
      */
-    protected $orderSender;
+    private $orderSender;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger
diff --git a/app/code/Magento/Quote/Plugin/RecollectOnGroupChange.php b/app/code/Magento/Quote/Plugin/RecollectOnGroupChange.php
new file mode 100644
index 0000000000000..03b19c6e661a9
--- /dev/null
+++ b/app/code/Magento/Quote/Plugin/RecollectOnGroupChange.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Plugin;
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Recollect quote totals after change customer group
+ */
+class RecollectOnGroupChange
+{
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(
+        CartRepositoryInterface $cartRepository
+    ) {
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * Recollect totals if customer group change
+     *
+     * @param CustomerResource $subject
+     * @param CustomerResource $result
+     * @param AbstractModel $customer
+     * @return CustomerResource
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(CustomerResource $subject, CustomerResource $result, AbstractModel $customer)
+    {
+        /** @var Customer $customer */
+        if ($customer->getOrigData('group_id') !== null
+            && $customer->getOrigData('group_id') != $customer->getGroupId()
+        ) {
+            try {
+                /** @var \Magento\Quote\Model\Quote $quote */
+                $quote = $this->cartRepository->getActiveForCustomer($customer->getId());
+                $quote->setCustomerGroupId($customer->getGroupId());
+                $quote->collectTotals();
+                $this->cartRepository->save($quote);
+            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+                //no active cart for customer
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Quote/Plugin/UpdateQuoteStore.php b/app/code/Magento/Quote/Plugin/UpdateQuoteStore.php
new file mode 100644
index 0000000000000..de2fc76b9179f
--- /dev/null
+++ b/app/code/Magento/Quote/Plugin/UpdateQuoteStore.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Plugin;
+
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\QuoteRepository;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreCookieManagerInterface;
+
+/**
+ * Updates quote store id.
+ */
+class UpdateQuoteStore
+{
+    /**
+     * @var QuoteRepository
+     */
+    private $quoteRepository;
+
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @param QuoteRepository $quoteRepository
+     * @param Session $checkoutSession
+     */
+    public function __construct(
+        QuoteRepository $quoteRepository,
+        Session $checkoutSession
+    ) {
+        $this->quoteRepository = $quoteRepository;
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * Update store id in active quote after store view switching.
+     *
+     * @param StoreCookieManagerInterface $subject
+     * @param null $result
+     * @param StoreInterface $store
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSetStoreCookie(
+        StoreCookieManagerInterface $subject,
+        $result,
+        StoreInterface $store
+    ) {
+        $storeCodeFromCookie = $subject->getStoreCodeFromCookie();
+        if (null === $storeCodeFromCookie) {
+            return;
+        }
+
+        $quote = $this->checkoutSession->getQuote();
+        if ($quote->getIsActive() && $store->getCode() != $storeCodeFromCookie) {
+            $quote->setStoreId(
+                $store->getId()
+            );
+            $this->quoteRepository->save($quote);
+        }
+    }
+}
diff --git a/app/code/Magento/Quote/Setup/InstallData.php b/app/code/Magento/Quote/Setup/InstallData.php
deleted file mode 100644
index f039c15797c27..0000000000000
--- a/app/code/Magento/Quote/Setup/InstallData.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Quote\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Quote setup factory
-     *
-     * @var QuoteSetupFactory
-     */
-    private $quoteSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param QuoteSetupFactory $setupFactory
-     */
-    public function __construct(QuoteSetupFactory $setupFactory)
-    {
-        $this->quoteSetupFactory = $setupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var QuoteSetup $quoteSetup */
-        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
-
-        /**
-         * Install eav entity types to the eav/entity_type table
-         */
-        $attributes = [
-            'vat_id' => ['type' => Table::TYPE_TEXT],
-            'vat_is_valid' => ['type' => Table::TYPE_SMALLINT],
-            'vat_request_id' => ['type' => Table::TYPE_TEXT],
-            'vat_request_date' => ['type' => Table::TYPE_TEXT],
-            'vat_request_success' => ['type' => Table::TYPE_SMALLINT],
-        ];
-
-        foreach ($attributes as $attributeCode => $attributeParams) {
-            $quoteSetup->addAttribute('quote_address', $attributeCode, $attributeParams);
-        }
-    }
-}
diff --git a/app/code/Magento/Quote/Setup/InstallSchema.php b/app/code/Magento/Quote/Setup/InstallSchema.php
deleted file mode 100644
index bbf7e670da0b4..0000000000000
--- a/app/code/Magento/Quote/Setup/InstallSchema.php
+++ /dev/null
@@ -1,1572 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Quote\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'quote'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'converted_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true],
-            'Converted At'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '1'],
-            'Is Active'
-        )->addColumn(
-            'is_virtual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Is Virtual'
-        )->addColumn(
-            'is_multi_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Is Multi Shipping'
-        )->addColumn(
-            'items_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Items Count'
-        )->addColumn(
-            'items_qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Items Qty'
-        )->addColumn(
-            'orig_order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Orig Order Id'
-        )->addColumn(
-            'store_to_base_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Store To Base Rate'
-        )->addColumn(
-            'store_to_quote_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Store To Quote Rate'
-        )->addColumn(
-            'base_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Base Currency Code'
-        )->addColumn(
-            'store_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Store Currency Code'
-        )->addColumn(
-            'quote_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Quote Currency Code'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Grand Total'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Grand Total'
-        )->addColumn(
-            'checkout_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Checkout Method'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer Id'
-        )->addColumn(
-            'customer_tax_class_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer Tax Class Id'
-        )->addColumn(
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Customer Group Id'
-        )->addColumn(
-            'customer_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Email'
-        )->addColumn(
-            'customer_prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Customer Prefix'
-        )->addColumn(
-            'customer_firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Firstname'
-        )->addColumn(
-            'customer_middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Customer Middlename'
-        )->addColumn(
-            'customer_lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Lastname'
-        )->addColumn(
-            'customer_suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Customer Suffix'
-        )->addColumn(
-            'customer_dob',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            [],
-            'Customer Dob'
-        )->addColumn(
-            'customer_note',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Note'
-        )->addColumn(
-            'customer_note_notify',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '1'],
-            'Customer Note Notify'
-        )->addColumn(
-            'customer_is_guest',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Customer Is Guest'
-        )->addColumn(
-            'remote_ip',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Remote Ip'
-        )->addColumn(
-            'applied_rule_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Applied Rule Ids'
-        )->addColumn(
-            'reserved_order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            64,
-            ['nullable' => true],
-            'Reserved Order Id'
-        )->addColumn(
-            'password_hash',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Password Hash'
-        )->addColumn(
-            'coupon_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Coupon Code'
-        )->addColumn(
-            'global_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Global Currency Code'
-        )->addColumn(
-            'base_to_global_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Global Rate'
-        )->addColumn(
-            'base_to_quote_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Quote Rate'
-        )->addColumn(
-            'customer_taxvat',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Taxvat'
-        )->addColumn(
-            'customer_gender',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Gender'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'base_subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal'
-        )->addColumn(
-            'subtotal_with_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal With Discount'
-        )->addColumn(
-            'base_subtotal_with_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal With Discount'
-        )->addColumn(
-            'is_changed',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Is Changed'
-        )->addColumn(
-            'trigger_recollect',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Trigger Recollect'
-        )->addColumn(
-            'ext_shipping_info',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Ext Shipping Info'
-        )->addIndex(
-            $installer->getIdxName('quote', ['customer_id', 'store_id', 'is_active']),
-            ['customer_id', 'store_id', 'is_active']
-        )->addIndex(
-            $installer->getIdxName('quote', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('quote', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Quote'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'quote_address'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_address')
-        )->addColumn(
-            'address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Address Id'
-        )->addColumn(
-            'quote_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Quote Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer Id'
-        )->addColumn(
-            'save_in_address_book',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['default' => '0'],
-            'Save In Address Book'
-        )->addColumn(
-            'customer_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer Address Id'
-        )->addColumn(
-            'address_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            10,
-            [],
-            'Address Type'
-        )->addColumn(
-            'email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Email'
-        )->addColumn(
-            'prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Prefix'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            [],
-            'Firstname'
-        )->addColumn(
-            'middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            [],
-            'Middlename'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            [],
-            'Lastname'
-        )->addColumn(
-            'suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Suffix'
-        )->addColumn(
-            'company',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Company'
-        )->addColumn(
-            'street',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Street'
-        )->addColumn(
-            'city',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'City'
-        )->addColumn(
-            'region',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Region'
-        )->addColumn(
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Region Id'
-        )->addColumn(
-            'postcode',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            [],
-            'Postcode'
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            30,
-            [],
-            'Country Id'
-        )->addColumn(
-            'telephone',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            [],
-            'Phone Number'
-        )->addColumn(
-            'fax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            20,
-            [],
-            'Fax'
-        )->addColumn(
-            'same_as_billing',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Same As Billing'
-        )->addColumn(
-            'collect_shipping_rates',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Collect Shipping Rates'
-        )->addColumn(
-            'shipping_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            [],
-            'Shipping Method'
-        )->addColumn(
-            'shipping_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Description'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Weight'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Subtotal'
-        )->addColumn(
-            'base_subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Subtotal'
-        )->addColumn(
-            'subtotal_with_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Subtotal With Discount'
-        )->addColumn(
-            'base_subtotal_with_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Subtotal With Discount'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Tax Amount'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Tax Amount'
-        )->addColumn(
-            'shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Shipping Amount'
-        )->addColumn(
-            'base_shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Shipping Amount'
-        )->addColumn(
-            'shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Tax Amount'
-        )->addColumn(
-            'base_shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Tax Amount'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Discount Amount'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Grand Total'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Grand Total'
-        )->addColumn(
-            'customer_notes',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Customer Notes'
-        )->addColumn(
-            'applied_taxes',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Applied Taxes'
-        )->addColumn(
-            'discount_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Discount Description'
-        )->addColumn(
-            'shipping_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Discount Amount'
-        )->addColumn(
-            'base_shipping_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Discount Amount'
-        )->addColumn(
-            'subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Incl Tax'
-        )->addColumn(
-            'base_subtotal_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Total Incl Tax'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_shipping_discount_tax_compensation_amnt',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Incl Tax'
-        )->addColumn(
-            'base_shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Incl Tax'
-        )->addIndex(
-            $installer->getIdxName('quote_address', ['quote_id']),
-            ['quote_id']
-        )->addForeignKey(
-            $installer->getFkName('quote_address', 'quote_id', 'quote', 'entity_id'),
-            'quote_id',
-            $installer->getTable('quote'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Quote Address'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'quote_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_item')
-        )->addColumn(
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Item Id'
-        )->addColumn(
-            'quote_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Quote Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Product Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'parent_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Parent Item Id'
-        )->addColumn(
-            'is_virtual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Virtual'
-        )->addColumn(
-            'sku',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sku'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'applied_rule_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Applied Rule Ids'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'is_qty_decimal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Qty Decimal'
-        )->addColumn(
-            'no_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'No Discount'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Weight'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Qty'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Price'
-        )->addColumn(
-            'base_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Price'
-        )->addColumn(
-            'custom_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Custom Price'
-        )->addColumn(
-            'discount_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Discount Percent'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Discount Amount'
-        )->addColumn(
-            'tax_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Tax Percent'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Tax Amount'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Tax Amount'
-        )->addColumn(
-            'row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Row Total'
-        )->addColumn(
-            'base_row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Row Total'
-        )->addColumn(
-            'row_total_with_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Row Total With Discount'
-        )->addColumn(
-            'row_weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Row Weight'
-        )->addColumn(
-            'product_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Product Type'
-        )->addColumn(
-            'base_tax_before_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Before Discount'
-        )->addColumn(
-            'tax_before_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Before Discount'
-        )->addColumn(
-            'original_custom_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Original Custom Price'
-        )->addColumn(
-            'redirect_url',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Redirect Url'
-        )->addColumn(
-            'base_cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Cost'
-        )->addColumn(
-            'price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price Incl Tax'
-        )->addColumn(
-            'base_price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price Incl Tax'
-        )->addColumn(
-            'row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total Incl Tax'
-        )->addColumn(
-            'base_row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total Incl Tax'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addIndex(
-            $installer->getIdxName('quote_item', ['parent_item_id']),
-            ['parent_item_id']
-        )->addIndex(
-            $installer->getIdxName('quote_item', ['product_id']),
-            ['product_id']
-        )->addIndex(
-            $installer->getIdxName('quote_item', ['quote_id']),
-            ['quote_id']
-        )->addIndex(
-            $installer->getIdxName('quote_item', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('quote_item', 'parent_item_id', 'quote_item', 'item_id'),
-            'parent_item_id',
-            $installer->getTable('quote_item'),
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('quote_item', 'quote_id', 'quote', 'entity_id'),
-            'quote_id',
-            $installer->getTable('quote'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('quote_item', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Flat Quote Item'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'quote_address_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_address_item')
-        )->addColumn(
-            'address_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Address Item Id'
-        )->addColumn(
-            'parent_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Parent Item Id'
-        )->addColumn(
-            'quote_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Quote Address Id'
-        )->addColumn(
-            'quote_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Quote Item Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'applied_rule_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Applied Rule Ids'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Weight'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Qty'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Tax Amount'
-        )->addColumn(
-            'row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Row Total'
-        )->addColumn(
-            'base_row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Row Total'
-        )->addColumn(
-            'row_total_with_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Row Total With Discount'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Discount Amount'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Tax Amount'
-        )->addColumn(
-            'row_weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Row Weight'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Product Id'
-        )->addColumn(
-            'super_product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Super Product Id'
-        )->addColumn(
-            'parent_product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Parent Product Id'
-        )->addColumn(
-            'sku',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sku'
-        )->addColumn(
-            'image',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Image'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'is_qty_decimal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Is Qty Decimal'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price'
-        )->addColumn(
-            'discount_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Percent'
-        )->addColumn(
-            'no_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'No Discount'
-        )->addColumn(
-            'tax_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Percent'
-        )->addColumn(
-            'base_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price'
-        )->addColumn(
-            'base_cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Cost'
-        )->addColumn(
-            'price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price Incl Tax'
-        )->addColumn(
-            'base_price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price Incl Tax'
-        )->addColumn(
-            'row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total Incl Tax'
-        )->addColumn(
-            'base_row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total Incl Tax'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addIndex(
-            $installer->getIdxName('quote_address_item', ['quote_address_id']),
-            ['quote_address_id']
-        )->addIndex(
-            $installer->getIdxName('quote_address_item', ['parent_item_id']),
-            ['parent_item_id']
-        )->addIndex(
-            $installer->getIdxName('quote_address_item', ['quote_item_id']),
-            ['quote_item_id']
-        )->addForeignKey(
-            $installer->getFkName(
-                'quote_address_item',
-                'quote_address_id',
-                'quote_address',
-                'address_id'
-            ),
-            'quote_address_id',
-            $installer->getTable('quote_address'),
-            'address_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'quote_address_item',
-                'parent_item_id',
-                'quote_address_item',
-                'address_item_id'
-            ),
-            'parent_item_id',
-            $installer->getTable('quote_address_item'),
-            'address_item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('quote_address_item', 'quote_item_id', 'quote_item', 'item_id'),
-            'quote_item_id',
-            $installer->getTable('quote_item'),
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Quote Address Item'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'quote_item_option'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_item_option')
-        )->addColumn(
-            'option_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Option Id'
-        )->addColumn(
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Item Id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Product Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName('quote_item_option', ['item_id']),
-            ['item_id']
-        )->addForeignKey(
-            $installer->getFkName('quote_item_option', 'item_id', 'quote_item', 'item_id'),
-            'item_id',
-            $installer->getTable('quote_item'),
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Quote Item Option'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'quote_payment'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_payment')
-        )->addColumn(
-            'payment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Payment Id'
-        )->addColumn(
-            'quote_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Quote Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Method'
-        )->addColumn(
-            'cc_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Type'
-        )->addColumn(
-            'cc_number_enc',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Number Enc'
-        )->addColumn(
-            'cc_last_4',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Last 4'
-        )->addColumn(
-            'cc_cid_enc',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Cid Enc'
-        )->addColumn(
-            'cc_owner',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Owner'
-        )->addColumn(
-            'cc_exp_month',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['unsigned' => true, 'default' => null, 'nullable' => true],
-            'Cc Exp Month'
-        )->addColumn(
-            'cc_exp_year',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Cc Exp Year'
-        )->addColumn(
-            'cc_ss_owner',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Ss Owner'
-        )->addColumn(
-            'cc_ss_start_month',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Cc Ss Start Month'
-        )->addColumn(
-            'cc_ss_start_year',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Cc Ss Start Year'
-        )->addColumn(
-            'po_number',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Po Number'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'cc_ss_issue',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Cc Ss Issue'
-        )->addColumn(
-            'additional_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Information'
-        )->addIndex(
-            $installer->getIdxName('quote_payment', ['quote_id']),
-            ['quote_id']
-        )->addForeignKey(
-            $installer->getFkName('quote_payment', 'quote_id', 'quote', 'entity_id'),
-            'quote_id',
-            $installer->getTable('quote'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Quote Payment'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'quote_shipping_rate'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_shipping_rate')
-        )->addColumn(
-            'rate_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Rate Id'
-        )->addColumn(
-            'address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Address Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'carrier',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Carrier'
-        )->addColumn(
-            'carrier_title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Carrier Title'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Code'
-        )->addColumn(
-            'method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Method'
-        )->addColumn(
-            'method_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Method Description'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Price'
-        )->addColumn(
-            'error_message',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Error Message'
-        )->addColumn(
-            'method_title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Method Title'
-        )->addIndex(
-            $installer->getIdxName('quote_shipping_rate', ['address_id']),
-            ['address_id']
-        )->addForeignKey(
-            $installer->getFkName('quote_shipping_rate', 'address_id', 'quote_address', 'address_id'),
-            'address_id',
-            $installer->getTable('quote_address'),
-            'address_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Quote Shipping Rate'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table to store cartId and obscured UUID based cartId mapping
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('quote_id_mask')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'quote_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Quote ID'
-        )->addIndex(
-            $installer->getIdxName('quote_id_mask', ['quote_id']),
-            ['quote_id']
-        )->addForeignKey(
-            $installer->getFkName('quote_id_mask', 'quote_id', 'quote', 'entity_id'),
-            'quote_id',
-            $installer->getTable('quote'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addColumn(
-            'masked_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => 'false'],
-            'Masked ID'
-        )->setComment(
-            'Quote ID and masked ID mapping'
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..f537280272227
--- /dev/null
+++ b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Quote\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Quote\Setup\ConvertSerializedDataToJsonFactory;
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedDataToJson
+ * @package Magento\Quote\Setup\Patch
+ */
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * @var ConvertSerializedDataToJsonFactory
+     */
+    private $convertSerializedDataToJsonFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        QuoteSetupFactory $quoteSetupFactory,
+        ConvertSerializedDataToJsonFactory $convertSerializedDataToJsonFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->quoteSetupFactory = $quoteSetupFactory;
+        $this->convertSerializedDataToJsonFactory = $convertSerializedDataToJsonFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $quoteSetup = $this->quoteSetupFactory->create();
+        $this->convertSerializedDataToJsonFactory->create(['quoteSetup' => $quoteSetup])->convert();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InstallEntityTypes::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.6';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php b/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php
new file mode 100644
index 0000000000000..24ff3ecad58e6
--- /dev/null
+++ b/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Quote\Setup\Patch\Data;
+
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Quote\Setup\QuoteSetup;
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/***
+ * Class InstallEntityTypes
+ * @package Magento\Quote\Setup\Patch
+ */
+class InstallEntityTypes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * InstallEntityTypes constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param QuoteSetupFactory $quoteSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        QuoteSetupFactory $quoteSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->quoteSetupFactory = $quoteSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var QuoteSetup $quoteSetup */
+        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        /**
+         * Install eav entity types to the eav/entity_type table
+         */
+        $attributes = [
+            'vat_id' => ['type' => Table::TYPE_TEXT],
+            'vat_is_valid' => ['type' => Table::TYPE_SMALLINT],
+            'vat_request_id' => ['type' => Table::TYPE_TEXT],
+            'vat_request_date' => ['type' => Table::TYPE_TEXT],
+            'vat_request_success' => ['type' => Table::TYPE_SMALLINT],
+        ];
+        foreach ($attributes as $attributeCode => $attributeParams) {
+            $quoteSetup->addAttribute('quote_address', $attributeCode, $attributeParams);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Quote/Setup/UpgradeData.php b/app/code/Magento/Quote/Setup/UpgradeData.php
deleted file mode 100644
index fde232c2e593b..0000000000000
--- a/app/code/Magento/Quote/Setup/UpgradeData.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Quote\Setup;
-
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var QuoteSetupFactory
-     */
-    private $quoteSetupFactory;
-
-    /**
-     * @var ConvertSerializedDataToJsonFactory
-     */
-    private $convertSerializedDataToJsonFactory;
-
-    /**
-     * Constructor
-     *
-     * @param QuoteSetupFactory $quoteSetupFactory
-     * @param ConvertSerializedDataToJsonFactory $convertSerializedDataToJsonFactory
-     */
-    public function __construct(
-        QuoteSetupFactory $quoteSetupFactory,
-        ConvertSerializedDataToJsonFactory $convertSerializedDataToJsonFactory
-    ) {
-        $this->quoteSetupFactory = $quoteSetupFactory;
-        $this->convertSerializedDataToJsonFactory = $convertSerializedDataToJsonFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.6', '<')) {
-            $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
-            $this->convertSerializedDataToJsonFactory->create(['quoteSetup' => $quoteSetup])
-                ->convert();
-        }
-    }
-}
diff --git a/app/code/Magento/Quote/Setup/UpgradeSchema.php b/app/code/Magento/Quote/Setup/UpgradeSchema.php
deleted file mode 100644
index fadb39d7e6594..0000000000000
--- a/app/code/Magento/Quote/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Quote\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Upgrade the Catalog module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private static $connectionName = 'checkout';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $setup->getConnection(self::$connectionName)->addIndex(
-                $setup->getTable('quote_id_mask', self::$connectionName),
-                $setup->getIdxName('quote_id_mask', ['masked_id'], '', self::$connectionName),
-                ['masked_id']
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $setup->getConnection(self::$connectionName)->changeColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'street',
-                'street',
-                [
-                    'type' => Table::TYPE_TEXT,
-                    'length' => 255,
-                    'comment' => 'Street'
-                ]
-            );
-        }
-        //drop foreign key for single DB case
-        if (version_compare($context->getVersion(), '2.0.3', '<')
-            && $setup->tableExists($setup->getTable('quote_item'))
-        ) {
-            $setup->getConnection()->dropForeignKey(
-                $setup->getTable('quote_item'),
-                $setup->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id')
-            );
-        }
-        if (version_compare($context->getVersion(), '2.0.5', '<')) {
-            $connection = $setup->getConnection();
-            $connection->modifyColumn(
-                $setup->getTable('quote_address'),
-                'shipping_method',
-                [
-                    'type' => Table::TYPE_TEXT,
-                    'length' => 120
-                ]
-            );
-        }
-        if (version_compare($context->getVersion(), '2.0.6', '<')) {
-            $connection = $setup->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'firstname',
-                [
-                    'type' => Table::TYPE_TEXT,
-                    'length' => 255,
-                ]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'middlename',
-                [
-                    'type' => Table::TYPE_TEXT,
-                    'length' => 40,
-                ]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'lastname',
-                [
-                    'type' => Table::TYPE_TEXT,
-                    'length' => 255,
-                ]
-            )->modifyColumn(
-                $setup->getTable('quote', self::$connectionName),
-                'updated_at',
-                [
-                    'type' => Table::TYPE_TIMESTAMP,
-                    'nullable' => false,
-                    'default' => Table::TIMESTAMP_INIT_UPDATE,
-                ]
-            );
-        }
-        if (version_compare($context->getVersion(), '2.0.7', '<')) {
-            $connection = $setup->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'telephone',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'fax',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'region',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'city',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            );
-        }
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
new file mode 100644
index 0000000000000..4cc2c4f392419
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleCartItem" type="CartItem">
+        <data key="qty">1</data>
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
new file mode 100644
index 0000000000000..1d63a8a0d9f87
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+
+    <entity name="GuestCart" type="GuestCart">
+    </entity>
+
+    <entity name="GuestAddressInformation" type="AddressInformation">
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <requiredEntity type="shipping_address">ShippingAddressTX</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
+        <data key="shipping_method_code">flatrate</data>
+        <data key="shipping_carrier_code">flatrate</data>
+    </entity>
+
+    <entity name="GuestOrderPaymentMethod" type="PaymentInformation">
+        <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE.txt b/app/code/Magento/Quote/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE.txt
rename to app/code/Magento/Quote/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE_AFL.txt b/app/code/Magento/Quote/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/Quote/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
new file mode 100644
index 0000000000000..d4a4c4345d738
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateBillingAddress" dataType="billing_address" type="create">
+        <field key="city">string</field>
+        <field key="region">string</field>
+        <field key="region_code">string</field>
+        <field key="region_id">int</field>
+        <field key="country_id">string</field>
+        <array key="street">
+            <value>string</value>
+        </array>
+        <field key="postcode">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="telephone">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
new file mode 100644
index 0000000000000..27c7af95d0f2c
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateGuestCart" dataType="GuestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
+        <contentType>application/json</contentType>
+    </operation>
+
+    <operation name="AddProductToGuestCart" dataType="CartItem" type="create" auth="anonymous" url="V1/guest-carts/{return}/items" method="POST">
+        <contentType>application/json</contentType>
+        <object key="cartItem" dataType="CartItem">
+            <field key="quote_id">string</field>
+            <field key="sku" type="string">string</field>
+            <field key="qty">integer</field>
+        </object>
+    </operation>
+
+    <operation name="AddAddressInfoToGuestCart" dataType="AddressInformation" type="create" auth="anonymous" url="/V1/guest-carts/{return}/shipping-information" method="POST">
+        <contentType>application/json</contentType>
+        <object key="addressInformation" dataType="AddressInformation">
+            <object key="shipping_address" dataType="shipping_address">
+                <field key="city">string</field>
+                <field key="region">string</field>
+                <field key="region_code">string</field>
+                <field key="region_id">integer</field>
+                <field key="country_id">string</field>
+                <array key="street">
+                    <value>string</value>
+                </array>
+                <field key="postcode">string</field>
+                <field key="firstname">string</field>
+                <field key="lastname">string</field>
+                <field key="email">string</field>
+                <field key="telephone">string</field>
+            </object>
+            <object key="billing_address" dataType="billing_address">
+                <field key="city">string</field>
+                <field key="region">string</field>
+                <field key="region_code">string</field>
+                <field key="region_id">integer</field>
+                <field key="country_id">string</field>
+                <array key="street">
+                    <value>string</value>
+                </array>
+                <field key="postcode">string</field>
+                <field key="firstname">string</field>
+                <field key="lastname">string</field>
+                <field key="email">string</field>
+                <field key="telephone">string</field>
+            </object>
+            <field key="shipping_method_code">string</field>
+            <field key="shipping_carrier_code">string</field>
+        </object>
+    </operation>
+
+    <operation name="SendGuestPaymentInformation" dataType="PaymentInformation" type="update" auth="anonymous" url="/V1/guest-carts/{return}/order" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="paymentMethod" dataType="payment_method">
+            <field key="method">string</field>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
new file mode 100644
index 0000000000000..803681252a9e9
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateShippingAddress" dataType="shipping_address" type="create">
+        <field key="city">string</field>
+        <field key="region">string</field>
+        <field key="region_code">string</field>
+        <field key="region_id">int</field>
+        <field key="country_id">string</field>
+        <array key="street">
+            <value>string</value>
+        </array>
+        <field key="postcode">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="telephone">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Quote/Test/Mftf/README.md b/app/code/Magento/Quote/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f1021b8435cba
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Quote Functional Tests
+
+The Functional Test Module for **Magento Quote** module.
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
new file mode 100644
index 0000000000000..ab0db2dac643e
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontGuestCheckoutDisabledProductTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="Remove item from cart if product disabled"/>
+            <description value="Remove item from cart if simple or configurable product is disabled"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95857"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+        <!--  Step 1: Add simple product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AddSimpleProductToCart" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectOption"/>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
+        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart($$createConfigProduct.name$$)}}" time="30" stepKey="assertMessage"/>
+        <!--Disabled via admin panel-->
+        <openNewTab stepKey="openNewTab"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <!-- Find the first simple product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <!-- Disabled child configurable product -->
+        <click selector="{{AdminProductFormSection.enableProductAttributeLabel}}" stepKey="clickDisableProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageSaved"/>
+        <!-- Disabled simple product from grid -->
+        <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="status" value="Disable"/>
+        </actionGroup>
+        <closeTab stepKey="closeTab"/>
+        <!--Check cart-->
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageReload2"/>
+        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart"/>
+        <dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php
index 14bc1dcc8efba..4182dbe72dac4 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php
@@ -128,7 +128,7 @@ public function testSetAddress()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Unable to save address. Please check input data.
+     * @expectedExceptionMessage The address failed to save. Verify the address and try again.
      */
     public function testSetAddressWithInabilityToSaveQuote()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php
index 287d2b3c8d4f0..d6338eb428657 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php
@@ -92,6 +92,9 @@ public function testCollectTotalsNoShipping($shippingCarrierCode, $shippingMetho
         );
     }
 
+    /**
+     * @return array
+     */
     public function collectTotalsShippingData()
     {
         return [
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
index b1cec90e61e01..1e999cb5e523e 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
@@ -163,6 +163,9 @@ public function testGet($isVirtual, $getAddressType)
         $this->assertEquals($totalsMock, $this->model->get($cartId));
     }
 
+    /**
+     * @return array
+     */
     public function getDataProvider()
     {
         return [
diff --git a/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
index ed32017e7e440..91211904c11eb 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
@@ -47,6 +47,7 @@ protected function setUp()
                 'save',
                 'getShippingAddress',
                 'getCouponCode',
+                'getStoreId',
                 '__wakeup'
             ]);
         $this->quoteAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, [
@@ -76,7 +77,7 @@ public function testGetCoupon()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Cart 33 doesn't contain products
+     * @expectedExceptionMessage The "33" Cart doesn't contain products.
      */
     public function testSetWhenCartDoesNotContainsProducts()
     {
@@ -91,13 +92,16 @@ public function testSetWhenCartDoesNotContainsProducts()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not apply coupon code
+     * @expectedExceptionMessage The coupon code couldn't be applied. Verify the coupon code and try again.
      */
     public function testSetWhenCouldNotApplyCoupon()
     {
         $cartId = 33;
         $couponCode = '153a-ABC';
 
+        $this->storeMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($this->returnValue(1));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActive')->with($cartId)->will($this->returnValue($this->quoteMock));
         $this->quoteMock->expects($this->once())->method('getItemsCount')->will($this->returnValue(12));
@@ -105,7 +109,7 @@ public function testSetWhenCouldNotApplyCoupon()
             ->method('getShippingAddress')->will($this->returnValue($this->quoteAddressMock));
         $this->quoteAddressMock->expects($this->once())->method('setCollectShippingRates')->with(true);
         $this->quoteMock->expects($this->once())->method('setCouponCode')->with($couponCode);
-        $exceptionMessage = 'Could not apply coupon code';
+        $exceptionMessage = "The coupon code couldn't be applied. Verify the coupon code and try again.";
         $exception = new \Magento\Framework\Exception\CouldNotDeleteException(__($exceptionMessage));
         $this->quoteMock->expects($this->once())->method('collectTotals')->will($this->returnValue($this->quoteMock));
         $this->quoteRepositoryMock->expects($this->once())
@@ -118,13 +122,16 @@ public function testSetWhenCouldNotApplyCoupon()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Coupon code is not valid
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testSetWhenCouponCodeIsInvalid()
     {
         $cartId = 33;
         $couponCode = '153a-ABC';
 
+        $this->storeMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($this->returnValue(1));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActive')->with($cartId)->will($this->returnValue($this->quoteMock));
         $this->quoteMock->expects($this->once())->method('getItemsCount')->will($this->returnValue(12));
@@ -144,6 +151,9 @@ public function testSet()
         $cartId = 33;
         $couponCode = '153a-ABC';
 
+        $this->storeMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($this->returnValue(1));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActive')->with($cartId)->will($this->returnValue($this->quoteMock));
         $this->quoteMock->expects($this->once())->method('getItemsCount')->will($this->returnValue(12));
@@ -160,7 +170,7 @@ public function testSet()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Cart 65 doesn't contain products
+     * @expectedExceptionMessage The "65" Cart doesn't contain products.
      */
     public function testDeleteWhenCartDoesNotContainsProducts()
     {
@@ -176,7 +186,7 @@ public function testDeleteWhenCartDoesNotContainsProducts()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Could not delete coupon code
+     * @expectedExceptionMessage The coupon code couldn't be deleted. Verify the coupon code and try again.
      */
     public function testDeleteWhenCouldNotDeleteCoupon()
     {
@@ -190,7 +200,7 @@ public function testDeleteWhenCouldNotDeleteCoupon()
         $this->quoteAddressMock->expects($this->once())->method('setCollectShippingRates')->with(true);
         $this->quoteMock->expects($this->once())->method('setCouponCode')->with('');
         $this->quoteMock->expects($this->once())->method('collectTotals')->will($this->returnValue($this->quoteMock));
-        $exceptionMessage = 'Could not delete coupon code';
+        $exceptionMessage = "The coupon code couldn't be deleted. Verify the coupon code and try again.";
         $exception = new \Magento\Framework\Exception\CouldNotSaveException(__($exceptionMessage));
         $this->quoteMock->expects($this->once())->method('collectTotals')->will($this->returnValue($this->quoteMock));
         $this->quoteRepositoryMock->expects($this->once())
@@ -203,7 +213,7 @@ public function testDeleteWhenCouldNotDeleteCoupon()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Could not delete coupon code
+     * @expectedExceptionMessage The coupon code couldn't be deleted. Verify the coupon code and try again.
      */
     public function testDeleteWhenCouponIsNotEmpty()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php
index ee0ffd3bcc666..73ed2e65b41a9 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php
@@ -94,7 +94,7 @@ public function testCreateEmptyCart()
         $cartId = 1;
         $this->quoteIdMaskMock->expects($this->once())->method('setQuoteId')->with($cartId)->willReturnSelf();
         $this->quoteIdMaskMock->expects($this->once())->method('save')->willReturnSelf();
-        $this->quoteIdMaskMock->expects($this->once())->method('getMaskedId')->willreturn($maskedCartId);
+        $this->quoteIdMaskMock->expects($this->once())->method('getMaskedId')->willReturn($maskedCartId);
         $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
         $this->quoteManagementMock->expects($this->once())->method('createEmptyCart')->willReturn($cartId);
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
index 9cde4bbc19184..49ed8a10bee35 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
@@ -36,7 +36,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedMessage Cannot assign customer to the given cart. You don't have permission for this operation.
+     * @expectedExceptionMessage You don't have the correct permissions to assign the customer to the cart.
      */
     public function testBeforeAssignCustomer()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php
index 8143e0e417ead..f18d1fa1b06e5 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Test\Unit\Model;
 
 class PaymentMethodManagementTest extends \PHPUnit\Framework\TestCase
@@ -151,8 +153,8 @@ public function testSetVirtualProduct()
             ->with($paymentMethod)
             ->willReturnSelf();
 
-        $quoteMock->expects($this->exactly(2))->method('getPayment')->willReturn($paymentMock);
-        $quoteMock->expects($this->exactly(2))->method('isVirtual')->willReturn(true);
+        $quoteMock->method('getPayment')->willReturn($paymentMock);
+        $quoteMock->expects($this->once())->method('isVirtual')->willReturn(true);
         $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($billingAddressMock);
 
         $methodInstance = $this->getMockForAbstractClass(\Magento\Payment\Model\MethodInterface::class);
@@ -164,7 +166,6 @@ public function testSetVirtualProduct()
             ->willReturn(true);
 
         $quoteMock->expects($this->once())->method('setTotalsCollectedFlag')->with(false)->willReturnSelf();
-        $quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
         $quoteMock->expects($this->once())->method('save')->willReturnSelf();
 
         $paymentMock->expects($this->once())->method('getId')->willReturn($paymentId);
@@ -217,9 +218,9 @@ public function testSetVirtualProductThrowsExceptionIfPaymentMethodNotAvailable(
             ->with($paymentMethod)
             ->willReturnSelf();
 
-        $quoteMock->expects($this->once())->method('getPayment')->willReturn($paymentMock);
-        $quoteMock->expects($this->exactly(2))->method('isVirtual')->willReturn(true);
-        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->method('getPayment')->willReturn($paymentMock);
+        $quoteMock->method('isVirtual')->willReturn(true);
+        $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
 
         $methodInstance = $this->getMockForAbstractClass(\Magento\Payment\Model\MethodInterface::class);
         $paymentMock->expects($this->once())->method('getMethodInstance')->willReturn($methodInstance);
@@ -267,17 +268,20 @@ public function testSetSimpleProduct()
 
         $shippingAddressMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
-            ['getCountryId', 'setPaymentMethod']
+            ['getCountryId', 'setPaymentMethod', 'setCollectShippingRates']
         );
         $shippingAddressMock->expects($this->once())->method('getCountryId')->willReturn(100);
         $shippingAddressMock->expects($this->once())
             ->method('setPaymentMethod')
             ->with($paymentMethod)
             ->willReturnSelf();
+        $shippingAddressMock->expects($this->once())
+            ->method('setCollectShippingRates')
+            ->with(true);
 
-        $quoteMock->expects($this->exactly(2))->method('getPayment')->willReturn($paymentMock);
-        $quoteMock->expects($this->exactly(2))->method('isVirtual')->willReturn(false);
-        $quoteMock->expects($this->exactly(4))->method('getShippingAddress')->willReturn($shippingAddressMock);
+        $quoteMock->method('getPayment')->willReturn($paymentMock);
+        $quoteMock->method('isVirtual')->willReturn(false);
+        $quoteMock->method('getShippingAddress')->willReturn($shippingAddressMock);
 
         $methodInstance = $this->getMockForAbstractClass(\Magento\Payment\Model\MethodInterface::class);
         $paymentMock->expects($this->once())->method('getMethodInstance')->willReturn($methodInstance);
@@ -288,7 +292,6 @@ public function testSetSimpleProduct()
             ->willReturn(true);
 
         $quoteMock->expects($this->once())->method('setTotalsCollectedFlag')->with(false)->willReturnSelf();
-        $quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
         $quoteMock->expects($this->once())->method('save')->willReturnSelf();
 
         $paymentMock->expects($this->once())->method('getId')->willReturn($paymentId);
@@ -297,12 +300,11 @@ public function testSetSimpleProduct()
 
     /**
      * @expectedException \Magento\Framework\Exception\State\InvalidTransitionException
-     * @expectedExceptionMessage Shipping address is not set
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetSimpleProductTrowsExceptionIfShippingAddressNotSet()
     {
         $cartId = 100;
-        $methodData = ['method' => 'data'];
 
         $quoteMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote::class,
@@ -310,6 +312,7 @@ public function testSetSimpleProductTrowsExceptionIfShippingAddressNotSet()
         );
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
 
+        /** @var \Magento\Quote\Model\Quote\Payment|\PHPUnit_Framework_MockObject_MockObject $methodMock */
         $methodMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Payment::class, ['setChecks', 'getData']);
         $methodMock->expects($this->once())
             ->method('setChecks')
@@ -320,17 +323,13 @@ public function testSetSimpleProductTrowsExceptionIfShippingAddressNotSet()
                 \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
             ])
             ->willReturnSelf();
-        $methodMock->expects($this->once())->method('getData')->willReturn($methodData);
-
-        $paymentMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Payment::class, ['importData']);
-        $paymentMock->expects($this->once())->method('importData')->with($methodData)->willReturnSelf();
+        $methodMock->expects($this->never())->method('getData');
 
         $shippingAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, ['getCountryId']);
         $shippingAddressMock->expects($this->once())->method('getCountryId')->willReturn(null);
 
-        $quoteMock->expects($this->once())->method('getPayment')->willReturn($paymentMock);
-        $quoteMock->expects($this->once())->method('isVirtual')->willReturn(false);
-        $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($shippingAddressMock);
+        $quoteMock->method('isVirtual')->willReturn(false);
+        $quoteMock->method('getShippingAddress')->willReturn($shippingAddressMock);
 
         $this->model->set($cartId, $methodMock);
     }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php b/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
index 38f303dd23582..cd7a54455a994 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
@@ -49,6 +49,9 @@ public function testAfterUpdate($originalPrice, $newPrice, $callMethod, $tierPri
         $this->assertEquals($result, $productResourceMock);
     }
 
+    /**
+     * @return array
+     */
     public function aroundUpdateDataProvider()
     {
         return [
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php
index 6c572b1e86d08..999595357c05a 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Quote\Test\Unit\Model\Quote\Address\Total;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ShippingTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -42,6 +45,9 @@ class ShippingTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $priceCurrency;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->freeShipping = $this->getMockForAbstractClass(
@@ -123,7 +129,10 @@ protected function setUp()
         $this->store = $this->createMock(\Magento\Store\Model\Store::class);
     }
 
-    public function testFetch()
+    /**
+     * @return void
+     */
+    public function testFetch(): void
     {
         $shippingAmount = 100;
         $shippingDescription = 100;
@@ -144,7 +153,10 @@ public function testFetch()
         $this->assertEquals($expectedResult, $this->shippingModel->fetch($quoteMock, $totalMock));
     }
 
-    public function testCollect()
+    /**
+     * @return void
+     */
+    public function testCollect(): void
     {
         $this->shippingAssignment->expects($this->exactly(3))
             ->method('getShipping')
@@ -158,12 +170,10 @@ public function testCollect()
         $this->shippingAssignment->expects($this->atLeastOnce())
             ->method('getItems')
             ->willReturn([$this->cartItem]);
-        $this->freeShipping->expects($this->once())
-            ->method('isFreeShipping')
+        $this->freeShipping->method('isFreeShipping')
             ->with($this->quote, [$this->cartItem])
             ->willReturn(true);
-        $this->address->expects($this->once())
-            ->method('setFreeShipping')
+        $this->address->method('setFreeShipping')
             ->with(true);
         $this->total->expects($this->atLeastOnce())
             ->method('setTotalAmount');
@@ -175,24 +185,19 @@ public function testCollect()
         $this->cartItem->expects($this->atLeastOnce())
             ->method('isVirtual')
             ->willReturn(false);
-        $this->cartItem->expects($this->once())
-            ->method('getParentItem')
+        $this->cartItem->method('getParentItem')
             ->willReturn(false);
-        $this->cartItem->expects($this->once())
-            ->method('getHasChildren')
+        $this->cartItem->method('getHasChildren')
             ->willReturn(false);
-        $this->cartItem->expects($this->once())
-            ->method('getWeight')
+        $this->cartItem->method('getWeight')
             ->willReturn(2);
         $this->cartItem->expects($this->atLeastOnce())
             ->method('getQty')
             ->willReturn(2);
         $this->freeShippingAssertions();
-        $this->cartItem->expects($this->once())
-            ->method('setRowWeight')
+        $this->cartItem->method('setRowWeight')
             ->with(0);
-        $this->address->expects($this->once())
-            ->method('setItemQty')
+        $this->address->method('setItemQty')
             ->with(2);
         $this->address->expects($this->atLeastOnce())
             ->method('setWeight');
@@ -241,7 +246,10 @@ public function testCollect()
         $this->shippingModel->collect($this->quote, $this->shippingAssignment, $this->total);
     }
 
-    protected function freeShippingAssertions()
+    /**
+     * @return void
+     */
+    protected function freeShippingAssertions(): void
     {
         $this->address->expects($this->at(0))
             ->method('getFreeShipping')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
index 78a87b59d9f62..c4a8081fbb8fa 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -49,6 +49,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function collectDataProvider()
     {
         return [
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/TotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/TotalTest.php
index f884981424d65..e1971fa9833a3 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/TotalTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/TotalTest.php
@@ -49,6 +49,9 @@ public function testSetTotalAmount($code, $amount, $storedCode)
         $this->assertSame($this->model, $result);
     }
 
+    /**
+     * @return array
+     */
     public function setTotalAmountDataProvider()
     {
         return [
@@ -80,6 +83,9 @@ public function testSetBaseTotalAmount($code, $amount, $storedCode)
         $this->assertSame($this->model, $result);
     }
 
+    /**
+     * @return array
+     */
     public function setBaseTotalAmountDataProvider()
     {
         return [
@@ -111,6 +117,9 @@ public function testAddTotalAmount($initialAmount, $delta, $updatedAmount)
         $this->assertEquals($updatedAmount, $this->model->getTotalAmount($code));
     }
 
+    /**
+     * @return array
+     */
     public function addTotalAmountDataProvider()
     {
         return [
@@ -142,6 +151,9 @@ public function testAddBaseTotalAmount($initialAmount, $delta, $updatedAmount)
         $this->assertEquals($updatedAmount, $this->model->getBaseTotalAmount($code));
     }
 
+    /**
+     * @return array
+     */
     public function addBaseTotalAmountDataProvider()
     {
         return [
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
index 3229fecb46837..c1c131260f17a 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Quote\Test\Unit\Model\Quote;
 
 use Magento\Directory\Model\Currency;
-use \Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\CollectionFactory as RateCollectionFactory;
 use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\Collection as RatesCollection;
@@ -26,6 +26,7 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Quote\Model\Quote\Address\RateResult\AbstractResult;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Test class for sales quote address model
@@ -121,7 +122,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config::class);
-        $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializer = new Json();
 
         $this->requestFactory = $this->getMockBuilder(RateRequestFactory::class)
             ->disableOriginalConstructor()
@@ -193,7 +194,7 @@ protected function setUp()
         $this->address->setQuote($this->quote);
     }
 
-    public function testValidateMiniumumAmountDisabled()
+    public function testValidateMinimumAmountDisabled()
     {
         $storeId = 1;
 
@@ -209,7 +210,7 @@ public function testValidateMiniumumAmountDisabled()
         $this->assertTrue($this->address->validateMinimumAmount());
     }
 
-    public function testValidateMiniumumAmountVirtual()
+    public function testValidateMinimumAmountVirtual()
     {
         $storeId = 1;
         $scopeConfigValues = [
@@ -233,7 +234,7 @@ public function testValidateMiniumumAmountVirtual()
         $this->assertTrue($this->address->validateMinimumAmount());
     }
 
-    public function testValidateMiniumumAmount()
+    public function testValidateMinimumAmount()
     {
         $storeId = 1;
         $scopeConfigValues = [
@@ -256,7 +257,7 @@ public function testValidateMiniumumAmount()
         $this->assertTrue($this->address->validateMinimumAmount());
     }
 
-    public function testValidateMiniumumAmountNegative()
+    public function testValidateMinimumAmountNegative()
     {
         $storeId = 1;
         $scopeConfigValues = [
@@ -283,20 +284,17 @@ public function testValidateMiniumumAmountNegative()
     public function testSetAndGetAppliedTaxes()
     {
         $data = ['data'];
-        $result = json_encode($data);
-
-        $this->serializer->expects($this->once())
-            ->method('serialize')
-            ->with($data)
-            ->willReturn($result);
-
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->with($result)
-            ->willReturn($data);
+        self::assertInstanceOf(Address::class, $this->address->setAppliedTaxes($data));
+        self::assertEquals($data, $this->address->getAppliedTaxes());
+    }
 
-        $this->assertInstanceOf(\Magento\Quote\Model\Quote\Address::class, $this->address->setAppliedTaxes($data));
-        $this->assertEquals($data, $this->address->getAppliedTaxes());
+    /**
+     * Checks a case, when applied taxes are not provided.
+     */
+    public function testGetAppliedTaxesWithEmptyValue()
+    {
+        $this->address->setData('applied_taxes', null);
+        self::assertEquals([], $this->address->getAppliedTaxes());
     }
 
     /**
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
index a73a241922a9c..8be4479598907 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RelatedProductsTest.php
@@ -61,6 +61,9 @@ public function testGetRelatedProductIds($optionValue, $productId, $expectedResu
      *
      * @return array
      */
+    /**
+     * @return array
+     */
     public function getRelatedProductIdsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php
index e329a15c5a7f4..4ecd8b021d7f0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php
@@ -145,7 +145,7 @@ public function testSave()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Cart 11 doesn't contain item  5
+     * @expectedExceptionMessage The 11 Cart doesn't contain the 5 item.
      */
     public function testDeleteWithInvalidQuoteItem()
     {
@@ -163,7 +163,7 @@ public function testDeleteWithInvalidQuoteItem()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not remove item from quote
+     * @expectedExceptionMessage The item couldn't be removed from the quote.
      */
     public function testDeleteWithCouldNotSaveException()
     {
@@ -181,7 +181,7 @@ public function testDeleteWithCouldNotSaveException()
             ->method('removeItem')
             ->with($itemId)
             ->willReturn($this->quoteMock);
-        $exceptionMessage = 'Could not remove item from quote';
+        $exceptionMessage = "The item couldn't be removed from the quote.";
         $exception = new \Magento\Framework\Exception\CouldNotSaveException(__($exceptionMessage));
         $this->quoteRepositoryMock->expects($this->once())
             ->method('save')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
index 03c3e32c20cb9..8e6a3723caa7c 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
@@ -67,7 +67,7 @@ protected function setUp()
                 'addOption',
                 'setCustomPrice',
                 'setOriginalCustomPrice',
-                'unsetData',
+                'setData',
                 'hasData',
                 'setIsQtyDecimal'
             ]);
@@ -92,7 +92,7 @@ protected function setUp()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @ExceptedExceptionMessage The qty value is required to update quote item.
+     * @expectedExceptionMessage The qty value is required to update quote item.
      */
     public function testUpdateNoQty()
     {
@@ -130,6 +130,9 @@ public function testUpdateNotQtyDecimal($qty, $expectedQty)
         $this->assertEquals($result, $this->object);
     }
 
+    /**
+     * @return array
+     */
     public function qtyProvider()
     {
         return [
@@ -142,6 +145,9 @@ public function qtyProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function qtyProviderDecimal()
     {
         return [
@@ -295,7 +301,7 @@ public function testUpdateUnsetCustomPrice()
                 'setProduct',
                 'getData',
                 'unsetData',
-                'hasData'
+                'hasData',
             ]);
         $buyRequestMock->expects($this->never())->method('setCustomPrice');
         $buyRequestMock->expects($this->once())->method('getData')->will($this->returnValue([]));
@@ -347,7 +353,11 @@ public function testUpdateUnsetCustomPrice()
             ->will($this->returnValue($buyRequestMock));
 
         $this->itemMock->expects($this->exactly(2))
-            ->method('unsetData');
+            ->method('setData')
+            ->withConsecutive(
+                ['custom_price', null],
+                ['original_custom_price', null]
+            );
 
         $this->itemMock->expects($this->once())
             ->method('hasData')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
index 9f1f849a7cfa8..ef529f643d6d4 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
@@ -847,10 +847,26 @@ public function testSetOptionsWithNull()
         $this->assertEquals($this->model, $this->model->setOptions(null));
     }
 
+    /**
+     * @param $optionCode
+     * @param array $optionData
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function createOptionMock($optionCode, $optionData = [])
     {
         $optionMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item\Option::class)
-            ->setMethods(['setData', 'setItem', 'getCode', '__wakeup', 'isDeleted', 'getValue', 'getProduct'])
+            ->setMethods([
+                'setData',
+                'setItem',
+                'getItem',
+                'getCode',
+                '__wakeup',
+                'isDeleted',
+                'delete',
+                'getValue',
+                'getProduct',
+                'save'
+            ])
             ->disableOriginalConstructor()
             ->getMock();
         $optionMock->expects($this->any())
@@ -1189,4 +1205,33 @@ public function testRemoveErrorInfosByParamsAllErrorsRemoved()
         $this->assertFalse($this->model->getHasError());
         $this->assertEquals('', $this->model->getMessage());
     }
+
+    /**
+     * Test method \Magento\Quote\Model\Quote\Item::saveItemOptions
+     */
+    public function testSaveItemOptions()
+    {
+        $optionMockDeleted = $this->createOptionMock(100);
+        $optionMockDeleted->expects(self::once())->method('isDeleted')->willReturn(true);
+        $optionMockDeleted->expects(self::once())->method('delete');
+
+        $optionMock1 = $this->createOptionMock(200);
+        $optionMock1->expects(self::once())->method('isDeleted')->willReturn(false);
+        $quoteItemMock1 = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getId']);
+        $quoteItemMock1->expects(self::once())->method('getId')->willReturn(null);
+        $optionMock1->expects(self::exactly(2))->method('getItem')->willReturn($quoteItemMock1);
+        $optionMock1->expects(self::exactly(2))->method('setItem')->with($this->model);
+        $optionMock1->expects(self::once())->method('save');
+
+        $optionMock2 = $this->createOptionMock(300);
+        $optionMock2->expects(self::once())->method('isDeleted')->willReturn(false);
+        $quoteItemMock2 = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getId']);
+        $quoteItemMock2->expects(self::once())->method('getId')->willReturn(11);
+        $optionMock2->expects(self::exactly(2))->method('getItem')->willReturn($quoteItemMock2);
+        $optionMock2->expects(self::once())->method('setItem')->with($this->model);
+        $optionMock2->expects(self::once())->method('save');
+
+        $this->model->setOptions([$optionMockDeleted, $optionMock1, $optionMock2]);
+        $this->model->saveItemOptions();
+    }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
index 64204ea1fb93d..272a4e3a4ba49 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
@@ -26,19 +26,27 @@ class ValidationMessageTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
+     * @deprecated since 101.0.0
      */
     private $currencyMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $priceHelperMock;
+
     protected function setUp()
     {
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->currencyMock = $this->createMock(\Magento\Framework\Locale\CurrencyInterface::class);
+        $this->priceHelperMock = $this->createMock(\Magento\Framework\Pricing\Helper\Data::class);
 
         $this->model = new \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage(
             $this->scopeConfigMock,
             $this->storeManagerMock,
-            $this->currencyMock
+            $this->currencyMock,
+            $this->priceHelperMock
         );
     }
 
@@ -46,8 +54,6 @@ public function testGetMessage()
     {
         $minimumAmount = 20;
         $minimumAmountCurrency = '$20';
-        $currencyCode = 'currency_code';
-
         $this->scopeConfigMock->expects($this->at(0))
             ->method('getValue')
             ->with('sales/minimum_order/description', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
@@ -58,27 +64,13 @@ public function testGetMessage()
             ->with('sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->willReturn($minimumAmount);
 
-        $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getCurrentCurrencyCode']);
-        $storeMock->expects($this->once())->method('getCurrentCurrencyCode')->willReturn($currencyCode);
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $this->priceHelperMock->expects($this->once())
+            ->method('currency')
+            ->with($minimumAmount, true, false)
+            ->will($this->returnValue($minimumAmountCurrency));
 
-        $currencyMock = $this->createMock(\Magento\Framework\Currency::class);
-        $this->currencyMock->expects($this->once())
-            ->method('getCurrency')
-            ->with($currencyCode)
-            ->willReturn($currencyMock);
-
-        $currencyMock->expects($this->once())
-            ->method('toCurrency')
-            ->with($minimumAmount)
-            ->willReturn($minimumAmountCurrency);
-
-        $this->assertEquals(
-            __('Minimum order amount is %1', $minimumAmountCurrency),
-            $this->model->getMessage()
-        );
+        $this->assertEquals(__('Minimum order amount is %1', $minimumAmountCurrency), $this->model->getMessage());
     }
-
     public function testGetConfigMessage()
     {
         $configMessage = 'config_message';
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index fb4fe954de94c..72e516e35cd6e 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -188,6 +188,7 @@ protected function setUp()
                 'setCustomerGroupId',
                 'assignCustomer',
                 'getPayment',
+                'collectTotals'
             ]);
 
         $this->quoteAddressFactory = $this->createPartialMock(
@@ -246,11 +247,15 @@ public function testCreateEmptyCartAnonymous()
         $quoteId = 2311;
 
         $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-
-        $quoteAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $quoteAddress = $this->createPartialMock(
+            \Magento\Quote\Model\Quote\Address::class,
+            ['setCollectShippingRates']
+        );
+        $quoteAddress->expects($this->once())->method('setCollectShippingRates')->with(true);
 
         $quoteMock->expects($this->any())->method('setBillingAddress')->with($quoteAddress)->willReturnSelf();
         $quoteMock->expects($this->any())->method('setShippingAddress')->with($quoteAddress)->willReturnSelf();
+        $quoteMock->expects($this->any())->method('getShippingAddress')->willReturn($quoteAddress);
 
         $this->quoteAddressFactory->expects($this->any())->method('create')->willReturn($quoteAddress);
 
@@ -316,7 +321,7 @@ public function testCreateEmptyCartForCustomerReturnExistsQuote()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot assign customer to the given cart. The cart belongs to different store
+     * @expectedExceptionMessage The customer can't be assigned to the cart. The cart belongs to a different store.
      */
     public function testAssignCustomerFromAnotherStore()
     {
@@ -360,7 +365,7 @@ public function testAssignCustomerFromAnotherStore()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot assign customer to the given cart. The cart is not anonymous.
+     * @expectedExceptionMessage The customer can't be assigned to the cart because the cart isn't anonymous.
      */
     public function testAssignCustomerToNonanonymousCart()
     {
@@ -409,7 +414,6 @@ public function testAssignCustomerToNonanonymousCart()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cannot assign customer to the given cart. Customer already has active cart.
      */
     public function testAssignCustomerNoSuchCustomer()
     {
@@ -459,6 +463,10 @@ public function testAssignCustomerNoSuchCustomer()
             ->with($customerId);
 
         $this->model->assignCustomer($cartId, $customerId, $storeId);
+
+        $this->expectExceptionMessage(
+            "The customer can't be assigned to the cart because the customer already has an active cart."
+        );
     }
 
     public function testAssignCustomer()
@@ -680,6 +688,7 @@ public function testPlaceOrderIfCustomerIsGuest()
         $service->expects($this->once())->method('submit')->willReturn($orderMock);
 
         $this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
+        $this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
 
         $orderMock->expects($this->atLeastOnce())->method('getId')->willReturn($orderId);
         $orderMock->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($orderIncrementId);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
index f330ebda17317..043e04319362d 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Test\Unit\Model\QuoteRepository\Plugin;
 
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Quote\Model\ChangeQuoteControl;
 use Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl;
 use Magento\Quote\Model\Quote;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -34,6 +36,11 @@ class AccessChangeQuoteControlTest extends \PHPUnit\Framework\TestCase
      */
     private $quoteRepositoryMock;
 
+    /**
+     * @var ChangeQuoteControl|MockObject
+     */
+    private $changeQuoteControlMock;
+
     protected function setUp()
     {
         $this->userContextMock = $this->getMockBuilder(UserContextInterface::class)
@@ -50,15 +57,19 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->changeQuoteControlMock = $this->getMockBuilder(ChangeQuoteControl::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectManagerHelper = new ObjectManager($this);
         $this->accessChangeQuoteControl = $objectManagerHelper->getObject(
             AccessChangeQuoteControl::class,
-            ['userContext' => $this->userContextMock]
+            ['changeQuoteControl' => $this->changeQuoteControlMock]
         );
     }
 
     /**
-     * User with role Customer and customer_id much with context user_id.
+     * User with role Customer and customer_id matches context user_id.
      */
     public function testBeforeSaveForCustomer()
     {
@@ -68,6 +79,9 @@ public function testBeforeSaveForCustomer()
         $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER);
 
+        $this->changeQuoteControlMock->method('isAllowed')
+            ->willReturn(true);
+
         $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
 
         $this->assertNull($result);
@@ -81,11 +95,15 @@ public function testBeforeSaveForCustomer()
      */
     public function testBeforeSaveException()
     {
-        $this->userContextMock->method('getUserType')
-            ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER);
         $this->quoteMock->method('getCustomerId')
             ->willReturn(2);
 
+        $this->userContextMock->method('getUserType')
+            ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER);
+
+        $this->changeQuoteControlMock->method('isAllowed')
+            ->willReturn(false);
+
         $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
@@ -100,6 +118,9 @@ public function testBeforeSaveForAdmin()
         $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_ADMIN);
 
+        $this->changeQuoteControlMock->method('isAllowed')
+            ->willReturn(true);
+
         $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
 
         $this->assertNull($result);
@@ -116,6 +137,9 @@ public function testBeforeSaveForGuest()
         $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_GUEST);
 
+        $this->changeQuoteControlMock->method('isAllowed')
+            ->willReturn(true);
+
         $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
 
         $this->assertNull($result);
@@ -135,6 +159,9 @@ public function testBeforeSaveForGuestException()
         $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_GUEST);
 
+        $this->changeQuoteControlMock->method('isAllowed')
+            ->willReturn(false);
+
         $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
@@ -152,6 +179,9 @@ public function testBeforeSaveForUnknownUserTypeException()
         $this->userContextMock->method('getUserType')
             ->willReturn(10);
 
+        $this->changeQuoteControlMock->method('isAllowed')
+            ->willReturn(false);
+
         $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index d9f53d16f1447..22785f051dcfa 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -145,6 +145,11 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
      */
     private $itemProcessor;
 
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderIncrementIdChecker;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -256,6 +261,7 @@ protected function setUp()
             \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
             ['create']
         );
+        $this->orderIncrementIdChecker = $this->createMock(\Magento\Sales\Model\OrderIncrementIdChecker::class);
         $this->quote = (new ObjectManager($this))
             ->getObject(
                 \Magento\Quote\Model\Quote::class,
@@ -280,9 +286,10 @@ protected function setUp()
                     'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
                     'customerDataFactory' => $this->customerDataFactoryMock,
                     'itemProcessor' => $this->itemProcessor,
+                    'orderIncrementIdChecker' => $this->orderIncrementIdChecker,
                     'data' => [
-                        'reserved_order_id' => 1000001
-                    ]
+                        'reserved_order_id' => 1000001,
+                    ],
                 ]
             );
     }
@@ -632,6 +639,9 @@ public function testGetAddressById($addressId, $expected)
         $this->assertEquals((bool)$expected, (bool)$result);
     }
 
+    /**
+     * @return array
+     */
     public static function dataProviderGetAddress()
     {
         return [
@@ -673,6 +683,9 @@ public function testGetAddressByCustomerAddressId($isDeleted, $customerAddressId
         $this->assertEquals((bool)$expected, (bool)$result);
     }
 
+    /**
+     * @return array
+     */
     public static function dataProviderGetAddressByCustomer()
     {
         return [
@@ -719,6 +732,9 @@ public function testGetShippingAddressByCustomerAddressId($isDeleted, $addressTy
         $this->assertEquals($expected, (bool)$result);
     }
 
+    /**
+     * @return array
+     */
     public static function dataProviderShippingAddress()
     {
         return [
@@ -950,7 +966,7 @@ public function testAddProductItemNew()
         $this->assertEquals($expectedResult, $result);
     }
 
-    public function testValidateMiniumumAmount()
+    public function testValidateMinimumAmount()
     {
         $storeId = 1;
         $this->quote->setStoreId($storeId);
@@ -976,7 +992,7 @@ public function testValidateMiniumumAmount()
         $this->assertTrue($this->quote->validateMinimumAmount());
     }
 
-    public function testValidateMiniumumAmountNegative()
+    public function testValidateMinimumAmountNegative()
     {
         $storeId = 1;
         $this->quote->setStoreId($storeId);
@@ -1222,28 +1238,32 @@ public function testGetAllItems()
     }
 
     /**
-     * Test to verify if existing reserved_order_id in use
+     * Test to verify if existing reserved_order_id in use.
      *
      * @param bool $isReservedOrderIdExist
      * @param int $reservedOrderId
+     * @return void
      * @dataProvider reservedOrderIdDataProvider
      */
-    public function testReserveOrderId($isReservedOrderIdExist, $reservedOrderId)
+    public function testReserveOrderId(bool $isReservedOrderIdExist, int $reservedOrderId): void
     {
-        $this->resourceMock
+        $this->orderIncrementIdChecker
             ->expects($this->once())
-            ->method('isOrderIncrementIdUsed')
+            ->method('isIncrementIdUsed')
             ->with(1000001)->willReturn($isReservedOrderIdExist);
         $this->resourceMock->expects($this->any())->method('getReservedOrderId')->willReturn($reservedOrderId);
         $this->quote->reserveOrderId();
         $this->assertEquals($reservedOrderId, $this->quote->getReservedOrderId());
     }
 
-    public function reservedOrderIdDataProvider()
+    /**
+     * @return array
+     */
+    public function reservedOrderIdDataProvider(): array
     {
         return [
             'id_already_in_use' => [true, 100002],
-            'id_not_in_use' => [false, 1000001]
+            'id_not_in_use' => [false, 1000001],
         ];
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php
index bd53e44afe9db..d0a3c9fab5131 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Test\Unit\Model;
 
 use Magento\Directory\Model\AllowedCountries;
@@ -87,182 +88,4 @@ public function testCheckQuoteAmountExistingError()
             $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER + 1)
         );
     }
-
-    public function testCheckQuoteAmountAmountLessThanAvailable()
-    {
-        $this->quoteMock->expects($this->once())
-            ->method('getHasError')
-            ->will($this->returnValue(false));
-
-        $this->quoteMock->expects($this->never())
-            ->method('setHasError');
-
-        $this->quoteMock->expects($this->never())
-            ->method('addMessage');
-
-        $this->assertSame(
-            $this->quoteValidator,
-            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER - 1)
-        );
-    }
-
-    public function testCheckQuoteAmountAmountGreaterThanAvailable()
-    {
-        $this->quoteMock->expects($this->once())
-            ->method('getHasError')
-            ->will($this->returnValue(false));
-
-        $this->quoteMock->expects($this->once())
-            ->method('setHasError')
-            ->with(true);
-
-        $this->quoteMock->expects($this->once())
-            ->method('addMessage')
-            ->with(__('This item price or quantity is not valid for checkout.'));
-
-        $this->assertSame(
-            $this->quoteValidator,
-            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER + 1)
-        );
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please check the shipping address information.
-     */
-    public function testValidateBeforeSubmitThrowsExceptionIfShippingAddressIsInvalid()
-    {
-        $shippingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $this->quoteMock->expects($this->any())->method('getShippingAddress')->willReturn($shippingAddressMock);
-        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(false);
-        $shippingAddressMock->expects($this->any())->method('validate')->willReturn(['Invalid Shipping Address']);
-
-        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please specify a shipping method.
-     */
-    public function testValidateBeforeSubmitThrowsExceptionIfShippingRateIsNotSelected()
-    {
-        $shippingMethod = 'checkmo';
-        $shippingAddressMock = $this->getMockBuilder(Address::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->allowedCountryReader->method('getAllowedCountries')
-            ->willReturn(['US' => 'US']);
-
-        $this->quoteMock->expects($this->any())->method('getShippingAddress')->willReturn($shippingAddressMock);
-        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(false);
-        $shippingAddressMock->expects($this->any())->method('validate')->willReturn(true);
-        $shippingAddressMock->method('getCountryId')
-            ->willReturn('US');
-        $shippingAddressMock->expects($this->any())->method('getShippingMethod')->willReturn($shippingMethod);
-        $shippingAddressMock->expects($this->once())->method('getShippingRateByCode')->with($shippingMethod);
-
-        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please check the billing address information.
-     */
-    public function testValidateBeforeSubmitThrowsExceptionIfBillingAddressIsNotValid()
-    {
-        $billingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $this->quoteMock->expects($this->any())->method('getBillingAddress')->willReturn($billingAddressMock);
-        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(true);
-        $billingAddressMock->expects($this->any())->method('validate')->willReturn(['Invalid Billing Address']);
-
-        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please select a valid payment method.
-     */
-    public function testValidateBeforeSubmitThrowsExceptionIfPaymentMethodIsNotSelected()
-    {
-        $paymentMock = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
-        $billingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $billingAddressMock->expects($this->any())->method('validate')->willReturn(true);
-
-        $this->quoteMock->expects($this->any())->method('getBillingAddress')->willReturn($billingAddressMock);
-        $this->quoteMock->expects($this->any())->method('getPayment')->willReturn($paymentMock);
-        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(true);
-
-        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Minimum Order Amount Exceeded.
-     */
-    public function testValidateBeforeSubmitThrowsExceptionIfMinimumOrderAmount()
-    {
-        $paymentMock = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
-        $paymentMock->expects($this->once())->method('getMethod')->willReturn('checkmo');
-
-        $billingAddressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $billingAddressMock->expects($this->any())->method('validate')->willReturn(true);
-
-        $this->quoteMock->expects($this->any())->method('getBillingAddress')->willReturn($billingAddressMock);
-        $this->quoteMock->expects($this->any())->method('getPayment')->willReturn($paymentMock);
-        $this->quoteMock->expects($this->any())->method('isVirtual')->willReturn(true);
-
-        $this->quoteMock->expects($this->any())->method('getIsMultiShipping')->willReturn(false);
-        $this->quoteMock->expects($this->any())->method('validateMinimumAmount')->willReturn(false);
-
-        $this->orderAmountValidationMessage->expects($this->once())->method('getMessage')
-            ->willReturn(__("Minimum Order Amount Exceeded."));
-
-        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
-    }
-
-    /**
-     * Test case when country id not present in allowed countries list.
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Some addresses cannot be used due to country-specific configurations.
-     */
-    public function testValidateBeforeSubmitThrowsExceptionIfCountrySpecificConfigurations()
-    {
-        $this->allowedCountryReader->method('getAllowedCountries')
-            ->willReturn(['EE' => 'EE']);
-
-        $addressMock = $this->getMockBuilder(Address::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $addressMock->method('validate')
-            ->willReturn(true);
-        $addressMock->method('getCountryId')
-            ->willReturn('EU');
-
-        $paymentMock = $this->getMockBuilder(Payment::class)
-            ->setMethods(['getMethod'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $paymentMock->method('getMethod')
-            ->willReturn(true);
-
-        $billingAddressMock = $this->getMockBuilder(Address::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['validate'])
-            ->getMock();
-        $billingAddressMock->method('validate')
-            ->willReturn(true);
-
-        $this->quoteMock->method('getShippingAddress')
-            ->willReturn($addressMock);
-        $this->quoteMock->method('isVirtual')
-            ->willReturn(false);
-        $this->quoteMock->method('getBillingAddress')
-            ->willReturn($billingAddressMock);
-        $this->quoteMock->method('getPayment')
-            ->willReturn($paymentMock);
-
-        $this->quoteValidator->validateBeforeSubmit($this->quoteMock);
-    }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
index a6f34fb10bccd..7136e8260a880 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
@@ -6,79 +6,86 @@
 
 namespace Magento\Quote\Test\Unit\Model\ResourceModel;
 
+use Magento\Framework\DB\Sequence\SequenceInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesSequence\Model\Manager;
+
+/**
+ * Unit test for \Magento\Quote\Model\ResourceModel\Quote.
+ */
 class QuoteTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $model;
+    private $quoteMock;
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $resourceMock;
+    private $sequenceManagerMock;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\Pdo\Mysql
+     * @var SequenceInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $adapterMock;
+    private $sequenceMock;
 
     /**
-     * @var \Magento\Framework\DB\Select
+     * @var QuoteResource
      */
-    private $selectMock;
+    private $model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
-        $this->selectMock->expects($this->any())->method('where');
-
-        $this->adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
-
-        $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resourceMock->expects(
-            $this->any()
-        )->method(
-            'getConnection'
-        )->will(
-            $this->returnValue($this->adapterMock)
-        );
-
+        $objectManagerHelper = new ObjectManager($this);
+        $this->quoteMock = $this->createMock(Quote::class);
+        $this->sequenceManagerMock = $this->createMock(Manager::class);
+        $this->sequenceMock = $this->createMock(SequenceInterface::class);
         $this->model = $objectManagerHelper->getObject(
-            \Magento\Quote\Model\ResourceModel\Quote::class,
+            QuoteResource::class,
             [
-                'resource' => $this->resourceMock
+                'sequenceManager' => $this->sequenceManagerMock,
             ]
         );
     }
 
     /**
-     * Unit test to verify if isOrderIncrementIdUsed method works with different types increment ids
-     *
-     * @param array $value
-     * @dataProvider isOrderIncrementIdUsedDataProvider
+     * @param string $entityType
+     * @param int $storeId
+     * @param string $reservedOrderId
+     * @return void
+     * @dataProvider getReservedOrderIdDataProvider
      */
-    public function testIsOrderIncrementIdUsed($value)
+    public function testGetReservedOrderId(string $entityType, int $storeId, string $reservedOrderId): void
     {
-        $expectedBind = [':increment_id' => $value];
-        $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
-        $this->model->isOrderIncrementIdUsed($value);
+        $this->sequenceManagerMock->expects($this->once())
+            ->method('getSequence')
+            ->with($entityType, $storeId)
+            ->willReturn($this->sequenceMock);
+        $this->quoteMock->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $this->sequenceMock->expects($this->once())
+            ->method('getNextValue')
+            ->willReturn($reservedOrderId);
+
+        $this->assertEquals($reservedOrderId, $this->model->getReservedOrderId($this->quoteMock));
     }
 
     /**
      * @return array
      */
-    public function isOrderIncrementIdUsedDataProvider()
+    public function getReservedOrderIdDataProvider(): array
     {
-        return [[100000001], ['10000000001'], ['M10000000001']];
+        return [
+            [\Magento\Sales\Model\Order::ENTITY, 1, '1000000001'],
+            [\Magento\Sales\Model\Order::ENTITY, 2, '2000000001'],
+            [\Magento\Sales\Model\Order::ENTITY, 3, '3000000001'],
+        ];
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
index c3afd3f053271..89fea2bec73a8 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
@@ -102,7 +102,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expected ExceptionMessage error345
+     * @expectedExceptionMessage error345
      */
     public function testSetAddressValidationFailed()
     {
@@ -173,7 +173,7 @@ public function testSetAddress()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Cart contains virtual product(s) only. Shipping address is not applicable
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
     public function testSetAddressForVirtualProduct()
     {
@@ -195,12 +195,12 @@ public function testSetAddressForVirtualProduct()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Unable to save address. Please check input data.
+     * @expectedExceptionMessage The address failed to save. Verify the address and try again.
      */
     public function testSetAddressWithInabilityToSaveQuote()
     {
         $this->quoteAddressMock->expects($this->once())->method('save')->willThrowException(
-            new \Exception('Unable to save address. Please check input data.')
+            new \Exception('The address failed to save. Verify the address and try again.')
         );
 
         $customerAddressId = 150;
@@ -265,7 +265,7 @@ public function testGetAddress()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Cart contains virtual product(s) only. Shipping address is not applicable
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
     public function testGetAddressOfQuoteWithVirtualProducts()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
index af68dcc30a50f..34d7707d31666 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
@@ -15,7 +15,9 @@
 use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Quote\Model\Quote\TotalsCollector;
 use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Model\ResourceModel\Quote\Address as QuoteAddressResource;
 use Magento\Quote\Model\ShippingMethodManagement;
+use Magento\Store\Model\Store;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -83,6 +85,16 @@ class ShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $totalsCollector;
 
+    /**
+     * @var Store|MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var QuoteAddressResource|MockObject
+     */
+    private $quoteAddressResource;
+
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -98,7 +110,8 @@ protected function setUp()
         $className = \Magento\Framework\Reflection\DataObjectProcessor::class;
         $this->dataProcessor = $this->createMock($className);
 
-        $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+        $this->quoteAddressResource = $this->createMock(QuoteAddressResource::class);
+        $this->storeMock = $this->createMock(Store::class);
         $this->quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods([
@@ -150,6 +163,7 @@ protected function setUp()
                 'converter' => $this->converter,
                 'totalsCollector' => $this->totalsCollector,
                 'addressRepository' => $this->addressRepository,
+                'quoteAddressResource' => $this->quoteAddressResource,
             ]
         );
 
@@ -168,7 +182,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Shipping address not set.
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testGetMethodWhenShippingAddressIsNotSet()
     {
@@ -257,7 +271,7 @@ public function testGetListForEmptyCart()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Shipping address not set.
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testGetListWhenShippingAddressIsNotSet()
     {
@@ -307,7 +321,7 @@ public function testGetList()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Shipping method is not applicable for empty cart
+     * @expectedExceptionMessage The shipping method can't be set for an empty cart. Add an item to cart and try again.
      */
     public function testSetMethodWithInputException()
     {
@@ -326,7 +340,7 @@ public function testSetMethodWithInputException()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Cart contains virtual product(s) only. Shipping method is not applicable.
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
     public function testSetMethodWithVirtualProduct()
     {
@@ -346,7 +360,7 @@ public function testSetMethodWithVirtualProduct()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Shipping address is not set
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetMethodWithoutShippingAddress()
     {
@@ -362,13 +376,14 @@ public function testSetMethodWithoutShippingAddress()
         $this->quote->expects($this->once())
             ->method('getShippingAddress')->will($this->returnValue($this->shippingAddress));
         $this->shippingAddress->expects($this->once())->method('getCountryId')->will($this->returnValue(null));
+        $this->quoteAddressResource->expects($this->once())->method('delete')->with($this->shippingAddress);
 
         $this->model->set($cartId, $carrierCode, $methodCode);
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Cannot set shipping method. Custom Error
+     * @expectedExceptionMessage The shipping method can't be set. Custom Error
      */
     public function testSetMethodWithCouldNotSaveException()
     {
@@ -404,7 +419,7 @@ public function testSetMethodWithCouldNotSaveException()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Shipping address is not set
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetMethodWithoutAddress()
     {
@@ -421,6 +436,7 @@ public function testSetMethodWithoutAddress()
             ->method('getShippingAddress')
             ->willReturn($this->shippingAddress);
         $this->shippingAddress->expects($this->once())->method('getCountryId');
+        $this->quoteAddressResource->expects($this->once())->method('delete')->with($this->shippingAddress);
 
         $this->model->set($cartId, $carrierCode, $methodCode);
     }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php b/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php
index bc47a04a226e1..b533463d689a8 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php
@@ -67,6 +67,9 @@ public function testGetOverriddenValueIsCustomerAndCartExists()
         $this->assertSame($retValue, $this->model->getOverriddenValue());
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testGetOverriddenValueIsCustomerAndCartDoesNotExist()
     {
         $customerId = 1;
@@ -83,7 +86,7 @@ public function testGetOverriddenValueIsCustomerAndCartDoesNotExist()
             ->with($customerId)
             ->will($this->throwException(new NoSuchEntityException()));
 
-        $this->assertNull($this->model->getOverriddenValue());
+        $this->model->getOverriddenValue();
     }
 
     public function testGetOverriddenValueIsCustomerAndCartIsNull()
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
index 682045c0cdb25..f5ef9fed4ff84 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
@@ -157,11 +157,14 @@ public function testDispatch($isWebsiteScope, $websites)
         $this->customerQuote->execute($this->observerMock);
     }
 
+    /**
+     * @return array
+     */
     public function dispatchDataProvider()
     {
         return [
-            [true, ['website1']],
-            [true, ['website1', 'website2']],
+            [true, [['website1']]],
+            [true, [['website1'], ['website2']]],
             [false, ['website1']],
             [false, ['website1', 'website2']],
         ];
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Webapi/SubmitObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/SubmitObserverTest.php
similarity index 95%
rename from app/code/Magento/Quote/Test/Unit/Observer/Webapi/SubmitObserverTest.php
rename to app/code/Magento/Quote/Test/Unit/Observer/SubmitObserverTest.php
index 618a633fd62e0..c19606a7b8f5d 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Webapi/SubmitObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/SubmitObserverTest.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Quote\Test\Unit\Observer\Webapi;
+namespace Magento\Quote\Test\Unit\Observer;
 
 class SubmitObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Observer\Webapi\SubmitObserver
+     * @var \Magento\Quote\Observer\SubmitObserver
      */
     protected $model;
 
@@ -59,7 +59,7 @@ protected function setUp()
         $eventMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
         $eventMock->expects($this->once())->method('getOrder')->willReturn($this->orderMock);
         $this->quoteMock->expects($this->once())->method('getPayment')->willReturn($this->paymentMock);
-        $this->model = new \Magento\Quote\Observer\Webapi\SubmitObserver(
+        $this->model = new \Magento\Quote\Observer\SubmitObserver(
             $this->loggerMock,
             $this->orderSenderMock
         );
diff --git a/app/code/Magento/Quote/Test/Unit/Setup/QuoteSetupTest.php b/app/code/Magento/Quote/Test/Unit/Setup/QuoteSetupTest.php
new file mode 100644
index 0000000000000..6e143076c0b10
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Unit/Setup/QuoteSetupTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Quote\Test\Unit\Setup;
+
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Test for Quote module setup model.
+ *
+ * @package Magento\Quote\Test\Unit\Setup
+ */
+class QuoteSetupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Quote\Setup\QuoteSetup
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleDataSetupMock;
+
+    /**
+     * @var \Magento\Eav\Model\Entity\Setup\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cacheMock;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    protected function setUp()
+    {
+        $this->moduleDataSetupMock = $this->getMockBuilder(\Magento\Framework\Setup\ModuleDataSetupInterface::class)
+            ->getMockForAbstractClass();
+        $this->contextMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Setup\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cacheMock = $this->getMockBuilder(\Magento\Framework\App\CacheInterface::class)
+            ->getMockForAbstractClass();
+        $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Quote\Setup\QuoteSetup::class,
+            [
+                'setup' => $this->moduleDataSetupMock,
+                'context' => $this->contextMock,
+                'cache' => $this->cacheMock,
+                'attrGroupCollectionFactory' => $this->collectionFactoryMock,
+                'config' => $this->scopeConfigMock
+            ]
+        );
+    }
+
+    public function testGetConnection()
+    {
+        $this->moduleDataSetupMock->expects($this->once())
+            ->method('getConnection')
+            ->with('checkout');
+        $this->model->getConnection();
+    }
+}
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 760c4267ddd9d..0281c75507f54 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -5,28 +5,27 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-sales-sequence": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-payment": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.3.*"
+        "magento/module-webapi": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Quote/etc/adminhtml/di.xml b/app/code/Magento/Quote/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..08e87c7db9ec7
--- /dev/null
+++ b/app/code/Magento/Quote/etc/adminhtml/di.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Quote\Model\ValidationRules\QuoteValidationComposite">
+        <arguments>
+            <argument name="validationRules" xsi:type="array">
+                <item name="ShippingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingAddressValidationRule</item>
+                <item name="AllowedCountryValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\AllowedCountryValidationRule</item>
+                <item name="ShippingMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule</item>
+                <item name="BillingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\BillingAddressValidationRule</item>
+                <item name="PaymentMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\PaymentMethodValidationRule</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
new file mode 100644
index 0000000000000..7dd215b87e8cc
--- /dev/null
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -0,0 +1,508 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="quote" resource="checkout" engine="innodb" comment="Sales Flat Quote">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"/>
+        <column xsi:type="timestamp" name="converted_at" on_update="false" nullable="true" comment="Converted At"/>
+        <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="true" identity="false"
+                default="1" comment="Is Active"/>
+        <column xsi:type="smallint" name="is_virtual" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Is Virtual"/>
+        <column xsi:type="smallint" name="is_multi_shipping" padding="5" unsigned="true" nullable="true"
+                identity="false" default="0" comment="Is Multi Shipping"/>
+        <column xsi:type="int" name="items_count" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Items Count"/>
+        <column xsi:type="decimal" name="items_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Items Qty"/>
+        <column xsi:type="int" name="orig_order_id" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Orig Order Id"/>
+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Store To Base Rate"/>
+        <column xsi:type="decimal" name="store_to_quote_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Store To Quote Rate"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="255" comment="Base Currency Code"/>
+        <column xsi:type="varchar" name="store_currency_code" nullable="true" length="255"
+                comment="Store Currency Code"/>
+        <column xsi:type="varchar" name="quote_currency_code" nullable="true" length="255"
+                comment="Quote Currency Code"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Grand Total"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Base Grand Total"/>
+        <column xsi:type="varchar" name="checkout_method" nullable="true" length="255" comment="Checkout Method"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="int" name="customer_tax_class_id" padding="10" unsigned="true" nullable="true"
+                identity="false" comment="Customer Tax Class Id"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Customer Group Id"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="255" comment="Customer Email"/>
+        <column xsi:type="varchar" name="customer_prefix" nullable="true" length="40" comment="Customer Prefix"/>
+        <column xsi:type="varchar" name="customer_firstname" nullable="true" length="255" comment="Customer Firstname"/>
+        <column xsi:type="varchar" name="customer_middlename" nullable="true" length="40"
+                comment="Customer Middlename"/>
+        <column xsi:type="varchar" name="customer_lastname" nullable="true" length="255" comment="Customer Lastname"/>
+        <column xsi:type="varchar" name="customer_suffix" nullable="true" length="40" comment="Customer Suffix"/>
+        <column xsi:type="datetime" name="customer_dob" on_update="false" nullable="true" comment="Customer Dob"/>
+        <column xsi:type="varchar" name="customer_note" nullable="true" length="255" comment="Customer Note"/>
+        <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
+                identity="false" default="1" comment="Customer Note Notify"/>
+        <column xsi:type="smallint" name="customer_is_guest" padding="5" unsigned="true" nullable="true"
+                identity="false" default="0" comment="Customer Is Guest"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
+        <column xsi:type="varchar" name="applied_rule_ids" nullable="true" length="255" comment="Applied Rule Ids"/>
+        <column xsi:type="varchar" name="reserved_order_id" nullable="true" length="64" comment="Reserved Order Id"/>
+        <column xsi:type="varchar" name="password_hash" nullable="true" length="255" comment="Password Hash"/>
+        <column xsi:type="varchar" name="coupon_code" nullable="true" length="255" comment="Coupon Code"/>
+        <column xsi:type="varchar" name="global_currency_code" nullable="true" length="255"
+                comment="Global Currency Code"/>
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Global Rate"/>
+        <column xsi:type="decimal" name="base_to_quote_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Quote Rate"/>
+        <column xsi:type="varchar" name="customer_taxvat" nullable="true" length="255" comment="Customer Taxvat"/>
+        <column xsi:type="varchar" name="customer_gender" nullable="true" length="255" comment="Customer Gender"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Subtotal"/>
+        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Subtotal With Discount"/>
+        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal With Discount"/>
+        <column xsi:type="int" name="is_changed" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Is Changed"/>
+        <column xsi:type="smallint" name="trigger_recollect" padding="6" unsigned="false" nullable="false"
+                identity="false" default="0" comment="Trigger Recollect"/>
+        <column xsi:type="text" name="ext_shipping_info" nullable="true" comment="Ext Shipping Info"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_STORE_ID_STORE_STORE_ID" table="quote" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_CUSTOMER_ID_STORE_ID_IS_ACTIVE" indexType="btree">
+            <column name="customer_id"/>
+            <column name="store_id"/>
+            <column name="is_active"/>
+        </index>
+        <index referenceId="QUOTE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="quote_address" resource="checkout" engine="innodb" comment="Sales Flat Quote Address">
+        <column xsi:type="int" name="address_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Address Id"/>
+        <column xsi:type="int" name="quote_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Quote Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
+                comment="Updated At"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="smallint" name="save_in_address_book" padding="6" unsigned="false" nullable="true"
+                identity="false" default="0" comment="Save In Address Book"/>
+        <column xsi:type="int" name="customer_address_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Address Id"/>
+        <column xsi:type="varchar" name="address_type" nullable="true" length="10" comment="Address Type"/>
+        <column xsi:type="varchar" name="email" nullable="true" length="255" comment="Email"/>
+        <column xsi:type="varchar" name="prefix" nullable="true" length="40" comment="Prefix"/>
+        <column xsi:type="varchar" name="firstname" nullable="true" length="255"/>
+        <column xsi:type="varchar" name="middlename" nullable="true" length="40"/>
+        <column xsi:type="varchar" name="lastname" nullable="true" length="255"/>
+        <column xsi:type="varchar" name="suffix" nullable="true" length="40" comment="Suffix"/>
+        <column xsi:type="varchar" name="company" nullable="true" length="255" comment="Company"/>
+        <column xsi:type="varchar" name="street" nullable="true" length="255" onCreate="migrateDataFrom(street)"
+                comment="Street"/>
+        <column xsi:type="varchar" name="city" nullable="true" length="255"/>
+        <column xsi:type="varchar" name="region" nullable="true" length="255"/>
+        <column xsi:type="int" name="region_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Region Id"/>
+        <column xsi:type="varchar" name="postcode" nullable="true" length="20" comment="Postcode"/>
+        <column xsi:type="varchar" name="country_id" nullable="true" length="30" comment="Country Id"/>
+        <column xsi:type="varchar" name="telephone" nullable="true" length="255"/>
+        <column xsi:type="varchar" name="fax" nullable="true" length="255"/>
+        <column xsi:type="smallint" name="same_as_billing" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Same As Billing"/>
+        <column xsi:type="smallint" name="collect_shipping_rates" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Collect Shipping Rates"/>
+        <column xsi:type="varchar" name="shipping_method" nullable="true" length="120"/>
+        <column xsi:type="varchar" name="shipping_description" nullable="true" length="255"
+                comment="Shipping Description"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Weight"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Subtotal"/>
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Subtotal"/>
+        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Subtotal With Discount"/>
+        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Base Subtotal With Discount"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Tax Amount"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Shipping Amount"/>
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Base Shipping Amount"/>
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Grand Total"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Grand Total"/>
+        <column xsi:type="text" name="customer_notes" nullable="true" comment="Customer Notes"/>
+        <column xsi:type="text" name="applied_taxes" nullable="true" comment="Applied Taxes"/>
+        <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
+                comment="Discount Description"/>
+        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Shipping Discount Amount"/>
+        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Discount Amount"/>
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Total Incl Tax"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Incl Tax"/>
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Incl Tax"/>
+        <column xsi:type="text" name="vat_id" nullable="true" comment="Vat Id"/>
+        <column xsi:type="smallint" name="vat_is_valid" padding="6" unsigned="false" nullable="true" identity="false"
+                comment="Vat Is Valid"/>
+        <column xsi:type="text" name="vat_request_id" nullable="true" comment="Vat Request Id"/>
+        <column xsi:type="text" name="vat_request_date" nullable="true" comment="Vat Request Date"/>
+        <column xsi:type="smallint" name="vat_request_success" padding="6" unsigned="false" nullable="true"
+                identity="false" comment="Vat Request Success"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="address_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_address"
+                    column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_ADDRESS_QUOTE_ID" indexType="btree">
+            <column name="quote_id"/>
+        </index>
+    </table>
+    <table name="quote_item" resource="checkout" engine="innodb" comment="Sales Flat Quote Item">
+        <column xsi:type="int" name="item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Item Id"/>
+        <column xsi:type="int" name="quote_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Quote Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
+                comment="Updated At"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="parent_item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent Item Id"/>
+        <column xsi:type="smallint" name="is_virtual" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Virtual"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="text" name="applied_rule_ids" nullable="true" comment="Applied Rule Ids"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="smallint" name="is_qty_decimal" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Qty Decimal"/>
+        <column xsi:type="smallint" name="no_discount" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="No Discount"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true" default="0"
+                comment="Weight"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Qty"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Price"/>
+        <column xsi:type="decimal" name="custom_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Custom Price"/>
+        <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Discount Percent"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Tax Percent"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Tax Amount"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Row Total"/>
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Row Total"/>
+        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Row Total With Discount"/>
+        <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Row Weight"/>
+        <column xsi:type="varchar" name="product_type" nullable="true" length="255" comment="Product Type"/>
+        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Tax Before Discount"/>
+        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Before Discount"/>
+        <column xsi:type="decimal" name="original_custom_price" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Original Custom Price"/>
+        <column xsi:type="varchar" name="redirect_url" nullable="true" length="255" comment="Redirect Url"/>
+        <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Cost"/>
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price Incl Tax"/>
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price Incl Tax"/>
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_PARENT_ITEM_ID_QUOTE_ITEM_ITEM_ID" table="quote_item"
+                    column="parent_item_id" referenceTable="quote_item" referenceColumn="item_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_item" column="quote_id"
+                    referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_STORE_ID_STORE_STORE_ID" table="quote_item" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <index referenceId="QUOTE_ITEM_PARENT_ITEM_ID" indexType="btree">
+            <column name="parent_item_id"/>
+        </index>
+        <index referenceId="QUOTE_ITEM_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="QUOTE_ITEM_QUOTE_ID" indexType="btree">
+            <column name="quote_id"/>
+        </index>
+        <index referenceId="QUOTE_ITEM_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="quote_address_item" resource="checkout" engine="innodb" comment="Sales Flat Quote Address Item">
+        <column xsi:type="int" name="address_item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Address Item Id"/>
+        <column xsi:type="int" name="parent_item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent Item Id"/>
+        <column xsi:type="int" name="quote_address_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Quote Address Id"/>
+        <column xsi:type="int" name="quote_item_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Quote Item Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
+                comment="Updated At"/>
+        <column xsi:type="text" name="applied_rule_ids" nullable="true" comment="Applied Rule Ids"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true" default="0"
+                comment="Weight"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Qty"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Tax Amount"/>
+        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Row Total"/>
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Row Total"/>
+        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Row Total With Discount"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Row Weight"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="int" name="super_product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Super Product Id"/>
+        <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent Product Id"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
+        <column xsi:type="varchar" name="image" nullable="true" length="255" comment="Image"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="int" name="is_qty_decimal" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Is Qty Decimal"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Percent"/>
+        <column xsi:type="int" name="no_discount" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="No Discount"/>
+        <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Percent"/>
+        <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price"/>
+        <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Cost"/>
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price Incl Tax"/>
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price Incl Tax"/>
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="address_item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID"
+                    table="quote_address_item" column="quote_address_id" referenceTable="quote_address"
+                    referenceColumn="address_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDR_ITEM_PARENT_ITEM_ID_QUOTE_ADDR_ITEM_ADDR_ITEM_ID"
+                    table="quote_address_item" column="parent_item_id" referenceTable="quote_address_item"
+                    referenceColumn="address_item_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
+                    table="quote_address_item" column="quote_item_id" referenceTable="quote_item"
+                    referenceColumn="item_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID" indexType="btree">
+            <column name="quote_address_id"/>
+        </index>
+        <index referenceId="QUOTE_ADDRESS_ITEM_PARENT_ITEM_ID" indexType="btree">
+            <column name="parent_item_id"/>
+        </index>
+        <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID" indexType="btree">
+            <column name="quote_item_id"/>
+        </index>
+    </table>
+    <table name="quote_item_option" resource="checkout" engine="innodb" comment="Sales Flat Quote Item Option">
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Id"/>
+        <column xsi:type="int" name="item_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Item Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
+        <column xsi:type="text" name="value" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ITEM_OPTION_ITEM_ID_QUOTE_ITEM_ITEM_ID" table="quote_item_option"
+                    column="item_id" referenceTable="quote_item" referenceColumn="item_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_ITEM_OPTION_ITEM_ID" indexType="btree">
+            <column name="item_id"/>
+        </index>
+    </table>
+    <table name="quote_payment" resource="checkout" engine="innodb" comment="Sales Flat Quote Payment">
+        <column xsi:type="int" name="payment_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Payment Id"/>
+        <column xsi:type="int" name="quote_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Quote Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
+                comment="Updated At"/>
+        <column xsi:type="varchar" name="method" nullable="true" length="255" comment="Method"/>
+        <column xsi:type="varchar" name="cc_type" nullable="true" length="255" comment="Cc Type"/>
+        <column xsi:type="varchar" name="cc_number_enc" nullable="true" length="255" comment="Cc Number Enc"/>
+        <column xsi:type="varchar" name="cc_last_4" nullable="true" length="255" comment="Cc Last 4"/>
+        <column xsi:type="varchar" name="cc_cid_enc" nullable="true" length="255" comment="Cc Cid Enc"/>
+        <column xsi:type="varchar" name="cc_owner" nullable="true" length="255" comment="Cc Owner"/>
+        <column xsi:type="varchar" name="cc_exp_month" nullable="true" length="255" comment="Cc Exp Month"/>
+        <column xsi:type="smallint" name="cc_exp_year" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Cc Exp Year"/>
+        <column xsi:type="varchar" name="cc_ss_owner" nullable="true" length="255" comment="Cc Ss Owner"/>
+        <column xsi:type="smallint" name="cc_ss_start_month" padding="5" unsigned="true" nullable="true"
+                identity="false" default="0" comment="Cc Ss Start Month"/>
+        <column xsi:type="smallint" name="cc_ss_start_year" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Cc Ss Start Year"/>
+        <column xsi:type="varchar" name="po_number" nullable="true" length="255" comment="Po Number"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="varchar" name="cc_ss_issue" nullable="true" length="255" comment="Cc Ss Issue"/>
+        <column xsi:type="text" name="additional_information" nullable="true" comment="Additional Information"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="payment_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_PAYMENT_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_payment"
+                    column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_PAYMENT_QUOTE_ID" indexType="btree">
+            <column name="quote_id"/>
+        </index>
+    </table>
+    <table name="quote_shipping_rate" resource="checkout" engine="innodb" comment="Sales Flat Quote Shipping Rate">
+        <column xsi:type="int" name="rate_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rate Id"/>
+        <column xsi:type="int" name="address_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Address Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="0"
+                comment="Updated At"/>
+        <column xsi:type="varchar" name="carrier" nullable="true" length="255" comment="Carrier"/>
+        <column xsi:type="varchar" name="carrier_title" nullable="true" length="255" comment="Carrier Title"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
+        <column xsi:type="varchar" name="method" nullable="true" length="255" comment="Method"/>
+        <column xsi:type="text" name="method_description" nullable="true" comment="Method Description"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <column xsi:type="text" name="error_message" nullable="true" comment="Error Message"/>
+        <column xsi:type="text" name="method_title" nullable="true" comment="Method Title"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rate_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_SHIPPING_RATE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID"
+                    table="quote_shipping_rate" column="address_id" referenceTable="quote_address"
+                    referenceColumn="address_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_SHIPPING_RATE_ADDRESS_ID" indexType="btree">
+            <column name="address_id"/>
+        </index>
+    </table>
+    <table name="quote_id_mask" resource="checkout" engine="innodb" comment="Quote ID and masked ID mapping">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="quote_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Quote ID"/>
+        <column xsi:type="varchar" name="masked_id" nullable="true" length="32" comment="Masked ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+            <column name="quote_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ID_MASK_QUOTE_ID_QUOTE_ENTITY_ID" table="quote_id_mask"
+                    column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="QUOTE_ID_MASK_QUOTE_ID" indexType="btree">
+            <column name="quote_id"/>
+        </index>
+        <index referenceId="QUOTE_ID_MASK_MASKED_ID" indexType="btree">
+            <column name="masked_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Quote/etc/db_schema_whitelist.json b/app/code/Magento/Quote/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..c2cc34293dcb5
--- /dev/null
+++ b/app/code/Magento/Quote/etc/db_schema_whitelist.json
@@ -0,0 +1,329 @@
+{
+    "quote": {
+        "column": {
+            "entity_id": true,
+            "store_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "converted_at": true,
+            "is_active": true,
+            "is_virtual": true,
+            "is_multi_shipping": true,
+            "items_count": true,
+            "items_qty": true,
+            "orig_order_id": true,
+            "store_to_base_rate": true,
+            "store_to_quote_rate": true,
+            "base_currency_code": true,
+            "store_currency_code": true,
+            "quote_currency_code": true,
+            "grand_total": true,
+            "base_grand_total": true,
+            "checkout_method": true,
+            "customer_id": true,
+            "customer_tax_class_id": true,
+            "customer_group_id": true,
+            "customer_email": true,
+            "customer_prefix": true,
+            "customer_firstname": true,
+            "customer_middlename": true,
+            "customer_lastname": true,
+            "customer_suffix": true,
+            "customer_dob": true,
+            "customer_note": true,
+            "customer_note_notify": true,
+            "customer_is_guest": true,
+            "remote_ip": true,
+            "applied_rule_ids": true,
+            "reserved_order_id": true,
+            "password_hash": true,
+            "coupon_code": true,
+            "global_currency_code": true,
+            "base_to_global_rate": true,
+            "base_to_quote_rate": true,
+            "customer_taxvat": true,
+            "customer_gender": true,
+            "subtotal": true,
+            "base_subtotal": true,
+            "subtotal_with_discount": true,
+            "base_subtotal_with_discount": true,
+            "is_changed": true,
+            "trigger_recollect": true,
+            "ext_shipping_info": true
+        },
+        "index": {
+            "QUOTE_CUSTOMER_ID_STORE_ID_IS_ACTIVE": true,
+            "QUOTE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "quote_address": {
+        "column": {
+            "address_id": true,
+            "quote_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "customer_id": true,
+            "save_in_address_book": true,
+            "customer_address_id": true,
+            "address_type": true,
+            "email": true,
+            "prefix": true,
+            "firstname": true,
+            "middlename": true,
+            "lastname": true,
+            "suffix": true,
+            "company": true,
+            "street": true,
+            "city": true,
+            "region": true,
+            "region_id": true,
+            "postcode": true,
+            "country_id": true,
+            "telephone": true,
+            "fax": true,
+            "same_as_billing": true,
+            "collect_shipping_rates": true,
+            "shipping_method": true,
+            "shipping_description": true,
+            "weight": true,
+            "subtotal": true,
+            "base_subtotal": true,
+            "subtotal_with_discount": true,
+            "base_subtotal_with_discount": true,
+            "tax_amount": true,
+            "base_tax_amount": true,
+            "shipping_amount": true,
+            "base_shipping_amount": true,
+            "shipping_tax_amount": true,
+            "base_shipping_tax_amount": true,
+            "discount_amount": true,
+            "base_discount_amount": true,
+            "grand_total": true,
+            "base_grand_total": true,
+            "customer_notes": true,
+            "applied_taxes": true,
+            "discount_description": true,
+            "shipping_discount_amount": true,
+            "base_shipping_discount_amount": true,
+            "subtotal_incl_tax": true,
+            "base_subtotal_total_incl_tax": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "shipping_discount_tax_compensation_amount": true,
+            "base_shipping_discount_tax_compensation_amnt": true,
+            "shipping_incl_tax": true,
+            "base_shipping_incl_tax": true,
+            "vat_id": true,
+            "vat_is_valid": true,
+            "vat_request_id": true,
+            "vat_request_date": true,
+            "vat_request_success": true
+        },
+        "index": {
+            "QUOTE_ADDRESS_QUOTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_ADDRESS_QUOTE_ID_QUOTE_ENTITY_ID": true
+        }
+    },
+    "quote_item": {
+        "column": {
+            "item_id": true,
+            "quote_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "product_id": true,
+            "store_id": true,
+            "parent_item_id": true,
+            "is_virtual": true,
+            "sku": true,
+            "name": true,
+            "description": true,
+            "applied_rule_ids": true,
+            "additional_data": true,
+            "is_qty_decimal": true,
+            "no_discount": true,
+            "weight": true,
+            "qty": true,
+            "price": true,
+            "base_price": true,
+            "custom_price": true,
+            "discount_percent": true,
+            "discount_amount": true,
+            "base_discount_amount": true,
+            "tax_percent": true,
+            "tax_amount": true,
+            "base_tax_amount": true,
+            "row_total": true,
+            "base_row_total": true,
+            "row_total_with_discount": true,
+            "row_weight": true,
+            "product_type": true,
+            "base_tax_before_discount": true,
+            "tax_before_discount": true,
+            "original_custom_price": true,
+            "redirect_url": true,
+            "base_cost": true,
+            "price_incl_tax": true,
+            "base_price_incl_tax": true,
+            "row_total_incl_tax": true,
+            "base_row_total_incl_tax": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true
+        },
+        "index": {
+            "QUOTE_ITEM_PARENT_ITEM_ID": true,
+            "QUOTE_ITEM_PRODUCT_ID": true,
+            "QUOTE_ITEM_QUOTE_ID": true,
+            "QUOTE_ITEM_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_ITEM_PARENT_ITEM_ID_QUOTE_ITEM_ITEM_ID": true,
+            "QUOTE_ITEM_QUOTE_ID_QUOTE_ENTITY_ID": true,
+            "QUOTE_ITEM_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "quote_address_item": {
+        "column": {
+            "address_item_id": true,
+            "parent_item_id": true,
+            "quote_address_id": true,
+            "quote_item_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "applied_rule_ids": true,
+            "additional_data": true,
+            "weight": true,
+            "qty": true,
+            "discount_amount": true,
+            "tax_amount": true,
+            "row_total": true,
+            "base_row_total": true,
+            "row_total_with_discount": true,
+            "base_discount_amount": true,
+            "base_tax_amount": true,
+            "row_weight": true,
+            "product_id": true,
+            "super_product_id": true,
+            "parent_product_id": true,
+            "sku": true,
+            "image": true,
+            "name": true,
+            "description": true,
+            "is_qty_decimal": true,
+            "price": true,
+            "discount_percent": true,
+            "no_discount": true,
+            "tax_percent": true,
+            "base_price": true,
+            "base_cost": true,
+            "price_incl_tax": true,
+            "base_price_incl_tax": true,
+            "row_total_incl_tax": true,
+            "base_row_total_incl_tax": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true
+        },
+        "index": {
+            "QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID": true,
+            "QUOTE_ADDRESS_ITEM_PARENT_ITEM_ID": true,
+            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID": true,
+            "QUOTE_ADDR_ITEM_PARENT_ITEM_ID_QUOTE_ADDR_ITEM_ADDR_ITEM_ID": true,
+            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true
+        }
+    },
+    "quote_item_option": {
+        "column": {
+            "option_id": true,
+            "item_id": true,
+            "product_id": true,
+            "code": true,
+            "value": true
+        },
+        "index": {
+            "QUOTE_ITEM_OPTION_ITEM_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_ITEM_OPTION_ITEM_ID_QUOTE_ITEM_ITEM_ID": true
+        }
+    },
+    "quote_payment": {
+        "column": {
+            "payment_id": true,
+            "quote_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "method": true,
+            "cc_type": true,
+            "cc_number_enc": true,
+            "cc_last_4": true,
+            "cc_cid_enc": true,
+            "cc_owner": true,
+            "cc_exp_month": true,
+            "cc_exp_year": true,
+            "cc_ss_owner": true,
+            "cc_ss_start_month": true,
+            "cc_ss_start_year": true,
+            "po_number": true,
+            "additional_data": true,
+            "cc_ss_issue": true,
+            "additional_information": true
+        },
+        "index": {
+            "QUOTE_PAYMENT_QUOTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_PAYMENT_QUOTE_ID_QUOTE_ENTITY_ID": true
+        }
+    },
+    "quote_shipping_rate": {
+        "column": {
+            "rate_id": true,
+            "address_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "carrier": true,
+            "carrier_title": true,
+            "code": true,
+            "method": true,
+            "method_description": true,
+            "price": true,
+            "error_message": true,
+            "method_title": true
+        },
+        "index": {
+            "QUOTE_SHIPPING_RATE_ADDRESS_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_SHIPPING_RATE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID": true
+        }
+    },
+    "quote_id_mask": {
+        "column": {
+            "entity_id": true,
+            "quote_id": true,
+            "masked_id": true
+        },
+        "index": {
+            "QUOTE_ID_MASK_QUOTE_ID": true,
+            "QUOTE_ID_MASK_MASKED_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "QUOTE_ID_MASK_QUOTE_ID_QUOTE_ENTITY_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml
index 674e0eea46e97..cd5e62307fdca 100644
--- a/app/code/Magento/Quote/etc/di.xml
+++ b/app/code/Magento/Quote/etc/di.xml
@@ -11,6 +11,8 @@
     <preference for="Magento\Quote\Api\Data\ShippingMethodInterface" type="Magento\Quote\Model\Cart\ShippingMethod" />
     <preference for="Magento\Quote\Api\BillingAddressManagementInterface" type="Magento\Quote\Model\BillingAddressManagement" />
     <preference for="Magento\Quote\Model\ShippingAddressManagementInterface" type="Magento\Quote\Model\ShippingAddressManagement" />
+    <preference for="Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface" type="Magento\Quote\Model\MaskedQuoteIdToQuoteId" />
+    <preference for="Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface" type="Magento\Quote\Model\QuoteIdToMaskedQuoteId" />
     <preference for="Magento\Quote\Api\Data\AddressInterface" type="Magento\Quote\Model\Quote\Address" />
     <preference for="Magento\Quote\Api\Data\CartItemInterface" type="Magento\Quote\Model\Quote\Item" />
     <preference for="Magento\Quote\Api\Data\CartInterface" type="Magento\Quote\Model\Quote" />
@@ -22,6 +24,7 @@
     <preference for="Magento\Quote\Api\CouponManagementInterface" type="Magento\Quote\Model\CouponManagement" />
     <preference for="Magento\Quote\Api\CartManagementInterface" type="Magento\Quote\Model\QuoteManagement" />
     <preference for="Magento\Quote\Api\CartTotalRepositoryInterface" type="Magento\Quote\Model\Cart\CartTotalRepository" />
+    <preference for="Magento\Quote\Api\ChangeQuoteControlInterface" type="Magento\Quote\Model\ChangeQuoteControl" />
     <preference for="Magento\Quote\Api\CartTotalManagementInterface" type="Magento\Quote\Model\Cart\CartTotalManagement" />
     <preference for="Magento\Quote\Api\Data\TotalsInterface" type="Magento\Quote\Model\Cart\Totals" />
     <preference for="Magento\Quote\Api\Data\TotalSegmentInterface" type="Magento\Quote\Model\Cart\TotalSegment" />
@@ -40,6 +43,7 @@
     <preference for="Magento\Quote\Api\GuestCartTotalManagementInterface" type="Magento\Quote\Model\GuestCart\GuestCartTotalManagement" />
     <preference for="Magento\Quote\Api\Data\EstimateAddressInterface" type="Magento\Quote\Model\EstimateAddress" />
     <preference for="Magento\Quote\Api\Data\ProductOptionInterface" type="Magento\Quote\Model\Quote\ProductOption" />
+    <preference for="Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface" type="Magento\Quote\Model\ValidationRules\QuoteValidationComposite\Proxy"/>
     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
         <arguments>
             <argument name="paramOverriders" xsi:type="array">
@@ -94,4 +98,44 @@
         <plugin name="clean_quote_items_after_product_delete" type="Magento\Quote\Model\Product\Plugin\RemoveQuoteItems"/>
         <plugin name="update_quote_items_after_product_save" type="Magento\Quote\Model\Product\Plugin\UpdateQuoteItems"/>
     </type>
+    <type name="Magento\Catalog\Model\Product\Action">
+        <plugin name="quoteProductMassChange" type="Magento\Quote\Model\Product\Plugin\MarkQuotesRecollectMassDisabled"/>
+    </type>
+    <type name="Magento\Quote\Model\ValidationRules\QuoteValidationComposite">
+        <arguments>
+            <argument name="validationRules" xsi:type="array">
+                <item name="AllowedCountryValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\AllowedCountryValidationRule</item>
+                <item name="ShippingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingAddressValidationRule</item>
+                <item name="ShippingMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule</item>
+                <item name="BillingAddressValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\BillingAddressValidationRule</item>
+                <item name="PaymentMethodValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\PaymentMethodValidationRule</item>
+                <item name="MinimumAmountValidationRule" xsi:type="object">Magento\Quote\Model\ValidationRules\MinimumAmountValidationRule</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Quote\Model\ValidationRules\AllowedCountryValidationRule">
+        <arguments>
+            <argument name="generalMessage" xsi:type="string" translatable="true">Some addresses can't be used due to the configurations for specific countries.</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Quote\Model\ValidationRules\ShippingAddressValidationRule">
+        <arguments>
+            <argument name="generalMessage" xsi:type="string" translatable="true">Please check the shipping address information.</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule">
+        <arguments>
+            <argument name="generalMessage" xsi:type="string" translatable="true">The shipping method is missing. Select the shipping method and try again.</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Quote\Model\ValidationRules\BillingAddressValidationRule">
+        <arguments>
+            <argument name="generalMessage" xsi:type="string" translatable="true">Please check the billing address information.</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Quote\Model\ValidationRules\PaymentMethodValidationRule">
+        <arguments>
+            <argument name="generalMessage" xsi:type="string" translatable="true">Enter a valid payment method and try again.</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Quote/etc/frontend/di.xml b/app/code/Magento/Quote/etc/frontend/di.xml
new file mode 100644
index 0000000000000..125afb96f20fd
--- /dev/null
+++ b/app/code/Magento/Quote/etc/frontend/di.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Quote\Plugin\UpdateQuoteStore">
+        <arguments>
+            <argument name="quoteRepository" xsi:type="object">Magento\Quote\Model\QuoteRepository\Proxy</argument>
+            <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Store\Api\StoreCookieManagerInterface">
+        <plugin name="update_quote_store_after_switch_store_view" type="Magento\Quote\Plugin\UpdateQuoteStore"/>
+    </type>
+    <type name="Magento\Customer\Model\ResourceModel\Customer">
+        <plugin name="cart_recollect_on_group_change" type="Magento\Quote\Plugin\RecollectOnGroupChange"/>
+    </type>
+</config>
diff --git a/app/code/Magento/Quote/etc/frontend/events.xml b/app/code/Magento/Quote/etc/frontend/events.xml
new file mode 100644
index 0000000000000..1e9822bbf3ef8
--- /dev/null
+++ b/app/code/Magento/Quote/etc/frontend/events.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:Event/etc/events.xsd">
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
+    </event>
+</config>
diff --git a/app/code/Magento/Quote/etc/module.xml b/app/code/Magento/Quote/etc/module.xml
index 6607dea5809b1..852100221b563 100644
--- a/app/code/Magento/Quote/etc/module.xml
+++ b/app/code/Magento/Quote/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Quote" setup_version="2.0.7">
+    <module name="Magento_Quote" >
     </module>
 </config>
diff --git a/app/code/Magento/Quote/etc/webapi_rest/events.xml b/app/code/Magento/Quote/etc/webapi_rest/events.xml
index 7b94434f3f20a..1e9822bbf3ef8 100644
--- a/app/code/Magento/Quote/etc/webapi_rest/events.xml
+++ b/app/code/Magento/Quote/etc/webapi_rest/events.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_success">
-        <observer name="sendEmail" instance="Magento\Quote\Observer\Webapi\SubmitObserver" />
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
     </event>
 </config>
diff --git a/app/code/Magento/Quote/etc/webapi_soap/events.xml b/app/code/Magento/Quote/etc/webapi_soap/events.xml
index 7b94434f3f20a..1e9822bbf3ef8 100644
--- a/app/code/Magento/Quote/etc/webapi_soap/events.xml
+++ b/app/code/Magento/Quote/etc/webapi_soap/events.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_success">
-        <observer name="sendEmail" instance="Magento\Quote\Observer\Webapi\SubmitObserver" />
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
     </event>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE.txt b/app/code/Magento/QuoteAnalytics/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE.txt
rename to app/code/Magento/QuoteAnalytics/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE_AFL.txt b/app/code/Magento/QuoteAnalytics/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE_AFL.txt
rename to app/code/Magento/QuoteAnalytics/LICENSE_AFL.txt
diff --git a/app/code/Magento/QuoteAnalytics/README.md b/app/code/Magento/QuoteAnalytics/README.md
new file mode 100644
index 0000000000000..d4adcc9313229
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_QuoteAnalytics
+
+The Magento_QuoteAnalytics module configures data definitions for a data collection related to the Quote module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE.txt b/app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE.txt
rename to app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE_AFL.txt b/app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE_AFL.txt
rename to app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/QuoteAnalytics/Test/Mftf/README.md b/app/code/Magento/QuoteAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..617b175d7ed07
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Quote Analytics Functional Tests
+
+The Functional Test Module for **Magento Quote Analytics** module.
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
new file mode 100644
index 0000000000000..90dae1ec2adca
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-quote-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\QuoteAnalytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteAnalytics/etc/analytics.xml b/app/code/Magento/QuoteAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..cc4dfb6364904
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/etc/analytics.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="quotes">
+        <providers>
+            <reportProvider name="quotes" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>quotes</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/QuoteAnalytics/etc/module.xml b/app/code/Magento/QuoteAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..947a792547143
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_QuoteAnalytics" >
+        <sequence>
+            <module name="Magento_Quote"/>
+            <module name="Magento_Analytics"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/QuoteAnalytics/etc/reports.xml b/app/code/Magento/QuoteAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..f57012df23389
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/etc/reports.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="quotes" connection="default">
+        <source name="quote">
+            <attribute name="entity_id"/>
+            <attribute name="customer_id"/>
+            <attribute name="store_id"/>
+            <attribute name="created_at"/>
+            <attribute name="converted_at"/>
+            <attribute name="is_active"/>
+            <attribute name="items_count"/>
+            <attribute name="items_qty"/>
+            <attribute name="orig_order_id"/>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/QuoteAnalytics/registration.php b/app/code/Magento/QuoteAnalytics/registration.php
new file mode 100644
index 0000000000000..19718c3cf2adf
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_QuoteAnalytics',
+    __DIR__
+);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
new file mode 100644
index 0000000000000..96259f2264943
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Message\AbstractMessage;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Add products to cart
+ */
+class AddProductsToCart
+{
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var AddSimpleProductToCart
+     */
+    private $addProductToCart;
+
+    /**
+     * @param CartRepositoryInterface $cartRepository
+     * @param AddSimpleProductToCart $addProductToCart
+     */
+    public function __construct(
+        CartRepositoryInterface $cartRepository,
+        AddSimpleProductToCart $addProductToCart
+    ) {
+        $this->cartRepository = $cartRepository;
+        $this->addProductToCart = $addProductToCart;
+    }
+
+    /**
+     * Add products to cart
+     *
+     * @param Quote $cart
+     * @param array $cartItems
+     * @throws GraphQlInputException
+     */
+    public function execute(Quote $cart, array $cartItems): void
+    {
+        foreach ($cartItems as $cartItemData) {
+            $this->addProductToCart->execute($cart, $cartItemData);
+        }
+
+        if ($cart->getData('has_error')) {
+            throw new GraphQlInputException(
+                __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
+            );
+        }
+
+        $this->cartRepository->save($cart);
+    }
+
+    /**
+     * Collecting cart errors
+     *
+     * @param Quote $cart
+     * @return string
+     */
+    private function getCartErrors(Quote $cart): string
+    {
+        $errorMessages = [];
+
+        /** @var AbstractMessage $error */
+        foreach ($cart->getErrors() as $error) {
+            $errorMessages[] = $error->getText();
+        }
+
+        return implode(PHP_EOL, $errorMessages);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
new file mode 100644
index 0000000000000..aa5b41daebdc3
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Add simple product to cart
+ *
+ * TODO: should be replaced for different types resolver
+ */
+class AddSimpleProductToCart
+{
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param ArrayManager $arrayManager
+     * @param DataObjectFactory $dataObjectFactory
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(
+        ArrayManager $arrayManager,
+        DataObjectFactory $dataObjectFactory,
+        ProductRepositoryInterface $productRepository
+    ) {
+        $this->arrayManager = $arrayManager;
+        $this->dataObjectFactory = $dataObjectFactory;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Add simple product to cart
+     *
+     * @param Quote $cart
+     * @param array $cartItemData
+     * @return void
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
+     */
+    public function execute(Quote $cart, array $cartItemData): void
+    {
+        $sku = $this->extractSku($cartItemData);
+        $qty = $this->extractQty($cartItemData);
+        $customizableOptions = $this->extractCustomizableOptions($cartItemData);
+
+        try {
+            $product = $this->productRepository->get($sku);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
+        }
+
+        $result = $cart->addProduct($product, $this->createBuyRequest($qty, $customizableOptions));
+
+        if (is_string($result)) {
+            throw new GraphQlInputException(__($result));
+        }
+    }
+
+    /**
+     * Extract SKU from cart item data
+     *
+     * @param array $cartItemData
+     * @return string
+     * @throws GraphQlInputException
+     */
+    private function extractSku(array $cartItemData): string
+    {
+        $sku = $this->arrayManager->get('data/sku', $cartItemData);
+        if (!isset($sku)) {
+            throw new GraphQlInputException(__('Missing key "sku" in cart item data'));
+        }
+        return (string)$sku;
+    }
+
+    /**
+     * Extract Qty from cart item data
+     *
+     * @param array $cartItemData
+     * @return float
+     * @throws GraphQlInputException
+     */
+    private function extractQty(array $cartItemData): float
+    {
+        $qty = $this->arrayManager->get('data/qty', $cartItemData);
+        if (!isset($qty)) {
+            throw new GraphQlInputException(__('Missing key "qty" in cart item data'));
+        }
+        return (float)$qty;
+    }
+
+    /**
+     * Extract Customizable Options from cart item data
+     *
+     * @param array $cartItemData
+     * @return array
+     */
+    private function extractCustomizableOptions(array $cartItemData): array
+    {
+        $customizableOptions = $this->arrayManager->get('customizable_options', $cartItemData, []);
+
+        $customizableOptionsData = [];
+        foreach ($customizableOptions as $customizableOption) {
+            $customizableOptionsData[$customizableOption['id']] = $customizableOption['value'];
+        }
+        return $customizableOptionsData;
+    }
+
+    /**
+     * Format GraphQl input data to a shape that buy request has
+     *
+     * @param float $qty
+     * @param array $customOptions
+     * @return DataObject
+     */
+    private function createBuyRequest(float $qty, array $customOptions): DataObject
+    {
+        return $this->dataObjectFactory->create([
+            'data' => [
+                'qty' => $qty,
+                'options' => $customOptions,
+            ],
+        ]);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php
new file mode 100644
index 0000000000000..fb742477ec99b
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart\Address;
+
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+
+/**
+ * Class AddressDataProvider
+ *
+ * Collect and return information about cart shipping and billing addresses
+ */
+class AddressDataProvider
+{
+    /**
+     * @var ExtensibleDataObjectConverter
+     */
+    private $dataObjectConverter;
+
+    /**
+     * AddressDataProvider constructor.
+     *
+     * @param ExtensibleDataObjectConverter $dataObjectConverter
+     */
+    public function __construct(
+        ExtensibleDataObjectConverter $dataObjectConverter
+    ) {
+        $this->dataObjectConverter = $dataObjectConverter;
+    }
+
+    /**
+     * Collect and return information about shipping and billing addresses
+     *
+     * @param CartInterface $cart
+     * @return array
+     */
+    public function getCartAddresses(CartInterface $cart): array
+    {
+        $addressData = [];
+        $shippingAddress = $cart->getShippingAddress();
+        $billingAddress = $cart->getBillingAddress();
+
+        if ($shippingAddress) {
+            $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], AddressInterface::class);
+            $shippingData['address_type'] = 'SHIPPING';
+            $addressData[] = array_merge($shippingData, $this->extractAddressData($shippingAddress));
+        }
+
+        if ($billingAddress) {
+            $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], AddressInterface::class);
+            $billingData['address_type'] = 'BILLING';
+            $addressData[] = array_merge($billingData, $this->extractAddressData($billingAddress));
+        }
+
+        return $addressData;
+    }
+
+    /**
+     * Extract the necessary address fields from address model
+     *
+     * @param QuoteAddress $address
+     * @return array
+     */
+    private function extractAddressData(QuoteAddress $address): array
+    {
+        $addressData = [
+            'country' => [
+                'code' => $address->getCountryId(),
+                'label' => $address->getCountry()
+            ],
+            'region' => [
+                'code' => $address->getRegionCode(),
+                'label' => $address->getRegion()
+            ],
+            'street' => $address->getStreet(),
+            'selected_shipping_method' => [
+                'code' => $address->getShippingMethod(),
+                'label' => $address->getShippingDescription(),
+                'free_shipping' => $address->getFreeShipping(),
+            ],
+            'items_weight' => $address->getWeight(),
+            'customer_notes' => $address->getCustomerNotes()
+        ];
+
+        return $addressData;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
new file mode 100644
index 0000000000000..faefa686606e2
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+
+/**
+ * Extract data from cart
+ */
+class ExtractDataFromCart
+{
+    /**
+     * Extract data from cart
+     *
+     * @param Quote $cart
+     * @return array
+     */
+    public function execute(Quote $cart): array
+    {
+        $items = [];
+
+        /**
+         * @var QuoteItem $cartItem
+         */
+        foreach ($cart->getAllItems() as $cartItem) {
+            $productData = $cartItem->getProduct()->getData();
+            $productData['model'] = $cartItem->getProduct();
+
+            $items[] = [
+                'id' => $cartItem->getItemId(),
+                'qty' => $cartItem->getQty(),
+                'product' => $productData,
+                'model' => $cartItem,
+            ];
+        }
+
+        return [
+            'items' => $items,
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
new file mode 100644
index 0000000000000..c3207bf478bbe
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Get cart
+ */
+class GetCartForUser
+{
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(
+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
+        CartRepositoryInterface $cartRepository
+    ) {
+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * Get cart for user
+     *
+     * @param string $cartHash
+     * @param int|null $userId
+     * @return Quote
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(string $cartHash, ?int $userId): Quote
+    {
+        try {
+            $cartId = $this->maskedQuoteIdToQuoteId->execute($cartHash);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
+                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
+            );
+        }
+
+        try {
+            /** @var Quote $cart */
+            $cart = $this->cartRepository->get($cartId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
+            );
+        }
+
+        $customerId = (int)$cart->getCustomerId();
+
+        /* Guest cart, allow operations */
+        if (!$customerId) {
+            return $cart;
+        }
+
+        if ($customerId !== $userId) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'The current user cannot perform operations on cart "%masked_cart_id"',
+                    ['masked_cart_id' => $cartHash]
+                )
+            );
+        }
+        return $cart;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php
new file mode 100644
index 0000000000000..b9fd5c7807d2f
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+
+/**
+ * Set single shipping address for a specified shopping cart
+ */
+class SetShippingAddressOnCart implements SetShippingAddressesOnCartInterface
+{
+    /**
+     * @var ShippingAddressManagementInterface
+     */
+    private $shippingAddressManagement;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var Address
+     */
+    private $addressModel;
+
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @param ShippingAddressManagementInterface $shippingAddressManagement
+     * @param AddressRepositoryInterface $addressRepository
+     * @param Address $addressModel
+     * @param CheckCustomerAccount $checkCustomerAccount
+     */
+    public function __construct(
+        ShippingAddressManagementInterface $shippingAddressManagement,
+        AddressRepositoryInterface $addressRepository,
+        Address $addressModel,
+        CheckCustomerAccount $checkCustomerAccount
+    ) {
+        $this->shippingAddressManagement = $shippingAddressManagement;
+        $this->addressRepository = $addressRepository;
+        $this->addressModel = $addressModel;
+        $this->checkCustomerAccount = $checkCustomerAccount;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddresses): void
+    {
+        if (count($shippingAddresses) > 1) {
+            throw new GraphQlInputException(
+                __('You cannot specify multiple shipping addresses.')
+            );
+        }
+        $shippingAddress = current($shippingAddresses);
+        $customerAddressId = $shippingAddress['customer_address_id'] ?? null;
+        $addressInput = $shippingAddress['address'] ?? null;
+
+        if (null === $customerAddressId && null === $addressInput) {
+            throw new GraphQlInputException(
+                __('The shipping address must contain either "customer_address_id" or "address".')
+            );
+        }
+        if ($customerAddressId && $addressInput) {
+            throw new GraphQlInputException(
+                __('The shipping address cannot contain "customer_address_id" and "address" at the same time.')
+            );
+        }
+        if (null === $customerAddressId) {
+            $shippingAddress = $this->addressModel->addData($addressInput);
+        } else {
+            $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
+
+            /** @var AddressInterface $customerAddress */
+            $customerAddress = $this->addressRepository->getById($customerAddressId);
+            $shippingAddress = $this->addressModel->importCustomerAddressData($customerAddress);
+        }
+
+        $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
new file mode 100644
index 0000000000000..c5da3db75add7
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Extension point for setting shipping addresses for a specified shopping cart
+ *
+ * All objects that are responsible for setting shipping addresses on a cart via GraphQl
+ * should implement this interface.
+ */
+interface SetShippingAddressesOnCartInterface
+{
+    /**
+     * Set shipping addresses for a specified shopping cart
+     *
+     * @param ContextInterface $context
+     * @param CartInterface $cart
+     * @param array $shippingAddresses
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddresses): void;
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php
new file mode 100644
index 0000000000000..a630b2d07c7df
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\AddressFactory as QuoteAddressFactory;
+use Magento\Quote\Model\ResourceModel\Quote\Address as QuoteAddressResource;
+use Magento\Checkout\Model\ShippingInformationFactory;
+use Magento\Checkout\Api\ShippingInformationManagementInterface;
+use Magento\Checkout\Model\ShippingInformation;
+
+/**
+ * Class SetShippingMethodsOnCart
+ *
+ * Set shipping method for a specified shopping cart address
+ */
+class SetShippingMethodOnCart
+{
+    /**
+     * @var ShippingInformationFactory
+     */
+    private $shippingInformationFactory;
+
+    /**
+     * @var QuoteAddressFactory
+     */
+    private $quoteAddressFactory;
+
+    /**
+     * @var QuoteAddressResource
+     */
+    private $quoteAddressResource;
+
+    /**
+     * @var ShippingInformationManagementInterface
+     */
+    private $shippingInformationManagement;
+
+    /**
+     * @param ShippingInformationManagementInterface $shippingInformationManagement
+     * @param QuoteAddressFactory $quoteAddressFactory
+     * @param QuoteAddressResource $quoteAddressResource
+     * @param ShippingInformationFactory $shippingInformationFactory
+     */
+    public function __construct(
+        ShippingInformationManagementInterface $shippingInformationManagement,
+        QuoteAddressFactory $quoteAddressFactory,
+        QuoteAddressResource $quoteAddressResource,
+        ShippingInformationFactory $shippingInformationFactory
+    ) {
+        $this->shippingInformationManagement = $shippingInformationManagement;
+        $this->quoteAddressResource = $quoteAddressResource;
+        $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->shippingInformationFactory = $shippingInformationFactory;
+    }
+
+    /**
+     * Sets shipping method for a specified shopping cart address
+     *
+     * @param Quote $cart
+     * @param int $cartAddressId
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(Quote $cart, int $cartAddressId, string $carrierCode, string $methodCode): void
+    {
+        $quoteAddress = $this->quoteAddressFactory->create();
+        $this->quoteAddressResource->load($quoteAddress, $cartAddressId);
+
+        /** @var ShippingInformation $shippingInformation */
+        $shippingInformation = $this->shippingInformationFactory->create();
+
+        /* If the address is not a shipping address (but billing) the system will find the proper shipping address for
+           the selected cart and set the information there (actual for single shipping address) */
+        $shippingInformation->setShippingAddress($quoteAddress);
+        $shippingInformation->setShippingCarrierCode($carrierCode);
+        $shippingInformation->setShippingMethodCode($methodCode);
+
+        try {
+            $this->shippingInformationManagement->saveAddressInformation($cart->getId(), $shippingInformation);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
+        } catch (StateException $exception) {
+            throw new GraphQlInputException(__($exception->getMessage()));
+        } catch (InputException $exception) {
+            throw new GraphQlInputException(__($exception->getMessage()));
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOption.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOption.php
new file mode 100644
index 0000000000000..3199668060ea5
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOption.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+
+/**
+ * Custom Option Data provider
+ */
+class CustomizableOption
+{
+    /**
+     * @var CustomizableOptionValueInterface
+     */
+    private $customizableOptionValue;
+
+    /**
+     * @param CustomizableOptionValueInterface $customOptionValueDataProvider
+     */
+    public function __construct(
+        CustomizableOptionValueInterface $customOptionValueDataProvider
+    ) {
+        $this->customizableOptionValue = $customOptionValueDataProvider;
+    }
+
+    /**
+     * Retrieve custom option data
+     *
+     * @param QuoteItem $cartItem
+     * @param int $optionId
+     * @return array
+     * @throws LocalizedException
+     */
+    public function getData(QuoteItem $cartItem, int $optionId): array
+    {
+        $product = $cartItem->getProduct();
+        $option = $product->getOptionById($optionId);
+
+        if (!$option) {
+            return [];
+        }
+
+        $selectedOption = $cartItem->getOptionByCode('option_' . $option->getId());
+
+        $selectedOptionValueData = $this->customizableOptionValue->getData(
+            $cartItem,
+            $option,
+            $selectedOption
+        );
+
+        return [
+            'id' => $option->getId(),
+            'label' => $option->getTitle(),
+            'type' => $option->getType(),
+            'values' => $selectedOptionValueData,
+            'sort_order' => $option->getSortOrder(),
+            'is_required' => $option->getIsRequire(),
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Composite.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Composite.php
new file mode 100644
index 0000000000000..5297845125300
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Composite.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
+
+use Magento\Catalog\Model\Product\Option;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
+
+/**
+ * @inheritdoc
+ */
+class Composite implements CustomizableOptionValueInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CustomizableOptionValueInterface[]
+     */
+    private $customizableOptionValues;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param CustomizableOptionValueInterface[] $customizableOptionValues
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $customizableOptionValues = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->customizableOptionValues = $customizableOptionValues;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(
+        QuoteItem $cartItem,
+        Option $option,
+        SelectedOption $selectedOption
+    ): array {
+        $optionType = $option->getType();
+
+        if (!array_key_exists($optionType, $this->customizableOptionValues)) {
+            throw new GraphQlInputException(__('Option type "%1" is not supported', $optionType));
+        }
+        $customizableOptionValueClassName = $this->customizableOptionValues[$optionType];
+
+        $customizableOptionValue = $this->objectManager->get($customizableOptionValueClassName);
+        if (!$customizableOptionValue instanceof CustomizableOptionValueInterface) {
+            throw new LocalizedException(
+                __('%1 doesn\'t implement CustomizableOptionValueInterface', $customizableOptionValueClassName)
+            );
+        }
+        return $customizableOptionValue->getData($cartItem, $option, $selectedOption);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Dropdown.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Dropdown.php
new file mode 100644
index 0000000000000..74ed403465009
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Dropdown.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
+
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Option\Type\Select as SelectOptionType;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
+
+/**
+ * @inheritdoc
+ */
+class Dropdown implements CustomizableOptionValueInterface
+{
+    /**
+     * @var PriceUnitLabel
+     */
+    private $priceUnitLabel;
+
+    /**
+     * @param PriceUnitLabel $priceUnitLabel
+     */
+    public function __construct(
+        PriceUnitLabel $priceUnitLabel
+    ) {
+        $this->priceUnitLabel = $priceUnitLabel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(
+        QuoteItem $cartItem,
+        Option $option,
+        SelectedOption $selectedOption
+    ): array {
+        /** @var SelectOptionType $optionTypeRenderer */
+        $optionTypeRenderer = $option->groupFactory($option->getType())
+            ->setOption($option)
+            ->setConfigurationItemOption($selectedOption);
+
+        $selectedValue = $selectedOption->getValue();
+        $optionValue = $option->getValueById($selectedValue);
+        $optionPriceType = (string)$optionValue->getPriceType();
+        $priceValueUnits = $this->priceUnitLabel->getData($optionPriceType);
+
+        $selectedOptionValueData = [
+            'id' => $selectedOption->getId(),
+            'label' => $optionTypeRenderer->getFormattedOptionValue($selectedValue),
+            'value' => $selectedValue,
+            'price' => [
+                'type' => strtoupper($optionPriceType),
+                'units' => $priceValueUnits,
+                'value' => $optionValue->getPrice(),
+            ]
+        ];
+        return [$selectedOptionValueData];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php
new file mode 100644
index 0000000000000..619e84568a545
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
+
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Option\Type\DefaultType;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
+
+/**
+ * Multiple Option Value Data provider
+ */
+class Multiple implements CustomizableOptionValueInterface
+{
+    /**
+     * @var PriceUnitLabel
+     */
+    private $priceUnitLabel;
+
+    /**
+     * @param PriceUnitLabel $priceUnitLabel
+     */
+    public function __construct(
+        PriceUnitLabel $priceUnitLabel
+    ) {
+        $this->priceUnitLabel = $priceUnitLabel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(
+        QuoteItem $cartItem,
+        Option $option,
+        SelectedOption $selectedOption
+    ): array {
+        $selectedOptionValueData = [];
+        $optionIds = explode(',', $selectedOption->getValue());
+
+        if (0 === count($optionIds)) {
+            return $selectedOptionValueData;
+        }
+
+        foreach ($optionIds as $optionId) {
+            $optionValue = $option->getValueById($optionId);
+            $priceValueUnits = $this->priceUnitLabel->getData($optionValue->getPriceType());
+
+            $selectedOptionValueData[] = [
+                'id' => $selectedOption->getId(),
+                'label' => $optionValue->getTitle(),
+                'price' => [
+                    'type' => strtoupper($optionValue->getPriceType()),
+                    'units' => $priceValueUnits,
+                    'value' => $optionValue->getPrice(),
+                ],
+            ];
+        }
+
+        return $selectedOptionValueData;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/PriceUnitLabel.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/PriceUnitLabel.php
new file mode 100644
index 0000000000000..bee2e54ed5f40
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/PriceUnitLabel.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
+
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Custom Option Data provider
+ */
+class PriceUnitLabel
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager
+    ) {
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Retrieve price value unit
+     *
+     * @param string $priceType
+     * @return string
+     */
+    public function getData(string $priceType): string
+    {
+        if (ProductPriceOptionsInterface::VALUE_PERCENT == $priceType) {
+            return '%';
+        }
+
+        return $this->getCurrencySymbol();
+    }
+
+    /**
+     * Get currency symbol
+     *
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    private function getCurrencySymbol(): string
+    {
+        /** @var Store|StoreInterface $store */
+        $store = $this->storeManager->getStore();
+
+        return $store->getBaseCurrency()->getCurrencySymbol();
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
new file mode 100644
index 0000000000000..4b29eb6a4a663
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue;
+
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Option\Type\Text as TextOptionType;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface;
+
+/**
+ * @inheritdoc
+ */
+class Text implements CustomizableOptionValueInterface
+{
+    /**
+     * @var PriceUnitLabel
+     */
+    private $priceUnitLabel;
+
+    /**
+     * @param PriceUnitLabel $priceUnitLabel
+     */
+    public function __construct(
+        PriceUnitLabel $priceUnitLabel
+    ) {
+        $this->priceUnitLabel = $priceUnitLabel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(
+        QuoteItem $cartItem,
+        Option $option,
+        SelectedOption $selectedOption
+    ): array {
+        /** @var TextOptionType $optionTypeRenderer */
+        $optionTypeRenderer = $option->groupFactory($option->getType());
+        $priceValueUnits = $this->priceUnitLabel->getData($option->getPriceType());
+
+        $selectedOptionValueData = [
+            'id' => $selectedOption->getId(),
+            'label' => '',
+            'value' => $optionTypeRenderer->getFormattedOptionValue($selectedOption->getValue()),
+            'price' => [
+                'type' => strtoupper($option->getPriceType()),
+                'units' => $priceValueUnits,
+                'value' => $option->getPrice(),
+            ],
+        ];
+        return [$selectedOptionValueData];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValueInterface.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValueInterface.php
new file mode 100644
index 0000000000000..fce8b80f6d476
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValueInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\CartItem\DataProvider;
+
+use Magento\Catalog\Model\Product\Option;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\Quote\Item\Option as SelectedOption;
+
+/**
+ * Customizable Option Value Data provider
+ */
+interface CustomizableOptionValueInterface
+{
+    /**
+     * Customizable Option Value Data Provider
+     *
+     * @param QuoteItem $cartItem
+     * @param Option $option
+     * @param SelectedOption $selectedOption
+     * @return array
+     */
+    public function getData(
+        QuoteItem $cartItem,
+        Option $option,
+        SelectedOption $selectedOption
+    ): array;
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
new file mode 100644
index 0000000000000..f4335b262c854
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
+use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromCart;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+
+/**
+ * Add simple products to cart GraphQl resolver
+ * {@inheritdoc}
+ */
+class AddSimpleProductsToCart implements ResolverInterface
+{
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var AddProductsToCart
+     */
+    private $addProductsToCart;
+
+    /**
+     * @var ExtractDataFromCart
+     */
+    private $extractDataFromCart;
+
+    /**
+     * @param ArrayManager $arrayManager
+     * @param GetCartForUser $getCartForUser
+     * @param AddProductsToCart $addProductsToCart
+     * @param ExtractDataFromCart $extractDataFromCart
+     */
+    public function __construct(
+        ArrayManager $arrayManager,
+        GetCartForUser $getCartForUser,
+        AddProductsToCart $addProductsToCart,
+        ExtractDataFromCart $extractDataFromCart
+    ) {
+        $this->arrayManager = $arrayManager;
+        $this->getCartForUser = $getCartForUser;
+        $this->addProductsToCart = $addProductsToCart;
+        $this->extractDataFromCart = $extractDataFromCart;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $cartHash = $this->arrayManager->get('input/cart_id', $args);
+        $cartItems = $this->arrayManager->get('input/cartItems', $args);
+
+        if (!isset($cartHash)) {
+            throw new GraphQlInputException(__('Missing key "cart_id" in cart data'));
+        }
+
+        if (!isset($cartItems) || !is_array($cartItems) || empty($cartItems)) {
+            throw new GraphQlInputException(__('Missing key "cartItems" in cart data'));
+        }
+
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute((string)$cartHash, $currentUserId);
+
+        $this->addProductsToCart->execute($cart, $cartItems);
+        $cartData = $this->extractDataFromCart->execute($cart);
+
+        return [
+            'cart' => $cartData,
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
new file mode 100644
index 0000000000000..ec59416d49371
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CouponManagementInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+
+/**
+ * @inheritdoc
+ */
+class ApplyCouponToCart implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var CouponManagementInterface
+     */
+    private $couponManagement;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param CouponManagementInterface $couponManagement
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        CouponManagementInterface $couponManagement
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->couponManagement = $couponManagement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($args['input']['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        $maskedCartId = $args['input']['cart_id'];
+
+        if (!isset($args['input']['coupon_code'])) {
+            throw new GraphQlInputException(__('Required parameter "coupon_code" is missing'));
+        }
+        $couponCode = $args['input']['coupon_code'];
+
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+        $cartId = $cart->getId();
+
+        /* Check current cart does not have coupon code applied */
+        $appliedCouponCode = $this->couponManagement->get($cartId);
+        if (!empty($appliedCouponCode)) {
+            throw new GraphQlInputException(
+                __('A coupon is already applied to the cart. Please remove it to apply another')
+            );
+        }
+
+        try {
+            $this->couponManagement->set($cartId, $couponCode);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
+        } catch (CouldNotSaveException $exception) {
+            throw new LocalizedException(__($exception->getMessage()));
+        }
+
+        $data['cart']['applied_coupon'] = [
+            'code' => $couponCode,
+        ];
+        return $data;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php
new file mode 100644
index 0000000000000..69544672bf12e
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\QuoteGraphQl\Model\Cart\Address\AddressDataProvider;
+
+/**
+ * @inheritdoc
+ */
+class CartAddresses implements ResolverInterface
+{
+    /**
+     * @var AddressDataProvider
+     */
+    private $addressDataProvider;
+
+    /**
+     * @param AddressDataProvider $addressDataProvider
+     */
+    public function __construct(
+        AddressDataProvider $addressDataProvider
+    ) {
+        $this->addressDataProvider = $addressDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $cart = $value['model'];
+
+        return $this->addressDataProvider->getCartAddresses($cart);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemTypeResolver.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemTypeResolver.php
new file mode 100644
index 0000000000000..962463860a592
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemTypeResolver.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class CartItemTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @var array
+     */
+    private $supportedTypes = [];
+
+    /**
+     * @param array $supportedTypes
+     */
+    public function __construct(array $supportedTypes = [])
+    {
+        $this->supportedTypes = $supportedTypes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolveType(array $data) : string
+    {
+        if (!isset($data['product'])) {
+            throw new LocalizedException(__('Missing key "product" in cart data'));
+        }
+        $productData = $data['product'];
+
+        if (!isset($productData['type_id'])) {
+            throw new LocalizedException(__('Missing key "type_id" in product data'));
+        }
+        $productTypeId = $productData['type_id'];
+
+        if (!isset($this->supportedTypes[$productTypeId])) {
+            throw new LocalizedException(
+                __('Product "%product_type" type is not supported', ['product_type' => $productTypeId])
+            );
+        }
+        return $this->supportedTypes[$productTypeId];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CreateEmptyCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CreateEmptyCart.php
new file mode 100644
index 0000000000000..06123abe615e6
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CreateEmptyCart.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+
+/**
+ * @inheritdoc
+ */
+class CreateEmptyCart implements ResolverInterface
+{
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @var GuestCartManagementInterface
+     */
+    private $guestCartManagement;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @param CartManagementInterface $cartManagement
+     * @param GuestCartManagementInterface $guestCartManagement
+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     */
+    public function __construct(
+        CartManagementInterface $cartManagement,
+        GuestCartManagementInterface $guestCartManagement,
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId,
+        QuoteIdMaskFactory $quoteIdMaskFactory
+    ) {
+        $this->cartManagement = $cartManagement;
+        $this->guestCartManagement = $guestCartManagement;
+        $this->quoteIdToMaskedId = $quoteIdToMaskedId;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $customerId = $context->getUserId();
+
+        if (0 !== $customerId && null !== $customerId) {
+            $quoteId = $this->cartManagement->createEmptyCartForCustomer($customerId);
+            $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quoteId);
+
+            if (empty($maskedQuoteId)) {
+                $quoteIdMask = $this->quoteIdMaskFactory->create();
+                $quoteIdMask->setQuoteId($quoteId)->save();
+                $maskedQuoteId = $quoteIdMask->getMaskedId();
+            }
+        } else {
+            $maskedQuoteId = $this->guestCartManagement->createEmptyCart();
+        }
+
+        return $maskedQuoteId;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
new file mode 100644
index 0000000000000..a681b2ca0d004
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOption;
+
+/**
+ * @inheritdoc
+ */
+class CustomizableOptions implements ResolverInterface
+{
+    /**
+     * @var CustomizableOption
+     */
+    private $customizableOption;
+
+    /**
+     * @param CustomizableOption $customizableOption
+     */
+    public function __construct(
+        CustomizableOption $customizableOption
+    ) {
+        $this->customizableOption = $customizableOption;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var QuoteItem $cartItem */
+        $cartItem = $value['model'];
+        $quoteItemOption = $cartItem->getOptionByCode('option_ids');
+
+        if (null === $quoteItemOption) {
+            return [];
+        }
+
+        $customizableOptionsData = [];
+        $customizableOptionIds = explode(',', $quoteItemOption->getValue());
+
+        foreach ($customizableOptionIds as $customizableOptionId) {
+            $customizableOption = $this->customizableOption->getData(
+                $cartItem,
+                (int)$customizableOptionId
+            );
+            $customizableOptionsData[] = $customizableOption;
+        }
+        return $customizableOptionsData;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
new file mode 100644
index 0000000000000..c21d869ddac7d
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CouponManagementInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+
+/**
+ * @inheritdoc
+ */
+class RemoveCouponFromCart implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var CouponManagementInterface
+     */
+    private $couponManagement;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param CouponManagementInterface $couponManagement
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        CouponManagementInterface $couponManagement
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->couponManagement = $couponManagement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($args['input']['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        $maskedCartId = $args['input']['cart_id'];
+
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+        $cartId = $cart->getId();
+
+        try {
+            $this->couponManagement->remove($cartId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
+        } catch (CouldNotDeleteException $exception) {
+            throw new LocalizedException(__($exception->getMessage()));
+        }
+
+        $data['cart']['applied_coupon'] = [
+            'code' => '',
+        ];
+        return $data;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
new file mode 100644
index 0000000000000..b024e7b77af40
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCartInterface;
+
+/**
+ * Class SetShippingAddressesOnCart
+ *
+ * Mutation resolver for setting shipping addresses for shopping cart
+ */
+class SetShippingAddressesOnCart implements ResolverInterface
+{
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var ShippingAddressManagementInterface
+     */
+    private $shippingAddressManagement;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var SetShippingAddressesOnCartInterface
+     */
+    private $setShippingAddressesOnCart;
+
+    /**
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
+     * @param ShippingAddressManagementInterface $shippingAddressManagement
+     * @param GetCartForUser $getCartForUser
+     * @param ArrayManager $arrayManager
+     * @param SetShippingAddressesOnCartInterface $setShippingAddressesOnCart
+     */
+    public function __construct(
+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
+        ShippingAddressManagementInterface $shippingAddressManagement,
+        GetCartForUser $getCartForUser,
+        ArrayManager $arrayManager,
+        SetShippingAddressesOnCartInterface $setShippingAddressesOnCart
+    ) {
+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
+        $this->shippingAddressManagement = $shippingAddressManagement;
+        $this->getCartForUser = $getCartForUser;
+        $this->arrayManager = $arrayManager;
+        $this->setShippingAddressesOnCart = $setShippingAddressesOnCart;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $shippingAddresses = $this->arrayManager->get('input/shipping_addresses', $args);
+        $maskedCartId = $this->arrayManager->get('input/cart_id', $args);
+
+        if (!$maskedCartId) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        if (!$shippingAddresses) {
+            throw new GraphQlInputException(__('Required parameter "shipping_addresses" is missing'));
+        }
+
+        $maskedCartId = $args['input']['cart_id'];
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+
+        $this->setShippingAddressesOnCart->execute($context, $cart, $shippingAddresses);
+
+        return [
+            'cart' => [
+                'cart_id' => $maskedCartId,
+                'model' => $cart,
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
new file mode 100644
index 0000000000000..920829f5d67b1
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\QuoteGraphQl\Model\Cart\SetShippingMethodOnCart;
+
+/**
+ * Class SetShippingMethodsOnCart
+ *
+ * Mutation resolver for setting shipping methods for shopping cart
+ */
+class SetShippingMethodsOnCart implements ResolverInterface
+{
+    /**
+     * @var SetShippingMethodOnCart
+     */
+    private $setShippingMethodOnCart;
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @param ArrayManager $arrayManager
+     * @param GetCartForUser $getCartForUser
+     * @param SetShippingMethodOnCart $setShippingMethodOnCart
+     */
+    public function __construct(
+        ArrayManager $arrayManager,
+        GetCartForUser $getCartForUser,
+        SetShippingMethodOnCart $setShippingMethodOnCart
+    ) {
+        $this->arrayManager = $arrayManager;
+        $this->getCartForUser = $getCartForUser;
+        $this->setShippingMethodOnCart = $setShippingMethodOnCart;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $shippingMethods = $this->arrayManager->get('input/shipping_methods', $args);
+        $maskedCartId = $this->arrayManager->get('input/cart_id', $args);
+
+        if (!$maskedCartId) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        if (!$shippingMethods) {
+            throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
+        }
+
+        $shippingMethod = reset($shippingMethods); // This point can be extended for multishipping
+
+        if (!$shippingMethod['cart_address_id']) {
+            throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing'));
+        }
+        if (!$shippingMethod['shipping_carrier_code']) {
+            throw new GraphQlInputException(__('Required parameter "shipping_carrier_code" is missing'));
+        }
+        if (!$shippingMethod['shipping_method_code']) {
+            throw new GraphQlInputException(__('Required parameter "shipping_method_code" is missing'));
+        }
+
+        $userId = $context->getUserId();
+        $cart = $this->getCartForUser->execute((string) $maskedCartId, $userId);
+
+        $this->setShippingMethodOnCart->execute(
+            $cart,
+            $shippingMethod['cart_address_id'],
+            $shippingMethod['shipping_carrier_code'],
+            $shippingMethod['shipping_method_code']
+        );
+
+        return [
+            'cart' => [
+                'cart_id' => $maskedCartId,
+                'model' => $cart
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/README.md b/app/code/Magento/QuoteGraphQl/README.md
new file mode 100644
index 0000000000000..05d6746b873e8
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/README.md
@@ -0,0 +1,4 @@
+# QuoteGraphQl
+
+**QuoteGraphQl** provides type and resolver information for the GraphQl module
+to generate quote (cart) information endpoints. Also provides endpoints for modifying a quote.
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
new file mode 100644
index 0000000000000..1bf4d581a5fe3
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "magento/module-quote-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*",
+        "magento/module-checkout": "*",
+        "magento/module-catalog": "*",
+        "magento/module-store": "*",
+        "magento/module-customer": "*",
+        "magento/module-customer-graph-ql": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\QuoteGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..63ad9e193b955
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/etc/di.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface" type="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Composite" />
+    <type name="Magento\QuoteGraphQl\Model\Resolver\CartItemTypeResolver">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="simple" xsi:type="string">SimpleCartItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Composite">
+        <arguments>
+            <argument name="customizableOptionValues" xsi:type="array">
+                <item name="field" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
+                <item name="date" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
+                <item name="time" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
+                <item name="date_time" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
+                <item name="area" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Text</item>
+                <item name="drop_down" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Dropdown</item>
+                <item name="radio" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Dropdown</item>
+                <item name="checkbox" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Dropdown</item>
+                <item name="multiple" xsi:type="string">Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Multiple</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..86bc954ae4ac4
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCartInterface"
+                type="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressOnCart" />
+</config>
diff --git a/app/code/Magento/QuoteGraphQl/etc/module.xml b/app/code/Magento/QuoteGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..9f29b124abbb8
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_QuoteGraphQl"/>
+</config>
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..edc643973ce77
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -0,0 +1,220 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    getAvailableShippingMethodsOnCart(input: AvailableShippingMethodsOnCartInput): AvailableShippingMethodsOnCartOutput @doc(description:"Returns available shipping methods for cart by address/address_id")
+}
+
+type Mutation {
+    createEmptyCart: String @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CreateEmptyCart") @doc(description:"Creates an empty shopping cart for a guest or logged in user")
+    applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Coupon\\ApplyCouponToCart")
+    removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Coupon\\RemoveCouponFromCart")
+    setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
+    applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ApplyCouponToCart")
+    removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveCouponFromCart")
+    setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput
+    setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
+    addSimpleProductsToCart(input: AddSimpleProductsToCartInput): AddSimpleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
+}
+
+input SetShippingAddressesOnCartInput {
+    cart_id: String!
+    shipping_addresses: [ShippingAddressInput!]!
+}
+
+input ShippingAddressInput {
+    customer_address_id: Int # Can be provided in one-page checkout and is required for multi-shipping checkout
+    address: CartAddressInput
+    cart_items: [CartItemQuantityInput!]
+}
+
+input CartItemQuantityInput {
+    cart_item_id: Int!
+    quantity: Float!
+}
+
+input SetBillingAddressOnCartInput {
+    cart_id: String!
+    customer_address_id: Int
+    address: CartAddressInput
+    # TODO: consider adding "Same as shipping" option
+}
+
+input CartAddressInput {
+    firstname: String!
+    lastname: String!
+    company: String
+    street: [String!]!
+    city: String!
+    region: String
+    postcode: String
+    country_code: String!
+    telephone: String!
+    save_in_address_book: Boolean!
+}
+
+input SetShippingMethodsOnCartInput {
+    cart_id: String!
+    shipping_methods: [ShippingMethodForAddressInput!]!
+}
+
+input ShippingMethodForAddressInput {
+    cart_address_id: Int!
+    shipping_carrier_code: String!
+    shipping_method_code: String!
+}
+
+type SetBillingAddressOnCartOutput {
+    cart: Cart!
+}
+
+type SetShippingAddressesOnCartOutput {
+    cart: Cart!
+}
+
+type SetShippingMethodsOnCartOutput {
+    cart: Cart!
+}
+
+# If no address is provided, the system get address assigned to a quote
+# If there's no address at all - the system returns all shipping methods
+input AvailableShippingMethodsOnCartInput {
+    cart_id: String!
+    customer_address_id: Int
+    address: CartAddressInput
+}
+
+type AvailableShippingMethodsOnCartOutput {
+    available_shipping_methods: [CheckoutShippingMethod]
+}
+
+input ApplyCouponToCartInput {
+    cart_id: String!
+    coupon_code: String!
+}
+
+type ApplyCouponToCartOutput {
+    cart: Cart!
+}
+
+type Cart {
+    cart_id: String
+    items: [CartItemInterface]
+    applied_coupon: AppliedCoupon
+    addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddresses")
+}
+
+type CartAddress {
+    firstname: String
+    lastname: String
+    company: String
+    street: [String]
+    city: String
+    region: CartAddressRegion
+    postcode: String
+    country: CartAddressCountry
+    telephone: String
+    address_type: AdressTypeEnum
+    selected_shipping_method: CheckoutShippingMethod
+    available_shipping_methods: [CheckoutShippingMethod]
+    items_weight: Float
+    customer_notes: String
+    cart_items: [CartItemQuantity]
+}
+
+type CartItemQuantity {
+    cart_item_id: String!
+    quantity: Float!
+}
+
+type CartAddressRegion {
+    code: String
+    label: String
+}
+
+type CartAddressCountry {
+    code: String
+    label: String
+}
+
+type CheckoutShippingMethod {
+    code: String
+    label: String
+    free_shipping: Boolean!
+    error_message: String
+    # TODO: Add more complex structure for shipping rates
+}
+
+enum AdressTypeEnum {
+    SHIPPING
+    BILLING
+}
+
+type AppliedCoupon {
+    code: String!
+}
+
+input RemoveCouponFromCartInput {
+    cart_id: String!
+}
+
+type RemoveCouponFromCartOutput {
+    cart: Cart
+}
+
+input AddSimpleProductsToCartInput {
+    cart_id: String!
+    cartItems: [SimpleProductCartItemInput!]!
+}
+
+input SimpleProductCartItemInput {
+    data: CartItemInput!
+    customizable_options:[CustomizableOptionInput!]
+}
+
+input CustomizableOptionInput {
+    id: Int!
+    value: String!
+}
+
+type AddSimpleProductsToCartOutput {
+    cart: Cart!
+}
+
+type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
+    customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
+}
+
+input CartItemInput {
+    sku: String!
+    qty: Float!
+}
+
+interface CartItemInterface @typeResolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CartItemTypeResolver") {
+    id: String!
+    qty: Float!
+    product: ProductInterface!
+}
+
+type SelectedCustomizableOption {
+    id: Int!
+    label: String!
+    type: String!
+    is_required: Int!
+    values: [SelectedCustomizableOptionValue!]!
+    sort_order: Int!
+}
+
+type SelectedCustomizableOptionValue {
+    id: Int!
+    label: String!
+    value: String!
+    price: CartItemSelectedOptionValuePrice!
+    sort_order: Int!
+}
+
+type CartItemSelectedOptionValuePrice {
+    value: Float!
+    units: String!
+    type: PriceTypeEnum!
+}
diff --git a/app/code/Magento/QuoteGraphQl/registration.php b/app/code/Magento/QuoteGraphQl/registration.php
new file mode 100644
index 0000000000000..8c945d902ba3e
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_QuoteGraphQl', __DIR__);
diff --git a/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php b/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php
new file mode 100644
index 0000000000000..c606958df273d
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Controller\Adminhtml\Notification;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger as NotificationLogger;
+use Magento\Framework\App\ProductMetadataInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller to record that the current admin user has seen the release notification content
+ */
+class MarkUserNotified extends Action
+{
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @var NotificationLogger
+     */
+    private $notificationLogger;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * MarkUserNotified constructor.
+     *
+     * @param Action\Context $context
+     * @param ProductMetadataInterface $productMetadata
+     * @param NotificationLogger $notificationLogger
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Action\Context $context,
+        ProductMetadataInterface $productMetadata,
+        NotificationLogger $notificationLogger,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+        $this->productMetadata = $productMetadata;
+        $this->notificationLogger = $notificationLogger;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Log information about the last shown advertisement
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function execute()
+    {
+        try {
+            $responseContent = [
+                'success' => $this->notificationLogger->log(
+                    $this->_auth->getUser()->getId(),
+                    $this->productMetadata->getVersion()
+                ),
+                'error_message' => ''
+            ];
+        } catch (LocalizedException $e) {
+            $this->logger->error($e->getMessage());
+            $responseContent = [
+                'success' => false,
+                'error_message' => $e->getMessage()
+            ];
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            $responseContent = [
+                'success' => false,
+                'error_message' => __('It is impossible to log user action')
+            ];
+        }
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        return $resultJson->setData($responseContent);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return parent::_isAllowed();
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE.txt b/app/code/Magento/ReleaseNotification/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE.txt
rename to app/code/Magento/ReleaseNotification/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE_AFL.txt b/app/code/Magento/ReleaseNotification/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE_AFL.txt
rename to app/code/Magento/ReleaseNotification/LICENSE_AFL.txt
diff --git a/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
new file mode 100644
index 0000000000000..03dda34637242
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Model\Condition;
+
+use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
+use Magento\Framework\App\CacheInterface;
+
+/**
+ * Dynamic validator for UI release notification, manage UI component visibility.
+ * Return true if the logged in user has not seen the notification.
+ */
+class CanViewNotification implements VisibilityConditionInterface
+{
+    /**
+     * Unique condition name.
+     *
+     * @var string
+     */
+    private static $conditionName = 'can_view_notification';
+
+    /**
+     * Prefix for cache
+     *
+     * @var string
+     */
+    private static $cachePrefix = 'release-notification-popup-';
+
+    /**
+     * @var Logger
+     */
+    private $viewerLogger;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @var CacheInterface
+     */
+    private $cacheStorage;
+
+    /**
+     * CanViewNotification constructor.
+     *
+     * @param Logger $viewerLogger
+     * @param Session $session
+     * @param ProductMetadataInterface $productMetadata
+     * @param CacheInterface $cacheStorage
+     */
+    public function __construct(
+        Logger $viewerLogger,
+        Session $session,
+        ProductMetadataInterface $productMetadata,
+        CacheInterface $cacheStorage
+    ) {
+        $this->viewerLogger = $viewerLogger;
+        $this->session = $session;
+        $this->productMetadata = $productMetadata;
+        $this->cacheStorage = $cacheStorage;
+    }
+
+    /**
+     * Validate if notification popup can be shown and set the notification flag
+     *
+     * @inheritdoc
+     */
+    public function isVisible(array $arguments)
+    {
+        $userId = $this->session->getUser()->getId();
+        $cacheKey = self::$cachePrefix . $userId;
+        $value = $this->cacheStorage->load($cacheKey);
+        if ($value === false) {
+            $value = version_compare(
+                $this->viewerLogger->get($userId)->getLastViewVersion(),
+                $this->productMetadata->getVersion(),
+                '<'
+            );
+            $this->cacheStorage->save(false, $cacheKey);
+        }
+        return (bool)$value;
+    }
+
+    /**
+     * Get condition name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return self::$conditionName;
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/HttpContentProvider.php b/app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/HttpContentProvider.php
new file mode 100644
index 0000000000000..41002ab769e57
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/HttpContentProvider.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Model\ContentProvider\Http;
+
+use Magento\ReleaseNotification\Model\ContentProviderInterface;
+use Magento\Setup\Module\I18n\Locale;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\HTTP\ClientInterface;
+
+/**
+ * Requests the release notification content data via an HTTP call to a REST API
+ */
+class HttpContentProvider implements ContentProviderInterface
+{
+    /**
+     * @var ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var UrlBuilder
+     */
+    private $urlBuilder;
+
+    /**
+     * HttpContentProvider constructor.
+     * @param ClientInterface $httpClient
+     * @param UrlBuilder $urlBuilder
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ClientInterface $httpClient,
+        UrlBuilder $urlBuilder,
+        LoggerInterface $logger
+    ) {
+        $this->httpClient = $httpClient;
+        $this->urlBuilder = $urlBuilder;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getContent($version, $edition, $locale)
+    {
+        $result = false;
+
+        try {
+            $result = $this->retrieveContent($version, $edition, $locale);
+            if (!$result) {
+                $result = $this->retrieveContent($version, $edition, Locale::DEFAULT_SYSTEM_LOCALE);
+                if (!$result) {
+                    $result = $this->retrieveContent($version, '', 'default');
+                }
+            }
+        } catch (\Exception $e) {
+            $this->logger->warning(
+                sprintf(
+                    'Failed to retrieve the release notification content. The response is: %s',
+                    empty($result) ? 'Response body is empty.' : $result
+                )
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Retrieve content from given url
+     *
+     * @param string $version
+     * @param string $edition
+     * @param string $locale
+     * @return bool|string
+     */
+    private function retrieveContent($version, $edition, $locale)
+    {
+        $url = $this->urlBuilder->getUrl($version, $edition, $locale);
+        return empty($url) ? false : $this->getResponse($url);
+    }
+
+    /**
+     * Returns the response body from the HTTP client
+     *
+     * @param $url
+     * @return string
+     */
+    private function getResponse($url)
+    {
+        $this->httpClient->get($url);
+        $responseBody = $this->httpClient->getBody();
+
+        if ($this->httpClient->getStatus() === 200 && !empty($responseBody)) {
+            return $responseBody;
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/UrlBuilder.php b/app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/UrlBuilder.php
new file mode 100644
index 0000000000000..96a5aaf3ce4d2
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/UrlBuilder.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Model\ContentProvider\Http;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Builder to build Url to retrieve the notification content.
+ */
+class UrlBuilder
+{
+    /**
+     * Path to the configuration value which contains an URL that provides the release notification data.
+     *
+     * @var string
+     */
+    private static $notificationContentUrlConfigPath = 'system/release_notification/content_url';
+
+    /**
+     * Path to the configuration value indicates if use https in notification content request.
+     *
+     * @var string
+     */
+    private static $useHttpsFlagConfigPath = 'system/release_notification/use_https';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ScopeConfigInterface $config
+     */
+    public function __construct(ScopeConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Builds the URL to request the release notification content data based on passed parameters.
+     *
+     * @param string $version
+     * @param string $edition
+     * @param string $locale
+     * @return string
+     */
+    public function getUrl($version, $edition, $locale)
+    {
+        $scheme = $this->config->isSetFlag(self::$useHttpsFlagConfigPath) ? 'https://' : 'http://';
+        $baseUrl = $this->config->getValue(self::$notificationContentUrlConfigPath);
+        if (empty($baseUrl)) {
+            return '';
+        } else {
+            $url = $scheme . $baseUrl;
+            $url .= empty($version) ? '' : '/' . $version;
+            $url .= empty($edition) ? '' : '/' . $edition;
+            $url .= empty($locale) ? '' : '/' . $locale;
+            return $url . '.json';
+        }
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/ContentProviderInterface.php b/app/code/Magento/ReleaseNotification/Model/ContentProviderInterface.php
new file mode 100644
index 0000000000000..ea0e400eccdaf
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/ContentProviderInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Model;
+
+/**
+ * Requests the release notification content data from a defined service
+ */
+interface ContentProviderInterface
+{
+    /**
+     * Retrieves the release notification content data.
+     *
+     * @param string $version
+     * @param string $edition
+     * @param string $locale
+     *
+     * @return string|false
+     */
+    public function getContent($version, $edition, $locale);
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php b/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
new file mode 100644
index 0000000000000..967ccabcdb49c
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReleaseNotification\Model\ResourceModel\Viewer;
+
+use Magento\ReleaseNotification\Model\Viewer\Log;
+use Magento\ReleaseNotification\Model\Viewer\LogFactory;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Release notification viewer log data logger.
+ *
+ * Saves and retrieves release notification viewer log data.
+ */
+class Logger
+{
+    /**
+     * Log table name
+     */
+    const LOG_TABLE_NAME = 'release_notification_viewer_log';
+
+    /**
+     * @var Resource
+     */
+    private $resource;
+
+    /**
+     * @var LogFactory
+     */
+    private $logFactory;
+
+    /**
+     * Logger constructor.
+     * @param ResourceConnection $resource
+     * @param LogFactory $logFactory
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        LogFactory $logFactory
+    ) {
+        $this->resource = $resource;
+        $this->logFactory = $logFactory;
+    }
+
+    /**
+     * Save (insert new or update existing) log.
+     *
+     * @param int $viewerId
+     * @param string $lastViewVersion
+     * @return bool
+     */
+    public function log(int $viewerId, string $lastViewVersion) : bool
+    {
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
+        $connection = $this->resource->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+        $connection->insertOnDuplicate(
+            $this->resource->getTableName(self::LOG_TABLE_NAME),
+            [
+                'viewer_id' => $viewerId,
+                'last_view_version' => $lastViewVersion
+            ],
+            [
+                'last_view_version'
+            ]
+        );
+        return true;
+    }
+
+    /**
+     * Get log by viewer Id.
+     *
+     * @param int $viewerId
+     * @return Log
+     */
+    public function get(int $viewerId) : Log
+    {
+        return $this->logFactory->create(['data' => $this->loadLogData($viewerId)]);
+    }
+
+    /**
+     * Load release notification viewer log data by viewer id
+     *
+     * @param int $viewerId
+     * @return array
+     */
+    private function loadLogData(int $viewerId) : array
+    {
+        $connection = $this->resource->getConnection();
+        $select = $connection->select()
+            ->from($this->resource->getTableName(self::LOG_TABLE_NAME))
+            ->where('viewer_id = ?', $viewerId);
+
+        $data = $connection->fetchRow($select);
+        if (!$data) {
+            $data = [];
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Model/Viewer/Log.php b/app/code/Magento/ReleaseNotification/Model/Viewer/Log.php
new file mode 100644
index 0000000000000..2cf3e6770c762
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Model/Viewer/Log.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Model\Viewer;
+
+use Magento\Framework\DataObject;
+
+/**
+ * Release notification viewer log resource
+ */
+class Log extends DataObject
+{
+    /**
+     * Get log id
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->getData('id');
+    }
+
+    /**
+     * Get viewer id
+     *
+     * @return int
+     */
+    public function getViewerId()
+    {
+        return $this->getData('viewer_id');
+    }
+
+    /**
+     * Get last viewed product version
+     *
+     * @return string
+     */
+    public function getLastViewVersion()
+    {
+        return $this->getData('last_view_version');
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/README.md b/app/code/Magento/ReleaseNotification/README.md
new file mode 100644
index 0000000000000..df3206a176f09
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/README.md
@@ -0,0 +1,53 @@
+ # Magento_ReleaseNotification Module
+
+The **Release Notification Module** serves to provide a notification delivery platform for displaying new features of a Magento installation or upgrade as well as any other required release notifications.
+
+## Purpose and Content
+
+* Provides a method of notifying administrators of changes, features, and functionality being introduced in a Magento release.
+* Displays a modal containing a high level overview of the features included in the installed or upgraded release of Magento upon the initial login of each administrator into the Admin Panel for a given Magento version.
+* The modal is enabled with pagination functionality to allow for easy navigation between each modal page.
+* Each modal page includes detailed information about a highlighted feature of the Magento release or other notification.
+* Release Notification modal content is determined and provided by Magento Marketing.
+
+## Content Retrieval
+
+Release notification content is maintained by Magento for each Magento version, edition, and locale. To retrieve the content, a response is returned from a request with the following parameters:
+
+*  **version** = The Magento version that the client has installed (ex. 2.3.0).
+*  **edition** = The Magento edition that the client has installed (ex. Community).
+*  **locale** = The chosen locale of the admin user (ex. en_US).
+
+The module will make three attempts to retrieve content for the parameters in the order listed:
+
+1. Version/Edition/Locale
+2. Version/Edition/en_US (default locale)
+3. Version (default file for a Magento version)
+
+If there is no content to be retrieved after these requests, the release notification modal will not be displayed to the admin user.
+
+## Content Guidelines
+
+The modal system in the ReleaseNotification module can have up to four modal pages. The admin user can navigate between pages using the "< Prev" and "Next >" buttons at the bottom of the modal. The last modal page will have a "Done" button that will close the modal and record that the admin user has seen the notification. 
+
+Each modal page can have the following optional content:
+
+* Main Content
+    * Title
+    * URL to the image to be displayed alongside the title
+    * Text body
+    * Bullet point list
+* Sub Headings (highlighted overviews of the content to be detailed on subsequent modal pages) - one to three Sub Headings may be displayed
+    * Sub heading title
+    * URL to the image to be display before the sub heading title
+    * Sub heading content
+* Footer
+    * Footer content text
+
+The Sub Heading section is ideally used on the first modal page as a way to describe one to three highlighted features that will be presented in greater detail on the following modal pages. It is recommended to use the Main Content -> Text Body and Bullet Point lists as the paragraph and list content displayed on a highlighted feature's detail modal page.
+
+A clickable link to internal or external content in any text field will be created by using the following format and opened in a new browser tab. Providing the URL for the link followed by the text to be displayed for that link in brackets will cause a clickable link to be created. The text between the brackets [text] will be the text that the clickable link shows.
+
+### Link Format Example:
+
+The text: `http://devdocs.magento.com/ [Magento DevDocs].` will appear as [Magento DevDocs](http://devdocs.magento.com/).
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE.txt b/app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE.txt
rename to app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE_AFL.txt b/app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE_AFL.txt
rename to app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ReleaseNotification/Test/Mftf/README.md b/app/code/Magento/ReleaseNotification/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a8c47e35e0c85
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Release Notification Functional Tests
+
+The Functional Test Module for **Magento Release Notification** module.
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
new file mode 100644
index 0000000000000..5bb443e41d0a3
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReleaseNotification\Test\Unit\Controller\Notification;
+
+use Psr\Log\LoggerInterface;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\Auth\Credential\StorageInterface;
+use Magento\Backend\Model\Auth;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger as NotificationLogger;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\ReleaseNotification\Controller\Adminhtml\Notification\MarkUserNotified;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MarkUserNotifiedTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|StorageInterface
+     */
+    private $storageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Auth
+     */
+    private $authMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|LoggerInterface
+     */
+    private $loggerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Json
+     */
+    private $resultMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ProductMetadataInterface
+     */
+    private $productMetadataMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|NotificationLogger
+     */
+    private $notificationLoggerMock;
+
+    /**
+     * @var MarkUserNotified
+     */
+    private $action;
+
+    public function setUp()
+    {
+        $this->storageMock = $this->getMockBuilder(StorageInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $this->authMock = $this->getMockBuilder(Auth::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextMock->expects($this->once())
+            ->method('getAuth')
+            ->willReturn($this->authMock);
+        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
+            ->getMockForAbstractClass();
+        $this->notificationLoggerMock = $this->getMockBuilder(NotificationLogger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->getMock();
+        $resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON)
+            ->willReturn($this->resultMock);
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->action = $objectManagerHelper->getObject(
+            MarkUserNotified::class,
+            [
+                'resultFactory' => $resultFactoryMock,
+                'productMetadata' => $this->productMetadataMock,
+                'notificationLogger' => $this->notificationLoggerMock,
+                'context' => $contextMock,
+                'logger' => $this->loggerMock
+            ]
+        );
+    }
+
+    public function testExecuteSuccess()
+    {
+        $this->authMock->expects($this->once())
+            ->method('getUser')
+            ->willReturn($this->storageMock);
+        $this->storageMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMetadataMock->expects($this->once())
+            ->method('getVersion')
+            ->willReturn('999.999.999-alpha');
+        $this->notificationLoggerMock->expects($this->once())
+            ->method('log')
+            ->with(1, '999.999.999-alpha')
+            ->willReturn(true);
+        $this->resultMock->expects($this->once())
+            ->method('setData')
+            ->with(
+                [
+                    'success' => true,
+                    'error_message' => ''
+                ],
+                false,
+                []
+            )->willReturnSelf();
+        $this->assertEquals($this->resultMock, $this->action->execute());
+    }
+
+    public function testExecuteFailedWithLocalizedException()
+    {
+        $this->authMock->expects($this->once())
+            ->method('getUser')
+            ->willReturn($this->storageMock);
+        $this->storageMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMetadataMock->expects($this->once())
+            ->method('getVersion')
+            ->willReturn('999.999.999-alpha');
+        $this->notificationLoggerMock->expects($this->once())
+            ->method('log')
+            ->willThrowException(new LocalizedException(__('Error message')));
+        $this->resultMock->expects($this->once())
+            ->method('setData')
+            ->with(
+                [
+                    'success' => false,
+                    'error_message' => 'Error message'
+                ],
+                false,
+                []
+            )->willReturnSelf();
+        $this->assertEquals($this->resultMock, $this->action->execute());
+    }
+
+    public function testExecuteFailedWithException()
+    {
+        $this->authMock->expects($this->once())
+            ->method('getUser')
+            ->willReturn($this->storageMock);
+        $this->storageMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMetadataMock->expects($this->once())
+            ->method('getVersion')
+            ->willReturn('999.999.999-alpha');
+        $this->notificationLoggerMock->expects($this->once())
+            ->method('log')
+            ->willThrowException(new \Exception('Any message'));
+        $this->resultMock->expects($this->once())
+            ->method('setData')
+            ->with(
+                [
+                    'success' => false,
+                    'error_message' => __('It is impossible to log user action')
+                ],
+                false,
+                []
+            )->willReturnSelf();
+        $this->assertEquals($this->resultMock, $this->action->execute());
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
new file mode 100644
index 0000000000000..55f448730a506
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Test\Unit\Model\Condition;
+
+use Magento\ReleaseNotification\Model\Condition\CanViewNotification;
+use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger;
+use Magento\ReleaseNotification\Model\Viewer\Log;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\App\CacheInterface;
+
+class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var CanViewNotification */
+    private $canViewNotification;
+
+    /** @var  Logger|\PHPUnit_Framework_MockObject_MockObject */
+    private $viewerLoggerMock;
+
+    /** @var ProductMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $productMetadataMock;
+
+    /** @var Session|\PHPUnit_Framework_MockObject_MockObject */
+    private $sessionMock;
+
+    /** @var  Log|\PHPUnit_Framework_MockObject_MockObject */
+    private $logMock;
+
+    /** @var  $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
+    private $cacheStorageMock;
+
+    public function setUp()
+    {
+        $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
+            ->getMockForAbstractClass();
+        $this->logMock = $this->getMockBuilder(Log::class)
+            ->getMock();
+        $this->sessionMock = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUser', 'getId'])
+            ->getMock();
+        $this->viewerLoggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager = new ObjectManager($this);
+        $this->canViewNotification = $objectManager->getObject(
+            CanViewNotification::class,
+            [
+                'viewerLogger' => $this->viewerLoggerMock,
+                'session' => $this->sessionMock,
+                'productMetadata' => $this->productMetadataMock,
+                'cacheStorage' => $this->cacheStorageMock,
+            ]
+        );
+    }
+
+    public function testIsVisibleLoadDataFromCache()
+    {
+        $this->sessionMock->expects($this->once())
+            ->method('getUser')
+            ->willReturn($this->sessionMock);
+        $this->sessionMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->cacheStorageMock->expects($this->once())
+            ->method('load')
+            ->with('release-notification-popup-1')
+            ->willReturn("0");
+        $this->assertEquals(false, $this->canViewNotification->isVisible([]));
+    }
+
+    /**
+     * @param bool $expected
+     * @param string $version
+     * @param string|null $lastViewVersion
+     * @dataProvider isVisibleProvider
+     */
+    public function testIsVisible($expected, $version, $lastViewVersion)
+    {
+        $this->cacheStorageMock->expects($this->once())
+            ->method('load')
+            ->with('release-notification-popup-1')
+            ->willReturn(false);
+        $this->sessionMock->expects($this->once())
+            ->method('getUser')
+            ->willReturn($this->sessionMock);
+        $this->sessionMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMetadataMock->expects($this->once())
+            ->method('getVersion')
+            ->willReturn($version);
+        $this->logMock->expects($this->once())
+            ->method('getLastViewVersion')
+            ->willReturn($lastViewVersion);
+        $this->viewerLoggerMock->expects($this->once())
+            ->method('get')
+            ->with(1)
+            ->willReturn($this->logMock);
+        $this->cacheStorageMock->expects($this->once())
+            ->method('save')
+            ->with(false, 'release-notification-popup-1');
+        $this->assertEquals($expected, $this->canViewNotification->isVisible([]));
+    }
+
+    /**
+     * @return array
+     */
+    public function isVisibleProvider()
+    {
+        return [
+            [false, '2.2.1-dev', '999.999.999-alpha'],
+            [true, '2.2.1-dev', '2.0.0'],
+            [true, '2.2.1-dev', null],
+            [false, '2.2.1-dev', '2.2.1'],
+            [true, '2.2.1-dev', '2.2.0'],
+            [true, '2.3.0', '2.2.0'],
+            [false, '2.2.2', '2.2.2'],
+        ];
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/HttpContentProviderTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/HttpContentProviderTest.php
new file mode 100644
index 0000000000000..9f3affbba2ebc
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/HttpContentProviderTest.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Test\Unit\Model\ContentProvider\Http;
+
+use Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider;
+use Magento\ReleaseNotification\Model\ContentProvider\Http\UrlBuilder;
+use Magento\Framework\HTTP\ClientInterface;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * A unit test for testing of the representation of a HttpContentProvider request.
+ */
+class HttpContentProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var HttpContentProvider
+     */
+    private $httpContentProvider;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var UrlBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlBuilderMock;
+
+    /**
+     * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $httpClientMock;
+
+    public function setUp()
+    {
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
+        $this->urlBuilderMock = $this->getMockBuilder(UrlBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
+        $this->httpClientMock = $this->getMockBuilder(ClientInterface::class)
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManager($this);
+        $this->httpContentProvider = $objectManager->getObject(
+            HttpContentProvider::class,
+            [
+                'httpClient' => $this->httpClientMock,
+                'urlBuilder' => $this->urlBuilderMock,
+                'logger' => $this->loggerMock
+            ]
+        );
+    }
+
+    public function testGetContentSuccess()
+    {
+        $version = '2.3.0';
+        $edition = 'Community';
+        $locale = 'fr_FR';
+        $url = 'https://content.url.example/'. $version . '/' . $edition . '/' . $locale . '.json';
+        $response = '{"return":"success"}';
+
+        $this->urlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->willReturn($url);
+        $this->httpClientMock->expects($this->once())
+            ->method('get')
+            ->with($url);
+        $this->httpClientMock->expects($this->once())
+            ->method('getBody')
+            ->willReturn($response);
+        $this->httpClientMock->expects($this->once())
+            ->method('getStatus')
+            ->willReturn(200);
+        $this->loggerMock->expects($this->never())
+            ->method('warning');
+
+        $this->assertEquals($response, $this->httpContentProvider->getContent($version, $edition, $locale));
+    }
+
+    public function testGetContentFailure()
+    {
+        $version = '2.3.5';
+        $edition = 'Community';
+        $locale = 'fr_FR';
+        $url = 'https://content.url.example/'. $version . '/' . $edition . '/' . $locale . '.json';
+
+        $this->urlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->with($version, $edition, $locale)
+            ->willReturn($url);
+        $this->httpClientMock->expects($this->once())
+            ->method('get')
+            ->with($url)
+            ->will($this->throwException(new \Exception));
+        $this->httpClientMock->expects($this->never())->method('getBody');
+        $this->loggerMock->expects($this->once())
+            ->method('warning');
+
+        $this->assertFalse($this->httpContentProvider->getContent($version, $edition, $locale));
+    }
+
+    public function testGetContentSuccessOnLocaleDefault()
+    {
+        $version = '2.3.1';
+        $edition = 'Community';
+        $locale = 'fr_FR';
+        $urlLocale = 'https://content.url.example/'. $version . '/' . $edition . '/' . $locale . '.json';
+        $urlDefaultLocale = 'https://content.url.example/'. $version . '/' . $edition . '/en_US.json';
+        $response = '{"return":"default-locale"}';
+
+        $this->urlBuilderMock->expects($this->exactly(2))
+            ->method('getUrl')
+            ->withConsecutive(
+                [$version, $edition, $locale],
+                [$version, $edition, 'en_US']
+            )
+            ->willReturnOnConsecutiveCalls($urlLocale, $urlDefaultLocale);
+        $this->httpClientMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive([$urlLocale], [$urlDefaultLocale]);
+        $this->httpClientMock->expects($this->exactly(2))
+            ->method('getBody')
+            ->willReturnOnConsecutiveCalls('', $response);
+        $this->httpClientMock->expects($this->exactly(2))
+            ->method('getStatus')
+            ->willReturnOnConsecutiveCalls(404, 200);
+        $this->loggerMock->expects($this->never())
+            ->method('warning');
+
+        $this->assertEquals($response, $this->httpContentProvider->getContent($version, $edition, $locale));
+    }
+
+    /**
+     * @param string $version
+     * @param string $edition
+     * @param string $locale
+     * @param string $response
+     * @dataProvider getGetContentOnDefaultOrEmptyProvider
+     */
+    public function testGetContentSuccessOnDefaultOrEmpty($version, $edition, $locale, $response)
+    {
+        $urlLocale = 'https://content.url.example/'. $version . '/' . $edition . '/' . $locale . '.json';
+        $urlDefaultLocale = 'https://content.url.example/'. $version . '/' . $edition . '/en_US.json';
+        $urlDefault = 'https://content.url.example/' . $version . '/default.json';
+
+        $this->urlBuilderMock->expects($this->exactly(3))
+            ->method('getUrl')
+            ->withConsecutive(
+                [$version, $edition, $locale],
+                [$version, $edition, 'en_US'],
+                [$version, '', 'default']
+            )
+            ->willReturnOnConsecutiveCalls($urlLocale, $urlDefaultLocale, $urlDefault);
+        $this->httpClientMock->expects($this->exactly(3))
+            ->method('get')
+            ->withConsecutive([$urlLocale], [$urlDefaultLocale], [$urlDefault]);
+        $this->httpClientMock->expects($this->exactly(3))
+            ->method('getBody')
+            ->willReturnOnConsecutiveCalls('', '', $response);
+        $this->httpClientMock->expects($this->exactly(3))
+            ->method('getStatus')
+            ->willReturnOnConsecutiveCalls(404, 404, 200);
+        $this->loggerMock->expects($this->never())
+            ->method('warning');
+
+        $this->assertEquals($response, $this->httpContentProvider->getContent($version, $edition, $locale));
+    }
+
+    /**
+     * @return array
+     */
+    public function getGetContentOnDefaultOrEmptyProvider()
+    {
+        return [
+            'default-fr_FR' => [
+                '2.3.0',
+                'Community',
+                'fr_FR',
+                '{"return":"default-fr_FR"}'
+            ],
+            'default-en_US' => [
+                '2.3.0',
+                'Community',
+                'en_US',
+                '{"return":"default-en_US"}'
+            ],
+            'empty-fr_FR' => [
+                '2.3.0',
+                'Community',
+                'fr_FR',
+                '{"return":"empty-fr_FR"}'
+            ],
+            'empty-en_US' => [
+                '2.3.0',
+                'Community',
+                'en_US',
+                '{"return":"empty-en_US"}'
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/UrlBuilderTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/UrlBuilderTest.php
new file mode 100644
index 0000000000000..46b3edf85826e
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/UrlBuilderTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Test\Unit\Model\ContentProvider\Http;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\ReleaseNotification\Model\ContentProvider\Http\UrlBuilder;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class UrlBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var UrlBuilder
+     */
+    private $urlBuilder;
+
+    public function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManager($this);
+        $this->urlBuilder = $objectManager->getObject(
+            UrlBuilder::class,
+            [
+                'config' => $this->configMock,
+            ]
+        );
+    }
+
+    /**
+     * @param string $baseUrl
+     * @param string $expected
+     * @param string $version
+     * @param string $edition
+     * @param string $locale
+     * @dataProvider getUrlDataProvider
+     */
+    public function testGetUrl($baseUrl, $version, $edition, $locale, $expected)
+    {
+        $this->configMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($baseUrl);
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->willReturn(1);
+        $this->assertEquals(
+            $expected,
+            $this->urlBuilder->getUrl($version, $edition, $locale)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getUrlDataProvider()
+    {
+        return [
+            'all' => [
+                'content/url/example',
+                'version',
+                'edition',
+                'locale',
+                'https://content/url/example/version/edition/locale.json'
+            ],
+            'no-edition' => [
+                'content/url/example',
+                'version',
+                '',
+                'locale',
+                'https://content/url/example/version/locale.json'
+            ],
+            'no-locale' => [
+                'content/url/example',
+                'version',
+                'edition',
+                '',
+                'https://content/url/example/version/edition.json'
+            ],
+            'no-content-url' => [
+                '',
+                'version',
+                'edition',
+                'locale',
+                ''
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Ui/DataProvider/Modifier/Notifications.php b/app/code/Magento/ReleaseNotification/Ui/DataProvider/Modifier/Notifications.php
new file mode 100644
index 0000000000000..e82d61d499663
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Ui/DataProvider/Modifier/Notifications.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Ui\DataProvider\Modifier;
+
+use Magento\ReleaseNotification\Model\ContentProviderInterface;
+use Magento\ReleaseNotification\Ui\Renderer\NotificationRenderer;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\App\CacheInterface;
+use Magento\Ui\Component;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Backend\Model\Auth\Session;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Modifies the metadata returning to the Release Notification data provider
+ */
+class Notifications implements ModifierInterface
+{
+    /**
+     * @var ContentProviderInterface
+     */
+    private $contentProvider;
+
+    /**
+     * @var NotificationRenderer
+     */
+    private $renderer;
+
+    /**
+     * Prefix for cache
+     *
+     * @var string
+     */
+    private static $cachePrefix = 'release-notification-content-';
+
+    /**
+     * @var CacheInterface
+     */
+    private $cacheStorage;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param ContentProviderInterface $contentProvider
+     * @param NotificationRenderer $render
+     * @param CacheInterface $cacheStorage
+     * @param SerializerInterface $serializer
+     * @param ProductMetadataInterface $productMetadata
+     * @param Session $session
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ContentProviderInterface $contentProvider,
+        NotificationRenderer $render,
+        CacheInterface $cacheStorage,
+        SerializerInterface $serializer,
+        ProductMetadataInterface $productMetadata,
+        Session $session,
+        LoggerInterface $logger
+    ) {
+        $this->contentProvider = $contentProvider;
+        $this->renderer = $render;
+        $this->cacheStorage = $cacheStorage;
+        $this->serializer = $serializer;
+        $this->productMetadata = $productMetadata;
+        $this->session = $session;
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function modifyData(array $data)
+    {
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function modifyMeta(array $meta)
+    {
+        $modalContent = $this->getNotificationContent();
+
+        if ($modalContent) {
+            $pages = $modalContent['pages'];
+            $pageCount = count($pages);
+            $counter = 1;
+
+            foreach ($pages as $page) {
+                $meta = $this->buildNotificationMeta($meta, $page, $counter++ == $pageCount);
+            }
+        } else {
+            $meta = $this->hideNotification($meta);
+        }
+
+        return $meta;
+    }
+
+    /**
+     * Builds the notification modal by modifying $meta for the ui component
+     *
+     * @param array $meta
+     * @param array $page
+     * @param bool $isLastPage
+     * @return array
+     */
+    private function buildNotificationMeta(array $meta, array $page, $isLastPage)
+    {
+        $meta['notification_modal_' . $page['name']]['arguments']['data']['config'] = [
+            'isTemplate' => false,
+            'componentType' => Component\Modal::NAME
+        ];
+
+        $meta['notification_modal_' . $page['name']]['children']['notification_fieldset']['children']
+        ['notification_text']['arguments']['data']['config'] = [
+            'text' => $this->renderer->getNotificationContent($page)
+        ];
+
+        if ($isLastPage) {
+            $meta['notification_modal_' . $page['name']]['arguments']['data']['config']['options'] = [
+                'title' => $this->renderer->getNotificationTitle($page),
+                'buttons' => [
+                    [
+                        'text' => 'Done',
+                        'actions' => [
+                            [
+                                'targetName' => '${ $.name }',
+                                'actionName' => 'closeReleaseNotes'
+                            ]
+                        ],
+                        'class' => 'release-notification-button-next'
+                    ]
+                ],
+            ];
+
+            $meta['notification_modal_' . $page['name']]['children']['notification_fieldset']['children']
+            ['notification_buttons']['children']['notification_button_next']['arguments']['data']['config'] = [
+                'buttonClasses' => 'hide-release-notification'
+            ];
+        } else {
+            $meta['notification_modal_' . $page['name']]['arguments']['data']['config']['options'] = [
+                'title' => $this->renderer->getNotificationTitle($page)
+            ];
+        }
+
+        return $meta;
+    }
+
+    /**
+     * Sets the modal to not display if no content is available.
+     *
+     * @param array $meta
+     * @return array
+     */
+    private function hideNotification(array $meta)
+    {
+        $meta['notification_modal_1']['arguments']['data']['config']['options'] = [
+            'autoOpen' => false
+        ];
+
+        return $meta;
+    }
+
+    /**
+     * Returns the notification modal content data
+     *
+     * @returns array|false
+     */
+    private function getNotificationContent()
+    {
+        $version = strtolower($this->getTargetVersion());
+        $edition = strtolower($this->productMetadata->getEdition());
+        $locale = strtolower($this->session->getUser()->getInterfaceLocale());
+
+        $cacheKey = self::$cachePrefix . $version . "-" . $edition . "-" . $locale;
+        $modalContent = $this->cacheStorage->load($cacheKey);
+        if ($modalContent === false) {
+            $modalContent = $this->contentProvider->getContent($version, $edition, $locale);
+            $this->cacheStorage->save($modalContent, $cacheKey);
+        }
+
+        return !$modalContent ? $modalContent : $this->unserializeContent($modalContent);
+    }
+
+    /**
+     * Unserializes the notification modal content to be used for rendering
+     *
+     * @param string $modalContent
+     * @return array|false
+     */
+    private function unserializeContent($modalContent)
+    {
+        $result = false;
+
+        try {
+            $result = $this->serializer->unserialize($modalContent);
+        } catch (\InvalidArgumentException $e) {
+            $this->logger->warning(
+                sprintf(
+                    'Failed to unserialize the release notification content. The error is: %s',
+                    $e->getMessage()
+                )
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the current Magento version used to retrieve the release notification content.
+     * Version information after the dash (-) character is removed (ex. -dev or -rc).
+     *
+     * @return string
+     */
+    private function getTargetVersion()
+    {
+        $metadataVersion = $this->productMetadata->getVersion();
+        $version = strstr($metadataVersion, '-', true);
+
+        return !$version ? $metadataVersion : $version;
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php b/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php
new file mode 100644
index 0000000000000..a1e558a5a2f84
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Ui\DataProvider;
+
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
+
+/**
+ * Data Provider for the Release Notifications UI component.
+ */
+class NotificationDataProvider implements DataProviderInterface
+{
+    /**
+     * @var PoolInterface
+     */
+    private $pool;
+
+    /**
+     * Search result object.
+     *
+     * @var SearchResultInterface
+     */
+    private $searchResult;
+
+    /**
+     * Search criteria object.
+     *
+     * @var SearchCriteriaInterface
+     */
+    private $searchCriteria;
+
+    /**
+     * Own name of this provider.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Provider configuration data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Provider configuration meta.
+     *
+     * @var array
+     */
+    private $meta;
+
+    /**
+     * @param string $name
+     * @param SearchResultInterface $searchResult
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param PoolInterface $pool
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        $name,
+        SearchResultInterface $searchResult,
+        SearchCriteriaInterface $searchCriteria,
+        PoolInterface $pool,
+        array $meta = [],
+        array $data = []
+    ) {
+        $this->name = $name;
+        $this->searchResult = $searchResult;
+        $this->searchCriteria = $searchCriteria;
+        $this->pool = $pool;
+        $this->meta = $meta;
+        $this->data = $data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData()
+    {
+        /** @var ModifierInterface $modifier */
+        foreach ($this->pool->getModifiersInstances() as $modifier) {
+            $this->data = $modifier->modifyData($this->data);
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMeta()
+    {
+        /** @var ModifierInterface $modifier */
+        foreach ($this->pool->getModifiersInstances() as $modifier) {
+            $this->meta = $modifier->modifyMeta($this->meta);
+        }
+        return $this->meta;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConfigData()
+    {
+        return $this->data['config'] ?? [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setConfigData($config)
+    {
+        $this->data['config'] = $config;
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getFieldMetaInfo($fieldSetName, $fieldName)
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getFieldSetMetaInfo($fieldSetName)
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getFieldsMetaInfo($fieldSetName)
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPrimaryFieldName()
+    {
+        return 'release_notification';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRequestFieldName()
+    {
+        return 'release_notification';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFilter(\Magento\Framework\Api\Filter $filter)
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addOrder($field, $direction)
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setLimit($offset, $size)
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSearchCriteria()
+    {
+        return $this->searchCriteria;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSearchResult()
+    {
+        return $this->searchResult;
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php
new file mode 100644
index 0000000000000..c4760bd9d28c3
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Ui\Renderer;
+
+use Magento\Framework\Escaper;
+
+/**
+ * Builds the HTML for the release notification modals
+ */
+class NotificationRenderer
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Escaper $escaper
+     */
+    public function __construct(
+        Escaper $escaper
+    ) {
+        $this->escaper = $escaper;
+    }
+
+    /**
+     * Returns the HTML for notification's title to the ui component
+     *
+     * @param array $page
+     * @return string
+     */
+    public function getNotificationTitle(array $page)
+    {
+        $title = $this->escaper->escapeHtml($page['mainContent']['title']);
+        $imageUrl = $this->escaper->escapeUrl($page['mainContent']['imageUrl']);
+        $content = "";
+
+        if (!empty($imageUrl)) {
+            $content .= "<div class='release-notification-title-with-image' style='background-image: url(\"" . $imageUrl
+                . "\")'>";
+            $content .= $title;
+            $content .= "</div>";
+        } else {
+            $content = $title;
+        }
+
+        return $content;
+    }
+
+    /**
+     * Returns the HTML for the content in the notification ui component
+     *
+     * @param array $page
+     * @return string
+     */
+    public function getNotificationContent(array $page)
+    {
+        $content = $this->buildMainContent($page['mainContent']);
+        $content .= $this->buildSubHeadings($page['subHeading']);
+        $content .= $this->buildFooter($page['footer']);
+
+        return $content;
+    }
+
+    /**
+     * Builds the HTML for the main content in the notification ui component
+     *
+     * @param array $mainContent
+     * @return string
+     */
+    private function buildMainContent(array $mainContent)
+    {
+        $content = $this->buildContentTextAreas($mainContent['content']);
+        $content .= $this->buildLists($mainContent['lists']);
+
+        return $this->formatContentWithLinks($content);
+    }
+
+    /**
+     * Builds the HTML for the main text areas in the notification ui component
+     *
+     * @param array $contentAreas
+     * @return string
+     */
+    private function buildContentTextAreas(array $contentAreas)
+    {
+        $content = "";
+        $lastContentArea = end($contentAreas);
+
+        foreach ($contentAreas as $contentArea) {
+            $content .= "<p>";
+            $content .= $this->escaper->escapeHtml($contentArea['text']);
+            $content .= "</p>";
+            if ($contentArea != $lastContentArea) {
+                $content .= "<br />";
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * Builds the HTML for the bullet list content in the notification ui component
+     *
+     * @param array $lists
+     * @return string
+     */
+    private function buildLists(array $lists)
+    {
+        $content = "<ul>";
+
+        foreach ($lists as $listItem) {
+            $content .= "<li><span>";
+            $content .= $this->escaper->escapeHtml($listItem['text']);
+            $content .= "</span></li>";
+        }
+
+        $content .= "</ul>";
+
+        return $content;
+    }
+
+    /**
+     * Builds the HTML for the highlighted sub heads for the overview page in the notification ui component
+     *
+     * @param array $subHeadings
+     * @return string
+     */
+    private function buildSubHeadings(array $subHeadings)
+    {
+        $content = "";
+
+        foreach ($subHeadings as $subHeading) {
+            if (!empty($subHeading['imageUrl'])) {
+                $content .= "<div class='highlight-item' style='background-image: url(\""
+                    . $this->escaper->escapeUrl($subHeading['imageUrl']) . "\")'>";
+            } else {
+                $content .= "<div class='highlight-item-no-image'>";
+            }
+
+            $content .= "<h3>";
+            $content .= $this->escaper->escapeHtml($subHeading['title']);
+            $content .= "</h3>";
+            $content .= "<p>";
+            $content .= $this->formatContentWithLinks($subHeading['content']);
+            $content .= "</p>";
+            $content .= "</div>";
+        }
+
+        return $content;
+    }
+
+    /**
+     * Builds the HTML for the footer content in the notification ui component
+     *
+     * @param array $footer
+     * @return string
+     */
+    private function buildFooter(array $footer)
+    {
+        $content = "<p>";
+        $content .= $this->escaper->escapeHtml($footer['content']);
+        $content .= "</p>";
+
+        return $this->formatContentWithLinks($content);
+    }
+
+    /**
+     * Searches a given string for a URL, formats it to an HTML anchor tag, and returns the original string in the
+     * correct HTML format.
+     *
+     * @param string $content
+     * @return string
+     */
+    private function formatContentWithLinks($content)
+    {
+        $urlRegex = '#\bhttps?://[^,\s()<>]+(?:\([\w\d]+\)|([^,[:punct:]\s]|/))#';
+        $urlTextRegex = '/\[(.*?)\]/';
+
+        preg_match_all($urlRegex, $content, $urlMatches);
+        preg_match_all($urlTextRegex, $content, $urlTextMatches);
+
+        foreach ($urlMatches[0] as $key => $urlMatch) {
+            if (!empty($urlTextMatches[0])) {
+                $linkMatch = $urlMatch . " " . $urlTextMatches[0][$key];
+                $content = str_replace(
+                    $linkMatch,
+                    "<a target='_blank' href='{$this->escaper->escapeUrl($urlMatch)}'>
+                        {$this->escaper->escapeHtml($urlTextMatches[1][$key])}</a>",
+                    $content
+                );
+            } else {
+                $content = str_replace(
+                    $urlMatch,
+                    "<a target='_blank' href='{$this->escaper->escapeUrl($urlMatch)}'>
+                        {$this->escaper->escapeUrl($urlMatch)}</a>",
+                    $content
+                );
+            }
+        }
+
+        return $content;
+    }
+}
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
new file mode 100644
index 0000000000000..97b312b74ff74
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -0,0 +1,27 @@
+{
+  "name": "magento/module-release-notification",
+  "description": "N/A",
+  "require": {
+    "php": "~7.1.3||~7.2.0",
+    "magento/module-user": "*",
+    "magento/module-backend": "*",
+    "magento/module-ui": "*",
+    "magento/framework": "*"
+  },
+  "suggest": {
+    "magento/module-config": "*"
+  },
+  "type": "magento2-module",
+  "license": [
+    "OSL-3.0",
+    "AFL-3.0"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Magento\\ReleaseNotification\\": ""
+    }
+  }
+}
diff --git a/app/code/Magento/ReleaseNotification/etc/adminhtml/routes.xml b/app/code/Magento/ReleaseNotification/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..4b1ddc69ce3bd
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="releaseNotification" frontName="releaseNotification">
+            <module name="Magento_ReleaseNotification" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/ReleaseNotification/etc/config.xml b/app/code/Magento/ReleaseNotification/etc/config.xml
new file mode 100644
index 0000000000000..de67dc155d602
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <release_notification>
+                <content_url>magento.com/release_notifications</content_url>
+                <use_https>1</use_https>
+            </release_notification>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/ReleaseNotification/etc/db_schema.xml b/app/code/Magento/ReleaseNotification/etc/db_schema.xml
new file mode 100644
index 0000000000000..6f3aa481f73d4
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/db_schema.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="release_notification_viewer_log" resource="default" engine="innodb"
+           comment="Release Notification Viewer Log Table">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Log ID"/>
+        <column xsi:type="int" name="viewer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Viewer admin user ID"/>
+        <column xsi:type="varchar" name="last_view_version" nullable="false" length="16"
+                comment="Viewer last view on product version"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID_ADMIN_USER_USER_ID"
+                    table="release_notification_viewer_log" column="viewer_id" referenceTable="admin_user"
+                    referenceColumn="user_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID">
+            <column name="viewer_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/ReleaseNotification/etc/db_schema_whitelist.json b/app/code/Magento/ReleaseNotification/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..5edb2b7010be6
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/db_schema_whitelist.json
@@ -0,0 +1,14 @@
+{
+    "release_notification_viewer_log": {
+        "column": {
+            "id": true,
+            "viewer_id": true,
+            "last_view_version": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID_ADMIN_USER_USER_ID": true,
+            "RELEASE_NOTIFICATION_VIEWER_LOG_VIEWER_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/ReleaseNotification/etc/di.xml b/app/code/Magento/ReleaseNotification/etc/di.xml
new file mode 100644
index 0000000000000..1404a6adb0a10
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/etc/di.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
+    <preference for="Magento\ReleaseNotification\Model\ContentProviderInterface" type="Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider" />
+    <type name="Magento\Config\Model\Config\TypePool">
+        <arguments>
+            <argument name="sensitive" xsi:type="array">
+                <item name="releaseNotification/content_url" xsi:type="string">1</item>
+                <item name="releaseNotification/use_https" xsi:type="string">1</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="notificationPool" type="Magento\Ui\DataProvider\Modifier\Pool">
+        <arguments>
+            <argument name="modifiers" xsi:type="array">
+                <item name="notifications" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\ReleaseNotification\Ui\DataProvider\Modifier\Notifications</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\ReleaseNotification\Ui\DataProvider\NotificationDataProvider">
+        <arguments>
+            <argument name="pool" xsi:type="object">notificationPool</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/ReleaseNotification/etc/module.xml b/app/code/Magento/ReleaseNotification/etc/module.xml
new file mode 100644
index 0000000000000..a2d33eb593278
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/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_ReleaseNotification" >
+        <sequence>
+            <module name="Magento_User"/>
+            <module name="Magento_Backend"/>
+            <module name="Magento_Ui"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/ReleaseNotification/i18n/en_US.csv b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
new file mode 100644
index 0000000000000..426cdc0e863d2
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
@@ -0,0 +1,15 @@
+"Next >","Next >"
+"< Back","< Back"
+"Done","Done"
+"Sorry, we had a problem loading our “What’s new” content.","Sorry, we had a problem loading our “What’s new” content."
+"<![CDATA[
+    <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
+    <p>To learn more about new features, see our latest Release Notes in
+    <a href=""http://devdocs.magento.com/magento-release-information.html""
+    target=""_blank"">DevDocs' Release Information</a>.
+    </p>]]>","<![CDATA[
+    <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
+    <p>To learn more about new features, see our latest Release Notes in
+    <a href=""http://devdocs.magento.com/magento-release-information.html""
+    target=""_blank"">DevDocs' Release Information</a>.
+    </p>]]>"
diff --git a/app/code/Magento/ReleaseNotification/registration.php b/app/code/Magento/ReleaseNotification/registration.php
new file mode 100644
index 0000000000000..c5bce27f20387
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_ReleaseNotification',
+    __DIR__
+);
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/layout/adminhtml_dashboard_index.xml
new file mode 100644
index 0000000000000..34ce4e3daff84
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/layout/adminhtml_dashboard_index.xml
@@ -0,0 +1,17 @@
+<?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>
+        <referenceContainer name="content">
+            <uiComponent name="release_notification">
+                <visibilityCondition name="can_view_notification" className="Magento\ReleaseNotification\Model\Condition\CanViewNotification"/>
+            </uiComponent>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
new file mode 100644
index 0000000000000..3134b2a8af21e
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">release_notification.release_notification_data_source</item>
+        </item>
+        <item name="label" xsi:type="string" translate="true">Release Notification</item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <namespace>release_notification</namespace>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>release_notification.release_notification_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="release_notification_data_source">
+        <argument name="dataProvider" xsi:type="configurableObject">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="data" xsi:type="array">
+                        <item name="logAction" xsi:type="url" path="releaseNotification/notification/markUserNotified"/>
+                    </item>
+                </item>
+            </argument>
+        </argument>
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <dataProvider class="Magento\ReleaseNotification\Ui\DataProvider\NotificationDataProvider" name="release_notification_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>entity_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <modal name="notification_modal_1" component="Magento_ReleaseNotification/js/modal/component">
+        <settings>
+            <onCancel>actionCancel</onCancel>
+            <state>true</state>
+            <options>
+                <option name="modalClass" xsi:type="string">release-notification-modal</option>
+                <option name="title" xsi:type="string" translate="true">Sorry, we had a problem loading our “What’s new” content.</option>
+                <option name="type" xsi:type="string">popup</option>
+                <option name="responsive" xsi:type="boolean">true</option>
+                <option name="innerScroll" xsi:type="boolean">true</option>
+                <option name="autoOpen" xsi:type="boolean">true</option>
+            </options>
+        </settings>
+        <fieldset name="notification_fieldset">
+            <settings>
+                <label/>
+            </settings>
+            <container name="notification_text" template="ui/form/components/complex">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                        <item name="additionalClasses" xsi:type="string">release-notification-text</item>
+                        <item name="text" xsi:type="string" translate="true"><![CDATA[
+                        <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
+                        <p>To learn more about new features, see our latest Release Notes in
+                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        target="_blank">DevDocs' Release Information</a>.
+                        </p>]]></item>
+                    </item>
+                </argument>
+            </container>
+            <container name="notification_buttons">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                    </item>
+                </argument>
+                <button name="notification_button_next" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_1</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_2</item>
+                                    <item name="actionName" xsi:type="string">openModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title><![CDATA[Next >]]></title>
+                    </settings>
+                </button>
+            </container>
+        </fieldset>
+    </modal>
+    <modal name="notification_modal_2" component="Magento_ReleaseNotification/js/modal/component">
+        <settings>
+            <onCancel>actionCancel</onCancel>
+            <options>
+                <option name="modalClass" xsi:type="string">release-notification-modal</option>
+                <option name="title" xsi:type="string" translate="true">Sorry, we had a problem loading our “What’s new” content.</option>
+                <option name="type" xsi:type="string">popup</option>
+                <option name="responsive" xsi:type="boolean">true</option>
+                <option name="innerScroll" xsi:type="boolean">true</option>
+                <option name="autoOpen" xsi:type="boolean">false</option>
+            </options>
+        </settings>
+        <fieldset name="notification_fieldset">
+            <settings>
+                <label/>
+            </settings>
+            <container name="notification_text" template="ui/form/components/complex">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                        <item name="additionalClasses" xsi:type="string">release-notification-text</item>
+                        <item name="text" xsi:type="string" translate="true"><![CDATA[
+                        <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
+                        <p>To learn more about new features, see our latest Release Notes in
+                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        target="_blank">DevDocs' Release Information</a>.
+                        </p>]]></item>
+                    </item>
+                </argument>
+            </container>
+            <container name="notification_buttons">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                    </item>
+                </argument>
+                <button name="notification_button_back" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_2</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_1</item>
+                                    <item name="actionName" xsi:type="string">openModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title><![CDATA[< Back]]></title>
+                    </settings>
+                </button>
+                <button name="notification_button_next" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_2</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_3</item>
+                                    <item name="actionName" xsi:type="string">openModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title><![CDATA[Next >]]></title>
+                    </settings>
+                </button>
+            </container>
+        </fieldset>
+    </modal>
+    <modal name="notification_modal_3" component="Magento_ReleaseNotification/js/modal/component">
+        <settings>
+            <onCancel>actionCancel</onCancel>
+            <options>
+                <option name="modalClass" xsi:type="string">release-notification-modal</option>
+                <option name="title" xsi:type="string" translate="true">Sorry, we had a problem loading our “What’s new” content.</option>
+                <option name="type" xsi:type="string">popup</option>
+                <option name="responsive" xsi:type="boolean">true</option>
+                <option name="innerScroll" xsi:type="boolean">true</option>
+                <option name="autoOpen" xsi:type="boolean">false</option>
+            </options>
+        </settings>
+        <fieldset name="notification_fieldset">
+            <settings>
+                <label/>
+            </settings>
+            <container name="notification_text" template="ui/form/components/complex">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                        <item name="additionalClasses" xsi:type="string">release-notification-text</item>
+                        <item name="text" xsi:type="string" translate="true"><![CDATA[
+                        <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
+                        <p>To learn more about new features, see our latest Release Notes in
+                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        target="_blank">DevDocs' Release Information</a>.
+                        </p>]]></item>
+                    </item>
+                </argument>
+            </container>
+            <container name="notification_buttons">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                    </item>
+                </argument>
+                <button name="notification_button_back" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_3</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_2</item>
+                                    <item name="actionName" xsi:type="string">openModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title><![CDATA[< Back]]></title>
+                    </settings>
+                </button>
+                <button name="notification_button_next" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_3</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_4</item>
+                                    <item name="actionName" xsi:type="string">openModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title><![CDATA[Next >]]></title>
+                    </settings>
+                </button>
+            </container>
+        </fieldset>
+    </modal>
+    <modal name="notification_modal_4" component="Magento_ReleaseNotification/js/modal/component">
+        <settings>
+            <onCancel>actionCancel</onCancel>
+            <options>
+                <option name="modalClass" xsi:type="string">release-notification-modal</option>
+                <option name="title" xsi:type="string" translate="true">Sorry, we had a problem loading our “What’s new” content.</option>
+                <option name="type" xsi:type="string">popup</option>
+                <option name="responsive" xsi:type="boolean">true</option>
+                <option name="innerScroll" xsi:type="boolean">true</option>
+                <option name="autoOpen" xsi:type="boolean">false</option>
+            </options>
+        </settings>
+        <fieldset name="notification_fieldset">
+            <settings>
+                <label/>
+            </settings>
+            <container name="notification_text" template="ui/form/components/complex">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                        <item name="additionalClasses" xsi:type="string">release-notification-text</item>
+                        <item name="text" xsi:type="string" translate="true"><![CDATA[
+                        <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
+                        <p>To learn more about new features, see our latest Release Notes in
+                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        target="_blank">DevDocs' Release Information</a>.
+                        </p>]]></item>
+                    </item>
+                </argument>
+            </container>
+            <container name="notification_buttons">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string"/>
+                    </item>
+                </argument>
+                <button name="notification_button_back" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_4</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_3</item>
+                                    <item name="actionName" xsi:type="string">openModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title><![CDATA[< Back]]></title>
+                    </settings>
+                </button>
+                <button name="notification_button_next" displayArea="actions-secondary">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = notification_modal_4</item>
+                                    <item name="actionName" xsi:type="string">closeModal</item>
+                                </item>
+                            </item>
+                        </item>
+                    </argument>
+                    <settings>
+                        <displayAsLink>true</displayAsLink>
+                        <title>Done</title>
+                    </settings>
+                </button>
+            </container>
+        </fieldset>
+    </modal>
+</form>
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js b/app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js
new file mode 100644
index 0000000000000..b74ef2af1a04d
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal-component',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate'
+], function ($, Modal, alert, $t) {
+    'use strict';
+
+    return Modal.extend({
+        defaults: {
+            imports: {
+                logAction:  '${ $.provider }:data.logAction'
+            }
+        },
+
+        /**
+         * Error handler.
+         *
+         * @param {Object} xhr - request result.
+         */
+        onError: function (xhr) {
+            if (xhr.statusText === 'abort') {
+                return;
+            }
+
+            alert({
+                content: xhr.message || $t('An error occurred while logging process.')
+            });
+        },
+
+        /**
+         * Log release notes show
+         */
+        logReleaseNotesShow: function () {
+            var self = this,
+                data = {
+                    'form_key': window.FORM_KEY
+                };
+
+            $.ajax({
+                type: 'POST',
+                url: this.logAction,
+                data: data,
+                showLoader: true
+            }).done(function (xhr) {
+                if (xhr.error) {
+                    self.onError(xhr);
+                }
+            }).fail(this.onError);
+        },
+
+        /**
+         * Close release notes
+         */
+        closeReleaseNotes: function () {
+            this.logReleaseNotesShow();
+            this.closeModal();
+        }
+    });
+});
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
index 5a27b4dc7666f..4ac12501aa90f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
@@ -23,9 +23,8 @@ protected function _getElementHtml(AbstractElement $element)
     {
         $_months = [];
         for ($i = 1; $i <= 12; $i++) {
-            $_months[$i] = $this->_localeDate->date(mktime(null, null, null, $i))->format('m');
+            $_months[$i] = $this->_localeDate->date(mktime(null, null, null, $i, 1))->format('m');
         }
-
         $_days = [];
         for ($i = 1; $i <= 31; $i++) {
             $_days[$i] = $i < 10 ? '0' . $i : $i;
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
index d9ff254b2558a..fa6704bb276f4 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
@@ -31,7 +31,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     protected $_fieldVisibility = [];
 
     /**
-     * Report field opions
+     * Report field options
      *
      * @var array
      */
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
index 2bb4dcd1efbf1..7bbbac644bfeb 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -127,8 +127,8 @@ protected function _prepareCollection()
                  * Validate from and to date
                  */
                 try {
-                    $from = $this->_localeDate->scopeDate(null, $this->getFilter('report_from'), false);
-                    $to = $this->_localeDate->scopeDate(null, $this->getFilter('report_to'), false);
+                    $from = $this->_localeDate->date($this->getFilter('report_from'), null, false, false);
+                    $to = $this->_localeDate->date($this->getFilter('report_to'), null, false, false);
 
                     $collection->setInterval($from, $to);
                 } catch (\Exception $e) {
@@ -215,8 +215,8 @@ public function setStoreSwitcherVisibility($visible = true)
 
     /**
      * Return visibility of store switcher
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -227,8 +227,8 @@ public function getStoreSwitcherVisibility()
 
     /**
      * Return store switcher html
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return string
      */
     public function getStoreSwitcherHtml()
@@ -250,8 +250,8 @@ public function setDateFilterVisibility($visible = true)
 
     /**
      * Return visibility of date filter
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -262,8 +262,8 @@ public function getDateFilterVisibility()
 
     /**
      * Return date filter html
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return string
      */
     public function getDateFilterHtml()
@@ -293,8 +293,8 @@ public function getDateFormat()
 
     /**
      * Return refresh button html
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return string
      */
     public function getRefreshButtonHtml()
@@ -346,8 +346,8 @@ public function setSubReportSize($size)
 
     /**
      * Return sub-report rows count
-     * @codeCoverageIgnore
      *
+     * @codeCoverageIgnore
      * @return int
      */
     public function getSubReportSize()
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 48a87bf77cf94..2ff87237222f0 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Reports\Block\Adminhtml\Grid;
 
+/**
+ * Backend reports grid
+ */
 class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
@@ -90,9 +94,8 @@ protected function _construct()
     /**
      * Get resource collection name
      *
-     * @codeCoverageIgnore
-     *
      * @return string
+     * @codeCoverageIgnore
      */
     public function getResourceCollectionName()
     {
@@ -100,6 +103,8 @@ public function getResourceCollectionName()
     }
 
     /**
+     * Return reports collection
+     *
      * @return \Magento\Framework\Data\Collection
      */
     public function getCollection()
@@ -111,6 +116,8 @@ public function getCollection()
     }
 
     /**
+     * Retrieve array of columns that should be aggregated
+     *
      * @return array
      */
     protected function _getAggregatedColumns()
@@ -170,12 +177,7 @@ public function addColumn($columnId, $column)
      */
     protected function _getStoreIds()
     {
-        $filterData = $this->getFilterData();
-        if ($filterData) {
-            $storeIds = explode(',', $filterData->getData('store_ids'));
-        } else {
-            $storeIds = [];
-        }
+        $storeIds = $this->getFilteredStores();
         // By default storeIds array contains only allowed stores
         $allowedStoreIds = array_keys($this->_storeManager->getStores());
         // And then array_intersect with post data for prevent unauthorized stores reports
@@ -191,6 +193,8 @@ protected function _getStoreIds()
     }
 
     /**
+     * Apply sorting and filtering to collection
+     *
      * @return $this|\Magento\Backend\Block\Widget\Grid
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -280,6 +284,8 @@ protected function _prepareCollection()
     }
 
     /**
+     * Return count totals
+     *
      * @return array
      */
     public function getCountTotals()
@@ -302,6 +308,7 @@ public function getCountTotals()
             );
 
             $this->_addOrderStatusFilter($totalsCollection, $filterData);
+            $this->_addCustomFilter($totalsCollection, $filterData);
 
             if ($totalsCollection->load()->getSize() < 1 || !$filterData->getData('from')) {
                 $this->setTotals(new \Magento\Framework\DataObject());
@@ -313,10 +320,13 @@ public function getCountTotals()
                 }
             }
         }
+
         return parent::getCountTotals();
     }
 
     /**
+     * Retrieve subtotal items
+     *
      * @return array
      */
     public function getSubTotals()
@@ -358,17 +368,18 @@ public function setStoreIds($storeIds)
     }
 
     /**
+     * Return current currency code
+     *
      * @return string|\Magento\Directory\Model\Currency $currencyCode
      */
     public function getCurrentCurrencyCode()
     {
         if ($this->_currentCurrencyCode === null) {
-            $this->_currentCurrencyCode = count(
-                $this->_storeIds
-            ) > 0 ? $this->_storeManager->getStore(
-                array_shift($this->_storeIds)
-            )->getBaseCurrencyCode() : $this->_storeManager->getStore()->getBaseCurrencyCode();
+            $this->_currentCurrencyCode = count($this->_storeIds) > 0
+                ? $this->_storeManager->getStore(array_shift($this->_storeIds))->getCurrentCurrencyCode()
+                : $this->_storeManager->getStore()->getBaseCurrencyCode();
         }
+
         return $this->_currentCurrencyCode;
     }
 
@@ -398,6 +409,7 @@ protected function _addOrderStatusFilter($collection, $filterData)
 
     /**
      * Adds custom filter to resource collection
+     *
      * Can be overridden in child classes if custom filter needed
      *
      * @param \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection $collection
@@ -410,4 +422,35 @@ protected function _addCustomFilter($collection, $filterData)
     {
         return $this;
     }
+
+    /**
+     * Return stores by website, group and store id
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getFilteredStores(): array
+    {
+        $storeIds = [];
+
+        $filterData = $this->getFilterData();
+        if ($filterData) {
+            if ($filterData->getWebsite()) {
+                $storeIds = array_keys(
+                    $this->_storeManager->getWebsite($filterData->getWebsite())->getStores()
+                );
+            }
+
+            if ($filterData->getGroup()) {
+                $storeIds = array_keys(
+                    $this->_storeManager->getGroup($filterData->getGroup())->getStores()
+                );
+            }
+
+            if ($filterData->getData('store_ids')) {
+                $storeIds = explode(',', $filterData->getData('store_ids'));
+            }
+        }
+        return is_array($storeIds) ? $storeIds : [];
+    }
 }
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index 260d7bb50679d..f22b3e7bb963b 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -30,7 +30,7 @@ public function render(\Magento\Framework\DataObject $row)
             return $data;
         }
 
-        $data = floatval($data) * $this->_getRate($row);
+        $data = (float)$data * $this->_getRate($row);
         $data = sprintf("%f", $data);
         $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
         return $data;
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
index fc4cffbdca408..f901b32d8b12f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
@@ -17,7 +17,7 @@ class Viewed extends \Magento\Backend\Block\Widget\Grid\Container
     /**
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * @return void
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
index d70930d2395ae..b773184408a7f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
@@ -19,7 +19,7 @@ class Bestsellers extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
index b8f71158877bb..fe85af58b34f6 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
@@ -19,7 +19,7 @@ class Coupons extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
index c96483e33ebe5..57594a11bd997 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
@@ -19,7 +19,7 @@ class Invoiced extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
index 7ff80f62f6bee..994b29e6eb0dd 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
@@ -19,7 +19,7 @@ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
index 5abea45e657d7..64375ace3e94d 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
@@ -19,7 +19,7 @@ class Sales extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index 21836f1a8c276..9f5f784df677f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
 
+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+
 /**
  * Adminhtml sales report grid block
  *
@@ -22,7 +24,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
     protected $_columnGroupBy = 'period';
 
     /**
-     * {@inheritdoc}
+     * Reports grid constructor
+     *
      * @codeCoverageIgnore
      */
     protected function _construct()
@@ -32,17 +35,19 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * Return collection name based on report_type
+     *
+     * @return string
      */
     public function getResourceCollectionName()
     {
-        return $this->getFilterData()->getData('report_type') == 'updated_at_order'
+        return $this->getFilterData()->getData('report_type') === 'updated_at_order'
             ? \Magento\Sales\Model\ResourceModel\Report\Order\Updatedat\Collection::class
             : \Magento\Sales\Model\ResourceModel\Report\Order\Collection::class;
     }
 
     /**
-     * {@inheritdoc}
+     * Initialize reports grid columns
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -103,9 +108,7 @@ protected function _prepareColumns()
             ]
         );
 
-        if ($this->getFilterData()->getStoreIds()) {
-            $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
-        }
+        $this->setStoreIds($this->_getStoreIds());
         $currencyCode = $this->getCurrentCurrencyCode();
         $rate = $this->getRate($currencyCode);
 
@@ -118,6 +121,7 @@ protected function _prepareColumns()
                 'index' => 'total_income_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-total',
                 'column_css_class' => 'col-sales-total'
@@ -133,6 +137,7 @@ protected function _prepareColumns()
                 'index' => 'total_revenue_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-revenue',
@@ -149,6 +154,7 @@ protected function _prepareColumns()
                 'index' => 'total_profit_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-profit',
@@ -165,6 +171,7 @@ protected function _prepareColumns()
                 'index' => 'total_invoiced_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-invoiced',
                 'column_css_class' => 'col-invoiced'
@@ -180,6 +187,7 @@ protected function _prepareColumns()
                 'index' => 'total_paid_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-paid',
@@ -196,6 +204,7 @@ protected function _prepareColumns()
                 'index' => 'total_refunded_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-refunded',
                 'column_css_class' => 'col-refunded'
@@ -211,6 +220,7 @@ protected function _prepareColumns()
                 'index' => 'total_tax_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-tax',
                 'column_css_class' => 'col-sales-tax'
@@ -226,6 +236,7 @@ protected function _prepareColumns()
                 'index' => 'total_tax_amount_actual',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-tax',
@@ -242,6 +253,7 @@ protected function _prepareColumns()
                 'index' => 'total_shipping_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-shipping',
                 'column_css_class' => 'col-sales-shipping'
@@ -257,6 +269,7 @@ protected function _prepareColumns()
                 'index' => 'total_shipping_amount_actual',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-shipping',
@@ -273,6 +286,7 @@ protected function _prepareColumns()
                 'index' => 'total_discount_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-discount',
                 'column_css_class' => 'col-sales-discount'
@@ -288,6 +302,7 @@ protected function _prepareColumns()
                 'index' => 'total_discount_amount_actual',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-discount',
@@ -304,6 +319,7 @@ protected function _prepareColumns()
                 'index' => 'total_canceled_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-canceled',
                 'column_css_class' => 'col-canceled'
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
index 44dd4521c7bbe..e4dbdc2737745 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
@@ -19,7 +19,7 @@ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
index 38de08314d257..fa9e63745a87d 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
@@ -19,7 +19,7 @@ class Tax extends \Magento\Backend\Block\Widget\Grid\Container
      *
      * @var string
      */
-    protected $_template = 'report/grid/container.phtml';
+    protected $_template = 'Magento_Reports::report/grid/container.phtml';
 
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index 79deb27423be5..f65a2b964fb38 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -53,7 +53,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @codeCoverageIgnore
      */
     protected function _construct()
@@ -64,7 +65,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getResourceCollectionName()
     {
@@ -74,7 +75,7 @@ public function getResourceCollectionName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _prepareColumns()
     {
@@ -123,7 +124,6 @@ protected function _prepareColumns()
             [
                 'header' => __('Orders'),
                 'index' => 'orders_count',
-                'total' => 'sum',
                 'type' => 'number',
                 'sortable' => false,
                 'header_css_class' => 'col-qty',
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index f81176b7a1124..5a92b6ab4e79c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -37,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Grid constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -46,6 +48,8 @@ protected function _construct()
     }
 
     /**
+     * Prepare collection
+     *
      * @return \Magento\Backend\Block\Widget\Grid
      */
     protected function _prepareCollection()
@@ -67,11 +71,16 @@ protected function _prepareCollection()
 
         $this->setCollection($collection);
         parent::_prepareCollection();
+        if ($this->_isExport) {
+            $collection->setPageSize(null);
+        }
         $this->getCollection()->resolveCustomerNames();
         return $this;
     }
 
     /**
+     * Add column filter to collection
+     *
      * @param array $column
      *
      * @return $this
@@ -90,6 +99,8 @@ protected function _addColumnFilterToCollection($column)
     }
 
     /**
+     * Prepare columns
+     *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -223,6 +234,8 @@ protected function _prepareColumns()
     }
 
     /**
+     * Get rows url
+     *
      * @param \Magento\Framework\DataObject $row
      *
      * @return string
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index 28f2011de3365..1ca76cb1cf95f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -18,7 +18,7 @@ class Wishlist extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'report/wishlist.phtml';
+    protected $_template = 'Magento_Reports::report/wishlist.phtml';
 
     /**
      * Reports wishlist collection factory
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 3dbced45e0a69..2fbff13a5b644 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -9,13 +9,18 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Reports\Controller\Adminhtml\Report;
 
+use Magento\Backend\Helper\Data as BackendHelper;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
+ * Reports api controller
+ *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 abstract class AbstractReport extends \Magento\Backend\App\Action
 {
@@ -41,22 +46,30 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
      */
     protected $timezone;
 
+    /**
+     * @var BackendHelper
+     */
+    private $backendHelper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param TimezoneInterface $timezone
+     * @param BackendHelper|null $backendHelperData
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
-        TimezoneInterface $timezone
+        TimezoneInterface $timezone,
+        BackendHelper $backendHelperData = null
     ) {
         parent::__construct($context);
         $this->_fileFactory = $fileFactory;
         $this->_dateFilter = $dateFilter;
         $this->timezone = $timezone;
+        $this->backendHelper = $backendHelperData ?: $this->_objectManager->get(BackendHelper::class);
     }
 
     /**
@@ -103,25 +116,7 @@ public function _initReportAction($blocks)
             $blocks = [$blocks];
         }
 
-        $requestData = $this->_objectManager->get(
-            \Magento\Backend\Helper\Data::class
-        )->prepareFilterString(
-            $this->getRequest()->getParam('filter')
-        );
-        $inputFilter = new \Zend_Filter_Input(
-            ['from' => $this->_dateFilter, 'to' => $this->_dateFilter],
-            [],
-            $requestData
-        );
-        $requestData = $inputFilter->getUnescaped();
-        $requestData['store_ids'] = $this->getRequest()->getParam('store_ids');
-        $params = new \Magento\Framework\DataObject();
-
-        foreach ($requestData as $key => $value) {
-            if (!empty($value)) {
-                $params->setData($key, $value);
-            }
-        }
+        $params = $this->initFilterData();
 
         foreach ($blocks as $block) {
             if ($block) {
@@ -147,7 +142,7 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
             ->loadSelf();
         $updatedAt = 'undefined';
         if ($flag->hasData()) {
-            $updatedAt =  $this->timezone->formatDate(
+            $updatedAt = $this->timezone->formatDate(
                 $flag->getLastUpdate(),
                 \IntlDateFormatter::MEDIUM,
                 true
@@ -155,17 +150,51 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
         }
 
         $refreshStatsLink = $this->getUrl('reports/report_statistics');
-        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent', ['code' => $refreshCode]);
+        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent');
 
         $this->messageManager->addNotice(
             __(
                 'Last updated: %1. To refresh last day\'s <a href="%2">statistics</a>, ' .
-                'click <a href="%3">here</a>.',
+                'click <a href="#2" data-post="%3">here</a>.',
                 $updatedAt,
                 $refreshStatsLink,
-                $directRefreshLink
+                str_replace(
+                    '"',
+                    '&quot;',
+                    json_encode(['action' => $directRefreshLink, 'data' => ['code' => $refreshCode]])
+                )
             )
         );
         return $this;
     }
+
+    /**
+     * Init filter data
+     *
+     * @return \Magento\Framework\DataObject
+     */
+    private function initFilterData(): \Magento\Framework\DataObject
+    {
+        $requestData = $this->backendHelper
+            ->prepareFilterString(
+                $this->getRequest()->getParam('filter')
+            );
+
+        $filterRules = ['from' => $this->_dateFilter, 'to' => $this->_dateFilter];
+        $inputFilter = new \Zend_Filter_Input($filterRules, [], $requestData);
+
+        $requestData = $inputFilter->getUnescaped();
+        $requestData['store_ids'] = $this->getRequest()->getParam('store_ids');
+        $requestData['group'] = $this->getRequest()->getParam('group');
+        $requestData['website'] = $this->getRequest()->getParam('website');
+
+        $params = new \Magento\Framework\DataObject();
+
+        foreach ($requestData as $key => $value) {
+            if (!empty($value)) {
+                $params->setData($key, $value);
+            }
+        }
+        return $params;
+    }
 }
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
index ae1c0401add56..f8d0cbe9e6909 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
-class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface
 {
     /**
      * New accounts action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
index 56a594ac24ea2..be46fb6a94c76 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
-class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface
 {
     /**
      * Customers by number of orders action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
index 17928872eba97..02f40e5be9807 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
-class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface
 {
     /**
      * Customers by orders total action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
index e8df3118caa2f..f2c03d0dc22a5 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
index b5e3602383f7a..266d6a853414d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
index 19b8258beaa5b..f01c46f4c142d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
index 07beec5a72738..980540fb1fa0f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product
+class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
index 50b1f79abd4f0..481522b86f0dd 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review implements HttpGetActionInterface
 {
     /**
      * Customer Reviews Report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
index 3d0ebc5f56828..911a313377ca9 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review implements HttpGetActionInterface
 {
     /**
      * Product reviews report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
index d77f30a004651..c77ff5c26b04e 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/Controller/Adminhtml/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
index 60f8cc87f2ab4..eff3796b6d472 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales
+class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
 {
     /**
      * Bestsellers report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
index 2e324bceee3c8..d9e83cd77b991 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales
+class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
 {
     /**
      * Coupons report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
index f533d597990fc..c26b0f931e6b7 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales
+class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
 {
     /**
      * Invoice report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
index 85c5fdaed4279..f88e9f64b971a 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales
+class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
 {
     /**
      * Refunds report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
index d6460864c5c1b..e3f383ab5a743 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales
+class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
 {
     /**
      * Sales report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
index e8ae11088f5a7..2e6ba487f3981 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Model\Flag;
 
-class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales
+class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface
 {
     /**
      * Tax report action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
index e03f2f6556010..3f0567c05a93d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
 {
     /**
      * Abandoned carts action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
index 65db66f2d2e0c..b41c901fe8576 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
 {
     /**
      * Products in carts action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
index d9f9de39657d1..61ec31337db58 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
 
-class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics implements HttpGetActionInterface
 {
     /**
      * Refresh statistics action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
index 1f0f6e8e40535..66123938243d9 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
@@ -6,7 +6,12 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
 
-class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+/**
+ * Refresh recent stats.
+ */
+class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics implements HttpPostActionInterface
 {
     /**
      * Refresh statistics for last 25 hours
diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
index 5682892a77c60..7337286149cc3 100644
--- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -113,7 +113,7 @@ public function beforeSave()
     /**
      * Retrieve visitor id
      *
-     * if don't exists return current visitor id
+     * If don't exists return current visitor id
      *
      * @return int
      */
@@ -128,7 +128,7 @@ public function getVisitorId()
     /**
      * Retrieve customer id
      *
-     * if customer don't logged in return null
+     * If customer don't logged in return null
      *
      * @return int
      */
@@ -143,7 +143,7 @@ public function getCustomerId()
     /**
      * Retrieve store id
      *
-     * default return current store id
+     * Default return current store id
      *
      * @return int
      */
@@ -246,13 +246,14 @@ public function clean()
 
     /**
      * Add product ids to current visitor/customer log
+     *
      * @param string[] $productIds
      * @return $this
      */
     public function registerIds($productIds)
     {
         $this->_getResource()->registerIds($this, $productIds);
-        $this->_getSession()->unsData($this->_countCacheKey);
+        $this->_getSession()->unsetData($this->_countCacheKey);
         return $this;
     }
 }
diff --git a/app/code/Magento/Reports/Model/ReportStatus.php b/app/code/Magento/Reports/Model/ReportStatus.php
new file mode 100644
index 0000000000000..d5d4611682090
--- /dev/null
+++ b/app/code/Magento/Reports/Model/ReportStatus.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\InputException;
+
+/**
+ * Is report for specified event type is enabled in system configuration
+ */
+class ReportStatus
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * ReportStatus constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Is report for specified event type is enabled in system configuration
+     *
+     * @param string $reportEventType
+     * @return bool
+     * @throws InputException
+     */
+    public function isReportEnabled(string $reportEventType): bool
+    {
+        return $this->scopeConfig->isSetFlag('reports/options/enabled')
+            && $this->scopeConfig->isSetFlag($this->getConfigPathByEventType($reportEventType));
+    }
+
+    /**
+     * Get Config Path By Event Type
+     *
+     * @param string $reportEventType
+     * @return string
+     * @throws InputException
+     */
+    private function getConfigPathByEventType(string $reportEventType): string
+    {
+        $typeToPathMap = [
+            Event::EVENT_PRODUCT_VIEW => 'reports/options/product_view_enabled',
+            Event::EVENT_PRODUCT_SEND => 'reports/options/product_send_enabled',
+            Event::EVENT_PRODUCT_COMPARE => 'reports/options/product_compare_enabled',
+            Event::EVENT_PRODUCT_TO_CART => 'reports/options/product_to_cart_enabled',
+            Event::EVENT_PRODUCT_TO_WISHLIST => 'reports/options/product_to_wishlist_enabled',
+            Event::EVENT_WISHLIST_SHARE => 'reports/options/wishlist_share_enabled',
+        ];
+
+        if (!isset($typeToPathMap[$reportEventType])) {
+            throw new InputException(
+                __('System configuration is not found for report event type "%1"', $reportEventType)
+            );
+        }
+
+        return $typeToPathMap[$reportEventType];
+    }
+}
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
index 671acc9701012..c1c6fb2eaed88 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\Reports\Model\ResourceModel\Quote;
 
+use Magento\Store\Model\Store;
+
 /**
+ * Collection of abandoned quotes with reports join.
+ *
  * @api
  * @since 100.0.2
  */
@@ -48,6 +52,24 @@ public function __construct(
         $this->customerResource = $customerResource;
     }
 
+    /**
+     * Filter collections by stores.
+     *
+     * @param array $storeIds
+     * @param bool $withAdmin
+     * @return $this
+     */
+    public function addStoreFilter(array $storeIds, $withAdmin = true)
+    {
+        if ($withAdmin) {
+            $storeIds[] = Store::DEFAULT_STORE_ID;
+        }
+
+        $this->addFieldToFilter('store_id', ['in' => $storeIds]);
+
+        return $this;
+    }
+
     /**
      * Prepare for abandoned report
      *
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
index e9dbfdae7a9a5..d219aefe81d45 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -192,7 +192,7 @@ protected function getProductData(array $productIds)
             . ' AND product_name.attribute_id = ' . $productAttrNameId
             . ' AND product_name.store_id = ' . \Magento\Store\Model\Store::DEFAULT_STORE_ID,
             ['name' => 'product_name.value']
-        )->joinInner(
+        )->joinLeft(
             ['product_price' => $productAttrPrice->getBackend()->getTable()],
             "product_price.{$linkField} = main_table.{$linkField}"
             ." AND product_price.attribute_id = {$productAttrPriceId}",
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
index d0fed6e1a0654..522bfa7bcf0bf 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
@@ -215,8 +215,11 @@ protected function _getMonthInterval(\DateTime $dateStart, \DateTime $dateEnd, $
                 )
             );
         } else {
+            // Transform the start date to UTC whilst preserving the date. This is required as getTimestamp()
+            // is in UTC which may result in a different month from the original start date due to time zones.
+            $dateStartUtc = (new \DateTime())->createFromFormat('d-m-Y g:i:s', $dateStart->format('d-m-Y 00:00:00'));
             $interval['end'] = $this->_localeDate->convertConfigTimeToUtc(
-                $dateStart->format('Y-m-' . date('t', $dateStart->getTimestamp()) . ' 23:59:59')
+                $dateStart->format('Y-m-' . date('t', $dateStartUtc->getTimestamp()) . ' 23:59:59')
             );
         }
 
diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
index c7da558180a85..0bdc3ed3f124a 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php
@@ -6,6 +6,7 @@
 namespace Magento\Reports\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Reports\Model\Event;
 
 /**
  * Reports Event observer model
@@ -32,22 +33,30 @@ class CatalogProductCompareAddProductObserver implements ObserverInterface
      */
     protected $eventSaver;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
-        EventSaver $eventSaver
+        EventSaver $eventSaver,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->_productCompFactory = $productCompFactory;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
         $this->eventSaver = $eventSaver;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
@@ -60,6 +69,9 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_COMPARE)) {
+            return;
+        }
         $productId = $observer->getEvent()->getProduct()->getId();
         $viewData = ['product_id' => $productId];
         if ($this->_customerSession->isLoggedIn()) {
@@ -69,6 +81,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
         $this->_productCompFactory->create()->setData($viewData)->save()->calculate();
 
-        $this->eventSaver->save(\Magento\Reports\Model\Event::EVENT_PRODUCT_COMPARE, $productId);
+        $this->eventSaver->save(Event::EVENT_PRODUCT_COMPARE, $productId);
     }
 }
diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
index daa52d9daa22d..bbe431aeeef9c 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
@@ -17,13 +17,20 @@ class CatalogProductCompareClearObserver implements ObserverInterface
      */
     protected $_productCompFactory;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
      */
     public function __construct(
-        \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
+        \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->_productCompFactory = $productCompFactory;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
@@ -37,8 +44,10 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        $this->_productCompFactory->create()->calculate();
+        if (!$this->reportStatus->isReportEnabled(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW)) {
+            return;
+        }
 
-        return $this;
+        $this->_productCompFactory->create()->calculate();
     }
 }
diff --git a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
index 4c4476ed7c673..7797dda8eabfb 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
@@ -6,6 +6,7 @@
 namespace Magento\Reports\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Reports\Model\Event;
 
 /**
  * Reports Event observer model
@@ -37,6 +38,11 @@ class CatalogProductViewObserver implements ObserverInterface
      */
     protected $eventSaver;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory
@@ -49,13 +55,15 @@ public function __construct(
         \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
-        EventSaver $eventSaver
+        EventSaver $eventSaver,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->_storeManager = $storeManager;
         $this->_productIndxFactory = $productIndxFactory;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
         $this->eventSaver = $eventSaver;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
@@ -66,6 +74,10 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_VIEW)) {
+            return;
+        }
+
         $productId = $observer->getEvent()->getProduct()->getId();
 
         $viewData['product_id'] = $productId;
@@ -78,6 +90,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         $this->_productIndxFactory->create()->setData($viewData)->save()->calculate();
 
-        $this->eventSaver->save(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW, $productId);
+        $this->eventSaver->save(Event::EVENT_PRODUCT_VIEW, $productId);
     }
 }
diff --git a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
index 1e44b3c4fbec2..718cc02349ce5 100644
--- a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
@@ -6,6 +6,7 @@
 namespace Magento\Reports\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Reports\Model\Event;
 
 /**
  * Reports Event observer model
@@ -17,29 +18,38 @@ class CheckoutCartAddProductObserver implements ObserverInterface
      */
     protected $eventSaver;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param EventSaver $eventSaver
      */
     public function __construct(
-        EventSaver $eventSaver
+        EventSaver $eventSaver,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->eventSaver = $eventSaver;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
      * Add product to shopping cart action
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
+     * @return void
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_TO_CART)) {
+            return;
+        }
+
         $quoteItem = $observer->getEvent()->getItem();
         if (!$quoteItem->getId() && !$quoteItem->getParentItem()) {
             $productId = $quoteItem->getProductId();
-            $this->eventSaver->save(\Magento\Reports\Model\Event::EVENT_PRODUCT_TO_CART, $productId);
+            $this->eventSaver->save(Event::EVENT_PRODUCT_TO_CART, $productId);
         }
-
-        return $this;
     }
 }
diff --git a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
index b8ae653043362..0583b45d2d05f 100644
--- a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
+++ b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
@@ -6,6 +6,7 @@
 namespace Magento\Reports\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Reports\Model\Event;
 
 /**
  * Reports Event observer model
@@ -17,13 +18,20 @@ class SendfriendProductObserver implements ObserverInterface
      */
     protected $eventSaver;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param EventSaver $eventSaver
      */
     public function __construct(
-        EventSaver $eventSaver
+        EventSaver $eventSaver,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->eventSaver = $eventSaver;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
@@ -34,8 +42,12 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_SEND)) {
+            return;
+        }
+
         $this->eventSaver->save(
-            \Magento\Reports\Model\Event::EVENT_PRODUCT_SEND,
+            Event::EVENT_PRODUCT_SEND,
             $observer->getEvent()->getProduct()->getId()
         );
     }
diff --git a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
index 1bbd4a1666ba6..3fd868abbd968 100644
--- a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
@@ -6,6 +6,7 @@
 namespace Magento\Reports\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Reports\Model\Event;
 
 /**
  * Reports Event observer model
@@ -17,13 +18,20 @@ class WishlistAddProductObserver implements ObserverInterface
      */
     protected $eventSaver;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param EventSaver $eventSaver
      */
     public function __construct(
-        EventSaver $eventSaver
+        EventSaver $eventSaver,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->eventSaver = $eventSaver;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
@@ -34,8 +42,12 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_TO_WISHLIST)) {
+            return;
+        }
+
         $this->eventSaver->save(
-            \Magento\Reports\Model\Event::EVENT_PRODUCT_TO_WISHLIST,
+            Event::EVENT_PRODUCT_TO_WISHLIST,
             $observer->getEvent()->getProduct()->getId()
         );
     }
diff --git a/app/code/Magento/Reports/Observer/WishlistShareObserver.php b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
index 832429cf6a3a0..2c4926ac12a16 100644
--- a/app/code/Magento/Reports/Observer/WishlistShareObserver.php
+++ b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
@@ -6,6 +6,7 @@
 namespace Magento\Reports\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Reports\Model\Event;
 
 /**
  * Reports Event observer model
@@ -17,13 +18,20 @@ class WishlistShareObserver implements ObserverInterface
      */
     protected $eventSaver;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus
+     */
+    private $reportStatus;
+
     /**
      * @param EventSaver $eventSaver
      */
     public function __construct(
-        EventSaver $eventSaver
+        EventSaver $eventSaver,
+        \Magento\Reports\Model\ReportStatus $reportStatus
     ) {
         $this->eventSaver = $eventSaver;
+        $this->reportStatus = $reportStatus;
     }
 
     /**
@@ -34,8 +42,12 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->reportStatus->isReportEnabled(Event::EVENT_WISHLIST_SHARE)) {
+            return;
+        }
+
         $this->eventSaver->save(
-            \Magento\Reports\Model\Event::EVENT_WISHLIST_SHARE,
+            Event::EVENT_WISHLIST_SHARE,
             $observer->getEvent()->getWishlist()->getId()
         );
     }
diff --git a/app/code/Magento/Reports/Setup/InstallData.php b/app/code/Magento/Reports/Setup/InstallData.php
deleted file mode 100644
index 2ef7f9507380d..0000000000000
--- a/app/code/Magento/Reports/Setup/InstallData.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Reports\Setup;
-
-use Magento\Cms\Model\PageFactory;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements \Magento\Framework\Setup\InstallDataInterface
-{
-    /**
-     * Page factory
-     *
-     * @var PageFactory
-     */
-    private $pageFactory;
-
-    /**
-     * Init
-     *
-     * @param PageFactory $pageFactory
-     */
-    public function __construct(PageFactory $pageFactory)
-    {
-        $this->pageFactory = $pageFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        /*
-         * Report Event Types default data
-         */
-        $eventTypeData = [
-            [
-                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW,
-                'event_name' => 'catalog_product_view'
-            ],
-            ['event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_SEND, 'event_name' => 'sendfriend_product'],
-            [
-                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_COMPARE,
-                'event_name' => 'catalog_product_compare_add_product'
-            ],
-            [
-                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_TO_CART,
-                'event_name' => 'checkout_cart_add_product'
-            ],
-            [
-                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_TO_WISHLIST,
-                'event_name' => 'wishlist_add_product'
-            ],
-            ['event_type_id' => \Magento\Reports\Model\Event::EVENT_WISHLIST_SHARE, 'event_name' => 'wishlist_share'],
-        ];
-
-        foreach ($eventTypeData as $row) {
-            $setup->getConnection()
-                ->insertForce($setup->getTable('report_event_types'), $row);
-        }
-
-        /**
-         * Prepare database after data upgrade
-         */
-        $setup->endSetup();
-
-        /**
-         * Cms Page  with 'home' identifier page modification for report pages
-         */
-        /** @var $cms \Magento\Cms\Model\Page */
-        $cms = $this->pageFactory->create();
-        $cms->load('home', 'identifier');
-
-        // @codingStandardsIgnoreStart
-        $reportLayoutUpdate = '<!--
-    <referenceContainer name="right">
-        <referenceBlock name="catalog.compare.sidebar" remove="true" />
-    </referenceContainer>-->';
-        // @codingStandardsIgnoreEnd
-
-        /*
-         * Merge and save old layout update data with report layout data
-         */
-        $cms->setLayoutUpdateXml($cms->getLayoutUpdateXml() . $reportLayoutUpdate)
-            ->save();
-    }
-}
diff --git a/app/code/Magento/Reports/Setup/InstallSchema.php b/app/code/Magento/Reports/Setup/InstallSchema.php
deleted file mode 100644
index 0ad61096612ab..0000000000000
--- a/app/code/Magento/Reports/Setup/InstallSchema.php
+++ /dev/null
@@ -1,878 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Reports\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        /*
-         * Prepare database for tables install
-         */
-        $installer->startSetup();
-
-        /**
-         * Create table 'report_compared_product_index'.
-         * In MySQL version this table comes with unique keys to implement insertOnDuplicate(), so that
-         * only one record is added when customer/visitor compares same product again.
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_compared_product_index'))
-            ->addColumn(
-                'index_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Index Id'
-            )
-            ->addColumn(
-                'visitor_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Visitor Id'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Customer Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Product Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Store Id'
-            )
-            ->addColumn(
-                'added_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Added At'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_compared_product_index',
-                    ['visitor_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['visitor_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_compared_product_index',
-                    ['customer_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['customer_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('report_compared_product_index', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_compared_product_index', ['added_at']),
-                ['added_at']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_compared_product_index', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_compared_product_index', 'customer_id', 'customer_entity', 'entity_id'),
-                'customer_id',
-                $installer->getTable('customer_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'report_compared_product_index',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_compared_product_index', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment('Reports Compared Product Index Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'report_viewed_product_index'
-         * In MySQL version this table comes with unique keys to implement insertOnDuplicate(), so that
-         * only one record is added when customer/visitor views same product again.
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_viewed_product_index'))
-            ->addColumn(
-                'index_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Index Id'
-            )
-            ->addColumn(
-                'visitor_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Visitor Id'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Customer Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Product Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Store Id'
-            )
-            ->addColumn(
-                'added_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Added At'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_viewed_product_index',
-                    ['visitor_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['visitor_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_viewed_product_index',
-                    ['customer_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['customer_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_index', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_index', ['added_at']),
-                ['added_at']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_index', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_viewed_product_index', 'customer_id', 'customer_entity', 'entity_id'),
-                'customer_id',
-                $installer->getTable('customer_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'report_viewed_product_index',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_viewed_product_index', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment('Reports Viewed Product Index Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'report_event_types'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_event_types'))
-            ->addColumn(
-                'event_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Event Type Id'
-            )
-            ->addColumn(
-                'event_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                ['nullable' => false],
-                'Event Name'
-            )
-            ->addColumn(
-                'customer_login',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Customer Login'
-            )
-            ->setComment('Reports Event Type Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'report_event'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_event'))
-            ->addColumn(
-                'event_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Event Id'
-            )
-            ->addColumn(
-                'logged_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Logged At'
-            )
-            ->addColumn(
-                'event_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Event Type Id'
-            )
-            ->addColumn(
-                'object_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Object Id'
-            )
-            ->addColumn(
-                'subject_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Subject Id'
-            )
-            ->addColumn(
-                'subtype',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Subtype'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Store Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('report_event', ['event_type_id']),
-                ['event_type_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_event', ['subject_id']),
-                ['subject_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_event', ['object_id']),
-                ['object_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_event', ['subtype']),
-                ['subtype']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_event', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_event', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_event', 'event_type_id', 'report_event_types', 'event_type_id'),
-                'event_type_id',
-                $installer->getTable('report_event_types'),
-                'event_type_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Reports Event Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'report_compared_product_index'.
-         * MySQL table differs by having unique keys on (customer/visitor, product) columns and is created
-         * in separate install.
-         */
-        $tableName = $installer->getTable('report_compared_product_index');
-        if (!$installer->tableExists($tableName)) {
-            $table = $installer->getConnection()
-                ->newTable($tableName)
-                ->addColumn(
-                    'index_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                    null,
-                    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                    'Index Id'
-                )
-                ->addColumn(
-                    'visitor_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true],
-                    'Visitor Id'
-                )
-                ->addColumn(
-                    'customer_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true],
-                    'Customer Id'
-                )
-                ->addColumn(
-                    'product_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true, 'nullable' => false],
-                    'Product Id'
-                )
-                ->addColumn(
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    null,
-                    ['unsigned' => true],
-                    'Store Id'
-                )
-                ->addColumn(
-                    'added_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                    'Added At'
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_compared_product_index', ['visitor_id', 'product_id']),
-                    ['visitor_id', 'product_id']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_compared_product_index', ['customer_id', 'product_id']),
-                    ['customer_id', 'product_id']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_compared_product_index', ['store_id']),
-                    ['store_id']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_compared_product_index', ['added_at']),
-                    ['added_at']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_compared_product_index', ['product_id']),
-                    ['product_id']
-                )
-                ->addForeignKey(
-                    $installer->getFkName(
-                        'report_compared_product_index',
-                        'customer_id',
-                        'customer_entity',
-                        'entity_id'
-                    ),
-                    'customer_id',
-                    $installer->getTable('customer_entity'),
-                    'entity_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->addForeignKey(
-                    $installer->getFkName(
-                        'report_compared_product_index',
-                        'product_id',
-                        'catalog_product_entity',
-                        'entity_id'
-                    ),
-                    'product_id',
-                    $installer->getTable('catalog_product_entity'),
-                    'entity_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->addForeignKey(
-                    $installer->getFkName('report_compared_product_index', 'store_id', 'store', 'store_id'),
-                    'store_id',
-                    $installer->getTable('store'),
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-                )
-                ->setComment('Reports Compared Product Index Table');
-            $installer->getConnection()->createTable($table);
-        }
-
-        /**
-         * Create table 'report_viewed_product_index'.
-         * MySQL table differs by having unique keys on (customer/visitor, product) columns and is created
-         * in separate install.
-         */
-        $tableName = $installer->getTable('report_viewed_product_index');
-        if (!$installer->tableExists($tableName)) {
-            $table = $installer->getConnection()
-                ->newTable($tableName)
-                ->addColumn(
-                    'index_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                    null,
-                    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                    'Index Id'
-                )
-                ->addColumn(
-                    'visitor_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true],
-                    'Visitor Id'
-                )
-                ->addColumn(
-                    'customer_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true],
-                    'Customer Id'
-                )
-                ->addColumn(
-                    'product_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true, 'nullable' => false],
-                    'Product Id'
-                )
-                ->addColumn(
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    null,
-                    ['unsigned' => true],
-                    'Store Id'
-                )
-                ->addColumn(
-                    'added_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                    'Added At'
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_viewed_product_index', ['visitor_id', 'product_id']),
-                    ['visitor_id', 'product_id']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_viewed_product_index', ['customer_id', 'product_id']),
-                    ['customer_id', 'product_id']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_viewed_product_index', ['store_id']),
-                    ['store_id']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_viewed_product_index', ['added_at']),
-                    ['added_at']
-                )
-                ->addIndex(
-                    $installer->getIdxName('report_viewed_product_index', ['product_id']),
-                    ['product_id']
-                )
-                ->addForeignKey(
-                    $installer->getFkName('report_viewed_product_index', 'customer_id', 'customer_entity', 'entity_id'),
-                    'customer_id',
-                    $installer->getTable('customer_entity'),
-                    'entity_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->addForeignKey(
-                    $installer->getFkName(
-                        'report_viewed_product_index',
-                        'product_id',
-                        'catalog_product_entity',
-                        'entity_id'
-                    ),
-                    'product_id',
-                    $installer->getTable('catalog_product_entity'),
-                    'entity_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->addForeignKey(
-                    $installer->getFkName('report_viewed_product_index', 'store_id', 'store', 'store_id'),
-                    'store_id',
-                    $installer->getTable('store'),
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-                )
-                ->setComment('Reports Viewed Product Index Table');
-            $installer->getConnection()->createTable($table);
-        }
-
-        /**
-         * Create table 'report_viewed_product_aggregated_daily'.
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_viewed_product_aggregated_daily'))
-            ->addColumn(
-                'id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Id'
-            )
-            ->addColumn(
-                'period',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'Period'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Store Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Product Id'
-            )
-            ->addColumn(
-                'product_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Product Name'
-            )
-            ->addColumn(
-                'product_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Product Price'
-            )
-            ->addColumn(
-                'views_num',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Number of Views'
-            )
-            ->addColumn(
-                'rating_pos',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Rating Pos'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_viewed_product_aggregated_daily',
-                    ['period', 'store_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['period', 'store_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_aggregated_daily', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_aggregated_daily', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_viewed_product_aggregated_daily', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'report_viewed_product_aggregated_daily',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Most Viewed Products Aggregated Daily');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'report_viewed_product_aggregated_monthly'.
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_viewed_product_aggregated_monthly'))
-            ->addColumn(
-                'id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Id'
-            )
-            ->addColumn(
-                'period',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'Period'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Store Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Product Id'
-            )
-            ->addColumn(
-                'product_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Product Name'
-            )
-            ->addColumn(
-                'product_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Product Price'
-            )
-            ->addColumn(
-                'views_num',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Number of Views'
-            )
-            ->addColumn(
-                'rating_pos',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Rating Pos'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_viewed_product_aggregated_monthly',
-                    ['period', 'store_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['period', 'store_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_aggregated_monthly', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_aggregated_monthly', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_viewed_product_aggregated_monthly', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'report_viewed_product_aggregated_monthly',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Most Viewed Products Aggregated Monthly');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'report_viewed_product_aggregated_yearly'.
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('report_viewed_product_aggregated_yearly'))
-            ->addColumn(
-                'id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Id'
-            )
-            ->addColumn(
-                'period',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-                null,
-                [],
-                'Period'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true],
-                'Store Id'
-            )
-            ->addColumn(
-                'product_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Product Id'
-            )
-            ->addColumn(
-                'product_name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true],
-                'Product Name'
-            )
-            ->addColumn(
-                'product_price',
-                \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                '12,4',
-                ['nullable' => false, 'default' => '0.0000'],
-                'Product Price'
-            )
-            ->addColumn(
-                'views_num',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Number of Views'
-            )
-            ->addColumn(
-                'rating_pos',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Rating Pos'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'report_viewed_product_aggregated_yearly',
-                    ['period', 'store_id', 'product_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['period', 'store_id', 'product_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_aggregated_yearly', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('report_viewed_product_aggregated_yearly', ['product_id']),
-                ['product_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('report_viewed_product_aggregated_yearly', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'report_viewed_product_aggregated_yearly',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'product_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Most Viewed Products Aggregated Yearly');
-        $installer->getConnection()->createTable($table);
-
-        /*
-         * Prepare database for tables install
-         */
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php b/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
new file mode 100644
index 0000000000000..77824689b8557
--- /dev/null
+++ b/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Reports\Setup\Patch\Data;
+
+use Magento\Cms\Model\PageFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InitializeReportEntityTypesAndPages
+ * @package Magento\Reports\Setup\Patch
+ */
+class InitializeReportEntityTypesAndPages implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * InitializeReportEntityTypesAndPages constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param PageFactory $pageFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Cms\Model\PageFactory $pageFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->pageFactory = $pageFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        /*
+         * Report Event Types default data
+         */
+        $eventTypeData = [
+            [
+                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW,
+                'event_name' => 'catalog_product_view'
+            ],
+            ['event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_SEND, 'event_name' => 'sendfriend_product'],
+            [
+                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_COMPARE,
+                'event_name' => 'catalog_product_compare_add_product'
+            ],
+            [
+                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_TO_CART,
+                'event_name' => 'checkout_cart_add_product'
+            ],
+            [
+                'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_TO_WISHLIST,
+                'event_name' => 'wishlist_add_product'
+            ],
+            ['event_type_id' => \Magento\Reports\Model\Event::EVENT_WISHLIST_SHARE, 'event_name' => 'wishlist_share'],
+        ];
+
+        foreach ($eventTypeData as $row) {
+            $this->moduleDataSetup->getConnection()
+                ->insertForce($this->moduleDataSetup->getTable('report_event_types'), $row);
+        }
+        /**
+         * Prepare database after data upgrade
+         */
+        $this->moduleDataSetup->getConnection()->endSetup();
+        /**
+         * Cms Page  with 'home' identifier page modification for report pages
+         */
+        /** @var $cms \Magento\Cms\Model\Page */
+        $cms = $this->pageFactory->create();
+        $cms->load('home', 'identifier');
+        // @codingStandardsIgnoreStart
+        $reportLayoutUpdate = '<!--
+    <referenceContainer name="right">
+        <referenceBlock name="catalog.compare.sidebar" remove="true" />
+    </referenceContainer>-->';
+        // @codingStandardsIgnoreEnd
+        /*
+         * Merge and save old layout update data with report layout data
+         */
+        $cms->setLayoutUpdateXml($cms->getLayoutUpdateXml() . $reportLayoutUpdate)
+            ->save();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
new file mode 100644
index 0000000000000..003a5e6655f34
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminReviewOrderActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click stepKey="openReports" selector="{{OrderedProductsSection.reports}}"/>
+        <waitForPageLoad stepKey="waitForReports" time="5"/>
+        <click stepKey="openOrdered" selector="{{OrderedProductsSection.ordered}}"/>
+        <waitForPageLoad stepKey="waitForOrdersPage" time="5"/>
+        <click stepKey="refresh" selector="{{OrderedProductsSection.refresh}}"/>
+        <waitForPageLoad stepKey="waitForOrderList" time="5"/>
+        <scrollTo stepKey="scrollTo" selector="{{OrderedProductsSection.total}}"/>
+        <see stepKey="seeOrder" userInput="{{productName}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE.txt b/app/code/Magento/Reports/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE.txt
rename to app/code/Magento/Reports/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE_AFL.txt b/app/code/Magento/Reports/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/LICENSE_AFL.txt
rename to app/code/Magento/Reports/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Reports/Test/Mftf/README.md b/app/code/Magento/Reports/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3617914a36783
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Reports Functional Tests
+
+The Functional Test Module for **Magento Reports** module.
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
new file mode 100644
index 0000000000000..89e8497dddcea
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OrderedProductsSection">
+        <element name="reports" type="button" selector="//li[@data-ui-id='menu-magento-reports-report']"/>
+        <element name="ordered" type="button" selector="//li[@data-ui-id='menu-magento-reports-report-products-sold']"/>
+        <element name="refresh" type="button" selector="//button[@title='Refresh']" timeout="30"/>
+        <element name="total" type="text" selector="//tfoot//th[contains(text(), 'Total')]"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/AbstractGridTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/AbstractGridTest.php
new file mode 100644
index 0000000000000..dc16928861b1c
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/AbstractGridTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Reports\Test\Unit\Block\Adminhtml\Grid;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for class \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid.
+ */
+class AbstractGridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->storeManagerMock = $this->getMockForAbstractClass(
+            \Magento\Store\Model\StoreManagerInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getStore']
+        );
+
+        $this->model = $objectManager->getObject(
+            \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid::class,
+            ['_storeManager' => $this->storeManagerMock]
+        );
+    }
+
+    /**
+     * @param $storeIds
+     *
+     * @dataProvider getCurrentCurrencyCodeDataProvider
+     */
+    public function testGetCurrentCurrencyCode($storeIds)
+    {
+        $storeMock = $this->getMockForAbstractClass(
+            \Magento\Store\Api\Data\StoreInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getBaseCurrencyCode', 'getCurrentCurrencyCode']
+        );
+
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+        $this->model->setStoreIds($storeIds);
+
+        if ($storeIds) {
+            $storeMock->expects($this->once())->method('getCurrentCurrencyCode')->willReturn('EUR');
+            $expectedCurrencyCode = 'EUR';
+        } else {
+            $storeMock->expects($this->once())->method('getBaseCurrencyCode')->willReturn('USD');
+            $expectedCurrencyCode = 'USD';
+        }
+
+        $currencyCode = $this->model->getCurrentCurrencyCode();
+        $this->assertEquals($expectedCurrencyCode, $currencyCode);
+    }
+
+    /**
+     * DataProvider for testGetCurrentCurrencyCode.
+     *
+     * @return array
+     */
+    public function getCurrentCurrencyCodeDataProvider()
+    {
+        return [
+            [[]],
+            [[2]],
+        ];
+    }
+}
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php
new file mode 100644
index 0000000000000..3c7ad9ee9e686
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Unit\Block\Adminhtml\Sales\Coupons;
+
+/**
+ * Test for class \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var \Magento\Reports\Model\ResourceModel\Report\Collection\Factory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceFactoryMock;
+
+    /**
+     * Set up mock objects for tested class
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->getMock();
+        $this->resourceFactoryMock = $this
+            ->getMockBuilder(\Magento\Reports\Model\ResourceModel\Report\Collection\Factory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $aggregatedColumns = [1 => 'SUM(value)'];
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid::class,
+            [
+                '_storeManager' => $this->storeManagerMock,
+                '_aggregatedColumns' => $aggregatedColumns,
+                'resourceFactory' => $this->resourceFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getCountTotalsDataProvider
+     *
+     * @param string $reportType
+     * @param int $priceRuleType
+     * @param int $collectionSize
+     * @param bool $expectedCountTotals
+     * @return void
+     */
+    public function testGetCountTotals(
+        string $reportType,
+        int $priceRuleType,
+        int $collectionSize,
+        bool $expectedCountTotals
+    ): void {
+        $filterData = new \Magento\Framework\DataObject();
+        $filterData->setData('report_type', $reportType);
+        $filterData->setData('period_type', 'day');
+        $filterData->setData('from', '2000-01-01');
+        $filterData->setData('to', '2000-01-30');
+        $filterData->setData('store_ids', '1');
+        $filterData->setData('price_rule_type', $priceRuleType);
+        if ($priceRuleType) {
+            $filterData->setData('rules_list', ['0,1']);
+        }
+        $filterData->setData('order_statuses', 'statuses');
+        $this->model->setFilterData($filterData);
+
+        $resourceCollectionName = $this->model->getResourceCollectionName();
+        $collectionMock = $this->buildBaseCollectionMock($filterData, $resourceCollectionName, $collectionSize);
+
+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->getMock();
+        $this->storeManagerMock->method('getStores')
+            ->willReturn([1 => $store]);
+        $this->resourceFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($collectionMock);
+
+        $this->assertEquals($expectedCountTotals, $this->model->getCountTotals());
+    }
+
+    /**
+     * @return array
+     */
+    public function getCountTotalsDataProvider(): array
+    {
+        return [
+            ['created_at_shipment', 0, 0, false],
+            ['created_at_shipment', 0, 1, true],
+            ['updated_at_order', 0, 1, true],
+            ['updated_at_order', 1, 1, true],
+        ];
+    }
+
+    /**
+     * @param \Magento\Framework\DataObject $filterData
+     * @param string $resourceCollectionName
+     * @param int $collectionSize
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function buildBaseCollectionMock(
+        \Magento\Framework\DataObject $filterData,
+        string $resourceCollectionName,
+        int $collectionSize
+    ): \PHPUnit_Framework_MockObject_MockObject {
+        $collectionMock = $this->getMockBuilder($resourceCollectionName)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionMock->expects($this->once())
+            ->method('setPeriod')
+            ->with($filterData->getData('period_type'))
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('setDateRange')
+            ->with($filterData->getData('from'), $filterData->getData('to'))
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('addStoreFilter')
+            ->with(\explode(',', $filterData->getData('store_ids')))
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('setAggregatedColumns')
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('isTotals')
+            ->with(true)
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('addOrderStatusFilter')
+            ->with($filterData->getData('order_statuses'))
+            ->willReturnSelf();
+
+        if ($filterData->getData('price_rule_type')) {
+            $collectionMock->expects($this->once())
+                ->method('addRuleFilter')
+                ->with(\explode(',', $filterData->getData('rules_list')[0]))
+                ->willReturnSelf();
+        }
+
+        $collectionMock->expects($this->once())
+            ->method('load')
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn($collectionSize);
+        if ($collectionSize) {
+            $itemMock = $this->getMockBuilder(\Magento\Reports\Model\Item::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+            $collectionMock->expects($this->once())
+                ->method('getItems')
+                ->willReturn([$itemMock]);
+        }
+
+        return $collectionMock;
+    }
+}
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
index bf58e214ef4a6..3ad9827c7f462 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
@@ -202,7 +202,7 @@ public function testCheckIsLive()
      * @param int $useAggregatedData
      * @param string $mainTable
      * @param int $isFilter
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult
      * @dataProvider useAggregatedDataDataProvider
      * @return void
      */
@@ -309,7 +309,7 @@ public function testAddItemCountExpr()
      * @param int $isFilter
      * @param int $useAggregatedData
      * @param string $mainTable
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult
      * @dataProvider totalsDataProvider
      * @return void
      */
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
index 17e13f9d64bd7..df9f0d2139221 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
@@ -190,8 +190,8 @@ function ($arg) {
     /**
      * @param mixed $from
      * @param mixed $to
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $truncateCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $deleteCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $truncateCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $deleteCount
      * @dataProvider intervalsDataProvider
      * @return void
      */
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
index 051dc3f5f5593..7bb866287d37a 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
@@ -124,7 +124,8 @@ public function testLoadWithFilter()
         $this->selectMock->expects($this->once())->method('reset')->willReturnSelf();
         $this->selectMock->expects($this->once())->method('from')->willReturnSelf();
         $this->selectMock->expects($this->once())->method('useStraightJoin')->willReturnSelf();
-        $this->selectMock->expects($this->exactly(2))->method('joinInner')->willReturnSelf();
+        $this->selectMock->expects($this->once())->method('joinInner')->willReturnSelf();
+        $this->selectMock->expects($this->once())->method('joinLeft')->willReturnSelf();
         $collection->expects($this->once())->method('getOrdersData')->willReturn([]);
         $productAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
         $priceAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
diff --git a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php
index 959f9ddc442f8..a1bb9722f6ade 100644
--- a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php
@@ -50,6 +50,11 @@ class CatalogProductCompareAddProductObserverTest extends \PHPUnit\Framework\Tes
      */
     protected $productCompModelMock;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reportStatusMock;
+
     /**
      * {@inheritDoc}
      */
@@ -98,13 +103,19 @@ protected function setUp()
             ->setMethods(['save'])
             ->getMock();
 
+        $this->reportStatusMock = $this->getMockBuilder(\Magento\Reports\Model\ReportStatus::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isReportEnabled'])
+            ->getMock();
+
         $this->observer = $objectManager->getObject(
             \Magento\Reports\Observer\CatalogProductCompareAddProductObserver::class,
             [
                 'productCompFactory' => $this->productCompFactoryMock,
                 'customerSession' => $this->customerSessionMock,
                 'customerVisitor' => $this->customerVisitorMock,
-                'eventSaver' => $this->eventSaverMock
+                'eventSaver' => $this->eventSaverMock,
+                'reportStatus' => $this->reportStatusMock
             ]
         );
     }
@@ -127,6 +138,7 @@ public function testCatalogProductCompareAddProduct($isLoggedIn, $userKey, $user
         ];
         $observerMock = $this->getObserverMock($productId);
 
+        $this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn($isLoggedIn);
         $this->customerSessionMock->expects($this->any())->method('getCustomerId')->willReturn($customerId);
 
diff --git a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php
index d881778e3a86a..0a43dde0b8253 100644
--- a/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Observer/CatalogProductViewObserverTest.php
@@ -60,6 +60,11 @@ class CatalogProductViewObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $productIndexFactoryMock;
 
+    /**
+     * @var \Magento\Reports\Model\ReportStatus|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $reportStatusMock;
+
     /**
      * {@inheritDoc}
      */
@@ -127,6 +132,11 @@ protected function setUp()
             ->setMethods(['save'])
             ->getMock();
 
+        $this->reportStatusMock = $this->getMockBuilder(\Magento\Reports\Model\ReportStatus::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isReportEnabled'])
+            ->getMock();
+
         $this->observer = $objectManager->getObject(
             \Magento\Reports\Observer\CatalogProductViewObserver::class,
             [
@@ -134,7 +144,8 @@ protected function setUp()
                 'productIndxFactory' => $this->productIndexFactoryMock,
                 'customerSession' => $this->customerSessionMock,
                 'customerVisitor' => $this->customerVisitorMock,
-                'eventSaver' => $this->eventSaverMock
+                'eventSaver' => $this->eventSaverMock,
+                'reportStatus' => $this->reportStatusMock
             ]
         );
     }
@@ -161,6 +172,7 @@ public function testCatalogProductViewCustomer()
             'store_id' => $storeId,
         ];
 
+        $this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
         $this->storeMock->expects($this->any())->method('getId')->willReturn($storeId);
 
         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn(true);
@@ -197,6 +209,7 @@ public function testCatalogProductViewVisitor()
             'store_id' => $storeId,
         ];
 
+        $this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
         $this->storeMock->expects($this->any())->method('getId')->willReturn($storeId);
 
         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn(false);
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index f1e6719a59d0b..f2ead8fedff74 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -5,27 +5,26 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-downloadable": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-review": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-sales-rule": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-widget": "100.3.*",
-        "magento/module-wishlist": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-quote": "*",
+        "magento/module-review": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Reports/etc/adminhtml/system.xml b/app/code/Magento/Reports/etc/adminhtml/system.xml
index a16dfb4c68aee..5a5524d41d473 100644
--- a/app/code/Magento/Reports/etc/adminhtml/system.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/system.xml
@@ -39,6 +39,62 @@
                     <comment>Select day of the month.</comment>
                 </field>
             </group>
+            <group id="options" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>General Options</label>
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Reports</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>If disabled, all report events will be disabled</comment>
+                </field>
+                <field id="product_view_enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable "Product View" Report</label>
+                    <comment>If enabled, will collect statistic of viewed product pages</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="product_send_enabled" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable "Send Product Link To Friend" Report</label>
+                    <comment>If enabled, will collect statistic of product links sent to friend</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="product_compare_enabled" translate="label comment" type="select" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable "Add Product To Compare List" Report</label>
+                    <comment>If enabled, will collect statistic of products added to Compare List</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="product_to_cart_enabled" translate="label comment" type="select" sortOrder="4" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable "Product Added To Cart" Report</label>
+                    <comment>If enabled, will collect statistic of products added to Cart</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="product_to_wishlist_enabled" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable "Product Added To WishList" Report</label>
+                    <comment>If enabled, will collect statistic of products added to WishList</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="wishlist_share_enabled" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable "Share WishList" Report</label>
+                    <comment>If enabled, will collect statistic of shared WishLists</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+            </group>
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/Reports/etc/config.xml b/app/code/Magento/Reports/etc/config.xml
index ecf9569ad1979..ffd2299eb6884 100644
--- a/app/code/Magento/Reports/etc/config.xml
+++ b/app/code/Magento/Reports/etc/config.xml
@@ -19,6 +19,15 @@
                 <ytd_start>1,1</ytd_start>
                 <mtd_start>1</mtd_start>
             </dashboard>
+            <options>
+                <enabled>1</enabled>
+                <product_view_enabled>1</product_view_enabled>
+                <product_send_enabled>1</product_send_enabled>
+                <product_compare_enabled>1</product_compare_enabled>
+                <product_to_cart_enabled>1</product_to_cart_enabled>
+                <product_to_wishlist_enabled>1</product_to_wishlist_enabled>
+                <wishlist_share_enabled>1</wishlist_share_enabled>
+            </options>
         </reports>
     </default>
 </config>
diff --git a/app/code/Magento/Reports/etc/db_schema.xml b/app/code/Magento/Reports/etc/db_schema.xml
new file mode 100644
index 0000000000000..1321ebba4d3d6
--- /dev/null
+++ b/app/code/Magento/Reports/etc/db_schema.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="report_compared_product_index" resource="default" engine="innodb"
+           comment="Reports Compared Product Index Table">
+        <column xsi:type="bigint" name="index_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Index Id"/>
+        <column xsi:type="int" name="visitor_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Visitor Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="timestamp" name="added_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Added At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="index_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REPORT_CMPD_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID"
+                    table="report_compared_product_index" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_CMPD_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="report_compared_product_index" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_COMPARED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID"
+                    table="report_compared_product_index" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="REPORT_COMPARED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID">
+            <column name="visitor_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="REPORT_COMPARED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID">
+            <column name="customer_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="REPORT_COMPARED_PRODUCT_INDEX_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="REPORT_COMPARED_PRODUCT_INDEX_ADDED_AT" indexType="btree">
+            <column name="added_at"/>
+        </index>
+        <index referenceId="REPORT_COMPARED_PRODUCT_INDEX_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="report_viewed_product_index" resource="default" engine="innodb"
+           comment="Reports Viewed Product Index Table">
+        <column xsi:type="bigint" name="index_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Index Id"/>
+        <column xsi:type="int" name="visitor_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Visitor Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="timestamp" name="added_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Added At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="index_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID"
+                    table="report_viewed_product_index" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="report_viewed_product_index" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID"
+                    table="report_viewed_product_index" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID">
+            <column name="visitor_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID">
+            <column name="customer_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="REPORT_VIEWED_PRODUCT_INDEX_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="REPORT_VIEWED_PRODUCT_INDEX_ADDED_AT" indexType="btree">
+            <column name="added_at"/>
+        </index>
+        <index referenceId="REPORT_VIEWED_PRODUCT_INDEX_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="report_event_types" resource="default" engine="innodb" comment="Reports Event Type Table">
+        <column xsi:type="smallint" name="event_type_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Event Type Id"/>
+        <column xsi:type="varchar" name="event_name" nullable="false" length="64" comment="Event Name"/>
+        <column xsi:type="smallint" name="customer_login" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Login"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="event_type_id"/>
+        </constraint>
+    </table>
+    <table name="report_event" resource="default" engine="innodb" comment="Reports Event Table">
+        <column xsi:type="bigint" name="event_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Event Id"/>
+        <column xsi:type="timestamp" name="logged_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Logged At"/>
+        <column xsi:type="smallint" name="event_type_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Event Type Id"/>
+        <column xsi:type="int" name="object_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Object Id"/>
+        <column xsi:type="int" name="subject_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Subject Id"/>
+        <column xsi:type="smallint" name="subtype" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Subtype"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="event_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REPORT_EVENT_STORE_ID_STORE_STORE_ID" table="report_event"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_EVENT_EVENT_TYPE_ID_REPORT_EVENT_TYPES_EVENT_TYPE_ID"
+                    table="report_event" column="event_type_id" referenceTable="report_event_types"
+                    referenceColumn="event_type_id" onDelete="CASCADE"/>
+        <index referenceId="REPORT_EVENT_EVENT_TYPE_ID" indexType="btree">
+            <column name="event_type_id"/>
+        </index>
+        <index referenceId="REPORT_EVENT_SUBJECT_ID" indexType="btree">
+            <column name="subject_id"/>
+        </index>
+        <index referenceId="REPORT_EVENT_OBJECT_ID" indexType="btree">
+            <column name="object_id"/>
+        </index>
+        <index referenceId="REPORT_EVENT_SUBTYPE" indexType="btree">
+            <column name="subtype"/>
+        </index>
+        <index referenceId="REPORT_EVENT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="report_viewed_product_aggregated_daily" resource="default" engine="innodb"
+           comment="Most Viewed Products Aggregated Daily">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product Name"/>
+        <column xsi:type="decimal" name="product_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Product Price"/>
+        <column xsi:type="int" name="views_num" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Number of Views"/>
+        <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Pos"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID"
+                    table="report_viewed_product_aggregated_daily" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_AGGRED_DAILY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="report_viewed_product_aggregated_daily" column="product_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRD_AGGRED_DAILY_PERIOD_STORE_ID_PRD_ID">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="report_viewed_product_aggregated_monthly" resource="default" engine="innodb"
+           comment="Most Viewed Products Aggregated Monthly">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product Name"/>
+        <column xsi:type="decimal" name="product_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Product Price"/>
+        <column xsi:type="int" name="views_num" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Number of Views"/>
+        <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Pos"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID"
+                    table="report_viewed_product_aggregated_monthly" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_AGGRED_MONTHLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="report_viewed_product_aggregated_monthly" column="product_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRD_AGGRED_MONTHLY_PERIOD_STORE_ID_PRD_ID">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="report_viewed_product_aggregated_yearly" resource="default" engine="innodb"
+           comment="Most Viewed Products Aggregated Yearly">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product Name"/>
+        <column xsi:type="decimal" name="product_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Product Price"/>
+        <column xsi:type="int" name="views_num" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Number of Views"/>
+        <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Pos"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID"
+                    table="report_viewed_product_aggregated_yearly" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REPORT_VIEWED_PRD_AGGRED_YEARLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+                    table="report_viewed_product_aggregated_yearly" column="product_id"
+                    referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="REPORT_VIEWED_PRD_AGGRED_YEARLY_PERIOD_STORE_ID_PRD_ID">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Reports/etc/db_schema_whitelist.json b/app/code/Magento/Reports/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8f55ef4fdbee6
--- /dev/null
+++ b/app/code/Magento/Reports/etc/db_schema_whitelist.json
@@ -0,0 +1,152 @@
+{
+    "report_compared_product_index": {
+        "column": {
+            "index_id": true,
+            "visitor_id": true,
+            "customer_id": true,
+            "product_id": true,
+            "store_id": true,
+            "added_at": true
+        },
+        "index": {
+            "REPORT_COMPARED_PRODUCT_INDEX_STORE_ID": true,
+            "REPORT_COMPARED_PRODUCT_INDEX_ADDED_AT": true,
+            "REPORT_COMPARED_PRODUCT_INDEX_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REPORT_CMPD_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
+            "REPORT_CMPD_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "REPORT_COMPARED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID": true,
+            "REPORT_COMPARED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID": true,
+            "REPORT_COMPARED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID": true,
+            "REPORT_CMPD_PRD_IDX_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    },
+    "report_viewed_product_index": {
+        "column": {
+            "index_id": true,
+            "visitor_id": true,
+            "customer_id": true,
+            "product_id": true,
+            "store_id": true,
+            "added_at": true
+        },
+        "index": {
+            "REPORT_VIEWED_PRODUCT_INDEX_STORE_ID": true,
+            "REPORT_VIEWED_PRODUCT_INDEX_ADDED_AT": true,
+            "REPORT_VIEWED_PRODUCT_INDEX_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REPORT_VIEWED_PRD_IDX_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
+            "REPORT_VIEWED_PRD_IDX_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "REPORT_VIEWED_PRODUCT_INDEX_STORE_ID_STORE_STORE_ID": true,
+            "REPORT_VIEWED_PRODUCT_INDEX_VISITOR_ID_PRODUCT_ID": true,
+            "REPORT_VIEWED_PRODUCT_INDEX_CUSTOMER_ID_PRODUCT_ID": true,
+            "REPORT_VIEWED_PRD_IDX_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    },
+    "report_event_types": {
+        "column": {
+            "event_type_id": true,
+            "event_name": true,
+            "customer_login": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "report_event": {
+        "column": {
+            "event_id": true,
+            "logged_at": true,
+            "event_type_id": true,
+            "object_id": true,
+            "subject_id": true,
+            "subtype": true,
+            "store_id": true
+        },
+        "index": {
+            "REPORT_EVENT_EVENT_TYPE_ID": true,
+            "REPORT_EVENT_SUBJECT_ID": true,
+            "REPORT_EVENT_OBJECT_ID": true,
+            "REPORT_EVENT_SUBTYPE": true,
+            "REPORT_EVENT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REPORT_EVENT_STORE_ID_STORE_STORE_ID": true,
+            "REPORT_EVENT_EVENT_TYPE_ID_REPORT_EVENT_TYPES_EVENT_TYPE_ID": true
+        }
+    },
+    "report_viewed_product_aggregated_daily": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "product_id": true,
+            "product_name": true,
+            "product_price": true,
+            "views_num": true,
+            "rating_pos": true
+        },
+        "index": {
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID": true,
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_DAILY_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_DAILY_PERIOD_STORE_ID_PRD_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_DAILY_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    },
+    "report_viewed_product_aggregated_monthly": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "product_id": true,
+            "product_name": true,
+            "product_price": true,
+            "views_num": true,
+            "rating_pos": true
+        },
+        "index": {
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID": true,
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_MONTHLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_MONTHLY_PERIOD_STORE_ID_PRD_ID": true,
+            "FK_0140003A30AFC1A9188D723C4634BA5D": true
+        }
+    },
+    "report_viewed_product_aggregated_yearly": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "product_id": true,
+            "product_name": true,
+            "product_price": true,
+            "views_num": true,
+            "rating_pos": true
+        },
+        "index": {
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID": true,
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REPORT_VIEWED_PRODUCT_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_YEARLY_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_YEARLY_PERIOD_STORE_ID_PRD_ID": true,
+            "REPORT_VIEWED_PRD_AGGRED_YEARLY_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Reports/etc/module.xml b/app/code/Magento/Reports/etc/module.xml
index bfc94f20f1fcd..ed9468539e4b3 100644
--- a/app/code/Magento/Reports/etc/module.xml
+++ b/app/code/Magento/Reports/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Reports" setup_version="2.0.0">
+    <module name="Magento_Reports" >
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index cb267ce29dd34..00766acac16fd 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/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 019c2cbedb75c..ec41c4238967f 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -183,6 +183,9 @@ public function createBundleJsPool()
             }
 
             foreach ($libDir->read($bundleDir) as $bundleFile) {
+                if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {
+                    continue;
+                }
                 $relPath = $libDir->getRelativePath($bundleFile);
                 $bundles[] = $this->assetRepo->createArbitrary($relPath, '');
             }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE.txt b/app/code/Magento/RequireJs/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE.txt
rename to app/code/Magento/RequireJs/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE_AFL.txt b/app/code/Magento/RequireJs/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/LICENSE_AFL.txt
rename to app/code/Magento/RequireJs/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/RequireJs/Test/Mftf/README.md b/app/code/Magento/RequireJs/Test/Mftf/README.md
new file mode 100644
index 0000000000000..152b706f7be1e
--- /dev/null
+++ b/app/code/Magento/RequireJs/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Require Js Functional Tests
+
+The Functional Test Module for **Magento Require Js** module.
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 6b6d709cbb608..834ee5b68485e 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -153,7 +153,7 @@ public function testCreateBundleJsPool()
             ->expects($this->once())
             ->method('read')
             ->with('path/to/bundle/dir/js/bundle')
-            ->willReturn(['bundle1.js', 'bundle2.js']);
+            ->willReturn(['bundle1.js', 'bundle2.js', 'some_file.not_js']);
         $dirRead
             ->expects($this->exactly(2))
             ->method('getRelativePath')
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index d54dfeafc6f74..e48082a69319c 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/RequireJs/etc/module.xml b/app/code/Magento/RequireJs/etc/module.xml
index 7935092e2c9b0..e2b8db50762df 100644
--- a/app/code/Magento/RequireJs/etc/module.xml
+++ b/app/code/Magento/RequireJs/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_RequireJs" setup_version="2.0.0"/>
+    <module name="Magento_RequireJs" />
 </config>
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 2d619725ae201..04e6343eb43ca 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -142,11 +142,6 @@ protected function _prepareForm()
 
         $fieldset->addField('product_id', 'hidden', ['name' => 'product_id']);
 
-        /*$gridFieldset = $form->addFieldset('add_review_grid', array('legend' => __('Please select a product')));
-          $gridFieldset->addField('products_grid', 'note', array(
-          'text' => $this->getLayout()->createBlock(\Magento\Review\Block\Adminhtml\Product\Grid::class)->toHtml(),
-          ));*/
-
         $form->setMethod('post');
         $form->setUseContainer(true);
         $form->setId('edit_form');
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
index adad931da5a69..a02c998f856bd 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
@@ -121,9 +121,9 @@ public function getRating()
                 )->setStoreFilter(
                     $stores
                 )->setPositionOrder()->load()->addOptionToItems();
-                if (intval($this->getRequest()->getParam('id'))) {
+                if ((int)$this->getRequest()->getParam('id')) {
                     $this->_voteCollection = $this->_votesFactory->create()->setReviewFilter(
-                        intval($this->getRequest()->getParam('id'))
+                        (int)$this->getRequest()->getParam('id')
                     )->addOptionInfo()->load()->addRatingOptions();
                 }
             }
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
index 0841388252905..dbf0a79bc42ff 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -17,7 +17,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     /**
      * @var string
      */
-    protected $_template = 'rating/form.phtml';
+    protected $_template = 'Magento_Review::rating/form.phtml';
 
     /**
      * Session
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
index 5d2ec9fc186ca..def0e896fc95f 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
@@ -16,7 +16,7 @@ class Link extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'rss/grid/link.phtml';
+    protected $_template = 'Magento_Review::rss/grid/link.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
diff --git a/app/code/Magento/Review/Block/Customer/ListCustomer.php b/app/code/Magento/Review/Block/Customer/ListCustomer.php
index 8377cc73646b9..eb67af5780ddb 100644
--- a/app/code/Magento/Review/Block/Customer/ListCustomer.php
+++ b/app/code/Magento/Review/Block/Customer/ListCustomer.php
@@ -154,13 +154,13 @@ public function getProductLink()
     /**
      * Get product URL
      *
-     * @param \Magento\Review\Model\Review $review
+     * @param \Magento\Catalog\Model\Product $product
      * @return string
      * @since 100.2.0
      */
-    public function getProductUrl($review)
+    public function getProductUrl($product)
     {
-        return $this->getUrl('catalog/product/view', ['id' => $review->getEntityPkValue()]);
+        return $product->getProductUrl();
     }
 
     /**
diff --git a/app/code/Magento/Review/Block/Customer/Recent.php b/app/code/Magento/Review/Block/Customer/Recent.php
index 8f593f5695812..5c7f1ec2c0dad 100644
--- a/app/code/Magento/Review/Block/Customer/Recent.php
+++ b/app/code/Magento/Review/Block/Customer/Recent.php
@@ -20,7 +20,7 @@ class Recent extends \Magento\Framework\View\Element\Template
      *
      * @var string
      */
-    protected $_template = 'customer/list.phtml';
+    protected $_template = 'Magento_Review::customer/list.phtml';
 
     /**
      * Product reviews collection
diff --git a/app/code/Magento/Review/Block/Customer/View.php b/app/code/Magento/Review/Block/Customer/View.php
index b7dfd4b969a9d..237b972f16573 100644
--- a/app/code/Magento/Review/Block/Customer/View.php
+++ b/app/code/Magento/Review/Block/Customer/View.php
@@ -23,7 +23,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      *
      * @var string
      */
-    protected $_template = 'customer/view.phtml';
+    protected $_template = 'Magento_Review::customer/view.phtml';
 
     /**
      * Catalog product model
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
index 440e13deb5839..c6dfad8265ac7 100644
--- a/app/code/Magento/Review/Block/Form.php
+++ b/app/code/Magento/Review/Block/Form.php
@@ -139,7 +139,7 @@ protected function _construct()
             );
         }
 
-        $this->setTemplate('form.phtml');
+        $this->setTemplate('Magento_Review::form.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Review/Block/Product/ReviewRenderer.php b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
index 8aa10d2437cbb..3183196ebf30c 100644
--- a/app/code/Magento/Review/Block/Product/ReviewRenderer.php
+++ b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
@@ -9,7 +9,11 @@
 
 use Magento\Catalog\Block\Product\ReviewRendererInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Review\Observer\PredispatchReviewObserver;
 
+/**
+ * Class ReviewRenderer
+ */
 class ReviewRenderer extends \Magento\Framework\View\Element\Template implements ReviewRendererInterface
 {
     /**
@@ -18,8 +22,8 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
      * @var array
      */
     protected $_availableTemplates = [
-        self::FULL_VIEW => 'helper/summary.phtml',
-        self::SHORT_VIEW => 'helper/summary_short.phtml',
+        self::FULL_VIEW => 'Magento_Review::helper/summary.phtml',
+        self::SHORT_VIEW => 'Magento_Review::helper/summary_short.phtml',
     ];
 
     /**
@@ -43,6 +47,19 @@ public function __construct(
         parent::__construct($context, $data);
     }
 
+    /**
+     * Review module availability
+     *
+     * @return string
+     */
+    public function isReviewEnabled() : string
+    {
+        return $this->_scopeConfig->getValue(
+            PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
     /**
      * Get review summary html
      *
diff --git a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
index de871d9061428..d496b3955de7b 100644
--- a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
+++ b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
@@ -15,7 +15,7 @@ class Detailed extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'detailed.phtml';
+    protected $_template = 'Magento_Review::detailed.phtml';
 
     /**
      * @var \Magento\Review\Model\RatingFactory
@@ -37,19 +37,21 @@ public function __construct(
     }
 
     /**
+     * Returns block html
+     *
      * @return string
      */
     protected function _toHtml()
     {
         $entityId = $this->_request->getParam('id');
-        if (intval($entityId) <= 0) {
+        if ((int)$entityId <= 0) {
             return '';
         }
 
         $reviewsCount = $this->_ratingFactory->create()->getTotalReviews($entityId, true);
         if ($reviewsCount == 0) {
             #return __('Be the first to review this product');
-            $this->setTemplate('empty.phtml');
+            $this->setTemplate('Magento_Review::empty.phtml');
             return parent::_toHtml();
         }
 
diff --git a/app/code/Magento/Review/Block/View.php b/app/code/Magento/Review/Block/View.php
index e2d0355671688..95b7176b48c44 100644
--- a/app/code/Magento/Review/Block/View.php
+++ b/app/code/Magento/Review/Block/View.php
@@ -19,7 +19,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
      *
      * @var string
      */
-    protected $_template = 'view.phtml';
+    protected $_template = 'Magento_Review::view.phtml';
 
     /**
      * Rating option model
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
index a39b22ec080c6..7d922f30cd98b 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Edit extends ProductController
+class Edit extends ProductController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
index 0dce5b238838d..94c80f89f8d8c 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Index extends ProductController
+class Index extends ProductController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Framework\Controller\ResultInterface
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
index c6e9cc81d5814..db336d0c2f563 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
@@ -14,7 +15,10 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Controller\ResultFactory;
 
-class JsonProductInfo extends ProductController
+/**
+ * Represents product info in json
+ */
+class JsonProductInfo extends ProductController implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
@@ -40,13 +44,15 @@ public function __construct(
     }
 
     /**
+     * Execute controller
+     *
      * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()
     {
         $response = new DataObject();
         $id = $this->getRequest()->getParam('id');
-        if (intval($id) > 0) {
+        if ((int)$id > 0) {
             $product = $this->productRepository->getById($id);
             $response->setId($id);
             $response->addData($product->getData());
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
index 5ac3a6a057246..2709b5ce64b37 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 
-class NewAction extends ProductController
+class NewAction extends ProductController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index 1f21a52077bb7..b62fcc7326eec 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Store\Model\Store;
 use Magento\Framework\Exception\LocalizedException;
 
-class Post extends ProductController
+class Post extends ProductController implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
index f1b25c3613d49..e4057be14af2f 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
@@ -13,7 +15,7 @@
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\Controller\ResultFactory;
 
-class ProductGrid extends ProductController
+class ProductGrid extends ProductController implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
index 5b0ab217e7191..1da8e4abbd6b0 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
@@ -13,7 +15,7 @@
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\Controller\ResultFactory;
 
-class RatingItems extends ProductController
+class RatingItems extends ProductController implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
index 7159b1825dc4d..35187e46933bc 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -5,11 +5,12 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 
-class Save extends ProductController
+class Save extends ProductController implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating.php b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
index 73c31dbcb0777..02649661154af 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
@@ -41,9 +41,18 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @deprecated Misspelled method
+     * @see initEntityId
      */
     protected function initEnityId()
+    {
+        $this->initEntityId();
+    }
+
+    /**
+     * @return void
+     */
+    protected function initEntityId()
     {
         $this->coreRegistry->register(
             'entityId',
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
index 5535c3de26e43..b25db6e498fe0 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Delete extends RatingController
+class Delete extends RatingController implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
index 29342a1eee5f5..90dac026cfd64 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
@@ -5,17 +5,18 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Edit extends RatingController
+class Edit extends RatingController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
      */
     public function execute()
     {
-        $this->initEnityId();
+        $this->initEntityId();
         /** @var \Magento\Review\Model\Rating $ratingModel */
         $ratingModel = $this->_objectManager->create(\Magento\Review\Model\Rating::class);
         if ($this->getRequest()->getParam('id')) {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
index 63306e43c30a5..ff9ab4d50eac4 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
@@ -5,17 +5,18 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Index extends RatingController
+class Index extends RatingController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
      */
     public function execute()
     {
-        $this->initEnityId();
+        $this->initEntityId();
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_Review::catalog_reviews_ratings_ratings');
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
index 18ff73ad31c5e..92d20aeec3eb7 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
-class NewAction extends RatingController
+class NewAction extends RatingController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
index a4f6faf82e329..5dd464f7eb611 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Save extends RatingController
+class Save extends RatingController implements HttpPostActionInterface
 {
     /**
      * Save rating
@@ -17,7 +18,7 @@ class Save extends RatingController
      */
     public function execute()
     {
-        $this->initEnityId();
+        $this->initEntityId();
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if ($this->getRequest()->getPostValue()) {
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index fea94dae23bcc..a88fcb4193df0 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -39,7 +39,7 @@ abstract class Product extends \Magento\Framework\App\Action\Action
     protected $reviewSession;
 
     /**
-     * Catalog catgory model
+     * Catalog category model
      *
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
      */
@@ -219,6 +219,11 @@ protected function loadProduct($productId)
 
         try {
             $product = $this->productRepository->getById($productId);
+
+            if (!in_array($this->storeManager->getStore()->getWebsiteId(), $product->getWebsiteIds())) {
+                throw new NoSuchEntityException();
+            }
+
             if (!$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
                 throw new NoSuchEntityException();
             }
diff --git a/app/code/Magento/Review/Controller/Product/ListAction.php b/app/code/Magento/Review/Controller/Product/ListAction.php
index dd8b272867c55..26344d125172a 100644
--- a/app/code/Magento/Review/Controller/Product/ListAction.php
+++ b/app/code/Magento/Review/Controller/Product/ListAction.php
@@ -26,8 +26,8 @@ protected function getProductPage($product)
             $resultPage->getConfig()->setPageLayout($product->getPageLayout());
         }
         $urlSafeSku = rawurlencode($product->getSku());
-        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
+        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
         $resultPage->addUpdate($product->getCustomLayoutUpdate());
         return $resultPage;
     }
diff --git a/app/code/Magento/Review/Controller/Product/ListAjax.php b/app/code/Magento/Review/Controller/Product/ListAjax.php
index 32d608704c241..d923814c7dce5 100644
--- a/app/code/Magento/Review/Controller/Product/ListAjax.php
+++ b/app/code/Magento/Review/Controller/Product/ListAjax.php
@@ -3,28 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Review\Controller\Product;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\View\Result\Layout;
 use Magento\Review\Controller\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
-class ListAjax extends ProductController
+class ListAjax extends ProductController implements HttpGetActionInterface
 {
     /**
      * Show list of product's reviews
      *
-     * @return \Magento\Framework\View\Result\Layout
+     * @return ResponseInterface|ResultInterface|Layout
      */
     public function execute()
     {
         if (!$this->initProduct()) {
-            throw new LocalizedException(__('Cannot initialize product'));
-        } else {
-            /** @var \Magento\Framework\View\Result\Layout $resultLayout */
-            $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+            return $resultForward->forward('noroute');
         }
 
-        return $resultLayout;
+        return $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
     }
 }
diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
index be18f8fe25bbe..32838eb6acbbb 100644
--- a/app/code/Magento/Review/Controller/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Product/Post.php
@@ -5,11 +5,12 @@
  */
 namespace Magento\Review\Controller\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Review\Controller\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Review\Model\Review;
 
-class Post extends ProductController
+class Post extends ProductController implements HttpPostActionInterface
 {
     /**
      * Submit new review action
diff --git a/app/code/Magento/Review/Helper/Action/Pager.php b/app/code/Magento/Review/Helper/Action/Pager.php
index 39c4f3c09d0b7..5d1c5fd308e9c 100644
--- a/app/code/Magento/Review/Helper/Action/Pager.php
+++ b/app/code/Magento/Review/Helper/Action/Pager.php
@@ -141,7 +141,7 @@ protected function _findItemPositionByValue($value)
     protected function _getStorageKey()
     {
         if (!$this->_storageId) {
-            throw new LocalizedException(__('Storage key was not set'));
+            throw new LocalizedException(__("The storage key wasn't set. Add the storage key and try again."));
         }
 
         return self::STORAGE_PREFIX . $this->_storageId;
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php
index 3f54c17f6ff7c..37a93d40b1107 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Review\Model\ResourceModel;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Rating resource model
  *
@@ -12,6 +15,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -34,13 +38,19 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $_logger;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary
+     * @param Review\Summary $reviewSummary
      * @param string $connectionName
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,12 +58,14 @@ public function __construct(
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary,
-        $connectionName = null
+        $connectionName = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         $this->moduleManager = $moduleManager;
         $this->_storeManager = $storeManager;
         $this->_logger = $logger;
         $this->_reviewSummary = $reviewSummary;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -178,6 +190,8 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
+     * Process rating codes
+     *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
@@ -201,6 +215,8 @@ protected function processRatingCodes(\Magento\Framework\Model\AbstractModel $ob
     }
 
     /**
+     * Process rating stores
+     *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
@@ -224,6 +240,8 @@ protected function processRatingStores(\Magento\Framework\Model\AbstractModel $o
     }
 
     /**
+     * Delete rating data
+     *
      * @param int $ratingId
      * @param string $table
      * @param array $storeIds
@@ -247,6 +265,8 @@ protected function deleteRatingData($ratingId, $table, array $storeIds)
     }
 
     /**
+     * Insert rating data
+     *
      * @param string $table
      * @param array $data
      * @return void
@@ -269,6 +289,7 @@ protected function insertRatingData($table, array $data)
 
     /**
      * Perform actions after object delete
+     *
      * Prepare rating data for reaggregate all data for reviews
      *
      * @param \Magento\Framework\Model\AbstractModel $object
@@ -277,7 +298,12 @@ protected function insertRatingData($table, array $data)
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
         parent::_afterDelete($object);
-        if (!$this->moduleManager->isEnabled('Magento_Review')) {
+        if (!$this->moduleManager->isEnabled('Magento_Review') &&
+            !$this->scopeConfig->getValue(
+                \Magento\Review\Observer\PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+        ) {
             return $this;
         }
         $data = $this->_getEntitySummaryData($object);
@@ -425,9 +451,11 @@ public function getReviewSummary($object, $onlyForCurrentStore = true)
 
         $data = $connection->fetchAll($select, [':review_id' => $object->getReviewId()]);
 
+        $currentStore = $this->_storeManager->isSingleStoreMode() ? $this->_storeManager->getStore()->getId() : null;
+
         if ($onlyForCurrentStore) {
             foreach ($data as $row) {
-                if ($row['store_id'] == $this->_storeManager->getStore()->getId()) {
+                if ($row['store_id'] !== $currentStore) {
                     $object->addData($row);
                 }
             }
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
index cbbe17a47c0ad..0dcb9da6a8c75 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Collection.php
@@ -141,7 +141,6 @@ public function setStoreFilter($storeId)
                 'main_table.rating_id = store.rating_id',
                 []
             );
-            //        ->group('main_table.rating_id')
             $this->_isStoreJoined = true;
         }
         $inCondition = $connection->prepareSqlCondition('store.store_id', ['in' => $storeId]);
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
index 6f68000a1efff..ef4acb6c90cb8 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
@@ -154,7 +154,7 @@ public function addVote($option)
             }
             $connection->commit();
         } catch (\Exception $e) {
-            $connection->rollback();
+            $connection->rollBack();
             throw new \Exception($e->getMessage());
         }
         return $this;
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
index 830354796907f..3033a31ff1723 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
@@ -403,12 +403,20 @@ public function getAllIds($limit = null, $offset = null)
     public function getResultingIds()
     {
         $idsSelect = clone $this->getSelect();
-        $idsSelect->reset(Select::LIMIT_COUNT);
-        $idsSelect->reset(Select::LIMIT_OFFSET);
-        $idsSelect->reset(Select::COLUMNS);
-        $idsSelect->reset(Select::ORDER);
-        $idsSelect->columns('rt.review_id');
-        return $this->getConnection()->fetchCol($idsSelect);
+        $data = $this->getConnection()
+            ->fetchAll(
+                $idsSelect
+                    ->reset(Select::LIMIT_COUNT)
+                    ->reset(Select::LIMIT_OFFSET)
+                    ->columns('rt.review_id')
+            );
+
+        return array_map(
+            function ($value) {
+                return $value['review_id'];
+            },
+            $data
+        );
     }
 
     /**
@@ -540,6 +548,16 @@ protected function _afterLoad()
         return $this;
     }
 
+    /**
+     * Not add store ids to items
+     *
+     * @return $this
+     */
+    protected function prepareStoreId()
+    {
+        return $this;
+    }
+
     /**
      * Add store data
      *
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index c00af3fc61407..e689d4ed460ac 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Review\Model;
 
+use Magento\Framework\DataObject;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductCollection;
@@ -327,6 +328,9 @@ public function appendSummary($collection)
                     $item->setRatingSummary($summary);
                 }
             }
+            if (!$item->getRatingSummary()) {
+                $item->setRatingSummary(new DataObject());
+            }
         }
 
         return $this;
diff --git a/app/code/Magento/Review/Observer/PredispatchReviewObserver.php b/app/code/Magento/Review/Observer/PredispatchReviewObserver.php
new file mode 100644
index 0000000000000..bdca0f5ecb1ec
--- /dev/null
+++ b/app/code/Magento/Review/Observer/PredispatchReviewObserver.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Review\Observer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Review\Block\Product\ReviewRenderer;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class PredispatchReviewObserver
+ */
+class PredispatchReviewObserver implements ObserverInterface
+{
+    /**
+     * Configuration path to review active setting
+     */
+    const XML_PATH_REVIEW_ACTIVE = 'catalog/review/active';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * PredispatchReviewObserver constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param UrlInterface $url
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        UrlInterface $url
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->url = $url;
+    }
+    /**
+     * Redirect review routes to 404 when review module is disabled.
+     *
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer)
+    {
+        if (!$this->scopeConfig->getValue(
+            self::XML_PATH_REVIEW_ACTIVE,
+            ScopeInterface::SCOPE_STORE
+        )
+        ) {
+            $defaultNoRouteUrl = $this->scopeConfig->getValue(
+                'web/default/no_route',
+                ScopeInterface::SCOPE_STORE
+            );
+            $redirectUrl = $this->url->getUrl($defaultNoRouteUrl);
+            $observer->getControllerAction()
+                ->getResponse()
+                ->setRedirect($redirectUrl);
+        }
+    }
+}
diff --git a/app/code/Magento/Review/Setup/InstallData.php b/app/code/Magento/Review/Setup/InstallData.php
deleted file mode 100644
index 8e9e60d3d64df..0000000000000
--- a/app/code/Magento/Review/Setup/InstallData.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Review\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        //Fill table review/review_entity
-        $reviewEntityCodes = [
-            \Magento\Review\Model\Review::ENTITY_PRODUCT_CODE,
-            \Magento\Review\Model\Review::ENTITY_CUSTOMER_CODE,
-            \Magento\Review\Model\Review::ENTITY_CATEGORY_CODE,
-        ];
-        foreach ($reviewEntityCodes as $entityCode) {
-            $installer->getConnection()->insert($installer->getTable('review_entity'), ['entity_code' => $entityCode]);
-        }
-
-        //Fill table review/review_entity
-        $reviewStatuses = [
-            \Magento\Review\Model\Review::STATUS_APPROVED => 'Approved',
-            \Magento\Review\Model\Review::STATUS_PENDING => 'Pending',
-            \Magento\Review\Model\Review::STATUS_NOT_APPROVED => 'Not Approved',
-        ];
-        foreach ($reviewStatuses as $k => $v) {
-            $bind = ['status_id' => $k, 'status_code' => $v];
-            $installer->getConnection()->insertForce($installer->getTable('review_status'), $bind);
-        }
-
-        $data = [
-            \Magento\Review\Model\Rating::ENTITY_PRODUCT_CODE => [
-                ['rating_code' => 'Quality', 'position' => 0],
-                ['rating_code' => 'Value', 'position' => 0],
-                ['rating_code' => 'Price', 'position' => 0],
-            ],
-            \Magento\Review\Model\Rating::ENTITY_PRODUCT_REVIEW_CODE => [],
-            \Magento\Review\Model\Rating::ENTITY_REVIEW_CODE => [],
-        ];
-
-        foreach ($data as $entityCode => $ratings) {
-            //Fill table rating/rating_entity
-            $installer->getConnection()->insert($installer->getTable('rating_entity'), ['entity_code' => $entityCode]);
-            $entityId = $installer->getConnection()->lastInsertId($installer->getTable('rating_entity'));
-
-            foreach ($ratings as $bind) {
-                //Fill table rating/rating
-                $bind['entity_id'] = $entityId;
-                $installer->getConnection()->insert($installer->getTable('rating'), $bind);
-
-                //Fill table rating/rating_option
-                $ratingId = $installer->getConnection()->lastInsertId($installer->getTable('rating'));
-                $optionData = [];
-                for ($i = 1; $i <= 5; $i++) {
-                    $optionData[] = ['rating_id' => $ratingId, 'code' => (string)$i, 'value' => $i, 'position' => $i];
-                }
-                $installer->getConnection()->insertMultiple($installer->getTable('rating_option'), $optionData);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Review/Setup/InstallSchema.php b/app/code/Magento/Review/Setup/InstallSchema.php
deleted file mode 100644
index 334d66abcc63c..0000000000000
--- a/app/code/Magento/Review/Setup/InstallSchema.php
+++ /dev/null
@@ -1,750 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Review\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-        /**
-         * Create table 'review_entity'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('review_entity'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Review entity id'
-            )
-            ->addColumn(
-                'entity_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => false],
-                'Review entity code'
-            )
-            ->setComment('Review entities');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'review_status'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('review_status'))
-            ->addColumn(
-                'status_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Status id'
-            )
-            ->addColumn(
-                'status_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => false],
-                'Status code'
-            )
-            ->setComment('Review statuses');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'review'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('review'))
-            ->addColumn(
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Review id'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Review create date'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity id'
-            )
-            ->addColumn(
-                'entity_pk_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Product id'
-            )
-            ->addColumn(
-                'status_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Status code'
-            )
-            ->addIndex(
-                $installer->getIdxName('review', ['entity_id']),
-                ['entity_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('review', ['status_id']),
-                ['status_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('review', ['entity_pk_value']),
-                ['entity_pk_value']
-            )
-            ->addForeignKey(
-                $installer->getFkName('review', 'entity_id', 'review_entity', 'entity_id'),
-                'entity_id',
-                $installer->getTable('review_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('review', 'status_id', 'review_status', 'status_id'),
-                'status_id',
-                $installer->getTable('review_status'),
-                'status_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
-            )
-            ->setComment('Review base information');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'review_detail'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('review_detail'))
-            ->addColumn(
-                'detail_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Review detail id'
-            )
-            ->addColumn(
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Review id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'default' => '0'],
-                'Store id'
-            )
-            ->addColumn(
-                'title',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Title'
-            )
-            ->addColumn(
-                'detail',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                ['nullable' => false],
-                'Detail description'
-            )
-            ->addColumn(
-                'nickname',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                128,
-                ['nullable' => false],
-                'User nickname'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true],
-                'Customer Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('review_detail', ['review_id']),
-                ['review_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('review_detail', ['store_id']),
-                ['store_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('review_detail', ['customer_id']),
-                ['customer_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('review_detail', 'customer_id', 'customer_entity', 'entity_id'),
-                'customer_id',
-                $installer->getTable('customer_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->addForeignKey(
-                $installer->getFkName('review_detail', 'review_id', 'review', 'review_id'),
-                'review_id',
-                $installer->getTable('review'),
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('review_detail', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-            )
-            ->setComment('Review detail information');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'review_entity_summary'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('review_entity_summary'))
-            ->addColumn(
-                'primary_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Summary review entity id'
-            )
-            ->addColumn(
-                'entity_pk_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Product id'
-            )
-            ->addColumn(
-                'entity_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Entity type id'
-            )
-            ->addColumn(
-                'reviews_count',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Qty of reviews'
-            )
-            ->addColumn(
-                'rating_summary',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '0'],
-                'Summarized rating'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store id'
-            )
-            ->addIndex(
-                $installer->getIdxName('review_entity_summary', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('review_entity_summary', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Review aggregates');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'review_store'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('review_store'))
-            ->addColumn(
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Review Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Store Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('review_store', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('review_store', 'review_id', 'review', 'review_id'),
-                'review_id',
-                $installer->getTable('review'),
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('review_store', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Review Store');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating_entity'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating_entity'))
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )
-            ->addColumn(
-                'entity_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                ['nullable' => false],
-                'Entity Code'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'rating_entity',
-                    ['entity_code'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['entity_code'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->setComment('Rating entities');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating'))
-            ->addColumn(
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rating Id'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Entity Id'
-            )
-            ->addColumn(
-                'rating_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                64,
-                ['nullable' => false],
-                'Rating Code'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Rating Position On Storefront'
-            )
-            ->addColumn(
-                'is_active',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => 1],
-                'Rating is active.'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'rating',
-                    ['rating_code'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['rating_code'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('rating', ['entity_id']),
-                ['entity_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating', 'entity_id', 'rating_entity', 'entity_id'),
-                'entity_id',
-                $installer->getTable('rating_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Ratings');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating_option'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating_option'))
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rating Option Id'
-            )
-            ->addColumn(
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Rating Id'
-            )
-            ->addColumn(
-                'code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => false],
-                'Rating Option Code'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Rating Option Value'
-            )
-            ->addColumn(
-                'position',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Ration option position on Storefront'
-            )
-            ->addIndex(
-                $installer->getIdxName('rating_option', ['rating_id']),
-                ['rating_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_option', 'rating_id', 'rating', 'rating_id'),
-                'rating_id',
-                $installer->getTable('rating'),
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Rating options');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating_option_vote'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating_option_vote'))
-            ->addColumn(
-                'vote_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Vote id'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Vote option id'
-            )
-            ->addColumn(
-                'remote_ip',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                16,
-                ['nullable' => false],
-                'Customer IP'
-            )
-            ->addColumn(
-                'remote_ip_long',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['nullable' => false, 'default' => 0],
-                'Customer IP converted to long integer format'
-            )
-            ->addColumn(
-                'customer_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'default' => 0],
-                'Customer Id'
-            )
-            ->addColumn(
-                'entity_pk_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Product id'
-            )
-            ->addColumn(
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Rating id'
-            )
-            ->addColumn(
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['unsigned' => true],
-                'Review id'
-            )
-            ->addColumn(
-                'percent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => 0],
-                'Percent amount'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => 0],
-                'Vote option value'
-            )
-            ->addIndex(
-                $installer->getIdxName('rating_option_vote', ['option_id']),
-                ['option_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_option_vote', 'option_id', 'rating_option', 'option_id'),
-                'option_id',
-                $installer->getTable('rating_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_option_vote', 'review_id', 'review', 'review_id'),
-                'review_id',
-                $installer->getTable('review'),
-                'review_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Rating option values');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating_option_vote_aggregated'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating_option_vote_aggregated'))
-            ->addColumn(
-                'primary_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Vote aggregation id'
-            )
-            ->addColumn(
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Rating id'
-            )
-            ->addColumn(
-                'entity_pk_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Product id'
-            )
-            ->addColumn(
-                'vote_count',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Vote dty'
-            )
-            ->addColumn(
-                'vote_value_sum',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'General vote sum'
-            )
-            ->addColumn(
-                'percent',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => 0],
-                'Vote percent'
-            )
-            ->addColumn(
-                'percent_approved',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['default' => '0'],
-                'Vote percent approved by admin'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Store Id'
-            )
-            ->addIndex(
-                $installer->getIdxName('rating_option_vote_aggregated', ['rating_id']),
-                ['rating_id']
-            )
-            ->addIndex(
-                $installer->getIdxName('rating_option_vote_aggregated', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_option_vote_aggregated', 'rating_id', 'rating', 'rating_id'),
-                'rating_id',
-                $installer->getTable('rating'),
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_option_vote_aggregated', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Rating vote aggregated');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating_store'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating_store'))
-            ->addColumn(
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0, 'primary' => true],
-                'Rating id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0, 'primary' => true],
-                'Store id'
-            )
-            ->addIndex(
-                $installer->getIdxName('rating_store', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_store', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_store', 'rating_id', 'rating', 'rating_id'),
-                'rating_id',
-                $installer->getTable('rating'),
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Rating Store');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'rating_title'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('rating_title'))
-            ->addColumn(
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0, 'primary' => true],
-                'Rating Id'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0, 'primary' => true],
-                'Store Id'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Rating Label'
-            )
-            ->addIndex(
-                $installer->getIdxName('rating_title', ['store_id']),
-                ['store_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_title', 'rating_id', 'rating', 'rating_id'),
-                'rating_id',
-                $installer->getTable('rating'),
-                'rating_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $installer->getFkName('rating_title', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Rating Title');
-        $installer->getConnection()->createTable($table);
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php b/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php
new file mode 100644
index 0000000000000..0ad7042668c0e
--- /dev/null
+++ b/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Review\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class InitReviewStatusesAndData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        //Fill table review/review_entity
+        $reviewEntityCodes = [
+            \Magento\Review\Model\Review::ENTITY_PRODUCT_CODE,
+            \Magento\Review\Model\Review::ENTITY_CUSTOMER_CODE,
+            \Magento\Review\Model\Review::ENTITY_CATEGORY_CODE,
+        ];
+        foreach ($reviewEntityCodes as $entityCode) {
+            $this->moduleDataSetup->getConnection()->insert(
+                $this->moduleDataSetup->getTable('review_entity'),
+                ['entity_code' => $entityCode]
+            );
+        }
+        //Fill table review/review_entity
+        $reviewStatuses = [
+            \Magento\Review\Model\Review::STATUS_APPROVED => 'Approved',
+            \Magento\Review\Model\Review::STATUS_PENDING => 'Pending',
+            \Magento\Review\Model\Review::STATUS_NOT_APPROVED => 'Not Approved',
+        ];
+        foreach ($reviewStatuses as $k => $v) {
+            $bind = ['status_id' => $k, 'status_code' => $v];
+            $this->moduleDataSetup->getConnection()->insertForce(
+                $this->moduleDataSetup->getTable('review_status'),
+                $bind
+            );
+        }
+        $data = [
+            \Magento\Review\Model\Rating::ENTITY_PRODUCT_CODE => [
+                ['rating_code' => 'Quality', 'position' => 0],
+                ['rating_code' => 'Value', 'position' => 0],
+                ['rating_code' => 'Price', 'position' => 0],
+            ],
+            \Magento\Review\Model\Rating::ENTITY_PRODUCT_REVIEW_CODE => [],
+            \Magento\Review\Model\Rating::ENTITY_REVIEW_CODE => [],
+        ];
+        foreach ($data as $entityCode => $ratings) {
+            //Fill table rating/rating_entity
+            $this->moduleDataSetup->getConnection()->insert(
+                $this->moduleDataSetup->getTable('rating_entity'),
+                ['entity_code' => $entityCode]
+            );
+            $entityId = $this->moduleDataSetup->getConnection()->lastInsertId(
+                $this->moduleDataSetup->getTable('rating_entity')
+            );
+            foreach ($ratings as $bind) {
+                //Fill table rating/rating
+                $bind['entity_id'] = $entityId;
+                $this->moduleDataSetup->getConnection()->insert(
+                    $this->moduleDataSetup->getTable('rating'),
+                    $bind
+                );
+                //Fill table rating/rating_option
+                $ratingId = $this->moduleDataSetup->getConnection()->lastInsertId(
+                    $this->moduleDataSetup->getTable('rating')
+                );
+                $optionData = [];
+                for ($i = 1; $i <= 5; $i++) {
+                    $optionData[] = ['rating_id' => $ratingId, 'code' => (string)$i, 'value' => $i, 'position' => $i];
+                }
+                $this->moduleDataSetup->getConnection()->insertMultiple(
+                    $this->moduleDataSetup->getTable('rating_option'),
+                    $optionData
+                );
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE.txt b/app/code/Magento/Review/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE.txt
rename to app/code/Magento/Review/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE_AFL.txt b/app/code/Magento/Review/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE_AFL.txt
rename to app/code/Magento/Review/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Review/Test/Mftf/README.md b/app/code/Magento/Review/Test/Mftf/README.md
new file mode 100644
index 0000000000000..86af37286a7d6
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Review Functional Tests
+
+The Functional Test Module for **Magento Review** module.
diff --git a/app/code/Magento/Review/Test/Unit/Block/FormTest.php b/app/code/Magento/Review/Test/Unit/Block/FormTest.php
index 2184385035c8d..1fd38551702ab 100644
--- a/app/code/Magento/Review/Test/Unit/Block/FormTest.php
+++ b/app/code/Magento/Review/Test/Unit/Block/FormTest.php
@@ -136,6 +136,9 @@ public function testGetAction($isSecure, $actionUrl, $productId)
         $this->assertEquals($actionUrl . '/id/' . $productId, $this->object->getAction());
     }
 
+    /**
+     * @return array
+     */
     public function getActionDataProvider()
     {
         return [
diff --git a/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php b/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php
index 243b4e8389923..01868242d0e0c 100644
--- a/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php
+++ b/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php
@@ -204,6 +204,9 @@ public function testGetProductReviewUrl($isSecure, $actionUrl, $productId)
         $this->assertEquals($actionUrl . '/id/' . $productId, $this->block->getProductReviewUrl());
     }
 
+    /**
+     * @return array
+     */
     public function getProductReviewUrlDataProvider()
     {
         return [
diff --git a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
index 3186c0fcc3c57..1526e80f8190a 100644
--- a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
+++ b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
@@ -147,7 +147,11 @@ protected function setUp()
         $ratingFactory->expects($this->once())->method('create')->willReturn($this->rating);
         $this->messageManager = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
 
-        $this->store = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getId']);
+        $this->store = $this->createPartialMock(
+            \Magento\Store\Model\Store::class,
+            ['getId', 'getWebsiteId']
+        );
+
         $storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
         $storeManager->expects($this->any())->method('getStore')->willReturn($this->store);
 
@@ -219,7 +223,7 @@ public function testExecute()
             ->willReturn(1);
         $product = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
-            ['__wakeup', 'isVisibleInCatalog', 'isVisibleInSiteVisibility', 'getId']
+            ['__wakeup', 'isVisibleInCatalog', 'isVisibleInSiteVisibility', 'getId', 'getWebsiteIds']
         );
         $product->expects($this->once())
             ->method('isVisibleInCatalog')
@@ -227,6 +231,15 @@ public function testExecute()
         $product->expects($this->once())
             ->method('isVisibleInSiteVisibility')
             ->willReturn(true);
+
+        $product->expects($this->once())
+            ->method('getWebsiteIds')
+            ->willReturn([1]);
+
+        $this->store->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+
         $this->productRepository->expects($this->any())->method('getById')
             ->with(1)
             ->willReturn($product);
diff --git a/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php b/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php
index b3d2cec648dc6..36cbe455fa890 100644
--- a/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php
+++ b/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php
@@ -147,6 +147,9 @@ public function testAddEntityFilter(
         $this->model->addEntityFilter($entity, $pkValue);
     }
 
+    /**
+     * @return array
+     */
     public function addEntityFilterDataProvider()
     {
         return [
diff --git a/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php b/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php
new file mode 100644
index 0000000000000..cb01e55e4f491
--- /dev/null
+++ b/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Review\Test\Unit\Observer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Review\Observer\PredispatchReviewObserver;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for \Magento\Review\Observer\PredispatchReviewObserver
+ */
+class PredispatchReviewObserverTest extends TestCase
+{
+    /**
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mockObject;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlMock;
+
+    /**
+     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    /**
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp() : void
+    {
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+                                 ->disableOriginalConstructor()
+                                 ->getMock();
+        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
+                              ->disableOriginalConstructor()
+                              ->getMock();
+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
+                                   ->disableOriginalConstructor()
+                                   ->setMethods(['setRedirect'])
+                                   ->getMockForAbstractClass();
+        $this->redirectMock = $this->getMockBuilder(RedirectInterface::class)
+                                   ->getMock();
+        $this->objectManager = new ObjectManager($this);
+        $this->mockObject = $this->objectManager->getObject(
+            PredispatchReviewObserver::class,
+            [
+                'scopeConfig' => $this->configMock,
+                'url' => $this->urlMock
+            ]
+        );
+    }
+
+    /**
+     * Test with enabled review active config.
+     */
+    public function testReviewEnabled() : void
+    {
+        $observerMock = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getResponse', 'getData', 'setRedirect'])
+            ->getMockForAbstractClass();
+
+        $this->configMock->method('getValue')
+            ->with(PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+        $observerMock->expects($this->never())
+            ->method('getData')
+            ->with('controller_action')
+            ->willReturnSelf();
+
+        $observerMock->expects($this->never())
+            ->method('getResponse')
+            ->willReturnSelf();
+
+        $this->assertNull($this->mockObject->execute($observerMock));
+    }
+
+    /**
+     * Test with disabled review active config.
+     */
+    public function testReviewDisabled() : void
+    {
+        $observerMock = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getControllerAction', 'getResponse'])
+            ->getMockForAbstractClass();
+
+        $this->configMock->expects($this->at(0))
+            ->method('getValue')
+            ->with(PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE, ScopeInterface::SCOPE_STORE)
+            ->willReturn(false);
+
+        $expectedRedirectUrl = 'https://test.com/index';
+
+        $this->configMock->expects($this->at(1))
+            ->method('getValue')
+            ->with('web/default/no_route', ScopeInterface::SCOPE_STORE)
+            ->willReturn($expectedRedirectUrl);
+
+        $this->urlMock->expects($this->once())
+            ->method('getUrl')
+            ->willReturn($expectedRedirectUrl);
+
+        $observerMock->expects($this->once())
+            ->method('getControllerAction')
+            ->willReturnSelf();
+
+        $observerMock->expects($this->once())
+            ->method('getResponse')
+            ->willReturn($this->responseMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with($expectedRedirectUrl);
+
+        $this->assertNull($this->mockObject->execute($observerMock));
+    }
+}
diff --git a/app/code/Magento/Review/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php b/app/code/Magento/Review/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
new file mode 100644
index 0000000000000..9d3980a99f9a4
--- /dev/null
+++ b/app/code/Magento/Review/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Test\Unit\Observer;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Review\Model\ResourceModel\Rating;
+use Magento\Review\Model\ResourceModel\Review;
+use Magento\Review\Observer\ProcessProductAfterDeleteEventObserver;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * Class ProcessProductAfterDeleteEventObserverTest
+ */
+class ProcessProductAfterDeleteEventObserverTest extends TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ProcessProductAfterDeleteEventObserver
+     */
+    private $observer;
+
+    /**
+     * @var Review|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceReviewMock;
+
+    /**
+     * @var Rating|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceRatingMock;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->resourceReviewMock = $this->createMock(Review::class);
+        $this->resourceRatingMock = $this->createMock(Rating::class);
+
+        $this->observer = new ProcessProductAfterDeleteEventObserver(
+            $this->resourceReviewMock,
+            $this->resourceRatingMock
+        );
+    }
+
+    /**
+     * Test cleanup product reviews after product delete
+     *
+     * @return void
+     */
+    public function testCleanupProductReviewsWithProduct()
+    {
+        $productId = 1;
+        $observerMock = $this->createMock(Observer::class);
+        $eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMock();
+
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMock();
+
+        $productMock->expects(self::exactly(3))
+            ->method('getId')
+            ->willReturn($productId);
+        $eventMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+        $observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($eventMock);
+        $this->resourceReviewMock->expects($this->once())
+            ->method('deleteReviewsByProductId')
+            ->willReturnSelf();
+        $this->resourceRatingMock->expects($this->once())
+            ->method('deleteAggregatedRatingsByProductId')
+            ->willReturnSelf();
+
+        $this->observer->execute($observerMock);
+    }
+
+    /**
+     * Test with no event product
+     *
+     * @return void
+     */
+    public function testCleanupProductReviewsWithoutProduct()
+    {
+        $observerMock = $this->createMock(Observer::class);
+        $eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMock();
+
+        $eventMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn(null);
+        $observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($eventMock);
+        $this->resourceReviewMock->expects($this->never())
+            ->method('deleteReviewsByProductId')
+            ->willReturnSelf();
+        $this->resourceRatingMock->expects($this->never())
+            ->method('deleteAggregatedRatingsByProductId')
+            ->willReturnSelf();
+
+        $this->observer->execute($observerMock);
+    }
+}
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index a4f12e758ac83..17e0d9bebcf50 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -5,23 +5,22 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-newsletter": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.3.*",
-        "magento/module-review-sample-data": "Sample Data version:100.3.*"
+        "magento/module-cookie": "*",
+        "magento/module-review-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 2ed92a48ad421..e3532483f88af 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/Review/etc/adminhtml/system.xml b/app/code/Magento/Review/etc/adminhtml/system.xml
index c0574e9491782..a24ed29dc2c23 100644
--- a/app/code/Magento/Review/etc/adminhtml/system.xml
+++ b/app/code/Magento/Review/etc/adminhtml/system.xml
@@ -10,7 +10,11 @@
         <section id="catalog">
             <group id="review" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Product Reviews</label>
-                <field id="allow_guest" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="allow_guest" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Allow Guests to Write Reviews</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/Review/etc/config.xml b/app/code/Magento/Review/etc/config.xml
index 78dc87960f090..9fd9443be67ef 100644
--- a/app/code/Magento/Review/etc/config.xml
+++ b/app/code/Magento/Review/etc/config.xml
@@ -9,6 +9,7 @@
     <default>
         <catalog>
             <review>
+                <active>1</active>
                 <allow_guest>1</allow_guest>
             </review>
         </catalog>
diff --git a/app/code/Magento/Review/etc/db_schema.xml b/app/code/Magento/Review/etc/db_schema.xml
new file mode 100644
index 0000000000000..d1090d413384b
--- /dev/null
+++ b/app/code/Magento/Review/etc/db_schema.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="review_entity" resource="default" engine="innodb" comment="Review entities">
+        <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Review entity id"/>
+        <column xsi:type="varchar" name="entity_code" nullable="false" length="32" comment="Review entity code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+    </table>
+    <table name="review_status" resource="default" engine="innodb" comment="Review statuses">
+        <column xsi:type="smallint" name="status_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Status id"/>
+        <column xsi:type="varchar" name="status_code" nullable="false" length="32" comment="Status code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="status_id"/>
+        </constraint>
+    </table>
+    <table name="review" resource="default" engine="innodb" comment="Review base information">
+        <column xsi:type="bigint" name="review_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Review id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Review create date"/>
+        <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity id"/>
+        <column xsi:type="int" name="entity_pk_value" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product id"/>
+        <column xsi:type="smallint" name="status_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Status code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="review_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REVIEW_ENTITY_ID_REVIEW_ENTITY_ENTITY_ID" table="review" column="entity_id"
+                    referenceTable="review_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REVIEW_STATUS_ID_REVIEW_STATUS_STATUS_ID" table="review" column="status_id"
+                    referenceTable="review_status" referenceColumn="status_id" onDelete="NO ACTION"/>
+        <index referenceId="REVIEW_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="REVIEW_STATUS_ID" indexType="btree">
+            <column name="status_id"/>
+        </index>
+        <index referenceId="REVIEW_ENTITY_PK_VALUE" indexType="btree">
+            <column name="entity_pk_value"/>
+        </index>
+    </table>
+    <table name="review_detail" resource="default" engine="innodb" comment="Review detail information">
+        <column xsi:type="bigint" name="detail_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Review detail id"/>
+        <column xsi:type="bigint" name="review_id" padding="20" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Review id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Store id"/>
+        <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
+        <column xsi:type="text" name="detail" nullable="false" comment="Detail description"/>
+        <column xsi:type="varchar" name="nickname" nullable="false" length="128" comment="User nickname"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="detail_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REVIEW_DETAIL_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="review_detail"
+                    column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
+                    onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="REVIEW_DETAIL_REVIEW_ID_REVIEW_REVIEW_ID" table="review_detail"
+                    column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REVIEW_DETAIL_STORE_ID_STORE_STORE_ID" table="review_detail"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <index referenceId="REVIEW_DETAIL_REVIEW_ID" indexType="btree">
+            <column name="review_id"/>
+        </index>
+        <index referenceId="REVIEW_DETAIL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="REVIEW_DETAIL_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+    </table>
+    <table name="review_entity_summary" resource="default" engine="innodb" comment="Review aggregates">
+        <column xsi:type="bigint" name="primary_id" padding="20" unsigned="false" nullable="false" identity="true"
+                comment="Summary review entity id"/>
+        <column xsi:type="bigint" name="entity_pk_value" padding="20" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Product id"/>
+        <column xsi:type="smallint" name="entity_type" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Entity type id"/>
+        <column xsi:type="smallint" name="reviews_count" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Qty of reviews"/>
+        <column xsi:type="smallint" name="rating_summary" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Summarized rating"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="primary_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REVIEW_ENTITY_SUMMARY_STORE_ID_STORE_STORE_ID"
+                    table="review_entity_summary" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="REVIEW_ENTITY_SUMMARY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="review_store" resource="default" engine="innodb" comment="Review Store">
+        <column xsi:type="bigint" name="review_id" padding="20" unsigned="true" nullable="false" identity="false"
+                comment="Review ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="review_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="REVIEW_STORE_REVIEW_ID_REVIEW_REVIEW_ID" table="review_store"
+                    column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="REVIEW_STORE_STORE_ID_STORE_STORE_ID" table="review_store"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="REVIEW_STORE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="rating_entity" resource="default" engine="innodb" comment="Rating entities">
+        <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="entity_code" nullable="false" length="64" comment="Entity Code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="RATING_ENTITY_ENTITY_CODE">
+            <column name="entity_code"/>
+        </constraint>
+    </table>
+    <table name="rating" resource="default" engine="innodb" comment="Ratings">
+        <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Rating ID"/>
+        <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="rating_code" nullable="false" length="64" comment="Rating Code"/>
+        <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Position On Storefront"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="1" comment="Rating is active."/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rating_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RATING_ENTITY_ID_RATING_ENTITY_ENTITY_ID" table="rating" column="entity_id"
+                    referenceTable="rating_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="RATING_RATING_CODE">
+            <column name="rating_code"/>
+        </constraint>
+        <index referenceId="RATING_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+    </table>
+    <table name="rating_option" resource="default" engine="innodb" comment="Rating options">
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rating Option Id"/>
+        <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="32" comment="Rating Option Code"/>
+        <column xsi:type="smallint" name="value" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Option Value"/>
+        <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Ration option position on Storefront"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_RATING_ID_RATING_RATING_ID" table="rating_option"
+                    column="rating_id" referenceTable="rating" referenceColumn="rating_id" onDelete="CASCADE"/>
+        <index referenceId="RATING_OPTION_RATING_ID" indexType="btree">
+            <column name="rating_id"/>
+        </index>
+    </table>
+    <table name="rating_option_vote" resource="default" engine="innodb" comment="Rating option values">
+        <column xsi:type="bigint" name="vote_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Vote id"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Vote option id"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="false" length="16" comment="Customer IP"/>
+        <column xsi:type="bigint" name="remote_ip_long" padding="20" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Customer IP converted to long integer format"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Customer Id"/>
+        <column xsi:type="bigint" name="entity_pk_value" padding="20" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product id"/>
+        <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating id"/>
+        <column xsi:type="bigint" name="review_id" padding="20" unsigned="true" nullable="true" identity="false"
+                comment="Review id"/>
+        <column xsi:type="smallint" name="percent" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Percent amount"/>
+        <column xsi:type="smallint" name="value" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Vote option value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="vote_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_OPTION_ID_RATING_OPTION_OPTION_ID"
+                    table="rating_option_vote" column="option_id" referenceTable="rating_option"
+                    referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_REVIEW_ID_REVIEW_REVIEW_ID" table="rating_option_vote"
+                    column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
+        <index referenceId="RATING_OPTION_VOTE_OPTION_ID" indexType="btree">
+            <column name="option_id"/>
+        </index>
+    </table>
+    <table name="rating_option_vote_aggregated" resource="default" engine="innodb" comment="Rating vote aggregated">
+        <column xsi:type="int" name="primary_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Vote aggregation id"/>
+        <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating id"/>
+        <column xsi:type="bigint" name="entity_pk_value" padding="20" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product id"/>
+        <column xsi:type="int" name="vote_count" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Vote dty"/>
+        <column xsi:type="int" name="vote_value_sum" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="General vote sum"/>
+        <column xsi:type="smallint" name="percent" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Vote percent"/>
+        <column xsi:type="smallint" name="percent_approved" padding="6" unsigned="false" nullable="true"
+                identity="false" default="0" comment="Vote percent approved by admin"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="primary_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_AGGREGATED_RATING_ID_RATING_RATING_ID"
+                    table="rating_option_vote_aggregated" column="rating_id" referenceTable="rating"
+                    referenceColumn="rating_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="RATING_OPTION_VOTE_AGGREGATED_STORE_ID_STORE_STORE_ID"
+                    table="rating_option_vote_aggregated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="RATING_OPTION_VOTE_AGGREGATED_RATING_ID" indexType="btree">
+            <column name="rating_id"/>
+        </index>
+        <index referenceId="RATING_OPTION_VOTE_AGGREGATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="rating_store" resource="default" engine="innodb" comment="Rating Store">
+        <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rating_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RATING_STORE_STORE_ID_STORE_STORE_ID" table="rating_store"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="RATING_STORE_RATING_ID_RATING_RATING_ID" table="rating_store"
+                    column="rating_id" referenceTable="rating" referenceColumn="rating_id" onDelete="CASCADE"/>
+        <index referenceId="RATING_STORE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="rating_title" resource="default" engine="innodb" comment="Rating Title">
+        <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="varchar" name="value" nullable="false" length="255" comment="Rating Label"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rating_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="RATING_TITLE_RATING_ID_RATING_RATING_ID" table="rating_title"
+                    column="rating_id" referenceTable="rating" referenceColumn="rating_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="RATING_TITLE_STORE_ID_STORE_STORE_ID" table="rating_title"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="RATING_TITLE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Review/etc/db_schema_whitelist.json b/app/code/Magento/Review/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b7781570c4a3d
--- /dev/null
+++ b/app/code/Magento/Review/etc/db_schema_whitelist.json
@@ -0,0 +1,207 @@
+{
+    "review_entity": {
+        "column": {
+            "entity_id": true,
+            "entity_code": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "review_status": {
+        "column": {
+            "status_id": true,
+            "status_code": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "review": {
+        "column": {
+            "review_id": true,
+            "created_at": true,
+            "entity_id": true,
+            "entity_pk_value": true,
+            "status_id": true
+        },
+        "index": {
+            "REVIEW_ENTITY_ID": true,
+            "REVIEW_STATUS_ID": true,
+            "REVIEW_ENTITY_PK_VALUE": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REVIEW_ENTITY_ID_REVIEW_ENTITY_ENTITY_ID": true,
+            "REVIEW_STATUS_ID_REVIEW_STATUS_STATUS_ID": true
+        }
+    },
+    "review_detail": {
+        "column": {
+            "detail_id": true,
+            "review_id": true,
+            "store_id": true,
+            "title": true,
+            "detail": true,
+            "nickname": true,
+            "customer_id": true
+        },
+        "index": {
+            "REVIEW_DETAIL_REVIEW_ID": true,
+            "REVIEW_DETAIL_STORE_ID": true,
+            "REVIEW_DETAIL_CUSTOMER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REVIEW_DETAIL_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "REVIEW_DETAIL_REVIEW_ID_REVIEW_REVIEW_ID": true,
+            "REVIEW_DETAIL_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "review_entity_summary": {
+        "column": {
+            "primary_id": true,
+            "entity_pk_value": true,
+            "entity_type": true,
+            "reviews_count": true,
+            "rating_summary": true,
+            "store_id": true
+        },
+        "index": {
+            "REVIEW_ENTITY_SUMMARY_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REVIEW_ENTITY_SUMMARY_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "review_store": {
+        "column": {
+            "review_id": true,
+            "store_id": true
+        },
+        "index": {
+            "REVIEW_STORE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "REVIEW_STORE_REVIEW_ID_REVIEW_REVIEW_ID": true,
+            "REVIEW_STORE_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "rating_entity": {
+        "column": {
+            "entity_id": true,
+            "entity_code": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_ENTITY_ENTITY_CODE": true
+        }
+    },
+    "rating": {
+        "column": {
+            "rating_id": true,
+            "entity_id": true,
+            "rating_code": true,
+            "position": true,
+            "is_active": true
+        },
+        "index": {
+            "RATING_ENTITY_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_ENTITY_ID_RATING_ENTITY_ENTITY_ID": true,
+            "RATING_RATING_CODE": true
+        }
+    },
+    "rating_option": {
+        "column": {
+            "option_id": true,
+            "rating_id": true,
+            "code": true,
+            "value": true,
+            "position": true
+        },
+        "index": {
+            "RATING_OPTION_RATING_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_OPTION_RATING_ID_RATING_RATING_ID": true
+        }
+    },
+    "rating_option_vote": {
+        "column": {
+            "vote_id": true,
+            "option_id": true,
+            "remote_ip": true,
+            "remote_ip_long": true,
+            "customer_id": true,
+            "entity_pk_value": true,
+            "rating_id": true,
+            "review_id": true,
+            "percent": true,
+            "value": true
+        },
+        "index": {
+            "RATING_OPTION_VOTE_OPTION_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_OPTION_VOTE_OPTION_ID_RATING_OPTION_OPTION_ID": true,
+            "RATING_OPTION_VOTE_REVIEW_ID_REVIEW_REVIEW_ID": true
+        }
+    },
+    "rating_option_vote_aggregated": {
+        "column": {
+            "primary_id": true,
+            "rating_id": true,
+            "entity_pk_value": true,
+            "vote_count": true,
+            "vote_value_sum": true,
+            "percent": true,
+            "percent_approved": true,
+            "store_id": true
+        },
+        "index": {
+            "RATING_OPTION_VOTE_AGGREGATED_RATING_ID": true,
+            "RATING_OPTION_VOTE_AGGREGATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_OPTION_VOTE_AGGREGATED_RATING_ID_RATING_RATING_ID": true,
+            "RATING_OPTION_VOTE_AGGREGATED_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "rating_store": {
+        "column": {
+            "rating_id": true,
+            "store_id": true
+        },
+        "index": {
+            "RATING_STORE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_STORE_STORE_ID_STORE_STORE_ID": true,
+            "RATING_STORE_RATING_ID_RATING_RATING_ID": true
+        }
+    },
+    "rating_title": {
+        "column": {
+            "rating_id": true,
+            "store_id": true,
+            "value": true
+        },
+        "index": {
+            "RATING_TITLE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "RATING_TITLE_RATING_ID_RATING_RATING_ID": true,
+            "RATING_TITLE_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Review/etc/frontend/events.xml b/app/code/Magento/Review/etc/frontend/events.xml
index bc94277d69709..8e883ce328a2c 100644
--- a/app/code/Magento/Review/etc/frontend/events.xml
+++ b/app/code/Magento/Review/etc/frontend/events.xml
@@ -12,4 +12,7 @@
     <event name="catalog_block_product_list_collection">
         <observer name="review" instance="Magento\Review\Observer\CatalogBlockProductCollectionBeforeToHtmlObserver" shared="false" />
     </event>
+    <event name="controller_action_predispatch_review">
+        <observer name="catalog_review_enabled" instance="Magento\Review\Observer\PredispatchReviewObserver" />
+    </event>
 </config>
diff --git a/app/code/Magento/Review/etc/module.xml b/app/code/Magento/Review/etc/module.xml
index 3f2431edd1707..9ce62a8a0c646 100644
--- a/app/code/Magento/Review/etc/module.xml
+++ b/app/code/Magento/Review/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Review" setup_version="2.0.0">
+    <module name="Magento_Review" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Store"/>
diff --git a/app/code/Magento/Review/i18n/en_US.csv b/app/code/Magento/Review/i18n/en_US.csv
index 36407ae341148..b3ea21dfcae90 100644
--- a/app/code/Magento/Review/i18n/en_US.csv
+++ b/app/code/Magento/Review/i18n/en_US.csv
@@ -132,3 +132,6 @@ Summary,Summary
 "Allow Guests to Write Reviews","Allow Guests to Write Reviews"
 Active,Active
 Inactive,Inactive
+"Please select one of each of the ratings above.","Please select one of each of the ratings above."
+star,star
+stars,stars
diff --git a/app/code/Magento/Review/view/adminhtml/web/js/rating.js b/app/code/Magento/Review/view/adminhtml/web/js/rating.js
index cc72d386dc053..b8d1b1b241b8f 100644
--- a/app/code/Magento/Review/view/adminhtml/web/js/rating.js
+++ b/app/code/Magento/Review/view/adminhtml/web/js/rating.js
@@ -27,7 +27,7 @@ define([
         _bind: function () {
             this._labels.on({
                 click: $.proxy(function (e) {
-                    $('[id="' + $(e.currentTarget).attr('for') + '"]').prop('checked', true);
+                    $(e.currentTarget).prev().prop('checked', true);
                     this._updateRating();
                 }, this),
 
diff --git a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
index d7c5c19d4d813..6fcf5b0c82b4f 100644
--- a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
@@ -9,7 +9,7 @@
     <update handle="review_product_form_component"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
+            <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="triggers" xsi:type="array">
                         <item name="submitReviewButton" xsi:type="string">.review .action.submit</item>
@@ -18,8 +18,8 @@
             </block>
         </referenceContainer>
         <referenceBlock name="product.info.details">
-            <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info">
-                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
+            <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info" ifconfig="catalog/review/active">
+                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
                 </block>
             </block>
diff --git a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
index 0a7ddd8b8903d..8a853cdd2e409 100644
--- a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
+++ b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
@@ -9,7 +9,7 @@
     <update handle="catalog_product_view"/>
     <body>
         <referenceBlock name="reviews.tab">
-            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
+            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">
                         <item name="components" xsi:type="array">
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
index 54d171cbf1322..9f759dba41782 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_account_navigation">
-            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link">
+            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="path" xsi:type="string">review/customer</argument>
                     <argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
index 73174f0570e28..2e898a539a954 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="Magento_Review::customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false"/>
+            <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="Magento_Review::customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
index 2857e859aa06c..b5f7562963314 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
@@ -9,7 +9,7 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="Magento_Review::customer/list.phtml" cacheable="false"/>
+            <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="Magento_Review::customer/list.phtml" cacheable="false" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
index d51c89a1abe1a..d3adbd7950cf9 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
@@ -9,7 +9,7 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false"/>
+            <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
index c83cfe95d7964..8c5c1297cdda3 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
@@ -9,15 +9,15 @@
     <update handle="catalog_product_view"/>
     <body>
         <referenceContainer name="product.info.main">
-            <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto"/>
+            <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto" ifconfig="catalog/review/active"/>
         </referenceContainer>
         <referenceContainer name="content">
             <container name="product.info.details" htmlTag="div" htmlClass="product info detailed" after="product.info.media">
-                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
+                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before" htmlTag="div" htmlClass="rewards"/>
                 </block>
-                <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml"/>
-                <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar"/>
+                <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active"/>
+                <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar" ifconfig="catalog/review/active"/>
             </container>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
index af8d2dc2f506f..36fa71ea5125a 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
@@ -7,8 +7,8 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root">
-        <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" />
-        <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar">
+        <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active"/>
+        <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar" ifconfig="catalog/review/active">
             <arguments>
                 <argument name="show_per_page" xsi:type="boolean">false</argument>
                 <argument name="show_amounts" xsi:type="boolean">false</argument>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
index b70aec3f00b68..3bfc98cad9736 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\View" name="review_view"/>
+            <block class="Magento\Review\Block\View" name="review_view" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
index 0a7ddd8b8903d..8a853cdd2e409 100644
--- a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
+++ b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
@@ -9,7 +9,7 @@
     <update handle="catalog_product_view"/>
     <body>
         <referenceBlock name="reviews.tab">
-            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
+            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">
                         <item name="components" xsi:type="array">
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
index 725df702bb465..a65ec01d626eb 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -22,29 +22,29 @@
                 </tr>
             </thead>
             <tbody>
-                <?php foreach ($block->getReviews() as $_review): ?>
+                <?php foreach ($block->getReviews() as $review): ?>
                 <tr>
-                    <td data-th="<?= $block->escapeHtml(__('Created')) ?>" class="col date"><?= $block->escapeHtml($block->dateFormat($_review->getReviewCreatedAt())) ?></td>
+                    <td data-th="<?= $block->escapeHtml(__('Created')) ?>" class="col date"><?= $block->escapeHtml($block->dateFormat($review->getReviewCreatedAt())) ?></td>
                     <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
                         <strong class="product-name">
-                            <a href="<?= $block->escapeUrl($block->getProductUrl($_review)) ?>"><?= $block->escapeHtml($_review->getName()) ?></a>
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($review)) ?>"><?= $block->escapeHtml($review->getName()) ?></a>
                         </strong>
                     </td>
                     <td data-th="<?= $block->escapeHtml(__('Rating')) ?>" class="col summary">
-                    <?php if ($_review->getSum()): ?>
+                    <?php if ($review->getSum()): ?>
                         <div class="rating-summary">
                             <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-                            <div class="rating-result" title="<?= /* @noEscape */ ((int)$_review->getSum() / (int)$_review->getCount()) ?>%">
-                                <span style="width:<?= /* @noEscape */ ((int)$_review->getSum() / (int)$_review->getCount()) ?>%;"><span><?= /* @noEscape */ ((int)$_review->getSum() / (int)$_review->getCount()) ?>%</span></span>
+                            <div class="rating-result" title="<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%">
+                                <span style="width:<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%;"><span><?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%</span></span>
                             </div>
                         </div>
                     <?php endif; ?>
                     </td>
                     <td data-th="<?= $block->escapeHtmlAttr(__('Review')) ?>" class="col description">
-                        <?= $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?>
+                        <?= $this->helper('Magento\Review\Helper\Data')->getDetailHtml($review->getDetail()) ?>
                     </td>
                     <td data-th="<?= $block->escapeHtmlAttr(__('Actions')) ?>" class="col actions">
-                        <a href="<?= $block->escapeUrl($block->getReviewUrl($_review)) ?>" class="action more">
+                        <a href="<?= $block->escapeUrl($block->getReviewUrl($review)) ?>" class="action more">
                             <span><?= $block->escapeHtml(__('See Details')) ?></span>
                         </a>
                     </td>
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
index 22031b3f3a20b..71295d15f8622 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -35,14 +35,14 @@
                                     id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
                                     value="<?= $block->escapeHtmlAttr($_option->getId()) ?>"
                                     class="radio"
-                                    data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}"
+                                    data-validate="{'rating-required':true}"
                                     aria-labelledby="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_rating_label <?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label" />
                                 <label
                                     class="rating-<?= $block->escapeHtmlAttr($iterator) ?>"
                                     for="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
-                                    title="<?= $block->escapeHtmlAttr(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?>"
+                                    title="<?= $block->escapeHtmlAttr(__('%1 %2', $iterator, $iterator > 1 ? __('stars') : __('star'))) ?>"
                                     id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label">
-                                    <span><?= $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?></span>
+                                    <span><?= $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? __('stars') : __('star'))) ?></span>
                                 </label>
                             <?php $iterator++; ?>
                             <?php endforeach; ?>
@@ -85,7 +85,8 @@
         "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
     },
     "#review-form": {
-        "Magento_Review/js/error-placement": {}
+        "Magento_Review/js/error-placement": {},
+        "Magento_Review/js/validate-review": {}
     }
 }
 </script>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index da689960dfe54..23cb6699aeb21 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -11,7 +11,7 @@
 $url = $block->getReviewsUrl() . '#reviews';
 $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
-<?php if ($block->getReviewsCount()): ?>
+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
 <?php $rating = $block->getRatingSummary(); ?>
 <div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
     <?php if ($rating):?>
@@ -35,7 +35,7 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
         <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>"><?= $block->escapeHtml(__('Add Your Review')) ?></a>
     </div>
 </div>
-<?php elseif ($block->getDisplayIfEmpty()): ?>
+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
 <div class="product-reviews-summary empty">
     <div class="reviews-actions">
         <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
index c3eb11f03fd7d..a3ff56505f06f 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
@@ -11,7 +11,7 @@
 $url = $block->getReviewsUrl() . '#reviews';
 $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
-<?php if ($block->getReviewsCount()): ?>
+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
 <?php $rating = $block->getRatingSummary(); ?>
 <div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
     <?php if ($rating):?>
@@ -26,7 +26,7 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
         <a class="action view" href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
     </div>
 </div>
-<?php elseif ($block->getDisplayIfEmpty()): ?>
+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
 <div class="product-reviews-summary short empty">
     <div class="reviews-actions">
         <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
diff --git a/app/code/Magento/Review/view/frontend/templates/redirect.phtml b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
index fc74cadacb319..2fdb5e90a9c18 100644
--- a/app/code/Magento/Review/view/frontend/templates/redirect.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
@@ -8,9 +8,6 @@
 
 ?>
 <?php
-/*    if(isset($GET['limit'])) {
-        $limit = $GET['limit']
-    }*/
     header("Location:{$block->getProduct()->getProductUrl()}#info-product_reviews");
     exit;
 ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
index 564a6e1a7c537..205ce5c20572a 100644
--- a/app/code/Magento/Review/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/view.phtml
@@ -49,7 +49,7 @@
     <div class="actions">
         <div class="secondary">
             <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></a></span>
+                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
index 08464e3da6f42..d1c40959e3ec2 100644
--- a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
+++ b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
@@ -50,15 +50,15 @@ define([
 
         $(function () {
             $('.product-info-main .reviews-actions a').click(function (event) {
-                var acnchor;
+                var anchor;
 
                 event.preventDefault();
-                acnchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
+                anchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
                 $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
                     if (this.id == 'reviews') { //eslint-disable-line eqeqeq
                         $('.product.data.items').tabs('activate', index);
                         $('html, body').animate({
-                            scrollTop: $('#' + acnchor).offset().top - 50
+                            scrollTop: $('#' + anchor).offset().top - 50
                         }, 300);
                     }
                 });
diff --git a/app/code/Magento/Review/view/frontend/web/js/validate-review.js b/app/code/Magento/Review/view/frontend/web/js/validate-review.js
new file mode 100644
index 0000000000000..e3f57eaf8cd33
--- /dev/null
+++ b/app/code/Magento/Review/view/frontend/web/js/validate-review.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/ui',
+    'jquery/validate',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    $.validator.addMethod(
+        'rating-required', function (value) {
+            return value !== undefined;
+        }, $.mage.__('Please select one of each of the ratings above.'));
+});
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE.txt b/app/code/Magento/ReviewAnalytics/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE.txt
rename to app/code/Magento/ReviewAnalytics/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE_AFL.txt b/app/code/Magento/ReviewAnalytics/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE_AFL.txt
rename to app/code/Magento/ReviewAnalytics/LICENSE_AFL.txt
diff --git a/app/code/Magento/ReviewAnalytics/README.md b/app/code/Magento/ReviewAnalytics/README.md
new file mode 100644
index 0000000000000..b078083dfb7dc
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_ReviewAnalytics module
+
+The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE.txt b/app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE.txt
rename to app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE_AFL.txt b/app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE_AFL.txt
rename to app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ReviewAnalytics/Test/Mftf/README.md b/app/code/Magento/ReviewAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9175fe01002bc
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Review Analytics Functional Tests
+
+The Functional Test Module for **Magento Review Analytics** module.
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
new file mode 100644
index 0000000000000..73f534451580c
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-review-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-review": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\ReviewAnalytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/ReviewAnalytics/etc/analytics.xml b/app/code/Magento/ReviewAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..cd5d1b2c1af4c
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/etc/analytics.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="reviews">
+        <providers>
+            <reportProvider name="reviews" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>reviews</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="rating_option_votes">
+        <providers>
+            <reportProvider  name="rating_option_votes" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>rating_option_votes</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/ReviewAnalytics/etc/module.xml b/app/code/Magento/ReviewAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..ce2f870f2be79
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_ReviewAnalytics" >
+        <sequence>
+            <module name="Magento_Review"/>
+            <module name="Magento_Analytics"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/ReviewAnalytics/etc/reports.xml b/app/code/Magento/ReviewAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..8dd508983aced
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/etc/reports.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="reviews" connection="default">
+        <source name="review">
+            <attribute name="review_id"/>
+            <attribute name="created_at"/>
+            <attribute name="entity_pk_value"/>
+        </source>
+    </report>
+    <report name="rating_option_votes" connection="default">
+        <source name="rating_option_vote_aggregated">
+            <attribute name="primary_id"/>
+            <attribute name="entity_pk_value"/>
+            <attribute name="store_id"/>
+            <attribute name="rating_id"/>
+            <attribute name="percent_approved"/>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/ReviewAnalytics/registration.php b/app/code/Magento/ReviewAnalytics/registration.php
new file mode 100644
index 0000000000000..6b795ca04c61b
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_ReviewAnalytics',
+    __DIR__
+);
diff --git a/app/code/Magento/Robots/Block/Data.php b/app/code/Magento/Robots/Block/Data.php
index 0e492eb73732d..460225d3ed71c 100644
--- a/app/code/Magento/Robots/Block/Data.php
+++ b/app/code/Magento/Robots/Block/Data.php
@@ -11,9 +11,11 @@
 use Magento\Robots\Model\Config\Value;
 use Magento\Robots\Model\Robots;
 use Magento\Store\Model\StoreResolver;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Robots Block Class.
+ *
  * Prepares base content for robots.txt and implements Page Cache functionality.
  *
  * @api
@@ -27,24 +29,29 @@ class Data extends AbstractBlock implements IdentityInterface
     private $robots;
 
     /**
-     * @var StoreResolver
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @param Context $context
      * @param Robots $robots
      * @param StoreResolver $storeResolver
+     * @param StoreManagerInterface|null $storeManager
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
         Robots $robots,
         StoreResolver $storeResolver,
+        StoreManagerInterface $storeManager = null,
         array $data = []
     ) {
         $this->robots = $robots;
-        $this->storeResolver = $storeResolver;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
 
         parent::__construct($context, $data);
     }
@@ -69,7 +76,7 @@ protected function _toHtml()
     public function getIdentities()
     {
         return [
-            Value::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
+            Value::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(),
         ];
     }
 }
diff --git a/app/code/Magento/Robots/Controller/Index/Index.php b/app/code/Magento/Robots/Controller/Index/Index.php
index b94626e93432d..679066d723dce 100644
--- a/app/code/Magento/Robots/Controller/Index/Index.php
+++ b/app/code/Magento/Robots/Controller/Index/Index.php
@@ -43,6 +43,7 @@ public function execute()
         /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create(true);
         $resultPage->addHandle('robots_index_index');
+        $resultPage->setHeader('Content-Type', 'text/plain');
         return $resultPage;
     }
 }
diff --git a/app/code/Magento/Robots/Controller/Router.php b/app/code/Magento/Robots/Controller/Router.php
index 4ed2b6c72871b..fa516455831d0 100644
--- a/app/code/Magento/Robots/Controller/Router.php
+++ b/app/code/Magento/Robots/Controller/Router.php
@@ -13,7 +13,7 @@
 use Magento\Framework\App\RouterInterface;
 
 /**
- * Matches applicaton action in case when robots.txt file was requested
+ * Matches application action in case when robots.txt file was requested
  */
 class Router implements RouterInterface
 {
diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php
index 83c21d6602fca..c4e17e55f1262 100644
--- a/app/code/Magento/Robots/Model/Config/Value.php
+++ b/app/code/Magento/Robots/Model/Config/Value.php
@@ -14,9 +14,11 @@
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
 use Magento\Store\Model\StoreResolver;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Backend model for design/search_engine_robots/custom_instructions configuration value.
+ *
  * Required to implement Page Cache functionality.
  *
  * @api
@@ -38,9 +40,9 @@ class Value extends ConfigValue implements IdentityInterface
     protected $_cacheTag = true;
 
     /**
-     * @var StoreResolver
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @param Context $context
@@ -48,9 +50,12 @@ class Value extends ConfigValue implements IdentityInterface
      * @param ScopeConfigInterface $config
      * @param TypeListInterface $cacheTypeList
      * @param StoreResolver $storeResolver
+     * @param StoreManagerInterface|null $storeManager
      * @param AbstractResource|null $resource
      * @param AbstractDb|null $resourceCollection
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
@@ -58,11 +63,13 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         StoreResolver $storeResolver,
+        StoreManagerInterface $storeManager = null,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
         array $data = []
     ) {
-        $this->storeResolver = $storeResolver;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
 
         parent::__construct(
             $context,
@@ -84,7 +91,7 @@ public function __construct(
     public function getIdentities()
     {
         return [
-            self::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
+            self::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(),
         ];
     }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE.txt b/app/code/Magento/Robots/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE.txt
rename to app/code/Magento/Robots/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE_AFL.txt b/app/code/Magento/Robots/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE_AFL.txt
rename to app/code/Magento/Robots/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Robots/Test/Mftf/README.md b/app/code/Magento/Robots/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e10f7c3e78419
--- /dev/null
+++ b/app/code/Magento/Robots/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Robots Functional Tests
+
+The Functional Test Module for **Magento Robots** module.
diff --git a/app/code/Magento/Robots/Test/Unit/Block/DataTest.php b/app/code/Magento/Robots/Test/Unit/Block/DataTest.php
index 10d2595832a48..95aa97fc8f677 100644
--- a/app/code/Magento/Robots/Test/Unit/Block/DataTest.php
+++ b/app/code/Magento/Robots/Test/Unit/Block/DataTest.php
@@ -27,6 +27,11 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     private $storeResolver;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
     /**
      * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -65,10 +70,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+
         $this->block = new \Magento\Robots\Block\Data(
             $this->context,
             $this->robots,
-            $this->storeResolver
+            $this->storeResolver,
+            $this->storeManager
         );
     }
 
@@ -97,8 +106,14 @@ public function testGetIdentities()
     {
         $storeId = 1;
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->once())
+            ->method('getId')
             ->willReturn($storeId);
 
         $expected = [
diff --git a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
index 22a69cc13bd52..d3a7a97c7ea80 100644
--- a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
@@ -51,6 +51,9 @@ public function testExecute()
         $resultPageMock->expects($this->once())
             ->method('addHandle')
             ->with('robots_index_index');
+        $resultPageMock->expects($this->once())
+            ->method('setHeader')
+            ->with('Content-Type', 'text/plain');
 
         $this->resultPageFactory->expects($this->any())
             ->method('create')
diff --git a/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php b/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php
index fc0c55ccef147..44e843e7de936 100644
--- a/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php
+++ b/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php
@@ -37,6 +37,11 @@ class ValueTest extends \PHPUnit\Framework\TestCase
      */
     private $storeResolver;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
     protected function setUp()
     {
         $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
@@ -57,12 +62,16 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+
         $this->model = new \Magento\Robots\Model\Config\Value(
             $this->context,
             $this->registry,
             $this->scopeConfig,
             $this->typeList,
-            $this->storeResolver
+            $this->storeResolver,
+            $this->storeManager
         );
     }
 
@@ -73,8 +82,14 @@ public function testGetIdentities()
     {
         $storeId = 1;
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->once())
+            ->method('getId')
             ->willReturn($storeId);
 
         $expected = [
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index b04f3bff15fa2..6f812857873b8 100644
--- a/app/code/Magento/Robots/composer.json
+++ b/app/code/Magento/Robots/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-theme": "100.3.*"
+        "magento/module-theme": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Robots/etc/module.xml b/app/code/Magento/Robots/etc/module.xml
index ab04dfb7486f7..6a6b36a66c778 100644
--- a/app/code/Magento/Robots/etc/module.xml
+++ b/app/code/Magento/Robots/etc/module.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Robots" setup_version="2.0.0">
+    <module name="Magento_Robots" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Theme"/>
diff --git a/app/code/Magento/Rss/Block/Feeds.php b/app/code/Magento/Rss/Block/Feeds.php
index 2e88d25c02891..86998f87f5c17 100644
--- a/app/code/Magento/Rss/Block/Feeds.php
+++ b/app/code/Magento/Rss/Block/Feeds.php
@@ -16,7 +16,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'feeds.phtml';
+    protected $_template = 'Magento_Rss::feeds.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\RssManagerInterface
diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php
index 7461c780fb230..e37ee263b8301 100644
--- a/app/code/Magento/Rss/Model/Rss.php
+++ b/app/code/Magento/Rss/Model/Rss.php
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Rss\Model;
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Rss\DataProviderInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\App\FeedFactoryInterface;
 
 /**
  * Provides functionality to work with RSS feeds
@@ -27,6 +31,11 @@ class Rss
      */
     protected $cache;
 
+    /**
+     * @var \Magento\Framework\App\FeedFactoryInterface
+     */
+    private $feedFactory;
+
     /**
      * @var SerializerInterface
      */
@@ -37,13 +46,16 @@ class Rss
      *
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param SerializerInterface|null $serializer
+     * @param FeedFactoryInterface|null $feedFactory
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        FeedFactoryInterface $feedFactory = null
     ) {
         $this->cache = $cache;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->feedFactory = $feedFactory ?: ObjectManager::getInstance()->get(FeedFactoryInterface::class);
     }
 
     /**
@@ -89,10 +101,12 @@ public function setDataProvider(DataProviderInterface $dataProvider)
 
     /**
      * @return string
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
     public function createRssXml()
     {
-        $rssFeedFromArray = \Zend_Feed::importArray($this->getFeeds(), 'rss');
-        return $rssFeedFromArray->saveXML();
+        $feed = $this->feedFactory->create($this->getFeeds(), FeedFactoryInterface::FORMAT_RSS);
+        return $feed->getFormattedContent();
     }
 }
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE.txt b/app/code/Magento/Rss/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE.txt
rename to app/code/Magento/Rss/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE_AFL.txt b/app/code/Magento/Rss/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE_AFL.txt
rename to app/code/Magento/Rss/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Rss/Test/Mftf/README.md b/app/code/Magento/Rss/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f0dfa5b1df52f
--- /dev/null
+++ b/app/code/Magento/Rss/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Rss Functional Tests
+
+The Functional Test Module for **Magento Rss** module.
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
index 32aab6ffb92bc..a601f8fb2d1d7 100644
--- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Rss\Test\Unit\Controller\Adminhtml\Feed;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Feed\Writer\Exception\InvalidArgumentException;
 
 /**
  * Class IndexTest
@@ -103,14 +104,22 @@ public function testExecuteWithException()
         $dataProvider = $this->createMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true));
 
-        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider']);
+        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml']);
         $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf());
 
+        $exceptionMock = new \Magento\Framework\Exception\RuntimeException(
+            new \Magento\Framework\Phrase('Any message')
+        );
+
+        $rssModel->expects($this->once())->method('createRssXml')->will(
+            $this->throwException($exceptionMock)
+        );
+
         $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf());
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException('\Zend_Feed_Builder_Exception');
+        $this->expectException(\Magento\Framework\Exception\RuntimeException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
index 71802deee0a8d..30415155d5f6e 100644
--- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Rss\Test\Unit\Controller\Feed;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Feed\Writer\Exception\InvalidArgumentException;
 
 /**
  * Class IndexTest
@@ -52,6 +53,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
+
         $this->controller = $objectManagerHelper->getObject(
             \Magento\Rss\Controller\Feed\Index::class,
             [
@@ -90,14 +92,22 @@ public function testExecuteWithException()
         $dataProvider = $this->createMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true));
 
-        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider']);
+        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml']);
         $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf());
 
+        $exceptionMock = new \Magento\Framework\Exception\RuntimeException(
+            new \Magento\Framework\Phrase('Any message')
+        );
+
+        $rssModel->expects($this->once())->method('createRssXml')->will(
+            $this->throwException($exceptionMock)
+        );
+
         $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf());
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException('\Zend_Feed_Builder_Exception');
+        $this->expectException(\Magento\Framework\Exception\RuntimeException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
index 6f98b9f202e30..f2888e4296b40 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
@@ -19,7 +19,7 @@ class RssTest extends \PHPUnit\Framework\TestCase
     /**
      * @var array
      */
-    protected $feedData = [
+    private $feedData = [
         'title' => 'Feed Title',
         'link' => 'http://magento.com/rss/link',
         'description' => 'Feed Description',
@@ -33,6 +33,27 @@ class RssTest extends \PHPUnit\Framework\TestCase
         ],
     ];
 
+    /**
+     * @var string
+     */
+    private $feedXml = '<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0">
+  <channel>
+    <title><![CDATA[Feed Title]]></title>
+    <link>http://magento.com/rss/link</link>
+    <description><![CDATA[Feed Description]]></description>
+    <pubDate>Sat, 22 Apr 2017 13:21:12 +0200</pubDate>
+    <generator>Zend\Feed</generator>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <item>
+      <title><![CDATA[Feed 1 Title]]></title>
+      <link>http://magento.com/rss/link/id/1</link>
+      <description><![CDATA[Feed 1 Description]]></description>
+      <pubDate>Sat, 22 Apr 2017 13:21:12 +0200</pubDate>
+    </item>
+  </channel>
+</rss>';
+
     /**
      * @var ObjectManagerHelper
      */
@@ -43,6 +64,16 @@ class RssTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheMock;
 
+    /**
+     * @var \Magento\Framework\App\FeedFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $feedFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\FeedInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $feedMock;
+
     /**
      * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -52,11 +83,15 @@ protected function setUp()
     {
         $this->cacheMock = $this->createMock(\Magento\Framework\App\CacheInterface::class);
         $this->serializerMock = $this->createMock(SerializerInterface::class);
+        $this->feedFactoryMock = $this->createMock(\Magento\Framework\App\FeedFactoryInterface::class);
+        $this->feedMock = $this->createMock(\Magento\Framework\App\FeedInterface::class);
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->rss = $this->objectManagerHelper->getObject(
             \Magento\Rss\Model\Rss::class,
             [
                 'cache' => $this->cacheMock,
+                'feedFactory' => $this->feedFactoryMock,
                 'serializer' => $this->serializerMock
             ]
         );
@@ -116,14 +151,16 @@ public function testCreateRssXml()
         $dataProvider->expects($this->any())->method('getCacheLifetime')->will($this->returnValue(100));
         $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData));
 
+        $this->feedMock->expects($this->once())
+            ->method('getFormattedContent')
+            ->willReturn($this->feedXml);
+
+        $this->feedFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->feedData, \Magento\Framework\App\FeedFactoryInterface::FORMAT_RSS)
+            ->will($this->returnValue($this->feedMock));
+
         $this->rss->setDataProvider($dataProvider);
-        $result = $this->rss->createRssXml();
-        $this->assertContains('<?xml version="1.0" encoding="UTF-8"?>', $result);
-        $this->assertContains('<title><![CDATA[Feed Title]]></title>', $result);
-        $this->assertContains('<title><![CDATA[Feed 1 Title]]></title>', $result);
-        $this->assertContains('<link>http://magento.com/rss/link</link>', $result);
-        $this->assertContains('<link>http://magento.com/rss/link/id/1</link>', $result);
-        $this->assertContains('<description><![CDATA[Feed Description]]></description>', $result);
-        $this->assertContains('<description><![CDATA[Feed 1 Description]]></description>', $result);
+        $this->assertNotNull($this->rss->createRssXml());
     }
 }
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index 7fe788c0494ae..5b6c34688c31a 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rss/etc/module.xml b/app/code/Magento/Rss/etc/module.xml
index c0daf630f75e8..196d8c3ac5655 100644
--- a/app/code/Magento/Rss/etc/module.xml
+++ b/app/code/Magento/Rss/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Rss" setup_version="2.0.0">
+    <module name="Magento_Rss" >
     </module>
 </config>
diff --git a/app/code/Magento/Rule/Model/Action/AbstractAction.php b/app/code/Magento/Rule/Model/Action/AbstractAction.php
index fb15edf8a4893..4d56f6cc56edc 100644
--- a/app/code/Magento/Rule/Model/Action/AbstractAction.php
+++ b/app/code/Magento/Rule/Model/Action/AbstractAction.php
@@ -49,13 +49,16 @@ public function __construct(
 
         $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
 
-        foreach (array_keys($this->getAttributeOption()) as $attr) {
-            $this->setAttribute($attr);
-            break;
+        $attributes = $this->getAttributeOption();
+        if ($attributes) {
+            reset($attributes);
+            $this->setAttribute(key($attributes));
         }
-        foreach (array_keys($this->getOperatorOption()) as $operator) {
-            $this->setOperator($operator);
-            break;
+
+        $operators = $this->getOperatorOption();
+        if ($operators) {
+            reset($operators);
+            $this->setOperator(key($operators));
         }
     }
 
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index 01e715f06a27f..a1987f67e47f2 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -24,7 +24,6 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
 {
     /**
      * Defines which operators will be available for this condition
-     *
      * @var string
      */
     protected $_inputType = null;
@@ -84,17 +83,13 @@ public function __construct(Context $context, array $data = [])
 
         $options = $this->getAttributeOptions();
         if ($options) {
-            foreach (array_keys($options) as $attr) {
-                $this->setAttribute($attr);
-                break;
-            }
+            reset($options);
+            $this->setAttribute(key($options));
         }
         $options = $this->getOperatorOptions();
         if ($options) {
-            foreach (array_keys($options) as $operator) {
-                $this->setOperator($operator);
-                break;
-            }
+            reset($options);
+            $this->setOperator(key($options));
         }
     }
 
@@ -160,14 +155,13 @@ public function getForm()
      */
     public function asArray(array $arrAttributes = [])
     {
-        $out = [
+        return [
             'type' => $this->getType(),
             'attribute' => $this->getAttribute(),
             'operator' => $this->getOperator(),
             'value' => $this->getValue(),
             'is_value_processed' => $this->getIsValueParsed(),
         ];
-        return $out;
     }
 
     /**
@@ -205,7 +199,7 @@ public function getMappedSqlField()
      */
     public function asXml()
     {
-        $xml = "<type>" .
+        return "<type>" .
             $this->getType() .
             "</type>" .
             "<attribute>" .
@@ -217,7 +211,6 @@ public function asXml()
             "<value>" .
             $this->getValue() .
             "</value>";
-        return $xml;
     }
 
     /**
@@ -244,8 +237,7 @@ public function loadXml($xml)
         if (is_string($xml)) {
             $xml = simplexml_load_string($xml);
         }
-        $arr = (array)$xml;
-        $this->loadArray($arr);
+        $this->loadArray((array)$xml);
         return $this;
     }
 
@@ -304,10 +296,7 @@ public function loadOperatorOptions()
      */
     public function getInputType()
     {
-        if (null === $this->_inputType) {
-            return 'string';
-        }
-        return $this->_inputType;
+        return null === $this->_inputType ? 'string' : $this->_inputType;
     }
 
     /**
@@ -348,12 +337,11 @@ public function loadValueOptions()
      */
     public function getValueSelectOptions()
     {
-        $valueOption = $opt = [];
+        $opt = [];
         if ($this->hasValueOption()) {
-            $valueOption = (array)$this->getValueOption();
-        }
-        foreach ($valueOption as $key => $value) {
-            $opt[] = ['value' => $key, 'label' => $value];
+            foreach ((array)$this->getValueOption() as $key => $value) {
+                $opt[] = ['value' => $key, 'label' => $value];
+            }
         }
         return $opt;
     }
@@ -367,10 +355,10 @@ public function getValueParsed()
     {
         if (!$this->hasValueParsed()) {
             $value = $this->getData('value');
-            if (is_array($value) && isset($value[0]) && is_string($value[0])) {
-                $value = $value[0];
+            if (is_array($value) && count($value) === 1) {
+                $value = reset($value);
             }
-            if ($this->isArrayOperatorType() && $value) {
+            if (!is_array($value) && $this->isArrayOperatorType() && $value) {
                 $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY);
             }
             $this->setValueParsed($value);
@@ -392,7 +380,7 @@ public function isArrayOperatorType()
     }
 
     /**
-     * @return array
+     * @return mixed
      */
     public function getValue()
     {
@@ -470,13 +458,12 @@ public function getNewChildName()
      */
     public function asHtml()
     {
-        $html = $this->getTypeElementHtml() .
+        return $this->getTypeElementHtml() .
             $this->getAttributeElementHtml() .
             $this->getOperatorElementHtml() .
             $this->getValueElementHtml() .
             $this->getRemoveLinkHtml() .
             $this->getChooserContainerHtml();
-        return $html;
     }
 
     /**
@@ -484,8 +471,7 @@ public function asHtml()
      */
     public function asHtmlRecursive()
     {
-        $html = $this->asHtml();
-        return $html;
+        return $this->asHtml();
     }
 
     /**
@@ -520,9 +506,10 @@ public function getTypeElementHtml()
     public function getAttributeElement()
     {
         if (null === $this->getAttribute()) {
-            foreach (array_keys($this->getAttributeOption()) as $option) {
-                $this->setAttribute($option);
-                break;
+            $options = $this->getAttributeOption();
+            if ($options) {
+                reset($options);
+                $this->setAttribute(key($options));
             }
         }
         return $this->getForm()->addField(
@@ -558,10 +545,8 @@ public function getOperatorElement()
     {
         $options = $this->getOperatorSelectOptions();
         if ($this->getOperator() === null) {
-            foreach ($options as $option) {
-                $this->setOperator($option['value']);
-                break;
-            }
+            $option = reset($options);
+            $this->setOperator($option['value']);
         }
 
         $elementId = sprintf('%s__%s__operator', $this->getPrefix(), $this->getId());
@@ -654,8 +639,7 @@ public function getValueElementHtml()
     public function getAddLinkHtml()
     {
         $src = $this->_assetRepo->getUrl('images/rule_component_add.gif');
-        $html = '<img src="' . $src . '" class="rule-param-add v-middle" alt="" title="' . __('Add') . '"/>';
-        return $html;
+        return '<img src="' . $src . '" class="rule-param-add v-middle" alt="" title="' . __('Add') . '"/>';
     }
 
     /**
@@ -676,11 +660,7 @@ public function getRemoveLinkHtml()
     public function getChooserContainerHtml()
     {
         $url = $this->getValueElementChooserUrl();
-        $html = '';
-        if ($url) {
-            $html = '<div class="rule-chooser" url="' . $url . '"></div>';
-        }
-        return $html;
+        return $url ? '<div class="rule-chooser" url="' . $url . '"></div>' : '';
     }
 
     /**
@@ -690,8 +670,7 @@ public function getChooserContainerHtml()
      */
     public function asString($format = '')
     {
-        $str = $this->getAttributeName() . ' ' . $this->getOperatorName() . ' ' . $this->getValueName();
-        return $str;
+        return $this->getAttributeName() . ' ' . $this->getOperatorName() . ' ' . $this->getValueName();
     }
 
     /**
@@ -700,8 +679,7 @@ public function asString($format = '')
      */
     public function asStringRecursive($level = 0)
     {
-        $str = str_pad('', $level * 3, ' ', STR_PAD_LEFT) . $this->asString();
-        return $str;
+        return str_pad('', $level * 3, ' ', STR_PAD_LEFT) . $this->asString();
     }
 
     /**
@@ -740,12 +718,10 @@ public function validateAttribute($validatedValue)
             case '==':
             case '!=':
                 if (is_array($value)) {
-                    if (is_array($validatedValue)) {
-                        $result = array_intersect($value, $validatedValue);
-                        $result = !empty($result);
-                    } else {
+                    if (!is_array($validatedValue)) {
                         return false;
                     }
+                    $result = !empty(array_intersect($value, $validatedValue));
                 } else {
                     if (is_array($validatedValue)) {
                         $result = count($validatedValue) == 1 && array_shift($validatedValue) == $value;
@@ -759,18 +735,16 @@ public function validateAttribute($validatedValue)
             case '>':
                 if (!is_scalar($validatedValue)) {
                     return false;
-                } else {
-                    $result = $validatedValue <= $value;
                 }
+                $result = $validatedValue <= $value;
                 break;
 
             case '>=':
             case '<':
                 if (!is_scalar($validatedValue)) {
                     return false;
-                } else {
-                    $result = $validatedValue >= $value;
                 }
+                $result = $validatedValue >= $value;
                 break;
 
             case '{}':
@@ -783,12 +757,11 @@ public function validateAttribute($validatedValue)
                         }
                     }
                 } elseif (is_array($value)) {
-                    if (is_array($validatedValue)) {
-                        $result = array_intersect($value, $validatedValue);
-                        $result = !empty($result);
-                    } else {
+                    if (!is_array($validatedValue)) {
                         return false;
                     }
+                    $result = array_intersect($value, $validatedValue);
+                    $result = !empty($result);
                 } else {
                     if (is_array($validatedValue)) {
                         $result = in_array($value, $validatedValue);
@@ -833,13 +806,13 @@ protected function _compareValues($validatedValue, $value, $strict = true)
     {
         if ($strict && is_numeric($validatedValue) && is_numeric($value)) {
             return $validatedValue == $value;
-        } else {
-            $validatePattern = preg_quote($validatedValue, '~');
-            if ($strict) {
-                $validatePattern = '^' . $validatePattern . '$';
-            }
-            return (bool)preg_match('~' . $validatePattern . '~iu', $value);
         }
+
+        $validatePattern = preg_quote($validatedValue, '~');
+        if ($strict) {
+            $validatePattern = '^' . $validatePattern . '$';
+        }
+        return (bool)preg_match('~' . $validatePattern . '~iu', $value);
     }
 
     /**
diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php
index 24ed1cb497472..48873aec66295 100644
--- a/app/code/Magento/Rule/Model/Condition/Combine.php
+++ b/app/code/Magento/Rule/Model/Condition/Combine.php
@@ -46,10 +46,8 @@ public function __construct(Context $context, array $data = [])
         $this->loadAggregatorOptions();
         $options = $this->getAggregatorOptions();
         if ($options) {
-            foreach (array_keys($options) as $aggregator) {
-                $this->setAggregator($aggregator);
-                break;
-            }
+            reset($options);
+            $this->setAggregator(key($options));
         }
     }
 
@@ -90,9 +88,10 @@ public function getAggregatorName()
     public function getAggregatorElement()
     {
         if ($this->getAggregator() === null) {
-            foreach (array_keys($this->getAggregatorOption()) as $key) {
-                $this->setAggregator($key);
-                break;
+            $options = $this->getAggregatorOption();
+            if ($options) {
+                reset($options);
+                $this->setAggregator(key($options));
             }
         }
         return $this->getForm()->addField(
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 41a55f4c25166..6267e30a7a6d5 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -6,9 +6,14 @@
 
 namespace Magento\Rule\Model\Condition\Sql;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Rule\Model\Condition\AbstractCondition;
 use Magento\Rule\Model\Condition\Combine;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 
 /**
  * Class SQL Builder
@@ -27,26 +32,48 @@ class Builder
         '=='    => ':field = ?',
         '!='    => ':field <> ?',
         '>='    => ':field >= ?',
+        '&gt;=' => ':field >= ?',
         '>'     => ':field > ?',
+        '&gt;'  => ':field > ?',
         '<='    => ':field <= ?',
+        '&lt;=' => ':field <= ?',
         '<'     => ':field < ?',
+        '&lt;'  => ':field < ?',
         '{}'    => ':field IN (?)',
         '!{}'   => ':field NOT IN (?)',
         '()'    => ':field IN (?)',
         '!()'   => ':field NOT IN (?)',
     ];
 
+    /**
+     * @var array
+     */
+    private $stringConditionOperatorMap = [
+        '{}' => ':field LIKE ?',
+        '!{}' => ':field NOT LIKE ?',
+    ];
+
     /**
      * @var \Magento\Rule\Model\Condition\Sql\ExpressionFactory
      */
     protected $_expressionFactory;
 
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
     /**
      * @param ExpressionFactory $expressionFactory
+     * @param AttributeRepositoryInterface|null $attributeRepository
      */
-    public function __construct(ExpressionFactory $expressionFactory)
-    {
+    public function __construct(
+        ExpressionFactory $expressionFactory,
+        AttributeRepositoryInterface $attributeRepository = null
+    ) {
         $this->_expressionFactory = $expressionFactory;
+        $this->attributeRepository = $attributeRepository ?:
+            ObjectManager::getInstance()->get(AttributeRepositoryInterface::class);
     }
 
     /**
@@ -88,14 +115,14 @@ protected function _getChildCombineTablesToJoin(Combine $combine, $tables = [])
     /**
      * Join tables from conditions combination to collection
      *
-     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param AbstractCollection $collection
      * @param Combine $combine
      * @return $this
      */
     protected function _joinTablesToCollection(
-        \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection,
+        AbstractCollection $collection,
         Combine $combine
-    ) {
+    ): Builder {
         foreach ($this->_getCombineTablesToJoin($combine) as $alias => $joinTable) {
             /** @var $condition AbstractCondition */
             $collection->getSelect()->joinLeft(
@@ -104,6 +131,7 @@ protected function _joinTablesToCollection(
                 isset($joinTable['columns']) ? $joinTable['columns'] : '*'
             );
         }
+
         return $this;
     }
 
@@ -112,11 +140,16 @@ protected function _joinTablesToCollection(
      *
      * @param AbstractCondition $condition
      * @param string $value
+     * @param bool $isDefaultStoreUsed no longer used because caused an issue about not existing table alias
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    protected function _getMappedSqlCondition(AbstractCondition $condition, $value = '')
-    {
+    protected function _getMappedSqlCondition(
+        AbstractCondition $condition,
+        string $value = '',
+        bool $isDefaultStoreUsed = true
+    ): string {
         $argument = $condition->getMappedSqlField();
 
         // If rule hasn't valid argument - create negative expression to prevent incorrect rule behavior.
@@ -130,25 +163,59 @@ protected function _getMappedSqlCondition(AbstractCondition $condition, $value =
             throw new \Magento\Framework\Exception\LocalizedException(__('Unknown condition operator'));
         }
 
-        $sql = str_replace(
-            ':field',
-            $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), 0),
-            $this->_conditionOperatorMap[$conditionOperator]
-        );
+        $defaultValue = 0;
+        //operator 'contains {}' is mapped to 'IN()' query that cannot work with substrings
+        // adding mapping to 'LIKE %%'
+        if ($condition->getInputType() === 'string'
+            && in_array($conditionOperator, array_keys($this->stringConditionOperatorMap), true)
+        ) {
+            $sql = str_replace(
+                ':field',
+                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
+                $this->stringConditionOperatorMap[$conditionOperator]
+            );
+            $bindValue = $condition->getBindArgumentValue();
+            $expression = $value . $this->_connection->quoteInto($sql, "%$bindValue%");
+        } else {
+            $sql = str_replace(
+                ':field',
+                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
+                $this->_conditionOperatorMap[$conditionOperator]
+            );
+            $bindValue = $condition->getBindArgumentValue();
+            $expression = $value . $this->_connection->quoteInto($sql, $bindValue);
+        }
+        // values for multiselect attributes can be saved in comma-separated format
+        // below is a solution for matching such conditions with selected values
+        if (is_array($bindValue) && \in_array($conditionOperator, ['()', '{}'], true)) {
+            foreach ($bindValue as $item) {
+                $expression .= $this->_connection->quoteInto(
+                    " OR (FIND_IN_SET (?, {$this->_connection->quoteIdentifier($argument)}) > 0)",
+                    $item
+                );
+            }
+        }
 
         return $this->_expressionFactory->create(
-            ['expression' => $value . $this->_connection->quoteInto($sql, $condition->getBindArgumentValue())]
+            ['expression' => $expression]
         );
     }
 
     /**
+     * Get mapped sql combination.
+     *
      * @param Combine $combine
      * @param string $value
+     * @param bool $isDefaultStoreUsed
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _getMappedSqlCombination(Combine $combine, $value = '')
-    {
+    protected function _getMappedSqlCombination(
+        Combine $combine,
+        string $value = '',
+        bool $isDefaultStoreUsed = true
+    ): string {
         $out = (!empty($value) ? $value : '');
         $value = ($combine->getValue() ? '' : ' NOT ');
         $getAggregator = $combine->getAggregator();
@@ -158,27 +225,27 @@ protected function _getMappedSqlCombination(Combine $combine, $value = '')
             $con = ($getAggregator == 'any' ? Select::SQL_OR : Select::SQL_AND);
             $con = (isset($conditions[$key+1]) ? $con : '');
             if ($condition instanceof Combine) {
-                $out .= $this->_getMappedSqlCombination($condition, $value);
+                $out .= $this->_getMappedSqlCombination($condition, $value, $isDefaultStoreUsed);
             } else {
-                $out .= $this->_getMappedSqlCondition($condition, $value);
+                $out .= $this->_getMappedSqlCondition($condition, $value, $isDefaultStoreUsed);
             }
             $out .=  $out ? (' ' . $con) : '';
         }
+
         return $this->_expressionFactory->create(['expression' => $out]);
     }
 
     /**
      * Attach conditions filter to collection
      *
-     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param AbstractCollection $collection
      * @param Combine $combine
-     *
      * @return void
      */
     public function attachConditionToCollection(
-        \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection,
+        AbstractCollection $collection,
         Combine $combine
-    ) {
+    ): void {
         $this->_connection = $collection->getResource()->getConnection();
         $this->_joinTablesToCollection($collection, $combine);
         $whereExpression = (string)$this->_getMappedSqlCombination($combine);
diff --git a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
index 2fdb960521a97..6e685a9a9b978 100644
--- a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
@@ -81,7 +81,7 @@ public function bindRuleToEntity($ruleIds, $entityIds, $entityType)
         try {
             $this->_multiplyBunchInsert($ruleIds, $entityIds, $entityType);
         } catch (\Exception $e) {
-            $this->getConnection()->rollback();
+            $this->getConnection()->rollBack();
             throw $e;
         }
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE.txt b/app/code/Magento/Rule/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE.txt
rename to app/code/Magento/Rule/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE_AFL.txt b/app/code/Magento/Rule/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE_AFL.txt
rename to app/code/Magento/Rule/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Rule/Test/Mftf/README.md b/app/code/Magento/Rule/Test/Mftf/README.md
new file mode 100644
index 0000000000000..46d592f4ab950
--- /dev/null
+++ b/app/code/Magento/Rule/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Rule Functional Tests
+
+The Functional Test Module for **Magento Rule** module.
diff --git a/app/code/Magento/Rule/Test/Unit/Model/Condition/AbstractConditionTest.php b/app/code/Magento/Rule/Test/Unit/Model/Condition/AbstractConditionTest.php
index 1201ba92464d9..52653197e3981 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/Condition/AbstractConditionTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/Condition/AbstractConditionTest.php
@@ -40,6 +40,9 @@ public function testGetMappedSqlField()
         $this->assertEquals('category_ids', $this->_condition->getMappedSqlField());
     }
 
+    /**
+     * @return array
+     */
     public function validateAttributeDataProvider()
     {
         return [
@@ -146,6 +149,9 @@ public function testValidate($existingValue, $operator, $valueForValidate, $expe
         );
     }
 
+    /**
+     * @return array
+     */
     public function validateAttributeArrayInputTypeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php b/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
index f53098c4bb97e..9dcbbd18c4c20 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
@@ -35,7 +35,12 @@ public function testAttachConditionToCollection()
     {
         $collection = $this->createPartialMock(
             \Magento\Eav\Model\Entity\Collection\AbstractCollection::class,
-            ['getResource', 'getSelect']
+            [
+                'getResource',
+                'getSelect',
+                'getStoreId',
+                'getDefaultStoreId',
+            ]
         );
         $combine = $this->createPartialMock(\Magento\Rule\Model\Condition\Combine::class, ['getConditions']);
         $resource = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['getConnection']);
@@ -53,7 +58,6 @@ public function testAttachConditionToCollection()
         $collection->expects($this->once())
             ->method('getResource')
             ->will($this->returnValue($resource));
-
         $collection->expects($this->any())
             ->method('getSelect')
             ->will($this->returnValue($select));
@@ -68,4 +72,69 @@ public function testAttachConditionToCollection()
 
         $this->_builder->attachConditionToCollection($collection, $combine);
     }
+
+    /**
+     * Test for attach condition to collection with operator in html format
+     *
+     * @covers \Magento\Rule\Model\Condition\Sql\Builder::attachConditionToCollection()
+     * @return void;
+     */
+    public function testAttachConditionAsHtmlToCollection()
+    {
+        $abstractCondition = $this->getMockForAbstractClass(
+            \Magento\Rule\Model\Condition\AbstractCondition::class,
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getOperatorForValidate', 'getMappedSqlField', 'getAttribute', 'getBindArgumentValue']
+        );
+
+        $abstractCondition->expects($this->once())->method('getMappedSqlField')->will($this->returnValue('argument'));
+        $abstractCondition->expects($this->once())->method('getOperatorForValidate')->will($this->returnValue('&gt;'));
+        $abstractCondition->expects($this->at(1))->method('getAttribute')->will($this->returnValue('attribute'));
+        $abstractCondition->expects($this->at(2))->method('getAttribute')->will($this->returnValue('attribute'));
+        $abstractCondition->expects($this->once())->method('getBindArgumentValue')->will($this->returnValue(10));
+
+        $conditions = [$abstractCondition];
+        $collection = $this->createPartialMock(
+            \Magento\Eav\Model\Entity\Collection\AbstractCollection::class,
+            [
+                'getResource',
+                'getSelect'
+            ]
+        );
+        $combine = $this->createPartialMock(
+            \Magento\Rule\Model\Condition\Combine::class,
+            [
+                'getConditions',
+                'getValue',
+                'getAggregator'
+            ]
+        );
+
+        $resource = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['getConnection']);
+        $select = $this->createPartialMock(\Magento\Framework\DB\Select::class, ['where']);
+        $select->expects($this->never())->method('where');
+
+        $connection = $this->getMockForAbstractClass(
+            \Magento\Framework\DB\Adapter\AdapterInterface::class,
+            ['quoteInto'],
+            '',
+            false
+        );
+
+        $connection->expects($this->once())->method('quoteInto')->with(' > ?', 10)->will($this->returnValue(' > 10'));
+        $collection->expects($this->once())->method('getResource')->will($this->returnValue($resource));
+        $resource->expects($this->once())->method('getConnection')->will($this->returnValue($connection));
+        $combine->expects($this->once())->method('getValue')->willReturn('attribute');
+        $combine->expects($this->once())->method('getAggregator')->willReturn(' AND ');
+        $combine->expects($this->at(0))->method('getConditions')->will($this->returnValue($conditions));
+        $combine->expects($this->at(1))->method('getConditions')->will($this->returnValue($conditions));
+        $combine->expects($this->at(2))->method('getConditions')->will($this->returnValue($conditions));
+        $combine->expects($this->at(3))->method('getConditions')->will($this->returnValue($conditions));
+
+        $this->_builder->attachConditionToCollection($collection, $combine);
+    }
 }
diff --git a/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php b/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php
index d8c0cc470f55e..f78ee4f345d0d 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php
@@ -78,7 +78,8 @@ public function testCreateExceptionClass()
             ->expects($this->never())
             ->method('create');
 
-        $this->expectException(\InvalidArgumentException::class, 'Class does not exist');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Class does not exist');
 
         $this->conditionFactory->create($type);
     }
@@ -92,7 +93,8 @@ public function testCreateExceptionType()
             ->method('create')
             ->with($type)
             ->willReturn(new \stdClass());
-        $this->expectException(\InvalidArgumentException::class, 'Class does not implement condition interface');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Class does not implement condition interface');
         $this->conditionFactory->create($type);
     }
 }
diff --git a/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php b/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php
index 644d10ad75fe6..c4e7a591212c5 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php
@@ -91,6 +91,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function addWebsitesToResultDataProvider()
     {
         return [
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 2a2aff2dc77f0..15f72b8ec24a0 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rule/etc/module.xml b/app/code/Magento/Rule/etc/module.xml
index f5e43eaed237b..ee1bd4605c85e 100644
--- a/app/code/Magento/Rule/etc/module.xml
+++ b/app/code/Magento/Rule/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Rule" setup_version="2.0.0">
+    <module name="Magento_Rule" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js b/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js
new file mode 100644
index 0000000000000..8eebc9ef0bd40
--- /dev/null
+++ b/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js
@@ -0,0 +1,140 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'underscore'
+], function ($, _) {
+    'use strict';
+
+    /**
+     * @constructor
+     */
+    var ConditionsDataNormalizer = function () {
+        this.patterns = {
+            validate: /^[a-z0-9_.-][a-z0-9_.-]*(?:\[(?:\d*|[a-z0-9_.-]+)\])*$/i,
+            key: /[a-z0-9_.-]+|(?=\[\])/gi,
+            push: /^$/,
+            fixed: /^\d+$/,
+            named: /^[a-z0-9_.-]+$/i
+        };
+    };
+
+    ConditionsDataNormalizer.prototype = {
+        /**
+         * Will convert an object:
+         * {
+         *   "foo[bar][1][baz]": 123,
+         *   "foo[bar][1][blah]": 321
+         *   "foo[bar][1--1][ah]": 456
+         * }
+         *
+         * to
+         * {
+         *   "foo": {
+         *     "bar": {
+         *       "1": {
+         *         "baz": 123,
+         *         "blah": 321
+         *       },
+         *       "1--1": {
+         *         "ah": 456
+         *       }
+         *     }
+         *   }
+         * }
+         */
+        normalize: function normalize(value) {
+            var el, _this = this;
+
+            this.pushes = {};
+            this.data = {};
+
+            _.each(value, function (e, i) {
+                el = {};
+                el[i] = e;
+
+                _this._addPair({
+                    name: i,
+                    value: e
+                });
+            });
+
+            return this.data;
+        },
+
+        /**
+         * @param {Object} base
+         * @param {String} key
+         * @param {String} value
+         * @return {Object}
+         * @private
+         */
+        _build: function build(base, key, value) {
+            base[key] = value;
+
+            return base;
+        },
+
+        /**
+         * @param {Object} root
+         * @param {String} value
+         * @return {*}
+         * @private
+         */
+        _makeObject: function makeObject(root, value) {
+            var keys = root.match(this.patterns.key),
+                k, idx; // nest, nest, ..., nest
+
+            while ((k = keys.pop()) !== undefined) {
+                // foo[]
+                if (this.patterns.push.test(k)) {
+                    idx = this._incrementPush(root.replace(/\[\]$/, ''));
+                    value = this._build([], idx, value);
+                } // foo[n]
+                else if (this.patterns.fixed.test(k)) {
+                    value = this._build({}, k, value);
+                } // foo; foo[bar]
+                else if (this.patterns.named.test(k)) {
+                    value = this._build({}, k, value);
+                }
+            }
+
+            return value;
+        },
+
+        /**
+         * @param {String} key
+         * @return {Number}
+         * @private
+         */
+        _incrementPush: function incrementPush(key) {
+            if (this.pushes[key] === undefined) {
+                this.pushes[key] = 0;
+            }
+
+            return this.pushes[key]++;
+        },
+
+        /**
+         * @param {Object} pair
+         * @return {Object}
+         * @private
+         */
+        _addPair: function addPair(pair) {
+            var obj = this._makeObject(pair.name, pair.value);
+
+            if (!this.patterns.validate.test(pair.name)) {
+                return this;
+            }
+
+            this.data = $.extend(true, this.data, obj);
+
+            return this;
+        }
+    };
+
+    return ConditionsDataNormalizer;
+});
diff --git a/app/code/Magento/Rule/view/adminhtml/web/rules.js b/app/code/Magento/Rule/view/adminhtml/web/rules.js
index 5c4be367b9cb3..b094b9818364a 100644
--- a/app/code/Magento/Rule/view/adminhtml/web/rules.js
+++ b/app/code/Magento/Rule/view/adminhtml/web/rules.js
@@ -137,7 +137,7 @@ define([
                 },
                 onSuccess: function (transport) {
                     if (this._processSuccess(transport)) {
-                        $(chooser).update(transport.responseText);
+                        jQuery(chooser).html(transport.responseText);
                         this.showChooserLoaded(chooser, transport);
                         jQuery(chooser).trigger('contentUpdated');
                     }
diff --git a/app/code/Magento/Sales/Api/Data/OrderInterface.php b/app/code/Magento/Sales/Api/Data/OrderInterface.php
index 3ca936afd4090..b45fddc7d7354 100644
--- a/app/code/Magento/Sales/Api/Data/OrderInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderInterface.php
@@ -581,6 +581,8 @@ public function getAdjustmentPositive();
     /**
      * Gets the applied rule IDs for the order.
      *
+     * Rules are comma separated if there are more than one.
+     *
      * @return string|null Applied rule IDs.
      */
     public function getAppliedRuleIds();
diff --git a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
index ae4064c0ab3d1..2aee648ef7c9f 100644
--- a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
@@ -415,6 +415,8 @@ public function getAmountRefunded();
     /**
      * Gets the applied rule IDs for the order item.
      *
+     * Rules are comma separated if there are more than one.
+     *
      * @return string|null Applied rule IDs.
      */
     public function getAppliedRuleIds();
diff --git a/app/code/Magento/Sales/Api/OrderCustomerDelegateInterface.php b/app/code/Magento/Sales/Api/OrderCustomerDelegateInterface.php
new file mode 100644
index 0000000000000..2902903b0b7d0
--- /dev/null
+++ b/app/code/Magento/Sales/Api/OrderCustomerDelegateInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Api;
+
+use Magento\Framework\Controller\Result\Redirect;
+
+/**
+ * Delegate related to orders customers operations to Customer module.
+ */
+interface OrderCustomerDelegateInterface
+{
+    /**
+     * Redirect to Customer module new-account page to finish creating customer based on order data.
+     *
+     * @param int $orderId
+     *
+     * @return Redirect
+     */
+    public function delegateNew(int $orderId): Redirect;
+}
diff --git a/app/code/Magento/Sales/Api/PaymentFailuresInterface.php b/app/code/Magento/Sales/Api/PaymentFailuresInterface.php
new file mode 100644
index 0000000000000..485ff1ffbe248
--- /dev/null
+++ b/app/code/Magento/Sales/Api/PaymentFailuresInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Api;
+
+/**
+ * Interface for managing payment gateway failures.
+ */
+interface PaymentFailuresInterface
+{
+    /**
+     * Handles payment gateway failures.
+     *
+     * @param int $cartId
+     * @param string $errorMessage
+     * @param string $checkoutType
+     * @return PaymentFailuresInterface
+     */
+    public function handle(
+        int $cartId,
+        string $errorMessage,
+        string $checkoutType = 'onepage'
+    ): PaymentFailuresInterface;
+}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
index 9d46969565eb2..7020835164c2a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
@@ -428,7 +428,7 @@ public function canCapture()
     }
 
     /**
-     * Retrieve formated price
+     * Retrieve formatted price
      *
      * @param float $price
      * @return string
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
index 1ed9d59d29a72..87c15e474d11f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Items\Column;
 
+use Magento\Framework\Filter\TruncateFilter\Result;
+
 /**
  * Sales Order items name column renderer
  *
@@ -13,6 +15,11 @@
  */
 class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
 {
+    /**
+     * @var Result
+     */
+    private $truncateResult = null;
+
     /**
      * Truncate string
      *
@@ -22,13 +29,15 @@ class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
      * @param string &$remainder
      * @param bool $breakWords
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function truncateString($value, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
     {
-        return $this->filterManager->truncate(
+        $this->truncateResult = $this->filterManager->truncateFilter(
             $value,
-            ['length' => $length, 'etc' => $etc, 'remainder' => $remainder, 'breakWords' => $breakWords]
+            ['length' => $length, 'etc' => $etc, 'breakWords' => $breakWords]
         );
+        return $this->truncateResult->getValue();
     }
 
     /**
@@ -40,8 +49,11 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
     public function getFormattedOption($value)
     {
         $remainder = '';
-        $value = $this->truncateString($value, 55, '', $remainder);
-        $result = ['value' => nl2br($value), 'remainder' => nl2br($remainder)];
+        $this->truncateString($value, 55, '', $remainder);
+        $result = [
+            'value' => nl2br($this->truncateResult->getValue()),
+            'remainder' => nl2br($this->truncateResult->getRemainder())
+        ];
 
         return $result;
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
index d7e0cf3e1acfb..b9aff07cc96fd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
@@ -135,7 +135,7 @@ public function getOrderInfoData()
     }
 
     /**
-     * Retrieve subtotal price include tax html formated content
+     * Retrieve subtotal price include tax html formatted content
      *
      * @param \Magento\Framework\DataObject $order
      * @return string
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index f2b454260dc22..12e59e63f6f7c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -19,7 +19,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      *
      * @var string
      */
-    protected $_template = 'order/address/form.phtml';
+    protected $_template = 'Magento_Sales::order/address/form.phtml';
 
     /**
      * Core registry
@@ -113,6 +113,7 @@ protected function _prepareForm()
             $this->getUrl('sales/*/addressSave', ['address_id' => $this->_getAddress()->getId()])
         );
         $this->_form->setUseContainer(true);
+
         return $this;
     }
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 323c2df975a8a..f335705e3deee 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -117,7 +117,7 @@ public function getStoreId()
     }
 
     /**
-     * Retrieve formated price
+     * Retrieve formatted price
      *
      * @param float $value
      * @return string
@@ -160,4 +160,22 @@ public function convertPrice($value, $format = true)
             )
             : $this->priceCurrency->convert($value, $this->getStore());
     }
+
+    /**
+     * If item is quote or wishlist we need to get product from it.
+     *
+     * @param $item
+     *
+     * @return Product
+     */
+    public function getProduct($item)
+    {
+        if ($item instanceof Product) {
+            $product = $item;
+        } else {
+            $product = $item->getProduct();
+        }
+
+        return $product;
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
index b10ce0f3db6f9..6a5035f9ffd8b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * Retrieve avilable currency codes
+     * Retrieve available currency codes
      *
      * @return string[]
      */
@@ -75,7 +75,7 @@ public function getAvailableCurrencies()
     }
 
     /**
-     * Retrieve curency name by code
+     * Retrieve currency name by code
      *
      * @param string $code
      * @return string
@@ -86,7 +86,7 @@ public function getCurrencyName($code)
     }
 
     /**
-     * Retrieve curency name by code
+     * Retrieve currency name by code
      *
      * @param string $code
      * @return string
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
index 5a29d058bf32f..2b214e42d8b98 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
@@ -103,7 +103,7 @@ public function getLoadBlockUrl()
     }
 
     /**
-     * Retrieve url for form submiting
+     * Retrieve url for form submitting
      *
      * @return string
      */
@@ -164,6 +164,7 @@ public function getDataSelectorDisplay()
     public function getOrderDataJson()
     {
         $data = [];
+        $this->_storeManager->setCurrentStore($this->getStoreId());
         if ($this->getCustomerId()) {
             $data['customer_id'] = $this->getCustomerId();
             $data['addresses'] = [];
@@ -189,6 +190,7 @@ public function getOrderDataJson()
             $data['shipping_method_reseted'] = !(bool)$this->getQuote()->getShippingAddress()->getShippingMethod();
             $data['payment_method'] = $this->getQuote()->getPayment()->getMethod();
         }
+        $data['quote_id'] = $this->_sessionQuote->getQuoteId();
 
         return $this->_jsonEncoder->encode($data);
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index d5aff28721534..d15c218a60b47 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
-use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 47f74734b60fa..26379a05fe694 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -132,7 +132,15 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-        $this->_form->setValues($this->getFormValues());
+
+        $formValues = $this->getFormValues();
+        foreach ($attributes as $code => $attribute) {
+            $defaultValue = $attribute->getDefaultValue();
+            if (isset($defaultValue) && !isset($formValues[$code])) {
+                $formValues[$code] = $defaultValue;
+            }
+        }
+        $this->_form->setValues($formValues);
 
         return $this;
     }
@@ -147,7 +155,7 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
     {
         switch ($element->getId()) {
             case 'email':
-                $element->setRequired(0);
+                $element->setRequired(1);
                 $element->setClass('validate-email admin__control-text');
                 break;
         }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index 5738e8ee33399..0e3d308df912e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -136,6 +136,7 @@ public function __construct(
         $this->searchCriteriaBuilder = $criteriaBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->addressMapper = $addressMapper;
+        $this->backendQuoteSession = $sessionQuote;
         parent::__construct(
             $context,
             $sessionQuote,
@@ -217,6 +218,11 @@ public function getAddressCollectionJson()
      */
     protected function _prepareForm()
     {
+        $storeId = $this->getCreateOrderModel()
+            ->getSession()
+            ->getStoreId();
+        $this->_storeManager->setCurrentStore($storeId);
+
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
 
         $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');
@@ -292,6 +298,8 @@ protected function _prepareForm()
     }
 
     /**
+     * Process country options.
+     *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $countryElement
      * @return void
      */
@@ -306,7 +314,8 @@ private function processCountryOptions(\Magento\Framework\Data\Form\Element\Abst
     }
 
     /**
-     * Retrieve Directiry Countries collection
+     * Retrieve Directory Countries collection
+     *
      * @deprecated 100.1.3
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */
@@ -322,6 +331,7 @@ private function getCountriesCollection()
 
     /**
      * Retrieve Backend Quote Session
+     *
      * @deprecated 100.1.3
      * @return Quote
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
index ced2d872827a7..2e0037f42bb1d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
@@ -183,7 +183,7 @@ public function _prepareForm()
             $this->_prepareVisibleFields($fieldset);
         }
 
-        // Set default sender and recipient from billing and shipping adresses
+        // Set default sender and recipient from billing and shipping addresses
         if (!$this->getMessage()->getSender()) {
             $this->getMessage()->setSender($this->getDefaultSender());
         }
@@ -194,7 +194,7 @@ public function _prepareForm()
 
         $this->getMessage()->setType($this->getEntityType());
 
-        // Overridden default data with edited when block reloads througth Ajax
+        // Overridden default data with edited when block reloads through Ajax
         $this->_applyPostData();
         $form->setValues($this->getMessage()->getData());
         $this->setForm($form);
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index dc266602c7466..1fd1c28c20727 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -90,7 +90,7 @@ public function getShippingRates()
     }
 
     /**
-     * Rertrieve carrier name from store configuration
+     * Retrieve carrier name from store configuration
      *
      * @param string $carrierCode
      * @return string
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
index 1f0ee8304629a..06c6a9eb0652b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -71,7 +71,7 @@ public function canDisplay()
     }
 
     /**
-     * Retrieve disply item qty availablity
+     * Retrieve display item qty availability
      *
      * @return false
      */
@@ -196,7 +196,7 @@ public function getItemCollection()
     }
 
     /**
-     * Retrieve disply price availablity
+     * Retrieve display price availability
      *
      * @return true
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
index 738f9a4fef999..b6b1d4f59715e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
@@ -15,9 +15,9 @@
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
-    //protected $_template = 'tax/checkout/subtotal.phtml';
-
-    //protected $_template = 'tax/checkout/subtotal.phtml';
+    /**
+     * @var \Magento\Tax\Model\Config
+     */
     protected $_taxConfig;
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
index eb437915ad668..cf9f8a44dee27 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
@@ -20,7 +20,7 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
      *
      * @var string
      */
-    protected $_template = 'order/create/totals/grandtotal.phtml';
+    protected $_template = 'Magento_Sales::order/create/totals/grandtotal.phtml';
 
     /**
      * Tax config
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index 9225d8c2e5f68..34a9ed8070e26 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -20,7 +20,7 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      *
      * @var string
      */
-    protected $_template = 'order/create/totals/shipping.phtml';
+    protected $_template = 'Magento_Sales::order/create/totals/shipping.phtml';
 
     /**
      * Tax config
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
index 1807c587c6893..166f3c9637ebb 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
@@ -20,7 +20,7 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
      *
      * @var string
      */
-    protected $_template = 'order/create/totals/subtotal.phtml';
+    protected $_template = 'Magento_Sales::order/create/totals/subtotal.phtml';
 
     /**
      * Tax config
@@ -54,14 +54,14 @@ public function __construct(
     }
 
     /**
-     * Check if we need display both sobtotals
+     * Check if we need display both subtotals
      *
      * @return bool
      */
     public function displayBoth()
     {
         /**
-         * Check without store parameter - we wil get admin configuration value
+         * Check without store parameter - we will get admin configuration value
          */
         return $this->_taxConfig->displayCartSubtotalBoth();
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
index d3da37c3f1bf8..207a4eca60213 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
@@ -18,5 +18,5 @@ class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTota
      *
      * @var string
      */
-    protected $_template = 'order/create/totals/tax.phtml';
+    protected $_template = 'Magento_Sales::order/create/totals/tax.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
index 5c3a7fce805cc..261f4b0cfd12a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
@@ -14,5 +14,5 @@ class Details extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/details.phtml';
+    protected $_template = 'Magento_Sales::order/details.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
index 76726d40aa7f4..f026ac02b4f4c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
@@ -55,7 +55,7 @@ public function getOrderUrl()
     }
 
     /**
-     * Retrieve formated price
+     * Retrieve formatted price
      *
      * @param float $price
      * @return string
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
index 648a281228908..c4ce48d162c2c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
@@ -8,6 +8,7 @@
 /**
  * Adminhtml creditmemo bar
  *
+ * @deprecated
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index afd23b456dca6..36c49ff5cbfea 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -182,7 +182,7 @@ protected function _construct()
                     'class' => __('unhold'),
                     'id' => 'order-view-unhold-button',
                     'data_attribute' => [
-                        'url' => $this->getUnHoldUrl()
+                        'url' => $this->getUnholdUrl()
                     ]
                 ]
             );
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
index 82c3effcab62d..6c06e9d624c81 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
@@ -17,5 +17,5 @@ class Form extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'order/view/form.phtml';
+    protected $_template = 'Magento_Sales::order/view/form.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
index 1912655a9292d..10b80b6f4e527 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -88,7 +88,8 @@ public function getStatuses()
      */
     public function canSendCommentEmail()
     {
-        return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId());
+        return $this->_salesData->canSendOrderCommentEmail($this->getOrder()->getStore()->getId())
+            && $this->_authorization->isAllowed('Magento_Sales::email');
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index 5489a0b2e513f..0972d74314246 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -18,7 +18,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
      *
      * @var string
      */
-    protected $_template = 'order/view/tab/history.phtml';
+    protected $_template = 'Magento_Sales::order/view/tab/history.phtml';
 
     /**
      * Core registry
@@ -61,6 +61,7 @@ public function getOrder()
 
     /**
      * Compose and get order full history.
+     *
      * Consists of the status history comments as well as of invoices, shipments and creditmemos creations
      *
      * @TODO This method requires refactoring. Need to create separate model for comment history handling
@@ -218,7 +219,7 @@ protected function _prepareHistoryItem($label, $notified, $created, $comment = '
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTabLabel()
     {
@@ -226,7 +227,7 @@ public function getTabLabel()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTabTitle()
     {
@@ -264,7 +265,7 @@ public function getTabUrl()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canShowTab()
     {
@@ -272,7 +273,7 @@ public function canShowTab()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isHidden()
     {
@@ -303,11 +304,7 @@ public static function sortHistoryByTimestamp($a, $b)
         $createdAtA = $a['created_at'];
         $createdAtB = $b['created_at'];
 
-        /** @var $createdAtA \DateTime */
-        if ($createdAtA->getTimestamp() == $createdAtB->getTimestamp()) {
-            return 0;
-        }
-        return $createdAtA->getTimestamp() < $createdAtB->getTimestamp() ? -1 : 1;
+        return $createdAtA->getTimestamp() <=> $createdAtB->getTimestamp();
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
index 686f28aadf041..a94a7b9d3f557 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
@@ -24,8 +24,6 @@ class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
     protected function _prepareForm()
     {
         parent::_prepareForm();
-        $form = $this->getForm();
-        $htmlIdPrefix = $form->getHtmlIdPrefix();
         /** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */
         $fieldset = $this->getForm()->getElement('base_fieldset');
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index fbb78970a4de0..512539824da20 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -14,7 +14,7 @@ class Link extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'rss/order/grid/link.phtml';
+    protected $_template = 'Magento_Sales::rss/order/grid/link.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\UrlBuilderInterface
diff --git a/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php b/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
index e10935ee152ed..afd0f01128fc3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * Render elemnt
+     * Render element
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
index 76e625ec042d9..537c00893dbfb 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
@@ -112,7 +112,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * Retrieve Transaction addtitional info
+     * Retrieve Transaction additional info
      *
      * @return array
      */
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo.php b/app/code/Magento/Sales/Block/Order/Creditmemo.php
index ae9a9a722291a..a32b2dbc74bde 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo.php
@@ -19,7 +19,7 @@ class Creditmemo extends \Magento\Sales\Block\Order\Creditmemo\Items
     /**
      * @var string
      */
-    protected $_template = 'order/creditmemo.phtml';
+    protected $_template = 'Magento_Sales::order/creditmemo.phtml';
 
     /**
      * @var \Magento\Framework\App\Http\Context
diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
index 034df4edb5b49..80925f66fc83d 100644
--- a/app/code/Magento/Sales/Block/Order/History.php
+++ b/app/code/Magento/Sales/Block/Order/History.php
@@ -19,7 +19,7 @@ class History extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/history.phtml';
+    protected $_template = 'Magento_Sales::order/history.phtml';
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
diff --git a/app/code/Magento/Sales/Block/Order/Info.php b/app/code/Magento/Sales/Block/Order/Info.php
index db3dbdbfde40b..689a55f06896c 100644
--- a/app/code/Magento/Sales/Block/Order/Info.php
+++ b/app/code/Magento/Sales/Block/Order/Info.php
@@ -23,7 +23,7 @@ class Info extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/info.phtml';
+    protected $_template = 'Magento_Sales::order/info.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons.php b/app/code/Magento/Sales/Block/Order/Info/Buttons.php
index a27b55cd8543f..18e79f6a76ecf 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons.php
@@ -20,7 +20,7 @@ class Buttons extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/info/buttons.phtml';
+    protected $_template = 'Magento_Sales::order/info/buttons.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index 77e20eaa8d07b..2b84b8f1444b6 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -16,7 +16,7 @@ class Rss extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/info/buttons/rss.phtml';
+    protected $_template = 'Magento_Sales::order/info/buttons/rss.phtml';
 
     /**
      * @var \Magento\Sales\Model\OrderFactory
diff --git a/app/code/Magento/Sales/Block/Order/Invoice.php b/app/code/Magento/Sales/Block/Order/Invoice.php
index 2d8448ea5bc98..24ddf4bac7696 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice.php
@@ -18,7 +18,7 @@ class Invoice extends \Magento\Sales\Block\Order\Invoice\Items
     /**
      * @var string
      */
-    protected $_template = 'order/invoice.phtml';
+    protected $_template = 'Magento_Sales::order/invoice.phtml';
 
     /**
      * @var \Magento\Framework\App\Http\Context
diff --git a/app/code/Magento/Sales/Block/Order/Items.php b/app/code/Magento/Sales/Block/Order/Items.php
index 028544cd56219..d7255a24aead5 100644
--- a/app/code/Magento/Sales/Block/Order/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Items.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Sales order view items block
- *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Sales\Block\Order;
 
 /**
+ * Sales order view items block.
+ *
  * @api
  * @since 100.0.2
  */
@@ -71,7 +71,6 @@ protected function _prepareLayout()
 
         $this->itemCollection = $this->itemCollectionFactory->create();
         $this->itemCollection->setOrderFilter($this->getOrder());
-        $this->itemCollection->filterByParent(null);
 
         /** @var \Magento\Theme\Block\Html\Pager $pagerBlock */
         $pagerBlock = $this->getChildBlock('sales_order_item_pager');
@@ -87,8 +86,9 @@ protected function _prepareLayout()
     }
 
     /**
-     * Determine if the pager should be displayed for order items list
-     * To be called from templates(after _prepareLayout())
+     * Determine if the pager should be displayed for order items list.
+     *
+     * To be called from templates(after _prepareLayout()).
      *
      * @return bool
      * @since 100.1.7
@@ -101,7 +101,8 @@ public function isPagerDisplayed()
 
     /**
      * Get visible items for current page.
-     * To be called from templates(after _prepareLayout())
+     *
+     * To be called from templates(after _prepareLayout()).
      *
      * @return \Magento\Framework\DataObject[]
      * @since 100.1.7
@@ -112,8 +113,9 @@ public function getItems()
     }
 
     /**
-     * Get pager HTML according to our requirements
-     * To be called from templates(after _prepareLayout())
+     * Get pager HTML according to our requirements.
+     *
+     * To be called from templates(after _prepareLayout()).
      *
      * @return string HTML output
      * @since 100.1.7
diff --git a/app/code/Magento/Sales/Block/Order/Recent.php b/app/code/Magento/Sales/Block/Order/Recent.php
index e57aa1fe420a0..7e5be0ebfbba2 100644
--- a/app/code/Magento/Sales/Block/Order/Recent.php
+++ b/app/code/Magento/Sales/Block/Order/Recent.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\Sales\Block\Order;
 
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Customer\Model\Session;
+use Magento\Sales\Model\Order\Config;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Sales order history block
  *
@@ -13,6 +20,11 @@
  */
 class Recent extends \Magento\Framework\View\Element\Template
 {
+    /**
+     * Limit of orders
+     */
+    const ORDER_LIMIT = 5;
+
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
      */
@@ -28,25 +40,34 @@ class Recent extends \Magento\Framework\View\Element\Template
      */
     protected $_orderConfig;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param array $data
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Sales\Model\Order\Config $orderConfig,
-        array $data = []
+        Context $context,
+        CollectionFactory $orderCollectionFactory,
+        Session $customerSession,
+        Config $orderConfig,
+        array $data = [],
+        StoreManagerInterface $storeManager = null
     ) {
         $this->_orderCollectionFactory = $orderCollectionFactory;
         $this->_customerSession = $customerSession;
         $this->_orderConfig = $orderConfig;
-        parent::__construct($context, $data);
         $this->_isScopePrivate = true;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
+        parent::__construct($context, $data);
     }
 
     /**
@@ -55,11 +76,22 @@ public function __construct(
     protected function _construct()
     {
         parent::_construct();
+        $this->getRecentOrders();
+    }
+
+    /**
+     * Get recently placed orders. By default they will be limited by 5.
+     */
+    private function getRecentOrders()
+    {
         $orders = $this->_orderCollectionFactory->create()->addAttributeToSelect(
             '*'
         )->addAttributeToFilter(
             'customer_id',
             $this->_customerSession->getCustomerId()
+        )->addAttributeToFilter(
+            'store_id',
+            $this->storeManager->getStore()->getId()
         )->addAttributeToFilter(
             'status',
             ['in' => $this->_orderConfig->getVisibleOnFrontStatuses()]
@@ -67,7 +99,7 @@ protected function _construct()
             'created_at',
             'desc'
         )->setPageSize(
-            '5'
+            self::ORDER_LIMIT
         )->load();
         $this->setOrders($orders);
     }
diff --git a/app/code/Magento/Sales/Block/Order/Totals.php b/app/code/Magento/Sales/Block/Order/Totals.php
index f910b654f4d8c..3720db76b5778 100644
--- a/app/code/Magento/Sales/Block/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Totals.php
@@ -293,6 +293,12 @@ public function removeTotal($code)
      */
     public function applySortOrder($order)
     {
+        \uksort(
+            $this->_totals,
+            function ($code1, $code2) use ($order) {
+                return ($order[$code1] ?? 0) <=> ($order[$code2] ?? 0);
+            }
+        );
         return $this;
     }
 
diff --git a/app/code/Magento/Sales/Block/Order/View.php b/app/code/Magento/Sales/Block/Order/View.php
index 870e2e15ab7b3..03d1340e0f690 100644
--- a/app/code/Magento/Sales/Block/Order/View.php
+++ b/app/code/Magento/Sales/Block/Order/View.php
@@ -18,7 +18,7 @@ class View extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/view.phtml';
+    protected $_template = 'Magento_Sales::order/view.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
index b413951d9d4f3..f989deb0ae7c0 100644
--- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
@@ -5,12 +5,35 @@
  */
 namespace Magento\Sales\Block\Status\Grid\Column;
 
+use Magento\Framework\App\ObjectManager;
+use \Magento\Backend\Block\Template\Context;
+use Magento\Framework\Serialize\Serializer\Json;
+
 /**
  * @api
  * @since 100.0.2
  */
 class Unassign extends \Magento\Backend\Block\Widget\Grid\Column
 {
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @inheritDoc
+     *
+     * @param Json|null $json
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?Json $json = null
+    ) {
+        parent::__construct($context, $data);
+        $this->json = $json ?? ObjectManager::getInstance()->get(Json::class);
+    }
+
     /**
      * Add decorated action to column
      *
@@ -36,9 +59,16 @@ public function decorateAction($value, $row, $column, $isExport)
         $cell = '';
         $state = $row->getState();
         if (!empty($state)) {
-            $url = $this->getUrl('*/*/unassign', ['status' => $row->getStatus(), 'state' => $row->getState()]);
+            $url = $this->getUrl('*/*/unassign');
             $label = __('Unassign');
-            $cell = '<a href="' . $url . '">' . $label . '</a>';
+            $cell = '<a href="#" data-post="'
+                .$this->escapeHtmlAttr(
+                    $this->json->serialize([
+                        'action' => $url,
+                        'data' => ['status' => $row->getStatus(), 'state' => $row->getState()]
+                    ])
+                )
+                .'">' . $label . '</a>';
         }
         return $cell;
     }
diff --git a/app/code/Magento/Sales/Console/Command/EncryptionPaymentDataUpdateCommand.php b/app/code/Magento/Sales/Console/Command/EncryptionPaymentDataUpdateCommand.php
new file mode 100644
index 0000000000000..47ef24c542c2a
--- /dev/null
+++ b/app/code/Magento/Sales/Console/Command/EncryptionPaymentDataUpdateCommand.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sales\Console\Command;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Command\Command;
+use Magento\Framework\Console\Cli;
+
+/**
+ * Command for updating encrypted credit card data to the latest cipher
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class EncryptionPaymentDataUpdateCommand extends Command
+{
+    /** Command name */
+    const NAME = 'encryption:payment-data:update';
+
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdate
+     */
+    private $paymentResource;
+
+    /**
+     * @param \Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdate $paymentResource
+     */
+    public function __construct(
+        \Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdate $paymentResource
+    ) {
+        $this->paymentResource = $paymentResource;
+        parent::__construct();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::NAME)
+            ->setDescription(
+                'Re-encrypts encrypted credit card data with latest encryption cipher.'
+            );
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            $this->paymentResource->reEncryptCreditCardNumbers();
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return Cli::RETURN_FAILURE;
+        }
+
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
index d7ab99377e1b5..65cb537e89fec 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
@@ -1,15 +1,21 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\AbstractController;
 
 use Magento\Framework\App\Action;
 use Magento\Framework\Registry;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-abstract class Reorder extends Action\Action
+/**
+ * Abstract class for controllers Reorder(Customer) and Reorder(Guest)
+ *
+ * @package Magento\Sales\Controller\AbstractController
+ */
+abstract class Reorder extends Action\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Sales\Controller\AbstractController\OrderLoaderInterface
@@ -59,13 +65,16 @@ public function execute()
                 $cart->addOrderItem($item);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 if ($this->_objectManager->get(\Magento\Checkout\Model\Session::class)->getUseNotice(true)) {
-                    $this->messageManager->addNotice($e->getMessage());
+                    $this->messageManager->addNoticeMessage($e->getMessage());
                 } else {
-                    $this->messageManager->addError($e->getMessage());
+                    $this->messageManager->addErrorMessage($e->getMessage());
                 }
                 return $resultRedirect->setPath('*/*/history');
             } 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.')
+                );
                 return $resultRedirect->setPath('checkout/cart');
             }
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php
index ac34af6f4ce6e..e3571f3cc02bc 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php
@@ -33,7 +33,7 @@ public function execute()
         $this->_objectManager->create(\Magento\Sales\Api\CreditmemoManagementInterface::class)
             ->notify($creditmemoId);
 
-        $this->messageManager->addSuccess(__('You sent the message.'));
+        $this->messageManager->addSuccessMessage(__('You sent the message.'));
         $resultRedirect = $this->resultRedirectFactory->create();
         $resultRedirect->setPath('sales/order_creditmemo/view', ['creditmemo_id' => $creditmemoId]);
         return $resultRedirect;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
index 83486704984f7..94ca6a0375e7c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
@@ -74,9 +74,12 @@ public function __construct(
      */
     public function massAction(AbstractCollection $collection)
     {
+        $pdf = $this->pdfCreditmemo->getPdf($collection);
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('creditmemo%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfCreditmemo->getPdf($collection)->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
index d6c94feb57606..c5902aac33355 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
@@ -53,6 +53,7 @@ public function __construct(
 
     /**
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
+     * @throws \Exception
      */
     public function execute()
     {
@@ -69,9 +70,11 @@ public function execute()
                 $date = $this->_objectManager->get(
                     \Magento\Framework\Stdlib\DateTime\DateTime::class
                 )->date('Y-m-d_H-i-s');
+                $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
                 return $this->_fileFactory->create(
                     \creditmemo::class . $date . '.pdf',
-                    $pdf->render(),
+                    $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'
                 );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
index b29c1ea3700ee..165c9e894de78 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php
@@ -5,7 +5,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Creditmemo;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index as AbstractIndex;
+
+class Index extends AbstractIndex implements HttpGetActionInterface
 {
     /**
      * Index page
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php
index e491dd78db617..c645df152ba8f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php
@@ -57,7 +57,7 @@ public function execute()
             \Magento\Sales\Api\InvoiceManagementInterface::class
         )->notify($invoice->getEntityId());
 
-        $this->messageManager->addSuccess(__('You sent the message.'));
+        $this->messageManager->addSuccessMessage(__('You sent the message.'));
         return $this->resultRedirectFactory->create()->setPath(
             'sales/invoice/view',
             ['order_id' => $invoice->getOrder()->getId(), 'invoice_id' => $invoiceId]
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
index a949ceca53961..18cf397c0e3b9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
@@ -75,9 +75,12 @@ public function __construct(
      */
     public function massAction(AbstractCollection $collection)
     {
+        $pdf = $this->pdfInvoice->getPdf($collection);
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('invoice%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfInvoice->getPdf($collection)->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
index 2421267aa753d..2caa8ec2dcb83 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
@@ -45,6 +45,7 @@ public function __construct(
 
     /**
      * @return ResponseInterface|void
+     * @throws \Exception
      */
     public function execute()
     {
@@ -58,9 +59,11 @@ public function execute()
                 $date = $this->_objectManager->get(
                     \Magento\Framework\Stdlib\DateTime\DateTime::class
                 )->date('Y-m-d_H-i-s');
+                $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
                 return $this->_fileFactory->create(
                     'invoice' . $date . '.pdf',
-                    $pdf->render(),
+                    $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'
                 );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
index 3615f3033ca81..300b7ee37f2ef 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
@@ -79,7 +79,7 @@ protected function getInvoice()
                 ->get($this->getRequest()->getParam('invoice_id'));
             $this->registry->register('current_invoice', $invoice);
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('Invoice capturing error'));
+            $this->messageManager->addErrorMessage(__('Invoice capturing error'));
             return false;
         }
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
index 429a388d9392f..bc53f752801ba 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Invoice;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index implements HttpGetActionInterface
 {
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
index 62add99ab5976..3b52199943230 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Invoice;
 
-class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface
 {
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order.php b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
index c2299374c798c..0066c5f4c828a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
@@ -154,11 +154,11 @@ protected function _initOrder()
         try {
             $order = $this->orderRepository->get($id);
         } catch (NoSuchEntityException $e) {
-            $this->messageManager->addError(__('This order no longer exists.'));
+            $this->messageManager->addErrorMessage(__('This order no longer exists.'));
             $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
             return false;
         } catch (InputException $e) {
-            $this->messageManager->addError(__('This order no longer exists.'));
+            $this->messageManager->addErrorMessage(__('This order no longer exists.'));
             $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
             return false;
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
index 891bfeefc9f52..c6b45f282debc 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
@@ -61,7 +61,7 @@ public function execute()
             $collection = $this->filter->getCollection($this->collectionFactory->create());
             return $this->massAction($collection);
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
             return $resultRedirect->setPath($this->redirectUrl);
@@ -70,7 +70,7 @@ public function execute()
 
     /**
      * Return component referrer url
-     * TODO: Technical dept referrer url should be implement as a part of Action configuration in in appropriate way
+     * TODO: Technical dept referrer url should be implement as a part of Action configuration in appropriate way
      *
      * @return null|string
      */
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
index 12038ee375059..e85083a50d725 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
@@ -1,15 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
 
-class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
+/**
+ * Class AddComment
+ */
+class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -18,6 +20,11 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
      */
     const ADMIN_RESOURCE = 'Magento_Sales::comment';
 
+    /**
+     * ACL resource needed to send comment email notification
+     */
+    const ADMIN_SALES_EMAIL_RESOURCE = 'Magento_Sales::emails';
+
     /**
      * Add order comment action
      *
@@ -30,11 +37,17 @@ public function execute()
             try {
                 $data = $this->getRequest()->getPost('history');
                 if (empty($data['comment']) && $data['status'] == $order->getDataByKey('status')) {
-                    throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a comment.'));
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('The comment is missing. Enter and try again.')
+                    );
                 }
 
-                $notify = isset($data['is_customer_notified']) ? $data['is_customer_notified'] : false;
-                $visible = isset($data['is_visible_on_front']) ? $data['is_visible_on_front'] : false;
+                $notify = $data['is_customer_notified'] ?? false;
+                $visible = $data['is_visible_on_front'] ?? false;
+
+                if ($notify && !$this->_authorization->isAllowed(self::ADMIN_SALES_EMAIL_RESOURCE)) {
+                    $notify = false;
+                }
 
                 $history = $order->addStatusHistoryComment($data['comment'], $data['status']);
                 $history->setIsVisibleOnFront($visible);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
index dde2192c3b82c..c71de8cb0252d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
@@ -114,12 +114,12 @@ public function execute()
                         'order_id' => $address->getParentId()
                     ]
                 );
-                $this->messageManager->addSuccess(__('You updated the order address.'));
+                $this->messageManager->addSuccessMessage(__('You updated the order address.'));
                 return $resultRedirect->setPath('sales/*/view', ['order_id' => $address->getParentId()]);
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('We can\'t update the order address right now.'));
+                $this->messageManager->addExceptionMessage($e, __('We can\'t update the order address right now.'));
             }
             return $resultRedirect->setPath('sales/*/address', ['address_id' => $address->getId()]);
         } else {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
index de41c3c737968..f96d221a7d3b3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-class Cancel extends \Magento\Sales\Controller\Adminhtml\Order
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Cancel extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -24,18 +26,18 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!$this->isValidPostRequest()) {
-            $this->messageManager->addError(__('You have not canceled the item.'));
+            $this->messageManager->addErrorMessage(__('You have not canceled the item.'));
             return $resultRedirect->setPath('sales/*/');
         }
         $order = $this->_initOrder();
         if ($order) {
             try {
                 $this->orderManagement->cancel($order->getEntityId());
-                $this->messageManager->addSuccess(__('You canceled the order.'));
+                $this->messageManager->addSuccessMessage(__('You canceled the order.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('You have not canceled the item.'));
+                $this->messageManager->addErrorMessage(__('You have not canceled the item.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             }
             return $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
index 8496c4f28d8bc..53ebc26d132ab 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php
@@ -6,16 +6,20 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Sales\Controller\Adminhtml\Order as OrderAction;
 
 /**
- * Class CommentsHistory
+ * Comments History tab, needs to be accessible by POST because of tabs mechanism.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
+class CommentsHistory extends OrderAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 1343b77bcd0ae..dcf5e617d055c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -317,7 +317,7 @@ protected function _processActionData($action = null)
                 }
             }
             if (!$isApplyDiscount) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __(
                         '"%1" coupon code was not applied. Do not apply discount is selected for item(s)',
                         $this->escaper->escapeHtml($couponCode)
@@ -325,14 +325,14 @@ protected function _processActionData($action = null)
                 );
             } else {
                 if ($this->_getQuote()->getCouponCode() !== $couponCode) {
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         __(
-                            '"%1" coupon code is not valid.',
+                            'The "%1" coupon code isn\'t valid. Verify the code and try again.',
                             $this->escaper->escapeHtml($couponCode)
                         )
                     );
                 } else {
-                    $this->messageManager->addSuccess(__('The coupon code has been accepted.'));
+                    $this->messageManager->addSuccessMessage(__('The coupon code has been accepted.'));
                 }
             }
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php
index 422fe1895b1f0..ba60a916c6daf 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
 class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create
@@ -19,12 +20,16 @@ public function execute()
         try {
             $quoteItemId = (int)$this->getRequest()->getParam('id');
             if (!$quoteItemId) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Quote item id is not received.'));
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('The quote item ID needs to be received. Set the ID and try again.')
+                );
             }
 
             $quoteItem = $this->_objectManager->create(\Magento\Quote\Model\Quote\Item::class)->load($quoteItemId);
             if (!$quoteItem->getId()) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Quote item is not loaded.'));
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('The quote item needs to be loaded. Load the item and try again.')
+                );
             }
 
             $configureResult->setOk(true);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
index ce3a36729de95..035dc7877897d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
 {
     /**
      * Index page
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
index 6a9d0a5dcb8ed..1e13e282cae3a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
@@ -5,12 +5,15 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Sales\Controller\Adminhtml\Order\Create as CreateAction;
 
-class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create
+class LoadBlock extends CreateAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var RawFactory
@@ -55,10 +58,10 @@ public function execute()
             $this->_initSession()->_processData();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->_reloadQuote();
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
             $this->_reloadQuote();
-            $this->messageManager->addException($e, $e->getMessage());
+            $this->messageManager->addExceptionMessage($e, $e->getMessage());
         }
 
         $asJson = $request->getParam('json');
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
index 74b7ad2165332..4348984d0403b 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
@@ -3,23 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\PaymentException;
 
-class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
+class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpPostActionInterface
 {
     /**
      * Saving quote and create order
      *
-     * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\ResultInterface
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-        $resultRedirect = $this->resultRedirectFactory->create();
+        $path = 'sales/*/';
+        $pathParams = [];
+
         try {
             // check if the creation of a new customer is allowed
             if (!$this->_authorization->isAllowed('Magento_Customer::manage')
@@ -49,29 +52,30 @@ public function execute()
                 ->createOrder();
 
             $this->_getSession()->clearStorage();
-            $this->messageManager->addSuccess(__('You created the order.'));
+            $this->messageManager->addSuccessMessage(__('You created the order.'));
             if ($this->_authorization->isAllowed('Magento_Sales::actions_view')) {
-                $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
+                $pathParams = ['order_id' => $order->getId()];
+                $path = 'sales/order/view';
             } else {
-                $resultRedirect->setPath('sales/order/index');
+                $path = 'sales/order/index';
             }
         } catch (PaymentException $e) {
             $this->_getOrderCreateModel()->saveQuote();
             $message = $e->getMessage();
             if (!empty($message)) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
-            $resultRedirect->setPath('sales/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            // customer can be created before place order flow is completed and should be stored in current session
+            $this->_getSession()->setCustomerId((int)$this->_getSession()->getQuote()->getCustomerId());
             $message = $e->getMessage();
             if (!empty($message)) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
-            $resultRedirect->setPath('sales/*/');
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Order saving error: %1', $e->getMessage()));
-            $resultRedirect->setPath('sales/*/');
+            $this->messageManager->addExceptionMessage($e, __('Order saving error: %1', $e->getMessage()));
         }
-        return $resultRedirect;
+
+        return $this->resultRedirectFactory->create()->setPath($path, $pathParams);
     }
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
index 01119c3aa88a1..24aedf56ec5a1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
 
-class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create
+class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
 {
     /**
      * @var RawFactory
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
index ee88b3361cc83..bc75bc4a5787f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 
-class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
+class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
 {
     /**
      * Start order create action
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
index cfac8243d091e..4e158efe9702d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
 use Magento\Backend\App\Action;
@@ -78,7 +79,7 @@ public function execute()
             $data = $this->getRequest()->getPost('comment');
             if (empty($data['comment'])) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please enter a comment.')
+                    __('The comment is missing. Enter and try again.')
                 );
             }
             $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id'));
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
index eedf49a6cae9a..1ca0b53ee8784 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
@@ -47,11 +47,11 @@ public function execute()
                     \Magento\Sales\Api\CreditmemoManagementInterface::class
                 );
                 $creditmemoManagement->cancel($creditmemoId);
-                $this->messageManager->addSuccess(__('The credit memo has been canceled.'));
+                $this->messageManager->addSuccessMessage(__('The credit memo has been canceled.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Credit memo has not been canceled.'));
+                $this->messageManager->addErrorMessage(__('Credit memo has not been canceled.'));
             }
             $resultRedirect = $this->resultRedirectFactory->create();
             $resultRedirect->setPath('sales/*/view', ['creditmemo_id' => $creditmemoId]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
index 03910f2ecccfe..3ac3abda82cd1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 
-class NewAction extends \Magento\Backend\App\Action
+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
index 826a2a2a8b6c1..91ae3b7d4e058 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -5,11 +5,12 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 
-class Save extends \Magento\Backend\App\Action
+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -109,7 +110,7 @@ public function execute()
                     $this->creditmemoSender->send($creditmemo);
                 }
 
-                $this->messageManager->addSuccess(__('You created the credit memo.'));
+                $this->messageManager->addSuccessMessage(__('You created the credit memo.'));
                 $this->_getSession()->getCommentText(true);
                 $resultRedirect->setPath('sales/order/view', ['order_id' => $creditmemo->getOrderId()]);
                 return $resultRedirect;
@@ -119,11 +120,11 @@ public function execute()
                 return $resultForward;
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_getSession()->setFormData($data);
         } catch (\Exception $e) {
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-            $this->messageManager->addError(__('We can\'t save the credit memo right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t save the credit memo right now.'));
         }
         $resultRedirect->setPath('sales/*/new', ['_current' => true]);
         return $resultRedirect;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
index 10ba7e425b651..3dc4aa6dcd500 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
-class Start extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Start extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
index bfd95666e7c48..d49fa8b8dc608 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
-class UpdateQty extends \Magento\Backend\App\Action
+class UpdateQty extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
index e7bd891fbfbff..146514265517a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
@@ -64,11 +64,11 @@ public function execute()
                     $transactionSave->addObject($creditmemo->getInvoice());
                 }
                 $transactionSave->save();
-                $this->messageManager->addSuccess(__('You voided the credit memo.'));
+                $this->messageManager->addSuccessMessage(__('You voided the credit memo.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t void the credit memo.'));
+                $this->messageManager->addErrorMessage(__('We can\'t void the credit memo.'));
             }
             $resultRedirect = $this->resultRedirectFactory->create();
             $resultRedirect->setPath('sales/*/view', ['creditmemo_id' => $creditmemo->getId()]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
index 057e72b6176d3..0c5864e954a4f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
@@ -138,7 +138,7 @@ protected function _canCreditmemo($order)
          * Check order existing
          */
         if (!$order->getId()) {
-            $this->messageManager->addError(__('The order no longer exists.'));
+            $this->messageManager->addErrorMessage(__('The order no longer exists.'));
             return false;
         }
 
@@ -146,7 +146,7 @@ protected function _canCreditmemo($order)
          * Check creditmemo create availability
          */
         if (!$order->canCreditmemo()) {
-            $this->messageManager->addError(__('We can\'t create credit memo for the order.'));
+            $this->messageManager->addErrorMessage(__('We can\'t create credit memo for the order.'));
             return false;
         }
         return true;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php
index 14c630542dbde..b1eba5f661c2e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php
@@ -36,10 +36,10 @@ public function execute()
                 $resultRedirect->setPath('sales/order/');
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, $e->getMessage());
+            $this->messageManager->addExceptionMessage($e, $e->getMessage());
             $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
         }
         return $resultRedirect;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
index 1573a07710b65..3500de798979a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
@@ -25,11 +25,11 @@ public function execute()
         if ($order) {
             try {
                 $this->orderManagement->notify($order->getEntityId());
-                $this->messageManager->addSuccess(__('You sent the order email.'));
+                $this->messageManager->addSuccessMessage(__('You sent the order email.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t send the email order right now.'));
+                $this->messageManager->addErrorMessage(__('We can\'t send the email order right now.'));
                 $this->logger->critical($e);
             }
             return $this->resultRedirectFactory->create()->setPath(
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php
index feb307ca19c31..7d2c713eece48 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php
@@ -23,18 +23,18 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!$this->isValidPostRequest()) {
-            $this->messageManager->addError(__('You have not put the order on hold.'));
+            $this->messageManager->addErrorMessage(__('You have not put the order on hold.'));
             return $resultRedirect->setPath('sales/*/');
         }
         $order = $this->_initOrder();
         if ($order) {
             try {
                 $this->orderManagement->hold($order->getEntityId());
-                $this->messageManager->addSuccess(__('You put the order on hold.'));
+                $this->messageManager->addSuccessMessage(__('You put the order on hold.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('You have not put the order on hold.'));
+                $this->messageManager->addErrorMessage(__('You have not put the order on hold.'));
             }
             $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
             return $resultRedirect;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
index 13a86befec0a5..d5dc11719237c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Order
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Sales\Controller\Adminhtml\Order implements HttpGetActionInterface
 {
     /**
      * Orders grid
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
index 9483abf6354cb..515c0753542a0 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Backend\App\Action\Context;
@@ -74,7 +75,7 @@ public function execute()
             $this->getRequest()->setParam('invoice_id', $this->getRequest()->getParam('id'));
             $data = $this->getRequest()->getPost('comment');
             if (empty($data['comment'])) {
-                throw new LocalizedException(__('Please enter a comment.'));
+                throw new LocalizedException(__('The comment is missing. Enter and try again.'));
             }
             $invoice = $this->getInvoice();
             if (!$invoice) {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php
index a031591b37fae..e4a74329502f1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php
@@ -31,11 +31,11 @@ public function execute()
             )->addObject(
                 $invoice->getOrder()
             )->save();
-            $this->messageManager->addSuccess(__('You canceled the invoice.'));
+            $this->messageManager->addSuccessMessage(__('You canceled the invoice.'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('Invoice canceling error'));
+            $this->messageManager->addErrorMessage(__('Invoice canceling error'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php
index 030ccc9d9d3f6..43270264ecbda 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php
@@ -33,11 +33,11 @@ public function execute()
             )->addObject(
                 $invoice->getOrder()
             )->save();
-            $this->messageManager->addSuccess(__('The invoice has been captured.'));
+            $this->messageManager->addSuccessMessage(__('The invoice has been captured.'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('Invoice capturing error'));
+            $this->messageManager->addErrorMessage(__('Invoice capturing error'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
index 9db9599862f4e..3295b244f323e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
@@ -4,14 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\Registry;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Sales\Model\Service\InvoiceService;
 
-class NewAction extends \Magento\Backend\App\Action
+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -94,7 +96,7 @@ public function execute()
 
             if (!$invoice->getTotalQty()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('You can\'t create an invoice without products.')
+                    __("The invoice can't be created without products. Add products and try again.")
                 );
             }
             $this->registry->register('current_invoice', $invoice);
@@ -111,10 +113,10 @@ public function execute()
             $resultPage->getConfig()->getTitle()->prepend(__('New Invoice'));
             return $resultPage;
         } catch (\Magento\Framework\Exception\LocalizedException $exception) {
-            $this->messageManager->addError($exception->getMessage());
+            $this->messageManager->addErrorMessage($exception->getMessage());
             return $this->_redirectToOrder($orderId);
         } catch (\Exception $exception) {
-            $this->messageManager->addException($exception, 'Cannot create an invoice.');
+            $this->messageManager->addExceptionMessage($exception, 'Cannot create an invoice.');
             return $this->_redirectToOrder($orderId);
         }
     }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index c45a1982784e1..ab74a64b6fcf3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -4,8 +4,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
@@ -18,7 +20,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Backend\App\Action
+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -117,7 +119,8 @@ public function execute()
         $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest());
         $isPost = $this->getRequest()->isPost();
         if (!$formKeyIsValid || !$isPost) {
-            $this->messageManager->addError(__('We can\'t save the invoice right now.'));
+            $this->messageManager
+                ->addErrorMessage(__("The invoice can't be saved at this time. Please try again later."));
             return $resultRedirect->setPath('sales/order/index');
         }
 
@@ -146,12 +149,12 @@ public function execute()
             $invoice = $this->invoiceService->prepareInvoice($order, $invoiceItems);
 
             if (!$invoice) {
-                throw new LocalizedException(__('We can\'t save the invoice right now.'));
+                throw new LocalizedException(__("The invoice can't be saved at this time. Please try again later."));
             }
 
             if (!$invoice->getTotalQty()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('You can\'t create an invoice without products.')
+                    __("The invoice can't be created without products. Add products and try again.")
                 );
             }
             $this->registry->register('current_invoice', $invoice);
@@ -192,9 +195,9 @@ public function execute()
             $transactionSave->save();
 
             if (!empty($data['do_shipment'])) {
-                $this->messageManager->addSuccess(__('You created the invoice and shipment.'));
+                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
             } else {
-                $this->messageManager->addSuccess(__('The invoice has been created.'));
+                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
             }
 
             // send invoice/shipment emails
@@ -204,7 +207,7 @@ public function execute()
                 }
             } catch (\Exception $e) {
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                $this->messageManager->addError(__('We can\'t send the invoice email right now.'));
+                $this->messageManager->addErrorMessage(__('We can\'t send the invoice email right now.'));
             }
             if ($shipment) {
                 try {
@@ -213,15 +216,17 @@ public function execute()
                     }
                 } catch (\Exception $e) {
                     $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                    $this->messageManager->addError(__('We can\'t send the shipment right now.'));
+                    $this->messageManager->addErrorMessage(__('We can\'t send the shipment right now.'));
                 }
             }
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
             return $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t save the invoice right now.'));
+            $this->messageManager->addErrorMessage(
+                __("The invoice can't be saved at this time. Please try again later.")
+            );
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
         return $resultRedirect->setPath('sales/*/new', ['order_id' => $orderId]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
index ca97ee3b3349b..4648656a3253f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface
 {
     /**
      * Start create invoice action
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
index cdb4114f70976..c94afa3cc8057 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
@@ -4,22 +4,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Backend\App\Action;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
 use Magento\Sales\Model\Service\InvoiceService;
+use Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View as AbstractView;
 
 /**
  * Class UpdateQty
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+class UpdateQty extends AbstractView implements HttpPostActionInterface
 {
     /**
      * @var JsonFactory
@@ -93,7 +95,7 @@ public function execute()
 
             if (!$invoice->getTotalQty()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('You can\'t create an invoice without products.')
+                    __("The invoice can't be created without products. Add products and try again.")
                 );
             }
             $this->registry->register('current_invoice', $invoice);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
index 78a413d5636e8..da700aae2f78a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
 
-class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface
 {
 
     /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php
index 6c91001cbb3da..4888ed555234c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php
@@ -34,11 +34,11 @@ public function execute()
             )->addObject(
                 $invoice->getOrder()
             )->save();
-            $this->messageManager->addSuccess(__('The invoice has been voided.'));
+            $this->messageManager->addSuccessMessage(__('The invoice has been voided.'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('Invoice voiding error'));
+            $this->messageManager->addErrorMessage(__('Invoice voiding error'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
index 2ba8467ff6864..deb20a989a260 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
@@ -5,27 +5,42 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Sales\Api\OrderManagementInterface;
 
-class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
+class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
      */
     const ADMIN_RESOURCE = 'Magento_Sales::cancel';
+    
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
 
     /**
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
+     * @param OrderManagementInterface|null $orderManagement
      */
-    public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
-    {
+    public function __construct(
+        Context $context,
+        Filter $filter,
+        CollectionFactory $collectionFactory,
+        OrderManagementInterface $orderManagement = null
+    ) {
         parent::__construct($context, $filter);
         $this->collectionFactory = $collectionFactory;
+        $this->orderManagement = $orderManagement ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Sales\Api\OrderManagementInterface::class
+        );
     }
 
     /**
@@ -38,23 +53,22 @@ protected function massAction(AbstractCollection $collection)
     {
         $countCancelOrder = 0;
         foreach ($collection->getItems() as $order) {
-            if (!$order->canCancel()) {
+            $isCanceled = $this->orderManagement->cancel($order->getEntityId());
+            if ($isCanceled === false) {
                 continue;
             }
-            $order->cancel();
-            $order->save();
             $countCancelOrder++;
         }
         $countNonCancelOrder = $collection->count() - $countCancelOrder;
 
         if ($countNonCancelOrder && $countCancelOrder) {
-            $this->messageManager->addError(__('%1 order(s) cannot be canceled.', $countNonCancelOrder));
+            $this->messageManager->addErrorMessage(__('%1 order(s) cannot be canceled.', $countNonCancelOrder));
         } elseif ($countNonCancelOrder) {
-            $this->messageManager->addError(__('You cannot cancel the order(s).'));
+            $this->messageManager->addErrorMessage(__('You cannot cancel the order(s).'));
         }
 
         if ($countCancelOrder) {
-            $this->messageManager->addSuccess(__('We canceled %1 order(s).', $countCancelOrder));
+            $this->messageManager->addSuccessMessage(__('We canceled %1 order(s).', $countCancelOrder));
         }
         $resultRedirect = $this->resultRedirectFactory->create();
         $resultRedirect->setPath($this->getComponentRefererUrl());
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
index e894957dc8b6c..5c96fbbe9e247 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
 /**
  * Class MassHold
  */
-class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
+class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -62,13 +63,13 @@ protected function massAction(AbstractCollection $collection)
         $countNonHoldOrder = $collection->count() - $countHoldOrder;
 
         if ($countNonHoldOrder && $countHoldOrder) {
-            $this->messageManager->addError(__('%1 order(s) were not put on hold.', $countNonHoldOrder));
+            $this->messageManager->addErrorMessage(__('%1 order(s) were not put on hold.', $countNonHoldOrder));
         } elseif ($countNonHoldOrder) {
-            $this->messageManager->addError(__('No order(s) were put on hold.'));
+            $this->messageManager->addErrorMessage(__('No order(s) were put on hold.'));
         }
 
         if ($countHoldOrder) {
-            $this->messageManager->addSuccess(__('You have put %1 order(s) on hold.', $countHoldOrder));
+            $this->messageManager->addSuccessMessage(__('You have put %1 order(s) on hold.', $countHoldOrder));
         }
 
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
index ebd6ff4a79b06..e862710379a04 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
@@ -5,27 +5,49 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Sales\Api\OrderManagementInterface;
 
-class MassUnhold extends AbstractMassAction
+/**
+ * Class MassUnhold, change status for select orders
+ *
+ * @package Magento\Sales\Controller\Adminhtml\Order
+ */
+class MassUnhold extends AbstractMassAction implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
      */
     const ADMIN_RESOURCE = 'Magento_Sales::unhold';
+    
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
 
     /**
+     * Class constructor
+     *
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
+     * @param OrderManagementInterface|null $orderManagement
      */
-    public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
-    {
+    public function __construct(
+        Context $context,
+        Filter $filter,
+        CollectionFactory $collectionFactory,
+        OrderManagementInterface $orderManagement = null
+    ) {
         parent::__construct($context, $filter);
         $this->collectionFactory = $collectionFactory;
+        $this->orderManagement = $orderManagement ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Sales\Api\OrderManagementInterface::class
+        );
     }
 
     /**
@@ -40,27 +62,25 @@ protected function massAction(AbstractCollection $collection)
 
         /** @var \Magento\Sales\Model\Order $order */
         foreach ($collection->getItems() as $order) {
-            $order->load($order->getId());
             if (!$order->canUnhold()) {
                 continue;
             }
-            $order->unhold();
-            $order->save();
+            $this->orderManagement->unHold($order->getEntityId());
             $countUnHoldOrder++;
         }
 
         $countNonUnHoldOrder = $collection->count() - $countUnHoldOrder;
 
         if ($countNonUnHoldOrder && $countUnHoldOrder) {
-            $this->messageManager->addError(
+            $this->messageManager->addErrorMessage(
                 __('%1 order(s) were not released from on hold status.', $countNonUnHoldOrder)
             );
         } elseif ($countNonUnHoldOrder) {
-            $this->messageManager->addError(__('No order(s) were released from on hold status.'));
+            $this->messageManager->addErrorMessage(__('No order(s) were released from on hold status.'));
         }
 
         if ($countUnHoldOrder) {
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('%1 order(s) have been released from on hold status.', $countUnHoldOrder)
             );
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php
index c53e4d48925c0..eeda8699a8b10 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php
@@ -27,7 +27,7 @@ public function execute()
             $collection = $this->filter->getCollection($this->getOrderCollection()->create());
             return $this->massAction($collection);
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
             return $resultRedirect->setPath($this->redirectUrl);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
index f96e2fd09c2b0..e731c54d8305a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
@@ -76,18 +76,22 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
 
         $creditmemoCollection = $this->collectionFactory->create()->setOrderFilter(['in' => $collection->getAllIds()]);
         if (!$creditmemoCollection->getSize()) {
-            $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
+            $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
+        $pdf = $this->pdfCreditmemo->getPdf($creditmemoCollection->getItems());
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('creditmemo%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfCreditmemo->getPdf($creditmemoCollection->getItems())->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
index d68cfe696b0ef..f641a7bde7335 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
@@ -113,6 +113,7 @@ public function __construct(
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Redirect
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
@@ -134,7 +135,7 @@ protected function massAction(AbstractCollection $collection)
         }
 
         if (empty($documents)) {
-            $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
+            $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
 
@@ -142,10 +143,11 @@ protected function massAction(AbstractCollection $collection)
         foreach ($documents as $document) {
             $pdf->pages = array_merge($pdf->pages, $document->pages);
         }
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
 
         return $this->fileFactory->create(
             sprintf('docs%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $pdf->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
index fee124a91410d..9e637c8883485 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
@@ -75,17 +75,21 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
         $invoicesCollection = $this->collectionFactory->create()->setOrderFilter(['in' => $collection->getAllIds()]);
         if (!$invoicesCollection->getSize()) {
-            $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
+            $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
+        $pdf = $this->pdfInvoice->getPdf($invoicesCollection->getItems());
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('invoice%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfInvoice->getPdf($invoicesCollection->getItems())->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
index 1aa5bfdb83878..6ce2557703ece 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
@@ -77,6 +77,7 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Redirect
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
@@ -84,12 +85,16 @@ protected function massAction(AbstractCollection $collection)
             ->create()
             ->setOrderFilter(['in' => $collection->getAllIds()]);
         if (!$shipmentsCollection->getSize()) {
-            $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
+            $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
+
+        $pdf = $this->pdfShipment->getPdf($shipmentsCollection->getItems());
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('packingslip%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfShipment->getPdf($shipmentsCollection->getItems())->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
index 88abdb76d26f7..09a52a113617a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
@@ -53,15 +53,15 @@ public function execute()
                         throw new \Exception(sprintf('Action "%s" is not supported.', $action));
                 }
                 $this->orderRepository->save($order);
-                $this->messageManager->addSuccess($message);
+                $this->messageManager->addSuccessMessage($message);
             } else {
                 $resultRedirect->setPath('sales/*/');
                 return $resultRedirect;
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t update the payment right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t update the payment right now.'));
             $this->logger->critical($e);
         }
         $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getEntityId()]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
index 982ee53cb0ff2..211ded865b4e4 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status
+class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
index 89820b41a68da..28a8e1cb02a14 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface
 {
     /**
      * Save status assignment to state
@@ -26,18 +28,18 @@ public function execute()
             if ($status && $status->getStatus()) {
                 try {
                     $status->assignState($state, $isDefault, $visibleOnFront);
-                    $this->messageManager->addSuccess(__('You assigned the order status.'));
+                    $this->messageManager->addSuccessMessage(__('You assigned the order status.'));
                     return $resultRedirect->setPath('sales/*/');
                 } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                    $this->messageManager->addError($e->getMessage());
+                    $this->messageManager->addErrorMessage($e->getMessage());
                 } catch (\Exception $e) {
-                    $this->messageManager->addException(
+                    $this->messageManager->addExceptionMessage(
                         $e,
                         __('Something went wrong while assigning the order status.')
                     );
                 }
             } else {
-                $this->messageManager->addError(__('We can\'t find this order status.'));
+                $this->messageManager->addErrorMessage(__('We can\'t find this order status.'));
             }
             return $resultRedirect->setPath('sales/*/assign');
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
index 69e051b20c4dd..7a4a1918bc1a2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
@@ -48,7 +48,7 @@ public function execute()
             $resultPage->getConfig()->getTitle()->prepend(__('Edit Order Status'));
             return $resultPage;
         } else {
-            $this->messageManager->addError(__('We can\'t find this order status.'));
+            $this->messageManager->addErrorMessage(__('We can\'t find this order status.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
             return $resultRedirect->setPath('sales/');
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
index 110402ee27070..3755dca9da950 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status
+class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
index 849a7e2d0c817..4645588a7522c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
@@ -6,25 +6,32 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Sales\Model\Order\Status;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Sales\Controller\Adminhtml\Order\Status as StatusAction;
+
+class Save extends StatusAction implements HttpPostActionInterface
 {
     /**
      * Save status form processing
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return Redirect
      */
     public function execute()
     {
         $data = $this->getRequest()->getPostValue();
         $isNew = $this->getRequest()->getParam('is_new');
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         if ($data) {
             $statusCode = $this->getRequest()->getParam('status');
 
             //filter tags in labels/status
-            /** @var $filterManager \Magento\Framework\Filter\FilterManager */
-            $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class);
+            /** @var $filterManager FilterManager */
+            $filterManager = $this->_objectManager->get(FilterManager::class);
             if ($isNew) {
                 $statusCode = $data['status'] = $filterManager->stripTags($data['status']);
             }
@@ -37,10 +44,11 @@ public function execute()
                 $label = $filterManager->stripTags($label);
             }
 
-            $status = $this->_objectManager->create(\Magento\Sales\Model\Order\Status::class)->load($statusCode);
+            $status = $this->_objectManager->create(Status::class)->load($statusCode);
             // check if status exist
             if ($isNew && $status->getStatus()) {
-                $this->messageManager->addError(__('We found another order status with the same order status code.'));
+                $this->messageManager
+                    ->addErrorMessage(__('We found another order status with the same order status code.'));
                 $this->_getSession()->setFormData($data);
                 return $resultRedirect->setPath('sales/*/new');
             }
@@ -49,23 +57,33 @@ public function execute()
 
             try {
                 $status->save();
-                $this->messageManager->addSuccess(__('You saved the order status.'));
+                $this->messageManager->addSuccessMessage(__('You saved the order status.'));
                 return $resultRedirect->setPath('sales/*/');
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+            } catch (LocalizedException $e) {
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('We can\'t add the order status right now.')
                 );
             }
             $this->_getSession()->setFormData($data);
-            if ($isNew) {
-                return $resultRedirect->setPath('sales/*/new');
-            } else {
-                return $resultRedirect->setPath('sales/*/edit', ['status' => $this->getRequest()->getParam('status')]);
-            }
+            return $this->getRedirect($resultRedirect, $isNew);
         }
         return $resultRedirect->setPath('sales/*/');
     }
+
+    /**
+     * @param Redirect $resultRedirect
+     * @param bool $isNew
+     * @return Redirect
+     */
+    private function getRedirect(Redirect $resultRedirect, $isNew)
+    {
+        if ($isNew) {
+            return $resultRedirect->setPath('sales/*/new');
+        } else {
+            return $resultRedirect->setPath('sales/*/edit', ['status' => $this->getRequest()->getParam('status')]);
+        }
+    }
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
index 04db430e1ffa4..16bb275a88ec1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
@@ -18,17 +20,17 @@ public function execute()
         if ($status) {
             try {
                 $status->unassignState($state);
-                $this->messageManager->addSuccess(__('You have unassigned the order status.'));
+                $this->messageManager->addSuccessMessage(__('You have unassigned the order status.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('Something went wrong while unassigning the order.')
                 );
             }
         } else {
-            $this->messageManager->addError(__('We can\'t find this order status.'));
+            $this->messageManager->addErrorMessage(__('We can\'t find this order status.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
index 752ab088689c8..8d7f27069eeb7 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!$this->isValidPostRequest()) {
-            $this->messageManager->addError(__('Can\'t unhold order.'));
+            $this->messageManager->addErrorMessage(__('Can\'t unhold order.'));
             return $resultRedirect->setPath('sales/*/');
         }
         $order = $this->_initOrder();
@@ -32,12 +32,12 @@ public function execute()
                 if (!$order->canUnhold()) {
                     throw new \Magento\Framework\Exception\LocalizedException(__('Can\'t unhold order.'));
                 }
-                $this->orderManagement->unhold($order->getEntityId());
-                $this->messageManager->addSuccess(__('You released the order from holding status.'));
+                $this->orderManagement->unHold($order->getEntityId());
+                $this->messageManager->addSuccessMessage(__('You released the order from holding status.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('The order was not on hold.'));
+                $this->messageManager->addErrorMessage(__('The order was not on hold.'));
             }
             $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
             return $resultRedirect;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
index 7be17f865312e..8906d11dd776f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
@@ -31,7 +31,7 @@ public function execute()
                 $resultPage->getConfig()->getTitle()->prepend(__('Orders'));
             } catch (\Exception $e) {
                 $this->logger->critical($e);
-                $this->messageManager->addError(__('Exception occurred during order load'));
+                $this->messageManager->addErrorMessage(__('Exception occurred during order load'));
                 $resultRedirect->setPath('sales/order/index');
                 return $resultRedirect;
             }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php
index 61dc325c05c91..88fdbe58271f6 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php
@@ -18,9 +18,9 @@ public function execute()
                 $this->getRequest()->getParam('giftmessage')
             )->saveAllInOrder();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('Something went wrong while saving the gift message.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong while saving the gift message.'));
         }
 
         if ($this->getRequest()->getParam('type') == 'order_item') {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
index 3e7ce50f9a6f1..4ead8885087c3 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
@@ -21,11 +21,11 @@ public function execute()
                 // workaround for backwards compatibility
                 $order->getPayment()->void(new \Magento\Framework\DataObject());
                 $order->save();
-                $this->messageManager->addSuccess(__('The payment has been voided.'));
+                $this->messageManager->addSuccessMessage(__('The payment has been voided.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t void the payment right now.'));
+                $this->messageManager->addErrorMessage(__('We can\'t void the payment right now.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             }
             $resultRedirect->setPath('sales/*/view', ['order_id' => $order->getId()]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
index b10dca908fe6a..4a7c6e0533e33 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
@@ -70,9 +70,12 @@ public function __construct(
      */
     public function massAction(AbstractCollection $collection)
     {
+        $pdf = $this->pdfShipment->getPdf($collection);
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('packingslip%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfShipment->getPdf($collection)->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
index da8646a0c30b2..1e49fe7eff60a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
@@ -48,6 +48,7 @@ public function __construct(
 
     /**
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
+     * @throws \Exception
      */
     public function execute()
     {
@@ -63,9 +64,11 @@ public function execute()
                 $date = $this->_objectManager->get(
                     \Magento\Framework\Stdlib\DateTime\DateTime::class
                 )->date('Y-m-d_H-i-s');
+                $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
                 return $this->_fileFactory->create(
                     'packingslip' . $date . '.pdf',
-                    $pdf->render(),
+                    $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'
                 );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
index c7f560c52fb66..59d8a68a7446d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php
@@ -6,6 +6,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Shipment;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index as AbstractIndex;
+
+class Index extends AbstractIndex implements HttpGetActionInterface
 {
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
index d5c1186964076..e344b258c5198 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
@@ -82,7 +82,7 @@ protected function _initTransaction()
         );
 
         if (!$txn->getId()) {
-            $this->messageManager->addError(__('Please correct the transaction ID and try again.'));
+            $this->messageManager->addErrorMessage(__('Please correct the transaction ID and try again.'));
             $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
             return false;
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
index e77c65716fdd7..1b72ce3f13e33 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
@@ -38,11 +38,11 @@ public function execute()
                 ->setOrder($txn->getOrder())
                 ->importTransactionInfo($txn);
             $txn->save();
-            $this->messageManager->addSuccess(__('The transaction details have been updated.'));
+            $this->messageManager->addSuccessMessage(__('The transaction details have been updated.'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t update the transaction details.'));
+            $this->messageManager->addErrorMessage(__('We can\'t update the transaction details.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
index 750781e99197c..a7327050064ae 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Transactions;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\Model\View\Result\Page;
 
-class Index extends \Magento\Sales\Controller\Adminhtml\Transactions
+class Index extends \Magento\Sales\Controller\Adminhtml\Transactions implements HttpGetActionInterface
 {
     /**
      * @return Page
diff --git a/app/code/Magento/Sales/Controller/Order/Creditmemo.php b/app/code/Magento/Sales/Controller/Order/Creditmemo.php
index 2a7fd3e9849e5..74aae3e1f8417 100644
--- a/app/code/Magento/Sales/Controller/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Controller/Order/Creditmemo.php
@@ -6,8 +6,10 @@
  */
 namespace Magento\Sales\Controller\Order;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Sales\Controller\OrderInterface;
+use Magento\Sales\Controller\AbstractController\Creditmemo as AbstractCreditmemo;
 
-class Creditmemo extends \Magento\Sales\Controller\AbstractController\Creditmemo implements OrderInterface
+class Creditmemo extends AbstractCreditmemo implements OrderInterface, HttpGetActionInterface
 {
 }
diff --git a/app/code/Magento/Sales/Controller/Order/History.php b/app/code/Magento/Sales/Controller/Order/History.php
index 23e8208d8b198..37de159845856 100644
--- a/app/code/Magento/Sales/Controller/Order/History.php
+++ b/app/code/Magento/Sales/Controller/Order/History.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Sales\Controller\Order;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Sales\Controller\OrderInterface;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
-class History extends \Magento\Framework\App\Action\Action implements OrderInterface
+class History extends \Magento\Framework\App\Action\Action implements OrderInterface, HttpGetActionInterface
 {
     /**
      * @var PageFactory
diff --git a/app/code/Magento/Sales/Controller/Order/View.php b/app/code/Magento/Sales/Controller/Order/View.php
index d68b9481c8619..21a5706a4448f 100644
--- a/app/code/Magento/Sales/Controller/Order/View.php
+++ b/app/code/Magento/Sales/Controller/Order/View.php
@@ -6,8 +6,9 @@
  */
 namespace Magento\Sales\Controller\Order;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Sales\Controller\OrderInterface;
 
-class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface
+class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface, HttpGetActionInterface
 {
 }
diff --git a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
index 3cd3afbfa4d22..f2f36979f30b2 100644
--- a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
+++ b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
@@ -6,6 +6,9 @@
 namespace Magento\Sales\CustomerData;
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Returns information for "Recently Ordered" widget.
@@ -54,25 +57,41 @@ class LastOrderedItems implements SectionSourceInterface
      */
     private $_storeManager;
 
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param ProductRepositoryInterface $productRepository
+     * @param LoggerInterface $logger
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
         \Magento\Sales\Model\Order\Config $orderConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        ProductRepositoryInterface $productRepository,
+        LoggerInterface $logger
     ) {
         $this->_orderCollectionFactory = $orderCollectionFactory;
         $this->_orderConfig = $orderConfig;
         $this->_customerSession = $customerSession;
         $this->stockRegistry = $stockRegistry;
         $this->_storeManager = $storeManager;
+        $this->productRepository = $productRepository;
+        $this->logger = $logger;
     }
 
     /**
@@ -108,11 +127,23 @@ protected function getItems()
             $website = $this->_storeManager->getStore()->getWebsiteId();
             /** @var \Magento\Sales\Model\Order\Item $item */
             foreach ($order->getParentItemsRandomCollection($limit) as $item) {
-                if ($item->hasData('product') && in_array($website, $item->getProduct()->getWebsiteIds())) {
+                /** @var \Magento\Catalog\Model\Product $product */
+                try {
+                    $product = $this->productRepository->getById(
+                        $item->getProductId(),
+                        false,
+                        $this->_storeManager->getStore()->getId()
+                    );
+                } catch (NoSuchEntityException $noEntityException) {
+                    $this->logger->critical($noEntityException);
+                    continue;
+                }
+                if (isset($product) && in_array($website, $product->getWebsiteIds())) {
+                    $url = $product->isVisibleInSiteVisibility() ? $product->getProductUrl() : null;
                     $items[] = [
                         'id' => $item->getId(),
                         'name' => $item->getName(),
-                        'url' => $item->getProduct()->getProductUrl(),
+                        'url' => $url,
                         'is_saleable' => $this->isItemAvailableForReorder($item),
                     ];
                 }
@@ -136,7 +167,7 @@ protected function isItemAvailableForReorder(\Magento\Sales\Model\Order\Item $or
                 $orderItem->getStore()->getWebsiteId()
             );
             return $stockItem->getIsInStock();
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $noEntityException) {
+        } catch (NoSuchEntityException $noEntityException) {
             return false;
         }
     }
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 1b8d95441dfc5..7053a696dcab5 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Helper;
 
+/**
+ * Sales admin helper.
+ */
 class Admin extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
@@ -84,7 +89,6 @@ public function displayPriceAttribute($dataObject, $code, $strong = false, $sepa
      */
     public function displayPrices($dataObject, $basePrice, $price, $strong = false, $separator = '<br/>')
     {
-        $order = false;
         if ($dataObject instanceof \Magento\Sales\Model\Order) {
             $order = $dataObject;
         } else {
@@ -149,22 +153,15 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
             $links = [];
             $i = 1;
             $data = str_replace('%', '%%', $data);
-            $regexp = "/<a\s[^>]*href\s*?=\s*?([\"\']??)([^\" >]*?)\\1[^>]*>(.*)<\/a>/siU";
+            $regexp = "#(?J)<a"
+                ."(?:(?:\s+(?:(?:href\s*=\s*(['\"])(?<link>.*?)\\1\s*)|(?:\S+\s*=\s*(['\"])(.*?)\\3)\s*)*)|>)"
+                .">?(?:(?:(?<text>.*?)(?:<\/a\s*>?|(?=<\w))|(?<text>.*)))#si";
             while (preg_match($regexp, $data, $matches)) {
-                //Revert the sprintf escaping
-                $url = str_replace('%%', '%', $matches[2]);
-                $text = str_replace('%%', '%', $matches[3]);
-                //Check for an valid url
-                if ($url) {
-                    $urlScheme = strtolower(parse_url($url, PHP_URL_SCHEME));
-                    if ($urlScheme !== 'http' && $urlScheme !== 'https') {
-                        $url = null;
-                    }
-                }
-                //Use hash tag as fallback
-                if (!$url) {
-                    $url = '#';
+                $text = '';
+                if (!empty($matches['text'])) {
+                    $text = str_replace('%%', '%', $matches['text']);
                 }
+                $url = $this->filterUrl($matches['link'] ?? '');
                 //Recreate a minimalistic secure a tag
                 $links[] = sprintf(
                     '<a href="%s">%s</a>',
@@ -179,4 +176,29 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
         }
         return $this->escaper->escapeHtml($data, $allowedTags);
     }
+
+    /**
+     * Filter the URL for allowed protocols.
+     *
+     * @param string $url
+     * @return string
+     */
+    private function filterUrl(string $url): string
+    {
+        if ($url) {
+            //Revert the sprintf escaping
+            $url = str_replace('%%', '%', $url);
+            $urlScheme = parse_url($url, PHP_URL_SCHEME);
+            $urlScheme = $urlScheme ? strtolower($urlScheme) : '';
+            if ($urlScheme !== 'http' && $urlScheme !== 'https') {
+                $url = null;
+            }
+        }
+
+        if (!$url) {
+            $url = '#';
+        }
+
+        return $url;
+    }
 }
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index a80be58bc003e..a3f2ac6ba3556 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,13 +158,14 @@ 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) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             return $this->resultRedirectFactory->create()->setPath('sales/guest/form');
         }
     }
@@ -178,12 +179,15 @@ public function loadValidOrder(App\RequestInterface $request)
     public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage)
     {
         $breadcrumbs = $resultPage->getLayout()->getBlock('breadcrumbs');
+        if (!$breadcrumbs) {
+            return;
+        }
         $breadcrumbs->addCrumb(
             'home',
             [
                 'label' => __('Home'),
                 'title' => __('Go to Home Page'),
-                'link' => $this->_storeManager->getStore()->getBaseUrl()
+                'link' => $this->storeManager->getStore()->getBaseUrl()
             ]
         );
         $breadcrumbs->addCrumb(
@@ -244,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']);
@@ -264,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'];
@@ -285,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']));
@@ -303,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/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 7ad684c198f90..088ad5a61f6c3 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -8,7 +8,14 @@
 
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Model\Metadata\Form as CustomerForm;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Item;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Model\Order;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Order create model
@@ -231,6 +238,16 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      */
     private $serializer;
 
+    /**
+     * @var ExtensibleDataObjectConverter
+     */
+    private $dataObjectConverter;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -261,6 +278,8 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * @param \Magento\Quote\Model\QuoteFactory $quoteFactory
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param ExtensibleDataObjectConverter|null $dataObjectConverter
+     * @param StoreManagerInterface $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -292,7 +311,9 @@ public function __construct(
         \Magento\Sales\Api\OrderManagementInterface $orderManagement,
         \Magento\Quote\Model\QuoteFactory $quoteFactory,
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ExtensibleDataObjectConverter $dataObjectConverter = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->_objectManager = $objectManager;
         $this->_eventManager = $eventManager;
@@ -321,9 +342,12 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->orderManagement = $orderManagement;
         $this->quoteFactory = $quoteFactory;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         parent::__construct($data);
+        $this->dataObjectConverter = $dataObjectConverter ?: ObjectManager::getInstance()
+            ->get(ExtensibleDataObjectConverter::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -401,7 +425,8 @@ public function setRecollect($flag)
 
     /**
      * Recollect totals for customer cart.
-     * Set recollect totals flag for quote
+     *
+     * Set recollect totals flag for quote.
      *
      * @return $this
      */
@@ -510,9 +535,7 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
 
         $shippingAddress = $order->getShippingAddress();
         if ($shippingAddress) {
-            $addressDiff = array_diff_assoc($shippingAddress->getData(), $order->getBillingAddress()->getData());
-            unset($addressDiff['address_type'], $addressDiff['entity_id']);
-            $shippingAddress->setSameAsBilling(empty($addressDiff));
+            $shippingAddress->setSameAsBilling($this->isAddressesAreEqual($order));
         }
 
         $this->_initBillingAddressFromOrder($order);
@@ -701,9 +724,10 @@ public function getCustomerCart()
         $this->_cart = $this->quoteFactory->create();
 
         $customerId = (int)$this->getSession()->getCustomerId();
+        $storeId = (int)$this->getSession()->getStoreId();
         if ($customerId) {
             try {
-                $this->_cart = $this->quoteRepository->getForCustomer($customerId);
+                $this->_cart = $this->quoteRepository->getForCustomer($customerId, [$storeId]);
             } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
                 $this->_cart->setStore($this->getSession()->getStore());
                 $customerData = $this->customerRepository->getById($customerId);
@@ -1061,7 +1085,7 @@ public function addProducts(array $products)
             try {
                 $this->addProduct($productId, $config);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 return $e;
             }
@@ -1289,7 +1313,7 @@ protected function _parseCustomPrice($price)
     }
 
     /**
-     * Retrieve oreder quote shipping address
+     * Retrieve order quote shipping address
      *
      * @return \Magento\Quote\Model\Quote\Address
      */
@@ -1319,6 +1343,7 @@ protected function _createCustomerForm(\Magento\Customer\Api\Data\CustomerInterf
 
     /**
      * Set and validate Quote address
+     *
      * All errors added to _errors
      *
      * @param \Magento\Quote\Model\Quote\Address $address
@@ -1415,7 +1440,7 @@ public function setShippingAddress($address)
     }
 
     /**
-     * Set shipping anddress to be same as billing
+     * Set shipping address to be same as billing
      *
      * @param bool $flag If true - don't save in address book and actually copy data across billing and shipping
      *                   addresses
@@ -1454,33 +1479,37 @@ public function getBillingAddress()
      */
     public function setBillingAddress($address)
     {
-        if (is_array($address)) {
-            $billingAddress = $this->_objectManager->create(
-                \Magento\Quote\Model\Quote\Address::class
-            )->setData(
-                $address
-            )->setAddressType(
-                \Magento\Quote\Model\Quote\Address::TYPE_BILLING
-            );
-            $this->_setQuoteAddress($billingAddress, $address);
-            /**
-             * save_in_address_book is not a valid attribute and is filtered out by _setQuoteAddress,
-             * that is why it should be added after _setQuoteAddress call
-             */
-            $saveInAddressBook = (int)(!empty($address['save_in_address_book']));
-            $billingAddress->setData('save_in_address_book', $saveInAddressBook);
-
-            if (!$this->getQuote()->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) {
-                $shippingAddress = clone $billingAddress;
-                $shippingAddress->setSameAsBilling(true);
-                $shippingAddress->setSaveInAddressBook(false);
-                $address['save_in_address_book'] = 0;
-                $this->setShippingAddress($address);
-            }
+        if (!is_array($address)) {
+            return $this;
+        }
 
-            $this->getQuote()->setBillingAddress($billingAddress);
+        $billingAddress = $this->_objectManager->create(Address::class)
+            ->setData($address)
+            ->setAddressType(Address::TYPE_BILLING);
+
+        $this->_setQuoteAddress($billingAddress, $address);
+
+        /**
+         * save_in_address_book is not a valid attribute and is filtered out by _setQuoteAddress,
+         * that is why it should be added after _setQuoteAddress call
+         */
+        $saveInAddressBook = (int)(!empty($address['save_in_address_book']));
+        $billingAddress->setData('save_in_address_book', $saveInAddressBook);
+
+        $quote = $this->getQuote();
+        if (!$quote->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) {
+            $address['save_in_address_book'] = 0;
+            $this->setShippingAddress($address);
         }
 
+        // not assigned billing address should be saved as new
+        // but if quote already has the billing address it won't be overridden
+        if (empty($billingAddress->getCustomerAddressId())) {
+            $billingAddress->setCustomerAddressId(null);
+            $quote->getBillingAddress()->setCustomerAddressId(null);
+        }
+        $quote->setBillingAddress($billingAddress);
+
         return $this;
     }
 
@@ -1518,6 +1547,8 @@ public function resetShippingMethod()
      */
     public function collectShippingRates()
     {
+        $store = $this->getQuote()->getStore();
+        $this->storeManager->setCurrentStore($store);
         $this->getQuote()->getShippingAddress()->setCollectShippingRates(true);
         $this->collectRates();
 
@@ -1782,6 +1813,7 @@ public function _prepareCustomer()
             $address = $this->getShippingAddress()->setCustomerId($this->getQuote()->getCustomer()->getId());
             $this->setShippingAddress($address);
         }
+        $this->getBillingAddress()->setCustomerId($customer->getId());
         $this->getQuote()->updateCustomerData($this->getQuote()->getCustomer());
 
         $customer = $this->getQuote()->getCustomer();
@@ -1858,7 +1890,7 @@ protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)
     }
 
     /**
-     * Prepare item otions
+     * Prepare item options
      *
      * @return $this
      */
@@ -1937,21 +1969,17 @@ public function createOrder()
      */
     protected function _validate()
     {
-        $customerId = $this->getSession()->getCustomerId();
-        if ($customerId === null) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a customer'));
-        }
-
         if (!$this->getSession()->getStore()->getId()) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Please select a store'));
         }
         $items = $this->getQuote()->getAllItems();
 
-        if (count($items) == 0) {
+        if (count($items) === 0) {
             $this->_errors[] = __('Please specify order items.');
         }
 
         foreach ($items as $item) {
+            /** @var \Magento\Quote\Model\Quote\Item $item */
             $messages = $item->getMessage(false);
             if ($item->getHasError() && is_array($messages) && !empty($messages)) {
                 $this->_errors = array_merge($this->_errors, $messages);
@@ -1960,12 +1988,12 @@ protected function _validate()
 
         if (!$this->getQuote()->isVirtual()) {
             if (!$this->getQuote()->getShippingAddress()->getShippingMethod()) {
-                $this->_errors[] = __('Please specify a shipping method.');
+                $this->_errors[] = __('The shipping method is missing. Select the shipping method and try again.');
             }
         }
 
         if (!$this->getQuote()->getPayment()->getMethod()) {
-            $this->_errors[] = __('Please specify a payment method.');
+            $this->_errors[] = __("The payment method isn't selected. Enter the payment method and try again.");
         } else {
             $method = $this->getQuote()->getPayment()->getMethodInstance();
             if (!$method->isAvailable($this->getQuote())) {
@@ -1979,9 +2007,13 @@ protected function _validate()
             }
         }
         if (!empty($this->_errors)) {
+            /** @var LoggerInterface $logger */
+            $logger = ObjectManager::getInstance()->get(LoggerInterface::class);
             foreach ($this->_errors as $error) {
-                $this->messageManager->addError($error);
+                $logger->error($error);
+                $this->messageManager->addErrorMessage($error);
             }
+
             throw new \Magento\Framework\Exception\LocalizedException(__('Validation is failed.'));
         }
 
@@ -1989,25 +2021,34 @@ protected function _validate()
     }
 
     /**
-     * Retrieve or generate new customer email.
+     * Retrieve new customer email.
      *
      * @return string
      */
     protected function _getNewCustomerEmail()
     {
-        $email = $this->getData('account/email');
-        if (empty($email)) {
-            $host = $this->_scopeConfig->getValue(
-                self::XML_PATH_DEFAULT_EMAIL_DOMAIN,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            );
-            $account = time();
-            $email = $account . '@' . $host;
-            $account = $this->getData('account');
-            $account['email'] = $email;
-            $this->setData('account', $account);
-        }
+        return $this->getData('account/email');
+    }
+
+    /**
+     * Checks id shipping and billing addresses are equal.
+     *
+     * @param Order $order
+     * @return bool
+     */
+    private function isAddressesAreEqual(Order $order)
+    {
+        $shippingAddress = $order->getShippingAddress();
+        $billingAddress = $order->getBillingAddress();
+        $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], OrderAddressInterface::class);
+        $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], OrderAddressInterface::class);
+        unset(
+            $shippingData['address_type'],
+            $shippingData['entity_id'],
+            $billingData['address_type'],
+            $billingData['entity_id']
+        );
 
-        return $email;
+        return $shippingData == $billingData;
     }
 }
diff --git a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
index 8ba0b5b071395..4e068eb571deb 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
@@ -55,7 +55,7 @@ public function send(Order $order)
             $this->orderSender->send($order);
         } catch (\Magento\Framework\Exception\MailException $exception) {
             $this->logger->critical($exception);
-            $this->messageManager->addWarning(
+            $this->messageManager->addWarningMessage(
                 __('You did not email your customer. Please check your email settings.')
             );
             return false;
diff --git a/app/code/Magento/Sales/Model/Config/Ordered.php b/app/code/Magento/Sales/Model/Config/Ordered.php
index 8c5ddb8e07df7..bae6223ee7d5e 100644
--- a/app/code/Magento/Sales/Model/Config/Ordered.php
+++ b/app/code/Magento/Sales/Model/Config/Ordered.php
@@ -167,13 +167,8 @@ function ($a, $b) {
                     if (!isset($a['sort_order']) || !isset($b['sort_order'])) {
                         return 0;
                     }
-                    if ($a['sort_order'] > $b['sort_order']) {
-                        return 1;
-                    } elseif ($a['sort_order'] < $b['sort_order']) {
-                        return -1;
-                    } else {
-                        return 0;
-                    }
+
+                    return $a['sort_order'] <=> $b['sort_order'];
                 }
             );
         }
diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
index 8a7bd0260df0f..999bb1786cf83 100644
--- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
@@ -3,11 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\CronJob;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Store\Model\StoresConfig;
 use Magento\Sales\Model\Order;
 
+/**
+ * Class that provides functionality of cleaning expired quotes by cron
+ */
 class CleanExpiredOrders
 {
     /**
@@ -16,20 +24,28 @@ class CleanExpiredOrders
     protected $storesConfig;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+     * @var CollectionFactory
      */
     protected $orderCollectionFactory;
 
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
     /**
      * @param StoresConfig $storesConfig
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+     * @param CollectionFactory $collectionFactory
+     * @param OrderManagementInterface|null $orderManagement
      */
     public function __construct(
         StoresConfig $storesConfig,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        OrderManagementInterface $orderManagement = null
     ) {
         $this->storesConfig = $storesConfig;
         $this->orderCollectionFactory = $collectionFactory;
+        $this->orderManagement = $orderManagement ?: ObjectManager::getInstance()->get(OrderManagementInterface::class);
     }
 
     /**
@@ -48,8 +64,10 @@ public function execute()
             $orders->getSelect()->where(
                 new \Zend_Db_Expr('TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP, `updated_at`)) >= ' . $lifetime * 60)
             );
-            $orders->walk('cancel');
-            $orders->walk('save');
+
+            foreach ($orders->getAllIds() as $entityId) {
+                $this->orderManagement->cancel((int) $entityId);
+            }
         }
     }
 }
diff --git a/app/code/Magento/Sales/Model/Download.php b/app/code/Magento/Sales/Model/Download.php
index 6d3ad8491253a..a76b72bfa41dd 100644
--- a/app/code/Magento/Sales/Model/Download.php
+++ b/app/code/Magento/Sales/Model/Download.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * Class Download. Represents download logic for files
+ */
 class Download
 {
     /**
@@ -36,6 +39,8 @@ class Download
     protected $rootDirBasePath;
 
     /**
+     * Constructor method
+     *
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDatabase
      * @param \Magento\MediaStorage\Model\File\Storage\DatabaseFactory $storageDatabaseFactory
@@ -78,11 +83,14 @@ public function downloadFile($info)
         $this->_fileFactory->create(
             $info['title'],
             ['value' => $this->_rootDir->getRelativePath($relativePath), 'type' => 'filename'],
-            $this->rootDirBasePath
+            $this->rootDirBasePath,
+            $info['type']
         );
     }
 
     /**
+     * Method checks, if file can be returned depends on the given filepath
+     *
      * @param string $relativePath
      * @return bool
      */
diff --git a/app/code/Magento/Sales/Model/EmailSenderHandler.php b/app/code/Magento/Sales/Model/EmailSenderHandler.php
index 73d4eacdd1fc8..7c7005bf0da75 100644
--- a/app/code/Magento/Sales/Model/EmailSenderHandler.php
+++ b/app/code/Magento/Sales/Model/EmailSenderHandler.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sales\Model;
 
+use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
+
 /**
  * Sales emails sending
  *
@@ -41,22 +43,42 @@ class EmailSenderHandler
      */
     protected $globalConfig;
 
+    /**
+     * @var IdentityInterface
+     */
+    private $identityContainer;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Sales\Model\Order\Email\Sender $emailSender
      * @param \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource
      * @param \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
+     * @param IdentityInterface|null $identityContainer
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @throws \InvalidArgumentException
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Sender $emailSender,
         \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource,
         \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection,
-        \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
+        \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
+        IdentityInterface $identityContainer = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         $this->emailSender = $emailSender;
         $this->entityResource = $entityResource;
         $this->entityCollection = $entityCollection;
         $this->globalConfig = $globalConfig;
+
+        $this->identityContainer = $identityContainer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Sales\Model\Order\Email\Container\NullIdentity::class);
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -68,15 +90,54 @@ public function sendEmails()
         if ($this->globalConfig->getValue('sales_email/general/async_sending')) {
             $this->entityCollection->addFieldToFilter('send_email', ['eq' => 1]);
             $this->entityCollection->addFieldToFilter('email_sent', ['null' => true]);
+            $this->entityCollection->setPageSize(
+                $this->globalConfig->getValue('sales_email/general/sending_limit')
+            );
 
-            /** @var \Magento\Sales\Model\AbstractModel $item */
-            foreach ($this->entityCollection->getItems() as $item) {
-                if ($this->emailSender->send($item, true)) {
-                    $this->entityResource->save(
-                        $item->setEmailSent(true)
-                    );
+            /** @var \Magento\Store\Api\Data\StoreInterface[] $stores */
+            $stores = $this->getStores(clone $this->entityCollection);
+
+            /** @var \Magento\Store\Model\Store $store */
+            foreach ($stores as $store) {
+                $this->identityContainer->setStore($store);
+                if (!$this->identityContainer->isEnabled()) {
+                    continue;
+                }
+                $entityCollection = clone $this->entityCollection;
+                $entityCollection->addFieldToFilter('store_id', $store->getId());
+
+                /** @var \Magento\Sales\Model\AbstractModel $item */
+                foreach ($entityCollection->getItems() as $item) {
+                    if ($this->emailSender->send($item, true)) {
+                        $this->entityResource->save(
+                            $item->setEmailSent(true)
+                        );
+                    }
                 }
             }
         }
     }
+
+    /**
+     * Get stores for given entities.
+     *
+     * @param ResourceModel\Collection\AbstractCollection $entityCollection
+     * @return \Magento\Store\Api\Data\StoreInterface[]
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getStores(
+        \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection
+    ): array {
+        $stores = [];
+
+        $entityCollection->addAttributeToSelect('store_id')->getSelect()->group('store_id');
+        /** @var \Magento\Sales\Model\EntityInterface $item */
+        foreach ($entityCollection->getItems() as $item) {
+            /** @var \Magento\Store\Model\StoreManagerInterface $store */
+            $store = $this->storeManager->getStore($item->getStoreId());
+            $stores[$item->getStoreId()] = $store;
+        }
+
+        return $stores;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/EntityStorage.php b/app/code/Magento/Sales/Model/EntityStorage.php
index 3fc0837e7cd58..06f0044715487 100644
--- a/app/code/Magento/Sales/Model/EntityStorage.php
+++ b/app/code/Magento/Sales/Model/EntityStorage.php
@@ -45,7 +45,7 @@ public function addByIdentifyingFields(FrameworkAbstractModel $object, array $id
             throw new \Magento\Framework\Exception\InputException(__('Identifying Fields required'));
         }
         if (!$object->getId()) {
-            throw new \Magento\Framework\Exception\InputException(__('Id required'));
+            throw new \Magento\Framework\Exception\InputException(__('An ID is needed. Set the ID and try again.'));
         }
         $this->storageMapper[$storageName][$this->getHash($identifyingFields)] = $object->getId();
         $this->registry[$object->getId()] = $object;
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index d3b8edbed2eea..1ce23afe434fb 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -13,10 +13,11 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
 use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\ProductOption;
 use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection as CreditmemoCollection;
 use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection;
-use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ImportCollection;
+use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
 use Magento\Sales\Model\ResourceModel\Order\Payment\Collection as PaymentCollection;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Collection as ShipmentCollection;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection as TrackCollection;
@@ -279,6 +280,11 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      */
     private $localeResolver;
 
+    /**
+     * @var ProductOption
+     */
+    private $productOption;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -308,6 +314,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param ResolverInterface $localeResolver
+     * @param ProductOption|null $productOption
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -338,7 +345,8 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        ResolverInterface $localeResolver = null
+        ResolverInterface $localeResolver = null,
+        ProductOption $productOption = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_orderConfig = $orderConfig;
@@ -361,6 +369,7 @@ public function __construct(
         $this->salesOrderCollectionFactory = $salesOrderCollectionFactory;
         $this->priceCurrency = $priceCurrency;
         $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(ResolverInterface::class);
+        $this->productOption = $productOption ?: ObjectManager::getInstance()->get(ProductOption::class);
 
         parent::__construct(
             $context,
@@ -546,6 +555,7 @@ public function canCancel()
                 break;
             }
         }
+
         if ($allInvoiced) {
             return false;
         }
@@ -564,6 +574,7 @@ public function canCancel()
 
     /**
      * Getter whether the payment can be voided
+     *
      * @return bool
      */
     public function canVoidPayment()
@@ -620,11 +631,8 @@ public function canCreditmemo()
             return $this->getForcedCanCreditmemo();
         }
 
-        if ($this->canUnhold() || $this->isPaymentReview()) {
-            return false;
-        }
-
-        if ($this->isCanceled() || $this->getState() === self::STATE_CLOSED) {
+        if ($this->canUnhold() || $this->isPaymentReview() ||
+            $this->isCanceled() || $this->getState() === self::STATE_CLOSED) {
             return false;
         }
 
@@ -634,15 +642,52 @@ public function canCreditmemo()
          * TotalPaid - contains amount, that were not rounded.
          */
         $totalRefunded = $this->priceCurrency->round($this->getTotalPaid()) - $this->getTotalRefunded();
-        if (abs($totalRefunded) < .0001) {
-            return false;
+        if (abs($this->getGrandTotal()) < .0001) {
+            return $this->canCreditmemoForZeroTotal($totalRefunded);
         }
+
+        return $this->canCreditmemoForZeroTotalRefunded($totalRefunded);
+    }
+
+    /**
+     * Retrieve credit memo for zero total refunded availability.
+     *
+     * @param float $totalRefunded
+     * @return bool
+     */
+    private function canCreditmemoForZeroTotalRefunded($totalRefunded)
+    {
+        $isRefundZero = abs($totalRefunded) < .0001;
         // Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
-        if (abs($totalRefunded - $this->getAdjustmentNegative()) < .0001) {
+        $hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
+        $hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
+        if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
             return false;
         }
 
-        if ($this->getActionFlag(self::ACTION_FLAG_EDIT) === false) {
+        return true;
+    }
+    
+    /**
+     * Retrieve credit memo for zero total availability.
+     *
+     * @param float $totalRefunded
+     * @return bool
+     */
+    public function canCreditmemoForZeroTotal($totalRefunded)
+    {
+        $totalPaid = $this->getTotalPaid();
+        //check if total paid is less than grandtotal
+        $checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
+        //case when amount is due for invoice
+        $hasDueAmount = $this->canInvoice() && ($checkAmtTotalPaid);
+        //case when paid amount is refunded and order has creditmemo created
+        $creditmemos = ($this->getCreditmemosCollection() === false) ?
+             true : (count($this->getCreditmemosCollection()) > 0);
+        $paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
+        if (($hasDueAmount || $paidAmtIsRefunded) ||
+            (!$checkAmtTotalPaid &&
+            abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)) {
             return false;
         }
         return true;
@@ -880,7 +925,7 @@ protected function _placePayment()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPayment()
     {
@@ -972,7 +1017,7 @@ public function getShippingAddress()
     }
 
     /**
-     * Set order state
+     * @inheritdoc
      *
      * @param string $state
      * @return $this
@@ -1007,14 +1052,32 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified =
     }
 
     /**
-     * Add a comment to order
-     * Different or default status may be specified
+     * Add a comment to order.
+     *
+     * Different or default status may be specified.
      *
      * @param string $comment
      * @param bool|string $status
      * @return OrderStatusHistoryInterface
+     * @deprecated
+     * @see addCommentToStatusHistory
      */
     public function addStatusHistoryComment($comment, $status = false)
+    {
+        return $this->addCommentToStatusHistory($comment, $status, false);
+    }
+    
+    /**
+     * Add a comment to order status history.
+     *
+     * Different or default status may be specified.
+     *
+     * @param string $comment
+     * @param bool|string $status
+     * @param bool $isVisibleOnFront
+     * @return OrderStatusHistoryInterface
+     */
+    public function addCommentToStatusHistory($comment, $status = false, $isVisibleOnFront = false)
     {
         if (false === $status) {
             $status = $this->getStatus();
@@ -1029,6 +1092,8 @@ public function addStatusHistoryComment($comment, $status = false)
             $comment
         )->setEntityName(
             $this->entityType
+        )->setIsVisibleOnFront(
+            $isVisibleOnFront
         );
         $this->addStatusHistory($history);
         return $history;
@@ -1070,6 +1135,8 @@ public function place()
     }
 
     /**
+     * Hold order
+     *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -1215,6 +1282,8 @@ public function getShippingMethod($asObject = false)
     /*********************** ADDRESSES ***************************/
 
     /**
+     * Get addresses collection
+     *
      * @return Collection
      */
     public function getAddressesCollection()
@@ -1229,6 +1298,8 @@ public function getAddressesCollection()
     }
 
     /**
+     * Get address by id
+     *
      * @param mixed $addressId
      * @return false
      */
@@ -1243,6 +1314,8 @@ public function getAddressById($addressId)
     }
 
     /**
+     * Add address
+     *
      * @param \Magento\Sales\Model\Order\Address $address
      * @return $this
      */
@@ -1257,9 +1330,11 @@ public function addAddress(\Magento\Sales\Model\Order\Address $address)
     }
 
     /**
+     * Get items collection
+     *
      * @param array $filterByTypes
      * @param bool $nonChildrenOnly
-     * @return ImportCollection
+     * @return ItemCollection
      */
     public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false)
     {
@@ -1275,6 +1350,7 @@ public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false
         if ($this->getId()) {
             foreach ($collection as $item) {
                 $item->setOrder($this);
+                $this->productOption->add($item);
             }
         }
         return $collection;
@@ -1284,7 +1360,7 @@ public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false
      * Get random items collection without related children
      *
      * @param int $limit
-     * @return ImportCollection
+     * @return ItemCollection
      */
     public function getParentItemsRandomCollection($limit = 1)
     {
@@ -1296,11 +1372,14 @@ public function getParentItemsRandomCollection($limit = 1)
      *
      * @param int $limit
      * @param bool $nonChildrenOnly
-     * @return ImportCollection
+     * @return ItemCollection
      */
     protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
     {
-        $collection = $this->_orderItemCollectionFactory->create()->setOrderFilter($this)->setRandomOrder();
+        $collection = $this->_orderItemCollectionFactory->create()
+            ->setOrderFilter($this)
+            ->setRandomOrder()
+            ->setPageSize($limit);
 
         if ($nonChildrenOnly) {
             $collection->filterByParent();
@@ -1314,9 +1393,7 @@ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
             $products
         )->setVisibility(
             $this->_productVisibility->getVisibleInSiteIds()
-        )->addPriceData()->setPageSize(
-            $limit
-        )->load();
+        )->addPriceData()->load();
 
         foreach ($collection as $item) {
             $product = $productsCollection->getItemById($item->getProductId());
@@ -1329,6 +1406,8 @@ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
     }
 
     /**
+     * Get all items
+     *
      * @return \Magento\Sales\Model\Order\Item[]
      */
     public function getAllItems()
@@ -1343,6 +1422,8 @@ public function getAllItems()
     }
 
     /**
+     * Get all visible items
+     *
      * @return array
      */
     public function getAllVisibleItems()
@@ -1374,6 +1455,8 @@ public function getItemById($itemId)
     }
 
     /**
+     * Get item by quote item id
+     *
      * @param mixed $quoteItemId
      * @return  \Magento\Framework\DataObject|null
      */
@@ -1388,6 +1471,8 @@ public function getItemByQuoteItemId($quoteItemId)
     }
 
     /**
+     * Add item
+     *
      * @param \Magento\Sales\Model\Order\Item $item
      * @return $this
      */
@@ -1403,6 +1488,8 @@ public function addItem(\Magento\Sales\Model\Order\Item $item)
     /*********************** PAYMENTS ***************************/
 
     /**
+     * Get payments collection
+     *
      * @return PaymentCollection
      */
     public function getPaymentsCollection()
@@ -1417,6 +1504,8 @@ public function getPaymentsCollection()
     }
 
     /**
+     * Get all payments
+     *
      * @return array
      */
     public function getAllPayments()
@@ -1431,6 +1520,8 @@ public function getAllPayments()
     }
 
     /**
+     * Get payment by id
+     *
      * @param mixed $paymentId
      * @return Payment|false
      */
@@ -1445,7 +1536,7 @@ public function getPaymentById($paymentId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $payment = null)
     {
@@ -1512,6 +1603,8 @@ public function getVisibleStatusHistory()
     }
 
     /**
+     * Get status history by id
+     *
      * @param mixed $statusId
      * @return string|false
      */
@@ -1526,7 +1619,8 @@ public function getStatusHistoryById($statusId)
     }
 
     /**
-     * Set the order status history object and the order object to each other
+     * @inheritdoc
+     *
      * Adds the object to the status history collection, which is automatically saved when the order is saved.
      * See the entity_id attribute backend model.
      * Or the history record can be saved standalone after this.
@@ -1546,6 +1640,8 @@ public function addStatusHistory(\Magento\Sales\Model\Order\Status\History $hist
     }
 
     /**
+     * Get real order id
+     *
      * @return string
      */
     public function getRealOrderId()
@@ -1574,9 +1670,9 @@ public function getOrderCurrency()
     /**
      * Get formatted price value including order currency rate to order website currency
      *
-     * @param   float $price
-     * @param   bool  $addBrackets
-     * @return  string
+     * @param float $price
+     * @param bool $addBrackets
+     * @return string
      */
     public function formatPrice($price, $addBrackets = false)
     {
@@ -1584,6 +1680,8 @@ public function formatPrice($price, $addBrackets = false)
     }
 
     /**
+     * Format price precision
+     *
      * @param float $price
      * @param int $precision
      * @param bool $addBrackets
@@ -1597,8 +1695,8 @@ public function formatPricePrecision($price, $precision, $addBrackets = false)
     /**
      * Retrieve text formatted price value including order rate
      *
-     * @param   float $price
-     * @return  string
+     * @param float $price
+     * @return string
      */
     public function formatPriceTxt($price)
     {
@@ -1619,6 +1717,8 @@ public function getBaseCurrency()
     }
 
     /**
+     * Format base price
+     *
      * @param float $price
      * @return string
      */
@@ -1628,6 +1728,8 @@ public function formatBasePrice($price)
     }
 
     /**
+     * Format Base Price Precision
+     *
      * @param float $price
      * @param int $precision
      * @return string
@@ -1638,6 +1740,8 @@ public function formatBasePricePrecision($price, $precision)
     }
 
     /**
+     * Is currency different
+     *
      * @return bool
      */
     public function isCurrencyDifferent()
@@ -1670,6 +1774,8 @@ public function getBaseTotalDue()
     }
 
     /**
+     * Get data
+     *
      * @param string $key
      * @param null|string|int $index
      * @return mixed
@@ -1705,7 +1811,7 @@ public function getInvoiceCollection()
     }
 
     /**
-     * Set order invoices collection
+     * @inheritdoc
      *
      * @param InvoiceCollection $invoices
      * @return $this
@@ -1810,6 +1916,8 @@ public function getRelatedObjects()
     }
 
     /**
+     * Get customer name
+     *
      * @return string
      */
     public function getCustomerName()
@@ -1837,8 +1945,9 @@ public function addRelatedObject(\Magento\Framework\Model\AbstractModel $object)
     /**
      * Get formatted order created date in store timezone
      *
-     * @param   string $format date format type (short|medium|long|full)
-     * @return  string
+     * @param int $format date format type (\IntlDateFormatter::SHORT|\IntlDateFormatter::MEDIUM
+     * |\IntlDateFormatter::LONG|\IntlDateFormatter::FULL)
+     * @return string
      */
     public function getCreatedAtFormatted($format)
     {
@@ -1852,6 +1961,8 @@ public function getCreatedAtFormatted($format)
     }
 
     /**
+     * Get email customer note
+     *
      * @return string
      */
     public function getEmailCustomerNote()
@@ -1863,6 +1974,8 @@ public function getEmailCustomerNote()
     }
 
     /**
+     * Get store group name
+     *
      * @return string
      */
     public function getStoreGroupName()
@@ -1875,8 +1988,7 @@ public function getStoreGroupName()
     }
 
     /**
-     * Resets all data in object
-     * so after another load it will be complete new object
+     * Reset all data in object so after another load it will be complete new object.
      *
      * @return $this
      */
@@ -1900,6 +2012,8 @@ public function reset()
     }
 
     /**
+     * Get order is not virtual
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -1930,7 +2044,7 @@ public function isCanceled()
     }
 
     /**
-     * Returns increment id
+     * Return increment id
      *
      * @codeCoverageIgnore
      *
@@ -1942,6 +2056,8 @@ public function getIncrementId()
     }
 
     /**
+     * Get Items
+     *
      * @return \Magento\Sales\Api\Data\OrderItemInterface[]
      */
     public function getItems()
@@ -1956,7 +2072,7 @@ public function getItems()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function setItems($items)
@@ -1965,6 +2081,8 @@ public function setItems($items)
     }
 
     /**
+     * Get addresses
+     *
      * @return \Magento\Sales\Api\Data\OrderAddressInterface[]
      */
     public function getAddresses()
@@ -1979,6 +2097,8 @@ public function getAddresses()
     }
 
     /**
+     * Get status History
+     *
      * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[]|null
      */
     public function getStatusHistories()
@@ -1993,7 +2113,7 @@ public function getStatusHistories()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\OrderExtensionInterface|null
      */
@@ -2003,7 +2123,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes
      * @return $this
@@ -2016,7 +2136,7 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderExtensionInt
     //@codeCoverageIgnoreStart
 
     /**
-     * Returns adjustment_negative
+     * Return adjustment_negative
      *
      * @return float|null
      */
@@ -2026,7 +2146,7 @@ public function getAdjustmentNegative()
     }
 
     /**
-     * Returns adjustment_positive
+     * Return adjustment_positive
      *
      * @return float|null
      */
@@ -2036,7 +2156,9 @@ public function getAdjustmentPositive()
     }
 
     /**
-     * Returns applied_rule_ids
+     * Return applied_rule_ids
+     *
+     * Rules are comma separated if there are more than one.
      *
      * @return string|null
      */
@@ -2046,7 +2168,7 @@ public function getAppliedRuleIds()
     }
 
     /**
-     * Returns base_adjustment_negative
+     * Return base_adjustment_negative
      *
      * @return float|null
      */
@@ -2056,7 +2178,7 @@ public function getBaseAdjustmentNegative()
     }
 
     /**
-     * Returns base_adjustment_positive
+     * Return base_adjustment_positive
      *
      * @return float|null
      */
@@ -2066,7 +2188,7 @@ public function getBaseAdjustmentPositive()
     }
 
     /**
-     * Returns base_currency_code
+     * Return base_currency_code
      *
      * @return string|null
      */
@@ -2076,7 +2198,7 @@ public function getBaseCurrencyCode()
     }
 
     /**
-     * Returns base_discount_amount
+     * Return base_discount_amount
      *
      * @return float|null
      */
@@ -2086,7 +2208,7 @@ public function getBaseDiscountAmount()
     }
 
     /**
-     * Returns base_discount_canceled
+     * Return base_discount_canceled
      *
      * @return float|null
      */
@@ -2096,7 +2218,7 @@ public function getBaseDiscountCanceled()
     }
 
     /**
-     * Returns base_discount_invoiced
+     * Return base_discount_invoiced
      *
      * @return float|null
      */
@@ -2106,7 +2228,7 @@ public function getBaseDiscountInvoiced()
     }
 
     /**
-     * Returns base_discount_refunded
+     * Return base_discount_refunded
      *
      * @return float|null
      */
@@ -2116,7 +2238,7 @@ public function getBaseDiscountRefunded()
     }
 
     /**
-     * Returns base_grand_total
+     * Return base_grand_total
      *
      * @return float
      */
@@ -2126,7 +2248,7 @@ public function getBaseGrandTotal()
     }
 
     /**
-     * Returns base_discount_tax_compensation_amount
+     * Return base_discount_tax_compensation_amount
      *
      * @return float|null
      */
@@ -2136,7 +2258,7 @@ public function getBaseDiscountTaxCompensationAmount()
     }
 
     /**
-     * Returns base_discount_tax_compensation_invoiced
+     * Return base_discount_tax_compensation_invoiced
      *
      * @return float|null
      */
@@ -2146,7 +2268,7 @@ public function getBaseDiscountTaxCompensationInvoiced()
     }
 
     /**
-     * Returns base_discount_tax_compensation_refunded
+     * Return base_discount_tax_compensation_refunded
      *
      * @return float|null
      */
@@ -2156,7 +2278,7 @@ public function getBaseDiscountTaxCompensationRefunded()
     }
 
     /**
-     * Returns base_shipping_amount
+     * Return base_shipping_amount
      *
      * @return float|null
      */
@@ -2166,7 +2288,7 @@ public function getBaseShippingAmount()
     }
 
     /**
-     * Returns base_shipping_canceled
+     * Return base_shipping_canceled
      *
      * @return float|null
      */
@@ -2176,7 +2298,7 @@ public function getBaseShippingCanceled()
     }
 
     /**
-     * Returns base_shipping_discount_amount
+     * Return base_shipping_discount_amount
      *
      * @return float|null
      */
@@ -2186,7 +2308,7 @@ public function getBaseShippingDiscountAmount()
     }
 
     /**
-     * Returns base_shipping_discount_tax_compensation_amnt
+     * Return base_shipping_discount_tax_compensation_amnt
      *
      * @return float|null
      */
@@ -2196,7 +2318,7 @@ public function getBaseShippingDiscountTaxCompensationAmnt()
     }
 
     /**
-     * Returns base_shipping_incl_tax
+     * Return base_shipping_incl_tax
      *
      * @return float|null
      */
@@ -2206,7 +2328,7 @@ public function getBaseShippingInclTax()
     }
 
     /**
-     * Returns base_shipping_invoiced
+     * Return base_shipping_invoiced
      *
      * @return float|null
      */
@@ -2216,7 +2338,7 @@ public function getBaseShippingInvoiced()
     }
 
     /**
-     * Returns base_shipping_refunded
+     * Return base_shipping_refunded
      *
      * @return float|null
      */
@@ -2226,7 +2348,7 @@ public function getBaseShippingRefunded()
     }
 
     /**
-     * Returns base_shipping_tax_amount
+     * Return base_shipping_tax_amount
      *
      * @return float|null
      */
@@ -2236,7 +2358,7 @@ public function getBaseShippingTaxAmount()
     }
 
     /**
-     * Returns base_shipping_tax_refunded
+     * Return base_shipping_tax_refunded
      *
      * @return float|null
      */
@@ -2246,7 +2368,7 @@ public function getBaseShippingTaxRefunded()
     }
 
     /**
-     * Returns base_subtotal
+     * Return base_subtotal
      *
      * @return float|null
      */
@@ -2256,7 +2378,7 @@ public function getBaseSubtotal()
     }
 
     /**
-     * Returns base_subtotal_canceled
+     * Return base_subtotal_canceled
      *
      * @return float|null
      */
@@ -2266,7 +2388,7 @@ public function getBaseSubtotalCanceled()
     }
 
     /**
-     * Returns base_subtotal_incl_tax
+     * Return base_subtotal_incl_tax
      *
      * @return float|null
      */
@@ -2276,7 +2398,7 @@ public function getBaseSubtotalInclTax()
     }
 
     /**
-     * Returns base_subtotal_invoiced
+     * Return base_subtotal_invoiced
      *
      * @return float|null
      */
@@ -2286,7 +2408,7 @@ public function getBaseSubtotalInvoiced()
     }
 
     /**
-     * Returns base_subtotal_refunded
+     * Return base_subtotal_refunded
      *
      * @return float|null
      */
@@ -2296,7 +2418,7 @@ public function getBaseSubtotalRefunded()
     }
 
     /**
-     * Returns base_tax_amount
+     * Return base_tax_amount
      *
      * @return float|null
      */
@@ -2306,7 +2428,7 @@ public function getBaseTaxAmount()
     }
 
     /**
-     * Returns base_tax_canceled
+     * Return base_tax_canceled
      *
      * @return float|null
      */
@@ -2316,7 +2438,7 @@ public function getBaseTaxCanceled()
     }
 
     /**
-     * Returns base_tax_invoiced
+     * Return base_tax_invoiced
      *
      * @return float|null
      */
@@ -2326,7 +2448,7 @@ public function getBaseTaxInvoiced()
     }
 
     /**
-     * Returns base_tax_refunded
+     * Return base_tax_refunded
      *
      * @return float|null
      */
@@ -2336,7 +2458,7 @@ public function getBaseTaxRefunded()
     }
 
     /**
-     * Returns base_total_canceled
+     * Return base_total_canceled
      *
      * @return float|null
      */
@@ -2346,7 +2468,7 @@ public function getBaseTotalCanceled()
     }
 
     /**
-     * Returns base_total_invoiced
+     * Return base_total_invoiced
      *
      * @return float|null
      */
@@ -2356,7 +2478,7 @@ public function getBaseTotalInvoiced()
     }
 
     /**
-     * Returns base_total_invoiced_cost
+     * Return base_total_invoiced_cost
      *
      * @return float|null
      */
@@ -2366,7 +2488,7 @@ public function getBaseTotalInvoicedCost()
     }
 
     /**
-     * Returns base_total_offline_refunded
+     * Return base_total_offline_refunded
      *
      * @return float|null
      */
@@ -2376,7 +2498,7 @@ public function getBaseTotalOfflineRefunded()
     }
 
     /**
-     * Returns base_total_online_refunded
+     * Return base_total_online_refunded
      *
      * @return float|null
      */
@@ -2386,7 +2508,7 @@ public function getBaseTotalOnlineRefunded()
     }
 
     /**
-     * Returns base_total_paid
+     * Return base_total_paid
      *
      * @return float|null
      */
@@ -2396,7 +2518,7 @@ public function getBaseTotalPaid()
     }
 
     /**
-     * Returns base_total_qty_ordered
+     * Return base_total_qty_ordered
      *
      * @return float|null
      */
@@ -2406,7 +2528,7 @@ public function getBaseTotalQtyOrdered()
     }
 
     /**
-     * Returns base_total_refunded
+     * Return base_total_refunded
      *
      * @return float|null
      */
@@ -2416,7 +2538,7 @@ public function getBaseTotalRefunded()
     }
 
     /**
-     * Returns base_to_global_rate
+     * Return base_to_global_rate
      *
      * @return float|null
      */
@@ -2426,7 +2548,7 @@ public function getBaseToGlobalRate()
     }
 
     /**
-     * Returns base_to_order_rate
+     * Return base_to_order_rate
      *
      * @return float|null
      */
@@ -2436,7 +2558,7 @@ public function getBaseToOrderRate()
     }
 
     /**
-     * Returns billing_address_id
+     * Return billing_address_id
      *
      * @return int|null
      */
@@ -2446,7 +2568,7 @@ public function getBillingAddressId()
     }
 
     /**
-     * Returns can_ship_partially
+     * Return can_ship_partially
      *
      * @return int|null
      */
@@ -2456,7 +2578,7 @@ public function getCanShipPartially()
     }
 
     /**
-     * Returns can_ship_partially_item
+     * Return can_ship_partially_item
      *
      * @return int|null
      */
@@ -2466,7 +2588,7 @@ public function getCanShipPartiallyItem()
     }
 
     /**
-     * Returns coupon_code
+     * Return coupon_code
      *
      * @return string|null
      */
@@ -2476,7 +2598,7 @@ public function getCouponCode()
     }
 
     /**
-     * Returns created_at
+     * Return created_at
      *
      * @return string|null
      */
@@ -2486,7 +2608,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -2494,7 +2616,7 @@ public function setCreatedAt($createdAt)
     }
 
     /**
-     * Returns customer_dob
+     * Return customer_dob
      *
      * @return string|null
      */
@@ -2504,7 +2626,7 @@ public function getCustomerDob()
     }
 
     /**
-     * Returns customer_email
+     * Return customer_email
      *
      * @return string
      */
@@ -2514,7 +2636,7 @@ public function getCustomerEmail()
     }
 
     /**
-     * Returns customer_firstname
+     * Return customer_firstname
      *
      * @return string|null
      */
@@ -2524,7 +2646,7 @@ public function getCustomerFirstname()
     }
 
     /**
-     * Returns customer_gender
+     * Return customer_gender
      *
      * @return int|null
      */
@@ -2534,7 +2656,7 @@ public function getCustomerGender()
     }
 
     /**
-     * Returns customer_group_id
+     * Return customer_group_id
      *
      * @return int|null
      */
@@ -2544,7 +2666,7 @@ public function getCustomerGroupId()
     }
 
     /**
-     * Returns customer_id
+     * Return customer_id
      *
      * @return int|null
      */
@@ -2554,7 +2676,7 @@ public function getCustomerId()
     }
 
     /**
-     * Returns customer_is_guest
+     * Return customer_is_guest
      *
      * @return int|null
      */
@@ -2564,7 +2686,7 @@ public function getCustomerIsGuest()
     }
 
     /**
-     * Returns customer_lastname
+     * Return customer_lastname
      *
      * @return string|null
      */
@@ -2574,7 +2696,7 @@ public function getCustomerLastname()
     }
 
     /**
-     * Returns customer_middlename
+     * Return customer_middlename
      *
      * @return string|null
      */
@@ -2584,7 +2706,7 @@ public function getCustomerMiddlename()
     }
 
     /**
-     * Returns customer_note
+     * Return customer_note
      *
      * @return string|null
      */
@@ -2594,7 +2716,7 @@ public function getCustomerNote()
     }
 
     /**
-     * Returns customer_note_notify
+     * Return customer_note_notify
      *
      * @return int|null
      */
@@ -2604,7 +2726,7 @@ public function getCustomerNoteNotify()
     }
 
     /**
-     * Returns customer_prefix
+     * Return customer_prefix
      *
      * @return string|null
      */
@@ -2614,7 +2736,7 @@ public function getCustomerPrefix()
     }
 
     /**
-     * Returns customer_suffix
+     * Return customer_suffix
      *
      * @return string|null
      */
@@ -2624,7 +2746,7 @@ public function getCustomerSuffix()
     }
 
     /**
-     * Returns customer_taxvat
+     * Return customer_taxvat
      *
      * @return string|null
      */
@@ -2634,7 +2756,7 @@ public function getCustomerTaxvat()
     }
 
     /**
-     * Returns discount_amount
+     * Return discount_amount
      *
      * @return float|null
      */
@@ -2644,7 +2766,7 @@ public function getDiscountAmount()
     }
 
     /**
-     * Returns discount_canceled
+     * Return discount_canceled
      *
      * @return float|null
      */
@@ -2654,7 +2776,7 @@ public function getDiscountCanceled()
     }
 
     /**
-     * Returns discount_description
+     * Return discount_description
      *
      * @return string|null
      */
@@ -2664,7 +2786,7 @@ public function getDiscountDescription()
     }
 
     /**
-     * Returns discount_invoiced
+     * Return discount_invoiced
      *
      * @return float|null
      */
@@ -2674,7 +2796,7 @@ public function getDiscountInvoiced()
     }
 
     /**
-     * Returns discount_refunded
+     * Return discount_refunded
      *
      * @return float|null
      */
@@ -2684,7 +2806,7 @@ public function getDiscountRefunded()
     }
 
     /**
-     * Returns edit_increment
+     * Return edit_increment
      *
      * @return int|null
      */
@@ -2694,7 +2816,7 @@ public function getEditIncrement()
     }
 
     /**
-     * Returns email_sent
+     * Return email_sent
      *
      * @return int|null
      */
@@ -2704,7 +2826,7 @@ public function getEmailSent()
     }
 
     /**
-     * Returns ext_customer_id
+     * Return ext_customer_id
      *
      * @return string|null
      */
@@ -2714,7 +2836,7 @@ public function getExtCustomerId()
     }
 
     /**
-     * Returns ext_order_id
+     * Return ext_order_id
      *
      * @return string|null
      */
@@ -2724,7 +2846,7 @@ public function getExtOrderId()
     }
 
     /**
-     * Returns forced_shipment_with_invoice
+     * Return forced_shipment_with_invoice
      *
      * @return int|null
      */
@@ -2734,7 +2856,7 @@ public function getForcedShipmentWithInvoice()
     }
 
     /**
-     * Returns global_currency_code
+     * Return global_currency_code
      *
      * @return string|null
      */
@@ -2744,7 +2866,7 @@ public function getGlobalCurrencyCode()
     }
 
     /**
-     * Returns grand_total
+     * Return grand_total
      *
      * @return float
      */
@@ -2754,7 +2876,7 @@ public function getGrandTotal()
     }
 
     /**
-     * Returns discount_tax_compensation_amount
+     * Return discount_tax_compensation_amount
      *
      * @return float|null
      */
@@ -2764,7 +2886,7 @@ public function getDiscountTaxCompensationAmount()
     }
 
     /**
-     * Returns discount_tax_compensation_invoiced
+     * Return discount_tax_compensation_invoiced
      *
      * @return float|null
      */
@@ -2774,7 +2896,7 @@ public function getDiscountTaxCompensationInvoiced()
     }
 
     /**
-     * Returns discount_tax_compensation_refunded
+     * Return discount_tax_compensation_refunded
      *
      * @return float|null
      */
@@ -2784,7 +2906,7 @@ public function getDiscountTaxCompensationRefunded()
     }
 
     /**
-     * Returns hold_before_state
+     * Return hold_before_state
      *
      * @return string|null
      */
@@ -2794,7 +2916,7 @@ public function getHoldBeforeState()
     }
 
     /**
-     * Returns hold_before_status
+     * Return hold_before_status
      *
      * @return string|null
      */
@@ -2804,7 +2926,7 @@ public function getHoldBeforeStatus()
     }
 
     /**
-     * Returns is_virtual
+     * Return is_virtual
      *
      * @return int|null
      */
@@ -2814,7 +2936,7 @@ public function getIsVirtual()
     }
 
     /**
-     * Returns order_currency_code
+     * Return order_currency_code
      *
      * @return string|null
      */
@@ -2824,7 +2946,7 @@ public function getOrderCurrencyCode()
     }
 
     /**
-     * Returns original_increment_id
+     * Return original_increment_id
      *
      * @return string|null
      */
@@ -2834,7 +2956,7 @@ public function getOriginalIncrementId()
     }
 
     /**
-     * Returns payment_authorization_amount
+     * Return payment_authorization_amount
      *
      * @return float|null
      */
@@ -2844,7 +2966,7 @@ public function getPaymentAuthorizationAmount()
     }
 
     /**
-     * Returns payment_auth_expiration
+     * Return payment_auth_expiration
      *
      * @return int|null
      */
@@ -2854,7 +2976,7 @@ public function getPaymentAuthExpiration()
     }
 
     /**
-     * Returns protect_code
+     * Return protect_code
      *
      * @return string|null
      */
@@ -2864,7 +2986,7 @@ public function getProtectCode()
     }
 
     /**
-     * Returns quote_address_id
+     * Return quote_address_id
      *
      * @return int|null
      */
@@ -2874,7 +2996,7 @@ public function getQuoteAddressId()
     }
 
     /**
-     * Returns quote_id
+     * Return quote_id
      *
      * @return int|null
      */
@@ -2884,7 +3006,7 @@ public function getQuoteId()
     }
 
     /**
-     * Returns relation_child_id
+     * Return relation_child_id
      *
      * @return string|null
      */
@@ -2894,7 +3016,7 @@ public function getRelationChildId()
     }
 
     /**
-     * Returns relation_child_real_id
+     * Return relation_child_real_id
      *
      * @return string|null
      */
@@ -2904,7 +3026,7 @@ public function getRelationChildRealId()
     }
 
     /**
-     * Returns relation_parent_id
+     * Return relation_parent_id
      *
      * @return string|null
      */
@@ -2914,7 +3036,7 @@ public function getRelationParentId()
     }
 
     /**
-     * Returns relation_parent_real_id
+     * Return relation_parent_real_id
      *
      * @return string|null
      */
@@ -2924,7 +3046,7 @@ public function getRelationParentRealId()
     }
 
     /**
-     * Returns remote_ip
+     * Return remote_ip
      *
      * @return string|null
      */
@@ -2934,7 +3056,7 @@ public function getRemoteIp()
     }
 
     /**
-     * Returns shipping_amount
+     * Return shipping_amount
      *
      * @return float|null
      */
@@ -2944,7 +3066,7 @@ public function getShippingAmount()
     }
 
     /**
-     * Returns shipping_canceled
+     * Return shipping_canceled
      *
      * @return float|null
      */
@@ -2954,7 +3076,7 @@ public function getShippingCanceled()
     }
 
     /**
-     * Returns shipping_description
+     * Return shipping_description
      *
      * @return string|null
      */
@@ -2964,7 +3086,7 @@ public function getShippingDescription()
     }
 
     /**
-     * Returns shipping_discount_amount
+     * Return shipping_discount_amount
      *
      * @return float|null
      */
@@ -2974,7 +3096,7 @@ public function getShippingDiscountAmount()
     }
 
     /**
-     * Returns shipping_discount_tax_compensation_amount
+     * Return shipping_discount_tax_compensation_amount
      *
      * @return float|null
      */
@@ -2984,7 +3106,7 @@ public function getShippingDiscountTaxCompensationAmount()
     }
 
     /**
-     * Returns shipping_incl_tax
+     * Return shipping_incl_tax
      *
      * @return float|null
      */
@@ -2994,7 +3116,7 @@ public function getShippingInclTax()
     }
 
     /**
-     * Returns shipping_invoiced
+     * Return shipping_invoiced
      *
      * @return float|null
      */
@@ -3004,7 +3126,7 @@ public function getShippingInvoiced()
     }
 
     /**
-     * Returns shipping_refunded
+     * Return shipping_refunded
      *
      * @return float|null
      */
@@ -3014,7 +3136,7 @@ public function getShippingRefunded()
     }
 
     /**
-     * Returns shipping_tax_amount
+     * Return shipping_tax_amount
      *
      * @return float|null
      */
@@ -3024,7 +3146,7 @@ public function getShippingTaxAmount()
     }
 
     /**
-     * Returns shipping_tax_refunded
+     * Return shipping_tax_refunded
      *
      * @return float|null
      */
@@ -3034,7 +3156,7 @@ public function getShippingTaxRefunded()
     }
 
     /**
-     * Returns state
+     * Return state
      *
      * @return string|null
      */
@@ -3044,7 +3166,7 @@ public function getState()
     }
 
     /**
-     * Returns status
+     * Return status
      *
      * @return string|null
      */
@@ -3054,7 +3176,7 @@ public function getStatus()
     }
 
     /**
-     * Returns store_currency_code
+     * Return store_currency_code
      *
      * @return string|null
      */
@@ -3064,7 +3186,7 @@ public function getStoreCurrencyCode()
     }
 
     /**
-     * Returns store_id
+     * Return store_id
      *
      * @return int|null
      */
@@ -3074,7 +3196,7 @@ public function getStoreId()
     }
 
     /**
-     * Returns store_name
+     * Return store_name
      *
      * @return string|null
      */
@@ -3084,7 +3206,7 @@ public function getStoreName()
     }
 
     /**
-     * Returns store_to_base_rate
+     * Return store_to_base_rate
      *
      * @return float|null
      */
@@ -3094,7 +3216,7 @@ public function getStoreToBaseRate()
     }
 
     /**
-     * Returns store_to_order_rate
+     * Return store_to_order_rate
      *
      * @return float|null
      */
@@ -3104,7 +3226,7 @@ public function getStoreToOrderRate()
     }
 
     /**
-     * Returns subtotal
+     * Return subtotal
      *
      * @return float|null
      */
@@ -3114,7 +3236,7 @@ public function getSubtotal()
     }
 
     /**
-     * Returns subtotal_canceled
+     * Return subtotal_canceled
      *
      * @return float|null
      */
@@ -3124,7 +3246,7 @@ public function getSubtotalCanceled()
     }
 
     /**
-     * Returns subtotal_incl_tax
+     * Return subtotal_incl_tax
      *
      * @return float|null
      */
@@ -3134,7 +3256,7 @@ public function getSubtotalInclTax()
     }
 
     /**
-     * Returns subtotal_invoiced
+     * Return subtotal_invoiced
      *
      * @return float|null
      */
@@ -3144,7 +3266,7 @@ public function getSubtotalInvoiced()
     }
 
     /**
-     * Returns subtotal_refunded
+     * Return subtotal_refunded
      *
      * @return float|null
      */
@@ -3154,7 +3276,7 @@ public function getSubtotalRefunded()
     }
 
     /**
-     * Returns tax_amount
+     * Return tax_amount
      *
      * @return float|null
      */
@@ -3164,7 +3286,7 @@ public function getTaxAmount()
     }
 
     /**
-     * Returns tax_canceled
+     * Return tax_canceled
      *
      * @return float|null
      */
@@ -3174,7 +3296,7 @@ public function getTaxCanceled()
     }
 
     /**
-     * Returns tax_invoiced
+     * Return tax_invoiced
      *
      * @return float|null
      */
@@ -3184,7 +3306,7 @@ public function getTaxInvoiced()
     }
 
     /**
-     * Returns tax_refunded
+     * Return tax_refunded
      *
      * @return float|null
      */
@@ -3194,7 +3316,7 @@ public function getTaxRefunded()
     }
 
     /**
-     * Returns total_canceled
+     * Return total_canceled
      *
      * @return float|null
      */
@@ -3204,7 +3326,7 @@ public function getTotalCanceled()
     }
 
     /**
-     * Returns total_invoiced
+     * Return total_invoiced
      *
      * @return float|null
      */
@@ -3214,7 +3336,7 @@ public function getTotalInvoiced()
     }
 
     /**
-     * Returns total_item_count
+     * Return total_item_count
      *
      * @return int|null
      */
@@ -3224,7 +3346,7 @@ public function getTotalItemCount()
     }
 
     /**
-     * Returns total_offline_refunded
+     * Return total_offline_refunded
      *
      * @return float|null
      */
@@ -3234,7 +3356,7 @@ public function getTotalOfflineRefunded()
     }
 
     /**
-     * Returns total_online_refunded
+     * Return total_online_refunded
      *
      * @return float|null
      */
@@ -3244,7 +3366,7 @@ public function getTotalOnlineRefunded()
     }
 
     /**
-     * Returns total_paid
+     * Return total_paid
      *
      * @return float|null
      */
@@ -3254,7 +3376,7 @@ public function getTotalPaid()
     }
 
     /**
-     * Returns total_qty_ordered
+     * Return total_qty_ordered
      *
      * @return float|null
      */
@@ -3264,7 +3386,7 @@ public function getTotalQtyOrdered()
     }
 
     /**
-     * Returns total_refunded
+     * Return total_refunded
      *
      * @return float|null
      */
@@ -3274,7 +3396,7 @@ public function getTotalRefunded()
     }
 
     /**
-     * Returns updated_at
+     * Return updated_at
      *
      * @return string|null
      */
@@ -3284,7 +3406,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * Returns weight
+     * Return weight
      *
      * @return float|null
      */
@@ -3294,7 +3416,7 @@ public function getWeight()
     }
 
     /**
-     * Returns x_forwarded_for
+     * Return x_forwarded_for
      *
      * @return string|null
      */
@@ -3304,7 +3426,7 @@ public function getXForwardedFor()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStatusHistories(array $statusHistories = null)
     {
@@ -3312,7 +3434,7 @@ public function setStatusHistories(array $statusHistories = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStatus($status)
     {
@@ -3320,7 +3442,7 @@ public function setStatus($status)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCouponCode($code)
     {
@@ -3328,7 +3450,7 @@ public function setCouponCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProtectCode($code)
     {
@@ -3336,7 +3458,7 @@ public function setProtectCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingDescription($description)
     {
@@ -3344,7 +3466,7 @@ public function setShippingDescription($description)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsVirtual($isVirtual)
     {
@@ -3352,7 +3474,7 @@ public function setIsVirtual($isVirtual)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($id)
     {
@@ -3360,7 +3482,7 @@ public function setStoreId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($id)
     {
@@ -3368,7 +3490,7 @@ public function setCustomerId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -3376,7 +3498,7 @@ public function setBaseDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountCanceled($baseDiscountCanceled)
     {
@@ -3384,7 +3506,7 @@ public function setBaseDiscountCanceled($baseDiscountCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountInvoiced($baseDiscountInvoiced)
     {
@@ -3392,7 +3514,7 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountRefunded($baseDiscountRefunded)
     {
@@ -3400,7 +3522,7 @@ public function setBaseDiscountRefunded($baseDiscountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseGrandTotal($amount)
     {
@@ -3408,7 +3530,7 @@ public function setBaseGrandTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingAmount($amount)
     {
@@ -3416,7 +3538,7 @@ public function setBaseShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingCanceled($baseShippingCanceled)
     {
@@ -3424,7 +3546,7 @@ public function setBaseShippingCanceled($baseShippingCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingInvoiced($baseShippingInvoiced)
     {
@@ -3432,7 +3554,7 @@ public function setBaseShippingInvoiced($baseShippingInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingRefunded($baseShippingRefunded)
     {
@@ -3440,7 +3562,7 @@ public function setBaseShippingRefunded($baseShippingRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -3448,7 +3570,7 @@ public function setBaseShippingTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
     {
@@ -3456,7 +3578,7 @@ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotal($amount)
     {
@@ -3464,7 +3586,7 @@ public function setBaseSubtotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotalCanceled($baseSubtotalCanceled)
     {
@@ -3472,7 +3594,7 @@ public function setBaseSubtotalCanceled($baseSubtotalCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotalInvoiced($baseSubtotalInvoiced)
     {
@@ -3480,7 +3602,7 @@ public function setBaseSubtotalInvoiced($baseSubtotalInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotalRefunded($baseSubtotalRefunded)
     {
@@ -3488,7 +3610,7 @@ public function setBaseSubtotalRefunded($baseSubtotalRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxAmount($amount)
     {
@@ -3496,7 +3618,7 @@ public function setBaseTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxCanceled($baseTaxCanceled)
     {
@@ -3504,7 +3626,7 @@ public function setBaseTaxCanceled($baseTaxCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxInvoiced($baseTaxInvoiced)
     {
@@ -3512,7 +3634,7 @@ public function setBaseTaxInvoiced($baseTaxInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxRefunded($baseTaxRefunded)
     {
@@ -3520,7 +3642,7 @@ public function setBaseTaxRefunded($baseTaxRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseToGlobalRate($rate)
     {
@@ -3528,7 +3650,7 @@ public function setBaseToGlobalRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseToOrderRate($rate)
     {
@@ -3536,7 +3658,7 @@ public function setBaseToOrderRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalCanceled($baseTotalCanceled)
     {
@@ -3544,7 +3666,7 @@ public function setBaseTotalCanceled($baseTotalCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalInvoiced($baseTotalInvoiced)
     {
@@ -3552,7 +3674,7 @@ public function setBaseTotalInvoiced($baseTotalInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalInvoicedCost($baseTotalInvoicedCost)
     {
@@ -3560,7 +3682,7 @@ public function setBaseTotalInvoicedCost($baseTotalInvoicedCost)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded)
     {
@@ -3568,7 +3690,7 @@ public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded)
     {
@@ -3576,7 +3698,7 @@ public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalPaid($baseTotalPaid)
     {
@@ -3584,7 +3706,7 @@ public function setBaseTotalPaid($baseTotalPaid)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalQtyOrdered($baseTotalQtyOrdered)
     {
@@ -3592,7 +3714,7 @@ public function setBaseTotalQtyOrdered($baseTotalQtyOrdered)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalRefunded($baseTotalRefunded)
     {
@@ -3600,7 +3722,7 @@ public function setBaseTotalRefunded($baseTotalRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountAmount($amount)
     {
@@ -3608,7 +3730,7 @@ public function setDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountCanceled($discountCanceled)
     {
@@ -3616,7 +3738,7 @@ public function setDiscountCanceled($discountCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountInvoiced($discountInvoiced)
     {
@@ -3624,7 +3746,7 @@ public function setDiscountInvoiced($discountInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountRefunded($discountRefunded)
     {
@@ -3632,7 +3754,7 @@ public function setDiscountRefunded($discountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGrandTotal($amount)
     {
@@ -3640,7 +3762,7 @@ public function setGrandTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingAmount($amount)
     {
@@ -3648,7 +3770,7 @@ public function setShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingCanceled($shippingCanceled)
     {
@@ -3656,7 +3778,7 @@ public function setShippingCanceled($shippingCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingInvoiced($shippingInvoiced)
     {
@@ -3664,7 +3786,7 @@ public function setShippingInvoiced($shippingInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingRefunded($shippingRefunded)
     {
@@ -3672,7 +3794,7 @@ public function setShippingRefunded($shippingRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingTaxAmount($amount)
     {
@@ -3680,7 +3802,7 @@ public function setShippingTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingTaxRefunded($shippingTaxRefunded)
     {
@@ -3688,7 +3810,7 @@ public function setShippingTaxRefunded($shippingTaxRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreToBaseRate($rate)
     {
@@ -3696,7 +3818,7 @@ public function setStoreToBaseRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreToOrderRate($rate)
     {
@@ -3704,7 +3826,7 @@ public function setStoreToOrderRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotal($amount)
     {
@@ -3712,7 +3834,7 @@ public function setSubtotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotalCanceled($subtotalCanceled)
     {
@@ -3720,7 +3842,7 @@ public function setSubtotalCanceled($subtotalCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotalInvoiced($subtotalInvoiced)
     {
@@ -3728,7 +3850,7 @@ public function setSubtotalInvoiced($subtotalInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotalRefunded($subtotalRefunded)
     {
@@ -3736,7 +3858,7 @@ public function setSubtotalRefunded($subtotalRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxAmount($amount)
     {
@@ -3744,7 +3866,7 @@ public function setTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxCanceled($taxCanceled)
     {
@@ -3752,7 +3874,7 @@ public function setTaxCanceled($taxCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxInvoiced($taxInvoiced)
     {
@@ -3760,7 +3882,7 @@ public function setTaxInvoiced($taxInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxRefunded($taxRefunded)
     {
@@ -3768,7 +3890,7 @@ public function setTaxRefunded($taxRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalCanceled($totalCanceled)
     {
@@ -3776,7 +3898,7 @@ public function setTotalCanceled($totalCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalInvoiced($totalInvoiced)
     {
@@ -3784,7 +3906,7 @@ public function setTotalInvoiced($totalInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalOfflineRefunded($totalOfflineRefunded)
     {
@@ -3792,7 +3914,7 @@ public function setTotalOfflineRefunded($totalOfflineRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalOnlineRefunded($totalOnlineRefunded)
     {
@@ -3800,7 +3922,7 @@ public function setTotalOnlineRefunded($totalOnlineRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalPaid($totalPaid)
     {
@@ -3808,7 +3930,7 @@ public function setTotalPaid($totalPaid)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalQtyOrdered($totalQtyOrdered)
     {
@@ -3816,7 +3938,7 @@ public function setTotalQtyOrdered($totalQtyOrdered)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalRefunded($totalRefunded)
     {
@@ -3824,7 +3946,7 @@ public function setTotalRefunded($totalRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCanShipPartially($flag)
     {
@@ -3832,7 +3954,7 @@ public function setCanShipPartially($flag)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCanShipPartiallyItem($flag)
     {
@@ -3840,7 +3962,7 @@ public function setCanShipPartiallyItem($flag)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerIsGuest($customerIsGuest)
     {
@@ -3848,7 +3970,7 @@ public function setCustomerIsGuest($customerIsGuest)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerNoteNotify($customerNoteNotify)
     {
@@ -3856,7 +3978,7 @@ public function setCustomerNoteNotify($customerNoteNotify)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBillingAddressId($id)
     {
@@ -3864,7 +3986,7 @@ public function setBillingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerGroupId($id)
     {
@@ -3872,7 +3994,7 @@ public function setCustomerGroupId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEditIncrement($editIncrement)
     {
@@ -3880,7 +4002,7 @@ public function setEditIncrement($editIncrement)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmailSent($emailSent)
     {
@@ -3888,7 +4010,7 @@ public function setEmailSent($emailSent)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice)
     {
@@ -3896,7 +4018,7 @@ public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPaymentAuthExpiration($paymentAuthExpiration)
     {
@@ -3904,7 +4026,7 @@ public function setPaymentAuthExpiration($paymentAuthExpiration)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQuoteAddressId($id)
     {
@@ -3912,7 +4034,7 @@ public function setQuoteAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQuoteId($id)
     {
@@ -3920,7 +4042,7 @@ public function setQuoteId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAdjustmentNegative($adjustmentNegative)
     {
@@ -3928,7 +4050,7 @@ public function setAdjustmentNegative($adjustmentNegative)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAdjustmentPositive($adjustmentPositive)
     {
@@ -3936,7 +4058,7 @@ public function setAdjustmentPositive($adjustmentPositive)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAdjustmentNegative($baseAdjustmentNegative)
     {
@@ -3944,7 +4066,7 @@ public function setBaseAdjustmentNegative($baseAdjustmentNegative)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAdjustmentPositive($baseAdjustmentPositive)
     {
@@ -3952,7 +4074,7 @@ public function setBaseAdjustmentPositive($baseAdjustmentPositive)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingDiscountAmount($amount)
     {
@@ -3960,7 +4082,7 @@ public function setBaseShippingDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotalInclTax($amount)
     {
@@ -3968,7 +4090,7 @@ public function setBaseSubtotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalDue($baseTotalDue)
     {
@@ -3976,7 +4098,7 @@ public function setBaseTotalDue($baseTotalDue)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPaymentAuthorizationAmount($amount)
     {
@@ -3984,7 +4106,7 @@ public function setPaymentAuthorizationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingDiscountAmount($amount)
     {
@@ -3992,7 +4114,7 @@ public function setShippingDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotalInclTax($amount)
     {
@@ -4000,7 +4122,7 @@ public function setSubtotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalDue($totalDue)
     {
@@ -4008,7 +4130,7 @@ public function setTotalDue($totalDue)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeight($weight)
     {
@@ -4016,7 +4138,7 @@ public function setWeight($weight)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerDob($customerDob)
     {
@@ -4024,7 +4146,7 @@ public function setCustomerDob($customerDob)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIncrementId($id)
     {
@@ -4032,7 +4154,7 @@ public function setIncrementId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAppliedRuleIds($appliedRuleIds)
     {
@@ -4040,7 +4162,7 @@ public function setAppliedRuleIds($appliedRuleIds)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseCurrencyCode($code)
     {
@@ -4048,7 +4170,7 @@ public function setBaseCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerEmail($customerEmail)
     {
@@ -4056,7 +4178,7 @@ public function setCustomerEmail($customerEmail)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerFirstname($customerFirstname)
     {
@@ -4064,7 +4186,7 @@ public function setCustomerFirstname($customerFirstname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerLastname($customerLastname)
     {
@@ -4072,7 +4194,7 @@ public function setCustomerLastname($customerLastname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerMiddlename($customerMiddlename)
     {
@@ -4080,7 +4202,7 @@ public function setCustomerMiddlename($customerMiddlename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerPrefix($customerPrefix)
     {
@@ -4088,7 +4210,7 @@ public function setCustomerPrefix($customerPrefix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerSuffix($customerSuffix)
     {
@@ -4096,7 +4218,7 @@ public function setCustomerSuffix($customerSuffix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerTaxvat($customerTaxvat)
     {
@@ -4104,7 +4226,7 @@ public function setCustomerTaxvat($customerTaxvat)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountDescription($description)
     {
@@ -4112,7 +4234,7 @@ public function setDiscountDescription($description)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtCustomerId($id)
     {
@@ -4120,7 +4242,7 @@ public function setExtCustomerId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtOrderId($id)
     {
@@ -4128,7 +4250,7 @@ public function setExtOrderId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGlobalCurrencyCode($code)
     {
@@ -4136,7 +4258,7 @@ public function setGlobalCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setHoldBeforeState($holdBeforeState)
     {
@@ -4144,7 +4266,7 @@ public function setHoldBeforeState($holdBeforeState)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setHoldBeforeStatus($holdBeforeStatus)
     {
@@ -4152,7 +4274,7 @@ public function setHoldBeforeStatus($holdBeforeStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderCurrencyCode($code)
     {
@@ -4160,7 +4282,7 @@ public function setOrderCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOriginalIncrementId($id)
     {
@@ -4168,7 +4290,7 @@ public function setOriginalIncrementId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRelationChildId($id)
     {
@@ -4176,7 +4298,7 @@ public function setRelationChildId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRelationChildRealId($realId)
     {
@@ -4184,7 +4306,7 @@ public function setRelationChildRealId($realId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRelationParentId($id)
     {
@@ -4192,7 +4314,7 @@ public function setRelationParentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRelationParentRealId($realId)
     {
@@ -4200,7 +4322,7 @@ public function setRelationParentRealId($realId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRemoteIp($remoteIp)
     {
@@ -4208,7 +4330,7 @@ public function setRemoteIp($remoteIp)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreCurrencyCode($code)
     {
@@ -4216,7 +4338,7 @@ public function setStoreCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreName($storeName)
     {
@@ -4224,7 +4346,7 @@ public function setStoreName($storeName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setXForwardedFor($xForwardedFor)
     {
@@ -4232,7 +4354,7 @@ public function setXForwardedFor($xForwardedFor)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerNote($customerNote)
     {
@@ -4240,7 +4362,7 @@ public function setCustomerNote($customerNote)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($timestamp)
     {
@@ -4248,7 +4370,7 @@ public function setUpdatedAt($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalItemCount($totalItemCount)
     {
@@ -4256,7 +4378,7 @@ public function setTotalItemCount($totalItemCount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerGender($customerGender)
     {
@@ -4264,7 +4386,7 @@ public function setCustomerGender($customerGender)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -4272,7 +4394,7 @@ public function setDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -4280,7 +4402,7 @@ public function setBaseDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -4288,7 +4410,7 @@ public function setShippingDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -4296,7 +4418,7 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced)
     {
@@ -4304,7 +4426,7 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced)
     {
@@ -4315,7 +4437,7 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded)
     {
@@ -4326,7 +4448,7 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded)
     {
@@ -4337,7 +4459,7 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingInclTax($amount)
     {
@@ -4345,7 +4467,7 @@ public function setShippingInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingInclTax($amount)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index 77d8330a72550..11d8a937387d1 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -173,7 +173,8 @@ protected function implodeStreetValue($value)
      * Enforce format of the street field
      *
      * @param array|string $key
-     * @param null $value
+     * @param array|string $value
+     *
      * @return \Magento\Framework\DataObject
      */
     public function setData($key, $value = null)
@@ -251,7 +252,7 @@ public function getStreet()
     public function getStreetLine($number)
     {
         $lines = $this->getStreet();
-        return isset($lines[$number - 1]) ? $lines[$number - 1] : '';
+        return $lines[$number - 1] ?? '';
     }
 
     //@codeCoverageIgnoreStart
@@ -508,7 +509,7 @@ public function getVatRequestSuccess()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setParentId($id)
     {
@@ -516,7 +517,7 @@ public function setParentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerAddressId($id)
     {
@@ -524,7 +525,7 @@ public function setCustomerAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionId($id)
     {
@@ -532,7 +533,7 @@ public function setRegionId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStreet($street)
     {
@@ -540,7 +541,7 @@ public function setStreet($street)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($id)
     {
@@ -548,7 +549,7 @@ public function setCustomerId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFax($fax)
     {
@@ -556,7 +557,7 @@ public function setFax($fax)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegion($region)
     {
@@ -564,7 +565,7 @@ public function setRegion($region)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPostcode($postcode)
     {
@@ -572,7 +573,7 @@ public function setPostcode($postcode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastname($lastname)
     {
@@ -580,7 +581,7 @@ public function setLastname($lastname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCity($city)
     {
@@ -588,7 +589,7 @@ public function setCity($city)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmail($email)
     {
@@ -596,7 +597,7 @@ public function setEmail($email)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTelephone($telephone)
     {
@@ -604,7 +605,7 @@ public function setTelephone($telephone)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCountryId($id)
     {
@@ -612,7 +613,7 @@ public function setCountryId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFirstname($firstname)
     {
@@ -620,7 +621,7 @@ public function setFirstname($firstname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAddressType($addressType)
     {
@@ -628,7 +629,7 @@ public function setAddressType($addressType)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrefix($prefix)
     {
@@ -636,7 +637,7 @@ public function setPrefix($prefix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMiddlename($middlename)
     {
@@ -644,7 +645,7 @@ public function setMiddlename($middlename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSuffix($suffix)
     {
@@ -652,7 +653,7 @@ public function setSuffix($suffix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCompany($company)
     {
@@ -660,7 +661,7 @@ public function setCompany($company)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatId($id)
     {
@@ -668,7 +669,7 @@ public function setVatId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatIsValid($vatIsValid)
     {
@@ -676,7 +677,7 @@ public function setVatIsValid($vatIsValid)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatRequestId($id)
     {
@@ -684,7 +685,7 @@ public function setVatRequestId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionCode($regionCode)
     {
@@ -692,7 +693,7 @@ public function setRegionCode($regionCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatRequestDate($vatRequestDate)
     {
@@ -700,7 +701,7 @@ public function setVatRequestDate($vatRequestDate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatRequestSuccess($vatRequestSuccess)
     {
@@ -708,7 +709,7 @@ public function setVatRequestSuccess($vatRequestSuccess)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\OrderAddressExtensionInterface|null
      */
@@ -718,9 +719,10 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes
+     *
      * @return $this
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderAddressExtensionInterface $extensionAttributes)
diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
index e6353f7f28899..31cb5bb1f60ca 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Address;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
@@ -84,7 +85,7 @@ public function validate(Address $address)
         $warnings = [];
         foreach ($this->required as $code => $label) {
             if (!$address->hasData($code)) {
-                $warnings[] = sprintf('%s is a required field', $label);
+                $warnings[] = sprintf('"%s" is required. Enter and try again.', $label);
             }
         }
         if (!filter_var($address->getEmail(), FILTER_VALIDATE_EMAIL)) {
diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
index 96dc531a82bf4..2aed6ef16817e 100644
--- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -67,14 +68,16 @@ public function __construct(
     public function get($id)
     {
         if (!$id) {
-            throw new InputException(__('Id required'));
+            throw new InputException(__('An ID is needed. Set the ID and try again.'));
         }
 
         if (!isset($this->registry[$id])) {
             /** @var \Magento\Sales\Api\Data\OrderAddressInterface $entity */
             $entity = $this->metadata->getNewInstance()->load($id);
             if (!$entity->getEntityId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
 
             $this->registry[$id] = $entity;
@@ -113,7 +116,7 @@ public function delete(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
 
             unset($this->registry[$entity->getEntityId()]);
         } catch (\Exception $e) {
-            throw new CouldNotDeleteException(__('Could not delete order address'), $e);
+            throw new CouldNotDeleteException(__("The order address couldn't be deleted."), $e);
         }
 
         return true;
@@ -145,7 +148,7 @@ public function save(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
             $this->metadata->getMapper()->save($entity);
             $this->registry[$entity->getEntityId()] = $entity;
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save order address'), $e);
+            throw new CouldNotSaveException(__("The order address couldn't be saved."), $e);
         }
 
         return $this->registry[$entity->getEntityId()];
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 1c7514142678b..e00eda647dc8d 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -122,8 +122,14 @@ public function getStateDefaultStatus($state)
      */
     public function getStatusLabel($code)
     {
-        $code = $this->maskStatusForArea($this->state->getAreaCode(), $code);
+        $area = $this->state->getAreaCode();
+        $code = $this->maskStatusForArea($area, $code);
         $status = $this->orderStatusFactory->create()->load($code);
+
+        if ($area == 'adminhtml') {
+            return $status->getLabel();
+        }
+
         return $status->getStoreLabel();
     }
 
@@ -211,7 +217,7 @@ public function getStateStatuses($state, $addLabels = true)
                 foreach ($collection as $item) {
                     $status = $item->getData('status');
                     if ($addLabels) {
-                        $statuses[$status] = $item->getStoreLabel();
+                        $statuses[$status] = $this->getStatusLabel($status);
                     } else {
                         $statuses[] = $status;
                     }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index c09a5da9177c3..cba45be6dfb35 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -7,23 +7,27 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Model\AbstractModel;
 use Magento\Sales\Model\EntityInterface;
+use Magento\Sales\Model\Order\InvoiceFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Order creditmemo model
  *
  * @api
- * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
- * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
+ * @method \Magento\Sales\Model\Order\Creditmemo setSendEmail(bool $value)
+ * @method \Magento\Sales\Model\Order\Creditmemo setCustomerNote(string $value)
  * @method string getCustomerNote()
- * @method \Magento\Sales\Model\Order\Invoice setCustomerNoteNotify(bool $value)
+ * @method \Magento\Sales\Model\Order\Creditmemo setCustomerNoteNotify(bool $value)
  * @method bool getCustomerNoteNotify()
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 100.0.2
  */
 class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInterface
@@ -38,6 +42,11 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
 
     const REPORT_DATE_TYPE_REFUND_CREATED = 'refund_created';
 
+    /**
+     * Allow Zero Grandtotal for Creditmemo path
+     */
+    const XML_PATH_ALLOW_ZERO_GRANDTOTAL = 'sales/zerograndtotal_creditmemo/allow_zero_grandtotal';
+
     /**
      * Identifier for order history item
      *
@@ -112,6 +121,16 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
      */
     protected $priceCurrency;
 
+    /**
+     * @var InvoiceFactory
+     */
+    private $invoiceFactory;
+
+    /**
+     * @var ScopeConfigInterface;
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -128,6 +147,8 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param InvoiceFactory $invoiceFactory
+     * @param ScopeConfigInterface $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -145,7 +166,9 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        InvoiceFactory $invoiceFactory = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         $this->_creditmemoConfig = $creditmemoConfig;
         $this->_orderFactory = $orderFactory;
@@ -155,6 +178,8 @@ public function __construct(
         $this->_commentFactory = $commentFactory;
         $this->_commentCollectionFactory = $commentCollectionFactory;
         $this->priceCurrency = $priceCurrency;
+        $this->invoiceFactory = $invoiceFactory ?: ObjectManager::getInstance()->get(InvoiceFactory::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -253,6 +278,8 @@ public function getShippingAddress()
     }
 
     /**
+     * Retrieve collection if items.
+     *
      * @return mixed
      */
     public function getItemsCollection()
@@ -268,6 +295,8 @@ public function getItemsCollection()
     }
 
     /**
+     * Retrieve all items.
+     *
      * @return \Magento\Sales\Model\Order\Creditmemo\Item[]
      */
     public function getAllItems()
@@ -282,6 +311,8 @@ public function getAllItems()
     }
 
     /**
+     * Retrieve item by id.
+     *
      * @param mixed $itemId
      * @return mixed
      */
@@ -312,6 +343,8 @@ public function getItemByOrderId($orderId)
     }
 
     /**
+     * Add an item to credit memo.
+     *
      * @param \Magento\Sales\Model\Order\Creditmemo\Item $item
      * @return $this
      */
@@ -357,6 +390,8 @@ public function roundPrice($price, $type = 'regular', $negative = false)
     }
 
     /**
+     * Check if credit memo can be refunded.
+     *
      * @return bool
      */
     public function canRefund()
@@ -377,6 +412,9 @@ public function canRefund()
      */
     public function getInvoice()
     {
+        if (!$this->getData('invoice') instanceof \Magento\Sales\Api\Data\InvoiceInterface && $this->getInvoiceId()) {
+            $this->setInvoice($this->invoiceFactory->create()->load($this->getInvoiceId()));
+        }
         return $this->getData('invoice');
     }
 
@@ -451,22 +489,19 @@ public function getStateName($stateId = null)
     }
 
     /**
+     * Set shipping amount.
+     *
      * @param float $amount
      * @return $this
      */
     public function setShippingAmount($amount)
     {
-        // base shipping amount calculated in total model
-        //        $amount = $this->getStore()->round($amount);
-        //        $this->setData('base_shipping_amount', $amount);
-        //
-        //        $amount = $this->getStore()->round(
-        //            $amount*$this->getOrder()->getStoreToOrderRate()
-        //        );
         return $this->setData(CreditmemoInterface::SHIPPING_AMOUNT, $amount);
     }
 
     /**
+     * Set adjustment positive amount.
+     *
      * @param string $amount
      * @return $this
      */
@@ -487,6 +522,8 @@ public function setAdjustmentPositive($amount)
     }
 
     /**
+     * Set adjustment negative amount.
+     *
      * @param string $amount
      * @return $this
      */
@@ -535,6 +572,8 @@ public function isLast()
     }
 
     /**
+     * Add comment to credit memo.
+     *
      * Adds comment to credit memo with additional possibility to send it to customer via email
      * and show it in customer account
      *
@@ -561,6 +600,8 @@ public function addComment($comment, $notify = false, $visibleOnFront = false)
     }
 
     /**
+     * Retrieve collection of comments.
+     *
      * @param bool $reload
      * @return \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\Collection
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -569,13 +610,6 @@ public function getCommentsCollection($reload = false)
     {
         $collection = $this->_commentCollectionFactory->create()->setCreditmemoFilter($this->getId())
             ->setCreatedAtOrder();
-//
-//            $this->setComments($comments);
-//            /**
-//             * When credit memo created with adding comment,
-//             * comments collection must be loaded before we added this comment.
-//             */
-//            $this->getComments()->load();
 
         if ($this->getId()) {
             foreach ($collection as $comment) {
@@ -607,11 +641,27 @@ public function getIncrementId()
     }
 
     /**
+     * Check if grand total is valid.
+     *
      * @return bool
      */
     public function isValidGrandTotal()
     {
-        return !($this->getGrandTotal() <= 0 && !$this->getAllowZeroGrandTotal());
+        return !($this->getGrandTotal() <= 0 && !$this->isAllowZeroGrandTotal());
+    }
+
+    /**
+     * Return Zero GrandTotal availability.
+     *
+     * @return bool
+     */
+    public function isAllowZeroGrandTotal()
+    {
+        $isAllowed = $this->scopeConfig->getValue(
+            self::XML_PATH_ALLOW_ZERO_GRANDTOTAL,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        return $isAllowed;
     }
 
     /**
@@ -659,7 +709,7 @@ public function getDiscountDescription()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItems($items)
     {
@@ -899,7 +949,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -1158,7 +1208,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setComments($comments)
     {
@@ -1166,7 +1216,7 @@ public function setComments($comments)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($id)
     {
@@ -1174,7 +1224,7 @@ public function setStoreId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -1182,7 +1232,7 @@ public function setBaseShippingTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreToOrderRate($rate)
     {
@@ -1190,7 +1240,7 @@ public function setStoreToOrderRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -1198,7 +1248,7 @@ public function setBaseDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseToOrderRate($rate)
     {
@@ -1206,7 +1256,7 @@ public function setBaseToOrderRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGrandTotal($amount)
     {
@@ -1214,7 +1264,7 @@ public function setGrandTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotalInclTax($amount)
     {
@@ -1222,7 +1272,7 @@ public function setBaseSubtotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotalInclTax($amount)
     {
@@ -1230,7 +1280,7 @@ public function setSubtotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingAmount($amount)
     {
@@ -1238,7 +1288,7 @@ public function setBaseShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreToBaseRate($rate)
     {
@@ -1246,7 +1296,7 @@ public function setStoreToBaseRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseToGlobalRate($rate)
     {
@@ -1254,7 +1304,7 @@ public function setBaseToGlobalRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAdjustment($baseAdjustment)
     {
@@ -1262,7 +1312,7 @@ public function setBaseAdjustment($baseAdjustment)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotal($amount)
     {
@@ -1270,7 +1320,7 @@ public function setBaseSubtotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountAmount($amount)
     {
@@ -1278,7 +1328,7 @@ public function setDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotal($amount)
     {
@@ -1286,7 +1336,7 @@ public function setSubtotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAdjustment($adjustment)
     {
@@ -1294,7 +1344,7 @@ public function setAdjustment($adjustment)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseGrandTotal($amount)
     {
@@ -1302,7 +1352,7 @@ public function setBaseGrandTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxAmount($amount)
     {
@@ -1310,7 +1360,7 @@ public function setBaseTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingTaxAmount($amount)
     {
@@ -1318,7 +1368,7 @@ public function setShippingTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxAmount($amount)
     {
@@ -1326,7 +1376,7 @@ public function setTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderId($id)
     {
@@ -1334,7 +1384,7 @@ public function setOrderId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmailSent($emailSent)
     {
@@ -1342,7 +1392,7 @@ public function setEmailSent($emailSent)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreditmemoStatus($creditmemoStatus)
     {
@@ -1350,7 +1400,7 @@ public function setCreditmemoStatus($creditmemoStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setState($state)
     {
@@ -1358,7 +1408,7 @@ public function setState($state)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingAddressId($id)
     {
@@ -1366,7 +1416,7 @@ public function setShippingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBillingAddressId($id)
     {
@@ -1374,7 +1424,7 @@ public function setBillingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setInvoiceId($id)
     {
@@ -1382,7 +1432,7 @@ public function setInvoiceId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreCurrencyCode($code)
     {
@@ -1390,7 +1440,7 @@ public function setStoreCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderCurrencyCode($code)
     {
@@ -1398,7 +1448,7 @@ public function setOrderCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseCurrencyCode($code)
     {
@@ -1406,7 +1456,7 @@ public function setBaseCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGlobalCurrencyCode($code)
     {
@@ -1414,7 +1464,7 @@ public function setGlobalCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIncrementId($id)
     {
@@ -1422,7 +1472,7 @@ public function setIncrementId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($timestamp)
     {
@@ -1430,7 +1480,7 @@ public function setUpdatedAt($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -1438,7 +1488,7 @@ public function setDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -1446,7 +1496,7 @@ public function setBaseDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -1454,7 +1504,7 @@ public function setShippingDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -1462,7 +1512,7 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingInclTax($amount)
     {
@@ -1470,7 +1520,7 @@ public function setShippingInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingInclTax($amount)
     {
@@ -1478,7 +1528,7 @@ public function setBaseShippingInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountDescription($description)
     {
@@ -1486,9 +1536,7 @@ public function setDiscountDescription($description)
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Sales\Api\Data\CreditmemoExtensionInterface|null
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -1496,15 +1544,11 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes
-     * @return $this
+     * @inheritdoc
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\CreditmemoExtensionInterface $extensionAttributes)
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
-
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
index 091bcdf594875..012bd7afa6411 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Creditmemo\Comment;
 
 use Magento\Sales\Model\Order\Creditmemo\Comment;
@@ -34,7 +35,7 @@ public function validate(Comment $comment)
         $commentData = $comment->getData();
         foreach ($this->required as $code => $label) {
             if (!$comment->hasData($code)) {
-                $errors[$code] = sprintf('%s is a required field', $label);
+                $errors[$code] = sprintf('"%s" is required. Enter and try again.', $label);
             } elseif (empty($commentData[$code])) {
                 $errors[$code] = sprintf('%s can not be empty', $label);
             }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php b/app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php
index 14d4ccae22446..991453bc6745e 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Sales\Api\CreditmemoCommentRepositoryInterface;
@@ -14,7 +15,13 @@
 use Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory;
 use Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterfaceFactory;
 use Magento\Sales\Model\Spi\CreditmemoCommentResourceInterface;
+use Magento\Sales\Model\Order\Email\Sender\CreditmemoCommentSender;
+use Magento\Sales\Api\CreditmemoRepositoryInterface;
+use Psr\Log\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CommentRepository implements CreditmemoCommentRepositoryInterface
 {
     /**
@@ -37,22 +44,48 @@ class CommentRepository implements CreditmemoCommentRepositoryInterface
      */
     private $collectionProcessor;
 
+    /**
+     * @var CreditmemoCommentSender
+     */
+    private $creditmemoCommentSender;
+
+    /**
+     * @var CreditmemoRepositoryInterface
+     */
+    private $creditmemoRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param CreditmemoCommentResourceInterface $commentResource
      * @param CreditmemoCommentInterfaceFactory $commentFactory
      * @param CreditmemoCommentSearchResultInterfaceFactory $searchResultFactory
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param CreditmemoCommentSender|null $creditmemoCommentSender
+     * @param CreditmemoRepositoryInterface|null $creditmemoRepository
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         CreditmemoCommentResourceInterface $commentResource,
         CreditmemoCommentInterfaceFactory $commentFactory,
         CreditmemoCommentSearchResultInterfaceFactory $searchResultFactory,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        CreditmemoCommentSender $creditmemoCommentSender = null,
+        CreditmemoRepositoryInterface $creditmemoRepository = null,
+        LoggerInterface $logger = null
     ) {
         $this->commentResource = $commentResource;
         $this->commentFactory = $commentFactory;
         $this->searchResultFactory = $searchResultFactory;
         $this->collectionProcessor = $collectionProcessor;
+        $this->creditmemoCommentSender = $creditmemoCommentSender
+            ?: ObjectManager::getInstance()->get(CreditmemoCommentSender::class);
+        $this->creditmemoRepository = $creditmemoRepository
+            ?: ObjectManager::getInstance()->get(CreditmemoRepositoryInterface::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -97,8 +130,16 @@ public function save(CreditmemoCommentInterface $entity)
         try {
             $this->commentResource->save($entity);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save the comment.'), $e);
+            throw new CouldNotSaveException(__('Could not save the creditmemo comment.'), $e);
         }
+
+        try {
+            $creditmemo = $this->creditmemoRepository->get($entity->getParentId());
+            $this->creditmemoCommentSender->send($creditmemo, $entity->getIsCustomerNotified(), $entity->getComment());
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+        }
+
         return $entity;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
index 0c2adfff80a2b..93a4e701e0322 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php
@@ -30,6 +30,7 @@ class CreationQuantityValidator implements ValidatorInterface
 
     /**
      * ItemCreationQuantityValidator constructor.
+     *
      * @param OrderItemRepositoryInterface $orderItemRepository
      * @param mixed $context
      */
@@ -53,6 +54,10 @@ public function validate($entity)
             return [__('The creditmemo contains product item that is not part of the original order.')];
         }
 
+        if ($orderItem->isDummy()) {
+            return [__('The creditmemo contains incorrect product items.')];
+        }
+
         if (!$this->isQtyAvailable($orderItem, $entity->getQty())) {
             return [__('The quantity to refund must not be greater than the unrefunded quantity.')];
         }
@@ -61,6 +66,8 @@ public function validate($entity)
     }
 
     /**
+     * Check the quantity to refund is greater than the unrefunded quantity
+     *
      * @param Item $orderItem
      * @param int $qty
      * @return bool
@@ -71,6 +78,8 @@ private function isQtyAvailable(Item $orderItem, $qty)
     }
 
     /**
+     * Check to see if Item is part of the order
+     *
      * @param OrderItemInterface $orderItem
      * @return bool
      */
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
index bb173f4010311..06bfbcf24daac 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php
@@ -5,11 +5,17 @@
  */
 namespace Magento\Sales\Model\Order\Creditmemo\Total;
 
+/**
+ * Discount total calculator
+ */
 class Discount extends AbstractTotal
 {
     /**
+     * Collect discount
+     *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
     {
@@ -25,7 +31,17 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
          * Calculate how much shipping discount should be applied
          * basing on how much shipping should be refunded.
          */
-        $baseShippingAmount = (float)$creditmemo->getBaseShippingAmount();
+        $baseShippingAmount = $this->getBaseShippingAmount($creditmemo);
+
+        /**
+         * If credit memo's shipping amount is set and Order's shipping amount is 0,
+         * throw exception with different message
+         */
+        if ($baseShippingAmount && $order->getBaseShippingAmount() <= 0) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("You can not refund shipping if there is no shipping amount.")
+            );
+        }
         if ($baseShippingAmount) {
             $baseShippingDiscount = $baseShippingAmount *
                 $order->getBaseShippingDiscountAmount() /
@@ -75,4 +91,21 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
         $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() - $baseTotalDiscountAmount);
         return $this;
     }
+
+    /**
+     * Get base shipping amount
+     *
+     * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
+     * @return float
+     */
+    private function getBaseShippingAmount(\Magento\Sales\Model\Order\Creditmemo $creditmemo): float
+    {
+        $baseShippingAmount = (float)$creditmemo->getBaseShippingAmount();
+        if (!$baseShippingAmount) {
+            $baseShippingInclTax = (float)$creditmemo->getBaseShippingInclTax();
+            $baseShippingTaxAmount = (float)$creditmemo->getBaseShippingTaxAmount();
+            $baseShippingAmount = $baseShippingInclTax - $baseShippingTaxAmount;
+        }
+        return $baseShippingAmount;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
index f00334f496b2a..f644d0c3a5a63 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -37,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Collects credit memo shipping totals.
+     *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -55,12 +57,10 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
         $orderShippingInclTax = $order->getShippingInclTax();
         $orderBaseShippingInclTax = $order->getBaseShippingInclTax();
         $allowedTaxAmount = $order->getShippingTaxAmount() - $order->getShippingTaxRefunded();
-        $baseAllowedTaxAmount = $order->getBaseShippingTaxAmount() - $order->getBaseShippingTaxRefunded();
         $allowedAmountInclTax = $allowedAmount + $allowedTaxAmount;
-        $baseAllowedAmountInclTax = $baseAllowedAmount + $baseAllowedTaxAmount;
-
-        // for the credit memo
-        $shippingAmount = $baseShippingAmount = $shippingInclTax = $baseShippingInclTax = 0;
+        $baseAllowedAmountInclTax = $orderBaseShippingInclTax
+            - $order->getBaseShippingRefunded()
+            - $order->getBaseShippingTaxRefunded();
 
         // Check if the desired shipping amount to refund was specified (from invoice or another source).
         if ($creditmemo->hasBaseShippingAmount()) {
@@ -128,7 +128,6 @@ private function isSuppliedShippingAmountInclTax($order)
 
     /**
      * Get the Tax Config.
-     * In a future release, will become a constructor parameter.
      *
      * @return \Magento\Tax\Model\Config
      *
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
index a842c0470ad85..d4c2e7b2d6854 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -5,9 +5,14 @@
  */
 namespace Magento\Sales\Model\Order\Creditmemo\Total;
 
+/**
+ * Collects credit memo taxes.
+ */
 class Tax extends AbstractTotal
 {
     /**
+     * Collects credit memo taxes.
+     *
      * @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
      * @return $this
      *
@@ -70,27 +75,20 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
         }
 
         $isPartialShippingRefunded = false;
+        $baseOrderShippingAmount = (float)$order->getBaseShippingAmount();
         if ($invoice = $creditmemo->getInvoice()) {
             //recalculate tax amounts in case if refund shipping value was changed
-            if ($order->getBaseShippingAmount() && $creditmemo->getBaseShippingAmount()) {
-                $taxFactor = $creditmemo->getBaseShippingAmount() / $order->getBaseShippingAmount();
+            if ($baseOrderShippingAmount && $creditmemo->getBaseShippingAmount() !== null) {
+                $taxFactor = $creditmemo->getBaseShippingAmount() / $baseOrderShippingAmount;
                 $shippingTaxAmount = $invoice->getShippingTaxAmount() * $taxFactor;
                 $baseShippingTaxAmount = $invoice->getBaseShippingTaxAmount() * $taxFactor;
                 $totalDiscountTaxCompensation += $invoice->getShippingDiscountTaxCompensationAmount() * $taxFactor;
                 $baseTotalDiscountTaxCompensation +=
                     $invoice->getBaseShippingDiscountTaxCompensationAmnt() * $taxFactor;
-                $shippingDiscountTaxCompensationAmount =
-                    $invoice->getShippingDiscountTaxCompensationAmount() * $taxFactor;
-                $baseShippingDiscountTaxCompensationAmount =
-                    $invoice->getBaseShippingDiscountTaxCompensationAmnt() * $taxFactor;
                 $shippingTaxAmount = $creditmemo->roundPrice($shippingTaxAmount);
                 $baseShippingTaxAmount = $creditmemo->roundPrice($baseShippingTaxAmount, 'base');
                 $totalDiscountTaxCompensation = $creditmemo->roundPrice($totalDiscountTaxCompensation);
                 $baseTotalDiscountTaxCompensation = $creditmemo->roundPrice($baseTotalDiscountTaxCompensation, 'base');
-                $shippingDiscountTaxCompensationAmount =
-                    $creditmemo->roundPrice($shippingDiscountTaxCompensationAmount);
-                $baseShippingDiscountTaxCompensationAmount =
-                    $creditmemo->roundPrice($baseShippingDiscountTaxCompensationAmount, 'base');
                 if ($taxFactor < 1 && $invoice->getShippingTaxAmount() > 0) {
                     $isPartialShippingRefunded = true;
                 }
@@ -99,7 +97,6 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
             }
         } else {
             $orderShippingAmount = $order->getShippingAmount();
-            $baseOrderShippingAmount = $order->getBaseShippingAmount();
 
             $baseOrderShippingRefundedAmount = $order->getBaseShippingRefunded();
 
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
index 65c1788c68d0b..b86acbab20806 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
@@ -99,11 +99,14 @@ private function attachComment(
             ->setCreditmemo($creditmemo)
             ->setIsCustomerNotified($appendComment);
         $creditmemo->setComments([$comment]);
+        $creditmemo->setCustomerNote($comment->getComment());
+        $creditmemo->setCustomerNoteNotify($appendComment);
         return $creditmemo;
     }
 
     /**
      * Create new Creditmemo
+     *
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationInterface[] $items
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
@@ -128,6 +131,8 @@ public function createFromOrder(
     }
 
     /**
+     * Create credit memo from invoice
+     *
      * @param \Magento\Sales\Api\Data\InvoiceInterface $invoice
      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationInterface[] $items
      * @param \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface|null $comment
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 5f1bba4c8f2c2..73afd0a06f710 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -5,13 +5,16 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Bundle\Ui\DataProvider\Product\Listing\Collector\BundlePrice;
+use Magento\Sales\Api\Data\OrderItemInterface;
+
 /**
  * Factory class for @see \Magento\Sales\Model\Order\Creditmemo
  */
 class CreditmemoFactory
 {
     /**
-     * Quote convert object
+     * Order convert object.
      *
      * @var \Magento\Sales\Model\Convert\Order
      */
@@ -63,31 +66,15 @@ public function createByOrder(\Magento\Sales\Model\Order $order, array $data = [
     {
         $totalQty = 0;
         $creditmemo = $this->convertor->toCreditmemo($order);
-        $qtys = isset($data['qtys']) ? $data['qtys'] : [];
+        $qtyList = isset($data['qtys']) ? $data['qtys'] : [];
 
         foreach ($order->getAllItems() as $orderItem) {
-            if (!$this->canRefundItem($orderItem, $qtys)) {
+            if (!$this->canRefundItem($orderItem, $qtyList)) {
                 continue;
             }
 
             $item = $this->convertor->itemToCreditmemoItem($orderItem);
-            if ($orderItem->isDummy()) {
-                if (isset($data['qtys'][$orderItem->getParentItemId()])) {
-                    $parentQty = $data['qtys'][$orderItem->getParentItemId()];
-                } else {
-                    $parentQty = $orderItem->getParentItem() ? $orderItem->getParentItem()->getQtyToRefund() : 1;
-                }
-                $qty = $this->calculateProductOptions($orderItem, $parentQty);
-                $orderItem->setLockedDoShip(true);
-            } else {
-                if (isset($qtys[$orderItem->getId()])) {
-                    $qty = (double)$qtys[$orderItem->getId()];
-                } elseif (!count($qtys)) {
-                    $qty = $orderItem->getQtyToRefund();
-                } else {
-                    continue;
-                }
-            }
+            $qty = $this->getQtyToRefund($orderItem, $qtyList);
             $totalQty += $qty;
             $item->setQty($qty);
             $creditmemo->addItem($item);
@@ -106,72 +93,31 @@ public function createByOrder(\Magento\Sales\Model\Order $order, array $data = [
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @param array $data
      * @return Creditmemo
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function createByInvoice(\Magento\Sales\Model\Order\Invoice $invoice, array $data = [])
     {
         $order = $invoice->getOrder();
         $totalQty = 0;
-        $qtys = isset($data['qtys']) ? $data['qtys'] : [];
+        $qtyList = isset($data['qtys']) ? $data['qtys'] : [];
         $creditmemo = $this->convertor->toCreditmemo($order);
         $creditmemo->setInvoice($invoice);
 
-        $invoiceQtysRefunded = [];
-        foreach ($invoice->getOrder()->getCreditmemosCollection() as $createdCreditmemo) {
-            if ($createdCreditmemo->getState() != Creditmemo::STATE_CANCELED &&
-                $createdCreditmemo->getInvoiceId() == $invoice->getId()
-            ) {
-                foreach ($createdCreditmemo->getAllItems() as $createdCreditmemoItem) {
-                    $orderItemId = $createdCreditmemoItem->getOrderItem()->getId();
-                    if (isset($invoiceQtysRefunded[$orderItemId])) {
-                        $invoiceQtysRefunded[$orderItemId] += $createdCreditmemoItem->getQty();
-                    } else {
-                        $invoiceQtysRefunded[$orderItemId] = $createdCreditmemoItem->getQty();
-                    }
-                }
-            }
-        }
-
-        $invoiceQtysRefundLimits = [];
-        foreach ($invoice->getAllItems() as $invoiceItem) {
-            $invoiceQtyCanBeRefunded = $invoiceItem->getQty();
-            $orderItemId = $invoiceItem->getOrderItem()->getId();
-            if (isset($invoiceQtysRefunded[$orderItemId])) {
-                $invoiceQtyCanBeRefunded = $invoiceQtyCanBeRefunded - $invoiceQtysRefunded[$orderItemId];
-            }
-            $invoiceQtysRefundLimits[$orderItemId] = $invoiceQtyCanBeRefunded;
-        }
+        $invoiceRefundLimitsQtyList = $this->getInvoiceRefundLimitsQtyList($invoice);
 
         foreach ($invoice->getAllItems() as $invoiceItem) {
+            /** @var OrderItemInterface $orderItem */
             $orderItem = $invoiceItem->getOrderItem();
 
-            if (!$this->canRefundItem($orderItem, $qtys, $invoiceQtysRefundLimits)) {
+            if (!$this->canRefundItem($orderItem, $qtyList, $invoiceRefundLimitsQtyList)) {
                 continue;
             }
 
-            $item = $this->convertor->itemToCreditmemoItem($orderItem);
-            if ($orderItem->isDummy()) {
-                if (isset($data['qtys'][$orderItem->getParentItemId()])) {
-                    $parentQty = $data['qtys'][$orderItem->getParentItemId()];
-                } else {
-                    $parentQty = $orderItem->getParentItem() ? $orderItem->getParentItem()->getQtyToRefund() : 1;
-                }
-                $qty = $this->calculateProductOptions($orderItem, $parentQty);
-            } else {
-                if (isset($qtys[$orderItem->getId()])) {
-                    $qty = (double)$qtys[$orderItem->getId()];
-                } elseif (!count($qtys)) {
-                    $qty = $orderItem->getQtyToRefund();
-                } else {
-                    continue;
-                }
-                if (isset($invoiceQtysRefundLimits[$orderItem->getId()])) {
-                    $qty = min($qty, $invoiceQtysRefundLimits[$orderItem->getId()]);
-                }
-            }
-            $qty = min($qty, $invoiceItem->getQty());
+            $qty = min(
+                $this->getQtyToRefund($orderItem, $qtyList, $invoiceRefundLimitsQtyList),
+                $invoiceItem->getQty()
+            );
             $totalQty += $qty;
+            $item = $this->convertor->itemToCreditmemoItem($orderItem);
             $item->setQty($qty);
             $creditmemo->addItem($item);
         }
@@ -179,15 +125,7 @@ public function createByInvoice(\Magento\Sales\Model\Order\Invoice $invoice, arr
 
         $this->initData($creditmemo, $data);
         if (!isset($data['shipping_amount'])) {
-            $isShippingInclTax = $this->taxConfig->displaySalesShippingInclTax($order->getStoreId());
-            if ($isShippingInclTax) {
-                $baseAllowedAmount = $order->getBaseShippingInclTax() -
-                    $order->getBaseShippingRefunded() -
-                    $order->getBaseShippingTaxRefunded();
-            } else {
-                $baseAllowedAmount = $order->getBaseShippingAmount() - $order->getBaseShippingRefunded();
-                $baseAllowedAmount = min($baseAllowedAmount, $invoice->getBaseShippingAmount());
-            }
+            $baseAllowedAmount = $this->getShippingAmount($invoice);
             $creditmemo->setBaseShippingAmount($baseAllowedAmount);
         }
 
@@ -262,6 +200,7 @@ protected function initData($creditmemo, $data)
     {
         if (isset($data['shipping_amount'])) {
             $creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);
+            $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);
         }
         if (isset($data['adjustment_positive'])) {
             $creditmemo->setAdjustmentPositive($data['adjustment_positive']);
@@ -272,11 +211,13 @@ protected function initData($creditmemo, $data)
     }
 
     /**
-     * @param \Magento\Sales\Api\Data\OrderItemInterface $orderItem
+     * Calculate product options.
+     *
+     * @param Item $orderItem
      * @param int $parentQty
      * @return int
      */
-    private function calculateProductOptions(\Magento\Sales\Api\Data\OrderItemInterface $orderItem, $parentQty)
+    private function calculateProductOptions(Item $orderItem, int $parentQty): int
     {
         $qty = $parentQty;
         $productOptions = $orderItem->getProductOptions();
@@ -290,4 +231,113 @@ private function calculateProductOptions(\Magento\Sales\Api\Data\OrderItemInterf
         }
         return $qty;
     }
+
+    /**
+     * Gets list of quantities based on invoice refunded items.
+     *
+     * @param Invoice $invoice
+     * @return array
+     */
+    private function getInvoiceRefundedQtyList(Invoice $invoice): array
+    {
+        $invoiceRefundedQtyList = [];
+        foreach ($invoice->getOrder()->getCreditmemosCollection() as $creditmemo) {
+            if ($creditmemo->getState() !== Creditmemo::STATE_CANCELED &&
+                $creditmemo->getInvoiceId() === $invoice->getId()
+            ) {
+                foreach ($creditmemo->getAllItems() as $creditmemoItem) {
+                    $orderItemId = $creditmemoItem->getOrderItem()->getId();
+                    if (isset($invoiceRefundedQtyList[$orderItemId])) {
+                        $invoiceRefundedQtyList[$orderItemId] += $creditmemoItem->getQty();
+                    } else {
+                        $invoiceRefundedQtyList[$orderItemId] = $creditmemoItem->getQty();
+                    }
+                }
+            }
+        }
+
+        return $invoiceRefundedQtyList;
+    }
+
+    /**
+     * Gets limits of refund based on invoice items.
+     *
+     * @param Invoice $invoice
+     * @return array
+     */
+    private function getInvoiceRefundLimitsQtyList(Invoice $invoice): array
+    {
+        $invoiceRefundLimitsQtyList = [];
+        $invoiceRefundedQtyList = $this->getInvoiceRefundedQtyList($invoice);
+
+        foreach ($invoice->getAllItems() as $invoiceItem) {
+            $qtyCanBeRefunded = $invoiceItem->getQty();
+            $orderItemId = $invoiceItem->getOrderItem()->getId();
+            if (isset($invoiceRefundedQtyList[$orderItemId])) {
+                $qtyCanBeRefunded = $qtyCanBeRefunded - $invoiceRefundedQtyList[$orderItemId];
+            }
+            $invoiceRefundLimitsQtyList[$orderItemId] = $qtyCanBeRefunded;
+        }
+
+        return $invoiceRefundLimitsQtyList;
+    }
+
+    /**
+     * Gets quantity of items to refund based on order item.
+     *
+     * @param Item $orderItem
+     * @param array $qtyList
+     * @param array $refundLimits
+     * @return float
+     */
+    private function getQtyToRefund(Item $orderItem, array $qtyList, array $refundLimits = []): float
+    {
+        $qty = 0;
+        if ($orderItem->isDummy()) {
+            if (isset($qtyList[$orderItem->getParentItemId()])) {
+                $parentQty = $qtyList[$orderItem->getParentItemId()];
+            } elseif ($orderItem->getProductType() === BundlePrice::PRODUCT_TYPE) {
+                $parentQty = $orderItem->getQtyInvoiced();
+            } else {
+                $parentQty = $orderItem->getParentItem() ? $orderItem->getParentItem()->getQtyToRefund() : 1;
+            }
+            $qty = $this->calculateProductOptions($orderItem, $parentQty);
+        } else {
+            if (isset($qtyList[$orderItem->getId()])) {
+                $qty = $qtyList[$orderItem->getId()];
+            } elseif (!count($qtyList)) {
+                $qty = $orderItem->getQtyToRefund();
+            } else {
+                return (float)$qty;
+            }
+
+            if (isset($refundLimits[$orderItem->getId()])) {
+                $qty = min($qty, $refundLimits[$orderItem->getId()]);
+            }
+        }
+
+        return (float)$qty;
+    }
+
+    /**
+     * Gets shipping amount based on invoice.
+     *
+     * @param Invoice $invoice
+     * @return float
+     */
+    private function getShippingAmount(Invoice $invoice): float
+    {
+        $order = $invoice->getOrder();
+        $isShippingInclTax = $this->taxConfig->displaySalesShippingInclTax($order->getStoreId());
+        if ($isShippingInclTax) {
+            $amount = $order->getBaseShippingInclTax() -
+                $order->getBaseShippingRefunded() -
+                $order->getBaseShippingTaxRefunded();
+        } else {
+            $amount = $order->getBaseShippingAmount() - $order->getBaseShippingRefunded();
+            $amount = min($amount, $invoice->getBaseShippingAmount());
+        }
+
+        return (float)$amount;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
index b866b0de0abfc..ce4a0aa5b3e3a 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
@@ -7,13 +7,13 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Model\ResourceModel\Order\Creditmemo as Resource;
-use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
+use Magento\Sales\Model\ResourceModel\Metadata;
 
 /**
  * Repository class for @see \Magento\Sales\Api\Data\CreditmemoInterface
@@ -70,13 +70,15 @@ public function __construct(
     public function get($id)
     {
         if (!$id) {
-            throw new InputException(__('Id required'));
+            throw new InputException(__('An ID is needed. Set the ID and try again.'));
         }
         if (!isset($this->registry[$id])) {
             /** @var \Magento\Sales\Api\Data\CreditmemoInterface $entity */
             $entity = $this->metadata->getNewInstance()->load($id);
             if (!$entity->getEntityId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
             $this->registry[$id] = $entity;
         }
@@ -121,7 +123,7 @@ public function delete(\Magento\Sales\Api\Data\CreditmemoInterface $entity)
             $this->metadata->getMapper()->delete($entity);
             unset($this->registry[$entity->getEntityId()]);
         } catch (\Exception $e) {
-            throw new CouldNotDeleteException(__('Could not delete credit memo'), $e);
+            throw new CouldNotDeleteException(__("The credit memo couldn't be deleted."), $e);
         }
         return true;
     }
@@ -138,8 +140,10 @@ public function save(\Magento\Sales\Api\Data\CreditmemoInterface $entity)
         try {
             $this->metadata->getMapper()->save($entity);
             $this->registry[$entity->getEntityId()] = $entity;
+        } catch (LocalizedException $e) {
+            throw new CouldNotSaveException(__($e->getMessage()), $e);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save credit memo'), $e);
+            throw new CouldNotSaveException(__("The credit memo couldn't be saved."), $e);
         }
         return $this->registry[$entity->getEntityId()];
     }
diff --git a/app/code/Magento/Sales/Model/Order/CustomerManagement.php b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
index bf54e65d0ce10..ae3f940dbb2ba 100644
--- a/app/code/Magento/Sales/Model/Order/CustomerManagement.php
+++ b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
@@ -6,12 +6,18 @@
 
 namespace Magento\Sales\Model\Order;
 
+use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Quote\Model\Quote\AddressFactory as QuoteAddressFactory;
+use Magento\Sales\Api\Data\OrderInterface;
 
 /**
  * Class CustomerManagement
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementInterface
 {
@@ -21,17 +27,17 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
     protected $accountManagement;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
+     * @deprecated
      */
     protected $customerFactory;
 
     /**
-     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
+     * @deprecated
      */
     protected $addressFactory;
 
     /**
-     * @var \Magento\Customer\Api\Data\RegionInterfaceFactory
+     * @deprecated
      */
     protected $regionFactory;
 
@@ -41,15 +47,20 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
     protected $orderRepository;
 
     /**
-     * @var \Magento\Framework\DataObject\Copy
+     * @deprecated
      */
     protected $objectCopyService;
 
     /**
-     * @var \Magento\Quote\Model\Quote\AddressFactory
+     * @var QuoteAddressFactory
      */
     private $quoteAddressFactory;
 
+    /**
+     * @var OrderCustomerExtractor
+     */
+    private $customerExtractor;
+
     /**
      * @param \Magento\Framework\DataObject\Copy $objectCopyService
      * @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
@@ -57,7 +68,8 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory
      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
-     * @param \Magento\Quote\Model\Quote\AddressFactory|null $quoteAddressFactory
+     * @param QuoteAddressFactory|null $quoteAddressFactory
+     * @param OrderCustomerExtractor|null $orderCustomerExtractor
      */
     public function __construct(
         \Magento\Framework\DataObject\Copy $objectCopyService,
@@ -66,7 +78,8 @@ public function __construct(
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory,
         \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory,
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
-        \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory = null
+        QuoteAddressFactory $quoteAddressFactory = null,
+        OrderCustomerExtractor $orderCustomerExtractor = null
     ) {
         $this->objectCopyService = $objectCopyService;
         $this->accountManagement = $accountManagement;
@@ -74,9 +87,10 @@ public function __construct(
         $this->customerFactory = $customerFactory;
         $this->addressFactory = $addressFactory;
         $this->regionFactory = $regionFactory;
-        $this->quoteAddressFactory = $quoteAddressFactory ?: ObjectManager::getInstance()->get(
-            \Magento\Quote\Model\Quote\AddressFactory::class
-        );
+        $this->quoteAddressFactory = $quoteAddressFactory
+            ?: ObjectManager::getInstance()->get(QuoteAddressFactory::class);
+        $this->customerExtractor = $orderCustomerExtractor
+            ?? ObjectManager::getInstance()->get(OrderCustomerExtractor::class);
     }
 
     /**
@@ -86,72 +100,61 @@ public function create($orderId)
     {
         $order = $this->orderRepository->get($orderId);
         if ($order->getCustomerId()) {
-            throw new AlreadyExistsException(__("This order already has associated customer account"));
-        }
-        $customerData = $this->objectCopyService->copyFieldsetToTarget(
-            'order_address',
-            'to_customer',
-            $order->getBillingAddress(),
-            []
-        );
-        $addresses = $order->getAddresses();
-        foreach ($addresses as $address) {
-            if (!$this->isNeededToSaveAddress($address->getData('quote_address_id'))) {
-                continue;
-            }
-            $addressData = $this->objectCopyService->copyFieldsetToTarget(
-                'order_address',
-                'to_customer_address',
-                $address,
-                []
+            throw new AlreadyExistsException(
+                __('This order already has associated customer account')
             );
-            /** @var \Magento\Customer\Api\Data\AddressInterface $customerAddress */
-            $customerAddress = $this->addressFactory->create(['data' => $addressData]);
-            switch ($address->getAddressType()) {
-                case QuoteAddress::ADDRESS_TYPE_BILLING:
-                    $customerAddress->setIsDefaultBilling(true);
-                    break;
-                case QuoteAddress::ADDRESS_TYPE_SHIPPING:
-                    $customerAddress->setIsDefaultShipping(true);
-                    break;
-            }
+        }
 
-            if (is_string($address->getRegion())) {
-                /** @var \Magento\Customer\Api\Data\RegionInterface $region */
-                $region = $this->regionFactory->create();
-                $region->setRegion($address->getRegion());
-                $region->setRegionCode($address->getRegionCode());
-                $region->setRegionId($address->getRegionId());
-                $customerAddress->setRegion($region);
+        $customer = $this->customerExtractor->extract($orderId);
+        /** @var AddressInterface[] $filteredAddresses */
+        $filteredAddresses = [];
+        foreach ($customer->getAddresses() as $address) {
+            if ($this->needToSaveAddress($order, $address)) {
+                $filteredAddresses[] = $address;
             }
-            $customerData['addresses'][] = $customerAddress;
         }
+        $customer->setAddresses($filteredAddresses);
 
-        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-        $customer = $this->customerFactory->create(['data' => $customerData]);
         $account = $this->accountManagement->createAccount($customer);
+        $order = $this->orderRepository->get($orderId);
         $order->setCustomerId($account->getId());
+        $order->setCustomerIsGuest(0);
         $this->orderRepository->save($order);
 
         return $account;
     }
 
     /**
-     * Check if we need to save address in address book.
-     *
-     * @param int $quoteAddressId
+     * @param OrderInterface $order
+     * @param AddressInterface $address
      *
      * @return bool
      */
-    private function isNeededToSaveAddress($quoteAddressId)
-    {
-        $saveInAddressBook = true;
+    private function needToSaveAddress(
+        OrderInterface $order,
+        AddressInterface $address
+    ): bool {
+        /** @var OrderAddressInterface|null $orderAddress */
+        $orderAddress = null;
+        if ($address->isDefaultBilling()) {
+            $orderAddress = $order->getBillingAddress();
+        } elseif ($address->isDefaultShipping()) {
+            $orderAddress = $order->getShippingAddress();
+        }
+        if ($orderAddress) {
+            $quoteAddressId = $orderAddress->getData('quote_address_id');
+            if ($quoteAddressId) {
+                /** @var QuoteAddress $quote */
+                $quote = $this->quoteAddressFactory->create()
+                    ->load($quoteAddressId);
+                if ($quote && $quote->getId()) {
+                    return (bool)(int)$quote->getData('save_in_address_book');
+                }
+            }
 
-        $quoteAddress = $this->quoteAddressFactory->create()->load($quoteAddressId);
-        if ($quoteAddress && $quoteAddress->getId()) {
-            $saveInAddressBook = (int)$quoteAddress->getData('save_in_address_book');
+            return true;
         }
 
-        return $saveInAddressBook;
+        return false;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php b/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php
index 55ce24e23e1ec..1d481a8acee65 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/IdentityInterface.php
@@ -3,7 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace  Magento\Sales\Model\Order\Email\Container;
+
+namespace Magento\Sales\Model\Order\Email\Container;
 
 use Magento\Store\Model\Store;
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/NullIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/NullIdentity.php
new file mode 100644
index 0000000000000..22348aa9ee2f6
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/NullIdentity.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order\Email\Container;
+
+class NullIdentity extends Container implements IdentityInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getEmailCopyTo()
+    {
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCopyMethod()
+    {
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getGuestTemplateId()
+    {
+        return null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTemplateId()
+    {
+        return null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getEmailIdentity()
+    {
+        return '';
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender.php b/app/code/Magento/Sales/Model/Order/Email/Sender.php
index 8ada6a3f321d2..564fd1e2a4b98 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender.php
@@ -65,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Send order email if it is enabled in configuration.
+     *
      * @param Order $order
      * @return bool
      */
@@ -81,15 +83,21 @@ protected function checkAndSend(Order $order)
 
         try {
             $sender->send();
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            return false;
+        }
+        try {
             $sender->sendCopyTo();
         } catch (\Exception $e) {
             $this->logger->error($e->getMessage());
         }
-
         return true;
     }
 
     /**
+     * Populate order email template with customer information.
+     *
      * @param Order $order
      * @return void
      */
@@ -111,6 +119,8 @@ protected function prepareTemplate(Order $order)
     }
 
     /**
+     * Create Sender object using appropriate template and identity.
+     *
      * @return Sender
      */
     protected function getSender()
@@ -124,6 +134,8 @@ protected function getSender()
     }
 
     /**
+     * Get template options.
+     *
      * @return array
      */
     protected function getTemplateOptions()
@@ -135,6 +147,8 @@ protected function getTemplateOptions()
     }
 
     /**
+     * Render shipping address into html.
+     *
      * @param Order $order
      * @return string|null
      */
@@ -146,6 +160,8 @@ protected function getFormattedShippingAddress($order)
     }
 
     /**
+     * Render billing address into html.
+     *
      * @param Order $order
      * @return string|null
      */
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
index 2944b8ccef647..f06da0de0fd00 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -131,14 +131,17 @@ protected function prepareTemplate(Order $order)
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
         ];
-        $transport = new DataObject($transport);
+        $transportObject = new DataObject($transport);
 
+        /**
+         * Event argument `transport` is @deprecated. Use `transportObject` instead.
+         */
         $this->eventManager->dispatch(
             'email_order_set_template_vars_before',
-            ['sender' => $this, 'transport' => $transport]
+            ['sender' => $this, 'transport' => $transportObject, 'transportObject' => $transportObject]
         );
 
-        $this->templateContainer->setTemplateVars($transport->getData());
+        $this->templateContainer->setTemplateVars($transportObject->getData());
 
         parent::prepareTemplate($order);
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 93c6f19b08690..7ec089b882972 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Email;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
@@ -26,19 +28,29 @@ class SenderBuilder
      */
     protected $transportBuilder;
 
+    /**
+     * @var TransportBuilderByStore
+     */
+    private $transportBuilderByStore;
+
     /**
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
+     * @param TransportBuilderByStore $transportBuilderByStore
      */
     public function __construct(
         Template $templateContainer,
         IdentityInterface $identityContainer,
-        TransportBuilder $transportBuilder
+        TransportBuilder $transportBuilder,
+        TransportBuilderByStore $transportBuilderByStore = null
     ) {
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
         $this->transportBuilder = $transportBuilder;
+        $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get(
+            TransportBuilderByStore::class
+        );
     }
 
     /**
@@ -98,6 +110,9 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilder->setFrom($this->identityContainer->getEmailIdentity());
+        $this->transportBuilderByStore->setFromByStore(
+            $this->identityContainer->getEmailIdentity(),
+            $this->identityContainer->getStore()->getId()
+        );
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index 3f2fa1f72f6e5..14dd0b14ac1f3 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -11,6 +11,8 @@
 use Magento\Sales\Model\EntityInterface;
 
 /**
+ * Invoice model.
+ *
  * @api
  * @method \Magento\Sales\Model\Order\Invoice setSendEmail(bool $value)
  * @method \Magento\Sales\Model\Order\Invoice setCustomerNote(string $value)
@@ -445,10 +447,6 @@ public function cancel()
         $order->setBaseDiscountInvoiced($order->getBaseDiscountInvoiced() - $this->getBaseDiscountAmount());
         $order->setBaseTotalInvoicedCost($order->getBaseTotalInvoicedCost() - $this->getBaseCost());
 
-        if ($this->getState() == self::STATE_PAID) {
-            $order->setTotalPaid($order->getTotalPaid() - $this->getGrandTotal());
-            $order->setBaseTotalPaid($order->getBaseTotalPaid() - $this->getBaseGrandTotal());
-        }
         $this->setState(self::STATE_CANCELED);
         $order->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
             ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING));
@@ -508,6 +506,8 @@ public function getItemsCollection()
     }
 
     /**
+     * Get all Invoice Items.
+     *
      * @return array
      */
     public function getAllItems()
@@ -522,6 +522,8 @@ public function getAllItems()
     }
 
     /**
+     * Get Invoice Item by id.
+     *
      * @param int|string $itemId
      * @return bool|\Magento\Sales\Model\Order\Invoice\Item
      */
@@ -536,8 +538,11 @@ public function getItemById($itemId)
     }
 
     /**
+     * Add Item to Invoice.
+     *
      * @param \Magento\Sales\Model\Order\Invoice\Item $item
      * @return $this
+     * @throws \Exception
      */
     public function addItem(\Magento\Sales\Model\Order\Invoice\Item $item)
     {
@@ -682,13 +687,13 @@ public function isLast()
     }
 
     /**
-     * Adds comment to invoice with additional possibility to send it to customer via email
-     * and show it in customer account
+     * Add comment with possibility to send it to customer via email and show it in customer account.
      *
      * @param string $comment
      * @param bool $notify
      * @param bool $visibleOnFront
      * @return $this
+     * @throws \Exception
      */
     public function addComment($comment, $notify = false, $visibleOnFront = false)
     {
@@ -710,6 +715,8 @@ public function addComment($comment, $notify = false, $visibleOnFront = false)
     }
 
     /**
+     * Get Invoice comments.
+     *
      * @param bool $reload
      * @return \Magento\Sales\Model\ResourceModel\Order\Invoice\Comment\Collection
      */
@@ -839,7 +846,7 @@ public function getDiscountDescription()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItems($items)
     {
@@ -1007,7 +1014,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -1266,7 +1273,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setComments($comments)
     {
@@ -1274,7 +1281,7 @@ public function setComments($comments)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($timestamp)
     {
@@ -1282,7 +1289,7 @@ public function setUpdatedAt($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($id)
     {
@@ -1290,7 +1297,7 @@ public function setStoreId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseGrandTotal($amount)
     {
@@ -1298,7 +1305,7 @@ public function setBaseGrandTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingTaxAmount($amount)
     {
@@ -1306,7 +1313,7 @@ public function setShippingTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxAmount($amount)
     {
@@ -1314,7 +1321,7 @@ public function setTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxAmount($amount)
     {
@@ -1322,7 +1329,7 @@ public function setBaseTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreToOrderRate($rate)
     {
@@ -1330,7 +1337,7 @@ public function setStoreToOrderRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingTaxAmount($amount)
     {
@@ -1338,7 +1345,7 @@ public function setBaseShippingTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -1346,7 +1353,7 @@ public function setBaseDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseToOrderRate($rate)
     {
@@ -1354,7 +1361,7 @@ public function setBaseToOrderRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGrandTotal($amount)
     {
@@ -1362,7 +1369,7 @@ public function setGrandTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingAmount($amount)
     {
@@ -1370,7 +1377,7 @@ public function setShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotalInclTax($amount)
     {
@@ -1378,7 +1385,7 @@ public function setSubtotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotalInclTax($amount)
     {
@@ -1386,7 +1393,7 @@ public function setBaseSubtotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreToBaseRate($rate)
     {
@@ -1394,7 +1401,7 @@ public function setStoreToBaseRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingAmount($amount)
     {
@@ -1402,7 +1409,7 @@ public function setBaseShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalQty($qty)
     {
@@ -1410,7 +1417,7 @@ public function setTotalQty($qty)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseToGlobalRate($rate)
     {
@@ -1418,7 +1425,7 @@ public function setBaseToGlobalRate($rate)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubtotal($amount)
     {
@@ -1426,7 +1433,7 @@ public function setSubtotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseSubtotal($amount)
     {
@@ -1434,7 +1441,7 @@ public function setBaseSubtotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountAmount($amount)
     {
@@ -1442,7 +1449,7 @@ public function setDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBillingAddressId($id)
     {
@@ -1450,7 +1457,7 @@ public function setBillingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsUsedForRefund($isUsedForRefund)
     {
@@ -1458,7 +1465,7 @@ public function setIsUsedForRefund($isUsedForRefund)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderId($id)
     {
@@ -1466,7 +1473,7 @@ public function setOrderId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmailSent($emailSent)
     {
@@ -1474,7 +1481,7 @@ public function setEmailSent($emailSent)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCanVoidFlag($canVoidFlag)
     {
@@ -1482,7 +1489,7 @@ public function setCanVoidFlag($canVoidFlag)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setState($state)
     {
@@ -1490,7 +1497,7 @@ public function setState($state)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingAddressId($id)
     {
@@ -1498,7 +1505,7 @@ public function setShippingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreCurrencyCode($code)
     {
@@ -1506,7 +1513,7 @@ public function setStoreCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderCurrencyCode($code)
     {
@@ -1514,7 +1521,7 @@ public function setOrderCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseCurrencyCode($code)
     {
@@ -1522,7 +1529,7 @@ public function setBaseCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGlobalCurrencyCode($code)
     {
@@ -1530,7 +1537,7 @@ public function setGlobalCurrencyCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIncrementId($id)
     {
@@ -1538,7 +1545,7 @@ public function setIncrementId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -1546,7 +1553,7 @@ public function setDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -1554,7 +1561,7 @@ public function setBaseDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingDiscountTaxCompensationAmount($amount)
     {
@@ -1562,7 +1569,7 @@ public function setShippingDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     {
@@ -1570,7 +1577,7 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingInclTax($amount)
     {
@@ -1578,7 +1585,7 @@ public function setShippingInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingInclTax($amount)
     {
@@ -1586,7 +1593,7 @@ public function setBaseShippingInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTotalRefunded($amount)
     {
@@ -1594,7 +1601,7 @@ public function setBaseTotalRefunded($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountDescription($description)
     {
@@ -1602,7 +1609,7 @@ public function setDiscountDescription($description)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\InvoiceExtensionInterface|null
      */
@@ -1612,7 +1619,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\InvoiceExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
index 316764dc6d61c..ac189d2277772 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Invoice\Comment;
 
 use Magento\Sales\Model\Order\Invoice\Comment;
@@ -34,7 +35,7 @@ public function validate(Comment $comment)
         $commentData = $comment->getData();
         foreach ($this->required as $code => $label) {
             if (!$comment->hasData($code)) {
-                $errors[$code] = sprintf('%s is a required field', $label);
+                $errors[$code] = sprintf('"%s" is required. Enter and try again.', $label);
             } elseif (empty($commentData[$code])) {
                 $errors[$code] = sprintf('%s can not be empty', $label);
             }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php b/app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php
index 858490132e0c7..9ad06cea775e8 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Sales\Api\Data\InvoiceCommentInterface;
@@ -14,7 +15,13 @@
 use Magento\Sales\Api\Data\InvoiceCommentSearchResultInterfaceFactory;
 use Magento\Sales\Api\InvoiceCommentRepositoryInterface;
 use Magento\Sales\Model\Spi\InvoiceCommentResourceInterface;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceCommentSender;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Psr\Log\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CommentRepository implements InvoiceCommentRepositoryInterface
 {
     /**
@@ -37,22 +44,48 @@ class CommentRepository implements InvoiceCommentRepositoryInterface
      */
     private $collectionProcessor;
 
+    /**
+     * @var InvoiceCommentSender
+     */
+    private $invoiceCommentSender;
+
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param InvoiceCommentResourceInterface $commentResource
      * @param InvoiceCommentInterfaceFactory $commentFactory
      * @param InvoiceCommentSearchResultInterfaceFactory $searchResultFactory
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param InvoiceCommentSender|null $invoiceCommentSender
+     * @param InvoiceRepositoryInterface|null $invoiceRepository
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         InvoiceCommentResourceInterface $commentResource,
         InvoiceCommentInterfaceFactory $commentFactory,
         InvoiceCommentSearchResultInterfaceFactory $searchResultFactory,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        InvoiceCommentSender $invoiceCommentSender = null,
+        InvoiceRepositoryInterface $invoiceRepository = null,
+        LoggerInterface $logger = null
     ) {
         $this->commentResource = $commentResource;
         $this->commentFactory = $commentFactory;
         $this->searchResultFactory = $searchResultFactory;
         $this->collectionProcessor = $collectionProcessor;
+        $this->invoiceCommentSender = $invoiceCommentSender
+            ?:ObjectManager::getInstance()->get(InvoiceCommentSender::class);
+        $this->invoiceRepository = $invoiceRepository
+            ?:ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -99,6 +132,14 @@ public function save(InvoiceCommentInterface $entity)
         } catch (\Exception $e) {
             throw new CouldNotSaveException(__('Could not save the invoice comment.'), $e);
         }
+
+        try {
+            $invoice = $this->invoiceRepository->get($entity->getParentId());
+            $this->invoiceCommentSender->send($invoice, $entity->getIsCustomerNotified(), $entity->getComment());
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+        }
+
         return $entity;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
index ce415d3f0b758..f4e9b0d5a6f76 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Grand.php
@@ -8,17 +8,14 @@
 class Grand extends AbstractTotal
 {
     /**
+     * Collect invoice grand total
+     *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
     {
-        /**
-         * Check order grand total and invoice amounts
-         */
-        if ($invoice->isLast()) {
-            //
-        }
         return $this;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
index fd5c015d9db4f..6e12f10f0c679 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Invoice\Total;
 
+/**
+ * Collects invoice taxes.
+ */
 class Tax extends AbstractTotal
 {
     /**
@@ -69,11 +72,24 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
             }
         }
 
+        $taxDiscountCompensationAmt = $totalDiscountTaxCompensation;
+        $baseTaxDiscountCompensationAmt = $baseTotalDiscountTaxCompensation;
+        $allowedDiscountTaxCompensation = $order->getDiscountTaxCompensationAmount() -
+            $order->getDiscountTaxCompensationInvoiced();
+        $allowedBaseDiscountTaxCompensation = $order->getBaseDiscountTaxCompensationAmount() -
+            $order->getBaseDiscountTaxCompensationInvoiced();
+
         if ($this->_canIncludeShipping($invoice)) {
             $totalTax += $order->getShippingTaxAmount();
             $baseTotalTax += $order->getBaseShippingTaxAmount();
             $totalDiscountTaxCompensation += $order->getShippingDiscountTaxCompensationAmount();
             $baseTotalDiscountTaxCompensation += $order->getBaseShippingDiscountTaxCompensationAmnt();
+
+            $allowedDiscountTaxCompensation += $order->getShippingDiscountTaxCompensationAmount() -
+                $order->getShippingDiscountTaxCompensationInvoiced();
+            $allowedBaseDiscountTaxCompensation += $order->getBaseShippingDiscountTaxCompensationAmnt() -
+                $order->getBaseShippingDiscountTaxCompensationInvoiced();
+
             $invoice->setShippingTaxAmount($order->getShippingTaxAmount());
             $invoice->setBaseShippingTaxAmount($order->getBaseShippingTaxAmount());
             $invoice->setShippingDiscountTaxCompensationAmount($order->getShippingDiscountTaxCompensationAmount());
@@ -81,14 +97,6 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
         }
         $allowedTax = $order->getTaxAmount() - $order->getTaxInvoiced();
         $allowedBaseTax = $order->getBaseTaxAmount() - $order->getBaseTaxInvoiced();
-        $allowedDiscountTaxCompensation = $order->getDiscountTaxCompensationAmount() +
-            $order->getShippingDiscountTaxCompensationAmount() -
-            $order->getDiscountTaxCompensationInvoiced() -
-            $order->getShippingDiscountTaxCompensationInvoiced();
-        $allowedBaseDiscountTaxCompensation = $order->getBaseDiscountTaxCompensationAmount() +
-            $order->getBaseShippingDiscountTaxCompensationAmnt() -
-            $order->getBaseDiscountTaxCompensationInvoiced() -
-            $order->getBaseShippingDiscountTaxCompensationInvoiced();
 
         if ($invoice->isLast()) {
             $totalTax = $allowedTax;
@@ -107,8 +115,8 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
 
         $invoice->setTaxAmount($totalTax);
         $invoice->setBaseTaxAmount($baseTotalTax);
-        $invoice->setDiscountTaxCompensationAmount($totalDiscountTaxCompensation);
-        $invoice->setBaseDiscountTaxCompensationAmount($baseTotalDiscountTaxCompensation);
+        $invoice->setDiscountTaxCompensationAmount($taxDiscountCompensationAmt);
+        $invoice->setBaseDiscountTaxCompensationAmount($baseTaxDiscountCompensationAmt);
 
         $invoice->setGrandTotal($invoice->getGrandTotal() + $totalTax + $totalDiscountTaxCompensation);
         $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseTotalTax + $baseTotalDiscountTaxCompensation);
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php b/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php
index d6fca37d664ad..e4fcecbcf11ac 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceQuantityValidator.php
@@ -75,7 +75,7 @@ private function checkQtyAvailability(InvoiceInterface $invoice, OrderInterface
         if ($qtys) {
             $messages[] = __('The invoice contains one or more items that are not part of the original order.');
         } elseif ($totalQty <= 0) {
-            $messages[] = __('You can\'t create an invoice without products.');
+            $messages[] = __("The invoice can't be created without products. Add products and try again.");
         }
         return $messages;
     }
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
index db8cb2e1d88c8..2244a86260c2f 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
@@ -66,13 +66,15 @@ public function __construct(
     public function get($id)
     {
         if (!$id) {
-            throw new \Magento\Framework\Exception\InputException(__('ID required'));
+            throw new \Magento\Framework\Exception\InputException(__('An ID is needed. Set the ID and try again.'));
         }
         if (!isset($this->registry[$id])) {
             /** @var \Magento\Sales\Api\Data\InvoiceInterface $entity */
             $entity = $this->metadata->getNewInstance()->load($id);
             if (!$entity->getEntityId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
             $this->registry[$id] = $entity;
         }
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index da2a06c2db25a..a0eff45179ac8 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -233,7 +233,7 @@ public function getQtyToShip()
     public function getSimpleQtyToShip()
     {
         $qty = $this->getQtyOrdered() - $this->getQtyShipped() - $this->getQtyRefunded() - $this->getQtyCanceled();
-        return max($qty, 0);
+        return max(round($qty, 8), 0);
     }
 
     /**
@@ -248,7 +248,7 @@ public function getQtyToInvoice()
         }
 
         $qty = $this->getQtyOrdered() - $this->getQtyInvoiced() - $this->getQtyCanceled();
-        return max($qty, 0);
+        return max(round($qty, 8), 0);
     }
 
     /**
@@ -483,6 +483,7 @@ public function getProductOptions()
 
     /**
      * Get product options array by code.
+     *
      * If code is null return all options
      *
      * @param string $code
@@ -540,8 +541,7 @@ public function getChildrenItems()
     }
 
     /**
-     * Return checking of what calculation
-     * type was for this product
+     * Return checking of what calculation type was for this product
      *
      * @return bool
      */
@@ -581,8 +581,7 @@ public function getForceApplyDiscountToParentItem()
     }
 
     /**
-     * Return checking of what shipment
-     * type was for this product
+     * Return checking of what shipment type was for this product
      *
      * @return bool
      */
@@ -605,9 +604,9 @@ public function isShipSeparately()
     }
 
     /**
-     * This is Dummy item or not
-     * if $shipment is true then we checking this for shipping situation if not
-     * then we checking this for calculation
+     * This is Dummy item or not.
+     *
+     * If $shipment is true then we checking this for shipping situation if not, we checking this for calculation.
      *
      * @param bool $shipment
      * @return bool
@@ -652,8 +651,9 @@ public function isDummy($shipment = false)
     }
 
     /**
-     * Returns formatted buy request - object, holding request received from
-     * product view page with keys and options for configured product
+     * Return formatted buy request.
+     *
+     * This object is holding request received from product view page with keys and options for configured product.
      *
      * @return \Magento\Framework\DataObject
      */
@@ -703,7 +703,7 @@ public function getStore()
     //@codeCoverageIgnoreStart
 
     /**
-     * Returns additional_data
+     * Return additional_data
      *
      * @return string|null
      */
@@ -713,7 +713,7 @@ public function getAdditionalData()
     }
 
     /**
-     * Returns amount_refunded
+     * Return amount_refunded
      *
      * @return float|null
      */
@@ -723,7 +723,9 @@ public function getAmountRefunded()
     }
 
     /**
-     * Returns applied_rule_ids
+     * Return applied_rule_ids
+     *
+     * Rules are comma separated if there are more than one.
      *
      * @return string|null
      */
@@ -733,7 +735,7 @@ public function getAppliedRuleIds()
     }
 
     /**
-     * Returns base_amount_refunded
+     * Return base_amount_refunded
      *
      * @return float|null
      */
@@ -743,7 +745,7 @@ public function getBaseAmountRefunded()
     }
 
     /**
-     * Returns base_cost
+     * Return base_cost
      *
      * @return float|null
      */
@@ -753,7 +755,7 @@ public function getBaseCost()
     }
 
     /**
-     * Returns base_discount_amount
+     * Return base_discount_amount
      *
      * @return float|null
      */
@@ -763,7 +765,7 @@ public function getBaseDiscountAmount()
     }
 
     /**
-     * Returns base_discount_invoiced
+     * Return base_discount_invoiced
      *
      * @return float|null
      */
@@ -773,7 +775,7 @@ public function getBaseDiscountInvoiced()
     }
 
     /**
-     * Returns base_discount_refunded
+     * Return base_discount_refunded
      *
      * @return float|null
      */
@@ -783,7 +785,7 @@ public function getBaseDiscountRefunded()
     }
 
     /**
-     * Returns base_discount_tax_compensation_amount
+     * Return base_discount_tax_compensation_amount
      *
      * @return float|null
      */
@@ -793,7 +795,7 @@ public function getBaseDiscountTaxCompensationAmount()
     }
 
     /**
-     * Returns base_discount_tax_compensation_invoiced
+     * Return base_discount_tax_compensation_invoiced
      *
      * @return float|null
      */
@@ -803,7 +805,7 @@ public function getBaseDiscountTaxCompensationInvoiced()
     }
 
     /**
-     * Returns base_discount_tax_compensation_refunded
+     * Return base_discount_tax_compensation_refunded
      *
      * @return float|null
      */
@@ -813,7 +815,7 @@ public function getBaseDiscountTaxCompensationRefunded()
     }
 
     /**
-     * Returns base_original_price
+     * Return base_original_price
      *
      * @return float|null
      */
@@ -823,7 +825,7 @@ public function getBaseOriginalPrice()
     }
 
     /**
-     * Returns base_price
+     * Return base_price
      *
      * @return float|null
      */
@@ -833,7 +835,7 @@ public function getBasePrice()
     }
 
     /**
-     * Returns base_price_incl_tax
+     * Return base_price_incl_tax
      *
      * @return float|null
      */
@@ -843,7 +845,7 @@ public function getBasePriceInclTax()
     }
 
     /**
-     * Returns base_row_invoiced
+     * Return base_row_invoiced
      *
      * @return float|null
      */
@@ -853,7 +855,7 @@ public function getBaseRowInvoiced()
     }
 
     /**
-     * Returns base_row_total
+     * Return base_row_total
      *
      * @return float|null
      */
@@ -863,7 +865,7 @@ public function getBaseRowTotal()
     }
 
     /**
-     * Returns base_row_total_incl_tax
+     * Return base_row_total_incl_tax
      *
      * @return float|null
      */
@@ -873,7 +875,7 @@ public function getBaseRowTotalInclTax()
     }
 
     /**
-     * Returns base_tax_amount
+     * Return base_tax_amount
      *
      * @return float|null
      */
@@ -883,7 +885,7 @@ public function getBaseTaxAmount()
     }
 
     /**
-     * Returns base_tax_before_discount
+     * Return base_tax_before_discount
      *
      * @return float|null
      */
@@ -893,7 +895,7 @@ public function getBaseTaxBeforeDiscount()
     }
 
     /**
-     * Returns base_tax_invoiced
+     * Return base_tax_invoiced
      *
      * @return float|null
      */
@@ -903,7 +905,7 @@ public function getBaseTaxInvoiced()
     }
 
     /**
-     * Returns base_tax_refunded
+     * Return base_tax_refunded
      *
      * @return float|null
      */
@@ -913,7 +915,7 @@ public function getBaseTaxRefunded()
     }
 
     /**
-     * Returns base_weee_tax_applied_amount
+     * Return base_weee_tax_applied_amount
      *
      * @return float|null
      */
@@ -923,7 +925,7 @@ public function getBaseWeeeTaxAppliedAmount()
     }
 
     /**
-     * Returns base_weee_tax_applied_row_amnt
+     * Return base_weee_tax_applied_row_amnt
      *
      * @return float|null
      */
@@ -933,7 +935,7 @@ public function getBaseWeeeTaxAppliedRowAmnt()
     }
 
     /**
-     * Returns base_weee_tax_disposition
+     * Return base_weee_tax_disposition
      *
      * @return float|null
      */
@@ -943,7 +945,7 @@ public function getBaseWeeeTaxDisposition()
     }
 
     /**
-     * Returns base_weee_tax_row_disposition
+     * Return base_weee_tax_row_disposition
      *
      * @return float|null
      */
@@ -953,7 +955,7 @@ public function getBaseWeeeTaxRowDisposition()
     }
 
     /**
-     * Returns created_at
+     * Return created_at
      *
      * @return string|null
      */
@@ -963,7 +965,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -971,7 +973,7 @@ public function setCreatedAt($createdAt)
     }
 
     /**
-     * Returns description
+     * Return description
      *
      * @return string|null
      */
@@ -981,7 +983,7 @@ public function getDescription()
     }
 
     /**
-     * Returns discount_amount
+     * Return discount_amount
      *
      * @return float|null
      */
@@ -991,7 +993,7 @@ public function getDiscountAmount()
     }
 
     /**
-     * Returns discount_invoiced
+     * Return discount_invoiced
      *
      * @return float|null
      */
@@ -1001,7 +1003,7 @@ public function getDiscountInvoiced()
     }
 
     /**
-     * Returns discount_percent
+     * Return discount_percent
      *
      * @return float|null
      */
@@ -1011,7 +1013,7 @@ public function getDiscountPercent()
     }
 
     /**
-     * Returns discount_refunded
+     * Return discount_refunded
      *
      * @return float|null
      */
@@ -1021,7 +1023,7 @@ public function getDiscountRefunded()
     }
 
     /**
-     * Returns event_id
+     * Return event_id
      *
      * @return int|null
      */
@@ -1031,7 +1033,7 @@ public function getEventId()
     }
 
     /**
-     * Returns ext_order_item_id
+     * Return ext_order_item_id
      *
      * @return string|null
      */
@@ -1041,7 +1043,7 @@ public function getExtOrderItemId()
     }
 
     /**
-     * Returns free_shipping
+     * Return free_shipping
      *
      * @return int|null
      */
@@ -1051,7 +1053,7 @@ public function getFreeShipping()
     }
 
     /**
-     * Returns gw_base_price
+     * Return gw_base_price
      *
      * @return float|null
      */
@@ -1061,7 +1063,7 @@ public function getGwBasePrice()
     }
 
     /**
-     * Returns gw_base_price_invoiced
+     * Return gw_base_price_invoiced
      *
      * @return float|null
      */
@@ -1071,7 +1073,7 @@ public function getGwBasePriceInvoiced()
     }
 
     /**
-     * Returns gw_base_price_refunded
+     * Return gw_base_price_refunded
      *
      * @return float|null
      */
@@ -1081,7 +1083,7 @@ public function getGwBasePriceRefunded()
     }
 
     /**
-     * Returns gw_base_tax_amount
+     * Return gw_base_tax_amount
      *
      * @return float|null
      */
@@ -1091,7 +1093,7 @@ public function getGwBaseTaxAmount()
     }
 
     /**
-     * Returns gw_base_tax_amount_invoiced
+     * Return gw_base_tax_amount_invoiced
      *
      * @return float|null
      */
@@ -1101,7 +1103,7 @@ public function getGwBaseTaxAmountInvoiced()
     }
 
     /**
-     * Returns gw_base_tax_amount_refunded
+     * Return gw_base_tax_amount_refunded
      *
      * @return float|null
      */
@@ -1111,7 +1113,7 @@ public function getGwBaseTaxAmountRefunded()
     }
 
     /**
-     * Returns gw_id
+     * Return gw_id
      *
      * @return int|null
      */
@@ -1121,7 +1123,7 @@ public function getGwId()
     }
 
     /**
-     * Returns gw_price
+     * Return gw_price
      *
      * @return float|null
      */
@@ -1131,7 +1133,7 @@ public function getGwPrice()
     }
 
     /**
-     * Returns gw_price_invoiced
+     * Return gw_price_invoiced
      *
      * @return float|null
      */
@@ -1141,7 +1143,7 @@ public function getGwPriceInvoiced()
     }
 
     /**
-     * Returns gw_price_refunded
+     * Return gw_price_refunded
      *
      * @return float|null
      */
@@ -1151,7 +1153,7 @@ public function getGwPriceRefunded()
     }
 
     /**
-     * Returns gw_tax_amount
+     * Return gw_tax_amount
      *
      * @return float|null
      */
@@ -1161,7 +1163,7 @@ public function getGwTaxAmount()
     }
 
     /**
-     * Returns gw_tax_amount_invoiced
+     * Return gw_tax_amount_invoiced
      *
      * @return float|null
      */
@@ -1171,7 +1173,7 @@ public function getGwTaxAmountInvoiced()
     }
 
     /**
-     * Returns gw_tax_amount_refunded
+     * Return gw_tax_amount_refunded
      *
      * @return float|null
      */
@@ -1181,7 +1183,7 @@ public function getGwTaxAmountRefunded()
     }
 
     /**
-     * Returns discount_tax_compensation_amount
+     * Return discount_tax_compensation_amount
      *
      * @return float|null
      */
@@ -1191,7 +1193,7 @@ public function getDiscountTaxCompensationAmount()
     }
 
     /**
-     * Returns discount_tax_compensation_canceled
+     * Return discount_tax_compensation_canceled
      *
      * @return float|null
      */
@@ -1201,7 +1203,7 @@ public function getDiscountTaxCompensationCanceled()
     }
 
     /**
-     * Returns discount_tax_compensation_invoiced
+     * Return discount_tax_compensation_invoiced
      *
      * @return float|null
      */
@@ -1211,7 +1213,7 @@ public function getDiscountTaxCompensationInvoiced()
     }
 
     /**
-     * Returns discount_tax_compensation_refunded
+     * Return discount_tax_compensation_refunded
      *
      * @return float|null
      */
@@ -1221,7 +1223,7 @@ public function getDiscountTaxCompensationRefunded()
     }
 
     /**
-     * Returns is_qty_decimal
+     * Return is_qty_decimal
      *
      * @return int|null
      */
@@ -1231,7 +1233,7 @@ public function getIsQtyDecimal()
     }
 
     /**
-     * Returns is_virtual
+     * Return is_virtual
      *
      * @return int|null
      */
@@ -1241,7 +1243,7 @@ public function getIsVirtual()
     }
 
     /**
-     * Returns item_id
+     * Return item_id
      *
      * @return int|null
      */
@@ -1251,7 +1253,7 @@ public function getItemId()
     }
 
     /**
-     * Returns locked_do_invoice
+     * Return locked_do_invoice
      *
      * @return int|null
      */
@@ -1261,7 +1263,7 @@ public function getLockedDoInvoice()
     }
 
     /**
-     * Returns locked_do_ship
+     * Return locked_do_ship
      *
      * @return int|null
      */
@@ -1271,7 +1273,7 @@ public function getLockedDoShip()
     }
 
     /**
-     * Returns name
+     * Return name
      *
      * @return string|null
      */
@@ -1281,7 +1283,7 @@ public function getName()
     }
 
     /**
-     * Returns no_discount
+     * Return no_discount
      *
      * @return int|null
      */
@@ -1291,7 +1293,7 @@ public function getNoDiscount()
     }
 
     /**
-     * Returns order_id
+     * Return order_id
      *
      * @return int|null
      */
@@ -1301,7 +1303,7 @@ public function getOrderId()
     }
 
     /**
-     * Returns parent_item_id
+     * Return parent_item_id
      *
      * @return int|null
      */
@@ -1311,7 +1313,7 @@ public function getParentItemId()
     }
 
     /**
-     * Returns price
+     * Return price
      *
      * @return float|null
      */
@@ -1321,7 +1323,7 @@ public function getPrice()
     }
 
     /**
-     * Returns price_incl_tax
+     * Return price_incl_tax
      *
      * @return float|null
      */
@@ -1331,7 +1333,7 @@ public function getPriceInclTax()
     }
 
     /**
-     * Returns product_id
+     * Return product_id
      *
      * @return int|null
      */
@@ -1341,7 +1343,7 @@ public function getProductId()
     }
 
     /**
-     * Returns product_type
+     * Return product_type
      *
      * @return string|null
      */
@@ -1351,7 +1353,7 @@ public function getProductType()
     }
 
     /**
-     * Returns qty_backordered
+     * Return qty_backordered
      *
      * @return float|null
      */
@@ -1361,7 +1363,7 @@ public function getQtyBackordered()
     }
 
     /**
-     * Returns qty_canceled
+     * Return qty_canceled
      *
      * @return float|null
      */
@@ -1371,7 +1373,7 @@ public function getQtyCanceled()
     }
 
     /**
-     * Returns qty_invoiced
+     * Return qty_invoiced
      *
      * @return float|null
      */
@@ -1381,7 +1383,7 @@ public function getQtyInvoiced()
     }
 
     /**
-     * Returns qty_ordered
+     * Return qty_ordered
      *
      * @return float|null
      */
@@ -1391,7 +1393,7 @@ public function getQtyOrdered()
     }
 
     /**
-     * Returns qty_refunded
+     * Return qty_refunded
      *
      * @return float|null
      */
@@ -1401,7 +1403,7 @@ public function getQtyRefunded()
     }
 
     /**
-     * Returns qty_returned
+     * Return qty_returned
      *
      * @return float|null
      */
@@ -1411,7 +1413,7 @@ public function getQtyReturned()
     }
 
     /**
-     * Returns qty_shipped
+     * Return qty_shipped
      *
      * @return float|null
      */
@@ -1421,7 +1423,7 @@ public function getQtyShipped()
     }
 
     /**
-     * Returns quote_item_id
+     * Return quote_item_id
      *
      * @return int|null
      */
@@ -1431,7 +1433,7 @@ public function getQuoteItemId()
     }
 
     /**
-     * Returns row_invoiced
+     * Return row_invoiced
      *
      * @return float|null
      */
@@ -1441,7 +1443,7 @@ public function getRowInvoiced()
     }
 
     /**
-     * Returns row_total
+     * Return row_total
      *
      * @return float|null
      */
@@ -1451,7 +1453,7 @@ public function getRowTotal()
     }
 
     /**
-     * Returns row_total_incl_tax
+     * Return row_total_incl_tax
      *
      * @return float|null
      */
@@ -1461,7 +1463,7 @@ public function getRowTotalInclTax()
     }
 
     /**
-     * Returns row_weight
+     * Return row_weight
      *
      * @return float|null
      */
@@ -1471,7 +1473,7 @@ public function getRowWeight()
     }
 
     /**
-     * Returns sku
+     * Return sku
      *
      * @return string
      */
@@ -1481,7 +1483,7 @@ public function getSku()
     }
 
     /**
-     * Returns store_id
+     * Return store_id
      *
      * @return int|null
      */
@@ -1491,7 +1493,7 @@ public function getStoreId()
     }
 
     /**
-     * Returns tax_amount
+     * Return tax_amount
      *
      * @return float|null
      */
@@ -1501,7 +1503,7 @@ public function getTaxAmount()
     }
 
     /**
-     * Returns tax_before_discount
+     * Return tax_before_discount
      *
      * @return float|null
      */
@@ -1511,7 +1513,7 @@ public function getTaxBeforeDiscount()
     }
 
     /**
-     * Returns tax_canceled
+     * Return tax_canceled
      *
      * @return float|null
      */
@@ -1521,7 +1523,7 @@ public function getTaxCanceled()
     }
 
     /**
-     * Returns tax_invoiced
+     * Return tax_invoiced
      *
      * @return float|null
      */
@@ -1531,7 +1533,7 @@ public function getTaxInvoiced()
     }
 
     /**
-     * Returns tax_percent
+     * Return tax_percent
      *
      * @return float|null
      */
@@ -1541,7 +1543,7 @@ public function getTaxPercent()
     }
 
     /**
-     * Returns tax_refunded
+     * Return tax_refunded
      *
      * @return float|null
      */
@@ -1551,7 +1553,7 @@ public function getTaxRefunded()
     }
 
     /**
-     * Returns updated_at
+     * Return updated_at
      *
      * @return string|null
      */
@@ -1561,7 +1563,7 @@ public function getUpdatedAt()
     }
 
     /**
-     * Returns weee_tax_applied
+     * Return weee_tax_applied
      *
      * @return string|null
      */
@@ -1571,7 +1573,7 @@ public function getWeeeTaxApplied()
     }
 
     /**
-     * Returns weee_tax_applied_amount
+     * Return weee_tax_applied_amount
      *
      * @return float|null
      */
@@ -1581,7 +1583,7 @@ public function getWeeeTaxAppliedAmount()
     }
 
     /**
-     * Returns weee_tax_applied_row_amount
+     * Return weee_tax_applied_row_amount
      *
      * @return float|null
      */
@@ -1591,7 +1593,7 @@ public function getWeeeTaxAppliedRowAmount()
     }
 
     /**
-     * Returns weee_tax_disposition
+     * Return weee_tax_disposition
      *
      * @return float|null
      */
@@ -1601,7 +1603,7 @@ public function getWeeeTaxDisposition()
     }
 
     /**
-     * Returns weee_tax_row_disposition
+     * Return weee_tax_row_disposition
      *
      * @return float|null
      */
@@ -1611,7 +1613,7 @@ public function getWeeeTaxRowDisposition()
     }
 
     /**
-     * Returns weight
+     * Return weight
      *
      * @return float|null
      */
@@ -1621,7 +1623,7 @@ public function getWeight()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($timestamp)
     {
@@ -1629,7 +1631,7 @@ public function setUpdatedAt($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItemId($id)
     {
@@ -1637,7 +1639,7 @@ public function setItemId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderId($id)
     {
@@ -1645,7 +1647,7 @@ public function setOrderId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setParentItemId($id)
     {
@@ -1653,7 +1655,7 @@ public function setParentItemId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQuoteItemId($id)
     {
@@ -1661,7 +1663,7 @@ public function setQuoteItemId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($id)
     {
@@ -1669,7 +1671,7 @@ public function setStoreId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProductId($id)
     {
@@ -1677,7 +1679,7 @@ public function setProductId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProductType($productType)
     {
@@ -1685,7 +1687,7 @@ public function setProductType($productType)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeight($weight)
     {
@@ -1693,7 +1695,7 @@ public function setWeight($weight)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsVirtual($isVirtual)
     {
@@ -1701,7 +1703,7 @@ public function setIsVirtual($isVirtual)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSku($sku)
     {
@@ -1709,7 +1711,7 @@ public function setSku($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setName($name)
     {
@@ -1717,7 +1719,7 @@ public function setName($name)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDescription($description)
     {
@@ -1725,7 +1727,7 @@ public function setDescription($description)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAppliedRuleIds($appliedRuleIds)
     {
@@ -1733,7 +1735,7 @@ public function setAppliedRuleIds($appliedRuleIds)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAdditionalData($additionalData)
     {
@@ -1741,7 +1743,7 @@ public function setAdditionalData($additionalData)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsQtyDecimal($isQtyDecimal)
     {
@@ -1749,7 +1751,7 @@ public function setIsQtyDecimal($isQtyDecimal)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setNoDiscount($noDiscount)
     {
@@ -1757,7 +1759,7 @@ public function setNoDiscount($noDiscount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyBackordered($qtyBackordered)
     {
@@ -1765,7 +1767,7 @@ public function setQtyBackordered($qtyBackordered)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyCanceled($qtyCanceled)
     {
@@ -1773,7 +1775,7 @@ public function setQtyCanceled($qtyCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyInvoiced($qtyInvoiced)
     {
@@ -1781,7 +1783,7 @@ public function setQtyInvoiced($qtyInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyOrdered($qtyOrdered)
     {
@@ -1789,7 +1791,7 @@ public function setQtyOrdered($qtyOrdered)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyRefunded($qtyRefunded)
     {
@@ -1797,7 +1799,7 @@ public function setQtyRefunded($qtyRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyShipped($qtyShipped)
     {
@@ -1805,7 +1807,7 @@ public function setQtyShipped($qtyShipped)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseCost($baseCost)
     {
@@ -1813,7 +1815,7 @@ public function setBaseCost($baseCost)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrice($price)
     {
@@ -1821,7 +1823,7 @@ public function setPrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBasePrice($price)
     {
@@ -1829,7 +1831,7 @@ public function setBasePrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOriginalPrice($price)
     {
@@ -1837,7 +1839,7 @@ public function setOriginalPrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseOriginalPrice($price)
     {
@@ -1845,7 +1847,7 @@ public function setBaseOriginalPrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxPercent($taxPercent)
     {
@@ -1853,7 +1855,7 @@ public function setTaxPercent($taxPercent)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxAmount($amount)
     {
@@ -1861,7 +1863,7 @@ public function setTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxAmount($amount)
     {
@@ -1869,7 +1871,7 @@ public function setBaseTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxInvoiced($taxInvoiced)
     {
@@ -1877,7 +1879,7 @@ public function setTaxInvoiced($taxInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxInvoiced($baseTaxInvoiced)
     {
@@ -1885,7 +1887,7 @@ public function setBaseTaxInvoiced($baseTaxInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountPercent($discountPercent)
     {
@@ -1893,7 +1895,7 @@ public function setDiscountPercent($discountPercent)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountAmount($amount)
     {
@@ -1901,7 +1903,7 @@ public function setDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -1909,7 +1911,7 @@ public function setBaseDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountInvoiced($discountInvoiced)
     {
@@ -1917,7 +1919,7 @@ public function setDiscountInvoiced($discountInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountInvoiced($baseDiscountInvoiced)
     {
@@ -1925,7 +1927,7 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAmountRefunded($amountRefunded)
     {
@@ -1933,7 +1935,7 @@ public function setAmountRefunded($amountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountRefunded($baseAmountRefunded)
     {
@@ -1941,7 +1943,7 @@ public function setBaseAmountRefunded($baseAmountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRowTotal($amount)
     {
@@ -1949,7 +1951,7 @@ public function setRowTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseRowTotal($amount)
     {
@@ -1957,7 +1959,7 @@ public function setBaseRowTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRowInvoiced($rowInvoiced)
     {
@@ -1965,7 +1967,7 @@ public function setRowInvoiced($rowInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseRowInvoiced($baseRowInvoiced)
     {
@@ -1973,7 +1975,7 @@ public function setBaseRowInvoiced($baseRowInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRowWeight($rowWeight)
     {
@@ -1981,7 +1983,7 @@ public function setRowWeight($rowWeight)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount)
     {
@@ -1989,7 +1991,7 @@ public function setBaseTaxBeforeDiscount($baseTaxBeforeDiscount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxBeforeDiscount($taxBeforeDiscount)
     {
@@ -1997,7 +1999,7 @@ public function setTaxBeforeDiscount($taxBeforeDiscount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtOrderItemId($id)
     {
@@ -2005,7 +2007,7 @@ public function setExtOrderItemId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLockedDoInvoice($flag)
     {
@@ -2013,7 +2015,7 @@ public function setLockedDoInvoice($flag)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLockedDoShip($flag)
     {
@@ -2021,7 +2023,7 @@ public function setLockedDoShip($flag)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPriceInclTax($amount)
     {
@@ -2029,7 +2031,7 @@ public function setPriceInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBasePriceInclTax($amount)
     {
@@ -2037,7 +2039,7 @@ public function setBasePriceInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRowTotalInclTax($amount)
     {
@@ -2045,7 +2047,7 @@ public function setRowTotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseRowTotalInclTax($amount)
     {
@@ -2053,7 +2055,7 @@ public function setBaseRowTotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -2061,7 +2063,7 @@ public function setDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -2069,7 +2071,7 @@ public function setBaseDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced)
     {
@@ -2077,7 +2079,7 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced)
     {
@@ -2088,7 +2090,7 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded)
     {
@@ -2096,7 +2098,7 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded)
     {
@@ -2107,7 +2109,7 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxCanceled($taxCanceled)
     {
@@ -2115,7 +2117,7 @@ public function setTaxCanceled($taxCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationCanceled($discountTaxCompensationCanceled)
     {
@@ -2123,7 +2125,7 @@ public function setDiscountTaxCompensationCanceled($discountTaxCompensationCance
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxRefunded($taxRefunded)
     {
@@ -2131,7 +2133,7 @@ public function setTaxRefunded($taxRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxRefunded($baseTaxRefunded)
     {
@@ -2139,7 +2141,7 @@ public function setBaseTaxRefunded($baseTaxRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountRefunded($discountRefunded)
     {
@@ -2147,7 +2149,7 @@ public function setDiscountRefunded($discountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountRefunded($baseDiscountRefunded)
     {
@@ -2155,7 +2157,7 @@ public function setBaseDiscountRefunded($baseDiscountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwId($id)
     {
@@ -2163,7 +2165,7 @@ public function setGwId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwBasePrice($price)
     {
@@ -2171,7 +2173,7 @@ public function setGwBasePrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwPrice($price)
     {
@@ -2179,7 +2181,7 @@ public function setGwPrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwBaseTaxAmount($amount)
     {
@@ -2187,7 +2189,7 @@ public function setGwBaseTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwTaxAmount($amount)
     {
@@ -2195,7 +2197,7 @@ public function setGwTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwBasePriceInvoiced($gwBasePriceInvoiced)
     {
@@ -2203,7 +2205,7 @@ public function setGwBasePriceInvoiced($gwBasePriceInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwPriceInvoiced($gwPriceInvoiced)
     {
@@ -2211,7 +2213,7 @@ public function setGwPriceInvoiced($gwPriceInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced)
     {
@@ -2219,7 +2221,7 @@ public function setGwBaseTaxAmountInvoiced($gwBaseTaxAmountInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced)
     {
@@ -2227,7 +2229,7 @@ public function setGwTaxAmountInvoiced($gwTaxAmountInvoiced)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwBasePriceRefunded($gwBasePriceRefunded)
     {
@@ -2235,7 +2237,7 @@ public function setGwBasePriceRefunded($gwBasePriceRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwPriceRefunded($gwPriceRefunded)
     {
@@ -2243,7 +2245,7 @@ public function setGwPriceRefunded($gwPriceRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded)
     {
@@ -2251,7 +2253,7 @@ public function setGwBaseTaxAmountRefunded($gwBaseTaxAmountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGwTaxAmountRefunded($gwTaxAmountRefunded)
     {
@@ -2259,7 +2261,7 @@ public function setGwTaxAmountRefunded($gwTaxAmountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFreeShipping($freeShipping)
     {
@@ -2267,7 +2269,7 @@ public function setFreeShipping($freeShipping)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQtyReturned($qtyReturned)
     {
@@ -2275,7 +2277,7 @@ public function setQtyReturned($qtyReturned)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEventId($id)
     {
@@ -2283,7 +2285,7 @@ public function setEventId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxAppliedAmount($amount)
     {
@@ -2291,7 +2293,7 @@ public function setBaseWeeeTaxAppliedAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxAppliedRowAmnt($amnt)
     {
@@ -2299,7 +2301,7 @@ public function setBaseWeeeTaxAppliedRowAmnt($amnt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxAppliedAmount($amount)
     {
@@ -2307,7 +2309,7 @@ public function setWeeeTaxAppliedAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxAppliedRowAmount($amount)
     {
@@ -2315,7 +2317,7 @@ public function setWeeeTaxAppliedRowAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxApplied($weeeTaxApplied)
     {
@@ -2323,7 +2325,7 @@ public function setWeeeTaxApplied($weeeTaxApplied)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxDisposition($weeeTaxDisposition)
     {
@@ -2331,7 +2333,7 @@ public function setWeeeTaxDisposition($weeeTaxDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
     {
@@ -2339,7 +2341,7 @@ public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
     {
@@ -2347,7 +2349,7 @@ public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
     {
@@ -2355,7 +2357,7 @@ public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getProductOption()
     {
@@ -2363,7 +2365,7 @@ public function getProductOption()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterface $productOption)
     {
@@ -2371,7 +2373,7 @@ public function setProductOption(\Magento\Catalog\Api\Data\ProductOptionInterfac
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\OrderItemExtensionInterface|null
      */
@@ -2381,7 +2383,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\OrderItemExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Sales/Model/Order/ItemRepository.php b/app/code/Magento/Sales/Model/Order/ItemRepository.php
index 8ded805546c8a..6e029ac468370 100644
--- a/app/code/Magento/Sales/Model/Order/ItemRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ItemRepository.php
@@ -3,21 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order;
 
-use Magento\Catalog\Api\Data\ProductOptionExtensionFactory;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Catalog\Model\ProductOptionFactory;
 use Magento\Catalog\Model\ProductOptionProcessorInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\DataObject\Factory as DataObjectFactory;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Sales\Api\Data\OrderItemSearchResultInterface;
 use Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
+use Magento\Sales\Model\Order\ProductOption;
 use Magento\Sales\Model\ResourceModel\Metadata;
 
 /**
@@ -41,16 +40,6 @@ class ItemRepository implements OrderItemRepositoryInterface
      */
     protected $searchResultFactory;
 
-    /**
-     * @var ProductOptionFactory
-     */
-    protected $productOptionFactory;
-
-    /**
-     * @var ProductOptionExtensionFactory
-     */
-    protected $extensionFactory;
-
     /**
      * @var ProductOptionProcessorInterface[]
      */
@@ -62,40 +51,41 @@ class ItemRepository implements OrderItemRepositoryInterface
     protected $registry = [];
 
     /**
-     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
+     * @var CollectionProcessorInterface
      */
     private $collectionProcessor;
 
     /**
-     * ItemRepository constructor.
+     * @var ProductOption
+     */
+    private $productOption;
+
+    /**
      * @param DataObjectFactory $objectFactory
      * @param Metadata $metadata
      * @param OrderItemSearchResultInterfaceFactory $searchResultFactory
-     * @param ProductOptionFactory $productOptionFactory
-     * @param ProductOptionExtensionFactory $extensionFactory
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param ProductOption $productOption
      * @param array $processorPool
-     * @param CollectionProcessorInterface|null $collectionProcessor
      */
     public function __construct(
         DataObjectFactory $objectFactory,
         Metadata $metadata,
         OrderItemSearchResultInterfaceFactory $searchResultFactory,
-        ProductOptionFactory $productOptionFactory,
-        ProductOptionExtensionFactory $extensionFactory,
-        array $processorPool = [],
-        CollectionProcessorInterface $collectionProcessor = null
+        CollectionProcessorInterface $collectionProcessor,
+        ProductOption $productOption,
+        array $processorPool = []
     ) {
         $this->objectFactory = $objectFactory;
         $this->metadata = $metadata;
         $this->searchResultFactory = $searchResultFactory;
-        $this->productOptionFactory = $productOptionFactory;
-        $this->extensionFactory = $extensionFactory;
+        $this->collectionProcessor = $collectionProcessor;
+        $this->productOption = $productOption;
         $this->processorPool = $processorPool;
-        $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
     }
 
     /**
-     * load entity
+     * Loads entity.
      *
      * @param int $id
      * @return OrderItemInterface
@@ -105,16 +95,19 @@ public function __construct(
     public function get($id)
     {
         if (!$id) {
-            throw new InputException(__('ID required'));
+            throw new InputException(__('An ID is needed. Set the ID and try again.'));
         }
         if (!isset($this->registry[$id])) {
             /** @var OrderItemInterface $orderItem */
             $orderItem = $this->metadata->getNewInstance()->load($id);
             if (!$orderItem->getItemId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
 
-            $this->addProductOption($orderItem);
+            $this->productOption->add($orderItem);
+            $this->addParentItem($orderItem);
             $this->registry[$id] = $orderItem;
         }
         return $this->registry[$id];
@@ -134,7 +127,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         $this->collectionProcessor->process($searchCriteria, $searchResult);
         /** @var OrderItemInterface $orderItem */
         foreach ($searchResult->getItems() as $orderItem) {
-            $this->addProductOption($orderItem);
+            $this->productOption->add($orderItem);
         }
 
         return $searchResult;
@@ -175,7 +168,9 @@ public function save(OrderItemInterface $entity)
     {
         if ($entity->getProductOption()) {
             $request = $this->getBuyRequest($entity);
-            $entity->setProductOptions(['info_buyRequest' => $request->toArray()]);
+            $productOptions = $entity->getProductOptions();
+            $productOptions['info_buyRequest'] = $request->toArray();
+            $entity->setProductOptions($productOptions);
         }
 
         $this->metadata->getMapper()->save($entity);
@@ -184,60 +179,25 @@ public function save(OrderItemInterface $entity)
     }
 
     /**
-     * Add product option data
+     * Set parent item.
      *
      * @param OrderItemInterface $orderItem
-     * @return $this
+     * @throws InputException
+     * @throws NoSuchEntityException
      */
-    protected function addProductOption(OrderItemInterface $orderItem)
+    private function addParentItem(OrderItemInterface $orderItem)
     {
-        /** @var DataObject $request */
-        $request = $orderItem->getBuyRequest();
-
-        $productType = $orderItem->getProductType();
-        if (isset($this->processorPool[$productType])
-            && !$orderItem->getParentItemId()) {
-            $data = $this->processorPool[$productType]->convertToProductOption($request);
-            if ($data) {
-                $this->setProductOption($orderItem, $data);
-            }
-        }
-
-        if (isset($this->processorPool['custom_options'])
-            && !$orderItem->getParentItemId()) {
-            $data = $this->processorPool['custom_options']->convertToProductOption($request);
-            if ($data) {
-                $this->setProductOption($orderItem, $data);
+        if ($parentId = $orderItem->getParentItemId()) {
+            $orderItem->setParentItem($this->get($parentId));
+        } else {
+            $orderCollection = $orderItem->getOrder()->getItemsCollection()->filterByParent($orderItem->getItemId());
+
+            foreach ($orderCollection->getItems() as $item) {
+                if ($item->getParentItemId() === $orderItem->getItemId()) {
+                    $item->setParentItem($orderItem);
+                }
             }
         }
-
-        return $this;
-    }
-
-    /**
-     * Set product options data
-     *
-     * @param OrderItemInterface $orderItem
-     * @param array $data
-     * @return $this
-     */
-    protected function setProductOption(OrderItemInterface $orderItem, array $data)
-    {
-        $productOption = $orderItem->getProductOption();
-        if (!$productOption) {
-            $productOption = $this->productOptionFactory->create();
-            $orderItem->setProductOption($productOption);
-        }
-
-        $extensionAttributes = $productOption->getExtensionAttributes();
-        if (!$extensionAttributes) {
-            $extensionAttributes = $this->extensionFactory->create();
-            $productOption->setExtensionAttributes($extensionAttributes);
-        }
-
-        $extensionAttributes->setData(key($data), current($data));
-
-        return $this;
     }
 
     /**
@@ -271,20 +231,4 @@ protected function getBuyRequest(OrderItemInterface $entity)
 
         return $request;
     }
-
-    /**
-     * Retrieve collection processor
-     *
-     * @deprecated 100.2.0
-     * @return CollectionProcessorInterface
-     */
-    private function getCollectionProcessor()
-    {
-        if (!$this->collectionProcessor) {
-            $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
-            );
-        }
-        return $this->collectionProcessor;
-    }
 }
diff --git a/app/code/Magento/Sales/Model/Order/OrderCustomerDelegate.php b/app/code/Magento/Sales/Model/Order/OrderCustomerDelegate.php
new file mode 100644
index 0000000000000..5d0cd4f37df5a
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/OrderCustomerDelegate.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Customer\Api\AccountDelegationInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Sales\Api\OrderCustomerDelegateInterface;
+use Magento\Sales\Observer\AssignOrderToCustomerObserver;
+
+/**
+ * {@inheritdoc}
+ *
+ * @see AssignOrderToCustomerObserver
+ */
+class OrderCustomerDelegate implements OrderCustomerDelegateInterface
+{
+    /**
+     * @var OrderCustomerExtractor
+     */
+    private $customerExtractor;
+
+    /**
+     * @var AccountDelegationInterface
+     */
+    private $delegateService;
+
+    /**
+     * @param OrderCustomerExtractor $customerExtractor
+     * @param AccountDelegationInterface $delegateService
+     */
+    public function __construct(
+        OrderCustomerExtractor $customerExtractor,
+        AccountDelegationInterface $delegateService
+    ) {
+        $this->customerExtractor = $customerExtractor;
+        $this->delegateService = $delegateService;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delegateNew(int $orderId): Redirect
+    {
+        return $this->delegateService->createRedirectForNew(
+            $this->customerExtractor->extract($orderId),
+            ['__sales_assign_order_id' => $orderId]
+        );
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
new file mode 100644
index 0000000000000..2f4d02109770b
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Framework\DataObject\Copy as CopyService;
+use Magento\Customer\Api\Data\RegionInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory as AddressFactory;
+use Magento\Customer\Api\Data\RegionInterfaceFactory as RegionFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory as CustomerFactory;
+use Magento\Quote\Api\Data\AddressInterfaceFactory as QuoteAddressFactory;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+
+/**
+ * Extract customer data from an order.
+ */
+class OrderCustomerExtractor
+{
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var CopyService
+     */
+    private $objectCopyService;
+
+    /**
+     * @var AddressFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var RegionFactory
+     */
+    private $regionFactory;
+
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var QuoteAddressFactory
+     */
+    private $quoteAddressFactory;
+
+    /**
+     * @param OrderRepositoryInterface $orderRepository
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param CopyService $objectCopyService
+     * @param AddressFactory $addressFactory
+     * @param RegionFactory $regionFactory
+     * @param CustomerFactory $customerFactory
+     * @param QuoteAddressFactory $quoteAddressFactory
+     */
+    public function __construct(
+        OrderRepositoryInterface $orderRepository,
+        CustomerRepositoryInterface $customerRepository,
+        CopyService $objectCopyService,
+        AddressFactory $addressFactory,
+        RegionFactory $regionFactory,
+        CustomerFactory $customerFactory,
+        QuoteAddressFactory $quoteAddressFactory
+    ) {
+        $this->orderRepository = $orderRepository;
+        $this->customerRepository = $customerRepository;
+        $this->objectCopyService = $objectCopyService;
+        $this->addressFactory = $addressFactory;
+        $this->regionFactory = $regionFactory;
+        $this->customerFactory = $customerFactory;
+        $this->quoteAddressFactory = $quoteAddressFactory;
+    }
+
+    /**
+     * Extract customer data from order.
+     *
+     * @param int $orderId
+     * @return CustomerInterface
+     */
+    public function extract(int $orderId): CustomerInterface
+    {
+        $order = $this->orderRepository->get($orderId);
+
+        //Simply return customer from DB.
+        if ($order->getCustomerId()) {
+            return $this->customerRepository->getById($order->getCustomerId());
+        }
+
+        //Prepare customer data from order data if customer doesn't exist yet.
+        $customerData = $this->objectCopyService->copyFieldsetToTarget(
+            'order_address',
+            'to_customer',
+            $order->getBillingAddress(),
+            []
+        );
+
+        $processedAddressData = [];
+        $customerAddresses = [];
+        foreach ($order->getAddresses() as $orderAddress) {
+            $addressData = $this->objectCopyService
+                ->copyFieldsetToTarget('order_address', 'to_customer_address', $orderAddress, []);
+
+            $index = array_search($addressData, $processedAddressData);
+            if ($index === false) {
+                // create new customer address only if it is unique
+                $customerAddress = $this->addressFactory->create(['data' => $addressData]);
+                $customerAddress->setIsDefaultBilling(false);
+                $customerAddress->setIsDefaultShipping(false);
+                if (is_string($orderAddress->getRegion())) {
+                    /** @var RegionInterface $region */
+                    $region = $this->regionFactory->create();
+                    $region->setRegion($orderAddress->getRegion());
+                    $region->setRegionCode($orderAddress->getRegionCode());
+                    $region->setRegionId($orderAddress->getRegionId());
+                    $customerAddress->setRegion($region);
+                }
+
+                $processedAddressData[] = $addressData;
+                $customerAddresses[] = $customerAddress;
+                $index = count($processedAddressData) - 1;
+            }
+
+            $customerAddress = $customerAddresses[$index];
+            // make sure that address type flags from equal addresses are stored in one resulted address
+            if ($orderAddress->getAddressType() == OrderAddress::TYPE_BILLING) {
+                $customerAddress->setIsDefaultBilling(true);
+            }
+            if ($orderAddress->getAddressType() == OrderAddress::TYPE_SHIPPING) {
+                $customerAddress->setIsDefaultShipping(true);
+            }
+        }
+
+        $customerData['addresses'] = $customerAddresses;
+
+        return $this->customerFactory->create(['data' => $customerData]);
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Order/OrderValidator.php b/app/code/Magento/Sales/Model/Order/OrderValidator.php
index 1b04e6ca8c362..880b85a993d11 100644
--- a/app/code/Magento/Sales/Model/Order/OrderValidator.php
+++ b/app/code/Magento/Sales/Model/Order/OrderValidator.php
@@ -6,7 +6,6 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Exception\DocumentValidationException;
 
 /**
  * Class OrderValidator
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Info.php b/app/code/Magento/Sales/Model/Order/Payment/Info.php
index 063b3eaa71f1b..fee846fe6a62c 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Info.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Info.php
@@ -11,8 +11,8 @@
 use Magento\Payment\Model\InfoInterface;
 
 /**
- *
  * Payment information model
+ *
  * @api
  * @since 100.0.2
  */
@@ -41,7 +41,7 @@ class Info extends AbstractModel implements InfoInterface
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
-     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory,
+     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
@@ -181,7 +181,7 @@ public function getAdditionalInformation($key = null)
         if (null === $key) {
             return $this->additionalInformation;
         }
-        return isset($this->additionalInformation[$key]) ? $this->additionalInformation[$key] : null;
+        return $this->additionalInformation[$key] ?? null;
     }
 
     /**
@@ -219,8 +219,7 @@ public function hasAdditionalInformation($key = null)
     }
 
     /**
-     * Initialize additional information container with data from model
-     * if property empty
+     * Initialize additional information container with data from model if property empty
      *
      * @return void
      */
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
index 87bcc85e00af6..4353f6b1cc391 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
@@ -80,12 +80,14 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     public function get($id)
     {
         if (!$id) {
-            throw new \Magento\Framework\Exception\InputException(__('ID required'));
+            throw new \Magento\Framework\Exception\InputException(__('An ID is needed. Set the ID and try again.'));
         }
         if (!isset($this->registry[$id])) {
             $entity = $this->metaData->getNewInstance()->load($id);
             if (!$entity->getId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
             $this->registry[$id] = $entity;
         }
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
index ee12b459118c1..d38e58d7341c1 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
@@ -35,7 +35,7 @@ public function __construct(StatusResolver $statusResolver = null)
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order)
     {
-        $state = Order::STATE_PROCESSING;
+        $state = $order->getState() ?: Order::STATE_PROCESSING;
         $status = null;
         $message = 'Registered notification about captured amount of %1.';
 
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 8d8de47ba99cf..a8acb9aa46983 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -132,10 +132,12 @@ class Transaction extends AbstractModel implements TransactionInterface
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param \Magento\Sales\Api\OrderPaymentRepositoryInterface $orderPaymentRepository
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param \Magento\Framework\Stdlib\DateTime\DateTimeFactory $dateFactory
      * @param TransactionFactory $transactionFactory
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -193,8 +195,7 @@ public function setTxnId($txnId)
     }
 
     /**
-     * Parent transaction ID setter
-     * Can set the transaction id as well
+     * Parent transaction ID setter Can set the transaction id as well
      *
      * @param string $parentTxnId
      * @param string $txnId
@@ -229,8 +230,7 @@ public function setTxnType($txnType)
     }
 
     /**
-     * Parent transaction getter
-     * May attempt to load it.
+     * Parent transaction getter. May attempt to load it.
      *
      * @param bool $shouldLoad
      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
@@ -366,8 +366,7 @@ public function closeAuthorization($shouldSave = true, $dryRun = false)
     }
 
     /**
-     * Close a capture transaction
-     * Logic is similar to closeAuthorization(), but for a capture transaction
+     * Close a capture transaction. Logic is similar to closeAuthorization(), but for a capture transaction
      *
      * @param bool $shouldSave
      * @return bool|\Magento\Sales\Model\Order\Payment\Transaction
@@ -395,6 +394,7 @@ public function closeCapture($shouldSave = true)
 
     /**
      * Check whether authorization in current hierarchy can be voided completely
+     *
      * Basically checks whether the authorization exists and it is not affected by a capture or void
      *
      * @return bool
@@ -472,7 +472,7 @@ public function getAdditionalInformation($key = null)
             $info = [];
         }
         if ($key) {
-            return isset($info[$key]) ? $info[$key] : null;
+            return $info[$key] ?? null;
         }
         return $info;
     }
@@ -536,6 +536,7 @@ public function close($shouldSave = true)
 
     /**
      * Order ID getter
+     *
      * Attempts to get ID from set order payment object, if any, or from data by key 'order_id'
      *
      * @return int|null
@@ -572,6 +573,7 @@ public function getOrder()
 
     /**
      * Set order instance for transaction depends on transaction behavior
+     *
      * If $order equals to true, method isn't loading new order instance.
      *
      * @param \Magento\Sales\Model\Order|null|boolean $order
@@ -695,7 +697,6 @@ protected function _loadChildren()
     /**
      * Check whether this transaction is voided
      *
-     * TODO: implement that there should be only one void per authorization
      * @return bool
      */
     protected function _isVoided()
@@ -805,7 +806,6 @@ protected function _verifyTxnId($txnId)
 
     /**
      * Make sure this object is a valid transaction
-     * TODO for more restriction we can check for data consistency
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -833,7 +833,7 @@ public function getTransactionId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTransactionId($id)
     {
@@ -898,7 +898,7 @@ public function getTxnId()
     public function getHtmlTxnId()
     {
         $this->_eventManager->dispatch($this->_eventPrefix . '_html_txn_id', $this->_getEventData());
-        return isset($this->_data['html_txn_id']) ? $this->_data['html_txn_id'] : $this->getTxnId();
+        return $this->_data['html_txn_id'] ?? $this->getTxnId();
     }
 
     /**
@@ -942,7 +942,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -950,7 +950,7 @@ public function setCreatedAt($createdAt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setParentId($id)
     {
@@ -958,7 +958,7 @@ public function setParentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderId($id)
     {
@@ -966,7 +966,7 @@ public function setOrderId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPaymentId($id)
     {
@@ -974,7 +974,7 @@ public function setPaymentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsClosed($isClosed)
     {
@@ -982,7 +982,7 @@ public function setIsClosed($isClosed)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\TransactionExtensionInterface|null
      */
@@ -992,10 +992,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes
-     * @return $this
+     * @inheritdoc
      */
     public function setExtensionAttributes(\Magento\Sales\Api\Data\TransactionExtensionInterface $extensionAttributes)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
index a2f1d6bcdfbcc..a602fe54363ed 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
@@ -13,14 +13,11 @@
 use Magento\Framework\Data\Collection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\TransactionInterface;
-use Magento\Sales\Api\OrderPaymentRepositoryInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\EntityStorage;
 use Magento\Sales\Model\EntityStorageFactory;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction as TransactionResource;
 
 /**
@@ -95,17 +92,19 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($id)
     {
         if (!$id) {
-            throw new \Magento\Framework\Exception\InputException(__('ID required'));
+            throw new \Magento\Framework\Exception\InputException(__('An ID is needed. Set the ID and try again.'));
         }
         if (!$this->entityStorage->has($id)) {
             $entity = $this->metaData->getNewInstance()->load($id);
             if (!$entity->getTransactionId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
             $this->entityStorage->add($entity);
         }
@@ -115,12 +114,10 @@ public function get($id)
     /**
      * @param int $transactionType
      * @param int $paymentId
-     * @param int $orderId
      * @return bool|\Magento\Framework\Model\AbstractModel|mixed
      * @throws \Magento\Framework\Exception\InputException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getByTransactionType($transactionType, $paymentId, $orderId)
+    public function getByTransactionType($transactionType, $paymentId)
     {
         $identityFieldsForCache = [$transactionType, $paymentId];
         $cacheStorage = 'txn_type';
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 0636679d72b65..8cdc90972bbb0 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -158,8 +158,7 @@ public function __construct(
     }
 
     /**
-     * Returns the total width in points of the string using the specified font and
-     * size.
+     * Returns the total width in points of the string using the specified font and size.
      *
      * This is not the most efficient way to perform this calculation. I'm
      * concentrating optimization efforts on the upcoming layout manager class.
@@ -230,7 +229,7 @@ public function getAlignCenter($string, $x, $columnWidth, \Zend_Pdf_Resource_Fon
      * Insert logo to pdf page
      *
      * @param \Zend_Pdf_Page &$page
-     * @param null $store
+     * @param string|null $store
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -285,7 +284,7 @@ protected function insertLogo(&$page, $store = null)
      * Insert address to pdf page
      *
      * @param \Zend_Pdf_Page &$page
-     * @param null $store
+     * @param string|null $store
      * @return void
      */
     protected function insertAddress(&$page, $store = null)
@@ -364,6 +363,38 @@ protected function _calcAddressHeight($address)
         return $y;
     }
 
+    /**
+     * Detect an input string is Arabic
+     *
+     * @param string $subject
+     * @return bool
+     */
+    private function isArabic(string $subject): bool
+    {
+        return (preg_match('/\p{Arabic}/u', $subject) > 0);
+    }
+
+    /**
+     * Reverse text with Arabic characters
+     *
+     * @param string $string
+     * @return string
+     */
+    private function reverseArabicText($string)
+    {
+        $splitText = explode(' ', $string);
+        for ($i = 0; $i < count($splitText); $i++) {
+            if ($this->isArabic($splitText[$i])) {
+                for ($j = $i + 1; $j < count($splitText); $j++) {
+                    $tmp = $this->string->strrev($splitText[$j]);
+                    $splitText[$j] = $this->string->strrev($splitText[$i]);
+                    $splitText[$i] = $tmp;
+                }
+            }
+        }
+        return implode(' ', $splitText);
+    }
+
     /**
      * Insert order to pdf page
      *
@@ -475,7 +506,7 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
             if ($value !== '') {
                 $text = [];
                 foreach ($this->string->split($value, 45, true, true) as $_value) {
-                    $text[] = $_value;
+                    $text[] = ($this->isArabic($_value)) ? $this->reverseArabicText($_value) : $_value;
                 }
                 foreach ($text as $part) {
                     $page->drawText(strip_tags(ltrim($part)), 35, $this->y, 'UTF-8');
@@ -492,7 +523,7 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
                 if ($value !== '') {
                     $text = [];
                     foreach ($this->string->split($value, 45, true, true) as $_value) {
-                        $text[] = $_value;
+                        $text[] = ($this->isArabic($_value)) ? $this->reverseArabicText($_value) : $_value;
                     }
                     foreach ($text as $part) {
                         $page->drawText(strip_tags(ltrim($part)), 285, $this->y, 'UTF-8');
@@ -641,11 +672,7 @@ protected function _sortTotalsList($a, $b)
             return 0;
         }
 
-        if ($a['sort_order'] == $b['sort_order']) {
-            return 0;
-        }
-
-        return $a['sort_order'] > $b['sort_order'] ? 1 : -1;
+        return $a['sort_order'] <=> $b['sort_order'];
     }
 
     /**
@@ -861,7 +888,7 @@ protected function _drawItem(
     protected function _setFontRegular($object, $size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerif.ttf')
         );
         $object->setFont($font, $size);
         return $font;
@@ -877,7 +904,7 @@ protected function _setFontRegular($object, $size = 7)
     protected function _setFontBold($object, $size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifBold.ttf')
         );
         $object->setFont($font, $size);
         return $font;
@@ -893,7 +920,7 @@ protected function _setFontBold($object, $size = 7)
     protected function _setFontItalic($object, $size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_It-2.8.2.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifItalic.ttf')
         );
         $object->setFont($font, $size);
         return $font;
@@ -958,7 +985,7 @@ public function newPage(array $settings = [])
      * font         string; font style, optional: bold, italic, regular
      * font_file    string; path to font file (optional for use your custom font)
      * font_size    int; font size (default 7)
-     * align        string; text align (also see feed parametr), optional left, right
+     * align        string; text align (also see feed parameter), optional left, right
      * height       int;line spacing (default 10)
      *
      * @param  \Zend_Pdf_Page $page
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
index c0d7a43bed862..422ff1746c9a6 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -338,7 +338,7 @@ public function getItemOptions()
     protected function _setFontRegular($size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerif.ttf')
         );
         $this->getPage()->setFont($font, $size);
         return $font;
@@ -353,7 +353,7 @@ protected function _setFontRegular($size = 7)
     protected function _setFontBold($size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifBold.ttf')
         );
         $this->getPage()->setFont($font, $size);
         return $font;
@@ -368,7 +368,7 @@ protected function _setFontBold($size = 7)
     protected function _setFontItalic($size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_It-2.8.2.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifItalic.ttf')
         );
         $this->getPage()->setFont($font, $size);
         return $font;
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
index bb6078e425900..8562328025540 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -127,7 +127,8 @@ public function draw()
                     'feed' => 35,
                 ];
 
-                if ($option['value']) {
+                // Checking whether option value is not null
+                if ($option['value'] !== null) {
                     if (isset($option['print_value'])) {
                         $printValue = $option['print_value'];
                     } else {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index 0e6f345e19bc3..6007e1dcf2b47 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -89,7 +89,7 @@ public function draw()
                 ];
 
                 // draw options value
-                if ($option['value']) {
+                if ($option['value'] !== null) {
                     $printValue = isset(
                         $option['print_value']
                     ) ? $option['print_value'] : $this->filterManager->stripTags(
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index b171fccdeb05b..32a289c0f5fa8 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -150,11 +150,11 @@ public function getPdf($shipments = [])
                 $this->_drawItem($item, $page, $order);
                 $page = end($pdf->pages);
             }
+            if ($shipment->getStoreId()) {
+                $this->_localeResolver->revert();
+            }
         }
         $this->_afterGetPdf();
-        if ($shipment->getStoreId()) {
-            $this->_localeResolver->revert();
-        }
         return $pdf;
     }
 
diff --git a/app/code/Magento/Sales/Model/Order/ProductOption.php b/app/code/Magento/Sales/Model/Order/ProductOption.php
new file mode 100644
index 0000000000000..dc9ec42e27e60
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/ProductOption.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Framework\DataObject;
+use Magento\Catalog\Model\ProductOptionFactory;
+use Magento\Catalog\Model\ProductOptionProcessorInterface;
+use Magento\Catalog\Api\Data\ProductOptionExtensionFactory;
+
+/**
+ * Adds product option to the order item according to product options processors pool.
+ *
+ * @api
+ */
+class ProductOption
+{
+    /**
+     * @var ProductOptionFactory
+     */
+    private $productOptionFactory;
+
+    /**
+     * @var ProductOptionExtensionFactory
+     */
+    private $extensionFactory;
+
+    /**
+     * @var ProductOptionProcessorInterface[]
+     */
+    private $processorPool;
+
+    /**
+     * @param ProductOptionFactory $productOptionFactory
+     * @param ProductOptionExtensionFactory $extensionFactory
+     * @param array $processorPool
+     */
+    public function __construct(
+        ProductOptionFactory $productOptionFactory,
+        ProductOptionExtensionFactory $extensionFactory,
+        array $processorPool = []
+    ) {
+        $this->productOptionFactory = $productOptionFactory;
+        $this->extensionFactory = $extensionFactory;
+        $this->processorPool = $processorPool;
+    }
+
+    /**
+     * Adds product option to the order item.
+     *
+     * @param OrderItemInterface $orderItem
+     */
+    public function add(OrderItemInterface $orderItem): void
+    {
+        /** @var DataObject $request */
+        $request = $orderItem->getBuyRequest();
+
+        $productType = $orderItem->getProductType();
+        if (isset($this->processorPool[$productType])
+            && !$orderItem->getParentItemId()) {
+            $data = $this->processorPool[$productType]->convertToProductOption($request);
+            if ($data) {
+                $this->setProductOption($orderItem, $data);
+            }
+        }
+
+        if (isset($this->processorPool['custom_options'])
+            && !$orderItem->getParentItemId()) {
+            $data = $this->processorPool['custom_options']->convertToProductOption($request);
+            if ($data) {
+                $this->setProductOption($orderItem, $data);
+            }
+        }
+    }
+
+    /**
+     * Sets product options data.
+     *
+     * @param OrderItemInterface $orderItem
+     * @param array $data
+     */
+    private function setProductOption(OrderItemInterface $orderItem, array $data): void
+    {
+        $productOption = $orderItem->getProductOption();
+        if (!$productOption) {
+            $productOption = $this->productOptionFactory->create();
+            $orderItem->setProductOption($productOption);
+        }
+
+        $extensionAttributes = $productOption->getExtensionAttributes();
+        if (!$extensionAttributes) {
+            $extensionAttributes = $this->extensionFactory->create();
+            $productOption->setExtensionAttributes($extensionAttributes);
+        }
+
+        $extensionAttributes->setData(key($data), current($data));
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index ae0c00505940a..cecee4283648d 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -9,6 +9,7 @@
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Model\AbstractModel;
 use Magento\Sales\Model\EntityInterface;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\Collection as CommentsCollection;
 
 /**
  * Sales order shipment model
@@ -94,9 +95,14 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
     protected $orderRepository;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection|null
+     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection
      */
-    private $tracksCollection = null;
+    private $tracksCollection;
+
+    /**
+     * @var CommentsCollection
+     */
+    private $commentsCollection;
 
     /**
      * @param \Magento\Framework\Model\Context $context
@@ -262,8 +268,6 @@ public function register()
                 if (!$item->getOrderItem()->isDummy(true)) {
                     $totalQty += $item->getQty();
                 }
-            } else {
-                $item->isDeleted(true);
             }
         }
 
@@ -273,6 +277,8 @@ public function register()
     }
 
     /**
+     * Retrieves the collection used to track the shipment's items
+     *
      * @return mixed
      */
     public function getItemsCollection()
@@ -291,6 +297,8 @@ public function getItemsCollection()
     }
 
     /**
+     * Retrieves all non-deleted items from the shipment
+     *
      * @return array
      */
     public function getAllItems()
@@ -305,6 +313,8 @@ public function getAllItems()
     }
 
     /**
+     * Retrieves an item from the shipment using its ID
+     *
      * @param string|int $itemId
      * @return bool|\Magento\Sales\Model\Order\Shipment\Item
      */
@@ -319,6 +329,8 @@ public function getItemById($itemId)
     }
 
     /**
+     * Adds an item to the shipment
+     *
      * @param \Magento\Sales\Model\Order\Shipment\Item $item
      * @return $this
      */
@@ -326,7 +338,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;
     }
@@ -339,13 +354,23 @@ public function addItem(\Magento\Sales\Model\Order\Shipment\Item $item)
     public function getTracksCollection()
     {
         if ($this->tracksCollection === null) {
-            $this->tracksCollection = $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
+            $this->tracksCollection = $this->_trackCollectionFactory->create();
+
+            if ($this->getId()) {
+                $this->tracksCollection->setShipmentFilter($this->getId());
+
+                foreach ($this->tracksCollection as $item) {
+                    $item->setShipment($this);
+                }
+            }
         }
 
         return $this->tracksCollection;
     }
 
     /**
+     * Retrieves all available tracks in the collection that aren't deleted
+     *
      * @return array
      */
     public function getAllTracks()
@@ -360,6 +385,8 @@ public function getAllTracks()
     }
 
     /**
+     * Retrieves a track using its ID
+     *
      * @param string|int $trackId
      * @return bool|\Magento\Sales\Model\Order\Shipment\Track
      */
@@ -374,24 +401,27 @@ public function getTrackById($trackId)
     }
 
     /**
+     * Addes a track to the collection and associates the shipment to the track
+     *
      * @param \Magento\Sales\Model\Order\Shipment\Track $track
      * @return $this
      */
     public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
     {
-        $track->setShipment(
-            $this
-        )->setParentId(
-            $this->getId()
-        )->setOrderId(
-            $this->getOrderId()
-        )->setStoreId(
-            $this->getStoreId()
-        );
+        $track->setShipment($this)
+            ->setParentId($this->getId())
+            ->setOrderId($this->getOrderId())
+            ->setStoreId($this->getStoreId());
+
         if (!$track->getId()) {
             $this->getTracksCollection()->addItem($track);
         }
 
+        $tracks = $this->getTracks();
+        // as it's a new track entity, the collection doesn't contain it
+        $tracks[] = $track;
+        $this->setTracks($tracks);
+
         /**
          * Track saving is implemented in _afterSave()
          * This enforces \Magento\Framework\Model\AbstractModel::save() not to skip _afterSave()
@@ -402,8 +432,7 @@ public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
     }
 
     /**
-     * Adds comment to shipment with additional possibility to send it to customer via email
-     * and show it in customer account
+     * Adds comment to shipment with option to send it to customer via email and show it in customer account
      *
      * @param \Magento\Sales\Model\Order\Shipment\Comment|string $comment
      * @param bool $notify
@@ -413,43 +442,45 @@ public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
     public function addComment($comment, $notify = false, $visibleOnFront = false)
     {
         if (!$comment instanceof \Magento\Sales\Model\Order\Shipment\Comment) {
-            $comment = $this->_commentFactory->create()->setComment(
-                $comment
-            )->setIsCustomerNotified(
-                $notify
-            )->setIsVisibleOnFront(
-                $visibleOnFront
-            );
+            $comment = $this->_commentFactory->create()
+                ->setComment($comment)
+                ->setIsCustomerNotified($notify)
+                ->setIsVisibleOnFront($visibleOnFront);
         }
-        $comment->setShipment($this)->setParentId($this->getId())->setStoreId($this->getStoreId());
+        $comment->setShipment($this)
+            ->setParentId($this->getId())
+            ->setStoreId($this->getStoreId());
         if (!$comment->getId()) {
             $this->getCommentsCollection()->addItem($comment);
         }
+        $comments = $this->getComments();
+        $comments[] = $comment;
+        $this->setComments($comments);
         $this->_hasDataChanges = true;
         return $this;
     }
 
     /**
-     * Retrieve comments collection.
+     * Retrieves comments collection.
      *
      * @param bool $reload
-     * @return \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\Collection
+     * @return CommentsCollection
      */
     public function getCommentsCollection($reload = false)
     {
-        if (!$this->hasData(ShipmentInterface::COMMENTS) || $reload) {
-            $comments = $this->_commentCollectionFactory->create()
-                ->setShipmentFilter($this->getId())
-                ->setCreatedAtOrder();
-            $this->setComments($comments);
-
+        if ($this->commentsCollection === null || $reload) {
+            $this->commentsCollection = $this->_commentCollectionFactory->create();
             if ($this->getId()) {
-                foreach ($this->getComments() as $comment) {
+                $this->commentsCollection->setShipmentFilter($this->getId())
+                    ->setCreatedAtOrder();
+
+                foreach ($this->commentsCollection as $comment) {
                     $comment->setShipment($this);
                 }
             }
         }
-        return $this->getComments();
+
+        return $this->commentsCollection;
     }
 
     /**
@@ -513,7 +544,7 @@ public function getPackages()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnore
      */
     public function setPackages(array $packages = null)
@@ -537,7 +568,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;
     }
 
     /**
@@ -556,18 +591,16 @@ public function setItems($items)
     /**
      * Returns tracks
      *
-     * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[]
+     * @return \Magento\Sales\Api\Data\ShipmentTrackInterface[]|null
      */
     public function getTracks()
     {
+        if (!$this->getId()) {
+            return $this->getData(ShipmentInterface::TRACKS);
+        }
+
         if ($this->getData(ShipmentInterface::TRACKS) === null) {
-            $collection =  $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
-            if ($this->getId()) {
-                foreach ($collection as $item) {
-                    $item->setShipment($this);
-                }
-                $this->setData(ShipmentInterface::TRACKS, $collection->getItems());
-            }
+            $this->setData(ShipmentInterface::TRACKS, $this->getTracksCollection()->getItems());
         }
         return $this->getData(ShipmentInterface::TRACKS);
     }
@@ -606,7 +639,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
@@ -738,7 +771,7 @@ public function setComments($comments = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($id)
     {
@@ -746,7 +779,7 @@ public function setStoreId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalWeight($totalWeight)
     {
@@ -754,7 +787,7 @@ public function setTotalWeight($totalWeight)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTotalQty($qty)
     {
@@ -762,7 +795,7 @@ public function setTotalQty($qty)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmailSent($emailSent)
     {
@@ -770,7 +803,7 @@ public function setEmailSent($emailSent)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderId($id)
     {
@@ -778,7 +811,7 @@ public function setOrderId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($id)
     {
@@ -786,7 +819,7 @@ public function setCustomerId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingAddressId($id)
     {
@@ -794,7 +827,7 @@ public function setShippingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBillingAddressId($id)
     {
@@ -802,7 +835,7 @@ public function setBillingAddressId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShipmentStatus($shipmentStatus)
     {
@@ -810,7 +843,7 @@ public function setShipmentStatus($shipmentStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIncrementId($id)
     {
@@ -818,7 +851,7 @@ public function setIncrementId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($timestamp)
     {
@@ -826,7 +859,7 @@ public function setUpdatedAt($timestamp)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\ShipmentExtensionInterface|null
      */
@@ -836,7 +869,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\ShipmentExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
index 3ccc65bf27512..d48af3cea8450 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Shipment\Comment;
 
 use Magento\Sales\Model\Order\Shipment\Comment;
@@ -34,7 +35,7 @@ public function validate(Comment $comment)
         $commentData = $comment->getData();
         foreach ($this->required as $code => $label) {
             if (!$comment->hasData($code)) {
-                $errors[$code] = sprintf('%s is a required field', $label);
+                $errors[$code] = sprintf('"%s" is required. Enter and try again.', $label);
             } elseif (empty($commentData[$code])) {
                 $errors[$code] = sprintf('%s can not be empty', $label);
             }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php b/app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php
index b0d3b03aec4ed..8efc9f8461914 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Sales\Api\Data\ShipmentCommentInterface;
@@ -14,7 +15,13 @@
 use Magento\Sales\Api\Data\ShipmentCommentSearchResultInterfaceFactory;
 use Magento\Sales\Api\ShipmentCommentRepositoryInterface;
 use Magento\Sales\Model\Spi\ShipmentCommentResourceInterface;
+use Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
+use Psr\Log\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CommentRepository implements ShipmentCommentRepositoryInterface
 {
     /**
@@ -37,22 +44,48 @@ class CommentRepository implements ShipmentCommentRepositoryInterface
      */
     private $collectionProcessor;
 
+    /**
+     * @var ShipmentCommentSender
+     */
+    private $shipmentCommentSender;
+
+    /**
+     * @var ShipmentRepositoryInterface
+     */
+    private $shipmentRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param ShipmentCommentResourceInterface $commentResource
      * @param ShipmentCommentInterfaceFactory $commentFactory
      * @param ShipmentCommentSearchResultInterfaceFactory $searchResultFactory
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param ShipmentCommentSender|null $shipmentCommentSender
+     * @param ShipmentRepositoryInterface|null $shipmentRepository
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         ShipmentCommentResourceInterface $commentResource,
         ShipmentCommentInterfaceFactory $commentFactory,
         ShipmentCommentSearchResultInterfaceFactory $searchResultFactory,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        ShipmentCommentSender $shipmentCommentSender = null,
+        ShipmentRepositoryInterface $shipmentRepository = null,
+        LoggerInterface $logger = null
     ) {
         $this->commentResource = $commentResource;
         $this->commentFactory = $commentFactory;
         $this->searchResultFactory = $searchResultFactory;
         $this->collectionProcessor = $collectionProcessor;
+        $this->shipmentCommentSender = $shipmentCommentSender
+            ?: ObjectManager::getInstance()->get(ShipmentCommentSender::class);
+        $this->shipmentRepository = $shipmentRepository
+            ?: ObjectManager::getInstance()->get(ShipmentRepositoryInterface::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -99,6 +132,14 @@ public function save(ShipmentCommentInterface $entity)
         } catch (\Exception $e) {
             throw new CouldNotSaveException(__('Could not save the shipment comment.'), $e);
         }
+
+        try {
+            $shipment = $this->shipmentRepository->get($entity->getParentId());
+            $this->shipmentCommentSender->send($shipment, $entity->getIsCustomerNotified(), $entity->getComment());
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+        }
+
         return $entity;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
index 342fd3fa8f21e..0da936e74ca6c 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/Model/Order/Shipment/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
index 8c018ecee544b..f600c65e05f52 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
@@ -43,6 +43,7 @@ public function getOrderItemId()
     public function setOrderItemId($orderItemId)
     {
         $this->orderItemId = $orderItemId;
+        return $this;
     }
 
     /**
@@ -59,6 +60,7 @@ public function getQty()
     public function setQty($qty)
     {
         $this->qty = $qty;
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
index 9001267f6bc4a..69077749902b5 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/OrderRegistrar.php
@@ -17,12 +17,19 @@ class OrderRegistrar implements \Magento\Sales\Model\Order\Shipment\OrderRegistr
      */
     public function register(OrderInterface $order, ShipmentInterface $shipment)
     {
-        /** @var  \Magento\Sales\Api\Data\ShipmentItemInterface|\Magento\Sales\Model\Order\Shipment\Item $item */
+        $totalQty = 0;
+        /** @var \Magento\Sales\Model\Order\Shipment\Item $item */
         foreach ($shipment->getItems() as $item) {
             if ($item->getQty() > 0) {
                 $item->register();
+
+                if (!$item->getOrderItem()->isDummy(true)) {
+                    $totalQty += $item->getQty();
+                }
             }
         }
+        $shipment->setTotalQty($totalQty);
+
         return $order;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php b/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php
index ddd193f3c50fd..9bd144654b6d3 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Shipment\Track;
 
 use Magento\Sales\Model\Order\Shipment\Track;
@@ -36,7 +37,7 @@ public function validate(Track $track)
         $commentData = $track->getData();
         foreach ($this->required as $code => $label) {
             if (!$track->hasData($code)) {
-                $errors[$code] = sprintf('%s is a required field', $label);
+                $errors[$code] = sprintf('"%s" is required. Enter and try again.', $label);
             } elseif (empty($commentData[$code])) {
                 $errors[$code] = sprintf('%s can not be empty', $label);
             }
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
index 3e2dabbd8dba8..4a3e834a69a3d 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 use Magento\Sales\Api\Data\ShipmentPackageCreationInterface;
@@ -14,6 +15,8 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
 use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory\ExtensionAttributesProcessor;
 
 /**
  * Class ShipmentDocumentFactory
@@ -38,21 +41,30 @@ class ShipmentDocumentFactory
      */
     private $hydratorPool;
 
+    /**
+     * @var ExtensionAttributesProcessor
+     */
+    private $extensionAttributesProcessor;
+
     /**
      * ShipmentDocumentFactory constructor.
      *
      * @param ShipmentFactory $shipmentFactory
      * @param HydratorPool $hydratorPool
      * @param TrackFactory $trackFactory
+     * @param ExtensionAttributesProcessor $extensionAttributesProcessor
      */
     public function __construct(
         ShipmentFactory $shipmentFactory,
         HydratorPool $hydratorPool,
-        TrackFactory $trackFactory
+        TrackFactory $trackFactory,
+        ExtensionAttributesProcessor $extensionAttributesProcessor = null
     ) {
         $this->shipmentFactory = $shipmentFactory;
         $this->trackFactory = $trackFactory;
         $this->hydratorPool = $hydratorPool;
+        $this->extensionAttributesProcessor = $extensionAttributesProcessor ?: ObjectManager::getInstance()
+            ->get(ExtensionAttributesProcessor::class);
     }
 
     /**
@@ -77,13 +89,27 @@ public function create(
         array $packages = [],
         ShipmentCreationArgumentsInterface $arguments = null
     ) {
-        $shipmentItems = $this->itemsToArray($items);
+        $shipmentItems = empty($items)
+            ? $this->getQuantitiesFromOrderItems($order->getItems())
+            : $this->getQuantitiesFromShipmentItems($items);
+
         /** @var Shipment $shipment */
         $shipment = $this->shipmentFactory->create(
             $order,
             $shipmentItems
         );
-        $this->prepareTracks($shipment, $tracks);
+
+        if (null !== $arguments) {
+            $this->extensionAttributesProcessor->execute($shipment, $arguments);
+        }
+
+        foreach ($tracks as $track) {
+            $hydrator = $this->hydratorPool->getHydrator(
+                \Magento\Sales\Api\Data\ShipmentTrackCreationInterface::class
+            );
+            $shipment->addTrack($this->trackFactory->create(['data' => $hydrator->extract($track)]));
+        }
+
         if ($comment) {
             $shipment->addComment(
                 $comment->getComment(),
@@ -101,30 +127,29 @@ public function create(
     }
 
     /**
-     * Adds tracks to the shipment.
+     * Translate OrderItemInterface array to product id => product quantity array.
      *
-     * @param ShipmentInterface $shipment
-     * @param ShipmentTrackCreationInterface[] $tracks
-     * @return ShipmentInterface
+     * @param OrderItemInterface[] $items
+     * @return int[]
      */
-    private function prepareTracks(\Magento\Sales\Api\Data\ShipmentInterface $shipment, array $tracks)
+    private function getQuantitiesFromOrderItems(array $items)
     {
-        foreach ($tracks as $track) {
-            $hydrator = $this->hydratorPool->getHydrator(
-                \Magento\Sales\Api\Data\ShipmentTrackCreationInterface::class
-            );
-            $shipment->addTrack($this->trackFactory->create(['data' => $hydrator->extract($track)]));
+        $shipmentItems = [];
+        foreach ($items as $item) {
+            if (!$item->getIsVirtual() && (!$item->getParentItem() || $item->isShipSeparately())) {
+                $shipmentItems[$item->getItemId()] = $item->getQtyOrdered();
+            }
         }
-        return $shipment;
+        return $shipmentItems;
     }
 
     /**
-     * Convert items to array
+     * Translate ShipmentItemCreationInterface array to product id => product quantity array.
      *
      * @param ShipmentItemCreationInterface[] $items
-     * @return array
+     * @return int[]
      */
-    private function itemsToArray(array $items = [])
+    private function getQuantitiesFromShipmentItems(array $items)
     {
         $shipmentItems = [];
         foreach ($items as $item) {
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessor.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessor.php
new file mode 100644
index 0000000000000..c4c38a234dab1
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessor.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order\ShipmentDocumentFactory;
+
+use Magento\Framework\Reflection\ExtensionAttributesProcessor as AttributesProcessor;
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface;
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
+use Magento\Sales\Api\Data\ShipmentExtensionFactory;
+use Magento\Sales\Api\Data\ShipmentExtensionInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+
+/**
+ * Build and set extension attributes for shipment.
+ */
+class ExtensionAttributesProcessor
+{
+    /**
+     * @var ShipmentExtensionFactory
+     */
+    private $shipmentExtensionFactory;
+
+    /**
+     * @var ExtensionAttributesProcessor
+     */
+    private $extensionAttributesProcessor;
+
+    /**
+     * @param ShipmentExtensionFactory $shipmentExtensionFactory
+     * @param AttributesProcessor $extensionAttributesProcessor
+     */
+    public function __construct(
+        ShipmentExtensionFactory $shipmentExtensionFactory,
+        AttributesProcessor $extensionAttributesProcessor
+    ) {
+        $this->shipmentExtensionFactory = $shipmentExtensionFactory;
+        $this->extensionAttributesProcessor = $extensionAttributesProcessor;
+    }
+
+    /**
+     * @param ShipmentInterface $shipment
+     * @param ShipmentCreationArgumentsInterface $arguments
+     * @return void
+     */
+    public function execute(
+        ShipmentInterface $shipment,
+        ShipmentCreationArgumentsInterface $arguments
+    ): void {
+        $shipmentExtensionAttributes = [];
+        if (null !== $shipment->getExtensionAttributes()) {
+            $shipmentExtensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
+                $shipment->getExtensionAttributes(),
+                ShipmentExtensionInterface::class
+            );
+        }
+        $argumentsExtensionAttributes = [];
+        if (null !== $arguments->getExtensionAttributes()) {
+            $argumentsExtensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
+                $arguments->getExtensionAttributes(),
+                ShipmentCreationArgumentsExtensionInterface::class
+            );
+        }
+
+        $mergedExtensionAttributes = $this->shipmentExtensionFactory->create([
+            'data' => array_merge($shipmentExtensionAttributes, $argumentsExtensionAttributes)
+        ]);
+
+        $shipment->setExtensionAttributes($mergedExtensionAttributes);
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
index dcb2cdf1d8ed9..21b42abeb293d 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Sales\Model\Order;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Factory class for @see \Magento\Sales\Api\Data\ShipmentInterface
+ *
+ * @api
  */
 class ShipmentFactory
 {
@@ -96,14 +96,17 @@ protected function prepareItems(
         \Magento\Sales\Model\Order $order,
         array $items = []
     ) {
-        $totalQty = 0;
+        $shipmentItems = [];
         foreach ($order->getAllItems() as $orderItem) {
-            if (!$this->canShipItem($orderItem, $items)) {
+            if ($this->validateItem($orderItem, $items) === false) {
                 continue;
             }
 
             /** @var \Magento\Sales\Model\Order\Shipment\Item $item */
             $item = $this->converter->itemToShipmentItem($orderItem);
+            if ($orderItem->getIsVirtual() || ($orderItem->getParentItemId() && !$orderItem->isShipSeparately())) {
+                $item->isDeleted(true);
+            }
 
             if ($orderItem->isDummy(true)) {
                 $qty = 0;
@@ -121,8 +124,7 @@ protected function prepareItems(
                             $qty = min($qty, $orderItem->getSimpleQtyToShip());
 
                             $item->setQty($this->castQty($orderItem, $qty));
-                            $shipment->addItem($item);
-
+                            $shipmentItems[] = $item;
                             continue;
                         } else {
                             $qty = 1;
@@ -141,10 +143,65 @@ protected function prepareItems(
                 }
             }
 
-            $totalQty += $qty;
-
             $item->setQty($this->castQty($orderItem, $qty));
-            $shipment->addItem($item);
+            $shipmentItems[] = $item;
+        }
+        return $this->setItemsToShipment($shipment, $shipmentItems);
+    }
+
+    /**
+     * Validate order item before shipment
+     *
+     * @param Item $orderItem
+     * @param array $items
+     * @return bool
+     */
+    private function validateItem(\Magento\Sales\Model\Order\Item $orderItem, array $items)
+    {
+        if (!$this->canShipItem($orderItem, $items)) {
+            return false;
+        }
+
+        // Remove from shipment items without qty or with qty=0
+        if (!$orderItem->isDummy(true)
+            && (!isset($items[$orderItem->getId()]) || $items[$orderItem->getId()] <= 0)
+        ) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Set prepared items to shipment document
+     *
+     * @param \Magento\Sales\Api\Data\ShipmentInterface $shipment
+     * @param array $shipmentItems
+     * @return \Magento\Sales\Api\Data\ShipmentInterface
+     */
+    private function setItemsToShipment(\Magento\Sales\Api\Data\ShipmentInterface $shipment, $shipmentItems)
+    {
+        $totalQty = 0;
+
+        /**
+         * Verify that composite products shipped separately has children, if not -> remove from collection
+         */
+        /** @var \Magento\Sales\Model\Order\Shipment\Item $shipmentItem */
+        foreach ($shipmentItems as $key => $shipmentItem) {
+            if ($shipmentItem->getOrderItem()->getHasChildren()
+                && $shipmentItem->getOrderItem()->isShipSeparately()
+            ) {
+                $containerId = $shipmentItem->getOrderItem()->getId();
+                $childItems = array_filter($shipmentItems, function ($item) use ($containerId) {
+                    return $containerId == $item->getOrderItem()->getParentItemId();
+                });
+
+                if (count($childItems) <= 0) {
+                    unset($shipmentItems[$key]);
+                    continue;
+                }
+            }
+            $totalQty += $shipmentItem->getQty();
+            $shipment->addItem($shipmentItem);
         }
         return $shipment->setTotalQty($totalQty);
     }
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
index d39d27746c92e..0b86bec895b75 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -66,14 +67,16 @@ public function __construct(
     public function get($id)
     {
         if (!$id) {
-            throw new InputException(__('Id required'));
+            throw new InputException(__('An ID is needed. Set the ID and try again.'));
         }
 
         if (!isset($this->registry[$id])) {
             /** @var \Magento\Sales\Api\Data\ShipmentInterface $entity */
             $entity = $this->metadata->getNewInstance()->load($id);
             if (!$entity->getEntityId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
 
             $this->registry[$id] = $entity;
@@ -112,7 +115,7 @@ public function delete(\Magento\Sales\Api\Data\ShipmentInterface $entity)
 
             unset($this->registry[$entity->getEntityId()]);
         } catch (\Exception $e) {
-            throw new CouldNotDeleteException(__('Could not delete shipment'), $e);
+            throw new CouldNotDeleteException(__("The shipment couldn't be deleted."), $e);
         }
 
         return true;
@@ -144,7 +147,7 @@ public function save(\Magento\Sales\Api\Data\ShipmentInterface $entity)
             $this->metadata->getMapper()->save($entity);
             $this->registry[$entity->getEntityId()] = $entity;
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save shipment'), $e);
+            throw new CouldNotSaveException(__("The shipment couldn't be saved."), $e);
         }
 
         return $this->registry[$entity->getEntityId()];
diff --git a/app/code/Magento/Sales/Model/Order/StateResolver.php b/app/code/Magento/Sales/Model/Order/StateResolver.php
index 6f84c9b48b6d5..f5575e0388af3 100644
--- a/app/code/Magento/Sales/Model/Order/StateResolver.php
+++ b/app/code/Magento/Sales/Model/Order/StateResolver.php
@@ -39,7 +39,7 @@ private function isOrderClosed(OrderInterface $order, $arguments)
     {
         /** @var $order Order|OrderInterface */
         $forceCreditmemo = in_array(self::FORCED_CREDITMEMO, $arguments);
-        if (floatval($order->getTotalRefunded()) || !$order->getTotalRefunded() && $forceCreditmemo) {
+        if ((float)$order->getTotalRefunded() || !$order->getTotalRefunded() && $forceCreditmemo) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index bdd15d4d844c6..4b33f4b4d9251 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -11,6 +12,7 @@
  * Class Status
  *
  * @method string getStatus()
+ * @method $this setStatus(string $status)
  * @method string getLabel()
  */
 class Status extends \Magento\Sales\Model\AbstractModel
@@ -92,10 +94,14 @@ public function assignState($state, $isDefault = false, $visibleOnFront = false)
     protected function validateBeforeUnassign($state)
     {
         if ($this->getResource()->checkIsStateLast($state)) {
-            throw new LocalizedException(__('The last status can\'t be unassigned from its current state.'));
+            throw new LocalizedException(
+                __("The last status can't be changed and needs to stay assigned to its current state.")
+            );
         }
         if ($this->getResource()->checkIsStatusUsed($this->getStatus())) {
-            throw new LocalizedException(__('Status can\'t be unassigned, because it is used by existing order(s).'));
+            throw new LocalizedException(
+                __("The status can't be unassigned because the status is currently used by an order.")
+            );
         }
     }
 
diff --git a/app/code/Magento/Sales/Model/Order/Status/History/Validator.php b/app/code/Magento/Sales/Model/Order/Status/History/Validator.php
index 0ba5a6aeb11ce..7a4c62089f771 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order\Status\History;
 
 use Magento\Sales\Model\Order\Status\History;
@@ -27,7 +28,7 @@ public function validate(History $history)
         $warnings = [];
         foreach ($this->requiredFields as $code => $label) {
             if (!$history->hasData($code)) {
-                $warnings[] = sprintf('%s is a required field', $label);
+                $warnings[] = sprintf('"%s" is required. Enter and try again.', $label);
             }
         }
         return $warnings;
diff --git a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
index b109b87e61bbf..7b346a232ab95 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
@@ -15,6 +15,8 @@
 class CanInvoice implements ValidatorInterface
 {
     /**
+     * Validate
+     *
      * @param OrderInterface $entity
      * @return array
      */
@@ -32,6 +34,8 @@ public function validate($entity)
     }
 
     /**
+     * Is state ready for invoice
+     *
      * @param OrderInterface $order
      * @return bool
      */
@@ -44,12 +48,14 @@ private function isStateReadyForInvoice(OrderInterface $order)
             $order->getState() === Order::STATE_CLOSED
         ) {
             return false;
-        };
+        }
 
         return true;
     }
 
     /**
+     * Can invoice
+     *
      * @param OrderInterface $order
      * @return bool
      */
diff --git a/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
new file mode 100644
index 0000000000000..57566bfd789e7
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order\Webapi;
+
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
+
+/**
+ * Class for changing row total in response.
+ */
+class ChangeOutputArray
+{
+    /**
+     * @var DefaultColumn
+     */
+    private $priceRenderer;
+
+    /**
+     * @param DefaultColumn $priceRenderer
+     */
+    public function __construct(
+        DefaultColumn $priceRenderer
+    ) {
+        $this->priceRenderer = $priceRenderer;
+    }
+
+    /**
+     * Changing row total for webapi order item response.
+     *
+     * @param OrderItemInterface $dataObject
+     * @param array $result
+     * @return array
+     */
+    public function execute(
+        OrderItemInterface $dataObject,
+        array $result
+    ): array {
+        $result[OrderItemInterface::ROW_TOTAL] = $this->priceRenderer->getTotalAmount($dataObject);
+        $result[OrderItemInterface::BASE_ROW_TOTAL] = $this->priceRenderer->getBaseTotalAmount($dataObject);
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Sales/Model/OrderIncrementIdChecker.php b/app/code/Magento/Sales/Model/OrderIncrementIdChecker.php
new file mode 100644
index 0000000000000..0af61835a9c9b
--- /dev/null
+++ b/app/code/Magento/Sales/Model/OrderIncrementIdChecker.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model;
+
+/**
+ * This class uses for checking if reserved order id was already used for some order.
+ */
+class OrderIncrementIdChecker
+{
+    /**
+     * @var ResourceModel\Order
+     */
+    private $resourceModel;
+
+    /**
+     * @param ResourceModel\Order $resourceModel
+     */
+    public function __construct(ResourceModel\Order $resourceModel)
+    {
+        $this->resourceModel = $resourceModel;
+    }
+
+    /**
+     * Check if order increment ID is already used.
+     *
+     * Method can be used to avoid collisions of order IDs.
+     *
+     * @param string|int $orderIncrementId
+     * @return bool
+     */
+    public function isIncrementIdUsed($orderIncrementId): bool
+    {
+        /** @var  \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
+        $adapter = $this->resourceModel->getConnection();
+        $bind = [':increment_id' => $orderIncrementId];
+        /** @var \Magento\Framework\DB\Select $select */
+        $select = $adapter->select();
+        $select->from($this->resourceModel->getMainTable(), $this->resourceModel->getIdFieldName())
+            ->where('increment_id = :increment_id');
+        $entity_id = $adapter->fetchOne($select, $bind);
+        if ($entity_id > 0) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index 26e833c44d70a..a98d6193402a9 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -16,6 +17,7 @@
 use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Api\OrderTaxManagementInterface;
 
 /**
  * Repository class
@@ -54,6 +56,11 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      */
     protected $registry = [];
 
+    /**
+     * @var OrderTaxManagementInterface
+     */
+    private $orderTaxManagement;
+
     /**
      * Constructor
      *
@@ -61,12 +68,14 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
      * @param \Magento\Sales\Api\Data\OrderExtensionFactory|null $orderExtensionFactory
+     * @param OrderTaxManagementInterface|null $orderTaxManagement
      */
     public function __construct(
         Metadata $metadata,
         SearchResultFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor = null,
-        \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory = null
+        \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory = null,
+        OrderTaxManagementInterface $orderTaxManagement = null
     ) {
         $this->metadata = $metadata;
         $this->searchResultFactory = $searchResultFactory;
@@ -74,10 +83,12 @@ public function __construct(
             ->get(\Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class);
         $this->orderExtensionFactory = $orderExtensionFactory ?: ObjectManager::getInstance()
             ->get(\Magento\Sales\Api\Data\OrderExtensionFactory::class);
+        $this->orderTaxManagement = $orderTaxManagement ?: ObjectManager::getInstance()
+            ->get(OrderTaxManagementInterface::class);
     }
 
     /**
-     * load entity
+     * Load entity
      *
      * @param int $id
      * @return \Magento\Sales\Api\Data\OrderInterface
@@ -87,20 +98,46 @@ public function __construct(
     public function get($id)
     {
         if (!$id) {
-            throw new InputException(__('Id required'));
+            throw new InputException(__('An ID is needed. Set the ID and try again.'));
         }
         if (!isset($this->registry[$id])) {
             /** @var OrderInterface $entity */
             $entity = $this->metadata->getNewInstance()->load($id);
             if (!$entity->getEntityId()) {
-                throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
+                throw new NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                );
             }
+            $this->setOrderTaxDetails($entity);
             $this->setShippingAssignments($entity);
             $this->registry[$id] = $entity;
         }
         return $this->registry[$id];
     }
 
+    /**
+     * Set order tax details to extension attributes.
+     *
+     * @param OrderInterface $order
+     * @return void
+     */
+    private function setOrderTaxDetails(OrderInterface $order)
+    {
+        $extensionAttributes = $order->getExtensionAttributes();
+        $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getEntityId());
+        $appliedTaxes = $orderTaxDetails->getAppliedTaxes();
+
+        $extensionAttributes->setAppliedTaxes($appliedTaxes);
+        if (!empty($appliedTaxes)) {
+            $extensionAttributes->setConvertingFromQuote(true);
+        }
+
+        $items = $orderTaxDetails->getItems();
+        $extensionAttributes->setItemAppliedTaxes($items);
+
+        $order->setExtensionAttributes($extensionAttributes);
+    }
+
     /**
      * Find entities by criteria
      *
@@ -115,6 +152,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $searchResult->setSearchCriteria($searchCriteria);
         foreach ($searchResult->getItems() as $order) {
             $this->setShippingAssignments($order);
+            $this->setOrderTaxDetails($order);
         }
         return $searchResult;
     }
@@ -168,6 +206,8 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
     }
 
     /**
+     * Set shipping assignments to extension attributes.
+     *
      * @param OrderInterface $order
      * @return void
      */
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
index d6b81039214e9..25c15449a9fb4 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -48,7 +48,6 @@ protected function _construct()
     /**
      * Returns connection
      *
-     * @todo: make method protected
      * @return AdapterInterface
      */
     public function getConnection()
@@ -104,6 +103,6 @@ protected function getLastUpdatedAtValue($default = '0000-00-00 00:00:00')
 
         $row = $this->getConnection()->fetchRow($select);
 
-        return isset($row['updated_at']) ? $row['updated_at'] : $default;
+        return $row['updated_at'] ?? $default;
     }
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
index 1b781890e0f7f..80612277e68d5 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
@@ -123,10 +123,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\AbstractModel $object */
         if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
+            $store = $object->getStore();
+            $storeId = $store->getId();
+            if ($storeId === null) {
+                $storeId = $store->getGroup()->getDefaultStoreId();
+            }
             $object->setIncrementId(
                 $this->sequenceManager->getSequence(
                     $object->getEntityType(),
-                    $object->getStore()->getGroup()->getDefaultStoreId()
+                    $storeId
                 )->getNextValue()
             );
         }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid.php b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
index b3425baf1e727..432918450a698 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Grid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
@@ -45,6 +45,11 @@ class Grid extends AbstractGrid
      */
     private $notSyncedDataProvider;
 
+    /**
+     * Order grid rows batch size
+     */
+    const BATCH_SIZE = 100;
+
     /**
      * @param Context $context
      * @param string $mainTableName
@@ -88,15 +93,20 @@ public function refresh($value, $field = null)
     {
         $select = $this->getGridOriginSelect()
             ->where(($field ?: $this->mainTableName . '.entity_id') . ' = ?', $value);
-        return $this->getConnection()->query(
-            $this->getConnection()
-                ->insertFromSelect(
-                    $select,
-                    $this->getTable($this->gridTableName),
-                    array_keys($this->columns),
-                    AdapterInterface::INSERT_ON_DUPLICATE
-                )
-        );
+        $sql = $this->getConnection()
+            ->insertFromSelect(
+                $select,
+                $this->getTable($this->gridTableName),
+                array_keys($this->columns),
+                AdapterInterface::INSERT_ON_DUPLICATE
+            );
+
+        $this->addCommitCallback(function () use ($sql) {
+            $this->getConnection()->query($sql);
+        });
+
+        // need for backward compatibility
+        return $this->getConnection()->query($sql);
     }
 
     /**
@@ -104,28 +114,25 @@ public function refresh($value, $field = null)
      *
      * Only orders created/updated since the last method call will be added.
      *
-     * @return \Zend_Db_Statement_Interface
+     * @return void
      */
     public function refreshBySchedule()
     {
-        $select = $this->getGridOriginSelect()
-            ->where(
-                $this->mainTableName . '.entity_id IN (?)',
-                $this->notSyncedDataProvider->getIds($this->mainTableName, $this->gridTableName)
+        $notSyncedIds = $this->notSyncedDataProvider->getIds($this->mainTableName, $this->gridTableName);
+        foreach (array_chunk($notSyncedIds, self::BATCH_SIZE) as $bunch) {
+            $select = $this->getGridOriginSelect()->where($this->mainTableName . '.entity_id IN (?)', $bunch);
+            $fetchResult = $this->getConnection()->fetchAll($select);
+            $this->getConnection()->insertOnDuplicate(
+                $this->getTable($this->gridTableName),
+                $fetchResult,
+                array_keys($this->columns)
             );
-
-        return $this->getConnection()->query(
-            $this->getConnection()
-                ->insertFromSelect(
-                    $select,
-                    $this->getTable($this->gridTableName),
-                    array_keys($this->columns),
-                    AdapterInterface::INSERT_ON_DUPLICATE
-                )
-        );
+        }
     }
 
     /**
+     * Get order id field.
+     *
      * @return string
      */
     public function getOrderIdField()
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
index 82d436cb6e047..b3bc05056a1b1 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Model\ResourceModel\Grid;
 
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\Search\AggregationInterface;
+use Magento\Framework\Api\Search\AggregationInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 
 /**
@@ -78,6 +78,7 @@ public function getAggregations()
     public function setAggregations($aggregations)
     {
         $this->aggregations = $aggregations;
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php b/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php
index 9b0e53347e21a..6c7d983f066e5 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/GridInterface.php
@@ -29,7 +29,7 @@ public function refresh($value, $field = null);
      *
      * Only rows created/updated since the last method call should be added.
      *
-     * @return \Zend_Db_Statement_Interface
+     * @return void
      */
     public function refreshBySchedule();
 
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
index f95a3206ce786..5ecbbd777a14e 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
@@ -50,6 +50,10 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
             $object->setBillingAddressId($object->getOrder()->getBillingAddress()->getId());
         }
 
+        if (!$object->getInvoiceId() && $object->getInvoice()) {
+            $object->setInvoiceId($object->getInvoice()->getId());
+        }
+
         return parent::_beforeSave($object);
     }
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
index f6dd8f8527a53..82c612c1a781d 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php
@@ -35,4 +35,19 @@ public function __construct(
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+
+        $tableDescription = $this->getConnection()->describeTable($this->getMainTable());
+        foreach ($tableDescription as $columnInfo) {
+            $this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.' . $columnInfo['COLUMN_NAME']);
+        }
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index c7bac874fa330..3b127abbda732 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -29,7 +29,7 @@ public function check(Order $order)
                     $order->setState(Order::STATE_COMPLETE)
                         ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
                 }
-            } elseif (floatval($order->getTotalRefunded())
+            } elseif ((float)$order->getTotalRefunded()
                 || !$order->getTotalRefunded() && $order->hasForcedCanCreditmemo()
             ) {
                 if ($order->getState() !== Order::STATE_CLOSED) {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
index 1574f6e47c7cc..2390ea223e22c 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
@@ -14,7 +14,7 @@
 class Payment extends SalesResource
 {
     /**
-     * Serializeable field: additional_information
+     * Serializable field: additional_information
      *
      * @var array
      */
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/EncryptionUpdate.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/EncryptionUpdate.php
new file mode 100644
index 0000000000000..4cbcfe49f4cc9
--- /dev/null
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/EncryptionUpdate.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\ResourceModel\Order\Payment;
+
+/**
+ * Resource for updating encrypted credit card data to the latest cipher
+ */
+class EncryptionUpdate
+{
+    const LEGACY_PATTERN = '^[[:digit:]]+:[^%s]:.*$';
+
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order\Payment
+     */
+    private $paymentResource;
+
+    /**
+     * @var \Magento\Framework\Encryption\Encryptor
+     */
+    private $encryptor;
+
+    /**
+     * @param \Magento\Sales\Model\ResourceModel\Order\Payment $paymentResource
+     * @param \Magento\Framework\Encryption\Encryptor $encryptor
+     */
+    public function __construct(
+        \Magento\Sales\Model\ResourceModel\Order\Payment $paymentResource,
+        \Magento\Framework\Encryption\Encryptor $encryptor
+    ) {
+        $this->paymentResource = $paymentResource;
+        $this->encryptor = $encryptor;
+    }
+
+    /**
+     * Fetch encrypted credit card numbers using legacy ciphers and re-encrypt with latest cipher
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function reEncryptCreditCardNumbers()
+    {
+        $connection = $this->paymentResource->getConnection();
+        $table = $this->paymentResource->getMainTable();
+        $select = $connection->select()->from($table, ['entity_id', 'cc_number_enc'])
+            ->where(
+                'cc_number_enc REGEXP ?',
+                sprintf(self::LEGACY_PATTERN, \Magento\Framework\Encryption\Encryptor::CIPHER_LATEST)
+            )->limit(1000);
+
+        while ($attributeValues = $connection->fetchPairs($select)) {
+                // save new values
+            foreach ($attributeValues as $valueId => $value) {
+                $connection->update(
+                    $table,
+                    ['cc_number_enc' => $this->encryptor->encrypt($this->encryptor->decrypt($value))],
+                    ['entity_id = ?' => (int)$valueId, 'cc_number_enc = ?' => (string)$value]
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php
index b543fad9616db..98524b64b39d7 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php
@@ -16,7 +16,7 @@
 class Transaction extends EntityAbstract implements TransactionResourceInterface
 {
     /**
-     * Serializeable field: additional_information
+     * Serializable field: additional_information
      *
      * @var array
      */
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
index f004a1ee37e65..8758fc1da92d8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
@@ -57,14 +57,16 @@ protected function _construct()
     }
 
     /**
-     * Used to emulate after load functionality for each item without loading them
+     * Unserialize packages in each item
      *
      * @return $this
      */
     protected function _afterLoad()
     {
-        $this->walk('afterLoad');
+        foreach ($this->_items as $item) {
+            $this->getResource()->unserializeFields($item);
+        }
 
-        return $this;
+        return parent::_afterLoad();
     }
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
index 9c8671d02c578..5851b2d936139 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
@@ -62,8 +62,8 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
                 $this->shipmentItemResource->save($item);
             }
         }
-        if (null !== $object->getTracksCollection()) {
-            foreach ($object->getTracksCollection() as $track) {
+        if (null !== $object->getTracks()) {
+            foreach ($object->getTracks() as $track) {
                 $track->setParentId($object->getId());
                 $this->shipmentTrackResource->save($track);
             }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
index 140ffdea262be..58284759b2fee 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\ResourceModel\Order;
 
 use Magento\Framework\App\ResourceConnection;
@@ -187,7 +188,7 @@ public function unassignState($status, $state)
             $this->getConnection()->commit();
         } catch (\Exception $e) {
             $this->getConnection()->rollBack();
-            throw new LocalizedException(__('Cannot unassign status from state'));
+            throw new LocalizedException(__('The status needs to remain assigned to its state.'));
         }
 
         return $this;
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php
new file mode 100644
index 0000000000000..846fa46572fde
--- /dev/null
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\ResourceModel\Provider;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Retrieves ID's of not synced by `updated_at` column entities.
+ * The result should contain list of entities ID's from the main table which have `updated_at` column greater
+ * than in the grid table.
+ */
+class UpdatedAtListProvider implements NotSyncedDataProviderInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->connection = $resourceConnection->getConnection('sales');
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIds($mainTableName, $gridTableName)
+    {
+        $mainTableName = $this->resourceConnection->getTableName($mainTableName);
+        $gridTableName = $this->resourceConnection->getTableName($gridTableName);
+        $select = $this->connection->select()
+            ->from($mainTableName, [$mainTableName . '.entity_id'])
+            ->joinInner(
+                [$gridTableName => $gridTableName],
+                sprintf(
+                    '%s.entity_id = %s.entity_id AND %s.updated_at > %s.updated_at',
+                    $mainTableName,
+                    $gridTableName,
+                    $mainTableName,
+                    $gridTableName
+                ),
+                []
+            );
+
+        return $this->connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
+    }
+}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
index 59906c79215fa..42c6e9d650315 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php
@@ -38,10 +38,12 @@ public function __construct(
      */
     public function getIds($mainTableName, $gridTableName)
     {
+        $mainTableName = $this->resourceConnection->getTableName($mainTableName);
+        $gridTableName = $this->resourceConnection->getTableName($gridTableName);
         $select = $this->getConnection()->select()
-            ->from($this->getConnection()->getTableName($mainTableName), [$mainTableName . '.entity_id'])
+            ->from($mainTableName, [$mainTableName . '.entity_id'])
             ->joinLeft(
-                [$gridTableName => $this->getConnection()->getTableName($gridTableName)],
+                [$gridTableName => $gridTableName],
                 sprintf(
                     '%s.%s = %s.%s',
                     $mainTableName,
diff --git a/app/code/Magento/Sales/Model/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
index d45c0e664f9d2..0da218a316117 100644
--- a/app/code/Magento/Sales/Model/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
@@ -205,7 +205,7 @@ protected function getEntries()
     }
 
     /**
-     * Get data for Header esction of RSS feed
+     * Get data for Header section of RSS feed
      *
      * @return array
      */
diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
index 2f08c26de9058..76db717161317 100644
--- a/app/code/Magento/Sales/Model/Service/CreditmemoService.php
+++ b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
@@ -100,22 +100,11 @@ public function __construct(
      * @param int $id Credit Memo Id
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function cancel($id)
     {
         throw new \Magento\Framework\Exception\LocalizedException(__('You can not cancel Credit Memo'));
-        try {
-            $creditmemo = $this->creditmemoRepository->get($id);
-            $creditmemo->setState(\Magento\Sales\Model\Order\Creditmemo::STATE_CANCELED);
-            foreach ($creditmemo->getAllItems() as $item) {
-                $item->cancel();
-            }
-            $this->eventManager->dispatch('sales_order_creditmemo_cancel', ['creditmemo' => $creditmemo]);
-            $this->creditmemoRepository->save($creditmemo);
-        } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Could not cancel creditmemo'), $e);
-        }
-        return true;
     }
 
     /**
@@ -177,8 +166,8 @@ public function refund(
                 $creditmemo->getOrder(),
                 !$offlineRequested
             );
-            $this->getOrderRepository()->save($order);
             $this->creditmemoRepository->save($creditmemo);
+            $this->getOrderRepository()->save($order);
             $connection->commit();
         } catch (\Exception $e) {
             $connection->rollBack();
@@ -189,13 +178,15 @@ public function refund(
     }
 
     /**
+     * Validates if credit memo is available for refund.
+     *
      * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo)
     {
-        if ($creditmemo->getId()) {
+        if ($creditmemo->getId() && $creditmemo->getState() != \Magento\Sales\Model\Order\Creditmemo::STATE_OPEN) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We cannot register an existing credit memo.')
             );
@@ -211,7 +202,7 @@ protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface
             throw new \Magento\Framework\Exception\LocalizedException(
                 __(
                     'The most money available to refund is %1.',
-                    $creditmemo->getOrder()->formatBasePrice($baseAvailableRefund)
+                    $creditmemo->getOrder()->formatPriceTxt($baseAvailableRefund)
                 )
             );
         }
@@ -219,8 +210,9 @@ protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface
     }
 
     /**
-     * @return \Magento\Sales\Model\Order\RefundAdapterInterface
+     * Initializes RefundAdapterInterface dependency.
      *
+     * @return \Magento\Sales\Model\Order\RefundAdapterInterface
      * @deprecated 100.1.3
      */
     private function getRefundAdapter()
@@ -233,8 +225,9 @@ private function getRefundAdapter()
     }
 
     /**
-     * @return \Magento\Framework\App\ResourceConnection|mixed
+     * Initializes ResourceConnection dependency.
      *
+     * @return \Magento\Framework\App\ResourceConnection|mixed
      * @deprecated 100.1.3
      */
     private function getResource()
@@ -247,8 +240,9 @@ private function getResource()
     }
 
     /**
-     * @return \Magento\Sales\Api\OrderRepositoryInterface
+     * Initializes OrderRepositoryInterface dependency.
      *
+     * @return \Magento\Sales\Api\OrderRepositoryInterface
      * @deprecated 100.1.3
      */
     private function getOrderRepository()
@@ -261,8 +255,9 @@ private function getOrderRepository()
     }
 
     /**
-     * @return \Magento\Sales\Api\InvoiceRepositoryInterface
+     * Initializes InvoiceRepositoryInterface dependency.
      *
+     * @return \Magento\Sales\Api\InvoiceRepositoryInterface
      * @deprecated 100.1.3
      */
     private function getInvoiceRepository()
diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
index 718f55c3e551c..2806f76b1389b 100644
--- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
@@ -125,6 +125,8 @@ public function setVoid($id)
     }
 
     /**
+     * Creates an invoice based on the order and quantities provided
+     *
      * @param Order $order
      * @param array $qtys
      * @return \Magento\Sales\Model\Order\Invoice
@@ -136,7 +138,7 @@ public function prepareInvoice(Order $order, array $qtys = [])
         $totalQty = 0;
         $qtys = $this->prepareItemsQty($order, $qtys);
         foreach ($order->getAllItems() as $orderItem) {
-            if (!$this->_canInvoiceItem($orderItem)) {
+            if (!$this->_canInvoiceItem($orderItem, $qtys)) {
                 continue;
             }
             $item = $this->orderConverter->itemToInvoiceItem($orderItem);
@@ -192,16 +194,15 @@ private function prepareItemsQty(Order $order, array $qtys = [])
     }
 
     /**
-     * Check if order item can be invoiced. Dummy item can be invoiced or with his children or
-     * with parent item which is included to invoice
+     * Check if order item can be invoiced.
      *
      * @param \Magento\Sales\Api\Data\OrderItemInterface $item
+     * @param array $qtys
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _canInvoiceItem(\Magento\Sales\Api\Data\OrderItemInterface $item)
+    protected function _canInvoiceItem(\Magento\Sales\Api\Data\OrderItemInterface $item, array $qtys = [])
     {
-        $qtys = [];
         if ($item->getLockedDoInvoice()) {
             return false;
         }
diff --git a/app/code/Magento/Sales/Model/Service/OrderService.php b/app/code/Magento/Sales/Model/Service/OrderService.php
index 1eb3fad11278f..e4a71f028cc82 100644
--- a/app/code/Magento/Sales/Model/Service/OrderService.php
+++ b/app/code/Magento/Sales/Model/Service/OrderService.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Model\Service;
 
 use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Payment\Gateway\Command\CommandException;
 
 /**
  * Class OrderService
@@ -49,6 +50,11 @@ class OrderService implements OrderManagementInterface
      */
     protected $orderCommentSender;
 
+    /**
+     * @var \Magento\Sales\Api\PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
     /**
      * Constructor
      *
@@ -59,6 +65,7 @@ class OrderService implements OrderManagementInterface
      * @param \Magento\Sales\Model\OrderNotifier $notifier
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender
+     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
      */
     public function __construct(
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
@@ -67,7 +74,8 @@ public function __construct(
         \Magento\Framework\Api\FilterBuilder $filterBuilder,
         \Magento\Sales\Model\OrderNotifier $notifier,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender
+        \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender,
+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
     ) {
         $this->orderRepository = $orderRepository;
         $this->historyRepository = $historyRepository;
@@ -76,6 +84,8 @@ public function __construct(
         $this->notifier = $notifier;
         $this->eventManager = $eventManager;
         $this->orderCommentSender = $orderCommentSender;
+        $this->paymentFailures = $paymentFailures ? : \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Sales\Api\PaymentFailuresInterface::class);
     }
 
     /**
@@ -192,6 +202,9 @@ public function place(\Magento\Sales\Api\Data\OrderInterface $order)
             return $this->orderRepository->save($order);
             //commit
         } catch (\Exception $e) {
+            if ($e instanceof CommandException) {
+                $this->paymentFailures->handle((int)$order->getQuoteId(), __($e->getMessage()));
+            }
             throw $e;
             //rollback;
         }
diff --git a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
new file mode 100644
index 0000000000000..a698276332af8
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
@@ -0,0 +1,310 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Service;
+
+use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Translate\Inline\StateInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface as Quote;
+use Magento\Sales\Api\PaymentFailuresInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Service is responsible for handling failed payment transactions.
+ *
+ * It depends on Stores > Configuration > Sales > Checkout > Payment Failed Emails configuration.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PaymentFailuresService implements PaymentFailuresInterface
+{
+    /**
+     * Store config
+     *
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StateInterface
+     */
+    private $inlineTranslation;
+
+    /**
+     * @var TransportBuilder
+     */
+    private $transportBuilder;
+
+    /**
+     * @var TimezoneInterface
+     */
+    private $localeDate;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StateInterface $inlineTranslation
+     * @param TransportBuilder $transportBuilder
+     * @param TimezoneInterface $localeDate
+     * @param CartRepositoryInterface $cartRepository
+     * @param LoggerInterface|null $logger
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        StateInterface $inlineTranslation,
+        TransportBuilder $transportBuilder,
+        TimezoneInterface $localeDate,
+        CartRepositoryInterface $cartRepository,
+        LoggerInterface $logger = null
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->inlineTranslation = $inlineTranslation;
+        $this->transportBuilder = $transportBuilder;
+        $this->localeDate = $localeDate;
+        $this->cartRepository = $cartRepository;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
+    }
+
+    /**
+     * Sends an email about failed transaction.
+     *
+     * @param int $cartId
+     * @param string $message
+     * @param string $checkoutType
+     * @return PaymentFailuresInterface
+     */
+    public function handle(
+        int $cartId,
+        string $message,
+        string $checkoutType = 'onepage'
+    ): PaymentFailuresInterface {
+        $this->inlineTranslation->suspend();
+        $quote = $this->cartRepository->get($cartId);
+
+        $template = $this->getConfigValue('checkout/payment_failed/template', $quote);
+        $receiver = $this->getConfigValue('checkout/payment_failed/receiver', $quote);
+        $sendTo = [
+            [
+                'email' => $this->getConfigValue('trans_email/ident_' . $receiver . '/email', $quote),
+                'name' => $this->getConfigValue('trans_email/ident_' . $receiver . '/name', $quote),
+            ],
+        ];
+
+        $copyMethod = $this->getConfigValue('checkout/payment_failed/copy_method', $quote);
+        $copyTo = $this->getConfigEmails($quote);
+
+        $bcc = [];
+        if (!empty($copyTo)) {
+            switch ($copyMethod) {
+                case 'bcc':
+                    $bcc = $copyTo;
+                    break;
+                case 'copy':
+                    foreach ($copyTo as $email) {
+                        $sendTo[] = ['email' => $email, 'name' => null];
+                    }
+                    break;
+            }
+        }
+
+        foreach ($sendTo as $recipient) {
+            $transport = $this->transportBuilder
+                ->setTemplateIdentifier($template)
+                ->setTemplateOptions([
+                    'area' => FrontNameResolver::AREA_CODE,
+                    'store' => Store::DEFAULT_STORE_ID,
+                ])
+                ->setTemplateVars($this->getTemplateVars($quote, $message, $checkoutType))
+                ->setFrom($this->getSendFrom($quote))
+                ->addTo($recipient['email'], $recipient['name'])
+                ->addBcc($bcc)
+                ->getTransport();
+
+            try {
+                $transport->sendMessage();
+            } catch (\Exception $e) {
+                $this->logger->critical($e->getMessage());
+            }
+        }
+
+        $this->inlineTranslation->resume();
+
+        return $this;
+    }
+
+    /**
+     * Returns mail template variables.
+     *
+     * @param Quote $quote
+     * @param string $message
+     * @param string $checkoutType
+     * @return array
+     */
+    private function getTemplateVars(Quote $quote, string $message, string $checkoutType): array
+    {
+        return [
+            'reason' => $message,
+            'checkoutType' => $checkoutType,
+            'dateAndTime' => $this->getLocaleDate(),
+            'customer' => $this->getCustomerName($quote),
+            'customerEmail' => $quote->getBillingAddress()->getEmail(),
+            'billingAddress' => $quote->getBillingAddress(),
+            'shippingAddress' => $quote->getShippingAddress(),
+            'shippingMethod' => $this->getConfigValue(
+                'carriers/' . $this->getShippingMethod($quote) . '/title',
+                $quote
+            ),
+            'paymentMethod' => $this->getConfigValue(
+                'payment/' . $this->getPaymentMethod($quote) . '/title',
+                $quote
+            ),
+            'items' => implode('<br />', $this->getQuoteItems($quote)),
+            'total' => $quote->getCurrency()->getStoreCurrencyCode() . ' ' . $quote->getGrandTotal(),
+        ];
+    }
+
+    /**
+     * Returns scope config value by config path.
+     *
+     * @param string $configPath
+     * @param Quote $quote
+     * @return mixed
+     */
+    private function getConfigValue(string $configPath, Quote $quote)
+    {
+        return $this->scopeConfig->getValue(
+            $configPath,
+            ScopeInterface::SCOPE_STORE,
+            $quote->getStoreId()
+        );
+    }
+
+    /**
+     * Returns shipping method from quote.
+     *
+     * @param Quote $quote
+     * @return string
+     */
+    private function getShippingMethod(Quote $quote): string
+    {
+        $shippingMethod = '';
+        $shippingInfo = $quote->getShippingAddress()->getShippingMethod();
+
+        if ($shippingInfo) {
+            $data = explode('_', $shippingInfo);
+            $shippingMethod = $data[0];
+        }
+
+        return $shippingMethod;
+    }
+
+    /**
+     * Returns payment method title from quote.
+     *
+     * @param Quote $quote
+     * @return string
+     */
+    private function getPaymentMethod(Quote $quote): string
+    {
+        $paymentMethod = $quote->getPayment()->getMethod() ?? '';
+
+        return $paymentMethod;
+    }
+
+    /**
+     * Returns quote visible items.
+     *
+     * @param Quote $quote
+     * @return array
+     */
+    private function getQuoteItems(Quote $quote): array
+    {
+        $items = [];
+        foreach ($quote->getAllVisibleItems() as $item) {
+            $itemData = $item->getProduct()->getName() . '  x ' . $item->getQty() . '  ' .
+                        $quote->getCurrency()->getStoreCurrencyCode() . ' ' .
+                        $item->getProduct()->getFinalPrice($item->getQty());
+            $items[] = $itemData;
+        }
+
+        return $items;
+    }
+
+    /**
+     * Gets email values by configuration path.
+     *
+     * @param Quote $quote
+     * @return array|false
+     */
+    private function getConfigEmails(Quote $quote)
+    {
+        $configData = $this->getConfigValue('checkout/payment_failed/copy_to', $quote);
+        if (!empty($configData)) {
+            return explode(',', $configData);
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns sender identity.
+     *
+     * @param Quote $quote
+     * @return string
+     */
+    private function getSendFrom(Quote $quote): string
+    {
+        return $this->getConfigValue('checkout/payment_failed/identity', $quote);
+    }
+
+    /**
+     * Returns current locale date and time
+     *
+     * @return string
+     */
+    private function getLocaleDate(): string
+    {
+        return $this->localeDate->formatDateTime(
+            new \DateTime(),
+            \IntlDateFormatter::MEDIUM,
+            \IntlDateFormatter::MEDIUM
+        );
+    }
+
+    /**
+     * Returns customer name.
+     *
+     * @param Quote $quote
+     * @return string
+     */
+    private function getCustomerName(Quote $quote): string
+    {
+        $customer = __('Guest')->render();
+        if (!$quote->getCustomerIsGuest()) {
+            $customer = $quote->getCustomer()->getFirstname() . ' ' .
+                        $quote->getCustomer()->getLastname();
+        }
+
+        return $customer;
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Validator.php b/app/code/Magento/Sales/Model/Validator.php
index f309e00b55cfa..740cfa76afe21 100644
--- a/app/code/Magento/Sales/Model/Validator.php
+++ b/app/code/Magento/Sales/Model/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model;
 
 use Magento\Framework\Exception\ConfigurationMismatchException;
@@ -58,9 +59,7 @@ public function validate($entity, array $validators, $context = null)
             $validator = $this->objectManager->create($validatorName, $validatorArguments);
             if (!$validator instanceof ValidatorInterface) {
                 throw new ConfigurationMismatchException(
-                    __(
-                        sprintf('Validator %s is not instance of general validator interface', $validatorName)
-                    )
+                    __('The "%1" validator is not an instance of the general validator interface.', $validatorName)
                 );
             }
             $messages = array_merge($messages, $validator->validate($entity));
diff --git a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
new file mode 100644
index 0000000000000..cade86d18e935
--- /dev/null
+++ b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Observer;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * Assign order to customer created after issuing guest order.
+ */
+class AssignOrderToCustomerObserver implements ObserverInterface
+{
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(OrderRepositoryInterface $orderRepository)
+    {
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(Observer $observer)
+    {
+        $event = $observer->getEvent();
+        /** @var CustomerInterface $customer */
+        $customer = $event->getData('customer_data_object');
+        /** @var array $delegateData */
+        $delegateData = $event->getData('delegate_data');
+        if (array_key_exists('__sales_assign_order_id', $delegateData)) {
+            $orderId = $delegateData['__sales_assign_order_id'];
+            $order = $this->orderRepository->get($orderId);
+            if (!$order->getCustomerId()) {
+                //if customer ID wasn't already assigned then assigning.
+                $order->setCustomerId($customer->getId());
+                $order->setCustomerIsGuest(0);
+                $this->orderRepository->save($order);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php b/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php
index 775a7dab95cfe..cd8c705750d6c 100644
--- a/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php
+++ b/app/code/Magento/Sales/Observer/Backend/SubtractQtyFromQuotesObserver.php
@@ -31,6 +31,6 @@ public function __construct(\Magento\Quote\Model\ResourceModel\Quote $quote)
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         $product = $observer->getEvent()->getProduct();
-        $this->_quote->substractProductFromQuotes($product);
+        $this->_quote->subtractProductFromQuotes($product);
     }
 }
diff --git a/app/code/Magento/Sales/Plugin/ShippingLabelConverter.php b/app/code/Magento/Sales/Plugin/ShippingLabelConverter.php
new file mode 100644
index 0000000000000..bfd426ddad593
--- /dev/null
+++ b/app/code/Magento/Sales/Plugin/ShippingLabelConverter.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Plugin;
+
+/**
+ * Plugin to convert shipping label from blob to base64encoded string
+ */
+class ShippingLabelConverter
+{
+    /**
+     * Convert shipping label from blob to base64encoded string
+     *
+     * @param \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository
+     * @param \Magento\Sales\Api\Data\ShipmentSearchResultInterface $searchResult
+     * @return \Magento\Sales\Api\Data\ShipmentSearchResultInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetList(
+        \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository,
+        \Magento\Sales\Api\Data\ShipmentSearchResultInterface $searchResult
+    ) {
+        /** @var \Magento\Sales\Model\Order\Shipment $item */
+        foreach ($searchResult->getItems() as $item) {
+            if ($item->getShippingLabel() !== null) {
+                $item->setShippingLabel(base64_encode($item->getShippingLabel()));
+            }
+        }
+        return $searchResult;
+    }
+
+    /**
+     * Convert shipping label from blob to base64encoded string
+     *
+     * @param \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository
+     * @param \Magento\Sales\Api\Data\ShipmentInterface $shipment
+     * @return \Magento\Sales\Api\Data\ShipmentInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGet(
+        \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository,
+        \Magento\Sales\Api\Data\ShipmentInterface $shipment
+    ) {
+        if ($shipment->getShippingLabel() !== null) {
+            $shipment->setShippingLabel(base64_encode($shipment->getShippingLabel()));
+        }
+        return $shipment;
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/InstallData.php b/app/code/Magento/Sales/Setup/InstallData.php
deleted file mode 100644
index d4fef6a690513..0000000000000
--- a/app/code/Magento/Sales/Setup/InstallData.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\SalesSequence\Model\Builder;
-use Magento\SalesSequence\Model\Config as SequenceConfig;
-
-/**
- * Class InstallData
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Sales setup factory
-     *
-     * @var SalesSetupFactory
-     */
-    private $salesSetupFactory;
-
-    /**
-     * @var Builder
-     */
-    private $sequenceBuilder;
-
-    /**
-     * @var SequenceConfig
-     */
-    private $sequenceConfig;
-
-    /**
-     * @param SalesSetupFactory $salesSetupFactory
-     * @param Builder $sequenceBuilder
-     * @param SequenceConfig $sequenceConfig
-     */
-    public function __construct(
-        SalesSetupFactory $salesSetupFactory,
-        Builder $sequenceBuilder,
-        SequenceConfig $sequenceConfig
-    ) {
-        $this->salesSetupFactory = $salesSetupFactory;
-        $this->sequenceBuilder = $sequenceBuilder;
-        $this->sequenceConfig = $sequenceConfig;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var \Magento\Sales\Setup\SalesSetup $salesSetup */
-        $salesSetup = $this->salesSetupFactory->create(['setup' => $setup]);
-
-        /**
-         * Install eav entity types to the eav/entity_type table
-         */
-        $salesSetup->installEntities();
-
-        /**
-         * Install order statuses from config
-         */
-        $data = [];
-        $statuses = [
-            'pending' => __('Pending'),
-            'pending_payment' => __('Pending Payment'),
-            'processing' => __('Processing'),
-            'holded' => __('On Hold'),
-            'complete' => __('Complete'),
-            'closed' => __('Closed'),
-            'canceled' => __('Canceled'),
-            'fraud' => __('Suspected Fraud'),
-            'payment_review' => __('Payment Review'),
-        ];
-        foreach ($statuses as $code => $info) {
-            $data[] = ['status' => $code, 'label' => $info];
-        }
-        $setup->getConnection()->insertArray($setup->getTable('sales_order_status'), ['status', 'label'], $data);
-
-        /**
-         * Install order states from config
-         */
-        $data = [];
-        $states = [
-            'new' => [
-                'label' => __('New'),
-                'statuses' => ['pending' => ['default' => '1']],
-                'visible_on_front' => true,
-            ],
-            'pending_payment' => [
-                'label' => __('Pending Payment'),
-                'statuses' => ['pending_payment' => ['default' => '1']],
-            ],
-            'processing' => [
-                'label' => __('Processing'),
-                'statuses' => ['processing' => ['default' => '1'], 'fraud' => []],
-                'visible_on_front' => true,
-            ],
-            'complete' => [
-                'label' => __('Complete'),
-                'statuses' => ['complete' => ['default' => '1']],
-                'visible_on_front' => true,
-            ],
-            'closed' => [
-                'label' => __('Closed'),
-                'statuses' => ['closed' => ['default' => '1']],
-                'visible_on_front' => true,
-            ],
-            'canceled' => [
-                'label' => __('Canceled'),
-                'statuses' => ['canceled' => ['default' => '1']],
-                'visible_on_front' => true,
-            ],
-            'holded' => [
-                'label' => __('On Hold'),
-                'statuses' => ['holded' => ['default' => '1']],
-                'visible_on_front' => true,
-            ],
-            'payment_review' => [
-                'label' => __('Payment Review'),
-                'statuses' => ['payment_review' => ['default' => '1'], 'fraud' => []],
-                'visible_on_front' => true,
-            ],
-        ];
-
-        foreach ($states as $code => $info) {
-            if (isset($info['statuses'])) {
-                foreach ($info['statuses'] as $status => $statusInfo) {
-                    $data[] = [
-                        'status' => $status,
-                        'state' => $code,
-                        'is_default' => is_array($statusInfo) && isset($statusInfo['default']) ? 1 : 0,
-                    ];
-                }
-            }
-        }
-        $setup->getConnection()->insertArray(
-            $setup->getTable('sales_order_status_state'),
-            ['status', 'state', 'is_default'],
-            $data
-        );
-
-        $entitiesToAlter = ['order_address'];
-
-        $attributes = [
-            'vat_id' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT],
-            'vat_is_valid' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT],
-            'vat_request_id' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT],
-            'vat_request_date' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT],
-            'vat_request_success' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT],
-        ];
-
-        foreach ($entitiesToAlter as $entityName) {
-            foreach ($attributes as $attributeCode => $attributeParams) {
-                $salesSetup->addAttribute($entityName, $attributeCode, $attributeParams);
-            }
-        }
-
-        /** Update visibility for states */
-        $states = ['new', 'processing', 'complete', 'closed', 'canceled', 'holded', 'payment_review'];
-        foreach ($states as $state) {
-            $setup->getConnection()->update(
-                $setup->getTable('sales_order_status_state'),
-                ['visible_on_front' => 1],
-                ['state = ?' => $state]
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php
deleted file mode 100644
index 3c1da7add06ec..0000000000000
--- a/app/code/Magento/Sales/Setup/InstallSchema.php
+++ /dev/null
@@ -1,5573 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'sales_order'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'State'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Status'
-        )->addColumn(
-            'coupon_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Coupon Code'
-        )->addColumn(
-            'protect_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Protect Code'
-        )->addColumn(
-            'shipping_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Description'
-        )->addColumn(
-            'is_virtual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Virtual'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer Id'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Amount'
-        )->addColumn(
-            'base_discount_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Canceled'
-        )->addColumn(
-            'base_discount_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Invoiced'
-        )->addColumn(
-            'base_discount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Refunded'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
-        )->addColumn(
-            'base_shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Amount'
-        )->addColumn(
-            'base_shipping_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Canceled'
-        )->addColumn(
-            'base_shipping_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Invoiced'
-        )->addColumn(
-            'base_shipping_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Refunded'
-        )->addColumn(
-            'base_shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Tax Amount'
-        )->addColumn(
-            'base_shipping_tax_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Tax Refunded'
-        )->addColumn(
-            'base_subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal'
-        )->addColumn(
-            'base_subtotal_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Canceled'
-        )->addColumn(
-            'base_subtotal_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Invoiced'
-        )->addColumn(
-            'base_subtotal_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Refunded'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Amount'
-        )->addColumn(
-            'base_tax_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Canceled'
-        )->addColumn(
-            'base_tax_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Invoiced'
-        )->addColumn(
-            'base_tax_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Refunded'
-        )->addColumn(
-            'base_to_global_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Global Rate'
-        )->addColumn(
-            'base_to_order_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Order Rate'
-        )->addColumn(
-            'base_total_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Canceled'
-        )->addColumn(
-            'base_total_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Invoiced'
-        )->addColumn(
-            'base_total_invoiced_cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Invoiced Cost'
-        )->addColumn(
-            'base_total_offline_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Offline Refunded'
-        )->addColumn(
-            'base_total_online_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Online Refunded'
-        )->addColumn(
-            'base_total_paid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Paid'
-        )->addColumn(
-            'base_total_qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Qty Ordered'
-        )->addColumn(
-            'base_total_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Refunded'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Amount'
-        )->addColumn(
-            'discount_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Canceled'
-        )->addColumn(
-            'discount_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Invoiced'
-        )->addColumn(
-            'discount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Refunded'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Grand Total'
-        )->addColumn(
-            'shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Amount'
-        )->addColumn(
-            'shipping_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Canceled'
-        )->addColumn(
-            'shipping_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Invoiced'
-        )->addColumn(
-            'shipping_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Refunded'
-        )->addColumn(
-            'shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Tax Amount'
-        )->addColumn(
-            'shipping_tax_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Tax Refunded'
-        )->addColumn(
-            'store_to_base_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Store To Base Rate'
-        )->addColumn(
-            'store_to_order_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Store To Order Rate'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'subtotal_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Canceled'
-        )->addColumn(
-            'subtotal_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Invoiced'
-        )->addColumn(
-            'subtotal_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Refunded'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Amount'
-        )->addColumn(
-            'tax_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Canceled'
-        )->addColumn(
-            'tax_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Invoiced'
-        )->addColumn(
-            'tax_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Refunded'
-        )->addColumn(
-            'total_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Canceled'
-        )->addColumn(
-            'total_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Invoiced'
-        )->addColumn(
-            'total_offline_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Offline Refunded'
-        )->addColumn(
-            'total_online_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Online Refunded'
-        )->addColumn(
-            'total_paid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Paid'
-        )->addColumn(
-            'total_qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Qty Ordered'
-        )->addColumn(
-            'total_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Refunded'
-        )->addColumn(
-            'can_ship_partially',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Can Ship Partially'
-        )->addColumn(
-            'can_ship_partially_item',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Can Ship Partially Item'
-        )->addColumn(
-            'customer_is_guest',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Customer Is Guest'
-        )->addColumn(
-            'customer_note_notify',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Customer Note Notify'
-        )->addColumn(
-            'billing_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Billing Address Id'
-        )->addColumn(
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            [],
-            'Customer Group Id'
-        )->addColumn(
-            'edit_increment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Edit Increment'
-        )->addColumn(
-            'email_sent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Email Sent'
-        )->addColumn(
-            'send_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Send Email'
-        )->addColumn(
-            'forced_shipment_with_invoice',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Forced Do Shipment With Invoice'
-        )->addColumn(
-            'payment_auth_expiration',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Payment Authorization Expiration'
-        )->addColumn(
-            'quote_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Quote Address Id'
-        )->addColumn(
-            'quote_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Quote Id'
-        )->addColumn(
-            'shipping_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Shipping Address Id'
-        )->addColumn(
-            'adjustment_negative',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment Negative'
-        )->addColumn(
-            'adjustment_positive',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment Positive'
-        )->addColumn(
-            'base_adjustment_negative',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Adjustment Negative'
-        )->addColumn(
-            'base_adjustment_positive',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Adjustment Positive'
-        )->addColumn(
-            'base_shipping_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Discount Amount'
-        )->addColumn(
-            'base_subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Incl Tax'
-        )->addColumn(
-            'base_total_due',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Due'
-        )->addColumn(
-            'payment_authorization_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Payment Authorization Amount'
-        )->addColumn(
-            'shipping_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Discount Amount'
-        )->addColumn(
-            'subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Incl Tax'
-        )->addColumn(
-            'total_due',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Due'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Weight'
-        )->addColumn(
-            'customer_dob',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            [],
-            'Customer Dob'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'applied_rule_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Applied Rule Ids'
-        )->addColumn(
-            'base_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Base Currency Code'
-        )->addColumn(
-            'customer_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Customer Email'
-        )->addColumn(
-            'customer_firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Customer Firstname'
-        )->addColumn(
-            'customer_lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Customer Lastname'
-        )->addColumn(
-            'customer_middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Customer Middlename'
-        )->addColumn(
-            'customer_prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Customer Prefix'
-        )->addColumn(
-            'customer_suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Customer Suffix'
-        )->addColumn(
-            'customer_taxvat',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Customer Taxvat'
-        )->addColumn(
-            'discount_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Discount Description'
-        )->addColumn(
-            'ext_customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Ext Customer Id'
-        )->addColumn(
-            'ext_order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Ext Order Id'
-        )->addColumn(
-            'global_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Global Currency Code'
-        )->addColumn(
-            'hold_before_state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Hold Before State'
-        )->addColumn(
-            'hold_before_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Hold Before Status'
-        )->addColumn(
-            'order_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Order Currency Code'
-        )->addColumn(
-            'original_increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Original Increment Id'
-        )->addColumn(
-            'relation_child_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Relation Child Id'
-        )->addColumn(
-            'relation_child_real_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Relation Child Real Id'
-        )->addColumn(
-            'relation_parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Relation Parent Id'
-        )->addColumn(
-            'relation_parent_real_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Relation Parent Real Id'
-        )->addColumn(
-            'remote_ip',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Remote Ip'
-        )->addColumn(
-            'shipping_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Shipping Method'
-        )->addColumn(
-            'store_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Store Currency Code'
-        )->addColumn(
-            'store_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Store Name'
-        )->addColumn(
-            'x_forwarded_for',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'X Forwarded For'
-        )->addColumn(
-            'customer_note',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Customer Note'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'total_item_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Total Item Count'
-        )->addColumn(
-            'customer_gender',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Customer Gender'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_shipping_discount_tax_compensation_amnt',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'discount_tax_compensation_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Invoiced'
-        )->addColumn(
-            'base_discount_tax_compensation_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Invoiced'
-        )->addColumn(
-            'discount_tax_compensation_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Refunded'
-        )->addColumn(
-            'base_discount_tax_compensation_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Refunded'
-        )->addColumn(
-            'shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Incl Tax'
-        )->addColumn(
-            'base_shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Incl Tax'
-        )->addColumn(
-            'coupon_rule_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Coupon Sales Rule Name'
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['status']),
-            ['status']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['state']),
-            ['state']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_order',
-                ['increment_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['customer_id']),
-            ['customer_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['ext_order_id']),
-            ['ext_order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['quote_id']),
-            ['quote_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['send_email']),
-            ['send_email']
-        )->addIndex(
-            $installer->getIdxName('sales_order', ['email_sent']),
-            ['email_sent']
-        )->addForeignKey(
-            $installer->getFkName('sales_order', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->addForeignKey(
-            $installer->getFkName('sales_order', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Flat Order'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_grid'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_grid')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Status'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'store_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Store Name'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Customer Id'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
-        )->addColumn(
-            'base_total_paid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Paid'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Grand Total'
-        )->addColumn(
-            'total_paid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Paid'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'base_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Base Currency Code'
-        )->addColumn(
-            'order_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Order Currency Code'
-        )->addColumn(
-            'shipping_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Name'
-        )->addColumn(
-            'billing_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Name'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Updated At'
-        )->addColumn(
-            'billing_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Address'
-        )->addColumn(
-            'shipping_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Address'
-        )->addColumn(
-            'shipping_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Method Name'
-        )->addColumn(
-            'customer_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Email'
-        )->addColumn(
-            'customer_group',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Group'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'shipping_and_handling',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping and handling amount'
-        )->addColumn(
-            'customer_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Name'
-        )->addColumn(
-            'payment_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Payment Method'
-        )->addColumn(
-            'total_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Refunded'
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['status']),
-            ['status']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['base_grand_total']),
-            ['base_grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['base_total_paid']),
-            ['base_total_paid']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['grand_total']),
-            ['grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['total_paid']),
-            ['total_paid']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_order_grid',
-                ['increment_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['shipping_name']),
-            ['shipping_name']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['billing_name']),
-            ['billing_name']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['customer_id']),
-            ['customer_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order_grid', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_order_grid',
-                [
-                    'increment_id',
-                    'billing_name',
-                    'shipping_name',
-                    'shipping_address',
-                    'billing_address',
-                    'customer_name',
-                    'customer_email'
-                ],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            [
-                'increment_id',
-                'billing_name',
-                'shipping_name',
-                'shipping_address',
-                'billing_address',
-                'customer_name',
-                'customer_email'
-            ],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->setComment(
-            'Sales Flat Order Grid'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_address'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_address')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Parent Id'
-        )->addColumn(
-            'customer_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Customer Address Id'
-        )->addColumn(
-            'quote_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Quote Address Id'
-        )->addColumn(
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Region Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Customer Id'
-        )->addColumn(
-            'fax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Fax'
-        )->addColumn(
-            'region',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Region'
-        )->addColumn(
-            'postcode',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Postcode'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Lastname'
-        )->addColumn(
-            'street',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Street'
-        )->addColumn(
-            'city',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'City'
-        )->addColumn(
-            'email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Email'
-        )->addColumn(
-            'telephone',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Phone Number'
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            [],
-            'Country Id'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Firstname'
-        )->addColumn(
-            'address_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Address Type'
-        )->addColumn(
-            'prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Prefix'
-        )->addColumn(
-            'middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Middlename'
-        )->addColumn(
-            'suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Suffix'
-        )->addColumn(
-            'company',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Company'
-        )->addIndex(
-            $installer->getIdxName('sales_order_address', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_order_address', 'parent_id', 'sales_order', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Order Address'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_status_history'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_status_history')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'is_customer_notified',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Is Customer Notified'
-        )->addColumn(
-            'is_visible_on_front',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is Visible On Front'
-        )->addColumn(
-            'comment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Comment'
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Status'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'entity_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true],
-            'Shows what entity history is bind to.'
-        )->addIndex(
-            $installer->getIdxName('sales_order_status_history', ['parent_id']),
-            ['parent_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order_status_history', ['created_at']),
-            ['created_at']
-        )->addForeignKey(
-            $installer->getFkName('sales_order_status_history', 'parent_id', 'sales_order', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Order Status History'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_item')
-        )->addColumn(
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Item Id'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Order Id'
-        )->addColumn(
-            'parent_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Parent Item Id'
-        )->addColumn(
-            'quote_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Quote Item Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Product Id'
-        )->addColumn(
-            'product_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Product Type'
-        )->addColumn(
-            'product_options',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Product Options'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Weight'
-        )->addColumn(
-            'is_virtual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Virtual'
-        )->addColumn(
-            'sku',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sku'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'applied_rule_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Applied Rule Ids'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'is_qty_decimal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Qty Decimal'
-        )->addColumn(
-            'no_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'No Discount'
-        )->addColumn(
-            'qty_backordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Qty Backordered'
-        )->addColumn(
-            'qty_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Qty Canceled'
-        )->addColumn(
-            'qty_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Qty Invoiced'
-        )->addColumn(
-            'qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Qty Ordered'
-        )->addColumn(
-            'qty_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Qty Refunded'
-        )->addColumn(
-            'qty_shipped',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Qty Shipped'
-        )->addColumn(
-            'base_cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Cost'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Price'
-        )->addColumn(
-            'base_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Price'
-        )->addColumn(
-            'original_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Original Price'
-        )->addColumn(
-            'base_original_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Original Price'
-        )->addColumn(
-            'tax_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Tax Percent'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Tax Amount'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Tax Amount'
-        )->addColumn(
-            'tax_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Tax Invoiced'
-        )->addColumn(
-            'base_tax_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Tax Invoiced'
-        )->addColumn(
-            'discount_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Discount Percent'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Discount Amount'
-        )->addColumn(
-            'discount_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Discount Invoiced'
-        )->addColumn(
-            'base_discount_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Discount Invoiced'
-        )->addColumn(
-            'amount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Amount Refunded'
-        )->addColumn(
-            'base_amount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Base Amount Refunded'
-        )->addColumn(
-            'row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Row Total'
-        )->addColumn(
-            'base_row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Row Total'
-        )->addColumn(
-            'row_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Row Invoiced'
-        )->addColumn(
-            'base_row_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Base Row Invoiced'
-        )->addColumn(
-            'row_weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['default' => '0.0000'],
-            'Row Weight'
-        )->addColumn(
-            'base_tax_before_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Before Discount'
-        )->addColumn(
-            'tax_before_discount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Before Discount'
-        )->addColumn(
-            'ext_order_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Ext Order Item Id'
-        )->addColumn(
-            'locked_do_invoice',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Locked Do Invoice'
-        )->addColumn(
-            'locked_do_ship',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Locked Do Ship'
-        )->addColumn(
-            'price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price Incl Tax'
-        )->addColumn(
-            'base_price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price Incl Tax'
-        )->addColumn(
-            'row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total Incl Tax'
-        )->addColumn(
-            'base_row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total Incl Tax'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'discount_tax_compensation_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Invoiced'
-        )->addColumn(
-            'base_discount_tax_compensation_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Invoiced'
-        )->addColumn(
-            'discount_tax_compensation_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Refunded'
-        )->addColumn(
-            'base_discount_tax_compensation_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Refunded'
-        )->addColumn(
-            'tax_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Canceled'
-        )->addColumn(
-            'discount_tax_compensation_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Canceled'
-        )->addColumn(
-            'tax_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Refunded'
-        )->addColumn(
-            'base_tax_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Refunded'
-        )->addColumn(
-            'discount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Refunded'
-        )->addColumn(
-            'base_discount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Refunded'
-        )->addIndex(
-            $installer->getIdxName('sales_order_item', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_order_item', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_order_item', 'order_id', 'sales_order', 'entity_id'),
-            'order_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('sales_order_item', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Flat Order Item'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_payment'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_payment')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'base_shipping_captured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Captured'
-        )->addColumn(
-            'shipping_captured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Captured'
-        )->addColumn(
-            'amount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Amount Refunded'
-        )->addColumn(
-            'base_amount_paid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Paid'
-        )->addColumn(
-            'amount_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Amount Canceled'
-        )->addColumn(
-            'base_amount_authorized',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Authorized'
-        )->addColumn(
-            'base_amount_paid_online',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Paid Online'
-        )->addColumn(
-            'base_amount_refunded_online',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Refunded Online'
-        )->addColumn(
-            'base_shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Amount'
-        )->addColumn(
-            'shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Amount'
-        )->addColumn(
-            'amount_paid',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Amount Paid'
-        )->addColumn(
-            'amount_authorized',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Amount Authorized'
-        )->addColumn(
-            'base_amount_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Ordered'
-        )->addColumn(
-            'base_shipping_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Refunded'
-        )->addColumn(
-            'shipping_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Refunded'
-        )->addColumn(
-            'base_amount_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Refunded'
-        )->addColumn(
-            'amount_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Amount Ordered'
-        )->addColumn(
-            'base_amount_canceled',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount Canceled'
-        )->addColumn(
-            'quote_payment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Quote Payment Id'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'cc_exp_month',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            12,
-            [],
-            'Cc Exp Month'
-        )->addColumn(
-            'cc_ss_start_year',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            12,
-            [],
-            'Cc Ss Start Year'
-        )->addColumn(
-            'echeck_bank_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Echeck Bank Name'
-        )->addColumn(
-            'method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Method'
-        )->addColumn(
-            'cc_debug_request_body',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Debug Request Body'
-        )->addColumn(
-            'cc_secure_verify',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Secure Verify'
-        )->addColumn(
-            'protection_eligibility',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Protection Eligibility'
-        )->addColumn(
-            'cc_approval',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Approval'
-        )->addColumn(
-            'cc_last_4',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            [],
-            'Cc Last 4'
-        )->addColumn(
-            'cc_status_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Status Description'
-        )->addColumn(
-            'echeck_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Echeck Type'
-        )->addColumn(
-            'cc_debug_response_serialized',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Debug Response Serialized'
-        )->addColumn(
-            'cc_ss_start_month',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Cc Ss Start Month'
-        )->addColumn(
-            'echeck_account_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Echeck Account Type'
-        )->addColumn(
-            'last_trans_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Last Trans Id'
-        )->addColumn(
-            'cc_cid_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Cid Status'
-        )->addColumn(
-            'cc_owner',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Cc Owner'
-        )->addColumn(
-            'cc_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Type'
-        )->addColumn(
-            'po_number',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Po Number'
-        )->addColumn(
-            'cc_exp_year',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            4,
-            ['nullable' => true, 'default' => null],
-            'Cc Exp Year'
-        )->addColumn(
-            'cc_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            4,
-            [],
-            'Cc Status'
-        )->addColumn(
-            'echeck_routing_number',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Echeck Routing Number'
-        )->addColumn(
-            'account_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Account Status'
-        )->addColumn(
-            'anet_trans_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Anet Trans Method'
-        )->addColumn(
-            'cc_debug_response_body',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Debug Response Body'
-        )->addColumn(
-            'cc_ss_issue',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Ss Issue'
-        )->addColumn(
-            'echeck_account_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Echeck Account Name'
-        )->addColumn(
-            'cc_avs_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Avs Status'
-        )->addColumn(
-            'cc_number_enc',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Cc Number Enc'
-        )->addColumn(
-            'cc_trans_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Cc Trans Id'
-        )->addColumn(
-            'address_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Address Status'
-        )->addColumn(
-            'additional_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Information'
-        )->addIndex(
-            $installer->getIdxName('sales_order_payment', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_order_payment', 'parent_id', 'sales_order', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Order Payment'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipment'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipment')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'total_weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Weight'
-        )->addColumn(
-            'total_qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Qty'
-        )->addColumn(
-            'email_sent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Email Sent'
-        )->addColumn(
-            'send_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Send Email'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Customer Id'
-        )->addColumn(
-            'shipping_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Shipping Address Id'
-        )->addColumn(
-            'billing_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Billing Address Id'
-        )->addColumn(
-            'shipment_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Shipment Status'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'packages',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '20000',
-            [],
-            'Packed Products in Packages'
-        )->addColumn(
-            'shipping_label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_VARBINARY,
-            '2m',
-            [],
-            'Shipping Label Content'
-        )->addColumn(
-            'customer_note',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Customer Note'
-        )->addColumn(
-            'customer_note_notify',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Customer Note Notify'
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['total_qty']),
-            ['total_qty']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment',
-                ['increment_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['send_email']),
-            ['send_email']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment', ['email_sent']),
-            ['email_sent']
-        )->addForeignKey(
-            $installer->getFkName('sales_shipment', 'order_id', 'sales_order', 'entity_id'),
-            'order_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('sales_shipment', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Flat Shipment'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipment_grid'
-         *
-         * @add order_id, shipping_description
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipment_grid')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Order Increment Id'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'order_created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false],
-            'Order Increment Id'
-        )->addColumn(
-            'customer_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            ['nullable' => false],
-            'Customer Name'
-        )->addColumn(
-            'total_qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Qty'
-        )->addColumn(
-            'shipment_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Shipment Status'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Order'
-        )->addColumn(
-            'billing_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Address'
-        )->addColumn(
-            'shipping_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Address'
-        )->addColumn(
-            'billing_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Billing Name'
-        )->addColumn(
-            'shipping_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Shipping Name'
-        )->addColumn(
-            'customer_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Customer Email'
-        )->addColumn(
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            [],
-            'Customer Group Id'
-        )->addColumn(
-            'payment_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Payment Method'
-        )->addColumn(
-            'shipping_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Method Name'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Updated At'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                [
-                    'increment_id',
-                    'store_id'
-                ],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                ['store_id']
-            ),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                ['total_qty']
-            ),
-            ['total_qty']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                ['order_increment_id']
-            ),
-            ['order_increment_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                ['shipment_status']
-            ),
-            ['shipment_status']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                ['order_status']
-            ),
-            ['order_status']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_grid', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_grid', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_grid', ['order_created_at']),
-            ['order_created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_grid', ['shipping_name']),
-            ['shipping_name']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_grid', ['billing_name']),
-            ['billing_name']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipment_grid',
-                [
-                    'increment_id',
-                    'order_increment_id',
-                    'shipping_name',
-                    'customer_name',
-                    'customer_email',
-                    'billing_address',
-                    'shipping_address'
-                ],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            [
-                'increment_id',
-                'order_increment_id',
-                'shipping_name',
-                'customer_name',
-                'customer_email',
-                'billing_address',
-                'shipping_address'
-            ],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->setComment(
-            'Sales Flat Shipment Grid'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipment_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipment_item')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Weight'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Qty'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Product Id'
-        )->addColumn(
-            'order_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Order Item Id'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'sku',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sku'
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_item', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_shipment_item', 'parent_id', 'sales_shipment', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_shipment'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Shipment Item'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipment_track'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipment_track')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'weight',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Weight'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Qty'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'track_number',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Number'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Title'
-        )->addColumn(
-            'carrier_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Carrier Code'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_track', ['parent_id']),
-            ['parent_id']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_track', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_track', ['created_at']),
-            ['created_at']
-        )->addForeignKey(
-            $installer->getFkName('sales_shipment_track', 'parent_id', 'sales_shipment', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_shipment'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Shipment Track'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipment_comment'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipment_comment')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'is_customer_notified',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Is Customer Notified'
-        )->addColumn(
-            'is_visible_on_front',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is Visible On Front'
-        )->addColumn(
-            'comment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Comment'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_comment', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_shipment_comment', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_shipment_comment', 'parent_id', 'sales_shipment', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_shipment'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Shipment Comment'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_invoice'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_invoice')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true, 'identity' => true],
-            'Entity Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
-        )->addColumn(
-            'shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Tax Amount'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Amount'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Amount'
-        )->addColumn(
-            'store_to_order_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Store To Order Rate'
-        )->addColumn(
-            'base_shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Tax Amount'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Amount'
-        )->addColumn(
-            'base_to_order_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Order Rate'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Grand Total'
-        )->addColumn(
-            'shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Amount'
-        )->addColumn(
-            'subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Incl Tax'
-        )->addColumn(
-            'base_subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Incl Tax'
-        )->addColumn(
-            'store_to_base_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Store To Base Rate'
-        )->addColumn(
-            'base_shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Amount'
-        )->addColumn(
-            'total_qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Qty'
-        )->addColumn(
-            'base_to_global_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Global Rate'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'base_subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Amount'
-        )->addColumn(
-            'billing_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Billing Address Id'
-        )->addColumn(
-            'is_used_for_refund',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Used For Refund'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'email_sent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Email Sent'
-        )->addColumn(
-            'send_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Send Email'
-        )->addColumn(
-            'can_void_flag',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Can Void Flag'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'State'
-        )->addColumn(
-            'shipping_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Shipping Address Id'
-        )->addColumn(
-            'store_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Store Currency Code'
-        )->addColumn(
-            'transaction_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Transaction Id'
-        )->addColumn(
-            'order_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Order Currency Code'
-        )->addColumn(
-            'base_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Base Currency Code'
-        )->addColumn(
-            'global_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Global Currency Code'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_shipping_discount_tax_compensation_amnt',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Incl Tax'
-        )->addColumn(
-            'base_shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Incl Tax'
-        )->addColumn(
-            'base_total_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Total Refunded'
-        )->addColumn(
-            'discount_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Discount Description'
-        )->addColumn(
-            'customer_note',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Customer Note'
-        )->addColumn(
-            'customer_note_notify',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Customer Note Notify'
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['grand_total']),
-            ['grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['state']),
-            ['state']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_invoice',
-                ['increment_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['send_email']),
-            ['send_email']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice', ['email_sent']),
-            ['email_sent']
-        )->addForeignKey(
-            $installer->getFkName('sales_invoice', 'order_id', 'sales_order', 'entity_id'),
-            'order_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('sales_invoice', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Flat Invoice'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_invoice_grid'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_invoice_grid')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'State'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'store_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Store Name'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'order_increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Increment Id'
-        )->addColumn(
-            'order_created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Order Created At'
-        )->addColumn(
-            'customer_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Name'
-        )->addColumn(
-            'customer_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Customer Email'
-        )->addColumn(
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            [],
-            'Customer Group Id'
-        )->addColumn(
-            'payment_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Payment Method'
-        )->addColumn(
-            'store_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Store Currency Code'
-        )->addColumn(
-            'order_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Order Currency Code'
-        )->addColumn(
-            'base_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Base Currency Code'
-        )->addColumn(
-            'global_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Global Currency Code'
-        )->addColumn(
-            'billing_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Name'
-        )->addColumn(
-            'billing_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Address'
-        )->addColumn(
-            'shipping_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Address'
-        )->addColumn(
-            'shipping_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Method Name'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'shipping_and_handling',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping and handling amount'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Grand Total'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Updated At'
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['grand_total']),
-            ['grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['state']),
-            ['state']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_invoice_grid',
-                ['increment_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['order_increment_id']),
-            ['order_increment_id']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['order_created_at']),
-            ['order_created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['billing_name']),
-            ['billing_name']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_invoice_grid',
-                [
-                    'increment_id',
-                    'order_increment_id',
-                    'billing_name',
-                    'billing_address',
-                    'shipping_address',
-                    'customer_name',
-                    'customer_email'
-                ],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            [
-                'increment_id',
-                'order_increment_id',
-                'billing_name',
-                'billing_address',
-                'shipping_address',
-                'customer_name',
-                'customer_email'
-            ],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->setComment(
-            'Sales Flat Invoice Grid'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_invoice_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_invoice_item')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'base_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Amount'
-        )->addColumn(
-            'base_row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Amount'
-        )->addColumn(
-            'row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Amount'
-        )->addColumn(
-            'price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price Incl Tax'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Amount'
-        )->addColumn(
-            'base_price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price Incl Tax'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Qty'
-        )->addColumn(
-            'base_cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Cost'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price'
-        )->addColumn(
-            'base_row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total Incl Tax'
-        )->addColumn(
-            'row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total Incl Tax'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Product Id'
-        )->addColumn(
-            'order_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Order Item Id'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'sku',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sku'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'tax_ratio',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            512,
-            [],
-            'Ratio of tax invoiced over tax of the order item'
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_item', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_invoice_item', 'parent_id', 'sales_invoice', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_invoice'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Invoice Item'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_invoice_comment'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_invoice_comment')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'is_customer_notified',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Customer Notified'
-        )->addColumn(
-            'is_visible_on_front',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is Visible On Front'
-        )->addColumn(
-            'comment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Comment'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_comment', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_comment', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_invoice_comment', 'parent_id', 'sales_invoice', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_invoice'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Invoice Comment'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_creditmemo'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_creditmemo')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'adjustment_positive',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment Positive'
-        )->addColumn(
-            'base_shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Tax Amount'
-        )->addColumn(
-            'store_to_order_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Store To Order Rate'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Amount'
-        )->addColumn(
-            'base_to_order_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Order Rate'
-        )->addColumn(
-            'grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Grand Total'
-        )->addColumn(
-            'base_adjustment_negative',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Adjustment Negative'
-        )->addColumn(
-            'base_subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal Incl Tax'
-        )->addColumn(
-            'shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Amount'
-        )->addColumn(
-            'subtotal_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal Incl Tax'
-        )->addColumn(
-            'adjustment_negative',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment Negative'
-        )->addColumn(
-            'base_shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Amount'
-        )->addColumn(
-            'store_to_base_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Store To Base Rate'
-        )->addColumn(
-            'base_to_global_rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base To Global Rate'
-        )->addColumn(
-            'base_adjustment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Adjustment'
-        )->addColumn(
-            'base_subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Subtotal'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Amount'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'adjustment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
-        )->addColumn(
-            'base_adjustment_positive',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Adjustment Positive'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Amount'
-        )->addColumn(
-            'shipping_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Tax Amount'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Amount'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'email_sent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Email Sent'
-        )->addColumn(
-            'send_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Send Email'
-        )->addColumn(
-            'creditmemo_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Creditmemo Status'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'State'
-        )->addColumn(
-            'shipping_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Shipping Address Id'
-        )->addColumn(
-            'billing_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Billing Address Id'
-        )->addColumn(
-            'invoice_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Invoice Id'
-        )->addColumn(
-            'store_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Store Currency Code'
-        )->addColumn(
-            'order_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Order Currency Code'
-        )->addColumn(
-            'base_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Base Currency Code'
-        )->addColumn(
-            'global_currency_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            3,
-            [],
-            'Global Currency Code'
-        )->addColumn(
-            'transaction_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Transaction Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_shipping_discount_tax_compensation_amnt',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Discount Tax Compensation Amount'
-        )->addColumn(
-            'shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping Incl Tax'
-        )->addColumn(
-            'base_shipping_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Shipping Incl Tax'
-        )->addColumn(
-            'discount_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Discount Description'
-        )->addColumn(
-            'customer_note',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Customer Note'
-        )->addColumn(
-            'customer_note_notify',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Customer Note Notify'
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['creditmemo_status']),
-            ['creditmemo_status']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_creditmemo',
-                ['increment_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['state']),
-            ['state']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['send_email']),
-            ['send_email']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo', ['email_sent']),
-            ['email_sent']
-        )->addForeignKey(
-            $installer->getFkName('sales_creditmemo', 'order_id', 'sales_order', 'entity_id'),
-            'order_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('sales_creditmemo', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Flat Creditmemo'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_creditmemo_grid'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_creditmemo_grid')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Updated At'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'order_increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Increment Id'
-        )->addColumn(
-            'order_created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Order Created At'
-        )->addColumn(
-            'billing_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Name'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Status'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Order Status'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'billing_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Billing Address'
-        )->addColumn(
-            'shipping_address',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Address'
-        )->addColumn(
-            'customer_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            ['nullable' => false],
-            'Customer Name'
-        )->addColumn(
-            'customer_email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            [],
-            'Customer Email'
-        )->addColumn(
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            [],
-            'Customer Group Id'
-        )->addColumn(
-            'payment_method',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Payment Method'
-        )->addColumn(
-            'shipping_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Method Name'
-        )->addColumn(
-            'subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Subtotal'
-        )->addColumn(
-            'shipping_and_handling',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Shipping and handling amount'
-        )->addColumn(
-            'adjustment_positive',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment Positive'
-        )->addColumn(
-            'adjustment_negative',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Adjustment Negative'
-        )->addColumn(
-            'order_base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Order Grand Total'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_creditmemo_grid',
-                [
-                    'increment_id',
-                    'store_id'
-                ],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['increment_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['order_increment_id']),
-            ['order_increment_id']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['updated_at']),
-            ['updated_at']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['order_created_at']),
-            ['order_created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['state']),
-            ['state']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['billing_name']),
-            ['billing_name']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['order_status']),
-            ['order_status']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['base_grand_total']),
-            ['base_grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['order_base_grand_total']),
-            ['order_base_grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_grid', ['order_id']),
-            ['order_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_creditmemo_grid',
-                [
-                    'increment_id',
-                    'order_increment_id',
-                    'billing_name',
-                    'billing_address',
-                    'shipping_address',
-                    'customer_name',
-                    'customer_email'
-                ],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            [
-                'increment_id',
-                'order_increment_id',
-                'billing_name',
-                'billing_address',
-                'shipping_address',
-                'customer_name',
-                'customer_email'
-            ],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->setComment(
-            'Sales Flat Creditmemo Grid'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_creditmemo_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_creditmemo_item')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'base_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price'
-        )->addColumn(
-            'tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Tax Amount'
-        )->addColumn(
-            'base_row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Amount'
-        )->addColumn(
-            'row_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total'
-        )->addColumn(
-            'base_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Amount'
-        )->addColumn(
-            'price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price Incl Tax'
-        )->addColumn(
-            'base_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Tax Amount'
-        )->addColumn(
-            'base_price_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Price Incl Tax'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Qty'
-        )->addColumn(
-            'base_cost',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Cost'
-        )->addColumn(
-            'price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Price'
-        )->addColumn(
-            'base_row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Row Total Incl Tax'
-        )->addColumn(
-            'row_total_incl_tax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Row Total Incl Tax'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Product Id'
-        )->addColumn(
-            'order_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Order Item Id'
-        )->addColumn(
-            'additional_data',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Additional Data'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'sku',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sku'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Discount Tax Compensation Amount'
-        )->addColumn(
-            'base_discount_tax_compensation_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Discount Tax Compensation Amount'
-        )->addColumn(
-            'tax_ratio',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            512,
-            [],
-            'Ratio of tax in the creditmemo item over tax of the order item'
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_item', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_creditmemo_item', 'parent_id', 'sales_creditmemo', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_creditmemo'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Creditmemo Item'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_creditmemo_comment'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_creditmemo_comment')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Parent Id'
-        )->addColumn(
-            'is_customer_notified',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            [],
-            'Is Customer Notified'
-        )->addColumn(
-            'is_visible_on_front',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is Visible On Front'
-        )->addColumn(
-            'comment',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Comment'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_comment', ['created_at']),
-            ['created_at']
-        )->addIndex(
-            $installer->getIdxName('sales_creditmemo_comment', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_creditmemo_comment', 'parent_id', 'sales_creditmemo', 'entity_id'),
-            'parent_id',
-            $installer->getTable('sales_creditmemo'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Flat Creditmemo Comment'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_invoiced_aggregated'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_invoiced_aggregated')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Status'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'orders_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Orders Invoiced'
-        )->addColumn(
-            'invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Invoiced'
-        )->addColumn(
-            'invoiced_captured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Invoiced Captured'
-        )->addColumn(
-            'invoiced_not_captured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Invoiced Not Captured'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_invoiced_aggregated',
-                ['period', 'store_id', 'order_status'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_invoiced_aggregated', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_invoiced_aggregated', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Invoiced Aggregated'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_invoiced_aggregated_order'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_invoiced_aggregated_order')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => false, 'default' => false],
-            'Order Status'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'orders_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Orders Invoiced'
-        )->addColumn(
-            'invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Invoiced'
-        )->addColumn(
-            'invoiced_captured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Invoiced Captured'
-        )->addColumn(
-            'invoiced_not_captured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Invoiced Not Captured'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_invoiced_aggregated_order',
-                ['period', 'store_id', 'order_status'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_invoiced_aggregated_order', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_invoiced_aggregated_order', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Invoiced Aggregated Order'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_aggregated_created'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_aggregated_created')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => false, 'default' => false],
-            'Order Status'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'total_qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Qty Ordered'
-        )->addColumn(
-            'total_qty_invoiced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Qty Invoiced'
-        )->addColumn(
-            'total_income_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Income Amount'
-        )->addColumn(
-            'total_revenue_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Revenue Amount'
-        )->addColumn(
-            'total_profit_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Profit Amount'
-        )->addColumn(
-            'total_invoiced_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Invoiced Amount'
-        )->addColumn(
-            'total_canceled_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Canceled Amount'
-        )->addColumn(
-            'total_paid_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Paid Amount'
-        )->addColumn(
-            'total_refunded_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Refunded Amount'
-        )->addColumn(
-            'total_tax_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Tax Amount'
-        )->addColumn(
-            'total_tax_amount_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Tax Amount Actual'
-        )->addColumn(
-            'total_shipping_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Shipping Amount'
-        )->addColumn(
-            'total_shipping_amount_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Shipping Amount Actual'
-        )->addColumn(
-            'total_discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Discount Amount'
-        )->addColumn(
-            'total_discount_amount_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Discount Amount Actual'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_order_aggregated_created',
-                ['period', 'store_id', 'order_status'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_order_aggregated_created', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_order_aggregated_created', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Order Aggregated Created'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->getConnection()->createTable(
-            $installer->getConnection()->createTableByDdl(
-                $installer->getTable('sales_order_aggregated_created'),
-                $installer->getTable('sales_order_aggregated_updated')
-            )
-        );
-
-        /**
-         * Create table 'sales_payment_transaction'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_payment_transaction')
-        )->addColumn(
-            'transaction_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Transaction Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Parent Id'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Order Id'
-        )->addColumn(
-            'payment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Payment Id'
-        )->addColumn(
-            'txn_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            [],
-            'Txn Id'
-        )->addColumn(
-            'parent_txn_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            [],
-            'Parent Txn Id'
-        )->addColumn(
-            'txn_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            15,
-            [],
-            'Txn Type'
-        )->addColumn(
-            'is_closed',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Is Closed'
-        )->addColumn(
-            'additional_information',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
-            '64K',
-            [],
-            'Additional Information'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_payment_transaction',
-                ['order_id', 'payment_id', 'txn_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['order_id', 'payment_id', 'txn_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_payment_transaction', ['parent_id']),
-            ['parent_id']
-        )->addIndex(
-            $installer->getIdxName('sales_payment_transaction', ['payment_id']),
-            ['payment_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_payment_transaction', 'order_id', 'sales_order', 'entity_id'),
-            'order_id',
-            $installer->getTable('sales_order'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'sales_payment_transaction',
-                'parent_id',
-                'sales_payment_transaction',
-                'transaction_id'
-            ),
-            'parent_id',
-            $installer->getTable('sales_payment_transaction'),
-            'transaction_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('sales_payment_transaction', 'payment_id', 'sales_order_payment', 'entity_id'),
-            'payment_id',
-            $installer->getTable('sales_order_payment'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Payment Transaction'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_refunded_aggregated'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_refunded_aggregated')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => false, 'default' => false],
-            'Order Status'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Refunded'
-        )->addColumn(
-            'online_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Online Refunded'
-        )->addColumn(
-            'offline_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Offline Refunded'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_refunded_aggregated',
-                ['period', 'store_id', 'order_status'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_refunded_aggregated', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_refunded_aggregated', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Refunded Aggregated'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_refunded_aggregated_order'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_refunded_aggregated_order')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Status'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Refunded'
-        )->addColumn(
-            'online_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Online Refunded'
-        )->addColumn(
-            'offline_refunded',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Offline Refunded'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_refunded_aggregated_order',
-                ['period', 'store_id', 'order_status'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_refunded_aggregated_order', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_refunded_aggregated_order', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Refunded Aggregated Order'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipping_aggregated'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipping_aggregated')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Status'
-        )->addColumn(
-            'shipping_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Description'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'total_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Shipping'
-        )->addColumn(
-            'total_shipping_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Shipping Actual'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipping_aggregated',
-                ['period', 'store_id', 'order_status', 'shipping_description'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status', 'shipping_description'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_shipping_aggregated', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_shipping_aggregated', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Shipping Aggregated'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_shipping_aggregated_order'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_shipping_aggregated_order')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Status'
-        )->addColumn(
-            'shipping_description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Shipping Description'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'total_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Shipping'
-        )->addColumn(
-            'total_shipping_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Total Shipping Actual'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_shipping_aggregated_order',
-                ['period', 'store_id', 'order_status', 'shipping_description'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status', 'shipping_description'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_shipping_aggregated_order', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_shipping_aggregated_order', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Sales Shipping Aggregated Order'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_bestsellers_aggregated_daily'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_bestsellers_aggregated_daily')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Product Id'
-        )->addColumn(
-            'product_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Product Name'
-        )->addColumn(
-            'product_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Product Price'
-        )->addColumn(
-            'qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Qty Ordered'
-        )->addColumn(
-            'rating_pos',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Rating Pos'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_bestsellers_aggregated_daily',
-                ['period', 'store_id', 'product_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'product_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_bestsellers_aggregated_daily', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_bestsellers_aggregated_daily', ['product_id']),
-            ['product_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_bestsellers_aggregated_daily', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Bestsellers Aggregated Daily'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_bestsellers_aggregated_monthly'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_bestsellers_aggregated_monthly')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Product Id'
-        )->addColumn(
-            'product_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Product Name'
-        )->addColumn(
-            'product_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Product Price'
-        )->addColumn(
-            'qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Qty Ordered'
-        )->addColumn(
-            'rating_pos',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Rating Pos'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_bestsellers_aggregated_monthly',
-                ['period', 'store_id', 'product_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'product_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_bestsellers_aggregated_monthly', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_bestsellers_aggregated_monthly', ['product_id']),
-            ['product_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_bestsellers_aggregated_monthly', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Bestsellers Aggregated Monthly'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_bestsellers_aggregated_yearly'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_bestsellers_aggregated_yearly')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Product Id'
-        )->addColumn(
-            'product_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Product Name'
-        )->addColumn(
-            'product_price',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Product Price'
-        )->addColumn(
-            'qty_ordered',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Qty Ordered'
-        )->addColumn(
-            'rating_pos',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Rating Pos'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_bestsellers_aggregated_yearly',
-                ['period', 'store_id', 'product_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'product_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('sales_bestsellers_aggregated_yearly', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('sales_bestsellers_aggregated_yearly', ['product_id']),
-            ['product_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_bestsellers_aggregated_yearly', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Bestsellers Aggregated Yearly'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_tax'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_tax')
-        )->addColumn(
-            'tax_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Tax Id'
-        )->addColumn(
-            'order_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Order Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Code'
-        )->addColumn(
-            'title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Title'
-        )->addColumn(
-            'percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Percent'
-        )->addColumn(
-            'amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Amount'
-        )->addColumn(
-            'priority',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Priority'
-        )->addColumn(
-            'position',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Position'
-        )->addColumn(
-            'base_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Amount'
-        )->addColumn(
-            'process',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false],
-            'Process'
-        )->addColumn(
-            'base_real_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Real Amount'
-        )->addIndex(
-            $installer->getIdxName('sales_order_tax', ['order_id', 'priority', 'position']),
-            ['order_id', 'priority', 'position']
-        )->setComment(
-            'Sales Order Tax Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_tax_item'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('sales_order_tax_item')
-        )->addColumn(
-            'tax_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Tax Item Id'
-        )->addColumn(
-            'tax_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Tax Id'
-        )->addColumn(
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Item Id'
-        )->addColumn(
-            'tax_percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Real Tax Percent For Item'
-        )->addColumn(
-            'amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Tax amount for the item and tax rate'
-        )->addColumn(
-            'base_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Base tax amount for the item and tax rate'
-        )->addColumn(
-            'real_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Real tax amount for the item and tax rate'
-        )->addColumn(
-            'real_base_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Real base tax amount for the item and tax rate'
-        )->addColumn(
-            'associated_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => true, 'unsigned' => true],
-            'Id of the associated item'
-        )->addColumn(
-            'taxable_item_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'Type of the taxable item'
-        )->addIndex(
-            $setup->getIdxName('sales_order_tax_item', ['item_id']),
-            ['item_id']
-        )->addIndex(
-            $setup->getIdxName(
-                'sales_order_tax_item',
-                ['tax_id', 'item_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['tax_id', 'item_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $setup->getFkName('sales_order_tax_item', 'associated_item_id', 'sales_order_item', 'item_id'),
-            'associated_item_id',
-            $setup->getTable('sales_order_item'),
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName('sales_order_tax_item', 'tax_id', 'sales_order_tax', 'tax_id'),
-            'tax_id',
-            $setup->getTable('sales_order_tax'),
-            'tax_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName('sales_order_tax_item', 'item_id', 'sales_order_item', 'item_id'),
-            'item_id',
-            $setup->getTable('sales_order_item'),
-            'item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Order Tax Item'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_status'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_status')
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => true],
-            'Status'
-        )->addColumn(
-            'label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            ['nullable' => false],
-            'Label'
-        )->setComment(
-            'Sales Order Status Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_status_state'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_status_state')
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => true],
-            'Status'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => true],
-            'Label'
-        )->addColumn(
-            'is_default',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Is Default'
-        )->addColumn(
-            'visible_on_front',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            1,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Visible on front'
-        )->addForeignKey(
-            $installer->getFkName('sales_order_status_state', 'status', 'sales_order_status', 'status'),
-            'status',
-            $installer->getTable('sales_order_status'),
-            'status',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Order Status Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'sales_order_status_label'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sales_order_status_label')
-        )->addColumn(
-            'status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => true],
-            'Status'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store Id'
-        )->addColumn(
-            'label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            ['nullable' => false],
-            'Label'
-        )->addIndex(
-            $installer->getIdxName('sales_order_status_label', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sales_order_status_label', 'status', 'sales_order_status', 'status'),
-            'status',
-            $installer->getTable('sales_order_status'),
-            'status',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('sales_order_status_label', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Order Status Label Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..542476c7dd902
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\State;
+use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Sales\Setup\SalesOrderPaymentDataConverter;
+use Magento\Sales\Setup\SalesSetup;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Sales\Setup\SerializedDataConverter;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedDataToJson
+ * @package Magento\Sales\Setup\Patch
+ */
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var AggregatedFieldDataConverter
+     */
+    private $aggregatedFieldDataConverter;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        SalesSetupFactory $salesSetupFactory,
+        \Magento\Eav\Model\Config $eavConfig,
+        AggregatedFieldDataConverter $aggregatedFieldDataConverter
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->salesSetupFactory = $salesSetupFactory;
+        $this->eavConfig = $eavConfig;
+        $this->aggregatedFieldDataConverter = $aggregatedFieldDataConverter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var SalesSetup $salesSetup */
+        $salesSetup = $this->salesSetupFactory->create();
+        $this->convertSerializedDataToJson($salesSetup);
+        $this->eavConfig->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateEntityTypes::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.6';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert native serialization to JSON.
+     *
+     * @param SalesSetup $salesSetup
+     */
+    private function convertSerializedDataToJson(SalesSetup $salesSetup)
+    {
+        $fieldsToUpdate = [
+            new FieldToConvert(
+                SerializedToJson::class,
+                $salesSetup->getTable('sales_invoice_item'),
+                'entity_id',
+                'tax_ratio'
+            ),
+            new FieldToConvert(
+                SerializedToJson::class,
+                $salesSetup->getTable('sales_creditmemo_item'),
+                'entity_id',
+                'tax_ratio'
+            ),
+        ];
+        $fieldsToUpdate[] = new FieldToConvert(
+            SerializedDataConverter::class,
+            $salesSetup->getTable('sales_order_item'),
+            'item_id',
+            'product_options'
+        );
+        $fieldsToUpdate[] = new FieldToConvert(
+            SerializedToJson::class,
+            $salesSetup->getTable('sales_shipment'),
+            'entity_id',
+            'packages'
+        );
+        $fieldsToUpdate[] = new FieldToConvert(
+            SalesOrderPaymentDataConverter::class,
+            $salesSetup->getTable('sales_order_payment'),
+            'entity_id',
+            'additional_information'
+        );
+        $fieldsToUpdate[] = new FieldToConvert(
+            SerializedToJson::class,
+            $salesSetup->getTable('sales_payment_transaction'),
+            'transaction_id',
+            'additional_information'
+        );
+        $this->aggregatedFieldDataConverter->convert($fieldsToUpdate, $salesSetup->getConnection());
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
new file mode 100644
index 0000000000000..2716e860243bf
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\State;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var AddressCollectionFactory
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        SalesSetupFactory $salesSetupFactory,
+        State $state,
+        Config $eavConfig,
+        AddressCollectionFactory $addressCollectionFactory,
+        OrderFactory $orderFactory,
+        QuoteFactory $quoteFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->salesSetupFactory = $salesSetupFactory;
+        $this->state = $state;
+        $this->eavConfig = $eavConfig;
+        $this->addressCollectionFactory = $addressCollectionFactory;
+        $this->orderFactory = $orderFactory;
+        $this->quoteFactory = $quoteFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->state->emulateAreaCode(
+            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+            [$this, 'fillQuoteAddressIdInSalesOrderAddress'],
+            [$this->moduleDataSetup]
+        );
+        $this->eavConfig->clear();
+    }
+
+    /**
+     * Fill quote_address_id in table sales_order_address if it is empty.
+     *
+     * @param ModuleDataSetupInterface $setup
+     */
+    public function fillQuoteAddressIdInSalesOrderAddress(ModuleDataSetupInterface $setup)
+    {
+        $addressTable = $setup->getTable('sales_order_address');
+        $updateOrderAddress = $setup->getConnection()
+            ->select()
+            ->joinInner(
+                ['sales_order' => $setup->getTable('sales_order')],
+                $addressTable . '.parent_id = sales_order.entity_id',
+                ['quote_address_id' => 'quote_address.address_id']
+            )
+            ->joinInner(
+                ['quote_address' => $setup->getTable('quote_address')],
+                'sales_order.quote_id = quote_address.quote_id 
+                AND ' . $addressTable . '.address_type = quote_address.address_type',
+                []
+            )
+            ->where(
+                $addressTable . '.quote_address_id IS NULL'
+            );
+        $updateOrderAddress = $setup->getConnection()->updateFromSelect(
+            $updateOrderAddress,
+            $addressTable
+        );
+        $setup->getConnection()->query($updateOrderAddress);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            ConvertSerializedDataToJson::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.8';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php b/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php
new file mode 100644
index 0000000000000..ba0535875d96b
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InstallOrderStatusesAndInitialSalesConfig
+ * @package Magento\Sales\Setup\Patch
+ */
+class InstallOrderStatusesAndInitialSalesConfig implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * InstallOrderStatusesAndInitialSalesConfig constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param SalesSetupFactory $salesSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        SalesSetupFactory $salesSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->salesSetupFactory = $salesSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function apply()
+    {
+        /** @var \Magento\Sales\Setup\SalesSetup $salesSetup */
+        $salesSetup = $this->salesSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        /**
+         * Install eav entity types to the eav/entity_type table
+         */
+        $salesSetup->installEntities();
+        /**
+         * Install order statuses from config
+         */
+        $data = [];
+        $statuses = [
+            'pending' => __('Pending'),
+            'pending_payment' => __('Pending Payment'),
+            'processing' => __('Processing'),
+            'holded' => __('On Hold'),
+            'complete' => __('Complete'),
+            'closed' => __('Closed'),
+            'canceled' => __('Canceled'),
+            'fraud' => __('Suspected Fraud'),
+            'payment_review' => __('Payment Review'),
+        ];
+        foreach ($statuses as $code => $info) {
+            $data[] = ['status' => $code, 'label' => $info];
+        }
+        $this->moduleDataSetup->getConnection()->insertArray(
+            $this->moduleDataSetup->getTable('sales_order_status'),
+            ['status', 'label'],
+            $data
+        );
+        /**
+         * Install order states from config
+         */
+        $data = [];
+        $states = [
+            'new' => [
+                'label' => __('New'),
+                'statuses' => ['pending' => ['default' => '1']],
+                'visible_on_front' => true,
+            ],
+            'pending_payment' => [
+                'label' => __('Pending Payment'),
+                'statuses' => ['pending_payment' => ['default' => '1']],
+            ],
+            'processing' => [
+                'label' => __('Processing'),
+                'statuses' => ['processing' => ['default' => '1'], 'fraud' => []],
+                'visible_on_front' => true,
+            ],
+            'complete' => [
+                'label' => __('Complete'),
+                'statuses' => ['complete' => ['default' => '1']],
+                'visible_on_front' => true,
+            ],
+            'closed' => [
+                'label' => __('Closed'),
+                'statuses' => ['closed' => ['default' => '1']],
+                'visible_on_front' => true,
+            ],
+            'canceled' => [
+                'label' => __('Canceled'),
+                'statuses' => ['canceled' => ['default' => '1']],
+                'visible_on_front' => true,
+            ],
+            'holded' => [
+                'label' => __('On Hold'),
+                'statuses' => ['holded' => ['default' => '1']],
+                'visible_on_front' => true,
+            ],
+            'payment_review' => [
+                'label' => __('Payment Review'),
+                'statuses' => ['payment_review' => ['default' => '1'], 'fraud' => []],
+                'visible_on_front' => true,
+            ],
+        ];
+        foreach ($states as $code => $info) {
+            if (isset($info['statuses'])) {
+                foreach ($info['statuses'] as $status => $statusInfo) {
+                    $data[] = [
+                        'status' => $status,
+                        'state' => $code,
+                        'is_default' => is_array($statusInfo) && isset($statusInfo['default']) ? 1 : 0,
+                    ];
+                }
+            }
+        }
+        $this->moduleDataSetup->getConnection()->insertArray(
+            $this->moduleDataSetup->getTable('sales_order_status_state'),
+            ['status', 'state', 'is_default'],
+            $data
+        );
+        $entitiesToAlter = ['order_address'];
+        $attributes = [
+            'vat_id' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT],
+            'vat_is_valid' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT],
+            'vat_request_id' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT],
+            'vat_request_date' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT],
+            'vat_request_success' => ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT],
+        ];
+        foreach ($entitiesToAlter as $entityName) {
+            foreach ($attributes as $attributeCode => $attributeParams) {
+                $salesSetup->addAttribute($entityName, $attributeCode, $attributeParams);
+            }
+        }
+        /** Update visibility for states */
+        $states = ['new', 'processing', 'complete', 'closed', 'canceled', 'holded', 'payment_review'];
+        foreach ($states as $state) {
+            $this->moduleDataSetup->getConnection()->update(
+                $this->moduleDataSetup->getTable('sales_order_status_state'),
+                ['visible_on_front' => 1],
+                ['state = ?' => $state]
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php
new file mode 100644
index 0000000000000..99e15df8420ef
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class UpdateEntityTypeModelForInvoice implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        SalesSetupFactory $salesSetupFactory,
+        Config $eavConfig
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->salesSetupFactory = $salesSetupFactory;
+        $this->eavConfig = $eavConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $salesSetup = $this->salesSetupFactory->create();
+        //Correct wrong source model for "invoice" entity type, introduced by mistake in 2.0.1 upgrade.
+        $salesSetup->updateEntityType(
+            'invoice',
+            'entity_model',
+            \Magento\Sales\Model\ResourceModel\Order\Invoice::class
+        );
+        $this->eavConfig->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            FillQuoteAddressIdInSalesOrderAddress::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.9';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php
new file mode 100644
index 0000000000000..9e39976203631
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class UpdateEntityTypes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        SalesSetupFactory $salesSetupFactory,
+        \Magento\Eav\Model\Config $eavConfig
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->salesSetupFactory = $salesSetupFactory;
+        $this->eavConfig = $eavConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $salesSetup = $this->salesSetupFactory->create();
+        $salesSetup->updateEntityTypes();
+        $this->eavConfig->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InstallOrderStatusesAndInitialSalesConfig::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/SalesSetup.php b/app/code/Magento/Sales/Setup/SalesSetup.php
index ec8f7ce0f14d2..4be2b38b074e7 100644
--- a/app/code/Magento/Sales/Setup/SalesSetup.php
+++ b/app/code/Magento/Sales/Setup/SalesSetup.php
@@ -10,6 +10,7 @@
 use Magento\Eav\Setup\EavSetup;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
@@ -303,8 +304,6 @@ public function getEncryptor()
     }
 
     /**
-     * Get sales connection
-     *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      */
     public function getConnection()
diff --git a/app/code/Magento/Sales/Setup/UpgradeData.php b/app/code/Magento/Sales/Setup/UpgradeData.php
deleted file mode 100644
index 16455d616d853..0000000000000
--- a/app/code/Magento/Sales/Setup/UpgradeData.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Setup;
-
-use Magento\Eav\Model\Config;
-use Magento\Framework\App\State;
-use Magento\Framework\DB\AggregatedFieldDataConverter;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Sales\Model\OrderFactory;
-use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
-
-/**
- * Data upgrade script
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * Sales setup factory
-     *
-     * @var SalesSetupFactory
-     */
-    private $salesSetupFactory;
-
-    /**
-     * @var Config
-     */
-    private $eavConfig;
-
-    /**
-     * @var AggregatedFieldDataConverter
-     */
-    private $aggregatedFieldConverter;
-
-    /**
-     * @var AddressCollectionFactory
-     */
-    private $addressCollectionFactory;
-
-    /**
-     * @var OrderFactory
-     */
-    private $orderFactory;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var State
-     */
-    private $state;
-
-    /**
-     * @param SalesSetupFactory $salesSetupFactory
-     * @param Config $eavConfig
-     * @param AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @param AddressCollectionFactory $addressCollFactory
-     * @param OrderFactory $orderFactory
-     * @param QuoteFactory $quoteFactory
-     * @param State $state
-     */
-    public function __construct(
-        SalesSetupFactory $salesSetupFactory,
-        Config $eavConfig,
-        AggregatedFieldDataConverter $aggregatedFieldConverter,
-        AddressCollectionFactory $addressCollFactory,
-        OrderFactory $orderFactory,
-        QuoteFactory $quoteFactory,
-        State $state
-    ) {
-        $this->salesSetupFactory = $salesSetupFactory;
-        $this->eavConfig = $eavConfig;
-        $this->aggregatedFieldConverter = $aggregatedFieldConverter;
-        $this->addressCollectionFactory = $addressCollFactory;
-        $this->orderFactory = $orderFactory;
-        $this->quoteFactory = $quoteFactory;
-        $this->state = $state;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $salesSetup = $this->salesSetupFactory->create(['setup' => $setup]);
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $salesSetup->updateEntityTypes();
-        }
-        if (version_compare($context->getVersion(), '2.0.6', '<')) {
-            $this->convertSerializedDataToJson($context->getVersion(), $salesSetup);
-        }
-        if (version_compare($context->getVersion(), '2.0.8', '<')) {
-            $this->state->emulateAreaCode(
-                \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
-                [$this, 'fillQuoteAddressIdInSalesOrderAddress'],
-                [$setup]
-            );
-        }
-        if (version_compare($context->getVersion(), '2.0.9', '<')) {
-            //Correct wrong source model for "invoice" entity type, introduced by mistake in 2.0.1 upgrade.
-            $salesSetup->updateEntityType(
-                'invoice',
-                'entity_model',
-                \Magento\Sales\Model\ResourceModel\Order\Invoice::class
-            );
-        }
-        $this->eavConfig->clear();
-    }
-
-    /**
-     * Convert data from serialized to JSON encoded
-     *
-     * @param string $setupVersion
-     * @param SalesSetup $salesSetup
-     * @return void
-     */
-    private function convertSerializedDataToJson($setupVersion, SalesSetup $salesSetup)
-    {
-        $fieldsToUpdate = [
-            new FieldToConvert(
-                SerializedToJson::class,
-                $salesSetup->getTable('sales_invoice_item'),
-                'entity_id',
-                'tax_ratio'
-            ),
-            new FieldToConvert(
-                SerializedToJson::class,
-                $salesSetup->getTable('sales_creditmemo_item'),
-                'entity_id',
-                'tax_ratio'
-            ),
-        ];
-        if (version_compare($setupVersion, '2.0.5', '<')) {
-            $fieldsToUpdate[] = new FieldToConvert(
-                SerializedDataConverter::class,
-                $salesSetup->getTable('sales_order_item'),
-                'item_id',
-                'product_options'
-            );
-            $fieldsToUpdate[] = new FieldToConvert(
-                SerializedToJson::class,
-                $salesSetup->getTable('sales_shipment'),
-                'entity_id',
-                'packages'
-            );
-            $fieldsToUpdate[] = new FieldToConvert(
-                SalesOrderPaymentDataConverter::class,
-                $salesSetup->getTable('sales_order_payment'),
-                'entity_id',
-                'additional_information'
-            );
-            $fieldsToUpdate[] = new FieldToConvert(
-                SerializedToJson::class,
-                $salesSetup->getTable('sales_payment_transaction'),
-                'transaction_id',
-                'additional_information'
-            );
-        }
-        $this->aggregatedFieldConverter->convert($fieldsToUpdate, $salesSetup->getConnection());
-    }
-
-    /**
-     * Fill quote_address_id in table sales_order_address if it is empty.
-     */
-    public function fillQuoteAddressIdInSalesOrderAddress()
-    {
-        $addressCollection = $this->addressCollectionFactory->create();
-        /** @var \Magento\Sales\Model\Order\Address $orderAddress */
-        foreach ($addressCollection as $orderAddress) {
-            if (!$orderAddress->getData('quote_address_id')) {
-                $orderId = $orderAddress->getParentId();
-                $addressType = $orderAddress->getAddressType();
-
-                /** @var \Magento\Sales\Model\Order $order */
-                $order = $this->orderFactory->create()->load($orderId);
-                $quoteId = $order->getQuoteId();
-                $quote = $this->quoteFactory->create()->load($quoteId);
-
-                if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) {
-                    $quoteAddressId = $quote->getShippingAddress()->getId();
-                    $orderAddress->setData('quote_address_id', $quoteAddressId);
-                } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) {
-                    $quoteAddressId = $quote->getBillingAddress()->getId();
-                    $orderAddress->setData('quote_address_id', $quoteAddressId);
-                }
-
-                $orderAddress->save();
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
deleted file mode 100644
index 5dbf71e69e9b8..0000000000000
--- a/app/code/Magento/Sales/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private static $connectionName = 'sales';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $connection = $installer->getConnection(self::$connectionName);
-            //sales_bestsellers_aggregated_daily
-            $connection->dropForeignKey(
-                $installer->getTable('sales_bestsellers_aggregated_daily', self::$connectionName),
-                $installer->getFkName(
-                    'sales_bestsellers_aggregated_daily',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id',
-                    self::$connectionName
-                )
-            );
-            //sales_bestsellers_aggregated_monthly
-            $connection->dropForeignKey(
-                $installer->getTable('sales_bestsellers_aggregated_monthly', self::$connectionName),
-                $installer->getFkName(
-                    'sales_bestsellers_aggregated_monthly',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id',
-                    self::$connectionName
-                )
-            );
-
-            //sales_bestsellers_aggregated_yearly
-            $connection->dropForeignKey(
-                $installer->getTable('sales_bestsellers_aggregated_yearly', self::$connectionName),
-                $installer->getFkName(
-                    'sales_bestsellers_aggregated_yearly',
-                    'product_id',
-                    'catalog_product_entity',
-                    'entity_id',
-                    self::$connectionName
-                )
-            );
-
-            $installer->endSetup();
-        }
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $this->addColumnBaseGrandTotal($installer);
-            $this->addIndexBaseGrandTotal($installer);
-        }
-        if (version_compare($context->getVersion(), '2.0.4', '<')) {
-            $tables = [
-                'sales_invoice_grid',
-                'sales_order',
-                'sales_shipment_grid',
-            ];
-            foreach ($tables as $table) {
-                $salesConnection = $setup->getConnection(self::$connectionName);
-                $salesConnection->modifyColumn(
-                    $installer->getTable($table, self::$connectionName),
-                    'customer_group_id',
-                    ['type' => 'integer']
-                );
-            }
-        }
-        if (version_compare($context->getVersion(), '2.0.5', '<')) {
-            $connection = $installer->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $installer->getTable('sales_order_payment', self::$connectionName),
-                'cc_number_enc',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 128
-                ]
-            );
-        }
-        if (version_compare($context->getVersion(), '2.0.7', '<')) {
-            $connection = $installer->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $installer->getTable('sales_order', self::$connectionName),
-                'shipping_method',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 120
-                ]
-            );
-        }
-    }
-
-    /**
-     * @param SchemaSetupInterface $installer
-     * @return void
-     */
-    private function addColumnBaseGrandTotal(SchemaSetupInterface $installer)
-    {
-        $connection = $installer->getConnection(self::$connectionName);
-        $connection->addColumn(
-            $installer->getTable('sales_invoice_grid', self::$connectionName),
-            'base_grand_total',
-            [
-                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-                'nullable' => true,
-                'length' => '12,4',
-                'comment' => 'Base Grand Total',
-                'after' => 'grand_total'
-            ]
-        );
-    }
-
-    /**
-     * @param SchemaSetupInterface $installer
-     * @return void
-     */
-    private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
-    {
-        $connection = $installer->getConnection(self::$connectionName);
-        $connection->addIndex(
-            $installer->getTable('sales_invoice_grid', self::$connectionName),
-            $installer->getIdxName('sales_invoice_grid', ['base_grand_total'], '', self::$connectionName),
-            ['base_grand_total']
-        );
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
new file mode 100644
index 0000000000000..58c7752626c8a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Check customer information is correct in credit memo-->
+    <actionGroup name="verifyBasicCreditMemoInformation">
+        <arguments>
+            <argument name="customer" defaultValue=""/>
+            <argument name="shippingAddress" defaultValue=""/>
+            <argument name="billingAddress" defaultValue=""/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminCreditMemoOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <actionGroup name="seeProductInItemsRefunded">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminCreditMemoItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
new file mode 100644
index 0000000000000..c814a886a2b33
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Check customer information is correct in invoice-->
+    <actionGroup name="verifyBasicInvoiceInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="shippingAddress"/>
+            <argument name="billingAddress"/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminInvoiceOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <!--Check that product is in invoice items-->
+    <actionGroup name="seeProductInInvoiceItems">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminInvoiceItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
+    </actionGroup>
+
+    <!--Admin Fast Create Invoice-->
+    <actionGroup name="adminFastCreateInvoice">
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
+        <waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForSuccessMessageLoad"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
+        <click selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="openInvoicePage"/>
+        <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
+    </actionGroup>
+
+    <actionGroup name="goToInvoiceIntoOrder">
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeOrderInvoiceUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
+    </actionGroup>
+
+    <actionGroup name="submitInvoiceIntoOrder">
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
new file mode 100644
index 0000000000000..2bb8b34aa01c8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Navigate to create order page (New Order -> Create New Customer)-->
+    <actionGroup name="navigateToNewOrderPageNewCustomer">
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectDefaultStoreView"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+    </actionGroup>
+
+    <!--Navigate to create order page (New Order -> Create New Customer)-->
+    <actionGroup name="navigateToNewOrderPageNewCustomerSingleStore">
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+    </actionGroup>
+
+    <!--Navigate to create order page (New Order -> Select Customer)-->
+    <actionGroup name="navigateToNewOrderPageExistingCustomer">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <waitForPageLoad stepKey="waitForCustomerGridLoad"/>
+        <!--Clear grid filters-->
+        <conditionalClick selector="{{AdminOrderCustomersGridSection.resetButton}}" dependentSelector="{{AdminOrderCustomersGridSection.resetButton}}" visible="true" stepKey="clearExistingCustomerFilters"/>
+        <fillField userInput="{{customer.email}}" selector="{{AdminOrderCustomersGridSection.emailInput}}" stepKey="filterEmail"/>
+        <click selector="{{AdminOrderCustomersGridSection.apply}}" stepKey="applyFilter"/>
+        <waitForPageLoad stepKey="waitForFilteredCustomerGridLoad"/>
+        <click selector="{{AdminOrderCustomersGridSection.firstRow}}" stepKey="clickOnCustomer"/>
+        <waitForPageLoad stepKey="waitForCreateOrderPageLoad" />
+        <!-- Select store view if appears -->
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
+        <waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect" />
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+    </actionGroup>
+
+    <!--Check the required fields are actually required-->
+    <actionGroup name="checkRequiredFieldsNewOrderForm">
+        <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
+        <seeElement selector="{{AdminOrderFormAccountSection.requiredEmail}}" stepKey="seeEmailRequired"/>
+        <clearField selector="{{AdminOrderFormAccountSection.email}}" stepKey="clearEmailField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.FirstName}}" stepKey="clearFirstNameField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.LastName}}" stepKey="clearLastNameField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" stepKey="clearStreetField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.City}}" stepKey="clearCityField"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.Country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.State}}" userInput="Please select" stepKey="selectNoState"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.PostalCode}}" stepKey="clearPostalCodeField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.Phone}}" stepKey="clearPhoneField"/>
+        <seeElement selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="seeShippingMethodNotSelected"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.emailError}}" userInput="This is a required field." stepKey="seeThatEmailIsRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}" userInput="This is a required field." stepKey="seeFirstNameRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.lastNameError}}" userInput="This is a required field." stepKey="seeLastNameRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.streetAddressError}}" userInput="This is a required field." stepKey="seeStreetRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.cityError}}" userInput="This is a required field." stepKey="seeCityRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.stateError}}" userInput="This is a required field." stepKey="seeStateRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.postalCodeError}}" userInput="This is a required field." stepKey="seePostalCodeRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.phoneError}}" userInput="This is a required field." stepKey="seePhoneRequired"/>
+        <see selector="{{AdminOrderFormPaymentSection.shippingError}}" userInput="This is a required field." stepKey="seeShippingMethodRequired"/>
+    </actionGroup>
+
+    <!--Add a simple product to order-->
+    <actionGroup name="addSimpleProductToOrder">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilter"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
+        <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="1" stepKey="fillProductQty"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+        <wait time="5" stepKey="waitForOptionsToLoad"/>
+    </actionGroup>
+
+    <!--Add configurable product to order -->
+    <actionGroup name="addConfigurableProductToOrder">
+        <arguments>
+            <argument name="product"/>
+            <argument name="attribute"/>
+            <argument name="option"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterConfigurable"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchConfigurable"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectConfigurableProduct"/>
+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_label)}}" stepKey="waitForConfigurablePopover"/>
+        <wait time="2" stepKey="waitForOptionsToLoad"/>
+        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_label)}}"
+                      userInput="{{option.name}}" stepKey="selectionConfigurableOption"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkConfigurablePopover"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+
+    <!--Add configurable product to order -->
+    <actionGroup name="addConfigurableProductToOrderFromAdmin" extends="addConfigurableProductToOrder">
+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" stepKey="waitForConfigurablePopover"/>
+        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}"
+                      userInput="{{option.label}}" stepKey="selectionConfigurableOption"/>
+    </actionGroup>
+
+    <actionGroup name="configureOrderedConfigurableProduct">
+        <arguments>
+            <argument name="attribute"/>
+            <argument name="option"/>
+            <argument name="quantity" type="string"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" stepKey="waitForConfigurablePopover"/>
+        <wait time="2" stepKey="waitForOptionsToLoad"/>
+        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}"
+                      userInput="{{option.label}}" stepKey="selectionConfigurableOption"/>
+        <fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkConfigurablePopover"/>
+    </actionGroup>
+
+    <!--Add bundle product to order -->
+    <actionGroup name="addBundleProductToOrder">
+        <arguments>
+            <argument name="product"/>
+            <argument name="quantity" type="string" defaultValue="1"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterBundle"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchBundle"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectBundleProduct"/>
+        <waitForElementVisible selector="{{AdminOrderFormBundleProductSection.quantity}}" stepKey="waitForBundleOptionLoad"/>
+        <wait time="2" stepKey="waitForOptionsToLoad"/>
+        <fillField selector="{{AdminOrderFormBundleProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+
+    <!--Add bundle product to order and check product price in the grid-->
+    <actionGroup name="addBundleProductToOrderAndCheckPriceInGrid" extends="addBundleProductToOrder">
+        <arguments>
+            <argument name="price" type="string"/>
+        </arguments>
+        <grabTextFrom selector="{{AdminOrderFormItemsSection.rowPrice('1')}}" stepKey="grabProductPriceFromGrid" after="clickOk"/>
+        <assertEquals stepKey="assertProductPriceInGrid" message="Bundle product price in grid should be equal {{price}}" after="grabProductPriceFromGrid">
+            <expectedResult type="string">{{price}}</expectedResult>
+            <actualResult type="variable">grabProductPriceFromGrid</actualResult>
+        </assertEquals>
+    </actionGroup>
+
+    <!--Add downloadable product to order -->
+    <actionGroup name="addDownloadableProductToOrder">
+        <arguments>
+            <argument name="product"/>
+            <argument name="link"/>
+            <argument name="quantity" defaultValue="1" type="string"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterDownloadable"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchDownloadable"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectDownloadableProduct"/>
+        <waitForElementVisible selector="{{AdminOrderFormDownloadableProductSection.optionSelect(link.title)}}" stepKey="waitForLinkLoad"/>
+        <click selector="{{AdminOrderFormDownloadableProductSection.optionSelect(link.title)}}" stepKey="selectLink"/>
+        <fillField selector="{{AdminOrderFormDownloadableProductSection.quantity}}" userInput="{{quantity}}" stepKey="setQuantity"/>
+        <click selector="{{AdminOrderFormDownloadableProductSection.ok}}" stepKey="confirmConfiguration"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+
+    <!--Add grouped product option to order -->
+    <actionGroup name="addGroupedProductOptionToOrder">
+        <arguments>
+            <argument name="product"/>
+            <argument name="option"/>
+            <argument name="quantity" type="string" defaultValue="1"/>
+        </arguments>
+
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterGrouped"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchGrouped"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectGroupedProduct"/>
+        <waitForElementVisible selector="{{AdminOrderFormGroupedProductSection.optionQty(option.sku)}}" stepKey="waitForGroupedOptionLoad"/>
+        <wait time="2" stepKey="waitForOptionsToLoad"/>
+        <fillField selector="{{AdminOrderFormGroupedProductSection.optionQty(option.sku)}}" userInput="{{quantity}}" stepKey="fillOptionQuantity"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+
+    <!--Fill customer billing address-->
+    <actionGroup name="fillOrderCustomerInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="address"/>
+        </arguments>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.FirstName}}" userInput="{{customer.firstname}}" stepKey="fillFirstName"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.LastName}}" userInput="{{customer.lastname}}" stepKey="fillLastName"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" userInput="{{address.street[0]}}" stepKey="fillStreetLine1"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.City}}" userInput="{{address.city}}" stepKey="fillCity"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.Country}}" userInput="{{address.country_id}}" stepKey="fillCountry"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.State}}" userInput="{{address.state}}" stepKey="fillState"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.PostalCode}}" userInput="{{address.postcode}}" stepKey="fillPostalCode"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.Phone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
+    </actionGroup>
+
+    <!--Select flat rate shipping method-->
+    <actionGroup name="orderSelectFlatRateShipping">
+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShippingMethods"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.flatRateOption}}" stepKey="waitForShippingOptions"/>
+        <selectOption selector="{{AdminOrderFormPaymentSection.flatRateOption}}" userInput="flatrate_flatrate" stepKey="checkFlatRate"/>
+    </actionGroup>
+
+    <!--Select free shipping method-->
+    <actionGroup name="orderSelectFreeShipping">
+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShippingMethods"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="waitForShippingOptions"/>
+        <selectOption selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" userInput="freeshipping_freeshipping" stepKey="checkFreeShipping"/>
+    </actionGroup>
+
+    <!--Check that customer information is correct in order-->
+    <actionGroup name="verifyBasicOrderInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="shippingAddress"/>
+            <argument name="billingAddress"/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminOrderDetailsInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminOrderDetailsInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminOrderDetailsInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <!--Verify order information-->
+    <actionGroup name="verifyCreatedOrderInformation">
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus" after="seeSuccessMessage"/>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId" after="seeOrderPendingStatus"/>
+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
+    </actionGroup>
+
+    <!--Check for product in order items list-->
+    <actionGroup name="seeProductInItemsOrdered">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" userInput="{{product.sku}}" stepKey="seeSkuInItemsOrdered"/>
+    </actionGroup>
+
+    <actionGroup name="CreateOrderInStoreActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="customer"/>
+            <argument name="storeView"/>
+        </arguments>
+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
+        <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForPageLoad stepKey="waitForStoreToAppear"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
+    </actionGroup>
+
+    <actionGroup name="CreateOrderInStoreChoosingPaymentMethodActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="customer"/>
+            <argument name="storeView"/>
+        </arguments>
+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
+        <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
+    </actionGroup>
+
+    <!--Cancel order that is in pending status-->
+    <actionGroup name="cancelPendingOrder">
+        <click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
+        <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
+    </actionGroup>
+
+    <!--Select Check Money payment method-->
+    <actionGroup name="SelectCheckMoneyPaymentMethod">
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
new file mode 100644
index 0000000000000..eed9f80c251c8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Filter order grid by order id field-->
+    <actionGroup name="filterOrderGridById">
+        <arguments>
+            <argument name="orderId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
+        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+    </actionGroup>
+
+    <!--Filter order grid by the billing name field-->
+    <actionGroup name="filterOrderGridByBillingName">
+        <arguments>
+            <argument name="customer"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('billing_name')}}" userInput="{{customer.fullname}}" stepKey="fillBillToNameFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+    </actionGroup>
+
+    <!--Filter order grid by order total range-->
+    <actionGroup name="filterOrderGridByBaseTotalRange">
+        <arguments>
+            <argument name="from"/>
+            <argument name="to"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('base_grand_total[from]')}}" userInput="{{from}}" stepKey="fillOrderTotalFrom"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('base_grand_total[to]')}}" userInput="{{to}}" stepKey="fillOrderTotalTo"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+    
+    <actionGroup name="filterOrderGridByPurchaseDate">
+        <arguments>
+            <argument name="from"/>
+            <argument name="to"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[from]')}}" userInput="{{from}}" stepKey="fillOrderPurchaseDateFrom"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[to]')}}" userInput="{{to}}" stepKey="fillOrderPurchaseDateTo"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+
+    <actionGroup name="filterOrderGridByStatus">
+        <arguments>
+            <argument name="status"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <selectOption selector="{{AdminDataGridHeaderSection.filterFieldSelect('status')}}" userInput="{{status}}" stepKey="fillOrderStatusFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+
+    <actionGroup name="AdminOrdersGridClearFiltersActionGroup">
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
new file mode 100644
index 0000000000000..e48e7bb3f0b1e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateOrderToPrintPageActionGroup">
+        <arguments>
+            <argument name="Category"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
+        <click selector="{{StorefrontCustomerOrderViewSection.printOrderLink}}" stepKey="clickPrintOrderLink"/>
+    </actionGroup>
+    <actionGroup name="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" extends="CreateOrderToPrintPageActionGroup">
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="clickNext" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="waitForPlaceOrderButton" stepKey="clickCheckMoneyOrderPayment"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
new file mode 100644
index 0000000000000..c46dd612022fd
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Fill order information fields and click continue-->
+    <actionGroup name="StorefrontFillOrderInformationActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="orderLastName"/>
+            <argument name="orderEmail"/>
+        </arguments>
+        <amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="navigateToOrderAndReturnPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
+        <click selector="{{StorefrontOrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
+        <waitForPageLoad stepKey="waitForOrderInformationPageLoad"/>
+        <seeInCurrentUrl url="{{StorefrontOrderInformationPage.url}}" stepKey="seeOrderInformationUrl"/>
+    </actionGroup>
+
+    <!--Enter quantity to return and submit-->
+    <actionGroup name="StorefrontFillQuantityToReturnActionGroup">
+        <click selector="{{StorefrontOrderInformationMainSection.return}}" stepKey="gotToCreateNewReturnPage"/>
+        <waitForPageLoad stepKey="waitForReturnPageLoad"/>
+        <fillField selector="{{StorefrontCreateNewReturnMainSection.quantityToReturn}}" userInput="1" stepKey="fillQuantityToReturn"/>
+        <click selector="{{StorefrontCreateNewReturnMainSection.submit}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
new file mode 100644
index 0000000000000..920618a70dfb8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ShippingAddressTX" type="shipping_address">
+        <data key="firstname">Joe</data>
+        <data key="lastname">Buyer</data>
+        <data key="fullname">Joe Buyer</data>
+        <array key="street">
+            <item>11501 Domain Dr</item>
+            <item>#150</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">1</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78758</data>
+        <data key="email" unique="prefix">joe.buyer@email.com</data>
+        <data key="telephone">512-345-6789</data>
+    </entity>
+    <entity name="BillingAddressTX" type="billing_address">
+        <data key="firstname">Joe</data>
+        <data key="lastname">Buyer</data>
+        <data key="fullname">Joe Buyer</data>
+        <array key="street">
+            <item>11501 Domain Dr</item>
+            <item>#150</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">1</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78758</data>
+        <data key="email" unique="prefix">joe.buyer@email.com</data>
+        <data key="telephone">512-345-6789</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
new file mode 100644
index 0000000000000..10de6681d1b57
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Const" type="constant">
+        <data key="one">1</data>
+        <data key="two">2</data>
+        <data key="fifty">50</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
new file mode 100644
index 0000000000000..eb5600f112ea1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!--Data for order created through UI with simple and configurable order-->
+    <entity name="AdminOrderSimpleConfigurableProduct" type="order">
+        <data key="subtotal">246.00</data>
+        <data key="shipping">10.00</data>
+        <data key="grandTotal">256.00</data>
+    </entity>
+    <entity name="AdminOrderSimpleProduct" type="order">
+        <data key="subtotal">123.00</data>
+        <data key="shipping">5.00</data>
+        <data key="grandTotal">128.00</data>
+    </entity>
+    <entity name="OrderGrandTotalFilterRange" type="filter">
+        <data key="from">200</data>
+        <data key="to">400</data>
+    </entity>
+
+    <entity name="OrderStatus" type="status">
+        <data key="canceled">Canceled</data>
+        <data key="closed">Closed</data>
+        <data key="complete">Complete</data>
+        <data key="suspected">Suspected</data>
+        <data key="onHold">On Hold</data>
+        <data key="paymentReview">Payment Review</data>
+        <data key="pending">Pending</data>
+        <data key="pendingPayment">Pending Payment</data>
+        <data key="processing">Processing</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
new file mode 100644
index 0000000000000..3239e17403255
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnabledMinimumOrderAmount500" type="sales_minimum_order">
+        <requiredEntity type="active">EnableMinimumOrderCheck</requiredEntity>
+        <requiredEntity type="amount">MinimumOrderAmount500</requiredEntity>
+    </entity>
+    <entity name="EnableMinimumOrderCheck" type="active">
+        <data key="value">1</data>
+    </entity>
+    <entity name="MinimumOrderAmount500" type="amount">
+        <data key="value">500</data>
+    </entity>
+
+    <entity name="DisabledMinimumOrderAmount" type="sales_minimum_order">
+        <requiredEntity type="active">DisableMinimumOrderCheck</requiredEntity>
+    </entity>
+    <entity name="DisableMinimumOrderCheck" type="active">
+        <data key="value">0</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
new file mode 100644
index 0000000000000..76ff20813483e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableRMA" type="sales_rma_config">
+        <requiredEntity type="enabled">EnableRMAStorefront</requiredEntity>
+    </entity>
+    <entity name="EnableRMAStorefront" type="enabled">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DisableRMA" type="sales_rma_config">
+        <requiredEntity type="enabled">DisableRMAStorefront</requiredEntity>
+    </entity>
+    <entity name="DisableRMAStorefront" type="enabled">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE.txt b/app/code/Magento/Sales/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE.txt
rename to app/code/Magento/Sales/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE_AFL.txt b/app/code/Magento/Sales/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE_AFL.txt
rename to app/code/Magento/Sales/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
new file mode 100644
index 0000000000000..2bd084b5457b8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SetSalesMinimumOrder" dataType="sales_minimum_order" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
+        <object key="groups" dataType="sales_minimum_order">
+            <object key="minimum_order" dataType="sales_minimum_order">
+                <object key="fields" dataType="sales_minimum_order">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="amount" dataType="amount">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
new file mode 100644
index 0000000000000..86226265dd146
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SalesRMAConfig" dataType="sales_rma_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
+        <object key="groups" dataType="sales_rma_config">
+            <object key="rma" dataType="sales_rma_config">
+                <object key="fields" dataType="sales_rma_config">
+                    <object key="enabled" dataType="enabled">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
new file mode 100644
index 0000000000000..2d020caa0d107
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCreditMemoNewPage" url="sales/order_creditmemo/new/order_id/" area="admin" module="Magento_Sales">
+        <section name="AdminCreditMemoOrderInformationSection"/>
+        <section name="AdminCreditMemoAddressInformationSection"/>
+        <section name="AdminCreditMemoPaymentShippingSection"/>
+        <section name="AdminCreditMemoItemsSection"/>
+        <section name="AdminCreditMemoTotalSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
new file mode 100644
index 0000000000000..bf48bc6763348
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminInvoiceDetailsPage" url="sales/invoice/view/invoice_id/" area="admin" module="Magento_Sales">
+        <section name="AdminInvoiceDetailsInformationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
new file mode 100644
index 0000000000000..d547c9f1eb05f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminInvoiceNewPage" url="sales/order_invoice/new/order_id/" area="admin" module="Magento_Sales">
+        <section name="AdminInvoiceMainActionsSection"/>
+        <section name="AdminInvoiceOrderInformationSection"/>
+        <section name="AdminInvoiceAddressInformationSection"/>
+        <section name="AdminInvoicePaymentShippingSection"/>
+        <section name="AdminInvoiceItemsSection"/>
+        <section name="AdminInvoiceTotalSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
new file mode 100644
index 0000000000000..3dda74adb9c0f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminInvoicesPage" url="sales/invoice/" area="admin" module="Magento_Sales">
+        <section name="AdminInvoicesGridSection"/>
+        <section name="AdminInvoicesFiltersSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
new file mode 100644
index 0000000000000..c8ec12203c676
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderCreatePage" url="sales/order_create/index" area="admin" module="Magento_Sales">
+        <section name="AdminOrderFormActionSection"/>
+        <section name="AdminOrderFormItemsSection"/>
+        <section name="AdminOrderFormConfigureProductSection"/>
+        <section name="AdminOrderFormAccountSection"/>
+        <section name="AdminOrderFormBillingAddressSection"/>
+        <section name="AdminOrderFormShippingAddressSection"/>
+        <section name="AdminOrderFormPaymentSection"/>
+        <section name="AdminOrderFormTotalSection"/>
+        <section name="AdminOrderFormStoreSelectorSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
new file mode 100644
index 0000000000000..c62144b84aa63
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderDetailsPage" url="sales/order/view/order_id/" area="admin" module="Magento_Sales">
+        <section name="AdminOrderDetailsMainActionsSection"/>
+        <section name="AdminOrderDetailsOrderViewSection"/>
+        <section name="AdminOrderDetailsInformationSection"/>
+        <section name="AdminOrderAddressInformationSection"/>
+        <section name="AdminOrderPaymentInformationSection"/>
+        <section name="AdminOrderShippingInformationSection"/>
+        <section name="AdminOrderItemsOrderedSection"/>
+        <section name="AdminOrderDetailsMessagesSection"/>
+        <section name="AdminOrderInvoicesTabSection"/>
+        <section name="AdminOrderCreditMemosTabSection"/>
+        <section name="AdminOrderShipmentsTabSection"/>
+        <section name="AdminOrderCommentsTabSection"/>
+        <section name="AdminOrderTotalSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
new file mode 100644
index 0000000000000..7a9414e3f9aab
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrdersPage" url="sales/order/" area="admin" module="Magento_Sales">
+        <section name="AdminOrdersGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
new file mode 100644
index 0000000000000..2a14f814eac16
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCreateNewReturnPage" url="rma/guest/create/order_id/" area="guest" module="Magento_Sales">
+        <section name="StorefrontCreateNewReturnMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml
new file mode 100644
index 0000000000000..4e89e5476c3bc
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerSignOutPage" url="/customer/account/logout/" area="storefront" module="Magento_Customer"/>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml
new file mode 100644
index 0000000000000..d2a4f4f0459c2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontGuestOrderSearchPage" url="sales/guest/form/" module="Magento_Sales" area="storefront">
+        <section name="StorefrontGuestOrderSearchSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml
new file mode 100644
index 0000000000000..69c7fa76129ea
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontGuestOrderViewPage" url="sales/guest/view/" module="Magento_Sales" area="storefront">
+        <section name="StorefrontGuestOrderViewSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
new file mode 100644
index 0000000000000..4159f9435c866
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontOrderInformationPage" url="sales/guest/view" area="guest" module="Magento_Sales">
+        <section name="StorefrontOrderInformationMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
new file mode 100644
index 0000000000000..32d94c3175807
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontOrdersAndReturnsPage" url="sales/guest/form" area="guest" module="Magento_Sales">
+        <section name="OrderAndReturnsMainSection"/>
+        <section name="OrderInformationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontSalesOrderPrintPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontSalesOrderPrintPage.xml
new file mode 100644
index 0000000000000..874e6889ec58c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontSalesOrderPrintPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="StorefrontSalesOrderPrintPage" url="/sales/order/print/order_id/{{var1}}/" parameterized="true"
+          area="storefront" module="Magento_Sales">
+        <section name="SalesOrderPrintSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/README.md b/app/code/Magento/Sales/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8a515e2b6233b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Functional Tests
+
+The Functional Test Module for **Magento Sales** module.
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
new file mode 100644
index 0000000000000..178cd37e6b8d5
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreditMemoAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
new file mode 100644
index 0000000000000..13f351c064437
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreditMemoItemsSection">
+        <element name="header" type="text" selector="#creditmemo_item_container span.title"/>
+        <element name="itemName" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
+        <element name="itemSku" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
+        <element name="itemPrice" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-ordered-qty .qty-table" parameterized="true"/>
+        <element name="itemReturnToStock" type="checkbox" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-return-to-stock input" parameterized="true"/>
+        <element name="itemQtyToRefund" type="input" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-refund .qty-input" parameterized="true"/>
+        <element name="itemSubtotal" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>
+        <element name="itemTaxAmount" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-tax-amount .price" parameterized="true"/>
+        <element name="itemDiscountAmount" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-discont .price" parameterized="true"/>
+        <element name="itemTotal" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
+        <element name="updateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button']" timeout="30"/>
+        <element name="nameColumn" type="text" selector=".order-creditmemo-tables .product-title"/>
+        <element name="skuColumn" type="text" selector=".order-creditmemo-tables .product-sku-block"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
new file mode 100644
index 0000000000000..5b7f829626587
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreditMemoOrderInformationSection">
+        <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="60"/>
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
new file mode 100644
index 0000000000000..1bfe28b9f045d
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreditMemoPaymentShippingSection">
+        <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="PaymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+        <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
+        <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
+        <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
new file mode 100644
index 0000000000000..84fcc8fc47dfb
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreditMemoTotalSection">
+        <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td//span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="refundShipping" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[shipping_amount]']"/>
+        <element name="adjustmentRefund" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_positive]'"/>
+        <element name="adjustmentFee" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_negative]']"/>
+        <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
+        <element name="appendComments" type="checkbox" selector=".order-totals-actions #notify_customer"/>
+        <element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
+        <element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
+        <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
+        <element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
+        <element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
new file mode 100644
index 0000000000000..14a0d4b8488ea
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
new file mode 100644
index 0000000000000..39071a9eb5899
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceDetailsInformationSection">
+        <element name="orderStatus" type="text" selector="#order_status"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
new file mode 100644
index 0000000000000..bc0d1cffd5d3e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceItemsSection">
+        <element name="itemName" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-title" parameterized="true"/>
+        <element name="itemSku" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-sku-block" parameterized="true"/>
+        <element name="itemPrice" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-qty .qty-table" parameterized="true"/>
+        <element name="itemQtyToInvoice" type="input" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-qty-invoice .qty-input" parameterized="true"/>
+        <element name="itemSubtotal" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>
+        <element name="itemTaxAmount" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-tax .price" parameterized="true"/>
+        <element name="itemDiscountAmount" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-discount .price" parameterized="true"/>
+        <element name="itemTotal" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
+        <element name="nameColumn" type="text" selector=".order-invoice-tables .product-title"/>
+        <element name="skuColumn" type="text" selector=".order-invoice-tables .product-sku-block"/>
+        <element name="priceColumn" type="text" selector=".order-invoice-tables .col-price .price"/>
+        <element name="qtyColumn" type="text" selector=".order-invoice-tables .col-qty .qty-table"/>
+        <element name="qtyToInvoiceColumn" type="input" selector=".order-invoice-tables .col-qty-invoice .qty-input"/>
+        <element name="subtotalColumn" type="text" selector=".order-invoice-tables .col-subtotal .price"/>
+        <element name="taxAmountColumn" type="text" selector=".order-invoice-tables .col-tax .price"/>
+        <element name="discountAmountColumn" type="text" selector=".order-invoice-tables .col-discount .price"/>
+        <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
+        <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
new file mode 100644
index 0000000000000..bc7fc8145af33
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceMainActionsSection">
+        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
+        <element name="openNewCreditMemoFromInvoice" type="button" selector=".action-default.scalable.credit-memo"/>
+        <element name="submitNewRefundFromInvoice" type="button" selector=".action-default.scalable.save.submit-button refund primary"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
new file mode 100644
index 0000000000000..38ca7e683fe56
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceOrderInformationSection">
+        <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
new file mode 100644
index 0000000000000..8d7c64733972e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoicePaymentShippingSection">
+        <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="PaymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+        <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
+        <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
+        <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
+        <element name="getShippingMethodAndRates" type="button" selector="//span[text()='Get shipping methods and rates']"/>
+        <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
new file mode 100644
index 0000000000000..f66412c876709
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceTotalSection">
+        <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
new file mode 100644
index 0000000000000..78b9c853ff6a2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoicesFiltersSection">
+        <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
new file mode 100644
index 0000000000000..b8cc79a84db1a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoicesGridSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="filter" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
new file mode 100644
index 0000000000000..2632d5f2815e7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
new file mode 100644
index 0000000000000..19f447117959a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderCommentsTabSection">
+        <element name="orderNotesList" type="text" selector="#Order_History .edit-order-comments .note-list"/>
+        <element name="orderComments" type="text" selector="#Order_History .edit-order-comments-block"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
new file mode 100644
index 0000000000000..e285f8700a1a7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderCreditMemosTabSection">
+        <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_creditmemo']"/>
+        <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_creditmemo/view']" parameterized="true"/>
+        <element name="gridRowCell" type="text" selector="//div[@id='sales_order_view_tabs_order_creditmemos_content']//tr[{{row}}]//td[count(//div[@id='sales_order_view_tabs_order_creditmemos_content']//tr//th[contains(., '{{column}}')][1]/preceding-sibling::th) +1 ]" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml
new file mode 100644
index 0000000000000..39318a093dde3
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderCustomersGridSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="apply" type="button" selector=".action-secondary[title='Search']"/>
+        <element name="resetFilter" type="button" selector=".action-tertiary[title='Reset Filter']"/>
+        <element name="emailInput" type="input" selector="#sales_order_create_customer_grid_filter_email"/>
+        <element name="firstRow" type="button" selector="tr:nth-of-type(1)[data-role='row']"/>
+        <element name="resetButton" type="button" selector="#sales_order_create_customer_grid [data-action='grid-filter-reset']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
new file mode 100644
index 0000000000000..a531f423d134c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderDetailsInformationSection">
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="accountInformation" type="text" selector=".order-account-information-table"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+        <element name="billingAddress" type="text" selector=".order-billing-address"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address"/>
+        <element name="itemsOrdered" type="text" selector=".edit-order-table"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
new file mode 100644
index 0000000000000..bcf8bdcae7c59
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderDetailsInvoicesSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="content" type="text" selector="#sales_order_view_tabs_order_invoices_content"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
new file mode 100644
index 0000000000000..578022217f358
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderDetailsMainActionsSection">
+        <element name="back" type="button" selector="#back" timeout="30"/>
+        <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
+        <element name="sendEmail" type="button" selector="#send_notification" timeout="30"/>
+        <element name="creditMemo" type="button" selector="#order_creditmemo" timeout="30"/>
+        <element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>
+        <element name="invoice" type="button" selector="#order_invoice" timeout="30"/>
+        <element name="ship" type="button" selector="#order_ship" timeout="30"/>
+        <element name="reorder" type="button" selector="#order_reorder" timeout="30"/>
+        <element name="edit" type="button" selector="#order_edit" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
new file mode 100644
index 0000000000000..1bc3718467102
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderDetailsMessagesSection">
+        <element name="successMessage" type="text" selector="div.message-success"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
new file mode 100644
index 0000000000000..7f98256fa732a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderDetailsOrderViewSection">
+        <element name="information" type="button" selector="#sales_order_view_tabs_order_info"/>
+        <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
+        <element name="creditMemos" type="button" selector="#sales_order_view_tabs_order_creditmemos"/>
+        <element name="shipments" type="button" selector="#sales_order_view_tabs_order_shipments"/>
+        <element name="commentsHistory" type="button" selector="#sales_order_view_tabs_order_history"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
new file mode 100644
index 0000000000000..11d973d1e19de
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormAccountSection">
+        <element name="group" type="select" selector="#group_id"/>
+        <element name="email" type="input" selector="#email"/>
+        <element name="requiredGroup" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-group-id']"/>
+        <element name="requiredEmail" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-email']"/>
+        <element name="defaultGeneral" type="text" selector="//*[contains(text(),'General')]" time="15"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
new file mode 100644
index 0000000000000..2f6149dfa1cb7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormActionSection">
+        <element name="SubmitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
+        <element name="Cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
+        <element name="CreateNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
new file mode 100644
index 0000000000000..2d1a4d5a4cbae
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormBillingAddressSection">
+        <element name="NamePrefix" type="input" selector="#order-billing_address_prefix" timeout="30"/>
+        <element name="FirstName" type="input" selector="#order-billing_address_firstname" timeout="30"/>
+        <element name="MiddleName" type="input" selector="#order-billing_address_middlename" timeout="30"/>
+        <element name="LastName" type="input" selector="#order-billing_address_lastname" timeout="30"/>
+        <element name="NameSuffix" type="input" selector="#order-billing_address_suffix" timeout="30"/>
+        <element name="Company" type="input" selector="#order-billing_address_company" timeout="30"/>
+        <element name="StreetLine1" type="input" selector="#order-billing_address_street0" timeout="30"/>
+        <element name="StreetLine2" type="input" selector="#order-billing_address_street1" timeout="30"/>
+        <element name="City" type="input" selector="#order-billing_address_city" timeout="30"/>
+        <element name="Country" type="select" selector="#order-billing_address_country_id" timeout="30"/>
+        <element name="State" type="select" selector="#order-billing_address_region_id" timeout="30"/>
+        <element name="Province" type="input" selector="#order-billing_address_region" timeout="30"/>
+        <element name="PostalCode" type="input" selector="#order-billing_address_postcode" timeout="30"/>
+        <element name="Phone" type="input" selector="#order-billing_address_telephone" timeout="30"/>
+        <element name="Fax" type="input" selector="#order-billing_address_fax" timeout="30"/>
+        <element name="VatNumber" type="input" selector="#order-billing_address_vat_id" timeout="30"/>
+        <element name="ValidateVatNumber" type="button" selector="#order-billing_address_vat_id + .actions>button.action-default" timeout="30"/>
+        <element name="SaveAddress" type="checkbox" selector="#order-billing_address_save_in_address_book"/>
+
+        <element name="emailError" type="text" selector="#email-error"/>
+        <element name="firstNameError" type="text" selector="#order-billing_address_firstname-error"/>
+        <element name="lastNameError" type="text" selector="#order-billing_address_lastname-error"/>
+        <element name="streetAddressError" type="text" selector="#order-billing_address_street0-error"/>
+        <element name="cityError" type="text" selector="#order-billing_address_city-error"/>
+        <element name="countryError" type="text" selector="#order-billing_address_country_id-error"/>
+        <element name="stateError" type="text" selector="#order-billing_address_region_id-error"/>
+        <element name="postalCodeError" type="text" selector="#order-billing_address_postcode-error"/>
+        <element name="phoneError" type="text" selector="#order-billing_address_telephone-error"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
new file mode 100644
index 0000000000000..562d17f2e8739
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormBundleProductSection">
+        <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
+        <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
new file mode 100644
index 0000000000000..83d417f6f8555
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormConfigureProductSection">
+        <element name="optionSelect" type="select" selector="//div[@class='product-options']/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
+        <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
+        <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml
new file mode 100644
index 0000000000000..94cb0c57d4ee2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormDownloadableProductSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormDownloadableProductSection">
+        <element name="optionSelect" type="select" selector="//div[contains(@class,'link')]/div/div/input[./../label[contains(text(),{{linkTitle}})]]" parameterized="true"/>
+        <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
+        <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml
new file mode 100644
index 0000000000000..5a25a1bd880f4
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormGroupedProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormGroupedProductSection">
+        <element name="optionQty" type="input" selector="//td[@class='col-sku'][text()='{{productSku}}']/..//input[contains(@class, 'qty')]" parameterized="true"/>
+        <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
new file mode 100644
index 0000000000000..11673f1f0fe26
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormItemsOrderedSection">
+        <element name="addProductsBySku" type="button" selector="//section[@id='order-items']//span[contains(text(),'Add Products By SKU')]"/>
+        <element name="configureButtonBySku" type="button" selector="//div[@class='sku-configure-button']//span[contains(text(),'Configure')]"/>
+        <element name="configureProductOk" type="button" selector="//div[@class='page-main-actions']//span[contains(text(),'OK')]"/>
+        <element name="configureProductQtyField" type="input" selector="//*[@id='super-product-table']/tbody/tr[{{arg}}]/td[5]/input[1]" parameterized="true"/>
+        <element name="addProductToOrder" type="input" selector="//*[@title='Add Products to Order']"/>
+        <element name="itemsOrderedSummaryText" type="textarea" selector="//table[@class='data-table admin__table-primary order-tables']/tfoot/tr"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
new file mode 100644
index 0000000000000..d7af13c394fb2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormItemsSection">
+        <element name="skuNumber" type="input" selector="#sku_{{row}}" parameterized="true"/>
+        <element name="qty" type="input" selector="#sku_qty_{{row}}" parameterized="true"/>
+        <element name="addAnother" type="button" selector="#sku_container .col-actions > button.add"/>
+        <element name="deleteRow" type="button" selector="#sku_container tr:nth_of_type({{row}}) .col-actions button.action-delete" parameterized="true"/>
+        <element name="addToOrder" type="button" selector="#order-additional_area .admin__page-section-title .actions button.action-add"/>
+        <element name="addProducts" type="button" selector="//section[@id='order-items']/div/div/button/span[text() = 'Add Products']" timeout="30"/>
+        <element name="search" type="button" selector="#sales_order_create_search_grid [data-action='grid-filter-apply']" timeout="30"/>
+        <element name="resetFilter" type="button" selector="#sales_order_create_search_grid [data-action='grid-filter-reset']" timeout="30"/>
+        <element name="idFilter" type="input" selector="#sales_order_create_search_grid_filter_entity_id"/>
+        <element name="nameFilter" type="input" selector="#sales_order_create_search_grid_filter_name"/>
+        <element name="skuFilter" type="input" selector="#sales_order_create_search_grid_filter_sku"/>
+        <element name="priceFromFilter" type="input" selector="#sales_order_create_search_grid_filter_price_from"/>
+        <element name="priceToFilter" type="input" selector="#sales_order_create_search_grid_filter_price_to"/>
+        <element name="selectedFilter" type="select" selector="#sales_order_create_search_grid_filter_in_products"/>
+        <element name="row" type="text" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="rowCheck" type="checkbox" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-select [type=checkbox]" parameterized="true"/>
+        <element name="rowQty" type="input" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-qty [name='qty']" parameterized="true"/>
+        <element name="rowPrice" type="text" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.price" parameterized="true"/>
+        <element name="addSelected" type="button" selector="#order-search .admin__page-section-title .actions button.action-add" timeout="30"/>
+        <element name="customPriceCheckbox" type="checkbox" selector="//*[@class='custom-price-block']/input"/>
+        <element name="customPriceField" type="input" selector="//*[@class='custom-price-block']/following-sibling::input"/>
+        <element name="updateItemsAndQuantities" type="button" selector="//span[contains(text(),'Update Items and Quantities')]"/>
+        <element name="creditMemo" type="input" selector="#order_creditmemo"/>
+        <element name="configure" type="button" selector=".product-configure-block button.action-default.scalable" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
new file mode 100644
index 0000000000000..22bff9c286d0f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormPaymentSection">
+        <element name="header" type="text" selector="#shipping-methods span.title"/>
+        <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
+        <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
+        <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>
+        <element name="freeShippingOption" type="radio" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
+        <element name="checkMoneyOption" type="radio" selector="#p_method_checkmo" timeout="30"/>
+        <element name="paymentBlock" type="text" selector="#order-billing_method" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
new file mode 100644
index 0000000000000..b79d933268769
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormShippingAddressSection">
+        <element name="SameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
+        <element name="NamePrefix" type="input" selector="#order-shipping_address_prefix"/>
+        <element name="FirstName" type="input" selector="#order-shipping_address_firstname"/>
+        <element name="MiddleName" type="input" selector="#order-shipping_address_middlename"/>
+        <element name="LastName" type="input" selector="#order-shipping_address_lastname"/>
+        <element name="NameSuffix" type="input" selector="#order-shipping_address_suffix"/>
+        <element name="Company" type="input" selector="#order-shipping_address_company"/>
+        <element name="StreetLine1" type="input" selector="#order-shipping_address_street0"/>
+        <element name="StreetLine2" type="input" selector="#order-shipping_address_street1"/>
+        <element name="City" type="input" selector="#order-shipping_address_city"/>
+        <element name="Country" type="select" selector="#order-shipping_address_country_id"/>
+        <element name="State" type="select" selector="#order-shipping_address_region_id"/>
+        <element name="Province" type="input" selector="#order-shipping_address_region"/>
+        <element name="PostalCode" type="input" selector="#order-shipping_address_postcode"/>
+        <element name="Phone" type="input" selector="#order-shipping_address_telephone"/>
+        <element name="Fax" type="input" selector="#order-shipping_address_fax"/>
+        <element name="VatNumber" type="input" selector="#order-shipping_address_vat_id"/>
+        <element name="ValidateVatNumber" type="button" selector="#order-shipping_address_vat_id + .actions>button.action-default"/>
+        <element name="SaveAddress" type="checkbox" selector="#order-shipping_address_save_in_address_book"/>
+        
+        <element name="firstNameError" type="text" selector="#order-shipping_address_firstname-error"/>
+        <element name="lastNameError" type="text" selector="#order-shipping_address_lastname-error"/>
+        <element name="streetAddressError" type="text" selector="#order-shipping_address_street0-error"/>
+        <element name="cityError" type="text" selector="#order-shipping_address_city-error"/>
+        <element name="countryError" type="text" selector="#order-shipping_address_country_id-error"/>
+        <element name="stateError" type="text" selector="#order-shipping_address_region_id-error"/>
+        <element name="postalCodeError" type="text" selector="#order-shipping_address_postcode-error"/>
+        <element name="phoneError" type="text" selector="#order-shipping_address_telephone-error"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormStoreSelectorSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormStoreSelectorSection.xml
new file mode 100644
index 0000000000000..8602c0d3c608f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormStoreSelectorSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormStoreSelectorSection">
+        <element name="storeSelectorContainer" type="input" selector="#order-store-selector"/>
+        <element name="defaultStoreViewButton" type="radio" selector="//*[contains(@class,'tree-store-scope')]//label[contains(text(),'Default Store View')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
new file mode 100644
index 0000000000000..6f62ce199ecbb
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormTotalSection">
+        <element name="subtotalRow" type="text" selector="#order-totals>table tr.row-totals:nth-of-type({{row}}) span.price" parameterized="true"/>
+        <element name="total" type="text" selector="//tr[contains(@class,'row-totals')]/td[contains(text(), '{{total}}')]/following-sibling::td/span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="grandTotal" type="text" selector="#order-totals>table tr.row-totals:nth-of-type(3) span.price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
new file mode 100644
index 0000000000000..4ebce4de6b383
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderInvoicesTabSection">
+        <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_invoice']"/>
+        <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_invoice/view']" parameterized="true"/>
+        <element name="viewInvoice" type="button" selector="//div[@class='admin__data-grid-wrap']//a[@class='action-menu-item']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
new file mode 100644
index 0000000000000..53aeeb62c6b70
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderItemsOrderedSection">
+        <element name="itemProductName" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
+        <element name="itemProductSku" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
+        <element name="itemStatus" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-status" parameterized="true"/>
+        <element name="itemOriginalPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-original-price .price" parameterized="true"/>
+        <element name="itemPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-ordered-qty .qty-table" parameterized="true"/>
+        <element name="itemSubtotal" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>
+        <element name="itemTaxAmount" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-tax-amount .price" parameterized="true"/>
+        <element name="itemTaxPercent" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-tax-percent" parameterized="true"/>
+        <element name="itemDiscountAmount" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-discont .price" parameterized="true"/>
+        <element name="itemTotal" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
+
+        <element name="productNameColumn" type="text" selector=".edit-order-table .col-product .product-title"/>
+        <element name="productNameOptions" type="text" selector=".edit-order-table .col-product .item-options"/>
+        <element name="productNameOptionsLink" type="text" selector="//table[contains(@class, 'edit-order-table')]//td[contains(@class, 'col-product')]//a[text() = '{{var1}}']" parameterized="true"/>
+        <element name="productSkuColumn" type="text" selector=".edit-order-table .col-product .product-sku-block"/>
+        <element name="statusColumn" type="text" selector=".edit-order-table .col-status"/>
+        <element name="originalPriceColumn" type="text" selector=".edit-order-table .col-original-price .price"/>
+        <element name="priceColumn" type="text" selector=".edit-order-table .col-price .price"/>
+        <element name="qtyColumn" type="text" selector=".edit-order-table .col-ordered-qty .qty-table"/>
+        <element name="subtotalColumn" type="text" selector=".edit-order-table .col-subtotal .price"/>
+        <element name="taxAmountColumn" type="text" selector=".edit-order-table .col-tax-amount .price"/>
+        <element name="taxPercentColumn" type="text" selector=".edit-order-table .col-tax-percent"/>
+        <element name="discountAmountColumn" type="text" selector=".edit-order-table .col-discont .price"/>
+        <element name="totalColumn" type="text" selector=".edit-order-table .col-total .price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
new file mode 100644
index 0000000000000..9299222fd3236
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderPaymentInformationSection">
+        <element name="paymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="paymentCurrency" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="paymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
new file mode 100644
index 0000000000000..70d413d733b8e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderShipmentsTabSection">
+        <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_shipment']"/>
+        <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_shipment/view']" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
new file mode 100644
index 0000000000000..83e5512ef0d27
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderShippingInformationSection">
+        <element name="shippingMethod" type="text" selector=".order-shipping-method .admin__page-section-item-content"/>
+        <element name="shippingPrice" type="text" selector=".order-shipping-method .admin__page-section-item-content .price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
new file mode 100644
index 0000000000000..cbe17499319f9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderStoreScopeTreeSection">
+        <element name="storeTree" type="text" selector="div.tree-store-scope"/>
+        <element name="storeOption" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{name}}')]/preceding-sibling::input" parameterized="true" timeout="30"/>
+        <element name="storeForOrder" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
new file mode 100644
index 0000000000000..9b7356127df69
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderTotalSection">
+        <element name="subTotal" type="text" selector=".order-subtotal-table tbody tr.col-0>td span.price"/>
+        <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
+        <element name="shippingAndHandling" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Shipping &amp; Handling']/following-sibling::td//span[@class='price']"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
new file mode 100644
index 0000000000000..53a6cbffcdac6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrdersGridSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
+        <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
+        <element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
+        <element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
+        <element name="createNewOrder" type="button" selector=".page-actions-buttons button#add" timeout="30"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="viewBookmarkDropdown" type="button" selector="div.admin__data-grid-action-bookmarks button" timeout="30"/>
+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="columnsDropdown" type="button" selector="div.admin__data-grid-action-columns button" timeout="30"/>
+        <element name="viewColumnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
+        <element name="customerInOrdersSection" type="button" selector="(//td[contains(text(),'{{customer}}')])[1]" parameterized="true"/>
+        <element name="productForOrder" type="button" selector="//td[contains(text(),'{{var}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
new file mode 100644
index 0000000000000..717022322698f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OrdersGridSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
+        <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
+        <element name="firstRow" type="button" selector="//*[@id='container']//tr[@class='data-row']//a[@class='action-menu-item']"/>
+        <element name="createNewOrder" type="button" selector="button[title='Create New Order'"/>
+
+        <element name="website" type="radio" selector="//label[contains(text(), '{{arg}}')]" parameterized="true"/>
+        <element name="addProducts" type="button" selector="#add_products"/>
+        <element name="selectProduct" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-select col-in_products')]" parameterized="true"/>
+        <element name="setQuantity" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-qty')]/input" parameterized="true"/>
+        <element name="addProductsToOrder" type="button" selector="//span[text()='Add Selected Product(s) to Order']"/>
+        <element name="customPrice" type="checkbox" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/div//span[contains(text(),'Custom Price')]" parameterized="true"/>
+        <element name="customQuantity" type="input" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-qty']/input" parameterized="true"/>
+        <element name="update" type="button" selector="//span[text()='Update Items and Quantities']"/>
+        <element name="discount" type="text" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-discount col-price']/span" parameterized="true"/>
+        <element name="productPrice" type="text" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-price col-row-subtotal']/span" parameterized="true"/>
+        <element name="removeItems" type="select" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/select[@class='admin__control-select']" parameterized="true"/>
+        <element name="applyCoupon" type="input" selector="#coupons:code"/>
+        <element name="submitOrder" type="button" selector="#submit_order_top_button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml
new file mode 100644
index 0000000000000..b08a66140fabf
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="SalesOrderPrintSection">
+        <element name="isOrderPrintPage" type="block" selector=".preview-area"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml
new file mode 100644
index 0000000000000..fe8391cf3c28f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCreateNewReturnMainSection">
+        <element name="quantityToReturn" type="input" selector="#items:qty_requested0"/>
+        <element name="submit" type="submit" selector="//span[contains(text(), 'Submit')]"/>
+        <element name="resolutionError" type="text" selector="//*[@id='items:resolution0']/following-sibling::div[contains(text(),'Please select an option')]"/>
+        <element name="conditionError" type="text" selector="//*[@id='items:condition0']/following-sibling::div[contains(text(),'Please select an option')]"/>
+        <element name="reasonError" type="text" selector="//*[@id='items:reason0']/following-sibling::div[contains(text(),'Please select an option')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
new file mode 100644
index 0000000000000..5e420ee03bf75
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontGuestOrderSearchSection">
+        <element name="orderId" type="input" selector="#oar-order-id"/>
+        <element name="billingLastName" type="input" selector="#oar-billing-lastname"/>
+        <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
+        <element name="email" type="input" selector="#oar_email"/>
+        <element name="continue" type="button" selector="//*/span[contains(text(), 'Continue')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
new file mode 100644
index 0000000000000..11080761b192c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontGuestOrderViewSection">
+        <element name="orderInformationTab" type="text" selector="//*[@class='nav item current']/strong[contains(text(), 'Order Information')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
new file mode 100644
index 0000000000000..aa57dd9bc17ba
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontOrderAndReturnInformationSection">
+        <element name="orderId" type="input" selector="#oar-order-id"/>
+        <element name="bilingLastName" type="input" selector="#oar-billing-lastname"/>
+        <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
+        <element name="email" type="input" selector="#oar_email"/>
+        <element name="bilingZipCode" type="input" selector="//input[@id='oar_zip']"/>
+        <element name="continueButton" type="submit" selector="//button[@title='Continue']"/>
+        <element name="ordersAndReturnsTitle" type="span" selector="//span[@id='page-title-wrapper']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
new file mode 100644
index 0000000000000..e42c301206152
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontOrderInformationMainSection">
+        <element name="orderTitle" type="span" selector="#page-title-wrapper"/>
+        <element name="return" type="span" selector="//span[contains(text(), 'Return')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
new file mode 100644
index 0000000000000..9180636db7821
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAvailabilityCreditMemoWithNoPaymentTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="MAGETWO-91547: Unable to create Credit memo for order with no payment required"/>
+            <title value="Checking availability of 'Credit memo' button for order with no payment required"/>
+            <description value="*Credit Memo* button should be displayed"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94470"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Enable *Free Shipping* -->
+            <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Disable *Free Shipping* -->
+            <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
+            <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logOut"/>
+        </after>
+
+        <!-- Flush Magento Cache -->
+        <magentoCLI stepKey="flushCache" command="cache:flush"/>
+
+        <!--Proceed to Admin panel > SALES > Orders. Created order should be in Processing status-->
+        <amOnPage url="{{AdminOrderCreatePage.url}}" stepKey="navigateToSalesOrderPage"/>
+        <waitForPageLoad stepKey="waitForSalesOrderPageLoaded"/>
+
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <waitForElementVisible stepKey="waitForNewOrderPageOpened" selector="{{NewOrderSection.submitOrder}}"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+
+        <!--Check if order can be submitted without the required fields including email address-->
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="seeNewOrderPageTitle"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <!--Click *Custom Price* link, enter 0 and click *Update Items and Quantities* button-->
+        <click selector="{{AdminOrderFormItemsSection.customPriceCheckbox}}" stepKey="clickCustomPriceCheckbox"/>
+        <waitForElementVisible stepKey="waitForPriceFieldAppears" selector="{{AdminOrderFormItemsSection.customPriceField}}"/>
+        <fillField selector="{{AdminOrderFormItemsSection.customPriceField}}" userInput="0" stepKey="fillCustomPriceField"/>
+        <click selector="{{AdminOrderFormItemsSection.updateItemsAndQuantities}}" stepKey="clickUpdateItemsAndQuantitiesButton"/>
+
+        <!--Fill customer group and customer email-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="clickUpdateItemsAndQuantitiesButton"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!-- Select Free shipping -->
+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption" after="fillCustomerAddress"/>
+
+        <!--Click *Submit Order* button-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectFreeShippingOption"/>
+
+        <!--Click *Invoice* button-->
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
+        <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
+
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
+        <see userInput="The invoice has been created." stepKey="seeCorrectMessage"/>
+
+        <!--Verify that *Credit Memo* button is displayed-->
+        <seeElement selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="seeCreditMemo"/>
+        <click selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="clickCreditMemoItem"/>
+        <waitForPageLoad stepKey="waitForCreditMemoPageLoaded"/>
+        <see stepKey="seeNewMemoPage" userInput="New Memo"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeUrlOnPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
new file mode 100644
index 0000000000000..94e99d25dbb60
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateInvoiceTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Create an Invoice via the Admin"/>
+            <title value="Admin should be able to create an invoice"/>
+            <description value="Admin should be able to create an invoice"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-72096"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteCategory1"/>
+        </after>
+
+        <!-- todo: Create an order via the api instead of driving the browser  -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <!-- end todo -->
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
+
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
+        <see selector="{{AdminOrderDetailsInvoicesSection.content}}" userInput="{$grabOrderNumber}" stepKey="seeInvoice1"/>
+        <see selector="{{AdminOrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForOrderInformationTabLoadingMask"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
+        <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridInitial"/>
+        <click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
+        <click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
+        <see selector="{{AdminInvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
new file mode 100644
index 0000000000000..f15f5de5df696
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderWithBundleProductTest">
+        <annotations>
+            <title value="Create Order in Admin and update bundle product configuration"/>
+            <stories value="MAGETWO-96488: Wrong price calculation for bundle product on creating order from the admin panel"/>
+            <description value="Add bundle product with bundle option items with default quantity 2 to order in Admin and check price in product grid"/>
+            <features value="Sales"/>
+            <severity value="AVERAGE"/>
+            <group value="Sales"/>
+        </annotations>
+
+        <before>
+            <!--Set default flat rate shipping method settings-->
+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
+
+            <!--Create simple customer-->
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
+
+            <!--Create simple product 1-->
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+
+            <!--Create simple product 2-->
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+
+            <!--Create bundle product with checkbox bundle option-->
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="CheckboxOption" stepKey="checkboxBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Add drop-down bundle option-->
+            <createData entity="DropDownBundleOption" stepKey="dropDownBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink3">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink4">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!--Create new customer order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+
+        <!--Add bundle product to order and check product price in grid-->
+        <actionGroup ref="addBundleProductToOrderAndCheckPriceInGrid" stepKey="addBundleProductToOrder">
+            <argument name="product" value="$$product$$"/>
+            <argument name="quantity" value="1"/>
+            <argument name="price" value="$738.00"/>
+        </actionGroup>
+
+        <!--Select FlatRate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+
+        <!--Submit order-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+
+        <!--Verify order information-->
+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="product" stepKey="delete"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
new file mode 100644
index 0000000000000..40b26a6b46045
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderWithMinimumAmountEnabledTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Admin create order"/>
+            <title value="Admin order is not restricted by 'Minimum Order Amount' configuration."/>
+            <description value="Admin should be able to create an order regardless of the minimum order amount."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92925"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
+            <createData entity="EnabledMinimumOrderAmount500" stepKey="enableMinimumOrderAmount"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheBefore"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <createData entity="DisabledMinimumOrderAmount" stepKey="disableMinimumOrderAmount"/>
+            <actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheAfter"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Admin creates order-->
+        <comment userInput="Admin creates order" stepKey="adminCreateOrder"/>
+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="navigateToNewOrderPage"/>
+        <conditionalClick selector="{{AdminOrderFormStoreSelectorSection.defaultStoreViewButton}}" dependentSelector="{{AdminOrderFormStoreSelectorSection.storeSelectorContainer}}" visible="true" stepKey="selectFirstStoreViewIfAppears"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappearedAfterStoreSelected"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+
+        <!--Fill customer group information-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectGroup"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillEmail"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
+
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus"/>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
+        <assertNotEmpty actual="$orderId" stepKey="assertOrderIdIsNotEmpty"/>
+        <actionGroup ref="verifyBasicOrderInformation" stepKey="verifyOrderInformation">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsOrdered" stepKey="seeSimpleProductInItemsOrdered">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
new file mode 100644
index 0000000000000..5f6ea0937b52a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Admin create order"/>
+            <title value="Free Shipping is not available in Admin if Minimum Order Amount does not match Order total"/>
+            <description value="Admin should not be able place order with Free Shipping method if Minimum Order Amount does not match Order total"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-61001"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="DisableFlatRateShippingMethodConfig" stepKey="disableFlatRate"/>
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
+            <createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
+            <createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache2"/>
+        </after>
+        <!--Create new order with existing customer-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Add product to order-->
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
+        <!--Click *Get shipping methods and rates* and see that Free Shipping is absent-->
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickGetShippingMehods"/>
+        <dontSeeElement selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="seeAbsentFreeShipping"/>
+        <!--Submit Order and verify that Order isn't placed-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+
+        <dontSeeElement selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+        <seeElement selector="{{AdminMessagesSection.errorMessage}}" stepKey="seeErrorMessage"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
new file mode 100644
index 0000000000000..041252af0ac5b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminSubmitConfigurableProductOrderTest">
+        <annotations>
+            <title value="Create Order in Admin and update product configuration"/>
+            <stories value="MAGETWO-59632: Create Sales > Order from admin add configurable product and change options click OK does not update Items Ordered List"/>
+            <description value="Create Order in Admin and update product configuration"/>
+            <features value="Sales"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-59633"/>
+            <group value="Sales"/>
+            <skip>
+                <issueId value="MAGETWO-96196"/>
+            </skip>
+        </annotations>
+
+        <before>
+            <!--Set default flat rate shipping method settings-->
+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
+
+            <!--Create simple customer-->
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
+
+            <!-- Create the category -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product and add it to the category -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create an attribute with two options to be used in the first child product -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the attribute we just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the option of the attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create a simple product and give it the attribute with option -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Add simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!--Create new customer order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+
+        <!--Add configurable product to order-->
+        <actionGroup ref="addConfigurableProductToOrderFromAdmin" stepKey="addConfigurableProductToOrder">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
+            <argument name="option" value="$$getConfigAttributeOption1$$"/>
+        </actionGroup>
+
+        <!--Configure ordered configurable product-->
+        <actionGroup ref="configureOrderedConfigurableProduct" stepKey="configureOrderedConfigurableProduct">
+            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
+            <argument name="option" value="$$getConfigAttributeOption2$$"/>
+            <argument name="quantity" value="2"/>
+        </actionGroup>
+
+        <!--Select FlatRate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
+
+        <!--Submit order-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+
+        <!--Verify order information-->
+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
new file mode 100644
index 0000000000000..ed536bd3351f9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSubmitsOrderWithAndWithoutEmailTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Create orders"/>
+            <title value="Email is required to create an order from Admin Panel"/>
+            <description value="Admin should not be able to submit orders without an email address"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92980"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!--Create order via Admin-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
+        <!--<actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+
+        <!--Check if order can be submitted without the required fields including email address-->
+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="seeNewOrderPageTitle"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!--Fill customer group and customer email-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSimpleProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+        </test>
+    </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
new file mode 100644
index 0000000000000..d8ab034b6475c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CreditMemoTotalAfterShippingDiscountTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Credit memos"/>
+            <title value="Verify credit memo grand total after shipping discount is applied via Cart Price Rule"/>
+            <description value="Verify credit memo grand total after shipping discount is applied via Cart Price Rule"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92924"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+            <actionGroup ref="SetTaxClassForShipping" stepKey="setShippingTaxClass"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetTaxClassForShipping" stepKey="resetTaxClassForShipping"/>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteSalesRule">
+                <argument name="ruleName" value="{{ApiSalesRule.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteCategory1"/>
+        </after>
+
+        <!-- Create a cart price rule for $10 Fixed amount discount -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ApiSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsite"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="chooseNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+
+        <!-- Open the Actions Tab in the Rules Edit page -->
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="waitForElementToBeVisible"/>
+        <click selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="enableApplyDiscountToShiping"/>
+        <seeCheckboxIsChecked selector="{{AdminCartPriceRulesFormSection.applyDiscountToShipping}}" stepKey="discountIsAppliedToShiping"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
+
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+        <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+
+        <!-- Place an order from Storefront as a Guest  -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductToAdd"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <!-- fill out customer information -->
+        <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <!-- Choose Shippping - Flat Rate Shipping  -->
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
+
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <!-- Search for Order in the order grid -->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForPageLoad time="30" stepKey="waitForOrderListPageLoad"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilter"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
+
+        <!-- Create invoice -->
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
+
+        <!-- Verify Invoice Totals including subTotal Shipping  Discount and GrandTotal -->
+        <see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeInvoiceSubTotal"/>
+        <comment userInput="Shipping and Handling" stepKey="commentViewShippingAndHandling" after="seeInvoiceSubTotal"/>
+        <see selector="{{AdminInvoiceTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeShippingAndHandling"/>
+        <scrollTo selector="{{AdminInvoiceTotalSection.total('Shipping')}}" stepKey="scrollToInvoiceTotals"/>
+        <grabTextFrom selector="{{AdminInvoiceTotalSection.total('Shipping')}}" stepKey="grabShippingCost"/>
+        <assertEquals expected='$5.00' expectedType="string" actual="($grabShippingCost)" message="ExpectedShipping" stepKey="assertShippingAndHandling"/>
+
+        <see selector="{{AdminInvoiceTotalSection.total('Discount')}}" userInput="-$15.00" stepKey="seeShippingAndHandling2"/>
+        <grabTextFrom selector="{{AdminInvoiceTotalSection.total('Discount')}}" stepKey="grabInvoiceDiscount"/>
+        <assertEquals expected='-$15.00' expectedType="string" actual="($grabInvoiceDiscount)" message="ExpectedDiscount" stepKey="assertDiscountValue"/>
+
+        <see selector="{{AdminInvoiceTotalSection.grandTotal}}" userInput="$113.00" stepKey="seeCorrectGrandTotal"/>
+        <grabTextFrom selector="{{AdminInvoiceTotalSection.grandTotal}}" stepKey="grabInvoiceGrandTotal" after="seeCorrectGrandTotal"/>
+
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage1"/>
+
+        <!--Create Credit Memo-->
+        <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreateCreditMemo" after="createCreditMemoComment"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewCreditMemoPage" after="clickCreateCreditMemo"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle" after="seeNewCreditMemoPage"/>
+
+        <!-- Verify Refund Totals -->
+        <see selector="{{AdminCreditMemoTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeRefundSubTotal"/>
+        <grabTextFrom selector="{{AdminCreditMemoTotalSection.total('Discount')}}" stepKey="grabRefundDiscountValue"/>
+        <assertEquals expected='-$15.00' expectedType="string" actual="($grabRefundDiscountValue)" message="notExpectedDiscountOnRefundPage" stepKey="assertDiscountValue1"/>
+        <grabTextFrom selector="{{AdminInvoiceTotalSection.grandTotal}}" stepKey="grabRefundGrandTotal"/>
+        <assertEquals expected="($grabInvoiceGrandTotal)" actual="($grabRefundGrandTotal)" message="RefundGrandTotalMatchesWithInvoiceGrandTotal" stepKey="compareRefundGrandTotalAndInvoiceGrandTotal"/>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..0fdd8d8c35b32
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CAdminTest">
+        <before>
+            <!--Create order via API-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProductApi">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="GuestCart" stepKey="createGuestCart"/>
+            <createData entity="SimpleCartItem" stepKey="addCartItem">
+                <requiredEntity createDataKey="createGuestCart"/>
+                <requiredEntity createDataKey="createSimpleProductApi"/>
+            </createData>
+            <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
+                <requiredEntity createDataKey="createGuestCart"/>
+            </createData>
+            <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
+                <requiredEntity createDataKey="createGuestCart"/>
+            </updateData>
+            <!--END Create order via API-->
+        </before>
+
+        <!--Prerequisites-->
+        <!--Create store view to ensure multiple store views-->
+        <comment userInput="Create prerequisite store view" stepKey="createStoreViewComment" before="createStoreView"/>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" before="navigateToNewOrderPage"/>
+
+        <!--Admin creates order-->
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment" before="navigateToNewOrderPage"/>
+        <actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage" after="deleteCategory"/>
+
+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="navigateToNewOrderPage"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="addConfigurableProductToOrder" stepKey="addConfigurableProductToOrder" after="addSimpleProductToOrder">
+            <argument name="product" value="BaseConfigurableProduct"/>
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="option" value="colorProductAttribute1"/>
+        </actionGroup>
+
+        <!--Fill customer group information-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectGroup" after="addConfigurableProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillEmail" after="selectGroup"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleConfigurableProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleConfigurableProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleConfigurableProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="seeOrderShipping"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus" after="seeSuccessMessage"/>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId" after="seeOrderPendingStatus"/>
+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
+        <actionGroup ref="verifyBasicOrderInformation" stepKey="verifyOrderInformation" after="assertOrderIdIsNotEmpty">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsOrdered" stepKey="seeSimpleProductInItemsOrdered" after="verifyOrderInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsOrdered" stepKey="seeConfigurableProductInItemsOrdered" after="seeSimpleProductInItemsOrdered">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Create order invoice-->
+        <comment userInput="Admin creates invoice for order" stepKey="adminCreateInvoiceComment" before="closeAdminNotificationInvoice"/>
+        <closeAdminNotification stepKey="closeAdminNotificationInvoice" after="seeConfigurableProductInItemsOrdered"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction" after="closeAdminNotificationInvoice"/>
+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeOrderInvoiceUrl" after="clickInvoiceAction"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage" after="seeOrderInvoiceUrl"/>
+
+        <!--Check Invoice Data-->
+        <see selector="{{AdminInvoiceOrderInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingInvoice" after="seePageNameNewInvoicePage"/>
+        <actionGroup ref="verifyBasicInvoiceInformation" stepKey="verifyOrderInvoiceInformation" after="seeOrderPendingInvoice">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <see selector="{{AdminInvoicePaymentShippingSection.ShippingMethod}}" userInput="{{DefaultFlatRateMethod.title}}" stepKey="seeShippingMethod" after="verifyOrderInvoiceInformation"/>
+        <see selector="{{AdminInvoicePaymentShippingSection.ShippingPrice}}" userInput="${{AdminOrderSimpleConfigurableProduct.shipping}}" stepKey="seeShippingCost" after="seeShippingMethod"/>
+        <!--Submit Invoice-->
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice" after="seeShippingCost"/>
+        <!--Invoice created successfully-->
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageInvoice" after="clickSubmitInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess" after="seeViewOrderPageInvoice"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="$getOrderId" stepKey="seePageNameMatchesOrderIdAfterInvoice" after="seeInvoiceCreateSuccess"/>
+
+        <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickOrderInvoicesTab" after="seePageNameMatchesOrderIdAfterInvoice"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask" after="clickOrderInvoicesTab"/>
+        <see selector="{{AdminOrderInvoicesTabSection.gridRow('1')}}" userInput="{{Simple_US_Customer.firstname}}" stepKey="seeOrderInvoiceInTabGrid" after="waitForInvoiceGridLoadingMask"/>
+        <click selector="{{AdminOrderInvoicesTabSection.viewGridRow('1')}}" stepKey="clickToViewInvoiceRow" after="seeOrderInvoiceInTabGrid"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.orderId}}" userInput="$getOrderId" stepKey="seeOrderIdOnInvoice" after="clickToViewInvoiceRow"/>
+        <actionGroup ref="verifyBasicInvoiceInformation" stepKey="verifyBasicInvoiceInformation" after="seeOrderIdOnInvoice">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInInvoiceItems" stepKey="seeSimpleProductInInvoice" after="verifyBasicInvoiceInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInInvoiceItems" stepKey="seeConfigurableProductInInvoice" after="seeSimpleProductInInvoice">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <click selector="{{AdminInvoiceOrderInformationSection.orderId}}" stepKey="clickOrderIdLinkOnInvoice" after="seeConfigurableProductInInvoice"/>
+
+        <!--Create Credit Memo-->
+        <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment" after="clickOrderIdOnShipment"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreateCreditMemo" after="createCreditMemoComment"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewCreditMemoPage" after="clickCreateCreditMemo"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle" after="seeNewCreditMemoPage"/>
+        <!--Check Credit Memo Order Data-->
+        <actionGroup ref="verifyBasicCreditMemoInformation" stepKey="verifyOrderCreditMemoInformation" after="seeNewMemoInPageTitle">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <!--Submit credit memo-->
+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline" after="verifyOrderCreditMemoInformation"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the credit memo." stepKey="seeCreditMemoSuccess" after="clickRefundOffline"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickOrderCreditMemosTab" after="seeCreditMemoSuccess"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCreditMemoTabLoadingMask" after="clickOrderCreditMemosTab"/>
+        <see selector="{{AdminOrderCreditMemosTabSection.gridRow('1')}}" userInput="{{Simple_US_Customer.firstname}}" stepKey="seeOrderCreditMemoInTabGrid" after="waitForCreditMemoTabLoadingMask"/>
+        <click selector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" stepKey="clickToViewCreditMemoRow" after="seeOrderCreditMemoInTabGrid"/>
+        <waitForPageLoad stepKey="waitForCreditMemoPageLoad" after="clickToViewCreditMemoRow"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.orderId}}" userInput="$getOrderId" stepKey="seeOrderIdOnCreditMemo" after="waitForCreditMemoPageLoad"/>
+        <actionGroup ref="verifyBasicCreditMemoInformation" stepKey="verifyBasicCreditMemoInformation" after="seeOrderIdOnCreditMemo">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsRefunded" stepKey="seeSimpleProductInItemsRefunded" after="verifyBasicCreditMemoInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsRefunded" stepKey="seeConfigurableProductInItemsRefunded" after="seeSimpleProductInItemsRefunded">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfCreditMemo" after="seeConfigurableProductInItemsRefunded"/>
+        <click selector="{{AdminCreditMemoOrderInformationSection.orderId}}" stepKey="clickOrderIdLinkOnCreditMemo" after="scrollToTopOfCreditMemo"/>
+
+        <!--Admin uses order grid-->
+        <comment userInput="Admin uses order grid" stepKey="adminUseOrderGridComment" before="navigateToOrderGridPage"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage" after="clickOrderIdLinkOnCreditMemo"/>
+        <waitForPageLoad time="60" stepKey="waitForLoadUseOrderGrid" after="navigateToOrderGridPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForOrderGridPageLoad" after="waitForLoadUseOrderGrid"/>
+
+        <!--Search order grid by name-->
+        <comment userInput="Admin searches order grid by name" stepKey="searchOrderGridComment" after="waitForOrderGridPageLoad"/>
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="setOrderGridToDefaultViewForSearch" after="searchOrderGridComment"/>
+        <!--@TODO use "Ship-to Name" when MQE-794 is fixed-->
+        <see selector="{{AdminDataGridTableSection.column('Ship')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="seeNonFilterNameInShipNameColumn" after="setOrderGridToDefaultViewForSearch"/>
+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchOrderGridByNameKeyword" after="seeNonFilterNameInShipNameColumn">
+            <argument name="keyword" value="BillingAddressTX.fullname"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Ship')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="dontSeeNonFilterNameInShipNameColumn" after="searchOrderGridByNameKeyword"/>
+        <see selector="{{AdminDataGridTableSection.column('Ship')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="seeFilterNameInShipNameColumn" after="dontSeeNonFilterNameInShipNameColumn"/>
+
+        <!--Filter order grid-->
+        <comment userInput="Admin filters order grid by 'Bill-to Name'" stepKey="filterOrderGridByNameComment" after="seeFilterNameInShipNameColumn"/>
+        <!--Filter order grid by "Bill-to Name"-->
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetOrderGridForNameFilter" after="filterOrderGridByNameComment"/>
+        <!--@TODO use "Bill-to Name" when MQE-794 is fixed-->
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="seeNonFilterNameInColumn" after="resetOrderGridForNameFilter"/>
+        <actionGroup ref="filterOrderGridByBillingName" stepKey="filterOrderGridByBillingName" after="seeNonFilterNameInColumn">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="dontSeeNonFilterNameInColumn" after="filterOrderGridByBillingName"/>
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="seeFilterNameInColumn" after="dontSeeNonFilterNameInColumn"/>
+        <!--Filter order grid by Grand Total (Base)-->
+        <comment userInput="Admin filters order grid by 'Grand Total'" stepKey="filterOrderGridByTotalComment" after="seeFilterNameInColumn"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilterBeforeTotalFilter" after="filterOrderGridByTotalComment"/>
+        <see selector="{{AdminDataGridTableSection.column('Grand Total')}}" userInput="{{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeLowerTotalInGrid" after="clearFilterBeforeTotalFilter"/>
+        <actionGroup ref="filterOrderGridByBaseTotalRange" stepKey="filterOrderGridByTotal" after="seeLowerTotalInGrid">
+            <argument name="from" value="OrderGrandTotalFilterRange.from"/>
+            <argument name="to" value="OrderGrandTotalFilterRange.to"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Grand Total')}}" userInput="{{AdminOrderSimpleProduct.grandTotal}}" stepKey="dontSeeLowerTotalInGrid" after="filterOrderGridByTotal"/>
+        <see selector="{{AdminDataGridTableSection.column('Grand Total')}}" userInput="{{AdminOrderSimpleConfigurableProduct.grandTotal}}" stepKey="seeExpectedTotalInGrid" after="dontSeeLowerTotalInGrid"/>
+        <!--Filter order grid by purchase date-->
+        <comment userInput="Admin filters order grid by 'Purchase Date'" stepKey="filterOrderGridByDateComment" after="seeExpectedTotalInGrid"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilterBeforeOrderDateFilter" after="filterOrderGridByDateComment"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderFilterForOrderDateFrom" after="clearFilterBeforeOrderDateFilter"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[from]')}}" userInput="01/01/2018" stepKey="fillOrderDateFromFilter" after="openOrderFilterForOrderDateFrom"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="applyFilterOrderDateFrom" after="fillOrderDateFromFilter"/>
+        <!--Both of our orders should be in grid-->
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="seeFirstOrderInGrid" after="applyFilterOrderDateFrom"/>
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="seeSecondOrderInGrid" after="seeFirstOrderInGrid"/>
+        <!--Add end date to date range filter (past date)-->
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderFilterForOrderDateTo" after="seeSecondOrderInGrid"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[to]')}}" userInput="01/10/2018" stepKey="fillOrderDateToFilter" after="openOrderFilterForOrderDateTo"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="applyFilterOrderDateTo" after="fillOrderDateToFilter"/>
+        <!--Dont see our orders in the grid-->
+        <dontSee selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="dontSeeFirstOrderInGrid" after="applyFilterOrderDateTo"/>
+        <dontSee selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="dontSeeSecondOrderInGrid" after="dontSeeFirstOrderInGrid"/>
+        <!--Filter order grid by status-->
+        <comment userInput="Admin filters order grid by 'Status'" stepKey="filterOrderGridByStatusComment" after="dontSeeSecondOrderInGrid"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilterBeforeStatusFilter" after="filterOrderGridByStatusComment"/>
+        <actionGroup ref="filterOrderGridByStatus" stepKey="filterOrderGridByPendingStatus" after="clearFilterBeforeStatusFilter">
+            <argument name="status" value="OrderStatus.pending"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.closed}}" stepKey="dontSeeClosedStatusInOrderGrid" after="filterOrderGridByPendingStatus"/>
+        <see selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.pending}}" stepKey="seePendingStatusInOrderGrid" after="dontSeeClosedStatusInOrderGrid"/>
+        <actionGroup ref="filterOrderGridByStatus" stepKey="filterOrderGridByClosedStatus" after="seePendingStatusInOrderGrid">
+            <argument name="status" value="OrderStatus.closed"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.closed}}" stepKey="seeClosedStatusInOrderGrid" after="filterOrderGridByClosedStatus"/>
+        <dontSee selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.pending}}" stepKey="dontSeePendingStatusInOrderGrid" after="seeClosedStatusInOrderGrid"/>
+
+        <!--Sort order grid-->
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetOrderGridForSorting" after="dontSeePendingStatusInOrderGrid"/>
+        <!--Sort order grid by status-->
+        <comment userInput="Admin sorts order grid by status" stepKey="sortOrderGridByStatusComment" after="resetOrderGridForSorting"/>
+        <click selector="{{AdminDataGridTableSection.columnHeader('Status')}}" stepKey="clickStatusToSortAsc" after="sortOrderGridByStatusComment"/>
+        <grabTextFrom selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" stepKey="getOrderStatusFirstRow" after="clickStatusToSortAsc"/>
+        <grabTextFrom selector="{{AdminDataGridTableSection.gridCell('2', 'Status')}}" stepKey="getOrderStatusSecondRow" after="getOrderStatusFirstRow"/>
+        <assertGreaterThanOrEqual expected="$getOrderStatusFirstRow" actual="$getOrderStatusSecondRow" stepKey="checkStatusSortOrderAsc" after="getOrderStatusSecondRow"/>
+        <!--@TODO improve sort assertion and check price and date column when MQE-690 is resolved-->
+
+        <!--Use paging on order grid-->
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminGridBeforePaging" after="checkStatusSortOrderAsc"/>
+        <comment userInput="Admin uses paging on order grid" stepKey="usePagingOrderGridComment" after="resetAdminGridBeforePaging"/>
+        <actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage" after="usePagingOrderGridComment">
+            <!--@TODO Change this to scalar when MQE-498 is implemented-->
+            <argument name="perPage" value="Const.one"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" userInput="1" stepKey="see1RowOnFirstPage" after="select1OrderPerPage"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstPageOrderGrid" after="see1RowOnFirstPage"/>
+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid" after="seeOnFirstPageOrderGrid"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid" after="clickNextPageOrderGrid"/>
+        <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" userInput="1" stepKey="see1RowOnSecondPage" after="seeOnSecondPageOrderGrid"/>
+        <actionGroup ref="adminDataGridSelectPerPage" stepKey="select50OrdersPerPage" after="see1RowOnSecondPage">
+            <!--@TODO Change this to scalar when MQE-498 is implemented-->
+            <argument name="perPage" value="Const.fifty"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" parameterArray="[2,50]" stepKey="seeCorrectNumberOfRowsPerPage" after="select50OrdersPerPage"/>
+
+        <!--Add column to order grid-->
+        <!--@TODO Change to action group when MQE-498 is implemented-->
+        <comment userInput="Admin adds column to order grid" stepKey="adminAddsColumnOrderGrid" after="seeCorrectNumberOfRowsPerPage"/>
+        <dontSeeElement selector="{{AdminDataGridTableSection.columnHeader('Customer Email')}}" stepKey="dontSeeCustomerEmailColumnInGrid" after="adminAddsColumnOrderGrid"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="openOrderGridColumnOptions" after="dontSeeCustomerEmailColumnInGrid"/>
+        <checkOption selector="{{AdminDataGridHeaderSection.columnCheckbox('Customer Email')}}" stepKey="addCustomerEmailColumnToOrderGrid" after="openOrderGridColumnOptions"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="closeOrderGridColumnOptions" after="addCustomerEmailColumnToOrderGrid"/>
+        <seeElement selector="{{AdminDataGridTableSection.columnHeader('Customer Email')}}" stepKey="seeCustomerEmailColumnInGrid" after="closeOrderGridColumnOptions"/>
+        <!--Remove column from order grid-->
+        <!--@TODO Change to action group when MQE-498 is implemented-->
+        <comment userInput="Admin removes column from order grid" stepKey="adminRemovesColumnOrderGrid" after="seeCustomerEmailColumnInGrid"/>
+        <seeElement selector="{{AdminDataGridTableSection.columnHeader('Purchase Point')}}" stepKey="seePurchasePointColumnInGrid" after="adminRemovesColumnOrderGrid"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="openOrderGridColumnOptionsPurchasePoint" after="seePurchasePointColumnInGrid"/>
+        <uncheckOption selector="{{AdminDataGridHeaderSection.columnCheckbox('Purchase Point')}}" stepKey="removePurchasePointColumnFromGrid" after="openOrderGridColumnOptionsPurchasePoint"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="closeOrderGridColumnOptionsPurchasePoint" after="removePurchasePointColumnFromGrid"/>
+        <dontSeeElement selector="{{AdminDataGridTableSection.columnHeader('Purchase Point')}}" stepKey="dontSeePurchasePointColumnInGrid" after="closeOrderGridColumnOptionsPurchasePoint"/>
+        <!--END admin uses order grid-->
+
+        <!--Delete store view created as prerequisites-->
+        <comment userInput="Clean up store view" stepKey="cleanUpStoreView" before="deleteStoreView"/>
+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
new file mode 100644
index 0000000000000..9790b5dfc47f3
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontRedirectToOrderHistory">
+        <annotations>
+            <features value="Redirection Rules"/>
+            <stories value="Create Invoice"/>
+            <title value="Create Invoice"/>
+            <description
+                    value="Check while order printing URL with an id of not relevant order redirects to order history"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92854"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCustomer2" stepKey="deleteCustomer2"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!--Create an order at Storefront as Customer 1 -->
+        <actionGroup ref="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" stepKey="createOrderToPrint">
+            <argument name="Category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!--Go to 'print order' page by grabbed order id-->
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderIdFromURL"/>
+        <switchToNextTab stepKey="switchToPrintPage"/>
+        <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage"/>
+        <openNewTab stepKey="openNewTab"/>
+        <switchToNextTab stepKey="switchForward"/>
+        <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage"/>
+
+        <!--Log out as customer 1-->
+        <switchToNextTab stepKey="switchForward2"/>
+        <openNewTab stepKey="openNewTab2"/>
+        <amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
+        <waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
+
+        <!--Log in to Storefront as Customer 2 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp2">
+            <argument name="Customer" value="$$createCustomer2$$"/>
+        </actionGroup>
+
+        <!--Create an order at Storefront as Customer 2 -->
+        <actionGroup ref="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" stepKey="createOrderToPrint2">
+            <argument name="Category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!--Try to load 'print order' page with not relevant order id to be redirected to 'order history' page-->
+        <switchToNextTab stepKey="switchToPrintPage2"/>
+        <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage2"/>
+        <openNewTab stepKey="openNewTab3"/>
+        <switchToNextTab stepKey="switchForward4"/>
+        <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage2"/>
+        <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php
index 20f7a7061b6b0..a390c43276085 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php
@@ -84,7 +84,7 @@ public function testGetItemRenderer()
      */
     public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
     {
-        $renderer = $this->createMock(\StdClass::class);
+        $renderer = $this->createMock(\stdClass::class);
         $layout = $this->createPartialMock(
             \Magento\Framework\View\Layout::class,
             ['getChildName', 'getBlock', '__wakeup']
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php
index 311e5f697675b..a34373f516c42 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php
@@ -62,7 +62,7 @@ public function testGetItemRenderer()
      */
     public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
     {
-        $renderer = $this->createMock(\StdClass::class);
+        $renderer = $this->createMock(\stdClass::class);
         $layout = $this->createPartialMock(
             \Magento\Framework\View\Layout::class,
             ['getChildName', 'getBlock', '__wakeup']
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
new file mode 100644
index 0000000000000..94148cc515382
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Address;
+
+use Magento\Customer\Model\Metadata\Form as CustomerForm;
+use Magento\Customer\Model\Metadata\FormFactory as CustomerFormFactory;
+use Magento\Directory\Model\ResourceModel\Country\Collection;
+use Magento\Framework\Data\Form as DataForm;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\Data\Form\Element\Select;
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Block\Adminhtml\Order\Address\Form;
+use Magento\Sales\Model\AdminOrder\Create;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class FormTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Form
+     */
+    private $addressBlock;
+
+    /**
+     * @var MockObject
+     */
+    private $formFactory;
+
+    /**
+     * @var MockObject
+     */
+    private $customerFormFactory;
+
+    /**
+     * @var MockObject
+     */
+    private $coreRegistry;
+
+    /**
+     * @var MockObject
+     */
+    private $countriesCollection;
+
+    /**
+     * @var QuoteSession|MockObject
+     */
+    private $sessionQuote;
+
+    /**
+     * @var Create|MockObject
+     */
+    private $orderCreate;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->formFactory = $this->createMock(FormFactory::class);
+        $this->customerFormFactory = $this->createMock(CustomerFormFactory::class);
+        $this->coreRegistry = $this->createMock(Registry::class);
+        $this->countriesCollection = $this->createMock(
+            Collection::class
+        );
+        $this->sessionQuote = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStoreId', 'getStore'])
+            ->getMock();
+
+        $this->orderCreate = $this->getMockBuilder(Create::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderCreate->method('getSession')
+            ->willReturn($this->sessionQuote);
+
+        $this->addressBlock = $objectManager->getObject(
+            Form::class,
+            [
+                '_formFactory' => $this->formFactory,
+                '_customerFormFactory' => $this->customerFormFactory,
+                '_coreRegistry' => $this->coreRegistry,
+                'countriesCollection' => $this->countriesCollection,
+                'sessionQuote' => $this->sessionQuote,
+                '_orderCreate' => $this->orderCreate
+            ]
+        );
+    }
+
+    public function testGetForm()
+    {
+        $storeId = 5;
+        $form = $this->createMock(DataForm::class);
+        $fieldset = $this->createMock(Fieldset::class);
+        $addressForm = $this->createMock(CustomerForm::class);
+        $address = $this->createMock(Address::class);
+        $select = $this->createMock(Select::class);
+        $order = $this->createMock(Order::class);
+
+        $this->formFactory->method('create')
+            ->willReturn($form);
+        $form->method('addFieldset')
+            ->willReturn($fieldset);
+        $this->customerFormFactory->method('create')
+            ->willReturn($addressForm);
+        $addressForm->method('getAttributes')
+            ->willReturn([]);
+        $this->coreRegistry->method('registry')
+            ->willReturn($address);
+        $form->method('getElement')
+            ->willReturnOnConsecutiveCalls(
+                $select,
+                $select,
+                $select,
+                $select,
+                $select,
+                $select,
+                $select,
+                null
+            );
+
+        $address->method('getOrder')
+            ->willReturn($order);
+        $order->method('getStoreId')
+            ->willReturn($storeId);
+        $this->sessionQuote->method('getStoreId')
+            ->willReturn($storeId);
+        $this->countriesCollection->method('loadByStore')
+            ->with($storeId)
+            ->willReturn($this->countriesCollection);
+
+        $this->addressBlock->getForm();
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
index 447fd7791ecbd..e010674ca354e 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\FinalPrice;
 
 class AbstractCreateTest extends \PHPUnit\Framework\TestCase
@@ -67,4 +69,34 @@ public function testGetItemPrice()
             ->willReturn($resultPrice);
         $this->assertEquals($resultPrice, $this->model->getItemPrice($this->productMock));
     }
+
+    /**
+     * @param $item
+     *
+     * @dataProvider getProductDataProvider
+     */
+    public function testGetProduct($item)
+    {
+        $product = $this->model->getProduct($item);
+
+        self::assertInstanceOf(Product::class, $product);
+    }
+
+    /**
+     * DataProvider for testGetProduct.
+     *
+     * @return array
+     */
+    public function getProductDataProvider()
+    {
+        $productMock = $this->createMock(Product::class);
+
+        $itemMock = $this->createMock(\Magento\Wishlist\Model\Item::class);
+        $itemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
+
+        return [
+            [$productMock],
+            [$itemMock],
+        ];
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php
new file mode 100644
index 0000000000000..037e8fd1eaaad
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/FormTest.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create;
+
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Address\Mapper;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\Currency;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Locale\CurrencyInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Payment;
+use Magento\Sales\Block\Adminhtml\Order\Create\Form;
+use Magento\Sales\Model\AdminOrder\Create;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class FormTest extends TestCase
+{
+    /**
+     * @var QuoteSession|MockObject
+     */
+    private $quoteSession;
+
+    /**
+     * @var CustomerRepositoryInterface|MockObject
+     */
+    private $customerRepository;
+
+    /**
+     * @var CurrencyInterface|MockObject
+     */
+    private $localeCurrency;
+
+    /**
+     * @var Form
+     */
+    private $block;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        /** @var Context|MockObject $context */
+        $context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $context->method('getStoreManager')
+            ->willReturn($this->storeManager);
+
+        $this->quoteSession = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getQuoteId', 'getStoreId', 'getStore', 'getQuote'])
+            ->getMock();
+        /** @var Create|MockObject $create */
+        $create = $this->getMockBuilder(Create::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var PriceCurrencyInterface|MockObject $priceCurrency */
+        $priceCurrency = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+        /** @var EncoderInterface|MockObject $encoder */
+        $encoder = $this->getMockForAbstractClass(EncoderInterface::class);
+        $encoder->method('encode')
+            ->willReturnCallback(function ($param) {
+                return json_encode($param);
+            });
+        /** @var FormFactory|MockObject $formFactory */
+        $formFactory = $this->getMockBuilder(FormFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerRepository = $this->getMockForAbstractClass(CustomerRepositoryInterface::class);
+
+        $this->localeCurrency = $this->getMockForAbstractClass(CurrencyInterface::class);
+        /** @var Mapper|MockObject $addressMapper */
+        $addressMapper = $this->getMockBuilder(Mapper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->block = new Form(
+            $context,
+            $this->quoteSession,
+            $create,
+            $priceCurrency,
+            $encoder,
+            $formFactory,
+            $this->customerRepository,
+            $this->localeCurrency,
+            $addressMapper
+        );
+    }
+
+    /**
+     * Checks if order contains all needed data.
+     */
+    public function testGetOrderDataJson()
+    {
+        $customerId = 1;
+        $storeId = 1;
+        $quoteId = 2;
+        $expected = [
+            'customer_id' => $customerId,
+            'addresses' => [],
+            'store_id' => $storeId,
+            'currency_symbol' => '$',
+            'shipping_method_reseted' => false,
+            'payment_method' => 'free',
+            'quote_id' => $quoteId
+        ];
+
+        $this->storeManager->method('setCurrentStore')
+            ->with($storeId);
+        $this->quoteSession->method('getCustomerId')
+            ->willReturn($customerId);
+        $this->quoteSession->method('getStoreId')
+            ->willReturn($storeId);
+        $this->quoteSession->method('getQuoteId')
+            ->willReturn($quoteId);
+
+        $customer = $this->getMockBuilder(CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customer->method('getAddresses')
+            ->willReturn([]);
+        $this->customerRepository->method('getById')
+            ->with($customerId)
+            ->willReturn($customer);
+
+        $this->withCurrencySymbol('$');
+
+        $this->withQuote();
+
+        self::assertEquals($expected, json_decode($this->block->getOrderDataJson(), true));
+    }
+
+    /**
+     * Configures mock object for currency.
+     *
+     * @param string $symbol
+     */
+    private function withCurrencySymbol(string $symbol)
+    {
+        $store = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $store->method('getCurrentCurrencyCode')
+            ->willReturn('USD');
+        $this->quoteSession->method('getStore')
+            ->willReturn($store);
+
+        $currency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currency->method('getSymbol')
+            ->willReturn($symbol);
+        $this->localeCurrency->method('getCurrency')
+            ->with('USD')
+            ->willReturn($currency);
+    }
+
+    /**
+     * Configures shipping and payment mock objects.
+     */
+    private function withQuote()
+    {
+        $quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteSession->method('getQuote')
+            ->willReturn($quote);
+
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $address->method('getShippingMethod')
+            ->willReturn('free');
+        $quote->method('getShippingAddress')
+            ->willReturn($address);
+
+        $payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $payment->method('getMethod')
+            ->willReturn('free');
+        $quote->method('getPayment')
+            ->willReturn($payment);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
index 9070fa1a2e7bd..271f6cb659d7e 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -268,6 +268,9 @@ public function testGetItems()
         $this->assertEquals(true, $this->block->getQuote()->getIsSuperMode());
     }
 
+    /**
+     * @return \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid
+     */
     protected function getGrid()
     {
         /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid  $grid */
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebarTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebarTest.php
index a52d8e1b7f9f9..7b94e769eff9a 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebarTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebarTest.php
@@ -39,6 +39,9 @@ public function testGetItemQty($itemQty, $qty, $expectedValue)
         $this->assertEquals($expectedValue, $this->abstractSidebar->getItemQty($this->itemMock));
     }
 
+    /**
+     * @return array
+     */
     public function getItemQtyDataProvider()
     {
         return ['whenQtyIsset' => [2, 10, 10], 'whenQtyNotIsset' => [1, false, 1]];
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Invoice/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Invoice/ViewTest.php
index 773694897291c..8f94ea8982ddf 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Invoice/ViewTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Invoice/ViewTest.php
@@ -54,6 +54,9 @@ public function testIsPaymentReview($canReviewPayment, $canFetchUpdate, $expecte
         $this->assertEquals($expectedResult, $testMethod->invoke($block));
     }
 
+    /**
+     * @return array
+     */
     public function isPaymentReviewDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php
index 2a839dd018dba..492cfee5f5d83 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php
@@ -70,10 +70,10 @@ protected function setUp()
 
         $this->quoteMock->expects($this->any())
             ->method('getBillingAddress')
-            ->willreturn($this->billingAddressMock);
+            ->willReturn($this->billingAddressMock);
         $this->quoteMock->expects($this->any())
             ->method('getShippingAddress')
-            ->willreturn($this->shippingAddressMock);
+            ->willReturn($this->shippingAddressMock);
         $this->sessionQuoteMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
         $this->totals = $this->helperManager->getObject(
             \Magento\Sales\Block\Adminhtml\Order\Create\Totals::class,
@@ -88,7 +88,7 @@ public function testGetTotals($isVirtual)
     {
         $expected = 'expected';
         $this->quoteMock->expects($this->at(1))->method('collectTotals');
-        $this->quoteMock->expects($this->once())->method('isVirtual')->willreturn($isVirtual);
+        $this->quoteMock->expects($this->once())->method('isVirtual')->willReturn($isVirtual);
         if ($isVirtual) {
             $this->billingAddressMock->expects($this->once())->method('getTotals')->willReturn($expected);
         } else {
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/RecentTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/RecentTest.php
index 99528983a13c9..96162aca42e12 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/RecentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/RecentTest.php
@@ -5,6 +5,15 @@
  */
 namespace Magento\Sales\Test\Unit\Block\Order;
 
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Customer\Model\Session;
+use Magento\Sales\Model\Order\Config;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\View\Layout;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Sales\Model\ResourceModel\Order\Collection;
+
 class RecentTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -32,26 +41,33 @@ class RecentTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderConfig;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
     protected function setUp()
     {
-        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
+        $this->context = $this->createMock(Context::class);
         $this->orderCollectionFactory = $this->createPartialMock(
-            \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class,
+            CollectionFactory::class,
             ['create']
         );
-        $this->customerSession = $this->createPartialMock(\Magento\Customer\Model\Session::class, ['getCustomerId']);
+        $this->customerSession = $this->createPartialMock(Session::class, ['getCustomerId']);
         $this->orderConfig = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Config::class,
+            Config::class,
             ['getVisibleOnFrontStatuses']
         );
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
     }
 
     public function testConstructMethod()
     {
-        $data = [];
-        $attribute = ['customer_id', 'status'];
+        $attribute = ['customer_id', 'store_id', 'status'];
         $customerId = 25;
-        $layout = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getBlock']);
+        $storeId = 4;
+        $layout = $this->createPartialMock(Layout::class, ['getBlock']);
         $this->context->expects($this->once())
             ->method('getLayout')
             ->will($this->returnValue($layout));
@@ -64,14 +80,20 @@ public function testConstructMethod()
             ->method('getVisibleOnFrontStatuses')
             ->will($this->returnValue($statuses));
 
-        $orderCollection = $this->createPartialMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class, [
-                'addAttributeToSelect',
-                'addFieldToFilter',
-                'addAttributeToFilter',
-                'addAttributeToSort',
-                'setPageSize',
-                'load'
-            ]);
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $storeMock = $this->getMockBuilder(StoreInterface::class)->getMockForAbstractClass();
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
+
+        $orderCollection = $this->createPartialMock(Collection::class, [
+            'addAttributeToSelect',
+            'addFieldToFilter',
+            'addAttributeToFilter',
+            'addAttributeToSort',
+            'setPageSize',
+            'load'
+        ]);
         $this->orderCollectionFactory->expects($this->once())
             ->method('create')
             ->will($this->returnValue($orderCollection));
@@ -85,17 +107,21 @@ public function testConstructMethod()
             ->willReturnSelf();
         $orderCollection->expects($this->at(2))
             ->method('addAttributeToFilter')
-            ->with($attribute[1], $this->equalTo(['in' => $statuses]))
-            ->will($this->returnSelf());
+            ->with($attribute[1], $this->equalTo($storeId))
+            ->willReturnSelf();
         $orderCollection->expects($this->at(3))
+            ->method('addAttributeToFilter')
+            ->with($attribute[2], $this->equalTo(['in' => $statuses]))
+            ->will($this->returnSelf());
+        $orderCollection->expects($this->at(4))
             ->method('addAttributeToSort')
             ->with('created_at', 'desc')
             ->will($this->returnSelf());
-        $orderCollection->expects($this->at(4))
+        $orderCollection->expects($this->at(5))
             ->method('setPageSize')
             ->with('5')
             ->will($this->returnSelf());
-        $orderCollection->expects($this->at(5))
+        $orderCollection->expects($this->at(6))
             ->method('load')
             ->will($this->returnSelf());
         $this->block = new \Magento\Sales\Block\Order\Recent(
@@ -103,7 +129,8 @@ public function testConstructMethod()
             $this->orderCollectionFactory,
             $this->customerSession,
             $this->orderConfig,
-            $data
+            [],
+            $this->storeManagerMock
         );
         $this->assertEquals($orderCollection, $this->block->getOrders());
     }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php
new file mode 100644
index 0000000000000..91b139772fb32
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * 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;
+use Magento\Sales\Block\Order\Totals;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Total;
+
+class TotalsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Block\Order\Totals
+     */
+    protected $block;
+
+    /**
+     * @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $context;
+
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
+        $this->block = new Totals($this->context, new Registry);
+        $this->block->setOrder($this->createMock(Order::class));
+    }
+
+    public function testApplySortOrder()
+    {
+        $this->block->addTotal(new Total(['code' => 'one']), 'last');
+        $this->block->addTotal(new Total(['code' => 'two']), 'last');
+        $this->block->addTotal(new Total(['code' => 'three']), 'last');
+        $this->block->applySortOrder(
+            [
+                'one' => 10,
+                'two' => 30,
+                'three' => 20,
+            ]
+        );
+        $this->assertEqualsSorted(
+            [
+                'one' => new Total(['code' => 'one']),
+                'three' => new Total(['code' => 'three']),
+                'two' => new Total(['code' => 'two']),
+            ],
+            $this->block->getTotals()
+        );
+    }
+
+    /**
+     * @param array $expected
+     * @param array $actual
+     */
+    private function assertEqualsSorted(array $expected, array $actual)
+    {
+        $this->assertEquals($expected, $actual, 'Array contents should be equal.');
+        $this->assertEquals(array_keys($expected), array_keys($actual), 'Array sort order should be equal.');
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php
index c6f1be2a88540..910164f029f1c 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php
@@ -73,6 +73,9 @@ class EmailTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultRedirectMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -98,7 +101,10 @@ protected function setUp()
             \Magento\Framework\ObjectManager\ObjectManager::class,
             ['create']
         );
-        $this->messageManager = $this->createPartialMock(\Magento\Framework\Message\Manager::class, ['addSuccess']);
+        $this->messageManager = $this->createPartialMock(
+            \Magento\Framework\Message\Manager::class,
+            ['addSuccessMessage']
+        );
         $this->session = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
         $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']);
         $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
@@ -128,6 +134,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testEmail
+     */
     public function testEmail()
     {
         $cmId = 10000031;
@@ -147,7 +156,7 @@ public function testEmail()
             ->method('notify')
             ->willReturn(true);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You sent the message.');
 
         $this->assertInstanceOf(
@@ -157,6 +166,9 @@ public function testEmail()
         $this->assertEquals($this->response, $this->creditmemoEmail->getResponse());
     }
 
+    /**
+     * testEmailNoCreditmemoId
+     */
     public function testEmailNoCreditmemoId()
     {
         $this->request->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php
index f71d98f94a82a..8407cc251db93 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php
@@ -89,6 +89,9 @@ class EmailTest extends \PHPUnit\Framework\TestCase
      */
     protected $invoiceManagement;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -153,6 +156,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testEmail
+     */
     public function testEmail()
     {
         $invoiceId = 10000031;
@@ -196,7 +202,7 @@ public function testEmail()
             ->with($invoiceId)
             ->willReturn(true);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You sent the message.');
 
         $this->resultRedirectFactory->expects($this->atLeastOnce())
@@ -209,6 +215,9 @@ public function testEmail()
         $this->assertInstanceOf(\Magento\Backend\Model\View\Result\Redirect::class, $this->invoiceEmail->execute());
     }
 
+    /**
+     * testEmailNoInvoiceId
+     */
     public function testEmailNoInvoiceId()
     {
         $this->request->expects($this->once())
@@ -226,6 +235,9 @@ public function testEmailNoInvoiceId()
         $this->assertInstanceOf(\Magento\Backend\Model\View\Result\Forward::class, $this->invoiceEmail->execute());
     }
 
+    /**
+     * testEmailNoInvoice
+     */
     public function testEmailNoInvoice()
     {
         $invoiceId = 10000031;
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php
new file mode 100644
index 0000000000000..3a4157df5c76f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
+
+class AddCommentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Controller\Adminhtml\Order\AddComment
+     */
+    private $addCommentController;
+
+    /**
+     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectMock;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\Sales\Api\OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Status\History|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statusHistoryCommentMock;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * Test setup
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->orderRepositoryMock = $this->createMock(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $this->orderMock = $this->createMock(\Magento\Sales\Model\Order::class);
+        $this->resultRedirectFactoryMock = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
+        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
+        $this->authorizationMock = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
+        $this->statusHistoryCommentMock = $this->createMock(\Magento\Sales\Model\Order\Status\History::class);
+        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+
+        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
+
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->addCommentController = $objectManagerHelper->getObject(
+            \Magento\Sales\Controller\Adminhtml\Order\AddComment::class,
+            [
+                'context' => $this->contextMock,
+                'orderRepository' => $this->orderRepositoryMock,
+                '_authorization' => $this->authorizationMock,
+                '_objectManager' => $this->objectManagerMock
+            ]
+        );
+    }
+
+    /**
+     * @param array $historyData
+     * @param bool $userHasResource
+     * @param bool $expectedNotify
+     *
+     * @dataProvider executeWillNotifyCustomerDataProvider
+     */
+    public function testExecuteWillNotifyCustomer(array $historyData, bool $userHasResource, bool $expectedNotify)
+    {
+        $orderId = 30;
+        $this->requestMock->expects($this->once())->method('getParam')->with('order_id')->willReturn($orderId);
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('get')
+            ->willReturn($this->orderMock);
+        $this->requestMock->expects($this->once())->method('getPost')->with('history')->willReturn($historyData);
+        $this->authorizationMock->expects($this->any())->method('isAllowed')->willReturn($userHasResource);
+        $this->orderMock->expects($this->once())
+            ->method('addStatusHistoryComment')
+            ->willReturn($this->statusHistoryCommentMock);
+        $this->statusHistoryCommentMock->expects($this->once())->method('setIsCustomerNotified')->with($expectedNotify);
+        $this->objectManagerMock->expects($this->once())->method('create')->willReturn(
+            $this->createMock(\Magento\Sales\Model\Order\Email\Sender\OrderCommentSender::class)
+        );
+
+        $this->addCommentController->execute();
+    }
+
+    /**
+     * @return array
+     */
+    public function executeWillNotifyCustomerDataProvider()
+    {
+        return [
+            'User Has Access - Notify True' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => true,
+                    'status' => 'Processing'
+                ],
+                'userHasResource' => true,
+                'expectedNotify' => true
+            ],
+            'User Has Access - Notify False' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => false,
+                    'status' => 'Processing'
+                ],
+                'userHasResource' => true,
+                'expectedNotify' => false
+            ],
+            'User Has Access - Notify Unset' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'status' => 'Processing'
+                ],
+                'userHasResource' => true,
+                'expectedNotify' => false
+            ],
+            'User No Access - Notify True' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => true,
+                    'status' => 'Processing'
+                ],
+                'userHasResource' => false,
+                'expectedNotify' => false
+            ],
+            'User No Access - Notify False' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => false,
+                    'status' => 'Processing'
+                ],
+                'userHasResource' => false,
+                'expectedNotify' => false
+            ],
+            'User No Access - Notify Unset' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'status' => 'Processing'
+                ],
+                'userHasResource' => false,
+                'expectedNotify' => false
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php
index 363f78e738f12..a368bf779398f 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php
@@ -61,6 +61,9 @@ class CancelTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -77,7 +80,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
         $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
@@ -108,6 +111,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecuteNotPost
+     */
     public function testExecuteNotPost()
     {
         $this->validatorMock->expects($this->once())
@@ -117,7 +123,7 @@ public function testExecuteNotPost()
             ->method('isPost')
             ->willReturn(false);
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('You have not canceled the item.');
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php
index 2b6436395a0cf..3e22867ce1f65 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php
@@ -63,6 +63,9 @@ class ProcessDataTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultForwardFactory;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -226,7 +229,11 @@ public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCoup
         );
         $this->escaper->expects($this->once())->method('escapeHtml')->with($couponCode)->willReturn($couponCode);
 
-        $this->messageManager->expects($this->once())->method('addError')->with($errorMessageManager)->willReturnSelf();
+        $this->messageManager
+            ->expects($this->once())
+            ->method('addErrorMessage')
+            ->with($errorMessageManager)
+            ->willReturnSelf();
 
         $this->resultForward->expects($this->once())
             ->method('forward')
@@ -235,11 +242,14 @@ public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCoup
         $this->assertInstanceOf(\Magento\Backend\Model\View\Result\Forward::class, $this->processData->execute());
     }
 
+    /**
+     * @return array
+     */
     public function isApplyDiscountDataProvider()
     {
         return [
             [true, '123', '"%1" coupon code was not applied. Do not apply discount is selected for item(s)', null],
-            [false, '123', '"%1" coupon code is not valid.', '132'],
+            [false, '123', 'The "%1" coupon code isn\'t valid. Verify the code and try again.', '132'],
         ];
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
index 1fdd9759f5045..b11d73de736d4 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
@@ -108,6 +108,9 @@ class ReorderTest extends \PHPUnit\Framework\TestCase
      */
     private $orderId;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->orderId = 111;
@@ -118,7 +121,9 @@ protected function setUp()
             ->getMock();
         $this->requestMock = $this->getMockBuilder(RequestInterface::class)->getMockForAbstractClass();
         $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)->getMockForAbstractClass();
-        $this->resultForwardFactoryMock = $this->getMockBuilder(ForwardFactory::class)->getMock();
+        $this->resultForwardFactoryMock = $this->getMockBuilder(ForwardFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->resultRedirectFactoryMock = $this->getMockBuilder(RedirectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -159,6 +164,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteForward()
     {
         $this->clearStorage();
@@ -169,6 +177,9 @@ public function testExecuteForward()
         $this->assertInstanceOf(Forward::class, $this->reorder->execute());
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteRedirectOrderGrid()
     {
         $this->clearStorage();
@@ -181,6 +192,9 @@ public function testExecuteRedirectOrderGrid()
         $this->assertInstanceOf(Redirect::class, $this->reorder->execute());
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteRedirectBack()
     {
         $this->clearStorage();
@@ -195,6 +209,9 @@ public function testExecuteRedirectBack()
         $this->assertInstanceOf(Redirect::class, $this->reorder->execute());
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteRedirectNewOrder()
     {
         $this->clearStorage();
@@ -209,6 +226,9 @@ public function testExecuteRedirectNewOrder()
         $this->assertInstanceOf(Redirect::class, $this->reorder->execute());
     }
 
+    /**
+     * @return void
+     */
     private function clearStorage()
     {
         $this->objectManagerMock->expects($this->at(0))
@@ -218,6 +238,9 @@ private function clearStorage()
         $this->quoteSessionMock->expects($this->once())->method('clearStorage')->will($this->returnSelf());
     }
 
+    /**
+     * @return void
+     */
     private function getOrder()
     {
         $this->requestMock->expects($this->once())
@@ -235,20 +258,26 @@ private function getOrder()
      */
     private function canReorder($result)
     {
-        $entity_id = 1;
-        $this->orderMock->expects($this->once())->method('getEntityId')->willReturn($entity_id);
+        $entityId = 1;
+        $this->orderMock->expects($this->once())->method('getEntityId')->willReturn($entityId);
         $this->reorderHelperMock->expects($this->once())
             ->method('canReorder')
-            ->with($entity_id)
+            ->with($entityId)
             ->willReturn($result);
     }
 
+    /**
+     * @return void
+     */
     private function prepareForward()
     {
         $this->resultForwardFactoryMock->expects($this->once())->method('create')->willReturn($this->resultForwardMock);
         $this->resultForwardMock->expects($this->once())->method('forward')->with('noroute')->willReturnSelf();
     }
 
+    /**
+     * @return void
+     */
     private function createRedirect()
     {
         $this->resultRedirectFactoryMock->expects($this->once())
@@ -284,6 +313,9 @@ private function getUnavailableProducts(array $unavailableProducts)
             ->willReturn($unavailableProducts);
     }
 
+    /**
+     * @return void
+     */
     private function initFromOrder()
     {
         $this->orderMock->expects($this->once())->method('setReordered')->with(true)->willReturnSelf();
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
index 29ae1b94704dc..dce080ad03591 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Creditmemo;
 
 /**
@@ -215,7 +216,7 @@ public function testExecuteException()
      */
     public function testExecuteNoComment()
     {
-        $message = 'Please enter a comment.';
+        $message = 'The comment is missing. Enter and try again.';
         $response = ['error' => true, 'message' => $message];
         $data = [];
 
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php
index af218903a3868..3e9e6af0b4181 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php
@@ -292,7 +292,7 @@ public function testExecute()
             ->method('cancel')
             ->with($creditmemoId);
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The credit memo has been canceled.');
         $this->resultRedirectFactoryMock->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
index 881af16f5fe69..11ccdd87a5664 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
@@ -81,6 +81,9 @@ class PrintActionTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultForwardMock;
 
+    /**
+     * test setup
+     */
     protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
@@ -155,7 +158,8 @@ public function testExecute()
         $creditmemoId = 2;
         $date = '2015-01-19_13-03-45';
         $fileName = 'creditmemo2015-01-19_13-03-45.pdf';
-        $fileContents = 'pdf0123456789';
+        $pdfContent = 'pdf0123456789';
+        $fileData = ['type' => 'string', 'value' => $pdfContent, 'rm' => true];
         $this->prepareTestExecute($creditmemoId);
 
         $this->objectManagerMock->expects($this->any())
@@ -184,12 +188,12 @@ public function testExecute()
             ->willReturn($date);
         $this->pdfMock->expects($this->once())
             ->method('render')
-            ->willReturn($fileContents);
+            ->willReturn($pdfContent);
         $this->fileFactoryMock->expects($this->once())
             ->method('create')
             ->with(
                 $fileName,
-                $fileContents,
+                $fileData,
                 \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR,
                 'application/pdf'
             )
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
index 490203563bb36..4ad2e314c8317 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -203,10 +203,10 @@ public function testSaveActionWithNegativeCreditmemo()
 
         $creditmemoMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Creditmemo::class,
-            ['load', 'getGrandTotal', 'getAllowZeroGrandTotal', '__wakeup']
+            ['load', 'getGrandTotal', 'isAllowZeroGrandTotal', '__wakeup']
         );
         $creditmemoMock->expects($this->once())->method('getGrandTotal')->will($this->returnValue('0'));
-        $creditmemoMock->expects($this->once())->method('getAllowZeroGrandTotal')->will($this->returnValue(false));
+        $creditmemoMock->expects($this->once())->method('isAllowZeroGrandTotal')->will($this->returnValue(false));
         $this->memoLoaderMock->expects(
             $this->once()
         )->method(
@@ -235,7 +235,7 @@ public function testSaveActionWithNegativeCreditmemo()
      */
     protected function _setSaveActionExpectationForMageCoreException($data, $errorMessage)
     {
-        $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($errorMessage));
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($this->equalTo($errorMessage));
         $this->_sessionMock->expects($this->once())->method('setFormData')->with($this->equalTo($data));
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php
index 7e0163002b437..04adb63bc88ac 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php
@@ -335,7 +335,7 @@ public function testExecute()
             ->method('getInvoice')
             ->willReturn($invoiceMock);
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You voided the credit memo.');
         $this->resultRedirectFactoryMock->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php
index 3c87b558bb1c9..e9a0e573e3f9a 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php
@@ -87,6 +87,9 @@ class EmailTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -119,7 +122,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
 
         $this->orderMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderInterface::class)
@@ -152,6 +155,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testEmail
+     */
     public function testEmail()
     {
         $orderId = 10000031;
@@ -171,7 +177,7 @@ public function testEmail()
             ->with($orderId)
             ->willReturn(true);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You sent the order email.');
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
@@ -185,6 +191,9 @@ public function testEmail()
         $this->assertEquals($this->response, $this->orderEmail->getResponse());
     }
 
+    /**
+     * testEmailNoOrderId
+     */
     public function testEmailNoOrderId()
     {
         $this->request->expects($this->once())
@@ -195,10 +204,12 @@ public function testEmailNoOrderId()
             ->method('get')
             ->with(null)
             ->willThrowException(
-                new \Magento\Framework\Exception\NoSuchEntityException(__('Requested entity doesn\'t exist'))
+                new \Magento\Framework\Exception\NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                )
             );
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('This order no longer exists.');
 
         $this->actionFlag->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php
index 68ce75781db78..30e25605f0b94 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php
@@ -61,6 +61,9 @@ class HoldTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -77,7 +80,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
         $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
@@ -108,6 +111,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecuteNotPost
+     */
     public function testExecuteNotPost()
     {
         $this->validatorMock->expects($this->once())
@@ -117,7 +123,7 @@ public function testExecuteNotPost()
             ->method('isPost')
             ->willReturn(false);
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('You have not put the order on hold.');
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php
index 83b897656d185..667b6775384cf 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php
@@ -213,7 +213,7 @@ public function testExecute()
             ->method('save');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You canceled the invoice.');
 
         $this->invoiceRepository->expects($this->once())
@@ -295,7 +295,7 @@ public function testExecuteModelException()
             ->will($this->throwException($e));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($message);
 
         $invoiceMock->expects($this->once())
@@ -343,7 +343,7 @@ public function testExecuteException()
             ->will($this->throwException($e));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($message);
 
         $invoiceMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
index 0fabc24dd4421..fd53d91b9d9ea 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
@@ -223,7 +223,7 @@ public function testExecute()
             ->method('save');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The invoice has been captured.');
 
         $invoiceMock->expects($this->once())
@@ -304,7 +304,7 @@ public function testExecuteModelException()
             ->getMock();
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($message);
 
         $invoiceMock->expects($this->once())
@@ -355,7 +355,7 @@ public function testExecuteException()
             ->getMock();
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($message);
 
         $invoiceMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php
index 6bd02f0c16317..17dc3f42a2fe2 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Backend\App\Action;
@@ -121,8 +122,8 @@ public function testExecuteNotValidPost()
             ->method('isPost')
             ->willReturn(false);
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('We can\'t save the invoice right now.');
+            ->method('addErrorMessage')
+            ->with("The invoice can't be saved at this time. Please try again later.");
         $redirectMock->expects($this->once())
             ->method('setPath')
             ->with('sales/order/index')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php
index d7766d79e9c30..0fbff061650f8 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php
@@ -250,7 +250,7 @@ public function testExecute()
             ->will($this->returnValue($transactionMock));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The invoice has been voided.');
 
         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
@@ -283,9 +283,9 @@ public function testExecuteNoInvoice()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $resultForward = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Forward::class)
             ->disableOriginalConstructor()
@@ -334,7 +334,7 @@ public function testExecuteModelException()
             ->willReturn($invoiceMock);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError');
+            ->method('addErrorMessage');
 
         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php
deleted file mode 100644
index 569a210d993f0..0000000000000
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
-
-use Magento\Framework\App\Action\Context;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * Class MassCancelTest
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class MassCancelTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Sales\Controller\Adminhtml\Order\MassCancel
-     */
-    protected $massAction;
-
-    /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contextMock;
-
-    /**
-     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectMock;
-
-    /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $requestMock;
-
-    /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $responseMock;
-
-    /**
-     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageManagerMock;
-
-    /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectManagerMock;
-
-    /**
-     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionMock;
-
-    /**
-     * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $actionFlagMock;
-
-    /**
-     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $helperMock;
-
-    /**
-     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderMock;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderCollectionMock;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderCollectionFactoryMock;
-
-    /**
-     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filterMock;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
-        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
-        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
-
-        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
-
-        $this->orderCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $resourceCollection = \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class;
-        $this->orderCollectionFactoryMock = $this->getMockBuilder($resourceCollection)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->sessionMock = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
-        $this->actionFlagMock = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get', 'set']);
-        $this->helperMock = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
-        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
-        $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
-
-        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $resultFactoryMock->expects($this->any())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
-            ->willReturn($redirectMock);
-
-        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
-        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
-        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
-        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
-        $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
-        $this->contextMock->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlagMock);
-        $this->contextMock->expects($this->once())->method('getHelper')->willReturn($this->helperMock);
-        $this->contextMock->expects($this->once())
-            ->method('getResultRedirectFactory')
-            ->willReturn($resultRedirectFactory);
-        $this->contextMock->expects($this->any())
-            ->method('getResultFactory')
-            ->willReturn($resultFactoryMock);
-        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->orderCollectionMock)
-            ->willReturn($this->orderCollectionMock);
-        $this->orderCollectionFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->orderCollectionMock);
-        $this->massAction = $objectManagerHelper->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\MassCancel::class,
-            [
-                'context' => $this->contextMock,
-                'filter' => $this->filterMock,
-                'collectionFactory' => $this->orderCollectionFactoryMock
-            ]
-        );
-    }
-
-    /**
-     * Test for selected orders
-     * Two orders, only $order1 can be canceled
-     */
-    public function testExecuteCanCancelOneOrder()
-    {
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orders = [$order1, $order2];
-        $countOrders = count($orders);
-
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn($orders);
-
-        $order1->expects($this->once())
-            ->method('canCancel')
-            ->willReturn(true);
-        $order1->expects($this->once())
-            ->method('cancel');
-        $order1->expects($this->once())
-            ->method('save');
-
-        $this->orderCollectionMock->expects($this->once())
-            ->method('count')
-            ->willReturn($countOrders);
-
-        $order2->expects($this->once())
-            ->method('canCancel')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('1 order(s) cannot be canceled.');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with('We canceled 1 order(s).');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sales/*/')
-            ->willReturnSelf();
-
-        $this->massAction->execute();
-    }
-
-    /**
-     * Test for excluded orders
-     * Two orders could't be canceled
-     */
-    public function testExcludedCannotCancelOrders()
-    {
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orders = [$order1, $order2];
-        $countOrders = count($orders);
-
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn([$order1, $order2]);
-
-        $order1->expects($this->once())
-            ->method('canCancel')
-            ->willReturn(false);
-
-        $this->orderCollectionMock->expects($this->once())
-            ->method('count')
-            ->willReturn($countOrders);
-
-        $order2->expects($this->once())
-            ->method('canCancel')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('You cannot cancel the order(s).');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sales/*/')
-            ->willReturnSelf();
-
-        $this->massAction->execute();
-    }
-
-    /**
-     * Order throws exception while canceling
-     */
-    public function testException()
-    {
-        $exception = new \Exception('Can not cancel');
-
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn([$order1]);
-
-        $order1->expects($this->once())
-            ->method('canCancel')
-            ->willReturn(true);
-        $order1->expects($this->once())
-            ->method('cancel')
-            ->willThrowException($exception);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('Can not cancel');
-
-        $this->massAction->execute();
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php
deleted file mode 100644
index 02ff208445596..0000000000000
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
-
-use Magento\Framework\App\Action\Context;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * Class MassHoldTest
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class MassHoldTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Sales\Controller\Adminhtml\Order\MassHold
-     */
-    protected $massAction;
-
-    /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contextMock;
-
-    /**
-     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectMock;
-
-    /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $requestMock;
-
-    /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $responseMock;
-
-    /**
-     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageManagerMock;
-
-    /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectManagerMock;
-
-    /**
-     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionMock;
-
-    /**
-     * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $actionFlagMock;
-
-    /**
-     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $helperMock;
-
-    /**
-     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderMock;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderCollectionMock;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderCollectionFactoryMock;
-
-    /**
-     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filterMock;
-
-    /**
-     * @var \Magento\Sales\Api\OrderManagementInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderManagementMock;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->orderManagementMock = $this->getMockBuilder(\Magento\Sales\Api\OrderManagementInterface::class)
-            ->getMockForAbstractClass();
-        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
-        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()->getMock();
-        $this->objectManagerMock = $this->createPartialMock(
-            \Magento\Framework\ObjectManager\ObjectManager::class,
-            ['create']
-        );
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
-        $this->orderCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderCollection = \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class;
-        $this->orderCollectionFactoryMock = $this->getMockBuilder($orderCollection)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $resultFactoryMock->expects($this->any())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
-            ->willReturn($redirectMock);
-
-        $this->sessionMock = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
-        $this->actionFlagMock = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get', 'set']);
-        $this->helperMock = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
-        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
-        $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
-
-        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
-        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
-        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
-        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
-        $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
-        $this->contextMock->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlagMock);
-        $this->contextMock->expects($this->once())->method('getHelper')->willReturn($this->helperMock);
-        $this->contextMock
-            ->expects($this->once())
-            ->method('getResultRedirectFactory')
-            ->willReturn($resultRedirectFactory);
-        $this->contextMock->expects($this->any())
-            ->method('getResultFactory')
-            ->willReturn($resultFactoryMock);
-
-        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->orderCollectionMock)
-            ->willReturn($this->orderCollectionMock);
-        $this->orderCollectionFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->orderCollectionMock);
-
-        $this->massAction = $objectManagerHelper->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\MassHold::class,
-            [
-                'context' => $this->contextMock,
-                'filter' => $this->filterMock,
-                'collectionFactory' => $this->orderCollectionFactoryMock,
-                'orderManagement' => $this->orderManagementMock
-            ]
-        );
-    }
-
-    public function testExecuteOneOrderPutOnHold()
-    {
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orders = [$order1, $order2];
-        $countOrders = count($orders);
-
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn($orders);
-
-        $order1->expects($this->once())
-            ->method('canHold')
-            ->willReturn(true);
-        $this->orderManagementMock->expects($this->once())
-            ->method('hold');
-        $this->orderCollectionMock->expects($this->once())
-            ->method('count')
-            ->willReturn($countOrders);
-
-        $order2->expects($this->once())
-            ->method('canHold')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('1 order(s) were not put on hold.');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with('You have put 1 order(s) on hold.');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sales/*/')
-            ->willReturnSelf();
-
-        $this->massAction->execute();
-    }
-
-    public function testExecuteNoOrdersPutOnHold()
-    {
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orders = [$order1, $order2];
-        $countOrders = count($orders);
-
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn($orders);
-
-        $order1->expects($this->once())
-            ->method('canHold')
-            ->willReturn(false);
-
-        $this->orderCollectionMock->expects($this->once())
-            ->method('count')
-            ->willReturn($countOrders);
-
-        $order2->expects($this->once())
-            ->method('canHold')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('No order(s) were put on hold.');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sales/*/')
-            ->willReturnSelf();
-
-        $this->massAction->execute();
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php
deleted file mode 100644
index 7003d445e1b50..0000000000000
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
-
-use Magento\Framework\App\Action\Context;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * Class MassHoldTest
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class MassUnholdTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Sales\Controller\Adminhtml\Order\MassUnhold
-     */
-    protected $massAction;
-
-    /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contextMock;
-
-    /**
-     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectMock;
-
-    /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $requestMock;
-
-    /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $responseMock;
-
-    /**
-     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageManagerMock;
-
-    /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectManagerMock;
-
-    /**
-     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionMock;
-
-    /**
-     * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $actionFlagMock;
-
-    /**
-     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $helperMock;
-
-    /**
-     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderMock;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderCollectionMock;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderCollectionFactoryMock;
-
-    /**
-     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filterMock;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
-        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()->getMock();
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
-
-        $this->orderCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderCollection = \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class;
-        $this->orderCollectionFactoryMock = $this->getMockBuilder($orderCollection)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->sessionMock = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']);
-        $this->actionFlagMock = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get', 'set']);
-        $this->helperMock = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
-        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
-        $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
-
-        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $resultFactoryMock->expects($this->any())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
-            ->willReturn($redirectMock);
-
-        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
-        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
-        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
-        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
-        $this->contextMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
-        $this->contextMock->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlagMock);
-        $this->contextMock->expects($this->once())->method('getHelper')->willReturn($this->helperMock);
-        $this->contextMock
-            ->expects($this->once())
-            ->method('getResultRedirectFactory')
-            ->willReturn($resultRedirectFactory);
-        $this->contextMock->expects($this->any())
-            ->method('getResultFactory')
-            ->willReturn($resultFactoryMock);
-
-        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->orderCollectionMock)
-            ->willReturn($this->orderCollectionMock);
-        $this->orderCollectionFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->orderCollectionMock);
-
-        $this->massAction = $objectManagerHelper->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\MassUnhold::class,
-            [
-                'context' => $this->contextMock,
-                'filter' => $this->filterMock,
-                'collectionFactory' => $this->orderCollectionFactoryMock
-            ]
-        );
-    }
-
-    public function testExecuteOneOrdersReleasedFromHold()
-    {
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orders = [$order1, $order2];
-
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn($orders);
-
-        $order1->expects($this->once())
-            ->method('canUnhold')
-            ->willReturn(true);
-        $order1->expects($this->once())
-            ->method('unhold');
-        $order1->expects($this->once())
-            ->method('save');
-
-        $this->orderCollectionMock->expects($this->once())
-            ->method('count')
-            ->willReturn(count($orders));
-
-        $order2->expects($this->once())
-            ->method('canUnhold')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('1 order(s) were not released from on hold status.');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with('1 order(s) have been released from on hold status.');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sales/*/')
-            ->willReturnSelf();
-
-        $this->massAction->execute();
-    }
-
-    public function testExecuteNoReleasedOrderFromHold()
-    {
-        $order1 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order2 = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orders = [$order1, $order2];
-
-        $this->orderCollectionMock->expects($this->any())
-            ->method('getItems')
-            ->willReturn($orders);
-
-        $order1->expects($this->once())
-            ->method('canUnhold')
-            ->willReturn(false);
-
-        $this->orderCollectionMock->expects($this->once())
-            ->method('count')
-            ->willReturn(count($orders));
-
-        $order2->expects($this->once())
-            ->method('canUnhold')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with('No order(s) were released from on hold status.');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sales/*/')
-            ->willReturnSelf();
-
-        $this->massAction->execute();
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php
index 27bbbd4eb0043..452bde7023f9d 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php
@@ -51,6 +51,9 @@ class ReviewPaymentTest extends \PHPUnit\Framework\TestCase
      */
     protected $loggerMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $this->contextMock = $this->createPartialMock(\Magento\Backend\App\Action\Context::class, [
@@ -75,7 +78,7 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->messageManagerMock = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
 
         $this->resultRedirectFactoryMock = $this->createPartialMock(
@@ -112,6 +115,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecuteUpdateAction
+     */
     public function testExecuteUpdateAction()
     {
         $orderId = 30;
@@ -137,7 +143,7 @@ public function testExecuteUpdateAction()
         $this->paymentMock->expects($this->once())->method('update');
         $this->paymentMock->expects($this->any())->method('getIsTransactionApproved')->willReturn(true);
 
-        $this->messageManagerMock->expects($this->once())->method('addSuccess');
+        $this->messageManagerMock->expects($this->once())->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php
index 7720b7615c3fa..cc4720f1c6b44 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php
@@ -61,6 +61,9 @@ class UnholdTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -77,7 +80,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
         $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
@@ -108,6 +111,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecuteNotPost
+     */
     public function testExecuteNotPost()
     {
         $this->validatorMock->expects($this->once())
@@ -117,7 +123,7 @@ public function testExecuteNotPost()
             ->method('isPost')
             ->willReturn(false);
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Can\'t unhold order.');
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php
index 9677ade99c6eb..7d39aca35d2c1 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
 
 /**
@@ -97,6 +98,9 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderRepositoryMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $this->orderManagementMock = $this->getMockBuilder(\Magento\Sales\Api\OrderManagementInterface::class)
@@ -218,7 +222,9 @@ public function testExecuteNoOrder()
             ->method('get')
             ->with($orderIdParam)
             ->willThrowException(
-                new \Magento\Framework\Exception\NoSuchEntityException(__('Requested entity doesn\'t exist'))
+                new \Magento\Framework\Exception\NoSuchEntityException(
+                    __("The entity that was requested doesn't exist. Verify the entity and try again.")
+                )
             );
         $this->initOrderFail();
         $this->prepareRedirect();
@@ -248,7 +254,7 @@ public function testGlobalException()
             ->method('critical')
             ->with($exception);
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Exception occurred during order load')
             ->willReturnSelf();
         $this->setPath('sales/order/index');
@@ -259,6 +265,9 @@ public function testGlobalException()
         );
     }
 
+    /**
+     * initOrder
+     */
     protected function initOrder()
     {
         $orderIdParam = 111;
@@ -286,10 +295,13 @@ protected function initOrderSuccess()
             );
     }
 
+    /**
+     * initOrderFail
+     */
     protected function initOrderFail()
     {
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('This order no longer exists.')
             ->willReturnSelf();
         $this->actionFlagMock->expects($this->once())
@@ -297,6 +309,9 @@ protected function initOrderFail()
             ->with('', \Magento\Sales\Controller\Adminhtml\Order::FLAG_NO_DISPATCH, true);
     }
 
+    /**
+     * initAction
+     */
     protected function initAction()
     {
         $this->resultPageFactoryMock->expects($this->once())
@@ -315,6 +330,9 @@ protected function initAction()
             ->willReturnSelf();
     }
 
+    /**
+     * prepareRedirect
+     */
     protected function prepareRedirect()
     {
         $this->resultRedirectFactoryMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php
index 0841e239429a5..bb9662b7e02d8 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php
@@ -40,13 +40,16 @@ class PdfDocumentsMassActionTest extends \PHPUnit\Framework\TestCase
      */
     private $filterMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
 
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
 
         $this->orderCollectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
@@ -80,6 +83,9 @@ protected function setUp()
             );
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testExecute()
     {
         $exception = new \Exception();
@@ -88,7 +94,7 @@ public function testExecute()
             ->method('getCollection')
             ->with($this->orderCollectionMock)
             ->willThrowException($exception);
-        $this->messageManager->expects($this->once())->method('addError');
+        $this->messageManager->expects($this->once())->method('addErrorMessage');
 
         $this->resultRedirect->expects($this->once())->method('setPath')->willReturnSelf();
         $this->controller->execute($exception);
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php
index 19cbec9d1a06b..d0d7e7efa97f7 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php
@@ -216,6 +216,9 @@ public function testExecute($itemOptionValues, $productOptionValues, $noRouteOcc
         $this->objectMock->execute();
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php b/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php
index fd20e0cb7d94a..e424cae85f223 100644
--- a/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php
@@ -70,6 +70,9 @@ public function testExecute($lifetimes, $additionalFilterFields)
         $this->observer->execute();
     }
 
+    /**
+     * @return array
+     */
     public function cleanExpiredQuotesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php b/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php
index 0802bafd5ac34..17b3fdde47456 100644
--- a/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php
@@ -48,11 +48,21 @@ class LastOrderedItemsTest extends \PHPUnit\Framework\TestCase
      */
     private $orderMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRepositoryMock;
+
     /**
      * @var \Magento\Sales\CustomerData\LastOrderedItems
      */
     private $section;
 
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -74,64 +84,102 @@ protected function setUp()
         $this->orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
+            ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->getMockForAbstractClass();
+
         $this->section = new \Magento\Sales\CustomerData\LastOrderedItems(
             $this->orderCollectionFactoryMock,
             $this->orderConfigMock,
             $this->customerSessionMock,
             $this->stockRegistryMock,
-            $this->storeManagerMock
+            $this->storeManagerMock,
+            $this->productRepositoryMock,
+            $this->loggerMock
         );
     }
 
     public function testGetSectionData()
     {
+        $storeId = 1;
         $websiteId = 4;
-        $expectedItem = [
+        $expectedItem1 = [
             'id' => 1,
-            'name' => 'Product Name',
+            'name' => 'Product Name 1',
             'url' => 'http://example.com',
             'is_saleable' => true,
         ];
-        $productId = 10;
+        $expectedItem2 = [
+            'id' => 2,
+            'name' => 'Product Name 2',
+            'url' => null,
+            'is_saleable' => true,
+        ];
+        $productIdVisible = 1;
+        $productIdNotVisible = 2;
         $stockItemMock = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
             ->getMockForAbstractClass();
-        $itemWithProductMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
+        $itemWithVisibleProduct = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $itemWithoutProductMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
+        $itemWithNotVisibleProduct = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+        $productVisible = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $items = [$itemWithoutProductMock, $itemWithProductMock];
+        $productNotVisible = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $items = [$itemWithVisibleProduct, $itemWithNotVisibleProduct];
         $this->getLastOrderMock();
         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
         $storeMock->expects($this->any())->method('getWebsiteId')->willReturn($websiteId);
+        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
         $this->orderMock->expects($this->once())
             ->method('getParentItemsRandomCollection')
             ->with(\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT)
             ->willReturn($items);
-        $itemWithProductMock->expects($this->once())->method('hasData')->with('product')->willReturn(true);
-        $itemWithProductMock->expects($this->any())->method('getProduct')->willReturn($productMock);
-        $productMock->expects($this->once())->method('getWebsiteIds')->willReturn([1, 4]);
-        $itemWithProductMock->expects($this->once())->method('getId')->willReturn($expectedItem['id']);
-        $itemWithProductMock->expects($this->once())->method('getName')->willReturn($expectedItem['name']);
-        $productMock->expects($this->once())->method('getProductUrl')->willReturn($expectedItem['url']);
-        $this->stockRegistryMock->expects($this->once())->method('getStockItem')->willReturn($stockItemMock);
-        $productMock->expects($this->once())->method('getId')->willReturn($productId);
-        $itemWithProductMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $productVisible->expects($this->once())->method('isVisibleInSiteVisibility')->willReturn(true);
+        $productVisible->expects($this->once())->method('getProductUrl')->willReturn($expectedItem1['url']);
+        $productVisible->expects($this->once())->method('getWebsiteIds')->willReturn([1, 4]);
+        $productVisible->expects($this->once())->method('getId')->willReturn($productIdVisible);
+        $productNotVisible->expects($this->once())->method('isVisibleInSiteVisibility')->willReturn(false);
+        $productNotVisible->expects($this->never())->method('getProductUrl');
+        $productNotVisible->expects($this->once())->method('getWebsiteIds')->willReturn([1, 4]);
+        $productNotVisible->expects($this->once())->method('getId')->willReturn($productIdNotVisible);
+        $itemWithVisibleProduct->expects($this->once())->method('getProductId')->willReturn($productIdVisible);
+        $itemWithVisibleProduct->expects($this->once())->method('getProduct')->willReturn($productVisible);
+        $itemWithVisibleProduct->expects($this->once())->method('getId')->willReturn($expectedItem1['id']);
+        $itemWithVisibleProduct->expects($this->once())->method('getName')->willReturn($expectedItem1['name']);
+        $itemWithVisibleProduct->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $itemWithNotVisibleProduct->expects($this->once())->method('getProductId')->willReturn($productIdNotVisible);
+        $itemWithNotVisibleProduct->expects($this->once())->method('getProduct')->willReturn($productNotVisible);
+        $itemWithNotVisibleProduct->expects($this->once())->method('getId')->willReturn($expectedItem2['id']);
+        $itemWithNotVisibleProduct->expects($this->once())->method('getName')->willReturn($expectedItem2['name']);
+        $itemWithNotVisibleProduct->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->willReturnMap([
+                [$productIdVisible, false, $storeId, false, $productVisible],
+                [$productIdNotVisible, false, $storeId, false, $productNotVisible],
+            ]);
         $this->stockRegistryMock
-            ->expects($this->once())
+            ->expects($this->any())
             ->method('getStockItem')
-            ->with($productId, $websiteId)
-            ->willReturn($stockItemMock);
-        $stockItemMock->expects($this->once())->method('getIsInStock')->willReturn($expectedItem['is_saleable']);
-        $itemWithoutProductMock->expects($this->once())->method('hasData')->with('product')->willReturn(false);
-        $this->assertEquals(['items' => [$expectedItem]], $this->section->getSectionData());
+            ->willReturnMap([
+                [$productIdVisible, $websiteId, $stockItemMock],
+                [$productIdNotVisible, $websiteId, $stockItemMock],
+            ]);
+        $stockItemMock->expects($this->exactly(2))->method('getIsInStock')->willReturn($expectedItem1['is_saleable']);
+        $this->assertEquals(['items' => [$expectedItem1, $expectedItem2]], $this->section->getSectionData());
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getLastOrderMock()
     {
         $customerId = 1;
@@ -160,4 +208,34 @@ private function getLastOrderMock()
             ->willReturnSelf();
         return $this->orderMock;
     }
+
+    public function testGetSectionDataWithNotExistingProduct()
+    {
+        $storeId = 1;
+        $websiteId = 4;
+        $productId = 1;
+        $exception = new \Magento\Framework\Exception\NoSuchEntityException(__("Product doesn't exist"));
+        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProductId'])
+            ->getMock();
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
+
+        $this->getLastOrderMock();
+        $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+        $this->orderMock->expects($this->once())
+            ->method('getParentItemsRandomCollection')
+            ->with(\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT)
+            ->willReturn([$orderItemMock]);
+        $orderItemMock->expects($this->once())->method('getProductId')->willReturn($productId);
+        $this->productRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->with($productId, false, $storeId)
+            ->willThrowException($exception);
+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
+
+        $this->assertEquals(['items' => []], $this->section->getSectionData());
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php b/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php
index 180cfca0bc3cb..389064b7274a7 100644
--- a/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php
@@ -198,6 +198,9 @@ public function testDisplayPriceAttribute(
         );
     }
 
+    /**
+     * @return array
+     */
     public function displayPricesDataProvider()
     {
         return [
@@ -310,6 +313,9 @@ public function testApplySalableProductTypesFilter($itemKey, $type, $calledTimes
         $this->adminHelper->applySalableProductTypesFilter($collectionMock);
     }
 
+    /**
+     * @return array
+     */
     public function applySalableProductTypesFilterDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
index 3bdbacadad230..91da34c2b8b26 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
@@ -6,8 +6,27 @@
 
 namespace Magento\Sales\Test\Unit\Model\AdminOrder;
 
+use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Customer\Model\Customer\Mapper;
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\Updater;
+use Magento\Sales\Model\AdminOrder\Create;
 use Magento\Sales\Model\AdminOrder\Product;
+use Magento\Quote\Model\QuoteFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,170 +36,97 @@ class CreateTest extends \PHPUnit\Framework\TestCase
 {
     const CUSTOMER_ID = 1;
 
-    /** @var \Magento\Sales\Model\AdminOrder\Create */
-    protected $adminOrderCreate;
-
-    /** @var \Magento\Backend\Model\Session\Quote|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sessionQuoteMock;
-
-    /** @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $formFactoryMock;
-
-    /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerFactoryMock;
-
-    /** @var \Magento\Quote\Model\Quote\Item\Updater|\PHPUnit_Framework_MockObject_MockObject */
-    protected $itemUpdater;
-
-    /** @var \Magento\Customer\Model\Customer\Mapper|\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerMapper;
-
     /**
-     * @var Product\Quote\Initializer|\PHPUnit_Framework_MockObject_MockObject
+     * @var Create
      */
-    protected $quoteInitializerMock;
+    private $adminOrderCreate;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerRepositoryMock;
+    private $quoteRepository;
 
     /**
-     * @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var QuoteFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $addressRepositoryMock;
+    private $quoteFactory;
 
     /**
-     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var SessionQuote|MockObject
      */
-    protected $addressFactoryMock;
+    private $sessionQuote;
 
     /**
-     * @var \Magento\Customer\Api\GroupRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var FormFactory|MockObject
      */
-    protected $groupRepositoryMock;
+    private $formFactory;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerInterfaceFactory|MockObject
      */
-    protected $scopeConfigMock;
+    private $customerFactory;
 
     /**
-     * @var \Magento\Sales\Model\AdminOrder\EmailSender|\PHPUnit_Framework_MockObject_MockObject
+     * @var Updater|MockObject
      */
-    protected $emailSenderMock;
+    private $itemUpdater;
 
     /**
-     * @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Mapper|MockObject
      */
-    protected $accountManagementMock;
+    private $customerMapper;
 
     /**
-     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var GroupRepositoryInterface|MockObject
      */
-    protected $dataObjectHelper;
+    private $groupRepository;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var DataObjectHelper|MockObject
      */
-    protected $objectFactory;
+    private $dataObjectHelper;
 
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
     protected function setUp()
     {
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $registryMock = $this->createMock(\Magento\Framework\Registry::class);
-        $configMock = $this->createMock(\Magento\Sales\Model\Config::class);
-        $this->sessionQuoteMock = $this->createMock(\Magento\Backend\Model\Session\Quote::class);
-        $loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $copyMock = $this->createMock(\Magento\Framework\DataObject\Copy::class);
-        $messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
-        $this->formFactoryMock = $this->createPartialMock(
-            \Magento\Customer\Model\Metadata\FormFactory::class,
-            ['create']
-        );
-        $this->customerFactoryMock = $this->createPartialMock(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
-            ['create']
-        );
+        $this->formFactory = $this->createPartialMock(FormFactory::class, ['create']);
+        $this->quoteFactory = $this->createPartialMock(QuoteFactory::class, ['create']);
+        $this->customerFactory = $this->createPartialMock(CustomerInterfaceFactory::class, ['create']);
 
-        $this->itemUpdater = $this->createMock(\Magento\Quote\Model\Quote\Item\Updater::class);
+        $this->itemUpdater = $this->createMock(Updater::class);
 
-        $this->objectFactory = $this->getMockBuilder(\Magento\Framework\DataObject\Factory::class)
+        $this->quoteRepository = $this->getMockBuilder(CartRepositoryInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->setMethods(['getForCustomer'])
+            ->getMockForAbstractClass();
+
+        $this->sessionQuote = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuote', 'getStoreId', 'getCustomerId'])
             ->getMock();
 
-        $this->customerMapper = $this->getMockBuilder(
-            \Magento\Customer\Model\Customer\Mapper::class
-        )->setMethods(['toFlatArray'])->disableOriginalConstructor()->getMock();
+        $this->customerMapper = $this->getMockBuilder(Mapper::class)
+            ->setMethods(['toFlatArray'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->quoteInitializerMock = $this->createMock(
-            \Magento\Sales\Model\AdminOrder\Product\Quote\Initializer::class
-        );
-        $this->customerRepositoryMock = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\CustomerRepositoryInterface::class,
-            [],
-            '',
-            false
-        );
-        $this->addressRepositoryMock = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\AddressRepositoryInterface::class,
-            [],
-            '',
-            false
-        );
-        $this->addressFactoryMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
-        $this->groupRepositoryMock = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\GroupRepositoryInterface::class,
-            [],
-            '',
-            false
-        );
-        $this->scopeConfigMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class,
-            [],
-            '',
-            false
-        );
-        $this->emailSenderMock = $this->createMock(\Magento\Sales\Model\AdminOrder\EmailSender::class);
-        $this->accountManagementMock = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\AccountManagementInterface::class,
-            [],
-            '',
-            false
-        );
-        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+        $this->groupRepository = $this->getMockForAbstractClass(GroupRepositoryInterface::class);
+        $this->dataObjectHelper = $this->getMockBuilder(DataObjectHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->adminOrderCreate = $objectManagerHelper->getObject(
-            \Magento\Sales\Model\AdminOrder\Create::class,
+            Create::class,
             [
-                'objectManager' => $objectManagerMock,
-                'eventManager' => $eventManagerMock,
-                'coreRegistry' => $registryMock,
-                'salesConfig' => $configMock,
-                'quoteSession' => $this->sessionQuoteMock,
-                'logger' => $loggerMock,
-                'objectCopyService' => $copyMock,
-                'messageManager' => $messageManagerMock,
-                'quoteInitializer' => $this->quoteInitializerMock,
-                'customerRepository' => $this->customerRepositoryMock,
-                'addressRepository' => $this->addressRepositoryMock,
-                'addressFactory' => $this->addressFactoryMock,
-                'metadataFormFactory' => $this->formFactoryMock,
-                'customerFactory' => $this->customerFactoryMock,
-                'groupRepository' => $this->groupRepositoryMock,
+                'quoteSession' => $this->sessionQuote,
+                'metadataFormFactory' => $this->formFactory,
+                'customerFactory' => $this->customerFactory,
+                'groupRepository' => $this->groupRepository,
                 'quoteItemUpdater' => $this->itemUpdater,
                 'customerMapper' => $this->customerMapper,
-                'objectFactory' => $this->objectFactory,
-                'accountManagement' => $this->accountManagementMock,
                 'dataObjectHelper' => $this->dataObjectHelper,
+                'quoteRepository' => $this->quoteRepository,
+                'quoteFactory' => $this->quoteFactory,
             ]
         );
     }
@@ -194,65 +140,60 @@ public function testSetAccountData()
         ];
         $attributeMocks = [];
 
-        foreach ($attributes as $attribute) {
-            $attributeMock = $this->createMock(\Magento\Customer\Api\Data\AttributeMetadataInterface::class);
-
-            $attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attribute[0]));
+        foreach ($attributes as $value) {
+            $attribute = $this->createMock(AttributeMetadataInterface::class);
+            $attribute->method('getAttributeCode')
+                ->willReturn($value[0]);
 
-            $attributeMocks[] = $attributeMock;
+            $attributeMocks[] = $attribute;
         }
 
-        $customerGroupMock = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\GroupInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getTaxClassId']
-        );
-        $customerGroupMock->expects($this->once())->method('getTaxClassId')->will($this->returnValue($taxClassId));
-        $customerFormMock = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
-        $customerFormMock->expects($this->any())
-            ->method('getAttributes')
-            ->will($this->returnValue([$attributeMocks[1]]));
-        $customerFormMock->expects($this->any())->method('extractData')->will($this->returnValue([]));
-        $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue(['group_id' => 1]));
-
-        $customerFormMock->expects($this->any())
-            ->method('prepareRequest')
-            ->will($this->returnValue($this->createMock(\Magento\Framework\App\RequestInterface::class)));
-
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $this->customerMapper->expects($this->atLeastOnce())
+        $customerGroup = $this->getMockForAbstractClass(GroupInterface::class);
+        $customerGroup->method('getTaxClassId')
+            ->willReturn($taxClassId);
+        $customerForm = $this->createMock(Form::class);
+        $customerForm->method('getAttributes')
+            ->willReturn([$attributeMocks[1]]);
+        $customerForm
+            ->method('extractData')
+            ->willReturn([]);
+        $customerForm
+            ->method('restoreData')
+            ->willReturn(['group_id' => 1]);
+
+        $customerForm->method('prepareRequest')
+            ->willReturn($this->createMock(RequestInterface::class));
+
+        $customer = $this->createMock(CustomerInterface::class);
+        $this->customerMapper->expects(self::atLeastOnce())
             ->method('toFlatArray')
             ->willReturn(['group_id' => 1]);
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $quoteMock->expects($this->any())->method('getCustomer')->will($this->returnValue($customerMock));
-        $quoteMock->expects($this->once())
-            ->method('addData')
-            ->with(
-                [
-                    'customer_group_id' => $attributes[1][1],
-                    'customer_tax_class_id' => $taxClassId
-                ]
-            );
-        $this->dataObjectHelper->expects($this->once())
-            ->method('populateWithArray')
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getCustomer')->willReturn($customer);
+        $quote->method('addData')->with(
+            [
+                'customer_group_id' => $attributes[1][1],
+                'customer_tax_class_id' => $taxClassId
+            ]
+        );
+        $this->dataObjectHelper->method('populateWithArray')
             ->with(
-                $customerMock,
+                $customer,
                 ['group_id' => 1],
-                \Magento\Customer\Api\Data\CustomerInterface::class
+                CustomerInterface::class
             );
 
-        $this->formFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerFormMock));
-        $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
-        $this->customerFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerMock));
+        $this->formFactory->method('create')
+            ->willReturn($customerForm);
+        $this->sessionQuote
+            ->method('getQuote')
+            ->willReturn($quote);
+        $this->customerFactory->method('create')
+            ->willReturn($customer);
 
-        $this->groupRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->will($this->returnValue($customerGroupMock));
+        $this->groupRepository->method('getById')
+            ->willReturn($customerGroup);
 
         $this->adminOrderCreate->setAccountData(['group_id' => 1]);
     }
@@ -260,7 +201,7 @@ public function testSetAccountData()
     public function testUpdateQuoteItemsNotArray()
     {
         $object = $this->adminOrderCreate->updateQuoteItems('string');
-        $this->assertEquals($this->adminOrderCreate, $object);
+        self::assertEquals($this->adminOrderCreate, $object);
     }
 
     public function testUpdateQuoteItemsEmptyConfiguredOption()
@@ -273,22 +214,21 @@ public function testUpdateQuoteItemsEmptyConfiguredOption()
             ]
         ];
 
-        $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+        $item = $this->createMock(Item::class);
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $quoteMock->expects($this->once())
-            ->method('getItemById')
-            ->will($this->returnValue($itemMock));
+        $quote = $this->createMock(Quote::class);
+        $quote->method('getItemById')
+            ->willReturn($item);
 
-        $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
-        $this->itemUpdater->expects($this->once())
-            ->method('update')
-            ->with($this->equalTo($itemMock), $this->equalTo($items[1]))
-            ->will($this->returnSelf());
+        $this->sessionQuote->method('getQuote')
+            ->willReturn($quote);
+        $this->itemUpdater->method('update')
+            ->with(self::equalTo($item), self::equalTo($items[1]))
+            ->willReturnSelf();
 
         $this->adminOrderCreate->setRecollect(false);
         $object = $this->adminOrderCreate->updateQuoteItems($items);
-        $this->assertEquals($this->adminOrderCreate, $object);
+        self::assertEquals($this->adminOrderCreate, $object);
     }
 
     public function testUpdateQuoteItemsWithConfiguredOption()
@@ -302,49 +242,74 @@ public function testUpdateQuoteItemsWithConfiguredOption()
             ]
         ];
 
-        $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $itemMock->expects($this->once())
-            ->method('getQty')
-            ->will($this->returnValue($qty));
+        $item = $this->createMock(Item::class);
+        $item->method('getQty')
+            ->willReturn($qty);
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $quoteMock->expects($this->once())
-            ->method('updateItem')
-            ->will($this->returnValue($itemMock));
+        $quote = $this->createMock(Quote::class);
+        $quote->method('updateItem')
+            ->willReturn($item);
 
-        $this->sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quoteMock));
+        $this->sessionQuote
+            ->method('getQuote')
+            ->willReturn($quote);
 
         $expectedInfo = $items[1];
         $expectedInfo['qty'] = $qty;
-        $this->itemUpdater->expects($this->once())
-            ->method('update')
-            ->with($this->equalTo($itemMock), $this->equalTo($expectedInfo));
+        $this->itemUpdater->method('update')
+            ->with(self::equalTo($item), self::equalTo($expectedInfo));
 
         $this->adminOrderCreate->setRecollect(false);
         $object = $this->adminOrderCreate->updateQuoteItems($items);
-        $this->assertEquals($this->adminOrderCreate, $object);
+        self::assertEquals($this->adminOrderCreate, $object);
     }
 
     public function testApplyCoupon()
     {
-        $couponCode = '';
-        $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['getShippingAddress', 'setCouponCode']
-        );
-        $this->sessionQuoteMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
+        $couponCode = '123';
+        $quote = $this->createPartialMock(Quote::class, ['getShippingAddress', 'setCouponCode']);
+        $this->sessionQuote->method('getQuote')
+            ->willReturn($quote);
+
+        $address = $this->createPartialMock(Address::class, ['setCollectShippingRates', 'setFreeShipping']);
+        $quote->method('getShippingAddress')
+            ->willReturn($address);
+        $quote->method('setCouponCode')
+            ->with($couponCode)
+            ->willReturnSelf();
+
+        $address->method('setCollectShippingRates')
+            ->with(true)
+            ->willReturnSelf();
+        $address->method('setFreeShipping')
+            ->with(0)
+            ->willReturnSelf();
 
-        $addressMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address::class,
-            ['setCollectShippingRates', 'setFreeShipping']
-        );
-        $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($addressMock);
-        $quoteMock->expects($this->once())->method('setCouponCode')->with($couponCode)->willReturnSelf();
+        $object = $this->adminOrderCreate->applyCoupon($couponCode);
+        self::assertEquals($this->adminOrderCreate, $object);
+    }
 
-        $addressMock->expects($this->once())->method('setCollectShippingRates')->with(true)->willReturnSelf();
-        $addressMock->expects($this->once())->method('setFreeShipping')->with(0)->willReturnSelf();
+    public function testGetCustomerCart()
+    {
+        $storeId = 2;
+        $customerId = 2;
+        $cartResult = [
+            'cart' => true,
+        ];
 
-        $object = $this->adminOrderCreate->applyCoupon($couponCode);
-        $this->assertEquals($this->adminOrderCreate, $object);
+        $this->quoteFactory->expects($this->once())
+            ->method('create');
+        $this->sessionQuote->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $this->sessionQuote->expects($this->once())
+            ->method('getCustomerId')
+            ->willReturn($customerId);
+        $this->quoteRepository->expects($this->once())
+            ->method('getForCustomer')
+            ->with($customerId, [$storeId])
+            ->willReturn($cartResult);
+
+        $this->assertEquals($cartResult, $this->adminOrderCreate->getCustomerCart());
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php
index ccc0bfe309f0c..37f0f754c7074 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php
@@ -34,6 +34,9 @@ class EmailSenderTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderSenderMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
@@ -44,6 +47,9 @@ protected function setUp()
         $this->emailSender = new EmailSender($this->messageManagerMock, $this->loggerMock, $this->orderSenderMock);
     }
 
+    /**
+     * testSendSuccess
+     */
     public function testSendSuccess()
     {
         $this->orderSenderMock->expects($this->once())
@@ -51,13 +57,16 @@ public function testSendSuccess()
         $this->assertTrue($this->emailSender->send($this->orderMock));
     }
 
+    /**
+     * testSendFailure
+     */
     public function testSendFailure()
     {
         $this->orderSenderMock->expects($this->once())
             ->method('send')
             ->willThrowException(new \Magento\Framework\Exception\MailException(__('test message')));
         $this->messageManagerMock->expects($this->once())
-            ->method('addWarning');
+            ->method('addWarningMessage');
         $this->loggerMock->expects($this->once())
             ->method('critical');
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
index 269ce829e64d3..6844b908ea98d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
@@ -26,6 +26,11 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderCollectionMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderManagementMock;
+
     /**
      * @var ObjectManager
      */
@@ -44,10 +49,12 @@ protected function setUp()
             ['create']
         );
         $this->orderCollectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
+        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
 
         $this->model = new CleanExpiredOrders(
             $this->storesConfigMock,
-            $this->collectionFactoryMock
+            $this->collectionFactoryMock,
+            $this->orderManagementMock
         );
     }
 
@@ -64,8 +71,11 @@ public function testExecute()
         $this->collectionFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->orderCollectionMock);
+        $this->orderCollectionMock->expects($this->exactly(2))
+            ->method('getAllIds')
+            ->willReturn([1, 2]);
         $this->orderCollectionMock->expects($this->exactly(4))->method('addFieldToFilter');
-        $this->orderCollectionMock->expects($this->exactly(4))->method('walk');
+        $this->orderManagementMock->expects($this->exactly(4))->method('cancel');
 
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $selectMock->expects($this->exactly(2))->method('where')->willReturnSelf();
@@ -92,14 +102,18 @@ public function testExecuteWithException()
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->orderCollectionMock);
+        $this->orderCollectionMock->expects($this->once())
+            ->method('getAllIds')
+            ->willReturn([1]);
         $this->orderCollectionMock->expects($this->exactly(2))->method('addFieldToFilter');
+        $this->orderManagementMock->expects($this->once())->method('cancel');
 
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $selectMock->expects($this->once())->method('where')->willReturnSelf();
         $this->orderCollectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
 
-        $this->orderCollectionMock->expects($this->once())
-            ->method('walk')
+        $this->orderManagementMock->expects($this->once())
+            ->method('cancel')
             ->willThrowException(new \Exception($exceptionMessage));
 
         $this->model->execute();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/DownloadTest.php b/app/code/Magento/Sales/Test/Unit/Model/DownloadTest.php
deleted file mode 100644
index dd430f8a03304..0000000000000
--- a/app/code/Magento/Sales/Test/Unit/Model/DownloadTest.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Test\Unit\Model;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-
-class DownloadTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Sales\Model\Download
-     */
-    protected $model;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filesystemMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storageMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storageFactoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $httpFileFactoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $writeDirectoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $driverMock;
-
-    protected function setUp()
-    {
-        $this->writeDirectoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Write::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->filesystemMock->expects($this->any())
-            ->method('getDirectoryWrite')
-            ->with(DirectoryList::MEDIA)
-            ->will($this->returnValue($this->writeDirectoryMock));
-
-        $this->driverMock = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\DriverInterface::class);
-        $this->storageMock = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storageFactoryMock = $this->getMockBuilder(
-            \Magento\MediaStorage\Model\File\Storage\DatabaseFactory::class
-        )->disableOriginalConstructor()
-            ->setMethods(['create', 'checkDbUsage'])
-            ->getMock();
-        $this->httpFileFactoryMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->model = new \Magento\Sales\Model\Download(
-            $this->filesystemMock,
-            $this->storageMock,
-            $this->storageFactoryMock,
-            $this->httpFileFactoryMock
-        );
-    }
-
-    public function testInstanceOf()
-    {
-        $model = new \Magento\Sales\Model\Download(
-            $this->filesystemMock,
-            $this->storageMock,
-            $this->storageFactoryMock,
-            $this->httpFileFactoryMock
-        );
-        $this->assertInstanceOf(\Magento\Sales\Model\Download::class, $model);
-    }
-
-    /**
-     * @param $realPatchCheck
-     * @param $isFile
-     * @param $isReadable
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @dataProvider dataProviderForTestDownloadFileException
-     */
-    public function testDownloadFileException($realPatchCheck, $isFile, $isReadable)
-    {
-        $info = ['order_path' => 'test/path', 'quote_path' => 'test/path2', 'title' => 'test title'];
-
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('getAbsolutePath')
-            ->will($this->returnArgument(0));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('getDriver')
-            ->willReturn($this->driverMock);
-        $this->driverMock->expects($this->any())->method('getRealPath')->willReturn($realPatchCheck);
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('isFile')
-            ->will($this->returnValue($isFile));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('isReadable')
-            ->will($this->returnValue($isReadable));
-
-        $this->storageFactoryMock->expects($this->any())
-            ->method('checkDbUsage')
-            ->will($this->returnValue(false));
-        $this->httpFileFactoryMock->expects($this->never())->method('create');
-
-        $this->model->downloadFile($info);
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderForTestDownloadFileException()
-    {
-        return [
-            [1, true, false],
-            [1, false, true],
-            [false, true, true],
-        ];
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     */
-    public function testDownloadFileNoStorage()
-    {
-        $info = ['order_path' => 'test/path', 'quote_path' => 'test/path2', 'title' => 'test title'];
-        $isFile = true;
-        $isReadable = false;
-
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('getAbsolutePath')
-            ->will($this->returnArgument(0));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('getDriver')
-            ->willReturn($this->driverMock);
-        $this->driverMock->expects($this->any())->method('getRealPath')->willReturn(true);
-
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('isFile')
-            ->will($this->returnValue($isFile));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('isReadable')
-            ->will($this->returnValue($isReadable));
-
-        $this->storageMock->expects($this->any())
-            ->method('checkDbUsage')
-            ->will($this->returnValue(true));
-
-        $storageDatabaseMock = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Storage\Database::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storageDatabaseMock->expects($this->at(0))
-            ->method('loadByFilename')
-            ->with($this->equalTo($info['order_path']))
-            ->will($this->returnSelf());
-        $storageDatabaseMock->expects($this->at(2))
-            ->method('loadByFilename')
-            ->with($this->equalTo($info['quote_path']))
-            ->will($this->returnSelf());
-
-        $storageDatabaseMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(false));
-
-        $this->storageFactoryMock->expects($this->any())
-            ->method('create')
-            ->will($this->returnValue($storageDatabaseMock));
-        $this->httpFileFactoryMock->expects($this->never())->method('create');
-
-        $this->model->downloadFile($info);
-    }
-
-    public function testDownloadFile()
-    {
-        $info = ['order_path' => 'test/path', 'quote_path' => 'test/path2', 'title' => 'test title'];
-        $isFile = true;
-        $isReadable = false;
-
-        $writeMock = $this->getMockBuilder(\Magento\Framework\Filesystem\File\Write::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $writeMock->expects($this->any())
-            ->method('lock');
-        $writeMock->expects($this->any())
-            ->method('write');
-        $writeMock->expects($this->any())
-            ->method('unlock');
-        $writeMock->expects($this->any())
-            ->method('close');
-
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('getAbsolutePath')
-            ->will($this->returnArgument(0));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('getDriver')
-            ->willReturn($this->driverMock);
-        $this->driverMock->expects($this->any())->method('getRealPath')->willReturn(true);
-
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('isFile')
-            ->will($this->returnValue($isFile));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('isReadable')
-            ->will($this->returnValue($isReadable));
-        $this->writeDirectoryMock->expects($this->any())
-            ->method('openFile')
-            ->will($this->returnValue($writeMock));
-        $this->writeDirectoryMock->expects($this->once())
-            ->method('getRelativePath')
-            ->with($info['order_path'])
-            ->will($this->returnArgument(0));
-
-        $this->storageMock->expects($this->any())
-            ->method('checkDbUsage')
-            ->will($this->returnValue(true));
-
-        $storageDatabaseMock = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Storage\Database::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['loadByFilename', 'getId', '__wakeup'])
-            ->getMock();
-        $storageDatabaseMock->expects($this->any())
-            ->method('loadByFilename')
-            ->will($this->returnSelf());
-
-        $storageDatabaseMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(true));
-
-        $this->storageFactoryMock->expects($this->any())
-            ->method('create')
-            ->will($this->returnValue($storageDatabaseMock));
-
-        $this->httpFileFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(
-                $info['title'],
-                ['value' => $info['order_path'], 'type' => 'filename'],
-                DirectoryList::MEDIA,
-                'application/octet-stream',
-                null
-            );
-
-        $result = $this->model->downloadFile($info);
-        $this->assertNull($result);
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php b/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
index 8d3aaa4dae616..e26b6e52b8d17 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
@@ -47,6 +47,16 @@ class EmailSenderHandlerTest extends \PHPUnit\Framework\TestCase
      */
     protected $globalConfig;
 
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Container\IdentityInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $identityContainerMock;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -70,18 +80,28 @@ protected function setUp()
             false,
             false,
             true,
-            ['addFieldToFilter', 'getItems']
+            ['addFieldToFilter', 'getItems', 'addAttributeToSelect', 'getSelect']
         );
 
         $this->globalConfig = $this->createMock(\Magento\Framework\App\Config::class);
 
+        $this->identityContainerMock = $this->createMock(
+            \Magento\Sales\Model\Order\Email\Container\IdentityInterface::class
+        );
+
+        $this->storeManagerMock = $this->createMock(
+            \Magento\Store\Model\StoreManagerInterface::class
+        );
+
         $this->object = $objectManager->getObject(
             \Magento\Sales\Model\EmailSenderHandler::class,
             [
-                'emailSender' => $this->emailSender,
-                'entityResource' => $this->entityResource,
-                'entityCollection' => $this->entityCollection,
-                'globalConfig' => $this->globalConfig
+                'emailSender'       => $this->emailSender,
+                'entityResource'    => $this->entityResource,
+                'entityCollection'  => $this->entityCollection,
+                'globalConfig'      => $this->globalConfig,
+                'identityContainer' => $this->identityContainerMock,
+                'storeManager'      => $this->storeManagerMock,
             ]
         );
     }
@@ -98,7 +118,7 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
         $path = 'sales_email/general/async_sending';
 
         $this->globalConfig
-            ->expects($this->once())
+            ->expects($this->at(0))
             ->method('getValue')
             ->with($path)
             ->willReturn($configValue);
@@ -114,12 +134,32 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
                 ->method('addFieldToFilter')
                 ->with('email_sent', ['null' => true]);
 
+            $this->entityCollection
+                ->expects($this->any())
+                ->method('addAttributeToSelect')
+                ->with('store_id')
+                ->willReturnSelf();
+
+            $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+
+            $selectMock
+                ->expects($this->atLeastOnce())
+                ->method('group')
+                ->with('store_id')
+                ->willReturnSelf();
+
+            $this->entityCollection
+                ->expects($this->any())
+                ->method('getSelect')
+                ->willReturn($selectMock);
+
             $this->entityCollection
                 ->expects($this->any())
                 ->method('getItems')
                 ->willReturn($collectionItems);
 
             if ($collectionItems) {
+
                 /** @var \Magento\Sales\Model\AbstractModel|\PHPUnit_Framework_MockObject_MockObject $collectionItem */
                 $collectionItem = $collectionItems[0];
 
@@ -129,6 +169,23 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
                     ->with($collectionItem, true)
                     ->willReturn($emailSendingResult);
 
+                $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+
+                $this->storeManagerMock
+                    ->expects($this->any())
+                    ->method('getStore')
+                    ->willReturn($storeMock);
+
+                $this->identityContainerMock
+                    ->expects($this->any())
+                    ->method('setStore')
+                    ->with($storeMock);
+
+                $this->identityContainerMock
+                    ->expects($this->any())
+                    ->method('isEnabled')
+                    ->willReturn(true);
+
                 if ($emailSendingResult) {
                     $collectionItem
                         ->expects($this->once())
@@ -159,14 +216,30 @@ public function executeDataProvider()
             false,
             false,
             true,
-            ['setEmailSent']
+            ['setEmailSent', 'getOrder']
         );
 
         return [
-            [1, [$entityModel], true],
-            [1, [$entityModel], false],
-            [1, [], null],
-            [0, null, null]
+            [
+                'configValue' => 1,
+                'collectionItems' => [clone $entityModel],
+                'emailSendingResult' => true,
+            ],
+            [
+                'configValue' => 1,
+                'collectionItems' => [clone $entityModel],
+                'emailSendingResult' => false,
+            ],
+            [
+                'configValue' => 1,
+                'collectionItems' => [],
+                'emailSendingResult' => null,
+            ],
+            [
+                'configValue' => 0,
+                'collectionItems' => null,
+                'emailSendingResult' => null,
+            ]
         ];
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php
index 014e0e28b49ee..02f855929d9d6 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php
@@ -428,6 +428,9 @@ public function testCouldNotInvoiceException()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
index 5309c2064c5a7..56e9a91a52aff 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
@@ -80,7 +80,7 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage ID required
+     * @expectedExceptionMessage An ID is needed. Set the ID and try again.
      */
     public function testGetNoId()
     {
@@ -89,7 +89,7 @@ public function testGetNoId()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested entity doesn't exist
+     * @expectedExceptionMessage The entity that was requested doesn't exist. Verify the entity and try again.
      */
     public function testGetEntityNoId()
     {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Address/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Address/ValidatorTest.php
index d83a3e34ec00a..e3a3367858bfd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Address/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Address/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Address;
 
 /**
@@ -125,7 +126,7 @@ public function providerAddressData()
                 'co.co.co',
                 'coco-shipping',
                 [
-                    'Street is a required field',
+                    '"Street" is required. Enter and try again.',
                     'Email has a wrong format',
                     'Address type doesn\'t match required options'
                 ]
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
index 87f4a9103be6f..33f1c2f8923af 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -176,7 +177,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Could not delete order address
+     * @expectedExceptionMessage The order address couldn't be deleted.
      */
     public function testDeleteWithException()
     {
@@ -233,7 +234,7 @@ public function testSave()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not save order address
+     * @expectedExceptionMessage The order address couldn't be saved.
      */
     public function testSaveWithException()
     {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressTest.php
index 73838379490fd..93eb56a07955c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressTest.php
@@ -78,6 +78,9 @@ public function testGetRegionCodeRegionIsSet()
         $this->assertEquals('region', $this->address->getRegionCode());
     }
 
+    /**
+     * @return array
+     */
     public function regionProvider()
     {
         return [ [1, null], [null, 1]];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
index f3a35e485c166..feee2816b2cd4 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
@@ -23,23 +23,53 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderStatusCollectionFactoryMock;
 
+    /**
+     * @var \Magento\Sales\Model\Order\StatusFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $statusFactoryMock;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Status
+     */
+    protected $orderStatusModel;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @return void
+     */
     protected function setUp()
     {
-        $orderStatusFactory = $this->createMock(\Magento\Sales\Model\Order\StatusFactory::class);
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->orderStatusModel = $objectManager->getObject(\Magento\Sales\Model\Order\Status::class, [
+            'storeManager' => $this->storeManagerMock,
+        ]);
+        $this->statusFactoryMock = $this->getMockBuilder(\Magento\Sales\Model\Order\StatusFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'create'])
+            ->getMock();
         $this->orderStatusCollectionFactoryMock = $this->createPartialMock(
             \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory::class,
             ['create']
         );
-        $this->salesConfig = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+        $this->salesConfig = $objectManager
             ->getObject(
                 \Magento\Sales\Model\Order\Config::class,
                 [
-                    'orderStatusFactory' => $orderStatusFactory,
+                    'orderStatusFactory' => $this->statusFactoryMock,
                     'orderStatusCollectionFactory' => $this->orderStatusCollectionFactoryMock
                 ]
             );
     }
 
+    /**
+     * @return void
+     */
     public function testGetInvisibleOnFrontStatuses()
     {
         $statuses = [
@@ -86,6 +116,9 @@ public function testGetInvisibleOnFrontStatuses()
         $this->assertSame($expectedResult, $result);
     }
 
+    /**
+     * @return void
+     */
     public function testGetStateLabelByStateAndStatus()
     {
         $statuses = [
@@ -147,6 +180,22 @@ public function testGetStatuses($state, $joinLabels, $collectionData, $expectedR
             ->method('joinStates')
             ->will($this->returnValue($collectionData));
 
+        $this->statusFactoryMock->method('create')
+            ->willReturnSelf();
+
+        $this->statusFactoryMock->method('load')
+            ->willReturn($this->orderStatusModel);
+
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $storeMock->method('getId')
+            ->willReturn(1);
+
+        $this->storeManagerMock->method('getStore')
+            ->with($this->anything())
+            ->willReturn($storeMock);
+
+        $this->orderStatusModel->setData('store_labels', [1 => 'Pending label']);
+
         $result = $this->salesConfig->getStateStatuses($state, $joinLabels);
         $this->assertSame($expectedResult, $result);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Comment/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Comment/ValidatorTest.php
index 97526ae544752..673523a70e53c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Comment/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Comment/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo\Comment;
 
 /**
@@ -82,7 +83,7 @@ public function providerCommentData()
                 ],
                 [
                     'parent_id' => 'Parent Creditmemo Id can not be empty',
-                    'comment' => 'Comment is a required field'
+                    'comment' => '"Comment" is required. Enter and try again.'
                 ]
             ]
         ];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/CommentRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/CommentRepositoryTest.php
new file mode 100644
index 0000000000000..649e8dc0600cf
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/CommentRepositoryTest.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Sales\Api\CreditmemoRepositoryInterface;
+use Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory;
+use Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterfaceFactory;
+use Magento\Sales\Model\Order\Creditmemo;
+use Magento\Sales\Model\Order\Creditmemo\Comment;
+use Magento\Sales\Model\Order\Creditmemo\CommentRepository;
+use Magento\Sales\Model\Order\Email\Sender\CreditmemoCommentSender;
+use Magento\Sales\Model\Spi\CreditmemoCommentResourceInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class CommentRepositoryTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CommentRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoCommentResourceInterface
+     */
+    private $commentResource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoCommentInterfaceFactory
+     */
+    private $commentFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoCommentSearchResultInterfaceFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var CommentRepository
+     */
+    private $commentRepository;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoCommentSender
+     */
+    private $creditmemoCommentSender;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoRepositoryInterface
+     */
+    private $creditmemoRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Creditmemo
+     */
+    private $creditmemoMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Comment
+     */
+    private $commentMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|LoggerInterface
+     */
+    private $loggerMock;
+
+    protected function setUp()
+    {
+        $this->commentResource = $this->getMockBuilder(CreditmemoCommentResourceInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentFactory = $this->getMockBuilder(CreditmemoCommentInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchResultFactory = $this->getMockBuilder(CreditmemoCommentSearchResultInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->creditmemoRepositoryMock = $this->getMockBuilder(CreditmemoRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->creditmemoCommentSender = $this->getMockBuilder(CreditmemoCommentSender::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
+
+        $this->creditmemoMock = $this->getMockBuilder(Creditmemo::class)->disableOriginalConstructor()->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)->disableOriginalConstructor()->getMock();
+
+        $this->commentRepository = new CommentRepository(
+            $this->commentResource,
+            $this->commentFactory,
+            $this->searchResultFactory,
+            $this->collectionProcessor,
+            $this->creditmemoCommentSender,
+            $this->creditmemoRepositoryMock,
+            $this->loggerMock
+        );
+    }
+
+    public function testSave()
+    {
+        $comment = "Comment text";
+        $creditmemoId = 123;
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willReturnSelf();
+        $this->commentMock->expects($this->once())
+            ->method('getIsCustomerNotified')
+            ->willReturn(1);
+        $this->commentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn($creditmemoId);
+        $this->commentMock->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+
+        $this->creditmemoRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($creditmemoId)
+            ->willReturn($this->creditmemoMock);
+        $this->creditmemoCommentSender->expects($this->once())
+            ->method('send')
+            ->with($this->creditmemoMock, true, $comment)
+            ->willReturn(true);
+        $this->commentRepository->save($this->commentMock);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+     * @expectedExceptionMessage Could not save the creditmemo comment.
+     */
+    public function testSaveWithException()
+    {
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willThrowException(
+                new \Magento\Framework\Exception\CouldNotSaveException(__('Could not save the creditmemo comment.'))
+            );
+
+         $this->commentRepository->save($this->commentMock);
+    }
+
+    public function testSaveSendCatchException()
+    {
+        $comment = "Comment text";
+        $creditmemoId = 123;
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willReturnSelf();
+        $this->commentMock->expects($this->once())
+            ->method('getIsCustomerNotified')
+            ->willReturn(1);
+        $this->commentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn($creditmemoId);
+        $this->commentMock->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+
+        $this->creditmemoRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($creditmemoId)
+            ->willReturn($this->creditmemoMock);
+        $this->creditmemoCommentSender->expects($this->once())
+            ->method('send')
+            ->willThrowException(new \Exception());
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
+
+        $this->commentRepository->save($this->commentMock);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php
index c911af3044e5d..24a64c37a5e13 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php
@@ -97,6 +97,9 @@ public function testValidateCreditMemoProductItems($orderItemId, $expectedResult
         $this->assertEquals($expectedResult, $this->createQuantityValidator->validate($this->entity));
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/RefundOperationTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/RefundOperationTest.php
index f917d69e69f79..9172a6f45bbcd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/RefundOperationTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/RefundOperationTest.php
@@ -364,6 +364,9 @@ public function baseAmountsDataProvider()
         ];
     }
 
+    /**
+     * @param $amounts
+     */
     private function setBaseAmounts($amounts)
     {
         foreach ($amounts as $amountName => $summands) {
@@ -403,6 +406,9 @@ private function registerItems()
             ->willReturn([$item1, $item2, $item3]);
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getCreditmemoItemMock()
     {
         return $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoItemInterface::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
index 2531a26321d67..8a45aa8c7958e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
@@ -48,7 +48,7 @@ protected function setUp()
             ]);
         $this->creditmemoMock = $this->createPartialMock(\Magento\Sales\Model\Order\Creditmemo::class, [
                 'setBaseCost', 'getAllItems', 'getOrder', 'getBaseShippingAmount', 'roundPrice',
-                'setDiscountAmount', 'setBaseDiscountAmount'
+                'setDiscountAmount', 'setBaseDiscountAmount', 'getBaseShippingInclTax', 'getBaseShippingTaxAmount'
             ]);
         $this->creditmemoItemMock = $this->createPartialMock(\Magento\Sales\Model\Order\Creditmemo\Item::class, [
                 'getHasChildren', 'getBaseCost', 'getQty', 'getOrderItem', 'setDiscountAmount',
@@ -74,7 +74,83 @@ public function testCollect()
         $this->orderMock->expects($this->once())
             ->method('getBaseShippingDiscountAmount')
             ->willReturn(1);
-        $this->orderMock->expects($this->exactly(2))
+        $this->orderMock->expects($this->exactly(3))
+            ->method('getBaseShippingAmount')
+            ->willReturn(1);
+        $this->orderMock->expects($this->once())
+            ->method('getShippingAmount')
+            ->willReturn(1);
+        $this->creditmemoMock->expects($this->once())
+            ->method('getAllItems')
+            ->willReturn([$this->creditmemoItemMock]);
+        $this->creditmemoItemMock->expects($this->atLeastOnce())
+            ->method('getOrderItem')
+            ->willReturn($this->orderItemMock);
+        $this->orderItemMock->expects($this->once())
+            ->method('isDummy')
+            ->willReturn(false);
+        $this->orderItemMock->expects($this->once())
+            ->method('getDiscountInvoiced')
+            ->willReturn(1);
+        $this->orderItemMock->expects($this->once())
+            ->method('getBaseDiscountInvoiced')
+            ->willReturn(1);
+        $this->orderItemMock->expects($this->once())
+            ->method('getQtyInvoiced')
+            ->willReturn(1);
+        $this->orderItemMock->expects($this->once())
+            ->method('getDiscountRefunded')
+            ->willReturn(1);
+        $this->orderItemMock->expects($this->once())
+            ->method('getQtyRefunded')
+            ->willReturn(0);
+        $this->creditmemoItemMock->expects($this->once())
+            ->method('isLast')
+            ->willReturn(false);
+        $this->creditmemoItemMock->expects($this->atLeastOnce())
+            ->method('getQty')
+            ->willReturn(1);
+        $this->creditmemoItemMock->expects($this->exactly(1))
+            ->method('setDiscountAmount')
+            ->willReturnSelf();
+        $this->creditmemoItemMock->expects($this->exactly(1))
+            ->method('setBaseDiscountAmount')
+            ->willReturnSelf();
+        $this->creditmemoMock->expects($this->exactly(2))
+            ->method('roundPrice')
+            ->willReturnMap(
+                [
+                    [1, 'regular', true, 1],
+                    [1, 'base', true, 1]
+                ]
+            );
+        $this->assertEquals($this->total, $this->total->collect($this->creditmemoMock));
+    }
+
+    public function testCollectNoBaseShippingAmount()
+    {
+        $this->creditmemoMock->expects($this->exactly(2))
+            ->method('setDiscountAmount')
+            ->willReturnSelf();
+        $this->creditmemoMock->expects($this->exactly(2))
+            ->method('setBaseDiscountAmount')
+            ->willReturnSelf();
+        $this->creditmemoMock->expects($this->once())
+            ->method('getOrder')
+            ->willReturn($this->orderMock);
+        $this->creditmemoMock->expects($this->once())
+            ->method('getBaseShippingAmount')
+            ->willReturn(0);
+        $this->creditmemoMock->expects($this->once())
+            ->method('getBaseShippingInclTax')
+            ->willReturn(1);
+        $this->creditmemoMock->expects($this->once())
+            ->method('getBaseShippingTaxAmount')
+            ->willReturn(0);
+        $this->orderMock->expects($this->once())
+            ->method('getBaseShippingDiscountAmount')
+            ->willReturn(1);
+        $this->orderMock->expects($this->exactly(3))
             ->method('getBaseShippingAmount')
             ->willReturn(1);
         $this->orderMock->expects($this->once())
@@ -193,4 +269,30 @@ public function testCollectZeroShipping()
             );
         $this->assertEquals($this->total, $this->total->collect($this->creditmemoMock));
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage You can not refund shipping if there is no shipping amount.
+     */
+    public function testCollectNonZeroShipping()
+    {
+        $this->creditmemoMock->expects($this->once())
+            ->method('setDiscountAmount')
+            ->willReturnSelf();
+        $this->creditmemoMock->expects($this->once())
+            ->method('setBaseDiscountAmount')
+            ->willReturnSelf();
+        $this->creditmemoMock->expects($this->once())
+            ->method('getOrder')
+            ->willReturn($this->orderMock);
+        $this->creditmemoMock->expects($this->once())
+            ->method('getBaseShippingAmount')
+            ->willReturn('10.0000');
+        $this->orderMock->expects($this->never())
+            ->method('getBaseShippingDiscountAmount');
+        $this->orderMock->expects($this->once())
+            ->method('getBaseShippingAmount')
+            ->willReturn('0.0000');
+        $this->assertEquals($this->total, $this->total->collect($this->creditmemoMock));
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
index 4bca669f089b7..565d51ff515a2 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
@@ -447,10 +447,10 @@ public function collectDataProvider()
                     ],
                 ],
                 'creditmemo_data' => [
-                    'grand_total' => 64.95,
-                    'base_grand_total' => 64.95,
-                    'tax_amount' => 4.95,
-                    'base_tax_amount' => 4.95,
+                    'grand_total' => 64.94,
+                    'base_grand_total' => 64.94,
+                    'tax_amount' => 4.94,
+                    'base_tax_amount' => 4.94,
                 ],
             ],
         ];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
index cb65b70b82718..dc18306942770 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
@@ -12,7 +12,6 @@
 use Magento\Sales\Api\Data\CreditmemoCommentInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Invoice;
-use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\CreditmemoItemCreationInterface;
 use Magento\Sales\Api\Data\CreditmemoCommentCreationInterface;
 use Magento\Framework\EntityManager\HydratorPool;
@@ -82,7 +81,7 @@ class CreditmemoDocumentFactoryTest extends \PHPUnit\Framework\TestCase
     private $commentCreationArgumentsMock;
 
     /**
-     * @var CreditmemoInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject
      */
     private $creditmemoMock;
 
@@ -121,7 +120,7 @@ public function setUp()
         $this->creditmemoItemCreationMock = $this->getMockBuilder(CreditmemoItemCreationInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->creditmemoMock = $this->getMockBuilder(CreditmemoInterface::class)
+        $this->creditmemoMock = $this->getMockBuilder(Order\Creditmemo::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->hydratorMock = $this->getMockBuilder(HydratorInterface::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoRepositoryTest.php
index c27a1b1a4e224..6a4db2e0cf715 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoRepositoryTest.php
@@ -81,7 +81,7 @@ public function testGet()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Id required
+     * @expectedExceptionMessage An ID is needed. Set the ID and try again.
      */
     public function testGetNoId()
     {
@@ -90,7 +90,7 @@ public function testGetNoId()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested entity doesn't exist
+     * @expectedExceptionMessage The entity that was requested doesn't exist. Verify the entity and try again.
      */
     public function testGetEntityNoId()
     {
@@ -167,7 +167,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Could not delete credit memo
+     * @expectedExceptionMessage The credit memo couldn't be deleted.
      */
     public function testDeleteWithException()
     {
@@ -216,7 +216,7 @@ public function testSave()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not save credit memo
+     * @expectedExceptionMessage The credit memo couldn't be saved.
      */
     public function testSaveWithException()
     {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
index b872a4ef9fba1..f299cd5accdb8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\CollectionFactory;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\Collection as ItemCollection;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Class CreditmemoTest
@@ -28,6 +29,11 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
      */
     protected $creditmemo;
 
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
     /**
      * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -36,6 +42,7 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->orderFactory = $this->createPartialMock(\Magento\Sales\Model\OrderFactory::class, ['create']);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->cmItemCollectionFactoryMock = $this->getMockBuilder(
@@ -62,6 +69,7 @@ protected function setUp()
             'commentCollectionFactory' => $this->createMock(
                 \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Comment\CollectionFactory::class
             ),
+            'scopeConfig' => $this->scopeConfigMock
         ];
         $this->creditmemo = $objectManagerHelper->getObject(
             \Magento\Sales\Model\Order\Creditmemo::class,
@@ -109,10 +117,27 @@ public function testIsValidGrandTotalGrandTotalEmpty()
     public function testIsValidGrandTotalGrandTotal()
     {
         $this->creditmemo->setGrandTotal(0);
-        $this->creditmemo->getAllowZeroGrandTotal(true);
+        $this->creditmemo->isAllowZeroGrandTotal(true);
         $this->assertFalse($this->creditmemo->isValidGrandTotal());
     }
 
+    /**
+     * Test for isAllowZeroGrandTotal method.
+     *
+     * @return void
+     */
+    public function testIsAllowZeroGrandTotal()
+    {
+        $isAllowed = 0;
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )->willReturn($isAllowed);
+        $this->assertEquals($isAllowed, $this->creditmemo->isAllowZeroGrandTotal());
+    }
+
     public function testIsValidGrandTotal()
     {
         $this->creditmemo->setGrandTotal(1);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php
deleted file mode 100644
index 2794860793ed6..0000000000000
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CustomerManagementTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Test\Unit\Model\Order;
-
-use Magento\Quote\Model\Quote\Address;
-use Magento\Sales\Api\Data\OrderAddressInterface;
-
-/**
- * Class BuilderTest
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class CustomerManagementTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectCopyService;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $accountManagement;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $addressFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderRepository;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $regionFactory;
-
-    /**
-     * @var \Magento\Sales\Model\Order\CustomerManagement
-     */
-    protected $service;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $quoteAddressFactory;
-
-    protected function setUp()
-    {
-        $this->objectCopyService = $this->createMock(\Magento\Framework\DataObject\Copy::class);
-        $this->accountManagement = $this->createMock(\Magento\Customer\Api\AccountManagementInterface::class);
-        $this->customerFactory = $this->createPartialMock(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
-            ['create']
-        );
-        $this->addressFactory = $this->createPartialMock(
-            \Magento\Customer\Api\Data\AddressInterfaceFactory::class,
-            ['create']
-        );
-        $this->regionFactory = $this->createPartialMock(
-            \Magento\Customer\Api\Data\RegionInterfaceFactory::class,
-            ['create']
-        );
-        $this->orderRepository = $this->createMock(\Magento\Sales\Api\OrderRepositoryInterface::class);
-        $this->quoteAddressFactory = $this->createMock(\Magento\Quote\Model\Quote\AddressFactory::class);
-
-        $this->service = new \Magento\Sales\Model\Order\CustomerManagement(
-            $this->objectCopyService,
-            $this->accountManagement,
-            $this->customerFactory,
-            $this->addressFactory,
-            $this->regionFactory,
-            $this->orderRepository,
-            $this->quoteAddressFactory
-        );
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\AlreadyExistsException
-     */
-    public function testCreateThrowsExceptionIfCustomerAlreadyExists()
-    {
-        $orderMock = $this->createMock(\Magento\Sales\Api\Data\OrderInterface::class);
-        $orderMock->expects($this->once())->method('getCustomerId')->will($this->returnValue('customer_id'));
-        $this->orderRepository->expects($this->once())->method('get')->with(1)->will($this->returnValue($orderMock));
-        $this->service->create(1);
-    }
-
-    public function testCreateCreatesCustomerBasedonGuestOrder()
-    {
-        $orderMock = $this->createMock(\Magento\Sales\Model\Order::class);
-        $orderMock->expects($this->once())->method('getCustomerId')->will($this->returnValue(null));
-        $orderMock->expects($this->any())->method('getBillingAddress')->will($this->returnValue('billing_address'));
-
-        $orderBillingAddress = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['getData']);
-        $orderBillingAddress->expects($this->once())
-            ->method('getAddressType')
-            ->willReturn(Address::ADDRESS_TYPE_BILLING);
-
-        $orderShippingAddress = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['getData']);
-        $orderShippingAddress->expects($this->once())
-            ->method('getAddressType')
-            ->willReturn(Address::ADDRESS_TYPE_SHIPPING);
-
-        $orderMock->expects($this->any())
-            ->method('getAddresses')
-            ->will($this->returnValue([$orderBillingAddress, $orderShippingAddress]));
-
-        $billingQuoteAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $billingQuoteAddress->expects($this->once())->method('load')->willReturn($billingQuoteAddress);
-        $billingQuoteAddress->expects($this->once())->method('getId')->willReturn(4);
-        $billingQuoteAddress->expects($this->once())->method('getData')->with('save_in_address_book')->willReturn(1);
-
-        $shippingQuoteAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $shippingQuoteAddress->expects($this->once())->method('load')->willReturn($shippingQuoteAddress);
-        $shippingQuoteAddress->expects($this->once())->method('getId')->willReturn(5);
-        $shippingQuoteAddress->expects($this->once())->method('getData')->with('save_in_address_book')->willReturn(1);
-        $this->quoteAddressFactory->expects($this->exactly(2))->method('create')
-            ->willReturnOnConsecutiveCalls($billingQuoteAddress, $shippingQuoteAddress);
-        $this->orderRepository->expects($this->once())->method('get')->with(1)->will($this->returnValue($orderMock));
-        $this->objectCopyService->expects($this->any())->method('copyFieldsetToTarget')->will($this->returnValueMap(
-            [
-                ['order_address', 'to_customer', 'billing_address', [], 'global', ['customer_data' => []]],
-                ['order_address', 'to_customer_address', $orderBillingAddress, [], 'global', 'address_data'],
-                ['order_address', 'to_customer_address', $orderShippingAddress, [], 'global', 'address_data'],
-            ]
-        ));
-
-        $addressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-        $addressMock->expects($this->any())
-            ->method('setIsDefaultBilling')
-            ->with(true)
-            ->willReturnSelf();
-        $addressMock->expects($this->any())
-            ->method('setIsDefaultShipping')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->addressFactory->expects($this->any())->method('create')->with(['data' => 'address_data'])->will(
-            $this->returnValue($addressMock)
-        );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $customerMock->expects($this->any())->method('getId')->will($this->returnValue('customer_id'));
-        $this->customerFactory->expects($this->once())->method('create')->with(
-            ['data' => ['customer_data' => [], 'addresses' => [$addressMock, $addressMock]]]
-        )->will($this->returnValue($customerMock));
-        $this->accountManagement->expects($this->once())->method('createAccount')->with($customerMock)->will(
-            $this->returnValue($customerMock)
-        );
-        $orderMock->expects($this->once())->method('setCustomerId')->with('customer_id');
-        $this->orderRepository->expects($this->once())->method('save')->with($orderMock);
-        $this->assertEquals($customerMock, $this->service->create(1));
-    }
-
-    /**
-     * Get mock for abstract class with methods.
-     *
-     * @param string $className
-     * @param array $methods
-     *
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function createPartialMockForAbstractClass($className, $methods = [])
-    {
-        return $this->getMockForAbstractClass(
-            $className,
-            [],
-            '',
-            true,
-            true,
-            true,
-            $methods
-        );
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
index 8e670ec610f30..68e1c7c17cd1c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php
index 19a9e23ac9305..3da6dfe78eb40 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
index 6d4ed5a874abe..b7ec911212254 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php
index d481b06458be1..4a63541bc05f2 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php
index d67cc1f8b9064..1dc53b97711ab 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php
index 554c1d19691cc..f554c2aeef168 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
index 9fba660087807..a8d676be2a2f1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php
index d3e869a8d8137..503646a5eac61 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php
@@ -164,7 +164,7 @@ public function testSetCustomerEmail()
         $this->assertEquals('email', $result);
     }
 
-    public function testSetCusomerName()
+    public function testSetCustomerName()
     {
         $this->identity->setCustomerName('name');
         $result = $this->identity->getCustomerName();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
index 97dc973e63437..2297d6aa711cf 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -120,6 +120,10 @@ public function stepMockSetup()
         $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
     }
 
+    /**
+     * @param $billingAddress
+     * @param bool $isVirtual
+     */
     public function stepAddressFormat($billingAddress, $isVirtual = false)
     {
         $this->orderMock->expects($this->any())
@@ -145,6 +149,9 @@ public function stepSendWithCallSendCopyTo()
         $this->stepSend($this->never(), $this->once());
     }
 
+    /**
+     * @param $identityMockClassName
+     */
     public function stepIdentityContainerInit($identityMockClassName)
     {
         $this->identityContainerMock = $this->createPartialMock(
@@ -156,9 +163,13 @@ public function stepIdentityContainerInit($identityMockClassName)
             ->will($this->returnValue($this->storeMock));
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects
+     */
     protected function stepSend(
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects,
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendExpects,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendCopyToExpects
     ) {
         $senderMock = $this->createPartialMock(\Magento\Sales\Model\Order\Email\Sender::class, ['send', 'sendCopyTo']);
         $senderMock->expects($sendExpects)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
index 411dd9e1433d7..46c44c03b1514 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
@@ -53,10 +53,11 @@ protected function setUp()
      * @param int $configValue
      * @param bool|null $forceSyncMode
      * @param bool|null $emailSendingResult
-     * @dataProvider sendDataProvider
+     * @param $senderSendException
      * @return void
+     * @dataProvider sendDataProvider
      */
-    public function testSend($configValue, $forceSyncMode, $emailSendingResult)
+    public function testSend($configValue, $forceSyncMode, $emailSendingResult, $senderSendException)
     {
         $address = 'address_test';
         $configPath = 'sales_email/general/async_sending';
@@ -110,19 +111,23 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult)
 
                 $this->senderMock->expects($this->once())->method('send');
 
-                $this->senderMock->expects($this->once())->method('sendCopyTo');
+                if ($senderSendException) {
+                    $this->checkSenderSendExceptionCase();
+                } else {
+                    $this->senderMock->expects($this->once())->method('sendCopyTo');
 
-                $this->orderMock->expects($this->once())
-                    ->method('setEmailSent')
-                    ->with(true);
+                    $this->orderMock->expects($this->once())
+                        ->method('setEmailSent')
+                        ->with(true);
 
-                $this->orderResourceMock->expects($this->once())
-                    ->method('saveAttribute')
-                    ->with($this->orderMock, ['send_email', 'email_sent']);
+                    $this->orderResourceMock->expects($this->once())
+                        ->method('saveAttribute')
+                        ->with($this->orderMock, ['send_email', 'email_sent']);
 
-                $this->assertTrue(
-                    $this->sender->send($this->orderMock)
-                );
+                    $this->assertTrue(
+                        $this->sender->send($this->orderMock)
+                    );
+                }
             } else {
                 $this->orderResourceMock->expects($this->once())
                     ->method('saveAttribute')
@@ -146,19 +151,42 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult)
         }
     }
 
+    /**
+     * Methods check case when method "send" in "senderMock" throw exception.
+     *
+     * @return void
+     */
+    protected function checkSenderSendExceptionCase()
+    {
+        $this->senderMock->expects($this->once())
+            ->method('send')
+            ->willThrowException(new \Exception('exception'));
+
+        $this->orderResourceMock->expects($this->once())
+            ->method('saveAttribute')
+            ->with($this->orderMock, 'send_email');
+
+        $this->assertFalse(
+            $this->sender->send($this->orderMock)
+        );
+    }
+
     /**
      * @return array
      */
     public function sendDataProvider()
     {
         return [
-            [0, 0, true],
-            [0, 0, true],
-            [0, 0, false],
-            [0, 0, false],
-            [0, 1, true],
-            [0, 1, true],
-            [1, null, null, null]
+            [0, 0, true, false],
+            [0, 0, true, false],
+            [0, 0, true, true],
+            [0, 0, false, false],
+            [0, 0, false, false],
+            [0, 0, false, true],
+            [0, 1, true, false],
+            [0, 1, true, false],
+            [0, 1, true, false],
+            [1, null, null, false]
         ];
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index 5319aa510bedf..38209bb22aef4 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Email;
 
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\SenderBuilder;
 
 class SenderBuilderTest extends \PHPUnit\Framework\TestCase
@@ -29,6 +31,16 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
      */
     protected $transportBuilder;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $transportBuilderByStore;
+
     protected function setUp()
     {
         $templateId = 'test_template_id';
@@ -42,7 +54,11 @@ protected function setUp()
             ['getTemplateVars', 'getTemplateOptions', 'getTemplateId']
         );
 
-        $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStoreId', '__wakeup']);
+        $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, [
+            'getStoreId',
+            '__wakeup',
+            'getId',
+        ]);
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::class,
@@ -52,15 +68,24 @@ protected function setUp()
                 'getCustomerName',
                 'getTemplateOptions',
                 'getEmailCopyTo',
-                'getCopyMethod'
+                'getCopyMethod',
+                'getStore',
             ]
         );
 
-        $this->transportBuilder = $this->createPartialMock(\Magento\Framework\Mail\Template\TransportBuilder::class, [
-                'addTo', 'addBcc', 'getTransport',
-                'setTemplateIdentifier', 'setTemplateOptions', 'setTemplateVars',
-                'setFrom',
-            ]);
+        $this->transportBuilder = $this->createPartialMock(
+            \Magento\Framework\Mail\Template\TransportBuilder::class,
+            [
+                'addTo',
+                'addBcc',
+                'getTransport',
+                'setTemplateIdentifier',
+                'setTemplateOptions',
+                'setTemplateVars',
+            ]
+        );
+
+        $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
 
         $this->templateContainerMock->expects($this->once())
             ->method('getTemplateId')
@@ -84,8 +109,8 @@ protected function setUp()
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
-        $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
+        $this->transportBuilderByStore->expects($this->once())
+            ->method('setFromByStore')
             ->with($this->equalTo($emailIdentity));
 
         $this->identityContainerMock->expects($this->once())
@@ -95,7 +120,8 @@ protected function setUp()
         $this->senderBuilder = new SenderBuilder(
             $this->templateContainerMock,
             $this->identityContainerMock,
-            $this->transportBuilder
+            $this->transportBuilder,
+            $this->transportBuilderByStore
         );
     }
 
@@ -119,6 +145,12 @@ public function testSend()
         $this->identityContainerMock->expects($this->once())
             ->method('getCustomerName')
             ->will($this->returnValue($customerName));
+        $this->identityContainerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
@@ -145,7 +177,12 @@ public function testSendCopyTo()
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
-
+        $this->identityContainerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
         $this->transportBuilder->expects($this->once())
             ->method('getTransport')
             ->will($this->returnValue($transportMock));
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Comment/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Comment/ValidatorTest.php
index 0bc9839e26652..6d2a903f7098c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Comment/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Comment/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Invoice\Comment;
 
 /**
@@ -82,7 +83,7 @@ public function providerCommentData()
                 ],
                 [
                     'parent_id' => 'Parent Invoice Id can not be empty',
-                    'comment' => 'Comment is a required field'
+                    'comment' => '"Comment" is required. Enter and try again.'
                 ]
             ]
         ];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/CommentRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/CommentRepositoryTest.php
new file mode 100644
index 0000000000000..984554b289901
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/CommentRepositoryTest.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order\Invoice;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\Data\InvoiceCommentInterfaceFactory;
+use Magento\Sales\Api\Data\InvoiceCommentSearchResultInterfaceFactory;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\Order\Invoice\Comment;
+use Magento\Sales\Model\Order\Invoice\CommentRepository;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceCommentSender;
+use Magento\Sales\Model\Spi\InvoiceCommentResourceInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class CommentRepositoryTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CommentRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|InvoiceCommentResourceInterface
+     */
+    private $commentResource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|InvoiceCommentInterfaceFactory
+     */
+    private $commentFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|InvoiceCommentSearchResultInterfaceFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var CommentRepository
+     */
+    private $commentRepository;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|InvoiceCommentSender
+     */
+    private $invoiceCommentSender;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|InvoiceRepositoryInterface
+     */
+    private $invoiceRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Invoice
+     */
+    private $invoiceMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Comment
+     */
+    private $commentMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|LoggerInterface
+     */
+    private $loggerMock;
+
+    protected function setUp()
+    {
+        $this->commentResource = $this->getMockBuilder(InvoiceCommentResourceInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentFactory = $this->getMockBuilder(InvoiceCommentInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchResultFactory = $this->getMockBuilder(InvoiceCommentSearchResultInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->invoiceRepositoryMock = $this->getMockBuilder(InvoiceRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->invoiceCommentSender = $this->getMockBuilder(InvoiceCommentSender::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
+
+        $this->invoiceMock = $this->getMockBuilder(Invoice::class)->disableOriginalConstructor()->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)->disableOriginalConstructor()->getMock();
+
+        $this->commentRepository = new CommentRepository(
+            $this->commentResource,
+            $this->commentFactory,
+            $this->searchResultFactory,
+            $this->collectionProcessor,
+            $this->invoiceCommentSender,
+            $this->invoiceRepositoryMock,
+            $this->loggerMock
+        );
+    }
+
+    public function testSave()
+    {
+        $comment = "Comment text";
+        $invoiceId = 123;
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willReturnSelf();
+        $this->commentMock->expects($this->once())
+            ->method('getIsCustomerNotified')
+            ->willReturn(1);
+        $this->commentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn($invoiceId);
+        $this->commentMock->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+
+        $this->invoiceRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($invoiceId)
+            ->willReturn($this->invoiceMock);
+        $this->invoiceCommentSender->expects($this->once())
+            ->method('send')
+            ->with($this->invoiceMock, true, $comment)
+            ->willReturn(true);
+        $this->commentRepository->save($this->commentMock);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+     * @expectedExceptionMessage Could not save the invoice comment.
+     */
+    public function testSaveWithException()
+    {
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willThrowException(
+                new \Magento\Framework\Exception\CouldNotSaveException(__('Could not save the invoice comment.'))
+            );
+
+        $this->commentRepository->save($this->commentMock);
+    }
+
+    public function testSaveSendCatchException()
+    {
+        $comment = "Comment text";
+        $creditmemoId = 123;
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willReturnSelf();
+        $this->commentMock->expects($this->once())
+            ->method('getIsCustomerNotified')
+            ->willReturn(1);
+        $this->commentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn($creditmemoId);
+        $this->commentMock->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+
+        $this->invoiceRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($creditmemoId)
+            ->willReturn($this->invoiceMock);
+        $this->invoiceCommentSender->expects($this->once())
+            ->method('send')
+            ->willThrowException(new \Exception());
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
+
+        $this->commentRepository->save($this->commentMock);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceQuantityValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceQuantityValidatorTest.php
index 5d3e9ae22e78b..f6051d0a7f172 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceQuantityValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceQuantityValidatorTest.php
@@ -136,7 +136,7 @@ public function testValidateNoOrder()
 
     public function testValidateNoInvoiceItems()
     {
-        $expectedResult = [__('You can\'t create an invoice without products.')];
+        $expectedResult = [__("The invoice can't be created without products. Add products and try again.")];
         $orderItemId = 1;
         $invoiceItemMock = $this->getInvoiceItemMock($orderItemId, 0);
         $this->invoiceMock->expects($this->once())
@@ -156,6 +156,11 @@ public function testValidateNoInvoiceItems()
         );
     }
 
+    /**
+     * @param $orderItemId
+     * @param $qty
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getInvoiceItemMock($orderItemId, $qty)
     {
         $invoiceItemMock = $this->getMockBuilder(\Magento\Sales\Api\Data\InvoiceItemInterface::class)
@@ -167,6 +172,12 @@ private function getInvoiceItemMock($orderItemId, $qty)
         return $invoiceItemMock;
     }
 
+    /**
+     * @param $id
+     * @param $qtyToInvoice
+     * @param $isDummy
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getOrderItemMock($id, $qtyToInvoice, $isDummy)
     {
         $orderItemMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderItemInterface::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
index 672b6aacc4084..01589fcd7fdb3 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
@@ -137,6 +137,9 @@ public function testDefaultCanVoid($canVoid)
         $this->assertEquals($canVoid, $this->model->canVoid());
     }
 
+    /**
+     * @return array
+     */
     public function canVoidDataProvider()
     {
         return [[true], [false]];
@@ -379,6 +382,9 @@ public function testPay(
         self::assertEquals($expectedTotal, $this->order->getTotalPaid());
     }
 
+    /**
+     * @return array
+     */
     public function payDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php
deleted file mode 100644
index 0c34e5bdffd4a..0000000000000
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Test\Unit\Model\Order;
-
-use Magento\Sales\Model\Order\ItemRepository;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ItemRepositoryTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Framework\DataObject\Factory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectFactory;
-
-    /**
-     * @var \Magento\Sales\Model\ResourceModel\Metadata|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $metadata;
-
-    /**
-     * @var \Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $searchResultFactory;
-
-    /**
-     * @var \Magento\Catalog\Model\ProductOptionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productOptionProcessorMock;
-
-    /**
-     * @var \Magento\Catalog\Model\ProductOptionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productOptionFactory;
-
-    /**
-     * @var \Magento\Catalog\Api\Data\ProductOptionExtensionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $extensionFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $collectionProcessor;
-
-    /**
-     * @var array
-     */
-    protected $productOptionData = [];
-
-    protected function setUp()
-    {
-        $this->objectFactory = $this->getMockBuilder(\Magento\Framework\DataObject\Factory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->metadata = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Metadata::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->searchResultFactory = $this->getMockBuilder(
-            \Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory::class
-        )
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->productOptionFactory = $this->getMockBuilder(\Magento\Catalog\Model\ProductOptionFactory::class)
-            ->setMethods([
-                'create',
-            ])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->collectionProcessor = $this->createMock(
-            \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
-        );
-
-        $this->extensionFactory = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductOptionExtensionFactory::class)
-            ->setMethods([
-                'create',
-            ])
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage ID required
-     */
-    public function testGetWithNoId()
-    {
-        $model = new ItemRepository(
-            $this->objectFactory,
-            $this->metadata,
-            $this->searchResultFactory,
-            $this->productOptionFactory,
-            $this->extensionFactory,
-            [],
-            $this->collectionProcessor
-        );
-
-        $model->get(null);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested entity doesn't exist
-     */
-    public function testGetEmptyEntity()
-    {
-        $orderItemId = 1;
-
-        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemMock->expects($this->once())
-            ->method('load')
-            ->with($orderItemId)
-            ->willReturn($orderItemMock);
-        $orderItemMock->expects($this->once())
-            ->method('getItemId')
-            ->willReturn(null);
-
-        $this->metadata->expects($this->once())
-            ->method('getNewInstance')
-            ->willReturn($orderItemMock);
-
-        $model = new ItemRepository(
-            $this->objectFactory,
-            $this->metadata,
-            $this->searchResultFactory,
-            $this->productOptionFactory,
-            $this->extensionFactory,
-            [],
-            $this->collectionProcessor
-        );
-
-        $model->get($orderItemId);
-    }
-
-    public function testGet()
-    {
-        $orderItemId = 1;
-        $productType = 'configurable';
-
-        $this->productOptionData = ['option1' => 'value1'];
-
-        $this->getProductOptionExtensionMock();
-        $productOption = $this->getProductOptionMock();
-        $orderItemMock = $this->getOrderMock($productType, $productOption);
-
-        $orderItemMock->expects($this->once())
-            ->method('load')
-            ->with($orderItemId)
-            ->willReturn($orderItemMock);
-        $orderItemMock->expects($this->once())
-            ->method('getItemId')
-            ->willReturn($orderItemId);
-
-        $this->metadata->expects($this->once())
-            ->method('getNewInstance')
-            ->willReturn($orderItemMock);
-
-        $model = $this->getModel($orderItemMock, $productType);
-        $this->assertSame($orderItemMock, $model->get($orderItemId));
-
-        // Assert already registered
-        $this->assertSame($orderItemMock, $model->get($orderItemId));
-    }
-
-    public function testGetList()
-    {
-        $productType = 'configurable';
-        $this->productOptionData = ['option1' => 'value1'];
-        $searchCriteriaMock = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteria::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->getProductOptionExtensionMock();
-        $productOption = $this->getProductOptionMock();
-        $orderItemMock = $this->getOrderMock($productType, $productOption);
-
-        $searchResultMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Item\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $searchResultMock->expects($this->once())
-            ->method('getItems')
-            ->willReturn([$orderItemMock]);
-
-        $this->searchResultFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($searchResultMock);
-
-        $model = $this->getModel($orderItemMock, $productType);
-        $this->assertSame($searchResultMock, $model->getList($searchCriteriaMock));
-    }
-
-    public function testDeleteById()
-    {
-        $orderItemId = 1;
-        $productType = 'configurable';
-
-        $requestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemMock->expects($this->once())
-            ->method('load')
-            ->with($orderItemId)
-            ->willReturn($orderItemMock);
-        $orderItemMock->expects($this->once())
-            ->method('getItemId')
-            ->willReturn($orderItemId);
-        $orderItemMock->expects($this->once())
-            ->method('getProductType')
-            ->willReturn($productType);
-        $orderItemMock->expects($this->once())
-            ->method('getBuyRequest')
-            ->willReturn($requestMock);
-
-        $orderItemResourceMock = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemResourceMock->expects($this->once())
-            ->method('delete')
-            ->with($orderItemMock)
-            ->willReturnSelf();
-
-        $this->metadata->expects($this->once())
-            ->method('getNewInstance')
-            ->willReturn($orderItemMock);
-        $this->metadata->expects($this->exactly(1))
-            ->method('getMapper')
-            ->willReturn($orderItemResourceMock);
-
-        $model = $this->getModel($orderItemMock, $productType);
-        $this->assertTrue($model->deleteById($orderItemId));
-    }
-
-    /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $orderItemMock
-     * @param string $productType
-     * @param array $data
-     * @return ItemRepository
-     */
-    protected function getModel(
-        \PHPUnit_Framework_MockObject_MockObject $orderItemMock,
-        $productType,
-        array $data = []
-    ) {
-        $requestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $requestUpdateMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $requestUpdateMock->expects($this->any())
-            ->method('getData')
-            ->willReturn($data);
-
-        $this->productOptionProcessorMock = $this->getMockBuilder(
-            \Magento\Catalog\Model\ProductOptionProcessorInterface::class
-        )
-            ->getMockForAbstractClass();
-        $this->productOptionProcessorMock->expects($this->any())
-            ->method('convertToProductOption')
-            ->with($requestMock)
-            ->willReturn($this->productOptionData);
-        $this->productOptionProcessorMock->expects($this->any())
-            ->method('convertToBuyRequest')
-            ->with($orderItemMock)
-            ->willReturn($requestUpdateMock);
-
-        $model = new ItemRepository(
-            $this->objectFactory,
-            $this->metadata,
-            $this->searchResultFactory,
-            $this->productOptionFactory,
-            $this->extensionFactory,
-            [
-                $productType => $this->productOptionProcessorMock,
-                'custom_options' => $this->productOptionProcessorMock
-            ],
-            $this->collectionProcessor
-        );
-        return $model;
-    }
-
-    /**
-     * @param string $productType
-     * @param \PHPUnit_Framework_MockObject_MockObject $productOption
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getOrderMock($productType, $productOption)
-    {
-        $requestMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemMock->expects($this->once())
-            ->method('getProductType')
-            ->willReturn($productType);
-        $orderItemMock->expects($this->once())
-            ->method('getBuyRequest')
-            ->willReturn($requestMock);
-        $orderItemMock->expects($this->any())
-            ->method('getProductOption')
-            ->willReturn(null);
-        $orderItemMock->expects($this->any())
-            ->method('setProductOption')
-            ->with($productOption)
-            ->willReturnSelf();
-
-        return $orderItemMock;
-    }
-
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getProductOptionMock()
-    {
-        $productOption = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductOptionInterface::class)
-            ->getMockForAbstractClass();
-        $productOption->expects($this->any())
-            ->method('getExtensionAttributes')
-            ->willReturn(null);
-
-        $this->productOptionFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($productOption);
-
-        return $productOption;
-    }
-
-    protected function getProductOptionExtensionMock()
-    {
-        $productOptionExtension = $this->getMockBuilder(
-            \Magento\Catalog\Api\Data\ProductOptionExtensionInterface::class
-        )
-            ->setMethods([
-                'setData',
-            ])
-            ->getMockForAbstractClass();
-        $productOptionExtension->expects($this->any())
-            ->method('setData')
-            ->with(key($this->productOptionData), current($this->productOptionData))
-            ->willReturnSelf();
-
-        $this->extensionFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($productOptionExtension);
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
index 03a388410f335..76bfd62a7b889 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
@@ -140,6 +140,9 @@ public function testGetStatusId(
         $this->assertEquals($expectedStatus, $this->model->getStatusId());
     }
 
+    /**
+     * @return array
+     */
     public function getStatusIdDataProvider()
     {
         return [
@@ -235,4 +238,114 @@ public function getProductOptionsDataProvider()
             ]
         ];
     }
+
+    /**
+     * Test different combinations of item qty setups
+     *
+     * @param array $options
+     * @param float $expectedResult
+     *
+     * @dataProvider getItemQtyVariants
+     */
+    public function testGetSimpleQtyToMethods(array $options, $expectedResult)
+    {
+        $this->model->setData($options);
+        $this->assertSame($this->model->getSimpleQtyToShip(), $expectedResult['to_ship']);
+        $this->assertSame($this->model->getQtyToInvoice(), $expectedResult['to_invoice']);
+    }
+
+    /**
+     * Provides different combinations of qty options for an item and the
+     * expected qtys pending shipment and invoice
+     *
+     * @return array
+     */
+    public function getItemQtyVariants()
+    {
+        return [
+            'empty_item' => [
+                'options' => [
+                    'qty_ordered' => 0, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ],
+            'ordered_item' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 12.0]
+            ],
+            'partially_invoiced' => [
+                'options' => ['qty_ordered' => 12, 'qty_invoiced' => 4, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 8.0]
+            ],
+            'completely_invoiced' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 0.0]
+            ],
+            'partially_invoiced_refunded' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 5, 'qty_refunded' => 5, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 7.0]
+            ],
+            'partially_refunded' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 0.0]
+            ],
+            'partially_shipped' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 4,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 8.0, 'to_invoice' => 12.0]
+            ],
+            'partially_refunded_partially_shipped' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 4,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 3.0, 'to_invoice' => 0.0]
+            ],
+            'complete' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 0, 'qty_shipped' => 12,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ],
+            'canceled' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 12
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ],
+            'completely_shipped_using_decimals' => [
+                'options' => [
+                    'qty_ordered' => 4.4, 'qty_invoiced' => 0.4, 'qty_refunded' => 0.4, 'qty_shipped' => 4,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 4.0]
+            ],
+            'completely_invoiced_using_decimals' => [
+                'options' => [
+                    'qty_ordered' => 4.4, 'qty_invoiced' => 4, 'qty_refunded' => 0, 'qty_shipped' => 4,
+                    'qty_canceled' => 0.4
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ]
+        ];
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
index 70e5ad127e44c..293c2eea1231d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
@@ -179,7 +179,7 @@ public function testDecrypt()
      */
     public function testSetAdditionalInformationException()
     {
-        $this->info->setAdditionalInformation('object', new \StdClass());
+        $this->info->setAdditionalInformation('object', new \stdClass());
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
index 66ac821006266..d8c17cc2ace87 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
@@ -149,6 +149,10 @@ public function testGetList()
         $this->assertSame($this->collection, $this->repository->getList($this->searchCriteria));
     }
 
+    /**
+     * @param bool $id
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function mockPayment($id = false)
     {
         $payment = $this->createMock(\Magento\Sales\Model\Order\Payment::class);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php
index 32ea9d8869344..1b762fafe0b71 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php
@@ -32,26 +32,29 @@ class RegisterCaptureNotificationCommandTest extends \PHPUnit\Framework\TestCase
      *
      * @param bool $isTransactionPending
      * @param bool $isFraudDetected
+     * @param string|null $currentState
      * @param string $expectedState
      * @param string $expectedStatus
      * @param string $expectedMessage
-     *
+     * @return void
      * @dataProvider commandResultDataProvider
      */
     public function testExecute(
-        $isTransactionPending,
-        $isFraudDetected,
-        $expectedState,
-        $expectedStatus,
-        $expectedMessage
-    ) {
+        bool $isTransactionPending,
+        bool $isFraudDetected,
+        $currentState,
+        string $expectedState,
+        string $expectedStatus,
+        string $expectedMessage
+    ): void {
+        $order = $this->getOrder($currentState);
         $actualReturn = (new RegisterCaptureNotificationCommand($this->getStatusResolver()))->execute(
             $this->getPayment($isTransactionPending, $isFraudDetected),
             $this->amount,
-            $this->getOrder()
+            $order
         );
 
-        $this->assertOrderStateAndStatus($this->getOrder(), $expectedState, $expectedStatus);
+        $this->assertOrderStateAndStatus($order, $expectedState, $expectedStatus);
         self::assertEquals(__($expectedMessage, $this->amount), $actualReturn);
     }
 
@@ -64,30 +67,42 @@ public function commandResultDataProvider()
             [
                 false,
                 false,
+                Order::STATE_COMPLETE,
+                Order::STATE_COMPLETE,
+                $this->newOrderStatus,
+                'Registered notification about captured amount of %1.',
+            ],
+            [
+                false,
+                false,
+                null,
                 Order::STATE_PROCESSING,
                 $this->newOrderStatus,
-                'Registered notification about captured amount of %1.'
+                'Registered notification about captured amount of %1.',
             ],
             [
                 true,
                 false,
+                Order::STATE_PROCESSING,
                 Order::STATE_PAYMENT_REVIEW,
                 $this->newOrderStatus,
-                'An amount of %1 will be captured after being approved at the payment gateway.'
+                'An amount of %1 will be captured after being approved at the payment gateway.',
             ],
             [
                 false,
                 true,
+                Order::STATE_PROCESSING,
                 Order::STATE_PAYMENT_REVIEW,
                 Order::STATUS_FRAUD,
-                'Order is suspended as its capture amount %1 is suspected to be fraudulent.'
+                'Order is suspended as its capture amount %1 is suspected to be fraudulent.',
             ],
             [
                 true,
                 true,
+                Order::STATE_PROCESSING,
                 Order::STATE_PAYMENT_REVIEW,
                 Order::STATUS_FRAUD,
-                'Order is suspended as its capture amount %1 is suspected to be fraudulent.'
+                'Order is suspended as its capture amount %1 is suspected to be fraudulent.',
             ],
         ];
     }
@@ -107,15 +122,19 @@ private function getStatusResolver()
     }
 
     /**
+     * @param string|null $state
      * @return Order|MockObject
      */
-    private function getOrder()
+    private function getOrder($state)
     {
+        /** @var Order|MockObject $order */
         $order = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
+            ->setMethods(['getBaseCurrency', 'getOrderStatusByState'])
             ->getMock();
         $order->method('getBaseCurrency')
             ->willReturn($this->getCurrency());
+        $order->setState($state);
 
         return $order;
     }
@@ -159,7 +178,7 @@ private function getCurrency()
      */
     private function assertOrderStateAndStatus($order, $expectedState, $expectedStatus)
     {
-        $order->method('setState')->with($expectedState);
-        $order->method('setStatus')->with($expectedStatus);
+        self::assertEquals($expectedState, $order->getState(), 'The order {state} should match.');
+        self::assertEquals($expectedStatus, $order->getStatus(), 'The order {status} should match.');
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/BuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/BuilderTest.php
index 1ea3aeedea51c..ea11604c53c45 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/BuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/BuilderTest.php
@@ -257,6 +257,9 @@ protected function expectsIsPaymentTransactionClosed($isPaymentTransactionClosed
             ->willReturn($isPaymentTransactionClosed);
     }
 
+    /**
+     * @return array
+     */
     public function createDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php
index 34b874c073a5a..13f6b9c607586 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php
@@ -155,6 +155,9 @@ public function generateTransactionIdDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function isTransactionExistsDataProvider()
     {
         return [
@@ -165,6 +168,9 @@ public function isTransactionExistsDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function getAuthorizationDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
index 95966b138097c..e9bda29900858 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
@@ -122,14 +122,20 @@ protected function setUp()
         );
     }
 
-    public function testCreate()
+    /**
+     * @return void
+     */
+    public function testCreate(): void
     {
         $expected = "expect";
         $this->metaData->expects($this->once())->method('getNewInstance')->willReturn($expected);
         $this->assertEquals($expected, $this->repository->create());
     }
 
-    public function testSave()
+    /**
+     * @return void
+     */
+    public function testSave(): void
     {
         $transactionId = 12;
         $transaction = $this->mockTransaction($transactionId);
@@ -142,7 +148,10 @@ public function testSave()
         $this->assertSame($transaction, $this->repository->save($transaction));
     }
 
-    public function testDelete()
+    /**
+     * @return void
+     */
+    public function testDelete(): void
     {
         $transactionId = 12;
         $transaction = $this->mockTransaction($transactionId);
@@ -152,7 +161,10 @@ public function testDelete()
         $this->assertTrue($this->repository->delete($transaction));
     }
 
-    public function testGet()
+    /**
+     * @return void
+     */
+    public function testGet(): void
     {
         $transactionId = 12;
         $transaction = $this->mockTransaction($transactionId);
@@ -165,22 +177,24 @@ public function testGet()
     }
 
     /**
+     * @return void
      * @expectedException \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testGetException()
+    public function testGetException(): void
     {
         $transactionId = null;
         $this->repository->get($transactionId);
     }
 
     /**
+     * @return void
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testGetNoSuchEntity()
+    public function testGetNoSuchEntity(): void
     {
         $transactionId = null;
         $transactionIdFromArgument = 12;
@@ -193,7 +207,10 @@ public function testGetNoSuchEntity()
         $this->assertSame($transaction, $this->repository->get(12));
     }
 
-    public function testGetExistInStorage()
+    /**
+     * @return void
+     */
+    public function testGetExistInStorage(): void
     {
         $transactionId = 12;
         $transaction = "transaction";
@@ -206,7 +223,10 @@ public function testGetExistInStorage()
         $this->assertSame($transaction, $this->repository->get($transactionId));
     }
 
-    public function testGetList()
+    /**
+     * @return void
+     */
+    public function testGetList(): void
     {
         $this->initListMock();
         $this->collectionProcessor->expects($this->once())
@@ -215,7 +235,10 @@ public function testGetList()
         $this->assertSame($this->collection, $this->repository->getList($this->searchCriteria));
     }
 
-    public function testGetByTransactionId()
+    /**
+     * @return void
+     */
+    public function testGetByTransactionId(): void
     {
         $transactionId = "100-refund";
         $paymentId = 1;
@@ -241,7 +264,10 @@ public function testGetByTransactionId()
         $this->assertEquals($transaction, $this->repository->getByTransactionId($transactionId, $paymentId, $orderId));
     }
 
-    public function testGetByTransactionIdNotFound()
+    /**
+     * @return void
+     */
+    public function testGetByTransactionIdNotFound(): void
     {
         $transactionId = "100-refund";
         $paymentId = 1;
@@ -267,7 +293,10 @@ public function testGetByTransactionIdNotFound()
         );
     }
 
-    public function testGetByTransactionIdFromStorage()
+    /**
+     * @return void
+     */
+    public function testGetByTransactionIdFromStorage(): void
     {
         $transactionId = "100-refund";
         $paymentId = 1;
@@ -284,11 +313,13 @@ public function testGetByTransactionIdFromStorage()
         );
     }
 
-    public function testGetByTransactionType()
+    /**
+     * @return void
+     */
+    public function testGetByTransactionType(): void
     {
         $transactionType = Transaction::TYPE_AUTH;
         $paymentId = 1;
-        $orderId = 3;
         $cacheStorage = 'txn_type';
         $identityFieldsForCache = [$transactionType, $paymentId];
         $this->entityStorage->expects($this->once())
@@ -341,15 +372,17 @@ public function testGetByTransactionType()
             ->with($transaction, $identityFieldsForCache, $cacheStorage);
         $this->assertEquals(
             $transaction,
-            $this->repository->getByTransactionType($transactionType, $paymentId, $orderId)
+            $this->repository->getByTransactionType($transactionType, $paymentId)
         );
     }
 
-    public function testGetByTransactionTypeFromCache()
+    /**
+     * @return void
+     */
+    public function testGetByTransactionTypeFromCache(): void
     {
         $transactionType = Transaction::TYPE_AUTH;
         $paymentId = 1;
-        $orderId = 3;
         $cacheStorage = 'txn_type';
         $transaction = "transaction";
         $identityFieldsForCache = [$transactionType, $paymentId];
@@ -358,7 +391,7 @@ public function testGetByTransactionTypeFromCache()
             ->willReturn($transaction);
         $this->assertEquals(
             $transaction,
-            $this->repository->getByTransactionType($transactionType, $paymentId, $orderId)
+            $this->repository->getByTransactionType($transactionType, $paymentId)
         );
     }
 
@@ -379,7 +412,7 @@ protected function mockTransaction($transactionId, $withoutTransactionIdMatcher
     /**
      * @return void
      */
-    protected function initListMock()
+    protected function initListMock(): void
     {
         $this->searchResultFactory->method('create')->willReturn($this->collection);
         $this->collection->expects($this->once())->method('addPaymentInformation')->with(['method']);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
index ee7e07873da51..30b584b8c4ebf 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
@@ -600,6 +600,9 @@ public function testAcceptApprovePaymentTrue()
         self::assertEquals($baseGrandTotal, $this->payment->getBaseAmountPaidOnline());
     }
 
+    /**
+     * @return array
+     */
     public function acceptPaymentFalseProvider()
     {
         return [
@@ -1532,6 +1535,9 @@ public function testRefund()
         static::assertEquals($amount, $this->payment->getData('base_amount_refunded'));
     }
 
+    /**
+     * @return array
+     */
     public function boolProvider()
     {
         return [
@@ -1570,6 +1576,9 @@ public function testGetShouldCloseParentTransaction()
         static::assertFalse($this->payment->getShouldCloseParentTransaction());
     }
 
+    /**
+     * @return object
+     */
     protected function initPayment()
     {
         return (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
@@ -1589,6 +1598,12 @@ protected function initPayment()
         );
     }
 
+    /**
+     * @param $state
+     * @param null $status
+     * @param null $message
+     * @param null $isCustomerNotified
+     */
     protected function assertOrderUpdated(
         $state,
         $status = null,
@@ -1617,6 +1632,11 @@ protected function assertOrderUpdated(
             ->willReturn($statusHistory);
     }
 
+    /**
+     * @param $state
+     * @param $status
+     * @param array $allStatuses
+     */
     protected function mockGetDefaultStatus($state, $status, $allStatuses = [])
     {
         /** @var \Magento\Sales\Model\Order\Config | \PHPUnit_Framework_MockObject_MockObject $orderConfigMock */
@@ -1642,6 +1662,10 @@ protected function mockGetDefaultStatus($state, $status, $allStatuses = [])
             ->will($this->returnValue($orderConfigMock));
     }
 
+    /**
+     * @param $transactionId
+     * @return MockObject
+     */
     protected function getTransactionMock($transactionId)
     {
         $transaction = $this->createPartialMock(\Magento\Sales\Model\Order\Payment\Transaction::class, [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php
index c91d4edb155a4..0761b5abb5d45 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php
@@ -19,7 +19,7 @@ public function testInsertTotals()
         // Setup parameters, that will be passed to the tested model method
         $page = $this->createMock(\Zend_Pdf_Page::class);
 
-        $order = new \StdClass();
+        $order = new \stdClass();
         $source = $this->createMock(\Magento\Sales\Model\Order\Invoice::class);
         $source->expects($this->any())->method('getOrder')->will($this->returnValue($order));
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php
index b1b51c3f12330..b808a4139e84e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php
@@ -87,7 +87,7 @@ protected function setUp()
     public function testRead()
     {
         $expectedResult = new \stdClass();
-        $constraint = function (\DOMDOcument $actual) {
+        $constraint = function (\DOMDocument $actual) {
             try {
                 $expected = __DIR__ . '/_files/pdf_merged.xml';
                 \PHPUnit\Framework\Assert::assertXmlStringEqualsXmlFile($expected, $actual->saveXML());
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Comment/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Comment/ValidatorTest.php
index a3de503f2f8c9..ff414f808cfa2 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Comment/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Comment/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Shipment\Comment;
 
 /**
@@ -82,7 +83,7 @@ public function providerCommentData()
                 ],
                 [
                     'parent_id' => 'Parent Shipment Id can not be empty',
-                    'comment' => 'Comment is a required field'
+                    'comment' => '"Comment" is required. Enter and try again.'
                 ]
             ]
         ];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/CommentRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/CommentRepositoryTest.php
new file mode 100644
index 0000000000000..5152b359e4b6a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/CommentRepositoryTest.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order\Shipment;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
+use Magento\Sales\Api\Data\ShipmentCommentInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentCommentSearchResultInterfaceFactory;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Sales\Model\Order\Shipment\Comment;
+use Magento\Sales\Model\Order\Shipment\CommentRepository;
+use Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender;
+use Magento\Sales\Model\Spi\ShipmentCommentResourceInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class CommentRepositoryTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CommentRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ShipmentCommentResourceInterface
+     */
+    private $commentResource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ShipmentCommentInterfaceFactory
+     */
+    private $commentFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ShipmentCommentSearchResultInterfaceFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var CommentRepository
+     */
+    private $commentRepository;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ShipmentCommentSender
+     */
+    private $shipmentCommentSender;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ShipmentRepositoryInterface
+     */
+    private $shipmentRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Shipment
+     */
+    private $shipmentMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Comment
+     */
+    private $commentMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|LoggerInterface
+     */
+    private $loggerMock;
+
+    protected function setUp()
+    {
+        $this->commentResource = $this->getMockBuilder(ShipmentCommentResourceInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentFactory = $this->getMockBuilder(ShipmentCommentInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchResultFactory = $this->getMockBuilder(ShipmentCommentSearchResultInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shipmentRepositoryMock = $this->getMockBuilder(ShipmentRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shipmentCommentSender = $this->getMockBuilder(ShipmentCommentSender::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
+
+        $this->shipmentMock = $this->getMockBuilder(Shipment::class)->disableOriginalConstructor()->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)->disableOriginalConstructor()->getMock();
+
+        $this->commentRepository = new CommentRepository(
+            $this->commentResource,
+            $this->commentFactory,
+            $this->searchResultFactory,
+            $this->collectionProcessor,
+            $this->shipmentCommentSender,
+            $this->shipmentRepositoryMock,
+            $this->loggerMock
+        );
+    }
+
+    public function testSave()
+    {
+        $comment = "Comment text";
+        $shipmentId = 123;
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willReturnSelf();
+        $this->commentMock->expects($this->once())
+            ->method('getIsCustomerNotified')
+            ->willReturn(1);
+        $this->commentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn($shipmentId);
+        $this->commentMock->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+
+        $this->shipmentRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($shipmentId)
+            ->willReturn($this->shipmentMock);
+        $this->shipmentCommentSender->expects($this->once())
+            ->method('send')
+            ->with($this->shipmentMock, true, $comment);
+        $this->assertEquals($this->commentMock, $this->commentRepository->save($this->commentMock));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+     * @expectedExceptionMessage Could not save the shipment comment.
+     */
+    public function testSaveWithException()
+    {
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willThrowException(
+                new \Magento\Framework\Exception\CouldNotSaveException(__('Could not save the shipment comment.'))
+            );
+
+        $this->commentRepository->save($this->commentMock);
+    }
+
+    public function testSaveSendCatchException()
+    {
+        $comment = "Comment text";
+        $creditmemoId = 123;
+        $this->commentResource->expects($this->once())
+            ->method('save')
+            ->with($this->commentMock)
+            ->willReturnSelf();
+        $this->commentMock->expects($this->once())
+            ->method('getIsCustomerNotified')
+            ->willReturn(1);
+        $this->commentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn($creditmemoId);
+        $this->commentMock->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+
+        $this->shipmentRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($creditmemoId)
+            ->willReturn($this->shipmentMock);
+        $this->shipmentCommentSender->expects($this->once())
+            ->method('send')
+            ->willThrowException(new \Exception());
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
+
+        $this->commentRepository->save($this->commentMock);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php
index ecc37a2cd427d..9eb6be5f6d66e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/OrderRegistrarTest.php
@@ -37,23 +37,20 @@ protected function setUp()
     public function testRegister()
     {
         $item1 = $this->getShipmentItemMock();
-        $item1->expects($this->once())
-            ->method('getQty')
-            ->willReturn(0);
-        $item1->expects($this->never())
-            ->method('register');
+        $item1->expects($this->once())->method('getQty')->willReturn(0);
+        $item1->expects($this->never())->method('register');
+        $item1->expects($this->never())->method('getOrderItem');
 
         $item2 = $this->getShipmentItemMock();
-        $item2->expects($this->once())
-            ->method('getQty')
-            ->willReturn(0.5);
-        $item2->expects($this->once())
-            ->method('register');
+        $item2->expects($this->atLeastOnce())->method('getQty')->willReturn(0.5);
+        $item2->expects($this->once())->method('register');
+
+        $orderItemMock = $this->createMock(\Magento\Sales\Model\Order\Item::class);
+        $orderItemMock->expects($this->once())->method('isDummy')->with(true)->willReturn(false);
+        $item2->expects($this->once())->method('getOrderItem')->willReturn($orderItemMock);
 
         $items = [$item1, $item2];
-        $this->shipmentMock->expects($this->once())
-            ->method('getItems')
-            ->willReturn($items);
+        $this->shipmentMock->expects($this->once())->method('getItems')->willReturn($items);
         $this->assertEquals(
             $this->orderMock,
             $this->model->register($this->orderMock, $this->shipmentMock)
@@ -67,7 +64,7 @@ private function getShipmentItemMock()
     {
         return $this->getMockBuilder(\Magento\Sales\Api\Data\ShipmentItemInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['register'])
+            ->setMethods(['register', 'getOrderItem'])
             ->getMockForAbstractClass();
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Plugin/ShippingLabelConverterTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Plugin/ShippingLabelConverterTest.php
new file mode 100644
index 0000000000000..24253aa0fd34f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Plugin/ShippingLabelConverterTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order\Shipment\Plugin;
+
+/**
+ * Unit test for plugin to convert shipping label from blob to base64encoded string
+ */
+class ShippingLabelConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Plugin\ShippingLabelConverter
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Sales\Api\Data\ShipmentInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shipmentMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->model = new \Magento\Sales\Plugin\ShippingLabelConverter();
+
+        $shippingLabel = 'shipping_label_test';
+        $shippingLabelEncoded = base64_encode('shipping_label_test');
+        $this->shipmentMock = $this->getMockBuilder(\Magento\Sales\Api\Data\ShipmentInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->shipmentMock->expects($this->exactly(2))->method('getShippingLabel')->willReturn($shippingLabel);
+        $this->shipmentMock->expects($this->once())
+            ->method('setShippingLabel')
+            ->with($shippingLabelEncoded)
+            ->willReturnSelf();
+    }
+
+    /**
+     * @covers \Magento\Sales\Plugin\ShippingLabelConverter::afterGet()
+     */
+    public function testAfterGet()
+    {
+        $this->model->afterGet(
+            $this->getMockBuilder(\Magento\Sales\Api\ShipmentRepositoryInterface::class)
+                ->disableOriginalConstructor()->getMock(),
+            $this->shipmentMock
+        );
+    }
+
+    /**
+     * @covers \Magento\Sales\Plugin\ShippingLabelConverter::afterGetList()
+     */
+    public function testAfterGetList()
+    {
+        $searchResultMock = $this->getMockBuilder(\Magento\Sales\Api\Data\ShipmentSearchResultInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $searchResultMock->expects($this->once())->method('getItems')->willReturn([$this->shipmentMock]);
+
+        $this->model->afterGetList(
+            $this->getMockBuilder(\Magento\Sales\Api\ShipmentRepositoryInterface::class)
+                ->disableOriginalConstructor()->getMock(),
+            $searchResultMock
+        );
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Track/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Track/ValidatorTest.php
index 5207f951a4a41..77374c29d105d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Track/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Track/ValidatorTest.php
@@ -90,9 +90,9 @@ public function providerTrackData()
                 ],
                 [
                     'parent_id' => 'Parent Track Id can not be empty',
-                    'order_id' => 'Order Id is a required field',
+                    'order_id' => '"Order Id" is required. Enter and try again.',
                     'track_number' => 'Number can not be empty',
-                    'carrier_code' => 'Carrier Code is a required field'
+                    'carrier_code' => '"Carrier Code" is required. Enter and try again.'
                 ]
             ]
         ];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
index e51d912d3f420..f17d18c3be1da 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
@@ -16,9 +16,11 @@
 use Magento\Sales\Model\Order\Shipment\TrackFactory;
 use Magento\Sales\Model\Order\Shipment\Track;
 use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory\ExtensionAttributesProcessor;
 
 /**
  * Class ShipmentDocumentFactoryTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShipmentDocumentFactoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -67,6 +69,11 @@ class ShipmentDocumentFactoryTest extends \PHPUnit\Framework\TestCase
      */
     private $hydratorMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ExtensionAttributesProcessor
+     */
+    private $extensionAttributeProcessorMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Track
      */
@@ -112,10 +119,15 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $this->extensionAttributeProcessorMock = $this->getMockBuilder(ExtensionAttributesProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->shipmentDocumentFactory = new ShipmentDocumentFactory(
             $this->shipmentFactoryMock,
             $this->hydratorPoolMock,
-            $this->trackFactoryMock
+            $this->trackFactoryMock,
+            $this->extensionAttributeProcessorMock
         );
     }
 
@@ -128,6 +140,9 @@ public function testCreate()
         $packages = [];
         $items = [1 => 10];
 
+        $this->extensionAttributeProcessorMock->expects($this->never())->method('execute');
+        $this->itemMock->expects($this->once())->method('getOrderItemId')->willReturn(1);
+        $this->itemMock->expects($this->once())->method('getQty')->willReturn(10);
         $this->itemMock->expects($this->once())
             ->method('getOrderItemId')
             ->willReturn(1);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php
index b4fb645c02f8b..e65b1b8330b93 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentFactoryTest.php
@@ -71,18 +71,31 @@ protected function setUp()
      */
     public function testCreate($tracks)
     {
-        $orderItem = $this->createPartialMock(\Magento\Sales\Model\Order\Item::class, ['getId', 'getQtyOrdered']);
+        $orderItem = $this->createPartialMock(
+            \Magento\Sales\Model\Order\Item::class,
+            ['getId', 'getQtyOrdered', 'getParentItemId', 'getIsVirtual']
+        );
         $orderItem->expects($this->any())
             ->method('getId')
             ->willReturn(1);
         $orderItem->expects($this->any())
             ->method('getQtyOrdered')
             ->willReturn(5);
+        $orderItem->expects($this->any())->method('getParentItemId')->willReturn(false);
+        $orderItem->expects($this->any())->method('getIsVirtual')->willReturn(false);
 
-        $shipmentItem = $this->createPartialMock(\Magento\Sales\Model\Order\Shipment\Item::class, ['setQty']);
+        $shipmentItem = $this->createPartialMock(
+            \Magento\Sales\Model\Order\Shipment\Item::class,
+            ['setQty', 'getOrderItem', 'getQty']
+        );
         $shipmentItem->expects($this->once())
             ->method('setQty')
             ->with(5);
+        $shipmentItem->expects($this->once())
+            ->method('getQty')
+            ->willReturn(5);
+
+        $shipmentItem->expects($this->atLeastOnce())->method('getOrderItem')->willReturn($orderItem);
 
         $order = $this->createPartialMock(\Magento\Sales\Model\Order::class, ['getAllItems']);
         $order->expects($this->any())
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentRepositoryTest.php
index 38097bf4bd562..6785c6c4aec51 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -169,7 +170,7 @@ public function testDelete()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedExceptionMessage Could not delete shipment
+     * @expectedExceptionMessage The shipment couldn't be deleted.
      */
     public function testDeleteWithException()
     {
@@ -226,7 +227,7 @@ public function testSave()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not save shipment
+     * @expectedExceptionMessage The shipment couldn't be saved.
      */
     public function testSaveWithException()
     {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentTest.php
index 5204073454345..a7649b5387cbe 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentTest.php
@@ -25,10 +25,13 @@ class ShipmentTest extends \PHPUnit\Framework\TestCase
     private $commentCollection;
 
     /**
-     * @var \Magento\Sales\Model\Order\shipment
+     * @var Shipment
      */
     private $shipmentModel;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $helperManager = new ObjectManager($this);
@@ -40,6 +43,11 @@ protected function setUp()
         ]);
     }
 
+    /**
+     * Test to Returns increment id
+     *
+     * @return void
+     */
     public function testGetIncrementId()
     {
         $this->shipmentModel->setIncrementId('test_increment_id');
@@ -47,7 +55,10 @@ public function testGetIncrementId()
     }
 
     /**
-     * @covers \Magento\Sales\Model\Order\Shipment::getCommentsCollection
+     * Test to Retrieves comments collection
+     *
+     * @return void
+     * @throws \ReflectionException
      */
     public function testGetCommentsCollection()
     {
@@ -58,35 +69,34 @@ public function testGetCommentsCollection()
             ->disableOriginalConstructor()
             ->setMethods(['setShipment'])
             ->getMock();
-        $shipmentItem->expects(static::once())
-            ->method('setShipment')
+        $shipmentItem->method('setShipment')
             ->with($this->shipmentModel);
         $collection = [$shipmentItem];
 
-        $this->commentCollection->expects(static::once())
+        $this->commentCollection->expects(self::once())
             ->method('setShipmentFilter')
             ->with($shipmentId)
             ->willReturnSelf();
-        $this->commentCollection->expects(static::once())
+        $this->commentCollection->expects(self::once())
             ->method('setCreatedAtOrder')
             ->willReturnSelf();
 
-        $this->commentCollection->expects(static::once())
-            ->method('load')
-            ->willReturnSelf();
-
         $reflection = new \ReflectionClass(Collection::class);
         $reflectionProperty = $reflection->getProperty('_items');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->commentCollection, $collection);
 
-        $expected = $this->shipmentModel->getCommentsCollection();
+        $actual = $this->shipmentModel->getCommentsCollection();
 
-        static::assertEquals($expected, $this->commentCollection);
+        self::assertTrue(is_object($actual));
+        self::assertEquals($this->commentCollection, $actual);
     }
 
     /**
-     * @covers \Magento\Sales\Model\Order\Shipment::getComments
+     * Test to Returns comments
+     *
+     * @return void
+     * @throws \ReflectionException
      */
     public function testGetComments()
     {
@@ -97,30 +107,27 @@ public function testGetComments()
             ->disableOriginalConstructor()
             ->setMethods(['setShipment'])
             ->getMock();
-        $shipmentItem->expects(static::once())
+        $shipmentItem->expects(self::once())
             ->method('setShipment')
             ->with($this->shipmentModel);
         $collection = [$shipmentItem];
 
-        $this->commentCollection->expects(static::once())
-            ->method('setShipmentFilter')
+        $this->commentCollection->method('setShipmentFilter')
             ->with($shipmentId)
             ->willReturnSelf();
 
-        $this->commentCollection->expects(static::once())
-            ->method('load')
-            ->willReturnSelf();
-
         $reflection = new \ReflectionClass(Collection::class);
         $reflectionProperty = $reflection->getProperty('_items');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->commentCollection, $collection);
 
-        $this->commentCollection->expects(static::once())
+        $this->commentCollection->expects(self::once())
             ->method('getItems')
             ->willReturn($collection);
 
-        static::assertEquals($this->shipmentModel->getComments(), $collection);
+        $actual = $this->shipmentModel->getComments();
+        self::assertTrue(is_array($actual));
+        self::assertEquals($collection, $actual);
     }
 
     /**
@@ -131,7 +138,7 @@ private function initCommentsCollectionFactoryMock()
     {
         $this->commentCollection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setShipmentFilter', 'setCreatedAtOrder', 'getItems', 'load', '__wakeup'])
+            ->setMethods(['setShipmentFilter', 'setCreatedAtOrder', 'getItems', 'load'])
             ->getMock();
 
         $this->commentCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
@@ -139,8 +146,7 @@ private function initCommentsCollectionFactoryMock()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->commentCollectionFactory->expects(static::any())
-            ->method('create')
+        $this->commentCollectionFactory->method('create')
             ->willReturn($this->commentCollection);
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php
index b72a9363eb8f7..ce9b57436c6e7 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Status\History;
 
 use \Magento\Sales\Model\Order\Status\History\Validator;
@@ -27,6 +28,6 @@ public function testValidateNegative()
             ->with('parent_id')
             ->will($this->returnValue(false));
         $validator = new Validator();
-        $this->assertEquals(['Order Id is a required field'], $validator->validate($history));
+        $this->assertEquals(['"Order Id" is required. Enter and try again.'], $validator->validate($history));
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/StatusResolverTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/StatusResolverTest.php
index 28c29cd7a3bdf..57a4d5f40aa36 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/StatusResolverTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/StatusResolverTest.php
@@ -27,6 +27,9 @@ public function testGetOrderStatusByState($order, $expectedReturn)
         self::assertEquals($expectedReturn, $actualReturn);
     }
 
+    /**
+     * @return array
+     */
     public function statesDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/StatusTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/StatusTest.php
index 781a55262abf9..d2a08330126dc 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/StatusTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/StatusTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order;
 
 /**
@@ -86,7 +87,7 @@ public function testUnassignStateSuccess()
      *  Test for method unassignState state is last
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The last status can't be unassigned from its current state.
+     * @expectedExceptionMessage The last status can't be changed and needs to stay assigned to its current state.
      */
     public function testUnassignStateStateIsLast()
     {
@@ -105,7 +106,7 @@ public function testUnassignStateStateIsLast()
      * Test for method unassignState status in use
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Status can't be unassigned, because it is used by existing order(s).
+     * @expectedExceptionMessage The status can't be unassigned because the status is currently used by an order.
      */
     public function testUnassignStateStatusUsed()
     {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php
new file mode 100644
index 0000000000000..e53cb7bfdf8c6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model;
+
+/**
+ * Unit test for \Magento\Sales\Model\OrderIncrementIdChecker.
+ */
+class OrderIncrementIdCheckerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
+        $this->selectMock->expects($this->any())->method('where');
+
+        $this->adapterMock = $this->createMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class);
+        $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
+
+        $this->resourceMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order::class);
+        $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($this->adapterMock);
+
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Sales\Model\OrderIncrementIdChecker::class,
+            [
+                'resourceModel' => $this->resourceMock,
+            ]
+        );
+    }
+
+    /**
+     * Unit test to verify if isOrderIncrementIdUsed method works with different types increment ids.
+     *
+     * @param string|int $value
+     * @return void
+     * @dataProvider isOrderIncrementIdUsedDataProvider
+     */
+    public function testIsIncrementIdUsed($value): void
+    {
+        $expectedBind = [':increment_id' => $value];
+        $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
+        $this->model->isIncrementIdUsed($value);
+    }
+
+    /**
+     * @return array
+     */
+    public function isOrderIncrementIdUsedDataProvider(): array
+    {
+        return [[100000001], ['10000000001'], ['M10000000001']];
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
index 3df667094f2a9..2e82d8064a9e8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -9,6 +9,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Model\ResourceModel\Metadata;
+use Magento\Tax\Api\OrderTaxManagementInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -40,8 +41,15 @@ class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $collectionProcessor;
 
+    /**
+     * @var OrderTaxManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderTaxManagementMock;
+
     /**
      * Setup the test
+     *
+     * @return void
      */
     protected function setUp()
     {
@@ -58,34 +66,53 @@ protected function setUp()
         $orderExtensionFactoryMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->orderTaxManagementMock = $this->getMockBuilder(OrderTaxManagementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $this->orderRepository = $this->objectManager->getObject(
             \Magento\Sales\Model\OrderRepository::class,
             [
                 'metadata' => $this->metadata,
                 'searchResultFactory' => $this->searchResultFactory,
                 'collectionProcessor' => $this->collectionProcessor,
-                'orderExtensionFactory' => $orderExtensionFactoryMock
+                'orderExtensionFactory' => $orderExtensionFactoryMock,
+                'orderTaxManagement' => $this->orderTaxManagementMock
             ]
         );
     }
 
+    /**
+     * Test for method getList.
+     *
+     * @return void
+     */
     public function testGetList()
     {
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
         $collectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
-        $itemsMock = $this->getMockBuilder(OrderInterface::class)->disableOriginalConstructor()->getMock();
+        $itemsMock = $this->getMockBuilder(OrderInterface::class)->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $orderTaxDetailsMock = $this->getMockBuilder(\Magento\Tax\Api\Data\OrderTaxDetailsInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAppliedTaxes', 'getItems'])->getMockForAbstractClass();
 
         $extensionAttributes = $this->createPartialMock(
             \Magento\Sales\Api\Data\OrderExtension::class,
-            ['getShippingAssignments']
+            [
+                'getShippingAssignments', 'setShippingAssignments', 'setConvertingFromQuote',
+                'setAppliedTaxes', 'setItemAppliedTaxes'
+            ]
         );
         $shippingAssignmentBuilder = $this->createMock(
             \Magento\Sales\Model\Order\ShippingAssignmentBuilder::class
         );
+        $itemsMock->expects($this->atLeastOnce())->method('getEntityId')->willReturn(1);
         $this->collectionProcessor->expects($this->once())
             ->method('process')
             ->with($searchCriteriaMock, $collectionMock);
-        $itemsMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $itemsMock->expects($this->atLeastOnce())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $this->orderTaxManagementMock->expects($this->atLeastOnce())->method('getOrderTaxDetails')
+            ->willReturn($orderTaxDetailsMock);
         $extensionAttributes->expects($this->any())
             ->method('getShippingAssignments')
             ->willReturn($shippingAssignmentBuilder);
@@ -96,6 +123,11 @@ public function testGetList()
         $this->assertEquals($collectionMock, $this->orderRepository->getList($searchCriteriaMock));
     }
 
+    /**
+     * Test for method save.
+     *
+     * @return void
+     */
     public function testSave()
     {
         $mapperMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index fb1970638753f..f724136eb5154 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -17,6 +17,8 @@
  * Test class for \Magento\Sales\Model\Order
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
 class OrderTest extends \PHPUnit\Framework\TestCase
 {
@@ -114,7 +116,7 @@ protected function setUp()
                 'getParentItemId',
                 'getQuoteItemId',
                 'getLockedDoInvoice',
-                'getProductId'
+                'getProductId',
             ]);
         $this->salesOrderCollectionMock = $this->getMockBuilder(
             \Magento\Sales\Model\ResourceModel\Order\Collection::class
@@ -332,6 +334,21 @@ public function testCanCreditMemo()
         $this->assertTrue($this->order->canCreditmemo());
     }
 
+    /**
+     * Test canCreditMemo method when grand total and paid total are zero.
+     *
+     * @return void
+     */
+    public function testCanCreditMemoForZeroTotal()
+    {
+        $grandTotal = 0;
+        $totalPaid = 0;
+        $totalRefunded = 0;
+        $this->order->setGrandTotal($grandTotal);
+        $this->order->setTotalPaid($totalPaid);
+        $this->assertFalse($this->order->canCreditmemoForZeroTotal($totalRefunded));
+    }
+
     public function testCanNotCreditMemoWithTotalNull()
     {
         $totalPaid = 0;
@@ -845,6 +862,9 @@ protected function prepareItemMock($qtyInvoiced)
             ->will($this->returnValue($itemCollectionMock));
     }
 
+    /**
+     * @return array
+     */
     public function canVoidPaymentDataProvider()
     {
         $data = [];
@@ -856,6 +876,9 @@ public function canVoidPaymentDataProvider()
         return $data;
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderActionFlag()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/RefundInvoiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/RefundInvoiceTest.php
index 5a8c1032cd4fc..5148752e9831a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/RefundInvoiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/RefundInvoiceTest.php
@@ -463,6 +463,9 @@ public function testCouldNotCreditmemoException()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         $creditmemoItemCreationMock = $this->getMockBuilder(CreditmemoItemCreationInterface::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
index 8bc3288af04cf..c95b56d81d6f4 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
@@ -407,6 +407,9 @@ public function testCouldNotCreditmemoException()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridTest.php
new file mode 100644
index 0000000000000..0c38ee9c509a5
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface as ConnectionAdapterInterface;
+use Magento\Sales\Model\ResourceModel\Grid;
+
+/**
+ * Unit tests for \Magento\Sales\Model\ResourceModel\Grid class
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Grid
+     */
+    private $grid;
+
+    /**
+     * @var NotSyncedDataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notSyncedDataProvider;
+
+    /**
+     * @var ConnectionAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $mainTable = 'sales_order';
+
+    /**
+     * @var string
+     */
+    private $gridTable = 'sales_order_grid';
+
+    /**
+     * @var array
+     */
+    private $columns = [
+        'column_1_key' => 'column_1_value',
+        'column_2_key' => 'column_2_value'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->notSyncedDataProvider = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIds'])
+            ->getMockForAbstractClass();
+        $this->connection = $this->getMockBuilder(ConnectionAdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['select', 'fetchAll', 'insertOnDuplicate'])
+            ->getMockForAbstractClass();
+
+        $this->grid = $objectManager->getObject(
+            \Magento\Sales\Model\ResourceModel\Grid::class,
+            [
+                'notSyncedDataProvider' => $this->notSyncedDataProvider,
+                'mainTableName' => $this->mainTable,
+                'gridTableName' => $this->gridTable,
+                'connection' => $this->connection,
+                '_tables' => ['sales_order' => $this->mainTable, 'sales_order_grid' => $this->gridTable],
+                'columns' => $this->columns
+            ]
+        );
+    }
+
+    /**
+     * Test for refreshBySchedule() method
+     */
+    public function testRefreshBySchedule()
+    {
+        $notSyncedIds = ['1', '2', '3'];
+        $fetchResult = ['column_1' => '1', 'column_2' => '2'];
+
+        $this->notSyncedDataProvider->expects($this->atLeastOnce())->method('getIds')->willReturn($notSyncedIds);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['from', 'columns', 'where'])
+            ->getMock();
+        $select->expects($this->atLeastOnce())->method('from')->with(['sales_order' => $this->mainTable], [])
+            ->willReturnSelf();
+        $select->expects($this->atLeastOnce())->method('columns')->willReturnSelf();
+        $select->expects($this->atLeastOnce())->method('where')
+            ->with($this->mainTable . '.entity_id IN (?)', $notSyncedIds)
+            ->willReturnSelf();
+
+        $this->connection->expects($this->atLeastOnce())->method('select')->willReturn($select);
+        $this->connection->expects($this->atLeastOnce())->method('fetchAll')->with($select)->willReturn($fetchResult);
+        $this->connection->expects($this->atLeastOnce())->method('insertOnDuplicate')
+            ->with($this->gridTable, $fetchResult, array_keys($this->columns))
+            ->willReturn(array_count_values($notSyncedIds));
+
+        $this->grid->refreshBySchedule();
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
index a7a615fb0f508..530306d77d3ed 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
@@ -3,145 +3,125 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Model\ResourceModel\Order\Shipment;
 
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Sales\Model\Order\Shipment\Comment as CommentEntity;
+use Magento\Sales\Model\Order\Shipment\Item as ItemEntity;
+use Magento\Sales\Model\Order\Shipment\Track as TrackEntity;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Comment;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Item;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Relation;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Track;
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * Class RelationTest
  */
 class RelationTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Relation
+     * @var Relation
      */
-    protected $relationProcessor;
+    private $relationProcessor;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Item|\PHPUnit_Framework_MockObject_MockObject
+     * @var Item|MockObject
      */
-    protected $itemResourceMock;
+    private $itemResource;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track|\PHPUnit_Framework_MockObject_MockObject
+     * @var Track|MockObject
      */
-    protected $trackResourceMock;
+    private $trackResource;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Comment|MockObject
      */
-    protected $commentResourceMock;
+    private $commentResource;
 
     /**
-     * @var \Magento\Sales\Model\Order\Shipment\Comment|\PHPUnit_Framework_MockObject_MockObject
+     * @var CommentEntity|MockObject
      */
-    protected $commentMock;
+    private $comment;
 
     /**
-     * @var \Magento\Sales\Model\Order\Shipment\Track|\PHPUnit_Framework_MockObject_MockObject
+     * @var TrackEntity|MockObject
      */
-    protected $trackMock;
+    private $track;
 
     /**
-     * @var \Magento\Sales\Model\Order\Shipment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Shipment|MockObject
      */
-    protected $shipmentMock;
+    private $shipment;
 
     /**
-     * @var \Magento\Sales\Model\Order\Shipment\Item|\PHPUnit_Framework_MockObject_MockObject
+     * @var ItemEntity|MockObject
      */
-    protected $itemMock;
+    private $item;
 
-    protected function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
-        $this->itemResourceMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Shipment\Item::class)
+        $this->itemResource = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'save'
-                ]
-            )
             ->getMock();
-        $this->commentResourceMock = $this->getMockBuilder(
-            \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment::class
-        )
+        $this->commentResource = $this->getMockBuilder(Comment::class)
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'save'
-                ]
-            )
             ->getMock();
-        $this->trackResourceMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Shipment\Track::class)
+        $this->trackResource = $this->getMockBuilder(Track::class)
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'save'
-                ]
-            )
             ->getMock();
-        $this->shipmentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+        $this->shipment = $this->getMockBuilder(Shipment::class)
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'getId',
-                    'getItems',
-                    'getTracks',
-                    'getComments',
-                    'getTracksCollection',
-                ]
-            )
             ->getMock();
-        $this->itemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
+        $this->item = $this->getMockBuilder(ItemEntity::class)
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'setParentId'
-                ]
-            )
             ->getMock();
-        $this->trackMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+        $this->track = $this->getMockBuilder(TrackEntity::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->commentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+        $this->comment = $this->getMockBuilder(Shipment::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->relationProcessor = new \Magento\Sales\Model\ResourceModel\Order\Shipment\Relation(
-            $this->itemResourceMock,
-            $this->trackResourceMock,
-            $this->commentResourceMock
+        $this->relationProcessor = new Relation(
+            $this->itemResource,
+            $this->trackResource,
+            $this->commentResource
         );
     }
 
-    public function testProcessRelations()
+    /**
+     * Checks saving shipment relations.
+     *
+     * @throws \Exception
+     */
+    public function testProcessRelations(): void
     {
-        $this->shipmentMock->expects($this->exactly(3))
-            ->method('getId')
+        $this->shipment->method('getId')
             ->willReturn('shipment-id-value');
-        $this->shipmentMock->expects($this->exactly(2))
-            ->method('getItems')
-            ->willReturn([$this->itemMock]);
-        $this->shipmentMock->expects($this->exactly(2))
-            ->method('getComments')
-            ->willReturn([$this->commentMock]);
-        $this->shipmentMock->expects($this->exactly(2))
-            ->method('getTracksCollection')
-            ->willReturn([$this->trackMock]);
-        $this->itemMock->expects($this->once())
-            ->method('setParentId')
+        $this->shipment->method('getItems')
+            ->willReturn([$this->item]);
+        $this->shipment->method('getComments')
+            ->willReturn([$this->comment]);
+        $this->shipment->method('getTracks')
+            ->willReturn([$this->track]);
+        $this->item->method('setParentId')
             ->with('shipment-id-value')
             ->willReturnSelf();
-        $this->itemResourceMock->expects($this->once())
-            ->method('save')
-            ->with($this->itemMock)
+        $this->itemResource->method('save')
+            ->with($this->item)
             ->willReturnSelf();
-        $this->commentResourceMock->expects($this->once())
-            ->method('save')
-            ->with($this->commentMock)
+        $this->commentResource->method('save')
+            ->with($this->comment)
             ->willReturnSelf();
-        $this->trackResourceMock->expects($this->once())
-            ->method('save')
-            ->with($this->trackMock)
+        $this->trackResource->method('save')
+            ->with($this->track)
             ->willReturnSelf();
-        $this->relationProcessor->processRelation($this->shipmentMock);
+        $this->relationProcessor->processRelation($this->shipment);
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
index 8e248d239a501..87e9f201eb758 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Sales\Test\Unit\Model\ResourceModel\Provider;
 
-use Magento\Framework\ObjectManager\TMap;
 use Magento\Framework\ObjectManager\TMapFactory;
 use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider;
 use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class NotSyncedDataProviderTest
+ * Class for testing not synchronized DataProvider.
  */
 class NotSyncedDataProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -23,30 +22,14 @@ public function testGetIdsEmpty()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder(TMap::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
-        $tMapFactory->expects(static::once())
-            ->method('create')
-            ->with(
-                [
-                    'array' => [],
-                    'type' => NotSyncedDataProviderInterface::class
-                ]
-            )
-            ->willReturn($tMap);
-        $tMap->expects(static::once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator([]));
+        $tMapFactory->method('create')
+            ->willReturn([]);
 
-        $provider = new NotSyncedDataProvider($tMapFactory, []);
-        static::assertEquals([], $provider->getIds('main_table', 'grid_table'));
+        $provider = new NotSyncedDataProvider($tMapFactory);
+        self::assertEquals([], $provider->getIds('main_table', 'grid_table'));
     }
 
-    /**
-     * @covers \Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider::getIds
-     */
     public function testGetIds()
     {
         /** @var TMapFactory|MockObject $tMapFactory */
@@ -54,46 +37,31 @@ public function testGetIds()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder(TMap::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $provider1 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
             ->getMockForAbstractClass();
-        $provider1->expects(static::once())
-            ->method('getIds')
+        $provider1->method('getIds')
             ->willReturn([1, 2]);
 
         $provider2 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
             ->getMockForAbstractClass();
-        $provider2->expects(static::once())
-            ->method('getIds')
+        $provider2->method('getIds')
             ->willReturn([2, 3, 4]);
 
-        $tMapFactory->expects(static::once())
-            ->method('create')
-            ->with(
+        $tMapFactory->method('create')
+            ->with(self::equalTo(
                 [
-                    'array' => [
-                        'provider1' => NotSyncedDataProviderInterface::class,
-                        'provider2' => NotSyncedDataProviderInterface::class
-                    ],
+                    'array' => [$provider1, $provider2],
                     'type' => NotSyncedDataProviderInterface::class
                 ]
-            )
-            ->willReturn($tMap);
-        $tMap->expects(static::once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator([$provider1, $provider2]));
+            ))
+            ->willReturn([$provider1, $provider2]);
 
-        $provider = new NotSyncedDataProvider(
-            $tMapFactory,
-            [
-                'provider1' => NotSyncedDataProviderInterface::class,
-                'provider2' => NotSyncedDataProviderInterface::class,
-            ]
-        );
+        $provider = new NotSyncedDataProvider($tMapFactory, [$provider1, $provider2]);
 
-        static::assertEquals([1, 2, 3, 4], array_values($provider->getIds('main_table', 'grid_table')));
+        self::assertEquals(
+            [1, 2, 3, 4],
+            array_values($provider->getIds('main_table', 'grid_table'))
+        );
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Rss/NewOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Rss/NewOrderTest.php
index e3337cf6f57fa..c32d140ad147e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Rss/NewOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Rss/NewOrderTest.php
@@ -32,7 +32,7 @@ class NewOrderTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $urlBuiler;
+    protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -84,7 +84,7 @@ class NewOrderTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->orderFactory = $this->createPartialMock(\Magento\Sales\Model\OrderFactory::class, ['create']);
-        $this->urlBuiler = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
         $this->timezoneInterface = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
         $this->dateTime = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
         $this->scopeConfigInterface = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
@@ -98,7 +98,7 @@ protected function setUp()
             \Magento\Sales\Model\Rss\NewOrder::class,
             [
                 'orderFactory' => $this->orderFactory,
-                'urlBuilder' => $this->urlBuiler,
+                'urlBuilder' => $this->urlBuilder,
                 'rssUrlBuilder' => $this->rssUrlBuilderInterface,
                 'localeDate' => $this->timezoneInterface,
                 'dateTime' => $this->dateTime,
@@ -150,7 +150,7 @@ public function testGetData()
         $block->expects($this->once())->method('toHtml')->will($this->returnValue('Order Description'));
 
         $this->layout->expects($this->once())->method('getBlockSingleton')->will($this->returnValue($block));
-        $this->urlBuiler->expects($this->once())->method('getUrl')
+        $this->urlBuilder->expects($this->once())->method('getUrl')
             ->will($this->returnValue('http://magento.com/sales/order/view/order_id/1'));
         $this->assertEquals($this->feedData, $this->model->getRssData());
     }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
index 9ecab6cf9ab52..68681c6c5a66b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Model\Service;
 
 use Magento\Sales\Model\Order;
 
+use Magento\Sales\Api\Data\CreditmemoInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 /**
  * Class CreditmemoServiceTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -14,34 +19,34 @@
 class CreditmemoServiceTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Sales\Api\CreditmemoRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Sales\Api\CreditmemoRepositoryInterface|MockObject
      */
     protected $creditmemoRepositoryMock;
 
     /**
-     * @var \Magento\Sales\Api\CreditmemoCommentRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Sales\Api\CreditmemoCommentRepositoryInterface|MockObject
      */
     protected $creditmemoCommentRepositoryMock;
 
     /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder|MockObject
      */
     protected $searchCriteriaBuilderMock;
 
     /**
-     * @var \Magento\Framework\Api\FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Api\FilterBuilder|MockObject
      */
     protected $filterBuilderMock;
 
     /**
-     * @var \Magento\Sales\Model\Order\CreditmemoNotifier|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Sales\Model\Order\CreditmemoNotifier|MockObject
      */
     protected $creditmemoNotifierMock;
 
     /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|MockObject
      */
-    private $priceCurrencyMock;
+    private $priceCurrency;
 
     /**
      * @var \Magento\Sales\Model\Service\CreditmemoService
@@ -79,7 +84,7 @@ protected function setUp()
             ['setField', 'setValue', 'setConditionType', 'create']
         );
         $this->creditmemoNotifierMock = $this->createMock(\Magento\Sales\Model\Order\CreditmemoNotifier::class);
-        $this->priceCurrencyMock = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
+        $this->priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
             ->getMockForAbstractClass();
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -91,7 +96,7 @@ protected function setUp()
                 'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
                 'filterBuilder' => $this->filterBuilderMock,
                 'creditmemoNotifier' => $this->creditmemoNotifierMock,
-                'priceCurrency' => $this->priceCurrencyMock,
+                'priceCurrency' => $this->priceCurrency,
             ]
         );
     }
@@ -187,7 +192,79 @@ public function testRefund()
         $orderMock->expects($this->once())->method('getBaseTotalPaid')->willReturn(10);
         $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10);
 
-        $this->priceCurrencyMock->expects($this->any())
+        $this->priceCurrency->expects($this->any())
+            ->method('round')
+            ->willReturnArgument(0);
+
+        // Set payment adapter dependency
+        $refundAdapterMock = $this->getMockBuilder(\Magento\Sales\Model\Order\RefundAdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->creditmemoService,
+            'refundAdapter',
+            $refundAdapterMock
+        );
+
+        // Set resource dependency
+        $resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->creditmemoService,
+            'resource',
+            $resourceMock
+        );
+
+        // Set order repository dependency
+        $orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->creditmemoService,
+            'orderRepository',
+            $orderRepositoryMock
+        );
+
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $resourceMock->expects($this->once())->method('getConnection')->with('sales')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())->method('beginTransaction');
+        $refundAdapterMock->expects($this->once())
+            ->method('refund')
+            ->with($creditMemoMock, $orderMock, false)
+            ->willReturn($orderMock);
+        $orderRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($orderMock);
+        $creditMemoMock->expects($this->once())
+            ->method('getInvoice')
+            ->willReturn(null);
+        $adapterMock->expects($this->once())->method('commit');
+        $this->creditmemoRepositoryMock->expects($this->once())
+            ->method('save');
+
+        $this->assertSame($creditMemoMock, $this->creditmemoService->refund($creditMemoMock, true));
+    }
+
+    public function testRefundPendingCreditMemo()
+    {
+        $creditMemoMock = $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoInterface::class)
+            ->setMethods(['getId', 'getOrder', 'getState', 'getInvoice'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $creditMemoMock->expects($this->once())->method('getId')->willReturn(444);
+        $creditMemoMock->expects($this->once())->method('getState')
+            ->willReturn(\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN);
+        $orderMock = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
+
+        $creditMemoMock->expects($this->atLeastOnce())->method('getOrder')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('getBaseTotalRefunded')->willReturn(0);
+        $orderMock->expects($this->once())->method('getBaseTotalPaid')->willReturn(10);
+        $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10);
+
+        $this->priceCurrency->expects($this->any())
             ->method('round')
             ->willReturnArgument(0);
 
@@ -252,27 +329,32 @@ public function testRefundExpectsMoneyAvailableToReturn()
         $baseGrandTotal = 10;
         $baseTotalRefunded = 9;
         $baseTotalPaid = 10;
-        $creditMemoMock = $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoInterface::class)
-            ->setMethods(['getId', 'getOrder', 'formatBasePrice'])
+        /** @var CreditmemoInterface|MockObject $creditMemo */
+        $creditMemo = $this->getMockBuilder(CreditmemoInterface::class)
+            ->setMethods(['getId', 'getOrder'])
             ->getMockForAbstractClass();
-        $creditMemoMock->expects($this->once())->method('getId')->willReturn(null);
-        $orderMock = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
-        $creditMemoMock->expects($this->atLeastOnce())->method('getOrder')->willReturn($orderMock);
-        $creditMemoMock->expects($this->once())->method('getBaseGrandTotal')->willReturn($baseGrandTotal);
-        $orderMock->expects($this->atLeastOnce())->method('getBaseTotalRefunded')->willReturn($baseTotalRefunded);
-        $this->priceCurrencyMock->expects($this->exactly(2))->method('round')->withConsecutive(
-            [$baseTotalRefunded + $baseGrandTotal],
-            [$baseTotalPaid]
-        )->willReturnOnConsecutiveCalls(
-            $baseTotalRefunded + $baseGrandTotal,
-            $baseTotalPaid
-        );
-        $orderMock->expects($this->atLeastOnce())->method('getBaseTotalPaid')->willReturn($baseTotalPaid);
+        $creditMemo->method('getId')
+            ->willReturn(null);
+        /** @var Order|MockObject $order */
+        $order = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $creditMemo->method('getOrder')
+            ->willReturn($order);
+        $creditMemo->method('getBaseGrandTotal')
+            ->willReturn($baseGrandTotal);
+        $order->method('getBaseTotalRefunded')
+            ->willReturn($baseTotalRefunded);
+        $this->priceCurrency->method('round')
+            ->withConsecutive([$baseTotalRefunded + $baseGrandTotal], [$baseTotalPaid])
+            ->willReturnOnConsecutiveCalls($baseTotalRefunded + $baseGrandTotal, $baseTotalPaid);
+        $order->method('getBaseTotalPaid')
+            ->willReturn($baseTotalPaid);
         $baseAvailableRefund = $baseTotalPaid - $baseTotalRefunded;
-        $orderMock->expects($this->once())->method('formatBasePrice')->with(
-            $baseAvailableRefund
-        )->willReturn($baseAvailableRefund);
-        $this->creditmemoService->refund($creditMemoMock, true);
+        $order->method('formatPriceTxt')
+            ->with($baseAvailableRefund)
+            ->willReturn($baseAvailableRefund);
+        $this->creditmemoService->refund($creditMemo, true);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php
new file mode 100644
index 0000000000000..4236890a2a37d
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\Sales\Model\ValidatorResultInterfaceFactory;
+use Magento\Sales\Model\ValidatorResultMerger;
+
+/**
+ * @covers \Magento\Sales\Model\ValidatorResultMerger
+ */
+class ValidatorResultMergerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ValidatorResultMerger
+     */
+    private $validatorResultMerger;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ValidatorResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorResultFactoryMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->validatorResultFactoryMock = $this->getMockBuilder(ValidatorResultInterfaceFactory::class)
+        ->setMethods(['create'])->disableOriginalConstructor()->getMock();
+        $this->objectManager = new ObjectManager($this);
+        $this->validatorResultMerger = $this->objectManager->getObject(
+            ValidatorResultMerger::class,
+            [
+                'validatorResultInterfaceFactory' => $this->validatorResultFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Test merge method
+     *
+     * @return void
+     */
+    public function testMerge()
+    {
+        $validatorResultMock = $this->createMock(ValidatorResultInterface::class);
+        $orderValidationResultMock = $this->createMock(ValidatorResultInterface::class);
+        $creditmemoValidationResultMock = $this->createMock(ValidatorResultInterface::class);
+        $itemsValidationMessages = [['test04', 'test05'], ['test06']];
+        $this->validatorResultFactoryMock->expects($this->once())->method('create')
+            ->willReturn($validatorResultMock);
+        $orderValidationResultMock->expects($this->once())->method('getMessages')->willReturn(['test01', 'test02']);
+        $creditmemoValidationResultMock->expects($this->once())->method('getMessages')->willReturn(['test03']);
+
+        $validatorResultMock->expects($this->at(0))->method('addMessage')->with('test01');
+        $validatorResultMock->expects($this->at(1))->method('addMessage')->with('test02');
+        $validatorResultMock->expects($this->at(2))->method('addMessage')->with('test03');
+        $validatorResultMock->expects($this->at(3))->method('addMessage')->with('test04');
+        $validatorResultMock->expects($this->at(4))->method('addMessage')->with('test05');
+        $validatorResultMock->expects($this->at(5))->method('addMessage')->with('test06');
+        $expected = $validatorResultMock;
+        $actual = $this->validatorResultMerger->merge(
+            $orderValidationResultMock,
+            $creditmemoValidationResultMock,
+            ...$itemsValidationMessages
+        );
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php
new file mode 100644
index 0000000000000..f4ab2d4f48e6f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\ValidatorResult;
+
+/**
+ * @covers \Magento\Sales\Model\ValidatorResult
+ */
+class ValidatorResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ValidatorResult
+     */
+    private $validatorResult;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->validatorResult = $this->objectManager->getObject(ValidatorResult::class);
+    }
+
+    /**
+     * Test addMessage method
+     *
+     * @return void
+     */
+    public function testAddMessages()
+    {
+        $messageFirst = 'Sample message 01.';
+        $messageSecond = 'Sample messages 02.';
+        $messageThird = 'Sample messages 03.';
+        $expected = [$messageFirst, $messageSecond, $messageThird];
+        $this->validatorResult->addMessage($messageFirst);
+        $this->validatorResult->addMessage($messageSecond);
+        $this->validatorResult->addMessage($messageThird);
+        $actual = $this->validatorResult->getMessages();
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test hasMessages method
+     *
+     * @return void
+     */
+    public function testHasMessages()
+    {
+        $this->assertFalse($this->validatorResult->hasMessages());
+        $messageFirst = 'Sample message 01.';
+        $messageSecond = 'Sample messages 02.';
+        $this->validatorResult->addMessage($messageFirst);
+        $this->validatorResult->addMessage($messageSecond);
+        $this->assertTrue($this->validatorResult->hasMessages());
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorTest.php
new file mode 100644
index 0000000000000..a334cf0e6096f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Validator;
+use Magento\Sales\Model\ValidatorInterface;
+use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\Sales\Model\ValidatorResultInterfaceFactory;
+
+/**
+ * @covers \Magento\Sales\Model\Validator
+ */
+class ValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var Validator
+     */
+    private $validator;
+
+    /**
+     * Object Manager
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var ValidatorResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorResultFactoryMock;
+
+    /**
+     * @var ValidatorResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorResultMock;
+
+    /**
+     * @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorMock;
+
+    /**
+     * @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $this->entityMock = $this->createMock(OrderInterface::class);
+        $this->validatorMock = $this->createMock(ValidatorInterface::class);
+        $this->validatorResultFactoryMock = $this->getMockBuilder(ValidatorResultInterfaceFactory::class)
+            ->setMethods(['create'])->disableOriginalConstructor()->getMock();
+        $this->validatorResultMock = $this->createMock(ValidatorResultInterface::class);
+        $this->validatorResultFactoryMock->expects($this->any())->method('create')
+            ->willReturn($this->validatorResultMock);
+        $this->objectManager = new ObjectManager($this);
+        $this->validator = $this->objectManager->getObject(
+            Validator::class,
+            [
+                'objectManager' => $this->objectManagerMock,
+                'validatorResult' => $this->validatorResultFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Test validate method
+     *
+     * @return void
+     *
+     * @throws ConfigurationMismatchException
+     */
+    public function testValidate()
+    {
+        $validatorName = 'test';
+        $validators = [$validatorName];
+        $context = new DataObject();
+        $validatorArguments = ['context' => $context];
+        $message = __('Sample message.');
+        $messages = [$message];
+
+        $this->objectManagerMock->expects($this->once())->method('create')
+            ->with($validatorName, $validatorArguments)->willReturn($this->validatorMock);
+        $this->validatorMock->expects($this->once())->method('validate')->with($this->entityMock)
+            ->willReturn($messages);
+        $this->validatorResultMock->expects($this->once())->method('addMessage')->with($message);
+
+        $expected = $this->validatorResultMock;
+        $actual = $this->validator->validate($this->entityMock, $validators, $context);
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Test validate method
+     *
+     * @return void
+     *
+     * @throws ConfigurationMismatchException
+     */
+    public function testValidateWithException()
+    {
+        $validatorName = 'test';
+        $validators = [$validatorName];
+        $this->objectManagerMock->expects($this->once())->method('create')->willReturn(null);
+        $this->validatorResultMock->expects($this->never())->method('addMessage');
+        $this->expectException(ConfigurationMismatchException::class);
+        $this->validator->validate($this->entityMock, $validators);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
new file mode 100644
index 0000000000000..c6e02151b9bc1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Observer;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Observer\AssignOrderToCustomerObserver;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * Class AssignOrderToCustomerObserverTest
+ */
+class AssignOrderToCustomerObserverTest extends TestCase
+{
+    /** @var AssignOrderToCustomerObserver */
+    protected $sut;
+
+    /** @var OrderRepositoryInterface|PHPUnit_Framework_MockObject_MockObject */
+    protected $orderRepositoryMock;
+
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->orderRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock);
+    }
+
+    /**
+     * Test assigning order to customer after issuing guest order
+     *
+     * @dataProvider getCustomerIds
+     * @param null|int $customerId
+     * @return void
+     */
+    public function testAssignOrderToCustomerAfterGuestOrder($customerId)
+    {
+        $orderId = 1;
+        /** @var Observer|PHPUnit_Framework_MockObject_MockObject $observerMock */
+        $observerMock = $this->createMock(Observer::class);
+        /** @var Event|PHPUnit_Framework_MockObject_MockObject $eventMock */
+        $eventMock = $this->getMockBuilder(Event::class)->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+        /** @var CustomerInterface|PHPUnit_Framework_MockObject_MockObject $customerMock */
+        $customerMock = $this->createMock(CustomerInterface::class);
+        /** @var OrderInterface|PHPUnit_Framework_MockObject_MockObject $orderMock */
+        $orderMock = $this->getMockBuilder(OrderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+        $eventMock->expects($this->any())->method('getData')
+            ->willReturnMap([
+                ['delegate_data', null, ['__sales_assign_order_id' => $orderId]],
+                ['customer_data_object', null, $customerMock]
+            ]);
+        $orderMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->orderRepositoryMock->expects($this->once())->method('get')->with($orderId)
+            ->willReturn($orderMock);
+        if (!$customerId) {
+            $this->orderRepositoryMock->expects($this->once())->method('save')->with($orderMock);
+            $this->sut->execute($observerMock);
+            return ;
+        }
+
+        $this->orderRepositoryMock->expects($this->never())->method('save')->with($orderMock);
+        $this->sut->execute($observerMock);
+    }
+
+    /**
+     * Customer id assigned to order
+     *
+     * @return array
+     */
+    public function getCustomerIds()
+    {
+        return [[null, 1]];
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Observer/Backend/SubtractQtyFromQuotesObserverTest.php b/app/code/Magento/Sales/Test/Unit/Observer/Backend/SubtractQtyFromQuotesObserverTest.php
index a6a828c888fc0..949121eadee44 100644
--- a/app/code/Magento/Sales/Test/Unit/Observer/Backend/SubtractQtyFromQuotesObserverTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Observer/Backend/SubtractQtyFromQuotesObserverTest.php
@@ -48,7 +48,7 @@ public function testSubtractQtyFromQuotes()
             ['getId', 'getStatus', '__wakeup']
         );
         $this->_eventMock->expects($this->once())->method('getProduct')->will($this->returnValue($productMock));
-        $this->_quoteMock->expects($this->once())->method('substractProductFromQuotes')->with($productMock);
+        $this->_quoteMock->expects($this->once())->method('subtractProductFromQuotes')->with($productMock);
         $this->_model->execute($this->_observerMock);
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Observer/Frontend/AddVatRequestParamsOrderCommentTest.php b/app/code/Magento/Sales/Test/Unit/Observer/Frontend/AddVatRequestParamsOrderCommentTest.php
index 395b653b0be8d..45cbea7307f4d 100644
--- a/app/code/Magento/Sales/Test/Unit/Observer/Frontend/AddVatRequestParamsOrderCommentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Observer/Frontend/AddVatRequestParamsOrderCommentTest.php
@@ -84,6 +84,9 @@ public function testAddVatRequestParamsOrderComment(
         $this->assertNull($this->observer->execute($observer));
     }
 
+    /**
+     * @return array
+     */
     public function addVatRequestParamsOrderCommentDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Observer/Frontend/RestoreCustomerGroupIdTest.php b/app/code/Magento/Sales/Test/Unit/Observer/Frontend/RestoreCustomerGroupIdTest.php
index f0738fbcf3129..f0845c67f1a4a 100644
--- a/app/code/Magento/Sales/Test/Unit/Observer/Frontend/RestoreCustomerGroupIdTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Observer/Frontend/RestoreCustomerGroupIdTest.php
@@ -72,6 +72,9 @@ public function testExecute($configAddressType)
         $this->quote->execute($observer);
     }
 
+    /**
+     * @return array
+     */
     public function restoreCustomerGroupIdDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php b/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php
new file mode 100644
index 0000000000000..51ff936fd5ef7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Unit\Setup;
+
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Test for sales setup model.
+ *
+ * @package Magento\Sales\Test\Unit\Setup
+ */
+class SalesSetupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Setup\SalesSetup
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleDataSetupMock;
+
+    /**
+     * @var \Magento\Eav\Model\Entity\Setup\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cacheMock;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    protected function setUp()
+    {
+        $this->moduleDataSetupMock = $this->getMockBuilder(\Magento\Framework\Setup\ModuleDataSetupInterface::class)
+            ->getMockForAbstractClass();
+        $this->contextMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Setup\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cacheMock = $this->getMockBuilder(\Magento\Framework\App\CacheInterface::class)
+            ->getMockForAbstractClass();
+        $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Sales\Setup\SalesSetup::class,
+            [
+                'setup' => $this->moduleDataSetupMock,
+                'context' => $this->contextMock,
+                'cache' => $this->cacheMock,
+                'attrGroupCollectionFactory' => $this->collectionFactoryMock,
+                'config' => $this->scopeConfigMock
+            ]
+        );
+    }
+
+    public function testGetConnection()
+    {
+        $this->moduleDataSetupMock->expects($this->once())
+            ->method('getConnection')
+            ->with('sales');
+        $this->model->getConnection();
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
index 1a903ab68952c..c79b06da60c4e 100644
--- a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
@@ -47,7 +47,7 @@ public function testPrepareDataSource()
     {
         $itemName = 'itemName';
         $oldItemValue = "itemValue\n";
-        $newItemValue = 'itemValue<br/>';
+        $newItemValue = "itemValue<br />\n";
         $dataSource = [
             'data' => [
                 'items' => [
@@ -57,7 +57,7 @@ public function testPrepareDataSource()
         ];
 
         $this->model->setData('name', $itemName);
-        $this->escaper->expects($this->once())->method('escapeHtml')->with($newItemValue)->willReturnArgument(0);
+        $this->escaper->expects($this->any())->method('escapeHtml')->with($oldItemValue)->willReturnArgument(0);
         $dataSource = $this->model->prepareDataSource($dataSource);
         $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
     }
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
index 23a6e7a41a5b7..d900bb7ba670f 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
@@ -49,9 +49,7 @@ public function prepareDataSource(array $dataSource)
     {
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
-                $item[$this->getData('name')] = $this->escaper->escapeHtml(
-                    str_replace("\n", '<br/>', $item[$this->getData('name')])
-                );
+                $item[$this->getData('name')] = nl2br($this->escaper->escapeHtml($item[$this->getData('name')]));
             }
         }
 
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
index 1144321ac0b56..5d95c7b94d8fa 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
diff --git a/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php b/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php
new file mode 100644
index 0000000000000..333ab4066ac80
--- /dev/null
+++ b/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\ViewModel\Customer;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Customer address formatter
+ */
+class AddressFormatter implements ArgumentInterface
+{
+    /**
+     * Customer form factory
+     *
+     * @var \Magento\Customer\Model\Metadata\FormFactory
+     */
+    private $customerFormFactory;
+
+    /**
+     * Address format helper
+     *
+     * @var \Magento\Customer\Helper\Address
+     */
+    private $addressFormatHelper;
+
+    /**
+     * Directory helper
+     *
+     * @var \Magento\Directory\Helper\Data
+     */
+    private $directoryHelper;
+
+    /**
+     * Session quote
+     *
+     * @var \Magento\Backend\Model\Session\Quote
+     */
+    private $session;
+
+    /**
+     * Json encoder
+     *
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $jsonEncoder;
+
+    /**
+     * Customer address
+     *
+     * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
+     * @param \Magento\Customer\Helper\Address $addressFormatHelper
+     * @param \Magento\Directory\Helper\Data $directoryHelper
+     * @param \Magento\Backend\Model\Session\Quote $session
+     * @param \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
+     */
+    public function __construct(
+        \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
+        \Magento\Customer\Helper\Address $addressFormatHelper,
+        \Magento\Directory\Helper\Data $directoryHelper,
+        \Magento\Backend\Model\Session\Quote $session,
+        \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
+    ) {
+        $this->customerFormFactory = $customerFormFactory;
+        $this->addressFormatHelper = $addressFormatHelper;
+        $this->directoryHelper = $directoryHelper;
+        $this->session = $session;
+        $this->jsonEncoder = $jsonEncoder;
+    }
+
+    /**
+     * Return customer address array as JSON
+     *
+     * @param array $addressArray
+     *
+     * @return string
+     */
+    public function getAddressesJson(array $addressArray): string
+    {
+        $data = $this->getEmptyAddressForm();
+        foreach ($addressArray as $addressId => $address) {
+            $addressForm = $this->customerFormFactory->create(
+                'customer_address',
+                'adminhtml_customer_address',
+                $address
+            );
+            $data[$addressId] = $addressForm->outputData(
+                \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON
+            );
+        }
+
+        return $this->jsonEncoder->serialize($data);
+    }
+
+    /**
+     * Represent customer address in 'online' format.
+     *
+     * @param array $address
+     * @return string
+     */
+    public function getAddressAsString(array $address): string
+    {
+        $formatTypeRenderer = $this->addressFormatHelper->getFormatTypeRenderer('oneline');
+        $result = '';
+        if ($formatTypeRenderer) {
+            $result = $formatTypeRenderer->renderArray($address);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return empty address address form
+     *
+     * @return array
+     */
+    private function getEmptyAddressForm(): array
+    {
+        $defaultCountryId = $this->directoryHelper->getDefaultCountry($this->session->getStore());
+        $emptyAddressForm = $this->customerFormFactory->create(
+            'customer_address',
+            'adminhtml_customer_address',
+            [\Magento\Customer\Api\Data\AddressInterface::COUNTRY_ID => $defaultCountryId]
+        );
+
+        return [0 => $emptyAddressForm->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON)];
+    }
+}
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index 1797a3122c32e..4286fbb506a53 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -5,37 +5,37 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-gift-message": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-reports": "100.3.*",
-        "magento/module-sales-rule": "100.3.*",
-        "magento/module-sales-sequence": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-widget": "100.3.*",
-        "magento/module-wishlist": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-bundle": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-sales-sample-data": "Sample Data version:100.3.*"
+        "magento/module-sales-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index 8f004d9ad5968..1b2f8b88d7dc3 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -48,6 +48,13 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
+            <group id="zerograndtotal_creditmemo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Allow Zero GrandTotal</label>
+                <field id="allow_zero_grandtotal" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Allow Zero GrandTotal for Creditmemo</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
             <group id="identity" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Invoice and Packing Slip Design</label>
                 <field id="logo" translate="label comment" type="image" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -106,15 +113,15 @@
                     <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" 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">
+                <field id="use_aggregated_data" translate="label comment" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Use Aggregated Data</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <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" 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>
@@ -132,6 +139,14 @@
                     <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
                     <backend_model>Magento\Sales\Model\Config\Backend\Email\AsyncSending</backend_model>
                 </field>
+                <field id="sending_limit" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Limit per cron run</label>
+                    <comment>Limit how many entities (orders/shipments/etc) will be processed during one cron run.</comment>
+                    <validate>required-number validate-number validate-greater-than-zero</validate>
+                    <depends>
+                        <field id="async_sending">1</field>
+                    </depends>
+                </field>
             </group>
             <group id="order" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Order</label>
@@ -393,7 +408,7 @@
             </group>
         </section>
         <section id="rss">
-            <group id="order" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="order" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Order</label>
                 <field id="status" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Customer Order Status Notification</label>
@@ -402,7 +417,7 @@
             </group>
         </section>
         <section id="dev">
-            <group id="grid" type="text" sortOrder="131" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="grid" translate="label" type="text" sortOrder="131" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Grid Settings</label>
                 <field id="async_indexing" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Asynchronous indexing</label>
diff --git a/app/code/Magento/Sales/etc/config.xml b/app/code/Magento/Sales/etc/config.xml
index da2408416133d..5be06fa3836a7 100644
--- a/app/code/Magento/Sales/etc/config.xml
+++ b/app/code/Magento/Sales/etc/config.xml
@@ -18,6 +18,9 @@
             <reorder>
                 <allow>1</allow>
             </reorder>
+            <zerograndtotal_creditmemo>
+                <allow_zero_grandtotal>1</allow_zero_grandtotal>
+            </zerograndtotal_creditmemo>
             <minimum_order>
                 <tax_including>1</tax_including>
             </minimum_order>
@@ -29,6 +32,7 @@
         <sales_email>
             <general>
                 <async_sending>0</async_sending>
+                <sending_limit>50</sending_limit>
             </general>
             <order>
                 <enabled>1</enabled>
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
new file mode 100644
index 0000000000000..da6d2bba552da
--- /dev/null
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -0,0 +1,2063 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="sales_order" resource="sales" engine="innodb" comment="Sales Flat Order">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="varchar" name="state" nullable="true" length="32" comment="State"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="32" comment="Status"/>
+        <column xsi:type="varchar" name="coupon_code" nullable="true" length="255" comment="Coupon Code"/>
+        <column xsi:type="varchar" name="protect_code" nullable="true" length="255" comment="Protect Code"/>
+        <column xsi:type="varchar" name="shipping_description" nullable="true" length="255"
+                comment="Shipping Description"/>
+        <column xsi:type="smallint" name="is_virtual" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Virtual"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="base_discount_canceled" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Canceled"/>
+        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Invoiced"/>
+        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Refunded"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Grand Total"/>
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Amount"/>
+        <column xsi:type="decimal" name="base_shipping_canceled" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Canceled"/>
+        <column xsi:type="decimal" name="base_shipping_invoiced" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Invoiced"/>
+        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Refunded"/>
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="base_shipping_tax_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Tax Refunded"/>
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Subtotal"/>
+        <column xsi:type="decimal" name="base_subtotal_canceled" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Canceled"/>
+        <column xsi:type="decimal" name="base_subtotal_invoiced" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Invoiced"/>
+        <column xsi:type="decimal" name="base_subtotal_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Refunded"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="base_tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Canceled"/>
+        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Invoiced"/>
+        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Refunded"/>
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Global Rate"/>
+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Order Rate"/>
+        <column xsi:type="decimal" name="base_total_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Canceled"/>
+        <column xsi:type="decimal" name="base_total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Invoiced"/>
+        <column xsi:type="decimal" name="base_total_invoiced_cost" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Total Invoiced Cost"/>
+        <column xsi:type="decimal" name="base_total_offline_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Total Offline Refunded"/>
+        <column xsi:type="decimal" name="base_total_online_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Total Online Refunded"/>
+        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Paid"/>
+        <column xsi:type="decimal" name="base_total_qty_ordered" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Total Qty Ordered"/>
+        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Refunded"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Amount"/>
+        <column xsi:type="decimal" name="discount_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Canceled"/>
+        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Invoiced"/>
+        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Refunded"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Grand Total"/>
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Amount"/>
+        <column xsi:type="decimal" name="shipping_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Canceled"/>
+        <column xsi:type="decimal" name="shipping_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Invoiced"/>
+        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Refunded"/>
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="shipping_tax_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Shipping Tax Refunded"/>
+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Store To Base Rate"/>
+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Store To Order Rate"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="subtotal_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Canceled"/>
+        <column xsi:type="decimal" name="subtotal_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Invoiced"/>
+        <column xsi:type="decimal" name="subtotal_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Refunded"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Amount"/>
+        <column xsi:type="decimal" name="tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Canceled"/>
+        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Invoiced"/>
+        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Refunded"/>
+        <column xsi:type="decimal" name="total_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Canceled"/>
+        <column xsi:type="decimal" name="total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Invoiced"/>
+        <column xsi:type="decimal" name="total_offline_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Total Offline Refunded"/>
+        <column xsi:type="decimal" name="total_online_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Total Online Refunded"/>
+        <column xsi:type="decimal" name="total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Paid"/>
+        <column xsi:type="decimal" name="total_qty_ordered" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Qty Ordered"/>
+        <column xsi:type="decimal" name="total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Refunded"/>
+        <column xsi:type="smallint" name="can_ship_partially" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Can Ship Partially"/>
+        <column xsi:type="smallint" name="can_ship_partially_item" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Can Ship Partially Item"/>
+        <column xsi:type="smallint" name="customer_is_guest" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Customer Is Guest"/>
+        <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Customer Note Notify"/>
+        <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Billing Address Id"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="int" name="edit_increment" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Edit Increment"/>
+        <column xsi:type="smallint" name="email_sent" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Email Sent"/>
+        <column xsi:type="smallint" name="send_email" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Send Email"/>
+        <column xsi:type="smallint" name="forced_shipment_with_invoice" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Forced Do Shipment With Invoice"/>
+        <column xsi:type="int" name="payment_auth_expiration" padding="11" unsigned="false" nullable="true"
+                identity="false" comment="Payment Authorization Expiration"/>
+        <column xsi:type="int" name="quote_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Quote Address Id"/>
+        <column xsi:type="int" name="quote_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Quote Id"/>
+        <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Shipping Address Id"/>
+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment Negative"/>
+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment Positive"/>
+        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Adjustment Negative"/>
+        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Adjustment Positive"/>
+        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Discount Amount"/>
+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="base_total_due" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Due"/>
+        <column xsi:type="decimal" name="payment_authorization_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Payment Authorization Amount"/>
+        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Shipping Discount Amount"/>
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="total_due" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Due"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Weight"/>
+        <column xsi:type="datetime" name="customer_dob" on_update="false" nullable="true" comment="Customer Dob"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="32" comment="Increment Id"/>
+        <column xsi:type="varchar" name="applied_rule_ids" nullable="true" length="128" comment="Applied Rule Ids"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="128" comment="Customer Email"/>
+        <column xsi:type="varchar" name="customer_firstname" nullable="true" length="128" comment="Customer Firstname"/>
+        <column xsi:type="varchar" name="customer_lastname" nullable="true" length="128" comment="Customer Lastname"/>
+        <column xsi:type="varchar" name="customer_middlename" nullable="true" length="128"
+                comment="Customer Middlename"/>
+        <column xsi:type="varchar" name="customer_prefix" nullable="true" length="32" comment="Customer Prefix"/>
+        <column xsi:type="varchar" name="customer_suffix" nullable="true" length="32" comment="Customer Suffix"/>
+        <column xsi:type="varchar" name="customer_taxvat" nullable="true" length="32" comment="Customer Taxvat"/>
+        <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
+                comment="Discount Description"/>
+        <column xsi:type="varchar" name="ext_customer_id" nullable="true" length="32" comment="Ext Customer Id"/>
+        <column xsi:type="varchar" name="ext_order_id" nullable="true" length="32" comment="Ext Order Id"/>
+        <column xsi:type="varchar" name="global_currency_code" nullable="true" length="3"
+                comment="Global Currency Code"/>
+        <column xsi:type="varchar" name="hold_before_state" nullable="true" length="32" comment="Hold Before State"/>
+        <column xsi:type="varchar" name="hold_before_status" nullable="true" length="32" comment="Hold Before Status"/>
+        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="3" comment="Order Currency Code"/>
+        <column xsi:type="varchar" name="original_increment_id" nullable="true" length="32"
+                comment="Original Increment Id"/>
+        <column xsi:type="varchar" name="relation_child_id" nullable="true" length="32" comment="Relation Child Id"/>
+        <column xsi:type="varchar" name="relation_child_real_id" nullable="true" length="32"
+                comment="Relation Child Real Id"/>
+        <column xsi:type="varchar" name="relation_parent_id" nullable="true" length="32" comment="Relation Parent Id"/>
+        <column xsi:type="varchar" name="relation_parent_real_id" nullable="true" length="32"
+                comment="Relation Parent Real Id"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
+        <column xsi:type="varchar" name="shipping_method" nullable="true" length="120"/>
+        <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
+        <column xsi:type="varchar" name="store_name" nullable="true" length="32" comment="Store Name"/>
+        <column xsi:type="varchar" name="x_forwarded_for" nullable="true" length="32" comment="X Forwarded For"/>
+        <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="total_item_count" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Total Item Count"/>
+        <column xsi:type="int" name="customer_gender" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Customer Gender"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Invoiced"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Invoiced"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Refunded"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Refunded"/>
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Incl Tax"/>
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Incl Tax"/>
+        <column xsi:type="varchar" name="coupon_rule_name" nullable="true" length="255"
+                comment="Coupon Sales Rule Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="sales_order"
+                    column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
+                    onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STORE_ID_STORE_STORE_ID" table="sales_order" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_ORDER_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_ORDER_STATUS" indexType="btree">
+            <column name="status"/>
+        </index>
+        <index referenceId="SALES_ORDER_STATE" indexType="btree">
+            <column name="state"/>
+        </index>
+        <index referenceId="SALES_ORDER_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_ORDER_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_EXT_ORDER_ID" indexType="btree">
+            <column name="ext_order_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_QUOTE_ID" indexType="btree">
+            <column name="quote_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_ORDER_SEND_EMAIL" indexType="btree">
+            <column name="send_email"/>
+        </index>
+        <index referenceId="SALES_ORDER_EMAIL_SENT" indexType="btree">
+            <column name="email_sent"/>
+        </index>
+    </table>
+    <table name="sales_order_grid" resource="sales" engine="innodb" comment="Sales Flat Order Grid">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity Id"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="32" comment="Status"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Grand Total"/>
+        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Paid"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Grand Total"/>
+        <column xsi:type="decimal" name="total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Paid"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
+        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="255"
+                comment="Order Currency Code"/>
+        <column xsi:type="varchar" name="shipping_name" nullable="true" length="255" comment="Shipping Name"/>
+        <column xsi:type="varchar" name="billing_name" nullable="true" length="255" comment="Billing Name"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
+        <column xsi:type="varchar" name="billing_address" nullable="true" length="255" comment="Billing Address"/>
+        <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
+        <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
+                comment="Shipping Method Name"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="255" comment="Customer Email"/>
+        <column xsi:type="varchar" name="customer_group" nullable="true" length="255" comment="Customer Group"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Shipping and handling amount"/>
+        <column xsi:type="varchar" name="customer_name" nullable="true" length="255" comment="Customer Name"/>
+        <column xsi:type="varchar" name="payment_method" nullable="true" length="255" comment="Payment Method"/>
+        <column xsi:type="decimal" name="total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Refunded"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SALES_ORDER_GRID_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_ORDER_GRID_STATUS" indexType="btree">
+            <column name="status"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_BASE_GRAND_TOTAL" indexType="btree">
+            <column name="base_grand_total"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_BASE_TOTAL_PAID" indexType="btree">
+            <column name="base_total_paid"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_GRAND_TOTAL" indexType="btree">
+            <column name="grand_total"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_TOTAL_PAID" indexType="btree">
+            <column name="total_paid"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_SHIPPING_NAME" indexType="btree">
+            <column name="shipping_name"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_BILLING_NAME" indexType="btree">
+            <column name="billing_name"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_GRID_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="FTI_65B9E9925EC58F0C7C2E2F6379C233E7" indexType="fulltext">
+            <column name="increment_id"/>
+            <column name="billing_name"/>
+            <column name="shipping_name"/>
+            <column name="shipping_address"/>
+            <column name="billing_address"/>
+            <column name="customer_name"/>
+            <column name="customer_email"/>
+        </index>
+    </table>
+    <table name="sales_order_address" resource="sales" engine="innodb" comment="Sales Flat Order Address">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="int" name="customer_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Customer Address Id"/>
+        <column xsi:type="int" name="quote_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Quote Address Id"/>
+        <column xsi:type="int" name="region_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Region Id"/>
+        <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="varchar" name="fax" nullable="true" length="255" comment="Fax"/>
+        <column xsi:type="varchar" name="region" nullable="true" length="255" comment="Region"/>
+        <column xsi:type="varchar" name="postcode" nullable="true" length="255" comment="Postcode"/>
+        <column xsi:type="varchar" name="lastname" nullable="true" length="255" comment="Lastname"/>
+        <column xsi:type="varchar" name="street" nullable="true" length="255" comment="Street"/>
+        <column xsi:type="varchar" name="city" nullable="true" length="255" comment="City"/>
+        <column xsi:type="varchar" name="email" nullable="true" length="255" comment="Email"/>
+        <column xsi:type="varchar" name="telephone" nullable="true" length="255" comment="Phone Number"/>
+        <column xsi:type="varchar" name="country_id" nullable="true" length="2" comment="Country Id"/>
+        <column xsi:type="varchar" name="firstname" nullable="true" length="255" comment="Firstname"/>
+        <column xsi:type="varchar" name="address_type" nullable="true" length="255" comment="Address Type"/>
+        <column xsi:type="varchar" name="prefix" nullable="true" length="255" comment="Prefix"/>
+        <column xsi:type="varchar" name="middlename" nullable="true" length="255" comment="Middlename"/>
+        <column xsi:type="varchar" name="suffix" nullable="true" length="255" comment="Suffix"/>
+        <column xsi:type="varchar" name="company" nullable="true" length="255" comment="Company"/>
+        <column xsi:type="text" name="vat_id" nullable="true" comment="Vat Id"/>
+        <column xsi:type="smallint" name="vat_is_valid" padding="6" unsigned="false" nullable="true" identity="false"
+                comment="Vat Is Valid"/>
+        <column xsi:type="text" name="vat_request_id" nullable="true" comment="Vat Request Id"/>
+        <column xsi:type="text" name="vat_request_date" nullable="true" comment="Vat Request Date"/>
+        <column xsi:type="smallint" name="vat_request_success" padding="6" unsigned="false" nullable="true"
+                identity="false" comment="Vat Request Success"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_ADDRESS_PARENT_ID_SALES_ORDER_ENTITY_ID"
+                    table="sales_order_address" column="parent_id" referenceTable="sales_order"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_ORDER_ADDRESS_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_order_status_history" resource="sales" engine="innodb" comment="Sales Flat Order Status History">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="int" name="is_customer_notified" padding="11" unsigned="false" nullable="true"
+                identity="false" comment="Is Customer Notified"/>
+        <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible On Front"/>
+        <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="32" comment="Status"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="varchar" name="entity_name" nullable="true" length="32"
+                comment="Shows what entity history is bind to."/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_HISTORY_PARENT_ID_SALES_ORDER_ENTITY_ID"
+                    table="sales_order_status_history" column="parent_id" referenceTable="sales_order"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_ORDER_STATUS_HISTORY_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_STATUS_HISTORY_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+    </table>
+    <table name="sales_order_item" resource="sales" engine="innodb" comment="Sales Flat Order Item">
+        <column xsi:type="int" name="item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Item Id"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Order Id"/>
+        <column xsi:type="int" name="parent_item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent Item Id"/>
+        <column xsi:type="int" name="quote_item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Quote Item Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_type" nullable="true" length="255" comment="Product Type"/>
+        <column xsi:type="text" name="product_options" nullable="true" comment="Product Options"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true" default="0"
+                comment="Weight"/>
+        <column xsi:type="smallint" name="is_virtual" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Virtual"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="text" name="applied_rule_ids" nullable="true" comment="Applied Rule Ids"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="smallint" name="is_qty_decimal" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Qty Decimal"/>
+        <column xsi:type="smallint" name="no_discount" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="No Discount"/>
+        <column xsi:type="decimal" name="qty_backordered" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Qty Backordered"/>
+        <column xsi:type="decimal" name="qty_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Qty Canceled"/>
+        <column xsi:type="decimal" name="qty_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Qty Invoiced"/>
+        <column xsi:type="decimal" name="qty_ordered" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Qty Ordered"/>
+        <column xsi:type="decimal" name="qty_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Qty Refunded"/>
+        <column xsi:type="decimal" name="qty_shipped" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Qty Shipped"/>
+        <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Base Cost"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Price"/>
+        <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Price"/>
+        <column xsi:type="decimal" name="original_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Original Price"/>
+        <column xsi:type="decimal" name="base_original_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Original Price"/>
+        <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Tax Percent"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Tax Amount"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Tax Invoiced"/>
+        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Base Tax Invoiced"/>
+        <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Discount Percent"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Discount Invoiced"/>
+        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Base Discount Invoiced"/>
+        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Amount Refunded"/>
+        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" default="0" comment="Base Amount Refunded"/>
+        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Row Total"/>
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Row Total"/>
+        <column xsi:type="decimal" name="row_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Row Invoiced"/>
+        <column xsi:type="decimal" name="base_row_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Base Row Invoiced"/>
+        <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
+                default="0" comment="Row Weight"/>
+        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Tax Before Discount"/>
+        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Before Discount"/>
+        <column xsi:type="varchar" name="ext_order_item_id" nullable="true" length="255" comment="Ext Order Item Id"/>
+        <column xsi:type="smallint" name="locked_do_invoice" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Locked Do Invoice"/>
+        <column xsi:type="smallint" name="locked_do_ship" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Locked Do Ship"/>
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price Incl Tax"/>
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price Incl Tax"/>
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Invoiced"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Invoiced"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Refunded"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Refunded"/>
+        <column xsi:type="decimal" name="tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Canceled"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_canceled" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Canceled"/>
+        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Refunded"/>
+        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Refunded"/>
+        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Refunded"/>
+        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Refunded"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_ITEM_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_order_item"
+                    column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_ITEM_STORE_ID_STORE_STORE_ID" table="sales_order_item"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <index referenceId="SALES_ORDER_ITEM_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="SALES_ORDER_ITEM_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_order_payment" resource="sales" engine="innodb" comment="Sales Flat Order Payment">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="decimal" name="base_shipping_captured" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Captured"/>
+        <column xsi:type="decimal" name="shipping_captured" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Captured"/>
+        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Amount Refunded"/>
+        <column xsi:type="decimal" name="base_amount_paid" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Amount Paid"/>
+        <column xsi:type="decimal" name="amount_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Amount Canceled"/>
+        <column xsi:type="decimal" name="base_amount_authorized" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Amount Authorized"/>
+        <column xsi:type="decimal" name="base_amount_paid_online" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Amount Paid Online"/>
+        <column xsi:type="decimal" name="base_amount_refunded_online" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Amount Refunded Online"/>
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Amount"/>
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Amount"/>
+        <column xsi:type="decimal" name="amount_paid" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Amount Paid"/>
+        <column xsi:type="decimal" name="amount_authorized" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Amount Authorized"/>
+        <column xsi:type="decimal" name="base_amount_ordered" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Amount Ordered"/>
+        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Refunded"/>
+        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Refunded"/>
+        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Amount Refunded"/>
+        <column xsi:type="decimal" name="amount_ordered" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Amount Ordered"/>
+        <column xsi:type="decimal" name="base_amount_canceled" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Amount Canceled"/>
+        <column xsi:type="int" name="quote_payment_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Quote Payment Id"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="varchar" name="cc_exp_month" nullable="true" length="12" comment="Cc Exp Month"/>
+        <column xsi:type="varchar" name="cc_ss_start_year" nullable="true" length="12" comment="Cc Ss Start Year"/>
+        <column xsi:type="varchar" name="echeck_bank_name" nullable="true" length="128" comment="Echeck Bank Name"/>
+        <column xsi:type="varchar" name="method" nullable="true" length="128" comment="Method"/>
+        <column xsi:type="varchar" name="cc_debug_request_body" nullable="true" length="32"
+                comment="Cc Debug Request Body"/>
+        <column xsi:type="varchar" name="cc_secure_verify" nullable="true" length="32" comment="Cc Secure Verify"/>
+        <column xsi:type="varchar" name="protection_eligibility" nullable="true" length="32"
+                comment="Protection Eligibility"/>
+        <column xsi:type="varchar" name="cc_approval" nullable="true" length="32" comment="Cc Approval"/>
+        <column xsi:type="varchar" name="cc_last_4" nullable="true" length="100" comment="Cc Last 4"/>
+        <column xsi:type="varchar" name="cc_status_description" nullable="true" length="32"
+                comment="Cc Status Description"/>
+        <column xsi:type="varchar" name="echeck_type" nullable="true" length="32" comment="Echeck Type"/>
+        <column xsi:type="varchar" name="cc_debug_response_serialized" nullable="true" length="32"
+                comment="Cc Debug Response Serialized"/>
+        <column xsi:type="varchar" name="cc_ss_start_month" nullable="true" length="128" comment="Cc Ss Start Month"/>
+        <column xsi:type="varchar" name="echeck_account_type" nullable="true" length="255"
+                comment="Echeck Account Type"/>
+        <column xsi:type="varchar" name="last_trans_id" nullable="true" length="255" comment="Last Trans Id"/>
+        <column xsi:type="varchar" name="cc_cid_status" nullable="true" length="32" comment="Cc Cid Status"/>
+        <column xsi:type="varchar" name="cc_owner" nullable="true" length="128" comment="Cc Owner"/>
+        <column xsi:type="varchar" name="cc_type" nullable="true" length="32" comment="Cc Type"/>
+        <column xsi:type="varchar" name="po_number" nullable="true" length="32" comment="Po Number"/>
+        <column xsi:type="varchar" name="cc_exp_year" nullable="true" length="4" comment="Cc Exp Year"/>
+        <column xsi:type="varchar" name="cc_status" nullable="true" length="4" comment="Cc Status"/>
+        <column xsi:type="varchar" name="echeck_routing_number" nullable="true" length="32"
+                comment="Echeck Routing Number"/>
+        <column xsi:type="varchar" name="account_status" nullable="true" length="32" comment="Account Status"/>
+        <column xsi:type="varchar" name="anet_trans_method" nullable="true" length="32" comment="Anet Trans Method"/>
+        <column xsi:type="varchar" name="cc_debug_response_body" nullable="true" length="32"
+                comment="Cc Debug Response Body"/>
+        <column xsi:type="varchar" name="cc_ss_issue" nullable="true" length="32" comment="Cc Ss Issue"/>
+        <column xsi:type="varchar" name="echeck_account_name" nullable="true" length="32"
+                comment="Echeck Account Name"/>
+        <column xsi:type="varchar" name="cc_avs_status" nullable="true" length="32" comment="Cc Avs Status"/>
+        <column xsi:type="varchar" name="cc_number_enc" nullable="true" length="128"/>
+        <column xsi:type="varchar" name="cc_trans_id" nullable="true" length="32" comment="Cc Trans Id"/>
+        <column xsi:type="varchar" name="address_status" nullable="true" length="32" comment="Address Status"/>
+        <column xsi:type="text" name="additional_information" nullable="true" comment="Additional Information"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_PAYMENT_PARENT_ID_SALES_ORDER_ENTITY_ID"
+                    table="sales_order_payment" column="parent_id" referenceTable="sales_order"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_ORDER_PAYMENT_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_shipment" resource="sales" engine="innodb" comment="Sales Flat Shipment">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="decimal" name="total_weight" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Weight"/>
+        <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Qty"/>
+        <column xsi:type="smallint" name="email_sent" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Email Sent"/>
+        <column xsi:type="smallint" name="send_email" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Send Email"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Shipping Address Id"/>
+        <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Billing Address Id"/>
+        <column xsi:type="int" name="shipment_status" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Shipment Status"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="text" name="packages" nullable="true" comment="Packed Products in Packages"/>
+        <column xsi:type="mediumblob" name="shipping_label" nullable="true" comment="Shipping Label Content"/>
+        <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
+        <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Customer Note Notify"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_shipment"
+                    column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_STORE_ID_STORE_STORE_ID" table="sales_shipment"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_SHIPMENT_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_SHIPMENT_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_TOTAL_QTY" indexType="btree">
+            <column name="total_qty"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_SEND_EMAIL" indexType="btree">
+            <column name="send_email"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_EMAIL_SENT" indexType="btree">
+            <column name="email_sent"/>
+        </index>
+    </table>
+    <table name="sales_shipment_grid" resource="sales" engine="innodb" comment="Sales Flat Shipment Grid">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity Id"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_increment_id" nullable="false" length="32" comment="Order Increment Id"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="false"
+                default="CURRENT_TIMESTAMP" comment="Order Increment Id"/>
+        <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
+        <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Qty"/>
+        <column xsi:type="int" name="shipment_status" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Shipment Status"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="32" comment="Order"/>
+        <column xsi:type="varchar" name="billing_address" nullable="true" length="255" comment="Billing Address"/>
+        <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
+        <column xsi:type="varchar" name="billing_name" nullable="true" length="128" comment="Billing Name"/>
+        <column xsi:type="varchar" name="shipping_name" nullable="true" length="128" comment="Shipping Name"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="128" comment="Customer Email"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="varchar" name="payment_method" nullable="true" length="32" comment="Payment Method"/>
+        <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
+                comment="Shipping Method Name"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SALES_SHIPMENT_GRID_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_SHIPMENT_GRID_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_TOTAL_QTY" indexType="btree">
+            <column name="total_qty"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_ORDER_INCREMENT_ID" indexType="btree">
+            <column name="order_increment_id"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_SHIPMENT_STATUS" indexType="btree">
+            <column name="shipment_status"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_ORDER_STATUS" indexType="btree">
+            <column name="order_status"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_ORDER_CREATED_AT" indexType="btree">
+            <column name="order_created_at"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_SHIPPING_NAME" indexType="btree">
+            <column name="shipping_name"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_GRID_BILLING_NAME" indexType="btree">
+            <column name="billing_name"/>
+        </index>
+        <index referenceId="FTI_086B40C8955F167B8EA76653437879B4" indexType="fulltext">
+            <column name="increment_id"/>
+            <column name="order_increment_id"/>
+            <column name="shipping_name"/>
+            <column name="customer_name"/>
+            <column name="customer_email"/>
+            <column name="billing_address"/>
+            <column name="shipping_address"/>
+        </index>
+    </table>
+    <table name="sales_shipment_item" resource="sales" engine="innodb" comment="Sales Flat Shipment Item">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Weight"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
+        <column xsi:type="int" name="product_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="int" name="order_item_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Order Item Id"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_ITEM_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
+                    table="sales_shipment_item" column="parent_id" referenceTable="sales_shipment"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_SHIPMENT_ITEM_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_shipment_track" resource="sales" engine="innodb" comment="Sales Flat Shipment Track">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Weight"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="text" name="track_number" nullable="true" comment="Number"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <column xsi:type="varchar" name="carrier_code" nullable="true" length="32" comment="Carrier Code"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_TRACK_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
+                    table="sales_shipment_track" column="parent_id" referenceTable="sales_shipment"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_SHIPMENT_TRACK_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_TRACK_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_TRACK_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+    </table>
+    <table name="sales_shipment_comment" resource="sales" engine="innodb" comment="Sales Flat Shipment Comment">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="int" name="is_customer_notified" padding="11" unsigned="false" nullable="true"
+                identity="false" comment="Is Customer Notified"/>
+        <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible On Front"/>
+        <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPMENT_COMMENT_PARENT_ID_SALES_SHIPMENT_ENTITY_ID"
+                    table="sales_shipment_comment" column="parent_id" referenceTable="sales_shipment"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_SHIPMENT_COMMENT_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_SHIPMENT_COMMENT_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_invoice" resource="sales" engine="innodb" comment="Sales Flat Invoice">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Grand Total"/>
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Amount"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Store To Order Rate"/>
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Order Rate"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Grand Total"/>
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Amount"/>
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Store To Base Rate"/>
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Amount"/>
+        <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Qty"/>
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Global Rate"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Subtotal"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Amount"/>
+        <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Billing Address Id"/>
+        <column xsi:type="smallint" name="is_used_for_refund" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Is Used For Refund"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="smallint" name="email_sent" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Email Sent"/>
+        <column xsi:type="smallint" name="send_email" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Send Email"/>
+        <column xsi:type="smallint" name="can_void_flag" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Can Void Flag"/>
+        <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="State"/>
+        <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Shipping Address Id"/>
+        <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
+        <column xsi:type="varchar" name="transaction_id" nullable="true" length="255" comment="Transaction Id"/>
+        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="3" comment="Order Currency Code"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
+        <column xsi:type="varchar" name="global_currency_code" nullable="true" length="3"
+                comment="Global Currency Code"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Incl Tax"/>
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Incl Tax"/>
+        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Total Refunded"/>
+        <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
+                comment="Discount Description"/>
+        <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
+        <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Customer Note Notify"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_invoice"
+                    column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_STORE_ID_STORE_STORE_ID" table="sales_invoice"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_INVOICE_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_INVOICE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRAND_TOTAL" indexType="btree">
+            <column name="grand_total"/>
+        </index>
+        <index referenceId="SALES_INVOICE_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="SALES_INVOICE_STATE" indexType="btree">
+            <column name="state"/>
+        </index>
+        <index referenceId="SALES_INVOICE_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_INVOICE_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_INVOICE_SEND_EMAIL" indexType="btree">
+            <column name="send_email"/>
+        </index>
+        <index referenceId="SALES_INVOICE_EMAIL_SENT" indexType="btree">
+            <column name="email_sent"/>
+        </index>
+    </table>
+    <table name="sales_invoice_grid" resource="sales" engine="innodb" comment="Sales Flat Invoice Grid">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity Id"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="State"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="varchar" name="order_increment_id" nullable="true" length="50" comment="Order Increment Id"/>
+        <column xsi:type="timestamp" name="order_created_at" on_update="false" nullable="true"
+                comment="Order Created At"/>
+        <column xsi:type="varchar" name="customer_name" nullable="true" length="255" comment="Customer Name"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="255" comment="Customer Email"/>
+        <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="true" identity="false"/>
+        <column xsi:type="varchar" name="payment_method" nullable="true" length="128" comment="Payment Method"/>
+        <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
+        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="3" comment="Order Currency Code"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
+        <column xsi:type="varchar" name="global_currency_code" nullable="true" length="3"
+                comment="Global Currency Code"/>
+        <column xsi:type="varchar" name="billing_name" nullable="true" length="255" comment="Billing Name"/>
+        <column xsi:type="varchar" name="billing_address" nullable="true" length="255" comment="Billing Address"/>
+        <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
+        <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
+                comment="Shipping Method Name"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Shipping and handling amount"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Grand Total"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Grand Total"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SALES_INVOICE_GRID_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_INVOICE_GRID_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_GRAND_TOTAL" indexType="btree">
+            <column name="grand_total"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_STATE" indexType="btree">
+            <column name="state"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_ORDER_INCREMENT_ID" indexType="btree">
+            <column name="order_increment_id"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_ORDER_CREATED_AT" indexType="btree">
+            <column name="order_created_at"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_BILLING_NAME" indexType="btree">
+            <column name="billing_name"/>
+        </index>
+        <index referenceId="FTI_95D9C924DD6A8734EB8B5D01D60F90DE" indexType="fulltext">
+            <column name="increment_id"/>
+            <column name="order_increment_id"/>
+            <column name="billing_name"/>
+            <column name="billing_address"/>
+            <column name="shipping_address"/>
+            <column name="customer_name"/>
+            <column name="customer_email"/>
+        </index>
+        <index referenceId="SALES_INVOICE_GRID_BASE_GRAND_TOTAL" indexType="btree">
+            <column name="base_grand_total"/>
+        </index>
+    </table>
+    <table name="sales_invoice_item" resource="sales" engine="innodb" comment="Sales Flat Invoice Item">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Amount"/>
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Row Total"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Amount"/>
+        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price Incl Tax"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price Incl Tax"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
+        <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Cost"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total Incl Tax"/>
+        <column xsi:type="int" name="product_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="int" name="order_item_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Order Item Id"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="text" name="tax_ratio" nullable="true"
+                comment="Ratio of tax invoiced over tax of the order item"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_ITEM_PARENT_ID_SALES_INVOICE_ENTITY_ID"
+                    table="sales_invoice_item" column="parent_id" referenceTable="sales_invoice"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_INVOICE_ITEM_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_invoice_comment" resource="sales" engine="innodb" comment="Sales Flat Invoice Comment">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="smallint" name="is_customer_notified" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Is Customer Notified"/>
+        <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible On Front"/>
+        <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_INVOICE_COMMENT_PARENT_ID_SALES_INVOICE_ENTITY_ID"
+                    table="sales_invoice_comment" column="parent_id" referenceTable="sales_invoice"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_INVOICE_COMMENT_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_INVOICE_COMMENT_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_creditmemo" resource="sales" engine="innodb" comment="Sales Flat Creditmemo">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment Positive"/>
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Store To Order Rate"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Order Rate"/>
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Grand Total"/>
+        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Adjustment Negative"/>
+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Amount"/>
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal Incl Tax"/>
+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment Negative"/>
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Amount"/>
+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Store To Base Rate"/>
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base To Global Rate"/>
+        <column xsi:type="decimal" name="base_adjustment" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Adjustment"/>
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Subtotal"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Amount"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="adjustment" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Grand Total"/>
+        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Adjustment Positive"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Tax Amount"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Amount"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="smallint" name="email_sent" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Email Sent"/>
+        <column xsi:type="smallint" name="send_email" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Send Email"/>
+        <column xsi:type="int" name="creditmemo_status" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Creditmemo Status"/>
+        <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="State"/>
+        <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Shipping Address Id"/>
+        <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Billing Address Id"/>
+        <column xsi:type="int" name="invoice_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Invoice Id"/>
+        <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
+        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="3" comment="Order Currency Code"/>
+        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
+        <column xsi:type="varchar" name="global_currency_code" nullable="true" length="3"
+                comment="Global Currency Code"/>
+        <column xsi:type="varchar" name="transaction_id" nullable="true" length="255" comment="Transaction Id"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Shipping Incl Tax"/>
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Shipping Incl Tax"/>
+        <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
+                comment="Discount Description"/>
+        <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
+        <column xsi:type="smallint" name="customer_note_notify" padding="5" unsigned="true" nullable="true"
+                identity="false" comment="Customer Note Notify"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_ORDER_ID_SALES_ORDER_ENTITY_ID" table="sales_creditmemo"
+                    column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_STORE_ID_STORE_STORE_ID" table="sales_creditmemo"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_CREDITMEMO_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_CREDITMEMO_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_CREDITMEMO_STATUS" indexType="btree">
+            <column name="creditmemo_status"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_STATE" indexType="btree">
+            <column name="state"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_SEND_EMAIL" indexType="btree">
+            <column name="send_email"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_EMAIL_SENT" indexType="btree">
+            <column name="email_sent"/>
+        </index>
+    </table>
+    <table name="sales_creditmemo_grid" resource="sales" engine="innodb" comment="Sales Flat Creditmemo Grid">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity Id"/>
+        <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="varchar" name="order_increment_id" nullable="true" length="50" comment="Order Increment Id"/>
+        <column xsi:type="timestamp" name="order_created_at" on_update="false" nullable="true"
+                comment="Order Created At"/>
+        <column xsi:type="varchar" name="billing_name" nullable="true" length="255" comment="Billing Name"/>
+        <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Status"/>
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Grand Total"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="32" comment="Order Status"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="billing_address" nullable="true" length="255" comment="Billing Address"/>
+        <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
+        <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
+        <column xsi:type="varchar" name="customer_email" nullable="true" length="128" comment="Customer Email"/>
+        <column xsi:type="smallint" name="customer_group_id" padding="6" unsigned="false" nullable="true"
+                identity="false" comment="Customer Group Id"/>
+        <column xsi:type="varchar" name="payment_method" nullable="true" length="32" comment="Payment Method"/>
+        <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
+                comment="Shipping Method Name"/>
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Subtotal"/>
+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Shipping and handling amount"/>
+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment Positive"/>
+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Adjustment Negative"/>
+        <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Order Grand Total"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SALES_CREDITMEMO_GRID_INCREMENT_ID_STORE_ID">
+            <column name="increment_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID" indexType="btree">
+            <column name="order_increment_id"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_UPDATED_AT" indexType="btree">
+            <column name="updated_at"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_CREATED_AT" indexType="btree">
+            <column name="order_created_at"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_STATE" indexType="btree">
+            <column name="state"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_BILLING_NAME" indexType="btree">
+            <column name="billing_name"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_STATUS" indexType="btree">
+            <column name="order_status"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL" indexType="btree">
+            <column name="base_grand_total"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_BASE_GRAND_TOTAL" indexType="btree">
+            <column name="order_base_grand_total"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_GRID_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+        <index referenceId="FTI_32B7BA885941A8254EE84AE650ABDC86" indexType="fulltext">
+            <column name="increment_id"/>
+            <column name="order_increment_id"/>
+            <column name="billing_name"/>
+            <column name="billing_address"/>
+            <column name="shipping_address"/>
+            <column name="customer_name"/>
+            <column name="customer_email"/>
+        </index>
+    </table>
+    <table name="sales_creditmemo_item" resource="sales" engine="innodb" comment="Sales Flat Creditmemo Item">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price"/>
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Tax Amount"/>
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Row Total"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Amount"/>
+        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total"/>
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Discount Amount"/>
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price Incl Tax"/>
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Tax Amount"/>
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Price Incl Tax"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
+        <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Cost"/>
+        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Price"/>
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Row Total Incl Tax"/>
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Row Total Incl Tax"/>
+        <column xsi:type="int" name="product_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="int" name="order_item_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Order Item Id"/>
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Discount Tax Compensation Amount"/>
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+                unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
+        <column xsi:type="text" name="tax_ratio" nullable="true"
+                comment="Ratio of tax in the creditmemo item over tax of the order item"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_ITEM_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID"
+                    table="sales_creditmemo_item" column="parent_id" referenceTable="sales_creditmemo"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_CREDITMEMO_ITEM_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_creditmemo_comment" resource="sales" engine="innodb" comment="Sales Flat Creditmemo Comment">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="int" name="is_customer_notified" padding="11" unsigned="false" nullable="true"
+                identity="false" comment="Is Customer Notified"/>
+        <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is Visible On Front"/>
+        <column xsi:type="text" name="comment" nullable="true" comment="Comment"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_CREDITMEMO_COMMENT_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID"
+                    table="sales_creditmemo_comment" column="parent_id" referenceTable="sales_creditmemo"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALES_CREDITMEMO_COMMENT_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+        <index referenceId="SALES_CREDITMEMO_COMMENT_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+    </table>
+    <table name="sales_invoiced_aggregated" resource="sales" engine="innodb" comment="Sales Invoiced Aggregated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="orders_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Orders Invoiced"/>
+        <column xsi:type="decimal" name="invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Invoiced"/>
+        <column xsi:type="decimal" name="invoiced_captured" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Invoiced Captured"/>
+        <column xsi:type="decimal" name="invoiced_not_captured" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Invoiced Not Captured"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_INVOICED_AGGREGATED_STORE_ID_STORE_STORE_ID"
+                    table="sales_invoiced_aggregated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_INVOICED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="SALES_INVOICED_AGGREGATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_invoiced_aggregated_order" resource="sales" engine="innodb"
+           comment="Sales Invoiced Aggregated Order">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="orders_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Orders Invoiced"/>
+        <column xsi:type="decimal" name="invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Invoiced"/>
+        <column xsi:type="decimal" name="invoiced_captured" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Invoiced Captured"/>
+        <column xsi:type="decimal" name="invoiced_not_captured" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Invoiced Not Captured"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_INVOICED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
+                    table="sales_invoiced_aggregated_order" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_INVOICED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="SALES_INVOICED_AGGREGATED_ORDER_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_order_aggregated_created" resource="sales" engine="innodb"
+           comment="Sales Order Aggregated Created">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="total_qty_ordered" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Qty Ordered"/>
+        <column xsi:type="decimal" name="total_qty_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Qty Invoiced"/>
+        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Income Amount"/>
+        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Revenue Amount"/>
+        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Profit Amount"/>
+        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Invoiced Amount"/>
+        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Canceled Amount"/>
+        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Paid Amount"/>
+        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Refunded Amount"/>
+        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Tax Amount"/>
+        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Tax Amount Actual"/>
+        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Shipping Amount"/>
+        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Shipping Amount Actual"/>
+        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Discount Amount"/>
+        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Discount Amount Actual"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID"
+                    table="sales_order_aggregated_created" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_ORDER_AGGREGATED_CREATED_PERIOD_STORE_ID_ORDER_STATUS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="SALES_ORDER_AGGREGATED_CREATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_order_aggregated_updated" resource="sales" engine="innodb"
+           comment="Sales Order Aggregated Updated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="total_qty_ordered" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Qty Ordered"/>
+        <column xsi:type="decimal" name="total_qty_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Qty Invoiced"/>
+        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Income Amount"/>
+        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Revenue Amount"/>
+        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Profit Amount"/>
+        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Invoiced Amount"/>
+        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Canceled Amount"/>
+        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Paid Amount"/>
+        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Refunded Amount"/>
+        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Tax Amount"/>
+        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Tax Amount Actual"/>
+        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Shipping Amount"/>
+        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Shipping Amount Actual"/>
+        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Discount Amount"/>
+        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Discount Amount Actual"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
+                    table="sales_order_aggregated_updated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_ORDER_AGGREGATED_UPDATED_PERIOD_STORE_ID_ORDER_STATUS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="SALES_ORDER_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_payment_transaction" resource="sales" engine="innodb" comment="Sales Payment Transaction">
+        <column xsi:type="int" name="transaction_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Transaction Id"/>
+        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Order Id"/>
+        <column xsi:type="int" name="payment_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Payment Id"/>
+        <column xsi:type="varchar" name="txn_id" nullable="true" length="100" comment="Txn Id"/>
+        <column xsi:type="varchar" name="parent_txn_id" nullable="true" length="100" comment="Parent Txn Id"/>
+        <column xsi:type="varchar" name="txn_type" nullable="true" length="15" comment="Txn Type"/>
+        <column xsi:type="smallint" name="is_closed" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Closed"/>
+        <column xsi:type="blob" name="additional_information" nullable="true" comment="Additional Information"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="transaction_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_PAYMENT_TRANSACTION_ORDER_ID_SALES_ORDER_ENTITY_ID"
+                    table="sales_payment_transaction" column="order_id" referenceTable="sales_order"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_B99FF1A06402D725EBDB0F3A7ECD47A2" table="sales_payment_transaction"
+                    column="parent_id" referenceTable="sales_payment_transaction" referenceColumn="transaction_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_PAYMENT_TRANSACTION_PAYMENT_ID_SALES_ORDER_PAYMENT_ENTT_ID"
+                    table="sales_payment_transaction" column="payment_id" referenceTable="sales_order_payment"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALES_PAYMENT_TRANSACTION_ORDER_ID_PAYMENT_ID_TXN_ID">
+            <column name="order_id"/>
+            <column name="payment_id"/>
+            <column name="txn_id"/>
+        </constraint>
+        <index referenceId="SALES_PAYMENT_TRANSACTION_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+        <index referenceId="SALES_PAYMENT_TRANSACTION_PAYMENT_ID" indexType="btree">
+            <column name="payment_id"/>
+        </index>
+    </table>
+    <table name="sales_refunded_aggregated" resource="sales" engine="innodb" comment="Sales Refunded Aggregated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Refunded"/>
+        <column xsi:type="decimal" name="online_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Online Refunded"/>
+        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Offline Refunded"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_REFUNDED_AGGREGATED_STORE_ID_STORE_STORE_ID"
+                    table="sales_refunded_aggregated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_REFUNDED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="SALES_REFUNDED_AGGREGATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_refunded_aggregated_order" resource="sales" engine="innodb"
+           comment="Sales Refunded Aggregated Order">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Refunded"/>
+        <column xsi:type="decimal" name="online_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Online Refunded"/>
+        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Offline Refunded"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
+                    table="sales_refunded_aggregated_order" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_REFUNDED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_shipping_aggregated" resource="sales" engine="innodb" comment="Sales Shipping Aggregated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="varchar" name="shipping_description" nullable="true" length="255"
+                comment="Shipping Description"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="total_shipping" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Shipping"/>
+        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Total Shipping Actual"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPPING_AGGREGATED_STORE_ID_STORE_STORE_ID"
+                    table="sales_shipping_aggregated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SALES_SHPP_AGGRED_PERIOD_STORE_ID_ORDER_STS_SHPP_DESCRIPTION">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+            <column name="shipping_description"/>
+        </constraint>
+        <index referenceId="SALES_SHIPPING_AGGREGATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_shipping_aggregated_order" resource="sales" engine="innodb"
+           comment="Sales Shipping Aggregated Order">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="varchar" name="shipping_description" nullable="true" length="255"
+                comment="Shipping Description"/>
+        <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="decimal" name="total_shipping" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Total Shipping"/>
+        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Total Shipping Actual"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
+                    table="sales_shipping_aggregated_order" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="UNQ_C05FAE47282EEA68654D0924E946761F">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+            <column name="shipping_description"/>
+        </constraint>
+        <index referenceId="SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="sales_bestsellers_aggregated_daily" resource="sales" engine="innodb"
+           comment="Sales Bestsellers Aggregated Daily">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product Name"/>
+        <column xsi:type="decimal" name="product_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Product Price"/>
+        <column xsi:type="decimal" name="qty_ordered" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Qty Ordered"/>
+        <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Pos"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID"
+                    table="sales_bestsellers_aggregated_daily" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_PERIOD_STORE_ID_PRODUCT_ID">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_DAILY_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="sales_bestsellers_aggregated_monthly" resource="sales" engine="innodb"
+           comment="Sales Bestsellers Aggregated Monthly">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product Name"/>
+        <column xsi:type="decimal" name="product_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Product Price"/>
+        <column xsi:type="decimal" name="qty_ordered" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Qty Ordered"/>
+        <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Pos"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID"
+                    table="sales_bestsellers_aggregated_monthly" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_PERIOD_STORE_ID_PRODUCT_ID">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_MONTHLY_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="sales_bestsellers_aggregated_yearly" resource="sales" engine="innodb"
+           comment="Sales Bestsellers Aggregated Yearly">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="product_name" nullable="true" length="255" comment="Product Name"/>
+        <column xsi:type="decimal" name="product_price" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Product Price"/>
+        <column xsi:type="decimal" name="qty_ordered" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Qty Ordered"/>
+        <column xsi:type="smallint" name="rating_pos" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Rating Pos"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID"
+                    table="sales_bestsellers_aggregated_yearly" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_PERIOD_STORE_ID_PRODUCT_ID">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALES_BESTSELLERS_AGGREGATED_YEARLY_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+    </table>
+    <table name="sales_order_tax" resource="sales" engine="innodb" comment="Sales Order Tax Table">
+        <column xsi:type="int" name="tax_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Tax Id"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order Id"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
+        <column xsi:type="decimal" name="percent" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Percent"/>
+        <column xsi:type="decimal" name="amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Amount"/>
+        <column xsi:type="int" name="priority" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Priority"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Position"/>
+        <column xsi:type="decimal" name="base_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Amount"/>
+        <column xsi:type="smallint" name="process" padding="6" unsigned="false" nullable="false" identity="false"
+                comment="Process"/>
+        <column xsi:type="decimal" name="base_real_amount" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Base Real Amount"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="tax_id"/>
+        </constraint>
+        <index referenceId="SALES_ORDER_TAX_ORDER_ID_PRIORITY_POSITION" indexType="btree">
+            <column name="order_id"/>
+            <column name="priority"/>
+            <column name="position"/>
+        </index>
+    </table>
+    <table name="sales_order_tax_item" resource="sales" engine="innodb" comment="Sales Order Tax Item">
+        <column xsi:type="int" name="tax_item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Tax Item Id"/>
+        <column xsi:type="int" name="tax_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Tax Id"/>
+        <column xsi:type="int" name="item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Item Id"/>
+        <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Real Tax Percent For Item"/>
+        <column xsi:type="decimal" name="amount" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Tax amount for the item and tax rate"/>
+        <column xsi:type="decimal" name="base_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Base tax amount for the item and tax rate"/>
+        <column xsi:type="decimal" name="real_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Real tax amount for the item and tax rate"/>
+        <column xsi:type="decimal" name="real_base_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Real base tax amount for the item and tax rate"/>
+        <column xsi:type="int" name="associated_item_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Id of the associated item"/>
+        <column xsi:type="varchar" name="taxable_item_type" nullable="false" length="32"
+                comment="Type of the taxable item"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="tax_item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_TAX_ITEM_ASSOCIATED_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
+                    table="sales_order_tax_item" column="associated_item_id" referenceTable="sales_order_item"
+                    referenceColumn="item_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_TAX_ITEM_TAX_ID_SALES_ORDER_TAX_TAX_ID"
+                    table="sales_order_tax_item" column="tax_id" referenceTable="sales_order_tax"
+                    referenceColumn="tax_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_TAX_ITEM_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID"
+                    table="sales_order_tax_item" column="item_id" referenceTable="sales_order_item"
+                    referenceColumn="item_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALES_ORDER_TAX_ITEM_TAX_ID_ITEM_ID">
+            <column name="tax_id"/>
+            <column name="item_id"/>
+        </constraint>
+        <index referenceId="SALES_ORDER_TAX_ITEM_ITEM_ID" indexType="btree">
+            <column name="item_id"/>
+        </index>
+    </table>
+    <table name="sales_order_status" resource="sales" engine="innodb" comment="Sales Order Status Table">
+        <column xsi:type="varchar" name="status" nullable="false" length="32" comment="Status"/>
+        <column xsi:type="varchar" name="label" nullable="false" length="128" comment="Label"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="status"/>
+        </constraint>
+    </table>
+    <table name="sales_order_status_state" resource="sales" engine="innodb" comment="Sales Order Status Table">
+        <column xsi:type="varchar" name="status" nullable="false" length="32" comment="Status"/>
+        <column xsi:type="varchar" name="state" nullable="false" length="32" comment="Label"/>
+        <column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is Default"/>
+        <column xsi:type="smallint" name="visible_on_front" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Visible on front"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="status"/>
+            <column name="state"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_STATE_STATUS_SALES_ORDER_STATUS_STATUS"
+                    table="sales_order_status_state" column="status" referenceTable="sales_order_status"
+                    referenceColumn="status" onDelete="CASCADE"/>
+    </table>
+    <table name="sales_order_status_label" resource="sales" engine="innodb" comment="Sales Order Status Label Table">
+        <column xsi:type="varchar" name="status" nullable="false" length="32" comment="Status"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="label" nullable="false" length="128" comment="Label"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="status"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_LABEL_STATUS_SALES_ORDER_STATUS_STATUS"
+                    table="sales_order_status_label" column="status" referenceTable="sales_order_status"
+                    referenceColumn="status" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALES_ORDER_STATUS_LABEL_STORE_ID_STORE_STORE_ID"
+                    table="sales_order_status_label" column="store_id" referenceTable="store" referenceColumn="store_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="SALES_ORDER_STATUS_LABEL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Sales/etc/db_schema_whitelist.json b/app/code/Magento/Sales/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..8790523c97c21
--- /dev/null
+++ b/app/code/Magento/Sales/etc/db_schema_whitelist.json
@@ -0,0 +1,1248 @@
+{
+    "sales_order": {
+        "column": {
+            "entity_id": true,
+            "state": true,
+            "status": true,
+            "coupon_code": true,
+            "protect_code": true,
+            "shipping_description": true,
+            "is_virtual": true,
+            "store_id": true,
+            "customer_id": true,
+            "base_discount_amount": true,
+            "base_discount_canceled": true,
+            "base_discount_invoiced": true,
+            "base_discount_refunded": true,
+            "base_grand_total": true,
+            "base_shipping_amount": true,
+            "base_shipping_canceled": true,
+            "base_shipping_invoiced": true,
+            "base_shipping_refunded": true,
+            "base_shipping_tax_amount": true,
+            "base_shipping_tax_refunded": true,
+            "base_subtotal": true,
+            "base_subtotal_canceled": true,
+            "base_subtotal_invoiced": true,
+            "base_subtotal_refunded": true,
+            "base_tax_amount": true,
+            "base_tax_canceled": true,
+            "base_tax_invoiced": true,
+            "base_tax_refunded": true,
+            "base_to_global_rate": true,
+            "base_to_order_rate": true,
+            "base_total_canceled": true,
+            "base_total_invoiced": true,
+            "base_total_invoiced_cost": true,
+            "base_total_offline_refunded": true,
+            "base_total_online_refunded": true,
+            "base_total_paid": true,
+            "base_total_qty_ordered": true,
+            "base_total_refunded": true,
+            "discount_amount": true,
+            "discount_canceled": true,
+            "discount_invoiced": true,
+            "discount_refunded": true,
+            "grand_total": true,
+            "shipping_amount": true,
+            "shipping_canceled": true,
+            "shipping_invoiced": true,
+            "shipping_refunded": true,
+            "shipping_tax_amount": true,
+            "shipping_tax_refunded": true,
+            "store_to_base_rate": true,
+            "store_to_order_rate": true,
+            "subtotal": true,
+            "subtotal_canceled": true,
+            "subtotal_invoiced": true,
+            "subtotal_refunded": true,
+            "tax_amount": true,
+            "tax_canceled": true,
+            "tax_invoiced": true,
+            "tax_refunded": true,
+            "total_canceled": true,
+            "total_invoiced": true,
+            "total_offline_refunded": true,
+            "total_online_refunded": true,
+            "total_paid": true,
+            "total_qty_ordered": true,
+            "total_refunded": true,
+            "can_ship_partially": true,
+            "can_ship_partially_item": true,
+            "customer_is_guest": true,
+            "customer_note_notify": true,
+            "billing_address_id": true,
+            "customer_group_id": true,
+            "edit_increment": true,
+            "email_sent": true,
+            "send_email": true,
+            "forced_shipment_with_invoice": true,
+            "payment_auth_expiration": true,
+            "quote_address_id": true,
+            "quote_id": true,
+            "shipping_address_id": true,
+            "adjustment_negative": true,
+            "adjustment_positive": true,
+            "base_adjustment_negative": true,
+            "base_adjustment_positive": true,
+            "base_shipping_discount_amount": true,
+            "base_subtotal_incl_tax": true,
+            "base_total_due": true,
+            "payment_authorization_amount": true,
+            "shipping_discount_amount": true,
+            "subtotal_incl_tax": true,
+            "total_due": true,
+            "weight": true,
+            "customer_dob": true,
+            "increment_id": true,
+            "applied_rule_ids": true,
+            "base_currency_code": true,
+            "customer_email": true,
+            "customer_firstname": true,
+            "customer_lastname": true,
+            "customer_middlename": true,
+            "customer_prefix": true,
+            "customer_suffix": true,
+            "customer_taxvat": true,
+            "discount_description": true,
+            "ext_customer_id": true,
+            "ext_order_id": true,
+            "global_currency_code": true,
+            "hold_before_state": true,
+            "hold_before_status": true,
+            "order_currency_code": true,
+            "original_increment_id": true,
+            "relation_child_id": true,
+            "relation_child_real_id": true,
+            "relation_parent_id": true,
+            "relation_parent_real_id": true,
+            "remote_ip": true,
+            "shipping_method": true,
+            "store_currency_code": true,
+            "store_name": true,
+            "x_forwarded_for": true,
+            "customer_note": true,
+            "created_at": true,
+            "updated_at": true,
+            "total_item_count": true,
+            "customer_gender": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "shipping_discount_tax_compensation_amount": true,
+            "base_shipping_discount_tax_compensation_amnt": true,
+            "discount_tax_compensation_invoiced": true,
+            "base_discount_tax_compensation_invoiced": true,
+            "discount_tax_compensation_refunded": true,
+            "base_discount_tax_compensation_refunded": true,
+            "shipping_incl_tax": true,
+            "base_shipping_incl_tax": true,
+            "coupon_rule_name": true
+        },
+        "index": {
+            "SALES_ORDER_STATUS": true,
+            "SALES_ORDER_STATE": true,
+            "SALES_ORDER_STORE_ID": true,
+            "SALES_ORDER_CREATED_AT": true,
+            "SALES_ORDER_CUSTOMER_ID": true,
+            "SALES_ORDER_EXT_ORDER_ID": true,
+            "SALES_ORDER_QUOTE_ID": true,
+            "SALES_ORDER_UPDATED_AT": true,
+            "SALES_ORDER_SEND_EMAIL": true,
+            "SALES_ORDER_EMAIL_SENT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "SALES_ORDER_STORE_ID_STORE_STORE_ID": true,
+            "SALES_ORDER_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_order_grid": {
+        "column": {
+            "entity_id": true,
+            "status": true,
+            "store_id": true,
+            "store_name": true,
+            "customer_id": true,
+            "base_grand_total": true,
+            "base_total_paid": true,
+            "grand_total": true,
+            "total_paid": true,
+            "increment_id": true,
+            "base_currency_code": true,
+            "order_currency_code": true,
+            "shipping_name": true,
+            "billing_name": true,
+            "created_at": true,
+            "updated_at": true,
+            "billing_address": true,
+            "shipping_address": true,
+            "shipping_information": true,
+            "customer_email": true,
+            "customer_group": true,
+            "subtotal": true,
+            "shipping_and_handling": true,
+            "customer_name": true,
+            "payment_method": true,
+            "total_refunded": true
+        },
+        "index": {
+            "SALES_ORDER_GRID_STATUS": true,
+            "SALES_ORDER_GRID_STORE_ID": true,
+            "SALES_ORDER_GRID_BASE_GRAND_TOTAL": true,
+            "SALES_ORDER_GRID_BASE_TOTAL_PAID": true,
+            "SALES_ORDER_GRID_GRAND_TOTAL": true,
+            "SALES_ORDER_GRID_TOTAL_PAID": true,
+            "SALES_ORDER_GRID_SHIPPING_NAME": true,
+            "SALES_ORDER_GRID_BILLING_NAME": true,
+            "SALES_ORDER_GRID_CREATED_AT": true,
+            "SALES_ORDER_GRID_CUSTOMER_ID": true,
+            "SALES_ORDER_GRID_UPDATED_AT": true,
+            "FTI_65B9E9925EC58F0C7C2E2F6379C233E7": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_GRID_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_order_address": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "customer_address_id": true,
+            "quote_address_id": true,
+            "region_id": true,
+            "customer_id": true,
+            "fax": true,
+            "region": true,
+            "postcode": true,
+            "lastname": true,
+            "street": true,
+            "city": true,
+            "email": true,
+            "telephone": true,
+            "country_id": true,
+            "firstname": true,
+            "address_type": true,
+            "prefix": true,
+            "middlename": true,
+            "suffix": true,
+            "company": true,
+            "vat_id": true,
+            "vat_is_valid": true,
+            "vat_request_id": true,
+            "vat_request_date": true,
+            "vat_request_success": true
+        },
+        "index": {
+            "SALES_ORDER_ADDRESS_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_ADDRESS_PARENT_ID_SALES_ORDER_ENTITY_ID": true
+        }
+    },
+    "sales_order_status_history": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "is_customer_notified": true,
+            "is_visible_on_front": true,
+            "comment": true,
+            "status": true,
+            "created_at": true,
+            "entity_name": true
+        },
+        "index": {
+            "SALES_ORDER_STATUS_HISTORY_PARENT_ID": true,
+            "SALES_ORDER_STATUS_HISTORY_CREATED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_STATUS_HISTORY_PARENT_ID_SALES_ORDER_ENTITY_ID": true
+        }
+    },
+    "sales_order_item": {
+        "column": {
+            "item_id": true,
+            "order_id": true,
+            "parent_item_id": true,
+            "quote_item_id": true,
+            "store_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "product_id": true,
+            "product_type": true,
+            "product_options": true,
+            "weight": true,
+            "is_virtual": true,
+            "sku": true,
+            "name": true,
+            "description": true,
+            "applied_rule_ids": true,
+            "additional_data": true,
+            "is_qty_decimal": true,
+            "no_discount": true,
+            "qty_backordered": true,
+            "qty_canceled": true,
+            "qty_invoiced": true,
+            "qty_ordered": true,
+            "qty_refunded": true,
+            "qty_shipped": true,
+            "base_cost": true,
+            "price": true,
+            "base_price": true,
+            "original_price": true,
+            "base_original_price": true,
+            "tax_percent": true,
+            "tax_amount": true,
+            "base_tax_amount": true,
+            "tax_invoiced": true,
+            "base_tax_invoiced": true,
+            "discount_percent": true,
+            "discount_amount": true,
+            "base_discount_amount": true,
+            "discount_invoiced": true,
+            "base_discount_invoiced": true,
+            "amount_refunded": true,
+            "base_amount_refunded": true,
+            "row_total": true,
+            "base_row_total": true,
+            "row_invoiced": true,
+            "base_row_invoiced": true,
+            "row_weight": true,
+            "base_tax_before_discount": true,
+            "tax_before_discount": true,
+            "ext_order_item_id": true,
+            "locked_do_invoice": true,
+            "locked_do_ship": true,
+            "price_incl_tax": true,
+            "base_price_incl_tax": true,
+            "row_total_incl_tax": true,
+            "base_row_total_incl_tax": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "discount_tax_compensation_invoiced": true,
+            "base_discount_tax_compensation_invoiced": true,
+            "discount_tax_compensation_refunded": true,
+            "base_discount_tax_compensation_refunded": true,
+            "tax_canceled": true,
+            "discount_tax_compensation_canceled": true,
+            "tax_refunded": true,
+            "base_tax_refunded": true,
+            "discount_refunded": true,
+            "base_discount_refunded": true
+        },
+        "index": {
+            "SALES_ORDER_ITEM_ORDER_ID": true,
+            "SALES_ORDER_ITEM_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_ITEM_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "SALES_ORDER_ITEM_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "sales_order_payment": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "base_shipping_captured": true,
+            "shipping_captured": true,
+            "amount_refunded": true,
+            "base_amount_paid": true,
+            "amount_canceled": true,
+            "base_amount_authorized": true,
+            "base_amount_paid_online": true,
+            "base_amount_refunded_online": true,
+            "base_shipping_amount": true,
+            "shipping_amount": true,
+            "amount_paid": true,
+            "amount_authorized": true,
+            "base_amount_ordered": true,
+            "base_shipping_refunded": true,
+            "shipping_refunded": true,
+            "base_amount_refunded": true,
+            "amount_ordered": true,
+            "base_amount_canceled": true,
+            "quote_payment_id": true,
+            "additional_data": true,
+            "cc_exp_month": true,
+            "cc_ss_start_year": true,
+            "echeck_bank_name": true,
+            "method": true,
+            "cc_debug_request_body": true,
+            "cc_secure_verify": true,
+            "protection_eligibility": true,
+            "cc_approval": true,
+            "cc_last_4": true,
+            "cc_status_description": true,
+            "echeck_type": true,
+            "cc_debug_response_serialized": true,
+            "cc_ss_start_month": true,
+            "echeck_account_type": true,
+            "last_trans_id": true,
+            "cc_cid_status": true,
+            "cc_owner": true,
+            "cc_type": true,
+            "po_number": true,
+            "cc_exp_year": true,
+            "cc_status": true,
+            "echeck_routing_number": true,
+            "account_status": true,
+            "anet_trans_method": true,
+            "cc_debug_response_body": true,
+            "cc_ss_issue": true,
+            "echeck_account_name": true,
+            "cc_avs_status": true,
+            "cc_number_enc": true,
+            "cc_trans_id": true,
+            "address_status": true,
+            "additional_information": true
+        },
+        "index": {
+            "SALES_ORDER_PAYMENT_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_PAYMENT_PARENT_ID_SALES_ORDER_ENTITY_ID": true
+        }
+    },
+    "sales_shipment": {
+        "column": {
+            "entity_id": true,
+            "store_id": true,
+            "total_weight": true,
+            "total_qty": true,
+            "email_sent": true,
+            "send_email": true,
+            "order_id": true,
+            "customer_id": true,
+            "shipping_address_id": true,
+            "billing_address_id": true,
+            "shipment_status": true,
+            "increment_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "packages": true,
+            "shipping_label": true,
+            "customer_note": true,
+            "customer_note_notify": true
+        },
+        "index": {
+            "SALES_SHIPMENT_STORE_ID": true,
+            "SALES_SHIPMENT_TOTAL_QTY": true,
+            "SALES_SHIPMENT_ORDER_ID": true,
+            "SALES_SHIPMENT_CREATED_AT": true,
+            "SALES_SHIPMENT_UPDATED_AT": true,
+            "SALES_SHIPMENT_SEND_EMAIL": true,
+            "SALES_SHIPMENT_EMAIL_SENT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPMENT_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "SALES_SHIPMENT_STORE_ID_STORE_STORE_ID": true,
+            "SALES_SHIPMENT_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_shipment_grid": {
+        "column": {
+            "entity_id": true,
+            "increment_id": true,
+            "store_id": true,
+            "order_increment_id": true,
+            "order_id": true,
+            "order_created_at": true,
+            "customer_name": true,
+            "total_qty": true,
+            "shipment_status": true,
+            "order_status": true,
+            "billing_address": true,
+            "shipping_address": true,
+            "billing_name": true,
+            "shipping_name": true,
+            "customer_email": true,
+            "customer_group_id": true,
+            "payment_method": true,
+            "shipping_information": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "SALES_SHIPMENT_GRID_STORE_ID": true,
+            "SALES_SHIPMENT_GRID_TOTAL_QTY": true,
+            "SALES_SHIPMENT_GRID_ORDER_INCREMENT_ID": true,
+            "SALES_SHIPMENT_GRID_SHIPMENT_STATUS": true,
+            "SALES_SHIPMENT_GRID_ORDER_STATUS": true,
+            "SALES_SHIPMENT_GRID_CREATED_AT": true,
+            "SALES_SHIPMENT_GRID_UPDATED_AT": true,
+            "SALES_SHIPMENT_GRID_ORDER_CREATED_AT": true,
+            "SALES_SHIPMENT_GRID_SHIPPING_NAME": true,
+            "SALES_SHIPMENT_GRID_BILLING_NAME": true,
+            "FTI_086B40C8955F167B8EA76653437879B4": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPMENT_GRID_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_shipment_item": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "row_total": true,
+            "price": true,
+            "weight": true,
+            "qty": true,
+            "product_id": true,
+            "order_item_id": true,
+            "additional_data": true,
+            "description": true,
+            "name": true,
+            "sku": true
+        },
+        "index": {
+            "SALES_SHIPMENT_ITEM_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPMENT_ITEM_PARENT_ID_SALES_SHIPMENT_ENTITY_ID": true
+        }
+    },
+    "sales_shipment_track": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "weight": true,
+            "qty": true,
+            "order_id": true,
+            "track_number": true,
+            "description": true,
+            "title": true,
+            "carrier_code": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "SALES_SHIPMENT_TRACK_PARENT_ID": true,
+            "SALES_SHIPMENT_TRACK_ORDER_ID": true,
+            "SALES_SHIPMENT_TRACK_CREATED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPMENT_TRACK_PARENT_ID_SALES_SHIPMENT_ENTITY_ID": true
+        }
+    },
+    "sales_shipment_comment": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "is_customer_notified": true,
+            "is_visible_on_front": true,
+            "comment": true,
+            "created_at": true
+        },
+        "index": {
+            "SALES_SHIPMENT_COMMENT_CREATED_AT": true,
+            "SALES_SHIPMENT_COMMENT_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPMENT_COMMENT_PARENT_ID_SALES_SHIPMENT_ENTITY_ID": true
+        }
+    },
+    "sales_invoice": {
+        "column": {
+            "entity_id": true,
+            "store_id": true,
+            "base_grand_total": true,
+            "shipping_tax_amount": true,
+            "tax_amount": true,
+            "base_tax_amount": true,
+            "store_to_order_rate": true,
+            "base_shipping_tax_amount": true,
+            "base_discount_amount": true,
+            "base_to_order_rate": true,
+            "grand_total": true,
+            "shipping_amount": true,
+            "subtotal_incl_tax": true,
+            "base_subtotal_incl_tax": true,
+            "store_to_base_rate": true,
+            "base_shipping_amount": true,
+            "total_qty": true,
+            "base_to_global_rate": true,
+            "subtotal": true,
+            "base_subtotal": true,
+            "discount_amount": true,
+            "billing_address_id": true,
+            "is_used_for_refund": true,
+            "order_id": true,
+            "email_sent": true,
+            "send_email": true,
+            "can_void_flag": true,
+            "state": true,
+            "shipping_address_id": true,
+            "store_currency_code": true,
+            "transaction_id": true,
+            "order_currency_code": true,
+            "base_currency_code": true,
+            "global_currency_code": true,
+            "increment_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "shipping_discount_tax_compensation_amount": true,
+            "base_shipping_discount_tax_compensation_amnt": true,
+            "shipping_incl_tax": true,
+            "base_shipping_incl_tax": true,
+            "base_total_refunded": true,
+            "discount_description": true,
+            "customer_note": true,
+            "customer_note_notify": true
+        },
+        "index": {
+            "SALES_INVOICE_STORE_ID": true,
+            "SALES_INVOICE_GRAND_TOTAL": true,
+            "SALES_INVOICE_ORDER_ID": true,
+            "SALES_INVOICE_STATE": true,
+            "SALES_INVOICE_CREATED_AT": true,
+            "SALES_INVOICE_UPDATED_AT": true,
+            "SALES_INVOICE_SEND_EMAIL": true,
+            "SALES_INVOICE_EMAIL_SENT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_INVOICE_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "SALES_INVOICE_STORE_ID_STORE_STORE_ID": true,
+            "SALES_INVOICE_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_invoice_grid": {
+        "column": {
+            "entity_id": true,
+            "increment_id": true,
+            "state": true,
+            "store_id": true,
+            "store_name": true,
+            "order_id": true,
+            "order_increment_id": true,
+            "order_created_at": true,
+            "customer_name": true,
+            "customer_email": true,
+            "customer_group_id": true,
+            "payment_method": true,
+            "store_currency_code": true,
+            "order_currency_code": true,
+            "base_currency_code": true,
+            "global_currency_code": true,
+            "billing_name": true,
+            "billing_address": true,
+            "shipping_address": true,
+            "shipping_information": true,
+            "subtotal": true,
+            "shipping_and_handling": true,
+            "grand_total": true,
+            "created_at": true,
+            "updated_at": true,
+            "base_grand_total": true
+        },
+        "index": {
+            "SALES_INVOICE_GRID_STORE_ID": true,
+            "SALES_INVOICE_GRID_GRAND_TOTAL": true,
+            "SALES_INVOICE_GRID_ORDER_ID": true,
+            "SALES_INVOICE_GRID_STATE": true,
+            "SALES_INVOICE_GRID_ORDER_INCREMENT_ID": true,
+            "SALES_INVOICE_GRID_CREATED_AT": true,
+            "SALES_INVOICE_GRID_UPDATED_AT": true,
+            "SALES_INVOICE_GRID_ORDER_CREATED_AT": true,
+            "SALES_INVOICE_GRID_BILLING_NAME": true,
+            "FTI_95D9C924DD6A8734EB8B5D01D60F90DE": true,
+            "SALES_INVOICE_GRID_BASE_GRAND_TOTAL": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_INVOICE_GRID_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_invoice_item": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "base_price": true,
+            "tax_amount": true,
+            "base_row_total": true,
+            "discount_amount": true,
+            "row_total": true,
+            "base_discount_amount": true,
+            "price_incl_tax": true,
+            "base_tax_amount": true,
+            "base_price_incl_tax": true,
+            "qty": true,
+            "base_cost": true,
+            "price": true,
+            "base_row_total_incl_tax": true,
+            "row_total_incl_tax": true,
+            "product_id": true,
+            "order_item_id": true,
+            "additional_data": true,
+            "description": true,
+            "sku": true,
+            "name": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "tax_ratio": true
+        },
+        "index": {
+            "SALES_INVOICE_ITEM_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_INVOICE_ITEM_PARENT_ID_SALES_INVOICE_ENTITY_ID": true
+        }
+    },
+    "sales_invoice_comment": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "is_customer_notified": true,
+            "is_visible_on_front": true,
+            "comment": true,
+            "created_at": true
+        },
+        "index": {
+            "SALES_INVOICE_COMMENT_CREATED_AT": true,
+            "SALES_INVOICE_COMMENT_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_INVOICE_COMMENT_PARENT_ID_SALES_INVOICE_ENTITY_ID": true
+        }
+    },
+    "sales_creditmemo": {
+        "column": {
+            "entity_id": true,
+            "store_id": true,
+            "adjustment_positive": true,
+            "base_shipping_tax_amount": true,
+            "store_to_order_rate": true,
+            "base_discount_amount": true,
+            "base_to_order_rate": true,
+            "grand_total": true,
+            "base_adjustment_negative": true,
+            "base_subtotal_incl_tax": true,
+            "shipping_amount": true,
+            "subtotal_incl_tax": true,
+            "adjustment_negative": true,
+            "base_shipping_amount": true,
+            "store_to_base_rate": true,
+            "base_to_global_rate": true,
+            "base_adjustment": true,
+            "base_subtotal": true,
+            "discount_amount": true,
+            "subtotal": true,
+            "adjustment": true,
+            "base_grand_total": true,
+            "base_adjustment_positive": true,
+            "base_tax_amount": true,
+            "shipping_tax_amount": true,
+            "tax_amount": true,
+            "order_id": true,
+            "email_sent": true,
+            "send_email": true,
+            "creditmemo_status": true,
+            "state": true,
+            "shipping_address_id": true,
+            "billing_address_id": true,
+            "invoice_id": true,
+            "store_currency_code": true,
+            "order_currency_code": true,
+            "base_currency_code": true,
+            "global_currency_code": true,
+            "transaction_id": true,
+            "increment_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "shipping_discount_tax_compensation_amount": true,
+            "base_shipping_discount_tax_compensation_amnt": true,
+            "shipping_incl_tax": true,
+            "base_shipping_incl_tax": true,
+            "discount_description": true,
+            "customer_note": true,
+            "customer_note_notify": true
+        },
+        "index": {
+            "SALES_CREDITMEMO_STORE_ID": true,
+            "SALES_CREDITMEMO_ORDER_ID": true,
+            "SALES_CREDITMEMO_CREDITMEMO_STATUS": true,
+            "SALES_CREDITMEMO_STATE": true,
+            "SALES_CREDITMEMO_CREATED_AT": true,
+            "SALES_CREDITMEMO_UPDATED_AT": true,
+            "SALES_CREDITMEMO_SEND_EMAIL": true,
+            "SALES_CREDITMEMO_EMAIL_SENT": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_CREDITMEMO_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "SALES_CREDITMEMO_STORE_ID_STORE_STORE_ID": true,
+            "SALES_CREDITMEMO_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_creditmemo_grid": {
+        "column": {
+            "entity_id": true,
+            "increment_id": true,
+            "created_at": true,
+            "updated_at": true,
+            "order_id": true,
+            "order_increment_id": true,
+            "order_created_at": true,
+            "billing_name": true,
+            "state": true,
+            "base_grand_total": true,
+            "order_status": true,
+            "store_id": true,
+            "billing_address": true,
+            "shipping_address": true,
+            "customer_name": true,
+            "customer_email": true,
+            "customer_group_id": true,
+            "payment_method": true,
+            "shipping_information": true,
+            "subtotal": true,
+            "shipping_and_handling": true,
+            "adjustment_positive": true,
+            "adjustment_negative": true,
+            "order_base_grand_total": true
+        },
+        "index": {
+            "SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID": true,
+            "SALES_CREDITMEMO_GRID_CREATED_AT": true,
+            "SALES_CREDITMEMO_GRID_UPDATED_AT": true,
+            "SALES_CREDITMEMO_GRID_ORDER_CREATED_AT": true,
+            "SALES_CREDITMEMO_GRID_STATE": true,
+            "SALES_CREDITMEMO_GRID_BILLING_NAME": true,
+            "SALES_CREDITMEMO_GRID_ORDER_STATUS": true,
+            "SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL": true,
+            "SALES_CREDITMEMO_GRID_STORE_ID": true,
+            "SALES_CREDITMEMO_GRID_ORDER_BASE_GRAND_TOTAL": true,
+            "SALES_CREDITMEMO_GRID_ORDER_ID": true,
+            "FTI_32B7BA885941A8254EE84AE650ABDC86": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_CREDITMEMO_GRID_INCREMENT_ID_STORE_ID": true
+        }
+    },
+    "sales_creditmemo_item": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "base_price": true,
+            "tax_amount": true,
+            "base_row_total": true,
+            "discount_amount": true,
+            "row_total": true,
+            "base_discount_amount": true,
+            "price_incl_tax": true,
+            "base_tax_amount": true,
+            "base_price_incl_tax": true,
+            "qty": true,
+            "base_cost": true,
+            "price": true,
+            "base_row_total_incl_tax": true,
+            "row_total_incl_tax": true,
+            "product_id": true,
+            "order_item_id": true,
+            "additional_data": true,
+            "description": true,
+            "sku": true,
+            "name": true,
+            "discount_tax_compensation_amount": true,
+            "base_discount_tax_compensation_amount": true,
+            "tax_ratio": true
+        },
+        "index": {
+            "SALES_CREDITMEMO_ITEM_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_CREDITMEMO_ITEM_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID": true
+        }
+    },
+    "sales_creditmemo_comment": {
+        "column": {
+            "entity_id": true,
+            "parent_id": true,
+            "is_customer_notified": true,
+            "is_visible_on_front": true,
+            "comment": true,
+            "created_at": true
+        },
+        "index": {
+            "SALES_CREDITMEMO_COMMENT_CREATED_AT": true,
+            "SALES_CREDITMEMO_COMMENT_PARENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_CREDITMEMO_COMMENT_PARENT_ID_SALES_CREDITMEMO_ENTITY_ID": true
+        }
+    },
+    "sales_invoiced_aggregated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "orders_count": true,
+            "orders_invoiced": true,
+            "invoiced": true,
+            "invoiced_captured": true,
+            "invoiced_not_captured": true
+        },
+        "index": {
+            "SALES_INVOICED_AGGREGATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_INVOICED_AGGREGATED_STORE_ID_STORE_STORE_ID": true,
+            "SALES_INVOICED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS": true
+        }
+    },
+    "sales_invoiced_aggregated_order": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "orders_count": true,
+            "orders_invoiced": true,
+            "invoiced": true,
+            "invoiced_captured": true,
+            "invoiced_not_captured": true
+        },
+        "index": {
+            "SALES_INVOICED_AGGREGATED_ORDER_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_INVOICED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true,
+            "SALES_INVOICED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS": true
+        }
+    },
+    "sales_order_aggregated_created": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "orders_count": true,
+            "total_qty_ordered": true,
+            "total_qty_invoiced": true,
+            "total_income_amount": true,
+            "total_revenue_amount": true,
+            "total_profit_amount": true,
+            "total_invoiced_amount": true,
+            "total_canceled_amount": true,
+            "total_paid_amount": true,
+            "total_refunded_amount": true,
+            "total_tax_amount": true,
+            "total_tax_amount_actual": true,
+            "total_shipping_amount": true,
+            "total_shipping_amount_actual": true,
+            "total_discount_amount": true,
+            "total_discount_amount_actual": true
+        },
+        "index": {
+            "SALES_ORDER_AGGREGATED_CREATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID": true,
+            "SALES_ORDER_AGGREGATED_CREATED_PERIOD_STORE_ID_ORDER_STATUS": true
+        }
+    },
+    "sales_order_aggregated_updated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "orders_count": true,
+            "total_qty_ordered": true,
+            "total_qty_invoiced": true,
+            "total_income_amount": true,
+            "total_revenue_amount": true,
+            "total_profit_amount": true,
+            "total_invoiced_amount": true,
+            "total_canceled_amount": true,
+            "total_paid_amount": true,
+            "total_refunded_amount": true,
+            "total_tax_amount": true,
+            "total_tax_amount_actual": true,
+            "total_shipping_amount": true,
+            "total_shipping_amount_actual": true,
+            "total_discount_amount": true,
+            "total_discount_amount_actual": true
+        },
+        "index": {
+            "SALES_ORDER_AGGREGATED_UPDATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID": true,
+            "SALES_ORDER_AGGREGATED_UPDATED_PERIOD_STORE_ID_ORDER_STATUS": true
+        }
+    },
+    "sales_payment_transaction": {
+        "column": {
+            "transaction_id": true,
+            "parent_id": true,
+            "order_id": true,
+            "payment_id": true,
+            "txn_id": true,
+            "parent_txn_id": true,
+            "txn_type": true,
+            "is_closed": true,
+            "additional_information": true,
+            "created_at": true
+        },
+        "index": {
+            "SALES_PAYMENT_TRANSACTION_PARENT_ID": true,
+            "SALES_PAYMENT_TRANSACTION_PAYMENT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_PAYMENT_TRANSACTION_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "FK_B99FF1A06402D725EBDB0F3A7ECD47A2": true,
+            "SALES_PAYMENT_TRANSACTION_PAYMENT_ID_SALES_ORDER_PAYMENT_ENTT_ID": true,
+            "SALES_PAYMENT_TRANSACTION_ORDER_ID_PAYMENT_ID_TXN_ID": true
+        }
+    },
+    "sales_refunded_aggregated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "orders_count": true,
+            "refunded": true,
+            "online_refunded": true,
+            "offline_refunded": true
+        },
+        "index": {
+            "SALES_REFUNDED_AGGREGATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_REFUNDED_AGGREGATED_STORE_ID_STORE_STORE_ID": true,
+            "SALES_REFUNDED_AGGREGATED_PERIOD_STORE_ID_ORDER_STATUS": true
+        }
+    },
+    "sales_refunded_aggregated_order": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "orders_count": true,
+            "refunded": true,
+            "online_refunded": true,
+            "offline_refunded": true
+        },
+        "index": {
+            "SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_REFUNDED_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true,
+            "SALES_REFUNDED_AGGREGATED_ORDER_PERIOD_STORE_ID_ORDER_STATUS": true
+        }
+    },
+    "sales_shipping_aggregated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "shipping_description": true,
+            "orders_count": true,
+            "total_shipping": true,
+            "total_shipping_actual": true
+        },
+        "index": {
+            "SALES_SHIPPING_AGGREGATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPPING_AGGREGATED_STORE_ID_STORE_STORE_ID": true,
+            "SALES_SHPP_AGGRED_PERIOD_STORE_ID_ORDER_STS_SHPP_DESCRIPTION": true
+        }
+    },
+    "sales_shipping_aggregated_order": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "shipping_description": true,
+            "orders_count": true,
+            "total_shipping": true,
+            "total_shipping_actual": true
+        },
+        "index": {
+            "SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SHIPPING_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true,
+            "UNQ_C05FAE47282EEA68654D0924E946761F": true
+        }
+    },
+    "sales_bestsellers_aggregated_daily": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "product_id": true,
+            "product_name": true,
+            "product_price": true,
+            "qty_ordered": true,
+            "rating_pos": true
+        },
+        "index": {
+            "SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID": true,
+            "SALES_BESTSELLERS_AGGREGATED_DAILY_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_BESTSELLERS_AGGREGATED_DAILY_STORE_ID_STORE_STORE_ID": true,
+            "SALES_BESTSELLERS_AGGREGATED_DAILY_PERIOD_STORE_ID_PRODUCT_ID": true
+        }
+    },
+    "sales_bestsellers_aggregated_monthly": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "product_id": true,
+            "product_name": true,
+            "product_price": true,
+            "qty_ordered": true,
+            "rating_pos": true
+        },
+        "index": {
+            "SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID": true,
+            "SALES_BESTSELLERS_AGGREGATED_MONTHLY_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_BESTSELLERS_AGGREGATED_MONTHLY_STORE_ID_STORE_STORE_ID": true,
+            "SALES_BESTSELLERS_AGGREGATED_MONTHLY_PERIOD_STORE_ID_PRODUCT_ID": true
+        }
+    },
+    "sales_bestsellers_aggregated_yearly": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "product_id": true,
+            "product_name": true,
+            "product_price": true,
+            "qty_ordered": true,
+            "rating_pos": true
+        },
+        "index": {
+            "SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID": true,
+            "SALES_BESTSELLERS_AGGREGATED_YEARLY_PRODUCT_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_BESTSELLERS_AGGREGATED_YEARLY_STORE_ID_STORE_STORE_ID": true,
+            "SALES_BESTSELLERS_AGGREGATED_YEARLY_PERIOD_STORE_ID_PRODUCT_ID": true
+        }
+    },
+    "sales_order_tax": {
+        "column": {
+            "tax_id": true,
+            "order_id": true,
+            "code": true,
+            "title": true,
+            "percent": true,
+            "amount": true,
+            "priority": true,
+            "position": true,
+            "base_amount": true,
+            "process": true,
+            "base_real_amount": true
+        },
+        "index": {
+            "SALES_ORDER_TAX_ORDER_ID_PRIORITY_POSITION": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "sales_order_tax_item": {
+        "column": {
+            "tax_item_id": true,
+            "tax_id": true,
+            "item_id": true,
+            "tax_percent": true,
+            "amount": true,
+            "base_amount": true,
+            "real_amount": true,
+            "real_base_amount": true,
+            "associated_item_id": true,
+            "taxable_item_type": true
+        },
+        "index": {
+            "SALES_ORDER_TAX_ITEM_ITEM_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_TAX_ITEM_ASSOCIATED_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID": true,
+            "SALES_ORDER_TAX_ITEM_TAX_ID_SALES_ORDER_TAX_TAX_ID": true,
+            "SALES_ORDER_TAX_ITEM_ITEM_ID_SALES_ORDER_ITEM_ITEM_ID": true,
+            "SALES_ORDER_TAX_ITEM_TAX_ID_ITEM_ID": true
+        }
+    },
+    "sales_order_status": {
+        "column": {
+            "status": true,
+            "label": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "sales_order_status_state": {
+        "column": {
+            "status": true,
+            "state": true,
+            "is_default": true,
+            "visible_on_front": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_STATUS_STATE_STATUS_SALES_ORDER_STATUS_STATUS": true
+        }
+    },
+    "sales_order_status_label": {
+        "column": {
+            "status": true,
+            "store_id": true,
+            "label": true
+        },
+        "index": {
+            "SALES_ORDER_STATUS_LABEL_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_ORDER_STATUS_LABEL_STATUS_SALES_ORDER_STATUS_STATUS": true,
+            "SALES_ORDER_STATUS_LABEL_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 9de3f238d6a39..5a5dd925a3098 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -65,6 +65,7 @@
     <preference for="Magento\Sales\Api\OrderRepositoryInterface" type="Magento\Sales\Model\OrderRepository"/>
     <preference for="Magento\Sales\Api\OrderManagementInterface" type="Magento\Sales\Model\Service\OrderService"/>
     <preference for="Magento\Sales\Api\OrderStatusHistoryRepositoryInterface" type="Magento\Sales\Model\Order\Status\HistoryRepository"/>
+    <preference for="Magento\Sales\Api\PaymentFailuresInterface" type="Magento\Sales\Model\Service\PaymentFailuresService" />
     <preference for="Magento\Sales\Api\ShipmentCommentRepositoryInterface" type="Magento\Sales\Model\Order\Shipment\CommentRepository"/>
     <preference for="Magento\Sales\Api\ShipmentItemRepositoryInterface" type="Magento\Sales\Model\Order\Shipment\ItemRepository"/>
     <preference for="Magento\Sales\Api\ShipmentRepositoryInterface" type="Magento\Sales\Model\Order\ShipmentRepository"/>
@@ -119,6 +120,7 @@
         <arguments>
             <argument name="providers" xsi:type="array">
                 <item name="default" xsi:type="string">Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider</item>
+                <item name="updated_at" xsi:type="string">Magento\Sales\Model\ResourceModel\Provider\UpdatedAtListProvider</item>
             </argument>
         </arguments>
     </type>
@@ -322,6 +324,7 @@
             <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\OrderSender</argument>
             <argument name="entityResource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order</argument>
             <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Collection</argument>
+            <argument name="identityContainer" xsi:type="object" shared="false">Magento\Sales\Model\Order\Email\Container\OrderIdentity</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesOrderInvoiceSendEmails" type="Magento\Sales\Model\EmailSenderHandler">
@@ -329,6 +332,7 @@
             <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\InvoiceSender</argument>
             <argument name="entityResource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Invoice</argument>
             <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Invoice\Collection</argument>
+            <argument name="identityContainer" xsi:type="object" shared="false">Magento\Sales\Model\Order\Email\Container\InvoiceIdentity</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesOrderShipmentSendEmails" type="Magento\Sales\Model\EmailSenderHandler">
@@ -336,6 +340,7 @@
             <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\ShipmentSender</argument>
             <argument name="entityResource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Shipment</argument>
             <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Shipment\Collection</argument>
+            <argument name="identityContainer" xsi:type="object" shared="false">Magento\Sales\Model\Order\Email\Container\ShipmentIdentity</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesOrderCreditmemoSendEmails" type="Magento\Sales\Model\EmailSenderHandler">
@@ -343,48 +348,49 @@
             <argument name="emailSender" xsi:type="object">Magento\Sales\Model\Order\Email\Sender\CreditmemoSender</argument>
             <argument name="entityResource" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Creditmemo</argument>
             <argument name="entityCollection" xsi:type="object" shared="false">Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection</argument>
+            <argument name="identityContainer" xsi:type="object" shared="false">Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity</argument>
         </arguments>
     </virtualType>
 
     <virtualType name="SalesOrderSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesOrderInvoiceSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesOrderShipmentSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesOrderCreditmemoSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
         </arguments>
     </virtualType>
 
     <virtualType name="SalesOrderSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesInvoiceSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesShipmentSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
         </arguments>
     </virtualType>
     <virtualType name="SalesCreditmemoSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
         <arguments>
-            <argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
+            <argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
         </arguments>
     </virtualType>
     <type name="Magento\SalesSequence\Model\EntityPool">
@@ -470,6 +476,14 @@
             <argument name="entityRelationComposite" xsi:type="object">CreditmemoRelationsComposite</argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Sales\Model\ResourceModel\Provider\NotSyncedOrderDataProvider" type="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider</item>
+                <item name="updated_at" xsi:type="string">Magento\Sales\Model\ResourceModel\Provider\UpdatedAtListProvider</item>
+            </argument>
+        </arguments>
+    </virtualType>
     <virtualType name="Magento\Sales\Model\ResourceModel\Order\Grid" type="Magento\Sales\Model\ResourceModel\Grid">
         <arguments>
             <argument name="mainTableName" xsi:type="string">sales_order</argument>
@@ -520,6 +534,7 @@
                 <item name="payment_method" xsi:type="string">sales_order_payment.method</item>
                 <item name="total_refunded" xsi:type="string">sales_order.total_refunded</item>
             </argument>
+            <argument name="notSyncedDataProvider" xsi:type="object">Magento\Sales\Model\ResourceModel\Provider\NotSyncedOrderDataProvider</argument>
         </arguments>
     </virtualType>
     <virtualType name="ShipmentGridAggregator" type="Magento\Sales\Model\ResourceModel\Grid">
@@ -676,8 +691,8 @@
                 <item name="billing_address" xsi:type="object">BillingAddressAggregator</item>
                 <item name="shipping_address" xsi:type="object">ShippingAddressAggregator</item>
                 <item name="shipping_information" xsi:type="string">sales_order.shipping_description</item>
-                <item name="subtotal" xsi:type="string">sales_order.base_subtotal</item>
-                <item name="shipping_and_handling" xsi:type="string">sales_order.base_shipping_amount</item>
+                <item name="subtotal" xsi:type="string">sales_invoice.base_subtotal</item>
+                <item name="shipping_and_handling" xsi:type="string">sales_invoice.base_shipping_amount</item>
                 <item name="base_grand_total" xsi:type="string">sales_invoice.base_grand_total</item>
                 <item name="grand_total" xsi:type="string">sales_invoice.grand_total</item>
                 <item name="created_at" xsi:type="string">sales_invoice.created_at</item>
@@ -730,6 +745,10 @@
     <virtualType name="ShippingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
         <arguments>
             <argument name="columns" xsi:type="array">
+                <item name="company" xsi:type="array">
+                    <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
+                    <item name="columnName" xsi:type="string">company</item>
+                </item>
                 <item name="street" xsi:type="array">
                     <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
                     <item name="columnName" xsi:type="string">street</item>
@@ -753,6 +772,10 @@
     <virtualType name="BillingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
         <arguments>
             <argument name="columns" xsi:type="array">
+                <item name="company" xsi:type="array">
+                    <item name="tableAlias" xsi:type="string">sales_billing_address</item>
+                    <item name="columnName" xsi:type="string">company</item>
+                </item>
                 <item name="street" xsi:type="array">
                     <item name="tableAlias" xsi:type="string">sales_billing_address</item>
                     <item name="columnName" xsi:type="string">street</item>
@@ -965,6 +988,13 @@
     <type name="Magento\Sales\Model\ResourceModel\Order\Handler\Address">
         <plugin name="addressUpdate" type="Magento\Sales\Model\Order\Invoice\Plugin\AddressUpdate"/>
     </type>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="encyption_payment_data_update" xsi:type="object">Magento\Sales\Console\Command\EncryptionPaymentDataUpdateCommand</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
             <argument name="sensitive" xsi:type="array">
@@ -982,4 +1012,7 @@
             </argument>
         </arguments>
     </type>
+    <preference
+            for="Magento\Sales\Api\OrderCustomerDelegateInterface"
+            type="Magento\Sales\Model\Order\OrderCustomerDelegate" />
 </config>
diff --git a/app/code/Magento/Sales/etc/events.xml b/app/code/Magento/Sales/etc/events.xml
index 9ec983acab5bd..b3a7a4ab99577 100644
--- a/app/code/Magento/Sales/etc/events.xml
+++ b/app/code/Magento/Sales/etc/events.xml
@@ -51,4 +51,9 @@
     <event name="store_add">
         <observer name="magento_sequence" instance="Magento\SalesSequence\Observer\SequenceCreatorObserver" />
     </event>
+    <event name="customer_save_after_data_object">
+        <observer
+                name="sales_assign_order_to_customer"
+                instance="Magento\Sales\Observer\AssignOrderToCustomerObserver" />
+    </event>
 </config>
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
index b234cdad876cc..11eebaa3d5a3d 100644
--- a/app/code/Magento/Sales/etc/module.xml
+++ b/app/code/Magento/Sales/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sales" setup_version="2.0.9">
+    <module name="Magento_Sales" >
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 0cfd36e219169..6435445e0ef93 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -12,4 +12,14 @@
     <type name="Magento\Sales\Model\ResourceModel\Order">
         <plugin name="authorization" type="Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization" />
     </type>
+    <type name="Magento\Sales\Api\ShipmentRepositoryInterface">
+        <plugin name="convert_blob_to_string" type="Magento\Sales\Plugin\ShippingLabelConverter" />
+    </type>
+    <type name="Magento\Framework\Reflection\DataObjectProcessor">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 0cfd36e219169..6435445e0ef93 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -12,4 +12,14 @@
     <type name="Magento\Sales\Model\ResourceModel\Order">
         <plugin name="authorization" type="Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization" />
     </type>
+    <type name="Magento\Sales\Api\ShipmentRepositoryInterface">
+        <plugin name="convert_blob_to_string" type="Magento\Sales\Plugin\ShippingLabelConverter" />
+    </type>
+    <type name="Magento\Framework\Reflection\DataObjectProcessor">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index a32f3cacce756..c5657f3a309f7 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -686,17 +686,9 @@ General,General
 "Allow Reorder","Allow Reorder"
 "Invoice and Packing Slip Design","Invoice and Packing Slip Design"
 "Logo for PDF Print-outs (200x50)","Logo for PDF Print-outs (200x50)"
-"
-                        Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
-                    ","
-                        Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.
-                    "
+"Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.","Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image."
 "Logo for HTML Print View","Logo for HTML Print View"
-"
-                        Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
-                    ","
-                        Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)
-                    "
+"Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)","Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)"
 Address,Address
 "Minimum Order Amount","Minimum Order Amount"
 Enable,Enable
@@ -803,3 +795,5 @@ Created,Created
 "PDF Shipments","PDF Shipments"
 "PDF Creditmemos","PDF Creditmemos"
 Refunds,Refunds
+"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
+"Allow Zero GrandTotal","Allow Zero GrandTotal"
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
index c321bee460e46..0f5a3559f3008 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
@@ -80,13 +80,13 @@
                             <argument name="align" xsi:type="string">center</argument>
                         </arguments>
                     </block>
-                </block>
-                <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
-                    <arguments>
-                        <argument name="header" xsi:type="string" translate="true">Website</argument>
-                        <argument name="index" xsi:type="string">website_name</argument>
-                        <argument name="align" xsi:type="string">center</argument>
-                    </arguments>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Website</argument>
+                            <argument name="index" xsi:type="string">website_name</argument>
+                            <argument name="align" xsi:type="string">center</argument>
+                        </arguments>
+                    </block>
                 </block>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index eb0a7685e5e22..3832476ff6972 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -45,8 +45,18 @@
                             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="Magento_Sales::order/create/sidebar/items.phtml" name="pviewed"/>
                         </block>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="Magento_Sales::order/create/form/account.phtml" name="form_account"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
+                            <arguments>
+                                <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                                <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                            </arguments>
+                        </block>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
+                            <arguments>
+                                <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                                <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                            </arguments>
+                        </block>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="Magento_Sales::order/create/shipping/method/form.phtml" name="order_create_shipping_form" as="form"/>
                         </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
index 6f0cbdb0cd43f..c52f81d5cb56d 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
@@ -8,7 +8,12 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
+            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
+                <arguments>
+                    <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                    <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
index 70b5bfc298274..54348ce961c56 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -20,8 +20,18 @@
                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="Magento_Sales::order/create/sidebar/items.phtml" name="pviewed"/>
                 </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="Magento_Sales::order/create/form/account.phtml" name="form_account"/>
-                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
-                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
+                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
+                    <arguments>
+                        <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                        <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
+                    <arguments>
+                        <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                        <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="Magento_Sales::order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
                 </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
index 56f6786397df9..559f56dcb845b 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
@@ -8,7 +8,12 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
+            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
+                <arguments>
+                    <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                    <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
index 0c1b395b5116d..71490553aff17 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -22,7 +22,6 @@
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="Magento_Sales::order/totals.phtml">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="Magento_Sales::order/creditmemo/create/totals/adjustments.phtml"/>
                             <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
index 29a61308391c6..8375bec965794 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -13,7 +13,6 @@
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
             <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-            <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
             <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="Magento_Sales::order/totals.phtml">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="Magento_Sales::order/creditmemo/create/totals/adjustments.phtml"/>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
index def5ebaf546cd..b589ac0ac793d 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -25,7 +25,6 @@
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="Magento_Sales::order/totals.phtml">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
                         </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
index 4df3f057f6a58..38e4cb50f4343 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -13,7 +13,6 @@
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
             <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-            <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
             <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="Magento_Sales::order/totals.phtml">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
             </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index 27b8ca86b1681..a903c92ef33e2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -14,32 +14,34 @@
 ?>
 
 <?php if ($_item = $block->getItem()): ?>
-    <div id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"
+    <div id="order_item_<?= $block->escapeHtml($_item->getId()) ?>_title"
          class="product-title">
         <?= $block->escapeHtml($_item->getName()) ?>
     </div>
-
     <div class="product-sku-block">
-        <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
+        <span><?= $block->escapeHtml(__('SKU'))?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
     </div>
 
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
             <?php foreach ($block->getOrderOptions() as $_option): ?>
-                <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
+                <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
                 <dd>
                     <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                         <?= /* @escapeNotVerified */ $block->getCustomizedOptionValue($_option) ?>
                     <?php else: ?>
                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
-                        <?= /* @escapeNotVerified */ $_option['value'] ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?= /* @escapeNotVerified */ $_dots = 'dots' . uniqid() ?>"> ...</span><span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_option['remainder'] ?></span>
+                        <?php $dots = 'dots' . uniqid(); ?>
+                        <?= $block->escapeHtml($_option['value']) ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?> <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
+                            <?php  $id = 'id' . uniqid(); ?>
+                            <span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder']) ?></span>
                             <script>
                                 require(['prototype'], function() {
-                                    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_dots ?>').hide();});
-                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_dots ?>').show();});
+                                    $('<?= /* @noEscape */ $id; ?>').hide();
+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $id; ?>').show();});
+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $dots; ?>').hide();});
+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $id; ?>').hide();});
+                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $dots; ?>').show();});
                                 });
                             </script>
                         <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index faa49dca3a8eb..9bf4856795197 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -7,38 +7,38 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php if ($_item = $block->getItem()): ?>
+<?php if ($item = $block->getItem()): ?>
 <table class="qty-table">
     <tr>
-        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
+        <th><?= $block->escapeHtml(__('Ordered')); ?></th>
+        <td><?= /* @noEscape */  $item->getQtyOrdered()*1 ?></td>
     </tr>
 
-    <?php if ((float) $_item->getQtyInvoiced()): ?>
+    <?php if ((float) $item->getQtyInvoiced()): ?>
         <tr>
-            <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
-            <td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
+            <th><?= $block->escapeHtml(__('Invoiced')); ?></th>
+            <td><?= /* @noEscape */  $item->getQtyInvoiced()*1 ?></td>
         </tr>
     <?php endif; ?>
 
-    <?php if ((float) $_item->getQtyShipped()): ?>
+    <?php if ((float) $item->getQtyShipped()): ?>
         <tr>
-            <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-            <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
+            <th><?= $block->escapeHtml(__('Shipped')); ?></th>
+            <td><?= /* @noEscape */  $item->getQtyShipped()*1 ?></td>
         </tr>
     <?php endif; ?>
 
-    <?php if ((float) $_item->getQtyRefunded()): ?>
+    <?php if ((float) $item->getQtyRefunded()): ?>
         <tr>
-            <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
-            <td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
+            <th><?= $block->escapeHtml(__('Refunded')); ?></th>
+            <td><?= /* @noEscape */ $item->getQtyRefunded()*1 ?></td>
         </tr>
     <?php endif; ?>
 
-    <?php if ((float) $_item->getQtyCanceled()): ?>
+    <?php if ((float) $item->getQtyCanceled()): ?>
         <tr>
-            <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
-            <td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
+            <th><?= $block->escapeHtml(__('Canceled')); ?></th>
+            <td><?= /* @noEscape */ $item->getQtyCanceled()*1 ?></td>
         </tr>
     <?php endif; ?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index a0851a864ff0b..c69d453fb81d5 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -12,11 +12,12 @@
         $_methods = $block->getMethods();
         $_methodsCount = count($_methods);
         $_counter = 0;
+        $currentSelectedMethod = $block->getSelectedMethodCode();
     ?>
     <?php foreach ($_methods as $_method) :
         $_code = $_method->getCode();
         $_counter++;
-    ?>
+        ?>
         <dt class="admin__field-option">
         <?php if ($_methodsCount > 1) : ?>
             <input id="p_method_<?= $block->escapeHtml($_code); ?>"
@@ -24,7 +25,7 @@
                    type="radio" name="payment[method]"
                    title="<?= $block->escapeHtml($_method->getTitle()); ?>"
                    onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
-                    <?php if ($block->getSelectedMethodCode() == $_code) : ?>
+                    <?php if ($currentSelectedMethod == $_code) : ?>
                     checked="checked"
                     <?php endif; ?>
                     <?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
@@ -39,8 +40,8 @@
             </span>
         <?php endif;?>
 
-            <label class="admin__field-label"
-                   for="p_method_<?= $block->escapeHtml($_code); ?>"><?= $block->escapeHtml($_method->getTitle()) ?>
+            <label class="admin__field-label" for="p_method_<?= $block->escapeHtml($_code); ?>">
+                <?= $block->escapeHtml($_method->getTitle()) ?>
             </label>
         </dt>
         <dd class="admin__payment-method-wrapper">
@@ -55,7 +56,11 @@
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
-            order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
+        <?php if ($_methodsCount !== 1) : ?>
+            order.setPaymentMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+        <?php else : ?>
+            payment.switchMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+        <?php endif; ?>
         });
     </script>
 <?php else : ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index fdbaae2347398..170fea937348d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -47,17 +47,15 @@
             </div>
         </section>
 
-        <section id="order-methods" class="admin__page-section order-methods">
-            <div class="admin__page-section-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Information') ?></span>
+        <section id="shipping-methods" class="admin__page-section order-methods">
+            <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
+                <?= $block->getChildHtml('shipping_method') ?>
             </div>
-            <div class="admin__page-section-content">
-                <div id="order-billing_method" class="admin__page-section-item order-billing-method">
-                    <?= $block->getChildHtml('billing_method') ?>
-                </div>
-                <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
-                    <?= $block->getChildHtml('shipping_method') ?>
-                </div>
+        </section>
+
+        <section id="payment-methods" class="admin__page-section payment-methods">
+            <div id="order-billing_method" class="admin__page-section-item order-billing-method">
+                <?= $block->getChildHtml('billing_method') ?>
             </div>
         </section>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index 686e311292ac7..b0a88b8fa37dc 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -6,6 +6,21 @@
 
 // @codingStandardsIgnoreFile
 
+/**
+ * @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
+ */
+$addressCollection = $block->getData('customerAddressCollection');
+
+$addressArray = [];
+if ($block->getCustomerId()) {
+    $addressArray = $addressCollection->setCustomerFilter([$block->getCustomerId()])->toArray();
+}
+
+/**
+ * @var \Magento\Sales\ViewModel\Customer\AddressFormatter $customerAddressFormatter
+ */
+$customerAddressFormatter = $block->getData('customerAddressFormatter');
+
 /**
  * @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|\Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
  */
@@ -17,7 +32,7 @@ if ($block->getIsShipping()):
     require(["Magento_Sales/order/create/form"], function(){
 
         order.shippingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
-        order.setAddresses(<?= /* @escapeNotVerified */ $block->getAddressCollectionJson() ?>);
+        order.setAddresses(<?= /* @escapeNotVerified */ $customerAddressFormatter->getAddressesJson($addressArray) ?>);
 
     });
     </script>
@@ -59,13 +74,11 @@ endif; ?>
                         onchange="order.selectAddress(this, '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>')"
                         class="admin__control-select">
                     <option value=""><?= /* @escapeNotVerified */ __('Add New Address') ?></option>
-                    <?php foreach ($block->getAddressCollection() as $_address): ?>
-                        <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
+                    <?php foreach ($addressArray as $addressId => $address): ?>
                         <option
-                            value="<?= /* @escapeNotVerified */ $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $block->getAddressAsString($_address) ?>
+                            value="<?= /* @escapeNotVerified */ $addressId ?>"<?php if ($addressId == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
+                            <?= /* @escapeNotVerified */ $block->escapeHtml($customerAddressFormatter->getAddressAsString($address)) ?>
                         </option>
-                        <?php //endif; ?>
                     <?php endforeach; ?>
                 </select>
             </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 9e0394f6430bd..65d3a612e5133 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -100,12 +100,8 @@ require(['prototype'], function(){
 </div>
 <script>
     require(["Magento_Sales/order/create/form"], function(){
-
         order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
         order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
-
-        <?php if ($block->getQuote()->isVirtual()): ?>
-            order.isOnlyVirtualProduct = true;
-        <?php endif; ?>
+        order.isOnlyVirtualProduct = <?= /* @noEscape */ $block->getQuote()->isVirtual() ? 'true' : 'false'; ?>;
     });
 </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 2ca2420934519..2dbf717f73439 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -67,11 +67,7 @@
 
                         <?php if ($block->canDisplayPrice()): ?>
                             <td class="col-price">
-                                <?php if ($block->getDataId() == 'cart'): ?>
-                                    <?= /* @noEscape */ $block->getItemPrice($_item->getProduct()) ?>
-                                <?php else: ?>
-                                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-                                <?php endif; ?>
+                                <?= /* @noEscape */ $block->getItemPrice($block->getProduct($_item)) ?>
                             </td>
                         <?php endif; ?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index fa5ea0568011b..4a77c3b166de9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -31,9 +31,9 @@
                 <?php if ($block->canEditQty()): ?>
                 <tfoot>
                     <tr>
-                        <td colspan="2">&nbsp;</td>
-                        <td colspan="3"><?= $block->getUpdateButtonHtml() ?></td>
                         <td colspan="3">&nbsp;</td>
+                        <td><?= $block->getUpdateButtonHtml() ?></td>
+                        <td colspan="4">&nbsp;</td>
                     </tr>
                 </tfoot>
                 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index b038c72199c7f..14025eb2dd51a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
@@ -4,16 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
+$totals = $block->getTotals();
 ?>
-<?php if (sizeof($block->getTotals()) > 0): ?>
+<?php if ($totals && count($totals) > 0): ?>
 <table class="items-to-invoice">
     <tr>
-    <?php foreach ($block->getTotals() as $_total): ?>
-        <td <?php if ($_total['grand']): ?>class="grand-total"<?php endif; ?>>
-            <?= /* @escapeNotVerified */ $_total['label'] ?><br />
-            <?= /* @escapeNotVerified */ $_total['value'] ?>
+    <?php foreach ($totals as $total): ?>
+        <td <?php if ($total['grand']): ?>class="grand-total"<?php endif; ?>>
+            <?= $block->escapeHtml($total['label']) ?><br />
+            <?= $block->escapeHtml($total['value']) ?>
         </td>
     <?php endforeach; ?>
     </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
index d23ebac84e6c2..27b82505a11d3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -7,14 +7,6 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /*$_source = $block->getSource(); ?>
-<?php $block->setPriceDataObject($_source) ?>
-<?php if ($_source): ?>
-<table width="100%">
-    <?= $block->getChildHtml('main') ?>
-    <?= $block->getChildHtml('footer') ?>
-</table>
-<?php endif;*/ ?>
 <table class="data-table admin__table-secondary order-subtotal-table">
     <?php $_totals = $block->getTotals('footer')?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index 1ec51ffb793c6..6ac6e13a873ed 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -5,7 +5,7 @@
  */
 
 // @codingStandardsIgnoreFile
-
+/** @var \Magento\Sales\Block\Adminhtml\Order\View\History $block */
 ?>
 <div id="order_history_block" class="edit-order-comments">
     <?php if ($block->canAddComment()):?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
index 56c1a99e66ade..5384a00dc894d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
@@ -24,6 +24,8 @@ $orderStoreDate = $block->formatDate(
     true,
     $block->getTimezoneForStore($order->getStore())
 );
+
+$customerUrl = $block->getCustomerViewUrl();
 ?>
 
 <section class="admin__page-section order-view-account-information">
@@ -114,8 +116,8 @@ $orderStoreDate = $block->formatDate(
             <div class="admin__page-section-item-title">
                 <span class="title"><?= $block->escapeHtml(__('Account Information')) ?></span>
                 <div class="actions">
-                    <?php if ($customerUrl = $block->getCustomerViewUrl()) : ?>
-                        <a href="<?= /* @noEscape */ $block->getCustomerViewUrl() ?>" target="_blank">
+                    <?php if ($customerUrl) : ?>
+                        <a href="<?= /* @noEscape */ $customerUrl ?>" target="_blank">
                             <?= $block->escapeHtml(__('Edit Customer')) ?>
                         </a>
                     <?php endif; ?>
@@ -126,7 +128,7 @@ $orderStoreDate = $block->formatDate(
                     <tr>
                         <th><?= $block->escapeHtml(__('Customer Name')) ?></th>
                         <td>
-                            <?php if ($customerUrl = $block->getCustomerViewUrl()): ?>
+                            <?php if ($customerUrl): ?>
                                 <a href="<?= $block->escapeUrl($customerUrl) ?>" target="_blank">
                                     <span><?= $block->escapeHtml($order->getCustomerName()) ?></span>
                                 </a>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
index b3708edf1d098..c46ff775f6f9a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -58,7 +58,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title""><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
         <?= $block->getChildHtml('child_grid') ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
index ecc2b5beee321..10b7b1c028c66 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
@@ -35,7 +35,13 @@
     <listingToolbar name="listing_top">
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <exportButton name="export_button"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" active="true" name="order_id">*</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
         <filterSearch name="fulltext"/>
         <filters name="listing_filters">
             <filterSelect name="store_id" provider="${ $.parentName }">
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml
index 3ec450a570b46..ac1233c5e4961 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml
@@ -35,7 +35,13 @@
     <listingToolbar name="listing_top">
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <exportButton name="export_button"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" active="true" name="order_id">*</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
         <filterSearch name="fulltext"/>
         <filters name="listing_filters">
             <filterSelect name="store_id" provider="${ $.parentName }">
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
index 27cef50742163..6db77a79b8c14 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
@@ -35,7 +35,13 @@
     <listingToolbar name="listing_top">
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <exportButton name="export_button"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" active="true" name="order_id">*</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
         <filterSearch name="fulltext"/>
         <filters name="listing_filters">
             <filterSelect name="store_id" provider="${ $.parentName }">
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 629b7ac93ecee..c508a5ecdfa58 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -4,14 +4,17 @@
  */
 
 define([
-    "jquery",
+    'jquery',
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/alert',
-    "mage/translate",
-    "prototype",
-    "Magento_Catalog/catalog/product/composite/configure",
+    'mage/template',
+    'text!Magento_Sales/templates/order/create/shipping/reload.html',
+    'text!Magento_Sales/templates/order/create/payment/reload.html',
+    'mage/translate',
+    'prototype',
+    'Magento_Catalog/catalog/product/composite/configure',
     'Magento_Ui/js/lib/view/utils/async'
-], function(jQuery, confirm, alert){
+], function (jQuery, confirm, alert, template, shippingTemplate, paymentTemplate) {
 
     window.AdminOrder = new Class.create();
 
@@ -21,6 +24,7 @@ define([
             this.loadBaseUrl    = false;
             this.customerId     = data.customer_id ? data.customer_id : false;
             this.storeId        = data.store_id ? data.store_id : false;
+            this.quoteId        = data['quote_id'] ? data['quote_id'] : false;
             this.currencyId     = false;
             this.currencySymbol = data.currency_symbol ? data.currency_symbol : '';
             this.addresses      = data.addresses ? data.addresses : $H({});
@@ -28,7 +32,7 @@ define([
             this.gridProducts   = $H({});
             this.gridProductsGift = $H({});
             this.billingAddressContainer = '';
-            this.shippingAddressContainer= '';
+            this.shippingAddressContainer = '';
             this.isShippingMethodReseted = data.shipping_method_reseted ? data.shipping_method_reseted : false;
             this.overlayData = $H({});
             this.giftMessageDataChanged = false;
@@ -38,6 +42,19 @@ define([
             this.isOnlyVirtualProduct = false;
             this.excludedPaymentMethods = [];
             this.summarizePrice = true;
+            this.shippingTemplate = template(shippingTemplate, {
+                data: {
+                    title: jQuery.mage.__('Shipping Method'),
+                    linkText: jQuery.mage.__('Get shipping methods and rates')
+                }
+            });
+            this.paymentTemplate = template(paymentTemplate, {
+                data: {
+                    title: jQuery.mage.__('Payment Method'),
+                    linkText: jQuery.mage.__('Get available payment methods')
+                }
+            });
+
             jQuery.async('#order-items', (function(){
                 this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
                 this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
@@ -46,8 +63,8 @@ define([
                         if (typeof controlButtonArea != 'undefined') {
                             var buttons = controlButtonArea.childElements();
                             for (var i = 0; i < buttons.length; i++) {
-                                if (buttons[i].innerHTML.include(button.label)) {
-                                    return ;
+                                if (buttons[i].innerHTML.include(button.getLabel())) {
+                                    return;
                                 }
                             }
                             button.insertIn(controlButtonArea, 'top');
@@ -55,7 +72,8 @@ define([
                     }
                 });
 
-                var searchButton = new ControlButton(jQuery.mage.__('Add Products')),
+                var searchButtonId = 'add_products',
+                    searchButton = new ControlButton(jQuery.mage.__('Add Products'), searchButtonId),
                     searchAreaId = this.getAreaId('search');
                 searchButton.onClick = function() {
                     $(searchAreaId).show();
@@ -74,7 +92,7 @@ define([
 
                     this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function(proceed) {
                         proceed();
-                        if ($(searchAreaId) && !$(searchAreaId).visible()) {
+                        if ($(searchAreaId) && !$(searchAreaId).visible() && !$(searchButtonId)) {
                             this.addControlButton(searchButton);
                         }
                     });
@@ -157,6 +175,7 @@ define([
             }
             if(this.addresses[id]){
                 this.fillAddressFields(container, this.addresses[id]);
+
             }
             else{
                 this.fillAddressFields(container, {});
@@ -164,73 +183,137 @@ define([
 
             var data = this.serializeData(container);
             data[el.name] = id;
-            if(this.isShippingField(container) && !this.isShippingMethodReseted){
+
+            this.resetPaymentMethod();
+            if (this.isShippingField(container) && !this.isShippingMethodReseted) {
                 this.resetShippingMethod(data);
-            }
-            else{
+            } else{
                 this.saveData(data);
             }
         },
 
-        isShippingField : function(fieldId){
-            if(this.shippingAsBilling){
+        /**
+         * Checks if the field belongs to the shipping address.
+         *
+         * @param {String} fieldId
+         * @return {Boolean}
+         */
+        isShippingField: function (fieldId) {
+            if (this.shippingAsBilling) {
                 return fieldId.include('billing');
             }
+
             return fieldId.include('shipping');
         },
 
-        isBillingField : function(fieldId){
+        /**
+         * Checks if the field belongs to the billing address.
+         *
+         * @param {String} fieldId
+         * @return {Boolean}
+         */
+        isBillingField: function (fieldId) {
             return fieldId.include('billing');
         },
 
-        bindAddressFields : function(container) {
-            var fields = $(container).select('input', 'select', 'textarea');
-            for(var i=0;i<fields.length;i++){
-                Event.observe(fields[i], 'change', this.changeAddressField.bind(this));
+        /**
+         * Binds events on container form fields.
+         *
+         * @param {String} container
+         */
+        bindAddressFields: function (container) {
+            var fields = $(container).select('input', 'select', 'textarea'),
+                i;
+
+            for (i = 0; i < fields.length; i++) {
+                jQuery(fields[i]).change(this.changeAddressField.bind(this));
             }
         },
 
-        changeAddressField : function(event){
-            var field = Event.element(event);
-            var re = /[^\[]*\[([^\]]*)_address\]\[([^\]]*)\](\[(\d)\])?/;
-            var matchRes = field.name.match(re);
+        /**
+         * Triggers on each form's element changes.
+         *
+         * @param {Event} event
+         */
+        changeAddressField: function (event) {
+            var field = Event.element(event),
+                re = /[^\[]*\[([^\]]*)_address\]\[([^\]]*)\](\[(\d)\])?/,
+                matchRes = field.name.match(re),
+                type,
+                name,
+                data,
+                resetShipping = false;
 
             if (!matchRes) {
                 return;
             }
 
-            var type = matchRes[1];
-            var name = matchRes[2];
-            var data;
+            type = matchRes[1];
+            name = matchRes[2];
 
-            if(this.isBillingField(field.id)){
-                data = this.serializeData(this.billingAddressContainer)
-            }
-            else{
-                data = this.serializeData(this.shippingAddressContainer)
+            if (this.isBillingField(field.id)) {
+                data = this.serializeData(this.billingAddressContainer);
+            } else {
+                data = this.serializeData(this.shippingAddressContainer);
             }
             data = data.toObject();
 
-            if( (type == 'billing' && this.shippingAsBilling)
-                || (type == 'shipping' && !this.shippingAsBilling) ) {
+            if (type === 'billing' && this.shippingAsBilling) {
+                this.syncAddressField(this.shippingAddressContainer, field.name, field.value);
+                resetShipping = true;
+            }
+
+            if (type === 'shipping' && !this.shippingAsBilling) {
+                resetShipping = true;
+            }
+
+            if (resetShipping) {
                 data['reset_shipping'] = true;
             }
 
-            data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value;
+            data['order[' + type + '_address][customer_address_id]'] = null;
+            data['shipping_as_billing'] = +this.shippingAsBilling;
+
+            if (name === 'customer_address_id') {
+                data['order[' + type + '_address][customer_address_id]'] =
+                    $('order-' + type + '_address_customer_address_id').value;
+            }
+
+            this.resetPaymentMethod();
 
             if (data['reset_shipping']) {
-                this.resetShippingMethod(data);
+                this.resetShippingMethod();
             } else {
                 this.saveData(data);
-                if (name == 'country_id' || name == 'customer_address_id') {
+
+                if (name === 'country_id' || name === 'customer_address_id') {
                     this.loadArea(['shipping_method', 'billing_method', 'totals', 'items'], true, data);
                 }
-                // added for reloading of default sender and default recipient for giftmessages
-                //this.loadArea(['giftmessage'], true, data);
             }
         },
 
-        fillAddressFields : function(container, data){
+        /**
+         * Set address container form field value.
+         *
+         * @param {String} container - container ID
+         * @param {String} fieldName - form field name
+         * @param {*} fieldValue - form field value
+         */
+        syncAddressField: function (container, fieldName, fieldValue) {
+            var syncName;
+
+            if (this.isBillingField(fieldName)) {
+                syncName = fieldName.replace('billing', 'shipping');
+            }
+
+            $(container).select('[name="' + syncName + '"]').each(function (element) {
+                if (~['input', 'textarea', 'select'].indexOf(element.tagName.toLowerCase())) {
+                    element.value = fieldValue;
+                }
+            });
+        },
+
+        fillAddressFields: function(container, data){
             var regionIdElem = false;
             var regionIdElemValue = false;
 
@@ -271,10 +354,15 @@ define([
                     fields[i].setValue(data[name] ? data[name] : '');
                 }
 
-                if (fields[i].changeUpdater) fields[i].changeUpdater();
+                if (fields[i].changeUpdater) {
+                    fields[i].changeUpdater();
+                }
+
                 if (name == 'region' && data['region_id'] && !data['region']){
                     fields[i].value = data['region_id'];
                 }
+
+                jQuery(fields[i]).trigger('change');
             }
         },
 
@@ -305,46 +393,83 @@ define([
             }
         },
 
-        setShippingAsBilling : function(flag){
-            var data;
-            var areasToLoad = ['billing_method', 'shipping_address', 'totals', 'giftmessage'];
+        /**
+         * Equals shipping and billing addresses.
+         *
+         * @param {Boolean} flag
+         */
+        setShippingAsBilling: function (flag) {
+            var data,
+                areasToLoad = ['billing_method', 'shipping_address', 'shipping_method', 'totals', 'giftmessage'];
+
             this.disableShippingAddress(flag);
-            if(flag){
-                data = this.serializeData(this.billingAddressContainer);
-            } else {
-                data = this.serializeData(this.shippingAddressContainer);
-            }
-            areasToLoad.push('shipping_method');
+            data = this.serializeData(flag ? this.billingAddressContainer : this.shippingAddressContainer);
             data = data.toObject();
             data['shipping_as_billing'] = flag ? 1 : 0;
             data['reset_shipping'] = 1;
             this.loadArea(areasToLoad, true, data);
         },
 
-        resetShippingMethod : function(data){
-            var areasToLoad = ['billing_method', 'shipping_address', 'totals', 'giftmessage', 'items'];
-            if(!this.isOnlyVirtualProduct) {
-                areasToLoad.push('shipping_method');
-                areasToLoad.push('shipping_address');
+        /**
+         * Replace shipping method area.
+         */
+        resetShippingMethod: function () {
+            if (!this.isOnlyVirtualProduct) {
+                $(this.getAreaId('shipping_method')).update(this.shippingTemplate);
             }
+        },
 
-            data['reset_shipping'] = 1;
-            this.isShippingMethodReseted = true;
-            this.loadArea(areasToLoad, true, data);
+        /**
+         * Replace payment method area.
+         */
+        resetPaymentMethod: function () {
+            $(this.getAreaId('billing_method')).update(this.paymentTemplate);
         },
 
-        loadShippingRates : function(){
+        /**
+         * Loads shipping options according to address data.
+         *
+         * @return {Boolean}
+         */
+        loadShippingRates: function () {
+            var addressContainer = this.shippingAsBilling ?
+                    'billingAddressContainer' :
+                    'shippingAddressContainer',
+                data = this.serializeData(this[addressContainer]).toObject();
+
+            data['collect_shipping_rates'] = 1;
             this.isShippingMethodReseted = false;
-            this.loadArea(['shipping_method', 'totals'], true, {collect_shipping_rates: 1});
+            this.loadArea(['shipping_method', 'totals'], true, data);
+
+            return false;
         },
 
-        setShippingMethod : function(method){
+        setShippingMethod: function(method) {
             var data = {};
+
             data['order[shipping_method]'] = method;
-            this.loadArea(['shipping_method', 'totals', 'billing_method'], true, data);
+            this.loadArea([
+                'shipping_method',
+                'totals',
+                'billing_method'
+            ], true, data);
+        },
+
+        /**
+         * Updates available payment
+         * methods list according to order data.
+         *
+         * @return boolean
+         */
+        loadPaymentMethods: function() {
+            var data = this.serializeData(this.billingAddressContainer).toObject();
+
+            this.loadArea(['billing_method','totals'], true, data);
+
+            return false;
         },
 
-        switchPaymentMethod : function(method){
+        switchPaymentMethod: function(method){
             jQuery('#edit_form')
                 .off('submitOrder')
                 .on('submitOrder', function(){
@@ -606,7 +731,7 @@ define([
                     }
                     else if (((elms[i].type == 'checkbox' || elms[i].type == 'radio') && elms[i].checked)
                         || ((elms[i].type == 'file' || elms[i].type == 'text' || elms[i].type == 'textarea' || elms[i].type == 'hidden')
-                        && Form.Element.getValue(elms[i]))
+                            && Form.Element.getValue(elms[i]))
                     ) {
                         if (this._isSummarizePrice(elms[i])) {
                             productPrice += getPrice(elms[i]);
@@ -894,6 +1019,7 @@ define([
                     qtyElement.value = confirmedCurrentQty.value;
                 }
                 this.productConfigureAddFields['item['+itemId+'][configured]'] = 1;
+                this.itemsUpdate();
 
             }.bind(this));
             productConfigure.setShowWindowCallback(listType, function() {
@@ -1118,12 +1244,18 @@ define([
          */
         isPaymentValidationAvailable : function(){
             return ((typeof this.paymentMethod) == 'undefined'
-            || this.excludedPaymentMethods.indexOf(this.paymentMethod) == -1);
+                || this.excludedPaymentMethods.indexOf(this.paymentMethod) == -1);
         },
 
-        serializeData : function(container){
-            var fields = $(container).select('input', 'select', 'textarea');
-            var data = Form.serializeElements(fields, true);
+        /**
+         * Serializes container form elements data.
+         *
+         * @param {String} container
+         * @return {Object}
+         */
+        serializeData: function (container) {
+            var fields = $(container).select('input', 'select', 'textarea'),
+                data = Form.serializeElements(fields, true);
 
             return $H(data);
         },
@@ -1143,8 +1275,12 @@ define([
 
         submit : function()
         {
-            jQuery('#edit_form').trigger('processStart');
-            jQuery('#edit_form').trigger('submitOrder');
+            var $editForm = jQuery('#edit_form');
+
+            if ($editForm.valid()) {
+                $editForm.trigger('processStart');
+                $editForm.trigger('submitOrder');
+            }
         },
 
         _realSubmit: function () {
@@ -1383,12 +1519,15 @@ define([
         _label: '',
         _node: null,
 
-        initialize: function(label){
+        initialize: function(label, id){
             this._label = label;
             this._node = new Element('button', {
                 'class': 'action-secondary action-add',
                 'type':  'button'
             });
+            if (typeof id !== 'undefined') {
+                this._node.setAttribute('id', id)
+            }
         },
 
         onClick: function(){
@@ -1401,8 +1540,10 @@ define([
             node.update('<span>' + this._label + '</span>');
             content[position] = node;
             Element.insert(element, content);
+        },
+
+        getLabel: function(){
+            return this._label;
         }
     };
-
 });
-
diff --git a/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/payment/reload.html b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/payment/reload.html
new file mode 100644
index 0000000000000..c503f3c678ab6
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/payment/reload.html
@@ -0,0 +1,18 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div class="admin__page-section-title">
+    <span class="title"><%- data.title %></span>
+</div>
+<div id="order-billing_method_summary"
+     class="order-billing-method-summary">
+    <a href="#"
+       onclick="return order.loadPaymentMethods();"
+       class="action-default">
+        <span><%- data.linkText %></span>
+    </a>
+</div>
diff --git a/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html
new file mode 100644
index 0000000000000..6b191ee81a45a
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/web/templates/order/create/shipping/reload.html
@@ -0,0 +1,19 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div class="admin__page-section-title">
+    <span class="title"><%- data.title %></span>
+</div>
+<div id="order-shipping-method-summary"
+     class="order-shipping-method-summary">
+    <a href="#"
+       onclick="return order.loadShippingRates();"
+       class="action-default">
+        <span><%- data.linkText %></span>
+    </a>
+    <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
+</div>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
index 0e2689e3e2191..99af16ce629d0 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
@@ -12,11 +12,20 @@
     <body>
         <attribute name="class" value="sales-guest-view"/>
         <referenceContainer name="page.main.title">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.status" template="Magento_Sales::order/order_status.phtml" />
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.date" template="Magento_Sales::order/order_date.phtml" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.status"
+                   template="Magento_Sales::order/order_status.phtml"
+                   cacheable="false" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.date"
+                   template="Magento_Sales::order/order_date.phtml"
+                   cacheable="false" />
         </referenceContainer>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="Magento_Sales::order/view.phtml">
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="sales.order.print"
+                   template="Magento_Sales::order/view.phtml"
+                   cacheable="false">
                 <block class="Magento\Sales\Block\Order\PrintShipment" name="order_items" template="Magento_Sales::order/items.phtml">
                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.renderers" as="renderer.list" />
                     <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="Magento_Sales::order/totals.phtml">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
index 50ffe979651ea..4410a6fc4a9a2 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
@@ -12,12 +12,21 @@
     <body>
         <attribute name="class" value="account"/>
         <referenceContainer name="page.main.title">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.status" template="Magento_Sales::order/order_status.phtml" />
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.date" template="Magento_Sales::order/order_date.phtml" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.status"
+                   template="Magento_Sales::order/order_status.phtml"
+                   cacheable="false" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.date"
+                   template="Magento_Sales::order/order_date.phtml"
+                   cacheable="false" />
         </referenceContainer>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="Magento_Sales::order/view.phtml">
-                <block class="Magento\Sales\Block\Order\PrintShipment" name="order_items" template="Magento_Sales::order/items.phtml">
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="sales.order.print"
+                   template="Magento_Sales::order/view.phtml"
+                   cacheable="false">
+                <block class="Magento\Sales\Block\Order\Items" name="order_items" template="Magento_Sales::order/items.phtml">
                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.renderers" as="renderer.list" />
                     <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="Magento_Sales::order/totals.phtml">
                         <arguments>
diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js
index 04778765f3c97..4d323684afff6 100644
--- a/app/code/Magento/Sales/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js
@@ -6,8 +6,10 @@
 var config = {
     map: {
         '*': {
-            giftMessage:    'Magento_Sales/gift-message',
-            ordersReturns:  'Magento_Sales/orders-returns'
+            giftMessage:    'Magento_Sales/js/gift-message',
+            ordersReturns:  'Magento_Sales/js/orders-returns',
+            'Magento_Sales/gift-message':    'Magento_Sales/js/gift-message',
+            'Magento_Sales/orders-returns':  'Magento_Sales/js/orders-returns'
         }
     }
 };
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
index 297e31d6d2c98..8cef5d57664a9 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
@@ -25,14 +25,11 @@
             </tr>
         </thead>
         <?php foreach ($_creditmemo->getAllItems() as $_item): ?>
-            <?php
-                if ($_item->getOrderItem()->getParentItem()) {
-                    continue;
-                }
-            ?>
-            <tbody>
-                <?= $block->getItemHtml($_item) ?>
-            </tbody>
+            <?php if (!$_item->getOrderItem()->getParentItem())  : ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
         <tfoot class="order-totals">
             <?= $block->getChildHtml('creditmemo_totals') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
index 10e07d1365470..4c377dea47da2 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
@@ -25,14 +25,11 @@
             </tr>
         </thead>
         <?php foreach ($_invoice->getAllItems() as $_item): ?>
-            <?php
-                if ($_item->getOrderItem()->getParentItem()) {
-                    continue;
-                }
-            ?>
-            <tbody>
-                <?= $block->getItemHtml($_item) ?>
-            </tbody>
+            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
         <tfoot class="order-totals">
             <?= $block->getChildHtml('invoice_totals') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 358264463d49a..37469582865dc 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -25,14 +25,11 @@
             </tr>
         </thead>
         <?php foreach ($_items as $_item): ?>
-            <?php
-                if ($_item->getParentItem()) {
-                    continue;
-                }
-            ?>
-            <tbody>
-                <?= $block->getItemHtml($_item) ?>
-            </tbody>
+            <?php if (!$_item->getParentItem()) : ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
         <tfoot class="order-totals">
             <?= $block->getChildHtml('order_totals') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
index 20c2c1869fedb..1fca65932b0b0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -31,6 +31,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
index 20c2c1869fedb..1fca65932b0b0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
@@ -31,6 +31,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
index 2d2b7b2c2b26e..022511ae3cfd0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
@@ -22,14 +22,11 @@
             </tr>
         </thead>
         <?php foreach ($_shipment->getAllItems() as $_item): ?>
-            <?php
-                if ($_item->getOrderItem()->getParentItem()) {
-                    continue;
-                }
-            ?>
-            <tbody>
-                <?= $block->getItemHtml($_item) ?>
-            </tbody>
+            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
     </table>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 9f7146ab084df..f1cd5f2b99865 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -9,22 +9,23 @@
 ?>
 <?php $_shipment = $block->getShipment() ?>
 <?php $_order = $block->getOrder() ?>
-<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
-<br />
-<table class="shipment-track">
-    <thead>
+<?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
+<?php if ($_shipment && $_order && $trackCollection): ?>
+    <br />
+    <table class="shipment-track">
+        <thead>
         <tr>
             <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
             <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
         </tr>
-    </thead>
-    <tbody>
-    <?php foreach ($_shipment->getAllTracks() as $_item): ?>
-        <tr>
-            <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-            <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
-        </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+        <?php foreach ($trackCollection as $_item): ?>
+            <tr>
+                <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
+                <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
+            </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index 3ebca4d08b349..89be190588677 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -10,7 +10,7 @@
 <form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>"
       method="post" name="guest_post">
     <fieldset class="fieldset">
-        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Information') ?></span></legend>
+        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Order Information') ?></span></legend>
         <br>
 
         <div class="field id required">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
index a90300efaf5c9..dc2cf2433ac8d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
@@ -40,14 +40,12 @@
             </tr>
         </thead>
         <?php $_items = $_creditmemo->getAllItems(); ?>
-        <?php $_count = count($_items) ?>
         <?php foreach ($_items as $_item): ?>
-        <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} ?>
-        <tbody>
-            <?= $block->getItemHtml($_item) ?>
-        </tbody>
+            <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
         <tfoot>
             <?= $block->getTotalsHtml($_creditmemo) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
index 5542439da17fd..2dbef1f485945 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
@@ -20,12 +20,12 @@
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
+                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="tooltip content">
                         <dl class="item options">
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
index 980710569fa3b..0f3236ec25bc3 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
@@ -37,14 +37,12 @@
             </tr>
         </thead>
         <?php $_items = $_invoice->getAllItems(); ?>
-        <?php $_count = count($_items) ?>
         <?php foreach ($_items as $_item): ?>
-        <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} ?>
-        <tbody>
-            <?= $block->getItemHtml($_item) ?>
-        </tbody>
+            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
         <tfoot>
             <?= $block->getInvoiceTotalsHtml($_invoice) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
index 4f95f3d93e2c2..c17c46d5f945a 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
@@ -20,12 +20,12 @@
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
+                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="tooltip content">
                         <dl class="item options">
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
index e43d32760febb..dc179b6ee4ac1 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
@@ -29,9 +29,10 @@
         </thead>
         <?php $items = $block->getItems(); ?>
         <?php $giftMessage = ''?>
+        <tbody>
         <?php foreach ($items as $item): ?>
             <?php if ($item->getParentItem()) continue; ?>
-            <tbody>
+
                 <?= $block->getItemHtml($item) ?>
                 <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()): ?>
                     <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
@@ -62,8 +63,8 @@
                         </td>
                     </tr>
                 <?php endif ?>
-            </tbody>
         <?php endforeach; ?>
+        </tbody>
         <tfoot>
             <?php if($block->isPagerDisplayed()): ?>
                 <tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
index d4550dd4f01c3..19da4994c914e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
@@ -20,9 +20,9 @@ $_item = $block->getItem();
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                        <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
+                        <?= $block->escapeHtml($_formatedOptionValue['full_view'], ['a']) ?>
                     <?php else: ?>
-                        <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
+                        <?=$block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
index d68b4cdb62fcc..567dfc20f2de2 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
@@ -34,14 +34,12 @@
                 </tr>
             </thead>
             <?php $_items = $_creditmemo->getAllItems(); ?>
-            <?php $_count = count($_items); ?>
             <?php foreach ($_items as $_item): ?>
-            <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} ?>
-            <tbody>
-                <?= $block->getItemHtml($_item) ?>
-            </tbody>
+                <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+                    <tbody>
+                        <?= $block->getItemHtml($_item) ?>
+                    </tbody>
+                <?php endif; ?>
             <?php endforeach; ?>
             <tfoot>
                 <?= $block->getTotalsHtml($_creditmemo) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index 5aa1cab686e2c..6fe6da9e75209 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -32,14 +32,12 @@
             </tr>
             </thead>
             <?php $_items = $_invoice->getItemsCollection(); ?>
-            <?php $_count = $_items->count(); ?>
             <?php foreach ($_items as $_item): ?>
-            <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} ?>
-            <tbody>
-                <?= $block->getItemHtml($_item) ?>
-            </tbody>
+                <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+                    <tbody>
+                        <?= $block->getItemHtml($_item) ?>
+                    </tbody>
+                <?php endif; ?>
             <?php endforeach; ?>
             <tfoot>
                 <?= $block->getInvoiceTotalsHtml($_invoice) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index df7e6bf334d9a..bb354e920c529 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -8,10 +8,13 @@
 
 ?>
 <div class="block block-dashboard-orders">
-<?php $_orders = $block->getOrders(); ?>
+<?php
+    $_orders = $block->getOrders();
+    $count = count($_orders);
+?>
     <div class="block-title order">
         <strong><?= /* @escapeNotVerified */ __('Recent Orders') ?></strong>
-        <?php if (sizeof($_orders->getItems()) > 0): ?>
+        <?php if ($count > 0): ?>
             <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/history') ?>">
                 <span><?= /* @escapeNotVerified */ __('View All') ?></span>
             </a>
@@ -19,7 +22,7 @@
     </div>
     <div class="block-content">
     <?= $block->getChildHtml() ?>
-    <?php if (sizeof($_orders->getItems()) > 0): ?>
+    <?php if ($count > 0): ?>
         <div class="table-wrapper orders-recent">
             <table class="data table table-order-items recent" id="my-orders-table">
                 <caption class="table-caption"><?= /* @escapeNotVerified */ __('Recent Orders') ?></caption>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
index b46e8d115480e..3f916b7a8da67 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
@@ -19,12 +19,12 @@
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
+                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="tooltip content">
                         <dl class="item options">
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index 5ecf1ebe893bc..9b3633fde60b4 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -26,14 +26,18 @@
             <ol id="cart-sidebar-reorder" class="product-items product-items-names"
                 data-bind="foreach: lastOrderedItems().items">
                 <li class="product-item">
-                    <div class="field item choice no-display" data-bind="css: {'no-display': !is_saleable}">
+                    <div class="field item choice">
                         <label class="label" data-bind="attr: {'for': 'reorder-item-' + id}">
                             <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                         </label>
                         <div class="control">
                             <input type="checkbox" name="order_items[]"
-                                   data-bind="attr: {id: 'reorder-item-' + id, value: id}"
-                                   title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
+                                   data-bind="attr: {
+                                        id: 'reorder-item-' + id,
+                                        value: id,
+                                        title: is_saleable ? '<?= /* @escapeNotVerified */ __('Add to Cart') ?>' : '<?= /* @escapeNotVerified */ __('Product is not salable.') ?>'
+                                   },
+                                   disable: !is_saleable"
                                    class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
                         </div>
                     </div>
@@ -46,8 +50,8 @@
             </ol>
             <div id="cart-sidebar-reorder-advice-container"></div>
             <div class="actions-toolbar">
-                <div class="primary no-display"
-                     data-bind="css: {'no-display': !lastOrderedItems().isShowAddToCart}">
+                <div class="primary"
+                     data-bind="visible: isShowAddToCart">
                     <button type="submit" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>" class="action tocart primary">
                         <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                     </button>
diff --git a/app/code/Magento/Sales/view/frontend/web/gift-message.js b/app/code/Magento/Sales/view/frontend/web/js/gift-message.js
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/web/gift-message.js
rename to app/code/Magento/Sales/view/frontend/web/js/gift-message.js
diff --git a/app/code/Magento/Sales/view/frontend/web/orders-returns.js b/app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/web/orders-returns.js
rename to app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
diff --git a/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js b/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js
index f393cc3fcd3bc..17e61a77d98a3 100644
--- a/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js
+++ b/app/code/Magento/Sales/view/frontend/web/js/view/last-ordered-items.js
@@ -5,27 +5,43 @@
 
 define([
     'uiComponent',
-    'Magento_Customer/js/customer-data'
-], function (Component, customerData) {
+    'Magento_Customer/js/customer-data',
+    'underscore'
+], function (Component, customerData, _) {
     'use strict';
 
     return Component.extend({
+        defaults: {
+            isShowAddToCart: false
+        },
+
         /** @inheritdoc */
         initialize: function () {
-            var isShowAddToCart = false,
-                item;
-
             this._super();
             this.lastOrderedItems = customerData.get('last-ordered-items');
+            this.lastOrderedItems.subscribe(this.checkSalableItems.bind(this));
+            this.checkSalableItems();
+
+            return this;
+        },
+
+        /** @inheritdoc */
+        initObservable: function () {
+            this._super()
+                .observe('isShowAddToCart');
+
+            return this;
+        },
 
-            for (item in this.lastOrderedItems.items) {
-                if (item['is_saleable']) {
-                    isShowAddToCart = true;
-                    break;
-                }
-            }
+        /**
+         * Check if items is_saleable and change add to cart button visibility.
+         */
+        checkSalableItems: function () {
+            var isShowAddToCart = _.some(this.lastOrderedItems().items, {
+                'is_saleable': true
+            });
 
-            this.lastOrderedItems.isShowAddToCart = isShowAddToCart;
+            this.isShowAddToCart(isShowAddToCart);
         }
     });
 });
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE.txt b/app/code/Magento/SalesAnalytics/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE.txt
rename to app/code/Magento/SalesAnalytics/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE_AFL.txt b/app/code/Magento/SalesAnalytics/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE_AFL.txt
rename to app/code/Magento/SalesAnalytics/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesAnalytics/README.md b/app/code/Magento/SalesAnalytics/README.md
new file mode 100644
index 0000000000000..70f456c97d4b3
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_SalesAnalytics module
+
+The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE.txt b/app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE.txt
rename to app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE_AFL.txt b/app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE_AFL.txt
rename to app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesAnalytics/Test/Mftf/README.md b/app/code/Magento/SalesAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..00e1b136c5c26
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Analytics Functional Tests
+
+The Functional Test Module for **Magento Sales Analytics** module.
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
new file mode 100644
index 0000000000000..64424c8f5bc61
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-sales-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-sales": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\SalesAnalytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/SalesAnalytics/etc/analytics.xml b/app/code/Magento/SalesAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..be6c4dfde9b19
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/etc/analytics.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="orders">
+        <providers>
+            <reportProvider class="Magento\Analytics\ReportXml\ReportProvider" name="orders">
+                <parameters>
+                    <name>orders</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="order_items">
+        <providers>
+            <reportProvider class="Magento\Analytics\ReportXml\ReportProvider" name="order_items">
+                <parameters>
+                    <name>order_items</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="order_addresses">
+        <providers>
+            <reportProvider class="Magento\Analytics\ReportXml\ReportProvider" name="order_addresses">
+                <parameters>
+                    <name>order_addresses</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/SalesAnalytics/etc/module.xml b/app/code/Magento/SalesAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..54f67fa13aa36
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_SalesAnalytics" >
+        <sequence>
+            <module name="Magento_Sales"/>
+            <module name="Magento_Analytics"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/SalesAnalytics/etc/reports.xml b/app/code/Magento/SalesAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..bb6bdb800e9bf
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/etc/reports.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="orders" connection="sales">
+        <source name="sales_order">
+            <attribute name="entity_id"/>
+            <attribute name="created_at"/>
+            <attribute name="customer_id"/>
+            <attribute name="status"/>
+            <attribute name="base_grand_total"/>
+            <attribute name="base_tax_amount"/>
+            <attribute name="base_shipping_amount"/>
+            <attribute name="coupon_code" function="sha1"/>
+            <attribute name="store_id"/>
+            <attribute name="store_name"/>
+            <attribute name="base_discount_amount"/>
+            <attribute name="base_subtotal"/>
+            <attribute name="base_total_refunded"/>
+            <attribute name="shipping_method"/>
+            <attribute name="shipping_address_id"/>
+            <attribute name="customer_email" function="sha1"/>
+            <attribute name="base_total_online_refunded"/>
+            <attribute name="base_total_offline_refunded"/>
+            <attribute name="base_currency_code"/>
+            <attribute name="billing_address_id"/>
+        </source>
+    </report>
+    <report name="order_items" connection="sales">
+        <source name="sales_order_item">
+            <attribute name="item_id"/>
+            <attribute name="created_at"/>
+            <attribute name="name"/>
+            <attribute name="base_price"/>
+            <attribute name="qty_ordered"/>
+            <attribute name="order_id"/>
+            <attribute name="sku"/>
+            <attribute name="product_id"/>
+            <attribute name="store_id"/>
+        </source>
+    </report>
+    <report name="order_addresses" connection="sales">
+        <source name="sales_order_address">
+            <attribute name="entity_id"/>
+            <attribute name="customer_id"/>
+            <attribute name="city"/>
+            <attribute name="region"/>
+            <attribute name="country_id"/>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/SalesAnalytics/registration.php b/app/code/Magento/SalesAnalytics/registration.php
new file mode 100644
index 0000000000000..eff2c5b1a2c05
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_SalesAnalytics',
+    __DIR__
+);
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
new file mode 100644
index 0000000000000..5802115d44b5e
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+
+/**
+ * Orders data reslover
+ */
+class Orders implements ResolverInterface
+{
+    /**
+     * @var CollectionFactoryInterface
+     */
+    private $collectionFactory;
+
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
+    /**
+     * @param CollectionFactoryInterface $collectionFactory
+     * @param CheckCustomerAccount $checkCustomerAccount
+     */
+    public function __construct(
+        CollectionFactoryInterface $collectionFactory,
+        CheckCustomerAccount $checkCustomerAccount
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->checkCustomerAccount = $checkCustomerAccount;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $customerId = $context->getUserId();
+        $this->checkCustomerAccount->execute($customerId, $context->getUserType());
+
+        $items = [];
+        $orders = $this->collectionFactory->create($customerId);
+
+        /** @var \Magento\Sales\Model\Order $order */
+        foreach ($orders as $order) {
+            $items[] = [
+                'id' => $order->getId(),
+                'increment_id' => $order->getIncrementId(),
+                'created_at' => $order->getCreatedAt(),
+                'grand_total' => $order->getGrandTotal(),
+                'status' => $order->getStatus(),
+            ];
+        }
+        return ['items' => $items];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/README.md b/app/code/Magento/SalesGraphQl/README.md
new file mode 100644
index 0000000000000..d5717821b164c
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/README.md
@@ -0,0 +1,4 @@
+# SalesGraphQl
+
+**SalesGraphQl** provides type and resolver information for the GraphQl module
+to generate sales orders information.
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
new file mode 100644
index 0000000000000..0549d31d59a24
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-sales-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-customer-graph-ql": "*",
+        "magento/module-sales": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\SalesGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/etc/module.xml b/app/code/Magento/SalesGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..70a55db67a506
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_SalesGraphQl"/>
+</config>
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..44f106532858f
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -0,0 +1,18 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    customerOrders: CustomerOrders @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Orders") @doc(description: "List of customer orders")
+}
+
+type CustomerOrder @doc(description: "Order mapping fields") {
+    id: Int
+    increment_id: String
+    created_at: String
+    grand_total: Float
+    status: String
+}
+
+type CustomerOrders {
+    items: [CustomerOrder] @doc(description: "Array of orders")
+}
diff --git a/app/code/Magento/SalesGraphQl/registration.php b/app/code/Magento/SalesGraphQl/registration.php
new file mode 100644
index 0000000000000..afb4091bfa32f
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_SalesGraphQl', __DIR__);
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
index ed95ecd7e4380..3f2ba38fa5a55 100644
--- a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
+++ b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
@@ -10,6 +10,8 @@
 
 /**
  * Class ReturnProcessor
+ *
+ * @api
  */
 class ReturnProcessor
 {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE.txt b/app/code/Magento/SalesInventory/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE.txt
rename to app/code/Magento/SalesInventory/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE_AFL.txt b/app/code/Magento/SalesInventory/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE_AFL.txt
rename to app/code/Magento/SalesInventory/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesInventory/Test/Mftf/README.md b/app/code/Magento/SalesInventory/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5d52679cbb173
--- /dev/null
+++ b/app/code/Magento/SalesInventory/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Inventory Functional Tests
+
+The Functional Test Module for **Magento Sales Inventory** module.
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php
index 3d811363156d7..32eb810c7a16a 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php
@@ -121,6 +121,9 @@ public function testValidationWithWrongOrderItems()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockInvoiceTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockInvoiceTest.php
index 3339cac4de76b..8435c6c025bcd 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockInvoiceTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockInvoiceTest.php
@@ -63,7 +63,7 @@ class ReturnToStockInvoiceTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface
      */
-    private $extencionAttributesMock;
+    private $extensionAttributesMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\CatalogInventory\Api\StockConfigurationInterface
@@ -91,7 +91,7 @@ protected function setUp()
             \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface::class
         )->disableOriginalConstructor()
             ->getMock();
-        $this->extencionAttributesMock = $this->getMockBuilder(
+        $this->extensionAttributesMock = $this->getMockBuilder(
             \Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface::class
         )->disableOriginalConstructor()
             ->setMethods(['getReturnToStockItems'])
@@ -128,14 +128,14 @@ public function testAfterExecute()
         $invoiceId = 98;
         $this->creditmemoCreationArgumentsMock->expects($this->exactly(3))
             ->method('getExtensionAttributes')
-            ->willReturn($this->extencionAttributesMock);
+            ->willReturn($this->extensionAttributesMock);
 
         $this->invoiceRepositoryMock->expects($this->once())
             ->method('get')
             ->with($invoiceId)
             ->willReturn($this->invoiceMock);
 
-        $this->extencionAttributesMock->expects($this->exactly(2))
+        $this->extensionAttributesMock->expects($this->exactly(2))
             ->method('getReturnToStockItems')
             ->willReturn($returnToStockItems);
 
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php
index a0882a5b82225..0342d109b3249 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php
@@ -68,7 +68,7 @@ class ReturnToStockOrderTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoCreationArgumentsInterface
      */
-    private $extencionAttributesMock;
+    private $extensionAttributesMock;
 
     protected function setUp()
     {
@@ -87,7 +87,7 @@ protected function setUp()
         $this->creditmemoCreationArgumentsMock = $this->getMockBuilder(CreditmemoCreationArgumentsInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extencionAttributesMock = $this->getMockBuilder(CreditmemoCreationArgumentsExtensionInterface::class)
+        $this->extensionAttributesMock = $this->getMockBuilder(CreditmemoCreationArgumentsExtensionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getReturnToStockItems'])
             ->getMockForAbstractClass();
@@ -117,9 +117,9 @@ public function testAfterExecute()
         $returnToStockItems = [1];
         $this->creditmemoCreationArgumentsMock->expects($this->exactly(3))
             ->method('getExtensionAttributes')
-            ->willReturn($this->extencionAttributesMock);
+            ->willReturn($this->extensionAttributesMock);
 
-        $this->extencionAttributesMock->expects($this->exactly(2))
+        $this->extensionAttributesMock->expects($this->exactly(2))
             ->method('getReturnToStockItems')
             ->willReturn($returnToStockItems);
 
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php
index 2ee8f81a2aa88..c80cae2150704 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php
@@ -16,7 +16,7 @@
 use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface;
 
 /**
- * Class InvoiceRefundCreatetionArgumentsTest
+ * Class InvoiceRefundCreationArgumentsTest
  */
 class InvoiceRefundCreationArgumentsTest extends \PHPUnit\Framework\TestCase
 {
@@ -33,7 +33,7 @@ class InvoiceRefundCreationArgumentsTest extends \PHPUnit\Framework\TestCase
     /**
      * @var CreditmemoCreationArgumentsExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $extencionAttributesMock;
+    private $extensionAttributesMock;
 
     /**
      * @var CreditmemoCreationArgumentsInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -75,7 +75,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->extencionAttributesMock = $this->getMockBuilder(CreditmemoCreationArgumentsExtensionInterface::class)
+        $this->extensionAttributesMock = $this->getMockBuilder(CreditmemoCreationArgumentsExtensionInterface::class)
             ->setMethods(['getReturnToStockItems'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -111,9 +111,9 @@ public function testAfterValidation($erroMessage)
         $returnToStockItems = [1];
         $this->creditmemoCreationArgumentsMock->expects($this->exactly(3))
             ->method('getExtensionAttributes')
-            ->willReturn($this->extencionAttributesMock);
+            ->willReturn($this->extensionAttributesMock);
 
-        $this->extencionAttributesMock->expects($this->exactly(2))
+        $this->extensionAttributesMock->expects($this->exactly(2))
             ->method('getReturnToStockItems')
             ->willReturn($returnToStockItems);
 
@@ -140,6 +140,9 @@ public function testAfterValidation($erroMessage)
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php
index d5b1f1647340f..58e21b7f13a5b 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php
@@ -15,7 +15,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
- * Class OrderRefundCreatetionArgumentsTest
+ * Class OrderRefundCreationArgumentsTest
  */
 class OrderRefundCreationArgumentsTest extends \PHPUnit\Framework\TestCase
 {
@@ -32,7 +32,7 @@ class OrderRefundCreationArgumentsTest extends \PHPUnit\Framework\TestCase
     /**
      * @var CreditmemoCreationArgumentsExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $extencionAttributesMock;
+    private $extensionAttributesMock;
 
     /**
      * @var CreditmemoCreationArgumentsInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -69,7 +69,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->extencionAttributesMock = $this->getMockBuilder(CreditmemoCreationArgumentsExtensionInterface::class)
+        $this->extensionAttributesMock = $this->getMockBuilder(CreditmemoCreationArgumentsExtensionInterface::class)
             ->setMethods(['getReturnToStockItems'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -101,9 +101,9 @@ public function testAfterValidation($erroMessage)
         $returnToStockItems = [1];
         $this->creditmemoCreationArgumentsMock->expects($this->exactly(3))
             ->method('getExtensionAttributes')
-            ->willReturn($this->extencionAttributesMock);
+            ->willReturn($this->extensionAttributesMock);
 
-        $this->extencionAttributesMock->expects($this->exactly(2))
+        $this->extensionAttributesMock->expects($this->exactly(2))
             ->method('getReturnToStockItems')
             ->willReturn($returnToStockItems);
 
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php b/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
index c2e2d4710f96c..9cbc1ec1677d0 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
@@ -173,6 +173,10 @@ public function testRefundOrderInventory()
         $this->observer->execute($this->eventObserver);
     }
 
+    /**
+     * @param $productId
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getCreditMemoItem($productId)
     {
         $backToStock = true;
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index 2150f0773e717..d8a48bed9169a 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesInventory/etc/module.xml b/app/code/Magento/SalesInventory/etc/module.xml
index f40a587f66fed..7d71924d3591f 100644
--- a/app/code/Magento/SalesInventory/etc/module.xml
+++ b/app/code/Magento/SalesInventory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SalesInventory" setup_version="1.0.0">
+    <module name="Magento_SalesInventory" >
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
index 0cb286056d825..bee7573c1fe2a 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
@@ -26,7 +26,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to delete this?'
-                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
index b4be904223aac..901866d52f73f 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\SalesRule\Block\Adminhtml\Promo\Widget;
 
+/**
+ * Widget that allows to select a sales rule.
+ */
 class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
@@ -87,7 +91,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
         if ($element->getValue()) {
             $rule = $this->ruleFactory->create()->load((int)$element->getValue());
             if ($rule->getId()) {
-                $chooser->setLabel($rule->getName());
+                $chooser->setLabel($this->escapeHtml($rule->getName()));
             }
         }
 
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
index 15f87931886c8..55e1d319cc776 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
@@ -74,7 +74,7 @@ protected function _initRule()
     /**
      * Initiate action
      *
-     * @return this
+     * @return $this
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
index 9adb62583985d..45b717fb9bd2d 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
 {
     /**
      * Delete promo quote action
@@ -21,13 +23,13 @@ public function execute()
                 $model = $this->_objectManager->create(\Magento\SalesRule\Model\Rule::class);
                 $model->load($id);
                 $model->delete();
-                $this->messageManager->addSuccess(__('You deleted the rule.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the rule.'));
                 $this->_redirect('sales_rule/*/');
                 return;
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('We can\'t delete the rule right now. Please review the log and try again.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -35,7 +37,7 @@ public function execute()
                 return;
             }
         }
-        $this->messageManager->addError(__('We can\'t find a rule to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a rule to delete.'));
         $this->_redirect('sales_rule/*/');
     }
 }
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
index 7221f49b852d3..3255ee0f2b724 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
@@ -51,7 +53,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getRuleId()) {
-                $this->messageManager->addError(__('This rule no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This rule no longer exists.'));
                 $this->_redirect('sales_rule/*');
                 return;
             }
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index 297db7d96939d..da05fd98e609b 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -1,15 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\SalesRule\Model\CouponGenerator;
 
-class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+/**
+ * Generate promo quote
+ */
+class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
 {
     /**
      * @var CouponGenerator
@@ -64,7 +66,7 @@ public function execute()
 
                 $couponCodes = $this->couponGenerator->generateCodes($data);
                 $generated = count($couponCodes);
-                $this->messageManager->addSuccess(__('%1 coupon(s) have been generated.', $generated));
+                $this->messageManager->addSuccessMessage(__('%1 coupon(s) have been generated.', $generated));
                 $this->_view->getLayout()->initMessages();
                 $result['messages'] = $this->_view->getLayout()->getMessagesBlock()->getGroupedHtml();
             } catch (\Magento\Framework\Exception\InputException $inputException) {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
index 0c11ee3785a08..4f3c712049e43 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface
 {
     /**
      * Index action
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
index ecf39605a8709..5adef0552bc8b 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface
 {
     /**
      * New promo quote action
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
index f28b245ee04ab..388679e6d9eff 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -6,8 +6,41 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
+/**
+ * SalesRule save controller
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
 {
+    /**
+     * @var TimezoneInterface
+     */
+    private $timezone;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param TimezoneInterface $timezone
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        TimezoneInterface $timezone = null
+    ) {
+        parent::__construct($context, $coreRegistry, $fileFactory, $dateFilter);
+        $this->timezone =  $timezone ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            TimezoneInterface::class
+        );
+    }
+
     /**
      * Promo quote save action
      *
@@ -26,6 +59,9 @@ public function execute()
                     ['request' => $this->getRequest()]
                 );
                 $data = $this->getRequest()->getPostValue();
+                if (empty($data['from_date'])) {
+                    $data['from_date'] = $this->timezone->formatDate();
+                }
 
                 $filterValues = ['from_date' => $this->_dateFilter];
                 if ($this->getRequest()->getParam('to_date')) {
@@ -50,7 +86,7 @@ public function execute()
                 $validateResult = $model->validateData(new \Magento\Framework\DataObject($data));
                 if ($validateResult !== true) {
                     foreach ($validateResult as $errorMessage) {
-                        $this->messageManager->addError($errorMessage);
+                        $this->messageManager->addErrorMessage($errorMessage);
                     }
                     $session->setPageData($data);
                     $this->_redirect('sales_rule/*/edit', ['id' => $model->getId()]);
@@ -82,7 +118,7 @@ public function execute()
                 $session->setPageData($model->getData());
 
                 $model->save();
-                $this->messageManager->addSuccess(__('You saved the rule.'));
+                $this->messageManager->addSuccessMessage(__('You saved the rule.'));
                 $session->setPageData(false);
                 if ($this->getRequest()->getParam('back')) {
                     $this->_redirect('sales_rule/*/edit', ['id' => $model->getId()]);
@@ -91,7 +127,7 @@ public function execute()
                 $this->_redirect('sales_rule/*/');
                 return;
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $id = (int)$this->getRequest()->getParam('rule_id');
                 if (!empty($id)) {
                     $this->_redirect('sales_rule/*/edit', ['id' => $id]);
@@ -100,7 +136,7 @@ public function execute()
                 }
                 return;
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Something went wrong while saving the rule data. Please review the error log.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
new file mode 100644
index 0000000000000..f413a7d047d62
--- /dev/null
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Controller\Adminhtml\Promo\Widget;
+
+/**
+ * Class for generation of JSON for building tree catalog.
+ *
+ * Examples of use:
+ * \Magento\Catalog\Block\Adminhtml\Category\Tree::getLoadTreeUrl
+ * \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser::getLoadTreeUrl
+ */
+class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget\CategoriesJson
+{
+    /**
+     * Authorization level of a basic admin session.
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_SalesRule::quote';
+}
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index ee1eaff08303c..3c96d08a38dd9 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -39,10 +39,10 @@ protected function _construct()
     /**
      * Set rule instance
      *
-     * @param \Magento\SalesRule\Model\Rule $rule
+     * @param Rule $rule
      * @return $this
      */
-    public function setRule(\Magento\SalesRule\Model\Rule $rule)
+    public function setRule(Rule $rule)
     {
         $this->setRuleId($rule->getId());
         return $this;
@@ -51,7 +51,7 @@ public function setRule(\Magento\SalesRule\Model\Rule $rule)
     /**
      * Load primary coupon for specified rule
      *
-     * @param \Magento\SalesRule\Model\Rule|int $rule
+     * @param Rule|int $rule
      * @return $this
      */
     public function loadPrimaryByRule($rule)
@@ -190,6 +190,8 @@ public function getTimesUsed()
     }
 
     /**
+     * Set Times Used
+     *
      * @param int $timesUsed
      * @return $this
      */
@@ -273,6 +275,8 @@ public function getType()
     }
 
     /**
+     * Set type
+     *
      * @param int $type
      * @return $this
      */
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
index 1d86ec2b01b35..c89677f0e9097 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
@@ -38,7 +38,7 @@ public function generateCode()
         $length = $this->getActualLength();
         $code = '';
         for ($i = 0, $indexMax = strlen($alphabet) - 1; $i < $length; ++$i) {
-            $code .= substr($alphabet, mt_rand(0, $indexMax), 1);
+            $code .= substr($alphabet, random_int(0, $indexMax), 1);
         }
 
         return $code;
@@ -54,7 +54,7 @@ protected function getActualLength()
         $lengthMin = $this->getLengthMin() ? $this->getLengthMin() : static::DEFAULT_LENGTH_MIN;
         $lengthMax = $this->getLengthMax() ? $this->getLengthMax() : static::DEFAULT_LENGTH_MAX;
 
-        return $this->getLength() ? $this->getLength() : mt_rand($lengthMin, $lengthMax);
+        return $this->getLength() ? $this->getLength() : random_int($lengthMin, $lengthMax);
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
index 99d6727a8be29..8a77c3bb0f935 100644
--- a/app/code/Magento/SalesRule/Model/CouponRepository.php
+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Collection;
 
 /**
@@ -197,13 +196,13 @@ public function deleteById($couponId)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @deprecated 100.2.0
      * @return void
      */
     protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        FilterGroup $filterGroup,
         Collection $collection
     ) {
         $fields = [];
diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
index 72465b285032e..58520831c016b 100644
--- a/app/code/Magento/SalesRule/Model/Data/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
@@ -16,8 +16,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
  */
-class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-    \Magento\SalesRule\Api\Data\RuleInterface
+class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleInterface
 {
     const KEY_RULE_ID = 'rule_id';
     const KEY_NAME = 'name';
@@ -271,6 +270,8 @@ public function getIsAdvanced()
     }
 
     /**
+     * Set Is Advanced
+     *
      * @param bool $isAdvanced
      * @return $this
      */
@@ -374,6 +375,8 @@ public function getSortOrder()
     }
 
     /**
+     * Set Sort Order
+     *
      * @param int $sortOrder
      * @return $this
      */
@@ -617,7 +620,7 @@ public function setSimpleFreeShipping($simpleFreeShipping)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
      */
@@ -627,7 +630,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/SalesRule/Model/DeltaPriceRound.php b/app/code/Magento/SalesRule/Model/DeltaPriceRound.php
new file mode 100644
index 0000000000000..b080a93ee4c9f
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/DeltaPriceRound.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Round price and save rounding operation delta.
+ */
+class DeltaPriceRound
+{
+    /**
+     * @var PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
+    /**
+     * @var float[]
+     */
+    private $roundingDeltas;
+
+    /**
+     * @param PriceCurrencyInterface $priceCurrency
+     */
+    public function __construct(PriceCurrencyInterface $priceCurrency)
+    {
+        $this->priceCurrency = $priceCurrency;
+    }
+
+    /**
+     * Round price based on previous rounding operation delta.
+     *
+     * @param float $price
+     * @param string $type
+     * @return float
+     */
+    public function round(float $price, string $type): float
+    {
+        if ($price) {
+            // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5
+            $delta = isset($this->roundingDeltas[$type]) ? $this->roundingDeltas[$type] : 0.000001;
+            $price += $delta;
+            $roundPrice = $this->priceCurrency->round($price);
+            $this->roundingDeltas[$type] = $price - $roundPrice;
+            $price = $roundPrice;
+        }
+
+        return $price;
+    }
+
+    /**
+     * Reset all deltas.
+     *
+     * @return void
+     */
+    public function resetAll(): void
+    {
+        $this->roundingDeltas = [];
+    }
+
+    /**
+     * Reset deltas by type.
+     *
+     * @param string $type
+     * @return void
+     */
+    public function reset(string $type): void
+    {
+        if (isset($this->roundingDeltas[$type])) {
+            unset($this->roundingDeltas[$type]);
+        }
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 9705808c88a01..b9d461037a230 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\SalesRule\Model\Plugin;
 
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Model\Session;
 use Magento\SalesRule\Model\ResourceModel\Rule as RuleResource;
 
+/**
+ * Quote Config Product Attributes Class
+ */
 class QuoteConfigProductAttributes
 {
     /**
diff --git a/app/code/Magento/SalesRule/Model/Quote/ChildrenValidationLocator.php b/app/code/Magento/SalesRule/Model/Quote/ChildrenValidationLocator.php
new file mode 100644
index 0000000000000..af1f61c187129
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Quote/ChildrenValidationLocator.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Quote;
+
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
+
+/**
+ * Used to determine necessity to validate rule on item's children that may depends on product type.
+ */
+class ChildrenValidationLocator
+{
+    /**
+     * @var array
+     */
+    private $productTypeChildrenValidationMap;
+
+    /**
+     * @param array $productTypeChildrenValidationMap
+     * <pre>
+     * [
+     *      'ProductType1' => true,
+     *      'ProductType2' => false
+     * ]
+     * </pre>
+     */
+    public function __construct(
+        array $productTypeChildrenValidationMap = []
+    ) {
+        $this->productTypeChildrenValidationMap = $productTypeChildrenValidationMap;
+    }
+
+    /**
+     * Checks necessity to validate rule on item's children.
+     *
+     * @param QuoteItem $item
+     * @return bool
+     */
+    public function isChildrenValidationRequired(QuoteItem $item): bool
+    {
+        $type = $item->getProduct()->getTypeId();
+        if (isset($this->productTypeChildrenValidationMap[$type])) {
+            return (bool)$this->productTypeChildrenValidationMap[$type];
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index bee007b41181f..693a61b272f66 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -179,7 +179,7 @@ protected function distributeDiscount(\Magento\Quote\Model\Quote\Item\AbstractIt
             $roundingDelta[$key] = 0.0000001;
         }
         foreach ($item->getChildren() as $child) {
-            $ratio = $child->getBaseRowTotal() / $parentBaseRowTotal;
+            $ratio = $parentBaseRowTotal != 0 ? $child->getBaseRowTotal() / $parentBaseRowTotal : 0;
             foreach ($keys as $key) {
                 if (!$item->hasData($key)) {
                     continue;
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
index 5068f53f23bc9..3907261cad1b9 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
@@ -106,7 +106,7 @@ public function exists($code)
     }
 
     /**
-     * Update auto generated Specific Coupon if it's rule changed
+     * Update auto generated Specific Coupon if its rule changed
      *
      * @param \Magento\SalesRule\Model\Rule $rule
      * @return $this
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
index 6407f04611a36..db32bdbe1e908 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
@@ -73,11 +73,11 @@ public function loadByCustomerCoupon(\Magento\Framework\DataObject $object, $cus
             $select = $connection->select()->from(
                 $this->getMainTable()
             )->where(
-                'customer_id =:customet_id'
+                'customer_id =:customer_id'
             )->where(
                 'coupon_id = :coupon_id'
             );
-            $data = $connection->fetchRow($select, [':coupon_id' => $couponId, ':customet_id' => $customerId]);
+            $data = $connection->fetchRow($select, [':coupon_id' => $couponId, ':customer_id' => $customerId]);
             if ($data) {
                 $object->setData($data);
             }
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
index 193a949108103..22d8b8446538c 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
@@ -37,11 +36,14 @@ public function __construct(
     }
 
     /**
+     * Read handler
+     *
      * @param string $entityType
      * @param array $entityData
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
index 794fc94d6a2a8..3a5ed16fdd2fd 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
@@ -239,7 +239,7 @@ public function saveStoreLabels($ruleId, $labels)
                 $connection->delete($table, ['rule_id=?' => $ruleId, 'store_id IN (?)' => $deleteByStoreIds]);
             }
         } catch (\Exception $e) {
-            $connection->rollback();
+            $connection->rollBack();
             throw $e;
         }
         $connection->commit();
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 54b50dbdf38db..59f24fa8b6e03 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -6,6 +6,7 @@
 
 namespace Magento\SalesRule\Model\ResourceModel\Rule;
 
+use Magento\Framework\DB\Select;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
 
@@ -209,7 +210,9 @@ public function setValidationFilter(
                 $andWhereCondition = implode(' AND ', $andWhereConditions);
 
                 $select->where(
-                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')'
+                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')',
+                    null,
+                    Select::TYPE_CONDITION
                 );
             } else {
                 $this->addFieldToFilter(
@@ -320,7 +323,7 @@ public function addAttributeInConditionFilter($attributeCode)
         $this->getSelect()->where(
             sprintf('(%s OR %s)', $cCond, $aCond),
             null,
-            \Magento\Framework\DB\Select::TYPE_CONDITION
+            Select::TYPE_CONDITION
         );
 
         return $this;
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
index 685de1b581fb4..d4ef15f1801bc 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
@@ -37,11 +36,14 @@ public function __construct(
     }
 
     /**
+     * Save handler
+     *
      * @param string $entityType
      * @param array $entityData
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index f4469213bd96e..a9836d2632aac 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -308,8 +308,7 @@ public function afterSave()
     }
 
     /**
-     * Initialize rule model data from array.
-     * Set store labels if applicable.
+     * Initialize rule model data from array. Set store labels if applicable.
      *
      * @param array $data
      * @return $this
@@ -501,6 +500,8 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
             $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
         )->setExpirationDate(
             $this->getToDate()
+        )->setType(
+            \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
         );
 
         $couponCode = self::getCouponCodeGenerator()->generateCode();
@@ -521,7 +522,7 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
                         $coupon->setCode(
                             $couponCode . self::getCouponCodeGenerator()->getDelimiter() . sprintf(
                                 '%04u',
-                                rand(0, 9999)
+                                random_int(0, 9999)
                             )
                         );
                         continue;
@@ -539,6 +540,8 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
     }
 
     /**
+     * Get from date.
+     *
      * @return string
      * @since 100.1.0
      */
@@ -548,6 +551,8 @@ public function getFromDate()
     }
 
     /**
+     * Get to date.
+     *
      * @return string
      * @since 100.1.0
      */
@@ -610,6 +615,8 @@ private function _getAddressId($address)
     }
 
     /**
+     * Get conditions field set id.
+     *
      * @param string $formName
      * @return string
      * @since 100.1.0
@@ -620,6 +627,8 @@ public function getConditionsFieldSetId($formName = '')
     }
 
     /**
+     * Get actions field set id.
+     *
      * @param string $formName
      * @return string
      * @since 100.1.0
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
index caa938322617d..2ae1c1c7ac63a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\SalesRule\Model\DeltaPriceRound;
+use Magento\SalesRule\Model\Validator;
+
+/**
+ * Calculates discount for cart item if fixed discount applied on whole cart.
+ */
 class CartFixed extends AbstractDiscount
 {
     /**
@@ -15,6 +22,35 @@ class CartFixed extends AbstractDiscount
     protected $_cartFixedRuleUsedForAddress = [];
 
     /**
+     * @var DeltaPriceRound
+     */
+    private $deltaPriceRound;
+
+    /**
+     * @var string
+     */
+    private static $discountType = 'CartFixed';
+
+    /**
+     * @param Validator $validator
+     * @param DataFactory $discountDataFactory
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param DeltaPriceRound $deltaPriceRound
+     */
+    public function __construct(
+        Validator $validator,
+        DataFactory $discountDataFactory,
+        PriceCurrencyInterface $priceCurrency,
+        DeltaPriceRound $deltaPriceRound
+    ) {
+        $this->deltaPriceRound = $deltaPriceRound;
+
+        parent::__construct($validator, $discountDataFactory, $priceCurrency);
+    }
+
+    /**
+     * Fixed discount for cart calculation
+     *
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
@@ -51,14 +87,22 @@ public function calculate($rule, $item, $qty)
             $cartRules[$rule->getId()] = $rule->getDiscountAmount();
         }
 
-        if ($cartRules[$rule->getId()] > 0) {
+        $availableDiscountAmount = (float)$cartRules[$rule->getId()];
+        $discountType = self::$discountType . $rule->getId();
+
+        if ($availableDiscountAmount > 0) {
             $store = $quote->getStore();
             if ($ruleTotals['items_count'] <= 1) {
-                $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $store);
-                $baseDiscountAmount = min($baseItemPrice * $qty, $cartRules[$rule->getId()]);
+                $quoteAmount = $this->priceCurrency->convert($availableDiscountAmount, $store);
+                $baseDiscountAmount = min($baseItemPrice * $qty, $availableDiscountAmount);
+                $this->deltaPriceRound->reset($discountType);
             } else {
-                $discountRate = $baseItemPrice * $qty / $ruleTotals['base_items_price'];
-                $maximumItemDiscount = $rule->getDiscountAmount() * $discountRate;
+                $ratio = $baseItemPrice * $qty / $ruleTotals['base_items_price'];
+                $maximumItemDiscount = $this->deltaPriceRound->round(
+                    $rule->getDiscountAmount() * $ratio,
+                    $discountType
+                );
+
                 $quoteAmount = $this->priceCurrency->convert($maximumItemDiscount, $store);
 
                 $baseDiscountAmount = min($baseItemPrice * $qty, $maximumItemDiscount);
@@ -67,7 +111,11 @@ public function calculate($rule, $item, $qty)
 
             $baseDiscountAmount = $this->priceCurrency->round($baseDiscountAmount);
 
-            $cartRules[$rule->getId()] -= $baseDiscountAmount;
+            $availableDiscountAmount -= $baseDiscountAmount;
+            $cartRules[$rule->getId()] = $availableDiscountAmount;
+            if ($availableDiscountAmount <= 0) {
+                $this->deltaPriceRound->reset($discountType);
+            }
 
             $discountData->setAmount($this->priceCurrency->round(min($itemPrice * $qty, $quoteAmount)));
             $discountData->setBaseAmount($baseDiscountAmount);
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
index 499e35db9dfd6..9bda4793e8681 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\SalesRule\Model\Rule\Condition;
 
 /**
@@ -24,6 +25,130 @@ protected function _addSpecialAttributes(array &$attributes)
         $attributes['quote_item_qty'] = __('Quantity in cart');
         $attributes['quote_item_price'] = __('Price in cart');
         $attributes['quote_item_row_total'] = __('Row total in cart');
+
+        $attributes['parent::category_ids'] = __('Category (Parent only)');
+        $attributes['children::category_ids'] = __('Category (Children Only)');
+    }
+
+    /**
+     * Retrieve attribute
+     *
+     * @return string
+     */
+    public function getAttribute()
+    {
+        $attribute = $this->getData('attribute');
+        if (strpos($attribute, '::') !== false) {
+            list (, $attribute) = explode('::', $attribute);
+        }
+        return $attribute;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeName()
+    {
+        $attribute = $this->getAttribute();
+        if ($this->getAttributeScope()) {
+            $attribute = $this->getAttributeScope() . '::' . $attribute;
+        }
+        return $this->getAttributeOption($attribute);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function loadAttributeOptions()
+    {
+        $productAttributes = $this->_productResource->loadAllAttributes()->getAttributesByCode();
+
+        $attributes = [];
+        foreach ($productAttributes as $attribute) {
+            /* @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+            if (!$attribute->isAllowedForRuleCondition()
+                || !$attribute->getDataUsingMethod($this->_isUsedForRuleProperty)
+            ) {
+                continue;
+            }
+            $frontLabel = $attribute->getFrontendLabel();
+            $attributes[$attribute->getAttributeCode()] = $frontLabel;
+            $attributes['parent::' . $attribute->getAttributeCode()] = $frontLabel . __('(Parent Only)');
+            $attributes['children::' . $attribute->getAttributeCode()] = $frontLabel . __('(Children Only)');
+        }
+
+        $this->_addSpecialAttributes($attributes);
+
+        asort($attributes);
+        $this->setAttributeOption($attributes);
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeElementHtml()
+    {
+        $html = parent::getAttributeElementHtml() .
+                $this->getAttributeScopeElement()->getHtml();
+        return $html;
+    }
+
+    /**
+     * Retrieve form element for scope element
+     *
+     * @return \Magento\Framework\Data\Form\Element\AbstractElement
+     */
+    private function getAttributeScopeElement()
+    {
+        return $this->getForm()->addField(
+            $this->getPrefix() . '__' . $this->getId() . '__attribute_scope',
+            'hidden',
+            [
+                'name' => $this->elementName . '[' . $this->getPrefix() . '][' . $this->getId() . '][attribute_scope]',
+                'value' => $this->getAttributeScope(),
+                'no_span' => true,
+                'class' => 'hidden',
+                'data-form-part' => $this->getFormName()
+            ]
+        );
+    }
+
+    /**
+     * Set attribute value
+     *
+     * @param string $value
+     */
+    public function setAttribute($value)
+    {
+        if (strpos($value, '::') !== false) {
+            list($scope, $attribute) = explode('::', $value);
+            $this->setData('attribute_scope', $scope);
+            $this->setData('attribute', $attribute);
+        } else {
+            $this->setData('attribute', $value);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function loadArray($arr)
+    {
+        parent::loadArray($arr);
+        $this->setAttributeScope(isset($arr['attribute_scope']) ? $arr['attribute_scope'] : null);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function asArray(array $arrAttributes = [])
+    {
+        $out = parent::asArray($arrAttributes);
+        $out['attribute_scope'] = $this->getAttributeScope();
+        return $out;
     }
 
     /**
@@ -51,10 +176,17 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
 
         $attrCode = $this->getAttribute();
 
-        if ('category_ids' == $attrCode) {
+        if ($attrCode === 'category_ids') {
             return $this->validateAttribute($this->_getAvailableInCategories($product->getId()));
         }
 
+        if ($attrCode === 'quote_item_price') {
+            $numericOperations = $this->getDefaultOperatorInputByType()['numeric'];
+            if (in_array($this->getOperator(), $numericOperations)) {
+                $this->setData('value', $this->getFormattedPrice($this->getValue()));
+            }
+        }
+
         return parent::validate($product);
     }
 
@@ -79,4 +211,25 @@ public function getValueElementChooserUrl()
         }
         return $url !== false ? $this->_backendData->getUrl($url) : '';
     }
+
+    /**
+     * Get locale-based formatted price.
+     *
+     * @param string $value
+     * @return float|null
+     */
+    private function getFormattedPrice($value)
+    {
+        $value = preg_replace('/[^0-9^\^.,-]/m', '', $value);
+
+        /**
+         * If the comma is the third symbol in the number, we consider it to be a decimal separator
+         */
+        $separatorComa = strpos($value, ',');
+        $separatorDot = strpos($value, '.');
+        if ($separatorComa !== false && $separatorDot === false && preg_match('/,\d{3}$/m', $value) === 1) {
+            $value .= '.00';
+        }
+        return $this->_localeFormat->getNumber($value);
+    }
 }
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
index b5ac02e67b1e1..1649dea80ef5b 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 
 /**
+ * Combine conditions for product.
  * @api
  * @since 100.0.2
  */
@@ -85,4 +86,73 @@ public function collectValidatedAttributes($productCollection)
         }
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isValid($entity)
+    {
+        if (!$this->getConditions()) {
+            return true;
+        }
+
+        $all = $this->getAggregator() === 'all';
+        $true = (bool)$this->getValue();
+
+        foreach ($this->getConditions() as $cond) {
+            if ($entity instanceof \Magento\Framework\Model\AbstractModel) {
+                $validated = $this->validateEntity($cond, $entity);
+            } else {
+                $validated = $cond->validateByEntityId($entity);
+            }
+            if ($all && $validated !== $true) {
+                return false;
+            } elseif (!$all && $validated === $true) {
+                return true;
+            }
+        }
+        return $all ? true : false;
+    }
+
+    /**
+     * Validate entity.
+     *
+     * @param object $cond
+     * @param \Magento\Framework\Model\AbstractModel $entity
+     * @return bool
+     */
+    private function validateEntity($cond, \Magento\Framework\Model\AbstractModel $entity)
+    {
+        $true = (bool)$this->getValue();
+        $validated = !$true;
+        foreach ($this->retrieveValidateEntities($cond->getAttributeScope(), $entity) as $validateEntity) {
+            $validated = $cond->validate($validateEntity);
+            if ($validated === $true) {
+                break;
+            }
+        }
+
+        return $validated;
+    }
+
+    /**
+     * Retrieve entities for validation by attribute scope
+     *
+     * @param string $attributeScope
+     * @param \Magento\Framework\Model\AbstractModel $entity
+     * @return \Magento\Framework\Model\AbstractModel[]
+     */
+    private function retrieveValidateEntities($attributeScope, \Magento\Framework\Model\AbstractModel $entity)
+    {
+        if ($attributeScope === 'parent') {
+            $validateEntities = [$entity];
+        } elseif ($attributeScope === 'children') {
+            $validateEntities = $entity->getChildren() ?: [$entity];
+        } else {
+            $validateEntities = $entity->getChildren() ?: [];
+            $validateEntities[] = $entity;
+        }
+
+        return $validateEntities;
+    }
 }
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 108cc341253ae..1e8fbf43ec3bc 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -136,6 +136,7 @@ public function asHtml()
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -145,8 +146,22 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
         $attr = $this->getAttribute();
         $total = 0;
         foreach ($model->getQuote()->getAllVisibleItems() as $item) {
-            if (parent::validate($item)) {
-                $total += $item->getData($attr);
+            $hasValidChild = false;
+            $useChildrenTotal = ($item->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
+            $childrenAttrTotal = 0;
+            $children = $item->getChildren();
+            if (!empty($children)) {
+                foreach ($children as $child) {
+                    if (parent::validate($child)) {
+                        $hasValidChild = true;
+                        if ($useChildrenTotal) {
+                            $childrenAttrTotal += $child->getData($attr);
+                        }
+                    }
+                }
+            }
+            if ($hasValidChild || parent::validate($item)) {
+                $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
             }
         }
         return $this->validateAttribute($total);
diff --git a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
index b57daac1f0d58..fdd6c2b169a7d 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Rule\Metadata;
 
-use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 use Magento\SalesRule\Model\Rule;
 use Magento\Store\Model\System\Store;
 use Magento\Customer\Api\GroupRepositoryInterface;
diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
index a2279db85aa1f..2cff0d64dba01 100644
--- a/app/code/Magento/SalesRule/Model/RuleRepository.php
+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
@@ -8,7 +8,6 @@
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 
 /**
@@ -107,7 +106,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
     {
@@ -119,7 +118,7 @@ public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getById($id)
     {
@@ -136,7 +135,7 @@ public function getById($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -183,13 +182,13 @@ public function deleteById($id)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @deprecated 100.2.0
      * @return void
      */
     protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        FilterGroup $filterGroup,
         Collection $collection
     ) {
         $fields = [];
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index 06a4e252bf60e..f771a4f1e3892 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -6,6 +6,9 @@
 namespace Magento\SalesRule\Model;
 
 use Magento\Quote\Model\Quote\Address;
+use Magento\SalesRule\Model\Quote\ChildrenValidationLocator;
+use Magento\Framework\App\ObjectManager;
+use Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory;
 
 /**
  * Class RulesApplier
@@ -25,19 +28,33 @@ class RulesApplier
      */
     protected $validatorUtility;
 
+    /**
+     * @var ChildrenValidationLocator
+     */
+    private $childrenValidationLocator;
+
+    /**
+     * @var CalculatorFactory
+     */
+    private $calculatorFactory;
+
     /**
      * @param \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\SalesRule\Model\Utility $utility
+     * @param ChildrenValidationLocator|null $childrenValidationLocator
      */
     public function __construct(
         \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\SalesRule\Model\Utility $utility
+        \Magento\SalesRule\Model\Utility $utility,
+        ChildrenValidationLocator $childrenValidationLocator = null
     ) {
         $this->calculatorFactory = $calculatorFactory;
         $this->validatorUtility = $utility;
         $this->_eventManager = $eventManager;
+        $this->childrenValidationLocator = $childrenValidationLocator
+             ?: ObjectManager::getInstance()->get(ChildrenValidationLocator::class);
     }
 
     /**
@@ -61,6 +78,9 @@ public function applyRules($item, $rules, $skipValidation, $couponCode)
             }
 
             if (!$skipValidation && !$rule->getActions()->validate($item)) {
+                if (!$this->childrenValidationLocator->isChildrenValidationRequired($item)) {
+                     continue;
+                }
                 $childItems = $item->getChildren();
                 $isContinue = true;
                 if (!empty($childItems)) {
diff --git a/app/code/Magento/SalesRule/Model/Utility.php b/app/code/Magento/SalesRule/Model/Utility.php
index a3876a9d7e046..45c5dc3da0ebd 100644
--- a/app/code/Magento/SalesRule/Model/Utility.php
+++ b/app/code/Magento/SalesRule/Model/Utility.php
@@ -189,6 +189,8 @@ public function deltaRoundingFix(
     ) {
         $discountAmount = $discountData->getAmount();
         $baseDiscountAmount = $discountData->getBaseAmount();
+        $rowTotalInclTax = $item->getRowTotalInclTax();
+        $baseRowTotalInclTax = $item->getBaseRowTotalInclTax();
 
         //TODO Seems \Magento\Quote\Model\Quote\Item\AbstractItem::getDiscountPercent() returns float value
         //that can not be used as array index
@@ -205,6 +207,23 @@ public function deltaRoundingFix(
                 - $this->priceCurrency->round($baseDiscountAmount);
         }
 
+        /**
+         * When we have 100% discount check if totals will not be negative
+         */
+
+        if ($percentKey == 100) {
+            $discountDelta = $rowTotalInclTax - $discountAmount;
+            $baseDiscountDelta = $baseRowTotalInclTax - $baseDiscountAmount;
+
+            if ($discountDelta < 0) {
+                $discountAmount += $discountDelta;
+            }
+
+            if ($baseDiscountDelta < 0) {
+                $baseDiscountAmount += $baseDiscountDelta;
+            }
+        }
+
         $discountData->setAmount($this->priceCurrency->round($discountAmount));
         $discountData->setBaseAmount($this->priceCurrency->round($baseDiscountAmount));
 
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index 5c76c534ed03b..5c0f97ae0b08b 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -506,7 +506,7 @@ public function sortItemsByPriority($items, Address $address = null)
             foreach ($items as $itemKey => $itemValue) {
                 if ($rule->getActions()->validate($itemValue)) {
                     unset($items[$itemKey]);
-                    array_push($itemsSorted, $itemValue);
+                    $itemsSorted[] = $itemValue;
                 }
             }
         }
diff --git a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
index 4b66d2b98642c..f2819a06fe1bf 100644
--- a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
+++ b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php
@@ -54,7 +54,7 @@ public function checkSalesRulesAvailability($attributeCode)
         }
 
         if ($disabledRulesCount) {
-            $this->messageManager->addWarning(
+            $this->messageManager->addWarningMessage(
                 __(
                     '%1 Cart Price Rules based on "%2" attribute have been disabled.',
                     $disabledRulesCount,
diff --git a/app/code/Magento/SalesRule/Setup/InstallData.php b/app/code/Magento/SalesRule/Setup/InstallData.php
deleted file mode 100644
index 6d234aa803ddc..0000000000000
--- a/app/code/Magento/SalesRule/Setup/InstallData.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\SalesRule\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup->createMigrationSetup();
-        $setup->startSetup();
-
-        $installer->appendClassAliasReplace(
-            'salesrule',
-            'conditions_serialized',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
-            ['rule_id']
-        );
-        $installer->appendClassAliasReplace(
-            'salesrule',
-            'actions_serialized',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
-            ['rule_id']
-        );
-
-        $installer->doUpdateClassAliases();
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/SalesRule/Setup/InstallSchema.php b/app/code/Magento/SalesRule/Setup/InstallSchema.php
deleted file mode 100644
index e49933c211d20..0000000000000
--- a/app/code/Magento/SalesRule/Setup/InstallSchema.php
+++ /dev/null
@@ -1,794 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\SalesRule\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-        $customerGroupTable = $setup->getConnection()->describeTable($setup->getTable('customer_group'));
-        $customerGroupIdType = $customerGroupTable['customer_group_id']['DATA_TYPE'] == 'int'
-            ? \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER : $customerGroupTable['customer_group_id']['DATA_TYPE'];
-        /**
-         * Create table 'salesrule'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule')
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Rule Id'
-        )->addColumn(
-            'name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Name'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Description'
-        )->addColumn(
-            'from_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => true, 'default' => null],
-            'From'
-        )->addColumn(
-            'to_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => true, 'default' => null],
-            'To'
-        )->addColumn(
-            'uses_per_customer',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Uses Per Customer'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Is Active'
-        )->addColumn(
-            'conditions_serialized',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '2M',
-            [],
-            'Conditions Serialized'
-        )->addColumn(
-            'actions_serialized',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '2M',
-            [],
-            'Actions Serialized'
-        )->addColumn(
-            'stop_rules_processing',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '1'],
-            'Stop Rules Processing'
-        )->addColumn(
-            'is_advanced',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Is Advanced'
-        )->addColumn(
-            'product_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Product Ids'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addColumn(
-            'simple_action',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Simple Action'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'discount_qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            [],
-            'Discount Qty'
-        )->addColumn(
-            'discount_step',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Discount Step'
-        )->addColumn(
-            'apply_to_shipping',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Apply To Shipping'
-        )->addColumn(
-            'times_used',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Times Used'
-        )->addColumn(
-            'is_rss',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Is Rss'
-        )->addColumn(
-            'coupon_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Coupon Type'
-        )->addColumn(
-            'use_auto_generation',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => false, 'nullable' => false, 'default' => 0],
-            'Use Auto Generation'
-        )->addColumn(
-            'uses_per_coupon',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => 0],
-            'User Per Coupon'
-        )->addIndex(
-            $installer->getIdxName('salesrule', ['is_active', 'sort_order', 'to_date', 'from_date']),
-            ['is_active', 'sort_order', 'to_date', 'from_date']
-        )->setComment(
-            'Salesrule'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_coupon'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_coupon')
-        )->addColumn(
-            'coupon_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Coupon Id'
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Rule Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Code'
-        )->addColumn(
-            'usage_limit',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Usage Limit'
-        )->addColumn(
-            'usage_per_customer',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Usage Per Customer'
-        )->addColumn(
-            'times_used',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Times Used'
-        )->addColumn(
-            'expiration_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Expiration Date'
-        )->addColumn(
-            'is_primary',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Is Primary'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true],
-            'Coupon Code Creation Date'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => true, 'default' => 0],
-            'Coupon Code Type'
-        )->addIndex(
-            $installer->getIdxName(
-                'salesrule_coupon',
-                ['code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName(
-                'salesrule_coupon',
-                ['rule_id', 'is_primary'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['rule_id', 'is_primary'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('salesrule_coupon', ['rule_id']),
-            ['rule_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_coupon', 'rule_id', 'salesrule', 'rule_id'),
-            'rule_id',
-            $installer->getTable('salesrule'),
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Salesrule Coupon'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_coupon_usage'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_coupon_usage')
-        )->addColumn(
-            'coupon_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Coupon Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Customer Id'
-        )->addColumn(
-            'times_used',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Times Used'
-        )->addIndex(
-            $installer->getIdxName('salesrule_coupon_usage', ['customer_id']),
-            ['customer_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_coupon_usage', 'coupon_id', 'salesrule_coupon', 'coupon_id'),
-            'coupon_id',
-            $installer->getTable('salesrule_coupon'),
-            'coupon_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('salesrule_coupon_usage', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Salesrule Coupon Usage'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_customer'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_customer')
-        )->addColumn(
-            'rule_customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Rule Customer Id'
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Rule Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Customer Id'
-        )->addColumn(
-            'times_used',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Times Used'
-        )->addIndex(
-            $installer->getIdxName('salesrule_customer', ['rule_id', 'customer_id']),
-            ['rule_id', 'customer_id']
-        )->addIndex(
-            $installer->getIdxName('salesrule_customer', ['customer_id', 'rule_id']),
-            ['customer_id', 'rule_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_customer', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('salesrule_customer', 'rule_id', 'salesrule', 'rule_id'),
-            'rule_id',
-            $installer->getTable('salesrule'),
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Salesrule Customer'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_label'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_label')
-        )->addColumn(
-            'label_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Label Id'
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Rule Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Store Id'
-        )->addColumn(
-            'label',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Label'
-        )->addIndex(
-            $installer->getIdxName(
-                'salesrule_label',
-                ['rule_id', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['rule_id', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('salesrule_label', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_label', 'rule_id', 'salesrule', 'rule_id'),
-            'rule_id',
-            $installer->getTable('salesrule'),
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('salesrule_label', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Salesrule Label'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_product_attribute'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_product_attribute')
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Rule Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Website Id'
-        )->addColumn(
-            'customer_group_id',
-            $customerGroupIdType,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Customer Group Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Attribute Id'
-        )->addIndex(
-            $installer->getIdxName('salesrule_product_attribute', ['website_id']),
-            ['website_id']
-        )->addIndex(
-            $installer->getIdxName('salesrule_product_attribute', ['customer_group_id']),
-            ['customer_group_id']
-        )->addIndex(
-            $installer->getIdxName('salesrule_product_attribute', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_product_attribute', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $installer->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'salesrule_product_attribute',
-                'customer_group_id',
-                'customer_group',
-                'customer_group_id'
-            ),
-            'customer_group_id',
-            $installer->getTable('customer_group'),
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('salesrule_product_attribute', 'rule_id', 'salesrule', 'rule_id'),
-            'rule_id',
-            $installer->getTable('salesrule'),
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('salesrule_product_attribute', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Salesrule Product Attribute'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_coupon_aggregated'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_coupon_aggregated')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => false],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Status'
-        )->addColumn(
-            'coupon_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Coupon Code'
-        )->addColumn(
-            'coupon_uses',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Coupon Uses'
-        )->addColumn(
-            'subtotal_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Subtotal Amount'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'total_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Amount'
-        )->addColumn(
-            'subtotal_amount_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Subtotal Amount Actual'
-        )->addColumn(
-            'discount_amount_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Discount Amount Actual'
-        )->addColumn(
-            'total_amount_actual',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Amount Actual'
-        )->addColumn(
-            'rule_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Rule Name'
-        )->addIndex(
-            $installer->getIdxName(
-                'salesrule_coupon_aggregated',
-                ['period', 'store_id', 'order_status', 'coupon_code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status', 'coupon_code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('salesrule_coupon_aggregated', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('salesrule_coupon_aggregated', ['rule_name']),
-            ['rule_name']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_coupon_aggregated', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Coupon Aggregated'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->getConnection()->createTable(
-            $installer->getConnection()->createTableByDdl(
-                $installer->getTable('salesrule_coupon_aggregated'),
-                $installer->getTable('salesrule_coupon_aggregated_updated')
-            )
-        );
-
-        /**
-         * Create table 'salesrule_coupon_aggregated_order'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('salesrule_coupon_aggregated_order')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => false],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Order Status'
-        )->addColumn(
-            'coupon_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Coupon Code'
-        )->addColumn(
-            'coupon_uses',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Coupon Uses'
-        )->addColumn(
-            'subtotal_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Subtotal Amount'
-        )->addColumn(
-            'discount_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Discount Amount'
-        )->addColumn(
-            'total_amount',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            [12, 4],
-            ['nullable' => false, 'default' => '0.0000'],
-            'Total Amount'
-        )->addColumn(
-            'rule_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Rule Name'
-        )->addIndex(
-            $installer->getIdxName(
-                'salesrule_coupon_aggregated_order',
-                ['period', 'store_id', 'order_status', 'coupon_code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['period', 'store_id', 'order_status', 'coupon_code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('salesrule_coupon_aggregated_order', ['store_id']),
-            ['store_id']
-        )->addIndex(
-            $installer->getIdxName('salesrule_coupon_aggregated_order', ['rule_name']),
-            ['rule_name']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_coupon_aggregated_order', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Coupon Aggregated Order'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $websitesTable = $installer->getTable('store_website');
-        $customerGroupsTable = $installer->getTable('customer_group');
-        $rulesWebsitesTable = $installer->getTable('salesrule_website');
-        $rulesCustomerGroupsTable = $installer->getTable('salesrule_customer_group');
-
-        /**
-         * Create table 'salesrule_website' if not exists. This table will be used instead of
-         * column website_ids of main catalog rules table
-         */
-        $table = $installer->getConnection()->newTable(
-            $rulesWebsitesTable
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Rule Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Website Id'
-        )->addIndex(
-            $installer->getIdxName('salesrule_website', ['website_id']),
-            ['website_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_website', 'rule_id', 'salesrule', 'rule_id'),
-            'rule_id',
-            $installer->getTable('salesrule'),
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('salesrule_website', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $websitesTable,
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Rules To Websites Relations'
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'salesrule_customer_group' if not exists. This table will be used instead of
-         * column customer_group_ids of main catalog rules table
-         */
-        $table = $installer->getConnection()->newTable(
-            $rulesCustomerGroupsTable
-        )->addColumn(
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Rule Id'
-        )->addColumn(
-            'customer_group_id',
-            $customerGroupIdType,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Customer Group Id'
-        )->addIndex(
-            $installer->getIdxName('salesrule_customer_group', ['customer_group_id']),
-            ['customer_group_id']
-        )->addForeignKey(
-            $installer->getFkName('salesrule_customer_group', 'rule_id', 'salesrule', 'rule_id'),
-            'rule_id',
-            $installer->getTable('salesrule'),
-            'rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'salesrule_customer_group',
-                'customer_group_id',
-                'customer_group',
-                'customer_group_id'
-            ),
-            'customer_group_id',
-            $customerGroupsTable,
-            'customer_group_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Sales Rules To Customer Groups Relations'
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..e863f2af3354d
--- /dev/null
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedDataToJson
+ *
+ * @package Magento\SalesRule\Setup\Patch
+ */
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter
+     */
+    private $aggregatedFieldConverter;
+
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->aggregatedFieldConverter = $aggregatedFieldConverter;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * Do Upgrade
+     *
+     * @return void
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->convertSerializedDataToJson();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            PrepareRuleModelSerializedData::class
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert native serialized data to json.
+     *
+     * @return void
+     */
+    private function convertSerializedDataToJson()
+    {
+        $metadata = $this->metadataPool->getMetadata(\Magento\SalesRule\Api\Data\RuleInterface::class);
+        $this->aggregatedFieldConverter->convert(
+            [
+                new \Magento\Framework\DB\FieldToConvert(
+                    \Magento\Framework\DB\DataConverter\SerializedToJson::class,
+                    $this->moduleDataSetup->getTable('salesrule'),
+                    $metadata->getLinkField(),
+                    'conditions_serialized'
+                ),
+                new \Magento\Framework\DB\FieldToConvert(
+                    \Magento\Framework\DB\DataConverter\SerializedToJson::class,
+                    $this->moduleDataSetup->getTable('salesrule'),
+                    $metadata->getLinkField(),
+                    'actions_serialized'
+                ),
+            ],
+            $this->moduleDataSetup->getConnection()
+        );
+    }
+}
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
new file mode 100644
index 0000000000000..22cf4fe6b1075
--- /dev/null
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Setup\Patch\Data;
+
+use Magento\Framework\App\State;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class FillSalesRuleProductAttributeTable
+ *
+ * @package Magento\SalesRule\Setup\Patch
+ */
+class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
+     */
+    private $ruleColletionFactory;
+
+    /**
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule
+     */
+    private $resourceModelRule;
+
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * FillSalesRuleProductAttributeTable constructor.
+     * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param State $appState
+     */
+    public function __construct(
+        \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        State $appState
+    ) {
+        $this->ruleColletionFactory = $ruleColletionFactory;
+        $this->serializer = $serializer;
+        $this->resourceModelRule = $resourceModelRule;
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->appState = $appState;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+            $this->appState->emulateAreaCode(
+                \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+                [$this, 'fillSalesRuleProductAttributeTable']
+            );
+            $this->fillSalesRuleProductAttributeTable();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * Fill attribute table for sales rule
+     */
+    public function fillSalesRuleProductAttributeTable()
+    {
+        /** @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
+        $ruleCollection = $this->ruleColletionFactory->create();
+        /** @var \Magento\SalesRule\Model\Rule $rule */
+        foreach ($ruleCollection as $rule) {
+            // Save product attributes used in rule
+            $conditions = $rule->getConditions()->asArray();
+            $actions = $rule->getActions()->asArray();
+            $serializedConditions = $this->serializer->serialize($conditions);
+            $serializedActions = $this->serializer->serialize($actions);
+            $conditionAttributes = $this->resourceModelRule->getProductAttributes($serializedConditions);
+            $actionAttributes = $this->resourceModelRule->getProductAttributes($serializedActions);
+            $ruleProductAttributes = array_merge($conditionAttributes, $actionAttributes);
+            if ($ruleProductAttributes) {
+                $this->resourceModelRule->setActualProductAttributes($rule, $ruleProductAttributes);
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            ConvertSerializedDataToJson::class
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
new file mode 100644
index 0000000000000..cad83b6f5d1dd
--- /dev/null
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class PrepareRuleModelSerializedData
+ *
+ * @package Magento\SalesRule\Setup\Patch
+ */
+class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $installer = $this->moduleDataSetup->createMigrationSetup();
+        $this->moduleDataSetup->startSetup();
+
+        $installer->appendClassAliasReplace(
+            'salesrule',
+            'conditions_serialized',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
+            ['rule_id']
+        );
+        $installer->appendClassAliasReplace(
+            'salesrule',
+            'actions_serialized',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_SERIALIZED,
+            ['rule_id']
+        );
+        $installer->doUpdateClassAliases();
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
deleted file mode 100644
index 9a34d85bba995..0000000000000
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\SalesRule\Setup;
-
-/**
- * Class \Magento\SalesRule\Setup\UpgradeData
- */
-class UpgradeData implements \Magento\Framework\Setup\UpgradeDataInterface
-{
-    /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
-     */
-    private $metadataPool;
-
-    /**
-     * @var \Magento\Framework\DB\AggregatedFieldDataConverter
-     */
-    private $aggregatedFieldConverter;
-
-    /**
-     * Resource Model of sales rule.
-     *
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule;
-     */
-    private $resourceModelRule;
-
-    /**
-     * App state.
-     *
-     * @var \Magento\Framework\App\State
-     */
-    private $state;
-
-    /**
-     * Serializer.
-     *
-     * @var \Magento\Framework\Serialize\SerializerInterface
-     */
-    private $serializer;
-
-    /**
-     * Rule Collection Factory.
-     *
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory
-     */
-    private $ruleColletionFactory;
-
-    /**
-     * @param \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-     * @param \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule
-     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
-     * @param \Magento\Framework\App\State $state
-     * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
-     */
-    public function __construct(
-        \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule,
-        \Magento\Framework\Serialize\SerializerInterface $serializer,
-        \Magento\Framework\App\State $state,
-        \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
-    ) {
-        $this->aggregatedFieldConverter = $aggregatedFieldConverter;
-        $this->metadataPool = $metadataPool;
-        $this->resourceModelRule = $resourceModelRule;
-        $this->serializer = $serializer;
-        $this->state = $state;
-        $this->ruleColletionFactory = $ruleColletionFactory;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(
-        \Magento\Framework\Setup\ModuleDataSetupInterface $setup,
-        \Magento\Framework\Setup\ModuleContextInterface $context
-    ) {
-        $setup->startSetup();
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $this->convertSerializedDataToJson($setup);
-        }
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $this->state->emulateAreaCode(
-                \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
-                [$this, 'fillSalesRuleProductAttributeTable'],
-                [$setup]
-            );
-            $this->fillSalesRuleProductAttributeTable();
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * Convert metadata from serialized to JSON format:
-     *
-     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $setup     *
-     * @return void
-     */
-    public function convertSerializedDataToJson($setup)
-    {
-        $metadata = $this->metadataPool->getMetadata(\Magento\SalesRule\Api\Data\RuleInterface::class);
-        $this->aggregatedFieldConverter->convert(
-            [
-                new \Magento\Framework\DB\FieldToConvert(
-                    \Magento\Framework\DB\DataConverter\SerializedToJson::class,
-                    $setup->getTable('salesrule'),
-                    $metadata->getLinkField(),
-                    'conditions_serialized'
-                ),
-                new \Magento\Framework\DB\FieldToConvert(
-                    \Magento\Framework\DB\DataConverter\SerializedToJson::class,
-                    $setup->getTable('salesrule'),
-                    $metadata->getLinkField(),
-                    'actions_serialized'
-                ),
-            ],
-            $setup->getConnection()
-        );
-    }
-
-    /**
-     * Fills blank table salesrule_product_attribute with data.
-     *
-     * @return void
-     */
-    public function fillSalesRuleProductAttributeTable()
-    {
-        /** @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
-        $ruleCollection = $this->ruleColletionFactory->create();
-        /** @var \Magento\SalesRule\Model\Rule $rule */
-        foreach ($ruleCollection as $rule) {
-            // Save product attributes used in rule
-            $conditions = $rule->getConditions()->asArray();
-            $actions = $rule->getActions()->asArray();
-            $serializedConditions = $this->serializer->serialize($conditions);
-            $serializedActions = $this->serializer->serialize($actions);
-            $conditionAttributes = $this->resourceModelRule->getProductAttributes($serializedConditions);
-            $actionAttributes = $this->resourceModelRule->getProductAttributes($serializedActions);
-            $ruleProductAttributes = array_merge($conditionAttributes, $actionAttributes);
-            if ($ruleProductAttributes) {
-                $this->resourceModelRule->setActualProductAttributes($rule, $ruleProductAttributes);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/SalesRule/Setup/UpgradeSchema.php b/app/code/Magento/SalesRule/Setup/UpgradeSchema.php
deleted file mode 100644
index c39536d121064..0000000000000
--- a/app/code/Magento/SalesRule/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\SalesRule\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Ddl\Table;
-
-/**
- * Upgrade the SalesRule module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->addDefaultValueForDiscountStep($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Add default value of 0 for the discount step column
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addDefaultValueForDiscountStep(SchemaSetupInterface $setup)
-    {
-        $connection = $setup->getConnection();
-        $connection->modifyColumn(
-            $setup->getTable('salesrule'),
-            'discount_step',
-            [
-                'type' => Table::TYPE_INTEGER,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '0',
-                'comment' => 'Discount Step',
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
new file mode 100644
index 0000000000000..a794c67e736fc
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="selectNotLoggedInCustomerGroup">
+        <!-- This actionGroup was created to be merged from B2B because B2B has a very different form control here -->
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+    </actionGroup>
+
+    <actionGroup name="selectRetailerCustomerGroup">
+        <!-- This actionGroup was created to be merged from B2B. Retailer Customer Group -->
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectRetailerCustomerGroup"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
new file mode 100644
index 0000000000000..224977e767cd3
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ruleName.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{ruleName.websites}}" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{ruleName.customerGroups}}]" stepKey="selectCustomerGroup"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{ruleName.apply}}" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{ruleName.discountAmount}}" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="AdminCreateCartPriceRuleWithCouponCode" extends="AdminCreateCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="couponCode"  defaultValue="_defaultCoupon.code"/>
+        </arguments>
+        <remove keyForRemoval="selectActionType"/>
+        <remove keyForRemoval="fillDiscountAmount"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType" after="fillRuleName"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponCode}}" stepKey="waitForElementVisible" after="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{couponCode}}" stepKey="fillCouponCode" after="waitForElementVisible"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="99" stepKey="fillUserPerCoupon" after="fillCouponCode"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionTypeToFixed" after="clickToExpandActions"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1" stepKey="fillDiscountAmount" after="selectActionTypeToFixed"/>
+    </actionGroup>
+
+    <!--Delete Cart price Rule for Retailer customer-->
+    <actionGroup name="AdminDeleteCartPriceRuleForRetailerActionGroup">
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToCartPriceRules"/>
+        <waitForPageLoad stepKey="waitForCartPriceRules"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{SimpleSalesRule.name}}" stepKey="filterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
+        <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
+        <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
+        <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
new file mode 100644
index 0000000000000..35e1bee0952cf
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Search grid with keyword search-->
+    <actionGroup name="AdminFilterCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName}}" stepKey="filterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
+        <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
new file mode 100644
index 0000000000000..800621ac70ff1
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteCartPriceRuleByName">
+        <arguments>
+            <argument name="ruleName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName}}" stepKey="filterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
+        <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
+        <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
+        <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
new file mode 100644
index 0000000000000..37e171823b11a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ApplyCartRuleOnStorefrontActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="couponCode" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart" />
+        <waitForText userInput="You added {{product.name}} to your shopping cart." stepKey="waitForText"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToDiscountTab" />
+        <fillField selector="{{DiscountSection.CouponInput}}" userInput="{{couponCode}}" stepKey="fillCouponCode"/>
+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="applyCode"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
new file mode 100644
index 0000000000000..a196bbd61d0ac
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Apply Sales Rule Coupon to the cart -->
+    <actionGroup name="StorefrontApplyCouponActionGroup">
+        <arguments>
+            <argument name="coupon"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" time="30" stepKey="waitForCouponHeader" />
+        <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader" />
+        <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
+        <fillField userInput="{{coupon.code}}" selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="fillCouponField"/>
+        <click selector="{{StorefrontSalesRuleCartCouponSection.applyButton}}" stepKey="clickApplyButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Cancel Sales Rule Coupon applied to the cart -->
+    <actionGroup name="StorefrontCancelCouponActionGroup">
+        <waitForElement selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" time="30" stepKey="waitForCouponHeader" />
+        <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader" />
+        <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
+        <click selector="{{StorefrontSalesRuleCartCouponSection.cancelButton}}" stepKey="clickCancelButton"/>
+    </actionGroup>
+
+    <!-- Check applied discount in cart summary -->
+    <actionGroup name="StorefrontCheckCouponAppliedActionGroup">
+        <arguments>
+            <argument name="rule"/>
+            <argument name="discount" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="waitForDiscountTotal"/>
+        <see userInput="{{rule.store_labels[1][store_label]}}" selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="assertDiscountLabel"/>
+        <see userInput="-${{discount}}" selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="assertDiscountTotal"/>
+    </actionGroup>
+
+    <actionGroup name="VerifyDiscountAmount">
+        <arguments>
+            <argument name="productUrl" type="string"/>
+            <argument name="quantity" type="string"/>
+            <argument name="expectedDiscount" type="string"/>
+        </arguments>
+        <amOnPage url="{{productUrl}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="{{expectedDiscount}}" stepKey="seeDiscountTotal"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
new file mode 100644
index 0000000000000..4cd5513080f73
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="E2EB2CQuoteWith10PercentDiscount" type="Quote">
+        <data key="subtotal">480.00</data>
+        <data key="shipping">15.00</data>
+        <data key="discount">48.00</data>
+        <data key="total">447.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
new file mode 100644
index 0000000000000..bab82fa20463b
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ApiSalesRuleCoupon" type="SalesRuleCoupon">
+        <data key="code" unique="suffix">salesCoupon</data>
+        <data key="times_used">0</data>
+        <data key="is_primary">1</data>
+        <data key="type">0</data>
+        <var key="rule_id" entityType="SalesRule" entityKey="rule_id"/>
+    </entity>
+    <entity name="_defaultCoupon" type="SalesRuleCoupon">
+        <data key="code" unique="suffix">defaultCoupon</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
new file mode 100644
index 0000000000000..3dd87d94d0148
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleSalesRuleCoupon" type="SalesRuleCoupon">
+        <var key="rule_id" entityKey="rule_id" entityType="SalesRule"/>
+        <data key="code" unique="suffix">Code</data>
+        <data key="is_primary">1</data>
+        <data key="times_used">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
new file mode 100644
index 0000000000000..3b2e9da9e7928
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ApiSalesRule" type="SalesRule">
+        <data key="name" unique="suffix">salesRule</data>
+        <data key="description">Sales Rule Descritpion</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">2</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">2</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">2</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">1</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
+    </entity>
+
+    <entity name="ApiCartRule" type="SalesRule">
+        <data key="name" unique="suffix">salesRule</data>
+        <data key="description">Sales Rule Descritpion</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">0</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">0</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">50</data>
+        <data key="discount_qty">0</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">NO_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+    </entity>
+
+    <entity name="SimpleSalesRule" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="is_active">true</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="uses_per_coupon">10</data>
+        <data key="uses_per_customer">10</data>
+        <data key="simple_action">by_percent</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+    </entity>
+    <entity name="TestSalesRule" type="SalesRule">
+        <data key="name" unique="suffix">TestSalesRule</data>
+        <data key="websites">Main Website</data>
+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
+        <data key="apply">Percent of product price discount</data>
+        <data key="discountAmount">50</data>
+    </entity>
+    <entity name="SalesRuleSpecificCoupon" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="description">Sales Rule Description</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">1</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">false</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">2</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">1</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">1</data>
+        <data key="is_rss">false</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">true</data>
+        <data key="uses_per_coupon">2</data>
+        <data key="simple_free_shipping">1</data>
+    </entity>
+
+    <entity name="SalesRuleSpecificCouponWithFixedDiscount" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="description">Sales Rule Description</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>1</item>
+        </array>
+        <data key="uses_per_customer">10</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">false</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">1</data>
+        <data key="simple_action">cart_fixed</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">10</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">false</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">10</data>
+        <data key="simple_free_shipping">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
new file mode 100644
index 0000000000000..90fe36fd7bdba
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SalesRuleLabelDefault" type="SalesRuleLabel">
+        <data key="store_id">0</data>
+        <data key="store_label" unique="suffix">Sales Rule (Default) </data>
+    </entity>
+    <entity name="SalesRuleLabelStore1" type="SalesRuleLabel">
+        <data key="store_id">1</data>
+        <data key="store_label" unique="suffix">Sales Rule (Store 1) </data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml
new file mode 100644
index 0000000000000..8af7ac0fdd99a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SalesRuleProductConditions" type="SalesRuleConditionAttribute">
+        <data key="priceInCart" >Magento\SalesRule\Model\Rule\Condition\Product|quote_item_price</data>
+        <data key="quantityInCart">Magento\SalesRule\Model\Rule\Condition\Product|quote_item_qty</data>
+        <data key="rowTotalInCart">Magento\SalesRule\Model\Rule\Condition\Product|quote_item_row_total</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE.txt b/app/code/Magento/SalesRule/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE.txt
rename to app/code/Magento/SalesRule/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE_AFL.txt b/app/code/Magento/SalesRule/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE_AFL.txt
rename to app/code/Magento/SalesRule/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
new file mode 100644
index 0000000000000..bd50be31e01b8
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSalesRuleCondition" dataType="SalesRuleCondition" type="create">
+        <field key="condition_type" required="true">string</field>
+        <array key="conditions" required="true">
+            <value>SalesRuleCondition</value>
+        </array>
+        <field key="aggregator_type" required="true">string</field>
+        <field key="operator" required="true">string</field>
+        <field key="attribute_name" required="true">string</field>
+        <field key="value" required="true">mixed</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+
+    <operation name="UpdateSalesRuleCondition" dataType="SalesRuleCondition" type="update">
+        <field key="condition_type">string</field>
+        <array key="conditions">
+            <value>SalesRuleCondition</value>
+        </array>
+        <field key="aggregator_type">string</field>
+        <field key="operator">string</field>
+        <field key="attribute_name">string</field>
+        <field key="value">mixed</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
new file mode 100644
index 0000000000000..a2025add0b629
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSalesRuleCoupon" dataType="SalesRuleCoupon" type="create" auth="adminOauth" url="/V1/coupons" method="POST">
+        <contentType>application/json</contentType>
+        <object key="coupon" dataType="SalesRuleCoupon">
+            <field key="coupon_id">integer</field>
+            <field key="rule_id" required="true">integer</field>
+            <field key="code" required="true">string</field>
+            <field key="usage_limit">integer</field>
+            <field key="usage_per_customer">integer</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="expiration_date">string</field>
+            <field key="is_primary">boolean</field>
+            <field key="created_at">string</field>
+            <field key="type">integer</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+
+    <operation name="UpdateSalesRuleCoupon" dataType="SalesRuleCoupon" type="update" auth="adminOauth" url="/V1/coupons" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="coupon" dataType="SalesRuleCoupon">
+            <field key="coupon_id" required="true">integer</field>
+            <field key="rule_id" required="true">integer</field>
+            <field key="code" required="true">string</field>
+            <field key="usage_limit">integer</field>
+            <field key="usage_per_customer">integer</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="expiration_date">string</field>
+            <field key="is_primary">boolean</field>
+            <field key="created_at">string</field>
+            <field key="type">integer</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+
+    <operation name="DeleteSalesRuleCoupon" dataType="SalesRuleCoupon" type="delete" auth="adminOauth" url="/V1/coupons/{coupon_id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
new file mode 100644
index 0000000000000..c462824a47f97
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSalesRuleLabel" dataType="SalesRuleLabel" type="create">
+        <field key="store_id" required="true">integer</field>
+        <field key="store_label" required="true">string</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+
+    <operation name="UpdateSalesRuleLabel" dataType="SalesRuleLabel" type="update">
+        <field key="store_id">integer</field>
+        <field key="store_label">string</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
new file mode 100644
index 0000000000000..3b3f7f39a65a0
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSalesRule" dataType="SalesRule" type="create" auth="adminOauth" url="/V1/salesRules" method="POST">
+        <contentType>application/json</contentType>
+        <object key="rule" dataType="SalesRule">
+            <field key="rule_id">integer</field>
+            <field key="name" required="true">string</field>
+            <array key="store_labels">
+                <value>SalesRuleLabel</value>
+            </array>
+            <field key="from_date">string</field>
+            <field key="to_date">string</field>
+            <field key="uses_per_customer" required="true">integer</field>
+            <field key="is_active" required="true">boolean</field>
+            <field key="condition">SalesRuleCondition</field>
+            <field key="action_condition">SalesRuleCondition</field>
+            <field key="stop_rules_processing" required="true">boolean</field>
+            <array key="product_ids">
+                <value>integer</value>
+            </array>
+            <field key="sort_order" required="true">integer</field>
+            <field key="simple_action" required="true">string</field>
+            <field key="discount_amount" required="true">number</field>
+            <field key="discount_qty" required="true">number</field>
+            <field key="discount_step" required="true">integer</field>
+            <field key="apply_to_shipping" required="true">boolean</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="is_rss" required="true">boolean</field>
+            <field key="coupon_type" required="true">string</field>
+            <field key="use_auto_generation" required="true">boolean</field>
+            <field key="uses_per_coupon" required="true">integer</field>
+            <field key="simple_free_shipping" required="true">string</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+            <field key="description" required="true">string</field>
+            <array key="customer_group_ids" required="true">
+                <value>integer</value>
+            </array>
+            <array key="website_ids" required="true">
+                <value>integer</value>
+            </array>
+        </object>
+    </operation>
+
+    <operation name="UpdateSalesRule" dataType="SalesRule" type="update" auth="adminOauth" url="/V1/salesRules" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="rule" dataType="SalesRule">
+            <field key="rule_id" required="true">integer</field>
+            <field key="name" required="true">string</field>
+            <array key="store_labels">
+                <value>SalesRuleLabel</value>
+            </array>
+            <field key="description" required="true">string</field>
+            <array key="website_ids" required="true">
+                <value>integer</value>
+            </array>
+            <array key="customer_group_ids" required="true">
+                <value>integer</value>
+            </array>
+            <field key="from_date">string</field>
+            <field key="to_date">string</field>
+            <field key="uses_per_customer" required="true">integer</field>
+            <field key="is_active" required="true">boolean</field>
+            <field key="condition">SalesRuleCondition</field>
+            <field key="action_condition">SalesRuleCondition</field>
+            <field key="stop_rules_processing" required="true">boolean</field>
+            <array key="product_ids">
+                <value>integer</value>
+            </array>
+            <field key="sort_order" required="true">integer</field>
+            <field key="simple_action" required="true">string</field>
+            <field key="discount_amount" required="true">number</field>
+            <field key="discount_qty" required="true">number</field>
+            <field key="discount_step" required="true">integer</field>
+            <field key="apply_to_shipping" required="true">boolean</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="is_rss" required="true">boolean</field>
+            <field key="coupon_type" required="true">string</field>
+            <field key="use_auto_generation" required="true">boolean</field>
+            <field key="uses_per_coupon" required="true">integer</field>
+            <field key="simple_free_shipping" required="true">string</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+
+    <operation name="DeleteSalesRule" dataType="SalesRule" type="delete" auth="adminOauth" url="/V1/salesRules/{rule_id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
new file mode 100644
index 0000000000000..faed9d42bcdec
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCartPriceRuleEditPage" area="admin" url="sales_rule/promo_quote/edit/id/{{salesRuleId}}" module="Magento_SalesRule" parameterized="true">
+        <section name="AdminCartPriceRulesFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
new file mode 100644
index 0000000000000..78e10904411c3
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCartPriceRulesPage" url="sales_rule/promo_quote/" area="admin" module="SalesRule">
+        <section name="AdminCartPriceRulesSection"/>
+        <section name="AdminCartPriceRulesFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
new file mode 100644
index 0000000000000..94967fedf8f01
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
@@ -0,0 +1,11 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <page name="PriceRuleNewPage" url="sales_rule/promo_quote/new/" area="admin" module="Magento_SalesRule">
+        <section name="PriceRuleConditionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/README.md b/app/code/Magento/SalesRule/Test/Mftf/README.md
new file mode 100644
index 0000000000000..7b65abe671e29
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Rule Functional Tests
+
+The Functional Test Module for **Magento Sales Rule** module.
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
new file mode 100644
index 0000000000000..070532500afe1
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCartPriceRulesFormSection">
+        <element name="save" type="button" selector="#save" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="modalAcceptButton" type="button" selector="button.action-accept" timeout="30"/>
+
+        <!-- Rule Information (the main form on the page) -->
+        <element name="ruleInformationHeader" type="button" selector="div[data-index='rule_information']" timeout="30"/>
+        <element name="ruleName" type="input" selector="input[name='name']"/>
+        <element name="websites" type="multiselect" selector="select[name='website_ids']"/>
+        <element name="customerGroups" type="multiselect" selector="select[name='customer_group_ids']"/>
+        <element name="coupon" type="select" selector="select[name='coupon_type']"/>
+        <element name="couponCode" type="input" selector="input[name='coupon_code']"/>
+        <element name="useAutoGeneration" type="checkbox" selector="input[name='use_auto_generation']"/>
+        <element name="fromDate" type="input" selector="input[name='from_date']"/>
+        <element name="toDate" type="input" selector="input[name='to_date']"/>
+        <element name="userPerCoupon" type="input" selector="//input[@name='uses_per_coupon']"/>
+        <element name="userPerCustomer" type="input" selector="//input[@name='uses_per_customer']"/>
+        <element name="priority" type="input" selector="//*[@name='sort_order']"/>
+
+        <!-- Actions sub-form -->
+        <element name="actionsTab" type="text" selector="//div[@data-index='actions']//span[contains(.,'Actions')][1]"/>
+        <element name="actionsHeader" type="button" selector="div[data-index='actions']" timeout="30"/>
+        <element name="actionsHeaderOpen" type="button" selector="div[data-index='actions'] div[data-state-collapsible='open']" timeout="30"/>
+        <element name="apply" type="select" selector="select[name='simple_action']"/>
+        <element name="conditions" type="button" selector=".rule-param.rule-param-new-child > a"/>
+        <element name="childAttribute" type="select" selector="//select[contains(@name, 'new_child')]"/>
+        <element name="condition" type="text" selector="//span[@class='rule-param']/a[text()='{{arg}}']" parameterized="true"/>
+        <element name="operator" type="select" selector="//select[contains(@name, '[operator]')]"/>
+        <element name="option" type="select" selector="//ul[@class='rule-param-children']//select[contains(@name, '[value]')]"/>
+        <element name="actionValue" type="input" selector=".rule-param-edit input"/>
+        <element name="actionOperator" type="select" selector=".rule-param-edit select"/>
+        <element name="applyDiscountToShipping" type="checkbox" selector="input[name='apply_to_shipping']"/>
+        <element name="applyDiscountToShippingLabel" type="checkbox" selector="input[name='apply_to_shipping']+label"/>
+        <element name="discountAmount" type="input" selector="input[name='discount_amount']"/>
+        <element name="discountStep" type="input" selector="input[name='discount_step']"/>
+        <element name="freeShipping" type="select" selector="//select[@name='simple_free_shipping']"/>
+
+        <!-- Manage Coupon Codes sub-form -->
+        <element name="manageCouponCodesHeader" type="button" selector="div[data-index='manage_coupon_codes']" timeout="30"/>
+        <element name="successMessage" type="text" selector="div.message.message-success.success"/>
+        <element name="couponQty" type="input" selector="#coupons_qty"/>
+        <element name="generateCouponsButton" type="button" selector="#coupons_generate_button" timeout="30"/>
+        <element name="generatedCouponByIndex" type="text" selector="#couponCodesGrid_table > tbody > tr:nth-child({{var}}) > td.col-code" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
new file mode 100644
index 0000000000000..a32c50d9d8617
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCartPriceRulesSection">
+        <element name="addNewRuleButton" type="button" selector="#add" timeout="30"/>
+        <element name="messages" type="text" selector=".messages"/>
+        <element name="filterByNameInput" type="input" selector="input[name='name']"/>
+        <element name="searchButton" type="button" selector="#promo_quote_grid button[title='Search']" timeout="30"/>
+        <element name="nameColumns" type="text" selector="td[data-column='name']"/>
+        <element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
+        <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
new file mode 100644
index 0000000000000..f3d5e9627efcf
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CartPriceRulesSubmenuSection">
+        <element name="cartPriceRules" type="button" selector="//li[@data-ui-id='menu-magento-catalogrule-promo']//li[@data-ui-id='menu-magento-salesrule-promo-quote']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..a5fb96afcc972
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="discountLabel" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]"/>
+        <element name="discountTotal" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]//td//span//span[@class='price']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
new file mode 100644
index 0000000000000..e14bfb554b3f6
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="DiscountSection">
+        <element name="DiscountTab" type="button" selector="//*[text()='Apply Discount Code']"/>
+        <element name="CouponInput" type="input" selector="#coupon_code"/>
+        <element name="DiscountInput" type="input" selector="#discount-code"/>
+        <element name="ApplyCodeBtn" type="button" selector="//span[text()='Apply Discount']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
new file mode 100644
index 0000000000000..9a74ced2a2c17
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
@@ -0,0 +1,24 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <section name="PriceRuleConditionsSection">
+        <element name="conditionsTab" type="text" selector="//div[@data-index='conditions']//span[contains(.,'Conditions')][1]"/>
+        <element name="createNewRule" type="text" selector="span.rule-param.rule-param-new-child"/>
+        <element name="rulesDropdown" type="select" selector="select[data-form-part='sales_rule_form'][data-ui-id='newchild-0-select-rule-conditions-1-new-child']"/>
+        <element name="addProductAttributesButton" type="text" selector="#conditions__1--1__children>li>span>a"/>
+        <element name="productAttributesDropdown" type="select" selector="#conditions__1--1__new_child"/>
+        <element name="changeCategoriesButton" type="text" selector="#conditions__1--1__children>li>span.rule-param:nth-of-type(2)>a"/>
+        <element name="categoriesChooser" type="text" selector="#conditions__1--1__children>li>span.rule-param:nth-of-type(2)>span>label>a"/>
+        <element name="treeRoot" type="text" selector=".x-tree-root-ct.x-tree-lines"/>
+        <element name="lastTreeNode" type="text" selector=".x-tree-root-ct.x-tree-lines > div > li > ul > li:last-child div img.x-tree-elbow-end-plus"/>
+        <element name="subcategory4level" type="text" selector=".x-tree-root-ct.x-tree-lines > div > li > ul > li > ul > li > ul > li > ul > li > div img.x-tree-elbow-end-plus"/>
+
+        <element name="ruleParamLink" type="button" selector="//*[@id='conditions__{{var1}}__children']/li[{{var2}}]/span[{{var3}}]/a" parameterized="true"/>
+        <element name="operatorByIndex" type="input" selector="#conditions__{{var1}}--{{var2}}__operator" parameterized="true"/>
+        <element name="valueByIndex" type="input" selector="#conditions__{{var1}}--{{var2}}__value" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
new file mode 100644
index 0000000000000..a51aa0b7a7e66
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontSalesRuleCartCouponSection">
+        <element name="couponHeader" type="button" selector="#block-discount-heading"/>
+        <element name="couponField" type="text" selector="#coupon_code"/>
+        <element name="discountBlockActive" type="text" selector=".block.discount.active" />
+        <element name="applyButton" type="text" selector="#discount-coupon-form button[class*='apply']" timeout="30"/>
+        <element name="cancelButton" type="text" selector="#discount-coupon-form button[class*='cancel']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
new file mode 100644
index 0000000000000..92d221de9e157
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateBuyXGetYFreeTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule of type Buy X get Y free"/>
+            <description value="Admin should be able to create a cart price rule of type Buy X get Y free"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-73"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a cart price rule of type Buy X get Y free -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Buy X get Y free (discount amount is Y)" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1" stepKey="fillDiscountAmount"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountStep}}" userInput="1" stepKey="fillDiscountStep"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Create a product to check the storefront -->
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!-- Spot check the storefront -->
+        <actionGroup ref="VerifyDiscountAmount" stepKey="verifyStorefront">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="quantity" value="2"/>
+            <argument name="expectedDiscount" value="-$123.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
new file mode 100644
index 0000000000000..e6676dab4eb5e
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCartPriceRuleEmptyFromDateTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule with no starting date"/>
+            <description value="Admin should be able to create a cart price rule without specifying the from_date and it should be set with the current date"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-5299"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
+            </actionGroup>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Set timezone-->
+        <!--Set timezone so we need compare with the same timezone used in "generateDate" action-->
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig"/>
+        <waitForPageLoad stepKey="waitForConfigPage"/>
+        <wait stepKey="wait" time="10"/>
+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
+        <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone"/>
+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="America/Los_Angeles" stepKey="setTimezone"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
+
+        <!-- Create a cart price rule based on a coupon code  -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectCustomerGroup"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="fillCouponCode"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+
+        <!-- Verify initial successful save -->
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{_defaultCoupon.code}}" stepKey="filterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
+        <see selector="{{AdminCartPriceRulesSection.nameColumns}}" userInput="{{_defaultCoupon.code}}" stepKey="seeRuleInResults"/>
+
+        <!-- Verify further on the Rule's edit page -->
+        <click selector="{{AdminCartPriceRulesSection.rowContainingText(_defaultCoupon.code)}}" stepKey="goToEditRule"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="seeRuleName"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="seeWebsites"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="seeCouponType"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="seeCouponCode"/>
+        <generateDate date="now" format="m/j/Y" timezone="America/Los_Angeles" stepKey="today"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="$today" stepKey="seeCorrectFromDate"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.toDate}}" userInput="" stepKey="seeEmptyToDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions2"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="seeActionType"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="seeDiscountAmount"/>
+
+        <!-- Spot check the storefront -->
+        <amOnPage url="$$product.custom_attributes[url_key]$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon">
+            <argument name="coupon" value="_defaultCoupon"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$5.00" stepKey="seeDiscountTotal"/>
+
+        <!--Reset timezone-->
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset"/>
+        <waitForPageLoad stepKey="waitForConfigPageReset"/>
+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset"/>
+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
new file mode 100644
index 0000000000000..3deb688de9c34
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCartPriceRuleForCouponCodeTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule for a specific coupon code"/>
+            <description value="Admin should be able to create a cart price rule for a specific coupon code"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-90"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create a cart price rule based on a coupon code  -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="fillCouponCode"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+
+        <!-- Verify initial successful save -->
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{_defaultCoupon.code}}" stepKey="filterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
+        <see selector="{{AdminCartPriceRulesSection.nameColumns}}" userInput="{{_defaultCoupon.code}}" stepKey="seeRuleInResults"/>
+
+        <!-- Verify further on the Rule's edit page -->
+        <click selector="{{AdminCartPriceRulesSection.rowContainingText(_defaultCoupon.code)}}" stepKey="goToEditRule"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="seeRuleName"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="seeWebsites"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="seeCustomerGroup"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="seeCouponType"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="{{_defaultCoupon.code}}" stepKey="seeCouponCode"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions2"/>
+        <seeOptionIsSelected selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="seeActionType"/>
+        <seeInField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="5" stepKey="seeDiscountAmount"/>
+
+        <!-- Create a product to check the storefront -->
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!-- Spot check the storefront -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon">
+            <argument name="coupon" value="_defaultCoupon"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$5.00" stepKey="seeDiscountTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
new file mode 100644
index 0000000000000..271477070d8cd
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCartPriceRuleForGeneratedCouponTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule for auto generated coupon codes"/>
+            <description value="Admin should be able to create a cart price rule for auto generated coupon codes"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-75"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a cart price rule  -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <checkOption selector="{{AdminCartPriceRulesFormSection.useAutoGeneration}}" stepKey="tickAutoGeneration"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="0.99" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveAndContinueButton"/>
+
+        <!-- Generate some coupon codes -->
+        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="10" stepKey="fillCouponQty"/>
+        <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerate"/>
+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="10 coupon(s) have been generated." stepKey="seeGenerationSuccess"/>
+
+        <!-- Grab a coupon code and hold on to it for later -->
+        <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}" stepKey="grabCouponCode"/>
+
+        <!-- Create a product to check the storefront -->
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!-- Spot check the storefront -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader"/>
+        <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
+        <fillField selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" userInput="{$grabCouponCode}" stepKey="fillCouponField"/>
+        <click selector="{{StorefrontSalesRuleCartCouponSection.applyButton}}" stepKey="clickApplyButton"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$0.99" stepKey="seeDiscountTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
new file mode 100644
index 0000000000000..08a08275ee07a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateFixedAmountDiscountTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule of type Fixed amount discount"/>
+            <description value="Admin should be able to create a cart price rule of type Fixed amount discount"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-62"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a cart price rule for $10 Fixed amount discount -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Create a product to check the storefront -->
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!-- Spot check the storefront -->
+        <actionGroup ref="VerifyDiscountAmount" stepKey="verifyStorefront">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="quantity" value="2"/>
+            <argument name="expectedDiscount" value="-$20.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
new file mode 100644
index 0000000000000..a39530f7607e4
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateFixedAmountWholeCartDiscountTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule of type Fixed amount discount for whole cart"/>
+            <description value="Admin should be able to create a cart price rule of type Fixed amount discount for whole cart"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-91"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a cart price rule for Fixed amount discount for whole cart -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="19.99" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Create a product to check the storefront -->
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!-- Spot check the storefront -->
+        <actionGroup ref="VerifyDiscountAmount" stepKey="verifyStorefront">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="quantity" value="2"/>
+            <argument name="expectedDiscount" value="-$19.99"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
new file mode 100644
index 0000000000000..1f7d849ac02b0
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreatePercentOfProductPriceTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Admin should be able to create a cart price rule of type Percent of product price discount"/>
+            <description value="Admin should be able to create a cart price rule of type Percent of product price discount"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-72"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{_defaultCoupon.code}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a cart price rule for 50 percent of product price -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="50" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Create a product to check the storefront -->
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!-- Spot check the storefront -->
+        <actionGroup ref="VerifyDiscountAmount" stepKey="verifyStorefront">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="quantity" value="1"/>
+            <argument name="expectedDiscount" value="-$61.50"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
new file mode 100644
index 0000000000000..e2687f5f16baf
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CartPriceRuleForConfigurableProductTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="MAGETWO-94407 - Cart Price Rule for configurable products"/>
+            <title value="Checking Cart Price Rule for configurable products"/>
+            <description value="Checking Cart Price Rule for configurable products"/>
+            <severity value="BLOCKER"/>
+            <testCaseId value="MAGETWO-94471"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <!-- Create the category -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!-- Create the configurable product and add it to the category -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create an attribute with two options to be used in the first child product -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                  <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the attribute we just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                  <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the option of the attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <!-- Create a simple product and give it the attribute with option -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                 <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Add simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="DeleteCartPriceRuleByName">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
+	    <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        
+        <!-- Create the rule -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="ABCD" stepKey="fillCouponCOde"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="50" stepKey="fillDiscountAmount"/>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="ScrollToApplyRuleForConditions"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="ApplyRuleForConditions"/>
+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$" stepKey="selectAttribute"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickToChooseCondition"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.operator}}" userInput="is not" stepKey="selectOperator"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened1"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption"/>
+        <waitForPageLoad stepKey="waitForConditionOpened2"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.option}}" userInput="option1" stepKey="selectOption"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add the first product to the cart -->
+        <amOnPage url="$$createConfigChildProduct1.sku$$.html" stepKey="goToProductPage1"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
+        <waitForPageLoad stepKey="waitForAddToCart1"/>
+        <!-- Add the second product to the cart -->
+        <amOnPage url="$$createConfigChildProduct2.sku$$.html" stepKey="goToProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
+        <waitForPageLoad stepKey="waitForAddToCart2"/>
+
+        <!--View and edit cart-->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="clickViewAndEditCartFromMiniCart"/>
+        <click selector="{{DiscountSection.DiscountTab}}" stepKey="scrollToDiscountTab" />
+        <fillField selector="{{DiscountSection.CouponInput}}" userInput="ABCD" stepKey="fillCouponCode" />
+        <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="applyCode"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="You used coupon code" stepKey="assertText"/>
+        <!--Verify values-->
+        <grabTextFrom selector="{{StorefrontMinicartSection.itemDiscount}}" stepKey="getDiscount"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.subtotal}}" stepKey="getSubtotal"/>
+        <assertEquals stepKey="checkDescount">
+            <expectedResult type="string">-$117.00</expectedResult>
+            <actualResult type="variable">$getDiscount</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="checkSubtotal">
+            <expectedResult type="string">$357.00</expectedResult>
+            <actualResult type="variable">$getSubtotal</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..da9eb8e19790e
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <before>
+            <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
+            <createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">
+                <requiredEntity createDataKey="createSalesRule"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+        </after>
+
+        <!-- Step 5: User uses coupon codes -->
+        <comment userInput="Start of using coupon code" stepKey="startOfUsingCouponCode" after="endOfComparingProducts" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="couponOpenCart" after="startOfUsingCouponCode"/>
+
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="couponApplyCoupon" after="couponOpenCart">
+            <argument name="coupon" value="$$createSalesRuleCoupon$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
+            <argument name="rule" value="$$createSalesRule$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+        <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon" />
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..d735d5a73f0f5
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <before>
+            <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
+            <createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">
+                <requiredEntity createDataKey="createSalesRule"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+        </after>
+
+        <!-- Step 6: User uses coupon codes -->
+        <comment userInput="Start of using coupon code" stepKey="startOfUsingCouponCode" after="endOfComparingProducts" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="couponOpenCart" after="startOfUsingCouponCode"/>
+
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="couponApplyCoupon" after="couponOpenCart">
+            <argument name="coupon" value="$$createSalesRuleCoupon$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
+            <argument name="rule" value="$$createSalesRule$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+        <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
new file mode 100644
index 0000000000000..091e09e32f1e6
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
@@ -0,0 +1,66 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <test name="PriceRuleCategoryNestingTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create categories"/>
+            <title value="Category nesting level must be the same as were created in categories."/>
+            <description value="Category nesting level must be the same as were created in categories."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-91101"/>
+            <group value="SalesRule"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="subcategory1"/>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory2">
+                <requiredEntity createDataKey="subcategory1"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory3">
+                <requiredEntity createDataKey="subcategory2"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory4">
+                <requiredEntity createDataKey="subcategory3"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory5">
+                <requiredEntity createDataKey="subcategory4"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="subcategory1" stepKey="deleteCategory1"/>
+            <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Login as admin and open page for creation new Price Rule -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{PriceRuleNewPage.url}}" stepKey="openCatalogPriceRulePage"/>
+        <waitForPageLoad stepKey="waitCatalogPriceRulePageLoad"/>
+        <!-- Open Conditions section and select Categories condition -->
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="openConditionsSection"/>
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="createNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Magento\SalesRule\Model\Rule\Condition\Product\Found" stepKey="selectProductAttributes"/>
+        <waitForAjaxLoad stepKey="ajaxLoad1"/>
+        <waitForElement selector="{{PriceRuleConditionsSection.addProductAttributesButton}}" stepKey="wait1"/>
+        <scrollTo selector="{{PriceRuleConditionsSection.addProductAttributesButton}}" stepKey="scrollToAddProductAttributeButton"/>
+        <click selector="{{PriceRuleConditionsSection.addProductAttributesButton}}" stepKey="clickToshowAttributes"/>
+        <selectOption selector="{{PriceRuleConditionsSection.productAttributesDropdown}}" userInput="Magento\SalesRule\Model\Rule\Condition\Product|category_ids" stepKey="selectCategoryAttribute"/>
+        <waitForAjaxLoad stepKey="ajaxLoad2"/>
+        <!-- Select categories chooser -->
+        <waitForElement selector="{{PriceRuleConditionsSection.changeCategoriesButton}}" stepKey="wait2"/>
+        <click selector="{{PriceRuleConditionsSection.changeCategoriesButton}}" stepKey="changeCategories"/>
+        <click selector="{{PriceRuleConditionsSection.categoriesChooser}}" stepKey="showCategoriesChooser"/>
+        <waitForAjaxLoad stepKey="ajaxLoad3"/>
+        <!-- Click on categories to check that the deepest subcategory is clickable -->
+        <waitForElement selector="{{PriceRuleConditionsSection.treeRoot}}" stepKey="wait3"/>
+        <click selector="{{PriceRuleConditionsSection.lastTreeNode}}" stepKey="openLatestTreeNode1"/>
+        <click selector="{{PriceRuleConditionsSection.lastTreeNode}}" stepKey="openLatestTreeNode2"/>
+        <click selector="{{PriceRuleConditionsSection.lastTreeNode}}" stepKey="openLatestTreeNode3"/>
+        <waitForAjaxLoad stepKey="ajaxLoad4"/>
+        <waitForElement selector="{{PriceRuleConditionsSection.subcategory4level}}" stepKey="wait4"/>
+        <click selector="{{PriceRuleConditionsSection.subcategory4level}}" stepKey="openLatestTreeNode4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
new file mode 100644
index 0000000000000..ed05f8b27e5ca
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAutoGeneratedCouponCodeTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="[Cart Price Rule] Auto generated coupon code considers 'Uses per Coupon' and 'Uses per Customer' options"/>
+            <description
+                    value="[Cart Price Rule] Auto generated coupon code considers 'Uses per Coupon' and 'Uses per Customer' options"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-59323"/>
+            <group value="salesRule"/>
+        </annotations>
+
+        <before>
+            <!-- Create customer -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!-- Create simple product-->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <!-- Create a cart price rule -->
+            <createData entity="SalesRuleSpecificCoupon" stepKey="createSalesRule"/>
+        </before>
+
+        <after>
+            <!-- Delete the cart price rule we made during the test -->
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Login as Admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Search Cart Price Rule and go to edit Cart Price Rule -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="$$createSalesRule.name$$"
+                   stepKey="fillFieldFilterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see selector="{{AdminCartPriceRulesSection.nameColumns}}" userInput="$$createSalesRule.name$$"
+             stepKey="seeRuleName"/>
+        <click selector="{{AdminCartPriceRulesSection.rowContainingText($$createSalesRule.name$$)}}"
+               stepKey="goToEditRule"/>
+
+        <!-- Step 3-4. Navigate to Manage Coupon Codes section to generate 1 coupon code -->
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}"
+                          dependentSelector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" visible="true"
+                          stepKey="clickManageCouponCodes"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="1" stepKey="fillFieldCouponQty"/>
+        <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerateCoupon"/>
+        <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="1 coupon(s) have been generated."
+             stepKey="seeSuccessMessage"/>
+        <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}"
+                      stepKey="couponCode"/>
+
+        <!-- Step: 5. Login to storefront as previously created customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Step: 6-7. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="couponCode" value="{$couponCode}"/>
+        </actionGroup>
+        <waitForText userInput='You used coupon code "{$couponCode}"' stepKey="waitForText"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput='You used coupon code "{$couponCode}"'
+             stepKey="seeSuccessMessage1"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
+                               stepKey="waitForElementDiscountVisible"/>
+
+        <!-- Step 8. Go to Checkout and Click Place Order button -->
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}"
+               stepKey="selectFlatShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
+
+        <!-- Step: 9-10. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="couponCode" value="{$couponCode}"/>
+        </actionGroup>
+        <waitForText userInput='The coupon code "{$couponCode}" is not valid.' stepKey="waitForText1"/>
+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{$couponCode}" is not valid.'
+             stepKey="seeErrorMessages"/>
+        <waitForElementNotVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
+                                  stepKey="waitForElementNotDiscountVisible"/>
+
+        <!-- Step 11. Log out from storefront -->
+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="storefrontSignOut"/>
+
+        <!-- Step: 12-13. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage2"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="couponCode" value="{$couponCode}"/>
+        </actionGroup>
+        <waitForText userInput='You used coupon code "{$couponCode}"' stepKey="waitForText2"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput='You used coupon code "{$couponCode}"'
+             stepKey="seeSuccessMessage2"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
+                               stepKey="waitForElementDiscountVisible1"/>
+
+        <!-- Step 14. Go to Checkout and Click Place Order button -->
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout1"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage1"/>
+
+        <!-- Step; 15-16. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage3"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule3">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="couponCode" value="{$couponCode}"/>
+        </actionGroup>
+        <waitForText userInput='The coupon code "{$couponCode}" is not valid.' stepKey="waitForText3"/>
+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{$couponCode}" is not valid.'
+             stepKey="seeErrorMessages1"/>
+        <waitForElementNotVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
+                                  stepKey="waitForElementNotDiscountVisible1"/>
+
+        <!-- Step: 17. Reset Cookie -->
+        <resetCookie userInput="PHPSESSID" stepKey="resetCookie"/>
+
+        <!-- Step: 18-19. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="openProductPage4"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule4">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="couponCode" value="{$couponCode}"/>
+        </actionGroup>
+        <waitForText userInput='The coupon code "{$couponCode}" is not valid.' stepKey="waitForText4"/>
+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{$couponCode}" is not valid.'
+             stepKey="seeErrorMessages2"/>
+        <waitForElementNotVisible selector="{{CheckoutCartSummarySection.discountAmount}}" time="30"
+                                  stepKey="waitForElementNotDiscountVisible2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
new file mode 100644
index 0000000000000..045fdbb33763f
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCartPriceRuleCountry">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Customer should only see cart price rule discount if condition shipping country"/>
+            <description value="Customer should only see cart price rule discount if condition shipping country"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-241"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create the rule... -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
+        <!-- Scroll down to fix some flaky behavior... -->
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Shipping Country" stepKey="selectProductAttributes"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <selectOption selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="Brazil" stepKey="fillValue"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="9.99" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add the product we created to our cart -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+
+        <!-- Should not see the discount yet because we have not set country -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="openEstimateShippingSection"/>
+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
+
+        <!-- See discount if we use valid country -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Brazil" stepKey="fillCountry"/>
+        <waitForPageLoad stepKey="waitForCountry1"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$9.99" stepKey="seeDiscountTotal"/>
+
+        <!-- Do not see discount with other country -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="fillCountry2"/>
+        <waitForPageLoad stepKey="waitForCountry2"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
new file mode 100644
index 0000000000000..d8c3ef9c32b0b
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCartPriceRulePostcode">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Customer should only see cart price rule discount if condition shipping postcode"/>
+            <description value="Customer should only see cart price rule discount if condition shipping postcode"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-238"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create the rule... -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
+        <!-- Scroll down to fix some flaky behavior... -->
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Shipping Postcode" stepKey="selectProductAttributes"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '1')}}" stepKey="startEditOperator"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="is one of" stepKey="fillOperator"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="78613" stepKey="fillValue"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="9.99" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add the product we created to our cart -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+
+        <!-- Should not see the discount yet because we have not filled in postcode -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="openEstimateShippingSection"/>
+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
+
+        <!-- See discount if we use valid postcode -->
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="78613" stepKey="fillPostcode"/>
+        <waitForPageLoad stepKey="waitForPostcode1"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$9.99" stepKey="seeDiscountTotal"/>
+
+        <!-- Do not see discount with other postcode -->
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="90210" stepKey="fillPostcode2"/>
+        <waitForPageLoad stepKey="waitForPostcode2"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
new file mode 100644
index 0000000000000..51d11b4e5cb1c
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCartPriceRuleQuantity">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Customer should only see cart price rule discount if condition total items quantity greater than"/>
+            <description value="Customer should only see cart price rule discount if condition total items quantity greater than"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-236"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create the rule... -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
+        <!-- Scroll down to fix some flaky behavior... -->
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Total Items Quantity" stepKey="selectProductAttributes"/>
+        <waitForPageLoad stepKey="waitForConditions"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '1')}}" stepKey="startEditOperator"/>
+        <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="greater than" stepKey="fillOperator"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/>
+        <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="1" stepKey="fillValue"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1.00" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add 1 product to the cart -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+
+        <!-- Should not see the discount yet because we have only 1 item in our cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
+
+        <!-- Add the same product to the cart again (2 total) -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
+        <waitForPageLoad stepKey="waitForAddToCart2"/>
+
+        <!-- Now we should see the discount because we have more than 1 item -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/>
+        <waitForPageLoad stepKey="waitForCartPage2"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$246.00" stepKey="seeSubtotal2"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$1.00" stepKey="seeDiscountTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
new file mode 100644
index 0000000000000..647f4d6e5c800
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCartPriceRuleState">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Customer should only see cart price rule discount if condition shipping state/province"/>
+            <description value="Customer should only see cart price rule discount if condition shipping state/province"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-239"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create the rule... -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
+        <!-- Scroll down to fix some flaky behavior... -->
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Shipping State/Province" stepKey="selectProductAttributes"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <selectOption selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="Indiana" stepKey="fillValue"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="9.99" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add the product we created to our cart -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+
+        <!-- Should not see the discount yet because we have not filled in postcode -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/>
+        <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShipping"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
+
+        <!-- See discount if we use valid postcode -->
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Indiana" stepKey="fillState"/>
+        <waitForPageLoad stepKey="waitForPostcode1"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$9.99" stepKey="seeDiscountTotal"/>
+
+        <!-- Do not see discount with other postcode -->
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Texas" stepKey="fillState2"/>
+        <waitForPageLoad stepKey="waitForPostcode2"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
new file mode 100644
index 0000000000000..7c9c52e1c02ac
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCartPriceRuleSubtotal">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Customer should only see cart price rule discount if condition subtotal equals or greater than"/>
+            <description value="Customer should only see cart price rule discount if condition subtotal equals or greater than"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-235"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create the rule... -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="yesterdayDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$yesterdayDate}" stepKey="fillFromDate"/>
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/>
+        <!-- Scroll down to fix some flaky behavior... -->
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Subtotal" stepKey="selectProductAttributes"/>
+        <waitForPageLoad stepKey="waitForConditions"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '1')}}" stepKey="startEditOperator"/>
+        <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="equals or greater than" stepKey="fillOperator"/>
+        <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/>
+        <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="200" stepKey="fillValue"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="0.01" stepKey="fillDiscountAmount"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add 1 product worth $123.00 to the cart -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
+        <waitForPageLoad stepKey="waitForAddToCart"/>
+
+        <!-- Should not see the discount yet because we have not exceeded $200 -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPage"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/>
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/>
+
+        <!-- Add the same product to the cart again ($246.00 subtotal) -->
+        <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
+        <waitForPageLoad stepKey="waitForAddToCart2"/>
+
+        <!-- Now we should see the discount because we exceeded $200 -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/>
+        <waitForPageLoad stepKey="waitForCartPage2"/>
+        <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$246.00" stepKey="seeSubtotal2"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$0.01" stepKey="seeDiscountTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
index fb01476ed6b34..ae59a1f90b8e3 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Test\Unit\Block\Adminhtml\Promo\Quote\Edit;
 
-use Magento\SalesRule\Model\RegistryConstants;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class DeleteButtonTest extends \PHPUnit\Framework\TestCase
@@ -25,13 +24,16 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase
      */
     protected $registryMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
         $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
         $contextMock = $this->createMock(\Magento\Backend\Block\Widget\Context::class);
 
-        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
+        $contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
 
         $this->model = (new ObjectManager($this))->getObject(
             \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\DeleteButton::class,
@@ -42,33 +44,9 @@ protected function setUp()
         );
     }
 
-    public function testGetButtonData()
-    {
-        $ruleId = 42;
-        $deleteUrl = 'http://magento.com/rule/delete/' . $ruleId;
-        $ruleMock = new \Magento\Framework\DataObject(['id' => $ruleId]);
-
-        $this->registryMock->expects($this->once())
-            ->method('registry')
-            ->with(RegistryConstants::CURRENT_SALES_RULE)
-            ->willReturn($ruleMock);
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('*/*/delete', ['id' => $ruleId])
-            ->willReturn($deleteUrl);
-
-        $data = [
-            'label' => __('Delete'),
-            'class' => 'delete',
-            'on_click' => 'deleteConfirm(\'' . __(
-                'Are you sure you want to delete this?'
-            ) . '\', \'' . $deleteUrl . '\')',
-            'sort_order' => 20,
-        ];
-
-        $this->assertEquals($data, $this->model->getButtonData());
-    }
-
+    /**
+     * Test empty response without a present rule.
+     */
     public function testGetButtonDataWithoutRule()
     {
         $this->assertEquals([], $this->model->getButtonData());
diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Rss/DiscountsTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Rss/DiscountsTest.php
index cd00562bc4f7a..bd14773ea4923 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Block/Rss/DiscountsTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Block/Rss/DiscountsTest.php
@@ -195,6 +195,9 @@ public function testIsAllowed($isAllowed)
         $this->assertEquals($isAllowed, $this->block->isAllowed());
     }
 
+    /**
+     * @return array
+     */
     public function isAllowedDataProvider()
     {
         return [
diff --git a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
index 8bcffcab9ca0a..2ef77d72a8af5 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
@@ -50,6 +50,9 @@ class GenerateTest extends \PHPUnit\Framework\TestCase
     /** @var  CouponGenerator | \PHPUnit_Framework_MockObject_MockObject */
     private $couponGenerator;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $this->contextMock = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
@@ -109,6 +112,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecute
+     */
     public function testExecute()
     {
         $helperData = $this->getMockBuilder(\Magento\Framework\Json\Helper\Data::class)
@@ -143,7 +149,7 @@ public function testExecute()
             ->with($requestData)
             ->willReturn(['some_data', 'some_data_2']);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
         $this->responseMock->expects($this->once())
             ->method('representJson')
             ->with();
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php
index 82868b3723c75..1016d14066afc 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php
@@ -115,6 +115,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     private function getArrayData()
     {
         return [
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToModelTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToModelTest.php
index 98e1d7cddee57..5dd67424418b7 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToModelTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToModelTest.php
@@ -273,6 +273,9 @@ public function testFormattingDate($data)
         $this->model->toModel($dataModel);
     }
 
+    /**
+     * @return array
+     */
     public function expectedDatesProvider()
     {
         return [
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php
new file mode 100644
index 0000000000000..24ea8f2ab5efb
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model;
+
+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterface;
+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
+use Magento\SalesRule\Model\CouponGenerator;
+use Magento\SalesRule\Model\Service\CouponManagementService;
+
+/**
+ * @covers \Magento\SalesRule\Model\CouponGenerator
+ */
+class CouponGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var CouponGenerator
+     */
+    private $couponGenerator;
+
+    /**
+     * @var CouponManagementService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $couponManagementServiceMock;
+
+    /**
+     * @var CouponGenerationSpecInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $generationSpecFactoryMock;
+
+    /**
+     * @var CouponGenerationSpecInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $generationSpecMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->generationSpecFactoryMock = $this->getMockBuilder(CouponGenerationSpecInterfaceFactory::class)
+            ->disableOriginalConstructor()->setMethods(['create'])->getMock();
+        $this->couponManagementServiceMock = $this->createMock(CouponManagementService::class);
+        $this->generationSpecMock = $this->createMock(CouponGenerationSpecInterface::class);
+        $this->couponGenerator = new CouponGenerator(
+            $this->couponManagementServiceMock,
+            $this->generationSpecFactoryMock
+        );
+    }
+
+    /**
+     * Test beforeSave method
+     *
+     * @return void
+     */
+    public function testBeforeSave()
+    {
+        $expected = ['test'];
+        $this->generationSpecFactoryMock->expects($this->once())->method('create')
+            ->willReturn($this->generationSpecMock);
+        $this->couponManagementServiceMock->expects($this->once())->method('generate')
+            ->with($this->generationSpecMock)->willReturn($expected);
+        $actual = $this->couponGenerator->generateCodes([]);
+        self::assertEquals($expected, $actual);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php
index ebdc10830f33f..e516f817a59d1 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php
@@ -150,10 +150,14 @@ public function testSaveWithExceptions($exceptionObject, $exceptionName, $except
             $this->resource->expects($this->once())->method('save')->with($coupon)
                 ->willThrowException($exceptionObject);
         }
-        $this->expectException($exceptionName, $exceptionMessage);
+        $this->expectException($exceptionName);
+        $this->expectExceptionMessage($exceptionMessage);
         $this->model->save($coupon);
     }
 
+    /**
+     * @return array
+     */
     public function saveExceptionsDataProvider()
     {
         $msg = 'kiwis';
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/DeltaPriceRoundTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/DeltaPriceRoundTest.php
new file mode 100644
index 0000000000000..d67dab5baf63b
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/DeltaPriceRoundTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\SalesRule\Model\DeltaPriceRound;
+
+/**
+ * Tests for Magento\SalesRule\Model\DeltaPriceRound.
+ */
+class DeltaPriceRoundTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $priceCurrency;
+
+    /**
+     * @var DeltaPriceRound
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->priceCurrency = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+        $this->priceCurrency->method('round')
+            ->willReturnCallback(
+                function ($amount) {
+                    return round($amount, 2);
+                }
+            );
+
+        $this->model = new DeltaPriceRound($this->priceCurrency);
+    }
+
+    /**
+     * Tests rounded price based on previous rounding operation delta.
+     *
+     * @param array $prices
+     * @param array $roundedPrices
+     * @return void
+     * @dataProvider roundDataProvider
+     */
+    public function testRound(array $prices, array $roundedPrices): void
+    {
+        foreach ($prices as $key => $price) {
+            $roundedPrice = $this->model->round($price, 'test');
+            $this->assertEquals($roundedPrices[$key], $roundedPrice);
+        }
+
+        $this->model->reset('test');
+    }
+
+    /**
+     * @return array
+     */
+    public function roundDataProvider(): array
+    {
+        return [
+            [
+                'prices' => [1.004, 1.004],
+                'rounded prices' => [1.00, 1.01],
+            ],
+            [
+                'prices' => [1.005, 1.005],
+                'rounded prices' => [1.01, 1.0],
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testReset(): void
+    {
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test'));
+        $this->model->reset('test');
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testResetAll(): void
+    {
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test1'));
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test2'));
+
+        $this->model->resetAll();
+
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test1'));
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test2'));
+    }
+}
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/ChildrenValidationLocatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/ChildrenValidationLocatorTest.php
new file mode 100644
index 0000000000000..abb8d791d74c4
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/ChildrenValidationLocatorTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model\Quote;
+
+use Magento\SalesRule\Model\Quote\ChildrenValidationLocator;
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Product;
+
+/**
+ * Test for Magento\SalesRule\Model\Quote\ChildrenValidationLocator
+ */
+class ChildrenValidationLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var array
+     */
+    private $productTypeChildrenValidationMap;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ChildrenValidationLocator
+     */
+    private $model;
+
+    /**
+     * @var QuoteItem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteItemMock;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->productTypeChildrenValidationMap = [
+            'type1' => true,
+            'type2' => false,
+        ];
+
+        $this->quoteItemMock = $this->getMockBuilder(QuoteItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMockForAbstractClass();
+
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTypeId'])
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            ChildrenValidationLocator::class,
+            [
+                'productTypeChildrenValidationMap' => $this->productTypeChildrenValidationMap,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider productTypeDataProvider
+     * @param string $type
+     * @param bool $expected
+     *
+     * @return void
+     */
+    public function testIsChildrenValidationRequired(string $type, bool $expected): void
+    {
+        $this->quoteItemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+
+        $this->productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn($type);
+
+        $this->assertEquals($this->model->isChildrenValidationRequired($this->quoteItemMock), $expected);
+    }
+
+    /**
+     * @return array
+     */
+    public function productTypeDataProvider(): array
+    {
+        return [
+            ['type1', true],
+            ['type2', false],
+            ['type3', true],
+        ];
+    }
+}
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
index a1c325f39a947..090dbd7fe5d6d 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
@@ -225,11 +225,37 @@ public function testCollectItemHasChildren($childItemData, $parentData, $expecte
         }
     }
 
+    /**
+     * @return array
+     */
     public function collectItemHasChildrenDataProvider()
     {
         $data = [
             // 3 items, each $100, testing that discount are distributed to item correctly
-            'three_items' => [
+            [
+                    'child_item_data' => [
+                        'item1' => [
+                            'base_row_total' => 0,
+                        ]
+                    ],
+                    'parent_item_data' => [
+                        'discount_amount' => 20,
+                        'base_discount_amount' => 10,
+                        'original_discount_amount' => 40,
+                        'base_original_discount_amount' => 20,
+                        'base_row_total' => 0,
+                    ],
+                    'expected_child_item_data' => [
+                        'item1' => [
+                            'discount_amount' => 0,
+                            'base_discount_amount' => 0,
+                            'original_discount_amount' => 0,
+                            'base_original_discount_amount' => 0,
+                        ]
+                    ],
+                ],
+            [
+                // 3 items, each $100, testing that discount are distributed to item correctly
                 'child_item_data' => [
                     'item1' => [
                         'base_row_total' => 100,
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
index 0d6c09b7f6141..f7522746b2100 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
@@ -16,7 +16,7 @@
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\ReadHandler
+     * @var ReadHandler
      */
     protected $model;
 
@@ -49,7 +49,7 @@ protected function setUp()
         $this->metadataPool = $this->createMock($className);
 
         $this->model = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\ResourceModel\ReadHandler::class,
+            ReadHandler::class,
             [
                 'ruleResource' => $this->ruleResource,
                 'metadataPool' => $this->metadataPool,
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
index 528db1ea0b891..65f345cb78d66 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
@@ -13,7 +13,7 @@
 class DateApplierTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier|\PHPUnit_Framework_MockObject_MockObject
+     * @var DateApplier|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $model;
 
@@ -29,10 +29,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->model = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier::class,
-            []
-        );
+        $this->model = $this->objectManager->getObject(DateApplier::class, []);
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
index 2f1bee9fc686a..13f26124c464d 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
@@ -5,48 +5,56 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\Rule\Action\Discount;
 
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests for Magento\SalesRule\Model\Rule\Action\Discount\CartFixed.
+ */
 class CartFixedTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Rule|MockObject
      */
     protected $rule;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Item\AbstractItem|MockObject
      */
     protected $item;
 
     /**
-     * @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Validator|MockObject
      */
     protected $validator;
 
     /**
-     * @var \Magento\SalesRule\Model\Rule\Action\Discount\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Rule\Action\Discount\Data|MockObject
      */
     protected $data;
 
     /**
-     * @var \Magento\Quote\Model\Quote|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote|MockObject
      */
     protected $quote;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Address|MockObject
      */
     protected $address;
 
     /**
-     * @var CartFixed
+     * @var \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed
      */
     protected $model;
 
     /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|MockObject
      */
     protected $priceCurrency;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->rule = $this->getMockBuilder(\Magento\Framework\DataObject::class)
@@ -66,18 +74,23 @@ protected function setUp()
         $this->item->expects($this->any())->method('getAddress')->will($this->returnValue($this->address));
 
         $this->validator = $this->createMock(\Magento\SalesRule\Model\Validator::class);
+        /** @var \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory|MockObject $dataFactory */
         $dataFactory = $this->createPartialMock(
             \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory::class,
             ['create']
         );
         $dataFactory->expects($this->any())->method('create')->will($this->returnValue($this->data));
-        $this->priceCurrency = $this->getMockBuilder(
-            \Magento\Framework\Pricing\PriceCurrencyInterface::class
-        )->getMock();
+        $this->priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
+            ->getMock();
+        $deltaPriceRound = $this->getMockBuilder(\Magento\SalesRule\Model\DeltaPriceRound::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = new \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed(
             $this->validator,
             $dataFactory,
-            $this->priceCurrency
+            $this->priceCurrency,
+            $deltaPriceRound
         );
     }
 
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
index 0bce282747b16..8ca6b20db3b5a 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\SalesRule\Test\Unit\Model\Rule\Condition;
 
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\ScopeResolverInterface;
 use \Magento\Framework\DB\Adapter\AdapterInterface;
 use \Magento\Framework\DB\Select;
-use \Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Locale\Format;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use \Magento\Rule\Model\Condition\Context;
 use \Magento\Backend\Helper\Data;
@@ -50,8 +54,8 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /** @var Collection|\PHPUnit_Framework_MockObject_MockObject */
     protected $collectionMock;
 
-    /** @var FormatInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $formatMock;
+    /** @var FormatInterface */
+    protected $format;
 
     /** @var AttributeLoaderInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $attributeLoaderInterfaceMock;
@@ -130,8 +134,12 @@ protected function setUp()
         $this->collectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->formatMock = $this->getMockBuilder(FormatInterface::class)
-            ->getMockForAbstractClass();
+        $this->format = new Format(
+            $this->getMockBuilder(ScopeResolverInterface::class)->disableOriginalConstructor()->getMock(),
+            $this->getMockBuilder(ResolverInterface::class)->disableOriginalConstructor()->getMock(),
+            $this->getMockBuilder(CurrencyFactory::class)->disableOriginalConstructor()->getMock()
+        );
+
         $this->model = new SalesRuleProduct(
             $this->contextMock,
             $this->backendHelperMock,
@@ -140,7 +148,7 @@ protected function setUp()
             $this->productRepositoryMock,
             $this->productMock,
             $this->collectionMock,
-            $this->formatMock
+            $this->format
         );
     }
 
@@ -199,7 +207,10 @@ public function testGetValueElementChooserUrl($attribute, $url, $jsObject = '')
         $this->assertEquals($url, $this->model->getValueElementChooserUrl());
     }
 
-    public function testValidateCategoriesIgnoresVisibility()
+    /**
+     * test ValidateCategoriesIgnoresVisibility
+     */
+    public function testValidateCategoriesIgnoresVisibility(): void
     {
         /* @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
@@ -231,4 +242,81 @@ public function testValidateCategoriesIgnoresVisibility()
 
         $this->model->validate($item);
     }
+
+    /**
+     * @param boolean $isValid
+     * @param string $conditionValue
+     * @param string $operator
+     * @param double $productPrice
+     * @dataProvider localisationProvider
+     */
+    public function testQuoteLocaleFormatPrice($isValid, $conditionValue, $operator = '>=', $productPrice = 2000.00)
+    {
+        $attr = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttribute'])
+            ->getMockForAbstractClass();
+
+        $attr->expects($this->any())
+            ->method('getAttribute')
+            ->willReturn('');
+
+        /* @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setQuoteItemPrice', 'getResource', 'hasData', 'getData',])
+            ->getMock();
+
+        $product->expects($this->any())
+            ->method('setQuoteItemPrice')
+            ->willReturnSelf();
+
+        $product->expects($this->any())
+            ->method('getResource')
+            ->willReturn($attr);
+
+        $product->expects($this->any())
+            ->method('hasData')
+            ->willReturn(true);
+
+        $product->expects($this->any())
+            ->method('getData')
+            ->with('quote_item_price')
+            ->willReturn($productPrice);
+
+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPrice', 'getProduct',])
+            ->getMockForAbstractClass();
+
+        $item->expects($this->any())
+            ->method('getPrice')
+            ->willReturn($productPrice);
+
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($product);
+
+        $this->model->setAttribute('quote_item_price');
+        $this->model->setData('operator', $operator);
+
+        $this->assertEquals($isValid, $this->model->setValue($conditionValue)->validate($item));
+    }
+
+    /**
+     * DataProvider for testQuoteLocaleFormatPrice
+     *
+     * @return array
+     */
+    public function localisationProvider(): array
+    {
+        return [
+            'number' => [true, 500.01],
+            'locale' => [true, '1,500.03'],
+            'operation' => [true, '1,500.03', '!='],
+            'stringOperation' => [false, '1,500.03', '{}'],
+            'smallPrice' => [false, '1,500.03', '>=', 1000],
+        ];
+    }
 }
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/RuleTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/RuleTest.php
index 89f4e93901c1b..be9e25eb20302 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/RuleTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/RuleTest.php
@@ -113,6 +113,9 @@ public function testBeforeSaveResetConditionToNull()
         $this->model->getActions();
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupProdConditionMock()
     {
         $prodConditionMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule\Condition\Product\Combine::class)
@@ -133,6 +136,9 @@ protected function setupProdConditionMock()
         return $prodConditionMock;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupConditionMock()
     {
         $conditionMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule\Condition\Combine::class)
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
index 814048c2ac1d0..217a8dba273c4 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\SalesRule\Test\Unit\Model;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class RulesApplierTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -28,6 +31,11 @@ class RulesApplierTest extends \PHPUnit\Framework\TestCase
      */
     protected $validatorUtility;
 
+    /**
+     * @var \Magento\SalesRule\Model\Quote\ChildrenValidationLocator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $childrenValidationLocator;
+
     protected function setUp()
     {
         $this->calculatorFactory = $this->createMock(
@@ -38,11 +46,15 @@ protected function setUp()
             \Magento\SalesRule\Model\Utility::class,
             ['canProcessRule', 'minFix', 'deltaRoundingFix', 'getItemQty']
         );
-
+        $this->childrenValidationLocator = $this->createPartialMock(
+            \Magento\SalesRule\Model\Quote\ChildrenValidationLocator::class,
+            ['isChildrenValidationRequired']
+        );
         $this->rulesApplier = new \Magento\SalesRule\Model\RulesApplier(
             $this->calculatorFactory,
             $this->eventManager,
-            $this->validatorUtility
+            $this->validatorUtility,
+            $this->childrenValidationLocator
         );
     }
 
@@ -84,6 +96,10 @@ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed($isChildren,
         $item->setDiscountCalculationPrice($positivePrice);
         $item->setData('calculation_price', $positivePrice);
 
+        $this->childrenValidationLocator->expects($this->any())
+            ->method('isChildrenValidationRequired')
+            ->willReturn(true);
+
         $this->validatorUtility->expects($this->atLeastOnce())
             ->method('canProcessRule')
             ->will($this->returnValue(true));
@@ -124,6 +140,9 @@ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed($isChildren,
         $this->assertEquals($appliedRuleIds, $result);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderChildren()
     {
         return [
@@ -163,6 +182,10 @@ protected function getPreparedItem()
         return $item;
     }
 
+    /**
+     * @param $item
+     * @param $rule
+     */
     protected function applyRule($item, $rule)
     {
         $qty = 2;
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/UtilityTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/UtilityTest.php
index 5e48f3110a395..4ce0f2a0564f3 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/UtilityTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/UtilityTest.php
@@ -362,6 +362,9 @@ public function testMergeIds($a1, $a2, $isSting, $expected)
         $this->assertEquals($expected, $this->utility->mergeIds($a1, $a2, $isSting));
     }
 
+    /**
+     * @return array
+     */
     public function mergeIdsDataProvider()
     {
         return [
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
index 2e6a3c3c38af0..42448565791c5 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
@@ -495,6 +495,9 @@ public function testProcessShippingAmountActions($action)
         );
     }
 
+    /**
+     * @return array
+     */
     public static function dataProviderActions()
     {
         return [
diff --git a/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php b/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php
index b14c783019590..32bf2201665ef 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Observer/SalesOrderAfterPlaceObserverTest.php
@@ -170,6 +170,9 @@ public function testSalesOrderAfterPlace($ruleCustomerId)
         $this->assertEquals($this->model, $this->model->execute($observer));
     }
 
+    /**
+     * @return array
+     */
     public function salesOrderAfterPlaceDataProvider()
     {
         return [
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 44f5a78954618..a2e7dc8835ae7 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -5,30 +5,29 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-rule": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-reports": "100.3.*",
-        "magento/module-rule": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-widget": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-rule": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-sales-rule-sample-data": "Sample Data version:100.3.*"
+        "magento/module-sales-rule-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml
new file mode 100644
index 0000000000000..8dbdf76387cd8
--- /dev/null
+++ b/app/code/Magento/SalesRule/etc/db_schema.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="salesrule" resource="default" engine="innodb" comment="Salesrule">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Description"/>
+        <column xsi:type="date" name="from_date" comment="From"/>
+        <column xsi:type="date" name="to_date" comment="To"/>
+        <column xsi:type="int" name="uses_per_customer" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Uses Per Customer"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Is Active"/>
+        <column xsi:type="mediumtext" name="conditions_serialized" nullable="true" comment="Conditions Serialized"/>
+        <column xsi:type="mediumtext" name="actions_serialized" nullable="true" comment="Actions Serialized"/>
+        <column xsi:type="smallint" name="stop_rules_processing" padding="6" unsigned="false" nullable="false"
+                identity="false" default="1" comment="Stop Rules Processing"/>
+        <column xsi:type="smallint" name="is_advanced" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Is Advanced"/>
+        <column xsi:type="text" name="product_ids" nullable="true" comment="Product Ids"/>
+        <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="varchar" name="simple_action" nullable="true" length="32" comment="Simple Action"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="discount_qty" scale="4" precision="12" unsigned="false" nullable="true"
+                comment="Discount Qty"/>
+        <column xsi:type="int" name="discount_step" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Discount Step"/>
+        <column xsi:type="smallint" name="apply_to_shipping" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Apply To Shipping"/>
+        <column xsi:type="int" name="times_used" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Times Used"/>
+        <column xsi:type="smallint" name="is_rss" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Is Rss"/>
+        <column xsi:type="smallint" name="coupon_type" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Coupon Type"/>
+        <column xsi:type="smallint" name="use_auto_generation" padding="6" unsigned="false" nullable="false"
+                identity="false" default="0" comment="Use Auto Generation"/>
+        <column xsi:type="int" name="uses_per_coupon" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="User Per Coupon"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+        </constraint>
+        <index referenceId="SALESRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE" indexType="btree">
+            <column name="is_active"/>
+            <column name="sort_order"/>
+            <column name="to_date"/>
+            <column name="from_date"/>
+        </index>
+    </table>
+    <table name="salesrule_coupon" resource="default" engine="innodb" comment="Salesrule Coupon">
+        <column xsi:type="int" name="coupon_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Coupon Id"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
+        <column xsi:type="int" name="usage_limit" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Usage Limit"/>
+        <column xsi:type="int" name="usage_per_customer" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Usage Per Customer"/>
+        <column xsi:type="int" name="times_used" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Times Used"/>
+        <column xsi:type="timestamp" name="expiration_date" on_update="false" nullable="true"
+                comment="Expiration Date"/>
+        <column xsi:type="smallint" name="is_primary" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Is Primary"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true"
+                comment="Coupon Code Creation Date"/>
+        <column xsi:type="smallint" name="type" padding="6" unsigned="false" nullable="true" identity="false"
+                default="0" comment="Coupon Code Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="coupon_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_RULE_ID_SALESRULE_RULE_ID" table="salesrule_coupon"
+                    column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALESRULE_COUPON_CODE">
+            <column name="code"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SALESRULE_COUPON_RULE_ID_IS_PRIMARY">
+            <column name="rule_id"/>
+            <column name="is_primary"/>
+        </constraint>
+        <index referenceId="SALESRULE_COUPON_RULE_ID" indexType="btree">
+            <column name="rule_id"/>
+        </index>
+    </table>
+    <table name="salesrule_coupon_usage" resource="default" engine="innodb" comment="Salesrule Coupon Usage">
+        <column xsi:type="int" name="coupon_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Coupon Id"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="int" name="times_used" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Times Used"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="coupon_id"/>
+            <column name="customer_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_USAGE_COUPON_ID_SALESRULE_COUPON_COUPON_ID"
+                    table="salesrule_coupon_usage" column="coupon_id" referenceTable="salesrule_coupon"
+                    referenceColumn="coupon_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_USAGE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="salesrule_coupon_usage" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="SALESRULE_COUPON_USAGE_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+    </table>
+    <table name="salesrule_customer" resource="default" engine="innodb" comment="Salesrule Customer">
+        <column xsi:type="int" name="rule_customer_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rule Customer Id"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer Id"/>
+        <column xsi:type="smallint" name="times_used" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Times Used"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_customer_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_CUSTOMER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="salesrule_customer" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_CUSTOMER_RULE_ID_SALESRULE_RULE_ID" table="salesrule_customer"
+                    column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
+        <index referenceId="SALESRULE_CUSTOMER_RULE_ID_CUSTOMER_ID" indexType="btree">
+            <column name="rule_id"/>
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="SALESRULE_CUSTOMER_CUSTOMER_ID_RULE_ID" indexType="btree">
+            <column name="customer_id"/>
+            <column name="rule_id"/>
+        </index>
+    </table>
+    <table name="salesrule_label" resource="default" engine="innodb" comment="Salesrule Label">
+        <column xsi:type="int" name="label_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Label Id"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="label" nullable="true" length="255" comment="Label"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="label_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_LABEL_RULE_ID_SALESRULE_RULE_ID" table="salesrule_label"
+                    column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_LABEL_STORE_ID_STORE_STORE_ID" table="salesrule_label"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALESRULE_LABEL_RULE_ID_STORE_ID">
+            <column name="rule_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SALESRULE_LABEL_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="salesrule_product_attribute" resource="default" engine="innodb" comment="Salesrule Product Attribute">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group Id"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="website_id"/>
+            <column name="customer_group_id"/>
+            <column name="attribute_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRD_ATTR_ATTR_ID_EAV_ATTR_ATTR_ID"
+                    table="salesrule_product_attribute" column="attribute_id" referenceTable="eav_attribute"
+                    referenceColumn="attribute_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRD_ATTR_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+                    table="salesrule_product_attribute" column="customer_group_id" referenceTable="customer_group"
+                    referenceColumn="customer_group_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRODUCT_ATTRIBUTE_RULE_ID_SALESRULE_RULE_ID"
+                    table="salesrule_product_attribute" column="rule_id" referenceTable="salesrule"
+                    referenceColumn="rule_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="salesrule_product_attribute" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="SALESRULE_PRODUCT_ATTRIBUTE_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+        <index referenceId="SALESRULE_PRODUCT_ATTRIBUTE_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="salesrule_coupon_aggregated" resource="sales" engine="innodb" comment="Coupon Aggregated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" nullable="false" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
+        <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Coupon Uses"/>
+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Subtotal Amount"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Amount"/>
+        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Subtotal Amount Actual"/>
+        <column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Discount Amount Actual"/>
+        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Amount Actual"/>
+        <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_AGGREGATED_STORE_ID_STORE_STORE_ID"
+                    table="salesrule_coupon_aggregated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALESRULE_COUPON_AGGRED_PERIOD_STORE_ID_ORDER_STS_COUPON_CODE">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+            <column name="coupon_code"/>
+        </constraint>
+        <index referenceId="SALESRULE_COUPON_AGGREGATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALESRULE_COUPON_AGGREGATED_RULE_NAME" indexType="btree">
+            <column name="rule_name"/>
+        </index>
+    </table>
+    <table name="salesrule_coupon_aggregated_updated" resource="sales" engine="innodb"
+           comment="Salesrule Coupon Aggregated Updated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" nullable="false" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
+        <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Coupon Uses"/>
+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Subtotal Amount"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Amount"/>
+        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Subtotal Amount Actual"/>
+        <column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Discount Amount Actual"/>
+        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
+                nullable="false" default="0" comment="Total Amount Actual"/>
+        <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
+                    table="salesrule_coupon_aggregated_updated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="UNQ_7196FA120A4F0F84E1B66605E87E213E">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+            <column name="coupon_code"/>
+        </constraint>
+        <index referenceId="SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALESRULE_COUPON_AGGREGATED_UPDATED_RULE_NAME" indexType="btree">
+            <column name="rule_name"/>
+        </index>
+    </table>
+    <table name="salesrule_coupon_aggregated_order" resource="default" engine="innodb"
+           comment="Coupon Aggregated Order">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" nullable="false" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
+        <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
+        <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Coupon Uses"/>
+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Subtotal Amount"/>
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Discount Amount"/>
+        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
+                default="0" comment="Total Amount"/>
+        <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID"
+                    table="salesrule_coupon_aggregated_order" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="UNQ_1094D1FBBCBB11704A29DEF3ACC37D2B">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="order_status"/>
+            <column name="coupon_code"/>
+        </constraint>
+        <index referenceId="SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SALESRULE_COUPON_AGGREGATED_ORDER_RULE_NAME" indexType="btree">
+            <column name="rule_name"/>
+        </index>
+    </table>
+    <table name="salesrule_website" resource="default" engine="innodb" comment="Sales Rules To Websites Relations">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Website Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_WEBSITE_RULE_ID_SALESRULE_RULE_ID" table="salesrule_website"
+                    column="rule_id" referenceTable="salesrule" referenceColumn="rule_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="salesrule_website" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="SALESRULE_WEBSITE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+    <table name="salesrule_customer_group" resource="default" engine="innodb"
+           comment="Sales Rules To Customer Groups Relations">
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
+        <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Customer Group Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="rule_id"/>
+            <column name="customer_group_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_CUSTOMER_GROUP_RULE_ID_SALESRULE_RULE_ID"
+                    table="salesrule_customer_group" column="rule_id" referenceTable="salesrule"
+                    referenceColumn="rule_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SALESRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+                    table="salesrule_customer_group" column="customer_group_id" referenceTable="customer_group"
+                    referenceColumn="customer_group_id" onDelete="CASCADE"/>
+        <index referenceId="SALESRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID" indexType="btree">
+            <column name="customer_group_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/SalesRule/etc/db_schema_whitelist.json b/app/code/Magento/SalesRule/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..f05591b276231
--- /dev/null
+++ b/app/code/Magento/SalesRule/etc/db_schema_whitelist.json
@@ -0,0 +1,230 @@
+{
+    "salesrule": {
+        "column": {
+            "rule_id": true,
+            "name": true,
+            "description": true,
+            "from_date": true,
+            "to_date": true,
+            "uses_per_customer": true,
+            "is_active": true,
+            "conditions_serialized": true,
+            "actions_serialized": true,
+            "stop_rules_processing": true,
+            "is_advanced": true,
+            "product_ids": true,
+            "sort_order": true,
+            "simple_action": true,
+            "discount_amount": true,
+            "discount_qty": true,
+            "discount_step": true,
+            "apply_to_shipping": true,
+            "times_used": true,
+            "is_rss": true,
+            "coupon_type": true,
+            "use_auto_generation": true,
+            "uses_per_coupon": true
+        },
+        "index": {
+            "SALESRULE_IS_ACTIVE_SORT_ORDER_TO_DATE_FROM_DATE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "salesrule_coupon": {
+        "column": {
+            "coupon_id": true,
+            "rule_id": true,
+            "code": true,
+            "usage_limit": true,
+            "usage_per_customer": true,
+            "times_used": true,
+            "expiration_date": true,
+            "is_primary": true,
+            "created_at": true,
+            "type": true
+        },
+        "index": {
+            "SALESRULE_COUPON_RULE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_COUPON_RULE_ID_SALESRULE_RULE_ID": true,
+            "SALESRULE_COUPON_CODE": true,
+            "SALESRULE_COUPON_RULE_ID_IS_PRIMARY": true
+        }
+    },
+    "salesrule_coupon_usage": {
+        "column": {
+            "coupon_id": true,
+            "customer_id": true,
+            "times_used": true
+        },
+        "index": {
+            "SALESRULE_COUPON_USAGE_CUSTOMER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_COUPON_USAGE_COUPON_ID_SALESRULE_COUPON_COUPON_ID": true,
+            "SALESRULE_COUPON_USAGE_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true
+        }
+    },
+    "salesrule_customer": {
+        "column": {
+            "rule_customer_id": true,
+            "rule_id": true,
+            "customer_id": true,
+            "times_used": true
+        },
+        "index": {
+            "SALESRULE_CUSTOMER_RULE_ID_CUSTOMER_ID": true,
+            "SALESRULE_CUSTOMER_CUSTOMER_ID_RULE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_CUSTOMER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "SALESRULE_CUSTOMER_RULE_ID_SALESRULE_RULE_ID": true
+        }
+    },
+    "salesrule_label": {
+        "column": {
+            "label_id": true,
+            "rule_id": true,
+            "store_id": true,
+            "label": true
+        },
+        "index": {
+            "SALESRULE_LABEL_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_LABEL_RULE_ID_SALESRULE_RULE_ID": true,
+            "SALESRULE_LABEL_STORE_ID_STORE_STORE_ID": true,
+            "SALESRULE_LABEL_RULE_ID_STORE_ID": true
+        }
+    },
+    "salesrule_product_attribute": {
+        "column": {
+            "rule_id": true,
+            "website_id": true,
+            "customer_group_id": true,
+            "attribute_id": true
+        },
+        "index": {
+            "SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID": true,
+            "SALESRULE_PRODUCT_ATTRIBUTE_CUSTOMER_GROUP_ID": true,
+            "SALESRULE_PRODUCT_ATTRIBUTE_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_PRD_ATTR_ATTR_ID_EAV_ATTR_ATTR_ID": true,
+            "SALESRULE_PRD_ATTR_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true,
+            "SALESRULE_PRODUCT_ATTRIBUTE_RULE_ID_SALESRULE_RULE_ID": true,
+            "SALESRULE_PRODUCT_ATTRIBUTE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "salesrule_coupon_aggregated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "coupon_code": true,
+            "coupon_uses": true,
+            "subtotal_amount": true,
+            "discount_amount": true,
+            "total_amount": true,
+            "subtotal_amount_actual": true,
+            "discount_amount_actual": true,
+            "total_amount_actual": true,
+            "rule_name": true
+        },
+        "index": {
+            "SALESRULE_COUPON_AGGREGATED_STORE_ID": true,
+            "SALESRULE_COUPON_AGGREGATED_RULE_NAME": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_COUPON_AGGREGATED_STORE_ID_STORE_STORE_ID": true,
+            "SALESRULE_COUPON_AGGRED_PERIOD_STORE_ID_ORDER_STS_COUPON_CODE": true
+        }
+    },
+    "salesrule_coupon_aggregated_updated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "coupon_code": true,
+            "coupon_uses": true,
+            "subtotal_amount": true,
+            "discount_amount": true,
+            "total_amount": true,
+            "subtotal_amount_actual": true,
+            "discount_amount_actual": true,
+            "total_amount_actual": true,
+            "rule_name": true
+        },
+        "index": {
+            "SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID": true,
+            "SALESRULE_COUPON_AGGREGATED_UPDATED_RULE_NAME": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_COUPON_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID": true,
+            "UNQ_7196FA120A4F0F84E1B66605E87E213E": true
+        }
+    },
+    "salesrule_coupon_aggregated_order": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "order_status": true,
+            "coupon_code": true,
+            "coupon_uses": true,
+            "subtotal_amount": true,
+            "discount_amount": true,
+            "total_amount": true,
+            "rule_name": true
+        },
+        "index": {
+            "SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID": true,
+            "SALESRULE_COUPON_AGGREGATED_ORDER_RULE_NAME": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_COUPON_AGGREGATED_ORDER_STORE_ID_STORE_STORE_ID": true,
+            "UNQ_1094D1FBBCBB11704A29DEF3ACC37D2B": true
+        }
+    },
+    "salesrule_website": {
+        "column": {
+            "rule_id": true,
+            "website_id": true
+        },
+        "index": {
+            "SALESRULE_WEBSITE_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_WEBSITE_RULE_ID_SALESRULE_RULE_ID": true,
+            "SALESRULE_WEBSITE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    },
+    "salesrule_customer_group": {
+        "column": {
+            "rule_id": true,
+            "customer_group_id": true
+        },
+        "index": {
+            "SALESRULE_CUSTOMER_GROUP_CUSTOMER_GROUP_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALESRULE_CUSTOMER_GROUP_RULE_ID_SALESRULE_RULE_ID": true,
+            "SALESRULE_CSTR_GROUP_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/etc/module.xml b/app/code/Magento/SalesRule/etc/module.xml
index f3f160eb7d40b..4344e00b6f840 100644
--- a/app/code/Magento/SalesRule/etc/module.xml
+++ b/app/code/Magento/SalesRule/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SalesRule" setup_version="2.0.3">
+    <module name="Magento_SalesRule" >
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
index 022403579b237..9e86671500c50 100644
--- a/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
@@ -13,14 +13,10 @@
                     <item name="components" xsi:type="array">
                         <item name="block-totals" xsi:type="array">
                             <item name="children" xsi:type="array">
-                                <item name="before_grandtotal" xsi:type="array">
-                                    <item name="children" xsi:type="array">
-                                        <item name="discount" xsi:type="array">
-                                            <item name="component"  xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
-                                            <item name="config" xsi:type="array">
-                                                <item name="title" xsi:type="string" translate="true">Discount</item>
-                                            </item>
-                                        </item>
+                                <item name="discount" xsi:type="array">
+                                    <item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
+                                    <item name="config" xsi:type="array">
+                                        <item name="title" xsi:type="string" translate="true">Discount</item>
                                     </item>
                                 </item>
                             </item>
diff --git a/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml
index e285530b25d9f..f75525576f16b 100644
--- a/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml
@@ -47,7 +47,7 @@
                                                 <item name="totals" xsi:type="array">
                                                     <item name="children" xsi:type="array">
                                                         <item name="discount" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
+                                                            <item name="component" xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="title" xsi:type="string" translate="true">Discount</item>
                                                             </item>
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js b/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js
index 5b04700596272..f2924fe48e01b 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js
@@ -44,6 +44,25 @@ define([
             return this.totals()['coupon_label'];
         },
 
+        /**
+         * Get discount title
+         *
+         * @returns {null|String}
+         */
+        getTitle: function () {
+            var discountSegments;
+
+            if (!this.totals()) {
+                return null;
+            }
+
+            discountSegments = this.totals()['total_segments'].filter(function (segment) {
+                return segment.code.indexOf('discount') !== -1;
+            });
+
+            return discountSegments.length ? discountSegments[0].title : null;
+        },
+
         /**
          * @return {Number}
          */
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
index 4b70b4b110c97..8fbb4a6ce74ae 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
@@ -7,7 +7,7 @@
 <!-- ko if: isDisplayed() -->
 <tr class="totals">
     <th colspan="1" style="" class="mark" scope="row">
-        <span class="title" data-bind="text: title"></span>
+        <span class="title" data-bind="text: getTitle()"></span>
         <span class="discount coupon" data-bind="text: getCouponLabel()"></span>
     </th>
     <td class="amount" data-bind="attr: {'data-th': title}">
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 7246460382fa7..d622b5ea5762d 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -27,7 +27,7 @@
                                id="discount-code"
                                name="discount_code"
                                data-validate="{'required-entry':true}"
-                               data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
+                               data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />
                     </div>
                 </div>
             </div>
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
index 17a9559fa01f2..017e358c7e419 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
@@ -7,7 +7,7 @@
 <!-- ko if: isDisplayed() -->
 <tr class="totals discount">
     <th class="mark" scope="row">
-        <span class="title" data-bind="text: title"></span>
+        <span class="title" data-bind="text: getTitle()"></span>
         <span class="discount coupon" data-bind="text: getCouponCode()"></span>
     </th>
     <td class="amount">
diff --git a/app/code/Magento/SalesSequence/Model/Manager.php b/app/code/Magento/SalesSequence/Model/Manager.php
index d18a872bf3b62..95b26ba425cf6 100644
--- a/app/code/Magento/SalesSequence/Model/Manager.php
+++ b/app/code/Magento/SalesSequence/Model/Manager.php
@@ -41,7 +41,9 @@ public function __construct(
      *
      * @param string $entityType
      * @param int $storeId
+     *
      * @return \Magento\Framework\DB\Sequence\SequenceInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSequence($entityType, $storeId)
     {
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
index 10cf903d0baed..7a4aabea85680 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\SalesSequence\Model\ResourceModel;
 
 use Magento\Framework\Exception\LocalizedException as Exception;
@@ -95,7 +96,9 @@ public function loadByEntityTypeAndStore($entityType, $storeId)
      * Using for load sequence profile and setting it into metadata
      *
      * @param \Magento\Framework\Model\AbstractModel $object
-     * @return $this
+     *
+     * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -117,7 +120,12 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         if (!$object->getData('active_profile') instanceof ModelProfile) {
-            throw new NoSuchEntityException(__('Entity Sequence profile not added to meta active profile'));
+            throw new NoSuchEntityException(
+                __(
+                    "The entity sequence profile wasn't added to the meta active profile. "
+                    . "Verify the profile and try again."
+                )
+            );
         }
 
         if (!$object->getData('entity_type')
@@ -131,7 +139,12 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
-     * @inheritdoc
+     * Perform actions after object save
+     *
+     * @param \Magento\Framework\Model\AbstractModel $object
+     *
+     * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
index 368bdf6c26f16..4f1788b0ca353 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesSequence\Model\ResourceModel;
 
-use Magento\SalesSequence\Model\Meta as ModelMeta;
 use Magento\Framework\Model\ResourceModel\Db\Context as DatabaseContext;
 use Magento\SalesSequence\Model\ProfileFactory;
 
diff --git a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
index cc828e7d36a45..cf56c96fb1710 100644
--- a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
+++ b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
@@ -49,8 +49,12 @@ public function __construct(
     }
 
     /**
+     * Observer triggered during adding new store
+     *
      * @param EventObserver $observer
-     * @return $this
+     *
+     * @return $this|void
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesSequence/Setup/InstallData.php b/app/code/Magento/SalesSequence/Setup/InstallData.php
deleted file mode 100644
index 5c07c37908760..0000000000000
--- a/app/code/Magento/SalesSequence/Setup/InstallData.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\SalesSequence\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * Recurring data upgrade for SalesSequence module.
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * @var SequenceCreator
-     */
-    private $sequenceCreator;
-
-    /**
-     * @param SequenceCreator $sequenceCreator
-     */
-    public function __construct(
-        SequenceCreator $sequenceCreator
-    ) {
-        $this->sequenceCreator = $sequenceCreator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $this->sequenceCreator->create();
-    }
-}
diff --git a/app/code/Magento/SalesSequence/Setup/InstallSchema.php b/app/code/Magento/SalesSequence/Setup/InstallSchema.php
deleted file mode 100644
index a73d892b5ea2a..0000000000000
--- a/app/code/Magento/SalesSequence/Setup/InstallSchema.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\SalesSequence\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * @var string
-     */
-    private static $connectionName = 'sales';
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-        /**
-         * Create table 'sales_sequence_profile'
-         */
-        $table = $installer->getConnection(self::$connectionName)->newTable(
-            $installer->getTable('sales_sequence_profile', self::$connectionName)
-        )->addColumn(
-            'profile_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'meta_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false]
-        )->addColumn(
-            'prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true, 'primary' => false],
-            'Prefix'
-        )->addColumn(
-            'suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true, 'primary' => false],
-            'Suffix'
-        )->addColumn(
-            'start_value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'unsigned' => true, 'primary' => false, 'default' => 1],
-            'Start value for sequence'
-        )->addColumn(
-            'step',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'unsigned' => true, 'primary' => false, 'default' => 1],
-            'Step for sequence'
-        )->addColumn(
-            'max_value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'unsigned' => true, 'primary' => false],
-            'MaxValue for sequence'
-        )->addColumn(
-            'warning_value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'unsigned' => true, 'primary' => false],
-            'WarningValue for sequence'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-            null,
-            ['nullable' => false, 'default' => 0],
-            'isActive flag'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_sequence_profile',
-                ['meta_id', 'prefix', 'suffix'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE,
-                '',
-                self::$connectionName
-            ),
-            ['meta_id', 'prefix', 'suffix'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName(
-                'sales_sequence_profile',
-                'meta_id',
-                'sales_sequence_meta',
-                'meta_id',
-                self::$connectionName
-            ),
-            'meta_id',
-            $installer->getTable('sales_sequence_meta', self::$connectionName),
-            'meta_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-        $installer->getConnection(self::$connectionName)->createTable($table);
-
-        /**
-         * Create table 'sales_sequence_meta'
-         */
-        $table = $installer->getConnection(self::$connectionName)->newTable(
-            $installer->getTable('sales_sequence_meta', self::$connectionName)
-        )->addColumn(
-            'meta_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'entity_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false, 'primary' => false],
-            'Prefix'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => false],
-            'Store Id'
-        )->addColumn(
-            'sequence_table',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'table for sequence'
-        )->addIndex(
-            $installer->getIdxName(
-                'sales_sequence_meta',
-                ['entity_type', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE,
-                '',
-                self::$connectionName
-            ),
-            ['entity_type', 'store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        );
-        $installer->getConnection(self::$connectionName)->createTable($table);
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/SalesSequence/Setup/Recurring.php b/app/code/Magento/SalesSequence/Setup/Recurring.php
new file mode 100644
index 0000000000000..2beff94bfab67
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Setup/Recurring.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesSequence\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var SequenceCreator
+     */
+    private $sequenceCreator;
+
+    /**
+     * @param SequenceCreator $sequenceCreator
+     */
+    public function __construct(
+        SequenceCreator $sequenceCreator
+    ) {
+        $this->sequenceCreator = $sequenceCreator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $this->sequenceCreator->create();
+    }
+}
diff --git a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
index b0cbf545957bd..14df80224e2ce 100644
--- a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
+++ b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
@@ -49,6 +49,8 @@ public function __construct(
 
     /**
      * Creates sales sequences.
+     *
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function create()
     {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE.txt b/app/code/Magento/SalesSequence/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE.txt
rename to app/code/Magento/SalesSequence/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE_AFL.txt b/app/code/Magento/SalesSequence/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE_AFL.txt
rename to app/code/Magento/SalesSequence/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesSequence/Test/Mftf/README.md b/app/code/Magento/SalesSequence/Test/Mftf/README.md
new file mode 100644
index 0000000000000..969f7d0daf509
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Sequence Functional Tests
+
+The Functional Test Module for **Magento Sales Sequence** module.
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index 37b562420383d..3865d9569c529 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesSequence/etc/db_schema.xml b/app/code/Magento/SalesSequence/etc/db_schema.xml
new file mode 100644
index 0000000000000..0e580b85bd608
--- /dev/null
+++ b/app/code/Magento/SalesSequence/etc/db_schema.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="sales_sequence_profile" resource="sales" engine="innodb" comment="sales_sequence_profile" onCreate="skip-migration">
+        <column xsi:type="int" name="profile_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Id"/>
+        <column xsi:type="int" name="meta_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Meta_id"/>
+        <column xsi:type="varchar" name="prefix" nullable="true" length="32" comment="Prefix"/>
+        <column xsi:type="varchar" name="suffix" nullable="true" length="32" comment="Suffix"/>
+        <column xsi:type="int" name="start_value" padding="10" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Start value for sequence"/>
+        <column xsi:type="int" name="step" padding="10" unsigned="true" nullable="false" identity="false" default="1"
+                comment="Step for sequence"/>
+        <column xsi:type="int" name="max_value" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="MaxValue for sequence"/>
+        <column xsi:type="int" name="warning_value" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="WarningValue for sequence"/>
+        <column xsi:type="boolean" name="is_active" nullable="false" default="false" comment="isActive flag"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="profile_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SALES_SEQUENCE_PROFILE_META_ID_SALES_SEQUENCE_META_META_ID"
+                    table="sales_sequence_profile" column="meta_id" referenceTable="sales_sequence_meta"
+                    referenceColumn="meta_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SALES_SEQUENCE_PROFILE_META_ID_PREFIX_SUFFIX">
+            <column name="meta_id"/>
+            <column name="prefix"/>
+            <column name="suffix"/>
+        </constraint>
+    </table>
+    <table name="sales_sequence_meta" resource="sales" engine="innodb" comment="sales_sequence_meta" onCreate="skip-migration">
+        <column xsi:type="int" name="meta_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Id"/>
+        <column xsi:type="varchar" name="entity_type" nullable="false" length="32" comment="Prefix"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="sequence_table" nullable="false" length="32" comment="table for sequence"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="meta_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SALES_SEQUENCE_META_ENTITY_TYPE_STORE_ID">
+            <column name="entity_type"/>
+            <column name="store_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/SalesSequence/etc/db_schema_whitelist.json b/app/code/Magento/SalesSequence/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..17fec04e24467
--- /dev/null
+++ b/app/code/Magento/SalesSequence/etc/db_schema_whitelist.json
@@ -0,0 +1,32 @@
+{
+    "sales_sequence_profile": {
+        "column": {
+            "profile_id": true,
+            "meta_id": true,
+            "prefix": true,
+            "suffix": true,
+            "start_value": true,
+            "step": true,
+            "max_value": true,
+            "warning_value": true,
+            "is_active": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SEQUENCE_PROFILE_META_ID_SALES_SEQUENCE_META_META_ID": true,
+            "SALES_SEQUENCE_PROFILE_META_ID_PREFIX_SUFFIX": true
+        }
+    },
+    "sales_sequence_meta": {
+        "column": {
+            "meta_id": true,
+            "entity_type": true,
+            "store_id": true,
+            "sequence_table": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SALES_SEQUENCE_META_ENTITY_TYPE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/SalesSequence/etc/module.xml b/app/code/Magento/SalesSequence/etc/module.xml
index d896811611254..dc6918830dbfa 100644
--- a/app/code/Magento/SalesSequence/etc/module.xml
+++ b/app/code/Magento/SalesSequence/etc/module.xml
@@ -6,6 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SalesSequence" setup_version="2.0.0">
-    </module>
+    <module name="Magento_SalesSequence"/>
 </config>
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index 88df47283133a..57a61fecae5ca 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -68,7 +68,7 @@ public function __construct(
     protected function configure()
     {
         $this->setName('sampledata:deploy')
-            ->setDescription('Deploy sample data modules');
+            ->setDescription('Deploy sample data modules for composer-based Magento installations');
         $this->addOption(
             self::OPTION_NO_UPDATE,
             null,
@@ -83,6 +83,12 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $rootJson = json_decode($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->readFile("composer.json"));
+        if (!isset($rootJson->version)) {
+            // @codingStandardsIgnoreLine
+            $output->writeln('<info>' . 'Git installations must deploy sample data from GitHub; see https://devdocs.magento.com/guides/v2.3/install-gde/install/sample-data-after-clone.html for more information.' . '</info>');
+            return;
+        }
         $this->updateMemoryLimit();
         $this->createAuthFile();
         $sampleDataPackages = $this->sampleDataDependency->getSampleDataPackages();
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
index e3949a6bd502e..d08f2d9833e86 100644
--- a/app/code/Magento/SampleData/Model/Dependency.php
+++ b/app/code/Magento/SampleData/Model/Dependency.php
@@ -12,7 +12,7 @@
 use Magento\Framework\Config\Composer\Package;
 use Magento\Framework\Config\Composer\PackageFactory;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\ReadInterfaceFactory;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 
 /**
  * Sample Data dependency
@@ -40,7 +40,7 @@ class Dependency
     private $componentRegistrar;
 
     /**
-     * @var ReadInterfaceFactory
+     * @var ReadFactory
      */
     private $directoryReadFactory;
 
@@ -51,7 +51,7 @@ class Dependency
      * @param Filesystem $filesystem @deprecated 2.3.0 $directoryReadFactory is used instead
      * @param PackageFactory $packageFactory
      * @param ComponentRegistrarInterface $componentRegistrar
-     * @param Filesystem\Directory\ReadInterfaceFactory|null $directoryReadFactory
+     * @param Filesystem\Directory\ReadFactory|null $directoryReadFactory
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
@@ -59,13 +59,13 @@ public function __construct(
         Filesystem $filesystem,
         PackageFactory $packageFactory,
         ComponentRegistrarInterface $componentRegistrar,
-        \Magento\Framework\Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory = null
+        \Magento\Framework\Filesystem\Directory\ReadFactory $directoryReadFactory = null
     ) {
         $this->composerInformation = $composerInformation;
         $this->packageFactory = $packageFactory;
         $this->componentRegistrar = $componentRegistrar;
         $this->directoryReadFactory = $directoryReadFactory ?:
-            ObjectManager::getInstance()->get(ReadInterfaceFactory::class);
+            ObjectManager::getInstance()->get(ReadFactory::class);
     }
 
     /**
@@ -81,7 +81,7 @@ public function getSampleDataPackages()
         $suggests = array_merge($suggests, $this->getSuggestsFromModules());
         foreach ($suggests as $name => $version) {
             if (strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
-                $installExtensions[$name] = substr($version, strlen(self::SAMPLE_DATA_SUGGEST));
+                $installExtensions[$name] = trim(substr($version, strlen(self::SAMPLE_DATA_SUGGEST)));
             }
         }
         return $installExtensions;
@@ -123,7 +123,7 @@ private function getModuleComposerPackage($moduleDir)
          */
         foreach ([$moduleDir, $moduleDir . DIRECTORY_SEPARATOR . '..'] as $dir) {
             /** @var Filesystem\Directory\ReadInterface $directory */
-            $directory = $this->directoryReadFactory->create(['path' => $dir]);
+            $directory = $this->directoryReadFactory->create($dir);
             if ($directory->isExist('composer.json') && $directory->isReadable('composer.json')) {
                 /** @var Package $package */
                 return $this->packageFactory->create(['json' => json_decode($directory->readFile('composer.json'))]);
diff --git a/app/code/Magento/SampleData/Setup/InstallData.php b/app/code/Magento/SampleData/Setup/InstallData.php
deleted file mode 100644
index edb1bd76cc978..0000000000000
--- a/app/code/Magento/SampleData/Setup/InstallData.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\SampleData\Setup;
-
-use Magento\Framework\Setup;
-
-/**
- * Class PostInstallSampleData
- */
-class InstallData implements Setup\InstallDataInterface
-{
-    /**
-     * @var \Magento\Framework\Setup\SampleData\State
-     */
-    protected $state;
-
-    /**
-     * @param \Magento\Framework\Setup\SampleData\State $state
-     */
-    public function __construct(
-        \Magento\Framework\Setup\SampleData\State $state
-    ) {
-        $this->state = $state;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function install(Setup\ModuleDataSetupInterface $setup, Setup\ModuleContextInterface $moduleContext)
-    {
-        $this->state->clearState();
-    }
-}
diff --git a/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php b/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php
new file mode 100644
index 0000000000000..2725573b1ab99
--- /dev/null
+++ b/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SampleData\Setup\Patch\Data;
+
+use Magento\Framework\Setup;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ClearSampleDataState
+ * @package Magento\SampleData\Setup\Patch
+ */
+class ClearSampleDataState implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var Setup\SampleData\State
+     */
+    private $state;
+
+    /**
+     * ClearSampleDataState constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param Setup\SampleData\State $state
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Framework\Setup\SampleData\State $state
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->state = $state;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->state->clearState();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/SampleData/Test/Mftf/README.md b/app/code/Magento/SampleData/Test/Mftf/README.md
new file mode 100644
index 0000000000000..dcadf692f4959
--- /dev/null
+++ b/app/code/Magento/SampleData/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sample Data Functional Tests
+
+The Functional Test Module for **Magento Sample Data** module.
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php
index 090bb4256f807..a5790d40f782c 100644
--- a/app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php
+++ b/app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php
@@ -83,6 +83,9 @@ protected function setupMocks(
         $additionalComposerArgs = []
     ) {
         $this->directoryReadMock->expects($this->any())->method('getAbsolutePath')->willReturn($pathToComposerJson);
+        $this->directoryReadMock->expects($this->any())->method('readFile')->with('composer.json')->willReturn(
+            '{"version": "0.0.1"}'
+        );
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->with(DirectoryList::ROOT)->willReturn(
             $this->directoryReadMock
         );
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
index 450b2d8798f52..7ca27a7d746c7 100644
--- a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
+++ b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
@@ -115,6 +115,15 @@ public function processDataProvider()
      */
     public function testExecuteWithException()
     {
+        $this->directoryReadMock->expects($this->once())
+            ->method('readFile')
+            ->with('composer.json')
+            ->willReturn('{"version": "0.0.1"}');
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::ROOT)
+            ->willReturn($this->directoryReadMock);
+        
         $this->directoryWriteMock->expects($this->once())
             ->method('isExist')
             ->with(PackagesAuth::PATH_TO_AUTH_FILE)
diff --git a/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php b/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php
index f7dc46d1128ad..f0b69a627091f 100644
--- a/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php
+++ b/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php
@@ -14,7 +14,13 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Phrase;
 use Magento\SampleData\Model\Dependency;
+use Magento\Framework\Filesystem\DriverPool;
 
+/**
+ * Class DependencyTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DependencyTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -59,7 +65,7 @@ public function testPackagesFromComposerSuggest(
                 $moduleDirectories
             );
 
-        $directoryReadFactory = $this->getMockBuilder(Filesystem\Directory\ReadInterfaceFactory::class)
+        $directoryReadFactory = $this->getMockBuilder(Filesystem\Directory\ReadFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -75,6 +81,10 @@ public function testPackagesFromComposerSuggest(
         );
         $this->assertEquals($expectedPackages, $dependency->getSampleDataPackages());
     }
+
+    /**
+     * @return array
+     */
     public static function dataPackagesFromComposerSuggest()
     {
         return [
@@ -88,7 +98,8 @@ public static function dataPackagesFromComposerSuggest()
                 'composerJsonGenerator' => function (DependencyTest $test) {
                     return [
                         [
-                            ['path' => 'app/code/LocalModule'],
+                            'app/code/LocalModule',
+                            DriverPool::FILE,
                             $test->stubComposerJsonReader(
                                 [
                                     'name' => 'local/module',
@@ -99,11 +110,13 @@ public static function dataPackagesFromComposerSuggest()
                             )
                         ],
                         [
-                            ['path' => 'app/code/LocalModuleWithoutComposerJson'],
+                            'app/code/LocalModuleWithoutComposerJson',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'vendor/company/module'],
+                            'vendor/company/module',
+                            DriverPool::FILE,
                             $test->stubComposerJsonReader(
                                 [
                                     'name' => 'company/module',
@@ -114,7 +127,8 @@ public static function dataPackagesFromComposerSuggest()
                             )
                         ],
                         [
-                            ['path' => 'vendor/company2/module/src/..'],
+                            'vendor/company2/module/src/..',
+                            DriverPool::FILE,
                             $test->stubComposerJsonReader(
                                 [
                                     'name' => 'company2/module',
@@ -125,26 +139,30 @@ public static function dataPackagesFromComposerSuggest()
                             )
                         ],
                         [
-                            ['path' => 'vendor/company2/module/src'],
+                            'vendor/company2/module/src',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'vendor/company/module/..'],
+                            'vendor/company/module/..',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'app/code/LocalModuleWithoutComposerJson/..'],
+                            'app/code/LocalModuleWithoutComposerJson/..',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'app/code/LocalModule/..'],
+                            'app/code/LocalModule/..',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                     ];
                 },
                 'suggestions' => [
-                    'magento/foo-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . '100.0.0',
-                    'thirdparty/bar-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . '1.2.3',
+                    'magento/foo-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . ' 100.0.0',
+                    'thirdparty/bar-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . ' 1.2.3',
                     'thirdparty/something-else' => 'Just a suggested package',
                 ],
                 'expectedPackages' => [
@@ -158,6 +176,10 @@ public static function dataPackagesFromComposerSuggest()
         ];
     }
 
+    /**
+     * @param array $composerJsonContent
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     public function stubComposerJsonReader(array $composerJsonContent)
     {
         $stub = $this->getMockBuilder(Filesystem\Directory\ReadInterface::class)
@@ -174,6 +196,9 @@ public function stubComposerJsonReader(array $composerJsonContent)
         return $stub;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     public function stubFileNotFoundReader()
     {
         $stub = $this->getMockBuilder(Filesystem\Directory\ReadInterface::class)
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 0109bab4d9240..17bb4d03dd55e 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/sample-data-media": "Sample Data version:100.3.*"
+        "magento/sample-data-media": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SampleData/etc/di.xml b/app/code/Magento/SampleData/etc/di.xml
index 93cf98a41150c..412e86c150f52 100644
--- a/app/code/Magento/SampleData/etc/di.xml
+++ b/app/code/Magento/SampleData/etc/di.xml
@@ -15,10 +15,4 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\SampleData\Filesystem\Directory\Read" type="Magento\Framework\Filesystem\Directory\Read">
-        <arguments>
-            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
-        </arguments>
-    </virtualType>
-    <preference for="Magento\Framework\Filesystem\Directory\ReadInterface" type="Magento\SampleData\Filesystem\Directory\Read" />
 </config>
diff --git a/app/code/Magento/SampleData/etc/module.xml b/app/code/Magento/SampleData/etc/module.xml
index 965a78871e54f..6746aadc4b408 100644
--- a/app/code/Magento/SampleData/etc/module.xml
+++ b/app/code/Magento/SampleData/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SampleData" setup_version="2.0.0">
+    <module name="Magento_SampleData" >
         <sequence>
             <module name="Magento_UrlRewrite"/>
         </sequence>
diff --git a/app/code/Magento/Search/Api/SynonymGroupRepositoryInterface.php b/app/code/Magento/Search/Api/SynonymGroupRepositoryInterface.php
index 3fa185abb4ea7..e30508637f9ae 100644
--- a/app/code/Magento/Search/Api/SynonymGroupRepositoryInterface.php
+++ b/app/code/Magento/Search/Api/SynonymGroupRepositoryInterface.php
@@ -31,7 +31,7 @@ public function save(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGrou
     public function delete(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup);
 
     /**
-     * Return a paritcular synonym group interface instance based on passed in synonym group id
+     * Return a particular synonym group interface instance based on passed in synonym group id
      *
      * @param int $synonymGroupId
      * @return \Magento\Search\Api\Data\SynonymGroupInterface
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
index 03c298b23a43e..5ead8437f943a 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
@@ -63,6 +63,7 @@ protected function _construct()
 
     /**
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _prepareCollection()
     {
@@ -86,6 +87,7 @@ protected function _prepareCollection()
 
     /**
      * @return $this
+     * @throws \Exception
      */
     protected function _prepareColumns()
     {
@@ -118,7 +120,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
index 9019a127c5b64..18d6d2cf54c3a 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
@@ -51,6 +51,8 @@ protected function _construct()
      * Prepare form fields
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function _prepareForm()
diff --git a/app/code/Magento/Search/Block/Term.php b/app/code/Magento/Search/Block/Term.php
index e6c5c2b82ab5e..b27ef6b01fda2 100644
--- a/app/code/Magento/Search/Block/Term.php
+++ b/app/code/Magento/Search/Block/Term.php
@@ -71,6 +71,7 @@ public function __construct(
      * Load terms and try to sort it by names
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _loadTerms()
     {
@@ -109,6 +110,7 @@ protected function _loadTerms()
 
     /**
      * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getTerms()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
index bb476423692d1..9d8b612cefadf 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
@@ -60,16 +60,18 @@ public function execute()
                 /** @var \Magento\Search\Model\SynonymGroup $synGroupModel */
                 $synGroupModel = $this->synGroupRepository->get($id);
                 $this->synGroupRepository->delete($synGroupModel);
-                $this->messageManager->addSuccess(__('The synonym group has been deleted.'));
+                $this->messageManager->addSuccessMessage(__('The synonym group has been deleted.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->logger->error($e);
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('An error was encountered while performing delete operation.'));
+                $this->messageManager->addErrorMessage(
+                    __('An error was encountered while performing delete operation.')
+                );
                 $this->logger->error($e);
             }
         } else {
-            $this->messageManager->addError(__('We can\'t find a synonym group to delete.'));
+            $this->messageManager->addErrorMessage(__('We can\'t find a synonym group to delete.'));
         }
 
         return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
index 506976247327f..adc4ecc52030a 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
@@ -34,7 +34,6 @@ class Edit extends \Magento\Backend\App\Action
      * Edit constructor.
      *
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Search\Controller\Adminhtml\Synonyms\ResultPageBuilder $pageBuilder
      * @param \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
@@ -66,7 +65,7 @@ public function execute()
 
         // 2. Initial checking
         if ($groupId && (!$synGroup->getGroupId())) {
-                $this->messageManager->addError(__('This synonyms group no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This synonyms group no longer exists.'));
                 /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
index 4add418d95325..f2770f77cc533 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
@@ -72,17 +72,17 @@ public function execute()
                 $this->synGroupRepository->delete($synonymGroup);
                 $deletedItems++;
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         }
         if ($deletedItems != 0) {
             if ($collectionSize != $deletedItems) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Failed to delete %1 synonym group(s).', $collectionSize - $deletedItems)
                 );
             }
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('A total of %1 synonym group(s) have been deleted.', $deletedItems)
             );
         }
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/ResultPageBuilder.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/ResultPageBuilder.php
index c04ede1941243..d337dc85fcb38 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/ResultPageBuilder.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/ResultPageBuilder.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Synonyms;
 
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\Search\SearchEngine\ConfigInterface;
+
 /**
  * Result page builder class
  *
@@ -17,12 +20,12 @@ class ResultPageBuilder
     protected $resultPageFactory;
 
     /**
-     * @var \Magento\Search\Model\EngineResolver $engineResolver
+     * @var EngineResolverInterface $engineResolver
      */
     protected $engineResolver;
 
     /**
-     * @var \Magento\Framework\Search\SearchEngine\ConfigInterface $searchFeatureConfig
+     * @var ConfigInterface $searchFeatureConfig
      */
     protected $searchFeatureConfig;
 
@@ -35,14 +38,14 @@ class ResultPageBuilder
      * Constructor
      *
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @param \Magento\Search\Model\EngineResolver $engineResolver
-     * @param \Magento\Framework\Search\SearchEngine\ConfigInterface $searchFeatureConfig
+     * @param EngineResolverInterface $engineResolver
+     * @param ConfigInterface $searchFeatureConfig
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      */
     public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Search\Model\EngineResolver $engineResolver,
-        \Magento\Framework\Search\SearchEngine\ConfigInterface $searchFeatureConfig,
+        EngineResolverInterface $engineResolver,
+        ConfigInterface $searchFeatureConfig,
         \Magento\Framework\Message\ManagerInterface $messageManager
     ) {
         $this->resultPageFactory = $resultPageFactory;
@@ -80,7 +83,7 @@ protected function checkSearchEngineSupport()
         $searchEngine = $this->engineResolver->getCurrentSearchEngine();
         if (!$this->searchFeatureConfig
             ->isFeatureSupported(
-                \Magento\Framework\Search\SearchEngine\ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS,
+                ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS,
                 $searchEngine
             )
         ) {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php
index ffa97ceb3e0e1..0ed73fd0cee32 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php
@@ -59,7 +59,7 @@ public function execute()
             $synGroup = $this->synGroupRepository->get($synGroupId);
 
             if (!$synGroup->getGroupId() && $synGroupId) {
-                $this->messageManager->addError(__('This synonym group no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This synonym group no longer exists.'));
                 return $resultRedirect->setPath('*/*/');
             }
 
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
index 3a1b80df2ea7e..ce3dfcc601fa4 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Delete extends TermController
+class Delete extends TermController implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
@@ -23,16 +24,16 @@ public function execute()
                 $model = $this->_objectManager->create(\Magento\Search\Model\Query::class);
                 $model->setId($id);
                 $model->delete();
-                $this->messageManager->addSuccess(__('You deleted the search.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the search.'));
                 $resultRedirect->setPath('search/*/');
                 return $resultRedirect;
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $resultRedirect->setPath('search/*/edit', ['id' => $this->getRequest()->getParam('id')]);
                 return $resultRedirect;
             }
         }
-        $this->messageManager->addError(__('We can\'t find a search term to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a search term to delete.'));
         $resultRedirect->setPath('search/*/');
         return $resultRedirect;
     }
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
index 85e14ae9fe0b0..cd1ef7553c7ec 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
 use Magento\Framework\Controller\ResultFactory;
 
-class Edit extends TermController
+class Edit extends TermController implements HttpGetActionInterface
 {
     /**
      * Core registry
@@ -43,7 +44,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This search no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This search no longer exists.'));
                 /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
                 $resultRedirect->setPath('search/*');
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
index 75173381b5239..128fa1c6c687c 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
@@ -34,6 +34,7 @@ public function __construct(
      * Export search report grid to CSV format
      *
      * @return \Magento\Framework\App\ResponseInterface
+     * @throws \Exception
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
index e3859bc5aefd2..d7e2b02bc5249 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
@@ -34,6 +34,7 @@ public function __construct(
      * Export search report to Excel XML format
      *
      * @return \Magento\Framework\App\ResponseInterface
+     * @throws \Exception
      */
     public function execute()
     {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
index f7d0b86590721..c097cc08489f9 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 
-class Index extends TermController
+class Index extends TermController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
index b38d883b8faae..84e475b7275ae 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
 
-class MassDelete extends TermController
+class MassDelete extends TermController implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
@@ -17,16 +18,16 @@ public function execute()
     {
         $searchIds = $this->getRequest()->getParam('search');
         if (!is_array($searchIds)) {
-            $this->messageManager->addError(__('Please select searches.'));
+            $this->messageManager->addErrorMessage(__('Please select searches.'));
         } else {
             try {
                 foreach ($searchIds as $searchId) {
                     $model = $this->_objectManager->create(\Magento\Search\Model\Query::class)->load($searchId);
                     $model->delete();
                 }
-                $this->messageManager->addSuccess(__('Total of %1 record(s) were deleted.', count($searchIds)));
+                $this->messageManager->addSuccessMessage(__('Total of %1 record(s) were deleted.', count($searchIds)));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
index 8565c03724c65..49805400713fc 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
 
-class NewAction extends TermController
+class NewAction extends TermController implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Forward
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
index fb4964717e565..b0ce066f12709 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Reports\Controller\Adminhtml\Index as ReportsIndexController;
 use Magento\Framework\Controller\ResultFactory;
 
-class Report extends ReportsIndexController
+class Report extends ReportsIndexController implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
index 42e9373a20fe2..39ae07f0d3531 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
@@ -5,13 +5,14 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Exception\LocalizedException;
 
-class Save extends TermController
+class Save extends TermController implements HttpPostActionInterface
 {
     /**
      * @var QueryFactory
@@ -45,12 +46,15 @@ public function execute()
                 $model->addData($data);
                 $model->setIsProcessed(0);
                 $model->save();
-                $this->messageManager->addSuccess(__('You saved the search term.'));
+                $this->messageManager->addSuccessMessage(__('You saved the search term.'));
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 return $this->proceedToEdit($data);
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while saving the search query.'));
+                $this->messageManager->addExceptionMessage(
+                    $e,
+                    __('Something went wrong while saving the search query.')
+                );
                 return $this->proceedToEdit($data);
             }
         }
diff --git a/app/code/Magento/Search/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php
index 307f4df163243..6eab0949145b7 100644
--- a/app/code/Magento/Search/Controller/Ajax/Suggest.php
+++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Search\Controller\Ajax;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Search\Model\AutocompleteInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Suggest extends Action
+class Suggest extends Action implements HttpGetActionInterface
 {
     /**
      * @var  \Magento\Search\Model\AutocompleteInterface
diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php
index acc1ce324567e..0573fe6a81a12 100644
--- a/app/code/Magento/Search/Controller/Term/Popular.php
+++ b/app/code/Magento/Search/Controller/Term/Popular.php
@@ -34,6 +34,7 @@ public function __construct(Context $context, ScopeConfigInterface $scopeConfig)
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @return \Magento\Framework\App\ResponseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function dispatch(RequestInterface $request)
     {
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index f3ad8a39de00e..e813d7342761f 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -124,7 +124,7 @@ public function getSuggestUrl()
     {
         return $this->_getUrl(
             'search/ajax/suggest',
-            ['_secure' => $this->storeManager->getStore()->isCurrentlySecure()]
+            ['_secure' => $this->_getRequest()->isSecure()]
         );
     }
 
diff --git a/app/code/Magento/Search/Model/AdapterFactory.php b/app/code/Magento/Search/Model/AdapterFactory.php
index f7ca8761171d4..917603ce57dc3 100644
--- a/app/code/Magento/Search/Model/AdapterFactory.php
+++ b/app/code/Magento/Search/Model/AdapterFactory.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Search\Model;
 
+use Magento\Framework\Search\EngineResolverInterface;
+
 /**
  * @api
  * @since 100.0.2
@@ -15,6 +17,7 @@ class AdapterFactory
      * Scope configuration
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @deprecated since it is not used anymore
      */
     protected $scopeConfig;
 
@@ -29,11 +32,13 @@ class AdapterFactory
      * Config path
      *
      * @var string
+     * @deprecated since it is not used anymore
      */
     protected $path;
 
     /**
      * Config Scope
+     * @deprecated since it is not used anymore
      */
     protected $scope;
 
@@ -44,25 +49,24 @@ class AdapterFactory
      */
     private $adapterPool;
 
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $adapters
-     * @param string $path
-     * @param string $scopeType
+     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         array $adapters,
-        $path,
-        $scopeType
+        EngineResolverInterface $engineResolver
     ) {
         $this->objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
         $this->adapterPool = $adapters;
-        $this->path = $path;
-        $this->scope = $scopeType;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -73,7 +77,7 @@ public function __construct(
      */
     public function create(array $data = [])
     {
-        $currentAdapter = $this->scopeConfig->getValue($this->path, $this->scope);
+        $currentAdapter = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->adapterPool[$currentAdapter])) {
             throw new \LogicException(
                 'There is no such adapter: ' . $currentAdapter
diff --git a/app/code/Magento/Search/Model/EngineResolver.php b/app/code/Magento/Search/Model/EngineResolver.php
index 326fe448181c8..720df0e0fda97 100644
--- a/app/code/Magento/Search/Model/EngineResolver.php
+++ b/app/code/Magento/Search/Model/EngineResolver.php
@@ -6,12 +6,14 @@
 namespace Magento\Search\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * @api
  * @since 100.1.0
  */
-class EngineResolver
+class EngineResolver implements EngineResolverInterface
 {
     /**
      * MySQL search engine
@@ -45,14 +47,28 @@ class EngineResolver
      */
     protected $scopeCode;
 
+    /**
+     * Available engines
+     * @var array
+     */
+    private $engines = [];
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
+     * @param array $engines
      * @param string $path
      * @param string $scopeType
      * @param string $scopeCode
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
+        array $engines,
+        LoggerInterface $logger,
         $path,
         $scopeType,
         $scopeCode = null
@@ -61,19 +77,33 @@ public function __construct(
         $this->path = $path;
         $this->scopeType = $scopeType;
         $this->scopeCode = $scopeCode;
+        $this->engines = $engines;
+        $this->logger = $logger;
     }
 
     /**
-     * Current Search Engine
+     * Returns Current Search Engine
+     *
+     * It returns string identifier of Search Engine that is currently chosen in configuration
+     *
      * @return string
      * @since 100.1.0
      */
     public function getCurrentSearchEngine()
     {
-        return $this->scopeConfig->getValue(
+        $engine = $this->scopeConfig->getValue(
             $this->path,
             $this->scopeType,
             $this->scopeCode
         );
+
+        if (in_array($engine, $this->engines)) {
+            return $engine;
+        } else {
+            $this->logger->error(
+                $engine . ' search engine doesn\'t exists. Falling back to ' . self::CATALOG_SEARCH_MYSQL_ENGINE
+            );
+            return self::CATALOG_SEARCH_MYSQL_ENGINE;
+        }
     }
 }
diff --git a/app/code/Magento/Search/Model/PopularSearchTerms.php b/app/code/Magento/Search/Model/PopularSearchTerms.php
new file mode 100644
index 0000000000000..d5ddc0e1dac5f
--- /dev/null
+++ b/app/code/Magento/Search/Model/PopularSearchTerms.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Search\Model;
+
+/**
+ * Popular search terms
+ */
+class PopularSearchTerms
+{
+    const XML_PATH_MAX_COUNT_CACHEABLE_SEARCH_TERMS = 'catalog/search/max_count_cacheable_search_terms';
+
+    /**
+     * Scope configuration
+     *
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Catalog search data
+     *
+     * @var \Magento\Search\Model\ResourceModel\Query\Collection
+     */
+    private $queryCollection;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Search\Model\ResourceModel\Query\Collection
+     */
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Search\Model\ResourceModel\Query\Collection $queryCollection
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->queryCollection = $queryCollection;
+    }
+
+    /**
+     * Check if is cacheable search term
+     *
+     * @param string $term
+     * @param int $storeId
+     * @return bool
+     */
+    public function isCacheable(string $term, int $storeId)
+    {
+        $terms = $this->queryCollection
+            ->setPopularQueryFilter($storeId)
+            ->setPageSize($this->getMaxCountCacheableSearchTerms($storeId))
+            ->load()
+            ->getColumnValues('query_text');
+
+        return in_array($term, $terms);
+    }
+
+    /**
+     * Retrieve maximum count cacheable search terms
+     *
+     * @param int $storeId
+     * @return int
+     */
+    private function getMaxCountCacheableSearchTerms(int $storeId)
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_MAX_COUNT_CACHEABLE_SEARCH_TERMS,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
+}
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index 404d93f76da6d..d8c92a4801e8c 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Search\Model;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Search\Model\ResourceModel\Query\Collection as QueryCollection;
 use Magento\Search\Model\ResourceModel\Query\CollectionFactory as QueryCollectionFactory;
 use Magento\Search\Model\SearchCollectionInterface as Collection;
@@ -147,6 +146,7 @@ public function getSearchCollection()
      * Retrieve collection of suggest queries
      *
      * @return QueryCollection
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getSuggestCollection()
     {
@@ -167,6 +167,7 @@ public function getSuggestCollection()
      *
      * @param string $text
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @deprecated 100.1.0 "synonym for" feature has been removed
      */
     public function loadByQuery($text)
@@ -180,6 +181,7 @@ public function loadByQuery($text)
      *
      * @param string $text
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function loadByQueryText($text)
     {
@@ -204,6 +206,7 @@ public function setStoreId($storeId)
      * Retrieve store Id
      *
      * @return int
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getStoreId()
     {
@@ -217,6 +220,7 @@ public function getStoreId()
      * Prepare save query for result
      *
      * @return $this
+     * @throws \Exception
      */
     public function prepare()
     {
@@ -264,6 +268,7 @@ public function saveNumResults($numResults)
      * Retrieve minimum query length
      *
      * @return int
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getMinQueryLength()
     {
@@ -278,6 +283,7 @@ public function getMinQueryLength()
      * Retrieve maximum query length
      *
      * @return int
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getMaxQueryLength()
     {
@@ -289,8 +295,7 @@ public function getMaxQueryLength()
     }
 
     /**
-     * @return string
-     * @codeCoverageIgnore
+     * @inheritdoc
      */
     public function getQueryText()
     {
@@ -298,6 +303,8 @@ public function getQueryText()
     }
 
     /**
+     * Check if query maximum length exceeded.
+     *
      * @return bool
      * @codeCoverageIgnore
      */
@@ -307,6 +314,8 @@ public function isQueryTextExceeded()
     }
 
     /**
+     * Check if minimum query length reached.
+     *
      * @return bool
      * @codeCoverageIgnore
      * @since 100.1.0
diff --git a/app/code/Magento/Search/Model/Search/PageSizeProvider.php b/app/code/Magento/Search/Model/Search/PageSizeProvider.php
new file mode 100644
index 0000000000000..5572bac6addc3
--- /dev/null
+++ b/app/code/Magento/Search/Model/Search/PageSizeProvider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Model\Search;
+
+/**
+ * Returns max  page size by search engine name
+ * @api
+ */
+class PageSizeProvider
+{
+    /**
+     * @var \Magento\Search\Model\EngineResolver
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $pageSizeBySearchEngine;
+
+    /**
+     * @param \Magento\Search\Model\EngineResolver $engineResolver
+     * @param array $pageSizeBySearchEngine
+     */
+    public function __construct(
+        \Magento\Search\Model\EngineResolver $engineResolver,
+        array $pageSizeBySearchEngine = []
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->pageSizeBySearchEngine = $pageSizeBySearchEngine;
+    }
+
+    /**
+     * Returns max_page_size depends on engine
+     *
+     * @return integer
+     */
+    public function getMaxPageSize() : int
+    {
+        $searchEngine = $this->engineResolver->getCurrentSearchEngine();
+
+        $pageSize = PHP_INT_MAX;
+        if (isset($this->pageSizeBySearchEngine[$searchEngine])) {
+            $pageSize = $this->pageSizeBySearchEngine[$searchEngine];
+        }
+
+        return (int)$pageSize;
+    }
+}
diff --git a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php b/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
deleted file mode 100644
index f2eee56042fc7..0000000000000
--- a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Search\Model\SearchEngine;
-
-use Magento\Backend\Model\Menu;
-use Magento\Backend\Model\Menu\Builder;
-use Magento\Framework\Search\SearchEngine\ConfigInterface;
-use Magento\Search\Model\EngineResolver;
-
-/**
- * A plugin for Magento\Backend\Model\Menu\Builder class. Implements "after" for "getResult()".
- *
- * The purpose of this plugin is to go through the menu tree and remove "Search Terms" menu item if the
- * selected search engine does not support "synonyms" feature.
- */
-class MenuBuilder
-{
-    /**
-     * A constant to refer to "Search Synonyms" menu item id from etc/adminhtml/menu.xml
-     */
-    const SEARCH_SYNONYMS_MENU_ITEM_ID = 'Magento_Search::search_synonyms';
-
-    /**
-     * @var ConfigInterface $searchFeatureConfig
-     */
-    protected $searchFeatureConfig;
-
-    /**
-     * @var EngineResolver $engineResolver
-     */
-    protected $engineResolver;
-
-    /**
-     * MenuBuilder constructor.
-     *
-     * @param ConfigInterface $searchFeatureConfig
-     * @param EngineResolver $engineResolver
-     */
-    public function __construct(
-        ConfigInterface $searchFeatureConfig,
-        EngineResolver $engineResolver
-    ) {
-        $this->searchFeatureConfig = $searchFeatureConfig;
-        $this->engineResolver = $engineResolver;
-    }
-
-    /**
-     * Removes 'Search Synonyms' from the menu if 'synonyms' is not supported
-     *
-     * @param Builder $subject
-     * @param Menu $menu
-     * @return Menu
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterGetResult(Builder $subject, Menu $menu)
-    {
-        $searchEngine = $this->engineResolver->getCurrentSearchEngine();
-        if (!$this->searchFeatureConfig
-            ->isFeatureSupported(ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS, $searchEngine)
-        ) {
-            // "Search Synonyms" feature is not supported by the current configured search engine.
-            // Menu will be updated to remove it from the list
-            $menu->remove(self::SEARCH_SYNONYMS_MENU_ITEM_ID);
-        }
-        return $menu;
-    }
-}
diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
index 6d5daf6115c0d..eea6a950d7ce5 100644
--- a/app/code/Magento/Search/Model/SynonymAnalyzer.php
+++ b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
 namespace Magento\Search\Model;
 
 use Magento\Search\Api\SynonymAnalyzerInterface;
 
+/**
+ * SynonymAnalyzer responsible for search of synonyms matching a word or a phrase.
+ */
 class SynonymAnalyzer implements SynonymAnalyzerInterface
 {
     /**
@@ -39,58 +44,126 @@ public function __construct(SynonymReader $synReader)
      * ]
      * @param string $phrase
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSynonymsForPhrase($phrase)
     {
-        $synGroups = [];
+        $result = [];
 
-        if (empty($phrase)) {
-            return $synGroups;
+        if (empty(trim($phrase))) {
+            return $result;
         }
 
-        $rows = $this->synReaderModel->loadByPhrase($phrase)->getData();
-        $synonyms = [];
-        foreach ($rows as $row) {
-            $synonyms [] = $row['synonyms'];
-        }
+        $synonymGroups = $this->getSynonymGroupsByPhrase($phrase);
+
+        // Replace multiple spaces in a row with the only one space
+        $phrase = preg_replace("/ {2,}/", " ", $phrase);
 
         // Go through every returned record looking for presence of the actual phrase. If there were no matching
         // records found in DB then create a new entry for it in the returned array
         $words = explode(' ', $phrase);
-        foreach ($words as $w) {
-            $position = $this->findInArray($w, $synonyms);
-            if ($position !== false) {
-                $synGroups[] = explode(',', $synonyms[$position]);
-            } else {
-                // No synonyms were found. Return the original word in this position
-                $synGroups[] = [$w];
+
+        foreach ($words as $offset => $word) {
+            $synonyms = [$word];
+
+            if ($synonymGroups) {
+                $pattern = $this->getSearchPattern(\array_slice($words, $offset));
+                $position = $this->findInArray($pattern, $synonymGroups);
+                if ($position !== null) {
+                    $synonyms = explode(',', $synonymGroups[$position]);
+                }
             }
+
+            $result[] = $synonyms;
         }
-        return $synGroups;
+
+        return $result;
     }
 
     /**
-     * Helper method to find the presence of $word in $wordsArray. If found, the particular array index is returned.
-     * Otherwise false will be returned.
+     * Helper method to find the matching of $pattern to $synonymGroupsToExamine.
+     * If matches, the particular array index is returned.
+     * Otherwise null will be returned.
      *
-     * @param string $word
-     * @param $array $wordsArray
-     * @return boolean | int
+     * @param string $pattern
+     * @param array $synonymGroupsToExamine
+     * @return int|null
      */
-    private function findInArray($word, $wordsArray)
+    private function findInArray(string $pattern, array $synonymGroupsToExamine)
     {
-        if (empty($wordsArray)) {
-            return false;
-        }
         $position = 0;
-        foreach ($wordsArray as $wordsLine) {
-            $pattern = '/^' . $word . ',|,' . $word . ',|,' . $word . '$/';
-            $rv = preg_match($pattern, $wordsLine);
-            if ($rv != 0) {
+        foreach ($synonymGroupsToExamine as $synonymGroup) {
+            $matchingResultCode = preg_match($pattern, $synonymGroup);
+            if ($matchingResultCode === 1) {
                 return $position;
             }
             $position++;
         }
-        return false;
+
+        return null;
+    }
+
+    /**
+     * Returns a regular expression to search for synonyms of the phrase represented as the list of words.
+     *
+     * Returned pattern contains expression to search for a part of the phrase from the beginning.
+     *
+     * For example, in the phrase "Elizabeth is the English queen" with subset from the very first word,
+     * the method will build an expression which looking for synonyms for all these patterns:
+     * - Elizabeth is the English queen
+     * - Elizabeth is the English
+     * - Elizabeth is the
+     * - Elizabeth is
+     * - Elizabeth
+     *
+     * For the same phrase on the second iteration with the first word "is" it will match for these synonyms:
+     * - is the English queen
+     * - is the English
+     * - is the
+     * - is
+     *
+     * The pattern looking for exact match and will not find these phrases as synonyms:
+     * - Is there anybody in the room?
+     * - Is the English is most popular language?
+     * - Is the English queen Elizabeth?
+     *
+     * Take into account that returned pattern expects that data will be represented as comma-separated value.
+     *
+     * @param array $words
+     * @return string
+     */
+    private function getSearchPattern(array $words): string
+    {
+        $patterns = [];
+        for ($lastItem = count($words); $lastItem > 0; $lastItem--) {
+            $phrase = implode("\s+", \array_slice($words, 0, $lastItem));
+            $patterns[] = '^' . $phrase . ',';
+            $patterns[] = ',' . $phrase . ',';
+            $patterns[] = ',' . $phrase . '$';
+        }
+
+        $pattern = '/' . implode('|', $patterns) . '/i';
+        return $pattern;
+    }
+
+    /**
+     * Get all synonym groups for the phrase
+     *
+     * Returns an array of synonyms which are represented as comma-separated value for each item in the list
+     *
+     * @param string $phrase
+     * @return string[]
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getSynonymGroupsByPhrase(string $phrase): array
+    {
+        $result = [];
+
+        /** @var array $synonymGroups */
+        $synonymGroups = $this->synReaderModel->loadByPhrase($phrase)->getData();
+        foreach ($synonymGroups as $row) {
+            $result[] = $row['synonyms'];
+        }
+        return $result;
     }
 }
diff --git a/app/code/Magento/Search/Model/SynonymGroupRepository.php b/app/code/Magento/Search/Model/SynonymGroupRepository.php
index 7b924df56a7e0..75d7049afd949 100644
--- a/app/code/Magento/Search/Model/SynonymGroupRepository.php
+++ b/app/code/Magento/Search/Model/SynonymGroupRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Search\Model;
 
 use Magento\Framework\Exception\CouldNotDeleteException;
@@ -44,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(SynonymGroupInterface $synonymGroup, $errorOnMergeConflict = false)
     {
@@ -73,7 +74,7 @@ public function delete(SynonymGroupInterface $synonymGroup)
         } catch (\Exception $exception) {
             throw new CouldNotDeleteException(
                 __(
-                    'Synonym group with id %1 cannot be deleted. %2',
+                    'The synonym group with the "%1" ID can\'t be deleted. %2',
                     $synonymGroup->getGroupId(),
                     $exception->getMessage()
                 )
@@ -105,6 +106,7 @@ public function get($synonymGroupId)
      * @param bool $errorOnMergeConflict
      * @return SynonymGroupInterface
      * @throws Synonym\MergeConflictException
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     private function create(SynonymGroupInterface $synonymGroup, $errorOnMergeConflict)
     {
@@ -143,6 +145,7 @@ private function create(SynonymGroupInterface $synonymGroup, $errorOnMergeConfli
      * @param SynonymGroupInterface $synonymGroupToMerge
      * @param array $matchingGroupIds
      * @return array
+     * @throws \Exception
      */
     private function merge(SynonymGroupInterface $synonymGroupToMerge, array $matchingGroupIds)
     {
@@ -181,6 +184,7 @@ private function populateSynonymGroupModel(SynonymGroup $modelToPopulate, Synony
      * @param bool $errorOnMergeConflict
      * @return SynonymGroupInterface
      * @throws Synonym\MergeConflictException
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     private function update(
         SynonymGroup $oldSynonymGroup,
diff --git a/app/code/Magento/Search/Model/SynonymReader.php b/app/code/Magento/Search/Model/SynonymReader.php
index 202931665f493..078a3eb178cbe 100644
--- a/app/code/Magento/Search/Model/SynonymReader.php
+++ b/app/code/Magento/Search/Model/SynonymReader.php
@@ -78,6 +78,7 @@ protected function _construct()
      *
      * @param string $phrase
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @since 100.1.0
      */
     public function loadByPhrase($phrase)
diff --git a/app/code/Magento/Search/Setup/InstallSchema.php b/app/code/Magento/Search/Setup/InstallSchema.php
deleted file mode 100644
index 5aba160381d0a..0000000000000
--- a/app/code/Magento/Search/Setup/InstallSchema.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Search\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'search_query'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('search_query'))
-            ->addColumn(
-                'query_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Query ID'
-            )
-            ->addColumn(
-                'query_text',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Query text'
-            )
-            ->addColumn(
-                'num_results',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Num results'
-            )
-            ->addColumn(
-                'popularity',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Popularity'
-            )
-            ->addColumn(
-                'redirect',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Redirect'
-            )
-            ->addColumn(
-                'synonym_for',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Synonym for'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store ID'
-            )
-            ->addColumn(
-                'display_in_terms',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['nullable' => false, 'default' => '1'],
-                'Display in terms'
-            )
-            ->addColumn(
-                'is_active',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['default' => '1'],
-                'Active status'
-            )
-            ->addColumn(
-                'is_processed',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['default' => '0'],
-                'Processed status'
-            )
-            ->addColumn(
-                'updated_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                'Updated at'
-            )
-            ->addIndex(
-                $installer->getIdxName('search_query', ['query_text', 'store_id', 'popularity']),
-                ['query_text', 'store_id', 'popularity']
-            )
-            ->addIndex(
-                $installer->getIdxName('search_query', 'store_id'),
-                'store_id'
-            )
-            ->addIndex(
-                $installer->getIdxName('search_query', 'is_processed'),
-                'is_processed'
-            )
-            ->addIndex(
-                $installer->getIdxName('search_query', 'synonym_for'),
-                'synonym_for'
-            )
-            ->addForeignKey(
-                $installer->getFkName('search_query', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Search query table');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Search/Setup/UpgradeSchema.php b/app/code/Magento/Search/Setup/UpgradeSchema.php
deleted file mode 100644
index ba725d968ca33..0000000000000
--- a/app/code/Magento/Search/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Search\Setup;
-
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $connection = $installer->getConnection();
-        if (version_compare($context->getVersion(), '2.0.1') < 0) {
-            $connection->dropIndex(
-                $setup->getTable('search_query'),
-                $installer->getIdxName('search_query', ['query_text', 'store_id'])
-            );
-            $connection->addIndex(
-                $setup->getTable('search_query'),
-                $installer->getIdxName(
-                    'search_query',
-                    ['query_text', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['query_text', 'store_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            );
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2') < 0) {
-            /**
-             * Create table 'search_synonyms'
-             */
-            $table = $connection
-                ->newTable($installer->getTable('search_synonyms'))
-                ->addColumn(
-                    'group_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                    null,
-                    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                    'Synonyms Group Id'
-                )
-                ->addColumn(
-                    'synonyms',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    65535,
-                    ['nullable' => false],
-                    'list of synonyms making up this group'
-                )
-                ->addColumn(
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    null,
-                    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                    'Store Id - identifies the store view these synonyms belong to'
-                )
-                ->addIndex(
-                    $setup->getIdxName(
-                        $installer->getTable('search_synonyms'),
-                        ['synonyms'],
-                        AdapterInterface::INDEX_TYPE_FULLTEXT
-                    ),
-                    ['synonyms'],
-                    ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT]
-                )
-                ->addIndex(
-                    $installer->getIdxName('search_synonyms', 'store_id'),
-                    ['store_id'],
-                    ['type' => AdapterInterface::INDEX_TYPE_INDEX]
-                )
-                ->addForeignKey(
-                    $installer->getFkName('search_synonyms', 'store_id', 'store', 'store_id'),
-                    'store_id',
-                    $installer->getTable('store'),
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->setComment('table storing various synonyms groups per store view');
-
-            $connection->createTable($table);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.3') < 0) {
-            // Drop and recreate 'search_synonyms' table
-            $connection->dropTable($installer->getTable('search_synonyms'));
-
-            $table = $connection
-                ->newTable($installer->getTable('search_synonyms'))
-                ->addColumn(
-                    'group_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                    null,
-                    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                    'Synonyms Group Id'
-                )
-                ->addColumn(
-                    'synonyms',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    65535,
-                    ['nullable' => false],
-                    'list of synonyms making up this group'
-                )
-                ->addColumn(
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    null,
-                    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                    'Store Id - identifies the store view these synonyms belong to'
-                )
-                ->addColumn(
-                    'website_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    null,
-                    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                    'Website Id - identifies the website id these synonyms belong to'
-                )
-                ->addIndex(
-                    $setup->getIdxName(
-                        $installer->getTable('search_synonyms'),
-                        ['synonyms'],
-                        AdapterInterface::INDEX_TYPE_FULLTEXT
-                    ),
-                    ['synonyms'],
-                    ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT]
-                )
-                ->addIndex(
-                    $installer->getIdxName('search_synonyms', 'store_id'),
-                    ['store_id'],
-                    ['type' => AdapterInterface::INDEX_TYPE_INDEX]
-                )
-                ->addIndex(
-                    $installer->getIdxName('search_synonyms', 'website_id'),
-                    ['website_id'],
-                    ['type' => AdapterInterface::INDEX_TYPE_INDEX]
-                )
-                ->addForeignKey(
-                    $installer->getFkName('search_synonyms', 'store_id', 'store', 'store_id'),
-                    'store_id',
-                    $installer->getTable('store'),
-                    'store_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->addForeignKey(
-                    $installer->getFkName('search_synonyms', 'website_id', 'store_website', 'website_id'),
-                    'website_id',
-                    $installer->getTable('store_website'),
-                    'website_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->setComment('table storing various synonyms groups');
-
-            $connection->createTable($table);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.4') < 0) {
-            $connection->dropIndex(
-                $setup->getTable('search_query'),
-                $installer->getIdxName('search_query', 'synonym_for')
-            );
-            $connection->dropColumn($setup->getTable('search_query'), 'synonym_for');
-        }
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE.txt b/app/code/Magento/Search/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE.txt
rename to app/code/Magento/Search/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE_AFL.txt b/app/code/Magento/Search/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE_AFL.txt
rename to app/code/Magento/Search/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Search/Test/Mftf/README.md b/app/code/Magento/Search/Test/Mftf/README.md
new file mode 100644
index 0000000000000..bd4bc14db41f7
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Search Functional Tests
+
+The Functional Test Module for **Magento Search** module.
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
new file mode 100644
index 0000000000000..2b08e9b4b85ec
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontQuickSearchSection">
+        <element name="searchPhrase" type="input" selector="#search"/>
+        <element name="searchButton" type="button" selector="button.action.search" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
index a7f71941dc6b2..38c78b986faf4 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
@@ -107,10 +107,10 @@ public function testDeleteAction()
         $this->repository->expects($this->once())->method('get')->with(10)->willReturn($this->synonymGroupMock);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('The synonym group has been deleted.'));
 
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())->method('setPath')->with('*/*/')->willReturnSelf();
 
@@ -124,10 +124,10 @@ public function testDeleteActionNoId()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t find a synonym group to delete.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/ResultPageBuilderTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/ResultPageBuilderTest.php
new file mode 100644
index 0000000000000..cbe62829bc973
--- /dev/null
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/ResultPageBuilderTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Search\Test\Unit\Controller\Adminhtml\Synonyms;
+
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\Search\SearchEngine\ConfigInterface;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Search\Controller\Adminhtml\Synonyms\ResultPageBuilder;
+
+class ResultPageBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var ResultPageBuilder */
+    private $model;
+
+    /** @var PageFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $resultPageFactoryMock;
+
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
+
+    /** @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $searchFeatureConfigMock;
+
+    /** @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $messageManagerMock;
+
+    protected function setUp()
+    {
+        $this->resultPageFactoryMock = $this->getMockBuilder(PageFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
+        $this->searchFeatureConfigMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->model = new ResultPageBuilder(
+            $this->resultPageFactoryMock,
+            $this->engineResolverMock,
+            $this->searchFeatureConfigMock,
+            $this->messageManagerMock
+        );
+    }
+
+    public function testBuild()
+    {
+        $currentEngine = 'current_engine';
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentEngine);
+
+        $this->searchFeatureConfigMock->expects($this->once())
+            ->method('isFeatureSupported')
+            ->with(ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS, $currentEngine)
+            ->willReturn(true);
+
+        $this->messageManagerMock->expects($this->never())
+            ->method('addNoticeMessage');
+
+        $resultPageMock = $this->getMockBuilder(Page::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultPageFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($resultPageMock);
+
+        $this->assertEquals($resultPageMock, $this->model->build());
+    }
+
+    public function testBuildWithDisabledEngine()
+    {
+        $currentEngine = 'current_engine';
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($currentEngine);
+
+        $this->searchFeatureConfigMock->expects($this->once())
+            ->method('isFeatureSupported')
+            ->with(ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS, $currentEngine)
+            ->willReturn(false);
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addNoticeMessage');
+
+        $resultPageMock = $this->getMockBuilder(Page::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultPageFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($resultPageMock);
+
+        $this->assertEquals($resultPageMock, $this->model->build());
+    }
+}
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
index efda8f52fcfe9..60cc958a6187c 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
@@ -54,7 +54,7 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess', 'addError'])
+            ->setMethods(['addSuccessMessage', 'addErrorMessage'])
             ->getMockForAbstractClass();
         $this->pageFactory = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
             ->setMethods([])
@@ -107,7 +107,7 @@ public function testExecute()
         $this->createQuery(0, 1);
         $this->createQuery(1, 2);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->will($this->returnSelf());
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php
index 09ae2c38fe525..28f4b65cd412f 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php
@@ -75,7 +75,7 @@ protected function setUp()
 
         $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess', 'addError', 'addException'])
+            ->setMethods(['addSuccessMessage', 'addErrorMessage', 'addExceptionMessage'])
             ->getMockForAbstractClass();
         $this->context->expects($this->any())
             ->method('getMessageManager')
@@ -143,7 +143,7 @@ public function testExecuteLoadQueryQueryId()
         $this->query->expects($this->once())->method('getId')->willReturn(false);
         $this->query->expects($this->once())->method('load')->with($queryId);
 
-        $this->messageManager->expects($this->once())->method('addSuccess');
+        $this->messageManager->expects($this->once())->method('addSuccessMessage');
 
         $this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
         $this->assertSame($this->redirect, $this->controller->execute());
@@ -161,7 +161,7 @@ public function testExecuteLoadQueryQueryIdQueryText()
         $this->query->expects($this->once())->method('loadByQueryText')->with($queryText);
         $this->query->expects($this->any())->method('getId')->willReturn($queryId);
 
-        $this->messageManager->expects($this->once())->method('addSuccess');
+        $this->messageManager->expects($this->once())->method('addSuccessMessage');
 
         $this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
         $this->assertSame($this->redirect, $this->controller->execute());
@@ -180,7 +180,7 @@ public function testExecuteLoadQueryQueryIdQueryText2()
         $this->query->expects($this->any())->method('getId')->willReturn(false);
         $this->query->expects($this->once())->method('load')->with($queryId);
 
-        $this->messageManager->expects($this->once())->method('addSuccess');
+        $this->messageManager->expects($this->once())->method('addSuccessMessage');
 
         $this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
         $this->assertSame($this->redirect, $this->controller->execute());
@@ -199,7 +199,7 @@ public function testExecuteLoadQueryQueryIdQueryTextException()
         $this->query->expects($this->once())->method('loadByQueryText')->with($queryText);
         $this->query->expects($this->any())->method('getId')->willReturn($anotherQueryId);
 
-        $this->messageManager->expects($this->once())->method('addError');
+        $this->messageManager->expects($this->once())->method('addErrorMessage');
         $this->session->expects($this->once())->method('setPageData');
         $this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
         $this->assertSame($this->redirect, $this->controller->execute());
@@ -216,7 +216,7 @@ public function testExecuteException()
         $this->query->expects($this->once())->method('setStoreId');
         $this->query->expects($this->once())->method('loadByQueryText')->willThrowException(new \Exception());
 
-        $this->messageManager->expects($this->once())->method('addException');
+        $this->messageManager->expects($this->once())->method('addExceptionMessage');
         $this->session->expects($this->once())->method('setPageData');
         $this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
         $this->assertSame($this->redirect, $this->controller->execute());
diff --git a/app/code/Magento/Search/Test/Unit/Helper/DataTest.php b/app/code/Magento/Search/Test/Unit/Helper/DataTest.php
index 5cfde7e8efda9..1f9aad8d4316d 100644
--- a/app/code/Magento/Search/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Search/Test/Unit/Helper/DataTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Search\Test\Unit\Helper;
 
 /**
@@ -43,6 +44,11 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     protected $storeManagerMock;
 
+    /**
+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlBuilderMock;
+
     protected function setUp()
     {
         $this->stringMock = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
@@ -53,9 +59,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
+        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->setMethods(['getUrl'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $this->contextMock = $this->createMock(\Magento\Framework\App\Helper\Context::class);
         $this->contextMock->expects($this->any())->method('getScopeConfig')->willReturn($this->scopeConfigMock);
         $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
+        $this->contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
 
         $this->model = new \Magento\Search\Helper\Data(
             $this->contextMock,
@@ -116,6 +127,9 @@ public function testGetEscapedQueryText($queryText, $maxQueryLength, $expected)
         $this->assertEquals($expected, $this->model->getEscapedQueryText());
     }
 
+    /**
+     * @return array
+     */
     public function queryTextDataProvider()
     {
         return [
@@ -126,4 +140,39 @@ public function queryTextDataProvider()
             ['testtest', 7, 'testtes'],
         ];
     }
+
+    /**
+     * Test getSuggestUrl() take into consideration type of request(secure, non-secure).
+     *
+     * @dataProvider getSuggestUrlDataProvider
+     * @param bool $isSecure
+     * @return void
+     */
+    public function testGetSuggestUrl(bool $isSecure)
+    {
+        $this->requestMock->expects(self::once())
+            ->method('isSecure')
+            ->willReturn($isSecure);
+        $this->urlBuilderMock->expects(self::once())
+            ->method('getUrl')
+            ->with(self::identicalTo('search/ajax/suggest'), self::identicalTo(['_secure' => $isSecure]));
+        $this->model->getSuggestUrl();
+    }
+
+    /**
+     * Provide test data for testGetSuggestUrl() test.
+     *
+     * @return array
+     */
+    public function getSuggestUrlDataProvider()
+    {
+        return [
+            'non-secure' => [
+                'isSecure' => false,
+            ],
+            'secure' => [
+                'secure' => true,
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Search/Test/Unit/Model/AdapterFactoryTest.php b/app/code/Magento/Search/Test/Unit/Model/AdapterFactoryTest.php
index cbee2414f522f..e48c8e69ef819 100644
--- a/app/code/Magento/Search/Test/Unit/Model/AdapterFactoryTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/AdapterFactoryTest.php
@@ -5,56 +5,44 @@
  */
 namespace Magento\Search\Test\Unit\Model;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\AdapterFactory;
 
 class AdapterFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Search\Model\AdapterFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $adapterFactory;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface |\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerInterface |\PHPUnit_Framework_MockObject_MockObject
      */
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $helper;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $scopeConfig;
+    private $engineResolverMock;
 
     protected function setUp()
     {
-        $this->helper = new ObjectManager($this);
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
 
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->objectManager = $this->createMock(ObjectManagerInterface::class);
 
-        $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-
-        $this->adapterFactory = $this->helper->getObject(
-            \Magento\Search\Model\AdapterFactory::class,
-            [
-                'objectManager' => $this->objectManager,
-                'scopeConfig' => $this->scopeConfig,
-                'path' => 'some_path',
-                'scopeType' => 'some_scopeType',
-                'adapters' => ['ClassName' => 'ClassName']
-            ]
+        $this->adapterFactory = new AdapterFactory(
+            $this->objectManager,
+            ['ClassName' => 'ClassName'],
+            $this->engineResolverMock
         );
     }
 
     public function testCreate()
     {
-        $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType'))
+        $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine')
             ->will($this->returnValue('ClassName'));
 
         $adapter = $this->getMockBuilder(\Magento\Framework\Search\AdapterInterface::class)
@@ -74,8 +62,7 @@ public function testCreate()
      */
     public function testCreateExceptionThrown()
     {
-        $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType'))
+        $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine')
             ->will($this->returnValue('ClassName'));
 
         $this->objectManager->expects($this->once())->method('create')
@@ -90,8 +77,7 @@ public function testCreateExceptionThrown()
      */
     public function testCreateLogicException()
     {
-        $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType'))
+        $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine')
             ->will($this->returnValue('Class'));
 
         $this->adapterFactory->create(['input']);
diff --git a/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php b/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php
index 9c384f783bf7a..1501030f1d0a4 100755
--- a/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Search\Model\EngineResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Psr\Log\LoggerInterface;
 
 class EngineResolverTest extends \PHPUnit\Framework\TestCase
 {
@@ -18,22 +19,32 @@ class EngineResolverTest extends \PHPUnit\Framework\TestCase
     /**
      * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeConfig;
+    private $scopeConfig;
 
     /**
      * @var string|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $path;
+    private $path;
 
     /**
      * @var string|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeType;
+    private $scopeType;
 
     /**
      * @var null|string|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeCode;
+    private $scopeCode;
+
+    /**
+     * @var string[]
+     */
+    private $engines = [];
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
 
     /**
      * Setup
@@ -45,13 +56,18 @@ protected function setUp()
         $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
 
         $this->path = 'catalog/search/engine';
         $this->scopeType = 'default';
         $this->scopeCode = null;
+        $this->engines = [EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE, 'anotherengine'];
 
         $this->model = new EngineResolver(
             $this->scopeConfig,
+            $this->engines,
+            $this->loggerMock,
             $this->path,
             $this->scopeType,
             $this->scopeCode
@@ -63,7 +79,7 @@ protected function setUp()
      */
     public function testGetCurrentSearchEngine()
     {
-        $engine = 'mysql';
+        $engine = 'anotherengine';
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
@@ -71,4 +87,25 @@ public function testGetCurrentSearchEngine()
 
         $this->assertEquals($engine, $this->model->getCurrentSearchEngine());
     }
+
+    /**
+     * Test getCurrentSearchEngine
+     */
+    public function testGetCurrentSearchEngineWithoutEngine()
+    {
+        $engine = 'nonexistentengine';
+
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn($engine);
+
+        $this->loggerMock->expects($this->any())
+            ->method('error')
+            ->with(
+                $engine . ' search engine doesn\'t exists. Falling back to '
+                . EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE
+            );
+
+        $this->assertEquals(EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE, $this->model->getCurrentSearchEngine());
+    }
 }
diff --git a/app/code/Magento/Search/Test/Unit/Model/PopularSearchTermsTest.php b/app/code/Magento/Search/Test/Unit/Model/PopularSearchTermsTest.php
new file mode 100644
index 0000000000000..849a0c067d459
--- /dev/null
+++ b/app/code/Magento/Search/Test/Unit/Model/PopularSearchTermsTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Test\Unit\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Search\Model\PopularSearchTerms;
+use Magento\Search\Model\ResourceModel\Query\Collection;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * @covers \Magento\Search\Model\PopularSearchTerms
+ */
+class PopularSearchTermsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var PopularSearchTerms
+     */
+    private $popularSearchTerms;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queryCollectionMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->queryCollectionMock = $this->createMock(Collection::class);
+        $this->popularSearchTerms = new PopularSearchTerms($this->scopeConfigMock, $this->queryCollectionMock);
+    }
+
+    /**
+     * Test isCacheableDataProvider method
+     *
+     * @dataProvider isCacheableDataProvider
+     *
+     * @param string $term
+     * @param array $terms
+     * @param $expected $terms
+     *
+     * @return void
+     */
+    public function testIsCacheable($term, $terms, $expected)
+    {
+        $storeId = 7;
+        $pageSize = 25;
+
+        $this->scopeConfigMock->expects($this->once())->method('getValue')
+            ->with(
+                PopularSearchTerms::XML_PATH_MAX_COUNT_CACHEABLE_SEARCH_TERMS,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            )->willReturn($pageSize);
+        $this->queryCollectionMock->expects($this->once())->method('setPopularQueryFilter')->with($storeId)
+            ->willReturnSelf();
+        $this->queryCollectionMock->expects($this->once())->method('setPageSize')->with($pageSize)
+            ->willReturnSelf();
+        $this->queryCollectionMock->expects($this->once())->method('load')->willReturnSelf();
+        $this->queryCollectionMock->expects($this->once())->method('getColumnValues')->with('query_text')
+            ->willReturn($terms);
+
+        $actual = $this->popularSearchTerms->isCacheable($term, $storeId);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function isCacheableDataProvider()
+    {
+        return [
+            ['test01', [], false],
+            ['test02', ['test01', 'test02'], true],
+            ['test03', ['test01', 'test02'], false],
+            ['test04', ['test04'], true],
+        ];
+    }
+}
diff --git a/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
new file mode 100644
index 0000000000000..982d00bd9f648
--- /dev/null
+++ b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Test\Unit\Model\Search;
+
+use Magento\Search\Model\Search\PageSizeProvider;
+
+class PageSizeProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PageSizeProvider
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Search\Model\EngineResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pageSizeBySearchEngineMock;
+
+    public function setUp()
+    {
+        $this->pageSizeBySearchEngineMock = $this->getMockBuilder(\Magento\Search\Model\EngineResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new PageSizeProvider(
+
+            $this->pageSizeBySearchEngineMock,
+            ['search' => 10,
+                'catalogSearch3' => 11
+            ]
+        );
+    }
+
+    /**
+     * @param string $searchEngine
+     * @param int $size
+     * @dataProvider getPageSizeDataProvider
+     */
+    public function testGetPageSize($searchEngine, $size)
+    {
+        $this->pageSizeBySearchEngineMock
+            ->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($searchEngine);
+        $this->assertEquals($size, $this->model->getMaxPageSize());
+    }
+
+    public function getPageSizeDataProvider()
+    {
+        return [
+            ['search', 10],
+            ['catalogSearch3', 11],
+            ['newSearch', PHP_INT_MAX]
+        ];
+    }
+}
diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
deleted file mode 100644
index 8e51631976bd8..0000000000000
--- a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Search\Test\Unit\Model\SearchEngine;
-
-use Magento\Backend\Model\Menu;
-use Magento\Backend\Model\Menu\Builder;
-use Magento\Framework\Search\SearchEngine\ConfigInterface;
-use Magento\Search\Model\EngineResolver;
-
-/**
- * Class MenuBuilderTest. A unit test class to test functionality of
- * Magento\Search\Model\SearchEngine\MenuBuilder class
- */
-class MenuBuilderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $searchFeatureConfig;
-
-    /**
-     * @var EngineResolver|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $engineResolver;
-
-    protected function setUp()
-    {
-        $this->searchFeatureConfig = $this->createMock(\Magento\Search\Model\SearchEngine\Config::class);
-        $this->engineResolver = $this->createMock(\Magento\Search\Model\EngineResolver::class);
-    }
-
-    public function testAfterGetResult()
-    {
-        $this->engineResolver->expects($this->once())->method('getCurrentSearchEngine')->willReturn('mysql');
-        $this->searchFeatureConfig
-            ->expects($this->once())
-            ->method('isFeatureSupported')
-            ->with('synonyms', 'mysql')
-            ->willReturn(false);
-        /** @var \Magento\Backend\Model\Menu $menu */
-        $menu = $this->createMock(\Magento\Backend\Model\Menu::class);
-        $menu->expects($this->once())->method('remove')->willReturn(true);
-
-        /** @var \Magento\Backend\Model\Menu\Builder $menuBuilder */
-        $menuBuilder = $this->createMock(\Magento\Backend\Model\Menu\Builder::class);
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        /** @var \Magento\Search\Model\SearchEngine\MenuBuilder $searchMenuBuilder */
-        $searchMenuBuilder = $objectManager->getObject(
-            \Magento\Search\Model\SearchEngine\MenuBuilder::class,
-            [
-                'searchFeatureConfig' => $this->searchFeatureConfig,
-                'engineResolver' => $this->engineResolver
-            ]
-        );
-        $this->assertInstanceOf(
-            \Magento\Backend\Model\Menu::class,
-            $searchMenuBuilder->afterGetResult($menuBuilder, $menu)
-        );
-    }
-}
diff --git a/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php b/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
new file mode 100644
index 0000000000000..c452ab506a138
--- /dev/null
+++ b/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Class SynonymAnalyzerTest
+ */
+class SynonymAnalyzerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Search\Model\SynonymAnalyzer
+     */
+    private $synonymAnalyzer;
+
+    /**
+     * @var \Magento\Search\Model\SynonymReader |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $synReaderModel;
+
+    /**
+     * Test set up
+     */
+    protected function setUp()
+    {
+        $helper = new ObjectManager($this);
+
+        $this->synReaderModel = $this->getMockBuilder(\Magento\Search\Model\SynonymReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->synonymAnalyzer = $helper->getObject(
+            \Magento\Search\Model\SynonymAnalyzer::class,
+            [
+                'synReader' => $this->synReaderModel,
+            ]
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function testGetSynonymsForPhrase()
+    {
+        $phrase = 'Elizabeth is the british queen';
+        $expected = [
+            0 => [ 0 => "Elizabeth" ],
+            1 => [ 0 => "is" ],
+            2 => [ 0 => "the" ],
+            3 => [ 0 => "british", 1 => "english" ],
+            4 => [ 0 => "queen", 1 => "monarch" ],
+        ];
+        $this->synReaderModel->expects($this->once())
+            ->method('loadByPhrase')
+            ->with($phrase)
+            ->willReturnSelf()
+        ;
+        $this->synReaderModel->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                ['synonyms' => 'british,english'],
+                ['synonyms' => 'queen,monarch'],
+            ])
+        ;
+
+        $actual = $this->synonymAnalyzer->getSynonymsForPhrase($phrase);
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @test
+     *
+     * Empty phrase scenario
+     */
+    public function testGetSynonymsForPhraseEmptyPhrase()
+    {
+        $phrase = '';
+        $expected = [];
+        $actual = $this->synonymAnalyzer->getSynonymsForPhrase($phrase);
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php b/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
index f62c07b149c0e..4532479c482b5 100644
--- a/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
@@ -53,7 +53,7 @@ public function testSaveCreate()
 
     /**
      * @expectedException \Magento\Search\Model\Synonym\MergeConflictException
-     * @expecteExceptionMessage (c,d,e)
+     * @expectedExceptionMessage Merge conflict with existing synonym group(s): (a,b,c)
      */
     public function testSaveCreateMergeConflict()
     {
@@ -138,7 +138,7 @@ public function testSaveUpdate()
 
     /**
      * @expectedException \Magento\Search\Model\Synonym\MergeConflictException
-     * @expecteExceptionMessage (d,h,i)
+     * @expectedExceptionMessage (d,h,i)
      */
     public function testSaveUpdateMergeConflict()
     {
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php b/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php
index 1a66d9242b343..405042f2e7825 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php
@@ -46,6 +46,7 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -62,6 +63,7 @@ public function prepareDataSource(array $dataSource)
      *
      * @param array $item
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function prepareItem(array $item)
     {
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php b/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php
index 216e0b3877ddb..78fd4b9c36a80 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php
@@ -47,6 +47,7 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -63,6 +64,7 @@ public function prepareDataSource(array $dataSource)
      *
      * @param array $item
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function prepareItem(array $item)
     {
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 192e2c843a7b8..067d1bf2f7dfd 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -5,16 +5,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog-search": "100.3.*",
-        "magento/module-reports": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-reports": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Search/etc/db_schema.xml b/app/code/Magento/Search/etc/db_schema.xml
new file mode 100644
index 0000000000000..754af7d246d6d
--- /dev/null
+++ b/app/code/Magento/Search/etc/db_schema.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="search_query" resource="default" engine="innodb" comment="Search query table">
+        <column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Query ID"/>
+        <column xsi:type="varchar" name="query_text" nullable="true" length="255" comment="Query text"/>
+        <column xsi:type="int" name="num_results" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Num results"/>
+        <column xsi:type="int" name="popularity" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Popularity"/>
+        <column xsi:type="varchar" name="redirect" nullable="true" length="255" comment="Redirect"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store ID"/>
+        <column xsi:type="smallint" name="display_in_terms" padding="6" unsigned="false" nullable="false"
+                identity="false" default="1" comment="Display in terms"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="true" identity="false"
+                default="1" comment="Active status"/>
+        <column xsi:type="smallint" name="is_processed" padding="6" unsigned="false" nullable="true" identity="false"
+                default="0" comment="Processed status"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated at"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="query_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SEARCH_QUERY_STORE_ID_STORE_STORE_ID" table="search_query"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID">
+            <column name="query_text"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY" indexType="btree">
+            <column name="query_text"/>
+            <column name="store_id"/>
+            <column name="popularity"/>
+        </index>
+        <index referenceId="SEARCH_QUERY_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SEARCH_QUERY_IS_PROCESSED" indexType="btree">
+            <column name="is_processed"/>
+        </index>
+    </table>
+    <table name="search_synonyms" resource="default" engine="innodb" comment="table storing various synonyms groups">
+        <column xsi:type="bigint" name="group_id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Synonyms Group Id"/>
+        <column xsi:type="text" name="synonyms" nullable="false" comment="list of synonyms making up this group"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id - identifies the store view these synonyms belong to"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id - identifies the website id these synonyms belong to"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="group_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SEARCH_SYNONYMS_STORE_ID_STORE_STORE_ID" table="search_synonyms"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID"
+                    table="search_synonyms" column="website_id" referenceTable="store_website"
+                    referenceColumn="website_id" onDelete="CASCADE"/>
+        <index referenceId="SEARCH_SYNONYMS_SYNONYMS" indexType="fulltext">
+            <column name="synonyms"/>
+        </index>
+        <index referenceId="SEARCH_SYNONYMS_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="SEARCH_SYNONYMS_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Search/etc/db_schema_whitelist.json b/app/code/Magento/Search/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..71adbc68887d0
--- /dev/null
+++ b/app/code/Magento/Search/etc/db_schema_whitelist.json
@@ -0,0 +1,46 @@
+{
+    "search_query": {
+        "column": {
+            "query_id": true,
+            "query_text": true,
+            "num_results": true,
+            "popularity": true,
+            "redirect": true,
+            "synonym_for": true,
+            "store_id": true,
+            "display_in_terms": true,
+            "is_active": true,
+            "is_processed": true,
+            "updated_at": true
+        },
+        "index": {
+            "SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY": true,
+            "SEARCH_QUERY_STORE_ID": true,
+            "SEARCH_QUERY_IS_PROCESSED": true,
+            "SEARCH_QUERY_SYNONYM_FOR": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SEARCH_QUERY_STORE_ID_STORE_STORE_ID": true,
+            "SEARCH_QUERY_QUERY_TEXT_STORE_ID": true
+        }
+    },
+    "search_synonyms": {
+        "column": {
+            "group_id": true,
+            "synonyms": true,
+            "store_id": true,
+            "website_id": true
+        },
+        "index": {
+            "SEARCH_SYNONYMS_SYNONYMS": true,
+            "SEARCH_SYNONYMS_STORE_ID": true,
+            "SEARCH_SYNONYMS_WEBSITE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SEARCH_SYNONYMS_STORE_ID_STORE_STORE_ID": true,
+            "SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Search/etc/di.xml b/app/code/Magento/Search/etc/di.xml
index 5a10e3787e4fb..4aa211d23f0a2 100755
--- a/app/code/Magento/Search/etc/di.xml
+++ b/app/code/Magento/Search/etc/di.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Search\Api\SearchInterface" type="Magento\Search\Model\Search"/>
+    <preference for="Magento\Framework\Search\EngineResolverInterface" type="Magento\Search\Model\EngineResolver"/>
     <type name="Magento\Framework\Module\Setup\Migration">
         <arguments>
             <argument name="compositeModules" xsi:type="array">
@@ -36,6 +37,9 @@
         <arguments>
             <argument name="path" xsi:type="string">catalog/search/engine</argument>
             <argument name="scopeType" xsi:type="string">default</argument>
+            <argument name="engines" xsi:type="array">
+                <item name="mysql" xsi:type="string">mysql</item>
+            </argument>
         </arguments>
     </type>
     <preference for="Magento\Search\Model\AutocompleteInterface" type="Magento\Search\Model\Autocomplete" />
@@ -82,7 +86,4 @@
             <argument name="dataStorage" xsi:type="object">Magento\Search\Model\SearchEngine\Config\Data</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Menu\Builder">
-        <plugin name="SearchTermMenuBuilder" type="Magento\Search\Model\SearchEngine\MenuBuilder" />
-    </type>
 </config>
diff --git a/app/code/Magento/Search/etc/module.xml b/app/code/Magento/Search/etc/module.xml
index 12c5591109591..2acbc54254eb0 100644
--- a/app/code/Magento/Search/etc/module.xml
+++ b/app/code/Magento/Search/etc/module.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Search" setup_version="2.0.4">
+    <module name="Magento_Search" >
         <sequence>
             <module name="Magento_Backend" />
         </sequence>
diff --git a/app/code/Magento/Search/i18n/pt_BR.csv b/app/code/Magento/Search/i18n/pt_BR.csv
index 8b4b04aa3b9ec..c10566a7c9800 100644
--- a/app/code/Magento/Search/i18n/pt_BR.csv
+++ b/app/code/Magento/Search/i18n/pt_BR.csv
@@ -1 +1 @@
-"Search Engine","Search Engine"
+"Search Engine","Mecanismo de Busca"
diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js
index c38cba4315eac..d945944daa1b0 100644
--- a/app/code/Magento/Search/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Search/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            quickSearch: 'Magento_Search/form-mini'
+            quickSearch: 'Magento_Search/js/form-mini',
+            'Magento_Search/form-mini': 'Magento_Search/js/form-mini'
         }
     }
 };
diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
index c4297b404717c..2ea87be13d5e3 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -9,7 +9,7 @@
 <?php
 /** @var $block \Magento\Framework\View\Element\Template */
 /** @var $helper \Magento\Search\Helper\Data */
-$helper = $this->helper('Magento\Search\Helper\Data');
+$helper = $this->helper(\Magento\Search\Helper\Data::class);
 ?>
 <div class="block block-search">
     <div class="block block-title"><strong><?= /* @escapeNotVerified */ __('Search') ?></strong></div>
@@ -23,7 +23,7 @@ $helper = $this->helper('Magento\Search\Helper\Data');
                     <input id="search"
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
-                                "url":"<?= /* @escapeNotVerified */ $block->getUrl('search/ajax/suggest', ['_secure' => $block->getRequest()->isSecure()]) ?>",
+                                "url":"<?= /* @escapeNotVerified */ $helper->getSuggestUrl()?>",
                                 "destinationSelector":"#search_autocomplete"}
                            }'
                            type="text"
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
similarity index 75%
rename from app/code/Magento/Search/view/frontend/web/form-mini.js
rename to app/code/Magento/Search/view/frontend/web/js/form-mini.js
index 7b2c7003074cb..15bcf2e73393e 100644
--- a/app/code/Magento/Search/view/frontend/web/form-mini.js
+++ b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
@@ -43,7 +43,8 @@ define([
                 '</li>',
             submitBtn: 'button[type="submit"]',
             searchLabel: '[data-role=minisearch-label]',
-            isExpandable: null
+            isExpandable: null,
+            suggestionDelay: 300
         },
 
         /** @inheritdoc */
@@ -55,7 +56,7 @@ define([
             this.autoComplete = $(this.options.destinationSelector);
             this.searchForm = $(this.options.formSelector);
             this.submitBtn = this.searchForm.find(this.options.submitBtn)[0];
-            this.searchLabel = $(this.options.searchLabel);
+            this.searchLabel = this.searchForm.find(this.options.searchLabel);
             this.isExpandable = this.options.isExpandable;
 
             _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit');
@@ -98,14 +99,17 @@ define([
                 }, this), 250);
             }, this));
 
-            this.element.trigger('blur');
+            if (this.element.get(0) === document.activeElement) {
+                this.setActiveState(true);
+            }
 
             this.element.on('focus', this.setActiveState.bind(this, true));
             this.element.on('keydown', this._onKeyDown);
-            this.element.on('input propertychange', this._onPropertyChange);
+            // Prevent spamming the server with requests by waiting till the user has stopped typing for period of time
+            this.element.on('input propertychange', _.debounce(this._onPropertyChange, this.options.suggestionDelay));
 
-            this.searchForm.on('submit', $.proxy(function () {
-                this._onSubmit();
+            this.searchForm.on('submit', $.proxy(function (e) {
+                this._onSubmit(e);
                 this._updateAriaHasPopup(false);
             }, this));
         },
@@ -204,13 +208,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:
@@ -220,6 +228,7 @@ define([
 
                 case $.ui.keyCode.ENTER:
                     this.searchForm.trigger('submit');
+                    e.preventDefault();
                     break;
 
                 case $.ui.keyCode.DOWN:
@@ -286,46 +295,56 @@ define([
                 $.getJSON(this.options.url, {
                     q: value
                 }, $.proxy(function (data) {
-                    $.each(data, function (index, element) {
-                        var html;
-
-                        element.index = index;
-                        html = template({
-                            data: element
+                    if (data.length) {
+                        $.each(data, function (index, element) {
+                            var html;
+
+                            element.index = index;
+                            html = template({
+                                data: element
+                            });
+                            dropdown.append(html);
                         });
-                        dropdown.append(html);
-                    });
-                    this.responseList.indexList = this.autoComplete.html(dropdown)
-                        .css(clonePosition)
-                        .show()
-                        .find(this.options.responseFieldElements + ':visible');
-
-                    this._resetResponseList(false);
-                    this.element.removeAttr('aria-activedescendant');
-
-                    if (this.responseList.indexList.length) {
-                        this._updateAriaHasPopup(true);
+
+                        this._resetResponseList(true);
+
+                        this.responseList.indexList = this.autoComplete.html(dropdown)
+                            .css(clonePosition)
+                            .show()
+                            .find(this.options.responseFieldElements + ':visible');
+
+                        this.element.removeAttr('aria-activedescendant');
+
+                        if (this.responseList.indexList.length) {
+                            this._updateAriaHasPopup(true);
+                        } else {
+                            this._updateAriaHasPopup(false);
+                        }
+
+                        this.responseList.indexList
+                            .on('click', function (e) {
+                                this.responseList.selected = $(e.currentTarget);
+                                this.searchForm.trigger('submit');
+                            }.bind(this))
+                            .on('mouseenter mouseleave', function (e) {
+                                this.responseList.indexList.removeClass(this.options.selectClass);
+                                $(e.target).addClass(this.options.selectClass);
+                                this.responseList.selected = $(e.target);
+                                this.element.attr('aria-activedescendant', $(e.target).attr('id'));
+                            }.bind(this))
+                            .on('mouseout', function (e) {
+                                if (!this._getLastElement() &&
+                                    this._getLastElement().hasClass(this.options.selectClass)) {
+                                    $(e.target).removeClass(this.options.selectClass);
+                                    this._resetResponseList(false);
+                                }
+                            }.bind(this));
                     } else {
+                        this._resetResponseList(true);
+                        this.autoComplete.hide();
                         this._updateAriaHasPopup(false);
+                        this.element.removeAttr('aria-activedescendant');
                     }
-
-                    this.responseList.indexList
-                        .on('click', function (e) {
-                            this.responseList.selected = $(e.currentTarget);
-                            this.searchForm.trigger('submit');
-                        }.bind(this))
-                        .on('mouseenter mouseleave', function (e) {
-                            this.responseList.indexList.removeClass(this.options.selectClass);
-                            $(e.target).addClass(this.options.selectClass);
-                            this.responseList.selected = $(e.target);
-                            this.element.attr('aria-activedescendant', $(e.target).attr('id'));
-                        }.bind(this))
-                        .on('mouseout', function (e) {
-                            if (!this._getLastElement() && this._getLastElement().hasClass(this.options.selectClass)) {
-                                $(e.target).removeClass(this.options.selectClass);
-                                this._resetResponseList(false);
-                            }
-                        }.bind(this));
                 }, this));
             } else {
                 this._resetResponseList(true);
diff --git a/app/code/Magento/Security/Block/Adminhtml/Session/Activity.php b/app/code/Magento/Security/Block/Adminhtml/Session/Activity.php
index a7a891d688849..bd85697330875 100644
--- a/app/code/Magento/Security/Block/Adminhtml/Session/Activity.php
+++ b/app/code/Magento/Security/Block/Adminhtml/Session/Activity.php
@@ -88,7 +88,7 @@ public function getRemoteIp()
     }
 
     /**
-     * Retrieve formatting datatime
+     * Retrieve formatting datetime
      *
      * @param   string $time
      * @return  string
diff --git a/app/code/Magento/Security/Controller/Adminhtml/Session/LogoutAll.php b/app/code/Magento/Security/Controller/Adminhtml/Session/LogoutAll.php
index c533e740b2251..35d8f22d84d51 100644
--- a/app/code/Magento/Security/Controller/Adminhtml/Session/LogoutAll.php
+++ b/app/code/Magento/Security/Controller/Adminhtml/Session/LogoutAll.php
@@ -38,11 +38,11 @@ public function execute()
     {
         try {
             $this->sessionsManager->logoutOtherUserSessions();
-            $this->messageManager->addSuccess(__('All other open sessions for this account were terminated.'));
+            $this->messageManager->addSuccessMessage(__('All other open sessions for this account were terminated.'));
         } 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 logout because of an error."));
+            $this->messageManager->addExceptionMessage($e, __("We couldn't logout because of an error."));
         }
         $this->_redirect('*/*/activity');
     }
diff --git a/app/code/Magento/Security/Model/AdminSessionInfo.php b/app/code/Magento/Security/Model/AdminSessionInfo.php
index 1aeb1b671c5cf..77d864965baca 100644
--- a/app/code/Magento/Security/Model/AdminSessionInfo.php
+++ b/app/code/Magento/Security/Model/AdminSessionInfo.php
@@ -164,7 +164,7 @@ public function isOtherSessionsTerminated()
      * Setter for isOtherSessionsTerminated
      *
      * @param bool $isOtherSessionsTerminated
-     * @return this
+     * @return $this
      * @since 100.1.0
      */
     public function setIsOtherSessionsTerminated($isOtherSessionsTerminated)
diff --git a/app/code/Magento/Security/Model/AdminSessionsManager.php b/app/code/Magento/Security/Model/AdminSessionsManager.php
index 4ebdcc58240a1..7503fe04ba480 100644
--- a/app/code/Magento/Security/Model/AdminSessionsManager.php
+++ b/app/code/Magento/Security/Model/AdminSessionsManager.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Security\Model;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
@@ -66,6 +67,14 @@ class AdminSessionsManager
      */
     private $remoteAddress;
 
+    /**
+     * Max lifetime for session prolong to be valid (sec)
+     *
+     * Means that after session was prolonged
+     * all other prolongs will be ignored within this period
+     */
+    private $maxIntervalBetweenConsecutiveProlongs = 60;
+
     /**
      * @param ConfigInterface $securityConfig
      * @param \Magento\Backend\Model\Auth\Session $authSession
@@ -124,11 +133,16 @@ public function processLogin()
      */
     public function processProlong()
     {
-        $this->getCurrentSession()->setData(
-            'updated_at',
-            $this->authSession->getUpdatedAt()
-        );
-        $this->getCurrentSession()->save();
+        if ($this->lastProlongIsOldEnough()) {
+            $this->getCurrentSession()->setData(
+                'updated_at',
+                date(
+                    \Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT,
+                    $this->authSession->getUpdatedAt()
+                )
+            );
+            $this->getCurrentSession()->save();
+        }
 
         return $this;
     }
@@ -192,7 +206,7 @@ public function getLogoutReasonMessageByStatus($statusCode)
                 break;
             case self::LOGOUT_REASON_USER_LOCKED:
                 $reasonMessage = __(
-                    'Your account is temporarily disabled.'
+                    'Your account is temporarily disabled. Please try again later.'
                 );
                 break;
             default:
@@ -298,4 +312,45 @@ protected function createAdminSessionInfoCollection()
     {
         return $this->adminSessionInfoCollectionFactory->create();
     }
+
+    /**
+     * Calculates diff between now and last session updated_at
+     * and decides whether new prolong must be triggered or not
+     *
+     * This is done to limit amount of session prolongs and updates to database
+     * within some period of time - X
+     * X - is calculated in getIntervalBetweenConsecutiveProlongs()
+     *
+     * @see getIntervalBetweenConsecutiveProlongs()
+     * @return bool
+     */
+    private function lastProlongIsOldEnough()
+    {
+        $lastProlongTimestamp = strtotime($this->getCurrentSession()->getUpdatedAt());
+        $nowTimestamp = $this->authSession->getUpdatedAt();
+
+        $diff = $nowTimestamp - $lastProlongTimestamp;
+
+        return (float) $diff > $this->getIntervalBetweenConsecutiveProlongs();
+    }
+
+    /**
+     * Calculates lifetime for session prolong to be valid
+     *
+     * Calculation is based on admin session lifetime
+     * Calculated result is in seconds and is in the interval
+     * between 1 (including) and MAX_INTERVAL_BETWEEN_CONSECUTIVE_PROLONGS (including)
+     *
+     * @return float
+     */
+    private function getIntervalBetweenConsecutiveProlongs()
+    {
+        return (float) max(
+            1,
+            min(
+                4 * log((float)$this->securityConfig->getAdminSessionLifetime()),
+                $this->maxIntervalBetweenConsecutiveProlongs
+            )
+        );
+    }
 }
diff --git a/app/code/Magento/Security/Model/Plugin/AuthSession.php b/app/code/Magento/Security/Model/Plugin/AuthSession.php
index abec4dc7c29ef..01203caaa31cd 100644
--- a/app/code/Magento/Security/Model/Plugin/AuthSession.php
+++ b/app/code/Magento/Security/Model/Plugin/AuthSession.php
@@ -82,7 +82,7 @@ private function addUserLogoutNotification()
                 $this->sessionsManager->getCurrentSession()->getStatus()
             );
         } elseif ($message = $this->sessionsManager->getLogoutReasonMessage()) {
-            $this->messageManager->addError($message);
+            $this->messageManager->addErrorMessage($message);
         }
 
         return $this;
diff --git a/app/code/Magento/Security/Model/Plugin/LoginController.php b/app/code/Magento/Security/Model/Plugin/LoginController.php
index ab9c6e2857bce..ba1a18c4f0c06 100644
--- a/app/code/Magento/Security/Model/Plugin/LoginController.php
+++ b/app/code/Magento/Security/Model/Plugin/LoginController.php
@@ -53,7 +53,7 @@ public function beforeExecute(Login $login)
     {
         $logoutReasonCode = $this->securityCookie->getLogoutReasonCookie();
         if ($this->isLoginForm($login) && $logoutReasonCode >= 0) {
-            $this->messageManager->addError(
+            $this->messageManager->addErrorMessage(
                 $this->sessionsManager->getLogoutReasonMessageByStatus($logoutReasonCode)
             );
             $this->securityCookie->deleteLogoutReasonCookie();
diff --git a/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php b/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php
index efb5749ba16f0..334449d74d195 100644
--- a/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php
+++ b/app/code/Magento/Security/Model/ResourceModel/AdminSessionInfo.php
@@ -42,7 +42,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Security\Setup\InstallSchema::ADMIN_SESSIONS_DB_TABLE_NAME, 'id');
+        $this->_init('admin_user_session', 'id');
     }
 
     /**
diff --git a/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php b/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php
index e012ca9fe9bc3..ba1af428316d5 100644
--- a/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php
+++ b/app/code/Magento/Security/Model/ResourceModel/PasswordResetRequestEvent.php
@@ -37,7 +37,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Security\Setup\InstallSchema::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME, 'id');
+        $this->_init('password_reset_request_event', 'id');
     }
 
     /**
diff --git a/app/code/Magento/Security/Model/SecurityChecker/Frequency.php b/app/code/Magento/Security/Model/SecurityChecker/Frequency.php
index 5ff06272563a7..5aeb0fca6f0a6 100644
--- a/app/code/Magento/Security/Model/SecurityChecker/Frequency.php
+++ b/app/code/Magento/Security/Model/SecurityChecker/Frequency.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Security\Model\SecurityChecker;
 
 use Magento\Framework\Exception\SecurityViolationException;
@@ -76,7 +77,8 @@ public function check($securityEventType, $accountReference = null, $longIp = nu
                 )) {
                 throw new SecurityViolationException(
                     __(
-                        'Too many password reset requests. Please wait and try again or contact %1.',
+                        'We received too many requests for password resets. '
+                        . 'Please wait and try again later or contact %1.',
                         $this->securityConfig->getCustomerServiceEmail()
                     )
                 );
diff --git a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
index 7f1d85abeb74b..9d86b55158be5 100644
--- a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
+++ b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Security\Model\SecurityChecker;
 
 use Magento\Framework\Exception\SecurityViolationException;
@@ -58,7 +59,8 @@ public function check($securityEventType, $accountReference = null, $longIp = nu
             if ($collection->count() >= $allowedAttemptsNumber) {
                 throw new SecurityViolationException(
                     __(
-                        'Too many password reset requests. Please wait and try again or contact %1.',
+                        'We received too many requests for password resets. '
+                        . 'Please wait and try again later or contact %1.',
                         $this->securityConfig->getCustomerServiceEmail()
                     )
                 );
diff --git a/app/code/Magento/Security/Setup/InstallSchema.php b/app/code/Magento/Security/Setup/InstallSchema.php
deleted file mode 100644
index c66383d778d69..0000000000000
--- a/app/code/Magento/Security/Setup/InstallSchema.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Security\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * Session DB table name
-     */
-    const ADMIN_SESSIONS_DB_TABLE_NAME = 'admin_user_session';
-
-    /**
-     * Security Control DB table name
-     */
-    const PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME = 'password_reset_request_event';
-
-    /**
-     * Admin user table name
-     */
-    const ADMIN_USER_DB_TABLE_NAME = 'admin_user';
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'admin_user_session'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable(self::ADMIN_SESSIONS_DB_TABLE_NAME))
-            ->addColumn(
-                'id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'session_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                128,
-                ['nullable' => false],
-                'Session id value'
-            )
-            ->addColumn(
-                'user_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => true],
-                'Admin User ID'
-            )
-            ->addColumn(
-                'status',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-                'Current Session status'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Created Time'
-            )
-            ->addColumn(
-                'updated_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                'Update Time'
-            )
-            ->addColumn(
-                'ip',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                15,
-                ['nullable' => false],
-                'Remote user IP'
-            )
-            ->addIndex(
-                $installer->getIdxName(self::ADMIN_SESSIONS_DB_TABLE_NAME, ['session_id']),
-                ['session_id']
-            )
-            ->addIndex(
-                $installer->getIdxName(self::ADMIN_SESSIONS_DB_TABLE_NAME, ['user_id']),
-                ['user_id']
-            )
-            ->addForeignKey(
-                $installer->getFkName(
-                    self::ADMIN_SESSIONS_DB_TABLE_NAME,
-                    'user_id',
-                    self::ADMIN_USER_DB_TABLE_NAME,
-                    'user_id'
-                ),
-                'user_id',
-                $installer->getTable(self::ADMIN_USER_DB_TABLE_NAME),
-                'user_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Admin User sessions table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'password_reset_request_event'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable(self::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME))
-            ->addColumn(
-                'id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity ID'
-            )
-            ->addColumn(
-                'request_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Type of the event under a security control'
-            )
-            ->addColumn(
-                'account_reference',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['nullable' => true, 'default' => null],
-                'An identifier for existing account or another target'
-            )
-            ->addColumn(
-                'created_at',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                'Timestamp when the event occurs'
-            )
-            ->addColumn(
-                'ip',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                15,
-                ['nullable' => false],
-                'Remote user IP'
-            )
-            ->addIndex(
-                $installer->getIdxName(self::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME, ['account_reference']),
-                ['account_reference']
-            )
-            ->addIndex(
-                $installer->getIdxName(self::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME, ['created_at']),
-                ['created_at']
-            )
-            ->setComment('Password Reset Request Event under a security control');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Security/Setup/UpgradeSchema.php b/app/code/Magento/Security/Setup/UpgradeSchema.php
deleted file mode 100644
index 4fdf12f672e94..0000000000000
--- a/app/code/Magento/Security/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Security\Setup;
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Upgrade the Catalog module DB scheme
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $setup->getConnection()->changeColumn(
-                $setup->getTable(\Magento\Security\Setup\InstallSchema::ADMIN_SESSIONS_DB_TABLE_NAME),
-                'ip',
-                'ip',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 15,
-                    'nullable' => false,
-                    'comment' => 'Remote user IP'
-                ]
-            );
-
-            $setup->getConnection()->changeColumn(
-                $setup->getTable(\Magento\Security\Setup\InstallSchema::PASSWORD_RESET_REQUEST_EVENT_DB_TABLE_NAME),
-                'ip',
-                'ip',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 15,
-                    'nullable' => false,
-                    'comment' => 'Remote user IP'
-                ]
-            );
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE.txt b/app/code/Magento/Security/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE.txt
rename to app/code/Magento/Security/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE_AFL.txt b/app/code/Magento/Security/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE_AFL.txt
rename to app/code/Magento/Security/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Security/Test/Mftf/README.md b/app/code/Magento/Security/Test/Mftf/README.md
new file mode 100644
index 0000000000000..65a0ff6c26e21
--- /dev/null
+++ b/app/code/Magento/Security/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Security Functional Tests
+
+The Functional Test Module for **Magento Security** module.
diff --git a/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/LogoutAllTest.php b/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/LogoutAllTest.php
index 8c2119bde667e..02335ef55aa93 100644
--- a/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/LogoutAllTest.php
+++ b/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/LogoutAllTest.php
@@ -74,7 +74,7 @@ public function setUp()
 
         $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess', 'addError', 'addException'])
+            ->setMethods(['addSuccessMessage', 'addErrorMessage', 'addExceptionMessage'])
             ->getMockForAbstractClass();
         $this->contextMock->expects($this->any())
             ->method('getMessageManager')
@@ -132,12 +132,12 @@ public function testExecute()
         $this->sessionsManager->expects($this->once())
             ->method('logoutOtherUserSessions');
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($successMessage);
         $this->messageManager->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
         $this->messageManager->expects($this->never())
-            ->method('addException');
+            ->method('addExceptionMessage');
         $this->responseMock->expects($this->once())
             ->method('setRedirect');
         $this->actionFlagMock->expects($this->once())
@@ -158,7 +158,7 @@ public function testExecuteLocalizedException()
             ->method('logoutOtherUserSessions')
             ->willThrowException(new LocalizedException($phrase));
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($phrase);
         $this->controller->execute();
     }
@@ -173,7 +173,7 @@ public function testExecuteException()
             ->method('logoutOtherUserSessions')
             ->willThrowException(new \Exception());
         $this->messageManager->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with(new \Exception(), $phrase);
         $this->controller->execute();
     }
diff --git a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
index d81264f661762..be0bdaecf8de3 100644
--- a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
@@ -99,7 +99,8 @@ public function setUp()
                 'setIsOtherSessionsTerminated',
                 'save',
                 'getUserId',
-                'getSessionId'
+                'getSessionId',
+                'getUpdatedAt'
             ]);
 
         $this->securityConfigMock = $this->getMockBuilder(\Magento\Security\Model\ConfigInterface::class)
@@ -216,7 +217,8 @@ public function testProcessLogin()
     public function testProcessProlong()
     {
         $sessionId = 50;
-        $updatedAt = '2015-12-31 23:59:59';
+        $lastUpdatedAt = '2015-12-31 23:59:59';
+        $newUpdatedAt = '2016-01-01 00:00:30';
 
         $this->adminSessionInfoFactoryMock->expects($this->any())
             ->method('create')
@@ -230,13 +232,21 @@ public function testProcessProlong()
             ->method('load')
             ->willReturnSelf();
 
-        $this->authSessionMock->expects($this->once())
+        $this->currentSessionMock->expects($this->once())
+            ->method('getUpdatedAt')
+            ->willReturn($lastUpdatedAt);
+
+        $this->authSessionMock->expects($this->exactly(2))
             ->method('getUpdatedAt')
-            ->willReturn($updatedAt);
+            ->willReturn(strtotime($newUpdatedAt));
+
+        $this->securityConfigMock->expects($this->once())
+            ->method('getAdminSessionLifetime')
+            ->willReturn(100);
 
         $this->currentSessionMock->expects($this->once())
             ->method('setData')
-            ->with('updated_at', $updatedAt)
+            ->with('updated_at', $newUpdatedAt)
             ->willReturnSelf();
 
         $this->currentSessionMock->expects($this->once())
@@ -360,7 +370,7 @@ public function dataProviderLogoutReasonMessage()
                 'sessionStatus' => \Magento\Security\Model\AdminSessionInfo::LOGGED_OUT
             ],
             [
-                'expectedResult' => __('Your account is temporarily disabled.'),
+                'expectedResult' => __('Your account is temporarily disabled. Please try again later.'),
                 'sessionStatus' => \Magento\Security\Model\AdminSessionsManager::LOGOUT_REASON_USER_LOCKED
             ],
             [
diff --git a/app/code/Magento/Security/Test/Unit/Model/Plugin/AuthSessionTest.php b/app/code/Magento/Security/Test/Unit/Model/Plugin/AuthSessionTest.php
index 5cb06d6143023..0f7f590b71de4 100644
--- a/app/code/Magento/Security/Test/Unit/Model/Plugin/AuthSessionTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/Plugin/AuthSessionTest.php
@@ -112,7 +112,7 @@ public function testAroundProlongSessionIsNotActiveAndIsNotAjaxRequest()
             ->willReturn($errorMessage);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($errorMessage);
 
         $this->model->aroundProlong($this->authSessionMock, $proceed);
diff --git a/app/code/Magento/Security/Test/Unit/Model/Plugin/LoginControllerTest.php b/app/code/Magento/Security/Test/Unit/Model/Plugin/LoginControllerTest.php
index 2bb2bc3cafac7..aa066e23f67cb 100644
--- a/app/code/Magento/Security/Test/Unit/Model/Plugin/LoginControllerTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/Plugin/LoginControllerTest.php
@@ -103,7 +103,7 @@ public function testBeforeExecute()
             ->willReturn($errorMessage);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($errorMessage);
 
         $this->securityCookieMock->expects($this->once())
diff --git a/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php b/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php
index 525693631e86f..89bc5c2b85d50 100644
--- a/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php
@@ -86,6 +86,9 @@ public function testCreate(
         $this->model->create($securityEventType, $accountReference, $longIp);
     }
 
+    /**
+     * @return array
+     */
     public function createDataProvider()
     {
         return [
diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/FrequencyTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/FrequencyTest.php
index b17768bd01f89..732163383f702 100644
--- a/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/FrequencyTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/FrequencyTest.php
@@ -134,7 +134,6 @@ public function testCheck($securityEventType, $requestsMethod)
      * @param int $requestsMethod
      * @dataProvider dataProviderSecurityEventTypeWithRequestsMethod
      * @expectedException \Magento\Framework\Exception\SecurityViolationException
-     * @expectedExceptionMessage Too many password reset requests. Please wait and try again or contact test@host.com.
      */
     public function testCheckException($securityEventType, $requestsMethod)
     {
@@ -158,6 +157,11 @@ public function testCheckException($securityEventType, $requestsMethod)
             ->willReturn($record);
 
         $this->model->check($securityEventType);
+
+        $this->expectExceptionMessage(
+            'We received too many requests for password resets. '
+            . 'Please wait and try again later or contact test@host.com.'
+        );
     }
 
     /**
diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/QuantityTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/QuantityTest.php
index 94cfde17f5726..e98fd06b9d47e 100644
--- a/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/QuantityTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/SecurityChecker/QuantityTest.php
@@ -114,7 +114,6 @@ public function testCheck($securityEventType, $requestsMethod)
      * @param int $requestsMethod
      * @dataProvider dataProviderSecurityEventTypeWithRequestsMethod
      * @expectedException \Magento\Framework\Exception\SecurityViolationException
-     * @expectedExceptionMessage Too many password reset requests. Please wait and try again or contact test@host.com.
      */
     public function testCheckException($securityEventType, $requestsMethod)
     {
@@ -127,6 +126,11 @@ public function testCheckException($securityEventType, $requestsMethod)
             ->willReturn($limitNumberPasswordResetRequests);
 
         $this->model->check($securityEventType);
+
+        $this->expectExceptionMessage(
+            'We received too many requests for password resets. '
+            . 'Please wait and try again later or contact test@host.com.'
+        );
     }
 
     /**
diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php
index b310bf63bc989..3a1855b3a220f 100644
--- a/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/SecurityCookieTest.php
@@ -87,7 +87,7 @@ public function testGetLogoutReasonCookie()
             )
             ->willReturn($cookie);
 
-        $this->assertEquals(intval($cookie), $this->model->getLogoutReasonCookie());
+        $this->assertEquals((int)$cookie, $this->model->getLogoutReasonCookie());
     }
 
     /**
@@ -114,7 +114,7 @@ public function testSetLogoutReasonCookie()
             ->method('setPublicCookie')
             ->with(
                 SecurityCookie::LOGOUT_REASON_CODE_COOKIE_NAME,
-                intval($status),
+                (int)$status,
                 $this->cookieMetadataMock
             )
             ->willReturnSelf();
diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php
index 8d98d8145f17e..c5326da45005e 100644
--- a/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php
@@ -126,9 +126,9 @@ public function testConstructorException()
     {
         $securityChecker = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
 
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            __('Incorrect Security Checker class. It has to implement SecurityCheckerInterface')
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(
+            (string)__('Incorrect Security Checker class. It has to implement SecurityCheckerInterface')
         );
 
         $this->model->__construct(
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index 3c47d086f33d7..405b5b518097d 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -5,16 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-customer": "100.3.*"
+        "magento/module-customer": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Security/etc/adminhtml/di.xml b/app/code/Magento/Security/etc/adminhtml/di.xml
index c1188c2d405cf..79477e9443097 100644
--- a/app/code/Magento/Security/etc/adminhtml/di.xml
+++ b/app/code/Magento/Security/etc/adminhtml/di.xml
@@ -24,7 +24,7 @@
         <arguments>
             <argument name="securityCheckers" xsi:type="array">
                 <item name="frequency" xsi:type="object">Magento\Security\Model\SecurityChecker\Frequency</item>
-                <item name="wuantity" xsi:type="object">Magento\Security\Model\SecurityChecker\Quantity</item>
+                <item name="quantity" xsi:type="object">Magento\Security\Model\SecurityChecker\Quantity</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Security/etc/db_schema.xml b/app/code/Magento/Security/etc/db_schema.xml
new file mode 100644
index 0000000000000..ce7143582ce69
--- /dev/null
+++ b/app/code/Magento/Security/etc/db_schema.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="admin_user_session" resource="default" engine="innodb" comment="Admin User sessions table">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="session_id" nullable="false" length="128" comment="Session id value"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Admin User ID"/>
+        <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
+                default="1" comment="Current Session status"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created Time"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Update Time"/>
+        <column xsi:type="varchar" name="ip" nullable="false" length="15" onCreate="migrateDataFrom(ip)"
+                comment="Remote user IP"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="ADMIN_USER_SESSION_USER_ID_ADMIN_USER_USER_ID" table="admin_user_session"
+                    column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
+        <index referenceId="ADMIN_USER_SESSION_SESSION_ID" indexType="btree">
+            <column name="session_id"/>
+        </index>
+        <index referenceId="ADMIN_USER_SESSION_USER_ID" indexType="btree">
+            <column name="user_id"/>
+        </index>
+    </table>
+    <table name="password_reset_request_event" resource="default" engine="innodb"
+           comment="Password Reset Request Event under a security control">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="smallint" name="request_type" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Type of the event under a security control"/>
+        <column xsi:type="varchar" name="account_reference" nullable="true" length="255"
+                comment="An identifier for existing account or another target"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Timestamp when the event occurs"/>
+        <column xsi:type="varchar" name="ip" nullable="false" length="15" onCreate="migrateDataFrom(ip)"
+                comment="Remote user IP"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <index referenceId="PASSWORD_RESET_REQUEST_EVENT_ACCOUNT_REFERENCE" indexType="btree">
+            <column name="account_reference"/>
+        </index>
+        <index referenceId="PASSWORD_RESET_REQUEST_EVENT_CREATED_AT" indexType="btree">
+            <column name="created_at"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Security/etc/db_schema_whitelist.json b/app/code/Magento/Security/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..c387b7591c7a5
--- /dev/null
+++ b/app/code/Magento/Security/etc/db_schema_whitelist.json
@@ -0,0 +1,37 @@
+{
+    "admin_user_session": {
+        "column": {
+            "id": true,
+            "session_id": true,
+            "user_id": true,
+            "status": true,
+            "created_at": true,
+            "updated_at": true,
+            "ip": true
+        },
+        "index": {
+            "ADMIN_USER_SESSION_SESSION_ID": true,
+            "ADMIN_USER_SESSION_USER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "ADMIN_USER_SESSION_USER_ID_ADMIN_USER_USER_ID": true
+        }
+    },
+    "password_reset_request_event": {
+        "column": {
+            "id": true,
+            "request_type": true,
+            "account_reference": true,
+            "created_at": true,
+            "ip": true
+        },
+        "index": {
+            "PASSWORD_RESET_REQUEST_EVENT_ACCOUNT_REFERENCE": true,
+            "PASSWORD_RESET_REQUEST_EVENT_CREATED_AT": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Security/etc/module.xml b/app/code/Magento/Security/etc/module.xml
index e1f0239be3fdd..9141c4ddbea66 100644
--- a/app/code/Magento/Security/etc/module.xml
+++ b/app/code/Magento/Security/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Security" setup_version="2.0.1">
+    <module name="Magento_Security" >
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Magento_Store"/>
diff --git a/app/code/Magento/SendFriend/Setup/InstallSchema.php b/app/code/Magento/SendFriend/Setup/InstallSchema.php
deleted file mode 100644
index 0e5db032da32e..0000000000000
--- a/app/code/Magento/SendFriend/Setup/InstallSchema.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\SendFriend\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sendfriend_log')
-        )->addColumn(
-            'log_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Log ID'
-        )->addColumn(
-            'ip',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-            '20',
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Customer IP address'
-        )->addColumn(
-            'time',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Log time'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website ID'
-        )->addIndex(
-            $installer->getIdxName('sendfriend_log', 'ip'),
-            'ip'
-        )->addIndex(
-            $installer->getIdxName('sendfriend_log', 'time'),
-            'time'
-        )->setComment(
-            'Send to friend function log storage table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE.txt b/app/code/Magento/SendFriend/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE.txt
rename to app/code/Magento/SendFriend/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE_AFL.txt b/app/code/Magento/SendFriend/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE_AFL.txt
rename to app/code/Magento/SendFriend/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SendFriend/Test/Mftf/README.md b/app/code/Magento/SendFriend/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a6e18162013a3
--- /dev/null
+++ b/app/code/Magento/SendFriend/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Send Friend Functional Tests
+
+The Functional Test Module for **Magento Send Friend** module.
diff --git a/app/code/Magento/SendFriend/Test/Unit/Block/Plugin/Catalog/Product/ViewTest.php b/app/code/Magento/SendFriend/Test/Unit/Block/Plugin/Catalog/Product/ViewTest.php
index 6dbab3a5573a8..2718e1fa44f6e 100644
--- a/app/code/Magento/SendFriend/Test/Unit/Block/Plugin/Catalog/Product/ViewTest.php
+++ b/app/code/Magento/SendFriend/Test/Unit/Block/Plugin/Catalog/Product/ViewTest.php
@@ -52,6 +52,9 @@ public function testAfterCanEmailToFriend($result, $callSendfriend)
         $this->assertTrue($this->view->afterCanEmailToFriend($this->productView, $result));
     }
 
+    /**
+     * @return array
+     */
     public function afterCanEmailToFriendDataSet()
     {
         return [
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index ab01ba4360e8d..30aecf13c3588 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SendFriend/etc/db_schema.xml b/app/code/Magento/SendFriend/etc/db_schema.xml
new file mode 100644
index 0000000000000..b9551749dfc6d
--- /dev/null
+++ b/app/code/Magento/SendFriend/etc/db_schema.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="sendfriend_log" resource="default" engine="innodb" comment="Send to friend function log storage table">
+        <column xsi:type="int" name="log_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Log ID"/>
+        <column xsi:type="bigint" name="ip" padding="20" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Customer IP address"/>
+        <column xsi:type="int" name="time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Log time"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="log_id"/>
+        </constraint>
+        <index referenceId="SENDFRIEND_LOG_IP" indexType="btree">
+            <column name="ip"/>
+        </index>
+        <index referenceId="SENDFRIEND_LOG_TIME" indexType="btree">
+            <column name="time"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/SendFriend/etc/db_schema_whitelist.json b/app/code/Magento/SendFriend/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..5cab97e6dfb1c
--- /dev/null
+++ b/app/code/Magento/SendFriend/etc/db_schema_whitelist.json
@@ -0,0 +1,17 @@
+{
+    "sendfriend_log": {
+        "column": {
+            "log_id": true,
+            "ip": true,
+            "time": true,
+            "website_id": true
+        },
+        "index": {
+            "SENDFRIEND_LOG_IP": true,
+            "SENDFRIEND_LOG_TIME": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/SendFriend/etc/module.xml b/app/code/Magento/SendFriend/etc/module.xml
index fae2b90f710a3..01c267b3c4fcb 100644
--- a/app/code/Magento/SendFriend/etc/module.xml
+++ b/app/code/Magento/SendFriend/etc/module.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SendFriend" setup_version="2.0.0">
+    <module name="Magento_SendFriend" >
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 7a972cd5f01c5..4922a9f365ced 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -17,13 +17,13 @@
         <div class="secondary">
             <button type="button" id="btn-remove<%- data._index_ %>" class="action remove"
                title="<?= $block->escapeHtmlAttr(__('Remove Recipent')) ?>">
-               <span><?= $block->escapeJs($block->escapeHtml(__('Remove'))) ?></span>
+               <span><?= $block->escapeHtml(__('Remove')) ?></span>
             </button>
         </div>
     </div>
     <fieldset class="fieldset">
         <div class="field name required">
-            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Name'))) ?></span></label>
+            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
             <div class="control">
                 <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
                        id="recipients-name<%- data._index_ %>" data-validate="{required:true}"/>
@@ -31,10 +31,11 @@
         </div>
 
         <div class="field email required">
-            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Email'))) ?></span></label>
+            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
                 <input name="recipients[email][<%- data._index_ %>]" title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
                        id="recipients-email<%- data._index_ %>" type="email" class="input-text"
+                       data-mage-init='{"mage/trim-input":{}}'
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
@@ -72,7 +73,8 @@
             <label for="sender-email" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
                 <input name="sender[email]" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>"
-                       title="<?= $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="text" class="input-text"
+                       title="<?= $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="email" class="input-text"
+                       data-mage-init='{"mage/trim-input":{}}'
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
@@ -121,7 +123,7 @@
 <script type="text/x-magento-init">
     {
         "a[role='back']": {
-            "Magento_SendFriend/back-event": {}
+            "Magento_SendFriend/js/back-event": {}
         }
     }
 </script>
diff --git a/app/code/Magento/SendFriend/view/frontend/web/back-event.js b/app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
similarity index 100%
rename from app/code/Magento/SendFriend/view/frontend/web/back-event.js
rename to app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
diff --git a/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js b/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js
new file mode 100644
index 0000000000000..8e85666c2362a
--- /dev/null
+++ b/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+var config = {
+    map: {
+        '*': {
+            'Magento_SendFriend/back-event': 'Magento_SendFriend/js/back-event'
+        }
+    }
+};
diff --git a/app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php b/app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php
new file mode 100644
index 0000000000000..c0c01c71df764
--- /dev/null
+++ b/app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SendFriendGraphQl\Model\Resolver;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\SendFriend\Model\SendFriend;
+use Magento\SendFriend\Model\SendFriendFactory;
+
+/**
+ * @inheritdoc
+ */
+class SendEmailToFriend implements ResolverInterface
+{
+    /**
+     * @var SendFriendFactory
+     */
+    private $sendFriendFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * @param SendFriendFactory $sendFriendFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param DataObjectFactory $dataObjectFactory
+     * @param ManagerInterface $eventManager
+     */
+    public function __construct(
+        SendFriendFactory $sendFriendFactory,
+        ProductRepositoryInterface $productRepository,
+        DataObjectFactory $dataObjectFactory,
+        ManagerInterface $eventManager
+    ) {
+        $this->sendFriendFactory = $sendFriendFactory;
+        $this->productRepository = $productRepository;
+        $this->dataObjectFactory = $dataObjectFactory;
+        $this->eventManager = $eventManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        /** @var SendFriend $sendFriend */
+        $sendFriend = $this->sendFriendFactory->create();
+
+        if ($sendFriend->getMaxSendsToFriend() && $sendFriend->isExceedLimit()) {
+            throw new GraphQlInputException(
+                __('You can\'t send messages more than %1 times an hour.', $sendFriend->getMaxSendsToFriend())
+            );
+        }
+
+        $product = $this->getProduct($args['input']['product_id']);
+        $this->eventManager->dispatch('sendfriend_product', ['product' => $product]);
+        $sendFriend->setProduct($product);
+
+        $senderData = $this->extractSenderData($args);
+        $sendFriend->setSender($senderData);
+
+        $recipientsData = $this->extractRecipientsData($args);
+        $sendFriend->setRecipients($recipientsData);
+
+        $this->validateSendFriendModel($sendFriend, $senderData, $recipientsData);
+        $sendFriend->send();
+
+        return array_merge($senderData, $recipientsData);
+    }
+
+    /**
+     * Validate send friend model
+     *
+     * @param SendFriend $sendFriend
+     * @param array $senderData
+     * @param array $recipientsData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    private function validateSendFriendModel(SendFriend $sendFriend, array $senderData, array $recipientsData): void
+    {
+        $sender = $this->dataObjectFactory->create()->setData($senderData['sender']);
+        $sendFriend->setData('_sender', $sender);
+
+        $emails = array_column($recipientsData['recipients'], 'email');
+        $recipients = $this->dataObjectFactory->create()->setData('emails', $emails);
+        $sendFriend->setData('_recipients', $recipients);
+
+        $validationResult = $sendFriend->validate();
+        if ($validationResult !== true) {
+            throw new GraphQlInputException(__(implode($validationResult)));
+        }
+    }
+
+    /**
+     * Get product
+     *
+     * @param int $productId
+     * @return ProductInterface
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getProduct(int $productId): ProductInterface
+    {
+        try {
+            $product = $this->productRepository->getById($productId);
+            if (!$product->isVisibleInCatalog()) {
+                throw new GraphQlNoSuchEntityException(
+                    __("The product that was requested doesn't exist. Verify the product and try again.")
+                );
+            }
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        }
+        return $product;
+    }
+
+    /**
+     * Extract recipients data
+     *
+     * @param array $args
+     * @return array
+     * @throws GraphQlInputException
+     */
+    private function extractRecipientsData(array $args): array
+    {
+        $recipients = [];
+        foreach ($args['input']['recipients'] as $recipient) {
+            if (empty($recipient['name'])) {
+                throw new GraphQlInputException(__('Please provide Name for all of recipients.'));
+            }
+
+            if (empty($recipient['email'])) {
+                throw new GraphQlInputException(__('Please provide Email for all of recipients.'));
+            }
+
+            $recipients[] = [
+                'name' => $recipient['name'],
+                'email' => $recipient['email'],
+            ];
+        }
+        return ['recipients' => $recipients];
+    }
+
+    /**
+     * Extract sender data
+     *
+     * @param array $args
+     * @return array
+     * @throws GraphQlInputException
+     */
+    private function extractSenderData(array $args): array
+    {
+        if (empty($args['input']['sender']['name'])) {
+            throw new GraphQlInputException(__('Please provide Name of sender.'));
+        }
+
+        if (empty($args['input']['sender']['email'])) {
+            throw new GraphQlInputException(__('Please provide Email of sender.'));
+        }
+
+        if (empty($args['input']['sender']['message'])) {
+            throw new GraphQlInputException(__('Please provide Message.'));
+        }
+
+        return [
+            'sender' => [
+                'name' => $args['input']['sender']['name'],
+                'email' => $args['input']['sender']['email'],
+                'message' => $args['input']['sender']['message'],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/SendFriendGraphQl/README.md b/app/code/Magento/SendFriendGraphQl/README.md
new file mode 100644
index 0000000000000..d8051922ddad7
--- /dev/null
+++ b/app/code/Magento/SendFriendGraphQl/README.md
@@ -0,0 +1,3 @@
+# SendFriendGraphQl
+
+**SendFriendGraphQl** provides support of GraphQL for SendFriend functionality.
diff --git a/app/code/Magento/SendFriendGraphQl/composer.json b/app/code/Magento/SendFriendGraphQl/composer.json
new file mode 100644
index 0000000000000..d401f57b2257a
--- /dev/null
+++ b/app/code/Magento/SendFriendGraphQl/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-send-friend-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-send-friend": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\SendFriendGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/SendFriendGraphQl/etc/module.xml b/app/code/Magento/SendFriendGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..3df33266cac6e
--- /dev/null
+++ b/app/code/Magento/SendFriendGraphQl/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_SendFriendGraphQl"/>
+</config>
diff --git a/app/code/Magento/SendFriendGraphQl/etc/schema.graphqls b/app/code/Magento/SendFriendGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..1234b65a7b910
--- /dev/null
+++ b/app/code/Magento/SendFriendGraphQl/etc/schema.graphqls
@@ -0,0 +1,39 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Mutation {
+    sendEmailToFriend (input: SendEmailToFriendInput): SendEmailToFriendOutput @resolver(class: "\\Magento\\SendFriendGraphQl\\Model\\Resolver\\SendEmailToFriend") @doc(description:"Recommends Product by Sending Single/Multiple Email")
+}
+
+input SendEmailToFriendInput {
+    product_id: Int!
+    sender: SendEmailToFriendSenderInput!
+    recipients: [SendEmailToFriendRecipientInput!]!
+}
+
+input SendEmailToFriendSenderInput {
+    name: String!
+    email: String!
+    message: String!
+}
+
+input SendEmailToFriendRecipientInput {
+    name: String!
+    email: String!
+}
+
+type SendEmailToFriendOutput {
+    sender: SendEmailToFriendSender
+    recipients: [SendEmailToFriendRecipient]
+}
+
+type SendEmailToFriendSender {
+    name: String!
+    email: String!
+    message: String!
+}
+
+type SendEmailToFriendRecipient {
+    name: String!
+    email: String!
+}
diff --git a/app/code/Magento/SendFriendGraphQl/registration.php b/app/code/Magento/SendFriendGraphQl/registration.php
new file mode 100644
index 0000000000000..13ec47b16abdb
--- /dev/null
+++ b/app/code/Magento/SendFriendGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_SendFriendGraphQl', __DIR__);
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index b4ff445c63f4e..e5e419328eea4 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -74,6 +74,7 @@ public function getShipment()
      * Configuration for popup window for packaging
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getConfigDataJson()
     {
@@ -86,7 +87,7 @@ public function getConfigDataJson()
         $itemsName = [];
         $itemsWeight = [];
         $itemsProductId = [];
-
+        $itemsOrderItemId = [];
         if ($shipmentId) {
             $urlParams['shipment_id'] = $shipmentId;
             $createLabelUrl = $this->getUrl('adminhtml/order_shipment/createLabel', $urlParams);
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index 9e340cc31ff17..1d3f6ad1ee5a3 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -10,7 +10,7 @@ class Grid extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'order/packaging/grid.phtml';
+    protected $_template = 'Magento_Shipping::order/packaging/grid.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
index 00fc6fce1bfb8..356483c9a5dd7 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -92,11 +92,6 @@ public function getRemoveUrl($track)
     public function getCarrierTitle($code)
     {
         $carrier = $this->_carrierFactory->create($code);
-        if ($carrier) {
-            return $carrier->getConfigData('title');
-        } else {
-            return __('Custom Value');
-        }
-        return false;
+        return $carrier ? $carrier->getConfigData('title') : __('Custom Value');
     }
 }
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
index 653fb357f0b1d..21e960985d6b6 100644
--- a/app/code/Magento/Shipping/Block/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -18,7 +18,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/shipment.phtml';
+    protected $_template = 'Magento_Shipping::order/shipment.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
index 0ac36110d7e6b..483ac21689baf 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender;
@@ -64,7 +65,7 @@ public function execute()
             $data = $this->getRequest()->getPost('comment');
             if (empty($data['comment'])) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please enter a comment.')
+                    __('The comment is missing. Enter and try again.')
                 );
             }
             $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
index 500fe0dd3b289..7231bc8b9c6e0 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
@@ -6,9 +6,11 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\ObjectManager;
 
-class NewAction extends \Magento\Backend\App\Action
+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -22,15 +24,24 @@ class NewAction extends \Magento\Backend\App\Action
      */
     protected $shipmentLoader;
 
+    /**
+     * @var \Magento\Shipping\Model\ShipmentProviderInterface
+     */
+    private $shipmentProvider;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
+     * @param \Magento\Shipping\Model\ShipmentProviderInterface $shipmentProvider
      */
     public function __construct(
         Action\Context $context,
-        \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
+        \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
+        \Magento\Shipping\Model\ShipmentProviderInterface $shipmentProvider = null
     ) {
         $this->shipmentLoader = $shipmentLoader;
+        $this->shipmentProvider = $shipmentProvider ?: ObjectManager::getInstance()
+            ->get(\Magento\Shipping\Model\ShipmentProviderInterface::class);
         parent::__construct($context);
     }
 
@@ -43,7 +54,7 @@ public function execute()
     {
         $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
         $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
-        $this->shipmentLoader->setShipment($this->getRequest()->getParam('shipment'));
+        $this->shipmentLoader->setShipment($this->shipmentProvider->getShipmentData());
         $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
         $shipment = $this->shipmentLoader->load();
         if ($shipment) {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 5520bae0e26a8..8bd64ccf82d88 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
@@ -13,7 +14,7 @@
  * Class Save
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Backend\App\Action
+class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -108,6 +109,7 @@ public function execute()
         }
 
         $isNeedCreateLabel = isset($data['create_shipping_label']) && $data['create_shipping_label'];
+        $responseAjax = new \Magento\Framework\DataObject();
 
         try {
             $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
@@ -143,7 +145,6 @@ public function execute()
             $shipment->register();
 
             $shipment->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
-            $responseAjax = new \Magento\Framework\DataObject();
 
             if ($isNeedCreateLabel) {
                 $this->labelGenerator->create($shipment, $this->_request);
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
index ac15c0accd1c3..8a874ddc79526 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-class Start extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Start extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
index 0c6be6fd57756..c4094a63ec527 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
@@ -6,6 +6,16 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order;
 
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
+use Magento\Sales\Api\Data\ShipmentTrackCreationInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 
 /**
  * Class ShipmentLoader
@@ -17,80 +27,77 @@
  * @method ShipmentLoader setTracking($tracking)
  * @method int getOrderId()
  * @method int getShipmentId()
- * @method array getShipment()
  * @method array getTracking()
  */
 class ShipmentLoader extends DataObject
 {
+    const SHIPMENT = 'shipment';
+
     /**
-     * @var \Magento\Framework\Message\ManagerInterface
+     * @var ManagerInterface
      */
-    protected $messageManager;
+    private $messageManager;
 
     /**
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
-    protected $registry;
+    private $registry;
 
     /**
-     * @var \Magento\Sales\Api\ShipmentRepositoryInterface
+     * @var ShipmentRepositoryInterface
      */
-    protected $shipmentRepository;
+    private $shipmentRepository;
 
     /**
-     * @var \Magento\Sales\Model\Order\ShipmentFactory
+     * @var OrderRepositoryInterface
      */
-    protected $shipmentFactory;
+    private $orderRepository;
 
     /**
-     * @var \Magento\Sales\Model\Order\Shipment\TrackFactory
+     * @var ShipmentDocumentFactory
      */
-    protected $trackFactory;
+    private $documentFactory;
 
     /**
-     * @var \Magento\Sales\Api\OrderRepositoryInterface
+     * @var ShipmentTrackCreationInterfaceFactory
      */
-    protected $orderRepository;
+    private $trackFactory;
 
     /**
-     * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository
-     * @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
-     * @param \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory
-     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @var ShipmentItemCreationInterfaceFactory
+     */
+    private $itemFactory;
+
+    /**
+     * @param ManagerInterface $messageManager
+     * @param Registry $registry
+     * @param ShipmentRepositoryInterface $shipmentRepository
+     * @param OrderRepositoryInterface $orderRepository
+     * @param ShipmentDocumentFactory $documentFactory
+     * @param ShipmentTrackCreationInterfaceFactory $trackFactory
+     * @param ShipmentItemCreationInterfaceFactory $itemFactory
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Message\ManagerInterface $messageManager,
-        \Magento\Framework\Registry $registry,
-        \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository,
-        \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
-        \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory,
-        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        ManagerInterface $messageManager,
+        Registry $registry,
+        ShipmentRepositoryInterface $shipmentRepository,
+        OrderRepositoryInterface $orderRepository,
+        ShipmentDocumentFactory $documentFactory,
+        ShipmentTrackCreationInterfaceFactory $trackFactory,
+        ShipmentItemCreationInterfaceFactory $itemFactory,
         array $data = []
     ) {
         $this->messageManager = $messageManager;
         $this->registry = $registry;
         $this->shipmentRepository = $shipmentRepository;
-        $this->shipmentFactory = $shipmentFactory;
-        $this->trackFactory = $trackFactory;
         $this->orderRepository = $orderRepository;
+        $this->documentFactory = $documentFactory;
+        $this->trackFactory = $trackFactory;
+        $this->itemFactory = $itemFactory;
         parent::__construct($data);
     }
 
-    /**
-     * Initialize shipment items QTY
-     *
-     * @return array
-     */
-    protected function getItemQtys()
-    {
-        $data = $this->getShipment();
-
-        return isset($data['items']) ? $data['items'] : [];
-    }
-
     /**
      * Initialize shipment model instance
      *
@@ -129,14 +136,73 @@ public function load()
                 return false;
             }
 
-            $shipment = $this->shipmentFactory->create(
+            $shipmentItems = $this->getShipmentItems($this->getShipment());
+
+            $shipment = $this->documentFactory->create(
                 $order,
-                $this->getItemQtys(),
-                $this->getTracking()
+                $shipmentItems,
+                $this->getTrackingArray()
             );
         }
 
         $this->registry->register('current_shipment', $shipment);
         return $shipment;
     }
+
+    /**
+     * Convert UI-generated tracking array to Data Object array
+     *
+     * @return ShipmentTrackCreationInterface[]
+     * @throws LocalizedException
+     */
+    private function getTrackingArray()
+    {
+        $tracks = $this->getTracking() ?: [];
+        $trackingCreation = [];
+        foreach ($tracks as $track) {
+            if (!isset($track['number']) || !isset($track['title']) || !isset($track['carrier_code'])) {
+                throw new LocalizedException(
+                    __('Tracking information must contain title, carrier code, and tracking number')
+                );
+            }
+            /** @var ShipmentTrackCreationInterface $trackCreation */
+            $trackCreation = $this->trackFactory->create();
+            $trackCreation->setTrackNumber($track['number']);
+            $trackCreation->setTitle($track['title']);
+            $trackCreation->setCarrierCode($track['carrier_code']);
+            $trackingCreation[] = $trackCreation;
+        }
+
+        return $trackingCreation;
+    }
+
+    /**
+     * Extract product id => product quantity array from shipment data.
+     *
+     * @param array $shipmentData
+     * @return int[]
+     */
+    private function getShipmentItems(array $shipmentData)
+    {
+        $shipmentItems = [];
+        $itemQty = isset($shipmentData['items']) ? $shipmentData['items'] : [];
+        foreach ($itemQty as $itemId => $quantity) {
+            /** @var ShipmentItemCreationInterface $item */
+            $item = $this->itemFactory->create();
+            $item->setOrderItemId($itemId);
+            $item->setQty($quantity);
+            $shipmentItems[] = $item;
+        }
+        return $shipmentItems;
+    }
+
+    /**
+     * Retrieve shipment
+     *
+     * @return array
+     */
+    public function getShipment()
+    {
+        return $this->getData(self::SHIPMENT) ?: [];
+    }
 }
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index c2535336495f7..835454389cf7a 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -9,6 +9,10 @@
  */
 namespace Magento\Shipping\Helper;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
@@ -19,19 +23,28 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_allowedHashKeys = ['ship_id', 'order_id', 'track_id'];
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
+    /**
+     * @var UrlInterface|null
+     */
+    private $url;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
+     * @param UrlInterface|null $url
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        UrlInterface $url = null
     ) {
         $this->_storeManager = $storeManager;
+        $this->url = $url ?: ObjectManager::getInstance()->get(UrlInterface::class);
+
         parent::__construct($context);
     }
 
@@ -63,12 +76,13 @@ protected function _getTrackingUrl($key, $model, $method = 'getId')
     {
         $urlPart = "{$key}:{$model->{$method}()}:{$model->getProtectCode()}";
         $params = [
+            '_scope' => $model->getStoreId(),
+            '_nosid' => true,
             '_direct' => 'shipping/tracking/popup',
             '_query' => ['hash' => $this->urlEncoder->encode($urlPart)]
         ];
 
-        $storeModel = $this->_storeManager->getStore($model->getStoreId());
-        return $storeModel->getUrl('', $params);
+        return $this->url->getUrl('', $params);
     }
 
     /**
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 29e861cca891f..f9030ee75630b 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -329,11 +329,24 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
      * @return $this|bool|\Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
+    public function processAdditionalValidation(\Magento\Framework\DataObject $request)
     {
         return $this;
     }
 
+    /**
+     * Processing additional validation to check is carrier applicable.
+     *
+     * @param \Magento\Framework\DataObject $request
+     * @return $this|bool|\Magento\Framework\DataObject
+     * @deprecated
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
+    {
+        return $this->processAdditionalValidation($request);
+    }
+
     /**
      * Determine whether current carrier enabled for activity
      *
@@ -394,6 +407,9 @@ public function getSortOrder()
      */
     protected function _updateFreeMethodQuote($request)
     {
+        if (!$request->getFreeShipping()) {
+            return;
+        }
         if ($request->getFreeMethodWeight() == $request->getPackageWeight() || !$request->hasFreeMethodWeight()) {
             return;
         }
@@ -435,6 +451,12 @@ protected function _updateFreeMethodQuote($request)
                     }
                 }
             }
+        } else {
+            /**
+             * if we can apply free shipping for all order we should force price
+             * to $0.00 for shipping with out sending second request to carrier
+             */
+            $price = 0;
         }
 
         /**
@@ -453,7 +475,7 @@ protected function _updateFreeMethodQuote($request)
      */
     public function getFinalPriceWithHandlingFee($cost)
     {
-        $handlingFee = $this->getConfigData('handling_fee');
+        $handlingFee = (float)$this->getConfigData('handling_fee');
         $handlingType = $this->getConfigData('handling_type');
         if (!$handlingType) {
             $handlingType = self::HANDLING_TYPE_FIXED;
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index d42da53263ca4..27047ae46bf1f 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Model\Carrier;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -183,11 +184,11 @@ public function setActiveFlag($code = 'active')
     /**
      * Return code of carrier
      *
-     * @return string
+     * @return string|null
      */
     public function getCarrierCode()
     {
-        return isset($this->_code) ? $this->_code : null;
+        return $this->_code ?? null;
     }
 
     /**
@@ -215,6 +216,7 @@ public function getTrackingInfo($tracking)
 
     /**
      * Check if carrier has shipping tracking option available
+     *
      * All \Magento\Usa carriers have shipping tracking option available
      *
      * @return boolean
@@ -301,10 +303,24 @@ public function getAllItems(RateRequest $request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|\Magento\Framework\DataObject
+     * @deprecated
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
+    {
+        return $this->processAdditionalValidation($request);
+    }
+
+    /**
+     * Processing additional validation to check if carrier applicable.
+     *
+     * @param \Magento\Framework\DataObject $request
+     * @return $this|bool|\Magento\Framework\DataObject
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function processAdditionalValidation(\Magento\Framework\DataObject $request)
     {
         //Skip by item validation if there is no items in request
         if (!count($this->getAllItems($request))) {
@@ -384,8 +400,8 @@ protected function _getQuotesCacheKey($requestParams)
 
     /**
      * Checks whether some request to rates have already been done, so we have cache for it
-     * Used to reduce number of same requests done to carrier service during one session
      *
+     * Used to reduce number of same requests done to carrier service during one session
      * Returns cached response or null
      *
      * @param string|array $requestParams
@@ -395,7 +411,7 @@ protected function _getCachedQuotes($requestParams)
     {
         $key = $this->_getQuotesCacheKey($requestParams);
 
-        return isset(self::$_quotesCache[$key]) ? self::$_quotesCache[$key] : null;
+        return self::$_quotesCache[$key] ?? null;
     }
 
     /**
@@ -428,8 +444,7 @@ protected function _prepareServiceName($name)
     }
 
     /**
-     * Prepare shipment request.
-     * Validate and correct request information
+     * Prepare shipment request. Validate and correct request information
      *
      * @param \Magento\Framework\DataObject $request
      * @return void
@@ -543,8 +558,7 @@ public function returnOfShipment($request)
     }
 
     /**
-     * For multi package shipments. Delete requested shipments if the current shipment
-     * request is failed
+     * For multi package shipments. Delete requested shipments if the current shipment. Request is failed
      *
      * @param array $data
      * @return bool
@@ -610,6 +624,8 @@ public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
     }
 
     /**
+     * Set Raw Request
+     *
      * @param \Magento\Framework\DataObject|null $request
      * @return $this
      * @api
@@ -655,7 +671,7 @@ public function getMethodPrice($cost, $method = '')
     public function parseXml($xmlContent, $customSimplexml = 'SimpleXMLElement')
     {
         if (!$this->xmlSecurity->scan($xmlContent)) {
-            throw new LocalizedException(__('Security validation of XML document has been failed.'));
+            throw new LocalizedException(__('The security validation of the XML document has failed.'));
         }
 
         $xmlElement = simplexml_load_string($xmlContent, $customSimplexml);
@@ -665,6 +681,7 @@ public function parseXml($xmlContent, $customSimplexml = 'SimpleXMLElement')
 
     /**
      * Checks if shipping method can collect rates
+     *
      * @return bool
      */
     public function canCollectRates()
@@ -674,6 +691,7 @@ public function canCollectRates()
 
     /**
      * Debug errors if showmethod is unset
+     *
      * @param Error $errors
      *
      * @return void
diff --git a/app/code/Magento/Shipping/Model/Info.php b/app/code/Magento/Shipping/Model/Info.php
index 31d39fb80410b..ed4c1c3f6d127 100644
--- a/app/code/Magento/Shipping/Model/Info.php
+++ b/app/code/Magento/Shipping/Model/Info.php
@@ -114,7 +114,7 @@ protected function _initOrder()
         /** @var \Magento\Sales\Model\Order $order */
         $order = $this->_orderFactory->create()->load($this->getOrderId());
 
-        if (!$order->getId() || $this->getProtectCode() != $order->getProtectCode()) {
+        if (!$order->getId() || $this->getProtectCode() !== $order->getProtectCode()) {
             return false;
         }
 
@@ -130,7 +130,7 @@ protected function _initShipment()
     {
         /* @var $model Shipment */
         $ship = $this->shipmentRepository->get($this->getShipId());
-        if (!$ship->getEntityId() || $this->getProtectCode() != $ship->getProtectCode()) {
+        if (!$ship->getEntityId() || $this->getProtectCode() !== $ship->getProtectCode()) {
             return false;
         }
 
@@ -195,7 +195,7 @@ public function getTrackingInfoByTrackId()
     {
         /** @var \Magento\Shipping\Model\Order\Track $track */
         $track = $this->_trackFactory->create()->load($this->getTrackId());
-        if ($track->getId() && $this->getProtectCode() == $track->getProtectCode()) {
+        if ($track->getId() && $this->getProtectCode() === $track->getProtectCode()) {
             $this->_trackingInfo = [[$track->getNumberDetail()]];
         }
         return $this->_trackingInfo;
diff --git a/app/code/Magento/Shipping/Model/ShipmentProvider.php b/app/code/Magento/Shipping/Model/ShipmentProvider.php
new file mode 100644
index 0000000000000..917203af72460
--- /dev/null
+++ b/app/code/Magento/Shipping/Model/ShipmentProvider.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Model;
+
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * @inheritdoc
+ */
+class ShipmentProvider implements ShipmentProviderInterface
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     */
+    public function __construct(RequestInterface $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShipmentData(): array
+    {
+        return $this->request->getParam('shipment', []);
+    }
+}
diff --git a/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php b/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php
new file mode 100644
index 0000000000000..4ff9ba0008340
--- /dev/null
+++ b/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Model;
+
+/**
+ * Provide shipment items data.
+ *
+ * @api
+ */
+interface ShipmentProviderInterface
+{
+    /**
+     * Retrieve shipment items.
+     *
+     * @return array
+     */
+    public function getShipmentData(): array;
+}
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index 2223cb8ae3bf2..57e055e83a58a 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -259,7 +259,7 @@ public function collectCarrierRates($carrierCode, $request)
         $carrier->setActiveFlag($this->_availabilityConfigField);
         $result = $carrier->checkAvailableShipCountries($request);
         if (false !== $result && !$result instanceof \Magento\Quote\Model\Quote\Address\RateResult\Error) {
-            $result = $carrier->proccessAdditionalValidation($request);
+            $result = $carrier->processAdditionalValidation($request);
         }
         /*
          * Result will be false if the admin set not to show the shipping module
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index 6a1660c9f02ed..08ce168567182 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -91,7 +91,9 @@ public function requestToShipment(Shipment $orderShipment)
         $shipmentCarrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
         $baseCurrencyCode = $this->_storeManager->getStore($shipmentStoreId)->getBaseCurrencyCode();
         if (!$shipmentCarrier) {
-            throw new LocalizedException(__('Invalid carrier: %1', $shippingMethod->getCarrierCode()));
+            throw new LocalizedException(
+                __('The "%1" carrier is invalid. Verify and try again.', $shippingMethod->getCarrierCode())
+            );
         }
         $shipperRegionCode = $this->_scopeConfig->getValue(
             Shipment::XML_PATH_STORE_REGION_ID,
@@ -115,8 +117,8 @@ public function requestToShipment(Shipment $orderShipment)
             )
         );
 
-        if (!$admin->getFirstname()
-            || !$admin->getLastname()
+        if (!$admin->getFirstName()
+            || !$admin->getLastName()
             || !$storeInfo->getName()
             || !$storeInfo->getPhone()
             || !$originStreet1
@@ -138,8 +140,8 @@ public function requestToShipment(Shipment $orderShipment)
         ) {
             throw new LocalizedException(
                 __(
-                    'We don\'t have enough information to create shipping labels.'
-                    . ' Please make sure your store information and settings are complete.'
+                    "Shipping labels can't be created. "
+                    . "Verify that the store information and settings are complete and try again."
                 )
             );
         }
@@ -186,8 +188,8 @@ protected function setShipperDetails(
         );
 
         $request->setShipperContactPersonName($storeAdmin->getName());
-        $request->setShipperContactPersonFirstName($storeAdmin->getFirstname());
-        $request->setShipperContactPersonLastName($storeAdmin->getLastname());
+        $request->setShipperContactPersonFirstName($storeAdmin->getFirstName());
+        $request->setShipperContactPersonLastName($storeAdmin->getLastName());
         $request->setShipperContactCompanyName($store->getName());
         $request->setShipperContactPhoneNumber($store->getPhone());
         $request->setShipperEmail($storeAdmin->getEmail());
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
new file mode 100644
index 0000000000000..3d70a742b13eb
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="verifyBasicShipmentInformation">
+        <arguments>
+            <argument name="customer" defaultValue=""/>
+            <argument name="shippingAddress" defaultValue=""/>
+            <argument name="billingAddress" defaultValue=""/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminShipmentOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminShipmentOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminShipmentOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <actionGroup name="seeProductInShipmentItems">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminShipmentItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
+    </actionGroup>
+
+    <actionGroup name="goToShipmentIntoOrder">
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Shipment" stepKey="seePageNameNewInvoicePage"/>
+    </actionGroup>
+
+    <actionGroup name="submitShipmentIntoOrder">
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShipping"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
new file mode 100644
index 0000000000000..6d877dac5cbf4
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Enable Flat Rate Shipping method config -->
+    <entity name="FlatRateShippingMethodConfig" type="flat_rate_shipping_method">
+        <requiredEntity type="active">flatRateActiveEnable</requiredEntity>
+    </entity>
+    <entity name="flatRateActiveEnable" type="active">
+        <data key="value">1</data>
+    </entity>
+    <!-- Disable Flat Rate Shipping method config -->
+    <entity name="DisableFlatRateShippingMethodConfig" type="flat_rate_shipping_method">
+        <requiredEntity type="active">flatRateActiveDisable</requiredEntity>
+    </entity>
+    <entity name="flatRateActiveDisable" type="active">
+        <data key="value">0</data>
+    </entity>
+    <!-- Flat Rate Shipping method default setup -->
+    <entity name="FlatRateShippingMethodDefault" type="flat_rate_shipping_method">
+        <requiredEntity type="active">flatRateActiveDefault</requiredEntity>
+        <requiredEntity type="title">flatRateTitleDefault</requiredEntity>
+        <requiredEntity type="name">flatRateNameDefault</requiredEntity>
+        <requiredEntity type="type">flatRateTypeDefault</requiredEntity>
+        <requiredEntity type="price">flatRatePriceDefault</requiredEntity>
+        <requiredEntity type="handling_type">flatRateHandlingTypeDefault</requiredEntity>
+        <requiredEntity type="handling_fee">flatRateHandlingFeeDefault</requiredEntity>
+        <requiredEntity type="specificerrmsg">flatRateSpecificerrmsgDefault</requiredEntity>
+        <requiredEntity type="sallowspecific">flatRateSallowspecificDefault</requiredEntity>
+        <requiredEntity type="specificcountry">flatRateSpecificcountryDefault</requiredEntity>
+        <requiredEntity type="showmethod">flatRateShowmethodDefault</requiredEntity>
+        <requiredEntity type="sort_order">flatRateSortOrderDefault</requiredEntity>
+    </entity>
+    <entity name="flatRateActiveDefault" type="active">
+        <data key="value">1</data>
+    </entity>
+    <entity name="flatRateTitleDefault" type="title">
+        <data key="value">Flat Rate</data>
+    </entity>
+    <entity name="flatRateNameDefault" type="name">
+        <data key="value">Fixed</data>
+    </entity>
+    <entity name="flatRateTypeDefault" type="type">
+        <data key="value">I</data>
+    </entity>
+    <entity name="flatRatePriceDefault" type="price">
+        <data key="value">5.00</data>
+    </entity>
+    <entity name="flatRateHandlingFeeDefault" type="handling_fee">
+        <data key="value">F</data>
+    </entity>
+    <entity name="flatRateSpecificerrmsgDefault" type="specificerrmsg">
+        <data key="value">This shipping method is not available. To use this shipping method, please contact us.</data>
+    </entity>
+    <entity name="flatRateSallowspecificDefault" type="sallowspecific">
+        <data key="value">0</data>
+    </entity>
+    <entity name="flatRateSpecificcountryDefault" type="specificcountry">
+        <data key="value" />
+    </entity>
+    <entity name="flatRateShowmethodDefault" type="showmethod">
+        <data key="value">0</data>
+    </entity>
+    <entity name="flatRateSortOrderDefault" type="sort_order">
+        <data key="value" />
+    </entity>
+</entities>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
new file mode 100644
index 0000000000000..512ef8389bb7b
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Enable Free Shipping method -->
+    <entity name="FreeShippinMethodConfig" type="free_shipping_method">
+        <requiredEntity type="active">freeActiveEnable</requiredEntity>
+    </entity>
+    <entity name="freeActiveEnable" type="active">
+        <data key="value">1</data>
+    </entity>
+    <!-- Free Shipping method default setup -->
+    <entity name="FreeShippinMethodDefault" type="free_shipping_method">
+        <requiredEntity type="active">freeActiveDefault</requiredEntity>
+        <requiredEntity type="title">freeTitleDefault</requiredEntity>
+        <requiredEntity type="name">freeNameDefault</requiredEntity>
+        <requiredEntity type="free_shipping_subtotal">freeShippingSubtotalDefault</requiredEntity>
+        <requiredEntity type="specificerrmsg">freeSpecificerrmsgDefault</requiredEntity>
+        <requiredEntity type="sallowspecific">freeSallowspecificDefault</requiredEntity>
+        <requiredEntity type="specificcountry">freeSpecificcountryDefault</requiredEntity>
+        <requiredEntity type="showmethod">freeShowmethodDefault</requiredEntity>
+        <requiredEntity type="sort_order">freeSortOrderDefault</requiredEntity>
+    </entity>
+    <entity name="freeActiveDefault" type="active">
+        <data key="value">0</data>
+    </entity>
+    <entity name="freeTitleDefault" type="title">
+        <data key="value">Free Shipping</data>
+    </entity>
+    <entity name="freeNameDefault" type="name">
+        <data key="value">Free</data>
+    </entity>
+    <entity name="freeShippingSubtotalDefault" type="free_shipping_subtotal">
+        <data key="value" />
+    </entity>
+    <entity name="freeSpecificerrmsgDefault" type="specificerrmsg">
+        <data key="value">This shipping method is not available. To use this shipping method, please contact us.</data>
+    </entity>
+    <entity name="freeSallowspecificDefault" type="sallowspecific">
+        <data key="value">0</data>
+    </entity>
+    <entity name="freeSpecificcountryDefault" type="specificcountry">
+        <data key="value" />
+    </entity>
+    <entity name="freeShowmethodDefault" type="showmethod">
+        <data key="value">0</data>
+    </entity>
+    <entity name="freeSortOrderDefault" type="sort_order">
+        <data key="value" />
+    </entity>
+    <!--Set Free Shipping Subtotal to 101-->
+    <entity name="setFreeShippingSubtotal" type="free_shipping_method">
+        <requiredEntity type="free_shipping_subtotal">freeShippingSubtotal</requiredEntity>
+    </entity>
+    <entity name="freeShippingSubtotal" type="free_shipping_subtotal">
+        <data key="value">101</data>
+    </entity>
+    <!--Set to default Free Shipping Subtotal-->
+    <entity name="setFreeShippingSubtotalToDefault" type="free_shipping_method">
+        <requiredEntity type="free_shipping_subtotal">freeShippingSubtotalDefault</requiredEntity>
+    </entity>
+    <entity name="freeShippingSubtotalDefault" type="free_shipping_subtotal">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
new file mode 100644
index 0000000000000..1151e55c4378f
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultFlatRateMethod" type="shipping">
+        <data key="enabled">Yes</data>
+        <data key="title">Flat Rate</data>
+        <data key="methodName">Fixed</data>
+        <data key="type">Per Item</data>
+        <data key="price">5.00</data>
+        <data key="calculateHandlingFee">Fixed</data>
+        <data key="handlingFee">0.00</data>
+        <data key="errorMessage">This shipping method is not available. To use this shipping method, please contact us.</data>
+        <data key="applicableCountries">All Allowed Countries</data>
+        <data key="showIfNotApplicable">No</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE.txt b/app/code/Magento/Shipping/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE.txt
rename to app/code/Magento/Shipping/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE_AFL.txt b/app/code/Magento/Shipping/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE_AFL.txt
rename to app/code/Magento/Shipping/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
new file mode 100644
index 0000000000000..5781b886386f6
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="FlatRateShippingMethodSetup" dataType="flat_rate_shipping_method" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
+        <object key="groups" dataType="flat_rate_shipping_method">
+            <object key="flatrate" dataType="flat_rate_shipping_method">
+                <object key="fields" dataType="flat_rate_shipping_method">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="title" dataType="title">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="name" dataType="name">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="type" dataType="type">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="price" dataType="price">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="handling_type" dataType="handling_type">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="handling_fee" dataType="handling_fee">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="specificerrmsg" dataType="specificerrmsg">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="sallowspecific" dataType="sallowspecific">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="specificcountry" dataType="specificcountry">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="showmethod" dataType="showmethod">
+                        <field key="value">string</field>
+                    </object>
+                     <object key="sort_order" dataType="sort_order">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="FreeShippingMethodSetup" dataType="free_shipping_method" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
+        <object key="groups" dataType="free_shipping_method">
+            <object key="freeshipping" dataType="free_shipping_method">
+                <object key="fields" dataType="free_shipping_method">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="title" dataType="title">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="name" dataType="name">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="free_shipping_subtotal" dataType="free_shipping_subtotal">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="specificerrmsg" dataType="specificerrmsg">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="sallowspecific" dataType="sallowspecific">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="specificcountry" dataType="specificcountry">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="showmethod" dataType="showmethod">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="sort_order" dataType="sort_order">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
new file mode 100644
index 0000000000000..597abb5694e30
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Shipping">
+        <section name="AdminShipmentMainActionsSection"/>
+        <section name="AdminShipmentOrderInformationSection"/>
+        <section name="AdminShipmentAddressInformationSection"/>
+        <section name="AdminShipmentPaymentShippingSection"/>
+        <section name="AdminShipmentItemsSection"/>
+        <section name="AdminShipmentTotalSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/README.md b/app/code/Magento/Shipping/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6acc747f50d71
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Shipping Functional Tests
+
+The Functional Test Module for **Magento Shipping** module.
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
new file mode 100644
index 0000000000000..10878310c262f
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <section name="AdminShipmentAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+        <element name="goToShippingInformation" type="button" selector="//button[@title='Go to Shipping Information']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
new file mode 100644
index 0000000000000..a7bf82588f7c7
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminShipmentItemsSection">
+        <element name="itemName" type="text" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-product .product-title" parameterized="true"/>
+        <element name="itemSku" type="text" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-product .product-sku-block" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-ordered-qty .qty-table" parameterized="true"/>
+        <element name="itemQtyToShip" type="input" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-qty input.qty-item" parameterized="true"/>
+        <element name="nameColumn" type="text" selector=".order-shipment-table .col-product .product-title"/>
+        <element name="skuColumn" type="text" selector=".order-shipment-table .col-product .product-sku-block"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
new file mode 100644
index 0000000000000..9f66b269b96ac
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminShipmentMainActionsSection">
+        <element name="submitShipment" type="button" selector="button.action-default.save.submit-button"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
new file mode 100644
index 0000000000000..ca2b867bc1f4c
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminShipmentOrderInformationSection">
+        <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
new file mode 100644
index 0000000000000..48c7106c2d65e
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminShipmentPaymentShippingSection">
+        <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="PaymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+        <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
+        <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
+        <element name="AddTrackingNumber" type="button" selector="#tracking_numbers_table tfoot [data-ui-id='shipment-tracking-add-button']"/>
+        <element name="Carrier" type="select" selector="#tracking_numbers_table tr:nth-of-type({{row}}) .col-carrier select" parameterized="true"/>
+        <element name="Title" type="input" selector="#tracking_numbers_table tr:nth-of-type({{row}}) .col-title input" parameterized="true"/>
+        <element name="Number" type="input" selector="#tracking_numbers_table tr:nth-of-type({{row}} .col-number input)" parameterized="true"/>
+        <element name="Delete" type="button" selector="#tracking_numbers_table tr:nth-of-type({{row}} .col-delete button.action-delete)" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
new file mode 100644
index 0000000000000..f2f39d77d8d79
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminShipmentTotalSection">
+        <element name="CommentText" type="textarea" selector="#shipment_comment_text"/>
+        <element name="AppendComments" type="checkbox" selector=".order-totals input#notify_customer"/>
+        <element name="EmailCopy" type="checkbox" selector=".order-totals input#send_email"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 0000000000000..a0edf4e13a80f
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CAdminTest">
+        <!--Ship Order-->
+        <comment userInput="Admin creates shipment" stepKey="adminCreatesShipmentComment" before="clickShipAction"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction" after="clickOrderIdLinkOnInvoice"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl" after="clickShipAction"/>
+
+        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatus" after="seeOrderShipmentUrl"/>
+        <actionGroup ref="verifyBasicShipmentInformation" stepKey="checkBasicShipmentOrderInfo" after="seeShipmentOrderStatus">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!--Submit Shipment-->
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment" after="checkBasicShipmentOrderInfo"/>
+        <!--Shipment created successfully-->
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShipping" after="clickSubmitShipment"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="$getOrderId" stepKey="seeOrderIdInPageNameAfterShip" after="seeViewOrderPageShipping"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess" after="seeOrderIdInPageNameAfterShip"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Complete" stepKey="seeOrderComplete" after="seeShipmentCreateSuccess"/>
+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 1" stepKey="seeShippedQuantity" after="seeOrderComplete"/>
+
+        <click selector="{{AdminOrderDetailsOrderViewSection.shipments}}" stepKey="clickOrderShipmentsTab" after="seeShippedQuantity"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForShipmentTabLoad" after="clickOrderShipmentsTab"/>
+        <see selector="{{AdminOrderShipmentsTabSection.gridRow('1')}}" userInput="{{Simple_US_Customer.firstname}}" stepKey="seeOrderShipmentInTabGrid" after="waitForShipmentTabLoad"/>
+        <click selector="{{AdminOrderShipmentsTabSection.viewGridRow('1')}}" stepKey="clickRowToViewShipment" after="seeOrderShipmentInTabGrid"/>
+        <see selector="{{AdminShipmentOrderInformationSection.orderId}}" userInput="$getOrderId" stepKey="seeOrderIdOnShipment" after="clickRowToViewShipment"/>
+        <actionGroup ref="verifyBasicShipmentInformation" stepKey="checkShipmentOrderInformation" after="seeOrderIdOnShipment">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInShipmentItems" stepKey="seeSimpleProductInShipmentItems" after="checkShipmentOrderInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInShipmentItems" stepKey="seeConfigurableProductInShipmentItems" after="seeSimpleProductInShipmentItems">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <click selector="{{AdminShipmentOrderInformationSection.orderId}}" stepKey="clickOrderIdOnShipment" after="seeConfigurableProductInShipmentItems"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php
index e779b8ea1cd04..f809e53fc40c8 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php
@@ -179,7 +179,7 @@ public function testExecuteLoadException()
      */
     public function testExecuteSaveException()
     {
-        $logerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
 
         $this->shipmentLoaderMock->expects($this->once())
             ->method('load')
@@ -189,11 +189,11 @@ public function testExecuteSaveException()
             ->with($this->shipmentMock, $this->requestMock)
             ->will($this->returnValue(true));
         $this->shipmentMock->expects($this->once())->method('save')->will($this->throwException(new \Exception()));
-        $logerMock->expects($this->once())->method('critical');
+        $loggerMock->expects($this->once())->method('critical');
         $this->objectManagerMock->expects($this->once())
             ->method('get')
             ->with(\Psr\Log\LoggerInterface::class)
-            ->will($this->returnValue($logerMock));
+            ->will($this->returnValue($loggerMock));
         $this->responseMock->expects($this->once())->method('representJson');
 
         $this->assertNull($this->controller->execute());
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php
index 27b0192a702fd..b6da3f9cea20e 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php
@@ -86,6 +86,11 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
      */
     protected $pageTitleMock;
 
+    /**
+     * @var \Magento\Shipping\Model\ShipmentProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shipmentProviderMock;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -128,6 +133,10 @@ protected function setUp()
             \Magento\Backend\Model\Session::class,
             ['setIsUrlNotice', 'getCommentText']
         );
+        $this->shipmentProviderMock = $this->getMockBuilder(\Magento\Shipping\Model\ShipmentProviderInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getShipmentData'])
+            ->getMockForAbstractClass();
         $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']);
         $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
         $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
@@ -166,7 +175,7 @@ protected function setUp()
             \Magento\Shipping\Controller\Adminhtml\Order\Shipment\NewAction::class,
             [
                 'context' => $this->context, 'shipmentLoader' => $this->shipmentLoader, 'request' => $this->request,
-                'response' => $this->response, 'view' => $this->view
+                'response' => $this->response, 'view' => $this->view, 'shipmentProvider' => $this->shipmentProviderMock
             ]
         );
     }
@@ -188,7 +197,6 @@ public function testExecute()
                     [
                         ['order_id', null, $orderId],
                         ['shipment_id', null, $shipmentId],
-                        ['shipment', null, $shipmentData],
                         ['tracking', null, $tracking],
                     ]
                 )
@@ -261,6 +269,9 @@ public function testExecute()
             ->method('getBlock')
             ->with('menu')
             ->will($this->returnValue($menuBlock));
+        $this->shipmentProviderMock->expects($this->once())
+            ->method('getShipmentData')
+            ->willReturn($shipmentData);
 
         $this->assertNull($this->newAction->execute());
     }
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php
index 65460d1a13eea..2db8eabffae61 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php
@@ -204,6 +204,14 @@ public function testExecuteNoShipment()
         $this->assertEquals($this->resultForwardMock, $this->controller->execute());
     }
 
+    /**
+     * @param $orderId
+     * @param $shipmentId
+     * @param $shipment
+     * @param $tracking
+     * @param $comeFrom
+     * @param $returnShipment
+     */
     protected function loadShipment($orderId, $shipmentId, $shipment, $tracking, $comeFrom, $returnShipment)
     {
         $valueMap = [
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
index 39c960e933d45..83dd9595cc43b 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
@@ -5,55 +5,67 @@
  */
 namespace Magento\Shipping\Test\Unit\Controller\Adminhtml\Order;
 
+use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
+use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
+use Magento\Sales\Api\Data\ShipmentTrackCreationInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
+
 /**
- * Class ShipmentLoaderTest
- *
- * @package Magento\Shipping\Controller\Adminhtml\Order
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShipmentLoaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManager
      */
-    protected $objectManagerMock;
+    private $objectManagerMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $registryMock;
+    private $registryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $messageManagerMock;
+    private $messageManagerMock;
 
     /**
      * @var \Magento\Sales\Model\Order\ShipmentRepository|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $shipmentRepositoryMock;
+    private $shipmentRepositoryMock;
 
     /**
-     * @var \Magento\Sales\Model\Order\ShipmentFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ShipmentDocumentFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $shipmentFactory;
+    private $documentFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ShipmentTrackCreationInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $trackFactoryMock;
+
+    /**
+     * @var ShipmentItemCreationInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $trackFactoryMock;
+    private $itemFactoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $orderRepository;
+    private $orderRepositoryMock;
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
      */
-    protected $loader;
+    private $loader;
 
     protected function setUp()
     {
+        $this->objectManagerMock = new ObjectManager($this);
         $this->shipmentRepositoryMock = $this->getMockBuilder(\Magento\Sales\Model\Order\ShipmentRepository::class)
             ->disableOriginalConstructor()
             ->setMethods(['get'])
@@ -62,19 +74,23 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->shipmentFactory = $this->getMockBuilder(\Magento\Sales\Model\Order\ShipmentFactory::class)
+        $this->trackFactoryMock = $this->getMockBuilder(ShipmentTrackCreationInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->trackFactoryMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\TrackFactory::class)
+        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->setMethods([])
             ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
+        $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->orderRepository = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
+        $this->itemFactoryMock = $this->getMockBuilder(ShipmentItemCreationInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->documentFactoryMock = $this->getMockBuilder(ShipmentDocumentFactory::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
@@ -84,19 +100,23 @@ protected function setUp()
             'shipment_id' => 1000065,
             'shipment' => ['items' => [1 => 1, 2 => 2]],
             'tracking' => [
-                ['number' => 'jds0395'],
-                ['number' => 'lsk984g'],
+                ['number' => 'jds0395', 'title' => 'DHL', 'carrier_code' => 'dhl'],
+                ['number' => 'lsk984g', 'title' => 'UPS', 'carrier_code' => 'ups'],
             ],
         ];
 
-        $this->loader = new \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader(
-            $this->messageManagerMock,
-            $this->registryMock,
-            $this->shipmentRepositoryMock,
-            $this->shipmentFactory,
-            $this->trackFactoryMock,
-            $this->orderRepository,
-            $data
+        $this->loader = $this->objectManagerMock->getObject(
+            ShipmentLoader::class,
+            [
+                'messageManager' => $this->messageManagerMock,
+                'registry' => $this->registryMock,
+                'shipmentRepository' => $this->shipmentRepositoryMock,
+                'orderRepository' => $this->orderRepositoryMock,
+                'documentFactory' => $this->documentFactoryMock,
+                'trackFactory' => $this->trackFactoryMock,
+                'itemFactory' => $this->itemFactoryMock,
+                'data' => $data
+            ]
         );
     }
 
@@ -123,7 +143,7 @@ public function testLoadOrderId()
             ->disableOriginalConstructor()
             ->setMethods(['getForcedShipmentWithInvoice', 'getId', 'canShip'])
             ->getMock();
-        $this->orderRepository->expects($this->once())
+        $this->orderRepositoryMock->expects($this->once())
             ->method('get')
             ->will($this->returnValue($orderMock));
         $orderMock->expects($this->once())
@@ -139,27 +159,13 @@ public function testLoadOrderId()
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->shipmentFactory->expects($this->once())
-            ->method('create')
-            ->with($orderMock, $this->loader->getShipment()['items'])
-            ->willReturn($shipmentModelMock);
-        $trackMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+        $trackMock = $this->getMockBuilder(ShipmentTrackCreationInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
+            ->setMethods(['setCarrierCode', 'setTrackNumber', 'setTitle'])
+            ->getMockForAbstractClass();
         $this->trackFactoryMock->expects($this->any())
             ->method('create')
             ->will($this->returnValue($trackMock));
-        $trackMock->expects($this->any())
-            ->method('addData')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        [$this->loader->getTracking()[0], $trackMock],
-                        [$this->loader->getTracking()[1], $trackMock],
-                    ]
-                )
-            );
         $shipmentModelMock->expects($this->any())
             ->method('addTrack')
             ->with($this->equalTo($trackMock))
@@ -167,6 +173,13 @@ public function testLoadOrderId()
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('current_shipment', $shipmentModelMock);
+        $itemMock = $this->getMockBuilder(ShipmentItemCreationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->itemFactoryMock->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($itemMock));
+        $this->documentFactoryMock->expects($this->once())->method('create')->willReturn($shipmentModelMock);
 
         $this->assertEquals($shipmentModelMock, $this->loader->load());
     }
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
index 499f71a271981..b40f5b26b89f1 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Test\Unit\Model\Carrier;
 
 use \Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
@@ -99,7 +100,7 @@ public function testComposePackages()
         $this->stockItemData->expects($this->atLeastOnce())->method('getIsDecimalDivided')
             ->will($this->returnValue(true));
 
-        $this->carrier->proccessAdditionalValidation($request);
+        $this->carrier->processAdditionalValidation($request);
     }
 
     public function testParseXml()
@@ -118,7 +119,7 @@ public function testParseXml()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Security validation of XML document has been failed.
+     * @expectedExceptionMessage The security validation of the XML document has failed.
      */
     public function testParseXmlXXEXml()
     {
@@ -134,7 +135,7 @@ public function testParseXmlXXEXml()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Security validation of XML document has been failed.
+     * @expectedExceptionMessage The security validation of the XML document has failed.
      */
     public function testParseXmlXQBXml()
     {
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/InfoTest.php b/app/code/Magento/Shipping/Test/Unit/Model/InfoTest.php
new file mode 100644
index 0000000000000..6bc95993bfde6
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Unit/Model/InfoTest.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Shipping\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Shipping\Model\Info;
+use Magento\Shipping\Model\ResourceModel\Order\Track\CollectionFactory;
+
+/**
+ * Test for \Magento\Shipping\Model\Info.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class InfoTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Info
+     */
+    private $info;
+
+    /**
+     * @var \Magento\Shipping\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helper;
+
+    /**
+     * @var \Magento\Sales\Model\OrderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderFactory;
+
+    /**
+     * @var \Magento\Sales\Api\ShipmentRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shipmentRepository;
+
+    /**
+     * @var \Magento\Shipping\Model\Order\TrackFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $trackFactory;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $trackCollectionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->helper = $this->getMockBuilder(\Magento\Shipping\Helper\Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderFactory = $this->getMockBuilder(\Magento\Sales\Model\OrderFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->shipmentRepository = $this->getMockBuilder(\Magento\Sales\Api\ShipmentRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->trackFactory = $this->getMockBuilder(\Magento\Shipping\Model\Order\TrackFactory::class)
+           ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->trackCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManager($this);
+        $this->info = $objectManagerHelper->getObject(
+            Info::class,
+            [
+                'shippingData' => $this->helper,
+                'orderFactory' => $this->orderFactory,
+                'shipmentRepository' => $this->shipmentRepository,
+                'trackFactory' => $this->trackFactory,
+                'trackCollectionFactory' => $this->trackCollectionFactory,
+            ]
+        );
+    }
+
+    public function testLoadByHashWithOrderId()
+    {
+        $hash = strtr(base64_encode('order_id:1:protected_code'), '+/=', '-_,');
+        $decodedHash = [
+            'key' => 'order_id',
+            'id' => 1,
+            'hash' => 'protected_code',
+        ];
+        $shipmentId = 1;
+        $shipmentIncrementId = 3;
+        $trackDetails = 'track_details';
+
+        $this->helper->expects($this->atLeastOnce())
+            ->method('decodeTrackingHash')
+            ->with($hash)
+            ->willReturn($decodedHash);
+        $shipmentCollection = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Shipment\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIterator'])
+            ->getMock();
+
+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'getId', 'getProtectCode', 'getShipmentsCollection'])
+            ->getMock();
+        $order->expects($this->atLeastOnce())->method('load')->with($decodedHash['id'])->willReturnSelf();
+        $order->expects($this->atLeastOnce())->method('getId')->willReturn($decodedHash['id']);
+        $order->expects($this->atLeastOnce())->method('getProtectCode')->willReturn($decodedHash['hash']);
+        $order->expects($this->atLeastOnce())->method('getShipmentsCollection')->willReturn($shipmentCollection);
+        $this->orderFactory->expects($this->atLeastOnce())->method('create')->willReturn($order);
+
+        $shipment = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIncrementId', 'getId'])
+            ->getMock();
+        $shipment->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($shipmentIncrementId);
+        $shipment->expects($this->atLeastOnce())->method('getId')->willReturn($shipmentId);
+        $shipmentCollection->expects($this->any())->method('getIterator')->willReturn(new \ArrayIterator([$shipment]));
+
+        $track = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setShipment', 'getNumberDetail'])
+            ->getMock();
+        $track->expects($this->atLeastOnce())->method('setShipment')->with($shipment)->willReturnSelf();
+        $track->expects($this->atLeastOnce())->method('getNumberDetail')->willReturn($trackDetails);
+        $trackCollection = $this->getMockBuilder(\Magento\Shipping\Model\ResourceModel\Order\Track\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIterator', 'setShipmentFilter'])
+            ->getMock();
+        $trackCollection->expects($this->atLeastOnce())
+            ->method('setShipmentFilter')
+            ->with($shipmentId)
+            ->willReturnSelf();
+        $trackCollection->expects($this->atLeastOnce())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$track]));
+
+        $this->trackCollectionFactory->expects($this->atLeastOnce())->method('create')->willReturn($trackCollection);
+        $this->info->loadByHash($hash);
+
+        $this->assertEquals([$shipmentIncrementId => [$trackDetails]], $this->info->getTrackingInfo());
+    }
+
+    public function testLoadByHashWithOrderIdWrongCode()
+    {
+        $hash = strtr(base64_encode('order_id:1:0'), '+/=', '-_,');
+        $decodedHash = [
+            'key' => 'order_id',
+            'id' => 1,
+            'hash' => '0',
+        ];
+        $this->helper->expects($this->atLeastOnce())
+            ->method('decodeTrackingHash')
+            ->with($hash)
+            ->willReturn($decodedHash);
+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'getId', 'getProtectCode'])
+            ->getMock();
+        $order->expects($this->atLeastOnce())->method('load')->with($decodedHash['id'])->willReturnSelf();
+        $order->expects($this->atLeastOnce())->method('getId')->willReturn($decodedHash['id']);
+        $order->expects($this->atLeastOnce())->method('getProtectCode')->willReturn('0e123123123');
+        $this->orderFactory->expects($this->atLeastOnce())->method('create')->willReturn($order);
+        $this->info->loadByHash($hash);
+
+        $this->assertEmpty($this->info->getTrackingInfo());
+    }
+
+    public function testLoadByHashWithShipmentId()
+    {
+        $hash = strtr(base64_encode('ship_id:1:protected_code'), '+/=', '-_,');
+        $decodedHash = [
+            'key' => 'ship_id',
+            'id' => 1,
+            'hash' => 'protected_code',
+        ];
+        $shipmentIncrementId = 3;
+        $trackDetails = 'track_details';
+
+        $this->helper->expects($this->atLeastOnce())
+            ->method('decodeTrackingHash')
+            ->with($hash)
+            ->willReturn($decodedHash);
+        $shipment = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId', 'getProtectCode', 'getIncrementId', 'getId'])
+            ->getMock();
+        $shipment->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($shipmentIncrementId);
+        $shipment->expects($this->atLeastOnce())->method('getId')->willReturn($decodedHash['id']);
+        $shipment->expects($this->atLeastOnce())->method('getEntityId')->willReturn(3);
+        $shipment->expects($this->atLeastOnce())->method('getProtectCode')->willReturn($decodedHash['hash']);
+        $this->shipmentRepository->expects($this->atLeastOnce())
+            ->method('get')
+            ->with($decodedHash['id'])
+            ->willReturn($shipment);
+        $track = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setShipment', 'getNumberDetail'])
+            ->getMock();
+        $track->expects($this->atLeastOnce())->method('setShipment')->with($shipment)->willReturnSelf();
+        $track->expects($this->atLeastOnce())->method('getNumberDetail')->willReturn($trackDetails);
+        $trackCollection = $this->getMockBuilder(\Magento\Shipping\Model\ResourceModel\Order\Track\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIterator', 'setShipmentFilter'])
+            ->getMock();
+        $trackCollection->expects($this->atLeastOnce())
+            ->method('setShipmentFilter')
+            ->with($decodedHash['id'])
+            ->willReturnSelf();
+        $trackCollection->expects($this->atLeastOnce())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$track]));
+        $this->trackCollectionFactory->expects($this->atLeastOnce())->method('create')->willReturn($trackCollection);
+
+        $this->info->loadByHash($hash);
+
+        $this->assertEquals([$shipmentIncrementId => [$trackDetails]], $this->info->getTrackingInfo());
+    }
+
+    public function testLoadByHashWithShipmentIdWrongCode()
+    {
+        $hash = strtr(base64_encode('ship_id:1:0'), '+/=', '-_,');
+        $decodedHash = [
+            'key' => 'ship_id',
+            'id' => 1,
+            'hash' => '0',
+        ];
+        $this->helper->expects($this->atLeastOnce())
+            ->method('decodeTrackingHash')
+            ->with($hash)
+            ->willReturn($decodedHash);
+        $shipment = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId', 'getProtectCode'])
+            ->getMock();
+        $shipment->expects($this->atLeastOnce())->method('getEntityId')->willReturn(3);
+        $shipment->expects($this->atLeastOnce())->method('getProtectCode')->willReturn('0e123123123');
+        $this->shipmentRepository->expects($this->atLeastOnce())
+            ->method('get')
+            ->with($decodedHash['id'])
+            ->willReturn($shipment);
+
+        $this->info->loadByHash($hash);
+
+        $this->assertEmpty($this->info->getTrackingInfo());
+    }
+
+    /**
+     * @dataProvider loadByHashWithTrackIdDataProvider
+     * @param string $protectCodeHash
+     * @param string $protectCode
+     * @param string $numberDetail
+     * @param array $trackDetails
+     * @return void
+     */
+    public function testLoadByHashWithTrackId(
+        string $protectCodeHash,
+        string $protectCode,
+        string $numberDetail,
+        array $trackDetails
+    ) {
+        $hash = base64_encode('hash');
+        $decodedHash = [
+            'key' => 'track_id',
+            'id' => 1,
+            'hash' => $protectCodeHash,
+            ];
+        $this->helper->expects($this->atLeastOnce())
+            ->method('decodeTrackingHash')
+            ->with($hash)
+            ->willReturn($decodedHash);
+        $track = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'getId', 'getProtectCode', 'getNumberDetail'])
+            ->getMock();
+        $track->expects($this->atLeastOnce())->method('load')->with($decodedHash['id'])->willReturnSelf();
+        $track->expects($this->atLeastOnce())->method('getId')->willReturn($decodedHash['id']);
+        $track->expects($this->atLeastOnce())->method('getProtectCode')->willReturn($protectCode);
+        $track->expects($this->any())->method('getNumberDetail')->willReturn($numberDetail);
+
+        $this->trackFactory->expects($this->atLeastOnce())->method('create')->willReturn($track);
+        $this->info->loadByHash($hash);
+
+        $this->assertEquals($trackDetails, $this->info->getTrackingInfo());
+    }
+
+    /**
+     * @return array
+     */
+    public function loadByHashWithTrackIdDataProvider()
+    {
+        return [
+            [
+                'hash' => 'protected_code',
+                'protect_code' => 'protected_code',
+                'number_detail' => 'track_details',
+                'track_details' => [['track_details']],
+            ],
+            [
+                'hash' => '0',
+                'protect_code' => '0e6640',
+                'number_detail' => '',
+                'track_details' => [],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 7d33f54eee037..b29a2fd537e96 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -5,30 +5,29 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "ext-gd": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-contact": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-user": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-contact": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-fedex": "100.3.*",
-        "magento/module-ups": "100.3.*",
-        "magento/module-config": "100.3.*"
+        "magento/module-fedex": "*",
+        "magento/module-ups": "*",
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Shipping/etc/adminhtml/di.xml b/app/code/Magento/Shipping/etc/adminhtml/di.xml
index 54d5d9664e66f..33a41318dd08b 100644
--- a/app/code/Magento/Shipping/etc/adminhtml/di.xml
+++ b/app/code/Magento/Shipping/etc/adminhtml/di.xml
@@ -7,4 +7,12 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Shipping\Model\Shipping" type="Magento\Shipping\Model\Shipping\Labels" />
+    <preference for="Magento\Shipping\Model\ShipmentProviderInterface" type="Magento\Shipping\Model\ShipmentProvider" />
+
+    <type name="Magento\Shipping\Helper\Data">
+        <arguments>
+            <!-- Use frontend URL model-->
+            <argument name="url" xsi:type="object">Magento\Framework\Url</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Shipping/etc/di.xml b/app/code/Magento/Shipping/etc/di.xml
index 5834678157058..51c77c2cecd2d 100644
--- a/app/code/Magento/Shipping/etc/di.xml
+++ b/app/code/Magento/Shipping/etc/di.xml
@@ -9,4 +9,22 @@
     <preference for="Magento\Quote\Model\Quote\Address\RateCollectorInterface" type="Magento\Shipping\Model\Shipping" />
     <preference for="Magento\Shipping\Model\CarrierFactoryInterface" type="Magento\Shipping\Model\CarrierFactory" />
     <preference for="Magento\Shipping\Model\Carrier\Source\GenericInterface" type="Magento\Shipping\Model\Carrier\Source\GenericDefault" />
+
+    <virtualType name="Magento\Shipping\Model\Carrier\VirtualDebug" type="Magento\Framework\Logger\Handler\Base">
+        <arguments>
+            <argument name="fileName" xsi:type="string">/var/log/shipping.log</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Shipping\Model\Method\VirtualLogger" type="Magento\Framework\Logger\Monolog">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="debug" xsi:type="object">Magento\Shipping\Model\Carrier\VirtualDebug</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Shipping\Model\Carrier\AbstractCarrier">
+        <arguments>
+            <argument name="logger" xsi:type="object">Magento\Shipping\Model\Method\VirtualLogger</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Shipping/etc/module.xml b/app/code/Magento/Shipping/etc/module.xml
index af78f43d77644..1a54ecd64b38e 100644
--- a/app/code/Magento/Shipping/etc/module.xml
+++ b/app/code/Magento/Shipping/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Shipping" setup_version="2.0.0">
+    <module name="Magento_Shipping" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
index 2894bf2596783..0853aead3b8bb 100644
--- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
+++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
@@ -15,6 +15,7 @@
                         <container name="extra_customer_info"/>
                     </block>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+                    <container name="extra_shipment_info"/>
                     <block class="Magento\Shipping\Block\Adminhtml\Create\Items" name="order_items" template="Magento_Shipping::create/items.phtml">
                         <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="default" as="default" template="Magento_Shipping::create/items/renderer/default.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
index 677102cc77d1d..e0ef730a6942b 100644
--- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
+++ b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
@@ -15,6 +15,7 @@
                         <container name="extra_customer_info"/>
                     </block>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+                    <container name="extra_shipment_info"/>
                     <block class="Magento\Shipping\Block\Adminhtml\View\Items" name="shipment_items" template="Magento_Shipping::view/items.phtml">
                         <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="default" as="default" template="Magento_Shipping::view/items/renderer/default.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
index 0b40bf40e97a3..be4069ccdc186 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
@@ -52,6 +52,7 @@
             </div>
         </div>
     </div>
+    <div><?= $block->getChildHtml('extra_shipment_info') ?></div>
     <div id="ship_items_container">
         <?= $block->getItemsHtml() ?>
     </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index 89cc760bb8290..35e36aa5584c9 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -27,7 +27,7 @@
                 </tr>
             </thead>
             <?php $_items = $block->getShipment()->getAllItems() ?>
-            <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
+            <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
                 <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
                     <?= $block->getItemHtml($_item) ?>
                     <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
index 55c782eb0fc82..32805ec0a3495 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -5,71 +5,76 @@
  */
 
 // @codingStandardsIgnoreFile
-
+/**
+ * @var \Magento\Shipping\Block\Adminhtml\View\Form $block
+ */
+$order = $block->getShipment()->getOrder();
 ?>
-<?php  $_order = $block->getShipment()->getOrder() ?>
-<?= $block->getChildHtml('order_info') ?>
+<?= $block->getChildHtml('order_info'); ?>
 <section class="admin__page-section order-shipment-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')); ?></span>
     </div>
     <div class="admin__page-section-content">
-
-        <?php /* Billing Address */ ?>
         <div class="admin__page-section-item order-payment-method">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Payment Information')); ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div><?= $block->getChildHtml('order_payment') ?></div>
-                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-currency">
+                    <?= $block->escapeHtml(__('The order was placed using %1.', $order->getOrderCurrencyCode())); ?>
+                </div>
             </div>
         </div>
 
-        <?php /* Shipping Address */ ?>
         <div class="admin__page-section-item order-shipping-address">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipping and Tracking Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipping and Tracking Information')); ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="shipping-description-wrapper">
                     <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
                         <p>
-                            <a href="#" id="linkId" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= /* @escapeNotVerified */ __('Track this shipment') ?>"><?= /* @escapeNotVerified */ __('Track this shipment') ?></a>
+                            <a href="#" id="linkId" onclick="popWin('<?= $block->escapeUrl($this->helper(\Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($block->getShipment())); ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')"
+                               title="<?= $block->escapeHtml(__('Track this shipment')); ?>">
+                                <?= $block->escapeHtml(__('Track this shipment')); ?>
+                            </a>
                         </p>
                     <?php endif; ?>
                     <div class="shipping-description-title">
-                        <?= $block->escapeHtml($_order->getShippingDescription()) ?>
+                        <?= $block->escapeHtml($order->getShippingDescription()); ?>
                     </div>
 
-                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
+                    <?= $block->escapeHtml(__('Total Shipping Charges')); ?>:
 
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                        <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()): ?>
+                        <?php $excl = $block->displayShippingPriceInclTax($order); ?>
                     <?php else: ?>
-                        <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                        <?php $excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                     <?php endif; ?>
-                    <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+                    <?php $incl = $block->displayShippingPriceInclTax($order); ?>
 
-                    <?= /* @escapeNotVerified */ $_excl ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                    <?= /* @noEscape */ $excl; ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $incl != $excl): ?>
+                        (<?= $block->escapeHtml(__('Incl. Tax')); ?> <?= /* @noEscape */ $incl; ?>)
                     <?php endif; ?>
                 </div>
-                <?php if ($block->canCreateShippingLabel()): ?>
+
                 <p>
-                    <?= /* @escapeNotVerified */ $block->getCreateLabelButton() ?>
+                    <?php if ($block->canCreateShippingLabel()): ?>
+                        <?= /* @noEscape */ $block->getCreateLabelButton(); ?>
+                    <?php endif ?>
                     <?php if ($block->getShipment()->getShippingLabel()): ?>
-                        <?= /* @escapeNotVerified */ $block->getPrintLabelButton() ?>
+                        <?= /* @noEscape */ $block->getPrintLabelButton(); ?>
                     <?php endif ?>
                     <?php if ($block->getShipment()->getPackages()): ?>
-                        <?= /* @escapeNotVerified */ $block->getShowPackagesButton() ?>
+                        <?= /* @noEscape */ $block->getShowPackagesButton(); ?>
                     <?php endif ?>
                 </p>
-                <?php endif ?>
-                <?= $block->getChildHtml('shipment_tracking') ?>
+                <?= $block->getChildHtml('shipment_tracking'); ?>
 
-                <?= $block->getChildHtml('shipment_packaging') ?>
+                <?= $block->getChildHtml('shipment_packaging'); ?>
                 <script>
                     require([
                         'jquery',
@@ -80,9 +85,9 @@
                                 window.packaging.sendCreateLabelRequest();
                             });
                             window.packaging.setLabelCreatedCallback(function () {
-                                setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
+                                setLocation("<?php echo $block->escapeUrl($block->getUrl(
                                     'adminhtml/order_shipment/view',
-                                    ['shipment_id' => $block->getShipment()->getId()]
+                                    ['shipment_id' => $block->getShipment()->getId()])
                                 ); ?>");
                             });
                         };
@@ -98,26 +103,27 @@
         </div>
     </div>
 </section>
+<div><?= $block->getChildHtml('extra_shipment_info') ?></div>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items Shipped') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items Shipped')); ?></span>
     </div>
-    <?= $block->getChildHtml('shipment_items') ?>
+    <?= $block->getChildHtml('shipment_items'); ?>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Order Total')); ?></span>
     </div>
     <div class="admin__page-section-content">
-        <?= $block->getChildHtml('shipment_packed') ?>
+        <?= $block->getChildHtml('shipment_packed'); ?>
 
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipment History') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipment History')); ?></span>
             </div>
-            <div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments') ?></div>
+            <div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments'); ?></div>
         </div>
     </div>
 </section>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index 202e96bc425c9..8dddfaedda4e5 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -16,7 +16,7 @@
             </tr>
         </thead>
         <?php $_items = $block->getShipment()->getAllItems() ?>
-        <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
+        <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
             <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
                 <?= $block->getItemHtml($_item) ?>
                 <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
index 1f4958d1775fb..ebc6163a7bd06 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -66,14 +66,12 @@
             </tr>
         </thead>
         <?php $_items = $_shipment->getAllItems(); ?>
-        <?php $_count = count($_items) ?>
         <?php foreach ($_items as $_item): ?>
-        <?php if ($_item->getOrderItem()->getParentItem()) {
-    continue;
-} ?>
-        <tbody>
-            <?= $block->getItemHtml($_item) ?>
-        </tbody>
+            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                <tbody>
+                    <?= $block->getItemHtml($_item) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
     </table>
 </div>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
index 344ad2a87e4f4..9253b47f82f5d 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
@@ -21,7 +21,7 @@ $fields = [
 ];
 $number = is_object($track) ? $track->getTracking() : $track['number'];
 ?>
-<table class="data table order tracking" id="tracking-table-popup-<?= /* @noEscape */ $number ?>">
+<table class="data table order tracking" id="tracking-table-popup-<?= $block->escapeHtml($number) ?>">
     <caption class="table-caption"><?= $block->escapeHtml(__('Order tracking')) ?></caption>
     <tbody>
     <?php if (is_object($track)): ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
index 8a9d5fc0fe371..237eba09ff802 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
@@ -11,7 +11,7 @@ $parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
 ?>
 <div class="table-wrapper">
-    <table class="data table order tracking" id="track-history-table-<?= /* @noEscape */ $track->getTracking() ?>">
+    <table class="data table order tracking" id="track-history-table-<?= $block->escapeHtml($track->getTracking()) ?>">
         <caption class="table-caption"><?= $block->escapeHtml(__('Track history')) ?></caption>
         <thead>
         <tr>
@@ -23,7 +23,7 @@ $track = $block->getData('track');
         </thead>
         <tbody>
         <?php foreach ($track->getProgressdetail() as $detail): ?>
-            <?php $detailDate = (!empty($detail['deliverydate']) ? $parentBlock->formatDeliveryDate($detail['deliverydate']) : ''); ?>
+            <?php $detailDate = (!empty($detail['deliverydate']) ? $parentBlock->formatDeliveryDate($detail['deliverydate'] . ' ' . $detail['deliverytime']) : ''); ?>
             <?php $detailTime = (!empty($detail['deliverytime']) ? $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) : ''); ?>
             <tr>
                 <td data-th="<?= $block->escapeHtml(__('Location')) ?>" class="col location">
diff --git a/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php
new file mode 100644
index 0000000000000..f7611660b93a1
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd case creation interface
+ *
+ * Interface of service for new Signifyd case creation and registering it on Magento side.
+ * Implementation should send request to Signifyd API and create new entity in Magento.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseCreationServiceInterface
+{
+    /**
+     * Create new case for order with specified id.
+     *
+     * @param int $orderId
+     * @return bool
+     * @throws \Magento\Framework\Exception\NotFoundException If order does not exists
+     * @throws \Magento\Framework\Exception\AlreadyExistsException If case for $orderId already exists
+     * @since 100.2.0
+     */
+    public function createForOrder($orderId);
+}
diff --git a/app/code/Magento/Signifyd/Api/CaseManagementInterface.php b/app/code/Magento/Signifyd/Api/CaseManagementInterface.php
new file mode 100644
index 0000000000000..69075a308cb96
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/CaseManagementInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd management interface
+ * Allows to performs operations with Signifyd cases.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseManagementInterface
+{
+    /**
+     * Creates new Case entity linked to order id.
+     *
+     * @param int $orderId
+     * @return \Magento\Signifyd\Api\Data\CaseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException If order does not exists
+     * @throws \Magento\Framework\Exception\AlreadyExistsException If case for $orderId already exists
+     * @since 100.2.0
+     */
+    public function create($orderId);
+
+    /**
+     * Gets Case entity associated with order id.
+     *
+     * @param int $orderId
+     * @return \Magento\Signifyd\Api\Data\CaseInterface|null
+     * @since 100.2.0
+     */
+    public function getByOrderId($orderId);
+}
diff --git a/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php b/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php
new file mode 100644
index 0000000000000..4f148a082b300
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd Case repository interface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseRepositoryInterface
+{
+    /**
+     * Saves case entity.
+     *
+     * @param \Magento\Signifyd\Api\Data\CaseInterface $case
+     * @return \Magento\Signifyd\Api\Data\CaseInterface
+     * @since 100.2.0
+     */
+    public function save(\Magento\Signifyd\Api\Data\CaseInterface $case);
+
+    /**
+     * Gets case entity by order id.
+     *
+     * @param int $id
+     * @return \Magento\Signifyd\Api\Data\CaseInterface
+     * @since 100.2.0
+     */
+    public function getById($id);
+
+    /**
+     * Gets entity by Signifyd case id.
+     *
+     * @param int $caseId
+     * @return \Magento\Signifyd\Api\Data\CaseInterface|null
+     * @since 100.2.0
+     */
+    public function getByCaseId($caseId);
+
+    /**
+     * Deletes case entity.
+     *
+     * @param \Magento\Signifyd\Api\Data\CaseInterface $case
+     * @return bool
+     * @since 100.2.0
+     */
+    public function delete(\Magento\Signifyd\Api\Data\CaseInterface $case);
+
+    /**
+     * Gets list of case entities.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Signifyd\Api\Data\CaseSearchResultsInterface
+     * @since 100.2.0
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+}
diff --git a/app/code/Magento/Signifyd/Api/Data/CaseInterface.php b/app/code/Magento/Signifyd/Api/Data/CaseInterface.php
new file mode 100644
index 0000000000000..eff46b972fc02
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/Data/CaseInterface.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api\Data;
+
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+
+/**
+ * Signifyd Case entity interface
+ *
+ * @api
+ * @see https://www.signifyd.com/docs/api/#/reference/cases/retrieve-a-case/get-a-case
+ * @since 100.2.0
+ */
+interface CaseInterface
+{
+    /**#@+
+     * Constants for case available statuses
+     */
+    const STATUS_OPEN = Gateway::STATUS_OPEN;
+    const STATUS_PENDING = 'PENDING';
+    const STATUS_PROCESSING = Gateway::STATUS_PROCESSING;
+    const STATUS_FLAGGED = Gateway::STATUS_FLAGGED;
+    const STATUS_DISMISSED = Gateway::STATUS_DISMISSED;
+    /**#@-*/
+
+    /**#@+
+     * Constants for guarantee available statuses
+     */
+    const GUARANTEE_APPROVED = Gateway::GUARANTEE_APPROVED;
+    const GUARANTEE_DECLINED = Gateway::GUARANTEE_DECLINED;
+    const GUARANTEE_PENDING = Gateway::GUARANTEE_PENDING;
+    const GUARANTEE_CANCELED = Gateway::GUARANTEE_CANCELED;
+    const GUARANTEE_IN_REVIEW = Gateway::GUARANTEE_IN_REVIEW;
+    const GUARANTEE_UNREQUESTED = Gateway::GUARANTEE_UNREQUESTED;
+    /**#@-*/
+
+    /**#@+
+     * Constants for case available review dispositions
+     */
+    const DISPOSITION_GOOD = Gateway::DISPOSITION_GOOD;
+    const DISPOSITION_FRAUDULENT = Gateway::DISPOSITION_FRAUDULENT;
+    const DISPOSITION_UNSET = Gateway::DISPOSITION_UNSET;
+    /**#@-*/
+
+    /**
+     * Returns local case entity identifier.
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getEntityId();
+
+    /**
+     * Sets local case entity id.
+     *
+     * @param int $id
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setEntityId($id);
+
+    /**
+     * Returns Signifyd case identifier.
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getCaseId();
+
+    /**
+     * Sets Signifyd case id.
+     *
+     * @param int $id
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setCaseId($id);
+
+    /**
+     * Returns value, which indicates if a guarantee can be requested for a case.
+     * Returns null if state of guarantee eligible does not set yet.
+     *
+     * @return boolean|null
+     * @since 100.2.0
+     */
+    public function isGuaranteeEligible();
+
+    /**
+     * Sets value-indicator about guarantee availability for a case.
+     *
+     * @param bool $guaranteeEligible
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setGuaranteeEligible($guaranteeEligible);
+
+    /**
+     * Returns decision state of the guarantee.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getGuaranteeDisposition();
+
+    /**
+     * Sets decision state of the guarantee.
+     *
+     * @param string $disposition
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setGuaranteeDisposition($disposition);
+
+    /**
+     * Returns case status.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getStatus();
+
+    /**
+     * Sets case status.
+     *
+     * @param string $status
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setStatus($status);
+
+    /**
+     * Returns value, which indicates the likelihood that the order is fraud.
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getScore();
+
+    /**
+     * Sets risk level value.
+     *
+     * @param int $score
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setScore($score);
+
+    /**
+     * Get order id for a case.
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getOrderId();
+
+    /**
+     * Sets order id for a case.
+     *
+     * @param int $orderId
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setOrderId($orderId);
+
+    /**
+     * Returns data about a team associated with a case.
+     *
+     * @return array
+     * @since 100.2.0
+     */
+    public function getAssociatedTeam();
+
+    /**
+     * Sets team data associated with a case.
+     *
+     * @param array $team
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setAssociatedTeam(array $team);
+
+    /**
+     * Returns disposition of an agent's opinion after reviewing the case.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getReviewDisposition();
+
+    /**
+     * Sets case disposition.
+     *
+     * @param string $disposition
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setReviewDisposition($disposition);
+
+    /**
+     * Returns creation datetime for a case.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getCreatedAt();
+
+    /**
+     * Sets creation datetime for a case.
+     *
+     * @param string $datetime in DATE_ATOM format
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setCreatedAt($datetime);
+
+    /**
+     * Returns updating datetime for a case.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getUpdatedAt();
+
+    /**
+     * Sets updating datetime for a case.
+     *
+     * @param string $datetime in DATE_ATOM format
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setUpdatedAt($datetime);
+}
diff --git a/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php b/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php
new file mode 100644
index 0000000000000..78d37841cff69
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api\Data;
+
+use Magento\Framework\Api\SearchResultsInterface;
+
+/**
+ * Retrieve and set list of case entities.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface CaseSearchResultsInterface extends SearchResultsInterface
+{
+    /**
+     * Gets collection of case entities.
+     *
+     * @return \Magento\Signifyd\Api\Data\CaseInterface[]
+     * @since 100.2.0
+     */
+    public function getItems();
+
+    /**
+     * Sets collection of case entities.
+     *
+     * @param \Magento\Signifyd\Api\Data\CaseInterface[] $items
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setItems(array $items);
+}
diff --git a/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php b/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php
new file mode 100644
index 0000000000000..41f4753d036a7
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd guarantee canceling interface.
+ *
+ * Interface allows to submit request to cancel previously created guarantee.
+ * Implementation should send request to Signifyd API and update existing case entity with guarantee information.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface GuaranteeCancelingServiceInterface
+{
+    /**
+     * Cancels Signifyd guarantee for an order.
+     *
+     * @param int $orderId
+     * @return bool
+     * @since 100.2.0
+     */
+    public function cancelForOrder($orderId);
+}
diff --git a/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php b/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php
new file mode 100644
index 0000000000000..b4502ea861acd
--- /dev/null
+++ b/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Api;
+
+/**
+ * Signifyd guarantee creation interface
+ *
+ * Interface allows submit previously created Signifyd case for a guaranty.
+ * Implementation should send request to Signifyd API and update existing case entity with guarantee infromation.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface GuaranteeCreationServiceInterface
+{
+    /**
+     * Request Signifyd guarantee for order
+     *
+     * @param int $orderId
+     * @return bool
+     * @since 100.2.0
+     */
+    public function createForOrder($orderId);
+}
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php b/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php
new file mode 100644
index 0000000000000..87d09e392e091
--- /dev/null
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Block\Adminhtml;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CaseManagement;
+
+/**
+ * Get Signifyd Case Info
+ *
+ * @api
+ * @since 100.2.0
+ */
+class CaseInfo extends Template
+{
+    /**
+     * @var CaseInterface
+     */
+    private $caseEntity = false;
+
+    /**
+     * @var CaseManagement
+     */
+    private $caseManagement;
+
+    /**
+     * @param Context $context
+     * @param CaseManagement $caseManagement
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        CaseManagement $caseManagement,
+        array $data = []
+    ) {
+        $this->caseManagement = $caseManagement;
+
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Gets case entity associated with order id.
+     *
+     * @return CaseInterface|null
+     */
+    private function getCaseEntity()
+    {
+        if ($this->caseEntity === false) {
+            $this->caseEntity = $this->caseManagement->getByOrderId(
+                $this->getOrderId()
+            );
+        }
+
+        return $this->caseEntity;
+    }
+
+    /**
+     * Default getter for case properties
+     *
+     * @param mixed $defaultValue
+     * @param callable $callback
+     * @return mixed
+     */
+    private function getCaseProperty($defaultValue, callable $callback)
+    {
+        return $this->isEmptyCase() ? $defaultValue : call_user_func($callback);
+    }
+
+    /**
+     * Checks if case is exists for order
+     *
+     * @return bool
+     * @since 100.2.0
+     */
+    public function isEmptyCase()
+    {
+        return $this->getCaseEntity() === null;
+    }
+
+    /**
+     * Gets case guarantee disposition status.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getCaseGuaranteeDisposition()
+    {
+        return $this->getCaseProperty('', function () {
+            $guaranteeStatusMap = [
+                CaseInterface::GUARANTEE_APPROVED => __('Approved'),
+                CaseInterface::GUARANTEE_DECLINED => __('Declined'),
+                CaseInterface::GUARANTEE_PENDING => __('Pending'),
+                CaseInterface::GUARANTEE_CANCELED => __('Canceled'),
+                CaseInterface::GUARANTEE_IN_REVIEW => __('In Review'),
+                CaseInterface::GUARANTEE_UNREQUESTED => __('Unrequested')
+            ];
+
+            $status = isset($guaranteeStatusMap[$this->getCaseEntity()->getGuaranteeDisposition()]) ?
+                $guaranteeStatusMap[$this->getCaseEntity()->getGuaranteeDisposition()] :
+                '';
+
+            return $status;
+        });
+    }
+
+    /**
+     * Retrieves current order Id.
+     *
+     * @return integer
+     */
+    private function getOrderId()
+    {
+        return (int) $this->getRequest()->getParam('order_id');
+    }
+}
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
new file mode 100644
index 0000000000000..7964d6b1af397
--- /dev/null
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Block\Adminhtml\System\Config\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+
+/**
+ * Input field transformed to text node with link to store Signifyd webhooks controller.
+ */
+class WebhookUrl extends Field
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $url = '';
+        $originalData = $element->getOriginalData();
+        if (!empty($originalData['handler_url'])) {
+            $url = $this->getStoreUrl();
+            $url .= $originalData['handler_url'];
+        }
+
+        return '<p class="webhook-url">' . $this->escapeHtml($url) . '</p>';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isInheritCheckboxRequired(AbstractElement $element)
+    {
+        return false;
+    }
+
+    /**
+     * Return base store URL.
+     *
+     * @return string
+     */
+    private function getStoreUrl()
+    {
+        $website = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'));
+
+        $isSecure = $this->_scopeConfig->isSetFlag(
+            Store::XML_PATH_SECURE_IN_FRONTEND,
+            ScopeInterface::SCOPE_WEBSITE,
+            $website->getCode()
+        );
+
+        $configPath = $isSecure ? Store::XML_PATH_SECURE_BASE_LINK_URL : Store::XML_PATH_UNSECURE_BASE_LINK_URL;
+
+        return $this->_scopeConfig->getValue($configPath, ScopeInterface::SCOPE_WEBSITE, $website->getCode());
+    }
+}
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php
new file mode 100644
index 0000000000000..c18c3dc596e21
--- /dev/null
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset;
+
+use Magento\Config\Block\System\Config\Form\Fieldset;
+
+/**
+ * Fieldset renderer with url attached to comment.
+ */
+class Info extends Fieldset
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _getHeaderCommentHtml($element)
+    {
+        $groupConfig = $element->getGroup();
+
+        if (!empty($groupConfig['more_url']) && !empty($element->getComment())) {
+            $comment = $element->getComment();
+            $comment .= '<p><a href="' . $this->escapeUrl($groupConfig['more_url']) . '" target="_blank">' .
+                $this->escapeHtml(__('Learn more')) . '</a></p>';
+            $element->setComment($comment);
+        }
+
+        return parent::_getHeaderCommentHtml($element);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Block/Fingerprint.php b/app/code/Magento/Signifyd/Block/Fingerprint.php
new file mode 100644
index 0000000000000..f43bffce1fc1a
--- /dev/null
+++ b/app/code/Magento/Signifyd/Block/Fingerprint.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Block;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\QuoteSession\QuoteSessionInterface;
+use Magento\Signifyd\Model\SignifydOrderSessionId;
+
+/**
+ * Provides data for Signifyd device fingerprinting script.
+ *
+ * Signifyd’s device fingerprinting solution uniquely tracks and identifies devices
+ * used to transact on your site, increasing your protection from fraud.
+ *
+ * @api
+ * @see https://www.signifyd.com/docs/api/#/reference/device-fingerprint/create-a-case
+ * @since 100.2.0
+ */
+class Fingerprint extends Template
+{
+    /**
+     * @var SignifydOrderSessionId
+     */
+    private $signifydOrderSessionId;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var QuoteSessionInterface
+     */
+    private $quoteSession;
+
+    /**
+     * @var string
+     * @since 100.2.0
+     */
+    protected $_template = 'Magento_Signifyd::fingerprint.phtml';
+
+    /**
+     * @param Context $context
+     * @param Config $config
+     * @param SignifydOrderSessionId $signifydOrderSessionId
+     * @param QuoteSessionInterface $quoteSession
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Config $config,
+        SignifydOrderSessionId $signifydOrderSessionId,
+        QuoteSessionInterface $quoteSession,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->signifydOrderSessionId = $signifydOrderSessionId;
+        $this->config = $config;
+        $this->quoteSession = $quoteSession;
+    }
+
+    /**
+     * Returns a unique Signifyd order session id.
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getSignifydOrderSessionId()
+    {
+        $quoteId = $this->quoteSession->getQuote()->getId();
+
+        return $this->signifydOrderSessionId->get($quoteId);
+    }
+
+    /**
+     * Checks if module is enabled.
+     *
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function isModuleActive()
+    {
+        $storeId = $this->quoteSession->getQuote()->getStoreId();
+
+        return $this->config->isActive($storeId);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php b/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php
new file mode 100644
index 0000000000000..2dee31f4048b9
--- /dev/null
+++ b/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Controller\Webhooks;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageReader;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequestValidator;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Responsible for handling webhook posts from Signifyd service.
+ *
+ * @see https://www.signifyd.com/docs/api/#/reference/webhooks/
+ */
+class Handler extends Action implements \Magento\Framework\App\CsrfAwareActionInterface
+{
+    /**
+     * Event topic of test webhook request.
+     *
+     * @var string
+     */
+    private static $eventTopicTest = 'cases/test';
+
+    /**
+     * @var WebhookRequest
+     */
+    private $webhookRequest;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var WebhookMessageReader
+     */
+    private $webhookMessageReader;
+
+    /**
+     * @var UpdatingServiceFactory
+     */
+    private $caseUpdatingServiceFactory;
+
+    /**
+     * @var WebhookRequestValidator
+     */
+    private $webhookRequestValidator;
+
+    /**
+     * @var CaseRepositoryInterface
+     */
+    private $caseRepository;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param Context $context
+     * @param WebhookRequest $webhookRequest
+     * @param LoggerInterface $logger
+     * @param WebhookMessageReader $webhookMessageReader
+     * @param UpdatingServiceFactory $caseUpdatingServiceFactory
+     * @param WebhookRequestValidator $webhookRequestValidator
+     * @param CaseRepositoryInterface $caseRepository
+     * @param Config $config
+     */
+    public function __construct(
+        Context $context,
+        WebhookRequest $webhookRequest,
+        LoggerInterface $logger,
+        WebhookMessageReader $webhookMessageReader,
+        UpdatingServiceFactory $caseUpdatingServiceFactory,
+        WebhookRequestValidator $webhookRequestValidator,
+        CaseRepositoryInterface $caseRepository,
+        Config $config
+    ) {
+        parent::__construct($context);
+        $this->webhookRequest = $webhookRequest;
+        $this->logger = $logger;
+        $this->webhookMessageReader = $webhookMessageReader;
+        $this->caseUpdatingServiceFactory = $caseUpdatingServiceFactory;
+        $this->webhookRequestValidator = $webhookRequestValidator;
+        $this->caseRepository = $caseRepository;
+        $this->config = $config;
+    }
+
+    /**
+     * Processes webhook request data and updates case entity
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        if ($this->config->isDebugModeEnabled()) {
+            $this->logger->debug($this->webhookRequest->getEventTopic() . '|' . $this->webhookRequest->getBody());
+        }
+
+        if (!$this->webhookRequestValidator->validate($this->webhookRequest)) {
+            $this->_redirect('noroute');
+            return;
+        }
+
+        $webhookMessage = $this->webhookMessageReader->read($this->webhookRequest);
+        if ($webhookMessage->getEventTopic() === self::$eventTopicTest) {
+            return;
+        }
+
+        $data = $webhookMessage->getData();
+        if (empty($data['caseId'])) {
+            $this->_redirect('noroute');
+            return;
+        }
+
+        $case = $this->caseRepository->getByCaseId($data['caseId']);
+        if ($case === null) {
+            $this->_redirect('noroute');
+            return;
+        }
+
+        $caseUpdatingService = $this->caseUpdatingServiceFactory->create($webhookMessage->getEventTopic());
+        try {
+            $caseUpdatingService->update($case, $data);
+        } catch (LocalizedException $e) {
+            $this->getResponse()->setHttpResponseCode(400);
+            $this->logger->critical($e);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(RequestInterface $request): ?InvalidRequestException
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE.txt b/app/code/Magento/Signifyd/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE.txt
rename to app/code/Magento/Signifyd/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE_AFL.txt b/app/code/Magento/Signifyd/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE_AFL.txt
rename to app/code/Magento/Signifyd/LICENSE_AFL.txt
diff --git a/app/code/Magento/Signifyd/Model/CaseEntity.php b/app/code/Magento/Signifyd/Model/CaseEntity.php
new file mode 100644
index 0000000000000..c11c72db79f16
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseEntity.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+/**
+ * Implementation of Signifyd Case interface.
+ */
+class CaseEntity extends AbstractModel implements CaseInterface
+{
+    /**
+     * @var string
+     */
+    protected $_eventPrefix = 'signifyd_case';
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * CaseEntity constructor.
+     *
+     * @param Context $context
+     * @param Registry $registry
+     * @param SerializerInterface $serializer
+     * @param array $data
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        SerializerInterface $serializer,
+        array $data = [],
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null
+    ) {
+        $this->serializer = $serializer;
+        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(ResourceModel\CaseEntity::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getEntityId()
+    {
+        return (int) $this->getData('entity_id');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setEntityId($id)
+    {
+        $this->setData('entity_id', (int) $id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCaseId()
+    {
+        return (int) $this->getData('case_id');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setCaseId($id)
+    {
+        $this->setData('case_id', (int) $id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isGuaranteeEligible()
+    {
+        $value = $this->getData('guarantee_eligible');
+        return ($value === null) ? $value : (bool) $value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setGuaranteeEligible($guaranteeEligible)
+    {
+        $this->setData('guarantee_eligible', $guaranteeEligible);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getGuaranteeDisposition()
+    {
+        return (string) $this->getData('guarantee_disposition');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setGuaranteeDisposition($disposition)
+    {
+        $this->setData('guarantee_disposition', (string) $disposition);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getStatus()
+    {
+        return (string) $this->getData('status');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setStatus($status)
+    {
+        $this->setData('status', (string) $status);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getScore()
+    {
+        return (int) $this->getData('score');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setScore($score)
+    {
+        $this->setData('score', (int) $score);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrderId()
+    {
+        return (int) $this->getData('order_id');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setOrderId($orderId)
+    {
+        $this->setData('order_id', (int) $orderId);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAssociatedTeam()
+    {
+        $teamData = $this->getData('associated_team');
+        return empty($teamData) ? [] : $this->serializer->unserialize($teamData);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setAssociatedTeam(array $team)
+    {
+        $this->setData('associated_team', $this->serializer->serialize($team));
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getReviewDisposition()
+    {
+        return (string) $this->getData('review_disposition');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setReviewDisposition($disposition)
+    {
+        $this->setData('review_disposition', (string) $disposition);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCreatedAt()
+    {
+        return $this->getData('created_at');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setCreatedAt($datetime)
+    {
+        $this->setData('created_at', $datetime);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getUpdatedAt()
+    {
+        return $this->getData('updated_at');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setUpdatedAt($datetime)
+    {
+        $this->setData('updated_at', $datetime);
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseManagement.php b/app/code/Magento/Signifyd/Model/CaseManagement.php
new file mode 100644
index 0000000000000..1913f1e7a17b3
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseManagement.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Signifyd\Api\CaseManagementInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\DB\Adapter\DuplicateException;
+
+/**
+ *
+ * Default case management implementation
+ */
+class CaseManagement implements CaseManagementInterface
+{
+    /**
+     * @var CaseRepositoryInterface
+     */
+    private $caseRepository;
+
+    /**
+     * @var CaseInterfaceFactory
+     */
+    private $caseFactory;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * CaseManagement constructor.
+     * @param CaseRepositoryInterface $caseRepository
+     * @param CaseInterfaceFactory $caseFactory
+     * @param FilterBuilder $filterBuilder
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        CaseRepositoryInterface $caseRepository,
+        CaseInterfaceFactory $caseFactory,
+        FilterBuilder $filterBuilder,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->caseRepository = $caseRepository;
+        $this->caseFactory = $caseFactory;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function create($orderId)
+    {
+        /** @var \Magento\Signifyd\Api\Data\CaseInterface $case */
+        $case = $this->caseFactory->create();
+        $case->setOrderId($orderId)
+            ->setStatus(CaseInterface::STATUS_PENDING)
+            ->setGuaranteeDisposition(CaseInterface::GUARANTEE_PENDING);
+        try {
+            return $this->caseRepository->save($case);
+        } catch (DuplicateException $e) {
+            throw new AlreadyExistsException(__('This order already has associated case entity'), $e);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getByOrderId($orderId)
+    {
+        $filters = [
+            $this->filterBuilder->setField('order_id')
+                ->setValue($orderId)
+                ->create()
+        ];
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)->create();
+        $items = $this->caseRepository->getList($searchCriteria)->getItems();
+        return !empty($items) ? array_pop($items) : null;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseRepository.php b/app/code/Magento/Signifyd/Model/CaseRepository.php
new file mode 100644
index 0000000000000..ea3ea3e67aafd
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseRepository.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
+use Magento\Signifyd\Api\Data\CaseSearchResultsInterface;
+use Magento\Signifyd\Api\Data\CaseSearchResultsInterfaceFactory;
+use Magento\Signifyd\Model\ResourceModel\CaseEntity as CaseResourceModel;
+use Magento\Signifyd\Model\ResourceModel\CaseEntity\Collection;
+use Magento\Signifyd\Model\ResourceModel\CaseEntity\CollectionFactory;
+
+/**
+ * Repository for Case interface
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CaseRepository implements CaseRepositoryInterface
+{
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var CaseSearchResultsInterfaceFactory
+     */
+    private $searchResultsFactory;
+
+    /**
+     * @var CaseInterfaceFactory
+     */
+    private $caseFactory;
+
+    /**
+     * @var CaseResourceModel
+     */
+    private $resourceModel;
+
+    /**
+     * CaseRepository constructor.
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param CollectionFactory $collectionFactory
+     * @param CaseSearchResultsInterfaceFactory $searchResultsFactory
+     * @param CaseInterfaceFactory $caseFactory
+     * @param CaseResourceModel $resourceModel
+     */
+    public function __construct(
+        CollectionProcessorInterface $collectionProcessor,
+        CollectionFactory $collectionFactory,
+        CaseSearchResultsInterfaceFactory $searchResultsFactory,
+        CaseInterfaceFactory $caseFactory,
+        CaseResourceModel $resourceModel
+    ) {
+        $this->collectionProcessor = $collectionProcessor;
+        $this->collectionFactory = $collectionFactory;
+        $this->searchResultsFactory = $searchResultsFactory;
+        $this->caseFactory = $caseFactory;
+        $this->resourceModel = $resourceModel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save(CaseInterface $case)
+    {
+        /** @var CaseEntity $case */
+        $this->resourceModel->save($case);
+
+        return $case;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getById($id)
+    {
+        /** @var CaseEntity $case */
+        $case = $this->caseFactory->create();
+        $this->resourceModel->load($case, $id);
+
+        return $case;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getByCaseId($caseId)
+    {
+        /** @var CaseEntity $case */
+        $case = $this->caseFactory->create();
+        $this->resourceModel->load($case, $caseId, 'case_id');
+
+        return $case->getEntityId() ? $case : null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete(CaseInterface $case)
+    {
+        $this->resourceModel->delete($case);
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList(SearchCriteriaInterface $searchCriteria)
+    {
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create();
+        $this->collectionProcessor->process($searchCriteria, $collection);
+
+        /** @var CaseSearchResultsInterface $searchResults */
+        $searchResults = $this->searchResultsFactory->create();
+        $searchResults->setSearchCriteria($searchCriteria);
+        $searchResults->setItems($collection->getItems());
+
+        return $searchResults;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php b/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php
new file mode 100644
index 0000000000000..8413838bd7d5f
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Signifyd\Api\CaseCreationServiceInterface;
+use Magento\Signifyd\Api\CaseManagementInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Model\OrderStateService;
+use Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Case Creation Service
+ *
+ * Creates new Case entity and register it at Signifyd
+ */
+class CreationService implements CaseCreationServiceInterface
+{
+    /**
+     * @var CaseManagementInterface
+     */
+    private $caseManagement;
+
+    /**
+     * @var Gateway;
+     */
+    private $signifydGateway;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var CaseRepositoryInterface
+     */
+    private $caseRepository;
+
+    /**
+     * @var OrderGridUpdater
+     */
+    private $orderGridUpdater;
+
+    /**
+     * @var OrderStateService
+     */
+    private $orderStateService;
+
+    /**
+     * CreationService constructor.
+     *
+     * @param CaseManagementInterface $caseManagement
+     * @param Gateway $signifydGateway
+     * @param LoggerInterface $logger
+     * @param CaseRepositoryInterface $caseRepository
+     * @param OrderGridUpdater $orderGridUpdater
+     * @param OrderStateService $orderStateService
+     */
+    public function __construct(
+        CaseManagementInterface $caseManagement,
+        Gateway $signifydGateway,
+        LoggerInterface $logger,
+        CaseRepositoryInterface $caseRepository,
+        OrderGridUpdater $orderGridUpdater,
+        OrderStateService $orderStateService
+    ) {
+        $this->caseManagement = $caseManagement;
+        $this->signifydGateway = $signifydGateway;
+        $this->logger = $logger;
+        $this->caseRepository = $caseRepository;
+        $this->orderGridUpdater = $orderGridUpdater;
+        $this->orderStateService = $orderStateService;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createForOrder($orderId)
+    {
+        $case = $this->caseManagement->create($orderId);
+        $this->orderGridUpdater->update($orderId);
+
+        try {
+            $caseId = $this->signifydGateway->createCase($orderId);
+        } catch (GatewayException $e) {
+            $this->logger->error($e->getMessage());
+            return true;
+        }
+
+        $case->setCaseId($caseId);
+        $this->caseRepository->save($case);
+        $this->orderStateService->updateByCase($case);
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php b/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php
new file mode 100644
index 0000000000000..295d7f13fb0ac
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+/**
+ * Stub implementation for case updating service interface and might be used
+ * for test Signifyd webhooks
+ */
+class StubUpdatingService implements UpdatingServiceInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function update(CaseInterface $case, array $data)
+    {
+        // just stub method and doesn't contain any logic
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
new file mode 100644
index 0000000000000..168ab67f8cf50
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Framework\Api\SimpleDataObjectConverter;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CommentsHistoryUpdater;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorInterface;
+use Magento\Signifyd\Model\OrderStateService;
+use Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater;
+
+/**
+ * Performs Signifyd case entity updating operations.
+ */
+class UpdatingService implements UpdatingServiceInterface
+{
+    /**
+     * @var GeneratorInterface
+     */
+    private $messageGenerator;
+
+    /**
+     * @var CaseRepositoryInterface
+     */
+    private $caseRepository;
+
+    /**
+     * @var CommentsHistoryUpdater
+     */
+    private $commentsHistoryUpdater;
+
+    /**
+     * @var \Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater
+     */
+    private $orderGridUpdater;
+
+    /**
+     * @var OrderStateService
+     */
+    private $orderStateService;
+
+    /**
+     * UpdatingService constructor.
+     *
+     * @param GeneratorInterface $messageGenerator
+     * @param CaseRepositoryInterface $caseRepository
+     * @param CommentsHistoryUpdater $commentsHistoryUpdater
+     * @param \Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater $orderGridUpdater
+     * @param OrderStateService $orderStateService
+     */
+    public function __construct(
+        GeneratorInterface $messageGenerator,
+        CaseRepositoryInterface $caseRepository,
+        CommentsHistoryUpdater $commentsHistoryUpdater,
+        OrderGridUpdater $orderGridUpdater,
+        OrderStateService $orderStateService
+    ) {
+        $this->messageGenerator = $messageGenerator;
+        $this->caseRepository = $caseRepository;
+        $this->commentsHistoryUpdater = $commentsHistoryUpdater;
+        $this->orderGridUpdater = $orderGridUpdater;
+        $this->orderStateService = $orderStateService;
+    }
+
+    /**
+     * Updates Signifyd Case entity by received data.
+     *
+     * @param CaseInterface $case
+     * @param array $data
+     * @return void
+     * @throws LocalizedException
+     */
+    public function update(CaseInterface $case, array $data)
+    {
+        if (empty($case->getEntityId()) || empty($case->getCaseId())) {
+            throw new LocalizedException(__('The case entity should not be empty.'));
+        }
+
+        try {
+            $previousDisposition = $case->getGuaranteeDisposition();
+            $this->setCaseData($case, $data);
+            $orderHistoryComment = $this->messageGenerator->generate($data);
+            $case = $this->caseRepository->save($case);
+            $this->orderGridUpdater->update($case->getOrderId());
+            $this->commentsHistoryUpdater->addComment($case, $orderHistoryComment);
+            if ($case->getGuaranteeDisposition() !== $previousDisposition) {
+                $this->orderStateService->updateByCase($case);
+            }
+        } catch (\Exception $e) {
+            throw new LocalizedException(__('Cannot update Case entity.'), $e);
+        }
+    }
+
+    /**
+     * Sets data to case entity.
+     *
+     * @param CaseInterface $case
+     * @param array $data
+     * @return void
+     */
+    private function setCaseData(CaseInterface $case, array $data)
+    {
+        // list of keys which should not be replaced, like order id
+        $notResolvedKeys = [
+            'orderId'
+        ];
+        foreach ($data as $key => $value) {
+            $methodName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key);
+            if (!in_array($key, $notResolvedKeys) && method_exists($case, $methodName)) {
+                call_user_func([$case, $methodName], $value);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
new file mode 100644
index 0000000000000..5415044b5edc4
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
+use Magento\Signifyd\Model\Config;
+
+/**
+ * Creates instance of case updating service configured with specific message generator.
+ * The message generator initialization depends on specified type (like, case creation, re-scoring, review and
+ * guarantee completion).
+ */
+class UpdatingServiceFactory
+{
+    /**
+     * Type of testing Signifyd case
+     * @var string
+     */
+    private static $caseTest = 'cases/test';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var GeneratorFactory
+     */
+    private $generatorFactory;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * UpdatingServiceFactory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param GeneratorFactory $generatorFactory
+     * @param Config $config
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        GeneratorFactory $generatorFactory,
+        Config $config
+    ) {
+        $this->objectManager = $objectManager;
+        $this->generatorFactory = $generatorFactory;
+        $this->config = $config;
+    }
+
+    /**
+     * Creates instance of service updating case.
+     * As param retrieves type of message generator.
+     *
+     * @param string $type
+     * @return UpdatingServiceInterface
+     * @throws \InvalidArgumentException
+     */
+    public function create($type)
+    {
+        if (!$this->config->isActive() || $type === self::$caseTest) {
+            return $this->objectManager->create(StubUpdatingService::class);
+        }
+
+        $messageGenerator = $this->generatorFactory->create($type);
+        $service = $this->objectManager->create(UpdatingService::class, [
+            'messageGenerator' => $messageGenerator
+        ]);
+
+        return $service;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php
new file mode 100644
index 0000000000000..daa7b40bfd674
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+/**
+ * Common abstraction to perform updating operations with Signifyd case entity.
+ */
+interface UpdatingServiceInterface
+{
+    /**
+     * Updates Signifyd Case entity by received data.
+     *
+     * @param CaseInterface $case
+     * @param array $data
+     * @return void
+     */
+    public function update(CaseInterface $case, array $data);
+}
diff --git a/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php b/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php
new file mode 100644
index 0000000000000..f473d157efa4a
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Phrase;
+use Magento\Sales\Api\OrderStatusHistoryRepositoryInterface;
+use Magento\Sales\Model\Order\Status\HistoryFactory;
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+/**
+ * Updates case order comments history.
+ */
+class CommentsHistoryUpdater
+{
+    /**
+     * @var HistoryFactory
+     */
+    private $historyFactory;
+
+    /**
+     * @var OrderStatusHistoryRepositoryInterface
+     */
+    private $historyRepository;
+
+    /**
+     * CommentsHistoryUpdater constructor.
+     *
+     * @param HistoryFactory $historyFactory
+     * @param OrderStatusHistoryRepositoryInterface $historyRepository
+     */
+    public function __construct(
+        HistoryFactory $historyFactory,
+        OrderStatusHistoryRepositoryInterface $historyRepository
+    ) {
+        $this->historyFactory = $historyFactory;
+        $this->historyRepository = $historyRepository;
+    }
+
+    /**
+     * Adds comment to case related order.
+     * Throws an exception if cannot save history comment.
+     *
+     * @param CaseInterface $case
+     * @param Phrase $message
+     * @param string $status
+     * @return void
+     */
+    public function addComment(CaseInterface $case, Phrase $message, $status = '')
+    {
+        if (!$message->getText()) {
+            return;
+        }
+
+        /** @var \Magento\Sales\Api\Data\OrderStatusHistoryInterface $history */
+        $history = $this->historyFactory->create();
+        $history->setParentId($case->getOrderId())
+            ->setComment($message)
+            ->setEntityName('order')
+            ->setStatus($status);
+        $this->historyRepository->save($history);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/Config.php b/app/code/Magento/Signifyd/Model/Config.php
new file mode 100644
index 0000000000000..15d3608bd38c4
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/Config.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Signifyd integration configuration.
+ *
+ * Class is a proxy service for retrieving configuration settings.
+ */
+class Config
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Config constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * If this config option set to false no Signifyd integration should be available
+     * (only possibility to configure Signifyd setting in admin)
+     *
+     * @param int|null $storeId
+     * @return bool
+     */
+    public function isActive($storeId = null): bool
+    {
+        $enabled = $this->scopeConfig->isSetFlag(
+            'fraud_protection/signifyd/active',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        return $enabled;
+    }
+
+    /**
+     * Signifyd API Key used for authentication.
+     *
+     * @see https://www.signifyd.com/docs/api/#/introduction/authentication
+     * @see https://app.signifyd.com/settings
+     *
+     * @param int|null $storeId
+     * @return string
+     */
+    public function getApiKey($storeId = null): string
+    {
+        $apiKey = $this->scopeConfig->getValue(
+            'fraud_protection/signifyd/api_key',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        return $apiKey;
+    }
+
+    /**
+     * Base URL to Signifyd REST API.
+     * Usually equals to https://api.signifyd.com/v2 and should not be changed
+     *
+     * @param int|null $storeId
+     * @return string
+     */
+    public function getApiUrl($storeId = null): string
+    {
+        $apiUrl = $this->scopeConfig->getValue(
+            'fraud_protection/signifyd/api_url',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        return $apiUrl;
+    }
+
+    /**
+     * If is "true" extra information about interaction with Signifyd API are written to debug.log file
+     *
+     * @param int|null $storeId
+     * @return bool
+     */
+    public function isDebugModeEnabled($storeId = null): bool
+    {
+        $debugModeEnabled = $this->scopeConfig->isSetFlag(
+            'fraud_protection/signifyd/debug',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        return $debugModeEnabled;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/CustomerOrders.php b/app/code/Magento/Signifyd/Model/CustomerOrders.php
new file mode 100644
index 0000000000000..c326cf06424c0
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/CustomerOrders.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Exception;
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Provides information about customer orders.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CustomerOrders
+{
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var CurrencyFactory
+     */
+    private $currencyFactory;
+
+    /**
+     * @var array
+     */
+    private $currencies = [];
+
+    /**
+     * @var string
+     */
+    private static $usdCurrencyCode = 'USD';
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterBuilder $filterBuilder
+     * @param OrderRepositoryInterface $orderRepository
+     * @param CurrencyFactory $currencyFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterBuilder $filterBuilder,
+        OrderRepositoryInterface $orderRepository,
+        CurrencyFactory $currencyFactory,
+        LoggerInterface $logger
+    ) {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
+        $this->orderRepository = $orderRepository;
+        $this->currencyFactory = $currencyFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Returns aggregated customer orders count and total amount in USD.
+     *
+     * Returned array contains next keys:
+     * aggregateOrderCount - total count of orders placed by this account since it was created, including the current
+     * aggregateOrderDollars - total amount spent by this account since it was created, including the current order
+     *
+     * @param int $customerId
+     * @return array
+     */
+    public function getAggregatedOrdersInfo($customerId)
+    {
+        $result = [
+            'aggregateOrderCount' => null,
+            'aggregateOrderDollars' => null
+        ];
+
+        $customerOrders = $this->getCustomerOrders($customerId);
+        if (!empty($customerOrders)) {
+            try {
+                $orderTotalDollars = 0.0;
+                foreach ($customerOrders as $order) {
+                    $orderTotalDollars += $this->getUsdOrderTotal(
+                        $order->getBaseGrandTotal(),
+                        $order->getBaseCurrencyCode()
+                    );
+                }
+                $result = [
+                    'aggregateOrderCount' => count($customerOrders),
+                    'aggregateOrderDollars' => $orderTotalDollars
+                ];
+            } catch (Exception $e) {
+                $this->logger->error($e->getMessage());
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns customer orders.
+     *
+     * @param int $customerId
+     * @return OrderInterface[]
+     */
+    private function getCustomerOrders($customerId)
+    {
+        $filters = [
+            $this->filterBuilder->setField(OrderInterface::CUSTOMER_ID)->setValue($customerId)->create()
+        ];
+        $this->searchCriteriaBuilder->addFilters($filters);
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        $searchResults = $this->orderRepository->getList($searchCriteria);
+
+        return $searchResults->getItems();
+    }
+
+    /**
+     * Returns amount in USD.
+     *
+     * @param float $amount
+     * @param string $currency
+     * @return float
+     */
+    private function getUsdOrderTotal($amount, $currency)
+    {
+        if ($currency === self::$usdCurrencyCode) {
+            return $amount;
+        }
+
+        $operationCurrency = $this->getCurrencyByCode($currency);
+
+        return $operationCurrency->convert($amount, self::$usdCurrencyCode);
+    }
+
+    /**
+     * Returns currency by currency code.
+     *
+     * @param string|null $currencyCode
+     * @return Currency
+     */
+    private function getCurrencyByCode($currencyCode)
+    {
+        if (isset($this->currencies[$currencyCode])) {
+            return $this->currencies[$currencyCode];
+        }
+
+        /** @var Currency $currency */
+        $currency = $this->currencyFactory->create();
+        $this->currencies[$currencyCode] = $currency->load($currencyCode);
+
+        return $this->currencies[$currencyCode];
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php b/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php
new file mode 100644
index 0000000000000..65bede6f0cea5
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\Guarantee;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Model\CaseManagement;
+
+/**
+ * Checks if is possible to cancel Guarantee for order.
+ */
+class CancelGuaranteeAbility
+{
+    /**
+     * @var CaseManagement
+     */
+    private $caseManagement;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @param CaseManagement $caseManagement
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        CaseManagement $caseManagement,
+        OrderRepositoryInterface $orderRepository
+    ) {
+        $this->caseManagement = $caseManagement;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * Checks if it is possible to create Guarantee for order and case.
+     *
+     * @param int $orderId
+     * @return bool
+     */
+    public function isAvailable($orderId)
+    {
+        $case = $this->caseManagement->getByOrderId($orderId);
+        if ($case === null) {
+            return false;
+        }
+
+        if (in_array($case->getGuaranteeDisposition(), [null, $case::GUARANTEE_CANCELED])) {
+            return false;
+        }
+
+        $order = $this->getOrder($orderId);
+        if (null === $order) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns order by id
+     *
+     * @param int $orderId
+     * @return OrderInterface|null
+     */
+    private function getOrder($orderId)
+    {
+        try {
+            $order = $this->orderRepository->get($orderId);
+        } catch (InputException $e) {
+            return null;
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        return $order;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php b/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php
new file mode 100644
index 0000000000000..b30efac8c2190
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\Guarantee;
+
+use Magento\Signifyd\Api\CaseManagementInterface;
+use Magento\Signifyd\Api\GuaranteeCancelingServiceInterface;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Sends request to Signifyd to cancel guarantee and updates case entity.
+ */
+class CancelingService implements GuaranteeCancelingServiceInterface
+{
+    /**
+     * @var CaseManagementInterface
+     */
+    private $caseManagement;
+
+    /**
+     * @var UpdatingServiceFactory
+     */
+    private $serviceFactory;
+
+    /**
+     * @var Gateway
+     */
+    private $gateway;
+
+    /**
+     * @var CancelGuaranteeAbility
+     */
+    private $cancelGuaranteeAbility;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * CancelingService constructor.
+     *
+     * @param CaseManagementInterface $caseManagement
+     * @param UpdatingServiceFactory $serviceFactory
+     * @param Gateway $gateway
+     * @param CancelGuaranteeAbility $cancelGuaranteeAbility
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        CaseManagementInterface $caseManagement,
+        UpdatingServiceFactory $serviceFactory,
+        Gateway $gateway,
+        CancelGuaranteeAbility $cancelGuaranteeAbility,
+        LoggerInterface $logger
+    ) {
+        $this->caseManagement = $caseManagement;
+        $this->serviceFactory = $serviceFactory;
+        $this->gateway = $gateway;
+        $this->cancelGuaranteeAbility = $cancelGuaranteeAbility;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function cancelForOrder($orderId)
+    {
+        if (!$this->cancelGuaranteeAbility->isAvailable($orderId)) {
+            return false;
+        }
+
+        $caseEntity = $this->caseManagement->getByOrderId($orderId);
+
+        try {
+            $disposition = $this->gateway->cancelGuarantee($caseEntity->getCaseId());
+        } catch (GatewayException $e) {
+            $this->logger->error($e->getMessage());
+            return false;
+        }
+
+        $updatingService = $this->serviceFactory->create('guarantees/cancel');
+        $data = [
+            'guaranteeDisposition' => $disposition
+        ];
+        $updatingService->update($caseEntity, $data);
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php b/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php
new file mode 100644
index 0000000000000..15addba3ec4fd
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\Guarantee;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Model\CaseManagement;
+
+/**
+ * Checks if is possible to create Guarantee for order.
+ */
+class CreateGuaranteeAbility
+{
+    /**
+     * @var CaseManagement
+     */
+    private $caseManagement;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * Eligible count of days from the order creation date to submit a case for Guarantee.
+     *
+     * @var int
+     */
+    private static $guarantyEligibleDays = 7;
+
+    /**
+     * @param CaseManagement $caseManagement
+     * @param OrderRepositoryInterface $orderRepository
+     * @param DateTimeFactory $dateTimeFactory
+     */
+    public function __construct(
+        CaseManagement $caseManagement,
+        OrderRepositoryInterface $orderRepository,
+        DateTimeFactory $dateTimeFactory
+    ) {
+        $this->caseManagement = $caseManagement;
+        $this->orderRepository = $orderRepository;
+        $this->dateTimeFactory = $dateTimeFactory;
+    }
+
+    /**
+     * Checks if it is possible to create Guarantee for order and case.
+     *
+     * @param int $orderId
+     * @return bool
+     */
+    public function isAvailable($orderId)
+    {
+        $case = $this->caseManagement->getByOrderId($orderId);
+        if (null === $case) {
+            return false;
+        }
+
+        if ($case->isGuaranteeEligible() === false) {
+            return false;
+        }
+
+        $order = $this->getOrder($orderId);
+        if (null === $order) {
+            return false;
+        }
+
+        if (in_array($order->getState(), [Order::STATE_CANCELED, Order::STATE_CLOSED])) {
+            return false;
+        }
+
+        if ($this->isOrderOlderThen(static::$guarantyEligibleDays, $order)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks if Guarantee submit is applicable for order.
+     *
+     * @param OrderInterface $order
+     * @param int $days number of days from the order creation date to submit a case for Guarantee.
+     * @return bool
+     */
+    private function isOrderOlderThen($days, OrderInterface $order)
+    {
+        $orderCreateDate = $this->dateTimeFactory->create($order->getCreatedAt(), new \DateTimeZone('UTC'));
+        $currentDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+
+        return $orderCreateDate->diff($currentDate)->days >= $days;
+    }
+
+    /**
+     * Returns order by id
+     *
+     * @param int $orderId
+     * @return OrderInterface|null
+     */
+    private function getOrder($orderId)
+    {
+        try {
+            $order = $this->orderRepository->get($orderId);
+        } catch (InputException $e) {
+            return null;
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        return $order;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
new file mode 100644
index 0000000000000..4080aee453f18
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\Guarantee;
+
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Signifyd\Api\CaseManagementInterface;
+use Magento\Signifyd\Api\GuaranteeCreationServiceInterface;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Register guarantee at Signifyd and updates case entity
+ */
+class CreationService implements GuaranteeCreationServiceInterface
+{
+    /**
+     * @var CaseManagementInterface
+     */
+    private $caseManagement;
+
+    /**
+     * @var UpdatingServiceFactory
+     */
+    private $caseUpdatingServiceFactory;
+
+    /**
+     * @var Gateway
+     */
+    private $gateway;
+
+    /**
+     * @var CreateGuaranteeAbility
+     */
+    private $createGuaranteeAbility;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * CreationService constructor.
+     *
+     * @param CaseManagementInterface $caseManagement
+     * @param UpdatingServiceFactory $caseUpdatingServiceFactory
+     * @param Gateway $gateway
+     * @param CreateGuaranteeAbility $createGuaranteeAbility
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        CaseManagementInterface $caseManagement,
+        UpdatingServiceFactory $caseUpdatingServiceFactory,
+        Gateway $gateway,
+        CreateGuaranteeAbility $createGuaranteeAbility,
+        LoggerInterface $logger
+    ) {
+        $this->caseManagement = $caseManagement;
+        $this->caseUpdatingServiceFactory = $caseUpdatingServiceFactory;
+        $this->gateway = $gateway;
+        $this->createGuaranteeAbility = $createGuaranteeAbility;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createForOrder($orderId)
+    {
+        if (!$this->createGuaranteeAbility->isAvailable($orderId)) {
+            return false;
+        }
+
+        $caseEntity = $this->caseManagement->getByOrderId($orderId);
+
+        try {
+            $disposition = $this->gateway->submitCaseForGuarantee($caseEntity->getCaseId());
+        } catch (GatewayException $e) {
+            $this->logger->error($e->getMessage());
+            return false;
+        }
+
+        $updatingService = $this->caseUpdatingServiceFactory->create('guarantees/creation');
+        $data = [
+            'caseId' => $caseEntity->getCaseId(),
+            'guaranteeDisposition' => $disposition
+        ];
+        $updatingService->update($caseEntity, $data);
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php b/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php
new file mode 100644
index 0000000000000..d0e89854e3909
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\MessageGenerators;
+
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+
+/**
+ * Generates message based on previous and current Case scores.
+ */
+class CaseRescore implements GeneratorInterface
+{
+    /**
+     * @var CaseRepositoryInterface
+     */
+    private $caseRepository;
+
+    /**
+     * CaseRescore constructor.
+     *
+     * @param CaseRepositoryInterface $caseRepository
+     */
+    public function __construct(CaseRepositoryInterface $caseRepository)
+    {
+        $this->caseRepository = $caseRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function generate(array $data)
+    {
+        if (empty($data['caseId'])) {
+            throw new GeneratorException(__('The "%1" should not be empty.', 'caseId'));
+        }
+
+        $caseEntity = $this->caseRepository->getByCaseId($data['caseId']);
+
+        if ($caseEntity === null) {
+            throw new GeneratorException(__('Case entity not found.'));
+        }
+
+        return __(
+            'Case Update: New score for the order is %1. Previous score was %2.',
+            !empty($data['score']) ? $data['score'] : 0,
+            $caseEntity->getScore()
+        );
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
new file mode 100644
index 0000000000000..103cb9fc1e2d3
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\MessageGenerators;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Common exception for Signifyd message generators.
+ *
+ * @api
+ * @since 100.2.0
+ */
+class GeneratorException extends LocalizedException
+{
+
+}
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
new file mode 100644
index 0000000000000..66e02a3803950
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\MessageGenerators;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Signifyd\Model\MessageGeneratorInterface;
+
+/**
+ * Creates instance of message generator based on received type of message.
+ */
+class GeneratorFactory
+{
+    /**
+     * Type of message for Signifyd case creation.
+     * @var string
+     */
+    private static $caseCreation = 'cases/creation';
+
+    /**
+     * Type of message for Signifyd case re-scoring.
+     * @var string
+     */
+    private static $caseRescore = 'cases/rescore';
+
+    /**
+     * Type of message for Signifyd case reviewing
+     * @var string
+     */
+    private static $caseReview = 'cases/review';
+
+    /**
+     * Type of message of Signifyd guarantee completion
+     * @var string
+     */
+    private static $guaranteeCompletion = 'guarantees/completion';
+
+    /**
+     * Type of message of Signifyd guarantee creation
+     * @var string
+     */
+    private static $guaranteeCreation = 'guarantees/creation';
+
+    /**
+     * Type of message of Signifyd guarantee canceling
+     * @var string
+     */
+    private static $guaranteeCancel = 'guarantees/cancel';
+
+    /**
+     * UpdatingServiceFactory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Creates instance of message generator.
+     * Throws exception if type of message generator does not have implementations.
+     *
+     * @param string $type
+     * @return GeneratorInterface
+     * @throws \InvalidArgumentException
+     */
+    public function create($type)
+    {
+        $className = PatternGenerator::class;
+        switch ($type) {
+            case self::$caseCreation:
+                $classConfig = [
+                    'template' => 'Signifyd Case %1 has been created for order.',
+                    'requiredParams' => ['caseId']
+                ];
+                break;
+            case self::$caseRescore:
+                $classConfig = [];
+                $className = CaseRescore::class;
+                break;
+            case self::$caseReview:
+                $classConfig = [
+                    'template' => 'Case Update: Case Review was completed. Review Deposition is %1.',
+                    'requiredParams' => ['reviewDisposition']
+                ];
+                break;
+            case self::$guaranteeCompletion:
+                $classConfig = [
+                    'template' => 'Case Update: Guarantee Disposition is %1.',
+                    'requiredParams' => ['guaranteeDisposition']
+                ];
+                break;
+            case self::$guaranteeCreation:
+                $classConfig = [
+                    'template' => 'Case Update: Case is submitted for guarantee.'
+                ];
+                break;
+            case self::$guaranteeCancel:
+                $classConfig = [
+                    'template' => 'Case Update: Case guarantee has been cancelled.'
+                ];
+                break;
+            default:
+                throw new \InvalidArgumentException('Specified message type does not supported.');
+        }
+
+        return $this->objectManager->create($className, $classConfig);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php
new file mode 100644
index 0000000000000..385cbe35f05ac
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\MessageGenerators;
+
+/**
+ * Represents common abstraction for Signifyd Case/Guarantee messages.
+ * Each interface implementation might use Case/Guarantee data to generate specific message.
+ */
+interface GeneratorInterface
+{
+    /**
+     * Creates new localized message based on Signifyd Case/Guarantee data.
+     * @param array $data
+     * @return \Magento\Framework\Phrase
+     * @throws GeneratorException
+     */
+    public function generate(array $data);
+}
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php b/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php
new file mode 100644
index 0000000000000..8501934bebbc5
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\MessageGenerators;
+
+/**
+ * Common implementation of message generator.
+ * Takes a message template (placeholders for localization also can be used) and list
+ * of required params, which should persist in input data.
+ *
+ * If template contains placeholders, when required params should be specified in the same order as
+ * placeholders, for example:
+ * Message is 'Case Update: New score for the order is %1. Previous score was %2.', then the required params order
+ * should be ['new_score', 'prev_score'].
+ */
+class PatternGenerator implements GeneratorInterface
+{
+    /**
+     * @var string
+     */
+    private $template;
+
+    /**
+     * @var array
+     */
+    private $requiredParams;
+
+    /**
+     * PatternGenerator constructor.
+     *
+     * @param string $template
+     * @param array $requiredParams
+     */
+    public function __construct($template, array $requiredParams = [])
+    {
+        $this->template = $template;
+        $this->requiredParams = $requiredParams;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function generate(array $data)
+    {
+        $placeholders = [];
+        foreach ($this->requiredParams as $param) {
+            if (empty($data[$param])) {
+                throw new GeneratorException(__('The "%1" should not be empty.', $param));
+            }
+            $placeholders[] = $data[$param];
+        }
+        return __($this->template, ...$placeholders);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/OrderStateService.php b/app/code/Magento/Signifyd/Model/OrderStateService.php
new file mode 100644
index 0000000000000..2b3f0e155981e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/OrderStateService.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+/**
+ * Updates order state.
+ */
+class OrderStateService
+{
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
+    /**
+     * @var CommentsHistoryUpdater
+     */
+    private $commentsHistoryUpdater;
+
+    /**
+     * @param OrderFactory $orderFactory
+     * @param OrderManagementInterface $orderManagement
+     * @param CommentsHistoryUpdater $commentsHistoryUpdater
+     */
+    public function __construct(
+        OrderFactory $orderFactory,
+        OrderManagementInterface $orderManagement,
+        CommentsHistoryUpdater $commentsHistoryUpdater
+    ) {
+        $this->orderFactory = $orderFactory;
+        $this->orderManagement = $orderManagement;
+        $this->commentsHistoryUpdater = $commentsHistoryUpdater;
+    }
+
+    /**
+     * Updates order state depending on case guarantee disposition status.
+     *
+     * @param CaseInterface $case
+     * @return void
+     */
+    public function updateByCase(CaseInterface $case)
+    {
+        $orderId = $case->getOrderId();
+
+        switch ($case->getGuaranteeDisposition()) {
+            case CaseInterface::GUARANTEE_APPROVED:
+                $this->unHold($orderId);
+                break;
+            case CaseInterface::GUARANTEE_DECLINED:
+                $this->hold($orderId);
+                break;
+            case CaseInterface::GUARANTEE_PENDING:
+                if ($this->hold($orderId)) {
+                    $this->commentsHistoryUpdater->addComment(
+                        $case,
+                        __('Awaiting the Signifyd guarantee disposition.'),
+                        Order::STATE_HOLDED
+                    );
+                }
+                break;
+        }
+    }
+
+    /**
+     * Tries to unhold the order.
+     *
+     * @param int $orderId
+     * @return bool
+     */
+    private function unHold($orderId)
+    {
+        $order = $this->getOrder($orderId);
+        if ($order->canUnhold()) {
+            return $this->orderManagement->unHold($orderId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Tries to hold the order.
+     *
+     * @param int $orderId
+     * @return bool
+     */
+    private function hold($orderId)
+    {
+        $order = $this->getOrder($orderId);
+        if ($order->canHold()) {
+            return $this->orderManagement->hold($orderId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the order.
+     *
+     * @param int $orderId
+     * @return Order
+     */
+    private function getOrder($orderId)
+    {
+        return $this->orderFactory->create()->load($orderId);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php
new file mode 100644
index 0000000000000..cdf9041510b45
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\PaymentMethodMapper;
+
+use Magento\Framework\Config\Data;
+
+/**
+ * Load and cache configuration data.
+ */
+class PaymentMethodMapper
+{
+    /**
+     * @var Data
+     */
+    private $paymentMethodMapping;
+
+    /**
+     * PaymentMapper constructor.
+     *
+     * @param Data $paymentMapping
+     */
+    public function __construct(Data $paymentMapping)
+    {
+        $this->paymentMethodMapping = $paymentMapping;
+    }
+
+    /**
+     * Gets the Sygnifyd payment method by the order's payment method.
+     *
+     * @param string $paymentMethod
+     * @return string
+     */
+    public function getSignifydPaymentMethodCode($paymentMethod)
+    {
+        return $this->paymentMethodMapping->get($paymentMethod, '');
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php
new file mode 100644
index 0000000000000..5c3f23bb92729
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\PaymentMethodMapper;
+
+use Magento\Framework\Config\Dom\ValidationSchemaException;
+
+/**
+ * Converts XML config file to payment methods mapping.
+ */
+class XmlToArrayConfigConverter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * Node type wrapper for magento and signifyd payment codes
+     *
+     * @var string
+     */
+    private static $paymentMethodNodeType = 'payment_method';
+
+    /**
+     * Node type for payment methods code
+     *
+     * @var string
+     */
+    private static $magentoCodeNodeType = 'magento_code';
+
+    /**
+     * Node type for Sygnifyd payment methods code
+     *
+     * @var string
+     */
+    private static $signifydCodeNodeType = 'signifyd_code';
+
+    /**
+     * @inheritdoc
+     */
+    public function convert($source)
+    {
+        $paymentMethods = $source->getElementsByTagName(self::$paymentMethodNodeType);
+        $paymentsList = [];
+        foreach ($paymentMethods as $paymentMethod) {
+            $paymentsList += $this->getPaymentMethodMapping($paymentMethod);
+        }
+
+        return $paymentsList;
+    }
+
+    /**
+     * Adds a payment method as key and a Sygnifyd payment method as value
+     * in the payment list array
+     *
+     * @param \DOMElement $payment
+     * @return array
+     * @throws ValidationSchemaException
+     */
+    private function getPaymentMethodMapping(\DOMElement $payment)
+    {
+        $paymentMethodCode = $this->readSubnodeValue($payment, self::$magentoCodeNodeType);
+        $signifyPaymentMethodCode = $this->readSubnodeValue($payment, self::$signifydCodeNodeType);
+
+        return [$paymentMethodCode => $signifyPaymentMethodCode];
+    }
+
+    /**
+     * Reads node value by node type
+     *
+     * @param \DOMElement $element
+     * @param string      $subNodeType
+     * @return mixed
+     * @throws ValidationSchemaException
+     */
+    private function readSubnodeValue(\DOMElement $element, $subNodeType)
+    {
+        $domList = $element->getElementsByTagName($subNodeType);
+        if (empty($domList[0])) {
+            throw new ValidationSchemaException(__('Only single entrance of "%1" node is required.', $subNodeType));
+        }
+
+        $subNodeValue = trim($domList[0]->nodeValue);
+        if (!$subNodeValue) {
+            throw new ValidationSchemaException(__('Not empty value for "%1" node is required.', $subNodeType));
+        }
+
+        return $subNodeValue;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
new file mode 100644
index 0000000000000..5be5ccbc5e55a
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Payment\Gateway\ConfigInterface;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+
+/**
+ * Creates verification service for provided payment method, or PaymentVerificationInterface::class
+ * if payment method does not support AVS, CVV verifications.
+ */
+class PaymentVerificationFactory
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var PaymentVerificationInterface
+     */
+    private $avsDefaultAdapter;
+
+    /**
+     * @var PaymentVerificationInterface
+     */
+    private $cvvDefaultAdapter;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param ConfigInterface|Config $config
+     * @param PaymentVerificationInterface $avsDefaultAdapter
+     * @param PaymentVerificationInterface $cvvDefaultAdapter
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ConfigInterface $config,
+        PaymentVerificationInterface $avsDefaultAdapter,
+        PaymentVerificationInterface $cvvDefaultAdapter
+    ) {
+        $this->config = $config;
+        $this->objectManager = $objectManager;
+        $this->avsDefaultAdapter = $avsDefaultAdapter;
+        $this->cvvDefaultAdapter = $cvvDefaultAdapter;
+    }
+
+    /**
+     * Creates instance of CVV code verification.
+     * Exception will be thrown if CVV mapper does not implement PaymentVerificationInterface.
+     *
+     * @param string $paymentCode
+     * @return PaymentVerificationInterface
+     * @throws ConfigurationMismatchException
+     */
+    public function createPaymentCvv($paymentCode)
+    {
+        return $this->create($this->cvvDefaultAdapter, $paymentCode, 'cvv_ems_adapter');
+    }
+
+    /**
+     * Creates instance of AVS code verification.
+     * Exception will be thrown if AVS mapper does not implement PaymentVerificationInterface.
+     *
+     * @param string $paymentCode
+     * @return PaymentVerificationInterface
+     * @throws ConfigurationMismatchException
+     */
+    public function createPaymentAvs($paymentCode)
+    {
+        return $this->create($this->avsDefaultAdapter, $paymentCode, 'avs_ems_adapter');
+    }
+
+    /**
+     * Creates instance of PaymentVerificationInterface.
+     * Default implementation will be returned if payment method does not implement PaymentVerificationInterface.
+     *
+     * @param PaymentVerificationInterface $defaultAdapter
+     * @param string $paymentCode
+     * @param string $configKey
+     * @return PaymentVerificationInterface
+     * @throws ConfigurationMismatchException If payment verification instance
+     * does not implement PaymentVerificationInterface.
+     */
+    private function create(PaymentVerificationInterface $defaultAdapter, $paymentCode, $configKey)
+    {
+        $this->config->setMethodCode($paymentCode);
+        $verificationClass = $this->config->getValue($configKey);
+        if ($verificationClass === null) {
+            return $defaultAdapter;
+        }
+        $mapper = $this->objectManager->create($verificationClass);
+        if (!$mapper instanceof PaymentVerificationInterface) {
+            throw new ConfigurationMismatchException(
+                __('%1 must implement %2', $verificationClass, PaymentVerificationInterface::class)
+            );
+        }
+        return $mapper;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php b/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php
new file mode 100644
index 0000000000000..618d74b2a52e9
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+/**
+ * Default implementation of payment verification interface.
+ * The default code value can be configured via DI.
+ */
+class PredefinedVerificationCode implements PaymentVerificationInterface
+{
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * @param string $code
+     */
+    public function __construct($code = '')
+    {
+        $this->code = $code;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCode(OrderPaymentInterface $orderPayment)
+    {
+        return $this->code;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php b/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php
new file mode 100644
index 0000000000000..9be02719545c7
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\QuoteSession\Adminhtml;
+
+use Magento\Backend\Model\Session\Quote as BackendQuoteSession;
+use Magento\Signifyd\Model\QuoteSession\QuoteSessionInterface;
+
+/**
+ * Implementation of QuoteSessionInterface for Magento backend checkout.
+ */
+class BackendSession implements QuoteSessionInterface
+{
+    /**
+     * @var BackendQuoteSession
+     */
+    private $backendQuoteSession;
+
+    /**
+     * BackendSession constructor.
+     *
+     * Class uses backend session for retrieving quote.
+     *
+     * @param BackendQuoteSession $backendQuoteSession
+     */
+    public function __construct(BackendQuoteSession $backendQuoteSession)
+    {
+        $this->backendQuoteSession = $backendQuoteSession;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getQuote()
+    {
+        return $this->backendQuoteSession->getQuote();
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php b/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php
new file mode 100644
index 0000000000000..44c226ae4a47e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\QuoteSession;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+
+/**
+ * Implementation of QuoteSessionInterface for Magento frontend checkout.
+ */
+class FrontendSession implements QuoteSessionInterface
+{
+    /**
+     * @var CheckoutSession
+     */
+    private $checkoutSession;
+
+    /**
+     * FrontendSession constructor.
+     *
+     * Class uses checkout session for retrieving quote.
+     *
+     * @param CheckoutSession $checkoutSession
+     */
+    public function __construct(CheckoutSession $checkoutSession)
+    {
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getQuote()
+    {
+        return $this->checkoutSession->getQuote();
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php b/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php
new file mode 100644
index 0000000000000..14958ac65a6ee
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\QuoteSession;
+
+/**
+ * Interface QuoteSessionInterface
+ */
+interface QuoteSessionInterface
+{
+    /**
+     * Returns quote from session.
+     *
+     * @return \Magento\Quote\Api\Data\CartInterface
+     */
+    public function getQuote();
+}
diff --git a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php
new file mode 100644
index 0000000000000..9c6ffde4504b9
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+/**
+ * Implementation of case resource model
+ */
+class CaseEntity extends AbstractDb
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init('signifyd_case', 'entity_id');
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php
new file mode 100644
index 0000000000000..92e233dd42dbc
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\ResourceModel\CaseEntity;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Signifyd\Model\CaseEntity;
+use Magento\Signifyd\Model\ResourceModel\CaseEntity as CaseResourceModel;
+
+/**
+ * Collection of case entities
+ */
+class Collection extends AbstractCollection
+{
+    /**
+     * @inheritdoc
+     */
+    public function _construct()
+    {
+        $this->_init(CaseEntity::class, CaseResourceModel::class);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php b/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php
new file mode 100644
index 0000000000000..360225ae37b7b
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SalesOrderGrid;
+
+use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
+use Magento\Signifyd\Model\ResourceModel;
+use Magento\Signifyd\Model\ResourceModel\CaseEntity;
+
+/**
+ * Provides order ids list which Signifyd Case guaranty status were changed
+ */
+class NotSyncedOrderIdListProvider implements NotSyncedDataProviderInterface
+{
+    /**
+     * @var ResourceModel\CaseEntity
+     */
+    private $caseEntity;
+
+    /**
+     * @param ResourceModel\CaseEntity $caseEntity
+     */
+    public function __construct(
+        CaseEntity $caseEntity
+    ) {
+        $this->caseEntity = $caseEntity;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIds($mainTableName, $gridTableName)
+    {
+        $connection = $this->caseEntity->getConnection();
+        $select = $connection->select()
+            ->from($this->caseEntity->getMainTable(), ['order_id'])
+            ->joinLeft(
+                [$gridTableName => $connection->getTableName($gridTableName)],
+                sprintf(
+                    '%s.%s = %s.%s',
+                    $this->caseEntity->getMainTable(),
+                    'order_id',
+                    $gridTableName,
+                    'entity_id'
+                ),
+                []
+            )
+            ->where('guarantee_disposition != signifyd_guarantee_status');
+
+        return $connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php b/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php
new file mode 100644
index 0000000000000..fff42b300be58
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SalesOrderGrid;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sales\Model\ResourceModel\GridInterface;
+
+/**
+ * Perfoms sales order grid updating operations.
+ *
+ * Serves order grid updates in both synchronous and asynchronous modes.
+ */
+class OrderGridUpdater
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $globalConfig;
+
+    /**
+     * @var GridInterface
+     */
+    private $entityGrid;
+
+    /**
+     * @param GridInterface $entityGrid
+     * @param ScopeConfigInterface $globalConfig
+     */
+    public function __construct(
+        GridInterface $entityGrid,
+        ScopeConfigInterface $globalConfig
+    ) {
+        $this->globalConfig = $globalConfig;
+        $this->entityGrid = $entityGrid;
+    }
+
+    /**
+     * Handles synchronous updating order entity in grid.
+     *
+     * Works only if asynchronous grid indexing is disabled
+     * in global settings.
+     *
+     * @param int $orderId
+     * @return void
+     */
+    public function update($orderId)
+    {
+        if (!$this->globalConfig->getValue('dev/grid/async_indexing')) {
+            $this->entityGrid->refresh($orderId);
+        }
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php
new file mode 100644
index 0000000000000..73338c8ea4d62
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway;
+
+/**
+ * Exception of interaction with Signifyd API
+ */
+class ApiCallException extends GatewayException
+{
+    /**
+     * @var string
+     */
+    private $requestData;
+
+    /**
+     * ApiCallException constructor.
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     * @param string $requestData in JSON format
+     */
+    public function __construct($message = '', $code = 0, \Exception $previous = null, $requestData = '')
+    {
+        $this->requestData = $requestData;
+        parent::__construct($message, $code, $previous);
+    }
+
+    /**
+     * Gets request data for unsuccessful request in JSON format
+     * @return string
+     */
+    public function getRequestData()
+    {
+        return $this->requestData;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php
new file mode 100644
index 0000000000000..2d6d57a510ae3
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway;
+
+use Magento\Signifyd\Model\SignifydGateway\Client\RequestBuilder;
+
+/**
+ * Encapsulates Signifyd API protocol.
+ */
+class ApiClient
+{
+    /**
+     * @var RequestBuilder
+     */
+    private $requestBuilder;
+
+    /**
+     * ApiClient constructor.
+     *
+     * @param RequestBuilder $requestBuilder
+     */
+    public function __construct(
+        RequestBuilder $requestBuilder
+    ) {
+        $this->requestBuilder = $requestBuilder;
+    }
+
+    /**
+     * Perform call to Signifyd API.
+     *
+     * Method returns associative array that corresponds to successful result.
+     * Current implementation do not expose details in case of failure.
+     *
+     * @param string $url
+     * @param string $method
+     * @param array $params
+     * @param int|null $storeId
+     * @return array
+     */
+    public function makeApiCall($url, $method, array $params = [], $storeId = null): array
+    {
+        $result = $this->requestBuilder->doRequest($url, $method, $params, $storeId);
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php
new file mode 100644
index 0000000000000..2a9b933b98b5d
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Client;
+
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Signifyd\Model\Config;
+
+/**
+ * Class HttpClientFactory
+ * Creates and configures HTTP client for RequestBuilder
+ */
+class HttpClientFactory
+{
+    /**
+     * Specifies basic HTTP access authentication Header.
+     *
+     * @var string
+     */
+    private static $authorizationType = 'Authorization';
+
+    /**
+     * JSON HTTP Content-Type Header.
+     *
+     * @var string
+     */
+    private static $jsonDataType = 'application/json';
+
+    /**
+     * @var string
+     */
+    private static $urlSeparator = '/';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var ZendClientFactory
+     */
+    private $clientFactory;
+
+    /**
+     * @var EncoderInterface
+     */
+    private $dataEncoder;
+
+    /**
+     * HttpClientCreator constructor.
+     *
+     * @param Config $config
+     * @param ZendClientFactory $clientFactory
+     * @param EncoderInterface $dataEncoder
+     */
+    public function __construct(
+        Config $config,
+        ZendClientFactory $clientFactory,
+        EncoderInterface $dataEncoder
+    ) {
+        $this->config = $config;
+        $this->clientFactory = $clientFactory;
+        $this->dataEncoder = $dataEncoder;
+    }
+
+    /**
+     * Creates and configures HTTP client.
+     *
+     * @param string $url
+     * @param string $method
+     * @param array $params
+     * @param int|null $storeId
+     * @return ZendClient
+     */
+    public function create($url, $method, array $params = [], $storeId = null): ZendClient
+    {
+        $apiKey = $this->getApiKey($storeId);
+        $apiUrl = $this->buildFullApiUrl($url, $storeId);
+
+        $client = $this->createNewClient();
+        $client->setHeaders(
+            self::$authorizationType,
+            sprintf('Basic %s', base64_encode($apiKey))
+        );
+        if (!empty($params)) {
+            $encodedData = $this->dataEncoder->encode($params);
+            $client->setRawData($encodedData, self::$jsonDataType);
+        }
+        $client->setMethod($method);
+        $client->setUri($apiUrl);
+
+        return $client;
+    }
+
+    /**
+     * @return ZendClient
+     */
+    private function createNewClient()
+    {
+        return $this->clientFactory->create();
+    }
+
+    /**
+     * Signifyd API key for merchant account.
+     *
+     * @see https://www.signifyd.com/docs/api/#/introduction/authentication
+     * @param int|null $storeId
+     * @return string
+     */
+    private function getApiKey($storeId): string
+    {
+        return $this->config->getApiKey($storeId);
+    }
+
+    /**
+     * Full URL for Singifyd API based on relative URL.
+     *
+     * @param string $url
+     * @param int|null $storeId
+     * @return string
+     */
+    private function buildFullApiUrl($url, $storeId): string
+    {
+        $baseApiUrl = $this->getBaseApiUrl($storeId);
+        $fullUrl = $baseApiUrl . self::$urlSeparator . ltrim($url, self::$urlSeparator);
+
+        return $fullUrl;
+    }
+
+    /**
+     * Base Sigifyd API URL without trailing slash.
+     *
+     * @param int|null $storeId
+     * @return string
+     */
+    private function getBaseApiUrl($storeId): string
+    {
+        $baseApiUrl = $this->config->getApiUrl($storeId);
+
+        return rtrim($baseApiUrl, self::$urlSeparator);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
new file mode 100644
index 0000000000000..ee079a74d345f
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Client;
+
+/**
+ * Class RequestBuilder
+ * Creates HTTP client, sends request to Signifyd and handles response
+ */
+class RequestBuilder
+{
+    /**
+     * @var HttpClientFactory
+     */
+    private $clientCreator;
+
+    /**
+     * @var RequestSender
+     */
+    private $requestSender;
+
+    /**
+     * @var ResponseHandler
+     */
+    private $responseHandler;
+
+    /**
+     * RequestBuilder constructor.
+     *
+     * @param HttpClientFactory $clientCreator
+     * @param RequestSender     $requestSender
+     * @param ResponseHandler   $responseHandler
+     */
+    public function __construct(
+        HttpClientFactory $clientCreator,
+        RequestSender $requestSender,
+        ResponseHandler $responseHandler
+    ) {
+        $this->clientCreator = $clientCreator;
+        $this->requestSender = $requestSender;
+        $this->responseHandler = $responseHandler;
+    }
+
+    /**
+     * Creates HTTP client for API call.
+     *
+     * @param string $url
+     * @param string $method
+     * @param array $params
+     * @param int|null $storeId
+     * @return array
+     */
+    public function doRequest($url, $method, array $params = [], $storeId = null): array
+    {
+        $client = $this->clientCreator->create($url, $method, $params, $storeId);
+        $response = $this->requestSender->send($client, $storeId);
+        $result = $this->responseHandler->handle($response);
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
new file mode 100644
index 0000000000000..a63331e055c1c
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Client;
+
+use Magento\Signifyd\Model\SignifydGateway\Debugger\DebuggerFactory;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Framework\HTTP\ZendClient;
+
+/**
+ * Class RequestSender
+ * Gets HTTP client end sends request to Signifyd API
+ */
+class RequestSender
+{
+    /**
+     * @var DebuggerFactory
+     */
+    private $debuggerFactory;
+
+    /**
+     * RequestSender constructor.
+     *
+     * @param DebuggerFactory $debuggerFactory
+     */
+    public function __construct(
+        DebuggerFactory $debuggerFactory
+    ) {
+        $this->debuggerFactory = $debuggerFactory;
+    }
+
+    /**
+     * Sends HTTP request to Signifyd API with configured client.
+     *
+     * Each request/response pair is handled by debugger.
+     * If debug mode for Signifyd integration enabled in configuration
+     * debug information is recorded to debug.log.
+     *
+     * @param ZendClient $client
+     * @param int|null $storeId
+     * @return \Zend_Http_Response
+     * @throws ApiCallException
+     */
+    public function send(ZendClient $client, $storeId = null): \Zend_Http_Response
+    {
+        try {
+            $response = $client->request();
+
+            $this->debuggerFactory->create($storeId)->success(
+                $client->getUri(true),
+                $client->getLastRequest(),
+                $response->getStatus() . ' ' . $response->getMessage(),
+                $response->getBody()
+            );
+
+            return $response;
+        } catch (\Exception $e) {
+            $this->debuggerFactory->create($storeId)->failure(
+                $client->getUri(true),
+                $client->getLastRequest(),
+                $e
+            );
+
+            throw new ApiCallException(
+                'Unable to process Signifyd API: ' . $e->getMessage(),
+                $e->getCode(),
+                $e,
+                $client->getLastRequest()
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
new file mode 100644
index 0000000000000..614e59b7c29a2
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Client;
+
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Framework\Json\DecoderInterface;
+
+/**
+ * Class ResponseHandler
+ */
+class ResponseHandler
+{
+    /**
+     * Successful HTTP response codes.
+     *
+     * @var array
+     */
+    private static $successResponseCodes = [200, 201, 204];
+
+    /**
+     * Current servers PHP version id.
+     */
+    private static $phpVersionId = PHP_VERSION_ID;
+
+    /**
+     * Failure HTTP response codes with messages.
+     *
+     * @var array
+     */
+    private static $failureResponses = [
+        400 => 'Bad Request - The request could not be parsed. Response: %s',
+        401 => 'Unauthorized - user is not logged in, could not be authenticated. Response: %s',
+        403 => 'Forbidden - Cannot access resource. Response: %s',
+        404 => 'Not Found - resource does not exist. Response: %s',
+        409 => 'Conflict - with state of the resource on server. Can occur with (too rapid) PUT requests. Response: %s',
+        500 => 'Server error. Response: %s'
+    ];
+
+    /**
+     * Unexpected Signifyd API response message.
+     *
+     * @var string
+     */
+    private static $unexpectedResponse = 'Unexpected Signifyd API response code "%s" with content "%s".';
+
+    /**
+     * @var DecoderInterface
+     */
+    private $dataDecoder;
+
+    /**
+     * ResponseHandler constructor.
+     *
+     * @param DecoderInterface $dataDecoder
+     */
+    public function __construct(
+        DecoderInterface $dataDecoder
+    ) {
+        $this->dataDecoder = $dataDecoder;
+    }
+
+    /**
+     * Reads result of successful operation and throws exception in case of any failure.
+     *
+     * @param \Zend_Http_Response $response
+     * @return array
+     * @throws ApiCallException
+     */
+    public function handle(\Zend_Http_Response $response)
+    {
+        $responseCode = $response->getStatus();
+
+        if (!in_array($responseCode, self::$successResponseCodes)) {
+            $errorMessage = $this->buildApiCallFailureMessage($response);
+            throw new ApiCallException($errorMessage);
+        }
+
+        $responseBody = (string)$response->getBody();
+
+        if (self::$phpVersionId < 70000 && empty($responseBody)) {
+            /*
+             * Only since PHP 7.0 empty string treated as JSON syntax error
+             * http://php.net/manual/en/function.json-decode.php
+             */
+            throw new ApiCallException('Response is not valid JSON: Decoding failed: Syntax error');
+        }
+
+        try {
+            $decodedResponseBody = $this->dataDecoder->decode($responseBody);
+        } catch (\Exception $e) {
+            throw new ApiCallException(
+                'Response is not valid JSON: ' . $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        }
+
+        return $decodedResponseBody;
+    }
+
+    /**
+     *  Error message for request rejected by Signify.
+     *
+     * @param \Zend_Http_Response $response
+     * @return string
+     */
+    private function buildApiCallFailureMessage(\Zend_Http_Response $response)
+    {
+        $responseBody = $response->getBody();
+
+        if (key_exists($response->getStatus(), self::$failureResponses)) {
+            return sprintf(self::$failureResponses[$response->getStatus()], $responseBody);
+        }
+
+        return sprintf(
+            self::$unexpectedResponse,
+            $response->getStatus(),
+            $responseBody
+        );
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php
new file mode 100644
index 0000000000000..7057313b5e415
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Debugger;
+
+use Exception;
+
+/**
+ * This debugger ignores any information.
+ * Optimal production environment.
+ */
+class BlackHole implements DebuggerInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function success($requestUrl, $requestData, $responseStatus, $responseBody)
+    {
+        // ignore
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function failure($requestUrl, $requestData, Exception $exception)
+    {
+        // ignore
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php
new file mode 100644
index 0000000000000..1e61a313899cc
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Debugger;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Signifyd\Model\Config;
+
+/**
+ * Factory produces debugger based on runtime configuration.
+ *
+ * Configuration may be changed by
+ *  - config.xml
+ *  - at Admin panel (Stores > Configuration > Sales > Fraud Detection > Signifyd > Debug)
+ */
+class DebuggerFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * DebuggerFactory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param Config $config
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        Config $config
+    ) {
+        $this->objectManager = $objectManager;
+        $this->config = $config;
+    }
+
+    /**
+     * Create debugger instance
+     *
+     * @param int|null $storeId
+     * @return DebuggerInterface
+     */
+    public function create($storeId = null): DebuggerInterface
+    {
+        if (!$this->config->isDebugModeEnabled($storeId)) {
+            return $this->objectManager->get(BlackHole::class);
+        }
+
+        return $this->objectManager->get(Log::class);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php
new file mode 100644
index 0000000000000..f4a2f9cc56a8f
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Debugger;
+
+use Exception;
+
+/**
+ * Interface for debugging interaction with Signifyd API
+ */
+interface DebuggerInterface
+{
+    /**
+     * Register debug information about accepted request to Signifyd API
+     *
+     * @param string $requestUrl
+     * @param string $requestData
+     * @param string $responseStatus
+     * @param string $responseBody
+     * @return void
+     */
+    public function success($requestUrl, $requestData, $responseStatus, $responseBody);
+
+    /**
+     * Register debug information about failed request to Signifyd API
+     *
+     * @param string $requestUrl
+     * @param string $requestData
+     * @param Exception $exception
+     * @return mixed
+     */
+    public function failure($requestUrl, $requestData, Exception $exception);
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
new file mode 100644
index 0000000000000..4b7258180f53e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Debugger;
+
+use Psr\Log\LoggerInterface;
+use Exception;
+
+/**
+ * Debugger writes information about request, response and possible exception to standard system log.
+ */
+class Log implements DebuggerInterface
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Log constructor.
+     *
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function success($requestUrl, $requestData, $responseStatus, $responseBody)
+    {
+        $requestInfo = $this->buildRequestInfo($requestUrl, $requestData);
+        $responseInfo = $this->buildResponseInfo($responseStatus, $responseBody);
+
+        $info = $requestInfo
+              . $responseInfo;
+
+        $this->writeToLog($info);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function failure($requestUrl, $requestData, Exception $exception)
+    {
+        $requestInfo = $this->buildRequestInfo($requestUrl, $requestData);
+        $exceptionInfo = $this->buildExceptionInfo($exception);
+
+        $info = $requestInfo
+              . $exceptionInfo;
+
+        $this->writeToLog($info);
+    }
+
+    /**
+     * Build string with request URL and body
+     *
+     * @param string $requestUrl
+     * @param string $requestData
+     * @return string
+     */
+    private function buildRequestInfo($requestUrl, $requestData)
+    {
+        $infoContent = $this->buildInfoSection('URL', $requestUrl)
+                     . $this->buildInfoSection('Body', $requestData);
+
+        $info = $this->buildInfoSection('Request', $infoContent);
+        return $info;
+    }
+
+    /**
+     * Build string with response status code and body
+     *
+     * @param string $responseStatus
+     * @param string $responseBody
+     * @return string
+     */
+    private function buildResponseInfo($responseStatus, $responseBody)
+    {
+        $infoContent = $this->buildInfoSection('Status', $responseStatus)
+                     . $this->buildInfoSection('Body', $responseBody);
+
+        $info = $this->buildInfoSection('Response', $infoContent);
+        return $info;
+    }
+
+    /**
+     * Build string with exception information
+     *
+     * @param Exception $exception
+     * @return string
+     */
+    private function buildExceptionInfo(Exception $exception)
+    {
+        $infoContent = (string)$exception;
+        $info = $this->buildInfoSection('Exception', $infoContent);
+        return $info;
+    }
+
+    /**
+     * Write debug information to log file (var/log/debug.log by default)
+     *
+     * @param string $info
+     * @return void
+     */
+    private function writeToLog($info)
+    {
+        $logMessage = $this->buildInfoSection('Signifyd API integration debug info', $info);
+        $this->logger->debug($logMessage);
+    }
+
+    /**
+     * Build unified debug section string
+     *
+     * @param string $title
+     * @param string $content
+     * @return string
+     */
+    private function buildInfoSection($title, $content)
+    {
+        $formattedInfo = $title . ":\n"
+                       . $this->addIndent($content) . "\n";
+        return $formattedInfo;
+    }
+
+    /**
+     * Add indent to each line in content
+     *
+     * @param string $content
+     * @param string $indent
+     * @return string
+     */
+    private function addIndent($content, $indent = '    ')
+    {
+        $contentLines = explode("\n", $content);
+        $contentLinesWithIndent = array_map(function ($line) use ($indent) {
+            return $indent . $line;
+        }, $contentLines);
+        $content = implode("\n", $contentLinesWithIndent);
+        return $content;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
new file mode 100644
index 0000000000000..9f7a053c58724
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway;
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface;
+
+/**
+ * Signifyd Gateway.
+ *
+ * Encapsulates interaction with Signifyd API.
+ */
+class Gateway
+{
+    /**#@+
+     * Constants for case available statuses
+     */
+    const STATUS_OPEN = 'OPEN';
+    const STATUS_PROCESSING = 'PROCESSING';
+    const STATUS_FLAGGED = 'FLAGGED';
+    const STATUS_DISMISSED = 'DISMISSED';
+    /**#@-*/
+
+    /**#@+
+     * Constants for guarantee available statuses
+     * @see https://www.signifyd.com/resources/manual/signifyd-guarantee/signifyd-guarantee/
+     */
+    const GUARANTEE_APPROVED = 'APPROVED';
+    const GUARANTEE_DECLINED = 'DECLINED';
+    const GUARANTEE_PENDING = 'PENDING';
+    const GUARANTEE_CANCELED = 'CANCELED';
+    const GUARANTEE_IN_REVIEW = 'IN_REVIEW';
+    const GUARANTEE_UNREQUESTED = 'UNREQUESTED';
+    /**#@-*/
+
+    /**#@+
+     * Constants for case available review dispositions
+     */
+    const DISPOSITION_GOOD = 'GOOD';
+    const DISPOSITION_FRAUDULENT = 'FRAUDULENT';
+    const DISPOSITION_UNSET = 'UNSET';
+
+    /**
+     * @var CreateCaseBuilderInterface
+     */
+    private $createCaseBuilder;
+
+    /**
+     * @var ApiClient
+     */
+    private $apiClient;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var CaseRepositoryInterface
+     */
+    private $caseRepository;
+
+    /**
+     * Gateway constructor.
+     *
+     * @param CreateCaseBuilderInterface $createCaseBuilder
+     * @param ApiClient $apiClient
+     * @param OrderRepositoryInterface $orderRepository
+     * @param CaseRepositoryInterface $caseRepository
+     */
+    public function __construct(
+        CreateCaseBuilderInterface $createCaseBuilder,
+        ApiClient $apiClient,
+        OrderRepositoryInterface $orderRepository,
+        CaseRepositoryInterface $caseRepository
+    ) {
+        $this->createCaseBuilder = $createCaseBuilder;
+        $this->apiClient = $apiClient;
+        $this->orderRepository = $orderRepository;
+        $this->caseRepository = $caseRepository;
+    }
+
+    /**
+     * Returns id of created case (investigation) on Signifyd service
+     * @see https://www.signifyd.com/docs/api/#/reference/cases/create-a-case
+     *
+     * @param int $orderId
+     * @return int Signifyd case (investigation) identifier
+     * @throws GatewayException
+     */
+    public function createCase($orderId)
+    {
+        $caseParams = $this->createCaseBuilder->build($orderId);
+        $storeId = $this->getStoreIdFromOrder($orderId);
+
+        $caseCreationResult = $this->apiClient->makeApiCall(
+            '/cases',
+            'POST',
+            $caseParams,
+            $storeId
+        );
+
+        if (!isset($caseCreationResult['investigationId'])) {
+            throw new GatewayException('Expected field "investigationId" missed.');
+        }
+
+        return (int)$caseCreationResult['investigationId'];
+    }
+
+    /**
+     * Returns guaranty decision result
+     * @see https://www.signifyd.com/docs/api/#/reference/guarantees/submit-a-case-for-guarantee
+     *
+     * @param int $signifydCaseId
+     * @return string
+     * @throws GatewayException
+     */
+    public function submitCaseForGuarantee($signifydCaseId)
+    {
+        $storeId = $this->getStoreIdFromCase($signifydCaseId);
+        $guaranteeCreationResult = $this->apiClient->makeApiCall(
+            '/guarantees',
+            'POST',
+            [
+                'caseId' => $signifydCaseId,
+            ],
+            $storeId
+        );
+
+        $disposition = $this->processDispositionResult($guaranteeCreationResult);
+        return $disposition;
+    }
+
+    /**
+     * Sends request to cancel guarantee and returns disposition.
+     *
+     * @see https://www.signifyd.com/docs/api/#/reference/guarantees/submit-a-case-for-guarantee/cancel-guarantee
+     * @param int $caseId
+     * @return string
+     * @throws GatewayException
+     */
+    public function cancelGuarantee($caseId)
+    {
+        $storeId = $this->getStoreIdFromCase($caseId);
+        $result = $this->apiClient->makeApiCall(
+            '/cases/' . $caseId . '/guarantee',
+            'PUT',
+            [
+                'guaranteeDisposition' => self::GUARANTEE_CANCELED
+            ],
+            $storeId
+        );
+
+        $disposition = $this->processDispositionResult($result);
+        if ($disposition !== self::GUARANTEE_CANCELED) {
+            throw new GatewayException("API returned unexpected disposition: $disposition.");
+        }
+
+        return $disposition;
+    }
+
+    /**
+     * Processes result from Signifyd API.
+     * Throws the GatewayException is result does not contain guarantee disposition in response or
+     * disposition has unknown status.
+     *
+     * @param array $result
+     * @return string
+     * @throws GatewayException
+     */
+    private function processDispositionResult(array $result)
+    {
+        if (!isset($result['disposition'])) {
+            throw new GatewayException('Expected field "disposition" missed.');
+        }
+
+        $disposition = strtoupper($result['disposition']);
+
+        if (!in_array($disposition, [
+            self::GUARANTEE_APPROVED,
+            self::GUARANTEE_DECLINED,
+            self::GUARANTEE_PENDING,
+            self::GUARANTEE_CANCELED,
+            self::GUARANTEE_IN_REVIEW,
+            self::GUARANTEE_UNREQUESTED
+        ])) {
+            throw new GatewayException(
+                sprintf('API returns unknown guaranty disposition "%s".', $disposition)
+            );
+        }
+
+        return $disposition;
+    }
+
+    /**
+     * Returns store id by case.
+     *
+     * @param int $caseId
+     * @return int|null
+     */
+    private function getStoreIdFromCase(int $caseId)
+    {
+        $case = $this->caseRepository->getByCaseId($caseId);
+        $orderId = $case->getOrderId();
+
+        return $this->getStoreIdFromOrder($orderId);
+    }
+
+    /**
+     * Returns store id from order.
+     *
+     * @param int $orderId
+     * @return int|null
+     */
+    private function getStoreIdFromOrder(int $orderId)
+    {
+        $order = $this->orderRepository->get($orderId);
+
+        return $order->getStoreId();
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
new file mode 100644
index 0000000000000..666217f8ccc85
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway;
+
+/**
+ * Exception of interaction with Signifyd API
+ */
+class GatewayException extends \Exception
+{
+
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
new file mode 100644
index 0000000000000..482f243f6f05d
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Sales\Api\Data\OrderAddressInterface;
+
+/**
+ * Prepare address data
+ */
+class AddressBuilder
+{
+    /**
+     * Returns address data params based on OrderAddressInterface
+     *
+     * @param OrderAddressInterface $address
+     * @return array
+     */
+    public function build(OrderAddressInterface $address)
+    {
+        return [
+            'streetAddress' => $this->getStreetLine(1, $address->getStreet()),
+            'unit' => $this->getStreetLine(2, $address->getStreet()),
+            'city' => $address->getCity(),
+            'provinceCode' => $address->getRegionCode(),
+            'postalCode' => $address->getPostcode(),
+            'countryCode' => $address->getCountryId()
+        ];
+    }
+
+    /**
+     * Get street line by number
+     *
+     * @param int $number
+     * @param string[]|null $street
+     * @return string
+     */
+    private function getStreetLine($number, $street)
+    {
+        $lines = is_array($street) ? $street : [];
+
+        return $lines[$number - 1] ?? '';
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php
new file mode 100644
index 0000000000000..5e3a1a83e7aeb
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Sales\Model\Order;
+
+/**
+ * Prepare data related to the card that was used for the purchase and its cardholder.
+ */
+class CardBuilder
+{
+    /**
+     * @var AddressBuilder
+     */
+    private $addressBuilder;
+
+    /**
+     * @param AddressBuilder $addressBuilder
+     */
+    public function __construct(
+        AddressBuilder $addressBuilder
+    ) {
+        $this->addressBuilder = $addressBuilder;
+    }
+
+    /**
+     * Returns card data params based on payment and billing address info
+     *
+     * @param Order $order
+     * @return array
+     */
+    public function build(Order $order)
+    {
+        $result = [];
+        $address = $order->getBillingAddress();
+        if ($address === null) {
+            return $result;
+        }
+
+        $payment = $order->getPayment();
+        $result = [
+            'card' => [
+                'cardHolderName' => $address->getFirstname() . ' ' . $address->getLastname(),
+                'last4' => $payment->getCcLast4(),
+                'expiryMonth' => $payment->getCcExpMonth(),
+                'expiryYear' =>  $payment->getCcExpYear(),
+                'billingAddress' => $this->addressBuilder->build($address)
+            ]
+        ];
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php
new file mode 100644
index 0000000000000..8db06473b96d8
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Framework\App\ProductMetadataInterface;
+
+/**
+ * Provides platform name, edition and version info
+ */
+class ClientVersionBuilder
+{
+    /**
+     * @var string
+     */
+    private static $clientVersion = '1.0';
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @param ProductMetadataInterface $productMetadata
+     */
+    public function __construct(
+        ProductMetadataInterface $productMetadata
+    ) {
+        $this->productMetadata = $productMetadata;
+    }
+
+    /**
+     * Returns version info
+     *
+     * @return array
+     */
+    public function build()
+    {
+        return [
+            'platformAndClient' => [
+                'storePlatform' => $this->productMetadata->getName() . ' ' . $this->productMetadata->getEdition(),
+                'storePlatformVersion' => $this->productMetadata->getVersion(),
+                'signifydClientApp' => $this->productMetadata->getName(),
+                'signifydClientAppVersion' => self::$clientVersion,
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php
new file mode 100644
index 0000000000000..3e41003d47842
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Sales\Model\OrderFactory;
+
+/**
+ * Signifyd case creation request builder.
+ *
+ * Handles the conversion from Magento Order to Signifyd Case.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreateCaseBuilder implements CreateCaseBuilderInterface
+{
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
+    /**
+     * @var PurchaseBuilder
+     */
+    private $purchaseBuilder;
+
+    /**
+     * @var CardBuilder
+     */
+    private $cardBuilder;
+
+    /**
+     * @var RecipientBuilder
+     */
+    private $recipientBuilder;
+
+    /**
+     * @var SellerBuilder
+     */
+    private $sellerBuilder;
+
+    /**
+     * @var ClientVersionBuilder
+     */
+    private $clientVersionBuilder;
+
+    /**
+     * @var UserAccountBuilder
+     */
+    private $userAccountBuilder;
+
+    /**
+     * @param OrderFactory $orderFactory
+     * @param PurchaseBuilder $purchaseBuilder
+     * @param CardBuilder $cardBuilder
+     * @param RecipientBuilder $recipientBuilder
+     * @param SellerBuilder $sellerBuilder
+     * @param ClientVersionBuilder $clientVersionBuilder
+     * @param UserAccountBuilder $userAccountBuilder
+     */
+    public function __construct(
+        OrderFactory $orderFactory,
+        PurchaseBuilder $purchaseBuilder,
+        CardBuilder $cardBuilder,
+        RecipientBuilder $recipientBuilder,
+        SellerBuilder $sellerBuilder,
+        ClientVersionBuilder $clientVersionBuilder,
+        UserAccountBuilder $userAccountBuilder
+    ) {
+        $this->orderFactory = $orderFactory;
+        $this->purchaseBuilder = $purchaseBuilder;
+        $this->cardBuilder = $cardBuilder;
+        $this->recipientBuilder = $recipientBuilder;
+        $this->sellerBuilder = $sellerBuilder;
+        $this->clientVersionBuilder = $clientVersionBuilder;
+        $this->userAccountBuilder = $userAccountBuilder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build($orderId)
+    {
+        /* @var $order \Magento\Sales\Model\Order */
+        $order = $this->orderFactory->create()->load($orderId);
+
+        return $this->removeEmptyValues(
+            array_merge(
+                $this->purchaseBuilder->build($order),
+                $this->cardBuilder->build($order),
+                $this->recipientBuilder->build($order),
+                $this->userAccountBuilder->build($order),
+                $this->sellerBuilder->build($order),
+                $this->clientVersionBuilder->build()
+            )
+        );
+    }
+
+    /**
+     * Remove empty and null values.
+     *
+     * @param array $data
+     * @return array
+     */
+    private function removeEmptyValues($data)
+    {
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $data[$key] = $this->removeEmptyValues($data[$key]);
+            }
+
+            if ($this->isEmpty($data[$key])) {
+                unset($data[$key]);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Empty values are null, empty string and empty array.
+     *
+     * @param mixed $value
+     * @return bool
+     */
+    private function isEmpty($value)
+    {
+        return $value === null || (is_array($value) && empty($value));
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php
new file mode 100644
index 0000000000000..56662f69e7c5a
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+/**
+ * Collects information about order and build array with parameters required by Signifyd API
+ *
+ * @see https://www.signifyd.com/docs/api/#/reference/cases/create-a-case
+ */
+interface CreateCaseBuilderInterface
+{
+    /**
+     * Returns params for Case creation request
+     *
+     * @param int $orderId
+     * @return array
+     */
+    public function build($orderId);
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
new file mode 100644
index 0000000000000..5e544e4b4048e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Model\PaymentMethodMapper\PaymentMethodMapper;
+use Magento\Signifyd\Model\PaymentVerificationFactory;
+use Magento\Signifyd\Model\SignifydOrderSessionId;
+
+/**
+ * Prepare data related to purchase event represented in case creation request.
+ */
+class PurchaseBuilder
+{
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var ScopeInterface
+     */
+    private $scope;
+
+    /**
+     * @var SignifydOrderSessionId
+     */
+    private $signifydOrderSessionId;
+
+    /**
+     * @var PaymentVerificationFactory
+     */
+    private $paymentVerificationFactory;
+
+    /**
+     * @var PaymentMethodMapper
+     */
+    private $paymentMethodMapper;
+
+    /**
+     * PurchaseBuilder constructor.
+     *
+     * @param DateTimeFactory            $dateTimeFactory
+     * @param ScopeInterface             $scope
+     * @param SignifydOrderSessionId     $signifydOrderSessionId
+     * @param PaymentVerificationFactory $paymentVerificationFactory
+     * @param PaymentMethodMapper        $paymentMethodMapper
+     */
+    public function __construct(
+        DateTimeFactory $dateTimeFactory,
+        ScopeInterface $scope,
+        SignifydOrderSessionId $signifydOrderSessionId,
+        PaymentVerificationFactory $paymentVerificationFactory,
+        PaymentMethodMapper $paymentMethodMapper
+    ) {
+        $this->dateTimeFactory = $dateTimeFactory;
+        $this->scope = $scope;
+        $this->signifydOrderSessionId = $signifydOrderSessionId;
+        $this->paymentVerificationFactory = $paymentVerificationFactory;
+        $this->paymentMethodMapper = $paymentMethodMapper;
+    }
+
+    /**
+     * Returns purchase data params
+     *
+     * @param Order $order
+     * @return array
+     * @throws ConfigurationMismatchException
+     */
+    public function build(Order $order)
+    {
+        $orderPayment = $order->getPayment();
+        $createdAt = $this->dateTimeFactory->create(
+            $order->getCreatedAt(),
+            new \DateTimeZone('UTC')
+        );
+
+        $result = [
+            'purchase' => [
+                'orderSessionId' => $this->signifydOrderSessionId->get($order->getQuoteId()),
+                'browserIpAddress' => $order->getRemoteIp(),
+                'orderId' => $order->getIncrementId(),
+                'createdAt' => $createdAt->format(\DateTime::ATOM),
+                'paymentGateway' => $this->getPaymentGateway($orderPayment->getMethod()),
+                'transactionId' => $orderPayment->getLastTransId(),
+                'currency' => $order->getOrderCurrencyCode(),
+                'avsResponseCode' => $this->getAvsCode($orderPayment),
+                'cvvResponseCode' => $this->getCvvCode($orderPayment),
+                'orderChannel' => $this->getOrderChannel(),
+                'totalPrice' => $order->getGrandTotal(),
+                'paymentMethod' => $this->paymentMethodMapper
+                    ->getSignifydPaymentMethodCode($orderPayment->getMethod())
+            ],
+        ];
+
+        $shippingDescription = $order->getShippingDescription();
+        if ($shippingDescription !== null) {
+            $result['purchase']['shipments'] = [
+                [
+                    'shipper' => $this->getShipper($order->getShippingDescription()),
+                    'shippingMethod' => $this->getShippingMethod($order->getShippingDescription()),
+                    'shippingPrice' => $order->getShippingAmount()
+                ]
+            ];
+        }
+
+        $products = $this->getProducts($order);
+        if (!empty($products)) {
+            $result['purchase']['products'] = $products;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the products purchased in the transaction.
+     *
+     * @param Order $order
+     * @return array
+     */
+    private function getProducts(Order $order)
+    {
+        $result = [];
+        foreach ($order->getAllItems() as $orderItem) {
+            $result[] = [
+                'itemId' => $orderItem->getSku(),
+                'itemName' => $orderItem->getName(),
+                'itemPrice' => $orderItem->getPrice(),
+                'itemQuantity' => (int)$orderItem->getQtyOrdered(),
+                'itemUrl' => $orderItem->getProduct()->getProductUrl(),
+                'itemWeight' => $orderItem->getProduct()->getWeight()
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the name of the shipper
+     *
+     * @param string $shippingDescription
+     * @return string
+     */
+    private function getShipper($shippingDescription)
+    {
+        $result = explode(' - ', $shippingDescription, 2);
+
+        return count($result) == 2 ? $result[0] : '';
+    }
+
+    /**
+     * Returns the type of the shipment method used
+     *
+     * @param string $shippingDescription
+     * @return string
+     */
+    private function getShippingMethod($shippingDescription)
+    {
+        $result = explode(' - ', $shippingDescription, 2);
+
+        return count($result) == 2 ? $result[1] : '';
+    }
+
+    /**
+     * Returns the gateway that processed the transaction. For PayPal orders should be paypal_account.
+     *
+     * @param string $gatewayCode
+     * @return string
+     */
+    private function getPaymentGateway($gatewayCode)
+    {
+        $payPalCodeList = [
+            'paypal_express',
+            'braintree_paypal',
+            'payflowpro',
+            'payflow_express',
+            'payflow_link',
+            'payflow_advanced',
+            'hosted_pro',
+        ];
+        return in_array($gatewayCode, $payPalCodeList) ? 'paypal_account' : $gatewayCode;
+    }
+
+    /**
+     * Returns WEB for web-orders, PHONE for orders created by Admin
+     *
+     * @return string
+     */
+    private function getOrderChannel()
+    {
+        return $this->scope->getCurrentScope() === Area::AREA_ADMINHTML ? 'PHONE' : 'WEB';
+    }
+
+    /**
+     * Gets AVS code for order payment method.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws ConfigurationMismatchException
+     */
+    private function getAvsCode(OrderPaymentInterface $orderPayment)
+    {
+        $avsAdapter = $this->paymentVerificationFactory->createPaymentAvs($orderPayment->getMethod());
+        return $avsAdapter->getCode($orderPayment);
+    }
+
+    /**
+     * Gets CVV code for order payment method.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @return string
+     * @throws ConfigurationMismatchException
+     */
+    private function getCvvCode(OrderPaymentInterface $orderPayment)
+    {
+        $cvvAdapter = $this->paymentVerificationFactory->createPaymentCvv($orderPayment->getMethod());
+        return $cvvAdapter->getCode($orderPayment);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php
new file mode 100644
index 0000000000000..d9d26c8943b88
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Sales\Model\Order;
+
+/**
+ * Prepare data related to person or organization receiving the items purchased
+ */
+class RecipientBuilder
+{
+    /**
+     * @var AddressBuilder
+     */
+    private $addressBuilder;
+
+    /**
+     * @param AddressBuilder $addressBuilder
+     */
+    public function __construct(
+        AddressBuilder $addressBuilder
+    ) {
+        $this->addressBuilder = $addressBuilder;
+    }
+
+    /**
+     * Returns recipient data params based on shipping address
+     *
+     * @param Order $order
+     * @return array
+     */
+    public function build(Order $order)
+    {
+        $result = [];
+        $address = $order->getShippingAddress();
+        if ($address === null) {
+            return $result;
+        }
+
+        $result = [
+            'recipient' => [
+                'fullName' => $address->getName(),
+                'confirmationEmail' =>  $address->getEmail(),
+                'confirmationPhone' => $address->getTelephone(),
+                'organization' => $address->getCompany(),
+                'deliveryAddress' => $this->addressBuilder->build($address)
+            ]
+        ];
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php
new file mode 100644
index 0000000000000..b2cf0401b247f
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Directory\Model\RegionFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Information;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Prepare data related to the seller of the product.
+ *
+ * This information is optional unless you are operating a marketplace,
+ * listing goods on behalf of multiple sellers who each hold a seller account registered with your site.
+ */
+class SellerBuilder
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var RegionFactory
+     */
+    private $regionFactory;
+
+    /**
+     * @var array
+     */
+    private $regionCodes = [];
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param RegionFactory $regionFactory
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        RegionFactory $regionFactory
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->regionFactory = $regionFactory;
+    }
+
+    /**
+     * Returns seller data params
+     *
+     * @param Order $order
+     * @return array
+     */
+    public function build(Order $order)
+    {
+        $store = $order->getStore();
+
+        return [
+            'seller' => [
+                'name' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_NAME, $store),
+                'domain' => $this->getPublicDomain($store),
+                'shipFromAddress' => [
+                    'streetAddress' => $this->getConfigValue(Shipment::XML_PATH_STORE_ADDRESS1, $store),
+                    'unit' => $this->getConfigValue(Shipment::XML_PATH_STORE_ADDRESS2, $store),
+                    'city' => $this->getConfigValue(Shipment::XML_PATH_STORE_CITY, $store),
+                    'provinceCode' => $this->getRegionCodeById(
+                        $this->getConfigValue(Shipment::XML_PATH_STORE_REGION_ID, $store)
+                    ),
+                    'postalCode' => $this->getConfigValue(Shipment::XML_PATH_STORE_ZIP, $store),
+                    'countryCode' => $this->getConfigValue(Shipment::XML_PATH_STORE_COUNTRY_ID, $store),
+                ],
+                'corporateAddress' => [
+                    'streetAddress' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_STREET_LINE1, $store),
+                    'unit' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_STREET_LINE2, $store),
+                    'city' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_CITY, $store),
+                    'provinceCode' => $this->getRegionCodeById(
+                        $this->getConfigValue(Information::XML_PATH_STORE_INFO_REGION_CODE, $store)
+                    ),
+                    'postalCode' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_POSTCODE, $store),
+                    'countryCode' => $this->getConfigValue(Information::XML_PATH_STORE_INFO_COUNTRY_CODE, $store),
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Returns region code by id
+     *
+     * @param int $regionId
+     * @return string
+     */
+    private function getRegionCodeById($regionId)
+    {
+        if (!isset($this->regionCodes[$regionId])) {
+            $this->regionCodes[$regionId] = $this->regionFactory->create()->load($regionId)->getCode();
+        }
+
+        return $this->regionCodes[$regionId];
+    }
+
+    /**
+     * Returns value from config
+     *
+     * @param string $value
+     * @param StoreInterface $store
+     * @return mixed
+     */
+    private function getConfigValue($value, StoreInterface $store)
+    {
+        return $this->scopeConfig->getValue(
+            $value,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+    }
+
+    /**
+     * Returns public domain name
+     *
+     * @param StoreInterface $store
+     * @return string|null null if no DNS records corresponding to a current host found
+     */
+    private function getPublicDomain(StoreInterface $store)
+    {
+        $baseUrl = $store->getBaseUrl();
+        $domain = parse_url($baseUrl, PHP_URL_HOST);
+        if (\function_exists('checkdnsrr') && false === \checkdnsrr($domain)) {
+            return null;
+        }
+
+        return $domain;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php
new file mode 100644
index 0000000000000..0da49b85da869
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Model\CustomerOrders;
+
+/**
+ * Prepares details based on registered user account info
+ */
+class UserAccountBuilder
+{
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var \Magento\Framework\Intl\DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var CustomerOrders
+     */
+    private $customerOrders;
+
+    /**
+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     * @param CustomerOrders $customerOrders
+     * @param \Magento\Framework\Intl\DateTimeFactory $dateTimeFactory
+     */
+    public function __construct(
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
+        CustomerOrders $customerOrders,
+        \Magento\Framework\Intl\DateTimeFactory $dateTimeFactory
+    ) {
+        $this->customerRepository = $customerRepository;
+        $this->dateTimeFactory = $dateTimeFactory;
+        $this->customerOrders = $customerOrders;
+    }
+
+    /**
+     * Returns user account data params.
+     * Only for registered customers.
+     *
+     * @param Order $order
+     * @return array
+     */
+    public function build(Order $order)
+    {
+        $result = [];
+
+        $customerId = $order->getCustomerId();
+        if (null === $customerId) {
+            return $result;
+        }
+
+        $customer = $this->customerRepository->getById($customerId);
+        $result = [
+            'userAccount' => [
+                'email' => $customer->getEmail(),
+                'username' => $customer->getEmail(),
+                'phone' => $order->getBillingAddress()->getTelephone(),
+                'accountNumber' => $customerId,
+                'createdDate' => $this->formatDate($customer->getCreatedAt()),
+                'lastUpdateDate' => $this->formatDate($customer->getUpdatedAt())
+            ]
+        ];
+
+        $ordersInfo = $this->customerOrders->getAggregatedOrdersInfo($customerId);
+        if (isset($ordersInfo['aggregateOrderCount'])) {
+            $result['userAccount']['aggregateOrderCount'] = $ordersInfo['aggregateOrderCount'];
+        }
+        if (isset($ordersInfo['aggregateOrderDollars'])) {
+            $result['userAccount']['aggregateOrderDollars'] = $ordersInfo['aggregateOrderDollars'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns date formatted according to ISO8601.
+     *
+     * @param string $date
+     * @return string
+     */
+    private function formatDate($date)
+    {
+        $result = $this->dateTimeFactory->create(
+            $date,
+            new \DateTimeZone('UTC')
+        );
+
+        return $result->format(\DateTime::ATOM);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php
new file mode 100644
index 0000000000000..f77db737473c0
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Response;
+
+/**
+ * Webhooks are messages sent by SIGNIFYD via HTTP POST to a url you configure on your
+ * Notifications page in the SIGNIFYD settings.
+ *
+ * WebhookMessage messages are sent when certain events occur in the life of an investigation.
+ * They allow your application to receive pushed updates about a case, rather than poll SIGNIFYD for status changes.
+ *
+ * @see https://www.signifyd.com/docs/api/#/reference/webhooks
+ */
+class WebhookMessage
+{
+    /**
+     * Decoded webhook request body.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Event topic identifier.
+     *
+     * @var string
+     */
+    private $eventTopic;
+
+    /**
+     * @param array $data
+     * @param string $eventTopic
+     */
+    public function __construct(
+        array $data,
+        $eventTopic
+    ) {
+        $this->data = $data;
+        $this->eventTopic = $eventTopic;
+    }
+
+    /**
+     * Returns decoded webhook request body.
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Returns event topic identifier.
+     *
+     * @return string
+     */
+    public function getEventTopic()
+    {
+        return $this->eventTopic;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php
new file mode 100644
index 0000000000000..50389102359b1
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Response;
+
+use Magento\Framework\Json\DecoderInterface;
+
+/**
+ * Reads request and produces webhook message data object based on request params.
+ */
+class WebhookMessageReader
+{
+    /**
+     * @var DecoderInterface
+     */
+    private $dataDecoder;
+
+    /**
+     * @var WebhookMessageFactory
+     */
+    private $webhookMessageFactory;
+
+    /**
+     * @param DecoderInterface $decoder
+     * @param WebhookMessageFactory $webhookMessageFactory
+     */
+    public function __construct(
+        DecoderInterface $decoder,
+        WebhookMessageFactory $webhookMessageFactory
+    ) {
+        $this->dataDecoder = $decoder;
+        $this->webhookMessageFactory = $webhookMessageFactory;
+    }
+
+    /**
+     * Returns webhook message data object.
+     *
+     * @param WebhookRequest $request
+     * @return WebhookMessage
+     * @throws \InvalidArgumentException
+     */
+    public function read(WebhookRequest $request)
+    {
+        try {
+            $decodedData = $this->dataDecoder->decode($request->getBody());
+        } catch (\Exception $e) {
+            throw new \InvalidArgumentException(
+                'Webhook request body is not valid JSON: ' . $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        }
+
+        $webhookMessage = $this->webhookMessageFactory->create(
+            [
+                'data' => $decodedData,
+                'eventTopic' => $request->getEventTopic()
+            ]
+        );
+
+        return $webhookMessage;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php
new file mode 100644
index 0000000000000..214ccf0eeb70f
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Response;
+
+use Magento\Framework\App\Request\Http;
+
+/**
+ *  Reads Signifyd webhook request data.
+ */
+class WebhookRequest
+{
+    /**
+     * @var Http
+     */
+    private $request;
+
+    /**
+     * @param Http $request
+     */
+    public function __construct(
+        Http $request
+    ) {
+        $this->request = $request;
+    }
+
+    /**
+     * Returns Base64 encoded output of the HMAC SHA256 encoding of the JSON body of the message.
+     *
+     * @return string
+     */
+    public function getHash()
+    {
+        return (string)$this->request->getHeader('X-SIGNIFYD-SEC-HMAC-SHA256');
+    }
+
+    /**
+     * Returns event topic identifier.
+     *
+     * @return string
+     */
+    public function getEventTopic()
+    {
+        return (string)$this->request->getHeader('X-SIGNIFYD-TOPIC');
+    }
+
+    /**
+     * Returns raw data from the request body.
+     *
+     * @return string
+     */
+    public function getBody()
+    {
+        return (string)$this->request->getContent();
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php
new file mode 100644
index 0000000000000..274ef2f854684
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Response;
+
+use Magento\Framework\Json\DecoderInterface;
+use Magento\Signifyd\Model\Config;
+
+/**
+ * Validates webhook request.
+ *
+ */
+class WebhookRequestValidator
+{
+    /**
+     * Allowed topic identifiers which will be sent in the X-SIGNIFYD-TOPIC header of the webhook.
+     *
+     * @var array
+     */
+    private $allowedTopicValues = [
+        'cases/creation',
+        'cases/rescore',
+        'cases/review',
+        'guarantees/completion',
+        'cases/test'
+    ];
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var DecoderInterface
+     */
+    private $decoder;
+
+    /**
+     * @param Config $config
+     * @param DecoderInterface $decoder
+     */
+    public function __construct(
+        Config $config,
+        DecoderInterface $decoder
+    ) {
+        $this->config = $config;
+        $this->decoder = $decoder;
+    }
+
+    /**
+     * Validates webhook request.
+     *
+     * @param WebhookRequest $webhookRequest
+     * @return bool
+     */
+    public function validate(WebhookRequest $webhookRequest)
+    {
+        $body = $webhookRequest->getBody();
+        $eventTopic = $webhookRequest->getEventTopic();
+        $hash = $webhookRequest->getHash();
+
+        return $this->isValidTopic($eventTopic)
+            && $this->isValidBody($body)
+            && $this->isValidHash($eventTopic, $body, $hash);
+    }
+
+    /**
+     * Checks if value of topic identifier is in allowed list
+     *
+     * @param string $topic topic identifier.
+     * @return bool
+     */
+    private function isValidTopic($topic)
+    {
+        return in_array($topic, $this->allowedTopicValues);
+    }
+
+    /**
+     * Verifies a webhook request body is valid JSON and not empty.
+     *
+     * @param string $body
+     * @return bool
+     */
+    private function isValidBody($body)
+    {
+        try {
+            $decodedBody = $this->decoder->decode($body);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        return !empty($decodedBody);
+    }
+
+    /**
+     * Verifies a webhook request has in fact come from SIGNIFYD.
+     *
+     * @param string $eventTopic
+     * @param string $body
+     * @param string $hash
+     * @return bool
+     */
+    private function isValidHash($eventTopic, $body, $hash)
+    {
+        // In the case that this is a webhook test, the encoding ABCDE is allowed
+        $apiKey = $eventTopic == 'cases/test' ? 'ABCDE' : $this->config->getApiKey();
+        $actualHash = base64_encode(hash_hmac('sha256', $body, $apiKey, true));
+
+        return $hash === $actualHash;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php b/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php
new file mode 100644
index 0000000000000..52746bc4ec6c5
--- /dev/null
+++ b/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\DataObject\IdentityGeneratorInterface;
+
+/**
+ * Encapsulates generation of uuid by quote id.
+ */
+class SignifydOrderSessionId
+{
+    /**
+     * @var IdentityGeneratorInterface
+     */
+    private $identityGenerator;
+
+    /**
+     * @param IdentityGeneratorInterface $identityGenerator
+     */
+    public function __construct(
+        IdentityGeneratorInterface $identityGenerator
+    ) {
+        $this->identityGenerator = $identityGenerator;
+    }
+
+    /**
+     * Returns unique identifier through generation uuid by quote id.
+     *
+     * @param int $quoteId
+     * @return string
+     */
+    public function get($quoteId)
+    {
+        return $this->identityGenerator->generateIdForData($quoteId);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Observer/PlaceOrder.php b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
new file mode 100644
index 0000000000000..7c451a129cccd
--- /dev/null
+++ b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Observer;
+
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Api\CaseCreationServiceInterface;
+use Magento\Signifyd\Model\Config;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Observer should be triggered when new order is created and placed.
+ * If Signifyd integration enabled in configuration then new case will be created.
+ */
+class PlaceOrder implements ObserverInterface
+{
+    /**
+     * @var Config
+     */
+    private $signifydIntegrationConfig;
+
+    /**
+     * @var CaseCreationServiceInterface
+     */
+    private $caseCreationService;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Config $signifydIntegrationConfig
+     * @param CaseCreationServiceInterface $caseCreationService
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Config $signifydIntegrationConfig,
+        CaseCreationServiceInterface $caseCreationService,
+        LoggerInterface $logger
+    ) {
+        $this->signifydIntegrationConfig = $signifydIntegrationConfig;
+        $this->caseCreationService = $caseCreationService;
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(Observer $observer)
+    {
+        $orders = $this->extractOrders(
+            $observer->getEvent()
+        );
+
+        if (null === $orders) {
+            return;
+        }
+
+        foreach ($orders as $order) {
+            $storeId = $order->getStoreId();
+            if ($this->signifydIntegrationConfig->isActive($storeId)) {
+                $this->createCaseForOrder($order);
+            }
+        }
+    }
+
+    /**
+     * Creates Signifyd case for single order with online payment method.
+     *
+     * @param OrderInterface $order
+     * @return void
+     */
+    private function createCaseForOrder($order)
+    {
+        $orderId = $order->getEntityId();
+        if (null === $orderId
+            || $order->getPayment()->getMethodInstance()->isOffline()
+            || $order->getState() === Order::STATE_PENDING_PAYMENT) {
+            return;
+        }
+
+        try {
+            $this->caseCreationService->createForOrder($orderId);
+        } catch (AlreadyExistsException $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    /**
+     * Returns Orders entity list from Event data container
+     *
+     * @param Event $event
+     * @return OrderInterface[]|null
+     */
+    private function extractOrders(Event $event)
+    {
+        $order = $event->getData('order');
+        if (null !== $order) {
+            return [$order];
+        }
+
+        return $event->getData('orders');
+    }
+}
diff --git a/app/code/Magento/Signifyd/Plugin/OrderPlugin.php b/app/code/Magento/Signifyd/Plugin/OrderPlugin.php
new file mode 100644
index 0000000000000..663409d0eb824
--- /dev/null
+++ b/app/code/Magento/Signifyd/Plugin/OrderPlugin.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Plugin;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Api\GuaranteeCancelingServiceInterface;
+
+/**
+ * Plugin for Magento\Sales\Model\Order.
+ *
+ * @see Order
+ */
+class OrderPlugin
+{
+    /**
+     * @var GuaranteeCancelingServiceInterface
+     */
+    private $guaranteeCancelingService;
+
+    /**
+     * @param GuaranteeCancelingServiceInterface $guaranteeCancelingService
+     */
+    public function __construct(
+        GuaranteeCancelingServiceInterface $guaranteeCancelingService
+    ) {
+        $this->guaranteeCancelingService = $guaranteeCancelingService;
+    }
+
+    /**
+     * Performs Signifyd guarantee cancel operation after order canceling
+     * if cancel order operation was successful.
+     *
+     * @see Order::cancel
+     * @param Order $order
+     * @param OrderInterface $result
+     * @return OrderInterface
+     */
+    public function afterCancel(Order $order, $result)
+    {
+        if ($order->isCanceled()) {
+            $this->guaranteeCancelingService->cancelForOrder(
+                $order->getEntityId()
+            );
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php b/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php
new file mode 100644
index 0000000000000..17cf4d7e7dbe9
--- /dev/null
+++ b/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Plugin;
+
+use Magento\Payment\Model\InfoInterface;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Signifyd\Api\GuaranteeCancelingServiceInterface;
+
+/**
+ * Plugin for Magento\Payment\Model\MethodInterface.
+ *
+ * @see MethodInterface
+ */
+class PaymentPlugin
+{
+    /**
+     * @var GuaranteeCancelingServiceInterface
+     */
+    private $guaranteeCancelingService;
+
+    /**
+     * @param GuaranteeCancelingServiceInterface $guaranteeCancelingService
+     */
+    public function __construct(
+        GuaranteeCancelingServiceInterface $guaranteeCancelingService
+    ) {
+        $this->guaranteeCancelingService = $guaranteeCancelingService;
+    }
+
+    /**
+     * Performs Signifyd guarantee cancel operation after payment denying.
+     *
+     * @see MethodInterface::denyPayment
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
+     * @param MethodInterface $subject
+     * @param MethodInterface|bool $result
+     * @param InfoInterface $payment
+     * @return bool|MethodInterface
+     */
+    public function afterDenyPayment(MethodInterface $subject, $result, InfoInterface $payment)
+    {
+        if ($this->isPaymentDenied($payment, $result)) {
+            $this->guaranteeCancelingService->cancelForOrder($payment->getParentId());
+        }
+
+        return $result;
+    }
+
+    /**
+     * Checks if deny payment operation was successful.
+     *
+     * Result not false check for payment methods using AbstractMethod.
+     * Transaction is closed check for payment methods using Gateway.
+     *
+     * @param InfoInterface $payment
+     * @param MethodInterface $result
+     * @return bool
+     */
+    private function isPaymentDenied($payment, $result)
+    {
+        return $result !== false || $payment->getIsTransactionClosed();
+    }
+}
diff --git a/app/code/Magento/Signifyd/README.md b/app/code/Magento/Signifyd/README.md
new file mode 100644
index 0000000000000..9479972cb21b6
--- /dev/null
+++ b/app/code/Magento/Signifyd/README.md
@@ -0,0 +1,78 @@
+# Magento_Signifyd module
+
+## Overview
+
+The Magento_Signifyd module provides integration with the [Signifyd](https://www.signifyd.com/) fraud protection system. The integration is based on the Signifyd API; see the [Signifyd API docs](https://www.signifyd.com/docs/api/#/introduction/) for technical details.
+
+The module implementation allows to:
+
+ - create a [Signifyd case](https://www.signifyd.com/docs/api/#/reference/cases) for a placed order
+ - automatically receive a [Signifyd guarantee](https://www.signifyd.com/docs/api/#/reference/guarantees) for a created case
+ - automatically cancel a guarantee when the order is canceled
+
+## Extensibility
+
+The Magento_Signifyd module does not add own Events, Layouts, and UI Components as extension points.
+
+### Public API
+
+The following interfaces (marked with the `@api` annotation) provide methods that allow to:
+
+`Magento\Signifyd\Api\Data\CaseInterface` (common abstraction for the Signifyd case entity):
+
+- set or retrieve all case data fields
+
+`Magento\Signifyd\Api\CaseManagementInterface`:
+
+- create a new case entity
+- retrieve the existing case entity for a specified order
+
+`Magento\Signifyd\Api\CaseCreationServiceInterface`:
+
+- create a case entity for a specified order
+- send a request through the Signifyd API to create a new case
+
+`Magento\Signifyd\Api\CaseRepositoryInterface`:
+
+- describe methods to work with a case entity
+
+`Magento\Signifyd\Api\GuaranteeCreationServiceInterface`:
+
+- send a request through the Signifyd API to create a new case guarantee
+
+`Magento\Signifyd\Api\GuaranteeCancelingServiceInterface`:
+- send a request through the Signifyd API to cancel the Signifyd case guarantee
+
+`Magento\Signifyd\Api\Data\CaseSearchResultsInterface`:
+
+- might be used by `Magento\Signifyd\Api\CaseRepositoryInterface` to retrieve a list of case entities by specific conditions
+
+For information about a public API in Magento 2, see [Public interfaces & APIs](http://devdocs.magento.com/guides/v2.1/extension-dev-guide/api-concepts.html).
+
+## Additional information
+
+### Webhooks
+
+To update the entity data for a case or guarantee, the Magento_Signifyd module uses the [Signifyd Webhooks](https://www.signifyd.com/docs/api/#/reference/webhooks) mechanism.
+
+The newly created case entities have the `PENDING` status for a case and a guarantee. After receiving Webhook, both statuses are changed to appropriate Signifyd statuses.
+
+### Debug mode
+
+The Debug Mode may be enabled in the module configuration. This logs the communication data between the Magento_Signifyd module and the Signifyd service in this file:
+
+    var/log/debug.log
+
+### Backward incompatible changes
+
+The Magento_Signifyd module does not introduce backward incompatible changes.
+
+You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.0/release-notes/changes/ee_changes.html).
+
+### Processing supplementary payment information
+
+To improve the accuracy of Signifyd's transaction estimation, you may perform these operations (links lead to the Magento Developer Documentation Portal):
+
+- [Provide custom AVS/CVV mapping](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#provide-avscvv-response-codes)
+
+- [Retrieve payment method for a placed order](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#retrieve-payment-method-for-a-placed-order)
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE.txt b/app/code/Magento/Signifyd/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE.txt
rename to app/code/Magento/Signifyd/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE_AFL.txt b/app/code/Magento/Signifyd/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE_AFL.txt
rename to app/code/Magento/Signifyd/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Signifyd/Test/Mftf/README.md b/app/code/Magento/Signifyd/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9391d7b314ea5
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Signifyd Functional Tests
+
+The Functional Test Module for **Magento Signifyd** module.
diff --git a/app/code/Magento/Signifyd/Test/Unit/Block/Adminhtml/CaseInfoTest.php b/app/code/Magento/Signifyd/Test/Unit/Block/Adminhtml/CaseInfoTest.php
new file mode 100644
index 0000000000000..164cd8018fb69
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Block/Adminhtml/CaseInfoTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Block\Adminhtml;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Block\Adminhtml\CaseInfo;
+use Magento\Signifyd\Model\CaseManagement;
+use Magento\Signifyd\Model\Config;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests for Signifyd block information.
+ *
+ * Class CaseInfoTest
+ */
+class CaseInfoTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CaseInterface|MockObject
+     */
+    private $caseEntity;
+
+    /**
+     * @var CaseInfo
+     */
+    private $caseInfo;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $context;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var CaseManagement|MockObject
+     */
+    private $caseManagement;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $request;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->request = $this->getMockBuilder(RequestInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->context->expects(self::once())
+            ->method('getRequest')
+            ->willReturn($this->request);
+
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->caseManagement = $this->getMockBuilder(CaseManagement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getScore'])
+            ->getMockForAbstractClass();
+
+        $this->caseInfo = $objectManager->getObject(CaseInfo::class, [
+            'context' => $this->context,
+            'config' => $this->config,
+            'caseManagement' => $this->caseManagement
+        ]);
+    }
+
+    /**
+     * Checks label according to Signifyd Guarantee Disposition.
+     *
+     * @param string $guaranteeDisposition
+     * @param string $expectedLabel
+     * @covers \Magento\Signifyd\Block\Adminhtml\CaseInfo::getCaseGuaranteeDisposition()
+     * @dataProvider getGuaranteeLabelDataProvider
+     */
+    public function testGetGuaranteeDisposition($guaranteeDisposition, $expectedLabel)
+    {
+        $this->caseManagement->expects(self::once())
+            ->method('getByOrderId')
+            ->willReturn($this->caseEntity);
+
+        $this->caseEntity->expects(self::atLeastOnce())
+            ->method('getGuaranteeDisposition')
+            ->willReturn($guaranteeDisposition);
+
+        self::assertEquals(
+            $expectedLabel,
+            $this->caseInfo->getCaseGuaranteeDisposition()
+        );
+    }
+
+    /**
+     * Case Guarantee Disposition and corresponding label data provider.
+     *
+     * @return array
+     */
+    public function getGuaranteeLabelDataProvider()
+    {
+        return [
+            [CaseInterface::GUARANTEE_APPROVED, __('Approved')],
+            [CaseInterface::GUARANTEE_DECLINED, __('Declined')],
+            [CaseInterface::GUARANTEE_PENDING, __('Pending')],
+            [CaseInterface::GUARANTEE_CANCELED, __('Canceled')],
+            [CaseInterface::GUARANTEE_IN_REVIEW, __('In Review')],
+            [CaseInterface::GUARANTEE_UNREQUESTED, __('Unrequested')],
+            ['Unregistered', '']
+        ];
+    }
+
+    /**
+     * Checks case property getter with empty case.
+     *
+     * @covers \Magento\Signifyd\Block\Adminhtml\CaseInfo::getCaseProperty
+     */
+    public function testCasePropertyWithEmptyCase()
+    {
+        $this->caseManagement->expects(self::once())
+            ->method('getByOrderId')
+            ->willReturn(null);
+
+        self::assertEquals(
+            '',
+            $this->caseInfo->getCaseGuaranteeDisposition()
+        );
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php
new file mode 100644
index 0000000000000..8b98be338b973
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Controller\Webhooks;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Controller\Webhooks\Handler;
+use Magento\Signifyd\Model\CaseServices\UpdatingService;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessage;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageReader;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequestValidator;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class IndexTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class HandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Handler
+     */
+    private $controller;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var RedirectInterface|MockObject
+     */
+    private $redirect;
+
+    /**
+     * @var ResponseHttp|MockObject
+     */
+    private $response;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $context;
+
+    /**
+     * @var WebhookRequest|MockObject
+     */
+    private $webhookRequest;
+
+    /**
+     * @var WebhookMessageReader|MockObject
+     */
+    private $webhookMessageReader;
+
+    /**
+     * @var WebhookRequestValidator|MockObject
+     */
+    private $webhookRequestValidator;
+
+    /**
+     * @var UpdatingServiceFactory|MockObject
+     */
+    private $caseUpdatingServiceFactory;
+
+    /**
+     * @var CaseRepositoryInterface|MockObject
+     */
+    private $caseRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->webhookRequest = $this->getMockBuilder(WebhookRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->webhookMessageReader = $this->getMockBuilder(WebhookMessageReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->webhookRequestValidator = $this->getMockBuilder(WebhookRequestValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->caseUpdatingServiceFactory = $this->getMockBuilder(UpdatingServiceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->response = $this->getMockBuilder(ResponseHttp::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getResponse')
+            ->willReturn($this->response);
+        $this->redirect = $this->getMockBuilder(RedirectInterface::class)
+            ->getMockForAbstractClass();
+        $this->context->expects($this->once())
+            ->method('getRedirect')
+            ->willReturn($this->redirect);
+        $this->caseRepository = $this->getMockBuilder(CaseRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getByCaseId'])
+            ->getMockForAbstractClass();
+
+        $config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isDebugModeEnabled', 'getByCaseId'])
+            ->getMock();
+        $config->expects(self::any())
+            ->method('getByCaseId')
+            ->willReturn(false);
+
+        $this->controller = new Handler(
+            $this->context,
+            $this->webhookRequest,
+            $this->logger,
+            $this->webhookMessageReader,
+            $this->caseUpdatingServiceFactory,
+            $this->webhookRequestValidator,
+            $this->caseRepository,
+            $config
+        );
+    }
+
+    /**
+     * Successful case
+     */
+    public function testExecuteSuccessfully()
+    {
+        $eventTopic = 'cases/creation';
+        $caseId = 1;
+        $data = ['score' => 200, 'caseId' => $caseId];
+
+        $this->webhookRequestValidator->expects($this->once())
+            ->method('validate')
+            ->willReturn(true);
+
+        $webhookMessage = $this->getMockBuilder(WebhookMessage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookMessage->expects($this->exactly(2))
+            ->method('getEventTopic')
+            ->willReturn($eventTopic);
+        $webhookMessage->expects($this->once())
+            ->method('getData')
+            ->willReturn($data);
+        $this->webhookMessageReader->expects($this->once())
+            ->method('read')
+            ->with($this->webhookRequest)
+            ->willReturn($webhookMessage);
+
+        $caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->caseRepository->expects(self::once())
+            ->method('getByCaseId')
+            ->with(self::equalTo($caseId))
+            ->willReturn($caseEntity);
+
+        $caseUpdatingService = $this->getMockBuilder(UpdatingService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $caseUpdatingService->expects($this->once())
+            ->method('update')
+            ->with($caseEntity, $data);
+
+        $this->caseUpdatingServiceFactory->expects($this->once())
+            ->method('create')
+            ->with($eventTopic)
+            ->willReturn($caseUpdatingService);
+
+        $this->controller->execute();
+    }
+
+    /**
+     * Case when there is exception while updating case
+     */
+    public function testExecuteCaseUpdatingServiceException()
+    {
+        $eventTopic = 'cases/creation';
+        $caseId = 1;
+        $data = ['score' => 200, 'caseId' => $caseId];
+
+        $this->webhookRequestValidator->expects($this->once())
+            ->method('validate')
+            ->willReturn(true);
+
+        $webhookMessage = $this->getMockBuilder(WebhookMessage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookMessage->expects($this->exactly(2))
+            ->method('getEventTopic')
+            ->willReturn($eventTopic);
+        $webhookMessage->expects($this->once())
+            ->method('getData')
+            ->willReturn($data);
+        $this->webhookMessageReader->expects($this->once())
+            ->method('read')
+            ->with($this->webhookRequest)
+            ->willReturn($webhookMessage);
+
+        $caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->caseRepository->expects(self::once())
+            ->method('getByCaseId')
+            ->with(self::equalTo($caseId))
+            ->willReturn($caseEntity);
+
+        $caseUpdatingService = $this->getMockBuilder(UpdatingService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $caseUpdatingService->expects($this->once())
+            ->method('update')
+            ->with($caseEntity, $data)
+            ->willThrowException(new LocalizedException(__('Error')));
+
+        $this->caseUpdatingServiceFactory->expects($this->once())
+            ->method('create')
+            ->with($eventTopic)
+            ->willReturn($caseUpdatingService);
+
+        $this->response->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(400);
+        $this->logger->expects($this->once())
+            ->method('critical');
+
+        $this->controller->execute();
+    }
+
+    /**
+     * Case when webhook request validation fails
+     */
+    public function testExecuteRequestValidationFails()
+    {
+        $this->webhookRequestValidator->expects($this->once())
+            ->method('validate')
+            ->willReturn(false);
+        $this->redirect->expects($this->once())
+            ->method('redirect')
+            ->with($this->response, 'noroute', []);
+        $this->webhookMessageReader->expects($this->never())
+            ->method('read');
+        $this->caseUpdatingServiceFactory->expects($this->never())
+            ->method('create');
+
+        $this->controller->execute();
+    }
+
+    /**
+     * Case when webhook request has test event topic.
+     */
+    public function testExecuteWithTestEventTopic()
+    {
+        $this->webhookRequestValidator->expects($this->once())
+            ->method('validate')
+            ->willReturn(true);
+        $this->redirect->expects($this->never())
+            ->method('redirect');
+
+        $webhookMessage = $this->getMockBuilder(WebhookMessage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookMessage->expects($this->once())
+            ->method('getEventTopic')
+            ->willReturn('cases/test');
+        $webhookMessage->expects($this->never())
+            ->method('getData');
+
+        $this->webhookMessageReader->expects($this->once())
+            ->method('read')
+            ->with($this->webhookRequest)
+            ->willReturn($webhookMessage);
+
+        $this->caseUpdatingServiceFactory->expects($this->never())
+            ->method('create');
+
+        $this->controller->execute();
+    }
+
+    /**
+     * Checks a test case when received input data does not contain Signifyd case id.
+     *
+     * @covers \Magento\Signifyd\Controller\Webhooks\Handler::execute
+     */
+    public function testExecuteWithMissedCaseId()
+    {
+        $this->webhookRequestValidator->expects(self::once())
+            ->method('validate')
+            ->willReturn(true);
+
+        $webhookMessage = $this->getMockBuilder(WebhookMessage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookMessage->expects($this->once())
+            ->method('getEventTopic')
+            ->willReturn('cases/creation');
+        $webhookMessage->expects(self::once())
+            ->method('getData')
+            ->willReturn([
+                'orderId' => '1000101'
+            ]);
+
+        $this->webhookMessageReader->expects(self::once())
+            ->method('read')
+            ->with($this->webhookRequest)
+            ->willReturn($webhookMessage);
+
+        $this->redirect->expects(self::once())
+            ->method('redirect')
+            ->with($this->response, 'noroute', []);
+
+        $this->controller->execute();
+    }
+
+    /**
+     * Checks a case when Signifyd case entity not found.
+     *
+     * @covers \Magento\Signifyd\Controller\Webhooks\Handler::execute
+     */
+    public function testExecuteWithNotFoundCaseEntity()
+    {
+        $caseId = 123;
+
+        $this->webhookRequestValidator->expects(self::once())
+            ->method('validate')
+            ->willReturn(true);
+
+        $webhookMessage = $this->getMockBuilder(WebhookMessage::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+        $webhookMessage->expects(self::once())
+            ->method('getData')
+            ->willReturn([
+                'orderId' => '1000101',
+                'caseId' => $caseId
+            ]);
+
+        $this->webhookMessageReader->expects(self::once())
+            ->method('read')
+            ->with($this->webhookRequest)
+            ->willReturn($webhookMessage);
+
+        $this->caseRepository->expects(self::once())
+            ->method('getByCaseId')
+            ->with(self::equalTo($caseId))
+            ->willReturn(null);
+
+        $this->redirect->expects(self::once())
+            ->method('redirect')
+            ->with($this->response, 'noroute', []);
+
+        $this->controller->execute();
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php
new file mode 100644
index 0000000000000..f0184c032b550
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceFactoryTest.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\CaseServices;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Signifyd\Model\CaseServices\StubUpdatingService;
+use Magento\Signifyd\Model\CaseServices\UpdatingService;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Contains tests for case updating service factory.
+ */
+class UpdatingServiceFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UpdatingServiceFactory
+     */
+    private $factory;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $fakeObjectManager;
+
+    /**
+     * @var GeneratorFactory|MockObject
+     */
+    private $generatorFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isActive'])
+            ->getMock();
+
+        $this->fakeObjectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+
+        $this->generatorFactory = $this->getMockBuilder(GeneratorFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $this->factory = $objectManager->getObject(UpdatingServiceFactory::class, [
+            'objectManager' => $this->fakeObjectManager,
+            'generatorFactory' => $this->generatorFactory,
+            'config' => $this->config
+        ]);
+    }
+
+    /**
+     * Checks type of instance for updating service if Signifyd is not enabled.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create
+     */
+    public function testCreateWithInactiveConfig()
+    {
+        $type = 'cases/creation';
+        $this->config->expects(self::once())
+            ->method('isActive')
+            ->willReturn(false);
+
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with(StubUpdatingService::class)
+            ->willReturn(new StubUpdatingService());
+
+        $instance = $this->factory->create($type);
+        static::assertInstanceOf(StubUpdatingService::class, $instance);
+    }
+
+    /**
+     * Checks type of instance for updating service if test type is received.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create
+     */
+    public function testCreateWithTestType()
+    {
+        $type = 'cases/test';
+        $this->config->expects(self::once())
+            ->method('isActive')
+            ->willReturn(true);
+
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with(StubUpdatingService::class)
+            ->willReturn(new StubUpdatingService());
+
+        $instance = $this->factory->create($type);
+        static::assertInstanceOf(StubUpdatingService::class, $instance);
+    }
+
+    /**
+     * Checks exception type and message for unknown case type.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Specified message type does not supported.
+     */
+    public function testCreateWithException()
+    {
+        $type = 'cases/unknown';
+        $this->config->expects(self::once())
+            ->method('isActive')
+            ->willReturn(true);
+
+        $this->generatorFactory->expects(self::once())
+            ->method('create')
+            ->with($type)
+            ->willThrowException(new \InvalidArgumentException('Specified message type does not supported.'));
+
+        $this->factory->create($type);
+    }
+
+    /**
+     * Checks if factory creates correct instance of case updating service.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory::create
+     */
+    public function testCreate()
+    {
+        $type = 'case/creation';
+        $this->config->expects(self::once())
+            ->method('isActive')
+            ->willReturn(true);
+
+        $messageGenerator = $this->getMockBuilder(GeneratorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->generatorFactory->expects(self::once())
+            ->method('create')
+            ->with($type)
+            ->willReturn($messageGenerator);
+
+        $service = $this->getMockBuilder(UpdatingService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with(UpdatingService::class, ['messageGenerator' => $messageGenerator])
+            ->willReturn($service);
+
+        $result = $this->factory->create($type);
+        static::assertInstanceOf(UpdatingService::class, $result);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceTest.php
new file mode 100644
index 0000000000000..6eb7e5c37d5fc
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/CaseServices/UpdatingServiceTest.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\CaseServices;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CaseServices\UpdatingService;
+use Magento\Signifyd\Model\CommentsHistoryUpdater;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorException;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorInterface;
+use Magento\Signifyd\Model\OrderStateService;
+use Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Contains tests with different negative and positive scenarios for case updating service.
+ */
+class UpdatingServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UpdatingService
+     */
+    private $service;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var GeneratorInterface|MockObject
+     */
+    private $messageGenerator;
+
+    /**
+     * @var CaseRepositoryInterface|MockObject
+     */
+    private $caseRepository;
+
+    /**
+     * @var CommentsHistoryUpdater|MockObject
+     */
+    private $commentsHistoryUpdater;
+
+    /**
+     * @var OrderGridUpdater|MockObject
+     */
+    private $orderGridUpdater;
+
+    /**
+     * @var OrderStateService|MockObject
+     */
+    private $orderStateService;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->messageGenerator = $this->getMockBuilder(GeneratorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['generate'])
+            ->getMock();
+
+        $this->caseRepository = $this->getMockBuilder(CaseRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getByCaseId'])
+            ->getMockForAbstractClass();
+
+        $this->commentsHistoryUpdater = $this->getMockBuilder(CommentsHistoryUpdater::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['addComment'])
+            ->getMock();
+
+        $this->orderGridUpdater = $this->getMockBuilder(OrderGridUpdater::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->orderStateService = $this->getMockBuilder(OrderStateService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->service = $this->objectManager->getObject(UpdatingService::class, [
+            'messageGenerator' => $this->messageGenerator,
+            'caseRepository' => $this->caseRepository,
+            'commentsHistoryUpdater' => $this->commentsHistoryUpdater,
+            'orderGridUpdater' => $this->orderGridUpdater,
+            'orderStateService' => $this->orderStateService
+        ]);
+    }
+
+    /**
+     * Checks a test case when Signifyd case is empty entity.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage The case entity should not be empty.
+     */
+    public function testUpdateWithEmptyCaseEntity()
+    {
+        $data = [];
+        $caseEntity = $this->withCaseEntity(null, 123, $data);
+
+        $this->service->update($caseEntity, $data);
+    }
+
+    /**
+     * Checks a test case when Signifyd case id is not specified for a case entity.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage The case entity should not be empty.
+     */
+    public function testUpdateWithEmptyCaseId()
+    {
+        $data = [
+            'caseId' => 123
+        ];
+        $caseEntity = $this->withCaseEntity(1, null, $data);
+
+        $this->service->update($caseEntity, $data);
+    }
+
+    /**
+     * Checks as test case when service cannot save Signifyd case entity
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Cannot update Case entity.
+     */
+    public function testUpdateWithFailedCaseSaving()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId,
+            'status' => CaseInterface::STATUS_OPEN,
+            'orderId' => '10000012',
+            'score' => 500
+        ];
+
+        $caseEntity = $this->withCaseEntity(1, $caseId, $data);
+
+        $this->caseRepository->expects(self::once())
+            ->method('save')
+            ->willThrowException(new \Exception('Something wrong.'));
+
+        $this->service->update($caseEntity, $data);
+    }
+
+    /**
+     * Checks as test case when message generator throws an exception
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Cannot update Case entity.
+     */
+    public function testUpdateWithExceptionFromMessageGenerator()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId
+        ];
+
+        $caseEntity = $this->withCaseEntity(1, $caseId, $data);
+
+        $this->caseRepository->expects(self::never())
+            ->method('save')
+            ->with($caseEntity)
+            ->willReturn($caseEntity);
+
+        $this->messageGenerator->expects(self::once())
+            ->method('generate')
+            ->with($data)
+            ->willThrowException(new GeneratorException(__('Cannot generate message.')));
+
+        $this->service->update($caseEntity, $data);
+    }
+
+    /**
+     * Checks a test case when comments history updater throws an exception.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Cannot update Case entity.
+     */
+    public function testUpdateWithFailedCommentSaving()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId,
+            'orderId' => 1
+        ];
+
+        $caseEntity = $this->withCaseEntity(1, $caseId, $data);
+
+        $this->caseRepository->expects(self::once())
+            ->method('save')
+            ->with($caseEntity)
+            ->willReturn($caseEntity);
+
+        $this->orderGridUpdater->expects(self::once())
+            ->method('update')
+            ->with($data['orderId']);
+
+        $message = __('Message is generated.');
+        $this->messageGenerator->expects(self::once())
+            ->method('generate')
+            ->with($data)
+            ->willReturn($message);
+
+        $this->commentsHistoryUpdater->expects(self::once())
+            ->method('addComment')
+            ->with($caseEntity, $message)
+            ->willThrowException(new \Exception('Something wrong'));
+
+        $this->service->update($caseEntity, $data);
+    }
+
+    /**
+     * Checks a test case when Signifyd case entity is successfully updated and message stored in comments history.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     */
+    public function testUpdate()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId,
+            'orderId' => 1
+        ];
+
+        $caseEntity = $this->withCaseEntity(21, $caseId, $data);
+
+        $caseEntitySaved = clone $caseEntity;
+        $caseEntitySaved->expects(self::once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn('APPROVED');
+
+        $this->caseRepository->expects(self::once())
+            ->method('save')
+            ->with($caseEntity)
+            ->willReturn($caseEntitySaved);
+
+        $message = __('Message is generated.');
+        $this->messageGenerator->expects(self::once())
+            ->method('generate')
+            ->with($data)
+            ->willReturn($message);
+
+        $this->orderGridUpdater->expects(self::once())
+            ->method('update')
+            ->with($data['orderId']);
+
+        $this->commentsHistoryUpdater->expects(self::once())
+            ->method('addComment')
+            ->with($caseEntitySaved, $message);
+
+        $this->orderStateService->expects(self::once())
+            ->method('updateByCase')
+            ->with($caseEntitySaved);
+
+        $this->service->update($caseEntity, $data);
+    }
+
+    /**
+     * Create mock for case entity with common scenarios.
+     *
+     * @param $caseEntityId
+     * @param $caseId
+     * @param array $data
+     * @return CaseInterface|MockObject
+     */
+    private function withCaseEntity($caseEntityId, $caseId, array $data = [])
+    {
+        /** @var CaseInterface|MockObject $caseEntity */
+        $caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getEntityId', 'getCaseId', 'getOrderId',
+                'setCaseId', 'setStatus', 'setOrderId', 'setScore'
+            ])
+            ->getMockForAbstractClass();
+
+        $caseEntity->expects(self::any())
+            ->method('getEntityId')
+            ->willReturn($caseEntityId);
+        $caseEntity->expects(self::any())
+            ->method('getCaseId')
+            ->willReturn($caseId);
+
+        foreach ($data as $property => $value) {
+            $method = 'set' . ucfirst($property);
+            if ($property === 'orderId') {
+                $caseEntity->expects(self::never())
+                    ->method($method);
+            }
+            $caseEntity->expects(self::any())
+                ->method($method)
+                ->with(self::equalTo($value))
+                ->willReturnSelf();
+
+            $method = 'get' . ucfirst($property);
+            $caseEntity->expects(self::any())
+                ->method($method)
+                ->willReturn($value);
+        }
+
+        return $caseEntity;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php
new file mode 100644
index 0000000000000..5cbb3d8d93cdd
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Model\Order\Status\HistoryFactory;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CommentsHistoryUpdater;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Sales\Api\OrderStatusHistoryRepositoryInterface;
+
+/**
+ * Contains tests for comments history updater class.
+ */
+class CommentsHistoryUpdaterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var int
+     */
+    private static $orderId = 123;
+
+    /**
+     * @var string
+     */
+    private static $message = 'Case is created.';
+
+    /**
+     * @var string
+     */
+    private static $status = 'On Hold';
+
+    /**
+     * @var CommentsHistoryUpdater
+     */
+    private $updater;
+
+    /**
+     * @var HistoryFactory|MockObject
+     */
+    private $historyFactory;
+
+    /**
+     * @var CaseInterface|MockObject
+     */
+    private $caseEntity;
+
+    /**
+     * @var OrderStatusHistoryInterface|MockObject
+     */
+    private $historyEntity;
+
+    /**
+     * @var OrderStatusHistoryRepositoryInterface|MockObject
+     */
+    private $historyRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->historyFactory = $this->getMockBuilder(HistoryFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create', 'save'])
+            ->getMock();
+
+        $this->historyRepository = $this->getMockBuilder(OrderStatusHistoryRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOrderId'])
+            ->getMockForAbstractClass();
+
+        $this->initCommentMock();
+
+        $this->updater = $objectManager->getObject(CommentsHistoryUpdater::class, [
+            'historyFactory' => $this->historyFactory,
+            'historyRepository' => $this->historyRepository
+        ]);
+    }
+
+    /**
+     * Checks a test case when updater throws an exception while saving history comment.
+     *
+     * @covers \Magento\Signifyd\Model\CommentsHistoryUpdater::addComment
+     * @expectedException \Exception
+     */
+    public function testAddCommentWithException()
+    {
+        $this->caseEntity->expects(self::once())
+            ->method('getOrderId')
+            ->willReturn(self::$orderId);
+
+        $this->historyEntity->method('setStatus')
+            ->with('')
+            ->willReturnSelf();
+        $this->historyRepository->expects(self::once())
+            ->method('save')
+            ->with($this->historyEntity)
+            ->willThrowException(new \Exception('Cannot save comment message.'));
+
+        $this->updater->addComment($this->caseEntity, __(self::$message));
+    }
+
+    /**
+     * Checks a test case when updater successfully saves history comment.
+     *
+     * @covers \Magento\Signifyd\Model\CommentsHistoryUpdater::addComment
+     */
+    public function testAddComment()
+    {
+        $this->caseEntity->expects(self::once())
+            ->method('getOrderId')
+            ->willReturn(self::$orderId);
+
+        $this->historyEntity->method('setStatus')
+            ->with(self::$status)
+            ->willReturnSelf();
+        $this->historyRepository->expects(self::once())
+            ->method('save')
+            ->with($this->historyEntity)
+            ->willReturnSelf();
+
+        $this->updater->addComment($this->caseEntity, __(self::$message), self::$status);
+    }
+
+    /**
+     * Checks a test when message does not specified.
+     *
+     * @covers \Magento\Signifyd\Model\CommentsHistoryUpdater::addComment
+     */
+    public function testAddCommentWithoutMessage()
+    {
+        $this->caseEntity->expects(self::never())
+            ->method('getOrderId');
+
+        $this->historyFactory->expects(self::never())
+            ->method('save');
+
+        $phrase = '';
+        $this->updater->addComment($this->caseEntity, __($phrase));
+    }
+
+    /**
+     * Creates mock object for history entity.
+     *
+     * @return void
+     */
+    private function initCommentMock()
+    {
+        $this->historyEntity = $this->getMockBuilder(OrderStatusHistoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setParentId', 'setComment', 'setEntityName', 'save'])
+            ->getMockForAbstractClass();
+
+        $this->historyFactory->method('create')
+            ->willReturn($this->historyEntity);
+
+        $this->historyEntity->method('setParentId')
+            ->with(self::$orderId)
+            ->willReturnSelf();
+        $this->historyEntity->method('setComment')
+            ->with(self::$message)
+            ->willReturnSelf();
+        $this->historyEntity->method('setEntityName')
+            ->with('order')
+            ->willReturnSelf();
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php
new file mode 100644
index 0000000000000..02d3b4b9ad7a7
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model;
+
+use Magento\Directory\Model\Currency;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\Data\OrderSearchResultInterface;
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Model\CustomerOrders;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CustomerOrdersTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var int
+     */
+    private static $customerId = 1;
+
+    /**
+     * Order amount in EUR
+     * @var int
+     */
+    private static $eurAmount = 100;
+
+    /**
+     * Order amount in UAH
+     * @var int
+     */
+    private static $uahAmount = 270;
+
+    /**
+     * Order amount in USD
+     * @var int
+     */
+    private static $usdAmount = 50;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var FilterBuilder|MockObject
+     */
+    private $filterBuilder;
+
+    /**
+     * @var Currency|MockObject
+     */
+    private $eurCurrency;
+
+    /**
+     * @var Currency|MockObject
+     */
+    private $uahCurrency;
+
+    /**
+     * @var CustomerOrders
+     */
+    private $model;
+
+    /**
+     * @var OrderRepositoryInterface|MockObject
+     */
+    private $orderRepository;
+
+    /**
+     * @var SearchCriteriaBuilder|MockObject
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class)
+             ->getMockForAbstractClass();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(CustomerOrders::class, [
+            'filterBuilder' => $this->filterBuilder,
+            'orderRepository' => $this->orderRepository,
+            'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
+            'logger' => $this->logger
+        ]);
+
+        $this->initCurrencies();
+        $this->initOrderRepository();
+
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'currencies',
+            ['EUR' => $this->eurCurrency, 'UAH' => $this->uahCurrency]
+        );
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CustomerOrders::getAggregatedOrdersInfo()
+     */
+    public function testGetCountAndTotalAmount()
+    {
+        $this->eurCurrency->expects($this->once())
+            ->method('convert')
+            ->with(self::$eurAmount, 'USD')
+            ->willReturn(109);
+
+        $this->uahCurrency->expects($this->once())
+            ->method('convert')
+            ->with(self::$uahAmount, 'USD')
+            ->willReturn(10.35);
+
+        $actual = $this->model->getAggregatedOrdersInfo(self::$customerId);
+
+        static::assertEquals(3, $actual['aggregateOrderCount']);
+        static::assertEquals(169.35, $actual['aggregateOrderDollars']);
+    }
+
+    /**
+     * Test case when required currency rate is absent and exception is thrown
+     * @covers \Magento\Signifyd\Model\CustomerOrders::getAggregatedOrdersInfo()
+     */
+    public function testGetCountAndTotalAmountNegative()
+    {
+        $this->eurCurrency->expects($this->once())
+            ->method('convert')
+            ->with(self::$eurAmount, 'USD')
+            ->willReturn(109);
+
+        $this->uahCurrency->expects($this->once())
+            ->method('convert')
+            ->with(self::$uahAmount, 'USD')
+            ->willThrowException(new \Exception());
+
+        $this->logger->expects($this->once())
+            ->method('error');
+
+        $actual = $this->model->getAggregatedOrdersInfo(self::$customerId);
+
+        $this->assertNull($actual['aggregateOrderCount']);
+        $this->assertNull($actual['aggregateOrderDollars']);
+    }
+
+    /**
+     * Populate order repository with mocked orders
+     */
+    private function initOrderRepository()
+    {
+        $this->filterBuilder->expects($this->once())
+            ->method('setField')
+            ->willReturnSelf();
+        $this->filterBuilder->expects($this->once())
+            ->method('setValue')
+            ->willReturnSelf();
+        $filter = $this->getMockBuilder(\Magento\Framework\Api\Filter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filterBuilder->expects($this->once())
+            ->method('create')
+            ->willReturn($filter);
+
+        $searchCriteria = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteria::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchCriteriaBuilder->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteria);
+
+        $orderSearchResult = $this->getMockBuilder(OrderSearchResultInterface::class)
+            ->getMockForAbstractClass();
+        $orderSearchResult->expects($this->once())
+            ->method('getItems')
+            ->willReturn($this->getOrders());
+        $this->orderRepository->expects($this->once())
+            ->method('getList')
+            ->willReturn($orderSearchResult);
+    }
+
+    /**
+     * Creates mocks for currencies
+     * @return void
+     */
+    private function initCurrencies()
+    {
+        $this->eurCurrency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMock();
+
+        $this->uahCurrency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['convert'])
+            ->getMock();
+    }
+
+    /**
+     * Get list of mocked orders with different currencies
+     * @return array
+     */
+    private function getOrders()
+    {
+        $eurOrder = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseGrandTotal', 'getBaseCurrencyCode'])
+            ->getMock();
+
+        $eurOrder->expects($this->once())
+            ->method('getBaseGrandTotal')
+            ->willReturn(self::$eurAmount);
+        $eurOrder->expects($this->once())
+            ->method('getBaseCurrencyCode')
+            ->willReturn('EUR');
+
+        $uahOrder = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseGrandTotal', 'getBaseCurrencyCode'])
+            ->getMock();
+
+        $uahOrder->expects($this->once())
+            ->method('getBaseGrandTotal')
+            ->willReturn(self::$uahAmount);
+        $uahOrder->expects($this->once())
+            ->method('getBaseCurrencyCode')
+            ->willReturn('UAH');
+
+        $usdOrder = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseGrandTotal', 'getBaseCurrencyCode'])
+            ->getMock();
+
+        $usdOrder->expects($this->once())
+            ->method('getBaseGrandTotal')
+            ->willReturn(self::$usdAmount);
+        $usdOrder->expects($this->once())
+            ->method('getBaseCurrencyCode')
+            ->willReturn('USD');
+
+        return [$usdOrder, $eurOrder, $uahOrder];
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php
new file mode 100644
index 0000000000000..f7b4e473a0ec8
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelGuaranteeAbilityTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\Guarantee;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CaseEntity;
+use Magento\Signifyd\Model\CaseManagement;
+use Magento\Signifyd\Model\Guarantee\CancelGuaranteeAbility;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CancelGuaranteeAbilityTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderRepository;
+
+    /**
+     * @var CaseManagement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $caseManagement;
+
+    /**
+     * @var CancelGuaranteeAbility
+     */
+    private $cancelGuaranteeAbility;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->caseManagement = $this->getMockBuilder(CaseManagement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cancelGuaranteeAbility = new CancelGuaranteeAbility(
+            $this->caseManagement,
+            $this->orderRepository
+        );
+    }
+
+    /**
+     * Success test for Cancel Guarantee Request button
+     */
+    public function testIsAvailableSuccess()
+    {
+        $orderId = 123;
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $case->expects($this->once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn(CaseEntity::GUARANTEE_APPROVED);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */
+        $order = $this->getMockBuilder(OrderInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->orderRepository->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willReturn($order);
+
+        $this->assertTrue($this->cancelGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when Case entity doesn't exist for order
+     */
+    public function testIsAvailableWithNullCase()
+    {
+        $orderId = 123;
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn(null);
+
+        $this->assertFalse($this->cancelGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when Guarantee Disposition has Canceled states.
+     */
+    public function testIsAvailableWithCanceledGuarantee()
+    {
+        $orderId = 123;
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $case->expects($this->once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn(CaseEntity::GUARANTEE_CANCELED);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        $this->assertFalse($this->cancelGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when order does not exist.
+     */
+    public function testIsAvailableWithNullOrder()
+    {
+        $orderId = 123;
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $case->expects($this->once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn(CaseEntity::GUARANTEE_APPROVED);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        $this->orderRepository->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willThrowException(new NoSuchEntityException());
+
+        $this->assertFalse($this->cancelGuaranteeAbility->isAvailable($orderId));
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelingServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelingServiceTest.php
new file mode 100644
index 0000000000000..f8f1d4a4522c9
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CancelingServiceTest.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\Guarantee;
+
+use Magento\Signifyd\Api\CaseManagementInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CaseServices\StubUpdatingService;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\Guarantee\CancelGuaranteeAbility;
+use Magento\Signifyd\Model\Guarantee\CancelingService;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Contains test cases for Signifyd guarantee canceling service.
+ */
+class CancelingServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var int
+     */
+    private static $orderId = 23;
+
+    /**
+     * @var int
+     */
+    private static $caseId = 123;
+
+    /**
+     * @var CancelingService
+     */
+    private $service;
+
+    /**
+     * @var CaseManagementInterface|MockObject
+     */
+    private $caseManagement;
+
+    /**
+     * @var UpdatingServiceFactory|MockObject
+     */
+    private $updatingFactory;
+
+    /**
+     * @var Gateway|MockObject
+     */
+    private $gateway;
+
+    /**
+     * @var CancelGuaranteeAbility|MockObject
+     */
+    private $guaranteeAbility;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->caseManagement = $this->getMockBuilder(CaseManagementInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getByOrderId'])
+            ->getMockForAbstractClass();
+
+        $this->updatingFactory = $this->getMockBuilder(UpdatingServiceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->gateway = $this->getMockBuilder(Gateway::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['cancelGuarantee'])
+            ->getMock();
+
+        $this->guaranteeAbility = $this->getMockBuilder(CancelGuaranteeAbility::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAvailable'])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['error'])
+            ->getMockForAbstractClass();
+
+        $this->service = new CancelingService(
+            $this->caseManagement,
+            $this->updatingFactory,
+            $this->gateway,
+            $this->guaranteeAbility,
+            $this->logger
+        );
+    }
+
+    /**
+     * Checks a test case, when validation for a guarantee is failed.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder
+     */
+    public function testCancelForOrderWithUnavailableDisposition()
+    {
+        $this->guaranteeAbility->expects(self::once())
+            ->method('isAvailable')
+            ->with(self::equalTo(self::$orderId))
+            ->willReturn(false);
+
+        $this->caseManagement->expects(self::never())
+            ->method('getByOrderId');
+
+        $this->gateway->expects(self::never())
+            ->method('cancelGuarantee');
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $this->updatingFactory->expects(self::never())
+            ->method('create');
+
+        $result = $this->service->cancelForOrder(self::$orderId);
+        self::assertFalse($result);
+    }
+
+    /**
+     * Checks a test case, when request to Signifyd API fails.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder
+     */
+    public function testCancelForOrderWithFailedRequest()
+    {
+        $this->withCaseEntity();
+
+        $this->gateway->expects(self::once())
+            ->method('cancelGuarantee')
+            ->with(self::equalTo(self::$caseId))
+            ->willThrowException(new GatewayException('Something wrong.'));
+
+        $this->logger->expects(self::once())
+            ->method('error')
+            ->with(self::equalTo('Something wrong.'));
+
+        $this->updatingFactory->expects(self::never())
+            ->method('create');
+
+        $result = $this->service->cancelForOrder(self::$orderId);
+        self::assertFalse($result);
+    }
+
+    /**
+     * Checks a test case, when request to Signifyd successfully processed and case entity has been updated.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder
+     */
+    public function testCancelForOrder()
+    {
+        $case = $this->withCaseEntity();
+
+        $this->gateway->expects(self::once())
+            ->method('cancelGuarantee')
+            ->with(self::equalTo(self::$caseId))
+            ->willReturn(CaseInterface::GUARANTEE_CANCELED);
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $service = $this->getMockBuilder(StubUpdatingService::class)
+            ->setMethods(['update'])
+            ->getMock();
+        $this->updatingFactory->expects(self::once())
+            ->method('create')
+            ->willReturn($service);
+
+        $service->expects(self::once())
+            ->method('update')
+            ->with(self::equalTo($case), self::equalTo(['guaranteeDisposition' => CaseInterface::GUARANTEE_CANCELED]));
+
+        $result = $this->service->cancelForOrder(self::$orderId);
+        self::assertTrue($result);
+    }
+
+    /**
+     * Gets mock for a case entity.
+     *
+     * @return CaseInterface|MockObject
+     */
+    private function withCaseEntity()
+    {
+        $this->guaranteeAbility->expects(self::once())
+            ->method('isAvailable')
+            ->with(self::equalTo(self::$orderId))
+            ->willReturn(true);
+
+        $caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCaseId'])
+            ->getMockForAbstractClass();
+
+        $this->caseManagement->expects(self::once())
+            ->method('getByOrderId')
+            ->with(self::equalTo(self::$orderId))
+            ->willReturn($caseEntity);
+
+        $caseEntity->expects(self::once())
+            ->method('getCaseId')
+            ->willReturn(self::$caseId);
+        return $caseEntity;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php
new file mode 100644
index 0000000000000..6b7a6112a932e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreateGuaranteeAbilityTest.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\Guarantee;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CaseManagement;
+use Magento\Signifyd\Model\Guarantee\CreateGuaranteeAbility;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreateGuaranteeAbilityTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderRepository;
+
+    /**
+     * @var CaseManagement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $caseManagement;
+
+    /**
+     * @var CreateGuaranteeAbility
+     */
+    private $createGuaranteeAbility;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->dateTimeFactory = new DateTimeFactory();
+        $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class)
+            ->getMockForAbstractClass();
+        $this->caseManagement = $this->getMockBuilder(CaseManagement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->createGuaranteeAbility = new CreateGuaranteeAbility(
+            $this->caseManagement,
+            $this->orderRepository,
+            $this->dateTimeFactory
+        );
+    }
+
+    public function testIsAvailableSuccess()
+    {
+        $orderId = 123;
+        $orderCreatedAt = $this->getDateAgo(6);
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $case->expects($this->once())
+            ->method('isGuaranteeEligible')
+            ->willReturn(true);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */
+        $order = $this->getMockBuilder(OrderInterface::class)
+            ->getMockForAbstractClass();
+        $order->expects($this->once())
+            ->method('getState')
+            ->willReturn(Order::STATE_COMPLETE);
+        $order->expects($this->once())
+            ->method('getCreatedAt')
+            ->willReturn($orderCreatedAt);
+
+        $this->orderRepository->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willReturn($order);
+
+        $this->assertTrue($this->createGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when Case entity doesn't exist for order
+     */
+    public function testIsAvailableWithNullCase()
+    {
+        $orderId = 123;
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn(null);
+
+        $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when GuaranteeEligible for Case is false
+     */
+    public function testIsAvailableWithGuarantyEligibleFalse()
+    {
+        $orderId = 123;
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $case->expects($this->once())
+            ->method('isGuaranteeEligible')
+            ->willReturn(false);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when GuaranteeEligible for Case is false
+     */
+    public function testIsAvailableWithNullOrder()
+    {
+        $orderId = 123;
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $case->expects($this->once())
+            ->method('isGuaranteeEligible')
+            ->willReturn(true);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        $this->orderRepository->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willThrowException(new NoSuchEntityException());
+
+        $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Tests case when order has Canceled Or Closed states.
+     *
+     * @param string $state
+     * @dataProvider isAvailableWithCanceledOrderDataProvider
+     */
+    public function testIsAvailableWithCanceledOrder($state)
+    {
+        $orderId = 123;
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $case->expects($this->once())
+            ->method('isGuaranteeEligible')
+            ->willReturn(true);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */
+        $order = $this->getMockBuilder(OrderInterface::class)
+            ->getMockForAbstractClass();
+        $order->expects($this->once())
+            ->method('getState')
+            ->willReturn($state);
+
+        $this->orderRepository->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willReturn($order);
+
+        $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * @return array
+     */
+    public function isAvailableWithCanceledOrderDataProvider()
+    {
+        return [
+            [Order::STATE_CANCELED], [Order::STATE_CLOSED]
+        ];
+    }
+
+    public function testIsAvailableWithOldOrder()
+    {
+        $orderId = 123;
+        $orderCreatedAt = $this->getDateAgo(8);
+
+        /** @var CaseInterface|\PHPUnit_Framework_MockObject_MockObject $case */
+        $case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $case->expects($this->once())
+            ->method('isGuaranteeEligible')
+            ->willReturn(true);
+
+        $this->caseManagement->expects($this->once())
+            ->method('getByOrderId')
+            ->with($orderId)
+            ->willReturn($case);
+
+        /** @var OrderInterface|\PHPUnit_Framework_MockObject_MockObject $order */
+        $order = $this->getMockBuilder(OrderInterface::class)
+            ->getMockForAbstractClass();
+        $order->expects($this->once())
+            ->method('getState')
+            ->willReturn(Order::STATE_COMPLETE);
+        $order->expects($this->once())
+            ->method('getCreatedAt')
+            ->willReturn($orderCreatedAt);
+
+        $this->orderRepository->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willReturn($order);
+
+        $this->assertFalse($this->createGuaranteeAbility->isAvailable($orderId));
+    }
+
+    /**
+     * Returns date N days ago
+     *
+     * @param int $days number of days that will be deducted from the current date
+     * @return string
+     */
+    private function getDateAgo($days)
+    {
+        $createdAtTime = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+        $createdAtTime->sub(new \DateInterval('P' . $days . 'D'));
+
+        return $createdAtTime->format('Y-m-d h:i:s');
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php
new file mode 100644
index 0000000000000..db64b38375fe1
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\Guarantee;
+
+use Magento\Signifyd\Api\CaseManagementInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
+use Magento\Signifyd\Model\CaseServices\UpdatingServiceInterface;
+use Magento\Signifyd\Model\Guarantee\CreateGuaranteeAbility;
+use Magento\Signifyd\Model\Guarantee\CreationService;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use \PHPUnit\Framework\TestCase as TestCase;
+use Psr\Log\LoggerInterface;
+
+class CreationServiceTest extends TestCase
+{
+    /**
+     * @var CreationService|MockObject
+     */
+    private $service;
+
+    /**
+     * @var CaseManagementInterface|MockObject
+     */
+    private $caseManagement;
+
+    /**
+     * @var UpdatingServiceInterface|MockObject
+     */
+    private $caseUpdatingService;
+
+    /**
+     * @var Gateway|MockObject
+     */
+    private $gateway;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var CreateGuaranteeAbility|MockObject
+     */
+    private $createGuaranteeAbility;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->caseManagement = $this->getMockBuilder(CaseManagementInterface::class)
+            ->getMockForAbstractClass();
+
+        $caseUpdatingServiceFactory = $this->getMockBuilder(UpdatingServiceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->caseUpdatingService = $this->getMockBuilder(UpdatingServiceInterface::class)
+            ->getMockForAbstractClass();
+        $caseUpdatingServiceFactory
+            ->method('create')
+            ->willReturn($this->caseUpdatingService);
+
+        $this->gateway = $this->getMockBuilder(Gateway::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->createGuaranteeAbility = $this->getMockBuilder(CreateGuaranteeAbility::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isAvailable'])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->service = new CreationService(
+            $this->caseManagement,
+            $caseUpdatingServiceFactory,
+            $this->gateway,
+            $this->createGuaranteeAbility,
+            $this->logger
+        );
+    }
+
+    /**
+     * Checks a test case, when guarantee ability checker does not allow to submit case for a guarantee.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CreationService::createForOrder
+     */
+    public function testCreateForOrderWithNotEligibleCase()
+    {
+        $orderId = 1;
+
+        $this->createGuaranteeAbility->expects(self::once())
+            ->method('isAvailable')
+            ->with($orderId)
+            ->willReturn(false);
+
+        $this->caseManagement->expects(self::never())
+            ->method('getByOrderId');
+
+        $this->gateway->expects(self::never())
+            ->method('submitCaseForGuarantee');
+
+        $result = $this->service->createForOrder($orderId);
+        self::assertFalse($result);
+    }
+
+    public function testCreateForOrderWitCase()
+    {
+        $dummyOrderId = 1;
+        $dummyCaseId = 42;
+        $this->withCaseEntityExistsForOrderId(
+            $dummyOrderId,
+            [
+                'caseId' => $dummyCaseId,
+            ]
+        );
+
+        $this->gateway
+            ->expects($this->once())
+            ->method('submitCaseForGuarantee');
+
+        $this->service->createForOrder($dummyOrderId);
+    }
+
+    public function testCreateForOrderWithGatewayFailure()
+    {
+        $dummyOrderId = 1;
+        $dummyCaseId = 42;
+        $dummyGatewayFailureMessage = 'Everything fails sometimes';
+        $this->withCaseEntityExistsForOrderId(
+            $dummyOrderId,
+            [
+                'caseId' => $dummyCaseId,
+            ]
+        );
+        $this->withGatewayFailure($dummyGatewayFailureMessage);
+
+        $this->logger
+            ->expects($this->once())
+            ->method('error')
+            ->with($this->equalTo($dummyGatewayFailureMessage));
+        $this->caseUpdatingService
+            ->expects($this->never())
+            ->method('update');
+
+        $result = $this->service->createForOrder($dummyOrderId);
+        $this->assertEquals(
+            false,
+            $result,
+            'Service should return false in case of gateway failure'
+        );
+    }
+
+    public function testCreateForOrderWithGatewaySuccess()
+    {
+        $dummyOrderId = 1;
+        $dummyCaseId = 42;
+        $dummyGuaranteeDisposition = 'foo';
+        $caseEntity = $this->withCaseEntityExistsForOrderId(
+            $dummyOrderId,
+            [
+                'caseId' => $dummyCaseId,
+            ]
+        );
+        $this->withGatewaySuccess($dummyGuaranteeDisposition);
+
+        $this->caseUpdatingService
+            ->expects($this->once())
+            ->method('update')
+            ->with($caseEntity, $this->equalTo([
+                'caseId' => $dummyCaseId,
+                'guaranteeDisposition' => $dummyGuaranteeDisposition,
+            ]));
+
+        $this->service->createForOrder($dummyOrderId);
+    }
+
+    public function testCreateForOrderWithCaseUpdate()
+    {
+        $dummyOrderId = 1;
+        $dummyCaseId = 42;
+        $dummyGuaranteeDisposition = 'foo';
+        $this->withCaseEntityExistsForOrderId(
+            $dummyOrderId,
+            [
+                'caseId' => $dummyCaseId,
+            ]
+        );
+        $this->withGatewaySuccess($dummyGuaranteeDisposition);
+
+        $result = $this->service->createForOrder($dummyOrderId);
+        $this->assertEquals(
+            true,
+            $result,
+            'Service should return true in case if case update service is called'
+        );
+    }
+
+    /**
+     * @param $orderId
+     * @param array $caseData
+     * @return MockObject
+     */
+    private function withCaseEntityExistsForOrderId($orderId, array $caseData = [])
+    {
+        $this->createGuaranteeAbility->expects(self::once())
+            ->method('isAvailable')
+            ->with(self::equalTo($orderId))
+            ->willReturn(true);
+
+        $dummyCaseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->getMockForAbstractClass();
+        foreach ($caseData as $caseProperty => $casePropertyValue) {
+            $dummyCaseEntity
+                ->method('get' . ucfirst($caseProperty))
+                ->willReturn($casePropertyValue);
+        }
+
+        $this->caseManagement
+            ->method('getByOrderId')
+            ->with($this->equalTo($orderId))
+            ->willReturn($dummyCaseEntity);
+
+        return $dummyCaseEntity;
+    }
+
+    /**
+     * @param $failureMessage
+     */
+    private function withGatewayFailure($failureMessage)
+    {
+        $this->gateway
+            ->method('submitCaseForGuarantee')
+            ->willThrowException(new GatewayException($failureMessage));
+    }
+
+    /**
+     * @param $gatewayResult
+     */
+    private function withGatewaySuccess($gatewayResult)
+    {
+        $this->gateway
+            ->method('submitCaseForGuarantee')
+            ->willReturn($gatewayResult);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php
new file mode 100644
index 0000000000000..ba14036cd68d0
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/CaseRescoreTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\MessageGenerators;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\MessageGenerators\CaseRescore;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests for Signifyd CaseRescore message generator.
+ *
+ * Class CaseRescoreTest
+ */
+class CaseRescoreTest extends \PHPUnit\Framework\TestCase
+{
+    private static $data = [
+        'caseId' => 100,
+        'score'  => 200
+    ];
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var CaseRepositoryInterface|MockObject
+     */
+    private $caseRepository;
+
+    /**
+     * @var CaseRescore|MockObject
+     */
+    private $caseRescore;
+
+    /**
+     * @var CaseInterface|MockObject
+     */
+    private $case;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->case = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager = new ObjectManager($this);
+        $this->caseRepository = $this->getMockBuilder(CaseRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [
+            'caseRepository' => $this->caseRepository
+        ]);
+    }
+
+    /**
+     * Data array without required attribute caseId.
+     *
+     * @expectedException \Magento\Signifyd\Model\MessageGenerators\GeneratorException
+     * @expectedExceptionMessage The "caseId" should not be empty
+     */
+    public function testGenerateEmptyCaseIdException()
+    {
+        $this->caseRescore->generate([]);
+    }
+
+    /**
+     * Case entity was not found in DB.
+     *
+     * @expectedException \Magento\Signifyd\Model\MessageGenerators\GeneratorException
+     * @expectedExceptionMessage Case entity not found.
+     */
+    public function testGenerateNotFoundException()
+    {
+        $this->caseRepository->expects($this->once())
+            ->method('getByCaseId')
+            ->with(self::$data['caseId'])
+            ->willReturn(null);
+
+        $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [
+            'caseRepository' => $this->caseRepository
+        ]);
+
+        $this->caseRescore->generate(self::$data);
+    }
+
+    /**
+     * Generate case message with not empty previous score.
+     */
+    public function testGenerateWithPreviousScore()
+    {
+        $this->case->expects($this->once())
+            ->method('getScore')
+            ->willReturn(self::$data['score']);
+
+        $this->caseRepository->expects($this->once())
+            ->method('getByCaseId')
+            ->with(self::$data['caseId'])
+            ->willReturn($this->case);
+
+        $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [
+            'caseRepository' => $this->caseRepository
+        ]);
+
+        $phrase = __(
+            'Case Update: New score for the order is %1. Previous score was %2.',
+            self::$data['score'],
+            self::$data['score']
+        );
+
+        $message = $this->caseRescore->generate(self::$data);
+
+        $this->assertEquals($phrase, $message);
+    }
+
+    /**
+     * Generate case message with empty previous score.
+     */
+    public function testGenerateWithoutPreviousScore()
+    {
+        $this->caseRepository->expects($this->once())
+            ->method('getByCaseId')
+            ->with(self::$data['caseId'])
+            ->willReturn($this->case);
+
+        $this->caseRescore = $this->objectManager->getObject(CaseRescore::class, [
+            'caseRepository' => $this->caseRepository
+        ]);
+
+        $phrase = __(
+            'Case Update: New score for the order is %1. Previous score was %2.',
+            self::$data['score'],
+            null
+        );
+
+        $message = $this->caseRescore->generate(self::$data);
+
+        $this->assertEquals($phrase, $message);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php
new file mode 100644
index 0000000000000..50f87df3b694f
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\MessageGenerators;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Signifyd\Model\MessageGenerators\PatternGenerator;
+use Magento\Signifyd\Model\MessageGenerators\CaseRescore;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Contains tests for messages generators factory.
+ */
+class GeneratorFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GeneratorFactory
+     */
+    private $factory;
+
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $fakeObjectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->fakeObjectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+
+        $this->factory = $objectManager->getObject(GeneratorFactory::class, [
+            'objectManager' => $this->fakeObjectManager
+        ]);
+    }
+
+    /**
+     * Checks if factory returns correct instance of message generator.
+     *
+     * @covers \Magento\Signifyd\Model\MessageGenerators\GeneratorFactory::create
+     * @param string $type
+     * @param string $className
+     * @dataProvider typeDataProvider
+     */
+    public function testCreate($type, $className)
+    {
+        $generator = $this->getMockBuilder($className)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with($className)
+            ->willReturn($generator);
+
+        $instance = $this->factory->create($type);
+        self::assertInstanceOf($className, $instance);
+    }
+
+    /**
+     * Get list of available messages generators types and equal class names.
+     *
+     * @return array
+     */
+    public function typeDataProvider()
+    {
+        return [
+            ['cases/creation', PatternGenerator::class],
+            ['cases/review', PatternGenerator::class],
+            ['cases/rescore', CaseRescore::class],
+            ['guarantees/completion', PatternGenerator::class],
+            ['guarantees/creation', PatternGenerator::class],
+            ['guarantees/cancel', PatternGenerator::class],
+        ];
+    }
+
+    /**
+     * Checks correct exception message for unknown type of message generator.
+     *
+     * @covers \Magento\Signifyd\Model\MessageGenerators\GeneratorFactory::create
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Specified message type does not supported.
+     */
+    public function testCreateWithException()
+    {
+        $type = 'cases/unknown';
+        $this->factory->create($type);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php
new file mode 100644
index 0000000000000..9d5f71f657a1e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/PatternGeneratorTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\MessageGenerators;
+
+use Magento\Signifyd\Model\MessageGenerators\PatternGenerator;
+
+/**
+ * Contains tests for different variations like empty data, wrong required arguments, or bad placeholders.
+ */
+class PatternGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Checks an exception if generators does not receives required data.
+     *
+     * @covers \Magento\Signifyd\Model\MessageGenerators\PatternGenerator::generate
+     * @expectedException \Magento\Signifyd\Model\MessageGenerators\GeneratorException
+     * @expectedExceptionMessage The "caseId" should not be empty.
+     */
+    public function testGenerateThrowsException()
+    {
+        $data = [];
+        $generator = new PatternGenerator('Signifyd Case %1 has been created for order.', ['caseId']);
+        $generator->generate($data);
+    }
+
+    /**
+     * Checks cases with different template placeholders and input data.
+     *
+     * @covers \Magento\Signifyd\Model\MessageGenerators\PatternGenerator::generate
+     * @param string $template
+     * @param array $requiredFields
+     * @param string $expected
+     * @dataProvider messageDataProvider
+     */
+    public function testGenerate($template, array $requiredFields, $expected)
+    {
+        $data = [
+            'caseId' => 123,
+            'reviewDisposition' => 'Good',
+            'guaranteeDisposition' => 'Approved',
+            'score' => 500,
+            'case_score' => 300
+        ];
+
+        $generator = new PatternGenerator($template, $requiredFields);
+        $actual = $generator->generate($data);
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get list of variations with message templates, required fields and expected generated messages.
+     *
+     * @return array
+     */
+    public function messageDataProvider()
+    {
+        return [
+            [
+                'Signifyd Case %1 has been created for order.',
+                ['caseId'],
+                'Signifyd Case 123 has been created for order.'
+            ],
+            [
+                'Case Update: Case Review was completed. Review Deposition is %1.',
+                ['reviewDisposition'],
+                'Case Update: Case Review was completed. Review Deposition is Good.'
+            ],
+            [
+                'Case Update: New score for the order is %1. Previous score was %2.',
+                ['score', 'case_score'],
+                'Case Update: New score for the order is 500. Previous score was 300.'
+            ],
+            [
+                'Case Update: Case is submitted for guarantee.',
+                [],
+                'Case Update: Case is submitted for guarantee.'
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/OrderStateServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/OrderStateServiceTest.php
new file mode 100644
index 0000000000000..3a567a79891f8
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/OrderStateServiceTest.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model;
+
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\CommentsHistoryUpdater;
+use Magento\Signifyd\Model\OrderStateService;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class OrderStateServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var int
+     */
+    private static $orderId = 123;
+
+    /**
+     * @var OrderFactory|MockObject
+     */
+    private $orderFactory;
+
+    /**
+     * @var OrderManagementInterface|MockObject
+     */
+    private $orderManagement;
+
+    /**
+     * @var CommentsHistoryUpdater|MockObject
+     */
+    private $commentsHistoryUpdater;
+
+    /**
+     * @var CaseInterface|MockObject
+     */
+    private $caseEntity;
+
+    /**
+     * @var Order|MockObject
+     */
+    private $order;
+
+    /**
+     * @var OrderStateService
+     */
+    private $orderStateService;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->orderManagement = $this->getMockBuilder(OrderManagementInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->commentsHistoryUpdater = $this->getMockBuilder(CommentsHistoryUpdater::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->orderFactory = $this->getMockBuilder(OrderFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->order = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->order->expects($this->once())
+            ->method('load')
+            ->willReturnSelf();
+
+        $this->orderFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->order);
+
+        $this->caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->caseEntity->expects($this->once())
+            ->method('getOrderId')
+            ->willReturn(self::$orderId);
+
+        $this->orderStateService = new OrderStateService(
+            $this->orderFactory,
+            $this->orderManagement,
+            $this->commentsHistoryUpdater
+        );
+    }
+
+    /**
+     * Tests update order state flow when case guarantee disposition is PENDING.
+     *
+     * @param bool $canHold
+     * @param bool $hold
+     * @param int $addCommentCall
+     * @dataProvider updateByCaseWithGuaranteePendingDataProvider
+     */
+    public function testUpdateByCaseWithGuaranteePending($canHold, $hold, $addCommentCall)
+    {
+        $this->caseEntity->expects($this->once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn(CaseInterface::GUARANTEE_PENDING);
+        $this->order->expects($this->any())
+            ->method('canHold')
+            ->willReturn($canHold);
+        $this->orderManagement->expects($this->any())
+            ->method('hold')
+            ->willReturn($hold);
+        $this->commentsHistoryUpdater->expects($this->exactly($addCommentCall))
+            ->method('addComment')
+            ->with(
+                $this->caseEntity,
+                __('Awaiting the Signifyd guarantee disposition.'),
+                Order::STATE_HOLDED
+            );
+
+        $this->orderStateService->updateByCase($this->caseEntity);
+    }
+
+    /**
+     * @return array
+     */
+    public function updateByCaseWithGuaranteePendingDataProvider()
+    {
+        return [
+            ['canHold' => true, 'hold' => true, 'addCommentCall' => 1],
+            ['canHold' => false, 'hold' => true, 'addCommentCall' => 0],
+            ['canHold' => true, 'hold' => false, 'addCommentCall' => 0],
+        ];
+    }
+
+    /**
+     * Tests update order state flow when case guarantee disposition is APPROVED.
+     *
+     * @param bool $canUnhold
+     * @param int $unholdCall
+     * @dataProvider updateByCaseWithGuaranteeApprovedDataProvider
+     */
+    public function testUpdateByCaseWithGuaranteeApproved($canUnhold, $unholdCall)
+    {
+        $this->caseEntity->expects($this->once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn(CaseInterface::GUARANTEE_APPROVED);
+        $this->order->expects($this->any())
+            ->method('canUnhold')
+            ->willReturn($canUnhold);
+        $this->orderManagement->expects($this->exactly($unholdCall))
+            ->method('unHold');
+        $this->commentsHistoryUpdater->expects($this->never())
+            ->method('addComment');
+
+        $this->orderStateService->updateByCase($this->caseEntity);
+    }
+
+    /**
+     * @return array
+     */
+    public function updateByCaseWithGuaranteeApprovedDataProvider()
+    {
+        return [
+            ['canUnhold' => true,  'unholdCall' => 1],
+            ['canUnhold' => false, 'unholdCall' => 0]
+        ];
+    }
+
+    /**
+     * Tests update order state flow when case guarantee disposition is DECLINED.
+     *
+     * @param bool $canHold
+     * @param int $holdCall
+     * @dataProvider updateByCaseWithGuaranteeDeclinedDataProvider
+     */
+    public function testUpdateByCaseWithGuaranteeDeclined($canHold, $holdCall)
+    {
+        $this->caseEntity->expects($this->once())
+            ->method('getGuaranteeDisposition')
+            ->willReturn(CaseInterface::GUARANTEE_DECLINED);
+        $this->order->expects($this->any())
+            ->method('canHold')
+            ->willReturn($canHold);
+        $this->orderManagement->expects($this->exactly($holdCall))
+            ->method('hold');
+        $this->commentsHistoryUpdater->expects($this->never())
+            ->method('addComment');
+
+        $this->orderStateService->updateByCase($this->caseEntity);
+    }
+
+    /**
+     * @return array
+     */
+    public function updateByCaseWithGuaranteeDeclinedDataProvider()
+    {
+        return [
+            ['canHold' => true,  'holdCall' => 1],
+            ['canHold' => false, 'holdCall' => 0]
+        ];
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php
new file mode 100644
index 0000000000000..319229e326c4b
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\PaymentMethodMapper;
+
+use Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Config\Dom\ValidationSchemaException;
+
+class XmlToArrayConfigConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var XmlToArrayConfigConverter
+     */
+    private $converter;
+
+    /**
+     * @var string
+     */
+    private $filePath;
+
+    public function setUp()
+    {
+        $this->filePath = realpath(__DIR__) . '/_files/';
+
+        $objectManagerHelper = new ObjectManager($this);
+        $this->converter = $objectManagerHelper->getObject(
+            XmlToArrayConfigConverter::class
+        );
+    }
+
+    public function testConvert()
+    {
+        $testDom = $this->filePath . 'signifyd_payment_mapping.xml';
+        $dom = new \DOMDocument();
+        $dom->load($testDom);
+        $mapping = $this->converter->convert($dom);
+        $expectedArray = include $this->filePath . 'expected_array.php';
+
+        $this->assertEquals($expectedArray, $mapping);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Config\Dom\ValidationSchemaException
+     * @expectedExceptionMessage Only single entrance of "magento_code" node is required.
+     */
+    public function testConvertEmptyPaymentMethodException()
+    {
+        $dom = new \DOMDocument();
+        $element = $dom->createElement('payment_method');
+        $subelement = $dom->createElement('signifyd_code', 'test');
+        $element->appendChild($subelement);
+        $dom->appendChild($element);
+
+        $this->converter->convert($dom);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Config\Dom\ValidationSchemaException
+     * @expectedExceptionMessage Not empty value for "signifyd_code" node is required.
+     */
+    public function testConvertEmptySygnifydPaymentMethodException()
+    {
+        $dom = new \DOMDocument();
+        $element = $dom->createElement('payment_method');
+        $subelement = $dom->createElement('magento_code', 'test');
+        $subelement2 = $dom->createElement('signifyd_code', '');
+        $element->appendChild($subelement);
+        $element->appendChild($subelement2);
+        $dom->appendChild($element);
+
+        $this->converter->convert($dom);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/expected_array.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/expected_array.php
new file mode 100644
index 0000000000000..f5d3436ae6b7b
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/expected_array.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'payment_method_1' => 'PAYMENT_CARD',
+    'payment_method_2' => 'PAYPAL_ACCOUNT',
+    'payment_method_3' => 'CHECK',
+    'payment_method_4' => 'CASH',
+    'payment_method_5' => 'FREE'
+];
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/signifyd_payment_mapping.xml b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/signifyd_payment_mapping.xml
new file mode 100644
index 0000000000000..f70763e22c418
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/_files/signifyd_payment_mapping.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Signifyd:etc/payment_mapping.xsd">
+    <payment_method_list>
+        <payment_method>
+            <magento_code>payment_method_1</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payment_method_2</magento_code>
+            <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payment_method_3</magento_code>
+            <signifyd_code>CHECK</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payment_method_4</magento_code>
+            <signifyd_code>CASH</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payment_method_5</magento_code>
+            <signifyd_code>FREE</signifyd_code>
+        </payment_method>
+    </payment_method_list>
+</config>
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php
new file mode 100644
index 0000000000000..b0f9239d43bfa
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Signifyd\Model\PaymentVerificationFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Payment\Gateway\ConfigInterface;
+
+class PaymentVerificationFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PaymentVerificationFactory
+     */
+    private $factory;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $fakeObjectManager;
+
+    /**
+     * @var ConfigInterface|MockObject
+     */
+    private $config;
+
+    /**
+     * @var PaymentVerificationInterface|MockObject
+     */
+    private $avsDefaultAdapter;
+
+    /**
+     * @var PaymentVerificationInterface|MockObject
+     */
+    private $cvvDefaultAdapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->fakeObjectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->config = $this->getMockBuilder(ConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->avsDefaultAdapter = $this->getMockBuilder(PaymentVerificationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cvvDefaultAdapter = $this->getMockBuilder(PaymentVerificationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->factory = $this->objectManager->getObject(PaymentVerificationFactory::class, [
+            'objectManager' => $this->fakeObjectManager,
+            'config' => $this->config,
+            'avsDefaultAdapter' => $this->avsDefaultAdapter,
+            'cvvDefaultAdapter' => $this->cvvDefaultAdapter
+        ]);
+    }
+
+    /**
+     * Checks a test case when factory creates CVV mapper for provided payment method.
+     *
+     * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentCvv
+     */
+    public function testCreatePaymentCvv()
+    {
+        $paymentMethodCode = 'exists_payment';
+
+        $this->config->expects(self::once())
+            ->method('setMethodCode')
+            ->with(self::equalTo($paymentMethodCode))
+            ->willReturnSelf();
+
+        $this->config->expects(self::once())
+            ->method('getValue')
+            ->with('cvv_ems_adapter')
+            ->willReturn(PaymentVerificationInterface::class);
+
+        /** @var PaymentVerificationInterface|MockObject $cvvAdapter */
+        $cvvAdapter = $this->getMockBuilder(PaymentVerificationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with(self::equalTo(PaymentVerificationInterface::class))
+            ->willReturn($cvvAdapter);
+
+        $mapper = $this->factory->createPaymentCvv($paymentMethodCode);
+        self::assertInstanceOf(PaymentVerificationInterface::class, $mapper);
+    }
+
+    /**
+     * Checks a test case, when provided payment method does not have cvv mapper.
+     *
+     * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentCvv
+     */
+    public function testCreateDefaultCvvMapper()
+    {
+        $paymentMethodCode = 'non_exists_payment';
+
+        $this->config->expects(self::once())
+            ->method('setMethodCode')
+            ->with(self::equalTo($paymentMethodCode))
+            ->willReturnSelf();
+
+        $this->config->expects(self::once())
+            ->method('getValue')
+            ->with('cvv_ems_adapter')
+            ->willReturn(null);
+
+        $this->fakeObjectManager->expects(self::never())
+            ->method('create');
+
+        $mapper = $this->factory->createPaymentCvv($paymentMethodCode);
+        self::assertSame($this->cvvDefaultAdapter, $mapper);
+    }
+
+    /**
+     * Checks a test case, when mapper implementation does not corresponding to PaymentVerificationInterface.
+     *
+     * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentCvv
+     * @expectedException \Magento\Framework\Exception\ConfigurationMismatchException
+     * @expectedExceptionMessage stdClass must implement Magento\Payment\Api\PaymentVerificationInterface
+     */
+    public function testCreateWithUnsupportedImplementation()
+    {
+        $paymentMethodCode = 'exists_payment';
+
+        $this->config->expects(self::once())
+            ->method('setMethodCode')
+            ->with(self::equalTo($paymentMethodCode))
+            ->willReturnSelf();
+
+        $this->config->expects(self::once())
+            ->method('getValue')
+            ->with('cvv_ems_adapter')
+            ->willReturn(\stdClass::class);
+
+        $cvvAdapter = new \stdClass();
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with(self::equalTo(\stdClass::class))
+            ->willReturn($cvvAdapter);
+
+        $this->factory->createPaymentCvv($paymentMethodCode);
+    }
+
+    /**
+     * Checks a test case when factory creates AVS mapper for provided payment method.
+     *
+     * @covers \Magento\Signifyd\Model\PaymentVerificationFactory::createPaymentAvs
+     */
+    public function testCreatePaymentAvs()
+    {
+        $paymentMethodCode = 'exists_payment';
+
+        $this->config->expects(self::once())
+            ->method('setMethodCode')
+            ->with(self::equalTo($paymentMethodCode))
+            ->willReturnSelf();
+
+        $this->config->expects(self::once())
+            ->method('getValue')
+            ->with('avs_ems_adapter')
+            ->willReturn(PaymentVerificationInterface::class);
+
+        $avsAdapter = $this->getMockBuilder(PaymentVerificationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->fakeObjectManager->expects(self::once())
+            ->method('create')
+            ->with(self::equalTo(PaymentVerificationInterface::class))
+            ->willReturn($avsAdapter);
+
+        $mapper = $this->factory->createPaymentAvs($paymentMethodCode);
+        self::assertInstanceOf(PaymentVerificationInterface::class, $mapper);
+    }
+
+    /**
+     * Checks a test case when provided payment method does not support
+     */
+    public function testCreateDefaultAvsMapper()
+    {
+        $paymentMethodCode = 'non_exists_payment';
+
+        $this->config->expects(self::once())
+            ->method('setMethodCode')
+            ->with(self::equalTo($paymentMethodCode))
+            ->willReturnSelf();
+
+        $this->config->expects(self::once())
+            ->method('getValue')
+            ->with('avs_ems_adapter')
+            ->willReturn(null);
+
+        $this->fakeObjectManager->expects(self::never())
+            ->method('create');
+
+        $mapper = $this->factory->createPaymentAvs($paymentMethodCode);
+        self::assertSame($this->avsDefaultAdapter, $mapper);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php
new file mode 100644
index 0000000000000..885c9f018a488
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SalesOrderGrid/OrderGridUpdaterTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\SalesOrderGrid;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sales\Model\ResourceModel\GridInterface;
+use Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class OrderGridUpdaterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GridInterface|MockObject
+     */
+    private $orderGrid;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $globalConfig;
+
+    /**
+     * @var OrderGridUpdater
+     */
+    private $model;
+
+    /**
+     * Sets up testing class and dependency mocks.
+     */
+    protected function setUp()
+    {
+        $this->orderGrid = $this->getMockBuilder(GridInterface::class)
+            ->getMockForAbstractClass();
+        $this->globalConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->model = new OrderGridUpdater($this->orderGrid, $this->globalConfig);
+    }
+
+    public function testUpdateInSyncMode()
+    {
+        $orderId = 1;
+
+        $this->globalConfig->expects($this->once())
+            ->method('getValue')
+            ->with('dev/grid/async_indexing', 'default', null)
+            ->willReturn(false);
+        $this->orderGrid->expects($this->once())
+            ->method('refresh')
+            ->with($orderId);
+
+        $this->model->update($orderId);
+    }
+
+    public function testUpdateInAsyncMode()
+    {
+        $orderId = 1;
+
+        $this->globalConfig->expects($this->once())
+            ->method('getValue')
+            ->with('dev/grid/async_indexing', 'default', null)
+            ->willReturn(true);
+        $this->orderGrid->expects($this->never())
+            ->method('refresh')
+            ->with($orderId);
+
+        $this->model->update($orderId);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php
new file mode 100644
index 0000000000000..4aefd63355773
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Client;
+
+use Magento\Signifyd\Model\SignifydGateway\Client\HttpClientFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Signifyd\Model\Config;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\Json\EncoderInterface;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class HttpClientFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private static $dummy = 'dummy';
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var ZendClientFactory|MockObject
+     */
+    private $clientFactory;
+
+    /**
+     * @var ZendClient|MockObject
+     */
+    private $client;
+
+    /**
+     * @var EncoderInterface|MockObject
+     */
+    private $dataEncoder;
+
+    /**
+     * @var ZendClient|MockObject
+     */
+    private $httpClient;
+
+    public function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->client = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setHeaders', 'setMethod', 'setUri', 'setRawData'])
+            ->getMock();
+
+        $this->clientFactory = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->clientFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->client);
+
+        $this->dataEncoder = $this->getMockBuilder(EncoderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->httpClient = $this->objectManager->getObject(HttpClientFactory::class, [
+            'config'        => $this->config,
+            'clientFactory' => $this->clientFactory,
+            'dataEncoder'   => $this->dataEncoder
+        ]);
+    }
+
+    public function testCreateHttpClient()
+    {
+        $this->config->expects($this->once())
+            ->method('getApiKey')
+            ->willReturn('testKey');
+
+        $this->config->expects($this->once())
+            ->method('getApiUrl')
+            ->willReturn('testUrl');
+
+        $client = $this->httpClient->create('url', 'method');
+
+        $this->assertInstanceOf(ZendClient::class, $client);
+    }
+
+    public function testCreateWithParams()
+    {
+        $param = ['id' => 1];
+        $storeId = 1;
+        $json = '{"id":1}';
+
+        $this->config->expects($this->once())
+            ->method('getApiKey')
+            ->with($storeId)
+            ->willReturn('testKey');
+
+        $this->config->expects($this->once())
+            ->method('getApiUrl')
+            ->with($storeId)
+            ->willReturn(self::$dummy);
+
+        $this->dataEncoder->expects($this->once())
+            ->method('encode')
+            ->with($this->equalTo($param))
+            ->willReturn($json);
+
+        $this->client->expects($this->once())
+            ->method('setRawData')
+            ->with($this->equalTo($json), 'application/json')
+            ->willReturnSelf();
+
+        $client = $this->httpClient->create('url', 'method', $param, $storeId);
+
+        $this->assertInstanceOf(ZendClient::class, $client);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php
new file mode 100644
index 0000000000000..1ee55d7ad150c
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Client;
+
+use Magento\Signifyd\Model\SignifydGateway\Client\ResponseHandler;
+use Magento\Framework\Json\DecoderInterface;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use \Zend_Http_Response as Response;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class ResponseHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private static $errorMessage = 'Some error';
+
+    /**
+     * @var string
+     */
+    private static $testJson = '{"id": 1}';
+
+    /**
+     * @var int
+     */
+    private static $successfulCode = 200;
+
+    /**
+     * @var int
+     */
+    private static $phpVersionId = 50000;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ResponseHandler|MockObject
+     */
+    private $responseHandler;
+
+    /**
+     * @var DecoderInterface|MockObject
+     */
+    private $dataDecoder;
+
+    /**
+     * @var Response|MockObject
+     */
+    private $response;
+
+    public function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->dataDecoder = $this->getMockBuilder(DecoderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->response = $this->getMockBuilder(Response::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStatus', 'getBody'])
+            ->getMock();
+
+        $this->responseHandler = $this->objectManager->getObject(ResponseHandler::class, [
+            'dataDecoder' => $this->dataDecoder
+        ]);
+    }
+
+    /**
+     * @dataProvider errorsProvider
+     */
+    public function testHandleFailureMessage($code, $message)
+    {
+        $this->response->expects($this->any())
+            ->method('getStatus')
+            ->willReturn($code);
+
+        $this->response->expects($this->once())
+            ->method('getBody')
+            ->willReturn(self::$errorMessage);
+
+        try {
+            $this->responseHandler->handle($this->response);
+        } catch (ApiCallException $e) {
+            $this->assertEquals($e->getMessage(), sprintf($message, self::$errorMessage));
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function errorsProvider()
+    {
+        return [
+            [400, 'Bad Request - The request could not be parsed. Response: %s'],
+            [401, 'Unauthorized - user is not logged in, could not be authenticated. Response: %s'],
+            [403, 'Forbidden - Cannot access resource. Response: %s'],
+            [404, 'Not Found - resource does not exist. Response: %s'],
+            [
+                409,
+                'Conflict - with state of the resource on server. Can occur with (too rapid) PUT requests. Response: %s'
+            ],
+            [500, 'Server error. Response: %s']
+        ];
+    }
+
+    /**
+     * @expectedException     \Magento\Signifyd\Model\SignifydGateway\ApiCallException
+     * @expectedExceptionMessage  Response is not valid JSON: Decoding failed: Syntax error
+     */
+    public function testHandleEmptyJsonException()
+    {
+        $this->response->expects($this->any())
+            ->method('getStatus')
+            ->willReturn(self::$successfulCode);
+
+        $this->response->expects($this->once())
+            ->method('getBody')
+            ->willReturn('');
+
+        $r = new \ReflectionObject($this->responseHandler);
+        $prop = $r->getProperty('phpVersionId');
+        $prop->setAccessible(true);
+        $prop->setValue(self::$phpVersionId);
+
+        $this->responseHandler->handle($this->response);
+    }
+
+    /**
+     * @expectedException     \Magento\Signifyd\Model\SignifydGateway\ApiCallException
+     * @expectedExceptionMessage  Response is not valid JSON: Some error
+     */
+    public function testHandleInvalidJson()
+    {
+        $this->response->expects($this->any())
+            ->method('getStatus')
+            ->willReturn(self::$successfulCode);
+
+        $this->response->expects($this->once())
+            ->method('getBody')
+            ->willReturn('param');
+
+        $this->dataDecoder = $this->getMockBuilder(DecoderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataDecoder->expects($this->once())
+            ->method('decode')
+            ->with('param')
+            ->willThrowException(new \Exception(self::$errorMessage, 30));
+
+        $this->responseHandler = $this->objectManager->getObject(ResponseHandler::class, [
+            'dataDecoder' => $this->dataDecoder
+        ]);
+
+        $this->responseHandler->handle($this->response);
+    }
+
+    public function testHandle()
+    {
+        $this->response->expects($this->any())
+            ->method('getStatus')
+            ->willReturn(self::$successfulCode);
+
+        $this->response->expects($this->once())
+            ->method('getBody')
+            ->willReturn(self::$testJson);
+
+        $this->dataDecoder->expects($this->once())
+            ->method('decode')
+            ->willReturn(json_decode(self::$testJson, 1));
+
+        $decodedResponseBody = $this->responseHandler->handle($this->response);
+        $this->assertEquals($decodedResponseBody, ['id' => 1]);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php
new file mode 100644
index 0000000000000..ba82ff4619ad3
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php
@@ -0,0 +1,448 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface;
+use Magento\Signifyd\Model\SignifydGateway\ApiClient;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+
+class GatewayTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CreateCaseBuilderInterface|MockObject
+     */
+    private $createCaseBuilder;
+
+    /**
+     * @var ApiClient|MockObject
+     */
+    private $apiClient;
+
+    /**
+     * @var Gateway
+     */
+    private $gateway;
+
+    /**
+     * @var OrderRepositoryInterface|MockObject
+     */
+    private $orderRepository;
+
+    /**
+     * @var CaseRepositoryInterface|MockObject
+     */
+    private $caseRepository;
+
+    public function setUp()
+    {
+        $this->createCaseBuilder = $this->getMockBuilder(CreateCaseBuilderInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->apiClient = $this->getMockBuilder(ApiClient::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->orderRepository = $this->getMockBuilder(OrderRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->caseRepository= $this->getMockBuilder(CaseRepositoryInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->gateway = new Gateway(
+            $this->createCaseBuilder,
+            $this->apiClient,
+            $this->orderRepository,
+            $this->caseRepository
+        );
+    }
+
+    public function testCreateCaseForSpecifiedOrder()
+    {
+        $dummyOrderId = 1;
+        $dummyStoreId = 2;
+        $dummySignifydInvestigationId = 42;
+
+        $this->withOrderEntity($dummyOrderId, $dummyStoreId);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'investigationId' => $dummySignifydInvestigationId
+            ]);
+
+        $this->createCaseBuilder
+            ->expects($this->atLeastOnce())
+            ->method('build')
+            ->with($this->equalTo($dummyOrderId))
+            ->willReturn([]);
+
+        $result = $this->gateway->createCase($dummyOrderId);
+        $this->assertEquals(42, $result);
+    }
+
+    public function testCreateCaseCallsValidApiMethod()
+    {
+        $dummyOrderId = 1;
+        $dummyStoreId = 2;
+        $dummySignifydInvestigationId = 42;
+
+        $this->withOrderEntity($dummyOrderId, $dummyStoreId);
+        $this->createCaseBuilder
+            ->method('build')
+            ->willReturn([]);
+
+        $this->apiClient
+            ->expects($this->atLeastOnce())
+            ->method('makeApiCall')
+            ->with(
+                $this->equalTo('/cases'),
+                $this->equalTo('POST'),
+                $this->isType('array'),
+                $this->equalTo($dummyStoreId)
+            )
+            ->willReturn([
+                'investigationId' => $dummySignifydInvestigationId
+            ]);
+
+        $result = $this->gateway->createCase($dummyOrderId);
+        $this->assertEquals(42, $result);
+    }
+
+    public function testCreateCaseNormalFlow()
+    {
+        $dummyOrderId = 1;
+        $dummyStoreId = 2;
+        $dummySignifydInvestigationId = 42;
+
+        $this->withOrderEntity($dummyOrderId, $dummyStoreId);
+        $this->createCaseBuilder
+            ->method('build')
+            ->willReturn([]);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'investigationId' => $dummySignifydInvestigationId
+            ]);
+
+        $returnedInvestigationId = $this->gateway->createCase($dummyOrderId);
+        $this->assertEquals(
+            $dummySignifydInvestigationId,
+            $returnedInvestigationId,
+            'Method must return value specified in "investigationId" response parameter'
+        );
+    }
+
+    public function testCreateCaseWithFailedApiCall()
+    {
+        $dummyOrderId = 1;
+        $dummyStoreId = 2;
+        $apiCallFailureMessage = 'Api call failed';
+
+        $this->withOrderEntity($dummyOrderId, $dummyStoreId);
+        $this->createCaseBuilder
+            ->method('build')
+            ->willReturn([]);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willThrowException(new ApiCallException($apiCallFailureMessage));
+
+        $this->expectException(GatewayException::class);
+        $this->expectExceptionMessage($apiCallFailureMessage);
+        $this->gateway->createCase($dummyOrderId);
+    }
+
+    public function testCreateCaseWithMissedResponseRequiredData()
+    {
+        $dummyOrderId = 1;
+        $dummyStoreId = 2;
+
+        $this->withOrderEntity($dummyOrderId, $dummyStoreId);
+        $this->createCaseBuilder
+            ->method('build')
+            ->willReturn([]);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'someOtherParameter' => 'foo',
+            ]);
+
+        $this->expectException(GatewayException::class);
+        $this->gateway->createCase($dummyOrderId);
+    }
+
+    public function testCreateCaseWithAdditionalResponseData()
+    {
+        $dummyOrderId = 1;
+        $dummyStoreId = 2;
+        $dummySignifydInvestigationId = 42;
+
+        $this->withOrderEntity($dummyOrderId, $dummyStoreId);
+        $this->createCaseBuilder
+            ->method('build')
+            ->willReturn([]);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'investigationId' => $dummySignifydInvestigationId,
+                'someOtherParameter' => 'foo',
+            ]);
+
+        $returnedInvestigationId = $this->gateway->createCase($dummyOrderId);
+        $this->assertEquals(
+            $dummySignifydInvestigationId,
+            $returnedInvestigationId,
+            'Method must return value specified in "investigationId" response parameter and ignore any other parameters'
+        );
+    }
+
+    public function testSubmitCaseForGuaranteeCallsValidApiMethod()
+    {
+        $dummySygnifydCaseId = 42;
+        $dummyStoreId = 1;
+        $dummyDisposition = 'APPROVED';
+
+        $this->withCaseEntity($dummySygnifydCaseId, $dummyStoreId);
+        $this->apiClient
+            ->expects($this->atLeastOnce())
+            ->method('makeApiCall')
+            ->with(
+                $this->equalTo('/guarantees'),
+                $this->equalTo('POST'),
+                $this->equalTo([
+                    'caseId' => $dummySygnifydCaseId
+                ]),
+                $this->equalTo($dummyStoreId)
+            )->willReturn([
+                'disposition' => $dummyDisposition
+            ]);
+
+        $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals('APPROVED', $result);
+    }
+
+    public function testSubmitCaseForGuaranteeWithFailedApiCall()
+    {
+        $dummySygnifydCaseId = 42;
+        $dummyStoreId = 1;
+        $apiCallFailureMessage = 'Api call failed';
+
+        $this->withCaseEntity($dummySygnifydCaseId, $dummyStoreId);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willThrowException(new ApiCallException($apiCallFailureMessage));
+
+        $this->expectException(GatewayException::class);
+        $this->expectExceptionMessage($apiCallFailureMessage);
+        $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals('Api call failed', $result);
+    }
+
+    public function testSubmitCaseForGuaranteeReturnsDisposition()
+    {
+        $dummySygnifydCaseId = 42;
+        $dummyStoreId = 1;
+        $dummyDisposition = 'APPROVED';
+        $dummyGuaranteeId = 123;
+        $dummyRereviewCount = 0;
+
+        $this->withCaseEntity($dummySygnifydCaseId, $dummyStoreId);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'guaranteeId' => $dummyGuaranteeId,
+                'disposition' => $dummyDisposition,
+                'rereviewCount' => $dummyRereviewCount,
+            ]);
+
+        $actualDisposition = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals(
+            $dummyDisposition,
+            $actualDisposition,
+            'Method must return guarantee disposition retrieved in Signifyd API response as a result'
+        );
+    }
+
+    public function testSubmitCaseForGuaranteeWithMissedDisposition()
+    {
+        $dummySygnifydCaseId = 42;
+        $dummyStoreId = 1;
+        $dummyGuaranteeId = 123;
+        $dummyRereviewCount = 0;
+
+        $this->withCaseEntity($dummySygnifydCaseId, $dummyStoreId);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'guaranteeId' => $dummyGuaranteeId,
+                'rereviewCount' => $dummyRereviewCount,
+            ]);
+
+        $this->expectException(GatewayException::class);
+        $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+    }
+
+    public function testSubmitCaseForGuaranteeWithUnexpectedDisposition()
+    {
+        $dummySygnifydCaseId = 42;
+        $dummyStoreId = 1;
+        $dummyUnexpectedDisposition = 'UNEXPECTED';
+
+        $this->withCaseEntity($dummySygnifydCaseId, $dummyStoreId);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'disposition' => $dummyUnexpectedDisposition,
+            ]);
+
+        $this->expectException(GatewayException::class);
+        $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+        $this->assertEquals('UNEXPECTED', $result);
+    }
+
+    /**
+     * @dataProvider supportedGuaranteeDispositionsProvider
+     */
+    public function testSubmitCaseForGuaranteeWithExpectedDisposition($dummyExpectedDisposition)
+    {
+        $dummySygnifydCaseId = 42;
+        $dummyStoreId = 1;
+
+        $this->withCaseEntity($dummySygnifydCaseId, $dummyStoreId);
+        $this->apiClient
+            ->method('makeApiCall')
+            ->willReturn([
+                'disposition' => $dummyExpectedDisposition,
+            ]);
+
+        try {
+            $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId);
+            $this->assertEquals($dummyExpectedDisposition, $result);
+        } catch (GatewayException $e) {
+            $this->fail(sprintf(
+                'Expected disposition "%s" was not accepted with message "%s"',
+                $dummyExpectedDisposition,
+                $e->getMessage()
+            ));
+        }
+    }
+
+    /**
+     * Checks a test case when guarantee for a case is successfully canceled
+     *
+     * @covers \Magento\Signifyd\Model\SignifydGateway\Gateway::cancelGuarantee
+     */
+    public function testCancelGuarantee()
+    {
+        $caseId = 123;
+        $dummyStoreId = 1;
+
+        $this->withCaseEntity($caseId, $dummyStoreId);
+        $this->apiClient->expects(self::once())
+            ->method('makeApiCall')
+            ->with(
+                '/cases/' . $caseId . '/guarantee',
+                'PUT',
+                ['guaranteeDisposition' => Gateway::GUARANTEE_CANCELED],
+                $dummyStoreId
+            )
+            ->willReturn(
+                ['disposition' => Gateway::GUARANTEE_CANCELED]
+            );
+
+        $result = $this->gateway->cancelGuarantee($caseId);
+        self::assertEquals(Gateway::GUARANTEE_CANCELED, $result);
+    }
+
+    /**
+     * Checks a case when API request returns unexpected guarantee disposition.
+     *
+     * @covers \Magento\Signifyd\Model\SignifydGateway\Gateway::cancelGuarantee
+     * @expectedException \Magento\Signifyd\Model\SignifydGateway\GatewayException
+     * @expectedExceptionMessage API returned unexpected disposition: DECLINED.
+     */
+    public function testCancelGuaranteeWithUnexpectedDisposition()
+    {
+        $caseId = 123;
+        $dummyStoreId = 1;
+
+        $this->withCaseEntity($caseId, $dummyStoreId);
+        $this->apiClient->expects(self::once())
+            ->method('makeApiCall')
+            ->with(
+                '/cases/' . $caseId . '/guarantee',
+                'PUT',
+                ['guaranteeDisposition' => Gateway::GUARANTEE_CANCELED],
+                $dummyStoreId
+            )
+            ->willReturn(['disposition' => Gateway::GUARANTEE_DECLINED]);
+
+        $result = $this->gateway->cancelGuarantee($caseId);
+        $this->assertEquals(Gateway::GUARANTEE_CANCELED, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function supportedGuaranteeDispositionsProvider()
+    {
+        return [
+            'APPROVED' => ['APPROVED'],
+            'DECLINED' => ['DECLINED'],
+            'PENDING' => ['PENDING'],
+            'CANCELED' => ['CANCELED'],
+            'IN_REVIEW' => ['IN_REVIEW'],
+            'UNREQUESTED' => ['UNREQUESTED'],
+        ];
+    }
+
+    /**
+     * Specifies order entity mock execution.
+     *
+     * @param int $orderId
+     * @param int $storeId
+     * @return void
+     */
+    private function withOrderEntity(int $orderId, int $storeId): void
+    {
+        $orderEntity = $this->getMockBuilder(OrderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $orderEntity->method('getStoreId')
+            ->willReturn($storeId);
+        $this->orderRepository->method('get')
+            ->with($orderId)
+            ->willReturn($orderEntity);
+    }
+
+    /**
+     * Specifies case entity mock execution.
+     *
+     * @param int $caseId
+     * @param int $storeId
+     * @return void
+     */
+    private function withCaseEntity(int $caseId, int $storeId): void
+    {
+        $orderId = 1;
+
+        $caseEntity = $this->getMockBuilder(CaseInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $caseEntity->method('getOrderId')
+            ->willReturn($orderId);
+        $this->caseRepository->method('getByCaseId')
+            ->with($caseId)
+            ->willReturn($caseEntity);
+
+        $this->withOrderEntity($orderId, $storeId);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php
new file mode 100644
index 0000000000000..0dfdf4980fb58
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Response;
+
+use Magento\Framework\Json\DecoderInterface;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageReader;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessage;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageFactory;
+
+/**
+ * Class WebhookMessageReaderTest
+ */
+class WebhookMessageReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var WebhookMessageReader
+     */
+    private $model;
+
+    /**
+     * @var DecoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $decoder;
+
+    /**
+     * @var WebhookMessageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $webhookMessageFactory;
+
+    /**
+     * @var WebhookRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $webhookRequest;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->decoder = $this->getMockBuilder(DecoderInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->webhookMessageFactory = $this->getMockBuilder(WebhookMessageFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->webhookRequest = $this->getMockBuilder(WebhookRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new WebhookMessageReader(
+            $this->decoder,
+            $this->webhookMessageFactory
+        );
+    }
+
+    /**
+     * Tests successful reading webhook message from request.
+     *
+     */
+    public function testReadSuccess()
+    {
+        $rawBody = 'body';
+        $topic = 'topic';
+        $decodedData = ['status' => "DISMISSED", 'orderId' => '19418'];
+
+        $this->webhookRequest->expects($this->once())
+            ->method('getBody')
+            ->willReturn($rawBody);
+        $this->webhookRequest->expects($this->once())
+            ->method('getEventTopic')
+            ->willReturn('topic');
+        $this->decoder->expects($this->once())
+            ->method('decode')
+            ->with($rawBody)
+            ->willReturn($decodedData);
+        $webhookMessage = $this->getMockBuilder(WebhookMessage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->webhookMessageFactory->expects($this->once())
+            ->method('create')
+            ->with(
+                [
+                    'data' => $decodedData,
+                    'eventTopic' => $topic
+                ]
+            )
+            ->willReturn($webhookMessage);
+
+        $this->assertEquals(
+            $webhookMessage,
+            $this->model->read($this->webhookRequest)
+        );
+    }
+
+    /**
+     * Tests reading failure webhook message from request.
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testReadFail()
+    {
+        $this->decoder->expects($this->once())
+            ->method('decode')
+            ->willThrowException(new \Exception('Error'));
+
+        $this->model->read($this->webhookRequest);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php
new file mode 100644
index 0000000000000..5ae6b95a77548
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Response;
+
+use Magento\Framework\Json\DecoderInterface;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequestValidator;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
+
+/**
+ * Class WebhookRequestValidatorTest
+ */
+class WebhookRequestValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var WebhookRequestValidator
+     */
+    private $model;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * @var DecoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $decoder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->decoder = $this->getMockBuilder(DecoderInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->model = new WebhookRequestValidator(
+            $this->config,
+            $this->decoder
+        );
+    }
+
+    /**
+     * Tests successful cases.
+     *
+     * @param string $body
+     * @param string $topic
+     * @param string $hash
+     * @param int$callConfigCount
+     * @dataProvider validateSuccessDataProvider
+     */
+    public function testValidateSuccess($body, $topic, $hash, $callConfigCount)
+    {
+        $this->config->expects($this->exactly($callConfigCount))
+            ->method('getApiKey')
+            ->willReturn('GpFZZnxGgIxuI8BazSm3v6eGK');
+
+        $this->decoder->expects($this->once())
+            ->method('decode')
+            ->with($body)
+            ->willReturn(['status' => "DISMISSED", 'orderId' => '19418']);
+
+        $webhookRequest = $this->createWebhookRequest($body, $topic, $hash);
+
+        $this->assertTrue(
+            $this->model->validate($webhookRequest)
+        );
+    }
+
+    /**
+     * @case 1. All data are correct, event topic has real value
+     * @case 2. All data are correct, event topic has test value
+     * @return array
+     */
+    public function validateSuccessDataProvider()
+    {
+        return [
+            1 => [
+                'body' => '{ status: "DISMISSED", orderId: "19418" }',
+                'topic' => 'cases/creation',
+                'hash' => 'KWR8Bzu3tinEpDviw1opWSMJGFqfpA79nNGp0TEYM6Q=',
+                'callConfigCount' => 1
+            ],
+            2 => [
+                'body' => '{ status: "DISMISSED", orderId: "19418" }',
+                'topic' => 'cases/test',
+                'hash' => '6npAahliNbzYo/Qi4+g+JeqPhLFgg19sIbuxDLmvobw=',
+                'callConfigCount' => 0
+            ]
+        ];
+    }
+
+    /**
+     * Case with wrong event topic
+     *
+     * @param string $topic
+     * @dataProvider validationTopicFailsDataProvider
+     */
+    public function testValidationTopicFails($topic)
+    {
+        $body = '{ status: "DISMISSED", orderId: "19418" }';
+        $hash = 'KWR8Bzu3tinEpDviw1opWSMJGFqfpA79nNGp0TEYM6Q=';
+
+        $this->config->expects($this->never())
+            ->method('getApiKey');
+
+        $this->decoder->expects($this->never())
+            ->method('decode');
+
+        $webhookRequest = $this->createWebhookRequest($body, $topic, $hash);
+
+        $this->assertFalse(
+            $this->model->validate($webhookRequest),
+            'Negative webhook event topic value validation fails'
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function validationTopicFailsDataProvider()
+    {
+        return [
+            ['wrong topic' => 'bla-bla-topic'],
+            ['empty topic' => '']
+        ];
+    }
+
+    /**
+     * Case with wrong webhook request body
+     *
+     * @param string $body
+     * @dataProvider validationBodyFailsDataProvider
+     */
+    public function testValidationBodyFails($body)
+    {
+        $topic = 'cases/creation';
+        $hash = 'KWR8Bzu3tinEpDviw1opWSMJGFqfpA79nNGp0TEYM6Q=';
+        $webhookRequest = $this->createWebhookRequest($body, $topic, $hash);
+
+        $this->config->expects($this->never())
+            ->method('getApiKey');
+
+        if (empty($body)) {
+            $this->decoder->expects($this->once())
+                ->method('decode')
+                ->with($body)
+                ->willReturn('');
+        } else {
+            $this->decoder->expects($this->once())
+                ->method('decode')
+                ->with($body)
+                ->willThrowException(new \Exception('Error'));
+        }
+
+        $this->assertFalse(
+            $this->model->validate($webhookRequest),
+            'Negative webhook request body validation fails'
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function validationBodyFailsDataProvider()
+    {
+        return [
+            ['Empty request body' => ''],
+            ['Bad request body' => '{ bad data}']
+        ];
+    }
+
+    /**
+     * Case with wrong hash
+     */
+    public function testValidationHashFails()
+    {
+        $topic = 'cases/creation';
+        $body = '{ status: "DISMISSED", orderId: "19418" }';
+        $hash = 'wrong hash';
+        $webhookRequest = $this->createWebhookRequest($body, $topic, $hash);
+
+        $this->config->expects($this->once())
+            ->method('getApiKey')
+            ->willReturn('GpFZZnxGgIxuI8BazSm3v6eGK');
+
+        $this->decoder->expects($this->once())
+            ->method('decode')
+            ->with($body)
+            ->willReturn(['status' => "DISMISSED", 'orderId' => '19418']);
+
+        $this->assertFalse(
+            $this->model->validate($webhookRequest),
+            'Negative webhook hash validation fails'
+        );
+    }
+
+    /**
+     * Returns mocked WebhookRequest
+     *
+     * @param string $body
+     * @param string $topic
+     * @param string $hash
+     * @return WebhookRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createWebhookRequest($body, $topic, $hash)
+    {
+        $webhookRequest = $this->getMockBuilder(WebhookRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookRequest->expects($this->once())
+            ->method('getBody')
+            ->willReturn($body);
+        $webhookRequest->expects($this->once())
+            ->method('getEventTopic')
+            ->willReturn($topic);
+        $webhookRequest->expects($this->once())
+            ->method('getHash')
+            ->willReturn($hash);
+
+        return $webhookRequest;
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php
new file mode 100644
index 0000000000000..9d3061f240c21
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Model;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\DataObject\IdentityGeneratorInterface;
+use Magento\Signifyd\Model\SignifydOrderSessionId;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class SignifydOrderSessionIdTest tests that SignifydOrderSessionId class dependencies
+ * follow the contracts.
+ */
+class SignifydOrderSessionIdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SignifydOrderSessionId
+     */
+    private $signifydOrderSessionId;
+
+    /**
+     * @var IdentityGeneratorInterface|MockObject
+     */
+    private $identityGenerator;
+
+    /**
+     * Sets up testing class and dependency mocks.
+     */
+    protected function setUp()
+    {
+        $this->identityGenerator = $this->getMockBuilder(IdentityGeneratorInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->signifydOrderSessionId = new SignifydOrderSessionId($this->identityGenerator);
+    }
+
+    /**
+     * Tests method by passing quoteId parameter
+     *
+     * @covers \Magento\Signifyd\Model\SignifydOrderSessionId::get
+     */
+    public function testGetByQuoteId()
+    {
+        $quoteId = 1;
+        $signifydOrderSessionId = 'asdfzxcv';
+
+        $this->identityGenerator->expects(self::once())
+            ->method('generateIdForData')
+            ->with($quoteId)
+            ->willReturn($signifydOrderSessionId);
+
+        $this->assertEquals(
+            $signifydOrderSessionId,
+            $this->signifydOrderSessionId->get($quoteId)
+        );
+    }
+}
diff --git a/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php
new file mode 100644
index 0000000000000..d63831b1d4a8e
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php
@@ -0,0 +1,284 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Unit\Observer;
+
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Signifyd\Api\CaseCreationServiceInterface;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Observer\PlaceOrder;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+class PlaceOrderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var CaseCreationServiceInterface|MockObject
+     */
+    private $creationService;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var Observer|MockObject
+     */
+    private $observer;
+
+    /**
+     * @var Event|MockObject
+     */
+    private $event;
+
+    /**
+     * @var OrderInterface|MockObject
+     */
+    private $orderEntity;
+
+    /**
+     * @var PlaceOrder
+     */
+    private $placeOrder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isActive'])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->creationService = $this->getMockBuilder(CaseCreationServiceInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['createForOrder'])
+            ->getMock();
+
+        $this->observer = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEvent'])
+            ->getMock();
+
+        $this->event = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+
+        $this->placeOrder = new PlaceOrder(
+            $this->config,
+            $this->creationService,
+            $this->logger
+        );
+    }
+
+    /**
+     * Checks a test case when Signifyd module is disabled.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     */
+    public function testExecuteWithDisabledModule()
+    {
+        $orderId = 1;
+        $storeId = 2;
+        $this->withActiveSignifydIntegration(false, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
+    /**
+     * Checks a test case when the observer event returns empty an order entity.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     */
+    public function testExecuteWithoutOrder()
+    {
+        $this->withActiveSignifydIntegration(true);
+        $this->withOrderEntity(null, null);
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
+    /**
+     * Checks a test case when the order placed with offline payment method.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     */
+    public function testExecuteWithOfflinePayment()
+    {
+        $orderId = 1;
+        $storeId = 2;
+        $this->withActiveSignifydIntegration(true, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+        $this->withAvailablePaymentMethod(false);
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
+    /**
+     * Checks a test case when case creation service fails.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     */
+    public function testExecuteWithFailedCaseCreation()
+    {
+        $orderId = 1;
+        $storeId = 2;
+        $exceptionMessage = __('Case with the same order id already exists.');
+
+        $this->withActiveSignifydIntegration(true, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+        $this->withAvailablePaymentMethod(true);
+
+        $this->creationService->method('createForOrder')
+            ->with(self::equalTo($orderId))
+            ->willThrowException(new AlreadyExistsException($exceptionMessage));
+
+        $this->logger->method('error')
+            ->with(self::equalTo($exceptionMessage));
+
+        $result = $this->placeOrder->execute($this->observer);
+        $this->assertNull($result);
+    }
+
+    /**
+     * Checks a test case when observer successfully calls case creation service.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     */
+    public function testExecute()
+    {
+        $orderId = 1;
+        $storeId = 2;
+
+        $this->withActiveSignifydIntegration(true, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+        $this->withAvailablePaymentMethod(true);
+
+        $this->creationService
+            ->method('createForOrder')
+            ->with(self::equalTo($orderId));
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
+    public function testExecuteWithOrderPendingPayment()
+    {
+        $orderId = 1;
+        $storeId = 2;
+
+        $this->withActiveSignifydIntegration(true, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+        $this->orderEntity->method('getState')
+            ->willReturn(Order::STATE_PENDING_PAYMENT);
+        $this->withAvailablePaymentMethod(true);
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
+    /**
+     * Specifies order entity mock execution.
+     *
+     * @param int|null $orderId
+     * @param int|null $storeId
+     * @return void
+     */
+    private function withOrderEntity($orderId, $storeId): void
+    {
+        $this->orderEntity = $this->getMockBuilder(OrderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->orderEntity->method('getEntityId')
+            ->willReturn($orderId);
+        $this->orderEntity->method('getStoreId')
+            ->willReturn($storeId);
+
+        $this->observer->method('getEvent')
+            ->willReturn($this->event);
+
+        $this->event->method('getData')
+            ->with('order')
+            ->willReturn($this->orderEntity);
+    }
+
+    /**
+     * Specifies config mock execution.
+     *
+     * @param bool $isActive
+     * @param int|null $storeId
+     * @return void
+     */
+    private function withActiveSignifydIntegration(bool $isActive, $storeId = null): void
+    {
+        $this->config->method('isActive')
+            ->with($storeId)
+            ->willReturn($isActive);
+    }
+
+    /**
+     * Specifies payment method mock execution.
+     *
+     * @param bool $isAvailable
+     * @return void
+     */
+    private function withAvailablePaymentMethod($isAvailable)
+    {
+        /** @var MethodInterface|MockObject $paymentMethod */
+        $paymentMethod = $this->getMockBuilder(MethodInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /**
+         * The code depends on implementation but not interface
+         * because order payment implements two interfaces
+         */
+        /** @var Payment|MockObject $orderPayment */
+        $orderPayment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderEntity->method('getPayment')
+            ->willReturn($orderPayment);
+
+        $orderPayment->method('getMethodInstance')
+            ->willReturn($paymentMethod);
+
+        $paymentMethod->method('isOffline')
+            ->willReturn(!$isAvailable);
+    }
+}
diff --git a/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
new file mode 100644
index 0000000000000..1e6234a8e27a9
--- /dev/null
+++ b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Ui\Component\Listing\Column\Guarantee;
+
+use Magento\Framework\Escaper;
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+/**
+ * Class Options
+ */
+class Options implements OptionSourceInterface
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * Constructor
+     *
+     * @param Escaper $escaper
+     */
+    public function __construct(Escaper $escaper)
+    {
+        $this->escaper = $escaper;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => CaseInterface::GUARANTEE_DECLINED,
+                'label' => $this->escaper->escapeHtml(__('Declined'))
+            ],
+            [
+                'value' => CaseInterface::GUARANTEE_APPROVED,
+                'label' => $this->escaper->escapeHtml(__('Approved'))
+            ],
+            [
+                'value' => CaseInterface::GUARANTEE_CANCELED,
+                'label' => $this->escaper->escapeHtml(__('Canceled'))
+            ],
+            [
+                'value' => CaseInterface::GUARANTEE_PENDING,
+                'label' => $this->escaper->escapeHtml(__('Pending'))
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json
new file mode 100644
index 0000000000000..992a74d0dc3ec
--- /dev/null
+++ b/app/code/Magento/Signifyd/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "magento/module-signifyd",
+    "description": "Submitting Case Entry to Signifyd on Order Creation",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-payment": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "suggest": {
+        "magento/module-config": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\Signifyd\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/Signifyd/etc/acl.xml b/app/code/Magento/Signifyd/etc/acl.xml
new file mode 100644
index 0000000000000..32f0493fbcad9
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/acl.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="Magento_Sales::fraud_protection" title="Fraud Protection Section" translate="title" />
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/adminhtml/di.xml b/app/code/Magento/Signifyd/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..c771d67216d43
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/adminhtml/di.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Signifyd\Model\QuoteSession\QuoteSessionInterface" type="Magento\Signifyd\Model\QuoteSession\Adminhtml\BackendSession" />
+</config>
diff --git a/app/code/Magento/Signifyd/etc/adminhtml/routes.xml b/app/code/Magento/Signifyd/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..c078ab3c8c4c1
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="signifyd" frontName="signifyd">
+            <module name="Magento_Signifyd" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..2dd75d2d91e5b
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="fraud_protection" translate="label" type="text" sortOrder="410" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Fraud Protection</label>
+            <tab>sales</tab>
+            <resource>Magento_Sales::fraud_protection</resource>
+            <group id="signifyd" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+                <fieldset_css>signifyd-logo-header</fieldset_css>
+                <group id="about" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <frontend_model>Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info</frontend_model>
+                    <fieldset_css>signifyd-about-header</fieldset_css>
+                    <label><![CDATA[Protect your store from fraud with Guaranteed Fraud Protection by Signifyd.]]></label>
+                    <comment><![CDATA[Signifyd automatically reviews your orders for fraud, telling you in seconds which orders to ship, and which to reject.
+                    We back our approvals with 100% chargeback protection, reimbursing you the full order amount plus fees should you ever receive a fraudulent chargeback.
+                    <p>Benefits:<ul>
+                    <li>Grow your business without fear of fraud</li>
+                    <li>Accept more orders and maximize your revenue</li>
+                    <li>Automate order review and shift fraud off your plate</li></ul></p>]]>
+                    </comment>
+                    <more_url>https://www.signifyd.com/magento-guaranteed-fraud-protection</more_url>
+                </group>
+                <group id="config" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <fieldset_css>signifyd-about-header</fieldset_css>
+                    <label>Configuration</label>
+                    <comment><![CDATA[<a href="https://www.signifyd.com/resources/manual/magento-2/signifyd-on-magento-integration-guide/" target="_blank">View our setup guide</a> for step-by-step instructions on how to integrate Signifyd with Magento.<br />For support contact <a href="mailto:support@signifyd.com">support@signifyd.com</a>.]]>
+                    </comment>
+                    <field id="active" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Enable this Solution</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>fraud_protection/signifyd/active</config_path>
+                    </field>
+                    <field id="api_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>API Key</label>
+                        <comment><![CDATA[Your API key can be found on the <a href="http://signifyd.com/settings" target="_blank">settings page</a> in the Signifyd console]]></comment>
+                        <config_path>fraud_protection/signifyd/api_key</config_path>
+                        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    </field>
+                    <field id="api_url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>API URL</label>
+                        <config_path>fraud_protection/signifyd/api_url</config_path>
+                        <comment>Don’t change unless asked to do so.</comment>
+                    </field>
+                    <field id="debug" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Debug</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <config_path>fraud_protection/signifyd/debug</config_path>
+                    </field>
+                    <field id="webhook_url" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Webhook URL</label>
+                        <comment><![CDATA[Your webhook URL will be used to <a href="https://app.signifyd.com/settings/notifications" target="_blank">configure</a> a guarantee completed webhook in Signifyd. Webhooks are used to sync Signifyd`s guarantee decisions back to Magento.]]></comment>
+                        <attribute type="handler_url">signifyd/webhooks/handler</attribute>
+                        <frontend_model>Magento\Signifyd\Block\Adminhtml\System\Config\Field\WebhookUrl</frontend_model>
+                    </field>
+                </group>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/config.xml b/app/code/Magento/Signifyd/etc/config.xml
new file mode 100644
index 0000000000000..804342a14bb08
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <fraud_protection>
+            <signifyd>
+                <active>0</active>
+                <api_url>https://api.signifyd.com/v2/</api_url>
+                <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <debug>0</debug>
+            </signifyd>
+        </fraud_protection>
+    </default>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/db_schema.xml b/app/code/Magento/Signifyd/etc/db_schema.xml
new file mode 100644
index 0000000000000..8d47321c38b29
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/db_schema.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="signifyd_case" resource="sales" engine="innodb" comment="signifyd_case">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity_id"/>
+        <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Order_id"/>
+        <column xsi:type="int" name="case_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Case_id"/>
+        <column xsi:type="boolean" name="guarantee_eligible" nullable="true" comment="Guarantee_eligible"/>
+        <column xsi:type="varchar" name="guarantee_disposition" nullable="true" length="32" default="PENDING"
+                comment="Guarantee_disposition"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="32" default="PENDING" comment="Status"/>
+        <column xsi:type="int" name="score" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Score"/>
+        <column xsi:type="text" name="associated_team" nullable="true" comment="Associated_team"/>
+        <column xsi:type="varchar" name="review_disposition" nullable="true" length="32" comment="Review_disposition"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created_at"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated_at"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SIGNIFYD_CASE_ORDER_ID_SALES_ORDER_ENTITY_ID" table="signifyd_case"
+                    column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="SET NULL"/>
+        <constraint xsi:type="unique" referenceId="SIGNIFYD_CASE_ORDER_ID">
+            <column name="order_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="SIGNIFYD_CASE_CASE_ID">
+            <column name="case_id"/>
+        </constraint>
+    </table>
+    <table name="sales_order_grid" resource="sales" comment="Sales Flat Order Grid">
+        <column xsi:type="varchar" name="signifyd_guarantee_status" nullable="true" length="32"
+                comment="Signifyd Guarantee Disposition Status"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/Signifyd/etc/db_schema_whitelist.json b/app/code/Magento/Signifyd/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..69d164b23d9e7
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/db_schema_whitelist.json
@@ -0,0 +1,28 @@
+{
+    "signifyd_case": {
+        "column": {
+            "entity_id": true,
+            "order_id": true,
+            "case_id": true,
+            "guarantee_eligible": true,
+            "guarantee_disposition": true,
+            "status": true,
+            "score": true,
+            "associated_team": true,
+            "review_disposition": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SIGNIFYD_CASE_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "SIGNIFYD_CASE_ORDER_ID": true,
+            "SIGNIFYD_CASE_CASE_ID": true
+        }
+    },
+    "sales_order_grid": {
+        "column": {
+            "signifyd_guarantee_status": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Signifyd/etc/di.xml b/app/code/Magento/Signifyd/etc/di.xml
new file mode 100644
index 0000000000000..fd78fff27f619
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/di.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Signifyd\Api\Data\CaseInterface" type="Magento\Signifyd\Model\CaseEntity" />
+    <preference for="Magento\Signifyd\Api\CaseRepositoryInterface" type="Magento\Signifyd\Model\CaseRepository" />
+    <preference for="Magento\Signifyd\Api\CaseManagementInterface" type="Magento\Signifyd\Model\CaseManagement" />
+    <preference for="Magento\Signifyd\Api\Data\CaseSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Signifyd\Api\CaseCreationServiceInterface" type="Magento\Signifyd\Model\CaseServices\CreationService" />
+    <preference for="Magento\Signifyd\Api\GuaranteeCreationServiceInterface" type="Magento\Signifyd\Model\Guarantee\CreationService" />
+    <preference for="Magento\Signifyd\Api\GuaranteeCancelingServiceInterface" type="Magento\Signifyd\Model\Guarantee\CancelingService" />
+    <preference for="Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface" type="Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilder" />
+
+    <virtualType name="SignifydAvsDefaultMapper" type="Magento\Signifyd\Model\PredefinedVerificationCode" />
+    <virtualType name="SignifydCvvDefaultMapper" type="Magento\Signifyd\Model\PredefinedVerificationCode" />
+
+    <type name="Magento\Signifyd\Model\PaymentVerificationFactory">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\Payment\Gateway\Config\Config</argument>
+            <argument name="avsDefaultAdapter" xsi:type="object">SignifydAvsDefaultMapper</argument>
+            <argument name="cvvDefaultAdapter" xsi:type="object">SignifydCvvDefaultMapper</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Signifyd\Model\SalesOrderGrid\OrderGridUpdater">
+        <arguments>
+            <argument name="entityGrid" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Grid</argument>
+        </arguments>
+    </type>
+    <virtualType name="SignifydIdListProvider" type="Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="signifyd" xsi:type="string">Magento\Signifyd\Model\SalesOrderGrid\NotSyncedOrderIdListProvider</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Sales\Model\ResourceModel\Order\Grid">
+        <arguments>
+            <argument name="idListProvider" xsi:type="object">SignifydIdListProvider</argument>
+            <argument name="joins" xsi:type="array">
+                <item name="signifyd_case" xsi:type="array">
+                    <item name="table" xsi:type="string">signifyd_case</item>
+                    <item name="origin_column" xsi:type="string">entity_id</item>
+                    <item name="target_column" xsi:type="string">order_id</item>
+                </item>
+            </argument>
+            <argument name="columns" xsi:type="array">
+                <item name="signifyd_guarantee_status" xsi:type="string">signifyd_case.guarantee_disposition</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Signifyd\Model\ResourceModel\CaseEntity">
+        <arguments>
+            <argument name="connectionName" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <virtualType name="PaymentMapperSchemaLocator" type="Magento\Framework\Config\GenericSchemaLocator">
+        <arguments>
+            <argument name="moduleName" xsi:type="string">Magento_Signifyd</argument>
+            <argument name="schema" xsi:type="string">signifyd_payment_mapping.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="PaymentMapperConfigReader" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter</argument>
+            <argument name="schemaLocator" xsi:type="object">PaymentMapperSchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">signifyd_payment_mapping.xml</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="PaymentMethodConfigData" type="Magento\Framework\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">PaymentMapperConfigReader</argument>
+            <argument name="cacheId" xsi:type="string">signifyd_payment_list_cache</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Signifyd\Model\PaymentMethodMapper\PaymentMethodMapper">
+        <arguments>
+            <argument name="paymentMapping" xsi:type="object">PaymentMethodConfigData</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Model\Config\TypePool">
+        <arguments>
+            <argument name="sensitive" xsi:type="array">
+                <item name="fraud_protection/signifyd/api_key" xsi:type="string">1</item>
+                <item name="fraud_protection/signifyd/api_url" xsi:type="string">1</item>
+            </argument>
+            <argument name="environment" xsi:type="array">
+                <item name="fraud_protection/signifyd/api_key" xsi:type="string">1</item>
+                <item name="fraud_protection/signifyd/api_url" xsi:type="string">1</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Sales\Model\Order">
+        <plugin name="cancelGuaranteeAfterOrderCancel" type="Magento\Signifyd\Plugin\OrderPlugin" />
+    </type>
+    <type name="Magento\Payment\Model\MethodInterface">
+        <plugin name="cancelGuaranteeAfterPaymentDeny" type="Magento\Signifyd\Plugin\PaymentPlugin" />
+    </type>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/events.xml b/app/code/Magento/Signifyd/etc/events.xml
new file mode 100644
index 0000000000000..d44665f9fb97b
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/events.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="checkout_submit_all_after">
+        <observer name="signifyd_place_order_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
+    </event>
+    <event name="paypal_checkout_success">
+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
+    </event>
+    <event name="checkout_onepage_controller_success_action">
+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
+    </event>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/frontend/di.xml b/app/code/Magento/Signifyd/etc/frontend/di.xml
new file mode 100644
index 0000000000000..08a690d1a9930
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/frontend/di.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Signifyd\Model\QuoteSession\QuoteSessionInterface" type="Magento\Signifyd\Model\QuoteSession\FrontendSession" />
+</config>
diff --git a/app/code/Magento/Signifyd/etc/frontend/routes.xml b/app/code/Magento/Signifyd/etc/frontend/routes.xml
new file mode 100644
index 0000000000000..5803f59d8624b
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/frontend/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="standard">
+        <route id="signifyd" frontName="signifyd">
+            <module name="Magento_Signifyd" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/module.xml b/app/code/Magento/Signifyd/etc/module.xml
new file mode 100644
index 0000000000000..264f295e8c528
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/module.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_Signifyd" >
+        <sequence>
+            <module name="Magento_Sales" />
+            <module name="Magento_Store" />
+            <module name="Magento_Customer" />
+            <module name="Magento_Directory" />
+            <module name="Magento_Checkout" />
+            <module name="Magento_Backend" />
+            <module name="Magento_Payment" />
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml
new file mode 100644
index 0000000000000..096a968167173
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ /**
+  * Custom payment method might adds a block in payment_method_list e.g.
+  *      <payment_method>
+  *         <magento_code>custom_payment_method</magento_code>
+  *         <signifyd_code>PAYMENT_CARD</signifyd_code>
+  *     </payment_method>
+  *  Appropriate value for the <signifyd_code> tag from Signifyd documentation:
+  *  @see https://www.signifyd.com/docs/api/#/reference/webhooks/manage-single-webhooks/create-a-case
+  *  Create a Case -> Request -> ATTRIBUTES -> paymentMethod
+  */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Signifyd:etc/signifyd_payment_mapping.xsd">
+    <payment_method_list>
+        <payment_method>
+            <magento_code>braintree</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>braintree_paypal</magento_code>
+            <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>paypal_express</magento_code>
+            <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>paypal_express_bml</magento_code>
+            <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payflow_express</magento_code>
+            <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payflow_express_bml</magento_code>
+            <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payflowpro</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payflow_link</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>payflow_advanced</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>hosted_pro</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>authorizenet_directpost</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>worldpay</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>eway</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>cybersource</magento_code>
+            <signifyd_code>PAYMENT_CARD</signifyd_code>
+        </payment_method>
+        <payment_method>
+            <magento_code>free</magento_code>
+            <signifyd_code>FREE</signifyd_code>
+        </payment_method>
+    </payment_method_list>
+</config>
diff --git a/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd
new file mode 100644
index 0000000000000..f48805c328e09
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="payment_method_list" type="payment_method_list"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:complexType name="payment_method_list">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="payment_method" type="payment_method"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="payment_method">
+        <xs:sequence>
+            <xs:element minOccurs="1" name="magento_code"/>
+            <xs:element minOccurs="1" name="signifyd_code"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
diff --git a/app/code/Magento/Signifyd/i18n/en_US.csv b/app/code/Magento/Signifyd/i18n/en_US.csv
new file mode 100644
index 0000000000000..40772188dac9e
--- /dev/null
+++ b/app/code/Magento/Signifyd/i18n/en_US.csv
@@ -0,0 +1,46 @@
+OPEN,Open
+PROCESSING,Processing
+FLAGGED,Flagged
+DISMISSED,Dismissed
+HELD,Held
+GOOD,Good
+FRAUDULENT,Fraudulent
+UNSET,Unset
+NULL,Unset
+APPROVED,Approved
+DECLINED,Declined
+PENDING,Pending
+CANCELED,Canceled
+IN_REVIEW,"In review"
+Approved,Approved
+Declined,Declined
+Pending,Pending
+Canceled,Canceled
+"In Review","In Review"
+Unrequested,Unrequested
+"Learn more","Learn more"
+"This order already has associated case entity","This order already has associated case entity"
+"The case entity should not be empty.","The case entity should not be empty."
+"Cannot update Case entity.","Cannot update Case entity."
+"The ""%1"" should not be empty.","The ""%1"" should not be empty."
+"Case entity not found.","Case entity not found."
+"Case Update: New score for the order is %1. Previous score was %2.","Case Update: New score for the order is %1. Previous score was %2."
+"Awaiting the Signifyd guarantee disposition.","Awaiting the Signifyd guarantee disposition."
+"Only single entrance of ""%1"" node is required.","Only single entrance of ""%1"" node is required."
+"Not empty value for ""%1"" node is required.","Not empty value for ""%1"" node is required."
+"%1 must implement %2","%1 must implement %2"
+Error,Error
+"Cannot generate message.","Cannot generate message."
+"Message is generated.","Message is generated."
+"Case with the same order id already exists.","Case with the same order id already exists."
+"Fraud Protection Information","Fraud Protection Information"
+"Signifyd Guarantee Decision","Signifyd Guarantee Decision"
+"Fraud Protection Section","Fraud Protection Section"
+"Fraud Protection","Fraud Protection"
+"Protect your store from fraud with Guaranteed Fraud Protection by Signifyd.","Protect your store from fraud with Guaranteed Fraud Protection by Signifyd."
+Configuration,Configuration
+"Enable this Solution","Enable this Solution"
+"API Key","API Key"
+"API URL","API URL"
+Debug,Debug
+"Webhook URL","Webhook URL"
diff --git a/app/code/Magento/Signifyd/registration.php b/app/code/Magento/Signifyd/registration.php
new file mode 100644
index 0000000000000..72b11f7eac214
--- /dev/null
+++ b/app/code/Magento/Signifyd/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Signifyd', __DIR__);
diff --git a/app/code/Magento/Signifyd/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Signifyd/view/adminhtml/layout/sales_order_view.xml
new file mode 100644
index 0000000000000..ad62b2c6e01cf
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/adminhtml/layout/sales_order_view.xml
@@ -0,0 +1,14 @@
+<?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="order_additional_info">
+            <block class="Magento\Signifyd\Block\Adminhtml\CaseInfo"  name="order_case_info" template="Magento_Signifyd::case_info.phtml"/>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml b/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml
new file mode 100644
index 0000000000000..a42b7f93b5b92
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/adminhtml/templates/case_info.phtml
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+?>
+<?php /** @var $block Magento\Signifyd\Block\Adminhtml\CaseInfo */ ?>
+<?php
+
+    if ($block->isEmptyCase()) {
+        return '';
+    }
+?>
+<section class="admin__page-section order-case-info">
+    <div class="admin__page-section-title">
+        <span class="title"><?= $block->escapeHtml(__('Fraud Protection Information')) ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item case-information">
+            <div class="admin__table-wrapper">
+                <table class="admin__table-secondary order-case-table">
+                    <tbody>
+                    <tr>
+                        <th class="col-guarantee-disposition"><?= $block->escapeHtml(__('Signifyd Guarantee Decision')) ?></th>
+                        <td class="col-guarantee-disposition"><?= $block->escapeHtml($block->getCaseGuaranteeDisposition()) ?></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/app/code/Magento/Signifyd/view/adminhtml/ui_component/sales_order_grid.xml b/app/code/Magento/Signifyd/view/adminhtml/ui_component/sales_order_grid.xml
new file mode 100644
index 0000000000000..91053d617f31f
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/adminhtml/ui_component/sales_order_grid.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ /**
+  ~  * Copyright © Magento, Inc. All rights reserved.
+  ~  * See COPYING.txt for license details.
+  ~  */
+  -->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <columns name="sales_order_columns">
+        <column name="signifyd_guarantee_status" component="Magento_Ui/js/grid/columns/select">
+            <settings>
+                <filter>select</filter>
+                <options class="Magento\Signifyd\Ui\Component\Listing\Column\Guarantee\Options"/>
+                <visible>true</visible>
+                <dataType>select</dataType>
+                <label translate="true">Signifyd Guarantee Decision</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/Signifyd/view/adminhtml/web/images/logo.png b/app/code/Magento/Signifyd/view/adminhtml/web/images/logo.png
new file mode 100644
index 0000000000000..7c6645e7c6c93
Binary files /dev/null and b/app/code/Magento/Signifyd/view/adminhtml/web/images/logo.png differ
diff --git a/app/code/Magento/Signifyd/view/adminhtml/web/js/request-send.js b/app/code/Magento/Signifyd/view/adminhtml/web/js/request-send.js
new file mode 100644
index 0000000000000..f55170336ca03
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/adminhtml/web/js/request-send.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'mageUtils',
+    'Magento_Ui/js/form/components/button'
+], function (utils, Button) {
+    'use strict';
+
+    return Button.extend({
+
+        /**
+         * Creates and submits form for Guarantee create/cancel
+         */
+        sendRequest: function () {
+            utils.submit({
+                url: this.requestURL,
+                data: this.data
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/Signifyd/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Signifyd/view/frontend/layout/checkout_cart_index.xml
new file mode 100644
index 0000000000000..30472ae5e9ae9
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/frontend/layout/checkout_cart_index.xml
@@ -0,0 +1,14 @@
+<?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="head.components">
+            <block class="Magento\Signifyd\Block\Fingerprint" name="signifyd.fingerprint" />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Signifyd/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Signifyd/view/frontend/layout/checkout_index_index.xml
new file mode 100644
index 0000000000000..30472ae5e9ae9
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/frontend/layout/checkout_index_index.xml
@@ -0,0 +1,14 @@
+<?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="head.components">
+            <block class="Magento\Signifyd\Block\Fingerprint" name="signifyd.fingerprint" />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml b/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml
new file mode 100644
index 0000000000000..356bab9c62ded
--- /dev/null
+++ b/app/code/Magento/Signifyd/view/frontend/templates/fingerprint.phtml
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+/** @var $block Magento\Signifyd\Block\Fingerprint */
+?>
+<?php if ($block->isModuleActive()): ?>
+    <script
+        async
+        id="sig-api"
+        data-order-session-id="<?= $block->escapeHtml($block->getSignifydOrderSessionId()) ?>"
+        src="https://cdn-scripts.signifyd.com/api/script-tag.js">
+    </script>
+<?php endif; ?>
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
index ffc2bf5f6d1cf..b4e54104bdfb4 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -3,17 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-/**
- * Sitemap grid link column renderer
- *
- */
 namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Sitemap grid link column renderer
+ */
 class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
@@ -62,6 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
     {
         /** @var $sitemap \Magento\Sitemap\Model\Sitemap */
         $sitemap = $this->_sitemapFactory->create();
+        $sitemap->setStoreId($row->getStoreId());
         $url = $this->escapeHtml($sitemap->getSitemapUrl($row->getSitemapPath(), $row->getSitemapFilename()));
 
         $fileName = preg_replace('/^\//', '', $row->getSitemapPath() . $row->getSitemapFilename());
diff --git a/app/code/Magento/Sitemap/Block/Robots.php b/app/code/Magento/Sitemap/Block/Robots.php
index 7c3691cbe7b52..ac99b2ab1cd4a 100644
--- a/app/code/Magento/Sitemap/Block/Robots.php
+++ b/app/code/Magento/Sitemap/Block/Robots.php
@@ -22,11 +22,6 @@
  */
 class Robots extends AbstractBlock implements IdentityInterface
 {
-    /**
-     * @var StoreResolver
-     */
-    private $storeResolver;
-
     /**
      * @var CollectionFactory
      */
@@ -49,6 +44,8 @@ class Robots extends AbstractBlock implements IdentityInterface
      * @param SitemapHelper $sitemapHelper
      * @param StoreManagerInterface $storeManager
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
@@ -58,7 +55,6 @@ public function __construct(
         StoreManagerInterface $storeManager,
         array $data = []
     ) {
-        $this->storeResolver = $storeResolver;
         $this->sitemapCollectionFactory = $sitemapCollectionFactory;
         $this->sitemapHelper = $sitemapHelper;
         $this->storeManager = $storeManager;
@@ -78,11 +74,10 @@ public function __construct(
      */
     protected function _toHtml()
     {
-        $defaultStoreId = $this->storeResolver->getCurrentStoreId();
-        $defalutStore = $this->storeManager->getStore($defaultStoreId);
+        $defaultStore = $this->storeManager->getDefaultStoreView();
 
         /** @var \Magento\Store\Model\Website $website */
-        $website = $this->storeManager->getWebsite($defalutStore->getWebsiteId());
+        $website = $this->storeManager->getWebsite($defaultStore->getWebsiteId());
 
         $storeIds = [];
         foreach ($website->getStoreIds() as $storeId) {
@@ -138,7 +133,7 @@ protected function getSitemapLinks(array $storeIds)
     public function getIdentities()
     {
         return [
-            Value::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
+            Value::CACHE_TAG . '_' . $this->storeManager->getDefaultStoreView()->getId(),
         ];
     }
 }
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
index f0be0fe7ab682..29d50ea8408fd 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
@@ -53,28 +53,32 @@ public function execute()
                 $sitemap->load($id);
                 // delete file
                 $sitemapPath = $sitemap->getSitemapPath();
+                if ($sitemapPath && $sitemapPath[0] === DIRECTORY_SEPARATOR) {
+                    $sitemapPath = mb_substr($sitemapPath, 1);
+                }
                 $sitemapFilename = $sitemap->getSitemapFilename();
-
-                $path = $directory->getRelativePath($sitemapPath . $sitemapFilename);
+                $path = $directory->getRelativePath(
+                    $sitemapPath .$sitemapFilename
+                );
                 if ($sitemap->getSitemapFilename() && $directory->isFile($path)) {
                     $directory->delete($path);
                 }
                 $sitemap->delete();
                 // display success message
-                $this->messageManager->addSuccess(__('You deleted the sitemap.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the sitemap.'));
                 // go to grid
                 $this->_redirect('adminhtml/*/');
                 return;
             } catch (\Exception $e) {
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 $this->_redirect('adminhtml/*/edit', ['sitemap_id' => $id]);
                 return;
             }
         }
         // display error message
-        $this->messageManager->addError(__('We can\'t find a sitemap to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a sitemap to delete.'));
         // go to grid
         $this->_redirect('adminhtml/*/');
     }
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
index 04ab4f8725e0e..111353550b9cd 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
@@ -41,7 +41,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This sitemap no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This sitemap no longer exists.'));
                 $this->_redirect('adminhtml/*/');
                 return;
             }
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 67d2ce4f4f148..9592ab6f57c55 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -6,8 +6,29 @@
  */
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
+use Magento\Backend\App\Action;
+use Magento\Store\Model\App\Emulation;
+use Magento\Framework\App\ObjectManager;
+
 class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
+    /** @var \Magento\Store\Model\App\Emulation $appEmulation */
+    private $appEmulation;
+
+    /**
+     * Generate constructor.
+     * @param Action\Context $context
+     * @param \Magento\Store\Model\App\Emulation|null $appEmulation
+     */
+    public function __construct(
+        Action\Context $context,
+        Emulation $appEmulation = null
+    ) {
+        parent::__construct($context);
+        $this->appEmulation = $appEmulation ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\App\Emulation::class);
+    }
+
     /**
      * Generate sitemap
      *
@@ -23,18 +44,26 @@ public function execute()
         // if sitemap record exists
         if ($sitemap->getId()) {
             try {
+                //We need to emulate to get the correct frontend URL for the product images
+                $this->appEmulation->startEnvironmentEmulation(
+                    $sitemap->getStoreId(),
+                    \Magento\Framework\App\Area::AREA_FRONTEND,
+                    true
+                );
                 $sitemap->generateXml();
 
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('We can\'t generate the sitemap right now.'));
+                $this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
+            } finally {
+                $this->appEmulation->stopEnvironmentEmulation();
             }
         } else {
-            $this->messageManager->addError(__('We can\'t find a sitemap to generate.'));
+            $this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));
         }
 
         // go to grid
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
index 5f2cc805de0fc..e6823c6070a1b 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Backend\App\Action;
 
-class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface
 {
     /**
      * Index action
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
index 5c38cc68e6ef7..1e0d1cb248f00 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
@@ -30,7 +30,7 @@ protected function validatePath(array $data)
             $validator->setPaths($helper->getValidPaths());
             if (!$validator->isValid($path)) {
                 foreach ($validator->getMessages() as $message) {
-                    $this->messageManager->addError($message);
+                    $this->messageManager->addErrorMessage($message);
                 }
                 // save data in session
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData($data);
@@ -83,13 +83,13 @@ protected function saveData($data)
             // save the data
             $model->save();
             // display success message
-            $this->messageManager->addSuccess(__('You saved the sitemap.'));
+            $this->messageManager->addSuccessMessage(__('You saved the sitemap.'));
             // clear previously saved data from session
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData(false);
             return $model->getId();
         } catch (\Exception $e) {
             // display error message
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             // save data in session
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData($data);
         }
diff --git a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php
index d69b8e6d44815..7a6d28259bfed 100644
--- a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php
+++ b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php
@@ -15,9 +15,11 @@
 use Magento\Framework\Registry;
 use Magento\Robots\Model\Config\Value as RobotsValue;
 use Magento\Store\Model\StoreResolver;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Backend model for sitemap/search_engines/submission_robots configuration value.
+ *
  * Required to implement Page Cache functionality.
  */
 class Robots extends Value implements IdentityInterface
@@ -30,9 +32,9 @@ class Robots extends Value implements IdentityInterface
     protected $_cacheTag = true;
 
     /**
-     * @var StoreResolver
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @param Context $context
@@ -40,9 +42,12 @@ class Robots extends Value implements IdentityInterface
      * @param ScopeConfigInterface $config
      * @param TypeListInterface $cacheTypeList
      * @param StoreResolver $storeResolver
+     * @param StoreManagerInterface|null $storeManager
      * @param AbstractResource|null $resource
      * @param AbstractDb|null $resourceCollection
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Context $context,
@@ -50,11 +55,13 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         StoreResolver $storeResolver,
+        StoreManagerInterface $storeManager = null,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
         array $data = []
     ) {
-        $this->storeResolver = $storeResolver;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
 
         parent::__construct(
             $context,
@@ -75,7 +82,7 @@ public function __construct(
     public function getIdentities()
     {
         return [
-            RobotsValue::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(),
+            RobotsValue::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(),
         ];
     }
 }
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index 3ae3061310a0b..a536ec998b827 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -19,6 +19,8 @@ class Observer
 
     /**
      * Cronjob expression configuration
+     *
+     * @deprecated Use \Magento\Cron\Model\Config\Backend\Sitemap::CRON_STRING_PATH instead.
      */
     const XML_PATH_CRON_EXPR = 'crontab/default/jobs/generate_sitemaps/schedule/cron_expr';
 
@@ -113,7 +115,6 @@ public function scheduledGenerateSitemaps()
                 $sitemap->generateXml();
             } catch (\Exception $e) {
                 $errors[] = $e->getMessage();
-                throw $e;
             }
         }
 
@@ -122,8 +123,7 @@ public function scheduledGenerateSitemaps()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
-            $translate = $this->_translateModel->getTranslateInline();
-            $this->_translateModel->setTranslateInline(false);
+            $this->inlineTranslation->suspend();
 
             $this->_transportBuilder->setTemplateIdentifier(
                 $this->_scopeConfig->getValue(
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 0a3e36570ca2f..82024b3b015e5 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -5,9 +5,12 @@
  */
 namespace Magento\Sitemap\Model\ResourceModel\Catalog;
 
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Store\Model\Store;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Catalog\Helper\Product as HelperProduct;
 
 /**
  * Sitemap resource product collection model
@@ -90,6 +93,20 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     private $catalogImageHelper;
 
     /**
+     * @var UrlBuilder
+     */
+    private $imageUrlBuilder;
+
+    /**
+     * Scope Config
+     *
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Product constructor.
+     *
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Sitemap\Helper\Data $sitemapData
      * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
@@ -102,6 +119,8 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param string $connectionName
      * @param \Magento\Catalog\Model\Product $productModel
      * @param \Magento\Catalog\Helper\Image $catalogImageHelper
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
+     * @param UrlBuilder $urlBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -116,7 +135,9 @@ public function __construct(
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
         $connectionName = null,
         \Magento\Catalog\Model\Product $productModel = null,
-        \Magento\Catalog\Helper\Image $catalogImageHelper = null
+        \Magento\Catalog\Helper\Image $catalogImageHelper = null,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null,
+        UrlBuilder $urlBuilder = null
     ) {
         $this->_productResource = $productResource;
         $this->_storeManager = $storeManager;
@@ -127,12 +148,19 @@ public function __construct(
         $this->_mediaConfig = $mediaConfig;
         $this->_sitemapData = $sitemapData;
         $this->productModel = $productModel ?: ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
+        $this->catalogImageHelper = $catalogImageHelper;
+        $this->imageUrlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
         $this->catalogImageHelper = $catalogImageHelper ?: ObjectManager::getInstance()
             ->get(\Magento\Catalog\Helper\Image::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+
         parent::__construct($context, $connectionName);
     }
 
     /**
+     * Construct
+     *
      * @return void
      */
     protected function _construct()
@@ -147,7 +175,9 @@ protected function _construct()
      * @param string $attributeCode
      * @param mixed $value
      * @param string $type
+     *
      * @return \Magento\Framework\DB\Select|bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
     {
@@ -193,7 +223,9 @@ protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
      * @param int $storeId
      * @param string $attributeCode
      * @param string $column Add attribute value to given column
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _joinAttribute($storeId, $attributeCode, $column = null)
     {
@@ -236,7 +268,9 @@ protected function _joinAttribute($storeId, $attributeCode, $column = null)
      * Get attribute data by attribute code
      *
      * @param string $attributeCode
+     *
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _getAttribute($attributeCode)
     {
@@ -259,7 +293,11 @@ protected function _getAttribute($attributeCode)
      * Get category collection array
      *
      * @param null|string|bool|int|Store $storeId
+     *
      * @return array|bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Zend_Db_Statement_Exception
      */
     public function getCollection($storeId)
     {
@@ -272,6 +310,10 @@ public function getCollection($storeId)
         }
 
         $connection = $this->getConnection();
+        $urlsConfigCondition = '';
+        if ($this->isCategoryProductURLsConfig($storeId)) {
+            $urlsConfigCondition = 'NOT ';
+        }
 
         $this->_select = $connection->select()->from(
             ['e' => $this->getMainTable()],
@@ -282,7 +324,8 @@ public function getCollection($storeId)
             []
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
-            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS NULL'
+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS '
+            . $urlsConfigCondition . 'NULL'
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),
             ['url' => 'request_path']
@@ -319,7 +362,9 @@ public function getCollection($storeId)
      *
      * @param array $productRow
      * @param int $storeId
+     *
      * @return \Magento\Framework\DataObject
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _prepareProduct(array $productRow, $storeId)
     {
@@ -434,19 +479,29 @@ public function prepareSelectStatement(\Magento\Framework\DB\Select $select)
     }
 
     /**
-     * Get product image URL from image filename and path
+     * Get product image URL from image filename
      *
      * @param string $image
      * @return string
      */
     private function getProductImageUrl($image)
     {
-        $productObject = $this->productModel;
-        $imgUrl = $this->catalogImageHelper
-            ->init($productObject, 'product_page_image_large')
-            ->setImageFile($image)
-            ->getUrl();
+        return $this->imageUrlBuilder->getUrl($image, 'product_page_image_large');
+    }
 
-        return $imgUrl;
+    /**
+     * Return Use Categories Path for Product URLs config value
+     *
+     * @param null|string $storeId
+     *
+     * @return bool
+     */
+    private function isCategoryProductURLsConfig($storeId)
+    {
+        return $this->scopeConfig->isSetFlag(
+            HelperProduct::XML_PATH_PRODUCT_URL_USE_CATEGORY,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
     }
 }
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
index d050ea84ecccb..01addd0c19666 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
@@ -6,12 +6,15 @@
 namespace Magento\Sitemap\Model\ResourceModel\Cms;
 
 use Magento\Cms\Api\Data\PageInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Model\ResourceModel\Db\Context;
-use Magento\Framework\Model\AbstractModel;
+use Magento\Cms\Api\GetUtilityPageIdentifiersInterface;
 use Magento\Cms\Model\Page as CmsPage;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
 
 /**
  * Sitemap cms page collection model
@@ -19,7 +22,7 @@
  * @api
  * @since 100.0.2
  */
-class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Page extends AbstractDb
 {
     /**
      * @var MetadataPool
@@ -34,19 +37,29 @@ class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $entityManager;
 
     /**
-     * @param Context $context
-     * @param MetadataPool $metadataPool
-     * @param EntityManager $entityManager
-     * @param string $connectionName
+     * @var GetUtilityPageIdentifiersInterface
+     * @since 100.2.0
+     */
+    private $getUtilityPageIdentifiers;
+
+    /**
+     * @param Context                            $context
+     * @param MetadataPool                       $metadataPool
+     * @param EntityManager                      $entityManager
+     * @param string                             $connectionName
+     * @param GetUtilityPageIdentifiersInterface $getUtilityPageIdentifiers
      */
     public function __construct(
         Context $context,
         MetadataPool $metadataPool,
         EntityManager $entityManager,
-        $connectionName = null
+        $connectionName = null,
+        GetUtilityPageIdentifiersInterface $getUtilityPageIdentifiers = null
     ) {
-        $this->metadataPool = $metadataPool;
-        $this->entityManager = $entityManager;
+        $this->metadataPool      = $metadataPool;
+        $this->entityManager     = $entityManager;
+        $this->getUtilityPageIdentifiers = $getUtilityPageIdentifiers ?:
+            ObjectManager::getInstance()->get(GetUtilityPageIdentifiersInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -90,8 +103,8 @@ public function getCollection($storeId)
         )->where(
             'main_table.is_active = 1'
         )->where(
-            'main_table.identifier != ?',
-            \Magento\Cms\Model\Page::NOROUTE_PAGE_ID
+            'main_table.identifier NOT IN (?)',
+            $this->getUtilityPageIdentifiers->execute()
         )->where(
             'store_table.store_id IN(?)',
             [0, $storeId]
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 0136890afcd61..d58ff732c81d7 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -42,6 +42,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
 
     const TYPE_URL = 'url';
 
+    /**
+     * Last mode date min value
+     */
+    const LAST_MOD_MIN_VAL = '0000-01-01 00:00:00';
+
     /**
      * Real file path
      *
@@ -177,6 +182,13 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      */
     private $sitemapItemFactory;
 
+    /**
+     * Last mode min timestamp value
+     *
+     * @var int
+     */
+    private $lastModMinTsVal;
+
     /**
      * Initialize dependencies.
      *
@@ -634,7 +646,7 @@ protected function _finalizeSitemap($type = self::TYPE_URL)
      */
     protected function _getCurrentSitemapFilename($index)
     {
-        return self::INDEX_FILE_PREFIX . '-' . $this->getStoreId() . '-' . $index . '.xml';
+        return str_replace('.xml', '', $this->getSitemapFilename()) . '-' . $this->getStoreId() . '-' . $index . '.xml';
     }
 
     /**
@@ -694,7 +706,11 @@ protected function _getMediaUrl($url)
      */
     protected function _getFormattedLastmodDate($date)
     {
-        return date('c', strtotime($date));
+        if ($this->lastModMinTsVal === null) {
+            $this->lastModMinTsVal = strtotime(self::LAST_MOD_MIN_VAL);
+        }
+        $timestamp = max(strtotime($date), $this->lastModMinTsVal);
+        return date('c', $timestamp);
     }
 
     /**
diff --git a/app/code/Magento/Sitemap/Setup/InstallSchema.php b/app/code/Magento/Sitemap/Setup/InstallSchema.php
deleted file mode 100644
index eaf4effeb3684..0000000000000
--- a/app/code/Magento/Sitemap/Setup/InstallSchema.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sitemap\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'sitemap'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('sitemap')
-        )->addColumn(
-            'sitemap_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Sitemap Id'
-        )->addColumn(
-            'sitemap_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Sitemap Type'
-        )->addColumn(
-            'sitemap_filename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Sitemap Filename'
-        )->addColumn(
-            'sitemap_path',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Sitemap Path'
-        )->addColumn(
-            'sitemap_time',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true],
-            'Sitemap Time'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store id'
-        )->addIndex(
-            $installer->getIdxName('sitemap', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('sitemap', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'XML Sitemap'
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE.txt b/app/code/Magento/Sitemap/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE.txt
rename to app/code/Magento/Sitemap/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE_AFL.txt b/app/code/Magento/Sitemap/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE_AFL.txt
rename to app/code/Magento/Sitemap/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Sitemap/Test/Mftf/README.md b/app/code/Magento/Sitemap/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8d506744827f6
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sitemap Functional Tests
+
+The Functional Test Module for **Magento Sitemap** module.
diff --git a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
index 6fcd247ab1f0f..b7cfd2028b75f 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sitemap\Test\Unit\Block;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -77,6 +79,7 @@ protected function setUp()
         $this->sitemapCollectionFactory = $this->getMockBuilder(
             \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory::class
         )
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -109,12 +112,17 @@ public function testToHtmlRobotsSubmissionIsDisabled()
         $this->initEventManagerMock($expected);
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
-            ->willReturn($defaultStoreId);
-
         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
             ->getMockForAbstractClass();
+
+        $storeMock->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn($defaultWebsiteId);
+
+        $this->storeManager->expects($this->once())
+            ->method('getDefaultStoreView')
+            ->willReturn($storeMock);
+
         $storeMock->expects($this->any())
             ->method('getWebsiteId')
             ->willReturn($defaultWebsiteId);
@@ -126,10 +134,6 @@ public function testToHtmlRobotsSubmissionIsDisabled()
             ->method('getStoreIds')
             ->willReturn([$defaultStoreId]);
 
-        $this->storeManager->expects($this->once())
-            ->method('getStore')
-            ->with($defaultStoreId)
-            ->willReturn($storeMock);
         $this->storeManager->expects($this->once())
             ->method('getWebsite')
             ->with($defaultWebsiteId)
@@ -165,12 +169,13 @@ public function testAfterGetDataRobotsSubmissionIsEnabled()
         $this->initEventManagerMock($expected);
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
-            ->willReturn($defaultStoreId);
-
         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
             ->getMockForAbstractClass();
+
+        $this->storeManager->expects($this->once())
+            ->method('getDefaultStoreView')
+            ->willReturn($storeMock);
+
         $storeMock->expects($this->any())
             ->method('getWebsiteId')
             ->willReturn($defaultWebsiteId);
@@ -182,10 +187,6 @@ public function testAfterGetDataRobotsSubmissionIsEnabled()
             ->method('getStoreIds')
             ->willReturn([$defaultStoreId, $secondStoreId]);
 
-        $this->storeManager->expects($this->once())
-            ->method('getStore')
-            ->with($defaultStoreId)
-            ->willReturn($storeMock);
         $this->storeManager->expects($this->once())
             ->method('getWebsite')
             ->with($defaultWebsiteId)
@@ -228,8 +229,14 @@ public function testGetIdentities()
     {
         $storeId = 1;
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
+
+        $this->storeManager->expects($this->once())
+            ->method('getDefaultStoreView')
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->once())
+            ->method('getId')
             ->willReturn($storeId);
 
         $expected = [
diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
deleted file mode 100644
index ed004fe88b318..0000000000000
--- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sitemap\Test\Unit\Controller\Adminhtml\Sitemap;
-
-class DeleteTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Sitemap\Controller\Adminhtml\Sitemap\Delete
-     */
-    private $deleteController;
-
-    /**
-     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $filesystemMock;
-
-    /**
-     * @var \Magento\Sitemap\Model\SitemapFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $sitemapFactoryMock;
-
-    /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $requestMock;
-
-    /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $responseMock;
-
-    /**
-     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $messageManagerMock;
-
-    protected function setUp()
-    {
-        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->sitemapFactoryMock = $this->getMockBuilder(\Magento\Sitemap\Model\SitemapFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setRedirect'])
-            ->getMockForAbstractClass();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->deleteController = $objectManagerHelper->getObject(
-            \Magento\Sitemap\Controller\Adminhtml\Sitemap\Delete::class,
-            [
-                'request' => $this->requestMock,
-                'response' => $this->responseMock,
-                'messageManager' => $this->messageManagerMock,
-                'filesystem' => $this->filesystemMock,
-                'sitemapFactory' => $this->sitemapFactoryMock
-            ]
-        );
-    }
-
-    public function testExecuteWithoutSitemapId()
-    {
-        $writeDirectoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($writeDirectoryMock);
-        $this->requestMock->expects($this->any())->method('getParam')->with('sitemap_id')->willReturn(0);
-        $this->responseMock->expects($this->once())->method('setRedirect');
-        $this->messageManagerMock->expects($this->any())
-            ->method('addError')
-            ->with('We can\'t find a sitemap to delete.');
-
-        $this->deleteController->execute();
-    }
-
-    public function testExecuteCannotFindSitemap()
-    {
-        $id = 1;
-        $writeDirectoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($writeDirectoryMock);
-        $this->requestMock->expects($this->any())->method('getParam')->with('sitemap_id')->willReturn($id);
-
-        $sitemapMock = $this->getMockBuilder(\Magento\Sitemap\Model\Sitemap::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['load'])
-            ->getMock();
-
-        $sitemapMock->expects($this->once())->method('load')->with($id)->willThrowException(new \Exception);
-        $this->sitemapFactoryMock->expects($this->once())->method('create')->willReturn($sitemapMock);
-        $this->responseMock->expects($this->once())->method('setRedirect');
-        $this->messageManagerMock->expects($this->any())
-            ->method('addError');
-
-        $this->deleteController->execute();
-    }
-
-    public function testExecute()
-    {
-        $id = 1;
-        $sitemapPath = '/';
-        $sitemapFilename = 'sitemap.xml';
-        $relativePath = '/sitemap.xml';
-        $writeDirectoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($writeDirectoryMock);
-        $this->requestMock->expects($this->any())->method('getParam')->with('sitemap_id')->willReturn($id);
-
-        $sitemapMock = $this->getMockBuilder(\Magento\Sitemap\Model\Sitemap::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSitemapPath', 'getSitemapFilename', 'load', 'delete'])
-            ->getMock();
-        $sitemapMock->expects($this->once())->method('load')->with($id);
-        $sitemapMock->expects($this->once())->method('delete');
-        $sitemapMock->expects($this->any())->method('getSitemapPath')->willReturn($sitemapPath);
-        $sitemapMock->expects($this->any())->method('getSitemapFilename')->willReturn($sitemapFilename);
-        $this->sitemapFactoryMock->expects($this->once())->method('create')->willReturn($sitemapMock);
-        $writeDirectoryMock->expects($this->any())
-            ->method('getRelativePath')
-            ->with($sitemapPath . $sitemapFilename)
-            ->willReturn($relativePath);
-        $writeDirectoryMock->expects($this->once())->method('isFile')->with($relativePath)->willReturn(true);
-        $writeDirectoryMock->expects($this->once())->method('delete')->with($relativePath)->willReturn(true);
-
-        $this->responseMock->expects($this->once())->method('setRedirect');
-        $this->messageManagerMock->expects($this->any())
-            ->method('addSuccess');
-
-        $this->deleteController->execute();
-    }
-}
diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
index 36e3aa0312627..f77954101df7c 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
@@ -154,7 +154,7 @@ public function testTryToSaveInvalidDataShouldFailWithErrors()
             ->willReturnMap([[$helperClass, $helper], [$sessionClass, $session]]);
 
         $this->messageManagerMock->expects($this->at(0))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->withConsecutive(
                 [$messages[0]],
                 [$messages[1]]
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php
index f3c2f90de286b..cbf353d0a93c7 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php
@@ -37,6 +37,11 @@ class RobotsTest extends \PHPUnit\Framework\TestCase
      */
     private $storeResolver;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
     protected function setUp()
     {
         $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
@@ -57,12 +62,16 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+
         $this->model = new \Magento\Sitemap\Model\Config\Backend\Robots(
             $this->context,
             $this->registry,
             $this->scopeConfig,
             $this->typeList,
-            $this->storeResolver
+            $this->storeResolver,
+            $this->storeManager
         );
     }
 
@@ -73,8 +82,14 @@ public function testGetIdentities()
     {
         $storeId = 1;
 
-        $this->storeResolver->expects($this->once())
-            ->method('getCurrentStoreId')
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->once())
+            ->method('getId')
             ->willReturn($storeId);
 
         $expected = [
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
index 92e6f4e2e2293..ac88f23ff9d69 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
@@ -7,6 +7,10 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * Class ObserverTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -96,11 +100,11 @@ protected function setUp()
         );
     }
 
-    /**
-     * @expectedException \Exception
-     */
-    public function testScheduledGenerateSitemapsThrowsException()
+    public function testScheduledGenerateSitemapsSendsExceptionEmail()
     {
+        $exception = 'Sitemap Exception';
+        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
+
         $this->scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
 
         $this->collectionFactoryMock->expects($this->once())
@@ -111,7 +115,55 @@ public function testScheduledGenerateSitemapsThrowsException()
             ->method('getIterator')
             ->willReturn(new \ArrayIterator([$this->sitemapMock]));
 
-        $this->sitemapMock->expects($this->once())->method('generateXml')->willThrowException(new \Exception());
+        $this->sitemapMock->expects($this->once())
+            ->method('generateXml')
+            ->willThrowException(new \Exception($exception));
+
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('getValue')
+            ->with(
+                \Magento\Sitemap\Model\Observer::XML_PATH_ERROR_RECIPIENT,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+            ->willReturn('error-recipient@example.com');
+
+        $this->inlineTranslationMock->expects($this->once())
+            ->method('suspend');
+
+        $this->transportBuilderMock->expects($this->once())
+            ->method('setTemplateIdentifier')
+            ->will($this->returnSelf());
+
+        $this->transportBuilderMock->expects($this->once())
+            ->method('setTemplateOptions')
+            ->with([
+                'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+                'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+            ])
+            ->will($this->returnSelf());
+
+        $this->transportBuilderMock->expects($this->once())
+            ->method('setTemplateVars')
+            ->with(['warnings' => $exception])
+            ->will($this->returnSelf());
+
+        $this->transportBuilderMock->expects($this->once())
+            ->method('setFrom')
+            ->will($this->returnSelf());
+
+        $this->transportBuilderMock->expects($this->once())
+            ->method('addTo')
+            ->will($this->returnSelf());
+
+        $this->transportBuilderMock->expects($this->once())
+            ->method('getTransport')
+            ->willReturn($transport);
+
+        $transport->expects($this->once())
+            ->method('sendMessage');
+
+        $this->inlineTranslationMock->expects($this->once())
+            ->method('resume');
 
         $this->observer->scheduledGenerateSitemaps();
     }
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php
new file mode 100644
index 0000000000000..d6e19ce7277b7
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sitemap\Test\Unit\Model\ResourceModel\Cms;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\GetUtilityPageIdentifiers;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sitemap\Model\ResourceModel\Cms\Page;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for Cms Page resource model.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PageTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var Page
+     */
+    private $model;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
+    /**
+     * @var EntityManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManager;
+
+    /**
+     * @var GetUtilityPageIdentifiers|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $getUtilityPageIdentifiers;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->resource = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context = $objectManager->getObject(
+            Context::class,
+            ['resource' => $this->resource]
+        );
+        $this->metadataPool = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->entityManager = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->getUtilityPageIdentifiers = $this->getMockBuilder(GetUtilityPageIdentifiers::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = $objectManager->getObject(
+            Page::class,
+            [
+                'context' => $this->context,
+                'metadataPool' => $this->metadataPool,
+                'entityManager' => $this->entityManager,
+                'connectionName' => 'default',
+                'getUtilityPageIdentifiers' => $this->getUtilityPageIdentifiers,
+            ]
+        );
+    }
+
+    /**
+     * Test Page::getCollection() build correct query to get cms page collection array.
+     *
+     * @return void
+     */
+    public function testGetCollection()
+    {
+        $pageId = 'testPageId';
+        $url = 'testUrl';
+        $updatedAt = 'testUpdatedAt';
+        $pageIdentifiers = ['testCmsHomePage', 'testCmsNoRoute', 'testCmsNoCookies'];
+        $storeId = 1;
+        $linkField = 'testLinkField';
+        $expectedPage = new DataObject();
+        $expectedPage->setId($pageId);
+        $expectedPage->setUrl($url);
+        $expectedPage->setUpdatedAt($updatedAt);
+
+        $query = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['fetch'])
+            ->getMockForAbstractClass();
+        $query->expects($this->exactly(2))
+            ->method('fetch')
+            ->willReturnOnConsecutiveCalls(
+                [
+                    'page_id' => $pageId,
+                    'url' => $url,
+                    'updated_at' => $updatedAt
+                ],
+                false
+            );
+
+        $select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $select->expects($this->once())
+            ->method('from')
+            ->with(
+                $this->identicalTo(['main_table' => 'cms_page']),
+                $this->identicalTo(['page_id', 'url' => 'identifier', 'updated_at' => 'update_time'])
+            )->willReturnSelf();
+        $select->expects($this->once())
+            ->method('join')
+            ->with(
+                $this->identicalTo(['store_table' => 'cms_page_store']),
+                $this->identicalTo("main_table.{$linkField} = store_table.$linkField"),
+                $this->identicalTo([])
+            )->willReturnSelf();
+        $select->expects($this->exactly(3))
+            ->method('where')
+            ->withConsecutive(
+                [$this->identicalTo('main_table.is_active = 1')],
+                [$this->identicalTo('main_table.identifier NOT IN (?)'), $this->identicalTo($pageIdentifiers)],
+                [$this->identicalTo('store_table.store_id IN(?)'), $this->identicalTo([0, $storeId])]
+            )->willReturnSelf();
+
+        $connection = $this->getMockBuilder(AdapterInterface::class)
+            ->setMethods(['select'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->once())
+            ->method('select')
+            ->willReturn($select);
+        $connection->expects($this->once())
+            ->method('query')
+            ->with($this->identicalTo($select))
+            ->willReturn($query);
+
+        $entityMetadata = $this->getMockBuilder(EntityMetadataInterface::class)
+            ->setMethods(['getLinkField', 'getEntityConnection'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $entityMetadata->expects($this->once())
+            ->method('getLinkField')
+            ->willReturn($linkField);
+        $entityMetadata->expects($this->exactly(2))
+            ->method('getEntityConnection')
+            ->willReturn($connection);
+
+        $this->getUtilityPageIdentifiers->expects($this->once())
+            ->method('execute')
+            ->willReturn($pageIdentifiers);
+
+        $this->resource->expects($this->exactly(2))
+            ->method('getTableName')
+            ->withConsecutive(
+                [$this->identicalTo('cms_page'), $this->identicalTo('default')],
+                [$this->identicalTo('cms_page_store'), $this->identicalTo('default')]
+            )->willReturnOnConsecutiveCalls(
+                'cms_page',
+                'cms_page_store'
+            );
+
+        $this->metadataPool->expects($this->exactly(3))
+            ->method('getMetadata')
+            ->with($this->identicalTo(PageInterface::class))
+            ->willReturn($entityMetadata);
+
+        $result = $this->model->getCollection($storeId);
+        $resultPage = array_shift($result);
+        $this->assertEquals($expectedPage, $resultPage);
+    }
+}
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
index 29d188445cffb..f805d4471553b 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
@@ -527,7 +527,7 @@ protected function getModelMock($mockBeforeSave = false)
             ->willReturn([
                 new SitemapItem('category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
                 new SitemapItem('/category/sub-category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
-                new SitemapItem('product.html', '0.5', 'monthly', '2012-12-21 00:00:00'),
+                new SitemapItem('product.html', '0.5', 'monthly', '0000-00-00 00:00:00'),
                 new SitemapItem(
                     'product2.html',
                     '0.5',
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
index 3a0357cf30c51..519464cf76cf1 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-3.xml
@@ -10,7 +10,7 @@
         xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
         <loc>http://store.com/product.html</loc>
-        <lastmod>2012-12-21T00:00:00-08:00</lastmod>
+        <lastmod>0000-01-01T00:00:00-08:00</lastmod>
         <changefreq>monthly</changefreq>
         <priority>0.5</priority>
     </url>
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
index e79e022c98995..cc2ff96dd28f2 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
@@ -22,7 +22,7 @@
     </url>
     <url>
         <loc>http://store.com/product.html</loc>
-        <lastmod>2012-12-21T00:00:00-08:00</lastmod>
+        <lastmod>0000-01-01T00:00:00-08:00</lastmod>
         <changefreq>monthly</changefreq>
         <priority>0.5</priority>
     </url>
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index fe8d2d1919e5a..f537832bdc3de 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -5,23 +5,22 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-url-rewrite": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-robots": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-robots": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sitemap/etc/config.xml b/app/code/Magento/Sitemap/etc/config.xml
index 73468baadcb90..6f14ff728ac4f 100644
--- a/app/code/Magento/Sitemap/etc/config.xml
+++ b/app/code/Magento/Sitemap/etc/config.xml
@@ -42,5 +42,16 @@
                 </valid_paths>
             </file>
         </sitemap>
+        <crontab>
+            <default>
+                <jobs>
+                    <sitemap_generate>
+                        <schedule>
+                            <cron_expr>0 0 * * *</cron_expr>
+                        </schedule>
+                    </sitemap_generate>
+                </jobs>
+            </default>
+        </crontab>
     </default>
 </config>
diff --git a/app/code/Magento/Sitemap/etc/db_schema.xml b/app/code/Magento/Sitemap/etc/db_schema.xml
new file mode 100644
index 0000000000000..b3c028b626b73
--- /dev/null
+++ b/app/code/Magento/Sitemap/etc/db_schema.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="sitemap" resource="default" engine="innodb" comment="XML Sitemap">
+        <column xsi:type="int" name="sitemap_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Sitemap Id"/>
+        <column xsi:type="varchar" name="sitemap_type" nullable="true" length="32" comment="Sitemap Type"/>
+        <column xsi:type="varchar" name="sitemap_filename" nullable="true" length="32" comment="Sitemap Filename"/>
+        <column xsi:type="varchar" name="sitemap_path" nullable="true" length="255" comment="Sitemap Path"/>
+        <column xsi:type="timestamp" name="sitemap_time" on_update="false" nullable="true" comment="Sitemap Time"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="sitemap_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="SITEMAP_STORE_ID_STORE_STORE_ID" table="sitemap" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="SITEMAP_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Sitemap/etc/db_schema_whitelist.json b/app/code/Magento/Sitemap/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b6359e7526a0f
--- /dev/null
+++ b/app/code/Magento/Sitemap/etc/db_schema_whitelist.json
@@ -0,0 +1,19 @@
+{
+    "sitemap": {
+        "column": {
+            "sitemap_id": true,
+            "sitemap_type": true,
+            "sitemap_filename": true,
+            "sitemap_path": true,
+            "sitemap_time": true,
+            "store_id": true
+        },
+        "index": {
+            "SITEMAP_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SITEMAP_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Sitemap/etc/module.xml b/app/code/Magento/Sitemap/etc/module.xml
index 0edfcf84f644f..cf6327ac94e2c 100644
--- a/app/code/Magento/Sitemap/etc/module.xml
+++ b/app/code/Magento/Sitemap/etc/module.xml
@@ -6,9 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sitemap" setup_version="2.0.0">
+    <module name="Magento_Sitemap" >
         <sequence>
             <module name="Magento_Robots"/>
+            <module name="Magento_Cms"/>
             <module name="Magento_Catalog"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Store/Api/Data/WebsiteInterface.php b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
index 176e82f5905b5..27519e5b0bcd5 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
      */
@@ -36,7 +41,7 @@ public function getCode();
     public function setCode($code);
 
     /**
-     * Rethreive website name
+     * Retrieve website name
      *
      * @return string
      */
diff --git a/app/code/Magento/Store/Api/StoreResolverInterface.php b/app/code/Magento/Store/Api/StoreResolverInterface.php
index 7eb28729ec239..7c32e321fa6c4 100644
--- a/app/code/Magento/Store/Api/StoreResolverInterface.php
+++ b/app/code/Magento/Store/Api/StoreResolverInterface.php
@@ -8,8 +8,8 @@
 /**
  * Store resolver interface
  *
- * @api
- * @since 100.0.2
+ * @deprecated
+ * @see \Magento\Store\Model\StoreManagerInterface
  */
 interface StoreResolverInterface
 {
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 66fec992b38d7..0d34179d3c63e 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -7,9 +7,10 @@
 namespace Magento\Store\App\Action\Plugin;
 
 use Magento\Framework\App\Http\Context as HttpContext;
-use Magento\Framework\Phrase;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreCookieManagerInterface;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\RequestInterface;
@@ -58,42 +59,102 @@ public function __construct(
     }
 
     /**
-     * Set store and currency to http context
+     * Set store and currency to http context.
      *
      * @param AbstractAction $subject
      * @param RequestInterface $request
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeDispatch(AbstractAction $subject, RequestInterface $request)
-    {
-        /** @var \Magento\Store\Model\Store $defaultStore */
-        $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
+    public function beforeDispatch(
+        AbstractAction $subject,
+        RequestInterface $request
+    ) {
+        if ($this->isAlreadySet()) {
+            //If required store related value were already set for
+            //HTTP processors then just continuing as we were.
+            return;
+        }
 
+        /** @var string|array|null $storeCode */
         $storeCode = $request->getParam(
-            StoreResolverInterface::PARAM_NAME,
+            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
             $this->storeCookieManager->getStoreCodeFromCookie()
         );
-
         if (is_array($storeCode)) {
             if (!isset($storeCode['_data']['code'])) {
-                throw new \InvalidArgumentException(new Phrase('Invalid store parameter.'));
+                $this->processInvalidStoreRequested();
             }
             $storeCode = $storeCode['_data']['code'];
         }
-        /** @var \Magento\Store\Model\Store $currentStore */
-        $currentStore = $storeCode ? $this->storeManager->getStore($storeCode) : $defaultStore;
+        if ($storeCode === '') {
+            //Empty code - is an invalid code and it was given explicitly
+            //(the value would be null if the code wasn't found).
+            $this->processInvalidStoreRequested();
+        }
+        try {
+            $currentStore = $this->storeManager->getStore($storeCode);
+        } catch (NoSuchEntityException $exception) {
+            $this->processInvalidStoreRequested($exception);
+        }
+
+        $this->updateContext($currentStore);
+    }
+
+    /**
+     * Take action in case of invalid store requested.
+     *
+     * @param \Throwable|null $previousException
+     * @return void
+     * @throws NotFoundException
+     */
+    private function processInvalidStoreRequested(
+        \Throwable $previousException = null
+    ) {
+        $store = $this->storeManager->getStore();
+        $this->updateContext($store);
 
+        throw new NotFoundException(
+            $previousException
+                ? __($previousException->getMessage())
+                : __('Invalid store requested.'),
+            $previousException
+        );
+    }
+
+    /**
+     * Update context accordingly to the store found.
+     *
+     * @param StoreInterface $store
+     * @return void
+     */
+    private function updateContext(StoreInterface $store)
+    {
         $this->httpContext->setValue(
             StoreManagerInterface::CONTEXT_STORE,
-            $currentStore->getCode(),
+            $store->getCode(),
             $this->storeManager->getDefaultStoreView()->getCode()
         );
 
+        /** @var StoreInterface $defaultStore */
+        $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
         $this->httpContext->setValue(
             HttpContext::CONTEXT_CURRENCY,
-            $this->session->getCurrencyCode() ?: $currentStore->getDefaultCurrencyCode(),
+            $this->session->getCurrencyCode()
+                ?: $store->getDefaultCurrencyCode(),
             $defaultStore->getDefaultCurrencyCode()
         );
     }
+
+    /**
+     * Check if there is a need to find the current store.
+     *
+     * @return bool
+     */
+    private function isAlreadySet(): bool
+    {
+        $storeKey = StoreManagerInterface::CONTEXT_STORE;
+
+        return $this->httpContext->getValue($storeKey) !== null;
+    }
 }
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
index 9fbecc4db303e..e6b9d0000e4a6 100644
--- a/app/code/Magento/Store/App/Config/Type/Scopes.php
+++ b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -114,5 +114,6 @@ private function convertIdPathToCodePath(array $patchChunks)
     public function clean()
     {
         $this->data = null;
+        $this->idCodeMap = [];
     }
 }
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index 613a6d1998858..fad0d07c3a0a7 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -3,55 +3,75 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Store\App\Request;
+declare(strict_types=1);
 
-use Magento\Framework\Exception\NoSuchEntityException;
+namespace Magento\Store\App\Request;
 
+/**
+ * Processes the path and looks for the store in the url and removes it and modifies the path accordingly.
+ */
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StorePathInfoValidator
      */
-    private $storeManager;
+    private $storePathInfoValidator;
 
     /**
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @var \Magento\Framework\App\Config\ReinitableConfigInterface
      */
-    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
-    {
-        $this->storeManager = $storeManager;
+    private $config;
+
+    /**
+     * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator
+     * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
+     */
+    public function __construct(
+        \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator,
+        \Magento\Framework\App\Config\ReinitableConfigInterface $config
+    ) {
+        $this->storePathInfoValidator = $storePathInfoValidator;
+        $this->config = $config;
     }
 
     /**
-     * Process path info
+     * Process path info and remove store from pathInfo.
+     *
+     * This method also sets request to no route if store is not valid and store is present in url config is enabled
      *
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $pathInfo
      * @return string
      */
-    public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo)
+    public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string
     {
-        $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
-        $storeCode = $pathParts[0];
-
-        try {
-            /** @var \Magento\Store\Api\Data\StoreInterface $store */
-            $store = $this->storeManager->getStore($storeCode);
-        } catch (NoSuchEntityException $e) {
-            return $pathInfo;
-        }
-
-        if ($store->isUseStoreInUrl()) {
-            if (!$request->isDirectAccessFrontendName($storeCode)) {
-                $this->storeManager->setCurrentStore($store->getCode());
-                $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
-                return $pathInfo;
-            } elseif (!empty($storeCode)) {
-                $request->setActionName('noroute');
-                return $pathInfo;
+        //can store code be used in url
+        if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) {
+            $storeCode = $this->storePathInfoValidator->getValidStoreCode($request, $pathInfo);
+            if (!empty($storeCode)) {
+                if (!$request->isDirectAccessFrontendName($storeCode)) {
+                    $pathInfo = $this->trimStoreCodeFromPathInfo($pathInfo, $storeCode);
+                } else {
+                    //no route in case we're trying to access a store that has the same code as a direct access
+                    $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE);
+                }
             }
-            return $pathInfo;
         }
         return $pathInfo;
     }
+
+    /**
+     * Trim store code from path info string if exists
+     *
+     * @param string $pathInfo
+     * @param string $storeCode
+     * @return string
+     */
+    private function trimStoreCodeFromPathInfo(string $pathInfo, string $storeCode) : ?string
+    {
+        if (substr($pathInfo, 0, strlen('/' . $storeCode)) == '/'. $storeCode) {
+            $pathInfo = substr($pathInfo, strlen($storeCode)+1);
+        }
+        return empty($pathInfo) ? '/' : $pathInfo;
+    }
 }
diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php
new file mode 100644
index 0000000000000..0b66ba7586009
--- /dev/null
+++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\App\Request;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\Store;
+
+/**
+ * Gets the store from the path if valid
+ */
+class StorePathInfoValidator
+{
+    /**
+     * Store Config
+     *
+     * @var \Magento\Framework\App\Config\ReinitableConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var \Magento\Store\Api\StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var \Magento\Framework\App\Request\PathInfo
+     */
+    private $pathInfo;
+
+    /**
+     * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
+     * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
+     * @param \Magento\Framework\App\Request\PathInfo $pathInfo
+     */
+    public function __construct(
+        \Magento\Framework\App\Config\ReinitableConfigInterface $config,
+        \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
+        \Magento\Framework\App\Request\PathInfo $pathInfo
+    ) {
+        $this->config = $config;
+        $this->storeRepository = $storeRepository;
+        $this->pathInfo = $pathInfo;
+    }
+
+    /**
+     * Get store code from path info validate if config value. If path info is empty the try to calculate from request.
+     *
+     * @param \Magento\Framework\App\Request\Http $request
+     * @param string $pathInfo
+     * @return string|null
+     */
+    public function getValidStoreCode(
+        \Magento\Framework\App\Request\Http $request,
+        string $pathInfo = ''
+    ) : ?string {
+        if (empty($pathInfo)) {
+            $pathInfo = $this->pathInfo->getPathInfo(
+                $request->getRequestUri(),
+                $request->getBaseUrl()
+            );
+        }
+        $storeCode = $this->getStoreCode($pathInfo);
+        if (!empty($storeCode)
+            && $storeCode != Store::ADMIN_CODE
+            && (bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)
+        ) {
+            try {
+                $this->storeRepository->getActiveStoreByCode($storeCode);
+
+                if ((bool)$this->config->getValue(
+                    \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                    $storeCode
+                )) {
+                    return $storeCode;
+                }
+            } catch (NoSuchEntityException $e) {
+                //return null;
+            } catch (\Magento\Store\Model\StoreIsInactiveException $e) {
+                //return null;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get store code from path info string
+     *
+     * @param string $pathInfo
+     * @return string
+     */
+    private function getStoreCode(string $pathInfo) : string
+    {
+        $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
+        return current($pathParts);
+    }
+}
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index d826ad3425f54..3ad6a86db6908 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -7,8 +7,9 @@
  */
 namespace Magento\Store\App\Response;
 
-use Magento\Store\Api\StoreResolverInterface;
-
+/**
+ * Class Redirect computes redirect urls responses.
+ */
 class Redirect implements \Magento\Framework\App\Response\RedirectInterface
 {
     /**
@@ -76,22 +77,24 @@ public function __construct(
     }
 
     /**
+     * Get the referrer url.
+     *
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _getUrl()
     {
         $refererUrl = $this->_request->getServer('HTTP_REFERER');
-        $url = (string)$this->_request->getParam(self::PARAM_NAME_REFERER_URL);
-        if ($url) {
-            $refererUrl = $url;
-        }
-        $url = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_BASE64_URL);
-        if ($url) {
-            $refererUrl = $this->_urlCoder->decode($url);
-        }
-        $url = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED);
-        if ($url) {
-            $refererUrl = $this->_urlCoder->decode($url);
+        $encodedUrl = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED)
+            ?: $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_BASE64_URL);
+
+        if ($encodedUrl) {
+            $refererUrl = $this->_urlCoder->decode($encodedUrl);
+        } else {
+            $url = (string)$this->_request->getParam(self::PARAM_NAME_REFERER_URL);
+            if ($url) {
+                $refererUrl = $url;
+            }
         }
 
         if (!$this->_isUrlInternal($refererUrl)) {
@@ -164,23 +167,10 @@ public function success($defaultUrl)
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param array $arguments
-     * @return array
+     * @inheritdoc
      */
     public function updatePathParams(array $arguments)
     {
-        if ($this->_session->getCookieShouldBeReceived()
-            && $this->_sidResolver->getUseSessionInUrl()
-            && $this->_canUseSessionIdInParam
-        ) {
-            $arguments += [
-                '_query' => [
-                    $this->_sidResolver->getSessionIdQueryParam($this->_session) => $this->_session->getSessionId(),
-                ]
-            ];
-        }
         return $arguments;
     }
 
@@ -258,10 +248,10 @@ protected function normalizeRefererQueryParts($refererQuery)
         $store = $this->_storeManager->getStore();
 
         if ($store
-            && !empty($refererQuery[StoreResolverInterface::PARAM_NAME])
-            && ($refererQuery[StoreResolverInterface::PARAM_NAME] !== $store->getCode())
+            && !empty($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME])
+            && ($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] !== $store->getCode())
         ) {
-            $refererQuery[StoreResolverInterface::PARAM_NAME] = $store->getCode();
+            $refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode();
         }
 
         return $refererQuery;
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index 074dcb0262040..f15349f11066d 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -11,8 +11,14 @@
 
 use Magento\Directory\Helper\Data;
 use Magento\Store\Model\Group;
+use Magento\Store\Model\Store;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
 
 /**
+ * Switcher block
+ *
  * @api
  * @since 100.0.2
  */
@@ -29,22 +35,30 @@ class Switcher extends \Magento\Framework\View\Element\Template
     protected $_postDataHelper;
 
     /**
-     * Constructs
-     *
+     * @var UrlHelper
+     */
+    private $urlHelper;
+
+    /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
+     * @param UrlHelper $urlHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        array $data = []
+        array $data = [],
+        UrlHelper $urlHelper = null
     ) {
         $this->_postDataHelper = $postDataHelper;
         parent::__construct($context, $data);
+        $this->urlHelper = $urlHelper ?: ObjectManager::getInstance()->get(UrlHelper::class);
     }
 
     /**
+     * Get current website Id.
+     *
      * @return int|null|string
      */
     public function getCurrentWebsiteId()
@@ -53,6 +67,8 @@ public function getCurrentWebsiteId()
     }
 
     /**
+     * Get current group Id.
+     *
      * @return int|null|string
      */
     public function getCurrentGroupId()
@@ -61,6 +77,8 @@ public function getCurrentGroupId()
     }
 
     /**
+     * Get current Store Id.
+     *
      * @return int
      */
     public function getCurrentStoreId()
@@ -69,6 +87,8 @@ public function getCurrentStoreId()
     }
 
     /**
+     * Get raw groups.
+     *
      * @return array
      */
     public function getRawGroups()
@@ -86,6 +106,8 @@ public function getRawGroups()
     }
 
     /**
+     * Get raw stores.
+     *
      * @return array
      */
     public function getRawStores()
@@ -157,6 +179,8 @@ public function getGroups()
     }
 
     /**
+     * Get stores.
+     *
      * @return \Magento\Store\Model\Store[]
      */
     public function getStores()
@@ -176,6 +200,8 @@ public function getStores()
     }
 
     /**
+     * Get current store code.
+     *
      * @return string
      */
     public function getCurrentStoreCode()
@@ -184,6 +210,8 @@ public function getCurrentStoreCode()
     }
 
     /**
+     * Is store in url.
+     *
      * @return bool
      */
     public function isStoreInUrl()
@@ -195,7 +223,7 @@ public function isStoreInUrl()
     }
 
     /**
-     * Get store code
+     * Get store code.
      *
      * @return string
      */
@@ -205,7 +233,7 @@ public function getStoreCode()
     }
 
     /**
-     * Get store name
+     * Get store name.
      *
      * @return null|string
      */
@@ -215,17 +243,25 @@ public function getStoreName()
     }
 
     /**
-     * Returns target store post data
+     * Returns target store post data.
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @param array $data
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    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[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode();
+        $data['___from_store'] = $this->_storeManager->getStore()->getCode();
+
+        $urlOnTargetStore = $store->getCurrentUrl(false);
+        $data[ActionInterface::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl($urlOnTargetStore);
+
+        $url = $this->getUrl('stores/store/redirect');
+
         return $this->_postDataHelper->getPostData(
-            $store->getCurrentUrl(false),
+            $url,
             $data
         );
     }
diff --git a/app/code/Magento/Store/Console/Command/StoreListCommand.php b/app/code/Magento/Store/Console/Command/StoreListCommand.php
index aaaa8afb76fd2..fcd9600aac684 100644
--- a/app/code/Magento/Store/Console/Command/StoreListCommand.php
+++ b/app/code/Magento/Store/Console/Command/StoreListCommand.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Store\Console\Command;
 
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
@@ -48,7 +49,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            $table = $this->getHelperSet()->get('table');
+            $table = new Table($output);
             $table->setHeaders(['ID', 'Website ID', 'Group ID', 'Name', 'Code', 'Sort Order', 'Is Active']);
 
             foreach ($this->storeManager->getStores(true, true) as $store) {
@@ -63,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ]);
             }
 
-            $table->render($output);
+            $table->render();
 
             return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
         } catch (\Exception $e) {
diff --git a/app/code/Magento/Store/Console/Command/WebsiteListCommand.php b/app/code/Magento/Store/Console/Command/WebsiteListCommand.php
index ce0359d1bb799..985a6402e4e2f 100644
--- a/app/code/Magento/Store/Console/Command/WebsiteListCommand.php
+++ b/app/code/Magento/Store/Console/Command/WebsiteListCommand.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Store\Console\Command;
 
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
@@ -48,7 +49,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            $table = $this->getHelperSet()->get('table');
+            $table = new Table($output);
             $table->setHeaders(['ID', 'Default Group Id', 'Name', 'Code', 'Sort Order', 'Is Default']);
 
             foreach ($this->manager->getList() as $website) {
@@ -62,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ]);
             }
 
-            $table->render($output);
+            $table->render();
 
             return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
         } catch (\Exception $e) {
diff --git a/app/code/Magento/Store/Controller/Store/Redirect.php b/app/code/Magento/Store/Controller/Store/Redirect.php
new file mode 100644
index 0000000000000..21692e9d6dd1e
--- /dev/null
+++ b/app/code/Magento/Store/Controller/Store/Redirect.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Controller\Store;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreResolver;
+use Magento\Framework\Session\SidResolverInterface;
+use Magento\Framework\Session\Generic as Session;
+
+/**
+ * Builds correct url to target store and performs redirect.
+ */
+class Redirect extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var StoreResolverInterface
+     */
+    private $storeResolver;
+
+    /**
+     * @var SidResolverInterface
+     */
+    private $sidResolver;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Context $context
+     * @param StoreRepositoryInterface $storeRepository
+     * @param StoreResolverInterface $storeResolver
+     * @param Session $session
+     * @param SidResolverInterface $sidResolver
+     */
+    public function __construct(
+        Context $context,
+        StoreRepositoryInterface $storeRepository,
+        StoreResolverInterface $storeResolver,
+        Session $session,
+        SidResolverInterface $sidResolver
+    ) {
+        parent::__construct($context);
+        $this->storeRepository = $storeRepository;
+        $this->storeResolver = $storeResolver;
+        $this->session = $session;
+        $this->sidResolver = $sidResolver;
+    }
+
+    /**
+     * @return ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @throws NoSuchEntityException
+     */
+    public function execute()
+    {
+        /** @var \Magento\Store\Model\Store $currentStore */
+        $currentStore = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId());
+        $targetStoreCode = $this->_request->getParam(StoreResolver::PARAM_NAME);
+        $fromStoreCode = $this->_request->getParam('___from_store');
+        $error = null;
+
+        if ($targetStoreCode === null) {
+            return $this->_redirect($currentStore->getBaseUrl());
+        }
+
+        try {
+            /** @var \Magento\Store\Model\Store $targetStore */
+            $fromStore = $this->storeRepository->get($fromStoreCode);
+        } catch (NoSuchEntityException $e) {
+            $error = __('Requested store is not found');
+        }
+
+        if ($error !== null) {
+            $this->messageManager->addErrorMessage($error);
+            $this->_redirect->redirect($this->_response, $currentStore->getBaseUrl());
+        } else {
+            $encodedUrl = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED);
+
+            $query = [
+                '___from_store' => $fromStore->getCode(),
+                StoreResolverInterface::PARAM_NAME => $targetStoreCode,
+                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl,
+            ];
+
+            if ($this->sidResolver->getUseSessionInUrl()) {
+                // allow customers to stay logged in during store switching
+                $sidName = $this->sidResolver->getSessionIdQueryParam($this->session);
+                $query[$sidName] = $this->session->getSessionId();
+            }
+
+            $arguments = [
+                '_nosid' => true,
+                '_query' => $query
+            ];
+            $this->_redirect->redirect($this->_response, 'stores/store/switch', $arguments);
+        }
+    }
+}
diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php
index aa023e400460f..de721869c5aba 100644
--- a/app/code/Magento/Store/Controller/Store/SwitchAction.php
+++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php
@@ -4,21 +4,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Controller\Store;
 
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreIsInactiveException;
-use Magento\Store\Model\StoreResolver;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\StoreSwitcher;
+use Magento\Store\Model\StoreSwitcherInterface;
 
 /**
- * Switch current store view.
+ * Handles store switching url and makes redirect.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SwitchAction extends Action
 {
@@ -29,6 +33,7 @@ class SwitchAction extends Action
 
     /**
      * @var HttpContext
+     * @deprecated
      */
     protected $httpContext;
 
@@ -39,9 +44,15 @@ class SwitchAction extends Action
 
     /**
      * @var StoreManagerInterface
+     * @deprecated
      */
     protected $storeManager;
 
+    /**
+     * @var StoreSwitcherInterface
+     */
+    private $storeSwitcher;
+
     /**
      * Initialize dependencies.
      *
@@ -50,69 +61,57 @@ class SwitchAction extends Action
      * @param HttpContext $httpContext
      * @param StoreRepositoryInterface $storeRepository
      * @param StoreManagerInterface $storeManager
+     * @param StoreSwitcherInterface $storeSwitcher
      */
     public function __construct(
         ActionContext $context,
         StoreCookieManagerInterface $storeCookieManager,
         HttpContext $httpContext,
         StoreRepositoryInterface $storeRepository,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        StoreSwitcherInterface $storeSwitcher = null
     ) {
         parent::__construct($context);
         $this->storeCookieManager = $storeCookieManager;
         $this->httpContext = $httpContext;
         $this->storeRepository = $storeRepository;
         $this->storeManager = $storeManager;
+        $this->messageManager = $context->getMessageManager();
+        $this->storeSwitcher = $storeSwitcher ?: ObjectManager::getInstance()->get(StoreSwitcherInterface::class);
     }
 
     /**
+     * Execute action
+     *
      * @return void
+     * @throws StoreSwitcher\CannotSwitchStoreException
      */
     public function execute()
     {
-        $currentActiveStore = $this->storeManager->getStore();
-        $storeCode = $this->_request->getParam(
-            StoreResolver::PARAM_NAME,
+        $targetStoreCode = $this->_request->getParam(
+            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
             $this->storeCookieManager->getStoreCodeFromCookie()
         );
+        $fromStoreCode = $this->_request->getParam('___from_store');
 
+        $requestedUrlToRedirect = $this->_redirect->getRedirectUrl();
+        $redirectUrl = $requestedUrlToRedirect;
+
+        $error = null;
         try {
-            $store = $this->storeRepository->getActiveStoreByCode($storeCode);
+            $fromStore = $this->storeRepository->get($fromStoreCode);
+            $targetStore = $this->storeRepository->getActiveStoreByCode($targetStoreCode);
         } catch (StoreIsInactiveException $e) {
             $error = __('Requested store is inactive');
         } catch (NoSuchEntityException $e) {
-            $error = __('Requested store is not found');
-        }
-
-        if (isset($error)) {
-            $this->messageManager->addError($error);
-            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
-            return;
+            $error = __("The store that was requested wasn't found. Verify the store and try again.");
         }
-
-        $defaultStoreView = $this->storeManager->getDefaultStoreView();
-        if ($defaultStoreView->getId() == $store->getId()) {
-            $this->storeCookieManager->deleteStoreCookie($store);
+        if ($error !== null) {
+            $this->messageManager->addErrorMessage($error);
         } else {
-            $this->httpContext->setValue(Store::ENTITY, $store->getCode(), $defaultStoreView->getCode());
-            $this->storeCookieManager->setStoreCookie($store);
+            $redirectUrl = $this->storeSwitcher->switch($fromStore, $targetStore, $requestedUrlToRedirect);
         }
 
-        if ($store->isUseStoreInUrl()) {
-            // Change store code in redirect url
-            if (strpos($this->_redirect->getRedirectUrl(), $currentActiveStore->getBaseUrl()) !== false) {
-                $this->getResponse()->setRedirect(
-                    str_replace(
-                        $currentActiveStore->getBaseUrl(),
-                        $store->getBaseUrl(),
-                        $this->_redirect->getRedirectUrl()
-                    )
-                );
-            } else {
-                $this->getResponse()->setRedirect($store->getBaseUrl());
-            }
-        } else {
-            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
-        }
+        $this->getResponse()->setRedirect($redirectUrl);
     }
 }
diff --git a/app/code/Magento/Store/Model/Address/Renderer.php b/app/code/Magento/Store/Model/Address/Renderer.php
index 1f44b9dcec3e3..1d0fdd7284848 100644
--- a/app/code/Magento/Store/Model/Address/Renderer.php
+++ b/app/code/Magento/Store/Model/Address/Renderer.php
@@ -15,6 +15,12 @@
  */
 class Renderer
 {
+    const DEFAULT_TEMPLATE = "{{var name}}\n" .
+        "{{var street_line1}}\n" .
+        "{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
+        "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
+        "{{var country}}";
+
     /**
      * @var EventManager
      */
@@ -25,18 +31,26 @@ class Renderer
      */
     protected $filterManager;
 
+    /**
+     * @var string
+     */
+    private $template;
+
     /**
      * Constructor
      *
      * @param EventManager $eventManager
      * @param FilterManager $filterManager
+     * @param string $template
      */
     public function __construct(
         EventManager $eventManager,
-        FilterManager $filterManager
+        FilterManager $filterManager,
+        $template = self::DEFAULT_TEMPLATE
     ) {
         $this->eventManager = $eventManager;
         $this->filterManager = $filterManager;
+        $this->template = $template;
     }
 
     /**
@@ -50,9 +64,7 @@ public function format(DataObject $storeInfo, $type = 'html')
     {
         $this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]);
         $address = $this->filterManager->template(
-            "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
-            "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
-            "{{var country}}",
+            $this->template,
             ['variables' => $storeInfo->getData()]
         );
 
diff --git a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
index cfa13e65ea42a..4d4021f5528ad 100644
--- a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
+++ b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
@@ -6,8 +6,8 @@
 namespace Magento\Store\Model\Argument\Interpreter;
 
 use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreRepository;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Interpreter that builds Service URL by input path and optional parameters
@@ -25,9 +25,9 @@ class ServiceUrl implements InterpreterInterface
     private $service;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @var string
@@ -41,21 +41,21 @@ class ServiceUrl implements InterpreterInterface
 
     /**
      * @param \Magento\Framework\Url $url
-     * @param StoreResolverInterface $storeResolver
+     * @param StoreManagerInterface $storeManager
      * @param StoreRepository $storeRepository
      * @param string $service
      * @param string $version
      */
     public function __construct(
         \Magento\Framework\Url $url,
-        StoreResolverInterface $storeResolver,
+        StoreManagerInterface $storeManager,
         StoreRepository $storeRepository,
         $service = "rest",
         $version = "V1"
     ) {
         $this->url = $url;
         $this->service = $service;
-        $this->storeResolver = $storeResolver;
+        $this->storeManager = $storeManager;
         $this->version = $version;
         $this->storeRepository = $storeRepository;
     }
@@ -67,14 +67,16 @@ public function __construct(
      */
     private function getServiceUrl()
     {
-        $store = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId());
+        $store = $this->storeRepository->getById($this->storeManager->getStore()->getId());
         return $this->url->getUrl(
             $this->service . "/" . $store->getCode() . "/" . $this->version
         );
     }
 
     /**
-     * {@inheritdoc}
+     * Compute and return effective value of an argument
+     *
+     * @param array $data
      * @return string
      * @throws \InvalidArgumentException
      */
diff --git a/app/code/Magento/Store/Model/BaseUrlChecker.php b/app/code/Magento/Store/Model/BaseUrlChecker.php
index c0d27fd0d7a09..dbdcd9ff17bf9 100644
--- a/app/code/Magento/Store/Model/BaseUrlChecker.php
+++ b/app/code/Magento/Store/Model/BaseUrlChecker.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Store\Model;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Verifies that the requested URL matches to base URL of store.
  */
@@ -16,6 +18,8 @@ class BaseUrlChecker
     private $scopeConfig;
 
     /**
+     * BaseUrlChecker constructor.
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
@@ -47,14 +51,14 @@ public function execute($uri, $request)
      */
     public function isEnabled()
     {
-        return (bool) $this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             'web/url/redirect_to_base',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
     /**
-     * Cheks whether frontend is completely secure or not.
+     * Checks whether frontend is completely secure or not.
      *
      * @return bool
      */
@@ -62,13 +66,13 @@ public function isFrontendSecure()
     {
         $baseUrl = $this->scopeConfig->getValue(
             'web/unsecure/base_url',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
         $baseUrlParts = explode('://', $baseUrl);
         $baseUrlProtocol = array_shift($baseUrlParts);
-        $isSecure = (bool) $this->scopeConfig->getValue(
+        $isSecure = $this->scopeConfig->isSetFlag(
             'web/secure/use_in_frontend',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
 
         return $isSecure && $baseUrlProtocol == 'https';
diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php b/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
index 768482aa44636..1fb9f1c224d3e 100644
--- a/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Config\Importer\Processor;
 
 use Magento\Framework\Event\ManagerInterface;
@@ -16,8 +17,6 @@
 
 /**
  * The processor for creating of new entities.
- *
- * {@inheritdoc}
  */
 class Create implements ProcessorInterface
 {
@@ -52,6 +51,10 @@ class Create implements ProcessorInterface
     /**
      * The event manager.
      *
+     * @deprecated logic moved inside of "afterSave" method
+     *             \Magento\Store\Model\Website::afterSave
+     *             \Magento\Store\Model\Group::afterSave
+     *             \Magento\Store\Model\Store::afterSave
      * @var ManagerInterface
      */
     private $eventManager;
@@ -80,7 +83,9 @@ public function __construct(
     /**
      * Creates entities in application according to the data set.
      *
-     * {@inheritdoc}
+     * @param array $data The data to be processed
+     * @return void
+     * @throws RuntimeException If processor was unable to finish execution
      */
     public function run(array $data)
     {
@@ -172,8 +177,11 @@ private function createGroups(array $items, array $data)
             );
 
             $group = $this->groupFactory->create();
+            if (!isset($groupData['root_category_id'])) {
+                $groupData['root_category_id'] = 0;
+            }
+            
             $group->setData($groupData);
-            $group->setRootCategoryId(0);
 
             $group->getResource()->save($group);
             $group->getResource()->addCommitCallback(function () use ($data, $group, $website) {
@@ -181,8 +189,6 @@ private function createGroups(array $items, array $data)
                 $group->setDefaultStoreId($store->getStoreId());
                 $group->setWebsite($website);
                 $group->getResource()->save($group);
-
-                $this->eventManager->dispatch('store_group_save', ['group' => $group]);
             });
         }
     }
@@ -224,8 +230,7 @@ private function createStores(array $items, array $data)
     }
 
     /**
-     * Searches through given websites and compares with current websites.
-     * Returns found website.
+     * Searches through given websites and compares with current websites and returns found website.
      *
      * @param array $data The data to be searched in
      * @param string $websiteId The website id
@@ -243,12 +248,11 @@ private function detectWebsiteById(array $data, $websiteId)
             }
         }
 
-        throw new NotFoundException(__('Website was not found'));
+        throw new NotFoundException(__("The website wasn't found. Verify the website and try again."));
     }
 
     /**
-     * Searches through given groups and compares with current websites.
-     * Returns found group.
+     * Searches through given groups and compares with current websites and returns found group.
      *
      * @param array $data The data to be searched in
      * @param string $groupId The group id
@@ -266,12 +270,11 @@ private function detectGroupById(array $data, $groupId)
             }
         }
 
-        throw new NotFoundException(__('Group was not found'));
+        throw new NotFoundException(__("The group wasn't found. Verify the group and try again."));
     }
 
     /**
-     * Searches through given stores and compares with current stores.
-     * Returns found store.
+     * Searches through given stores and compares with current stores and returns found store.
      *
      * @param array $data The data to be searched in
      * @param string $storeId The store id
@@ -289,6 +292,6 @@ private function detectStoreById(array $data, $storeId)
             }
         }
 
-        throw new NotFoundException(__('Store was not found'));
+        throw new NotFoundException(__("The store wasn't found. Verify the store and try again."));
     }
 }
diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/Delete.php b/app/code/Magento/Store/Model/Config/Importer/Processor/Delete.php
index 8660a0ba7152d..475c15122773e 100644
--- a/app/code/Magento/Store/Model/Config/Importer/Processor/Delete.php
+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/Delete.php
@@ -168,10 +168,7 @@ private function deleteStores(array $items)
 
         foreach ($items as $storeCode) {
             $store = $this->storeRepository->get($storeCode);
-            $store->getResource()->delete($store);
-            $store->getResource()->addCommitCallback(function () use ($store) {
-                $this->eventManager->dispatch('store_delete', ['store' => $store]);
-            });
+            $store->delete();
         }
     }
 
diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/ProcessorFactory.php b/app/code/Magento/Store/Model/Config/Importer/Processor/ProcessorFactory.php
index 796d3849a740f..3af10deb69590 100644
--- a/app/code/Magento/Store/Model/Config/Importer/Processor/ProcessorFactory.php
+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/ProcessorFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Config\Importer\Processor;
 
 use Magento\Framework\Exception\ConfigurationMismatchException;
@@ -57,7 +58,9 @@ public function __construct(
     public function create($processorName)
     {
         if (!isset($this->processors[$processorName])) {
-            throw new ConfigurationMismatchException(__('Class for type "%1" was not declared', $processorName));
+            throw new ConfigurationMismatchException(
+                __('The class for "%1" type wasn\'t declared. Enter the class and try again.', $processorName)
+            );
         }
 
         $object = $this->objectManager->create($this->processors[$processorName]);
diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php b/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php
index 35f3957b168d7..155506291e59d 100644
--- a/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php
+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php
@@ -176,10 +176,7 @@ private function updateStores(array $items, array $data)
                 $store->setGroup($group);
             }
 
-            $store->getResource()->save($store);
-            $store->getResource()->addCommitCallback(function () use ($store) {
-                $this->eventManager->dispatch('store_edit', ['store' => $store]);
-            });
+            $store->save();
         }
     }
 
@@ -214,11 +211,7 @@ private function updateGroups(array $items, array $data)
             if ($website && $website->getId() != $group->getWebsiteId()) {
                 $group->setWebsite($website);
             }
-
-            $group->getResource()->save($group);
-            $group->getResource()->addCommitCallback(function () use ($group) {
-                $this->eventManager->dispatch('store_group_save', ['group' => $group]);
-            });
+            $group->save();
         }
     }
 
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/app/code/Magento/Store/Model/Config/Placeholder.php
index b08e58c59c1a7..4e4139d47bd92 100644
--- a/app/code/Magento/Store/Model/Config/Placeholder.php
+++ b/app/code/Magento/Store/Model/Config/Placeholder.php
@@ -91,8 +91,9 @@ protected function _processPlaceholders($value, $data)
             if ($url) {
                 $value = str_replace('{{' . $placeholder . '}}', $url, $value);
             } elseif (strpos($value, $this->urlPlaceholder) !== false) {
-                // localhost is replaced for cli requests, for http requests method getDistroBaseUrl is used
-                $value = str_replace($this->urlPlaceholder, 'http://localhost/', $value);
+                $distroBaseUrl = $this->request->getDistroBaseUrl();
+
+                $value = str_replace($this->urlPlaceholder, $distroBaseUrl, $value);
             }
 
             if (null !== $this->_getPlaceholder($value)) {
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 01f56fb9e0566..ccc3c65491422 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -95,6 +95,11 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      */
     protected $_storeManager;
 
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -106,6 +111,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -118,11 +124,14 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Event\ManagerInterface $eventManager = null
     ) {
         $this->_configDataResource = $configDataResource;
         $this->_storeListFactory = $storeListFactory;
         $this->_storeManager = $storeManager;
+        $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Event\ManagerInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -405,6 +414,11 @@ public function beforeDelete()
      */
     public function afterDelete()
     {
+        $group = $this;
+        $this->getResource()->addCommitCallback(function () use ($group) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['group' => $group]);
+        });
         $result = parent::afterDelete();
 
         if ($this->getId() === $this->getWebsite()->getDefaultGroupId()) {
@@ -421,6 +435,19 @@ public function afterDelete()
         return $result;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function afterSave()
+    {
+        $group = $this;
+        $this->getResource()->addCommitCallback(function () use ($group) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_save', ['group' => $group]);
+        });
+        return parent::afterSave();
+    }
+
     /**
      * Get/Set isReadOnly flag
      *
diff --git a/app/code/Magento/Store/Model/HeaderProvider/Hsts.php b/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
index 623fbed57e6c6..b22775e0987cb 100644
--- a/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
+++ b/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
@@ -33,6 +33,8 @@ class Hsts extends \Magento\Framework\App\Response\HeaderProvider\AbstractHeader
     protected $scopeConfig;
 
     /**
+     * Hsts constructor.
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
@@ -41,11 +43,11 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canApply()
     {
-        return (bool)$this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
+        return $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
             && $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
             && $this->scopeConfig->isSetFlag(Store::XML_PATH_ENABLE_HSTS);
     }
diff --git a/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php b/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
index a0bd015c15061..0ef8726e07f1b 100644
--- a/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
+++ b/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
@@ -33,6 +33,8 @@ class UpgradeInsecure extends \Magento\Framework\App\Response\HeaderProvider\Abs
     protected $scopeConfig;
 
     /**
+     * UpgradeInsecure constructor.
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
@@ -41,11 +43,11 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canApply()
     {
-        return (bool)$this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
+        return $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_FRONTEND)
             && $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
             && $this->scopeConfig->isSetFlag(Store::XML_PATH_ENABLE_UPGRADE_INSECURE);
     }
diff --git a/app/code/Magento/Store/Model/Indexer/WebsiteDimensionProvider.php b/app/code/Magento/Store/Model/Indexer/WebsiteDimensionProvider.php
new file mode 100644
index 0000000000000..6fceeabc3597e
--- /dev/null
+++ b/app/code/Magento/Store/Model/Indexer/WebsiteDimensionProvider.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\Indexer;
+
+use Magento\Framework\Indexer\Dimension;
+use Magento\Store\Model\ResourceModel\Website\CollectionFactory as WebsiteCollectionFactory;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Indexer\DimensionProviderInterface;
+use Magento\Store\Model\Store;
+
+class WebsiteDimensionProvider implements DimensionProviderInterface
+{
+    /**
+     * Name for website dimension for multidimensional indexer
+     * 'ws' - stands for 'website_store'
+     */
+    const DIMENSION_NAME = 'ws';
+
+    /**
+     * @var WebsiteCollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var \SplFixedArray
+     */
+    private $websitesDataIterator;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @param WebsiteCollectionFactory $collectionFactory
+     * @param DimensionFactory $dimensionFactory
+     */
+    public function __construct(WebsiteCollectionFactory $collectionFactory, DimensionFactory $dimensionFactory)
+    {
+        $this->dimensionFactory = $dimensionFactory;
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @return Dimension[]|\Traversable
+     */
+    public function getIterator(): \Traversable
+    {
+        foreach ($this->getWebsites() as $website) {
+            yield $this->dimensionFactory->create(self::DIMENSION_NAME, (string)$website);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getWebsites(): array
+    {
+        if ($this->websitesDataIterator === null) {
+            $websites = $this->collectionFactory->create()
+                ->addFieldToFilter('code', ['neq' => Store::ADMIN_CODE])
+                ->getAllIds();
+            $this->websitesDataIterator = is_array($websites) ? $websites : [];
+        }
+
+        return $this->websitesDataIterator;
+    }
+}
diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
index dfe4eee31f9a2..6eeb93d7475fa 100644
--- a/app/code/Magento/Store/Model/PathConfig.php
+++ b/app/code/Magento/Store/Model/PathConfig.php
@@ -83,6 +83,8 @@ public function shouldBeSecure($path)
      */
     public function getDefaultPath()
     {
-        return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
+        $store = $this->storeManager->getStore();
+        $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
+        return $value;
     }
 }
diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
index 612d35e136d7e..7aa2c91652e86 100644
--- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php
+++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
@@ -12,8 +12,6 @@
 use Magento\Store\Model\StoreIsInactiveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use \InvalidArgumentException;
-use Magento\Store\Api\StoreResolverInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class StoreCookie
@@ -35,27 +33,19 @@ class StoreCookie
      */
     protected $storeRepository;
 
-    /**
-     * @var StoreResolverInterface
-     */
-    private $storeResolver;
-
     /**
      * @param StoreManagerInterface $storeManager
      * @param StoreCookieManagerInterface $storeCookieManager
      * @param StoreRepositoryInterface $storeRepository
-     * @param StoreResolverInterface $storeResolver
      */
     public function __construct(
         StoreManagerInterface $storeManager,
         StoreCookieManagerInterface $storeCookieManager,
-        StoreRepositoryInterface $storeRepository,
-        StoreResolverInterface $storeResolver = null
+        StoreRepositoryInterface $storeRepository
     ) {
         $this->storeManager = $storeManager;
         $this->storeCookieManager = $storeCookieManager;
         $this->storeRepository = $storeRepository;
-        $this->storeResolver = $storeResolver ?: ObjectManager::getInstance()->get(StoreResolverInterface::class);
     }
 
     /**
@@ -82,12 +72,5 @@ public function beforeDispatch(
                 $this->storeCookieManager->deleteStoreCookie($this->storeManager->getDefaultStoreView());
             }
         }
-        if ($this->storeCookieManager->getStoreCodeFromCookie() === null
-            || $request->getParam(StoreResolverInterface::PARAM_NAME) !== null
-        ) {
-            $storeId = $this->storeResolver->getCurrentStoreId();
-            $store = $this->storeRepository->getActiveStoreById($storeId);
-            $this->storeCookieManager->setStoreCookie($store);
-        }
     }
 }
diff --git a/app/code/Magento/Store/Model/Resolver/Group.php b/app/code/Magento/Store/Model/Resolver/Group.php
index 3235b9c61a8bd..fba1701a53fdd 100644
--- a/app/code/Magento/Store/Model/Resolver/Group.php
+++ b/app/code/Magento/Store/Model/Resolver/Group.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Resolver;
 
 use Magento\Framework\App\ScopeInterface;
@@ -33,7 +34,7 @@ public function getScope($scopeId = null)
     {
         $scope = $this->storeManager->getGroup($scopeId);
         if (!$scope instanceof ScopeInterface) {
-            throw new InitException(__('Invalid scope object'));
+            throw new InitException(__('The scope object is invalid. Verify the scope object and try again.'));
         }
 
         return $scope;
diff --git a/app/code/Magento/Store/Model/Resolver/Store.php b/app/code/Magento/Store/Model/Resolver/Store.php
index afbe10d8e25cb..c01e49cd644a5 100644
--- a/app/code/Magento/Store/Model/Resolver/Store.php
+++ b/app/code/Magento/Store/Model/Resolver/Store.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Resolver;
 
 class Store implements \Magento\Framework\App\ScopeResolverInterface
@@ -28,7 +29,9 @@ public function getScope($scopeId = null)
     {
         $scope = $this->_storeManager->getStore($scopeId);
         if (!$scope instanceof \Magento\Framework\App\ScopeInterface) {
-            throw new \Magento\Framework\Exception\State\InitException(__('Invalid scope object'));
+            throw new \Magento\Framework\Exception\State\InitException(
+                __('The scope object is invalid. Verify the scope object and try again.')
+            );
         }
 
         return $scope;
diff --git a/app/code/Magento/Store/Model/Resolver/Website.php b/app/code/Magento/Store/Model/Resolver/Website.php
index a8b88551d5e9d..87c2664bd1022 100644
--- a/app/code/Magento/Store/Model/Resolver/Website.php
+++ b/app/code/Magento/Store/Model/Resolver/Website.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Resolver;
 
 class Website implements \Magento\Framework\App\ScopeResolverInterface
@@ -29,7 +30,9 @@ public function getScope($scopeId = null)
     {
         $scope = $this->_storeManager->getWebsite($scopeId);
         if (!($scope instanceof \Magento\Framework\App\ScopeInterface)) {
-            throw new \Magento\Framework\Exception\State\InitException(__('Invalid scope object'));
+            throw new \Magento\Framework\Exception\State\InitException(
+                __('The scope object is invalid. Verify the scope object and try again.')
+            );
         }
 
         return $scope;
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
index 5b3a74d5d8d39..fb23e842a38e3 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/Store.php b/app/code/Magento/Store/Model/Store.php
index 3dff61b9e7a57..29a1f4a9c666e 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -18,6 +18,7 @@
 use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
+use Zend\Uri\UriFactory;
 
 /**
  * Store model
@@ -319,6 +320,11 @@ class Store extends AbstractExtensibleModel implements
      */
     private $urlModifier;
 
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -344,6 +350,7 @@ class Store extends AbstractExtensibleModel implements
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param bool $isCustomEntryPoint
      * @param array $data optional generic object data
+     * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -371,7 +378,8 @@ public function __construct(
         \Magento\Store\Api\WebsiteRepositoryInterface $websiteRepository,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         $isCustomEntryPoint = false,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Event\ManagerInterface $eventManager = null
     ) {
         $this->_coreFileStorageDatabase = $coreFileStorageDatabase;
         $this->_config = $config;
@@ -390,6 +398,8 @@ public function __construct(
         $this->_currencyInstalled = $currencyInstalled;
         $this->groupRepository = $groupRepository;
         $this->websiteRepository = $websiteRepository;
+        $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Event\ManagerInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -402,7 +412,7 @@ public function __construct(
     }
 
     /**
-     * @return string[]
+     * @inheritdoc
      */
     public function __sleep()
     {
@@ -454,6 +464,7 @@ protected function _getSession()
      * Validation rules for store
      *
      * @return \Zend_Validate_Interface|null
+     * @throws \Zend_Validate_Exception
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -479,9 +490,11 @@ protected function _getValidationRulesBeforeSave()
     /**
      * Loading store data
      *
-     * @param   mixed $key
-     * @param   string $field
-     * @return  $this
+     * @param mixed $key
+     * @param string $field
+     *
+     * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function load($key, $field = null)
     {
@@ -535,8 +548,8 @@ public function setName($name)
     public function getConfig($path)
     {
         $data = $this->_config->getValue($path, ScopeInterface::SCOPE_STORE, $this->getCode());
-        if (!$data) {
-            $data = $this->_config->getValue($path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        if ($data === null) {
+            $data = $this->_config->getValue($path);
         }
         return $data === false ? null : $data;
     }
@@ -556,6 +569,7 @@ public function setWebsite(Website $website)
      * Retrieve store website
      *
      * @return Website|bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getWebsite()
     {
@@ -568,9 +582,11 @@ public function getWebsite()
     /**
      * Retrieve url using store configuration specific
      *
-     * @param   string $route
-     * @param   array $params
-     * @return  string
+     * @param string $route
+     * @param array $params
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getUrl($route = '', $params = [])
     {
@@ -776,7 +792,7 @@ public function isFrontUrlSecure()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isUrlSecure()
     {
@@ -801,7 +817,7 @@ public function isCurrentlySecure()
             return false;
         }
 
-        $uri = \Zend_Uri::factory($secureBaseUrl);
+        $uri = UriFactory::factory($secureBaseUrl);
         $port = $uri->getPort();
         $serverPort = $this->_request->getServer('SERVER_PORT');
         $isSecure = $uri->getScheme() == 'https' && isset($serverPort) && $port == $serverPort;
@@ -870,8 +886,10 @@ public function getDefaultCurrency()
     /**
      * Set current store currency code
      *
-     * @param   string $code
-     * @return  string
+     * @param string $code
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function setCurrentCurrencyCode($code)
     {
@@ -892,23 +910,17 @@ public function setCurrentCurrencyCode($code)
      */
     public function getCurrentCurrencyCode()
     {
+        $availableCurrencyCodes = \array_values($this->getAvailableCurrencyCodes(true));
         // try to get currently set code among allowed
-        $code = $this->_httpContext->getValue(Context::CONTEXT_CURRENCY);
-        $code = $code === null ? $this->_getSession()->getCurrencyCode() : $code;
-        if (empty($code)) {
+        $code = $this->_httpContext->getValue(Context::CONTEXT_CURRENCY) ?? $this->_getSession()->getCurrencyCode();
+        if (empty($code) || !\in_array($code, $availableCurrencyCodes)) {
             $code = $this->getDefaultCurrencyCode();
-        }
-        if (in_array($code, $this->getAvailableCurrencyCodes(true))) {
-            return $code;
+            if (!\in_array($code, $availableCurrencyCodes) && !empty($availableCurrencyCodes)) {
+                $code = $availableCurrencyCodes[0];
+            }
         }
 
-        // take first one of allowed codes
-        $codes = array_values($this->getAvailableCurrencyCodes(true));
-        if (empty($codes)) {
-            // return default code, if no codes specified at all
-            return $this->getDefaultCurrencyCode();
-        }
-        return array_shift($codes);
+        return $code;
     }
 
     /**
@@ -962,6 +974,7 @@ public function getAllowedCurrencies()
      * Retrieve store current currency
      *
      * @return Currency
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getCurrentCurrency()
     {
@@ -984,6 +997,7 @@ public function getCurrentCurrency()
      * Retrieve current currency rate
      *
      * @return float
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getCurrentCurrencyRate()
     {
@@ -994,6 +1008,7 @@ public function getCurrentCurrencyRate()
      * Retrieve root category identifier
      *
      * @return int
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getRootCategoryId()
     {
@@ -1019,6 +1034,7 @@ public function setGroup(Group $group)
      * Retrieve group model
      *
      * @return Group|bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getGroup()
     {
@@ -1048,6 +1064,15 @@ public function getWebsiteId()
     public function afterSave()
     {
         $this->_storeManager->reinitStores();
+        if ($this->isObjectNew()) {
+            $event = $this->_eventPrefix . '_add';
+        } else {
+            $event = $this->_eventPrefix . '_edit';
+        }
+        $store  = $this;
+        $this->getResource()->addCommitCallback(function () use ($event, $store) {
+            $this->eventManager->dispatch($event, ['store' => $store]);
+        });
         return parent::afterSave();
     }
 
@@ -1117,6 +1142,7 @@ public function getDefaultGroupId()
      * Check if store can be deleted
      *
      * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isCanDelete()
     {
@@ -1132,6 +1158,7 @@ public function isCanDelete()
      *
      * @return boolean
      * @since 100.1.0
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isDefault()
     {
@@ -1144,10 +1171,12 @@ public function isDefault()
     /**
      * Retrieve current url for store
      *
-     * @param bool|string $fromStore
+     * @param bool $fromStore
+     *
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getCurrentUrl($fromStore = true)
     {
@@ -1182,18 +1211,29 @@ public function getCurrentUrl($fromStore = true)
         if (!$this->isUseStoreInUrl()) {
             $storeParsedQuery['___store'] = $this->getCode();
         }
+
         if ($fromStore !== false) {
             $storeParsedQuery['___from_store'] = $fromStore ===
                 true ? $this->_storeManager->getStore()->getCode() : $fromStore;
         }
 
+        $requestStringParts = explode('?', $requestString, 2);
+        $requestStringPath = $requestStringParts[0];
+        if (isset($requestStringParts[1])) {
+            parse_str($requestStringParts[1], $requestString);
+        } else {
+            $requestString = [];
+        }
+
+        $currentUrlQueryParams = array_merge($requestString, $storeParsedQuery);
+
         $currentUrl = $storeParsedUrl['scheme']
             . '://'
             . $storeParsedUrl['host']
             . (isset($storeParsedUrl['port']) ? ':' . $storeParsedUrl['port'] : '')
             . $storeParsedUrl['path']
-            . $requestString
-            . ($storeParsedQuery ? '?' . http_build_query($storeParsedQuery, '', '&amp;') : '');
+            . $requestStringPath
+            . ($currentUrlQueryParams ? '?' . http_build_query($currentUrlQueryParams) : '');
 
         return $currentUrl;
     }
@@ -1212,6 +1252,7 @@ public function isActive()
      * Protect delete from non admin area
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function beforeDelete()
     {
@@ -1223,9 +1264,15 @@ public function beforeDelete()
      * Rewrite in order to clear configuration cache
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function afterDelete()
     {
+        $store = $this;
+        $this->getResource()->addCommitCallback(function () use ($store) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['store' => $store]);
+        });
         parent::afterDelete();
         $this->_configCacheType->clean();
 
@@ -1240,6 +1287,7 @@ public function afterDelete()
             $this->getGroup()->setDefaultStoreId($defaultId);
             $this->getGroup()->save();
         }
+
         return $this;
     }
 
@@ -1276,6 +1324,7 @@ public function isReadOnly($value = null)
      * Retrieve store group name
      *
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getFrontendName()
     {
@@ -1308,17 +1357,18 @@ public function getIdentities()
     }
 
     /**
+     * Return Store Path
+     *
      * @return string
      */
     public function getStorePath()
     {
         $parsedUrl = parse_url($this->getBaseUrl());
-        return isset($parsedUrl['path']) ? $parsedUrl['path'] : '/';
+        return $parsedUrl['path'] ?? '/';
     }
 
     /**
-     * {@inheritdoc}
-     * @since 100.1.0
+     * @inheritdoc
      */
     public function getScopeType()
     {
@@ -1326,8 +1376,7 @@ public function getScopeType()
     }
 
     /**
-     * {@inheritdoc}
-     * @since 100.1.0
+     * @inheritdoc
      */
     public function getScopeTypeName()
     {
@@ -1335,7 +1384,7 @@ public function getScopeTypeName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -1343,7 +1392,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Model/StoreDimensionProvider.php b/app/code/Magento/Store/Model/StoreDimensionProvider.php
new file mode 100644
index 0000000000000..17f75fb863d9c
--- /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\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, (string)$storeId)];
+        }
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
index a3423b96c3fe4..0fce3a5217058 100644
--- a/app/code/Magento/Store/Model/StoreManager.php
+++ b/app/code/Magento/Store/Model/StoreManager.php
@@ -6,6 +6,7 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\ResourceModel\StoreWebsiteRelation;
 
@@ -29,7 +30,7 @@ class StoreManager implements
     const PARAM_RUN_TYPE = 'MAGE_RUN_TYPE';
 
     /**
-     * Wether single store mode enabled or not
+     * Whether single store mode enabled or not
      */
     const XML_PATH_SINGLE_STORE_MODE_ENABLED = 'general/single_store_mode/enabled';
 
@@ -87,6 +88,8 @@ class StoreManager implements
     protected $isSingleStoreAllowed;
 
     /**
+     * StoreManager constructor.
+     *
      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
      * @param \Magento\Store\Api\GroupRepositoryInterface $groupRepository
      * @param \Magento\Store\Api\WebsiteRepositoryInterface $websiteRepository
@@ -114,7 +117,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCurrentStore($store)
     {
@@ -122,7 +125,7 @@ public function setCurrentStore($store)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsSingleStoreModeAllowed($value)
     {
@@ -130,7 +133,7 @@ public function setIsSingleStoreModeAllowed($value)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function hasSingleStore()
     {
@@ -139,7 +142,7 @@ public function hasSingleStore()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isSingleStoreMode()
     {
@@ -147,7 +150,7 @@ public function isSingleStoreMode()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStore($storeId = null)
     {
@@ -171,7 +174,7 @@ public function getStore($storeId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStores($withDefault = false, $codeKey = false)
     {
@@ -190,7 +193,7 @@ public function getStores($withDefault = false, $codeKey = false)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getWebsite($websiteId = null)
     {
@@ -210,7 +213,7 @@ public function getWebsite($websiteId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getWebsites($withDefault = false, $codeKey = false)
     {
@@ -229,7 +232,7 @@ public function getWebsites($withDefault = false, $codeKey = false)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function reinitStores()
     {
@@ -242,7 +245,7 @@ public function reinitStores()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultStoreView()
     {
@@ -252,7 +255,7 @@ public function getDefaultStoreView()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGroup($groupId = null)
     {
@@ -267,7 +270,7 @@ public function getGroup($groupId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGroups($withDefault = false)
     {
@@ -291,13 +294,15 @@ function ($item) {
      */
     protected function isSingleStoreModeEnabled()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
     /**
+     * Get Store Website Relation
+     *
      * @deprecated 100.2.0
      * @return StoreWebsiteRelation
      */
diff --git a/app/code/Magento/Store/Model/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php
index 84e498851ec32..f440515f23e0b 100644
--- a/app/code/Magento/Store/Model/StoreManagerInterface.php
+++ b/app/code/Magento/Store/Model/StoreManagerInterface.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Store\Model;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Store manager interface
  *
@@ -19,6 +21,11 @@ interface StoreManagerInterface
      */
     const CONTEXT_STORE = 'store';
 
+    /**
+     * The store GET Param name
+     */
+    const PARAM_NAME = '___store';
+
     /**
      * Allow or disallow single store mode
      *
@@ -46,6 +53,7 @@ public function isSingleStoreMode();
      *
      * @param null|string|bool|int|\Magento\Store\Api\Data\StoreInterface $storeId
      * @return \Magento\Store\Api\Data\StoreInterface
+     * @throws NoSuchEntityException If given store doesn't exist.
      */
     public function getStore($storeId = null);
 
diff --git a/app/code/Magento/Store/Model/StoreRepository.php b/app/code/Magento/Store/Model/StoreRepository.php
index 35871312da816..7e6773c2d24a3 100644
--- a/app/code/Magento/Store/Model/StoreRepository.php
+++ b/app/code/Magento/Store/Model/StoreRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\ObjectManager;
@@ -71,7 +72,9 @@ public function get($code)
         ]);
 
         if ($store->getId() === null) {
-            throw new NoSuchEntityException(__('Requested store is not found'));
+            throw new NoSuchEntityException(
+                __("The store that was requested wasn't found. Verify the store and try again.")
+            );
         }
         $this->entities[$code] = $store;
         $this->entitiesById[$store->getId()] = $store;
@@ -106,7 +109,9 @@ public function getById($id)
         ]);
 
         if ($store->getId() === null) {
-            throw new NoSuchEntityException(__('Requested store is not found'));
+            throw new NoSuchEntityException(
+                __("The store that was requested wasn't found. Verify the store and try again.")
+            );
         }
 
         $this->entitiesById[$id] = $store;
diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php
index 3f449f10c6d42..aafdd15138981 100644
--- a/app/code/Magento/Store/Model/StoreResolver.php
+++ b/app/code/Magento/Store/Model/StoreResolver.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Store\Model;
+declare(strict_types=1);
 
-use Magento\Framework\Serialize\SerializerInterface;
+namespace Magento\Store\Model;
 
+/**
+ * Class used to resolve store from url path or get parameters or cookie.
+ */
 class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
 {
     /**
@@ -25,12 +28,12 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
     protected $storeCookieManager;
 
     /**
-     * @var \Magento\Framework\Cache\FrontendInterface
+     * @deprecated
      */
     protected $cache;
 
     /**
-     * @var \Magento\Store\Model\StoreResolver\ReaderList
+     * @deprecated
      */
     protected $readerList;
 
@@ -45,56 +48,70 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
     protected $scopeCode;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface
+     * @var \Magento\Framework\App\Request\Http
      */
     protected $request;
 
     /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var StoresData
+     */
+    private $storesData;
+
+    /**
+     * @var \Magento\Store\App\Request\StorePathInfoValidator
      */
-    private $serializer;
+    private $storePathInfoValidator;
 
     /**
      * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository
      * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Framework\Cache\FrontendInterface $cache
-     * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList
-     * @param string $runMode
-     * @param null $scopeCode
+     * @param \Magento\Framework\App\Request\Http $request
+     * @param \Magento\Store\Model\StoresData $storesData
+     * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator
+     * @param string|null $runMode
+     * @param string|null $scopeCode
      */
     public function __construct(
         \Magento\Store\Api\StoreRepositoryInterface $storeRepository,
         \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager,
-        \Magento\Framework\App\RequestInterface $request,
-        \Magento\Framework\Cache\FrontendInterface $cache,
-        \Magento\Store\Model\StoreResolver\ReaderList $readerList,
+        \Magento\Framework\App\Request\Http $request,
+        \Magento\Store\Model\StoresData $storesData,
+        \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator,
         $runMode = ScopeInterface::SCOPE_STORE,
         $scopeCode = null
     ) {
         $this->storeRepository = $storeRepository;
         $this->storeCookieManager = $storeCookieManager;
         $this->request = $request;
-        $this->cache = $cache;
-        $this->readerList = $readerList;
+        $this->storePathInfoValidator = $storePathInfoValidator;
+        $this->storesData = $storesData;
         $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE;
         $this->scopeCode = $scopeCode;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCurrentStoreId()
     {
         list($stores, $defaultStoreId) = $this->getStoresData();
 
-        $storeCode = $this->request->getParam(self::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie());
+        $storeCode = $this->storePathInfoValidator->getValidStoreCode($this->request);
+
+        if (!$storeCode) {
+            $storeCode = $this->request->getParam(
+                \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
+                $this->storeCookieManager->getStoreCodeFromCookie()
+            );
+        }
+
         if (is_array($storeCode)) {
             if (!isset($storeCode['_data']['code'])) {
                 throw new \InvalidArgumentException(__('Invalid store parameter.'));
             }
             $storeCode = $storeCode['_data']['code'];
         }
+
         if ($storeCode) {
             try {
                 $store = $this->getRequestedStoreByCode($storeCode);
@@ -116,28 +133,21 @@ public function getCurrentStoreId()
      *
      * @return array
      */
-    protected function getStoresData()
+    protected function getStoresData() : array
     {
-        $cacheKey = 'resolved_stores_' . md5($this->runMode . $this->scopeCode);
-        $cacheData = $this->cache->load($cacheKey);
-        if ($cacheData) {
-            $storesData = $this->getSerializer()->unserialize($cacheData);
-        } else {
-            $storesData = $this->readStoresData();
-            $this->cache->save($this->getSerializer()->serialize($storesData), $cacheKey, [self::CACHE_TAG]);
-        }
-        return $storesData;
+        return $this->storesData->getStoresData($this->runMode, $this->scopeCode);
     }
 
     /**
      * Read stores data. First element is allowed store ids, second is default store id
      *
      * @return array
+     * @deprecated
+     * @see \Magento\Store\Model\StoreResolver::getStoresData
      */
-    protected function readStoresData()
+    protected function readStoresData() : array
     {
-        $reader = $this->readerList->getReader($this->runMode);
-        return [$reader->getAllowedStoreIds($this->scopeCode), $reader->getDefaultStoreId($this->scopeCode)];
+        return $this->getStoresData();
     }
 
     /**
@@ -147,7 +157,7 @@ protected function readStoresData()
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function getRequestedStoreByCode($storeCode)
+    protected function getRequestedStoreByCode($storeCode) : \Magento\Store\Api\Data\StoreInterface
     {
         try {
             $store = $this->storeRepository->getActiveStoreByCode($storeCode);
@@ -165,7 +175,7 @@ protected function getRequestedStoreByCode($storeCode)
      * @return \Magento\Store\Api\Data\StoreInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function getDefaultStoreById($id)
+    protected function getDefaultStoreById($id) : \Magento\Store\Api\Data\StoreInterface
     {
         try {
             $store = $this->storeRepository->getActiveStoreById($id);
@@ -175,19 +185,4 @@ protected function getDefaultStoreById($id)
 
         return $store;
     }
-
-    /**
-     * Get serializer
-     *
-     * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(SerializerInterface::class);
-        }
-        return $this->serializer;
-    }
 }
diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php
index 29f85716fea29..e314538099c8f 100644
--- a/app/code/Magento/Store/Model/StoreResolver/Website.php
+++ b/app/code/Magento/Store/Model/StoreResolver/Website.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Store\Model\StoreResolver;
 
+/**
+ * Reader implementation for website.
+ */
 class Website implements ReaderInterface
 {
     /**
@@ -38,22 +41,25 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllowedStoreIds($scopeCode)
     {
         $stores = [];
         $website = $scopeCode ? $this->websiteRepository->get($scopeCode) : $this->websiteRepository->getDefault();
         foreach ($this->storeRepository->getList() as $store) {
-            if ($store->isActive() && $store->getWebsiteId() == $website->getId()) {
-                $stores[] = $store->getId();
+            if ($store->getIsActive()) {
+                if (($scopeCode && $store->getWebsiteId() == $website->getId()) || (!$scopeCode)) {
+                    $stores[$store->getId()] = $store->getId();
+                }
             }
         }
+        sort($stores);
         return $stores;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultStoreId($scopeCode)
     {
diff --git a/app/code/Magento/Store/Model/StoreSwitcher.php b/app/code/Magento/Store/Model/StoreSwitcher.php
new file mode 100644
index 0000000000000..a294b6a0d6b0a
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model;
+
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreSwitcher\CannotSwitchStoreException;
+
+/**
+ * Handles store switching procedure and detects url for final redirect after store switching.
+ */
+class StoreSwitcher implements StoreSwitcherInterface
+{
+    /**
+     * @var StoreSwitcherInterface[]
+     */
+    private $storeSwitchers;
+
+    /**
+     * @param StoreSwitcherInterface[] $storeSwitchers
+     * @throws \Exception
+     */
+    public function __construct(array $storeSwitchers)
+    {
+        foreach ($storeSwitchers as $switcherName => $switcherInstance) {
+            if (!$switcherInstance instanceof StoreSwitcherInterface) {
+                throw new \InvalidArgumentException(
+                    "Store switcher '{$switcherName}' is expected to implement interface "
+                    . StoreSwitcherInterface::class
+                );
+            }
+        }
+        $this->storeSwitchers = $storeSwitchers;
+    }
+
+    /**
+     * @param StoreInterface $fromStore store where we came from
+     * @param StoreInterface $targetStore store where to go to
+     * @param string $redirectUrl original url requested for redirect after switching
+     * @return string url to be redirected after switching
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws CannotSwitchStoreException
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
+    {
+        $targetUrl = $redirectUrl;
+
+        foreach ($this->storeSwitchers as $storeSwitcher) {
+            $targetUrl = $storeSwitcher->switch($fromStore, $targetStore, $targetUrl);
+        }
+
+        return $targetUrl;
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/CannotSwitchStoreException.php b/app/code/Magento/Store/Model/StoreSwitcher/CannotSwitchStoreException.php
new file mode 100644
index 0000000000000..c6afd71cb6f01
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/CannotSwitchStoreException.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\StoreSwitcher;
+
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Phrase;
+
+/**
+ * Exception thrown if store cannot be switched.
+ */
+class CannotSwitchStoreException extends RuntimeException
+{
+    /**
+     * @param \Exception|null $cause
+     * @param Phrase|null $phrase
+     * @param int $code
+     */
+    public function __construct(\Exception $cause = null, Phrase $phrase = null, int $code = 0)
+    {
+        parent::__construct($phrase ?: __('The store cannot be switched.'), $cause, $code);
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php b/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php
new file mode 100644
index 0000000000000..3328a21e8f5e1
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\StoreSwitcher;
+
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreSwitcherInterface;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+
+/**
+ * Remove SID, from_store, store from target url.
+ */
+class CleanTargetUrl implements StoreSwitcherInterface
+{
+    /**
+     * @var UrlHelper
+     */
+    private $urlHelper;
+
+    /**
+     * @var \Magento\Framework\Session\Generic
+     */
+    private $session;
+
+    /**
+     * @var \Magento\Framework\Session\SidResolverInterface
+     */
+    private $sidResolver;
+
+    /**
+     * @param UrlHelper $urlHelper
+     * @param \Magento\Framework\Session\Generic $session
+     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
+     */
+    public function __construct(
+        UrlHelper $urlHelper,
+        \Magento\Framework\Session\Generic $session,
+        \Magento\Framework\Session\SidResolverInterface $sidResolver
+    ) {
+        $this->urlHelper = $urlHelper;
+        $this->session = $session;
+        $this->sidResolver = $sidResolver;
+    }
+
+    /**
+     * @param StoreInterface $fromStore store where we came from
+     * @param StoreInterface $targetStore store where to go to
+     * @param string $redirectUrl original url requested for redirect after switching
+     * @return string redirect url
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
+    {
+        $targetUrl = $redirectUrl;
+        $sidName = $this->sidResolver->getSessionIdQueryParam($this->session);
+        $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, $sidName);
+        $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, '___from_store');
+        $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, StoreResolverInterface::PARAM_NAME);
+
+        return $targetUrl;
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/ManagePrivateContent.php b/app/code/Magento/Store/Model/StoreSwitcher/ManagePrivateContent.php
new file mode 100644
index 0000000000000..8aed785641efe
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/ManagePrivateContent.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\StoreSwitcher;
+
+use Magento\Store\Model\StoreSwitcherInterface;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Set private content cookie to have actual local storage data on target store after store switching.
+ */
+class ManagePrivateContent implements StoreSwitcherInterface
+{
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\CookieManagerInterface
+     */
+    private $cookieManager;
+
+    /**
+     * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
+     * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
+     */
+    public function __construct(
+        \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
+        \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
+    ) {
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
+        $this->cookieManager = $cookieManager;
+    }
+
+    /**
+     * @param StoreInterface $fromStore store where we came from
+     * @param StoreInterface $targetStore store where to go to
+     * @param string $redirectUrl original url requested for redirect after switching
+     * @return string redirect url
+     * @throws CannotSwitchStoreException
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
+    {
+        try {
+            $publicCookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setDurationOneYear()
+                ->setPath('/')
+                ->setSecure(false)
+                ->setHttpOnly(false);
+            $this->cookieManager->setPublicCookie(
+                \Magento\Framework\App\PageCache\Version::COOKIE_NAME,
+                'should_be_updated',
+                $publicCookieMetadata
+            );
+        } catch (\Exception $e) {
+            throw new CannotSwitchStoreException($e);
+        }
+
+        return $redirectUrl;
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/ManageStoreCookie.php b/app/code/Magento/Store/Model/StoreSwitcher/ManageStoreCookie.php
new file mode 100644
index 0000000000000..7a485be090af6
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/ManageStoreCookie.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\StoreSwitcher;
+
+use Magento\Store\Model\StoreSwitcherInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Store\Api\StoreCookieManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
+
+/**
+ * Manage store cookie depending on what store view customer is.
+ */
+class ManageStoreCookie implements StoreSwitcherInterface
+{
+    /**
+     * @var StoreCookieManagerInterface
+     */
+    private $storeCookieManager;
+
+    /**
+     * @var HttpContext
+     */
+    private $httpContext;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreCookieManagerInterface $storeCookieManager
+     * @param HttpContext $httpContext
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        StoreCookieManagerInterface $storeCookieManager,
+        HttpContext $httpContext,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->storeCookieManager = $storeCookieManager;
+        $this->httpContext = $httpContext;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @param StoreInterface $fromStore store where we came from
+     * @param StoreInterface $targetStore store where to go to
+     * @param string $redirectUrl original url requested for redirect after switching
+     * @return string redirect url
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
+    {
+        $defaultStoreView = $this->storeManager->getDefaultStoreView();
+        if ($defaultStoreView !== null) {
+            if ($defaultStoreView->getId() === $targetStore->getId()) {
+                $this->storeCookieManager->deleteStoreCookie($targetStore);
+            } else {
+                $this->httpContext->setValue(Store::ENTITY, $targetStore->getCode(), $defaultStoreView->getCode());
+                $this->storeCookieManager->setStoreCookie($targetStore);
+            }
+        }
+
+        return $redirectUrl;
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcherInterface.php b/app/code/Magento/Store/Model/StoreSwitcherInterface.php
new file mode 100644
index 0000000000000..ee6fb0b4763c6
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcherInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model;
+
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreSwitcher\CannotSwitchStoreException;
+
+/**
+ * Handles store switching procedure and detects url for final redirect after store switching.
+ */
+interface StoreSwitcherInterface
+{
+    /**
+     * @param StoreInterface $fromStore store where we came from
+     * @param StoreInterface $targetStore store where to go to
+     * @param string $redirectUrl original url requested for redirect after switching
+     * @return string url to be redirected after switching
+     * @throws CannotSwitchStoreException
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string;
+}
diff --git a/app/code/Magento/Store/Model/StoresData.php b/app/code/Magento/Store/Model/StoresData.php
new file mode 100644
index 0000000000000..b3d00bc97cd2e
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoresData.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model;
+
+/**
+ * Class that computes and stores into cache the active store ids.
+ */
+class StoresData
+{
+    /**
+     * Cache tag
+     */
+    const CACHE_TAG = 'store_relations';
+
+    /**
+     * @var \Magento\Framework\Cache\FrontendInterface
+     */
+    private $cache;
+
+    /**
+     * @var \Magento\Store\Model\StoreResolver\ReaderList
+     */
+    private $readerList;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\Cache\FrontendInterface $cache
+     * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Cache\FrontendInterface $cache,
+        \Magento\Store\Model\StoreResolver\ReaderList $readerList,
+        \Magento\Framework\Serialize\SerializerInterface $serializer
+    ) {
+        $this->cache = $cache;
+        $this->readerList = $readerList;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Get stores data
+     *
+     * @param string $runMode
+     * @param string|null $scopeCode
+     * @return array
+     */
+    public function getStoresData(string $runMode, string $scopeCode = null) : array
+    {
+        $cacheKey = 'resolved_stores_' . md5($runMode . $scopeCode);
+        $cacheData = $this->cache->load($cacheKey);
+        if ($cacheData) {
+            $storesData = $this->serializer->unserialize($cacheData);
+        } else {
+            $reader = $this->readerList->getReader($runMode);
+            $storesData = [$reader->getAllowedStoreIds($scopeCode), $reader->getDefaultStoreId($scopeCode)];
+            $this->cache->save(
+                $this->serializer->serialize($storesData),
+                $cacheKey,
+                [
+                    self::CACHE_TAG,
+                    \Magento\Store\Model\Store::CACHE_TAG
+                ]
+            );
+        }
+        return $storesData;
+    }
+}
diff --git a/app/code/Magento/Store/Model/WebsiteRepository.php b/app/code/Magento/Store/Model/WebsiteRepository.php
index 94fd59c7634df..e01bc8191b355 100644
--- a/app/code/Magento/Store/Model/WebsiteRepository.php
+++ b/app/code/Magento/Store/Model/WebsiteRepository.php
@@ -3,12 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model;
 
+use Magento\Framework\App\Config;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\ResourceModel\Website\CollectionFactory;
-use Magento\Framework\App\Config;
 
 /**
  * Information Expert in store websites handling
@@ -63,7 +64,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($code)
     {
@@ -77,7 +78,14 @@ public function get($code)
         ]);
 
         if ($website->getId() === null) {
-            throw new NoSuchEntityException();
+            throw new NoSuchEntityException(
+                __(
+                    sprintf(
+                        "The website with code %s that was requested wasn't found. Verify the website and try again.",
+                        $code
+                    )
+                )
+            );
         }
         $this->entities[$code] = $website;
         $this->entitiesById[$website->getId()] = $website;
@@ -85,7 +93,7 @@ public function get($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getById($id)
     {
@@ -99,7 +107,14 @@ public function getById($id)
         ]);
 
         if ($website->getId() === null) {
-            throw new NoSuchEntityException();
+            throw new NoSuchEntityException(
+                __(
+                    sprintf(
+                        "The website with id %s that was requested wasn't found. Verify the website and try again.",
+                        $id
+                    )
+                )
+            );
         }
         $this->entities[$website->getCode()] = $website;
         $this->entitiesById[$id] = $website;
@@ -107,7 +122,7 @@ public function getById($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList()
     {
@@ -126,7 +141,7 @@ public function getList()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefault()
     {
@@ -141,7 +156,7 @@ public function getDefault()
                 $this->initDefaultWebsite();
             }
             if (!$this->default) {
-                throw new \DomainException(__('Default website is not defined'));
+                throw new \DomainException(__("The default website isn't defined. Set the website and try again."));
             }
         }
 
@@ -149,7 +164,7 @@ public function getDefault()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function clean()
     {
@@ -175,6 +190,7 @@ private function getAppConfig()
 
     /**
      * Initialize default website.
+     *
      * @return void
      */
     private function initDefaultWebsite()
@@ -183,7 +199,12 @@ private function initDefaultWebsite()
         foreach ($websites as $data) {
             if (isset($data['is_default']) && $data['is_default'] == 1) {
                 if ($this->default) {
-                    throw new \DomainException(__('More than one default website is defined'));
+                    throw new \DomainException(
+                        __(
+                            'The default website is invalid. '
+                            . 'Make sure no more than one default is defined and try again.'
+                        )
+                    );
                 }
                 $website = $this->factory->create([
                     'data' => $data
diff --git a/app/code/Magento/Store/Setup/InstallSchema.php b/app/code/Magento/Store/Setup/InstallSchema.php
deleted file mode 100644
index f6cdfb6fcba71..0000000000000
--- a/app/code/Magento/Store/Setup/InstallSchema.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Store\Setup;
-
-use Magento\Catalog\Helper\DefaultCategory;
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * @var DefaultCategory
-     */
-    private $defaultCategory;
-
-    /**
-     * @deprecated 100.1.0
-     * @return DefaultCategory
-     */
-    private function getDefaultCategory()
-    {
-        if ($this->defaultCategory === null) {
-            $this->defaultCategory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(DefaultCategory::class);
-        }
-        return $this->defaultCategory;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-        $connection = $installer->getConnection();
-
-        /**
-         * Create table 'store_website'
-         */
-        $table = $connection->newTable(
-            $installer->getTable('store_website')
-        )->addColumn(
-            'website_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Website Id'
-        )->addColumn(
-            'code',
-            Table::TYPE_TEXT,
-            32,
-            [],
-            'Code'
-        )->addColumn(
-            'name',
-            Table::TYPE_TEXT,
-            64,
-            [],
-            'Website Name'
-        )->addColumn(
-            'sort_order',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addColumn(
-            'default_group_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Default Group Id'
-        )->addColumn(
-            'is_default',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'default' => '0'],
-            'Defines Is Website Default'
-        )->addIndex(
-            $installer->getIdxName(
-                'store_website',
-                ['code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('store_website', ['sort_order']),
-            ['sort_order']
-        )->addIndex(
-            $installer->getIdxName('store_website', ['default_group_id']),
-            ['default_group_id']
-        )->setComment(
-            'Websites'
-        );
-        $connection->createTable($table);
-
-        /**
-         * Create table 'store_group'
-         */
-        $table = $connection->newTable(
-            $installer->getTable('store_group')
-        )->addColumn(
-            'group_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Group Id'
-        )->addColumn(
-            'website_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website Id'
-        )->addColumn(
-            'name',
-            Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Store Group Name'
-        )->addColumn(
-            'root_category_id',
-            Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Root Category Id'
-        )->addColumn(
-            'default_store_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Default Store Id'
-        )->addIndex(
-            $installer->getIdxName('store_group', ['website_id']),
-            ['website_id']
-        )->addIndex(
-            $installer->getIdxName('store_group', ['default_store_id']),
-            ['default_store_id']
-        )->addForeignKey(
-            $installer->getFkName('store_group', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            Table::ACTION_CASCADE
-        )->setComment(
-            'Store Groups'
-        );
-        $connection->createTable($table);
-
-        /**
-         * Create table 'store'
-         */
-        $table = $connection->newTable(
-            $installer->getTable('store')
-        )->addColumn(
-            'store_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store Id'
-        )->addColumn(
-            'code',
-            Table::TYPE_TEXT,
-            32,
-            [],
-            'Code'
-        )->addColumn(
-            'website_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website Id'
-        )->addColumn(
-            'group_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Group Id'
-        )->addColumn(
-            'name',
-            Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Store Name'
-        )->addColumn(
-            'sort_order',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Sort Order'
-        )->addColumn(
-            'is_active',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Activity'
-        )->addIndex(
-            $installer->getIdxName(
-                'store',
-                ['code'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['code'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('store', ['website_id']),
-            ['website_id']
-        )->addIndex(
-            $installer->getIdxName('store', ['is_active', 'sort_order']),
-            ['is_active', 'sort_order']
-        )->addIndex(
-            $installer->getIdxName('store', ['group_id']),
-            ['group_id']
-        )->addForeignKey(
-            $installer->getFkName('store', 'group_id', 'store_group', 'group_id'),
-            'group_id',
-            $installer->getTable('store_group'),
-            'group_id',
-            Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('store', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            Table::ACTION_CASCADE
-        )->setComment(
-            'Stores'
-        );
-        $connection->createTable($table);
-
-        /**
-         * Insert websites
-         */
-        $connection->insertForce(
-            $installer->getTable('store_website'),
-            [
-                'website_id' => 0,
-                'code' => 'admin',
-                'name' => 'Admin',
-                'sort_order' => 0,
-                'default_group_id' => 0,
-                'is_default' => 0
-            ]
-        );
-        $connection->insertForce(
-            $installer->getTable('store_website'),
-            [
-                'website_id' => 1,
-                'code' => 'base',
-                'name' => 'Main Website',
-                'sort_order' => 0,
-                'default_group_id' => 1,
-                'is_default' => 1
-            ]
-        );
-
-        /**
-         * Insert store groups
-         */
-        $connection->insertForce(
-            $installer->getTable('store_group'),
-            ['group_id' => 0, 'website_id' => 0, 'name' => 'Default', 'root_category_id' => 0, 'default_store_id' => 0]
-        );
-        $connection->insertForce(
-            $installer->getTable('store_group'),
-            [
-                'group_id' => 1,
-                'website_id' => 1,
-                'name' => 'Main Website Store',
-                'root_category_id' => $this->getDefaultCategory()->getId(),
-                'default_store_id' => 1
-            ]
-        );
-
-        /**
-         * Insert stores
-         */
-        $connection->insertForce(
-            $installer->getTable('store'),
-            [
-                'store_id' => 0,
-                'code' => 'admin',
-                'website_id' => 0,
-                'group_id' => 0,
-                'name' => 'Admin',
-                'sort_order' => 0,
-                'is_active' => 1
-            ]
-        );
-        $connection->insertForce(
-            $installer->getTable('store'),
-            [
-                'store_id' => 1,
-                'code' => 'default',
-                'website_id' => 1,
-                'group_id' => 1,
-                'name' => 'Default Store View',
-                'sort_order' => 0,
-                'is_active' => 1
-            ]
-        );
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php b/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php
new file mode 100644
index 0000000000000..43fd3f84c2ab1
--- /dev/null
+++ b/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateStoreGroupCodes
+ * @package Magento\Store\Setup\Patch
+ */
+class UpdateStoreGroupCodes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * UpdateStoreGroupCodes constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->updateStoreGroupCodes();
+    }
+
+    /**
+     * Upgrade codes for store groups
+     */
+    private function updateStoreGroupCodes()
+    {
+        $connection = $this->moduleDataSetup->getConnection();
+        $storeGroupTable = $this->moduleDataSetup->getTable('store_group');
+        $select = $connection->select()->from(
+            $storeGroupTable,
+            ['group_id', 'name']
+        );
+
+        $groupList = $connection->fetchPairs($select);
+
+        $codes = [];
+        foreach ($groupList as $groupId => $groupName) {
+            $code = preg_replace('/\s+/', '_', $groupName);
+            $code = preg_replace('/[^a-z0-9-_]/', '', strtolower($code));
+            $code = preg_replace('/^[^a-z]+/', '', $code);
+
+            if (empty($code)) {
+                $code = 'store_group';
+            }
+
+            if (array_key_exists($code, $codes)) {
+                $codes[$code]++;
+                $code = $code . $codes[$code];
+            }
+            $codes[$code] = 1;
+
+            $connection->update(
+                $storeGroupTable,
+                ['code' => $code],
+                ['group_id = ?' => $groupId]
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.1.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
new file mode 100644
index 0000000000000..05e46e04b5c96
--- /dev/null
+++ b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Setup\Patch\Schema;
+
+use Magento\Catalog\Helper\DefaultCategory;
+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
+ * other modules schema relies on store and website presence.
+ * @package Magento\Store\Setup\Patch\Schema
+ */
+class InitializeStoresAndWebsites implements SchemaPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var SchemaSetupInterface
+     */
+    private $schemaSetup;
+
+    /**
+     * @var DefaultCategory
+     */
+    private $defaultCategory;
+
+    /**
+     * @var \Magento\Catalog\Helper\DefaultCategoryFactory
+     */
+    private $defaultCategoryFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param SchemaSetupInterface $schemaSetup
+     */
+    public function __construct(
+        SchemaSetupInterface $schemaSetup,
+        \Magento\Catalog\Helper\DefaultCategoryFactory $defaultCategoryFactory
+    ) {
+        $this->schemaSetup = $schemaSetup;
+        $this->defaultCategoryFactory = $defaultCategoryFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->schemaSetup->startSetup();
+        $connection = $this->schemaSetup->getConnection();
+        $select = $connection->select()
+            ->from($this->schemaSetup->getTable('store_website'))
+            ->where('website_id = ?', 0);
+
+        if ($connection->fetchOne($select) === false) {
+            /**
+             * Insert websites
+             */
+            $connection->insertForce(
+                $this->schemaSetup->getTable('store_website'),
+                [
+                    'website_id' => 0,
+                    'code' => WebsiteInterface::ADMIN_CODE,
+                    'name' => 'Admin',
+                    'sort_order' => 0,
+                    'default_group_id' => 0,
+                    'is_default' => 0
+                ]
+            );
+            $connection->insertForce(
+                $this->schemaSetup->getTable('store_website'),
+                [
+                    'website_id' => 1,
+                    'code' => 'base',
+                    'name' => 'Main Website',
+                    'sort_order' => 0,
+                    'default_group_id' => 1,
+                    'is_default' => 1
+                ]
+            );
+
+            /**
+             * Insert store groups
+             */
+            $connection->insertForce(
+                $this->schemaSetup->getTable('store_group'),
+                [
+                    'group_id' => 0,
+                    'website_id' => 0,
+                    'name' => 'Default',
+                    'root_category_id' => 0,
+                    'default_store_id' => 0
+                ]
+            );
+            $connection->insertForce(
+                $this->schemaSetup->getTable('store_group'),
+                [
+                    'group_id' => 1,
+                    'website_id' => 1,
+                    'name' => 'Main Website Store',
+                    'root_category_id' => $this->getDefaultCategory()->getId(),
+                    'default_store_id' => 1
+                ]
+            );
+
+            /**
+             * Insert stores
+             */
+            $connection->insertForce(
+                $this->schemaSetup->getTable('store'),
+                [
+                    'store_id' => 0,
+                    'code' => 'admin',
+                    'website_id' => 0,
+                    'group_id' => 0,
+                    'name' => 'Admin',
+                    'sort_order' => 0,
+                    'is_active' => 1
+                ]
+            );
+            $connection->insertForce(
+                $this->schemaSetup->getTable('store'),
+                [
+                    'store_id' => 1,
+                    'code' => 'default',
+                    'website_id' => 1,
+                    'group_id' => 1,
+                    'name' => 'Default Store View',
+                    'sort_order' => 0,
+                    'is_active' => 1
+                ]
+            );
+            $this->schemaSetup->endSetup();
+        }
+    }
+
+    /**
+     * Get default category.
+     *
+     * @deprecated 100.1.0
+     * @return DefaultCategory
+     */
+    private function getDefaultCategory()
+    {
+        if ($this->defaultCategory === null) {
+            $this->defaultCategory = $this->defaultCategoryFactory->create();
+        }
+        return $this->defaultCategory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Store/Setup/UpgradeData.php b/app/code/Magento/Store/Setup/UpgradeData.php
deleted file mode 100644
index c4b2a595c5332..0000000000000
--- a/app/code/Magento/Store/Setup/UpgradeData.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Store\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * Upgrades data for a Store module.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.1.0', '<')) {
-            $this->updateStoreGroupCodes($setup);
-        }
-    }
-
-    /**
-     * Update column 'code' in store_group table.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function updateStoreGroupCodes($setup)
-    {
-        $storeGroupTable = $setup->getTable('store_group');
-        $select = $setup->getConnection()->select()->from(
-            $storeGroupTable,
-            ['group_id', 'name']
-        );
-
-        $groupList = $setup->getConnection()->fetchPairs($select);
-
-        $codes = [];
-        foreach ($groupList as $groupId => $groupName) {
-            $code = preg_replace('/\s+/', '_', $groupName);
-            $code = preg_replace('/[^a-z0-9-_]/', '', strtolower($code));
-            $code = preg_replace('/^[^a-z]+/', '', $code);
-
-            if (empty($code)) {
-                $code = 'store_group';
-            }
-
-            if (array_key_exists($code, $codes)) {
-                $codes[$code]++;
-                $code = $code . $codes[$code];
-            }
-            $codes[$code] = 1;
-
-            $setup->getConnection()->update(
-                $storeGroupTable,
-                ['code' => $code],
-                ['group_id = ?' => $groupId]
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/Store/Setup/UpgradeSchema.php b/app/code/Magento/Store/Setup/UpgradeSchema.php
deleted file mode 100644
index ad0d48effeca1..0000000000000
--- a/app/code/Magento/Store/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Store\Setup;
-
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * Upgrades DB schema for a module.
-     *
-     * @param SchemaSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.1.0', '<')) {
-            $this->addCodeColumnToStoreGroupTable($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Add new column 'code' to store_group table, and unique index for it.
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addCodeColumnToStoreGroupTable(SchemaSetupInterface $setup)
-    {
-        $setup->getConnection()->addColumn(
-            $setup->getTable('store_group'),
-            'code',
-            [
-                'type' => Table::TYPE_TEXT,
-                'length' => 32,
-                'comment' => 'Store group unique code',
-                'after' => 'website_id'
-            ]
-        );
-        $setup->getConnection()->addIndex(
-            $setup->getTable('store_group'),
-            $setup->getIdxName(
-                'store_group',
-                ['code'],
-                AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['code'],
-            AdapterInterface::INDEX_TYPE_UNIQUE
-        );
-    }
-}
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
new file mode 100644
index 0000000000000..91fe4fccddb91
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Admin creates new Store group -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateNewStoreGroupActionGroup">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="storeGroupName" type="string"/>
+            <argument name="storeGroupCode" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStoreGroupPage.url}}" stepKey="navigateToNewStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <!--Create Store group -->
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="selectWebsite" />
+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="enterStoreGroupName" />
+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="enterStoreGroupCode" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
+        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..6cbbb7ae22014
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateStoreViewActionGroup">
+        <arguments>
+            <argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
+            <argument name="customStore" defaultValue="customStore"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStoreViewPage.url}}" stepKey="navigateToNewStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <!--Create Store View-->
+        <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{StoreGroup.name}}" stepKey="selectStore" />
+        <fillField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{customStore.name}}" stepKey="enterStoreViewName" />
+        <fillField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{customStore.code}}" stepKey="enterStoreViewCode" />
+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="setStatus" />
+        <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
+    </actionGroup>
+    <!--Save the Store view-->
+    <actionGroup name="AdminCreateStoreViewActionSaveGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload2"/>
+        <see userInput="You saved the store view." stepKey="seeSavedMessage" />
+    </actionGroup>
+    <!--Save the same Store view code for code validation-->
+    <actionGroup name="AdminCreateStoreViewCodeUniquenessActionGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForForm"/>
+        <see userInput="Store with the same code already exists." stepKey="seeMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
new file mode 100644
index 0000000000000..ef8d77c8824ff
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Admin creates new custom website -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateWebsiteActionGroup">
+        <arguments>
+            <argument name="newWebsiteName" type="string"/>
+            <argument name="websiteCode" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStoreWebsitePage.url}}" stepKey="navigateToNewWebsitePage"/>
+        <waitForPageLoad stepKey="waitForStoresPageLoad"/>
+        <!--Create Website-->
+        <fillField selector="{{AdminNewWebsiteSection.name}}" userInput="{{newWebsiteName}}" stepKey="enterWebsiteName" />
+        <fillField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="enterWebsiteCode" />
+        <click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
+        <see userInput="You saved the website." stepKey="seeSavedMessage" />
+    </actionGroup>
+
+    <!--Get Website_id-->
+    <actionGroup name="AdminGetWebsiteIdActionGroup">
+        <arguments>
+            <argument name="website"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{website.name}}" stepKey="fillSearchWebsiteField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters" />
+        <see selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{website.name}}" stepKey="verifyThatCorrectWebsiteFound"/>
+        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..849dc91efedb7
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteStoreViewActionGroup">
+        <arguments>
+            <argument name="customStore" defaultValue="customStore"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
+        <waitForPageLoad stepKey="waitStoreIndexPageLoad" />
+        <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewInGrid"/>
+        <waitForPageLoad stepKey="waitForStoreViewPage"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreView"/>
+        <selectOption selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" userInput="No" stepKey="dontCreateDbBackup"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewAgain"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
+        <wait time="10" stepKey="extraWait"/>
+        <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
new file mode 100644
index 0000000000000..58fd0a3f0bc2b
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteWebsiteActionGroup">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
+        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>
+        <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
+        <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
+        <see userInput="You deleted the website." stepKey="seeSavedMessage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter2"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..e4cb26ea6ff7a
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFilterStoreViewActionGroup">
+        <arguments>
+            <argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
+            <argument name="customStore" defaultValue="customStore.name"/>
+        </arguments>
+        <click selector="{{AdminProductFiltersSection.filter}}" stepKey="ClickOnFilter"/>
+        <click selector="{{AdminProductFiltersSection.storeViewDropDown}}" stepKey="ClickOnStoreViewDropDown"/>
+        <click selector="{{AdminProductFiltersSection.storeViewOption(customStore)}}" stepKey="ClickOnStoreViewOption"/>
+        <click selector="{{AdminProductFiltersSection.applyFilters}}" stepKey="ClickOnApplyFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
new file mode 100644
index 0000000000000..023d5fc3587fb
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminStoreGroupCreateActionGroup">
+        <arguments>
+            <argument name="Website" defaultValue="_defaultWebsite"/>
+            <argument name="storeGroup"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStoreGroupPage.url}}" stepKey="navigateToNewStoreGroup"/>
+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
+
+        <comment userInput="Creating Store Group" stepKey="storeGroupCreationComment" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{Website.name}}" stepKey="selectWebsite" />
+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroup.name}}" stepKey="enterStoreGroupName" />
+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroup.code}}" stepKey="enterStoreGroupCode" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category"  stepKey="setRootCategory" />
+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..860f094a48ecc
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSwitchStoreViewActionGroup">
+        <arguments>
+            <argument name="storeView" defaultValue="customStore.name"/>
+        </arguments>
+        <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickStoreViewSwitchDropdown"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.storeViewByName('Default Store View')}}" stepKey="waitForStoreViewsAreVisible"/>
+        <click selector="{{AdminMainActionsSection.storeViewByName(storeView)}}" stepKey="clickStoreViewByName"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
+        <waitForPageLoad stepKey="waitForStoreViewSwitched"/>
+        <see userInput="{{storeView}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..31bbe7550e5a1
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateCustomStoreViewActionGroup">
+        <arguments>
+            <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
+        </arguments>
+        <amOnPage  url="{{AdminSystemStoreViewPage.url}}" stepKey="amOnAdminSystemStoreViewPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageLoad"/>
+        <selectOption userInput="{{storeGroupName}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+        <selectOption userInput="{{customStore.is_active}}" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="selectStoreViewStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
+        <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationButton" />
+        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="clickAcceptNewStoreViewCreationButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
new file mode 100644
index 0000000000000..8e32b819aa954
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteCustomStoreActionGroup">
+        <arguments>
+            <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteStoreGroupButtonOnEditStorePage"/>
+        <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
+        <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
new file mode 100644
index 0000000000000..cc6a1fb62ea5f
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteCustomWebsiteActionGroup">
+        <arguments>
+            <argument name="websiteName" defaultValue="customWebsite.name"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterResetButtonClicked" time="10"/>
+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
+        <waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
+        <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
+        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
+
+        <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
+        <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
+        <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..cfcd25086e067
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontSwitchStoreViewActionGroup">
+        <arguments>
+            <argument name="storeView" defaultValue="customStore"/>
+        </arguments>
+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.name)}}" stepKey="clickSelectStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml b/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml
new file mode 100644
index 0000000000000..8e84b84c8aa49
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductAssignToWebsite" type="product_website_link">
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
new file mode 100644
index 0000000000000..9fae618020ff3
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultStore" type="store">
+        <data key="name">Default Store View</data>
+        <data key="code">default</data>
+        <data key="is_active">1</data>
+    </entity>
+    <entity name="customStore" type="store">
+        <!--data key="group_id">customStoreGroup.id</data-->
+        <data key="name" unique="suffix">store</data>
+        <data key="code" unique="suffix">store</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="customStoreEN" type="store">
+        <data key="name">EN</data>
+        <data key="code">en</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="customStoreFR" type="store">
+        <data key="name">FR</data>
+        <data key="code">fr</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">group</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="staticStore" type="store">
+        <!--data key="group_id">customStoreGroup.id</data-->
+        <data key="name">Second Store View</data>
+        <data key="code">store123</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="staticSecondStore" extends="staticStore">
+        <data key="name">Store View</data>
+        <data key="code">store2</data>
+    </entity>
+    <entity name="NewStoreData" type="store">
+        <data key="name" unique="suffix">Store</data>
+        <data key="code" unique="suffix">StoreCode</data>
+    </entity>
+    <entity name="NewWebSiteData" type="webSite">
+        <data key="name" unique="suffix">WebSite</data>
+        <data key="code" unique="suffix">WebSiteCode</data>
+    </entity>
+    <entity name="NewStoreViewData">
+        <data key="name" unique="suffix">StoreView</data>
+        <data key="code" unique="suffix">StoreViewCode</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
new file mode 100644
index 0000000000000..e575ca3317ab6
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultStoreGroup" type="group">
+        <data key="name">Main Website Store</data>
+        <data key="code">main_website_store</data>
+        <data key="root_category_id">2</data>
+        <data key="website_id">1</data>
+    </entity>
+    <entity name="customStoreGroup" type="group">
+        <data key="group_id">null</data>
+        <data key="name" unique="suffix">store</data>
+        <data key="code" unique="suffix">store</data>
+        <data key="root_category_id">2</data>
+        <data key="website_id">1</data>
+        <data key="store_action">add</data>
+        <data key="store_type">group</data>
+    </entity>
+    <entity name="staticStoreGroup" type="group">
+        <data key="name">NewStore</data>
+        <data key="code" unique="suffix">Base12</data>
+        <data key="root_category_id">2</data>
+        <data key="website_id">1</data>
+    </entity>
+    <entity name="staticFirstStoreGroup" extends="staticStoreGroup">
+        <data key="name">NewStore</data>
+        <data key="code">Base1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StorePaymentMethodsData.xml b/app/code/Magento/Store/Test/Mftf/Data/StorePaymentMethodsData.xml
new file mode 100644
index 0000000000000..912399142fa61
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/StorePaymentMethodsData.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="PaymentMethodsSettingConfig" type="zero_subtotal_checkout_config_state">
+        <requiredEntity type="active">active</requiredEntity>
+        <requiredEntity type="order_status">orderStatus</requiredEntity>
+    </entity>
+    <entity name="active" type="active">
+        <data key="value">1</data>
+    </entity>
+    <entity name="orderStatus" type="order_status">
+        <data key="value">processing</data>
+    </entity>
+
+    <entity name="DisablePaymentMethodsSettingConfig" type="use_system_value_config_state">
+        <requiredEntity type="zeroSubEnable">zeroSubEnable</requiredEntity>
+        <requiredEntity type="zeroSubOrderStatus">zeroSubOrderStatus</requiredEntity>
+    </entity>
+    <entity name="zeroSubEnable" type="zeroSubEnable">
+        <data key="value">1</data>
+    </entity>
+    <entity name="zeroSubOrderStatus" type="zeroSubOrderStatus">
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml
new file mode 100644
index 0000000000000..6e3e7ce7eb0d3
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="FreeShippingMethodsSettingConfig" type="free_shipping_config_state">
+        <requiredEntity type="active">active</requiredEntity>
+    </entity>
+    <entity name="active" type="active">
+        <data key="value">1</data>
+    </entity>
+
+    <!-- default configuration used to restore Magento config -->
+    <entity name="DefaultShippingMethodsConfig" type="free_shipping_config_state">
+        <requiredEntity type="active">DefaultFreeShipping</requiredEntity>
+    </entity>
+    <entity name="DefaultFreeShipping" type="active">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DisableFreeShippingConfig" type="disable_free_shipping_config_state">
+        <requiredEntity type="disableFreeShipping">disableFreeShipping</requiredEntity>
+    </entity>
+    <entity name="disableFreeShipping" type="disableFreeShipping">
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
new file mode 100644
index 0000000000000..f636336524f01
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultWebsite" type="website">
+        <data key="name">Main Website</data>
+        <data key="code">base</data>
+        <data key="sort_order">0</data>
+    </entity>
+    <entity name="customWebsite" type="website">
+        <data key="name" unique="suffix">Second Website</data>
+        <data key="code" unique="suffix">second_website</data>
+        <data key="sort_order">10</data>
+        <data key="store_action">add</data>
+        <data key="store_type">website</data>
+        <data key="website_id">null</data>
+    </entity>
+    <entity name="secondCustomWebsite" extends="customWebsite">
+        <data key="name" unique="suffix">Custom Website</data>
+        <data key="code" unique="suffix">custom_website</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE.txt b/app/code/Magento/Store/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE.txt
rename to app/code/Magento/Store/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE_AFL.txt b/app/code/Magento/Store/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE_AFL.txt
rename to app/code/Magento/Store/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml
new file mode 100644
index 0000000000000..ca0725f86c289
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="ProductWebsiteLink" dataType="product_website_link" type="create" auth="adminOauth" url="/V1/products/{sku}/websites" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="product_website_link" key="productWebsiteLink">
+            <field key="sku">string</field>
+            <field key="websiteId">integer</field>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
new file mode 100644
index 0000000000000..a1cfc69ecd705
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateStore" dataType="store" type="create"
+               auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
+        <object dataType="store" key="store">
+            <field key="group_id">string</field>
+            <field key="name">string</field>
+            <field key="code">string</field>
+            <field key="is_active">boolean</field>
+            <field key="store_id">integer</field>
+        </object>
+        <field key="store_action">string</field>
+        <field key="store_type">string</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store_group-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store_group-meta.xml
rename to app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
index a090e706d1293..a8d8ff7b68323 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store_group-meta.xml
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
@@ -5,8 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateStoreGroup" dataType="group" type="create"
                auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
         <contentType>application/x-www-form-urlencoded</contentType>
@@ -20,4 +20,4 @@
         <field key="store_action">string</field>
         <field key="store_type">string</field>
     </operation>
-</config>
+</operations>
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store_payment_methods-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_payment_methods-meta.xml
new file mode 100644
index 0000000000000..cbad7265cbbd6
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_payment_methods-meta.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="EnableZeroSubtotalCheckoutConfigState" dataType="zero_subtotal_checkout_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
+        <object key="groups" dataType="zero_subtotal_checkout_config_state">
+            <object key="free" dataType="zero_subtotal_checkout_config_state">
+                <object key="fields" dataType="zero_subtotal_checkout_config_state">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="order_status" dataType="order_status">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DisablePaymentMethodsSettingConfig" dataType="use_system_value_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
+        <object key="groups" dataType="use_system_value_config_state">
+            <object key="free" dataType="use_system_value_config_state">
+                <object key="fields" dataType="use_system_value_config_state">
+                    <object key="active" dataType="use_system_value_config_state">
+                        <object key="inherit" dataType="zeroSubEnable">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="order_status" dataType="use_system_value_config_state">
+                        <object key="inherit" dataType="zeroSubOrderStatus">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+</operations>
+
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml
new file mode 100644
index 0000000000000..83288ecfdaf71
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="EnableFreeShippingConfigState" dataType="free_shipping_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
+        <object key="groups" dataType="free_shipping_config_state">
+            <object key="freeshipping" dataType="free_shipping_config_state">
+                <object key="fields" dataType="free_shipping_config_state">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DisableFreeShippingConfigState" dataType="disable_free_shipping_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
+        <object key="groups" dataType="disable_free_shipping_config_state">
+            <object key="freeshipping" dataType="disable_free_shipping_config_state">
+                <object key="fields" dataType="disable_free_shipping_config_state">
+                    <object key="active" dataType="disable_free_shipping_config_state">
+                        <object key="inherit" dataType="disableFreeShipping">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+</operations>
+
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml
new file mode 100644
index 0000000000000..bad274501f710
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/website-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateWebsite" dataType="website" type="create"
+               auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="">
+        <object dataType="website" key="website">
+            <field key="website_id">string</field>
+            <field key="name">string</field>
+            <field key="code">string</field>
+            <field key="sort_order">integer</field>
+        </object>
+        <field key="store_action">string</field>
+        <field key="store_type">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
new file mode 100644
index 0000000000000..79472f1cc2899
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreDeletePage" url="system_store/deleteStore" module="Magento_Store" area="admin">
+        <section name="AdminStoreBackupOptionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
new file mode 100644
index 0000000000000..6b020a1bffd95
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreEditPage" url="system_store/editStore" module="Magento_Store" area="admin">
+        <section name="AdminNewStoreViewMainActionsSection"/>
+        <section name="AdminNewStoreSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
new file mode 100644
index 0000000000000..386869a8fa19b
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreGroupEditPage" url="admin/system_store/editGroup" area="admin" module="Magento_Store">
+        <section name="AdminStoreGroupActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
new file mode 100644
index 0000000000000..8d48f3fd80417
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreGroupPage" url="admin/system_store/newGroup" module="Magento_Store" area="admin">
+        <section name="AdminNewStoreGroupSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
new file mode 100644
index 0000000000000..c309c47035bba
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStorePage" url="/admin/system_store/" area="admin" module="Magento_Store">
+        <section name="AdminStoresMainActionsSection"/>
+        <section name="AdminStoresGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
new file mode 100644
index 0000000000000..4a7de70fb3c35
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreViewPage" url="admin/system_store/newStore" module="Magento_Store" area="admin">
+        <section name="AdminNewStoreViewMainActionsSection"/>
+        <section name="AdminNewStoreSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
new file mode 100644
index 0000000000000..9296d2667b93d
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreWebsitePage" url="admin/system_store/newWebsite" module="Magento_Store" area="admin">
+        <section name="AdminNewWebsiteSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml b/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
new file mode 100644
index 0000000000000..0e6b578882f71
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontStoreHomePage" url="/{{store_view}}/" area="storefront" module="Magento_Store" parameterized="true">
+        <section name="StorefrontHeaderSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Store/Test/Mftf/README.md b/app/code/Magento/Store/Test/Mftf/README.md
new file mode 100644
index 0000000000000..18b37aad6d8ef
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Store Functional Tests
+
+The Functional Test Module for **Magento Store** module.
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
new file mode 100644
index 0000000000000..fda182246db4a
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMainActionsSection">
+        <element name="storeSwitcher" type="text" selector=".store-switcher"/>
+        <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
+        <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml
new file mode 100644
index 0000000000000..66e1407f17b26
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupActionsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewStoreGroupActionsSection">
+        <element name="backButton" type="button" selector="#back" timeout="30"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="resetButton" type="button" selector="#reset" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
new file mode 100644
index 0000000000000..ea5d9aab8b26d
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewStoreGroupSection">
+        <element name="storeGrpWebsiteDropdown" type="select" selector="#group_website_id"/>
+        <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
+        <element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
+        <element name="storeRootCategoryDropdown" type="select" selector="#group_root_category_id"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
new file mode 100644
index 0000000000000..5a7d9bba7ebec
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewStoreSection">
+        <element name="storeNameTextField" type="input" selector="#store_name"/>
+        <element name="storeCodeTextField" type="input" selector="#store_code"/>
+        <element name="statusDropdown" type="select" selector="#store_is_active"/>
+        <element name="storeGrpDropdown" type="select" selector="#store_group_id"/>
+        <element name="sortOrderTextField" type="input" selector="#store_sort_order"/>
+        <element name="acceptNewStoreViewCreation" type="button" selector=".action-primary.action-accept" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
new file mode 100644
index 0000000000000..0e3a74fccf9f0
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewStoreViewActionsSection">
+        <element name="backButton" type="button" selector="#back" timeout="30"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="resetButton" type="button" selector="#reset" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="60"/>
+        <element name="loadingMask" type="text" selector=".loading-mask"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
new file mode 100644
index 0000000000000..89c0ad15e7dab
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewWebsiteActionsSection">
+        <element name="saveWebsite" type="button" selector="#save" timeout="60"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
new file mode 100644
index 0000000000000..ea67cf71ccd68
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewWebsiteSection">
+        <element name="name" type="input" selector="#website_name"/>
+        <element name="code" type="input" selector="#website_code"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
new file mode 100644
index 0000000000000..82ec219f541a3
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoreBackupOptionsSection">
+        <element name="createBackupSelect" type="select" selector="select#store_create_backup"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
new file mode 100644
index 0000000000000..f79ea080ed1ca
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoreGroupActionsSection">
+        <element name="saveButton" type="button" selector="#save" timeout="60" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
new file mode 100644
index 0000000000000..8ac48dae364b1
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoresDeleteStoreGroupSection">
+        <element name="createDbBackup" type="select" selector="#store_create_backup"/>
+        <element name="deleteStoreGroupButton" type="button" selector="#delete" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
new file mode 100644
index 0000000000000..fea7dc07c8287
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoresDeleteWebsiteSection">
+        <element name="createDbBackup" type="select" selector="#store_create_backup"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
new file mode 100644
index 0000000000000..1b84027a5dd4a
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoresGridControlsSection">
+        <element name="createStoreView" type="button" selector="#add_store"/>
+        <element name="createStore" type="button" selector="#add_group"/>
+        <element name="createWebsite" type="button" selector="#add"/>
+    </section>
+    <section name="AdminStoresGridSection">
+        <element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
+        <element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
+        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]" timeout="30"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"  timeout="30"/>
+        <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
+        <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
+        <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
+        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+     </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
new file mode 100644
index 0000000000000..98ad1db46732b
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminStoresMainActionsSection">
+        <element name="createStoreViewButton" type="button" selector="#add_store" timeout="30"/>
+        <element name="createStoreButton" type="button" selector="#add_group" timeout="30"/>
+        <element name="createWebsiteButton" type="button" selector="#add" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="30"/>
+        <element name="backButton" type="button" selector="#back" timeout="30"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
new file mode 100644
index 0000000000000..af18e858e1057
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontHeaderSection">
+        <element name="storeViewSwitcher" type="button" selector="#switcher-language-trigger"/>
+        <element name="storeViewDropdown" type="button" selector="ul.switcher-dropdown"/>
+        <element name="storeViewOption" type="button" selector="li.view-{{var1}}>a" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
new file mode 100644
index 0000000000000..25e93f8f6ff4c
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateStoreGroupTest">
+        <annotations>
+            <features value="Store"/>
+            <stories value="Create a store group in admin"/>
+            <title value="Admin should be able to create a store group"/>
+            <description value="Admin should be able to create a store group"/>
+            <group value="store"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <createData stepKey="b1" entity="customStoreGroup"/>
+            <createData stepKey="b2" entity="customStoreGroup"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+        <amOnPage stepKey="s9" url="{{AdminSystemStorePage.url}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+
+        <click stepKey="s11" selector="{{AdminStoresGridSection.resetButton}}"/>
+        <waitForPageLoad stepKey="s15" time="10"/>
+
+        <fillField stepKey="s17" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b1.group[name]$$"/>
+        <click stepKey="s19" selector="{{AdminStoresGridSection.searchButton}}"/>
+        <waitForPageLoad stepKey="s21" time="10"/>
+        <see stepKey="s23" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b1.group[name]$$"/>
+
+        <click stepKey="s31" selector="{{AdminStoresGridSection.resetButton}}"/>
+        <waitForPageLoad stepKey="s35" time="10"/>
+        <fillField stepKey="s37" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b2.group[name]$$"/>
+        <click stepKey="s39" selector="{{AdminStoresGridSection.searchButton}}"/>
+        <waitForPageLoad stepKey="s41" time="10"/>
+        <see stepKey="s43" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b2.group[name]$$"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
new file mode 100644
index 0000000000000..e7a3d03f337db
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+        <test name="AdminCreateStoreViewTest">
+            <annotations>
+                <features value="Store"/>
+                <stories value="Create a store view in admin"/>
+                <title value="Admin should be able to create a store view"/>
+                <description value="Admin should be able to create a store view"/>
+                <group value="storeView"/>
+                <severity value="AVERAGE"/>
+                <testCaseId value="MAGETWO-95111"/>
+            </annotations>
+            <before>
+                <actionGroup ref="LoginActionGroup" stepKey="login"/>
+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+                <!--<createData stepKey="b2" entity="customStoreGroup"/>-->
+            </before>
+            <!--Save store view on Store Grid-->
+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="createStoreViewSave" />
+            <!--Confirm new store view created on Store Grid-->
+            <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilter"/>
+            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch" />
+            <waitForPageLoad stepKey="waitForPageLoad"/>
+            <see selector="{{AdminStoresGridSection.storeNameInFirstRow}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView" />
+            <!--Creating the same store view to validate the code uniqueness on store form-->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2" />
+            <actionGroup ref="AdminCreateStoreViewCodeUniquenessActionGroup" stepKey="createStoreViewCode" />
+            <after>
+                <actionGroup ref="logout" stepKey="logout"/>
+            </after>
+        </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php
index d44724fe302d0..616851465b49c 100644
--- a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php
+++ b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php
@@ -8,8 +8,10 @@
 use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\Http\Context as HttpContext;
 
 /**
  * Class ContextPluginTest
@@ -33,7 +35,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase
     protected $sessionMock;
 
     /**
-     * @var \Magento\Framework\App\Http\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var HttpContext|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $httpContextMock;
 
@@ -78,7 +80,11 @@ class ContextTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->sessionMock = $this->createPartialMock(\Magento\Framework\Session\Generic::class, ['getCurrencyCode']);
-        $this->httpContextMock = $this->createMock(\Magento\Framework\App\Http\Context::class);
+        $this->httpContextMock = $this->createMock(HttpContext::class);
+        $this->httpContextMock->expects($this->once())
+            ->method('getValue')
+            ->with(StoreManagerInterface::CONTEXT_STORE)
+            ->willReturn(null);
         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->storeCookieManager = $this->createMock(\Magento\Store\Api\StoreCookieManagerInterface::class);
         $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class);
@@ -101,29 +107,29 @@ protected function setUp()
                 'storeCookieManager' => $this->storeCookieManager,
             ]
         );
-        $this->storeManager->expects($this->once())
-            ->method('getWebsite')
-            ->will($this->returnValue($this->websiteMock));
+
         $this->storeManager->method('getDefaultStoreView')
             ->willReturn($this->storeMock);
-
-        $this->websiteMock->expects($this->once())
-            ->method('getDefaultStore')
-            ->will($this->returnValue($this->storeMock));
-
         $this->storeCookieManager->expects($this->once())
             ->method('getStoreCodeFromCookie')
-            ->will($this->returnValue('storeCookie'));
+            ->willReturn('storeCookie');
         $this->currentStoreMock->expects($this->any())
             ->method('getDefaultCurrencyCode')
-            ->will($this->returnValue(self::CURRENCY_CURRENT_STORE));
+            ->willReturn(self::CURRENCY_CURRENT_STORE);
     }
 
     public function testBeforeDispatchCurrencyFromSession()
     {
+        $this->storeManager->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())
+            ->method('getDefaultStore')
+            ->willReturn($this->storeMock);
+
         $this->storeMock->expects($this->once())
             ->method('getDefaultCurrencyCode')
-            ->will($this->returnValue(self::CURRENCY_DEFAULT));
+            ->willReturn(self::CURRENCY_DEFAULT);
 
         $this->storeMock->expects($this->once())
             ->method('getCode')
@@ -135,7 +141,7 @@ public function testBeforeDispatchCurrencyFromSession()
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with($this->equalTo('___store'))
-            ->will($this->returnValue('default'));
+            ->willReturn('default');
 
         $this->storeManager->method('getStore')
             ->with('default')
@@ -143,24 +149,42 @@ public function testBeforeDispatchCurrencyFromSession()
 
         $this->sessionMock->expects($this->any())
             ->method('getCurrencyCode')
-            ->will($this->returnValue(self::CURRENCY_SESSION));
+            ->willReturn(self::CURRENCY_SESSION);
 
-        $this->httpContextMock->expects($this->at(0))
-            ->method('setValue')
-            ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default');
-        /** Make sure that current currency is taken from session if available */
         $this->httpContextMock->expects($this->at(1))
             ->method('setValue')
-            ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_SESSION, self::CURRENCY_DEFAULT);
-
-        $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
+            ->with(
+                StoreManagerInterface::CONTEXT_STORE,
+                'custom_store',
+                'default'
+            );
+        // Make sure that current currency is taken from session if available.
+        $this->httpContextMock->expects($this->at(2))
+            ->method('setValue')
+            ->with(
+                Context::CONTEXT_CURRENCY,
+                self::CURRENCY_SESSION,
+                self::CURRENCY_DEFAULT
+            );
+
+        $this->plugin->beforeDispatch(
+            $this->subjectMock,
+            $this->requestMock
+        );
     }
 
     public function testDispatchCurrentStoreCurrency()
     {
+        $this->storeManager->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())
+            ->method('getDefaultStore')
+            ->willReturn($this->storeMock);
+
         $this->storeMock->expects($this->once())
             ->method('getDefaultCurrencyCode')
-            ->will($this->returnValue(self::CURRENCY_DEFAULT));
+            ->willReturn(self::CURRENCY_DEFAULT);
 
         $this->storeMock->expects($this->once())
             ->method('getCode')
@@ -172,28 +196,47 @@ public function testDispatchCurrentStoreCurrency()
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with($this->equalTo('___store'))
-            ->will($this->returnValue('default'));
+            ->willReturn('default');
 
         $this->storeManager->method('getStore')
             ->with('default')
             ->willReturn($this->currentStoreMock);
 
-        $this->httpContextMock->expects($this->at(0))
-            ->method('setValue')
-            ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default');
-        /** Make sure that current currency is taken from current store if no value is provided in session */
         $this->httpContextMock->expects($this->at(1))
             ->method('setValue')
-            ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_CURRENT_STORE, self::CURRENCY_DEFAULT);
-
-        $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
+            ->with(
+                StoreManagerInterface::CONTEXT_STORE,
+                'custom_store',
+                'default'
+            );
+        // Make sure that current currency is taken from current store
+        //if no value is provided in session.
+        $this->httpContextMock->expects($this->at(2))
+            ->method('setValue')
+            ->with(
+                Context::CONTEXT_CURRENCY,
+                self::CURRENCY_CURRENT_STORE,
+                self::CURRENCY_DEFAULT
+            );
+
+        $this->plugin->beforeDispatch(
+            $this->subjectMock,
+            $this->requestMock
+        );
     }
 
     public function testDispatchStoreParameterIsArray()
     {
+        $this->storeManager->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())
+            ->method('getDefaultStore')
+            ->willReturn($this->storeMock);
+
         $this->storeMock->expects($this->once())
             ->method('getDefaultCurrencyCode')
-            ->will($this->returnValue(self::CURRENCY_DEFAULT));
+            ->willReturn(self::CURRENCY_DEFAULT);
 
         $this->storeMock->expects($this->once())
             ->method('getCode')
@@ -211,35 +254,52 @@ public function testDispatchStoreParameterIsArray()
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with($this->equalTo('___store'))
-            ->will($this->returnValue($store));
+            ->willReturn($store);
 
         $this->storeManager->expects($this->once())
             ->method('getStore')
             ->with('500')
             ->willReturn($this->currentStoreMock);
 
-        $this->httpContextMock->expects($this->at(0))
-            ->method('setValue')
-            ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default');
-        /** Make sure that current currency is taken from current store if no value is provided in session */
         $this->httpContextMock->expects($this->at(1))
             ->method('setValue')
-            ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_CURRENT_STORE, self::CURRENCY_DEFAULT);
-
-        $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
+            ->with(
+                StoreManagerInterface::CONTEXT_STORE,
+                'custom_store',
+                'default'
+            );
+        //Make sure that current currency is taken from current store
+        //if no value is provided in session.
+        $this->httpContextMock->expects($this->at(2))
+            ->method('setValue')
+            ->with(
+                Context::CONTEXT_CURRENCY,
+                self::CURRENCY_CURRENT_STORE,
+                self::CURRENCY_DEFAULT
+            );
+
+        $this->plugin->beforeDispatch(
+            $this->subjectMock,
+            $this->requestMock
+        );
     }
 
     /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid store parameter.
+     * @expectedException \Magento\Framework\Exception\NotFoundException
      */
     public function testDispatchStoreParameterIsInvalidArray()
     {
-        $this->storeMock->expects($this->never())
+        $this->storeManager->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())
+            ->method('getDefaultStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->exactly(2))
             ->method('getDefaultCurrencyCode')
-            ->will($this->returnValue(self::CURRENCY_DEFAULT));
+            ->willReturn(self::CURRENCY_DEFAULT);
 
-        $this->storeMock->expects($this->never())
+        $this->storeMock->expects($this->exactly(2))
             ->method('getCode')
             ->willReturn('default');
         $this->currentStoreMock->expects($this->never())
@@ -255,7 +315,53 @@ public function testDispatchStoreParameterIsInvalidArray()
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with($this->equalTo('___store'))
-            ->will($this->returnValue($store));
+            ->willReturn($store);
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->with()
+            ->willReturn($this->storeMock);
+        $this->plugin->beforeDispatch(
+            $this->subjectMock,
+            $this->requestMock
+        );
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     */
+    public function testDispatchNonExistingStore()
+    {
+        $storeId = 'NonExisting';
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->with('___store')
+            ->willReturn($storeId);
+        $this->storeManager->expects($this->at(0))
+            ->method('getStore')
+            ->with($storeId)
+            ->willThrowException(new NoSuchEntityException());
+        $this->storeManager->expects($this->at(1))
+            ->method('getStore')
+            ->with()
+            ->willReturn($this->storeMock);
+        $this->storeManager->expects($this->once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+        $this->websiteMock->expects($this->once())
+            ->method('getDefaultStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->exactly(2))
+            ->method('getDefaultCurrencyCode')
+            ->willReturn(self::CURRENCY_DEFAULT);
+
+        $this->storeMock->expects($this->exactly(2))
+            ->method('getCode')
+            ->willReturn('default');
+        $this->currentStoreMock->expects($this->never())
+            ->method('getCode')
+            ->willReturn('custom_store');
+
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 }
diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php
index 7d2fb54014967..5d0f11b8a98d4 100644
--- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php
+++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php
@@ -12,45 +12,83 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Store\App\Request\PathInfoProcessor
      */
-    protected $_model;
+    private $model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_storeManagerMock;
+    private $requestMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_requestMock;
+    private $validatorConfigMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $processorConfigMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pathInfoMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storePathInfoValidator;
 
     /**
      * @var string
      */
-    protected $_pathInfo = '/storeCode/node_one/';
+    protected $pathInfo = '/storeCode/node_one/';
 
     protected function setUp()
     {
-        $this->_requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $this->validatorConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+
+        $this->processorConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+
+        $this->storeRepositoryMock = $this->createMock(\Magento\Store\Api\StoreRepositoryInterface::class);
+
+        $this->pathInfoMock = $this->getMockBuilder(\Magento\Framework\App\Request\PathInfo ::class)
             ->disableOriginalConstructor()->getMock();
-        $this->_storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
-        $this->_model = new \Magento\Store\App\Request\PathInfoProcessor($this->_storeManagerMock);
+
+        $this->storePathInfoValidator = new \Magento\Store\App\Request\StorePathInfoValidator(
+            $this->validatorConfigMock,
+            $this->storeRepositoryMock,
+            $this->pathInfoMock
+        );
+
+        $this->model = new \Magento\Store\App\Request\PathInfoProcessor(
+            $this->storePathInfoValidator,
+            $this->validatorConfigMock
+        );
     }
 
-    public function testProcessIfStoreExistsAndIsNotDirectAcccessToFrontName()
+    public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName()
     {
+        $this->validatorConfigMock->expects($this->any())->method('getValue')->willReturn(true);
+
         $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $this->_storeManagerMock->expects(
-            $this->once()
+        $this->storeRepositoryMock->expects(
+            $this->atLeastOnce()
         )->method(
-            'getStore'
+            'getActiveStoreByCode'
         )->with(
             'storeCode'
         )->willReturn($store);
-        $store->expects($this->once())->method('getCode')->will($this->returnValue('storeCode'));
-        $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
-        $this->_requestMock->expects(
-            $this->once()
+        $this->requestMock->expects(
+            $this->atLeastOnce()
         )->method(
             'isDirectAccessFrontendName'
         )->with(
@@ -58,67 +96,69 @@ public function testProcessIfStoreExistsAndIsNotDirectAcccessToFrontName()
         )->will(
             $this->returnValue(false)
         );
-        $this->_storeManagerMock->expects($this->once())->method('setCurrentStore')->with('storeCode');
-        $this->assertEquals('/node_one/', $this->_model->process($this->_requestMock, $this->_pathInfo));
+        $this->assertEquals('/node_one/', $this->model->process($this->requestMock, $this->pathInfo));
     }
 
-    public function testProcessIfStoreExistsAndDirectAcccessToFrontName()
+    public function testProcessIfStoreExistsAndDirectAccessToFrontName()
     {
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $this->_storeManagerMock->expects(
-            $this->once()
+        $this->validatorConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturn(true);
+
+        $this->storeRepositoryMock->expects(
+            $this->any()
         )->method(
-            'getStore'
-        )->with(
-            'storeCode'
-        )->willReturn($store);
-        $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
-        $this->_requestMock->expects(
-            $this->once()
+            'getActiveStoreByCode'
+        );
+        $this->requestMock->expects(
+            $this->atLeastOnce()
         )->method(
             'isDirectAccessFrontendName'
         )->with(
             'storeCode'
-        )->will(
-            $this->returnValue(true)
-        );
-        $this->_requestMock->expects($this->once())->method('setActionName')->with('noroute');
-        $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo));
+        )->willReturn(true);
+        $this->requestMock->expects($this->once())->method('setActionName')->with('noroute');
+        $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo));
     }
 
     public function testProcessIfStoreIsEmpty()
     {
+        $this->validatorConfigMock->expects($this->any())->method('getValue')->willReturn(true);
+
         $path = '/0/node_one/';
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $this->_storeManagerMock->expects(
-            $this->once()
+        $this->storeRepositoryMock->expects(
+            $this->never()
         )->method(
-            'getStore'
-        )->with(
-            '0'
-        )->willReturn($store);
-        $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
-        $this->_requestMock->expects(
-            $this->once()
+            'getActiveStoreByCode'
+        );
+        $this->requestMock->expects(
+            $this->never()
         )->method(
             'isDirectAccessFrontendName'
-        )->with(
-            '0'
-        )->will(
-            $this->returnValue(true)
         );
-        $this->_requestMock->expects($this->never())->method('setActionName');
-        $this->assertEquals($path, $this->_model->process($this->_requestMock, $path));
+        $this->requestMock->expects($this->never())->method('setActionName');
+        $this->assertEquals($path, $this->model->process($this->requestMock, $path));
     }
 
     public function testProcessIfStoreCodeIsNotExist()
     {
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $this->_storeManagerMock->expects($this->once())->method('getStore')->with('storeCode')
+        $this->validatorConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturn(true);
+
+        $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode')
             ->willThrowException(new NoSuchEntityException());
-        $store->expects($this->never())->method('isUseStoreInUrl');
-        $this->_requestMock->expects($this->never())->method('isDirectAccessFrontendName');
+        $this->requestMock->expects($this->never())->method('isDirectAccessFrontendName');
+
+        $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo));
+    }
+
+    public function testProcessIfStoreUrlNotEnabled()
+    {
+        $this->validatorConfigMock->expects($this->at(0))->method('getValue')->willReturn(true);
+
+        $this->validatorConfigMock->expects($this->at(1))->method('getValue')->willReturn(true);
+
+        $this->validatorConfigMock->expects($this->at(2))->method('getValue')->willReturn(false);
+
+        $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->willReturn(1);
 
-        $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo));
+        $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo));
     }
 }
diff --git a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
index 5f0ba6c0b42d3..aca3525a4400e 100644
--- a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
+++ b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
@@ -25,6 +25,12 @@ class SwitcherTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $urlBuilder;
 
+    /** @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $store;
+
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)->getMock();
@@ -33,6 +39,9 @@ protected function setUp()
         $this->context->expects($this->any())->method('getStoreManager')->will($this->returnValue($this->storeManager));
         $this->context->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilder));
         $this->corePostDataHelper = $this->createMock(\Magento\Framework\Data\Helper\PostHelper::class);
+        $this->store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $this->switcher = (new ObjectManager($this))->getObject(
             \Magento\Store\Block\Switcher::class,
             [
@@ -42,6 +51,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGetTargetStorePostData()
     {
         $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
@@ -50,20 +62,30 @@ public function testGetTargetStorePostData()
         $store->expects($this->any())
             ->method('getCode')
             ->willReturn('new-store');
-        $storeSwitchUrl = 'http://domain.com/stores/store/switch';
+        $storeSwitchUrl = 'http://domain.com/stores/store/redirect';
         $store->expects($this->atLeastOnce())
             ->method('getCurrentUrl')
             ->with(false)
             ->willReturn($storeSwitchUrl);
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->store);
+        $this->store->expects($this->once())
+            ->method('getCode')
+            ->willReturn('old-store');
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->willReturn($storeSwitchUrl);
         $this->corePostDataHelper->expects($this->any())
             ->method('getPostData')
-            ->with($storeSwitchUrl, ['___store' => 'new-store']);
+            ->with($storeSwitchUrl, ['___store' => 'new-store', 'uenc' => null, '___from_store' => 'old-store']);
 
         $this->switcher->getTargetStorePostData($store);
     }
 
     /**
      * @dataProvider isStoreInUrlDataProvider
+     * @param bool $isUseStoreInUrl
      */
     public function testIsStoreInUrl($isUseStoreInUrl)
     {
diff --git a/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php b/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php
index 4f848def8c353..50ea2947c1bd2 100644
--- a/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php
+++ b/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php
@@ -8,7 +8,6 @@
 use Magento\Store\Console\Command\StoreListCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Helper\TableHelper;
 use Magento\Store\Model\Store;
 use Magento\Framework\Console\Cli;
 
@@ -42,15 +41,6 @@ protected function setUp()
             StoreListCommand::class,
             ['storeManager' => $this->storeManagerMock]
         );
-
-        /** @var HelperSet $helperSet */
-        $helperSet = $this->objectManager->getObject(
-            HelperSet::class,
-            ['helpers' => [$this->objectManager->getObject(TableHelper::class)]]
-        );
-
-        //Inject table helper for output
-        $this->command->setHelperSet($helperSet);
     }
 
     public function testExecuteExceptionNoVerbosity()
diff --git a/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php b/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php
index 3978f49522224..0312c735c6772 100644
--- a/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php
+++ b/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php
@@ -8,7 +8,6 @@
 use Magento\Store\Console\Command\WebsiteListCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Helper\TableHelper;
 use Magento\Store\Model\Website;
 use Magento\Framework\Console\Cli;
 use Magento\Store\Api\WebsiteRepositoryInterface;
@@ -43,15 +42,6 @@ protected function setUp()
             WebsiteListCommand::class,
             ['websiteManagement' => $this->websiteRepositoryMock]
         );
-
-        /** @var HelperSet $helperSet */
-        $helperSet = $this->objectManager->getObject(
-            HelperSet::class,
-            ['helpers' => [$this->objectManager->getObject(TableHelper::class)]]
-        );
-
-        //Inject table helper for output
-        $this->command->setHelperSet($helperSet);
     }
 
     public function testExecuteExceptionNoVerbosity()
diff --git a/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php b/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php
index 1e7b2691a0084..0d337b91c192a 100644
--- a/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php
+++ b/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php
@@ -8,13 +8,15 @@
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreResolver;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\StoreResolver;
+use Magento\Store\Model\StoreSwitcher;
+use Magento\Store\Model\StoreSwitcherInterface;
 
 /**
  * Test class for \Magento\Store\Controller\Store\SwitchAction
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SwitchActionTest extends \PHPUnit\Framework\TestCase
 {
@@ -58,6 +60,12 @@ class SwitchActionTest extends \PHPUnit\Framework\TestCase
      */
     private $redirectMock;
 
+    /** @var StoreSwitcherInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $storeSwitcher;
+
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)->getMock();
@@ -73,6 +81,10 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->redirectMock =
             $this->getMockBuilder(\Magento\Framework\App\Response\RedirectInterface::class)->getMock();
+        $this->storeSwitcher = $this->getMockBuilder(StoreSwitcher::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['switch'])
+            ->getMock();
 
         $this->model = (new ObjectManager($this))->getObject(
             \Magento\Store\Controller\Store\SwitchAction::class,
@@ -83,81 +95,48 @@ protected function setUp()
                 'storeManager' => $this->storeManagerMock,
                 '_request' => $this->requestMock,
                 '_response' => $this->responseMock,
-                '_redirect' => $this->redirectMock
+                '_redirect' => $this->redirectMock,
+                'storeSwitcher' => $this->storeSwitcher
             ]
         );
     }
 
-    public function testExecuteSuccessWithoutUseStoreInUrl()
+    /**
+     * @return void
+     */
+    public function testExecute()
     {
         $storeToSwitchToCode = 'sv2';
         $defaultStoreViewCode = 'default';
         $expectedRedirectUrl = "magento.com/{$storeToSwitchToCode}";
-        $currentActiveStoreMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
         $defaultStoreViewMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
         $storeToSwitchToMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['isUseStoreInUrl'])
             ->getMockForAbstractClass();
 
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($currentActiveStoreMock);
-        $this->requestMock->expects($this->once())->method('getParam')->willReturn($storeToSwitchToCode);
+        $this->requestMock->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                [StoreResolver::PARAM_NAME, null, $storeToSwitchToCode],
+                ['___from_store', null, $defaultStoreViewCode]
+            ]
+        );
         $this->storeRepositoryMock
             ->expects($this->once())
-            ->method('getActiveStoreByCode')
-            ->willReturn($storeToSwitchToMock);
-        $this->storeManagerMock
-            ->expects($this->once())
-            ->method('getDefaultStoreView')
+            ->method('get')
+            ->with($defaultStoreViewCode)
             ->willReturn($defaultStoreViewMock);
-        $defaultStoreViewMock->expects($this->once())->method('getId')->willReturn($defaultStoreViewCode);
-        $storeToSwitchToMock->expects($this->once())->method('getId')->willReturn($storeToSwitchToCode);
-        $storeToSwitchToMock->expects($this->once())->method('isUseStoreInUrl')->willReturn(false);
-        $this->redirectMock->expects($this->once())->method('getRedirectUrl')->willReturn($expectedRedirectUrl);
-        $this->responseMock->expects($this->once())->method('setRedirect')->with($expectedRedirectUrl);
-
-        $this->model->execute();
-    }
-
-    public function testExecuteSuccessWithUseStoreInUrl()
-    {
-        $currentActiveStoreCode = 'sv1';
-        $storeToSwitchToCode = 'sv2';
-        $defaultStoreViewCode = 'default';
-        $originalRedirectUrl = "magento.com/{$currentActiveStoreCode}/test-page/test-sub-page";
-        $expectedRedirectUrl = "magento.com/{$storeToSwitchToCode}/test-page/test-sub-page";
-        $currentActiveStoreMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['isUseStoreInUrl', 'getBaseUrl'])
-            ->getMockForAbstractClass();
-        $defaultStoreViewMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock();
-        $storeToSwitchToMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['isUseStoreInUrl', 'getBaseUrl'])
-            ->getMockForAbstractClass();
-
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($currentActiveStoreMock);
-        $this->requestMock->expects($this->once())->method('getParam')->willReturn($storeToSwitchToCode);
         $this->storeRepositoryMock
             ->expects($this->once())
             ->method('getActiveStoreByCode')
+            ->with($storeToSwitchToCode)
             ->willReturn($storeToSwitchToMock);
-        $this->storeManagerMock
-            ->expects($this->once())
-            ->method('getDefaultStoreView')
-            ->willReturn($defaultStoreViewMock);
-        $defaultStoreViewMock->expects($this->once())->method('getId')->willReturn($defaultStoreViewCode);
-        $storeToSwitchToMock->expects($this->once())->method('getId')->willReturn($storeToSwitchToCode);
-        $storeToSwitchToMock->expects($this->once())->method('isUseStoreInUrl')->willReturn(true);
-        $this->redirectMock->expects($this->any())->method('getRedirectUrl')->willReturn($originalRedirectUrl);
-        $currentActiveStoreMock
-            ->expects($this->any())
-            ->method('getBaseUrl')
-            ->willReturn("magento.com/{$currentActiveStoreCode}");
-        $storeToSwitchToMock
-            ->expects($this->once())
-            ->method('getBaseUrl')
-            ->willReturn("magento.com/{$storeToSwitchToCode}");
+        $this->storeSwitcher->expects($this->once())
+            ->method('switch')
+            ->with($defaultStoreViewMock, $storeToSwitchToMock, $expectedRedirectUrl)
+            ->willReturn($expectedRedirectUrl);
+
+        $this->redirectMock->expects($this->once())->method('getRedirectUrl')->willReturn($expectedRedirectUrl);
         $this->responseMock->expects($this->once())->method('setRedirect')->with($expectedRedirectUrl);
 
         $this->model->execute();
diff --git a/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php b/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php
index 0eea86da61b3b..78a627c195f81 100644
--- a/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/BaseUrlCheckerTest.php
@@ -78,9 +78,9 @@ public function testExecute()
     public function testIsEnabled()
     {
         $this->scopeConfig->expects($this->once())
-            ->method('getValue')
+            ->method('isSetFlag')
             ->with('web/url/redirect_to_base', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
-            ->willReturn(1);
+            ->willReturn(!!1);
         $this->assertTrue($this->baseUrlChecker->isEnabled());
     }
 
@@ -89,15 +89,16 @@ public function testIsEnabled()
      */
     public function testIsFrontendSecure()
     {
-        $this->scopeConfig->expects($this->exactly(2))
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
-            ->withConsecutive(
-                ['web/unsecure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
-                ['web/secure/use_in_frontend', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
-            )->will($this->onConsecutiveCalls(
-                $this->returnValue('https://localhost'),
-                1
-            ));
+            ->with('web/unsecure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            ->willReturn('https://localhost');
+
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with('web/secure/use_in_frontend', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            ->willReturn(!!1);
+
         $this->assertTrue($this->baseUrlChecker->isFrontendSecure());
     }
 }
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php
index 9c7cc648cf8af..0fbf7bb7f044b 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php
@@ -196,14 +196,30 @@ private function initTestData()
                 'root_category_id' => '1',
                 'default_store_id' => '1',
                 'code' => 'default',
+            ],
+            2 => [
+                'group_id' => '1',
+                'website_id' => '1',
+                'name' => 'Default1',
+                'default_store_id' => '1',
+                'code' => 'default1',
             ]
         ];
-        $this->trimmedGroup = [
-            'name' => 'Default',
-            'root_category_id' => '1',
-            'code' => 'default',
-            'default_store_id' => '1',
-        ];
+        $this->trimmedGroup =
+            [
+                0 => [
+                    'name' => 'Default',
+                    'root_category_id' => '1',
+                    'code' => 'default',
+                    'default_store_id' => '1',
+                ],
+                1 => [
+                    'name' => 'Default1',
+                    'root_category_id' => '0',
+                    'code' => 'default1',
+                    'default_store_id' => '1'
+                ]
+            ];
         $this->stores = [
             'default' => [
                 'store_id' => '1',
@@ -280,34 +296,34 @@ public function testRunGroup()
                 [ScopeInterface::SCOPE_GROUPS, $this->groups, $this->groups],
             ]);
 
-        $this->websiteMock->expects($this->once())
+        $this->websiteMock->expects($this->exactly(2))
             ->method('getResource')
             ->willReturn($this->abstractDbMock);
 
-        $this->groupMock->expects($this->once())
+        $this->groupMock->expects($this->exactly(2))
             ->method('setData')
-            ->with($this->trimmedGroup)
-            ->willReturnSelf();
-        $this->groupMock->expects($this->exactly(3))
+            ->withConsecutive(
+                [$this->equalTo($this->trimmedGroup[0])],
+                [$this->equalTo($this->trimmedGroup[1])]
+            )->willReturnSelf();
+
+        $this->groupMock->expects($this->exactly(6))
             ->method('getResource')
             ->willReturn($this->abstractDbMock);
-        $this->groupMock->expects($this->once())
-            ->method('setRootCategoryId')
-            ->with(0);
-        $this->groupMock->expects($this->once())
+        $this->groupMock->expects($this->exactly(2))
             ->method('getDefaultStoreId')
             ->willReturn($defaultStoreId);
-        $this->groupMock->expects($this->once())
+        $this->groupMock->expects($this->exactly(2))
             ->method('setDefaultStoreId')
             ->with($storeId);
-        $this->groupMock->expects($this->once())
+        $this->groupMock->expects($this->exactly(2))
             ->method('setWebsite')
             ->with($this->websiteMock);
 
-        $this->storeMock->expects($this->once())
+        $this->storeMock->expects($this->exactly(2))
             ->method('getResource')
             ->willReturn($this->abstractDbMock);
-        $this->storeMock->expects($this->once())
+        $this->storeMock->expects($this->exactly(2))
             ->method('getStoreId')
             ->willReturn($storeId);
 
@@ -315,20 +331,16 @@ public function testRunGroup()
             ->method('load')
             ->withConsecutive([$this->websiteMock, 'base', 'code'], [$this->storeMock, 'default', 'code'])
             ->willReturnSelf();
-        $this->abstractDbMock->expects($this->exactly(2))
+        $this->abstractDbMock->expects($this->exactly(4))
             ->method('save')
             ->with($this->groupMock)
             ->willReturnSelf();
-        $this->abstractDbMock->expects($this->once())
+        $this->abstractDbMock->expects($this->exactly(2))
             ->method('addCommitCallback')
             ->willReturnCallback(function ($function) {
                 return $function();
             });
 
-        $this->eventManagerMock->expects($this->once())
-            ->method('dispatch')
-            ->with('store_group_save', ['group' => $this->groupMock]);
-
         $this->processor->run($this->data);
     }
 
@@ -382,10 +394,6 @@ public function testRunStore()
                 return $function();
             });
 
-        $this->eventManagerMock->expects($this->once())
-            ->method('dispatch')
-            ->with('store_add', ['store' => $this->storeMock]);
-
         $this->processor->run($this->data);
     }
 
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/DeleteTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/DeleteTest.php
index d16a4a70b00aa..c373643fa03ac 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/DeleteTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/DeleteTest.php
@@ -244,8 +244,6 @@ public function testRun()
             ->method('get')
             ->with('test')
             ->willReturn($this->storeMock);
-        $this->storeResourceMock->expects($this->once())
-            ->method('addCommitCallback');
 
         $this->registryMock->expects($this->once())
             ->method('unregister')
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/ProcessorFactoryTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/ProcessorFactoryTest.php
index b1042aea78add..7de97407ebc19 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/ProcessorFactoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/ProcessorFactoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Test\Unit\Model\Config\Importer\Processor;
 
 use Magento\Framework\ObjectManagerInterface;
@@ -62,7 +63,7 @@ public function testCreate()
 
     /**
      * @expectedException \Magento\Framework\Exception\ConfigurationMismatchException
-     * @expectedExceptionMessage Class for type "dummyType" was not declared
+     * @expectedExceptionMessage The class for "dummyType" type wasn't declared. Enter the class and try again.
      */
     public function testCreateNonExisted()
     {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
index 3b0b932e31d46..e98ad08d46a68 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
@@ -175,7 +175,7 @@ public function testRun()
                     $updateData[ScopeInterface::SCOPE_STORES],
                 ],
             ]);
-        $this->websiteMock->expects($this->exactly(4))
+        $this->websiteMock->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($this->websiteResourceMock);
         $this->websiteMock->expects($this->once())
@@ -203,7 +203,7 @@ public function testRun()
         $this->groupFactoryMock->expects($this->exactly(3))
             ->method('create')
             ->willReturn($this->groupMock);
-        $this->groupMock->expects($this->exactly(5))
+        $this->groupMock->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($this->groupResourceMock);
         $this->groupMock->expects($this->once())
@@ -227,7 +227,7 @@ public function testRun()
         $this->storeFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->storeMock);
-        $this->storeMock->expects($this->exactly(4))
+        $this->storeMock->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($this->storeResourceMock);
         $this->storeMock->expects($this->once())
@@ -244,15 +244,16 @@ public function testRun()
         $this->storeMock->expects($this->once())
             ->method('setData')
             ->with($updateData[ScopeInterface::SCOPE_STORES]['test']);
-        $this->storeResourceMock->expects($this->once())
+        $this->storeMock->expects($this->once())
             ->method('save')
-            ->with($this->storeMock);
-        $this->storeResourceMock->expects($this->once())
-            ->method('addCommitCallback');
+            ->willReturnSelf();
 
         $this->model->run($data);
     }
 
+    /**
+     * @return array
+     */
     private function getData()
     {
         return [
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php
index fd42be4cb8f6c..e44eacc79b82f 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php
@@ -23,7 +23,7 @@ protected function setUp()
     {
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
         $this->_requestMock->expects(
-            $this->any()
+            $this->once()
         )->method(
             'getDistroBaseUrl'
         )->will(
diff --git a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
index e56b5c7fcaa19..9f4be98ab5580 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
@@ -54,11 +54,6 @@ class StoreCookieTest extends \PHPUnit\Framework\TestCase
      */
     protected $storeRepositoryMock;
 
-    /**
-     * @var \Magento\Store\Api\StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storeResolverMock;
-
     /**
      * Set up
      */
@@ -94,22 +89,19 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
-        $this->storeResolverMock = $this->getMockBuilder(\Magento\Store\Api\StoreResolverInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
         $this->plugin = (new ObjectManager($this))->getObject(
             \Magento\Store\Model\Plugin\StoreCookie::class,
             [
                 'storeManager' => $this->storeManagerMock,
                 'storeCookieManager' => $this->storeCookieManagerMock,
-                'storeRepository' => $this->storeRepositoryMock,
-                'storeResolver' => $this->storeResolverMock
+                'storeRepository' => $this->storeRepositoryMock
             ]
         );
     }
 
+    /**
+     * @return void
+     */
     public function testBeforeDispatchNoSuchEntity()
     {
         $storeCode = 'store';
@@ -125,14 +117,13 @@ public function testBeforeDispatchNoSuchEntity()
         $this->storeCookieManagerMock->expects($this->once())
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
-        $this->requestMock->expects($this->atLeastOnce())
-            ->method('getParam')
-            ->with(StoreResolverInterface::PARAM_NAME)
-            ->willReturn(null);
 
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 
+    /**
+     * @return void
+     */
     public function testBeforeDispatchStoreIsInactive()
     {
         $storeCode = 'store';
@@ -148,14 +139,13 @@ public function testBeforeDispatchStoreIsInactive()
         $this->storeCookieManagerMock->expects($this->once())
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
-        $this->requestMock->expects($this->atLeastOnce())
-            ->method('getParam')
-            ->with(StoreResolverInterface::PARAM_NAME)
-            ->willReturn(null);
 
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 
+    /**
+     * @return void
+     */
     public function testBeforeDispatchInvalidArgument()
     {
         $storeCode = 'store';
@@ -171,14 +161,13 @@ public function testBeforeDispatchInvalidArgument()
         $this->storeCookieManagerMock->expects($this->once())
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
-        $this->requestMock->expects($this->atLeastOnce())
-            ->method('getParam')
-            ->with(StoreResolverInterface::PARAM_NAME)
-            ->willReturn(null);
 
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 
+    /**
+     * @return void
+     */
     public function testBeforeDispatchNoStoreCookie()
     {
         $storeCode = null;
@@ -194,21 +183,12 @@ public function testBeforeDispatchNoStoreCookie()
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
 
-        $this->storeResolverMock->expects($this->atLeastOnce())
-            ->method('getCurrentStoreId')
-            ->willReturn(1);
-
-        $this->storeRepositoryMock->expects($this->atLeastOnce())
-            ->method('getActiveStoreById')
-            ->willReturn($this->storeMock);
-
-        $this->storeCookieManagerMock->expects($this->atLeastOnce())
-            ->method('setStoreCookie')
-            ->with($this->storeMock);
-
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 
+    /**
+     * @return void
+     */
     public function testBeforeDispatchWithStoreRequestParam()
     {
         $storeCode = 'store';
@@ -222,23 +202,6 @@ public function testBeforeDispatchWithStoreRequestParam()
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
 
-        $this->requestMock->expects($this->atLeastOnce())
-            ->method('getParam')
-            ->with(StoreResolverInterface::PARAM_NAME)
-            ->willReturn($storeCode);
-
-        $this->storeResolverMock->expects($this->atLeastOnce())
-            ->method('getCurrentStoreId')
-            ->willReturn(1);
-
-        $this->storeRepositoryMock->expects($this->atLeastOnce())
-            ->method('getActiveStoreById')
-            ->willReturn($this->storeMock);
-
-        $this->storeCookieManagerMock->expects($this->atLeastOnce())
-            ->method('setStoreCookie')
-            ->with($this->storeMock);
-
         $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock);
     }
 }
diff --git a/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php b/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
index 702f4eee8db99..14d7e07c3c801 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
@@ -55,6 +55,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @param array $storeConfig
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getStoreMock(array $storeConfig)
     {
         $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
@@ -88,6 +92,9 @@ protected function getStoreMock(array $storeConfig)
         return $storeMock;
     }
 
+    /**
+     * @return \Magento\Store\Model\Data\StoreConfig
+     */
     protected function createStoreConfigDataObject()
     {
         /** @var \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactoryMock */
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
index ad3b927258717..a48804f02adc0 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
@@ -97,6 +97,9 @@ public function testGetStores($storesList, $withDefault, $codeKey, $expectedStor
         $this->assertEquals($expectedStores, $this->model->getStores($withDefault, $codeKey));
     }
 
+    /**
+     * @return array
+     */
     public function getStoresDataProvider()
     {
         $defaultStoreMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php
index 03b886459a7cc..59a433a76a08b 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php
@@ -76,7 +76,7 @@ private function initDistroList()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested store is not found
+     * @expectedExceptionMessage The store that was requested wasn't found. Verify the store and try again.
      */
     public function testGetWithException()
     {
@@ -128,7 +128,7 @@ public function testGetByIdWithAvailableStoreFromScope()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Requested store is not found
+     * @expectedExceptionMessage The store that was requested wasn't found. Verify the store and try again.
      */
     public function testGetByIdWithException()
     {
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
index eacccbf1bb475..f4a5010e51b88 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Store\Test\Unit\Model;
 
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 
@@ -38,11 +38,24 @@ class StoreTest extends \PHPUnit\Framework\TestCase
      */
     protected $filesystemMock;
 
+    /**
+     * @var ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionMock;
+
     /**
      * @var \Magento\Framework\Url\ModifierInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $urlModifierMock;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -58,12 +71,22 @@ protected function setUp()
             'isSecure',
             'getServer',
         ]);
+
         $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->configMock = $this->getMockBuilder(ReinitableConfigInterface::class)
+            ->getMock();
+        $this->sessionMock = $this->getMockBuilder(SessionManagerInterface::class)
+            ->setMethods(['getCurrencyCode'])
+            ->getMockForAbstractClass();
         $this->store = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
-            ['filesystem' => $this->filesystemMock]
+            [
+                'filesystem' => $this->filesystemMock,
+                'config' => $this->configMock,
+                'session' => $this->sessionMock,
+            ]
         );
 
         $this->urlModifierMock = $this->createMock(\Magento\Framework\Url\ModifierInterface::class);
@@ -94,6 +117,9 @@ public function testLoad($key, $field)
         $model->load($key);
     }
 
+    /**
+     * @return array
+     */
     public function loadDataProvider()
     {
         return [
@@ -102,6 +128,9 @@ public function loadDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testSetWebsite()
     {
         $website = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getId', '__wakeup']);
@@ -112,6 +141,9 @@ public function testSetWebsite()
         $this->assertEquals(2, $model->getWebsiteId());
     }
 
+    /**
+     * @return void
+     */
     public function testGetWebsite()
     {
         $websiteId = 2;
@@ -135,6 +167,9 @@ public function testGetWebsite()
         $this->assertEquals($website, $model->getWebsite());
     }
 
+    /**
+     * @return void
+     */
     public function testGetWebsiteIfWebsiteIsNotExist()
     {
         $websiteRepository = $this->getMockBuilder(\Magento\Store\Api\WebsiteRepositoryInterface::class)
@@ -153,6 +188,9 @@ public function testGetWebsiteIfWebsiteIsNotExist()
         $this->assertFalse($model->getWebsite());
     }
 
+    /**
+     * @return void
+     */
     public function testGetGroup()
     {
         $groupId = 2;
@@ -176,6 +214,9 @@ public function testGetGroup()
         $this->assertEquals($group, $model->getGroup());
     }
 
+    /**
+     * @return void
+     */
     public function testGetGroupIfGroupIsNotExist()
     {
         $groupRepository = $this->getMockBuilder(\Magento\Store\Api\GroupRepositoryInterface::class)
@@ -194,6 +235,9 @@ public function testGetGroupIfGroupIsNotExist()
         $this->assertFalse($model->getGroup());
     }
 
+    /**
+     * @return void
+     */
     public function testGetUrl()
     {
         $params = ['_scope_to_url' => true];
@@ -265,6 +309,9 @@ function ($path, $scope, $scopeCode) use ($secure, $expectedPath) {
         $this->assertEquals($expectedBaseUrl, $model->getBaseUrl($type, $secure));
     }
 
+    /**
+     * @return array
+     */
     public function getBaseUrlDataProvider()
     {
         return [
@@ -319,6 +366,9 @@ public function getBaseUrlDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testGetBaseUrlEntryPoint()
     {
         $expectedPath = 'web/unsecure/base_link_url';
@@ -371,10 +421,11 @@ public function testGetBaseUrlWrongType()
      * @param boolean $secure
      * @param string $url
      * @param string $expected
+     * @param bool|string $fromStore
      */
-    public function testGetCurrentUrl($secure, $url, $expected)
+    public function testGetCurrentUrl($secure, $url, $expected, $fromStore)
     {
-        $defaultStore = $this->createPartialMock(\Magento\Store\Model\Store::class, [
+        $defaultStore = $this->createPartialMock(Store::class, [
             'getId',
             'isCurrentlySecure',
             '__wakeup'
@@ -387,15 +438,31 @@ public function testGetCurrentUrl($secure, $url, $expected)
 
         $config = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
 
-        $this->requestMock->expects($this->atLeastOnce())->method('getRequestString')->will($this->returnValue(''));
+        $requestString = preg_replace(
+            '/http(s?)\:\/\/[a-z0-9\-]+\//i',
+            '',
+            $url
+        );
+        $this->requestMock
+            ->expects($this->atLeastOnce())
+            ->method('getRequestString')
+            ->willReturn($requestString);
         $this->requestMock->expects($this->atLeastOnce())->method('getQueryValue')->will($this->returnValue([
             'SID' => 'sid'
         ]));
 
         $urlMock = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
-        $urlMock->expects($this->atLeastOnce())->method('setScope')->will($this->returnSelf());
-        $urlMock->expects($this->any())->method('getUrl')
-            ->will($this->returnValue($url));
+        $urlMock
+            ->expects($this->atLeastOnce())
+            ->method('setScope')
+            ->will($this->returnSelf());
+        $urlMock->expects($this->any())
+            ->method('getUrl')
+            ->will($this->returnValue(str_replace($requestString, '', $url)));
+        $urlMock
+            ->expects($this->atLeastOnce())
+            ->method('escape')
+            ->willReturnArgument(0);
 
         $storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
         $storeManager->expects($this->any())
@@ -410,7 +477,7 @@ public function testGetCurrentUrl($secure, $url, $expected)
         $model->setStoreId(2);
         $model->setCode('scope_code');
 
-        $this->assertEquals($expected, $model->getCurrentUrl(false));
+        $this->assertEquals($expected, $model->getCurrentUrl($fromStore));
     }
 
     /**
@@ -419,9 +486,31 @@ public function testGetCurrentUrl($secure, $url, $expected)
     public function getCurrentUrlDataProvider()
     {
         return [
-            [true, 'http://test/url', 'http://test/url?SID=sid&amp;___store=scope_code'],
-            [true, 'http://test/url?SID=sid1&___store=scope', 'http://test/url?SID=sid&amp;___store=scope_code'],
-            [false, 'https://test/url', 'https://test/url?SID=sid&amp;___store=scope_code']
+            [
+                true,
+                'http://test/url',
+                'http://test/url?SID=sid&___store=scope_code',
+                false
+            ],
+            [
+                true,
+                'http://test/url?SID=sid1&___store=scope',
+                'http://test/url?SID=sid&___store=scope_code',
+                false
+            ],
+            [
+                false,
+                'https://test/url',
+                'https://test/url?SID=sid&___store=scope_code',
+                false
+            ],
+            [
+                true,
+                'http://test/u/u.2?___store=scope_code',
+                'http://test/u/u.2?'
+                . '___store=scope_code&SID=sid&___from_store=old-store',
+                'old-store'
+            ]
         ];
     }
 
@@ -481,6 +570,9 @@ public function getBaseCurrencyDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testGetAllowedCurrencies()
     {
         $currencyPath = 'cur/ren/cy/path';
@@ -563,6 +655,9 @@ public function testIsCurrentlySecure(
         }
     }
 
+    /**
+     * @return array
+     */
     public function isCurrentlySecureDataProvider()
     {
         return [
@@ -603,16 +698,96 @@ public function testGetBaseStaticDir()
         $this->assertEquals($expectedResult, $this->store->getBaseStaticDir());
     }
 
+    /**
+     * @return void
+     */
     public function testGetScopeType()
     {
         $this->assertEquals(ScopeInterface::SCOPE_STORE, $this->store->getScopeType());
     }
 
+    /**
+     * @return void
+     */
     public function testGetScopeTypeName()
     {
         $this->assertEquals('Store View', $this->store->getScopeTypeName());
     }
 
+    /**
+     * @param array $availableCodes
+     * @param string $currencyCode
+     * @param string $defaultCode
+     * @param string $expectedCode
+     * @return void
+     * @dataProvider currencyCodeDataProvider
+     */
+    public function testGetCurrentCurrencyCode(
+        array $availableCodes,
+        string $currencyCode,
+        string $defaultCode,
+        string $expectedCode
+    ): void {
+        $this->store->setData('available_currency_codes', $availableCodes);
+        $this->sessionMock->method('getCurrencyCode')
+            ->willReturn($currencyCode);
+        $this->configMock->method('getValue')
+            ->with(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT)
+            ->willReturn($defaultCode);
+
+        $code = $this->store->getCurrentCurrencyCode();
+        $this->assertEquals($expectedCode, $code);
+    }
+
+    /**
+     * @return array
+     */
+    public function currencyCodeDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'USD',
+                ],
+                'USD',
+                'USD',
+                'USD',
+            ],
+            [
+                [
+                    'USD',
+                    'EUR',
+                ],
+                'EUR',
+                'USD',
+                'EUR',
+            ],
+            [
+                [
+                    'EUR',
+                    'USD',
+                ],
+                'GBP',
+                'USD',
+                'USD',
+            ],
+            [
+                [
+                    'USD',
+                ],
+                'GBP',
+                'EUR',
+                'USD',
+            ],
+            [
+                [],
+                'GBP',
+                'EUR',
+                'EUR',
+            ],
+        ];
+    }
+
     /**
      * @param \Magento\Store\Model\Store $model
      */
diff --git a/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php
index d70da2ee1ddc6..9cc4bb6ac8e5b 100644
--- a/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php
@@ -104,6 +104,9 @@ public function testGetStoresStructure(
         );
     }
 
+    /**
+     * @return array
+     */
     public function getStoresStructureDataProvider()
     {
         $websiteName = 'website';
@@ -207,6 +210,9 @@ public function testGetStoreValuesForForm(
         );
     }
 
+    /**
+     * @return array
+     */
     public function getStoreValuesForFormDataProvider()
     {
         $websiteName = 'website';
diff --git a/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php b/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php
index 80e4973bbe7fe..0396092176673 100644
--- a/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->websiteFactoryMock =
-            $this->getMockBuilder('Magento\Store\Model\WebsiteFactory')
+            $this->getMockBuilder(\Magento\Store\Model\WebsiteFactory::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['create'])
                 ->getMock();
@@ -94,7 +94,6 @@ public function testGetDefault()
 
     /**
      * @expectedException \DomainException
-     * @expectedExceptionMessage More than one default website is defined
      */
     public function testGetDefaultIsSeveral()
     {
@@ -118,11 +117,15 @@ public function testGetDefaultIsSeveral()
         $this->websiteFactoryMock->expects($this->any())->method('create')->willReturn($websiteMock);
 
         $this->model->getDefault();
+
+        $this->expectExceptionMessage(
+            "The default website is invalid. Make sure no more than one default is defined and try again."
+        );
     }
 
     /**
      * @expectedException \DomainException
-     * @expectedExceptionMessage Default website is not defined
+     * @expectedExceptionMessage The default website isn't defined. Set the website and try again.
      */
     public function testGetDefaultIsZero()
     {
diff --git a/app/code/Magento/Store/Test/Unit/Setup/UpgradeDataTest.php b/app/code/Magento/Store/Test/Unit/Setup/UpgradeDataTest.php
deleted file mode 100644
index 0dc7de4224c43..0000000000000
--- a/app/code/Magento/Store/Test/Unit/Setup/UpgradeDataTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Store\Test\Unit\Setup;
-
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Select;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Setup\UpgradeData;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-
-class UpgradeDataTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ObjectManager
-     */
-    private $objectManagerHelper;
-
-    /**
-     * @var ModuleDataSetupInterface|MockObject
-     */
-    private $setupMock;
-
-    /**
-     * @var AdapterInterface|MockObject
-     */
-    private $connectionMock;
-
-    /**
-     * @var ModuleContextInterface|MockObject
-     */
-    private $contextMock;
-
-    /**
-     * @var UpgradeData
-     */
-    protected $model;
-
-    protected function setUp()
-    {
-        $this->objectManagerHelper = new ObjectManager($this);
-
-        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
-            ->getMockForAbstractClass();
-        $this->setupMock = $this->getMockBuilder(ModuleDataSetupInterface::class)
-            ->getMockForAbstractClass();
-        $this->setupMock->expects($this->any())
-            ->method('getConnection')
-            ->willReturn($this->connectionMock);
-        $this->contextMock = $this->getMockBuilder(ModuleContextInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->model = new UpgradeData();
-    }
-
-    /**
-     * @param array $groupList
-     * @param array $expectedCodes
-     * @dataProvider upgradeDataProvider
-     */
-    public function testUpgradeToVersion210(array $groupList, array $expectedCodes)
-    {
-        $tableName = 'store_group';
-        $this->setupMock->expects($this->once())
-            ->method('getTable')
-            ->willReturn($tableName);
-        $selectMock = $this->getMockBuilder(Select::class)
-            ->setMethods(['from'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->contextMock->expects($this->once())
-            ->method('getVersion')
-            ->willReturn('2.0.0');
-        $this->connectionMock->expects($this->any())
-            ->method('select')
-            ->willReturn($selectMock);
-        $selectMock->expects($this->once())
-            ->method('from')
-            ->with('store_group', ['group_id', 'name'])
-            ->willReturnSelf();
-        $this->connectionMock->expects($this->once())
-            ->method('fetchPairs')
-            ->with($selectMock)
-            ->willReturn($groupList);
-
-        $i = 2;
-        foreach ($expectedCodes as $groupId => $code) {
-            $this->connectionMock->expects($this->at($i++))
-                ->method('update')
-                ->with(
-                    $tableName,
-                    ['code' => $code],
-                    ['group_id = ?' => $groupId]
-                );
-        }
-
-        $this->model->upgrade($this->setupMock, $this->contextMock);
-    }
-
-    public function upgradeDataProvider()
-    {
-        return [
-            [
-                [
-                    1 => 'Test Group'
-                ],
-                [
-                    1 => 'test_group'
-                ]
-            ],
-            [
-                [
-                    1 => 'Test Group',
-                    2 => 'Test Group',
-                    3 => 'Test Group',
-                ],
-                [
-                    1 => 'test_group',
-                    2 => 'test_group2',
-                    3 => 'test_group3'
-                ]
-            ],
-            [
-                [
-                    1 => '123 Group',
-                    2 => '12345',
-                    3 => '123456',
-                    4 => '123456',
-                    5 => '12Group34',
-                    6 => '&#*@#&_group'
-                ],
-                [
-                    1 => 'group',
-                    2 => 'store_group',
-                    3 => 'store_group2',
-                    4 => 'store_group3',
-                    5 => 'group34',
-                    6 => 'group2'
-                ]
-            ]
-        ];
-    }
-}
diff --git a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
index ed9ac7ebe438a..9b83714166b12 100644
--- a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
+++ b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
@@ -22,6 +22,11 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $queryParamsResolverMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
+     */
+    protected $storeMock;
+
     /**
      * @var \Magento\Store\Url\Plugin\RouteParamsResolver
      */
@@ -30,7 +35,19 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->setMethods(['getCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock->expects($this->any())->method('getCode')->willReturn('custom_store');
+
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->storeManagerMock
+            ->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
         $this->queryParamsResolverMock = $this->createMock(\Magento\Framework\Url\QueryParamsResolverInterface::class);
         $this->model = new \Magento\Store\Url\Plugin\RouteParamsResolver(
             $this->scopeConfigMock,
@@ -42,6 +59,8 @@ protected function setUp()
     public function testBeforeSetRouteParamsScopeInParams()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -52,7 +71,7 @@ public function testBeforeSetRouteParamsScopeInParams()
             )
             ->will($this->returnValue(false));
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
-        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -61,7 +80,7 @@ public function testBeforeSetRouteParamsScopeInParams()
         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
 
-        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+        $this->queryParamsResolverMock->expects($this->any())->method('setQueryParam');
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
@@ -72,6 +91,8 @@ public function testBeforeSetRouteParamsScopeInParams()
     public function testBeforeSetRouteParamsScopeUseStoreInUrl()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -81,8 +102,9 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
                 $storeCode
             )
             ->will($this->returnValue(true));
+
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
-        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -91,7 +113,7 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
 
-        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('___store', $storeCode);
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
@@ -102,6 +124,8 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
     public function testBeforeSetRouteParamsSingleStore()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -112,7 +136,7 @@ public function testBeforeSetRouteParamsSingleStore()
             )
             ->will($this->returnValue(false));
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(true);
-        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -132,6 +156,8 @@ public function testBeforeSetRouteParamsSingleStore()
     public function testBeforeSetRouteParamsNoScopeInParams()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -140,17 +166,10 @@ public function testBeforeSetRouteParamsNoScopeInParams()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeCode
             )
-            ->will($this->returnValue(false));
+            ->will($this->returnValue(true));
+
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
-        /** @var \PHPUnit_Framework_MockObject_MockObject| $routeParamsResolverMock */
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->setMethods(['getCode'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storeMock->expects($this->any())->method('getCode')->willReturn($storeCode);
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
 
-        $data = ['_scope_to_url' => true];
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -159,7 +178,7 @@ public function testBeforeSetRouteParamsNoScopeInParams()
         $routeParamsResolverMock->expects($this->never())->method('setScope');
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn(false);
 
-        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('___store', $storeCode);
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
index c4f8a31430963..9c9d1e6023af0 100644
--- a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -6,6 +6,7 @@
 namespace Magento\Store\Url\Plugin;
 
 use \Magento\Store\Model\Store;
+use \Magento\Store\Api\Data\StoreInterface;
 use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 
 /**
@@ -51,6 +52,8 @@ public function __construct(
      * @param \Magento\Framework\Url\RouteParamsResolver $subject
      * @param array $data
      * @param bool $unsetOldParams
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     *
      * @return array
      */
     public function beforeSetRouteParams(
@@ -63,12 +66,18 @@ public function beforeSetRouteParams(
             unset($data['_scope']);
         }
         if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
-            $storeCode = $subject->getScope() ?: $this->storeManager->getStore()->getCode();
+            /** @var StoreInterface $currentScope */
+            $currentScope = $subject->getScope();
+            $storeCode = $currentScope && $currentScope instanceof StoreInterface ?
+                $currentScope->getCode() :
+                $this->storeManager->getStore()->getCode();
+
             $useStoreInUrl = $this->scopeConfig->getValue(
                 Store::XML_PATH_STORE_IN_URL,
                 StoreScopeInterface::SCOPE_STORE,
                 $storeCode
             );
+
             if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
                 $this->queryParamsResolver->setQueryParam('___store', $storeCode);
             }
diff --git a/app/code/Magento/Store/ViewModel/SwitcherUrlProvider.php b/app/code/Magento/Store/ViewModel/SwitcherUrlProvider.php
new file mode 100644
index 0000000000000..b0d08f064073d
--- /dev/null
+++ b/app/code/Magento/Store/ViewModel/SwitcherUrlProvider.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Store\ViewModel;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provides target store redirect url.
+ */
+class SwitcherUrlProvider implements \Magento\Framework\View\Element\Block\ArgumentInterface
+{
+    /**
+     * @var EncoderInterface
+     */
+    private $encoder;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param EncoderInterface $encoder
+     * @param StoreManagerInterface $storeManager
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(
+        EncoderInterface $encoder,
+        StoreManagerInterface $storeManager,
+        UrlInterface $urlBuilder
+    ) {
+        $this->encoder = $encoder;
+        $this->storeManager = $storeManager;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Returns target store redirect url.
+     *
+     * @param Store $store
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getTargetStoreRedirectUrl(Store $store): string
+    {
+        return $this->urlBuilder->getUrl(
+            'stores/store/redirect',
+            [
+                '___store' => $store->getCode(),
+                '___from_store' => $this->storeManager->getStore()->getCode(),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->encoder->encode(
+                    $store->getCurrentUrl(false)
+                ),
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index a8e3dbc5d1357..ebaa32b95f48b 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -5,19 +5,18 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-deploy": "100.3.*"
+        "magento/module-deploy": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index 470337a97dcd9..b9e7ac1c6aca0 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -21,13 +21,13 @@
                 <merge_files>0</merge_files>
                 <minify_files>0</minify_files>
                 <minify_exclude>
-                    /tiny_mce/
+                    <tiny_mce>/tiny_mce/</tiny_mce>
                 </minify_exclude>
             </js>
             <css>
                 <minify_files>0</minify_files>
                 <minify_exclude>
-                    /tiny_mce/
+                    <tiny_mce>/tiny_mce/</tiny_mce>
                 </minify_exclude>
             </css>
             <image>
@@ -115,6 +115,10 @@
             <file>
                 <protected_extensions>
                     <php>php</php>
+                    <php3>php3</php3>
+                    <php4>php4</php4>
+                    <php5>php5</php5>
+                    <php7>php7</php7>
                     <htaccess>htaccess</htaccess>
                     <jsp>jsp</jsp>
                     <pl>pl</pl>
@@ -126,6 +130,8 @@
                     <html>html</html>
                     <phtml>phtml</phtml>
                     <shtml>shtml</shtml>
+                    <phpt>phpt</phpt>
+                    <pht>pht</pht>
                 </protected_extensions>
                 <public_files_valid_paths>
                     <protected>
diff --git a/app/code/Magento/Store/etc/db_schema.xml b/app/code/Magento/Store/etc/db_schema.xml
new file mode 100644
index 0000000000000..6eea94b8deec7
--- /dev/null
+++ b/app/code/Magento/Store/etc/db_schema.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="store_website" resource="default" engine="innodb" comment="Websites">
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Website Id"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Code"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="64" comment="Website Name"/>
+        <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="smallint" name="default_group_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Default Group Id"/>
+        <column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="true" identity="false"
+                default="0" comment="Defines Is Website Default"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="website_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="STORE_WEBSITE_CODE">
+            <column name="code"/>
+        </constraint>
+        <index referenceId="STORE_WEBSITE_SORT_ORDER" indexType="btree">
+            <column name="sort_order"/>
+        </index>
+        <index referenceId="STORE_WEBSITE_DEFAULT_GROUP_ID" indexType="btree">
+            <column name="default_group_id"/>
+        </index>
+    </table>
+    <table name="store_group" resource="default" engine="innodb" comment="Store Groups">
+        <column xsi:type="smallint" name="group_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Group Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <column xsi:type="varchar" name="name" nullable="false" length="255" comment="Store Group Name"/>
+        <column xsi:type="int" name="root_category_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Root Category Id"/>
+        <column xsi:type="smallint" name="default_store_id" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Default Store Id"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Store group unique code"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="group_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="STORE_GROUP_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="store_group"
+                    column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="STORE_GROUP_CODE">
+            <column name="code"/>
+        </constraint>
+        <index referenceId="STORE_GROUP_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="STORE_GROUP_DEFAULT_STORE_ID" indexType="btree">
+            <column name="default_store_id"/>
+        </index>
+    </table>
+    <table name="store" resource="default" engine="innodb" comment="Stores">
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="true"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="32" comment="Code"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <column xsi:type="smallint" name="group_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Group Id"/>
+        <column xsi:type="varchar" name="name" nullable="false" length="255" comment="Store Name"/>
+        <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Sort Order"/>
+        <column xsi:type="smallint" name="is_active" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Activity"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="STORE_GROUP_ID_STORE_GROUP_GROUP_ID" table="store" column="group_id"
+                    referenceTable="store_group" referenceColumn="group_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="STORE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="store"
+                    column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="STORE_CODE">
+            <column name="code"/>
+        </constraint>
+        <index referenceId="STORE_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="STORE_IS_ACTIVE_SORT_ORDER" indexType="btree">
+            <column name="is_active"/>
+            <column name="sort_order"/>
+        </index>
+        <index referenceId="STORE_GROUP_ID" indexType="btree">
+            <column name="group_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Store/etc/db_schema_whitelist.json b/app/code/Magento/Store/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..24ed35c361efb
--- /dev/null
+++ b/app/code/Magento/Store/etc/db_schema_whitelist.json
@@ -0,0 +1,61 @@
+{
+    "store_website": {
+        "column": {
+            "website_id": true,
+            "code": true,
+            "name": true,
+            "sort_order": true,
+            "default_group_id": true,
+            "is_default": true
+        },
+        "index": {
+            "STORE_WEBSITE_SORT_ORDER": true,
+            "STORE_WEBSITE_DEFAULT_GROUP_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "STORE_WEBSITE_CODE": true
+        }
+    },
+    "store_group": {
+        "column": {
+            "group_id": true,
+            "website_id": true,
+            "name": true,
+            "root_category_id": true,
+            "default_store_id": true,
+            "code": true
+        },
+        "index": {
+            "STORE_GROUP_WEBSITE_ID": true,
+            "STORE_GROUP_DEFAULT_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "STORE_GROUP_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "STORE_GROUP_CODE": true
+        }
+    },
+    "store": {
+        "column": {
+            "store_id": true,
+            "code": true,
+            "website_id": true,
+            "group_id": true,
+            "name": true,
+            "sort_order": true,
+            "is_active": true
+        },
+        "index": {
+            "STORE_WEBSITE_ID": true,
+            "STORE_IS_ACTIVE_SORT_ORDER": true,
+            "STORE_GROUP_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "STORE_GROUP_ID_STORE_GROUP_GROUP_ID": true,
+            "STORE_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "STORE_CODE": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index 27133de270e2f..be005264b7bbf 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -25,6 +25,14 @@
     <preference for="Magento\Framework\App\ScopeFallbackResolverInterface" type="Magento\Store\Model\ScopeFallbackResolver"/>
     <preference for="Magento\Framework\App\ScopeTreeProviderInterface" type="Magento\Store\Model\ScopeTreeProvider"/>
     <preference for="Magento\Framework\App\ScopeValidatorInterface" type="Magento\Store\Model\ScopeValidator"/>
+    <preference for="Magento\Store\Model\StoreSwitcherInterface" type="Magento\Store\Model\StoreSwitcher" />
+    <type name="Magento\Framework\App\Http\Context">
+        <arguments>
+            <argument name="default" xsi:type="array">
+                <item name="website" xsi:type="string">0</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\App\Response\Http">
         <plugin name="genericHeaderPlugin" type="Magento\Framework\App\Response\HeaderManager"/>
     </type>
@@ -57,7 +65,7 @@
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
     <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
-        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>
+        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" />
     </type>
     <type name="Magento\Framework\Url\SecurityInfo">
         <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
@@ -94,11 +102,15 @@
     </type>
     <type name="Magento\Store\Model\StoreResolver">
         <arguments>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
             <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
             <argument name="scopeCode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_CODE</argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Model\StoresData">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+        </arguments>
+    </type>
     <type name="Magento\Store\App\FrontController\Plugin\DefaultStore">
         <arguments>
             <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
@@ -417,4 +429,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Model\StoreSwitcher">
+        <arguments>
+            <argument name="storeSwitchers" xsi:type="array">
+                <item name="cleanTargetUrl" xsi:type="object">Magento\Store\Model\StoreSwitcher\CleanTargetUrl</item>
+                <item name="manageStoreCookie" xsi:type="object">Magento\Store\Model\StoreSwitcher\ManageStoreCookie</item>
+                <item name="managePrivateContent" xsi:type="object">Magento\Store\Model\StoreSwitcher\ManagePrivateContent</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Store/etc/module.xml b/app/code/Magento/Store/etc/module.xml
index 644520f9a9e28..b034d18b0a310 100644
--- a/app/code/Magento/Store/etc/module.xml
+++ b/app/code/Magento/Store/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Store" setup_version="2.1.0">
+    <module name="Magento_Store" >
     </module>
 </config>
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
index 80152dbb9a08f..a620c2ce71407 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
@@ -27,7 +27,7 @@
             <?php foreach ($block->getStores() as $_lang): ?>
                 <?php if ($_lang->getId() != $block->getCurrentStoreId()): ?>
                     <li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
-                        <a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_lang) ?>'>
+                        <a href="<?= $block->escapeUrl($block->getViewModel()->getTargetStoreRedirectUrl($_lang)) ?>">
                             <?= $block->escapeHtml($_lang->getName()) ?>
                         </a>
                     </li>
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
new file mode 100644
index 0000000000000..8c2d6c36591d5
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver\Store;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * StoreConfig field data provider, used for GraphQL request processing.
+ */
+class StoreConfigDataProvider
+{
+    /**
+     * @var StoreConfigManagerInterface
+     */
+    private $storeConfigManager;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var array
+     */
+    private $extendedConfigData;
+
+    /**
+     * @param StoreConfigManagerInterface $storeConfigManager
+     * @param StoreManagerInterface $storeManager
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $extendedConfigData
+     */
+    public function __construct(
+        StoreConfigManagerInterface $storeConfigManager,
+        StoreManagerInterface $storeManager,
+        ScopeConfigInterface $scopeConfig,
+        array $extendedConfigData = []
+    ) {
+        $this->storeConfigManager = $storeConfigManager;
+        $this->storeManager = $storeManager;
+        $this->scopeConfig = $scopeConfig;
+        $this->extendedConfigData = $extendedConfigData;
+    }
+
+    /**
+     * Get store config data
+     *
+     * @return array
+     */
+    public function getStoreConfigData(): array
+    {
+        $storeConfigData = array_merge(
+            $this->getBaseConfigData(),
+            $this->getExtendedConfigData()
+        );
+        return $storeConfigData;
+    }
+
+    /**
+     * Get base config data
+     *
+     * @return array
+     */
+    private function getBaseConfigData() : array
+    {
+        $store = $this->storeManager->getStore();
+        $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
+
+        $storeConfigData = [
+            'id' => $storeConfig->getId(),
+            'code' => $storeConfig->getCode(),
+            'website_id' => $storeConfig->getWebsiteId(),
+            'locale' => $storeConfig->getLocale(),
+            'base_currency_code' => $storeConfig->getBaseCurrencyCode(),
+            'default_display_currency_code' => $storeConfig->getDefaultDisplayCurrencyCode(),
+            'timezone' => $storeConfig->getTimezone(),
+            'weight_unit' => $storeConfig->getWeightUnit(),
+            'base_url' => $storeConfig->getBaseUrl(),
+            'base_link_url' => $storeConfig->getBaseLinkUrl(),
+            'base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
+            'base_media_url' => $storeConfig->getBaseMediaUrl(),
+            'secure_base_url' => $storeConfig->getSecureBaseUrl(),
+            'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
+            'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
+            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
+        ];
+        return $storeConfigData;
+    }
+
+    /**
+     * Get extended config data
+     *
+     * @return array
+     */
+    private function getExtendedConfigData()
+    {
+        $store = $this->storeManager->getStore();
+        $extendedConfigData = [];
+        foreach ($this->extendedConfigData as $key => $path) {
+            $extendedConfigData[$key] = $this->scopeConfig->getValue(
+                $path,
+                ScopeInterface::SCOPE_STORE,
+                $store->getId()
+            );
+        }
+        return $extendedConfigData;
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
new file mode 100644
index 0000000000000..9c426172de85d
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider;
+
+/**
+ * StoreConfig page field resolver, used for GraphQL request processing.
+ */
+class StoreConfigResolver implements ResolverInterface
+{
+    /**
+     * @var StoreConfigDataProvider
+     */
+    private $storeConfigDataProvider;
+
+    /**
+     * @param StoreConfigDataProvider $storeConfigsDataProvider
+     */
+    public function __construct(
+        StoreConfigDataProvider $storeConfigsDataProvider
+    ) {
+        $this->storeConfigDataProvider = $storeConfigsDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        return $this->storeConfigDataProvider->getStoreConfigData();
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/README.md b/app/code/Magento/StoreGraphQl/README.md
new file mode 100644
index 0000000000000..ce265d38606a0
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/README.md
@@ -0,0 +1,4 @@
+# StoreGraphQl
+
+**StoreGraphQl** provides type information for the GraphQl module
+to generate store fields information endpoints.
diff --git a/app/code/Magento/StoreGraphQl/Test/Mftf/README.md b/app/code/Magento/StoreGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3e3588d2f7301
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Store Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Store Graph Ql** module.
diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
new file mode 100644
index 0000000000000..d53ba9fbb0023
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-store-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-store": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\StoreGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/etc/module.xml b/app/code/Magento/StoreGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..f53379ac3bbf2
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/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_StoreGraphQl">
+        <sequence>
+            <module name="Magento_GraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..af79d0e3e28b7
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -0,0 +1,33 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+type Query {
+    storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query")
+}
+
+type Website @doc(description: "The type contains information about a website") {
+    id : Int @doc(description: "The ID number assigned to the website")
+    name : String @doc(description: "The website name. Websites use this name to identify it easyer.")
+    code : String @doc(description: "A code assigned to the website to identify it")
+    sort_order : Int @doc(description: "The attribute to use for sorting websites")
+    default_group_id : String @doc(description: "The default group id that the website has")
+    is_default : Boolean @doc(description: "Specifies if this is the default website")
+}
+
+type StoreConfig @doc(description: "The type contains information about a store config") {
+    id : Int @doc(description: "The ID number assigned to the store")
+    code : String @doc(description: "A code assigned to the store to identify it")
+    website_id : Int @doc(description: "The ID number assigned to the website store belongs")
+    locale : String @doc(description: "Store locale")
+    base_currency_code : String @doc(description: "Base currency code")
+    default_display_currency_code : String @doc(description: "Default display currency code")
+    timezone : String @doc(description: "Timezone of the store")
+    weight_unit : String @doc(description: "The unit of weight")
+    base_url : String @doc(description: "Base URL for the store")
+    base_link_url : String @doc(description: "Base link URL for the store")
+    base_static_url : String @doc(description: "Base static URL for the store")
+    base_media_url : String @doc(description: "Base media URL for the store")
+    secure_base_url : String @doc(description: "Secure base URL for the store")
+    secure_base_link_url : String @doc(description: "Secure base link URL for the store")
+    secure_base_static_url : String @doc(description: "Secure base static URL for the store")
+    secure_base_media_url : String @doc(description: "Secure base media URL for the store")
+}
diff --git a/app/code/Magento/StoreGraphQl/registration.php b/app/code/Magento/StoreGraphQl/registration.php
new file mode 100644
index 0000000000000..39bfc862bd284
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_StoreGraphQl', __DIR__);
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 0000000000000..f1bc6fcc105dc
--- /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 91b67fe4e7f44..549495190ef34 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 e10a9235c4181..162367aaf81f9 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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE.txt b/app/code/Magento/Swagger/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE.txt
rename to app/code/Magento/Swagger/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE_AFL.txt b/app/code/Magento/Swagger/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE_AFL.txt
rename to app/code/Magento/Swagger/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Swagger/Test/Mftf/README.md b/app/code/Magento/Swagger/Test/Mftf/README.md
new file mode 100644
index 0000000000000..0ec1c02814c6e
--- /dev/null
+++ b/app/code/Magento/Swagger/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swagger Functional Tests
+
+The Functional Test Module for **Magento Swagger** module.
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 0000000000000..df35e0807a6ab
--- /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 6931979b52f98..c409cd6ca7504 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/composer.json b/app/code/Magento/Swagger/composer.json
index 5ea14336944d9..6a45076d3f32d 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Swagger/etc/module.xml b/app/code/Magento/Swagger/etc/module.xml
index 8f1086057b57e..ecc3fd507e9af 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" setup_version="2.0.0" />
+    <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 458102c38bf6f..5a592b9b7c987 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
@@ -10,32 +10,18 @@
         <title>Swagger UI</title>
 
         <!--<title>Swagger UI assets</title>-->
-        <css src='Magento_Swagger::swagger-ui/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-        <css src='Magento_Swagger::swagger-ui/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-        <css src='Magento_Swagger::swagger-ui/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-        <css src='Magento_Swagger::swagger-ui/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-        <css src='Magento_Swagger::swagger-ui/css/print.css' media='print' rel='stylesheet' type='text/css'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/jquery-1.8.0.min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/jquery.slideto.min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/jquery.wiggle.min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/jquery.ba-bbq.min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/handlebars.min-v4.0.10.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/underscore-min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/backbone-min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/jsoneditor.min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/swagger-ui.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/highlight.9.1.0.pack.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/highlight.9.1.0.pack_extended.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/lodash.min.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/object-assign-pollyfill.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/marked.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lib/swagger-oauth.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lang/translator.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lang/ru.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/lang/en.js' type='text/javascript'/>
-        <link src='Magento_Swagger::swagger-ui/js/magento-swagger.js' type='text/javascript'/>
+        <css src='Magento_Swagger::swagger-ui/css/style.css' media='screen' rel='stylesheet' type='text/css'/>
+        <css src='Magento_Swagger::swagger-ui/css/swagger-ui.css' media='screen' rel='stylesheet' type='text/css'/>
+        <link src='Magento_Swagger::swagger-ui/js/lang/translator.js' type='text/javascript' defer="defer"/>
+        <link src='Magento_Swagger::swagger-ui/js/lang/ru.js' type='text/javascript' defer="defer"/>
+        <link src='Magento_Swagger::swagger-ui/js/lang/en.js' type='text/javascript' defer="defer"/>
+        <link src='Magento_Swagger::swagger-ui/js/swagger-ui-bundle.min.js' type='text/javascript' defer="defer"/>
+        <link src='Magento_Swagger::swagger-ui/js/swagger-ui-standalone-preset.min.js' type='text/javascript' defer="defer"/>
+        <link src='Magento_Swagger::swagger-ui/js/magento-swagger.js' type='text/javascript' defer="defer"/>
 
         <!--Remove require-js assets-->
+        <remove src="css/styles-m.css"/>
+        <remove src="css/styles-s.css"/>
         <remove src="requirejs/require.js"/>
         <remove src="mage/requirejs/mixins.js"/>
         <remove src="requirejs-config.js"/>
@@ -43,10 +29,10 @@
     <body>
         <!--Remove Magento page content-->
         <referenceContainer name="page.wrapper" remove="true"/>
+        <referenceBlock name="translate" 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/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
index 6e8ad08efbf6b..26ef4847a1267 100644
--- a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
+++ b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
@@ -12,16 +12,53 @@
  * Modified by Magento, Modifications Copyright © Magento, Inc. All rights reserved.
  */
 
-/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Swagger\Block\Index $block
+ *
+ * @codingStandardsIgnoreFile
+ */
 
 $schemaUrl = $block->getSchemaUrl();
 ?>
 
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+    <defs>
+        <symbol viewBox="0 0 20 20" id="unlocked">
+            <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="locked">
+            <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="close">
+            <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="large-arrow">
+            <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 20 20" id="large-arrow-down">
+            <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+        </symbol>
+
+
+        <symbol viewBox="0 0 24 24" id="jump-to">
+            <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+        </symbol>
+
+        <symbol viewBox="0 0 24 24" id="expand">
+            <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+        </symbol>
+
+    </defs>
+</svg>
+
 <div id='header'>
     <div class="swagger-ui-wrap">
         <a id="logo" href="http://swagger.io">swagger</a>
         <form id='api_selector'>
-            <input id="input_baseUrl" type="hidden" value="<?= /* @escapeNotVerified */ $schemaUrl ?>"/>
+            <input id="input_baseUrl" type="hidden" value="<?= $block->escapeUrl($schemaUrl) ?>"/>
             <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
             <div class='input'><a id="explore" href="#" data-sw-translate>apply</a></div>
         </form>
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/print.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/print.css
deleted file mode 100644
index cd3aa8b6a4a84..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/print.css
+++ /dev/null
@@ -1,1172 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap .footer {
-  margin-top: 20px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_url {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_email {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_name {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 200px;
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper {
-  border-spacing: 0;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #bbbbbb;
-  display: none;
-  font-size: 11px;
-  max-width: 400px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-  margin-left: 10px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th {
-  text-align: center;
-  background-color: #eeeeee;
-  border: 1px solid #bbbbbb;
-  font-size: 11px;
-  color: #666666;
-  font-weight: bold;
-  padding: 5px;
-  line-height: 15px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
-  display: inline;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
-  display: block;
-  content: '';
-}
-.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
-  margin-right: -3px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
-  width: 128px;
-  height: 16px;
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
-  padding-bottom: 0;
-}
-.swagger-section .title {
-  font-style: bold;
-}
-.swagger-section .secondary_form {
-  display: none;
-}
-.swagger-section .main_image {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .oauth_body {
-  margin-left: 100px;
-  margin-right: 100px;
-}
-.swagger-section .oauth_submit {
-  text-align: center;
-}
-.swagger-section .api-popup-dialog {
-  z-index: 10000;
-  position: absolute;
-  width: 500px;
-  background: #FFF;
-  padding: 20px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog p.error-msg {
-  padding-left: 5px;
-  padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
-  height: 30px;
-}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
-  height: 30px;
-}
-.swagger-section .api-popup-scopes {
-  padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
-  padding: 5px 0;
-  line-height: 20px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
-  padding-left: 20px;
-  font-style: italic;
-}
-.swagger-section .api-popup-scopes li input {
-  position: relative;
-  top: 2px;
-}
-.swagger-section .api-popup-actions {
-  padding-top: 10px;
-}
-#header {
-  display: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  max-height: none;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 100px;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 100px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  display: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints {
-  display: block !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  display: block !important;
-}
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/reset.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/reset.css
deleted file mode 100644
index b2b078943c451..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/reset.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol,
-ul {
-  list-style: none;
-}
-blockquote,
-q {
-  quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/screen.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/screen.css
deleted file mode 100644
index 436cc28edd312..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/screen.css
+++ /dev/null
@@ -1,1279 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap .footer {
-  margin-top: 20px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_url {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_email {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_name {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 200px;
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper {
-  border-spacing: 0;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #bbbbbb;
-  display: none;
-  font-size: 11px;
-  max-width: 400px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-  margin-left: 10px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th {
-  text-align: center;
-  background-color: #eeeeee;
-  border: 1px solid #bbbbbb;
-  font-size: 11px;
-  color: #666666;
-  font-weight: bold;
-  padding: 5px;
-  line-height: 15px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
-  display: inline;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
-  display: block;
-  content: '';
-}
-.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
-  margin-right: -3px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
-  width: 128px;
-  height: 16px;
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
-  padding-bottom: 0;
-}
-.swagger-section .title {
-  font-style: bold;
-}
-.swagger-section .secondary_form {
-  display: none;
-}
-.swagger-section .main_image {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .oauth_body {
-  margin-left: 100px;
-  margin-right: 100px;
-}
-.swagger-section .oauth_submit {
-  text-align: center;
-}
-.swagger-section .api-popup-dialog {
-  z-index: 10000;
-  position: absolute;
-  width: 500px;
-  background: #FFF;
-  padding: 20px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog p.error-msg {
-  padding-left: 5px;
-  padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
-  height: 30px;
-}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
-  height: 30px;
-}
-.swagger-section .api-popup-scopes {
-  padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
-  padding: 5px 0;
-  line-height: 20px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
-  padding-left: 20px;
-  font-style: italic;
-}
-.swagger-section .api-popup-scopes li input {
-  position: relative;
-  top: 2px;
-}
-.swagger-section .api-popup-actions {
-  padding-top: 10px;
-}
-.swagger-section .access {
-  float: right;
-}
-.swagger-section .auth {
-  float: right;
-}
-.swagger-section .api-ic {
-  height: 18px;
-  vertical-align: middle;
-  display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
-}
-.swagger-section .api-ic .api_information_panel {
-  position: relative;
-  margin-top: 20px;
-  margin-left: -5px;
-  background: #FFF;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  max-width: 300px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-}
-.swagger-section .api-ic .api_information_panel p .api-msg-enabled {
-  color: green;
-}
-.swagger-section .api-ic .api_information_panel p .api-msg-disabled {
-  color: red;
-}
-.swagger-section .api-ic:hover .api_information_panel {
-  position: absolute;
-  display: block;
-}
-.swagger-section .ic-info {
-  background-position: 0 0;
-  width: 18px;
-  margin-top: -6px;
-  margin-left: 4px;
-}
-.swagger-section .ic-warning {
-  background-position: -60px 0;
-  width: 18px;
-  margin-top: -6px;
-  margin-left: 4px;
-}
-.swagger-section .ic-error {
-  background-position: -30px 0;
-  width: 18px;
-  margin-top: -6px;
-  margin-left: 4px;
-}
-.swagger-section .ic-off {
-  background-position: -90px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section .ic-on {
-  background-position: -160px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section #header {
-  background-color: #89bf04;
-  padding: 14px;
-}
-.swagger-section #header a#logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo_small.png) no-repeat left center;
-  padding: 20px 0 20px 40px;
-  color: white;
-}
-.swagger-section #header form#api_selector {
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section #header form#api_selector .input {
-  display: block;
-  clear: none;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.swagger-section #header form#api_selector .input input#input_apiKey {
-  width: 200px;
-}
-.swagger-section #header form#api_selector .input input#input_baseUrl {
-  width: 400px;
-}
-.swagger-section #header form#api_selector .input a#explore {
-  display: block;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 6px 8px;
-  font-size: 0.9em;
-  color: white;
-  background-color: #547f00;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -o-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-}
-.swagger-section #header form#api_selector .input a#explore:hover {
-  background-color: #547f00;
-}
-.swagger-section #header form#api_selector .input input {
-  font-size: 0.9em;
-  padding: 3px;
-  margin: 0;
-}
-.swagger-section #content_message {
-  margin: 10px 15px;
-  font-style: italic;
-  color: #999999;
-}
-.swagger-section #message-bar {
-  min-height: 30px;
-  text-align: center;
-  padding-top: 10px;
-}
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css
index ed7b1ff0c966c..f9ec0fabdab2b 100644
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css
+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css
@@ -1,250 +1,64 @@
-/* Modified by Magento, Modifications Copyright © Magento. */
-.swagger-section #header a#logo {
+body {
+  margin:0;
+  background: #fafafa;
+}
+#header {
+  background-color: #89bf04;
+  padding: 14px;
+}
+#header a#logo {
   font-size: 1.5em;
   font-weight: bold;
   text-decoration: none;
-  background: transparent no-repeat left center;
+  background: transparent url(../images/logo_small.png) no-repeat left center;
   padding: 20px 0 20px 40px;
+  color: white;
 }
-#text-head {
-  font-size: 80px;
-  font-family: 'Roboto', sans-serif;
-  color: #ffffff;
+#header form#api_selector {
+  display: block;
+  clear: none;
   float: right;
-  margin-right: 20%;
-}
-.navbar-fixed-top .navbar-nav {
-  height: auto;
-}
-.navbar-fixed-top .navbar-brand {
-  height: auto;
-}
-.navbar-header {
-  height: auto;
-}
-.navbar-inverse {
-  background-color: #000;
-  border-color: #000;
-}
-#navbar-brand {
-  margin-left: 20%;
-}
-.navtext {
-  font-size: 10px;
-}
-.h1,
-h1 {
-  font-size: 60px;
-}
-.navbar-default .navbar-header .navbar-brand {
-  color: #a2dfee;
-}
-/* tag titles */
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #393939;
-  font-family: 'Arvo', serif;
-  font-size: 1.5em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
 }
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #525252;
-  padding-left: 0px;
+#header form#api_selector .input {
   display: block;
   clear: none;
   float: left;
-  font-family: 'Arvo', serif;
-  font-weight: bold;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-  border-color: #0A0A0A;
-}
-.container1 {
-  width: 1500px;
-  margin: auto;
-  margin-top: 0;
-  background-repeat: no-repeat;
-  background-position: -40px -20px;
-  margin-bottom: 210px;
-}
-.container-inner {
-  width: 1200px;
-  margin: auto;
-  background-color: rgba(223, 227, 228, 0.75);
-  padding-bottom: 40px;
-  padding-top: 40px;
-  border-radius: 15px;
-}
-.header-content {
-  padding: 0;
-  width: 1000px;
-}
-.title1 {
-  font-size: 80px;
-  font-family: 'Vollkorn', serif;
-  color: #404040;
-  text-align: center;
-  padding-top: 40px;
-  padding-bottom: 100px;
-}
-#icon {
-  margin-top: -18px;
-}
-.subtext {
-  font-size: 25px;
-  font-style: italic;
-  color: #08b;
-  text-align: right;
-  padding-right: 250px;
-}
-.bg-primary {
-  background-color: #00468b;
-}
-.navbar-default .nav > li > a,
-.navbar-default .nav > li > a:focus {
-  color: #08b;
-}
-.navbar-default .nav > li > a,
-.navbar-default .nav > li > a:hover {
-  color: #08b;
-}
-.navbar-default .nav > li > a,
-.navbar-default .nav > li > a:focus:hover {
-  color: #08b;
-}
-.text-faded {
-  font-size: 25px;
-  font-family: 'Vollkorn', serif;
+  margin: 0 10px 0 0;
 }
-.section-heading {
-  font-family: 'Vollkorn', serif;
-  font-size: 45px;
-  padding-bottom: 10px;
+#header form#api_selector .input input#input_apiKey {
+  width: 200px;
 }
-hr {
-  border-color: #00468b;
-  padding-bottom: 10px;
+#header form#api_selector .input input#input_baseUrl {
+  width: 400px;
 }
-.description {
-  margin-top: 20px;
-  padding-bottom: 200px;
-}
-.description li {
-  font-family: 'Vollkorn', serif;
-  font-size: 25px;
-  color: #525252;
-  margin-left: 28%;
-  padding-top: 5px;
-}
-.gap {
-  margin-top: 200px;
-}
-.troubleshootingtext {
-  color: rgba(255, 255, 255, 0.7);
-  padding-left: 30%;
-}
-.troubleshootingtext li {
-  list-style-type: circle;
-  font-size: 25px;
-  padding-bottom: 5px;
-}
-.overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1000;
-}
-.block.response_body.json:hover {
-  cursor: pointer;
-}
-.backdrop {
-  color: blue;
-}
-#myModal {
-  height: 100%;
-}
-.modal-backdrop {
-  bottom: 0;
-  position: fixed;
-}
-.curl {
-  padding: 10px;
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+#header form#api_selector .input a#explore {
+  display: block;
+  text-decoration: none;
+  font-weight: bold;
+  padding: 6px 8px;
   font-size: 0.9em;
-  max-height: 400px;
-  margin-top: 5px;
-  overflow-y: auto;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
+  color: white;
+  background-color: #547f00;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -o-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -khtml-border-radius: 4px;
   border-radius: 4px;
 }
-.curl_title {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-  font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
-  font-weight: 500;
-  line-height: 1.1;
+#header form#api_selector .input a#explore:hover {
+  background-color: #547f00;
 }
-.footer {
-  display: none;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  padding: 0;
-}
-h2 {
+#header form#api_selector .input input {
+  font-size: 0.9em;
+  padding: 3px;
   margin: 0;
-  margin-bottom: 5px;
-}
-.markdown p {
-  font-size: 15px;
-  font-family: 'Arvo', serif;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-size: 15px;
-  font-family: 'Arvo', serif;
-}
-.swagger-section .swagger-ui-wrap b {
-  font-family: 'Arvo', serif;
-}
-#signin:hover {
-  cursor: pointer;
 }
-.dropdown-menu {
-  padding: 15px;
-}
-.navbar-right .dropdown-menu {
-  left: 0;
-  right: auto;
-}
-#signinbutton {
-  width: 100%;
-  height: 32px;
-  font-size: 13px;
-  font-weight: bold;
-  color: #08b;
-}
-.navbar-default .nav > li .details {
-  color: #000000;
-  text-transform: none;
-  font-size: 15px;
-  font-weight: normal;
-  font-family: 'Open Sans', sans-serif;
+#content_message {
+  margin: 10px 15px;
   font-style: italic;
-  line-height: 20px;
-  top: -2px;
+  color: #999999;
 }
-.navbar-default .nav > li .details:hover {
-  color: black;
-}
-#signout {
-  width: 100%;
-  height: 32px;
-  font-size: 13px;
-  font-weight: bold;
-  color: #08b;
+.swagger-ui .topbar {
+  display: none;
 }
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/swagger-ui.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/swagger-ui.css
new file mode 100644
index 0000000000000..971751da7027e
--- /dev/null
+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/swagger-ui.css
@@ -0,0 +1,2 @@
+.swagger-ui{font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .wrapper{width:100%;max-width:1460px;margin:0 auto;padding:0 20px;-webkit-box-sizing:border-box;box-sizing:border-box}.swagger-ui .opblock-tag-section{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.swagger-ui .opblock-tag{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:10px 20px 10px 10px;cursor:pointer;-webkit-transition:all .2s;transition:all .2s;border-bottom:1px solid rgba(59,65,81,.3)}.swagger-ui .opblock-tag:hover{background:rgba(0,0,0,.02)}.swagger-ui .opblock-tag{font-size:24px;margin:0 0 5px;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .opblock-tag.no-desc span{-webkit-box-flex:1;-ms-flex:1;flex:1}.swagger-ui .opblock-tag svg{-webkit-transition:all .4s;transition:all .4s}.swagger-ui .opblock-tag small{font-size:14px;font-weight:400;-webkit-box-flex:1;-ms-flex:1;flex:1;padding:0 10px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .parameter__type{font-size:12px;padding:5px 0;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui .view-line-link{position:relative;top:3px;width:20px;margin:0 5px;cursor:pointer;-webkit-transition:all .5s;transition:all .5s}.swagger-ui .opblock{margin:0 0 15px;border:1px solid #000;border-radius:4px;-webkit-box-shadow:0 0 3px rgba(0,0,0,.19);box-shadow:0 0 3px rgba(0,0,0,.19)}.swagger-ui .opblock .tab-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1;flex:1}.swagger-ui .opblock .tab-header .tab-item{padding:0 40px;cursor:pointer}.swagger-ui .opblock .tab-header .tab-item:first-of-type{padding:0 40px 0 0}.swagger-ui .opblock .tab-header .tab-item.active h4 span{position:relative}.swagger-ui .opblock .tab-header .tab-item.active h4 span:after{position:absolute;bottom:-15px;left:50%;width:120%;height:4px;content:"";-webkit-transform:translateX(-50%);transform:translateX(-50%);background:gray}.swagger-ui .opblock.is-open .opblock-summary{border-bottom:1px solid #000}.swagger-ui .opblock .opblock-section-header{padding:8px 20px;min-height:50px;background:hsla(0,0%,100%,.8);-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.swagger-ui .opblock .opblock-section-header,.swagger-ui .opblock .opblock-section-header label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.swagger-ui .opblock .opblock-section-header label{font-size:12px;font-weight:700;margin:0;margin-left:auto;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .opblock .opblock-section-header label span{padding:0 10px 0 0}.swagger-ui .opblock .opblock-section-header h4{font-size:14px;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .opblock .opblock-summary-method{font-size:14px;font-weight:700;min-width:80px;padding:6px 15px;text-align:center;border-radius:3px;background:#000;text-shadow:0 1px 0 rgba(0,0,0,.1);font-family:Titillium Web,sans-serif;color:#fff}.swagger-ui .opblock .opblock-summary-operation-id,.swagger-ui .opblock .opblock-summary-path,.swagger-ui .opblock .opblock-summary-path__deprecated{font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:0;-ms-flex:0 3 auto;flex:0 3 auto;-webkit-box-align:center;-ms-flex-align:center;align-items:center;word-break:break-all;padding:0 10px;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}@media (max-width:768px){.swagger-ui .opblock .opblock-summary-operation-id,.swagger-ui .opblock .opblock-summary-path,.swagger-ui .opblock .opblock-summary-path__deprecated{font-size:12px}}.swagger-ui .opblock .opblock-summary-operation-id .view-line-link,.swagger-ui .opblock .opblock-summary-path .view-line-link,.swagger-ui .opblock .opblock-summary-path__deprecated .view-line-link{position:relative;top:2px;width:0;margin:0;cursor:pointer;-webkit-transition:all .5s;transition:all .5s}.swagger-ui .opblock .opblock-summary-operation-id:hover .view-line-link,.swagger-ui .opblock .opblock-summary-path:hover .view-line-link,.swagger-ui .opblock .opblock-summary-path__deprecated:hover .view-line-link{width:18px;margin:0 5px}.swagger-ui .opblock .opblock-summary-path__deprecated{text-decoration:line-through}.swagger-ui .opblock .opblock-summary-operation-id{font-size:14px}.swagger-ui .opblock .opblock-summary-description{font-size:13px;-webkit-box-flex:1;-ms-flex:1;flex:1;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .opblock .opblock-summary{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:5px;cursor:pointer}.swagger-ui .opblock.opblock-post{border-color:#49cc90;background:rgba(73,204,144,.1)}.swagger-ui .opblock.opblock-post .opblock-summary-method{background:#49cc90}.swagger-ui .opblock.opblock-post .opblock-summary{border-color:#49cc90}.swagger-ui .opblock.opblock-post .tab-header .tab-item.active h4 span:after{background:#49cc90}.swagger-ui .opblock.opblock-put{border-color:#fca130;background:rgba(252,161,48,.1)}.swagger-ui .opblock.opblock-put .opblock-summary-method{background:#fca130}.swagger-ui .opblock.opblock-put .opblock-summary{border-color:#fca130}.swagger-ui .opblock.opblock-put .tab-header .tab-item.active h4 span:after{background:#fca130}.swagger-ui .opblock.opblock-delete{border-color:#f93e3e;background:rgba(249,62,62,.1)}.swagger-ui .opblock.opblock-delete .opblock-summary-method{background:#f93e3e}.swagger-ui .opblock.opblock-delete .opblock-summary{border-color:#f93e3e}.swagger-ui .opblock.opblock-delete .tab-header .tab-item.active h4 span:after{background:#f93e3e}.swagger-ui .opblock.opblock-get{border-color:#61affe;background:rgba(97,175,254,.1)}.swagger-ui .opblock.opblock-get .opblock-summary-method{background:#61affe}.swagger-ui .opblock.opblock-get .opblock-summary{border-color:#61affe}.swagger-ui .opblock.opblock-get .tab-header .tab-item.active h4 span:after{background:#61affe}.swagger-ui .opblock.opblock-patch{border-color:#50e3c2;background:rgba(80,227,194,.1)}.swagger-ui .opblock.opblock-patch .opblock-summary-method{background:#50e3c2}.swagger-ui .opblock.opblock-patch .opblock-summary{border-color:#50e3c2}.swagger-ui .opblock.opblock-patch .tab-header .tab-item.active h4 span:after{background:#50e3c2}.swagger-ui .opblock.opblock-head{border-color:#9012fe;background:rgba(144,18,254,.1)}.swagger-ui .opblock.opblock-head .opblock-summary-method{background:#9012fe}.swagger-ui .opblock.opblock-head .opblock-summary{border-color:#9012fe}.swagger-ui .opblock.opblock-head .tab-header .tab-item.active h4 span:after{background:#9012fe}.swagger-ui .opblock.opblock-options{border-color:#0d5aa7;background:rgba(13,90,167,.1)}.swagger-ui .opblock.opblock-options .opblock-summary-method{background:#0d5aa7}.swagger-ui .opblock.opblock-options .opblock-summary{border-color:#0d5aa7}.swagger-ui .opblock.opblock-options .tab-header .tab-item.active h4 span:after{background:#0d5aa7}.swagger-ui .opblock.opblock-deprecated{opacity:.6;border-color:#ebebeb;background:hsla(0,0%,92%,.1)}.swagger-ui .opblock.opblock-deprecated .opblock-summary-method{background:#ebebeb}.swagger-ui .opblock.opblock-deprecated .opblock-summary{border-color:#ebebeb}.swagger-ui .opblock.opblock-deprecated .tab-header .tab-item.active h4 span:after{background:#ebebeb}.swagger-ui .opblock .opblock-schemes{padding:8px 20px}.swagger-ui .opblock .opblock-schemes .schemes-title{padding:0 10px 0 0}.swagger-ui .filter .operation-filter-input{width:100%;margin:20px 0;padding:10px;border:2px solid #d8dde7}.swagger-ui .tab{display:-webkit-box;display:-ms-flexbox;display:flex;margin:20px 0 10px;padding:0;list-style:none}.swagger-ui .tab li{font-size:12px;min-width:100px;min-width:90px;padding:0;cursor:pointer;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .tab li:first-of-type{position:relative;padding-left:0}.swagger-ui .tab li:first-of-type:after{position:absolute;top:0;right:6px;width:1px;height:100%;content:"";background:rgba(0,0,0,.2)}.swagger-ui .tab li.active{font-weight:700}.swagger-ui .opblock-description-wrapper,.swagger-ui .opblock-external-docs-wrapper,.swagger-ui .opblock-title_normal{font-size:12px;margin:0 0 5px;padding:15px 20px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .opblock-description-wrapper h4,.swagger-ui .opblock-external-docs-wrapper h4,.swagger-ui .opblock-title_normal h4{font-size:12px;margin:0 0 5px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .opblock-description-wrapper p,.swagger-ui .opblock-external-docs-wrapper p,.swagger-ui .opblock-title_normal p{font-size:14px;margin:0;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .opblock-external-docs-wrapper h4{padding-left:0}.swagger-ui .execute-wrapper{padding:20px;text-align:right}.swagger-ui .execute-wrapper .btn{width:100%;padding:8px 40px}.swagger-ui .body-param-options{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.swagger-ui .body-param-options .body-param-edit{padding:10px 0}.swagger-ui .body-param-options label{padding:8px 0}.swagger-ui .body-param-options label select{margin:3px 0 0}.swagger-ui .responses-inner{padding:20px}.swagger-ui .responses-inner h4,.swagger-ui .responses-inner h5{font-size:12px;margin:10px 0 5px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .response-col_status{font-size:14px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .response-col_status .response-undocumented{font-size:11px;font-family:Source Code Pro,monospace;font-weight:600;color:#909090}.swagger-ui .response-col_links{padding-left:2em;max-width:40em;font-size:14px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .response-col_links .response-undocumented{font-size:11px;font-family:Source Code Pro,monospace;font-weight:600;color:#909090}.swagger-ui .response-col_description__inner div.markdown,.swagger-ui .response-col_description__inner div.renderedMarkdown{font-size:12px;font-style:italic;display:block;margin:0;padding:10px;border-radius:4px;background:#41444e;font-family:Source Code Pro,monospace;font-weight:600;color:#fff}.swagger-ui .response-col_description__inner div.markdown p,.swagger-ui .response-col_description__inner div.renderedMarkdown p{margin:0;font-family:Source Code Pro,monospace;font-weight:600;color:#fff}.swagger-ui .response-col_description__inner div.markdown a,.swagger-ui .response-col_description__inner div.renderedMarkdown a{font-family:Source Code Pro,monospace;font-weight:600;color:#89bf04;text-decoration:underline}.swagger-ui .response-col_description__inner div.markdown a:hover,.swagger-ui .response-col_description__inner div.renderedMarkdown a:hover{color:#81b10c}.swagger-ui .response-col_description__inner div.markdown th,.swagger-ui .response-col_description__inner div.renderedMarkdown th{font-family:Source Code Pro,monospace;font-weight:600;color:#fff;border-bottom:1px solid #fff}.swagger-ui .opblock-body pre{font-size:12px;margin:0;padding:10px;white-space:pre-wrap;word-wrap:break-word;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto;border-radius:4px;background:#41444e;overflow-wrap:break-word;font-family:Source Code Pro,monospace;font-weight:600;color:#fff}.swagger-ui .opblock-body pre span{color:#fff!important}.swagger-ui .opblock-body pre .headerline{display:block}.swagger-ui .scheme-container{margin:0 0 20px;padding:30px 0;background:#fff;-webkit-box-shadow:0 1px 2px 0 rgba(0,0,0,.15);box-shadow:0 1px 2px 0 rgba(0,0,0,.15)}.swagger-ui .scheme-container .schemes{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.swagger-ui .scheme-container .schemes>label{font-size:12px;font-weight:700;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin:-20px 15px 0 0;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .scheme-container .schemes>label select{min-width:130px;text-transform:uppercase}.swagger-ui .loading-container{padding:40px 0 60px;margin-top:1em;min-height:1px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.swagger-ui .loading-container .loading{position:relative}.swagger-ui .loading-container .loading:after{font-size:10px;font-weight:700;position:absolute;top:50%;left:50%;content:"loading";-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);text-transform:uppercase;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .loading-container .loading:before{position:absolute;top:50%;left:50%;display:block;width:60px;height:60px;margin:-30px;content:"";-webkit-animation:rotation 1s infinite linear,opacity .5s;animation:rotation 1s infinite linear,opacity .5s;opacity:1;border:2px solid rgba(85,85,85,.1);border-top-color:rgba(0,0,0,.6);border-radius:100%;-webkit-backface-visibility:hidden;backface-visibility:hidden}@-webkit-keyframes rotation{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes rotation{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.swagger-ui .response-content-type{padding-top:1em}.swagger-ui .response-content-type.controls-accept-header select{border-color:green}.swagger-ui .response-content-type.controls-accept-header small{color:green;font-size:.7em}@-webkit-keyframes blinker{50%{opacity:0}}@keyframes blinker{50%{opacity:0}}.swagger-ui section h3{font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui a.nostyle{display:inline}.swagger-ui a.nostyle,.swagger-ui a.nostyle:visited{text-decoration:inherit;color:inherit;cursor:pointer}.swagger-ui .btn{font-size:14px;font-weight:700;padding:5px 23px;-webkit-transition:all .3s;transition:all .3s;border:2px solid gray;border-radius:4px;background:transparent;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1);font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .btn.btn-sm{font-size:12px;padding:4px 23px}.swagger-ui .btn[disabled]{cursor:not-allowed;opacity:.3}.swagger-ui .btn:hover{-webkit-box-shadow:0 0 5px rgba(0,0,0,.3);box-shadow:0 0 5px rgba(0,0,0,.3)}.swagger-ui .btn.cancel{border-color:#ff6060;background-color:transparent;font-family:Titillium Web,sans-serif;color:#ff6060}.swagger-ui .btn.authorize{line-height:1;display:inline;color:#49cc90;border-color:#49cc90;background-color:transparent}.swagger-ui .btn.authorize span{float:left;padding:4px 20px 0 0}.swagger-ui .btn.authorize svg{fill:#49cc90}.swagger-ui .btn.execute{background-color:#4990e2;color:#fff;border-color:#4990e2}.swagger-ui .btn-group{display:-webkit-box;display:-ms-flexbox;display:flex;padding:30px}.swagger-ui .btn-group .btn{-webkit-box-flex:1;-ms-flex:1;flex:1}.swagger-ui .btn-group .btn:first-child{border-radius:4px 0 0 4px}.swagger-ui .btn-group .btn:last-child{border-radius:0 4px 4px 0}.swagger-ui .authorization__btn{padding:0 10px;border:none;background:none}.swagger-ui .authorization__btn.locked{opacity:1}.swagger-ui .authorization__btn.unlocked{opacity:.4}.swagger-ui .expand-methods,.swagger-ui .expand-operation{border:none;background:none}.swagger-ui .expand-methods svg,.swagger-ui .expand-operation svg{width:20px;height:20px}.swagger-ui .expand-methods{padding:0 10px}.swagger-ui .expand-methods:hover svg{fill:#404040}.swagger-ui .expand-methods svg{-webkit-transition:all .3s;transition:all .3s;fill:#707070}.swagger-ui button{cursor:pointer;outline:none}.swagger-ui button.invalid{-webkit-animation:shake .4s 1;animation:shake .4s 1;border-color:#f93e3e;background:#feebeb}.swagger-ui select{font-size:14px;font-weight:700;padding:5px 40px 5px 10px;border:2px solid #41444e;border-radius:4px;background:#f7f7f7 url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCI+ICAgIDxwYXRoIGQ9Ik0xMy40MTggNy44NTljLjI3MS0uMjY4LjcwOS0uMjY4Ljk3OCAwIC4yNy4yNjguMjcyLjcwMSAwIC45NjlsLTMuOTA4IDMuODNjLS4yNy4yNjgtLjcwNy4yNjgtLjk3OSAwbC0zLjkwOC0zLjgzYy0uMjctLjI2Ny0uMjctLjcwMSAwLS45NjkuMjcxLS4yNjguNzA5LS4yNjguOTc4IDBMMTAgMTFsMy40MTgtMy4xNDF6Ii8+PC9zdmc+) right 10px center no-repeat;background-size:20px;-webkit-box-shadow:0 1px 2px 0 rgba(0,0,0,.25);box-shadow:0 1px 2px 0 rgba(0,0,0,.25);font-family:Titillium Web,sans-serif;color:#3b4151;-webkit-appearance:none;-moz-appearance:none;appearance:none}.swagger-ui select[multiple]{margin:5px 0;padding:5px;background:#f7f7f7}.swagger-ui select.invalid{-webkit-animation:shake .4s 1;animation:shake .4s 1;border-color:#f93e3e;background:#feebeb}.swagger-ui .opblock-body select{min-width:230px}@media (max-width:768px){.swagger-ui .opblock-body select{min-width:180px}}.swagger-ui label{font-size:12px;font-weight:700;margin:0 0 5px;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui input[type=email],.swagger-ui input[type=file],.swagger-ui input[type=password],.swagger-ui input[type=search],.swagger-ui input[type=text]{min-width:100px;margin:5px 0;padding:8px 10px;border:1px solid #d9d9d9;border-radius:4px;background:#fff}@media (max-width:768px){.swagger-ui input[type=email],.swagger-ui input[type=file],.swagger-ui input[type=password],.swagger-ui input[type=search],.swagger-ui input[type=text]{max-width:175px}}.swagger-ui input[type=email].invalid,.swagger-ui input[type=file].invalid,.swagger-ui input[type=password].invalid,.swagger-ui input[type=search].invalid,.swagger-ui input[type=text].invalid{-webkit-animation:shake .4s 1;animation:shake .4s 1;border-color:#f93e3e;background:#feebeb}@-webkit-keyframes shake{10%,90%{-webkit-transform:translate3d(-1px,0,0);transform:translate3d(-1px,0,0)}20%,80%{-webkit-transform:translate3d(2px,0,0);transform:translate3d(2px,0,0)}30%,50%,70%{-webkit-transform:translate3d(-4px,0,0);transform:translate3d(-4px,0,0)}40%,60%{-webkit-transform:translate3d(4px,0,0);transform:translate3d(4px,0,0)}}@keyframes shake{10%,90%{-webkit-transform:translate3d(-1px,0,0);transform:translate3d(-1px,0,0)}20%,80%{-webkit-transform:translate3d(2px,0,0);transform:translate3d(2px,0,0)}30%,50%,70%{-webkit-transform:translate3d(-4px,0,0);transform:translate3d(-4px,0,0)}40%,60%{-webkit-transform:translate3d(4px,0,0);transform:translate3d(4px,0,0)}}.swagger-ui textarea{font-size:12px;width:100%;min-height:280px;padding:10px;border:none;border-radius:4px;outline:none;background:hsla(0,0%,100%,.8);font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui textarea:focus{border:2px solid #61affe}.swagger-ui textarea.curl{font-size:12px;min-height:100px;margin:0;padding:10px;resize:none;border-radius:4px;background:#41444e;font-family:Source Code Pro,monospace;font-weight:600;color:#fff}.swagger-ui .checkbox{padding:5px 0 10px;-webkit-transition:opacity .5s;transition:opacity .5s;color:#303030}.swagger-ui .checkbox label{display:-webkit-box;display:-ms-flexbox;display:flex}.swagger-ui .checkbox p{font-weight:400!important;font-style:italic;margin:0!important;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui .checkbox input[type=checkbox]{display:none}.swagger-ui .checkbox input[type=checkbox]+label>.item{position:relative;top:3px;display:inline-block;width:16px;height:16px;margin:0 8px 0 0;padding:5px;cursor:pointer;border-radius:1px;background:#e8e8e8;-webkit-box-shadow:0 0 0 2px #e8e8e8;box-shadow:0 0 0 2px #e8e8e8;-webkit-box-flex:0;-ms-flex:none;flex:none}.swagger-ui .checkbox input[type=checkbox]+label>.item:active{-webkit-transform:scale(.9);transform:scale(.9)}.swagger-ui .checkbox input[type=checkbox]:checked+label>.item{background:#e8e8e8 url("data:image/svg+xml;charset=utf-8,%3Csvg width='10' height='8' viewBox='3 7 10 8' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%2341474E' fill-rule='evenodd' d='M6.333 15L3 11.667l1.333-1.334 2 2L11.667 7 13 8.333z'/%3E%3C/svg%3E") 50% no-repeat}.swagger-ui .dialog-ux{position:fixed;z-index:9999;top:0;right:0;bottom:0;left:0}.swagger-ui .dialog-ux .backdrop-ux{position:fixed;top:0;right:0;bottom:0;left:0;background:rgba(0,0,0,.8)}.swagger-ui .dialog-ux .modal-ux{position:absolute;z-index:9999;top:50%;left:50%;width:100%;min-width:300px;max-width:650px;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border:1px solid #ebebeb;border-radius:4px;background:#fff;-webkit-box-shadow:0 10px 30px 0 rgba(0,0,0,.2);box-shadow:0 10px 30px 0 rgba(0,0,0,.2)}.swagger-ui .dialog-ux .modal-ux-content{overflow-y:auto;max-height:540px;padding:20px}.swagger-ui .dialog-ux .modal-ux-content p{font-size:12px;margin:0 0 5px;color:#41444e;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .dialog-ux .modal-ux-content h4{font-size:18px;font-weight:600;margin:15px 0 0;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .dialog-ux .modal-ux-header{display:-webkit-box;display:-ms-flexbox;display:flex;padding:12px 0;border-bottom:1px solid #ebebeb;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.swagger-ui .dialog-ux .modal-ux-header .close-modal{padding:0 10px;border:none;background:none;-webkit-appearance:none;-moz-appearance:none;appearance:none}.swagger-ui .dialog-ux .modal-ux-header h3{font-size:20px;font-weight:600;margin:0;padding:0 20px;-webkit-box-flex:1;-ms-flex:1;flex:1;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .model{font-size:12px;font-weight:300;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui .model .deprecated span,.swagger-ui .model .deprecated td{color:#a0a0a0!important}.swagger-ui .model .deprecated>td:first-of-type{text-decoration:line-through}.swagger-ui .model-toggle{font-size:10px;position:relative;top:6px;display:inline-block;margin:auto .3em;cursor:pointer;-webkit-transition:-webkit-transform .15s ease-in;transition:-webkit-transform .15s ease-in;transition:transform .15s ease-in;transition:transform .15s ease-in,-webkit-transform .15s ease-in;-webkit-transform:rotate(90deg);transform:rotate(90deg);-webkit-transform-origin:50% 50%;transform-origin:50% 50%}.swagger-ui .model-toggle.collapsed{-webkit-transform:rotate(0deg);transform:rotate(0deg)}.swagger-ui .model-toggle:after{display:block;width:20px;height:20px;content:"";background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z'/%3E%3C/svg%3E") 50% no-repeat;background-size:100%}.swagger-ui .model-jump-to-path{position:relative;cursor:pointer}.swagger-ui .model-jump-to-path .view-line-link{position:absolute;top:-.4em;cursor:pointer}.swagger-ui .model-title{position:relative}.swagger-ui .model-title:hover .model-hint{visibility:visible}.swagger-ui .model-hint{position:absolute;top:-1.8em;visibility:hidden;padding:.1em .5em;white-space:nowrap;color:#ebebeb;border-radius:4px;background:rgba(0,0,0,.7)}.swagger-ui .model p{margin:0 0 1em}.swagger-ui section.models{margin:30px 0;border:1px solid rgba(59,65,81,.3);border-radius:4px}.swagger-ui section.models.is-open{padding:0 0 20px}.swagger-ui section.models.is-open h4{margin:0 0 5px;border-bottom:1px solid rgba(59,65,81,.3)}.swagger-ui section.models h4{font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:0;padding:10px 20px 10px 10px;cursor:pointer;-webkit-transition:all .2s;transition:all .2s;font-family:Titillium Web,sans-serif;color:#606060}.swagger-ui section.models h4 svg{-webkit-transition:all .4s;transition:all .4s}.swagger-ui section.models h4 span{-webkit-box-flex:1;-ms-flex:1;flex:1}.swagger-ui section.models h4:hover{background:rgba(0,0,0,.02)}.swagger-ui section.models h5{font-size:16px;margin:0 0 10px;font-family:Titillium Web,sans-serif;color:#707070}.swagger-ui section.models .model-jump-to-path{position:relative;top:5px}.swagger-ui section.models .model-container{margin:0 20px 15px;-webkit-transition:all .5s;transition:all .5s;border-radius:4px;background:rgba(0,0,0,.05)}.swagger-ui section.models .model-container:hover{background:rgba(0,0,0,.07)}.swagger-ui section.models .model-container:first-of-type{margin:20px}.swagger-ui section.models .model-container:last-of-type{margin:0 20px}.swagger-ui section.models .model-box{background:none}.swagger-ui .model-box{padding:10px;border-radius:4px;background:rgba(0,0,0,.1)}.swagger-ui .model-box .model-jump-to-path{position:relative;top:4px}.swagger-ui .model-box.deprecated{opacity:.5}.swagger-ui .model-title{font-size:16px;font-family:Titillium Web,sans-serif;color:#505050}.swagger-ui .model-deprecated-warning{font-size:16px;font-weight:600;margin-right:1em;font-family:Titillium Web,sans-serif;color:#f93e3e}.swagger-ui span>span.model .brace-close{padding:0 0 0 10px}.swagger-ui .prop-name{display:inline-block;margin-right:1em}.swagger-ui .prop-type{color:#55a}.swagger-ui .prop-enum{display:block}.swagger-ui .prop-format{color:#606060}.swagger-ui .servers>label{font-size:12px;margin:-20px 15px 0 0;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .servers>label select{min-width:130px;max-width:100%}.swagger-ui .servers h4.message{padding-bottom:2em}.swagger-ui .servers table tr{width:30em}.swagger-ui .servers table td{display:inline-block;max-width:15em;vertical-align:middle;padding-top:10px;padding-bottom:10px}.swagger-ui .servers table td:first-of-type{padding-right:2em}.swagger-ui .servers table td input{width:100%;height:100%}.swagger-ui .servers .computed-url{margin:2em 0}.swagger-ui .servers .computed-url code{display:inline-block;padding:4px;font-size:16px;margin:0 1em}.swagger-ui .global-server-container{margin:0 0 20px;padding:30px 0;background:#fff;-webkit-box-shadow:0 1px 2px 0 rgba(0,0,0,.15);box-shadow:0 1px 2px 0 rgba(0,0,0,.15)}.swagger-ui .global-server-container .servers-title{line-height:2em;font-weight:700}.swagger-ui .operation-servers h4.message{margin-bottom:2em}.swagger-ui table{width:100%;padding:0 10px;border-collapse:collapse}.swagger-ui table.model tbody tr td{padding:0;vertical-align:top}.swagger-ui table.model tbody tr td:first-of-type{width:174px;padding:0 0 0 2em}.swagger-ui table.headers td{font-size:12px;font-weight:300;vertical-align:middle;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui table tbody tr td{padding:10px 0 0;vertical-align:top}.swagger-ui table tbody tr td:first-of-type{max-width:20%;min-width:6em;padding:10px 0}.swagger-ui table thead tr td,.swagger-ui table thead tr th{font-size:12px;font-weight:700;padding:12px 0;text-align:left;border-bottom:1px solid rgba(59,65,81,.2);font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .parameters-col_description input[type=text]{width:100%;max-width:340px}.swagger-ui .parameters-col_description select{border-width:1px}.swagger-ui .parameter__name{font-size:16px;font-weight:400;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .parameter__name.required{font-weight:700}.swagger-ui .parameter__name.required:after{font-size:10px;position:relative;top:-6px;padding:5px;content:"required";color:rgba(255,0,0,.6)}.swagger-ui .parameter__extension,.swagger-ui .parameter__in{font-size:12px;font-style:italic;font-family:Source Code Pro,monospace;font-weight:600;color:gray}.swagger-ui .parameter__deprecated{font-size:12px;font-style:italic;font-family:Source Code Pro,monospace;font-weight:600;color:red}.swagger-ui .table-container{padding:20px}.swagger-ui .topbar{padding:8px 0;background-color:#89bf04}.swagger-ui .topbar .topbar-wrapper,.swagger-ui .topbar a{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.swagger-ui .topbar a{font-size:1.5em;font-weight:700;-webkit-box-flex:1;-ms-flex:1;flex:1;max-width:300px;text-decoration:none;font-family:Titillium Web,sans-serif;color:#fff}.swagger-ui .topbar a span{margin:0;padding:0 10px}.swagger-ui .topbar .download-url-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:3;-ms-flex:3;flex:3;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.swagger-ui .topbar .download-url-wrapper input[type=text]{width:100%;margin:0;border:2px solid #547f00;border-radius:4px 0 0 4px;outline:none}.swagger-ui .topbar .download-url-wrapper .select-label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;max-width:600px;margin:0}.swagger-ui .topbar .download-url-wrapper .select-label span{font-size:16px;-webkit-box-flex:1;-ms-flex:1;flex:1;padding:0 10px 0 0;text-align:right}.swagger-ui .topbar .download-url-wrapper .select-label select{-webkit-box-flex:2;-ms-flex:2;flex:2;width:100%;border:2px solid #547f00;outline:none;-webkit-box-shadow:none;box-shadow:none}.swagger-ui .topbar .download-url-wrapper .download-url-button{font-size:16px;font-weight:700;padding:4px 30px;border:none;border-radius:0 4px 4px 0;background:#547f00;font-family:Titillium Web,sans-serif;color:#fff}.swagger-ui .info{margin:50px 0}.swagger-ui .info hgroup.main{margin:0 0 20px}.swagger-ui .info hgroup.main a{font-size:12px}.swagger-ui .info li,.swagger-ui .info p,.swagger-ui .info table{font-size:14px;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .info h1,.swagger-ui .info h2,.swagger-ui .info h3,.swagger-ui .info h4,.swagger-ui .info h5{font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .info code{padding:3px 5px;border-radius:4px;background:rgba(0,0,0,.05);font-family:Source Code Pro,monospace;font-weight:600;color:#9012fe}.swagger-ui .info a{font-size:14px;-webkit-transition:all .4s;transition:all .4s;font-family:Open Sans,sans-serif;color:#4990e2}.swagger-ui .info a:hover{color:#1f69c0}.swagger-ui .info>div{margin:0 0 5px}.swagger-ui .info .base-url{font-size:12px;font-weight:300!important;margin:0;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui .info .title{font-size:36px;margin:0;font-family:Open Sans,sans-serif;color:#3b4151}.swagger-ui .info .title small{font-size:10px;position:relative;top:-5px;display:inline-block;margin:0 0 0 5px;padding:2px 4px;vertical-align:super;border-radius:57px;background:#7d8492}.swagger-ui .info .title small pre{margin:0;font-family:Titillium Web,sans-serif;color:#fff}.swagger-ui .auth-btn-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;padding:10px 0;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.swagger-ui .auth-btn-wrapper .btn-done{margin-right:1em}.swagger-ui .auth-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1;flex:1;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.swagger-ui .auth-wrapper .authorize{padding-right:20px}.swagger-ui .auth-container{margin:0 0 10px;padding:10px 20px;border-bottom:1px solid #ebebeb}.swagger-ui .auth-container:last-of-type{margin:0;padding:10px 20px;border:0}.swagger-ui .auth-container h4{margin:5px 0 15px!important}.swagger-ui .auth-container .wrapper{margin:0;padding:0}.swagger-ui .auth-container input[type=password],.swagger-ui .auth-container input[type=text]{min-width:230px}.swagger-ui .auth-container .errors{font-size:12px;padding:10px;border-radius:4px;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui .scopes h2{font-size:14px;font-family:Titillium Web,sans-serif;color:#3b4151}.swagger-ui .scope-def{padding:0 0 20px}.swagger-ui .errors-wrapper{margin:20px;padding:10px 20px;-webkit-animation:scaleUp .5s;animation:scaleUp .5s;border:2px solid #f93e3e;border-radius:4px;background:rgba(249,62,62,.1)}.swagger-ui .errors-wrapper .error-wrapper{margin:0 0 10px}.swagger-ui .errors-wrapper .errors h4{font-size:14px;margin:0;font-family:Source Code Pro,monospace;font-weight:600;color:#3b4151}.swagger-ui .errors-wrapper .errors small{color:#606060}.swagger-ui .errors-wrapper hgroup{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.swagger-ui .errors-wrapper hgroup h4{font-size:20px;margin:0;-webkit-box-flex:1;-ms-flex:1;flex:1;font-family:Titillium Web,sans-serif;color:#3b4151}@-webkit-keyframes scaleUp{0%{-webkit-transform:scale(.8);transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);transform:scale(1);opacity:1}}@keyframes scaleUp{0%{-webkit-transform:scale(.8);transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);transform:scale(1);opacity:1}}.swagger-ui .Resizer.vertical.disabled{display:none}
+/*# sourceMappingURL=swagger-ui.css.map*/
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/typography.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/typography.css
deleted file mode 100644
index 27c3751ac2ebb..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/typography.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* droid-sans-regular - latin */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: url('../fonts/droid-sans-v6-latin-regular.eot'); /* IE9 Compat Modes */
-  src: local('Droid Sans'), local('DroidSans'),
-       url('../fonts/droid-sans-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('../fonts/droid-sans-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('../fonts/droid-sans-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('../fonts/droid-sans-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('../fonts/droid-sans-v6-latin-regular.svg#DroidSans') format('svg'); /* Legacy iOS */
-}
-/* droid-sans-700 - latin */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: url('../fonts/droid-sans-v6-latin-700.eot'); /* IE9 Compat Modes */
-  src: local('Droid Sans Bold'), local('DroidSans-Bold'),
-       url('../fonts/droid-sans-v6-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('../fonts/droid-sans-v6-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('../fonts/droid-sans-v6-latin-700.woff') format('woff'), /* Modern Browsers */
-       url('../fonts/droid-sans-v6-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('../fonts/droid-sans-v6-latin-700.svg#DroidSans') format('svg'); /* Legacy iOS */
-}
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.eot b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.eot
deleted file mode 100644
index d8524983ad8d2..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.eot and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.svg b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.svg
deleted file mode 100644
index a54bbbbf258aa..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.svg
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs >
-<font id="DroidSans" horiz-adv-x="1123" ><font-face
-    font-family="Droid Sans"
-    units-per-em="2048"
-    panose-1="2 11 8 6 3 8 4 2 2 4"
-    ascent="1907"
-    descent="-492"
-    alphabetic="0" />
-<glyph unicode=" " glyph-name="space" horiz-adv-x="532" />
-<glyph unicode="!" glyph-name="exclam" horiz-adv-x="586" d="M416 485H172L121 1462H467L416 485ZM117 143Q117 190 130 222T168 275T224 304T293 313Q328 313 359 304T415 275T453 223T467 143Q467 98 453 66T415 13T360 -17T293 -27Q256 -27 224 -18T168 13T131
-66T117 143Z" />
-<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="967" d="M412 1462L371 934H174L133 1462H412ZM834 1462L793 934H596L555 1462H834Z" />
-<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M999 844L952 612H1210V406H913L836 0H616L694 406H500L424 0H209L283 406H45V612H322L369 844H117V1053H406L483 1460H702L625 1053H823L901 1460H1116L1038 1053H1278V844H999ZM539 612H735L782
-844H586L539 612Z" />
-<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1128" d="M1061 457Q1061 382 1035 318T956 206T825 127T645 86V-119H508V82Q442 84 386 90T281 107T188 133T100 168V432Q142 411 191 392T294 358T401 331T508 317V635Q500 638 491 642Q483 645 475 648T461
-653Q370 688 302 726T189 811T121 915T98 1044Q98 1119 126 1180T208 1287T337 1361T508 1399V1556H645V1405Q732 1400 823 1380T1014 1317L913 1083Q848 1109 778 1129T645 1155V862L684 848Q779 813 850 776T968 693T1038 590T1061 457ZM760 451Q760 475 754
-493T733 526T698 553T645 580V328Q704 337 732 367T760 451ZM399 1051Q399 1004 425 973T508 920V1153Q454 1147 427 1123T399 1051Z" />
-<glyph unicode="%" glyph-name="percent" horiz-adv-x="1804" d="M315 1024Q315 897 337 835T410 772Q459 772 482 834T506 1024Q506 1274 410 1274Q360 1274 338 1213T315 1024ZM758 1026Q758 918 738 832T674 687T565 597T408 565Q323 565 259 596T151 687T85
-832T63 1026Q63 1134 83 1219T145 1362T253 1452T408 1483Q494 1483 559 1452T669 1363T735 1219T758 1026ZM1425 1462L614 0H375L1186 1462H1425ZM1298 440Q1298 313 1320 251T1393 188Q1442 188 1465 250T1489 440Q1489 690 1393 690Q1343 690 1321 629T1298
-440ZM1741 442Q1741 334 1721 249T1657 104T1548 14T1391 -18Q1306 -18 1242 13T1135 104T1069 248T1047 442Q1047 550 1067 635T1129 778T1236 868T1391 899Q1477 899 1542 868T1652 779T1718 635T1741 442Z" />
-<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="1479" d="M1475 0H1098L1001 100Q921 45 825 13T612 -20Q492 -20 395 10T228 94T120 225T82 395Q82 472 100 532T153 642T235 731T344 807Q306 853 280 895T237 979T214 1062T207 1149Q207 1227 237
-1288T322 1393T452 1460T618 1483Q704 1483 776 1462T901 1401T984 1301T1014 1165Q1014 1096 992 1039T931 932T842 842T731 766L991 498Q1026 564 1052 637T1098 784H1415Q1400 727 1380 664T1332 538T1270 411T1192 291L1475 0ZM403 424Q403 380 419 345T463
-286T530 249T614 236Q674 236 725 251T819 295L510 625Q459 583 431 535T403 424ZM731 1124Q731 1155 721 1176T695 1212T658 1232T616 1239Q594 1239 572 1233T531 1214T501 1178T489 1122Q489 1070 512 1024T575 932Q652 976 691 1020T731 1124Z" />
-<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="545" d="M412 1462L371 934H174L133 1462H412Z" />
-<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="694" d="M82 561Q82 686 100 807T155 1043T248 1263T383 1462H633Q492 1269 420 1038T348 563Q348 444 366 326T420 95T509 -124T631 -324H383Q305 -234 249 -131T155 84T100 317T82 561Z" />
-<glyph unicode=")" glyph-name="parenright" horiz-adv-x="694" d="M612 561Q612 437 594 317T539 85T446 -131T311 -324H63Q132 -230 185 -124T274 95T328 326T346 563Q346 807 274 1038T61 1462H311Q389 1369 445 1264T539 1044T594 808T612 561Z" />
-<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1116" d="M688 1556L647 1188L1020 1292L1053 1040L713 1016L936 719L709 598L553 911L416 600L180 719L401 1016L63 1042L102 1292L467 1188L426 1556H688Z" />
-<glyph unicode="+" glyph-name="plus" horiz-adv-x="1128" d="M455 612H88V831H455V1200H674V831H1040V612H674V248H455V612Z" />
-<glyph unicode="," glyph-name="comma" horiz-adv-x="594" d="M459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444L459 215Z" />
-<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M61 424V674H598V424H61Z" />
-<glyph unicode="." glyph-name="period" horiz-adv-x="584" d="M117 143Q117 190 130 222T168 275T224 304T293 313Q328 313 359 304T415 275T453 223T467 143Q467 98 453 66T415 13T360 -17T293 -27Q256 -27 224 -18T168 13T131 66T117 143Z" />
-<glyph unicode="/" glyph-name="slash" horiz-adv-x="846" d="M836 1462L291 0H14L559 1462H836Z" />
-<glyph unicode="0" glyph-name="zero" horiz-adv-x="1128" d="M1065 731Q1065 554 1038 415T950 179T794 31T563 -20Q436 -20 342 31T186 179T94 415T63 731Q63 908 90 1048T178 1285T333 1433T563 1485Q689 1485 783 1434T940 1286T1034 1049T1065 731ZM371 731Q371
-481 414 355T563 229Q667 229 712 354T758 731Q758 982 713 1108T563 1235Q510 1235 474 1203T414 1108T381 951T371 731Z" />
-<glyph unicode="1" glyph-name="one" horiz-adv-x="1128" d="M817 0H508V846Q508 872 508 908T510 984T513 1064T516 1137Q511 1131 499 1119T472 1093T441 1063T410 1036L242 901L92 1087L563 1462H817V0Z" />
-<glyph unicode="2" glyph-name="two" horiz-adv-x="1128" d="M1063 0H82V215L426 586Q491 656 544 715T635 830T694 944T715 1069Q715 1143 671 1184T551 1225Q472 1225 399 1186T246 1075L78 1274Q123 1315 172 1352T280 1419T410 1465T569 1483Q674 1483 757
-1454T900 1372T990 1242T1022 1071Q1022 985 992 907T910 753T790 603T643 451L467 274V260H1063V0Z" />
-<glyph unicode="3" glyph-name="three" horiz-adv-x="1128" d="M1006 1135Q1006 1059 982 999T915 893T815 817T690 770V764Q867 742 958 657T1049 426Q1049 330 1015 249T909 107T729 14T473 -20Q355 -20 251 -1T57 59V322Q102 298 152 280T252 250T350 231T442
-225Q528 225 585 241T676 286T724 355T739 444Q739 489 721 525T661 587T552 627T387 641H283V858H385Q477 858 538 874T635 919T687 986T702 1067Q702 1145 654 1189T500 1233Q452 1233 411 1224T334 1200T269 1168T215 1133L59 1339Q101 1370 150 1396T258 1441T383
-1472T526 1483Q634 1483 722 1460T874 1392T971 1283T1006 1135Z" />
-<glyph unicode="4" glyph-name="four" horiz-adv-x="1128" d="M1085 303H909V0H608V303H4V518L625 1462H909V543H1085V303ZM608 543V791Q608 804 608 828T610 884T612 948T615 1011T618 1063T621 1096H612Q594 1054 572 1007T520 913L276 543H608Z" />
-<glyph unicode="5" glyph-name="five" horiz-adv-x="1128" d="M598 934Q692 934 773 905T914 820T1008 681T1042 489Q1042 370 1005 276T896 116T718 15T473 -20Q418 -20 364 -15T261 -1T167 24T86 59V326Q121 306 167 289T262 259T362 239T457 231Q591 231 661
-286T731 463Q731 571 663 627T451 684Q425 684 396 681T338 673T283 663T238 651L115 717L170 1462H942V1200H438L414 913Q446 920 488 927T598 934Z" />
-<glyph unicode="6" glyph-name="six" horiz-adv-x="1128" d="M76 621Q76 726 87 830T128 1029T208 1207T336 1349T522 1444T776 1479Q797 1479 822 1478T872 1476T922 1471T965 1464V1217Q927 1226 885 1231T799 1237Q664 1237 577 1204T439 1110T367 966T340
-780H352Q372 816 400 847T467 901T552 937T659 950Q754 950 830 919T958 829T1039 684T1067 487Q1067 368 1034 274T938 115T788 15T590 -20Q482 -20 388 18T225 136T116 335T76 621ZM584 227Q625 227 658 242T716 289T754 369T768 483Q768 590 724 651T588 713Q542
-713 504 695T439 648T398 583T383 510Q383 459 395 409T433 318T496 252T584 227Z" />
-<glyph unicode="7" glyph-name="seven" horiz-adv-x="1128" d="M207 0L727 1200H55V1460H1063V1266L530 0H207Z" />
-<glyph unicode="8" glyph-name="eight" horiz-adv-x="1128" d="M565 1481Q656 1481 737 1459T879 1393T976 1283T1012 1128Q1012 1062 992 1009T937 912T854 834T750 772Q808 741 863 703T962 618T1031 511T1057 379Q1057 288 1021 214T920 88T765 8T565 -20Q447
--20 355 7T200 84T105 207T72 371Q72 446 94 506T154 614T243 699T352 764Q303 795 260 831T186 912T136 1011T117 1130Q117 1217 153 1282T252 1392T395 1459T565 1481ZM358 389Q358 349 371 316T409 258T473 221T561 207Q666 207 718 256T770 387Q770 429 753
-462T708 524T645 577T575 623L553 637Q509 615 473 590T412 534T372 467T358 389ZM563 1255Q530 1255 502 1245T453 1216T420 1169T408 1106Q408 1064 420 1034T454 980T504 938T565 901Q596 917 624 936T673 979T708 1035T721 1106Q721 1141 709 1169T676 1216T626
-1245T563 1255Z" />
-<glyph unicode="9" glyph-name="nine" horiz-adv-x="1128" d="M1055 838Q1055 733 1044 629T1003 429T923 252T795 109T609 15T354 -20Q333 -20 308 -19T258 -17T208 -13T166 -6V242Q203 232 245 227T332 221Q467 221 554 254T692 348T764 493T791 678H778Q758
-642 730 611T664 557T578 521T471 508Q376 508 300 539T172 629T91 774T63 971Q63 1090 96 1184T192 1343T342 1444T541 1479Q649 1479 743 1441T906 1323T1015 1123T1055 838ZM547 1231Q506 1231 472 1216T414 1170T376 1090T362 975Q362 869 407 807T543 745Q589
-745 627 763T692 810T733 875T748 948Q748 999 736 1049T698 1140T635 1206T547 1231Z" />
-<glyph unicode=":" glyph-name="colon" horiz-adv-x="584" d="M117 143Q117 190 130 222T168 275T224 304T293 313Q328 313 359 304T415 275T453 223T467 143Q467 98 453 66T415 13T360 -17T293 -27Q256 -27 224 -18T168 13T131 66T117 143ZM117 969Q117 1016
-130 1048T168 1101T224 1130T293 1139Q328 1139 359 1130T415 1101T453 1049T467 969Q467 924 453 892T415 839T360 809T293 799Q256 799 224 808T168 838T131 891T117 969Z" />
-<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="594" d="M444 238L459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444ZM117 969Q117 1016 130 1048T168 1101T224 1130T293 1139Q328 1139 359 1130T415
-1101T453 1049T467 969Q467 924 453 892T415 839T360 809T293 799Q256 799 224 808T168 838T131 891T117 969Z" />
-<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="1128" d="M1040 203L88 641V784L1040 1280V1040L397 723L1040 442V203Z" />
-<glyph unicode="=" glyph-name="equal" horiz-adv-x="1128" d="M88 807V1024H1040V807H88ZM88 418V637H1040V418H88Z" />
-<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="1128" d="M88 442L731 723L88 1040V1280L1040 784V641L88 203V442Z" />
-<glyph unicode="?" glyph-name="question" horiz-adv-x="940" d="M264 485V559Q264 610 274 651T306 730T362 803T444 877Q486 910 515 936T562 987T588 1041T596 1106Q596 1163 558 1200T440 1237Q371 1237 292 1208T127 1137L25 1358Q68 1383 118 1405T223 1445T334
-1473T444 1483Q546 1483 628 1459T767 1387T854 1273T885 1120Q885 1057 871 1008T830 916T761 834T664 750Q622 717 596 693T554 646T534 601T528 545V485H264ZM231 143Q231 190 244 222T282 275T338 304T408 313Q443 313 474 304T530 275T568 223T582 143Q582
-98 568 66T530 13T475 -17T408 -27Q371 -27 339 -18T282 13T245 66T231 143Z" />
-<glyph unicode="@" glyph-name="at" horiz-adv-x="1774" d="M1673 752Q1673 657 1651 564T1582 398T1467 279T1303 233Q1265 233 1232 242T1170 269T1122 310T1090 362H1075Q1056 337 1031 314T975 272T907 244T825 233Q742 233 678 261T569 342T502 468T479 631Q479
-734 510 820T599 968T740 1065T926 1100Q971 1100 1019 1095T1111 1082T1195 1064T1262 1044L1241 625Q1239 603 1239 582T1239 555Q1239 513 1245 486T1262 444T1286 422T1315 416Q1350 416 1376 443T1419 516T1445 623T1454 754Q1454 882 1416 982T1311 1151T1150
-1256T948 1292Q795 1292 679 1241T484 1099T365 882T324 608Q324 470 359 364T463 185T633 75T866 37Q922 37 981 44T1098 63T1213 92T1321 129V-63Q1227 -105 1113 -129T868 -154Q687 -154 545 -103T304 46T154 283T102 602Q102 726 129 839T207 1050T331 1227T499
-1363T706 1450T948 1481Q1106 1481 1239 1431T1468 1286T1619 1056T1673 752ZM711 627Q711 515 749 466T850 416Q892 416 922 435T972 490T1002 575T1016 686L1028 907Q1008 912 981 915T926 918Q867 918 826 893T760 827T723 734T711 627Z" />
-<glyph unicode="A" glyph-name="A" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489 608H846Z" />
-<glyph unicode="B" glyph-name="B" horiz-adv-x="1315" d="M184 1462H612Q750 1462 854 1443T1028 1380T1133 1266T1169 1092Q1169 1030 1154 976T1110 881T1040 813T944 776V766Q999 754 1046 732T1129 670T1185 570T1206 424Q1206 324 1171 246T1071 113T912
-29T700 0H184V1462ZM494 883H655Q713 883 752 893T815 925T849 977T860 1051Q860 1135 808 1171T641 1208H494V883ZM494 637V256H676Q737 256 778 270T845 310T882 373T893 455Q893 496 882 529T845 587T775 624T668 637H494Z" />
-<glyph unicode="C" glyph-name="C" horiz-adv-x="1305" d="M805 1225Q716 1225 648 1191T533 1092T462 935T438 727Q438 610 459 519T525 366T639 271T805 238Q894 238 983 258T1178 315V55Q1130 35 1083 21T987 -2T887 -15T776 -20Q607 -20 483 34T278 186T158
-422T119 729Q119 895 164 1033T296 1272T511 1427T805 1483Q914 1483 1023 1456T1233 1380L1133 1128Q1051 1167 968 1196T805 1225Z" />
-<glyph unicode="D" glyph-name="D" horiz-adv-x="1434" d="M1315 745Q1315 560 1265 421T1119 188T885 47T569 0H184V1462H612Q773 1462 902 1416T1124 1280T1265 1055T1315 745ZM1001 737Q1001 859 977 947T906 1094T792 1180T637 1208H494V256H608Q804 256 902
-376T1001 737Z" />
-<glyph unicode="E" glyph-name="E" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0Z" />
-<glyph unicode="F" glyph-name="F" horiz-adv-x="1124" d="M489 0H184V1462H1022V1208H489V831H985V578H489V0Z" />
-<glyph unicode="G" glyph-name="G" horiz-adv-x="1483" d="M739 821H1319V63Q1261 44 1202 29T1080 3T947 -14T799 -20Q635 -20 509 28T296 172T164 408T119 733Q119 905 169 1044T316 1280T556 1430T883 1483Q1000 1483 1112 1458T1317 1393L1214 1145Q1146 1179
-1061 1202T881 1225Q779 1225 698 1190T558 1089T469 932T438 727Q438 619 459 530T527 375T645 274T819 238Q885 238 930 244T1016 258V563H739V821Z" />
-<glyph unicode="H" glyph-name="H" horiz-adv-x="1485" d="M1300 0H991V631H494V0H184V1462H494V889H991V1462H1300V0Z" />
-<glyph unicode="I" glyph-name="I" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0Z" />
-<glyph unicode="J" glyph-name="J" horiz-adv-x="678" d="M-2 -430Q-67 -430 -116 -424T-199 -408V-150Q-162 -158 -122 -164T-33 -170Q13 -170 52 -160T121 -126T167 -60T184 43V1462H494V53Q494 -73 458 -164T356 -314T199 -402T-2 -430Z" />
-<glyph unicode="K" glyph-name="K" horiz-adv-x="1298" d="M1298 0H946L610 608L494 522V0H184V1462H494V758L616 965L950 1462H1294L827 803L1298 0Z" />
-<glyph unicode="L" glyph-name="L" horiz-adv-x="1096" d="M184 0V1462H494V256H1026V0H184Z" />
-<glyph unicode="M" glyph-name="M" horiz-adv-x="1870" d="M772 0L451 1147H442Q448 1055 452 969Q454 932 455 893T458 816T460 743T461 680V0H184V1462H606L922 344H928L1264 1462H1686V0H1397V692Q1397 718 1397 751T1399 821T1401 896T1404 970Q1408 1054
-1411 1145H1403L1057 0H772Z" />
-<glyph unicode="N" glyph-name="N" horiz-adv-x="1604" d="M1419 0H1026L451 1106H442Q448 1029 452 953Q456 888 458 817T461 688V0H184V1462H575L1149 367H1155Q1152 443 1148 517Q1147 549 1146 582T1143 649T1142 714T1141 770V1462H1419V0Z" />
-<glyph unicode="O" glyph-name="O" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430 733ZM438
-733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733Z" />
-<glyph unicode="P" glyph-name="P" horiz-adv-x="1225" d="M494 774H555Q686 774 752 826T819 995Q819 1104 760 1156T573 1208H494V774ZM1133 1006Q1133 910 1104 822T1009 667T834 560T565 520H494V0H184V1462H590Q731 1462 833 1431T1002 1341T1101 1198T1133 1006Z" />
-<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1548" d="M1430 733Q1430 614 1411 510T1352 319T1253 166T1112 55L1473 -348H1075L807 -18Q800 -18 794 -19Q789 -20 784 -20T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483
-1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430 733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733Z"
-/>
-<glyph unicode="R" glyph-name="R" horiz-adv-x="1290" d="M494 813H578Q707 813 763 864T819 1016Q819 1120 759 1164T573 1208H494V813ZM494 561V0H184V1462H584Q865 1462 999 1354T1133 1024Q1133 949 1113 888T1060 780T983 697T891 637Q1002 459 1090 319Q1128
-259 1163 202T1227 100T1273 28L1290 0H946L629 561H494Z" />
-<glyph unicode="S" glyph-name="S" horiz-adv-x="1073" d="M985 406Q985 308 952 230T854 96T696 10T481 -20Q375 -20 277 2T94 68V356Q142 333 191 312T290 273T391 246T492 236Q543 236 579 247T638 279T671 328T682 391Q682 432 665 463T616 522T540 576T440
-631Q394 655 337 689T230 773T145 895T111 1067Q111 1165 143 1242T236 1373T381 1455T573 1483Q626 1483 676 1476T776 1456T876 1424T979 1380L879 1139Q834 1160 795 1176T719 1203T647 1219T575 1225Q497 1225 456 1184T414 1073Q414 1036 426 1008T466 954T537
-903T643 844Q718 804 781 763T889 671T960 556T985 406Z" />
-<glyph unicode="T" glyph-name="T" horiz-adv-x="1124" d="M717 0H408V1204H41V1462H1083V1204H717V0Z" />
-<glyph unicode="U" glyph-name="U" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292Z" />
-<glyph unicode="V" glyph-name="V" horiz-adv-x="1249" d="M936 1462H1249L793 0H455L0 1462H313L561 582Q566 565 574 525T592 437T611 341T625 260Q630 293 639 341T658 436T677 524T692 582L936 1462Z" />
-<glyph unicode="W" glyph-name="W" horiz-adv-x="1898" d="M1546 0H1194L1014 721Q1010 736 1005 763T992 824T978 895T965 967T955 1031T948 1079Q946 1061 942 1032T931 968T919 896T906 825T893 763T883 719L705 0H352L0 1462H305L471 664Q474 648 479 618T492
-549T506 469T521 387T534 313T543 256Q546 278 551 312T563 384T576 464T590 540T601 603T610 643L813 1462H1085L1288 643Q1291 631 1296 604T1308 541T1322 464T1335 385T1347 312T1356 256Q1359 278 1364 312T1377 387T1391 469T1406 549T1418 617T1427 664L1593
-1462H1898L1546 0Z" />
-<glyph unicode="X" glyph-name="X" horiz-adv-x="1284" d="M1284 0H930L631 553L332 0H0L444 754L31 1462H373L647 936L915 1462H1249L831 737L1284 0Z" />
-<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1196" d="M598 860L862 1462H1196L752 569V0H444V559L0 1462H336L598 860Z" />
-<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1104" d="M1055 0H49V201L668 1206H68V1462H1036V1262L418 256H1055V0Z" />
-<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="678" d="M627 -324H143V1462H627V1251H403V-113H627V-324Z" />
-<glyph unicode="\" glyph-name="backslash" horiz-adv-x="846" d="M289 1462L834 0H557L12 1462H289Z" />
-<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="678" d="M51 -113H274V1251H51V1462H535V-324H51V-113Z" />
-<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1090" d="M8 520L446 1470H590L1085 520H846L524 1163Q455 1002 384 839T244 520H8Z" />
-<glyph unicode="_" glyph-name="underscore" horiz-adv-x="842" d="M846 -324H-4V-184H846V-324Z" />
-<glyph unicode="`" glyph-name="grave" horiz-adv-x="1182" d="M645 1241Q611 1269 564 1310T470 1396T386 1480T332 1548V1569H674Q690 1535 711 1495T756 1414T803 1335T848 1268V1241H645Z" />
-<glyph unicode="a" glyph-name="a" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190 1040Q274
-1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518Z" />
-<glyph unicode="b" glyph-name="b" horiz-adv-x="1245" d="M756 1139Q842 1139 913 1102T1035 992T1114 811T1143 561Q1143 417 1115 309T1034 127T909 17T748 -20Q692 -20 649 -8T571 24T512 69T465 123H444L393 0H160V1556H465V1194Q465 1161 463 1123T459 1051Q456
-1012 453 973H465Q486 1008 513 1038T575 1090T656 1126T756 1139ZM653 895Q602 895 567 877T509 821T477 728T465 596V563Q465 482 474 419T506 314T564 249T655 227Q746 227 788 313T831 565Q831 730 789 812T653 895Z" />
-<glyph unicode="c" glyph-name="c" horiz-adv-x="1022" d="M625 -20Q505 -20 409 13T244 115T139 293T102 553Q102 720 139 832T245 1013T410 1110T625 1139Q711 1139 796 1118T956 1059L868 827Q802 856 741 874T625 893Q514 893 464 809T414 555Q414 387 464
-307T621 227Q708 227 779 249T924 307V53Q887 35 852 21T782 -2T708 -15T625 -20Z" />
-<glyph unicode="d" glyph-name="d" horiz-adv-x="1245" d="M489 -20Q403 -20 332 17T210 126T131 307T102 557Q102 701 130 809T211 991T337 1102T498 1139Q552 1139 597 1127T678 1092T742 1040T793 975H803Q797 1014 792 1054Q787 1088 784 1126T780 1198V1556H1085V0H852L793
-145H780Q759 111 732 81T670 28T590 -7T489 -20ZM600 223Q654 223 692 241T753 297T788 391T801 522V555Q801 636 791 699T758 804T696 869T598 891Q502 891 457 805T412 553Q412 388 457 306T600 223Z" />
-<glyph unicode="e" glyph-name="e" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139 810 1106T962
-1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20Z" />
-<glyph unicode="f" glyph-name="f" horiz-adv-x="793" d="M741 889H514V0H209V889H41V1036L209 1118V1200Q209 1307 235 1377T309 1490T425 1549T578 1567Q670 1567 733 1553T840 1520L768 1296Q737 1307 703 1316T623 1325Q563 1325 539 1287T514 1188V1118H741V889Z" />
-<glyph unicode="g" glyph-name="g" horiz-adv-x="1130" d="M1085 1116V950L922 899Q942 865 950 829T958 750Q958 665 931 595T851 474T718 397T532 369Q509 369 482 371T442 377Q422 360 411 342T399 297Q399 276 412 264T446 244T495 234T553 231H727Q808 231
-872 213T980 156T1049 60T1073 -80Q1073 -175 1035 -251T922 -381T734 -463T475 -492Q361 -492 276 -471T134 -409T49 -311T20 -182Q20 -121 41 -76T97 1T176 53T268 84Q247 93 227 109T190 146T163 192T152 246Q152 278 161 304T189 352T234 395T295 436Q207 474
-156 558T104 756Q104 846 132 917T214 1037T348 1113T532 1139Q552 1139 577 1137T626 1131T672 1123T705 1116H1085ZM285 -158Q285 -183 295 -206T330 -248T393 -276T489 -287Q645 -287 724 -243T803 -125Q803 -62 754 -41T602 -20H461Q434 -20 403 -26T346 -49T303
--91T285 -158ZM395 752Q395 661 429 611T532 561Q604 561 636 611T668 752Q668 842 637 895T532 948Q395 948 395 752Z" />
-<glyph unicode="h" glyph-name="h" horiz-adv-x="1284" d="M1130 0H825V653Q825 774 788 834T672 895Q613 895 573 871T509 800T475 684T465 526V0H160V1556H465V1239Q465 1197 463 1151T458 1065Q454 1019 451 975H467Q516 1062 592 1100T764 1139Q847 1139 914
-1116T1030 1042T1104 915T1130 729V0Z" />
-<glyph unicode="i" glyph-name="i" horiz-adv-x="625" d="M147 1407Q147 1450 160 1478T195 1524T248 1549T313 1556Q347 1556 377 1549T429 1525T465 1479T479 1407Q479 1365 466 1336T430 1290T377 1265T313 1257Q279 1257 249 1264T196 1289T160 1336T147 1407ZM465
-0H160V1118H465V0Z" />
-<glyph unicode="j" glyph-name="j" horiz-adv-x="625" d="M102 -492Q54 -492 3 -485T-82 -467V-227Q-51 -237 -24 -241T37 -246Q62 -246 84 -239T123 -212T150 -160T160 -76V1118H465V-121Q465 -198 446 -265T383 -383T270 -463T102 -492ZM147 1407Q147 1450 160
-1478T195 1524T248 1549T313 1556Q347 1556 377 1549T429 1525T465 1479T479 1407Q479 1365 466 1336T430 1290T377 1265T313 1257Q279 1257 249 1264T196 1289T160 1336T147 1407Z" />
-<glyph unicode="k" glyph-name="k" horiz-adv-x="1208" d="M453 608L565 778L838 1118H1182L778 633L1208 0H856L584 430L465 348V0H160V1556H465V862L449 608H453Z" />
-<glyph unicode="l" glyph-name="l" horiz-adv-x="625" d="M465 0H160V1556H465V0Z" />
-<glyph unicode="m" glyph-name="m" horiz-adv-x="1929" d="M1120 0H815V653Q815 774 779 834T666 895Q608 895 570 871T508 800T475 684T465 526V0H160V1118H393L434 975H451Q475 1018 508 1049T582 1100T667 1129T758 1139Q873 1139 953 1100T1077 975H1102Q1126
-1018 1160 1049T1235 1100T1321 1129T1413 1139Q1593 1139 1684 1042T1776 729V0H1470V653Q1470 774 1434 834T1321 895Q1212 895 1166 809T1120 561V0Z" />
-<glyph unicode="n" glyph-name="n" horiz-adv-x="1284" d="M1130 0H825V653Q825 774 789 834T672 895Q612 895 572 871T509 800T475 684T465 526V0H160V1118H393L434 975H451Q475 1018 509 1049T585 1100T672 1129T766 1139Q848 1139 915 1116T1030 1042T1104
-915T1130 729V0Z" />
-<glyph unicode="o" glyph-name="o" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246 131T140 313T102
-561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561Z" />
-<glyph unicode="p" glyph-name="p" horiz-adv-x="1245" d="M748 -20Q693 -20 650 -8T572 24T512 69T465 123H449Q453 88 457 57Q460 31 462 4T465 -39V-492H160V1118H408L451 973H465Q486 1007 513 1037T575 1089T656 1125T756 1139Q843 1139 914 1102T1036 992T1115
-811T1143 561Q1143 418 1114 310T1033 128T908 17T748 -20ZM653 895Q602 895 567 877T509 821T477 728T465 596V563Q465 482 474 419T506 314T564 249T655 227Q746 227 788 313T831 565Q831 730 789 812T653 895Z" />
-<glyph unicode="q" glyph-name="q" horiz-adv-x="1245" d="M602 219Q657 219 694 237T755 293T789 386T801 518V555Q801 636 792 699T759 804T697 869T600 891Q504 891 459 805T414 553Q414 385 459 302T602 219ZM489 -20Q402 -20 331 17T209 126T130 307T102
-557Q102 700 130 808T211 990T337 1101T498 1139Q554 1139 599 1127T680 1092T745 1040T795 975H803L827 1118H1085V-492H780V-23Q780 -4 782 24T787 80Q790 112 793 145H780Q760 111 733 81T671 28T590 -7T489 -20Z" />
-<glyph unicode="r" glyph-name="r" horiz-adv-x="889" d="M743 1139Q755 1139 769 1139T797 1137T822 1134T840 1130V844Q832 846 818 848T789 851T758 853T733 854Q674 854 625 839T540 791T485 703T465 569V0H160V1118H391L436 950H451Q475 993 503 1028T565
-1087T643 1125T743 1139Z" />
-<glyph unicode="s" glyph-name="s" horiz-adv-x="985" d="M905 332Q905 244 873 178T782 68T639 2T451 -20Q396 -20 349 -17T260 -5T179 15T100 45V297Q142 276 188 259T281 230T370 210T451 203Q492 203 521 210T568 231T595 263T604 303Q604 324 598 340T568
-375T501 417T381 475Q308 508 255 540T167 613T115 704T98 827Q98 905 128 963T213 1061T345 1119T518 1139Q618 1139 708 1116T893 1047L801 831Q725 867 656 890T518 913Q456 913 429 891T401 831Q401 811 408 796T436 764T495 728T594 680Q665 649 722 619T820
-549T883 458T905 332Z" />
-<glyph unicode="t" glyph-name="t" horiz-adv-x="848" d="M614 223Q659 223 699 233T782 258V31Q739 9 676 -5T537 -20Q464 -20 401 -3T292 56T220 170T193 350V889H47V1018L215 1120L303 1356H498V1118H770V889H498V350Q498 285 530 254T614 223Z" />
-<glyph unicode="u" glyph-name="u" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891Z" />
-<glyph unicode="v" glyph-name="v" horiz-adv-x="1104" d="M395 0L0 1118H319L504 481Q521 424 533 363T549 252H555Q558 305 570 364T600 481L784 1118H1104L709 0H395Z" />
-<glyph unicode="w" glyph-name="w" horiz-adv-x="1651" d="M1014 0L928 391Q924 408 918 439T903 510T887 594T869 683Q849 786 825 905H819Q796 786 777 682Q769 638 761 593T744 509T730 437T719 387L629 0H301L0 1118H303L416 623Q425 584 434 530T452 420T468
-315T479 236H485Q486 255 489 285T498 351T508 422T519 491T529 547T537 582L659 1118H995L1112 582Q1117 560 1125 514T1141 416T1156 314T1163 236H1169Q1172 261 1179 310T1196 415T1215 528T1235 623L1352 1118H1651L1346 0H1014Z" />
-<glyph unicode="x" glyph-name="x" horiz-adv-x="1122" d="M389 571L29 1118H375L561 782L750 1118H1096L731 571L1112 0H766L561 362L356 0H10L389 571Z" />
-<glyph unicode="y" glyph-name="y" horiz-adv-x="1104" d="M0 1118H334L514 489Q530 437 537 378T547 272H553Q555 295 558 323T567 380T578 437T592 489L768 1118H1104L662 -143Q600 -320 493 -406T225 -492Q173 -492 135 -487T70 -475V-233Q91 -238 123 -242T190
--246Q238 -246 272 -233T330 -197T372 -140T403 -66L422 -10L0 1118Z" />
-<glyph unicode="z" glyph-name="z" horiz-adv-x="936" d="M877 0H55V180L512 885H86V1118H858V920L416 233H877V0Z" />
-<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="745" d="M287 367T222 408T31 449V688Q93 688 141 697T223 728T272 784T287 866V1184Q287 1258 306 1310T374 1396T509 1446T725 1462V1237Q685 1236 653 1230T598 1209T563 1166T551 1096V797Q545 610
-317 575V563Q432 546 493 491T551 342V43Q551 0 563 -27T597 -69T652 -91T725 -98V-324Q594 -324 509 -308T375 -259T306 -172T287 -45V270Q287 367 222 408Z" />
-<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M455 1550H674V-465H455V1550Z" />
-<glyph unicode="}" glyph-name="braceright" horiz-adv-x="745" d="M469 -45Q469 -119 450 -172T382 -258T247 -308T31 -324V-98Q71 -97 103 -91T157 -70T192 -27T205 43V342Q202 436 263 491T438 563V575Q211 610 205 797V1096Q205 1139 193 1166T158 1208T103
-1230T31 1237V1462Q162 1462 247 1446T381 1397T450 1311T469 1184V866Q468 818 484 784T533 729T614 698T725 688V449Q600 449 535 408T469 270V-45Z" />
-<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1128" d="M528 616Q491 632 463 643T411 660T366 669T322 672Q293 672 262 663T201 637T143 598T88 551V782Q139 836 202 863T344 891Q374 891 399 889T453 879T517 860T600 827Q638 811 666 801T719
-784T764 775T807 772Q836 772 867 781T928 807T986 845T1040 893V662Q939 553 784 553Q754 553 729 555T675 564T611 583T528 616Z" />
-<glyph unicode="&#xa0;" glyph-name="nbspace" horiz-adv-x="532" />
-<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="586" d="M168 606H412L463 -369H117L168 606ZM467 948Q467 901 454 869T416 816T360 787T291 778Q256 778 225 787T169 816T131 868T117 948Q117 993 131 1025T169 1078T224 1108T291 1118Q328 1118
-360 1109T416 1079T453 1026T467 948Z" />
-<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="1128" d="M543 -20V186Q451 199 377 236T251 340T171 506T143 743Q143 884 171 985T251 1155T378 1260T543 1311V1483H721V1319Q759 1318 797 1313T870 1299T937 1281T993 1260L907 1034Q886 1044 860
-1053T805 1070T750 1082T698 1087Q632 1087 586 1067T511 1006T468 901T455 750Q455 579 512 500T698 420Q774 420 844 438T965 481V242Q914 213 852 198T721 180V-20H543Z" />
-<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="1128" d="M680 1483Q790 1483 879 1459T1049 1401L956 1171Q885 1200 827 1217T705 1235Q638 1235 601 1197T563 1063V870H897V651H563V508Q563 453 550 413T514 343T466 294T412 260H1090V0H82V248Q124
-266 157 287T214 337T250 407T262 506V651H84V870H262V1065Q262 1178 293 1257T380 1387T512 1460T680 1483Z" />
-<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="1128" d="M168 723Q168 777 182 826T221 920L92 1047L240 1194L367 1067Q410 1092 461 1106T563 1120Q617 1120 665 1107T760 1065L887 1194L1036 1051L907 922Q932 880 946 829T961 723Q961 667 947
-618T907 524L1032 399L887 254L760 379Q716 356 667 342T563 328Q507 328 458 340T365 379L240 256L94 401L221 526Q168 617 168 723ZM375 723Q375 684 390 650T430 590T490 550T563 535Q603 535 638 549T699 589T741 649T756 723Q756 763 741 797T700 857T638
-898T563 913Q524 913 490 898T431 858T390 798T375 723Z" />
-<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="1128" d="M565 860L809 1462H1122L760 715H954V537H709V399H954V221H709V0H422V221H174V399H422V537H174V715H365L8 1462H324L565 860Z" />
-<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="1128" d="M455 1550H674V735H455V1550ZM455 350H674V-465H455V350Z" />
-<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="995" d="M121 805Q121 849 131 886T160 955T203 1012T254 1055Q191 1095 156 1154T121 1288Q121 1353 150 1406T232 1498T360 1556T526 1577Q628 1577 716 1554T889 1493L807 1303Q739 1335 669 1360T520
-1386Q439 1386 402 1363T365 1292Q365 1267 377 1246T415 1206T481 1167T578 1124Q649 1096 707 1062T807 987T872 895T895 782Q895 682 861 621T770 522Q832 482 863 430T895 303Q895 229 864 170T776 68T638 3T455 -20Q345 -20 261 0T106 59V266Q145 246 190
-229T281 198T371 176T455 168Q511 168 548 177T607 202T639 239T649 285Q649 310 642 329T612 368T549 408T442 457Q366 489 306 521T205 593T143 685T121 805ZM344 827Q344 764 400 716T575 616L590 610Q605 621 619 635T644 668T661 708T668 756Q668 788 658
-815T621 867T550 917T434 967Q416 960 400 947T372 915T352 875T344 827Z" />
-<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="1182" d="M248 1405Q248 1440 259 1465T288 1507T332 1532T387 1540Q416 1540 441 1532T486 1508T516 1466T528 1405Q528 1371 517 1346T486 1305T442 1280T387 1272Q358 1272 333 1280T289 1304T259
-1346T248 1405ZM651 1405Q651 1440 662 1465T692 1507T737 1532T793 1540Q821 1540 846 1532T891 1508T922 1466T934 1405Q934 1371 923 1346T892 1305T847 1280T793 1272Q733 1272 692 1305T651 1405Z" />
-<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="1704" d="M895 1010Q798 1010 745 936T692 731Q692 596 740 524T895 451Q952 451 1018 466T1141 510V319Q1084 292 1025 277T889 262Q782 262 702 296T569 392T488 540T461 733Q461 836 487 921T565
-1068T697 1164T881 1198Q964 1198 1041 1176T1186 1120L1112 952Q999 1010 895 1010ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231 1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384
-200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320 199T203 351T127 531T100 731ZM242 731Q242 604 290 493T420 300T614 169T852 121Q979 121 1090 169T1283 299T1414 493T1462 731Q1462 858 1414 969T1284 1162T1090 1293T852 1341Q725 1341 614 1293T421
-1163T290 969T242 731Z" />
-<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="743" d="M520 764L489 874Q449 816 393 784T268 752Q218 752 178 765T108 806T63 876T47 975Q47 1035 68 1076T130 1144T230 1184T365 1202L455 1206Q455 1269 426 1296T342 1323Q302 1323 253
-1306T152 1262L86 1397Q148 1429 222 1454T387 1479Q455 1479 505 1460T589 1405T638 1319T655 1206V764H520ZM373 1081Q335 1078 312 1068T275 1044T257 1012T252 977Q252 939 271 921T317 903Q349 903 374 914T418 944T445 991T455 1051V1087L373 1081Z" />
-<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="1198" d="M82 573L391 1028L610 909L393 561L610 213L391 94L82 547V573ZM588 573L897 1028L1116 909L899 561L1116 213L897 94L588 547V573Z" />
-<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="1128" d="M1040 248H821V612H88V831H1040V248Z" />
-<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="659" d="M61 424V674H598V424H61Z" />
-<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="1704" d="M1157 905Q1157 811 1119 756T1014 672L1251 272H997L819 610H772V272H543V1188H807Q989 1188 1073 1118T1157 905ZM772 778H803Q869 778 897 806T926 901Q926 936 919 959T896 995T857
-1014T801 1020H772V778ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231 1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384 200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320
-199T203 351T127 531T100 731ZM242 731Q242 604 290 493T420 300T614 169T852 121Q979 121 1090 169T1283 299T1414 493T1462 731Q1462 858 1414 969T1284 1162T1090 1293T852 1341Q725 1341 614 1293T421 1163T290 969T242 731Z" />
-<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1757H1030V1556Z" />
-<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="877" d="M92 1137Q92 1208 119 1271T193 1381T303 1455T438 1483Q510 1483 573 1456T683 1381T757 1271T784 1137Q784 1065 757 1002T684 893T574 820T438 793Q366 793 303 819T193 892T119 1002T92
-1137ZM283 1137Q283 1106 295 1078T328 1029T377 996T438 983Q470 983 498 995T548 1029T581 1078T594 1137Q594 1169 582 1197T548 1247T499 1281T438 1294Q406 1294 378 1282T328 1248T295 1198T283 1137Z" />
-<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="1128" d="M455 674H88V893H455V1262H674V893H1040V674H674V309H455V674ZM88 0V219H1040V0H88Z" />
-<glyph unicode="&#xb2;" glyph-name="twosuperior" horiz-adv-x="776" d="M702 586H55V754L279 973Q325 1018 355 1051T404 1111T430 1161T438 1212Q438 1250 414 1270T350 1290Q310 1290 267 1270T170 1202L47 1354Q112 1411 193 1447T383 1483Q449 1483 503
-1467T596 1419T656 1341T678 1233Q678 1187 666 1147T626 1065T557 980T455 881L350 786H702V586Z" />
-<glyph unicode="&#xb3;" glyph-name="threesuperior" horiz-adv-x="776" d="M666 1249Q666 1180 626 1130T496 1051V1038Q547 1028 584 1007T645 959T682 898T694 829Q694 708 606 639T332 569Q256 569 190 586T59 639V829Q125 789 191 764T330 739Q404 739 438
-766T473 846Q473 867 465 886T438 919T387 943T307 952H195V1112H287Q339 1112 371 1121T421 1145T445 1180T451 1221Q451 1259 426 1284T350 1309Q303 1309 261 1290T162 1231L61 1372Q123 1419 198 1450T377 1481Q439 1481 492 1465T583 1418T644 1345T666 1249Z"
-/>
-<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="1182" d="M332 1241V1268Q353 1297 377 1335T424 1413T469 1494T506 1569H848V1548Q837 1530 816 1506T768 1453T710 1396T648 1338T587 1285T535 1241H332Z" />
-<glyph unicode="&#xb5;" glyph-name="mu" horiz-adv-x="1290" d="M465 465Q465 344 502 284T621 223Q679 223 718 247T781 318T815 434T825 592V1118H1130V0H897L854 150H842Q807 65 755 23T627 -20Q573 -20 528 3T455 70Q457 28 460 -15Q462 -52 463 -94T465
--172V-492H160V1118H465V465Z" />
-<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="1341" d="M1167 -260H1006V1356H840V-260H678V559Q617 541 532 541Q437 541 360 566T228 651T143 806T113 1042Q113 1189 145 1287T237 1446T380 1531T563 1556H1167V-260Z" />
-<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="584" d="M117 723Q117 770 130 802T168 855T224 884T293 893Q328 893 359 884T415 855T453 803T467 723Q467 678 453 646T415 593T360 563T293 553Q256 553 224 562T168 592T131 645T117 723Z" />
-<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="420" d="M418 -250Q418 -307 403 -352T351 -428T256 -475T109 -492Q64 -492 28 -486T-37 -471V-303Q-22 -307 -4 -310T34 -317T72 -322T106 -324Q135 -324 156 -311T178 -262Q178 -225 141 -197T12
--154L90 0H283L256 -61Q287 -71 316 -88T367 -128T404 -182T418 -250Z" />
-<glyph unicode="&#xb9;" glyph-name="onesuperior" horiz-adv-x="776" d="M584 586H346V1032Q346 1052 346 1082T348 1144T351 1201T354 1239Q348 1231 339 1221T319 1199T298 1178T279 1161L201 1100L92 1227L393 1462H584V586Z" />
-<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="754" d="M696 1116Q696 1029 674 962T609 848T508 777T375 752Q306 752 248 776T147 847T81 961T57 1116Q57 1203 79 1270T143 1384T244 1455T379 1479Q447 1479 504 1455T605 1385T672 1271T696
-1116ZM260 1116Q260 1016 287 966T377 915Q437 915 464 965T492 1116Q492 1216 465 1265T377 1315Q315 1315 288 1266T260 1116Z" />
-<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="1198" d="M1118 547L809 94L590 213L807 561L590 909L809 1028L1118 573V547ZM612 547L303 94L84 213L301 561L84 909L303 1028L612 573V547Z" />
-<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="1804" d="M1370 1462L559 0H320L1131 1462H1370ZM794 586H556V1032Q556 1052 556 1082T558 1144T561 1201T564 1239Q558 1231 549 1221T529 1199T508 1178T489 1161L411 1100L302 1227L603 1462H794V586ZM1682
-152H1557V1H1319V152H936V306L1321 883H1557V320H1682V152ZM1319 320V484Q1319 526 1320 572T1325 668Q1320 655 1311 634T1290 590T1268 546T1248 511L1121 320H1319Z" />
-<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="1804" d="M1370 1462L559 0H320L1131 1462H1370ZM794 586H556V1032Q556 1052 556 1082T558 1144T561 1201T564 1239Q558 1231 549 1221T529 1199T508 1178T489 1161L411 1100L302 1227L603 1462H794V586ZM1716
-1H1069V169L1293 388Q1339 433 1369 466T1418 526T1444 576T1452 627Q1452 665 1428 685T1364 705Q1324 705 1281 685T1184 617L1061 769Q1126 826 1207 862T1397 898Q1463 898 1517 882T1610 834T1670 756T1692 648Q1692 602 1680 562T1640 480T1571 395T1469
-296L1364 201H1716V1Z" />
-<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="1804" d="M1441 1462L630 0H391L1202 1462H1441ZM1712 152H1587V1H1349V152H966V306L1351 883H1587V320H1712V152ZM1349 320V484Q1349 526 1350 572T1355 668Q1350 655 1341 634T1320 590T1298
-546T1278 511L1151 320H1349ZM697 1249Q697 1180 657 1130T527 1051V1038Q578 1028 615 1007T676 959T713 898T725 829Q725 708 637 639T363 569Q287 569 221 586T90 639V829Q156 789 222 764T361 739Q435 739 469 766T504 846Q504 867 496 886T469 919T418 943T338
-952H226V1112H318Q370 1112 402 1121T452 1145T476 1180T482 1221Q482 1259 457 1284T381 1309Q334 1309 292 1290T193 1231L92 1372Q154 1419 229 1450T408 1481Q470 1481 523 1465T614 1418T675 1345T697 1249Z" />
-<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="940" d="M686 606V532Q686 481 676 440T644 361T588 288T506 215Q464 182 435 156T388 105T362 51T354 -14Q354 -71 393 -108T510 -145Q579 -145 659 -116T823 -45L926 -266Q883 -292 832 -314T727
--354T616 -381T506 -391Q404 -391 323 -367T184 -296T97 -182T66 -29Q66 34 79 83T121 175T190 258T287 342Q328 375 354 399T396 446T416 492T422 547V606H686ZM719 948Q719 901 706 869T668 816T612 787T543 778Q508 778 477 787T421 816T383 868T369 948Q369
-993 383 1025T421 1078T476 1108T543 1118Q580 1118 612 1109T668 1079T705 1026T719 948Z" />
-<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
-608H846ZM632 1579Q598 1607 551 1648T457 1734T373 1818T319 1886V1907H661Q677 1873 698 1833T743 1752T790 1673T835 1606V1579H632Z" />
-<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
-608H846ZM494 1579V1606Q515 1635 539 1673T586 1751T631 1832T668 1907H1010V1886Q999 1868 978 1844T930 1791T872 1734T810 1676T749 1623T697 1579H494Z" />
-<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582
-928L489 608H846ZM879 1579Q828 1613 773 1656T666 1755Q612 1699 560 1656T457 1579H254V1606Q280 1635 311 1673T375 1751T438 1832T490 1907H846Q867 1873 897 1833T959 1752T1024 1673T1082 1606V1579H879Z" />
-<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
-608H846ZM504 1684Q473 1684 455 1658T424 1577H275Q281 1657 301 1715T353 1811T430 1867T527 1886Q568 1886 607 1870T684 1835T760 1799T834 1782Q865 1782 883 1808T914 1888H1063Q1057 1809 1037 1751T983 1655T907 1598T811 1579Q771 1579 731 1595T653 1631T578
-1667T504 1684Z" />
-<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
-608H846ZM324 1743Q324 1778 335 1803T364 1845T408 1870T463 1878Q492 1878 517 1870T562 1846T592 1804T604 1743Q604 1709 593 1684T562 1643T518 1618T463 1610Q434 1610 409 1618T365 1642T335 1684T324 1743ZM727 1743Q727 1778 738 1803T768 1845T813 1870T869
-1878Q897 1878 922 1870T967 1846T998 1804T1010 1743Q1010 1709 999 1684T968 1643T923 1618T869 1610Q809 1610 768 1643T727 1743Z" />
-<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
-608H846ZM918 1567Q918 1511 899 1467T845 1391T764 1344T664 1327Q609 1327 563 1343T485 1390T434 1465T416 1565Q416 1620 434 1664T484 1738T563 1785T664 1802Q717 1802 763 1786T843 1739T898 1665T918 1567ZM760 1565Q760 1610 733 1635T664 1661Q622 1661
-595 1636T568 1565Q568 1520 592 1494T664 1468Q706 1468 733 1494T760 1565Z" />
-<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="1888" d="M1767 0H926V348H465L315 0H0L655 1462H1767V1208H1235V887H1731V633H1235V256H1767V0ZM578 608H926V1198H829L578 608Z" />
-<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="1305" d="M805 1225Q716 1225 648 1191T533 1092T462 935T438 727Q438 610 459 519T525 366T639 271T805 238Q894 238 983 258T1178 315V55Q1130 35 1083 21T987 -2T887 -15T776 -20Q607 -20 483 34T278
-186T158 422T119 729Q119 895 164 1033T296 1272T511 1427T805 1483Q914 1483 1023 1456T1233 1380L1133 1128Q1051 1167 968 1196T805 1225ZM926 -250Q926 -307 911 -352T859 -428T764 -475T617 -492Q572 -492 536 -486T471 -471V-303Q486 -307 504 -310T542 -317T580
--322T614 -324Q643 -324 664 -311T686 -262Q686 -225 649 -197T520 -154L598 0H791L764 -61Q795 -71 824 -88T875 -128T912 -182T926 -250Z" />
-<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM572 1579Q538 1607 491 1648T397 1734T313 1818T259 1886V1907H601Q617 1873 638 1833T683 1752T730 1673T775 1606V1579H572Z" />
-<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM424 1579V1606Q445 1635 469 1673T516 1751T561 1832T598 1907H940V1886Q929 1868 908 1844T860 1791T802 1734T740 1676T679
-1623T627 1579H424Z" />
-<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM832 1579Q781 1613 726 1656T619 1755Q565 1699 513 1656T410 1579H207V1606Q233 1635 264 1673T328 1751T391 1832T443
-1907H799Q820 1873 850 1833T912 1752T977 1673T1035 1606V1579H832Z" />
-<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM273 1743Q273 1778 284 1803T313 1845T357 1870T412 1878Q441 1878 466 1870T511 1846T541 1804T553 1743Q553 1709 542 1684T511
-1643T467 1618T412 1610Q383 1610 358 1618T314 1642T284 1684T273 1743ZM676 1743Q676 1778 687 1803T717 1845T762 1870T818 1878Q846 1878 871 1870T916 1846T947 1804T959 1743Q959 1709 948 1684T917 1643T872 1618T818 1610Q758 1610 717 1643T676 1743Z"
-/>
-<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM355 1579Q321 1607 274 1648T180 1734T96 1818T42 1886V1907H384Q400 1873 421 1833T466 1752T513 1673T558 1606V1579H355Z"
-/>
-<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM237 1579V1606Q258 1635 282 1673T329 1751T374 1832T411 1907H753V1886Q742 1868 721 1844T673 1791T615 1734T553
-1676T492 1623T440 1579H237Z" />
-<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM609 1579Q558 1613 503 1656T396 1755Q342 1699 290 1656T187 1579H-16V1606Q10 1635 41 1673T105 1751T168
-1832T220 1907H576Q597 1873 627 1833T689 1752T754 1673T812 1606V1579H609Z" />
-<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM54 1743Q54 1778 65 1803T94 1845T138 1870T193 1878Q222 1878 247 1870T292 1846T322 1804T334 1743Q334 1709
-323 1684T292 1643T248 1618T193 1610Q164 1610 139 1618T95 1642T65 1684T54 1743ZM457 1743Q457 1778 468 1803T498 1845T543 1870T599 1878Q627 1878 652 1870T697 1846T728 1804T740 1743Q740 1709 729 1684T698 1643T653 1618T599 1610Q539 1610 498 1643T457
-1743Z" />
-<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="1434" d="M47 850H184V1462H612Q773 1462 902 1416T1124 1280T1265 1055T1315 745Q1315 560 1265 421T1119 188T885 47T569 0H184V596H47V850ZM1001 737Q1001 859 977 947T906 1094T792 1180T637 1208H494V850H731V596H494V256H608Q804
-256 902 376T1001 737Z" />
-<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="1604" d="M1419 0H1026L451 1106H442Q448 1029 452 953Q456 888 458 817T461 688V0H184V1462H575L1149 367H1155Q1152 443 1148 517Q1147 549 1146 582T1143 649T1142 714T1141 770V1462H1419V0ZM623
-1684Q592 1684 574 1658T543 1577H394Q400 1657 420 1715T472 1811T549 1867T646 1886Q687 1886 726 1870T803 1835T879 1799T953 1782Q984 1782 1002 1808T1033 1888H1182Q1176 1809 1156 1751T1102 1655T1026 1598T930 1579Q890 1579 850 1595T772 1631T697 1667T623
-1684Z" />
-<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
-733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM729 1579Q695 1607 648 1648T554 1734T470 1818T416 1886V1907H758Q774
-1873 795 1833T840 1752T887 1673T932 1606V1579H729Z" />
-<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
-733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM590 1579V1606Q611 1635 635 1673T682 1751T727 1832T764 1907H1106V1886Q1095
-1868 1074 1844T1026 1791T968 1734T906 1676T845 1623T793 1579H590Z" />
-<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390
-1043T1430 733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM975 1579Q924 1613 869 1656T762 1755Q708 1699
-656 1656T553 1579H350V1606Q376 1635 407 1673T471 1751T534 1832T586 1907H942Q963 1873 993 1833T1055 1752T1120 1673T1178 1606V1579H975Z" />
-<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
-733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM612 1684Q581 1684 563 1658T532 1577H383Q389 1657 409 1715T461
-1811T538 1867T635 1886Q676 1886 715 1870T792 1835T868 1799T942 1782Q973 1782 991 1808T1022 1888H1171Q1165 1809 1145 1751T1091 1655T1015 1598T919 1579Q879 1579 839 1595T761 1631T686 1667T612 1684Z" />
-<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
-733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM428 1743Q428 1778 439 1803T468 1845T512 1870T567 1878Q596
-1878 621 1870T666 1846T696 1804T708 1743Q708 1709 697 1684T666 1643T622 1618T567 1610Q538 1610 513 1618T469 1642T439 1684T428 1743ZM831 1743Q831 1778 842 1803T872 1845T917 1870T973 1878Q1001 1878 1026 1870T1071 1846T1102 1804T1114 1743Q1114
-1709 1103 1684T1072 1643T1027 1618T973 1610Q913 1610 872 1643T831 1743Z" />
-<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="1128" d="M408 723L109 1024L260 1178L561 879L866 1178L1020 1028L715 723L1016 420L866 268L561 569L260 270L111 422L408 723Z" />
-<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q595 -20 467 41L395 -76L227 18L309 152Q212 252 166 400T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q867 1485 944 1469T1087
-1421L1157 1532L1323 1436L1243 1307Q1337 1208 1383 1063T1430 733ZM438 733Q438 553 485 438L942 1184Q873 1227 776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM1110 733Q1110 904 1067 1020L612 279Q646 260 686 250T774 240Q863 240 926 274T1030
-371T1090 526T1110 733Z" />
-<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM706
-1579Q672 1607 625 1648T531 1734T447 1818T393 1886V1907H735Q751 1873 772 1833T817 1752T864 1673T909 1606V1579H706Z" />
-<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM570
-1579V1606Q591 1635 615 1673T662 1751T707 1832T744 1907H1086V1886Q1075 1868 1054 1844T1006 1791T948 1734T886 1676T825 1623T773 1579H570Z" />
-<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM942
-1579Q891 1613 836 1656T729 1755Q675 1699 623 1656T520 1579H317V1606Q343 1635 374 1673T438 1751T501 1832T553 1907H909Q930 1873 960 1833T1022 1752T1087 1673T1145 1606V1579H942Z" />
-<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM393
-1743Q393 1778 404 1803T433 1845T477 1870T532 1878Q561 1878 586 1870T631 1846T661 1804T673 1743Q673 1709 662 1684T631 1643T587 1618T532 1610Q503 1610 478 1618T434 1642T404 1684T393 1743ZM796 1743Q796 1778 807 1803T837 1845T882 1870T938 1878Q966
-1878 991 1870T1036 1846T1067 1804T1079 1743Q1079 1709 1068 1684T1037 1643T992 1618T938 1610Q878 1610 837 1643T796 1743Z" />
-<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="1196" d="M598 860L862 1462H1196L752 569V0H444V559L0 1462H336L598 860ZM422 1579V1606Q443 1635 467 1673T514 1751T559 1832T596 1907H938V1886Q927 1868 906 1844T858 1791T800 1734T738 1676T677
-1623T625 1579H422Z" />
-<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="1225" d="M1133 770Q1133 676 1108 590T1024 438T870 333T633 293H494V0H184V1462H494V1233H655Q779 1233 869 1200T1017 1107T1104 961T1133 770ZM494 543H578Q699 543 759 595T819 770Q819 878 766
-929T598 981H494V543Z" />
-<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="1395" d="M1188 1241Q1188 1177 1167 1129T1114 1042T1045 975T976 922T923 877T901 834Q901 814 913 797T952 760T1020 715T1118 651Q1167 620 1205 588T1269 517T1309 432T1323 326Q1323 154 1206
-67T862 -20Q764 -20 692 -6T559 43V285Q583 269 617 254T690 226T768 207T842 199Q922 199 966 229T1010 322Q1010 349 1003 370T976 412T918 457T821 516Q758 552 716 584T647 647T609 713T598 788Q598 841 618 880T670 950T737 1007T805 1059T856 1117T877 1188Q877
-1251 827 1290T680 1329Q572 1329 519 1281T465 1128V0H160V1139Q160 1248 197 1328T302 1462T467 1541T680 1567Q795 1567 889 1546T1049 1483T1152 1380T1188 1241Z" />
-<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
-1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM808 1241Q774 1269 727 1310T633 1396T549 1480T495 1548V1569H837Q853
-1535 874 1495T919 1414T966 1335T1011 1268V1241H808Z" />
-<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
-1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM441 1241V1268Q462 1297 486 1335T533 1413T578 1494T615
-1569H957V1548Q946 1530 925 1506T877 1453T819 1396T757 1338T696 1285T644 1241H441Z" />
-<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289
-838L190 1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM801 1496Q750 1530 695 1573T588 1672Q534 1616
-482 1573T379 1496H176V1523Q202 1552 233 1590T297 1668T360 1749T412 1824H768Q789 1790 819 1750T881 1669T946 1590T1004 1523V1496H801Z" />
-<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
-1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM681 1346Q650 1346 632 1320T601 1239H452Q458 1319 478
-1377T530 1473T607 1529T704 1548Q745 1548 784 1532T861 1497T937 1461T1011 1444Q1042 1444 1060 1470T1091 1550H1240Q1234 1471 1214 1413T1160 1317T1084 1260T988 1241Q948 1241 908 1257T830 1293T755 1329T681 1346Z" />
-<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289
-838L190 1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM254 1405Q254 1440 265 1465T294 1507T338 1532T393
-1540Q422 1540 447 1532T492 1508T522 1466T534 1405Q534 1371 523 1346T492 1305T448 1280T393 1272Q364 1272 339 1280T295 1304T265 1346T254 1405ZM657 1405Q657 1440 668 1465T698 1507T743 1532T799 1540Q827 1540 852 1532T897 1508T928 1466T940 1405Q940
-1371 929 1346T898 1305T853 1280T799 1272Q739 1272 698 1305T657 1405Z" />
-<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
-1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM842 1479Q842 1423 823 1379T769 1303T688 1256T588 1239Q533
-1239 487 1255T409 1302T358 1377T340 1477Q340 1532 358 1576T408 1650T487 1697T588 1714Q641 1714 687 1698T767 1651T822 1577T842 1479ZM684 1477Q684 1522 657 1547T588 1573Q546 1573 519 1548T492 1477Q492 1432 516 1406T588 1380Q630 1380 657 1406T684
-1477Z" />
-<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="1806" d="M1268 -20Q1137 -20 1030 30T854 186Q811 132 769 94T678 30T568 -8T424 -20Q356 -20 295 1T187 66T113 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427
-894T289 838L190 1040Q274 1087 376 1114T590 1141Q804 1141 913 1010Q1039 1139 1227 1139Q1338 1139 1427 1106T1579 1007T1674 848T1708 631V483H1026Q1028 419 1046 368T1098 281T1179 226T1288 207Q1382 207 1469 228T1645 295V59Q1605 38 1565 24T1479 -1T1382
--15T1268 -20ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM1229 922Q1147 922 1094 865T1032 686H1421Q1420 737 1408 780T1373 854T1313 904T1229 922Z" />
-<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="1022" d="M625 -20Q505 -20 409 13T244 115T139 293T102 553Q102 720 139 832T245 1013T410 1110T625 1139Q711 1139 796 1118T956 1059L868 827Q802 856 741 874T625 893Q514 893 464 809T414 555Q414
-387 464 307T621 227Q708 227 779 249T924 307V53Q887 35 852 21T782 -2T708 -15T625 -20ZM778 -250Q778 -307 763 -352T711 -428T616 -475T469 -492Q424 -492 388 -486T323 -471V-303Q338 -307 356 -310T394 -317T432 -322T466 -324Q495 -324 516 -311T538 -262Q538
--225 501 -197T372 -154L450 0H643L616 -61Q647 -71 676 -88T727 -128T764 -182T778 -250Z" />
-<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139
-810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM834 1241Q800 1269 753 1310T659 1396T575 1480T521 1548V1569H863Q879 1535 900
-1495T945 1414T992 1335T1037 1268V1241H834Z" />
-<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139
-810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM447 1241V1268Q468 1297 492 1335T539 1413T584 1494T621 1569H963V1548Q952 1530
-931 1506T883 1453T825 1396T763 1338T702 1285T650 1241H447Z" />
-<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721
-1139 810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM819 1241Q768 1275 713 1318T606 1417Q552 1361 500 1318T397 1241H194V1268Q220
-1297 251 1335T315 1413T378 1494T430 1569H786Q807 1535 837 1495T899 1414T964 1335T1022 1268V1241H819Z" />
-<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139
-810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM266 1405Q266 1440 277 1465T306 1507T350 1532T405 1540Q434 1540 459 1532T504
-1508T534 1466T546 1405Q546 1371 535 1346T504 1305T460 1280T405 1272Q376 1272 351 1280T307 1304T277 1346T266 1405ZM669 1405Q669 1440 680 1465T710 1507T755 1532T811 1540Q839 1540 864 1532T909 1508T940 1466T952 1405Q952 1371 941 1346T910 1305T865
-1280T811 1272Q751 1272 710 1305T669 1405Z" />
-<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM269 1241Q235 1269 188 1310T94 1396T10 1480T-44 1548V1569H298Q314 1535 335 1495T380 1414T427 1335T472 1268V1241H269Z" />
-<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM145 1241V1268Q166 1297 190 1335T237 1413T282 1494T319 1569H661V1548Q650 1530 629 1506T581 1453T523 1396T461 1338T400 1285T348 1241H145Z" />
-<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM521 1241Q470 1275 415 1318T308 1417Q254 1361 202 1318T99 1241H-104V1268Q-78 1297 -47 1335T17 1413T80 1494T132 1569H488Q509 1535 539 1495T601 1414T666
-1335T724 1268V1241H521Z" />
-<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM-32 1405Q-32 1440 -21 1465T8 1507T52 1532T107 1540Q136 1540 161 1532T206 1508T236 1466T248 1405Q248 1371 237 1346T206 1305T162 1280T107 1272Q78 1272 53
-1280T9 1304T-21 1346T-32 1405ZM371 1405Q371 1440 382 1465T412 1507T457 1532T513 1540Q541 1540 566 1532T611 1508T642 1466T654 1405Q654 1371 643 1346T612 1305T567 1280T513 1272Q453 1272 412 1305T371 1405Z" />
-<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="1182" d="M457 1309Q423 1330 384 1354T303 1401L399 1571Q472 1537 536 1503T657 1430L883 1569L983 1415L809 1309Q881 1240 935 1162T1024 993T1078 798T1096 573Q1096 431 1060 321T957 135T795 20T582
--20Q471 -20 378 14T218 113T112 272T74 489Q74 611 106 705T197 863T337 961T516 995Q612 995 680 964T780 883L801 885Q773 973 723 1050T606 1184L375 1040L274 1196L457 1309ZM784 532Q784 579 773 622T737 698T675 750T586 770Q478 770 432 700T385 487Q385
-424 396 372T432 283T495 226T586 205Q692 205 738 286T784 532Z" />
-<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="1284" d="M1130 0H825V653Q825 774 789 834T672 895Q612 895 572 871T509 800T475 684T465 526V0H160V1118H393L434 975H451Q475 1018 509 1049T585 1100T672 1129T766 1139Q848 1139 915 1116T1030
-1042T1104 915T1130 729V0ZM477 1346Q446 1346 428 1320T397 1239H248Q254 1319 274 1377T326 1473T403 1529T500 1548Q541 1548 580 1532T657 1497T733 1461T807 1444Q838 1444 856 1470T887 1550H1036Q1030 1471 1010 1413T956 1317T880 1260T784 1241Q744 1241
-704 1257T626 1293T551 1329T477 1346Z" />
-<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
-131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM841 1241Q807 1269 760 1310T666 1396T582 1480T528 1548V1569H870Q886 1535 907 1495T952 1414T999 1335T1044 1268V1241H841Z" />
-<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
-131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM434 1241V1268Q455 1297 479 1335T526 1413T571 1494T608 1569H950V1548Q939 1530 918 1506T870 1453T812 1396T750 1338T689 1285T637 1241H434Z"
-/>
-<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
-131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM821 1241Q770 1275 715 1318T608 1417Q554 1361 502 1318T399 1241H196V1268Q222 1297 253 1335T317 1413T380 1494T432 1569H788Q809 1535 839
-1495T901 1414T966 1335T1024 1268V1241H821Z" />
-<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
-131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM444 1346Q413 1346 395 1320T364 1239H215Q221 1319 241 1377T293 1473T370 1529T467 1548Q508 1548 547 1532T624 1497T700 1461T774 1444Q805
-1444 823 1470T854 1550H1003Q997 1471 977 1413T923 1317T847 1260T751 1241Q711 1241 671 1257T593 1293T518 1329T444 1346Z" />
-<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
-131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM266 1405Q266 1440 277 1465T306 1507T350 1532T405 1540Q434 1540 459 1532T504 1508T534 1466T546 1405Q546 1371 535 1346T504 1305T460 1280T405
-1272Q376 1272 351 1280T307 1304T277 1346T266 1405ZM669 1405Q669 1440 680 1465T710 1507T755 1532T811 1540Q839 1540 864 1532T909 1508T940 1466T952 1405Q952 1371 941 1346T910 1305T865 1280T811 1272Q751 1272 710 1305T669 1405Z" />
-<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="1128" d="M88 612V831H1040V612H88ZM424 373Q424 415 435 444T465 490T509 516T563 524Q591 524 616 516T660 491T690 444T702 373Q702 333 691 304T660 257T616 230T563 221Q535 221 510 229T465 256T435
-304T424 373ZM424 1071Q424 1113 435 1142T465 1189T509 1215T563 1223Q591 1223 616 1215T660 1189T690 1142T702 1071Q702 1031 691 1003T660 956T616 929T563 920Q535 920 510 928T465 955T435 1002T424 1071Z" />
-<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="1227" d="M1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q553 -20 501 -10T401 18L344 -76L182 14L250 125Q181 199 142 308T102 561Q102 700 137 808T239 989T401 1101T616 1139Q678 1139 735
-1126T844 1090L893 1169L1053 1073L991 975Q1054 903 1089 799T1124 561ZM414 561Q414 475 426 410L709 868Q669 893 612 893Q507 893 461 811T414 561ZM813 561Q813 625 807 674L539 240Q556 232 574 229T614 225Q719 225 766 310T813 561Z" />
-<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM839
-1241Q805 1269 758 1310T664 1396T580 1480T526 1548V1569H868Q884 1535 905 1495T950 1414T997 1335T1042 1268V1241H839Z" />
-<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM461
-1241V1268Q482 1297 506 1335T553 1413T598 1494T635 1569H977V1548Q966 1530 945 1506T897 1453T839 1396T777 1338T716 1285T664 1241H461Z" />
-<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM842
-1241Q791 1275 736 1318T629 1417Q575 1361 523 1318T420 1241H217V1268Q243 1297 274 1335T338 1413T401 1494T453 1569H809Q830 1535 860 1495T922 1414T987 1335T1045 1268V1241H842Z" />
-<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM295
-1405Q295 1440 306 1465T335 1507T379 1532T434 1540Q463 1540 488 1532T533 1508T563 1466T575 1405Q575 1371 564 1346T533 1305T489 1280T434 1272Q405 1272 380 1280T336 1304T306 1346T295 1405ZM698 1405Q698 1440 709 1465T739 1507T784 1532T840 1540Q868
-1540 893 1532T938 1508T969 1466T981 1405Q981 1371 970 1346T939 1305T894 1280T840 1272Q780 1272 739 1305T698 1405Z" />
-<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="1104" d="M0 1118H334L514 489Q530 437 537 378T547 272H553Q555 295 558 323T567 380T578 437T592 489L768 1118H1104L662 -143Q600 -320 493 -406T225 -492Q173 -492 135 -487T70 -475V-233Q91 -238
-123 -242T190 -246Q238 -246 272 -233T330 -197T372 -140T403 -66L422 -10L0 1118ZM393 1241V1268Q414 1297 438 1335T485 1413T530 1494T567 1569H909V1548Q898 1530 877 1506T829 1453T771 1396T709 1338T648 1285T596 1241H393Z" />
-<glyph unicode="&#xfe;" glyph-name="thorn" horiz-adv-x="1245" d="M465 973Q485 1008 512 1038T576 1090T656 1126T756 1139Q842 1139 913 1102T1035 992T1114 811T1143 561Q1143 418 1115 310T1036 128T914 17T756 -20Q701 -20 656 -10T576 20T513 64T465 117H451Q454
-85 458 55Q461 29 463 3T465 -39V-492H160V1556H465V1165Q465 1141 463 1108T458 1045Q454 1010 451 973H465ZM653 895Q602 895 567 877T509 821T477 728T465 596V563Q465 482 474 419T506 314T564 249T655 227Q746 227 788 313T831 565Q831 730 789 812T653 895Z"
-/>
-<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="1104" d="M0 1118H334L514 489Q530 437 537 378T547 272H553Q555 295 558 323T567 380T578 437T592 489L768 1118H1104L662 -143Q600 -320 493 -406T225 -492Q173 -492 135 -487T70 -475V-233Q91
--238 123 -242T190 -246Q238 -246 272 -233T330 -197T372 -140T403 -66L422 -10L0 1118ZM466 1405Q466 1440 477 1465T506 1507T550 1532T605 1540Q634 1540 659 1532T704 1508T734 1466T746 1405Q746 1371 735 1346T704 1305T660 1280T605 1272Q576 1272 551 1280T507
-1304T477 1346T466 1405ZM869 1405Q869 1440 880 1465T910 1507T955 1532T1011 1540Q1039 1540 1064 1532T1109 1508T1140 1466T1152 1405Q1152 1371 1141 1346T1110 1305T1065 1280T1011 1272Q951 1272 910 1305T869 1405Z" />
-<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="1024" d="M82 436V666H942V436H82Z" />
-<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="2048" d="M82 436V666H1966V436H82Z" />
-<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="440" d="M37 961L23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H418Q403 1401 389 1335T361 1204T336 1076T317 961H37Z" />
-<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="440" d="M403 1462L418 1440Q404 1385 385 1325T342 1202T293 1078T242 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H403Z" />
-<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="594" d="M459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444L459 215Z" />
-<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="907" d="M489 983Q503 1037 523 1098T566 1221T615 1344T666 1462H885Q870 1401 856 1335T828 1204T803 1076T784 961H504L489 983ZM23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H418Q403
-1401 389 1335T361 1204T336 1076T317 961H37L23 983Z" />
-<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="907" d="M418 1440Q404 1385 385 1325T342 1202T293 1078T242 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H403L418 1440ZM885 1440Q871 1385 852 1325T809 1202T760 1078T709 961H489Q504
-1021 518 1087T546 1219T571 1347T590 1462H870L885 1440Z" />
-<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="1061" d="M459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444L459 215ZM926 215Q912 161 893 100T850 -23T801 -146T750 -264H530Q545 -203
-559 -137T587 -6T612 122T631 238H911L926 215Z" />
-<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="770" d="M98 748Q98 834 120 894T180 992T271 1047T385 1065Q444 1065 496 1048T588 992T649 894T672 748Q672 663 650 603T588 505T497 448T385 430Q324 430 272 448T181 504T120 603T98 748Z" />
-<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="692" d="M82 573L391 1028L610 909L393 561L610 213L391 94L82 547V573Z" />
-<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="692" d="M610 547L301 94L82 213L299 561L82 909L301 1028L610 573V547Z" />
-</font>
-</defs>
-</svg>
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.ttf b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
deleted file mode 100644
index 15896c441fd59..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.ttf and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff
deleted file mode 100644
index 67e3e25f8362c..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
deleted file mode 100644
index 1e726a7cfce41..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.eot b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
deleted file mode 100644
index ac2698e85aee5..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.eot and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.svg b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
deleted file mode 100644
index d9f2a214f9629..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
+++ /dev/null
@@ -1,403 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs >
-<font id="DroidSans" horiz-adv-x="1062" ><font-face
-    font-family="Droid Sans"
-    units-per-em="2048"
-    panose-1="2 11 6 6 3 8 4 2 2 4"
-    ascent="1907"
-    descent="-492"
-    alphabetic="0" />
-<glyph unicode=" " glyph-name="space" horiz-adv-x="532" />
-<glyph unicode="!" glyph-name="exclam" horiz-adv-x="551" d="M336 414H215L164 1462H387L336 414ZM147 111Q147 149 157 175T184 218T224 242T274 250Q300 250 323 243T364 219T391 176T401 111Q401 74 391 48T364 4T324 -21T274 -29Q247 -29 224 -21T184 4T157
-47T147 111Z" />
-<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="823" d="M330 1462L289 934H174L133 1462H330ZM690 1462L649 934H535L494 1462H690Z" />
-<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M983 893L920 565H1200V428H893L811 0H664L748 428H457L375 0H231L309 428H51V565H336L401 893H127V1030H426L508 1462H655L573 1030H866L950 1462H1094L1010 1030H1272V893H983ZM483 565H774L838
-893H547L483 565Z" />
-<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1128" d="M985 446Q985 376 960 319T889 220T776 151T625 111V-119H487V102Q437 102 386 106T287 120T197 142T123 172V344Q156 328 199 312T291 282T389 261T487 252V686Q398 716 333 749T224 824T160 922T139
-1051Q139 1118 163 1173T233 1270T343 1338T487 1374V1554H625V1378Q725 1373 809 1352T961 1300L895 1155Q839 1180 769 1200T625 1227V805Q713 774 780 741T893 667T962 572T985 446ZM809 446Q809 479 799 506T768 556T711 598T625 635V262Q718 276 763 325T809
-446ZM315 1049Q315 1013 323 985T352 933T405 890T487 854V1223Q398 1207 357 1163T315 1049Z" />
-<glyph unicode="%" glyph-name="percent" horiz-adv-x="1690" d="M250 1026Q250 861 285 779T401 696Q557 696 557 1026Q557 1354 401 1354Q321 1354 286 1273T250 1026ZM705 1026Q705 918 687 832T632 687T538 597T401 565Q328 565 272 596T178 687T121 832T102
-1026Q102 1134 119 1219T173 1362T266 1452T401 1483Q476 1483 532 1452T627 1363T685 1219T705 1026ZM1133 440Q1133 275 1168 193T1284 111Q1440 111 1440 440Q1440 768 1284 768Q1204 768 1169 687T1133 440ZM1587 440Q1587 332 1570 247T1515 102T1421 12T1284
--20Q1210 -20 1154 11T1061 102T1004 246T985 440Q985 548 1002 633T1056 776T1149 866T1284 897Q1359 897 1415 866T1510 777T1567 633T1587 440ZM1331 1462L520 0H362L1174 1462H1331Z" />
-<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="1438" d="M422 1165Q422 1131 430 1099T454 1034T497 968T559 897Q618 932 661 963T732 1026T774 1093T788 1169Q788 1205 776 1235T740 1288T683 1322T608 1335Q522 1335 472 1291T422 1165ZM557
-141Q615 141 664 152T755 184T833 231T901 289L514 696Q462 663 422 632T355 564T313 486T299 387Q299 333 316 288T367 210T448 159T557 141ZM109 381Q109 459 129 520T187 631T281 724T408 809Q377 845 347 883T295 965T258 1058T244 1165Q244 1240 269 1299T341
-1400T457 1463T614 1485Q697 1485 762 1464T873 1401T943 1300T967 1165Q967 1101 942 1047T875 946T779 860T664 784L1016 412Q1043 441 1064 471T1103 535T1133 608T1157 694H1341Q1326 628 1306 573T1259 468T1200 377T1128 293L1405 0H1180L1012 172Q963 127
-915 92T813 32T697 -6T557 -20Q452 -20 369 6T228 84T140 210T109 381Z" />
-<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="463" d="M330 1462L289 934H174L133 1462H330Z" />
-<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="616" d="M82 561Q82 686 100 807T155 1043T248 1263T383 1462H555Q415 1269 343 1038T270 563Q270 444 288 326T342 95T431 -124T553 -324H383Q305 -234 249 -131T155 84T100 317T82 561Z" />
-<glyph unicode=")" glyph-name="parenright" horiz-adv-x="616" d="M535 561Q535 437 517 317T462 85T368 -131T233 -324H63Q132 -230 185 -124T274 95T328 326T346 563Q346 807 274 1038T61 1462H233Q311 1369 367 1264T461 1044T517 808T535 561Z" />
-<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1128" d="M664 1556L621 1163L1018 1274L1044 1081L666 1053L911 727L733 631L557 989L399 631L215 727L457 1053L82 1081L111 1274L502 1163L459 1556H664Z" />
-<glyph unicode="+" glyph-name="plus" horiz-adv-x="1128" d="M489 647H102V797H489V1186H639V797H1026V647H639V262H489V647Z" />
-<glyph unicode="," glyph-name="comma" horiz-adv-x="512" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362Z" />
-<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M82 465V633H578V465H82Z" />
-<glyph unicode="." glyph-name="period" horiz-adv-x="549" d="M147 111Q147 149 157 175T184 218T224 242T274 250Q300 250 323 243T364 219T391 176T401 111Q401 74 391 48T364 4T324 -21T274 -29Q247 -29 224 -21T184 4T157 47T147 111Z" />
-<glyph unicode="/" glyph-name="slash" horiz-adv-x="764" d="M743 1462L199 0H20L565 1462H743Z" />
-<glyph unicode="0" glyph-name="zero" horiz-adv-x="1128" d="M1032 733Q1032 556 1007 416T925 179T779 31T563 -20Q445 -20 358 31T213 179T127 416T98 733Q98 910 123 1050T204 1286T348 1434T563 1485Q682 1485 770 1435T916 1288T1003 1051T1032 733ZM283
-733Q283 583 298 471T346 285T432 173T563 135Q640 135 694 172T782 283T832 469T848 733Q848 883 833 995T783 1181T694 1292T563 1329Q486 1329 433 1292T346 1181T298 995T283 733Z" />
-<glyph unicode="1" glyph-name="one" horiz-adv-x="1128" d="M711 0H535V913Q535 956 535 1005T537 1102T540 1195T543 1274Q526 1256 513 1243T487 1218T458 1193T422 1161L274 1040L178 1163L561 1462H711V0Z" />
-<glyph unicode="2" glyph-name="two" horiz-adv-x="1128" d="M1008 0H96V156L446 537Q521 618 580 685T680 816T744 944T766 1085Q766 1144 749 1189T701 1265T626 1313T530 1329Q435 1329 359 1291T213 1192L111 1311Q151 1347 197 1378T296 1433T408 1469T532
-1483Q628 1483 705 1456T837 1379T920 1256T950 1092Q950 1007 924 930T851 779T740 629T600 473L319 174V166H1008V0Z" />
-<glyph unicode="3" glyph-name="three" horiz-adv-x="1128" d="M961 1120Q961 1047 938 987T874 883T774 811T645 770V764Q822 742 914 652T1006 416Q1006 320 974 240T875 102T708 12T469 -20Q360 -20 264 -3T82 59V229Q169 183 270 158T465 133Q557 133 624
-153T734 210T798 301T819 422Q819 490 793 538T717 618T598 665T438 680H305V831H438Q519 831 582 851T687 908T752 996T774 1108Q774 1160 756 1201T705 1270T626 1314T524 1329Q417 1329 336 1296T180 1208L88 1333Q126 1364 172 1391T274 1438T391 1471T524
-1483Q632 1483 713 1456T850 1381T933 1266T961 1120Z" />
-<glyph unicode="4" glyph-name="four" horiz-adv-x="1128" d="M1087 328H874V0H698V328H23V487L686 1470H874V494H1087V328ZM698 494V850Q698 906 699 967T703 1087T707 1197T711 1282H702Q695 1262 685 1238T662 1189T636 1141T612 1102L201 494H698Z" />
-<glyph unicode="5" glyph-name="five" horiz-adv-x="1128" d="M545 897Q644 897 729 870T878 788T978 654T1014 469Q1014 355 980 264T879 110T714 14T487 -20Q436 -20 387 -15T292 -1T205 24T131 59V231Q164 208 208 190T302 160T400 142T492 135Q571 135 633
-153T738 211T804 309T827 449Q827 592 739 667T483 743Q456 743 425 741T362 734T302 726T252 717L162 774L217 1462H907V1296H375L336 877Q368 883 420 890T545 897Z" />
-<glyph unicode="6" glyph-name="six" horiz-adv-x="1128" d="M113 625Q113 730 123 834T160 1033T233 1211T350 1353T520 1448T752 1483Q771 1483 794 1482T840 1479T885 1473T924 1464V1309Q889 1321 845 1327T758 1333Q668 1333 600 1312T481 1251T398 1158T343
-1039T312 899T299 745H311Q331 781 359 812T426 866T511 902T618 915Q713 915 790 886T921 799T1004 660T1034 471Q1034 357 1003 266T914 112T774 14T590 -20Q490 -20 403 19T251 138T150 339T113 625ZM588 133Q648 133 697 153T783 215T838 320T858 471Q858 541
-842 596T792 691T710 751T594 772Q527 772 472 749T377 688T317 602T295 506Q295 439 313 373T368 253T460 167T588 133Z" />
-<glyph unicode="7" glyph-name="seven" horiz-adv-x="1128" d="M281 0L844 1296H90V1462H1030V1317L475 0H281Z" />
-<glyph unicode="8" glyph-name="eight" horiz-adv-x="1128" d="M565 1485Q649 1485 723 1463T854 1397T944 1287T977 1133Q977 1066 957 1012T902 915T819 837T715 774Q773 743 828 705T927 620T997 513T1024 381Q1024 289 991 215T897 88T752 8T565 -20Q455 -20
-370 7T226 84T137 208T106 373Q106 448 128 508T189 616T279 701T389 766Q340 797 297 833T223 915T173 1014T154 1135Q154 1222 187 1287T278 1397T409 1463T565 1485ZM285 371Q285 318 301 274T351 198T437 149T561 131Q631 131 684 148T774 198T828 277T846
-379Q846 431 827 473T771 551T683 619T569 682L539 696Q413 636 349 559T285 371ZM563 1333Q457 1333 395 1280T332 1126Q332 1069 349 1028T398 955T472 898T567 848Q615 870 657 896T731 955T781 1030T799 1126Q799 1227 736 1280T563 1333Z" />
-<glyph unicode="9" glyph-name="nine" horiz-adv-x="1128" d="M1028 838Q1028 733 1018 629T981 429T908 252T791 109T621 15T389 -20Q370 -20 347 -19T301 -16T256 -10T217 -2V154Q252 141 296 135T383 129Q518 129 605 176T743 303T815 491T842 717H829Q809
-681 781 650T715 596T629 560T522 547Q427 547 350 576T219 663T136 802T106 991Q106 1105 137 1196T226 1351T366 1449T551 1483Q652 1483 739 1444T890 1325T991 1124T1028 838ZM553 1329Q493 1329 444 1309T358 1247T303 1142T283 991Q283 921 299 866T349 771T431
-711T547 690Q615 690 670 713T764 774T824 860T846 956Q846 1023 828 1089T773 1209T681 1296T553 1329Z" />
-<glyph unicode=":" glyph-name="colon" horiz-adv-x="549" d="M147 111Q147 149 157 175T184 218T224 242T274 250Q300 250 323 243T364 219T391 176T401 111Q401 74 391 48T364 4T324 -21T274 -29Q247 -29 224 -21T184 4T157 47T147 111ZM147 987Q147 1026 157
-1052T184 1095T224 1119T274 1126Q300 1126 323 1119T364 1096T391 1053T401 987Q401 950 391 924T364 881T324 856T274 848Q247 848 224 856T184 881T157 924T147 987Z" />
-<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="549" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362ZM147 987Q147 1026 157 1052T184 1095T224 1119T274 1126Q300 1126 323 1119T364
-1096T391 1053T401 987Q401 950 391 924T364 881T324 856T274 848Q247 848 224 856T184 881T157 924T147 987Z" />
-<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="1128" d="M1026 238L102 662V764L1026 1245V1085L291 721L1026 399V238Z" />
-<glyph unicode="=" glyph-name="equal" horiz-adv-x="1128" d="M102 852V1001H1026V852H102ZM102 442V592H1026V442H102Z" />
-<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="1128" d="M102 399L838 721L102 1085V1245L1026 764V662L102 238V399Z" />
-<glyph unicode="?" glyph-name="question" horiz-adv-x="872" d="M281 414V451Q281 508 288 554T315 640T368 718T451 799Q499 840 533 873T588 941T620 1015T631 1108Q631 1156 616 1195T573 1263T502 1307T403 1323Q320 1323 245 1297T100 1237L37 1382Q118
-1424 212 1453T403 1483Q496 1483 570 1458T697 1384T777 1267T805 1110Q805 1043 792 991T751 893T684 806T590 717Q538 672 505 639T453 574T427 509T420 432V414H281ZM233 111Q233 149 243 175T270 218T310 242T360 250Q386 250 409 243T450 219T477 176T487
-111Q487 74 477 48T450 4T410 -21T360 -29Q333 -29 310 -21T270 4T243 47T233 111Z" />
-<glyph unicode="@" glyph-name="at" horiz-adv-x="1774" d="M1665 731Q1665 669 1656 607T1628 488T1581 383T1514 298T1428 242T1321 221Q1276 221 1240 236T1177 276T1135 333T1112 401H1108Q1090 364 1063 331T1001 274T921 235T823 221Q746 221 687 249T586
-327T524 449T502 606Q502 707 531 791T616 936T751 1031T928 1065Q973 1065 1018 1061T1104 1050T1179 1035T1237 1018L1214 602Q1213 580 1213 567T1212 545T1212 533T1212 526Q1212 473 1222 439T1250 385T1288 358T1333 350Q1379 350 1414 380T1472 463T1508
-585T1520 733Q1520 875 1477 985T1358 1172T1178 1287T950 1327Q781 1327 652 1272T436 1117T303 881T258 582Q258 431 297 314T413 117T603 -4T864 -45Q925 -45 984 -38T1099 -19T1205 8T1298 41V-100Q1212 -138 1104 -160T866 -182Q687 -182 547 -131T309 17T160
-255T109 575Q109 763 168 925T336 1207T601 1394T950 1462Q1106 1462 1237 1412T1463 1267T1612 1037T1665 731ZM662 602Q662 469 712 410T848 350Q903 350 942 372T1006 436T1044 535T1061 662L1075 915Q1047 923 1009 929T928 936Q854 936 804 907T722 831T676
-724T662 602Z" />
-<glyph unicode="A" glyph-name="A" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836Z" />
-<glyph unicode="B" glyph-name="B" horiz-adv-x="1272" d="M199 1462H598Q726 1462 823 1443T986 1380T1085 1266T1118 1092Q1118 1030 1099 976T1042 881T951 813T827 776V766Q896 754 956 732T1062 670T1133 570T1159 424Q1159 324 1127 246T1033 113T883 29T684
-0H199V1462ZM385 842H629Q713 842 770 857T862 901T912 975T928 1079Q928 1199 851 1251T608 1303H385V842ZM385 686V158H651Q739 158 798 178T894 234T947 320T963 432Q963 488 947 535T893 615T793 667T639 686H385Z" />
-<glyph unicode="C" glyph-name="C" horiz-adv-x="1235" d="M793 1319Q686 1319 599 1279T451 1162T356 977T322 731Q322 590 351 481T440 296T587 182T793 143Q882 143 962 160T1120 201V39Q1081 24 1042 13T961 -6T870 -16T762 -20Q598 -20 478 34T280 187T163
-425T125 733Q125 899 168 1037T296 1274T506 1428T793 1483Q901 1483 999 1461T1176 1397L1098 1241Q1035 1273 961 1296T793 1319Z" />
-<glyph unicode="D" glyph-name="D" horiz-adv-x="1401" d="M1276 745Q1276 560 1228 421T1089 188T866 47T565 0H199V1462H606Q759 1462 883 1416T1094 1280T1228 1055T1276 745ZM1079 739Q1079 885 1046 991T950 1167T795 1269T586 1303H385V160H547Q811 160
-945 306T1079 739Z" />
-<glyph unicode="E" glyph-name="E" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0Z" />
-<glyph unicode="F" glyph-name="F" horiz-adv-x="1006" d="M385 0H199V1462H958V1298H385V782H920V618H385V0Z" />
-<glyph unicode="G" glyph-name="G" horiz-adv-x="1413" d="M782 772H1266V55Q1211 37 1155 23T1040 0T916 -15T776 -20Q619 -20 498 32T294 182T168 419T125 733Q125 905 172 1044T311 1280T535 1430T840 1483Q951 1483 1053 1461T1243 1397L1171 1235Q1135 1252
-1094 1267T1008 1293T918 1312T825 1319Q703 1319 609 1279T452 1162T355 977T322 731Q322 601 349 493T437 307T592 186T821 143Q865 143 901 145T969 152T1027 161T1081 172V608H782V772Z" />
-<glyph unicode="H" glyph-name="H" horiz-adv-x="1436" d="M1237 0H1051V682H385V0H199V1462H385V846H1051V1462H1237V0Z" />
-<glyph unicode="I" glyph-name="I" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0Z" />
-<glyph unicode="J" glyph-name="J" horiz-adv-x="555" d="M-29 -389Q-80 -389 -118 -383T-184 -365V-205Q-150 -214 -111 -219T-27 -225Q10 -225 47 -216T115 -181T165 -112T184 0V1462H371V20Q371 -85 342 -162T260 -289T134 -364T-29 -389Z" />
-<glyph unicode="K" glyph-name="K" horiz-adv-x="1186" d="M1186 0H975L524 698L385 584V0H199V1462H385V731L506 899L958 1462H1167L647 825L1186 0Z" />
-<glyph unicode="L" glyph-name="L" horiz-adv-x="1006" d="M199 0V1462H385V166H958V0H199Z" />
-<glyph unicode="M" glyph-name="M" horiz-adv-x="1782" d="M803 0L360 1280H352Q358 1206 362 1133Q366 1070 368 1001T371 874V0H199V1462H475L887 270H893L1307 1462H1583V0H1397V887Q1397 939 1399 1006T1404 1134Q1408 1205 1411 1278H1403L956 0H803Z" />
-<glyph unicode="N" glyph-name="N" horiz-adv-x="1493" d="M1294 0H1079L360 1210H352Q358 1133 362 1057Q366 992 368 921T371 793V0H199V1462H412L1128 258H1135Q1132 334 1128 408Q1127 440 1126 473T1123 540T1121 605T1120 662V1462H1294V0Z" />
-<glyph unicode="O" glyph-name="O" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393 733ZM322
-733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733Z" />
-<glyph unicode="P" glyph-name="P" horiz-adv-x="1180" d="M1075 1034Q1075 943 1048 859T957 711T791 608T535 569H385V0H199V1462H561Q695 1462 792 1434T952 1351T1045 1216T1075 1034ZM385 727H514Q607 727 676 743T791 794T860 886T883 1024Q883 1166 801
-1234T545 1303H385V727Z" />
-<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1518" d="M1393 733Q1393 602 1369 489T1297 286T1178 129T1014 25Q1057 -69 1125 -140T1284 -272L1163 -414Q1060 -341 974 -242T836 -16Q819 -18 799 -19T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125
-905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393 733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428
-1165T348 980T322 733Z" />
-<glyph unicode="R" glyph-name="R" horiz-adv-x="1208" d="M385 604V0H199V1462H555Q821 1462 948 1359T1075 1047Q1075 960 1051 895T986 784T893 706T786 655L1184 0H965L614 604H385ZM385 762H549Q639 762 702 779T805 831T864 917T883 1038Q883 1110 863 1160T801
-1242T696 1288T545 1303H385V762Z" />
-<glyph unicode="S" glyph-name="S" horiz-adv-x="1063" d="M969 391Q969 294 935 218T836 88T680 8T473 -20Q362 -20 266 -3T104 49V227Q138 211 181 196T273 168T372 149T473 141Q633 141 709 201T786 373Q786 427 772 467T721 540T623 605T469 674Q380 709 315
-750T207 844T144 962T123 1112Q123 1200 155 1269T245 1385T383 1458T561 1483Q680 1483 775 1461T944 1403L877 1247Q812 1276 730 1297T559 1319Q437 1319 370 1263T303 1110Q303 1053 318 1012T368 937T460 874T602 811Q693 775 761 737T876 651T945 540T969
-391Z" />
-<glyph unicode="T" glyph-name="T" horiz-adv-x="1063" d="M625 0H438V1298H20V1462H1042V1298H625V0Z" />
-<glyph unicode="U" glyph-name="U" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245Z" />
-<glyph unicode="V" glyph-name="V" horiz-adv-x="1163" d="M965 1462H1163L674 0H487L0 1462H197L492 535Q521 444 542 360T580 201Q595 275 618 359T672 541L965 1462Z" />
-<glyph unicode="W" glyph-name="W" horiz-adv-x="1810" d="M809 1462H1006L1235 606Q1250 550 1264 494T1291 386T1313 286T1329 201Q1333 239 1339 284T1353 378T1370 479T1391 580L1591 1462H1790L1423 0H1235L981 938Q967 989 954 1043T930 1144Q918 1199 907
-1251Q896 1200 885 1145Q875 1098 863 1042T836 932L594 0H406L20 1462H217L440 573Q452 527 462 478T480 379T496 285T508 201Q513 238 520 287T538 390T559 499T584 604L809 1462Z" />
-<glyph unicode="X" glyph-name="X" horiz-adv-x="1120" d="M1120 0H909L555 635L188 0H0L453 764L31 1462H229L561 903L895 1462H1085L664 770L1120 0Z" />
-<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1079" d="M539 723L879 1462H1079L633 569V0H446V559L0 1462H203L539 723Z" />
-<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1104" d="M1022 0H82V145L793 1296H102V1462H1001V1317L291 166H1022V0Z" />
-<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="621" d="M569 -324H164V1462H569V1313H346V-174H569V-324Z" />
-<glyph unicode="\" glyph-name="backslash" horiz-adv-x="764" d="M201 1462L745 0H567L23 1462H201Z" />
-<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="621" d="M51 -174H274V1313H51V1462H457V-324H51V-174Z" />
-<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1090" d="M41 549L500 1473H602L1049 549H888L551 1284L202 549H41Z" />
-<glyph unicode="_" glyph-name="underscore" horiz-adv-x="842" d="M846 -324H-4V-184H846V-324Z" />
-<glyph unicode="`" glyph-name="grave" horiz-adv-x="1182" d="M786 1241H666Q631 1269 590 1310T511 1396T441 1480T393 1548V1569H612Q628 1535 649 1495T694 1414T741 1335T786 1268V1241Z" />
-<glyph unicode="a" glyph-name="a" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967 374 943T236
-885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127Z" />
-<glyph unicode="b" glyph-name="b" horiz-adv-x="1200" d="M670 1118Q764 1118 841 1082T972 975T1057 797T1087 551Q1087 410 1057 304T973 125T841 17T670 -20Q611 -20 563 -7T477 27T409 78T356 139H344L307 0H174V1556H356V1180Q356 1145 355 1106T352 1032Q350
-992 348 954H356Q379 989 408 1019T475 1071T562 1105T670 1118ZM635 967Q555 967 502 942T416 864T370 734T356 551Q356 450 369 372T415 240T502 159T637 131Q772 131 835 240T899 553Q899 761 836 864T635 967Z" />
-<glyph unicode="c" glyph-name="c" horiz-adv-x="948" d="M594 -20Q493 -20 405 11T252 111T150 286T113 543Q113 700 151 809T255 987T411 1087T602 1118Q680 1118 754 1101T879 1059L825 905Q802 915 774 924T716 941T657 953T602 958Q445 958 373 858T301 545Q301
-334 373 237T594 139Q675 139 740 157T860 201V39Q806 10 745 -5T594 -20Z" />
-<glyph unicode="d" glyph-name="d" horiz-adv-x="1200" d="M852 147H844Q822 113 793 83T725 29T638 -7T530 -20Q437 -20 360 16T228 123T143 301T113 547Q113 688 143 794T228 973T360 1081T530 1118Q589 1118 637 1105T723 1070T792 1019T844 958H856Q853 992
-850 1023Q848 1049 846 1076T844 1120V1556H1026V0H879L852 147ZM565 131Q641 131 693 154T778 224T826 341T844 506V547Q844 648 831 726T785 858T698 939T563 967Q428 967 365 858T301 545Q301 336 364 234T565 131Z" />
-<glyph unicode="e" glyph-name="e" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139 704 144T788 158T867
-182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967Z" />
-<glyph unicode="f" glyph-name="f" horiz-adv-x="674" d="M651 961H406V0H223V961H29V1036L223 1104V1200Q223 1307 245 1377T310 1490T415 1549T555 1567Q614 1567 663 1556T752 1530L705 1389Q674 1400 638 1408T561 1417Q521 1417 492 1408T444 1374T416 1309T406
-1202V1098H651V961Z" />
-<glyph unicode="g" glyph-name="g" horiz-adv-x="1061" d="M1020 1098V985L823 958Q851 923 870 869T889 745Q889 669 866 605T795 493T677 420T514 393Q492 393 470 393T434 397Q417 387 401 375T371 346T349 310T340 266Q340 239 352 223T384 197T433 185T492
-182H668Q761 182 825 159T929 95T988 1T1006 -115Q1006 -203 974 -273T874 -391T705 -466T463 -492Q356 -492 276 -471T143 -410T64 -314T37 -186Q37 -126 56 -81T109 -2T185 52T276 84Q234 103 207 144T180 238Q180 299 212 343T313 430Q270 448 235 479T175 551T137
-640T123 739Q123 828 148 898T222 1017T344 1092T514 1118Q551 1118 590 1113T657 1098H1020ZM209 -180Q209 -217 222 -249T264 -304T342 -340T463 -354Q649 -354 741 -297T834 -131Q834 -85 822 -56T783 -11T710 12T600 18H424Q389 18 351 10T282 -20T230 -80T209
--180ZM301 745Q301 630 355 574T508 518Q608 518 659 573T711 748Q711 871 659 929T506 987Q407 987 354 927T301 745Z" />
-<glyph unicode="h" glyph-name="h" horiz-adv-x="1206" d="M860 0V707Q860 837 808 902T643 967Q562 967 507 941T419 864T371 739T356 569V0H174V1556H356V1094L348 950H358Q383 993 417 1024T493 1077T580 1108T674 1118Q857 1118 949 1023T1042 717V0H860Z" />
-<glyph unicode="i" glyph-name="i" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM160 1395Q160 1455 190 1482T266 1509Q288 1509 307 1503T341 1482T364 1447T373 1395Q373 1337 342 1309T266 1280Q221 1280 191 1308T160 1395Z" />
-<glyph unicode="j" glyph-name="j" horiz-adv-x="530" d="M66 -492Q18 -492 -13 -485T-68 -467V-319Q-42 -329 -15 -334T47 -340Q74 -340 97 -333T137 -306T164 -254T174 -170V1098H356V-158Q356 -235 339 -296T286 -401T196 -468T66 -492ZM160 1395Q160 1455
-190 1482T266 1509Q288 1509 307 1503T341 1482T364 1447T373 1395Q373 1337 342 1309T266 1280Q221 1280 191 1308T160 1395Z" />
-<glyph unicode="k" glyph-name="k" horiz-adv-x="1016" d="M342 567L477 737L770 1098H981L580 623L1008 0H799L463 504L354 422V0H174V1556H354V842L338 567H342Z" />
-<glyph unicode="l" glyph-name="l" horiz-adv-x="530" d="M356 0H174V1556H356V0Z" />
-<glyph unicode="m" glyph-name="m" horiz-adv-x="1835" d="M1489 0V707Q1489 837 1439 902T1284 967Q1211 967 1160 944T1077 875T1029 762T1014 606V0H831V707Q831 837 782 902T627 967Q550 967 498 941T415 864T370 739T356 569V0H174V1098H322L348 950H358Q382
-993 415 1024T487 1077T571 1108T662 1118Q782 1118 861 1074T979 936H987Q1013 983 1049 1017T1129 1073T1221 1107T1319 1118Q1494 1118 1582 1023T1671 717V0H1489Z" />
-<glyph unicode="n" glyph-name="n" horiz-adv-x="1206" d="M860 0V707Q860 837 808 902T643 967Q562 967 507 941T419 864T371 739T356 569V0H174V1098H322L348 950H358Q383 993 417 1024T493 1077T580 1108T674 1118Q857 1118 949 1023T1042 717V0H860Z" />
-<glyph unicode="o" glyph-name="o" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301 551Q301
-342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551Z" />
-<glyph unicode="p" glyph-name="p" horiz-adv-x="1200" d="M670 -20Q611 -20 563 -7T477 27T409 78T356 139H344Q347 105 350 74Q352 48 354 21T356 -23V-492H174V1098H322L348 950H356Q379 985 408 1015T475 1068T562 1104T670 1118Q764 1118 841 1082T972 975T1057
-797T1087 551Q1087 410 1057 304T973 125T841 17T670 -20ZM635 967Q559 967 507 944T422 874T374 757T356 592V551Q356 450 369 372T415 240T502 159T637 131Q772 131 835 240T899 553Q899 761 836 864T635 967Z" />
-<glyph unicode="q" glyph-name="q" horiz-adv-x="1200" d="M565 131Q641 131 693 154T778 224T826 341T844 506V547Q844 648 831 726T785 858T698 939T563 967Q428 967 365 858T301 545Q301 336 364 234T565 131ZM530 -20Q437 -20 360 16T228 123T143 301T113
-547Q113 688 143 794T228 973T360 1081T530 1118Q589 1118 637 1105T723 1069T791 1016T844 950H852L879 1098H1026V-492H844V-23Q844 -4 846 25T850 81Q853 113 856 147H844Q822 113 793 83T725 29T638 -7T530 -20Z" />
-<glyph unicode="r" glyph-name="r" horiz-adv-x="817" d="M649 1118Q678 1118 714 1116T776 1108L752 940Q724 945 695 948T639 952Q576 952 524 927T435 854T377 740T356 592V0H174V1098H322L344 897H352Q377 940 405 980T469 1050T549 1099T649 1118Z" />
-<glyph unicode="s" glyph-name="s" horiz-adv-x="924" d="M831 301Q831 221 802 161T719 61T587 0T414 -20Q305 -20 227 -3T90 49V215Q121 199 159 184T239 156T325 137T414 129Q479 129 524 140T598 171T640 221T653 287Q653 318 643 343T607 392T534 442T416
-498Q344 529 287 559T189 626T128 711T106 827Q106 897 133 951T211 1043T331 1099T487 1118Q584 1118 664 1097T817 1042L754 895Q689 924 621 945T481 967Q379 967 330 934T281 838Q281 803 292 777T332 728T407 682T524 629Q596 599 652 569T749 502T810 416T831
-301Z" />
-<glyph unicode="t" glyph-name="t" horiz-adv-x="694" d="M506 129Q524 129 546 131T590 136T628 143T655 150V12Q642 6 622 0T578 -10T528 -17T477 -20Q415 -20 362 -4T271 51T210 156T188 324V961H33V1042L188 1120L266 1350H371V1098H647V961H371V324Q371 227
-402 178T506 129Z" />
-<glyph unicode="u" glyph-name="u" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885Z" />
-<glyph unicode="v" glyph-name="v" horiz-adv-x="981" d="M375 0L0 1098H188L387 487Q398 454 413 402T443 296T470 194T487 121H494Q499 146 511 194T538 296T568 402T594 487L793 1098H981L606 0H375Z" />
-<glyph unicode="w" glyph-name="w" horiz-adv-x="1528" d="M1008 0L840 616Q836 634 830 656T818 704T806 755T793 806Q779 864 764 926H758Q744 863 731 805Q720 755 708 702T684 612L512 0H301L20 1098H211L342 514Q352 469 362 417T381 313T397 216T408 141H414Q419
-167 427 210T446 302T468 398T489 479L668 1098H864L1036 479Q1045 445 1056 399T1079 306T1099 214T1112 141H1118Q1121 167 1127 210T1143 306T1162 412T1184 514L1321 1098H1507L1223 0H1008Z" />
-<glyph unicode="x" glyph-name="x" horiz-adv-x="1024" d="M408 563L55 1098H262L512 688L762 1098H969L614 563L987 0H780L512 436L242 0H35L408 563Z" />
-<glyph unicode="y" glyph-name="y" horiz-adv-x="1001" d="M10 1098H199L414 485Q428 445 442 401T469 313T491 228T504 152H510Q515 177 526 220T550 311T578 407T604 487L803 1098H991L557 -143Q529 -224 497 -288T421 -398T320 -467T182 -492Q130 -492 92 -487T27
--475V-330Q48 -335 80 -338T147 -342Q195 -342 230 -331T291 -297T335 -243T369 -170L426 -10L10 1098Z" />
-<glyph unicode="z" glyph-name="z" horiz-adv-x="903" d="M821 0H82V125L618 961H115V1098H803V952L279 137H821V0Z" />
-<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="725" d="M500 -16Q500 -64 512 -94T546 -142T601 -166T674 -174V-324Q597 -323 532 -307T419 -255T344 -164T317 -31V303Q317 406 252 449T61 492V647Q186 647 251 690T317 836V1169Q317 1247 344 1302T418
-1392T531 1444T674 1462V1313Q634 1312 602 1306T547 1282T512 1234T500 1155V823Q500 718 441 657T266 575V563Q381 543 440 482T500 315V-16Z" />
-<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M489 1556H639V-492H489V1556Z" />
-<glyph unicode="}" glyph-name="braceright" horiz-adv-x="725" d="M225 315Q225 421 284 482T459 563V575Q344 595 285 656T225 823V1155Q225 1203 213 1233T179 1281T124 1305T51 1313V1462Q128 1461 193 1445T306 1393T381 1302T408 1169V836Q408 784 424 748T473
-690T554 657T664 647V492Q539 492 474 449T408 303V-31Q408 -109 381 -164T307 -254T194 -306T51 -324V-174Q91 -173 123 -167T178 -143T213 -95T225 -16V315Z" />
-<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1128" d="M530 651Q493 667 466 678T416 695T373 704T330 707Q302 707 272 698T213 672T155 633T102 586V748Q202 856 350 856Q379 856 404 854T456 845T517 826T598 793Q635 777 662 766T713 749T757
-740T799 737Q827 737 857 746T916 772T974 811T1026 858V696Q927 588 778 588Q749 588 724 590T672 599T611 618T530 651Z" />
-<glyph unicode="&#xa0;" glyph-name="nbspace" horiz-adv-x="532" />
-<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="551" d="M213 676H334L385 -373H162L213 676ZM401 979Q401 941 392 915T365 872T324 848T274 840Q248 840 225 847T185 871T157 914T147 979Q147 1016 157 1042T184 1085T225 1110T274 1118Q301
-1118 324 1110T364 1085T391 1042T401 979Z" />
-<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="1128" d="M886 212T831 197T700 180V-20H563V186Q476 199 407 236T289 340T214 506T188 743Q188 884 214 985T289 1155T407 1260T563 1311V1483H700V1319Q772 1316 840 1300T954 1260L901 1106Q878 1116
-850 1125T792 1142T733 1154T678 1159Q521 1159 449 1058T377 745Q377 535 449 438T670 340Q751 340 816 358T936 401V240Q886 212 831 197Z" />
-<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="1128" d="M666 1481Q772 1481 859 1459T1012 1401L946 1257Q890 1286 820 1307T674 1329Q626 1329 585 1316T514 1273T468 1196T451 1083V788H827V651H451V440Q451 378 440 334T409 257T364 204T311
-166H1059V0H68V154Q112 165 148 185T211 240T253 322T268 438V651H70V788H268V1112Q268 1199 297 1267T379 1383T505 1456T666 1481Z" />
-<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="1128" d="M186 723Q186 782 203 835T252 936L123 1065L221 1163L348 1034Q395 1066 449 1084T563 1102Q623 1102 676 1084T776 1034L905 1163L1004 1067L874 938Q905 892 923 838T942 723Q942 663
-925 608T874 508L1001 381L905 285L776 412Q730 381 677 364T563 346Q503 346 448 364T348 414L221 287L125 383L252 510Q221 555 204 609T186 723ZM324 723Q324 673 342 630T393 554T469 502T563 483Q614 483 658 502T736 553T788 629T807 723Q807 774 788 818T736
-896T659 948T563 967Q513 967 470 948T394 896T343 819T324 723Z" />
-<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="1128" d="M563 723L909 1462H1100L715 694H954V557H653V399H954V262H653V0H475V262H174V399H475V557H174V694H408L29 1462H221L563 723Z" />
-<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="1128" d="M489 1556H639V776H489V1556ZM489 289H639V-492H489V289Z" />
-<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="995" d="M137 809Q137 860 150 901T185 975T237 1029T297 1067Q222 1105 180 1162T137 1303Q137 1364 164 1413T242 1496T362 1548T518 1567Q615 1567 693 1547T844 1495L788 1356Q723 1384 653 1403T512
-1423Q413 1423 362 1394T311 1307Q311 1280 323 1257T363 1212T439 1167T557 1114Q629 1086 685 1054T781 982T841 895T862 784Q862 732 850 690T818 613T771 555T717 514Q786 476 824 422T862 289Q862 218 833 163T749 69T618 10T444 -10Q336 -10 258 6T121 55V213Q152
-198 190 183T270 157T356 138T444 131Q513 131 559 143T633 174T672 219T684 272Q684 301 676 323T642 368T569 415T446 471Q373 502 316 533T218 603T158 692T137 809ZM291 831Q291 794 305 763T350 702T432 646T555 588L590 573Q610 586 630 604T667 645T694
-696T705 758Q705 796 692 828T647 889T560 947T424 1006Q399 998 376 983T333 945T303 893T291 831Z" />
-<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="1182" d="M307 1395Q307 1449 335 1473T403 1497Q442 1497 471 1473T500 1395Q500 1342 471 1317T403 1292Q363 1292 335 1317T307 1395ZM682 1395Q682 1449 710 1473T778 1497Q797 1497 814 1491T845
-1473T866 1441T874 1395Q874 1342 845 1317T778 1292Q738 1292 710 1317T682 1395Z" />
-<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="1704" d="M891 1053Q830 1053 783 1031T704 968T656 866T639 731Q639 653 653 593T698 492T776 430T891 408Q914 408 941 411T996 421T1053 435T1106 453V322Q1082 311 1058 302T1007 286T950 276T885
-272Q783 272 707 305T581 399T505 545T479 733Q479 834 506 917T585 1061T714 1154T891 1188Q954 1188 1020 1172T1145 1126L1083 999Q1031 1025 983 1039T891 1053ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231
-1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384 200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320 199T203 351T127 531T100 731ZM209 731Q209 598 259 481T397 277T602 139T852 88Q985 88 1102 138T1306 276T1444 481T1495
-731Q1495 864 1445 981T1307 1185T1102 1323T852 1374Q719 1374 602 1324T398 1186T260 981T209 731Z" />
-<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="678" d="M487 797L459 879Q441 857 422 840T379 810T327 791T264 784Q221 784 185 797T123 835T83 899T68 989Q68 1091 138 1145T352 1204L451 1208V1239Q451 1311 421 1339T334 1368Q286 1368
-241 1354T154 1317L106 1417Q157 1443 215 1461T334 1479Q459 1479 518 1426T578 1251V797H487ZM377 1110Q326 1107 292 1098T238 1074T208 1038T199 987Q199 936 224 914T291 891Q325 891 354 901T404 934T438 988T451 1065V1114L377 1110Z" />
-<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="997" d="M82 553L391 967L508 889L270 541L508 193L391 115L82 526V553ZM489 553L799 967L915 889L678 541L915 193L799 115L489 526V553Z" />
-<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="1128" d="M1026 797V262H877V647H102V797H1026Z" />
-<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="659" d="M82 465V633H578V465H82Z" />
-<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="1704" d="M743 768H815Q906 768 945 804T985 909Q985 983 944 1012T813 1042H743V768ZM1145 913Q1145 865 1132 828T1096 762T1045 713T985 680Q1052 570 1105 483Q1128 446 1149 411T1186 347T1213
-302L1223 285H1044L838 637H743V285H586V1178H819Q987 1178 1066 1113T1145 913ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231 1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384
-200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320 199T203 351T127 531T100 731ZM209 731Q209 598 259 481T397 277T602 139T852 88Q985 88 1102 138T1306 276T1444 481T1495 731Q1495 864 1445 981T1307 1185T1102 1323T852 1374Q719 1374 602 1324T398 1186T260
-981T209 731Z" />
-<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1696H1030V1556Z" />
-<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="877" d="M123 1167Q123 1232 148 1289T215 1390T315 1458T438 1483Q503 1483 560 1458T661 1390T729 1290T754 1167Q754 1102 729 1045T661 946T561 879T438 854Q373 854 316 878T216 945T148 1045T123
-1167ZM246 1167Q246 1128 261 1094T302 1033T363 992T438 977Q478 977 513 992T574 1033T616 1093T631 1167Q631 1207 616 1242T575 1304T513 1346T438 1362Q398 1362 363 1347T302 1305T261 1243T246 1167Z" />
-<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="1128" d="M489 647H102V797H489V1186H639V797H1026V647H639V262H489V647ZM102 0V150H1026V0H102Z" />
-<glyph unicode="&#xb2;" glyph-name="twosuperior" horiz-adv-x="678" d="M621 586H49V698L258 926Q315 988 351 1030T407 1106T434 1169T442 1233Q442 1298 409 1330T322 1362Q271 1362 225 1337T133 1274L55 1368Q109 1416 175 1448T324 1481Q384 1481 432 1465T515
-1417T567 1340T586 1237Q586 1187 572 1144T530 1059T464 971T373 870L225 713H621V586Z" />
-<glyph unicode="&#xb3;" glyph-name="threesuperior" horiz-adv-x="678" d="M590 1255Q590 1177 550 1124T440 1047Q528 1024 572 971T616 840Q616 780 596 730T535 645T430 589T281 569Q211 569 150 581T31 625V758Q94 724 160 705T279 686Q377 686 421 727T465
-842Q465 916 412 949T262 983H164V1096H262Q354 1096 396 1135T438 1239Q438 1271 428 1294T401 1333T360 1355T309 1362Q250 1362 202 1342T102 1284L33 1380Q62 1403 92 1421T157 1453T229 1473T311 1481Q380 1481 432 1464T520 1417T572 1346T590 1255Z" />
-<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="1182" d="M393 1268Q415 1297 438 1335T485 1413T530 1494T567 1569H786V1548Q770 1521 739 1481T669 1396T590 1311T514 1241H393V1268Z" />
-<glyph unicode="&#xb5;" glyph-name="mu" horiz-adv-x="1217" d="M356 391Q356 261 409 196T573 131Q655 131 710 157T798 233T846 358T860 528V1098H1042V0H895L868 147H858Q810 64 738 22T563 -20Q491 -20 438 3T350 68Q351 30 353 -10Q355 -45 355 -87T356
--172V-492H174V1098H356V391Z" />
-<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="1341" d="M1126 -260H1006V1397H799V-260H678V559Q617 541 532 541Q437 541 360 566T228 651T143 806T113 1042Q113 1189 145 1287T237 1446T380 1531T563 1556H1126V-260Z" />
-<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="549" d="M147 723Q147 761 157 787T184 830T224 854T274 862Q300 862 323 855T364 831T391 788T401 723Q401 686 391 660T364 617T324 592T274 584Q247 584 224 592T184 617T157 660T147 723Z" />
-<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="420" d="M408 -287Q408 -384 338 -438T117 -492Q95 -492 73 -489T35 -483V-375Q50 -378 74 -379T115 -381Q186 -381 226 -360T266 -289Q266 -265 253 -248T217 -217T163 -195T94 -176L184 0H305L248
--115Q282 -123 311 -136T361 -169T395 -219T408 -287Z" />
-<glyph unicode="&#xb9;" glyph-name="onesuperior" horiz-adv-x="678" d="M307 1462H442V586H297V1102Q297 1127 297 1157T299 1217T302 1275T305 1325Q291 1308 272 1288T231 1251L137 1178L63 1274L307 1462Z" />
-<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="717" d="M651 1133Q651 1050 631 985T572 876T479 808T356 784Q293 784 240 807T148 875T88 985T66 1133Q66 1216 86 1280T145 1389T237 1456T360 1479Q422 1479 475 1456T568 1389T629 1281T651
-1133ZM197 1133Q197 1014 234 954T358 893Q443 893 480 953T518 1133Q518 1253 481 1310T358 1368Q272 1368 235 1311T197 1133Z" />
-<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="997" d="M918 526L608 115L492 193L729 541L492 889L608 967L918 553V526ZM510 526L201 115L84 193L322 541L84 889L201 967L510 553V526Z" />
-<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="1509" d="M307 1462H442V586H297V1102Q297 1127 297 1157T299 1217T302 1275T305 1325Q291 1308 272 1288T231 1251L137 1178L63 1274L307 1462ZM1202 1462L391 0H234L1045 1462H1202ZM1419 193H1294V1H1151V193H776V304L1153
-883H1294V320H1419V193ZM1151 320V515Q1151 557 1152 606T1157 705Q1152 694 1142 676T1121 636T1098 595T1077 560L922 320H1151Z" />
-<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="1509" d="M544 1462H679V586H534V1102Q534 1127 534 1157T536 1217T539 1275T542 1325Q528 1308 509 1288T468 1251L374 1178L300 1274L544 1462ZM1181 1462L370 0H213L1024 1462H1181ZM1440 1H868V113L1077
-341Q1134 403 1170 445T1226 521T1253 584T1261 648Q1261 713 1228 745T1141 777Q1090 777 1044 752T952 689L874 783Q928 831 994 863T1143 896Q1203 896 1251 880T1334 832T1386 755T1405 652Q1405 602 1391 559T1349 474T1283 386T1192 285L1044 128H1440V1Z"
-/>
-<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="1509" d="M590 1255Q590 1177 550 1124T440 1047Q528 1024 572 971T616 840Q616 780 596 730T535 645T430 589T281 569Q211 569 150 581T31 625V758Q94 724 160 705T279 686Q377 686 421 727T465
-842Q465 916 412 949T262 983H164V1096H262Q354 1096 396 1135T438 1239Q438 1271 428 1294T401 1333T360 1355T309 1362Q250 1362 202 1342T102 1284L33 1380Q62 1403 92 1421T157 1453T229 1473T311 1481Q380 1481 432 1464T520 1417T572 1346T590 1255ZM1296
-1462L485 0H328L1139 1462H1296ZM1486 193H1361V1H1218V193H843V304L1220 883H1361V320H1486V193ZM1218 320V515Q1218 557 1219 606T1224 705Q1219 694 1209 676T1188 636T1165 595T1144 560L989 320H1218Z" />
-<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="872" d="M592 676V639Q592 581 584 536T557 450T505 371T422 291Q374 250 340 217T285 149T253 75T242 -18Q242 -66 257 -105T300 -173T371 -217T469 -233Q553 -233 628 -208T772 -147L836 -293Q754
--335 660 -364T469 -393Q376 -393 302 -368T176 -294T96 -177T68 -20Q68 48 81 100T121 197T188 284T283 373Q335 418 368 451T420 516T446 580T453 657V676H592ZM639 979Q639 941 630 915T603 872T562 848T512 840Q486 840 463 847T423 871T395 914T385 979Q385
-1016 395 1042T422 1085T463 1110T512 1118Q539 1118 562 1110T602 1085T629 1042T639 979Z" />
-<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM719
-1579H599Q564 1607 523 1648T444 1734T374 1818T326 1886V1907H545Q561 1873 582 1833T627 1752T674 1673T719 1606V1579Z" />
-<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM534
-1606Q556 1635 579 1673T626 1751T671 1832T708 1907H927V1886Q911 1859 880 1819T810 1734T731 1649T655 1579H534V1606Z" />
-<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM953
-1579H832Q781 1613 727 1661T621 1765Q567 1710 514 1662T410 1579H289V1606Q315 1635 349 1673T416 1751T479 1832T525 1907H717Q733 1873 762 1833T825 1752T893 1673T953 1606V1579Z" />
-<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM772
-1581Q732 1581 693 1598T615 1637T542 1676T475 1694Q430 1694 406 1668T368 1579H264Q269 1639 285 1688T328 1771T392 1824T475 1843Q517 1843 557 1826T636 1787T708 1749T772 1731Q817 1731 840 1757T878 1845H983Q978 1785 962 1737T919 1654T855 1600T772
-1581Z" />
-<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM340
-1733Q340 1787 368 1811T436 1835Q475 1835 504 1811T533 1733Q533 1680 504 1655T436 1630Q396 1630 368 1655T340 1733ZM715 1733Q715 1787 743 1811T811 1835Q830 1835 847 1829T878 1811T899 1779T907 1733Q907 1680 878 1655T811 1630Q771 1630 743 1655T715
-1733Z" />
-<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM848
-1583Q848 1532 831 1492T783 1423T710 1381T619 1366Q569 1366 528 1380T458 1423T412 1490T396 1581Q396 1632 412 1671T457 1739T528 1781T619 1796Q667 1796 709 1782T782 1740T830 1673T848 1583ZM731 1581Q731 1634 700 1664T619 1694Q569 1694 538 1664T506
-1581Q506 1528 534 1498T619 1468Q668 1468 699 1498T731 1581Z" />
-<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="1745" d="M1622 0H862V453H387L184 0H-2L653 1462H1622V1298H1049V846H1583V684H1049V164H1622V0ZM459 618H862V1298H754L459 618Z" />
-<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="1235" d="M793 1319Q686 1319 599 1279T451 1162T356 977T322 731Q322 590 351 481T440 296T587 182T793 143Q882 143 962 160T1120 201V39Q1081 24 1042 13T961 -6T870 -16T762 -20Q598 -20 478 34T280
-187T163 425T125 733Q125 899 168 1037T296 1274T506 1428T793 1483Q901 1483 999 1461T1176 1397L1098 1241Q1035 1273 961 1296T793 1319ZM916 -287Q916 -384 846 -438T625 -492Q603 -492 581 -489T543 -483V-375Q558 -378 582 -379T623 -381Q694 -381 734 -360T774
--289Q774 -265 761 -248T725 -217T671 -195T602 -176L692 0H813L756 -115Q790 -123 819 -136T869 -169T903 -219T916 -287Z" />
-<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM713 1579H593Q558 1607 517 1648T438 1734T368 1818T320 1886V1907H539Q555 1873 576 1833T621 1752T668 1673T713 1606V1579Z" />
-<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM456 1606Q478 1635 501 1673T548 1751T593 1832T630 1907H849V1886Q833 1859 802 1819T732 1734T653 1649T577 1579H456V1606Z" />
-<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM907 1579H786Q735 1613 681 1661T575 1765Q521 1710 468 1662T364 1579H243V1606Q269 1635 303 1673T370 1751T433 1832T479
-1907H671Q687 1873 716 1833T779 1752T847 1673T907 1606V1579Z" />
-<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM296 1733Q296 1787 324 1811T392 1835Q431 1835 460 1811T489 1733Q489 1680 460 1655T392 1630Q352 1630 324 1655T296 1733ZM671
-1733Q671 1787 699 1811T767 1835Q786 1835 803 1829T834 1811T855 1779T863 1733Q863 1680 834 1655T767 1630Q727 1630 699 1655T671 1733Z" />
-<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM455 1579H335Q300 1607 259 1648T180 1734T110 1818T62 1886V1907H281Q297 1873 318 1833T363 1752T410 1673T455
-1606V1579Z" />
-<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM257 1606Q279 1635 302 1673T349 1751T394 1832T431 1907H650V1886Q634 1859 603 1819T533 1734T454 1649T378
-1579H257V1606Z" />
-<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM681 1579H560Q509 1613 455 1661T349 1765Q295 1710 242 1662T138 1579H17V1606Q43 1635 77 1673T144 1751T207
-1832T253 1907H445Q461 1873 490 1833T553 1752T621 1673T681 1606V1579Z" />
-<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM64 1733Q64 1787 92 1811T160 1835Q199 1835 228 1811T257 1733Q257 1680 228 1655T160 1630Q120 1630 92 1655T64
-1733ZM439 1733Q439 1787 467 1811T535 1835Q554 1835 571 1829T602 1811T623 1779T631 1733Q631 1680 602 1655T535 1630Q495 1630 467 1655T439 1733Z" />
-<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="1401" d="M47 805H199V1462H606Q759 1462 883 1416T1094 1280T1228 1055T1276 745Q1276 560 1228 421T1089 188T866 47T565 0H199V643H47V805ZM1079 739Q1079 885 1046 991T950 1167T795 1269T586 1303H385V805H721V643H385V160H547Q811
-160 945 306T1079 739Z" />
-<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="1493" d="M1294 0H1079L360 1210H352Q358 1133 362 1057Q366 992 368 921T371 793V0H199V1462H412L1128 258H1135Q1132 334 1128 408Q1127 440 1126 473T1123 540T1121 605T1120 662V1462H1294V0ZM905
-1581Q865 1581 826 1598T748 1637T675 1676T608 1694Q563 1694 539 1668T501 1579H397Q402 1639 418 1688T461 1771T525 1824T608 1843Q650 1843 690 1826T769 1787T841 1749T905 1731Q950 1731 973 1757T1011 1845H1116Q1111 1785 1095 1737T1052 1654T988 1600T905
-1581Z" />
-<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
-733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM870 1579H750Q715 1607 674 1648T595 1734T525 1818T477 1886V1907H696Q712
-1873 733 1833T778 1752T825 1673T870 1606V1579Z" />
-<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
-733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM651 1606Q673 1635 696 1673T743 1751T788 1832T825 1907H1044V1886Q1028
-1859 997 1819T927 1734T848 1649T772 1579H651V1606Z" />
-<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352
-1043T1393 733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM1096 1579H975Q924 1613 870 1661T764 1765Q710
-1710 657 1662T553 1579H432V1606Q458 1635 492 1673T559 1751T622 1832T668 1907H860Q876 1873 905 1833T968 1752T1036 1673T1096 1606V1579Z" />
-<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
-733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM891 1581Q851 1581 812 1598T734 1637T661 1676T594 1694Q549
-1694 525 1668T487 1579H383Q388 1639 404 1688T447 1771T511 1824T594 1843Q636 1843 676 1826T755 1787T827 1749T891 1731Q936 1731 959 1757T997 1845H1102Q1097 1785 1081 1737T1038 1654T974 1600T891 1581Z" />
-<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
-733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM477 1733Q477 1787 505 1811T573 1835Q612 1835 641 1811T670
-1733Q670 1680 641 1655T573 1630Q533 1630 505 1655T477 1733ZM852 1733Q852 1787 880 1811T948 1835Q967 1835 984 1829T1015 1811T1036 1779T1044 1733Q1044 1680 1015 1655T948 1630Q908 1630 880 1655T852 1733Z" />
-<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="1128" d="M459 723L141 1042L246 1147L563 829L885 1147L989 1044L668 723L987 403L885 301L563 618L246 303L143 406L459 723Z" />
-<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="1520" d="M1300 1454L1208 1305Q1299 1206 1346 1061T1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q571 -20 438 51L360 -76L223 2L313 147Q216 247 171 396T125 735Q125 905 163 1043T280
-1280T479 1431T762 1485Q856 1485 936 1464T1083 1405L1163 1532L1300 1454ZM322 733Q322 602 345 498T416 315L995 1260Q947 1289 890 1305T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM1196 733Q1196 990 1108 1141L530 201Q577 173 634 158T760 143Q874
-143 956 183T1092 300T1171 486T1196 733Z" />
-<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245ZM847
-1579H727Q692 1607 651 1648T572 1734T502 1818T454 1886V1907H673Q689 1873 710 1833T755 1752T802 1673T847 1606V1579Z" />
-<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245ZM590
-1606Q612 1635 635 1673T682 1751T727 1832T764 1907H983V1886Q967 1859 936 1819T866 1734T787 1649T711 1579H590V1606Z" />
-<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059
-512V1464H1245ZM1043 1579H922Q871 1613 817 1661T711 1765Q657 1710 604 1662T500 1579H379V1606Q405 1635 439 1673T506 1751T569 1832T615 1907H807Q823 1873 852 1833T915 1752T983 1673T1043 1606V1579Z" />
-<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245ZM432
-1733Q432 1787 460 1811T528 1835Q567 1835 596 1811T625 1733Q625 1680 596 1655T528 1630Q488 1630 460 1655T432 1733ZM807 1733Q807 1787 835 1811T903 1835Q922 1835 939 1829T970 1811T991 1779T999 1733Q999 1680 970 1655T903 1630Q863 1630 835 1655T807
-1733Z" />
-<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="1079" d="M539 723L879 1462H1079L633 569V0H446V559L0 1462H203L539 723ZM442 1606Q464 1635 487 1673T534 1751T579 1832T616 1907H835V1886Q819 1859 788 1819T718 1734T639 1649T563 1579H442V1606Z" />
-<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="1180" d="M1075 782Q1075 691 1048 607T957 459T791 356T535 317H385V0H199V1462H385V1210H561Q695 1210 792 1182T952 1099T1045 964T1075 782ZM385 475H514Q607 475 676 491T791 542T860 634T883 772Q883
-915 801 983T545 1051H385V475Z" />
-<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="1233" d="M1010 1260Q1010 1203 989 1159T936 1078T867 1011T798 954T745 899T723 842Q723 821 730 805T756 769T811 725T903 662Q959 625 1003 589T1077 512T1124 423T1141 313Q1141 226 1113 163T1035
-60T914 0T758 -20Q661 -20 592 -3T469 49V215Q495 199 527 184T596 156T670 137T745 129Q801 129 841 141T908 176T946 231T958 303Q958 339 950 368T920 426T862 483T770 547Q707 587 665 621T596 688T558 757T547 834Q547 888 567 927T619 998T686 1057T753 1113T804
-1175T825 1253Q825 1295 809 1326T762 1377T691 1407T598 1417Q549 1417 505 1408T428 1374T376 1309T356 1202V0H174V1200Q174 1304 205 1374T293 1487T428 1548T598 1567Q690 1567 766 1548T896 1491T980 1395T1010 1260Z" />
-<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
-374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM934 1241H814Q779
-1269 738 1310T659 1396T589 1480T541 1548V1569H760Q776 1535 797 1495T842 1414T889 1335T934 1268V1241Z" />
-<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
-374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM446 1268Q468 1297
-491 1335T538 1413T583 1494T620 1569H839V1548Q823 1521 792 1481T722 1396T643 1311T567 1241H446V1268Z" />
-<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445
-967 374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM1148 1241H1027Q976
-1275 922 1323T816 1427Q762 1372 709 1324T605 1241H484V1268Q510 1297 544 1335T611 1413T674 1494T720 1569H912Q928 1535 957 1495T1020 1414T1088 1335T1148 1268V1241Z" />
-<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
-374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM955 1243Q915 1243
-876 1260T798 1299T725 1338T658 1356Q613 1356 589 1330T551 1241H447Q452 1301 468 1350T511 1433T575 1486T658 1505Q700 1505 740 1488T819 1449T891 1411T955 1393Q1000 1393 1023 1419T1061 1507H1166Q1161 1447 1145 1399T1102 1316T1038 1262T955 1243Z"
-/>
-<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445
-967 374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM529 1395Q529
-1449 557 1473T625 1497Q664 1497 693 1473T722 1395Q722 1342 693 1317T625 1292Q585 1292 557 1317T529 1395ZM904 1395Q904 1449 932 1473T1000 1497Q1019 1497 1036 1491T1067 1473T1088 1441T1096 1395Q1096 1342 1067 1317T1000 1292Q960 1292 932 1317T904
-1395Z" />
-<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
-374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM1039 1458Q1039
-1407 1022 1367T974 1298T901 1256T810 1241Q760 1241 719 1255T649 1298T603 1365T587 1456Q587 1507 603 1546T648 1614T719 1656T810 1671Q858 1671 900 1657T973 1615T1021 1548T1039 1458ZM922 1456Q922 1509 891 1539T810 1569Q760 1569 729 1539T697 1456Q697
-1403 725 1373T810 1343Q859 1343 890 1373T922 1456Z" />
-<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="1706" d="M94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967 374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q659 1118 742 1076T868 940Q919 1025 1002
-1071T1188 1118Q1285 1118 1362 1083T1493 983T1575 828T1604 627V514H932Q937 321 1010 230T1231 139Q1280 139 1322 144T1404 158T1480 182T1554 215V53Q1515 34 1478 20T1401 -3T1319 -16T1227 -20Q1089 -20 988 37T825 209Q791 155 753 113T668 41T562 -4T430
--20Q359 -20 298 -1T191 59T120 161T94 307ZM283 305Q283 213 331 170T459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305ZM1184 967Q1074 967 1011 889T936 662H1407Q1407 730 1394 786T1354 883T1284 945T1184
-967Z" />
-<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="948" d="M594 -20Q493 -20 405 11T252 111T150 286T113 543Q113 700 151 809T255 987T411 1087T602 1118Q680 1118 754 1101T879 1059L825 905Q802 915 774 924T716 941T657 953T602 958Q445 958 373
-858T301 545Q301 334 373 237T594 139Q675 139 740 157T860 201V39Q806 10 745 -5T594 -20ZM730 -287Q730 -384 660 -438T439 -492Q417 -492 395 -489T357 -483V-375Q372 -378 396 -379T437 -381Q508 -381 548 -360T588 -289Q588 -265 575 -248T539 -217T485 -195T416
--176L506 0H627L570 -115Q604 -123 633 -136T683 -169T717 -219T730 -287Z" />
-<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139 704
-144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM934 1241H814Q779 1269 738 1310T659 1396T589 1480T541 1548V1569H760Q776 1535 797 1495T842 1414T889
-1335T934 1268V1241Z" />
-<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139 704
-144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM475 1268Q497 1297 520 1335T567 1413T612 1494T649 1569H868V1548Q852 1521 821 1481T751 1396T672 1311T596
-1241H475V1268Z" />
-<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139
-704 144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM1144 1241H1023Q972 1275 918 1323T812 1427Q758 1372 705 1324T601 1241H480V1268Q506 1297 540
-1335T607 1413T670 1494T716 1569H908Q924 1535 953 1495T1016 1414T1084 1335T1144 1268V1241Z" />
-<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139
-704 144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM525 1395Q525 1449 553 1473T621 1497Q660 1497 689 1473T718 1395Q718 1342 689 1317T621 1292Q581
-1292 553 1317T525 1395ZM900 1395Q900 1449 928 1473T996 1497Q1015 1497 1032 1491T1063 1473T1084 1441T1092 1395Q1092 1342 1063 1317T996 1292Q956 1292 928 1317T900 1395Z" />
-<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM359 1241H239Q204 1269 163 1310T84 1396T14 1480T-34 1548V1569H185Q201 1535 222 1495T267 1414T314 1335T359 1268V1241Z" />
-<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM185 1268Q207 1297 230 1335T277 1413T322 1494T359 1569H578V1548Q562 1521 531 1481T461 1396T382 1311T306 1241H185V1268Z" />
-<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM597 1241H476Q425 1275 371 1323T265 1427Q211 1372 158 1324T54 1241H-67V1268Q-41 1297 -7 1335T60 1413T123 1494T169 1569H361Q377 1535 406 1495T469 1414T537
-1335T597 1268V1241Z" />
-<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM-18 1395Q-18 1449 10 1473T78 1497Q117 1497 146 1473T175 1395Q175 1342 146 1317T78 1292Q38 1292 10 1317T-18 1395ZM357 1395Q357 1449 385 1473T453 1497Q472
-1497 489 1491T520 1473T541 1441T549 1395Q549 1342 520 1317T453 1292Q413 1292 385 1317T357 1395Z" />
-<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="1182" d="M1069 573Q1069 431 1036 321T940 135T788 20T588 -20Q484 -20 397 13T246 109T147 265T111 477Q111 596 142 688T233 843T376 938T565 971Q667 971 744 942T864 852L872 856Q841 974 781 1070T631
-1247L375 1094L301 1208L518 1339Q478 1367 436 1394T346 1448L416 1571Q481 1539 542 1503T662 1423L889 1561L963 1448L768 1331Q835 1266 890 1188T985 1017T1047 813T1069 573ZM881 526Q881 582 864 635T812 730T722 796T592 821Q515 821 461 798T371 731T320
-622T303 471Q303 395 319 333T371 225T461 156T592 131Q746 131 813 230T881 526Z" />
-<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="1206" d="M860 0V707Q860 837 808 902T643 967Q562 967 507 941T419 864T371 739T356 569V0H174V1098H322L348 950H358Q383 993 417 1024T493 1077T580 1108T674 1118Q857 1118 949 1023T1042 717V0H860ZM1015
-1243Q975 1243 936 1260T858 1299T785 1338T718 1356Q673 1356 649 1330T611 1241H507Q512 1301 528 1350T571 1433T635 1486T718 1505Q760 1505 800 1488T879 1449T951 1411T1015 1393Q1060 1393 1083 1419T1121 1507H1226Q1221 1447 1205 1399T1162 1316T1098
-1262T1015 1243Z" />
-<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301
-551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM1002 1241H882Q847 1269 806 1310T727 1396T657 1480T609 1548V1569H828Q844 1535 865 1495T910 1414T957 1335T1002 1268V1241Z" />
-<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301
-551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM473 1268Q495 1297 518 1335T565 1413T610 1494T647 1569H866V1548Q850 1521 819 1481T749 1396T670 1311T594 1241H473V1268Z" />
-<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069
-551ZM301 551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM1173 1241H1052Q1001 1275 947 1323T841 1427Q787 1372 734 1324T630 1241H509V1268Q535 1297 569 1335T636 1413T699 1494T745 1569H937Q953
-1535 982 1495T1045 1414T1113 1335T1173 1268V1241Z" />
-<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301
-551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM992 1243Q952 1243 913 1260T835 1299T762 1338T695 1356Q650 1356 626 1330T588 1241H484Q489 1301 505 1350T548 1433T612 1486T695 1505Q737 1505 777
-1488T856 1449T928 1411T992 1393Q1037 1393 1060 1419T1098 1507H1203Q1198 1447 1182 1399T1139 1316T1075 1262T992 1243Z" />
-<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069
-551ZM301 551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM556 1395Q556 1449 584 1473T652 1497Q691 1497 720 1473T749 1395Q749 1342 720 1317T652 1292Q612 1292 584 1317T556 1395ZM931 1395Q931
-1449 959 1473T1027 1497Q1046 1497 1063 1491T1094 1473T1115 1441T1123 1395Q1123 1342 1094 1317T1027 1292Q987 1292 959 1317T931 1395Z" />
-<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="1128" d="M102 647V797H1026V647H102ZM449 373Q449 408 458 431T482 470T518 491T563 498Q586 498 607 492T644 470T669 432T678 373Q678 340 669 317T644 278T607 255T563 248Q539 248 519 255T483
-277T458 316T449 373ZM449 1071Q449 1106 458 1129T482 1168T518 1189T563 1196Q586 1196 607 1190T644 1168T669 1130T678 1071Q678 1038 669 1015T644 976T607 953T563 946Q539 946 519 953T483 975T458 1014T449 1071Z" />
-<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="1182" d="M1071 551Q1071 414 1038 308T942 129T790 18T590 -20Q465 -20 367 33L299 -76L168 -2L248 129Q185 201 150 307T115 551Q115 687 148 792T244 970T395 1080T596 1118Q659 1118 715 1104T821
-1061L889 1169L1020 1096L940 967Q1002 894 1036 790T1071 551ZM303 551Q303 467 312 402T344 285L741 932Q712 949 675 958T592 967Q438 967 371 864T303 551ZM883 551Q883 710 844 809L446 164Q477 147 513 139T594 131Q748 131 815 236T883 551Z" />
-<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM949
-1241H829Q794 1269 753 1310T674 1396T604 1480T556 1548V1569H775Q791 1535 812 1495T857 1414T904 1335T949 1268V1241Z" />
-<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM489
-1268Q511 1297 534 1335T581 1413T626 1494T663 1569H882V1548Q866 1521 835 1481T765 1396T686 1311T610 1241H489V1268Z" />
-<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM930
-1241H809Q758 1275 704 1323T598 1427Q544 1372 491 1324T387 1241H266V1268Q292 1297 326 1335T393 1413T456 1494T502 1569H694Q710 1535 739 1495T802 1414T870 1335T930 1268V1241Z" />
-<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM309
-1395Q309 1449 337 1473T405 1497Q444 1497 473 1473T502 1395Q502 1342 473 1317T405 1292Q365 1292 337 1317T309 1395ZM684 1395Q684 1449 712 1473T780 1497Q799 1497 816 1491T847 1473T868 1441T876 1395Q876 1342 847 1317T780 1292Q740 1292 712 1317T684
-1395Z" />
-<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="1001" d="M10 1098H199L414 485Q428 445 442 401T469 313T491 228T504 152H510Q515 177 526 220T550 311T578 407T604 487L803 1098H991L557 -143Q529 -224 497 -288T421 -398T320 -467T182 -492Q130
--492 92 -487T27 -475V-330Q48 -335 80 -338T147 -342Q195 -342 230 -331T291 -297T335 -243T369 -170L426 -10L10 1098ZM407 1268Q429 1297 452 1335T499 1413T544 1494T581 1569H800V1548Q784 1521 753 1481T683 1396T604 1311T528 1241H407V1268Z" />
-<glyph unicode="&#xfe;" glyph-name="thorn" horiz-adv-x="1200" d="M356 950Q379 985 408 1015T475 1068T562 1104T670 1118Q764 1118 841 1082T972 975T1057 797T1087 551Q1087 410 1057 304T973 125T841 17T670 -20Q611 -20 563 -7T477 27T409 78T356 139H344Q347
-105 350 74Q352 48 354 21T356 -23V-492H174V1556H356V1098L348 950H356ZM635 967Q559 967 507 944T422 874T374 757T356 592V551Q356 450 369 372T415 240T502 159T637 131Q772 131 835 240T899 553Q899 761 836 864T635 967Z" />
-<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="1001" d="M10 1098H199L414 485Q428 445 442 401T469 313T491 228T504 152H510Q515 177 526 220T550 311T578 407T604 487L803 1098H991L557 -143Q529 -224 497 -288T421 -398T320 -467T182 -492Q130
--492 92 -487T27 -475V-330Q48 -335 80 -338T147 -342Q195 -342 230 -331T291 -297T335 -243T369 -170L426 -10L10 1098ZM484 1395Q484 1449 512 1473T580 1497Q619 1497 648 1473T677 1395Q677 1342 648 1317T580 1292Q540 1292 512 1317T484 1395ZM859 1395Q859
-1449 887 1473T955 1497Q974 1497 991 1491T1022 1473T1043 1441T1051 1395Q1051 1342 1022 1317T955 1292Q915 1292 887 1317T859 1395Z" />
-<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="1024" d="M82 465V633H942V465H82Z" />
-<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="2048" d="M82 465V633H1966V465H82Z" />
-<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="358" d="M37 961L23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H336Q321 1401 307 1335T279 1204T255 1076T236 961H37Z" />
-<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="358" d="M322 1462L336 1440Q322 1385 303 1325T260 1202T211 1078T160 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H322Z" />
-<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="512" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362Z" />
-<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="743" d="M422 961L408 983Q422 1037 441 1098T484 1221T533 1344T584 1462H721Q706 1401 692 1335T664 1204T640 1076T621 961H422ZM37 961L23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H336Q321
-1401 307 1335T279 1204T255 1076T236 961H37Z" />
-<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="743" d="M322 1462L336 1440Q322 1385 303 1325T260 1202T211 1078T160 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H322ZM707 1462L721 1440Q707 1385 688 1325T645 1202T596 1078T545
-961H408Q422 1021 436 1087T464 1219T489 1347T508 1462H707Z" />
-<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="897" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362ZM748 238L762 215Q748 161 729 100T686 -23T637 -146T586 -264H449Q463
--203 477 -137T505 -6T530 122T549 238H748Z" />
-<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="770" d="M150 748Q150 819 168 869T217 950T292 996T385 1010Q434 1010 477 996T552 951T602 869T621 748Q621 678 603 628T552 547T477 500T385 485Q335 485 292 500T218 546T168 628T150 748Z" />
-<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="590" d="M82 553L391 967L508 889L270 541L508 193L391 115L82 526V553Z" />
-<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="590" d="M508 526L199 115L82 193L319 541L82 889L199 967L508 553V526Z" />
-</font>
-</defs>
-</svg>
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
deleted file mode 100644
index fb8cea662b243..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
deleted file mode 100644
index abf19899f75a0..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
deleted file mode 100644
index 9f93f74c3bede..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png
deleted file mode 100644
index 137a9782e8c25..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png
deleted file mode 100755
index bccf3ce87d25f..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png
deleted file mode 100755
index ed6f12af1b392..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon.ico b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon.ico
deleted file mode 100755
index 8b60bcf06a768..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon.ico and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png
deleted file mode 100644
index c1e90ff0efd42..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif
deleted file mode 100644
index b75ed2b735d92..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png
deleted file mode 100644
index 962d2a12674d0..0000000000000
Binary files a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png and /dev/null differ
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lang/translator.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lang/translator.js
index 68c6b34d21e34..0c247b6c4ab37 100644
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lang/translator.js
+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lang/translator.js
@@ -25,17 +25,18 @@
 
             sel = sel || '[data-sw-translate]';
 
-            $(sel).each(function () {
-                $(this).html($this._tryTranslate($(this).html()));
-
-                $(this).val($this._tryTranslate($(this).val()));
-                $(this).attr('title', $this._tryTranslate($(this).attr('title')));
+            Array.prototype.slice.call(document.querySelectorAll(sel)).forEach(function (elem) {
+                elem.innerHTML = $this._tryTranslate(elem.innerHTML);
+                elem.value = $this._tryTranslate(elem.value);
+                elem.setAttribute('title', $this._tryTranslate(elem.getAttribute('title')));
             });
         },
 
         /** @function translate */
         _tryTranslate: function (word) {
-            return this._words[$.trim(word)] !== undefined ? this._words[$.trim(word)] : word;
+            word = word || '';
+
+            return this._words[word.trim()] !== undefined ? this._words[word.trim()] : word;
         },
 
         /** @function learn */
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/backbone-min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/backbone-min.js
deleted file mode 100644
index a3f544be6d9e8..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/backbone-min.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Backbone.js 1.1.2
-
-(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
-
-// From http://stackoverflow.com/a/19431552
-// Compatibility override - Backbone 1.1 got rid of the 'options' binding
-// automatically to views in the constructor - we need to keep that.
-Backbone.View = (function(View) {
-   return View.extend({
-        constructor: function(options) {
-            this.options = options || {};
-            View.apply(this, arguments);
-        }
-    });
-})(Backbone.View);
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/handlebars.min-v4.0.10.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/handlebars.min-v4.0.10.js
deleted file mode 100644
index ee8cfc0ae2382..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/handlebars.min-v4.0.10.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**!
-
- @license
- handlebars v4.0.10
-
-Copyright (C) 2011-2016 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-!function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b():"function"==typeof define&&define.amd?define([],b):"object"==typeof exports?exports.Handlebars=b():a.Handlebars=b()}(this,function(){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){"use strict";function d(){var a=r();return a.compile=function(b,c){return k.compile(b,c,a)},a.precompile=function(b,c){return k.precompile(b,c,a)},a.AST=i["default"],a.Compiler=k.Compiler,a.JavaScriptCompiler=m["default"],a.Parser=j.parser,a.parse=j.parse,a}var e=c(1)["default"];b.__esModule=!0;var f=c(2),g=e(f),h=c(35),i=e(h),j=c(36),k=c(41),l=c(42),m=e(l),n=c(39),o=e(n),p=c(34),q=e(p),r=g["default"].create,s=d();s.create=d,q["default"](s),s.Visitor=o["default"],s["default"]=s,b["default"]=s,a.exports=b["default"]},function(a,b){"use strict";b["default"]=function(a){return a&&a.__esModule?a:{"default":a}},b.__esModule=!0},function(a,b,c){"use strict";function d(){var a=new h.HandlebarsEnvironment;return n.extend(a,h),a.SafeString=j["default"],a.Exception=l["default"],a.Utils=n,a.escapeExpression=n.escapeExpression,a.VM=p,a.template=function(b){return p.template(b,a)},a}var e=c(3)["default"],f=c(1)["default"];b.__esModule=!0;var g=c(4),h=e(g),i=c(21),j=f(i),k=c(6),l=f(k),m=c(5),n=e(m),o=c(22),p=e(o),q=c(34),r=f(q),s=d();s.create=d,r["default"](s),s["default"]=s,b["default"]=s,a.exports=b["default"]},function(a,b){"use strict";b["default"]=function(a){if(a&&a.__esModule)return a;var b={};if(null!=a)for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&(b[c]=a[c]);return b["default"]=a,b},b.__esModule=!0},function(a,b,c){"use strict";function d(a,b,c){this.helpers=a||{},this.partials=b||{},this.decorators=c||{},i.registerDefaultHelpers(this),j.registerDefaultDecorators(this)}var e=c(1)["default"];b.__esModule=!0,b.HandlebarsEnvironment=d;var f=c(5),g=c(6),h=e(g),i=c(10),j=c(18),k=c(20),l=e(k),m="4.0.10";b.VERSION=m;var n=7;b.COMPILER_REVISION=n;var o={1:"<= 1.0.rc.2",2:"== 1.0.0-rc.3",3:"== 1.0.0-rc.4",4:"== 1.x.x",5:"== 2.0.0-alpha.x",6:">= 2.0.0-beta.1",7:">= 4.0.0"};b.REVISION_CHANGES=o;var p="[object Object]";d.prototype={constructor:d,logger:l["default"],log:l["default"].log,registerHelper:function(a,b){if(f.toString.call(a)===p){if(b)throw new h["default"]("Arg not supported with multiple helpers");f.extend(this.helpers,a)}else this.helpers[a]=b},unregisterHelper:function(a){delete this.helpers[a]},registerPartial:function(a,b){if(f.toString.call(a)===p)f.extend(this.partials,a);else{if("undefined"==typeof b)throw new h["default"]('Attempting to register a partial called "'+a+'" as undefined');this.partials[a]=b}},unregisterPartial:function(a){delete this.partials[a]},registerDecorator:function(a,b){if(f.toString.call(a)===p){if(b)throw new h["default"]("Arg not supported with multiple decorators");f.extend(this.decorators,a)}else this.decorators[a]=b},unregisterDecorator:function(a){delete this.decorators[a]}};var q=l["default"].log;b.log=q,b.createFrame=f.createFrame,b.logger=l["default"]},function(a,b){"use strict";function c(a){return k[a]}function d(a){for(var b=1;b<arguments.length;b++)for(var c in arguments[b])Object.prototype.hasOwnProperty.call(arguments[b],c)&&(a[c]=arguments[b][c]);return a}function e(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1}function f(a){if("string"!=typeof a){if(a&&a.toHTML)return a.toHTML();if(null==a)return"";if(!a)return a+"";a=""+a}return m.test(a)?a.replace(l,c):a}function g(a){return!a&&0!==a||!(!p(a)||0!==a.length)}function h(a){var b=d({},a);return b._parent=a,b}function i(a,b){return a.path=b,a}function j(a,b){return(a?a+".":"")+b}b.__esModule=!0,b.extend=d,b.indexOf=e,b.escapeExpression=f,b.isEmpty=g,b.createFrame=h,b.blockParams=i,b.appendContextPath=j;var k={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;","=":"&#x3D;"},l=/[&<>"'`=]/g,m=/[&<>"'`=]/,n=Object.prototype.toString;b.toString=n;var o=function(a){return"function"==typeof a};o(/x/)&&(b.isFunction=o=function(a){return"function"==typeof a&&"[object Function]"===n.call(a)}),b.isFunction=o;var p=Array.isArray||function(a){return!(!a||"object"!=typeof a)&&"[object Array]"===n.call(a)};b.isArray=p},function(a,b,c){"use strict";function d(a,b){var c=b&&b.loc,g=void 0,h=void 0;c&&(g=c.start.line,h=c.start.column,a+=" - "+g+":"+h);for(var i=Error.prototype.constructor.call(this,a),j=0;j<f.length;j++)this[f[j]]=i[f[j]];Error.captureStackTrace&&Error.captureStackTrace(this,d);try{c&&(this.lineNumber=g,e?Object.defineProperty(this,"column",{value:h,enumerable:!0}):this.column=h)}catch(k){}}var e=c(7)["default"];b.__esModule=!0;var f=["description","fileName","lineNumber","message","name","number","stack"];d.prototype=new Error,b["default"]=d,a.exports=b["default"]},function(a,b,c){a.exports={"default":c(8),__esModule:!0}},function(a,b,c){var d=c(9);a.exports=function(a,b,c){return d.setDesc(a,b,c)}},function(a,b){var c=Object;a.exports={create:c.create,getProto:c.getPrototypeOf,isEnum:{}.propertyIsEnumerable,getDesc:c.getOwnPropertyDescriptor,setDesc:c.defineProperty,setDescs:c.defineProperties,getKeys:c.keys,getNames:c.getOwnPropertyNames,getSymbols:c.getOwnPropertySymbols,each:[].forEach}},function(a,b,c){"use strict";function d(a){g["default"](a),i["default"](a),k["default"](a),m["default"](a),o["default"](a),q["default"](a),s["default"](a)}var e=c(1)["default"];b.__esModule=!0,b.registerDefaultHelpers=d;var f=c(11),g=e(f),h=c(12),i=e(h),j=c(13),k=e(j),l=c(14),m=e(l),n=c(15),o=e(n),p=c(16),q=e(p),r=c(17),s=e(r)},function(a,b,c){"use strict";b.__esModule=!0;var d=c(5);b["default"]=function(a){a.registerHelper("blockHelperMissing",function(b,c){var e=c.inverse,f=c.fn;if(b===!0)return f(this);if(b===!1||null==b)return e(this);if(d.isArray(b))return b.length>0?(c.ids&&(c.ids=[c.name]),a.helpers.each(b,c)):e(this);if(c.data&&c.ids){var g=d.createFrame(c.data);g.contextPath=d.appendContextPath(c.data.contextPath,c.name),c={data:g}}return f(b,c)})},a.exports=b["default"]},function(a,b,c){"use strict";var d=c(1)["default"];b.__esModule=!0;var e=c(5),f=c(6),g=d(f);b["default"]=function(a){a.registerHelper("each",function(a,b){function c(b,c,f){j&&(j.key=b,j.index=c,j.first=0===c,j.last=!!f,k&&(j.contextPath=k+b)),i+=d(a[b],{data:j,blockParams:e.blockParams([a[b],b],[k+b,null])})}if(!b)throw new g["default"]("Must pass iterator to #each");var d=b.fn,f=b.inverse,h=0,i="",j=void 0,k=void 0;if(b.data&&b.ids&&(k=e.appendContextPath(b.data.contextPath,b.ids[0])+"."),e.isFunction(a)&&(a=a.call(this)),b.data&&(j=e.createFrame(b.data)),a&&"object"==typeof a)if(e.isArray(a))for(var l=a.length;h<l;h++)h in a&&c(h,h,h===a.length-1);else{var m=void 0;for(var n in a)a.hasOwnProperty(n)&&(void 0!==m&&c(m,h-1),m=n,h++);void 0!==m&&c(m,h-1,!0)}return 0===h&&(i=f(this)),i})},a.exports=b["default"]},function(a,b,c){"use strict";var d=c(1)["default"];b.__esModule=!0;var e=c(6),f=d(e);b["default"]=function(a){a.registerHelper("helperMissing",function(){if(1!==arguments.length)throw new f["default"]('Missing helper: "'+arguments[arguments.length-1].name+'"')})},a.exports=b["default"]},function(a,b,c){"use strict";b.__esModule=!0;var d=c(5);b["default"]=function(a){a.registerHelper("if",function(a,b){return d.isFunction(a)&&(a=a.call(this)),!b.hash.includeZero&&!a||d.isEmpty(a)?b.inverse(this):b.fn(this)}),a.registerHelper("unless",function(b,c){return a.helpers["if"].call(this,b,{fn:c.inverse,inverse:c.fn,hash:c.hash})})},a.exports=b["default"]},function(a,b){"use strict";b.__esModule=!0,b["default"]=function(a){a.registerHelper("log",function(){for(var b=[void 0],c=arguments[arguments.length-1],d=0;d<arguments.length-1;d++)b.push(arguments[d]);var e=1;null!=c.hash.level?e=c.hash.level:c.data&&null!=c.data.level&&(e=c.data.level),b[0]=e,a.log.apply(a,b)})},a.exports=b["default"]},function(a,b){"use strict";b.__esModule=!0,b["default"]=function(a){a.registerHelper("lookup",function(a,b){return a&&a[b]})},a.exports=b["default"]},function(a,b,c){"use strict";b.__esModule=!0;var d=c(5);b["default"]=function(a){a.registerHelper("with",function(a,b){d.isFunction(a)&&(a=a.call(this));var c=b.fn;if(d.isEmpty(a))return b.inverse(this);var e=b.data;return b.data&&b.ids&&(e=d.createFrame(b.data),e.contextPath=d.appendContextPath(b.data.contextPath,b.ids[0])),c(a,{data:e,blockParams:d.blockParams([a],[e&&e.contextPath])})})},a.exports=b["default"]},function(a,b,c){"use strict";function d(a){g["default"](a)}var e=c(1)["default"];b.__esModule=!0,b.registerDefaultDecorators=d;var f=c(19),g=e(f)},function(a,b,c){"use strict";b.__esModule=!0;var d=c(5);b["default"]=function(a){a.registerDecorator("inline",function(a,b,c,e){var f=a;return b.partials||(b.partials={},f=function(e,f){var g=c.partials;c.partials=d.extend({},g,b.partials);var h=a(e,f);return c.partials=g,h}),b.partials[e.args[0]]=e.fn,f})},a.exports=b["default"]},function(a,b,c){"use strict";b.__esModule=!0;var d=c(5),e={methodMap:["debug","info","warn","error"],level:"info",lookupLevel:function(a){if("string"==typeof a){var b=d.indexOf(e.methodMap,a.toLowerCase());a=b>=0?b:parseInt(a,10)}return a},log:function(a){if(a=e.lookupLevel(a),"undefined"!=typeof console&&e.lookupLevel(e.level)<=a){var b=e.methodMap[a];console[b]||(b="log");for(var c=arguments.length,d=Array(c>1?c-1:0),f=1;f<c;f++)d[f-1]=arguments[f];console[b].apply(console,d)}}};b["default"]=e,a.exports=b["default"]},function(a,b){"use strict";function c(a){this.string=a}b.__esModule=!0,c.prototype.toString=c.prototype.toHTML=function(){return""+this.string},b["default"]=c,a.exports=b["default"]},function(a,b,c){"use strict";function d(a){var b=a&&a[0]||1,c=s.COMPILER_REVISION;if(b!==c){if(b<c){var d=s.REVISION_CHANGES[c],e=s.REVISION_CHANGES[b];throw new r["default"]("Template was precompiled with an older version of Handlebars than the current runtime. Please update your precompiler to a newer version ("+d+") or downgrade your runtime to an older version ("+e+").")}throw new r["default"]("Template was precompiled with a newer version of Handlebars than the current runtime. Please update your runtime to a newer version ("+a[1]+").")}}function e(a,b){function c(c,d,e){e.hash&&(d=p.extend({},d,e.hash),e.ids&&(e.ids[0]=!0)),c=b.VM.resolvePartial.call(this,c,d,e);var f=b.VM.invokePartial.call(this,c,d,e);if(null==f&&b.compile&&(e.partials[e.name]=b.compile(c,a.compilerOptions,b),f=e.partials[e.name](d,e)),null!=f){if(e.indent){for(var g=f.split("\n"),h=0,i=g.length;h<i&&(g[h]||h+1!==i);h++)g[h]=e.indent+g[h];f=g.join("\n")}return f}throw new r["default"]("The partial "+e.name+" could not be compiled when running in runtime-only mode")}function d(b){function c(b){return""+a.main(e,b,e.helpers,e.partials,g,i,h)}var f=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],g=f.data;d._setup(f),!f.partial&&a.useData&&(g=j(b,g));var h=void 0,i=a.useBlockParams?[]:void 0;return a.useDepths&&(h=f.depths?b!=f.depths[0]?[b].concat(f.depths):f.depths:[b]),(c=k(a.main,c,e,f.depths||[],g,i))(b,f)}if(!b)throw new r["default"]("No environment passed to template");if(!a||!a.main)throw new r["default"]("Unknown template object: "+typeof a);a.main.decorator=a.main_d,b.VM.checkRevision(a.compiler);var e={strict:function(a,b){if(!(b in a))throw new r["default"]('"'+b+'" not defined in '+a);return a[b]},lookup:function(a,b){for(var c=a.length,d=0;d<c;d++)if(a[d]&&null!=a[d][b])return a[d][b]},lambda:function(a,b){return"function"==typeof a?a.call(b):a},escapeExpression:p.escapeExpression,invokePartial:c,fn:function(b){var c=a[b];return c.decorator=a[b+"_d"],c},programs:[],program:function(a,b,c,d,e){var g=this.programs[a],h=this.fn(a);return b||e||d||c?g=f(this,a,h,b,c,d,e):g||(g=this.programs[a]=f(this,a,h)),g},data:function(a,b){for(;a&&b--;)a=a._parent;return a},merge:function(a,b){var c=a||b;return a&&b&&a!==b&&(c=p.extend({},b,a)),c},nullContext:l({}),noop:b.VM.noop,compilerInfo:a.compiler};return d.isTop=!0,d._setup=function(c){c.partial?(e.helpers=c.helpers,e.partials=c.partials,e.decorators=c.decorators):(e.helpers=e.merge(c.helpers,b.helpers),a.usePartial&&(e.partials=e.merge(c.partials,b.partials)),(a.usePartial||a.useDecorators)&&(e.decorators=e.merge(c.decorators,b.decorators)))},d._child=function(b,c,d,g){if(a.useBlockParams&&!d)throw new r["default"]("must pass block params");if(a.useDepths&&!g)throw new r["default"]("must pass parent depths");return f(e,b,a[b],c,0,d,g)},d}function f(a,b,c,d,e,f,g){function h(b){var e=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],h=g;return!g||b==g[0]||b===a.nullContext&&null===g[0]||(h=[b].concat(g)),c(a,b,a.helpers,a.partials,e.data||d,f&&[e.blockParams].concat(f),h)}return h=k(c,h,a,g,d,f),h.program=b,h.depth=g?g.length:0,h.blockParams=e||0,h}function g(a,b,c){return a?a.call||c.name||(c.name=a,a=c.partials[a]):a="@partial-block"===c.name?c.data["partial-block"]:c.partials[c.name],a}function h(a,b,c){var d=c.data&&c.data["partial-block"];c.partial=!0,c.ids&&(c.data.contextPath=c.ids[0]||c.data.contextPath);var e=void 0;if(c.fn&&c.fn!==i&&!function(){c.data=s.createFrame(c.data);var a=c.fn;e=c.data["partial-block"]=function(b){var c=arguments.length<=1||void 0===arguments[1]?{}:arguments[1];return c.data=s.createFrame(c.data),c.data["partial-block"]=d,a(b,c)},a.partials&&(c.partials=p.extend({},c.partials,a.partials))}(),void 0===a&&e&&(a=e),void 0===a)throw new r["default"]("The partial "+c.name+" could not be found");if(a instanceof Function)return a(b,c)}function i(){return""}function j(a,b){return b&&"root"in b||(b=b?s.createFrame(b):{},b.root=a),b}function k(a,b,c,d,e,f){if(a.decorator){var g={};b=a.decorator(b,g,c,d&&d[0],e,f,d),p.extend(b,g)}return b}var l=c(23)["default"],m=c(3)["default"],n=c(1)["default"];b.__esModule=!0,b.checkRevision=d,b.template=e,b.wrapProgram=f,b.resolvePartial=g,b.invokePartial=h,b.noop=i;var o=c(5),p=m(o),q=c(6),r=n(q),s=c(4)},function(a,b,c){a.exports={"default":c(24),__esModule:!0}},function(a,b,c){c(25),a.exports=c(30).Object.seal},function(a,b,c){var d=c(26);c(27)("seal",function(a){return function(b){return a&&d(b)?a(b):b}})},function(a,b){a.exports=function(a){return"object"==typeof a?null!==a:"function"==typeof a}},function(a,b,c){var d=c(28),e=c(30),f=c(33);a.exports=function(a,b){var c=(e.Object||{})[a]||Object[a],g={};g[a]=b(c),d(d.S+d.F*f(function(){c(1)}),"Object",g)}},function(a,b,c){var d=c(29),e=c(30),f=c(31),g="prototype",h=function(a,b,c){var i,j,k,l=a&h.F,m=a&h.G,n=a&h.S,o=a&h.P,p=a&h.B,q=a&h.W,r=m?e:e[b]||(e[b]={}),s=m?d:n?d[b]:(d[b]||{})[g];m&&(c=b);for(i in c)j=!l&&s&&i in s,j&&i in r||(k=j?s[i]:c[i],r[i]=m&&"function"!=typeof s[i]?c[i]:p&&j?f(k,d):q&&s[i]==k?function(a){var b=function(b){return this instanceof a?new a(b):a(b)};return b[g]=a[g],b}(k):o&&"function"==typeof k?f(Function.call,k):k,o&&((r[g]||(r[g]={}))[i]=k))};h.F=1,h.G=2,h.S=4,h.P=8,h.B=16,h.W=32,a.exports=h},function(a,b){var c=a.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=c)},function(a,b){var c=a.exports={version:"1.2.6"};"number"==typeof __e&&(__e=c)},function(a,b,c){var d=c(32);a.exports=function(a,b,c){if(d(a),void 0===b)return a;switch(c){case 1:return function(c){return a.call(b,c)};case 2:return function(c,d){return a.call(b,c,d)};case 3:return function(c,d,e){return a.call(b,c,d,e)}}return function(){return a.apply(b,arguments)}}},function(a,b){a.exports=function(a){if("function"!=typeof a)throw TypeError(a+" is not a function!");return a}},function(a,b){a.exports=function(a){try{return!!a()}catch(b){return!0}}},function(a,b){(function(c){"use strict";b.__esModule=!0,b["default"]=function(a){var b="undefined"!=typeof c?c:window,d=b.Handlebars;a.noConflict=function(){return b.Handlebars===a&&(b.Handlebars=d),a}},a.exports=b["default"]}).call(b,function(){return this}())},function(a,b){"use strict";b.__esModule=!0;var c={helpers:{helperExpression:function(a){return"SubExpression"===a.type||("MustacheStatement"===a.type||"BlockStatement"===a.type)&&!!(a.params&&a.params.length||a.hash)},scopedId:function(a){return/^\.|this\b/.test(a.original)},simpleId:function(a){return 1===a.parts.length&&!c.helpers.scopedId(a)&&!a.depth}}};b["default"]=c,a.exports=b["default"]},function(a,b,c){"use strict";function d(a,b){if("Program"===a.type)return a;h["default"].yy=n,n.locInfo=function(a){return new n.SourceLocation(b&&b.srcName,a)};var c=new j["default"](b);return c.accept(h["default"].parse(a))}var e=c(1)["default"],f=c(3)["default"];b.__esModule=!0,b.parse=d;var g=c(37),h=e(g),i=c(38),j=e(i),k=c(40),l=f(k),m=c(5);b.parser=h["default"];var n={};m.extend(n,l)},function(a,b){"use strict";b.__esModule=!0;var c=function(){function a(){this.yy={}}var b={trace:function(){},yy:{},symbols_:{error:2,root:3,program:4,EOF:5,program_repetition0:6,statement:7,mustache:8,block:9,rawBlock:10,partial:11,partialBlock:12,content:13,COMMENT:14,CONTENT:15,openRawBlock:16,rawBlock_repetition_plus0:17,END_RAW_BLOCK:18,OPEN_RAW_BLOCK:19,helperName:20,openRawBlock_repetition0:21,openRawBlock_option0:22,CLOSE_RAW_BLOCK:23,openBlock:24,block_option0:25,closeBlock:26,openInverse:27,block_option1:28,OPEN_BLOCK:29,openBlock_repetition0:30,openBlock_option0:31,openBlock_option1:32,CLOSE:33,OPEN_INVERSE:34,openInverse_repetition0:35,openInverse_option0:36,openInverse_option1:37,openInverseChain:38,OPEN_INVERSE_CHAIN:39,openInverseChain_repetition0:40,openInverseChain_option0:41,openInverseChain_option1:42,inverseAndProgram:43,INVERSE:44,inverseChain:45,inverseChain_option0:46,OPEN_ENDBLOCK:47,OPEN:48,mustache_repetition0:49,mustache_option0:50,OPEN_UNESCAPED:51,mustache_repetition1:52,mustache_option1:53,CLOSE_UNESCAPED:54,OPEN_PARTIAL:55,partialName:56,partial_repetition0:57,partial_option0:58,openPartialBlock:59,OPEN_PARTIAL_BLOCK:60,openPartialBlock_repetition0:61,openPartialBlock_option0:62,param:63,sexpr:64,OPEN_SEXPR:65,sexpr_repetition0:66,sexpr_option0:67,CLOSE_SEXPR:68,hash:69,hash_repetition_plus0:70,hashSegment:71,ID:72,EQUALS:73,blockParams:74,OPEN_BLOCK_PARAMS:75,blockParams_repetition_plus0:76,CLOSE_BLOCK_PARAMS:77,path:78,dataName:79,STRING:80,NUMBER:81,BOOLEAN:82,UNDEFINED:83,NULL:84,DATA:85,pathSegments:86,SEP:87,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",14:"COMMENT",15:"CONTENT",18:"END_RAW_BLOCK",19:"OPEN_RAW_BLOCK",23:"CLOSE_RAW_BLOCK",29:"OPEN_BLOCK",33:"CLOSE",34:"OPEN_INVERSE",39:"OPEN_INVERSE_CHAIN",44:"INVERSE",47:"OPEN_ENDBLOCK",48:"OPEN",51:"OPEN_UNESCAPED",54:"CLOSE_UNESCAPED",55:"OPEN_PARTIAL",60:"OPEN_PARTIAL_BLOCK",65:"OPEN_SEXPR",68:"CLOSE_SEXPR",72:"ID",73:"EQUALS",75:"OPEN_BLOCK_PARAMS",77:"CLOSE_BLOCK_PARAMS",80:"STRING",81:"NUMBER",82:"BOOLEAN",83:"UNDEFINED",84:"NULL",85:"DATA",87:"SEP"},productions_:[0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[13,1],[10,3],[16,5],[9,4],[9,4],[24,6],[27,6],[38,6],[43,2],[45,3],[45,1],[26,3],[8,5],[8,5],[11,5],[12,3],[59,5],[63,1],[63,1],[64,5],[69,1],[71,3],[74,3],[20,1],[20,1],[20,1],[20,1],[20,1],[20,1],[20,1],[56,1],[56,1],[79,2],[78,1],[86,3],[86,1],[6,0],[6,2],[17,1],[17,2],[21,0],[21,2],[22,0],[22,1],[25,0],[25,1],[28,0],[28,1],[30,0],[30,2],[31,0],[31,1],[32,0],[32,1],[35,0],[35,2],[36,0],[36,1],[37,0],[37,1],[40,0],[40,2],[41,0],[41,1],[42,0],[42,1],[46,0],[46,1],[49,0],[49,2],[50,0],[50,1],[52,0],[52,2],[53,0],[53,1],[57,0],[57,2],[58,0],[58,1],[61,0],[61,2],[62,0],[62,1],[66,0],[66,2],[67,0],[67,1],[70,1],[70,2],[76,1],[76,2]],performAction:function(a,b,c,d,e,f,g){var h=f.length-1;switch(e){case 1:return f[h-1];case 2:this.$=d.prepareProgram(f[h]);break;case 3:this.$=f[h];break;case 4:this.$=f[h];break;case 5:this.$=f[h];break;case 6:this.$=f[h];break;case 7:this.$=f[h];break;case 8:this.$=f[h];break;case 9:this.$={type:"CommentStatement",value:d.stripComment(f[h]),strip:d.stripFlags(f[h],f[h]),loc:d.locInfo(this._$)};break;case 10:this.$={type:"ContentStatement",original:f[h],value:f[h],loc:d.locInfo(this._$)};break;case 11:this.$=d.prepareRawBlock(f[h-2],f[h-1],f[h],this._$);break;case 12:this.$={path:f[h-3],params:f[h-2],hash:f[h-1]};break;case 13:this.$=d.prepareBlock(f[h-3],f[h-2],f[h-1],f[h],!1,this._$);break;case 14:this.$=d.prepareBlock(f[h-3],f[h-2],f[h-1],f[h],!0,this._$);break;case 15:this.$={open:f[h-5],path:f[h-4],params:f[h-3],hash:f[h-2],blockParams:f[h-1],strip:d.stripFlags(f[h-5],f[h])};break;case 16:this.$={path:f[h-4],params:f[h-3],hash:f[h-2],blockParams:f[h-1],strip:d.stripFlags(f[h-5],f[h])};break;case 17:this.$={path:f[h-4],params:f[h-3],hash:f[h-2],blockParams:f[h-1],strip:d.stripFlags(f[h-5],f[h])};break;case 18:this.$={strip:d.stripFlags(f[h-1],f[h-1]),program:f[h]};break;case 19:var i=d.prepareBlock(f[h-2],f[h-1],f[h],f[h],!1,this._$),j=d.prepareProgram([i],f[h-1].loc);j.chained=!0,this.$={strip:f[h-2].strip,program:j,chain:!0};break;case 20:this.$=f[h];break;case 21:this.$={path:f[h-1],strip:d.stripFlags(f[h-2],f[h])};break;case 22:this.$=d.prepareMustache(f[h-3],f[h-2],f[h-1],f[h-4],d.stripFlags(f[h-4],f[h]),this._$);break;case 23:this.$=d.prepareMustache(f[h-3],f[h-2],f[h-1],f[h-4],d.stripFlags(f[h-4],f[h]),this._$);break;case 24:this.$={type:"PartialStatement",name:f[h-3],params:f[h-2],hash:f[h-1],indent:"",strip:d.stripFlags(f[h-4],f[h]),loc:d.locInfo(this._$)};break;case 25:this.$=d.preparePartialBlock(f[h-2],f[h-1],f[h],this._$);break;case 26:this.$={path:f[h-3],params:f[h-2],hash:f[h-1],strip:d.stripFlags(f[h-4],f[h])};break;case 27:this.$=f[h];break;case 28:this.$=f[h];break;case 29:this.$={type:"SubExpression",path:f[h-3],params:f[h-2],hash:f[h-1],loc:d.locInfo(this._$)};break;case 30:this.$={type:"Hash",pairs:f[h],loc:d.locInfo(this._$)};break;case 31:this.$={type:"HashPair",key:d.id(f[h-2]),value:f[h],loc:d.locInfo(this._$)};break;case 32:this.$=d.id(f[h-1]);break;case 33:this.$=f[h];break;case 34:this.$=f[h];break;case 35:this.$={type:"StringLiteral",value:f[h],original:f[h],loc:d.locInfo(this._$)};break;case 36:this.$={type:"NumberLiteral",value:Number(f[h]),original:Number(f[h]),loc:d.locInfo(this._$)};break;case 37:this.$={type:"BooleanLiteral",value:"true"===f[h],original:"true"===f[h],loc:d.locInfo(this._$)};break;case 38:this.$={type:"UndefinedLiteral",original:void 0,value:void 0,loc:d.locInfo(this._$)};break;case 39:this.$={type:"NullLiteral",original:null,value:null,loc:d.locInfo(this._$)};break;case 40:this.$=f[h];break;case 41:this.$=f[h];break;case 42:this.$=d.preparePath(!0,f[h],this._$);break;case 43:this.$=d.preparePath(!1,f[h],this._$);break;case 44:f[h-2].push({part:d.id(f[h]),original:f[h],separator:f[h-1]}),this.$=f[h-2];break;case 45:this.$=[{part:d.id(f[h]),original:f[h]}];break;case 46:this.$=[];break;case 47:f[h-1].push(f[h]);break;case 48:this.$=[f[h]];break;case 49:f[h-1].push(f[h]);break;case 50:this.$=[];break;case 51:f[h-1].push(f[h]);break;case 58:this.$=[];break;case 59:f[h-1].push(f[h]);break;case 64:this.$=[];break;case 65:f[h-1].push(f[h]);break;case 70:this.$=[];break;case 71:f[h-1].push(f[h]);break;case 78:this.$=[];break;case 79:f[h-1].push(f[h]);break;case 82:this.$=[];break;case 83:f[h-1].push(f[h]);break;case 86:this.$=[];break;case 87:f[h-1].push(f[h]);break;case 90:this.$=[];break;case 91:f[h-1].push(f[h]);break;case 94:this.$=[];break;case 95:f[h-1].push(f[h]);break;case 98:this.$=[f[h]];break;case 99:f[h-1].push(f[h]);break;case 100:this.$=[f[h]];break;case 101:f[h-1].push(f[h])}},table:[{3:1,4:2,5:[2,46],6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:10,13:11,14:[1,12],15:[1,20],16:17,19:[1,23],24:15,27:16,29:[1,21],34:[1,22],39:[2,2],44:[2,2],47:[2,2],48:[1,13],51:[1,14],55:[1,18],59:19,60:[1,24]},{1:[2,1]},{5:[2,47],14:[2,47],15:[2,47],19:[2,47],29:[2,47],34:[2,47],39:[2,47],44:[2,47],47:[2,47],48:[2,47],51:[2,47],55:[2,47],60:[2,47]},{5:[2,3],14:[2,3],15:[2,3],19:[2,3],29:[2,3],34:[2,3],39:[2,3],44:[2,3],47:[2,3],48:[2,3],51:[2,3],55:[2,3],60:[2,3]},{5:[2,4],14:[2,4],15:[2,4],19:[2,4],29:[2,4],34:[2,4],39:[2,4],44:[2,4],47:[2,4],48:[2,4],51:[2,4],55:[2,4],60:[2,4]},{5:[2,5],14:[2,5],15:[2,5],19:[2,5],29:[2,5],34:[2,5],39:[2,5],44:[2,5],47:[2,5],48:[2,5],51:[2,5],55:[2,5],60:[2,5]},{5:[2,6],14:[2,6],15:[2,6],19:[2,6],29:[2,6],34:[2,6],39:[2,6],44:[2,6],47:[2,6],48:[2,6],51:[2,6],55:[2,6],60:[2,6]},{5:[2,7],14:[2,7],15:[2,7],19:[2,7],29:[2,7],34:[2,7],39:[2,7],44:[2,7],47:[2,7],48:[2,7],51:[2,7],55:[2,7],60:[2,7]},{5:[2,8],14:[2,8],15:[2,8],19:[2,8],29:[2,8],34:[2,8],39:[2,8],44:[2,8],47:[2,8],48:[2,8],51:[2,8],55:[2,8],60:[2,8]},{5:[2,9],14:[2,9],15:[2,9],19:[2,9],29:[2,9],34:[2,9],39:[2,9],44:[2,9],47:[2,9],48:[2,9],51:[2,9],55:[2,9],60:[2,9]},{20:25,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:36,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{4:37,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],39:[2,46],44:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{4:38,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],44:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{13:40,15:[1,20],17:39},{20:42,56:41,64:43,65:[1,44],72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{4:45,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{5:[2,10],14:[2,10],15:[2,10],18:[2,10],19:[2,10],29:[2,10],34:[2,10],39:[2,10],44:[2,10],47:[2,10],48:[2,10],51:[2,10],55:[2,10],60:[2,10]},{20:46,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:47,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:48,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:42,56:49,64:43,65:[1,44],72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{33:[2,78],49:50,65:[2,78],72:[2,78],80:[2,78],81:[2,78],82:[2,78],83:[2,78],84:[2,78],85:[2,78]},{23:[2,33],33:[2,33],54:[2,33],65:[2,33],68:[2,33],72:[2,33],75:[2,33],80:[2,33],81:[2,33],82:[2,33],83:[2,33],84:[2,33],85:[2,33]},{23:[2,34],33:[2,34],54:[2,34],65:[2,34],68:[2,34],72:[2,34],75:[2,34],80:[2,34],81:[2,34],82:[2,34],83:[2,34],84:[2,34],85:[2,34]},{23:[2,35],33:[2,35],54:[2,35],65:[2,35],68:[2,35],72:[2,35],75:[2,35],80:[2,35],81:[2,35],82:[2,35],83:[2,35],84:[2,35],85:[2,35]},{23:[2,36],33:[2,36],54:[2,36],65:[2,36],68:[2,36],72:[2,36],75:[2,36],80:[2,36],81:[2,36],82:[2,36],83:[2,36],84:[2,36],85:[2,36]},{23:[2,37],33:[2,37],54:[2,37],65:[2,37],68:[2,37],72:[2,37],75:[2,37],80:[2,37],81:[2,37],82:[2,37],83:[2,37],84:[2,37],85:[2,37]},{23:[2,38],33:[2,38],54:[2,38],65:[2,38],68:[2,38],72:[2,38],75:[2,38],80:[2,38],81:[2,38],82:[2,38],83:[2,38],84:[2,38],85:[2,38]},{23:[2,39],33:[2,39],54:[2,39],65:[2,39],68:[2,39],72:[2,39],75:[2,39],80:[2,39],81:[2,39],82:[2,39],83:[2,39],84:[2,39],85:[2,39]},{23:[2,43],33:[2,43],54:[2,43],65:[2,43],68:[2,43],72:[2,43],75:[2,43],80:[2,43],81:[2,43],82:[2,43],83:[2,43],84:[2,43],85:[2,43],87:[1,51]},{72:[1,35],86:52},{23:[2,45],33:[2,45],54:[2,45],65:[2,45],68:[2,45],72:[2,45],75:[2,45],80:[2,45],81:[2,45],82:[2,45],83:[2,45],84:[2,45],85:[2,45],87:[2,45]},{52:53,54:[2,82],65:[2,82],72:[2,82],80:[2,82],81:[2,82],82:[2,82],83:[2,82],84:[2,82],85:[2,82]},{25:54,38:56,39:[1,58],43:57,44:[1,59],45:55,47:[2,54]},{28:60,43:61,44:[1,59],47:[2,56]},{13:63,15:[1,20],18:[1,62]},{15:[2,48],18:[2,48]},{33:[2,86],57:64,65:[2,86],72:[2,86],80:[2,86],81:[2,86],82:[2,86],83:[2,86],84:[2,86],85:[2,86]},{33:[2,40],65:[2,40],72:[2,40],80:[2,40],81:[2,40],82:[2,40],83:[2,40],84:[2,40],85:[2,40]},{33:[2,41],65:[2,41],72:[2,41],80:[2,41],81:[2,41],82:[2,41],83:[2,41],84:[2,41],85:[2,41]},{20:65,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{26:66,47:[1,67]},{30:68,33:[2,58],65:[2,58],72:[2,58],75:[2,58],80:[2,58],81:[2,58],82:[2,58],83:[2,58],84:[2,58],85:[2,58]},{33:[2,64],35:69,65:[2,64],72:[2,64],75:[2,64],80:[2,64],81:[2,64],82:[2,64],83:[2,64],84:[2,64],85:[2,64]},{21:70,23:[2,50],65:[2,50],72:[2,50],80:[2,50],81:[2,50],82:[2,50],83:[2,50],84:[2,50],85:[2,50]},{33:[2,90],61:71,65:[2,90],72:[2,90],80:[2,90],81:[2,90],82:[2,90],83:[2,90],84:[2,90],85:[2,90]},{20:75,33:[2,80],50:72,63:73,64:76,65:[1,44],69:74,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{72:[1,80]},{23:[2,42],33:[2,42],54:[2,42],65:[2,42],68:[2,42],72:[2,42],75:[2,42],80:[2,42],81:[2,42],82:[2,42],83:[2,42],84:[2,42],85:[2,42],87:[1,51]},{20:75,53:81,54:[2,84],63:82,64:76,65:[1,44],69:83,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{26:84,47:[1,67]},{47:[2,55]},{4:85,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],39:[2,46],44:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{47:[2,20]},{20:86,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{4:87,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{26:88,47:[1,67]},{47:[2,57]},{5:[2,11],14:[2,11],15:[2,11],19:[2,11],29:[2,11],34:[2,11],39:[2,11],44:[2,11],47:[2,11],48:[2,11],51:[2,11],55:[2,11],60:[2,11]},{15:[2,49],18:[2,49]},{20:75,33:[2,88],58:89,63:90,64:76,65:[1,44],69:91,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{65:[2,94],66:92,68:[2,94],72:[2,94],80:[2,94],81:[2,94],82:[2,94],83:[2,94],84:[2,94],85:[2,94]},{5:[2,25],14:[2,25],15:[2,25],19:[2,25],29:[2,25],34:[2,25],39:[2,25],44:[2,25],47:[2,25],48:[2,25],51:[2,25],55:[2,25],60:[2,25]},{20:93,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,31:94,33:[2,60],63:95,64:76,65:[1,44],69:96,70:77,71:78,72:[1,79],75:[2,60],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,33:[2,66],36:97,63:98,64:76,65:[1,44],69:99,70:77,71:78,72:[1,79],75:[2,66],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,22:100,23:[2,52],63:101,64:76,65:[1,44],69:102,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,33:[2,92],62:103,63:104,64:76,65:[1,44],69:105,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{33:[1,106]},{33:[2,79],65:[2,79],72:[2,79],80:[2,79],81:[2,79],82:[2,79],83:[2,79],84:[2,79],85:[2,79]},{33:[2,81]},{23:[2,27],33:[2,27],54:[2,27],65:[2,27],68:[2,27],72:[2,27],75:[2,27],80:[2,27],81:[2,27],82:[2,27],83:[2,27],84:[2,27],85:[2,27]},{23:[2,28],33:[2,28],54:[2,28],65:[2,28],68:[2,28],72:[2,28],75:[2,28],80:[2,28],81:[2,28],82:[2,28],83:[2,28],84:[2,28],85:[2,28]},{23:[2,30],33:[2,30],54:[2,30],68:[2,30],71:107,72:[1,108],75:[2,30]},{23:[2,98],33:[2,98],54:[2,98],68:[2,98],72:[2,98],75:[2,98]},{23:[2,45],33:[2,45],54:[2,45],65:[2,45],68:[2,45],72:[2,45],73:[1,109],75:[2,45],80:[2,45],81:[2,45],82:[2,45],83:[2,45],84:[2,45],85:[2,45],87:[2,45]},{23:[2,44],33:[2,44],54:[2,44],65:[2,44],68:[2,44],72:[2,44],75:[2,44],80:[2,44],81:[2,44],82:[2,44],83:[2,44],84:[2,44],85:[2,44],87:[2,44]},{54:[1,110]},{54:[2,83],65:[2,83],72:[2,83],80:[2,83],81:[2,83],82:[2,83],83:[2,83],84:[2,83],85:[2,83]},{54:[2,85]},{5:[2,13],14:[2,13],15:[2,13],19:[2,13],29:[2,13],34:[2,13],39:[2,13],44:[2,13],47:[2,13],48:[2,13],51:[2,13],55:[2,13],60:[2,13]},{38:56,39:[1,58],43:57,44:[1,59],45:112,46:111,47:[2,76]},{33:[2,70],40:113,65:[2,70],72:[2,70],75:[2,70],80:[2,70],81:[2,70],82:[2,70],83:[2,70],84:[2,70],85:[2,70]},{47:[2,18]},{5:[2,14],14:[2,14],15:[2,14],19:[2,14],29:[2,14],34:[2,14],39:[2,14],44:[2,14],47:[2,14],48:[2,14],51:[2,14],55:[2,14],60:[2,14]},{33:[1,114]},{33:[2,87],65:[2,87],72:[2,87],80:[2,87],81:[2,87],82:[2,87],83:[2,87],84:[2,87],
-85:[2,87]},{33:[2,89]},{20:75,63:116,64:76,65:[1,44],67:115,68:[2,96],69:117,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{33:[1,118]},{32:119,33:[2,62],74:120,75:[1,121]},{33:[2,59],65:[2,59],72:[2,59],75:[2,59],80:[2,59],81:[2,59],82:[2,59],83:[2,59],84:[2,59],85:[2,59]},{33:[2,61],75:[2,61]},{33:[2,68],37:122,74:123,75:[1,121]},{33:[2,65],65:[2,65],72:[2,65],75:[2,65],80:[2,65],81:[2,65],82:[2,65],83:[2,65],84:[2,65],85:[2,65]},{33:[2,67],75:[2,67]},{23:[1,124]},{23:[2,51],65:[2,51],72:[2,51],80:[2,51],81:[2,51],82:[2,51],83:[2,51],84:[2,51],85:[2,51]},{23:[2,53]},{33:[1,125]},{33:[2,91],65:[2,91],72:[2,91],80:[2,91],81:[2,91],82:[2,91],83:[2,91],84:[2,91],85:[2,91]},{33:[2,93]},{5:[2,22],14:[2,22],15:[2,22],19:[2,22],29:[2,22],34:[2,22],39:[2,22],44:[2,22],47:[2,22],48:[2,22],51:[2,22],55:[2,22],60:[2,22]},{23:[2,99],33:[2,99],54:[2,99],68:[2,99],72:[2,99],75:[2,99]},{73:[1,109]},{20:75,63:126,64:76,65:[1,44],72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{5:[2,23],14:[2,23],15:[2,23],19:[2,23],29:[2,23],34:[2,23],39:[2,23],44:[2,23],47:[2,23],48:[2,23],51:[2,23],55:[2,23],60:[2,23]},{47:[2,19]},{47:[2,77]},{20:75,33:[2,72],41:127,63:128,64:76,65:[1,44],69:129,70:77,71:78,72:[1,79],75:[2,72],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{5:[2,24],14:[2,24],15:[2,24],19:[2,24],29:[2,24],34:[2,24],39:[2,24],44:[2,24],47:[2,24],48:[2,24],51:[2,24],55:[2,24],60:[2,24]},{68:[1,130]},{65:[2,95],68:[2,95],72:[2,95],80:[2,95],81:[2,95],82:[2,95],83:[2,95],84:[2,95],85:[2,95]},{68:[2,97]},{5:[2,21],14:[2,21],15:[2,21],19:[2,21],29:[2,21],34:[2,21],39:[2,21],44:[2,21],47:[2,21],48:[2,21],51:[2,21],55:[2,21],60:[2,21]},{33:[1,131]},{33:[2,63]},{72:[1,133],76:132},{33:[1,134]},{33:[2,69]},{15:[2,12]},{14:[2,26],15:[2,26],19:[2,26],29:[2,26],34:[2,26],47:[2,26],48:[2,26],51:[2,26],55:[2,26],60:[2,26]},{23:[2,31],33:[2,31],54:[2,31],68:[2,31],72:[2,31],75:[2,31]},{33:[2,74],42:135,74:136,75:[1,121]},{33:[2,71],65:[2,71],72:[2,71],75:[2,71],80:[2,71],81:[2,71],82:[2,71],83:[2,71],84:[2,71],85:[2,71]},{33:[2,73],75:[2,73]},{23:[2,29],33:[2,29],54:[2,29],65:[2,29],68:[2,29],72:[2,29],75:[2,29],80:[2,29],81:[2,29],82:[2,29],83:[2,29],84:[2,29],85:[2,29]},{14:[2,15],15:[2,15],19:[2,15],29:[2,15],34:[2,15],39:[2,15],44:[2,15],47:[2,15],48:[2,15],51:[2,15],55:[2,15],60:[2,15]},{72:[1,138],77:[1,137]},{72:[2,100],77:[2,100]},{14:[2,16],15:[2,16],19:[2,16],29:[2,16],34:[2,16],44:[2,16],47:[2,16],48:[2,16],51:[2,16],55:[2,16],60:[2,16]},{33:[1,139]},{33:[2,75]},{33:[2,32]},{72:[2,101],77:[2,101]},{14:[2,17],15:[2,17],19:[2,17],29:[2,17],34:[2,17],39:[2,17],44:[2,17],47:[2,17],48:[2,17],51:[2,17],55:[2,17],60:[2,17]}],defaultActions:{4:[2,1],55:[2,55],57:[2,20],61:[2,57],74:[2,81],83:[2,85],87:[2,18],91:[2,89],102:[2,53],105:[2,93],111:[2,19],112:[2,77],117:[2,97],120:[2,63],123:[2,69],124:[2,12],136:[2,75],137:[2,32]},parseError:function(a,b){throw new Error(a)},parse:function(a){function b(){var a;return a=c.lexer.lex()||1,"number"!=typeof a&&(a=c.symbols_[a]||a),a}var c=this,d=[0],e=[null],f=[],g=this.table,h="",i=0,j=0,k=0;this.lexer.setInput(a),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,this.yy.parser=this,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var l=this.lexer.yylloc;f.push(l);var m=this.lexer.options&&this.lexer.options.ranges;"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError);for(var n,o,p,q,r,s,t,u,v,w={};;){if(p=d[d.length-1],this.defaultActions[p]?q=this.defaultActions[p]:(null!==n&&"undefined"!=typeof n||(n=b()),q=g[p]&&g[p][n]),"undefined"==typeof q||!q.length||!q[0]){var x="";if(!k){v=[];for(s in g[p])this.terminals_[s]&&s>2&&v.push("'"+this.terminals_[s]+"'");x=this.lexer.showPosition?"Parse error on line "+(i+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+v.join(", ")+", got '"+(this.terminals_[n]||n)+"'":"Parse error on line "+(i+1)+": Unexpected "+(1==n?"end of input":"'"+(this.terminals_[n]||n)+"'"),this.parseError(x,{text:this.lexer.match,token:this.terminals_[n]||n,line:this.lexer.yylineno,loc:l,expected:v})}}if(q[0]instanceof Array&&q.length>1)throw new Error("Parse Error: multiple actions possible at state: "+p+", token: "+n);switch(q[0]){case 1:d.push(n),e.push(this.lexer.yytext),f.push(this.lexer.yylloc),d.push(q[1]),n=null,o?(n=o,o=null):(j=this.lexer.yyleng,h=this.lexer.yytext,i=this.lexer.yylineno,l=this.lexer.yylloc,k>0&&k--);break;case 2:if(t=this.productions_[q[1]][1],w.$=e[e.length-t],w._$={first_line:f[f.length-(t||1)].first_line,last_line:f[f.length-1].last_line,first_column:f[f.length-(t||1)].first_column,last_column:f[f.length-1].last_column},m&&(w._$.range=[f[f.length-(t||1)].range[0],f[f.length-1].range[1]]),r=this.performAction.call(w,h,j,i,this.yy,q[1],e,f),"undefined"!=typeof r)return r;t&&(d=d.slice(0,-1*t*2),e=e.slice(0,-1*t),f=f.slice(0,-1*t)),d.push(this.productions_[q[1]][0]),e.push(w.$),f.push(w._$),u=g[d[d.length-2]][d[d.length-1]],d.push(u);break;case 3:return!0}}return!0}},c=function(){var a={EOF:1,parseError:function(a,b){if(!this.yy.parser)throw new Error(a);this.yy.parser.parseError(a,b)},setInput:function(a){return this._input=a,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var a=this._input[0];this.yytext+=a,this.yyleng++,this.offset++,this.match+=a,this.matched+=a;var b=a.match(/(?:\r\n?|\n).*/g);return b?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),a},unput:function(a){var b=a.length,c=a.split(/(?:\r\n?|\n)/g);this._input=a+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-b-1),this.offset-=b;var d=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),c.length-1&&(this.yylineno-=c.length-1);var e=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:c?(c.length===d.length?this.yylloc.first_column:0)+d[d.length-c.length].length-c[0].length:this.yylloc.first_column-b},this.options.ranges&&(this.yylloc.range=[e[0],e[0]+this.yyleng-b]),this},more:function(){return this._more=!0,this},less:function(a){this.unput(this.match.slice(a))},pastInput:function(){var a=this.matched.substr(0,this.matched.length-this.match.length);return(a.length>20?"...":"")+a.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var a=this.match;return a.length<20&&(a+=this._input.substr(0,20-a.length)),(a.substr(0,20)+(a.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var a=this.pastInput(),b=new Array(a.length+1).join("-");return a+this.upcomingInput()+"\n"+b+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var a,b,c,d,e;this._more||(this.yytext="",this.match="");for(var f=this._currentRules(),g=0;g<f.length&&(c=this._input.match(this.rules[f[g]]),!c||b&&!(c[0].length>b[0].length)||(b=c,d=g,this.options.flex));g++);return b?(e=b[0].match(/(?:\r\n?|\n).*/g),e&&(this.yylineno+=e.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:e?e[e.length-1].length-e[e.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+b[0].length},this.yytext+=b[0],this.match+=b[0],this.matches=b,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._input=this._input.slice(b[0].length),this.matched+=b[0],a=this.performAction.call(this,this.yy,this,f[d],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),a?a:void 0):""===this._input?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var a=this.next();return"undefined"!=typeof a?a:this.lex()},begin:function(a){this.conditionStack.push(a)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(a){this.begin(a)}};return a.options={},a.performAction=function(a,b,c,d){function e(a,c){return b.yytext=b.yytext.substr(a,b.yyleng-c)}switch(c){case 0:if("\\\\"===b.yytext.slice(-2)?(e(0,1),this.begin("mu")):"\\"===b.yytext.slice(-1)?(e(0,1),this.begin("emu")):this.begin("mu"),b.yytext)return 15;break;case 1:return 15;case 2:return this.popState(),15;case 3:return this.begin("raw"),15;case 4:return this.popState(),"raw"===this.conditionStack[this.conditionStack.length-1]?15:(b.yytext=b.yytext.substr(5,b.yyleng-9),"END_RAW_BLOCK");case 5:return 15;case 6:return this.popState(),14;case 7:return 65;case 8:return 68;case 9:return 19;case 10:return this.popState(),this.begin("raw"),23;case 11:return 55;case 12:return 60;case 13:return 29;case 14:return 47;case 15:return this.popState(),44;case 16:return this.popState(),44;case 17:return 34;case 18:return 39;case 19:return 51;case 20:return 48;case 21:this.unput(b.yytext),this.popState(),this.begin("com");break;case 22:return this.popState(),14;case 23:return 48;case 24:return 73;case 25:return 72;case 26:return 72;case 27:return 87;case 28:break;case 29:return this.popState(),54;case 30:return this.popState(),33;case 31:return b.yytext=e(1,2).replace(/\\"/g,'"'),80;case 32:return b.yytext=e(1,2).replace(/\\'/g,"'"),80;case 33:return 85;case 34:return 82;case 35:return 82;case 36:return 83;case 37:return 84;case 38:return 81;case 39:return 75;case 40:return 77;case 41:return 72;case 42:return b.yytext=b.yytext.replace(/\\([\\\]])/g,"$1"),72;case 43:return"INVALID";case 44:return 5}},a.rules=[/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{(?=[^\/]))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{)))/,/^(?:[\s\S]*?--(~)?\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#>)/,/^(?:\{\{(~)?#\*?)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{(~)?!--)/,/^(?:\{\{(~)?![\s\S]*?\}\})/,/^(?:\{\{(~)?\*?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)|])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:undefined(?=([~}\s)])))/,/^(?:null(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:as\s+\|)/,/^(?:\|)/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)|]))))/,/^(?:\[(\\\]|[^\]])*\])/,/^(?:.)/,/^(?:$)/],a.conditions={mu:{rules:[7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44],inclusive:!1},emu:{rules:[2],inclusive:!1},com:{rules:[6],inclusive:!1},raw:{rules:[3,4,5],inclusive:!1},INITIAL:{rules:[0,1,44],inclusive:!0}},a}();return b.lexer=c,a.prototype=b,b.Parser=a,new a}();b["default"]=c,a.exports=b["default"]},function(a,b,c){"use strict";function d(){var a=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.options=a}function e(a,b,c){void 0===b&&(b=a.length);var d=a[b-1],e=a[b-2];return d?"ContentStatement"===d.type?(e||!c?/\r?\n\s*?$/:/(^|\r?\n)\s*?$/).test(d.original):void 0:c}function f(a,b,c){void 0===b&&(b=-1);var d=a[b+1],e=a[b+2];return d?"ContentStatement"===d.type?(e||!c?/^\s*?\r?\n/:/^\s*?(\r?\n|$)/).test(d.original):void 0:c}function g(a,b,c){var d=a[null==b?0:b+1];if(d&&"ContentStatement"===d.type&&(c||!d.rightStripped)){var e=d.value;d.value=d.value.replace(c?/^\s+/:/^[ \t]*\r?\n?/,""),d.rightStripped=d.value!==e}}function h(a,b,c){var d=a[null==b?a.length-1:b-1];if(d&&"ContentStatement"===d.type&&(c||!d.leftStripped)){var e=d.value;return d.value=d.value.replace(c?/\s+$/:/[ \t]+$/,""),d.leftStripped=d.value!==e,d.leftStripped}}var i=c(1)["default"];b.__esModule=!0;var j=c(39),k=i(j);d.prototype=new k["default"],d.prototype.Program=function(a){var b=!this.options.ignoreStandalone,c=!this.isRootSeen;this.isRootSeen=!0;for(var d=a.body,i=0,j=d.length;i<j;i++){var k=d[i],l=this.accept(k);if(l){var m=e(d,i,c),n=f(d,i,c),o=l.openStandalone&&m,p=l.closeStandalone&&n,q=l.inlineStandalone&&m&&n;l.close&&g(d,i,!0),l.open&&h(d,i,!0),b&&q&&(g(d,i),h(d,i)&&"PartialStatement"===k.type&&(k.indent=/([ \t]+$)/.exec(d[i-1].original)[1])),b&&o&&(g((k.program||k.inverse).body),h(d,i)),b&&p&&(g(d,i),h((k.inverse||k.program).body))}}return a},d.prototype.BlockStatement=d.prototype.DecoratorBlock=d.prototype.PartialBlockStatement=function(a){this.accept(a.program),this.accept(a.inverse);var b=a.program||a.inverse,c=a.program&&a.inverse,d=c,i=c;if(c&&c.chained)for(d=c.body[0].program;i.chained;)i=i.body[i.body.length-1].program;var j={open:a.openStrip.open,close:a.closeStrip.close,openStandalone:f(b.body),closeStandalone:e((d||b).body)};if(a.openStrip.close&&g(b.body,null,!0),c){var k=a.inverseStrip;k.open&&h(b.body,null,!0),k.close&&g(d.body,null,!0),a.closeStrip.open&&h(i.body,null,!0),!this.options.ignoreStandalone&&e(b.body)&&f(d.body)&&(h(b.body),g(d.body))}else a.closeStrip.open&&h(b.body,null,!0);return j},d.prototype.Decorator=d.prototype.MustacheStatement=function(a){return a.strip},d.prototype.PartialStatement=d.prototype.CommentStatement=function(a){var b=a.strip||{};return{inlineStandalone:!0,open:b.open,close:b.close}},b["default"]=d,a.exports=b["default"]},function(a,b,c){"use strict";function d(){this.parents=[]}function e(a){this.acceptRequired(a,"path"),this.acceptArray(a.params),this.acceptKey(a,"hash")}function f(a){e.call(this,a),this.acceptKey(a,"program"),this.acceptKey(a,"inverse")}function g(a){this.acceptRequired(a,"name"),this.acceptArray(a.params),this.acceptKey(a,"hash")}var h=c(1)["default"];b.__esModule=!0;var i=c(6),j=h(i);d.prototype={constructor:d,mutating:!1,acceptKey:function(a,b){var c=this.accept(a[b]);if(this.mutating){if(c&&!d.prototype[c.type])throw new j["default"]('Unexpected node type "'+c.type+'" found when accepting '+b+" on "+a.type);a[b]=c}},acceptRequired:function(a,b){if(this.acceptKey(a,b),!a[b])throw new j["default"](a.type+" requires "+b)},acceptArray:function(a){for(var b=0,c=a.length;b<c;b++)this.acceptKey(a,b),a[b]||(a.splice(b,1),b--,c--)},accept:function(a){if(a){if(!this[a.type])throw new j["default"]("Unknown type: "+a.type,a);this.current&&this.parents.unshift(this.current),this.current=a;var b=this[a.type](a);return this.current=this.parents.shift(),!this.mutating||b?b:b!==!1?a:void 0}},Program:function(a){this.acceptArray(a.body)},MustacheStatement:e,Decorator:e,BlockStatement:f,DecoratorBlock:f,PartialStatement:g,PartialBlockStatement:function(a){g.call(this,a),this.acceptKey(a,"program")},ContentStatement:function(){},CommentStatement:function(){},SubExpression:e,PathExpression:function(){},StringLiteral:function(){},NumberLiteral:function(){},BooleanLiteral:function(){},UndefinedLiteral:function(){},NullLiteral:function(){},Hash:function(a){this.acceptArray(a.pairs)},HashPair:function(a){this.acceptRequired(a,"value")}},b["default"]=d,a.exports=b["default"]},function(a,b,c){"use strict";function d(a,b){if(b=b.path?b.path.original:b,a.path.original!==b){var c={loc:a.path.loc};throw new q["default"](a.path.original+" doesn't match "+b,c)}}function e(a,b){this.source=a,this.start={line:b.first_line,column:b.first_column},this.end={line:b.last_line,column:b.last_column}}function f(a){return/^\[.*\]$/.test(a)?a.substr(1,a.length-2):a}function g(a,b){return{open:"~"===a.charAt(2),close:"~"===b.charAt(b.length-3)}}function h(a){return a.replace(/^\{\{~?\!-?-?/,"").replace(/-?-?~?\}\}$/,"")}function i(a,b,c){c=this.locInfo(c);for(var d=a?"@":"",e=[],f=0,g="",h=0,i=b.length;h<i;h++){var j=b[h].part,k=b[h].original!==j;if(d+=(b[h].separator||"")+j,k||".."!==j&&"."!==j&&"this"!==j)e.push(j);else{if(e.length>0)throw new q["default"]("Invalid path: "+d,{loc:c});".."===j&&(f++,g+="../")}}return{type:"PathExpression",data:a,depth:f,parts:e,original:d,loc:c}}function j(a,b,c,d,e,f){var g=d.charAt(3)||d.charAt(2),h="{"!==g&&"&"!==g,i=/\*/.test(d);return{type:i?"Decorator":"MustacheStatement",path:a,params:b,hash:c,escaped:h,strip:e,loc:this.locInfo(f)}}function k(a,b,c,e){d(a,c),e=this.locInfo(e);var f={type:"Program",body:b,strip:{},loc:e};return{type:"BlockStatement",path:a.path,params:a.params,hash:a.hash,program:f,openStrip:{},inverseStrip:{},closeStrip:{},loc:e}}function l(a,b,c,e,f,g){e&&e.path&&d(a,e);var h=/\*/.test(a.open);b.blockParams=a.blockParams;var i=void 0,j=void 0;if(c){if(h)throw new q["default"]("Unexpected inverse block on decorator",c);c.chain&&(c.program.body[0].closeStrip=e.strip),j=c.strip,i=c.program}return f&&(f=i,i=b,b=f),{type:h?"DecoratorBlock":"BlockStatement",path:a.path,params:a.params,hash:a.hash,program:b,inverse:i,openStrip:a.strip,inverseStrip:j,closeStrip:e&&e.strip,loc:this.locInfo(g)}}function m(a,b){if(!b&&a.length){var c=a[0].loc,d=a[a.length-1].loc;c&&d&&(b={source:c.source,start:{line:c.start.line,column:c.start.column},end:{line:d.end.line,column:d.end.column}})}return{type:"Program",body:a,strip:{},loc:b}}function n(a,b,c,e){return d(a,c),{type:"PartialBlockStatement",name:a.path,params:a.params,hash:a.hash,program:b,openStrip:a.strip,closeStrip:c&&c.strip,loc:this.locInfo(e)}}var o=c(1)["default"];b.__esModule=!0,b.SourceLocation=e,b.id=f,b.stripFlags=g,b.stripComment=h,b.preparePath=i,b.prepareMustache=j,b.prepareRawBlock=k,b.prepareBlock=l,b.prepareProgram=m,b.preparePartialBlock=n;var p=c(6),q=o(p)},function(a,b,c){"use strict";function d(){}function e(a,b,c){if(null==a||"string"!=typeof a&&"Program"!==a.type)throw new k["default"]("You must pass a string or Handlebars AST to Handlebars.precompile. You passed "+a);b=b||{},"data"in b||(b.data=!0),b.compat&&(b.useDepths=!0);var d=c.parse(a,b),e=(new c.Compiler).compile(d,b);return(new c.JavaScriptCompiler).compile(e,b)}function f(a,b,c){function d(){var d=c.parse(a,b),e=(new c.Compiler).compile(d,b),f=(new c.JavaScriptCompiler).compile(e,b,void 0,!0);return c.template(f)}function e(a,b){return f||(f=d()),f.call(this,a,b)}if(void 0===b&&(b={}),null==a||"string"!=typeof a&&"Program"!==a.type)throw new k["default"]("You must pass a string or Handlebars AST to Handlebars.compile. You passed "+a);b=l.extend({},b),"data"in b||(b.data=!0),b.compat&&(b.useDepths=!0);var f=void 0;return e._setup=function(a){return f||(f=d()),f._setup(a)},e._child=function(a,b,c,e){return f||(f=d()),f._child(a,b,c,e)},e}function g(a,b){if(a===b)return!0;if(l.isArray(a)&&l.isArray(b)&&a.length===b.length){for(var c=0;c<a.length;c++)if(!g(a[c],b[c]))return!1;return!0}}function h(a){if(!a.path.parts){var b=a.path;a.path={type:"PathExpression",data:!1,depth:0,parts:[b.original+""],original:b.original+"",loc:b.loc}}}var i=c(1)["default"];b.__esModule=!0,b.Compiler=d,b.precompile=e,b.compile=f;var j=c(6),k=i(j),l=c(5),m=c(35),n=i(m),o=[].slice;d.prototype={compiler:d,equals:function(a){var b=this.opcodes.length;if(a.opcodes.length!==b)return!1;for(var c=0;c<b;c++){var d=this.opcodes[c],e=a.opcodes[c];if(d.opcode!==e.opcode||!g(d.args,e.args))return!1}b=this.children.length;for(var c=0;c<b;c++)if(!this.children[c].equals(a.children[c]))return!1;return!0},guid:0,compile:function(a,b){this.sourceNode=[],this.opcodes=[],this.children=[],this.options=b,this.stringParams=b.stringParams,this.trackIds=b.trackIds,b.blockParams=b.blockParams||[];var c=b.knownHelpers;if(b.knownHelpers={helperMissing:!0,blockHelperMissing:!0,each:!0,"if":!0,unless:!0,"with":!0,log:!0,lookup:!0},c)for(var d in c)d in c&&(this.options.knownHelpers[d]=c[d]);return this.accept(a)},compileProgram:function(a){var b=new this.compiler,c=b.compile(a,this.options),d=this.guid++;return this.usePartial=this.usePartial||c.usePartial,this.children[d]=c,this.useDepths=this.useDepths||c.useDepths,d},accept:function(a){if(!this[a.type])throw new k["default"]("Unknown type: "+a.type,a);this.sourceNode.unshift(a);var b=this[a.type](a);return this.sourceNode.shift(),b},Program:function(a){this.options.blockParams.unshift(a.blockParams);for(var b=a.body,c=b.length,d=0;d<c;d++)this.accept(b[d]);return this.options.blockParams.shift(),this.isSimple=1===c,this.blockParams=a.blockParams?a.blockParams.length:0,this},BlockStatement:function(a){h(a);var b=a.program,c=a.inverse;b=b&&this.compileProgram(b),c=c&&this.compileProgram(c);var d=this.classifySexpr(a);"helper"===d?this.helperSexpr(a,b,c):"simple"===d?(this.simpleSexpr(a),this.opcode("pushProgram",b),this.opcode("pushProgram",c),this.opcode("emptyHash"),this.opcode("blockValue",a.path.original)):(this.ambiguousSexpr(a,b,c),this.opcode("pushProgram",b),this.opcode("pushProgram",c),this.opcode("emptyHash"),this.opcode("ambiguousBlockValue")),this.opcode("append")},DecoratorBlock:function(a){var b=a.program&&this.compileProgram(a.program),c=this.setupFullMustacheParams(a,b,void 0),d=a.path;this.useDecorators=!0,this.opcode("registerDecorator",c.length,d.original)},PartialStatement:function(a){this.usePartial=!0;var b=a.program;b&&(b=this.compileProgram(a.program));var c=a.params;if(c.length>1)throw new k["default"]("Unsupported number of partial arguments: "+c.length,a);c.length||(this.options.explicitPartialContext?this.opcode("pushLiteral","undefined"):c.push({type:"PathExpression",parts:[],depth:0}));var d=a.name.original,e="SubExpression"===a.name.type;e&&this.accept(a.name),this.setupFullMustacheParams(a,b,void 0,!0);var f=a.indent||"";this.options.preventIndent&&f&&(this.opcode("appendContent",f),f=""),this.opcode("invokePartial",e,d,f),this.opcode("append")},PartialBlockStatement:function(a){this.PartialStatement(a)},MustacheStatement:function(a){this.SubExpression(a),a.escaped&&!this.options.noEscape?this.opcode("appendEscaped"):this.opcode("append")},Decorator:function(a){this.DecoratorBlock(a)},ContentStatement:function(a){a.value&&this.opcode("appendContent",a.value)},CommentStatement:function(){},SubExpression:function(a){h(a);var b=this.classifySexpr(a);"simple"===b?this.simpleSexpr(a):"helper"===b?this.helperSexpr(a):this.ambiguousSexpr(a)},ambiguousSexpr:function(a,b,c){var d=a.path,e=d.parts[0],f=null!=b||null!=c;this.opcode("getContext",d.depth),this.opcode("pushProgram",b),this.opcode("pushProgram",c),d.strict=!0,this.accept(d),this.opcode("invokeAmbiguous",e,f)},simpleSexpr:function(a){var b=a.path;b.strict=!0,this.accept(b),this.opcode("resolvePossibleLambda")},helperSexpr:function(a,b,c){var d=this.setupFullMustacheParams(a,b,c),e=a.path,f=e.parts[0];if(this.options.knownHelpers[f])this.opcode("invokeKnownHelper",d.length,f);else{if(this.options.knownHelpersOnly)throw new k["default"]("You specified knownHelpersOnly, but used the unknown helper "+f,a);e.strict=!0,e.falsy=!0,this.accept(e),this.opcode("invokeHelper",d.length,e.original,n["default"].helpers.simpleId(e))}},PathExpression:function(a){this.addDepth(a.depth),this.opcode("getContext",a.depth);var b=a.parts[0],c=n["default"].helpers.scopedId(a),d=!a.depth&&!c&&this.blockParamIndex(b);d?this.opcode("lookupBlockParam",d,a.parts):b?a.data?(this.options.data=!0,this.opcode("lookupData",a.depth,a.parts,a.strict)):this.opcode("lookupOnContext",a.parts,a.falsy,a.strict,c):this.opcode("pushContext")},StringLiteral:function(a){this.opcode("pushString",a.value)},NumberLiteral:function(a){this.opcode("pushLiteral",a.value)},BooleanLiteral:function(a){this.opcode("pushLiteral",a.value)},UndefinedLiteral:function(){this.opcode("pushLiteral","undefined")},NullLiteral:function(){this.opcode("pushLiteral","null")},Hash:function(a){var b=a.pairs,c=0,d=b.length;for(this.opcode("pushHash");c<d;c++)this.pushParam(b[c].value);for(;c--;)this.opcode("assignToHash",b[c].key);this.opcode("popHash")},opcode:function(a){this.opcodes.push({opcode:a,args:o.call(arguments,1),loc:this.sourceNode[0].loc})},addDepth:function(a){a&&(this.useDepths=!0)},classifySexpr:function(a){var b=n["default"].helpers.simpleId(a.path),c=b&&!!this.blockParamIndex(a.path.parts[0]),d=!c&&n["default"].helpers.helperExpression(a),e=!c&&(d||b);if(e&&!d){var f=a.path.parts[0],g=this.options;g.knownHelpers[f]?d=!0:g.knownHelpersOnly&&(e=!1)}return d?"helper":e?"ambiguous":"simple"},pushParams:function(a){for(var b=0,c=a.length;b<c;b++)this.pushParam(a[b])},pushParam:function(a){var b=null!=a.value?a.value:a.original||"";if(this.stringParams)b.replace&&(b=b.replace(/^(\.?\.\/)*/g,"").replace(/\//g,".")),a.depth&&this.addDepth(a.depth),this.opcode("getContext",a.depth||0),this.opcode("pushStringParam",b,a.type),"SubExpression"===a.type&&this.accept(a);else{if(this.trackIds){var c=void 0;if(!a.parts||n["default"].helpers.scopedId(a)||a.depth||(c=this.blockParamIndex(a.parts[0])),c){var d=a.parts.slice(1).join(".");this.opcode("pushId","BlockParam",c,d)}else b=a.original||b,b.replace&&(b=b.replace(/^this(?:\.|$)/,"").replace(/^\.\//,"").replace(/^\.$/,"")),this.opcode("pushId",a.type,b)}this.accept(a)}},setupFullMustacheParams:function(a,b,c,d){var e=a.params;return this.pushParams(e),this.opcode("pushProgram",b),this.opcode("pushProgram",c),a.hash?this.accept(a.hash):this.opcode("emptyHash",d),e},blockParamIndex:function(a){for(var b=0,c=this.options.blockParams.length;b<c;b++){var d=this.options.blockParams[b],e=d&&l.indexOf(d,a);if(d&&e>=0)return[b,e]}}}},function(a,b,c){"use strict";function d(a){this.value=a}function e(){}function f(a,b,c,d){var e=b.popStack(),f=0,g=c.length;for(a&&g--;f<g;f++)e=b.nameLookup(e,c[f],d);return a?[b.aliasable("container.strict"),"(",e,", ",b.quotedString(c[f]),")"]:e}var g=c(1)["default"];b.__esModule=!0;var h=c(4),i=c(6),j=g(i),k=c(5),l=c(43),m=g(l);e.prototype={nameLookup:function(a,b){return e.isValidJavaScriptVariableName(b)?[a,".",b]:[a,"[",JSON.stringify(b),"]"]},depthedLookup:function(a){return[this.aliasable("container.lookup"),'(depths, "',a,'")']},compilerInfo:function(){var a=h.COMPILER_REVISION,b=h.REVISION_CHANGES[a];return[a,b]},appendToBuffer:function(a,b,c){return k.isArray(a)||(a=[a]),a=this.source.wrap(a,b),this.environment.isSimple?["return ",a,";"]:c?["buffer += ",a,";"]:(a.appendToBuffer=!0,a)},initializeBuffer:function(){return this.quotedString("")},compile:function(a,b,c,d){this.environment=a,this.options=b,this.stringParams=this.options.stringParams,this.trackIds=this.options.trackIds,this.precompile=!d,this.name=this.environment.name,this.isChild=!!c,this.context=c||{decorators:[],programs:[],environments:[]},this.preamble(),this.stackSlot=0,this.stackVars=[],this.aliases={},this.registers={list:[]},this.hashes=[],this.compileStack=[],this.inlineStack=[],this.blockParams=[],this.compileChildren(a,b),this.useDepths=this.useDepths||a.useDepths||a.useDecorators||this.options.compat,this.useBlockParams=this.useBlockParams||a.useBlockParams;var e=a.opcodes,f=void 0,g=void 0,h=void 0,i=void 0;for(h=0,i=e.length;h<i;h++)f=e[h],this.source.currentLocation=f.loc,g=g||f.loc,this[f.opcode].apply(this,f.args);if(this.source.currentLocation=g,this.pushSource(""),this.stackSlot||this.inlineStack.length||this.compileStack.length)throw new j["default"]("Compile completed with content left on stack");this.decorators.isEmpty()?this.decorators=void 0:(this.useDecorators=!0,this.decorators.prepend("var decorators = container.decorators;\n"),this.decorators.push("return fn;"),d?this.decorators=Function.apply(this,["fn","props","container","depth0","data","blockParams","depths",this.decorators.merge()]):(this.decorators.prepend("function(fn, props, container, depth0, data, blockParams, depths) {\n"),this.decorators.push("}\n"),this.decorators=this.decorators.merge()));var k=this.createFunctionContext(d);if(this.isChild)return k;var l={compiler:this.compilerInfo(),main:k};this.decorators&&(l.main_d=this.decorators,l.useDecorators=!0);var m=this.context,n=m.programs,o=m.decorators;for(h=0,i=n.length;h<i;h++)n[h]&&(l[h]=n[h],o[h]&&(l[h+"_d"]=o[h],l.useDecorators=!0));return this.environment.usePartial&&(l.usePartial=!0),this.options.data&&(l.useData=!0),this.useDepths&&(l.useDepths=!0),this.useBlockParams&&(l.useBlockParams=!0),this.options.compat&&(l.compat=!0),d?l.compilerOptions=this.options:(l.compiler=JSON.stringify(l.compiler),this.source.currentLocation={start:{line:1,column:0}},l=this.objectLiteral(l),b.srcName?(l=l.toStringWithSourceMap({file:b.destName}),l.map=l.map&&l.map.toString()):l=l.toString()),l},preamble:function(){this.lastContext=0,this.source=new m["default"](this.options.srcName),this.decorators=new m["default"](this.options.srcName)},createFunctionContext:function(a){var b="",c=this.stackVars.concat(this.registers.list);c.length>0&&(b+=", "+c.join(", "));var d=0;for(var e in this.aliases){var f=this.aliases[e];this.aliases.hasOwnProperty(e)&&f.children&&f.referenceCount>1&&(b+=", alias"+ ++d+"="+e,f.children[0]="alias"+d)}var g=["container","depth0","helpers","partials","data"];(this.useBlockParams||this.useDepths)&&g.push("blockParams"),this.useDepths&&g.push("depths");var h=this.mergeSource(b);return a?(g.push(h),Function.apply(this,g)):this.source.wrap(["function(",g.join(","),") {\n  ",h,"}"])},mergeSource:function(a){var b=this.environment.isSimple,c=!this.forceBuffer,d=void 0,e=void 0,f=void 0,g=void 0;return this.source.each(function(a){a.appendToBuffer?(f?a.prepend("  + "):f=a,g=a):(f&&(e?f.prepend("buffer += "):d=!0,g.add(";"),f=g=void 0),e=!0,b||(c=!1))}),c?f?(f.prepend("return "),g.add(";")):e||this.source.push('return "";'):(a+=", buffer = "+(d?"":this.initializeBuffer()),f?(f.prepend("return buffer + "),g.add(";")):this.source.push("return buffer;")),a&&this.source.prepend("var "+a.substring(2)+(d?"":";\n")),this.source.merge()},blockValue:function(a){var b=this.aliasable("helpers.blockHelperMissing"),c=[this.contextName(0)];this.setupHelperArgs(a,0,c);var d=this.popStack();c.splice(1,0,d),this.push(this.source.functionCall(b,"call",c))},ambiguousBlockValue:function(){var a=this.aliasable("helpers.blockHelperMissing"),b=[this.contextName(0)];this.setupHelperArgs("",0,b,!0),this.flushInline();var c=this.topStack();b.splice(1,0,c),this.pushSource(["if (!",this.lastHelper,") { ",c," = ",this.source.functionCall(a,"call",b),"}"])},appendContent:function(a){this.pendingContent?a=this.pendingContent+a:this.pendingLocation=this.source.currentLocation,this.pendingContent=a},append:function(){if(this.isInline())this.replaceStack(function(a){return[" != null ? ",a,' : ""']}),this.pushSource(this.appendToBuffer(this.popStack()));else{var a=this.popStack();this.pushSource(["if (",a," != null) { ",this.appendToBuffer(a,void 0,!0)," }"]),this.environment.isSimple&&this.pushSource(["else { ",this.appendToBuffer("''",void 0,!0)," }"])}},appendEscaped:function(){this.pushSource(this.appendToBuffer([this.aliasable("container.escapeExpression"),"(",this.popStack(),")"]))},getContext:function(a){this.lastContext=a},pushContext:function(){this.pushStackLiteral(this.contextName(this.lastContext))},lookupOnContext:function(a,b,c,d){var e=0;d||!this.options.compat||this.lastContext?this.pushContext():this.push(this.depthedLookup(a[e++])),this.resolvePath("context",a,e,b,c)},lookupBlockParam:function(a,b){this.useBlockParams=!0,this.push(["blockParams[",a[0],"][",a[1],"]"]),this.resolvePath("context",b,1)},lookupData:function(a,b,c){a?this.pushStackLiteral("container.data(data, "+a+")"):this.pushStackLiteral("data"),this.resolvePath("data",b,0,!0,c)},resolvePath:function(a,b,c,d,e){var g=this;if(this.options.strict||this.options.assumeObjects)return void this.push(f(this.options.strict&&e,this,b,a));for(var h=b.length;c<h;c++)this.replaceStack(function(e){
-var f=g.nameLookup(e,b[c],a);return d?[" && ",f]:[" != null ? ",f," : ",e]})},resolvePossibleLambda:function(){this.push([this.aliasable("container.lambda"),"(",this.popStack(),", ",this.contextName(0),")"])},pushStringParam:function(a,b){this.pushContext(),this.pushString(b),"SubExpression"!==b&&("string"==typeof a?this.pushString(a):this.pushStackLiteral(a))},emptyHash:function(a){this.trackIds&&this.push("{}"),this.stringParams&&(this.push("{}"),this.push("{}")),this.pushStackLiteral(a?"undefined":"{}")},pushHash:function(){this.hash&&this.hashes.push(this.hash),this.hash={values:[],types:[],contexts:[],ids:[]}},popHash:function(){var a=this.hash;this.hash=this.hashes.pop(),this.trackIds&&this.push(this.objectLiteral(a.ids)),this.stringParams&&(this.push(this.objectLiteral(a.contexts)),this.push(this.objectLiteral(a.types))),this.push(this.objectLiteral(a.values))},pushString:function(a){this.pushStackLiteral(this.quotedString(a))},pushLiteral:function(a){this.pushStackLiteral(a)},pushProgram:function(a){null!=a?this.pushStackLiteral(this.programExpression(a)):this.pushStackLiteral(null)},registerDecorator:function(a,b){var c=this.nameLookup("decorators",b,"decorator"),d=this.setupHelperArgs(b,a);this.decorators.push(["fn = ",this.decorators.functionCall(c,"",["fn","props","container",d])," || fn;"])},invokeHelper:function(a,b,c){var d=this.popStack(),e=this.setupHelper(a,b),f=c?[e.name," || "]:"",g=["("].concat(f,d);this.options.strict||g.push(" || ",this.aliasable("helpers.helperMissing")),g.push(")"),this.push(this.source.functionCall(g,"call",e.callParams))},invokeKnownHelper:function(a,b){var c=this.setupHelper(a,b);this.push(this.source.functionCall(c.name,"call",c.callParams))},invokeAmbiguous:function(a,b){this.useRegister("helper");var c=this.popStack();this.emptyHash();var d=this.setupHelper(0,a,b),e=this.lastHelper=this.nameLookup("helpers",a,"helper"),f=["(","(helper = ",e," || ",c,")"];this.options.strict||(f[0]="(helper = ",f.push(" != null ? helper : ",this.aliasable("helpers.helperMissing"))),this.push(["(",f,d.paramsInit?["),(",d.paramsInit]:[],"),","(typeof helper === ",this.aliasable('"function"')," ? ",this.source.functionCall("helper","call",d.callParams)," : helper))"])},invokePartial:function(a,b,c){var d=[],e=this.setupParams(b,1,d);a&&(b=this.popStack(),delete e.name),c&&(e.indent=JSON.stringify(c)),e.helpers="helpers",e.partials="partials",e.decorators="container.decorators",a?d.unshift(b):d.unshift(this.nameLookup("partials",b,"partial")),this.options.compat&&(e.depths="depths"),e=this.objectLiteral(e),d.push(e),this.push(this.source.functionCall("container.invokePartial","",d))},assignToHash:function(a){var b=this.popStack(),c=void 0,d=void 0,e=void 0;this.trackIds&&(e=this.popStack()),this.stringParams&&(d=this.popStack(),c=this.popStack());var f=this.hash;c&&(f.contexts[a]=c),d&&(f.types[a]=d),e&&(f.ids[a]=e),f.values[a]=b},pushId:function(a,b,c){"BlockParam"===a?this.pushStackLiteral("blockParams["+b[0]+"].path["+b[1]+"]"+(c?" + "+JSON.stringify("."+c):"")):"PathExpression"===a?this.pushString(b):"SubExpression"===a?this.pushStackLiteral("true"):this.pushStackLiteral("null")},compiler:e,compileChildren:function(a,b){for(var c=a.children,d=void 0,e=void 0,f=0,g=c.length;f<g;f++){d=c[f],e=new this.compiler;var h=this.matchExistingProgram(d);if(null==h){this.context.programs.push("");var i=this.context.programs.length;d.index=i,d.name="program"+i,this.context.programs[i]=e.compile(d,b,this.context,!this.precompile),this.context.decorators[i]=e.decorators,this.context.environments[i]=d,this.useDepths=this.useDepths||e.useDepths,this.useBlockParams=this.useBlockParams||e.useBlockParams,d.useDepths=this.useDepths,d.useBlockParams=this.useBlockParams}else d.index=h.index,d.name="program"+h.index,this.useDepths=this.useDepths||h.useDepths,this.useBlockParams=this.useBlockParams||h.useBlockParams}},matchExistingProgram:function(a){for(var b=0,c=this.context.environments.length;b<c;b++){var d=this.context.environments[b];if(d&&d.equals(a))return d}},programExpression:function(a){var b=this.environment.children[a],c=[b.index,"data",b.blockParams];return(this.useBlockParams||this.useDepths)&&c.push("blockParams"),this.useDepths&&c.push("depths"),"container.program("+c.join(", ")+")"},useRegister:function(a){this.registers[a]||(this.registers[a]=!0,this.registers.list.push(a))},push:function(a){return a instanceof d||(a=this.source.wrap(a)),this.inlineStack.push(a),a},pushStackLiteral:function(a){this.push(new d(a))},pushSource:function(a){this.pendingContent&&(this.source.push(this.appendToBuffer(this.source.quotedString(this.pendingContent),this.pendingLocation)),this.pendingContent=void 0),a&&this.source.push(a)},replaceStack:function(a){var b=["("],c=void 0,e=void 0,f=void 0;if(!this.isInline())throw new j["default"]("replaceStack on non-inline");var g=this.popStack(!0);if(g instanceof d)c=[g.value],b=["(",c],f=!0;else{e=!0;var h=this.incrStack();b=["((",this.push(h)," = ",g,")"],c=this.topStack()}var i=a.call(this,c);f||this.popStack(),e&&this.stackSlot--,this.push(b.concat(i,")"))},incrStack:function(){return this.stackSlot++,this.stackSlot>this.stackVars.length&&this.stackVars.push("stack"+this.stackSlot),this.topStackName()},topStackName:function(){return"stack"+this.stackSlot},flushInline:function(){var a=this.inlineStack;this.inlineStack=[];for(var b=0,c=a.length;b<c;b++){var e=a[b];if(e instanceof d)this.compileStack.push(e);else{var f=this.incrStack();this.pushSource([f," = ",e,";"]),this.compileStack.push(f)}}},isInline:function(){return this.inlineStack.length},popStack:function(a){var b=this.isInline(),c=(b?this.inlineStack:this.compileStack).pop();if(!a&&c instanceof d)return c.value;if(!b){if(!this.stackSlot)throw new j["default"]("Invalid stack pop");this.stackSlot--}return c},topStack:function(){var a=this.isInline()?this.inlineStack:this.compileStack,b=a[a.length-1];return b instanceof d?b.value:b},contextName:function(a){return this.useDepths&&a?"depths["+a+"]":"depth"+a},quotedString:function(a){return this.source.quotedString(a)},objectLiteral:function(a){return this.source.objectLiteral(a)},aliasable:function(a){var b=this.aliases[a];return b?(b.referenceCount++,b):(b=this.aliases[a]=this.source.wrap(a),b.aliasable=!0,b.referenceCount=1,b)},setupHelper:function(a,b,c){var d=[],e=this.setupHelperArgs(b,a,d,c),f=this.nameLookup("helpers",b,"helper"),g=this.aliasable(this.contextName(0)+" != null ? "+this.contextName(0)+" : (container.nullContext || {})");return{params:d,paramsInit:e,name:f,callParams:[g].concat(d)}},setupParams:function(a,b,c){var d={},e=[],f=[],g=[],h=!c,i=void 0;h&&(c=[]),d.name=this.quotedString(a),d.hash=this.popStack(),this.trackIds&&(d.hashIds=this.popStack()),this.stringParams&&(d.hashTypes=this.popStack(),d.hashContexts=this.popStack());var j=this.popStack(),k=this.popStack();(k||j)&&(d.fn=k||"container.noop",d.inverse=j||"container.noop");for(var l=b;l--;)i=this.popStack(),c[l]=i,this.trackIds&&(g[l]=this.popStack()),this.stringParams&&(f[l]=this.popStack(),e[l]=this.popStack());return h&&(d.args=this.source.generateArray(c)),this.trackIds&&(d.ids=this.source.generateArray(g)),this.stringParams&&(d.types=this.source.generateArray(f),d.contexts=this.source.generateArray(e)),this.options.data&&(d.data="data"),this.useBlockParams&&(d.blockParams="blockParams"),d},setupHelperArgs:function(a,b,c,d){var e=this.setupParams(a,b,c);return e=this.objectLiteral(e),d?(this.useRegister("options"),c.push("options"),["options=",e]):c?(c.push(e),""):e}},function(){for(var a="break else new var case finally return void catch for switch while continue function this with default if throw delete in try do instanceof typeof abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public let yield await null true false".split(" "),b=e.RESERVED_WORDS={},c=0,d=a.length;c<d;c++)b[a[c]]=!0}(),e.isValidJavaScriptVariableName=function(a){return!e.RESERVED_WORDS[a]&&/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(a)},b["default"]=e,a.exports=b["default"]},function(a,b,c){"use strict";function d(a,b,c){if(f.isArray(a)){for(var d=[],e=0,g=a.length;e<g;e++)d.push(b.wrap(a[e],c));return d}return"boolean"==typeof a||"number"==typeof a?a+"":a}function e(a){this.srcFile=a,this.source=[]}b.__esModule=!0;var f=c(5),g=void 0;try{}catch(h){}g||(g=function(a,b,c,d){this.src="",d&&this.add(d)},g.prototype={add:function(a){f.isArray(a)&&(a=a.join("")),this.src+=a},prepend:function(a){f.isArray(a)&&(a=a.join("")),this.src=a+this.src},toStringWithSourceMap:function(){return{code:this.toString()}},toString:function(){return this.src}}),e.prototype={isEmpty:function(){return!this.source.length},prepend:function(a,b){this.source.unshift(this.wrap(a,b))},push:function(a,b){this.source.push(this.wrap(a,b))},merge:function(){var a=this.empty();return this.each(function(b){a.add(["  ",b,"\n"])}),a},each:function(a){for(var b=0,c=this.source.length;b<c;b++)a(this.source[b])},empty:function(){var a=this.currentLocation||{start:{}};return new g(a.start.line,a.start.column,this.srcFile)},wrap:function(a){var b=arguments.length<=1||void 0===arguments[1]?this.currentLocation||{start:{}}:arguments[1];return a instanceof g?a:(a=d(a,this,b),new g(b.start.line,b.start.column,this.srcFile,a))},functionCall:function(a,b,c){return c=this.generateList(c),this.wrap([a,b?"."+b+"(":"(",c,")"])},quotedString:function(a){return'"'+(a+"").replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")+'"'},objectLiteral:function(a){var b=[];for(var c in a)if(a.hasOwnProperty(c)){var e=d(a[c],this);"undefined"!==e&&b.push([this.quotedString(c),":",e])}var f=this.generateList(b);return f.prepend("{"),f.add("}"),f},generateList:function(a){for(var b=this.empty(),c=0,e=a.length;c<e;c++)c&&b.add(","),b.add(d(a[c],this));return b},generateArray:function(a){var b=this.generateList(a);return b.prepend("["),b.add("]"),b}},b["default"]=e,a.exports=b["default"]}])});
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack.js
deleted file mode 100644
index 7b00c68d36561..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){"undefined"!=typeof exports?e(exports):(self.hljs=e({}),"function"==typeof define&&define.amd&&define("hljs",[],function(){return self.hljs}))}(function(e){function r(e){return e.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function n(e,r){var t=e&&e.exec(r);return t&&0==t.index}function a(e){return/^(no-?highlight|plain|text)$/i.test(e)}function c(e){var r,t,n,c=e.className+" ";if(c+=e.parentNode?e.parentNode.className:"",t=/\blang(?:uage)?-([\w-]+)\b/i.exec(c))return E(t[1])?t[1]:"no-highlight";for(c=c.split(/\s+/),r=0,n=c.length;n>r;r++)if(E(c[r])||a(c[r]))return c[r]}function i(e,r){var t,n={};for(t in e)n[t]=e[t];if(r)for(t in r)n[t]=r[t];return n}function o(e){var r=[];return function n(e,a){for(var c=e.firstChild;c;c=c.nextSibling)3==c.nodeType?a+=c.nodeValue.length:1==c.nodeType&&(r.push({event:"start",offset:a,node:c}),a=n(c,a),t(c).match(/br|hr|img|input/)||r.push({event:"stop",offset:a,node:c}));return a}(e,0),r}function s(e,n,a){function c(){return e.length&&n.length?e[0].offset!=n[0].offset?e[0].offset<n[0].offset?e:n:"start"==n[0].event?e:n:e.length?e:n}function i(e){function n(e){return" "+e.nodeName+'="'+r(e.value)+'"'}l+="<"+t(e)+Array.prototype.map.call(e.attributes,n).join("")+">"}function o(e){l+="</"+t(e)+">"}function s(e){("start"==e.event?i:o)(e.node)}for(var u=0,l="",f=[];e.length||n.length;){var b=c();if(l+=r(a.substr(u,b[0].offset-u)),u=b[0].offset,b==e){f.reverse().forEach(o);do s(b.splice(0,1)[0]),b=c();while(b==e&&b.length&&b[0].offset==u);f.reverse().forEach(i)}else"start"==b[0].event?f.push(b[0].node):f.pop(),s(b.splice(0,1)[0])}return l+r(a.substr(u))}function u(e){function r(e){return e&&e.source||e}function t(t,n){return new RegExp(r(t),"m"+(e.cI?"i":"")+(n?"g":""))}function n(a,c){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},s=function(r,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[r,t[1]?Number(t[1]):1]})};"string"==typeof a.k?s("keyword",a.k):Object.keys(a.k).forEach(function(e){s(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\b\w+\b/,!0),c&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=r(a.e)||"",a.eW&&c.tE&&(a.tE+=(a.e?"|":"")+c.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var u=[];a.c.forEach(function(e){e.v?e.v.forEach(function(r){u.push(i(e,r))}):u.push("self"==e?a:e)}),a.c=u,a.c.forEach(function(e){n(e,a)}),a.starts&&n(a.starts,c);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(r).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}n(e)}function l(e,t,a,c){function i(e,r){for(var t=0;t<r.c.length;t++)if(n(r.c[t].bR,e))return r.c[t]}function o(e,r){if(n(e.eR,r)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?o(e.parent,r):void 0}function s(e,r){return!a&&n(r.iR,e)}function b(e,r){var t=N.cI?r[0].toLowerCase():r[0];return e.k.hasOwnProperty(t)&&e.k[t]}function g(e,r,t,n){var a=n?"":w.classPrefix,c='<span class="'+a,i=t?"":"</span>";return c+=e+'">',c+r+i}function p(){if(!M.k)return r(B);var e="",t=0;M.lR.lastIndex=0;for(var n=M.lR.exec(B);n;){e+=r(B.substr(t,n.index-t));var a=b(M,n);a?(L+=a[1],e+=g(a[0],r(n[0]))):e+=r(n[0]),t=M.lR.lastIndex,n=M.lR.exec(B)}return e+r(B.substr(t))}function h(){var e="string"==typeof M.sL;if(e&&!y[M.sL])return r(B);var t=e?l(M.sL,B,!0,R[M.sL]):f(B,M.sL.length?M.sL:void 0);return M.r>0&&(L+=t.r),e&&(R[M.sL]=t.top),g(t.language,t.value,!1,!0)}function d(){return void 0!==M.sL?h():p()}function m(e,t){var n=e.cN?g(e.cN,"",!0):"";e.rB?(x+=n,B=""):e.eB?(x+=r(t)+n,B=""):(x+=n,B=t),M=Object.create(e,{parent:{value:M}})}function v(e,t){if(B+=e,void 0===t)return x+=d(),0;var n=i(t,M);if(n)return x+=d(),m(n,t),n.rB?0:t.length;var a=o(M,t);if(a){var c=M;c.rE||c.eE||(B+=t),x+=d();do M.cN&&(x+="</span>"),L+=M.r,M=M.parent;while(M!=a.parent);return c.eE&&(x+=r(t)),B="",a.starts&&m(a.starts,""),c.rE?0:t.length}if(s(t,M))throw new Error('Illegal lexeme "'+t+'" for mode "'+(M.cN||"<unnamed>")+'"');return B+=t,t.length||1}var N=E(e);if(!N)throw new Error('Unknown language: "'+e+'"');u(N);var C,M=c||N,R={},x="";for(C=M;C!=N;C=C.parent)C.cN&&(x=g(C.cN,"",!0)+x);var B="",L=0;try{for(var S,A,k=0;M.t.lastIndex=k,S=M.t.exec(t),S;)A=v(t.substr(k,S.index-k),S[0]),k=S.index+A;for(v(t.substr(k)),C=M;C.parent;C=C.parent)C.cN&&(x+="</span>");return{r:L,value:x,language:e,top:M}}catch(I){if(-1!=I.message.indexOf("Illegal"))return{r:0,value:r(t)};throw I}}function f(e,t){t=t||w.languages||Object.keys(y);var n={r:0,value:r(e)},a=n;return t.forEach(function(r){if(E(r)){var t=l(r,e,!1);t.language=r,t.r>a.r&&(a=t),t.r>n.r&&(a=n,n=t)}}),a.language&&(n.second_best=a),n}function b(e){return w.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,r){return r.replace(/\t/g,w.tabReplace)})),w.useBR&&(e=e.replace(/\n/g,"<br>")),e}function g(e,r,t){var n=r?C[r]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(n)&&a.push(n),a.join(" ").trim()}function p(e){var r=c(e);if(!a(r)){var t;w.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):t=e;var n=t.textContent,i=r?l(r,n,!0):f(n),u=o(t);if(u.length){var p=document.createElementNS("http://www.w3.org/1999/xhtml","div");p.innerHTML=i.value,i.value=s(u,o(p),n)}i.value=b(i.value),e.innerHTML=i.value,e.className=g(e.className,r,i.language),e.result={language:i.language,re:i.r},i.second_best&&(e.second_best={language:i.second_best.language,re:i.second_best.r})}}function h(e){w=i(w,e)}function d(){if(!d.called){d.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,p)}}function m(){addEventListener("DOMContentLoaded",d,!1),addEventListener("load",d,!1)}function v(r,t){var n=y[r]=t(e);n.aliases&&n.aliases.forEach(function(e){C[e]=r})}function N(){return Object.keys(y)}function E(e){return e=(e||"").toLowerCase(),y[e]||y[C[e]]}var w={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},y={},C={};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=b,e.highlightBlock=p,e.configure=h,e.initHighlighting=d,e.initHighlightingOnLoad=m,e.registerLanguage=v,e.listLanguages=N,e.getLanguage=E,e.inherit=i,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(r,t,n){var a=e.inherit({cN:"comment",b:r,e:t,c:[]},n||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e}),hljs.registerLanguage("json",function(e){var r={literal:"true false null"},t=[e.QSM,e.CNM],n={e:",",eW:!0,eE:!0,c:t,k:r},a={b:"{",e:"}",c:[{cN:"attr",b:'\\s*"',e:'"\\s*:\\s*',eB:!0,eE:!0,c:[e.BE],i:"\\n",starts:n}],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(n)],i:"\\S"};return t.splice(t.length,0,a,c),{c:t,k:r,i:"\\S"}}),hljs.registerLanguage("xml",function(e){var r="[A-Za-z0-9\\._:-]+",t={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php"},n={eW:!0,i:/</,r:0,c:[t,{cN:"attr",b:r,r:0},{b:"=",r:0,c:[{cN:"string",c:[t],v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s\/>]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},e.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[n],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[n],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},t,{cN:"meta",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},n]}]}}),hljs.registerLanguage("javascript",function(e){return{aliases:["js"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/</,e:/>\s*[);\]]/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}}),hljs.registerLanguage("css",function(e){var r="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\s*\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:r,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack_extended.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack_extended.js
deleted file mode 100644
index 162a224ddd604..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack_extended.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";!function(){var h,l;h=hljs.configure,hljs.configure=function(l){var i=l.highlightSizeThreshold;hljs.highlightSizeThreshold=i===+i?i:null,h.call(this,l)},l=hljs.highlightBlock,hljs.highlightBlock=function(h){var i=h.innerHTML,g=hljs.highlightSizeThreshold;(null==g||g>i.length)&&l.call(hljs,h)}}();
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery-1.8.0.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery-1.8.0.min.js
deleted file mode 100644
index 066d72c7e3a2e..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery-1.8.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bX(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bV.length;while(e--){b=bV[e]+c;if(b in a)return b}return d}function bY(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function bZ(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bY(c)&&(e[f]=p._data(c,"olddisplay",cb(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b$(a,b,c){var d=bO.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function b_(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bU[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bU[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bU[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bU[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bU[e]+"Width"))||0));return f}function ca(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bP.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+b_(a,b,c||(f?"border":"content"),e)+"px"}function cb(a){if(bR[a])return bR[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cz(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cu;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cz(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cz(a,c,d,e,"*",g)),h}function cA(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cB(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cC(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cK(){try{return new a.XMLHttpRequest}catch(b){}}function cL(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cT(){return setTimeout(function(){cM=b},0),cM=p.now()}function cU(a,b){p.each(b,function(b,c){var d=(cS[b]||[]).concat(cS["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cV(a,b,c){var d,e=0,f=0,g=cR.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cM||cT(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cM||cT(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cW(k,j.opts.specialEasing);for(;e<g;e++){d=cR[e].call(j,a,k,j.opts);if(d)return d}return cU(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cW(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cX(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bY(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cb(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cO.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cY(a,b,c,d,e){return new cY.prototype.init(a,b,c,d,e)}function cZ(a,b){var c,d={height:a},e=0;for(;e<4;e+=2-b)c=bU[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function c_(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=r.test(" ")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete"||e.readyState!=="loading"&&e.addEventListener)setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){p.isFunction(c)&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)(d=p._data(g[h],a+"queueHooks"))&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=[].slice.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click")){g=p(this),g.context=this;for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){i={},k=[],g[0]=f;for(d=0;d<q;d++)l=o[d],m=l.selector,i[m]===b&&(i[m]=g.is(m)),i[m]&&k.push(l);k.length&&u.push({elem:f,matches:k})}}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){j=u[d],c.currentTarget=j.elem;for(e=0;e<j.matches.length&&!c.isImmediatePropagationStopped();e++){l=j.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,h=((p.event.special[l.origType]||{}).handle||l.handler).apply(j.elem,r),h!==b&&(c.result=h,h===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{ready:{setup:p.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)Z(a,b[e],c,d)}function be(a,b,c,d,e,f){var g,h=$.setFilters[b.toLowerCase()];return h||Z.error(b),(a||!(g=e))&&bd(a||"*",d,g=[],e),g.length>0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(g[a]=b)};for(;p<q;p++){s.exec(""),a=f[p],j=[],i=0,k=e;while(g=s.exec(a)){n=s.lastIndex=g.index+g[0].length;if(n>i){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="<a name='"+q+"'></a><div name='"+q+"'></div>",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}};$.setFilters.nth=$.setFilters.eq,$.filters=$.pseudos,X||($.attrHandle={href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}}),V&&($.order.push("NAME"),$.find.NAME=function(a,b){if(typeof b.getElementsByName!==j)return b.getElementsByName(a)}),Y&&($.order.splice(1,0,"CLASS"),$.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!==j&&!c)return b.getElementsByClassName(a)});try{n.call(i.childNodes,0)[0].nodeType}catch(_){n=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}var ba=Z.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},bb=Z.contains=i.compareDocumentPosition?function(a,b){return!!(a.compareDocumentPosition(b)&16)}:i.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc=Z.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=bc(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=bc(b);return c};Z.attr=function(a,b){var c,d=ba(a);return d||(b=b.toLowerCase()),$.attrHandle[b]?$.attrHandle[b](a):U||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},Z.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},[0,0].sort(function(){return l=0}),i.compareDocumentPosition?e=function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:(e=function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],g=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return f(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)g.unshift(j),j=j.parentNode;c=e.length,d=g.length;for(var l=0;l<c&&l<d;l++)if(e[l]!==g[l])return f(e[l],g[l]);return l===c?f(a,g[l],-1):f(e[l],b,1)},f=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),Z.uniqueSort=function(a){var b,c=1;if(e){k=l,a.sort(e);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1)}return a};var bl=Z.compile=function(a,b,c){var d,e,f,g=O[a];if(g&&g.context===b)return g;e=bg(a,b,c);for(f=0;d=e[f];f++)e[f]=bj(d,b,c);return g=O[a]=bk(e),g.context=b,g.runs=g.dirruns=0,P.push(a),P.length>$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j<k;j++){p=$.order[j];if(s=L[p].exec(m)){h=$.find[p]((s[1]||"").replace(K,""),q,g);if(h==null)continue;m===r&&(a=a.slice(0,a.length-r.length)+m.replace(L[p],""),a||o.apply(e,n.call(h,0)));break}}}if(a){i=bl(a,b,g),d=i.dirruns++,h==null&&(h=$.find.TAG("*",G.test(a)&&b.parentNode||b));for(j=0;l=h[j];j++)c=i.runs++,i(l,b)&&e.push(l)}return e};h.querySelectorAll&&function(){var a,b=bm,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=i.matchesSelector||i.mozMatchesSelector||i.webkitMatchesSelector||i.oMatchesSelector||i.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=(c[0]||c).ownerDocument||c[0]||c,typeof c.createDocumentFragment=="undefined"&&(c=e),a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cS[c]=cS[c]||[],cS[c].unshift(b)},prefilter:function(a,b){b?cR.unshift(a):cR.push(a)}}),p.Tween=cY,cY.prototype={constructor:cY,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cY.propHooks[this.prop];return a&&a.get?a.get(this):cY.propHooks._default.get(this)},run:function(a){var b,c=cY.propHooks[this.prop];return this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration),this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cY.propHooks._default.set(this),this}},cY.prototype.init.prototype=cY.prototype,cY.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cY.propHooks.scrollTop=cY.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(cZ(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bY).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cV(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cQ.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:cZ("show"),slideUp:cZ("hide"),slideToggle:cZ("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cY.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cN&&(cN=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cN),cN=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c$=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j,k,l,m=this[0],n=m&&m.ownerDocument;if(!n)return;return(e=n.body)===m?p.offset.bodyOffset(m):(d=n.documentElement,p.contains(d,m)?(c=m.getBoundingClientRect(),f=c_(n),g=d.clientTop||e.clientTop||0,h=d.clientLeft||e.clientLeft||0,i=f.pageYOffset||d.scrollTop,j=f.pageXOffset||d.scrollLeft,k=c.top+i-g,l=c.left+j-h,{top:k,left:l}):{top:0,left:0})},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.ba-bbq.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.ba-bbq.min.js
deleted file mode 100644
index bcbf24834ac7e..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.ba-bbq.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
-/*
- * jQuery hashchange event - v1.2 - 2/11/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($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.slideto.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.slideto.min.js
deleted file mode 100644
index ba32cff3651b5..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.slideto.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.wiggle.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.wiggle.min.js
deleted file mode 100644
index 2adb0d6d54af0..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.wiggle.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-jQuery Wiggle
-Author: WonderGroup, Jordan Thomas
-URL: http://labs.wondergroup.com/demos/mini-ui/index.html
-License: MIT (http://en.wikipedia.org/wiki/MIT_License)
-*/
-jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
-if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jsoneditor.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jsoneditor.min.js
deleted file mode 100644
index 21db1ab3e112a..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jsoneditor.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-!function(){var t;!function(){var e=!1,i=/xyz/.test(function(){window.postMessage("xyz")})?/\b_super\b/:/.*/;return t=function(){},t.extend=function(t){function s(){!e&&this.init&&this.init.apply(this,arguments)}var r=this.prototype;e=!0;var n=new this;e=!1;for(var o in t)n[o]="function"==typeof t[o]&&"function"==typeof r[o]&&i.test(t[o])?function(t,e){return function(){var i=this._super;this._super=r[t];var s=e.apply(this,arguments);return this._super=i,s}}(o,t[o]):t[o];return s.prototype=n,s.prototype.constructor=s,s.extend=arguments.callee,s},t}(),function(){function t(t,e){e=e||{bubbles:!1,cancelable:!1,detail:void 0};var i=document.createEvent("CustomEvent");return i.initCustomEvent(t,e.bubbles,e.cancelable,e.detail),i}t.prototype=window.Event.prototype,window.CustomEvent=t}(),function(){for(var t=0,e=["ms","moz","webkit","o"],i=0;i<e.length&&!window.requestAnimationFrame;++i)window.requestAnimationFrame=window[e[i]+"RequestAnimationFrame"],window.cancelAnimationFrame=window[e[i]+"CancelAnimationFrame"]||window[e[i]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(e,i){var s=(new Date).getTime(),r=Math.max(0,16-(s-t)),n=window.setTimeout(function(){e(s+r)},r);return t=s+r,n}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(t){clearTimeout(t)})}(),function(){Array.isArray||(Array.isArray=function(t){return"[object Array]"===Object.prototype.toString.call(t)})}();var e=function(t){return!("object"!=typeof t||t.nodeType||null!==t&&t===t.window)&&!(t.constructor&&!Object.prototype.hasOwnProperty.call(t.constructor.prototype,"isPrototypeOf"))},i=function(t){var s,r,n;for(r=1;r<arguments.length;r++){s=arguments[r];for(n in s)s.hasOwnProperty(n)&&(s[n]&&e(s[n])?(t.hasOwnProperty(n)||(t[n]={}),i(t[n],s[n])):t[n]=s[n])}return t},s=function(t,e){if(t&&"object"==typeof t){var i;if(Array.isArray(t)||"number"==typeof t.length&&t.length>0&&t.length-1 in t){for(i=0;i<t.length;i++)if(e(i,t[i])===!1)return}else if(Object.keys){var s=Object.keys(t);for(i=0;i<s.length;i++)if(e(s[i],t[s[i]])===!1)return}else for(i in t)if(t.hasOwnProperty(i)&&e(i,t[i])===!1)return}},r=function(t,e){var i=document.createEvent("HTMLEvents");i.initEvent(e,!0,!0),t.dispatchEvent(i)},n=function(t,e){if(!(t instanceof Element))throw new Error("element should be an instance of Element");e=i({},n.defaults.options,e||{}),this.element=t,this.options=e,this.init()};n.prototype={constructor:n,init:function(){var t=this;this.ready=!1;var e=n.defaults.themes[this.options.theme||n.defaults.theme];if(!e)throw"Unknown theme "+(this.options.theme||n.defaults.theme);this.schema=this.options.schema,this.theme=new e,this.template=this.options.template,this.refs=this.options.refs||{},this.uuid=0,this.__data={};var i=n.defaults.iconlibs[this.options.iconlib||n.defaults.iconlib];i&&(this.iconlib=new i),this.root_container=this.theme.getContainer(),this.element.appendChild(this.root_container),this.translate=this.options.translate||n.defaults.translate,this._loadExternalRefs(this.schema,function(){t._getDefinitions(t.schema),t.validator=new n.Validator(t);var e=t.getEditorClass(t.schema);t.root=t.createEditor(e,{jsoneditor:t,schema:t.schema,required:!0,container:t.root_container}),t.root.preBuild(),t.root.build(),t.root.postBuild(),t.options.startval&&t.root.setValue(t.options.startval),t.validation_results=t.validator.validate(t.root.getValue()),t.root.showValidationErrors(t.validation_results),t.ready=!0,window.requestAnimationFrame(function(){t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),t.root.showValidationErrors(t.validation_results),t.trigger("ready"),t.trigger("change"))})})},getValue:function(){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before getting the value";return this.root.getValue()},setValue:function(t){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before setting the value";return this.root.setValue(t),this},validate:function(t){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before validating";return 1===arguments.length?this.validator.validate(t):this.validation_results},destroy:function(){this.destroyed||this.ready&&(this.schema=null,this.options=null,this.root.destroy(),this.root=null,this.root_container=null,this.validator=null,this.validation_results=null,this.theme=null,this.iconlib=null,this.template=null,this.__data=null,this.ready=!1,this.element.innerHTML="",this.destroyed=!0)},on:function(t,e){return this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[],this.callbacks[t].push(e),this},off:function(t,e){if(t&&e){this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[];for(var i=[],s=0;s<this.callbacks[t].length;s++)this.callbacks[t][s]!==e&&i.push(this.callbacks[t][s]);this.callbacks[t]=i}else t?(this.callbacks=this.callbacks||{},this.callbacks[t]=[]):this.callbacks={};return this},trigger:function(t){if(this.callbacks&&this.callbacks[t]&&this.callbacks[t].length)for(var e=0;e<this.callbacks[t].length;e++)this.callbacks[t][e]();return this},setOption:function(t,e){if("show_errors"!==t)throw"Option "+t+" must be set during instantiation and cannot be changed later";return this.options.show_errors=e,this.onChange(),this},getEditorClass:function(t){var e;if(t=this.expandSchema(t),s(n.defaults.resolvers,function(i,s){var r=s(t);return r&&n.defaults.editors[r]?(e=r,!1):void 0}),!e)throw"Unknown editor for schema "+JSON.stringify(t);if(!n.defaults.editors[e])throw"Unknown editor "+e;return n.defaults.editors[e]},createEditor:function(t,e){return e=i({},t.options||{},e),new t(e)},onChange:function(){if(this.ready&&!this.firing_change){this.firing_change=!0;var t=this;return window.requestAnimationFrame(function(){t.firing_change=!1,t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),"never"!==t.options.show_errors?t.root.showValidationErrors(t.validation_results):t.root.showValidationErrors([]),t.trigger("change"))}),this}},compileTemplate:function(t,e){e=e||n.defaults.template;var i;if("string"==typeof e){if(!n.defaults.templates[e])throw"Unknown template engine "+e;if(i=n.defaults.templates[e](),!i)throw"Template engine "+e+" missing required library."}else i=e;if(!i)throw"No template engine set";if(!i.compile)throw"Invalid template engine set";return i.compile(t)},_data:function(t,e,i){if(3!==arguments.length)return t.hasAttribute("data-jsoneditor-"+e)?this.__data[t.getAttribute("data-jsoneditor-"+e)]:null;var s;t.hasAttribute("data-jsoneditor-"+e)?s=t.getAttribute("data-jsoneditor-"+e):(s=this.uuid++,t.setAttribute("data-jsoneditor-"+e,s)),this.__data[s]=i},registerEditor:function(t){return this.editors=this.editors||{},this.editors[t.path]=t,this},unregisterEditor:function(t){return this.editors=this.editors||{},this.editors[t.path]=null,this},getEditor:function(t){return this.editors?this.editors[t]:void 0},watch:function(t,e){return this.watchlist=this.watchlist||{},this.watchlist[t]=this.watchlist[t]||[],this.watchlist[t].push(e),this},unwatch:function(t,e){if(!this.watchlist||!this.watchlist[t])return this;if(!e)return this.watchlist[t]=null,this;for(var i=[],s=0;s<this.watchlist[t].length;s++)this.watchlist[t][s]!==e&&i.push(this.watchlist[t][s]);return this.watchlist[t]=i.length?i:null,this},notifyWatchers:function(t){if(!this.watchlist||!this.watchlist[t])return this;for(var e=0;e<this.watchlist[t].length;e++)this.watchlist[t][e]()},isEnabled:function(){return!this.root||this.root.isEnabled()},enable:function(){this.root.enable()},disable:function(){this.root.disable()},_getDefinitions:function(t,e){if(e=e||"#/definitions/",t.definitions)for(var i in t.definitions)t.definitions.hasOwnProperty(i)&&(this.refs[e+i]=t.definitions[i],t.definitions[i].definitions&&this._getDefinitions(t.definitions[i],e+i+"/definitions/"))},_getExternalRefs:function(t){var e={},i=function(t){for(var i in t)t.hasOwnProperty(i)&&(e[i]=!0)};t.$ref&&"object"!=typeof t.$ref&&"#"!==t.$ref.substr(0,1)&&!this.refs[t.$ref]&&(e[t.$ref]=!0);for(var s in t)if(t.hasOwnProperty(s))if(t[s]&&"object"==typeof t[s]&&Array.isArray(t[s]))for(var r=0;r<t[s].length;r++)"object"==typeof t[s][r]&&i(this._getExternalRefs(t[s][r]));else t[s]&&"object"==typeof t[s]&&i(this._getExternalRefs(t[s]));return e},_loadExternalRefs:function(t,e){var i=this,r=this._getExternalRefs(t),n=0,o=0,a=!1;s(r,function(t){if(!i.refs[t]){if(!i.options.ajax)throw"Must set ajax option to true to load external ref "+t;i.refs[t]="loading",o++;var s=new XMLHttpRequest;s.open("GET",t,!0),s.onreadystatechange=function(){if(4==s.readyState){if(200!==s.status)throw window.console.log(s),"Failed to fetch ref via ajax- "+t;var r;try{r=JSON.parse(s.responseText)}catch(h){throw window.console.log(h),"Failed to parse external ref "+t}if(!r||"object"!=typeof r)throw"External ref does not contain a valid schema - "+t;i.refs[t]=r,i._loadExternalRefs(r,function(){n++,n>=o&&!a&&(a=!0,e())})}},s.send()}}),o||e()},expandRefs:function(t){for(t=i({},t);t.$ref;){var e=t.$ref;delete t.$ref,this.refs[e]||(e=decodeURIComponent(e)),t=this.extendSchemas(t,this.refs[e])}return t},expandSchema:function(t){var e,r=this,n=i({},t);if("object"==typeof t.type&&(Array.isArray(t.type)?s(t.type,function(e,i){"object"==typeof i&&(t.type[e]=r.expandSchema(i))}):t.type=r.expandSchema(t.type)),"object"==typeof t.disallow&&(Array.isArray(t.disallow)?s(t.disallow,function(e,i){"object"==typeof i&&(t.disallow[e]=r.expandSchema(i))}):t.disallow=r.expandSchema(t.disallow)),t.anyOf&&s(t.anyOf,function(e,i){t.anyOf[e]=r.expandSchema(i)}),t.dependencies&&s(t.dependencies,function(e,i){"object"!=typeof i||Array.isArray(i)||(t.dependencies[e]=r.expandSchema(i))}),t.not&&(t.not=this.expandSchema(t.not)),t.allOf){for(e=0;e<t.allOf.length;e++)n=this.extendSchemas(n,this.expandSchema(t.allOf[e]));delete n.allOf}if(t["extends"]){if(Array.isArray(t["extends"]))for(e=0;e<t["extends"].length;e++)n=this.extendSchemas(n,this.expandSchema(t["extends"][e]));else n=this.extendSchemas(n,this.expandSchema(t["extends"]));delete n["extends"]}if(t.oneOf){var o=i({},n);for(delete o.oneOf,e=0;e<t.oneOf.length;e++)n.oneOf[e]=this.extendSchemas(this.expandSchema(t.oneOf[e]),o)}return this.expandRefs(n)},extendSchemas:function(t,e){t=i({},t),e=i({},e);var r=this,n={};return s(t,function(t,i){"undefined"!=typeof e[t]?"required"===t&&"object"==typeof i&&Array.isArray(i)?n.required=i.concat(e[t]).reduce(function(t,e){return t.indexOf(e)<0&&t.push(e),t},[]):"type"!==t||"string"!=typeof i&&!Array.isArray(i)?"object"==typeof i&&Array.isArray(i)?n[t]=i.filter(function(i){return-1!==e[t].indexOf(i)}):"object"==typeof i&&null!==i?n[t]=r.extendSchemas(i,e[t]):n[t]=i:("string"==typeof i&&(i=[i]),"string"==typeof e.type&&(e.type=[e.type]),n.type=i.filter(function(t){return-1!==e.type.indexOf(t)}),1===n.type.length&&"string"==typeof n.type[0]&&(n.type=n.type[0])):n[t]=i}),s(e,function(e,i){"undefined"==typeof t[e]&&(n[e]=i)}),n}},n.defaults={themes:{},templates:{},iconlibs:{},editors:{},languages:{},resolvers:[],custom_validators:[]},n.Validator=t.extend({init:function(t,e){this.jsoneditor=t,this.schema=e||this.jsoneditor.schema,this.options={},this.translate=this.jsoneditor.translate||n.defaults.translate},validate:function(t){return this._validateSchema(this.schema,t)},_validateSchema:function(t,e,r){var o,a,h,l=this,d=[],u=JSON.stringify(e);if(r=r||"root",t=i({},this.jsoneditor.expandRefs(t)),t.required&&t.required===!0){if("undefined"==typeof e)return d.push({path:r,property:"required",message:this.translate("error_notset")}),d}else if("undefined"==typeof e){if(!this.jsoneditor.options.required_by_default)return d;d.push({path:r,property:"required",message:this.translate("error_notset")})}if(t["enum"]){for(o=!1,a=0;a<t["enum"].length;a++)u===JSON.stringify(t["enum"][a])&&(o=!0);o||d.push({path:r,property:"enum",message:this.translate("error_enum")})}if(t["extends"])for(a=0;a<t["extends"].length;a++)d=d.concat(this._validateSchema(t["extends"][a],e,r));if(t.allOf)for(a=0;a<t.allOf.length;a++)d=d.concat(this._validateSchema(t.allOf[a],e,r));if(t.anyOf){for(o=!1,a=0;a<t.anyOf.length;a++)if(!this._validateSchema(t.anyOf[a],e,r).length){o=!0;break}o||d.push({path:r,property:"anyOf",message:this.translate("error_anyOf")})}if(t.oneOf){o=0;var p=[];for(a=0;a<t.oneOf.length;a++){var c=this._validateSchema(t.oneOf[a],e,r);for(c.length||o++,h=0;h<c.length;h++)c[h].path=r+".oneOf["+a+"]"+c[h].path.substr(r.length);p=p.concat(c)}1!==o&&(d.push({path:r,property:"oneOf",message:this.translate("error_oneOf",[o])}),d=d.concat(p))}if(t.not&&(this._validateSchema(t.not,e,r).length||d.push({path:r,property:"not",message:this.translate("error_not")})),t.type)if(Array.isArray(t.type)){for(o=!1,a=0;a<t.type.length;a++)if(this._checkType(t.type[a],e)){o=!0;break}o||d.push({path:r,property:"type",message:this.translate("error_type_union")})}else this._checkType(t.type,e)||d.push({path:r,property:"type",message:this.translate("error_type",[t.type])});if(t.disallow)if(Array.isArray(t.disallow)){for(o=!0,a=0;a<t.disallow.length;a++)if(this._checkType(t.disallow[a],e)){o=!1;break}o||d.push({path:r,property:"disallow",message:this.translate("error_disallow_union")})}else this._checkType(t.disallow,e)&&d.push({path:r,property:"disallow",message:this.translate("error_disallow",[t.disallow])});if("number"==typeof e)(t.multipleOf||t.divisibleBy)&&(o=e/(t.multipleOf||t.divisibleBy),o!==Math.floor(o)&&d.push({path:r,property:t.multipleOf?"multipleOf":"divisibleBy",message:this.translate("error_multipleOf",[t.multipleOf||t.divisibleBy])})),t.hasOwnProperty("maximum")&&(t.exclusiveMaximum&&e>=t.maximum?d.push({path:r,property:"maximum",message:this.translate("error_maximum_excl",[t.maximum])}):!t.exclusiveMaximum&&e>t.maximum&&d.push({path:r,property:"maximum",message:this.translate("error_maximum_incl",[t.maximum])})),t.hasOwnProperty("minimum")&&(t.exclusiveMinimum&&e<=t.minimum?d.push({path:r,property:"minimum",message:this.translate("error_minimum_excl",[t.minimum])}):!t.exclusiveMinimum&&e<t.minimum&&d.push({path:r,property:"minimum",message:this.translate("error_minimum_incl",[t.minimum])}));else if("string"==typeof e)t.maxLength&&(e+"").length>t.maxLength&&d.push({path:r,property:"maxLength",message:this.translate("error_maxLength",[t.maxLength])}),t.minLength&&(e+"").length<t.minLength&&d.push({path:r,property:"minLength",message:this.translate(1===t.minLength?"error_notempty":"error_minLength",[t.minLength])}),t.pattern&&(new RegExp(t.pattern).test(e)||d.push({path:r,property:"pattern",message:this.translate("error_pattern")}));else if("object"==typeof e&&null!==e&&Array.isArray(e)){if(t.items)if(Array.isArray(t.items))for(a=0;a<e.length;a++)if(t.items[a])d=d.concat(this._validateSchema(t.items[a],e[a],r+"."+a));else{if(t.additionalItems===!0)break;if(!t.additionalItems){if(t.additionalItems===!1){d.push({path:r,property:"additionalItems",message:this.translate("error_additionalItems")});break}break}d=d.concat(this._validateSchema(t.additionalItems,e[a],r+"."+a))}else for(a=0;a<e.length;a++)d=d.concat(this._validateSchema(t.items,e[a],r+"."+a));if(t.maxItems&&e.length>t.maxItems&&d.push({path:r,property:"maxItems",message:this.translate("error_maxItems",[t.maxItems])}),t.minItems&&e.length<t.minItems&&d.push({path:r,property:"minItems",message:this.translate("error_minItems",[t.minItems])}),t.uniqueItems){var m={};for(a=0;a<e.length;a++){if(o=JSON.stringify(e[a]),m[o]){d.push({path:r,property:"uniqueItems",message:this.translate("error_uniqueItems")});break}m[o]=!0}}}else if("object"==typeof e&&null!==e){if(t.maxProperties){o=0;for(a in e)e.hasOwnProperty(a)&&o++;o>t.maxProperties&&d.push({path:r,property:"maxProperties",message:this.translate("error_maxProperties",[t.maxProperties])})}if(t.minProperties){o=0;for(a in e)e.hasOwnProperty(a)&&o++;o<t.minProperties&&d.push({path:r,property:"minProperties",message:this.translate("error_minProperties",[t.minProperties])})}if(t.required&&Array.isArray(t.required))for(a=0;a<t.required.length;a++)"undefined"==typeof e[t.required[a]]&&d.push({path:r,property:"required",message:this.translate("error_required",[t.required[a]])});var f={};if(t.properties)for(a in t.properties)t.properties.hasOwnProperty(a)&&(f[a]=!0,d=d.concat(this._validateSchema(t.properties[a],e[a],r+"."+a)));if(t.patternProperties)for(a in t.patternProperties)if(t.patternProperties.hasOwnProperty(a)){var g=new RegExp(a);for(h in e)e.hasOwnProperty(h)&&g.test(h)&&(f[h]=!0,d=d.concat(this._validateSchema(t.patternProperties[a],e[h],r+"."+h)))}if("undefined"!=typeof t.additionalProperties||!this.jsoneditor.options.no_additional_properties||t.oneOf||t.anyOf||(t.additionalProperties=!1),"undefined"!=typeof t.additionalProperties)for(a in e)if(e.hasOwnProperty(a)&&!f[a]){if(!t.additionalProperties){d.push({path:r,property:"additionalProperties",message:this.translate("error_additional_properties",[a])});break}if(t.additionalProperties===!0)break;d=d.concat(this._validateSchema(t.additionalProperties,e[a],r+"."+a))}if(t.dependencies)for(a in t.dependencies)if(t.dependencies.hasOwnProperty(a)&&"undefined"!=typeof e[a])if(Array.isArray(t.dependencies[a]))for(h=0;h<t.dependencies[a].length;h++)"undefined"==typeof e[t.dependencies[a][h]]&&d.push({path:r,property:"dependencies",message:this.translate("error_dependency",[t.dependencies[a][h]])});else d=d.concat(this._validateSchema(t.dependencies[a],e,r))}return s(n.defaults.custom_validators,function(i,s){d=d.concat(s.call(l,t,e,r))}),d},_checkType:function(t,e){return"string"==typeof t?"string"===t?"string"==typeof e:"number"===t?"number"==typeof e:"integer"===t?"number"==typeof e&&e===Math.floor(e):"boolean"===t?"boolean"==typeof e:"array"===t?Array.isArray(e):"object"===t?null!==e&&!Array.isArray(e)&&"object"==typeof e:"null"!==t||null===e:!this._validateSchema(t,e).length}}),n.AbstractEditor=t.extend({onChildEditorChange:function(t){this.onChange(!0)},notify:function(){this.jsoneditor.notifyWatchers(this.path)},change:function(){this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange()},onChange:function(t){this.notify(),this.watch_listener&&this.watch_listener(),t&&this.change()},register:function(){this.jsoneditor.registerEditor(this),this.onChange()},unregister:function(){this.jsoneditor&&this.jsoneditor.unregisterEditor(this)},getNumColumns:function(){return 12},init:function(t){this.jsoneditor=t.jsoneditor,this.theme=this.jsoneditor.theme,this.template_engine=this.jsoneditor.template,this.iconlib=this.jsoneditor.iconlib,this.original_schema=t.schema,this.schema=this.jsoneditor.expandSchema(this.original_schema),this.options=i({},this.options||{},t.schema.options||{},t),t.path||this.schema.id||(this.schema.id="root"),this.path=t.path||"root",this.formname=t.formname||this.path.replace(/\.([^.]+)/g,"[$1]"),this.jsoneditor.options.form_name_root&&(this.formname=this.formname.replace(/^root\[/,this.jsoneditor.options.form_name_root+"[")),this.key=this.path.split(".").pop(),this.parent=t.parent,this.link_watchers=[],t.container&&this.setContainer(t.container)},setContainer:function(t){this.container=t,this.schema.id&&this.container.setAttribute("data-schemaid",this.schema.id),this.schema.type&&"string"==typeof this.schema.type&&this.container.setAttribute("data-schematype",this.schema.type),this.container.setAttribute("data-schemapath",this.path)},preBuild:function(){},build:function(){},postBuild:function(){this.setupWatchListeners(),this.addLinks(),this.setValue(this.getDefault(),!0),this.updateHeaderText(),this.register(),this.onWatchedFieldChange()},setupWatchListeners:function(){var t=this;if(this.watched={},this.schema.vars&&(this.schema.watch=this.schema.vars),this.watched_values={},this.watch_listener=function(){t.refreshWatchedFieldValues()&&t.onWatchedFieldChange()},this.register(),this.schema.hasOwnProperty("watch")){var e,i,s,r,n;for(var o in this.schema.watch)if(this.schema.watch.hasOwnProperty(o)){if(e=this.schema.watch[o],Array.isArray(e)?i=[e[0]].concat(e[1].split(".")):(i=e.split("."),t.theme.closest(t.container,'[data-schemaid="'+i[0]+'"]')||i.unshift("#")),s=i.shift(),"#"===s&&(s=t.jsoneditor.schema.id||"root"),r=t.theme.closest(t.container,'[data-schemaid="'+s+'"]'),!r)throw"Could not find ancestor node with id "+s;n=r.getAttribute("data-schemapath")+"."+i.join("."),t.jsoneditor.watch(n,t.watch_listener),t.watched[o]=n}}this.schema.headerTemplate&&(this.header_template=this.jsoneditor.compileTemplate(this.schema.headerTemplate,this.template_engine))},addLinks:function(){if(!this.no_link_holder&&(this.link_holder=this.theme.getLinksHolder(),this.container.appendChild(this.link_holder),this.schema.links))for(var t=0;t<this.schema.links.length;t++)this.addLink(this.getLink(this.schema.links[t]))},getButton:function(t,e,i){var s="json-editor-btn-"+e;e=this.iconlib?this.iconlib.getIcon(e):null,!e&&i&&(t=i,i=null);var r=this.theme.getButton(t,e,i);return r.className+=" "+s+" ",r},setButtonText:function(t,e,i,s){return i=this.iconlib?this.iconlib.getIcon(i):null,!i&&s&&(e=s,s=null),this.theme.setButtonText(t,e,i,s)},addLink:function(t){this.link_holder&&this.link_holder.appendChild(t)},getLink:function(t){var e,i,s=t.mediaType||"application/javascript",r=s.split("/")[0],n=this.jsoneditor.compileTemplate(t.href,this.template_engine);if("image"===r){e=this.theme.getBlockLinkHolder(),i=document.createElement("a"),i.setAttribute("target","_blank");var o=document.createElement("img");this.theme.createImageLink(e,i,o),this.link_watchers.push(function(e){var s=n(e);i.setAttribute("href",s),i.setAttribute("title",t.rel||s),o.setAttribute("src",s)})}else if(["audio","video"].indexOf(r)>=0){e=this.theme.getBlockLinkHolder(),i=this.theme.getBlockLink(),i.setAttribute("target","_blank");var a=document.createElement(r);a.setAttribute("controls","controls"),this.theme.createMediaLink(e,i,a),this.link_watchers.push(function(e){var s=n(e);i.setAttribute("href",s),i.textContent=t.rel||s,a.setAttribute("src",s)})}else e=this.theme.getBlockLink(),e.setAttribute("target","_blank"),e.textContent=t.rel,this.link_watchers.push(function(i){var s=n(i);e.setAttribute("href",s),e.textContent=t.rel||s});return e},refreshWatchedFieldValues:function(){if(this.watched_values){var t={},e=!1,i=this;if(this.watched){var s,r;for(var n in this.watched)this.watched.hasOwnProperty(n)&&(r=i.jsoneditor.getEditor(this.watched[n]),s=r?r.getValue():null,i.watched_values[n]!==s&&(e=!0),t[n]=s)}return t.self=this.getValue(),this.watched_values.self!==t.self&&(e=!0),this.watched_values=t,e}},getWatchedFieldValues:function(){return this.watched_values},updateHeaderText:function(){if(this.header)if(this.header.children.length){for(var t=0;t<this.header.childNodes.length;t++)if(3===this.header.childNodes[t].nodeType){this.header.childNodes[t].nodeValue=this.getHeaderText();break}}else this.header.textContent=this.getHeaderText()},getHeaderText:function(t){return this.header_text?this.header_text:t?this.schema.title:this.getTitle()},onWatchedFieldChange:function(){var t;if(this.header_template){t=i(this.getWatchedFieldValues(),{key:this.key,i:this.key,i0:1*this.key,i1:1*this.key+1,title:this.getTitle()});var e=this.header_template(t);e!==this.header_text&&(this.header_text=e,this.updateHeaderText(),this.notify())}if(this.link_watchers.length){t=this.getWatchedFieldValues();for(var s=0;s<this.link_watchers.length;s++)this.link_watchers[s](t)}},setValue:function(t){this.value=t},getValue:function(){return this.value},refreshValue:function(){},getChildEditors:function(){return!1},destroy:function(){var t=this;this.unregister(this),s(this.watched,function(e,i){t.jsoneditor.unwatch(i,t.watch_listener)}),this.watched=null,this.watched_values=null,this.watch_listener=null,this.header_text=null,this.header_template=null,this.value=null,this.container&&this.container.parentNode&&this.container.parentNode.removeChild(this.container),this.container=null,this.jsoneditor=null,this.schema=null,this.path=null,this.key=null,this.parent=null},getDefault:function(){if(this.schema["default"])return this.schema["default"];if(this.schema["enum"])return this.schema["enum"][0];var t=this.schema.type||this.schema.oneOf;if(t&&Array.isArray(t)&&(t=t[0]),t&&"object"==typeof t&&(t=t.type),t&&Array.isArray(t)&&(t=t[0]),"string"==typeof t){if("number"===t)return 0;if("boolean"===t)return!1;if("integer"===t)return 0;if("string"===t)return"";if("object"===t)return{};if("array"===t)return[]}return null},getTitle:function(){return this.schema.title||this.key},enable:function(){this.disabled=!1},disable:function(){this.disabled=!0},isEnabled:function(){return!this.disabled},isRequired:function(){return"boolean"==typeof this.schema.required?this.schema.required:this.parent&&this.parent.schema&&Array.isArray(this.parent.schema.required)?this.parent.schema.required.indexOf(this.key)>-1:!!this.jsoneditor.options.required_by_default},getDisplayText:function(t){var e=[],i={};s(t,function(t,e){e.title&&(i[e.title]=i[e.title]||0,i[e.title]++),e.description&&(i[e.description]=i[e.description]||0,i[e.description]++),e.format&&(i[e.format]=i[e.format]||0,i[e.format]++),e.type&&(i[e.type]=i[e.type]||0,i[e.type]++)}),s(t,function(t,s){var r;r="string"==typeof s?s:s.title&&i[s.title]<=1?s.title:s.format&&i[s.format]<=1?s.format:s.type&&i[s.type]<=1?s.type:s.description&&i[s.description]<=1?s.descripton:s.title?s.title:s.format?s.format:s.type?s.type:s.description?s.description:JSON.stringify(s).length<50?JSON.stringify(s):"type",e.push(r)});var r={};return s(e,function(t,s){r[s]=r[s]||0,r[s]++,i[s]>1&&(e[t]=s+" "+r[s])}),e},getOption:function(t){try{throw"getOption is deprecated"}catch(e){window.console.error(e)}return this.options[t]},showValidationErrors:function(t){}}),n.defaults.editors["null"]=n.AbstractEditor.extend({getValue:function(){return null},setValue:function(){this.onChange()},getNumColumns:function(){return 2}}),n.defaults.editors.string=n.AbstractEditor.extend({register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},setValue:function(t,e,i){if((!this.template||i)&&(null===t||"undefined"==typeof t?t="":"object"==typeof t?t=JSON.stringify(t):"string"!=typeof t&&(t=""+t),t!==this.serialized)){var s=this.sanitize(t);if(this.input.value!==s){this.input.value=s,this.sceditor_instance?this.sceditor_instance.val(s):this.epiceditor?this.epiceditor.importFile(null,s):this.ace_editor&&this.ace_editor.setValue(s);var r=i||this.getValue()!==t;this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(r)}}},getNumColumns:function(){var t,e=Math.ceil(Math.max(this.getTitle().length,this.schema.maxLength||0,this.schema.minLength||0)/5);return t="textarea"===this.input_type?6:["text","email"].indexOf(this.input_type)>=0?4:2,Math.min(12,Math.max(e,t))},build:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.format=this.schema.format,!this.format&&this.schema.media&&this.schema.media.type&&(this.format=this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,"")),!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.format)if("textarea"===this.format)this.input_type="textarea",this.input=this.theme.getTextareaInput();else if("range"===this.format){this.input_type="range";var e=this.schema.minimum||0,i=this.schema.maximum||Math.max(100,e+1),s=1;this.schema.multipleOf&&(e%this.schema.multipleOf&&(e=Math.ceil(e/this.schema.multipleOf)*this.schema.multipleOf),i%this.schema.multipleOf&&(i=Math.floor(i/this.schema.multipleOf)*this.schema.multipleOf),s=this.schema.multipleOf),this.input=this.theme.getRangeInput(e,i,s)}else["actionscript","batchfile","bbcode","c","c++","cpp","coffee","csharp","css","dart","django","ejs","erlang","golang","handlebars","haskell","haxe","html","ini","jade","java","javascript","json","less","lisp","lua","makefile","markdown","matlab","mysql","objectivec","pascal","perl","pgsql","php","python","r","ruby","sass","scala","scss","smarty","sql","stylus","svg","twig","vbscript","xml","yaml"].indexOf(this.format)>=0?(this.input_type=this.format,this.source_code=!0,this.input=this.theme.getTextareaInput()):(this.input_type=this.format,this.input=this.theme.getFormInputField(this.input_type));else this.input_type="text",this.input=this.theme.getFormInputField(this.input_type);"undefined"!=typeof this.schema.maxLength&&this.input.setAttribute("maxlength",this.schema.maxLength),"undefined"!=typeof this.schema.pattern?this.input.setAttribute("pattern",this.schema.pattern):"undefined"!=typeof this.schema.minLength&&this.input.setAttribute("pattern",".{"+this.schema.minLength+",}"),this.options.compact?this.container.className+=" compact":this.options.input_width&&(this.input.style.width=this.options.input_width),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(e){if(e.preventDefault(),e.stopPropagation(),t.schema.template)return void(this.value=t.value);var i=this.value,s=t.sanitize(i);i!==s&&(this.value=s),t.is_dirty=!0,t.refreshValue(),t.onChange(!0)}),this.options.input_height&&(this.input.style.height=this.options.input_height),this.options.expand_height&&(this.adjust_height=function(t){if(t){var e,i=t.offsetHeight;if(t.offsetHeight<t.scrollHeight)for(e=0;t.offsetHeight<t.scrollHeight+3&&!(e>100);)e++,i++,t.style.height=i+"px";else{for(e=0;t.offsetHeight>=t.scrollHeight+3&&!(e>100);)e++,i--,t.style.height=i+"px";t.style.height=i+1+"px"}}},this.input.addEventListener("keyup",function(e){t.adjust_height(this)}),this.input.addEventListener("change",function(e){t.adjust_height(this)}),this.adjust_height()),this.format&&this.input.setAttribute("data-schemaformat",this.format),this.control=this.theme.getFormControl(this.label,this.input,this.description),this.container.appendChild(this.control),window.requestAnimationFrame(function(){t.input.parentNode&&t.afterInputReady(),t.adjust_height&&t.adjust_height(t.input)}),this.schema.template?(this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()):this.refreshValue()},enable:function(){this.always_disabled||(this.input.disabled=!1),this._super()},disable:function(){this.input.disabled=!0,this._super()},afterInputReady:function(){var t,e=this;if(this.source_code)if(this.options.wysiwyg&&["html","bbcode"].indexOf(this.input_type)>=0&&window.jQuery&&window.jQuery.fn&&window.jQuery.fn.sceditor)t=i({},{plugins:"html"===e.input_type?"xhtml":"bbcode",emoticonsEnabled:!1,width:"100%",height:300},n.plugins.sceditor,e.options.sceditor_options||{}),window.jQuery(e.input).sceditor(t),e.sceditor_instance=window.jQuery(e.input).sceditor("instance"),e.sceditor_instance.blur(function(){var t=window.jQuery("<div>"+e.sceditor_instance.val()+"</div>");window.jQuery("#sceditor-start-marker,#sceditor-end-marker,.sceditor-nlf",t).remove(),e.input.value=t.html(),e.value=e.input.value,e.is_dirty=!0,e.onChange(!0)});else if("markdown"===this.input_type&&window.EpicEditor)this.epiceditor_container=document.createElement("div"),this.input.parentNode.insertBefore(this.epiceditor_container,this.input),this.input.style.display="none",t=i({},n.plugins.epiceditor,{container:this.epiceditor_container,clientSideStorage:!1}),this.epiceditor=new window.EpicEditor(t).load(),this.epiceditor.importFile(null,this.getValue()),this.epiceditor.on("update",function(){var t=e.epiceditor.exportFile();e.input.value=t,e.value=t,e.is_dirty=!0,e.onChange(!0)});else if(window.ace){
-var s=this.input_type;("cpp"===s||"c++"===s||"c"===s)&&(s="c_cpp"),this.ace_container=document.createElement("div"),this.ace_container.style.width="100%",this.ace_container.style.position="relative",this.ace_container.style.height="400px",this.input.parentNode.insertBefore(this.ace_container,this.input),this.input.style.display="none",this.ace_editor=window.ace.edit(this.ace_container),this.ace_editor.setValue(this.getValue()),n.plugins.ace.theme&&this.ace_editor.setTheme("ace/theme/"+n.plugins.ace.theme),s=window.ace.require("ace/mode/"+s),s&&this.ace_editor.getSession().setMode(new s.Mode),this.ace_editor.on("change",function(){var t=e.ace_editor.getValue();e.input.value=t,e.refreshValue(),e.is_dirty=!0,e.onChange(!0)})}e.theme.afterInputReady(e.input)},refreshValue:function(){this.value=this.input.value,"string"!=typeof this.value&&(this.value=""),this.serialized=this.value},destroy:function(){this.sceditor_instance?this.sceditor_instance.destroy():this.epiceditor?this.epiceditor.unload():this.ace_editor&&this.ace_editor.destroy(),this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this._super()},sanitize:function(t){return t},onWatchedFieldChange:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),this._super()},showValidationErrors:function(t){var e=this;if("always"===this.jsoneditor.options.show_errors);else if(!this.is_dirty&&this.previous_error_setting===this.jsoneditor.options.show_errors)return;this.previous_error_setting=this.jsoneditor.options.show_errors;var i=[];s(t,function(t,s){s.path===e.path&&i.push(s.message)}),i.length?this.theme.addInputError(this.input,i.join(". ")+"."):this.theme.removeInputError(this.input)}}),n.defaults.editors.number=n.defaults.editors.string.extend({sanitize:function(t){return(t+"").replace(/[^0-9\.\-eE]/g,"")},getNumColumns:function(){return 2},getValue:function(){return 1*this.value}}),n.defaults.editors.integer=n.defaults.editors.number.extend({sanitize:function(t){return t+="",t.replace(/[^0-9\-]/g,"")},getNumColumns:function(){return 2}}),n.defaults.editors.object=n.AbstractEditor.extend({getDefault:function(){return i({},this.schema["default"]||{})},getChildEditors:function(){return this.editors},register:function(){if(this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].register()},unregister:function(){if(this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].unregister()},getNumColumns:function(){return Math.max(Math.min(12,this.maxwidth),3)},enable:function(){if(this.editjson_button&&(this.editjson_button.disabled=!1),this.addproperty_button&&(this.addproperty_button.disabled=!1),this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].enable()},disable:function(){if(this.editjson_button&&(this.editjson_button.disabled=!0),this.addproperty_button&&(this.addproperty_button.disabled=!0),this.hideEditJSON(),this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].disable()},layoutEditors:function(){var t,e,i=this;if(this.row_container){this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort(function(t,e){var s=i.editors[t].schema.propertyOrder,r=i.editors[e].schema.propertyOrder;return"number"!=typeof s&&(s=1e3),"number"!=typeof r&&(r=1e3),s-r});var r;if("grid"===this.format){var n=[];for(s(this.property_order,function(t,e){var s=i.editors[e];if(!s.property_removed){for(var r=!1,o=s.options.hidden?0:s.options.grid_columns||s.getNumColumns(),a=s.options.hidden?0:s.container.offsetHeight,h=0;h<n.length;h++)n[h].width+o<=12&&(!a||.5*n[h].minh<a&&2*n[h].maxh>a)&&(r=h);r===!1&&(n.push({width:0,minh:999999,maxh:0,editors:[]}),r=n.length-1),n[r].editors.push({key:e,width:o,height:a}),n[r].width+=o,n[r].minh=Math.min(n[r].minh,a),n[r].maxh=Math.max(n[r].maxh,a)}}),t=0;t<n.length;t++)if(n[t].width<12){var o=!1,a=0;for(e=0;e<n[t].editors.length;e++)o===!1?o=e:n[t].editors[e].width>n[t].editors[o].width&&(o=e),n[t].editors[e].width*=12/n[t].width,n[t].editors[e].width=Math.floor(n[t].editors[e].width),a+=n[t].editors[e].width;12>a&&(n[t].editors[o].width+=12-a),n[t].width=12}if(this.layout===JSON.stringify(n))return!1;for(this.layout=JSON.stringify(n),r=document.createElement("div"),t=0;t<n.length;t++){var h=this.theme.getGridRow();for(r.appendChild(h),e=0;e<n[t].editors.length;e++){var l=n[t].editors[e].key,d=this.editors[l];d.options.hidden?d.container.style.display="none":this.theme.setGridColumnSize(d.container,n[t].editors[e].width),h.appendChild(d.container)}}}else r=document.createElement("div"),s(this.property_order,function(t,e){var s=i.editors[e];if(!s.property_removed){var n=i.theme.getGridRow();r.appendChild(n),s.options.hidden?s.container.style.display="none":i.theme.setGridColumnSize(s.container,12),n.appendChild(s.container)}});this.row_container.innerHTML="",this.row_container.appendChild(r)}},getPropertySchema:function(t){var e=this.schema.properties[t]||{};e=i({},e);var s=!!this.schema.properties[t];if(this.schema.patternProperties)for(var r in this.schema.patternProperties)if(this.schema.patternProperties.hasOwnProperty(r)){var n=new RegExp(r);n.test(t)&&(e.allOf=e.allOf||[],e.allOf.push(this.schema.patternProperties[r]),s=!0)}return!s&&this.schema.additionalProperties&&"object"==typeof this.schema.additionalProperties&&(e=i({},this.schema.additionalProperties)),e},preBuild:function(){this._super(),this.editors={},this.cached_editors={};var t=this;if(this.format=this.options.layout||this.options.object_layout||this.schema.format||this.jsoneditor.options.object_layout||"normal",this.schema.properties=this.schema.properties||{},this.minwidth=0,this.maxwidth=0,this.options.table_row)s(this.schema.properties,function(e,i){var s=t.jsoneditor.getEditorClass(i);t.editors[e]=t.jsoneditor.createEditor(s,{jsoneditor:t.jsoneditor,schema:i,path:t.path+"."+e,parent:t,compact:!0,required:!0}),t.editors[e].preBuild();var r=t.editors[e].options.hidden?0:t.editors[e].options.grid_columns||t.editors[e].getNumColumns();t.minwidth+=r,t.maxwidth+=r}),this.no_link_holder=!0;else{if(this.options.table)throw"Not supported yet";this.defaultProperties=this.schema.defaultProperties||Object.keys(this.schema.properties),t.maxwidth+=1,s(this.defaultProperties,function(e,i){t.addObjectProperty(i,!0),t.editors[i]&&(t.minwidth=Math.max(t.minwidth,t.editors[i].options.grid_columns||t.editors[i].getNumColumns()),t.maxwidth+=t.editors[i].options.grid_columns||t.editors[i].getNumColumns())})}this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort(function(e,i){var s=t.editors[e].schema.propertyOrder,r=t.editors[i].schema.propertyOrder;return"number"!=typeof s&&(s=1e3),"number"!=typeof r&&(r=1e3),s-r})},build:function(){var t=this;if(this.options.table_row)this.editor_holder=this.container,s(this.editors,function(e,i){var s=t.theme.getTableCell();t.editor_holder.appendChild(s),i.setContainer(s),i.build(),i.postBuild(),t.editors[e].options.hidden&&(s.style.display="none"),t.editors[e].options.input_width&&(s.style.width=t.editors[e].options.input_width)});else{if(this.options.table)throw"Not supported yet";this.header=document.createElement("span"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header),this.container.appendChild(this.title),this.container.style.position="relative",this.editjson_holder=this.theme.getModal(),this.editjson_textarea=this.theme.getTextareaInput(),this.editjson_textarea.style.height="170px",this.editjson_textarea.style.width="300px",this.editjson_textarea.style.display="block",this.editjson_save=this.getButton("Save","save","Save"),this.editjson_save.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.saveJSON()}),this.editjson_cancel=this.getButton("Cancel","cancel","Cancel"),this.editjson_cancel.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.hideEditJSON()}),this.editjson_holder.appendChild(this.editjson_textarea),this.editjson_holder.appendChild(this.editjson_save),this.editjson_holder.appendChild(this.editjson_cancel),this.addproperty_holder=this.theme.getModal(),this.addproperty_list=document.createElement("div"),this.addproperty_list.style.width="295px",this.addproperty_list.style.maxHeight="160px",this.addproperty_list.style.padding="5px 0",this.addproperty_list.style.overflowY="auto",this.addproperty_list.style.overflowX="hidden",this.addproperty_list.style.paddingLeft="5px",this.addproperty_list.setAttribute("class","property-selector"),this.addproperty_add=this.getButton("add","add","add"),this.addproperty_input=this.theme.getFormInputField("text"),this.addproperty_input.setAttribute("placeholder","Property name..."),this.addproperty_input.style.width="220px",this.addproperty_input.style.marginBottom="0",this.addproperty_input.style.display="inline-block",this.addproperty_add.addEventListener("click",function(e){if(e.preventDefault(),e.stopPropagation(),t.addproperty_input.value){if(t.editors[t.addproperty_input.value])return void window.alert("there is already a property with that name");t.addObjectProperty(t.addproperty_input.value),t.editors[t.addproperty_input.value]&&t.editors[t.addproperty_input.value].disable(),t.onChange(!0)}}),this.addproperty_holder.appendChild(this.addproperty_list),this.addproperty_holder.appendChild(this.addproperty_input),this.addproperty_holder.appendChild(this.addproperty_add);var e=document.createElement("div");e.style.clear="both",this.addproperty_holder.appendChild(e),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),this.editor_holder=this.theme.getIndentedPanel(),this.editor_holder.style.paddingBottom="0",this.container.appendChild(this.editor_holder),this.row_container=this.theme.getGridContainer(),this.editor_holder.appendChild(this.row_container),s(this.editors,function(e,i){var s=t.theme.getGridColumn();t.row_container.appendChild(s),i.setContainer(s),i.build(),i.postBuild()}),this.title_controls=this.theme.getHeaderButtonHolder(),this.editjson_controls=this.theme.getHeaderButtonHolder(),this.addproperty_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.title.appendChild(this.editjson_controls),this.title.appendChild(this.addproperty_controls),this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls.appendChild(this.toggle_button),this.toggle_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.editor_holder.style.display="",t.collapsed=!1,t.setButtonText(t.toggle_button,"","collapse","Collapse")):(t.editor_holder.style.display="none",t.collapsed=!0,t.setButtonText(t.toggle_button,"","expand","Expand"))}),this.options.collapsed&&r(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.editjson_button=this.getButton("JSON","edit","Edit JSON"),this.editjson_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.toggleEditJSON()}),this.editjson_controls.appendChild(this.editjson_button),this.editjson_controls.appendChild(this.editjson_holder),this.schema.options&&"undefined"!=typeof this.schema.options.disable_edit_json?this.schema.options.disable_edit_json&&(this.editjson_button.style.display="none"):this.jsoneditor.options.disable_edit_json&&(this.editjson_button.style.display="none"),this.addproperty_button=this.getButton("Properties","edit","Object Properties"),this.addproperty_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.toggleAddProperty()}),this.addproperty_controls.appendChild(this.addproperty_button),this.addproperty_controls.appendChild(this.addproperty_holder),this.refreshAddProperties()}this.options.table_row?(this.editor_holder=this.container,s(this.property_order,function(e,i){t.editor_holder.appendChild(t.editors[i].container)})):(this.layoutEditors(),this.layoutEditors())},showEditJSON:function(){this.editjson_holder&&(this.hideAddProperty(),this.editjson_holder.style.left=this.editjson_button.offsetLeft+"px",this.editjson_holder.style.top=this.editjson_button.offsetTop+this.editjson_button.offsetHeight+"px",this.editjson_textarea.value=JSON.stringify(this.getValue(),null,2),this.disable(),this.editjson_holder.style.display="",this.editjson_button.disabled=!1,this.editing_json=!0)},hideEditJSON:function(){this.editjson_holder&&this.editing_json&&(this.editjson_holder.style.display="none",this.enable(),this.editing_json=!1)},saveJSON:function(){if(this.editjson_holder)try{var t=JSON.parse(this.editjson_textarea.value);this.setValue(t),this.hideEditJSON()}catch(e){throw window.alert("invalid JSON"),e}},toggleEditJSON:function(){this.editing_json?this.hideEditJSON():this.showEditJSON()},insertPropertyControlUsingPropertyOrder:function(t,e,i){var s;this.schema.properties[t]&&(s=this.schema.properties[t].propertyOrder),"number"!=typeof s&&(s=1e3),e.propertyOrder=s;for(var r=0;r<i.childNodes.length;r++){var n=i.childNodes[r];if(e.propertyOrder<n.propertyOrder){this.addproperty_list.insertBefore(e,n),e=null;break}}e&&this.addproperty_list.appendChild(e)},addPropertyCheckbox:function(t){var e,i,s,r,n=this;return e=n.theme.getCheckbox(),e.style.width="auto",s=this.schema.properties[t]&&this.schema.properties[t].title?this.schema.properties[t].title:t,i=n.theme.getCheckboxLabel(s),r=n.theme.getFormControl(i,e),r.style.paddingBottom=r.style.marginBottom=r.style.paddingTop=r.style.marginTop=0,r.style.height="auto",this.insertPropertyControlUsingPropertyOrder(t,r,this.addproperty_list),e.checked=t in this.editors,e.addEventListener("change",function(){e.checked?n.addObjectProperty(t):n.removeObjectProperty(t),n.onChange(!0)}),n.addproperty_checkboxes[t]=e,e},showAddProperty:function(){this.addproperty_holder&&(this.hideEditJSON(),this.addproperty_holder.style.left=this.addproperty_button.offsetLeft+"px",this.addproperty_holder.style.top=this.addproperty_button.offsetTop+this.addproperty_button.offsetHeight+"px",this.disable(),this.adding_property=!0,this.addproperty_button.disabled=!1,this.addproperty_holder.style.display="",this.refreshAddProperties())},hideAddProperty:function(){this.addproperty_holder&&this.adding_property&&(this.addproperty_holder.style.display="none",this.enable(),this.adding_property=!1)},toggleAddProperty:function(){this.adding_property?this.hideAddProperty():this.showAddProperty()},removeObjectProperty:function(t){this.editors[t]&&(this.editors[t].unregister(),delete this.editors[t],this.refreshValue(),this.layoutEditors())},addObjectProperty:function(t,e){var i=this;if(!this.editors[t]){if(this.cached_editors[t]){if(this.editors[t]=this.cached_editors[t],e)return;this.editors[t].register()}else{if(!(this.canHaveAdditionalProperties()||this.schema.properties&&this.schema.properties[t]))return;var s=i.getPropertySchema(t),r=i.jsoneditor.getEditorClass(s);if(i.editors[t]=i.jsoneditor.createEditor(r,{jsoneditor:i.jsoneditor,schema:s,path:i.path+"."+t,parent:i}),i.editors[t].preBuild(),!e){var n=i.theme.getChildEditorHolder();i.editor_holder.appendChild(n),i.editors[t].setContainer(n),i.editors[t].build(),i.editors[t].postBuild()}i.cached_editors[t]=i.editors[t]}e||(i.refreshValue(),i.layoutEditors())}},onChildEditorChange:function(t){this.refreshValue(),this._super(t)},canHaveAdditionalProperties:function(){return"boolean"==typeof this.schema.additionalProperties?this.schema.additionalProperties:!this.jsoneditor.options.no_additional_properties},destroy:function(){s(this.cached_editors,function(t,e){e.destroy()}),this.editor_holder&&(this.editor_holder.innerHTML=""),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.error_holder&&this.error_holder.parentNode&&this.error_holder.parentNode.removeChild(this.error_holder),this.editors=null,this.cached_editors=null,this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.editor_holder=null,this._super()},getValue:function(){var t=this._super();if(this.jsoneditor.options.remove_empty_properties||this.options.remove_empty_properties)for(var e in t)t.hasOwnProperty(e)&&(t[e]||delete t[e]);return t},refreshValue:function(){this.value={};for(var t in this.editors)this.editors.hasOwnProperty(t)&&(this.value[t]=this.editors[t].getValue());this.adding_property&&this.refreshAddProperties()},refreshAddProperties:function(){if(this.options.disable_properties||this.options.disable_properties!==!1&&this.jsoneditor.options.disable_properties)return void(this.addproperty_controls.style.display="none");var t,e=!1,i=!1,s=0,r=!1;for(t in this.editors)this.editors.hasOwnProperty(t)&&s++;e=this.canHaveAdditionalProperties()&&!("undefined"!=typeof this.schema.maxProperties&&s>=this.schema.maxProperties),this.addproperty_checkboxes&&(this.addproperty_list.innerHTML=""),this.addproperty_checkboxes={};for(t in this.cached_editors)this.cached_editors.hasOwnProperty(t)&&(this.addPropertyCheckbox(t),this.isRequired(this.cached_editors[t])&&t in this.editors&&(this.addproperty_checkboxes[t].disabled=!0),"undefined"!=typeof this.schema.minProperties&&s<=this.schema.minProperties?(this.addproperty_checkboxes[t].disabled=this.addproperty_checkboxes[t].checked,this.addproperty_checkboxes[t].checked||(r=!0)):t in this.editors?(r=!0,i=!0):e||this.schema.properties.hasOwnProperty(t)?(this.addproperty_checkboxes[t].disabled=!1,r=!0):this.addproperty_checkboxes[t].disabled=!0);this.canHaveAdditionalProperties()&&(r=!0);for(t in this.schema.properties)this.schema.properties.hasOwnProperty(t)&&(this.cached_editors[t]||(r=!0,this.addPropertyCheckbox(t)));r?this.canHaveAdditionalProperties()?e?this.addproperty_add.disabled=!1:this.addproperty_add.disabled=!0:(this.addproperty_add.style.display="none",this.addproperty_input.style.display="none"):(this.hideAddProperty(),this.addproperty_controls.style.display="none")},isRequired:function(t){return"boolean"==typeof t.schema.required?t.schema.required:Array.isArray(this.schema.required)?this.schema.required.indexOf(t.key)>-1:!!this.jsoneditor.options.required_by_default},setValue:function(t,e){var i=this;t=t||{},("object"!=typeof t||Array.isArray(t))&&(t={}),s(this.cached_editors,function(s,r){"undefined"!=typeof t[s]?(i.addObjectProperty(s),r.setValue(t[s],e)):e||i.isRequired(r)?r.setValue(r.getDefault(),e):i.removeObjectProperty(s)}),s(t,function(t,s){i.cached_editors[t]||(i.addObjectProperty(t),i.editors[t]&&i.editors[t].setValue(s,e))}),this.refreshValue(),this.layoutEditors(),this.onChange()},showValidationErrors:function(t){var e=this,i=[],r=[];s(t,function(t,s){s.path===e.path?i.push(s):r.push(s)}),this.error_holder&&(i.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",s(i,function(t,i){e.error_holder.appendChild(e.theme.getErrorMessage(i.message))})):this.error_holder.style.display="none"),this.options.table_row&&(i.length?this.theme.addTableRowError(this.container):this.theme.removeTableRowError(this.container)),s(this.editors,function(t,e){e.showValidationErrors(r)})}}),n.defaults.editors.array=n.AbstractEditor.extend({getDefault:function(){return this.schema["default"]||[]},register:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()},unregister:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()},getNumColumns:function(){var t=this.getItemInfo(0);return this.tabs_holder?Math.max(Math.min(12,t.width+2),4):t.width},enable:function(){if(this.add_row_button&&(this.add_row_button.disabled=!1),this.remove_all_rows_button&&(this.remove_all_rows_button.disabled=!1),this.delete_last_row_button&&(this.delete_last_row_button.disabled=!1),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].enable(),this.rows[t].moveup_button&&(this.rows[t].moveup_button.disabled=!1),this.rows[t].movedown_button&&(this.rows[t].movedown_button.disabled=!1),this.rows[t].delete_button&&(this.rows[t].delete_button.disabled=!1);this._super()},disable:function(){if(this.add_row_button&&(this.add_row_button.disabled=!0),this.remove_all_rows_button&&(this.remove_all_rows_button.disabled=!0),this.delete_last_row_button&&(this.delete_last_row_button.disabled=!0),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].disable(),this.rows[t].moveup_button&&(this.rows[t].moveup_button.disabled=!0),this.rows[t].movedown_button&&(this.rows[t].movedown_button.disabled=!0),this.rows[t].delete_button&&(this.rows[t].delete_button.disabled=!0);this._super()},preBuild:function(){this._super(),this.rows=[],this.row_cache=[],this.hide_delete_buttons=this.options.disable_array_delete||this.jsoneditor.options.disable_array_delete,this.hide_move_buttons=this.options.disable_array_reorder||this.jsoneditor.options.disable_array_reorder,this.hide_add_button=this.options.disable_array_add||this.jsoneditor.options.disable_array_add},build:function(){this.options.compact?(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder)):(this.header=document.createElement("span"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.isRequired()),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),"tabs"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTabHolder(),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTabContentHolder(this.tabs_holder),this.active_tab=null):(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls))),this.addControls()},onChildEditorChange:function(t){this.refreshValue(),this.refreshTabs(!0),this._super(t)},getItemTitle:function(){if(!this.item_title)if(this.schema.items&&!Array.isArray(this.schema.items)){var t=this.jsoneditor.expandRefs(this.schema.items);this.item_title=t.title||"item"}else this.item_title="item";return this.item_title},getItemSchema:function(t){return Array.isArray(this.schema.items)?t>=this.schema.items.length?this.schema.additionalItems===!0?{}:this.schema.additionalItems?i({},this.schema.additionalItems):void 0:i({},this.schema.items[t]):this.schema.items?i({},this.schema.items):{}},getItemInfo:function(t){var e=this.getItemSchema(t);this.item_info=this.item_info||{};var i=JSON.stringify(e);return"undefined"!=typeof this.item_info[i]?this.item_info[i]:(e=this.jsoneditor.expandRefs(e),this.item_info[i]={title:e.title||"item","default":e["default"],width:12,child_editors:e.properties||e.items},this.item_info[i])},getElementEditor:function(t){var e=this.getItemInfo(t),i=this.getItemSchema(t);i=this.jsoneditor.expandRefs(i),i.title=e.title+" "+(t+1);var s,r=this.jsoneditor.getEditorClass(i);s=this.tabs_holder?this.theme.getTabContent():e.child_editors?this.theme.getChildEditorHolder():this.theme.getIndentedPanel(),this.row_holder.appendChild(s);var n=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:i,container:s,path:this.path+"."+t,parent:this,required:!0});return n.preBuild(),n.build(),n.postBuild(),n.title_controls||(n.array_controls=this.theme.getButtonHolder(),s.appendChild(n.array_controls)),n},destroy:function(){this.empty(!0),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.row_holder&&this.row_holder.parentNode&&this.row_holder.parentNode.removeChild(this.row_holder),this.controls&&this.controls.parentNode&&this.controls.parentNode.removeChild(this.controls),this.panel&&this.panel.parentNode&&this.panel.parentNode.removeChild(this.panel),this.rows=this.row_cache=this.title=this.description=this.row_holder=this.panel=this.controls=null,this._super()},empty:function(t){if(this.rows){var e=this;s(this.rows,function(i,s){t&&(s.tab&&s.tab.parentNode&&s.tab.parentNode.removeChild(s.tab),e.destroyRow(s,!0),e.row_cache[i]=null),e.rows[i]=null}),e.rows=[],t&&(e.row_cache=[])}},destroyRow:function(t,e){var i=t.container;e?(t.destroy(),i.parentNode&&i.parentNode.removeChild(i),t.tab&&t.tab.parentNode&&t.tab.parentNode.removeChild(t.tab)):(t.tab&&(t.tab.style.display="none"),i.style.display="none",t.unregister())},getMax:function(){return Array.isArray(this.schema.items)&&this.schema.additionalItems===!1?Math.min(this.schema.items.length,this.schema.maxItems||1/0):this.schema.maxItems||1/0},refreshTabs:function(t){var e=this;s(this.rows,function(i,s){s.tab&&(t?s.tab_text.textContent=s.getHeaderText():s.tab===e.active_tab?(e.theme.markTabActive(s.tab),s.container.style.display=""):(e.theme.markTabInactive(s.tab),s.container.style.display="none"))})},setValue:function(t,e){t=t||[],Array.isArray(t)||(t=[t]);var i=JSON.stringify(t);if(i!==this.serialized){if(this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemInfo(t.length)["default"]);this.getMax()&&t.length>this.getMax()&&(t=t.slice(0,this.getMax()));var r=this;s(t,function(t,i){r.rows[t]?r.rows[t].setValue(i,e):r.row_cache[t]?(r.rows[t]=r.row_cache[t],r.rows[t].setValue(i,e),r.rows[t].container.style.display="",r.rows[t].tab&&(r.rows[t].tab.style.display=""),r.rows[t].register()):r.addRow(i,e)});for(var n=t.length;n<r.rows.length;n++)r.destroyRow(r.rows[n]),r.rows[n]=null;r.rows=r.rows.slice(0,t.length);var o=null;s(r.rows,function(t,e){return e.tab===r.active_tab?(o=e.tab,!1):void 0}),!o&&r.rows.length&&(o=r.rows[0].tab),r.active_tab=o,r.refreshValue(e),r.refreshTabs(!0),r.refreshTabs(),r.onChange()}},refreshValue:function(t){var e=this,i=this.value?this.value.length:0;if(this.value=[],s(this.rows,function(t,i){e.value[t]=i.getValue()}),i!==this.value.length||t){var r=this.schema.minItems&&this.schema.minItems>=this.rows.length;s(this.rows,function(t,i){i.movedown_button&&(t===e.rows.length-1?i.movedown_button.style.display="none":i.movedown_button.style.display=""),i.delete_button&&(r?i.delete_button.style.display="none":i.delete_button.style.display=""),e.value[t]=i.getValue()});var n=!1;this.value.length?1===this.value.length?(this.remove_all_rows_button.style.display="none",r||this.hide_delete_buttons?this.delete_last_row_button.style.display="none":(this.delete_last_row_button.style.display="",n=!0)):r||this.hide_delete_buttons?(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"):(this.delete_last_row_button.style.display="",this.remove_all_rows_button.style.display="",n=!0):(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"),this.getMax()&&this.getMax()<=this.rows.length||this.hide_add_button?this.add_row_button.style.display="none":(this.add_row_button.style.display="",n=!0),!this.collapsed&&n?this.controls.style.display="inline-block":this.controls.style.display="none"}},addRow:function(t,e){var i=this,r=this.rows.length;i.rows[r]=this.getElementEditor(r),i.row_cache[r]=i.rows[r],i.tabs_holder&&(i.rows[r].tab_text=document.createElement("span"),i.rows[r].tab_text.textContent=i.rows[r].getHeaderText(),i.rows[r].tab=i.theme.getTab(i.rows[r].tab_text),i.rows[r].tab.addEventListener("click",function(t){i.active_tab=i.rows[r].tab,i.refreshTabs(),t.preventDefault(),t.stopPropagation()}),i.theme.addTab(i.tabs_holder,i.rows[r].tab));var n=i.rows[r].title_controls||i.rows[r].array_controls;i.hide_delete_buttons||(i.rows[r].delete_button=this.getButton(i.getItemTitle(),"delete","Delete "+i.getItemTitle()),i.rows[r].delete_button.className+=" delete",i.rows[r].delete_button.setAttribute("data-i",r),i.rows[r].delete_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var e=1*this.getAttribute("data-i"),r=i.getValue(),n=[],o=null;s(r,function(t,s){return t===e?void(i.rows[t].tab===i.active_tab&&(i.rows[t+1]?o=i.rows[t].tab:t&&(o=i.rows[t-1].tab))):void n.push(s)}),i.setValue(n),o&&(i.active_tab=o,i.refreshTabs()),i.onChange(!0)}),n&&n.appendChild(i.rows[r].delete_button)),r&&!i.hide_move_buttons&&(i.rows[r].moveup_button=this.getButton("","moveup","Move up"),i.rows[r].moveup_button.className+=" moveup",i.rows[r].moveup_button.setAttribute("data-i",r),i.rows[r].moveup_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var e=1*this.getAttribute("data-i");if(!(0>=e)){var s=i.getValue(),r=s[e-1];s[e-1]=s[e],s[e]=r,i.setValue(s),i.active_tab=i.rows[e-1].tab,i.refreshTabs(),i.onChange(!0)}}),n&&n.appendChild(i.rows[r].moveup_button)),i.hide_move_buttons||(i.rows[r].movedown_button=this.getButton("","movedown","Move down"),i.rows[r].movedown_button.className+=" movedown",i.rows[r].movedown_button.setAttribute("data-i",r),i.rows[r].movedown_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var e=1*this.getAttribute("data-i"),s=i.getValue();if(!(e>=s.length-1)){var r=s[e+1];s[e+1]=s[e],s[e]=r,i.setValue(s),i.active_tab=i.rows[e+1].tab,i.refreshTabs(),i.onChange(!0)}}),n&&n.appendChild(i.rows[r].movedown_button)),t&&i.rows[r].setValue(t,e),i.refreshTabs()},addControls:function(){var t=this;this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls.appendChild(this.toggle_button);var e=t.row_holder.style.display,i=t.controls.style.display;this.toggle_button.addEventListener("click",function(s){s.preventDefault(),s.stopPropagation(),t.collapsed?(t.collapsed=!1,t.panel&&(t.panel.style.display=""),t.row_holder.style.display=e,t.tabs_holder&&(t.tabs_holder.style.display=""),t.controls.style.display=i,t.setButtonText(this,"","collapse","Collapse")):(t.collapsed=!0,t.row_holder.style.display="none",t.tabs_holder&&(t.tabs_holder.style.display="none"),t.controls.style.display="none",t.panel&&(t.panel.style.display="none"),t.setButtonText(this,"","expand","Expand"))}),this.options.collapsed&&r(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.add_row_button=this.getButton(this.getItemTitle(),"add","Add "+this.getItemTitle()),this.add_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation();var i=t.rows.length;t.row_cache[i]?(t.rows[i]=t.row_cache[i],t.rows[i].setValue(t.rows[i].getDefault()),t.rows[i].container.style.display="",t.rows[i].tab&&(t.rows[i].tab.style.display=""),t.rows[i].register()):t.addRow(),t.active_tab=t.rows[i].tab,t.refreshTabs(),t.refreshValue(),t.onChange(!0)}),t.controls.appendChild(this.add_row_button),this.delete_last_row_button=this.getButton("Last "+this.getItemTitle(),"delete","Delete Last "+this.getItemTitle()),
-this.delete_last_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation();var i=t.getValue(),s=null;t.rows.length>1&&t.rows[t.rows.length-1].tab===t.active_tab&&(s=t.rows[t.rows.length-2].tab),i.pop(),t.setValue(i),s&&(t.active_tab=s,t.refreshTabs()),t.onChange(!0)}),t.controls.appendChild(this.delete_last_row_button),this.remove_all_rows_button=this.getButton("All","delete","Delete All"),this.remove_all_rows_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.setValue([]),t.onChange(!0)}),t.controls.appendChild(this.remove_all_rows_button),t.tabs&&(this.add_row_button.style.width="100%",this.add_row_button.style.textAlign="left",this.add_row_button.style.marginBottom="3px",this.delete_last_row_button.style.width="100%",this.delete_last_row_button.style.textAlign="left",this.delete_last_row_button.style.marginBottom="3px",this.remove_all_rows_button.style.width="100%",this.remove_all_rows_button.style.textAlign="left",this.remove_all_rows_button.style.marginBottom="3px")},showValidationErrors:function(t){var e=this,i=[],r=[];s(t,function(t,s){s.path===e.path?i.push(s):r.push(s)}),this.error_holder&&(i.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",s(i,function(t,i){e.error_holder.appendChild(e.theme.getErrorMessage(i.message))})):this.error_holder.style.display="none"),s(this.rows,function(t,e){e.showValidationErrors(r)})}}),n.defaults.editors.table=n.defaults.editors.array.extend({register:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()},unregister:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()},getNumColumns:function(){return Math.max(Math.min(12,this.width),3)},preBuild:function(){var t=this.jsoneditor.expandRefs(this.schema.items||{});this.item_title=t.title||"row",this.item_default=t["default"]||null,this.item_has_child_editors=t.properties||t.items,this.width=12,this._super()},build:function(){var t=this;this.table=this.theme.getTable(),this.container.appendChild(this.table),this.thead=this.theme.getTableHead(),this.table.appendChild(this.thead),this.header_row=this.theme.getTableRow(),this.thead.appendChild(this.header_row),this.row_holder=this.theme.getTableBody(),this.table.appendChild(this.row_holder);var e=this.getElementEditor(0,!0);if(this.item_default=e.getDefault(),this.width=e.getNumColumns()+2,this.options.compact?(this.panel=document.createElement("div"),this.container.appendChild(this.panel)):(this.title=this.theme.getHeader(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.error_holder=document.createElement("div"),this.panel.appendChild(this.error_holder)),this.panel.appendChild(this.table),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.item_has_child_editors)for(var i=e.getChildEditors(),s=e.property_order||Object.keys(i),r=0;r<s.length;r++){var n=t.theme.getTableHeaderCell(i[s[r]].getTitle());i[s[r]].options.hidden&&(n.style.display="none"),t.header_row.appendChild(n)}else t.header_row.appendChild(t.theme.getTableHeaderCell(this.item_title));e.destroy(),this.row_holder.innerHTML="",this.controls_header_cell=t.theme.getTableHeaderCell(" "),t.header_row.appendChild(this.controls_header_cell),this.addControls()},onChildEditorChange:function(t){this.refreshValue(),this._super()},getItemDefault:function(){return i({},{"default":this.item_default})["default"]},getItemTitle:function(){return this.item_title},getElementEditor:function(t,e){var s=i({},this.schema.items),r=this.jsoneditor.getEditorClass(s,this.jsoneditor),n=this.row_holder.appendChild(this.theme.getTableRow()),o=n;this.item_has_child_editors||(o=this.theme.getTableCell(),n.appendChild(o));var a=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:s,container:o,path:this.path+"."+t,parent:this,compact:!0,table_row:!0});return a.preBuild(),e||(a.build(),a.postBuild(),a.controls_cell=n.appendChild(this.theme.getTableCell()),a.row=n,a.table_controls=this.theme.getButtonHolder(),a.controls_cell.appendChild(a.table_controls),a.table_controls.style.margin=0,a.table_controls.style.padding=0),a},destroy:function(){this.innerHTML="",this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.row_holder&&this.row_holder.parentNode&&this.row_holder.parentNode.removeChild(this.row_holder),this.table&&this.table.parentNode&&this.table.parentNode.removeChild(this.table),this.panel&&this.panel.parentNode&&this.panel.parentNode.removeChild(this.panel),this.rows=this.title=this.description=this.row_holder=this.table=this.panel=null,this._super()},setValue:function(t,e){if(t=t||[],this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemDefault());this.schema.maxItems&&t.length>this.schema.maxItems&&(t=t.slice(0,this.schema.maxItems));var i=JSON.stringify(t);if(i!==this.serialized){var r=!1,n=this;s(t,function(t,e){n.rows[t]?n.rows[t].setValue(e):(n.addRow(e),r=!0)});for(var o=t.length;o<n.rows.length;o++){var a=n.rows[o].container;n.item_has_child_editors||n.rows[o].row.parentNode.removeChild(n.rows[o].row),n.rows[o].destroy(),a.parentNode&&a.parentNode.removeChild(a),n.rows[o]=null,r=!0}n.rows=n.rows.slice(0,t.length),n.refreshValue(),(r||e)&&n.refreshRowButtons(),n.onChange()}},refreshRowButtons:function(){var t=this,e=this.schema.minItems&&this.schema.minItems>=this.rows.length,i=!1;s(this.rows,function(s,r){r.movedown_button&&(s===t.rows.length-1?r.movedown_button.style.display="none":(i=!0,r.movedown_button.style.display="")),r.delete_button&&(e?r.delete_button.style.display="none":(i=!0,r.delete_button.style.display="")),r.moveup_button&&(i=!0)}),s(this.rows,function(t,e){i?e.controls_cell.style.display="":e.controls_cell.style.display="none"}),i?this.controls_header_cell.style.display="":this.controls_header_cell.style.display="none";var r=!1;this.value.length?1===this.value.length||this.hide_delete_buttons?(this.table.style.display="",this.remove_all_rows_button.style.display="none",e||this.hide_delete_buttons?this.delete_last_row_button.style.display="none":(this.delete_last_row_button.style.display="",r=!0)):(this.table.style.display="",e||this.hide_delete_buttons?(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"):(this.delete_last_row_button.style.display="",this.remove_all_rows_button.style.display="",r=!0)):(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none",this.table.style.display="none"),this.schema.maxItems&&this.schema.maxItems<=this.rows.length||this.hide_add_button?this.add_row_button.style.display="none":(this.add_row_button.style.display="",r=!0),r?this.controls.style.display="":this.controls.style.display="none"},refreshValue:function(){var t=this;this.value=[],s(this.rows,function(e,i){t.value[e]=i.getValue()}),this.serialized=JSON.stringify(this.value)},addRow:function(t){var e=this,i=this.rows.length;e.rows[i]=this.getElementEditor(i);var r=e.rows[i].table_controls;this.hide_delete_buttons||(e.rows[i].delete_button=this.getButton("","delete","Delete"),e.rows[i].delete_button.className+=" delete",e.rows[i].delete_button.setAttribute("data-i",i),e.rows[i].delete_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var i=1*this.getAttribute("data-i"),r=e.getValue(),n=[];s(r,function(t,e){t!==i&&n.push(e)}),e.setValue(n),e.onChange(!0)}),r.appendChild(e.rows[i].delete_button)),i&&!this.hide_move_buttons&&(e.rows[i].moveup_button=this.getButton("","moveup","Move up"),e.rows[i].moveup_button.className+=" moveup",e.rows[i].moveup_button.setAttribute("data-i",i),e.rows[i].moveup_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var i=1*this.getAttribute("data-i");if(!(0>=i)){var s=e.getValue(),r=s[i-1];s[i-1]=s[i],s[i]=r,e.setValue(s),e.onChange(!0)}}),r.appendChild(e.rows[i].moveup_button)),this.hide_move_buttons||(e.rows[i].movedown_button=this.getButton("","movedown","Move down"),e.rows[i].movedown_button.className+=" movedown",e.rows[i].movedown_button.setAttribute("data-i",i),e.rows[i].movedown_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var i=1*this.getAttribute("data-i"),s=e.getValue();if(!(i>=s.length-1)){var r=s[i+1];s[i+1]=s[i],s[i]=r,e.setValue(s),e.onChange(!0)}}),r.appendChild(e.rows[i].movedown_button)),t&&e.rows[i].setValue(t)},addControls:function(){var t=this;this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls&&(this.title_controls.appendChild(this.toggle_button),this.toggle_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.collapsed=!1,t.panel.style.display="",t.setButtonText(this,"","collapse","Collapse")):(t.collapsed=!0,t.panel.style.display="none",t.setButtonText(this,"","expand","Expand"))}),this.options.collapsed&&r(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none")),this.add_row_button=this.getButton(this.getItemTitle(),"add","Add "+this.getItemTitle()),this.add_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.addRow(),t.refreshValue(),t.refreshRowButtons(),t.onChange(!0)}),t.controls.appendChild(this.add_row_button),this.delete_last_row_button=this.getButton("Last "+this.getItemTitle(),"delete","Delete Last "+this.getItemTitle()),this.delete_last_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation();var i=t.getValue();i.pop(),t.setValue(i),t.onChange(!0)}),t.controls.appendChild(this.delete_last_row_button),this.remove_all_rows_button=this.getButton("All","delete","Delete All"),this.remove_all_rows_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.setValue([]),t.onChange(!0)}),t.controls.appendChild(this.remove_all_rows_button)}}),n.defaults.editors.multiple=n.AbstractEditor.extend({register:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.type]&&this.editors[this.type].register()}this._super()},unregister:function(){if(this._super(),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()},getNumColumns:function(){return this.editors[this.type]?Math.max(this.editors[this.type].getNumColumns(),4):4},enable:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();this.switcher.disabled=!1,this._super()},disable:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].disable();this.switcher.disabled=!0,this._super()},switchEditor:function(t){var e=this;this.editors[t]||this.buildChildEditor(t),e.type=t,e.register();var i=e.getValue();s(e.editors,function(t,s){s&&(e.type===t?(e.keep_values&&s.setValue(i,!0),s.container.style.display=""):s.container.style.display="none")}),e.refreshValue(),e.refreshHeaderText()},buildChildEditor:function(t){var e=this,s=this.types[t],r=e.theme.getChildEditorHolder();e.editor_holder.appendChild(r);var n;"string"==typeof s?(n=i({},e.schema),n.type=s):(n=i({},e.schema,s),n=e.jsoneditor.expandRefs(n),s.required&&Array.isArray(s.required)&&e.schema.required&&Array.isArray(e.schema.required)&&(n.required=e.schema.required.concat(s.required)));var o=e.jsoneditor.getEditorClass(n);e.editors[t]=e.jsoneditor.createEditor(o,{jsoneditor:e.jsoneditor,schema:n,container:r,path:e.path,parent:e,required:!0}),e.editors[t].preBuild(),e.editors[t].build(),e.editors[t].postBuild(),e.editors[t].header&&(e.editors[t].header.style.display="none"),e.editors[t].option=e.switcher_options[t],r.addEventListener("change_header_text",function(){e.refreshHeaderText()}),t!==e.type&&(r.style.display="none")},preBuild:function(){if(this.types=[],this.type=0,this.editors=[],this.validators=[],this.keep_values=!0,"undefined"!=typeof this.jsoneditor.options.keep_oneof_values&&(this.keep_values=this.jsoneditor.options.keep_oneof_values),"undefined"!=typeof this.options.keep_oneof_values&&(this.keep_values=this.options.keep_oneof_values),this.schema.oneOf)this.oneOf=!0,this.types=this.schema.oneOf,s(this.types,function(t,e){}),delete this.schema.oneOf;else{if(this.schema.type&&"any"!==this.schema.type)Array.isArray(this.schema.type)?this.types=this.schema.type:this.types=[this.schema.type];else if(this.types=["string","number","integer","boolean","object","array","null"],this.schema.disallow){var t=this.schema.disallow;"object"==typeof t&&Array.isArray(t)||(t=[t]);var e=[];s(this.types,function(i,s){-1===t.indexOf(s)&&e.push(s)}),this.types=e}delete this.schema.type}this.display_text=this.getDisplayText(this.types)},build:function(){var t=this,e=this.container;this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.header),this.switcher=this.theme.getSwitcher(this.display_text),e.appendChild(this.switcher),this.switcher.addEventListener("change",function(e){e.preventDefault(),e.stopPropagation(),t.switchEditor(t.display_text.indexOf(this.value)),t.onChange(!0)}),this.editor_holder=document.createElement("div"),e.appendChild(this.editor_holder),this.switcher_options=this.theme.getSwitcherOptions(this.switcher),s(this.types,function(e,s){t.editors[e]=!1;var r;"string"==typeof s?(r=i({},t.schema),r.type=s):(r=i({},t.schema,s),s.required&&Array.isArray(s.required)&&t.schema.required&&Array.isArray(t.schema.required)&&(r.required=t.schema.required.concat(s.required))),t.validators[e]=new n.Validator(t.jsoneditor,r)}),this.switchEditor(0)},onChildEditorChange:function(t){this.editors[this.type]&&(this.refreshValue(),this.refreshHeaderText()),this._super()},refreshHeaderText:function(){var t=this.getDisplayText(this.types);s(this.switcher_options,function(e,i){i.textContent=t[e]})},refreshValue:function(){this.value=this.editors[this.type].getValue()},setValue:function(t,e){var i=this;s(this.validators,function(e,s){return s.validate(t).length?void 0:(i.type=e,i.switcher.value=i.display_text[e],!1)}),this.switchEditor(this.type),this.editors[this.type].setValue(t,e),this.refreshValue(),i.onChange()},destroy:function(){s(this.editors,function(t,e){e&&e.destroy()}),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),this._super()},showValidationErrors:function(t){var e=this;this.oneOf?s(this.editors,function(r,n){if(n){var o=e.path+".oneOf["+r+"]",a=[];s(t,function(t,s){if(s.path.substr(0,o.length)===o){var r=i({},s);r.path=e.path+r.path.substr(o.length),a.push(r)}}),n.showValidationErrors(a)}}):s(this.editors,function(e,i){i&&i.showValidationErrors(t)})}}),n.defaults.editors["enum"]=n.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){this.container,this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.options.enum_titles=this.options.enum_titles||[],this["enum"]=this.schema["enum"],this.selected=0,this.select_options=[],this.html_values=[];for(var t=this,e=0;e<this["enum"].length;e++)this.select_options[e]=this.options.enum_titles[e]||"Value "+(e+1),this.html_values[e]=this.getHTML(this["enum"][e]);this.switcher=this.theme.getSwitcher(this.select_options),this.container.appendChild(this.switcher),this.display_area=this.theme.getIndentedPanel(),this.container.appendChild(this.display_area),this.options.hide_display&&(this.display_area.style.display="none"),this.switcher.addEventListener("change",function(){t.selected=t.select_options.indexOf(this.value),t.value=t["enum"][t.selected],t.refreshValue(),t.onChange(!0)}),this.value=this["enum"][0],this.refreshValue(),1===this["enum"].length&&(this.switcher.style.display="none")},refreshValue:function(){var t=this;t.selected=-1;var e=JSON.stringify(this.value);return s(this["enum"],function(i,s){return e===JSON.stringify(s)?(t.selected=i,!1):void 0}),t.selected<0?void t.setValue(t["enum"][0]):(this.switcher.value=this.select_options[this.selected],void(this.display_area.innerHTML=this.html_values[this.selected]))},enable:function(){this.always_disabled||(this.switcher.disabled=!1),this._super()},disable:function(){this.switcher.disabled=!0,this._super()},getHTML:function(t){var e=this;if(null===t)return"<em>null</em>";if("object"==typeof t){var i="";return s(t,function(s,r){var n=e.getHTML(r);Array.isArray(t)||(n="<div><em>"+s+"</em>: "+n+"</div>"),i+="<li>"+n+"</li>"}),i=Array.isArray(t)?"<ol>"+i+"</ol>":"<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>"+i+"</ul>"}return"boolean"==typeof t?t?"true":"false":"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;"):t},setValue:function(t){this.value!==t&&(this.value=t,this.refreshValue(),this.onChange())},destroy:function(){this.display_area&&this.display_area.parentNode&&this.display_area.parentNode.removeChild(this.display_area),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),this._super()}}),n.defaults.editors.select=n.AbstractEditor.extend({setValue:function(t,e){t=this.typecast(t||"");var i=t;this.enum_values.indexOf(i)<0&&(i=this.enum_values[0]),this.value!==i&&(this.input.value=this.enum_options[this.enum_values.indexOf(i)],this.select2&&this.select2.select2("val",this.input.value),this.value=i,this.onChange())},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){if(!this.enum_options)return 3;for(var t=this.getTitle().length,e=0;e<this.enum_options.length;e++)t=Math.max(t,this.enum_options[e].length+4);return Math.min(12,Math.max(t/7,2))},typecast:function(t){return"boolean"===this.schema.type?!!t:"number"===this.schema.type?1*t:"integer"===this.schema.type?Math.floor(1*t):""+t},getValue:function(){return this.value},preBuild:function(){var t=this;if(this.input_type="select",this.enum_options=[],this.enum_values=[],this.enum_display=[],this.schema["enum"]){var e=this.schema.options&&this.schema.options.enum_titles||[];s(this.schema["enum"],function(i,s){t.enum_options[i]=""+s,t.enum_display[i]=""+(e[i]||s),t.enum_values[i]=t.typecast(s)}),this.isRequired()||(t.enum_display.unshift(" "),t.enum_options.unshift("undefined"),t.enum_values.unshift(void 0))}else if("boolean"===this.schema.type)t.enum_display=this.schema.options&&this.schema.options.enum_titles||["true","false"],t.enum_options=["1",""],t.enum_values=[!0,!1],this.isRequired()||(t.enum_display.unshift(" "),t.enum_options.unshift("undefined"),t.enum_values.unshift(void 0));else{if(!this.schema.enumSource)throw"'select' editor requires the enum property to be set.";if(this.enumSource=[],this.enum_display=[],this.enum_options=[],this.enum_values=[],Array.isArray(this.schema.enumSource))for(a=0;a<this.schema.enumSource.length;a++)"string"==typeof this.schema.enumSource[a]?this.enumSource[a]={source:this.schema.enumSource[a]}:Array.isArray(this.schema.enumSource[a])?this.enumSource[a]=this.schema.enumSource[a]:this.enumSource[a]=i({},this.schema.enumSource[a]);else this.schema.enumValue?this.enumSource=[{source:this.schema.enumSource,value:this.schema.enumValue}]:this.enumSource=[{source:this.schema.enumSource}];for(a=0;a<this.enumSource.length;a++)this.enumSource[a].value&&(this.enumSource[a].value=this.jsoneditor.compileTemplate(this.enumSource[a].value,this.template_engine)),this.enumSource[a].title&&(this.enumSource[a].title=this.jsoneditor.compileTemplate(this.enumSource[a].title,this.template_engine)),this.enumSource[a].filter&&(this.enumSource[a].filter=this.jsoneditor.compileTemplate(this.enumSource[a].filter,this.template_engine))}},build:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.compact&&(this.container.className+=" compact"),this.input=this.theme.getSelectInput(this.enum_options),this.theme.setSelectOptions(this.input,this.enum_options,this.enum_display),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(e){e.preventDefault(),e.stopPropagation(),t.onInputChange()}),this.control=this.theme.getFormControl(this.label,this.input,this.description),this.container.appendChild(this.control),this.value=this.enum_values[0]},onInputChange:function(){var t=this.input.value,e=t;-1===this.enum_options.indexOf(t)&&(e=this.enum_options[0]),this.value=this.enum_values[this.enum_options.indexOf(t)],this.onChange(!0)},setupSelect2:function(){if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&(this.enum_options.length>2||this.enum_options.length&&this.enumSource)){var t=i({},n.plugins.select2);this.schema.options&&this.schema.options.select2_options&&(t=i(t,this.schema.options.select2_options)),this.select2=window.jQuery(this.input).select2(t);var e=this;this.select2.on("select2-blur",function(){e.input.value=e.select2.select2("val"),e.onInputChange()})}else this.select2=null},postBuild:function(){this._super(),this.theme.afterInputReady(this.input),this.setupSelect2()},onWatchedFieldChange:function(){var t,e;if(this.enumSource){t=this.getWatchedFieldValues();for(var i=[],s=[],r=0;r<this.enumSource.length;r++)if(Array.isArray(this.enumSource[r]))i=i.concat(this.enumSource[r]),s=s.concat(this.enumSource[r]);else{var n=[];if(n=Array.isArray(this.enumSource[r].source)?this.enumSource[r].source:t[this.enumSource[r].source]){if(this.enumSource[r].slice&&(n=Array.prototype.slice.apply(n,this.enumSource[r].slice)),this.enumSource[r].filter){var o=[];for(e=0;e<n.length;e++)this.enumSource[r].filter({i:e,item:n[e],watched:t})&&o.push(n[e]);n=o}var a=[],h=[];for(e=0;e<n.length;e++){var l=n[e];this.enumSource[r].value?h[e]=this.enumSource[r].value({i:e,item:l}):h[e]=n[e],this.enumSource[r].title?a[e]=this.enumSource[r].title({i:e,item:l}):a[e]=h[e]}i=i.concat(h),s=s.concat(a)}}var d=this.value;this.theme.setSelectOptions(this.input,i,s),this.enum_options=i,this.enum_display=s,this.enum_values=i,this.select2&&this.select2.select2("destroy"),-1!==i.indexOf(d)?(this.input.value=d,this.value=d):(this.input.value=i[0],this.value=i[0]||"",this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange(),this.jsoneditor.notifyWatchers(this.path)),this.setupSelect2()}this._super()},enable:function(){this.always_disabled||(this.input.disabled=!1,this.select2&&this.select2.select2("enable",!0)),this._super()},disable:function(){this.input.disabled=!0,this.select2&&this.select2.select2("enable",!1),this._super()},destroy:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.select2&&(this.select2.select2("destroy"),this.select2=null),this._super()}}),n.defaults.editors.multiselect=n.AbstractEditor.extend({preBuild:function(){this._super(),this.select_options={},this.select_values={};var t=this.jsoneditor.expandRefs(this.schema.items||{}),e=t["enum"]||[];for(this.option_keys=[],a=0;a<e.length;a++)this.sanitize(e[a])===e[a]&&(this.option_keys.push(e[a]+""),this.select_values[e[a]+""]=e[a])},build:function(){var t,e=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),!this.schema.format&&this.option_keys.length<8||"checkbox"===this.schema.format){for(this.input_type="checkboxes",this.inputs={},this.controls={},t=0;t<this.option_keys.length;t++){this.inputs[this.option_keys[t]]=this.theme.getCheckbox(),this.select_options[this.option_keys[t]]=this.inputs[this.option_keys[t]];var i=this.theme.getCheckboxLabel(this.option_keys[t]);this.controls[this.option_keys[t]]=this.theme.getFormControl(i,this.inputs[this.option_keys[t]])}this.control=this.theme.getMultiCheckboxHolder(this.controls,this.label,this.description)}else{for(this.input_type="select",this.input=this.theme.getSelectInput(this.option_keys),this.input.multiple=!0,this.input.size=Math.min(10,this.option_keys.length),t=0;t<this.option_keys.length;t++)this.select_options[this.option_keys[t]]=this.input.children[t];(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.control=this.theme.getFormControl(this.label,this.input,this.description)}this.container.appendChild(this.control),this.control.addEventListener("change",function(i){i.preventDefault(),i.stopPropagation();var s=[];for(t=0;t<e.option_keys.length;t++)(e.select_options[e.option_keys[t]].selected||e.select_options[e.option_keys[t]].checked)&&s.push(e.select_values[e.option_keys[t]]);e.updateValue(s),e.onChange(!0)})},setValue:function(t,e){var i;for(t=t||[],"object"!=typeof t?t=[t]:Array.isArray(t)||(t=[]),i=0;i<t.length;i++)"string"!=typeof t[i]&&(t[i]+="");for(i in this.select_options)this.select_options.hasOwnProperty(i)&&(this.select_options[i]["select"===this.input_type?"selected":"checked"]=-1!==t.indexOf(i));this.updateValue(t),this.onChange()},setupSelect2:function(){if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2){var t=window.jQuery.extend({},n.plugins.select2);this.schema.options&&this.schema.options.select2_options&&(t=i(t,this.schema.options.select2_options)),this.select2=window.jQuery(this.input).select2(t);var e=this;this.select2.on("select2-blur",function(){var t=e.select2.select2("val");e.value=t,e.onChange(!0)})}else this.select2=null},onInputChange:function(){this.value=this.input.value,this.onChange(!0)},postBuild:function(){this._super(),this.setupSelect2()},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){var t=this.getTitle().length;for(var e in this.select_values)this.select_values.hasOwnProperty(e)&&(t=Math.max(t,(this.select_values[e]+"").length+4));return Math.min(12,Math.max(t/7,2))},updateValue:function(t){for(var e=!1,i=[],s=0;s<t.length;s++)if(this.select_options[t[s]+""]){var r=this.sanitize(this.select_values[t[s]]);i.push(r),r!==t[s]&&(e=!0)}else e=!0;return this.value=i,this.select2&&this.select2.select2("val",this.value),e},sanitize:function(t){return"number"===this.schema.items.type?1*t:"integer"===this.schema.items.type?Math.floor(1*t):""+t},enable:function(){if(!this.always_disabled){if(this.input)this.input.disabled=!1;else if(this.inputs)for(var t in this.inputs)this.inputs.hasOwnProperty(t)&&(this.inputs[t].disabled=!1);this.select2&&this.select2.select2("enable",!0)}this._super()},disable:function(){if(this.input)this.input.disabled=!0;else if(this.inputs)for(var t in this.inputs)this.inputs.hasOwnProperty(t)&&(this.inputs[t].disabled=!0);this.select2&&this.select2.select2("enable",!1),this._super()},destroy:function(){this.select2&&(this.select2.select2("destroy"),this.select2=null),this._super()}}),n.defaults.editors.base64=n.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){var t=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!window.FileReader)throw"FileReader required for base64 editor";this.uploader=this.theme.getFormInputField("file"),this.uploader.addEventListener("change",function(e){if(e.preventDefault(),e.stopPropagation(),this.files&&this.files.length){var i=new FileReader;i.onload=function(e){t.value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(this.files[0])}})}this.preview=this.theme.getFormInputDescription(this.schema.description),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview),this.container.appendChild(this.control)},refreshPreview:function(){if(this.last_preview!==this.value&&(this.last_preview=this.value,this.preview.innerHTML="",this.value)){var t=this.value.match(/^data:([^;,]+)[;,]/);if(t&&(t=t[1]),t){if(this.preview.innerHTML="<strong>Type:</strong> "+t+", <strong>Size:</strong> "+Math.floor((this.value.length-this.value.split(",")[0].length-1)/1.33333)+" bytes","image"===t.substr(0,5)){this.preview.innerHTML+="<br>";var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.src=this.value,this.preview.appendChild(e)}}else this.preview.innerHTML="<em>Invalid data URI</em>"}},enable:function(){this.uploader&&(this.uploader.disabled=!1),this._super()},disable:function(){this.uploader&&(this.uploader.disabled=!0),this._super()},setValue:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.refreshPreview(),this.onChange())},destroy:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),this._super()}}),n.defaults.editors.upload=n.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){var t=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!this.jsoneditor.options.upload)throw"Upload handler required for upload editor";this.uploader=this.theme.getFormInputField("file"),this.uploader.addEventListener("change",function(e){if(e.preventDefault(),e.stopPropagation(),this.files&&this.files.length){var i=new FileReader;i.onload=function(e){t.preview_value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(this.files[0])}})}var e=this.schema.description;e||(e=""),this.preview=this.theme.getFormInputDescription(e),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview),this.container.appendChild(this.control)},refreshPreview:function(){if(this.last_preview!==this.preview_value&&(this.last_preview=this.preview_value,this.preview.innerHTML="",this.preview_value)){var t=this,e=this.preview_value.match(/^data:([^;,]+)[;,]/);e&&(e=e[1]),e||(e="unknown");var i=this.uploader.files[0];if(this.preview.innerHTML="<strong>Type:</strong> "+e+", <strong>Size:</strong> "+i.size+" bytes","image"===e.substr(0,5)){this.preview.innerHTML+="<br>";var s=document.createElement("img");s.style.maxWidth="100%",s.style.maxHeight="100px",s.src=this.preview_value,
-this.preview.appendChild(s)}this.preview.innerHTML+="<br>";var r=this.getButton("Upload","upload","Upload");this.preview.appendChild(r),r.addEventListener("click",function(e){e.preventDefault(),r.setAttribute("disabled","disabled"),t.theme.removeInputError(t.uploader),t.theme.getProgressBar&&(t.progressBar=t.theme.getProgressBar(),t.preview.appendChild(t.progressBar)),t.jsoneditor.options.upload(t.path,i,{success:function(e){t.setValue(e),t.parent?t.parent.onChildEditorChange(t):t.jsoneditor.onChange(),t.progressBar&&t.preview.removeChild(t.progressBar),r.removeAttribute("disabled")},failure:function(e){t.theme.addInputError(t.uploader,e),t.progressBar&&t.preview.removeChild(t.progressBar),r.removeAttribute("disabled")},updateProgress:function(e){t.progressBar&&(e?t.theme.updateProgressBar(t.progressBar,e):t.theme.updateProgressBarUnknown(t.progressBar))}})})}},enable:function(){this.uploader&&(this.uploader.disabled=!1),this._super()},disable:function(){this.uploader&&(this.uploader.disabled=!0),this._super()},setValue:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.onChange())},destroy:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),this._super()}}),n.defaults.editors.checkbox=n.AbstractEditor.extend({setValue:function(t,e){this.value=!!t,this.input.checked=this.value,this.onChange()},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){return Math.min(12,Math.max(this.getTitle().length/7,2))},build:function(){var t=this;this.options.compact||(this.label=this.header=this.theme.getCheckboxLabel(this.getTitle())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.compact&&(this.container.className+=" compact"),this.input=this.theme.getCheckbox(),this.control=this.theme.getFormControl(this.label,this.input,this.description),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(e){e.preventDefault(),e.stopPropagation(),t.value=this.checked,t.onChange(!0)}),this.container.appendChild(this.control)},enable:function(){this.always_disabled||(this.input.disabled=!1),this._super()},disable:function(){this.input.disabled=!0,this._super()},destroy:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this._super()}});var o=function(){var t=document.documentElement;return t.matches?"matches":t.webkitMatchesSelector?"webkitMatchesSelector":t.mozMatchesSelector?"mozMatchesSelector":t.msMatchesSelector?"msMatchesSelector":t.oMatchesSelector?"oMatchesSelector":void 0}();n.AbstractTheme=t.extend({getContainer:function(){return document.createElement("div")},getFloatRightLinkHolder:function(){var t=document.createElement("div");return t.style=t.style||{},t.style.cssFloat="right",t.style.marginLeft="10px",t},getModal:function(){var t=document.createElement("div");return t.style.backgroundColor="white",t.style.border="1px solid black",t.style.boxShadow="3px 3px black",t.style.position="absolute",t.style.zIndex="10",t.style.display="none",t},getGridContainer:function(){var t=document.createElement("div");return t},getGridRow:function(){var t=document.createElement("div");return t.className="row",t},getGridColumn:function(){var t=document.createElement("div");return t},setGridColumnSize:function(t,e){},getLink:function(t){var e=document.createElement("a");return e.setAttribute("href","#"),e.appendChild(document.createTextNode(t)),e},disableHeader:function(t){t.style.color="#ccc"},disableLabel:function(t){t.style.color="#ccc"},enableHeader:function(t){t.style.color=""},enableLabel:function(t){t.style.color=""},getFormInputLabel:function(t){var e=document.createElement("label");return e.appendChild(document.createTextNode(t)),e},getCheckboxLabel:function(t){var e=this.getFormInputLabel(t);return e.style.fontWeight="normal",e},getHeader:function(t,e){var i=document.createElement("h3");return"string"==typeof t?i.textContent=t:i.appendChild(t),e&&(i.className+=" required"),i},getCheckbox:function(){var t=this.getFormInputField("checkbox");return t.style.display="inline-block",t.style.width="auto",t},getMultiCheckboxHolder:function(t,e,i){var s=document.createElement("div");e&&(e.style.display="block",s.appendChild(e));for(var r in t)t.hasOwnProperty(r)&&(t[r].style.display="inline-block",t[r].style.marginRight="20px",s.appendChild(t[r]));return i&&s.appendChild(i),s},getSelectInput:function(t){var e=document.createElement("select");return t&&this.setSelectOptions(e,t),e},getSwitcher:function(t){var e=this.getSelectInput(t);return e.style.backgroundColor="transparent",e.style.display="inline-block",e.style.fontStyle="italic",e.style.fontWeight="normal",e.style.height="auto",e.style.marginBottom=0,e.style.marginLeft="5px",e.style.padding="0 0 0 3px",e.style.width="auto",e},getSwitcherOptions:function(t){return t.getElementsByTagName("option")},setSwitcherOptions:function(t,e,i){this.setSelectOptions(t,e,i)},setSelectOptions:function(t,e,i){i=i||[],t.innerHTML="";for(var s=0;s<e.length;s++){var r=document.createElement("option");r.setAttribute("value",e[s]),r.textContent=i[s]||e[s],t.appendChild(r)}},getTextareaInput:function(){var t=document.createElement("textarea");return t.style=t.style||{},t.style.width="100%",t.style.height="300px",t.style.boxSizing="border-box",t},getRangeInput:function(t,e,i){var s=this.getFormInputField("range");return s.setAttribute("min",t),s.setAttribute("max",e),s.setAttribute("step",i),s},getFormInputField:function(t){var e=document.createElement("input");return e.setAttribute("type",t),e},afterInputReady:function(t){},getFormControl:function(t,e,i){var s=document.createElement("div");return s.className="form-control",t&&s.appendChild(t),"checkbox"===e.type?t.insertBefore(e,t.firstChild):s.appendChild(e),i&&s.appendChild(i),s},getIndentedPanel:function(){var t=document.createElement("div");return t.style=t.style||{},t.style.paddingLeft="10px",t.style.marginLeft="10px",t.style.borderLeft="1px solid #ccc",t},getChildEditorHolder:function(){return document.createElement("div")},getDescription:function(t){var e=document.createElement("p");return e.innerHTML=t,e},getCheckboxDescription:function(t){return this.getDescription(t)},getFormInputDescription:function(t){return this.getDescription(t)},getHeaderButtonHolder:function(){return this.getButtonHolder()},getButtonHolder:function(){return document.createElement("div")},getButton:function(t,e,i){var s=document.createElement("button");return s.type="button",this.setButtonText(s,t,e,i),s},setButtonText:function(t,e,i,s){t.innerHTML="",i&&(t.appendChild(i),t.innerHTML+=" "),t.appendChild(document.createTextNode(e)),s&&t.setAttribute("title",s)},getTable:function(){return document.createElement("table")},getTableRow:function(){return document.createElement("tr")},getTableHead:function(){return document.createElement("thead")},getTableBody:function(){return document.createElement("tbody")},getTableHeaderCell:function(t){var e=document.createElement("th");return e.textContent=t,e},getTableCell:function(){var t=document.createElement("td");return t},getErrorMessage:function(t){var e=document.createElement("p");return e.style=e.style||{},e.style.color="red",e.appendChild(document.createTextNode(t)),e},addInputError:function(t,e){},removeInputError:function(t){},addTableRowError:function(t){},removeTableRowError:function(t){},getTabHolder:function(){var t=document.createElement("div");return t.innerHTML="<div style='float: left; width: 130px;' class='tabs'></div><div class='content' style='margin-left: 130px;'></div><div style='clear:both;'></div>",t},applyStyles:function(t,e){t.style=t.style||{};for(var i in e)e.hasOwnProperty(i)&&(t.style[i]=e[i])},closest:function(t,e){for(;t&&t!==document;){if(!o)return!1;if(t[o](e))return t;t=t.parentNode}return!1},getTab:function(t){var e=document.createElement("div");return e.appendChild(t),e.style=e.style||{},this.applyStyles(e,{border:"1px solid #ccc",borderWidth:"1px 0 1px 1px",textAlign:"center",lineHeight:"30px",borderRadius:"5px",borderBottomRightRadius:0,borderTopRightRadius:0,fontWeight:"bold",cursor:"pointer"}),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){return this.getIndentedPanel()},markTabActive:function(t){this.applyStyles(t,{opacity:1,background:"white"})},markTabInactive:function(t){this.applyStyles(t,{opacity:.5,background:""})},addTab:function(t,e){t.children[0].appendChild(e)},getBlockLink:function(){var t=document.createElement("a");return t.style.display="block",t},getBlockLinkHolder:function(){var t=document.createElement("div");return t},getLinksHolder:function(){var t=document.createElement("div");return t},createMediaLink:function(t,e,i){t.appendChild(e),i.style.width="100%",t.appendChild(i)},createImageLink:function(t,e,i){t.appendChild(e),e.appendChild(i)}}),n.defaults.themes.bootstrap2=n.AbstractTheme.extend({getRangeInput:function(t,e,i){return this._super(t,e,i)},getGridContainer:function(){var t=document.createElement("div");return t.className="container-fluid",t},getGridRow:function(){var t=document.createElement("div");return t.className="row-fluid",t},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.display="inline-block",i.style.fontWeight="bold",e&&(i.className+=" required"),i},setGridColumnSize:function(t,e){t.className="span"+e},getSelectInput:function(t){var e=this._super(t);return e.style.width="auto",e.style.maxWidth="98%",e},getFormInputField:function(t){var e=this._super(t);return e.style.width="98%",e},afterInputReady:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".control-group"),t.controls=this.closest(t,".controls"),this.closest(t,".compact")&&(t.controlgroup.className=t.controlgroup.className.replace(/control-group/g,"").replace(/[ ]{2,}/g," "),t.controls.className=t.controlgroup.className.replace(/controls/g,"").replace(/[ ]{2,}/g," "),t.style.marginBottom=0))},getIndentedPanel:function(){var t=document.createElement("div");return t.className="well well-small",t},getFormInputDescription:function(t){var e=document.createElement("p");return e.className="help-inline",e.textContent=t,e},getFormControl:function(t,e,i){var s=document.createElement("div");s.className="control-group";var r=document.createElement("div");return r.className="controls",t&&"checkbox"===e.getAttribute("type")?(s.appendChild(r),t.className+=" checkbox",t.appendChild(e),r.appendChild(t),r.style.height="30px"):(t&&(t.className+=" control-label",s.appendChild(t)),r.appendChild(e),s.appendChild(r)),i&&r.appendChild(i),s},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t},getButtonHolder:function(){var t=document.createElement("div");return t.className="btn-group",t},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className+=" btn btn-default",s},getTable:function(){var t=document.createElement("table");return t.className="table table-bordered",t.style.width="auto",t.style.maxWidth="none",t},addInputError:function(t,e){t.controlgroup&&t.controls&&(t.controlgroup.className+=" error",t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.className="help-block errormsg",t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.className=t.controlgroup.className.replace(/\s?error/g,""))},getTabHolder:function(){var t=document.createElement("div");return t.className="tabbable tabs-left",t.innerHTML="<ul class='nav nav-tabs span2' style='margin-right: 0;'></ul><div class='tab-content span10' style='overflow:visible;'></div>",t},getTab:function(t){var e=document.createElement("li"),i=document.createElement("a");return i.setAttribute("href","#"),i.appendChild(t),e.appendChild(i),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){var t=document.createElement("div");return t.className="tab-pane active",t},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s?active/g,"")},addTab:function(t,e){t.children[0].appendChild(e)},getProgressBar:function(){var t=document.createElement("div");t.className="progress";var e=document.createElement("div");return e.className="bar",e.style.width="0%",t.appendChild(e),t},updateProgressBar:function(t,e){t&&(t.firstChild.style.width=e+"%")},updateProgressBarUnknown:function(t){t&&(t.className="progress progress-striped active",t.firstChild.style.width="100%")}}),n.defaults.themes.bootstrap3=n.AbstractTheme.extend({getSelectInput:function(t){var e=this._super(t);return e.className+="form-control",e},setGridColumnSize:function(t,e){t.className="col-md-"+e},afterInputReady:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))},getTextareaInput:function(){var t=document.createElement("textarea");return t.className="form-control",t},getRangeInput:function(t,e,i){return this._super(t,e,i)},getFormInputField:function(t){var e=this._super(t);return"checkbox"!==t&&(e.className+="form-control"),e},getFormControl:function(t,e,i){var s=document.createElement("div");return t&&"checkbox"===e.type?(s.className+=" checkbox",t.appendChild(e),t.style.fontSize="14px",s.style.marginTop="0",s.appendChild(t),e.style.position="relative",e.style.cssFloat="left"):(s.className+=" form-group",t&&(t.className+=" control-label",s.appendChild(t)),s.appendChild(e)),i&&s.appendChild(i),s},getIndentedPanel:function(){var t=document.createElement("div");return t.className="well well-sm",t},getFormInputDescription:function(t){var e=document.createElement("p");return e.className="help-block",e.innerHTML=t,e},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t},getButtonHolder:function(){var t=document.createElement("div");return t.className="btn-group",t},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className+="btn btn-default",s},getTable:function(){var t=document.createElement("table");return t.className="table table-bordered",t.style.width="auto",t.style.maxWidth="none",t},addInputError:function(t,e){t.controlgroup&&(t.controlgroup.className+=" has-error",t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.className="help-block errormsg",t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.className=t.controlgroup.className.replace(/\s?has-error/g,""))},getTabHolder:function(){var t=document.createElement("div");return t.innerHTML="<div class='tabs list-group col-md-2'></div><div class='col-md-10'></div>",t.className="rows",t},getTab:function(t){var e=document.createElement("a");return e.className="list-group-item",e.setAttribute("href","#"),e.appendChild(t),e},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s?active/g,"")},getProgressBar:function(){var t=0,e=100,i=0,s=document.createElement("div");s.className="progress";var r=document.createElement("div");return r.className="progress-bar",r.setAttribute("role","progressbar"),r.setAttribute("aria-valuenow",i),r.setAttribute("aria-valuemin",t),r.setAttribute("aria-valuenax",e),r.innerHTML=i+"%",s.appendChild(r),s},updateProgressBar:function(t,e){if(t){var i=t.firstChild,s=e+"%";i.setAttribute("aria-valuenow",e),i.style.width=s,i.innerHTML=s}},updateProgressBarUnknown:function(t){if(t){var e=t.firstChild;t.className="progress progress-striped active",e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}}),n.defaults.themes.foundation=n.AbstractTheme.extend({getChildEditorHolder:function(){var t=document.createElement("div");return t.style.marginBottom="15px",t},getSelectInput:function(t){var e=this._super(t);return e.style.minWidth="none",e.style.padding="5px",e.style.marginTop="3px",e},getSwitcher:function(t){var e=this._super(t);return e.style.paddingRight="8px",e},afterInputReady:function(t){this.closest(t,".compact")&&(t.style.marginBottom=0),t.group=this.closest(t,".form-control")},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.display="inline-block",e&&(i.className+=" required"),i},getFormInputField:function(t){var e=this._super(t);return e.style.width="100%",e.style.marginBottom="checkbox"===t?"0":"12px",e},getFormInputDescription:function(t){var e=document.createElement("p");return e.textContent=t,e.style.marginTop="-10px",e.style.fontStyle="italic",e},getIndentedPanel:function(){var t=document.createElement("div");return t.className="panel",t},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.display="inline-block",t.style.marginLeft="10px",t.style.verticalAlign="middle",t},getButtonHolder:function(){var t=document.createElement("div");return t.className="button-group",t},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className+=" small button",s},addInputError:function(t,e){t.group&&(t.group.className+=" error",t.errmsg?t.errmsg.style.display="":(t.insertAdjacentHTML("afterend",'<small class="error"></small>'),t.errmsg=t.parentNode.getElementsByClassName("error")[0]),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.group.className=t.group.className.replace(/ error/g,""),t.errmsg.style.display="none")},getProgressBar:function(){var t=document.createElement("div");t.className="progress";var e=document.createElement("span");return e.className="meter",e.style.width="0%",t.appendChild(e),t},updateProgressBar:function(t,e){t&&(t.firstChild.style.width=e+"%")},updateProgressBarUnknown:function(t){t&&(t.firstChild.style.width="100%")}}),n.defaults.themes.foundation3=n.defaults.themes.foundation.extend({getHeaderButtonHolder:function(){var t=this._super();return t.style.fontSize=".6em",t},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.fontWeight="bold",e&&(i.className+=" required"),i},getTabHolder:function(){var t=document.createElement("div");return t.className="row",t.innerHTML="<dl class='tabs vertical two columns'></dl><div class='tabs-content ten columns'></div>",t},setGridColumnSize:function(t,e){var i=["zero","one","two","three","four","five","six","seven","eight","nine","ten","eleven","twelve"];t.className="columns "+i[e]},getTab:function(t){var e=document.createElement("dd"),i=document.createElement("a");return i.setAttribute("href","#"),i.appendChild(t),e.appendChild(i),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){var t=document.createElement("div");return t.className="content active",t.style.paddingLeft="5px",t},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s*active/g,"")},addTab:function(t,e){t.children[0].appendChild(e)}}),n.defaults.themes.foundation4=n.defaults.themes.foundation.extend({getHeaderButtonHolder:function(){var t=this._super();return t.style.fontSize=".6em",t},setGridColumnSize:function(t,e){t.className="columns large-"+e},getFormInputDescription:function(t){var e=this._super(t);return e.style.fontSize=".8rem",e},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.fontWeight="bold",e&&(i.className+=" required"),i}}),n.defaults.themes.foundation5=n.defaults.themes.foundation.extend({getFormInputDescription:function(t){var e=this._super(t);return e.style.fontSize=".8rem",e},setGridColumnSize:function(t,e){t.className="columns medium-"+e},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className=s.className.replace(/\s*small/g,"")+" tiny",s},getTabHolder:function(){var t=document.createElement("div");return t.innerHTML="<dl class='tabs vertical'></dl><div class='tabs-content vertical'></div>",t},getTab:function(t){var e=document.createElement("dd"),i=document.createElement("a");return i.setAttribute("href","#"),i.appendChild(t),e.appendChild(i),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){var t=document.createElement("div");return t.className="content active",t.style.paddingLeft="5px",t},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s*active/g,"")},addTab:function(t,e){t.children[0].appendChild(e)}}),n.defaults.themes.html=n.AbstractTheme.extend({getFormInputLabel:function(t,e){var i=this._super(t);return i.style.display="block",i.style.marginBottom="3px",i.style.fontWeight="bold",e&&(i.className+=" required"),i},getFormInputDescription:function(t){var e=this._super(t);return e.style.fontSize=".8em",e.style.margin=0,e.style.display="inline-block",e.style.fontStyle="italic",e},getIndentedPanel:function(){var t=this._super();return t.style.border="1px solid #ddd",t.style.padding="5px",t.style.margin="5px",t.style.borderRadius="3px",t},getChildEditorHolder:function(){var t=this._super();return t.style.marginBottom="8px",t},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.display="inline-block",t.style.marginLeft="10px",t.style.fontSize=".8em",t.style.verticalAlign="middle",t},getTable:function(){var t=this._super();return t.style.borderBottom="1px solid #ccc",t.style.marginBottom="5px",t},addInputError:function(t,e){if(t.style.borderColor="red",t.errmsg)t.errmsg.style.display="block";else{var i=this.closest(t,".form-control");t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),t.errmsg.style=t.errmsg.style||{},t.errmsg.style.color="red",i.appendChild(t.errmsg)}t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))},removeInputError:function(t){t.style.borderColor="",t.errmsg&&(t.errmsg.style.display="none")},getProgressBar:function(){var t=100,e=0,i=document.createElement("progress");return i.setAttribute("max",t),i.setAttribute("value",e),i},updateProgressBar:function(t,e){t&&t.setAttribute("value",e)},updateProgressBarUnknown:function(t){t&&t.removeAttribute("value")}}),n.defaults.themes.jqueryui=n.AbstractTheme.extend({getTable:function(){var t=this._super();return t.setAttribute("cellpadding",5),t.setAttribute("cellspacing",0),t},getTableHeaderCell:function(t){var e=this._super(t);return e.className="ui-state-active",e.style.fontWeight="bold",e},getTableCell:function(){var t=this._super();return t.className="ui-widget-content",t},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t.style.fontSize=".6em",t.style.display="inline-block",t},getFormInputDescription:function(t){var e=this.getDescription(t);return e.style.marginLeft="10px",e.style.display="inline-block",e},getFormControl:function(t,e,i){var s=this._super(t,e,i);return"checkbox"===e.type?(s.style.lineHeight="25px",s.style.padding="3px 0"):s.style.padding="4px 0 8px 0",s},getDescription:function(t){var e=document.createElement("span");return e.style.fontSize=".8em",e.style.fontStyle="italic",e.textContent=t,e},getButtonHolder:function(){var t=document.createElement("div");return t.className="ui-buttonset",t.style.fontSize=".7em",t},getFormInputLabel:function(t,e){var i=document.createElement("label");return i.style.fontWeight="bold",i.style.display="block",e&&(i.className+=" required"),i.textContent=t,i},getButton:function(t,e,i){var s=document.createElement("button");s.className="ui-button ui-widget ui-state-default ui-corner-all",e&&!t?(s.className+=" ui-button-icon-only",e.className+=" ui-button-icon-primary ui-icon-primary",s.appendChild(e)):e?(s.className+=" ui-button-text-icon-primary",e.className+=" ui-button-icon-primary ui-icon-primary",s.appendChild(e)):s.className+=" ui-button-text-only";var r=document.createElement("span");return r.className="ui-button-text",r.textContent=t||i||".",s.appendChild(r),s.setAttribute("title",i),s},setButtonText:function(t,e,i,s){t.innerHTML="",t.className="ui-button ui-widget ui-state-default ui-corner-all",i&&!e?(t.className+=" ui-button-icon-only",i.className+=" ui-button-icon-primary ui-icon-primary",t.appendChild(i)):i?(t.className+=" ui-button-text-icon-primary",i.className+=" ui-button-icon-primary ui-icon-primary",t.appendChild(i)):t.className+=" ui-button-text-only";var r=document.createElement("span");r.className="ui-button-text",r.textContent=e||s||".",t.appendChild(r),t.setAttribute("title",s)},getIndentedPanel:function(){var t=document.createElement("div");return t.className="ui-widget-content ui-corner-all",t.style.padding="1em 1.4em",t.style.marginBottom="20px",t},afterInputReady:function(t){t.controls||(t.controls=this.closest(t,".form-control"))},addInputError:function(t,e){t.controls&&(t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("div"),t.errmsg.className="ui-state-error",t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.errmsg.style.display="none")},markTabActive:function(t){t.className=t.className.replace(/\s*ui-widget-header/g,"")+" ui-state-active"},markTabInactive:function(t){t.className=t.className.replace(/\s*ui-state-active/g,"")+" ui-widget-header"}}),n.AbstractIconLib=t.extend({mapping:{collapse:"",expand:"","delete":"",edit:"",add:"",cancel:"",save:"",moveup:"",movedown:""},icon_prefix:"",getIconClass:function(t){return this.mapping[t]?this.icon_prefix+this.mapping[t]:null},getIcon:function(t){var e=this.getIconClass(t);if(!e)return null;var i=document.createElement("i");return i.className=e,i}}),n.defaults.iconlibs.bootstrap2=n.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-up","delete":"trash",edit:"pencil",add:"plus",cancel:"ban-circle",save:"ok",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"icon-"}),n.defaults.iconlibs.bootstrap3=n.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-right","delete":"remove",edit:"pencil",add:"plus",cancel:"floppy-remove",save:"floppy-saved",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"glyphicon glyphicon-"}),n.defaults.iconlibs.fontawesome3=n.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-right","delete":"remove",edit:"pencil",add:"plus",cancel:"ban-circle",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"icon-"}),n.defaults.iconlibs.fontawesome4=n.AbstractIconLib.extend({mapping:{collapse:"caret-square-o-down",expand:"caret-square-o-right","delete":"times",edit:"pencil",add:"plus",cancel:"ban",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"fa fa-"}),n.defaults.iconlibs.foundation2=n.AbstractIconLib.extend({mapping:{collapse:"minus",expand:"plus","delete":"remove",edit:"edit",add:"add-doc",cancel:"error",save:"checkmark",moveup:"up-arrow",movedown:"down-arrow"},icon_prefix:"foundicon-"}),n.defaults.iconlibs.foundation3=n.AbstractIconLib.extend({mapping:{collapse:"minus",expand:"plus","delete":"x",edit:"pencil",add:"page-add",cancel:"x-circle",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"fi-"}),n.defaults.iconlibs.jqueryui=n.AbstractIconLib.extend({mapping:{collapse:"triangle-1-s",expand:"triangle-1-e","delete":"trash",edit:"pencil",add:"plusthick",cancel:"closethick",save:"disk",moveup:"arrowthick-1-n",movedown:"arrowthick-1-s"},icon_prefix:"ui-icon ui-icon-"}),n.defaults.templates["default"]=function(){return{compile:function(t){var e=t.match(/{{\s*([a-zA-Z0-9\-_ \.]+)\s*}}/g),i=e&&e.length;if(!i)return function(){return t};for(var s=[],r=function(t){var i,r=e[t].replace(/[{}]+/g,"").trim().split("."),n=r.length;if(n>1){var o;i=function(e){for(o=e,t=0;n>t&&(o=o[r[t]]);t++);return o}}else r=r[0],i=function(t){return t[r]};s.push({s:e[t],r:i})},n=0;i>n;n++)r(n);return function(e){var r,o=t+"";for(n=0;i>n;n++)r=s[n],o=o.replace(r.s,r.r(e));return o}}}},n.defaults.templates.ejs=function(){return!!window.EJS&&{compile:function(t){var e=new window.EJS({text:t});return function(t){return e.render(t)}}}},n.defaults.templates.handlebars=function(){return window.Handlebars},n.defaults.templates.hogan=function(){return!!window.Hogan&&{compile:function(t){var e=window.Hogan.compile(t);return function(t){return e.render(t)}}}},n.defaults.templates.markup=function(){return!(!window.Mark||!window.Mark.up)&&{compile:function(t){return function(e){return window.Mark.up(t,e)}}}},n.defaults.templates.mustache=function(){return!!window.Mustache&&{compile:function(t){return function(e){return window.Mustache.render(t,e)}}}},n.defaults.templates.swig=function(){return window.swig},n.defaults.templates.underscore=function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t,e)}}}},n.defaults.theme="html",n.defaults.template="default",n.defaults.options={},n.defaults.translate=function(t,e){var i=n.defaults.languages[n.defaults.language];if(!i)throw"Unknown language "+n.defaults.language;var s=i[t]||n.defaults.languages[n.defaults.default_language][t];if("undefined"==typeof s)throw"Unknown translate string "+t;if(e)for(var r=0;r<e.length;r++)s=s.replace(new RegExp("\\{\\{"+r+"}}","g"),e[r]);return s},n.defaults.default_language="en",n.defaults.language=n.defaults.default_language,n.defaults.languages.en={error_notset:"Property must be set",error_notempty:"Value required",error_enum:"Value must be one of the enumerated values",error_anyOf:"Value must validate against at least one of the provided schemas",error_oneOf:"Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.",error_not:"Value must not validate against the provided schema",error_type_union:"Value must be one of the provided types",error_type:"Value must be of type {{0}}",error_disallow_union:"Value must not be one of the provided disallowed types",error_disallow:"Value must not be of type {{0}}",error_multipleOf:"Value must be a multiple of {{0}}",error_maximum_excl:"Value must be less than {{0}}",error_maximum_incl:"Value must at most {{0}}",error_minimum_excl:"Value must be greater than {{0}}",error_minimum_incl:"Value must be at least {{0}}",error_maxLength:"Value must be at most {{0}} characters long",error_minLength:"Value must be at least {{0}} characters long",error_pattern:"Value must match the provided pattern",error_additionalItems:"No additional items allowed in this array",error_maxItems:"Value must have at most {{0}} items",error_minItems:"Value must have at least {{0}} items",error_uniqueItems:"Array must have unique items",error_maxProperties:"Object must have at most {{0}} properties",error_minProperties:"Object must have at least {{0}} properties",error_required:"Object is missing the required property '{{0}}'",error_additional_properties:"No additional properties allowed, but property {{0}} is set",error_dependency:"Must have property {{0}}"},n.plugins={ace:{theme:""},epiceditor:{},sceditor:{},select2:{}};for(var a in n.defaults.editors)n.defaults.editors.hasOwnProperty(a)&&(n.defaults.editors[a].options=n.defaults.editors.options||{});n.defaults.resolvers.unshift(function(t){return"string"!=typeof t.type?"multiple":void 0}),n.defaults.resolvers.unshift(function(t){return!t.type&&t.properties?"object":void 0}),n.defaults.resolvers.unshift(function(t){return"string"==typeof t.type?t.type:void 0}),n.defaults.resolvers.unshift(function(t){return"boolean"===t.type?"checkbox"===t.format||t.options&&t.options.checkbox?"checkbox":"select":void 0;
-}),n.defaults.resolvers.unshift(function(t){return"any"===t.type?"multiple":void 0}),n.defaults.resolvers.unshift(function(t){return"string"===t.type&&t.media&&"base64"===t.media.binaryEncoding?"base64":void 0}),n.defaults.resolvers.unshift(function(t){return"string"===t.type&&"url"===t.format&&t.options&&t.options.upload===!0&&window.FileReader?"upload":void 0}),n.defaults.resolvers.unshift(function(t){return"array"==t.type&&"table"==t.format?"table":void 0}),n.defaults.resolvers.unshift(function(t){return t.enumSource?"select":void 0}),n.defaults.resolvers.unshift(function(t){if(t["enum"]){if("array"===t.type||"object"===t.type)return"enum";if("number"===t.type||"integer"===t.type||"string"===t.type)return"select"}}),n.defaults.resolvers.unshift(function(t){return"array"===t.type&&t.items&&!Array.isArray(t.items)&&t.uniqueItems&&t.items["enum"]&&["string","number","integer"].indexOf(t.items.type)>=0?"multiselect":void 0}),n.defaults.resolvers.unshift(function(t){return t.oneOf?"multiple":void 0}),function(){if(window.jQuery||window.Zepto){var t=window.jQuery||window.Zepto;t.jsoneditor=n.defaults,t.fn.jsoneditor=function(t){var e=this,i=this.data("jsoneditor");if("value"===t){if(!i)throw"Must initialize jsoneditor before getting/setting the value";if(!(arguments.length>1))return i.getValue();i.setValue(arguments[1])}else{if("validate"===t){if(!i)throw"Must initialize jsoneditor before validating";return arguments.length>1?i.validate(arguments[1]):i.validate()}"destroy"===t?i&&(i.destroy(),this.data("jsoneditor",null)):(i&&i.destroy(),i=new n(this.get(0),t),this.data("jsoneditor",i),i.on("change",function(){e.trigger("change")}),i.on("ready",function(){e.trigger("ready")}))}return this}}}(),window.JSONEditor=n}();
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/lodash.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/lodash.min.js
deleted file mode 100644
index 3625da8d55264..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/lodash.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-(function(){function n(n,t){if(n!==t){var r=null===n,e=n===x,u=n===n,o=null===t,i=t===x,f=t===t;if(n>t&&!o||!u||r&&!i&&f||e&&f)return 1;if(n<t&&!r||!f||o&&!e&&u||i&&u)return-1}return 0}function t(n,t,r){for(var e=n.length,u=r?e:-1;r?u--:++u<e;)if(t(n[u],u,n))return u;return-1}function r(n,t,r){if(t!==t)return p(n,r);r-=1;for(var e=n.length;++r<e;)if(n[r]===t)return r;return-1}function e(n){return"function"==typeof n||!1}function u(n){return null==n?"":n+""}function o(n,t){for(var r=-1,e=n.length;++r<e&&-1<t.indexOf(n.charAt(r)););return r}function i(n,t){for(var r=n.length;r--&&-1<t.indexOf(n.charAt(r)););return r}function f(t,r){return n(t.a,r.a)||t.b-r.b}function c(n){return Nn[n]}function a(n){return Tn[n]}function l(n,t,r){return t?n=Bn[n]:r&&(n=Dn[n]),"\\"+n}function s(n){return"\\"+Dn[n]}function p(n,t,r){var e=n.length;for(t+=r?0:-1;r?t--:++t<e;){var u=n[t];if(u!==u)return t}return-1}function h(n){return!!n&&"object"==typeof n}function _(n){return 160>=n&&9<=n&&13>=n||32==n||160==n||5760==n||6158==n||8192<=n&&(8202>=n||8232==n||8233==n||8239==n||8287==n||12288==n||65279==n)}function v(n,t){for(var r=-1,e=n.length,u=-1,o=[];++r<e;)n[r]===t&&(n[r]=P,o[++u]=r);return o}function g(n){for(var t=-1,r=n.length;++t<r&&_(n.charCodeAt(t)););return t}function y(n){for(var t=n.length;t--&&_(n.charCodeAt(t)););return t}function d(n){return Pn[n]}function w(_){function Nn(n){if(h(n)&&!(Wo(n)||n instanceof zn)){if(n instanceof Pn)return n;if(eu.call(n,"__chain__")&&eu.call(n,"__wrapped__"))return qr(n)}return new Pn(n)}function Tn(){}function Pn(n,t,r){this.__wrapped__=n,this.__actions__=r||[],this.__chain__=!!t}function zn(n){this.__wrapped__=n,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=Cu,this.__views__=[]}function Bn(){this.__data__={}}function Dn(n){var t=n?n.length:0;for(this.data={hash:wu(null),set:new hu};t--;)this.push(n[t])}function Mn(n,t){var r=n.data;return("string"==typeof t||de(t)?r.set.has(t):r.hash[t])?0:-1}function qn(n,t){var r=-1,e=n.length;for(t||(t=De(e));++r<e;)t[r]=n[r];return t}function Kn(n,t){for(var r=-1,e=n.length;++r<e&&!1!==t(n[r],r,n););return n}function Vn(n,t){for(var r=-1,e=n.length;++r<e;)if(!t(n[r],r,n))return!1;return!0}function Zn(n,t){for(var r=-1,e=n.length,u=-1,o=[];++r<e;){var i=n[r];t(i,r,n)&&(o[++u]=i)}return o}function Xn(n,t){for(var r=-1,e=n.length,u=De(e);++r<e;)u[r]=t(n[r],r,n);return u}function Hn(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];return n}function Qn(n,t,r,e){var u=-1,o=n.length;for(e&&o&&(r=n[++u]);++u<o;)r=t(r,n[u],u,n);return r}function nt(n,t){for(var r=-1,e=n.length;++r<e;)if(t(n[r],r,n))return!0;return!1}function tt(n,t,r,e){return n!==x&&eu.call(e,r)?n:t}function rt(n,t,r){for(var e=-1,u=Ko(t),o=u.length;++e<o;){var i=u[e],f=n[i],c=r(f,t[i],i,n,t);(c===c?c===f:f!==f)&&(f!==x||i in n)||(n[i]=c)}return n}function et(n,t){return null==t?n:ot(t,Ko(t),n)}function ut(n,t){for(var r=-1,e=null==n,u=!e&&Sr(n),o=u?n.length:0,i=t.length,f=De(i);++r<i;){var c=t[r];f[r]=u?Ur(c,o)?n[c]:x:e?x:n[c]}return f}function ot(n,t,r){r||(r={});for(var e=-1,u=t.length;++e<u;){var o=t[e];r[o]=n[o]}return r}function it(n,t,r){var e=typeof n;return"function"==e?t===x?n:Dt(n,t,r):null==n?Ne:"object"==e?At(n):t===x?Be(n):jt(n,t)}function ft(n,t,r,e,u,o,i){var f;if(r&&(f=u?r(n,e,u):r(n)),f!==x)return f;if(!de(n))return n;if(e=Wo(n)){if(f=Ir(n),!t)return qn(n,f)}else{var c=ou.call(n),a=c==K;if(c!=Z&&c!=z&&(!a||u))return Ln[c]?Er(n,c,t):u?n:{};if(Gn(n))return u?n:{};if(f=Rr(a?{}:n),!t)return et(f,n)}for(o||(o=[]),i||(i=[]),u=o.length;u--;)if(o[u]==n)return i[u];return o.push(n),i.push(f),(e?Kn:gt)(n,function(e,u){f[u]=ft(e,t,r,u,n,o,i)}),f}function ct(n,t,r){if("function"!=typeof n)throw new Xe(T);return _u(function(){n.apply(x,r)},t)}function at(n,t){var e=n?n.length:0,u=[];if(!e)return u;var o=-1,i=jr(),f=i===r,c=f&&t.length>=F&&wu&&hu?new Dn(t):null,a=t.length;c&&(i=Mn,f=!1,t=c);n:for(;++o<e;)if(c=n[o],f&&c===c){for(var l=a;l--;)if(t[l]===c)continue n;u.push(c)}else 0>i(t,c,0)&&u.push(c);return u}function lt(n,t){var r=!0;return zu(n,function(n,e,u){return r=!!t(n,e,u)}),r}function st(n,t,r,e){var u=e,o=u;return zu(n,function(n,i,f){i=+t(n,i,f),(r(i,u)||i===e&&i===o)&&(u=i,o=n)}),o}function pt(n,t){var r=[];return zu(n,function(n,e,u){t(n,e,u)&&r.push(n)}),r}function ht(n,t,r,e){var u;return r(n,function(n,r,o){return t(n,r,o)?(u=e?r:n,!1):void 0}),u}function _t(n,t,r,e){e||(e=[]);for(var u=-1,o=n.length;++u<o;){var i=n[u];h(i)&&Sr(i)&&(r||Wo(i)||_e(i))?t?_t(i,t,r,e):Hn(e,i):r||(e[e.length]=i)}return e}function vt(n,t){return Du(n,t,Ee)}function gt(n,t){return Du(n,t,Ko)}function yt(n,t){return Mu(n,t,Ko)}function dt(n,t){for(var r=-1,e=t.length,u=-1,o=[];++r<e;){var i=t[r];ye(n[i])&&(o[++u]=i)}return o}function wt(n,t,r){if(null!=n){n=Dr(n),r!==x&&r in n&&(t=[r]),r=0;for(var e=t.length;null!=n&&r<e;)n=Dr(n)[t[r++]];return r&&r==e?n:x}}function xt(n,t,r,e,u,o){if(n===t)return!0;if(null==n||null==t||!de(n)&&!h(t))return n!==n&&t!==t;n:{var i=xt,f=Wo(n),c=Wo(t),a=B,l=B;f||(a=ou.call(n),a==z?a=Z:a!=Z&&(f=je(n))),c||(l=ou.call(t),l==z?l=Z:l!=Z&&je(t));var s=a==Z&&!Gn(n),c=l==Z&&!Gn(t),l=a==l;if(!l||f||s){if(!e&&(a=s&&eu.call(n,"__wrapped__"),c=c&&eu.call(t,"__wrapped__"),a||c)){n=i(a?n.value():n,c?t.value():t,r,e,u,o);break n}if(l){for(u||(u=[]),o||(o=[]),a=u.length;a--;)if(u[a]==n){n=o[a]==t;break n}u.push(n),o.push(t),n=(f?wr:br)(n,t,i,r,e,u,o),u.pop(),o.pop()}else n=!1}else n=xr(n,t,a)}return n}function bt(n,t,r){var e=t.length,u=e,o=!r;if(null==n)return!u;for(n=Dr(n);e--;){var i=t[e];if(o&&i[2]?i[1]!==n[i[0]]:!(i[0]in n))return!1}for(;++e<u;){var i=t[e],f=i[0],c=n[f],a=i[1];if(o&&i[2]){if(c===x&&!(f in n))return!1}else if(i=r?r(c,a,f):x,i===x?!xt(a,c,r,!0):!i)return!1}return!0}function mt(n,t){var r=-1,e=Sr(n)?De(n.length):[];return zu(n,function(n,u,o){e[++r]=t(n,u,o)}),e}function At(n){var t=kr(n);if(1==t.length&&t[0][2]){var r=t[0][0],e=t[0][1];return function(n){return null!=n&&(n=Dr(n),n[r]===e&&(e!==x||r in n))}}return function(n){return bt(n,t)}}function jt(n,t){var r=Wo(n),e=Wr(n)&&t===t&&!de(t),u=n+"";return n=Mr(n),function(o){if(null==o)return!1;var i=u;if(o=Dr(o),!(!r&&e||i in o)){if(o=1==n.length?o:wt(o,St(n,0,-1)),null==o)return!1;i=Gr(n),o=Dr(o)}return o[i]===t?t!==x||i in o:xt(t,o[i],x,!0)}}function kt(n,t,r,e,u){if(!de(n))return n;var o=Sr(t)&&(Wo(t)||je(t)),i=o?x:Ko(t);return Kn(i||t,function(f,c){if(i&&(c=f,f=t[c]),h(f)){e||(e=[]),u||(u=[]);n:{for(var a=c,l=e,s=u,p=l.length,_=t[a];p--;)if(l[p]==_){n[a]=s[p];break n}var p=n[a],v=r?r(p,_,a,n,t):x,g=v===x;g&&(v=_,Sr(_)&&(Wo(_)||je(_))?v=Wo(p)?p:Sr(p)?qn(p):[]:be(_)||_e(_)?v=_e(p)?Ie(p):be(p)?p:{}:g=!1),l.push(_),s.push(v),g?n[a]=kt(v,_,r,l,s):(v===v?v!==p:p===p)&&(n[a]=v)}}else a=n[c],l=r?r(a,f,c,n,t):x,(s=l===x)&&(l=f),l===x&&(!o||c in n)||!s&&(l===l?l===a:a!==a)||(n[c]=l)}),n}function Ot(n){return function(t){return null==t?x:Dr(t)[n]}}function It(n){var t=n+"";return n=Mr(n),function(r){return wt(r,n,t)}}function Rt(n,t){for(var r=n?t.length:0;r--;){var e=t[r];if(e!=u&&Ur(e)){var u=e;vu.call(n,e,1)}}return n}function Et(n,t){return n+xu(Ru()*(t-n+1))}function Ct(n,t,r,e,u){return u(n,function(n,u,o){r=e?(e=!1,n):t(r,n,u,o)}),r}function St(n,t,r){var e=-1,u=n.length;for(t=null==t?0:+t||0,0>t&&(t=-t>u?0:u+t),r=r===x||r>u?u:+r||0,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=De(u);++e<u;)r[e]=n[e+t];return r}function Ut(n,t){var r;return zu(n,function(n,e,u){return r=t(n,e,u),!r}),!!r}function $t(n,t){var r=n.length;for(n.sort(t);r--;)n[r]=n[r].c;return n}function Wt(t,r,e){var u=mr(),o=-1;return r=Xn(r,function(n){return u(n)}),t=mt(t,function(n){return{a:Xn(r,function(t){return t(n)}),b:++o,c:n}}),$t(t,function(t,r){var u;n:{for(var o=-1,i=t.a,f=r.a,c=i.length,a=e.length;++o<c;)if(u=n(i[o],f[o])){if(o>=a)break n;o=e[o],u*="asc"===o||!0===o?1:-1;break n}u=t.b-r.b}return u})}function Ft(n,t){var r=0;return zu(n,function(n,e,u){r+=+t(n,e,u)||0}),r}function Lt(n,t){var e=-1,u=jr(),o=n.length,i=u===r,f=i&&o>=F,c=f&&wu&&hu?new Dn((void 0)):null,a=[];c?(u=Mn,i=!1):(f=!1,c=t?[]:a);n:for(;++e<o;){var l=n[e],s=t?t(l,e,n):l;if(i&&l===l){for(var p=c.length;p--;)if(c[p]===s)continue n;t&&c.push(s),a.push(l)}else 0>u(c,s,0)&&((t||f)&&c.push(s),a.push(l))}return a}function Nt(n,t){for(var r=-1,e=t.length,u=De(e);++r<e;)u[r]=n[t[r]];return u}function Tt(n,t,r,e){for(var u=n.length,o=e?u:-1;(e?o--:++o<u)&&t(n[o],o,n););return r?St(n,e?0:o,e?o+1:u):St(n,e?o+1:0,e?u:o)}function Pt(n,t){var r=n;r instanceof zn&&(r=r.value());for(var e=-1,u=t.length;++e<u;)var o=t[e],r=o.func.apply(o.thisArg,Hn([r],o.args));return r}function zt(n,t,r){var e=0,u=n?n.length:e;if("number"==typeof t&&t===t&&u<=Uu){for(;e<u;){var o=e+u>>>1,i=n[o];(r?i<=t:i<t)&&null!==i?e=o+1:u=o}return u}return Bt(n,t,Ne,r)}function Bt(n,t,r,e){t=r(t);for(var u=0,o=n?n.length:0,i=t!==t,f=null===t,c=t===x;u<o;){var a=xu((u+o)/2),l=r(n[a]),s=l!==x,p=l===l;(i?p||e:f?p&&s&&(e||null!=l):c?p&&(e||s):null==l?0:e?l<=t:l<t)?u=a+1:o=a}return ku(o,Su)}function Dt(n,t,r){if("function"!=typeof n)return Ne;if(t===x)return n;switch(r){case 1:return function(r){return n.call(t,r)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,o){return n.call(t,r,e,u,o)};case 5:return function(r,e,u,o,i){return n.call(t,r,e,u,o,i)}}return function(){return n.apply(t,arguments)}}function Mt(n){var t=new cu(n.byteLength);return new gu(t).set(new gu(n)),t}function qt(n,t,r){for(var e=r.length,u=-1,o=ju(n.length-e,0),i=-1,f=t.length,c=De(f+o);++i<f;)c[i]=t[i];for(;++u<e;)c[r[u]]=n[u];for(;o--;)c[i++]=n[u++];return c}function Kt(n,t,r){for(var e=-1,u=r.length,o=-1,i=ju(n.length-u,0),f=-1,c=t.length,a=De(i+c);++o<i;)a[o]=n[o];for(i=o;++f<c;)a[i+f]=t[f];for(;++e<u;)a[i+r[e]]=n[o++];return a}function Vt(n,t){return function(r,e,u){var o=t?t():{};if(e=mr(e,u,3),Wo(r)){u=-1;for(var i=r.length;++u<i;){var f=r[u];n(o,f,e(f,u,r),r)}}else zu(r,function(t,r,u){n(o,t,e(t,r,u),u)});return o}}function Zt(n){return pe(function(t,r){var e=-1,u=null==t?0:r.length,o=2<u?r[u-2]:x,i=2<u?r[2]:x,f=1<u?r[u-1]:x;for("function"==typeof o?(o=Dt(o,f,5),u-=2):(o="function"==typeof f?f:x,u-=o?1:0),i&&$r(r[0],r[1],i)&&(o=3>u?x:o,u=1);++e<u;)(i=r[e])&&n(t,i,o);return t})}function Yt(n,t){return function(r,e){var u=r?Vu(r):0;if(!Lr(u))return n(r,e);for(var o=t?u:-1,i=Dr(r);(t?o--:++o<u)&&!1!==e(i[o],o,i););return r}}function Gt(n){return function(t,r,e){var u=Dr(t);e=e(t);for(var o=e.length,i=n?o:-1;n?i--:++i<o;){var f=e[i];if(!1===r(u[f],f,u))break}return t}}function Jt(n,t){function r(){return(this&&this!==Yn&&this instanceof r?e:n).apply(t,arguments)}var e=Ht(n);return r}function Xt(n){return function(t){var r=-1;t=Fe(Ue(t));for(var e=t.length,u="";++r<e;)u=n(u,t[r],r);return u}}function Ht(n){return function(){var t=arguments;switch(t.length){case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=Pu(n.prototype),t=n.apply(r,t);return de(t)?t:r}}function Qt(n){function t(r,e,u){return u&&$r(r,e,u)&&(e=x),r=dr(r,n,x,x,x,x,x,e),r.placeholder=t.placeholder,r}return t}function nr(n,t){return pe(function(r){var e=r[0];return null==e?e:(r.push(t),n.apply(x,r))})}function tr(n,t){return function(r,e,u){if(u&&$r(r,e,u)&&(e=x),e=mr(e,u,3),1==e.length){u=r=Wo(r)?r:Br(r);for(var o=e,i=-1,f=u.length,c=t,a=c;++i<f;){var l=u[i],s=+o(l);n(s,c)&&(c=s,a=l)}if(u=a,!r.length||u!==t)return u}return st(r,e,n,t)}}function rr(n,r){return function(e,u,o){return u=mr(u,o,3),Wo(e)?(u=t(e,u,r),-1<u?e[u]:x):ht(e,u,n)}}function er(n){return function(r,e,u){return r&&r.length?(e=mr(e,u,3),t(r,e,n)):-1}}function ur(n){return function(t,r,e){return r=mr(r,e,3),ht(t,r,n,!0)}}function or(n){return function(){for(var t,r=arguments.length,e=n?r:-1,u=0,o=De(r);n?e--:++e<r;){var i=o[u++]=arguments[e];if("function"!=typeof i)throw new Xe(T);!t&&Pn.prototype.thru&&"wrapper"==Ar(i)&&(t=new Pn([],(!0)))}for(e=t?-1:r;++e<r;){var i=o[e],u=Ar(i),f="wrapper"==u?Ku(i):x;t=f&&Fr(f[0])&&f[1]==(E|k|I|C)&&!f[4].length&&1==f[9]?t[Ar(f[0])].apply(t,f[3]):1==i.length&&Fr(i)?t[u]():t.thru(i)}return function(){var n=arguments,e=n[0];if(t&&1==n.length&&Wo(e)&&e.length>=F)return t.plant(e).value();for(var u=0,n=r?o[u].apply(this,n):e;++u<r;)n=o[u].call(this,n);return n}}}function ir(n,t){return function(r,e,u){return"function"==typeof e&&u===x&&Wo(r)?n(r,e):t(r,Dt(e,u,3))}}function fr(n){return function(t,r,e){return("function"!=typeof r||e!==x)&&(r=Dt(r,e,3)),n(t,r,Ee)}}function cr(n){return function(t,r,e){return("function"!=typeof r||e!==x)&&(r=Dt(r,e,3)),n(t,r)}}function ar(n){return function(t,r,e){var u={};return r=mr(r,e,3),gt(t,function(t,e,o){o=r(t,e,o),e=n?o:e,t=n?t:o,u[e]=t}),u}}function lr(n){return function(t,r,e){return t=u(t),(n?t:"")+_r(t,r,e)+(n?"":t)}}function sr(n){var t=pe(function(r,e){var u=v(e,t.placeholder);return dr(r,n,x,e,u)});return t}function pr(n,t){return function(r,e,u,o){var i=3>arguments.length;return"function"==typeof e&&o===x&&Wo(r)?n(r,e,u,i):Ct(r,mr(e,o,4),u,i,t)}}function hr(n,t,r,e,u,o,i,f,c,a){function l(){for(var w=arguments.length,b=w,j=De(w);b--;)j[b]=arguments[b];if(e&&(j=qt(j,e,u)),o&&(j=Kt(j,o,i)),_||y){var b=l.placeholder,k=v(j,b),w=w-k.length;if(w<a){var O=f?qn(f):x,w=ju(a-w,0),E=_?k:x,k=_?x:k,C=_?j:x,j=_?x:j;return t|=_?I:R,t&=~(_?R:I),g||(t&=~(m|A)),j=[n,t,r,C,E,j,k,O,c,w],O=hr.apply(x,j),Fr(n)&&Zu(O,j),O.placeholder=b,O}}if(b=p?r:this,O=h?b[n]:n,f)for(w=j.length,E=ku(f.length,w),k=qn(j);E--;)C=f[E],j[E]=Ur(C,w)?k[C]:x;return s&&c<j.length&&(j.length=c),this&&this!==Yn&&this instanceof l&&(O=d||Ht(n)),O.apply(b,j)}var s=t&E,p=t&m,h=t&A,_=t&k,g=t&j,y=t&O,d=h?x:Ht(n);return l}function _r(n,t,r){return n=n.length,t=+t,n<t&&mu(t)?(t-=n,r=null==r?" ":r+"",$e(r,du(t/r.length)).slice(0,t)):""}function vr(n,t,r,e){function u(){for(var t=-1,f=arguments.length,c=-1,a=e.length,l=De(a+f);++c<a;)l[c]=e[c];for(;f--;)l[c++]=arguments[++t];return(this&&this!==Yn&&this instanceof u?i:n).apply(o?r:this,l)}var o=t&m,i=Ht(n);return u}function gr(n){var t=Ve[n];return function(n,r){return(r=r===x?0:+r||0)?(r=su(10,r),t(n*r)/r):t(n)}}function yr(n){return function(t,r,e,u){var o=mr(e);return null==e&&o===it?zt(t,r,n):Bt(t,r,o(e,u,1),n)}}function dr(n,t,r,e,u,o,i,f){var c=t&A;if(!c&&"function"!=typeof n)throw new Xe(T);var a=e?e.length:0;if(a||(t&=~(I|R),e=u=x),a-=u?u.length:0,t&R){var l=e,s=u;e=u=x}var p=c?x:Ku(n);return r=[n,t,r,e,u,l,s,o,i,f],p&&(e=r[1],t=p[1],f=e|t,u=t==E&&e==k||t==E&&e==C&&r[7].length<=p[8]||t==(E|C)&&e==k,(f<E||u)&&(t&m&&(r[2]=p[2],f|=e&m?0:j),(e=p[3])&&(u=r[3],r[3]=u?qt(u,e,p[4]):qn(e),r[4]=u?v(r[3],P):qn(p[4])),(e=p[5])&&(u=r[5],r[5]=u?Kt(u,e,p[6]):qn(e),r[6]=u?v(r[5],P):qn(p[6])),(e=p[7])&&(r[7]=qn(e)),t&E&&(r[8]=null==r[8]?p[8]:ku(r[8],p[8])),null==r[9]&&(r[9]=p[9]),r[0]=p[0],r[1]=f),t=r[1],f=r[9]),r[9]=null==f?c?0:n.length:ju(f-a,0)||0,n=t==m?Jt(r[0],r[2]):t!=I&&t!=(m|I)||r[4].length?hr.apply(x,r):vr.apply(x,r),(p?qu:Zu)(n,r)}function wr(n,t,r,e,u,o,i){var f=-1,c=n.length,a=t.length;if(c!=a&&(!u||a<=c))return!1;for(;++f<c;){var l=n[f],a=t[f],s=e?e(u?a:l,u?l:a,f):x;if(s!==x){if(s)continue;return!1}if(u){if(!nt(t,function(n){return l===n||r(l,n,e,u,o,i)}))return!1}else if(l!==a&&!r(l,a,e,u,o,i))return!1}return!0}function xr(n,t,r){switch(r){case D:case M:return+n==+t;case q:return n.name==t.name&&n.message==t.message;case V:return n!=+n?t!=+t:n==+t;case Y:case G:return n==t+""}return!1}function br(n,t,r,e,u,o,i){var f=Ko(n),c=f.length,a=Ko(t).length;if(c!=a&&!u)return!1;for(a=c;a--;){var l=f[a];if(!(u?l in t:eu.call(t,l)))return!1}for(var s=u;++a<c;){var l=f[a],p=n[l],h=t[l],_=e?e(u?h:p,u?p:h,l):x;if(_===x?!r(p,h,e,u,o,i):!_)return!1;s||(s="constructor"==l)}return!(!s&&(r=n.constructor,e=t.constructor,r!=e&&"constructor"in n&&"constructor"in t&&!("function"==typeof r&&r instanceof r&&"function"==typeof e&&e instanceof e)))}function mr(n,t,r){var e=Nn.callback||Le,e=e===Le?it:e;return r?e(n,t,r):e}function Ar(n){for(var t=n.name+"",r=Fu[t],e=r?r.length:0;e--;){var u=r[e],o=u.func;if(null==o||o==n)return u.name}return t}function jr(n,t,e){var u=Nn.indexOf||Yr,u=u===Yr?r:u;return n?u(n,t,e):u}function kr(n){n=Ce(n);for(var t=n.length;t--;){var r,e=n[t];r=n[t][1],r=r===r&&!de(r),e[2]=r}return n}function Or(n,t){var r=null==n?x:n[t];return we(r)?r:x}function Ir(n){var t=n.length,r=new n.constructor(t);return t&&"string"==typeof n[0]&&eu.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function Rr(n){return n=n.constructor,"function"==typeof n&&n instanceof n||(n=Ye),new n}function Er(n,t,r){var e=n.constructor;switch(t){case J:return Mt(n);case D:case M:return new e((+n));case X:case H:case Q:case nn:case tn:case rn:case en:case un:case on:return e instanceof e&&(e=Lu[t]),t=n.buffer,new e(r?Mt(t):t,n.byteOffset,n.length);case V:case G:return new e(n);case Y:var u=new e(n.source,kn.exec(n));u.lastIndex=n.lastIndex}return u}function Cr(n,t,r){return null==n||Wr(t,n)||(t=Mr(t),n=1==t.length?n:wt(n,St(t,0,-1)),t=Gr(t)),t=null==n?n:n[t],null==t?x:t.apply(n,r)}function Sr(n){return null!=n&&Lr(Vu(n))}function Ur(n,t){return n="number"==typeof n||Rn.test(n)?+n:-1,t=null==t?$u:t,-1<n&&0==n%1&&n<t}function $r(n,t,r){if(!de(r))return!1;var e=typeof t;return!!("number"==e?Sr(r)&&Ur(t,r.length):"string"==e&&t in r)&&(t=r[t],n===n?n===t:t!==t)}function Wr(n,t){var r=typeof n;return!!("string"==r&&dn.test(n)||"number"==r)||!Wo(n)&&(!yn.test(n)||null!=t&&n in Dr(t))}function Fr(n){var t=Ar(n),r=Nn[t];return"function"==typeof r&&t in zn.prototype&&(n===r||(t=Ku(r),!!t&&n===t[0]))}function Lr(n){return"number"==typeof n&&-1<n&&0==n%1&&n<=$u}function Nr(n,t){return n===x?t:Fo(n,t,Nr)}function Tr(n,t){n=Dr(n);for(var r=-1,e=t.length,u={};++r<e;){var o=t[r];o in n&&(u[o]=n[o])}return u}function Pr(n,t){var r={};return vt(n,function(n,e,u){t(n,e,u)&&(r[e]=n)}),r}function zr(n){for(var t=Ee(n),r=t.length,e=r&&n.length,u=!!e&&Lr(e)&&(Wo(n)||_e(n)||Ae(n)),o=-1,i=[];++o<r;){var f=t[o];(u&&Ur(f,e)||eu.call(n,f))&&i.push(f)}return i}function Br(n){return null==n?[]:Sr(n)?Nn.support.unindexedChars&&Ae(n)?n.split(""):de(n)?n:Ye(n):Se(n)}function Dr(n){if(Nn.support.unindexedChars&&Ae(n)){for(var t=-1,r=n.length,e=Ye(n);++t<r;)e[t]=n.charAt(t);return e}return de(n)?n:Ye(n)}function Mr(n){if(Wo(n))return n;var t=[];return u(n).replace(wn,function(n,r,e,u){t.push(e?u.replace(An,"$1"):r||n)}),t}function qr(n){return n instanceof zn?n.clone():new Pn(n.__wrapped__,n.__chain__,qn(n.__actions__))}function Kr(n,t,r){return n&&n.length?((r?$r(n,t,r):null==t)&&(t=1),St(n,0>t?0:t)):[]}function Vr(n,t,r){var e=n?n.length:0;return e?((r?$r(n,t,r):null==t)&&(t=1),t=e-(+t||0),St(n,0,0>t?0:t)):[]}function Zr(n){return n?n[0]:x}function Yr(n,t,e){var u=n?n.length:0;if(!u)return-1;if("number"==typeof e)e=0>e?ju(u+e,0):e;else if(e)return e=zt(n,t),e<u&&(t===t?t===n[e]:n[e]!==n[e])?e:-1;return r(n,t,e||0)}function Gr(n){var t=n?n.length:0;return t?n[t-1]:x}function Jr(n){return Kr(n,1)}function Xr(n,t,e,u){if(!n||!n.length)return[];null!=t&&"boolean"!=typeof t&&(u=e,e=$r(n,t,u)?x:t,t=!1);var o=mr();if((null!=e||o!==it)&&(e=o(e,u,3)),t&&jr()===r){t=e;var i;e=-1,u=n.length;for(var o=-1,f=[];++e<u;){var c=n[e],a=t?t(c,e,n):c;e&&i===a||(i=a,f[++o]=c)}n=f}else n=Lt(n,e);return n}function Hr(n){if(!n||!n.length)return[];var t=-1,r=0;n=Zn(n,function(n){return Sr(n)?(r=ju(n.length,r),!0):void 0});for(var e=De(r);++t<r;)e[t]=Xn(n,Ot(t));return e}function Qr(n,t,r){return n&&n.length?(n=Hr(n),null==t?n:(t=Dt(t,r,4),Xn(n,function(n){return Qn(n,t,x,!0)}))):[]}function ne(n,t){var r=-1,e=n?n.length:0,u={};for(!e||t||Wo(n[0])||(t=[]);++r<e;){var o=n[r];t?u[o]=t[r]:o&&(u[o[0]]=o[1])}return u}function te(n){return n=Nn(n),n.__chain__=!0,n}function re(n,t,r){return t.call(r,n)}function ee(n,t,r){var e=Wo(n)?Vn:lt;return r&&$r(n,t,r)&&(t=x),("function"!=typeof t||r!==x)&&(t=mr(t,r,3)),e(n,t)}function ue(n,t,r){var e=Wo(n)?Zn:pt;return t=mr(t,r,3),e(n,t)}function oe(n,t,r,e){var u=n?Vu(n):0;return Lr(u)||(n=Se(n),u=n.length),r="number"!=typeof r||e&&$r(t,r,e)?0:0>r?ju(u+r,0):r||0,"string"==typeof n||!Wo(n)&&Ae(n)?r<=u&&-1<n.indexOf(t,r):!!u&&-1<jr(n,t,r)}function ie(n,t,r){var e=Wo(n)?Xn:mt;return t=mr(t,r,3),e(n,t)}function fe(n,t,r){if(r?$r(n,t,r):null==t){n=Br(n);var e=n.length;return 0<e?n[Et(0,e-1)]:x}r=-1,n=Oe(n);var e=n.length,u=e-1;for(t=ku(0>t?0:+t||0,e);++r<t;){var e=Et(r,u),o=n[e];n[e]=n[r],n[r]=o}return n.length=t,n}function ce(n,t,r){var e=Wo(n)?nt:Ut;return r&&$r(n,t,r)&&(t=x),("function"!=typeof t||r!==x)&&(t=mr(t,r,3)),e(n,t)}function ae(n,t){var r;if("function"!=typeof t){if("function"!=typeof n)throw new Xe(T);var e=n;n=t,t=e}return function(){return 0<--n&&(r=t.apply(this,arguments)),1>=n&&(t=x),r}}function le(n,t,r){function e(t,r){r&&au(r),c=p=h=x,t&&(_=xo(),a=n.apply(s,f),p||c||(f=s=x))}function u(){var n=t-(xo()-l);0>=n||n>t?e(h,c):p=_u(u,n)}function o(){e(g,p)}function i(){if(f=arguments,l=xo(),s=this,h=g&&(p||!y),!1===v)var r=y&&!p;else{c||y||(_=l);var e=v-(l-_),i=0>=e||e>v;i?(c&&(c=au(c)),_=l,a=n.apply(s,f)):c||(c=_u(o,e))}return i&&p?p=au(p):p||t===v||(p=_u(u,t)),r&&(i=!0,a=n.apply(s,f)),!i||p||c||(f=s=x),a}var f,c,a,l,s,p,h,_=0,v=!1,g=!0;if("function"!=typeof n)throw new Xe(T);if(t=0>t?0:+t||0,!0===r)var y=!0,g=!1;else de(r)&&(y=!!r.leading,v="maxWait"in r&&ju(+r.maxWait||0,t),g="trailing"in r?!!r.trailing:g);return i.cancel=function(){p&&au(p),c&&au(c),_=0,c=p=h=x},i}function se(n,t){if("function"!=typeof n||t&&"function"!=typeof t)throw new Xe(T);var r=function(){var e=arguments,u=t?t.apply(this,e):e[0],o=r.cache;return o.has(u)?o.get(u):(e=n.apply(this,e),r.cache=o.set(u,e),e)};return r.cache=new se.Cache,r}function pe(n,t){if("function"!=typeof n)throw new Xe(T);return t=ju(t===x?n.length-1:+t||0,0),function(){for(var r=arguments,e=-1,u=ju(r.length-t,0),o=De(u);++e<u;)o[e]=r[t+e];switch(t){case 0:return n.call(this,o);case 1:return n.call(this,r[0],o);case 2:return n.call(this,r[0],r[1],o)}for(u=De(t+1),e=-1;++e<t;)u[e]=r[e];return u[t]=o,n.apply(this,u)}}function he(n,t){return n>t}function _e(n){return h(n)&&Sr(n)&&eu.call(n,"callee")&&!pu.call(n,"callee")}function ve(n,t,r,e){return e=(r="function"==typeof r?Dt(r,e,3):x)?r(n,t):x,e===x?xt(n,t,r):!!e}function ge(n){return h(n)&&"string"==typeof n.message&&ou.call(n)==q}function ye(n){return de(n)&&ou.call(n)==K}function de(n){var t=typeof n;return!!n&&("object"==t||"function"==t)}function we(n){return null!=n&&(ye(n)?fu.test(ru.call(n)):h(n)&&(Gn(n)?fu:In).test(n))}function xe(n){return"number"==typeof n||h(n)&&ou.call(n)==V}function be(n){var t;if(!h(n)||ou.call(n)!=Z||Gn(n)||_e(n)||!(eu.call(n,"constructor")||(t=n.constructor,"function"!=typeof t||t instanceof t)))return!1;var r;return Nn.support.ownLast?(vt(n,function(n,t,e){return r=eu.call(e,t),!1}),!1!==r):(vt(n,function(n,t){r=t}),r===x||eu.call(n,r))}function me(n){return de(n)&&ou.call(n)==Y}function Ae(n){return"string"==typeof n||h(n)&&ou.call(n)==G}function je(n){return h(n)&&Lr(n.length)&&!!Fn[ou.call(n)]}function ke(n,t){return n<t}function Oe(n){var t=n?Vu(n):0;return Lr(t)?t?Nn.support.unindexedChars&&Ae(n)?n.split(""):qn(n):[]:Se(n)}function Ie(n){return ot(n,Ee(n))}function Re(n){return dt(n,Ee(n))}function Ee(n){if(null==n)return[];de(n)||(n=Ye(n));for(var t=n.length,r=Nn.support,t=t&&Lr(t)&&(Wo(n)||_e(n)||Ae(n))&&t||0,e=n.constructor,u=-1,e=ye(e)&&e.prototype||nu,o=e===n,i=De(t),f=0<t,c=r.enumErrorProps&&(n===Qe||n instanceof qe),a=r.enumPrototypes&&ye(n);++u<t;)i[u]=u+"";for(var l in n)a&&"prototype"==l||c&&("message"==l||"name"==l)||f&&Ur(l,t)||"constructor"==l&&(o||!eu.call(n,l))||i.push(l);if(r.nonEnumShadows&&n!==nu)for(t=n===tu?G:n===Qe?q:ou.call(n),r=Nu[t]||Nu[Z],t==Z&&(e=nu),t=Wn.length;t--;)l=Wn[t],u=r[l],o&&u||(u?!eu.call(n,l):n[l]===e[l])||i.push(l);return i}function Ce(n){n=Dr(n);for(var t=-1,r=Ko(n),e=r.length,u=De(e);++t<e;){var o=r[t];u[t]=[o,n[o]]}return u}function Se(n){return Nt(n,Ko(n))}function Ue(n){return(n=u(n))&&n.replace(En,c).replace(mn,"")}function $e(n,t){var r="";if(n=u(n),t=+t,1>t||!n||!mu(t))return r;do t%2&&(r+=n),t=xu(t/2),n+=n;while(t);return r}function We(n,t,r){var e=n;return(n=u(n))?(r?$r(e,t,r):null==t)?n.slice(g(n),y(n)+1):(t+="",n.slice(o(n,t),i(n,t)+1)):n}function Fe(n,t,r){return r&&$r(n,t,r)&&(t=x),n=u(n),n.match(t||Un)||[]}function Le(n,t,r){return r&&$r(n,t,r)&&(t=x),h(n)?Te(n):it(n,t)}function Ne(n){return n}function Te(n){return At(ft(n,!0))}function Pe(n,t,r){if(null==r){var e=de(t),u=e?Ko(t):x;((u=u&&u.length?dt(t,u):x)?u.length:e)||(u=!1,r=t,t=n,n=this)}u||(u=dt(t,Ko(t)));var o=!0,e=-1,i=ye(n),f=u.length;!1===r?o=!1:de(r)&&"chain"in r&&(o=r.chain);for(;++e<f;){r=u[e];var c=t[r];n[r]=c,i&&(n.prototype[r]=function(t){return function(){var r=this.__chain__;if(o||r){var e=n(this.__wrapped__);return(e.__actions__=qn(this.__actions__)).push({func:t,args:arguments,thisArg:n}),e.__chain__=r,e}return t.apply(n,Hn([this.value()],arguments))}}(c))}return n}function ze(){}function Be(n){return Wr(n)?Ot(n):It(n)}_=_?Jn.defaults(Yn.Object(),_,Jn.pick(Yn,$n)):Yn;var De=_.Array,Me=_.Date,qe=_.Error,Ke=_.Function,Ve=_.Math,Ze=_.Number,Ye=_.Object,Ge=_.RegExp,Je=_.String,Xe=_.TypeError,He=De.prototype,Qe=qe.prototype,nu=Ye.prototype,tu=Je.prototype,ru=Ke.prototype.toString,eu=nu.hasOwnProperty,uu=0,ou=nu.toString,iu=Yn._,fu=Ge("^"+ru.call(eu).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),cu=_.ArrayBuffer,au=_.clearTimeout,lu=_.parseFloat,su=Ve.pow,pu=nu.propertyIsEnumerable,hu=Or(_,"Set"),_u=_.setTimeout,vu=He.splice,gu=_.Uint8Array,yu=Or(_,"WeakMap"),du=Ve.ceil,wu=Or(Ye,"create"),xu=Ve.floor,bu=Or(De,"isArray"),mu=_.isFinite,Au=Or(Ye,"keys"),ju=Ve.max,ku=Ve.min,Ou=Or(Me,"now"),Iu=_.parseInt,Ru=Ve.random,Eu=Ze.NEGATIVE_INFINITY,Cu=Ze.POSITIVE_INFINITY,Su=4294967294,Uu=2147483647,$u=9007199254740991,Wu=yu&&new yu,Fu={},Lu={};Lu[X]=_.Float32Array,Lu[H]=_.Float64Array,Lu[Q]=_.Int8Array,Lu[nn]=_.Int16Array,Lu[tn]=_.Int32Array,Lu[rn]=gu,Lu[en]=_.Uint8ClampedArray,Lu[un]=_.Uint16Array,Lu[on]=_.Uint32Array;var Nu={};Nu[B]=Nu[M]=Nu[V]={constructor:!0,toLocaleString:!0,toString:!0,valueOf:!0},Nu[D]=Nu[G]={constructor:!0,toString:!0,valueOf:!0},Nu[q]=Nu[K]=Nu[Y]={constructor:!0,toString:!0},Nu[Z]={constructor:!0},Kn(Wn,function(n){for(var t in Nu)if(eu.call(Nu,t)){var r=Nu[t];r[n]=eu.call(r,n)}});var Tu=Nn.support={};!function(n){var t=function(){this.x=n},r={0:n,length:n},e=[];t.prototype={valueOf:n,y:n};for(var u in new t)e.push(u);Tu.enumErrorProps=pu.call(Qe,"message")||pu.call(Qe,"name"),Tu.enumPrototypes=pu.call(t,"prototype"),Tu.nonEnumShadows=!/valueOf/.test(e),Tu.ownLast="x"!=e[0],Tu.spliceObjects=(vu.call(r,0,1),!r[0]),Tu.unindexedChars="xx"!="x"[0]+Ye("x")[0]}(1,0),Nn.templateSettings={escape:_n,evaluate:vn,interpolate:gn,variable:"",imports:{_:Nn}};var Pu=function(){function n(){}return function(t){if(de(t)){n.prototype=t;var r=new n;n.prototype=x}return r||{}}}(),zu=Yt(gt),Bu=Yt(yt,!0),Du=Gt(),Mu=Gt(!0),qu=Wu?function(n,t){return Wu.set(n,t),n}:Ne,Ku=Wu?function(n){return Wu.get(n)}:ze,Vu=Ot("length"),Zu=function(){var n=0,t=0;return function(r,e){var u=xo(),o=W-(u-t);if(t=u,0<o){if(++n>=$)return r}else n=0;return qu(r,e)}}(),Yu=pe(function(n,t){return h(n)&&Sr(n)?at(n,_t(t,!1,!0)):[]}),Gu=er(),Ju=er(!0),Xu=pe(function(n){for(var t=n.length,e=t,u=De(l),o=jr(),i=o===r,f=[];e--;){var c=n[e]=Sr(c=n[e])?c:[];u[e]=i&&120<=c.length&&wu&&hu?new Dn(e&&c):null}var i=n[0],a=-1,l=i?i.length:0,s=u[0];n:for(;++a<l;)if(c=i[a],0>(s?Mn(s,c):o(f,c,0))){for(e=t;--e;){var p=u[e];if(0>(p?Mn(p,c):o(n[e],c,0)))continue n}s&&s.push(c),f.push(c)}return f}),Hu=pe(function(t,r){r=_t(r);var e=ut(t,r);return Rt(t,r.sort(n)),e}),Qu=yr(),no=yr(!0),to=pe(function(n){return Lt(_t(n,!1,!0))}),ro=pe(function(n,t){return Sr(n)?at(n,t):[]}),eo=pe(Hr),uo=pe(function(n){var t=n.length,r=2<t?n[t-2]:x,e=1<t?n[t-1]:x;return 2<t&&"function"==typeof r?t-=2:(r=1<t&&"function"==typeof e?(--t,e):x,e=x),n.length=t,Qr(n,r,e)}),oo=pe(function(n){return n=_t(n),this.thru(function(t){t=Wo(t)?t:[Dr(t)];for(var r=n,e=-1,u=t.length,o=-1,i=r.length,f=De(u+i);++e<u;)f[e]=t[e];for(;++o<i;)f[e++]=r[o];return f})}),io=pe(function(n,t){return Sr(n)&&(n=Br(n)),ut(n,_t(t))}),fo=Vt(function(n,t,r){eu.call(n,r)?++n[r]:n[r]=1}),co=rr(zu),ao=rr(Bu,!0),lo=ir(Kn,zu),so=ir(function(n,t){for(var r=n.length;r--&&!1!==t(n[r],r,n););return n},Bu),po=Vt(function(n,t,r){eu.call(n,r)?n[r].push(t):n[r]=[t]}),ho=Vt(function(n,t,r){n[r]=t}),_o=pe(function(n,t,r){var e=-1,u="function"==typeof t,o=Wr(t),i=Sr(n)?De(n.length):[];return zu(n,function(n){var f=u?t:o&&null!=n?n[t]:x;i[++e]=f?f.apply(n,r):Cr(n,t,r)}),i}),vo=Vt(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),go=pr(Qn,zu),yo=pr(function(n,t,r,e){var u=n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r},Bu),wo=pe(function(n,t){if(null==n)return[];var r=t[2];return r&&$r(t[0],t[1],r)&&(t.length=1),Wt(n,_t(t),[])}),xo=Ou||function(){return(new Me).getTime()},bo=pe(function(n,t,r){var e=m;if(r.length)var u=v(r,bo.placeholder),e=e|I;return dr(n,e,t,r,u)}),mo=pe(function(n,t){t=t.length?_t(t):Re(n);for(var r=-1,e=t.length;++r<e;){var u=t[r];n[u]=dr(n[u],m,n)}return n}),Ao=pe(function(n,t,r){var e=m|A;if(r.length)var u=v(r,Ao.placeholder),e=e|I;return dr(t,e,n,r,u)}),jo=Qt(k),ko=Qt(O),Oo=pe(function(n,t){return ct(n,1,t)}),Io=pe(function(n,t,r){return ct(n,t,r)}),Ro=or(),Eo=or(!0),Co=pe(function(n,t){if(t=_t(t),"function"!=typeof n||!Vn(t,e))throw new Xe(T);var r=t.length;return pe(function(e){for(var u=ku(e.length,r);u--;)e[u]=t[u](e[u]);return n.apply(this,e)})}),So=sr(I),Uo=sr(R),$o=pe(function(n,t){return dr(n,C,x,x,x,_t(t))}),Wo=bu||function(n){return h(n)&&Lr(n.length)&&ou.call(n)==B},Fo=Zt(kt),Lo=Zt(function(n,t,r){return r?rt(n,t,r):et(n,t)}),No=nr(Lo,function(n,t){return n===x?t:n}),To=nr(Fo,Nr),Po=ur(gt),zo=ur(yt),Bo=fr(Du),Do=fr(Mu),Mo=cr(gt),qo=cr(yt),Ko=Au?function(n){var t=null==n?x:n.constructor;return"function"==typeof t&&t.prototype===n||("function"==typeof n?Nn.support.enumPrototypes:Sr(n))?zr(n):de(n)?Au(n):[]}:zr,Vo=ar(!0),Zo=ar(),Yo=pe(function(n,t){if(null==n)return{};if("function"!=typeof t[0])return t=Xn(_t(t),Je),Tr(n,at(Ee(n),t));var r=Dt(t[0],t[1],3);return Pr(n,function(n,t,e){return!r(n,t,e)})}),Go=pe(function(n,t){return null==n?{}:"function"==typeof t[0]?Pr(n,Dt(t[0],t[1],3)):Tr(n,_t(t))}),Jo=Xt(function(n,t,r){return t=t.toLowerCase(),n+(r?t.charAt(0).toUpperCase()+t.slice(1):t)}),Xo=Xt(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Ho=lr(),Qo=lr(!0),ni=Xt(function(n,t,r){return n+(r?"_":"")+t.toLowerCase()}),ti=Xt(function(n,t,r){return n+(r?" ":"")+(t.charAt(0).toUpperCase()+t.slice(1))}),ri=pe(function(n,t){try{return n.apply(x,t)}catch(r){return ge(r)?r:new qe(r)}}),ei=pe(function(n,t){return function(r){return Cr(r,n,t)}}),ui=pe(function(n,t){return function(r){return Cr(n,r,t)}}),oi=gr("ceil"),ii=gr("floor"),fi=tr(he,Eu),ci=tr(ke,Cu),ai=gr("round");return Nn.prototype=Tn.prototype,Pn.prototype=Pu(Tn.prototype),Pn.prototype.constructor=Pn,zn.prototype=Pu(Tn.prototype),zn.prototype.constructor=zn,Bn.prototype["delete"]=function(n){return this.has(n)&&delete this.__data__[n]},Bn.prototype.get=function(n){return"__proto__"==n?x:this.__data__[n]},Bn.prototype.has=function(n){return"__proto__"!=n&&eu.call(this.__data__,n)},Bn.prototype.set=function(n,t){return"__proto__"!=n&&(this.__data__[n]=t),this},Dn.prototype.push=function(n){var t=this.data;"string"==typeof n||de(n)?t.set.add(n):t.hash[n]=!0},se.Cache=Bn,Nn.after=function(n,t){if("function"!=typeof t){if("function"!=typeof n)throw new Xe(T);var r=n;n=t,t=r}return n=mu(n=+n)?n:0,function(){return 1>--n?t.apply(this,arguments):void 0}},Nn.ary=function(n,t,r){return r&&$r(n,t,r)&&(t=x),t=n&&null==t?n.length:ju(+t||0,0),dr(n,E,x,x,x,x,t)},Nn.assign=Lo,Nn.at=io,Nn.before=ae,Nn.bind=bo,Nn.bindAll=mo,
-Nn.bindKey=Ao,Nn.callback=Le,Nn.chain=te,Nn.chunk=function(n,t,r){t=(r?$r(n,t,r):null==t)?1:ju(xu(t)||1,1),r=0;for(var e=n?n.length:0,u=-1,o=De(du(e/t));r<e;)o[++u]=St(n,r,r+=t);return o},Nn.compact=function(n){for(var t=-1,r=n?n.length:0,e=-1,u=[];++t<r;){var o=n[t];o&&(u[++e]=o)}return u},Nn.constant=function(n){return function(){return n}},Nn.countBy=fo,Nn.create=function(n,t,r){var e=Pu(n);return r&&$r(n,t,r)&&(t=x),t?et(e,t):e},Nn.curry=jo,Nn.curryRight=ko,Nn.debounce=le,Nn.defaults=No,Nn.defaultsDeep=To,Nn.defer=Oo,Nn.delay=Io,Nn.difference=Yu,Nn.drop=Kr,Nn.dropRight=Vr,Nn.dropRightWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3),!0,!0):[]},Nn.dropWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3),!0):[]},Nn.fill=function(n,t,r,e){var u=n?n.length:0;if(!u)return[];for(r&&"number"!=typeof r&&$r(n,t,r)&&(r=0,e=u),u=n.length,r=null==r?0:+r||0,0>r&&(r=-r>u?0:u+r),e=e===x||e>u?u:+e||0,0>e&&(e+=u),u=r>e?0:e>>>0,r>>>=0;r<u;)n[r++]=t;return n},Nn.filter=ue,Nn.flatten=function(n,t,r){var e=n?n.length:0;return r&&$r(n,t,r)&&(t=!1),e?_t(n,t):[]},Nn.flattenDeep=function(n){return n&&n.length?_t(n,!0):[]},Nn.flow=Ro,Nn.flowRight=Eo,Nn.forEach=lo,Nn.forEachRight=so,Nn.forIn=Bo,Nn.forInRight=Do,Nn.forOwn=Mo,Nn.forOwnRight=qo,Nn.functions=Re,Nn.groupBy=po,Nn.indexBy=ho,Nn.initial=function(n){return Vr(n,1)},Nn.intersection=Xu,Nn.invert=function(n,t,r){r&&$r(n,t,r)&&(t=x),r=-1;for(var e=Ko(n),u=e.length,o={};++r<u;){var i=e[r],f=n[i];t?eu.call(o,f)?o[f].push(i):o[f]=[i]:o[f]=i}return o},Nn.invoke=_o,Nn.keys=Ko,Nn.keysIn=Ee,Nn.map=ie,Nn.mapKeys=Vo,Nn.mapValues=Zo,Nn.matches=Te,Nn.matchesProperty=function(n,t){return jt(n,ft(t,!0))},Nn.memoize=se,Nn.merge=Fo,Nn.method=ei,Nn.methodOf=ui,Nn.mixin=Pe,Nn.modArgs=Co,Nn.negate=function(n){if("function"!=typeof n)throw new Xe(T);return function(){return!n.apply(this,arguments)}},Nn.omit=Yo,Nn.once=function(n){return ae(2,n)},Nn.pairs=Ce,Nn.partial=So,Nn.partialRight=Uo,Nn.partition=vo,Nn.pick=Go,Nn.pluck=function(n,t){return ie(n,Be(t))},Nn.property=Be,Nn.propertyOf=function(n){return function(t){return wt(n,Mr(t),t+"")}},Nn.pull=function(){var n=arguments,t=n[0];if(!t||!t.length)return t;for(var r=0,e=jr(),u=n.length;++r<u;)for(var o=0,i=n[r];-1<(o=e(t,i,o));)vu.call(t,o,1);return t},Nn.pullAt=Hu,Nn.range=function(n,t,r){r&&$r(n,t,r)&&(t=r=x),n=+n||0,r=null==r?1:+r||0,null==t?(t=n,n=0):t=+t||0;var e=-1;t=ju(du((t-n)/(r||1)),0);for(var u=De(t);++e<t;)u[e]=n,n+=r;return u},Nn.rearg=$o,Nn.reject=function(n,t,r){var e=Wo(n)?Zn:pt;return t=mr(t,r,3),e(n,function(n,r,e){return!t(n,r,e)})},Nn.remove=function(n,t,r){var e=[];if(!n||!n.length)return e;var u=-1,o=[],i=n.length;for(t=mr(t,r,3);++u<i;)r=n[u],t(r,u,n)&&(e.push(r),o.push(u));return Rt(n,o),e},Nn.rest=Jr,Nn.restParam=pe,Nn.set=function(n,t,r){if(null==n)return n;var e=t+"";t=null!=n[e]||Wr(t,n)?[e]:Mr(t);for(var e=-1,u=t.length,o=u-1,i=n;null!=i&&++e<u;){var f=t[e];de(i)&&(e==o?i[f]=r:null==i[f]&&(i[f]=Ur(t[e+1])?[]:{})),i=i[f]}return n},Nn.shuffle=function(n){return fe(n,Cu)},Nn.slice=function(n,t,r){var e=n?n.length:0;return e?(r&&"number"!=typeof r&&$r(n,t,r)&&(t=0,r=e),St(n,t,r)):[]},Nn.sortBy=function(n,t,r){if(null==n)return[];r&&$r(n,t,r)&&(t=x);var e=-1;return t=mr(t,r,3),n=mt(n,function(n,r,u){return{a:t(n,r,u),b:++e,c:n}}),$t(n,f)},Nn.sortByAll=wo,Nn.sortByOrder=function(n,t,r,e){return null==n?[]:(e&&$r(t,r,e)&&(r=x),Wo(t)||(t=null==t?[]:[t]),Wo(r)||(r=null==r?[]:[r]),Wt(n,t,r))},Nn.spread=function(n){if("function"!=typeof n)throw new Xe(T);return function(t){return n.apply(this,t)}},Nn.take=function(n,t,r){return n&&n.length?((r?$r(n,t,r):null==t)&&(t=1),St(n,0,0>t?0:t)):[]},Nn.takeRight=function(n,t,r){var e=n?n.length:0;return e?((r?$r(n,t,r):null==t)&&(t=1),t=e-(+t||0),St(n,0>t?0:t)):[]},Nn.takeRightWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3),!1,!0):[]},Nn.takeWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3)):[]},Nn.tap=function(n,t,r){return t.call(r,n),n},Nn.throttle=function(n,t,r){var e=!0,u=!0;if("function"!=typeof n)throw new Xe(T);return!1===r?e=!1:de(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),le(n,t,{leading:e,maxWait:+t,trailing:u})},Nn.thru=re,Nn.times=function(n,t,r){if(n=xu(n),1>n||!mu(n))return[];var e=-1,u=De(ku(n,4294967295));for(t=Dt(t,r,1);++e<n;)4294967295>e?u[e]=t(e):t(e);return u},Nn.toArray=Oe,Nn.toPlainObject=Ie,Nn.transform=function(n,t,r,e){var u=Wo(n)||je(n);return t=mr(t,e,4),null==r&&(u||de(n)?(e=n.constructor,r=u?Wo(n)?new e:[]:Pu(ye(e)?e.prototype:x)):r={}),(u?Kn:gt)(n,function(n,e,u){return t(r,n,e,u)}),r},Nn.union=to,Nn.uniq=Xr,Nn.unzip=Hr,Nn.unzipWith=Qr,Nn.values=Se,Nn.valuesIn=function(n){return Nt(n,Ee(n))},Nn.where=function(n,t){return ue(n,At(t))},Nn.without=ro,Nn.wrap=function(n,t){return t=null==t?Ne:t,dr(t,I,x,[n],[])},Nn.xor=function(){for(var n=-1,t=arguments.length;++n<t;){var r=arguments[n];if(Sr(r))var e=e?Hn(at(e,r),at(r,e)):r}return e?Lt(e):[]},Nn.zip=eo,Nn.zipObject=ne,Nn.zipWith=uo,Nn.backflow=Eo,Nn.collect=ie,Nn.compose=Eo,Nn.each=lo,Nn.eachRight=so,Nn.extend=Lo,Nn.iteratee=Le,Nn.methods=Re,Nn.object=ne,Nn.select=ue,Nn.tail=Jr,Nn.unique=Xr,Pe(Nn,Nn),Nn.add=function(n,t){return(+n||0)+(+t||0)},Nn.attempt=ri,Nn.camelCase=Jo,Nn.capitalize=function(n){return(n=u(n))&&n.charAt(0).toUpperCase()+n.slice(1)},Nn.ceil=oi,Nn.clone=function(n,t,r,e){return t&&"boolean"!=typeof t&&$r(n,t,r)?t=!1:"function"==typeof t&&(e=r,r=t,t=!1),"function"==typeof r?ft(n,t,Dt(r,e,3)):ft(n,t)},Nn.cloneDeep=function(n,t,r){return"function"==typeof t?ft(n,!0,Dt(t,r,3)):ft(n,!0)},Nn.deburr=Ue,Nn.endsWith=function(n,t,r){n=u(n),t+="";var e=n.length;return r=r===x?e:ku(0>r?0:+r||0,e),r-=t.length,0<=r&&n.indexOf(t,r)==r},Nn.escape=function(n){return(n=u(n))&&hn.test(n)?n.replace(sn,a):n},Nn.escapeRegExp=function(n){return(n=u(n))&&bn.test(n)?n.replace(xn,l):n||"(?:)"},Nn.every=ee,Nn.find=co,Nn.findIndex=Gu,Nn.findKey=Po,Nn.findLast=ao,Nn.findLastIndex=Ju,Nn.findLastKey=zo,Nn.findWhere=function(n,t){return co(n,At(t))},Nn.first=Zr,Nn.floor=ii,Nn.get=function(n,t,r){return n=null==n?x:wt(n,Mr(t),t+""),n===x?r:n},Nn.gt=he,Nn.gte=function(n,t){return n>=t},Nn.has=function(n,t){if(null==n)return!1;var r=eu.call(n,t);if(!r&&!Wr(t)){if(t=Mr(t),n=1==t.length?n:wt(n,St(t,0,-1)),null==n)return!1;t=Gr(t),r=eu.call(n,t)}return r||Lr(n.length)&&Ur(t,n.length)&&(Wo(n)||_e(n)||Ae(n))},Nn.identity=Ne,Nn.includes=oe,Nn.indexOf=Yr,Nn.inRange=function(n,t,r){return t=+t||0,r===x?(r=t,t=0):r=+r||0,n>=ku(t,r)&&n<ju(t,r)},Nn.isArguments=_e,Nn.isArray=Wo,Nn.isBoolean=function(n){return!0===n||!1===n||h(n)&&ou.call(n)==D},Nn.isDate=function(n){return h(n)&&ou.call(n)==M},Nn.isElement=function(n){return!!n&&1===n.nodeType&&h(n)&&!be(n)},Nn.isEmpty=function(n){return null==n||(Sr(n)&&(Wo(n)||Ae(n)||_e(n)||h(n)&&ye(n.splice))?!n.length:!Ko(n).length)},Nn.isEqual=ve,Nn.isError=ge,Nn.isFinite=function(n){return"number"==typeof n&&mu(n)},Nn.isFunction=ye,Nn.isMatch=function(n,t,r,e){return r="function"==typeof r?Dt(r,e,3):x,bt(n,kr(t),r)},Nn.isNaN=function(n){return xe(n)&&n!=+n},Nn.isNative=we,Nn.isNull=function(n){return null===n},Nn.isNumber=xe,Nn.isObject=de,Nn.isPlainObject=be,Nn.isRegExp=me,Nn.isString=Ae,Nn.isTypedArray=je,Nn.isUndefined=function(n){return n===x},Nn.kebabCase=Xo,Nn.last=Gr,Nn.lastIndexOf=function(n,t,r){var e=n?n.length:0;if(!e)return-1;var u=e;if("number"==typeof r)u=(0>r?ju(e+r,0):ku(r||0,e-1))+1;else if(r)return u=zt(n,t,!0)-1,n=n[u],(t===t?t===n:n!==n)?u:-1;if(t!==t)return p(n,u,!0);for(;u--;)if(n[u]===t)return u;return-1},Nn.lt=ke,Nn.lte=function(n,t){return n<=t},Nn.max=fi,Nn.min=ci,Nn.noConflict=function(){return Yn._=iu,this},Nn.noop=ze,Nn.now=xo,Nn.pad=function(n,t,r){n=u(n),t=+t;var e=n.length;return e<t&&mu(t)?(e=(t-e)/2,t=xu(e),e=du(e),r=_r("",e,r),r.slice(0,t)+n+r):n},Nn.padLeft=Ho,Nn.padRight=Qo,Nn.parseInt=function(n,t,r){return(r?$r(n,t,r):null==t)?t=0:t&&(t=+t),n=We(n),Iu(n,t||(On.test(n)?16:10))},Nn.random=function(n,t,r){r&&$r(n,t,r)&&(t=r=x);var e=null==n,u=null==t;return null==r&&(u&&"boolean"==typeof n?(r=n,n=1):"boolean"==typeof t&&(r=t,u=!0)),e&&u&&(t=1,u=!1),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=Ru(),ku(n+r*(t-n+lu("1e-"+((r+"").length-1))),t)):Et(n,t)},Nn.reduce=go,Nn.reduceRight=yo,Nn.repeat=$e,Nn.result=function(n,t,r){var e=null==n?x:Dr(n)[t];return e===x&&(null==n||Wr(t,n)||(t=Mr(t),n=1==t.length?n:wt(n,St(t,0,-1)),e=null==n?x:Dr(n)[Gr(t)]),e=e===x?r:e),ye(e)?e.call(n):e},Nn.round=ai,Nn.runInContext=w,Nn.size=function(n){var t=n?Vu(n):0;return Lr(t)?t:Ko(n).length},Nn.snakeCase=ni,Nn.some=ce,Nn.sortedIndex=Qu,Nn.sortedLastIndex=no,Nn.startCase=ti,Nn.startsWith=function(n,t,r){return n=u(n),r=null==r?0:ku(0>r?0:+r||0,n.length),n.lastIndexOf(t,r)==r},Nn.sum=function(n,t,r){if(r&&$r(n,t,r)&&(t=x),t=mr(t,r,3),1==t.length){n=Wo(n)?n:Br(n),r=n.length;for(var e=0;r--;)e+=+t(n[r])||0;n=e}else n=Ft(n,t);return n},Nn.template=function(n,t,r){var e=Nn.templateSettings;r&&$r(n,t,r)&&(t=r=x),n=u(n),t=rt(et({},r||t),e,tt),r=rt(et({},t.imports),e.imports,tt);var o,i,f=Ko(r),c=Nt(r,f),a=0;r=t.interpolate||Cn;var l="__p+='";r=Ge((t.escape||Cn).source+"|"+r.source+"|"+(r===gn?jn:Cn).source+"|"+(t.evaluate||Cn).source+"|$","g");var p="sourceURL"in t?"//# sourceURL="+t.sourceURL+"\n":"";if(n.replace(r,function(t,r,e,u,f,c){return e||(e=u),l+=n.slice(a,c).replace(Sn,s),r&&(o=!0,l+="'+__e("+r+")+'"),f&&(i=!0,l+="';"+f+";\n__p+='"),e&&(l+="'+((__t=("+e+"))==null?'':__t)+'"),a=c+t.length,t}),l+="';",(t=t.variable)||(l="with(obj){"+l+"}"),l=(i?l.replace(fn,""):l).replace(cn,"$1").replace(an,"$1;"),l="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(o?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}",t=ri(function(){return Ke(f,p+"return "+l).apply(x,c)}),t.source=l,ge(t))throw t;return t},Nn.trim=We,Nn.trimLeft=function(n,t,r){var e=n;return(n=u(n))?n.slice((r?$r(e,t,r):null==t)?g(n):o(n,t+"")):n},Nn.trimRight=function(n,t,r){var e=n;return(n=u(n))?(r?$r(e,t,r):null==t)?n.slice(0,y(n)+1):n.slice(0,i(n,t+"")+1):n},Nn.trunc=function(n,t,r){r&&$r(n,t,r)&&(t=x);var e=S;if(r=U,null!=t)if(de(t)){var o="separator"in t?t.separator:o,e="length"in t?+t.length||0:e;r="omission"in t?u(t.omission):r}else e=+t||0;if(n=u(n),e>=n.length)return n;if(e-=r.length,1>e)return r;if(t=n.slice(0,e),null==o)return t+r;if(me(o)){if(n.slice(e).search(o)){var i,f=n.slice(0,e);for(o.global||(o=Ge(o.source,(kn.exec(o)||"")+"g")),o.lastIndex=0;n=o.exec(f);)i=n.index;t=t.slice(0,null==i?e:i)}}else n.indexOf(o,e)!=e&&(o=t.lastIndexOf(o),-1<o&&(t=t.slice(0,o)));return t+r},Nn.unescape=function(n){return(n=u(n))&&pn.test(n)?n.replace(ln,d):n},Nn.uniqueId=function(n){var t=++uu;return u(n)+t},Nn.words=Fe,Nn.all=ee,Nn.any=ce,Nn.contains=oe,Nn.eq=ve,Nn.detect=co,Nn.foldl=go,Nn.foldr=yo,Nn.head=Zr,Nn.include=oe,Nn.inject=go,Pe(Nn,function(){var n={};return gt(Nn,function(t,r){Nn.prototype[r]||(n[r]=t)}),n}(),!1),Nn.sample=fe,Nn.prototype.sample=function(n){return this.__chain__||null!=n?this.thru(function(t){return fe(t,n)}):fe(this.value())},Nn.VERSION=b,Kn("bind bindKey curry curryRight partial partialRight".split(" "),function(n){Nn[n].placeholder=Nn}),Kn(["drop","take"],function(n,t){zn.prototype[n]=function(r){var e=this.__filtered__;if(e&&!t)return new zn(this);r=null==r?1:ju(xu(r)||0,0);var u=this.clone();return e?u.__takeCount__=ku(u.__takeCount__,r):u.__views__.push({size:r,type:n+(0>u.__dir__?"Right":"")}),u},zn.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),Kn(["filter","map","takeWhile"],function(n,t){var r=t+1,e=r!=N;zn.prototype[n]=function(n,t){var u=this.clone();return u.__iteratees__.push({iteratee:mr(n,t,1),type:r}),u.__filtered__=u.__filtered__||e,u}}),Kn(["first","last"],function(n,t){var r="take"+(t?"Right":"");zn.prototype[n]=function(){return this[r](1).value()[0]}}),Kn(["initial","rest"],function(n,t){var r="drop"+(t?"":"Right");zn.prototype[n]=function(){return this.__filtered__?new zn(this):this[r](1)}}),Kn(["pluck","where"],function(n,t){var r=t?"filter":"map",e=t?At:Be;zn.prototype[n]=function(n){return this[r](e(n))}}),zn.prototype.compact=function(){return this.filter(Ne)},zn.prototype.reject=function(n,t){return n=mr(n,t,1),this.filter(function(t){return!n(t)})},zn.prototype.slice=function(n,t){n=null==n?0:+n||0;var r=this;return r.__filtered__&&(0<n||0>t)?new zn(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==x&&(t=+t||0,r=0>t?r.dropRight(-t):r.take(t-n)),r)},zn.prototype.takeRightWhile=function(n,t){return this.reverse().takeWhile(n,t).reverse()},zn.prototype.toArray=function(){return this.take(Cu)},gt(zn.prototype,function(n,t){var r=/^(?:filter|map|reject)|While$/.test(t),e=/^(?:first|last)$/.test(t),u=Nn[e?"take"+("last"==t?"Right":""):t];u&&(Nn.prototype[t]=function(){var t=e?[1]:arguments,o=this.__chain__,i=this.__wrapped__,f=!!this.__actions__.length,c=i instanceof zn,a=t[0],l=c||Wo(i);l&&r&&"function"==typeof a&&1!=a.length&&(c=l=!1);var s=function(n){return e&&o?u(n,1)[0]:u.apply(x,Hn([n],t))},a={func:re,args:[s],thisArg:x},f=c&&!f;return e&&!o?f?(i=i.clone(),i.__actions__.push(a),n.call(i)):u.call(x,this.value())[0]:!e&&l?(i=f?i:new zn(this),i=n.apply(i,t),i.__actions__.push(a),new Pn(i,o)):this.thru(s)})}),Kn("join pop push replace shift sort splice split unshift".split(" "),function(n){var t=(/^(?:replace|split)$/.test(n)?tu:He)[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=!Tu.spliceObjects&&/^(?:pop|shift|splice)$/.test(n),u=/^(?:join|pop|replace|shift)$/.test(n),o=e?function(){var n=t.apply(this,arguments);return 0===this.length&&delete this[0],n}:t;Nn.prototype[n]=function(){var n=arguments;return u&&!this.__chain__?o.apply(this.value(),n):this[r](function(t){return o.apply(t,n)})}}),gt(zn.prototype,function(n,t){var r=Nn[t];if(r){var e=r.name+"";(Fu[e]||(Fu[e]=[])).push({name:t,func:r})}}),Fu[hr(x,A).name]=[{name:"wrapper",func:x}],zn.prototype.clone=function(){var n=new zn(this.__wrapped__);return n.__actions__=qn(this.__actions__),n.__dir__=this.__dir__,n.__filtered__=this.__filtered__,n.__iteratees__=qn(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=qn(this.__views__),n},zn.prototype.reverse=function(){if(this.__filtered__){var n=new zn(this);n.__dir__=-1,n.__filtered__=!0}else n=this.clone(),n.__dir__*=-1;return n},zn.prototype.value=function(){var n,t=this.__wrapped__.value(),r=this.__dir__,e=Wo(t),u=0>r,o=e?t.length:0;n=0;for(var i=o,f=this.__views__,c=-1,a=f.length;++c<a;){var l=f[c],s=l.size;switch(l.type){case"drop":n+=s;break;case"dropRight":i-=s;break;case"take":i=ku(i,n+s);break;case"takeRight":n=ju(n,i-s)}}if(n={start:n,end:i},i=n.start,f=n.end,n=f-i,u=u?f:i-1,i=this.__iteratees__,f=i.length,c=0,a=ku(n,this.__takeCount__),!e||o<F||o==n&&a==n)return Pt(t,this.__actions__);e=[];n:for(;n--&&c<a;){for(u+=r,o=-1,l=t[u];++o<f;){var p=i[o],s=p.type,p=p.iteratee(l);if(s==N)l=p;else if(!p){if(s==L)continue n;break n}}e[c++]=l}return e},Nn.prototype.chain=function(){return te(this)},Nn.prototype.commit=function(){return new Pn(this.value(),this.__chain__)},Nn.prototype.concat=oo,Nn.prototype.plant=function(n){for(var t,r=this;r instanceof Tn;){var e=qr(r);t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},Nn.prototype.reverse=function(){var n=this.__wrapped__,t=function(n){return n.reverse()};return n instanceof zn?(this.__actions__.length&&(n=new zn(this)),n=n.reverse(),n.__actions__.push({func:re,args:[t],thisArg:x}),new Pn(n,this.__chain__)):this.thru(t)},Nn.prototype.toString=function(){return this.value()+""},Nn.prototype.run=Nn.prototype.toJSON=Nn.prototype.valueOf=Nn.prototype.value=function(){return Pt(this.__wrapped__,this.__actions__)},Nn.prototype.collect=Nn.prototype.map,Nn.prototype.head=Nn.prototype.first,Nn.prototype.select=Nn.prototype.filter,Nn.prototype.tail=Nn.prototype.rest,Nn}var x,b="3.10.1",m=1,A=2,j=4,k=8,O=16,I=32,R=64,E=128,C=256,S=30,U="...",$=150,W=16,F=200,L=1,N=2,T="Expected a function",P="__lodash_placeholder__",z="[object Arguments]",B="[object Array]",D="[object Boolean]",M="[object Date]",q="[object Error]",K="[object Function]",V="[object Number]",Z="[object Object]",Y="[object RegExp]",G="[object String]",J="[object ArrayBuffer]",X="[object Float32Array]",H="[object Float64Array]",Q="[object Int8Array]",nn="[object Int16Array]",tn="[object Int32Array]",rn="[object Uint8Array]",en="[object Uint8ClampedArray]",un="[object Uint16Array]",on="[object Uint32Array]",fn=/\b__p\+='';/g,cn=/\b(__p\+=)''\+/g,an=/(__e\(.*?\)|\b__t\))\+'';/g,ln=/&(?:amp|lt|gt|quot|#39|#96);/g,sn=/[&<>"'`]/g,pn=RegExp(ln.source),hn=RegExp(sn.source),_n=/<%-([\s\S]+?)%>/g,vn=/<%([\s\S]+?)%>/g,gn=/<%=([\s\S]+?)%>/g,yn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,dn=/^\w*$/,wn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g,xn=/^[:!,]|[\\^$.*+?()[\]{}|\/]|(^[0-9a-fA-Fnrtuvx])|([\n\r\u2028\u2029])/g,bn=RegExp(xn.source),mn=/[\u0300-\u036f\ufe20-\ufe23]/g,An=/\\(\\)?/g,jn=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,kn=/\w*$/,On=/^0[xX]/,In=/^\[object .+?Constructor\]$/,Rn=/^\d+$/,En=/[\xc0-\xd6\xd8-\xde\xdf-\xf6\xf8-\xff]/g,Cn=/($^)/,Sn=/['\n\r\u2028\u2029\\]/g,Un=RegExp("[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?=[A-Z\\xc0-\\xd6\\xd8-\\xde][a-z\\xdf-\\xf6\\xf8-\\xff]+)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+|[A-Z\\xc0-\\xd6\\xd8-\\xde]+|[0-9]+","g"),$n="Array ArrayBuffer Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Math Number Object RegExp Set String _ clearTimeout isFinite parseFloat parseInt setTimeout TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap".split(" "),Wn="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),Fn={};Fn[X]=Fn[H]=Fn[Q]=Fn[nn]=Fn[tn]=Fn[rn]=Fn[en]=Fn[un]=Fn[on]=!0,Fn[z]=Fn[B]=Fn[J]=Fn[D]=Fn[M]=Fn[q]=Fn[K]=Fn["[object Map]"]=Fn[V]=Fn[Z]=Fn[Y]=Fn["[object Set]"]=Fn[G]=Fn["[object WeakMap]"]=!1;var Ln={};Ln[z]=Ln[B]=Ln[J]=Ln[D]=Ln[M]=Ln[X]=Ln[H]=Ln[Q]=Ln[nn]=Ln[tn]=Ln[V]=Ln[Z]=Ln[Y]=Ln[G]=Ln[rn]=Ln[en]=Ln[un]=Ln[on]=!0,Ln[q]=Ln[K]=Ln["[object Map]"]=Ln["[object Set]"]=Ln["[object WeakMap]"]=!1;var Nn={"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss"},Tn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","`":"&#96;"},Pn={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'","&#96;":"`"},zn={"function":!0,object:!0},Bn={0:"x30",1:"x31",2:"x32",3:"x33",4:"x34",5:"x35",6:"x36",7:"x37",8:"x38",9:"x39",A:"x41",B:"x42",C:"x43",D:"x44",E:"x45",F:"x46",a:"x61",b:"x62",c:"x63",d:"x64",e:"x65",f:"x66",n:"x6e",r:"x72",t:"x74",u:"x75",v:"x76",x:"x78"},Dn={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Mn=zn[typeof exports]&&exports&&!exports.nodeType&&exports,qn=zn[typeof module]&&module&&!module.nodeType&&module,Kn=zn[typeof self]&&self&&self.Object&&self,Vn=zn[typeof window]&&window&&window.Object&&window,Zn=qn&&qn.exports===Mn&&Mn,Yn=Mn&&qn&&"object"==typeof global&&global&&global.Object&&global||Vn!==(this&&this.window)&&Vn||Kn||this,Gn=function(){try{Object({toString:0}+"")}catch(n){return function(){return!1}}return function(n){return"function"!=typeof n.toString&&"string"==typeof(n+"")}}(),Jn=w();"function"==typeof define&&"object"==typeof define.amd&&define.amd?(Yn._=Jn,define(function(){return Jn})):Mn&&qn?Zn?(qn.exports=Jn)._=Jn:Mn._=Jn:Yn._=Jn}).call(this);
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js
deleted file mode 100644
index 87e1f85c9c95a..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js
+++ /dev/null
@@ -1,1274 +0,0 @@
-/**
- * marked - a markdown parser
- * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/chjj/marked
- *
- * Modified by Magento, Modifications Copyright © Magento.
- */
-
-;(function() {
-
-/**
- * Block-Level Grammar
- */
-
-var block = {
-  newline: /^\n+/,
-  code: /^( {4}[^\n]+\n*)+/,
-  fences: noop,
-  hr: /^( *[-*_]){3,} *(?:\n+|$)/,
-  heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
-  nptable: noop,
-  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-  blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
-  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-  html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
-  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
-  table: noop,
-  paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
-  text: /^[^\n]+/
-};
-
-block.bullet = /(?:[*+-]|\d+\.)/;
-block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
-block.item = replace(block.item, 'gm')
-  (/bull/g, block.bullet)
-  ();
-
-block.list = replace(block.list)
-  (/bull/g, block.bullet)
-  ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
-  ('def', '\\n+(?=' + block.def.source + ')')
-  ();
-
-block.blockquote = replace(block.blockquote)
-  ('def', block.def)
-  ();
-
-block._tag = '(?!(?:'
-  + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
-  + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
-  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
-
-block.html = replace(block.html)
-  ('comment', /<!--[\s\S]*?-->/)
-  ('closed', /<(tag)[\s\S]+?<\/\1>/)
-  ('closing', /<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)
-  (/tag/g, block._tag)
-  ();
-
-block.paragraph = replace(block.paragraph)
-  ('hr', block.hr)
-  ('heading', block.heading)
-  ('lheading', block.lheading)
-  ('blockquote', block.blockquote)
-  ('tag', '<' + block._tag)
-  ('def', block.def)
-  ();
-
-/**
- * Normal Block Grammar
- */
-
-block.normal = merge({}, block);
-
-/**
- * GFM Block Grammar
- */
-
-block.gfm = merge({}, block.normal, {
-  fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
-  paragraph: /^/
-});
-
-block.gfm.paragraph = replace(block.paragraph)
-  ('(?!', '(?!'
-    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
-    + block.list.source.replace('\\1', '\\3') + '|')
-  ();
-
-/**
- * GFM + Tables Block Grammar
- */
-
-block.tables = merge({}, block.gfm, {
-  nptable: /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,
-  table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
-});
-
-/**
- * Block Lexer
- */
-
-function Lexer(options) {
-  this.tokens = [];
-  this.tokens.links = {};
-  this.options = options || marked.defaults;
-  this.rules = block.normal;
-
-  if (this.options.gfm) {
-    if (this.options.tables) {
-      this.rules = block.tables;
-    } else {
-      this.rules = block.gfm;
-    }
-  }
-}
-
-/**
- * Expose Block Rules
- */
-
-Lexer.rules = block;
-
-/**
- * Static Lex Method
- */
-
-Lexer.lex = function(src, options) {
-  var lexer = new Lexer(options);
-  return lexer.lex(src);
-};
-
-/**
- * Preprocessing
- */
-
-Lexer.prototype.lex = function(src) {
-  src = src
-    .replace(/\r\n|\r/g, '\n')
-    .replace(/\t/g, '    ')
-    .replace(/\u00a0/g, ' ')
-    .replace(/\u2424/g, '\n');
-
-  return this.token(src, true);
-};
-
-/**
- * Lexing
- */
-
-Lexer.prototype.token = function(src, top, bq) {
-  var src = src.replace(/^ +$/gm, '')
-    , next
-    , loose
-    , cap
-    , bull
-    , b
-    , item
-    , space
-    , i
-    , l;
-
-  while (src) {
-    // newline
-    if (cap = this.rules.newline.exec(src)) {
-      src = src.substring(cap[0].length);
-      if (cap[0].length > 1) {
-        this.tokens.push({
-          type: 'space'
-        });
-      }
-    }
-
-    // code
-    if (cap = this.rules.code.exec(src)) {
-      src = src.substring(cap[0].length);
-      cap = cap[0].replace(/^ {4}/gm, '');
-      this.tokens.push({
-        type: 'code',
-        text: !this.options.pedantic
-          ? cap.replace(/\n+$/, '')
-          : cap
-      });
-      continue;
-    }
-
-    // fences (gfm)
-    if (cap = this.rules.fences.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'code',
-        lang: cap[2],
-        text: cap[3]
-      });
-      continue;
-    }
-
-    // heading
-    if (cap = this.rules.heading.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'heading',
-        depth: cap[1].length,
-        text: cap[2]
-      });
-      continue;
-    }
-
-    // table no leading pipe (gfm)
-    if (top && (cap = this.rules.nptable.exec(src))) {
-      src = src.substring(cap[0].length);
-
-      item = {
-        type: 'table',
-        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-        cells: cap[3].replace(/\n$/, '').split('\n')
-      };
-
-      for (i = 0; i < item.align.length; i++) {
-        if (/^ *-+: *$/.test(item.align[i])) {
-          item.align[i] = 'right';
-        } else if (/^ *:-+: *$/.test(item.align[i])) {
-          item.align[i] = 'center';
-        } else if (/^ *:-+ *$/.test(item.align[i])) {
-          item.align[i] = 'left';
-        } else {
-          item.align[i] = null;
-        }
-      }
-
-      for (i = 0; i < item.cells.length; i++) {
-        item.cells[i] = item.cells[i].split(/ *\| */);
-      }
-
-      this.tokens.push(item);
-
-      continue;
-    }
-
-    // lheading
-    if (cap = this.rules.lheading.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'heading',
-        depth: cap[2] === '=' ? 1 : 2,
-        text: cap[1]
-      });
-      continue;
-    }
-
-    // hr
-    if (cap = this.rules.hr.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'hr'
-      });
-      continue;
-    }
-
-    // blockquote
-    if (cap = this.rules.blockquote.exec(src)) {
-      src = src.substring(cap[0].length);
-
-      this.tokens.push({
-        type: 'blockquote_start'
-      });
-
-      cap = cap[0].replace(/^ *> ?/gm, '');
-
-      // Pass `top` to keep the current
-      // "toplevel" state. This is exactly
-      // how markdown.pl works.
-      this.token(cap, top, true);
-
-      this.tokens.push({
-        type: 'blockquote_end'
-      });
-
-      continue;
-    }
-
-    // list
-    if (cap = this.rules.list.exec(src)) {
-      src = src.substring(cap[0].length);
-      bull = cap[2];
-
-      this.tokens.push({
-        type: 'list_start',
-        ordered: bull.length > 1
-      });
-
-      // Get each top-level item.
-      cap = cap[0].match(this.rules.item);
-
-      next = false;
-      l = cap.length;
-      i = 0;
-
-      for (; i < l; i++) {
-        item = cap[i];
-
-        // Remove the list item's bullet
-        // so it is seen as the next token.
-        space = item.length;
-        item = item.replace(/^ *([*+-]|\d+\.) +/, '');
-
-        // Outdent whatever the
-        // list item contains. Hacky.
-        if (~item.indexOf('\n ')) {
-          space -= item.length;
-          item = !this.options.pedantic
-            ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
-            : item.replace(/^ {1,4}/gm, '');
-        }
-
-        // Determine whether the next list item belongs here.
-        // Backpedal if it does not belong in this list.
-        if (this.options.smartLists && i !== l - 1) {
-          b = block.bullet.exec(cap[i + 1])[0];
-          if (bull !== b && !(bull.length > 1 && b.length > 1)) {
-            src = cap.slice(i + 1).join('\n') + src;
-            i = l - 1;
-          }
-        }
-
-        // Determine whether item is loose or not.
-        // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
-        // for discount behavior.
-        loose = next || /\n\n(?!\s*$)/.test(item);
-        if (i !== l - 1) {
-          next = item.charAt(item.length - 1) === '\n';
-          if (!loose) loose = next;
-        }
-
-        this.tokens.push({
-          type: loose
-            ? 'loose_item_start'
-            : 'list_item_start'
-        });
-
-        // Recurse.
-        this.token(item, false, bq);
-
-        this.tokens.push({
-          type: 'list_item_end'
-        });
-      }
-
-      this.tokens.push({
-        type: 'list_end'
-      });
-
-      continue;
-    }
-
-    // html
-    if (cap = this.rules.html.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: this.options.sanitize
-          ? 'paragraph'
-          : 'html',
-        pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
-        text: cap[0]
-      });
-      continue;
-    }
-
-    // def
-    if ((!bq && top) && (cap = this.rules.def.exec(src))) {
-      src = src.substring(cap[0].length);
-      this.tokens.links[cap[1].toLowerCase()] = {
-        href: cap[2],
-        title: cap[3]
-      };
-      continue;
-    }
-
-    // table (gfm)
-    if (top && (cap = this.rules.table.exec(src))) {
-      src = src.substring(cap[0].length);
-
-      item = {
-        type: 'table',
-        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-        cells: cap[3].replace(/(?: *\| *)?\n$/, '').split('\n')
-      };
-
-      for (i = 0; i < item.align.length; i++) {
-        if (/^ *-+: *$/.test(item.align[i])) {
-          item.align[i] = 'right';
-        } else if (/^ *:-+: *$/.test(item.align[i])) {
-          item.align[i] = 'center';
-        } else if (/^ *:-+ *$/.test(item.align[i])) {
-          item.align[i] = 'left';
-        } else {
-          item.align[i] = null;
-        }
-      }
-
-      for (i = 0; i < item.cells.length; i++) {
-        item.cells[i] = item.cells[i]
-          .replace(/^ *\| *| *\| *$/g, '')
-          .split(/ *\| */);
-      }
-
-      this.tokens.push(item);
-
-      continue;
-    }
-
-    // top-level paragraph
-    if (top && (cap = this.rules.paragraph.exec(src))) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'paragraph',
-        text: cap[1].charAt(cap[1].length - 1) === '\n'
-          ? cap[1].slice(0, -1)
-          : cap[1]
-      });
-      continue;
-    }
-
-    // text
-    if (cap = this.rules.text.exec(src)) {
-      // Top-level should never reach here.
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'text',
-        text: cap[0]
-      });
-      continue;
-    }
-
-    if (src) {
-      throw new
-        Error('Infinite loop on byte: ' + src.charCodeAt(0));
-    }
-  }
-
-  return this.tokens;
-};
-
-/**
- * Inline-Level Grammar
- */
-
-var inline = {
-  escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
-  autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
-  url: noop,
-  tag: /^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,
-  link: /^!?\[(inside)\]\(href\)/,
-  reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
-  nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
-  strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
-  em: /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
-  br: /^ {2,}\n(?!\s*$)/,
-  del: noop,
-  text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
-};
-
-inline._inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
-inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
-
-inline.link = replace(inline.link)
-  ('inside', inline._inside)
-  ('href', inline._href)
-  ();
-
-inline.reflink = replace(inline.reflink)
-  ('inside', inline._inside)
-  ();
-
-/**
- * Normal Inline Grammar
- */
-
-inline.normal = merge({}, inline);
-
-/**
- * Pedantic Inline Grammar
- */
-
-inline.pedantic = merge({}, inline.normal, {
-  strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
-  em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/
-});
-
-/**
- * GFM Inline Grammar
- */
-
-inline.gfm = merge({}, inline.normal, {
-  escape: replace(inline.escape)('])', '~|])')(),
-  url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
-  del: /^~~(?=\S)([\s\S]*?\S)~~/,
-  text: replace(inline.text)
-    (']|', '~]|')
-    ('|', '|https?://|')
-    ()
-});
-
-/**
- * GFM + Line Breaks Inline Grammar
- */
-
-inline.breaks = merge({}, inline.gfm, {
-  br: replace(inline.br)('{2,}', '*')(),
-  text: replace(inline.gfm.text)('{2,}', '*')()
-});
-
-/**
- * Inline Lexer & Compiler
- */
-
-function InlineLexer(links, options) {
-  this.options = options || marked.defaults;
-  this.links = links;
-  this.rules = inline.normal;
-  this.renderer = this.options.renderer || new Renderer;
-  this.renderer.options = this.options;
-
-  if (!this.links) {
-    throw new
-      Error('Tokens array requires a `links` property.');
-  }
-
-  if (this.options.gfm) {
-    if (this.options.breaks) {
-      this.rules = inline.breaks;
-    } else {
-      this.rules = inline.gfm;
-    }
-  } else if (this.options.pedantic) {
-    this.rules = inline.pedantic;
-  }
-}
-
-/**
- * Expose Inline Rules
- */
-
-InlineLexer.rules = inline;
-
-/**
- * Static Lexing/Compiling Method
- */
-
-InlineLexer.output = function(src, links, options) {
-  var inline = new InlineLexer(links, options);
-  return inline.output(src);
-};
-
-/**
- * Lexing/Compiling
- */
-
-InlineLexer.prototype.output = function(src) {
-  var out = ''
-    , link
-    , text
-    , href
-    , cap;
-
-  while (src) {
-    // escape
-    if (cap = this.rules.escape.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += cap[1];
-      continue;
-    }
-
-    // autolink
-    if (cap = this.rules.autolink.exec(src)) {
-      src = src.substring(cap[0].length);
-      if (cap[2] === '@') {
-        text = cap[1].charAt(6) === ':'
-          ? this.mangle(cap[1].substring(7))
-          : this.mangle(cap[1]);
-        href = this.mangle('mailto:') + text;
-      } else {
-        text = escape(cap[1]);
-        href = text;
-      }
-      out += this.renderer.link(href, null, text);
-      continue;
-    }
-
-    // url (gfm)
-    if (!this.inLink && (cap = this.rules.url.exec(src))) {
-      src = src.substring(cap[0].length);
-      text = escape(cap[1]);
-      href = text;
-      out += this.renderer.link(href, null, text);
-      continue;
-    }
-
-    // tag
-    if (cap = this.rules.tag.exec(src)) {
-      if (!this.inLink && /^<a /i.test(cap[0])) {
-        this.inLink = true;
-      } else if (this.inLink && /^<\/a>/i.test(cap[0])) {
-        this.inLink = false;
-      }
-      src = src.substring(cap[0].length);
-      out += this.options.sanitize
-        ? escape(cap[0])
-        : cap[0];
-      continue;
-    }
-
-    // link
-    if (cap = this.rules.link.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.inLink = true;
-      out += this.outputLink(cap, {
-        href: cap[2],
-        title: cap[3]
-      });
-      this.inLink = false;
-      continue;
-    }
-
-    // reflink, nolink
-    if ((cap = this.rules.reflink.exec(src))
-        || (cap = this.rules.nolink.exec(src))) {
-      src = src.substring(cap[0].length);
-      link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
-      link = this.links[link.toLowerCase()];
-      if (!link || !link.href) {
-        out += cap[0].charAt(0);
-        src = cap[0].substring(1) + src;
-        continue;
-      }
-      this.inLink = true;
-      out += this.outputLink(cap, link);
-      this.inLink = false;
-      continue;
-    }
-
-    // strong
-    if (cap = this.rules.strong.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.strong(this.output(cap[2] || cap[1]));
-      continue;
-    }
-
-    // em
-    if (cap = this.rules.em.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.em(this.output(cap[2] || cap[1]));
-      continue;
-    }
-
-    // code
-    if (cap = this.rules.code.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.codespan(escape(cap[2], true));
-      continue;
-    }
-
-    // br
-    if (cap = this.rules.br.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.br();
-      continue;
-    }
-
-    // del (gfm)
-    if (cap = this.rules.del.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.del(this.output(cap[1]));
-      continue;
-    }
-
-    // text
-    if (cap = this.rules.text.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += escape(this.smartypants(cap[0]));
-      continue;
-    }
-
-    if (src) {
-      throw new
-        Error('Infinite loop on byte: ' + src.charCodeAt(0));
-    }
-  }
-
-  return out;
-};
-
-/**
- * Compile Link
- */
-
-InlineLexer.prototype.outputLink = function(cap, link) {
-  var href = escape(link.href)
-    , title = link.title ? escape(link.title) : null;
-
-  return cap[0].charAt(0) !== '!'
-    ? this.renderer.link(href, title, this.output(cap[1]))
-    : this.renderer.image(href, title, escape(cap[1]));
-};
-
-/**
- * Smartypants Transformations
- */
-
-InlineLexer.prototype.smartypants = function(text) {
-  if (!this.options.smartypants) return text;
-  return text
-    // em-dashes
-    .replace('/--/g', '\u2014')
-    // opening singles
-    .replace('/(^|[-\u2014/(\[{"\s])\'/g', '$1\u2018')
-    // closing singles & apostrophes
-    .replace('/\'/g', '\u2019')
-    // opening doubles
-    .replace('/(^|[-\u2014/(\[{\u2018\s])"/g', '$1\u201c')
-    // closing doubles
-    .replace('/"/g', '\u201d')
-    // ellipses
-    .replace('/\.{3}/g', '\u2026');
-};
-
-/**
- * Mangle Links
- */
-
-InlineLexer.prototype.mangle = function(text) {
-  var out = ''
-    , l = text.length
-    , i = 0
-    , ch;
-
-  for (; i < l; i++) {
-    ch = text.charCodeAt(i);
-    if (Math.random() > 0.5) {
-      ch = 'x' + ch.toString(16);
-    }
-    out += '&#' + ch + ';';
-  }
-
-  return out;
-};
-
-/**
- * Renderer
- */
-
-function Renderer(options) {
-  this.options = options || {};
-}
-
-Renderer.prototype.code = function(code, lang, escaped) {
-  if (this.options.highlight) {
-    var out = this.options.highlight(code, lang);
-    if (out != null && out !== code) {
-      escaped = true;
-      code = out;
-    }
-  }
-
-  if (!lang) {
-    return '<pre><code>'
-      + (escaped ? code : escape(code, true))
-      + '\n</code></pre>';
-  }
-
-  return '<pre><code class="'
-    + this.options.langPrefix
-    + escape(lang, true)
-    + '">'
-    + (escaped ? code : escape(code, true))
-    + '\n</code></pre>\n';
-};
-
-Renderer.prototype.blockquote = function(quote) {
-  return '<blockquote>\n' + quote + '</blockquote>\n';
-};
-
-Renderer.prototype.html = function(html) {
-  return html;
-};
-
-Renderer.prototype.heading = function(text, level, raw) {
-  return '<h'
-    + level
-    + ' id="'
-    + this.options.headerPrefix
-    + raw.toLowerCase().replace(/[^\w]+/g, '-')
-    + '">'
-    + text
-    + '</h'
-    + level
-    + '>\n';
-};
-
-Renderer.prototype.hr = function() {
-  return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
-};
-
-Renderer.prototype.list = function(body, ordered) {
-  var type = ordered ? 'ol' : 'ul';
-  return '<' + type + '>\n' + body + '</' + type + '>\n';
-};
-
-Renderer.prototype.listitem = function(text) {
-  return '<li>' + text + '</li>\n';
-};
-
-Renderer.prototype.paragraph = function(text) {
-  return '<p>' + text + '</p>\n';
-};
-
-Renderer.prototype.table = function(header, body) {
-  return '<table>\n'
-    + '<thead>\n'
-    + header
-    + '</thead>\n'
-    + '<tbody>\n'
-    + body
-    + '</tbody>\n'
-    + '</table>\n';
-};
-
-Renderer.prototype.tablerow = function(content) {
-  return '<tr>\n' + content + '</tr>\n';
-};
-
-Renderer.prototype.tablecell = function(content, flags) {
-  var type = flags.header ? 'th' : 'td';
-  var tag = flags.align
-    ? '<' + type + ' style="text-align:' + flags.align + '">'
-    : '<' + type + '>';
-  return tag + content + '</' + type + '>\n';
-};
-
-// span level renderer
-Renderer.prototype.strong = function(text) {
-  return '<strong>' + text + '</strong>';
-};
-
-Renderer.prototype.em = function(text) {
-  return '<em>' + text + '</em>';
-};
-
-Renderer.prototype.codespan = function(text) {
-  return '<code>' + text + '</code>';
-};
-
-Renderer.prototype.br = function() {
-  return this.options.xhtml ? '<br/>' : '<br>';
-};
-
-Renderer.prototype.del = function(text) {
-  return '<del>' + text + '</del>';
-};
-
-Renderer.prototype.link = function(href, title, text) {
-  if (this.options.sanitize) {
-    try {
-      var prot = decodeURIComponent(unescape(href))
-        .replace(/[^\w:]/g, '')
-        .toLowerCase();
-    } catch (e) {
-      return '';
-    }
-    if (prot.indexOf('javascript:') === 0) {
-      return '';
-    }
-  }
-  var out = '<a href="' + href + '"';
-  if (title) {
-    out += ' title="' + title + '"';
-  }
-  out += '>' + text + '</a>';
-  return out;
-};
-
-Renderer.prototype.image = function(href, title, text) {
-  var out = '<img src="' + href + '" alt="' + text + '"';
-  if (title) {
-    out += ' title="' + title + '"';
-  }
-  out += this.options.xhtml ? '/>' : '>';
-  return out;
-};
-
-/**
- * Parsing & Compiling
- */
-
-function Parser(options) {
-  this.tokens = [];
-  this.token = null;
-  this.options = options || marked.defaults;
-  this.options.renderer = this.options.renderer || new Renderer;
-  this.renderer = this.options.renderer;
-  this.renderer.options = this.options;
-}
-
-/**
- * Static Parse Method
- */
-
-Parser.parse = function(src, options, renderer) {
-  var parser = new Parser(options, renderer);
-  return parser.parse(src);
-};
-
-/**
- * Parse Loop
- */
-
-Parser.prototype.parse = function(src) {
-  this.inline = new InlineLexer(src.links, this.options, this.renderer);
-  this.tokens = src.reverse();
-
-  var out = '';
-  while (this.next()) {
-    out += this.tok();
-  }
-
-  return out;
-};
-
-/**
- * Next Token
- */
-
-Parser.prototype.next = function() {
-  return this.token = this.tokens.pop();
-};
-
-/**
- * Preview Next Token
- */
-
-Parser.prototype.peek = function() {
-  return this.tokens[this.tokens.length - 1] || 0;
-};
-
-/**
- * Parse Text Tokens
- */
-
-Parser.prototype.parseText = function() {
-  var body = this.token.text;
-
-  while (this.peek().type === 'text') {
-    body += '\n' + this.next().text;
-  }
-
-  return this.inline.output(body);
-};
-
-/**
- * Parse Current Token
- */
-
-Parser.prototype.tok = function() {
-  switch (this.token.type) {
-    case 'space': {
-      return '';
-    }
-    case 'hr': {
-      return this.renderer.hr();
-    }
-    case 'heading': {
-      return this.renderer.heading(
-        this.inline.output(this.token.text),
-        this.token.depth,
-        this.token.text);
-    }
-    case 'code': {
-      return this.renderer.code(this.token.text,
-        this.token.lang,
-        this.token.escaped);
-    }
-    case 'table': {
-      var header = ''
-        , body = ''
-        , i
-        , row
-        , cell
-        , flags
-        , j;
-
-      // header
-      cell = '';
-      for (i = 0; i < this.token.header.length; i++) {
-        flags = { header: true, align: this.token.align[i] };
-        cell += this.renderer.tablecell(
-          this.inline.output(this.token.header[i]),
-          { header: true, align: this.token.align[i] }
-        );
-      }
-      header += this.renderer.tablerow(cell);
-
-      for (i = 0; i < this.token.cells.length; i++) {
-        row = this.token.cells[i];
-
-        cell = '';
-        for (j = 0; j < row.length; j++) {
-          cell += this.renderer.tablecell(
-            this.inline.output(row[j]),
-            { header: false, align: this.token.align[j] }
-          );
-        }
-
-        body += this.renderer.tablerow(cell);
-      }
-      return this.renderer.table(header, body);
-    }
-    case 'blockquote_start': {
-      var body = '';
-
-      while (this.next().type !== 'blockquote_end') {
-        body += this.tok();
-      }
-
-      return this.renderer.blockquote(body);
-    }
-    case 'list_start': {
-      var body = ''
-        , ordered = this.token.ordered;
-
-      while (this.next().type !== 'list_end') {
-        body += this.tok();
-      }
-
-      return this.renderer.list(body, ordered);
-    }
-    case 'list_item_start': {
-      var body = '';
-
-      while (this.next().type !== 'list_item_end') {
-        body += this.token.type === 'text'
-          ? this.parseText()
-          : this.tok();
-      }
-
-      return this.renderer.listitem(body);
-    }
-    case 'loose_item_start': {
-      var body = '';
-
-      while (this.next().type !== 'list_item_end') {
-        body += this.tok();
-      }
-
-      return this.renderer.listitem(body);
-    }
-    case 'html': {
-      var html = !this.token.pre && !this.options.pedantic
-        ? this.inline.output(this.token.text)
-        : this.token.text;
-      return this.renderer.html(html);
-    }
-    case 'paragraph': {
-      return this.renderer.paragraph(this.inline.output(this.token.text));
-    }
-    case 'text': {
-      return this.renderer.paragraph(this.parseText());
-    }
-  }
-};
-
-/**
- * Helpers
- */
-
-function escape(html, encode) {
-  return html
-    .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}
-
-function unescape(html) {
-  return html.replace(/&([#\w]+);/g, function(_, n) {
-    n = n.toLowerCase();
-    if (n === 'colon') return ':';
-    if (n.charAt(0) === '#') {
-      return n.charAt(1) === 'x'
-        ? String.fromCharCode(parseInt(n.substring(2), 16))
-        : String.fromCharCode(+n.substring(1));
-    }
-    return '';
-  });
-}
-
-function replace(regex, opt) {
-  regex = regex.source;
-  opt = opt || '';
-  return function self(name, val) {
-    if (!name) return new RegExp(regex, opt);
-    val = val.source || val;
-    val = val.replace(/(^|[^\[])\^/g, '$1');
-    regex = regex.replace(name, val);
-    return self;
-  };
-}
-
-function noop() {}
-noop.exec = noop;
-
-function merge(obj) {
-  var i = 1
-    , target
-    , key;
-
-  for (; i < arguments.length; i++) {
-    target = arguments[i];
-    for (key in target) {
-      if (Object.prototype.hasOwnProperty.call(target, key)) {
-        obj[key] = target[key];
-      }
-    }
-  }
-
-  return obj;
-}
-
-
-/**
- * Marked
- */
-
-function marked(src, opt, callback) {
-  if (callback || typeof opt === 'function') {
-    if (!callback) {
-      callback = opt;
-      opt = null;
-    }
-
-    opt = merge({}, marked.defaults, opt || {});
-
-    var highlight = opt.highlight
-      , tokens
-      , pending
-      , i = 0;
-
-    try {
-      tokens = Lexer.lex(src, opt)
-    } catch (e) {
-      return callback(e);
-    }
-
-    pending = tokens.length;
-
-    var done = function(err) {
-      if (err) {
-        opt.highlight = highlight;
-        return callback(err);
-      }
-
-      var out;
-
-      try {
-        out = Parser.parse(tokens, opt);
-      } catch (e) {
-        err = e;
-      }
-
-      opt.highlight = highlight;
-
-      return err
-        ? callback(err)
-        : callback(null, out);
-    };
-
-    if (!highlight || highlight.length < 3) {
-      return done();
-    }
-
-    delete opt.highlight;
-
-    if (!pending) return done();
-
-    for (; i < tokens.length; i++) {
-      (function(token) {
-        if (token.type !== 'code') {
-          return --pending || done();
-        }
-        return highlight(token.text, token.lang, function(err, code) {
-          if (err) return done(err);
-          if (code == null || code === token.text) {
-            return --pending || done();
-          }
-          token.text = code;
-          token.escaped = true;
-          --pending || done();
-        });
-      })(tokens[i]);
-    }
-
-    return;
-  }
-  try {
-    if (opt) opt = merge({}, marked.defaults, opt);
-    return Parser.parse(Lexer.lex(src, opt), opt);
-  } catch (e) {
-    e.message += '\nPlease report this to https://github.com/chjj/marked.';
-    if ((opt || marked.defaults).silent) {
-      return '<p>An error occured:</p><pre>'
-        + escape(e.message + '', true)
-        + '</pre>';
-    }
-    throw e;
-  }
-}
-
-/**
- * Options
- */
-
-marked.options =
-marked.setOptions = function(opt) {
-  merge(marked.defaults, opt);
-  return marked;
-};
-
-marked.defaults = {
-  gfm: true,
-  tables: true,
-  breaks: false,
-  pedantic: false,
-  sanitize: false,
-  smartLists: false,
-  silent: false,
-  highlight: null,
-  langPrefix: 'lang-',
-  smartypants: false,
-  headerPrefix: '',
-  renderer: new Renderer,
-  xhtml: false
-};
-
-/**
- * Expose
- */
-
-marked.Parser = Parser;
-marked.parser = Parser.parse;
-
-marked.Renderer = Renderer;
-
-marked.Lexer = Lexer;
-marked.lexer = Lexer.lex;
-
-marked.InlineLexer = InlineLexer;
-marked.inlineLexer = InlineLexer.output;
-
-marked.parse = marked;
-
-if (typeof module !== 'undefined' && typeof exports === 'object') {
-  module.exports = marked;
-} else if (typeof define === 'function' && define.amd) {
-  define(function() { return marked; });
-} else {
-  this.marked = marked;
-}
-
-}).call(function() {
-  return this || (typeof window !== 'undefined' ? window : global);
-}());
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/object-assign-pollyfill.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/object-assign-pollyfill.js
deleted file mode 100644
index b34d63c859d99..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/object-assign-pollyfill.js
+++ /dev/null
@@ -1 +0,0 @@
-"function"!=typeof Object.assign&&!function(){Object.assign=function(n){"use strict";if(void 0===n||null===n)throw new TypeError("Cannot convert undefined or null to object");for(var t=Object(n),o=1;o<arguments.length;o++){var r=arguments[o];if(void 0!==r&&null!==r)for(var e in r)Object.prototype.hasOwnProperty.call(r,e)&&(t[e]=r[e])}return t}}();
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/swagger-oauth.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/swagger-oauth.js
deleted file mode 100644
index 3bf32647edb72..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/swagger-oauth.js
+++ /dev/null
@@ -1,290 +0,0 @@
-var appName;
-var popupMask;
-var popupDialog;
-var clientId;
-var realm;
-var oauth2KeyName;
-var redirect_uri;
-var clientSecret;
-var scopeSeparator;
-
-function handleLogin() {
-  var scopes = [];
-
-  var auths = window.swaggerUi.api.authSchemes || window.swaggerUi.api.securityDefinitions;
-  if(auths) {
-    var key;
-    var defs = auths;
-    for(key in defs) {
-      var auth = defs[key];
-      if(auth.type === 'oauth2' && auth.scopes) {
-        oauth2KeyName = key;
-        var scope;
-        if(Array.isArray(auth.scopes)) {
-          // 1.2 support
-          var i;
-          for(i = 0; i < auth.scopes.length; i++) {
-            scopes.push(auth.scopes[i]);
-          }
-        }
-        else {
-          // 2.0 support
-          for(scope in auth.scopes) {
-            scopes.push({scope: scope, description: auth.scopes[scope]});
-          }
-        }
-      }
-    }
-  }
-
-  if(window.swaggerUi.api
-    && window.swaggerUi.api.info) {
-    appName = window.swaggerUi.api.info.title;
-  }
-
-  $('.api-popup-dialog').remove(); 
-  popupDialog = $(
-    [
-      '<div class="api-popup-dialog">',
-      '<div class="api-popup-title">Select OAuth2.0 Scopes</div>',
-      '<div class="api-popup-content">',
-        '<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
-          '<a href="#">Learn how to use</a>',
-        '</p>',
-        '<p><strong>' + appName + '</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>',
-        '<ul class="api-popup-scopes">',
-        '</ul>',
-        '<p class="error-msg"></p>',
-        '<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',
-      '</div>',
-      '</div>'].join(''));
-  $(document.body).append(popupDialog);
-
-  popup = popupDialog.find('ul.api-popup-scopes').empty();
-  for (i = 0; i < scopes.length; i ++) {
-    scope = scopes[i];
-    str = '<li><input type="checkbox" id="scope_' + i + '" scope="' + scope.scope + '"/>' + '<label for="scope_' + i + '">' + scope.scope;
-    if (scope.description) {
-      str += '<br/><span class="api-scope-desc">' + scope.description + '</span>';
-    }
-    str += '</label></li>';
-    popup.append(str);
-  }
-
-  var $win = $(window),
-    dw = $win.width(),
-    dh = $win.height(),
-    st = $win.scrollTop(),
-    dlgWd = popupDialog.outerWidth(),
-    dlgHt = popupDialog.outerHeight(),
-    top = (dh -dlgHt)/2 + st,
-    left = (dw - dlgWd)/2;
-
-  popupDialog.css({
-    top: (top < 0? 0 : top) + 'px',
-    left: (left < 0? 0 : left) + 'px'
-  });
-
-  popupDialog.find('button.api-popup-cancel').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-    popupDialog.empty();
-    popupDialog = [];
-  });
-
-  $('button.api-popup-authbtn').unbind();
-  popupDialog.find('button.api-popup-authbtn').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-
-    var authSchemes = window.swaggerUi.api.authSchemes;
-    var host = window.location;
-    var pathname = location.pathname.substring(0, location.pathname.lastIndexOf("/"));
-    var defaultRedirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';
-    var redirectUrl = window.oAuthRedirectUrl || defaultRedirectUrl;
-    var url = null;
-
-    for (var key in authSchemes) {
-      if (authSchemes.hasOwnProperty(key)) {
-        var flow = authSchemes[key].flow;
-
-        if(authSchemes[key].type === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {
-          var dets = authSchemes[key];
-          url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');
-          window.swaggerUi.tokenName = dets.tokenName || 'access_token';
-          window.swaggerUi.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);
-        }
-        else if(authSchemes[key].grantTypes) {
-          // 1.2 support
-          var o = authSchemes[key].grantTypes;
-          for(var t in o) {
-            if(o.hasOwnProperty(t) && t === 'implicit') {
-              var dets = o[t];
-              var ep = dets.loginEndpoint.url;
-              url = dets.loginEndpoint.url + '?response_type=token';
-              window.swaggerUi.tokenName = dets.tokenName;
-            }
-            else if (o.hasOwnProperty(t) && t === 'accessCode') {
-              var dets = o[t];
-              var ep = dets.tokenRequestEndpoint.url;
-              url = dets.tokenRequestEndpoint.url + '?response_type=code';
-              window.swaggerUi.tokenName = dets.tokenName;
-            }
-          }
-        }
-      }
-    }
-    var scopes = []
-    var o = $('.api-popup-scopes').find('input:checked');
-
-    for(k =0; k < o.length; k++) {
-      var scope = $(o[k]).attr('scope');
-
-      if (scopes.indexOf(scope) === -1)
-        scopes.push(scope);
-    }
-
-    // Implicit auth recommends a state parameter.
-    var state = Math.random ();
-
-    window.enabledScopes=scopes;
-
-    redirect_uri = redirectUrl;
-
-    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-    url += '&realm=' + encodeURIComponent(realm);
-    url += '&client_id=' + encodeURIComponent(clientId);
-    url += '&scope=' + encodeURIComponent(scopes.join(scopeSeparator));
-    url += '&state=' + encodeURIComponent(state);
-
-    window.open(url);
-  });
-
-  popupMask.show();
-  popupDialog.show();
-  return;
-}
-
-
-function handleLogout() {
-  for(key in window.authorizations.authz){
-    window.authorizations.remove(key)
-  }
-  window.enabledScopes = null;
-  $('.api-ic.ic-on').addClass('ic-off');
-  $('.api-ic.ic-on').removeClass('ic-on');
-
-  // set the info box
-  $('.api-ic.ic-warning').addClass('ic-error');
-  $('.api-ic.ic-warning').removeClass('ic-warning');
-}
-
-function initOAuth(opts) {
-  var o = (opts||{});
-  var errors = [];
-
-  appName = (o.appName||errors.push('missing appName'));
-  popupMask = (o.popupMask||$('#api-common-mask'));
-  popupDialog = (o.popupDialog||$('.api-popup-dialog'));
-  clientId = (o.clientId||errors.push('missing client id'));
-  clientSecret = (o.clientSecret||errors.push('missing client secret'));
-  realm = (o.realm||errors.push('missing realm'));
-  scopeSeparator = (o.scopeSeparator||' ');
-
-  if(errors.length > 0){
-    log('auth unable initialize oauth: ' + errors);
-    return;
-  }
-
-  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
-  $('.api-ic').unbind();
-  $('.api-ic').click(function(s) {
-    if($(s.target).hasClass('ic-off'))
-      handleLogin();
-    else {
-      handleLogout();
-    }
-    false;
-  });
-}
-
-window.processOAuthCode = function processOAuthCode(data) {
-  var params = {
-    'client_id': clientId,
-    'client_secret': clientSecret,
-    'code': data.code,
-    'grant_type': 'authorization_code',
-    'redirect_uri': redirect_uri
-  }
-  $.ajax(
-  {
-    url : window.swaggerUi.tokenUrl,
-    type: "POST",
-    data: params,
-    success:function(data, textStatus, jqXHR)
-    {
-      onOAuthComplete(data);
-    },
-    error: function(jqXHR, textStatus, errorThrown)
-    {
-      onOAuthComplete("");
-    }
-  });
-}
-
-window.onOAuthComplete = function onOAuthComplete(token) {
-  if(token) {
-    if(token.error) {
-      var checkbox = $('input[type=checkbox],.secured')
-      checkbox.each(function(pos){
-        checkbox[pos].checked = false;
-      });
-      alert(token.error);
-    }
-    else {
-      var b = token[window.swaggerUi.tokenName];
-      if(b){
-        // if all roles are satisfied
-        var o = null;
-        $.each($('.auth .api-ic .api_information_panel'), function(k, v) {
-          var children = v;
-          if(children && children.childNodes) {
-            var requiredScopes = [];
-            $.each((children.childNodes), function (k1, v1){
-              var inner = v1.innerHTML;
-              if(inner)
-                requiredScopes.push(inner);
-            });
-            var diff = [];
-            for(var i=0; i < requiredScopes.length; i++) {
-              var s = requiredScopes[i];
-              if(window.enabledScopes && window.enabledScopes.indexOf(s) == -1) {
-                diff.push(s);
-              }
-            }
-            if(diff.length > 0){
-              o = v.parentNode.parentNode;
-              $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off');
-              $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on');
-
-              // sorry, not all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');
-            }
-            else {
-              o = v.parentNode.parentNode;
-              $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on');
-              $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off');
-
-              // all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-info');
-              $(o).find('.api-ic').removeClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');
-            }
-          }
-        });
-        window.swaggerUi.api.clientAuthorizations.add(oauth2KeyName, new SwaggerClient.ApiKeyAuthorization('Authorization', 'Bearer ' + b, 'header'));
-      }
-    }
-  }
-}
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.js
deleted file mode 100644
index 11f1d96f53308..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//     Underscore.js 1.7.0
-//     http://underscorejs.org
-//     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
-//     Underscore may be freely distributed under the MIT license.
-(function(){var n=this,t=n._,r=Array.prototype,e=Object.prototype,u=Function.prototype,i=r.push,a=r.slice,o=r.concat,l=e.toString,c=e.hasOwnProperty,f=Array.isArray,s=Object.keys,p=u.bind,h=function(n){return n instanceof h?n:this instanceof h?void(this._wrapped=n):new h(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=h),exports._=h):n._=h,h.VERSION="1.7.0";var g=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}};h.iteratee=function(n,t,r){return null==n?h.identity:h.isFunction(n)?g(n,t,r):h.isObject(n)?h.matches(n):h.property(n)},h.each=h.forEach=function(n,t,r){if(null==n)return n;t=g(t,r);var e,u=n.length;if(u===+u)for(e=0;u>e;e++)t(n[e],e,n);else{var i=h.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},h.map=h.collect=function(n,t,r){if(null==n)return[];t=h.iteratee(t,r);for(var e,u=n.length!==+n.length&&h.keys(n),i=(u||n).length,a=Array(i),o=0;i>o;o++)e=u?u[o]:o,a[o]=t(n[e],e,n);return a};var v="Reduce of empty array with no initial value";h.reduce=h.foldl=h.inject=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length,o=0;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[o++]:o++]}for(;a>o;o++)u=i?i[o]:o,r=t(r,n[u],u,n);return r},h.reduceRight=h.foldr=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[--a]:--a]}for(;a--;)u=i?i[a]:a,r=t(r,n[u],u,n);return r},h.find=h.detect=function(n,t,r){var e;return t=h.iteratee(t,r),h.some(n,function(n,r,u){return t(n,r,u)?(e=n,!0):void 0}),e},h.filter=h.select=function(n,t,r){var e=[];return null==n?e:(t=h.iteratee(t,r),h.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e)},h.reject=function(n,t,r){return h.filter(n,h.negate(h.iteratee(t)),r)},h.every=h.all=function(n,t,r){if(null==n)return!0;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,!t(n[u],u,n))return!1;return!0},h.some=h.any=function(n,t,r){if(null==n)return!1;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,t(n[u],u,n))return!0;return!1},h.contains=h.include=function(n,t){return null==n?!1:(n.length!==+n.length&&(n=h.values(n)),h.indexOf(n,t)>=0)},h.invoke=function(n,t){var r=a.call(arguments,2),e=h.isFunction(t);return h.map(n,function(n){return(e?t:n[t]).apply(n,r)})},h.pluck=function(n,t){return h.map(n,h.property(t))},h.where=function(n,t){return h.filter(n,h.matches(t))},h.findWhere=function(n,t){return h.find(n,h.matches(t))},h.max=function(n,t,r){var e,u,i=-1/0,a=-1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],e>i&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(u>a||u===-1/0&&i===-1/0)&&(i=n,a=u)});return i},h.min=function(n,t,r){var e,u,i=1/0,a=1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],i>e&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(a>u||1/0===u&&1/0===i)&&(i=n,a=u)});return i},h.shuffle=function(n){for(var t,r=n&&n.length===+n.length?n:h.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=h.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},h.sample=function(n,t,r){return null==t||r?(n.length!==+n.length&&(n=h.values(n)),n[h.random(n.length-1)]):h.shuffle(n).slice(0,Math.max(0,t))},h.sortBy=function(n,t,r){return t=h.iteratee(t,r),h.pluck(h.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var m=function(n){return function(t,r,e){var u={};return r=h.iteratee(r,e),h.each(t,function(e,i){var a=r(e,i,t);n(u,e,a)}),u}};h.groupBy=m(function(n,t,r){h.has(n,r)?n[r].push(t):n[r]=[t]}),h.indexBy=m(function(n,t,r){n[r]=t}),h.countBy=m(function(n,t,r){h.has(n,r)?n[r]++:n[r]=1}),h.sortedIndex=function(n,t,r,e){r=h.iteratee(r,e,1);for(var u=r(t),i=0,a=n.length;a>i;){var o=i+a>>>1;r(n[o])<u?i=o+1:a=o}return i},h.toArray=function(n){return n?h.isArray(n)?a.call(n):n.length===+n.length?h.map(n,h.identity):h.values(n):[]},h.size=function(n){return null==n?0:n.length===+n.length?n.length:h.keys(n).length},h.partition=function(n,t,r){t=h.iteratee(t,r);var e=[],u=[];return h.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},h.first=h.head=h.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:0>t?[]:a.call(n,0,t)},h.initial=function(n,t,r){return a.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},h.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:a.call(n,Math.max(n.length-t,0))},h.rest=h.tail=h.drop=function(n,t,r){return a.call(n,null==t||r?1:t)},h.compact=function(n){return h.filter(n,h.identity)};var y=function(n,t,r,e){if(t&&h.every(n,h.isArray))return o.apply(e,n);for(var u=0,a=n.length;a>u;u++){var l=n[u];h.isArray(l)||h.isArguments(l)?t?i.apply(e,l):y(l,t,r,e):r||e.push(l)}return e};h.flatten=function(n,t){return y(n,t,!1,[])},h.without=function(n){return h.difference(n,a.call(arguments,1))},h.uniq=h.unique=function(n,t,r,e){if(null==n)return[];h.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=h.iteratee(r,e));for(var u=[],i=[],a=0,o=n.length;o>a;a++){var l=n[a];if(t)a&&i===l||u.push(l),i=l;else if(r){var c=r(l,a,n);h.indexOf(i,c)<0&&(i.push(c),u.push(l))}else h.indexOf(u,l)<0&&u.push(l)}return u},h.union=function(){return h.uniq(y(arguments,!0,!0,[]))},h.intersection=function(n){if(null==n)return[];for(var t=[],r=arguments.length,e=0,u=n.length;u>e;e++){var i=n[e];if(!h.contains(t,i)){for(var a=1;r>a&&h.contains(arguments[a],i);a++);a===r&&t.push(i)}}return t},h.difference=function(n){var t=y(a.call(arguments,1),!0,!0,[]);return h.filter(n,function(n){return!h.contains(t,n)})},h.zip=function(n){if(null==n)return[];for(var t=h.max(arguments,"length").length,r=Array(t),e=0;t>e;e++)r[e]=h.pluck(arguments,e);return r},h.object=function(n,t){if(null==n)return{};for(var r={},e=0,u=n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},h.indexOf=function(n,t,r){if(null==n)return-1;var e=0,u=n.length;if(r){if("number"!=typeof r)return e=h.sortedIndex(n,t),n[e]===t?e:-1;e=0>r?Math.max(0,u+r):r}for(;u>e;e++)if(n[e]===t)return e;return-1},h.lastIndexOf=function(n,t,r){if(null==n)return-1;var e=n.length;for("number"==typeof r&&(e=0>r?e+r+1:Math.min(e,r+1));--e>=0;)if(n[e]===t)return e;return-1},h.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var d=function(){};h.bind=function(n,t){var r,e;if(p&&n.bind===p)return p.apply(n,a.call(arguments,1));if(!h.isFunction(n))throw new TypeError("Bind must be called on a function");return r=a.call(arguments,2),e=function(){if(!(this instanceof e))return n.apply(t,r.concat(a.call(arguments)));d.prototype=n.prototype;var u=new d;d.prototype=null;var i=n.apply(u,r.concat(a.call(arguments)));return h.isObject(i)?i:u}},h.partial=function(n){var t=a.call(arguments,1);return function(){for(var r=0,e=t.slice(),u=0,i=e.length;i>u;u++)e[u]===h&&(e[u]=arguments[r++]);for(;r<arguments.length;)e.push(arguments[r++]);return n.apply(this,e)}},h.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=h.bind(n[r],n);return n},h.memoize=function(n,t){var r=function(e){var u=r.cache,i=t?t.apply(this,arguments):e;return h.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},h.delay=function(n,t){var r=a.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},h.defer=function(n){return h.delay.apply(h,[n,1].concat(a.call(arguments,1)))},h.throttle=function(n,t,r){var e,u,i,a=null,o=0;r||(r={});var l=function(){o=r.leading===!1?0:h.now(),a=null,i=n.apply(e,u),a||(e=u=null)};return function(){var c=h.now();o||r.leading!==!1||(o=c);var f=t-(c-o);return e=this,u=arguments,0>=f||f>t?(clearTimeout(a),a=null,o=c,i=n.apply(e,u),a||(e=u=null)):a||r.trailing===!1||(a=setTimeout(l,f)),i}},h.debounce=function(n,t,r){var e,u,i,a,o,l=function(){var c=h.now()-a;t>c&&c>0?e=setTimeout(l,t-c):(e=null,r||(o=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,a=h.now();var c=r&&!e;return e||(e=setTimeout(l,t)),c&&(o=n.apply(i,u),i=u=null),o}},h.wrap=function(n,t){return h.partial(t,n)},h.negate=function(n){return function(){return!n.apply(this,arguments)}},h.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},h.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},h.before=function(n,t){var r;return function(){return--n>0?r=t.apply(this,arguments):t=null,r}},h.once=h.partial(h.before,2),h.keys=function(n){if(!h.isObject(n))return[];if(s)return s(n);var t=[];for(var r in n)h.has(n,r)&&t.push(r);return t},h.values=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},h.pairs=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},h.invert=function(n){for(var t={},r=h.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},h.functions=h.methods=function(n){var t=[];for(var r in n)h.isFunction(n[r])&&t.push(r);return t.sort()},h.extend=function(n){if(!h.isObject(n))return n;for(var t,r,e=1,u=arguments.length;u>e;e++){t=arguments[e];for(r in t)c.call(t,r)&&(n[r]=t[r])}return n},h.pick=function(n,t,r){var e,u={};if(null==n)return u;if(h.isFunction(t)){t=g(t,r);for(e in n){var i=n[e];t(i,e,n)&&(u[e]=i)}}else{var l=o.apply([],a.call(arguments,1));n=new Object(n);for(var c=0,f=l.length;f>c;c++)e=l[c],e in n&&(u[e]=n[e])}return u},h.omit=function(n,t,r){if(h.isFunction(t))t=h.negate(t);else{var e=h.map(o.apply([],a.call(arguments,1)),String);t=function(n,t){return!h.contains(e,t)}}return h.pick(n,t,r)},h.defaults=function(n){if(!h.isObject(n))return n;for(var t=1,r=arguments.length;r>t;t++){var e=arguments[t];for(var u in e)n[u]===void 0&&(n[u]=e[u])}return n},h.clone=function(n){return h.isObject(n)?h.isArray(n)?n.slice():h.extend({},n):n},h.tap=function(n,t){return t(n),n};var b=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof h&&(n=n._wrapped),t instanceof h&&(t=t._wrapped);var u=l.call(n);if(u!==l.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}if("object"!=typeof n||"object"!=typeof t)return!1;for(var i=r.length;i--;)if(r[i]===n)return e[i]===t;var a=n.constructor,o=t.constructor;if(a!==o&&"constructor"in n&&"constructor"in t&&!(h.isFunction(a)&&a instanceof a&&h.isFunction(o)&&o instanceof o))return!1;r.push(n),e.push(t);var c,f;if("[object Array]"===u){if(c=n.length,f=c===t.length)for(;c--&&(f=b(n[c],t[c],r,e)););}else{var s,p=h.keys(n);if(c=p.length,f=h.keys(t).length===c)for(;c--&&(s=p[c],f=h.has(t,s)&&b(n[s],t[s],r,e)););}return r.pop(),e.pop(),f};h.isEqual=function(n,t){return b(n,t,[],[])},h.isEmpty=function(n){if(null==n)return!0;if(h.isArray(n)||h.isString(n)||h.isArguments(n))return 0===n.length;for(var t in n)if(h.has(n,t))return!1;return!0},h.isElement=function(n){return!(!n||1!==n.nodeType)},h.isArray=f||function(n){return"[object Array]"===l.call(n)},h.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},h.each(["Arguments","Function","String","Number","Date","RegExp"],function(n){h["is"+n]=function(t){return l.call(t)==="[object "+n+"]"}}),h.isArguments(arguments)||(h.isArguments=function(n){return h.has(n,"callee")}),"function"!=typeof/./&&(h.isFunction=function(n){return"function"==typeof n||!1}),h.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},h.isNaN=function(n){return h.isNumber(n)&&n!==+n},h.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===l.call(n)},h.isNull=function(n){return null===n},h.isUndefined=function(n){return n===void 0},h.has=function(n,t){return null!=n&&c.call(n,t)},h.noConflict=function(){return n._=t,this},h.identity=function(n){return n},h.constant=function(n){return function(){return n}},h.noop=function(){},h.property=function(n){return function(t){return t[n]}},h.matches=function(n){var t=h.pairs(n),r=t.length;return function(n){if(null==n)return!r;n=new Object(n);for(var e=0;r>e;e++){var u=t[e],i=u[0];if(u[1]!==n[i]||!(i in n))return!1}return!0}},h.times=function(n,t,r){var e=Array(Math.max(0,n));t=g(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},h.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},h.now=Date.now||function(){return(new Date).getTime()};var _={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},w=h.invert(_),j=function(n){var t=function(t){return n[t]},r="(?:"+h.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};h.escape=j(_),h.unescape=j(w),h.result=function(n,t){if(null==n)return void 0;var r=n[t];return h.isFunction(r)?n[t]():r};var x=0;h.uniqueId=function(n){var t=++x+"";return n?n+t:t},h.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var A=/(.)^/,k={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},O=/\\|'|\r|\n|\u2028|\u2029/g,F=function(n){return"\\"+k[n]};h.template=function(n,t,r){!t&&r&&(t=r),t=h.defaults({},t,h.templateSettings);var e=RegExp([(t.escape||A).source,(t.interpolate||A).source,(t.evaluate||A).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,a,o){return i+=n.slice(u,o).replace(O,F),u=o+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":a&&(i+="';\n"+a+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var a=new Function(t.variable||"obj","_",i)}catch(o){throw o.source=i,o}var l=function(n){return a.call(this,n,h)},c=t.variable||"obj";return l.source="function("+c+"){\n"+i+"}",l},h.chain=function(n){var t=h(n);return t._chain=!0,t};var E=function(n){return this._chain?h(n).chain():n};h.mixin=function(n){h.each(h.functions(n),function(t){var r=h[t]=n[t];h.prototype[t]=function(){var n=[this._wrapped];return i.apply(n,arguments),E.call(this,r.apply(h,n))}})},h.mixin(h),h.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=r[n];h.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],E.call(this,r)}}),h.each(["concat","join","slice"],function(n){var t=r[n];h.prototype[n]=function(){return E.call(this,t.apply(this._wrapped,arguments))}}),h.prototype.value=function(){return this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return h})}).call(this);
-//# sourceMappingURL=underscore-min.map
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.map b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.map
deleted file mode 100644
index b31e43590a011..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"underscore-min.js","sources":["underscore.js"],"names":["createReduce","dir","iterator","obj","iteratee","memo","keys","index","length","currentKey","context","optimizeCb","isArrayLike","_","arguments","createIndexFinder","array","predicate","cb","collectNonEnumProps","nonEnumIdx","nonEnumerableProps","constructor","proto","isFunction","prototype","ObjProto","prop","has","contains","push","root","this","previousUnderscore","ArrayProto","Array","Object","FuncProto","Function","slice","toString","hasOwnProperty","nativeIsArray","isArray","nativeKeys","nativeBind","bind","nativeCreate","create","Ctor","_wrapped","exports","module","VERSION","func","argCount","value","call","other","collection","accumulator","apply","identity","isObject","matcher","property","Infinity","createAssigner","keysFunc","undefinedOnly","source","l","i","key","baseCreate","result","MAX_ARRAY_INDEX","Math","pow","each","forEach","map","collect","results","reduce","foldl","inject","reduceRight","foldr","find","detect","findIndex","findKey","filter","select","list","reject","negate","every","all","some","any","includes","include","target","fromIndex","values","indexOf","invoke","method","args","isFunc","pluck","where","attrs","findWhere","max","computed","lastComputed","min","shuffle","rand","set","shuffled","random","sample","n","guard","sortBy","criteria","sort","left","right","a","b","group","behavior","groupBy","indexBy","countBy","toArray","size","partition","pass","fail","first","head","take","initial","last","rest","tail","drop","compact","flatten","input","shallow","strict","startIndex","output","idx","isArguments","j","len","without","difference","uniq","unique","isSorted","isBoolean","seen","union","intersection","argsLength","item","zip","unzip","object","sortedIndex","isNaN","lastIndexOf","from","findLastIndex","low","high","mid","floor","range","start","stop","step","ceil","executeBound","sourceFunc","boundFunc","callingContext","self","TypeError","bound","concat","partial","boundArgs","position","bindAll","Error","memoize","hasher","cache","address","delay","wait","setTimeout","defer","throttle","options","timeout","previous","later","leading","now","remaining","clearTimeout","trailing","debounce","immediate","timestamp","callNow","wrap","wrapper","compose","after","times","before","once","hasEnumBug","propertyIsEnumerable","allKeys","mapObject","pairs","invert","functions","methods","names","extend","extendOwn","assign","pick","oiteratee","omit","String","defaults","clone","tap","interceptor","isMatch","eq","aStack","bStack","className","areArrays","aCtor","bCtor","pop","isEqual","isEmpty","isString","isElement","nodeType","type","name","Int8Array","isFinite","parseFloat","isNumber","isNull","isUndefined","noConflict","constant","noop","propertyOf","matches","accum","Date","getTime","escapeMap","&","<",">","\"","'","`","unescapeMap","createEscaper","escaper","match","join","testRegexp","RegExp","replaceRegexp","string","test","replace","escape","unescape","fallback","idCounter","uniqueId","prefix","id","templateSettings","evaluate","interpolate","noMatch","escapes","\\","\r","\n","
","
","escapeChar","template","text","settings","oldSettings","offset","variable","render","e","data","argument","chain","instance","_chain","mixin","valueOf","toJSON","define","amd"],"mappings":";;;;CAKC,WAoKC,QAASA,GAAaC,GAGpB,QAASC,GAASC,EAAKC,EAAUC,EAAMC,EAAMC,EAAOC,GAClD,KAAOD,GAAS,GAAaC,EAARD,EAAgBA,GAASN,EAAK,CACjD,GAAIQ,GAAaH,EAAOA,EAAKC,GAASA,CACtCF,GAAOD,EAASC,EAAMF,EAAIM,GAAaA,EAAYN,GAErD,MAAOE,GAGT,MAAO,UAASF,EAAKC,EAAUC,EAAMK,GACnCN,EAAWO,EAAWP,EAAUM,EAAS,EACzC,IAAIJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OACvBD,EAAQN,EAAM,EAAI,EAAIO,EAAS,CAMnC,OAJIM,WAAUN,OAAS,IACrBH,EAAOF,EAAIG,EAAOA,EAAKC,GAASA,GAChCA,GAASN,GAEJC,EAASC,EAAKC,EAAUC,EAAMC,EAAMC,EAAOC,IA+btD,QAASO,GAAkBd,GACzB,MAAO,UAASe,EAAOC,EAAWP,GAChCO,EAAYC,EAAGD,EAAWP,EAG1B,KAFA,GAAIF,GAAkB,MAATQ,GAAiBA,EAAMR,OAChCD,EAAQN,EAAM,EAAI,EAAIO,EAAS,EAC5BD,GAAS,GAAaC,EAARD,EAAgBA,GAASN,EAC5C,GAAIgB,EAAUD,EAAMT,GAAQA,EAAOS,GAAQ,MAAOT,EAEpD,QAAQ,GAgQZ,QAASY,GAAoBhB,EAAKG,GAChC,GAAIc,GAAaC,EAAmBb,OAChCc,EAAcnB,EAAImB,YAClBC,EAASV,EAAEW,WAAWF,IAAgBA,EAAYG,WAAcC,EAGhEC,EAAO,aAGX,KAFId,EAAEe,IAAIzB,EAAKwB,KAAUd,EAAEgB,SAASvB,EAAMqB,IAAOrB,EAAKwB,KAAKH,GAEpDP,KACLO,EAAON,EAAmBD,GACtBO,IAAQxB,IAAOA,EAAIwB,KAAUJ,EAAMI,KAAUd,EAAEgB,SAASvB,EAAMqB,IAChErB,EAAKwB,KAAKH,GAt4BhB,GAAII,GAAOC,KAGPC,EAAqBF,EAAKlB,EAG1BqB,EAAaC,MAAMV,UAAWC,EAAWU,OAAOX,UAAWY,EAAYC,SAASb,UAIlFK,EAAmBI,EAAWJ,KAC9BS,EAAmBL,EAAWK,MAC9BC,EAAmBd,EAASc,SAC5BC,EAAmBf,EAASe,eAK5BC,EAAqBP,MAAMQ,QAC3BC,EAAqBR,OAAO9B,KAC5BuC,EAAqBR,EAAUS,KAC/BC,EAAqBX,OAAOY,OAG1BC,EAAO,aAGPpC,EAAI,SAASV,GACf,MAAIA,aAAeU,GAAUV,EACvB6B,eAAgBnB,QACtBmB,KAAKkB,SAAW/C,GADiB,GAAIU,GAAEV,GAOlB,oBAAZgD,UACa,mBAAXC,SAA0BA,OAAOD,UAC1CA,QAAUC,OAAOD,QAAUtC,GAE7BsC,QAAQtC,EAAIA,GAEZkB,EAAKlB,EAAIA,EAIXA,EAAEwC,QAAU,OAKZ,IAAI1C,GAAa,SAAS2C,EAAM5C,EAAS6C,GACvC,GAAI7C,QAAiB,GAAG,MAAO4C,EAC/B,QAAoB,MAAZC,EAAmB,EAAIA,GAC7B,IAAK,GAAG,MAAO,UAASC,GACtB,MAAOF,GAAKG,KAAK/C,EAAS8C,GAE5B,KAAK,GAAG,MAAO,UAASA,EAAOE,GAC7B,MAAOJ,GAAKG,KAAK/C,EAAS8C,EAAOE,GAEnC,KAAK,GAAG,MAAO,UAASF,EAAOjD,EAAOoD,GACpC,MAAOL,GAAKG,KAAK/C,EAAS8C,EAAOjD,EAAOoD,GAE1C,KAAK,GAAG,MAAO,UAASC,EAAaJ,EAAOjD,EAAOoD,GACjD,MAAOL,GAAKG,KAAK/C,EAASkD,EAAaJ,EAAOjD,EAAOoD,IAGzD,MAAO,YACL,MAAOL,GAAKO,MAAMnD,EAASI,aAO3BI,EAAK,SAASsC,EAAO9C,EAAS6C,GAChC,MAAa,OAATC,EAAsB3C,EAAEiD,SACxBjD,EAAEW,WAAWgC,GAAe7C,EAAW6C,EAAO9C,EAAS6C,GACvD1C,EAAEkD,SAASP,GAAe3C,EAAEmD,QAAQR,GACjC3C,EAAEoD,SAAST,GAEpB3C,GAAET,SAAW,SAASoD,EAAO9C,GAC3B,MAAOQ,GAAGsC,EAAO9C,EAASwD,KAI5B,IAAIC,GAAiB,SAASC,EAAUC,GACtC,MAAO,UAASlE,GACd,GAAIK,GAASM,UAAUN,MACvB,IAAa,EAATA,GAAqB,MAAPL,EAAa,MAAOA,EACtC,KAAK,GAAII,GAAQ,EAAWC,EAARD,EAAgBA,IAIlC,IAAK,GAHD+D,GAASxD,UAAUP,GACnBD,EAAO8D,EAASE,GAChBC,EAAIjE,EAAKE,OACJgE,EAAI,EAAOD,EAAJC,EAAOA,IAAK,CAC1B,GAAIC,GAAMnE,EAAKkE,EACVH,IAAiBlE,EAAIsE,SAAc,KAAGtE,EAAIsE,GAAOH,EAAOG,IAGjE,MAAOtE,KAKPuE,EAAa,SAASjD,GACxB,IAAKZ,EAAEkD,SAAStC,GAAY,QAC5B,IAAIsB,EAAc,MAAOA,GAAatB,EACtCwB,GAAKxB,UAAYA,CACjB,IAAIkD,GAAS,GAAI1B,EAEjB,OADAA,GAAKxB,UAAY,KACVkD,GAMLC,EAAkBC,KAAKC,IAAI,EAAG,IAAM,EACpClE,EAAc,SAAS+C,GACzB,GAAInD,GAASmD,GAAcA,EAAWnD,MACtC,OAAwB,gBAAVA,IAAsBA,GAAU,GAAeoE,GAAVpE,EASrDK,GAAEkE,KAAOlE,EAAEmE,QAAU,SAAS7E,EAAKC,EAAUM,GAC3CN,EAAWO,EAAWP,EAAUM,EAChC,IAAI8D,GAAGhE,CACP,IAAII,EAAYT,GACd,IAAKqE,EAAI,EAAGhE,EAASL,EAAIK,OAAYA,EAAJgE,EAAYA,IAC3CpE,EAASD,EAAIqE,GAAIA,EAAGrE,OAEjB,CACL,GAAIG,GAAOO,EAAEP,KAAKH,EAClB,KAAKqE,EAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAC5CpE,EAASD,EAAIG,EAAKkE,IAAKlE,EAAKkE,GAAIrE,GAGpC,MAAOA,IAITU,EAAEoE,IAAMpE,EAAEqE,QAAU,SAAS/E,EAAKC,EAAUM,GAC1CN,EAAWc,EAAGd,EAAUM,EAIxB,KAAK,GAHDJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OACvB2E,EAAUhD,MAAM3B,GACXD,EAAQ,EAAWC,EAARD,EAAgBA,IAAS,CAC3C,GAAIE,GAAaH,EAAOA,EAAKC,GAASA,CACtC4E,GAAQ5E,GAASH,EAASD,EAAIM,GAAaA,EAAYN,GAEzD,MAAOgF,IA+BTtE,EAAEuE,OAASvE,EAAEwE,MAAQxE,EAAEyE,OAAStF,EAAa,GAG7Ca,EAAE0E,YAAc1E,EAAE2E,MAAQxF,GAAc,GAGxCa,EAAE4E,KAAO5E,EAAE6E,OAAS,SAASvF,EAAKc,EAAWP,GAC3C,GAAI+D,EAMJ,OAJEA,GADE7D,EAAYT,GACRU,EAAE8E,UAAUxF,EAAKc,EAAWP,GAE5BG,EAAE+E,QAAQzF,EAAKc,EAAWP,GAE9B+D,QAAa,IAAKA,KAAS,EAAUtE,EAAIsE,GAA7C,QAKF5D,EAAEgF,OAAShF,EAAEiF,OAAS,SAAS3F,EAAKc,EAAWP,GAC7C,GAAIyE,KAKJ,OAJAlE,GAAYC,EAAGD,EAAWP,GAC1BG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,EAAOwF,GAC7B9E,EAAUuC,EAAOjD,EAAOwF,IAAOZ,EAAQrD,KAAK0B,KAE3C2B,GAITtE,EAAEmF,OAAS,SAAS7F,EAAKc,EAAWP,GAClC,MAAOG,GAAEgF,OAAO1F,EAAKU,EAAEoF,OAAO/E,EAAGD,IAAaP,IAKhDG,EAAEqF,MAAQrF,EAAEsF,IAAM,SAAShG,EAAKc,EAAWP,GACzCO,EAAYC,EAAGD,EAAWP,EAG1B,KAAK,GAFDJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OAClBD,EAAQ,EAAWC,EAARD,EAAgBA,IAAS,CAC3C,GAAIE,GAAaH,EAAOA,EAAKC,GAASA,CACtC,KAAKU,EAAUd,EAAIM,GAAaA,EAAYN,GAAM,OAAO,EAE3D,OAAO,GAKTU,EAAEuF,KAAOvF,EAAEwF,IAAM,SAASlG,EAAKc,EAAWP,GACxCO,EAAYC,EAAGD,EAAWP,EAG1B,KAAK,GAFDJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OAClBD,EAAQ,EAAWC,EAARD,EAAgBA,IAAS,CAC3C,GAAIE,GAAaH,EAAOA,EAAKC,GAASA,CACtC,IAAIU,EAAUd,EAAIM,GAAaA,EAAYN,GAAM,OAAO,EAE1D,OAAO,GAKTU,EAAEgB,SAAWhB,EAAEyF,SAAWzF,EAAE0F,QAAU,SAASpG,EAAKqG,EAAQC,GAE1D,MADK7F,GAAYT,KAAMA,EAAMU,EAAE6F,OAAOvG,IAC/BU,EAAE8F,QAAQxG,EAAKqG,EAA4B,gBAAbC,IAAyBA,IAAc,GAI9E5F,EAAE+F,OAAS,SAASzG,EAAK0G,GACvB,GAAIC,GAAOvE,EAAMkB,KAAK3C,UAAW,GAC7BiG,EAASlG,EAAEW,WAAWqF,EAC1B,OAAOhG,GAAEoE,IAAI9E,EAAK,SAASqD,GACzB,GAAIF,GAAOyD,EAASF,EAASrD,EAAMqD,EACnC,OAAe,OAARvD,EAAeA,EAAOA,EAAKO,MAAML,EAAOsD,MAKnDjG,EAAEmG,MAAQ,SAAS7G,EAAKsE,GACtB,MAAO5D,GAAEoE,IAAI9E,EAAKU,EAAEoD,SAASQ,KAK/B5D,EAAEoG,MAAQ,SAAS9G,EAAK+G,GACtB,MAAOrG,GAAEgF,OAAO1F,EAAKU,EAAEmD,QAAQkD,KAKjCrG,EAAEsG,UAAY,SAAShH,EAAK+G,GAC1B,MAAOrG,GAAE4E,KAAKtF,EAAKU,EAAEmD,QAAQkD,KAI/BrG,EAAEuG,IAAM,SAASjH,EAAKC,EAAUM,GAC9B,GACI8C,GAAO6D,EADP1C,GAAUT,IAAUoD,GAAgBpD,GAExC,IAAgB,MAAZ9D,GAA2B,MAAPD,EAAa,CACnCA,EAAMS,EAAYT,GAAOA,EAAMU,EAAE6F,OAAOvG,EACxC,KAAK,GAAIqE,GAAI,EAAGhE,EAASL,EAAIK,OAAYA,EAAJgE,EAAYA,IAC/ChB,EAAQrD,EAAIqE,GACRhB,EAAQmB,IACVA,EAASnB,OAIbpD,GAAWc,EAAGd,EAAUM,GACxBG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,EAAOwF,GACjCsB,EAAWjH,EAASoD,EAAOjD,EAAOwF,IAC9BsB,EAAWC,GAAgBD,KAAcnD,KAAYS,KAAYT,OACnES,EAASnB,EACT8D,EAAeD,IAIrB,OAAO1C,IAIT9D,EAAE0G,IAAM,SAASpH,EAAKC,EAAUM,GAC9B,GACI8C,GAAO6D,EADP1C,EAAST,IAAUoD,EAAepD,GAEtC,IAAgB,MAAZ9D,GAA2B,MAAPD,EAAa,CACnCA,EAAMS,EAAYT,GAAOA,EAAMU,EAAE6F,OAAOvG,EACxC,KAAK,GAAIqE,GAAI,EAAGhE,EAASL,EAAIK,OAAYA,EAAJgE,EAAYA,IAC/ChB,EAAQrD,EAAIqE,GACAG,EAARnB,IACFmB,EAASnB,OAIbpD,GAAWc,EAAGd,EAAUM,GACxBG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,EAAOwF,GACjCsB,EAAWjH,EAASoD,EAAOjD,EAAOwF,IACnBuB,EAAXD,GAAwCnD,MAAbmD,GAAoCnD,MAAXS,KACtDA,EAASnB,EACT8D,EAAeD,IAIrB,OAAO1C,IAKT9D,EAAE2G,QAAU,SAASrH,GAInB,IAAK,GAAesH,GAHhBC,EAAM9G,EAAYT,GAAOA,EAAMU,EAAE6F,OAAOvG,GACxCK,EAASkH,EAAIlH,OACbmH,EAAWxF,MAAM3B,GACZD,EAAQ,EAAiBC,EAARD,EAAgBA,IACxCkH,EAAO5G,EAAE+G,OAAO,EAAGrH,GACfkH,IAASlH,IAAOoH,EAASpH,GAASoH,EAASF,IAC/CE,EAASF,GAAQC,EAAInH,EAEvB,OAAOoH,IAMT9G,EAAEgH,OAAS,SAAS1H,EAAK2H,EAAGC,GAC1B,MAAS,OAALD,GAAaC,GACVnH,EAAYT,KAAMA,EAAMU,EAAE6F,OAAOvG,IAC/BA,EAAIU,EAAE+G,OAAOzH,EAAIK,OAAS,KAE5BK,EAAE2G,QAAQrH,GAAKoC,MAAM,EAAGsC,KAAKuC,IAAI,EAAGU,KAI7CjH,EAAEmH,OAAS,SAAS7H,EAAKC,EAAUM,GAEjC,MADAN,GAAWc,EAAGd,EAAUM,GACjBG,EAAEmG,MAAMnG,EAAEoE,IAAI9E,EAAK,SAASqD,EAAOjD,EAAOwF,GAC/C,OACEvC,MAAOA,EACPjD,MAAOA,EACP0H,SAAU7H,EAASoD,EAAOjD,EAAOwF,MAElCmC,KAAK,SAASC,EAAMC,GACrB,GAAIC,GAAIF,EAAKF,SACTK,EAAIF,EAAMH,QACd,IAAII,IAAMC,EAAG,CACX,GAAID,EAAIC,GAAKD,QAAW,GAAG,MAAO,EAClC,IAAQC,EAAJD,GAASC,QAAW,GAAG,OAAQ,EAErC,MAAOH,GAAK5H,MAAQ6H,EAAM7H,QACxB,SAIN,IAAIgI,GAAQ,SAASC,GACnB,MAAO,UAASrI,EAAKC,EAAUM,GAC7B,GAAIiE,KAMJ,OALAvE,GAAWc,EAAGd,EAAUM,GACxBG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,GAC1B,GAAIkE,GAAMrE,EAASoD,EAAOjD,EAAOJ,EACjCqI,GAAS7D,EAAQnB,EAAOiB,KAEnBE,GAMX9D,GAAE4H,QAAUF,EAAM,SAAS5D,EAAQnB,EAAOiB,GACpC5D,EAAEe,IAAI+C,EAAQF,GAAME,EAAOF,GAAK3C,KAAK0B,GAAamB,EAAOF,IAAQjB,KAKvE3C,EAAE6H,QAAUH,EAAM,SAAS5D,EAAQnB,EAAOiB,GACxCE,EAAOF,GAAOjB,IAMhB3C,EAAE8H,QAAUJ,EAAM,SAAS5D,EAAQnB,EAAOiB,GACpC5D,EAAEe,IAAI+C,EAAQF,GAAME,EAAOF,KAAaE,EAAOF,GAAO,IAI5D5D,EAAE+H,QAAU,SAASzI,GACnB,MAAKA,GACDU,EAAE8B,QAAQxC,GAAaoC,EAAMkB,KAAKtD,GAClCS,EAAYT,GAAaU,EAAEoE,IAAI9E,EAAKU,EAAEiD,UACnCjD,EAAE6F,OAAOvG,OAIlBU,EAAEgI,KAAO,SAAS1I,GAChB,MAAW,OAAPA,EAAoB,EACjBS,EAAYT,GAAOA,EAAIK,OAASK,EAAEP,KAAKH,GAAKK,QAKrDK,EAAEiI,UAAY,SAAS3I,EAAKc,EAAWP,GACrCO,EAAYC,EAAGD,EAAWP,EAC1B,IAAIqI,MAAWC,IAIf,OAHAnI,GAAEkE,KAAK5E,EAAK,SAASqD,EAAOiB,EAAKtE,IAC9Bc,EAAUuC,EAAOiB,EAAKtE,GAAO4I,EAAOC,GAAMlH,KAAK0B,MAE1CuF,EAAMC,IAShBnI,EAAEoI,MAAQpI,EAAEqI,KAAOrI,EAAEsI,KAAO,SAASnI,EAAO8G,EAAGC,GAC7C,MAAa,OAAT/G,MAA2B,GACtB,MAAL8G,GAAaC,EAAc/G,EAAM,GAC9BH,EAAEuI,QAAQpI,EAAOA,EAAMR,OAASsH,IAMzCjH,EAAEuI,QAAU,SAASpI,EAAO8G,EAAGC,GAC7B,MAAOxF,GAAMkB,KAAKzC,EAAO,EAAG6D,KAAKuC,IAAI,EAAGpG,EAAMR,QAAe,MAALsH,GAAaC,EAAQ,EAAID,MAKnFjH,EAAEwI,KAAO,SAASrI,EAAO8G,EAAGC,GAC1B,MAAa,OAAT/G,MAA2B,GACtB,MAAL8G,GAAaC,EAAc/G,EAAMA,EAAMR,OAAS,GAC7CK,EAAEyI,KAAKtI,EAAO6D,KAAKuC,IAAI,EAAGpG,EAAMR,OAASsH,KAMlDjH,EAAEyI,KAAOzI,EAAE0I,KAAO1I,EAAE2I,KAAO,SAASxI,EAAO8G,EAAGC,GAC5C,MAAOxF,GAAMkB,KAAKzC,EAAY,MAAL8G,GAAaC,EAAQ,EAAID,IAIpDjH,EAAE4I,QAAU,SAASzI,GACnB,MAAOH,GAAEgF,OAAO7E,EAAOH,EAAEiD,UAI3B,IAAI4F,GAAU,SAASC,EAAOC,EAASC,EAAQC,GAE7C,IAAK,GADDC,MAAaC,EAAM,EACdxF,EAAIsF,GAAc,EAAGtJ,EAASmJ,GAASA,EAAMnJ,OAAYA,EAAJgE,EAAYA,IAAK,CAC7E,GAAIhB,GAAQmG,EAAMnF,EAClB,IAAI5D,EAAY4C,KAAW3C,EAAE8B,QAAQa,IAAU3C,EAAEoJ,YAAYzG,IAAS,CAE/DoG,IAASpG,EAAQkG,EAAQlG,EAAOoG,EAASC,GAC9C,IAAIK,GAAI,EAAGC,EAAM3G,EAAMhD,MAEvB,KADAuJ,EAAOvJ,QAAU2J,EACNA,EAAJD,GACLH,EAAOC,KAASxG,EAAM0G,SAEdL,KACVE,EAAOC,KAASxG,GAGpB,MAAOuG,GAITlJ,GAAE6I,QAAU,SAAS1I,EAAO4I,GAC1B,MAAOF,GAAQ1I,EAAO4I,GAAS,IAIjC/I,EAAEuJ,QAAU,SAASpJ,GACnB,MAAOH,GAAEwJ,WAAWrJ,EAAOuB,EAAMkB,KAAK3C,UAAW,KAMnDD,EAAEyJ,KAAOzJ,EAAE0J,OAAS,SAASvJ,EAAOwJ,EAAUpK,EAAUM,GACtD,GAAa,MAATM,EAAe,QACdH,GAAE4J,UAAUD,KACf9J,EAAUN,EACVA,EAAWoK,EACXA,GAAW,GAEG,MAAZpK,IAAkBA,EAAWc,EAAGd,EAAUM,GAG9C,KAAK,GAFDiE,MACA+F,KACKlG,EAAI,EAAGhE,EAASQ,EAAMR,OAAYA,EAAJgE,EAAYA,IAAK,CACtD,GAAIhB,GAAQxC,EAAMwD,GACd6C,EAAWjH,EAAWA,EAASoD,EAAOgB,EAAGxD,GAASwC,CAClDgH,IACGhG,GAAKkG,IAASrD,GAAU1C,EAAO7C,KAAK0B,GACzCkH,EAAOrD,GACEjH,EACJS,EAAEgB,SAAS6I,EAAMrD,KACpBqD,EAAK5I,KAAKuF,GACV1C,EAAO7C,KAAK0B,IAEJ3C,EAAEgB,SAAS8C,EAAQnB,IAC7BmB,EAAO7C,KAAK0B,GAGhB,MAAOmB,IAKT9D,EAAE8J,MAAQ,WACR,MAAO9J,GAAEyJ,KAAKZ,EAAQ5I,WAAW,GAAM,KAKzCD,EAAE+J,aAAe,SAAS5J,GACxB,GAAa,MAATA,EAAe,QAGnB,KAAK,GAFD2D,MACAkG,EAAa/J,UAAUN,OAClBgE,EAAI,EAAGhE,EAASQ,EAAMR,OAAYA,EAAJgE,EAAYA,IAAK,CACtD,GAAIsG,GAAO9J,EAAMwD,EACjB,KAAI3D,EAAEgB,SAAS8C,EAAQmG,GAAvB,CACA,IAAK,GAAIZ,GAAI,EAAOW,EAAJX,GACTrJ,EAAEgB,SAASf,UAAUoJ,GAAIY,GADAZ,KAG5BA,IAAMW,GAAYlG,EAAO7C,KAAKgJ,IAEpC,MAAOnG,IAKT9D,EAAEwJ,WAAa,SAASrJ,GACtB,GAAIsI,GAAOI,EAAQ5I,WAAW,GAAM,EAAM,EAC1C,OAAOD,GAAEgF,OAAO7E,EAAO,SAASwC,GAC9B,OAAQ3C,EAAEgB,SAASyH,EAAM9F,MAM7B3C,EAAEkK,IAAM,WACN,MAAOlK,GAAEmK,MAAMlK,YAKjBD,EAAEmK,MAAQ,SAAShK,GAIjB,IAAK,GAHDR,GAASQ,GAASH,EAAEuG,IAAIpG,EAAO,UAAUR,QAAU,EACnDmE,EAASxC,MAAM3B,GAEVD,EAAQ,EAAWC,EAARD,EAAgBA,IAClCoE,EAAOpE,GAASM,EAAEmG,MAAMhG,EAAOT,EAEjC,OAAOoE,IAMT9D,EAAEoK,OAAS,SAASlF,EAAMW,GAExB,IAAK,GADD/B,MACKH,EAAI,EAAGhE,EAASuF,GAAQA,EAAKvF,OAAYA,EAAJgE,EAAYA,IACpDkC,EACF/B,EAAOoB,EAAKvB,IAAMkC,EAAOlC,GAEzBG,EAAOoB,EAAKvB,GAAG,IAAMuB,EAAKvB,GAAG,EAGjC,OAAOG,IAOT9D,EAAE8F,QAAU,SAAS3F,EAAO8J,EAAMN,GAChC,GAAIhG,GAAI,EAAGhE,EAASQ,GAASA,EAAMR,MACnC,IAAuB,gBAAZgK,GACThG,EAAe,EAAXgG,EAAe3F,KAAKuC,IAAI,EAAG5G,EAASgK,GAAYA,MAC/C,IAAIA,GAAYhK,EAErB,MADAgE,GAAI3D,EAAEqK,YAAYlK,EAAO8J,GAClB9J,EAAMwD,KAAOsG,EAAOtG,GAAK,CAElC,IAAIsG,IAASA,EACX,MAAOjK,GAAE8E,UAAUpD,EAAMkB,KAAKzC,EAAOwD,GAAI3D,EAAEsK,MAE7C,MAAW3K,EAAJgE,EAAYA,IAAK,GAAIxD,EAAMwD,KAAOsG,EAAM,MAAOtG,EACtD,QAAQ,GAGV3D,EAAEuK,YAAc,SAASpK,EAAO8J,EAAMO,GACpC,GAAIrB,GAAMhJ,EAAQA,EAAMR,OAAS,CAIjC,IAHmB,gBAAR6K,KACTrB,EAAa,EAAPqB,EAAWrB,EAAMqB,EAAO,EAAIxG,KAAK0C,IAAIyC,EAAKqB,EAAO,IAErDP,IAASA,EACX,MAAOjK,GAAEyK,cAAc/I,EAAMkB,KAAKzC,EAAO,EAAGgJ,GAAMnJ,EAAEsK,MAEtD,QAASnB,GAAO,GAAG,GAAIhJ,EAAMgJ,KAASc,EAAM,MAAOd,EACnD,QAAQ,GAiBVnJ,EAAE8E,UAAY5E,EAAkB,GAEhCF,EAAEyK,cAAgBvK,GAAmB,GAIrCF,EAAEqK,YAAc,SAASlK,EAAOb,EAAKC,EAAUM,GAC7CN,EAAWc,EAAGd,EAAUM,EAAS,EAGjC,KAFA,GAAI8C,GAAQpD,EAASD,GACjBoL,EAAM,EAAGC,EAAOxK,EAAMR,OACbgL,EAAND,GAAY,CACjB,GAAIE,GAAM5G,KAAK6G,OAAOH,EAAMC,GAAQ,EAChCpL,GAASY,EAAMyK,IAAQjI,EAAO+H,EAAME,EAAM,EAAQD,EAAOC,EAE/D,MAAOF,IAMT1K,EAAE8K,MAAQ,SAASC,EAAOC,EAAMC,GAC1BhL,UAAUN,QAAU,IACtBqL,EAAOD,GAAS,EAChBA,EAAQ,GAEVE,EAAOA,GAAQ,CAKf,KAAK,GAHDtL,GAASqE,KAAKuC,IAAIvC,KAAKkH,MAAMF,EAAOD,GAASE,GAAO,GACpDH,EAAQxJ,MAAM3B,GAETwJ,EAAM,EAASxJ,EAANwJ,EAAcA,IAAO4B,GAASE,EAC9CH,EAAM3B,GAAO4B,CAGf,OAAOD,GAQT,IAAIK,GAAe,SAASC,EAAYC,EAAWxL,EAASyL,EAAgBrF,GAC1E,KAAMqF,YAA0BD,IAAY,MAAOD,GAAWpI,MAAMnD,EAASoG,EAC7E,IAAIsF,GAAO1H,EAAWuH,EAAWxK,WAC7BkD,EAASsH,EAAWpI,MAAMuI,EAAMtF,EACpC,OAAIjG,GAAEkD,SAASY,GAAgBA,EACxByH,EAMTvL,GAAEiC,KAAO,SAASQ,EAAM5C,GACtB,GAAImC,GAAcS,EAAKR,OAASD,EAAY,MAAOA,GAAWgB,MAAMP,EAAMf,EAAMkB,KAAK3C,UAAW,GAChG,KAAKD,EAAEW,WAAW8B,GAAO,KAAM,IAAI+I,WAAU,oCAC7C,IAAIvF,GAAOvE,EAAMkB,KAAK3C,UAAW,GAC7BwL,EAAQ,WACV,MAAON,GAAa1I,EAAMgJ,EAAO5L,EAASsB,KAAM8E,EAAKyF,OAAOhK,EAAMkB,KAAK3C,aAEzE,OAAOwL,IAMTzL,EAAE2L,QAAU,SAASlJ,GACnB,GAAImJ,GAAYlK,EAAMkB,KAAK3C,UAAW,GAClCwL,EAAQ,WAGV,IAAK,GAFDI,GAAW,EAAGlM,EAASiM,EAAUjM,OACjCsG,EAAO3E,MAAM3B,GACRgE,EAAI,EAAOhE,EAAJgE,EAAYA,IAC1BsC,EAAKtC,GAAKiI,EAAUjI,KAAO3D,EAAIC,UAAU4L,KAAcD,EAAUjI,EAEnE,MAAOkI,EAAW5L,UAAUN,QAAQsG,EAAKhF,KAAKhB,UAAU4L,KACxD,OAAOV,GAAa1I,EAAMgJ,EAAOtK,KAAMA,KAAM8E,GAE/C,OAAOwF,IAMTzL,EAAE8L,QAAU,SAASxM,GACnB,GAAIqE,GAA8BC,EAA3BjE,EAASM,UAAUN,MAC1B,IAAc,GAAVA,EAAa,KAAM,IAAIoM,OAAM,wCACjC,KAAKpI,EAAI,EAAOhE,EAAJgE,EAAYA,IACtBC,EAAM3D,UAAU0D,GAChBrE,EAAIsE,GAAO5D,EAAEiC,KAAK3C,EAAIsE,GAAMtE,EAE9B,OAAOA,IAITU,EAAEgM,QAAU,SAASvJ,EAAMwJ,GACzB,GAAID,GAAU,SAASpI,GACrB,GAAIsI,GAAQF,EAAQE,MAChBC,EAAU,IAAMF,EAASA,EAAOjJ,MAAM7B,KAAMlB,WAAa2D,EAE7D,OADK5D,GAAEe,IAAImL,EAAOC,KAAUD,EAAMC,GAAW1J,EAAKO,MAAM7B,KAAMlB,YACvDiM,EAAMC,GAGf,OADAH,GAAQE,SACDF,GAKThM,EAAEoM,MAAQ,SAAS3J,EAAM4J,GACvB,GAAIpG,GAAOvE,EAAMkB,KAAK3C,UAAW,EACjC,OAAOqM,YAAW,WAChB,MAAO7J,GAAKO,MAAM,KAAMiD,IACvBoG,IAKLrM,EAAEuM,MAAQvM,EAAE2L,QAAQ3L,EAAEoM,MAAOpM,EAAG,GAOhCA,EAAEwM,SAAW,SAAS/J,EAAM4J,EAAMI,GAChC,GAAI5M,GAASoG,EAAMnC,EACf4I,EAAU,KACVC,EAAW,CACVF,KAASA,KACd,IAAIG,GAAQ,WACVD,EAAWF,EAAQI,WAAY,EAAQ,EAAI7M,EAAE8M,MAC7CJ,EAAU,KACV5I,EAASrB,EAAKO,MAAMnD,EAASoG,GACxByG,IAAS7M,EAAUoG,EAAO,MAEjC,OAAO,YACL,GAAI6G,GAAM9M,EAAE8M,KACPH,IAAYF,EAAQI,WAAY,IAAOF,EAAWG,EACvD,IAAIC,GAAYV,GAAQS,EAAMH,EAc9B,OAbA9M,GAAUsB,KACV8E,EAAOhG,UACU,GAAb8M,GAAkBA,EAAYV,GAC5BK,IACFM,aAAaN,GACbA,EAAU,MAEZC,EAAWG,EACXhJ,EAASrB,EAAKO,MAAMnD,EAASoG,GACxByG,IAAS7M,EAAUoG,EAAO,OACrByG,GAAWD,EAAQQ,YAAa,IAC1CP,EAAUJ,WAAWM,EAAOG,IAEvBjJ,IAQX9D,EAAEkN,SAAW,SAASzK,EAAM4J,EAAMc,GAChC,GAAIT,GAASzG,EAAMpG,EAASuN,EAAWtJ,EAEnC8I,EAAQ,WACV,GAAIpE,GAAOxI,EAAE8M,MAAQM,CAEVf,GAAP7D,GAAeA,GAAQ,EACzBkE,EAAUJ,WAAWM,EAAOP,EAAO7D,IAEnCkE,EAAU,KACLS,IACHrJ,EAASrB,EAAKO,MAAMnD,EAASoG,GACxByG,IAAS7M,EAAUoG,EAAO,QAKrC,OAAO,YACLpG,EAAUsB,KACV8E,EAAOhG,UACPmN,EAAYpN,EAAE8M,KACd,IAAIO,GAAUF,IAAcT,CAO5B,OANKA,KAASA,EAAUJ,WAAWM,EAAOP,IACtCgB,IACFvJ,EAASrB,EAAKO,MAAMnD,EAASoG,GAC7BpG,EAAUoG,EAAO,MAGZnC,IAOX9D,EAAEsN,KAAO,SAAS7K,EAAM8K,GACtB,MAAOvN,GAAE2L,QAAQ4B,EAAS9K,IAI5BzC,EAAEoF,OAAS,SAAShF,GAClB,MAAO,YACL,OAAQA,EAAU4C,MAAM7B,KAAMlB,aAMlCD,EAAEwN,QAAU,WACV,GAAIvH,GAAOhG,UACP8K,EAAQ9E,EAAKtG,OAAS,CAC1B,OAAO,YAGL,IAFA,GAAIgE,GAAIoH,EACJjH,EAASmC,EAAK8E,GAAO/H,MAAM7B,KAAMlB,WAC9B0D,KAAKG,EAASmC,EAAKtC,GAAGf,KAAKzB,KAAM2C,EACxC,OAAOA,KAKX9D,EAAEyN,MAAQ,SAASC,EAAOjL,GACxB,MAAO,YACL,QAAMiL,EAAQ,EACLjL,EAAKO,MAAM7B,KAAMlB,WAD1B,SAOJD,EAAE2N,OAAS,SAASD,EAAOjL,GACzB,GAAIjD,EACJ,OAAO,YAKL,QAJMkO,EAAQ,IACZlO,EAAOiD,EAAKO,MAAM7B,KAAMlB,YAEb,GAATyN,IAAYjL,EAAO,MAChBjD,IAMXQ,EAAE4N,KAAO5N,EAAE2L,QAAQ3L,EAAE2N,OAAQ,EAM7B,IAAIE,KAAelM,SAAU,MAAMmM,qBAAqB,YACpDtN,GAAsB,UAAW,gBAAiB,WAClC,uBAAwB,iBAAkB,iBAqB9DR,GAAEP,KAAO,SAASH,GAChB,IAAKU,EAAEkD,SAAS5D,GAAM,QACtB,IAAIyC,EAAY,MAAOA,GAAWzC,EAClC,IAAIG,KACJ,KAAK,GAAImE,KAAOtE,GAASU,EAAEe,IAAIzB,EAAKsE,IAAMnE,EAAKwB,KAAK2C,EAGpD,OADIiK,IAAYvN,EAAoBhB,EAAKG,GAClCA,GAITO,EAAE+N,QAAU,SAASzO,GACnB,IAAKU,EAAEkD,SAAS5D,GAAM,QACtB,IAAIG,KACJ,KAAK,GAAImE,KAAOtE,GAAKG,EAAKwB,KAAK2C,EAG/B,OADIiK,IAAYvN,EAAoBhB,EAAKG,GAClCA,GAITO,EAAE6F,OAAS,SAASvG,GAIlB,IAAK,GAHDG,GAAOO,EAAEP,KAAKH,GACdK,EAASF,EAAKE,OACdkG,EAASvE,MAAM3B,GACVgE,EAAI,EAAOhE,EAAJgE,EAAYA,IAC1BkC,EAAOlC,GAAKrE,EAAIG,EAAKkE,GAEvB,OAAOkC,IAKT7F,EAAEgO,UAAY,SAAS1O,EAAKC,EAAUM,GACpCN,EAAWc,EAAGd,EAAUM,EAKtB,KAAK,GADDD,GAHFH,EAAQO,EAAEP,KAAKH,GACbK,EAASF,EAAKE,OACd2E,KAEK5E,EAAQ,EAAWC,EAARD,EAAgBA,IAClCE,EAAaH,EAAKC,GAClB4E,EAAQ1E,GAAcL,EAASD,EAAIM,GAAaA,EAAYN,EAE9D,OAAOgF,IAIXtE,EAAEiO,MAAQ,SAAS3O,GAIjB,IAAK,GAHDG,GAAOO,EAAEP,KAAKH,GACdK,EAASF,EAAKE,OACdsO,EAAQ3M,MAAM3B,GACTgE,EAAI,EAAOhE,EAAJgE,EAAYA,IAC1BsK,EAAMtK,IAAMlE,EAAKkE,GAAIrE,EAAIG,EAAKkE,IAEhC,OAAOsK,IAITjO,EAAEkO,OAAS,SAAS5O,GAGlB,IAAK,GAFDwE,MACArE,EAAOO,EAAEP,KAAKH,GACTqE,EAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAChDG,EAAOxE,EAAIG,EAAKkE,KAAOlE,EAAKkE,EAE9B,OAAOG,IAKT9D,EAAEmO,UAAYnO,EAAEoO,QAAU,SAAS9O,GACjC,GAAI+O,KACJ,KAAK,GAAIzK,KAAOtE,GACVU,EAAEW,WAAWrB,EAAIsE,KAAOyK,EAAMpN,KAAK2C,EAEzC,OAAOyK,GAAMhH,QAIfrH,EAAEsO,OAAShL,EAAetD,EAAE+N,SAI5B/N,EAAEuO,UAAYvO,EAAEwO,OAASlL,EAAetD,EAAEP,MAG1CO,EAAE+E,QAAU,SAASzF,EAAKc,EAAWP,GACnCO,EAAYC,EAAGD,EAAWP,EAE1B,KAAK,GADmB+D,GAApBnE,EAAOO,EAAEP,KAAKH,GACTqE,EAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAEhD,GADAC,EAAMnE,EAAKkE,GACPvD,EAAUd,EAAIsE,GAAMA,EAAKtE,GAAM,MAAOsE,IAK9C5D,EAAEyO,KAAO,SAASrE,EAAQsE,EAAW7O,GACnC,GAA+BN,GAAUE,EAArCqE,KAAaxE,EAAM8K,CACvB,IAAW,MAAP9K,EAAa,MAAOwE,EACpB9D,GAAEW,WAAW+N,IACfjP,EAAOO,EAAE+N,QAAQzO,GACjBC,EAAWO,EAAW4O,EAAW7O,KAEjCJ,EAAOoJ,EAAQ5I,WAAW,GAAO,EAAO,GACxCV,EAAW,SAASoD,EAAOiB,EAAKtE,GAAO,MAAOsE,KAAOtE,IACrDA,EAAMiC,OAAOjC,GAEf,KAAK,GAAIqE,GAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAAK,CACrD,GAAIC,GAAMnE,EAAKkE,GACXhB,EAAQrD,EAAIsE,EACZrE,GAASoD,EAAOiB,EAAKtE,KAAMwE,EAAOF,GAAOjB,GAE/C,MAAOmB,IAIT9D,EAAE2O,KAAO,SAASrP,EAAKC,EAAUM,GAC/B,GAAIG,EAAEW,WAAWpB,GACfA,EAAWS,EAAEoF,OAAO7F,OACf,CACL,GAAIE,GAAOO,EAAEoE,IAAIyE,EAAQ5I,WAAW,GAAO,EAAO,GAAI2O,OACtDrP,GAAW,SAASoD,EAAOiB,GACzB,OAAQ5D,EAAEgB,SAASvB,EAAMmE,IAG7B,MAAO5D,GAAEyO,KAAKnP,EAAKC,EAAUM,IAI/BG,EAAE6O,SAAWvL,EAAetD,EAAE+N,SAAS,GAGvC/N,EAAE8O,MAAQ,SAASxP,GACjB,MAAKU,GAAEkD,SAAS5D,GACTU,EAAE8B,QAAQxC,GAAOA,EAAIoC,QAAU1B,EAAEsO,UAAWhP,GADtBA,GAO/BU,EAAE+O,IAAM,SAASzP,EAAK0P,GAEpB,MADAA,GAAY1P,GACLA,GAITU,EAAEiP,QAAU,SAAS7E,EAAQ/D,GAC3B,GAAI5G,GAAOO,EAAEP,KAAK4G,GAAQ1G,EAASF,EAAKE,MACxC,IAAc,MAAVyK,EAAgB,OAAQzK,CAE5B,KAAK,GADDL,GAAMiC,OAAO6I,GACRzG,EAAI,EAAOhE,EAAJgE,EAAYA,IAAK,CAC/B,GAAIC,GAAMnE,EAAKkE,EACf,IAAI0C,EAAMzC,KAAStE,EAAIsE,MAAUA,IAAOtE,IAAM,OAAO,EAEvD,OAAO,EAKT,IAAI4P,GAAK,SAAS1H,EAAGC,EAAG0H,EAAQC,GAG9B,GAAI5H,IAAMC,EAAG,MAAa,KAAND,GAAW,EAAIA,IAAM,EAAIC,CAE7C,IAAS,MAALD,GAAkB,MAALC,EAAW,MAAOD,KAAMC,CAErCD,aAAaxH,KAAGwH,EAAIA,EAAEnF,UACtBoF,YAAazH,KAAGyH,EAAIA,EAAEpF,SAE1B,IAAIgN,GAAY1N,EAASiB,KAAK4E,EAC9B,IAAI6H,IAAc1N,EAASiB,KAAK6E,GAAI,OAAO,CAC3C,QAAQ4H,GAEN,IAAK,kBAEL,IAAK,kBAGH,MAAO,GAAK7H,GAAM,GAAKC,CACzB,KAAK,kBAGH,OAAKD,KAAOA,GAAWC,KAAOA,EAEhB,KAAND,EAAU,GAAKA,IAAM,EAAIC,GAAKD,KAAOC,CAC/C,KAAK,gBACL,IAAK,mBAIH,OAAQD,KAAOC,EAGnB,GAAI6H,GAA0B,mBAAdD,CAChB,KAAKC,EAAW,CACd,GAAgB,gBAAL9H,IAA6B,gBAALC,GAAe,OAAO,CAIzD,IAAI8H,GAAQ/H,EAAE/G,YAAa+O,EAAQ/H,EAAEhH,WACrC,IAAI8O,IAAUC,KAAWxP,EAAEW,WAAW4O,IAAUA,YAAiBA,IACxCvP,EAAEW,WAAW6O,IAAUA,YAAiBA,KACzC,eAAiBhI,IAAK,eAAiBC,GAC7D,OAAO,EAQX0H,EAASA,MACTC,EAASA,KAET,KADA,GAAIzP,GAASwP,EAAOxP,OACbA,KAGL,GAAIwP,EAAOxP,KAAY6H,EAAG,MAAO4H,GAAOzP,KAAY8H,CAQtD,IAJA0H,EAAOlO,KAAKuG,GACZ4H,EAAOnO,KAAKwG,GAGR6H,EAAW,CAGb,GADA3P,EAAS6H,EAAE7H,OACPA,IAAW8H,EAAE9H,OAAQ,OAAO,CAEhC,MAAOA,KACL,IAAKuP,EAAG1H,EAAE7H,GAAS8H,EAAE9H,GAASwP,EAAQC,GAAS,OAAO,MAEnD,CAEL,GAAsBxL,GAAlBnE,EAAOO,EAAEP,KAAK+H,EAGlB,IAFA7H,EAASF,EAAKE,OAEVK,EAAEP,KAAKgI,GAAG9H,SAAWA,EAAQ,OAAO,CACxC,MAAOA,KAGL,GADAiE,EAAMnE,EAAKE,IACLK,EAAEe,IAAI0G,EAAG7D,KAAQsL,EAAG1H,EAAE5D,GAAM6D,EAAE7D,GAAMuL,EAAQC,GAAU,OAAO,EAMvE,MAFAD,GAAOM,MACPL,EAAOK,OACA,EAITzP,GAAE0P,QAAU,SAASlI,EAAGC,GACtB,MAAOyH,GAAG1H,EAAGC,IAKfzH,EAAE2P,QAAU,SAASrQ,GACnB,MAAW,OAAPA,GAAoB,EACpBS,EAAYT,KAASU,EAAE8B,QAAQxC,IAAQU,EAAE4P,SAAStQ,IAAQU,EAAEoJ,YAAY9J,IAA6B,IAAfA,EAAIK,OAChE,IAAvBK,EAAEP,KAAKH,GAAKK,QAIrBK,EAAE6P,UAAY,SAASvQ,GACrB,SAAUA,GAAwB,IAAjBA,EAAIwQ,WAKvB9P,EAAE8B,QAAUD,GAAiB,SAASvC,GACpC,MAA8B,mBAAvBqC,EAASiB,KAAKtD,IAIvBU,EAAEkD,SAAW,SAAS5D,GACpB,GAAIyQ,SAAczQ,EAClB,OAAgB,aAATyQ,GAAgC,WAATA,KAAuBzQ,GAIvDU,EAAEkE,MAAM,YAAa,WAAY,SAAU,SAAU,OAAQ,SAAU,SAAU,SAAS8L,GACxFhQ,EAAE,KAAOgQ,GAAQ,SAAS1Q,GACxB,MAAOqC,GAASiB,KAAKtD,KAAS,WAAa0Q,EAAO,OAMjDhQ,EAAEoJ,YAAYnJ,aACjBD,EAAEoJ,YAAc,SAAS9J,GACvB,MAAOU,GAAEe,IAAIzB,EAAK,YAMJ,kBAAP,KAAyC,gBAAb2Q,aACrCjQ,EAAEW,WAAa,SAASrB,GACtB,MAAqB,kBAAPA,KAAqB,IAKvCU,EAAEkQ,SAAW,SAAS5Q,GACpB,MAAO4Q,UAAS5Q,KAASgL,MAAM6F,WAAW7Q,KAI5CU,EAAEsK,MAAQ,SAAShL,GACjB,MAAOU,GAAEoQ,SAAS9Q,IAAQA,KAASA,GAIrCU,EAAE4J,UAAY,SAAStK,GACrB,MAAOA,MAAQ,GAAQA,KAAQ,GAAgC,qBAAvBqC,EAASiB,KAAKtD,IAIxDU,EAAEqQ,OAAS,SAAS/Q,GAClB,MAAe,QAARA,GAITU,EAAEsQ,YAAc,SAAShR,GACvB,MAAOA,SAAa,IAKtBU,EAAEe,IAAM,SAASzB,EAAKsE,GACpB,MAAc,OAAPtE,GAAesC,EAAegB,KAAKtD,EAAKsE,IAQjD5D,EAAEuQ,WAAa,WAEb,MADArP,GAAKlB,EAAIoB,EACFD,MAITnB,EAAEiD,SAAW,SAASN,GACpB,MAAOA,IAIT3C,EAAEwQ,SAAW,SAAS7N,GACpB,MAAO,YACL,MAAOA,KAIX3C,EAAEyQ,KAAO,aAETzQ,EAAEoD,SAAW,SAASQ,GACpB,MAAO,UAAStE,GACd,MAAc,OAAPA,MAAmB,GAAIA,EAAIsE,KAKtC5D,EAAE0Q,WAAa,SAASpR,GACtB,MAAc,OAAPA,EAAc,aAAe,SAASsE,GAC3C,MAAOtE,GAAIsE,KAMf5D,EAAEmD,QAAUnD,EAAE2Q,QAAU,SAAStK,GAE/B,MADAA,GAAQrG,EAAEuO,aAAclI,GACjB,SAAS/G,GACd,MAAOU,GAAEiP,QAAQ3P,EAAK+G,KAK1BrG,EAAE0N,MAAQ,SAASzG,EAAG1H,EAAUM,GAC9B,GAAI+Q,GAAQtP,MAAM0C,KAAKuC,IAAI,EAAGU,GAC9B1H,GAAWO,EAAWP,EAAUM,EAAS,EACzC,KAAK,GAAI8D,GAAI,EAAOsD,EAAJtD,EAAOA,IAAKiN,EAAMjN,GAAKpE,EAASoE,EAChD,OAAOiN,IAIT5Q,EAAE+G,OAAS,SAASL,EAAKH,GAKvB,MAJW,OAAPA,IACFA,EAAMG,EACNA,EAAM,GAEDA,EAAM1C,KAAK6G,MAAM7G,KAAK+C,UAAYR,EAAMG,EAAM,KAIvD1G,EAAE8M,IAAM+D,KAAK/D,KAAO,WAClB,OAAO,GAAI+D,OAAOC,UAIpB,IAAIC,IACFC,IAAK,QACLC,IAAK,OACLC,IAAK,OACLC,IAAK,SACLC,IAAK,SACLC,IAAK,UAEHC,EAActR,EAAEkO,OAAO6C,GAGvBQ,EAAgB,SAASnN,GAC3B,GAAIoN,GAAU,SAASC,GACrB,MAAOrN,GAAIqN,IAGThO,EAAS,MAAQzD,EAAEP,KAAK2E,GAAKsN,KAAK,KAAO,IACzCC,EAAaC,OAAOnO,GACpBoO,EAAgBD,OAAOnO,EAAQ,IACnC,OAAO,UAASqO,GAEd,MADAA,GAAmB,MAAVA,EAAiB,GAAK,GAAKA,EAC7BH,EAAWI,KAAKD,GAAUA,EAAOE,QAAQH,EAAeL,GAAWM,GAG9E9R,GAAEiS,OAASV,EAAcR,GACzB/Q,EAAEkS,SAAWX,EAAcD,GAI3BtR,EAAE8D,OAAS,SAASsG,EAAQhH,EAAU+O,GACpC,GAAIxP,GAAkB,MAAVyH,MAAsB,GAAIA,EAAOhH,EAI7C,OAHIT,SAAe,KACjBA,EAAQwP,GAEHnS,EAAEW,WAAWgC,GAASA,EAAMC,KAAKwH,GAAUzH,EAKpD,IAAIyP,GAAY,CAChBpS,GAAEqS,SAAW,SAASC,GACpB,GAAIC,KAAOH,EAAY,EACvB,OAAOE,GAASA,EAASC,EAAKA,GAKhCvS,EAAEwS,kBACAC,SAAc,kBACdC,YAAc,mBACdT,OAAc,mBAMhB,IAAIU,GAAU,OAIVC,GACFxB,IAAU,IACVyB,KAAU,KACVC,KAAU,IACVC,KAAU,IACVC,SAAU,QACVC,SAAU,SAGRzB,EAAU,4BAEV0B,EAAa,SAASzB,GACxB,MAAO,KAAOmB,EAAQnB,GAOxBzR,GAAEmT,SAAW,SAASC,EAAMC,EAAUC,IAC/BD,GAAYC,IAAaD,EAAWC,GACzCD,EAAWrT,EAAE6O,YAAawE,EAAUrT,EAAEwS,iBAGtC,IAAIrP,GAAUyO,SACXyB,EAASpB,QAAUU,GAASlP,QAC5B4P,EAASX,aAAeC,GAASlP,QACjC4P,EAASZ,UAAYE,GAASlP,QAC/BiO,KAAK,KAAO,KAAM,KAGhBhS,EAAQ,EACR+D,EAAS,QACb2P,GAAKpB,QAAQ7O,EAAS,SAASsO,EAAOQ,EAAQS,EAAaD,EAAUc,GAanE,MAZA9P,IAAU2P,EAAK1R,MAAMhC,EAAO6T,GAAQvB,QAAQR,EAAS0B,GACrDxT,EAAQ6T,EAAS9B,EAAM9R,OAEnBsS,EACFxO,GAAU,cAAgBwO,EAAS,iCAC1BS,EACTjP,GAAU,cAAgBiP,EAAc,uBAC/BD,IACThP,GAAU,OAASgP,EAAW,YAIzBhB,IAEThO,GAAU,OAGL4P,EAASG,WAAU/P,EAAS,mBAAqBA,EAAS,OAE/DA,EAAS,2CACP,oDACAA,EAAS,eAEX,KACE,GAAIgQ,GAAS,GAAIhS,UAAS4R,EAASG,UAAY,MAAO,IAAK/P,GAC3D,MAAOiQ,GAEP,KADAA,GAAEjQ,OAASA,EACLiQ,EAGR,GAAIP,GAAW,SAASQ,GACtB,MAAOF,GAAO7Q,KAAKzB,KAAMwS,EAAM3T,IAI7B4T,EAAWP,EAASG,UAAY,KAGpC,OAFAL,GAAS1P,OAAS,YAAcmQ,EAAW,OAASnQ,EAAS,IAEtD0P,GAITnT,EAAE6T,MAAQ,SAASvU,GACjB,GAAIwU,GAAW9T,EAAEV,EAEjB,OADAwU,GAASC,QAAS,EACXD,EAUT,IAAIhQ,GAAS,SAASgQ,EAAUxU,GAC9B,MAAOwU,GAASC,OAAS/T,EAAEV,GAAKuU,QAAUvU,EAI5CU,GAAEgU,MAAQ,SAAS1U,GACjBU,EAAEkE,KAAKlE,EAAEmO,UAAU7O,GAAM,SAAS0Q,GAChC,GAAIvN,GAAOzC,EAAEgQ,GAAQ1Q,EAAI0Q,EACzBhQ,GAAEY,UAAUoP,GAAQ,WAClB,GAAI/J,IAAQ9E,KAAKkB,SAEjB,OADApB,GAAK+B,MAAMiD,EAAMhG,WACV6D,EAAO3C,KAAMsB,EAAKO,MAAMhD,EAAGiG,QAMxCjG,EAAEgU,MAAMhU,GAGRA,EAAEkE,MAAM,MAAO,OAAQ,UAAW,QAAS,OAAQ,SAAU,WAAY,SAAS8L,GAChF,GAAIhK,GAAS3E,EAAW2O,EACxBhQ,GAAEY,UAAUoP,GAAQ,WAClB,GAAI1Q,GAAM6B,KAAKkB,QAGf,OAFA2D,GAAOhD,MAAM1D,EAAKW,WACJ,UAAT+P,GAA6B,WAATA,GAAqC,IAAf1Q,EAAIK,cAAqBL,GAAI,GACrEwE,EAAO3C,KAAM7B,MAKxBU,EAAEkE,MAAM,SAAU,OAAQ,SAAU,SAAS8L,GAC3C,GAAIhK,GAAS3E,EAAW2O,EACxBhQ,GAAEY,UAAUoP,GAAQ,WAClB,MAAOlM,GAAO3C,KAAM6E,EAAOhD,MAAM7B,KAAKkB,SAAUpC,eAKpDD,EAAEY,UAAU+B,MAAQ,WAClB,MAAOxB,MAAKkB,UAKdrC,EAAEY,UAAUqT,QAAUjU,EAAEY,UAAUsT,OAASlU,EAAEY,UAAU+B,MAEvD3C,EAAEY,UAAUe,SAAW,WACrB,MAAO,GAAKR,KAAKkB,UAUG,kBAAX8R,SAAyBA,OAAOC,KACzCD,OAAO,gBAAkB,WACvB,MAAOnU,OAGX4C,KAAKzB"}
\ No newline at end of file
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/magento-swagger.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/magento-swagger.js
index 957f564715751..69ae7cc6a3cec 100644
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/magento-swagger.js
+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/magento-swagger.js
@@ -3,80 +3,67 @@
  * See COPYING.txt for license details.
  */
 
-/*global SwaggerClient SwaggerUi initOAuth hljs*/
+/*global SwaggerTranslator SwaggerUIBundle SwaggerUIStandalonePreset */
 
 /**
  * @api
  */
-$(function () {
+(function () {
     'use strict';
 
-    var url = $('#input_baseUrl').val();
+    var elementBaseUrl = document.querySelector('#input_baseUrl'),
+        url = elementBaseUrl.value,
+        ui;
 
     // Pre load translate...
-    if (window.SwaggerTranslator) {
-        window.SwaggerTranslator.translate();
+    if (SwaggerTranslator) {
+        SwaggerTranslator.translate();
     }
 
-    /** @function addApiKeyAuthorization */
-    function addApiKeyAuthorization() {
-        var key = encodeURIComponent($('#input_apiKey')[0].value);
+    /**
+     * Takes token from input and adds it to request header.
+     */
+    function addApiKeyAuthorization(e) {
+        var key = encodeURIComponent(e.target.value).trim();
 
-        if (key && key.trim() !== '') {
-            window.swaggerUi.api.clientAuthorizations.add(
-                'apiKeyAuth',
-                new SwaggerClient.ApiKeyAuthorization('Authorization',  'Bearer ' + key, 'header')
-            );
-        }
-    }
+        if (key) {
+            /**
+             * Adds Auth token to request header.
+             *
+             * @param {Object} req
+             *
+             * @returns {Object} req
+             */
+            ui.getConfigs().requestInterceptor = function (req) {
+                req.headers.Authorization = 'Bearer ' + key;
 
-    /** @function log */
-    function log() {
-        if ('console' in window) {
-            console.log.apply(console, arguments);
+                return req;
+            };
         }
     }
 
-    window.swaggerUi = new SwaggerUi({
+    ui = new SwaggerUIBundle({
         url: url,
         // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-        dom_id: 'swagger-ui-container',
+        dom_id: '#swagger-ui-container',
+        presets: [
+            SwaggerUIBundle.presets.apis,
+            SwaggerUIStandalonePreset
+        ],
+        plugins: [
+            SwaggerUIBundle.plugins.DownloadUrl
+        ],
+        deepLinking: true,
         // jscs:enable requireCamelCaseOrUpperCaseIdentifiers
         supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
-
-        /** @function onComplete */
-        onComplete: function () {
-            if (typeof initOAuth == 'function') {
-                initOAuth({
-                    clientId: 'your-client-id',
-                    clientSecret: 'your-client-secret',
-                    realm: 'your-realms',
-                    appName: 'your-app-name',
-                    scopeSeparator: ','
-                });
-            }
-
-            if (window.SwaggerTranslator) {
-                window.SwaggerTranslator.translate();
-            }
-
-            $('pre code').each(function (i, e) {
-                hljs.highlightBlock(e);
-            });
-
-            addApiKeyAuthorization();
-        },
-
-        /** @function onFailure */
-        onFailure: function () {
-            log('Unable to Load SwaggerUI');
-        },
         docExpansion: 'none',
         apisSorter: 'alpha',
-        showRequestHeaders: false
+        showRequestHeaders: false,
+        layout: 'StandaloneLayout'
     });
 
-    $('#input_apiKey').change(addApiKeyAuthorization);
-
-    window.swaggerUi.load();
-});
+    document.querySelector('#input_apiKey').addEventListener('change', addApiKeyAuthorization);
+    document.querySelector('#explore').addEventListener('click', function () {
+        ui.specActions.download();
+    });
+})();
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.min.js
new file mode 100644
index 0000000000000..453934ea53626
--- /dev/null
+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.min.js
@@ -0,0 +1,99 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SwaggerUIBundle=t():e.SwaggerUIBundle=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/dist",t(t.s=1213)}([function(e,t,n){"use strict";e.exports=n(92)},function(e,t,n){e.exports=n(996)()},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(331),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),(0,i.default)(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}()},function(e,t,n){e.exports={default:n(592),__esModule:!0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(565),o=r(i),a=n(330),s=r(a),u=n(48),l=r(u);t.default=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+(void 0===t?"undefined":(0,l.default)(t)));e.prototype=(0,s.default)(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(o.default?(0,o.default)(e,t):e.__proto__=t)}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(48),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!==(void 0===t?"undefined":(0,i.default)(t))&&"function"!=typeof t?e:t}},function(e,t,n){!function(t,n){e.exports=n()}(0,function(){"use strict";function e(e,t){t&&(e.prototype=Object.create(t.prototype)),e.prototype.constructor=e}function t(e){return o(e)?e:O(e)}function n(e){return a(e)?e:M(e)}function r(e){return s(e)?e:T(e)}function i(e){return o(e)&&!u(e)?e:P(e)}function o(e){return!(!e||!e[ln])}function a(e){return!(!e||!e[cn])}function s(e){return!(!e||!e[pn])}function u(e){return a(e)||s(e)}function l(e){return!(!e||!e[fn])}function c(e){return e.value=!1,e}function p(e){e&&(e.value=!0)}function f(){}function h(e,t){t=t||0;for(var n=Math.max(0,e.length-t),r=new Array(n),i=0;i<n;i++)r[i]=e[i+t];return r}function d(e){return void 0===e.size&&(e.size=e.__iterate(v)),e.size}function m(e,t){if("number"!=typeof t){var n=t>>>0;if(""+n!==t||4294967295===n)return NaN;t=n}return t<0?d(e)+t:t}function v(){return!0}function g(e,t,n){return(0===e||void 0!==n&&e<=-n)&&(void 0===t||void 0!==n&&t>=n)}function y(e,t){return b(e,t,0)}function _(e,t){return b(e,t,t)}function b(e,t,n){return void 0===e?n:e<0?Math.max(0,t+e):void 0===t?e:Math.min(t,e)}function x(e){this.next=e}function w(e,t,n,r){var i=0===e?t:1===e?n:[t,n];return r?r.value=i:r={value:i,done:!1},r}function k(){return{value:void 0,done:!0}}function E(e){return!!A(e)}function S(e){return e&&"function"==typeof e.next}function C(e){var t=A(e);return t&&t.call(e)}function A(e){var t=e&&(wn&&e[wn]||e[kn]);if("function"==typeof t)return t}function D(e){return e&&"number"==typeof e.length}function O(e){return null===e||void 0===e?B():o(e)?e.toSeq():z(e)}function M(e){return null===e||void 0===e?B().toKeyedSeq():o(e)?a(e)?e.toSeq():e.fromEntrySeq():L(e)}function T(e){return null===e||void 0===e?B():o(e)?a(e)?e.entrySeq():e.toIndexedSeq():q(e)}function P(e){return(null===e||void 0===e?B():o(e)?a(e)?e.entrySeq():e:q(e)).toSetSeq()}function I(e){this._array=e,this.size=e.length}function R(e){var t=Object.keys(e);this._object=e,this._keys=t,this.size=t.length}function j(e){this._iterable=e,this.size=e.length||e.size}function F(e){this._iterator=e,this._iteratorCache=[]}function N(e){return!(!e||!e[Sn])}function B(){return Cn||(Cn=new I([]))}function L(e){var t=Array.isArray(e)?new I(e).fromEntrySeq():S(e)?new F(e).fromEntrySeq():E(e)?new j(e).fromEntrySeq():"object"==typeof e?new R(e):void 0;if(!t)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+e);return t}function q(e){var t=U(e);if(!t)throw new TypeError("Expected Array or iterable object of values: "+e);return t}function z(e){var t=U(e)||"object"==typeof e&&new R(e);if(!t)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+e);return t}function U(e){return D(e)?new I(e):S(e)?new F(e):E(e)?new j(e):void 0}function W(e,t,n,r){var i=e._cache;if(i){for(var o=i.length-1,a=0;a<=o;a++){var s=i[n?o-a:a];if(!1===t(s[1],r?s[0]:a,e))return a+1}return a}return e.__iterateUncached(t,n)}function V(e,t,n,r){var i=e._cache;if(i){var o=i.length-1,a=0;return new x(function(){var e=i[n?o-a:a];return a++>o?k():w(t,r?e[0]:a-1,e[1])})}return e.__iteratorUncached(t,n)}function H(e,t){return t?G(t,e,"",{"":e}):J(e)}function G(e,t,n,r){return Array.isArray(t)?e.call(r,n,T(t).map(function(n,r){return G(e,n,r,t)})):K(t)?e.call(r,n,M(t).map(function(n,r){return G(e,n,r,t)})):t}function J(e){return Array.isArray(e)?T(e).map(J).toList():K(e)?M(e).map(J).toMap():e}function K(e){return e&&(e.constructor===Object||void 0===e.constructor)}function X(e,t){if(e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1;if("function"==typeof e.valueOf&&"function"==typeof t.valueOf){if(e=e.valueOf(),t=t.valueOf(),e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1}return!("function"!=typeof e.equals||"function"!=typeof t.equals||!e.equals(t))}function Y(e,t){if(e===t)return!0;if(!o(t)||void 0!==e.size&&void 0!==t.size&&e.size!==t.size||void 0!==e.__hash&&void 0!==t.__hash&&e.__hash!==t.__hash||a(e)!==a(t)||s(e)!==s(t)||l(e)!==l(t))return!1;if(0===e.size&&0===t.size)return!0;var n=!u(e);if(l(e)){var r=e.entries();return t.every(function(e,t){var i=r.next().value;return i&&X(i[1],e)&&(n||X(i[0],t))})&&r.next().done}var i=!1;if(void 0===e.size)if(void 0===t.size)"function"==typeof e.cacheResult&&e.cacheResult();else{i=!0;var c=e;e=t,t=c}var p=!0,f=t.__iterate(function(t,r){if(n?!e.has(t):i?!X(t,e.get(r,vn)):!X(e.get(r,vn),t))return p=!1,!1});return p&&e.size===f}function $(e,t){if(!(this instanceof $))return new $(e,t);if(this._value=e,this.size=void 0===t?1/0:Math.max(0,t),0===this.size){if(An)return An;An=this}}function Z(e,t){if(!e)throw new Error(t)}function Q(e,t,n){if(!(this instanceof Q))return new Q(e,t,n);if(Z(0!==n,"Cannot step a Range by 0"),e=e||0,void 0===t&&(t=1/0),n=void 0===n?1:Math.abs(n),t<e&&(n=-n),this._start=e,this._end=t,this._step=n,this.size=Math.max(0,Math.ceil((t-e)/n-1)+1),0===this.size){if(Dn)return Dn;Dn=this}}function ee(){throw TypeError("Abstract")}function te(){}function ne(){}function re(){}function ie(e){return e>>>1&1073741824|3221225471&e}function oe(e){if(!1===e||null===e||void 0===e)return 0;if("function"==typeof e.valueOf&&(!1===(e=e.valueOf())||null===e||void 0===e))return 0;if(!0===e)return 1;var t=typeof e;if("number"===t){if(e!==e||e===1/0)return 0;var n=0|e;for(n!==e&&(n^=4294967295*e);e>4294967295;)e/=4294967295,n^=e;return ie(n)}if("string"===t)return e.length>Fn?ae(e):se(e);if("function"==typeof e.hashCode)return e.hashCode();if("object"===t)return ue(e);if("function"==typeof e.toString)return se(e.toString());throw new Error("Value type "+t+" cannot be hashed.")}function ae(e){var t=Ln[e];return void 0===t&&(t=se(e),Bn===Nn&&(Bn=0,Ln={}),Bn++,Ln[e]=t),t}function se(e){for(var t=0,n=0;n<e.length;n++)t=31*t+e.charCodeAt(n)|0;return ie(t)}function ue(e){var t;if(In&&void 0!==(t=On.get(e)))return t;if(void 0!==(t=e[jn]))return t;if(!Pn){if(void 0!==(t=e.propertyIsEnumerable&&e.propertyIsEnumerable[jn]))return t;if(void 0!==(t=le(e)))return t}if(t=++Rn,1073741824&Rn&&(Rn=0),In)On.set(e,t);else{if(void 0!==Tn&&!1===Tn(e))throw new Error("Non-extensible objects are not allowed as keys.");if(Pn)Object.defineProperty(e,jn,{enumerable:!1,configurable:!1,writable:!1,value:t});else if(void 0!==e.propertyIsEnumerable&&e.propertyIsEnumerable===e.constructor.prototype.propertyIsEnumerable)e.propertyIsEnumerable=function(){return this.constructor.prototype.propertyIsEnumerable.apply(this,arguments)},e.propertyIsEnumerable[jn]=t;else{if(void 0===e.nodeType)throw new Error("Unable to set a non-enumerable property on object.");e[jn]=t}}return t}function le(e){if(e&&e.nodeType>0)switch(e.nodeType){case 1:return e.uniqueID;case 9:return e.documentElement&&e.documentElement.uniqueID}}function ce(e){Z(e!==1/0,"Cannot perform this action with an infinite size.")}function pe(e){return null===e||void 0===e?we():fe(e)&&!l(e)?e:we().withMutations(function(t){var r=n(e);ce(r.size),r.forEach(function(e,n){return t.set(n,e)})})}function fe(e){return!(!e||!e[qn])}function he(e,t){this.ownerID=e,this.entries=t}function de(e,t,n){this.ownerID=e,this.bitmap=t,this.nodes=n}function me(e,t,n){this.ownerID=e,this.count=t,this.nodes=n}function ve(e,t,n){this.ownerID=e,this.keyHash=t,this.entries=n}function ge(e,t,n){this.ownerID=e,this.keyHash=t,this.entry=n}function ye(e,t,n){this._type=t,this._reverse=n,this._stack=e._root&&be(e._root)}function _e(e,t){return w(e,t[0],t[1])}function be(e,t){return{node:e,index:0,__prev:t}}function xe(e,t,n,r){var i=Object.create(zn);return i.size=e,i._root=t,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function we(){return Un||(Un=xe(0))}function ke(e,t,n){var r,i;if(e._root){var o=c(gn),a=c(yn);if(r=Ee(e._root,e.__ownerID,0,void 0,t,n,o,a),!a.value)return e;i=e.size+(o.value?n===vn?-1:1:0)}else{if(n===vn)return e;i=1,r=new he(e.__ownerID,[[t,n]])}return e.__ownerID?(e.size=i,e._root=r,e.__hash=void 0,e.__altered=!0,e):r?xe(i,r):we()}function Ee(e,t,n,r,i,o,a,s){return e?e.update(t,n,r,i,o,a,s):o===vn?e:(p(s),p(a),new ge(t,r,[i,o]))}function Se(e){return e.constructor===ge||e.constructor===ve}function Ce(e,t,n,r,i){if(e.keyHash===r)return new ve(t,r,[e.entry,i]);var o,a=(0===n?e.keyHash:e.keyHash>>>n)&mn,s=(0===n?r:r>>>n)&mn;return new de(t,1<<a|1<<s,a===s?[Ce(e,t,n+hn,r,i)]:(o=new ge(t,r,i),a<s?[e,o]:[o,e]))}function Ae(e,t,n,r){e||(e=new f);for(var i=new ge(e,oe(n),[n,r]),o=0;o<t.length;o++){var a=t[o];i=i.update(e,0,void 0,a[0],a[1])}return i}function De(e,t,n,r){for(var i=0,o=0,a=new Array(n),s=0,u=1,l=t.length;s<l;s++,u<<=1){var c=t[s];void 0!==c&&s!==r&&(i|=u,a[o++]=c)}return new de(e,i,a)}function Oe(e,t,n,r,i){for(var o=0,a=new Array(dn),s=0;0!==n;s++,n>>>=1)a[s]=1&n?t[o++]:void 0;return a[r]=i,new me(e,o+1,a)}function Me(e,t,r){for(var i=[],a=0;a<r.length;a++){var s=r[a],u=n(s);o(s)||(u=u.map(function(e){return H(e)})),i.push(u)}return Ie(e,t,i)}function Te(e,t,n){return e&&e.mergeDeep&&o(t)?e.mergeDeep(t):X(e,t)?e:t}function Pe(e){return function(t,n,r){if(t&&t.mergeDeepWith&&o(n))return t.mergeDeepWith(e,n);var i=e(t,n,r);return X(t,i)?t:i}}function Ie(e,t,n){return n=n.filter(function(e){return 0!==e.size}),0===n.length?e:0!==e.size||e.__ownerID||1!==n.length?e.withMutations(function(e){for(var r=t?function(n,r){e.update(r,vn,function(e){return e===vn?n:t(e,n,r)})}:function(t,n){e.set(n,t)},i=0;i<n.length;i++)n[i].forEach(r)}):e.constructor(n[0])}function Re(e,t,n,r){var i=e===vn,o=t.next();if(o.done){var a=i?n:e,s=r(a);return s===a?e:s}Z(i||e&&e.set,"invalid keyPath");var u=o.value,l=i?vn:e.get(u,vn),c=Re(l,t,n,r);return c===l?e:c===vn?e.remove(u):(i?we():e).set(u,c)}function je(e){return e-=e>>1&1431655765,e=(858993459&e)+(e>>2&858993459),e=e+(e>>4)&252645135,e+=e>>8,127&(e+=e>>16)}function Fe(e,t,n,r){var i=r?e:h(e);return i[t]=n,i}function Ne(e,t,n,r){var i=e.length+1;if(r&&t+1===i)return e[t]=n,e;for(var o=new Array(i),a=0,s=0;s<i;s++)s===t?(o[s]=n,a=-1):o[s]=e[s+a];return o}function Be(e,t,n){var r=e.length-1;if(n&&t===r)return e.pop(),e;for(var i=new Array(r),o=0,a=0;a<r;a++)a===t&&(o=1),i[a]=e[a+o];return i}function Le(e){var t=Ve();if(null===e||void 0===e)return t;if(qe(e))return e;var n=r(e),i=n.size;return 0===i?t:(ce(i),i>0&&i<dn?We(0,i,hn,null,new ze(n.toArray())):t.withMutations(function(e){e.setSize(i),n.forEach(function(t,n){return e.set(n,t)})}))}function qe(e){return!(!e||!e[Gn])}function ze(e,t){this.array=e,this.ownerID=t}function Ue(e,t){function n(e,t,n){return 0===t?r(e,n):i(e,t,n)}function r(e,n){var r=n===s?u&&u.array:e&&e.array,i=n>o?0:o-n,l=a-n;return l>dn&&(l=dn),function(){if(i===l)return Xn;var e=t?--l:i++;return r&&r[e]}}function i(e,r,i){var s,u=e&&e.array,l=i>o?0:o-i>>r,c=1+(a-i>>r);return c>dn&&(c=dn),function(){for(;;){if(s){var e=s();if(e!==Xn)return e;s=null}if(l===c)return Xn;var o=t?--c:l++;s=n(u&&u[o],r-hn,i+(o<<r))}}}var o=e._origin,a=e._capacity,s=$e(a),u=e._tail;return n(e._root,e._level,0)}function We(e,t,n,r,i,o,a){var s=Object.create(Jn);return s.size=t-e,s._origin=e,s._capacity=t,s._level=n,s._root=r,s._tail=i,s.__ownerID=o,s.__hash=a,s.__altered=!1,s}function Ve(){return Kn||(Kn=We(0,0,hn))}function He(e,t,n){if((t=m(e,t))!==t)return e;if(t>=e.size||t<0)return e.withMutations(function(e){t<0?Xe(e,t).set(0,n):Xe(e,0,t+1).set(t,n)});t+=e._origin;var r=e._tail,i=e._root,o=c(yn);return t>=$e(e._capacity)?r=Ge(r,e.__ownerID,0,t,n,o):i=Ge(i,e.__ownerID,e._level,t,n,o),o.value?e.__ownerID?(e._root=i,e._tail=r,e.__hash=void 0,e.__altered=!0,e):We(e._origin,e._capacity,e._level,i,r):e}function Ge(e,t,n,r,i,o){var a=r>>>n&mn,s=e&&a<e.array.length;if(!s&&void 0===i)return e;var u;if(n>0){var l=e&&e.array[a],c=Ge(l,t,n-hn,r,i,o);return c===l?e:(u=Je(e,t),u.array[a]=c,u)}return s&&e.array[a]===i?e:(p(o),u=Je(e,t),void 0===i&&a===u.array.length-1?u.array.pop():u.array[a]=i,u)}function Je(e,t){return t&&e&&t===e.ownerID?e:new ze(e?e.array.slice():[],t)}function Ke(e,t){if(t>=$e(e._capacity))return e._tail;if(t<1<<e._level+hn){for(var n=e._root,r=e._level;n&&r>0;)n=n.array[t>>>r&mn],r-=hn;return n}}function Xe(e,t,n){void 0!==t&&(t|=0),void 0!==n&&(n|=0);var r=e.__ownerID||new f,i=e._origin,o=e._capacity,a=i+t,s=void 0===n?o:n<0?o+n:i+n;if(a===i&&s===o)return e;if(a>=s)return e.clear();for(var u=e._level,l=e._root,c=0;a+c<0;)l=new ze(l&&l.array.length?[void 0,l]:[],r),u+=hn,c+=1<<u;c&&(a+=c,i+=c,s+=c,o+=c);for(var p=$e(o),h=$e(s);h>=1<<u+hn;)l=new ze(l&&l.array.length?[l]:[],r),u+=hn;var d=e._tail,m=h<p?Ke(e,s-1):h>p?new ze([],r):d;if(d&&h>p&&a<o&&d.array.length){l=Je(l,r);for(var v=l,g=u;g>hn;g-=hn){var y=p>>>g&mn;v=v.array[y]=Je(v.array[y],r)}v.array[p>>>hn&mn]=d}if(s<o&&(m=m&&m.removeAfter(r,0,s)),a>=h)a-=h,s-=h,u=hn,l=null,m=m&&m.removeBefore(r,0,a);else if(a>i||h<p){for(c=0;l;){var _=a>>>u&mn;if(_!==h>>>u&mn)break;_&&(c+=(1<<u)*_),u-=hn,l=l.array[_]}l&&a>i&&(l=l.removeBefore(r,u,a-c)),l&&h<p&&(l=l.removeAfter(r,u,h-c)),c&&(a-=c,s-=c)}return e.__ownerID?(e.size=s-a,e._origin=a,e._capacity=s,e._level=u,e._root=l,e._tail=m,e.__hash=void 0,e.__altered=!0,e):We(a,s,u,l,m)}function Ye(e,t,n){for(var i=[],a=0,s=0;s<n.length;s++){var u=n[s],l=r(u);l.size>a&&(a=l.size),o(u)||(l=l.map(function(e){return H(e)})),i.push(l)}return a>e.size&&(e=e.setSize(a)),Ie(e,t,i)}function $e(e){return e<dn?0:e-1>>>hn<<hn}function Ze(e){return null===e||void 0===e?tt():Qe(e)?e:tt().withMutations(function(t){var r=n(e);ce(r.size),r.forEach(function(e,n){return t.set(n,e)})})}function Qe(e){return fe(e)&&l(e)}function et(e,t,n,r){var i=Object.create(Ze.prototype);return i.size=e?e.size:0,i._map=e,i._list=t,i.__ownerID=n,i.__hash=r,i}function tt(){return Yn||(Yn=et(we(),Ve()))}function nt(e,t,n){var r,i,o=e._map,a=e._list,s=o.get(t),u=void 0!==s;if(n===vn){if(!u)return e;a.size>=dn&&a.size>=2*o.size?(i=a.filter(function(e,t){return void 0!==e&&s!==t}),r=i.toKeyedSeq().map(function(e){return e[0]}).flip().toMap(),e.__ownerID&&(r.__ownerID=i.__ownerID=e.__ownerID)):(r=o.remove(t),i=s===a.size-1?a.pop():a.set(s,void 0))}else if(u){if(n===a.get(s)[1])return e;r=o,i=a.set(s,[t,n])}else r=o.set(t,a.size),i=a.set(a.size,[t,n]);return e.__ownerID?(e.size=r.size,e._map=r,e._list=i,e.__hash=void 0,e):et(r,i)}function rt(e,t){this._iter=e,this._useKeys=t,this.size=e.size}function it(e){this._iter=e,this.size=e.size}function ot(e){this._iter=e,this.size=e.size}function at(e){this._iter=e,this.size=e.size}function st(e){var t=Dt(e);return t._iter=e,t.size=e.size,t.flip=function(){return e},t.reverse=function(){var t=e.reverse.apply(this);return t.flip=function(){return e.reverse()},t},t.has=function(t){return e.includes(t)},t.includes=function(t){return e.has(t)},t.cacheResult=Ot,t.__iterateUncached=function(t,n){var r=this;return e.__iterate(function(e,n){return!1!==t(n,e,r)},n)},t.__iteratorUncached=function(t,n){if(t===xn){var r=e.__iterator(t,n);return new x(function(){var e=r.next();if(!e.done){var t=e.value[0];e.value[0]=e.value[1],e.value[1]=t}return e})}return e.__iterator(t===bn?_n:bn,n)},t}function ut(e,t,n){var r=Dt(e);return r.size=e.size,r.has=function(t){return e.has(t)},r.get=function(r,i){var o=e.get(r,vn);return o===vn?i:t.call(n,o,r,e)},r.__iterateUncached=function(r,i){var o=this;return e.__iterate(function(e,i,a){return!1!==r(t.call(n,e,i,a),i,o)},i)},r.__iteratorUncached=function(r,i){var o=e.__iterator(xn,i);return new x(function(){var i=o.next();if(i.done)return i;var a=i.value,s=a[0];return w(r,s,t.call(n,a[1],s,e),i)})},r}function lt(e,t){var n=Dt(e);return n._iter=e,n.size=e.size,n.reverse=function(){return e},e.flip&&(n.flip=function(){var t=st(e);return t.reverse=function(){return e.flip()},t}),n.get=function(n,r){return e.get(t?n:-1-n,r)},n.has=function(n){return e.has(t?n:-1-n)},n.includes=function(t){return e.includes(t)},n.cacheResult=Ot,n.__iterate=function(t,n){var r=this;return e.__iterate(function(e,n){return t(e,n,r)},!n)},n.__iterator=function(t,n){return e.__iterator(t,!n)},n}function ct(e,t,n,r){var i=Dt(e);return r&&(i.has=function(r){var i=e.get(r,vn);return i!==vn&&!!t.call(n,i,r,e)},i.get=function(r,i){var o=e.get(r,vn);return o!==vn&&t.call(n,o,r,e)?o:i}),i.__iterateUncached=function(i,o){var a=this,s=0;return e.__iterate(function(e,o,u){if(t.call(n,e,o,u))return s++,i(e,r?o:s-1,a)},o),s},i.__iteratorUncached=function(i,o){var a=e.__iterator(xn,o),s=0;return new x(function(){for(;;){var o=a.next();if(o.done)return o;var u=o.value,l=u[0],c=u[1];if(t.call(n,c,l,e))return w(i,r?l:s++,c,o)}})},i}function pt(e,t,n){var r=pe().asMutable();return e.__iterate(function(i,o){r.update(t.call(n,i,o,e),0,function(e){return e+1})}),r.asImmutable()}function ft(e,t,n){var r=a(e),i=(l(e)?Ze():pe()).asMutable();e.__iterate(function(o,a){i.update(t.call(n,o,a,e),function(e){return e=e||[],e.push(r?[a,o]:o),e})});var o=At(e);return i.map(function(t){return Et(e,o(t))})}function ht(e,t,n,r){var i=e.size;if(void 0!==t&&(t|=0),void 0!==n&&(n===1/0?n=i:n|=0),g(t,n,i))return e;var o=y(t,i),a=_(n,i);if(o!==o||a!==a)return ht(e.toSeq().cacheResult(),t,n,r);var s,u=a-o;u===u&&(s=u<0?0:u);var l=Dt(e);return l.size=0===s?s:e.size&&s||void 0,!r&&N(e)&&s>=0&&(l.get=function(t,n){return t=m(this,t),t>=0&&t<s?e.get(t+o,n):n}),l.__iterateUncached=function(t,n){var i=this;if(0===s)return 0;if(n)return this.cacheResult().__iterate(t,n);var a=0,u=!0,l=0;return e.__iterate(function(e,n){if(!u||!(u=a++<o))return l++,!1!==t(e,r?n:l-1,i)&&l!==s}),l},l.__iteratorUncached=function(t,n){if(0!==s&&n)return this.cacheResult().__iterator(t,n);var i=0!==s&&e.__iterator(t,n),a=0,u=0;return new x(function(){for(;a++<o;)i.next();if(++u>s)return k();var e=i.next();return r||t===bn?e:t===_n?w(t,u-1,void 0,e):w(t,u-1,e.value[1],e)})},l}function dt(e,t,n){var r=Dt(e);return r.__iterateUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterate(r,i);var a=0;return e.__iterate(function(e,i,s){return t.call(n,e,i,s)&&++a&&r(e,i,o)}),a},r.__iteratorUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterator(r,i);var a=e.__iterator(xn,i),s=!0;return new x(function(){if(!s)return k();var e=a.next();if(e.done)return e;var i=e.value,u=i[0],l=i[1];return t.call(n,l,u,o)?r===xn?e:w(r,u,l,e):(s=!1,k())})},r}function mt(e,t,n,r){var i=Dt(e);return i.__iterateUncached=function(i,o){var a=this;if(o)return this.cacheResult().__iterate(i,o);var s=!0,u=0;return e.__iterate(function(e,o,l){if(!s||!(s=t.call(n,e,o,l)))return u++,i(e,r?o:u-1,a)}),u},i.__iteratorUncached=function(i,o){var a=this;if(o)return this.cacheResult().__iterator(i,o);var s=e.__iterator(xn,o),u=!0,l=0;return new x(function(){var e,o,c;do{if(e=s.next(),e.done)return r||i===bn?e:i===_n?w(i,l++,void 0,e):w(i,l++,e.value[1],e);var p=e.value;o=p[0],c=p[1],u&&(u=t.call(n,c,o,a))}while(u);return i===xn?e:w(i,o,c,e)})},i}function vt(e,t){var r=a(e),i=[e].concat(t).map(function(e){return o(e)?r&&(e=n(e)):e=r?L(e):q(Array.isArray(e)?e:[e]),e}).filter(function(e){return 0!==e.size});if(0===i.length)return e;if(1===i.length){var u=i[0];if(u===e||r&&a(u)||s(e)&&s(u))return u}var l=new I(i);return r?l=l.toKeyedSeq():s(e)||(l=l.toSetSeq()),l=l.flatten(!0),l.size=i.reduce(function(e,t){if(void 0!==e){var n=t.size;if(void 0!==n)return e+n}},0),l}function gt(e,t,n){var r=Dt(e);return r.__iterateUncached=function(r,i){function a(e,l){var c=this;e.__iterate(function(e,i){return(!t||l<t)&&o(e)?a(e,l+1):!1===r(e,n?i:s++,c)&&(u=!0),!u},i)}var s=0,u=!1;return a(e,0),s},r.__iteratorUncached=function(r,i){var a=e.__iterator(r,i),s=[],u=0;return new x(function(){for(;a;){var e=a.next();if(!1===e.done){var l=e.value;if(r===xn&&(l=l[1]),t&&!(s.length<t)||!o(l))return n?e:w(r,u++,l,e);s.push(a),a=l.__iterator(r,i)}else a=s.pop()}return k()})},r}function yt(e,t,n){var r=At(e);return e.toSeq().map(function(i,o){return r(t.call(n,i,o,e))}).flatten(!0)}function _t(e,t){var n=Dt(e);return n.size=e.size&&2*e.size-1,n.__iterateUncached=function(n,r){var i=this,o=0;return e.__iterate(function(e,r){return(!o||!1!==n(t,o++,i))&&!1!==n(e,o++,i)},r),o},n.__iteratorUncached=function(n,r){var i,o=e.__iterator(bn,r),a=0;return new x(function(){return(!i||a%2)&&(i=o.next(),i.done)?i:a%2?w(n,a++,t):w(n,a++,i.value,i)})},n}function bt(e,t,n){t||(t=Mt);var r=a(e),i=0,o=e.toSeq().map(function(t,r){return[r,t,i++,n?n(t,r,e):t]}).toArray();return o.sort(function(e,n){return t(e[3],n[3])||e[2]-n[2]}).forEach(r?function(e,t){o[t].length=2}:function(e,t){o[t]=e[1]}),r?M(o):s(e)?T(o):P(o)}function xt(e,t,n){if(t||(t=Mt),n){var r=e.toSeq().map(function(t,r){return[t,n(t,r,e)]}).reduce(function(e,n){return wt(t,e[1],n[1])?n:e});return r&&r[0]}return e.reduce(function(e,n){return wt(t,e,n)?n:e})}function wt(e,t,n){var r=e(n,t);return 0===r&&n!==t&&(void 0===n||null===n||n!==n)||r>0}function kt(e,n,r){var i=Dt(e);return i.size=new I(r).map(function(e){return e.size}).min(),i.__iterate=function(e,t){for(var n,r=this.__iterator(bn,t),i=0;!(n=r.next()).done&&!1!==e(n.value,i++,this););return i},i.__iteratorUncached=function(e,i){var o=r.map(function(e){return e=t(e),C(i?e.reverse():e)}),a=0,s=!1;return new x(function(){var t;return s||(t=o.map(function(e){return e.next()}),s=t.some(function(e){return e.done})),s?k():w(e,a++,n.apply(null,t.map(function(e){return e.value})))})},i}function Et(e,t){return N(e)?t:e.constructor(t)}function St(e){if(e!==Object(e))throw new TypeError("Expected [K, V] tuple: "+e)}function Ct(e){return ce(e.size),d(e)}function At(e){return a(e)?n:s(e)?r:i}function Dt(e){return Object.create((a(e)?M:s(e)?T:P).prototype)}function Ot(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):O.prototype.cacheResult.call(this)}function Mt(e,t){return e>t?1:e<t?-1:0}function Tt(e){var n=C(e);if(!n){if(!D(e))throw new TypeError("Expected iterable or array-like: "+e);n=C(t(e))}return n}function Pt(e,t){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var a=Object.keys(e);jt(i,a),i.size=a.length,i._name=t,i._keys=a,i._defaultValues=e}this._map=pe(o)},i=r.prototype=Object.create($n);return i.constructor=r,r}function It(e,t,n){var r=Object.create(Object.getPrototypeOf(e));return r._map=t,r.__ownerID=n,r}function Rt(e){return e._name||e.constructor.name||"Record"}function jt(e,t){try{t.forEach(Ft.bind(void 0,e))}catch(e){}}function Ft(e,t){Object.defineProperty(e,t,{get:function(){return this.get(t)},set:function(e){Z(this.__ownerID,"Cannot set on an immutable record."),this.set(t,e)}})}function Nt(e){return null===e||void 0===e?zt():Bt(e)&&!l(e)?e:zt().withMutations(function(t){var n=i(e);ce(n.size),n.forEach(function(e){return t.add(e)})})}function Bt(e){return!(!e||!e[Zn])}function Lt(e,t){return e.__ownerID?(e.size=t.size,e._map=t,e):t===e._map?e:0===t.size?e.__empty():e.__make(t)}function qt(e,t){var n=Object.create(Qn);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function zt(){return er||(er=qt(we()))}function Ut(e){return null===e||void 0===e?Ht():Wt(e)?e:Ht().withMutations(function(t){var n=i(e);ce(n.size),n.forEach(function(e){return t.add(e)})})}function Wt(e){return Bt(e)&&l(e)}function Vt(e,t){var n=Object.create(tr);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function Ht(){return nr||(nr=Vt(tt()))}function Gt(e){return null===e||void 0===e?Xt():Jt(e)?e:Xt().unshiftAll(e)}function Jt(e){return!(!e||!e[rr])}function Kt(e,t,n,r){var i=Object.create(ir);return i.size=e,i._head=t,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function Xt(){return or||(or=Kt(0))}function Yt(e,t){var n=function(n){e.prototype[n]=t[n]};return Object.keys(t).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(t).forEach(n),e}function $t(e,t){return t}function Zt(e,t){return[t,e]}function Qt(e){return function(){return!e.apply(this,arguments)}}function en(e){return function(){return-e.apply(this,arguments)}}function tn(e){return"string"==typeof e?JSON.stringify(e):String(e)}function nn(){return h(arguments)}function rn(e,t){return e<t?1:e>t?-1:0}function on(e){if(e.size===1/0)return 0;var t=l(e),n=a(e),r=t?1:0;return an(e.__iterate(n?t?function(e,t){r=31*r+sn(oe(e),oe(t))|0}:function(e,t){r=r+sn(oe(e),oe(t))|0}:t?function(e){r=31*r+oe(e)|0}:function(e){r=r+oe(e)|0}),r)}function an(e,t){return t=Mn(t,3432918353),t=Mn(t<<15|t>>>-15,461845907),t=Mn(t<<13|t>>>-13,5),t=(t+3864292196|0)^e,t=Mn(t^t>>>16,2246822507),t=Mn(t^t>>>13,3266489909),t=ie(t^t>>>16)}function sn(e,t){return e^t+2654435769+(e<<6)+(e>>2)|0}var un=Array.prototype.slice;e(n,t),e(r,t),e(i,t),t.isIterable=o,t.isKeyed=a,t.isIndexed=s,t.isAssociative=u,t.isOrdered=l,t.Keyed=n,t.Indexed=r,t.Set=i;var ln="@@__IMMUTABLE_ITERABLE__@@",cn="@@__IMMUTABLE_KEYED__@@",pn="@@__IMMUTABLE_INDEXED__@@",fn="@@__IMMUTABLE_ORDERED__@@",hn=5,dn=1<<hn,mn=dn-1,vn={},gn={value:!1},yn={value:!1},_n=0,bn=1,xn=2,wn="function"==typeof Symbol&&Symbol.iterator,kn="@@iterator",En=wn||kn;x.prototype.toString=function(){return"[Iterator]"},x.KEYS=_n,x.VALUES=bn,x.ENTRIES=xn,x.prototype.inspect=x.prototype.toSource=function(){return this.toString()},x.prototype[En]=function(){return this},e(O,t),O.of=function(){return O(arguments)},O.prototype.toSeq=function(){return this},O.prototype.toString=function(){return this.__toString("Seq {","}")},O.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},O.prototype.__iterate=function(e,t){return W(this,e,t,!0)},O.prototype.__iterator=function(e,t){return V(this,e,t,!0)},e(M,O),M.prototype.toKeyedSeq=function(){return this},e(T,O),T.of=function(){return T(arguments)},T.prototype.toIndexedSeq=function(){return this},T.prototype.toString=function(){return this.__toString("Seq [","]")},T.prototype.__iterate=function(e,t){return W(this,e,t,!1)},T.prototype.__iterator=function(e,t){return V(this,e,t,!1)},e(P,O),P.of=function(){return P(arguments)},P.prototype.toSetSeq=function(){return this},O.isSeq=N,O.Keyed=M,O.Set=P,O.Indexed=T;var Sn="@@__IMMUTABLE_SEQ__@@";O.prototype[Sn]=!0,e(I,T),I.prototype.get=function(e,t){return this.has(e)?this._array[m(this,e)]:t},I.prototype.__iterate=function(e,t){for(var n=this._array,r=n.length-1,i=0;i<=r;i++)if(!1===e(n[t?r-i:i],i,this))return i+1;return i},I.prototype.__iterator=function(e,t){var n=this._array,r=n.length-1,i=0;return new x(function(){return i>r?k():w(e,i,n[t?r-i++:i++])})},e(R,M),R.prototype.get=function(e,t){return void 0===t||this.has(e)?this._object[e]:t},R.prototype.has=function(e){return this._object.hasOwnProperty(e)},R.prototype.__iterate=function(e,t){for(var n=this._object,r=this._keys,i=r.length-1,o=0;o<=i;o++){var a=r[t?i-o:o];if(!1===e(n[a],a,this))return o+1}return o},R.prototype.__iterator=function(e,t){var n=this._object,r=this._keys,i=r.length-1,o=0;return new x(function(){var a=r[t?i-o:o];return o++>i?k():w(e,a,n[a])})},R.prototype[fn]=!0,e(j,T),j.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);var n=this._iterable,r=C(n),i=0;if(S(r))for(var o;!(o=r.next()).done&&!1!==e(o.value,i++,this););return i},j.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterable,r=C(n);if(!S(r))return new x(k);var i=0;return new x(function(){var t=r.next();return t.done?t:w(e,i++,t.value)})},e(F,T),F.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);for(var n=this._iterator,r=this._iteratorCache,i=0;i<r.length;)if(!1===e(r[i],i++,this))return i;for(var o;!(o=n.next()).done;){var a=o.value;if(r[i]=a,!1===e(a,i++,this))break}return i},F.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterator,r=this._iteratorCache,i=0;return new x(function(){if(i>=r.length){var t=n.next();if(t.done)return t;r[i]=t.value}return w(e,i,r[i++])})};var Cn;e($,T),$.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},$.prototype.get=function(e,t){return this.has(e)?this._value:t},$.prototype.includes=function(e){return X(this._value,e)},$.prototype.slice=function(e,t){var n=this.size;return g(e,t,n)?this:new $(this._value,_(t,n)-y(e,n))},$.prototype.reverse=function(){return this},$.prototype.indexOf=function(e){return X(this._value,e)?0:-1},$.prototype.lastIndexOf=function(e){return X(this._value,e)?this.size:-1},$.prototype.__iterate=function(e,t){for(var n=0;n<this.size;n++)if(!1===e(this._value,n,this))return n+1;return n},$.prototype.__iterator=function(e,t){var n=this,r=0;return new x(function(){return r<n.size?w(e,r++,n._value):k()})},$.prototype.equals=function(e){return e instanceof $?X(this._value,e._value):Y(e)};var An;e(Q,T),Q.prototype.toString=function(){return 0===this.size?"Range []":"Range [ "+this._start+"..."+this._end+(1!==this._step?" by "+this._step:"")+" ]"},Q.prototype.get=function(e,t){return this.has(e)?this._start+m(this,e)*this._step:t},Q.prototype.includes=function(e){var t=(e-this._start)/this._step;return t>=0&&t<this.size&&t===Math.floor(t)},Q.prototype.slice=function(e,t){return g(e,t,this.size)?this:(e=y(e,this.size),t=_(t,this.size),t<=e?new Q(0,0):new Q(this.get(e,this._end),this.get(t,this._end),this._step))},Q.prototype.indexOf=function(e){var t=e-this._start;if(t%this._step==0){var n=t/this._step;if(n>=0&&n<this.size)return n}return-1},Q.prototype.lastIndexOf=function(e){return this.indexOf(e)},Q.prototype.__iterate=function(e,t){for(var n=this.size-1,r=this._step,i=t?this._start+n*r:this._start,o=0;o<=n;o++){if(!1===e(i,o,this))return o+1;i+=t?-r:r}return o},Q.prototype.__iterator=function(e,t){var n=this.size-1,r=this._step,i=t?this._start+n*r:this._start,o=0;return new x(function(){var a=i;return i+=t?-r:r,o>n?k():w(e,o++,a)})},Q.prototype.equals=function(e){return e instanceof Q?this._start===e._start&&this._end===e._end&&this._step===e._step:Y(this,e)};var Dn;e(ee,t),e(te,ee),e(ne,ee),e(re,ee),ee.Keyed=te,ee.Indexed=ne,ee.Set=re;var On,Mn="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(e,t){e|=0,t|=0;var n=65535&e,r=65535&t;return n*r+((e>>>16)*r+n*(t>>>16)<<16>>>0)|0},Tn=Object.isExtensible,Pn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(e){return!1}}(),In="function"==typeof WeakMap;In&&(On=new WeakMap);var Rn=0,jn="__immutablehash__";"function"==typeof Symbol&&(jn=Symbol(jn));var Fn=16,Nn=255,Bn=0,Ln={};e(pe,te),pe.of=function(){var e=un.call(arguments,0);return we().withMutations(function(t){for(var n=0;n<e.length;n+=2){if(n+1>=e.length)throw new Error("Missing value for key: "+e[n]);t.set(e[n],e[n+1])}})},pe.prototype.toString=function(){return this.__toString("Map {","}")},pe.prototype.get=function(e,t){return this._root?this._root.get(0,void 0,e,t):t},pe.prototype.set=function(e,t){return ke(this,e,t)},pe.prototype.setIn=function(e,t){return this.updateIn(e,vn,function(){return t})},pe.prototype.remove=function(e){return ke(this,e,vn)},pe.prototype.deleteIn=function(e){return this.updateIn(e,function(){return vn})},pe.prototype.update=function(e,t,n){return 1===arguments.length?e(this):this.updateIn([e],t,n)},pe.prototype.updateIn=function(e,t,n){n||(n=t,t=void 0);var r=Re(this,Tt(e),t,n);return r===vn?void 0:r},pe.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):we()},pe.prototype.merge=function(){return Me(this,void 0,arguments)},pe.prototype.mergeWith=function(e){return Me(this,e,un.call(arguments,1))},pe.prototype.mergeIn=function(e){var t=un.call(arguments,1);return this.updateIn(e,we(),function(e){return"function"==typeof e.merge?e.merge.apply(e,t):t[t.length-1]})},pe.prototype.mergeDeep=function(){return Me(this,Te,arguments)},pe.prototype.mergeDeepWith=function(e){var t=un.call(arguments,1);return Me(this,Pe(e),t)},pe.prototype.mergeDeepIn=function(e){var t=un.call(arguments,1);return this.updateIn(e,we(),function(e){return"function"==typeof e.mergeDeep?e.mergeDeep.apply(e,t):t[t.length-1]})},pe.prototype.sort=function(e){return Ze(bt(this,e))},pe.prototype.sortBy=function(e,t){return Ze(bt(this,t,e))},pe.prototype.withMutations=function(e){var t=this.asMutable();return e(t),t.wasAltered()?t.__ensureOwner(this.__ownerID):this},pe.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new f)},pe.prototype.asImmutable=function(){return this.__ensureOwner()},pe.prototype.wasAltered=function(){return this.__altered},pe.prototype.__iterator=function(e,t){return new ye(this,e,t)},pe.prototype.__iterate=function(e,t){var n=this,r=0;return this._root&&this._root.iterate(function(t){return r++,e(t[1],t[0],n)},t),r},pe.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?xe(this.size,this._root,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},pe.isMap=fe;var qn="@@__IMMUTABLE_MAP__@@",zn=pe.prototype;zn[qn]=!0,zn.delete=zn.remove,zn.removeIn=zn.deleteIn,he.prototype.get=function(e,t,n,r){for(var i=this.entries,o=0,a=i.length;o<a;o++)if(X(n,i[o][0]))return i[o][1];return r},he.prototype.update=function(e,t,n,r,i,o,a){for(var s=i===vn,u=this.entries,l=0,c=u.length;l<c&&!X(r,u[l][0]);l++);var f=l<c;if(f?u[l][1]===i:s)return this;if(p(a),(s||!f)&&p(o),!s||1!==u.length){if(!f&&!s&&u.length>=Wn)return Ae(e,u,r,i);var d=e&&e===this.ownerID,m=d?u:h(u);return f?s?l===c-1?m.pop():m[l]=m.pop():m[l]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new he(e,m)}},de.prototype.get=function(e,t,n,r){void 0===t&&(t=oe(n));var i=1<<((0===e?t:t>>>e)&mn),o=this.bitmap;return 0==(o&i)?r:this.nodes[je(o&i-1)].get(e+hn,t,n,r)},de.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=(0===t?n:n>>>t)&mn,u=1<<s,l=this.bitmap,c=0!=(l&u);if(!c&&i===vn)return this;var p=je(l&u-1),f=this.nodes,h=c?f[p]:void 0,d=Ee(h,e,t+hn,n,r,i,o,a);if(d===h)return this;if(!c&&d&&f.length>=Vn)return Oe(e,f,l,s,d);if(c&&!d&&2===f.length&&Se(f[1^p]))return f[1^p];if(c&&d&&1===f.length&&Se(d))return d;var m=e&&e===this.ownerID,v=c?d?l:l^u:l|u,g=c?d?Fe(f,p,d,m):Be(f,p,m):Ne(f,p,d,m);return m?(this.bitmap=v,this.nodes=g,this):new de(e,v,g)},me.prototype.get=function(e,t,n,r){void 0===t&&(t=oe(n));var i=(0===e?t:t>>>e)&mn,o=this.nodes[i];return o?o.get(e+hn,t,n,r):r},me.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=(0===t?n:n>>>t)&mn,u=i===vn,l=this.nodes,c=l[s];if(u&&!c)return this;var p=Ee(c,e,t+hn,n,r,i,o,a);if(p===c)return this;var f=this.count;if(c){if(!p&&--f<Hn)return De(e,l,f,s)}else f++;var h=e&&e===this.ownerID,d=Fe(l,s,p,h);return h?(this.count=f,this.nodes=d,this):new me(e,f,d)},ve.prototype.get=function(e,t,n,r){for(var i=this.entries,o=0,a=i.length;o<a;o++)if(X(n,i[o][0]))return i[o][1];return r},ve.prototype.update=function(e,t,n,r,i,o,a){void 0===n&&(n=oe(r));var s=i===vn;if(n!==this.keyHash)return s?this:(p(a),p(o),Ce(this,e,t,n,[r,i]));for(var u=this.entries,l=0,c=u.length;l<c&&!X(r,u[l][0]);l++);var f=l<c;if(f?u[l][1]===i:s)return this;if(p(a),(s||!f)&&p(o),s&&2===c)return new ge(e,this.keyHash,u[1^l]);var d=e&&e===this.ownerID,m=d?u:h(u);return f?s?l===c-1?m.pop():m[l]=m.pop():m[l]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new ve(e,this.keyHash,m)},ge.prototype.get=function(e,t,n,r){return X(n,this.entry[0])?this.entry[1]:r},ge.prototype.update=function(e,t,n,r,i,o,a){var s=i===vn,u=X(r,this.entry[0]);return(u?i===this.entry[1]:s)?this:(p(a),s?void p(o):u?e&&e===this.ownerID?(this.entry[1]=i,this):new ge(e,this.keyHash,[r,i]):(p(o),Ce(this,e,t,oe(r),[r,i])))},he.prototype.iterate=ve.prototype.iterate=function(e,t){for(var n=this.entries,r=0,i=n.length-1;r<=i;r++)if(!1===e(n[t?i-r:r]))return!1},de.prototype.iterate=me.prototype.iterate=function(e,t){for(var n=this.nodes,r=0,i=n.length-1;r<=i;r++){var o=n[t?i-r:r];if(o&&!1===o.iterate(e,t))return!1}},ge.prototype.iterate=function(e,t){return e(this.entry)},e(ye,x),ye.prototype.next=function(){for(var e=this._type,t=this._stack;t;){var n,r=t.node,i=t.index++;if(r.entry){if(0===i)return _e(e,r.entry)}else if(r.entries){if(n=r.entries.length-1,i<=n)return _e(e,r.entries[this._reverse?n-i:i])}else if(n=r.nodes.length-1,i<=n){var o=r.nodes[this._reverse?n-i:i];if(o){if(o.entry)return _e(e,o.entry);t=this._stack=be(o,t)}continue}t=this._stack=this._stack.__prev}return k()};var Un,Wn=dn/4,Vn=dn/2,Hn=dn/4;e(Le,ne),Le.of=function(){return this(arguments)},Le.prototype.toString=function(){return this.__toString("List [","]")},Le.prototype.get=function(e,t){if((e=m(this,e))>=0&&e<this.size){e+=this._origin;var n=Ke(this,e);return n&&n.array[e&mn]}return t},Le.prototype.set=function(e,t){return He(this,e,t)},Le.prototype.remove=function(e){return this.has(e)?0===e?this.shift():e===this.size-1?this.pop():this.splice(e,1):this},Le.prototype.insert=function(e,t){return this.splice(e,0,t)},Le.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=hn,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):Ve()},Le.prototype.push=function(){var e=arguments,t=this.size;return this.withMutations(function(n){Xe(n,0,t+e.length);for(var r=0;r<e.length;r++)n.set(t+r,e[r])})},Le.prototype.pop=function(){return Xe(this,0,-1)},Le.prototype.unshift=function(){var e=arguments;return this.withMutations(function(t){Xe(t,-e.length);for(var n=0;n<e.length;n++)t.set(n,e[n])})},Le.prototype.shift=function(){return Xe(this,1)},Le.prototype.merge=function(){return Ye(this,void 0,arguments)},Le.prototype.mergeWith=function(e){return Ye(this,e,un.call(arguments,1))},Le.prototype.mergeDeep=function(){return Ye(this,Te,arguments)},Le.prototype.mergeDeepWith=function(e){var t=un.call(arguments,1);return Ye(this,Pe(e),t)},Le.prototype.setSize=function(e){return Xe(this,0,e)},Le.prototype.slice=function(e,t){var n=this.size;return g(e,t,n)?this:Xe(this,y(e,n),_(t,n))},Le.prototype.__iterator=function(e,t){var n=0,r=Ue(this,t);return new x(function(){var t=r();return t===Xn?k():w(e,n++,t)})},Le.prototype.__iterate=function(e,t){for(var n,r=0,i=Ue(this,t);(n=i())!==Xn&&!1!==e(n,r++,this););return r},Le.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?We(this._origin,this._capacity,this._level,this._root,this._tail,e,this.__hash):(this.__ownerID=e,this)},Le.isList=qe;var Gn="@@__IMMUTABLE_LIST__@@",Jn=Le.prototype;Jn[Gn]=!0,Jn.delete=Jn.remove,Jn.setIn=zn.setIn,Jn.deleteIn=Jn.removeIn=zn.removeIn,Jn.update=zn.update,Jn.updateIn=zn.updateIn,Jn.mergeIn=zn.mergeIn,Jn.mergeDeepIn=zn.mergeDeepIn,Jn.withMutations=zn.withMutations,Jn.asMutable=zn.asMutable,Jn.asImmutable=zn.asImmutable,Jn.wasAltered=zn.wasAltered,ze.prototype.removeBefore=function(e,t,n){if(n===t?1<<t:0===this.array.length)return this;var r=n>>>t&mn;if(r>=this.array.length)return new ze([],e);var i,o=0===r;if(t>0){var a=this.array[r];if((i=a&&a.removeBefore(e,t-hn,n))===a&&o)return this}if(o&&!i)return this;var s=Je(this,e);if(!o)for(var u=0;u<r;u++)s.array[u]=void 0;return i&&(s.array[r]=i),s},ze.prototype.removeAfter=function(e,t,n){if(n===(t?1<<t:0)||0===this.array.length)return this;var r=n-1>>>t&mn;if(r>=this.array.length)return this;var i;if(t>0){var o=this.array[r];if((i=o&&o.removeAfter(e,t-hn,n))===o&&r===this.array.length-1)return this}var a=Je(this,e);return a.array.splice(r+1),i&&(a.array[r]=i),a};var Kn,Xn={};e(Ze,pe),Ze.of=function(){return this(arguments)},Ze.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Ze.prototype.get=function(e,t){var n=this._map.get(e);return void 0!==n?this._list.get(n)[1]:t},Ze.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):tt()},Ze.prototype.set=function(e,t){return nt(this,e,t)},Ze.prototype.remove=function(e){return nt(this,e,vn)},Ze.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Ze.prototype.__iterate=function(e,t){var n=this;return this._list.__iterate(function(t){return t&&e(t[1],t[0],n)},t)},Ze.prototype.__iterator=function(e,t){return this._list.fromEntrySeq().__iterator(e,t)},Ze.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e),n=this._list.__ensureOwner(e);return e?et(t,n,e,this.__hash):(this.__ownerID=e,this._map=t,this._list=n,this)},Ze.isOrderedMap=Qe,Ze.prototype[fn]=!0,Ze.prototype.delete=Ze.prototype.remove;var Yn;e(rt,M),rt.prototype.get=function(e,t){return this._iter.get(e,t)},rt.prototype.has=function(e){return this._iter.has(e)},rt.prototype.valueSeq=function(){return this._iter.valueSeq()},rt.prototype.reverse=function(){var e=this,t=lt(this,!0);return this._useKeys||(t.valueSeq=function(){return e._iter.toSeq().reverse()}),t},rt.prototype.map=function(e,t){var n=this,r=ut(this,e,t);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(e,t)}),r},rt.prototype.__iterate=function(e,t){var n,r=this;return this._iter.__iterate(this._useKeys?function(t,n){return e(t,n,r)}:(n=t?Ct(this):0,function(i){return e(i,t?--n:n++,r)}),t)},rt.prototype.__iterator=function(e,t){if(this._useKeys)return this._iter.__iterator(e,t);var n=this._iter.__iterator(bn,t),r=t?Ct(this):0;return new x(function(){var i=n.next();return i.done?i:w(e,t?--r:r++,i.value,i)})},rt.prototype[fn]=!0,e(it,T),it.prototype.includes=function(e){return this._iter.includes(e)},it.prototype.__iterate=function(e,t){var n=this,r=0;return this._iter.__iterate(function(t){return e(t,r++,n)},t)},it.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t),r=0;return new x(function(){var t=n.next();return t.done?t:w(e,r++,t.value,t)})},e(ot,P),ot.prototype.has=function(e){return this._iter.includes(e)},ot.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){return e(t,t,n)},t)},ot.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t);return new x(function(){var t=n.next();return t.done?t:w(e,t.value,t.value,t)})},e(at,M),at.prototype.entrySeq=function(){return this._iter.toSeq()},at.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){if(t){St(t);var r=o(t);return e(r?t.get(1):t[1],r?t.get(0):t[0],n)}},t)},at.prototype.__iterator=function(e,t){var n=this._iter.__iterator(bn,t);return new x(function(){for(;;){var t=n.next();if(t.done)return t;var r=t.value;if(r){St(r);var i=o(r);return w(e,i?r.get(0):r[0],i?r.get(1):r[1],t)}}})},it.prototype.cacheResult=rt.prototype.cacheResult=ot.prototype.cacheResult=at.prototype.cacheResult=Ot,e(Pt,te),Pt.prototype.toString=function(){return this.__toString(Rt(this)+" {","}")},Pt.prototype.has=function(e){return this._defaultValues.hasOwnProperty(e)},Pt.prototype.get=function(e,t){if(!this.has(e))return t;var n=this._defaultValues[e];return this._map?this._map.get(e,n):n},Pt.prototype.clear=function(){if(this.__ownerID)return this._map&&this._map.clear(),this;var e=this.constructor;return e._empty||(e._empty=It(this,we()))},Pt.prototype.set=function(e,t){if(!this.has(e))throw new Error('Cannot set unknown key "'+e+'" on '+Rt(this));if(this._map&&!this._map.has(e)){if(t===this._defaultValues[e])return this}var n=this._map&&this._map.set(e,t);return this.__ownerID||n===this._map?this:It(this,n)},Pt.prototype.remove=function(e){if(!this.has(e))return this;var t=this._map&&this._map.remove(e);return this.__ownerID||t===this._map?this:It(this,t)},Pt.prototype.wasAltered=function(){return this._map.wasAltered()},Pt.prototype.__iterator=function(e,t){var r=this;return n(this._defaultValues).map(function(e,t){return r.get(t)}).__iterator(e,t)},Pt.prototype.__iterate=function(e,t){var r=this;return n(this._defaultValues).map(function(e,t){return r.get(t)}).__iterate(e,t)},Pt.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map&&this._map.__ensureOwner(e);return e?It(this,t,e):(this.__ownerID=e,this._map=t,this)};var $n=Pt.prototype;$n.delete=$n.remove,$n.deleteIn=$n.removeIn=zn.removeIn,$n.merge=zn.merge,$n.mergeWith=zn.mergeWith,$n.mergeIn=zn.mergeIn,$n.mergeDeep=zn.mergeDeep,$n.mergeDeepWith=zn.mergeDeepWith,$n.mergeDeepIn=zn.mergeDeepIn,$n.setIn=zn.setIn,$n.update=zn.update,$n.updateIn=zn.updateIn,$n.withMutations=zn.withMutations,$n.asMutable=zn.asMutable,$n.asImmutable=zn.asImmutable,e(Nt,re),Nt.of=function(){return this(arguments)},Nt.fromKeys=function(e){return this(n(e).keySeq())},Nt.prototype.toString=function(){return this.__toString("Set {","}")},Nt.prototype.has=function(e){return this._map.has(e)},Nt.prototype.add=function(e){return Lt(this,this._map.set(e,!0))},Nt.prototype.remove=function(e){return Lt(this,this._map.remove(e))},Nt.prototype.clear=function(){return Lt(this,this._map.clear())},Nt.prototype.union=function(){var e=un.call(arguments,0);return e=e.filter(function(e){return 0!==e.size}),0===e.length?this:0!==this.size||this.__ownerID||1!==e.length?this.withMutations(function(t){for(var n=0;n<e.length;n++)i(e[n]).forEach(function(e){return t.add(e)})}):this.constructor(e[0])},Nt.prototype.intersect=function(){var e=un.call(arguments,0);if(0===e.length)return this;e=e.map(function(e){return i(e)});var t=this;return this.withMutations(function(n){t.forEach(function(t){e.every(function(e){return e.includes(t)})||n.remove(t)})})},Nt.prototype.subtract=function(){var e=un.call(arguments,0);if(0===e.length)return this;e=e.map(function(e){return i(e)});var t=this;return this.withMutations(function(n){t.forEach(function(t){e.some(function(e){return e.includes(t)})&&n.remove(t)})})},Nt.prototype.merge=function(){return this.union.apply(this,arguments)},Nt.prototype.mergeWith=function(e){var t=un.call(arguments,1);return this.union.apply(this,t)},Nt.prototype.sort=function(e){return Ut(bt(this,e))},Nt.prototype.sortBy=function(e,t){return Ut(bt(this,t,e))},Nt.prototype.wasAltered=function(){return this._map.wasAltered()},Nt.prototype.__iterate=function(e,t){var n=this;return this._map.__iterate(function(t,r){return e(r,r,n)},t)},Nt.prototype.__iterator=function(e,t){return this._map.map(function(e,t){return t}).__iterator(e,t)},Nt.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e);return e?this.__make(t,e):(this.__ownerID=e,this._map=t,this)},Nt.isSet=Bt;var Zn="@@__IMMUTABLE_SET__@@",Qn=Nt.prototype;Qn[Zn]=!0,Qn.delete=Qn.remove,Qn.mergeDeep=Qn.merge,Qn.mergeDeepWith=Qn.mergeWith,Qn.withMutations=zn.withMutations,Qn.asMutable=zn.asMutable,Qn.asImmutable=zn.asImmutable,Qn.__empty=zt,Qn.__make=qt;var er;e(Ut,Nt),Ut.of=function(){return this(arguments)},Ut.fromKeys=function(e){return this(n(e).keySeq())},Ut.prototype.toString=function(){return this.__toString("OrderedSet {","}")},Ut.isOrderedSet=Wt;var tr=Ut.prototype;tr[fn]=!0,tr.__empty=Ht,tr.__make=Vt;var nr;e(Gt,ne),Gt.of=function(){return this(arguments)},Gt.prototype.toString=function(){return this.__toString("Stack [","]")},Gt.prototype.get=function(e,t){var n=this._head;for(e=m(this,e);n&&e--;)n=n.next;return n?n.value:t},Gt.prototype.peek=function(){return this._head&&this._head.value},Gt.prototype.push=function(){if(0===arguments.length)return this;for(var e=this.size+arguments.length,t=this._head,n=arguments.length-1;n>=0;n--)t={value:arguments[n],next:t};return this.__ownerID?(this.size=e,this._head=t,this.__hash=void 0,this.__altered=!0,this):Kt(e,t)},Gt.prototype.pushAll=function(e){if(e=r(e),0===e.size)return this;ce(e.size);var t=this.size,n=this._head;return e.reverse().forEach(function(e){t++,n={value:e,next:n}}),this.__ownerID?(this.size=t,this._head=n,this.__hash=void 0,this.__altered=!0,this):Kt(t,n)},Gt.prototype.pop=function(){return this.slice(1)},Gt.prototype.unshift=function(){return this.push.apply(this,arguments)},Gt.prototype.unshiftAll=function(e){return this.pushAll(e)},Gt.prototype.shift=function(){return this.pop.apply(this,arguments)},Gt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):Xt()},Gt.prototype.slice=function(e,t){if(g(e,t,this.size))return this;var n=y(e,this.size);if(_(t,this.size)!==this.size)return ne.prototype.slice.call(this,e,t);for(var r=this.size-n,i=this._head;n--;)i=i.next;return this.__ownerID?(this.size=r,this._head=i,this.__hash=void 0,this.__altered=!0,this):Kt(r,i)},Gt.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?Kt(this.size,this._head,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},Gt.prototype.__iterate=function(e,t){if(t)return this.reverse().__iterate(e);for(var n=0,r=this._head;r&&!1!==e(r.value,n++,this);)r=r.next;return n},Gt.prototype.__iterator=function(e,t){if(t)return this.reverse().__iterator(e);var n=0,r=this._head;return new x(function(){if(r){var t=r.value;return r=r.next,w(e,n++,t)}return k()})},Gt.isStack=Jt;var rr="@@__IMMUTABLE_STACK__@@",ir=Gt.prototype;ir[rr]=!0,ir.withMutations=zn.withMutations,ir.asMutable=zn.asMutable,ir.asImmutable=zn.asImmutable,ir.wasAltered=zn.wasAltered;var or;t.Iterator=x,Yt(t,{toArray:function(){ce(this.size);var e=new Array(this.size||0);return this.valueSeq().__iterate(function(t,n){e[n]=t}),e},toIndexedSeq:function(){return new it(this)},toJS:function(){return this.toSeq().map(function(e){return e&&"function"==typeof e.toJS?e.toJS():e}).__toJS()},toJSON:function(){return this.toSeq().map(function(e){return e&&"function"==typeof e.toJSON?e.toJSON():e}).__toJS()},toKeyedSeq:function(){return new rt(this,!0)},toMap:function(){return pe(this.toKeyedSeq())},toObject:function(){ce(this.size);var e={};return this.__iterate(function(t,n){e[n]=t}),e},toOrderedMap:function(){return Ze(this.toKeyedSeq())},toOrderedSet:function(){return Ut(a(this)?this.valueSeq():this)},toSet:function(){return Nt(a(this)?this.valueSeq():this)},toSetSeq:function(){return new ot(this)},toSeq:function(){return s(this)?this.toIndexedSeq():a(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Gt(a(this)?this.valueSeq():this)},toList:function(){return Le(a(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(e,t){return 0===this.size?e+t:e+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+t},concat:function(){return Et(this,vt(this,un.call(arguments,0)))},includes:function(e){return this.some(function(t){return X(t,e)})},entries:function(){return this.__iterator(xn)},every:function(e,t){ce(this.size);var n=!0;return this.__iterate(function(r,i,o){if(!e.call(t,r,i,o))return n=!1,!1}),n},filter:function(e,t){return Et(this,ct(this,e,t,!0))},find:function(e,t,n){var r=this.findEntry(e,t);return r?r[1]:n},forEach:function(e,t){return ce(this.size),this.__iterate(t?e.bind(t):e)},join:function(e){ce(this.size),e=void 0!==e?""+e:",";var t="",n=!0;return this.__iterate(function(r){n?n=!1:t+=e,t+=null!==r&&void 0!==r?r.toString():""}),t},keys:function(){return this.__iterator(_n)},map:function(e,t){return Et(this,ut(this,e,t))},reduce:function(e,t,n){ce(this.size);var r,i;return arguments.length<2?i=!0:r=t,this.__iterate(function(t,o,a){i?(i=!1,r=t):r=e.call(n,r,t,o,a)}),r},reduceRight:function(e,t,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return Et(this,lt(this,!0))},slice:function(e,t){return Et(this,ht(this,e,t,!0))},some:function(e,t){return!this.every(Qt(e),t)},sort:function(e){return Et(this,bt(this,e))},values:function(){return this.__iterator(bn)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some(function(){return!0})},count:function(e,t){return d(e?this.toSeq().filter(e,t):this)},countBy:function(e,t){return pt(this,e,t)},equals:function(e){return Y(this,e)},entrySeq:function(){var e=this;if(e._cache)return new I(e._cache);var t=e.toSeq().map(Zt).toIndexedSeq();return t.fromEntrySeq=function(){return e.toSeq()},t},filterNot:function(e,t){return this.filter(Qt(e),t)},findEntry:function(e,t,n){var r=n;return this.__iterate(function(n,i,o){if(e.call(t,n,i,o))return r=[i,n],!1}),r},findKey:function(e,t){var n=this.findEntry(e,t);return n&&n[0]},findLast:function(e,t,n){return this.toKeyedSeq().reverse().find(e,t,n)},findLastEntry:function(e,t,n){return this.toKeyedSeq().reverse().findEntry(e,t,n)},findLastKey:function(e,t){return this.toKeyedSeq().reverse().findKey(e,t)},first:function(){return this.find(v)},flatMap:function(e,t){return Et(this,yt(this,e,t))},flatten:function(e){return Et(this,gt(this,e,!0))},fromEntrySeq:function(){return new at(this)},get:function(e,t){return this.find(function(t,n){return X(n,e)},void 0,t)},getIn:function(e,t){for(var n,r=this,i=Tt(e);!(n=i.next()).done;){var o=n.value;if((r=r&&r.get?r.get(o,vn):vn)===vn)return t}return r},groupBy:function(e,t){return ft(this,e,t)},has:function(e){return this.get(e,vn)!==vn},hasIn:function(e){return this.getIn(e,vn)!==vn},isSubset:function(e){return e="function"==typeof e.includes?e:t(e),this.every(function(t){return e.includes(t)})},isSuperset:function(e){return e="function"==typeof e.isSubset?e:t(e),e.isSubset(this)},keyOf:function(e){return this.findKey(function(t){return X(t,e)})},keySeq:function(){return this.toSeq().map($t).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(e){return this.toKeyedSeq().reverse().keyOf(e)},max:function(e){return xt(this,e)},maxBy:function(e,t){return xt(this,t,e)},min:function(e){return xt(this,e?en(e):rn)},minBy:function(e,t){return xt(this,t?en(t):rn,e)},rest:function(){return this.slice(1)},skip:function(e){return this.slice(Math.max(0,e))},skipLast:function(e){return Et(this,this.toSeq().reverse().skip(e).reverse())},skipWhile:function(e,t){return Et(this,mt(this,e,t,!0))},skipUntil:function(e,t){return this.skipWhile(Qt(e),t)},sortBy:function(e,t){return Et(this,bt(this,t,e))},take:function(e){return this.slice(0,Math.max(0,e))},takeLast:function(e){return Et(this,this.toSeq().reverse().take(e).reverse())},takeWhile:function(e,t){return Et(this,dt(this,e,t))},takeUntil:function(e,t){return this.takeWhile(Qt(e),t)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=on(this))}});var ar=t.prototype;ar[ln]=!0,ar[En]=ar.values,ar.__toJS=ar.toArray,ar.__toStringMapper=tn,ar.inspect=ar.toSource=function(){return this.toString()},ar.chain=ar.flatMap,ar.contains=ar.includes,Yt(n,{flip:function(){return Et(this,st(this))},mapEntries:function(e,t){var n=this,r=0;return Et(this,this.toSeq().map(function(i,o){return e.call(t,[o,i],r++,n)}).fromEntrySeq())},mapKeys:function(e,t){var n=this;return Et(this,this.toSeq().flip().map(function(r,i){return e.call(t,r,i,n)}).flip())}});var sr=n.prototype;return sr[cn]=!0,sr[En]=ar.entries,sr.__toJS=ar.toObject,sr.__toStringMapper=function(e,t){return JSON.stringify(t)+": "+tn(e)},Yt(r,{toKeyedSeq:function(){return new rt(this,!1)},filter:function(e,t){return Et(this,ct(this,e,t,!1))},findIndex:function(e,t){var n=this.findEntry(e,t);return n?n[0]:-1},indexOf:function(e){var t=this.keyOf(e);return void 0===t?-1:t},lastIndexOf:function(e){var t=this.lastKeyOf(e);return void 0===t?-1:t},reverse:function(){return Et(this,lt(this,!1))},slice:function(e,t){return Et(this,ht(this,e,t,!1))},splice:function(e,t){var n=arguments.length;if(t=Math.max(0|t,0),0===n||2===n&&!t)return this;e=y(e,e<0?this.count():this.size);var r=this.slice(0,e);return Et(this,1===n?r:r.concat(h(arguments,2),this.slice(e+t)))},findLastIndex:function(e,t){var n=this.findLastEntry(e,t);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(e){return Et(this,gt(this,e,!1))},get:function(e,t){return e=m(this,e),e<0||this.size===1/0||void 0!==this.size&&e>this.size?t:this.find(function(t,n){return n===e},void 0,t)},has:function(e){return(e=m(this,e))>=0&&(void 0!==this.size?this.size===1/0||e<this.size:-1!==this.indexOf(e))},interpose:function(e){return Et(this,_t(this,e))},interleave:function(){var e=[this].concat(h(arguments)),t=kt(this.toSeq(),T.of,e),n=t.flatten(!0);return t.size&&(n.size=t.size*e.length),Et(this,n)},keySeq:function(){return Q(0,this.size)},last:function(){return this.get(-1)},skipWhile:function(e,t){return Et(this,mt(this,e,t,!1))},zip:function(){return Et(this,kt(this,nn,[this].concat(h(arguments))))},zipWith:function(e){var t=h(arguments);return t[0]=this,Et(this,kt(this,e,t))}}),r.prototype[pn]=!0,r.prototype[fn]=!0,Yt(i,{get:function(e,t){return this.has(e)?e:t},includes:function(e){return this.has(e)},keySeq:function(){return this.valueSeq()}}),i.prototype.has=ar.includes,i.prototype.contains=i.prototype.includes,Yt(M,n.prototype),Yt(T,r.prototype),Yt(P,i.prototype),Yt(te,n.prototype),Yt(ne,r.prototype),Yt(re,i.prototype),{Iterable:t,Seq:O,Collection:ee,Map:pe,OrderedMap:Ze,List:Le,Stack:Gt,Set:Nt,OrderedSet:Ut,Record:Pt,Range:Q,Repeat:$,is:X,fromJS:H}})},function(e,t,n){"use strict";function r(e,t,n,r,o,a,s,u){if(i(t),!e){var l;if(void 0===t)l=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var c=[n,r,o,a,s,u],p=0;l=new Error(t.replace(/%s/g,function(){return c[p++]})),l.name="Invariant Violation"}throw l.framesToPop=1,l}}var i=function(e){};e.exports=r},function(e,t,n){"use strict";(function(e){function r(e){return e&&e.__esModule?e:{default:e}}function i(e){try{var t=JSON.parse(e);if(t&&"object"===(void 0===t?"undefined":(0,N.default)(t)))return t}catch(e){}return!1}function o(e){return p(e)?oe(e)?e.toObject():e:{}}function a(e){return e?e.toArray?e.toArray():l(e):[]}function s(e){return oe(e)?e:e instanceof te.default.File?e:p(e)?Array.isArray(e)?L.default.Seq(e).map(s).toList():L.default.OrderedMap(e).map(s):e}function u(e,t){var n={};return(0,j.default)(e).filter(function(t){return"function"==typeof e[t]}).forEach(function(r){return n[r]=e[r].bind(null,t)}),n}function l(e){return Array.isArray(e)?e:[e]}function c(e){return"function"==typeof e}function p(e){return!!e&&"object"===(void 0===e?"undefined":(0,N.default)(e))}function f(e){return"function"==typeof e}function h(e){return Array.isArray(e)}function d(e,t){return(0,j.default)(e).reduce(function(n,r){return n[r]=t(e[r],r),n},{})}function m(e,t){return(0,j.default)(e).reduce(function(n,r){var i=t(e[r],r);return i&&"object"===(void 0===i?"undefined":(0,N.default)(i))&&(0,I.default)(n,i),n},{})}function v(e){return function(t){t.dispatch,t.getState;return function(t){return function(n){return"function"==typeof n?n(e()):t(n)}}}}function g(e){var t=e.keySeq();return t.contains(ie)?ie:t.filter(function(e){return"2"===(e+"")[0]}).sort().first()}function y(e,t){if(!L.default.Iterable.isIterable(e))return L.default.List();var n=e.getIn(Array.isArray(t)?t:[t]);return L.default.List.isList(n)?n:L.default.List()}function _(e){var t=document;if(!e)return"";if(e.textContent.length>5e3)return e.textContent;return function(e){for(var n,r,i,o,a,s=e.textContent,u=0,l=s[0],c=1,p=e.innerHTML="",f=0;r=n,n=f<7&&"\\"==n?1:c;){if(c=l,l=s[++u],o=p.length>1,!c||f>8&&"\n"==c||[/\S/.test(c),1,1,!/[$\w]/.test(c),("/"==n||"\n"==n)&&o,'"'==n&&o,"'"==n&&o,s[u-4]+r+n=="--\x3e",r+n=="*/"][f])for(p&&(e.appendChild(a=t.createElement("span")).setAttribute("style",["color: #555; font-weight: bold;","","","color: #555;",""][f?f<3?2:f>6?4:f>3?3:+/^(a(bstract|lias|nd|rguments|rray|s(m|sert)?|uto)|b(ase|egin|ool(ean)?|reak|yte)|c(ase|atch|har|hecked|lass|lone|ompl|onst|ontinue)|de(bugger|cimal|clare|f(ault|er)?|init|l(egate|ete)?)|do|double|e(cho|ls?if|lse(if)?|nd|nsure|num|vent|x(cept|ec|p(licit|ort)|te(nds|nsion|rn)))|f(allthrough|alse|inal(ly)?|ixed|loat|or(each)?|riend|rom|unc(tion)?)|global|goto|guard|i(f|mp(lements|licit|ort)|n(it|clude(_once)?|line|out|stanceof|t(erface|ernal)?)?|s)|l(ambda|et|ock|ong)|m(icrolight|odule|utable)|NaN|n(amespace|ative|ext|ew|il|ot|ull)|o(bject|perator|r|ut|verride)|p(ackage|arams|rivate|rotected|rotocol|ublic)|r(aise|e(adonly|do|f|gister|peat|quire(_once)?|scue|strict|try|turn))|s(byte|ealed|elf|hort|igned|izeof|tatic|tring|truct|ubscript|uper|ynchronized|witch)|t(emplate|hen|his|hrows?|ransient|rue|ry|ype(alias|def|id|name|of))|u(n(checked|def(ined)?|ion|less|signed|til)|se|sing)|v(ar|irtual|oid|olatile)|w(char_t|hen|here|hile|ith)|xor|yield)$/.test(p):0]),a.appendChild(t.createTextNode(p))),i=f&&f<7?f:i,p="",f=11;![1,/[\/{}[(\-+*=<>:;|\\.,?!&@~]/.test(c),/[\])]/.test(c),/[$\w]/.test(c),"/"==c&&i<2&&"<"!=n,'"'==c,"'"==c,c+l+s[u+1]+s[u+2]=="\x3c!--",c+l=="/*",c+l=="//","#"==c][--f];);p+=c}}(e)}function b(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"key",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:L.default.Map();if(!L.default.Map.isMap(e)||!e.size)return L.default.List();if(Array.isArray(t)||(t=[t]),t.length<1)return e.merge(n);var r=L.default.List(),i=t[0],o=!0,a=!1,s=void 0;try{for(var u,l=(0,T.default)(e.entries());!(o=(u=l.next()).done);o=!0){var c=u.value,p=(0,O.default)(c,2),f=p[0],h=p[1],d=b(h,t.slice(1),n.set(i,f));r=L.default.List.isList(d)?r.concat(d):r.push(d)}}catch(e){a=!0,s=e}finally{try{!o&&l.return&&l.return()}finally{if(a)throw s}}return r}function x(e){var t=/filename="([^;]*);?"/i.exec(e);return null===t&&(t=/filename=([^;]*);?/i.exec(e)),null!==t&&t.length>1?t[1]:null}function w(e){return(0,V.default)((0,U.default)(e))}function k(e){return w(e.replace(/\.[^.\/]*$/,""))}function E(e){return"string"!=typeof e||""===e?"":(0,q.sanitizeUrl)(e)}function S(e){if(!L.default.OrderedMap.isOrderedMap(e))return null;if(!e.size)return null;var t=e.find(function(e,t){return t.startsWith("2")&&(0,j.default)(e.get("content")||{}).length>0}),n=e.get("default")||L.default.OrderedMap(),r=(n.get("content")||L.default.OrderedMap()).keySeq().toJS(),i=r.length?n:null;return t||i}Object.defineProperty(t,"__esModule",{value:!0}),t.getExtensions=t.escapeDeepLinkPath=t.createDeepLinkPath=t.shallowEqualKeys=t.buildFormData=t.sorters=t.btoa=t.parseSearch=t.getSampleSchema=t.validateParam=t.validatePattern=t.validateMinLength=t.validateMaxLength=t.validateGuid=t.validateDateTime=t.validateString=t.validateBoolean=t.validateFile=t.validateInteger=t.validateNumber=t.validateMinimum=t.validateMaximum=t.propChecker=t.memoize=t.isImmutable=void 0;var C=n(35),A=r(C),D=n(18),O=r(D),M=n(95),T=r(M),P=n(30),I=r(P),R=n(47),j=r(R),F=n(48),N=r(F);t.isJSONObject=i,t.objectify=o,t.arrayify=a,t.fromJSOrdered=s,t.bindToState=u,t.normalizeArray=l,t.isFn=c,t.isObject=p,t.isFunc=f,t.isArray=h,t.objMap=d,t.objReduce=m,t.systemThunkMiddleware=v,t.defaultStatusCode=g,t.getList=y,t.highlight=_,t.mapToList=b,t.extractFileNameFromContentDispositionHeader=x,t.pascalCase=w,t.pascalCaseFilename=k,t.sanitizeUrl=E,t.getAcceptControllingResponse=S;var B=n(7),L=r(B),q=n(506),z=n(940),U=r(z),W=n(428),V=r(W),H=n(425),G=r(H),J=n(223),K=r(J),X=n(955),Y=r(X),$=n(120),Z=r($),Q=n(172),ee=n(46),te=r(ee),ne=n(697),re=r(ne),ie="default",oe=t.isImmutable=function(e){return L.default.Iterable.isIterable(e)},ae=(t.memoize=G.default,t.propChecker=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[];return(0,j.default)(e).length!==(0,j.default)(t).length||((0,Y.default)(e,function(e,n){if(r.includes(n))return!1;var i=t[n];return L.default.Iterable.isIterable(e)?!L.default.is(e,i):("object"!==(void 0===e?"undefined":(0,N.default)(e))||"object"!==(void 0===i?"undefined":(0,N.default)(i)))&&e!==i})||n.some(function(n){return!(0,Z.default)(e[n],t[n])}))},t.validateMaximum=function(e,t){if(e>t)return"Value must be less than Maximum"}),se=t.validateMinimum=function(e,t){if(e<t)return"Value must be greater than Minimum"},ue=t.validateNumber=function(e){if(!/^-?\d+(\.?\d+)?$/.test(e))return"Value must be a number"},le=t.validateInteger=function(e){if(!/^-?\d+$/.test(e))return"Value must be an integer"},ce=t.validateFile=function(e){if(e&&!(e instanceof te.default.File))return"Value must be a file"},pe=t.validateBoolean=function(e){if("true"!==e&&"false"!==e&&!0!==e&&!1!==e)return"Value must be a boolean"},fe=t.validateString=function(e){if(e&&"string"!=typeof e)return"Value must be a string"},he=t.validateDateTime=function(e){if(isNaN(Date.parse(e)))return"Value must be a DateTime"},de=t.validateGuid=function(e){if(e=e.toString().toLowerCase(),!/^[{(]?[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}[)}]?$/.test(e))return"Value must be a Guid"},me=t.validateMaxLength=function(e,t){if(e.length>t)return"Value must be less than MaxLength"},ve=t.validateMinLength=function(e,t){if(e.length<t)return"Value must be greater than MinLength"},ge=t.validatePattern=function(e,t){if(!new RegExp(t).test(e))return"Value must follow pattern "+t},ye=(t.validateParam=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=[],i=t&&"body"===e.get("in")?e.get("value_xml"):e.get("value"),o=e.get("required"),a=n?e.get("schema"):e;if(!a)return r;var s=a.get("maximum"),u=a.get("minimum"),l=a.get("type"),c=a.get("format"),p=a.get("maxLength"),f=a.get("minLength"),h=a.get("pattern");if(l&&(o||i)){var d="string"===l&&i,m="array"===l&&Array.isArray(i)&&i.length,v="array"===l&&L.default.List.isList(i)&&i.count(),g="file"===l&&i instanceof te.default.File,y="boolean"===l&&(i||!1===i),_="number"===l&&(i||0===i),b="integer"===l&&(i||0===i);if(o&&!(d||m||v||g||y||_||b))return r.push("Required field is not provided"),r;if(h){var x=ge(i,h);x&&r.push(x)}if(p||0===p){var w=me(i,p);w&&r.push(w)}if(f){var k=ve(i,f);k&&r.push(k)}if(s||0===s){var E=ae(i,s);E&&r.push(E)}if(u||0===u){var S=se(i,u);S&&r.push(S)}if("string"===l){var C=void 0;if(!(C="date-time"===c?he(i):"uuid"===c?de(i):fe(i)))return r;r.push(C)}else if("boolean"===l){var A=pe(i);if(!A)return r;r.push(A)}else if("number"===l){var D=ue(i);if(!D)return r;r.push(D)}else if("integer"===l){var O=le(i);if(!O)return r;r.push(O)}else if("array"===l){var M=void 0;if(!i.count())return r;M=a.getIn(["items","type"]),i.forEach(function(e,t){var n=void 0;"number"===M?n=ue(e):"integer"===M?n=le(e):"string"===M&&(n=fe(e)),n&&r.push({index:t,error:n})})}else if("file"===l){var T=ce(i);if(!T)return r;r.push(T)}}return r},t.getSampleSchema=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(/xml/.test(t)){if(!e.xml||!e.xml.name){if(e.xml=e.xml||{},!e.$$ref)return e.type||e.items||e.properties||e.additionalProperties?'<?xml version="1.0" encoding="UTF-8"?>\n\x3c!-- XML example cannot be generated --\x3e':null;var r=e.$$ref.match(/\S*\/(\S+)$/);e.xml.name=r[1]}return(0,Q.memoizedCreateXMLExample)(e,n)}return(0,A.default)((0,Q.memoizedSampleFromSchema)(e,n),null,2)},t.parseSearch=function(){var e={},t=te.default.location.search;if(!t)return{};if(""!=t){var n=t.substr(1).split("&");for(var r in n)n.hasOwnProperty(r)&&(r=n[r].split("="),e[decodeURIComponent(r[0])]=decodeURIComponent(r[1]))}return e},t.btoa=function(t){var n=void 0;return n=t instanceof e?t:new e(t.toString(),"utf-8"),n.toString("base64")},t.sorters={operationsSorter:{alpha:function(e,t){return e.get("path").localeCompare(t.get("path"))},method:function(e,t){return e.get("method").localeCompare(t.get("method"))}},tagsSorter:{alpha:function(e,t){return e.localeCompare(t)}}},t.buildFormData=function(e){var t=[];for(var n in e){var r=e[n];void 0!==r&&""!==r&&t.push([n,"=",encodeURIComponent(r).replace(/%20/g,"+")].join(""))}return t.join("&")},t.shallowEqualKeys=function(e,t,n){return!!(0,K.default)(n,function(n){return(0,Z.default)(e[n],t[n])})},t.createDeepLinkPath=function(e){return"string"==typeof e||e instanceof String?e.trim().replace(/\s/g,"_"):""});t.escapeDeepLinkPath=function(e){return(0,re.default)(ye(e))},t.getExtensions=function(e){return e.filter(function(e,t){return/^x-/.test(t)})}}).call(t,n(40).Buffer)},function(e,t,n){"use strict";var r=n(32),i=r;e.exports=i},function(e,t,n){"use strict";function r(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}e.exports=r},function(e,t,n){"use strict";function r(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":e instanceof b.Iterable?"Immutable."+e.toSource().split(" ")[0]:t}function i(e){function t(t,n,r,i,o,a){for(var s=arguments.length,u=Array(s>6?s-6:0),l=6;l<s;l++)u[l-6]=arguments[l];if(a=a||r,i=i||x,null!=n[r])return e.apply(void 0,[n,r,i,o,a].concat(u));var c=o;return t?new Error("Required "+c+" `"+a+"` was not specified in `"+i+"`."):void 0}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function o(e,t){function n(n,i,o,a,s){var u=n[i];if(!t(u)){var l=r(u);return new Error("Invalid "+a+" `"+s+"` of type `"+l+"` supplied to `"+o+"`, expected `"+e+"`.")}return null}return i(n)}function a(e,t,n){function o(i,o,a,s,u){for(var l=arguments.length,c=Array(l>5?l-5:0),p=5;p<l;p++)c[p-5]=arguments[p];var f=i[o];if(!n(f)){var h=s,d=r(f);return new Error("Invalid "+h+" `"+u+"` of type `"+d+"` supplied to `"+a+"`, expected an Immutable.js "+t+".")}if("function"!=typeof e)return new Error("Invalid typeChecker supplied to `"+a+"` for propType `"+u+"`, expected a function.");for(var m=f.toArray(),v=0,g=m.length;v<g;v++){var y=e.apply(void 0,[m,v,a,s,u+"["+v+"]"].concat(c));if(y instanceof Error)return y}}return i(o)}function s(e){function t(t,n,r,i,o){for(var a=arguments.length,s=Array(a>5?a-5:0),u=5;u<a;u++)s[u-5]=arguments[u];var l=t[n];if("function"!=typeof e)return new Error("Invalid keysTypeChecker (optional second argument) supplied to `"+r+"` for propType `"+o+"`, expected a function.");for(var c=l.keySeq().toArray(),p=0,f=c.length;p<f;p++){var h=e.apply(void 0,[c,p,r,i,o+" -> key("+c[p]+")"].concat(s));if(h instanceof Error)return h}}return i(t)}function u(e){return a(e,"List",b.List.isList)}function l(e,t,n,r){function o(){for(var i=arguments.length,o=Array(i),u=0;u<i;u++)o[u]=arguments[u];return a(e,n,r).apply(void 0,o)||t&&s(t).apply(void 0,o)}return i(o)}function c(e,t){return l(e,t,"Map",b.Map.isMap)}function p(e,t){return l(e,t,"OrderedMap",b.OrderedMap.isOrderedMap)}function f(e){return a(e,"Set",b.Set.isSet)}function h(e){return a(e,"OrderedSet",b.OrderedSet.isOrderedSet)}function d(e){return a(e,"Stack",b.Stack.isStack)}function m(e){return a(e,"Iterable",b.Iterable.isIterable)}function v(e){function t(t,n,i,o,a){for(var s=arguments.length,u=Array(s>5?s-5:0),l=5;l<s;l++)u[l-5]=arguments[l];var c=t[n];if(!(c instanceof b.Record)){var p=r(c),f=o;return new Error("Invalid "+f+" `"+a+"` of type `"+p+"` supplied to `"+i+"`, expected an Immutable.js Record.")}for(var h in e){var d=e[h];if(d){var m=c.toObject(),v=d.apply(void 0,[m,h,i,o,a+"."+h].concat(u));if(v)return v}}}return i(t)}function g(e){function t(t,i,a,s,u){for(var l=arguments.length,c=Array(l>5?l-5:0),p=5;p<l;p++)c[p-5]=arguments[p];var f=t[i];if(!o(f)){var h=r(f),d=s;return new Error("Invalid "+d+" `"+u+"` of type `"+h+"` supplied to `"+a+"`, expected an Immutable.js "+n+".")}var m=f.toObject();for(var v in e){var g=e[v];if(g){var y=g.apply(void 0,[m,v,a,s,u+"."+v].concat(c));if(y)return y}}}var n=void 0===arguments[1]?"Iterable":arguments[1],o=void 0===arguments[2]?b.Iterable.isIterable:arguments[2];return i(t)}function y(e){return g(e)}function _(e){return g(e,"Map",b.Map.isMap)}var b=n(7),x="<<anonymous>>",w={listOf:u,mapOf:c,orderedMapOf:p,setOf:f,orderedSetOf:h,stackOf:d,iterableOf:m,recordOf:v,shape:y,contains:y,mapContains:_,list:o("List",b.List.isList),map:o("Map",b.Map.isMap),orderedMap:o("OrderedMap",b.OrderedMap.isOrderedMap),set:o("Set",b.Set.isSet),orderedSet:o("OrderedSet",b.OrderedSet.isOrderedSet),stack:o("Stack",b.Stack.isStack),seq:o("Seq",b.Seq.isSeq),record:o("Record",function(e){return e instanceof b.Record}),iterable:o("Iterable",b.Iterable.isIterable)};e.exports=w},function(e,t,n){"use strict";function r(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+var i=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,a=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var n,s,u=r(e),l=1;l<arguments.length;l++){n=Object(arguments[l]);for(var c in n)o.call(n,c)&&(u[c]=n[c]);if(i){s=i(n);for(var p=0;p<s.length;p++)a.call(n,s[p])&&(u[s[p]]=n[s[p]])}}return u}},function(e,t,n){"use strict";function r(e,t){return 1===e.nodeType&&e.getAttribute(d)===String(t)||8===e.nodeType&&e.nodeValue===" react-text: "+t+" "||8===e.nodeType&&e.nodeValue===" react-empty: "+t+" "}function i(e){for(var t;t=e._renderedComponent;)e=t;return e}function o(e,t){var n=i(e);n._hostNode=t,t[v]=n}function a(e){var t=e._hostNode;t&&(delete t[v],e._hostNode=null)}function s(e,t){if(!(e._flags&m.hasCachedChildNodes)){var n=e._renderedChildren,a=t.firstChild;e:for(var s in n)if(n.hasOwnProperty(s)){var u=n[s],l=i(u)._domID;if(0!==l){for(;null!==a;a=a.nextSibling)if(r(a,l)){o(u,a);continue e}p("32",l)}}e._flags|=m.hasCachedChildNodes}}function u(e){if(e[v])return e[v];for(var t=[];!e[v];){if(t.push(e),!e.parentNode)return null;e=e.parentNode}for(var n,r;e&&(r=e[v]);e=t.pop())n=r,t.length&&s(r,e);return n}function l(e){var t=u(e);return null!=t&&t._hostNode===e?t:null}function c(e){if(void 0===e._hostNode&&p("33"),e._hostNode)return e._hostNode;for(var t=[];!e._hostNode;)t.push(e),e._hostParent||p("34"),e=e._hostParent;for(;t.length;e=t.pop())s(e,e._hostNode);return e._hostNode}var p=n(11),f=n(89),h=n(453),d=(n(8),f.ID_ATTRIBUTE_NAME),m=h,v="__reactInternalInstance$"+Math.random().toString(36).slice(2),g={getClosestInstanceFromNode:u,getInstanceFromNode:l,getNodeFromInstance:c,precacheChildNodes:s,precacheNode:o,uncacheNode:a};e.exports=g},function(e,t){var n=e.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(e,t,n){"use strict";function r(e){var t={};return null!==e&&Object.keys(e).forEach(function(n){e[n].forEach(function(e){t[String(e)]=n})}),t}function i(e,t){if(t=t||{},Object.keys(t).forEach(function(t){if(-1===a.indexOf(t))throw new o('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')}),this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.defaultStyle=t.defaultStyle||null,this.styleAliases=r(t.styleAliases||null),-1===s.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')}var o=n(117),a=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],s=["scalar","sequence","mapping"];e.exports=i},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(564),o=r(i),a=n(95),s=r(a);t.default=function(){function e(e,t){var n=[],r=!0,i=!1,o=void 0;try{for(var a,u=(0,s.default)(e);!(r=(a=u.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){i=!0,o=e}finally{try{!r&&u.return&&u.return()}finally{if(i)throw o}}return n}return function(t,n){if(Array.isArray(t))return t;if((0,o.default)(Object(t)))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}()},function(e,t,n){var r=n(361)("wks"),i=n(202),o=n(31).Symbol,a="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=a&&o[e]||(a?o:i)("Symbol."+e))}).store=r},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){"use strict";t.__esModule=!0;var r=n(30),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=i.default||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}},function(e,t,n){var r=n(188)("wks"),i=n(134),o=n(24).Symbol,a="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=a&&o[e]||(a?o:i)("Symbol."+e))}).store=r},function(e,t,n){var r=n(24),i=n(15),o=n(53),a=n(56),s=function(e,t,n){var u,l,c,p=e&s.F,f=e&s.G,h=e&s.S,d=e&s.P,m=e&s.B,v=e&s.W,g=f?i:i[t]||(i[t]={}),y=g.prototype,_=f?r:h?r[t]:(r[t]||{}).prototype;f&&(n=t);for(u in n)(l=!p&&_&&void 0!==_[u])&&u in g||(c=l?_[u]:n[u],g[u]=f&&"function"!=typeof _[u]?n[u]:m&&l?o(c,r):v&&_[u]==c?function(e){var t=function(t,n,r){if(this instanceof e){switch(arguments.length){case 0:return new e;case 1:return new e(t);case 2:return new e(t,n)}return new e(t,n,r)}return e.apply(this,arguments)};return t.prototype=e.prototype,t}(c):d&&"function"==typeof c?o(Function.call,c):c,d&&((g.virtual||(g.virtual={}))[u]=c,e&s.R&&y&&!y[u]&&a(y,u,c)))};s.F=1,s.G=2,s.S=4,s.P=8,s.B=16,s.W=32,s.U=64,s.R=128,e.exports=s},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){"use strict";var r=!("undefined"==typeof window||!window.document||!window.document.createElement),i={canUseDOM:r,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:r&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:r&&!!window.screen,isInWorker:!r};e.exports=i},function(e,t,n){"use strict";function r(e){return Object.prototype.toString.call(e)}function i(e){return"[object String]"===r(e)}function o(e,t){return!!e&&d.call(e,t)}function a(e){return[].slice.call(arguments,1).forEach(function(t){if(t){if("object"!=typeof t)throw new TypeError(t+"must be object");Object.keys(t).forEach(function(n){e[n]=t[n]})}}),e}function s(e){return e.indexOf("\\")<0?e:e.replace(m,"$1")}function u(e){return!(e>=55296&&e<=57343)&&(!(e>=64976&&e<=65007)&&(65535!=(65535&e)&&65534!=(65535&e)&&(!(e>=0&&e<=8)&&(11!==e&&(!(e>=14&&e<=31)&&(!(e>=127&&e<=159)&&!(e>1114111)))))))}function l(e){if(e>65535){e-=65536;var t=55296+(e>>10),n=56320+(1023&e);return String.fromCharCode(t,n)}return String.fromCharCode(e)}function c(e,t){var n=0;return o(y,t)?y[t]:35===t.charCodeAt(0)&&g.test(t)&&(n="x"===t[1].toLowerCase()?parseInt(t.slice(2),16):parseInt(t.slice(1),10),u(n))?l(n):e}function p(e){return e.indexOf("&")<0?e:e.replace(v,c)}function f(e){return x[e]}function h(e){return _.test(e)?e.replace(b,f):e}var d=Object.prototype.hasOwnProperty,m=/\\([\\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g,v=/&([a-z#][a-z0-9]{1,31});/gi,g=/^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))/i,y=n(488),_=/[&<>"]/,b=/[&<>"]/g,x={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;"};t.assign=a,t.isString=i,t.has=o,t.unescapeMd=s,t.isValidEntityCode=u,t.fromCodePoint=l,t.replaceEntities=p,t.escapeHtml=h},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){var r=n(31),i=n(63),o=n(64),a=n(78),s=n(136),u=function(e,t,n){var l,c,p,f,h=e&u.F,d=e&u.G,m=e&u.S,v=e&u.P,g=e&u.B,y=d?r:m?r[t]||(r[t]={}):(r[t]||{}).prototype,_=d?i:i[t]||(i[t]={}),b=_.prototype||(_.prototype={});d&&(n=t);for(l in n)c=!h&&y&&void 0!==y[l],p=(c?y:n)[l],f=g&&c?s(p,r):v&&"function"==typeof p?s(Function.call,p):p,y&&a(y,l,p,e&u.U),_[l]!=p&&o(_,l,f),v&&b[l]!=p&&(b[l]=p)};r.core=i,u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,e.exports=u},function(e,t,n){var r=n(28),i=n(107),o=n(57),a=/"/g,s=function(e,t,n,r){var i=String(o(e)),s="<"+t;return""!==n&&(s+=" "+n+'="'+String(r).replace(a,"&quot;")+'"'),s+">"+i+"</"+t+">"};e.exports=function(e,t){var n={};n[e]=t(s),r(r.P+r.F*i(function(){var t=""[e]('"');return t!==t.toLowerCase()||t.split('"').length>3}),"String",n)}},function(e,t,n){e.exports={default:n(589),__esModule:!0}},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){"use strict";function r(e){return function(){return e}}var i=function(){};i.thatReturns=r,i.thatReturnsFalse=r(!1),i.thatReturnsTrue=r(!0),i.thatReturnsNull=r(null),i.thatReturnsThis=function(){return this},i.thatReturnsArgument=function(e){return e},e.exports=i},function(e,t){function n(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function i(e){if(c===setTimeout)return setTimeout(e,0);if((c===n||!c)&&setTimeout)return c=setTimeout,setTimeout(e,0);try{return c(e,0)}catch(t){try{return c.call(null,e,0)}catch(t){return c.call(this,e,0)}}}function o(e){if(p===clearTimeout)return clearTimeout(e);if((p===r||!p)&&clearTimeout)return p=clearTimeout,clearTimeout(e);try{return p(e)}catch(t){try{return p.call(null,e)}catch(t){return p.call(this,e)}}}function a(){m&&h&&(m=!1,h.length?d=h.concat(d):v=-1,d.length&&s())}function s(){if(!m){var e=i(a);m=!0;for(var t=d.length;t;){for(h=d,d=[];++v<t;)h&&h[v].run();v=-1,t=d.length}h=null,m=!1,o(e)}}function u(e,t){this.fun=e,this.array=t}function l(){}var c,p,f=e.exports={};!function(){try{c="function"==typeof setTimeout?setTimeout:n}catch(e){c=n}try{p="function"==typeof clearTimeout?clearTimeout:r}catch(e){p=r}}();var h,d=[],m=!1,v=-1;f.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];d.push(new u(e,t)),1!==d.length||m||i(s)},u.prototype.run=function(){this.fun.apply(null,this.array)},f.title="browser",f.browser=!0,f.env={},f.argv=[],f.version="",f.versions={},f.on=l,f.addListener=l,f.once=l,f.off=l,f.removeListener=l,f.removeAllListeners=l,f.emit=l,f.prependListener=l,f.prependOnceListener=l,f.listeners=function(e){return[]},f.binding=function(e){throw new Error("process.binding is not supported")},f.cwd=function(){return"/"},f.chdir=function(e){throw new Error("process.chdir is not supported")},f.umask=function(){return 0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.get("openapi");return!!t&&t.startsWith("3")}function o(e){var t=e.get("swagger");return!!t&&t.startsWith("2")}function a(e){return function(t,n){return function(r){if(n&&n.specSelectors&&n.specSelectors.specJson){return i(n.specSelectors.specJson())?c.default.createElement(e,(0,u.default)({},r,n,{Ori:t})):c.default.createElement(t,r)}return console.warn("OAS3 wrapper: couldn't get spec"),null}}}Object.defineProperty(t,"__esModule",{value:!0});var s=n(21),u=r(s);t.isOAS3=i,t.isSwagger2=o,t.OAS3ComponentWrapFactory=a;var l=n(0),c=r(l)},function(e,t,n){e.exports={default:n(588),__esModule:!0}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(331),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e,t,n){return t in e?(0,i.default)(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}},function(e,t,n){var r=n(27);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t){function n(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}e.exports=n},function(e,t,n){"use strict";var r=null;e.exports={debugTool:r}},function(e,t,n){"use strict";(function(e){function r(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(e,t){if(r()<t)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(e=new Uint8Array(t),e.__proto__=o.prototype):(null===e&&(e=new o(t)),e.length=t),e}function o(e,t,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(e,t,n);if("number"==typeof e){if("string"==typeof t)throw new Error("If encoding is specified then the first argument must be a string");return l(this,e)}return a(this,e,t,n)}function a(e,t,n,r){if("number"==typeof t)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer?f(e,t,n,r):"string"==typeof t?c(e,t,n):h(e,t)}function s(e){if("number"!=typeof e)throw new TypeError('"size" argument must be a number');if(e<0)throw new RangeError('"size" argument must not be negative')}function u(e,t,n,r){return s(t),t<=0?i(e,t):void 0!==n?"string"==typeof r?i(e,t).fill(n,r):i(e,t).fill(n):i(e,t)}function l(e,t){if(s(t),e=i(e,t<0?0:0|d(t)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<t;++n)e[n]=0;return e}function c(e,t,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|v(t,n);e=i(e,r);var a=e.write(t,n);return a!==r&&(e=e.slice(0,a)),e}function p(e,t){var n=t.length<0?0:0|d(t.length);e=i(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function f(e,t,n,r){if(t.byteLength,n<0||t.byteLength<n)throw new RangeError("'offset' is out of bounds");if(t.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return t=void 0===n&&void 0===r?new Uint8Array(t):void 0===r?new Uint8Array(t,n):new Uint8Array(t,n,r),o.TYPED_ARRAY_SUPPORT?(e=t,e.__proto__=o.prototype):e=p(e,t),e}function h(e,t){if(o.isBuffer(t)){var n=0|d(t.length);return e=i(e,n),0===e.length?e:(t.copy(e,0,0,n),e)}if(t){if("undefined"!=typeof ArrayBuffer&&t.buffer instanceof ArrayBuffer||"length"in t)return"number"!=typeof t.length||X(t.length)?i(e,0):p(e,t);if("Buffer"===t.type&&Z(t.data))return p(e,t.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function d(e){if(e>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|e}function m(e){return+e!=e&&(e=0),o.alloc(+e)}function v(e,t){if(o.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return V(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return J(e).length;default:if(r)return V(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=!1;if((void 0===t||t<0)&&(t=0),t>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,t>>>=0,n<=t)return"";for(e||(e="utf8");;)switch(e){case"hex":return P(this,t,n);case"utf8":case"utf-8":return D(this,t,n);case"ascii":return M(this,t,n);case"latin1":case"binary":return T(this,t,n);case"base64":return A(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return I(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}function y(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function _(e,t,n,r,i){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(i)return-1;n=e.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof t&&(t=o.from(t,r)),o.isBuffer(t))return 0===t.length?-1:b(e,t,n,r,i);if("number"==typeof t)return t&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):b(e,[t],n,r,i);throw new TypeError("val must be string, number or Buffer")}function b(e,t,n,r,i){function o(e,t){return 1===a?e[t]:e.readUInt16BE(t*a)}var a=1,s=e.length,u=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;a=2,s/=2,u/=2,n/=2}var l;if(i){var c=-1;for(l=n;l<s;l++)if(o(e,l)===o(t,-1===c?0:l-c)){if(-1===c&&(c=l),l-c+1===u)return c*a}else-1!==c&&(l-=l-c),c=-1}else for(n+u>s&&(n=s-u),l=n;l>=0;l--){for(var p=!0,f=0;f<u;f++)if(o(e,l+f)!==o(t,f)){p=!1;break}if(p)return l}return-1}function x(e,t,n,r){n=Number(n)||0;var i=e.length-n;r?(r=Number(r))>i&&(r=i):r=i;var o=t.length;if(o%2!=0)throw new TypeError("Invalid hex string");r>o/2&&(r=o/2);for(var a=0;a<r;++a){var s=parseInt(t.substr(2*a,2),16);if(isNaN(s))return a;e[n+a]=s}return a}function w(e,t,n,r){return K(V(t,e.length-n),e,n,r)}function k(e,t,n,r){return K(H(t),e,n,r)}function E(e,t,n,r){return k(e,t,n,r)}function S(e,t,n,r){return K(J(t),e,n,r)}function C(e,t,n,r){return K(G(t,e.length-n),e,n,r)}function A(e,t,n){return 0===t&&n===e.length?Y.fromByteArray(e):Y.fromByteArray(e.slice(t,n))}function D(e,t,n){n=Math.min(e.length,n);for(var r=[],i=t;i<n;){var o=e[i],a=null,s=o>239?4:o>223?3:o>191?2:1;if(i+s<=n){var u,l,c,p;switch(s){case 1:o<128&&(a=o);break;case 2:u=e[i+1],128==(192&u)&&(p=(31&o)<<6|63&u)>127&&(a=p);break;case 3:u=e[i+1],l=e[i+2],128==(192&u)&&128==(192&l)&&(p=(15&o)<<12|(63&u)<<6|63&l)>2047&&(p<55296||p>57343)&&(a=p);break;case 4:u=e[i+1],l=e[i+2],c=e[i+3],128==(192&u)&&128==(192&l)&&128==(192&c)&&(p=(15&o)<<18|(63&u)<<12|(63&l)<<6|63&c)>65535&&p<1114112&&(a=p)}}null===a?(a=65533,s=1):a>65535&&(a-=65536,r.push(a>>>10&1023|55296),a=56320|1023&a),r.push(a),i+=s}return O(r)}function O(e){var t=e.length;if(t<=Q)return String.fromCharCode.apply(String,e);for(var n="",r=0;r<t;)n+=String.fromCharCode.apply(String,e.slice(r,r+=Q));return n}function M(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(127&e[i]);return r}function T(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(e[i]);return r}function P(e,t,n){var r=e.length;(!t||t<0)&&(t=0),(!n||n<0||n>r)&&(n=r);for(var i="",o=t;o<n;++o)i+=W(e[o]);return i}function I(e,t,n){for(var r=e.slice(t,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function R(e,t,n){if(e%1!=0||e<0)throw new RangeError("offset is not uint");if(e+t>n)throw new RangeError("Trying to access beyond buffer length")}function j(e,t,n,r,i,a){if(!o.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>i||t<a)throw new RangeError('"value" argument is out of bounds');if(n+r>e.length)throw new RangeError("Index out of range")}function F(e,t,n,r){t<0&&(t=65535+t+1);for(var i=0,o=Math.min(e.length-n,2);i<o;++i)e[n+i]=(t&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function N(e,t,n,r){t<0&&(t=4294967295+t+1);for(var i=0,o=Math.min(e.length-n,4);i<o;++i)e[n+i]=t>>>8*(r?i:3-i)&255}function B(e,t,n,r,i,o){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function L(e,t,n,r,i){return i||B(e,t,n,4,3.4028234663852886e38,-3.4028234663852886e38),$.write(e,t,n,r,23,4),n+4}function q(e,t,n,r,i){return i||B(e,t,n,8,1.7976931348623157e308,-1.7976931348623157e308),$.write(e,t,n,r,52,8),n+8}function z(e){if(e=U(e).replace(ee,""),e.length<2)return"";for(;e.length%4!=0;)e+="=";return e}function U(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function W(e){return e<16?"0"+e.toString(16):e.toString(16)}function V(e,t){t=t||1/0;for(var n,r=e.length,i=null,o=[],a=0;a<r;++a){if((n=e.charCodeAt(a))>55295&&n<57344){if(!i){if(n>56319){(t-=3)>-1&&o.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(n<56320){(t-=3)>-1&&o.push(239,191,189),i=n;continue}n=65536+(i-55296<<10|n-56320)}else i&&(t-=3)>-1&&o.push(239,191,189);if(i=null,n<128){if((t-=1)<0)break;o.push(n)}else if(n<2048){if((t-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function H(e){for(var t=[],n=0;n<e.length;++n)t.push(255&e.charCodeAt(n));return t}function G(e,t){for(var n,r,i,o=[],a=0;a<e.length&&!((t-=2)<0);++a)n=e.charCodeAt(a),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function J(e){return Y.toByteArray(z(e))}function K(e,t,n,r){for(var i=0;i<r&&!(i+n>=t.length||i>=e.length);++i)t[i+n]=e[i];return i}function X(e){return e!==e}/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @license  MIT
+ */
+var Y=n(570),$=n(764),Z=n(387);t.Buffer=o,t.SlowBuffer=m,t.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==e.TYPED_ARRAY_SUPPORT?e.TYPED_ARRAY_SUPPORT:function(){try{var e=new Uint8Array(1);return e.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===e.foo()&&"function"==typeof e.subarray&&0===e.subarray(1,1).byteLength}catch(e){return!1}}(),t.kMaxLength=r(),o.poolSize=8192,o._augment=function(e){return e.__proto__=o.prototype,e},o.from=function(e,t,n){return a(null,e,t,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(e,t,n){return u(null,e,t,n)},o.allocUnsafe=function(e){return l(null,e)},o.allocUnsafeSlow=function(e){return l(null,e)},o.isBuffer=function(e){return!(null==e||!e._isBuffer)},o.compare=function(e,t){if(!o.isBuffer(e)||!o.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var n=e.length,r=t.length,i=0,a=Math.min(n,r);i<a;++i)if(e[i]!==t[i]){n=e[i],r=t[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(e){switch(String(e).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(e,t){if(!Z(e))throw new TypeError('"list" argument must be an Array of Buffers');if(0===e.length)return o.alloc(0);var n;if(void 0===t)for(t=0,n=0;n<e.length;++n)t+=e[n].length;var r=o.allocUnsafe(t),i=0;for(n=0;n<e.length;++n){var a=e[n];if(!o.isBuffer(a))throw new TypeError('"list" argument must be an Array of Buffers');a.copy(r,i),i+=a.length}return r},o.byteLength=v,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var e=this.length;if(e%2!=0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var t=0;t<e;t+=2)y(this,t,t+1);return this},o.prototype.swap32=function(){var e=this.length;if(e%4!=0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var t=0;t<e;t+=4)y(this,t,t+3),y(this,t+1,t+2);return this},o.prototype.swap64=function(){var e=this.length;if(e%8!=0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var t=0;t<e;t+=8)y(this,t,t+7),y(this,t+1,t+6),y(this,t+2,t+5),y(this,t+3,t+4);return this},o.prototype.toString=function(){var e=0|this.length;return 0===e?"":0===arguments.length?D(this,0,e):g.apply(this,arguments)},o.prototype.equals=function(e){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===o.compare(this,e)},o.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),"<Buffer "+e+">"},o.prototype.compare=function(e,t,n,r,i){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),t<0||n>e.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&t>=n)return 0;if(r>=i)return-1;if(t>=n)return 1;if(t>>>=0,n>>>=0,r>>>=0,i>>>=0,this===e)return 0;for(var a=i-r,s=n-t,u=Math.min(a,s),l=this.slice(r,i),c=e.slice(t,n),p=0;p<u;++p)if(l[p]!==c[p]){a=l[p],s=c[p];break}return a<s?-1:s<a?1:0},o.prototype.includes=function(e,t,n){return-1!==this.indexOf(e,t,n)},o.prototype.indexOf=function(e,t,n){return _(this,e,t,n,!0)},o.prototype.lastIndexOf=function(e,t,n){return _(this,e,t,n,!1)},o.prototype.write=function(e,t,n,r){if(void 0===t)r="utf8",n=this.length,t=0;else if(void 0===n&&"string"==typeof t)r=t,n=this.length,t=0;else{if(!isFinite(t))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");t|=0,isFinite(n)?(n|=0,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-t;if((void 0===n||n>i)&&(n=i),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return x(this,e,t,n);case"utf8":case"utf-8":return w(this,e,t,n);case"ascii":return k(this,e,t,n);case"latin1":case"binary":return E(this,e,t,n);case"base64":return S(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return C(this,e,t,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;o.prototype.slice=function(e,t){var n=this.length;e=~~e,t=void 0===t?n:~~t,e<0?(e+=n)<0&&(e=0):e>n&&(e=n),t<0?(t+=n)<0&&(t=0):t>n&&(t=n),t<e&&(t=e);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(e,t),r.__proto__=o.prototype;else{var i=t-e;r=new o(i,void 0);for(var a=0;a<i;++a)r[a]=this[a+e]}return r},o.prototype.readUIntLE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return r},o.prototype.readUIntBE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e+--t],i=1;t>0&&(i*=256);)r+=this[e+--t]*i;return r},o.prototype.readUInt8=function(e,t){return t||R(e,1,this.length),this[e]},o.prototype.readUInt16LE=function(e,t){return t||R(e,2,this.length),this[e]|this[e+1]<<8},o.prototype.readUInt16BE=function(e,t){return t||R(e,2,this.length),this[e]<<8|this[e+1]},o.prototype.readUInt32LE=function(e,t){return t||R(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},o.prototype.readUInt32BE=function(e,t){return t||R(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},o.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=this[e],i=1,o=0;++o<t&&(i*=256);)r+=this[e+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*t)),r},o.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||R(e,t,this.length);for(var r=t,i=1,o=this[e+--r];r>0&&(i*=256);)o+=this[e+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*t)),o},o.prototype.readInt8=function(e,t){return t||R(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},o.prototype.readInt16LE=function(e,t){t||R(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(e,t){t||R(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(e,t){return t||R(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},o.prototype.readInt32BE=function(e,t){return t||R(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},o.prototype.readFloatLE=function(e,t){return t||R(e,4,this.length),$.read(this,e,!0,23,4)},o.prototype.readFloatBE=function(e,t){return t||R(e,4,this.length),$.read(this,e,!1,23,4)},o.prototype.readDoubleLE=function(e,t){return t||R(e,8,this.length),$.read(this,e,!0,52,8)},o.prototype.readDoubleBE=function(e,t){return t||R(e,8,this.length),$.read(this,e,!1,52,8)},o.prototype.writeUIntLE=function(e,t,n,r){if(e=+e,t|=0,n|=0,!r){j(this,e,t,n,Math.pow(2,8*n)-1,0)}var i=1,o=0;for(this[t]=255&e;++o<n&&(i*=256);)this[t+o]=e/i&255;return t+n},o.prototype.writeUIntBE=function(e,t,n,r){if(e=+e,t|=0,n|=0,!r){j(this,e,t,n,Math.pow(2,8*n)-1,0)}var i=n-1,o=1;for(this[t+i]=255&e;--i>=0&&(o*=256);)this[t+i]=e/o&255;return t+n},o.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,1,255,0),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},o.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):F(this,e,t,!0),t+2},o.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):F(this,e,t,!1),t+2},o.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):N(this,e,t,!0),t+4},o.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):N(this,e,t,!1),t+4},o.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var i=Math.pow(2,8*n-1);j(this,e,t,n,i-1,-i)}var o=0,a=1,s=0;for(this[t]=255&e;++o<n&&(a*=256);)e<0&&0===s&&0!==this[t+o-1]&&(s=1),this[t+o]=(e/a>>0)-s&255;return t+n},o.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var i=Math.pow(2,8*n-1);j(this,e,t,n,i-1,-i)}var o=n-1,a=1,s=0;for(this[t+o]=255&e;--o>=0&&(a*=256);)e<0&&0===s&&0!==this[t+o+1]&&(s=1),this[t+o]=(e/a>>0)-s&255;return t+n},o.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,1,127,-128),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},o.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):F(this,e,t,!0),t+2},o.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):F(this,e,t,!1),t+2},o.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):N(this,e,t,!0),t+4},o.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||j(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):N(this,e,t,!1),t+4},o.prototype.writeFloatLE=function(e,t,n){return L(this,e,t,!0,n)},o.prototype.writeFloatBE=function(e,t,n){return L(this,e,t,!1,n)},o.prototype.writeDoubleLE=function(e,t,n){return q(this,e,t,!0,n)},o.prototype.writeDoubleBE=function(e,t,n){return q(this,e,t,!1,n)},o.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===e.length||0===this.length)return 0;if(t<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t<r-n&&(r=e.length-t+n);var i,a=r-n;if(this===e&&n<t&&t<r)for(i=a-1;i>=0;--i)e[i+t]=this[i+n];else if(a<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<a;++i)e[i+t]=this[i+n];else Uint8Array.prototype.set.call(e,this.subarray(n,n+a),t);return a},o.prototype.fill=function(e,t,n,r){if("string"==typeof e){if("string"==typeof t?(r=t,t=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===e.length){var i=e.charCodeAt(0);i<256&&(e=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof e&&(e&=255);if(t<0||this.length<t||this.length<n)throw new RangeError("Out of range index");if(n<=t)return this;t>>>=0,n=void 0===n?this.length:n>>>0,e||(e=0);var a;if("number"==typeof e)for(a=t;a<n;++a)this[a]=e;else{var s=o.isBuffer(e)?e:V(new o(e,r).toString()),u=s.length;for(a=0;a<n-t;++a)this[a+t]=s[a%u]}return this};var ee=/[^+\/0-9A-Za-z-_]/g}).call(t,n(17))},function(e,t,n){var r=n(37),i=n(335),o=n(190),a=Object.defineProperty;t.f=n(49)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),i)try{return a(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){var r=n(406),i="object"==typeof self&&self&&self.Object===Object&&self,o=r||i||Function("return this")();e.exports=o},function(e,t,n){"use strict";function r(){D.ReactReconcileTransaction&&w||c("123")}function i(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=f.getPooled(),this.reconcileTransaction=D.ReactReconcileTransaction.getPooled(!0)}function o(e,t,n,i,o,a){return r(),w.batchedUpdates(e,t,n,i,o,a)}function a(e,t){return e._mountOrder-t._mountOrder}function s(e){var t=e.dirtyComponentsLength;t!==y.length&&c("124",t,y.length),y.sort(a),_++;for(var n=0;n<t;n++){var r=y[n],i=r._pendingCallbacks;r._pendingCallbacks=null;var o;if(d.logTopLevelRenders){var s=r;r._currentElement.type.isReactTopLevelWrapper&&(s=r._renderedComponent),o="React update: "+s.getName(),console.time(o)}if(m.performUpdateIfNecessary(r,e.reconcileTransaction,_),o&&console.timeEnd(o),i)for(var u=0;u<i.length;u++)e.callbackQueue.enqueue(i[u],r.getPublicInstance())}}function u(e){if(r(),!w.isBatchingUpdates)return void w.batchedUpdates(u,e);y.push(e),null==e._updateBatchNumber&&(e._updateBatchNumber=_+1)}function l(e,t){g(w.isBatchingUpdates,"ReactUpdates.asap: Can't enqueue an asap callback in a context whereupdates are not being batched."),b.enqueue(e,t),x=!0}var c=n(11),p=n(13),f=n(451),h=n(70),d=n(456),m=n(90),v=n(161),g=n(8),y=[],_=0,b=f.getPooled(),x=!1,w=null,k={initialize:function(){this.dirtyComponentsLength=y.length},close:function(){this.dirtyComponentsLength!==y.length?(y.splice(0,this.dirtyComponentsLength),C()):y.length=0}},E={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},S=[k,E];p(i.prototype,v,{getTransactionWrappers:function(){return S},destructor:function(){this.dirtyComponentsLength=null,f.release(this.callbackQueue),this.callbackQueue=null,D.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return v.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),h.addPoolingTo(i);var C=function(){for(;y.length||x;){if(y.length){var e=i.getPooled();e.perform(s,null,e),i.release(e)}if(x){x=!1;var t=b;b=f.getPooled(),t.notifyAll(),f.release(t)}}},A={injectReconcileTransaction:function(e){e||c("126"),D.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){e||c("127"),"function"!=typeof e.batchedUpdates&&c("128"),"boolean"!=typeof e.isBatchingUpdates&&c("129"),w=e}},D={ReactReconcileTransaction:null,batchedUpdates:o,enqueueUpdate:u,flushBatchedUpdates:C,injection:A,asap:l};e.exports=D},function(e,t){(function(){var e=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1},t=function(e,t){function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},n={}.hasOwnProperty;this.Mark=function(){function t(e,t,n,r){this.line=e,this.column=t,this.buffer=n,this.pointer=r}return t.prototype.get_snippet=function(t,n){var r,i,o,a,s,u,l;if(null==t&&(t=4),null==n&&(n=75),null==this.buffer)return null;for(r="\0\r\n…\u2028\u2029",o="",u=this.pointer;u>0&&(a=this.buffer[u-1],e.call(r,a)<0);)if(u--,this.pointer-u>n/2-1){o=" ... ",u+=5;break}for(l="",i=this.pointer;i<this.buffer.length&&(s=this.buffer[i],e.call(r,s)<0);)if(++i-this.pointer>n/2-1){l=" ... ",i-=5;break}return""+new Array(t).join(" ")+o+this.buffer.slice(u,i)+l+"\n"+new Array(t+this.pointer-u+o.length).join(" ")+"^"},t.prototype.toString=function(){var e,t;return e=this.get_snippet(),t="  on line "+(this.line+1)+", column "+(this.column+1),e?t:t+":\n"+e},t}(),this.YAMLError=function(e){function n(e){this.message=e,n.__super__.constructor.call(this),this.stack=this.toString()+"\n"+(new Error).stack.split("\n").slice(1).join("\n")}return t(n,e),n.prototype.toString=function(){return this.message},n}(Error),this.MarkedYAMLError=function(e){function n(e,t,r,i,o){this.context=e,this.context_mark=t,this.problem=r,this.problem_mark=i,this.note=o,n.__super__.constructor.call(this)}return t(n,e),n.prototype.toString=function(){var e;return e=[],null!=this.context&&e.push(this.context),null==this.context_mark||null!=this.problem&&null!=this.problem_mark&&this.context_mark.line===this.problem_mark.line&&this.context_mark.column===this.problem_mark.column||e.push(this.context_mark.toString()),null!=this.problem&&e.push(this.problem),null!=this.problem_mark&&e.push(this.problem_mark.toString()),null!=this.note&&e.push(this.note),e.join("\n")},n}(this.YAMLError)}).call(this)},function(e,t,n){"use strict";var r=n(95),i=function(e){return e&&e.__esModule?e:{default:e}}(r);e.exports=function(){var e={location:{},history:{},open:function(){},close:function(){},File:function(){}};if("undefined"==typeof window)return e;try{e=window;var t=["File","Blob","FormData"],n=!0,r=!1,o=void 0;try{for(var a,s=(0,i.default)(t);!(n=(a=s.next()).done);n=!0){var u=a.value;u in window&&(e[u]=window[u])}}catch(e){r=!0,o=e}finally{try{!n&&s.return&&s.return()}finally{if(r)throw o}}}catch(e){console.error(e)}return e}()},function(e,t,n){e.exports={default:n(593),__esModule:!0}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0;var i=n(567),o=r(i),a=n(566),s=r(a),u="function"==typeof s.default&&"symbol"==typeof o.default?function(e){return typeof e}:function(e){return e&&"function"==typeof s.default&&e.constructor===s.default&&e!==s.default.prototype?"symbol":typeof e};t.default="function"==typeof s.default&&"symbol"===u(o.default)?function(e){return void 0===e?"undefined":u(e)}:function(e){return e&&"function"==typeof s.default&&e.constructor===s.default&&e!==s.default.prototype?"symbol":void 0===e?"undefined":u(e)}},function(e,t,n){e.exports=!n(54)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t,n){"use strict";function r(e,t,n){return n?[e,t]:e}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){this.dispatchConfig=e,this._targetInst=t,this.nativeEvent=n;var i=this.constructor.Interface;for(var o in i)if(i.hasOwnProperty(o)){var s=i[o];s?this[o]=s(n):"target"===o?this.target=r:this[o]=n[o]}var u=null!=n.defaultPrevented?n.defaultPrevented:!1===n.returnValue;return this.isDefaultPrevented=u?a.thatReturnsTrue:a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse,this}var i=n(13),o=n(70),a=n(32),s=(n(10),["dispatchConfig","_targetInst","nativeEvent","isDefaultPrevented","isPropagationStopped","_dispatchListeners","_dispatchInstances"]),u={type:null,target:null,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};i(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=a.thatReturnsTrue)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=a.thatReturnsTrue)},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;for(var n=0;n<s.length;n++)this[s[n]]=null}}),r.Interface=u,r.augmentClass=function(e,t){var n=this,r=function(){};r.prototype=n.prototype;var a=new r;i(a,e.prototype),e.prototype=a,e.prototype.constructor=e,e.Interface=i({},n.Interface,t),e.augmentClass=n.augmentClass,o.addPoolingTo(e,o.fourArgumentPooler)},o.addPoolingTo(r,o.fourArgumentPooler),e.exports=r},function(e,t,n){"use strict";var r={current:null};e.exports=r},function(e,t,n){var r=n(98);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)}}return function(){return e.apply(t,arguments)}}},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},function(e,t,n){var r=n(41),i=n(101);e.exports=n(49)?function(e,t,n){return r.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on  "+e);return e}},function(e,t,n){"use strict";e.exports=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e}},function(e,t,n){function r(e){return a(e)?i(e):o(e)}var i=n(393),o=n(856),a=n(86);e.exports=r},function(e,t,n){"use strict";function r(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function i(e,t){return e===t}function o(e){var t=arguments.length<=1||void 0===arguments[1]?i:arguments[1],n=null,r=null;return function(){for(var i=arguments.length,o=Array(i),a=0;a<i;a++)o[a]=arguments[a];return null!==n&&n.length===o.length&&o.every(function(e,r){return t(e,n[r])})?r:(r=e.apply(void 0,o),n=o,r)}}function a(e){var t=Array.isArray(e[0])?e[0]:e;if(!t.every(function(e){return"function"==typeof e})){var n=t.map(function(e){return typeof e}).join(", ");throw new Error("Selector creators expect all input-selectors to be functions, instead received the following types: ["+n+"]")}return t}function s(e){for(var t=arguments.length,n=Array(t>1?t-1:0),i=1;i<t;i++)n[i-1]=arguments[i];return function(){for(var t=arguments.length,i=Array(t),o=0;o<t;o++)i[o]=arguments[o];var s=0,u=i.pop(),l=a(i),c=e.apply(void 0,[function(){return s++,u.apply(void 0,arguments)}].concat(n)),p=function(e,t){for(var n=arguments.length,i=Array(n>2?n-2:0),o=2;o<n;o++)i[o-2]=arguments[o];var a=l.map(function(n){return n.apply(void 0,[e,t].concat(i))});return c.apply(void 0,r(a))};return p.resultFunc=u,p.recomputations=function(){return s},p.resetRecomputations=function(){return s=0},p}}function u(){return s(o).apply(void 0,arguments)}function l(e){var t=arguments.length<=1||void 0===arguments[1]?u:arguments[1];if("object"!=typeof e)throw new Error("createStructuredSelector expects first argument to be an object where each property is a selector, instead received a "+typeof e);var n=Object.keys(e);return t(n.map(function(t){return e[t]}),function(){for(var e=arguments.length,t=Array(e),r=0;r<e;r++)t[r]=arguments[r];return t.reduce(function(e,t,r){return e[n[r]]=t,e},{})})}t.__esModule=!0,t.defaultMemoize=o,t.createSelectorCreator=s,t.createSelector=u,t.createStructuredSelector=l},function(e,t,n){(function(e){(function(){var t,r,i,o=[].slice,a={}.hasOwnProperty;this.StringStream=function(){function e(){this.string=""}return e.prototype.write=function(e){return this.string+=e},e}(),this.clone=function(e){return function(t){return e.extend({},t)}}(this),this.extend=function(){var e,t,n,r,i,a,s;for(e=arguments[0],a=2<=arguments.length?o.call(arguments,1):[],t=0,r=a.length;t<r;t++){i=a[t];for(n in i)s=i[n],e[n]=s}return e},this.is_empty=function(e){var t;if(Array.isArray(e)||"string"==typeof e)return 0===e.length;for(t in e)if(a.call(e,t))return!1;return!0},this.inspect=null!=(t=null!=(r=null!=(i=n(1194))?i.inspect:void 0)?r:e.inspect)?t:function(e){return""+e},this.pad_left=function(e,t,n){return e=String(e),e.length>=n?e:e.length+1===n?""+t+e:""+new Array(n-e.length+1).join(t)+e},this.to_hex=function(e){return"string"==typeof e&&(e=e.charCodeAt(0)),e.toString(16)}}).call(this)}).call(t,n(17))},function(e,t,n){var r=n(77);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t){var n=e.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(e,t,n){var r=n(138),i=n(360);e.exports=n(106)?function(e,t,n){return r.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";var r=n(725),i=Math.max;e.exports=function(e){return i(0,r(e))}},function(e,t,n){function r(e){return null==e?void 0===e?u:s:(e=Object(e),l&&l in e?o(e):a(e))}var i=n(82),o=n(896),a=n(925),s="[object Null]",u="[object Undefined]",l=i?i.toStringTag:void 0;e.exports=r},function(e,t,n){function r(e,t){var n=o(e,t);return i(n)?n:void 0}var i=n(854),o=n(897);e.exports=r},function(e,t){function n(e){return null!=e&&"object"==typeof e}e.exports=n},function(e,t,n){"use strict"},function(e,t,n){"use strict";var r=n(11),i=(n(8),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),o=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,e,t,n),i}return new r(e,t,n)},s=function(e,t,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,e,t,n,r),o}return new i(e,t,n,r)},u=function(e){var t=this;e instanceof t||r("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=i,c=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||l,n.poolSize||(n.poolSize=10),n.release=u,n},p={addPoolingTo:c,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:a,fourArgumentPooler:s};e.exports=p},function(e,t,n){"use strict";function r(e){if(!(this instanceof r))return new r(e);l.call(this,e),c.call(this,e),e&&!1===e.readable&&(this.readable=!1),e&&!1===e.writable&&(this.writable=!1),this.allowHalfOpen=!0,e&&!1===e.allowHalfOpen&&(this.allowHalfOpen=!1),this.once("end",i)}function i(){this.allowHalfOpen||this._writableState.ended||a(o,this)}function o(e){e.end()}var a=n(158),s=Object.keys||function(e){var t=[];for(var n in e)t.push(n);return t};e.exports=r;var u=n(111);u.inherits=n(42);var l=n(479),c=n(261);u.inherits(r,l);for(var p=s(c.prototype),f=0;f<p.length;f++){var h=p[f];r.prototype[h]||(r.prototype[h]=c.prototype[h])}Object.defineProperty(r.prototype,"destroyed",{get:function(){return void 0!==this._readableState&&void 0!==this._writableState&&(this._readableState.destroyed&&this._writableState.destroyed)},set:function(e){void 0!==this._readableState&&void 0!==this._writableState&&(this._readableState.destroyed=e,this._writableState.destroyed=e)}}),r.prototype._destroy=function(e,t){this.push(null),this.end(),a(t,e)}},function(e,t){e.exports=function(e){return e.webpackPolyfill||(e.deprecate=function(){},e.paths=[],e.children||(e.children=[]),Object.defineProperty(e,"loaded",{enumerable:!0,get:function(){return e.l}}),Object.defineProperty(e,"id",{enumerable:!0,get:function(){return e.i}}),e.webpackPolyfill=1),e}},function(e,t,n){"use strict";var r=n(430),i=n(429),o=n(114).decodeHTML,a="&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});",s="<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>",u="</[A-Za-z][A-Za-z0-9-]*\\s*[>]",l=new RegExp("^(?:<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>|</[A-Za-z][A-Za-z0-9-]*\\s*[>]|\x3c!----\x3e|\x3c!--(?:-?[^>-])(?:-?[^-])*--\x3e|[<][?].*?[?][>]|<![A-Z]+\\s+[^>]*>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>)","i"),c=/[\\&]/,p="[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]",f=new RegExp("\\\\"+p+"|"+a,"gi"),h=new RegExp('[&<>"]',"g"),d=new RegExp(a+'|[&<>"]',"gi"),m=function(e){return 92===e.charCodeAt(0)?e.charAt(1):o(e)},v=function(e){return c.test(e)?e.replace(f,m):e},g=function(e){try{return r(i(e))}catch(t){return e}},y=function(e){switch(e){case"&":return"&amp;";case"<":return"&lt;";case">":return"&gt;";case'"':return"&quot;";default:return e}},_=function(e,t){return h.test(e)?t?e.replace(d,y):e.replace(h,y):e};e.exports={unescapeString:v,normalizeURI:g,escapeXml:_,reHtmlTag:l,OPENTAG:s,CLOSETAG:u,ENTITY:a,ESCAPABLE:p}},function(e,t){e.exports={}},function(e,t,n){var r=n(181),i=n(178);e.exports=function(e){return r(i(e))}},function(e,t,n){var r=n(178);e.exports=function(e){return Object(r(e))}},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){var r=n(31),i=n(64),o=n(108),a=n(202)("src"),s=Function.toString,u=(""+s).split("toString");n(63).inspectSource=function(e){return s.call(e)},(e.exports=function(e,t,n,s){var l="function"==typeof n;l&&(o(n,"name")||i(n,"name",t)),e[t]!==n&&(l&&(o(n,a)||i(n,a,e[t]?""+e[t]:u.join(String(t)))),e===r?e[t]=n:s?e[t]?e[t]=n:i(e,t,n):(delete e[t],i(e,t,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[a]||s.call(this)})},function(e,t,n){"use strict";var r=n(372)();e.exports=function(e){return e!==r&&null!==e}},function(e,t,n){"use strict";function r(e){return void 0===e||null===e}function i(e){return"object"==typeof e&&null!==e}function o(e){return Array.isArray(e)?e:r(e)?[]:[e]}function a(e,t){var n,r,i,o;if(t)for(o=Object.keys(t),n=0,r=o.length;n<r;n+=1)i=o[n],e[i]=t[i];return e}function s(e,t){var n,r="";for(n=0;n<t;n+=1)r+=e;return r}function u(e){return 0===e&&Number.NEGATIVE_INFINITY===1/e}e.exports.isNothing=r,e.exports.isObject=i,e.exports.toArray=o,e.exports.repeat=s,e.exports.isNegativeZero=u,e.exports.extend=a},function(e,t,n){"use strict";function r(e,t,n){var i=[];return e.include.forEach(function(e){n=r(e,t,n)}),e[t].forEach(function(e){n.forEach(function(t,n){t.tag===e.tag&&t.kind===e.kind&&i.push(n)}),n.push(e)}),n.filter(function(e,t){return-1===i.indexOf(t)})}function i(){function e(e){r[e.kind][e.tag]=r.fallback[e.tag]=e}var t,n,r={scalar:{},sequence:{},mapping:{},fallback:{}};for(t=0,n=arguments.length;t<n;t+=1)arguments[t].forEach(e);return r}function o(e){this.include=e.include||[],this.implicit=e.implicit||[],this.explicit=e.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&"scalar"!==e.loadKind)throw new s("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var a=n(80),s=n(117),u=n(16);o.DEFAULT=null,o.create=function(){var e,t;switch(arguments.length){case 1:e=o.DEFAULT,t=arguments[0];break;case 2:e=arguments[0],t=arguments[1];break;default:throw new s("Wrong number of arguments for Schema.create function")}if(e=a.toArray(e),t=a.toArray(t),!e.every(function(e){return e instanceof o}))throw new s("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!t.every(function(e){return e instanceof u}))throw new s("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:e,explicit:t})},e.exports=o},function(e,t,n){var r=n(43),i=r.Symbol;e.exports=i},function(e,t,n){function r(e,t){return i(e)?e:o(e,t)?[e]:a(s(e))}var i=n(20),o=n(221),a=n(936),s=n(87);e.exports=r},function(e,t,n){function r(e,t,n,r){var a=!n;n||(n={});for(var s=-1,u=t.length;++s<u;){var l=t[s],c=r?r(n[l],e[l],l,n,e):void 0;void 0===c&&(c=e[l]),a?o(n,l,c):i(n,l,c)}return n}var i=n(148),o=n(396);e.exports=r},function(e,t,n){function r(e){if("string"==typeof e||i(e))return e;var t=e+"";return"0"==t&&1/e==-o?"-0":t}var i=n(155),o=1/0;e.exports=r},function(e,t,n){function r(e){return null!=e&&o(e.length)&&!i(e)}var i=n(420),o=n(228);e.exports=r},function(e,t,n){function r(e){return null==e?"":i(e)}var i=n(401);e.exports=r},function(e,t,n){"use strict";function r(e){if(d){var t=e.node,n=e.children;if(n.length)for(var r=0;r<n.length;r++)m(t,n[r],null);else null!=e.html?p(t,e.html):null!=e.text&&h(t,e.text)}}function i(e,t){e.parentNode.replaceChild(t.node,e),r(t)}function o(e,t){d?e.children.push(t):e.node.appendChild(t.node)}function a(e,t){d?e.html=t:p(e.node,t)}function s(e,t){d?e.text=t:h(e.node,t)}function u(){return this.node.nodeName}function l(e){return{node:e,children:[],html:null,text:null,toString:u}}var c=n(241),p=n(163),f=n(249),h=n(469),d="undefined"!=typeof document&&"number"==typeof document.documentMode||"undefined"!=typeof navigator&&"string"==typeof navigator.userAgent&&/\bEdge\/\d/.test(navigator.userAgent),m=f(function(e,t,n){11===t.node.nodeType||1===t.node.nodeType&&"object"===t.node.nodeName.toLowerCase()&&(null==t.node.namespaceURI||t.node.namespaceURI===c.html)?(r(t),e.insertBefore(t.node,n)):(e.insertBefore(t.node,n),r(t))});l.insertTreeBefore=m,l.replaceChildWithTree=i,l.queueChild=o,l.queueHTML=a,l.queueText=s,e.exports=l},function(e,t,n){"use strict";function r(e,t){return(e&t)===t}var i=n(11),o=(n(8),{MUST_USE_PROPERTY:1,HAS_BOOLEAN_VALUE:4,HAS_NUMERIC_VALUE:8,HAS_POSITIVE_NUMERIC_VALUE:24,HAS_OVERLOADED_BOOLEAN_VALUE:32,injectDOMPropertyConfig:function(e){var t=o,n=e.Properties||{},a=e.DOMAttributeNamespaces||{},u=e.DOMAttributeNames||{},l=e.DOMPropertyNames||{},c=e.DOMMutationMethods||{};e.isCustomAttribute&&s._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var p in n){s.properties.hasOwnProperty(p)&&i("48",p);var f=p.toLowerCase(),h=n[p],d={attributeName:f,attributeNamespace:null,propertyName:p,mutationMethod:null,mustUseProperty:r(h,t.MUST_USE_PROPERTY),hasBooleanValue:r(h,t.HAS_BOOLEAN_VALUE),hasNumericValue:r(h,t.HAS_NUMERIC_VALUE),hasPositiveNumericValue:r(h,t.HAS_POSITIVE_NUMERIC_VALUE),hasOverloadedBooleanValue:r(h,t.HAS_OVERLOADED_BOOLEAN_VALUE)};if(d.hasBooleanValue+d.hasNumericValue+d.hasOverloadedBooleanValue<=1||i("50",p),u.hasOwnProperty(p)){var m=u[p];d.attributeName=m}a.hasOwnProperty(p)&&(d.attributeNamespace=a[p]),l.hasOwnProperty(p)&&(d.propertyName=l[p]),c.hasOwnProperty(p)&&(d.mutationMethod=c[p]),s.properties[p]=d}}}),a=":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",s={ID_ATTRIBUTE_NAME:"data-reactid",ROOT_ATTRIBUTE_NAME:"data-reactroot",ATTRIBUTE_NAME_START_CHAR:a,ATTRIBUTE_NAME_CHAR:a+"\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",properties:{},getPossibleStandardName:null,_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<s._isCustomAttributeFunctions.length;t++){if((0,s._isCustomAttributeFunctions[t])(e))return!0}return!1},injection:o};e.exports=s},function(e,t,n){"use strict";function r(){i.attachRefs(this,this._currentElement)}var i=n(1045),o=(n(39),n(10),{mountComponent:function(e,t,n,i,o,a){var s=e.mountComponent(t,n,i,o,a);return e._currentElement&&null!=e._currentElement.ref&&t.getReactMountReady().enqueue(r,e),s},getHostNode:function(e){return e.getHostNode()},unmountComponent:function(e,t){i.detachRefs(e,e._currentElement),e.unmountComponent(t)},receiveComponent:function(e,t,n,o){var a=e._currentElement;if(t!==a||o!==e._context){var s=i.shouldUpdateRefs(a,t);s&&i.detachRefs(e,a),e.receiveComponent(t,n,o),s&&e._currentElement&&null!=e._currentElement.ref&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t,n){e._updateBatchNumber===n&&e.performUpdateIfNecessary(t)}});e.exports=o},function(e,t,n){"use strict";var r=n(430),i=n(429),o=n(114).decodeHTML,a="&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});",s="<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>",u="</[A-Za-z][A-Za-z0-9-]*\\s*[>]",l=new RegExp("^(?:<[A-Za-z][A-Za-z0-9-]*(?:\\s+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:\\s*=\\s*(?:[^\"'=<>`\\x00-\\x20]+|'[^']*'|\"[^\"]*\"))?)*\\s*/?>|</[A-Za-z][A-Za-z0-9-]*\\s*[>]|\x3c!----\x3e|\x3c!--(?:-?[^>-])(?:-?[^-])*--\x3e|[<][?].*?[?][>]|<![A-Z]+\\s+[^>]*>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>)","i"),c=/[\\&]/,p="[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]",f=new RegExp("\\\\"+p+"|"+a,"gi"),h=new RegExp('[&<>"]',"g"),d=new RegExp(a+'|[&<>"]',"gi"),m=function(e){return 92===e.charCodeAt(0)?e.charAt(1):o(e)},v=function(e){return c.test(e)?e.replace(f,m):e},g=function(e){try{return r(i(e))}catch(t){return e}},y=function(e){switch(e){case"&":return"&amp;";case"<":return"&lt;";case">":return"&gt;";case'"':return"&quot;";default:return e}},_=function(e,t){return h.test(e)?t?e.replace(d,y):e.replace(h,y):e};e.exports={unescapeString:v,normalizeURI:g,escapeXml:_,reHtmlTag:l,OPENTAG:s,CLOSETAG:u,ENTITY:a,ESCAPABLE:p}},function(e,t,n){"use strict";var r=n(13),i=n(474),o=n(1100),a=n(1101),s=n(93),u=n(1102),l=n(1103),c=n(1104),p=n(1108),f=s.createElement,h=s.createFactory,d=s.cloneElement,m=r,v=function(e){return e},g={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:p},Component:i.Component,PureComponent:i.PureComponent,createElement:f,cloneElement:d,isValidElement:s.isValidElement,PropTypes:u,createClass:c,createFactory:h,createMixin:v,DOM:a,version:l,__spread:m};e.exports=g},function(e,t,n){"use strict";function r(e){return void 0!==e.ref}function i(e){return void 0!==e.key}var o=n(13),a=n(52),s=(n(10),n(478),Object.prototype.hasOwnProperty),u=n(476),l={key:!0,ref:!0,__self:!0,__source:!0},c=function(e,t,n,r,i,o,a){var s={$$typeof:u,type:e,key:t,ref:n,props:a,_owner:o};return s};c.createElement=function(e,t,n){var o,u={},p=null,f=null;if(null!=t){r(t)&&(f=t.ref),i(t)&&(p=""+t.key),void 0===t.__self?null:t.__self,void 0===t.__source?null:t.__source;for(o in t)s.call(t,o)&&!l.hasOwnProperty(o)&&(u[o]=t[o])}var h=arguments.length-2;if(1===h)u.children=n;else if(h>1){for(var d=Array(h),m=0;m<h;m++)d[m]=arguments[m+2];u.children=d}if(e&&e.defaultProps){var v=e.defaultProps;for(o in v)void 0===u[o]&&(u[o]=v[o])}return c(e,p,f,0,0,a.current,u)},c.createFactory=function(e){var t=c.createElement.bind(null,e);return t.type=e,t},c.cloneAndReplaceKey=function(e,t){return c(e.type,t,e.ref,e._self,e._source,e._owner,e.props)},c.cloneElement=function(e,t,n){var u,p=o({},e.props),f=e.key,h=e.ref,d=(e._self,e._source,e._owner);if(null!=t){r(t)&&(h=t.ref,d=a.current),i(t)&&(f=""+t.key);var m;e.type&&e.type.defaultProps&&(m=e.type.defaultProps);for(u in t)s.call(t,u)&&!l.hasOwnProperty(u)&&(void 0===t[u]&&void 0!==m?p[u]=m[u]:p[u]=t[u])}var v=arguments.length-2;if(1===v)p.children=n;else if(v>1){for(var g=Array(v),y=0;y<v;y++)g[y]=arguments[y+2];p.children=g}return c(e.type,f,h,0,0,d,p)},c.isValidElement=function(e){return"object"==typeof e&&null!==e&&e.$$typeof===u},e.exports=c},function(e,t){(function(){var e,t=function(e,t){function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},n={}.hasOwnProperty;e=0,this.Node=function(){function t(t,n,r,i){this.tag=t,this.value=n,this.start_mark=r,this.end_mark=i,this.unique_id="node_"+e++}return t}(),this.ScalarNode=function(e){function n(e,t,r,i,o){this.tag=e,this.value=t,this.start_mark=r,this.end_mark=i,this.style=o,n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="scalar",n}(this.Node),this.CollectionNode=function(e){function n(e,t,r,i,o){this.tag=e,this.value=t,this.start_mark=r,this.end_mark=i,this.flow_style=o,n.__super__.constructor.apply(this,arguments)}return t(n,e),n}(this.Node),this.SequenceNode=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="sequence",n}(this.CollectionNode),this.MappingNode=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return t(n,e),n.prototype.id="mapping",n}(this.CollectionNode)}).call(this)},function(e,t,n){e.exports={default:n(586),__esModule:!0}},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}},function(e,t,n){"use strict";t.__esModule=!0;var r=n(563),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=function(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return(0,i.default)(e)}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){var r=n(345),i=n(180);e.exports=Object.keys||function(e){return r(e,i)}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(41).f,i=n(55),o=n(22)("toStringTag");e.exports=function(e,t,n){e&&!i(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){"use strict";var r=n(617)(!0);n(339)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,t=this._t,n=this._i;return n>=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){n(622);for(var r=n(24),i=n(56),o=n(74),a=n(22)("toStringTag"),s="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),u=0;u<s.length;u++){var l=s[u],c=r[l],p=c&&c.prototype;p&&!p[a]&&i(p,a,l),o[l]=o.Array}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){e.exports=!n(107)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var n={}.hasOwnProperty;e.exports=function(e,t){return n.call(e,t)}},function(e,t){e.exports={}},function(e,t,n){var r=n(139),i=Math.min;e.exports=function(e){return e>0?i(r(e),9007199254740991):0}},function(e,t,n){(function(e){function n(e){return Array.isArray?Array.isArray(e):"[object Array]"===v(e)}function r(e){return"boolean"==typeof e}function i(e){return null===e}function o(e){return null==e}function a(e){return"number"==typeof e}function s(e){return"string"==typeof e}function u(e){return"symbol"==typeof e}function l(e){return void 0===e}function c(e){return"[object RegExp]"===v(e)}function p(e){return"object"==typeof e&&null!==e}function f(e){return"[object Date]"===v(e)}function h(e){return"[object Error]"===v(e)||e instanceof Error}function d(e){return"function"==typeof e}function m(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e}function v(e){return Object.prototype.toString.call(e)}t.isArray=n,t.isBoolean=r,t.isNull=i,t.isNullOrUndefined=o,t.isNumber=a,t.isString=s,t.isSymbol=u,t.isUndefined=l,t.isRegExp=c,t.isObject=p,t.isDate=f,t.isError=h,t.isFunction=d,t.isPrimitive=m,t.isBuffer=e.isBuffer}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e){return"string"==typeof e&&i.test(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=/-webkit-|-moz-|-ms-/;e.exports=t.default},function(e,t){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},function(e,t,n){var r=n(711),i=n(710);t.decode=function(e,t){return(!t||t<=0?i.XML:i.HTML)(e)},t.decodeStrict=function(e,t){return(!t||t<=0?i.XML:i.HTMLStrict)(e)},t.encode=function(e,t){return(!t||t<=0?r.XML:r.HTML)(e)},t.encodeXML=r.XML,t.encodeHTML4=t.encodeHTML5=t.encodeHTML=r.HTML,t.decodeXML=t.decodeXMLStrict=i.XML,t.decodeHTML4=t.decodeHTML5=t.decodeHTML=i.HTML,t.decodeHTML4Strict=t.decodeHTML5Strict=t.decodeHTMLStrict=i.HTMLStrict,t.escape=r.escape},function(e,t,n){"use strict";var r=n(79);e.exports=function(e){if(!r(e))throw new TypeError("Cannot use null or undefined");return e}},function(e,t,n){function r(t,n){return delete e.exports[t],e.exports[t]=n,n}var i=n(380),o=n(700);e.exports={Parser:i,Tokenizer:n(381),ElementType:n(113),DomHandler:o,get FeedHandler(){return r("FeedHandler",n(760))},get Stream(){return r("Stream",n(762))},get WritableStream(){return r("WritableStream",n(382))},get ProxyHandler(){return r("ProxyHandler",n(761))},get DomUtils(){return r("DomUtils",n(702))},get CollectingHandler(){return r("CollectingHandler",n(759))},DefaultHandler:o,get RssHandler(){return r("RssHandler",this.FeedHandler)},parseDOM:function(e,t){var n=new o(t);return new i(n,t).end(e),n.dom},parseFeed:function(t,n){var r=new e.exports.FeedHandler(n);return new i(r,n).end(t),r.dom},createDomStream:function(e,t,n){var r=new o(e,t,n);return new i(r,t)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},function(e,t,n){"use strict";function r(e,t){Error.call(this),this.name="YAMLException",this.reason=e,this.mark=t,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t},e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(388)],implicit:[n(814),n(807)],explicit:[n(799),n(809),n(810),n(812)]})},function(e,t,n){function r(e){return"function"==typeof e?e:null==e?a:"object"==typeof e?s(e)?o(e[0],e[1]):i(e):u(e)}var i=n(858),o=n(859),a=n(225),s=n(20),u=n(952);e.exports=r},function(e,t){function n(e,t){return e===t||e!==e&&t!==t}e.exports=n},function(e,t){function n(e,t,n){if(t in e)return e[t];if(3===arguments.length)return n;throw new Error('"'+t+'" is a required argument.')}function r(e){var t=e.match(y);return t?{scheme:t[1],auth:t[2],host:t[3],port:t[4],path:t[5]}:null}function i(e){var t="";return e.scheme&&(t+=e.scheme+":"),t+="//",e.auth&&(t+=e.auth+"@"),e.host&&(t+=e.host),e.port&&(t+=":"+e.port),e.path&&(t+=e.path),t}function o(e){var n=e,o=r(e);if(o){if(!o.path)return e;n=o.path}for(var a,s=t.isAbsolute(n),u=n.split(/\/+/),l=0,c=u.length-1;c>=0;c--)a=u[c],"."===a?u.splice(c,1):".."===a?l++:l>0&&(""===a?(u.splice(c+1,l),l=0):(u.splice(c,2),l--));return n=u.join("/"),""===n&&(n=s?"/":"."),o?(o.path=n,i(o)):n}function a(e,t){""===e&&(e="."),""===t&&(t=".");var n=r(t),a=r(e);if(a&&(e=a.path||"/"),n&&!n.scheme)return a&&(n.scheme=a.scheme),i(n);if(n||t.match(_))return t;if(a&&!a.host&&!a.path)return a.host=t,i(a);var s="/"===t.charAt(0)?t:o(e.replace(/\/+$/,"")+"/"+t);return a?(a.path=s,i(a)):s}function s(e,t){""===e&&(e="."),e=e.replace(/\/$/,"");for(var n=0;0!==t.indexOf(e+"/");){var r=e.lastIndexOf("/");if(r<0)return t;if(e=e.slice(0,r),e.match(/^([^\/]+:\/)?\/*$/))return t;++n}return Array(n+1).join("../")+t.substr(e.length+1)}function u(e){return e}function l(e){return p(e)?"$"+e:e}function c(e){return p(e)?e.slice(1):e}function p(e){if(!e)return!1;var t=e.length;if(t<9)return!1;if(95!==e.charCodeAt(t-1)||95!==e.charCodeAt(t-2)||111!==e.charCodeAt(t-3)||116!==e.charCodeAt(t-4)||111!==e.charCodeAt(t-5)||114!==e.charCodeAt(t-6)||112!==e.charCodeAt(t-7)||95!==e.charCodeAt(t-8)||95!==e.charCodeAt(t-9))return!1;for(var n=t-10;n>=0;n--)if(36!==e.charCodeAt(n))return!1;return!0}function f(e,t,n){var r=d(e.source,t.source);return 0!==r?r:0!==(r=e.originalLine-t.originalLine)?r:0!==(r=e.originalColumn-t.originalColumn)||n?r:0!==(r=e.generatedColumn-t.generatedColumn)?r:(r=e.generatedLine-t.generatedLine,0!==r?r:d(e.name,t.name))}function h(e,t,n){var r=e.generatedLine-t.generatedLine;return 0!==r?r:0!==(r=e.generatedColumn-t.generatedColumn)||n?r:0!==(r=d(e.source,t.source))?r:0!==(r=e.originalLine-t.originalLine)?r:(r=e.originalColumn-t.originalColumn,0!==r?r:d(e.name,t.name))}function d(e,t){return e===t?0:null===e?1:null===t?-1:e>t?1:-1}function m(e,t){var n=e.generatedLine-t.generatedLine;return 0!==n?n:0!==(n=e.generatedColumn-t.generatedColumn)?n:0!==(n=d(e.source,t.source))?n:0!==(n=e.originalLine-t.originalLine)?n:(n=e.originalColumn-t.originalColumn,0!==n?n:d(e.name,t.name))}function v(e){return JSON.parse(e.replace(/^\)]}'[^\n]*\n/,""))}function g(e,t,n){if(t=t||"",e&&("/"!==e[e.length-1]&&"/"!==t[0]&&(e+="/"),t=e+t),n){var s=r(n);if(!s)throw new Error("sourceMapURL could not be parsed");if(s.path){var u=s.path.lastIndexOf("/");u>=0&&(s.path=s.path.substring(0,u+1))}t=a(i(s),t)}return o(t)}t.getArg=n;var y=/^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/,_=/^data:.+\,.+$/;t.urlParse=r,t.urlGenerate=i,t.normalize=o,t.join=a,t.isAbsolute=function(e){return"/"===e.charAt(0)||y.test(e)},t.relative=s;var b=function(){return!("__proto__"in Object.create(null))}();t.toSetString=b?u:l,t.fromSetString=b?u:c,t.compareByOriginalPositions=f,t.compareByGeneratedPositionsDeflated=h,t.compareByGeneratedPositionsInflated=m,t.parseSourceMapInput=v,t.computeSourceURL=g},function(e,t,n){"use strict";function r(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}function i(e,t,n){switch(e){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":return!(!n.disabled||!r(t));default:return!1}}var o=n(11),a=n(242),s=n(243),u=n(247),l=n(462),c=n(463),p=(n(8),{}),f=null,h=function(e,t){e&&(s.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e))},d=function(e){return h(e,!0)},m=function(e){return h(e,!1)},v=function(e){return"."+e._rootNodeID},g={injection:{injectEventPluginOrder:a.injectEventPluginOrder,injectEventPluginsByName:a.injectEventPluginsByName},putListener:function(e,t,n){"function"!=typeof n&&o("94",t,typeof n);var r=v(e);(p[t]||(p[t]={}))[r]=n;var i=a.registrationNameModules[t];i&&i.didPutListener&&i.didPutListener(e,t,n)},getListener:function(e,t){var n=p[t];if(i(t,e._currentElement.type,e._currentElement.props))return null;var r=v(e);return n&&n[r]},deleteListener:function(e,t){var n=a.registrationNameModules[t];n&&n.willDeleteListener&&n.willDeleteListener(e,t);var r=p[t];if(r){delete r[v(e)]}},deleteAllListeners:function(e){var t=v(e);for(var n in p)if(p.hasOwnProperty(n)&&p[n][t]){var r=a.registrationNameModules[n];r&&r.willDeleteListener&&r.willDeleteListener(e,n),delete p[n][t]}},extractEvents:function(e,t,n,r){for(var i,o=a.plugins,s=0;s<o.length;s++){var u=o[s];if(u){var c=u.extractEvents(e,t,n,r);c&&(i=l(i,c))}}return i},enqueueEvents:function(e){e&&(f=l(f,e))},processEventQueue:function(e){var t=f;f=null,e?c(t,d):c(t,m),f&&o("95"),u.rethrowCaughtError()},__purge:function(){p={}},__getListenerBank:function(){return p}};e.exports=g},function(e,t,n){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return g(e,r)}function i(e,t,n){var i=r(e,n,t);i&&(n._dispatchListeners=m(n._dispatchListeners,i),n._dispatchInstances=m(n._dispatchInstances,e))}function o(e){e&&e.dispatchConfig.phasedRegistrationNames&&d.traverseTwoPhase(e._targetInst,i,e)}function a(e){if(e&&e.dispatchConfig.phasedRegistrationNames){var t=e._targetInst,n=t?d.getParentInstance(t):null;d.traverseTwoPhase(n,i,e)}}function s(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,i=g(e,r);i&&(n._dispatchListeners=m(n._dispatchListeners,i),n._dispatchInstances=m(n._dispatchInstances,e))}}function u(e){e&&e.dispatchConfig.registrationName&&s(e._targetInst,null,e)}function l(e){v(e,o)}function c(e){v(e,a)}function p(e,t,n,r){d.traverseEnterLeave(n,r,s,e,t)}function f(e){v(e,u)}var h=n(122),d=n(243),m=n(462),v=n(463),g=(n(10),h.getListener),y={accumulateTwoPhaseDispatches:l,accumulateTwoPhaseDispatchesSkipTarget:c,accumulateDirectDispatches:f,accumulateEnterLeaveDispatches:p};e.exports=y},function(e,t,n){"use strict";var r={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o=n(252),a={view:function(e){if(e.view)return e.view;var t=o(e);if(t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};i.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}e.exports=r},function(e,t){(function(){var e=function(e,n){function r(){this.constructor=e}for(var i in n)t.call(n,i)&&(e[i]=n[i]);return r.prototype=n.prototype,e.prototype=new r,e.__super__=n.prototype,e},t={}.hasOwnProperty;this.Event=function(){function e(e,t){this.start_mark=e,this.end_mark=t}return e}(),this.NodeEvent=function(t){function n(e,t,n){this.anchor=e,this.start_mark=t,this.end_mark=n}return e(n,t),n}(this.Event),this.CollectionStartEvent=function(t){function n(e,t,n,r,i,o){this.anchor=e,this.tag=t,this.implicit=n,this.start_mark=r,this.end_mark=i,this.flow_style=o}return e(n,t),n}(this.NodeEvent),this.CollectionEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.Event),this.StreamStartEvent=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.encoding=n}return e(n,t),n}(this.Event),this.StreamEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.Event),this.DocumentStartEvent=function(t){function n(e,t,n,r,i){this.start_mark=e,this.end_mark=t,this.explicit=n,this.version=r,this.tags=i}return e(n,t),n}(this.Event),this.DocumentEndEvent=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.explicit=n}return e(n,t),n}(this.Event),this.AliasEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.NodeEvent),this.ScalarEvent=function(t){function n(e,t,n,r,i,o,a){this.anchor=e,this.tag=t,this.implicit=n,this.value=r,this.start_mark=i,this.end_mark=o,this.style=a}return e(n,t),n}(this.NodeEvent),this.SequenceStartEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionStartEvent),this.SequenceEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionEndEvent),this.MappingStartEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionStartEvent),this.MappingEndEvent=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n}(this.CollectionEndEvent)}).call(this)},function(e,t,n){"use strict";function r(e){return{type:p,payload:(0,c.default)(e)}}function i(e){return{type:f,payload:e}}function o(e){return{type:h,payload:e}}function a(e){return{type:d,payload:e}}function s(e){return{type:m,payload:e}}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return{type:v,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.CLEAR=t.NEW_AUTH_ERR=t.NEW_SPEC_ERR_BATCH=t.NEW_SPEC_ERR=t.NEW_THROWN_ERR_BATCH=t.NEW_THROWN_ERR=void 0,t.newThrownErr=r,t.newThrownErrBatch=i,t.newSpecErr=o,t.newSpecErrBatch=a,t.newAuthErr=s,t.clear=u;var l=n(264),c=function(e){return e&&e.__esModule?e:{default:e}}(l),p=t.NEW_THROWN_ERR="err_new_thrown_err",f=t.NEW_THROWN_ERR_BATCH="err_new_thrown_err_batch",h=t.NEW_SPEC_ERR="err_new_spec_err",d=t.NEW_SPEC_ERR_BATCH="err_new_spec_err_batch",m=t.NEW_AUTH_ERR="err_new_auth_err",v=t.CLEAR="err_clear"},function(e,t,n){var r=n(53),i=n(338),o=n(336),a=n(37),s=n(133),u=n(193),l={},c={},t=e.exports=function(e,t,n,p,f){var h,d,m,v,g=f?function(){return e}:u(e),y=r(n,p,t?2:1),_=0;if("function"!=typeof g)throw TypeError(e+" is not iterable!");if(o(g)){for(h=s(e.length);h>_;_++)if((v=t?y(a(d=e[_])[0],d[1]):y(e[_]))===l||v===c)return v}else for(m=g.call(e);!(d=m.next()).done;)if((v=i(m,y,d.value,t))===l||v===c)return v};t.BREAK=l,t.RETURN=c},function(e,t){e.exports=!0},function(e,t,n){var r=n(134)("meta"),i=n(27),o=n(55),a=n(41).f,s=0,u=Object.isExtensible||function(){return!0},l=!n(54)(function(){return u(Object.preventExtensions({}))}),c=function(e){a(e,r,{value:{i:"O"+ ++s,w:{}}})},p=function(e,t){if(!i(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e;if(!o(e,r)){if(!u(e))return"F";if(!t)return"E";c(e)}return e[r].i},f=function(e,t){if(!o(e,r)){if(!u(e))return!0;if(!t)return!1;c(e)}return e[r].w},h=function(e){return l&&d.NEED&&u(e)&&!o(e,r)&&c(e),e},d=e.exports={KEY:r,NEED:!1,fastKey:p,getWeak:f,onFreeze:h}},function(e,t){t.f={}.propertyIsEnumerable},function(e,t,n){var r=n(189),i=Math.min;e.exports=function(e){return e>0?i(r(e),9007199254740991):0}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t,n){var r=n(135);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)}}return function(){return e.apply(t,arguments)}}},function(e,t,n){"use strict";var r=n(64),i=n(78),o=n(107),a=n(57),s=n(19);e.exports=function(e,t,n){var u=s(e),l=n(a,u,""[e]),c=l[0],p=l[1];o(function(){var t={};return t[u]=function(){return 7},7!=""[e](t)})&&(i(String.prototype,e,c),r(RegExp.prototype,u,2==t?function(e,t){return p.call(e,this,t)}:function(e){return p.call(e,this)}))}},function(e,t,n){var r=n(62),i=n(642),o=n(661),a=Object.defineProperty;t.f=n(106)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),i)try{return a(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t){var n=Math.ceil,r=Math.floor;e.exports=function(e){return isNaN(e=+e)?0:(e>0?r:n)(e)}},function(e,t,n){var r=n(644),i=n(57);e.exports=function(e){return r(i(e))}},function(e,t,n){"use strict";var r,i=n(373),o=n(376),a=n(729),s=n(734);r=e.exports=function(e,t){var n,r,a,u,l;return arguments.length<2||"string"!=typeof e?(u=t,t=e,e=null):u=arguments[2],null==e?(n=a=!0,r=!1):(n=s.call(e,"c"),r=s.call(e,"e"),a=s.call(e,"w")),l={value:t,configurable:n,enumerable:r,writable:a},u?i(o(u),l):l},r.gs=function(e,t,n){var r,u,l,c;return"string"!=typeof e?(l=n,n=t,t=e,e=null):l=arguments[3],null==t?t=void 0:a(t)?null==n?n=void 0:a(n)||(l=n,n=void 0):(l=t,t=n=void 0),null==e?(r=!0,u=!1):(r=s.call(e,"c"),u=s.call(e,"e")),c={get:t,set:n,configurable:r,enumerable:u},l?i(o(l),c):c}},function(e,t,n){"use strict";e.exports=n(726)("forEach")},function(e,t){function n(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function r(e){return"function"==typeof e}function i(e){return"number"==typeof e}function o(e){return"object"==typeof e&&null!==e}function a(e){return void 0===e}e.exports=n,n.EventEmitter=n,n.prototype._events=void 0,n.prototype._maxListeners=void 0,n.defaultMaxListeners=10,n.prototype.setMaxListeners=function(e){if(!i(e)||e<0||isNaN(e))throw TypeError("n must be a positive number");return this._maxListeners=e,this},n.prototype.emit=function(e){var t,n,i,s,u,l;if(this._events||(this._events={}),"error"===e&&(!this._events.error||o(this._events.error)&&!this._events.error.length)){if((t=arguments[1])instanceof Error)throw t;var c=new Error('Uncaught, unspecified "error" event. ('+t+")");throw c.context=t,c}if(n=this._events[e],a(n))return!1;if(r(n))switch(arguments.length){case 1:n.call(this);break;case 2:n.call(this,arguments[1]);break;case 3:n.call(this,arguments[1],arguments[2]);break;default:s=Array.prototype.slice.call(arguments,1),n.apply(this,s)}else if(o(n))for(s=Array.prototype.slice.call(arguments,1),l=n.slice(),i=l.length,u=0;u<i;u++)l[u].apply(this,s);return!0},n.prototype.addListener=function(e,t){var i;if(!r(t))throw TypeError("listener must be a function");return this._events||(this._events={}),this._events.newListener&&this.emit("newListener",e,r(t.listener)?t.listener:t),this._events[e]?o(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,o(this._events[e])&&!this._events[e].warned&&(i=a(this._maxListeners)?n.defaultMaxListeners:this._maxListeners)&&i>0&&this._events[e].length>i&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace()),this},n.prototype.on=n.prototype.addListener,n.prototype.once=function(e,t){function n(){this.removeListener(e,n),i||(i=!0,t.apply(this,arguments))}if(!r(t))throw TypeError("listener must be a function");var i=!1;return n.listener=t,this.on(e,n),this},n.prototype.removeListener=function(e,t){var n,i,a,s;if(!r(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(n=this._events[e],a=n.length,i=-1,n===t||r(n.listener)&&n.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(o(n)){for(s=a;s-- >0;)if(n[s]===t||n[s].listener&&n[s].listener===t){i=s;break}if(i<0)return this;1===n.length?(n.length=0,delete this._events[e]):n.splice(i,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},n.prototype.removeAllListeners=function(e){var t,n;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(n=this._events[e],r(n))this.removeListener(e,n);else if(n)for(;n.length;)this.removeListener(e,n[n.length-1]);return delete this._events[e],this},n.prototype.listeners=function(e){return this._events&&this._events[e]?r(this._events[e])?[this._events[e]]:this._events[e].slice():[]},n.prototype.listenerCount=function(e){if(this._events){var t=this._events[e];if(r(t))return 1;if(t)return t.length}return 0},n.listenerCount=function(e,t){return e.listenerCount(t)}},function(e,t,n){"use strict";var r={};e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=r.DEFAULT=new r({include:[n(118)],explicit:[n(805),n(804),n(803)]})},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(911),o=n(912),a=n(913),s=n(914),u=n(915);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t){function n(e,t,n,r){var i=-1,o=null==e?0:e.length;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}e.exports=n},function(e,t,n){function r(e,t,n){var r=e[t];s.call(e,t)&&o(r,n)&&(void 0!==n||t in e)||i(e,t,n)}var i=n(396),o=n(120),a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t){for(var n=e.length;n--;)if(i(e[n][0],t))return n;return-1}var i=n(120);e.exports=r},function(e,t,n){function r(e,t){t=i(t,e);for(var n=0,r=t.length;null!=e&&n<r;)e=e[o(t[n++])];return n&&n==r?e:void 0}var i=n(83),o=n(85);e.exports=r},function(e,t,n){function r(e,t){var n=e.__data__;return i(t)?n["string"==typeof t?"string":"hash"]:n.map}var i=n(909);e.exports=r},function(e,t){function n(e,t){return!!(t=null==t?r:t)&&("number"==typeof e||i.test(e))&&e>-1&&e%1==0&&e<t}var r=9007199254740991,i=/^(?:0|[1-9]\d*)$/;e.exports=n},function(e,t){function n(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||r)}var r=Object.prototype;e.exports=n},function(e,t,n){var r=n(67),i=r(Object,"create");e.exports=i},function(e,t,n){function r(e){return"symbol"==typeof e||o(e)&&i(e)==a}var i=n(66),o=n(68),a="[object Symbol]";e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(233),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="atrule",o}return o(t,e),t.prototype.append=function(){var t;this.nodes||(this.nodes=[]);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];return(t=e.prototype.append).call.apply(t,[this].concat(r))},t.prototype.prepend=function(){var t;this.nodes||(this.nodes=[]);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];return(t=e.prototype.prepend).call.apply(t,[this].concat(r))},t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(233),l=r(u),c=n(435),p=r(c),f=function(e){function t(n){i(this,t);var r=o(this,e.call(this,n));return r.type="rule",r.nodes||(r.nodes=[]),r}return a(t,e),s(t,[{key:"selectors",get:function(){return p.default.comma(this.selector)},set:function(e){var t=this.selector?this.selector.match(/,\s*/):null,n=t?t[0]:","+this.raw("between","beforeOpen");this.selector=e.join(n)}}]),t}(l.default);t.default=f,e.exports=t.default},function(e,t,n){"use strict";(function(t){function n(e,n,r,i){if("function"!=typeof e)throw new TypeError('"callback" argument must be a function');var o,a,s=arguments.length;switch(s){case 0:case 1:return t.nextTick(e);case 2:return t.nextTick(function(){e.call(null,n)});case 3:return t.nextTick(function(){e.call(null,n,r)});case 4:return t.nextTick(function(){e.call(null,n,r,i)});default:for(o=new Array(s-1),a=0;a<o.length;)o[a++]=arguments[a];return t.nextTick(function(){e.apply(null,o)})}}!t.version||0===t.version.indexOf("v0.")||0===t.version.indexOf("v1.")&&0!==t.version.indexOf("v1.8.")?e.exports=n:e.exports=t.nextTick}).call(t,n(33))},function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=h++,p[e[m]]={}),p[e[m]]}var i,o=n(13),a=n(242),s=n(1037),u=n(461),l=n(1069),c=n(253),p={},f=!1,h=0,d={topAbort:"abort",topAnimationEnd:l("animationend")||"animationend",topAnimationIteration:l("animationiteration")||"animationiteration",topAnimationStart:l("animationstart")||"animationstart",topBlur:"blur",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topScroll:"scroll",topSeeked:"seeked",topSeeking:"seeking",topSelectionChange:"selectionchange",topStalled:"stalled",topSuspend:"suspend",topTextInput:"textInput",topTimeUpdate:"timeupdate",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topTransitionEnd:l("transitionend")||"transitionend",topVolumeChange:"volumechange",topWaiting:"waiting",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),v=o({},s,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,i=r(n),o=a.registrationNameDependencies[e],s=0;s<o.length;s++){var u=o[s];i.hasOwnProperty(u)&&i[u]||("topWheel"===u?c("wheel")?v.ReactEventListener.trapBubbledEvent("topWheel","wheel",n):c("mousewheel")?v.ReactEventListener.trapBubbledEvent("topWheel","mousewheel",n):v.ReactEventListener.trapBubbledEvent("topWheel","DOMMouseScroll",n):"topScroll"===u?c("scroll",!0)?v.ReactEventListener.trapCapturedEvent("topScroll","scroll",n):v.ReactEventListener.trapBubbledEvent("topScroll","scroll",v.ReactEventListener.WINDOW_HANDLE):"topFocus"===u||"topBlur"===u?(c("focus",!0)?(v.ReactEventListener.trapCapturedEvent("topFocus","focus",n),v.ReactEventListener.trapCapturedEvent("topBlur","blur",n)):c("focusin")&&(v.ReactEventListener.trapBubbledEvent("topFocus","focusin",n),v.ReactEventListener.trapBubbledEvent("topBlur","focusout",n)),i.topBlur=!0,i.topFocus=!0):d.hasOwnProperty(u)&&v.ReactEventListener.trapBubbledEvent(u,d[u],n),i[u]=!0)}},trapBubbledEvent:function(e,t,n){return v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},supportsEventPageXY:function(){if(!document.createEvent)return!1;var e=document.createEvent("MouseEvent");return null!=e&&"pageX"in e},ensureScrollValueMonitoring:function(){if(void 0===i&&(i=v.supportsEventPageXY()),!i&&!f){var e=u.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),f=!0}}});e.exports=v},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(461),a=n(251),s={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+o.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+o.currentScrollTop}};i.augmentClass(r,s),e.exports=r},function(e,t,n){"use strict";var r=n(11),i=(n(8),{}),o={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,i,o,a,s,u){this.isInTransaction()&&r("27");var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,i,o,a,s,u),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(e){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=i,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===i)try{this.initializeAll(n+1)}catch(e){}}}},closeAll:function(e){this.isInTransaction()||r("28");for(var t=this.transactionWrappers,n=e;n<t.length;n++){var o,a=t[n],s=this.wrapperInitData[n];try{o=!0,s!==i&&a.close&&a.close.call(this,s),o=!1}finally{if(o)try{this.closeAll(n+1)}catch(e){}}}this.wrapperInitData.length=0}};e.exports=o},function(e,t,n){"use strict";function r(e){var t=""+e,n=o.exec(t);if(!n)return t;var r,i="",a=0,s=0;for(a=n.index;a<t.length;a++){switch(t.charCodeAt(a)){case 34:r="&quot;";break;case 38:r="&amp;";break;case 39:r="&#x27;";break;case 60:r="&lt;";break;case 62:r="&gt;";break;default:continue}s!==a&&(i+=t.substring(s,a)),s=a+1,i+=r}return s!==a?i+t.substring(s,a):i}function i(e){return"boolean"==typeof e||"number"==typeof e?""+e:r(e)}var o=/["'&<>]/;e.exports=i},function(e,t,n){"use strict";var r,i=n(25),o=n(241),a=/^[ \r\n\t\f]/,s=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,u=n(249),l=u(function(e,t){if(e.namespaceURI!==o.svg||"innerHTML"in e)e.innerHTML=t;else{r=r||document.createElement("div"),r.innerHTML="<svg>"+t+"</svg>";for(var n=r.firstChild;n.firstChild;)e.appendChild(n.firstChild)}});if(i.canUseDOM){var c=document.createElement("div");c.innerHTML=" ",""===c.innerHTML&&(l=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),a.test(t)||"<"===t[0]&&s.test(t)){e.innerHTML=String.fromCharCode(65279)+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t}),c=null}e.exports=l},function(e,t,n){"use strict";function r(e){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]="number"==typeof e[n]?e[n]:e[n].val);return t}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o=-1,a=e.posMax,s=e.pos,u=e.isInLabel;if(e.isInLabel)return-1;if(e.labelUnmatchedScopes)return e.labelUnmatchedScopes--,-1;for(e.pos=t+1,e.isInLabel=!0,n=1;e.pos<a;){if(91===(i=e.src.charCodeAt(e.pos)))n++;else if(93===i&&0===--n){r=!0;break}e.parser.skipToken(e)}return r?(o=e.pos,e.labelUnmatchedScopes=0):e.labelUnmatchedScopes=n-1,e.pos=s,e.isInLabel=u,o}},function(e,t,n){"use strict";function r(){this.__rules__=[],this.__cache__=null}r.prototype.__find__=function(e){for(var t=this.__rules__.length,n=-1;t--;)if(this.__rules__[++n].name===e)return n;return-1},r.prototype.__compile__=function(){var e=this,t=[""];e.__rules__.forEach(function(e){e.enabled&&e.alt.forEach(function(e){t.indexOf(e)<0&&t.push(e)})}),e.__cache__={},t.forEach(function(t){e.__cache__[t]=[],e.__rules__.forEach(function(n){n.enabled&&(t&&n.alt.indexOf(t)<0||e.__cache__[t].push(n.fn))})})},r.prototype.at=function(e,t,n){var r=this.__find__(e),i=n||{};if(-1===r)throw new Error("Parser rule not found: "+e);this.__rules__[r].fn=t,this.__rules__[r].alt=i.alt||[],this.__cache__=null},r.prototype.before=function(e,t,n,r){var i=this.__find__(e),o=r||{};if(-1===i)throw new Error("Parser rule not found: "+e);this.__rules__.splice(i,0,{name:t,enabled:!0,fn:n,alt:o.alt||[]}),this.__cache__=null},r.prototype.after=function(e,t,n,r){var i=this.__find__(e),o=r||{};if(-1===i)throw new Error("Parser rule not found: "+e);this.__rules__.splice(i+1,0,{name:t,enabled:!0,fn:n,alt:o.alt||[]}),this.__cache__=null},r.prototype.push=function(e,t,n){var r=n||{};this.__rules__.push({name:e,enabled:!0,fn:t,alt:r.alt||[]}),this.__cache__=null},r.prototype.enable=function(e,t){e=Array.isArray(e)?e:[e],t&&this.__rules__.forEach(function(e){e.enabled=!1}),e.forEach(function(e){var t=this.__find__(e);if(t<0)throw new Error("Rules manager: invalid rule name "+e);this.__rules__[t].enabled=!0},this),this.__cache__=null},r.prototype.disable=function(e){e=Array.isArray(e)?e:[e],e.forEach(function(e){var t=this.__find__(e);if(t<0)throw new Error("Rules manager: invalid rule name "+e);this.__rules__[t].enabled=!1},this),this.__cache__=null},r.prototype.getRules=function(e){return null===this.__cache__&&this.__compile__(),this.__cache__[e]||[]},e.exports=r},function(e,t,n){function r(e,t){for(var n in e)t[n]=e[n]}function i(e,t,n){return a(e,t,n)}var o=n(40),a=o.Buffer;a.from&&a.alloc&&a.allocUnsafe&&a.allocUnsafeSlow?e.exports=o:(r(o,t),t.Buffer=i),r(a,i),i.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return a(e,t,n)},i.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=a(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},i.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return a(e)},i.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o.SlowBuffer(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return{type:v,payload:e}}function o(e){return{type:g,payload:e}}function a(e){return{type:y,payload:e}}function s(e){return{type:_,payload:e}}function u(e){return{type:b,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.authorizeRequest=t.authorizeAccessCodeWithBasicAuthentication=t.authorizeAccessCodeWithFormParams=t.authorizeApplication=t.authorizePassword=t.preAuthorizeImplicit=t.CONFIGURE_AUTH=t.VALIDATE=t.AUTHORIZE_OAUTH2=t.PRE_AUTHORIZE_OAUTH2=t.LOGOUT=t.AUTHORIZE=t.SHOW_AUTH_POPUP=void 0;var l=n(30),c=r(l),p=n(35),f=r(p);t.showDefinitions=i,t.authorize=o,t.logout=a,t.authorizeOauth2=s,t.configureAuth=u;var h=n(46),d=r(h),m=n(9),v=t.SHOW_AUTH_POPUP="show_popup",g=t.AUTHORIZE="authorize",y=t.LOGOUT="logout",_=(t.PRE_AUTHORIZE_OAUTH2="pre_authorize_oauth2",t.AUTHORIZE_OAUTH2="authorize_oauth2"),b=(t.VALIDATE="validate",t.CONFIGURE_AUTH="configure_auth");t.preAuthorizeImplicit=function(e){return function(t){var n=t.authActions,r=t.errActions,i=e.auth,o=e.token,a=e.isValid,s=i.schema,u=i.name,l=s.get("flow");if(delete d.default.swaggerUIRedirectOauth2,"accessCode"===l||a||r.newAuthErr({authId:u,source:"auth",level:"warning",message:"Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"}),o.error)return void r.newAuthErr({authId:u,source:"auth",level:"error",message:(0,f.default)(o)});n.authorizeOauth2({auth:i,token:o})}},t.authorizePassword=function(e){return function(t){var n=t.authActions,r=e.schema,i=e.name,o=e.username,a=e.password,s=e.passwordType,u=e.clientId,l=e.clientSecret,p={grant_type:"password",scope:e.scopes.join(" ")},f={},h={};return"basic"===s?h.Authorization="Basic "+(0,m.btoa)(o+":"+a):((0,c.default)(p,{username:o},{password:a}),"query"===s?(u&&(f.client_id=u),l&&(f.client_secret=l)):h.Authorization="Basic "+(0,m.btoa)(u+":"+l)),n.authorizeRequest({body:(0,m.buildFormData)(p),url:r.get("tokenUrl"),name:i,headers:h,query:f,auth:e})}},t.authorizeApplication=function(e){return function(t){var n=t.authActions,r=e.schema,i=e.scopes,o=e.name,a=e.clientId,s=e.clientSecret,u={Authorization:"Basic "+(0,m.btoa)(a+":"+s)},l={grant_type:"client_credentials",scope:i.join(" ")};return n.authorizeRequest({body:(0,m.buildFormData)(l),name:o,url:r.get("tokenUrl"),auth:e,headers:u})}},t.authorizeAccessCodeWithFormParams=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,i=t.schema,o=t.name,a=t.clientId,s=t.clientSecret,u={grant_type:"authorization_code",code:t.code,client_id:a,client_secret:s,redirect_uri:n};return r.authorizeRequest({body:(0,m.buildFormData)(u),name:o,url:i.get("tokenUrl"),auth:t})}},t.authorizeAccessCodeWithBasicAuthentication=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,i=t.schema,o=t.name,a=t.clientId,s=t.clientSecret,u={Authorization:"Basic "+(0,m.btoa)(a+":"+s)},l={grant_type:"authorization_code",code:t.code,client_id:a,redirect_uri:n};return r.authorizeRequest({body:(0,m.buildFormData)(l),name:o,url:i.get("tokenUrl"),auth:t,headers:u})}},t.authorizeRequest=function(e){return function(t){var n=t.fn,r=t.getConfigs,i=t.authActions,o=t.errActions,a=t.authSelectors,s=e.body,u=e.query,l=void 0===u?{}:u,p=e.headers,h=void 0===p?{}:p,d=e.name,m=e.url,v=e.auth,g=a.getConfigs()||{},y=g.additionalQueryStringParams,_=m;for(var b in y)m+="&"+b+"="+encodeURIComponent(y[b]);var x=(0,c.default)({Accept:"application/json, text/plain, */*","Content-Type":"application/x-www-form-urlencoded"},h);n.fetch({url:_,method:"post",headers:x,query:l,body:s,requestInterceptor:r().requestInterceptor,responseInterceptor:r().responseInterceptor}).then(function(e){var t=JSON.parse(e.data),n=t&&(t.error||""),r=t&&(t.parseError||"");return e.ok?n||r?void o.newAuthErr({authId:d,level:"error",source:"auth",message:(0,f.default)(t)}):void i.authorizeOauth2({auth:v,token:t}):void o.newAuthErr({authId:d,level:"error",source:"auth",message:e.statusText})}).catch(function(e){var t=new Error(e);o.newAuthErr({authId:d,level:"error",source:"auth",message:t.message})})}}},function(e,t,n){"use strict";function r(e,t){return{type:s,payload:(0,a.default)({},e,t)}}function i(e){return{type:u,payload:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.TOGGLE_CONFIGS=t.UPDATE_CONFIGS=void 0;var o=n(36),a=function(e){return e&&e.__esModule?e:{default:e}}(o);t.update=r,t.toggle=i;var s=t.UPDATE_CONFIGS="configs_update",u=t.TOGGLE_CONFIGS="configs_toggle"},function(e,t,n){"use strict";function r(e){return{type:u,payload:e}}function i(e){return{type:l,payload:e}}function o(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];return e=(0,s.normalizeArray)(e),{type:p,payload:{thing:e,shown:t}}}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e=(0,s.normalizeArray)(e),{type:c,payload:{thing:e,mode:t}}}Object.defineProperty(t,"__esModule",{value:!0}),t.SHOW=t.UPDATE_MODE=t.UPDATE_FILTER=t.UPDATE_LAYOUT=void 0,t.updateLayout=r,t.updateFilter=i,t.show=o,t.changeMode=a;var s=n(9),u=t.UPDATE_LAYOUT="layout_update_layout",l=t.UPDATE_FILTER="layout_update_filter",c=t.UPDATE_MODE="layout_update_mode",p=t.SHOW="layout_show"},function(e,t,n){"use strict";function r(e,t){return{type:u,payload:{selectedServerUrl:e,namespace:t}}}function i(e){var t=e.value,n=e.pathMethod;return{type:l,payload:{value:t,pathMethod:n}}}function o(e){var t=e.value,n=e.pathMethod;return{type:c,payload:{value:t,pathMethod:n}}}function a(e){var t=e.value,n=e.path,r=e.method;return{type:p,payload:{value:t,path:n,method:r}}}function s(e){var t=e.server,n=e.namespace,r=e.key,i=e.val;return{type:f,payload:{server:t,namespace:n,key:r,val:i}}}Object.defineProperty(t,"__esModule",{value:!0}),t.setSelectedServer=r,t.setRequestBodyValue=i,t.setRequestContentType=o,t.setResponseContentType=a,t.setServerVariableValue=s;var u=t.UPDATE_SELECTED_SERVER="oas3_set_servers",l=t.UPDATE_REQUEST_BODY_VALUE="oas3_set_request_body_value",c=t.UPDATE_REQUEST_CONTENT_TYPE="oas3_set_request_content_type",p=t.UPDATE_RESPONSE_CONTENT_TYPE="oas3_set_response_content_type",f=t.UPDATE_SERVER_VARIABLE_VALUE="oas3_set_server_variable_value"},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n=h(e,t);if(n)return(0,s.default)(n,{declaration:!0,indent:"\t"})}Object.defineProperty(t,"__esModule",{value:!0}),t.memoizedSampleFromSchema=t.memoizedCreateXMLExample=t.sampleXmlFromSchema=t.inferSchema=t.sampleFromSchema=void 0,t.createXMLExample=i;var o=n(9),a=n(1198),s=r(a),u=n(968),l=r(u),c={string:function(){return"string"},string_email:function(){return"user@example.com"},"string_date-time":function(){return(new Date).toISOString()},number:function(){return 0},number_float:function(){return 0},integer:function(){return 0},boolean:function(e){return"boolean"!=typeof e.default||e.default}},p=function(e){e=(0,o.objectify)(e);var t=e,n=t.type,r=t.format,i=c[n+"_"+r]||c[n];return(0,o.isFunc)(i)?i(e):"Unknown Type: "+e.type},f=t.sampleFromSchema=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=(0,o.objectify)(t),i=r.type,a=r.example,s=r.properties,u=r.additionalProperties,l=r.items,c=n.includeReadOnly,f=n.includeWriteOnly;if(void 0!==a)return a;if(!i)if(s)i="object";else{if(!l)return;i="array"}if("object"===i){var h=(0,o.objectify)(s),d={};for(var m in h)h[m].readOnly&&!c||h[m].writeOnly&&!f||(d[m]=e(h[m],n));if(!0===u)d.additionalProp1={};else if(u)for(var v=(0,o.objectify)(u),g=e(v,n),y=1;y<4;y++)d["additionalProp"+y]=g;return d}return"array"===i?[e(l,n)]:t.enum?t.default?t.default:(0,o.normalizeArray)(t.enum)[0]:"file"!==i?p(t):void 0},h=(t.inferSchema=function(e){return e.schema&&(e=e.schema),e.properties&&(e.type="object"),e},t.sampleXmlFromSchema=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=(0,o.objectify)(t),i=r.type,a=r.properties,s=r.additionalProperties,u=r.items,l=r.example,c=n.includeReadOnly,f=n.includeWriteOnly,h=r.default,d={},m={},v=t.xml,g=v.name,y=v.prefix,_=v.namespace,b=r.enum,x=void 0,w=void 0;if(!i)if(a||s)i="object";else{if(!u)return;i="array"}if(g=g||"notagname",x=(y?y+":":"")+g,_){m[y?"xmlns:"+y:"xmlns"]=_}if("array"===i&&u){if(u.xml=u.xml||v||{},u.xml.name=u.xml.name||v.name,v.wrapped)return d[x]=[],Array.isArray(l)?l.forEach(function(t){u.example=t,d[x].push(e(u,n))}):Array.isArray(h)?h.forEach(function(t){u.default=t,d[x].push(e(u,n))}):d[x]=[e(u,n)],m&&d[x].push({_attr:m}),d;var k=[];return Array.isArray(l)?(l.forEach(function(t){u.example=t,k.push(e(u,n))}),k):Array.isArray(h)?(h.forEach(function(t){u.default=t,k.push(e(u,n))}),k):e(u,n)}if("object"===i){var E=(0,o.objectify)(a);d[x]=[],l=l||{};for(var S in E)if(E.hasOwnProperty(S)&&(!E[S].readOnly||c)&&(!E[S].writeOnly||f))if(E[S].xml=E[S].xml||{},E[S].xml.attribute){var C=Array.isArray(E[S].enum)&&E[S].enum[0],A=E[S].example,D=E[S].default;m[E[S].xml.name||S]=void 0!==A&&A||void 0!==l[S]&&l[S]||void 0!==D&&D||C||p(E[S])}else{E[S].xml.name=E[S].xml.name||S,E[S].example=void 0!==E[S].example?E[S].example:l[S];var O=e(E[S]);Array.isArray(O)?d[x]=d[x].concat(O):d[x].push(O)}return!0===s?d[x].push({additionalProp:"Anything can be here"}):s&&d[x].push({additionalProp:p(s)}),m&&d[x].push({_attr:m}),d}return w=void 0!==l?l:void 0!==h?h:Array.isArray(b)?b[0]:p(t),d[x]=m?[{_attr:m},w]:w,d});t.memoizedCreateXMLExample=(0,l.default)(i),t.memoizedSampleFromSchema=(0,l.default)(f)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=X(e).replace(/\t/g,"  ");if("string"==typeof e)return{type:R,payload:t}}function o(e){return{type:J,payload:e}}function a(e){return{type:j,payload:e}}function s(e){return{type:F,payload:e}}function u(e,t,n,r,i){return{type:N,payload:{path:e,value:r,paramName:t,paramIn:n,isXml:i}}}function l(e){return{type:H,payload:{pathMethod:e}}}function c(e,t){return{type:G,payload:{path:e,value:t,key:"consumes_value"}}}function p(e,t){return{type:G,payload:{path:e,value:t,key:"produces_value"}}}function f(e,t){return{type:W,payload:{path:e,method:t}}}function h(e,t){return{type:V,payload:{path:e,method:t}}}function d(e,t,n){return{type:K,payload:{scheme:e,path:t,method:n}}}Object.defineProperty(t,"__esModule",{value:!0}),t.execute=t.executeRequest=t.logRequest=t.setMutatedRequest=t.setRequest=t.setResponse=t.validateParams=t.resolveSpec=t.parseToJson=t.SET_SCHEME=t.UPDATE_RESOLVED=t.UPDATE_OPERATION_META_VALUE=t.CLEAR_VALIDATE_PARAMS=t.CLEAR_REQUEST=t.CLEAR_RESPONSE=t.LOG_REQUEST=t.SET_MUTATED_REQUEST=t.SET_REQUEST=t.SET_RESPONSE=t.VALIDATE_PARAMS=t.UPDATE_PARAM=t.UPDATE_JSON=t.UPDATE_URL=t.UPDATE_SPEC=void 0;var m=n(21),v=r(m),g=n(96),y=r(g),_=n(30),b=r(_),x=n(47),w=r(x),k=n(48),E=r(k);t.updateSpec=i,t.updateResolved=o,t.updateUrl=a,t.updateJsonSpec=s,t.changeParam=u,t.clearValidateParams=l,t.changeConsumesValue=c,t.changeProducesValue=p,t.clearResponse=f,t.clearRequest=h,t.setScheme=d;var S=n(211),C=r(S),A=n(1187),D=r(A),O=n(264),M=r(O),T=n(422),P=r(T),I=n(9),R=t.UPDATE_SPEC="spec_update_spec",j=t.UPDATE_URL="spec_update_url",F=t.UPDATE_JSON="spec_update_json",N=t.UPDATE_PARAM="spec_update_param",B=t.VALIDATE_PARAMS="spec_validate_param",L=t.SET_RESPONSE="spec_set_response",q=t.SET_REQUEST="spec_set_request",z=t.SET_MUTATED_REQUEST="spec_set_mutated_request",U=t.LOG_REQUEST="spec_log_request",W=t.CLEAR_RESPONSE="spec_clear_response",V=t.CLEAR_REQUEST="spec_clear_request",H=t.CLEAR_VALIDATE_PARAMS="spec_clear_validate_param",G=t.UPDATE_OPERATION_META_VALUE="spec_update_operation_meta_value",J=t.UPDATE_RESOLVED="spec_update_resolved",K=t.SET_SCHEME="set_scheme",X=function(e){return(0,P.default)(e)?e:""},Y=(t.parseToJson=function(e){return function(t){var n=t.specActions,r=t.specSelectors,i=t.errActions,o=r.specStr,a=null;try{e=e||o(),i.clear({source:"parser"}),a=C.default.safeLoad(e)}catch(e){return console.error(e),i.newSpecErr({source:"parser",level:"error",message:e.reason,line:e.mark&&e.mark.line?e.mark.line+1:void 0})}return a&&"object"===(void 0===a?"undefined":(0,E.default)(a))?n.updateJsonSpec(a):{}}},t.resolveSpec=function(e,t){return function(n){var r=n.specActions,i=n.specSelectors,o=n.errActions,a=n.fn,s=a.fetch,u=a.resolve,l=a.AST,c=n.getConfigs,p=c(),f=p.modelPropertyMacro,h=p.parameterMacro,d=p.requestInterceptor,m=p.responseInterceptor;void 0===e&&(e=i.specJson()),void 0===t&&(t=i.url());var v=l.getLineNumberForPath,g=i.specStr();return u({fetch:s,spec:e,baseDoc:t,modelPropertyMacro:f,parameterMacro:h,requestInterceptor:d,responseInterceptor:m}).then(function(e){var t=e.spec,n=e.errors;if(o.clear({type:"thrown"}),Array.isArray(n)&&n.length>0){var i=n.map(function(e){return console.error(e),e.line=e.fullPath?v(g,e.fullPath):null,e.path=e.fullPath?e.fullPath.join("."):null,e.level="error",e.type="thrown",e.source="resolver",Object.defineProperty(e,"message",{enumerable:!0,value:e.message}),e});o.newThrownErrBatch(i)}return r.updateResolved(t)})}},t.validateParams=function(e,t){return{type:B,payload:{pathMethod:e,isOAS3:t}}},t.setResponse=function(e,t,n){return{payload:{path:e,method:t,res:n},type:L}},t.setRequest=function(e,t,n){return{payload:{path:e,method:t,req:n},type:q}},t.setMutatedRequest=function(e,t,n){return{payload:{path:e,method:t,req:n},type:z}},t.logRequest=function(e){return{payload:e,type:U}},t.executeRequest=function(e){return function(t){var n=t.fn,r=t.specActions,i=t.specSelectors,o=t.getConfigs,a=t.oas3Selectors,s=e.pathName,u=e.method,l=e.operation,c=o(),p=c.requestInterceptor,f=c.responseInterceptor,h=l.toJS();if(e.contextUrl=(0,D.default)(i.url()).toString(),h&&h.operationId?e.operationId=h.operationId:h&&s&&u&&(e.operationId=n.opId(h,s,u)),i.isOAS3()){var d=s+":"+u;e.server=a.selectedServer(d)||a.selectedServer();var m=a.serverVariables({server:e.server,namespace:d}).toJS(),v=a.serverVariables({server:e.server}).toJS();e.serverVariables=(0,w.default)(m).length?m:v,e.requestContentType=a.requestContentType(s,u),e.responseContentType=a.responseContentType(s,u)||"*/*";var g=a.requestBodyValue(s,u);(0,I.isJSONObject)(g)?e.requestBody=JSON.parse(g):e.requestBody=g}var y=(0,b.default)({},e);y=n.buildRequest(y),r.setRequest(e.pathName,e.method,y);var _=function(t){var n=p.apply(this,[t]),i=(0,b.default)({},n);return r.setMutatedRequest(e.pathName,e.method,i),n};e.requestInterceptor=_,e.responseInterceptor=f;var x=Date.now();return n.execute(e).then(function(t){t.duration=Date.now()-x,r.setResponse(e.pathName,e.method,t)}).catch(function(t){return r.setResponse(e.pathName,e.method,{error:!0,err:(0,M.default)(t)})})}},function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.path,n=e.method,r=(0,y.default)(e,["path","method"]);return function(e){var i=e.fn.fetch,o=e.specSelectors,a=e.specActions,s=o.spec().toJS(),u=o.operationScheme(t,n),l=o.contentTypeValues([t,n]).toJS(),c=l.requestContentType,p=l.responseContentType,f=/xml/i.test(c),h=o.parameterValues([t,n],f).toJS();return a.executeRequest((0,v.default)({fetch:i,spec:s,pathName:t,method:n,parameters:h,requestContentType:c,scheme:u,responseContentType:p},r))}});t.execute=Y},function(e,t,n){"use strict";function r(e){switch(e._type){case"document":case"block_quote":case"list":case"item":case"paragraph":case"heading":case"emph":case"strong":case"link":case"image":case"custom_inline":case"custom_block":return!0;default:return!1}}var i=function(e,t){this.current=e,this.entering=!0===t},o=function(){var e=this.current,t=this.entering;if(null===e)return null;var n=r(e);return t&&n?e._firstChild?(this.current=e._firstChild,this.entering=!0):this.entering=!1:e===this.root?this.current=null:null===e._next?(this.current=e._parent,this.entering=!1):(this.current=e._next,this.entering=!0),{entering:t,node:e}},a=function(e){return{current:e,root:e,entering:!0,next:o,resumeAt:i}},s=function(e,t){this._type=e,this._parent=null,this._firstChild=null,this._lastChild=null,this._prev=null,this._next=null,this._sourcepos=t,this._lastLineBlank=!1,this._open=!0,this._string_content=null,this._literal=null,this._listData={},this._info=null,this._destination=null,this._title=null,this._isFenced=!1,this._fenceChar=null,this._fenceLength=0,this._fenceOffset=null,this._level=null,this._onEnter=null,this._onExit=null},u=s.prototype;Object.defineProperty(u,"isContainer",{get:function(){return r(this)}}),Object.defineProperty(u,"type",{get:function(){return this._type}}),Object.defineProperty(u,"firstChild",{get:function(){return this._firstChild}}),Object.defineProperty(u,"lastChild",{get:function(){return this._lastChild}}),Object.defineProperty(u,"next",{get:function(){return this._next}}),Object.defineProperty(u,"prev",{get:function(){return this._prev}}),Object.defineProperty(u,"parent",{get:function(){return this._parent}}),Object.defineProperty(u,"sourcepos",{get:function(){return this._sourcepos}}),Object.defineProperty(u,"literal",{get:function(){return this._literal},set:function(e){this._literal=e}}),Object.defineProperty(u,"destination",{get:function(){return this._destination},set:function(e){this._destination=e}}),Object.defineProperty(u,"title",{get:function(){return this._title},set:function(e){this._title=e}}),Object.defineProperty(u,"info",{get:function(){return this._info},set:function(e){this._info=e}}),Object.defineProperty(u,"level",{get:function(){return this._level},set:function(e){this._level=e}}),Object.defineProperty(u,"listType",{get:function(){return this._listData.type},set:function(e){this._listData.type=e}}),Object.defineProperty(u,"listTight",{get:function(){return this._listData.tight},set:function(e){this._listData.tight=e}}),Object.defineProperty(u,"listStart",{get:function(){return this._listData.start},set:function(e){this._listData.start=e}}),Object.defineProperty(u,"listDelimiter",{get:function(){return this._listData.delimiter},set:function(e){this._listData.delimiter=e}}),Object.defineProperty(u,"onEnter",{get:function(){return this._onEnter},set:function(e){this._onEnter=e}}),Object.defineProperty(u,"onExit",{get:function(){return this._onExit},set:function(e){this._onExit=e}}),s.prototype.appendChild=function(e){e.unlink(),e._parent=this,this._lastChild?(this._lastChild._next=e,e._prev=this._lastChild,this._lastChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.prependChild=function(e){e.unlink(),e._parent=this,this._firstChild?(this._firstChild._prev=e,e._next=this._firstChild,this._firstChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.unlink=function(){this._prev?this._prev._next=this._next:this._parent&&(this._parent._firstChild=this._next),this._next?this._next._prev=this._prev:this._parent&&(this._parent._lastChild=this._prev),this._parent=null,this._next=null,this._prev=null},s.prototype.insertAfter=function(e){e.unlink(),e._next=this._next,e._next&&(e._next._prev=e),e._prev=this,this._next=e,e._parent=this._parent,e._next||(e._parent._lastChild=e)},s.prototype.insertBefore=function(e){e.unlink(),e._prev=this._prev,e._prev&&(e._prev._next=e),e._next=this,this._prev=e,e._parent=this._parent,e._prev||(e._parent._firstChild=e)},s.prototype.walker=function(){return new a(this)},e.exports=s},function(e,t){e.exports=function(e,t,n,r){if(!(e instanceof t)||void 0!==r&&r in e)throw TypeError(n+": incorrect invocation!");return e}},function(e,t,n){var r=n(53),i=n(181),o=n(76),a=n(133),s=n(602);e.exports=function(e,t){var n=1==e,u=2==e,l=3==e,c=4==e,p=6==e,f=5==e||p,h=t||s;return function(t,s,d){for(var m,v,g=o(t),y=i(g),_=r(s,d,3),b=a(y.length),x=0,w=n?h(t,b):u?h(t,0):void 0;b>x;x++)if((f||x in y)&&(m=y[x],v=_(m,x,g),e))if(n)w[x]=v;else if(v)switch(e){case 3:return!0;case 5:return m;case 6:return x;case 2:w.push(m)}else if(c)return!1;return p?-1:l||c?c:w}}},function(e,t,n){var r=n(99),i=n(22)("toStringTag"),o="Arguments"==r(function(){return arguments}()),a=function(e,t){try{return e[t]}catch(e){}};e.exports=function(e){var t,n,s;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=a(t=Object(e),i))?n:o?r(t):"Object"==(s=r(t))&&"function"==typeof t.callee?"Arguments":s}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on  "+e);return e}},function(e,t,n){var r=n(27),i=n(24).document,o=r(i)&&r(i.createElement);e.exports=function(e){return o?i.createElement(e):{}}},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t,n){var r=n(99);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,t,n){"use strict";function r(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=i(t),this.reject=i(n)}var i=n(98);e.exports.f=function(e){return new r(e)}},function(e,t,n){var r=n(37),i=n(611),o=n(180),a=n(187)("IE_PROTO"),s=function(){},u=function(){var e,t=n(179)("iframe"),r=o.length;for(t.style.display="none",n(334).appendChild(t),t.src="javascript:",e=t.contentWindow.document,e.open(),e.write("<script>document.F=Object<\/script>"),e.close(),u=e.F;r--;)delete u.prototype[o[r]];return u()};e.exports=Object.create||function(e,t){var n;return null!==e?(s.prototype=r(e),n=new s,s.prototype=null,n[a]=e):n=u(),void 0===t?n:i(n,t)}},function(e,t){t.f=Object.getOwnPropertySymbols},function(e,t,n){var r=n(56);e.exports=function(e,t,n){for(var i in t)n&&e[i]?e[i]=t[i]:r(e,i,t[i]);return e}},function(e,t,n){e.exports=n(56)},function(e,t,n){var r=n(188)("keys"),i=n(134);e.exports=function(e){return r[e]||(r[e]=i(e))}},function(e,t,n){var r=n(24),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});e.exports=function(e){return i[e]||(i[e]={})}},function(e,t){var n=Math.ceil,r=Math.floor;e.exports=function(e){return isNaN(e=+e)?0:(e>0?r:n)(e)}},function(e,t,n){var r=n(27);e.exports=function(e,t){if(!r(e))return e;var n,i;if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i;if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(24),i=n(15),o=n(130),a=n(192),s=n(41).f;e.exports=function(e){var t=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==e.charAt(0)||e in t||s(t,e,{value:a.f(e)})}},function(e,t,n){t.f=n(22)},function(e,t,n){var r=n(177),i=n(22)("iterator"),o=n(74);e.exports=n(15).getIteratorMethod=function(e){if(void 0!=e)return e[i]||e["@@iterator"]||o[r(e)]}},function(e,t){},function(e,t,n){var r=n(105),i=n(19)("toStringTag"),o="Arguments"==r(function(){return arguments}()),a=function(e,t){try{return e[t]}catch(e){}};e.exports=function(e){var t,n,s;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=a(t=Object(e),i))?n:o?r(t):"Object"==(s=r(t))&&"function"==typeof t.callee?"Arguments":s}},function(e,t,n){var r=n(77),i=n(31).document,o=r(i)&&r(i.createElement);e.exports=function(e){return o?i.createElement(e):{}}},function(e,t,n){var r=n(19)("match");e.exports=function(e){var t=/./;try{"/./"[e](t)}catch(n){try{return t[r]=!1,!"/./"[e](t)}catch(e){}}return!0}},function(e,t,n){"use strict";function r(e){var t,n;this.promise=new e(function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor");t=e,n=r}),this.resolve=i(t),this.reject=i(n)}var i=n(135);e.exports.f=function(e){return new r(e)}},function(e,t,n){var r=n(138).f,i=n(108),o=n(19)("toStringTag");e.exports=function(e,t,n){e&&!i(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){var r=n(361)("keys"),i=n(202);e.exports=function(e){return r[e]||(r[e]=i(e))}},function(e,t,n){var r=n(354),i=n(57);e.exports=function(e,t,n){if(r(t))throw TypeError("String#"+n+" doesn't accept regex!");return String(i(e))}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t,n){"use strict";(function(t){/*!
+ * @description Recursive object extending
+ * @author Viacheslav Lotsmanov <lotsmanov89@gmail.com>
+ * @license MIT
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2015 Viacheslav Lotsmanov
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+function n(e){return e instanceof t||e instanceof Date||e instanceof RegExp}function r(e){if(e instanceof t){var n=new t(e.length);return e.copy(n),n}if(e instanceof Date)return new Date(e.getTime());if(e instanceof RegExp)return new RegExp(e);throw new Error("Unexpected situation")}function i(e){var t=[];return e.forEach(function(e,a){"object"==typeof e&&null!==e?Array.isArray(e)?t[a]=i(e):n(e)?t[a]=r(e):t[a]=o({},e):t[a]=e}),t}var o=e.exports=function(){if(arguments.length<1||"object"!=typeof arguments[0])return!1;if(arguments.length<2)return arguments[0];var e,t,a=arguments[0],s=Array.prototype.slice.call(arguments,1);return s.forEach(function(s){"object"!=typeof s||Array.isArray(s)||Object.keys(s).forEach(function(u){return t=a[u],e=s[u],e===a?void 0:"object"!=typeof e||null===e?void(a[u]=e):Array.isArray(e)?void(a[u]=i(e)):n(e)?void(a[u]=r(e)):"object"!=typeof t||null===t||Array.isArray(t)?void(a[u]=o({},e)):void(a[u]=o(t,e))})}),a}}).call(t,n(40).Buffer)},function(e,t){e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅",in:"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺",int:"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},function(e,t){e.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},function(e,t,n){"use strict";var r=n(722),i=n(65),o=n(115),a=Array.prototype.indexOf,s=Object.prototype.hasOwnProperty,u=Math.abs,l=Math.floor;e.exports=function(e){var t,n,c,p;if(!r(e))return a.apply(this,arguments);for(n=i(o(this).length),c=arguments[1],c=isNaN(c)?0:c>=0?l(c):i(this.length)-l(u(c)),t=c;t<n;++t)if(s.call(this,t)&&(p=this[t],r(p)))return t;return-1}},function(e,t,n){"use strict";e.exports=n(713)()?Array.from:n(714)},function(e,t,n){"use strict";function r(e,t){return e===t?0!==e||0!==t||1/e==1/t:e!==e&&t!==t}function i(e,t){if(r(e,t))return!0;if("object"!=typeof e||null===e||"object"!=typeof t||null===t)return!1;var n=Object.keys(e),i=Object.keys(t);if(n.length!==i.length)return!1;for(var a=0;a<n.length;a++)if(!o.call(t,n[a])||!r(e[n[a]],t[n[a]]))return!1;return!0}var o=Object.prototype.hasOwnProperty;e.exports=i},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(765),o=r(i),a=n(768),s=r(a),u=n(767),l=r(u),c=n(769),p=r(c),f=n(770),h=r(f),d=n(771),m=r(d),v=n(772),g=r(v),y=n(773),_=r(y),b=n(774),x=r(b),w=n(775),k=r(w),E=n(776),S=r(E),C=n(778),A=r(C),D=n(766),O=r(D),M=[l.default,s.default,p.default,m.default,g.default,_.default,x.default,k.default,S.default,h.default],T=(0,o.default)({prefixMap:O.default.prefixMap,plugins:M},A.default);t.default=T,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e.charAt(0).toUpperCase()+e.slice(1)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";var r=n(795);e.exports=r},function(e,t,n){"use strict";var r=n(81);e.exports=new r({explicit:[n(813),n(811),n(806)]})},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Map");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(916),o=n(917),a=n(918),s=n(919),u=n(920);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t,n){function r(e){var t=this.__data__=new i(e);this.size=t.size}var i=n(146),o=n(930),a=n(931),s=n(932),u=n(933),l=n(934);r.prototype.clear=o,r.prototype.delete=a,r.prototype.get=s,r.prototype.has=u,r.prototype.set=l,e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}e.exports=n},function(e,t,n){var r=n(849),i=n(887),o=i(r);e.exports=o},function(e,t,n){function r(e){var t=new e.constructor(e.byteLength);return new i(t).set(new i(e)),t}var i=n(392);e.exports=r},function(e,t,n){var r=n(222),i=r(Object.getPrototypeOf,Object);e.exports=i},function(e,t,n){var r=n(222),i=n(426),o=Object.getOwnPropertySymbols,a=o?r(o,Object):i;e.exports=a},function(e,t,n){function r(e,t){if(i(e))return!1;var n=typeof e;return!("number"!=n&&"symbol"!=n&&"boolean"!=n&&null!=e&&!o(e))||(s.test(e)||!a.test(e)||null!=t&&e in Object(t))}var i=n(20),o=n(155),a=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,s=/^\w*$/;e.exports=r},function(e,t){function n(e,t){return function(n){return e(t(n))}}e.exports=n},function(e,t,n){var r=n(890),i=n(945),o=r(i);e.exports=o},function(e,t,n){function r(e,t,n){var r=null==e?void 0:i(e,t);return void 0===r?n:r}var i=n(150);e.exports=r},function(e,t){function n(e){return e}e.exports=n},function(e,t,n){var r=n(851),i=n(68),o=Object.prototype,a=o.hasOwnProperty,s=o.propertyIsEnumerable,u=r(function(){return arguments}())?r:function(e){return i(e)&&a.call(e,"callee")&&!s.call(e,"callee")};e.exports=u},function(e,t,n){(function(e){var r=n(43),i=n(957),o="object"==typeof t&&t&&!t.nodeType&&t,a=o&&"object"==typeof e&&e&&!e.nodeType&&e,s=a&&a.exports===o,u=s?r.Buffer:void 0,l=u?u.isBuffer:void 0,c=l||i;e.exports=c}).call(t,n(72)(e))},function(e,t){function n(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=r}var r=9007199254740991;e.exports=n},function(e,t,n){"use strict";(function(t,n){var r,i;r=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e},i=function(e){var t,n,i=document.createTextNode(""),o=0;return new e(function(){var e;if(t)n&&(t=n.concat(t));else{if(!n)return;t=n}if(n=t,t=null,"function"==typeof n)return e=n,n=null,void e();for(i.data=o=++o%2;n;)e=n.shift(),n.length||(n=null),e()}).observe(i,{characterData:!0}),function(e){if(r(e),t)return void("function"==typeof t?t=[t,e]:t.push(e));t=e,i.data=o=++o%2}},e.exports=function(){if("object"==typeof t&&t&&"function"==typeof t.nextTick)return t.nextTick;if("object"==typeof document&&document){if("function"==typeof MutationObserver)return i(MutationObserver);if("function"==typeof WebKitMutationObserver)return i(WebKitMutationObserver)}return"function"==typeof n?function(e){n(r(e))}:"function"==typeof setTimeout||"object"==typeof setTimeout?function(e){setTimeout(r(e),0)}:null}()}).call(t,n(33),n(496).setImmediate)},function(e,t,n){(function(e){function n(e,t){for(var n=0,r=e.length-1;r>=0;r--){var i=e[r];"."===i?e.splice(r,1):".."===i?(e.splice(r,1),n++):n&&(e.splice(r,1),n--)}if(t)for(;n--;n)e.unshift("..");return e}function r(e,t){if(e.filter)return e.filter(t);for(var n=[],r=0;r<e.length;r++)t(e[r],r,e)&&n.push(e[r]);return n}var i=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/,o=function(e){return i.exec(e).slice(1)};t.resolve=function(){for(var t="",i=!1,o=arguments.length-1;o>=-1&&!i;o--){var a=o>=0?arguments[o]:e.cwd();if("string"!=typeof a)throw new TypeError("Arguments to path.resolve must be strings");a&&(t=a+"/"+t,i="/"===a.charAt(0))}return t=n(r(t.split("/"),function(e){return!!e}),!i).join("/"),(i?"/":"")+t||"."},t.normalize=function(e){var i=t.isAbsolute(e),o="/"===a(e,-1);return e=n(r(e.split("/"),function(e){return!!e}),!i).join("/"),e||i||(e="."),e&&o&&(e+="/"),(i?"/":"")+e},t.isAbsolute=function(e){return"/"===e.charAt(0)},t.join=function(){var e=Array.prototype.slice.call(arguments,0);return t.normalize(r(e,function(e,t){if("string"!=typeof e)throw new TypeError("Arguments to path.join must be strings");return e}).join("/"))},t.relative=function(e,n){function r(e){for(var t=0;t<e.length&&""===e[t];t++);for(var n=e.length-1;n>=0&&""===e[n];n--);return t>n?[]:e.slice(t,n-t+1)}e=t.resolve(e).substr(1),n=t.resolve(n).substr(1);for(var i=r(e.split("/")),o=r(n.split("/")),a=Math.min(i.length,o.length),s=a,u=0;u<a;u++)if(i[u]!==o[u]){s=u;break}for(var l=[],u=s;u<i.length;u++)l.push("..");return l=l.concat(o.slice(s)),l.join("/")},t.sep="/",t.delimiter=":",t.dirname=function(e){var t=o(e),n=t[0],r=t[1];return n||r?(r&&(r=r.substr(0,r.length-1)),n+r):"."},t.basename=function(e,t){var n=o(e)[2];return t&&n.substr(-1*t.length)===t&&(n=n.substr(0,n.length-t.length)),n},t.extname=function(e){return o(e)[3]};var a="b"==="ab".substr(-1)?function(e,t,n){return e.substr(t,n)}:function(e,t,n){return t<0&&(t=e.length+t),e.substr(t,n)}}).call(t,n(33))},function(e,t,n){(function(t){(function(){var n,r,i;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(n()-i)/1e6},r=t.hrtime,n=function(){var e;return e=r(),1e9*e[0]+e[1]},i=n()):Date.now?(e.exports=function(){return Date.now()-i},i=Date.now()):(e.exports=function(){return(new Date).getTime()-i},i=(new Date).getTime())}).call(this)}).call(t,n(33))},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(235),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="comment",o}return o(t,e),t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e){return e.map(function(e){return e.nodes&&(e.nodes=s(e.nodes)),delete e.source,e})}t.__esModule=!0;var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(234),c=r(l),p=n(232),f=r(p),h=n(235),d=r(h),m=function(e){function t(){return i(this,t),o(this,e.apply(this,arguments))}return a(t,e),t.prototype.push=function(e){return e.parent=this,this.nodes.push(e),this},t.prototype.each=function(e){this.lastEach||(this.lastEach=0),this.indexes||(this.indexes={}),this.lastEach+=1;var t=this.lastEach;if(this.indexes[t]=0,this.nodes){for(var n=void 0,r=void 0;this.indexes[t]<this.nodes.length&&(n=this.indexes[t],!1!==(r=e(this.nodes[n],n)));)this.indexes[t]+=1;return delete this.indexes[t],r}},t.prototype.walk=function(e){return this.each(function(t,n){var r=e(t,n);return!1!==r&&t.walk&&(r=t.walk(e)),r})},t.prototype.walkDecls=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("decl"===n.type&&e.test(n.prop))return t(n,r)}):this.walk(function(n,r){if("decl"===n.type&&n.prop===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("decl"===e.type)return t(e,n)}))},t.prototype.walkRules=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("rule"===n.type&&e.test(n.selector))return t(n,r)}):this.walk(function(n,r){if("rule"===n.type&&n.selector===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("rule"===e.type)return t(e,n)}))},t.prototype.walkAtRules=function(e,t){return t?e instanceof RegExp?this.walk(function(n,r){if("atrule"===n.type&&e.test(n.name))return t(n,r)}):this.walk(function(n,r){if("atrule"===n.type&&n.name===e)return t(n,r)}):(t=e,this.walk(function(e,n){if("atrule"===e.type)return t(e,n)}))},t.prototype.walkComments=function(e){return this.walk(function(t,n){if("comment"===t.type)return e(t,n)})},t.prototype.append=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}for(var s=a,u=this.normalize(s,this.last),l=u,c=Array.isArray(l),p=0,l=c?l:l[Symbol.iterator]();;){var f;if(c){if(p>=l.length)break;f=l[p++]}else{if(p=l.next(),p.done)break;f=p.value}var h=f;this.nodes.push(h)}}return this},t.prototype.prepend=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];t=t.reverse();for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}for(var s=a,u=this.normalize(s,this.first,"prepend").reverse(),l=u,c=Array.isArray(l),p=0,l=c?l:l[Symbol.iterator]();;){var f;if(c){if(p>=l.length)break;f=l[p++]}else{if(p=l.next(),p.done)break;f=p.value}var h=f;this.nodes.unshift(h)}for(var d in this.indexes)this.indexes[d]=this.indexes[d]+u.length}return this},t.prototype.cleanRaws=function(t){if(e.prototype.cleanRaws.call(this,t),this.nodes)for(var n=this.nodes,r=Array.isArray(n),i=0,n=r?n:n[Symbol.iterator]();;){var o;if(r){if(i>=n.length)break;o=n[i++]}else{if(i=n.next(),i.done)break;o=i.value}var a=o;a.cleanRaws(t)}},t.prototype.insertBefore=function(e,t){e=this.index(e);for(var n=0===e&&"prepend",r=this.normalize(t,this.nodes[e],n).reverse(),i=r,o=Array.isArray(i),a=0,i=o?i:i[Symbol.iterator]();;){var s;if(o){if(a>=i.length)break;s=i[a++]}else{if(a=i.next(),a.done)break;s=a.value}var u=s;this.nodes.splice(e,0,u)}var l=void 0;for(var c in this.indexes)l=this.indexes[c],e<=l&&(this.indexes[c]=l+r.length);return this},t.prototype.insertAfter=function(e,t){e=this.index(e);for(var n=this.normalize(t,this.nodes[e]).reverse(),r=n,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}var s=a;this.nodes.splice(e+1,0,s)}var u=void 0;for(var l in this.indexes)u=this.indexes[l],e<u&&(this.indexes[l]=u+n.length);return this},t.prototype.removeChild=function(e){e=this.index(e),this.nodes[e].parent=void 0,this.nodes.splice(e,1);var t=void 0;for(var n in this.indexes)(t=this.indexes[n])>=e&&(this.indexes[n]=t-1);return this},t.prototype.removeAll=function(){for(var e=this.nodes,t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}r.parent=void 0}return this.nodes=[],this},t.prototype.replaceValues=function(e,t,n){return n||(n=t,t={}),this.walkDecls(function(r){t.props&&-1===t.props.indexOf(r.prop)||t.fast&&-1===r.value.indexOf(t.fast)||(r.value=r.value.replace(e,n))}),this},t.prototype.every=function(e){return this.nodes.every(e)},t.prototype.some=function(e){return this.nodes.some(e)},t.prototype.index=function(e){return"number"==typeof e?e:this.nodes.indexOf(e)},t.prototype.normalize=function(e,t){var r=this;if("string"==typeof e){e=s(n(236)(e).nodes)}else if(Array.isArray(e)){e=e.slice(0);for(var i=e,o=Array.isArray(i),a=0,i=o?i:i[Symbol.iterator]();;){var u;if(o){if(a>=i.length)break;u=i[a++]}else{if(a=i.next(),a.done)break;u=a.value}var l=u;l.parent&&l.parent.removeChild(l,"ignore")}}else if("root"===e.type){e=e.nodes.slice(0);for(var p=e,h=Array.isArray(p),d=0,p=h?p:p[Symbol.iterator]();;){var m;if(h){if(d>=p.length)break;m=p[d++]}else{if(d=p.next(),d.done)break;m=d.value}var v=m;v.parent&&v.parent.removeChild(v,"ignore")}}else if(e.type)e=[e];else if(e.prop){if(void 0===e.value)throw new Error("Value field is missed in node creation");"string"!=typeof e.value&&(e.value=String(e.value)),e=[new c.default(e)]}else if(e.selector){var g=n(157);e=[new g(e)]}else if(e.name){var y=n(156);e=[new y(e)]}else{if(!e.text)throw new Error("Unknown node type in node creation");e=[new f.default(e)]}return e.map(function(e){return"function"!=typeof e.before&&(e=r.rebuild(e)),e.parent&&e.parent.removeChild(e),void 0===e.raws.before&&t&&void 0!==t.raws.before&&(e.raws.before=t.raws.before.replace(/[^\s]/g,"")),e.parent=r,e})},t.prototype.rebuild=function(e,t){var r=this,i=void 0;if("root"===e.type){var o=n(237);i=new o}else if("atrule"===e.type){var a=n(156);i=new a}else if("rule"===e.type){var s=n(157);i=new s}else"decl"===e.type?i=new c.default:"comment"===e.type&&(i=new f.default);for(var u in e)"nodes"===u?i.nodes=e.nodes.map(function(e){return r.rebuild(e,i)}):"parent"===u&&t?i.parent=t:e.hasOwnProperty(u)&&(i[u]=e[u]);return i},u(t,[{key:"first",get:function(){if(this.nodes)return this.nodes[0]}},{key:"last",get:function(){if(this.nodes)return this.nodes[this.nodes.length-1]}}]),t}(d.default);t.default=m,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(235),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="decl",o}return o(t,e),t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=n(432),s=r(a),u=n(437),l=r(u),c=n(238),p=r(c),f=n(987),h=r(f),d=function e(t,n){var r=new t.constructor;for(var i in t)if(t.hasOwnProperty(i)){var a=t[i],s=void 0===a?"undefined":o(a);"parent"===i&&"object"===s?n&&(r[i]=n):"source"===i?r[i]=a:a instanceof Array?r[i]=a.map(function(t){return e(t,r)}):("object"===s&&null!==a&&(a=e(a)),r[i]=a)}return r},m=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};if(i(this,e),this.raws={},"object"!==(void 0===t?"undefined":o(t))&&void 0!==t)throw new Error("PostCSS nodes constructor accepts object, not "+JSON.stringify(t));for(var n in t)this[n]=t[n]}return e.prototype.error=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(this.source){var n=this.positionBy(t);return this.source.input.error(e,n.line,n.column,t)}return new s.default(e)},e.prototype.warn=function(e,t,n){var r={node:this};for(var i in n)r[i]=n[i];return e.warn(t,r)},e.prototype.remove=function(){return this.parent&&this.parent.removeChild(this),this.parent=void 0,this},e.prototype.toString=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:p.default;e.stringify&&(e=e.stringify);var t="";return e(this,function(e){t+=e}),t},e.prototype.clone=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=d(this);for(var n in e)t[n]=e[n];return t},e.prototype.cloneBefore=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this.clone(e);return this.parent.insertBefore(this,t),t},e.prototype.cloneAfter=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=this.clone(e);return this.parent.insertAfter(this,t),t},e.prototype.replaceWith=function(){if(this.parent){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t,i=Array.isArray(r),o=0,r=i?r:r[Symbol.iterator]();;){var a;if(i){if(o>=r.length)break;a=r[o++]}else{if(o=r.next(),o.done)break;a=o.value}var s=a;this.parent.insertBefore(this,s)}this.remove()}return this},e.prototype.moveTo=function(e){return(0,h.default)("Node#moveTo was deprecated. Use Container#append."),this.cleanRaws(this.root()===e.root()),this.remove(),e.append(this),this},e.prototype.moveBefore=function(e){return(0,h.default)("Node#moveBefore was deprecated. Use Node#before."),this.cleanRaws(this.root()===e.root()),this.remove(),e.parent.insertBefore(e,this),this},e.prototype.moveAfter=function(e){return(0,h.default)("Node#moveAfter was deprecated. Use Node#after."),this.cleanRaws(this.root()===e.root()),this.remove(),e.parent.insertAfter(e,this),this},e.prototype.next=function(){var e=this.parent.index(this);return this.parent.nodes[e+1]},e.prototype.prev=function(){var e=this.parent.index(this);return this.parent.nodes[e-1]},e.prototype.before=function(e){return this.parent.insertBefore(this,e),this},e.prototype.after=function(e){return this.parent.insertAfter(this,e),this},e.prototype.toJSON=function(){var e={};for(var t in this)if(this.hasOwnProperty(t)&&"parent"!==t){var n=this[t];n instanceof Array?e[t]=n.map(function(e){return"object"===(void 0===e?"undefined":o(e))&&e.toJSON?e.toJSON():e}):"object"===(void 0===n?"undefined":o(n))&&n.toJSON?e[t]=n.toJSON():e[t]=n}return e},e.prototype.raw=function(e,t){return(new l.default).raw(this,e,t)},e.prototype.root=function(){for(var e=this;e.parent;)e=e.parent;return e},e.prototype.cleanRaws=function(e){delete this.raws.before,delete this.raws.after,e||delete this.raws.between},e.prototype.positionInside=function(e){for(var t=this.toString(),n=this.source.start.column,r=this.source.start.line,i=0;i<e;i++)"\n"===t[i]?(n=1,r+=1):n+=1;return{line:r,column:n}},e.prototype.positionBy=function(e){var t=this.source.start;if(e.index)t=this.positionInside(e.index);else if(e.word){var n=this.toString().indexOf(e.word);-1!==n&&(t=this.positionInside(n))}return t},e}();t.default=m,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(t&&t.safe)throw new Error('Option safe was removed. Use parser: require("postcss-safe-parser")');var n=new u.default(e,t),r=new a.default(n);try{r.parse()}catch(e){throw"CssSyntaxError"===e.name&&t&&t.from&&(/\.scss$/i.test(t.from)?e.message+="\nYou tried to parse SCSS with the standard CSS parser; try again with the postcss-scss parser":/\.sass/i.test(t.from)?e.message+="\nYou tried to parse Sass with the standard CSS parser; try again with the postcss-sass parser":/\.less$/i.test(t.from)&&(e.message+="\nYou tried to parse Less with the standard CSS parser; try again with the postcss-less parser")),e}return r.root}t.__esModule=!0,t.default=i;var o=n(981),a=r(o),s=n(433),u=r(s);e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=n(233),s=function(e){return e&&e.__esModule?e:{default:e}}(a),u=function(e){function t(n){r(this,t);var o=i(this,e.call(this,n));return o.type="root",o.nodes||(o.nodes=[]),o}return o(t,e),t.prototype.removeChild=function(t,n){var r=this.index(t);return!n&&0===r&&this.nodes.length>1&&(this.nodes[1].raws.before=this.nodes[r].raws.before),e.prototype.removeChild.call(this,t)},t.prototype.normalize=function(t,n,r){var i=e.prototype.normalize.call(this,t);if(n)if("prepend"===r)this.nodes.length>1?n.raws.before=this.nodes[1].raws.before:delete n.raws.before;else if(this.first!==n)for(var o=i,a=Array.isArray(o),s=0,o=a?o:o[Symbol.iterator]();;){var u;if(a){if(s>=o.length)break;u=o[s++]}else{if(s=o.next(),s.done)break;u=s.value}var l=u;l.raws.before=n.raws.before}return i},t.prototype.toResult=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return new(n(434))(new(n(436)),this,e).stringify()},t}(s.default);t.default=u,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){new o.default(t).stringify(e)}t.__esModule=!0,t.default=r;var i=n(437),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){(function(t){for(var r=n(1006),i="undefined"==typeof window?t:window,o=["moz","webkit"],a="AnimationFrame",s=i["request"+a],u=i["cancel"+a]||i["cancelRequest"+a],l=0;!s&&l<o.length;l++)s=i[o[l]+"Request"+a],u=i[o[l]+"Cancel"+a]||i[o[l]+"CancelRequest"+a];if(!s||!u){var c=0,p=0,f=[];s=function(e){if(0===f.length){var t=r(),n=Math.max(0,1e3/60-(t-c));c=n+t,setTimeout(function(){var e=f.slice(0);f.length=0;for(var t=0;t<e.length;t++)if(!e[t].cancelled)try{e[t].callback(c)}catch(e){setTimeout(function(){throw e},0)}},Math.round(n))}return f.push({handle:++p,callback:e,cancelled:!1}),p},u=function(e){for(var t=0;t<f.length;t++)f[t].handle===e&&(f[t].cancelled=!0)}}e.exports=function(e){return s.call(i,e)},e.exports.cancel=function(){u.apply(i,arguments)},e.exports.polyfill=function(e){e||(e=i),e.requestAnimationFrame=s,e.cancelAnimationFrame=u}}).call(t,n(17))},function(e,t,n){"use strict";function r(e,t){return Array.isArray(t)&&(t=t[1]),t?t.nextSibling:e.firstChild}function i(e,t,n){c.insertTreeBefore(e,t,n)}function o(e,t,n){Array.isArray(t)?s(e,t[0],t[1],n):m(e,t,n)}function a(e,t){if(Array.isArray(t)){var n=t[1];t=t[0],u(e,t,n),e.removeChild(n)}e.removeChild(t)}function s(e,t,n,r){for(var i=t;;){var o=i.nextSibling;if(m(e,i,r),i===n)break;i=o}}function u(e,t,n){for(;;){var r=t.nextSibling;if(r===n)break;e.removeChild(r)}}function l(e,t,n){var r=e.parentNode,i=e.nextSibling;i===t?n&&m(r,document.createTextNode(n),i):n?(d(i,n),u(r,i,t)):u(r,e,t)}var c=n(88),p=n(1014),f=(n(14),n(39),n(249)),h=n(163),d=n(469),m=f(function(e,t,n){e.insertBefore(t,n)}),v=p.dangerouslyReplaceNodeWithMarkup,g={dangerouslyReplaceNodeWithMarkup:v,replaceDelimitedText:l,processUpdates:function(e,t){for(var n=0;n<t.length;n++){var s=t[n];switch(s.type){case"INSERT_MARKUP":i(e,s.content,r(e,s.afterNode));break;case"MOVE_EXISTING":o(e,s.fromNode,r(e,s.afterNode));break;case"SET_MARKUP":h(e,s.content);break;case"TEXT_CONTENT":d(e,s.content);break;case"REMOVE_NODE":a(e,s.fromNode)}}}};e.exports=g},function(e,t,n){"use strict";var r={html:"http://www.w3.org/1999/xhtml",mathml:"http://www.w3.org/1998/Math/MathML",svg:"http://www.w3.org/2000/svg"};e.exports=r},function(e,t,n){"use strict";function r(){if(s)for(var e in u){var t=u[e],n=s.indexOf(e);if(n>-1||a("96",e),!l.plugins[n]){t.extractEvents||a("97",e),l.plugins[n]=t;var r=t.eventTypes;for(var o in r)i(r[o],t,o)||a("98",o,e)}}}function i(e,t,n){l.eventNameDispatchConfigs.hasOwnProperty(n)&&a("99",n),l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var i in r)if(r.hasOwnProperty(i)){var s=r[i];o(s,t,n)}return!0}return!!e.registrationName&&(o(e.registrationName,t,n),!0)}function o(e,t,n){l.registrationNameModules[e]&&a("100",e),l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=n(11),s=(n(8),null),u={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},possibleRegistrationNames:null,injectEventPluginOrder:function(e){s&&a("101"),s=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var i=e[n];u.hasOwnProperty(n)&&u[n]===i||(u[n]&&a("102",n),u[n]=i,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;if(void 0!==t.phasedRegistrationNames){var n=t.phasedRegistrationNames;for(var r in n)if(n.hasOwnProperty(r)){var i=l.registrationNameModules[n[r]];if(i)return i}}return null},_resetEventPlugins:function(){s=null;for(var e in u)u.hasOwnProperty(e)&&delete u[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var i in r)r.hasOwnProperty(i)&&delete r[i]}};e.exports=l},function(e,t,n){"use strict";function r(e){return"topMouseUp"===e||"topTouchEnd"===e||"topTouchCancel"===e}function i(e){return"topMouseMove"===e||"topTouchMove"===e}function o(e){return"topMouseDown"===e||"topTouchStart"===e}function a(e,t,n,r){var i=e.type||"unknown-event";e.currentTarget=g.getNodeFromInstance(r),t?m.invokeGuardedCallbackWithCatch(i,n,e):m.invokeGuardedCallback(i,n,e),e.currentTarget=null}function s(e,t){var n=e._dispatchListeners,r=e._dispatchInstances;if(Array.isArray(n))for(var i=0;i<n.length&&!e.isPropagationStopped();i++)a(e,t,n[i],r[i]);else n&&a(e,t,n,r);e._dispatchListeners=null,e._dispatchInstances=null}function u(e){var t=e._dispatchListeners,n=e._dispatchInstances;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function l(e){var t=u(e);return e._dispatchInstances=null,e._dispatchListeners=null,t}function c(e){var t=e._dispatchListeners,n=e._dispatchInstances;Array.isArray(t)&&d("103"),e.currentTarget=t?g.getNodeFromInstance(n):null;var r=t?t(e):null;return e.currentTarget=null,e._dispatchListeners=null,e._dispatchInstances=null,r}function p(e){return!!e._dispatchListeners}var f,h,d=n(11),m=n(247),v=(n(8),n(10),{injectComponentTree:function(e){f=e},injectTreeTraversal:function(e){h=e}}),g={isEndish:r,isMoveish:i,isStartish:o,executeDirectDispatch:c,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:l,hasDispatches:p,getInstanceFromNode:function(e){return f.getInstanceFromNode(e)},getNodeFromInstance:function(e){return f.getNodeFromInstance(e)},isAncestor:function(e,t){return h.isAncestor(e,t)},getLowestCommonAncestor:function(e,t){return h.getLowestCommonAncestor(e,t)},getParentInstance:function(e){return h.getParentInstance(e)},traverseTwoPhase:function(e,t,n){return h.traverseTwoPhase(e,t,n)},traverseEnterLeave:function(e,t,n,r,i){return h.traverseEnterLeave(e,t,n,r,i)},injection:v};e.exports=g},function(e,t,n){"use strict";function r(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,function(e){return t[e]})}function i(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1))).replace(t,function(e){return n[e]})}var o={escape:r,unescape:i};e.exports=o},function(e,t,n){"use strict";function r(e){null!=e.checkedLink&&null!=e.valueLink&&s("87")}function i(e){r(e),(null!=e.value||null!=e.onChange)&&s("88")}function o(e){r(e),(null!=e.checked||null!=e.onChange)&&s("89")}function a(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}var s=n(11),u=n(1043),l=n(443),c=n(92),p=l(c.isValidElement),f=(n(8),n(10),{button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0}),h={value:function(e,t,n){return!e[t]||f[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:p.func},d={},m={checkPropTypes:function(e,t,n){for(var r in h){if(h.hasOwnProperty(r))var i=h[r](t,r,e,"prop",null,u);if(i instanceof Error&&!(i.message in d)){d[i.message]=!0;a(n)}}},getValue:function(e){return e.valueLink?(i(e),e.valueLink.value):e.value},getChecked:function(e){return e.checkedLink?(o(e),e.checkedLink.value):e.checked},executeOnChange:function(e,t){return e.valueLink?(i(e),e.valueLink.requestChange(t.target.value)):e.checkedLink?(o(e),e.checkedLink.requestChange(t.target.checked)):e.onChange?e.onChange.call(void 0,t):void 0}};e.exports=m},function(e,t,n){"use strict";var r=n(11),i=(n(8),!1),o={replaceNodeWithMarkup:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){i&&r("104"),o.replaceNodeWithMarkup=e.replaceNodeWithMarkup,o.processChildrenUpdates=e.processChildrenUpdates,i=!0}}};e.exports=o},function(e,t,n){"use strict";function r(e,t,n){try{t(n)}catch(e){null===i&&(i=e)}}var i=null,o={invokeGuardedCallback:r,invokeGuardedCallbackWithCatch:r,rethrowCaughtError:function(){if(i){var e=i;throw i=null,e}}};e.exports=o},function(e,t,n){"use strict";function r(e){u.enqueueUpdate(e)}function i(e){var t=typeof e;if("object"!==t)return t;var n=e.constructor&&e.constructor.name||t,r=Object.keys(e);return r.length>0&&r.length<20?n+" (keys: "+r.join(", ")+")":n}function o(e,t){var n=s.get(e);if(!n){return null}return n}var a=n(11),s=(n(52),n(124)),u=(n(39),n(44)),l=(n(8),n(10),{isMounted:function(e){var t=s.get(e);return!!t&&!!t._renderedComponent},enqueueCallback:function(e,t,n){l.validateCallback(t,n);var i=o(e);if(!i)return null;i._pendingCallbacks?i._pendingCallbacks.push(t):i._pendingCallbacks=[t],r(i)},enqueueCallbackInternal:function(e,t){e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=o(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t,n){var i=o(e,"replaceState");i&&(i._pendingStateQueue=[t],i._pendingReplaceState=!0,void 0!==n&&null!==n&&(l.validateCallback(n,"replaceState"),i._pendingCallbacks?i._pendingCallbacks.push(n):i._pendingCallbacks=[n]),r(i))},enqueueSetState:function(e,t){var n=o(e,"setState");if(n){(n._pendingStateQueue||(n._pendingStateQueue=[])).push(t),r(n)}},enqueueElementInternal:function(e,t,n){e._pendingElement=t,e._context=n,r(e)},validateCallback:function(e,t){e&&"function"!=typeof e&&a("122",t,i(e))}});e.exports=l},function(e,t,n){"use strict";var r=function(e){return"undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction?function(t,n,r,i){MSApp.execUnsafeLocalFunction(function(){return e(t,n,r,i)})}:e};e.exports=r},function(e,t,n){"use strict";function r(e){var t,n=e.keyCode;return"charCode"in e?0===(t=e.charCode)&&13===n&&(t=13):t=n,t>=32||13===t?t:0}e.exports=r},function(e,t,n){"use strict";function r(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=o[e];return!!r&&!!n[r]}function i(e){return r}var o={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};e.exports=i},function(e,t,n){"use strict";function r(e){var t=e.target||e.srcElement||window;return t.correspondingUseElement&&(t=t.correspondingUseElement),3===t.nodeType?t.parentNode:t}e.exports=r},function(e,t,n){"use strict";/**
+ * Checks if an event is supported in the current execution environment.
+ *
+ * NOTE: This will not work correctly for non-generic events such as `change`,
+ * `reset`, `load`, `error`, and `select`.
+ *
+ * Borrows from Modernizr.
+ *
+ * @param {string} eventNameSuffix Event name, e.g. "click".
+ * @param {?boolean} capture Check if the capture phase is supported.
+ * @return {boolean} True if the event is supported.
+ * @internal
+ * @license Modernizr 3.0.0pre (Custom Build) | MIT
+ */
+function r(e,t){if(!o.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var a=document.createElement("div");a.setAttribute(n,"return;"),r="function"==typeof a[n]}return!r&&i&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var i,o=n(25);o.canUseDOM&&(i=document.implementation&&document.implementation.hasFeature&&!0!==document.implementation.hasFeature("","")),e.exports=r},function(e,t,n){"use strict";function r(e,t){var n=null===e||!1===e,r=null===t||!1===t;if(n||r)return n===r;var i=typeof e,o=typeof t;return"string"===i||"number"===i?"string"===o||"number"===o:"object"===o&&e.type===t.type&&e.key===t.key}e.exports=r},function(e,t,n){"use strict";var r=(n(13),n(32)),i=(n(10),r);e.exports=i},function(e,t,n){"use strict";function r(e){switch(e._type){case"Document":case"BlockQuote":case"List":case"Item":case"Paragraph":case"Heading":case"Emph":case"Strong":case"Link":case"Image":case"CustomInline":case"CustomBlock":return!0;default:return!1}}var i=function(e,t){this.current=e,this.entering=!0===t},o=function(){var e=this.current,t=this.entering;if(null===e)return null;var n=r(e);return t&&n?e._firstChild?(this.current=e._firstChild,this.entering=!0):this.entering=!1:e===this.root?this.current=null:null===e._next?(this.current=e._parent,this.entering=!1):(this.current=e._next,this.entering=!0),{entering:t,node:e}},a=function(e){return{current:e,root:e,entering:!0,next:o,resumeAt:i}},s=function(e,t){this._type=e,this._parent=null,this._firstChild=null,this._lastChild=null,this._prev=null,this._next=null,this._sourcepos=t,this._lastLineBlank=!1,this._open=!0,this._string_content=null,this._literal=null,this._listData={},this._info=null,this._destination=null,this._title=null,this._isFenced=!1,this._fenceChar=null,this._fenceLength=0,this._fenceOffset=null,this._level=null,this._onEnter=null,this._onExit=null},u=s.prototype;Object.defineProperty(u,"isContainer",{get:function(){return r(this)}}),Object.defineProperty(u,"type",{get:function(){return this._type}}),Object.defineProperty(u,"firstChild",{get:function(){return this._firstChild}}),Object.defineProperty(u,"lastChild",{get:function(){return this._lastChild}}),Object.defineProperty(u,"next",{get:function(){return this._next}}),Object.defineProperty(u,"prev",{get:function(){return this._prev}}),Object.defineProperty(u,"parent",{get:function(){return this._parent}}),Object.defineProperty(u,"sourcepos",{get:function(){return this._sourcepos}}),Object.defineProperty(u,"literal",{get:function(){return this._literal},set:function(e){this._literal=e}}),Object.defineProperty(u,"destination",{get:function(){return this._destination},set:function(e){this._destination=e}}),Object.defineProperty(u,"title",{get:function(){return this._title},set:function(e){this._title=e}}),Object.defineProperty(u,"info",{get:function(){return this._info},set:function(e){this._info=e}}),Object.defineProperty(u,"level",{get:function(){return this._level},set:function(e){this._level=e}}),Object.defineProperty(u,"listType",{get:function(){return this._listData.type},set:function(e){this._listData.type=e}}),Object.defineProperty(u,"listTight",{get:function(){return this._listData.tight},set:function(e){this._listData.tight=e}}),Object.defineProperty(u,"listStart",{get:function(){return this._listData.start},set:function(e){this._listData.start=e}}),Object.defineProperty(u,"listDelimiter",{get:function(){return this._listData.delimiter},set:function(e){this._listData.delimiter=e}}),Object.defineProperty(u,"onEnter",{get:function(){return this._onEnter},set:function(e){this._onEnter=e}}),Object.defineProperty(u,"onExit",{get:function(){return this._onExit},set:function(e){this._onExit=e}}),s.prototype.appendChild=function(e){e.unlink(),e._parent=this,this._lastChild?(this._lastChild._next=e,e._prev=this._lastChild,this._lastChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.prependChild=function(e){e.unlink(),e._parent=this,this._firstChild?(this._firstChild._prev=e,e._next=this._firstChild,this._firstChild=e):(this._firstChild=e,this._lastChild=e)},s.prototype.unlink=function(){this._prev?this._prev._next=this._next:this._parent&&(this._parent._firstChild=this._next),this._next?this._next._prev=this._prev:this._parent&&(this._parent._lastChild=this._prev),this._parent=null,this._next=null,this._prev=null},s.prototype.insertAfter=function(e){e.unlink(),e._next=this._next,e._next&&(e._next._prev=e),e._prev=this,this._next=e,e._parent=this._parent,e._next||(e._parent._lastChild=e)},s.prototype.insertBefore=function(e){e.unlink(),e._prev=this._prev,e._prev&&(e._prev._next=e),e._next=this,this._prev=e,e._parent=this._parent,e._prev||(e._parent._firstChild=e)},s.prototype.walker=function(){return new a(this)},e.exports=s},function(e,t,n){"use strict";function r(e){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=0);return t}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){for(var r in t)if(Object.prototype.hasOwnProperty.call(t,r)){if(0!==n[r])return!1;var i="number"==typeof t[r]?t[r]:t[r].val;if(e[r]!==i)return!1}return!0}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r,o,a,s){var u=-o*(t-r),l=-a*n,c=u+l,p=n+c*e,f=t+p*e;return Math.abs(p)<s&&Math.abs(f-r)<s?(i[0]=r,i[1]=0,i):(i[0]=f,i[1]=p,i)}t.__esModule=!0,t.default=r;var i=[0,0];e.exports=t.default},function(e,t,n){var r=n(1097),i=n(1);e.exports=function(e,t,n){var i=e[t];if(i){var o=[];if(Object.keys(i).forEach(function(e){-1===r.indexOf(e)&&o.push(e)}),o.length)throw new Error("Prop "+t+" passed to "+n+". Has invalid keys "+o.join(", "))}},e.exports.isRequired=function(t,n,r){if(!t[n])throw new Error("Prop "+n+" passed to "+r+" is required");return e.exports(t,n,r)},e.exports.supportingArrays=i.oneOfType([i.arrayOf(e.exports),e.exports])},function(e,t,n){"use strict";(function(t,r,i){function o(e){var t=this;this.next=null,this.entry=null,this.finish=function(){A(t,e)}}function a(e){return R.from(e)}function s(e){return R.isBuffer(e)||e instanceof j}function u(){}function l(e,t){O=O||n(71),e=e||{},this.objectMode=!!e.objectMode,t instanceof O&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var r=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var a=!1===e.decodeStrings;this.decodeStrings=!a,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){y(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new o(this)}function c(e){if(O=O||n(71),!(N.call(c,this)||this instanceof O))return new c(e);this._writableState=new l(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),I.call(this)}function p(e,t){var n=new Error("write after end");e.emit("error",n),D(t,n)}function f(e,t,n,r){var i=!0,o=!1;return null===n?o=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(o=new TypeError("Invalid non-string/buffer chunk")),o&&(e.emit("error",o),D(r,o),i=!1),i}function h(e,t,n){return e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=R.from(t,n)),t}function d(e,t,n,r,i,o){if(!n){var a=h(t,r,i);r!==a&&(n=!0,i="buffer",r=a)}var s=t.objectMode?1:r.length;t.length+=s;var u=t.length<t.highWaterMark;if(u||(t.needDrain=!0),t.writing||t.corked){var l=t.lastBufferedRequest;t.lastBufferedRequest={chunk:r,encoding:i,isBuf:n,callback:o,next:null},l?l.next=t.lastBufferedRequest:t.bufferedRequest=t.lastBufferedRequest,t.bufferedRequestCount+=1}else m(e,t,!1,s,r,i,o);return u}function m(e,t,n,r,i,o,a){t.writelen=r,t.writecb=a,t.writing=!0,t.sync=!0,n?e._writev(i,t.onwrite):e._write(i,o,t.onwrite),t.sync=!1}function v(e,t,n,r,i){--t.pendingcb,n?(D(i,r),D(S,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(i(r),e._writableState.errorEmitted=!0,e.emit("error",r),S(e,t))}function g(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}function y(e,t){var n=e._writableState,r=n.sync,i=n.writecb;if(g(n),t)v(e,n,r,t,i);else{var o=w(n);o||n.corked||n.bufferProcessing||!n.bufferedRequest||x(e,n),r?M(_,e,n,o,i):_(e,n,o,i)}}function _(e,t,n,r){n||b(e,t),t.pendingcb--,r(),S(e,t)}function b(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}function x(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,i=new Array(r),a=t.corkedRequestsFree;a.entry=n;for(var s=0,u=!0;n;)i[s]=n,n.isBuf||(u=!1),n=n.next,s+=1;i.allBuffers=u,m(e,t,!0,t.length,i,"",a.finish),t.pendingcb++,t.lastBufferedRequest=null,a.next?(t.corkedRequestsFree=a.next,a.next=null):t.corkedRequestsFree=new o(t)}else{for(;n;){var l=n.chunk,c=n.encoding,p=n.callback;if(m(e,t,!1,t.objectMode?1:l.length,l,c,p),n=n.next,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequestCount=0,t.bufferedRequest=n,t.bufferProcessing=!1}function w(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function k(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),S(e,t)})}function E(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,D(k,e,t)):(t.prefinished=!0,e.emit("prefinish")))}function S(e,t){var n=w(t);return n&&(E(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}function C(e,t,n){t.ending=!0,S(e,t),n&&(t.finished?D(n):e.once("finish",n)),t.ended=!0,e.writable=!1}function A(e,t,n){var r=e.entry;for(e.entry=null;r;){var i=r.callback;t.pendingcb--,i(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}var D=n(158);e.exports=c;var O,M=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:D;c.WritableState=l;var T=n(111);T.inherits=n(42);var P={deprecate:n(1191)},I=n(482),R=n(167).Buffer,j=i.Uint8Array||function(){},F=n(481);T.inherits(c,I),l.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(l.prototype,"buffer",{get:P.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}();var N;"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(N=Function.prototype[Symbol.hasInstance],Object.defineProperty(c,Symbol.hasInstance,{value:function(e){return!!N.call(this,e)||e&&e._writableState instanceof l}})):N=function(e){return e instanceof this},c.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},c.prototype.write=function(e,t,n){var r=this._writableState,i=!1,o=s(e)&&!r.objectMode;return o&&!R.isBuffer(e)&&(e=a(e)),"function"==typeof t&&(n=t,t=null),o?t="buffer":t||(t=r.defaultEncoding),"function"!=typeof n&&(n=u),r.ended?p(this,n):(o||f(this,r,e,n))&&(r.pendingcb++,i=d(this,r,o,e,t,n)),i},c.prototype.cork=function(){this._writableState.corked++},c.prototype.uncork=function(){var e=this._writableState;e.corked&&(e.corked--,e.writing||e.corked||e.finished||e.bufferProcessing||!e.bufferedRequest||x(this,e))},c.prototype.setDefaultEncoding=function(e){if("string"==typeof e&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},c.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},c.prototype._writev=null,c.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!==e&&void 0!==e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||C(this,r,n)},Object.defineProperty(c.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),c.prototype.destroy=F.destroy,c.prototype._undestroy=F.undestroy,c.prototype._destroy=function(e,t){this.end(),t(e)}}).call(t,n(33),n(496).setImmediate,n(17))},function(e,t,n){t=e.exports=n(479),t.Stream=t,t.Readable=t,t.Writable=n(261),t.Duplex=n(71),t.Transform=n(480),t.PassThrough=n(1111)},function(e,t,n){"use strict";function r(e,t,n,r,i){this.src=e,this.env=r,this.options=n,this.parser=t,this.tokens=i,this.pos=0,this.posMax=this.src.length,this.level=0,this.pending="",this.pendingLevel=0,this.cache=[],this.isInLabel=!1,this.linkLevel=0,this.linkContent="",this.labelUnmatchedScopes=0}r.prototype.pushPending=function(){this.tokens.push({type:"text",content:this.pending,level:this.pendingLevel}),this.pending=""},r.prototype.push=function(e){this.pending&&this.pushPending(),this.tokens.push(e),this.pendingLevel=this.level},r.prototype.cacheSet=function(e,t){for(var n=this.cache.length;n<=e;n++)this.cache.push(0);this.cache[e]=t},r.prototype.cacheGet=function(e){return e<this.cache.length?this.cache[e]:0},e.exports=r},function(e,t,n){"use strict";function r(e,t){var n;return n=Array.isArray(e)?[]:{},t.push(e),Object.keys(e).forEach(function(i){var o=e[i];if("function"!=typeof o)return o&&"object"==typeof o?-1===t.indexOf(e[i])?void(n[i]=r(e[i],t.slice(0))):void(n[i]="[Circular]"):void(n[i]=o)}),n}e.exports=function(e){if("object"==typeof e){var t=r(e,[]);return"string"==typeof e.name&&(t.name=e.name),"string"==typeof e.message&&(t.message=e.message),"string"==typeof e.stack&&(t.stack=e.stack),t}return"function"==typeof e?"[Function: "+(e.name||"anonymous")+"]":e}},function(e,t,n){"use strict";function r(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}function i(e){var t=r(e);if("string"!=typeof t&&(y.isEncoding===_||!_(e)))throw new Error("Unknown encoding: "+e);return t||e}function o(e){this.encoding=i(e);var t;switch(this.encoding){case"utf16le":this.text=f,this.end=h,t=4;break;case"utf8":this.fillLast=l,t=4;break;case"base64":this.text=d,this.end=m,t=3;break;default:return this.write=v,void(this.end=g)}this.lastNeed=0,this.lastTotal=0,this.lastChar=y.allocUnsafe(t)}function a(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:-1}function s(e,t,n){var r=t.length-1;if(r<n)return 0;var i=a(t[r]);return i>=0?(i>0&&(e.lastNeed=i-1),i):--r<n?0:(i=a(t[r]))>=0?(i>0&&(e.lastNeed=i-2),i):--r<n?0:(i=a(t[r]),i>=0?(i>0&&(2===i?i=0:e.lastNeed=i-3),i):0)}function u(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�".repeat(n);if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�".repeat(n+1);if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�".repeat(n+2)}}function l(e){var t=this.lastTotal-this.lastNeed,n=u(this,e,t);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function c(e,t){var n=s(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)}function p(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+"�".repeat(this.lastTotal-this.lastNeed):t}function f(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function h(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function d(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function m(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function v(e){return e.toString(this.encoding)}function g(e){return e&&e.length?this.write(e):""}var y=n(167).Buffer,_=y.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};t.StringDecoder=o,o.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n<e.length?t?t+this.text(e,n):this.text(e,n):t||""},o.prototype.end=p,o.prototype.text=c,o.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){(function(){var e,t,r,i=function(e,t){function n(){this.constructor=e}for(var r in t)o.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},o={}.hasOwnProperty,a=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};t=n(94),r=n(61),e=n(45).YAMLError,this.ResolverError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(e),this.BaseResolver=function(){function e(){this.resolver_exact_paths=[],this.resolver_prefix_paths=[]}var n,i,o;return i="tag:yaml.org,2002:str",o="tag:yaml.org,2002:seq",n="tag:yaml.org,2002:map",e.prototype.yaml_implicit_resolvers={},e.prototype.yaml_path_resolvers={},e.add_implicit_resolver=function(e,t,n){var i,o,a,s,u;for(null==n&&(n=[null]),this.prototype.hasOwnProperty("yaml_implicit_resolvers")||(this.prototype.yaml_implicit_resolvers=r.extend({},this.prototype.yaml_implicit_resolvers)),u=[],a=0,s=n.length;a<s;a++)o=n[a],u.push((null!=(i=this.prototype.yaml_implicit_resolvers)[o]?i[o]:i[o]=[]).push([e,t]));return u},e.prototype.descend_resolver=function(e,t){var n,i,o,a,s,u,l,c,p,f,h,d,m;if(!r.is_empty(this.yaml_path_resolvers)){if(i={},p=[],e)for(n=this.resolver_prefix_paths.length,f=this.resolver_prefix_paths.slice(-1)[0],o=0,u=f.length;o<u;o++)h=f[o],c=h[0],s=h[1],this.check_resolver_prefix(n,c,s,e,t)&&(c.length>n?p.push([c,s]):i[s]=this.yaml_path_resolvers[c][s]);else for(d=this.yaml_path_resolvers,a=0,l=d.length;a<l;a++)m=d[a],c=m[0],s=m[1],c?p.push([c,s]):i[s]=this.yaml_path_resolvers[c][s];return this.resolver_exact_paths.push(i),this.resolver_prefix_paths.push(p)}},e.prototype.ascend_resolver=function(){if(!r.is_empty(this.yaml_path_resolvers))return this.resolver_exact_paths.pop(),this.resolver_prefix_paths.pop()},e.prototype.check_resolver_prefix=function(e,n,r,i,o){var a,s,u;if(u=n[e-1],s=u[0],a=u[1],"string"==typeof s){if(i.tag!==s)return}else if(null!==s&&!(i instanceof s))return;if((!0!==a||null===o)&&(!1!==a&&null!==a||null!==o)){if("string"==typeof a){if(!(o instanceof t.ScalarNode)&&a===o.value)return}else if("number"==typeof a&&a!==o)return;return!0}},e.prototype.resolve=function(e,r,s){var u,l,c,p,f,h,d,m,v,g,y,_;if(e===t.ScalarNode&&s[0]){for(y=""===r?null!=(h=this.yaml_implicit_resolvers[""])?h:[]:null!=(d=this.yaml_implicit_resolvers[r[0]])?d:[],y=y.concat(null!=(m=this.yaml_implicit_resolvers[null])?m:[]),c=0,f=y.length;c<f;c++)if(v=y[c],_=v[0],g=v[1],r.match(g))return _;s=s[1]}u=!0;for(p in this.yaml_path_resolvers)null=={}[p]&&(u=!1);if(!u){if(l=this.resolver_exact_paths.slice(-1)[0],a.call(l,e)>=0)return l[e];if(a.call(l,null)>=0)return l[null]}return e===t.ScalarNode?i:e===t.SequenceNode?o:e===t.MappingNode?n:void 0},e}(),this.Resolver=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(this.BaseResolver),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:bool",/^(?:yes|Yes|YES|true|True|TRUE|on|On|ON|no|No|NO|false|False|FALSE|off|Off|OFF)$/,"yYnNtTfFoO"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:float",/^(?:[-+]?(?:[0-9][0-9_]*)\.[0-9_]*(?:[eE][-+][0-9]+)?|\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\.[0-9_]*|[-+]?\.(?:inf|Inf|INF)|\.(?:nan|NaN|NAN))$/,"-+0123456789."),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:int",/^(?:[-+]?0b[01_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?0o[0-7_]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$/,"-+0123456789"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:merge",/^(?:<<)$/,"<"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:null",/^(?:~|null|Null|NULL|)$/,["~","n","N",""]),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:timestamp",/^(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]|[0-9][0-9][0-9][0-9]-[0-9][0-9]?-[0-9][0-9]?(?:[Tt]|[\x20\t]+)[0-9][0-9]?:[0-9][0-9]:[0-9][0-9](?:\.[0-9]*)?(?:[\x20\t]*(?:Z|[-+][0-9][0-9]?(?::[0-9][0-9])?))?)$/,"0123456789"),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:value",/^(?:=)$/,"="),this.Resolver.add_implicit_resolver("tag:yaml.org,2002:yaml",/^(?:!|&|\*)$/,"!&*")}).call(this)},function(e,t){(function(){var e=function(e,n){function r(){this.constructor=e}for(var i in n)t.call(n,i)&&(e[i]=n[i]);return r.prototype=n.prototype,e.prototype=new r,e.__super__=n.prototype,e},t={}.hasOwnProperty;this.Token=function(){function e(e,t){this.start_mark=e,this.end_mark=t}return e}(),this.DirectiveToken=function(t){function n(e,t,n,r){this.name=e,this.value=t,this.start_mark=n,this.end_mark=r}return e(n,t),n.prototype.id="<directive>",n}(this.Token),this.DocumentStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<document start>",n}(this.Token),this.DocumentEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<document end>",n}(this.Token),this.StreamStartToken=function(t){function n(e,t,n){this.start_mark=e,this.end_mark=t,this.encoding=n}return e(n,t),n.prototype.id="<stream start>",n}(this.Token),this.StreamEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<stream end>",n}(this.Token),this.BlockSequenceStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block sequence start>",n}(this.Token),this.BlockMappingStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block mapping end>",n}(this.Token),this.BlockEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="<block end>",n}(this.Token),this.FlowSequenceStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="[",n}(this.Token),this.FlowMappingStartToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="{",n}(this.Token),this.FlowSequenceEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="]",n}(this.Token),this.FlowMappingEndToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="}",n}(this.Token),this.KeyToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="?",n}(this.Token),this.ValueToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id=":",n}(this.Token),this.BlockEntryToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id="-",n}(this.Token),this.FlowEntryToken=function(t){function n(){return n.__super__.constructor.apply(this,arguments)}return e(n,t),n.prototype.id=",",n}(this.Token),this.AliasToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<alias>",n}(this.Token),this.AnchorToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<anchor>",n}(this.Token),this.TagToken=function(t){function n(e,t,n){this.value=e,this.start_mark=t,this.end_mark=n}return e(n,t),n.prototype.id="<tag>",n}(this.Token),this.ScalarToken=function(t){function n(e,t,n,r,i){this.value=e,this.plain=t,this.start_mark=n,this.end_mark=r,this.style=i}return e(n,t),n.prototype.id="<scalar>",n}(this.Token)}).call(this)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return t.filter(function(e){return!!e}).join(" ").trim()}Object.defineProperty(t,"__esModule",{value:!0}),t.Collapse=t.Link=t.Select=t.Input=t.TextArea=t.Button=t.Row=t.Col=t.Container=void 0;var o=n(21),a=r(o),s=n(96),u=r(s),l=n(4),c=r(l),p=n(2),f=r(p),h=n(3),d=r(h),m=n(6),v=r(m),g=n(5),y=r(g),_=n(0),b=r(_),x=n(1),w=r(x),k=n(448);(t.Container=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.fullscreen,n=e.full,r=(0,u.default)(e,["fullscreen","full"]);if(t)return b.default.createElement("section",r);var o="swagger-container"+(n?"-full":"");return b.default.createElement("section",(0,a.default)({},r,{className:i(r.className,o)}))}}]),t}(b.default.Component)).propTypes={fullscreen:w.default.bool,full:w.default.bool,className:w.default.string};var E={mobile:"",tablet:"-tablet",desktop:"-desktop",large:"-hd"};(t.Col=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.hide,n=e.keepContents,r=(e.mobile,e.tablet,e.desktop,e.large,(0,u.default)(e,["hide","keepContents","mobile","tablet","desktop","large"]));if(t&&!n)return b.default.createElement("span",null);var o=[];for(var s in E)if(E.hasOwnProperty(s)){var l=E[s];if(s in this.props){var c=this.props[s];if(c<1){o.push("none"+l);continue}o.push("block"+l),o.push("col-"+c+l)}}var p=i.apply(void 0,[r.className].concat(o));return b.default.createElement("section",(0,a.default)({},r,{style:{display:t?"none":null},className:p}))}}]),t}(b.default.Component)).propTypes={hide:w.default.bool,keepContents:w.default.bool,mobile:w.default.number,tablet:w.default.number,desktop:w.default.number,large:w.default.number,className:w.default.string},(t.Row=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("div",(0,a.default)({},this.props,{className:i(this.props.className,"wrapper")}))}}]),t}(b.default.Component)).propTypes={className:w.default.string};var S=t.Button=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("button",(0,a.default)({},this.props,{className:i(this.props.className,"button")}))}}]),t}(b.default.Component);S.propTypes={className:w.default.string},S.defaultProps={className:""};var C=(t.TextArea=function(e){return b.default.createElement("textarea",e)},t.Input=function(e){return b.default.createElement("input",e)},t.Select=function(e){function t(e,n){(0,f.default)(this,t);var r=(0,v.default)(this,(t.__proto__||(0,c.default)(t)).call(this,e,n));A.call(r);var i=void 0;return i=e.value?e.value:e.multiple?[""]:"",r.state={value:i},r}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props,t=e.allowedValues,n=e.multiple,r=e.allowEmptyValue,i=this.state.value.toJS?this.state.value.toJS():this.state.value;return b.default.createElement("select",{className:this.props.className,multiple:n,value:i,onChange:this.onChange},r?b.default.createElement("option",{value:""},"--"):null,t.map(function(e,t){return b.default.createElement("option",{key:t,value:String(e)},String(e))}))}}]),t}(b.default.Component));C.propTypes={allowedValues:w.default.array,value:w.default.any,onChange:w.default.func,multiple:w.default.bool,allowEmptyValue:w.default.bool,className:w.default.string},C.defaultProps={multiple:!1,allowEmptyValue:!0};var A=function(){var e=this;this.onChange=function(t){var n=e.props,r=n.onChange,i=n.multiple,o=[].slice.call(t.target.options),a=void 0;a=i?o.filter(function(e){return e.selected}).map(function(e){return e.value}):t.target.value,e.setState({value:a}),r&&r(a)}};(t.Link=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){return b.default.createElement("a",(0,a.default)({},this.props,{className:i(this.props.className,"link")}))}}]),t}(b.default.Component)).propTypes={className:w.default.string};var D=function(e){var t=e.children;return b.default.createElement("div",{style:{height:"auto",border:"none",margin:0,padding:0}}," ",t," ")};D.propTypes={children:w.default.node};var O=t.Collapse=function(e){function t(){return(0,f.default)(this,t),(0,v.default)(this,(t.__proto__||(0,c.default)(t)).apply(this,arguments))}return(0,y.default)(t,e),(0,d.default)(t,[{key:"renderNotAnimated",value:function(){return this.props.isOpened?b.default.createElement(D,null,this.props.children):b.default.createElement("noscript",null)}},{key:"render",value:function(){var e=this.props,t=e.animated,n=e.isOpened,r=e.children;return t?(r=n?r:null,b.default.createElement(k.Collapse,{isOpened:n},b.default.createElement(D,null,r))):this.renderNotAnimated()}}]),t}(b.default.Component);O.propTypes={isOpened:w.default.bool,children:w.default.node.isRequired,animated:w.default.bool},O.defaultProps={isOpened:!1,animated:!1}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1072),_=r(y),b=n(12),x=r(b),w=n(1),k=r(w),E=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.getModelName=function(e){return-1!==e.indexOf("#/definitions/")?e.replace(/^.*#\/definitions\//,""):-1!==e.indexOf("#/components/schemas/")?e.replace("#/components/schemas/",""):void 0},r.getRefSchema=function(e){return r.props.specSelectors.findDefinition(e)},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=e.specSelectors,i=e.schema,a=e.required,s=e.name,u=e.isRef,l=e.specPath,c=t("ObjectModel"),p=t("ArrayModel"),f=t("PrimitiveModel"),h="object",d=i&&i.get("$$ref");!s&&d&&(s=this.getModelName(d)),!i&&d&&(i=this.getRefSchema(s));var m=r.isOAS3()&&i.get("deprecated");switch(u=void 0!==u?u:!!d,h=i&&i.get("type")||h){case"object":return g.default.createElement(c,(0,o.default)({className:"object"},this.props,{specPath:l,getConfigs:n,schema:i,name:s,deprecated:m,isRef:u}));case"array":return g.default.createElement(p,(0,o.default)({className:"array"},this.props,{getConfigs:n,schema:i,name:s,deprecated:m,required:a}));case"string":case"number":case"integer":case"boolean":default:return g.default.createElement(f,(0,o.default)({},this.props,{getComponent:t,getConfigs:n,schema:i,name:s,deprecated:m,required:a}))}}}]),t}(_.default);E.propTypes={schema:x.default.orderedMap.isRequired,getComponent:k.default.func.isRequired,getConfigs:k.default.func.isRequired,specSelectors:k.default.object.isRequired,name:k.default.string,isRef:k.default.bool,required:k.default.bool,expandDepth:k.default.number,depth:k.default.number,specPath:x.default.list.isRequired},t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.source,n=new h.default({html:!0,typographer:!0,breaks:!0,linkify:!0,linkTarget:"_blank"}).render(t),r=o(n);return t&&n&&r?l.default.createElement("div",{className:"markdown",dangerouslySetInnerHTML:{__html:r}}):null}function o(e){return(0,m.default)(e,v)}Object.defineProperty(t,"__esModule",{value:!0});var a=n(21),s=r(a);t.sanitizer=o;var u=n(0),l=r(u),c=n(1),p=r(c),f=n(1126),h=r(f),d=n(1179),m=r(d);i.propTypes={source:p.default.string.isRequired},t.default=i;var v={allowedTags:m.default.defaults.allowedTags.concat(["h1","h2","img","span"]),allowedAttributes:(0,s.default)({},m.default.defaults.allowedAttributes,{img:m.default.defaults.allowedAttributes.img.concat(["title"]),td:["colspan"],"*":["class"]}),textFilter:function(e){return e.replace(/&quot;/g,'"')}}},function(e,t,n){"use strict";var r=n(9),i=n(1208);i.keys().forEach(function(t){if("./index.js"!==t){var n=i(t);e.exports[(0,r.pascalCaseFilename)(t)]=n.default?n.default:n}})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){function n(e,t,i){if(!e)return i&&i.start_mark?i.start_mark.line:0;if(t.length&&e.tag===b)for(r=0;r<e.value.length;r++){var o=e.value[r],a=o[0],s=o[1];if(a.value===t[0])return n(s,t.slice(1),e);if(a.value===t[0].replace(/\[.*/,"")){var u=parseInt(t[0].match(/\[(.*)\]/)[1]);if(1===s.value.length&&0!==u&&u)var l=(0,g.default)(s.value[0],{value:u.toString()});else var l=s.value[u];return n(l,t.slice(1),s.value)}}if(t.length&&e.tag===x){var c=e.value[t[0]];if(c&&c.tag)return n(c,t.slice(1),e.value)}return e.tag!==b||Array.isArray(i)?e.start_mark.line+1:e.start_mark.line}if("string"!=typeof e)throw new TypeError("yaml should be a string");if(!(0,m.default)(t))throw new TypeError("path should be an array of strings");var r=0;return n(_(e),t)}function o(e,t){function n(e,o){if(e.tag===b)for(i=0;i<e.value.length;i++){var a=e.value[i],s=a[0],u=a[1];if(s.value===t[0])return t.shift(),n(u,s)}if(e.tag===x){var l=e.value[t[0]];if(l&&l.tag)return t.shift(),n(l,o)}if(t.length)return r;var c={start:{line:e.start_mark.line,column:e.start_mark.column,pointer:e.start_mark.pointer},end:{line:e.end_mark.line,column:e.end_mark.column,pointer:e.end_mark.pointer}};return o&&(c.key_start={line:o.start_mark.line,column:o.start_mark.column,pointer:o.start_mark.pointer},c.key_end={line:o.end_mark.line,column:o.end_mark.column,pointer:o.end_mark.pointer}),c}if("string"!=typeof e)throw new TypeError("yaml should be a string");if(!(0,m.default)(t))throw new TypeError("path should be an array of strings");var r={start:{line:-1,column:-1},end:{line:-1,column:-1}},i=0;return n(_(e))}function a(e,t){function n(e){function r(e){return e.start_mark.line===e.end_mark.line?t.line===e.start_mark.line&&e.start_mark.column<=t.column&&e.end_mark.column>=t.column:t.line===e.start_mark.line?t.column>=e.start_mark.column:t.line===e.end_mark.line?t.column<=e.end_mark.column:e.start_mark.line<t.line&&e.end_mark.line>t.line}var o=0;if(!e||-1===[b,x].indexOf(e.tag))return i;if(e.tag===b)for(o=0;o<e.value.length;o++){var a=e.value[o],s=a[0],u=a[1];if(r(s))return i;if(r(u))return i.push(s.value),n(u)}if(e.tag===x)for(o=0;o<e.value.length;o++){var l=e.value[o];if(r(l))return i.push(o.toString()),n(l)}return i}if("string"!=typeof e)throw new TypeError("yaml should be a string");if("object"!==(void 0===t?"undefined":(0,p.default)(t))||"number"!=typeof t.line||"number"!=typeof t.column)throw new TypeError("position should be an object with line and column properties");try{var r=_(e)}catch(n){return console.error("Error composing AST",n),console.error("Problem area:\n",e.split("\n").slice(t.line-5,t.line+5).join("\n")),null}var i=[];return n(r)}function s(e){return function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return new l.default(function(t){return t(e.apply(void 0,n))})}}Object.defineProperty(t,"__esModule",{value:!0}),t.getLineNumberForPathAsync=t.positionRangeForPathAsync=t.pathForPositionAsync=void 0;var u=n(332),l=r(u),c=n(48),p=r(c);t.getLineNumberForPath=i,t.positionRangeForPath=o,t.pathForPosition=a;var f=n(1206),h=r(f),d=n(20),m=r(d),v=n(223),g=r(v),y=n(9),_=(0,y.memoize)(h.default.compose),b="tag:yaml.org,2002:map",x="tag:yaml.org,2002:seq";t.pathForPositionAsync=s(a),t.positionRangeForPathAsync=s(o),t.getLineNumberForPathAsync=s(i)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:{AST:i},components:{JumpToPath:a.default}}};var r=n(272),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r),o=n(274),a=function(e){return e&&e.__esModule?e:{default:e}}(o)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return null}}]),t}(m.default.Component);t.default=v},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{afterLoad:function(e){this.rootInjects=this.rootInjects||{},this.rootInjects.initOAuth=e.authActions.configureAuth},statePlugins:{auth:{reducers:o.default,actions:s,selectors:l},spec:{wrapActions:p}}}};var i=n(276),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(168),s=r(a),u=n(277),l=r(u),c=n(278),p=r(c)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(30),u=r(s),l=n(18),c=r(l),p=n(7),f=n(9),h=n(168);t.default=(i={},(0,a.default)(i,h.SHOW_AUTH_POPUP,function(e,t){var n=t.payload;return e.set("showDefinitions",n)}),(0,a.default)(i,h.AUTHORIZE,function(e,t){var n=t.payload,r=(0,p.fromJS)(n),i=e.get("authorized")||(0,p.Map)();return r.entrySeq().forEach(function(e){var t=(0,c.default)(e,2),n=t[0],r=t[1],o=r.getIn(["schema","type"]);if("apiKey"===o||"http"===o)i=i.set(n,r);else if("basic"===o){var a=r.getIn(["value","username"]),s=r.getIn(["value","password"]);i=i.setIn([n,"value"],{username:a,header:"Basic "+(0,f.btoa)(a+":"+s)}),i=i.setIn([n,"schema"],r.get("schema"))}}),e.set("authorized",i)}),(0,a.default)(i,h.AUTHORIZE_OAUTH2,function(e,t){var n=t.payload,r=n.auth,i=n.token,o=void 0;return r.token=(0,u.default)({},i),o=(0,p.fromJS)(r),e.setIn(["authorized",o.get("name")],o)}),(0,a.default)(i,h.LOGOUT,function(e,t){var n=t.payload,r=e.get("authorized").withMutations(function(e){n.forEach(function(t){e.delete(t)})});return e.set("authorized",r)}),(0,a.default)(i,h.CONFIGURE_AUTH,function(e,t){var n=t.payload;return e.set("configs",n)}),i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.getConfigs=t.isAuthorized=t.authorized=t.definitionsForRequirements=t.getDefinitionsByNames=t.definitionsToAuthorize=t.shownDefinitions=void 0;var i=n(47),o=r(i),a=n(18),s=r(a),u=n(60),l=n(7),c=function(e){return e};t.shownDefinitions=(0,u.createSelector)(c,function(e){return e.get("showDefinitions")}),t.definitionsToAuthorize=(0,u.createSelector)(c,function(){return function(e){var t=e.specSelectors,n=t.securityDefinitions()||(0,l.Map)({}),r=(0,l.List)();return n.entrySeq().forEach(function(e){var t=(0,s.default)(e,2),n=t[0],i=t[1],o=(0,l.Map)();o=o.set(n,i),r=r.push(o)}),r}}),t.getDefinitionsByNames=function(e,t){return function(e){var n=e.specSelectors;console.warn("WARNING: getDefinitionsByNames is deprecated and will be removed in the next major version.");var r=n.securityDefinitions(),i=(0,l.List)();return t.valueSeq().forEach(function(e){var t=(0,l.Map)();e.entrySeq().forEach(function(e){var n=(0,s.default)(e,2),i=n[0],o=n[1],a=r.get(i),u=void 0;"oauth2"===a.get("type")&&o.size&&(u=a.get("scopes"),u.keySeq().forEach(function(e){o.contains(e)||(u=u.delete(e))}),a=a.set("allowedScopes",u)),t=t.set(i,a)}),i=i.push(t)}),i}},t.definitionsForRequirements=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:(0,l.List)();return function(e){return(e.authSelectors.definitionsToAuthorize()||(0,l.List)()).filter(function(e){return t.some(function(t){return t.get(e.keySeq().first())})})}},t.authorized=(0,u.createSelector)(c,function(e){return e.get("authorized")||(0,l.Map)()}),t.isAuthorized=function(e,t){return function(e){var n=e.authSelectors,r=n.authorized();return l.List.isList(t)?!!t.toJS().filter(function(e){return-1===(0,o.default)(e).map(function(e){return!!r.get(e)}).indexOf(!1)}).length:null}},t.getConfigs=(0,u.createSelector)(c,function(e){return e.get("configs")})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.execute=void 0;var r=n(21),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.execute=function(e,t){var n=t.authSelectors,r=t.specSelectors;return function(t){var o=t.path,a=t.method,s=t.operation,u=t.extras,l={authorized:n.authorized()&&n.authorized().toJS(),definitions:r.securityDefinitions()&&r.securityDefinitions().toJS(),specSecurity:r.security()&&r.security().toJS()};return e((0,i.default)({path:o,method:a,operation:s,securities:l},u))}}},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e){return e&&e.__esModule?e:{default:e}}function o(){return{statePlugins:{spec:{actions:g,selectors:y},configs:{reducers:m.default,actions:p,selectors:h}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var a=n(211),s=i(a),u=n(1007),l=i(u),c=n(169),p=r(c),f=n(281),h=r(f),d=n(280),m=i(d),v=function(e,t){try{return s.default.safeLoad(e)}catch(e){return t&&t.errActions.newThrownErr(new Error(e)),{}}},g={downloadConfig:function(e){return function(t){return(0,t.fn.fetch)(e)}},getConfigByUrl:function(e,t){return function(n){function r(n){n instanceof Error||n.status>=400?(i.updateLoadingStatus("failedConfig"),i.updateLoadingStatus("failedConfig"),i.updateUrl(""),console.error(n.statusText+" "+e),t(null)):t(v(n.text))}var i=n.specActions;if(e)return i.downloadConfig(e).then(r,r)}}},y={getLocalConfig:function(){return v(l.default)}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,i=n(36),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(7),s=n(169);t.default=(r={},(0,o.default)(r,s.UPDATE_CONFIGS,function(e,t){return e.merge((0,a.fromJS)(t.payload))}),(0,o.default)(r,s.TOGGLE_CONFIGS,function(e,t){var n=t.payload,r=e.get(n);return e.set(n,!r)}),r)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.get=function(e,t){return e.getIn(Array.isArray(t)?t:[t])}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.setHash=function(e){return e?history.pushState(null,null,"#"+e):window.location.hash=""}},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{spec:{wrapActions:o},layout:{wrapActions:s}}}};var i=n(285),o=r(i),a=n(284),s=r(a)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.show=void 0;var r=n(18),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(282),a=n(9);t.show=function(e,t){var n=t.getConfigs;return function(){for(var t=arguments.length,r=Array(t),s=0;s<t;s++)r[s]=arguments[s];e.apply(void 0,r);var u=n().deepLinking;if(u&&"false"!==u)try{var l=r[0],c=r[1],p=(0,i.default)(l,1),f=p[0];if("operations-tag"===f||"operations"===f){if(!c)return(0,o.setHash)("/");if("operations"===f){var h=(0,i.default)(l,3),d=h[1],m=h[2];(0,o.setHash)("/"+(0,a.createDeepLinkPath)(d)+"/"+(0,a.createDeepLinkPath)(m))}if("operations-tag"===f){var v=(0,i.default)(l,2),g=v[1];(0,o.setHash)("/"+(0,a.createDeepLinkPath)(g))}}}catch(e){console.error(e)}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.updateResolved=void 0;var i=n(18),o=r(i),a=n(1207),s=r(a),u=n(9),l=!1;t.updateResolved=function(e,t){var n=t.layoutActions,r=t.getConfigs;return function(){e.apply(void 0,arguments);var t=r().deepLinking;if(t&&"false"!==t){if(window.location.hash&&!l){var i=window.location.hash.slice(1);"!"===i[0]&&(i=i.slice(1)),"/"===i[0]&&(i=i.slice(1));var a=i.split("/"),c=(0,o.default)(a,2),p=c[0],f=c[1],h=document.querySelector(".swagger-ui"),d=s.default.createScroller(h),m=void 0;p&&f?(n.show(["operations-tag",p],!0),n.show(["operations",p,f],!0),m=document.getElementById("operations-"+(0,u.escapeDeepLinkPath)(p)+"-"+(0,u.escapeDeepLinkPath)(f))):p&&(n.show(["operations-tag",p],!0),m=document.getElementById("operations-tag-"+(0,u.escapeDeepLinkPath)(p))),m&&(d.to(m),setTimeout(function(){0===s.default.getY()&&s.default.to(m)},50))}l=!0}}}},function(e,t,n){"use strict";function r(e){var t=e.fn;return{statePlugins:{spec:{actions:{download:function(e){return function(n){function r(t){if(t instanceof Error||t.status>=400)return a.updateLoadingStatus("failed"),i.newThrownErr(new Error((t.message||t.statusText)+" "+e));a.updateLoadingStatus("success"),a.updateSpec(t.text),a.updateUrl(e)}var i=n.errActions,o=n.specSelectors,a=n.specActions,s=n.getConfigs,u=t.fetch,l=s();e=e||o.url(),a.updateLoadingStatus("loading"),u({url:e,loadSpec:!0,requestInterceptor:l.requestInterceptor||function(e){return e},responseInterceptor:l.responseInterceptor||function(e){return e},credentials:"same-origin",headers:{Accept:"application/json,*/*"}}).then(r,r)}},updateLoadingStatus:function(e){var t=[null,"loading","failed","success","failedConfig"];return-1===t.indexOf(e)&&console.error("Error: "+e+" is not one of "+(0,o.default)(t)),{type:"spec_update_loading_status",payload:e}}},reducers:{spec_update_loading_status:function(e,t){return"string"==typeof t.payload?e.set("loadingStatus",t.payload):e}},selectors:{loadingStatus:(0,a.createSelector)(function(e){return e||(0,s.Map)()},function(e){return e.get("loadingStatus")||null})}}}}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=function(e){return e&&e.__esModule?e:{default:e}}(i);t.default=r;var a=n(60),s=n(7)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e,t){var n={jsSpec:t.specSelectors.specJson().toJS()};return(0,a.default)(h,function(e,t){try{return t.transform(e,n).filter(function(e){return!!e})}catch(t){return console.error("Transformer error:",t),e}},e).filter(function(e){return!!e}).map(function(e){return!e.get("line")&&e.get("path"),e})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(953),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=n(288),u=r(s),l=n(289),c=r(l),p=n(290),f=r(p),h=[u,c,f]},function(e,t,n){"use strict";function r(e){return e.map(function(e){var t=e.get("message").indexOf("is not of a type(s)");if(t>-1){var n=e.get("message").slice(t+"is not of a type(s)".length).split(",");return e.set("message",e.get("message").slice(0,t)+i(n))}return e})}function i(e){return e.reduce(function(e,t,n,r){return n===r.length-1&&r.length>1?e+"or "+t:r[n+1]&&r.length>2?e+t+", ":r[n+1]?e+t+" ":e+t},"should be a")}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r},function(e,t,n){"use strict";function r(e,t){t.jsSpec;return e}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r;var i=n(224);(function(e){e&&e.__esModule})(i),n(7)},function(e,t,n){"use strict";function r(e){return e.map(function(e){return e.set("message",i(e.get("message"),"instance."))})}function i(e,t){return e.replace(new RegExp(t,"g"),"")}Object.defineProperty(t,"__esModule",{value:!0}),t.transform=r},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return{statePlugins:{err:{reducers:(0,o.default)(e),actions:s,selectors:l}}}};var i=n(292),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(128),s=r(a),u=n(293),l=r(u)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(30),s=r(a);t.default=function(e){var t;return t={},(0,o.default)(t,u.NEW_THROWN_ERR,function(t,n){var r=n.payload,i=(0,s.default)(m,r,{type:"thrown"});return t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_THROWN_ERR_BATCH,function(t,n){var r=n.payload;return r=r.map(function(e){return(0,p.fromJS)((0,s.default)(m,e,{type:"thrown"}))}),t.update("errors",function(e){return(e||(0,p.List)()).concat((0,p.fromJS)(r))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_SPEC_ERR,function(t,n){var r=n.payload,i=(0,p.fromJS)(r);return i=i.set("type","spec"),t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i)).sortBy(function(e){return e.get("line")})}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_SPEC_ERR_BATCH,function(t,n){var r=n.payload;return r=r.map(function(e){return(0,p.fromJS)((0,s.default)(m,e,{type:"spec"}))}),t.update("errors",function(e){return(e||(0,p.List)()).concat((0,p.fromJS)(r))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.NEW_AUTH_ERR,function(t,n){var r=n.payload,i=(0,p.fromJS)((0,s.default)({},r));return i=i.set("type","auth"),t.update("errors",function(e){return(e||(0,p.List)()).push((0,p.fromJS)(i))}).update("errors",function(t){return(0,d.default)(t,e.getSystem())})}),(0,o.default)(t,u.CLEAR,function(e,t){var n=t.payload;if(n){var r=f.default.fromJS((0,c.default)((e.get("errors")||(0,p.List)()).toJS(),n));return e.merge({errors:r})}}),t};var u=n(128),l=n(954),c=r(l),p=n(7),f=r(p),h=n(287),d=r(h),m={line:0,level:"error",message:"Unknown error"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.lastError=t.allErrors=void 0;var r=n(7),i=n(60),o=function(e){return e},a=t.allErrors=(0,i.createSelector)(o,function(e){return e.get("errors",(0,r.List)())});t.lastError=(0,i.createSelector)(a,function(e){return e.last()})},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{layout:{reducers:o.default,actions:s,selectors:l}}}};var i=n(295),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(170),s=r(a),u=n(296),l=r(u)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,i=n(36),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(7),s=n(170);t.default=(r={},(0,o.default)(r,s.UPDATE_LAYOUT,function(e,t){return e.set("layout",t.payload)}),(0,o.default)(r,s.UPDATE_FILTER,function(e,t){return e.set("filter",t.payload)}),(0,o.default)(r,s.SHOW,function(e,t){var n=t.payload.shown,r=(0,a.fromJS)(t.payload.thing);return e.update("shown",(0,a.fromJS)({}),function(e){return e.set(r,n)})}),(0,o.default)(r,s.UPDATE_MODE,function(e,t){var n=t.payload.thing,r=t.payload.mode;return e.setIn(["modes"].concat(n),(r||"")+"")}),r)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.showSummary=t.whatMode=t.isShown=t.currentFilter=t.current=void 0;var r=n(97),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(60),a=n(9),s=n(7),u=function(e){return e},l=(t.current=function(e){return e.get("layout")},t.currentFilter=function(e){return e.get("filter")},t.isShown=function(e,t,n){return t=(0,a.normalizeArray)(t),e.get("shown",(0,s.fromJS)({})).get((0,s.fromJS)(t),n)});t.whatMode=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return t=(0,a.normalizeArray)(t),e.getIn(["modes"].concat((0,i.default)(t)),n)},t.showSummary=(0,o.createSelector)(u,function(e){return!l(e,"editor")})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){function t(e){for(var t,n=arguments.length,r=Array(n>1?n-1:0),o=1;o<n;o++)r[o-1]=arguments[o];i(e)>=a&&(t=console)[e].apply(t,r)}var n=e.configs,r={debug:0,info:1,log:2,warn:3,error:4},i=function(e){return r[e]||-1},o=n.logLevel,a=i(o);return t.warn=t.bind(null,"warn"),t.error=t.bind(null,"error"),t.info=t.bind(null,"info"),t.debug=t.bind(null,"debug"),{rootInjects:{log:t}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.definitionsToAuthorize=void 0;var i=n(36),o=r(i),a=n(18),s=r(a),u=n(60),l=n(7),c=n(34),p=function(e){return e};t.definitionsToAuthorize=function(e){return function(t,n){return function(r){for(var i=arguments.length,o=Array(i>1?i-1:0),a=1;a<i;a++)o[a-1]=arguments[a];var s=n.getSystem().specSelectors.specJson();return(0,c.isOAS3)(s)?e.apply(void 0,[n].concat(o)):t.apply(void 0,o)}}}((0,u.createSelector)(p,function(e){return e.specSelectors.securityDefinitions()},function(e,t){var n=(0,l.List)();return t.entrySeq().forEach(function(e){var t=(0,s.default)(e,2),r=t[0],i=t[1],a=i.get("type");"oauth2"===a&&i.get("flows").entrySeq().forEach(function(e){var t=(0,s.default)(e,2),a=t[0],u=t[1],c=(0,l.fromJS)({flow:a,authorizationUrl:u.get("authorizationUrl"),tokenUrl:u.get("tokenUrl"),scopes:u.get("scopes"),type:i.get("type")});n=n.push(new l.Map((0,o.default)({},r,c.filter(function(e){return void 0!==e}))))}),"http"!==a&&"apiKey"!==a||(n=n.push(new l.Map((0,o.default)({},r,i))))}),n}))},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=n(12),p=r(c),f=n(7),h=function(e){var t=e.callbacks,n=e.getComponent,r=n("OperationContainer",!0);if(!t)return s.default.createElement("span",null,"No callbacks");var i=t.map(function(t,n){return s.default.createElement("div",{key:n},s.default.createElement("h2",null,n),t.map(function(t,n){return s.default.createElement("div",{key:n},t.map(function(t,i){var a=(0,f.fromJS)({operation:t});return s.default.createElement(r,(0,o.default)({},e,{op:a,key:i,tag:"",method:i,path:n,allowTryItOut:!1}))}))}))});return s.default.createElement("div",null,i)};h.propTypes={getComponent:l.default.func.isRequired,callbacks:p.default.iterable.isRequired},t.default=h},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));_.call(r);var i=r.props,a=i.name,u=i.schema,l=r.getValue();return r.state={name:a,schema:u,value:l},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.name,n=e.authorized;return n&&n.getIn([t,"value"])}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.errSelectors,i=e.name,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("Markdown"),c=n("JumpToPath",!0),p=t.get("scheme"),f=this.getValue(),h=r.allErrors().filter(function(e){return e.get("authId")===i});if("basic"===p){var d=f?f.get("username"):null;return m.default.createElement("div",null,m.default.createElement("h4",null,m.default.createElement("code",null,i||t.get("name")),"  (http, Basic)",m.default.createElement(c,{path:["securityDefinitions",i]})),d&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(l,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Username:"),d?m.default.createElement("code",null," ",d," "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",required:"required",name:"username",onChange:this.onChange}))),m.default.createElement(a,null,m.default.createElement("label",null,"Password:"),d?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{required:"required",autoComplete:"new-password",name:"password",type:"password",onChange:this.onChange}))),h.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})}))}return"bearer"===p?m.default.createElement("div",null,m.default.createElement("h4",null,m.default.createElement("code",null,i||t.get("name")),"  (http, Bearer)",m.default.createElement(c,{path:["securityDefinitions",i]})),f&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(l,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Value:"),f?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",onChange:this.onChange}))),h.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})})):m.default.createElement("div",null,m.default.createElement("em",null,m.default.createElement("b",null,i)," HTTP authentication: unsupported or missing scheme"))}}]),t}(m.default.Component);y.propTypes={authorized:g.default.object,getComponent:g.default.func.isRequired,errSelectors:g.default.object.isRequired,schema:g.default.object.isRequired,name:g.default.string.isRequired,onChange:g.default.func};var _=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target,i=r.value,o=r.name,a=e.state.value||{};o?a[o]=i:a=i,e.setState({value:a},function(){return n(e.state)})}};t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(299),o=r(i),a=n(305),s=r(a),u=n(302),l=r(u),c=n(306),p=r(c),f=n(304),h=r(f),d=n(300),m=r(d),v=n(303),g=r(v);t.default={Callbacks:o.default,HttpAuth:m.default,RequestBody:s.default,Servers:p.default,RequestBodyEditor:h.default,OperationServers:g.default,operationLink:l.default}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){return"string"!=typeof t?"":t.split("\n").map(function(t,n){return n>0?Array(e+1).join(" ")+t:t}).join("\n")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(35),a=r(o),s=n(4),u=r(s),l=n(2),c=r(l),p=n(3),f=r(p),h=n(6),d=r(h),m=n(5),v=r(m),g=n(0),y=r(g),_=n(1),b=r(_),x=n(12),w=r(x),k=function(e){function t(){return(0,c.default)(this,t),(0,d.default)(this,(t.__proto__||(0,u.default)(t)).apply(this,arguments))}return(0,v.default)(t,e),(0,f.default)(t,[{key:"render",value:function(){var e=this.props,t=e.link,n=e.name,r=e.getComponent,o=r("Markdown"),s=t.get("operationId")||t.get("operationRef"),u=t.get("parameters")&&t.get("parameters").toJS(),l=t.get("description");return y.default.createElement("div",{style:{marginBottom:"1.5em"}},y.default.createElement("div",{style:{marginBottom:".5em"}},y.default.createElement("b",null,y.default.createElement("code",null,n)),l?y.default.createElement(o,{source:l}):null),y.default.createElement("pre",null,"Operation `",s,"`",y.default.createElement("br",null),y.default.createElement("br",null),"Parameters ",i(0,(0,a.default)(u,null,2))||"{}",y.default.createElement("br",null)))}}]),t}(g.Component);k.propTypes={getComponent:b.default.func.isRequired,link:w.default.orderedMap.isRequired,name:b.default.String},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var a=arguments.length,u=Array(a),c=0;c<a;c++)u[c]=arguments[c];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(u))),r.setSelectedServer=function(e){var t=r.props,n=t.path,i=t.method;return r.forceUpdate(),r.props.setSelectedServer(e,n+":"+i)},r.setServerVariableValue=function(e){var t=r.props,n=t.path,i=t.method;return r.forceUpdate(),r.props.setServerVariableValue((0,o.default)({},e,{namespace:n+":"+i}))},r.getSelectedServer=function(){var e=r.props,t=e.path,n=e.method;return r.props.getSelectedServer(t+":"+n)},r.getServerVariable=function(e,t){var n=r.props,i=n.path,o=n.method;return r.props.getServerVariable({namespace:i+":"+o,server:e},t)},r.getEffectiveServerValue=function(e){var t=r.props,n=t.path,i=t.method;return r.props.getEffectiveServerValue({server:e,namespace:n+":"+i})},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.operationServers,n=e.pathServers,r=e.getComponent;if(!t&&!n)return null;var i=r("Servers"),o=t||n,a=t?"operation":"path";return g.default.createElement("div",{className:"opblock-section operation-servers"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("div",{className:"tab-header"},g.default.createElement("h4",{className:"opblock-title"},"Servers"))),g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement("h4",{className:"message"},"These ",a,"-level options override the global server options."),g.default.createElement(i,{servers:o,currentServer:this.getSelectedServer(),setSelectedServer:this.setSelectedServer,setServerVariableValue:this.setServerVariableValue,getServerVariable:this.getServerVariable,getEffectiveServerValue:this.getEffectiveServerValue})))}}]),t}(g.default.Component);w.propTypes={path:_.default.string.isRequired,method:_.default.string.isRequired,operationServers:x.default.list,pathServers:x.default.list,setSelectedServer:_.default.func.isRequired,setServerVariableValue:_.default.func.isRequired,getSelectedServer:_.default.func.isRequired,getServerVariable:_.default.func.isRequired,getEffectiveServerValue:_.default.func.isRequired,getComponent:_.default.func.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(9),b=Function.prototype,x=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r.setValueToSample=function(e){r.onChange(r.sample(e))},r.sample=function(e){var t=r.props,n=t.requestBody,i=t.mediaType,o=n.getIn(["content",e||i,"schema"]).toJS();return(0,_.getSampleSchema)(o,e||i,{includeWriteOnly:!0})},r.onChange=function(e){r.setState({value:e}),r.props.onChange(e)},r.handleOnChange=function(e){var t=r.props.mediaType,n=/json/i.test(t),i=n?e.target.value.trim():e.target.value;r.onChange(i)},r.toggleIsEditBox=function(){return r.setState(function(e){return{isEditBox:!e.isEditBox}})},r.state={isEditBox:!1,value:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.setValueToSample.call(this)}},{key:"componentWillReceiveProps",value:function(e){this.props.mediaType!==e.mediaType&&this.setValueToSample(e.mediaType),!this.props.isExecute&&e.isExecute&&this.setState({isEditBox:!0})}},{key:"componentDidUpdate",value:function(e){this.props.requestBody!==e.requestBody&&this.setValueToSample(this.props.mediaType)}},{key:"render",value:function(){var e=this.props,t=e.isExecute,n=e.getComponent,r=n("Button"),i=n("TextArea"),o=n("highlightCode"),a=this.state,s=a.value,u=a.isEditBox;return m.default.createElement("div",{className:"body-param"},u&&t?m.default.createElement(i,{className:"body-param__text",value:s,onChange:this.handleOnChange}):s&&m.default.createElement(o,{className:"body-param__example",value:s}),m.default.createElement("div",{className:"body-param-options"},t?m.default.createElement("div",{className:"body-param-edit"},m.default.createElement(r,{className:u?"btn cancel body-param__example-edit":"btn edit body-param__example-edit",onClick:this.toggleIsEditBox},u?"Cancel":"Edit")):null))}}]),t}(d.PureComponent);x.propTypes={requestBody:g.default.object.isRequired,mediaType:g.default.string.isRequired,onChange:g.default.func,getComponent:g.default.func.isRequired,isExecute:g.default.bool,specSelectors:g.default.object.isRequired},x.defaultProps={mediaType:"application/json",requestBody:(0,y.fromJS)({}),onChange:b},t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(1),s=r(a),u=n(12),l=r(u),c=n(7),p=function(e){var t=e.requestBody,n=e.getComponent,r=e.getConfigs,i=e.specSelectors,a=e.contentType,s=e.isExecute,u=e.specPath,l=e.onChange,p=n("Markdown"),f=n("modelExample"),h=n("RequestBodyEditor"),d=t&&t.get("description")||null,m=t&&t.get("content")||new c.OrderedMap;a=a||m.keySeq().first();var v=m.get(a);return v?o.default.createElement("div",null,d&&o.default.createElement(p,{source:d}),o.default.createElement(f,{getComponent:n,getConfigs:r,specSelectors:i,expandDepth:1,isExecute:s,schema:v.get("schema"),specPath:u.push("content",a),example:o.default.createElement(h,{requestBody:t,onChange:l,mediaType:a,getComponent:n,isExecute:s,specSelectors:i})})):null};p.propTypes={requestBody:l.default.orderedMap.isRequired,getComponent:s.default.func.isRequired,getConfigs:s.default.func.isRequired,specSelectors:s.default.object.isRequired,contentType:s.default.string,isExecute:s.default.bool.isRequired,onChange:s.default.func.isRequired,specPath:s.default.array.isRequired},t.default=p},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(7),g=n(1),y=r(g),_=n(12),b=r(_),x=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onServerChange=function(e){r.setServer(e.target.value)},r.onServerVariableValueChange=function(e){var t=r.props,n=t.setServerVariableValue,i=t.currentServer,o=e.target.getAttribute("data-variable"),a=e.target.value;"function"==typeof n&&n({server:i,key:o,val:a})},r.setServer=function(e){(0,r.props.setSelectedServer)(e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){var e=this.props,t=e.servers;e.currentServer||this.setServer(t.first().get("url"))}},{key:"componentWillReceiveProps",value:function(e){var t=this.props,n=t.servers,r=t.setServerVariableValue,i=t.getServerVariable;if(this.props.currentServer!==e.currentServer){var o=n.find(function(t){return t.get("url")===e.currentServer});if(!o)return this.setServer(n.first().get("url"));(o.get("variables")||(0,v.OrderedMap)()).map(function(t,n){i(e.currentServer,n)||r({server:e.currentServer,key:n,val:t.get("default")||""})})}}},{key:"render",value:function(){var e=this,t=this.props,n=t.servers,r=t.currentServer,i=t.getServerVariable,o=t.getEffectiveServerValue,a=n.find(function(e){return e.get("url")===r})||(0,v.OrderedMap)(),s=a.get("variables")||(0,v.OrderedMap)(),u=0!==s.size;return m.default.createElement("div",{className:"servers"},m.default.createElement("label",{htmlFor:"servers"},m.default.createElement("select",{onChange:this.onServerChange},n.valueSeq().map(function(e){return m.default.createElement("option",{value:e.get("url"),key:e.get("url")},e.get("url"))}).toArray())),u?m.default.createElement("div",null,m.default.createElement("div",{className:"computed-url"},"Computed URL:",m.default.createElement("code",null,o(r))),m.default.createElement("h4",null,"Server variables"),m.default.createElement("table",null,m.default.createElement("tbody",null,s.map(function(t,n){return m.default.createElement("tr",{key:n},m.default.createElement("td",null,n),m.default.createElement("td",null,t.get("enum")?m.default.createElement("select",{"data-variable":n,onChange:e.onServerVariableValueChange},t.get("enum").map(function(e){return m.default.createElement("option",{selected:e===i(r,n),key:e,value:e},e)})):m.default.createElement("input",{type:"text",value:i(r,n)||"",onChange:e.onServerVariableValueChange,"data-variable":n})))})))):null)}}]),t}(m.default.Component);x.propTypes={servers:b.default.list.isRequired,currentServer:y.default.string.isRequired,setSelectedServer:y.default.func.isRequired,setServerVariableValue:y.default.func.isRequired,getServerVariable:y.default.func.isRequired,getEffectiveServerValue:y.default.func.isRequired},t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{components:f.default,wrapComponents:d.default,statePlugins:{spec:{wrapSelectors:a,selectors:c},auth:{wrapSelectors:u},oas3:{actions:v,reducers:b.default,selectors:y}}}};var o=n(311),a=i(o),s=n(298),u=i(s),l=n(310),c=i(l),p=n(301),f=r(p),h=n(313),d=r(h),m=n(171),v=i(m),g=n(309),y=i(g),_=n(308),b=r(_)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(18),u=r(s),l=n(171);t.default=(i={},(0,a.default)(i,l.UPDATE_SELECTED_SERVER,function(e,t){var n=t.payload,r=n.selectedServerUrl,i=n.namespace,o=i?[i,"selectedServer"]:["selectedServer"];return e.setIn(o,r)}),(0,a.default)(i,l.UPDATE_REQUEST_BODY_VALUE,function(e,t){var n=t.payload,r=n.value,i=n.pathMethod,o=(0,u.default)(i,2),a=o[0],s=o[1];return e.setIn(["requestData",a,s,"bodyValue"],r)}),(0,a.default)(i,l.UPDATE_REQUEST_CONTENT_TYPE,function(e,t){var n=t.payload,r=n.value,i=n.pathMethod,o=(0,u.default)(i,2),a=o[0],s=o[1];return e.setIn(["requestData",a,s,"requestContentType"],r)}),(0,a.default)(i,l.UPDATE_RESPONSE_CONTENT_TYPE,function(e,t){var n=t.payload,r=n.value,i=n.path,o=n.method;return e.setIn(["requestData",i,o,"responseContentType"],r)}),(0,a.default)(i,l.UPDATE_SERVER_VARIABLE_VALUE,function(e,t){var n=t.payload,r=n.server,i=n.namespace,o=n.key,a=n.val,s=i?[i,"serverVariableValues",r,o]:["serverVariableValues",r,o];return e.setIn(s,a)}),i)},function(e,t,n){"use strict";function r(e){return function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return function(t){var r=t.getSystem().specSelectors.specJson();return(0,o.isOAS3)(r)?e.apply(void 0,n):null}}}Object.defineProperty(t,"__esModule",{value:!0}),t.serverEffectiveValue=t.serverVariables=t.serverVariableValue=t.responseContentType=t.requestContentType=t.requestBodyValue=t.selectedServer=void 0;var i=n(7),o=n(34);t.selectedServer=r(function(e,t){var n=t?[t,"selectedServer"]:["selectedServer"];return e.getIn(n)||""}),t.requestBodyValue=r(function(e,t,n){return e.getIn(["requestData",t,n,"bodyValue"])||null}),t.requestContentType=r(function(e,t,n){return e.getIn(["requestData",t,n,"requestContentType"])||null}),t.responseContentType=r(function(e,t,n){return e.getIn(["requestData",t,n,"responseContentType"])||null}),t.serverVariableValue=r(function(e,t,n){var r=void 0;if("string"!=typeof t){var i=t.server,o=t.namespace;r=o?[o,"serverVariableValues",i,n]:["serverVariableValues",i,n]}else{r=["serverVariableValues",t,n]}return e.getIn(r)||null}),t.serverVariables=r(function(e,t){var n=void 0;if("string"!=typeof t){var r=t.server,o=t.namespace;n=o?[o,"serverVariableValues",r]:["serverVariableValues",r]}else{n=["serverVariableValues",t]}return e.getIn(n)||(0,i.OrderedMap)()}),t.serverEffectiveValue=r(function(e,t){var n,r;if("string"!=typeof t){var o=t.server,a=t.namespace;r=o,n=a?e.getIn([a,"serverVariableValues",r]):e.getIn(["serverVariableValues",r])}else r=t,n=e.getIn(["serverVariableValues",r]);n=n||(0,i.OrderedMap)();var s=r;return n.map(function(e,t){s=s.replace(new RegExp("{"+t+"}","g"),e)}),s})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.isSwagger2=t.servers=void 0;var r=n(60),i=n(7),o=n(34),a=function(e){return e||(0,i.Map)()},s=(0,r.createSelector)(a,function(e){return e.get("json",(0,i.Map)())}),u=(0,r.createSelector)(a,function(e){return e.get("resolved",(0,i.Map)())}),l=function(e){var t=u(e);return t.count()<1&&(t=s(e)),t};t.servers=function(e){return function(){return function(t){for(var n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];var a=t.getSystem().specSelectors.specJson();return(0,o.isOAS3)(a)?e.apply(void 0,r):null}}}((0,r.createSelector)(l,function(e){return e.getIn(["servers"])||(0,i.Map)()})),t.isSwagger2=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,o.isSwagger2)(e)}}},function(e,t,n){"use strict";function r(e){return function(t,n){return function(){var r=n.getSystem().specSelectors.specJson();return(0,a.isOAS3)(r)?e.apply(void 0,arguments):t.apply(void 0,arguments)}}}Object.defineProperty(t,"__esModule",{value:!0}),t.isSwagger2=t.isOAS3=t.servers=t.schemes=t.produces=t.consumes=t.basePath=t.host=t.securityDefinitions=t.hasHost=t.definitions=void 0;var i=n(60),o=n(7),a=n(34),s=function(e){return e||(0,o.Map)()},u=(0,i.createSelector)(function(){return null}),l=r(u),c=(0,i.createSelector)(s,function(e){return e.get("json",(0,o.Map)())}),p=(0,i.createSelector)(s,function(e){return e.get("resolved",(0,o.Map)())}),f=function(e){var t=p(e);return t.count()<1&&(t=c(e)),t};t.definitions=r((0,i.createSelector)(f,function(e){return e.getIn(["components","schemas"])||(0,o.Map)()})),t.hasHost=r(function(e){return f(e).hasIn(["servers",0])}),t.securityDefinitions=r((0,i.createSelector)(f,function(e){return e.getIn(["components","securitySchemes"])||null})),t.host=l,t.basePath=l,t.consumes=l,t.produces=l,t.schemes=l,t.servers=r((0,i.createSelector)(f,function(e){return e.getIn(["servers"])||(0,o.Map)()})),t.isOAS3=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,a.isOAS3)(o.Map.isMap(e)?e:(0,o.Map)())}},t.isSwagger2=function(e,t){return function(){var e=t.getSystem().specSelectors.specJson();return(0,a.isSwagger2)(o.Map.isMap(e)?e:(0,o.Map)())}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(96),o=r(i),a=n(0),s=r(a),u=n(34);t.default=(0,u.OAS3ComponentWrapFactory)(function(e){var t=e.Ori,n=(0,o.default)(e,["Ori"]),r=n.schema,i=n.getComponent,a=n.errSelectors,u=n.authorized,l=n.onAuthChange,c=n.name,p=i("HttpAuth");return"http"===r.get("type")?s.default.createElement(p,{key:c,schema:r,name:c,errSelectors:a,authorized:u,getComponent:i,onChange:l}):s.default.createElement(t,n)})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(314),o=r(i),a=n(312),s=r(a),u=n(317),l=r(u),c=n(318),p=r(c),f=n(316),h=r(f),d=n(315),m=r(d);t.default={Markdown:o.default,AuthItem:s.default,parameters:l.default,VersionStamp:p.default,model:m.default,onlineValidatorBadge:h.default}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Markdown=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=n(1080),l=r(u),c=n(577),p=n(34),f=n(270),h=t.Markdown=function(e){var t=e.source;if(t){var n=new c.Parser,r=new c.HtmlRenderer,i=r.render(n.parse(t||"")),a=(0,f.sanitizer)(i);return t&&i&&a?o.default.createElement(l.default,{source:a,className:"renderedMarkdown"}):null}return null};h.propTypes={source:s.default.string},t.default=(0,p.OAS3ComponentWrapFactory)(h)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(34),x=n(269),w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getConfigs,n=e.schema,r=["model-box"],i=!0===n.get("deprecated"),a=null;return i&&(r.push("deprecated"),a=g.default.createElement("span",{className:"model-deprecated-warning"},"Deprecated:")),g.default.createElement("div",{className:r.join(" ")},a,g.default.createElement(x.Model,(0,o.default)({},this.props,{getConfigs:t,depth:1,expandDepth:this.props.expandDepth||0})))}}]),t}(v.Component);w.propTypes={schema:_.default.object.isRequired,name:_.default.string,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,expandDepth:_.default.number},t.default=(0,b.OAS3ComponentWrapFactory)(w)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(34);t.default=(0,r.OAS3ComponentWrapFactory)(function(){return null})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(97),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(7),x=r(b),w=n(12),k=r(w),E=n(34),S=function(e,t){return e.valueSeq().filter(x.default.Map.isMap).map(t)},C=function(e){function t(e){(0,l.default)(this,t);var n=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e));return n.onChange=function(e,t,r){var i=n.props;(0,i.specActions.changeParam)(i.onChangeKey,e.get("name"),e.get("in"),t,r)},n.onChangeConsumesWrapper=function(e){var t=n.props;(0,t.specActions.changeConsumesValue)(t.onChangeKey,e)},n.toggleTab=function(e){return"parameters"===e?n.setState({parametersVisible:!0,callbackVisible:!1}):"callbacks"===e?n.setState({callbackVisible:!0,parametersVisible:!1}):void 0},n.state={callbackVisible:!1,parametersVisible:!0},n}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.onTryoutClick,r=t.onCancelClick,i=t.parameters,a=t.allowTryItOut,s=t.tryItOutEnabled,u=t.fn,l=t.getComponent,c=t.getConfigs,p=t.specSelectors,f=t.oas3Actions,h=t.oas3Selectors,d=t.pathMethod,m=t.specPath,v=t.operation,y=l("parameterRow"),_=l("TryItOutButton"),x=l("contentType"),w=l("Callbacks",!0),k=l("RequestBody",!0),E=s&&a,C=p.isOAS3,A=v.get("requestBody"),D=m.slice(0,-1).push("requestBody");return g.default.createElement("div",{className:"opblock-section"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("div",{className:"tab-header"},g.default.createElement("div",{onClick:function(){return e.toggleTab("parameters")},className:"tab-item "+(this.state.parametersVisible&&"active")},g.default.createElement("h4",{className:"opblock-title"},g.default.createElement("span",null,"Parameters"))),v.get("callbacks")?g.default.createElement("div",{onClick:function(){return e.toggleTab("callbacks")},className:"tab-item "+(this.state.callbackVisible&&"active")},g.default.createElement("h4",{className:"opblock-title"},g.default.createElement("span",null,"Callbacks"))):null),a?g.default.createElement(_,{enabled:s,onCancelClick:r,onTryoutClick:n}):null),this.state.parametersVisible?g.default.createElement("div",{className:"parameters-container"},i.count()?g.default.createElement("div",{className:"table-container"},g.default.createElement("table",{className:"parameters"},g.default.createElement("thead",null,g.default.createElement("tr",null,g.default.createElement("th",{className:"col col_header parameters-col_name"},"Name"),g.default.createElement("th",{className:"col col_header parameters-col_description"},"Description"))),g.default.createElement("tbody",null,S(i,function(t,n){return g.default.createElement(y,{fn:u,getComponent:l,specPath:m.push(n),getConfigs:c,param:t,key:t.get("name"),onChange:e.onChange,onChangeConsumes:e.onChangeConsumesWrapper,specSelectors:p,pathMethod:d,isExecute:E})}).toArray()))):g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement("p",null,"No parameters"))):"",this.state.callbackVisible?g.default.createElement("div",{className:"callbacks-container opblock-description-wrapper"},g.default.createElement(w,{callbacks:(0,b.Map)(v.get("callbacks"))})):"",C()&&A&&this.state.parametersVisible&&g.default.createElement("div",{className:"opblock-section"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("h4",{className:"opblock-title parameter__name "+(A.get("required")&&"required")},"Request body"),g.default.createElement("label",null,g.default.createElement(x,{value:h.requestContentType.apply(h,(0,o.default)(d)),contentTypes:A.get("content").keySeq(),onChange:function(e){f.setRequestContentType({value:e,pathMethod:d})},className:"body-param-content-type"}))),g.default.createElement("div",{className:"opblock-description-wrapper"},g.default.createElement(k,{specPath:D,requestBody:A,isExecute:E,onChange:function(e){f.setRequestBodyValue({value:e,pathMethod:d})},contentType:h.requestContentType.apply(h,(0,o.default)(d))}))))}}]),t}(v.Component);C.propTypes={parameters:k.default.list.isRequired,specActions:_.default.object.isRequired,operation:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,oas3Actions:_.default.object.isRequired,oas3Selectors:_.default.object.isRequired,fn:_.default.object.isRequired,tryItOutEnabled:_.default.bool,allowTryItOut:_.default.bool,specPath:k.default.list.isRequired,onTryoutClick:_.default.func,onCancelClick:_.default.func,onChangeKey:_.default.array,pathMethod:_.default.array.isRequired},C.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,tryItOutEnabled:!1,allowTryItOut:!0,onChangeKey:[]},t.default=(0,E.OAS3ComponentWrapFactory)(C)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(0),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(34);t.default=(0,o.OAS3ComponentWrapFactory)(function(e){var t=e.Ori;return i.default.createElement("span",null,i.default.createElement(t,e),i.default.createElement("small",{style:{backgroundColor:"#89bf04"}},i.default.createElement("pre",{className:"version"},"OAS3")))})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:i}};var r=n(172),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{statePlugins:{spec:{wrapActions:p,reducers:o.default,actions:s,selectors:l}}}};var i=n(321),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(173),s=r(a),u=n(322),l=r(u),c=n(323),p=r(c)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(36),a=r(o),s=n(30),u=r(s),l=n(97),c=r(l),p=n(7),f=n(9),h=n(46),d=r(h),m=n(173);t.default=(i={},(0,a.default)(i,m.UPDATE_SPEC,function(e,t){return"string"==typeof t.payload?e.set("spec",t.payload):e}),(0,a.default)(i,m.UPDATE_URL,function(e,t){return e.set("url",t.payload+"")}),(0,a.default)(i,m.UPDATE_JSON,function(e,t){return e.set("json",(0,f.fromJSOrdered)(t.payload))}),(0,a.default)(i,m.UPDATE_RESOLVED,function(e,t){return e.setIn(["resolved"],(0,f.fromJSOrdered)(t.payload))}),(0,a.default)(i,m.UPDATE_PARAM,function(e,t){var n=t.payload,r=n.path,i=n.paramName,o=n.paramIn,a=n.value,s=n.isXml;return e.updateIn(["resolved","paths"].concat((0,c.default)(r),["parameters"]),(0,p.fromJS)([]),function(e){var t=e.findIndex(function(e){return e.get("name")===i&&e.get("in")===o});return a instanceof d.default.File||(a=(0,f.fromJSOrdered)(a)),e.setIn([t,s?"value_xml":"value"],a)})}),(0,a.default)(i,m.VALIDATE_PARAMS,function(e,t){var n=t.payload,r=n.pathMethod,i=n.isOAS3,o=e.getIn(["meta","paths"].concat((0,c.default)(r)),(0,p.fromJS)({})),a=/xml/i.test(o.get("consumes_value"));return e.updateIn(["resolved","paths"].concat((0,c.default)(r),["parameters"]),(0,p.fromJS)([]),function(e){return e.withMutations(function(e){for(var t=0,n=e.count();t<n;t++){var r=(0,f.validateParam)(e.get(t),a,i);e.setIn([t,"errors"],(0,p.fromJS)(r))}})})}),(0,a.default)(i,m.CLEAR_VALIDATE_PARAMS,function(e,t){var n=t.payload.pathMethod;return e.updateIn(["resolved","paths"].concat((0,c.default)(n),["parameters"]),(0,p.fromJS)([]),function(e){return e.withMutations(function(e){for(var t=0,n=e.count();t<n;t++)e.setIn([t,"errors"],(0,p.fromJS)([]))})})}),(0,a.default)(i,m.SET_RESPONSE,function(e,t){var n=t.payload,r=n.res,i=n.path,o=n.method,a=void 0;a=r.error?(0,u.default)({error:!0,name:r.err.name,message:r.err.message,statusCode:r.err.statusCode},r.err.response):r,a.headers=a.headers||{};var s=e.setIn(["responses",i,o],(0,f.fromJSOrdered)(a));return d.default.Blob&&r.data instanceof d.default.Blob&&(s=s.setIn(["responses",i,o,"text"],r.data)),s}),(0,a.default)(i,m.SET_REQUEST,function(e,t){var n=t.payload,r=n.req,i=n.path,o=n.method;return e.setIn(["requests",i,o],(0,f.fromJSOrdered)(r))}),(0,a.default)(i,m.SET_MUTATED_REQUEST,function(e,t){var n=t.payload,r=n.req,i=n.path,o=n.method;return e.setIn(["mutatedRequests",i,o],(0,f.fromJSOrdered)(r))}),(0,a.default)(i,m.UPDATE_OPERATION_META_VALUE,function(e,t){var n=t.payload,r=n.path,i=n.value,o=n.key,a=["resolved","paths"].concat((0,c.default)(r)),s=["meta","paths"].concat((0,c.default)(r));return e.getIn(a)?e.setIn([].concat((0,c.default)(s),[o]),(0,p.fromJS)(i)):e}),(0,a.default)(i,m.CLEAR_RESPONSE,function(e,t){var n=t.payload,r=n.path,i=n.method;return e.deleteIn(["responses",r,i])}),(0,a.default)(i,m.CLEAR_REQUEST,function(e,t){var n=t.payload,r=n.path,i=n.method;return e.deleteIn(["requests",r,i])}),(0,a.default)(i,m.SET_SCHEME,function(e,t){var n=t.payload,r=n.scheme,i=n.path,o=n.method;return i&&o?e.setIn(["scheme",i,o],r):i||o?void 0:e.setIn(["scheme","_defaultScheme"],r)}),i)},function(e,t,n){"use strict";function r(e,t,n,r){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])).find(function(e){return m.Map.isMap(e)&&e.get("name")===n&&e.get("in")===r})||(0,m.Map)()}function i(e,t,n){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])).reduce(function(e,t){var r=n&&"body"===t.get("in")?t.get("value_xml"):t.get("value");return e.set(t.get("in")+"."+t.get("name"),r)},(0,m.fromJS)({}))}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(m.List.isList(e))return e.some(function(e){return m.Map.isMap(e)&&e.get("in")===t})}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(m.List.isList(e))return e.some(function(e){return m.Map.isMap(e)&&e.get("type")===t})}function s(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t)),(0,m.fromJS)({})),r=e.getIn(["meta","paths"].concat((0,f.default)(t)),(0,m.fromJS)({})),i=l(e,t),o=n.get("parameters")||new m.List,s=r.get("consumes_value")?r.get("consumes_value"):a(o,"file")?"multipart/form-data":a(o,"formData")?"application/x-www-form-urlencoded":void 0;return(0,m.fromJS)({requestContentType:s,responseContentType:i})}function u(e,t){return t=t||[],_(e).getIn(["paths"].concat((0,f.default)(t),["consumes"]),(0,m.fromJS)({}))}function l(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t)),null);if(null!==n){var r=e.getIn(["meta","paths"].concat((0,f.default)(t),["produces_value"]),null),i=n.getIn(["produces",0],null);return r||i||"application/json"}}function c(e){return m.Map.isMap(e)?e:new m.Map}Object.defineProperty(t,"__esModule",{value:!0}),t.validateBeforeExecute=t.canExecuteScheme=t.operationScheme=t.hasHost=t.allowTryItOutFor=t.mutatedRequestFor=t.requestFor=t.responseFor=t.mutatedRequests=t.requests=t.responses=t.taggedOperations=t.operationsWithTags=t.tagDetails=t.tags=t.operationsWithRootInherited=t.schemes=t.host=t.basePath=t.definitions=t.findDefinition=t.securityDefinitions=t.security=t.produces=t.consumes=t.operations=t.paths=t.semver=t.version=t.externalDocs=t.info=t.isOAS3=t.spec=t.specResolved=t.specJson=t.specSource=t.specStr=t.url=t.lastError=void 0;var p=n(97),f=function(e){return e&&e.__esModule?e:{default:e}}(p);t.getParameter=r,t.parameterValues=i,t.parametersIncludeIn=o,t.parametersIncludeType=a,t.contentTypeValues=s,t.operationConsumes=u,t.currentProducesFor=l;var h=n(60),d=n(9),m=n(7),v=["get","put","post","delete","options","head","patch","trace"],g=function(e){return e||(0,m.Map)()},y=(t.lastError=(0,h.createSelector)(g,function(e){return e.get("lastError")}),t.url=(0,h.createSelector)(g,function(e){return e.get("url")}),t.specStr=(0,h.createSelector)(g,function(e){return e.get("spec")||""}),t.specSource=(0,h.createSelector)(g,function(e){return e.get("specSource")||"not-editor"}),t.specJson=(0,h.createSelector)(g,function(e){return e.get("json",(0,m.Map)())}),t.specResolved=(0,h.createSelector)(g,function(e){return e.get("resolved",(0,m.Map)())})),_=t.spec=function(e){return y(e)},b=(t.isOAS3=(0,h.createSelector)(_,function(){return!1}),t.info=(0,h.createSelector)(_,function(e){return c(e&&e.get("info"))})),x=(t.externalDocs=(0,h.createSelector)(_,function(e){return c(e&&e.get("externalDocs"))}),t.version=(0,h.createSelector)(b,function(e){return e&&e.get("version")})),w=(t.semver=(0,h.createSelector)(x,function(e){return/v?([0-9]*)\.([0-9]*)\.([0-9]*)/i.exec(e).slice(1)}),t.paths=(0,h.createSelector)(_,function(e){return e.get("paths")})),k=t.operations=(0,h.createSelector)(w,function(e){if(!e||e.size<1)return(0,m.List)();var t=(0,m.List)();return e&&e.forEach?(e.forEach(function(e,n){if(!e||!e.forEach)return{};e.forEach(function(e,r){v.indexOf(r)<0||(t=t.push((0,m.fromJS)({path:n,method:r,operation:e,id:r+"-"+n})))})}),t):(0,m.List)()}),E=t.consumes=(0,h.createSelector)(_,function(e){return(0,m.Set)(e.get("consumes"))}),S=t.produces=(0,h.createSelector)(_,function(e){return(0,m.Set)(e.get("produces"))}),C=(t.security=(0,h.createSelector)(_,function(e){return e.get("security",(0,m.List)())}),t.securityDefinitions=(0,h.createSelector)(_,function(e){return e.get("securityDefinitions")}),t.findDefinition=function(e,t){return y(e).getIn(["definitions",t],null)},t.definitions=(0,h.createSelector)(_,function(e){return e.get("definitions")||(0,m.Map)()}),t.basePath=(0,h.createSelector)(_,function(e){return e.get("basePath")}),t.host=(0,h.createSelector)(_,function(e){return e.get("host")}),t.schemes=(0,h.createSelector)(_,function(e){return e.get("schemes",(0,m.Map)())}),t.operationsWithRootInherited=(0,h.createSelector)(k,E,S,function(e,t,n){return e.map(function(e){return e.update("operation",function(e){if(e){if(!m.Map.isMap(e))return;return e.withMutations(function(e){return e.get("consumes")||e.update("consumes",function(e){return(0,m.Set)(e).merge(t)}),e.get("produces")||e.update("produces",function(e){return(0,m.Set)(e).merge(n)}),e})}return(0,m.Map)()})})})),A=t.tags=(0,h.createSelector)(_,function(e){return e.get("tags",(0,m.List)())}),D=t.tagDetails=function(e,t){return(A(e)||(0,m.List)()).filter(m.Map.isMap).find(function(e){return e.get("name")===t},(0,m.Map)())},O=t.operationsWithTags=(0,h.createSelector)(C,A,function(e,t){return e.reduce(function(e,t){var n=(0,m.Set)(t.getIn(["operation","tags"]));return n.count()<1?e.update("default",(0,m.List)(),function(e){return e.push(t)}):n.reduce(function(e,n){return e.update(n,(0,m.List)(),function(e){return e.push(t)})},e)},t.reduce(function(e,t){return e.set(t.get("name"),(0,m.List)())},(0,m.OrderedMap)()))}),M=(t.taggedOperations=function(e){return function(t){var n=t.getConfigs,r=n(),i=r.tagsSorter,o=r.operationsSorter;return O(e).sortBy(function(e,t){return t},function(e,t){var n="function"==typeof i?i:d.sorters.tagsSorter[i];return n?n(e,t):null}).map(function(t,n){var r="function"==typeof o?o:d.sorters.operationsSorter[o],i=r?t.sort(r):t;return(0,m.Map)({tagDetails:D(e,n),operations:i})})}},t.responses=(0,h.createSelector)(g,function(e){return e.get("responses",(0,m.Map)())})),T=t.requests=(0,h.createSelector)(g,function(e){return e.get("requests",(0,m.Map)())}),P=t.mutatedRequests=(0,h.createSelector)(g,function(e){return e.get("mutatedRequests",(0,m.Map)())}),I=(t.responseFor=function(e,t,n){return M(e).getIn([t,n],null)},t.requestFor=function(e,t,n){return T(e).getIn([t,n],null)},t.mutatedRequestFor=function(e,t,n){return P(e).getIn([t,n],null)},t.allowTryItOutFor=function(){return!0},t.hasHost=(0,h.createSelector)(_,function(e){var t=e.get("host");return"string"==typeof t&&t.length>0&&"/"!==t[0]}),t.operationScheme=function(e,t,n){var r=e.get("url"),i=r.match(/^([a-z][a-z0-9+\-.]*):/),o=Array.isArray(i)?i[1]:null;return e.getIn(["scheme",t,n])||e.getIn(["scheme","_defaultScheme"])||o||""});t.canExecuteScheme=function(e,t,n){return["http","https"].indexOf(I(e,t,n))>-1},t.validateBeforeExecute=function(e,t){t=t||[];var n=_(e).getIn(["paths"].concat((0,f.default)(t),["parameters"]),(0,m.fromJS)([])),r=!0;return n.forEach(function(e){var t=e.get("errors");t&&t.count()&&(r=!1)}),r}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.updateSpec=function(e,t){var n=t.specActions;return function(){e.apply(void 0,arguments),n.parseToJson.apply(n,arguments)}},t.updateJsonSpec=function(e,t){var n=t.specActions;return function(){e.apply(void 0,arguments),n.resolveSpec.apply(n,arguments)}},t.executeRequest=function(e,t){var n=t.specActions;return function(t){return n.logRequest(t),e(t)}},t.validateParams=function(e,t){var n=t.specSelectors;return function(t){return e(t,n.isOAS3())}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(1093),_=r(y),b=["split-pane-mode"],x="left",w="right",k="both",E=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.initializeComponent=function(e){r.splitPane=e},r.onDragFinished=function(){var e=r.props,t=e.threshold,n=e.layoutActions,i=r.splitPane.state,o=i.position,a=i.draggedSize;r.draggedSize=a;var s=o<=t,u=a<=t;n.changeMode(b,s?w:u?x:k)},r.sizeFromMode=function(e,t){return e===x?(r.draggedSize=null,"0px"):e===w?(r.draggedSize=null,"100%"):r.draggedSize||t},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.children,n=e.layoutSelectors,r=n.whatMode(b),i=r===w?m.default.createElement("noscript",null):t[0],o=r===x?m.default.createElement("noscript",null):t[1],a=this.sizeFromMode(r,"50%");return m.default.createElement(_.default,{disabledClass:"",ref:this.initializeComponent,split:"vertical",defaultSize:"50%",primary:"second",minSize:0,size:a,onDragFinished:this.onDragFinished,allowResize:r!==x&&r!==w,resizerStyle:{flex:"0 0 auto",position:"relative"}},i,o)}}]),t}(m.default.Component);E.propTypes={threshold:g.default.number,children:g.default.array,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired},E.defaultProps={threshold:100,children:[]},t.default=E},function(e,t,n){"use strict";function r(){return{components:{SplitPaneMode:o.default}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(324),o=function(e){return e&&e.__esModule?e:{default:e}}(i)},function(e,t,n){"use strict";var r=n(495),i=function(e){return e&&e.__esModule?e:{default:e}}(r);e.exports=function(e){var t=e.configs;return{fn:{fetch:i.default.makeHttp(t.preFetch,t.postFetch),buildRequest:i.default.buildRequest,execute:i.default.execute,resolve:i.default.resolve,serializeRes:i.default.serializeRes,opId:i.default.helpers.opId}}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){return{fn:{shallowEqualKeys:r.shallowEqualKeys}}};var r=n(9)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){var t=e.getComponents,n=e.getStore,r=e.getSystem,a=i.getComponent,s=i.render,u=i.makeMappedContainer,l=(0,o.memoize)(a.bind(null,r,n,t));return{rootInjects:{getComponent:l,makeMappedContainer:(0,o.memoize)(u.bind(null,r,n,l,t)),render:s.bind(null,r,n,a,t)}}};var r=n(329),i=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(r),o=n(9)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.getComponent=t.render=t.makeMappedContainer=void 0;var i=n(48),o=r(i),a=n(47),s=r(a),u=n(30),l=r(u),c=n(21),p=r(c),f=n(4),h=r(f),d=n(2),m=r(d),v=n(3),g=r(v),y=n(6),_=r(y),b=n(5),x=r(b),w=n(0),k=r(w),E=n(449),S=r(E),C=n(1090),A=n(950),D=r(A),O=function(e,t){return function(n){function r(){return(0,m.default)(this,r),(0,_.default)(this,(r.__proto__||(0,h.default)(r)).apply(this,arguments))}return(0,x.default)(r,n),(0,g.default)(r,[{key:"render",value:function(){return k.default.createElement(t,(0,p.default)({},e(),this.props,this.context))}}]),r}(w.Component)},M=function(e,t){return function(n){function r(){return(0,m.default)(this,r),(0,_.default)(this,(r.__proto__||(0,h.default)(r)).apply(this,arguments))}return(0,x.default)(r,n),(0,g.default)(r,[{key:"render",value:function(){return k.default.createElement(C.Provider,{store:e},k.default.createElement(t,(0,p.default)({},this.props,this.context)))}}]),r}(w.Component)},T=function(e,t,n){var r=function(n,r){var i=(0,l.default)({},r,e());return(t.prototype.mapStateToProps||function(e){return{state:e}})(n,i)},i=O(e,t),o=(0,C.connect)(r)(i);return n?M(n,o):o},P=function(e,t,n,r){for(var i in t){var o=t[i];"function"==typeof o&&o(n[i],r[i],e())}},I=(t.makeMappedContainer=function(e,t,n,r,i,o){return function(t){function r(t,n){(0,m.default)(this,r);var i=(0,_.default)(this,(r.__proto__||(0,h.default)(r)).call(this,t,n));return P(e,o,t,{}),i}return(0,x.default)(r,t),(0,g.default)(r,[{key:"componentWillReceiveProps",value:function(t){P(e,o,t,this.props)}},{key:"render",value:function(){var e=(0,D.default)(this.props,o?(0,s.default)(o):[]),t=n(i,"root");return k.default.createElement(t,e)}}]),r}(w.Component)},t.render=function(e,t,n,r,i){var o=n(e,t,r,"App","root");S.default.render(k.default.createElement(o,null),i)},function(e){return function(t){function n(){return(0,m.default)(this,n),(0,_.default)(this,(n.__proto__||(0,h.default)(n)).apply(this,arguments))}return(0,x.default)(n,t),(0,g.default)(n,[{key:"render",value:function(){return e(this.props)}}]),n}(w.Component)}),R=function(e){var t=e.name;return k.default.createElement("div",{style:{padding:"1em",color:"#aaa"}},"😱 ",k.default.createElement("i",null,"Could not render ","t"===t?"this component":t,", see the console."))},j=function(e){var t=function(e){return!(e.prototype&&e.prototype.isReactComponent)}(e)?I(e):e,n=t.prototype.render;return t.prototype.render=function(){try{for(var e=arguments.length,r=Array(e),i=0;i<e;i++)r[i]=arguments[i];return n.apply(this,r)}catch(e){return console.error(e),k.default.createElement(R,{error:e,name:t.name})}},t};t.getComponent=function(e,t,n,r,i){if("string"!=typeof r)throw new TypeError("Need a string, to fetch a component. Was given a "+(void 0===r?"undefined":(0,o.default)(r)));var a=n(r);return a?i?"root"===i?T(e,a,t()):T(e,j(a)):j(a):(e().log.warn("Could not find component",r),null)}},function(e,t,n){e.exports={default:n(590),__esModule:!0}},function(e,t,n){e.exports={default:n(591),__esModule:!0}},function(e,t,n){e.exports={default:n(595),__esModule:!0}},function(e,t,n){"use strict";function r(){}function i(e){var t,n,r=e.walker();for(this.buffer="",this.lastOut="\n";t=r.next();)n=t.node.type,this[n]&&this[n](t.node,t.entering);return this.buffer}function o(e){this.buffer+=e,this.lastOut=e}function a(){"\n"!==this.lastOut&&this.lit("\n")}function s(e){this.lit(e)}function u(e){return e}r.prototype.render=i,r.prototype.out=s,r.prototype.lit=o,r.prototype.cr=a,r.prototype.esc=u,e.exports=r},function(e,t,n){var r=n(24).document;e.exports=r&&r.documentElement},function(e,t,n){e.exports=!n(49)&&!n(54)(function(){return 7!=Object.defineProperty(n(179)("div"),"a",{get:function(){return 7}}).a})},function(e,t,n){var r=n(74),i=n(22)("iterator"),o=Array.prototype;e.exports=function(e){return void 0!==e&&(r.Array===e||o[i]===e)}},function(e,t,n){var r=n(99);e.exports=Array.isArray||function(e){return"Array"==r(e)}},function(e,t,n){var r=n(37);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(t){var o=e.return;throw void 0!==o&&r(o.call(e)),t}}},function(e,t,n){"use strict";var r=n(130),i=n(23),o=n(186),a=n(56),s=n(55),u=n(74),l=n(608),c=n(102),p=n(344),f=n(22)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,t,n,m,v,g,y){l(n,t,m);var _,b,x,w=function(e){if(!h&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",E="values"==v,S=!1,C=e.prototype,A=C[f]||C["@@iterator"]||v&&C[v],D=!h&&A||w(v),O=v?E?w("entries"):D:void 0,M="Array"==t?C.entries||A:A;if(M&&(x=p(M.call(new e)))!==Object.prototype&&x.next&&(c(x,k,!0),r||s(x,f)||a(x,f,d)),E&&A&&"values"!==A.name&&(S=!0,D=function(){return A.call(this)}),r&&!y||!h&&!S&&C[f]||a(C,f,D),u[t]=D,u[k]=d,v)if(_={values:E?D:w("values"),keys:g?D:w("keys"),entries:O},y)for(b in _)b in C||o(C,b,_[b]);else i(i.P+i.F*(h||S),t,_);return _}},function(e,t,n){var r=n(22)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(e){}e.exports=function(e,t){if(!t&&!i)return!1;var n=!1;try{var o=[7],a=o[r]();a.next=function(){return{done:n=!0}},o[r]=function(){return a},e(o)}catch(e){}return n}},function(e,t,n){"use strict";var r=n(100),i=n(184),o=n(132),a=n(76),s=n(181),u=Object.assign;e.exports=!u||n(54)(function(){var e={},t={},n=Symbol(),r="abcdefghijklmnopqrst";return e[n]=7,r.split("").forEach(function(e){t[e]=e}),7!=u({},e)[n]||Object.keys(u({},t)).join("")!=r})?function(e,t){for(var n=a(e),u=arguments.length,l=1,c=i.f,p=o.f;u>l;)for(var f,h=s(arguments[l++]),d=c?r(h).concat(c(h)):r(h),m=d.length,v=0;m>v;)p.call(h,f=d[v++])&&(n[f]=h[f]);return n}:u},function(e,t,n){var r=n(132),i=n(101),o=n(75),a=n(190),s=n(55),u=n(335),l=Object.getOwnPropertyDescriptor;t.f=n(49)?l:function(e,t){if(e=o(e),t=a(t,!0),u)try{return l(e,t)}catch(e){}if(s(e,t))return i(!r.f.call(e,t),e[t])}},function(e,t,n){var r=n(345),i=n(180).concat("length","prototype");t.f=Object.getOwnPropertyNames||function(e){return r(e,i)}},function(e,t,n){var r=n(55),i=n(76),o=n(187)("IE_PROTO"),a=Object.prototype;e.exports=Object.getPrototypeOf||function(e){return e=i(e),r(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?a:null}},function(e,t,n){var r=n(55),i=n(75),o=n(600)(!1),a=n(187)("IE_PROTO");e.exports=function(e,t){var n,s=i(e),u=0,l=[];for(n in s)n!=a&&r(s,n)&&l.push(n);for(;t.length>u;)r(s,n=t[u++])&&(~o(l,n)||l.push(n));return l}},function(e,t,n){var r=n(23),i=n(15),o=n(54);e.exports=function(e,t){var n=(i.Object||{})[e]||Object[e],a={};a[e]=t(n),r(r.S+r.F*o(function(){n(1)}),"Object",a)}},function(e,t){e.exports=function(e){try{return{e:!1,v:e()}}catch(e){return{e:!0,v:e}}}},function(e,t,n){var r=n(37),i=n(27),o=n(182);e.exports=function(e,t){if(r(e),i(t)&&t.constructor===e)return t;var n=o.f(e);return(0,n.resolve)(t),n.promise}},function(e,t,n){var r=n(37),i=n(98),o=n(22)("species");e.exports=function(e,t){var n,a=r(e).constructor;return void 0===a||void 0==(n=r(a)[o])?t:i(n)}},function(e,t,n){var r,i,o,a=n(53),s=n(607),u=n(334),l=n(179),c=n(24),p=c.process,f=c.setImmediate,h=c.clearImmediate,d=c.MessageChannel,m=c.Dispatch,v=0,g={},y=function(){var e=+this;if(g.hasOwnProperty(e)){var t=g[e];delete g[e],t()}},_=function(e){y.call(e.data)};f&&h||(f=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++]);return g[++v]=function(){s("function"==typeof e?e:Function(e),t)},r(v),v},h=function(e){delete g[e]},"process"==n(99)(p)?r=function(e){p.nextTick(a(y,e,1))}:m&&m.now?r=function(e){m.now(a(y,e,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=_,r=a(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(r=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):r="onreadystatechange"in l("script")?function(e){u.appendChild(l("script")).onreadystatechange=function(){u.removeChild(this),y.call(e)}}:function(e){setTimeout(a(y,e,1),0)}),e.exports={set:f,clear:h}},function(e,t,n){var r=n(27);e.exports=function(e,t){if(!r(e)||e._t!==t)throw TypeError("Incompatible receiver, "+t+" required!");return e}},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t,n){var r=n(31).document;e.exports=r&&r.documentElement},function(e,t,n){var r=n(77),i=n(105),o=n(19)("match");e.exports=function(e){var t;return r(e)&&(void 0!==(t=e[o])?!!t:"RegExp"==i(e))}},function(e,t,n){"use strict";var r=n(356),i=n(28),o=n(78),a=n(64),s=n(108),u=n(109),l=n(647),c=n(199),p=n(653),f=n(19)("iterator"),h=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,t,n,m,v,g,y){l(n,t,m);var _,b,x,w=function(e){if(!h&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",E="values"==v,S=!1,C=e.prototype,A=C[f]||C["@@iterator"]||v&&C[v],D=!h&&A||w(v),O=v?E?w("entries"):D:void 0,M="Array"==t?C.entries||A:A;if(M&&(x=p(M.call(new e)))!==Object.prototype&&x.next&&(c(x,k,!0),r||s(x,f)||a(x,f,d)),E&&A&&"values"!==A.name&&(S=!0,D=function(){return A.call(this)}),r&&!y||!h&&!S&&C[f]||a(C,f,D),u[t]=D,u[k]=d,v)if(_={values:E?D:w("values"),keys:g?D:w("keys"),entries:O},y)for(b in _)b in C||o(C,b,_[b]);else i(i.P+i.F*(h||S),t,_);return _}},function(e,t){e.exports=!1},function(e,t,n){var r=n(654),i=n(352);e.exports=Object.keys||function(e){return r(e,i)}},function(e,t){e.exports=function(e){try{return{e:!1,v:e()}}catch(e){return{e:!0,v:e}}}},function(e,t,n){var r=n(62),i=n(77),o=n(198);e.exports=function(e,t){if(r(e),i(t)&&t.constructor===e)return t;var n=o.f(e);return(0,n.resolve)(t),n.promise}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(31),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});e.exports=function(e){return i[e]||(i[e]={})}},function(e,t,n){var r=n(62),i=n(135),o=n(19)("species");e.exports=function(e,t){var n,a=r(e).constructor;return void 0===a||void 0==(n=r(a)[o])?t:i(n)}},function(e,t,n){var r=n(139),i=n(57);e.exports=function(e){return function(t,n){var o,a,s=String(i(t)),u=r(n),l=s.length;return u<0||u>=l?e?"":void 0:(o=s.charCodeAt(u),o<55296||o>56319||u+1===l||(a=s.charCodeAt(u+1))<56320||a>57343?e?s.charAt(u):o:e?s.slice(u,u+2):a-56320+(o-55296<<10)+65536)}}},function(e,t,n){var r,i,o,a=n(136),s=n(643),u=n(353),l=n(196),c=n(31),p=c.process,f=c.setImmediate,h=c.clearImmediate,d=c.MessageChannel,m=c.Dispatch,v=0,g={},y=function(){var e=+this;if(g.hasOwnProperty(e)){var t=g[e];delete g[e],t()}},_=function(e){y.call(e.data)};f&&h||(f=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++]);return g[++v]=function(){s("function"==typeof e?e:Function(e),t)},r(v),v},h=function(e){delete g[e]},"process"==n(105)(p)?r=function(e){p.nextTick(a(y,e,1))}:m&&m.now?r=function(e){m.now(a(y,e,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=_,r=a(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(r=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):r="onreadystatechange"in l("script")?function(e){u.appendChild(l("script")).onreadystatechange=function(){u.removeChild(this),y.call(e)}}:function(e){setTimeout(a(y,e,1),0)}),e.exports={set:f,clear:h}},function(e,t,n){var r=n(139),i=Math.max,o=Math.min;e.exports=function(e,t){return e=r(e),e<0?i(e+t,0):o(e,t)}},function(e,t,n){"use strict";var r=n(363)(!0);n(355)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,t=this._t,n=this._i;return n>=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){"use strict";function r(e){return(0,o.default)(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(763),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t){var n=e.exports={get firstChild(){var e=this.children;return e&&e[0]||null},get lastChild(){var e=this.children;return e&&e[e.length-1]||null},get nodeType(){return i[this.type]||i.element}},r={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"},i={element:1,text:3,cdata:4,comment:8};Object.keys(r).forEach(function(e){var t=r[e];Object.defineProperty(n,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},function(e,t,n){function r(e){if(e>=55296&&e<=57343||e>1114111)return"�";e in i&&(e=i[e]);var t="";return e>65535&&(e-=65536,t+=String.fromCharCode(e>>>10&1023|55296),e=56320|1023&e),t+=String.fromCharCode(e)}var i=n(712);e.exports=r},function(e,t){e.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},function(e,t,n){"use strict";var r,i,o,a,s=n(65),u=function(e,t){return t};try{Object.defineProperty(u,"length",{configurable:!0,writable:!1,enumerable:!1,value:1})}catch(e){}1===u.length?(r={configurable:!0,writable:!1,enumerable:!1},i=Object.defineProperty,e.exports=function(e,t){return t=s(t),e.length===t?e:(r.value=t,i(e,"length",r))}):(a=n(375),o=function(){var e=[];return function(t){var n,r=0;if(e[t])return e[t];for(n=[];t--;)n.push("a"+(++r).toString(36));return new Function("fn","return function ("+n.join(", ")+") { return fn.apply(this, arguments); };")}}(),e.exports=function(e,t){var n;if(t=s(t),e.length===t)return e;n=o(t)(e);try{a(n,e)}catch(e){}return n})},function(e,t,n){"use strict";e.exports=function(){}},function(e,t,n){"use strict";e.exports=n(727)()?Object.assign:n(728)},function(e,t,n){"use strict";var r=n(58),i=n(142),o=Function.prototype.call;e.exports=function(e,t){var n={},a=arguments[2];return r(t),i(e,function(e,r,i,s){n[r]=o.call(t,a,e,r,i,s)}),n}},function(e,t,n){"use strict";var r=n(115),i=Object.defineProperty,o=Object.getOwnPropertyDescriptor,a=Object.getOwnPropertyNames,s=Object.getOwnPropertySymbols;e.exports=function(e,t){var n,u=Object(r(t));if(e=Object(r(e)),a(u).forEach(function(r){try{i(e,r,o(t,r))}catch(e){n=e}}),"function"==typeof s&&s(u).forEach(function(r){try{i(e,r,o(t,r))}catch(e){n=e}}),void 0!==n)throw n;return e}},function(e,t,n){"use strict";var r=n(79),i=Array.prototype.forEach,o=Object.create,a=function(e,t){var n;for(n in e)t[n]=e[n]};e.exports=function(e){var t=o(null);return i.call(arguments,function(e){r(e)&&a(Object(e),t)}),t}},function(e,t,n){"use strict";var r=n(32),i={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent("on"+t,n),{remove:function(){e.detachEvent("on"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};e.exports=i},function(e,t,n){"use strict";function r(e){try{e.focus()}catch(e){}}e.exports=r},function(e,t,n){"use strict";function r(e){if(void 0===(e=e||("undefined"!=typeof document?document:void 0)))return null;try{return e.activeElement||e.body}catch(t){return e.body}}e.exports=r},function(e,t,n){function r(e,t){this._options=t||{},this._cbs=e||{},this._tagname="",this._attribname="",this._attribvalue="",this._attribs=null,this._stack=[],this.startIndex=0,this.endIndex=null,this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode,this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode,this._options.Tokenizer&&(i=this._options.Tokenizer),this._tokenizer=new i(this._options,this),this._cbs.onparserinit&&this._cbs.onparserinit(this)}var i=n(381),o={input:!0,option:!0,optgroup:!0,select:!0,button:!0,datalist:!0,textarea:!0},a={tr:{tr:!0,th:!0,td:!0},th:{th:!0},td:{thead:!0,th:!0,td:!0},body:{head:!0,link:!0,script:!0},li:{li:!0},p:{p:!0},h1:{p:!0},h2:{p:!0},h3:{p:!0},h4:{p:!0},h5:{p:!0},h6:{p:!0},select:o,input:o,output:o,button:o,datalist:o,textarea:o,option:{option:!0},optgroup:{optgroup:!0}},s={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,path:!0,circle:!0,ellipse:!0,line:!0,rect:!0,use:!0,stop:!0,polyline:!0,polygon:!0},u=/\s|\//;n(42)(r,n(143).EventEmitter),r.prototype._updatePosition=function(e){null===this.endIndex?this._tokenizer._sectionStart<=e?this.startIndex=0:this.startIndex=this._tokenizer._sectionStart-e:this.startIndex=this.endIndex+1,this.endIndex=this._tokenizer.getAbsoluteIndex()},r.prototype.ontext=function(e){this._updatePosition(1),this.endIndex--,this._cbs.ontext&&this._cbs.ontext(e)},r.prototype.onopentagname=function(e){if(this._lowerCaseTagNames&&(e=e.toLowerCase()),this._tagname=e,!this._options.xmlMode&&e in a)for(var t;(t=this._stack[this._stack.length-1])in a[e];this.onclosetag(t));!this._options.xmlMode&&e in s||this._stack.push(e),this._cbs.onopentagname&&this._cbs.onopentagname(e),this._cbs.onopentag&&(this._attribs={})},r.prototype.onopentagend=function(){this._updatePosition(1),this._attribs&&(this._cbs.onopentag&&this._cbs.onopentag(this._tagname,this._attribs),this._attribs=null),!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in s&&this._cbs.onclosetag(this._tagname),this._tagname=""},r.prototype.onclosetag=function(e){if(this._updatePosition(1),this._lowerCaseTagNames&&(e=e.toLowerCase()),!this._stack.length||e in s&&!this._options.xmlMode)this._options.xmlMode||"br"!==e&&"p"!==e||(this.onopentagname(e),this._closeCurrentTag());else{var t=this._stack.lastIndexOf(e);if(-1!==t)if(this._cbs.onclosetag)for(t=this._stack.length-t;t--;)this._cbs.onclosetag(this._stack.pop());else this._stack.length=t;else"p"!==e||this._options.xmlMode||(this.onopentagname(e),this._closeCurrentTag())}},r.prototype.onselfclosingtag=function(){this._options.xmlMode||this._options.recognizeSelfClosing?this._closeCurrentTag():this.onopentagend()},r.prototype._closeCurrentTag=function(){var e=this._tagname;this.onopentagend(),this._stack[this._stack.length-1]===e&&(this._cbs.onclosetag&&this._cbs.onclosetag(e),this._stack.pop())},r.prototype.onattribname=function(e){this._lowerCaseAttributeNames&&(e=e.toLowerCase()),this._attribname=e},r.prototype.onattribdata=function(e){this._attribvalue+=e},r.prototype.onattribend=function(){this._cbs.onattribute&&this._cbs.onattribute(this._attribname,this._attribvalue),this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)&&(this._attribs[this._attribname]=this._attribvalue),this._attribname="",this._attribvalue=""},r.prototype._getInstructionName=function(e){var t=e.search(u),n=t<0?e:e.substr(0,t);return this._lowerCaseTagNames&&(n=n.toLowerCase()),n},r.prototype.ondeclaration=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("!"+t,"!"+e)}},r.prototype.onprocessinginstruction=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("?"+t,"?"+e)}},r.prototype.oncomment=function(e){this._updatePosition(4),this._cbs.oncomment&&this._cbs.oncomment(e),this._cbs.oncommentend&&this._cbs.oncommentend()},r.prototype.oncdata=function(e){this._updatePosition(1),this._options.xmlMode||this._options.recognizeCDATA?(this._cbs.oncdatastart&&this._cbs.oncdatastart(),this._cbs.ontext&&this._cbs.ontext(e),this._cbs.oncdataend&&this._cbs.oncdataend()):this.oncomment("[CDATA["+e+"]]")},r.prototype.onerror=function(e){this._cbs.onerror&&this._cbs.onerror(e)},r.prototype.onend=function(){if(this._cbs.onclosetag)for(var e=this._stack.length;e>0;this._cbs.onclosetag(this._stack[--e]));this._cbs.onend&&this._cbs.onend()},r.prototype.reset=function(){this._cbs.onreset&&this._cbs.onreset(),this._tokenizer.reset(),this._tagname="",this._attribname="",this._attribs=null,this._stack=[],this._cbs.onparserinit&&this._cbs.onparserinit(this)},r.prototype.parseComplete=function(e){this.reset(),this.end(e)},r.prototype.write=function(e){this._tokenizer.write(e)},r.prototype.end=function(e){this._tokenizer.end(e)},r.prototype.pause=function(){this._tokenizer.pause()},r.prototype.resume=function(){this._tokenizer.resume()},r.prototype.parseChunk=r.prototype.write,r.prototype.done=r.prototype.end,e.exports=r},function(e,t,n){function r(e){return" "===e||"\n"===e||"\t"===e||"\f"===e||"\r"===e}function i(e,t,n){var r=e.toLowerCase();return e===r?function(e){e===r?this._state=t:(this._state=n,this._index--)}:function(i){i===r||i===e?this._state=t:(this._state=n,this._index--)}}function o(e,t){var n=e.toLowerCase();return function(r){r===n||r===e?this._state=t:(this._state=d,this._index--)}}function a(e,t){this._state=f,this._buffer="",this._sectionStart=0,this._index=0,this._bufferOffset=0,this._baseState=f,this._special=de,this._cbs=t,this._running=!0,this._ended=!1,this._xmlMode=!(!e||!e.xmlMode),this._decodeEntities=!(!e||!e.decodeEntities)}e.exports=a;var s=n(369),u=n(204),l=n(370),c=n(205),p=0,f=p++,h=p++,d=p++,m=p++,v=p++,g=p++,y=p++,_=p++,b=p++,x=p++,w=p++,k=p++,E=p++,S=p++,C=p++,A=p++,D=p++,O=p++,M=p++,T=p++,P=p++,I=p++,R=p++,j=p++,F=p++,N=p++,B=p++,L=p++,q=p++,z=p++,U=p++,W=p++,V=p++,H=p++,G=p++,J=p++,K=p++,X=p++,Y=p++,$=p++,Z=p++,Q=p++,ee=p++,te=p++,ne=p++,re=p++,ie=p++,oe=p++,ae=p++,se=p++,ue=p++,le=p++,ce=p++,pe=p++,fe=p++,he=0,de=he++,me=he++,ve=he++;a.prototype._stateText=function(e){"<"===e?(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._state=h,this._sectionStart=this._index):this._decodeEntities&&this._special===de&&"&"===e&&(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._baseState=f,this._state=ue,this._sectionStart=this._index)},a.prototype._stateBeforeTagName=function(e){"/"===e?this._state=v:"<"===e?(this._cbs.ontext(this._getSection()),this._sectionStart=this._index):">"===e||this._special!==de||r(e)?this._state=f:"!"===e?(this._state=C,this._sectionStart=this._index+1):"?"===e?(this._state=D,this._sectionStart=this._index+1):(this._state=this._xmlMode||"s"!==e&&"S"!==e?d:U,this._sectionStart=this._index)},a.prototype._stateInTagName=function(e){("/"===e||">"===e||r(e))&&(this._emitToken("onopentagname"),this._state=_,this._index--)},a.prototype._stateBeforeCloseingTagName=function(e){r(e)||(">"===e?this._state=f:this._special!==de?"s"===e||"S"===e?this._state=W:(this._state=f,this._index--):(this._state=g,this._sectionStart=this._index))},a.prototype._stateInCloseingTagName=function(e){(">"===e||r(e))&&(this._emitToken("onclosetag"),this._state=y,this._index--)},a.prototype._stateAfterCloseingTagName=function(e){">"===e&&(this._state=f,this._sectionStart=this._index+1)},a.prototype._stateBeforeAttributeName=function(e){">"===e?(this._cbs.onopentagend(),this._state=f,this._sectionStart=this._index+1):"/"===e?this._state=m:r(e)||(this._state=b,this._sectionStart=this._index)},a.prototype._stateInSelfClosingTag=function(e){">"===e?(this._cbs.onselfclosingtag(),this._state=f,this._sectionStart=this._index+1):r(e)||(this._state=_,this._index--)},a.prototype._stateInAttributeName=function(e){("="===e||"/"===e||">"===e||r(e))&&(this._cbs.onattribname(this._getSection()),this._sectionStart=-1,this._state=x,this._index--)},a.prototype._stateAfterAttributeName=function(e){"="===e?this._state=w:"/"===e||">"===e?(this._cbs.onattribend(),this._state=_,this._index--):r(e)||(this._cbs.onattribend(),this._state=b,this._sectionStart=this._index)},a.prototype._stateBeforeAttributeValue=function(e){'"'===e?(this._state=k,this._sectionStart=this._index+1):"'"===e?(this._state=E,this._sectionStart=this._index+1):r(e)||(this._state=S,this._sectionStart=this._index,this._index--)},a.prototype._stateInAttributeValueDoubleQuotes=function(e){'"'===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateInAttributeValueSingleQuotes=function(e){"'"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateInAttributeValueNoQuotes=function(e){r(e)||">"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=_,this._index--):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},a.prototype._stateBeforeDeclaration=function(e){this._state="["===e?I:"-"===e?O:A},a.prototype._stateInDeclaration=function(e){">"===e&&(this._cbs.ondeclaration(this._getSection()),this._state=f,this._sectionStart=this._index+1)},a.prototype._stateInProcessingInstruction=function(e){">"===e&&(this._cbs.onprocessinginstruction(this._getSection()),this._state=f,this._sectionStart=this._index+1)},a.prototype._stateBeforeComment=function(e){"-"===e?(this._state=M,this._sectionStart=this._index+1):this._state=A},a.prototype._stateInComment=function(e){"-"===e&&(this._state=T)},a.prototype._stateAfterComment1=function(e){this._state="-"===e?P:M},a.prototype._stateAfterComment2=function(e){">"===e?(this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"-"!==e&&(this._state=M)},a.prototype._stateBeforeCdata1=i("C",R,A),a.prototype._stateBeforeCdata2=i("D",j,A),a.prototype._stateBeforeCdata3=i("A",F,A),a.prototype._stateBeforeCdata4=i("T",N,A),a.prototype._stateBeforeCdata5=i("A",B,A),a.prototype._stateBeforeCdata6=function(e){"["===e?(this._state=L,this._sectionStart=this._index+1):(this._state=A,this._index--)},a.prototype._stateInCdata=function(e){"]"===e&&(this._state=q)},a.prototype._stateAfterCdata1=function(e,t){return function(n){n===e&&(this._state=t)}}("]",z),a.prototype._stateAfterCdata2=function(e){">"===e?(this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"]"!==e&&(this._state=L)},a.prototype._stateBeforeSpecial=function(e){"c"===e||"C"===e?this._state=V:"t"===e||"T"===e?this._state=ee:(this._state=d,this._index--)},a.prototype._stateBeforeSpecialEnd=function(e){this._special!==me||"c"!==e&&"C"!==e?this._special!==ve||"t"!==e&&"T"!==e?this._state=f:this._state=ie:this._state=X},a.prototype._stateBeforeScript1=o("R",H),a.prototype._stateBeforeScript2=o("I",G),a.prototype._stateBeforeScript3=o("P",J),a.prototype._stateBeforeScript4=o("T",K),a.prototype._stateBeforeScript5=function(e){("/"===e||">"===e||r(e))&&(this._special=me),this._state=d,this._index--},a.prototype._stateAfterScript1=i("R",Y,f),a.prototype._stateAfterScript2=i("I",$,f),a.prototype._stateAfterScript3=i("P",Z,f),a.prototype._stateAfterScript4=i("T",Q,f),a.prototype._stateAfterScript5=function(e){">"===e||r(e)?(this._special=de,this._state=g,this._sectionStart=this._index-6,this._index--):this._state=f},a.prototype._stateBeforeStyle1=o("Y",te),a.prototype._stateBeforeStyle2=o("L",ne),a.prototype._stateBeforeStyle3=o("E",re),a.prototype._stateBeforeStyle4=function(e){("/"===e||">"===e||r(e))&&(this._special=ve),this._state=d,this._index--},a.prototype._stateAfterStyle1=i("Y",oe,f),a.prototype._stateAfterStyle2=i("L",ae,f),a.prototype._stateAfterStyle3=i("E",se,f),a.prototype._stateAfterStyle4=function(e){">"===e||r(e)?(this._special=de,this._state=g,this._sectionStart=this._index-5,this._index--):this._state=f},a.prototype._stateBeforeEntity=i("#",le,ce),a.prototype._stateBeforeNumericEntity=i("X",fe,pe),a.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var e=this._buffer.substring(this._sectionStart+1,this._index),t=this._xmlMode?c:u;t.hasOwnProperty(e)&&(this._emitPartial(t[e]),this._sectionStart=this._index+1)}},a.prototype._parseLegacyEntity=function(){var e=this._sectionStart+1,t=this._index-e;for(t>6&&(t=6);t>=2;){var n=this._buffer.substr(e,t);if(l.hasOwnProperty(n))return this._emitPartial(l[n]),void(this._sectionStart+=t+1);t--}},a.prototype._stateInNamedEntity=function(e){";"===e?(this._parseNamedEntityStrict(),this._sectionStart+1<this._index&&!this._xmlMode&&this._parseLegacyEntity(),this._state=this._baseState):(e<"a"||e>"z")&&(e<"A"||e>"Z")&&(e<"0"||e>"9")&&(this._xmlMode||this._sectionStart+1===this._index||(this._baseState!==f?"="!==e&&this._parseNamedEntityStrict():this._parseLegacyEntity()),this._state=this._baseState,this._index--)},a.prototype._decodeNumericEntity=function(e,t){var n=this._sectionStart+e;if(n!==this._index){var r=this._buffer.substring(n,this._index),i=parseInt(r,t);this._emitPartial(s(i)),this._sectionStart=this._index}else this._sectionStart--;this._state=this._baseState},a.prototype._stateInNumericEntity=function(e){";"===e?(this._decodeNumericEntity(2,10),this._sectionStart++):(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(2,10),this._index--)},a.prototype._stateInHexEntity=function(e){";"===e?(this._decodeNumericEntity(3,16),this._sectionStart++):(e<"a"||e>"f")&&(e<"A"||e>"F")&&(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(3,16),this._index--)},a.prototype._cleanup=function(){this._sectionStart<0?(this._buffer="",this._bufferOffset+=this._index,this._index=0):this._running&&(this._state===f?(this._sectionStart!==this._index&&this._cbs.ontext(this._buffer.substr(this._sectionStart)),this._buffer="",this._bufferOffset+=this._index,this._index=0):this._sectionStart===this._index?(this._buffer="",this._bufferOffset+=this._index,this._index=0):(this._buffer=this._buffer.substr(this._sectionStart),this._index-=this._sectionStart,this._bufferOffset+=this._sectionStart),this._sectionStart=0)},a.prototype.write=function(e){this._ended&&this._cbs.onerror(Error(".write() after done!")),this._buffer+=e,this._parse()},a.prototype._parse=function(){for(;this._index<this._buffer.length&&this._running;){var e=this._buffer.charAt(this._index);this._state===f?this._stateText(e):this._state===h?this._stateBeforeTagName(e):this._state===d?this._stateInTagName(e):this._state===v?this._stateBeforeCloseingTagName(e):this._state===g?this._stateInCloseingTagName(e):this._state===y?this._stateAfterCloseingTagName(e):this._state===m?this._stateInSelfClosingTag(e):this._state===_?this._stateBeforeAttributeName(e):this._state===b?this._stateInAttributeName(e):this._state===x?this._stateAfterAttributeName(e):this._state===w?this._stateBeforeAttributeValue(e):this._state===k?this._stateInAttributeValueDoubleQuotes(e):this._state===E?this._stateInAttributeValueSingleQuotes(e):this._state===S?this._stateInAttributeValueNoQuotes(e):this._state===C?this._stateBeforeDeclaration(e):this._state===A?this._stateInDeclaration(e):this._state===D?this._stateInProcessingInstruction(e):this._state===O?this._stateBeforeComment(e):this._state===M?this._stateInComment(e):this._state===T?this._stateAfterComment1(e):this._state===P?this._stateAfterComment2(e):this._state===I?this._stateBeforeCdata1(e):this._state===R?this._stateBeforeCdata2(e):this._state===j?this._stateBeforeCdata3(e):this._state===F?this._stateBeforeCdata4(e):this._state===N?this._stateBeforeCdata5(e):this._state===B?this._stateBeforeCdata6(e):this._state===L?this._stateInCdata(e):this._state===q?this._stateAfterCdata1(e):this._state===z?this._stateAfterCdata2(e):this._state===U?this._stateBeforeSpecial(e):this._state===W?this._stateBeforeSpecialEnd(e):this._state===V?this._stateBeforeScript1(e):this._state===H?this._stateBeforeScript2(e):this._state===G?this._stateBeforeScript3(e):this._state===J?this._stateBeforeScript4(e):this._state===K?this._stateBeforeScript5(e):this._state===X?this._stateAfterScript1(e):this._state===Y?this._stateAfterScript2(e):this._state===$?this._stateAfterScript3(e):this._state===Z?this._stateAfterScript4(e):this._state===Q?this._stateAfterScript5(e):this._state===ee?this._stateBeforeStyle1(e):this._state===te?this._stateBeforeStyle2(e):this._state===ne?this._stateBeforeStyle3(e):this._state===re?this._stateBeforeStyle4(e):this._state===ie?this._stateAfterStyle1(e):this._state===oe?this._stateAfterStyle2(e):this._state===ae?this._stateAfterStyle3(e):this._state===se?this._stateAfterStyle4(e):this._state===ue?this._stateBeforeEntity(e):this._state===le?this._stateBeforeNumericEntity(e):this._state===ce?this._stateInNamedEntity(e):this._state===pe?this._stateInNumericEntity(e):this._state===fe?this._stateInHexEntity(e):this._cbs.onerror(Error("unknown _state"),this._state),this._index++}this._cleanup()},a.prototype.pause=function(){this._running=!1},a.prototype.resume=function(){this._running=!0,this._index<this._buffer.length&&this._parse(),this._ended&&this._finish()},a.prototype.end=function(e){this._ended&&this._cbs.onerror(Error(".end() after done!")),e&&this.write(e),this._ended=!0,this._running&&this._finish()},a.prototype._finish=function(){this._sectionStart<this._index&&this._handleTrailingData(),this._cbs.onend()},a.prototype._handleTrailingData=function(){var e=this._buffer.substr(this._sectionStart);this._state===L||this._state===q||this._state===z?this._cbs.oncdata(e):this._state===M||this._state===T||this._state===P?this._cbs.oncomment(e):this._state!==ce||this._xmlMode?this._state!==pe||this._xmlMode?this._state!==fe||this._xmlMode?this._state!==d&&this._state!==_&&this._state!==w&&this._state!==x&&this._state!==b&&this._state!==E&&this._state!==k&&this._state!==S&&this._state!==g&&this._cbs.ontext(e):(this._decodeNumericEntity(3,16),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._decodeNumericEntity(2,10),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._parseLegacyEntity(),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData()))},a.prototype.reset=function(){a.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)},a.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index},a.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)},a.prototype._emitToken=function(e){this._cbs[e](this._getSection()),this._sectionStart=-1},a.prototype._emitPartial=function(e){this._baseState!==f?this._cbs.onattribdata(e):this._cbs.ontext(e)}},function(e,t,n){function r(e,t){var n=this._parser=new i(e,t),r=this._decoder=new a;o.call(this,{decodeStrings:!1}),this.once("finish",function(){n.end(r.end())})}e.exports=r;var i=n(380),o=n(493).Writable||n(1209).Writable,a=n(265).StringDecoder,s=n(40).Buffer;n(42)(r,o),o.prototype._write=function(e,t,n){e instanceof s&&(e=this._decoder.write(e)),this._parser.write(e),n()}},function(e,t,n){"use strict";function r(e,t){-1===e.indexOf(t)&&e.push(t)}function i(e,t){if(Array.isArray(t))for(var n=0,i=t.length;n<i;++n)r(e,t[n]);else r(e,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e instanceof Object&&!Array.isArray(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r,i){for(var o=0,a=e.length;o<a;++o){var s=e[o](t,n,r,i);if(s)return s}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t){function n(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}e.exports=n},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(389)]})},function(e,t,n){"use strict";var r=n(81);e.exports=new r({include:[n(212)],implicit:[n(808),n(800),n(802),n(801)]})},function(e,t,n){"use strict";var r=n(821),i=r.a.Symbol;t.a=i},function(e,t,n){"use strict";function r(e){if(!n.i(a.a)(e)||n.i(i.a)(e)!=s)return!1;var t=n.i(o.a)(e);if(null===t)return!0;var r=p.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&c.call(r)==f}var i=n(815),o=n(817),a=n(822),s="[object Object]",u=Function.prototype,l=Object.prototype,c=u.toString,p=l.hasOwnProperty,f=c.call(Object);t.a=r},function(e,t,n){var r=n(43),i=r.Uint8Array;e.exports=i},function(e,t,n){function r(e,t){var n=a(e),r=!n&&o(e),c=!n&&!r&&s(e),f=!n&&!r&&!c&&l(e),h=n||r||c||f,d=h?i(e.length,String):[],m=d.length;for(var v in e)!t&&!p.call(e,v)||h&&("length"==v||c&&("offset"==v||"parent"==v)||f&&("buffer"==v||"byteLength"==v||"byteOffset"==v)||u(v,m))||d.push(v);return d}var i=n(870),o=n(226),a=n(20),s=n(227),u=n(152),l=n(423),c=Object.prototype,p=c.hasOwnProperty;e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length,i=Array(r);++n<r;)i[n]=t(e[n],n,e);return i}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length;++n<r;)if(t(e[n],n,e))return!0;return!1}e.exports=n},function(e,t,n){function r(e,t,n){"__proto__"==t&&i?i(e,t,{configurable:!0,enumerable:!0,value:n,writable:!0}):e[t]=n}var i=n(403);e.exports=r},function(e,t,n){function r(e,t,n,T,P,I){var R,j=t&k,F=t&E,N=t&S;if(n&&(R=P?n(e,T,P,I):n(e)),void 0!==R)return R;if(!x(e))return e;var B=_(e);if(B){if(R=v(e),!j)return c(e,R)}else{var L=m(e),q=L==A||L==D;if(b(e))return l(e,j);if(L==O||L==C||q&&!P){if(R=F||q?{}:y(e),!j)return F?f(e,u(R,e)):p(e,s(R,e))}else{if(!M[L])return P?e:{};R=g(e,L,r,j)}}I||(I=new i);var z=I.get(e);if(z)return z;I.set(e,R);var U=N?F?d:h:F?keysIn:w,W=B?void 0:U(e);return o(W||e,function(i,o){W&&(o=i,i=e[o]),a(R,o,r(i,t,n,o,e,I))}),R}var i=n(215),o=n(837),a=n(148),s=n(841),u=n(842),l=n(875),c=n(882),p=n(883),f=n(884),h=n(894),d=n(407),m=n(409),v=n(905),g=n(906),y=n(907),_=n(20),b=n(227),x=n(38),w=n(59),k=1,E=2,S=4,C="[object Arguments]",A="[object Function]",D="[object GeneratorFunction]",O="[object Object]",M={};M[C]=M["[object Array]"]=M["[object ArrayBuffer]"]=M["[object DataView]"]=M["[object Boolean]"]=M["[object Date]"]=M["[object Float32Array]"]=M["[object Float64Array]"]=M["[object Int8Array]"]=M["[object Int16Array]"]=M["[object Int32Array]"]=M["[object Map]"]=M["[object Number]"]=M[O]=M["[object RegExp]"]=M["[object Set]"]=M["[object String]"]=M["[object Symbol]"]=M["[object Uint8Array]"]=M["[object Uint8ClampedArray]"]=M["[object Uint16Array]"]=M["[object Uint32Array]"]=!0,M["[object Error]"]=M[A]=M["[object WeakMap]"]=!1,e.exports=r},function(e,t,n){function r(e,t,n){var r=t(e);return o(e)?r:i(r,n(e))}var i=n(216),o=n(20);e.exports=r},function(e,t,n){function r(e,t,n,s,u){return e===t||(null==e||null==t||!o(e)&&!a(t)?e!==e&&t!==t:i(e,t,n,s,r,u))}var i=n(852),o=n(38),a=n(68);e.exports=r},function(e,t){function n(e,t,n){var r=-1,i=e.length;t<0&&(t=-t>i?0:i+t),n=n>i?i:n,n<0&&(n+=i),i=t>n?0:n-t>>>0,t>>>=0;for(var o=Array(i);++r<i;)o[r]=e[r+t];return o}e.exports=n},function(e,t,n){function r(e){if("string"==typeof e)return e;if(a(e))return o(e,r)+"";if(s(e))return c?c.call(e):"";var t=e+"";return"0"==t&&1/e==-u?"-0":t}var i=n(82),o=n(394),a=n(20),s=n(155),u=1/0,l=i?i.prototype:void 0,c=l?l.toString:void 0;e.exports=r},function(e,t,n){function r(e){return function(t){return i(a(o(t).replace(s,"")),e,"")}}var i=n(147),o=n(944),a=n(960),s=RegExp("['’]","g");e.exports=r},function(e,t,n){var r=n(67),i=function(){try{var e=r(Object,"defineProperty");return e({},"",{}),e}catch(e){}}();e.exports=i},function(e,t,n){function r(e,t,n,r,l,c){var p=n&s,f=e.length,h=t.length;if(f!=h&&!(p&&h>f))return!1;var d=c.get(e);if(d&&c.get(t))return d==t;var m=-1,v=!0,g=n&u?new i:void 0;for(c.set(e,t),c.set(t,e);++m<f;){var y=e[m],_=t[m];if(r)var b=p?r(_,y,m,t,e,c):r(y,_,m,e,t,c);if(void 0!==b){if(b)continue;v=!1;break}if(g){if(!o(t,function(e,t){if(!a(g,t)&&(y===e||l(y,e,n,r,c)))return g.push(t)})){v=!1;break}}else if(y!==_&&!l(y,_,n,r,c)){v=!1;break}}return c.delete(e),c.delete(t),v}var i=n(832),o=n(395),a=n(873),s=1,u=2;e.exports=r},function(e,t,n){function r(e){return a(o(e,void 0,i),e+"")}var i=n(946),o=n(415),a=n(417);e.exports=r},function(e,t,n){(function(t){var n="object"==typeof t&&t&&t.Object===Object&&t;e.exports=n}).call(t,n(17))},function(e,t,n){function r(e){return i(e,a,o)}var i=n(398),o=n(408),a=n(424);e.exports=r},function(e,t,n){var r=n(216),i=n(219),o=n(220),a=n(426),s=Object.getOwnPropertySymbols,u=s?function(e){for(var t=[];e;)r(t,o(e)),e=i(e);return t}:a;e.exports=u},function(e,t,n){var r=n(828),i=n(213),o=n(830),a=n(831),s=n(833),u=n(66),l=n(418),c=l(r),p=l(i),f=l(o),h=l(a),d=l(s),m=u;(r&&"[object DataView]"!=m(new r(new ArrayBuffer(1)))||i&&"[object Map]"!=m(new i)||o&&"[object Promise]"!=m(o.resolve())||a&&"[object Set]"!=m(new a)||s&&"[object WeakMap]"!=m(new s))&&(m=function(e){var t=u(e),n="[object Object]"==t?e.constructor:void 0,r=n?l(n):"";if(r)switch(r){case c:return"[object DataView]";case p:return"[object Map]";case f:return"[object Promise]";case h:return"[object Set]";case d:return"[object WeakMap]"}return t}),e.exports=m},function(e,t){function n(e){return r.test(e)}var r=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]");e.exports=n},function(e,t,n){function r(e,t,n){if(!s(n))return!1;var r=typeof t;return!!("number"==r?o(n)&&a(t,n.length):"string"==r&&t in n)&&i(n[t],e)}var i=n(120),o=n(86),a=n(152),s=n(38);e.exports=r},function(e,t,n){function r(e){return e===e&&!i(e)}var i=n(38);e.exports=r},function(e,t){function n(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}e.exports=n},function(e,t){function n(e,t){return function(n){return null!=n&&(n[e]===t&&(void 0!==t||e in Object(n)))}}e.exports=n},function(e,t,n){function r(e,t,n){return t=o(void 0===t?e.length-1:t,0),function(){for(var r=arguments,a=-1,s=o(r.length-t,0),u=Array(s);++a<s;)u[a]=r[t+a];a=-1;for(var l=Array(t+1);++a<t;)l[a]=r[a];return l[t]=n(u),i(e,this,l)}}var i=n(836),o=Math.max;e.exports=r},function(e,t){function n(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}e.exports=n},function(e,t,n){var r=n(868),i=n(929),o=i(r);e.exports=o},function(e,t){function n(e){if(null!=e){try{return i.call(e)}catch(e){}try{return e+""}catch(e){}}return""}var r=Function.prototype,i=r.toString;e.exports=n},function(e,t,n){function r(e,t){return null!=e&&o(e,t,i)}var i=n(850),o=n(898);e.exports=r},function(e,t,n){function r(e){if(!o(e))return!1;var t=i(e);return t==s||t==u||t==a||t==l}var i=n(66),o=n(38),a="[object AsyncFunction]",s="[object Function]",u="[object GeneratorFunction]",l="[object Proxy]";e.exports=r},function(e,t,n){function r(e){if(!a(e)||i(e)!=s)return!1;var t=o(e);if(null===t)return!0;var n=p.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&c.call(n)==f}var i=n(66),o=n(219),a=n(68),s="[object Object]",u=Function.prototype,l=Object.prototype,c=u.toString,p=l.hasOwnProperty,f=c.call(Object);e.exports=r},function(e,t,n){function r(e){return"string"==typeof e||!o(e)&&a(e)&&i(e)==s}var i=n(66),o=n(20),a=n(68),s="[object String]";e.exports=r},function(e,t,n){var r=n(855),i=n(871),o=n(924),a=o&&o.isTypedArray,s=a?i(a):r;e.exports=s},function(e,t,n){function r(e){return a(e)?i(e,!0):o(e)}var i=n(393),o=n(857),a=n(86);e.exports=r},function(e,t,n){function r(e,t){if("function"!=typeof e||null!=t&&"function"!=typeof t)throw new TypeError(o);var n=function(){var r=arguments,i=t?t.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=e.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(r.Cache||i),n}var i=n(214),o="Expected a function";r.Cache=i,e.exports=r},function(e,t){function n(){return[]}e.exports=n},function(e,t,n){function r(e){var t=i(e),n=t%1;return t===t?n?t-n:t:0}var i=n(958);e.exports=r},function(e,t,n){var r=n(889),i=r("toUpperCase");e.exports=i},function(e,t,n){"use strict";function r(e){var t,n,r=o[e];if(r)return r;for(r=o[e]=[],t=0;t<128;t++)n=String.fromCharCode(t),r.push(n);for(t=0;t<e.length;t++)n=e.charCodeAt(t),r[n]="%"+("0"+n.toString(16).toUpperCase()).slice(-2);return r}function i(e,t){var n;return"string"!=typeof t&&(t=i.defaultChars),n=r(t),e.replace(/(%[a-f0-9]{2})+/gi,function(e){var t,r,i,o,a,s,u,l="";for(t=0,r=e.length;t<r;t+=3)i=parseInt(e.slice(t+1,t+3),16),i<128?l+=n[i]:192==(224&i)&&t+3<r&&128==(192&(o=parseInt(e.slice(t+4,t+6),16)))?(u=i<<6&1984|63&o,l+=u<128?"��":String.fromCharCode(u),t+=3):224==(240&i)&&t+6<r&&(o=parseInt(e.slice(t+4,t+6),16),a=parseInt(e.slice(t+7,t+9),16),128==(192&o)&&128==(192&a))?(u=i<<12&61440|o<<6&4032|63&a,l+=u<2048||u>=55296&&u<=57343?"���":String.fromCharCode(u),t+=6):240==(248&i)&&t+9<r&&(o=parseInt(e.slice(t+4,t+6),16),a=parseInt(e.slice(t+7,t+9),16),s=parseInt(e.slice(t+10,t+12),16),128==(192&o)&&128==(192&a)&&128==(192&s))?(u=i<<18&1835008|o<<12&258048|a<<6&4032|63&s,u<65536||u>1114111?l+="����":(u-=65536,l+=String.fromCharCode(55296+(u>>10),56320+(1023&u))),t+=9):l+="�";return l})}var o={};i.defaultChars=";/?:@&=+$,#",i.componentChars="",e.exports=i},function(e,t,n){"use strict";function r(e){var t,n,r=o[e];if(r)return r;for(r=o[e]=[],t=0;t<128;t++)n=String.fromCharCode(t),/^[0-9a-z]$/i.test(n)?r.push(n):r.push("%"+("0"+t.toString(16).toUpperCase()).slice(-2));for(t=0;t<e.length;t++)r[e.charCodeAt(t)]=e[t];return r}function i(e,t,n){var o,a,s,u,l,c="";for("string"!=typeof t&&(n=t,t=i.defaultChars),void 0===n&&(n=!0),l=r(t),o=0,a=e.length;o<a;o++)if(s=e.charCodeAt(o),n&&37===s&&o+2<a&&/^[0-9a-f]{2}$/i.test(e.slice(o+1,o+3)))c+=e.slice(o,o+3),o+=2;else if(s<128)c+=l[s];else if(s>=55296&&s<=57343){if(s>=55296&&s<=56319&&o+1<a&&(u=e.charCodeAt(o+1))>=56320&&u<=57343){c+=encodeURIComponent(e[o]+e[o+1]),o++;continue}c+="%EF%BF%BD"}else c+=encodeURIComponent(e[o]);return c}var o={};i.defaultChars=";/?:@&=+$,-_.!~*'()#",i.componentChars="-_.!~*'()",e.exports=i},function(e,t,n){"use strict";var r=n(65);e.exports=function(e,t,n){var i;return isNaN(e)?(i=t,i>=0?n&&i?i-1:i:1):!1!==e&&r(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=n(1211),a=r(o),s=n(503),u=r(s),l=n(985),c=r(l),p=function(){function e(t,n,r,o,a,s){i(this,e),this.name="CssSyntaxError",this.reason=t,a&&(this.file=a),o&&(this.source=o),s&&(this.plugin=s),void 0!==n&&void 0!==r&&(this.line=n,this.column=r),this.setMessage(),Error.captureStackTrace&&Error.captureStackTrace(this,e)}return e.prototype.setMessage=function(){this.message=this.plugin?this.plugin+": ":"",this.message+=this.file?this.file:"<css input>",void 0!==this.line&&(this.message+=":"+this.line+":"+this.column),this.message+=": "+this.reason},e.prototype.showSourceCode=function(e){function t(t){return e&&u.default.red?u.default.red.bold(t):t}function n(t){return e&&u.default.gray?u.default.gray(t):t}var r=this;if(!this.source)return"";var i=this.source;void 0===e&&(e=a.default),e&&(i=(0,c.default)(i));var o=i.split(/\r?\n/),s=Math.max(this.line-3,0),l=Math.min(this.line+2,o.length),p=String(l).length;return o.slice(s,l).map(function(e,i){var o=s+1+i,a=" "+(" "+o).slice(-p)+" | ";if(o===r.line){var u=n(a.replace(/\d/g," "))+e.slice(0,r.column-1).replace(/[^\t]/g," ");return t(">")+n(a)+e+"\n "+u+t("^")}return" "+n(a)+e}).join("\n")},e.prototype.toString=function(){var e=this.showSourceCode();return e&&(e="\n\n"+e+"\n"),this.name+": "+this.message+e},e}();t.default=p,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(432),s=r(a),u=n(983),l=r(u),c=n(230),p=r(c),f=0,h=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};i(this,e),this.css=t.toString(),"\ufeff"!==this.css[0]&&"￾"!==this.css[0]||(this.css=this.css.slice(1)),n.from&&(/^\w+:\/\//.test(n.from)?this.file=n.from:this.file=p.default.resolve(n.from));var r=new l.default(this.css,n);if(r.text){this.map=r;var o=r.consumer().file;!this.file&&o&&(this.file=this.mapResolve(o))}this.file||(f+=1,this.id="<input css "+f+">"),this.map&&(this.map.file=this.from)}return e.prototype.error=function(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},i=void 0,o=this.origin(t,n);return i=o?new s.default(e,o.line,o.column,o.source,o.file,r.plugin):new s.default(e,t,n,this.css,this.file,r.plugin),i.input={line:t,column:n,source:this.css},this.file&&(i.input.file=this.file),i},e.prototype.origin=function(e,t){if(!this.map)return!1;var n=this.map.consumer(),r=n.originalPositionFor({line:e,column:t});if(!r.source)return!1;var i={file:this.mapResolve(r.source),line:r.line,column:r.column},o=n.sourceContentFor(r.source);return o&&(i.source=o),i},e.prototype.mapResolve=function(e){return/^\w+:\/\//.test(e)?e:p.default.resolve(this.map.consumer().sourceRoot||".",e)},o(e,[{key:"from",get:function(){return this.file||this.id}}]),e}();t.default=h,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){return"object"===(void 0===e?"undefined":s(e))&&"function"==typeof e.then}t.__esModule=!0;var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=n(980),l=r(u),c=n(238),p=r(c),f=n(984),h=r(f),d=n(236),m=r(d),v=function(){function e(t,n,r){i(this,e),this.stringified=!1,this.processed=!1;var o=void 0;if("object"===(void 0===n?"undefined":s(n))&&"root"===n.type)o=n;else if(n instanceof e||n instanceof h.default)o=n.root,n.map&&(void 0===r.map&&(r.map={}),r.map.inline||(r.map.inline=!1),r.map.prev=n.map);else{var a=m.default;r.syntax&&(a=r.syntax.parse),r.parser&&(a=r.parser),a.parse&&(a=a.parse);try{o=a(n,r)}catch(e){this.error=e}}this.result=new h.default(t,o,r)}return e.prototype.warnings=function(){return this.sync().warnings()},e.prototype.toString=function(){return this.css},e.prototype.then=function(e,t){return this.async().then(e,t)},e.prototype.catch=function(e){return this.async().catch(e)},e.prototype.handleError=function(e,t){try{if(this.error=e,"CssSyntaxError"!==e.name||e.plugin){if(t.postcssVersion){var n=t.postcssPlugin,r=t.postcssVersion,i=this.result.processor.version,o=r.split("."),a=i.split(".");(o[0]!==a[0]||parseInt(o[1])>parseInt(a[1]))&&console.error("Unknown error from PostCSS plugin. Your current PostCSS version is "+i+", but "+n+" uses "+r+". Perhaps this is the source of the error below.")}}else e.plugin=t.postcssPlugin,e.setMessage()}catch(e){console&&console.error&&console.error(e)}},e.prototype.asyncTick=function(e,t){var n=this;if(this.plugin>=this.processor.plugins.length)return this.processed=!0,e();try{var r=this.processor.plugins[this.plugin],i=this.run(r);this.plugin+=1,o(i)?i.then(function(){n.asyncTick(e,t)}).catch(function(e){n.handleError(e,r),n.processed=!0,t(e)}):this.asyncTick(e,t)}catch(e){this.processed=!0,t(e)}},e.prototype.async=function(){var e=this;return this.processed?new Promise(function(t,n){e.error?n(e.error):t(e.stringify())}):this.processing?this.processing:(this.processing=new Promise(function(t,n){if(e.error)return n(e.error);e.plugin=0,e.asyncTick(t,n)}).then(function(){return e.processed=!0,e.stringify()}),this.processing)},e.prototype.sync=function(){if(this.processed)return this.result;if(this.processed=!0,this.processing)throw new Error("Use process(css).then(cb) to work with async plugins");if(this.error)throw this.error;for(var e=this.result.processor.plugins,t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}var i=r;if(o(this.run(i)))throw new Error("Use process(css).then(cb) to work with async plugins")}return this.result},e.prototype.run=function(e){this.result.lastPlugin=e;try{return e(this.result.root,this.result)}catch(t){throw this.handleError(t,e),t}},e.prototype.stringify=function(){if(this.stringified)return this.result;this.stringified=!0,this.sync();var e=this.result.opts,t=p.default;e.syntax&&(t=e.syntax.stringify),e.stringifier&&(t=e.stringifier),t.stringify&&(t=t.stringify);var n=new l.default(t,this.result.root,this.result.opts),r=n.generate();return this.result.css=r[0],this.result.map=r[1],this.result},a(e,[{key:"processor",get:function(){return this.result.processor}},{key:"opts",get:function(){return this.result.opts}},{key:"css",get:function(){return this.stringify().css}},{key:"content",get:function(){return this.stringify().content}},{key:"map",get:function(){return this.stringify().map}},{key:"root",get:function(){return this.sync().root}},{key:"messages",get:function(){return this.sync().messages}}]),e}();t.default=v,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r={split:function(e,t,n){for(var r=[],i="",o=!1,a=0,s=!1,u=!1,l=0;l<e.length;l++){var c=e[l];s?u?u=!1:"\\"===c?u=!0:c===s&&(s=!1):'"'===c||"'"===c?s=c:"("===c?a+=1:")"===c?a>0&&(a-=1):0===a&&-1!==t.indexOf(c)&&(o=!0),o?(""!==i&&r.push(i.trim()),i="",o=!1):i+=c}return(n||""!==i)&&r.push(i.trim()),r},space:function(e){var t=[" ","\n","\t"];return r.split(e,t)},comma:function(e){return r.split(e,[","],!0)}};t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=n(434),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];r(this,e),this.version="6.0.14",this.plugins=this.normalize(t)}return e.prototype.use=function(e){return this.plugins=this.plugins.concat(this.normalize([e])),this},e.prototype.process=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return new a.default(this,e,t)},e.prototype.normalize=function(e){for(var t=[],n=e,r=Array.isArray(n),o=0,n=r?n:n[Symbol.iterator]();;){var a;if(r){if(o>=n.length)break;a=n[o++]}else{if(o=n.next(),o.done)break;a=o.value}var s=a;if(s.postcss&&(s=s.postcss),"object"===(void 0===s?"undefined":i(s))&&Array.isArray(s.plugins))t=t.concat(s.plugins);else{if("function"!=typeof s)throw"object"===(void 0===s?"undefined":i(s))&&(s.parse||s.stringify)?new Error("PostCSS syntaxes cannot be used as plugins. Instead, please use one of the syntax/parser/stringifier options as outlined in your PostCSS runner documentation."):new Error(s+" is not a PostCSS plugin");t.push(s)}}return t},e}();t.default=s,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e){return e[0].toUpperCase()+e.slice(1)}t.__esModule=!0;var o={colon:": ",indent:"    ",beforeDecl:"\n",beforeRule:"\n",beforeOpen:" ",beforeClose:"\n",beforeComment:"\n",after:"\n",emptyBody:"",commentLeft:" ",commentRight:" "},a=function(){function e(t){r(this,e),this.builder=t}return e.prototype.stringify=function(e,t){this[e.type](e,t)},e.prototype.root=function(e){this.body(e),e.raws.after&&this.builder(e.raws.after)},e.prototype.comment=function(e){var t=this.raw(e,"left","commentLeft"),n=this.raw(e,"right","commentRight");this.builder("/*"+t+e.text+n+"*/",e)},e.prototype.decl=function(e,t){var n=this.raw(e,"between","colon"),r=e.prop+n+this.rawValue(e,"value");e.important&&(r+=e.raws.important||" !important"),t&&(r+=";"),this.builder(r,e)},e.prototype.rule=function(e){this.block(e,this.rawValue(e,"selector")),e.raws.ownSemicolon&&this.builder(e.raws.ownSemicolon,e,"end")},e.prototype.atrule=function(e,t){var n="@"+e.name,r=e.params?this.rawValue(e,"params"):"";if(void 0!==e.raws.afterName?n+=e.raws.afterName:r&&(n+=" "),e.nodes)this.block(e,n+r);else{var i=(e.raws.between||"")+(t?";":"");this.builder(n+r+i,e)}},e.prototype.body=function(e){for(var t=e.nodes.length-1;t>0&&"comment"===e.nodes[t].type;)t-=1;for(var n=this.raw(e,"semicolon"),r=0;r<e.nodes.length;r++){var i=e.nodes[r],o=this.raw(i,"before");o&&this.builder(o),this.stringify(i,t!==r||n)}},e.prototype.block=function(e,t){var n=this.raw(e,"between","beforeOpen");this.builder(t+n+"{",e,"start");var r=void 0;e.nodes&&e.nodes.length?(this.body(e),r=this.raw(e,"after")):r=this.raw(e,"after","emptyBody"),r&&this.builder(r),this.builder("}",e,"end")},e.prototype.raw=function(e,t,n){var r=void 0;if(n||(n=t),t&&void 0!==(r=e.raws[t]))return r;var a=e.parent;if("before"===n&&(!a||"root"===a.type&&a.first===e))return"";if(!a)return o[n];var s=e.root();if(s.rawCache||(s.rawCache={}),void 0!==s.rawCache[n])return s.rawCache[n];if("before"===n||"after"===n)return this.beforeAfter(e,n);var u="raw"+i(n);return this[u]?r=this[u](s,e):s.walk(function(e){if(void 0!==(r=e.raws[t]))return!1}),void 0===r&&(r=o[n]),s.rawCache[n]=r,r},e.prototype.rawSemicolon=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&e.nodes.length&&"decl"===e.last.type&&void 0!==(t=e.raws.semicolon))return!1}),t},e.prototype.rawEmptyBody=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&0===e.nodes.length&&void 0!==(t=e.raws.after))return!1}),t},e.prototype.rawIndent=function(e){if(e.raws.indent)return e.raws.indent;var t=void 0;return e.walk(function(n){var r=n.parent;if(r&&r!==e&&r.parent&&r.parent===e&&void 0!==n.raws.before){var i=n.raws.before.split("\n");return t=i[i.length-1],t=t.replace(/[^\s]/g,""),!1}}),t},e.prototype.rawBeforeComment=function(e,t){var n=void 0;return e.walkComments(function(e){if(void 0!==e.raws.before)return n=e.raws.before,-1!==n.indexOf("\n")&&(n=n.replace(/[^\n]+$/,"")),!1}),void 0===n?n=this.raw(t,null,"beforeDecl"):n&&(n=n.replace(/[^\s]/g,"")),n},e.prototype.rawBeforeDecl=function(e,t){var n=void 0;return e.walkDecls(function(e){if(void 0!==e.raws.before)return n=e.raws.before,-1!==n.indexOf("\n")&&(n=n.replace(/[^\n]+$/,"")),!1}),void 0===n?n=this.raw(t,null,"beforeRule"):n&&(n=n.replace(/[^\s]/g,"")),n},e.prototype.rawBeforeRule=function(e){var t=void 0;return e.walk(function(n){if(n.nodes&&(n.parent!==e||e.first!==n)&&void 0!==n.raws.before)return t=n.raws.before,-1!==t.indexOf("\n")&&(t=t.replace(/[^\n]+$/,"")),!1}),t&&(t=t.replace(/[^\s]/g,"")),t},e.prototype.rawBeforeClose=function(e){var t=void 0;return e.walk(function(e){if(e.nodes&&e.nodes.length>0&&void 0!==e.raws.after)return t=e.raws.after,-1!==t.indexOf("\n")&&(t=t.replace(/[^\n]+$/,"")),!1}),t&&(t=t.replace(/[^\s]/g,"")),t},e.prototype.rawBeforeOpen=function(e){var t=void 0;return e.walk(function(e){if("decl"!==e.type&&void 0!==(t=e.raws.between))return!1}),t},e.prototype.rawColon=function(e){var t=void 0;return e.walkDecls(function(e){if(void 0!==e.raws.between)return t=e.raws.between.replace(/[^\s:]/g,""),!1}),t},e.prototype.beforeAfter=function(e,t){var n=void 0;n="decl"===e.type?this.raw(e,null,"beforeDecl"):"comment"===e.type?this.raw(e,null,"beforeComment"):"before"===t?this.raw(e,null,"beforeRule"):this.raw(e,null,"beforeClose");for(var r=e.parent,i=0;r&&"root"!==r.type;)i+=1,r=r.parent;if(-1!==n.indexOf("\n")){var o=this.raw(e,null,"indent");if(o.length)for(var a=0;a<i;a++)n+=o}return n},e.prototype.rawValue=function(e,t){var n=e[t],r=e.raws[t];return r&&r.value===n?r.raw:n},e}();t.default=a,e.exports=t.default},function(e,t,n){"use strict";function r(e){function t(t){throw e.error("Unclosed "+t,J,K-G)}function n(){return 0===Y.length&&K>=H}function r(){if(Y.length)return Y.pop();if(!(K>=H)){switch(T=O.charCodeAt(K),(T===u||T===c||T===f&&O.charCodeAt(K+1)!==u)&&(G=K,J+=1),T){case u:case l:case p:case f:case c:P=K;do{P+=1,(T=O.charCodeAt(P))===u&&(G=P,J+=1)}while(T===l||T===u||T===p||T===f||T===c);V=["space",O.slice(K,P)],K=P-1;break;case h:V=["[","[",J,K-G];break;case d:V=["]","]",J,K-G];break;case g:V=["{","{",J,K-G];break;case y:V=["}","}",J,K-G];break;case x:V=[":",":",J,K-G];break;case _:V=[";",";",J,K-G];break;case m:if(U=X.length?X.pop()[1]:"",W=O.charCodeAt(K+1),"url"===U&&W!==i&&W!==o&&W!==l&&W!==u&&W!==p&&W!==c&&W!==f){P=K;do{if(q=!1,-1===(P=O.indexOf(")",P+1))){if(M){P=K;break}t("bracket")}for(z=P;O.charCodeAt(z-1)===a;)z-=1,q=!q}while(q);V=["brackets",O.slice(K,P+1),J,K-G,J,P-G],K=P}else P=O.indexOf(")",K+1),F=O.slice(K,P+1),-1===P||S.test(F)?V=["(","(",J,K-G]:(V=["brackets",F,J,K-G,J,P-G],K=P);break;case v:V=[")",")",J,K-G];break;case i:case o:I=T===i?"'":'"',P=K;do{if(q=!1,-1===(P=O.indexOf(I,P+1))){if(M){P=K+1;break}t("string")}for(z=P;O.charCodeAt(z-1)===a;)z-=1,q=!q}while(q);F=O.slice(K,P+1),R=F.split("\n"),j=R.length-1,j>0?(B=J+j,L=P-R[j].length):(B=J,L=G),V=["string",O.slice(K,P+1),J,K-G,B,P-L],G=L,J=B,K=P;break;case w:k.lastIndex=K+1,k.test(O),P=0===k.lastIndex?O.length-1:k.lastIndex-2,V=["at-word",O.slice(K,P+1),J,K-G,J,P-G],K=P;break;case a:for(P=K,N=!0;O.charCodeAt(P+1)===a;)P+=1,N=!N;if(T=O.charCodeAt(P+1),N&&T!==s&&T!==l&&T!==u&&T!==p&&T!==f&&T!==c&&(P+=1,C.test(O.charAt(P)))){for(;C.test(O.charAt(P+1));)P+=1;O.charCodeAt(P+1)===l&&(P+=1)}V=["word",O.slice(K,P+1),J,K-G,J,P-G],K=P;break;default:T===s&&O.charCodeAt(K+1)===b?(P=O.indexOf("*/",K+2)+1,0===P&&(M?P=O.length:t("comment")),F=O.slice(K,P+1),R=F.split("\n"),j=R.length-1,j>0?(B=J+j,L=P-R[j].length):(B=J,L=G),V=["comment",F,J,K-G,B,P-L],G=L,J=B,K=P):(E.lastIndex=K+1,E.test(O),P=0===E.lastIndex?O.length-1:E.lastIndex-2,V=["word",O.slice(K,P+1),J,K-G,J,P-G],X.push(V),K=P)}return K++,V}}function A(e){Y.push(e)}var D=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},O=e.css.valueOf(),M=D.ignoreErrors,T=void 0,P=void 0,I=void 0,R=void 0,j=void 0,F=void 0,N=void 0,B=void 0,L=void 0,q=void 0,z=void 0,U=void 0,W=void 0,V=void 0,H=O.length,G=-1,J=1,K=0,X=[],Y=[];return{back:A,nextToken:r,endOfFile:n}}t.__esModule=!0,t.default=r;var i=39,o=34,a=92,s=47,u=10,l=32,c=12,p=9,f=13,h=91,d=93,m=40,v=41,g=123,y=125,_=59,b=42,x=58,w=64,k=/[ \n\t\r\f\{\(\)'"\\;\/\[\]#]/g,E=/[ \n\t\r\f\(\)\{\}:;@!'"\\\]\[#]|\/(?=\*)/g,S=/.[\\\/\("'\n]/,C=/[a-f0-9]/i;e.exports=t.default},function(e,t,n){function r(){this._array=[],this._set=a?new Map:Object.create(null)}var i=n(121),o=Object.prototype.hasOwnProperty,a="undefined"!=typeof Map;r.fromArray=function(e,t){for(var n=new r,i=0,o=e.length;i<o;i++)n.add(e[i],t);return n},r.prototype.size=function(){return a?this._set.size:Object.getOwnPropertyNames(this._set).length},r.prototype.add=function(e,t){var n=a?e:i.toSetString(e),r=a?this.has(e):o.call(this._set,n),s=this._array.length;r&&!t||this._array.push(e),r||(a?this._set.set(e,s):this._set[n]=s)},r.prototype.has=function(e){if(a)return this._set.has(e);var t=i.toSetString(e);return o.call(this._set,t)},r.prototype.indexOf=function(e){if(a){var t=this._set.get(e);if(t>=0)return t}else{var n=i.toSetString(e);if(o.call(this._set,n))return this._set[n]}throw new Error('"'+e+'" is not in the set.')},r.prototype.at=function(e){if(e>=0&&e<this._array.length)return this._array[e];throw new Error("No element indexed by "+e)},r.prototype.toArray=function(){return this._array.slice()},t.ArraySet=r},function(e,t,n){function r(e){return e<0?1+(-e<<1):0+(e<<1)}function i(e){var t=1==(1&e),n=e>>1;return t?-n:n}var o=n(989);t.encode=function(e){var t,n="",i=r(e);do{t=31&i,i>>>=5,i>0&&(t|=32),n+=o.encode(t)}while(i>0);return n},t.decode=function(e,t,n){var r,a,s=e.length,u=0,l=0;do{if(t>=s)throw new Error("Expected more digits in base 64 VLQ value.");if(-1===(a=o.decode(e.charCodeAt(t++))))throw new Error("Invalid base64 digit: "+e.charAt(t-1));r=!!(32&a),a&=31,u+=a<<l,l+=5}while(r);n.value=i(u),n.rest=t}},function(e,t,n){function r(e){e||(e={}),this._file=o.getArg(e,"file",null),this._sourceRoot=o.getArg(e,"sourceRoot",null),this._skipValidation=o.getArg(e,"skipValidation",!1),this._sources=new a,this._names=new a,this._mappings=new s,this._sourcesContents=null}var i=n(440),o=n(121),a=n(439).ArraySet,s=n(991).MappingList;r.prototype._version=3,r.fromSourceMap=function(e){var t=e.sourceRoot,n=new r({file:e.file,sourceRoot:t});return e.eachMapping(function(e){var r={generated:{line:e.generatedLine,column:e.generatedColumn}};null!=e.source&&(r.source=e.source,null!=t&&(r.source=o.relative(t,r.source)),r.original={line:e.originalLine,column:e.originalColumn},null!=e.name&&(r.name=e.name)),n.addMapping(r)}),e.sources.forEach(function(r){var i=r;null!==t&&(i=o.relative(t,r)),n._sources.has(i)||n._sources.add(i);var a=e.sourceContentFor(r);null!=a&&n.setSourceContent(r,a)}),n},r.prototype.addMapping=function(e){var t=o.getArg(e,"generated"),n=o.getArg(e,"original",null),r=o.getArg(e,"source",null),i=o.getArg(e,"name",null);this._skipValidation||this._validateMapping(t,n,r,i),null!=r&&(r=String(r),this._sources.has(r)||this._sources.add(r)),null!=i&&(i=String(i),this._names.has(i)||this._names.add(i)),this._mappings.add({generatedLine:t.line,generatedColumn:t.column,originalLine:null!=n&&n.line,originalColumn:null!=n&&n.column,source:r,name:i})},r.prototype.setSourceContent=function(e,t){var n=e;null!=this._sourceRoot&&(n=o.relative(this._sourceRoot,n)),null!=t?(this._sourcesContents||(this._sourcesContents=Object.create(null)),this._sourcesContents[o.toSetString(n)]=t):this._sourcesContents&&(delete this._sourcesContents[o.toSetString(n)],0===Object.keys(this._sourcesContents).length&&(this._sourcesContents=null))},r.prototype.applySourceMap=function(e,t,n){var r=t;if(null==t){if(null==e.file)throw new Error('SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, or the source map\'s "file" property. Both were omitted.');r=e.file}var i=this._sourceRoot;null!=i&&(r=o.relative(i,r));var s=new a,u=new a;this._mappings.unsortedForEach(function(t){if(t.source===r&&null!=t.originalLine){var a=e.originalPositionFor({line:t.originalLine,column:t.originalColumn});null!=a.source&&(t.source=a.source,null!=n&&(t.source=o.join(n,t.source)),null!=i&&(t.source=o.relative(i,t.source)),t.originalLine=a.line,t.originalColumn=a.column,null!=a.name&&(t.name=a.name))}var l=t.source;null==l||s.has(l)||s.add(l);var c=t.name;null==c||u.has(c)||u.add(c)},this),this._sources=s,this._names=u,e.sources.forEach(function(t){var r=e.sourceContentFor(t);null!=r&&(null!=n&&(t=o.join(n,t)),null!=i&&(t=o.relative(i,t)),this.setSourceContent(t,r))},this)},r.prototype._validateMapping=function(e,t,n,r){if(t&&"number"!=typeof t.line&&"number"!=typeof t.column)throw new Error("original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values.");if((!(e&&"line"in e&&"column"in e&&e.line>0&&e.column>=0)||t||n||r)&&!(e&&"line"in e&&"column"in e&&t&&"line"in t&&"column"in t&&e.line>0&&e.column>=0&&t.line>0&&t.column>=0&&n))throw new Error("Invalid mapping: "+JSON.stringify({generated:e,source:n,original:t,name:r}))},r.prototype._serializeMappings=function(){for(var e,t,n,r,a=0,s=1,u=0,l=0,c=0,p=0,f="",h=this._mappings.toArray(),d=0,m=h.length;d<m;d++){if(t=h[d],e="",t.generatedLine!==s)for(a=0;t.generatedLine!==s;)e+=";",s++;else if(d>0){if(!o.compareByGeneratedPositionsInflated(t,h[d-1]))continue;e+=","}e+=i.encode(t.generatedColumn-a),a=t.generatedColumn,null!=t.source&&(r=this._sources.indexOf(t.source),e+=i.encode(r-p),p=r,e+=i.encode(t.originalLine-1-l),l=t.originalLine-1,e+=i.encode(t.originalColumn-u),u=t.originalColumn,null!=t.name&&(n=this._names.indexOf(t.name),e+=i.encode(n-c),c=n)),f+=e}return f},r.prototype._generateSourcesContent=function(e,t){return e.map(function(e){if(!this._sourcesContents)return null;null!=t&&(e=o.relative(t,e));var n=o.toSetString(e);return Object.prototype.hasOwnProperty.call(this._sourcesContents,n)?this._sourcesContents[n]:null},this)},r.prototype.toJSON=function(){var e={version:this._version,sources:this._sources.toArray(),names:this._names.toArray(),mappings:this._serializeMappings()};return null!=this._file&&(e.file=this._file),null!=this._sourceRoot&&(e.sourceRoot=this._sourceRoot),this._sourcesContents&&(e.sourcesContent=this._generateSourcesContent(e.sources,e.sourceRoot)),e},r.prototype.toString=function(){return JSON.stringify(this.toJSON())},t.SourceMapGenerator=r},function(e,t,n){t.SourceMapGenerator=n(441).SourceMapGenerator,t.SourceMapConsumer=n(993).SourceMapConsumer,t.SourceNode=n(994).SourceNode},function(e,t,n){"use strict";var r=n(997);e.exports=function(e){return r(e,!1)}},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";var r=String.prototype.replace,i=/%20/g;e.exports={default:"RFC3986",formatters:{RFC1738:function(e){return r.call(e,i,"+")},RFC3986:function(e){return e}},RFC1738:"RFC1738",RFC3986:"RFC3986"}},function(e,t,n){"use strict";var r=Object.prototype.hasOwnProperty,i=function(){for(var e=[],t=0;t<256;++t)e.push("%"+((t<16?"0":"")+t.toString(16)).toUpperCase());return e}(),o=function(e){for(var t;e.length;){var n=e.pop();if(t=n.obj[n.prop],Array.isArray(t)){for(var r=[],i=0;i<t.length;++i)void 0!==t[i]&&r.push(t[i]);n.obj[n.prop]=r}}return t};t.arrayToObject=function(e,t){for(var n=t&&t.plainObjects?Object.create(null):{},r=0;r<e.length;++r)void 0!==e[r]&&(n[r]=e[r]);return n},t.merge=function(e,n,i){if(!n)return e;if("object"!=typeof n){if(Array.isArray(e))e.push(n);else{if("object"!=typeof e)return[e,n];(i.plainObjects||i.allowPrototypes||!r.call(Object.prototype,n))&&(e[n]=!0)}return e}if("object"!=typeof e)return[e].concat(n);var o=e;return Array.isArray(e)&&!Array.isArray(n)&&(o=t.arrayToObject(e,i)),Array.isArray(e)&&Array.isArray(n)?(n.forEach(function(n,o){r.call(e,o)?e[o]&&"object"==typeof e[o]?e[o]=t.merge(e[o],n,i):e.push(n):e[o]=n}),e):Object.keys(n).reduce(function(e,o){var a=n[o];return r.call(e,o)?e[o]=t.merge(e[o],a,i):e[o]=a,e},o)},t.assign=function(e,t){return Object.keys(t).reduce(function(e,n){return e[n]=t[n],e},e)},t.decode=function(e){try{return decodeURIComponent(e.replace(/\+/g," "))}catch(t){return e}},t.encode=function(e){if(0===e.length)return e;for(var t="string"==typeof e?e:String(e),n="",r=0;r<t.length;++r){var o=t.charCodeAt(r);45===o||46===o||95===o||126===o||o>=48&&o<=57||o>=65&&o<=90||o>=97&&o<=122?n+=t.charAt(r):o<128?n+=i[o]:o<2048?n+=i[192|o>>6]+i[128|63&o]:o<55296||o>=57344?n+=i[224|o>>12]+i[128|o>>6&63]+i[128|63&o]:(r+=1,o=65536+((1023&o)<<10|1023&t.charCodeAt(r)),n+=i[240|o>>18]+i[128|o>>12&63]+i[128|o>>6&63]+i[128|63&o])}return n},t.compact=function(e){for(var t=[{obj:{o:e},prop:"o"}],n=[],r=0;r<t.length;++r)for(var i=t[r],a=i.obj[i.prop],s=Object.keys(a),u=0;u<s.length;++u){var l=s[u],c=a[l];"object"==typeof c&&null!==c&&-1===n.indexOf(c)&&(t.push({obj:a,prop:l}),n.push(c))}return o(t)},t.isRegExp=function(e){return"[object RegExp]"===Object.prototype.toString.call(e)},t.isBuffer=function(e){return null!==e&&void 0!==e&&!!(e.constructor&&e.constructor.isBuffer&&e.constructor.isBuffer(e))}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.Collapse=void 0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(1085),m="IDLING",v=function(){return null},g={collapse:"ReactCollapse--collapse",content:"ReactCollapse--content"},y=t.Collapse=function(e){function t(e){o(this,t);var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return _.call(n),n.state={currentState:m,from:0,to:0},n}return s(t,e),l(t,[{key:"componentDidMount",value:function(){var e=this.props,t=e.isOpened,n=e.forceInitialAnimation,r=e.onRest;if(t){var i=this.getTo();if(n){var o=this.wrapper.clientHeight;this.setState({currentState:"RESIZING",from:o,to:i})}else this.setState({currentState:m,from:i,to:i})}r()}},{key:"componentWillReceiveProps",value:function(e){e.hasNestedCollapse?e.isOpened!==this.props.isOpened&&this.setState({currentState:"WAITING"}):this.state.currentState===m&&(e.isOpened||this.props.isOpened)&&this.setState({currentState:"WAITING"})}},{key:"componentDidUpdate",value:function(e,t){var n=this.props,r=n.isOpened,i=n.onRest,o=n.onMeasure;if(this.state.currentState===m)return void i();t.to!==this.state.to&&o({height:this.state.to,width:this.content.clientWidth});var a=this.wrapper.clientHeight,s=r?this.getTo():0;if(a!==s)return void this.setState({currentState:"RESIZING",from:a,to:s});"RESTING"!==this.state.currentState&&"WAITING"!==this.state.currentState||this.setState({currentState:m,from:a,to:s})}},{key:"componentWillUnmount",value:function(){cancelAnimationFrame(this.raf)}},{key:"render",value:function(){return p.default.createElement(d.Motion,u({},this.getMotionProps(),{onRest:this.onRest,children:this.renderContent}))}}]),t}(p.default.PureComponent);y.propTypes={isOpened:h.default.bool.isRequired,springConfig:h.default.objectOf(h.default.number),forceInitialAnimation:h.default.bool,hasNestedCollapse:h.default.bool,fixedHeight:h.default.number,theme:h.default.objectOf(h.default.string),style:h.default.object,onRender:h.default.func,onRest:h.default.func,onMeasure:h.default.func,children:h.default.node.isRequired},y.defaultProps={forceInitialAnimation:!1,hasNestedCollapse:!1,fixedHeight:-1,style:{},theme:g,onRender:v,onRest:v,onMeasure:v};var _=function(){var e=this;this.onContentRef=function(t){e.content=t},this.onWrapperRef=function(t){e.wrapper=t},this.onRest=function(){e.raf=requestAnimationFrame(e.setResting)},this.setResting=function(){e.setState({currentState:"RESTING"})},this.getTo=function(){var t=e.props.fixedHeight;return t>-1?t:e.content.clientHeight},this.getWrapperStyle=function(t){if(e.state.currentState===m&&e.state.to){var n=e.props.fixedHeight;return n>-1?{overflow:"hidden",height:n}:{height:"auto"}}return"WAITING"!==e.state.currentState||e.state.to?{overflow:"hidden",height:Math.max(0,t)}:{overflow:"hidden",height:0}},this.getMotionProps=function(){var t=e.props.springConfig;return e.state.currentState===m?{defaultStyle:{height:e.state.to},style:{height:e.state.to}}:{defaultStyle:{height:e.state.from},style:{height:(0,d.spring)(e.state.to,u({precision:1},t))}}},this.renderContent=function(t){var n=t.height,r=e.props,o=(r.isOpened,r.springConfig,r.forceInitialAnimation,r.hasNestedCollapse,r.fixedHeight,r.theme),a=r.style,s=r.onRender,l=(r.onRest,r.onMeasure,r.children),c=i(r,["isOpened","springConfig","forceInitialAnimation","hasNestedCollapse","fixedHeight","theme","style","onRender","onRest","onMeasure","children"]),f=e.state;return s({current:n,from:f.from,to:f.to}),p.default.createElement("div",u({ref:e.onWrapperRef,className:o.collapse,style:u({},e.getWrapperStyle(Math.max(0,n)),a)},c),p.default.createElement("div",{ref:e.onContentRef,className:o.content},l))}}},function(e,t,n){"use strict";var r=n(447),i=r.Collapse,o=n(1008),a=o.UnmountClosed;a.Collapse=i,a.UnmountClosed=a,e.exports=a},function(e,t,n){"use strict";e.exports=n(1022)},function(e,t,n){"use strict";function r(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var i={animationIterationCount:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},o=["Webkit","ms","Moz","O"];Object.keys(i).forEach(function(e){o.forEach(function(t){i[r(t,e)]=i[e]})});var a={background:{backgroundAttachment:!0,backgroundColor:!0,backgroundImage:!0,backgroundPositionX:!0,backgroundPositionY:!0,backgroundRepeat:!0},backgroundPosition:{backgroundPositionX:!0,backgroundPositionY:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0},outline:{outlineWidth:!0,outlineStyle:!0,outlineColor:!0}},s={isUnitlessNumber:i,shorthandPropertyExpansions:a};e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(11),o=n(70),a=(n(8),function(){function e(t){r(this,e),this._callbacks=null,this._contexts=null,this._arg=t}return e.prototype.enqueue=function(e,t){this._callbacks=this._callbacks||[],this._callbacks.push(e),this._contexts=this._contexts||[],this._contexts.push(t)},e.prototype.notifyAll=function(){var e=this._callbacks,t=this._contexts,n=this._arg;if(e&&t){e.length!==t.length&&i("24"),this._callbacks=null,this._contexts=null;for(var r=0;r<e.length;r++)e[r].call(t[r],n);e.length=0,t.length=0}},e.prototype.checkpoint=function(){return this._callbacks?this._callbacks.length:0},e.prototype.rollback=function(e){this._callbacks&&this._contexts&&(this._callbacks.length=e,this._contexts.length=e)},e.prototype.reset=function(){this._callbacks=null,this._contexts=null},e.prototype.destructor=function(){this.reset()},e}());e.exports=o.addPoolingTo(a)},function(e,t,n){"use strict";function r(e){return!!l.hasOwnProperty(e)||!u.hasOwnProperty(e)&&(s.test(e)?(l[e]=!0,!0):(u[e]=!0,!1))}function i(e,t){return null==t||e.hasBooleanValue&&!t||e.hasNumericValue&&isNaN(t)||e.hasPositiveNumericValue&&t<1||e.hasOverloadedBooleanValue&&!1===t}var o=n(89),a=(n(14),n(39),n(1070)),s=(n(10),new RegExp("^["+o.ATTRIBUTE_NAME_START_CHAR+"]["+o.ATTRIBUTE_NAME_CHAR+"]*$")),u={},l={},c={createMarkupForID:function(e){return o.ID_ATTRIBUTE_NAME+"="+a(e)},setAttributeForID:function(e,t){e.setAttribute(o.ID_ATTRIBUTE_NAME,t)},createMarkupForRoot:function(){return o.ROOT_ATTRIBUTE_NAME+'=""'},setAttributeForRoot:function(e){e.setAttribute(o.ROOT_ATTRIBUTE_NAME,"")},createMarkupForProperty:function(e,t){var n=o.properties.hasOwnProperty(e)?o.properties[e]:null;if(n){if(i(n,t))return"";var r=n.attributeName;return n.hasBooleanValue||n.hasOverloadedBooleanValue&&!0===t?r+'=""':r+"="+a(t)}return o.isCustomAttribute(e)?null==t?"":e+"="+a(t):null},createMarkupForCustomAttribute:function(e,t){return r(e)&&null!=t?e+"="+a(t):""},setValueForProperty:function(e,t,n){var r=o.properties.hasOwnProperty(t)?o.properties[t]:null;if(r){var a=r.mutationMethod;if(a)a(e,n);else{if(i(r,n))return void this.deleteValueForProperty(e,t);if(r.mustUseProperty)e[r.propertyName]=n;else{var s=r.attributeName,u=r.attributeNamespace;u?e.setAttributeNS(u,s,""+n):r.hasBooleanValue||r.hasOverloadedBooleanValue&&!0===n?e.setAttribute(s,""):e.setAttribute(s,""+n)}}}else if(o.isCustomAttribute(t))return void c.setValueForAttribute(e,t,n)},setValueForAttribute:function(e,t,n){if(r(t)){null==n?e.removeAttribute(t):e.setAttribute(t,""+n)}},deleteValueForAttribute:function(e,t){e.removeAttribute(t)},deleteValueForProperty:function(e,t){var n=o.properties.hasOwnProperty(t)?o.properties[t]:null;if(n){var r=n.mutationMethod;if(r)r(e,void 0);else if(n.mustUseProperty){var i=n.propertyName;n.hasBooleanValue?e[i]=!1:e[i]=""}else e.removeAttribute(n.attributeName)}else o.isCustomAttribute(t)&&e.removeAttribute(t)}};e.exports=c},function(e,t,n){"use strict";var r={hasCachedChildNodes:1};e.exports=r},function(e,t,n){"use strict";function r(){if(this._rootNodeID&&this._wrapperState.pendingUpdate){this._wrapperState.pendingUpdate=!1;var e=this._currentElement.props,t=s.getValue(e);null!=t&&i(this,Boolean(e.multiple),t)}}function i(e,t,n){var r,i,o=u.getNodeFromInstance(e).options;if(t){for(r={},i=0;i<n.length;i++)r[""+n[i]]=!0;for(i=0;i<o.length;i++){var a=r.hasOwnProperty(o[i].value);o[i].selected!==a&&(o[i].selected=a)}}else{for(r=""+n,i=0;i<o.length;i++)if(o[i].value===r)return void(o[i].selected=!0);o.length&&(o[0].selected=!0)}}function o(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return this._rootNodeID&&(this._wrapperState.pendingUpdate=!0),l.asap(r,this),n}var a=n(13),s=n(245),u=n(14),l=n(44),c=(n(10),!1),p={getHostProps:function(e,t){return a({},t,{onChange:e._wrapperState.onChange,value:void 0})},mountWrapper:function(e,t){var n=s.getValue(t);e._wrapperState={pendingUpdate:!1,initialValue:null!=n?n:t.defaultValue,listeners:null,onChange:o.bind(e),wasMultiple:Boolean(t.multiple)},void 0===t.value||void 0===t.defaultValue||c||(c=!0)},getSelectValueContext:function(e){return e._wrapperState.initialValue},postUpdateWrapper:function(e){var t=e._currentElement.props;e._wrapperState.initialValue=void 0;var n=e._wrapperState.wasMultiple;e._wrapperState.wasMultiple=Boolean(t.multiple);var r=s.getValue(t);null!=r?(e._wrapperState.pendingUpdate=!1,i(e,Boolean(t.multiple),r)):n!==Boolean(t.multiple)&&(null!=t.defaultValue?i(e,Boolean(t.multiple),t.defaultValue):i(e,Boolean(t.multiple),t.multiple?[]:""))}};e.exports=p},function(e,t,n){"use strict";var r,i={injectEmptyComponentFactory:function(e){r=e}},o={create:function(e){return r(e)}};o.injection=i,e.exports=o},function(e,t,n){"use strict";var r={logTopLevelRenders:!1};e.exports=r},function(e,t,n){"use strict";function r(e){return s||a("111",e.type),new s(e)}function i(e){return new u(e)}function o(e){return e instanceof u}var a=n(11),s=(n(8),null),u=null,l={injectGenericComponentClass:function(e){s=e},injectTextComponentClass:function(e){u=e}},c={createInternalComponent:r,createInstanceForText:i,isTextComponent:o,injection:l};e.exports=c},function(e,t,n){"use strict";function r(e){return o(document.documentElement,e)}var i=n(1030),o=n(748),a=n(378),s=n(379),u={hasSelectionCapabilities:function(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&("input"===t&&"text"===e.type||"textarea"===t||"true"===e.contentEditable)},getSelectionInformation:function(){var e=s();return{focusedElem:e,selectionRange:u.hasSelectionCapabilities(e)?u.getSelection(e):null}},restoreSelection:function(e){var t=s(),n=e.focusedElem,i=e.selectionRange;t!==n&&r(n)&&(u.hasSelectionCapabilities(n)&&u.setSelection(n,i),a(n))},getSelection:function(e){var t;if("selectionStart"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart("character",-e.value.length),end:-n.moveEnd("character",-e.value.length)})}else t=i.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if(void 0===r&&(r=n),"selectionStart"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var o=e.createTextRange();o.collapse(!0),o.moveStart("character",n),o.moveEnd("character",r-n),o.select()}else i.setOffsets(e,t)}};e.exports=u},function(e,t,n){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;r<n;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function i(e){return e?e.nodeType===R?e.documentElement:e.firstChild:null}function o(e){return e.getAttribute&&e.getAttribute(T)||""}function a(e,t,n,r,i){var o;if(x.logTopLevelRenders){var a=e._currentElement.props.child,s=a.type;o="React mount: "+("string"==typeof s?s:s.displayName||s.name),console.time(o)}var u=E.mountComponent(e,n,null,_(e,t),i,0);o&&console.timeEnd(o),e._renderedComponent._topLevelWrapper=e,L._mountImageIntoNode(u,t,e,r,n)}function s(e,t,n,r){var i=C.ReactReconcileTransaction.getPooled(!n&&b.useCreateElement);i.perform(a,null,e,t,i,n,r),C.ReactReconcileTransaction.release(i)}function u(e,t,n){for(E.unmountComponent(e,n),t.nodeType===R&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)}function l(e){var t=i(e);if(t){var n=y.getInstanceFromNode(t);return!(!n||!n._hostParent)}}function c(e){return!(!e||e.nodeType!==I&&e.nodeType!==R&&e.nodeType!==j)}function p(e){var t=i(e),n=t&&y.getInstanceFromNode(t);return n&&!n._hostParent?n:null}function f(e){var t=p(e);return t?t._hostContainerInfo._topLevelWrapper:null}var h=n(11),d=n(88),m=n(89),v=n(92),g=n(159),y=(n(52),n(14)),_=n(1024),b=n(1026),x=n(456),w=n(124),k=(n(39),n(1040)),E=n(90),S=n(248),C=n(44),A=n(144),D=n(467),O=(n(8),n(163)),M=n(254),T=(n(10),m.ID_ATTRIBUTE_NAME),P=m.ROOT_ATTRIBUTE_NAME,I=1,R=9,j=11,F={},N=1,B=function(){this.rootID=N++};B.prototype.isReactComponent={},B.prototype.render=function(){return this.props.child},B.isReactTopLevelWrapper=!0;var L={TopLevelWrapper:B,_instancesByReactRootID:F,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r,i){return L.scrollMonitor(r,function(){S.enqueueElementInternal(e,t,n),i&&S.enqueueCallbackInternal(e,i)}),e},_renderNewRootComponent:function(e,t,n,r){c(t)||h("37"),g.ensureScrollValueMonitoring();var i=D(e,!1);C.batchedUpdates(s,i,t,n,r);var o=i._instance.rootID;return F[o]=i,i},renderSubtreeIntoContainer:function(e,t,n,r){return null!=e&&w.has(e)||h("38"),L._renderSubtreeIntoContainer(e,t,n,r)},_renderSubtreeIntoContainer:function(e,t,n,r){S.validateCallback(r,"ReactDOM.render"),v.isValidElement(t)||h("39","string"==typeof t?" Instead of passing a string like 'div', pass React.createElement('div') or <div />.":"function"==typeof t?" Instead of passing a class like Foo, pass React.createElement(Foo) or <Foo />.":null!=t&&void 0!==t.props?" This may be caused by unintentionally loading two independent copies of React.":"");var a,s=v.createElement(B,{child:t});if(e){var u=w.get(e);a=u._processChildContext(u._context)}else a=A;var c=f(n);if(c){var p=c._currentElement,d=p.props.child;if(M(d,t)){var m=c._renderedComponent.getPublicInstance(),g=r&&function(){r.call(m)};return L._updateRootComponent(c,s,a,n,g),m}L.unmountComponentAtNode(n)}var y=i(n),_=y&&!!o(y),b=l(n),x=_&&!c&&!b,k=L._renderNewRootComponent(s,n,x,a)._renderedComponent.getPublicInstance();return r&&r.call(k),k},render:function(e,t,n){return L._renderSubtreeIntoContainer(null,e,t,n)},unmountComponentAtNode:function(e){c(e)||h("40");var t=f(e);if(!t){l(e),1===e.nodeType&&e.hasAttribute(P);return!1}return delete F[t._instance.rootID],C.batchedUpdates(u,t,e,!1),!0},_mountImageIntoNode:function(e,t,n,o,a){if(c(t)||h("41"),o){var s=i(t);if(k.canReuseMarkup(e,s))return void y.precacheNode(n,s);var u=s.getAttribute(k.CHECKSUM_ATTR_NAME);s.removeAttribute(k.CHECKSUM_ATTR_NAME);var l=s.outerHTML;s.setAttribute(k.CHECKSUM_ATTR_NAME,u);var p=e,f=r(p,l),m=" (client) "+p.substring(f-20,f+20)+"\n (server) "+l.substring(f-20,f+20);t.nodeType===R&&h("42",m)}if(t.nodeType===R&&h("43"),a.useCreateElement){for(;t.lastChild;)t.removeChild(t.lastChild);d.insertTreeBefore(t,e,null)}else O(t,e),y.precacheNode(n,t.firstChild)}};e.exports=L},function(e,t,n){"use strict";var r=n(11),i=n(92),o=(n(8),{HOST:0,COMPOSITE:1,EMPTY:2,getType:function(e){return null===e||!1===e?o.EMPTY:i.isValidElement(e)?"function"==typeof e.type?o.COMPOSITE:o.HOST:void r("26",e)}});e.exports=o},function(e,t,n){"use strict";var r={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){r.currentScrollLeft=e.x,r.currentScrollTop=e.y}};e.exports=r},function(e,t,n){"use strict";function r(e,t){return null==t&&i("30"),null==e?t:Array.isArray(e)?Array.isArray(t)?(e.push.apply(e,t),e):(e.push(t),e):Array.isArray(t)?[e].concat(t):[e,t]}var i=n(11);n(8);e.exports=r},function(e,t,n){"use strict";function r(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)}e.exports=r},function(e,t,n){"use strict";function r(e){for(var t;(t=e._renderedNodeType)===i.COMPOSITE;)e=e._renderedComponent;return t===i.HOST?e._renderedComponent:t===i.EMPTY?null:void 0}var i=n(460);e.exports=r},function(e,t,n){"use strict";function r(){return!o&&i.canUseDOM&&(o="textContent"in document.documentElement?"textContent":"innerText"),o}var i=n(25),o=null;e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.type,n=e.nodeName;return n&&"input"===n.toLowerCase()&&("checkbox"===t||"radio"===t)}function i(e){return e._wrapperState.valueTracker}function o(e,t){e._wrapperState.valueTracker=t}function a(e){e._wrapperState.valueTracker=null}function s(e){var t;return e&&(t=r(e)?""+e.checked:e.value),t}var u=n(14),l={_getTrackerFromNode:function(e){return i(u.getInstanceFromNode(e))},track:function(e){if(!i(e)){var t=u.getNodeFromInstance(e),n=r(t)?"checked":"value",s=Object.getOwnPropertyDescriptor(t.constructor.prototype,n),l=""+t[n];t.hasOwnProperty(n)||"function"!=typeof s.get||"function"!=typeof s.set||(Object.defineProperty(t,n,{enumerable:s.enumerable,configurable:!0,get:function(){return s.get.call(this)},set:function(e){l=""+e,s.set.call(this,e)}}),o(e,{getValue:function(){return l},setValue:function(e){l=""+e},stopTracking:function(){a(e),delete t[n]}}))}},updateValueIfChanged:function(e){if(!e)return!1;var t=i(e);if(!t)return l.track(e),!0;var n=t.getValue(),r=s(u.getNodeFromInstance(e));return r!==n&&(t.setValue(r),!0)},stopTracking:function(e){var t=i(e);t&&t.stopTracking()}};e.exports=l},function(e,t,n){"use strict";function r(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}function i(e){return"function"==typeof e&&void 0!==e.prototype&&"function"==typeof e.prototype.mountComponent&&"function"==typeof e.prototype.receiveComponent}function o(e,t){var n;if(null===e||!1===e)n=l.create(o);else if("object"==typeof e){var s=e,u=s.type;if("function"!=typeof u&&"string"!=typeof u){var f="";f+=r(s._owner),a("130",null==u?u:typeof u,f)}"string"==typeof s.type?n=c.createInternalComponent(s):i(s.type)?(n=new s.type(s),n.getHostNode||(n.getHostNode=n.getNativeNode)):n=new p(s)}else"string"==typeof e||"number"==typeof e?n=c.createInstanceForText(e):a("131",typeof e);return n._mountIndex=0,n._mountImage=null,n}var a=n(11),s=n(13),u=n(1021),l=n(455),c=n(457),p=(n(1106),n(8),n(10),function(e){this.construct(e)});s(p.prototype,u,{_instantiateReactComponent:o}),e.exports=o},function(e,t,n){"use strict";function r(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return"input"===t?!!i[e.type]:"textarea"===t}var i={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};e.exports=r},function(e,t,n){"use strict";var r=n(25),i=n(162),o=n(163),a=function(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&3===n.nodeType)return void(n.nodeValue=t)}e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(a=function(e,t){if(3===e.nodeType)return void(e.nodeValue=t);o(e,i(t))})),e.exports=a},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function i(e,t,n,o){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(o,e,""===t?c+r(e,0):t),1;var h,d,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)h=e[g],d=v+r(h,g),m+=i(h,d,n,o);else{var y=u(e);if(y){var _,b=y.call(e);if(y!==e.entries)for(var x=0;!(_=b.next()).done;)h=_.value,d=v+r(h,x++),m+=i(h,d,n,o);else for(;!(_=b.next()).done;){var w=_.value;w&&(h=w[1],d=v+l.escape(w[0])+p+r(h,0),m+=i(h,d,n,o))}}else if("object"===f){var k="",E=String(e);a("31","[object Object]"===E?"object with keys {"+Object.keys(e).join(", ")+"}":E,k)}}return m}function o(e,t,n){return null==e?0:i(e,"",t,n)}var a=n(11),s=(n(52),n(1036)),u=n(1067),l=(n(8),n(244)),c=(n(10),"."),p=":";e.exports=o},function(e,t,n){"use strict";t.__esModule=!0,t.default={noWobble:{stiffness:170,damping:26},gentle:{stiffness:120,damping:14},wobbly:{stiffness:180,damping:12},stiff:{stiffness:210,damping:20}},e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r=n(1),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.default=i.default.shape({subscribe:i.default.func.isRequired,dispatch:i.default.func.isRequired,getState:i.default.func.isRequired})},function(e,t,n){"use strict";function r(e){"undefined"!=typeof console&&"function"==typeof console.error&&console.error(e);try{throw new Error(e)}catch(e){}}t.__esModule=!0,t.default=r},function(e,t,n){"use strict";function r(e,t,n){this.props=e,this.context=t,this.refs=l,this.updater=n||u}function i(e,t,n){this.props=e,this.context=t,this.refs=l,this.updater=n||u}function o(){}var a=n(126),s=n(13),u=n(477),l=(n(478),n(144));n(8),n(1107);r.prototype.isReactComponent={},r.prototype.setState=function(e,t){"object"!=typeof e&&"function"!=typeof e&&null!=e&&a("85"),this.updater.enqueueSetState(this,e),t&&this.updater.enqueueCallback(this,t,"setState")},r.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this),e&&this.updater.enqueueCallback(this,e,"forceUpdate")};o.prototype=r.prototype,i.prototype=new o,i.prototype.constructor=i,s(i.prototype,r.prototype),i.prototype.isPureReactComponent=!0,e.exports={Component:r,PureComponent:i}},function(e,t,n){"use strict";function r(e){var t=Function.prototype.toString,n=Object.prototype.hasOwnProperty,r=RegExp("^"+t.call(n).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");try{var i=t.call(e);return r.test(i)}catch(e){return!1}}function i(e){var t=l(e);if(t){var n=t.childIDs;c(e),n.forEach(i)}}function o(e,t,n){return"\n    in "+(e||"Unknown")+(t?" (at "+t.fileName.replace(/^.*[\\\/]/,"")+":"+t.lineNumber+")":n?" (created by "+n+")":"")}function a(e){return null==e?"#empty":"string"==typeof e||"number"==typeof e?"#text":"string"==typeof e.type?e.type:e.type.displayName||e.type.name||"Unknown"}function s(e){var t,n=S.getDisplayName(e),r=S.getElement(e),i=S.getOwnerID(e);return i&&(t=S.getDisplayName(i)),o(n,r&&r._source,t)}var u,l,c,p,f,h,d,m=n(126),v=n(52),g=(n(8),n(10),"function"==typeof Array.from&&"function"==typeof Map&&r(Map)&&null!=Map.prototype&&"function"==typeof Map.prototype.keys&&r(Map.prototype.keys)&&"function"==typeof Set&&r(Set)&&null!=Set.prototype&&"function"==typeof Set.prototype.keys&&r(Set.prototype.keys));if(g){var y=new Map,_=new Set;u=function(e,t){y.set(e,t)},l=function(e){return y.get(e)},c=function(e){y.delete(e)},p=function(){return Array.from(y.keys())},f=function(e){_.add(e)},h=function(e){_.delete(e)},d=function(){return Array.from(_.keys())}}else{var b={},x={},w=function(e){return"."+e},k=function(e){return parseInt(e.substr(1),10)};u=function(e,t){var n=w(e);b[n]=t},l=function(e){var t=w(e);return b[t]},c=function(e){var t=w(e);delete b[t]},p=function(){return Object.keys(b).map(k)},f=function(e){var t=w(e);x[t]=!0},h=function(e){var t=w(e);delete x[t]},d=function(){return Object.keys(x).map(k)}}var E=[],S={onSetChildren:function(e,t){var n=l(e);n||m("144"),n.childIDs=t;for(var r=0;r<t.length;r++){var i=t[r],o=l(i);o||m("140"),null==o.childIDs&&"object"==typeof o.element&&null!=o.element&&m("141"),o.isMounted||m("71"),null==o.parentID&&(o.parentID=e),o.parentID!==e&&m("142",i,o.parentID,e)}},onBeforeMountComponent:function(e,t,n){u(e,{element:t,parentID:n,text:null,childIDs:[],isMounted:!1,updateCount:0})},onBeforeUpdateComponent:function(e,t){var n=l(e);n&&n.isMounted&&(n.element=t)},onMountComponent:function(e){var t=l(e);t||m("144"),t.isMounted=!0,0===t.parentID&&f(e)},onUpdateComponent:function(e){var t=l(e);t&&t.isMounted&&t.updateCount++},onUnmountComponent:function(e){var t=l(e);if(t){t.isMounted=!1;0===t.parentID&&h(e)}E.push(e)},purgeUnmountedComponents:function(){if(!S._preventPurging){for(var e=0;e<E.length;e++){i(E[e])}E.length=0}},isMounted:function(e){var t=l(e);return!!t&&t.isMounted},getCurrentStackAddendum:function(e){var t="";if(e){var n=a(e),r=e._owner;t+=o(n,e._source,r&&r.getName())}var i=v.current,s=i&&i._debugID;return t+=S.getStackAddendumByID(s)},getStackAddendumByID:function(e){for(var t="";e;)t+=s(e),e=S.getParentID(e);return t},getChildIDs:function(e){var t=l(e);return t?t.childIDs:[]},getDisplayName:function(e){var t=S.getElement(e);return t?a(t):null},getElement:function(e){var t=l(e);return t?t.element:null},getOwnerID:function(e){var t=S.getElement(e);return t&&t._owner?t._owner._debugID:null},getParentID:function(e){var t=l(e);return t?t.parentID:null},getSource:function(e){var t=l(e),n=t?t.element:null;return null!=n?n._source:null},getText:function(e){var t=S.getElement(e);return"string"==typeof t?t:"number"==typeof t?""+t:null},getUpdateCount:function(e){var t=l(e);return t?t.updateCount:0},getRootIDs:d,getRegisteredIDs:p,pushNonStandardWarningStack:function(e,t){if("function"==typeof console.reactStack){var n=[],r=v.current,i=r&&r._debugID;try{for(e&&n.push({name:i?S.getDisplayName(i):null,fileName:t?t.fileName:null,lineNumber:t?t.lineNumber:null});i;){var o=S.getElement(i),a=S.getParentID(i),s=S.getOwnerID(i),u=s?S.getDisplayName(s):null,l=o&&o._source;n.push({name:u,fileName:l?l.fileName:null,lineNumber:l?l.lineNumber:null}),i=a}}catch(e){}console.reactStack(n)}},popNonStandardWarningStack:function(){"function"==typeof console.reactStackEnd&&console.reactStackEnd()}};e.exports=S},function(e,t,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=r},function(e,t,n){"use strict";var r=(n(10),{isMounted:function(e){return!1},enqueueCallback:function(e,t){},enqueueForceUpdate:function(e){},enqueueReplaceState:function(e,t){},enqueueSetState:function(e,t){}});e.exports=r},function(e,t,n){"use strict";var r=!1;e.exports=r},function(e,t,n){"use strict";(function(t,r){function i(e){return N.from(e)}function o(e){return N.isBuffer(e)||e instanceof B}function a(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?R(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}function s(e,t){I=I||n(71),e=e||{},this.objectMode=!!e.objectMode,t instanceof I&&(this.objectMode=this.objectMode||!!e.readableObjectMode);var r=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=Math.floor(this.highWaterMark),this.buffer=new W,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.destroyed=!1,this.defaultEncoding=e.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,e.encoding&&(U||(U=n(265).StringDecoder),this.decoder=new U(e.encoding),this.encoding=e.encoding)}function u(e){if(I=I||n(71),!(this instanceof u))return new u(e);this._readableState=new s(e,this),this.readable=!0,e&&("function"==typeof e.read&&(this._read=e.read),"function"==typeof e.destroy&&(this._destroy=e.destroy)),F.call(this)}function l(e,t,n,r,o){var a=e._readableState;if(null===t)a.reading=!1,m(e,a);else{var s;o||(s=p(a,t)),s?e.emit("error",s):a.objectMode||t&&t.length>0?("string"==typeof t||a.objectMode||Object.getPrototypeOf(t)===N.prototype||(t=i(t)),r?a.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):c(e,a,t,!0):a.ended?e.emit("error",new Error("stream.push() after EOF")):(a.reading=!1,a.decoder&&!n?(t=a.decoder.write(t),a.objectMode||0!==t.length?c(e,a,t,!1):y(e,a)):c(e,a,t,!1))):r||(a.reading=!1)}return f(a)}function c(e,t,n,r){t.flowing&&0===t.length&&!t.sync?(e.emit("data",n),e.read(0)):(t.length+=t.objectMode?1:n.length,r?t.buffer.unshift(n):t.buffer.push(n),t.needReadable&&v(e)),y(e,t)}function p(e,t){var n;return o(t)||"string"==typeof t||void 0===t||e.objectMode||(n=new TypeError("Invalid non-string/buffer chunk")),n}function f(e){return!e.ended&&(e.needReadable||e.length<e.highWaterMark||0===e.length)}function h(e){return e>=G?e=G:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}function d(e,t){return e<=0||0===t.length&&t.ended?0:t.objectMode?1:e!==e?t.flowing&&t.length?t.buffer.head.data.length:t.length:(e>t.highWaterMark&&(t.highWaterMark=h(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function m(e,t){if(!t.ended){if(t.decoder){var n=t.decoder.end();n&&n.length&&(t.buffer.push(n),t.length+=t.objectMode?1:n.length)}t.ended=!0,v(e)}}function v(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(z("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?P(g,e):g(e))}function g(e){z("emit readable"),e.emit("readable"),E(e)}function y(e,t){t.readingMore||(t.readingMore=!0,P(_,e,t))}function _(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length<t.highWaterMark&&(z("maybeReadMore read 0"),e.read(0),n!==t.length);)n=t.length;t.readingMore=!1}function b(e){return function(){var t=e._readableState;z("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&j(e,"data")&&(t.flowing=!0,E(e))}}function x(e){z("readable nexttick read 0"),e.read(0)}function w(e,t){t.resumeScheduled||(t.resumeScheduled=!0,P(k,e,t))}function k(e,t){t.reading||(z("resume read 0"),e.read(0)),t.resumeScheduled=!1,t.awaitDrain=0,e.emit("resume"),E(e),t.flowing&&!t.reading&&e.read(0)}function E(e){var t=e._readableState;for(z("flow",t.flowing);t.flowing&&null!==e.read(););}function S(e,t){if(0===t.length)return null;var n;return t.objectMode?n=t.buffer.shift():!e||e>=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=C(e,t.buffer,t.decoder),n}function C(e,t,n){var r;return e<t.head.data.length?(r=t.head.data.slice(0,e),t.head.data=t.head.data.slice(e)):r=e===t.head.data.length?t.shift():n?A(e,t):D(e,t),r}function A(e,t){var n=t.head,r=1,i=n.data;for(e-=i.length;n=n.next;){var o=n.data,a=e>o.length?o.length:e;if(a===o.length?i+=o:i+=o.slice(0,e),0===(e-=a)){a===o.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=o.slice(a));break}++r}return t.length-=r,i}function D(e,t){var n=N.allocUnsafe(e),r=t.head,i=1;for(r.data.copy(n),e-=r.data.length;r=r.next;){var o=r.data,a=e>o.length?o.length:e;if(o.copy(n,n.length-e,0,a),0===(e-=a)){a===o.length?(++i,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=o.slice(a));break}++i}return t.length-=i,n}function O(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,P(M,t,e))}function M(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function T(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1}var P=n(158);e.exports=u;var I,R=n(387);u.ReadableState=s;var j=(n(143).EventEmitter,function(e,t){return e.listeners(t).length}),F=n(482),N=n(167).Buffer,B=t.Uint8Array||function(){},L=n(111);L.inherits=n(42);var q=n(1212),z=void 0;z=q&&q.debuglog?q.debuglog("stream"):function(){};var U,W=n(1112),V=n(481);L.inherits(u,F);var H=["error","close","destroy","pause","resume"];Object.defineProperty(u.prototype,"destroyed",{get:function(){return void 0!==this._readableState&&this._readableState.destroyed},set:function(e){this._readableState&&(this._readableState.destroyed=e)}}),u.prototype.destroy=V.destroy,u.prototype._undestroy=V.undestroy,u.prototype._destroy=function(e,t){this.push(null),t(e)},u.prototype.push=function(e,t){var n,r=this._readableState;return r.objectMode?n=!0:"string"==typeof e&&(t=t||r.defaultEncoding,t!==r.encoding&&(e=N.from(e,t),t=""),n=!0),l(this,e,t,!1,n)},u.prototype.unshift=function(e){return l(this,e,null,!0,!1)},u.prototype.isPaused=function(){return!1===this._readableState.flowing},u.prototype.setEncoding=function(e){return U||(U=n(265).StringDecoder),this._readableState.decoder=new U(e),this._readableState.encoding=e,this};var G=8388608;u.prototype.read=function(e){z("read",e),e=parseInt(e,10);var t=this._readableState,n=e;if(0!==e&&(t.emittedReadable=!1),0===e&&t.needReadable&&(t.length>=t.highWaterMark||t.ended))return z("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?O(this):v(this),null;if(0===(e=d(e,t))&&t.ended)return 0===t.length&&O(this),null;var r=t.needReadable;z("need readable",r),(0===t.length||t.length-e<t.highWaterMark)&&(r=!0,z("length less than watermark",r)),t.ended||t.reading?(r=!1,z("reading or ended",r)):r&&(z("do read"),t.reading=!0,t.sync=!0,0===t.length&&(t.needReadable=!0),this._read(t.highWaterMark),t.sync=!1,t.reading||(e=d(n,t)));var i;return i=e>0?S(e,t):null,null===i?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&O(this)),null!==i&&this.emit("data",i),i},u.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},u.prototype.pipe=function(e,t){function n(e,t){z("onunpipe"),e===f&&t&&!1===t.hasUnpiped&&(t.hasUnpiped=!0,o())}function i(){z("onend"),e.end()}function o(){z("cleanup"),e.removeListener("close",l),e.removeListener("finish",c),e.removeListener("drain",v),e.removeListener("error",u),e.removeListener("unpipe",n),f.removeListener("end",i),f.removeListener("end",p),f.removeListener("data",s),g=!0,!h.awaitDrain||e._writableState&&!e._writableState.needDrain||v()}function s(t){z("ondata"),y=!1,!1!==e.write(t)||y||((1===h.pipesCount&&h.pipes===e||h.pipesCount>1&&-1!==T(h.pipes,e))&&!g&&(z("false write response, pause",f._readableState.awaitDrain),f._readableState.awaitDrain++,y=!0),f.pause())}function u(t){z("onerror",t),p(),e.removeListener("error",u),0===j(e,"error")&&e.emit("error",t)}function l(){e.removeListener("finish",c),p()}function c(){z("onfinish"),e.removeListener("close",l),p()}function p(){z("unpipe"),f.unpipe(e)}var f=this,h=this._readableState;switch(h.pipesCount){case 0:h.pipes=e;break;case 1:h.pipes=[h.pipes,e];break;default:h.pipes.push(e)}h.pipesCount+=1,z("pipe count=%d opts=%j",h.pipesCount,t);var d=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr,m=d?i:p;h.endEmitted?P(m):f.once("end",m),e.on("unpipe",n);var v=b(f);e.on("drain",v);var g=!1,y=!1;return f.on("data",s),a(e,"error",u),e.once("close",l),e.once("finish",c),e.emit("pipe",f),h.flowing||(z("pipe resume"),f.resume()),e},u.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,i=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var o=0;o<i;o++)r[o].emit("unpipe",this,n);return this}var a=T(t.pipes,e);return-1===a?this:(t.pipes.splice(a,1),t.pipesCount-=1,1===t.pipesCount&&(t.pipes=t.pipes[0]),e.emit("unpipe",this,n),this)},u.prototype.on=function(e,t){var n=F.prototype.on.call(this,e,t);if("data"===e)!1!==this._readableState.flowing&&this.resume();else if("readable"===e){var r=this._readableState;r.endEmitted||r.readableListening||(r.readableListening=r.needReadable=!0,r.emittedReadable=!1,r.reading?r.length&&v(this):P(x,this))}return n},u.prototype.addListener=u.prototype.on,u.prototype.resume=function(){var e=this._readableState;return e.flowing||(z("resume"),e.flowing=!0,w(this,e)),this},u.prototype.pause=function(){return z("call pause flowing=%j",this._readableState.flowing),!1!==this._readableState.flowing&&(z("pause"),this._readableState.flowing=!1,this.emit("pause")),this},u.prototype.wrap=function(e){var t=this._readableState,n=!1,r=this;e.on("end",function(){if(z("wrapped end"),t.decoder&&!t.ended){var e=t.decoder.end();e&&e.length&&r.push(e)}r.push(null)}),e.on("data",function(i){if(z("wrapped data"),t.decoder&&(i=t.decoder.write(i)),(!t.objectMode||null!==i&&void 0!==i)&&(t.objectMode||i&&i.length)){r.push(i)||(n=!0,e.pause())}});for(var i in e)void 0===this[i]&&"function"==typeof e[i]&&(this[i]=function(t){return function(){return e[t].apply(e,arguments)}}(i));for(var o=0;o<H.length;o++)e.on(H[o],r.emit.bind(r,H[o]));return r._read=function(t){z("wrapped _read",t),n&&(n=!1,e.resume())},r},u._fromList=S}).call(t,n(17),n(33))},function(e,t,n){"use strict";function r(e){this.afterTransform=function(t,n){return i(e,t,n)},this.needTransform=!1,this.transforming=!1,this.writecb=null,this.writechunk=null,this.writeencoding=null}function i(e,t,n){var r=e._transformState;r.transforming=!1;var i=r.writecb;if(!i)return e.emit("error",new Error("write callback called multiple times"));r.writechunk=null,r.writecb=null,null!==n&&void 0!==n&&e.push(n),i(t);var o=e._readableState;o.reading=!1,(o.needReadable||o.length<o.highWaterMark)&&e._read(o.highWaterMark)}function o(e){if(!(this instanceof o))return new o(e);s.call(this,e),this._transformState=new r(this);var t=this;this._readableState.needReadable=!0,this._readableState.sync=!1,e&&("function"==typeof e.transform&&(this._transform=e.transform),"function"==typeof e.flush&&(this._flush=e.flush)),this.once("prefinish",function(){"function"==typeof this._flush?this._flush(function(e,n){a(t,e,n)}):a(t)})}function a(e,t,n){if(t)return e.emit("error",t);null!==n&&void 0!==n&&e.push(n);var r=e._writableState,i=e._transformState;if(r.length)throw new Error("Calling transform done when ws.length != 0");if(i.transforming)throw new Error("Calling transform done when still transforming");return e.push(null)}e.exports=o;var s=n(71),u=n(111);u.inherits=n(42),u.inherits(o,s),o.prototype.push=function(e,t){return this._transformState.needTransform=!1,s.prototype.push.call(this,e,t)},o.prototype._transform=function(e,t,n){throw new Error("_transform() is not implemented")},o.prototype._write=function(e,t,n){var r=this._transformState;if(r.writecb=n,r.writechunk=e,r.writeencoding=t,!r.transforming){var i=this._readableState;(r.needTransform||i.needReadable||i.length<i.highWaterMark)&&this._read(i.highWaterMark)}},o.prototype._read=function(e){var t=this._transformState;null!==t.writechunk&&t.writecb&&!t.transforming?(t.transforming=!0,this._transform(t.writechunk,t.writeencoding,t.afterTransform)):t.needTransform=!0},o.prototype._destroy=function(e,t){var n=this;s.prototype._destroy.call(this,e,function(e){t(e),n.emit("close")})}},function(e,t,n){"use strict";function r(e,t){var n=this,r=this._readableState&&this._readableState.destroyed,i=this._writableState&&this._writableState.destroyed;if(r||i)return void(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||a(o,this,e));this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(a(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)})}function i(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function o(e,t){e.emit("error",t)}var a=n(158);e.exports={destroy:r,undestroy:i}},function(e,t,n){e.exports=n(143).EventEmitter},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return e&&"@@redux/INIT"===e.type?"initialState argument passed to createStore":"previous state received by the reducer"},e.exports=t.default},function(e,t,n){"use strict";function r(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return 0===t.length?function(e){return e}:1===t.length?t[0]:t.reduce(function(e,t){return function(){return e(t.apply(void 0,arguments))}})}t.a=r},function(e,t,n){"use strict";function r(e,t,o){function u(){y===g&&(y=g.slice())}function l(){return v}function c(e){if("function"!=typeof e)throw new Error("Expected listener to be a function.");var t=!0;return u(),y.push(e),function(){if(t){t=!1,u();var n=y.indexOf(e);y.splice(n,1)}}}function p(e){if(!n.i(i.a)(e))throw new Error("Actions must be plain objects. Use custom middleware for async actions.");if(void 0===e.type)throw new Error('Actions may not have an undefined "type" property. Have you misspelled a constant?');if(_)throw new Error("Reducers may not dispatch actions.");try{_=!0,v=m(v,e)}finally{_=!1}for(var t=g=y,r=0;r<t.length;r++){(0,t[r])()}return e}function f(e){if("function"!=typeof e)throw new Error("Expected the nextReducer to be a function.");m=e,p({type:s.INIT})}function h(){var e,t=c;return e={subscribe:function(e){function n(){e.next&&e.next(l())}if("object"!=typeof e)throw new TypeError("Expected the observer to be an object.");return n(),{unsubscribe:t(n)}}},e[a.a]=function(){return this},e}var d;if("function"==typeof t&&void 0===o&&(o=t,t=void 0),void 0!==o){if("function"!=typeof o)throw new Error("Expected the enhancer to be a function.");return o(r)(e,t)}if("function"!=typeof e)throw new Error("Expected the reducer to be a function.");var m=e,v=t,g=[],y=g,_=!1;return p({type:s.INIT}),d={dispatch:p,subscribe:c,getState:l,replaceReducer:f},d[a.a]=h,d}n.d(t,"b",function(){return s}),t.a=r;var i=n(391),o=n(1182),a=n.n(o),s={INIT:"@@redux/INIT"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(485),i=n(1123),o=n(1122),a=n(1121),s=n(484);n(487);n.d(t,"createStore",function(){return r.a}),n.d(t,"combineReducers",function(){return i.a}),n.d(t,"bindActionCreators",function(){return o.a}),n.d(t,"applyMiddleware",function(){return a.a}),n.d(t,"compose",function(){return s.a})},function(e,t,n){"use strict"},function(e,t,n){"use strict";e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",AMP:"&",amp:"&",And:"⩓",and:"∧",andand:"⩕",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsd:"∡",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",ap:"≈",apacir:"⩯",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",Barwed:"⌆",barwed:"⌅",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",Because:"∵",because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxDL:"╗",boxDl:"╖",boxdL:"╕",boxdl:"┐",boxDR:"╔",boxDr:"╓",boxdR:"╒",boxdr:"┌",boxH:"═",boxh:"─",boxHD:"╦",boxHd:"╤",boxhD:"╥",boxhd:"┬",boxHU:"╩",boxHu:"╧",boxhU:"╨",boxhu:"┴",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxUL:"╝",boxUl:"╜",boxuL:"╛",boxul:"┘",boxUR:"╚",boxUr:"╙",boxuR:"╘",boxur:"└",boxV:"║",boxv:"│",boxVH:"╬",boxVh:"╫",boxvH:"╪",boxvh:"┼",boxVL:"╣",boxVl:"╢",boxvL:"╡",boxvl:"┤",boxVR:"╠",boxVr:"╟",boxvR:"╞",boxvr:"├",bprime:"‵",Breve:"˘",breve:"˘",brvbar:"¦",Bscr:"ℬ",bscr:"𝒷",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsol:"\\",bsolb:"⧅",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",Cap:"⋒",cap:"∩",capand:"⩄",capbrcup:"⩉",capcap:"⩋",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",CenterDot:"·",centerdot:"·",Cfr:"ℭ",cfr:"𝔠",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",cir:"○",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",Colon:"∷",colon:":",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",Conint:"∯",conint:"∮",ContourIntegral:"∮",Copf:"ℂ",copf:"𝕔",coprod:"∐",Coproduct:"∐",COPY:"©",copy:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",Cross:"⨯",cross:"✗",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",Cup:"⋓",cup:"∪",cupbrcap:"⩈",CupCap:"≍",cupcap:"⩆",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",Dagger:"‡",dagger:"†",daleth:"ℸ",Darr:"↡",dArr:"⇓",darr:"↓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",DD:"ⅅ",dd:"ⅆ",ddagger:"‡",ddarr:"⇊",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",Diamond:"⋄",diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrow:"↓",Downarrow:"⇓",downarrow:"↓",DownArrowBar:"⤓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVector:"↽",DownLeftVectorBar:"⥖",DownRightTeeVector:"⥟",DownRightVector:"⇁",DownRightVectorBar:"⥗",DownTee:"⊤",DownTeeArrow:"↧",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",ecir:"≖",Ecirc:"Ê",ecirc:"ê",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",eDot:"≑",edot:"ė",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp:" ",emsp13:" ",emsp14:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",Escr:"ℰ",escr:"ℯ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",ExponentialE:"ⅇ",exponentiale:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",ForAll:"∀",forall:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",Fscr:"ℱ",fscr:"𝒻",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",gE:"≧",ge:"≥",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",ges:"⩾",gescc:"⪩",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",Gg:"⋙",gg:"≫",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gl:"≷",gla:"⪥",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gnE:"≩",gne:"⪈",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",GT:">",Gt:"≫",gt:">",gtcc:"⪧",gtcir:"⩺",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",hArr:"⇔",harr:"↔",harrcir:"⥈",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",Hfr:"ℌ",hfr:"𝔥",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",Hopf:"ℍ",hopf:"𝕙",horbar:"―",HorizontalLine:"─",Hscr:"ℋ",hscr:"𝒽",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",Ifr:"ℑ",ifr:"𝔦",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Im:"ℑ",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",imof:"⊷",imped:"Ƶ",Implies:"⇒",in:"∈",incare:"℅",infin:"∞",infintie:"⧝",inodot:"ı",Int:"∬",int:"∫",intcal:"⊺",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",Iscr:"ℐ",iscr:"𝒾",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",Lang:"⟪",lang:"⟨",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",Larr:"↞",lArr:"⇐",larr:"←",larrb:"⇤",larrbfs:"⤟",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",lat:"⪫",lAtail:"⤛",latail:"⤙",late:"⪭",lates:"⪭︀",lBarr:"⤎",lbarr:"⤌",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",lE:"≦",le:"≤",LeftAngleBracket:"⟨",LeftArrow:"←",Leftarrow:"⇐",leftarrow:"←",LeftArrowBar:"⇤",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVector:"⇃",LeftDownVectorBar:"⥙",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrow:"↔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTee:"⊣",LeftTeeArrow:"↤",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangle:"⊲",LeftTriangleBar:"⧏",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVector:"↿",LeftUpVectorBar:"⥘",LeftVector:"↼",LeftVectorBar:"⥒",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",les:"⩽",lescc:"⪨",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",Ll:"⋘",ll:"≪",llarr:"⇇",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoust:"⎰",lmoustache:"⎰",lnap:"⪉",lnapprox:"⪉",lnE:"≨",lne:"⪇",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftarrow:"⟵",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longleftrightarrow:"⟷",longmapsto:"⟼",LongRightArrow:"⟶",Longrightarrow:"⟹",longrightarrow:"⟶",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",Lscr:"ℒ",lscr:"𝓁",Lsh:"↰",lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",LT:"<",Lt:"≪",lt:"<",ltcc:"⪦",ltcir:"⩹",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",mid:"∣",midast:"*",midcir:"⫰",middot:"·",minus:"−",minusb:"⊟",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",Mscr:"ℳ",mscr:"𝓂",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natur:"♮",natural:"♮",naturals:"ℕ",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",ne:"≠",nearhk:"⤤",neArr:"⇗",nearr:"↗",nearrow:"↗",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nhArr:"⇎",nharr:"↮",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlArr:"⇍",nlarr:"↚",nldr:"‥",nlE:"≦̸",nle:"≰",nLeftarrow:"⇍",nleftarrow:"↚",nLeftrightarrow:"⇎",nleftrightarrow:"↮",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",Nopf:"ℕ",nopf:"𝕟",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangle:"⋪",NotLeftTriangleBar:"⧏̸",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangle:"⋫",NotRightTriangleBar:"⧐̸",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",npar:"∦",nparallel:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",npre:"⪯̸",nprec:"⊀",npreceq:"⪯̸",nrArr:"⇏",nrarr:"↛",nrarrc:"⤳̸",nrarrw:"↝̸",nRightarrow:"⇏",nrightarrow:"↛",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nVDash:"⊯",nVdash:"⊮",nvDash:"⊭",nvdash:"⊬",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwArr:"⇖",nwarr:"↖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",ocir:"⊚",Ocirc:"Ô",ocirc:"ô",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",Or:"⩔",or:"∨",orarr:"↻",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",Otimes:"⨷",otimes:"⊗",otimesas:"⨶",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",par:"∥",para:"¶",parallel:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plus:"+",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",Popf:"ℙ",popf:"𝕡",pound:"£",Pr:"⪻",pr:"≺",prap:"⪷",prcue:"≼",prE:"⪳",pre:"⪯",prec:"≺",precapprox:"⪷",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",precsim:"≾",Prime:"″",prime:"′",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportion:"∷",Proportional:"∝",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",Qopf:"ℚ",qopf:"𝕢",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",QUOT:'"',quot:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",Rang:"⟫",rang:"⟩",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",Rarr:"↠",rArr:"⇒",rarr:"→",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",rAtail:"⤜",ratail:"⤚",ratio:"∶",rationals:"ℚ",RBarr:"⤐",rBarr:"⤏",rbarr:"⤍",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",Re:"ℜ",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",rect:"▭",REG:"®",reg:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",Rfr:"ℜ",rfr:"𝔯",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrow:"→",Rightarrow:"⇒",rightarrow:"→",RightArrowBar:"⇥",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVector:"⇂",RightDownVectorBar:"⥕",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTee:"⊢",RightTeeArrow:"↦",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangle:"⊳",RightTriangleBar:"⧐",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVector:"↾",RightUpVectorBar:"⥔",RightVector:"⇀",RightVectorBar:"⥓",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoust:"⎱",rmoustache:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",Ropf:"ℝ",ropf:"𝕣",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",Rscr:"ℛ",rscr:"𝓇",Rsh:"↱",rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",Sc:"⪼",sc:"≻",scap:"⪸",Scaron:"Š",scaron:"š",sccue:"≽",scE:"⪴",sce:"⪰",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdot:"⋅",sdotb:"⊡",sdote:"⩦",searhk:"⤥",seArr:"⇘",searr:"↘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",sol:"/",solb:"⧄",solbar:"⌿",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",squ:"□",Square:"□",square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",Sub:"⋐",sub:"⊂",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",Subset:"⋐",subset:"⊂",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succ:"≻",succapprox:"⪸",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",Sum:"∑",sum:"∑",sung:"♪",Sup:"⋑",sup:"⊃",sup1:"¹",sup2:"²",sup3:"³",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",Supset:"⋑",supset:"⊃",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swArr:"⇙",swarr:"↙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",Therefore:"∴",therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",thinsp:" ",ThinSpace:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",Tilde:"∼",tilde:"˜",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",times:"×",timesb:"⊠",timesbar:"⨱",timesd:"⨰",tint:"∭",toea:"⤨",top:"⊤",topbot:"⌶",topcir:"⫱",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",TRADE:"™",trade:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",Uarr:"↟",uArr:"⇑",uarr:"↑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrow:"↑",Uparrow:"⇑",uparrow:"↑",UpArrowBar:"⤒",UpArrowDownArrow:"⇅",UpDownArrow:"↕",Updownarrow:"⇕",updownarrow:"↕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",Upsi:"ϒ",upsi:"υ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTee:"⊥",UpTeeArrow:"↥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",vArr:"⇕",varr:"↕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",Vbar:"⫫",vBar:"⫨",vBarv:"⫩",Vcy:"В",vcy:"в",VDash:"⊫",Vdash:"⊩",vDash:"⊨",vdash:"⊢",Vdashl:"⫦",Vee:"⋁",vee:"∨",veebar:"⊻",veeeq:"≚",vellip:"⋮",Verbar:"‖",verbar:"|",Vert:"‖",vert:"|",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",Wedge:"⋀",wedge:"∧",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xhArr:"⟺",xharr:"⟷",Xi:"Ξ",xi:"ξ",xlArr:"⟸",xlarr:"⟵",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrArr:"⟹",xrarr:"⟶",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",Yuml:"Ÿ",yuml:"ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",Zfr:"ℨ",zfr:"𝔷",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",Zopf:"ℤ",zopf:"𝕫",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},function(e,t,n){"use strict";var r=n(26).replaceEntities;e.exports=function(e){var t=r(e);try{t=decodeURI(t)}catch(e){}return encodeURI(t)}},function(e,t,n){"use strict";e.exports=function(e){return e.trim().replace(/\s+/g," ").toUpperCase()}},function(e,t,n){"use strict";var r=n(489),i=n(26).unescapeMd;e.exports=function(e,t){var n,o,a,s=t,u=e.posMax;if(60===e.src.charCodeAt(t)){for(t++;t<u;){if(10===(n=e.src.charCodeAt(t)))return!1;if(62===n)return a=r(i(e.src.slice(s+1,t))),!!e.parser.validateLink(a)&&(e.pos=t+1,e.linkContent=a,!0);92===n&&t+1<u?t+=2:t++}return!1}for(o=0;t<u&&32!==(n=e.src.charCodeAt(t))&&!(n>8&&n<14);)if(92===n&&t+1<u)t+=2;else{if(40===n&&++o>1)break;if(41===n&&--o<0)break;t++}return s!==t&&(a=i(e.src.slice(s,t)),!!e.parser.validateLink(a)&&(e.linkContent=a,e.pos=t,!0))}},function(e,t,n){"use strict";var r=n(26).unescapeMd;e.exports=function(e,t){var n,i=t,o=e.posMax,a=e.src.charCodeAt(t);if(34!==a&&39!==a&&40!==a)return!1;for(t++,40===a&&(a=41);t<o;){if((n=e.src.charCodeAt(t))===a)return e.pos=t+1,e.linkContent=r(e.src.slice(i+1,t)),!0;92===n&&t+1<o?t+=2:t++}return!1}},function(e,t,n){function r(){i.call(this)}e.exports=r;var i=n(143).EventEmitter;n(42)(r,i),r.Readable=n(262),r.Writable=n(1115),r.Duplex=n(1110),r.Transform=n(1114),r.PassThrough=n(1113),r.Stream=r,r.prototype.pipe=function(e,t){function n(t){e.writable&&!1===e.write(t)&&l.pause&&l.pause()}function r(){l.readable&&l.resume&&l.resume()}function o(){c||(c=!0,e.end())}function a(){c||(c=!0,"function"==typeof e.destroy&&e.destroy())}function s(e){if(u(),0===i.listenerCount(this,"error"))throw e}function u(){l.removeListener("data",n),e.removeListener("drain",r),l.removeListener("end",o),l.removeListener("close",a),l.removeListener("error",s),e.removeListener("error",s),l.removeListener("end",u),l.removeListener("close",u),e.removeListener("close",u)}var l=this;l.on("data",n),e.on("drain",r),e._isStdio||t&&!1===t.end||(l.on("end",o),l.on("close",a));var c=!1;return l.on("error",s),e.on("error",s),l.on("end",u),l.on("close",u),e.on("close",u),e.emit("pipe",l),e}},function(e,t){/*! http://mths.be/repeat v0.2.0 by @mathias */
+String.prototype.repeat||function(){"use strict";var e=function(){try{var e={},t=Object.defineProperty,n=t(e,e,e)&&t}catch(e){}return n}(),t=function(e){if(null==this)throw TypeError();var t=String(this),n=e?Number(e):0;if(n!=n&&(n=0),n<0||n==1/0)throw RangeError();for(var r="";n;)n%2==1&&(r+=t),n>1&&(t+=t),n>>=1;return r};e?e(String.prototype,"repeat",{value:t,configurable:!0,writable:!0}):String.prototype.repeat=t}()},function(e,t,n){e.exports=function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=58)}([function(e,t){e.exports=n(47)},function(e,t){e.exports=n(30)},function(e,t){e.exports=n(48)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.openapi;return!!t&&(0,b.default)(t,"3")}function o(e){var t=e.swagger;return!!t&&(0,b.default)(t,"2")}function a(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return e&&"object"===(void 0===e?"undefined":(0,v.default)(e))?(e.operationId||"").replace(/\s/g,"").length?w(e.operationId):s(t,n):null}function s(e,t){return""+x(t)+w(e)}function u(e,t){return x(t)+"-"+e}function l(e,t){return e&&e.paths?c(e,function(e){var n=e.pathName,r=e.method,i=e.operation;if(!i||"object"!==(void 0===i?"undefined":(0,v.default)(i)))return!1;var o=i.operationId;return[a(i,n,r),u(n,r),o].some(function(e){return e&&e===t})}):null}function c(e,t){return p(e,t,!0)||null}function p(e,t,n){if(!e||"object"!==(void 0===e?"undefined":(0,v.default)(e))||!e.paths||"object"!==(0,v.default)(e.paths))return null;var r=e.paths;for(var i in r)for(var o in r[i])if("PARAMETERS"!==o.toUpperCase()){var a=r[i][o];if(a&&"object"===(void 0===a?"undefined":(0,v.default)(a))){var s={spec:e,pathName:i,method:o.toUpperCase(),operation:a},u=t(s);if(n&&u)return s}}}function f(e){var t=e.spec,n=t.paths,r={};if(!n)return e;for(var i in n){var o=n[i];if((0,y.default)(o)){var s=o.parameters;for(var u in o)!function(e){var n=o[e];if(!(0,y.default)(n))return"continue";var u=a(n,i,e);if(u){r[u]?r[u].push(n):r[u]=[n];var l=r[u];if(l.length>1)l.forEach(function(e,t){e.__originalOperationId=e.__originalOperationId||e.operationId,e.operationId=""+u+(t+1)});else if(void 0!==n.operationId){var c=l[0];c.__originalOperationId=c.__originalOperationId||n.operationId,c.operationId=u}}if("parameters"!==e){var p=[],f={};for(var h in t)"produces"!==h&&"consumes"!==h&&"security"!==h||(f[h]=t[h],p.push(f));if(s&&(f.parameters=s,p.push(f)),p.length){var m=!0,v=!1,g=void 0;try{for(var _,b=(0,d.default)(p);!(m=(_=b.next()).done);m=!0){var x=_.value;for(var w in x)if(n[w]){if("parameters"===w){var k=!0,E=!1,S=void 0;try{for(var C,A=(0,d.default)(x[w]);!(k=(C=A.next()).done);k=!0)!function(){var e=C.value;n[w].some(function(t){return t.name===e.name})||n[w].push(e)}()}catch(e){E=!0,S=e}finally{try{!k&&A.return&&A.return()}finally{if(E)throw S}}}}else n[w]=x[w]}}catch(e){v=!0,g=e}finally{try{!m&&b.return&&b.return()}finally{if(v)throw g}}}}}(u)}}return e}Object.defineProperty(t,"__esModule",{value:!0});var h=n(13),d=r(h),m=n(2),v=r(m);t.isOAS3=i,t.isSwagger2=o,t.opId=a,t.idFromPathMethod=s,t.legacyIdFromPathMethod=u,t.getOperationRaw=l,t.findOperation=c,t.eachOperation=p,t.normalizeSwagger=f;var g=n(51),y=r(g),_=n(19),b=r(_),x=function(e){return String.prototype.toLowerCase.call(e)},w=function(e){return e.replace(/[^\w]/gi,"_")}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return"object"===(void 0===e?"undefined":(0,b.default)(e))&&(t=e,e=t.url),t.headers=t.headers||{},A.mergeInQueryOrForm(t),t.requestInterceptor&&(t=t.requestInterceptor(t)||t),/multipart\/form-data/i.test(t.headers["content-type"]||t.headers["Content-Type"])&&(delete t.headers["content-type"],delete t.headers["Content-Type"]),(t.userFetch||fetch)(t.url,t).then(function(n){var r=A.serializeRes(n,e,t).then(function(e){return t.responseInterceptor&&(e=t.responseInterceptor(e)||e),e});if(!n.ok){var i=new Error(n.statusText);return i.statusCode=i.status=n.status,r.then(function(e){throw i.response=e,i},function(e){throw i.responseError=e,i})}return r})}function o(e,t){return"application/json"===t?JSON.parse(e):E.default.safeLoad(e)}function a(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=n.loadSpec,i=void 0!==r&&r,a={ok:e.ok,url:e.url||t,status:e.status,statusText:e.statusText,headers:s(e.headers)},u=a.headers["content-type"],l=i||D(u);return(l?e.text:e.blob||e.buffer).call(e).then(function(e){if(a.text=e,a.data=e,l)try{var t=o(e,u);a.body=t,a.obj=t}catch(e){a.parseError=e}return a})}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t={};return"function"==typeof e.forEach?(e.forEach(function(e,n){void 0!==t[n]?(t[n]=Array.isArray(t[n])?t[n]:[t[n]],t[n].push(e)):t[n]=e}),t):t}function u(e){return"undefined"!=typeof File?e instanceof File:null!==e&&"object"===(void 0===e?"undefined":(0,b.default)(e))&&"function"==typeof e.pipe}function l(e,t){var n=e.collectionFormat,r=e.allowEmptyValue,i="object"===(void 0===e?"undefined":(0,b.default)(e))?e.value:e,o={csv:",",ssv:"%20",tsv:"%09",pipes:"|"};if(void 0===i&&r)return"";if(u(i)||"boolean"==typeof i)return i;var a=encodeURIComponent;return t&&(a=(0,C.default)(i)?function(e){return e}:function(e){return(0,y.default)(e)}),"object"!==(void 0===i?"undefined":(0,b.default)(i))||Array.isArray(i)?Array.isArray(i)?Array.isArray(i)&&!n?i.map(a).join(","):"multi"===n?i.map(a):i.map(a).join(o[n]):a(i):""}function c(e){var t=(0,v.default)(e).reduce(function(t,n){var r=e[n],i=!!r.skipEncoding,o=i?n:encodeURIComponent(n),a=function(e){return e&&"object"===(void 0===e?"undefined":(0,b.default)(e))}(r)&&!Array.isArray(r);return t[o]=l(a?r:{value:r},i),t},{});return w.default.stringify(t,{encode:!1,indices:!1})||""}function p(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.url,r=void 0===t?"":t,i=e.query,o=e.form;if(o){var a=(0,v.default)(o).some(function(e){return u(o[e].value)}),s=e.headers["content-type"]||e.headers["Content-Type"];if(a||/multipart\/form-data/i.test(s)){var p=n(46);e.body=new p,(0,v.default)(o).forEach(function(t){e.body.append(t,l(o[t],!0))})}else e.body=c(o);delete e.form}if(i){var f=r.split("?"),h=(0,d.default)(f,2),m=h[0],g=h[1],y="";if(g){var _=w.default.parse(g);(0,v.default)(i).forEach(function(e){return delete _[e]}),y=w.default.stringify(_,{encode:!0})}var b=function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];var r=t.filter(function(e){return e}).join("&");return r?"?"+r:""}(y,c(i));e.url=m+b,delete e.query}return e}function f(e,t,n){return n=n||function(e){return e},t=t||function(e){return e},function(r){return"string"==typeof r&&(r={url:r}),A.mergeInQueryOrForm(r),r=t(r),n(e(r))}}Object.defineProperty(t,"__esModule",{value:!0}),t.shouldDownloadAsText=t.self=void 0;var h=n(38),d=r(h),m=n(0),v=r(m),g=n(6),y=r(g),_=n(2),b=r(_);t.default=i,t.serializeRes=a,t.serializeHeaders=s,t.encodeFormOrQuery=c,t.mergeInQueryOrForm=p,t.makeHttp=f,n(42);var x=n(55),w=r(x),k=n(47),E=r(k),S=n(53),C=r(S),A=t.self={serializeRes:a,mergeInQueryOrForm:p},D=t.shouldDownloadAsText=function(){return/(json|xml|yaml|text)\b/.test(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t,n){if(n=n||{},t=(0,z.default)({},t,{path:t.path&&o(t.path)}),"merge"===t.op){var r=I(e,t.path);(0,z.default)(r,t.value),W.default.applyPatch(e,[s(t.path,r)])}else if("mergeDeep"===t.op){var i=I(e,t.path),a=(0,z.default)({},i);(0,J.default)(i,t.value);for(var u in t.value)if(Object.prototype.hasOwnProperty.call(t.value,u)){var l=t.value[u];if(Array.isArray(l)){var c=a[u]||[];i[u]=c.concat(l)}}}else if("add"===t.op&&""===t.path&&k(t.value)){var p=(0,L.default)(t.value).reduce(function(e,n){return e.push({op:"add",path:"/"+o(n),value:t.value[n]}),e},[]);W.default.applyPatch(e,p)}else if("replace"===t.op&&""===t.path){var f=t.value;n.allowMetaPatches&&t.meta&&M(t)&&(Array.isArray(t.value)||k(t.value))&&(f=(0,z.default)({},f,t.meta)),e=f}else if(W.default.applyPatch(e,[t]),n.allowMetaPatches&&t.meta&&M(t)&&(Array.isArray(t.value)||k(t.value))){var h=I(e,t.path),d=(0,z.default)({},h,t.meta);W.default.applyPatch(e,[s(t.path,d)])}return e}function o(e){return Array.isArray(e)?e.length<1?"":"/"+e.map(function(e){return(e+"").replace(/~/g,"~0").replace(/\//g,"~1")}).join("/"):e}function a(e,t){return{op:"add",path:e,value:t}}function s(e,t,n){return{op:"replace",path:e,value:t,meta:n}}function u(e,t){return{op:"remove",path:e}}function l(e,t){return{type:"mutation",op:"merge",path:e,value:t}}function c(e,t){return{type:"mutation",op:"mergeDeep",path:e,value:t}}function p(e,t){return{type:"context",path:e,value:t}}function f(e,t){try{return d(e,v,t)}catch(e){return e}}function h(e,t){try{return d(e,m,t)}catch(e){return e}}function d(e,t,n){return w(x(e.filter(M).map(function(e){return t(e.value,n,e.path)})||[]))}function m(e,t,n){return n=n||[],Array.isArray(e)?e.map(function(e,r){return m(e,t,n.concat(r))}):k(e)?(0,L.default)(e).map(function(r){return m(e[r],t,n.concat(r))}):t(e,n[n.length-1],n)}function v(e,t,n){n=n||[];var r=[];if(n.length>0){var i=t(e,n[n.length-1],n);i&&(r=r.concat(i))}if(Array.isArray(e)){var o=e.map(function(e,r){return v(e,t,n.concat(r))});o&&(r=r.concat(o))}else if(k(e)){var a=(0,L.default)(e).map(function(r){return v(e[r],t,n.concat(r))});a&&(r=r.concat(a))}return r=x(r)}function g(e,t){if(!Array.isArray(t))return!1;for(var n=0,r=t.length;n<r;n++)if(t[n]!==e[n])return!1;return!0}function y(e,t){return t.reduce(function(e,t){return void 0!==t&&e?e[t]:e},e)}function _(e){return w(x(b(e)))}function b(e){return Array.isArray(e)?e:[e]}function x(e){var t;return(t=[]).concat.apply(t,(0,N.default)(e.map(function(e){return Array.isArray(e)?x(e):e})))}function w(e){return e.filter(function(e){return void 0!==e})}function k(e){return e&&"object"===(void 0===e?"undefined":(0,j.default)(e))}function E(e){return k(e)&&S(e.then)}function S(e){return e&&"function"==typeof e}function C(e){return e instanceof Error}function A(e){if(P(e)){var t=e.op;return"add"===t||"remove"===t||"replace"===t}return!1}function D(e){return H.default.isGeneratorFunction(e)}function O(e){return A(e)||P(e)&&"mutation"===e.type}function M(e){return O(e)&&("add"===e.op||"replace"===e.op||"merge"===e.op||"mergeDeep"===e.op)}function T(e){return P(e)&&"context"===e.type}function P(e){return e&&"object"===(void 0===e?"undefined":(0,j.default)(e))}function I(e,t){try{return W.default.getValueByPointer(e,t)}catch(e){return console.error(e),{}}}Object.defineProperty(t,"__esModule",{value:!0});var R=n(2),j=r(R),F=n(39),N=r(F),B=n(0),L=r(B),q=n(1),z=r(q),U=n(45),W=r(U),V=n(17),H=r(V),G=n(43),J=r(G);t.default={add:a,replace:s,remove:u,merge:l,mergeDeep:c,context:p,getIn:y,applyPatch:i,parentPathMatch:g,flatten:x,fullyNormalizeArray:_,normalizeArray:b,isPromise:E,forEachNew:f,forEachNewPrimitive:h,isJsonPatch:A,isContextPatch:T,isPatch:P,isMutation:O,isAdditiveMutation:M,isGenerator:D,isFunction:S,isObject:k,isError:C}},function(e,t){e.exports=n(35)},function(e,t){e.exports=n(21)},function(e,t){e.exports=n(939)},function(e,t){e.exports=n(572)},function(e,t){e.exports=n(497)},function(e,t,n){"use strict";function r(e){var t=e[e.length-1],n=e.join("/");return i.indexOf(t)>-1||o.indexOf(n)>-1}Object.defineProperty(t,"__esModule",{value:!0}),t.isFreelyNamed=r;var i=["properties"],o=["definitions","parameters","responses","securityDefinitions","components/schemas","components/responses","components/parameters","components/securitySchemes"]},function(e,t,n){"use strict";function r(e,t){function n(){Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack;for(var e=arguments.length,n=Array(e),r=0;r<e;r++)n[r]=arguments[r];this.message=n[0],t&&t.apply(this,n)}return n.prototype=new Error,n.prototype.name=e,n.prototype.constructor=n,n}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t){e.exports=n(95)},function(e,t){e.exports=n(332)},function(e,t){e.exports=n(2)},function(e,t){e.exports=n(3)},function(e,t){e.exports=n(569)},function(e,t){e.exports=n(224)},function(e,t){e.exports=n(956)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if("string"==typeof e?n.url=e:n=e,!(this instanceof i))return new i(n);(0,l.default)(this,n);var r=this.resolve().then(function(){return t.disableInterfaces||(0,l.default)(t,i.makeApisTagOperation(t)),t});return r.client=this,r}var o=n(7),a=r(o),s=n(48),u=(r(s),n(8)),l=r(u),c=n(19),p=r(c),f=n(10),h=r(f),d=n(4),m=r(d),v=n(28),g=r(v),y=n(27),_=n(21),b=n(3);i.http=m.default,i.makeHttp=d.makeHttp.bind(null,i.http),i.resolve=g.default,i.execute=_.execute,i.serializeRes=d.serializeRes,i.serializeHeaders=d.serializeHeaders,i.clearCache=v.clearCache,i.parameterBuilders=_.PARAMETER_BUILDERS,i.makeApisTagOperation=y.makeApisTagOperation,i.buildRequest=_.buildRequest,i.helpers={opId:b.opId},e.exports=i,i.prototype={http:m.default,execute:function(e){return this.applyDefaults(),i.execute((0,a.default)({spec:this.spec,http:this.http,securities:{authorized:this.authorizations}},e))},resolve:function(){var e=this;return i.resolve({spec:this.spec,url:this.url,allowMetaPatches:this.allowMetaPatches,requestInterceptor:this.requestInterceptor||null,responseInterceptor:this.responseInterceptor||null}).then(function(t){return e.originalSpec=e.spec,e.spec=t.spec,e.errors=t.errors,e})}},i.prototype.applyDefaults=function(){var e=this.spec,t=this.url;if(t&&(0,p.default)(t,"http")){var n=h.default.parse(t);e.host||(e.host=n.host),e.schemes||(e.schemes=[n.protocol.replace(":","")]),e.basePath||(e.basePath="/")}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.http,n=e.fetch,r=e.spec,i=e.operationId,o=e.pathName,a=e.method,s=e.parameters,u=e.securities,l=(0,v.default)(e,["http","fetch","spec","operationId","pathName","method","parameters","securities"]),c=t||n||R.default;o&&a&&!i&&(i=(0,H.legacyIdFromPathMethod)(o,a));var p=Y.buildRequest((0,d.default)({spec:r,operationId:i,parameters:s,securities:u,http:c},l));return p.body&&((0,S.default)(p.body)||(0,A.default)(p.body))&&(p.body=(0,f.default)(p.body)),c(p)}function o(e){var t=e.spec,n=e.operationId,r=(e.securities,e.requestContentType,e.responseContentType),i=e.scheme,o=e.requestInterceptor,s=e.responseInterceptor,u=e.contextUrl,l=e.userFetch,c=(e.requestBody,e.server),p=e.serverVariables,f=e.http,h=e.parameters,m=e.parameterBuilders,v=(0,H.isOAS3)(t);m||(m=v?q.default:B.default);var g=f&&f.withCredentials?"include":"same-origin",_={url:"",credentials:g,headers:{},cookies:{}};o&&(_.requestInterceptor=o),s&&(_.responseInterceptor=s),l&&(_.userFetch=l);var b=(0,H.getOperationRaw)(t,n);if(!b)throw new J("Operation "+n+" not found");var x=b.operation,w=void 0===x?{}:x,k=b.method,E=b.pathName;if(_.url+=a({spec:t,scheme:i,contextUrl:u,server:c,serverVariables:p,pathName:E,method:k}),!n)return delete _.cookies,_;_.url+=E,_.method=(""+k).toUpperCase(),h=h||{};var S=t.paths[E]||{};r&&(_.headers.accept=r);var C=X([].concat(G(w.parameters)).concat(G(S.parameters)));C.forEach(function(e){var n=m[e.in],r=void 0;if("body"===e.in&&e.schema&&e.schema.properties&&(r=h),r=e&&e.name&&h[e.name],void 0===r?r=e&&e.name&&h[e.in+"."+e.name]:K(e.name,C).length>1&&console.warn("Parameter '"+e.name+"' is ambiguous because the defined spec has more than one parameter with the name: '"+e.name+"' and the passed-in parameter values did not define an 'in' value."),void 0!==e.default&&void 0===r&&(r=e.default),void 0===r&&e.required&&!e.allowEmptyValue)throw new Error("Required parameter "+e.name+" is not provided");n&&n({req:_,parameter:e,value:r,operation:w,spec:t})});var A=(0,d.default)({},e,{operation:w});if(_=v?(0,U.default)(A,_):(0,V.default)(A,_),_.cookies&&(0,y.default)(_.cookies).length){var D=(0,y.default)(_.cookies).reduce(function(e,t){var n=_.cookies[t];return e+(e?"&":"")+P.default.serialize(t,n)},"");_.headers.Cookie=D}return _.cookies&&delete _.cookies,(0,I.mergeInQueryOrForm)(_),_}function a(e){return(0,H.isOAS3)(e.spec)?s(e):c(e)}function s(e){var t=e.spec,n=e.pathName,r=e.method,i=e.server,o=e.contextUrl,a=e.serverVariables,s=void 0===a?{}:a,c=(0,k.default)(t,["paths",n,(r||"").toLowerCase(),"servers"])||(0,k.default)(t,["paths",n,"servers"])||(0,k.default)(t,["servers"]),p="",f=null;if(i&&c){var h=c.map(function(e){return e.url});h.indexOf(i)>-1&&(p=i,f=c[h.indexOf(i)])}return!p&&c&&(p=c[0].url,f=c[0]),p.indexOf("{")>-1&&l(p).forEach(function(e){if(f.variables&&f.variables[e]){var t=f.variables[e],n=s[e]||t.default,r=new RegExp("{"+e+"}","g");p=p.replace(r,n)}}),u(p,o)}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=M.default.parse(e),r=M.default.parse(t),i=$(n.protocol)||$(r.protocol)||"",o=n.host||r.host,a=n.pathname||"",s=void 0;return s=i&&o?i+"://"+(o+a):a,"/"===s[s.length-1]?s.slice(0,-1):s}function l(e){for(var t=[],n=/{([^}]+)}/g,r=void 0;r=n.exec(e);)t.push(r[1]);return t}function c(e){var t=e.spec,n=e.scheme,r=e.contextUrl,i=void 0===r?"":r,o=M.default.parse(i),a=Array.isArray(t.schemes)?t.schemes[0]:null,s=n||a||$(o.protocol)||"http",u=t.host||o.host||"",l=t.basePath||"",c=void 0;return c=s&&u?s+"://"+(u+l):l,"/"===c[c.length-1]?c.slice(0,-1):c}Object.defineProperty(t,"__esModule",{value:!0}),t.self=void 0;var p=n(6),f=r(p),h=n(7),d=r(h),m=n(37),v=r(m),g=n(0),y=r(g),_=n(1),b=r(_);t.execute=i,t.buildRequest=o,t.baseUrl=a;var x=n(8),w=(r(x),n(18)),k=r(w),E=n(52),S=r(E),C=n(50),A=r(C),D=n(9),O=(r(D),n(10)),M=r(O),T=n(40),P=r(T),I=n(4),R=r(I),j=n(12),F=r(j),N=n(26),B=r(N),L=n(23),q=r(L),z=n(22),U=r(z),W=n(25),V=r(W),H=n(3),G=function(e){return Array.isArray(e)?e:[]},J=(0,F.default)("OperationNotFoundError",function(e,t,n){this.originalError=n,(0,b.default)(this,t||{})}),K=function(e,t){return t.filter(function(t){return t.name===e})},X=function(e){var t={};e.forEach(function(e){t[e.in]||(t[e.in]={}),t[e.in][e.name]=e});var n=[];return(0,y.default)(t).forEach(function(e){(0,y.default)(t[e]).forEach(function(r){n.push(t[e][r])})}),n},Y=t.self={buildRequest:o},$=function(e){return e?e.replace(/\W/g,""):null}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.request,n=e.securities,r=void 0===n?{}:n,i=e.operation,o=void 0===i?{}:i,a=e.spec,s=(0,f.default)({},t),u=r.authorized,l=void 0===u?{}:u,p=o.security||a.security||[],h=l&&!!(0,c.default)(l).length,m=(0,d.default)(a,["components","securitySchemes"])||{};return s.headers=s.headers||{},s.query=s.query||{},(0,c.default)(r).length&&h&&p&&(!Array.isArray(o.security)||o.security.length)?(p.forEach(function(e,t){for(var n in e){var r=l[n],i=m[n];if(r){var o=r.value||r,a=i.type;if(r)if("apiKey"===a)"query"===i.in&&(s.query[i.name]=o),"header"===i.in&&(s.headers[i.name]=o),"cookie"===i.in&&(s.cookies[i.name]=o);else if("http"===a){if("basic"===i.scheme){var u=o.username,c=o.password,p=(0,v.default)(u+":"+c);s.headers.Authorization="Basic "+p}"bearer"===i.scheme&&(s.headers.Authorization="Bearer "+o)}else if("oauth2"===a){var f=r.token||{},h=f.access_token,d=f.token_type;d&&"bearer"!==d.toLowerCase()||(d="Bearer"),s.headers.Authorization=d+" "+h}}}}),s):t}Object.defineProperty(t,"__esModule",{value:!0});var o=n(6),a=r(o),s=n(2),u=r(s),l=n(0),c=r(l);t.default=function(e,t){var n=e.operation,r=e.requestBody,o=e.securities,s=e.spec,l=e.requestContentType;t=i({request:t,securities:o,operation:n,spec:s});var p=n.requestBody||{},f=(0,c.default)(p.content||{});if(r){var h=l&&f.indexOf(l)>-1;if(l&&h)t.headers["Content-Type"]=l;else if(!l){var d=f[0];d&&(t.headers["Content-Type"]=d,l=d)}}return r&&(l?f.indexOf(l)>-1&&("application/x-www-form-urlencoded"===l?"object"===(void 0===r?"undefined":(0,u.default)(r))?(t.form={},(0,c.default)(r).forEach(function(e){var n=r[e],i=void 0;i="object"===(void 0===n?"undefined":(0,u.default)(n))?Array.isArray(n)?n.toString():(0,a.default)(n):n,t.form[e]={value:i}})):t.form=r:t.body=r):t.body=r),t},t.applySecurities=i;var p=n(8),f=r(p),h=n(18),d=r(h),m=n(9),v=r(m)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.req,n=e.value,r=e.parameter,i=r.name,o=r.style,a=r.explode,s=(0,h.default)({key:r.name,value:n,style:o||"simple",explode:a||!1,escape:!1});t.url=t.url.replace("{"+i+"}",s)}function o(e){var t=e.req,n=e.value,r=e.parameter;if(t.query=t.query||{},!1===n&&(n="false"),0===n&&(n="0"),n){var i=void 0===n?"undefined":(0,p.default)(n);if("deepObject"===r.style)(0,l.default)(n).forEach(function(e){var i=n[e];t.query[r.name+"["+e+"]"]={value:(0,h.default)({key:e,value:i,style:"deepObject",escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0}});else if("object"!==i||Array.isArray(n)||"form"!==r.style&&r.style||!r.explode&&void 0!==r.explode)t.query[r.name]={value:(0,h.default)({key:r.name,value:n,style:r.style||"form",explode:void 0===r.explode||r.explode,escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0};else{var o=(0,l.default)(n);o.forEach(function(e){var i=n[e];t.query[e]={value:(0,h.default)({key:e,value:i,style:r.style||"form",escape:r.allowReserved?"unsafe":"reserved"}),skipEncoding:!0}})}}else if(r.allowEmptyValue){var a=r.name;t.query[a]=t.query[a]||{},t.query[a].allowEmptyValue=!0}}function a(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{},d.indexOf(n.name.toLowerCase())>-1||void 0!==r&&(t.headers[n.name]=(0,h.default)({key:n.name,value:r,style:n.style||"simple",explode:void 0!==n.explode&&n.explode,escape:!1}))}function s(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{};var i=void 0===r?"undefined":(0,p.default)(r);if("undefined"!==i){var o="object"===i&&!Array.isArray(r)&&n.explode?"":n.name+"=";t.headers.Cookie=o+(0,h.default)({key:n.name,value:r,escape:!1,style:n.style||"form",explode:void 0!==n.explode&&n.explode})}}Object.defineProperty(t,"__esModule",{value:!0});var u=n(0),l=r(u),c=n(2),p=r(c),f=n(24),h=r(f);t.default={path:i,query:o,header:a,cookie:s};var d=["accept","authorization","content-type"]},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.escape,r=arguments[2];return"number"==typeof e&&(e=e.toString()),"string"==typeof e&&e.length&&n?r?JSON.parse(e):(0,m.stringToCharArray)(e).map(function(e){return g(e)?e:v(e)&&"unsafe"===n?e:((0,d.default)(e)||[]).map(function(e){return e.toString(16).toUpperCase()}).map(function(e){return"%"+e}).join("")}).join(""):e}function o(e){var t=e.key,n=e.value,r=e.style,o=e.explode,a=e.escape,s=function(e){return i(e,{escape:a})};if("simple"===r)return n.map(function(e){return s(e)}).join(",");if("label"===r)return"."+n.map(function(e){return s(e)}).join(".");if("matrix"===r)return n.map(function(e){return s(e)}).reduce(function(e,n){return!e||o?(e||"")+";"+t+"="+n:e+","+n},"");if("form"===r){var u=o?"&"+t+"=":",";return n.map(function(e){return s(e)}).join(u)}if("spaceDelimited"===r){var l=o?t+"=":"";return n.map(function(e){return s(e)}).join(" "+l)}if("pipeDelimited"===r){var c=o?t+"=":"";return n.map(function(e){return s(e)}).join("|"+c)}}function a(e){var t=e.key,n=e.value,r=e.style,o=e.explode,a=e.escape,s=function(e){return i(e,{escape:a})},u=(0,l.default)(n);return"simple"===r?u.reduce(function(e,t){var r=s(n[t]),i=o?"=":",";return(e?e+",":"")+t+i+r},""):"label"===r?u.reduce(function(e,t){var r=s(n[t]),i=o?"=":".";return(e?e+".":".")+t+i+r},""):"matrix"===r&&o?u.reduce(function(e,t){var r=s(n[t]);return(e?e+";":";")+t+"="+r},""):"matrix"===r?u.reduce(function(e,r){var i=s(n[r]);return(e?e+",":";"+t+"=")+r+","+i},""):"form"===r?u.reduce(function(e,t){var r=s(n[t]);return(e?e+(o?"&":","):"")+t+(o?"=":",")+r},""):void 0}function s(e){var t=e.key,n=e.value,r=e.style,o=e.escape,a=function(e){return i(e,{escape:o})};return"simple"===r?a(n):"label"===r?"."+a(n):"matrix"===r?";"+t+"="+a(n):"form"===r?a(n):"deepObject"===r?a(n):void 0}Object.defineProperty(t,"__esModule",{value:!0});var u=n(0),l=r(u),c=n(2),p=r(c);t.encodeDisallowedCharacters=i,t.default=function(e){var t=e.value;return Array.isArray(t)?o(e):"object"===(void 0===t?"undefined":(0,p.default)(t))?a(e):s(e)};var f=n(44),h=(r(f),n(56)),d=r(h),m=n(57),v=function(e){return":/?#[]@!$&'()*+,;=".indexOf(e)>-1},g=function(e){return/^[a-z0-9\-._~]+$/i.test(e)}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=e.request,n=e.securities,r=void 0===n?{}:n,i=e.operation,o=void 0===i?{}:i,s=e.spec,l=(0,c.default)({},t),p=r.authorized,f=void 0===p?{}:p,h=r.specSecurity,d=void 0===h?[]:h,m=o.security||d,v=f&&!!(0,a.default)(f).length,g=s.securityDefinitions;return l.headers=l.headers||{},l.query=l.query||{},(0,a.default)(r).length&&v&&m&&(!Array.isArray(o.security)||o.security.length)?(m.forEach(function(e,t){for(var n in e){var r=f[n];if(r){var i=r.token,o=r.value||r,a=g[n],s=a.type,c=i&&i.access_token,p=i&&i.token_type;if(r)if("apiKey"===s){var h="query"===a.in?"query":"headers";l[h]=l[h]||{},l[h][a.name]=o}else"basic"===s?o.header?l.headers.authorization=o.header:(o.base64=(0,u.default)(o.username+":"+o.password),l.headers.authorization="Basic "+o.base64):"oauth2"===s&&c&&(p=p&&"bearer"!==p.toLowerCase()?p:"Bearer",l.headers.authorization=p+" "+c)}}}),l):t}Object.defineProperty(t,"__esModule",{value:!0});var o=n(0),a=r(o);t.default=function(e,t){var n=e.spec,r=e.operation,o=e.securities,a=e.requestContentType;return t=i({request:t,securities:o,operation:r,spec:n}),(t.body||t.form)&&(a?t.headers["Content-Type"]=a:Array.isArray(r.consumes)?t.headers["Content-Type"]=r.consumes[0]:Array.isArray(n.consumes)?t.headers["Content-Type"]=n.consumes[0]:r.parameters&&r.parameters.filter(function(e){return"file"===e.type}).length?t.headers["Content-Type"]="multipart/form-data":r.parameters&&r.parameters.filter(function(e){return"formData"===e.in}).length&&(t.headers["Content-Type"]="application/x-www-form-urlencoded")),t},t.applySecurities=i;var s=n(9),u=r(s),l=n(8),c=r(l);r(n(4))},function(e,t,n){"use strict";function r(e){var t=e.req,n=e.value;t.body=n}function i(e){var t=e.req,n=e.value,r=e.parameter;t.form=t.form||{},(n||r.allowEmptyValue)&&(t.form[r.name]={value:n,allowEmptyValue:r.allowEmptyValue,collectionFormat:r.collectionFormat})}function o(e){var t=e.req,n=e.parameter,r=e.value;t.headers=t.headers||{},void 0!==r&&(t.headers[n.name]=r)}function a(e){var t=e.req,n=e.value,r=e.parameter;t.url=t.url.replace("{"+r.name+"}",encodeURIComponent(n))}function s(e){var t=e.req,n=e.value,r=e.parameter;if(t.query=t.query||{},!1===n&&"boolean"===r.type&&(n="false"),0===n&&["number","integer"].indexOf(r.type)>-1&&(n="0"),n)t.query[r.name]={collectionFormat:r.collectionFormat,value:n};else if(r.allowEmptyValue){var i=r.name;t.query[i]=t.query[i]||{},t.query[i].allowEmptyValue=!0}}Object.defineProperty(t,"__esModule",{value:!0}),t.default={body:r,header:o,query:s,path:a,formData:i}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return function(t){var n=t.pathName,r=t.method,i=t.operationId;return function(t){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return e.execute((0,l.default)({spec:e.spec},(0,p.default)(e,"requestInterceptor","responseInterceptor","userFetch"),{pathName:n,method:r,parameters:t,operationId:i},o))}}}function o(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=m.makeExecute(e),n=m.mapTagOperations({spec:e.spec,cb:t}),r={};for(var i in n){r[i]={operations:{}};for(var o in n[i])r[i].operations[o]={execute:n[i][o]}}return{apis:r}}function a(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=m.makeExecute(e);return{apis:m.mapTagOperations({spec:e.spec,cb:t})}}function s(e){var t=e.spec,n=e.cb,r=void 0===n?h:n,i=e.defaultTag,o=void 0===i?"default":i,a={},s={};return(0,f.eachOperation)(t,function(e){var n=e.pathName,i=e.method,u=e.operation;(u.tags?d(u.tags):[o]).forEach(function(e){if("string"==typeof e){var o=s[e]=s[e]||{},l=(0,f.opId)(u,n,i),c=r({spec:t,pathName:n,method:i,operation:u,operationId:l});if(a[l])a[l]++,o[""+l+a[l]]=c;else if(void 0!==o[l]){var p=a[l]||1;a[l]=p+1,o[""+l+a[l]]=c;var h=o[l];delete o[l],o[""+l+p]=h}else o[l]=c}})}),s}Object.defineProperty(t,"__esModule",{value:!0}),t.self=void 0;var u=n(7),l=r(u);t.makeExecute=i,t.makeApisTagOperationsOperationExecute=o,t.makeApisTagOperation=a,t.mapTagOperations=s;var c=n(54),p=r(c),f=n(3),h=function(){return null},d=function(e){return Array.isArray(e)?e:[e]},m=t.self={mapTagOperations:s,makeExecute:i}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.requestInterceptor,r=t.responseInterceptor,i=e.withCredentials?"include":"same-origin";return function(t){return e({url:t,loadSpec:!0,requestInterceptor:n,responseInterceptor:r,headers:{Accept:"application/json"},credentials:i}).then(function(e){return e.body})}}function o(){l.plugins.refs.clearCache()}function a(e){function t(e){y&&(l.plugins.refs.docCache[y]=e),l.plugins.refs.fetchJSON=i(g,{requestInterceptor:m,responseInterceptor:v});var t=[l.plugins.refs];return"function"==typeof d&&t.push(l.plugins.parameters),"function"==typeof h&&t.push(l.plugins.properties),"strict"!==a&&t.push(l.plugins.allOf),(0,c.default)({spec:e,context:{baseDoc:y},plugins:t,allowMetaPatches:f,parameterMacro:d,modelPropertyMacro:h}).then(p.normalizeSwagger)}var n=e.fetch,r=e.spec,o=e.url,a=e.mode,s=e.allowMetaPatches,f=void 0===s||s,h=e.modelPropertyMacro,d=e.parameterMacro,m=e.requestInterceptor,v=e.responseInterceptor,g=e.http,y=e.baseDoc;return y=y||o,g=n||g||u.default,r?t(r):i(g,{requestInterceptor:m,responseInterceptor:v})(y).then(t)}Object.defineProperty(t,"__esModule",{value:!0}),t.makeFetchJSON=i,t.clearCache=o,t.default=a;var s=n(4),u=r(s),l=n(29),c=r(l),p=n(3)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return new N(e).dispatch()}Object.defineProperty(t,"__esModule",{value:!0}),t.plugins=t.SpecMap=void 0;var o=n(6),a=r(o),s=n(14),u=r(s),l=n(17),c=r(l),p=n(0),f=r(p),h=n(13),d=r(h),m=n(35),v=r(m),g=n(1),y=r(g),_=n(15),b=r(_),x=n(16),w=r(x);t.default=i;var k=n(49),E=r(k),S=n(5),C=r(S),A=n(34),D=r(A),O=n(30),M=r(O),T=n(32),P=r(T),I=n(33),R=r(I),j=n(31),F=r(j),N=function(){function e(t){(0,b.default)(this,e),(0,y.default)(this,{spec:"",debugLevel:"info",plugins:[],pluginHistory:{},errors:[],mutations:[],promisedPatches:[],state:{},patches:[],context:{},contextTree:new F.default,showDebug:!1,allPatches:[],pluginProp:"specMap",libMethods:(0,y.default)((0,v.default)(this),C.default),allowMetaPatches:!1},t),this.get=this._get.bind(this),this.getContext=this._getContext.bind(this),this.hasRun=this._hasRun.bind(this),this.wrappedPlugins=this.plugins.map(this.wrapPlugin.bind(this)).filter(C.default.isFunction),this.patches.push(C.default.add([],this.spec)),this.patches.push(C.default.context([],this.context)),this.updatePatches(this.patches)}return(0,w.default)(e,[{key:"debug",value:function(e){if(this.debugLevel===e){for(var t,n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];(t=console).log.apply(t,r)}}},{key:"verbose",value:function(e){if("verbose"===this.debugLevel){for(var t,n=arguments.length,r=Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=arguments[i];(t=console).log.apply(t,["["+e+"]   "].concat(r))}}},{key:"wrapPlugin",value:function(e,t){var n=null,r=void 0;return e[this.pluginProp]?(n=e,r=e[this.pluginProp]):C.default.isFunction(e)?r=e:C.default.isObject(e)&&(r=function(e){return c.default.mark(function t(n,r){var i,o,a,s,u,l,p,h,m;return c.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:m=function t(n,a,s){var u,l,p,h,m,v,g,y,_,b,x,w,k,E,S;return c.default.wrap(function(i){for(;;)switch(i.prev=i.next){case 0:if(C.default.isObject(n)){i.next=6;break}if(e.key!==a[a.length-1]){i.next=4;break}return i.next=4,e.plugin(n,e.key,a,r);case 4:i.next=46;break;case 6:u=a.length-1,l=a[u],p=a.indexOf("properties"),h="properties"===l&&u===p,m=r.allowMetaPatches&&o[n.$$ref],v=!0,g=!1,y=void 0,i.prev=14,_=(0,d.default)((0,f.default)(n));case 16:if(v=(b=_.next()).done){i.next=32;break}if(x=b.value,w=n[x],k=a.concat(x),E=C.default.isObject(w),S=n.$$ref,m){i.next=26;break}if(!E){i.next=26;break}return r.allowMetaPatches&&S&&(o[S]=!0),i.delegateYield(t(w,k,s),"t0",26);case 26:if(h||x!==e.key){i.next=29;break}return i.next=29,e.plugin(w,x,k,r,s);case 29:v=!0,i.next=16;break;case 32:i.next=38;break;case 34:i.prev=34,i.t1=i.catch(14),g=!0,y=i.t1;case 38:i.prev=38,i.prev=39,!v&&_.return&&_.return();case 41:if(i.prev=41,!g){i.next=44;break}throw y;case 44:return i.finish(41);case 45:return i.finish(38);case 46:case"end":return i.stop()}},i,this,[[14,34,38,46],[39,,41,45]])},i=c.default.mark(m),o={},a=!0,s=!1,u=void 0,t.prev=6,l=(0,d.default)(n.filter(C.default.isAdditiveMutation));case 8:if(a=(p=l.next()).done){t.next=14;break}return h=p.value,t.delegateYield(m(h.value,h.path,h),"t0",11);case 11:a=!0,t.next=8;break;case 14:t.next=20;break;case 16:t.prev=16,t.t1=t.catch(6),s=!0,u=t.t1;case 20:t.prev=20,t.prev=21,!a&&l.return&&l.return();case 23:if(t.prev=23,!s){t.next=26;break}throw u;case 26:return t.finish(23);case 27:return t.finish(20);case 28:case"end":return t.stop()}},t,this,[[6,16,20,28],[21,,23,27]])})}(e)),(0,y.default)(r.bind(n),{pluginName:e.name||t,isGenerator:C.default.isGenerator(r)})}},{key:"nextPlugin",value:function(){var e=this;return(0,E.default)(this.wrappedPlugins,function(t){return e.getMutationsForPlugin(t).length>0})}},{key:"nextPromisedPatch",value:function(){if(this.promisedPatches.length>0)return u.default.race(this.promisedPatches.map(function(e){return e.value}))}},{key:"getPluginHistory",value:function(e){var t=this.getPluginName(e);return this.pluginHistory[t]||[]}},{key:"getPluginRunCount",value:function(e){return this.getPluginHistory(e).length}},{key:"getPluginHistoryTip",value:function(e){var t=this.getPluginHistory(e);return t&&t[t.length-1]||{}}},{key:"getPluginMutationIndex",value:function(e){var t=this.getPluginHistoryTip(e).mutationIndex;return"number"!=typeof t?-1:t}},{key:"getPluginName",value:function(e){return e.pluginName}},{key:"updatePluginHistory",value:function(e,t){var n=this.getPluginName(e);(this.pluginHistory[n]=this.pluginHistory[n]||[]).push(t)}},{key:"updatePatches",value:function(e,t){var n=this;C.default.normalizeArray(e).forEach(function(e){if(e instanceof Error)return void n.errors.push(e);try{if(!C.default.isObject(e))return void n.debug("updatePatches","Got a non-object patch",e);if(n.showDebug&&n.allPatches.push(e),C.default.isPromise(e.value))return n.promisedPatches.push(e),void n.promisedPatchThen(e);if(C.default.isContextPatch(e))return void n.setContext(e.path,e.value);if(C.default.isMutation(e))return void n.updateMutations(e)}catch(e){n.errors.push(e)}})}},{key:"updateMutations",value:function(e){var t=C.default.applyPatch(this.state,e,{allowMetaPatches:this.allowMetaPatches});t&&(this.mutations.push(e),this.state=t)}},{key:"removePromisedPatch",value:function(e){var t=this.promisedPatches.indexOf(e);if(t<0)return void this.debug("Tried to remove a promisedPatch that isn't there!");this.promisedPatches.splice(t,1)}},{key:"promisedPatchThen",value:function(e){var t=this;return e.value=e.value.then(function(n){var r=(0,y.default)({},e,{value:n});t.removePromisedPatch(e),t.updatePatches(r)}).catch(function(n){t.removePromisedPatch(e),t.updatePatches(n)})}},{key:"getMutations",value:function(e,t){return e=e||0,"number"!=typeof t&&(t=this.mutations.length),this.mutations.slice(e,t)}},{key:"getCurrentMutations",value:function(){return this.getMutationsForPlugin(this.getCurrentPlugin())}},{key:"getMutationsForPlugin",value:function(e){var t=this.getPluginMutationIndex(e);return this.getMutations(t+1)}},{key:"getCurrentPlugin",value:function(){return this.currentPlugin}},{key:"getPatchesOfType",value:function(e,t){return e.filter(t)}},{key:"getLib",value:function(){return this.libMethods}},{key:"_get",value:function(e){return C.default.getIn(this.state,e)}},{key:"_getContext",value:function(e){return this.contextTree.get(e)}},{key:"setContext",value:function(e,t){return this.contextTree.set(e,t)}},{key:"_hasRun",value:function(e){return this.getPluginRunCount(this.getCurrentPlugin())>(e||0)}},{key:"_clone",value:function(e){return JSON.parse((0,a.default)(e))}},{key:"dispatch",value:function(){function e(e){e&&(e=C.default.fullyNormalizeArray(e),n.updatePatches(e,r))}var t=this,n=this,r=this.nextPlugin();if(!r){var i=this.nextPromisedPatch();if(i)return i.then(function(){return t.dispatch()}).catch(function(){return t.dispatch()});var o={spec:this.state,errors:this.errors};return this.showDebug&&(o.patches=this.allPatches),u.default.resolve(o)}if(n.pluginCount=n.pluginCount||{},n.pluginCount[r]=(n.pluginCount[r]||0)+1,n.pluginCount[r]>100)return u.default.resolve({spec:n.state,errors:n.errors.concat(new Error("We've reached a hard limit of 100 plugin runs"))});if(r!==this.currentPlugin&&this.promisedPatches.length){var a=this.promisedPatches.map(function(e){return e.value});return u.default.all(a.map(function(e){return e.then(Function,Function)})).then(function(){return t.dispatch()})}return function(){n.currentPlugin=r;var t=n.getCurrentMutations(),i=n.mutations.length-1;try{if(r.isGenerator){var o=!0,a=!1,s=void 0;try{for(var u,l=(0,d.default)(r(t,n.getLib()));!(o=(u=l.next()).done);o=!0)e(u.value)}catch(e){a=!0,s=e}finally{try{!o&&l.return&&l.return()}finally{if(a)throw s}}}else e(r(t,n.getLib()))}catch(t){e([(0,y.default)((0,v.default)(t),{plugin:r})])}finally{n.updatePluginHistory(r,{mutationIndex:i})}return n.dispatch()}()}}]),e}(),B={refs:D.default,allOf:M.default,parameters:P.default,properties:R.default};t.SpecMap=N,t.plugins=B},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(11);t.default={key:"allOf",plugin:function(e,t,n,r,a){if(!a.meta||!a.meta.$$ref){var s=n.slice(0,-1);if(!(0,o.isFreelyNamed)(s)){if(!Array.isArray(e)){var u=new TypeError("allOf must be an array");return u.fullPath=n,u}var l=!1,c=a.value;s.forEach(function(e){c=c[e]}),c=(0,i.default)({},c),delete c.allOf;var p=[r.replace(s,{})].concat(e.map(function(e,t){if(!r.isObject(e)){if(l)return null;l=!0;var i=new TypeError("Elements in allOf must be objects");return i.fullPath=n,i}return r.mergeDeep(s,e)}));return p.push(r.mergeDeep(s,c)),c.$$ref||p.push(r.remove([].concat(s,"$$ref"))),p}}}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){return o({children:{}},e,t)}function o(e,t,n){return e.value=t||{},e.protoValue=n?(0,l.default)({},n.protoValue,e.value):e.value,(0,s.default)(e.children).forEach(function(t){var n=e.children[t];e.children[t]=o(n,n.value,e)}),e}Object.defineProperty(t,"__esModule",{value:!0});var a=n(0),s=r(a),u=n(7),l=r(u),c=n(15),p=r(c),f=n(16),h=r(f),d=function(){function e(t){(0,p.default)(this,e),this.root=i(t||{})}return(0,h.default)(e,[{key:"set",value:function(e,t){var n=this.getParent(e,!0);if(!n)return void o(this.root,t,null);var r=e[e.length-1],a=n.children;if(a[r])return void o(a[r],t,n);a[r]=i(t,n)}},{key:"get",value:function(e){if(e=e||[],e.length<1)return this.root.value;for(var t=this.root,n=void 0,r=void 0,i=0;i<e.length&&(r=e[i],n=t.children,n[r]);i++)t=n[r];return t&&t.protoValue}},{key:"getParent",value:function(e,t){return!e||e.length<1?null:e.length<2?this.root:e.slice(0,-1).reduce(function(e,n){if(!e)return e;var r=e.children;return!r[n]&&t&&(r[n]=i(null,e)),r[n]},this.root)}}]),e}();t.default=d},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(1),o=r(i),a=n(5),s=r(a);t.default={key:"parameters",plugin:function(e,t,n,r,i){if(Array.isArray(e)&&e.length){var a=(0,o.default)([],e),u=n.slice(0,-1),l=(0,o.default)({},s.default.getIn(r.spec,u));return e.forEach(function(e,t){try{a[t].default=r.parameterMacro(l,e)}catch(e){var i=new Error(e);return i.fullPath=n,i}}),s.default.replace(n,a)}return s.default.replace(n,e)}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(1),o=r(i),a=n(5),s=r(a);t.default={key:"properties",plugin:function(e,t,n,r){var i=(0,o.default)({},e);for(var a in e)try{i[a].default=r.modelPropertyMacro(i[a])}catch(e){var u=new Error(e);return u.fullPath=n,u}return s.default.replace(n,i)}}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!N.test(e)){if(!t)throw new B("Tried to resolve a relative URL, without having a basePath. path: '"+e+"' basePath: '"+t+"'");return T.default.resolve(t,e)}return e}function o(e,t){return new B("Could not resolve reference because of: "+e.message,t,e)}function a(e){return(e+"").split("#")}function s(e,t){var n=L[e];if(n&&!I.default.isPromise(n))try{var r=p(t,n);return(0,D.default)(E.default.resolve(r),{__value:r})}catch(e){return E.default.reject(e)}return l(e).then(function(e){return p(t,e)})}function u(e){void 0!==e?delete L[e]:(0,w.default)(L).forEach(function(e){delete L[e]})}function l(e){var t=L[e];return t?I.default.isPromise(t)?t:E.default.resolve(t):(L[e]=U.fetchJSON(e).then(function(t){return L[e]=t,t}),L[e])}function c(e){return(0,O.fetch)(e,{headers:{Accept:"application/json, application/yaml"},loadSpec:!0}).then(function(e){return e.json()})}function p(e,t){var n=f(e);if(n.length<1)return t;var r=I.default.getIn(t,n);if(void 0===r)throw new B("Could not resolve pointer: "+e+" does not exist in document",{pointer:e});return r}function f(e){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+(void 0===e?"undefined":(0,b.default)(e)));return"/"===e[0]&&(e=e.substr(1)),""===e?[]:e.split("/").map(h)}function h(e){return"string"!=typeof e?e:e.replace(/~1/g,"/").replace(/~0/g,"~")}function d(e){return e.replace(/~/g,"~0").replace(/\//g,"~1")}function m(e){return 0===e.length?"":"/"+e.map(d).join("/")}function v(e,t){if(W(t))return!0;var n=e.charAt(t.length);return 0===e.indexOf(t)&&(!n||"/"===n||"#"===n)}function g(e,t,n,r){var i=q.get(r);i||(i={},q.set(r,i));var o=m(n),a=(t||"<specmap-base>")+"#"+e;if(t==r.contextTree.get([]).baseDoc&&v(o,e))return!0;var s="";if(n.some(function(e){return s=s+"/"+d(e),i[s]&&i[s].some(function(e){return v(e,a)||v(a,e)})}))return!0;i[o]=(i[o]||[]).concat(a)}function y(e,t){function n(e){return I.default.isObject(e)&&(r.indexOf(e)>=0||(0,w.default)(e).some(function(t){return n(e[t])}))}var r=[e];return t.path.reduce(function(e,t){return r.push(e[t]),e[t]},e),n(t.value)}Object.defineProperty(t,"__esModule",{value:!0});var _=n(2),b=r(_),x=n(0),w=r(x),k=n(14),E=r(k),S=n(36),C=r(S),A=n(1),D=r(A),O=n(41),M=n(10),T=r(M),P=n(5),I=r(P),R=n(12),j=r(R),F=n(11),N=new RegExp("^([a-z]+://|//)","i"),B=(0,j.default)("JSONRefError",function(e,t,n){this.originalError=n,(0,D.default)(this,t||{})}),L={},q=new C.default,z={key:"$ref",plugin:function(e,t,n,r){var u=n.slice(0,-1);if(!(0,F.isFreelyNamed)(u)){var l=r.getContext(n).baseDoc;if("string"!=typeof e)return new B("$ref: must be a string (JSON-Ref)",{$ref:e,baseDoc:l,fullPath:n});var c=a(e),p=c[0],h=c[1]||"",d=void 0;try{d=l||p?i(p,l):null}catch(t){return o(t,{pointer:h,$ref:e,basePath:d,fullPath:n})}var m=void 0,v=void 0;if(!g(h,d,u,r)){if(null==d?(v=f(h),void 0===(m=r.get(v))&&(m=new B("Could not resolve reference: "+e,{pointer:h,$ref:e,baseDoc:l,fullPath:n}))):(m=s(d,h),m=null!=m.__value?m.__value:m.catch(function(t){throw o(t,{pointer:h,$ref:e,baseDoc:l,fullPath:n})})),m instanceof Error)return[I.default.remove(n),m];var _=I.default.replace(u,m,{$$ref:e});return d&&d!==l?[_,I.default.context(u,{baseDoc:d})]:y(r.state,_)?void 0:_}}}},U=(0,D.default)(z,{docCache:L,absoluteify:i,clearCache:u,JSONRefError:B,wrapError:o,getDoc:l,split:a,extractFromDoc:s,fetchJSON:c,extract:p,jsonPointerToArray:f,unescapeJsonPointerToken:h});t.default=U;var W=function(e){return!e||"/"===e||"#"===e}},function(e,t){e.exports=n(330)},function(e,t){e.exports=n(568)},function(e,t){e.exports=n(96)},function(e,t){e.exports=n(18)},function(e,t){e.exports=n(97)},function(e,t){e.exports=n(582)},function(e,t){e.exports=n(696)},function(e,t){e.exports=n(695)},function(e,t){e.exports=n(203)},function(e,t){e.exports=n(709)},function(e,t){e.exports=n(745)},function(e,t){e.exports=n(794)},function(e,t){e.exports=n(211)},function(e,t){e.exports=n(942)},function(e,t){e.exports=n(223)},function(e,t){e.exports=n(20)},function(e,t){e.exports=n(38)},function(e,t){e.exports=n(421)},function(e,t){e.exports=n(422)},function(e,t){e.exports=n(951)},function(e,t){e.exports=n(999)},function(e,t){e.exports=n(1189)},function(e,t){e.exports=n(1190)},function(e,t,n){e.exports=n(20)}])},function(e,t,n){function r(e,t){this._id=e,this._clearFn=t}var i=Function.prototype.apply;t.setTimeout=function(){return new r(i.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new r(i.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},r.prototype.unref=r.prototype.ref=function(){},r.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(1180),t.setImmediate=setImmediate,t.clearImmediate=clearImmediate},function(e,t,n){"use strict";function r(){this.protocol=null,this.slashes=null,this.auth=null,this.host=null,this.port=null,this.hostname=null,this.hash=null,this.search=null,this.query=null,this.pathname=null,this.path=null,this.href=null}function i(e,t,n){if(e&&l.isObject(e)&&e instanceof r)return e;var i=new r;return i.parse(e,t,n),i}function o(e){return l.isString(e)&&(e=i(e)),e instanceof r?e.format():r.prototype.format.call(e)}function a(e,t){return i(e,!1,!0).resolve(t)}function s(e,t){return e?i(e,!1,!0).resolveObject(t):t}var u=n(998),l=n(1188);t.parse=i,t.resolve=a,t.resolveObject=s,t.format=o,t.Url=r;var c=/^([a-z0-9.+-]+:)/i,p=/:[0-9]*$/,f=/^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,h=["<",">",'"',"`"," ","\r","\n","\t"],d=["{","}","|","\\","^","`"].concat(h),m=["'"].concat(d),v=["%","/","?",";","#"].concat(m),g=["/","?","#"],y=/^[+a-z0-9A-Z_-]{0,63}$/,_=/^([+a-z0-9A-Z_-]{0,63})(.*)$/,b={javascript:!0,"javascript:":!0},x={javascript:!0,"javascript:":!0},w={http:!0,https:!0,ftp:!0,gopher:!0,file:!0,"http:":!0,"https:":!0,"ftp:":!0,"gopher:":!0,"file:":!0},k=n(1004);r.prototype.parse=function(e,t,n){if(!l.isString(e))throw new TypeError("Parameter 'url' must be a string, not "+typeof e);var r=e.indexOf("?"),i=-1!==r&&r<e.indexOf("#")?"?":"#",o=e.split(i),a=/\\/g;o[0]=o[0].replace(a,"/"),e=o.join(i);var s=e;if(s=s.trim(),!n&&1===e.split("#").length){var p=f.exec(s);if(p)return this.path=s,this.href=s,this.pathname=p[1],p[2]?(this.search=p[2],this.query=t?k.parse(this.search.substr(1)):this.search.substr(1)):t&&(this.search="",this.query={}),this}var h=c.exec(s);if(h){h=h[0];var d=h.toLowerCase();this.protocol=d,s=s.substr(h.length)}if(n||h||s.match(/^\/\/[^@\/]+@[^@\/]+/)){var E="//"===s.substr(0,2);!E||h&&x[h]||(s=s.substr(2),this.slashes=!0)}if(!x[h]&&(E||h&&!w[h])){for(var S=-1,C=0;C<g.length;C++){var A=s.indexOf(g[C]);-1!==A&&(-1===S||A<S)&&(S=A)}var D,O;O=-1===S?s.lastIndexOf("@"):s.lastIndexOf("@",S),-1!==O&&(D=s.slice(0,O),s=s.slice(O+1),this.auth=decodeURIComponent(D)),S=-1;for(var C=0;C<v.length;C++){var A=s.indexOf(v[C]);-1!==A&&(-1===S||A<S)&&(S=A)}-1===S&&(S=s.length),this.host=s.slice(0,S),s=s.slice(S),this.parseHost(),this.hostname=this.hostname||"";var M="["===this.hostname[0]&&"]"===this.hostname[this.hostname.length-1];if(!M)for(var T=this.hostname.split(/\./),C=0,P=T.length;C<P;C++){var I=T[C];if(I&&!I.match(y)){for(var R="",j=0,F=I.length;j<F;j++)I.charCodeAt(j)>127?R+="x":R+=I[j];if(!R.match(y)){var N=T.slice(0,C),B=T.slice(C+1),L=I.match(_);L&&(N.push(L[1]),B.unshift(L[2])),B.length&&(s="/"+B.join(".")+s),this.hostname=N.join(".");break}}}this.hostname.length>255?this.hostname="":this.hostname=this.hostname.toLowerCase(),M||(this.hostname=u.toASCII(this.hostname));var q=this.port?":"+this.port:"",z=this.hostname||"";this.host=z+q,this.href+=this.host,M&&(this.hostname=this.hostname.substr(1,this.hostname.length-2),"/"!==s[0]&&(s="/"+s))}if(!b[d])for(var C=0,P=m.length;C<P;C++){var U=m[C];if(-1!==s.indexOf(U)){var W=encodeURIComponent(U);W===U&&(W=escape(U)),s=s.split(U).join(W)}}var V=s.indexOf("#");-1!==V&&(this.hash=s.substr(V),s=s.slice(0,V));var H=s.indexOf("?");if(-1!==H?(this.search=s.substr(H),this.query=s.substr(H+1),t&&(this.query=k.parse(this.query)),s=s.slice(0,H)):t&&(this.search="",this.query={}),s&&(this.pathname=s),w[d]&&this.hostname&&!this.pathname&&(this.pathname="/"),this.pathname||this.search){var q=this.pathname||"",G=this.search||"";this.path=q+G}return this.href=this.format(),this},r.prototype.format=function(){var e=this.auth||"";e&&(e=encodeURIComponent(e),e=e.replace(/%3A/i,":"),e+="@");var t=this.protocol||"",n=this.pathname||"",r=this.hash||"",i=!1,o="";this.host?i=e+this.host:this.hostname&&(i=e+(-1===this.hostname.indexOf(":")?this.hostname:"["+this.hostname+"]"),this.port&&(i+=":"+this.port)),this.query&&l.isObject(this.query)&&Object.keys(this.query).length&&(o=k.stringify(this.query));var a=this.search||o&&"?"+o||"";return t&&":"!==t.substr(-1)&&(t+=":"),this.slashes||(!t||w[t])&&!1!==i?(i="//"+(i||""),n&&"/"!==n.charAt(0)&&(n="/"+n)):i||(i=""),r&&"#"!==r.charAt(0)&&(r="#"+r),a&&"?"!==a.charAt(0)&&(a="?"+a),n=n.replace(/[?#]/g,function(e){return encodeURIComponent(e)}),a=a.replace("#","%23"),t+i+n+a+r},r.prototype.resolve=function(e){return this.resolveObject(i(e,!1,!0)).format()},r.prototype.resolveObject=function(e){if(l.isString(e)){var t=new r;t.parse(e,!1,!0),e=t}for(var n=new r,i=Object.keys(this),o=0;o<i.length;o++){var a=i[o];n[a]=this[a]}if(n.hash=e.hash,""===e.href)return n.href=n.format(),n;if(e.slashes&&!e.protocol){for(var s=Object.keys(e),u=0;u<s.length;u++){var c=s[u];"protocol"!==c&&(n[c]=e[c])}return w[n.protocol]&&n.hostname&&!n.pathname&&(n.path=n.pathname="/"),n.href=n.format(),n}if(e.protocol&&e.protocol!==n.protocol){if(!w[e.protocol]){for(var p=Object.keys(e),f=0;f<p.length;f++){var h=p[f];n[h]=e[h]}return n.href=n.format(),n}if(n.protocol=e.protocol,e.host||x[e.protocol])n.pathname=e.pathname;else{for(var d=(e.pathname||"").split("/");d.length&&!(e.host=d.shift()););e.host||(e.host=""),e.hostname||(e.hostname=""),""!==d[0]&&d.unshift(""),d.length<2&&d.unshift(""),n.pathname=d.join("/")}if(n.search=e.search,n.query=e.query,n.host=e.host||"",n.auth=e.auth,n.hostname=e.hostname||e.host,n.port=e.port,n.pathname||n.search){var m=n.pathname||"",v=n.search||"";n.path=m+v}return n.slashes=n.slashes||e.slashes,n.href=n.format(),n}var g=n.pathname&&"/"===n.pathname.charAt(0),y=e.host||e.pathname&&"/"===e.pathname.charAt(0),_=y||g||n.host&&e.pathname,b=_,k=n.pathname&&n.pathname.split("/")||[],d=e.pathname&&e.pathname.split("/")||[],E=n.protocol&&!w[n.protocol];if(E&&(n.hostname="",n.port=null,n.host&&(""===k[0]?k[0]=n.host:k.unshift(n.host)),n.host="",e.protocol&&(e.hostname=null,e.port=null,e.host&&(""===d[0]?d[0]=e.host:d.unshift(e.host)),e.host=null),_=_&&(""===d[0]||""===k[0])),y)n.host=e.host||""===e.host?e.host:n.host,n.hostname=e.hostname||""===e.hostname?e.hostname:n.hostname,n.search=e.search,n.query=e.query,k=d;else if(d.length)k||(k=[]),k.pop(),k=k.concat(d),n.search=e.search,n.query=e.query;else if(!l.isNullOrUndefined(e.search)){if(E){n.hostname=n.host=k.shift();var S=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@");S&&(n.auth=S.shift(),n.host=n.hostname=S.shift())}return n.search=e.search,n.query=e.query,l.isNull(n.pathname)&&l.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.href=n.format(),n}if(!k.length)return n.pathname=null,n.search?n.path="/"+n.search:n.path=null,n.href=n.format(),n;for(var C=k.slice(-1)[0],A=(n.host||e.host||k.length>1)&&("."===C||".."===C)||""===C,D=0,O=k.length;O>=0;O--)C=k[O],"."===C?k.splice(O,1):".."===C?(k.splice(O,1),D++):D&&(k.splice(O,1),D--);if(!_&&!b)for(;D--;D)k.unshift("..");!_||""===k[0]||k[0]&&"/"===k[0].charAt(0)||k.unshift(""),A&&"/"!==k.join("/").substr(-1)&&k.push("");var M=""===k[0]||k[0]&&"/"===k[0].charAt(0);if(E){n.hostname=n.host=M?"":k.length?k.shift():"";var S=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@");S&&(n.auth=S.shift(),n.host=n.hostname=S.shift())}return _=_||n.host&&k.length,_&&!M&&k.unshift(""),k.length?n.pathname=k.join("/"):(n.pathname=null,n.path=null),l.isNull(n.pathname)&&l.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.auth=e.auth||n.auth,n.slashes=n.slashes||e.slashes,n.href=n.format(),n},r.prototype.parseHost=function(){var e=this.host,t=p.exec(e);t&&(t=t[0],":"!==t&&(this.port=t.substr(1)),e=e.substr(0,e.length-t.length)),e&&(this.hostname=e)}},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty;r=n(127),e=n(45).MarkedYAMLError,i=n(94),this.ComposerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Composer=function(){function e(){this.anchors={}}return e.prototype.check_node=function(){return this.check_event(r.StreamStartEvent)&&this.get_event(),!this.check_event(r.StreamEndEvent)},e.prototype.get_node=function(){if(!this.check_event(r.StreamEndEvent))return this.compose_document()},e.prototype.get_single_node=function(){var e,n;if(this.get_event(),e=null,this.check_event(r.StreamEndEvent)||(e=this.compose_document()),!this.check_event(r.StreamEndEvent))throw n=this.get_event(),new t.ComposerError("expected a single document in the stream",e.start_mark,"but found another document",n.start_mark);return this.get_event(),e},e.prototype.compose_document=function(){var e;return this.get_event(),e=this.compose_node(),this.get_event(),this.anchors={},e},e.prototype.compose_node=function(e,n){var i,o,a;if(this.check_event(r.AliasEvent)){if(o=this.get_event(),!((i=o.anchor)in this.anchors))throw new t.ComposerError(null,null,"found undefined alias "+i,o.start_mark);return this.anchors[i]}if(o=this.peek_event(),null!==(i=o.anchor)&&i in this.anchors)throw new t.ComposerError("found duplicate anchor "+i+"; first occurence",this.anchors[i].start_mark,"second occurrence",o.start_mark);return this.descend_resolver(e,n),this.check_event(r.ScalarEvent)?a=this.compose_scalar_node(i):this.check_event(r.SequenceStartEvent)?a=this.compose_sequence_node(i):this.check_event(r.MappingStartEvent)&&(a=this.compose_mapping_node(i)),this.ascend_resolver(),a},e.prototype.compose_scalar_node=function(e){var t,n,r;return t=this.get_event(),r=t.tag,null!==r&&"!"!==r||(r=this.resolve(i.ScalarNode,t.value,t.implicit)),n=new i.ScalarNode(r,t.value,t.start_mark,t.end_mark,t.style),null!==e&&(this.anchors[e]=n),n},e.prototype.compose_sequence_node=function(e){var t,n,o,a,s;for(a=this.get_event(),s=a.tag,null!==s&&"!"!==s||(s=this.resolve(i.SequenceNode,null,a.implicit)),o=new i.SequenceNode(s,[],a.start_mark,null,a.flow_style),null!==e&&(this.anchors[e]=o),n=0;!this.check_event(r.SequenceEndEvent);)o.value.push(this.compose_node(o,n)),n++;return t=this.get_event(),o.end_mark=t.end_mark,o},e.prototype.compose_mapping_node=function(e){var t,n,o,a,s,u;for(s=this.get_event(),u=s.tag,null!==u&&"!"!==u||(u=this.resolve(i.MappingNode,null,s.implicit)),a=new i.MappingNode(u,[],s.start_mark,null,s.flow_style),null!==e&&(this.anchors[e]=a);!this.check_event(r.MappingEndEvent);)n=this.compose_node(a),o=this.compose_node(a,n),a.value.push([n,o]);return t=this.get_event(),a.end_mark=t.end_mark,a},e}()}).call(this)},function(e,t,n){(function(e){(function(){var r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};r=n(45).MarkedYAMLError,i=n(94),o=n(61),this.ConstructorError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(r),this.BaseConstructor=function(){function e(){this.constructed_objects={},this.constructing_nodes=[],this.deferred_constructors=[]}return e.prototype.yaml_constructors={},e.prototype.yaml_multi_constructors={},e.add_constructor=function(e,t){return this.prototype.hasOwnProperty("yaml_constructors")||(this.prototype.yaml_constructors=o.extend({},this.prototype.yaml_constructors)),this.prototype.yaml_constructors[e]=t},e.add_multi_constructor=function(e,t){return this.prototype.hasOwnProperty("yaml_multi_constructors")||(this.prototype.yaml_multi_constructors=o.extend({},this.prototype.yaml_multi_constructors)),this.prototype.yaml_multi_constructors[e]=t},e.prototype.check_data=function(){return this.check_node()},e.prototype.get_data=function(){if(this.check_node())return this.construct_document(this.get_node())},e.prototype.get_single_data=function(){var e;return e=this.get_single_node(),null!=e?this.construct_document(e):null},e.prototype.construct_document=function(e){var t;for(t=this.construct_object(e);!o.is_empty(this.deferred_constructors);)this.deferred_constructors.pop()();return t},e.prototype.defer=function(e){return this.deferred_constructors.push(e)},e.prototype.construct_object=function(e){var n,r,o,a,s;if(e.unique_id in this.constructed_objects)return this.constructed_objects[e.unique_id];if(o=e.unique_id,u.call(this.constructing_nodes,o)>=0)throw new t.ConstructorError(null,null,"found unconstructable recursive node",e.start_mark);if(this.constructing_nodes.push(e.unique_id),n=null,s=null,e.tag in this.yaml_constructors)n=this.yaml_constructors[e.tag];else{for(a in this.yaml_multi_constructors)if(e.tag.indexOf(0===a)){s=e.tag.slice(a.length),n=this.yaml_multi_constructors[a];break}null==n&&(null in this.yaml_multi_constructors?(s=e.tag,n=this.yaml_multi_constructors[null]):null in this.yaml_constructors?n=this.yaml_constructors[null]:e instanceof i.ScalarNode?n=this.construct_scalar:e instanceof i.SequenceNode?n=this.construct_sequence:e instanceof i.MappingNode&&(n=this.construct_mapping))}return r=n.call(this,null!=s?s:e,e),this.constructed_objects[e.unique_id]=r,this.constructing_nodes.pop(),r},e.prototype.construct_scalar=function(e){if(!(e instanceof i.ScalarNode))throw new t.ConstructorError(null,null,"expected a scalar node but found "+e.id,e.start_mark);return e.value},e.prototype.construct_sequence=function(e){var n,r,o,a,s;if(!(e instanceof i.SequenceNode))throw new t.ConstructorError(null,null,"expected a sequence node but found "+e.id,e.start_mark);for(a=e.value,s=[],r=0,o=a.length;r<o;r++)n=a[r],s.push(this.construct_object(n));return s},e.prototype.construct_mapping=function(e){var n,r,o,a,s,u,l,c,p;if(!(e instanceof i.MappingNode))throw new ConstructorError(null,null,"expected a mapping node but found "+e.id,e.start_mark);for(s={},u=e.value,n=0,a=u.length;n<a;n++){if(l=u[n],o=l[0],p=l[1],"object"==typeof(r=this.construct_object(o)))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"found unhashable key",o.start_mark);c=this.construct_object(p),s[r]=c}return s},e.prototype.construct_pairs=function(e){var n,r,o,a,s,u,l,c,p;if(!(e instanceof i.MappingNode))throw new t.ConstructorError(null,null,"expected a mapping node but found "+e.id,e.start_mark);for(s=[],u=e.value,n=0,a=u.length;n<a;n++)l=u[n],o=l[0],p=l[1],r=this.construct_object(o),c=this.construct_object(p),s.push([r,c]);return s},e}(),this.Constructor=function(n){function r(){return r.__super__.constructor.apply(this,arguments)}var o,s,l;return a(r,n),o={on:!0,off:!1,true:!0,false:!1,yes:!0,no:!1},l=/^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:(?:[Tt]|[\x20\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\.([0-9]*))?(?:[\x20\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?)?$/,s={year:1,month:2,day:3,hour:4,minute:5,second:6,fraction:7,tz:8,tz_sign:9,tz_hour:10,tz_minute:11},r.prototype.construct_scalar=function(e){var t,n,o,a,s,u;if(e instanceof i.MappingNode)for(a=e.value,t=0,o=a.length;t<o;t++)if(s=a[t],n=s[0],u=s[1],"tag:yaml.org,2002:value"===n.tag)return this.construct_scalar(u);return r.__super__.construct_scalar.call(this,e)},r.prototype.flatten_mapping=function(e){var n,r,o,a,s,u,l,c,p,f,h,d,m;for(l=[],r=0;r<e.value.length;)if(c=e.value[r],a=c[0],m=c[1],"tag:yaml.org,2002:merge"===a.tag)if(e.value.splice(r,1),m instanceof i.MappingNode)this.flatten_mapping(m),l=l.concat(m.value);else{if(!(m instanceof i.SequenceNode))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"expected a mapping or list of mappings for merging but found "+m.id,m.start_mark);for(f=[],p=m.value,n=0,s=p.length;n<s;n++){if(!((h=p[n])instanceof i.MappingNode))throw new t.ConstructorError("while constructing a mapping",e.start_mark,"expected a mapping for merging, but found "+h.id,h.start_mark);this.flatten_mapping(h),f.push(h.value)}for(f.reverse(),o=0,u=f.length;o<u;o++)d=f[o],l=l.concat(d)}else"tag:yaml.org,2002:value"===a.tag?(a.tag="tag:yaml.org,2002:str",r++):r++;if(l.length)return e.value=l.concat(e.value)},r.prototype.construct_mapping=function(e){return e instanceof i.MappingNode&&this.flatten_mapping(e),r.__super__.construct_mapping.call(this,e)},r.prototype.construct_yaml_null=function(e){return this.construct_scalar(e),null},r.prototype.construct_yaml_bool=function(e){var t;return t=this.construct_scalar(e),o[t.toLowerCase()]},r.prototype.construct_yaml_int=function(e){var t,n,r,i,o,a,s,l,c;if(c=this.construct_scalar(e),c=c.replace(/_/g,""),l="-"===c[0]?-1:1,s=c[0],u.call("+-",s)>=0&&(c=c.slice(1)),"0"===c)return 0;if(0===c.indexOf("0b"))return l*parseInt(c.slice(2),2);if(0===c.indexOf("0x"))return l*parseInt(c.slice(2),16);if(0===c.indexOf("0o"))return l*parseInt(c.slice(2),8);if("0"===c[0])return l*parseInt(c,8);if(u.call(c,":")>=0){for(r=function(){var e,t,n,r;for(n=c.split(/:/g),r=[],e=0,t=n.length;e<t;e++)a=n[e],r.push(parseInt(a));return r}(),r.reverse(),t=1,c=0,i=0,o=r.length;i<o;i++)n=r[i],c+=n*t,t*=60;return l*c}return l*parseInt(c)},r.prototype.construct_yaml_float=function(e){var t,n,r,i,o,a,s,l,c;if(c=this.construct_scalar(e),c=c.replace(/_/g,"").toLowerCase(),l="-"===c[0]?-1:1,s=c[0],u.call("+-",s)>=0&&(c=c.slice(1)),".inf"===c)return Infinity*l;if(".nan"===c)return NaN;if(u.call(c,":")>=0){for(r=function(){var e,t,n,r;for(n=c.split(/:/g),r=[],e=0,t=n.length;e<t;e++)a=n[e],r.push(parseFloat(a));return r}(),r.reverse(),t=1,c=0,i=0,o=r.length;i<o;i++)n=r[i],c+=n*t,t*=60;return l*c}return l*parseFloat(c)},r.prototype.construct_yaml_binary=function(n){var r,i;i=this.construct_scalar(n);try{return"undefined"!=typeof window&&null!==window?atob(i):new e(i,"base64").toString("ascii")}catch(e){throw r=e,new t.ConstructorError(null,null,"failed to decode base64 data: "+r,n.start_mark)}},r.prototype.construct_yaml_timestamp=function(e){var t,n,r,i,o,a,u,c,p,f,h,d,m,v,g;this.construct_scalar(e),a=e.value.match(l),v={};for(o in s)i=s[o],v[o]=a[i];if(g=parseInt(v.year),p=parseInt(v.month)-1,t=parseInt(v.day),!v.hour)return new Date(Date.UTC(g,p,t));if(r=parseInt(v.hour),c=parseInt(v.minute),f=parseInt(v.second),u=0,v.fraction){for(n=v.fraction.slice(0,6);n.length<6;)n+="0";n=parseInt(n),u=Math.round(n/1e3)}return v.tz_sign&&(m="-"===v.tz_sign?1:-1,(h=parseInt(v.tz_hour))&&(r+=m*h),(d=parseInt(v.tz_minute))&&(c+=m*d)),new Date(Date.UTC(g,p,t,r,c,f,u))},r.prototype.construct_yaml_pair_list=function(e,n){var r;if(r=[],!(n instanceof i.SequenceNode))throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a sequence but found "+n.id,n.start_mark);return this.defer(function(o){return function(){var a,s,u,l,c,p,f,h,d,m;for(c=n.value,f=[],a=0,l=c.length;a<l;a++){if(!((h=c[a])instanceof i.MappingNode))throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a mapping of length 1 but found "+h.id,h.start_mark);if(1!==h.value.length)throw new t.ConstructorError("while constructing "+e,n.start_mark,"expected a mapping of length 1 but found "+h.id,h.start_mark);p=h.value[0],u=p[0],m=p[1],s=o.construct_object(u),d=o.construct_object(m),f.push(r.push([s,d]))}return f}}(this)),r},r.prototype.construct_yaml_omap=function(e){return this.construct_yaml_pair_list("an ordered map",e)},r.prototype.construct_yaml_pairs=function(e){return this.construct_yaml_pair_list("pairs",e)},r.prototype.construct_yaml_set=function(e){var t;return t=[],this.defer(function(n){return function(){var r,i;i=[];for(r in n.construct_mapping(e))i.push(t.push(r));return i}}(this)),t},r.prototype.construct_yaml_str=function(e){return this.construct_scalar(e)},r.prototype.construct_yaml_seq=function(e){var t;return t=[],this.defer(function(n){return function(){var r,i,o,a,s;for(a=n.construct_sequence(e),s=[],r=0,o=a.length;r<o;r++)i=a[r],s.push(t.push(i));return s}}(this)),t},r.prototype.construct_yaml_map=function(e){var t;return t={},this.defer(function(n){return function(){var r,i,o,a;i=n.construct_mapping(e),o=[];for(r in i)a=i[r],o.push(t[r]=a);return o}}(this)),t},r.prototype.construct_yaml_object=function(e,t){var n;return n=new t,this.defer(function(t){return function(){var r,i,o,a;i=t.construct_mapping(e,!0),o=[];for(r in i)a=i[r],o.push(n[r]=a);return o}}(this)),n},r.prototype.construct_undefined=function(e){throw new t.ConstructorError(null,null,"could not determine a constructor for the tag "+e.tag,e.start_mark)},r}(this.BaseConstructor),this.Constructor.add_constructor("tag:yaml.org,2002:null",this.Constructor.prototype.construct_yaml_null),this.Constructor.add_constructor("tag:yaml.org,2002:bool",this.Constructor.prototype.construct_yaml_bool),this.Constructor.add_constructor("tag:yaml.org,2002:int",this.Constructor.prototype.construct_yaml_int),this.Constructor.add_constructor("tag:yaml.org,2002:float",this.Constructor.prototype.construct_yaml_float),this.Constructor.add_constructor("tag:yaml.org,2002:binary",this.Constructor.prototype.construct_yaml_binary),this.Constructor.add_constructor("tag:yaml.org,2002:timestamp",this.Constructor.prototype.construct_yaml_timestamp),this.Constructor.add_constructor("tag:yaml.org,2002:omap",this.Constructor.prototype.construct_yaml_omap),this.Constructor.add_constructor("tag:yaml.org,2002:pairs",this.Constructor.prototype.construct_yaml_pairs),this.Constructor.add_constructor("tag:yaml.org,2002:set",this.Constructor.prototype.construct_yaml_set),this.Constructor.add_constructor("tag:yaml.org,2002:str",this.Constructor.prototype.construct_yaml_str),this.Constructor.add_constructor("tag:yaml.org,2002:seq",this.Constructor.prototype.construct_yaml_seq),this.Constructor.add_constructor("tag:yaml.org,2002:map",this.Constructor.prototype.construct_yaml_map),this.Constructor.add_constructor(null,this.Constructor.prototype.construct_undefined)}).call(this)}).call(t,n(40).Buffer)},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty,s=[].slice;r=n(127),e=n(45).MarkedYAMLError,i=n(267),this.ParserError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Parser=function(){function e(){this.current_event=null,this.yaml_version=null,this.tag_handles={},this.states=[],this.marks=[],this.state="parse_stream_start"}var n;return n={"!":"!","!!":"tag:yaml.org,2002:"},e.prototype.dispose=function(){return this.states=[],this.state=null},e.prototype.check_event=function(){var e,t,n,r;if(t=1<=arguments.length?s.call(arguments,0):[],null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),null!==this.current_event){if(0===t.length)return!0;for(n=0,r=t.length;n<r;n++)if(e=t[n],this.current_event instanceof e)return!0}return!1},e.prototype.peek_event=function(){return null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),this.current_event},e.prototype.get_event=function(){var e;return null===this.current_event&&null!=this.state&&(this.current_event=this[this.state]()),e=this.current_event,this.current_event=null,e},e.prototype.parse_stream_start=function(){var e,t;return t=this.get_token(),e=new r.StreamStartEvent(t.start_mark,t.end_mark),this.state="parse_implicit_document_start",e},e.prototype.parse_implicit_document_start=function(){var e,t,o,a;return this.check_token(i.DirectiveToken,i.DocumentStartToken,i.StreamEndToken)?this.parse_document_start():(this.tag_handles=n,a=this.peek_token(),o=e=a.start_mark,t=new r.DocumentStartEvent(o,e,!1),this.states.push("parse_document_end"),this.state="parse_block_node",t)},e.prototype.parse_document_start=function(){for(var e,n,o,a,s,u,l;this.check_token(i.DocumentEndToken);)this.get_token();if(this.check_token(i.StreamEndToken)){if(u=this.get_token(),n=new r.StreamEndEvent(u.start_mark,u.end_mark),0!==this.states.length)throw new Error("assertion error, states should be empty");if(0!==this.marks.length)throw new Error("assertion error, marks should be empty");this.state=null}else{if(a=this.peek_token().start_mark,o=this.process_directives(),l=o[0],s=o[1],!this.check_token(i.DocumentStartToken))throw new t.ParserError("expected '<document start>', but found "+this.peek_token().id,this.peek_token().start_mark);u=this.get_token(),e=u.end_mark,n=new r.DocumentStartEvent(a,e,!0,l,s),this.states.push("parse_document_end"),this.state="parse_document_content"}return n},e.prototype.parse_document_end=function(){var e,t,n,o,a;return a=this.peek_token(),o=e=a.start_mark,n=!1,this.check_token(i.DocumentEndToken)&&(a=this.get_token(),e=a.end_mark,n=!0),t=new r.DocumentEndEvent(o,e,n),this.state="parse_document_start",t},e.prototype.parse_document_content=function(){var e;return this.check_token(i.DirectiveToken,i.DocumentStartToken,i.DocumentEndToken,i.StreamEndToken)?(e=this.process_empty_scalar(this.peek_token().start_mark),this.state=this.states.pop(),e):this.parse_block_node()},e.prototype.process_directives=function(){var e,r,o,s,u,l,c,p,f;for(this.yaml_version=null,this.tag_handles={};this.check_token(i.DirectiveToken);)if(p=this.get_token(),"YAML"===p.name){if(null!==this.yaml_version)throw new t.ParserError(null,null,"found duplicate YAML directive",p.start_mark);if(s=p.value,r=s[0],s[1],1!==r)throw new t.ParserError(null,null,"found incompatible YAML document (version 1.* is required)",p.start_mark);this.yaml_version=p.value}else if("TAG"===p.name){if(u=p.value,e=u[0],o=u[1],e in this.tag_handles)throw new t.ParserError(null,null,"duplicate tag handle "+e,p.start_mark);this.tag_handles[e]=o}c=null,l=this.tag_handles;for(e in l)a.call(l,e)&&(o=l[e],null==c&&(c={}),c[e]=o);f=[this.yaml_version,c];for(e in n)a.call(n,e)&&((o=n[e])in this.tag_handles||(this.tag_handles[e]=o));return f},e.prototype.parse_block_node=function(){return this.parse_node(!0)},e.prototype.parse_flow_node=function(){return this.parse_node()},e.prototype.parse_block_node_or_indentless_sequence=function(){return this.parse_node(!0,!0)},e.prototype.parse_node=function(e,n){var o,a,s,u,l,c,p,f,h,d,m;if(null==e&&(e=!1),null==n&&(n=!1),this.check_token(i.AliasToken))m=this.get_token(),s=new r.AliasEvent(m.value,m.start_mark,m.end_mark),this.state=this.states.pop();else{if(o=null,h=null,p=a=d=null,this.check_token(i.AnchorToken)?(m=this.get_token(),p=m.start_mark,a=m.end_mark,o=m.value,this.check_token(i.TagToken)&&(m=this.get_token(),d=m.start_mark,a=m.end_mark,h=m.value)):this.check_token(i.TagToken)&&(m=this.get_token(),p=d=m.start_mark,a=m.end_mark,h=m.value,this.check_token(i.AnchorToken)&&(m=this.get_token(),a=m.end_mark,o=m.value)),null!==h)if(u=h[0],f=h[1],null!==u){if(!(u in this.tag_handles))throw new t.ParserError("while parsing a node",p,"found undefined tag handle "+u,d);h=this.tag_handles[u]+f}else h=f;if(null===p&&(p=a=this.peek_token().start_mark),s=null,l=null===h||"!"===h,n&&this.check_token(i.BlockEntryToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a),this.state="parse_indentless_sequence_entry";else if(this.check_token(i.ScalarToken))m=this.get_token(),a=m.end_mark,l=m.plain&&null===h||"!"===h?[!0,!1]:null===h?[!1,!0]:[!1,!1],s=new r.ScalarEvent(o,h,l,m.value,p,a,m.style),this.state=this.states.pop();else if(this.check_token(i.FlowSequenceStartToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a,!0),this.state="parse_flow_sequence_first_entry";else if(this.check_token(i.FlowMappingStartToken))a=this.peek_token().end_mark,s=new r.MappingStartEvent(o,h,l,p,a,!0),this.state="parse_flow_mapping_first_key";else if(e&&this.check_token(i.BlockSequenceStartToken))a=this.peek_token().end_mark,s=new r.SequenceStartEvent(o,h,l,p,a,!1),this.state="parse_block_sequence_first_entry";else if(e&&this.check_token(i.BlockMappingStartToken))a=this.peek_token().end_mark,s=new r.MappingStartEvent(o,h,l,p,a,!1),this.state="parse_block_mapping_first_key";else{if(null===o&&null===h)throw c=e?"block":"flow",m=this.peek_token(),new t.ParserError("while parsing a "+c+" node",p,"expected the node content, but found "+m.id,m.start_mark);s=new r.ScalarEvent(o,h,[l,!1],"",p,a),this.state=this.states.pop()}}return s},e.prototype.parse_block_sequence_first_entry=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_block_sequence_entry()},e.prototype.parse_block_sequence_entry=function(){var e,n;if(this.check_token(i.BlockEntryToken))return n=this.get_token(),this.check_token(i.BlockEntryToken,i.BlockEndToken)?(this.state="parse_block_sequence_entry",this.process_empty_scalar(n.end_mark)):(this.states.push("parse_block_sequence_entry"),this.parse_block_node());if(!this.check_token(i.BlockEndToken))throw n=this.peek_token(),new t.ParserError("while parsing a block collection",this.marks.slice(-1)[0],"expected <block end>, but found "+n.id,n.start_mark);return n=this.get_token(),e=new r.SequenceEndEvent(n.start_mark,n.end_mark),this.state=this.states.pop(),this.marks.pop(),e},e.prototype.parse_indentless_sequence_entry=function(){var e,t;return this.check_token(i.BlockEntryToken)?(t=this.get_token(),this.check_token(i.BlockEntryToken,i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_indentless_sequence_entry",this.process_empty_scalar(t.end_mark)):(this.states.push("parse_indentless_sequence_entry"),this.parse_block_node())):(t=this.peek_token(),e=new r.SequenceEndEvent(t.start_mark,t.start_mark),this.state=this.states.pop(),e)},e.prototype.parse_block_mapping_first_key=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_block_mapping_key()},e.prototype.parse_block_mapping_key=function(){var e,n;if(this.check_token(i.KeyToken))return n=this.get_token(),this.check_token(i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_block_mapping_value",this.process_empty_scalar(n.end_mark)):(this.states.push("parse_block_mapping_value"),this.parse_block_node_or_indentless_sequence());if(!this.check_token(i.BlockEndToken))throw n=this.peek_token(),new t.ParserError("while parsing a block mapping",this.marks.slice(-1)[0],"expected <block end>, but found "+n.id,n.start_mark);return n=this.get_token(),e=new r.MappingEndEvent(n.start_mark,n.end_mark),this.state=this.states.pop(),this.marks.pop(),e},e.prototype.parse_block_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.KeyToken,i.ValueToken,i.BlockEndToken)?(this.state="parse_block_mapping_key",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_block_mapping_key"),this.parse_block_node_or_indentless_sequence())):(this.state="parse_block_mapping_key",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_sequence_first_entry=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_flow_sequence_entry(!0)},e.prototype.parse_flow_sequence_entry=function(e){var n,o;if(null==e&&(e=!1),!this.check_token(i.FlowSequenceEndToken)){if(!e){if(!this.check_token(i.FlowEntryToken))throw o=this.peek_token(),new t.ParserError("while parsing a flow sequence",this.marks.slice(-1)[0],"expected ',' or ']', but got "+o.id,o.start_mark);this.get_token()}if(this.check_token(i.KeyToken))return o=this.peek_token(),n=new r.MappingStartEvent(null,null,!0,o.start_mark,o.end_mark,!0),this.state="parse_flow_sequence_entry_mapping_key",n;if(!this.check_token(i.FlowSequenceEndToken))return this.states.push("parse_flow_sequence_entry"),this.parse_flow_node()}return o=this.get_token(),n=new r.SequenceEndEvent(o.start_mark,o.end_mark),this.state=this.states.pop(),this.marks.pop(),n},e.prototype.parse_flow_sequence_entry_mapping_key=function(){var e;return e=this.get_token(),this.check_token(i.ValueToken,i.FlowEntryToken,i.FlowSequenceEndToken)?(this.state="parse_flow_sequence_entry_mapping_value",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_sequence_entry_mapping_value"),this.parse_flow_node())},e.prototype.parse_flow_sequence_entry_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.FlowEntryToken,i.FlowSequenceEndToken)?(this.state="parse_flow_sequence_entry_mapping_end",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_sequence_entry_mapping_end"),this.parse_flow_node())):(this.state="parse_flow_sequence_entry_mapping_end",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_sequence_entry_mapping_end=function(){var e;return this.state="parse_flow_sequence_entry",e=this.peek_token(),new r.MappingEndEvent(e.start_mark,e.start_mark)},e.prototype.parse_flow_mapping_first_key=function(){var e;return e=this.get_token(),this.marks.push(e.start_mark),this.parse_flow_mapping_key(!0)},e.prototype.parse_flow_mapping_key=function(e){var n,o;if(null==e&&(e=!1),!this.check_token(i.FlowMappingEndToken)){if(!e){if(!this.check_token(i.FlowEntryToken))throw o=this.peek_token(),new t.ParserError("while parsing a flow mapping",this.marks.slice(-1)[0],"expected ',' or '}', but got "+o.id,o.start_mark);this.get_token()}if(this.check_token(i.KeyToken))return o=this.get_token(),this.check_token(i.ValueToken,i.FlowEntryToken,i.FlowMappingEndToken)?(this.state="parse_flow_mapping_value",this.process_empty_scalar(o.end_mark)):(this.states.push("parse_flow_mapping_value"),this.parse_flow_node());if(!this.check_token(i.FlowMappingEndToken))return this.states.push("parse_flow_mapping_empty_value"),this.parse_flow_node()}return o=this.get_token(),n=new r.MappingEndEvent(o.start_mark,o.end_mark),this.state=this.states.pop(),this.marks.pop(),n},e.prototype.parse_flow_mapping_value=function(){var e;return this.check_token(i.ValueToken)?(e=this.get_token(),this.check_token(i.FlowEntryToken,i.FlowMappingEndToken)?(this.state="parse_flow_mapping_key",this.process_empty_scalar(e.end_mark)):(this.states.push("parse_flow_mapping_key"),this.parse_flow_node())):(this.state="parse_flow_mapping_key",e=this.peek_token(),this.process_empty_scalar(e.start_mark))},e.prototype.parse_flow_mapping_empty_value=function(){return this.state="parse_flow_mapping_key",this.process_empty_scalar(this.peek_token().start_mark)},e.prototype.process_empty_scalar=function(e){return new r.ScalarEvent(null,null,[!0,!1],"",e,e)},e}()}).call(this)},function(e,t,n){(function(){var e,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty,s=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};i=n(45),e=i.Mark,r=i.YAMLError,this.ReaderError=function(e){function t(e,n,r){this.position=e,this.character=n,this.reason=r,t.__super__.constructor.call(this)}return o(t,e),t.prototype.toString=function(){return"unacceptable character #"+this.character.charCodeAt(0).toString(16)+": "+this.reason+"\n  position "+this.position},t}(r),this.Reader=function(){function n(e){this.string=e,this.line=0,this.column=0,this.index=0,this.check_printable(),this.string+="\0"}var r;return r=/[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uFFFD]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,n.prototype.peek=function(e){return null==e&&(e=0),this.string[this.index+e]},n.prototype.prefix=function(e){return null==e&&(e=1),this.string.slice(this.index,this.index+e)},n.prototype.forward=function(e){var t,n;for(null==e&&(e=1),n=[];e;)t=this.string[this.index],this.index++,s.call("\n…₂\u2029",t)>=0||"\r"===t&&"\n"!==this.string[this.index]?(this.line++,this.column=0):this.column++,n.push(e--);return n},n.prototype.get_mark=function(){return new e(this.line,this.column,this.string,this.index)},n.prototype.check_printable=function(){var e,n,i;if(n=r.exec(this.string))throw e=n[0],i=this.string.length-this.index+n.index,new t.ReaderError(i,e,"special characters are not allowed")},n}()}).call(this)},function(e,t,n){(function(){var e,r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].slice,l=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};e=n(45).MarkedYAMLError,i=n(267),o=n(61),this.ScannerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(e),r=function(){function e(e,t,n,r,i,o){this.token_number=e,this.required=t,this.index=n,this.line=r,this.column=i,this.mark=o}return e}(),this.Scanner=function(){function e(){this.done=!1,this.flow_level=0,this.tokens=[],this.fetch_stream_start(),this.tokens_taken=0,this.indent=-1,this.indents=[],this.allow_simple_key=!0,this.possible_simple_keys={}}var n,a,c,p,f;return n="\r\n…\u2028\u2029",c="\t ",a="0123456789",f={0:"\0",a:"",b:"\b",t:"\t","\t":"\t",n:"\n",v:"\v",f:"\f",r:"\r",e:""," ":" ",'"':'"',"\\":"\\",N:"…",_:" ",L:"\u2028",P:"\u2029"},p={x:2,u:4,U:8},e.prototype.check_token=function(){var e,t,n,r;for(t=1<=arguments.length?u.call(arguments,0):[];this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length){if(0===t.length)return!0;for(n=0,r=t.length;n<r;n++)if(e=t[n],this.tokens[0]instanceof e)return!0}return!1},e.prototype.peek_token=function(){for(;this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length)return this.tokens[0]},e.prototype.get_token=function(){for(;this.need_more_tokens();)this.fetch_more_tokens();if(0!==this.tokens.length)return this.tokens_taken++,this.tokens.shift()},e.prototype.need_more_tokens=function(){return!this.done&&(0===this.tokens.length||(this.stale_possible_simple_keys(),this.next_possible_simple_key()===this.tokens_taken))},e.prototype.fetch_more_tokens=function(){var e;if(this.scan_to_next_token(),this.stale_possible_simple_keys(),this.unwind_indent(this.column),"\0"===(e=this.peek()))return this.fetch_stream_end();if("%"===e&&this.check_directive())return this.fetch_directive();if("-"===e&&this.check_document_start())return this.fetch_document_start();if("."===e&&this.check_document_end())return this.fetch_document_end();if("["===e)return this.fetch_flow_sequence_start();if("{"===e)return this.fetch_flow_mapping_start();if("]"===e)return this.fetch_flow_sequence_end();if("}"===e)return this.fetch_flow_mapping_end();if(","===e)return this.fetch_flow_entry();if("-"===e&&this.check_block_entry())return this.fetch_block_entry();if("?"===e&&this.check_key())return this.fetch_key();if(":"===e&&this.check_value())return this.fetch_value();if("*"===e)return this.fetch_alias();if("&"===e)return this.fetch_anchor();if("!"===e)return this.fetch_tag();if("|"===e&&0===this.flow_level)return this.fetch_literal();if(">"===e&&0===this.flow_level)return this.fetch_folded();if("'"===e)return this.fetch_single();if('"'===e)return this.fetch_double();if(this.check_plain())return this.fetch_plain();throw new t.ScannerError("while scanning for the next token",null,"found character "+e+" that cannot start any token",this.get_mark())},e.prototype.next_possible_simple_key=function(){var e,t,n,r;n=null,r=this.possible_simple_keys;for(t in r)s.call(r,t)&&(e=r[t],(null===n||e.token_number<n)&&(n=e.token_number));return n},e.prototype.stale_possible_simple_keys=function(){var e,n,r,i;r=this.possible_simple_keys,i=[];for(n in r)if(s.call(r,n)&&(e=r[n],!(e.line===this.line&&this.index-e.index<=1024))){if(e.required)throw new t.ScannerError("while scanning a simple key",e.mark,"could not find expected ':'",this.get_mark());i.push(delete this.possible_simple_keys[n])}return i},e.prototype.save_possible_simple_key=function(){var e,t;if((e=0===this.flow_level&&this.indent===this.column)&&!this.allow_simple_key)throw new Error("logic failure");if(this.allow_simple_key)return this.remove_possible_simple_key(),t=this.tokens_taken+this.tokens.length,this.possible_simple_keys[this.flow_level]=new r(t,e,this.index,this.line,this.column,this.get_mark())},e.prototype.remove_possible_simple_key=function(){var e;if(e=this.possible_simple_keys[this.flow_level]){if(e.required)throw new t.ScannerError("while scanning a simple key",e.mark,"could not find expected ':'",this.get_mark());return delete this.possible_simple_keys[this.flow_level]}},e.prototype.unwind_indent=function(e){var t,n;if(0===this.flow_level){for(n=[];this.indent>e;)t=this.get_mark(),this.indent=this.indents.pop(),n.push(this.tokens.push(new i.BlockEndToken(t,t)));return n}},e.prototype.add_indent=function(e){return e>this.indent&&(this.indents.push(this.indent),this.indent=e,!0)},e.prototype.fetch_stream_start=function(){var e;return e=this.get_mark(),this.tokens.push(new i.StreamStartToken(e,e,this.encoding))},e.prototype.fetch_stream_end=function(){var e;return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_possible_simple_key=!1,this.possible_simple_keys={},e=this.get_mark(),this.tokens.push(new i.StreamEndToken(e,e)),this.done=!0},e.prototype.fetch_directive=function(){return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_directive())},e.prototype.fetch_document_start=function(){return this.fetch_document_indicator(i.DocumentStartToken)},e.prototype.fetch_document_end=function(){return this.fetch_document_indicator(i.DocumentEndToken)},e.prototype.fetch_document_indicator=function(e){var t;return this.unwind_indent(-1),this.remove_possible_simple_key(),this.allow_simple_key=!1,t=this.get_mark(),this.forward(3),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_sequence_start=function(){return this.fetch_flow_collection_start(i.FlowSequenceStartToken)},e.prototype.fetch_flow_mapping_start=function(){return this.fetch_flow_collection_start(i.FlowMappingStartToken)},e.prototype.fetch_flow_collection_start=function(e){var t;return this.save_possible_simple_key(),this.flow_level++,this.allow_simple_key=!0,t=this.get_mark(),this.forward(),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_sequence_end=function(){return this.fetch_flow_collection_end(i.FlowSequenceEndToken)},e.prototype.fetch_flow_mapping_end=function(){return this.fetch_flow_collection_end(i.FlowMappingEndToken)},e.prototype.fetch_flow_collection_end=function(e){var t;return this.remove_possible_simple_key(),this.flow_level--,this.allow_simple_key=!1,t=this.get_mark(),this.forward(),this.tokens.push(new e(t,this.get_mark()))},e.prototype.fetch_flow_entry=function(){var e;return this.allow_simple_key=!0,this.remove_possible_simple_key(),e=this.get_mark(),this.forward(),this.tokens.push(new i.FlowEntryToken(e,this.get_mark()))},e.prototype.fetch_block_entry=function(){var e,n;if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"sequence entries are not allowed here",this.get_mark());this.add_indent(this.column)&&(e=this.get_mark(),this.tokens.push(new i.BlockSequenceStartToken(e,e)))}return this.allow_simple_key=!0,this.remove_possible_simple_key(),n=this.get_mark(),this.forward(),this.tokens.push(new i.BlockEntryToken(n,this.get_mark()))},e.prototype.fetch_key=function(){var e,n;if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"mapping keys are not allowed here",this.get_mark());this.add_indent(this.column)&&(e=this.get_mark(),this.tokens.push(new i.BlockMappingStartToken(e,e)))}return this.allow_simple_key=!this.flow_level,this.remove_possible_simple_key(),n=this.get_mark(),this.forward(),this.tokens.push(new i.KeyToken(n,this.get_mark()))},e.prototype.fetch_value=function(){var e,n,r;if(e=this.possible_simple_keys[this.flow_level])delete this.possible_simple_keys[this.flow_level],this.tokens.splice(e.token_number-this.tokens_taken,0,new i.KeyToken(e.mark,e.mark)),0===this.flow_level&&this.add_indent(e.column)&&this.tokens.splice(e.token_number-this.tokens_taken,0,new i.BlockMappingStartToken(e.mark,e.mark)),this.allow_simple_key=!1;else{if(0===this.flow_level){if(!this.allow_simple_key)throw new t.ScannerError(null,null,"mapping values are not allowed here",this.get_mark());this.add_indent(this.column)&&(n=this.get_mark(),this.tokens.push(new i.BlockMappingStartToken(n,n)))}this.allow_simple_key=!this.flow_level,this.remove_possible_simple_key()}return r=this.get_mark(),this.forward(),this.tokens.push(new i.ValueToken(r,this.get_mark()))},e.prototype.fetch_alias=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_anchor(i.AliasToken))},e.prototype.fetch_anchor=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_anchor(i.AnchorToken))},e.prototype.fetch_tag=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_tag())},e.prototype.fetch_literal=function(){return this.fetch_block_scalar("|")},e.prototype.fetch_folded=function(){return this.fetch_block_scalar(">")},e.prototype.fetch_block_scalar=function(e){return this.allow_simple_key=!0,this.remove_possible_simple_key(),this.tokens.push(this.scan_block_scalar(e))},e.prototype.fetch_single=function(){return this.fetch_flow_scalar("'")},e.prototype.fetch_double=function(){return this.fetch_flow_scalar('"')},e.prototype.fetch_flow_scalar=function(e){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_flow_scalar(e))},e.prototype.fetch_plain=function(){return this.save_possible_simple_key(),this.allow_simple_key=!1,this.tokens.push(this.scan_plain())},e.prototype.check_directive=function(){return 0===this.column},e.prototype.check_document_start=function(){var e;return 0===this.column&&"---"===this.prefix(3)&&(e=this.peek(3),l.call(n+c+"\0",e)>=0)},e.prototype.check_document_end=function(){var e;return 0===this.column&&"..."===this.prefix(3)&&(e=this.peek(3),l.call(n+c+"\0",e)>=0)},e.prototype.check_block_entry=function(){var e;return e=this.peek(1),l.call(n+c+"\0",e)>=0},e.prototype.check_key=function(){var e;return 0!==this.flow_level||(e=this.peek(1),l.call(n+c+"\0",e)>=0)},e.prototype.check_value=function(){var e;return 0!==this.flow_level||(e=this.peek(1),l.call(n+c+"\0",e)>=0)},e.prototype.check_plain=function(){var e,t;return e=this.peek(),l.call(n+c+"\0-?:,[]{}#&*!|>'\"%@`",e)<0||(t=this.peek(1),l.call(n+c+"\0",t)<0&&("-"===e||0===this.flow_level&&l.call("?:",e)>=0))},e.prototype.scan_to_next_token=function(){var e,t,r;for(0===this.index&&"\ufeff"===this.peek()&&this.forward(),e=!1,r=[];!e;){for(;" "===this.peek();)this.forward();if("#"===this.peek())for(;t=this.peek(),l.call(n+"\0",t)<0;)this.forward();this.scan_line_break()?0===this.flow_level?r.push(this.allow_simple_key=!0):r.push(void 0):r.push(e=!0)}return r},e.prototype.scan_directive=function(){var e,t,r,o,a;if(o=this.get_mark(),this.forward(),t=this.scan_directive_name(o),a=null,"YAML"===t)a=this.scan_yaml_directive_value(o),e=this.get_mark();else if("TAG"===t)a=this.scan_tag_directive_value(o),e=this.get_mark();else for(e=this.get_mark();r=this.peek(),l.call(n+"\0",r)<0;)this.forward();return this.scan_directive_ignored_line(o),new i.DirectiveToken(t,a,o,e)},e.prototype.scan_directive_name=function(e){var r,i,o;for(i=0,r=this.peek(i);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)i++,r=this.peek(i);if(0===i)throw new t.ScannerError("while scanning a directive",e,"expected alphanumeric or numeric character but found "+r,this.get_mark());if(o=this.prefix(i),this.forward(i),r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected alphanumeric or numeric character but found "+r,this.get_mark());return o},e.prototype.scan_yaml_directive_value=function(e){for(var r,i,o;" "===this.peek();)this.forward();if(r=this.scan_yaml_directive_number(e),"."!==this.peek())throw new t.ScannerError("while scanning a directive",e,"expected a digit or '.' but found "+this.peek(),this.get_mark());if(this.forward(),i=this.scan_yaml_directive_number(e),o=this.peek(),l.call(n+"\0 ",o)<0)throw new t.ScannerError("while scanning a directive",e,"expected a digit or ' ' but found "+this.peek(),this.get_mark());return[r,i]},e.prototype.scan_yaml_directive_number=function(e){var n,r,i,o;if(!("0"<=(n=this.peek())&&n<="9"))throw new t.ScannerError("while scanning a directive",e,"expected a digit but found "+n,this.get_mark());for(r=0;"0"<=(i=this.peek(r))&&i<="9";)r++;return o=parseInt(this.prefix(r)),this.forward(r),o},e.prototype.scan_tag_directive_value=function(e){for(var t,n;" "===this.peek();)this.forward();for(t=this.scan_tag_directive_handle(e);" "===this.peek();)this.forward();return n=this.scan_tag_directive_prefix(e),[t,n]},e.prototype.scan_tag_directive_handle=function(e){var n,r;if(r=this.scan_tag_handle("directive",e)," "!==(n=this.peek()))throw new t.ScannerError("while scanning a directive",e,"expected ' ' but found "+n,this.get_mark());return r},e.prototype.scan_tag_directive_prefix=function(e){var r,i;if(i=this.scan_tag_uri("directive",e),r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected ' ' but found "+r,this.get_mark());return i},e.prototype.scan_directive_ignored_line=function(e){for(var r,i;" "===this.peek();)this.forward();if("#"===this.peek())for(;i=this.peek(),l.call(n+"\0",i)<0;)this.forward();if(r=this.peek(),l.call(n+"\0",r)<0)throw new t.ScannerError("while scanning a directive",e,"expected a comment or a line break but found "+r,this.get_mark());return this.scan_line_break()},e.prototype.scan_anchor=function(e){var r,i,o,a,s,u;for(s=this.get_mark(),i=this.peek(),a="*"===i?"alias":"anchor",this.forward(),o=0,r=this.peek(o);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)o++,r=this.peek(o);if(0===o)throw new t.ScannerError("while scanning an "+a,s,"expected alphabetic or numeric character but found '"+r+"'",this.get_mark());if(u=this.prefix(o),this.forward(o),r=this.peek(),l.call(n+c+"\0?:,]}%@`",r)<0)throw new t.ScannerError("while scanning an "+a,s,"expected alphabetic or numeric character but found '"+r+"'",this.get_mark());return new e(u,s,this.get_mark())},e.prototype.scan_tag=function(){var e,r,o,a,s,u;if(a=this.get_mark(),"<"===(e=this.peek(1))){if(r=null,this.forward(2),s=this.scan_tag_uri("tag",a),">"!==this.peek())throw new t.ScannerError("while parsing a tag",a,"expected '>' but found "+this.peek(),this.get_mark());this.forward()}else if(l.call(n+c+"\0",e)>=0)r=null,s="!",this.forward();else{for(o=1,u=!1;l.call(n+"\0 ",e)<0;){if("!"===e){u=!0;break}o++,e=this.peek(o)}u?r=this.scan_tag_handle("tag",a):(r="!",this.forward()),s=this.scan_tag_uri("tag",a)}if(e=this.peek(),l.call(n+"\0 ",e)<0)throw new t.ScannerError("while scanning a tag",a,"expected ' ' but found "+e,this.get_mark());return new i.TagToken([r,s],a,this.get_mark())},e.prototype.scan_block_scalar=function(e){var t,r,a,s,u,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E;for(u=">"===e,a=[],E=this.get_mark(),this.forward(),g=this.scan_block_scalar_indicators(E),r=g[0],c=g[1],this.scan_block_scalar_ignored_line(E),v=this.indent+1,v<1&&(v=1),null==c?(y=this.scan_block_scalar_indentation(),t=y[0],m=y[1],s=y[2],p=Math.max(v,m)):(p=v+c-1,_=this.scan_block_scalar_breaks(p),t=_[0],s=_[1]),d="";this.column===p&&"\0"!==this.peek();){for(a=a.concat(t),b=this.peek(),f=l.call(" \t",b)<0,h=0;x=this.peek(h),l.call(n+"\0",x)<0;)h++;if(a.push(this.prefix(h)),this.forward(h),d=this.scan_line_break(),w=this.scan_block_scalar_breaks(p),t=w[0],s=w[1],this.column!==p||"\0"===this.peek())break;u&&"\n"===d&&f&&(k=this.peek(),l.call(" \t",k)<0)?o.is_empty(t)&&a.push(" "):a.push(d)}return!1!==r&&a.push(d),!0===r&&(a=a.concat(t)),new i.ScalarToken(a.join(""),!1,E,s,e)},e.prototype.scan_block_scalar_indicators=function(e){var r,i,o;if(i=null,o=null,r=this.peek(),l.call("+-",r)>=0){if(i="+"===r,this.forward(),r=this.peek(),l.call(a,r)>=0){if(0===(o=parseInt(r)))throw new t.ScannerError("while scanning a block scalar",e,"expected indentation indicator in the range 1-9 but found 0",this.get_mark());this.forward()}}else if(l.call(a,r)>=0){if(0===(o=parseInt(r)))throw new t.ScannerError("while scanning a block scalar",e,"expected indentation indicator in the range 1-9 but found 0",this.get_mark());this.forward(),r=this.peek(),l.call("+-",r)>=0&&(i="+"===r,this.forward())}if(r=this.peek(),l.call(n+"\0 ",r)<0)throw new t.ScannerError("while scanning a block scalar",e,"expected chomping or indentation indicators, but found "+r,this.get_mark());return[i,o]},e.prototype.scan_block_scalar_ignored_line=function(e){for(var r,i;" "===this.peek();)this.forward();if("#"===this.peek())for(;i=this.peek(),l.call(n+"\0",i)<0;)this.forward();if(r=this.peek(),l.call(n+"\0",r)<0)throw new t.ScannerError("while scanning a block scalar",e,"expected a comment or a line break but found "+r,this.get_mark());return this.scan_line_break()},e.prototype.scan_block_scalar_indentation=function(){var e,t,r,i;for(e=[],r=0,t=this.get_mark();i=this.peek(),l.call(n+" ",i)>=0;)" "!==this.peek()?(e.push(this.scan_line_break()),t=this.get_mark()):(this.forward(),this.column>r&&(r=this.column));return[e,r,t]},e.prototype.scan_block_scalar_breaks=function(e){var t,r,i;for(t=[],r=this.get_mark();this.column<e&&" "===this.peek();)this.forward();for(;i=this.peek(),l.call(n,i)>=0;)for(t.push(this.scan_line_break()),r=this.get_mark();this.column<e&&" "===this.peek();)this.forward();return[t,r]},e.prototype.scan_flow_scalar=function(e){var t,n,r,o;for(n='"'===e,t=[],o=this.get_mark(),r=this.peek(),this.forward(),t=t.concat(this.scan_flow_scalar_non_spaces(n,o));this.peek()!==r;)t=t.concat(this.scan_flow_scalar_spaces(n,o)),t=t.concat(this.scan_flow_scalar_non_spaces(n,o));return this.forward(),new i.ScalarToken(t.join(""),!1,o,this.get_mark(),e)},e.prototype.scan_flow_scalar_non_spaces=function(e,r){var i,o,s,u,h,d,m,v,g;for(o=[];;){for(d=0;m=this.peek(d),l.call(n+c+"'\"\\\0",m)<0;)d++;if(0!==d&&(o.push(this.prefix(d)),this.forward(d)),i=this.peek(),e||"'"!==i||"'"!==this.peek(1))if(e&&"'"===i||!e&&l.call('"\\',i)>=0)o.push(i),this.forward();else{if(!e||"\\"!==i)return o;if(this.forward(),(i=this.peek())in f)o.push(f[i]),this.forward();else if(i in p){for(d=p[i],this.forward(),h=u=0,v=d;0<=v?u<v:u>v;h=0<=v?++u:--u)if(g=this.peek(h),l.call(a+"ABCDEFabcdef",g)<0)throw new t.ScannerError("while scanning a double-quoted scalar",r,"expected escape sequence of "+d+" hexadecimal numbers, but found "+this.peek(h),this.get_mark());s=parseInt(this.prefix(d),16),o.push(String.fromCharCode(s)),this.forward(d)}else{if(!(l.call(n,i)>=0))throw new t.ScannerError("while scanning a double-quoted scalar",r,"found unknown escape character "+i,this.get_mark());this.scan_line_break(),o=o.concat(this.scan_flow_scalar_breaks(e,r))}}else o.push("'"),this.forward(2)}},e.prototype.scan_flow_scalar_spaces=function(e,r){var i,o,a,s,u,p,f;for(a=[],s=0;p=this.peek(s),l.call(c,p)>=0;)s++;if(f=this.prefix(s),this.forward(s),"\0"===(o=this.peek()))throw new t.ScannerError("while scanning a quoted scalar",r,"found unexpected end of stream",this.get_mark());return l.call(n,o)>=0?(u=this.scan_line_break(),i=this.scan_flow_scalar_breaks(e,r),"\n"!==u?a.push(u):0===i.length&&a.push(" "),a=a.concat(i)):a.push(f),a},e.prototype.scan_flow_scalar_breaks=function(e,r){var i,o,a,s,u;for(i=[];;){if("---"===(o=this.prefix(3))||"..."===o&&(a=this.peek(3),l.call(n+c+"\0",a)>=0))throw new t.ScannerError("while scanning a quoted scalar",r,"found unexpected document separator",this.get_mark());for(;s=this.peek(),l.call(c,s)>=0;)this.forward();if(u=this.peek(),!(l.call(n,u)>=0))return i;i.push(this.scan_line_break())}},e.prototype.scan_plain=function(){var e,r,o,a,s,u,p,f,h;for(r=[],h=o=this.get_mark(),a=this.indent+1,f=[];;){if(s=0,"#"===this.peek())break;for(;;){if(e=this.peek(s),l.call(n+c+"\0",e)>=0||0===this.flow_level&&":"===e&&(u=this.peek(s+1),l.call(n+c+"\0",u)>=0)||0!==this.flow_level&&l.call(",:?[]{}",e)>=0)break;s++}if(0!==this.flow_level&&":"===e&&(p=this.peek(s+1),l.call(n+c+"\0,[]{}",p)<0))throw this.forward(s),new t.ScannerError("while scanning a plain scalar",h,"found unexpected ':'",this.get_mark(),"Please check http://pyyaml.org/wiki/YAMLColonInFlowContext");if(0===s)break;if(this.allow_simple_key=!1,r=r.concat(f),r.push(this.prefix(s)),this.forward(s),o=this.get_mark(),null==(f=this.scan_plain_spaces(a,h))||0===f.length||"#"===this.peek()||0===this.flow_level&&this.column<a)break}return new i.ScalarToken(r.join(""),!0,h,o)},e.prototype.scan_plain_spaces=function(e,t){var r,i,o,a,s,u,p,f,h,d,m;for(o=[],a=0;p=this.peek(a),l.call(" ",p)>=0;)a++;if(m=this.prefix(a),this.forward(a),i=this.peek(),l.call(n,i)>=0){if(s=this.scan_line_break(),this.allow_simple_key=!0,"---"===(u=this.prefix(3))||"..."===u&&(f=this.peek(3),l.call(n+c+"\0",f)>=0))return;for(r=[];d=this.peek(),l.call(n+" ",d)>=0;)if(" "===this.peek())this.forward();else if(r.push(this.scan_line_break()),"---"===(u=this.prefix(3))||"..."===u&&(h=this.peek(3),l.call(n+c+"\0",h)>=0))return;"\n"!==s?o.push(s):0===r.length&&o.push(" "),o=o.concat(r)}else m&&o.push(m);return o},e.prototype.scan_tag_handle=function(e,n){var r,i,o;if("!"!==(r=this.peek()))throw new t.ScannerError("while scanning a "+e,n,"expected '!' but found "+r,this.get_mark());if(i=1," "!==(r=this.peek(i))){for(;"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-_",r)>=0;)i++,r=this.peek(i);if("!"!==r)throw this.forward(i),new t.ScannerError("while scanning a "+e,n,"expected '!' but found "+r,this.get_mark());i++}return o=this.prefix(i),this.forward(i),o},e.prototype.scan_tag_uri=function(e,n){var r,i,o;for(i=[],o=0,r=this.peek(o);"0"<=r&&r<="9"||"A"<=r&&r<="Z"||"a"<=r&&r<="z"||l.call("-;/?:@&=+$,_.!~*'()[]%",r)>=0;)"%"===r?(i.push(this.prefix(o)),this.forward(o),o=0,i.push(this.scan_uri_escapes(e,n))):o++,r=this.peek(o);if(0!==o&&(i.push(this.prefix(o)),this.forward(o),o=0),0===i.length)throw new t.ScannerError("while parsing a "+e,n,"expected URI but found "+r,this.get_mark());return i.join("")},e.prototype.scan_uri_escapes=function(e,n){var r,i,o;for(r=[],this.get_mark();"%"===this.peek();){for(this.forward(),o=i=0;i<=2;o=++i)throw new t.ScannerError("while scanning a "+e,n,"expected URI escape sequence of 2 hexadecimal numbers but found "+this.peek(o),this.get_mark());r.push(String.fromCharCode(parseInt(this.prefix(2),16))),this.forward(2)}return r.join("")},e.prototype.scan_line_break=function(){var e;return e=this.peek(),l.call("\r\n…",e)>=0?("\r\n"===this.prefix(2)?this.forward(2):this.forward(),"\n"):l.call("\u2028\u2029",e)>=0?(this.forward(),e):""},e}()}).call(this)},function(e,t){},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var i=n(35),o=r(i),a=n(47),s=r(a),u=n(48),l=r(u),c=n(203),p=r(c),f=n(562),h=r(f),d=n(46),m=r(d),v=n(560),g=r(v),y=n(271),_=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(y),b=n(9),x={PACKAGE_VERSION:"3.10.0",GIT_COMMIT:"g2e05bb99",GIT_DIRTY:!0,HOSTNAME:"banjo",BUILD_TIME:"Sat, 10 Feb 2018 04:32:34 GMT"},w=x.GIT_DIRTY,k=x.GIT_COMMIT,E=x.PACKAGE_VERSION,S=x.HOSTNAME,C=x.BUILD_TIME;e.exports=function(e){m.default.versions=m.default.versions||{},m.default.versions.swaggerUi={version:E,gitRevision:k,gitDirty:w,buildTimestamp:C,machine:S};var t={dom_id:null,domNode:null,spec:{},url:"",urls:null,layout:"BaseLayout",docExpansion:"list",maxDisplayedTags:null,filter:null,validatorUrl:"https://online.swagger.io/validator",configs:{},custom:{},displayOperationId:!1,displayRequestDuration:!1,deepLinking:!1,requestInterceptor:function(e){return e},responseInterceptor:function(e){return e},showMutatedRequest:!0,defaultModelRendering:"example",defaultModelExpandDepth:1,defaultModelsExpandDepth:1,showExtensions:!1,supportedSubmitMethods:["get","put","post","delete","options","head","patch","trace"],presets:[g.default],plugins:[],initialState:{},fn:{},components:{}},n=(0,b.parseSearch)(),r=e.domNode;delete e.domNode;var i=(0,p.default)({},t,e,n),a={system:{configs:i.configs},plugins:i.presets,state:(0,p.default)({layout:{layout:i.layout,filter:i.filter},spec:{spec:"",url:i.url}},i.initialState)};if(i.initialState)for(var u in i.initialState)i.initialState.hasOwnProperty(u)&&void 0===i.initialState[u]&&delete a.state[u];var c=function(){return{fn:i.fn,components:i.components,state:i.state}},f=new h.default(a);f.register([i.plugins,c]);var d=f.getSystem(),v=function(e){if("object"!==(void 0===i?"undefined":(0,l.default)(i)))return d;var t=d.specSelectors.getLocalConfig?d.specSelectors.getLocalConfig():{},a=(0,p.default)({},t,i,e||{},n);if(r&&(a.domNode=r),f.setConfigs(a),null!==e&&(!n.url&&"object"===(0,l.default)(a.spec)&&(0,s.default)(a.spec).length?(d.specActions.updateUrl(""),d.specActions.updateLoadingStatus("success"),d.specActions.updateSpec((0,o.default)(a.spec))):d.specActions.download&&a.url&&(d.specActions.updateUrl(a.url),d.specActions.download(a.url))),a.domNode)d.render(a.domNode,"App");else if(a.dom_id){var u=document.querySelector(a.dom_id);d.render(u,"App")}else null===a.dom_id||null===a.domNode||console.error("Skipped rendering: no `dom_id` or `domNode` was specified");return d},y=n.config||i.configUrl;return!y||!d.specActions.getConfigByUrl||d.specActions.getConfigByUrl&&!d.specActions.getConfigByUrl(y,v)?v():d},e.exports.presets={apis:g.default},e.exports.plugins=_},function(e,t,n){"use strict";var r=n(46);void 0===function(e){return e&&e.__esModule?e:{default:e}}(r).default.Promise&&n(584),String.prototype.startsWith||n(583)},function(e,t,n){"use strict";function r(e){return u.indexOf(e[0])>-1}function i(e){var t,n,i=e.replace(a,"");return r(i)?i:(n=i.match(s))?(t=n[0],o.test(t)?"about:blank":i):"about:blank"}var o=/^(%20|\s)*(javascript|data)/im,a=/[^\x20-\x7E]/gim,s=/^([^:]+):/gm,u=[".","/"];e.exports={sanitizeUrl:i}},function(e,t,n){"use strict";(function(t){function n(e){for(var t=[],n=0;n<e.length;n++)-1===t.indexOf(e[n])&&t.push(e[n]);return t}function r(e){var t=new Set;return e.filter(function(e){return!t.has(e)&&(t.add(e),!0)})}function i(e){var t=[];return new Set(e).forEach(function(e){t.push(e)}),t}"Set"in t?"function"==typeof Set.prototype.forEach&&function(){var e=!1;return new Set([!0]).forEach(function(t){e=t}),!0===e}()?e.exports=i:e.exports=r:e.exports=n}).call(t,n(17))},function(e,t,n){var r,i;!function(n,o){r=[],void 0!==(i=function(){return n.Autolinker=o()}.apply(t,r))&&(e.exports=i)}(this,function(){/*!
+ * Autolinker.js
+ * 0.15.3
+ *
+ * Copyright(c) 2015 Gregory Jacobs <greg@greg-jacobs.com>
+ * MIT Licensed. http://www.opensource.org/licenses/mit-license.php
+ *
+ * https://github.com/gregjacobs/Autolinker.js
+ */
+var e=function(t){e.Util.assign(this,t)};return e.prototype={constructor:e,urls:!0,email:!0,twitter:!0,newWindow:!0,stripPrefix:!0,truncate:void 0,className:"",htmlParser:void 0,matchParser:void 0,tagBuilder:void 0,link:function(e){for(var t=this.getHtmlParser(),n=t.parse(e),r=0,i=[],o=0,a=n.length;o<a;o++){var s=n[o],u=s.getType(),l=s.getText();if("element"===u)"a"===s.getTagName()&&(s.isClosing()?r=Math.max(r-1,0):r++),i.push(l);else if("entity"===u)i.push(l);else if(0===r){var c=this.linkifyStr(l);i.push(c)}else i.push(l)}return i.join("")},linkifyStr:function(e){return this.getMatchParser().replace(e,this.createMatchReturnVal,this)},createMatchReturnVal:function(t){var n;return this.replaceFn&&(n=this.replaceFn.call(this,this,t)),"string"==typeof n?n:!1===n?t.getMatchedText():n instanceof e.HtmlTag?n.toString():this.getTagBuilder().build(t).toString()},getHtmlParser:function(){var t=this.htmlParser;return t||(t=this.htmlParser=new e.htmlParser.HtmlParser),t},getMatchParser:function(){var t=this.matchParser;return t||(t=this.matchParser=new e.matchParser.MatchParser({urls:this.urls,email:this.email,twitter:this.twitter,stripPrefix:this.stripPrefix})),t},getTagBuilder:function(){var t=this.tagBuilder;return t||(t=this.tagBuilder=new e.AnchorTagBuilder({newWindow:this.newWindow,truncate:this.truncate,className:this.className})),t}},e.link=function(t,n){return new e(n).link(t)},e.match={},e.htmlParser={},e.matchParser={},e.Util={abstractMethod:function(){throw"abstract"},assign:function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},extend:function(t,n){var r=t.prototype,i=function(){};i.prototype=r;var o;o=n.hasOwnProperty("constructor")?n.constructor:function(){r.constructor.apply(this,arguments)};var a=o.prototype=new i;return a.constructor=o,a.superclass=r,delete n.constructor,e.Util.assign(a,n),o},ellipsis:function(e,t,n){return e.length>t&&(n=null==n?"..":n,e=e.substring(0,t-n.length)+n),e},indexOf:function(e,t){if(Array.prototype.indexOf)return e.indexOf(t);for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},splitAndCapture:function(e,t){if(!t.global)throw new Error("`splitRegex` must have the 'g' flag set");for(var n,r=[],i=0;n=t.exec(e);)r.push(e.substring(i,n.index)),r.push(n[0]),i=n.index+n[0].length;return r.push(e.substring(i)),r}},e.HtmlTag=e.Util.extend(Object,{whitespaceRegex:/\s+/,constructor:function(t){e.Util.assign(this,t),this.innerHtml=this.innerHtml||this.innerHTML},setTagName:function(e){return this.tagName=e,this},getTagName:function(){return this.tagName||""},setAttr:function(e,t){return this.getAttrs()[e]=t,this},getAttr:function(e){return this.getAttrs()[e]},setAttrs:function(t){var n=this.getAttrs();return e.Util.assign(n,t),this},getAttrs:function(){return this.attrs||(this.attrs={})},setClass:function(e){return this.setAttr("class",e)},addClass:function(t){for(var n,r=this.getClass(),i=this.whitespaceRegex,o=e.Util.indexOf,a=r?r.split(i):[],s=t.split(i);n=s.shift();)-1===o(a,n)&&a.push(n);return this.getAttrs().class=a.join(" "),this},removeClass:function(t){for(var n,r=this.getClass(),i=this.whitespaceRegex,o=e.Util.indexOf,a=r?r.split(i):[],s=t.split(i);a.length&&(n=s.shift());){var u=o(a,n);-1!==u&&a.splice(u,1)}return this.getAttrs().class=a.join(" "),this},getClass:function(){return this.getAttrs().class||""},hasClass:function(e){return-1!==(" "+this.getClass()+" ").indexOf(" "+e+" ")},setInnerHtml:function(e){return this.innerHtml=e,this},getInnerHtml:function(){return this.innerHtml||""},toString:function(){var e=this.getTagName(),t=this.buildAttrsStr();return t=t?" "+t:"",["<",e,t,">",this.getInnerHtml(),"</",e,">"].join("")},buildAttrsStr:function(){if(!this.attrs)return"";var e=this.getAttrs(),t=[];for(var n in e)e.hasOwnProperty(n)&&t.push(n+'="'+e[n]+'"');return t.join(" ")}}),e.AnchorTagBuilder=e.Util.extend(Object,{constructor:function(t){e.Util.assign(this,t)},build:function(t){return new e.HtmlTag({tagName:"a",attrs:this.createAttrs(t.getType(),t.getAnchorHref()),innerHtml:this.processAnchorText(t.getAnchorText())})},createAttrs:function(e,t){var n={href:t},r=this.createCssClass(e);return r&&(n.class=r),this.newWindow&&(n.target="_blank"),n},createCssClass:function(e){var t=this.className;return t?t+" "+t+"-"+e:""},processAnchorText:function(e){return e=this.doTruncate(e)},doTruncate:function(t){return e.Util.ellipsis(t,this.truncate||Number.POSITIVE_INFINITY)}}),e.htmlParser.HtmlParser=e.Util.extend(Object,{htmlRegex:function(){var e=/[0-9a-zA-Z][0-9a-zA-Z:]*/,t=/[^\s\0"'>\/=\x01-\x1F\x7F]+/,n=/(?:"[^"]*?"|'[^']*?'|[^'"=<>`\s]+)/,r=t.source+"(?:\\s*=\\s*"+n.source+")?";return new RegExp(["(?:","<(!DOCTYPE)","(?:","\\s+","(?:",r,"|",n.source+")",")*",">",")","|","(?:","<(/)?","("+e.source+")","(?:","\\s+",r,")*","\\s*/?",">",")"].join(""),"gi")}(),htmlCharacterEntitiesRegex:/(&nbsp;|&#160;|&lt;|&#60;|&gt;|&#62;|&quot;|&#34;|&#39;)/gi,parse:function(e){for(var t,n,r=this.htmlRegex,i=0,o=[];null!==(t=r.exec(e));){var a=t[0],s=t[1]||t[3],u=!!t[2],l=e.substring(i,t.index);l&&(n=this.parseTextAndEntityNodes(l),o.push.apply(o,n)),o.push(this.createElementNode(a,s,u)),i=t.index+a.length}if(i<e.length){var c=e.substring(i);c&&(n=this.parseTextAndEntityNodes(c),o.push.apply(o,n))}return o},parseTextAndEntityNodes:function(t){for(var n=[],r=e.Util.splitAndCapture(t,this.htmlCharacterEntitiesRegex),i=0,o=r.length;i<o;i+=2){var a=r[i],s=r[i+1];a&&n.push(this.createTextNode(a)),s&&n.push(this.createEntityNode(s))}return n},createElementNode:function(t,n,r){return new e.htmlParser.ElementNode({text:t,tagName:n.toLowerCase(),closing:r})},createEntityNode:function(t){return new e.htmlParser.EntityNode({text:t})},createTextNode:function(t){return new e.htmlParser.TextNode({text:t})}}),e.htmlParser.HtmlNode=e.Util.extend(Object,{text:"",constructor:function(t){e.Util.assign(this,t)},getType:e.Util.abstractMethod,getText:function(){return this.text}}),e.htmlParser.ElementNode=e.Util.extend(e.htmlParser.HtmlNode,{tagName:"",closing:!1,getType:function(){return"element"},getTagName:function(){return this.tagName},isClosing:function(){return this.closing}}),e.htmlParser.EntityNode=e.Util.extend(e.htmlParser.HtmlNode,{getType:function(){return"entity"}}),e.htmlParser.TextNode=e.Util.extend(e.htmlParser.HtmlNode,{getType:function(){return"text"}}),e.matchParser.MatchParser=e.Util.extend(Object,{urls:!0,email:!0,twitter:!0,stripPrefix:!0,matcherRegex:function(){var e=/(^|[^\w])@(\w{1,15})/,t=/(?:[\-;:&=\+\$,\w\.]+@)/,n=/(?:[A-Za-z][-.+A-Za-z0-9]+:(?![A-Za-z][-.+A-Za-z0-9]+:\/\/)(?!\d+\/?)(?:\/\/)?)/,r=/(?:www\.)/,i=/[A-Za-z0-9\.\-]*[A-Za-z0-9\-]/,o=/\.(?:international|construction|contractors|enterprises|photography|productions|foundation|immobilien|industries|management|properties|technology|christmas|community|directory|education|equipment|institute|marketing|solutions|vacations|bargains|boutique|builders|catering|cleaning|clothing|computer|democrat|diamonds|graphics|holdings|lighting|partners|plumbing|supplies|training|ventures|academy|careers|company|cruises|domains|exposed|flights|florist|gallery|guitars|holiday|kitchen|neustar|okinawa|recipes|rentals|reviews|shiksha|singles|support|systems|agency|berlin|camera|center|coffee|condos|dating|estate|events|expert|futbol|kaufen|luxury|maison|monash|museum|nagoya|photos|repair|report|social|supply|tattoo|tienda|travel|viajes|villas|vision|voting|voyage|actor|build|cards|cheap|codes|dance|email|glass|house|mango|ninja|parts|photo|shoes|solar|today|tokyo|tools|watch|works|aero|arpa|asia|best|bike|blue|buzz|camp|club|cool|coop|farm|fish|gift|guru|info|jobs|kiwi|kred|land|limo|link|menu|mobi|moda|name|pics|pink|post|qpon|rich|ruhr|sexy|tips|vote|voto|wang|wien|wiki|zone|bar|bid|biz|cab|cat|ceo|com|edu|gov|int|kim|mil|net|onl|org|pro|pub|red|tel|uno|wed|xxx|xyz|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cw|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)\b/,a=/[\-A-Za-z0-9+&@#\/%=~_()|'$*\[\]?!:,.;]*[\-A-Za-z0-9+&@#\/%=~_()|'$*\[\]]/;return new RegExp(["(",e.source,")","|","(",t.source,i.source,o.source,")","|","(","(?:","(",n.source,i.source,")","|","(?:","(.?//)?",r.source,i.source,")","|","(?:","(.?//)?",i.source,o.source,")",")","(?:"+a.source+")?",")"].join(""),"gi")}(),charBeforeProtocolRelMatchRegex:/^(.)?\/\//,constructor:function(t){e.Util.assign(this,t),this.matchValidator=new e.MatchValidator},replace:function(e,t,n){var r=this;return e.replace(this.matcherRegex,function(e,i,o,a,s,u,l,c,p){var f=r.processCandidateMatch(e,i,o,a,s,u,l,c,p);if(f){var h=t.call(n,f.match);return f.prefixStr+h+f.suffixStr}return e})},processCandidateMatch:function(t,n,r,i,o,a,s,u,l){var c,p=u||l,f="",h="";if(n&&!this.twitter||o&&!this.email||a&&!this.urls||!this.matchValidator.isValidMatch(a,s,p))return null;if(this.matchHasUnbalancedClosingParen(t)&&(t=t.substr(0,t.length-1),h=")"),o)c=new e.match.Email({matchedText:t,email:o});else if(n)r&&(f=r,t=t.slice(1)),c=new e.match.Twitter({matchedText:t,twitterHandle:i});else{if(p){var d=p.match(this.charBeforeProtocolRelMatchRegex)[1]||"";d&&(f=d,t=t.slice(1))}c=new e.match.Url({matchedText:t,url:t,protocolUrlMatch:!!s,protocolRelativeMatch:!!p,stripPrefix:this.stripPrefix})}return{prefixStr:f,suffixStr:h,match:c}},matchHasUnbalancedClosingParen:function(e){if(")"===e.charAt(e.length-1)){var t=e.match(/\(/g),n=e.match(/\)/g);if((t&&t.length||0)<(n&&n.length||0))return!0}return!1}}),e.MatchValidator=e.Util.extend(Object,{invalidProtocolRelMatchRegex:/^[\w]\/\//,hasFullProtocolRegex:/^[A-Za-z][-.+A-Za-z0-9]+:\/\//,uriSchemeRegex:/^[A-Za-z][-.+A-Za-z0-9]+:/,hasWordCharAfterProtocolRegex:/:[^\s]*?[A-Za-z]/,isValidMatch:function(e,t,n){return!(t&&!this.isValidUriScheme(t)||this.urlMatchDoesNotHaveProtocolOrDot(e,t)||this.urlMatchDoesNotHaveAtLeastOneWordChar(e,t)||this.isInvalidProtocolRelativeMatch(n))},isValidUriScheme:function(e){var t=e.match(this.uriSchemeRegex)[0].toLowerCase();return"javascript:"!==t&&"vbscript:"!==t},urlMatchDoesNotHaveProtocolOrDot:function(e,t){return!(!e||t&&this.hasFullProtocolRegex.test(t)||-1!==e.indexOf("."))},urlMatchDoesNotHaveAtLeastOneWordChar:function(e,t){return!(!e||!t)&&!this.hasWordCharAfterProtocolRegex.test(e)},isInvalidProtocolRelativeMatch:function(e){return!!e&&this.invalidProtocolRelMatchRegex.test(e)}}),e.match.Match=e.Util.extend(Object,{constructor:function(t){e.Util.assign(this,t)},getType:e.Util.abstractMethod,getMatchedText:function(){return this.matchedText},getAnchorHref:e.Util.abstractMethod,getAnchorText:e.Util.abstractMethod}),e.match.Email=e.Util.extend(e.match.Match,{getType:function(){return"email"},getEmail:function(){return this.email},getAnchorHref:function(){return"mailto:"+this.email},getAnchorText:function(){return this.email}}),e.match.Twitter=e.Util.extend(e.match.Match,{getType:function(){return"twitter"},getTwitterHandle:function(){return this.twitterHandle},getAnchorHref:function(){return"https://twitter.com/"+this.twitterHandle},getAnchorText:function(){return"@"+this.twitterHandle}}),e.match.Url=e.Util.extend(e.match.Match,{urlPrefixRegex:/^(https?:\/\/)?(www\.)?/i,protocolRelativeRegex:/^\/\//,protocolPrepended:!1,getType:function(){return"url"},getUrl:function(){var e=this.url;return this.protocolRelativeMatch||this.protocolUrlMatch||this.protocolPrepended||(e=this.url="http://"+e,this.protocolPrepended=!0),e},getAnchorHref:function(){return this.getUrl().replace(/&amp;/g,"&")},getAnchorText:function(){var e=this.getUrl();return this.protocolRelativeMatch&&(e=this.stripProtocolRelativePrefix(e)),this.stripPrefix&&(e=this.stripUrlPrefix(e)),e=this.removeTrailingSlash(e)},stripUrlPrefix:function(e){return e.replace(this.urlPrefixRegex,"")},stripProtocolRelativePrefix:function(e){return e.replace(this.protocolRelativeRegex,"")},removeTrailingSlash:function(e){return"/"===e.charAt(e.length-1)&&(e=e.slice(0,-1)),e}}),e})},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getLayout",value:function(){var e=this.props,t=e.getComponent,n=e.layoutSelectors,r=n.current(),i=t(r,!0);return i||function(){return m.default.createElement("h1",null,' No layout defined for "',r,'" ')}}},{key:"render",value:function(){var e=this.getLayout();return m.default.createElement(e,null)}}]),t}(m.default.Component);t.default=y,y.propTypes={getComponent:g.default.func.isRequired,layoutSelectors:g.default.object.isRequired},y.defaultProps={}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(18),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(12),k=r(w),E={color:"#999",fontStyle:"italic"},S=function(e){function t(){return(0,p.default)(this,t),(0,m.default)(this,(t.__proto__||(0,l.default)(t)).apply(this,arguments))}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=e.schema,i=e.depth,a=e.expandDepth,u=e.name,l=e.specPath,c=r.get("description"),p=r.get("items"),f=r.get("title")||u,h=r.filter(function(e,t){return-1===["type","items","description","$$ref"].indexOf(t)}),d=t("Markdown"),m=t("ModelCollapse"),v=t("Model"),g=t("Property"),y=f&&_.default.createElement("span",{className:"model-title"},_.default.createElement("span",{className:"model-title__text"},f));return _.default.createElement("span",{className:"model"},_.default.createElement(m,{title:y,expanded:i<=a,collapsedContent:"[...]"},"[",h.size?h.entrySeq().map(function(e){var t=(0,s.default)(e,2),n=t[0],r=t[1];return _.default.createElement(g,{key:n+"-"+r,propKey:n,propVal:r,propStyle:E})}):null,c?_.default.createElement(d,{source:c}):null,_.default.createElement("span",null,_.default.createElement(v,(0,o.default)({},this.props,{getConfigs:n,specPath:l.push("items"),name:null,schema:p,required:!1,depth:i+1}))),"]"))}}]),t}(y.Component);S.propTypes={schema:x.default.object.isRequired,getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired,name:x.default.string,required:x.default.bool,expandDepth:x.default.number,specPath:k.default.list.isRequired,depth:x.default.number},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(30),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));x.call(r);var i=r.props,o=i.name,a=i.schema,u=r.getValue();return r.state={name:o,schema:a,value:u},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.name,n=e.authorized;return n&&n.getIn([t,"value"])}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.errSelectors,i=e.name,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("Markdown"),c=n("JumpToPath",!0),p=this.getValue(),f=r.allErrors().filter(function(e){return e.get("authId")===i});return g.default.createElement("div",null,g.default.createElement("h4",null,g.default.createElement("code",null,i||t.get("name")),"  (apiKey)",g.default.createElement(c,{path:["securityDefinitions",i]})),p&&g.default.createElement("h6",null,"Authorized"),g.default.createElement(a,null,g.default.createElement(l,{source:t.get("description")})),g.default.createElement(a,null,g.default.createElement("p",null,"Name: ",g.default.createElement("code",null,t.get("name")))),g.default.createElement(a,null,g.default.createElement("p",null,"In: ",g.default.createElement("code",null,t.get("in")))),g.default.createElement(a,null,g.default.createElement("label",null,"Value:"),p?g.default.createElement("code",null," ****** "):g.default.createElement(s,null,g.default.createElement(o,{type:"text",onChange:this.onChange}))),f.valueSeq().map(function(e,t){return g.default.createElement(u,{error:e,key:t})}))}}]),t}(g.default.Component);b.propTypes={authorized:_.default.object,getComponent:_.default.func.isRequired,errSelectors:_.default.object.isRequired,schema:_.default.object.isRequired,name:_.default.string.isRequired,onChange:_.default.func};var x=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target.value,i=(0,o.default)({},e.state,{value:r});e.setState(i),n(i)}};t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.name,r=e.getComponent,i=e.onAuthChange,o=e.authorized,a=e.errSelectors,s=r("apiKeyAuth"),u=r("basicAuth"),l=void 0,c=t.get("type");switch(c){case"apiKey":l=m.default.createElement(s,{key:n,schema:t,name:n,errSelectors:a,authorized:o,getComponent:r,onChange:i});break;case"basic":l=m.default.createElement(u,{key:n,schema:t,name:n,errSelectors:a,authorized:o,getComponent:r,onChange:i});break;default:l=m.default.createElement("div",{key:n},"Unknown security definition type ",c)}return m.default.createElement("div",{key:n+"-jump"},l)}}]),t}(m.default.Component);b.propTypes={schema:_.default.orderedMap.isRequired,name:g.default.string.isRequired,onAuthChange:g.default.func.isRequired,authorized:_.default.orderedMap.isRequired},b.propTypes={errSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,authActions:g.default.object.isRequired,definitions:_.default.iterable.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.close=function(){r.props.authActions.showDefinitions(!1)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.authSelectors,n=e.authActions,r=e.getComponent,i=e.errSelectors,o=e.specSelectors,a=e.fn.AST,s=t.shownDefinitions(),u=r("auths");return m.default.createElement("div",{className:"dialog-ux"},m.default.createElement("div",{className:"backdrop-ux"}),m.default.createElement("div",{className:"modal-ux"},m.default.createElement("div",{className:"modal-dialog-ux"},m.default.createElement("div",{className:"modal-ux-inner"},m.default.createElement("div",{className:"modal-ux-header"},m.default.createElement("h3",null,"Available authorizations"),m.default.createElement("button",{type:"button",className:"close-modal",onClick:this.close},m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:"#close",xlinkHref:"#close"})))),m.default.createElement("div",{className:"modal-ux-content"},s.valueSeq().map(function(e,s){return m.default.createElement(u,{key:s,AST:a,definitions:e,getComponent:r,errSelectors:i,authSelectors:t,authActions:n,specSelectors:o})}))))))}}]),t}(m.default.Component);y.propTypes={fn:g.default.object.isRequired,getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,errSelectors:g.default.object.isRequired,authActions:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.authActions,n=e.authSelectors,i=n.definitionsToAuthorize();t.showDefinitions(i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.authSelectors,n=e.getComponent,r=n("authorizationPopup",!0),i=!!t.shownDefinitions(),o=!!t.authorized().size;return m.default.createElement("div",{className:"auth-wrapper"},m.default.createElement("button",{className:o?"btn authorize locked":"btn authorize unlocked",onClick:this.onClick},m.default.createElement("span",null,"Authorize"),m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:o?"#locked":"#unlocked",xlinkHref:o?"#locked":"#unlocked"}))),i&&m.default.createElement(r,null))}}]),t}(m.default.Component);y.propTypes={className:g.default.string},y.propTypes={getComponent:g.default.func.isRequired,authSelectors:g.default.object.isRequired,errActions:g.default.object.isRequired,authActions:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(e){e.stopPropagation();var t=r.props.onClick;t&&t()},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.isAuthorized;return m.default.createElement("button",{className:e?"authorization__btn locked":"authorization__btn unlocked","aria-label":e?"authorization button locked":"authorization button unlocked",onClick:this.onClick},m.default.createElement("svg",{width:"20",height:"20"},m.default.createElement("use",{href:e?"#locked":"#unlocked",xlinkHref:e?"#locked":"#unlocked"})))}}]),t}(m.default.Component);y.propTypes={isAuthorized:g.default.bool.isRequired,onClick:g.default.func},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));return r.onAuthChange=function(e){var t=e.name;r.setState((0,o.default)({},t,e))},r.submitAuth=function(e){e.preventDefault(),r.props.authActions.authorize(r.state)},r.logoutClick=function(e){e.preventDefault();var t=r.props,n=t.authActions,i=t.definitions,o=i.map(function(e,t){return t}).toArray();n.logout(o)},r.close=function(e){e.preventDefault(),r.props.authActions.showDefinitions(!1)},r.state={},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.definitions,r=t.getComponent,i=t.authSelectors,o=t.errSelectors,a=r("AuthItem"),s=r("oauth2",!0),u=r("Button"),l=i.authorized(),c=n.filter(function(e,t){return!!l.get(t)}),p=n.filter(function(e){return"oauth2"!==e.get("type")}),f=n.filter(function(e){return"oauth2"===e.get("type")});return g.default.createElement("div",{className:"auth-container"},!!p.size&&g.default.createElement("form",{onSubmit:this.submitAuth},p.map(function(t,n){return g.default.createElement(a,{key:n,schema:t,name:n,getComponent:r,onAuthChange:e.onAuthChange,authorized:l,errSelectors:o})}).toArray(),g.default.createElement("div",{className:"auth-btn-wrapper"},g.default.createElement(u,{className:"btn modal-btn auth btn-done",onClick:this.close},"Done"),p.size===c.size?g.default.createElement(u,{className:"btn modal-btn auth",onClick:this.logoutClick},"Logout"):g.default.createElement(u,{type:"submit",className:"btn modal-btn auth authorize"},"Authorize"))),f&&f.size?g.default.createElement("div",null,g.default.createElement("div",{className:"scope-def"},g.default.createElement("p",null,"Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes."),g.default.createElement("p",null,"API requires the following scopes. Select which ones you want to grant to Swagger UI.")),n.filter(function(e){return"oauth2"===e.get("type")}).map(function(e,t){return g.default.createElement("div",{key:t},g.default.createElement(s,{authorized:l,schema:e,name:t}))}).toArray()):null)}}]),t}(g.default.Component);w.propTypes={definitions:_.default.object.isRequired,getComponent:_.default.func.isRequired,authSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,specSelectors:_.default.object.isRequired},w.propTypes={errSelectors:_.default.object.isRequired,getComponent:_.default.func.isRequired,authSelectors:_.default.object.isRequired,specSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,definitions:x.default.iterable.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));x.call(r);var i=r.props,a=i.schema,u=i.name,l=r.getValue(),c=l.username;return r.state={name:u,schema:a,value:c?{username:c}:{}},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"getValue",value:function(){var e=this.props,t=e.authorized,n=e.name;return t&&t.getIn([n,"value"])||{}}},{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.name,i=e.errSelectors,o=n("Input"),a=n("Row"),s=n("Col"),u=n("authError"),l=n("JumpToPath",!0),c=n("Markdown"),p=this.getValue().username,f=i.allErrors().filter(function(e){return e.get("authId")===r});return m.default.createElement("div",null,m.default.createElement("h4",null,"Basic authorization",m.default.createElement(l,{path:["securityDefinitions",r]})),p&&m.default.createElement("h6",null,"Authorized"),m.default.createElement(a,null,m.default.createElement(c,{source:t.get("description")})),m.default.createElement(a,null,m.default.createElement("label",null,"Username:"),p?m.default.createElement("code",null," ",p," "):m.default.createElement(s,null,m.default.createElement(o,{type:"text",required:"required",name:"username",onChange:this.onChange}))),m.default.createElement(a,null,m.default.createElement("label",null,"Password:"),p?m.default.createElement("code",null," ****** "):m.default.createElement(s,null,m.default.createElement(o,{required:"required",autoComplete:"new-password",name:"password",type:"password",onChange:this.onChange}))),f.valueSeq().map(function(e,t){return m.default.createElement(u,{error:e,key:t})}))}}]),t}(m.default.Component);b.propTypes={authorized:g.default.object,getComponent:g.default.func.isRequired,schema:g.default.object.isRequired,onChange:g.default.func.isRequired},b.propTypes={name:g.default.string.isRequired,errSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,onChange:g.default.func,schema:_.default.map,authorized:_.default.map};var x=function(){var e=this;this.onChange=function(t){var n=e.props.onChange,r=t.target,i=r.value,o=r.name,a=e.state.value;a[o]=i,e.setState({value:a}),n(e.state)}};t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.error,t=e.get("level"),n=e.get("message"),r=e.get("source");return m.default.createElement("div",{className:"errors",style:{backgroundColor:"#ffeeee",color:"red",margin:"1em"}},m.default.createElement("b",{style:{textTransform:"capitalize",marginRight:"1em"}},r," ",t),m.default.createElement("span",null,n))}}]),t}(m.default.Component);y.propTypes={error:g.default.object.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(36),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(559),x=r(b),w=function(e){function t(e,n){(0,l.default)(this,t);var r=(0,h.default)(this,(t.__proto__||(0,s.default)(t)).call(this,e,n));k.call(r);var i=r.props,o=i.name,a=i.schema,u=i.authorized,c=i.authSelectors,p=u&&u.get(o),f=c.getConfigs()||{},d=p&&p.get("username")||"",m=p&&p.get("clientId")||f.clientId||"",v=p&&p.get("clientSecret")||f.clientSecret||"",g=p&&p.get("passwordType")||"request-body";return r.state={appName:f.appName,name:o,schema:a,scopes:[],clientId:m,clientSecret:v,username:d,password:"",passwordType:g},r}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.schema,r=t.getComponent,i=t.authSelectors,o=t.errSelectors,a=t.name,s=t.specSelectors,u=r("Input"),l=r("Row"),c=r("Col"),p=r("Button"),f=r("authError"),h=r("JumpToPath",!0),d=r("Markdown"),m=s.isOAS3,v=m()?"authorizationCode":"accessCode",y=m()?"clientCredentials":"application",_=n.get("flow"),b=n.get("allowedScopes")||n.get("scopes"),x=i.authorized().get(a),w=!!x,k=o.allErrors().filter(function(e){return e.get("authId")===a}),E=!k.filter(function(e){return"validation"===e.get("source")}).size,S=n.get("description");return g.default.createElement("div",null,g.default.createElement("h4",null,a," (OAuth2, ",n.get("flow"),") ",g.default.createElement(h,{path:["securityDefinitions",a]})),this.state.appName?g.default.createElement("h5",null,"Application: ",this.state.appName," "):null,S&&g.default.createElement(d,{source:n.get("description")}),w&&g.default.createElement("h6",null,"Authorized"),("implicit"===_||_===v)&&g.default.createElement("p",null,"Authorization URL: ",g.default.createElement("code",null,n.get("authorizationUrl"))),("password"===_||_===v||_===y)&&g.default.createElement("p",null,"Token URL:",g.default.createElement("code",null," ",n.get("tokenUrl"))),g.default.createElement("p",{className:"flow"},"Flow: ",g.default.createElement("code",null,n.get("flow"))),"password"!==_?null:g.default.createElement(l,null,g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"oauth_username"},"username:"),w?g.default.createElement("code",null," ",this.state.username," "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"oauth_username",type:"text","data-name":"username",onChange:this.onInputChange}))),g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"oauth_password"},"password:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"oauth_password",type:"password","data-name":"password",onChange:this.onInputChange}))),g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"password_type"},"type:"),w?g.default.createElement("code",null," ",this.state.passwordType," "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("select",{id:"password_type","data-name":"passwordType",onChange:this.onInputChange},g.default.createElement("option",{value:"request-body"},"Request body"),g.default.createElement("option",{value:"basic"},"Basic auth"),g.default.createElement("option",{value:"query"},"Query parameters"))))),(_===y||"implicit"===_||_===v||"password"===_&&"basic"!==this.state.passwordType)&&(!w||w&&this.state.clientId)&&g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"client_id"},"client_id:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"client_id",type:"text",required:"password"===_,value:this.state.clientId,"data-name":"clientId",onChange:this.onInputChange}))),(_===y||_===v||"password"===_&&"basic"!==this.state.passwordType)&&g.default.createElement(l,null,g.default.createElement("label",{htmlFor:"client_secret"},"client_secret:"),w?g.default.createElement("code",null," ****** "):g.default.createElement(c,{tablet:10,desktop:10},g.default.createElement("input",{id:"client_secret",value:this.state.clientSecret,type:"text","data-name":"clientSecret",onChange:this.onInputChange}))),!w&&b&&b.size?g.default.createElement("div",{className:"scopes"},g.default.createElement("h2",null,"Scopes:"),b.map(function(t,n){return g.default.createElement(l,{key:n},g.default.createElement("div",{className:"checkbox"},g.default.createElement(u,{"data-value":n,id:n+"-"+_+"-checkbox-"+e.state.name,disabled:w,type:"checkbox",onChange:e.onScopeChange}),g.default.createElement("label",{htmlFor:n+"-"+_+"-checkbox-"+e.state.name},g.default.createElement("span",{className:"item"}),g.default.createElement("div",{className:"text"},g.default.createElement("p",{className:"name"},n),g.default.createElement("p",{className:"description"},t)))))}).toArray()):null,k.valueSeq().map(function(e,t){return g.default.createElement(f,{error:e,key:t})}),g.default.createElement("div",{className:"auth-btn-wrapper"},E&&(w?g.default.createElement(p,{className:"btn modal-btn auth authorize",onClick:this.logout},"Logout"):g.default.createElement(p,{className:"btn modal-btn auth authorize",onClick:this.authorize},"Authorize"))))}}]),t}(g.default.Component);w.propTypes={name:_.default.string,authorized:_.default.object,getComponent:_.default.func.isRequired,schema:_.default.object.isRequired,authSelectors:_.default.object.isRequired,authActions:_.default.object.isRequired,errSelectors:_.default.object.isRequired,specSelectors:_.default.object.isRequired,errActions:_.default.object.isRequired,getConfigs:_.default.any};var k=function(){var e=this;this.authorize=function(){var t=e.props,n=t.authActions,r=t.errActions,i=t.getConfigs,o=t.authSelectors,a=i(),s=o.getConfigs();r.clear({authId:name,type:"auth",source:"auth"}),(0,x.default)({auth:e.state,authActions:n,errActions:r,configs:a,authConfigs:s})},this.onScopeChange=function(t){var n=t.target,r=n.checked,i=n.dataset.value;if(r&&-1===e.state.scopes.indexOf(i)){var o=e.state.scopes.concat([i]);e.setState({scopes:o})}else!r&&e.state.scopes.indexOf(i)>-1&&e.setState({scopes:e.state.scopes.filter(function(e){return e!==i})})},this.onInputChange=function(t){var n=t.target,r=n.dataset.name,i=n.value,a=(0,o.default)({},r,i);e.setState(a)},this.logout=function(t){t.preventDefault();var n=e.props,r=n.authActions,i=n.errActions,o=n.name;i.clear({authId:o,type:"auth",source:"auth"}),r.logout([o])}};t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.specActions,n=e.path,i=e.method;t.clearResponse(n,i),t.clearRequest(n,i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("button",{className:"btn btn-clear opblock-control__btn",onClick:this.onClick},"Clear")}}]),t}(d.Component);y.propTypes={specActions:g.default.object.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(7),x=function(){},w=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChangeWrapper=function(e){return r.props.onChange(e.target.value)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.props.contentTypes&&this.props.onChange(this.props.contentTypes.first())}},{key:"componentWillReceiveProps",value:function(e){e.contentTypes&&e.contentTypes.size&&(e.contentTypes.includes(e.value)||e.onChange(e.contentTypes.first()))}},{key:"render",value:function(){var e=this.props,t=e.contentTypes,n=e.className,r=e.value;return t&&t.size?m.default.createElement("div",{className:"content-type-wrapper "+(n||"")},m.default.createElement("select",{className:"content-type",value:r||"",onChange:this.onChangeWrapper},t.map(function(e){return m.default.createElement("option",{key:e,value:e},e)}).toArray())):null}}]),t}(m.default.Component);w.propTypes={contentTypes:g.default.oneOfType([_.default.list,_.default.set,_.default.seq]),value:g.default.string,onChange:g.default.func,className:g.default.string},w.defaultProps={onChange:x,value:null,contentTypes:(0,b.fromJS)(["application/json"])},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(557),_=r(y),b=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"handleFocus",value:function(e){e.target.select(),document.execCommand("copy")}},{key:"render",value:function(){var e=this.props.request,t=(0,_.default)(e);return m.default.createElement("div",null,m.default.createElement("h4",null,"Curl"),m.default.createElement("div",{className:"copy-paste"},m.default.createElement("textarea",{onFocus:this.handleFocus,readOnly:"true",className:"curl",style:{whiteSpace:"normal"},value:t})))}}]),t}(m.default.Component);b.propTypes={request:g.default.object.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.DeepLink=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.DeepLink=function(e){var t=e.enabled,n=e.path,r=e.text;return o.default.createElement("a",{className:"nostyle",onClick:t?function(e){return e.preventDefault()}:null,href:t?"#/"+n:null},o.default.createElement("span",null,r))};u.propTypes={enabled:s.default.bool,isShown:s.default.bool,path:s.default.string,text:s.default.string},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(12),s=r(a),u=function(e){var t=e.value,n=e.getComponent,r=n("ModelCollapse"),i=o.default.createElement("span",null,"Array [ ",t.count()," ]");return o.default.createElement("span",{className:"prop-enum"},"Enum:",o.default.createElement("br",null),o.default.createElement(r,{collapsedContent:i},"[ ",t.join(", ")," ]"))};u.propTypes={value:s.default.iterable,getComponent:s.default.func},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){return(e||"").split(" ").map(function(e){return e[0].toUpperCase()+e.slice(1)}).join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),a=r(o),s=n(2),u=r(s),l=n(3),c=r(l),p=n(6),f=r(p),h=n(5),d=r(h),m=n(0),v=r(m),g=n(1),y=r(g),_=n(7),b=n(448),x=function(e){function t(){return(0,u.default)(this,t),(0,f.default)(this,(t.__proto__||(0,a.default)(t)).apply(this,arguments))}return(0,d.default)(t,e),(0,c.default)(t,[{key:"render",value:function(){var e=this.props,t=e.editorActions,n=e.errSelectors,r=e.layoutSelectors,i=e.layoutActions;if(t&&t.jumpToLine)var o=t.jumpToLine;var a=n.allErrors(),s=a.filter(function(e){return"thrown"===e.get("type")||"error"===e.get("level")});if(!s||s.count()<1)return null;var u=r.isShown(["errorPane"],!0),l=function(){return i.show(["errorPane"],!u)},c=s.sortBy(function(e){return e.get("line")});return v.default.createElement("pre",{className:"errors-wrapper"},v.default.createElement("hgroup",{className:"error"},v.default.createElement("h4",{className:"errors__title"},"Errors"),v.default.createElement("button",{className:"btn errors__clear-btn",onClick:l},u?"Hide":"Show")),v.default.createElement(b.Collapse,{isOpened:u,animated:!0},v.default.createElement("div",{className:"errors"},c.map(function(e,t){var n=e.get("type");return"thrown"===n||"auth"===n?v.default.createElement(w,{key:t,error:e.get("error")||e,jumpToLine:o}):"spec"===n?v.default.createElement(k,{key:t,error:e,jumpToLine:o}):void 0}))))}}]),t}(v.default.Component);x.propTypes={editorActions:y.default.object,errSelectors:y.default.object.isRequired,layoutSelectors:y.default.object.isRequired,layoutActions:y.default.object.isRequired},t.default=x;var w=function(e){var t=e.error,n=e.jumpToLine;if(!t)return null;var r=t.get("line");return v.default.createElement("div",{className:"error-wrapper"},t?v.default.createElement("div",null,v.default.createElement("h4",null,t.get("source")&&t.get("level")?i(t.get("source"))+" "+t.get("level"):"",t.get("path")?v.default.createElement("small",null," at ",t.get("path")):null),v.default.createElement("span",{style:{whiteSpace:"pre-line",maxWidth:"100%"}},t.get("message")),v.default.createElement("div",{style:{"text-decoration":"underline",cursor:"pointer"}},r&&n?v.default.createElement("a",{onClick:n.bind(null,r)},"Jump to line ",r):null)):null)},k=function(e){var t=e.error,n=e.jumpToLine,r=null;return t.get("path")?r=_.List.isList(t.get("path"))?v.default.createElement("small",null,"at ",t.get("path").join(".")):v.default.createElement("small",null,"at ",t.get("path")):t.get("line")&&!n&&(r=v.default.createElement("small",null,"on line ",t.get("line"))),v.default.createElement("div",{className:"error-wrapper"},t?v.default.createElement("div",null,v.default.createElement("h4",null,i(t.get("source"))+" "+t.get("level")," ",r),v.default.createElement("span",{style:{whiteSpace:"pre-line"}},t.get("message")),v.default.createElement("div",{style:{"text-decoration":"underline",cursor:"pointer"}},n?v.default.createElement("a",{onClick:n.bind(null,t.get("line"))},"Jump to line ",t.get("line")):null)):null)};w.propTypes={error:y.default.object.isRequired,jumpToLine:y.default.func},w.defaultProps={jumpToLine:null},k.propTypes={error:y.default.object.isRequired,jumpToLine:y.default.func}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onClick=function(){var e=r.props,t=e.specSelectors,n=e.specActions,i=e.operation,o=e.path,a=e.method;n.validateParams([o,a]),t.validateBeforeExecute([o,a])&&(r.props.onExecute&&r.props.onExecute(),n.execute({operation:i,path:o,method:a}))},r.onChangeProducesWrapper=function(e){return r.props.specActions.changeProducesValue([r.props.path,r.props.method],e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("button",{className:"btn execute opblock-control__btn",onClick:this.onClick},"Execute")}}]),t}(d.Component);y.propTypes={specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,operation:g.default.object.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired,onExecute:g.default.func},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){return m.default.createElement("div",{className:"footer"})}}]),t}(m.default.Component);t.default=v},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(7),x=r(b),w={color:"#999",fontStyle:"italic"},k=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.headers,n=e.getComponent,r=n("Property");return t&&t.size?g.default.createElement("div",{className:"headers-wrapper"},g.default.createElement("h4",{className:"headers__title"},"Headers:"),g.default.createElement("table",{className:"headers"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"header-row"},g.default.createElement("th",{className:"header-col"},"Name"),g.default.createElement("th",{className:"header-col"},"Description"),g.default.createElement("th",{className:"header-col"},"Type"))),g.default.createElement("tbody",null,t.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],i=t[1];if(!x.default.Map.isMap(i))return null;var a=i.getIn(["schema"])?i.getIn(["schema","type"]):i.getIn(["type"]),s=i.getIn(["schema","example"]);return g.default.createElement("tr",{key:n},g.default.createElement("td",{className:"header-col"},n),g.default.createElement("td",{className:"header-col"},i.get("description")),g.default.createElement("td",{className:"header-col"},a," ",s?g.default.createElement(r,{propKey:"Example",propVal:s,propStyle:w}):null))}).toArray()))):null}}]),t}(g.default.Component);k.propTypes={headers:_.default.object.isRequired,getComponent:_.default.func.isRequired},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(9),_=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.initializeComponent=function(e){r.el=e},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){(0,y.highlight)(this.el)}},{key:"componentDidUpdate",value:function(){(0,y.highlight)(this.el)}},{key:"render",value:function(){var e=this.props,t=e.value,n=e.className;return n=n||"",m.default.createElement("pre",{ref:this.initializeComponent,className:n+" microlight"},t)}}]),t}(d.Component);_.propTypes={value:g.default.string.isRequired,className:g.default.string},t.default=_},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(12),b=r(_),x=n(9),w=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.host,n=e.basePath;return m.default.createElement("pre",{className:"base-url"},"[ Base URL: ",t,n," ]")}}]),t}(m.default.Component);w.propTypes={host:g.default.string,basePath:g.default.string};var k=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.data,t=e.get("name")||"the developer",n=e.get("url"),r=e.get("email");return m.default.createElement("div",null,n&&m.default.createElement("div",null,m.default.createElement("a",{href:(0,x.sanitizeUrl)(n),target:"_blank"},t," - Website")),r&&m.default.createElement("a",{href:(0,x.sanitizeUrl)("mailto:"+r)},n?"Send email to "+t:"Contact "+t))}}]),t}(m.default.Component);k.propTypes={data:g.default.object};var E=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props.license,t=e.get("name")||"License",n=e.get("url");return m.default.createElement("div",null,n?m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(n)},t):m.default.createElement("span",null,t))}}]),t}(m.default.Component);E.propTypes={license:g.default.object};var S=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.info,n=e.url,r=e.host,i=e.basePath,o=e.getComponent,a=e.externalDocs,s=t.get("version"),u=t.get("description"),l=t.get("title"),c=t.get("termsOfService"),p=t.get("contact"),f=t.get("license"),h=(a||(0,y.fromJS)({})).toJS(),d=h.url,v=h.description,g=o("Markdown"),_=o("VersionStamp");return m.default.createElement("div",{className:"info"},m.default.createElement("hgroup",{className:"main"},m.default.createElement("h2",{className:"title"},l,s&&m.default.createElement(_,{version:s})),r||i?m.default.createElement(w,{host:r,basePath:i}):null,n&&m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(n)},m.default.createElement("span",{className:"url"}," ",n," "))),m.default.createElement("div",{className:"description"},m.default.createElement(g,{source:u})),c&&m.default.createElement("div",null,m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(c)},"Terms of service")),p&&p.size?m.default.createElement(k,{data:p}):null,f&&f.size?m.default.createElement(E,{license:f}):null,d?m.default.createElement("a",{target:"_blank",href:(0,x.sanitizeUrl)(d)},v||d):null)}}]),t}(m.default.Component);S.propTypes={info:g.default.object,url:g.default.string,host:g.default.string,basePath:g.default.string,externalDocs:b.default.map,getComponent:g.default.func.isRequired},t.default=S,S.propTypes={title:g.default.any,description:g.default.any,version:g.default.any,url:g.default.string}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onFilterChange=function(e){var t=e.target.value;r.props.layoutActions.updateFilter(t)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.specActions,r=e.getComponent,i=e.layoutSelectors,o=e.oas3Selectors,a=e.oas3Actions,s=t.info(),u=t.url(),l=t.basePath(),c=t.host(),p=t.securityDefinitions(),f=t.externalDocs(),h=t.schemes(),d=t.servers(),v=r("info"),g=r("operations",!0),y=r("Models",!0),_=r("authorizeBtn",!0),b=r("Row"),x=r("Col"),w=r("Servers"),k=r("errors",!0),E="loading"===t.loadingStatus(),S="failed"===t.loadingStatus(),C=i.currentFilter(),A={};S&&(A.color="red"),E&&(A.color="#aaa");var D=r("schemes");if(!t.specStr()){var O=void 0;return O=E?m.default.createElement("div",{className:"loading"}):m.default.createElement("h4",null,"No API definition provided."),m.default.createElement("div",{className:"swagger-ui"},m.default.createElement("div",{className:"loading-container"},O))}return m.default.createElement("div",{className:"swagger-ui"},m.default.createElement("div",null,m.default.createElement(k,null),m.default.createElement(b,{className:"information-container"},m.default.createElement(x,{mobile:12},s.count()?m.default.createElement(v,{info:s,url:u,host:c,basePath:l,externalDocs:f,getComponent:r}):null)),h&&h.size||p?m.default.createElement("div",{className:"scheme-container"},m.default.createElement(x,{className:"schemes wrapper",mobile:12},h&&h.size?m.default.createElement(D,{currentScheme:t.operationScheme(),schemes:h,specActions:n}):null,p?m.default.createElement(_,null):null)):null,d&&d.size?m.default.createElement("div",{className:"global-server-container"},m.default.createElement(x,{className:"servers wrapper",mobile:12},m.default.createElement("span",{className:"servers-title"},"Server"),m.default.createElement(w,{servers:d,currentServer:o.selectedServer(),setSelectedServer:a.setSelectedServer,setServerVariableValue:a.setServerVariableValue,getServerVariable:o.serverVariableValue,getEffectiveServerValue:o.serverEffectiveValue}))):null,null===C||!1===C?null:m.default.createElement("div",{className:"filter-container"},m.default.createElement(x,{className:"filter wrapper",mobile:12},m.default.createElement("input",{className:"operation-filter-input",placeholder:"Filter by tag",type:"text",onChange:this.onFilterChange,value:!0===C||"true"===C?"":C,disabled:E,style:A}))),m.default.createElement(b,null,m.default.createElement(x,{mobile:12,desktop:12},m.default.createElement(g,null))),m.default.createElement(b,null,m.default.createElement(x,{mobile:12,desktop:12},m.default.createElement(y,null)))))}}]),t}(m.default.Component);y.propTypes={errSelectors:g.default.object.isRequired,errActions:g.default.object.isRequired,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,oas3Selectors:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,getComponent:g.default.func.isRequired},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(47),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(12),x=r(b),w=n(7),k=function(e){var t=e.headers;return g.default.createElement("div",null,g.default.createElement("h5",null,"Response headers"),g.default.createElement("pre",null,t))};k.propTypes={headers:_.default.array.isRequired};var E=function(e){var t=e.duration;return g.default.createElement("div",null,g.default.createElement("h5",null,"Request duration"),g.default.createElement("pre",null,t," ms"))};E.propTypes={duration:_.default.number.isRequired};var S=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"shouldComponentUpdate",value:function(e){return this.props.response!==e.response||this.props.path!==e.path||this.props.method!==e.method||this.props.displayRequestDuration!==e.displayRequestDuration}},{key:"render",value:function(){var e=this.props,t=e.response,n=e.getComponent,r=e.getConfigs,i=e.displayRequestDuration,a=e.specSelectors,s=e.path,u=e.method,l=r(),c=l.showMutatedRequest,p=c?a.mutatedRequestFor(s,u):a.requestFor(s,u),f=t.get("status"),h=p.get("url"),d=t.get("headers").toJS(),m=t.get("notDocumented"),v=t.get("error"),y=t.get("text"),_=t.get("duration"),b=(0,o.default)(d),x=d["content-type"],w=n("curl"),S=n("responseBody"),C=b.map(function(e){return g.default.createElement("span",{className:"headerline",key:e}," ",e,": ",d[e]," ")}),A=0!==C.length;return g.default.createElement("div",null,p&&g.default.createElement(w,{request:p}),h&&g.default.createElement("div",null,g.default.createElement("h4",null,"Request URL"),g.default.createElement("div",{className:"request-url"},g.default.createElement("pre",null,h))),g.default.createElement("h4",null,"Server response"),g.default.createElement("table",{className:"responses-table"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"responses-header"},g.default.createElement("td",{className:"col col_header response-col_status"},"Code"),g.default.createElement("td",{className:"col col_header response-col_description"},"Details"))),g.default.createElement("tbody",null,g.default.createElement("tr",{className:"response"},g.default.createElement("td",{className:"col response-col_status"},f,m?g.default.createElement("div",{className:"response-undocumented"},g.default.createElement("i",null," Undocumented ")):null),g.default.createElement("td",{className:"col response-col_description"},v?g.default.createElement("span",null,t.get("name")+": "+t.get("message")):null,y?g.default.createElement(S,{content:y,contentType:x,url:h,headers:d,getComponent:n}):null,A?g.default.createElement(k,{headers:C}):null,i&&_?g.default.createElement(E,{duration:_}):null)))))}}]),t}(g.default.Component);S.propTypes={response:_.default.instanceOf(w.Iterable).isRequired,path:_.default.string.isRequired,method:_.default.string.isRequired,displayRequestDuration:_.default.bool.isRequired,specSelectors:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired},S.propTypes={getComponent:_.default.func.isRequired,response:x.default.map},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));r.toggleCollapsed=function(){r.props.onToggle&&r.props.onToggle(r.props.modelName,!r.state.expanded),r.setState({expanded:!r.state.expanded})};var i=r.props,a=i.expanded,u=i.collapsedContent;return r.state={expanded:a,collapsedContent:u||t.defaultProps.collapsedContent},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillReceiveProps",value:function(e){this.props.expanded!=e.expanded&&this.setState({expanded:e.expanded})}},{key:"render",value:function(){var e=this.props.title;return m.default.createElement("span",null,e&&m.default.createElement("span",{onClick:this.toggleCollapsed,style:{cursor:"pointer"}},e),m.default.createElement("span",{onClick:this.toggleCollapsed,style:{cursor:"pointer"}},m.default.createElement("span",{className:"model-toggle"+(this.state.expanded?"":" collapsed")})),this.state.expanded?this.props.children:this.state.collapsedContent)}}]),t}(d.Component);y.propTypes={collapsedContent:g.default.any,expanded:g.default.bool,children:g.default.any,title:g.default.element,modelName:g.default.string,onToggle:g.default.func},y.defaultProps={collapsedContent:"{...}",expanded:!1,title:null,onToggle:function(){}},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));r.activeTab=function(e){var t=e.target.dataset.name;r.setState({activeTab:t})};var i=r.props.getConfigs,a=i(),u=a.defaultModelRendering;return"example"!==u&&"model"!==u&&(u="example"),r.state={activeTab:u},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.specSelectors,r=e.schema,i=e.example,o=e.isExecute,a=e.getConfigs,s=e.specPath,u=a(),l=u.defaultModelExpandDepth,c=t("ModelWrapper");return m.default.createElement("div",null,m.default.createElement("ul",{className:"tab"},m.default.createElement("li",{className:"tabitem"+(o||"example"===this.state.activeTab?" active":"")},m.default.createElement("a",{className:"tablinks","data-name":"example",onClick:this.activeTab},"Example Value")),r?m.default.createElement("li",{className:"tabitem"+(o||"model"!==this.state.activeTab?"":" active")},m.default.createElement("a",{className:"tablinks"+(o?" inactive":""),"data-name":"model",onClick:this.activeTab},"Model")):null),m.default.createElement("div",null,(o||"example"===this.state.activeTab)&&i,!o&&"model"===this.state.activeTab&&m.default.createElement(c,{schema:r,getComponent:t,getConfigs:a,specSelectors:n,expandDepth:l,specPath:s})))}}]),t}(m.default.Component);b.propTypes={getComponent:g.default.func.isRequired,specSelectors:g.default.object.isRequired,schema:g.default.object.isRequired,example:g.default.any.isRequired,isExecute:g.default.bool,getConfigs:g.default.func.isRequired,specPath:_.default.list.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.onToggle=function(e,t){r.props.layoutActions&&r.props.layoutActions.show(["models",e],t)},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.getConfigs,r=t("Model"),i=void 0;return this.props.layoutSelectors&&(i=this.props.layoutSelectors.isShown(["models",this.props.name])),g.default.createElement("div",{className:"model-box"},g.default.createElement(r,(0,o.default)({},this.props,{getConfigs:n,expanded:i,depth:1,onToggle:this.onToggle,expandDepth:this.props.expandDepth||0})))}}]),t}(v.Component);b.propTypes={schema:_.default.object.isRequired,name:_.default.string,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,specSelectors:_.default.object.isRequired,expandDepth:_.default.number,layoutActions:_.default.object,layoutSelectors:_.default.object.isRequired},t.default=b},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(7),_=r(y),b=n(1),x=r(b),w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.getComponent,r=e.layoutSelectors,i=e.layoutActions,a=e.getConfigs,s=t.definitions(),u=a(),l=u.docExpansion,c=u.defaultModelsExpandDepth;if(!s.size||c<0)return null;var p=r.isShown("models",c>0&&"none"!==l),f=t.isOAS3()?["components","schemas"]:["definitions"],h=n("ModelWrapper"),d=n("Collapse");return g.default.createElement("section",{className:p?"models is-open":"models"},g.default.createElement("h4",{onClick:function(){return i.show("models",!p)}},g.default.createElement("span",null,"Models"),g.default.createElement("svg",{width:"20",height:"20"},g.default.createElement("use",{xlinkHref:p?"#large-arrow-down":"#large-arrow"}))),g.default.createElement(d,{isOpened:p},s.entrySeq().map(function(e){var s=(0,o.default)(e,2),u=s[0],l=s[1];return g.default.createElement("div",{id:"model-"+u,className:"model-container",key:"models-section-"+u},g.default.createElement(h,{name:u,expandDepth:c,schema:l,specPath:_.default.List([].concat(f,[u])),getComponent:n,specSelectors:t,getConfigs:a,layoutSelectors:r,layoutActions:i}))}).toArray()))}}]),t}(v.Component);w.propTypes={getComponent:x.default.func,specSelectors:x.default.object,layoutSelectors:x.default.object,layoutActions:x.default.object,getConfigs:x.default.func.isRequired},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=r(i),a=n(21),s=r(a),u=n(18),l=r(u),c=n(96),p=r(c),f=n(4),h=r(f),d=n(2),m=r(d),v=n(3),g=r(v),y=n(6),_=r(y),b=n(5),x=r(b),w=n(0),k=r(w),E=n(1),S=r(E),C=n(7),A=n(12),D=r(A),O=function(e){function t(){return(0,m.default)(this,t),(0,_.default)(this,(t.__proto__||(0,h.default)(t)).apply(this,arguments))}return(0,x.default)(t,e),(0,g.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.name,r=e.isRef,i=e.getComponent,a=e.getConfigs,u=e.depth,c=e.onToggle,f=e.expanded,h=e.specPath,d=(0,p.default)(e,["schema","name","isRef","getComponent","getConfigs","depth","onToggle","expanded","specPath"]),m=d.specSelectors,v=d.expandDepth,g=m.isOAS3;if(!t)return null;var y=a(),_=y.showExtensions,b=t.get("description"),x=t.get("properties"),w=t.get("additionalProperties"),E=t.get("title")||n,S=t.get("required"),A=i("JumpToPath",!0),D=i("Markdown"),O=i("Model"),M=i("ModelCollapse"),T=function(){return k.default.createElement("span",{className:"model-jump-to-path"},k.default.createElement(A,{specPath:h}))},P=k.default.createElement("span",null,k.default.createElement("span",null,"{"),"...",k.default.createElement("span",null,"}"),r?k.default.createElement(T,null):""),I=m.isOAS3()?t.get("anyOf"):null,R=m.isOAS3()?t.get("oneOf"):null,j=m.isOAS3()?t.get("not"):null,F=E&&k.default.createElement("span",{className:"model-title"},r&&t.get("$$ref")&&k.default.createElement("span",{className:"model-hint"},t.get("$$ref")),k.default.createElement("span",{className:"model-title__text"},E));return k.default.createElement("span",{className:"model"},k.default.createElement(M,{modelName:n,title:F,onToggle:c,expanded:!!f||u<=v,collapsedContent:P},k.default.createElement("span",{className:"brace-open object"},"{"),r?k.default.createElement(T,null):null,k.default.createElement("span",{className:"inner-object"},k.default.createElement("table",{className:"model"},k.default.createElement("tbody",null,b?k.default.createElement("tr",{style:{color:"#999",fontStyle:"italic"}},k.default.createElement("td",null,"description:"),k.default.createElement("td",null,k.default.createElement(D,{source:b}))):null,x&&x.size?x.entrySeq().map(function(e){var t=(0,l.default)(e,2),r=t[0],o=t[1],c=g()&&o.get("deprecated"),p=C.List.isList(S)&&S.contains(r),f={verticalAlign:"top",paddingRight:"0.2em"};return p&&(f.fontWeight="bold"),k.default.createElement("tr",{key:r,className:c&&"deprecated"},k.default.createElement("td",{style:f},r,p&&k.default.createElement("span",{style:{color:"red"}},"*")),k.default.createElement("td",{style:{verticalAlign:"top"}},k.default.createElement(O,(0,s.default)({key:"object-"+n+"-"+r+"_"+o},d,{required:p,getComponent:i,specPath:h.push("properties",r),getConfigs:a,schema:o,depth:u+1}))))}).toArray():null,_?k.default.createElement("tr",null," "):null,_?t.entrySeq().map(function(e){var t=(0,l.default)(e,2),n=t[0],r=t[1];if("x-"===n.slice(0,2)){var i=r?r.toJS?r.toJS():r:null;return k.default.createElement("tr",{key:n,style:{color:"#777"}},k.default.createElement("td",null,n),k.default.createElement("td",{style:{verticalAlign:"top"}},(0,o.default)(i)))}}).toArray():null,w&&w.size?k.default.createElement("tr",null,k.default.createElement("td",null,"< * >:"),k.default.createElement("td",null,k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("additionalProperties"),getConfigs:a,schema:w,depth:u+1})))):null,I?k.default.createElement("tr",null,k.default.createElement("td",null,"anyOf ->"),k.default.createElement("td",null,I.map(function(e,t){return k.default.createElement("div",{key:t},k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("anyOf",t),getConfigs:a,schema:e,depth:u+1})))}))):null,R?k.default.createElement("tr",null,k.default.createElement("td",null,"oneOf ->"),k.default.createElement("td",null,R.map(function(e,t){return k.default.createElement("div",{key:t},k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("oneOf",t),getConfigs:a,schema:e,depth:u+1})))}))):null,j?k.default.createElement("tr",null,k.default.createElement("td",null,"not ->"),k.default.createElement("td",null,k.default.createElement("div",null,k.default.createElement(O,(0,s.default)({},d,{required:!1,getComponent:i,specPath:h.push("not"),getConfigs:a,schema:j,depth:u+1}))))):null))),k.default.createElement("span",{className:"brace-close"},"}")))}}]),t}(w.Component);O.propTypes={schema:S.default.object.isRequired,getComponent:S.default.func.isRequired,getConfigs:S.default.func.isRequired,expanded:S.default.bool,onToggle:S.default.func,specSelectors:S.default.object.isRequired,name:S.default.string,isRef:S.default.bool,expandDepth:S.default.number,depth:S.default.number,specPath:D.default.list.isRequired},t.default=O},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(47),o=r(i),a=n(48),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(9),k=function(e){function t(e,n){(0,p.default)(this,t);var r=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e,n)),i=e.specSelectors,o=e.getConfigs,a=o(),s=a.validatorUrl;return r.state={url:i.url(),validatorUrl:void 0===s?"https://online.swagger.io/validator":s},r}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentWillReceiveProps",value:function(e){var t=e.specSelectors,n=e.getConfigs,r=n(),i=r.validatorUrl;this.setState({url:t.url(),validatorUrl:void 0===i?"https://online.swagger.io/validator":i})}},{key:"render",value:function(){var e=this.props.getConfigs,t=e(),n=t.spec,r=(0,w.sanitizeUrl)(this.state.validatorUrl);return"object"===(void 0===n?"undefined":(0,s.default)(n))&&(0,o.default)(n).length?null:!this.state.url||!this.state.validatorUrl||this.state.url.indexOf("localhost")>=0||this.state.url.indexOf("127.0.0.1")>=0?null:_.default.createElement("span",{style:{float:"right"}},_.default.createElement("a",{target:"_blank",href:r+"/debug?url="+this.state.url},_.default.createElement(E,{src:r+"?url="+this.state.url,alt:"Online validator badge"})))}}]),t}(_.default.Component);k.propTypes={getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired},t.default=k;var E=function(e){function t(e){(0,p.default)(this,t);var n=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e));return n.state={loaded:!1,error:!1},n}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentDidMount",value:function(){var e=this,t=new Image;t.onload=function(){e.setState({loaded:!0})},t.onerror=function(){e.setState({error:!0})},t.src=this.props.src}},{key:"componentWillReceiveProps",value:function(e){var t=this;if(e.src!==this.props.src){var n=new Image;n.onload=function(){t.setState({loaded:!0})},n.onerror=function(){t.setState({error:!0})},n.src=e.src}}},{key:"render",value:function(){return this.state.error?_.default.createElement("img",{alt:"Error"}):this.state.loaded?_.default.createElement("img",{src:this.props.src,alt:this.props.alt}):_.default.createElement("img",{alt:"Loading..."})}}]),t}(_.default.Component);E.propTypes={src:x.default.string,alt:x.default.string}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationExtRow=void 0;var i=n(35),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=t.OperationExtRow=function(e){var t=e.xKey,n=e.xVal,r=n?n.toJS?n.toJS():n:null;return s.default.createElement("tr",null,s.default.createElement("td",null,t),s.default.createElement("td",null,(0,o.default)(r)))};c.propTypes={xKey:l.default.string,xVal:l.default.any},t.default=c},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationExt=void 0;var i=n(18),o=r(i),a=n(0),s=r(a),u=n(1),l=r(u),c=t.OperationExt=function(e){var t=e.extensions,n=e.getComponent,r=n("OperationExtRow");return s.default.createElement("div",{className:"opblock-section"},s.default.createElement("div",{className:"opblock-section-header"},s.default.createElement("h4",null,"Extensions")),s.default.createElement("div",{className:"table-container"},s.default.createElement("table",null,s.default.createElement("thead",null,s.default.createElement("tr",null,s.default.createElement("td",{className:"col col_header"},"Field"),s.default.createElement("td",{className:"col col_header"},"Value"))),s.default.createElement("tbody",null,t.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],i=t[1];return s.default.createElement(r,{key:n+"-"+i,xKey:n,xVal:i})})))))};c.propTypes={extensions:l.default.object.isRequired,getComponent:l.default.func.isRequired},t.default=c},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(9),_=n(7),b=n(12),x=r(b),w=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specPath,n=e.response,r=e.request,i=e.toggleShown,o=e.onTryoutClick,a=e.onCancelClick,s=e.onExecute,u=e.fn,l=e.getComponent,c=e.getConfigs,p=e.specActions,f=e.specSelectors,h=e.authActions,d=e.authSelectors,v=e.oas3Actions,g=e.oas3Selectors,_=this.props.operation,b=_.toJS(),x=b.isShown,w=b.isAuthorized,k=b.path,E=b.method,S=b.op,C=b.tag,A=b.showSummary,D=b.operationId,O=b.allowTryItOut,M=b.displayOperationId,T=b.displayRequestDuration,P=b.isDeepLinkingEnabled,I=b.tryItOutEnabled,R=b.executeInProgress,j=S.operation,F=j.summary,N=j.description,B=j.deprecated,L=j.externalDocs,q=j.schemes,z=_.getIn(["op","operation"]),U=_.get("security"),W=z.get("responses"),V=z.get("produces"),H=(0,y.getList)(z,["parameters"]),G=f.operationScheme(k,E),J=["operations",C,D],K=(0,y.getExtensions)(z),X=l("responses"),Y=l("parameters"),$=l("execute"),Z=l("clear"),Q=l("authorizeOperationBtn"),ee=l("JumpToPath",!0),te=l("Collapse"),ne=l("Markdown"),re=l("schemes"),ie=l("OperationServers"),oe=l("OperationExt"),ae=l("DeepLink"),se=c(),ue=se.showExtensions;if(W&&n&&n.size>0){var le=!W.get(String(n.get("status")))&&!W.get("default");n=n.set("notDocumented",le)}var ce=[k,E];return m.default.createElement("div",{className:B?"opblock opblock-deprecated":x?"opblock opblock-"+E+" is-open":"opblock opblock-"+E,id:J.join("-")},m.default.createElement("div",{className:"opblock-summary opblock-summary-"+E,onClick:i},m.default.createElement("span",{className:"opblock-summary-method"},E.toUpperCase()),m.default.createElement("span",{className:B?"opblock-summary-path__deprecated":"opblock-summary-path"},m.default.createElement(ae,{enabled:P,isShown:x,path:""+J.join("/"),text:k}),m.default.createElement(ee,{path:t})," "),A?m.default.createElement("div",{className:"opblock-summary-description"},F):null,M&&D?m.default.createElement("span",{className:"opblock-summary-operation-id"},D):null,U&&U.count()?m.default.createElement(Q,{isAuthorized:w,onClick:function(){var e=d.definitionsForRequirements(U);h.showDefinitions(e)}}):null),m.default.createElement(te,{isOpened:x},m.default.createElement("div",{className:"opblock-body"},B&&m.default.createElement("h4",{className:"opblock-title_normal"}," Warning: Deprecated"),N&&m.default.createElement("div",{className:"opblock-description-wrapper"},m.default.createElement("div",{className:"opblock-description"},m.default.createElement(ne,{source:N}))),L&&L.url?m.default.createElement("div",{className:"opblock-external-docs-wrapper"},m.default.createElement("h4",{className:"opblock-title_normal"},"Find more details"),m.default.createElement("div",{className:"opblock-external-docs"},m.default.createElement("span",{className:"opblock-external-docs__description"},m.default.createElement(ne,{source:L.description})),m.default.createElement("a",{target:"_blank",className:"opblock-external-docs__link",href:(0,y.sanitizeUrl)(L.url)},L.url))):null,m.default.createElement(Y,{parameters:H,specPath:t.push("parameters"),operation:z,onChangeKey:ce,onTryoutClick:o,onCancelClick:a,tryItOutEnabled:I,allowTryItOut:O,fn:u,getComponent:l,specActions:p,specSelectors:f,pathMethod:[k,E],getConfigs:c}),I?m.default.createElement(ie,{getComponent:l,path:k,method:E,operationServers:z.get("servers"),pathServers:f.paths().getIn([k,"servers"]),getSelectedServer:g.selectedServer,setSelectedServer:v.setSelectedServer,setServerVariableValue:v.setServerVariableValue,getServerVariable:g.serverVariableValue,getEffectiveServerValue:g.serverEffectiveValue}):null,I&&O&&q&&q.size?m.default.createElement("div",{className:"opblock-schemes"},m.default.createElement(re,{schemes:q,path:k,method:E,specActions:p,currentScheme:G})):null,m.default.createElement("div",{className:I&&n&&O?"btn-group":"execute-wrapper"},I&&O?m.default.createElement($,{operation:z,specActions:p,specSelectors:f,path:k,method:E,onExecute:s}):null,I&&n&&O?m.default.createElement(Z,{specActions:p,path:k,method:E}):null),R?m.default.createElement("div",{className:"loading-container"},m.default.createElement("div",{className:"loading"})):null,W?m.default.createElement(X,{responses:W,request:r,tryItOutResponse:n,getComponent:l,getConfigs:c,specSelectors:f,oas3Actions:v,specActions:p,produces:V,producesValue:f.currentProducesFor([k,E]),specPath:t.push("responses"),path:k,method:E,displayRequestDuration:T,fn:u}):null,ue&&K.size?m.default.createElement(oe,{extensions:K,getComponent:l}):null)))}}]),t}(d.PureComponent);w.propTypes={specPath:x.default.list.isRequired,operation:g.default.instanceOf(_.Iterable).isRequired,response:g.default.instanceOf(_.Iterable),request:g.default.instanceOf(_.Iterable),toggleShown:g.default.func.isRequired,onTryoutClick:g.default.func.isRequired,onCancelClick:g.default.func.isRequired,onExecute:g.default.func.isRequired,getComponent:g.default.func.isRequired,getConfigs:g.default.func.isRequired,authActions:g.default.object,authSelectors:g.default.object,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,oas3Selectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,fn:g.default.object.isRequired},w.defaultProps={operation:null,response:null,request:null,specPath:(0,_.List)()},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=r(y),b=n(9),x=["get","put","post","delete","options","head","patch"],w=x.concat(["trace"]),k=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.getComponent,r=e.layoutSelectors,i=e.layoutActions,o=e.getConfigs,a=t.taggedOperations(),s=n("OperationContainer",!0),u=n("Collapse"),l=n("Markdown"),c=n("DeepLink"),p=o(),f=p.docExpansion,h=p.maxDisplayedTags,d=p.deepLinking,v=d&&"false"!==d,g=r.currentFilter();return g&&!0!==g&&(a=a.filter(function(e,t){return-1!==t.indexOf(g)})),h&&!isNaN(h)&&h>=0&&(a=a.slice(0,h)),m.default.createElement("div",null,a.map(function(e,n){var o=e.get("operations"),a=e.getIn(["tagDetails","description"],null),p=e.getIn(["tagDetails","externalDocs","description"]),h=e.getIn(["tagDetails","externalDocs","url"]),d=["operations-tag",(0,b.createDeepLinkPath)(n)],g=r.isShown(d,"full"===f||"list"===f);return m.default.createElement("div",{className:g?"opblock-tag-section is-open":"opblock-tag-section",key:"operation-"+n},m.default.createElement("h4",{onClick:function(){return i.show(d,!g)},className:a?"opblock-tag":"opblock-tag no-desc",id:d.join("-")},m.default.createElement(c,{enabled:v,isShown:g,path:n,text:n}),a?m.default.createElement("small",null,m.default.createElement(l,{source:a})):m.default.createElement("small",null),m.default.createElement("div",null,p?m.default.createElement("small",null,p,h?": ":null,h?m.default.createElement("a",{href:(0,b.sanitizeUrl)(h),onClick:function(e){return e.stopPropagation()},target:"_blank"},h):null):null),m.default.createElement("button",{className:"expand-operation",title:g?"Collapse operation":"Expand operation",onClick:function(){return i.show(d,!g)}},m.default.createElement("svg",{className:"arrow",width:"20",height:"20"},m.default.createElement("use",{href:g?"#large-arrow-down":"#large-arrow",xlinkHref:g?"#large-arrow-down":"#large-arrow"})))),m.default.createElement(u,{isOpened:g},o.map(function(e){var r=e.get("path"),i=e.get("method"),o=_.default.List(["paths",r,i]);return-1===(t.isOAS3()?w:x).indexOf(i)?null:m.default.createElement(s,{key:r+"-"+i,specPath:o,op:e,path:r,method:i,tag:n})}).toArray()))}).toArray(),a.size<1?m.default.createElement("h3",null," No operations defined in spec! "):null)}}]),t}(m.default.Component);k.propTypes={specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,oas3Actions:g.default.object.isRequired,getComponent:g.default.func.isRequired,layoutSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,authActions:g.default.object.isRequired,authSelectors:g.default.object.isRequired,getConfigs:g.default.func.isRequired},t.default=k,k.propTypes={layoutActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,specActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,getComponent:g.default.func.isRequired,fn:g.default.object.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.OperationLink=void 0;var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(268),_=function(e){function t(){var e;(0,s.default)(this,t);for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];var a=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(r)));return a.setTagShown=a._setTagShown.bind(a),a}return(0,h.default)(t,e),(0,l.default)(t,[{key:"_setTagShown",value:function(e,t){this.props.layoutActions.show(e,t)}},{key:"showOp",value:function(e,t){this.props.layoutActions.show(e,t)}},{key:"render",value:function(){var e=this.props,t=e.specSelectors,n=e.layoutSelectors,r=e.layoutActions,i=e.getComponent,o=t.taggedOperations(),a=i("Collapse");return m.default.createElement("div",null,m.default.createElement("h4",{className:"overview-title"},"Overview"),o.map(function(e,t){var i=e.get("operations"),o=["overview-tags",t],s=n.isShown(o,!0),u=function(){return r.show(o,!s)};return m.default.createElement("div",{key:"overview-"+t},m.default.createElement("h4",{onClick:u,className:"link overview-tag"}," ",s?"-":"+",t),m.default.createElement(a,{isOpened:s,animated:!0},i.map(function(e){var t=e.toObject(),i=t.path,o=t.method,a=t.id,s=a,u=n.isShown(["operations",s]);return m.default.createElement(b,{key:a,path:i,method:o,id:i+"-"+o,shown:u,showOpId:s,showOpIdPrefix:"operations",href:"#operation-"+s,onClick:r.show})}).toArray()))}).toArray(),o.size<1&&m.default.createElement("h3",null," No operations defined in spec! "))}}]),t}(m.default.Component);t.default=_,_.propTypes={layoutSelectors:g.default.object.isRequired,specSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,getComponent:g.default.func.isRequired};var b=t.OperationLink=function(e){function t(e){(0,s.default)(this,t);var n=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e));return n.onClick=n._onClick.bind(n),n}return(0,h.default)(t,e),(0,l.default)(t,[{key:"_onClick",value:function(){var e=this.props,t=e.showOpId,n=e.showOpIdPrefix;(0,e.onClick)([n,t],!e.shown)}},{key:"render",value:function(){var e=this.props,t=e.id,n=e.method,r=e.shown,i=e.href;return m.default.createElement(y.Link,{href:i,style:{fontWeight:r?"bold":"normal"},onClick:this.onClick,className:"block opblock-link"},m.default.createElement("div",null,m.default.createElement("small",{className:"bold-label-"+n},n.toUpperCase()),m.default.createElement("span",{className:"bold-label"},t)))}}]),t}(m.default.Component);b.propTypes={href:g.default.string,onClick:g.default.func,id:g.default.string.isRequired,method:g.default.string.isRequired,shown:g.default.bool.isRequired,showOpId:g.default.string.isRequired,showOpIdPrefix:g.default.string.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(7),_=n(9),b=Function.prototype,x=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return w.call(r),r.state={isEditBox:!1,value:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentDidMount",value:function(){this.updateValues.call(this,this.props)}},{key:"componentWillReceiveProps",value:function(e){this.updateValues.call(this,e)}},{key:"render",value:function(){var e=this.props,n=e.onChangeConsumes,r=e.param,i=e.isExecute,o=e.specSelectors,a=e.pathMethod,s=e.getComponent,u=s("Button"),l=s("TextArea"),c=s("highlightCode"),p=s("contentType"),f=o?o.getParameter(a,r.get("name"),r.get("in")):r,h=f.get("errors",(0,y.List)()),d=o.contentTypeValues(a).get("requestContentType"),v=this.props.consumes&&this.props.consumes.size?this.props.consumes:t.defaultProp.consumes,g=this.state,_=g.value,b=g.isEditBox;return m.default.createElement("div",{className:"body-param"},b&&i?m.default.createElement(l,{className:"body-param__text"+(h.count()?" invalid":""),value:_,onChange:this.handleOnChange}):_&&m.default.createElement(c,{className:"body-param__example",value:_}),m.default.createElement("div",{className:"body-param-options"},i?m.default.createElement("div",{className:"body-param-edit"},m.default.createElement(u,{className:b?"btn cancel body-param__example-edit":"btn edit body-param__example-edit",onClick:this.toggleIsEditBox},b?"Cancel":"Edit")):null,m.default.createElement("label",{htmlFor:""},m.default.createElement("span",null,"Parameter content type"),m.default.createElement(p,{value:d,contentTypes:v,onChange:n,className:"body-param-content-type"}))))}}]),t}(d.PureComponent);x.propTypes={param:g.default.object,onChange:g.default.func,onChangeConsumes:g.default.func,consumes:g.default.object,consumesValue:g.default.string,fn:g.default.object.isRequired,getComponent:g.default.func.isRequired,isExecute:g.default.bool,specSelectors:g.default.object.isRequired,pathMethod:g.default.array.isRequired},x.defaultProp={consumes:(0,y.fromJS)(["application/json"]),param:(0,y.fromJS)({}),onChange:b,onChangeConsumes:b};var w=function(){var e=this;this.updateValues=function(t){var n=t.specSelectors,r=t.pathMethod,i=t.param,o=t.isExecute,a=t.consumesValue,s=void 0===a?"":a,u=n?n.getParameter(r,i.get("name"),i.get("in")):(0,y.fromJS)({}),l=/xml/i.test(s),c=/json/i.test(s),p=l?u.get("value_xml"):u.get("value");if(void 0!==p){var f=!p&&c?"{}":p;e.setState({value:f}),e.onChange(f,{isXml:l,isEditBox:o})}else l?e.onChange(e.sample("xml"),{isXml:l,isEditBox:o}):e.onChange(e.sample(),{isEditBox:o})},this.sample=function(t){var n=e.props,r=n.param,i=n.fn.inferSchema,o=i(r.toJS());return(0,_.getSampleSchema)(o,t,{includeWriteOnly:!0})},this.onChange=function(t,n){var r=n.isEditBox,i=n.isXml;e.setState({value:t,isEditBox:r}),e._onChange(t,i)},this._onChange=function(t,n){(e.props.onChange||b)(e.props.param,t,n)},this.handleOnChange=function(t){var n=e.props.consumesValue,r=/json/i.test(n),i=/xml/i.test(n),o=r?t.target.value.trim():t.target.value;e.onChange(o,{isXml:i})},this.toggleIsEditBox=function(){return e.setState(function(e){return{isEditBox:!e.isEditBox}})}};t.default=x},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.ParameterExt=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.ParameterExt=function(e){var t=e.xKey,n=e.xVal;return o.default.createElement("div",{className:"parameter__extension"},t,": ",String(n))};u.propTypes={xKey:s.default.string,xVal:s.default.any},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(7),g=n(1),y=r(g),_=n(12),b=r(_),x=n(46),w=r(x),k=n(9),E=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));S.call(r);var i=e.specSelectors,a=e.pathMethod,u=e.param,l=u.get("default"),c=i.getParameter(a,u.get("name"),u.get("in")),f=c?c.get("value"):"";return void 0!==l&&void 0===f&&r.onChangeWrapper(l),r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillReceiveProps",value:function(e){var t=e.specSelectors,n=e.pathMethod,r=e.param,i=t.isOAS3,o=r.get("example"),a=r.get("default"),s=t.getParameter(n,r.get("name"),r.get("in")),u=void 0;if(i()){u=(r.get("schema")||(0,v.Map)()).get("enum")}else u=s?s.get("enum"):void 0;var l=s?s.get("value"):void 0,c=void 0;void 0!==l?c=l:void 0!==o?c=o:void 0!==a?c=a:r.get("required")&&u&&u.size&&(c=u.first()),void 0!==c&&this.onChangeWrapper(c)}},{key:"render",value:function(){var e=this.props,t=e.param,n=e.onChange,r=e.getComponent,i=e.getConfigs,o=e.isExecute,a=e.fn,s=e.onChangeConsumes,u=e.specSelectors,l=e.pathMethod,c=e.specPath,p=u.isOAS3,f=i(),h=f.showExtensions,d=r("JsonSchemaForm"),v=r("ParamBody"),g=t.get("in"),y="body"!==g?null:m.default.createElement(v,{getComponent:r,fn:a,param:t,consumes:u.operationConsumes(l),consumesValue:u.contentTypeValues(l).get("requestContentType"),onChange:n,onChangeConsumes:s,isExecute:o,specSelectors:u,pathMethod:l}),_=r("modelExample"),b=r("Markdown"),x=r("ParameterExt"),E=t.get("schema"),S=p&&p()?t.getIn(["schema","type"]):t.get("type"),C="formData"===g,A="FormData"in w.default,D=t.get("required"),O=t.getIn(p&&p()?["schema","items","type"]:["items","type"]),M=u.getParameter(l,t.get("name"),t.get("in")),T=M?M.get("value"):"",P=(0,k.getExtensions)(t),I=void 0,R=void 0,j=!1;void 0!==t&&(I=t.get("items")),void 0!==I&&(R=t.get("items").get("enum")),void 0!==R&&R.size>0&&(j=!0);var F=void 0,N=void 0;return void 0!==t&&(F=t.get("default"),N=t.get("example")),j&&(F=I.get("default")),m.default.createElement("tr",null,m.default.createElement("td",{className:"col parameters-col_name"},m.default.createElement("div",{className:D?"parameter__name required":"parameter__name"},t.get("name"),D?m.default.createElement("span",{style:{color:"red"}}," *"):null),m.default.createElement("div",{className:"parameter__type"},S," ",O&&"["+O+"]"),m.default.createElement("div",{className:"parameter__deprecated"},p&&p()&&t.get("deprecated")?"deprecated":null),m.default.createElement("div",{className:"parameter__in"},"(",t.get("in"),")"),h&&P.size?P.map(function(e,t){return m.default.createElement(x,{key:t+"-"+e,xKey:t,xVal:e})}):null),m.default.createElement("td",{className:"col parameters-col_description"},m.default.createElement(b,{source:t.get("description")}),!y&&o||!j?null:m.default.createElement(b,{source:"<i>Available values</i>: "+R.map(function(e){return e}).toArray().join(", ")}),!y&&o||void 0===F?null:m.default.createElement(b,{source:"<i>Default value</i>: "+F}),!y&&o||void 0===N?null:m.default.createElement(b,{source:"<i>Example</i>: "+N}),C&&!A&&m.default.createElement("div",null,"Error: your browser does not support FormData"),y||!o?null:m.default.createElement(d,{fn:a,getComponent:r,value:T,required:D,description:t.get("description")?t.get("name")+" - "+t.get("description"):""+t.get("name"),onChange:this.onChangeWrapper,errors:t.get("errors"),schema:p&&p()?t.get("schema"):t}),y&&E?m.default.createElement(_,{getComponent:r,specPath:c.push("schema"),getConfigs:i,isExecute:o,specSelectors:u,schema:E,example:y}):null))}}]),t}(d.Component);E.propTypes={onChange:y.default.func.isRequired,param:y.default.object.isRequired,getComponent:y.default.func.isRequired,fn:y.default.object.isRequired,isExecute:y.default.bool,onChangeConsumes:y.default.func.isRequired,specSelectors:y.default.object.isRequired,pathMethod:y.default.array.isRequired,getConfigs:y.default.func.isRequired,specPath:b.default.list.isRequired};var S=function(){var e=this;this.onChangeWrapper=function(t){var n=e.props;return(0,n.onChange)(n.param,t)}};t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(7),x=r(b),w=function(e,t){return e.valueSeq().filter(x.default.Map.isMap).map(t)},k=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChange=function(e,t,n){var i=r.props;(0,i.specActions.changeParam)(i.onChangeKey,e.get("name"),e.get("in"),t,n)},r.onChangeConsumesWrapper=function(e){var t=r.props;(0,t.specActions.changeConsumesValue)(t.onChangeKey,e)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this,t=this.props,n=t.onTryoutClick,r=t.onCancelClick,i=t.parameters,o=t.allowTryItOut,a=t.tryItOutEnabled,s=t.specPath,u=t.fn,l=t.getComponent,c=t.getConfigs,p=t.specSelectors,f=t.pathMethod,h=l("parameterRow"),d=l("TryItOutButton"),v=a&&o;return m.default.createElement("div",{className:"opblock-section"},m.default.createElement("div",{className:"opblock-section-header"},m.default.createElement("div",{className:"tab-header"},m.default.createElement("h4",{className:"opblock-title"},"Parameters")),o?m.default.createElement(d,{enabled:a,onCancelClick:r,onTryoutClick:n}):null),i.count()?m.default.createElement("div",{className:"table-container"},m.default.createElement("table",{className:"parameters"},m.default.createElement("thead",null,m.default.createElement("tr",null,m.default.createElement("th",{className:"col col_header parameters-col_name"},"Name"),m.default.createElement("th",{className:"col col_header parameters-col_description"},"Description"))),m.default.createElement("tbody",null,w(i,function(t,n){return m.default.createElement(h,{fn:u,specPath:s.push(n.toString()),getComponent:l,getConfigs:c,param:t,key:t.get("in")+"."+t.get("name"),onChange:e.onChange,onChangeConsumes:e.onChangeConsumesWrapper,specSelectors:p,pathMethod:f,isExecute:v})}).toArray()))):m.default.createElement("div",{className:"opblock-description-wrapper"},m.default.createElement("p",null,"No parameters")))}}]),t}(d.Component);k.propTypes={parameters:_.default.list.isRequired,specActions:g.default.object.isRequired,getComponent:g.default.func.isRequired,specSelectors:g.default.object.isRequired,fn:g.default.object.isRequired,tryItOutEnabled:g.default.bool,allowTryItOut:g.default.bool,onTryoutClick:g.default.func,onCancelClick:g.default.func,onChangeKey:g.default.array,pathMethod:g.default.array.isRequired,getConfigs:g.default.func.isRequired,specPath:_.default.list.isRequired},k.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,tryItOutEnabled:!1,allowTryItOut:!0,onChangeKey:[],specPath:[]},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(9),x={color:"#6b6b6b",fontStyle:"italic"},w=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.getComponent,r=e.getConfigs,i=e.name,a=e.depth,s=r(),u=s.showExtensions;if(!t||!t.get)return g.default.createElement("div",null);var l=t.get("type"),c=t.get("format"),p=t.get("xml"),f=t.get("enum"),h=t.get("title")||i,d=t.get("description"),m=(0,b.getExtensions)(t),v=t.filter(function(e,t){return-1===["enum","type","format","description","$$ref"].indexOf(t)}).filterNot(function(e,t){return m.has(t)}),y=n("Markdown"),_=n("EnumModel"),w=n("Property");return g.default.createElement("span",{className:"model"},g.default.createElement("span",{className:"prop"},i&&g.default.createElement("span",{className:(1===a&&"model-title")+" prop-name"},h),g.default.createElement("span",{className:"prop-type"},l),c&&g.default.createElement("span",{className:"prop-format"},"($",c,")"),v.size?v.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement(w,{key:n+"-"+r,propKey:n,propVal:r,propStyle:x})}):null,u&&m.size?m.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement(w,{key:n+"-"+r,propKey:n,propVal:r,propStyle:x})}):null,d?g.default.createElement(y,{source:d}):null,p&&p.size?g.default.createElement("span",null,g.default.createElement("br",null),g.default.createElement("span",{style:x},"xml:"),p.entrySeq().map(function(e){var t=(0,o.default)(e,2),n=t[0],r=t[1];return g.default.createElement("span",{key:n+"-"+r,style:x},g.default.createElement("br",null),"   ",n,": ",String(r))}).toArray()):null,f&&g.default.createElement(_,{value:f,getComponent:n})))}}]),t}(v.Component);w.propTypes={schema:_.default.object.isRequired,getComponent:_.default.func.isRequired,getConfigs:_.default.func.isRequired,name:_.default.string,depth:_.default.number},t.default=w},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Property=void 0;var i=n(0),o=r(i),a=n(1),s=r(a),u=t.Property=function(e){var t=e.propKey,n=e.propVal,r=e.propStyle;return o.default.createElement("span",{style:r},o.default.createElement("br",null),t,": ",String(n))};u.propTypes={propKey:s.default.string,propVal:s.default.any,propStyle:s.default.object},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(35),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(1),_=r(y),b=n(1196),x=r(b),w=n(948),k=r(w),E=n(9),S=function(e){function t(){return(0,l.default)(this,t),(0,h.default)(this,(t.__proto__||(0,s.default)(t)).apply(this,arguments))}return(0,m.default)(t,e),(0,p.default)(t,[{key:"render",value:function(){var e=this.props,t=e.content,n=e.contentType,r=e.url,i=e.headers,a=void 0===i?{}:i,s=e.getComponent,u=s("highlightCode"),l=void 0,c=void 0;if(r=r||"",/^application\/octet-stream/i.test(n)||a["Content-Disposition"]&&/attachment/i.test(a["Content-Disposition"])||a["content-disposition"]&&/attachment/i.test(a["content-disposition"])||a["Content-Description"]&&/File Transfer/i.test(a["Content-Description"])||a["content-description"]&&/File Transfer/i.test(a["content-description"])){if(!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)&&"Blob"in window){var p=n||"text/html",f=t instanceof Blob?t:new Blob([t],{type:p}),h=window.URL.createObjectURL(f),d=r.substr(r.lastIndexOf("/")+1),m=[p,d,h].join(":"),v=a["content-disposition"]||a["Content-Disposition"];if(void 0!==v){var y=(0,E.extractFileNameFromContentDispositionHeader)(v);null!==y&&(m=y)}c=g.default.createElement("div",null,g.default.createElement("a",{href:h,download:m},"Download file"))}else c=g.default.createElement("pre",null,"Download headers detected but your browser does not support downloading binary via XHR (Blob).")}else if(/json/i.test(n)){try{l=(0,o.default)(JSON.parse(t),null,"  ")}catch(e){l="can't parse JSON.  Raw result:\n\n"+t}c=g.default.createElement(u,{value:l})}else/xml/i.test(n)?(l=(0,x.default)(t,{textNodesOnSameLine:!0,indentor:"  "}),c=g.default.createElement(u,{value:l})):c="text/html"===(0,k.default)(n)||/text\/plain/.test(n)?g.default.createElement(u,{value:t}):/^image\//i.test(n)?n.includes("svg")?g.default.createElement("div",null," ",t," "):g.default.createElement("img",{style:{maxWidth:"100%"},src:window.URL.createObjectURL(t)}):/^audio\//i.test(n)?g.default.createElement("pre",null,g.default.createElement("audio",{controls:!0},g.default.createElement("source",{src:r,type:n}))):"string"==typeof t?g.default.createElement(u,{value:t}):t.size>0?g.default.createElement("div",null,"Unknown response type"):null;return c?g.default.createElement("div",null,g.default.createElement("h5",null,"Response body"),c):null}}]),t}(g.default.Component);S.propTypes={content:_.default.any.isRequired,contentType:_.default.string,getComponent:_.default.func.isRequired,headers:_.default.object,url:_.default.string},t.default=S},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(35),m=r(d),v=n(18),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(12),k=r(w),E=n(573),S=r(E),C=n(7),A=n(9),D=function(e,t,n){return t&&t.size?t.entrySeq().map(function(e){var t=(0,g.default)(e,2),r=t[0],i=t[1],o=i;if(i.toJS)try{o=(0,m.default)(i.toJS(),null,2)}catch(e){o=String(i)}return _.default.createElement("div",{key:r},_.default.createElement("h5",null,r),_.default.createElement(n,{className:"example",value:o}))}).toArray():e?_.default.createElement("div",null,_.default.createElement(n,{className:"example",value:e})):null},O=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r._onContentTypeChange=function(e){var t=r.props,n=t.onContentTypeChange,i=t.controlsAcceptHeader;r.setState({responseContentType:e}),n({value:e,controlsAcceptHeader:i})},r.state={responseContentType:""},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e,t,n,r=this.props,i=r.code,o=r.response,a=r.className,s=r.specPath,u=r.fn,l=r.getComponent,c=r.getConfigs,p=r.specSelectors,f=r.contentType,h=r.controlsAcceptHeader,d=u.inferSchema,m=p.isOAS3,v=o.get("headers"),g=o.get("examples"),y=o.get("links"),b=l("headers"),x=l("highlightCode"),w=l("modelExample"),k=l("Markdown"),E=l("operationLink"),O=l("contentType");if(m()){var M=(0,C.List)(["content",this.state.responseContentType,"schema"]),T=o.getIn(M);e=T?(0,A.getSampleSchema)(T.toJS(),this.state.responseContentType,{includeReadOnly:!0}):null,t=T?d(T.toJS()):null,n=T?M:s}else t=d(o.toJS()),n=o.has("schema")?s.push("schema"):s,e=t?(0,A.getSampleSchema)(t,f,{includeReadOnly:!0,includeWriteOnly:!0}):null;g&&(g=g.map(function(e){return e.set?e.set("$$ref",void 0):e}));var P=D(e,g,x);return _.default.createElement("tr",{className:"response "+(a||"")},_.default.createElement("td",{className:"col response-col_status"},i),_.default.createElement("td",{className:"col response-col_description"},_.default.createElement("div",{className:"response-col_description__inner"},_.default.createElement(k,{source:o.get("description")})),m?_.default.createElement("div",{className:(0,S.default)("response-content-type",{"controls-accept-header":h})},_.default.createElement(O,{value:this.state.responseContentType,contentTypes:o.get("content")?o.get("content").keySeq():(0,C.Seq)(),onChange:this._onContentTypeChange}),h?_.default.createElement("small",null,"Controls ",_.default.createElement("code",null,"Accept")," header."):null):null,P?_.default.createElement(w,{specPath:n,getComponent:l,getConfigs:c,specSelectors:p,schema:(0,A.fromJSOrdered)(t),example:P}):null,v?_.default.createElement(b,{headers:v,getComponent:l}):null),p.isOAS3()?_.default.createElement("td",{className:"col response-col_links"},y?y.toSeq().map(function(e,t){return _.default.createElement(E,{key:t,name:t,link:e,getComponent:l})}):_.default.createElement("i",null,"No links")):null)}}]),t}(_.default.Component);O.propTypes={code:x.default.string.isRequired,response:x.default.instanceOf(C.Iterable),className:x.default.string,getComponent:x.default.func.isRequired,getConfigs:x.default.func.isRequired,specSelectors:x.default.object.isRequired,specPath:k.default.list.isRequired,fn:x.default.object.isRequired,contentType:x.default.string,controlsAcceptHeader:x.default.bool,onContentTypeChange:x.default.func},O.defaultProps={response:(0,C.fromJS)({}),onContentTypeChange:function(){}},t.default=O},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(18),o=r(i),a=n(4),s=r(a),u=n(2),l=r(u),c=n(3),p=r(c),f=n(6),h=r(f),d=n(5),m=r(d),v=n(0),g=r(v),y=n(7),_=n(1),b=r(_),x=n(12),w=r(x),k=n(9),E=function(e){function t(){var e,n,r,i;(0,l.default)(this,t);for(var o=arguments.length,a=Array(o),u=0;u<o;u++)a[u]=arguments[u];return n=r=(0,h.default)(this,(e=t.__proto__||(0,s.default)(t)).call.apply(e,[this].concat(a))),r.onChangeProducesWrapper=function(e){return r.props.specActions.changeProducesValue([r.props.path,r.props.method],e)},r.onResponseContentTypeChange=function(e){var t=e.controlsAcceptHeader,n=e.value,i=r.props,o=i.oas3Actions,a=i.path,s=i.method;t&&o.setResponseContentType({value:n,path:a,method:s})},i=n,(0,h.default)(r,i)}return(0,m.default)(t,e),(0,p.default)(t,[{key:"shouldComponentUpdate",value:function(e){return this.props.tryItOutResponse!==e.tryItOutResponse||this.props.responses!==e.responses||this.props.produces!==e.produces||this.props.producesValue!==e.producesValue||this.props.displayRequestDuration!==e.displayRequestDuration||this.props.path!==e.path||this.props.method!==e.method}},{key:"render",value:function(){var e=this,n=this.props,r=n.responses,i=n.tryItOutResponse,a=n.getComponent,s=n.getConfigs,u=n.specSelectors,l=n.fn,c=n.producesValue,p=n.displayRequestDuration,f=n.specPath,h=(0,k.defaultStatusCode)(r),d=a("contentType"),m=a("liveResponse"),v=a("response"),y=this.props.produces&&this.props.produces.size?this.props.produces:t.defaultProps.produces,_=u.isOAS3(),b=_?(0,k.getAcceptControllingResponse)(r):null;return g.default.createElement("div",{className:"responses-wrapper"},g.default.createElement("div",{className:"opblock-section-header"},g.default.createElement("h4",null,"Responses"),u.isOAS3()?null:g.default.createElement("label",null,g.default.createElement("span",null,"Response content type"),g.default.createElement(d,{value:c,onChange:this.onChangeProducesWrapper,contentTypes:y,className:"execute-content-type"}))),g.default.createElement("div",{className:"responses-inner"},i?g.default.createElement("div",null,g.default.createElement(m,{response:i,getComponent:a,getConfigs:s,specSelectors:u,path:this.props.path,method:this.props.method,displayRequestDuration:p}),g.default.createElement("h4",null,"Responses")):null,g.default.createElement("table",{className:"responses-table"},g.default.createElement("thead",null,g.default.createElement("tr",{className:"responses-header"},g.default.createElement("td",{className:"col col_header response-col_status"},"Code"),g.default.createElement("td",{className:"col col_header response-col_description"},"Description"),u.isOAS3()?g.default.createElement("td",{className:"col col_header response-col_links"},"Links"):null)),g.default.createElement("tbody",null,r.entrySeq().map(function(t){var n=(0,o.default)(t,2),r=n[0],p=n[1],d=i&&i.get("status")==r?"response_current":"";return g.default.createElement(v,{key:r,specPath:f.push(r),isDefault:h===r,fn:l,className:d,code:r,response:p,specSelectors:u,controlsAcceptHeader:p===b,onContentTypeChange:e.onResponseContentTypeChange,contentType:c,getConfigs:s,getComponent:a})}).toArray()))))}}]),t}(g.default.Component);E.propTypes={tryItOutResponse:b.default.instanceOf(y.Iterable),responses:b.default.instanceOf(y.Iterable).isRequired,produces:b.default.instanceOf(y.Iterable),producesValue:b.default.any,displayRequestDuration:b.default.bool.isRequired,path:b.default.string.isRequired,method:b.default.string.isRequired,getComponent:b.default.func.isRequired,getConfigs:b.default.func.isRequired,specSelectors:b.default.object.isRequired,specActions:b.default.object.isRequired,oas3Actions:b.default.object.isRequired,specPath:w.default.list.isRequired,fn:b.default.object.isRequired},E.defaultProps={tryItOutResponse:null,produces:(0,y.fromJS)(["application/json"]),displayRequestDuration:!1},t.default=E},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){var e,n,r,i;(0,s.default)(this,t);for(var a=arguments.length,u=Array(a),l=0;l<a;l++)u[l]=arguments[l];return n=r=(0,p.default)(this,(e=t.__proto__||(0,o.default)(t)).call.apply(e,[this].concat(u))),r.onChange=function(e){r.setScheme(e.target.value)},r.setScheme=function(e){var t=r.props,n=t.path,i=t.method;t.specActions.setScheme(e,n,i)},i=n,(0,p.default)(r,i)}return(0,h.default)(t,e),(0,l.default)(t,[{key:"componentWillMount",value:function(){var e=this.props.schemes;this.setScheme(e.first())}},{key:"componentWillReceiveProps",value:function(e){this.props.currentScheme&&e.schemes.includes(this.props.currentScheme)||this.setScheme(e.schemes.first())}},{key:"render",value:function(){var e=this.props.schemes;return m.default.createElement("label",{htmlFor:"schemes"},m.default.createElement("span",{className:"schemes-title"},"Schemes"),m.default.createElement("select",{onChange:this.onChange},e.valueSeq().map(function(e){return m.default.createElement("option",{value:e,key:e},e)}).toArray()))}}]),t}(m.default.Component);y.propTypes={specActions:g.default.object.isRequired,schemes:g.default.object.isRequired,currentScheme:g.default.string.isRequired,path:g.default.string,method:g.default.string},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=function(e){function t(){return(0,s.default)(this,t),(0,p.default)(this,(t.__proto__||(0,o.default)(t)).apply(this,arguments))}return(0,h.default)(t,e),(0,l.default)(t,[{key:"render",value:function(){var e=this.props,t=e.onTryoutClick,n=e.onCancelClick,r=e.enabled;return m.default.createElement("div",{className:"try-out"},r?m.default.createElement("button",{className:"btn try-out__btn cancel",onClick:t},"Cancel"):m.default.createElement("button",{className:"btn try-out__btn",onClick:n},"Try it out "))}}]),t}(m.default.Component);y.propTypes={onTryoutClick:g.default.func,onCancelClick:g.default.func,enabled:g.default.bool},y.defaultProps={onTryoutClick:Function.prototype,onCancelClick:Function.prototype,enabled:!1},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(0),o=r(i),a=n(1),s=r(a),u=function(e){var t=e.version;return o.default.createElement("small",null,o.default.createElement("pre",{className:"version"}," ",t," "))};u.propTypes={version:s.default.string.isRequired},t.default=u},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(4),o=r(i),a=n(2),s=r(a),u=n(3),l=r(u),c=n(6),p=r(c),f=n(5),h=r(f),d=n(0),m=r(d),v=n(1),g=r(v),y=n(12),_=r(y),b=n(495),x=n(7),w=b.helpers.opId,k=function(e){function t(e,n){(0,s.default)(this,t);var r=(0,p.default)(this,(t.__proto__||(0,o.default)(t)).call(this,e,n));return r.toggleShown=function(){var e=r.props,t=e.layoutActions,n=e.tag,i=e.operationId,o=e.isShown;t.show(["operations",n,i],!o)},r.onTryoutClick=function(){r.setState({tryItOutEnabled:!r.state.tryItOutEnabled})},r.onCancelClick=function(){var e=r.props,t=e.specActions,n=e.path,i=e.method;r.setState({tryItOutEnabled:!r.state.tryItOutEnabled}),t.clearValidateParams([n,i])},r.onExecute=function(){r.setState({executeInProgress:!0})},r.state={tryItOutEnabled:!1,executeInProgress:!1},r}return(0,h.default)(t,e),(0,l.default)(t,[{key:"mapStateToProps",value:function(e,t){var n=t.op,r=t.layoutSelectors,i=t.getConfigs,o=i(),a=o.docExpansion,s=o.deepLinking,u=o.displayOperationId,l=o.displayRequestDuration,c=o.supportedSubmitMethods,p=r.showSummary(),f=n.getIn(["operation","operationId"])||n.getIn(["operation","__originalOperationId"])||w(n.get("operation"),t.path,t.method)||n.get("id"),h=["operations",t.tag,f],d=s&&"false"!==s,m=c.indexOf(t.method)>=0&&(void 0===t.allowTryItOut?t.specSelectors.allowTryItOutFor(t.path,t.method):t.allowTryItOut),v=n.getIn(["operation","security"])||t.specSelectors.security();return{operationId:f,isDeepLinkingEnabled:d,showSummary:p,displayOperationId:u,displayRequestDuration:l,allowTryItOut:m,security:v,isAuthorized:t.authSelectors.isAuthorized(v),isShown:r.isShown(h,"full"===a),jumpToKey:"paths."+t.path+"."+t.method,response:t.specSelectors.responseFor(t.path,t.method),request:t.specSelectors.requestFor(t.path,t.method)}}},{key:"componentWillReceiveProps",value:function(e){e.response!==this.props.response&&this.setState({executeInProgress:!1})}},{key:"render",value:function(){var e=this.props,t=e.op,n=e.tag,r=e.path,i=e.method,o=e.security,a=e.isAuthorized,s=e.operationId,u=e.showSummary,l=e.isShown,c=e.jumpToKey,p=e.allowTryItOut,f=e.response,h=e.request,d=e.displayOperationId,v=e.displayRequestDuration,g=e.isDeepLinkingEnabled,y=e.specPath,_=e.specSelectors,b=e.specActions,w=e.getComponent,k=e.getConfigs,E=e.layoutSelectors,S=e.layoutActions,C=e.authActions,A=e.authSelectors,D=e.oas3Actions,O=e.oas3Selectors,M=e.fn,T=w("operation"),P=(0,x.fromJS)({op:t,tag:n,path:r,method:i,security:o,isAuthorized:a,operationId:s,showSummary:u,isShown:l,jumpToKey:c,allowTryItOut:p,request:h,displayOperationId:d,displayRequestDuration:v,isDeepLinkingEnabled:g,executeInProgress:this.state.executeInProgress,tryItOutEnabled:this.state.tryItOutEnabled});return m.default.createElement(T,{operation:P,response:f,request:h,isShown:l,toggleShown:this.toggleShown,onTryoutClick:this.onTryoutClick,onCancelClick:this.onCancelClick,onExecute:this.onExecute,specPath:y,specActions:b,specSelectors:_,oas3Actions:D,oas3Selectors:O,layoutActions:S,layoutSelectors:E,authActions:C,authSelectors:A,getComponent:w,getConfigs:k,fn:M})}}]),t}(d.PureComponent);k.propTypes={op:g.default.instanceOf(x.Iterable).isRequired,tag:g.default.string.isRequired,path:g.default.string.isRequired,method:g.default.string.isRequired,operationId:g.default.string.isRequired,showSummary:g.default.bool.isRequired,isShown:g.default.bool.isRequired,jumpToKey:g.default.string.isRequired,allowTryItOut:g.default.bool,displayOperationId:g.default.bool,isAuthorized:g.default.bool,displayRequestDuration:g.default.bool,response:g.default.instanceOf(x.Iterable),request:g.default.instanceOf(x.Iterable),security:g.default.instanceOf(x.Iterable),isDeepLinkingEnabled:g.default.bool.isRequired,specPath:_.default.list.isRequired,getComponent:g.default.func.isRequired,authActions:g.default.object,oas3Actions:g.default.object,oas3Selectors:g.default.object,authSelectors:g.default.object,specActions:g.default.object.isRequired,specSelectors:g.default.object.isRequired,layoutActions:g.default.object.isRequired,layoutSelectors:g.default.object.isRequired,fn:g.default.object.isRequired,getConfigs:g.default.func.isRequired},k.defaultProps={showSummary:!0,response:null,allowTryItOut:!0,displayOperationId:!1,displayRequestDuration:!1},t.default=k},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=[],n="",r=e.get("headers");if(t.push("curl"),t.push("-X",e.get("method")),t.push('"'+e.get("url")+'"'),r&&r.size){var i=!0,o=!1,s=void 0;try{for(var l,p=(0,c.default)(e.get("headers").entries());!(i=(l=p.next()).done);i=!0){var h=l.value,d=(0,u.default)(h,2),m=d[0],v=d[1];n=v,t.push("-H "),t.push('"'+m+": "+v+'"')}}catch(e){o=!0,s=e}finally{try{!i&&p.return&&p.return()}finally{if(o)throw s}}}if(e.get("body"))if("multipart/form-data"===n&&"POST"===e.get("method")){var g=!0,y=!1,_=void 0;try{for(var b,x=(0,c.default)(e.get("body").entrySeq());!(g=(b=x.next()).done);g=!0){var w=(0,u.default)(b.value,2),k=w[0],v=w[1];t.push("-F"),v instanceof f.default.File?t.push('"'+k+"=@"+v.name+";type="+v.type+'"'):t.push('"'+k+"="+v+'"')}}catch(e){y=!0,_=e}finally{try{!g&&x.return&&x.return()}finally{if(y)throw _}}}else t.push("-d"),t.push((0,a.default)(e.get("body")).replace(/\\n/g,""));return t.join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=n(35),a=r(o),s=n(18),u=r(s),l=n(95),c=r(l);t.default=i;var p=n(46),f=r(p)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.JsonSchema_boolean=t.JsonSchema_array=t.JsonSchema_string=t.JsonSchemaForm=void 0;var i=n(30),o=r(i),a=n(21),s=r(a),u=n(4),l=r(u),c=n(2),p=r(c),f=n(3),h=r(f),d=n(6),m=r(d),v=n(5),g=r(v),y=n(0),_=r(y),b=n(1),x=r(b),w=n(7),k=n(12),E=r(k),S=function(){},C={getComponent:x.default.func.isRequired,value:x.default.any,onChange:x.default.func,keyName:x.default.any,fn:x.default.object.isRequired,schema:x.default.object,errors:E.default.list,required:x.default.bool,description:x.default.any},A={value:"",onChange:S,schema:{},keyName:"",required:!1,errors:(0,w.List)()},D=t.JsonSchemaForm=function(e){function t(){return(0,p.default)(this,t),(0,m.default)(this,(t.__proto__||(0,l.default)(t)).apply(this,arguments))}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.schema,n=e.errors,r=e.value,i=e.onChange,o=e.getComponent,a=e.fn;t.toJS&&(t=t.toJS());var u=t,l=u.type,c=u.format,p=void 0===c?"":c,f=o(p?"JsonSchema_"+l+"_"+p:"JsonSchema_"+l)||o("JsonSchema_string");return _.default.createElement(f,(0,s.default)({},this.props,{errors:n,fn:a,getComponent:o,value:r,onChange:i,schema:t}))}}]),t}(y.Component);D.propTypes=C,D.defaultProps=A;var O=t.JsonSchema_string=function(e){function t(){var e,n,r,i;(0,p.default)(this,t);for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return n=r=(0,m.default)(this,(e=t.__proto__||(0,l.default)(t)).call.apply(e,[this].concat(a))),r.onChange=function(e){var t="file"===r.props.schema.type?e.target.files[0]:e.target.value;r.props.onChange(t,r.props.keyName)},r.onEnumChange=function(e){return r.props.onChange(e)},i=n,(0,m.default)(r,i)}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.value,r=e.schema,i=e.errors,o=e.required,a=e.description,s=r.enum;if(i=i.toJS?i.toJS():[],s){var u=t("Select");return _.default.createElement(u,{className:i.length?"invalid":"",title:i.length?i:"",allowedValues:s,value:n,allowEmptyValue:!o,onChange:this.onEnumChange})}var l="formData"===r.in&&!("FormData"in window),c=t("Input");return"file"===r.type?_.default.createElement(c,{type:"file",className:i.length?"invalid":"",title:i.length?i:"",onChange:this.onChange,disabled:l}):_.default.createElement(c,{type:"password"===r.format?"password":"text",className:i.length?"invalid":"",title:i.length?i:"",value:n,placeholder:a,onChange:this.onChange,disabled:l})}}]),t}(y.Component);O.propTypes=C,O.defaultProps=A;var M=t.JsonSchema_array=function(e){function t(e,n){(0,p.default)(this,t);var r=(0,m.default)(this,(t.__proto__||(0,l.default)(t)).call(this,e,n));return r.onChange=function(){return r.props.onChange(r.state.value)},r.onItemChange=function(e,t){r.setState(function(n){return{value:n.value.set(t,e)}},r.onChange)},r.removeItem=function(e){r.setState(function(t){return{value:t.value.remove(e)}},r.onChange)},r.addItem=function(){r.setState(function(e){return e.value=e.value||(0,w.List)(),{value:e.value.push("")}},r.onChange)},r.onEnumChange=function(e){r.setState(function(){return{value:e}},r.onChange)},r.state={value:e.value},r}return(0,g.default)(t,e),(0,h.default)(t,[{key:"componentWillReceiveProps",value:function(e){e.value!==this.state.value&&this.setState({value:e.value})}},{key:"render",value:function(){var e=this,t=this.props,n=t.getComponent,r=t.required,i=t.schema,a=t.errors,s=t.fn;a=a.toJS?a.toJS():[];var u=s.inferSchema(i.items),l=n("JsonSchemaForm"),c=n("Button"),p=u.enum,f=this.state.value;if(p){var h=n("Select");return _.default.createElement(h,{className:a.length?"invalid":"",title:a.length?a:"",multiple:!0,value:f,allowedValues:p,allowEmptyValue:!r,onChange:this.onEnumChange})}return _.default.createElement("div",null,!f||f.count()<1?null:f.map(function(t,r){var i=(0,o.default)({},u);if(a.length){var p=a.filter(function(e){return e.index===r});p.length&&(a=[p[0].error+r])}return _.default.createElement("div",{key:r,className:"json-schema-form-item"},_.default.createElement(l,{fn:s,getComponent:n,value:t,onChange:function(t){return e.onItemChange(t,r)},schema:i}),_.default.createElement(c,{className:"btn btn-sm json-schema-form-item-remove",onClick:function(){return e.removeItem(r)}}," - "))}).toArray(),_.default.createElement(c,{className:"btn btn-sm json-schema-form-item-add "+(a.length?"invalid":null),onClick:this.addItem}," Add item "))}}]),t}(y.PureComponent);M.propTypes=C,M.defaultProps=A;var T=t.JsonSchema_boolean=function(e){function t(){var e,n,r,i;(0,p.default)(this,t);for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return n=r=(0,m.default)(this,(e=t.__proto__||(0,l.default)(t)).call.apply(e,[this].concat(a))),r.onEnumChange=function(e){return r.props.onChange(e)},i=n,(0,m.default)(r,i)}return(0,g.default)(t,e),(0,h.default)(t,[{key:"render",value:function(){var e=this.props,t=e.getComponent,n=e.value,r=e.errors,i=e.schema;r=r.toJS?r.toJS():[];var o=t("Select");return _.default.createElement(o,{className:r.length?"invalid":"",title:r.length?r:"",value:String(n),allowedValues:(0,w.fromJS)(i.enum||["true","false"]),allowEmptyValue:!this.props.required,onChange:this.onEnumChange})}}]),t}(y.Component);T.propTypes=C,T.defaultProps=A},function(e,t,n){"use strict";function r(e){var t=e.auth,n=e.authActions,r=e.errActions,i=e.configs,s=e.authConfigs,u=void 0===s?{}:s,l=t.schema,c=t.scopes,p=t.name,f=t.clientId,h=l.get("flow"),d=[];switch(h){case"password":return void n.authorizePassword(t);case"application":return void n.authorizeApplication(t);case"accessCode":d.push("response_type=code");break;case"implicit":d.push("response_type=token");break;case"clientCredentials":return void n.authorizeApplication(t);case"authorizationCode":d.push("response_type=code")}"string"==typeof f&&d.push("client_id="+encodeURIComponent(f));var m=i.oauth2RedirectUrl;if(void 0===m)return void r.newAuthErr({authId:p,source:"validation",level:"error",message:"oauth2RedirectUrl configuration is not passed. Oauth2 authorization cannot be performed."});if(d.push("redirect_uri="+encodeURIComponent(m)),Array.isArray(c)&&0<c.length){var v=u.scopeSeparator||" ";d.push("scope="+encodeURIComponent(c.join(v)))}var g=(0,a.btoa)(new Date);d.push("state="+encodeURIComponent(g)),void 0!==u.realm&&d.push("realm="+encodeURIComponent(u.realm));var y=u.additionalQueryStringParams;for(var _ in y)void 0!==y[_]&&d.push([_,y[_]].map(encodeURIComponent).join("="));var b=l.get("authorizationUrl"),x=[b,d.join("&")].join(-1===b.indexOf("?")?"?":"&"),w=void 0;w="implicit"===h?n.preAuthorizeImplicit:u.useBasicAuthenticationWithAccessCodeGrant?n.authorizeAccessCodeWithBasicAuthentication:n.authorizeAccessCodeWithFormParams,o.default.swaggerUIRedirectOauth2={auth:t,state:g,redirectUrl:m,callback:w,errCb:r.newAuthErr},o.default.open(x)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(46),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=n(9)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){return[a.default,u.default]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(561),a=r(o),s=n(307),u=r(s)},function(e,t,n){"use strict";function r(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function i(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(){var e={components:{App:F.default,authorizationPopup:B.default,authorizeBtn:q.default,authorizeOperationBtn:U.default,auths:V.default,AuthItem:G.default,authError:K.default,oauth2:ee.default,apiKeyAuth:Y.default,basicAuth:Z.default,clear:ne.default,liveResponse:ie.default,info:qe.default,onlineValidatorBadge:ae.default,operations:ue.default,operation:ce.default,highlightCode:ve.default,responses:ye.default,response:be.default,responseBody:we.default,parameters:Ee.default,parameterRow:De.default,execute:Me.default,headers:Pe.default,errors:Re.default,contentType:Fe.default,overview:Be.default,footer:Ue.default,ParamBody:Ve.default,curl:Ge.default,schemes:Ke.default,modelExample:Ze.default,ModelWrapper:et.default,ModelCollapse:Ye.default,Model:nt.default,Models:it.default,EnumModel:at.default,ObjectModel:ut.default,ArrayModel:ct.default,PrimitiveModel:ft.default,Property:dt.default,TryItOutButton:vt.default,Markdown:wt.default,BaseLayout:Et.default,VersionStamp:yt.default,OperationExt:fe.default,OperationExtRow:de.default,ParameterExt:Ce.default,OperationContainer:R.default,DeepLink:bt.default}},t={components:Ct},n={components:Dt};return[M.default,E.default,v.default,f.default,c.default,a.default,u.default,d.default,e,t,b.default,n,w.default,y.default,C.default,D.default,P.default]};var o=n(291),a=i(o),s=n(294),u=i(s),l=n(320),c=i(l),p=n(328),f=i(p),h=n(319),d=i(h),m=n(297),v=i(m),g=n(273),y=i(g),_=n(326),b=i(_),x=n(275),w=i(x),k=n(327),E=i(k),S=n(325),C=i(S),A=n(286),D=i(A),O=n(279),M=i(O),T=n(283),P=i(T),I=n(556),R=i(I),j=n(509),F=i(j),N=n(513),B=i(N),L=n(514),q=i(L),z=n(515),U=i(z),W=n(516),V=i(W),H=n(512),G=i(H),J=n(518),K=i(J),X=n(511),Y=i(X),$=n(517),Z=i($),Q=n(519),ee=i(Q),te=n(520),ne=i(te),re=n(532),ie=i(re),oe=n(538),ae=i(oe),se=n(542),ue=i(se),le=n(541),ce=i(le),pe=n(540),fe=i(pe),he=n(539),de=i(he),me=n(529),ve=i(me),ge=n(552),ye=i(ge),_e=n(551),be=i(_e),xe=n(550),we=i(xe),ke=n(547),Ee=i(ke),Se=n(545),Ce=i(Se),Ae=n(546),De=i(Ae),Oe=n(526),Me=i(Oe),Te=n(528),Pe=i(Te),Ie=n(525),Re=i(Ie),je=n(521),Fe=i(je),Ne=n(543),Be=i(Ne),Le=n(530),qe=i(Le),ze=n(527),Ue=i(ze),We=n(544),Ve=i(We),He=n(522),Ge=i(He),Je=n(553),Ke=i(Je),Xe=n(533),Ye=i(Xe),$e=n(534),Ze=i($e),Qe=n(535),et=i(Qe),tt=n(269),nt=i(tt),rt=n(536),it=i(rt),ot=n(524),at=i(ot),st=n(537),ut=i(st),lt=n(510),ct=i(lt),pt=n(548),ft=i(pt),ht=n(549),dt=i(ht),mt=n(554),vt=i(mt),gt=n(555),yt=i(gt),_t=n(523),bt=i(_t),xt=n(270),wt=i(xt),kt=n(531),Et=i(kt),St=n(268),Ct=r(St),At=n(558),Dt=r(At)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t,n){var r=[(0,F.systemThunkMiddleware)(n)],i=j.default.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__||S.compose;return(0,S.createStore)(e,t,i(S.applyMiddleware.apply(void 0,r)))}function o(e,t){return(0,F.isObject)(e)&&!(0,F.isArray)(e)?e:(0,F.isFunc)(e)?o(e(t),t):(0,F.isArray)(e)?e.map(function(e){return o(e,t)}).reduce(s,{}):{}}function a(e,t){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},i=r.hasLoaded,o=i;return(0,F.isObject)(e)&&!(0,F.isArray)(e)&&"function"==typeof e.afterLoad&&(o=!0,p(e.afterLoad).call(this,t)),(0,F.isFunc)(e)?a.call(this,e(t),t,{hasLoaded:o}):(0,F.isArray)(e)?e.map(function(e){return a.call(n,e,t,{hasLoaded:o})}):o}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(!(0,F.isObject)(e))return{};if(!(0,F.isObject)(t))return e;t.wrapComponents&&((0,F.objMap)(t.wrapComponents,function(n,r){var i=e.components&&e.components[r];i&&Array.isArray(i)?(e.components[r]=i.concat([n]),delete t.wrapComponents[r]):i&&(e.components[r]=[i,n],delete t.wrapComponents[r])}),(0,d.default)(t.wrapComponents).length||delete t.wrapComponents);var n=e.statePlugins;if((0,F.isObject)(n))for(var r in n){var i=n[r];if((0,F.isObject)(i)&&(0,F.isObject)(i.wrapActions)){var o=i.wrapActions;for(var a in o){var s=o[a];Array.isArray(s)||(s=[s],o[a]=s),t&&t.statePlugins&&t.statePlugins[r]&&t.statePlugins[r].wrapActions&&t.statePlugins[r].wrapActions[a]&&(t.statePlugins[r].wrapActions[a]=o[a].concat(t.statePlugins[r].wrapActions[a]))}}}return(0,O.default)(e,t)}function u(e){return l((0,F.objMap)(e,function(e){return e.reducers}))}function l(e){var t=(0,d.default)(e).reduce(function(t,n){return t[n]=c(e[n]),t},{});return(0,d.default)(t).length?(0,M.combineReducers)(t):N}function c(e){return function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new C.Map,n=arguments[1];if(!e)return t;var r=e[n.type];if(r){var i=p(r)(t,n);return null===i?t:i}return t}}function p(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.logErrors,r=void 0===n||n;return"function"!=typeof e?e:function(){try{for(var t=arguments.length,n=Array(t),i=0;i<t;i++)n[i]=arguments[i];return e.call.apply(e,[this].concat(n))}catch(e){return r&&console.error(e),null}}}function f(e,t,n){return i(e,t,n)}Object.defineProperty(t,"__esModule",{value:!0});var h=n(47),d=r(h),m=n(36),v=r(m),g=n(30),y=r(g),_=n(2),b=r(_),x=n(3),w=r(x),k=n(0),E=r(k),S=n(486),C=n(7),A=r(C),D=n(203),O=r(D),M=n(1117),T=n(264),P=r(T),I=n(128),R=n(46),j=r(R),F=n(9),N=function(e){return e},B=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};(0,b.default)(this,e),(0,O.default)(this,{state:{},plugins:[],system:{configs:{},fn:{},components:{},rootInjects:{},statePlugins:{}},boundSystem:{},toolbox:{}},t),this.getSystem=this._getSystem.bind(this),this.store=f(N,(0,C.fromJS)(this.state),this.getSystem),this.buildSystem(!1),this.register(this.plugins)}return(0,w.default)(e,[{key:"getStore",value:function(){return this.store}},{key:"register",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=o(e,this.getSystem());s(this.system,n),t&&this.buildSystem(),a.call(this.system,e,this.getSystem())&&this.buildSystem()}},{key:"buildSystem",value:function(){var e=!(arguments.length>0&&void 0!==arguments[0])||arguments[0],t=this.getStore().dispatch,n=this.getStore().getState;this.boundSystem=(0,y.default)({},this.getRootInjects(),this.getWrappedAndBoundActions(t),this.getWrappedAndBoundSelectors(n,this.getSystem),this.getStateThunks(n),this.getFn(),this.getConfigs()),e&&this.rebuildReducer()}},{key:"_getSystem",value:function(){return this.boundSystem}},{key:"getRootInjects",value:function(){return(0,y.default)({getSystem:this.getSystem,getStore:this.getStore.bind(this),getComponents:this.getComponents.bind(this),getState:this.getStore().getState,getConfigs:this._getConfigs.bind(this),Im:A.default,React:E.default},this.system.rootInjects||{})}},{key:"_getConfigs",value:function(){return this.system.configs}},{key:"getConfigs",value:function(){return{configs:this.system.configs}}},{key:"setConfigs",value:function(e){this.system.configs=e}},{key:"rebuildReducer",value:function(){this.store.replaceReducer(u(this.system.statePlugins))}},{key:"getType",value:function(e){var t=e[0].toUpperCase()+e.slice(1);return(0,F.objReduce)(this.system.statePlugins,function(n,r){var i=n[e];if(i)return(0,v.default)({},r+t,i)})}},{key:"getSelectors",value:function(){return this.getType("selectors")}},{key:"getActions",value:function(){var e=this.getType("actions");return(0,F.objMap)(e,function(e){return(0,F.objReduce)(e,function(e,t){if((0,F.isFn)(e))return(0,v.default)({},t,e)})})}},{key:"getWrappedAndBoundActions",value:function(e){var t=this,n=this.getBoundActions(e);return(0,F.objMap)(n,function(e,n){var r=t.system.statePlugins[n.slice(0,-7)].wrapActions;return r?(0,F.objMap)(e,function(e,n){var i=r[n];return i?(Array.isArray(i)||(i=[i]),i.reduce(function(e,n){var r=function(){return n(e,t.getSystem()).apply(void 0,arguments)};if(!(0,F.isFn)(r))throw new TypeError("wrapActions needs to return a function that returns a new function (ie the wrapped action)");return p(r)},e||Function.prototype)):e}):e})}},{key:"getWrappedAndBoundSelectors",value:function(e,t){var n=this,r=this.getBoundSelectors(e,t);return(0,F.objMap)(r,function(t,r){var i=[r.slice(0,-9)],o=n.system.statePlugins[i].wrapSelectors;return o?(0,F.objMap)(t,function(t,r){var a=o[r];return a?(Array.isArray(a)||(a=[a]),a.reduce(function(t,r){var o=function(){for(var o=arguments.length,a=Array(o),s=0;s<o;s++)a[s]=arguments[s];return r(t,n.getSystem()).apply(void 0,[e().getIn(i)].concat(a))};if(!(0,F.isFn)(o))throw new TypeError("wrapSelector needs to return a function that returns a new function (ie the wrapped action)");return o},t||Function.prototype)):t}):t})}},{key:"getStates",value:function(e){return(0,d.default)(this.system.statePlugins).reduce(function(t,n){return t[n]=e.get(n),t},{})}},{key:"getStateThunks",value:function(e){return(0,d.default)(this.system.statePlugins).reduce(function(t,n){return t[n]=function(){return e().get(n)},t},{})}},{key:"getFn",value:function(){return{fn:this.system.fn}}},{key:"getComponents",value:function(e){var t=this,n=this.system.components[e];return Array.isArray(n)?n.reduce(function(e,n){return n(e,t.getSystem())}):void 0!==e?this.system.components[e]:this.system.components}},{key:"getBoundSelectors",value:function(e,t){return(0,F.objMap)(this.getSelectors(),function(n,r){var i=[r.slice(0,-9)],o=function(){return e().getIn(i)};return(0,F.objMap)(n,function(e){return function(){for(var n=arguments.length,r=Array(n),i=0;i<n;i++)r[i]=arguments[i];var a=p(e).apply(null,[o()].concat(r));return"function"==typeof a&&(a=p(a)(t())),a}})})}},{key:"getBoundActions",value:function(e){e=e||this.getStore().dispatch;var t=this.getActions(),n=function e(t){return"function"!=typeof t?(0,F.objMap)(t,function(t){return e(t)}):function(){var e=null;try{e=t.apply(void 0,arguments)}catch(t){e={type:I.NEW_THROWN_ERR,error:!0,payload:(0,P.default)(t)}}finally{return e}}};return(0,F.objMap)(t,function(t){return(0,S.bindActionCreators)(n(t),e)})}},{key:"getMapStateToProps",value:function(){var e=this;return function(){return(0,y.default)({},e.getSystem())}}},{key:"getMapDispatchToProps",value:function(e){var t=this;return function(n){return(0,O.default)({},t.getWrappedAndBoundActions(n),t.getFn(),e)}}}]),e}();t.default=B},function(e,t,n){e.exports={default:n(585),__esModule:!0}},function(e,t,n){e.exports={default:n(587),__esModule:!0}},function(e,t,n){e.exports={default:n(594),__esModule:!0}},function(e,t,n){e.exports={default:n(596),__esModule:!0}},function(e,t,n){e.exports={default:n(597),__esModule:!0}},function(e,t,n){e.exports={default:n(598),__esModule:!0}},function(e,t,n){e.exports=n(1124)},function(e,t,n){"use strict";function r(e){var t=e.length;if(t%4>0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===e[t-2]?2:"="===e[t-1]?1:0}function i(e){return 3*e.length/4-r(e)}function o(e){var t,n,i,o,a,s=e.length;o=r(e),a=new p(3*s/4-o),n=o>0?s-4:s;var u=0;for(t=0;t<n;t+=4)i=c[e.charCodeAt(t)]<<18|c[e.charCodeAt(t+1)]<<12|c[e.charCodeAt(t+2)]<<6|c[e.charCodeAt(t+3)],a[u++]=i>>16&255,a[u++]=i>>8&255,a[u++]=255&i;return 2===o?(i=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,a[u++]=255&i):1===o&&(i=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,a[u++]=i>>8&255,a[u++]=255&i),a}function a(e){return l[e>>18&63]+l[e>>12&63]+l[e>>6&63]+l[63&e]}function s(e,t,n){for(var r,i=[],o=t;o<n;o+=3)r=(e[o]<<16)+(e[o+1]<<8)+e[o+2],i.push(a(r));return i.join("")}function u(e){for(var t,n=e.length,r=n%3,i="",o=[],a=0,u=n-r;a<u;a+=16383)o.push(s(e,a,a+16383>u?u:a+16383));return 1===r?(t=e[n-1],i+=l[t>>2],i+=l[t<<4&63],i+="=="):2===r&&(t=(e[n-2]<<8)+e[n-1],i+=l[t>>10],i+=l[t>>4&63],i+=l[t<<2&63],i+="="),o.push(i),o.join("")}t.byteLength=i,t.toByteArray=o,t.fromByteArray=u;for(var l=[],c=[],p="undefined"!=typeof Uint8Array?Uint8Array:Array,f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",h=0,d=f.length;h<d;++h)l[h]=f[h],c[f.charCodeAt(h)]=h;c["-".charCodeAt(0)]=62,c["_".charCodeAt(0)]=63},function(e,t,n){/*!
+ * Bowser - a browser detector
+ * https://github.com/ded/bowser
+ * MIT License | (c) Dustin Diaz 2015
+ */
+!function(t,r,i){void 0!==e&&e.exports?e.exports=i():n(1195)("bowser",i)}(0,0,function(){function e(e){function t(t){var n=e.match(t);return n&&n.length>1&&n[1]||""}function n(t){var n=e.match(t);return n&&n.length>1&&n[2]||""}var r,i=t(/(ipod|iphone|ipad)/i).toLowerCase(),o=/like android/i.test(e),s=!o&&/android/i.test(e),u=/nexus\s*[0-6]\s*/i.test(e),l=!u&&/nexus\s*[0-9]+/i.test(e),c=/CrOS/.test(e),p=/silk/i.test(e),f=/sailfish/i.test(e),h=/tizen/i.test(e),d=/(web|hpw)os/i.test(e),m=/windows phone/i.test(e),v=(/SamsungBrowser/i.test(e),!m&&/windows/i.test(e)),g=!i&&!p&&/macintosh/i.test(e),y=!s&&!f&&!h&&!d&&/linux/i.test(e),_=n(/edg([ea]|ios)\/(\d+(\.\d+)?)/i),b=t(/version\/(\d+(\.\d+)?)/i),x=/tablet/i.test(e)&&!/tablet pc/i.test(e),w=!x&&/[^-]mobi/i.test(e),k=/xbox/i.test(e);/opera/i.test(e)?r={name:"Opera",opera:a,version:b||t(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i)}:/opr\/|opios/i.test(e)?r={name:"Opera",opera:a,version:t(/(?:opr|opios)[\s\/](\d+(\.\d+)?)/i)||b}:/SamsungBrowser/i.test(e)?r={name:"Samsung Internet for Android",samsungBrowser:a,version:b||t(/(?:SamsungBrowser)[\s\/](\d+(\.\d+)?)/i)}:/coast/i.test(e)?r={name:"Opera Coast",coast:a,version:b||t(/(?:coast)[\s\/](\d+(\.\d+)?)/i)}:/yabrowser/i.test(e)?r={name:"Yandex Browser",yandexbrowser:a,version:b||t(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)}:/ucbrowser/i.test(e)?r={name:"UC Browser",ucbrowser:a,version:t(/(?:ucbrowser)[\s\/](\d+(?:\.\d+)+)/i)}:/mxios/i.test(e)?r={name:"Maxthon",maxthon:a,version:t(/(?:mxios)[\s\/](\d+(?:\.\d+)+)/i)}:/epiphany/i.test(e)?r={name:"Epiphany",epiphany:a,version:t(/(?:epiphany)[\s\/](\d+(?:\.\d+)+)/i)}:/puffin/i.test(e)?r={name:"Puffin",puffin:a,version:t(/(?:puffin)[\s\/](\d+(?:\.\d+)?)/i)}:/sleipnir/i.test(e)?r={name:"Sleipnir",sleipnir:a,version:t(/(?:sleipnir)[\s\/](\d+(?:\.\d+)+)/i)}:/k-meleon/i.test(e)?r={name:"K-Meleon",kMeleon:a,version:t(/(?:k-meleon)[\s\/](\d+(?:\.\d+)+)/i)}:m?(r={name:"Windows Phone",osname:"Windows Phone",windowsphone:a},_?(r.msedge=a,r.version=_):(r.msie=a,r.version=t(/iemobile\/(\d+(\.\d+)?)/i))):/msie|trident/i.test(e)?r={name:"Internet Explorer",msie:a,version:t(/(?:msie |rv:)(\d+(\.\d+)?)/i)}:c?r={name:"Chrome",osname:"Chrome OS",chromeos:a,chromeBook:a,chrome:a,version:t(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:/edg([ea]|ios)/i.test(e)?r={name:"Microsoft Edge",msedge:a,version:_}:/vivaldi/i.test(e)?r={name:"Vivaldi",vivaldi:a,version:t(/vivaldi\/(\d+(\.\d+)?)/i)||b}:f?r={name:"Sailfish",osname:"Sailfish OS",sailfish:a,version:t(/sailfish\s?browser\/(\d+(\.\d+)?)/i)}:/seamonkey\//i.test(e)?r={name:"SeaMonkey",seamonkey:a,version:t(/seamonkey\/(\d+(\.\d+)?)/i)}:/firefox|iceweasel|fxios/i.test(e)?(r={name:"Firefox",firefox:a,version:t(/(?:firefox|iceweasel|fxios)[ \/](\d+(\.\d+)?)/i)},/\((mobile|tablet);[^\)]*rv:[\d\.]+\)/i.test(e)&&(r.firefoxos=a,r.osname="Firefox OS")):p?r={name:"Amazon Silk",silk:a,version:t(/silk\/(\d+(\.\d+)?)/i)}:/phantom/i.test(e)?r={name:"PhantomJS",phantom:a,version:t(/phantomjs\/(\d+(\.\d+)?)/i)}:/slimerjs/i.test(e)?r={name:"SlimerJS",slimer:a,version:t(/slimerjs\/(\d+(\.\d+)?)/i)}:/blackberry|\bbb\d+/i.test(e)||/rim\stablet/i.test(e)?r={name:"BlackBerry",osname:"BlackBerry OS",blackberry:a,version:b||t(/blackberry[\d]+\/(\d+(\.\d+)?)/i)}:d?(r={name:"WebOS",osname:"WebOS",webos:a,version:b||t(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i)},/touchpad\//i.test(e)&&(r.touchpad=a)):/bada/i.test(e)?r={name:"Bada",osname:"Bada",bada:a,version:t(/dolfin\/(\d+(\.\d+)?)/i)}:h?r={name:"Tizen",osname:"Tizen",tizen:a,version:t(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i)||b}:/qupzilla/i.test(e)?r={name:"QupZilla",qupzilla:a,version:t(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i)||b}:/chromium/i.test(e)?r={name:"Chromium",chromium:a,version:t(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i)||b}:/chrome|crios|crmo/i.test(e)?r={name:"Chrome",chrome:a,version:t(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:s?r={name:"Android",version:b}:/safari|applewebkit/i.test(e)?(r={name:"Safari",safari:a},b&&(r.version=b)):i?(r={name:"iphone"==i?"iPhone":"ipad"==i?"iPad":"iPod"},b&&(r.version=b)):r=/googlebot/i.test(e)?{name:"Googlebot",googlebot:a,version:t(/googlebot\/(\d+(\.\d+))/i)||b}:{name:t(/^(.*)\/(.*) /),version:n(/^(.*)\/(.*) /)},!r.msedge&&/(apple)?webkit/i.test(e)?(/(apple)?webkit\/537\.36/i.test(e)?(r.name=r.name||"Blink",r.blink=a):(r.name=r.name||"Webkit",r.webkit=a),!r.version&&b&&(r.version=b)):!r.opera&&/gecko\//i.test(e)&&(r.name=r.name||"Gecko",r.gecko=a,r.version=r.version||t(/gecko\/(\d+(\.\d+)?)/i)),r.windowsphone||!s&&!r.silk?!r.windowsphone&&i?(r[i]=a,r.ios=a,r.osname="iOS"):g?(r.mac=a,r.osname="macOS"):k?(r.xbox=a,r.osname="Xbox"):v?(r.windows=a,r.osname="Windows"):y&&(r.linux=a,r.osname="Linux"):(r.android=a,r.osname="Android");var E="";r.windows?E=function(e){switch(e){case"NT":return"NT";case"XP":return"XP";case"NT 5.0":return"2000";case"NT 5.1":return"XP";case"NT 5.2":return"2003";case"NT 6.0":return"Vista";case"NT 6.1":return"7";case"NT 6.2":return"8";case"NT 6.3":return"8.1";case"NT 10.0":return"10";default:return}}(t(/Windows ((NT|XP)( \d\d?.\d)?)/i)):r.windowsphone?E=t(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i):r.mac?(E=t(/Mac OS X (\d+([_\.\s]\d+)*)/i),E=E.replace(/[_\s]/g,".")):i?(E=t(/os (\d+([_\s]\d+)*) like mac os x/i),E=E.replace(/[_\s]/g,".")):s?E=t(/android[ \/-](\d+(\.\d+)*)/i):r.webos?E=t(/(?:web|hpw)os\/(\d+(\.\d+)*)/i):r.blackberry?E=t(/rim\stablet\sos\s(\d+(\.\d+)*)/i):r.bada?E=t(/bada\/(\d+(\.\d+)*)/i):r.tizen&&(E=t(/tizen[\/\s](\d+(\.\d+)*)/i)),E&&(r.osversion=E);var S=!r.windows&&E.split(".")[0];return x||l||"ipad"==i||s&&(3==S||S>=4&&!w)||r.silk?r.tablet=a:(w||"iphone"==i||"ipod"==i||s||u||r.blackberry||r.webos||r.bada)&&(r.mobile=a),r.msedge||r.msie&&r.version>=10||r.yandexbrowser&&r.version>=15||r.vivaldi&&r.version>=1||r.chrome&&r.version>=20||r.samsungBrowser&&r.version>=4||r.firefox&&r.version>=20||r.safari&&r.version>=6||r.opera&&r.version>=10||r.ios&&r.osversion&&r.osversion.split(".")[0]>=6||r.blackberry&&r.version>=10.1||r.chromium&&r.version>=20?r.a=a:r.msie&&r.version<10||r.chrome&&r.version<20||r.firefox&&r.version<20||r.safari&&r.version<6||r.opera&&r.version<10||r.ios&&r.osversion&&r.osversion.split(".")[0]<6||r.chromium&&r.version<20?r.c=a:r.x=a,r}function t(e){return e.split(".").length}function n(e,t){var n,r=[];if(Array.prototype.map)return Array.prototype.map.call(e,t);for(n=0;n<e.length;n++)r.push(t(e[n]));return r}function r(e){for(var r=Math.max(t(e[0]),t(e[1])),i=n(e,function(e){var i=r-t(e);return e+=new Array(i+1).join(".0"),n(e.split("."),function(e){return new Array(20-e.length).join("0")+e}).reverse()});--r>=0;){if(i[0][r]>i[1][r])return 1;if(i[0][r]!==i[1][r])return-1;if(0===r)return 0}}function i(t,n,i){var o=s;"string"==typeof n&&(i=n,n=void 0),void 0===n&&(n=!1),i&&(o=e(i));var a=""+o.version;for(var u in t)if(t.hasOwnProperty(u)&&o[u]){if("string"!=typeof t[u])throw new Error("Browser version in the minVersion map should be a string: "+u+": "+String(t));return r([a,t[u]])<0}return n}function o(e,t,n){return!i(e,t,n)}var a=!0,s=e("undefined"!=typeof navigator?navigator.userAgent||"":"");return s.test=function(e){for(var t=0;t<e.length;++t){var n=e[t];if("string"==typeof n&&n in s)return!0}return!1},s.isUnsupportedBrowser=i,s.compareVersions=r,s.check=o,s._detect=e,s})},function(e,t,n){(function(t){!function(){"use strict";function n(e){var n;return n=e instanceof t?e:new t(e.toString(),"binary"),n.toString("base64")}e.exports=n}()}).call(t,n(40).Buffer)},function(e,t,n){var r,i;/*!
+  Copyright (c) 2016 Jed Watson.
+  Licensed under the MIT License (MIT), see
+  http://jedwatson.github.io/classnames
+*/
+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var i=typeof r;if("string"===i||"number"===i)e.push(r);else if(Array.isArray(r))e.push(n.apply(null,r));else if("object"===i)for(var a in r)o.call(r,a)&&r[a]&&e.push(a)}}return e.join(" ")}var o={}.hasOwnProperty;void 0!==e&&e.exports?e.exports=n:(r=[],void 0!==(i=function(){return n}.apply(t,r))&&(e.exports=i))}()},function(e,t,n){"use strict";function r(e){return{key:e.nodeKey,className:e.className,"data-sourcepos":e["data-sourcepos"]}}function i(e){var t=e.toLowerCase(),n=w[t]||t;return void 0!==k[n]?n:e}function o(e){return Object.keys(e||{}).reduce(function(t,n){return t[i(n)]=e[n],t},{})}function a(e){var t=r(e),n=e.escapeHtml?{}:{dangerouslySetInnerHTML:{__html:e.literal}},i=e.escapeHtml?[e.literal]:null;if(e.escapeHtml||!e.skipHtml){var o=y(t,n);return l(e.isBlock?"div":"span",o,i)}}function s(e){var t=e.parent.parent;return t&&"list"===t.type.toLowerCase()&&t.listTight}function u(e,t){var n=e;do{n=n.parent}while(!n.react);n.react.children.push(t)}function l(e,t,n){var r=Array.isArray(n)&&n.reduce(c,[]),i=[e,t].concat(r||n);return g.createElement.apply(g,i)}function c(e,t){var n=e.length-1;return"string"==typeof t&&"string"==typeof e[n]?e[n]+=t:e.push(t),e}function p(e){return[e[0][0],":",e[0][1],"-",e[1][0],":",e[1][1]].map(String).join("")}function f(e,t,n,r){var o={key:t};n.sourcePos&&e.sourcepos&&(o["data-sourcepos"]=p(e.sourcepos));var a=i(e.type);switch(a){case"html_inline":case"html_block":o.isBlock="html_block"===a,o.escapeHtml=n.escapeHtml,o.skipHtml=n.skipHtml;break;case"code_block":var s=e.info?e.info.split(/ +/):[];s.length>0&&s[0].length>0&&(o.language=s[0],o.codeinfo=s);break;case"code":o.children=e.literal,o.inline=!0;break;case"heading":o.level=e.level;break;case"softbreak":o.softBreak=n.softBreak;break;case"link":o.href=n.transformLinkUri?n.transformLinkUri(e.destination):e.destination,o.title=e.title||void 0,n.linkTarget&&(o.target=n.linkTarget);break;case"image":o.src=n.transformImageUri?n.transformImageUri(e.destination):e.destination,o.title=e.title||void 0,o.alt=e.react.children.join(""),e.react.children=void 0;break;case"list":o.start=e.listStart,o.type=e.listType,o.tight=e.listTight}"string"!=typeof r&&(o.literal=e.literal);var u=o.children||e.react&&e.react.children;return Array.isArray(u)&&(o.children=u.reduce(c,[])||null),o}function h(e){return e?e.sourcepos?p(e.sourcepos):h(e.parent):null}function d(e){for(var t,n,r,o,a,l,c,p,d,m=e.walker(),v={sourcePos:this.sourcePos,escapeHtml:this.escapeHtml,skipHtml:this.skipHtml,transformLinkUri:this.transformLinkUri,transformImageUri:this.transformImageUri,softBreak:this.softBreak,linkTarget:this.linkTarget},_=0;t=m.next();){var b=h(t.node.sourcepos?t.node:t.node.parent);if(d===b?(c=b+_,_++):(c=b,_=0),d=b,r=t.entering,o=!r,n=t.node,a=i(n.type),p=null,l){if(n!==l&&!("paragraph"===a&&s(n)||this.skipHtml&&("html_block"===a||"html_inline"===a))){var w=n===l,k=-1===this.allowedTypes.indexOf(a),E=!1,S=n.isContainer&&o,C=this.renderers[a];if(this.allowNode&&(S||!n.isContainer)){var A=S?n.react.children:[];p=f(n,c,v,C),E=!this.allowNode({type:x(a),renderer:this.renderers[a],props:p,children:A})}if(w||!E&&!k){var D="text"===a||"softbreak"===a;if("function"!=typeof C&&!D&&"string"!=typeof C)throw new Error("Renderer for type `"+x(n.type)+"` not defined or is not renderable");if(n.isContainer&&r)n.react={component:C,props:{},children:[]};else{var O=p||f(n,c,v,C);if(C)O="string"==typeof C?O:y(O,{nodeKey:O.key}),u(n,g.createElement(C,O));else if("text"===a)u(n,n.literal);else if("softbreak"===a){var M="br"===this.softBreak?g.createElement("br",{key:c}):this.softBreak;u(n,M)}}}else!this.unwrapDisallowed&&r&&n.isContainer&&m.resumeAt(n,!1)}}else l=n,n.react={children:[]}}return l.react.children}function m(e){var t=e.replace(/file:\/\//g,"x-file://");return decodeURI(b.uriInDoubleQuotedAttr(t))}function v(e){var t=e||{};if(t.allowedTypes&&t.disallowedTypes)throw new Error("Only one of `allowedTypes` and `disallowedTypes` should be defined");if(t.allowedTypes&&!Array.isArray(t.allowedTypes))throw new Error("`allowedTypes` must be an array");if(t.disallowedTypes&&!Array.isArray(t.disallowedTypes))throw new Error("`disallowedTypes` must be an array");if(t.allowNode&&"function"!=typeof t.allowNode)throw new Error("`allowNode` must be a function");var n=t.transformLinkUri;if(void 0===n)n=m;else if(n&&"function"!=typeof n)throw new Error("`transformLinkUri` must either be a function, or `null` to disable");var r=t.transformImageUri;if(void 0!==r&&"function"!=typeof r)throw new Error("`transformImageUri` must be a function");if(t.renderers&&!_(t.renderers))throw new Error("`renderers` must be a plain object of `Type`: `Renderer` pairs");var a=t.allowedTypes&&t.allowedTypes.map(i)||E;if(t.disallowedTypes){var s=t.disallowedTypes.map(i);a=a.filter(function(e){return-1===s.indexOf(e)})}return{sourcePos:Boolean(t.sourcePos),softBreak:t.softBreak||"\n",renderers:y({},k,o(t.renderers)),escapeHtml:Boolean(t.escapeHtml),skipHtml:Boolean(t.skipHtml),transformLinkUri:n,transformImageUri:r,allowNode:t.allowNode,allowedTypes:a,unwrapDisallowed:Boolean(t.unwrapDisallowed),render:d,linkTarget:t.linkTarget||!1}}var g=n(0),y=n(823),_=n(826),b=n(1199),x=n(979),w={blockquote:"block_quote",thematicbreak:"thematic_break",htmlblock:"html_block",htmlinline:"html_inline",codeblock:"code_block",hardbreak:"linebreak"},k={block_quote:"blockquote",emph:"em",linebreak:"br",image:"img",item:"li",link:"a",paragraph:"p",strong:"strong",thematic_break:"hr",html_block:a,html_inline:a,list:function(e){var t="bullet"===e.type.toLowerCase()?"ul":"ol",n=r(e);return null!==e.start&&1!==e.start&&(n.start=e.start.toString()),l(t,n,e.children)},code_block:function(e){var t=e.language&&"language-"+e.language,n=l("code",{className:t},e.literal);return l("pre",r(e),n)},code:function(e){return l("code",r(e),e.children)},heading:function(e){return l("h"+e.level,r(e),e.children)},text:null,softbreak:null},E=Object.keys(k);v.uriTransformer=m,v.types=E.map(x),v.renderers=E.reduce(function(e,t){return e[x(t)]=k[t],e},{}),e.exports=v},function(e,t,n){"use strict";function r(e){return{doc:new B,blocks:M,blockStarts:T,tip:this.doc,oldtip:this.doc,currentLine:"",lineNumber:0,offset:0,column:0,nextNonspace:0,nextNonspaceColumn:0,indent:0,indented:!1,blank:!1,partiallyConsumedTab:!1,allClosed:!0,lastMatchedContainer:this.doc,refmap:{},lastLineLength:0,inlineParser:new u(e),findNextNonspace:R,advanceOffset:P,advanceNextNonspace:I,addLine:S,addChild:C,incorporateLine:j,finalize:F,processInlines:N,closeUnmatchedBlocks:O,parse:L,options:e||{}}}var i=n(174),o=n(73).unescapeString,a=n(73).OPENTAG,s=n(73).CLOSETAG,u=n(578),l=[/./,/^<(?:script|pre|style)(?:\s|>|$)/i,/^<!--/,/^<[?]/,/^<![A-Z]/,/^<!\[CDATA\[/,/^<[\/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[123456]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[\/]?[>]|$)/i,new RegExp("^(?:"+a+"|"+s+")\\s*$","i")],c=[/./,/<\/(?:script|pre|style)>/i,/-->/,/\?>/,/>/,/\]\]>/],p=/^(?:(?:\*[ \t]*){3,}|(?:_[ \t]*){3,}|(?:-[ \t]*){3,})[ \t]*$/,f=/^[#`~*+_=<>0-9-]/,h=/[^ \t\f\v\r\n]/,d=/^[*+-]/,m=/^(\d{1,9})([.)])/,v=/^#{1,6}(?:[ \t]+|$)/,g=/^`{3,}(?!.*`)|^~{3,}(?!.*~)/,y=/^(?:`{3,}|~{3,})(?= *$)/,_=/^(?:=+|-+)[ \t]*$/,b=/\r\n|\n|\r/,x=function(e){return!h.test(e)},w=function(e){return 32===e||9===e},k=function(e,t){return t<e.length?e.charCodeAt(t):-1},E=function(e){for(;e;){if(e._lastLineBlank)return!0;var t=e.type;if("list"!==t&&"item"!==t)break;e=e._lastChild}return!1},S=function(){if(this.partiallyConsumedTab){this.offset+=1;var e=4-this.column%4;this.tip._string_content+=" ".repeat(e)}this.tip._string_content+=this.currentLine.slice(this.offset)+"\n"},C=function(e,t){for(;!this.blocks[this.tip.type].canContain(e);)this.finalize(this.tip,this.lineNumber-1);var n=t+1,r=new i(e,[[this.lineNumber,n],[0,0]]);return r._string_content="",this.tip.appendChild(r),this.tip=r,r},A=function(e,t){var n,r,i,o,a=e.currentLine.slice(e.nextNonspace),s={type:null,tight:!0,bulletChar:null,start:null,delimiter:null,padding:null,markerOffset:e.indent};if(n=a.match(d))s.type="bullet",s.bulletChar=n[0][0];else{if(!(n=a.match(m))||"paragraph"===t.type&&"1"!==n[1])return null;s.type="ordered",s.start=parseInt(n[1]),s.delimiter=n[2]}if(-1!==(r=k(e.currentLine,e.nextNonspace+n[0].length))&&9!==r&&32!==r)return null;if("paragraph"===t.type&&!e.currentLine.slice(e.nextNonspace+n[0].length).match(h))return null;e.advanceNextNonspace(),e.advanceOffset(n[0].length,!0),i=e.column,o=e.offset;do{e.advanceOffset(1,!0),r=k(e.currentLine,e.offset)}while(e.column-i<5&&w(r));var u=-1===k(e.currentLine,e.offset),l=e.column-i;return l>=5||l<1||u?(s.padding=n[0].length+1,e.column=i,e.offset=o,w(k(e.currentLine,e.offset))&&e.advanceOffset(1,!0)):s.padding=n[0].length+l,s},D=function(e,t){return e.type===t.type&&e.delimiter===t.delimiter&&e.bulletChar===t.bulletChar},O=function(){if(!this.allClosed){for(;this.oldtip!==this.lastMatchedContainer;){var e=this.oldtip._parent;this.finalize(this.oldtip,this.lineNumber-1),this.oldtip=e}this.allClosed=!0}},M={document:{continue:function(){return 0},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},list:{continue:function(){return 0},finalize:function(e,t){for(var n=t._firstChild;n;){if(E(n)&&n._next){t._listData.tight=!1;break}for(var r=n._firstChild;r;){if(E(r)&&(n._next||r._next)){t._listData.tight=!1;break}r=r._next}n=n._next}},canContain:function(e){return"item"===e},acceptsLines:!1},block_quote:{continue:function(e){var t=e.currentLine;return e.indented||62!==k(t,e.nextNonspace)?1:(e.advanceNextNonspace(),e.advanceOffset(1,!1),w(k(t,e.offset))&&e.advanceOffset(1,!0),0)},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},item:{continue:function(e,t){if(e.blank){if(null==t._firstChild)return 1;e.advanceNextNonspace()}else{if(!(e.indent>=t._listData.markerOffset+t._listData.padding))return 1;e.advanceOffset(t._listData.markerOffset+t._listData.padding,!0)}return 0},finalize:function(){},canContain:function(e){return"item"!==e},acceptsLines:!1},heading:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},thematic_break:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},code_block:{continue:function(e,t){var n=e.currentLine,r=e.indent;if(t._isFenced){var i=r<=3&&n.charAt(e.nextNonspace)===t._fenceChar&&n.slice(e.nextNonspace).match(y);if(i&&i[0].length>=t._fenceLength)return e.finalize(t,e.lineNumber),2;for(var o=t._fenceOffset;o>0&&w(k(n,e.offset));)e.advanceOffset(1,!0),o--}else if(r>=4)e.advanceOffset(4,!0);else{if(!e.blank)return 1;e.advanceNextNonspace()}return 0},finalize:function(e,t){if(t._isFenced){var n=t._string_content,r=n.indexOf("\n"),i=n.slice(0,r),a=n.slice(r+1);t.info=o(i.trim()),t._literal=a}else t._literal=t._string_content.replace(/(\n *)+$/,"\n");t._string_content=null},canContain:function(){return!1},acceptsLines:!0},html_block:{continue:function(e,t){return!e.blank||6!==t._htmlBlockType&&7!==t._htmlBlockType?0:1},finalize:function(e,t){t._literal=t._string_content.replace(/(\n *)+$/,""),t._string_content=null},canContain:function(){return!1},acceptsLines:!0},paragraph:{continue:function(e){return e.blank?1:0},finalize:function(e,t){for(var n,r=!1;91===k(t._string_content,0)&&(n=e.inlineParser.parseReference(t._string_content,e.refmap));)t._string_content=t._string_content.slice(n),r=!0;r&&x(t._string_content)&&t.unlink()},canContain:function(){return!1},acceptsLines:!0}},T=[function(e){return e.indented||62!==k(e.currentLine,e.nextNonspace)?0:(e.advanceNextNonspace(),e.advanceOffset(1,!1),w(k(e.currentLine,e.offset))&&e.advanceOffset(1,!0),e.closeUnmatchedBlocks(),e.addChild("block_quote",e.nextNonspace),1)},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(v))){e.advanceNextNonspace(),e.advanceOffset(t[0].length,!1),e.closeUnmatchedBlocks();var n=e.addChild("heading",e.nextNonspace);return n.level=t[0].trim().length,n._string_content=e.currentLine.slice(e.offset).replace(/^[ \t]*#+[ \t]*$/,"").replace(/[ \t]+#+[ \t]*$/,""),e.advanceOffset(e.currentLine.length-e.offset),2}return 0},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(g))){var n=t[0].length;e.closeUnmatchedBlocks();var r=e.addChild("code_block",e.nextNonspace);return r._isFenced=!0,r._fenceLength=n,r._fenceChar=t[0][0],r._fenceOffset=e.indent,e.advanceNextNonspace(),e.advanceOffset(n,!1),2}return 0},function(e,t){if(!e.indented&&60===k(e.currentLine,e.nextNonspace)){var n,r=e.currentLine.slice(e.nextNonspace);for(n=1;n<=7;n++)if(l[n].test(r)&&(n<7||"paragraph"!==t.type)){e.closeUnmatchedBlocks();var i=e.addChild("html_block",e.offset);return i._htmlBlockType=n,2}}return 0},function(e,t){var n;if(!e.indented&&"paragraph"===t.type&&(n=e.currentLine.slice(e.nextNonspace).match(_))){e.closeUnmatchedBlocks();var r=new i("heading",t.sourcepos);return r.level="="===n[0][0]?1:2,r._string_content=t._string_content,t.insertAfter(r),t.unlink(),e.tip=r,e.advanceOffset(e.currentLine.length-e.offset,!1),2}return 0},function(e){return!e.indented&&p.test(e.currentLine.slice(e.nextNonspace))?(e.closeUnmatchedBlocks(),e.addChild("thematic_break",e.nextNonspace),e.advanceOffset(e.currentLine.length-e.offset,!1),2):0},function(e,t){var n;return e.indented&&"list"!==t.type||!(n=A(e,t))?0:(e.closeUnmatchedBlocks(),"list"===e.tip.type&&D(t._listData,n)||(t=e.addChild("list",e.nextNonspace),t._listData=n),t=e.addChild("item",e.nextNonspace),t._listData=n,1)},function(e){return e.indented&&"paragraph"!==e.tip.type&&!e.blank?(e.advanceOffset(4,!0),e.closeUnmatchedBlocks(),e.addChild("code_block",e.offset),2):0}],P=function(e,t){for(var n,r,i,o=this.currentLine;e>0&&(i=o[this.offset]);)"\t"===i?(n=4-this.column%4,t?(this.partiallyConsumedTab=n>e,r=n>e?e:n,this.column+=r,this.offset+=this.partiallyConsumedTab?0:1,e-=r):(this.partiallyConsumedTab=!1,this.column+=n,this.offset+=1,e-=1)):(this.partiallyConsumedTab=!1,this.offset+=1,this.column+=1,e-=1)},I=function(){this.offset=this.nextNonspace,this.column=this.nextNonspaceColumn,this.partiallyConsumedTab=!1},R=function(){for(var e,t=this.currentLine,n=this.offset,r=this.column;""!==(e=t.charAt(n));)if(" "===e)n++,r++;else{if("\t"!==e)break;n++,r+=4-r%4}this.blank="\n"===e||"\r"===e||""===e,this.nextNonspace=n,this.nextNonspaceColumn=r,this.indent=this.nextNonspaceColumn-this.column,this.indented=this.indent>=4},j=function(e){var t,n=!0,r=this.doc;this.oldtip=this.tip,this.offset=0,this.column=0,this.blank=!1,this.partiallyConsumedTab=!1,this.lineNumber+=1,-1!==e.indexOf("\0")&&(e=e.replace(/\0/g,"�")),this.currentLine=e;for(var i;(i=r._lastChild)&&i._open;){switch(r=i,this.findNextNonspace(),this.blocks[r.type].continue(this,r)){case 0:break;case 1:n=!1;break;case 2:return void(this.lastLineLength=e.length);default:throw"continue returned illegal value, must be 0, 1, or 2"}if(!n){r=r._parent;break}}this.allClosed=r===this.oldtip,this.lastMatchedContainer=r;for(var o="paragraph"!==r.type&&M[r.type].acceptsLines,a=this.blockStarts,s=a.length;!o;){if(this.findNextNonspace(),!this.indented&&!f.test(e.slice(this.nextNonspace))){this.advanceNextNonspace();break}for(var u=0;u<s;){var l=a[u](this,r);if(1===l){r=this.tip;break}if(2===l){r=this.tip,o=!0;break}u++}if(u===s){this.advanceNextNonspace();break}}if(this.allClosed||this.blank||"paragraph"!==this.tip.type){this.closeUnmatchedBlocks(),this.blank&&r.lastChild&&(r.lastChild._lastLineBlank=!0),t=r.type;for(var p=this.blank&&!("block_quote"===t||"code_block"===t&&r._isFenced||"item"===t&&!r._firstChild&&r.sourcepos[0][0]===this.lineNumber),h=r;h;)h._lastLineBlank=p,h=h._parent;this.blocks[t].acceptsLines?(this.addLine(),"html_block"===t&&r._htmlBlockType>=1&&r._htmlBlockType<=5&&c[r._htmlBlockType].test(this.currentLine.slice(this.offset))&&this.finalize(r,this.lineNumber)):this.offset<e.length&&!this.blank&&(r=this.addChild("paragraph",this.offset),this.advanceNextNonspace(),this.addLine())}else this.addLine();this.lastLineLength=e.length},F=function(e,t){var n=e._parent;e._open=!1,e.sourcepos[1]=[t,this.lastLineLength],this.blocks[e.type].finalize(this,e),this.tip=n},N=function(e){var t,n,r,i=e.walker();for(this.inlineParser.refmap=this.refmap,this.inlineParser.options=this.options;n=i.next();)t=n.node,r=t.type,n.entering||"paragraph"!==r&&"heading"!==r||this.inlineParser.parse(t)},B=function(){return new i("document",[[1,1],[0,0]])},L=function(e){this.doc=new B,this.tip=this.doc,this.refmap={},this.lineNumber=0,this.lastLineLength=0,this.offset=0,this.column=0,this.lastMatchedContainer=this.doc,this.currentLine="",this.options.time&&console.time("preparing input");var t=e.split(b),n=t.length;10===e.charCodeAt(e.length-1)&&(n-=1),this.options.time&&console.timeEnd("preparing input"),this.options.time&&console.time("block parsing");for(var r=0;r<n;r++)this.incorporateLine(t[r]);for(;this.tip;)this.finalize(this.tip,n);return this.options.time&&console.timeEnd("block parsing"),this.options.time&&console.time("inline parsing"),this.processInlines(this.doc),this.options.time&&console.timeEnd("inline parsing"),this.doc};e.exports=r},function(e,t,n){"use strict";/*! http://mths.be/fromcodepoint v0.2.1 by @mathias */
+if(String.fromCodePoint)e.exports=function(e){try{return String.fromCodePoint(e)}catch(e){if(e instanceof RangeError)return String.fromCharCode(65533);throw e}};else{var r=String.fromCharCode,i=Math.floor,o=function(){var e,t,n=[],o=-1,a=arguments.length;if(!a)return"";for(var s="";++o<a;){var u=Number(arguments[o]);if(!isFinite(u)||u<0||u>1114111||i(u)!==u)return String.fromCharCode(65533);u<=65535?n.push(u):(u-=65536,e=55296+(u>>10),t=u%1024+56320,n.push(e,t)),(o+1===a||n.length>16384)&&(s+=r.apply(null,n),n.length=0)}return s};e.exports=o}},function(e,t,n){"use strict";e.exports.Node=n(174),e.exports.Parser=n(575),e.exports.HtmlRenderer=n(580),e.exports.XmlRenderer=n(581)},function(e,t,n){"use strict";function r(e){return{subject:"",delimiters:null,brackets:null,pos:0,refmap:{},match:F,peek:N,spnl:B,parseBackticks:L,parseBackslash:q,parseAutolink:z,parseHtmlTag:U,scanDelims:W,handleDelim:V,parseLinkTitle:K,parseLinkDestination:X,parseLinkLabel:Y,parseOpenBracket:$,parseBang:Z,parseCloseBracket:Q,addBracket:ee,removeBracket:te,parseEntity:ne,parseString:re,parseNewline:ie,parseReference:oe,parseInline:ae,processEmphasis:J,removeDelimiter:H,options:e||{},parse:se}}var i=n(174),o=n(73),a=n(579),s=o.normalizeURI,u=o.unescapeString,l=n(576),c=n(114).decodeHTML;n(494);var p=o.ESCAPABLE,f="\\\\"+p,h=o.ENTITY,d=o.reHtmlTag,m=new RegExp(/[!"#$%&'()*+,\-.\/:;<=>?@\[\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/),v=new RegExp('^(?:"('+f+'|[^"\\x00])*"|\'('+f+"|[^'\\x00])*'|\\(("+f+"|[^)\\x00])*\\))"),g=new RegExp("^(?:[<](?:[^ <>\\t\\n\\\\\\x00]|"+f+"|\\\\)*[>])"),y=new RegExp("^"+p),_=new RegExp("^"+h,"i"),b=/`+/,x=/^`+/,w=/\.\.\./g,k=/--+/g,E=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,S=/^<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*>/i,C=/^ *(?:\n *)?/,A=/^[ \t\n\x0b\x0c\x0d]/,D=/[ \t\n\x0b\x0c\x0d]+/g,O=/^\s/,M=/ *$/,T=/^ */,P=/^ *(?:\n|$)/,I=new RegExp("^\\[(?:[^\\\\\\[\\]]|"+f+"|\\\\){0,1000}\\]"),R=/^[^\n`\[\]\\!<&*_'"]+/m,j=function(e){var t=new i("text");return t._literal=e,t},F=function(e){var t=e.exec(this.subject.slice(this.pos));return null===t?null:(this.pos+=t.index+t[0].length,t[0])},N=function(){return this.pos<this.subject.length?this.subject.charCodeAt(this.pos):-1},B=function(){return this.match(C),!0},L=function(e){var t=this.match(x);if(null===t)return!1;for(var n,r,o=this.pos;null!==(n=this.match(b));)if(n===t)return r=new i("code"),r._literal=this.subject.slice(o,this.pos-t.length).trim().replace(D," "),e.appendChild(r),!0;return this.pos=o,e.appendChild(j(t)),!0},q=function(e){var t,n=this.subject;return this.pos+=1,10===this.peek()?(this.pos+=1,t=new i("linebreak"),e.appendChild(t)):y.test(n.charAt(this.pos))?(e.appendChild(j(n.charAt(this.pos))),this.pos+=1):e.appendChild(j("\\")),!0},z=function(e){var t,n,r;return(t=this.match(E))?(n=t.slice(1,t.length-1),r=new i("link"),r._destination=s("mailto:"+n),r._title="",r.appendChild(j(n)),e.appendChild(r),!0):!!(t=this.match(S))&&(n=t.slice(1,t.length-1),r=new i("link"),r._destination=s(n),r._title="",r.appendChild(j(n)),e.appendChild(r),!0)},U=function(e){var t=this.match(d);if(null===t)return!1;var n=new i("html_inline");return n._literal=t,e.appendChild(n),!0},W=function(e){var t,n,r,i,o,a,s,u,c,p,f,h=0,d=this.pos;if(39===e||34===e)h++,this.pos++;else for(;this.peek()===e;)h++,this.pos++;return 0===h?null:(t=0===d?"\n":this.subject.charAt(d-1),r=this.peek(),n=-1===r?"\n":l(r),u=O.test(n),c=m.test(n),p=O.test(t),f=m.test(t),i=!u&&(!c||p||f),o=!p&&(!f||u||c),95===e?(a=i&&(!o||f),s=o&&(!i||c)):39===e||34===e?(a=i&&!o,s=o):(a=i,s=o),this.pos=d,{numdelims:h,can_open:a,can_close:s})},V=function(e,t){var n=this.scanDelims(e);if(!n)return!1;var r,i=n.numdelims,o=this.pos;this.pos+=i,r=39===e?"’":34===e?"“":this.subject.slice(o,this.pos);var a=j(r);return t.appendChild(a),this.delimiters={cc:e,numdelims:i,origdelims:i,node:a,previous:this.delimiters,next:null,can_open:n.can_open,can_close:n.can_close},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},H=function(e){null!==e.previous&&(e.previous.next=e.next),null===e.next?this.delimiters=e.previous:e.next.previous=e.previous},G=function(e,t){e.next!==t&&(e.next=t,t.previous=e)},J=function(e){var t,n,r,o,a,s,u,l,c,p,f=[],h=!1;for(f[95]=e,f[42]=e,f[39]=e,f[34]=e,n=this.delimiters;null!==n&&n.previous!==e;)n=n.previous;for(;null!==n;){var d=n.cc;if(n.can_close){for(t=n.previous,p=!1;null!==t&&t!==e&&t!==f[d];){if(h=(n.can_open||t.can_close)&&(t.origdelims+n.origdelims)%3==0,t.cc===n.cc&&t.can_open&&!h){p=!0;break}t=t.previous}if(r=n,42===d||95===d)if(p){u=n.numdelims>=2&&t.numdelims>=2?2:1,o=t.node,a=n.node,t.numdelims-=u,n.numdelims-=u,o._literal=o._literal.slice(0,o._literal.length-u),a._literal=a._literal.slice(0,a._literal.length-u);var m=new i(1===u?"emph":"strong");for(l=o._next;l&&l!==a;)c=l._next,l.unlink(),m.appendChild(l),l=c;o.insertAfter(m),G(t,n),0===t.numdelims&&(o.unlink(),this.removeDelimiter(t)),0===n.numdelims&&(a.unlink(),s=n.next,this.removeDelimiter(n),n=s)}else n=n.next;else 39===d?(n.node._literal="’",p&&(t.node._literal="‘"),n=n.next):34===d&&(n.node._literal="”",p&&(t.node.literal="“"),n=n.next);p||h||(f[d]=r.previous,r.can_open||this.removeDelimiter(r))}else n=n.next}for(;null!==this.delimiters&&this.delimiters!==e;)this.removeDelimiter(this.delimiters)},K=function(){var e=this.match(v);return null===e?null:u(e.substr(1,e.length-2))},X=function(){var e=this.match(g);if(null===e){for(var t,n=this.pos,r=0;-1!==(t=this.peek());)if(92===t)this.pos+=1,-1!==this.peek()&&(this.pos+=1);else if(40===t)this.pos+=1,r+=1;else if(41===t){if(r<1)break;this.pos+=1,r-=1}else{if(null!==A.exec(l(t)))break;this.pos+=1}return e=this.subject.substr(n,this.pos-n),s(u(e))}return s(u(e.substr(1,e.length-2)))},Y=function(){var e=this.match(I);return null===e||e.length>1001||/[^\\]\\\]$/.exec(e)?0:e.length},$=function(e){var t=this.pos;this.pos+=1;var n=j("[");return e.appendChild(n),this.addBracket(n,t,!1),!0},Z=function(e){var t=this.pos;if(this.pos+=1,91===this.peek()){this.pos+=1;var n=j("![");e.appendChild(n),this.addBracket(n,t+1,!0)}else e.appendChild(j("!"));return!0},Q=function(e){var t,n,r,o,s,u,l=!1;if(this.pos+=1,t=this.pos,null===(u=this.brackets))return e.appendChild(j("]")),!0;if(!u.active)return e.appendChild(j("]")),this.removeBracket(),!0;n=u.image;var c=this.pos;if(40===this.peek()&&(this.pos++,this.spnl()&&null!==(r=this.parseLinkDestination())&&this.spnl()&&(A.test(this.subject.charAt(this.pos-1))&&(o=this.parseLinkTitle()),!0)&&this.spnl()&&41===this.peek()?(this.pos+=1,l=!0):this.pos=c),!l){var p=this.pos,f=this.parseLinkLabel();if(f>2?s=this.subject.slice(p,p+f):u.bracketAfter||(s=this.subject.slice(u.index,t)),0===f&&(this.pos=c),s){var h=this.refmap[a(s)];h&&(r=h.destination,o=h.title,l=!0)}}if(l){var d=new i(n?"image":"link");d._destination=r,d._title=o||"";var m,v;for(m=u.node._next;m;)v=m._next,m.unlink(),d.appendChild(m),m=v;if(e.appendChild(d),this.processEmphasis(u.previousDelimiter),this.removeBracket(),u.node.unlink(),!n)for(u=this.brackets;null!==u;)u.image||(u.active=!1),u=u.previous;return!0}return this.removeBracket(),this.pos=t,e.appendChild(j("]")),!0},ee=function(e,t,n){null!==this.brackets&&(this.brackets.bracketAfter=!0),this.brackets={node:e,previous:this.brackets,previousDelimiter:this.delimiters,index:t,image:n,active:!0}},te=function(){this.brackets=this.brackets.previous},ne=function(e){var t;return!!(t=this.match(_))&&(e.appendChild(j(c(t))),!0)},re=function(e){var t;return!!(t=this.match(R))&&(this.options.smart?e.appendChild(j(t.replace(w,"…").replace(k,function(e){var t=0,n=0;return e.length%3==0?n=e.length/3:e.length%2==0?t=e.length/2:e.length%3==2?(t=1,n=(e.length-2)/3):(t=2,n=(e.length-4)/3),"—".repeat(n)+"–".repeat(t)}))):e.appendChild(j(t)),!0)},ie=function(e){this.pos+=1;var t=e._lastChild;if(t&&"text"===t.type&&" "===t._literal[t._literal.length-1]){var n=" "===t._literal[t._literal.length-2];t._literal=t._literal.replace(M,""),e.appendChild(new i(n?"linebreak":"softbreak"))}else e.appendChild(new i("softbreak"));return this.match(T),!0},oe=function(e,t){this.subject=e,this.pos=0;var n,r,i,o,s=this.pos;if(0===(o=this.parseLinkLabel()))return 0;if(n=this.subject.substr(0,o),58!==this.peek())return this.pos=s,0;if(this.pos++,this.spnl(),null===(r=this.parseLinkDestination())||0===r.length)return this.pos=s,0;var u=this.pos;this.spnl(),null===(i=this.parseLinkTitle())&&(i="",this.pos=u);var l=!0;if(null===this.match(P)&&(""===i?l=!1:(i="",this.pos=u,l=null!==this.match(P))),!l)return this.pos=s,0;var c=a(n);return""===c?(this.pos=s,0):(t[c]||(t[c]={destination:r,title:i}),this.pos-s)},ae=function(e){var t=!1,n=this.peek();if(-1===n)return!1;switch(n){case 10:t=this.parseNewline(e);break;case 92:t=this.parseBackslash(e);break;case 96:t=this.parseBackticks(e);break;case 42:case 95:t=this.handleDelim(n,e);break;case 39:case 34:t=this.options.smart&&this.handleDelim(n,e);break;case 91:t=this.parseOpenBracket(e);break;case 33:t=this.parseBang(e);break;case 93:t=this.parseCloseBracket(e);break;case 60:t=this.parseAutolink(e)||this.parseHtmlTag(e);break;case 38:t=this.parseEntity(e);break;default:t=this.parseString(e)}return t||(this.pos+=1,e.appendChild(j(l(n)))),!0},se=function(e){for(this.subject=e._string_content.trim(),this.pos=0,this.delimiters=null,this.brackets=null;this.parseInline(e););e._string_content=null,this.processEmphasis(null)};e.exports=r},function(e,t,n){"use strict";var r=/[ \t\r\n]+|[A-Z\xB5\xC0-\xD6\xD8-\xDF\u0100\u0102\u0104\u0106\u0108\u010A\u010C\u010E\u0110\u0112\u0114\u0116\u0118\u011A\u011C\u011E\u0120\u0122\u0124\u0126\u0128\u012A\u012C\u012E\u0130\u0132\u0134\u0136\u0139\u013B\u013D\u013F\u0141\u0143\u0145\u0147\u0149\u014A\u014C\u014E\u0150\u0152\u0154\u0156\u0158\u015A\u015C\u015E\u0160\u0162\u0164\u0166\u0168\u016A\u016C\u016E\u0170\u0172\u0174\u0176\u0178\u0179\u017B\u017D\u017F\u0181\u0182\u0184\u0186\u0187\u0189-\u018B\u018E-\u0191\u0193\u0194\u0196-\u0198\u019C\u019D\u019F\u01A0\u01A2\u01A4\u01A6\u01A7\u01A9\u01AC\u01AE\u01AF\u01B1-\u01B3\u01B5\u01B7\u01B8\u01BC\u01C4\u01C5\u01C7\u01C8\u01CA\u01CB\u01CD\u01CF\u01D1\u01D3\u01D5\u01D7\u01D9\u01DB\u01DE\u01E0\u01E2\u01E4\u01E6\u01E8\u01EA\u01EC\u01EE\u01F0-\u01F2\u01F4\u01F6-\u01F8\u01FA\u01FC\u01FE\u0200\u0202\u0204\u0206\u0208\u020A\u020C\u020E\u0210\u0212\u0214\u0216\u0218\u021A\u021C\u021E\u0220\u0222\u0224\u0226\u0228\u022A\u022C\u022E\u0230\u0232\u023A\u023B\u023D\u023E\u0241\u0243-\u0246\u0248\u024A\u024C\u024E\u0345\u0370\u0372\u0376\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03AB\u03B0\u03C2\u03CF-\u03D1\u03D5\u03D6\u03D8\u03DA\u03DC\u03DE\u03E0\u03E2\u03E4\u03E6\u03E8\u03EA\u03EC\u03EE\u03F0\u03F1\u03F4\u03F5\u03F7\u03F9\u03FA\u03FD-\u042F\u0460\u0462\u0464\u0466\u0468\u046A\u046C\u046E\u0470\u0472\u0474\u0476\u0478\u047A\u047C\u047E\u0480\u048A\u048C\u048E\u0490\u0492\u0494\u0496\u0498\u049A\u049C\u049E\u04A0\u04A2\u04A4\u04A6\u04A8\u04AA\u04AC\u04AE\u04B0\u04B2\u04B4\u04B6\u04B8\u04BA\u04BC\u04BE\u04C0\u04C1\u04C3\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04D2\u04D4\u04D6\u04D8\u04DA\u04DC\u04DE\u04E0\u04E2\u04E4\u04E6\u04E8\u04EA\u04EC\u04EE\u04F0\u04F2\u04F4\u04F6\u04F8\u04FA\u04FC\u04FE\u0500\u0502\u0504\u0506\u0508\u050A\u050C\u050E\u0510\u0512\u0514\u0516\u0518\u051A\u051C\u051E\u0520\u0522\u0524\u0526\u0528\u052A\u052C\u052E\u0531-\u0556\u0587\u10A0-\u10C5\u10C7\u10CD\u1E00\u1E02\u1E04\u1E06\u1E08\u1E0A\u1E0C\u1E0E\u1E10\u1E12\u1E14\u1E16\u1E18\u1E1A\u1E1C\u1E1E\u1E20\u1E22\u1E24\u1E26\u1E28\u1E2A\u1E2C\u1E2E\u1E30\u1E32\u1E34\u1E36\u1E38\u1E3A\u1E3C\u1E3E\u1E40\u1E42\u1E44\u1E46\u1E48\u1E4A\u1E4C\u1E4E\u1E50\u1E52\u1E54\u1E56\u1E58\u1E5A\u1E5C\u1E5E\u1E60\u1E62\u1E64\u1E66\u1E68\u1E6A\u1E6C\u1E6E\u1E70\u1E72\u1E74\u1E76\u1E78\u1E7A\u1E7C\u1E7E\u1E80\u1E82\u1E84\u1E86\u1E88\u1E8A\u1E8C\u1E8E\u1E90\u1E92\u1E94\u1E96-\u1E9B\u1E9E\u1EA0\u1EA2\u1EA4\u1EA6\u1EA8\u1EAA\u1EAC\u1EAE\u1EB0\u1EB2\u1EB4\u1EB6\u1EB8\u1EBA\u1EBC\u1EBE\u1EC0\u1EC2\u1EC4\u1EC6\u1EC8\u1ECA\u1ECC\u1ECE\u1ED0\u1ED2\u1ED4\u1ED6\u1ED8\u1EDA\u1EDC\u1EDE\u1EE0\u1EE2\u1EE4\u1EE6\u1EE8\u1EEA\u1EEC\u1EEE\u1EF0\u1EF2\u1EF4\u1EF6\u1EF8\u1EFA\u1EFC\u1EFE\u1F08-\u1F0F\u1F18-\u1F1D\u1F28-\u1F2F\u1F38-\u1F3F\u1F48-\u1F4D\u1F50\u1F52\u1F54\u1F56\u1F59\u1F5B\u1F5D\u1F5F\u1F68-\u1F6F\u1F80-\u1FAF\u1FB2-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD2\u1FD3\u1FD6-\u1FDB\u1FE2-\u1FE4\u1FE6-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A\u212B\u2132\u2160-\u216F\u2183\u24B6-\u24CF\u2C00-\u2C2E\u2C60\u2C62-\u2C64\u2C67\u2C69\u2C6B\u2C6D-\u2C70\u2C72\u2C75\u2C7E-\u2C80\u2C82\u2C84\u2C86\u2C88\u2C8A\u2C8C\u2C8E\u2C90\u2C92\u2C94\u2C96\u2C98\u2C9A\u2C9C\u2C9E\u2CA0\u2CA2\u2CA4\u2CA6\u2CA8\u2CAA\u2CAC\u2CAE\u2CB0\u2CB2\u2CB4\u2CB6\u2CB8\u2CBA\u2CBC\u2CBE\u2CC0\u2CC2\u2CC4\u2CC6\u2CC8\u2CCA\u2CCC\u2CCE\u2CD0\u2CD2\u2CD4\u2CD6\u2CD8\u2CDA\u2CDC\u2CDE\u2CE0\u2CE2\u2CEB\u2CED\u2CF2\uA640\uA642\uA644\uA646\uA648\uA64A\uA64C\uA64E\uA650\uA652\uA654\uA656\uA658\uA65A\uA65C\uA65E\uA660\uA662\uA664\uA666\uA668\uA66A\uA66C\uA680\uA682\uA684\uA686\uA688\uA68A\uA68C\uA68E\uA690\uA692\uA694\uA696\uA698\uA69A\uA722\uA724\uA726\uA728\uA72A\uA72C\uA72E\uA732\uA734\uA736\uA738\uA73A\uA73C\uA73E\uA740\uA742\uA744\uA746\uA748\uA74A\uA74C\uA74E\uA750\uA752\uA754\uA756\uA758\uA75A\uA75C\uA75E\uA760\uA762\uA764\uA766\uA768\uA76A\uA76C\uA76E\uA779\uA77B\uA77D\uA77E\uA780\uA782\uA784\uA786\uA78B\uA78D\uA790\uA792\uA796\uA798\uA79A\uA79C\uA79E\uA7A0\uA7A2\uA7A4\uA7A6\uA7A8\uA7AA-\uA7AD\uA7B0\uA7B1\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A]|\uD801[\uDC00-\uDC27]|\uD806[\uDCA0-\uDCBF]/g,i={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","µ":"μ","À":"à","Á":"á","Â":"â","Ã":"ã","Ä":"ä","Å":"å","Æ":"æ","Ç":"ç","È":"è","É":"é","Ê":"ê","Ë":"ë","Ì":"ì","Í":"í","Î":"î","Ï":"ï","Ð":"ð","Ñ":"ñ","Ò":"ò","Ó":"ó","Ô":"ô","Õ":"õ","Ö":"ö","Ø":"ø","Ù":"ù","Ú":"ú","Û":"û","Ü":"ü","Ý":"ý","Þ":"þ","Ā":"ā","Ă":"ă","Ą":"ą","Ć":"ć","Ĉ":"ĉ","Ċ":"ċ","Č":"č","Ď":"ď","Đ":"đ","Ē":"ē","Ĕ":"ĕ","Ė":"ė","Ę":"ę","Ě":"ě","Ĝ":"ĝ","Ğ":"ğ","Ġ":"ġ","Ģ":"ģ","Ĥ":"ĥ","Ħ":"ħ","Ĩ":"ĩ","Ī":"ī","Ĭ":"ĭ","Į":"į","IJ":"ij","Ĵ":"ĵ","Ķ":"ķ","Ĺ":"ĺ","Ļ":"ļ","Ľ":"ľ","Ŀ":"ŀ","Ł":"ł","Ń":"ń","Ņ":"ņ","Ň":"ň","Ŋ":"ŋ","Ō":"ō","Ŏ":"ŏ","Ő":"ő","Œ":"œ","Ŕ":"ŕ","Ŗ":"ŗ","Ř":"ř","Ś":"ś","Ŝ":"ŝ","Ş":"ş","Š":"š","Ţ":"ţ","Ť":"ť","Ŧ":"ŧ","Ũ":"ũ","Ū":"ū","Ŭ":"ŭ","Ů":"ů","Ű":"ű","Ų":"ų","Ŵ":"ŵ","Ŷ":"ŷ","Ÿ":"ÿ","Ź":"ź","Ż":"ż","Ž":"ž","ſ":"s","Ɓ":"ɓ","Ƃ":"ƃ","Ƅ":"ƅ","Ɔ":"ɔ","Ƈ":"ƈ","Ɖ":"ɖ","Ɗ":"ɗ","Ƌ":"ƌ","Ǝ":"ǝ","Ə":"ə","Ɛ":"ɛ","Ƒ":"ƒ","Ɠ":"ɠ","Ɣ":"ɣ","Ɩ":"ɩ","Ɨ":"ɨ","Ƙ":"ƙ","Ɯ":"ɯ","Ɲ":"ɲ","Ɵ":"ɵ","Ơ":"ơ","Ƣ":"ƣ","Ƥ":"ƥ","Ʀ":"ʀ","Ƨ":"ƨ","Ʃ":"ʃ","Ƭ":"ƭ","Ʈ":"ʈ","Ư":"ư","Ʊ":"ʊ","Ʋ":"ʋ","Ƴ":"ƴ","Ƶ":"ƶ","Ʒ":"ʒ","Ƹ":"ƹ","Ƽ":"ƽ","DŽ":"dž","Dž":"dž","LJ":"lj","Lj":"lj","NJ":"nj","Nj":"nj","Ǎ":"ǎ","Ǐ":"ǐ","Ǒ":"ǒ","Ǔ":"ǔ","Ǖ":"ǖ","Ǘ":"ǘ","Ǚ":"ǚ","Ǜ":"ǜ","Ǟ":"ǟ","Ǡ":"ǡ","Ǣ":"ǣ","Ǥ":"ǥ","Ǧ":"ǧ","Ǩ":"ǩ","Ǫ":"ǫ","Ǭ":"ǭ","Ǯ":"ǯ","DZ":"dz","Dz":"dz","Ǵ":"ǵ","Ƕ":"ƕ","Ƿ":"ƿ","Ǹ":"ǹ","Ǻ":"ǻ","Ǽ":"ǽ","Ǿ":"ǿ","Ȁ":"ȁ","Ȃ":"ȃ","Ȅ":"ȅ","Ȇ":"ȇ","Ȉ":"ȉ","Ȋ":"ȋ","Ȍ":"ȍ","Ȏ":"ȏ","Ȑ":"ȑ","Ȓ":"ȓ","Ȕ":"ȕ","Ȗ":"ȗ","Ș":"ș","Ț":"ț","Ȝ":"ȝ","Ȟ":"ȟ","Ƞ":"ƞ","Ȣ":"ȣ","Ȥ":"ȥ","Ȧ":"ȧ","Ȩ":"ȩ","Ȫ":"ȫ","Ȭ":"ȭ","Ȯ":"ȯ","Ȱ":"ȱ","Ȳ":"ȳ","Ⱥ":"ⱥ","Ȼ":"ȼ","Ƚ":"ƚ","Ⱦ":"ⱦ","Ɂ":"ɂ","Ƀ":"ƀ","Ʉ":"ʉ","Ʌ":"ʌ","Ɇ":"ɇ","Ɉ":"ɉ","Ɋ":"ɋ","Ɍ":"ɍ","Ɏ":"ɏ","ͅ":"ι","Ͱ":"ͱ","Ͳ":"ͳ","Ͷ":"ͷ","Ϳ":"ϳ","Ά":"ά","Έ":"έ","Ή":"ή","Ί":"ί","Ό":"ό","Ύ":"ύ","Ώ":"ώ","Α":"α","Β":"β","Γ":"γ","Δ":"δ","Ε":"ε","Ζ":"ζ","Η":"η","Θ":"θ","Ι":"ι","Κ":"κ","Λ":"λ","Μ":"μ","Ν":"ν","Ξ":"ξ","Ο":"ο","Π":"π","Ρ":"ρ","Σ":"σ","Τ":"τ","Υ":"υ","Φ":"φ","Χ":"χ","Ψ":"ψ","Ω":"ω","Ϊ":"ϊ","Ϋ":"ϋ","ς":"σ","Ϗ":"ϗ","ϐ":"β","ϑ":"θ","ϕ":"φ","ϖ":"π","Ϙ":"ϙ","Ϛ":"ϛ","Ϝ":"ϝ","Ϟ":"ϟ","Ϡ":"ϡ","Ϣ":"ϣ","Ϥ":"ϥ","Ϧ":"ϧ","Ϩ":"ϩ","Ϫ":"ϫ","Ϭ":"ϭ","Ϯ":"ϯ","ϰ":"κ","ϱ":"ρ","ϴ":"θ","ϵ":"ε","Ϸ":"ϸ","Ϲ":"ϲ","Ϻ":"ϻ","Ͻ":"ͻ","Ͼ":"ͼ","Ͽ":"ͽ","Ѐ":"ѐ","Ё":"ё","Ђ":"ђ","Ѓ":"ѓ","Є":"є","Ѕ":"ѕ","І":"і","Ї":"ї","Ј":"ј","Љ":"љ","Њ":"њ","Ћ":"ћ","Ќ":"ќ","Ѝ":"ѝ","Ў":"ў","Џ":"џ","А":"а","Б":"б","В":"в","Г":"г","Д":"д","Е":"е","Ж":"ж","З":"з","И":"и","Й":"й","К":"к","Л":"л","М":"м","Н":"н","О":"о","П":"п","Р":"р","С":"с","Т":"т","У":"у","Ф":"ф","Х":"х","Ц":"ц","Ч":"ч","Ш":"ш","Щ":"щ","Ъ":"ъ","Ы":"ы","Ь":"ь","Э":"э","Ю":"ю","Я":"я","Ѡ":"ѡ","Ѣ":"ѣ","Ѥ":"ѥ","Ѧ":"ѧ","Ѩ":"ѩ","Ѫ":"ѫ","Ѭ":"ѭ","Ѯ":"ѯ","Ѱ":"ѱ","Ѳ":"ѳ","Ѵ":"ѵ","Ѷ":"ѷ","Ѹ":"ѹ","Ѻ":"ѻ","Ѽ":"ѽ","Ѿ":"ѿ","Ҁ":"ҁ","Ҋ":"ҋ","Ҍ":"ҍ","Ҏ":"ҏ","Ґ":"ґ","Ғ":"ғ","Ҕ":"ҕ","Җ":"җ","Ҙ":"ҙ","Қ":"қ","Ҝ":"ҝ","Ҟ":"ҟ","Ҡ":"ҡ","Ң":"ң","Ҥ":"ҥ","Ҧ":"ҧ","Ҩ":"ҩ","Ҫ":"ҫ","Ҭ":"ҭ","Ү":"ү","Ұ":"ұ","Ҳ":"ҳ","Ҵ":"ҵ","Ҷ":"ҷ","Ҹ":"ҹ","Һ":"һ","Ҽ":"ҽ","Ҿ":"ҿ","Ӏ":"ӏ","Ӂ":"ӂ","Ӄ":"ӄ","Ӆ":"ӆ","Ӈ":"ӈ","Ӊ":"ӊ","Ӌ":"ӌ","Ӎ":"ӎ","Ӑ":"ӑ","Ӓ":"ӓ","Ӕ":"ӕ","Ӗ":"ӗ","Ә":"ә","Ӛ":"ӛ","Ӝ":"ӝ","Ӟ":"ӟ","Ӡ":"ӡ","Ӣ":"ӣ","Ӥ":"ӥ","Ӧ":"ӧ","Ө":"ө","Ӫ":"ӫ","Ӭ":"ӭ","Ӯ":"ӯ","Ӱ":"ӱ","Ӳ":"ӳ","Ӵ":"ӵ","Ӷ":"ӷ","Ӹ":"ӹ","Ӻ":"ӻ","Ӽ":"ӽ","Ӿ":"ӿ","Ԁ":"ԁ","Ԃ":"ԃ","Ԅ":"ԅ","Ԇ":"ԇ","Ԉ":"ԉ","Ԋ":"ԋ","Ԍ":"ԍ","Ԏ":"ԏ","Ԑ":"ԑ","Ԓ":"ԓ","Ԕ":"ԕ","Ԗ":"ԗ","Ԙ":"ԙ","Ԛ":"ԛ","Ԝ":"ԝ","Ԟ":"ԟ","Ԡ":"ԡ","Ԣ":"ԣ","Ԥ":"ԥ","Ԧ":"ԧ","Ԩ":"ԩ","Ԫ":"ԫ","Ԭ":"ԭ","Ԯ":"ԯ","Ա":"ա","Բ":"բ","Գ":"գ","Դ":"դ","Ե":"ե","Զ":"զ","Է":"է","Ը":"ը","Թ":"թ","Ժ":"ժ","Ի":"ի","Լ":"լ","Խ":"խ","Ծ":"ծ","Կ":"կ","Հ":"հ","Ձ":"ձ","Ղ":"ղ","Ճ":"ճ","Մ":"մ","Յ":"յ","Ն":"ն","Շ":"շ","Ո":"ո","Չ":"չ","Պ":"պ","Ջ":"ջ","Ռ":"ռ","Ս":"ս","Վ":"վ","Տ":"տ","Ր":"ր","Ց":"ց","Ւ":"ւ","Փ":"փ","Ք":"ք","Օ":"օ","Ֆ":"ֆ","Ⴀ":"ⴀ","Ⴁ":"ⴁ","Ⴂ":"ⴂ","Ⴃ":"ⴃ","Ⴄ":"ⴄ","Ⴅ":"ⴅ","Ⴆ":"ⴆ","Ⴇ":"ⴇ","Ⴈ":"ⴈ","Ⴉ":"ⴉ","Ⴊ":"ⴊ","Ⴋ":"ⴋ","Ⴌ":"ⴌ","Ⴍ":"ⴍ","Ⴎ":"ⴎ","Ⴏ":"ⴏ","Ⴐ":"ⴐ","Ⴑ":"ⴑ","Ⴒ":"ⴒ","Ⴓ":"ⴓ","Ⴔ":"ⴔ","Ⴕ":"ⴕ","Ⴖ":"ⴖ","Ⴗ":"ⴗ","Ⴘ":"ⴘ","Ⴙ":"ⴙ","Ⴚ":"ⴚ","Ⴛ":"ⴛ","Ⴜ":"ⴜ","Ⴝ":"ⴝ","Ⴞ":"ⴞ","Ⴟ":"ⴟ","Ⴠ":"ⴠ","Ⴡ":"ⴡ","Ⴢ":"ⴢ","Ⴣ":"ⴣ","Ⴤ":"ⴤ","Ⴥ":"ⴥ","Ⴧ":"ⴧ","Ⴭ":"ⴭ","Ḁ":"ḁ","Ḃ":"ḃ","Ḅ":"ḅ","Ḇ":"ḇ","Ḉ":"ḉ","Ḋ":"ḋ","Ḍ":"ḍ","Ḏ":"ḏ","Ḑ":"ḑ","Ḓ":"ḓ","Ḕ":"ḕ","Ḗ":"ḗ","Ḙ":"ḙ","Ḛ":"ḛ","Ḝ":"ḝ","Ḟ":"ḟ","Ḡ":"ḡ","Ḣ":"ḣ","Ḥ":"ḥ","Ḧ":"ḧ","Ḩ":"ḩ","Ḫ":"ḫ","Ḭ":"ḭ","Ḯ":"ḯ","Ḱ":"ḱ","Ḳ":"ḳ","Ḵ":"ḵ","Ḷ":"ḷ","Ḹ":"ḹ","Ḻ":"ḻ","Ḽ":"ḽ","Ḿ":"ḿ","Ṁ":"ṁ","Ṃ":"ṃ","Ṅ":"ṅ","Ṇ":"ṇ","Ṉ":"ṉ","Ṋ":"ṋ","Ṍ":"ṍ","Ṏ":"ṏ","Ṑ":"ṑ","Ṓ":"ṓ","Ṕ":"ṕ","Ṗ":"ṗ","Ṙ":"ṙ","Ṛ":"ṛ","Ṝ":"ṝ","Ṟ":"ṟ","Ṡ":"ṡ","Ṣ":"ṣ","Ṥ":"ṥ","Ṧ":"ṧ","Ṩ":"ṩ","Ṫ":"ṫ","Ṭ":"ṭ","Ṯ":"ṯ","Ṱ":"ṱ","Ṳ":"ṳ","Ṵ":"ṵ","Ṷ":"ṷ","Ṹ":"ṹ","Ṻ":"ṻ","Ṽ":"ṽ","Ṿ":"ṿ","Ẁ":"ẁ","Ẃ":"ẃ","Ẅ":"ẅ","Ẇ":"ẇ","Ẉ":"ẉ","Ẋ":"ẋ","Ẍ":"ẍ","Ẏ":"ẏ","Ẑ":"ẑ","Ẓ":"ẓ","Ẕ":"ẕ","ẛ":"ṡ","Ạ":"ạ","Ả":"ả","Ấ":"ấ","Ầ":"ầ","Ẩ":"ẩ","Ẫ":"ẫ","Ậ":"ậ","Ắ":"ắ","Ằ":"ằ","Ẳ":"ẳ","Ẵ":"ẵ","Ặ":"ặ","Ẹ":"ẹ","Ẻ":"ẻ","Ẽ":"ẽ","Ế":"ế","Ề":"ề","Ể":"ể","Ễ":"ễ","Ệ":"ệ","Ỉ":"ỉ","Ị":"ị","Ọ":"ọ","Ỏ":"ỏ","Ố":"ố","Ồ":"ồ","Ổ":"ổ","Ỗ":"ỗ","Ộ":"ộ","Ớ":"ớ","Ờ":"ờ","Ở":"ở","Ỡ":"ỡ","Ợ":"ợ","Ụ":"ụ","Ủ":"ủ","Ứ":"ứ","Ừ":"ừ","Ử":"ử","Ữ":"ữ","Ự":"ự","Ỳ":"ỳ","Ỵ":"ỵ","Ỷ":"ỷ","Ỹ":"ỹ","Ỻ":"ỻ","Ỽ":"ỽ","Ỿ":"ỿ","Ἀ":"ἀ","Ἁ":"ἁ","Ἂ":"ἂ","Ἃ":"ἃ","Ἄ":"ἄ","Ἅ":"ἅ","Ἆ":"ἆ","Ἇ":"ἇ","Ἐ":"ἐ","Ἑ":"ἑ","Ἒ":"ἒ","Ἓ":"ἓ","Ἔ":"ἔ","Ἕ":"ἕ","Ἠ":"ἠ","Ἡ":"ἡ","Ἢ":"ἢ","Ἣ":"ἣ","Ἤ":"ἤ","Ἥ":"ἥ","Ἦ":"ἦ","Ἧ":"ἧ","Ἰ":"ἰ","Ἱ":"ἱ","Ἲ":"ἲ","Ἳ":"ἳ","Ἴ":"ἴ","Ἵ":"ἵ","Ἶ":"ἶ","Ἷ":"ἷ","Ὀ":"ὀ","Ὁ":"ὁ","Ὂ":"ὂ","Ὃ":"ὃ","Ὄ":"ὄ","Ὅ":"ὅ","Ὑ":"ὑ","Ὓ":"ὓ","Ὕ":"ὕ","Ὗ":"ὗ","Ὠ":"ὠ","Ὡ":"ὡ","Ὢ":"ὢ","Ὣ":"ὣ","Ὤ":"ὤ","Ὥ":"ὥ","Ὦ":"ὦ","Ὧ":"ὧ","Ᾰ":"ᾰ","Ᾱ":"ᾱ","Ὰ":"ὰ","Ά":"ά","ι":"ι","Ὲ":"ὲ","Έ":"έ","Ὴ":"ὴ","Ή":"ή","Ῐ":"ῐ","Ῑ":"ῑ","Ὶ":"ὶ","Ί":"ί","Ῠ":"ῠ","Ῡ":"ῡ","Ὺ":"ὺ","Ύ":"ύ","Ῥ":"ῥ","Ὸ":"ὸ","Ό":"ό","Ὼ":"ὼ","Ώ":"ώ","Ω":"ω","K":"k","Å":"å","Ⅎ":"ⅎ","Ⅰ":"ⅰ","Ⅱ":"ⅱ","Ⅲ":"ⅲ","Ⅳ":"ⅳ","Ⅴ":"ⅴ","Ⅵ":"ⅵ","Ⅶ":"ⅶ","Ⅷ":"ⅷ","Ⅸ":"ⅸ","Ⅹ":"ⅹ","Ⅺ":"ⅺ","Ⅻ":"ⅻ","Ⅼ":"ⅼ","Ⅽ":"ⅽ","Ⅾ":"ⅾ","Ⅿ":"ⅿ","Ↄ":"ↄ","Ⓐ":"ⓐ","Ⓑ":"ⓑ","Ⓒ":"ⓒ","Ⓓ":"ⓓ","Ⓔ":"ⓔ","Ⓕ":"ⓕ","Ⓖ":"ⓖ","Ⓗ":"ⓗ","Ⓘ":"ⓘ","Ⓙ":"ⓙ","Ⓚ":"ⓚ","Ⓛ":"ⓛ","Ⓜ":"ⓜ","Ⓝ":"ⓝ","Ⓞ":"ⓞ","Ⓟ":"ⓟ","Ⓠ":"ⓠ","Ⓡ":"ⓡ","Ⓢ":"ⓢ","Ⓣ":"ⓣ","Ⓤ":"ⓤ","Ⓥ":"ⓥ","Ⓦ":"ⓦ","Ⓧ":"ⓧ","Ⓨ":"ⓨ","Ⓩ":"ⓩ","Ⰰ":"ⰰ","Ⰱ":"ⰱ","Ⰲ":"ⰲ","Ⰳ":"ⰳ","Ⰴ":"ⰴ","Ⰵ":"ⰵ","Ⰶ":"ⰶ","Ⰷ":"ⰷ","Ⰸ":"ⰸ","Ⰹ":"ⰹ","Ⰺ":"ⰺ","Ⰻ":"ⰻ","Ⰼ":"ⰼ","Ⰽ":"ⰽ","Ⰾ":"ⰾ","Ⰿ":"ⰿ","Ⱀ":"ⱀ","Ⱁ":"ⱁ","Ⱂ":"ⱂ","Ⱃ":"ⱃ","Ⱄ":"ⱄ","Ⱅ":"ⱅ","Ⱆ":"ⱆ","Ⱇ":"ⱇ","Ⱈ":"ⱈ","Ⱉ":"ⱉ","Ⱊ":"ⱊ","Ⱋ":"ⱋ","Ⱌ":"ⱌ","Ⱍ":"ⱍ","Ⱎ":"ⱎ","Ⱏ":"ⱏ","Ⱐ":"ⱐ","Ⱑ":"ⱑ","Ⱒ":"ⱒ","Ⱓ":"ⱓ","Ⱔ":"ⱔ","Ⱕ":"ⱕ","Ⱖ":"ⱖ","Ⱗ":"ⱗ","Ⱘ":"ⱘ","Ⱙ":"ⱙ","Ⱚ":"ⱚ","Ⱛ":"ⱛ","Ⱜ":"ⱜ","Ⱝ":"ⱝ","Ⱞ":"ⱞ","Ⱡ":"ⱡ","Ɫ":"ɫ","Ᵽ":"ᵽ","Ɽ":"ɽ","Ⱨ":"ⱨ","Ⱪ":"ⱪ","Ⱬ":"ⱬ","Ɑ":"ɑ","Ɱ":"ɱ","Ɐ":"ɐ","Ɒ":"ɒ","Ⱳ":"ⱳ","Ⱶ":"ⱶ","Ȿ":"ȿ","Ɀ":"ɀ","Ⲁ":"ⲁ","Ⲃ":"ⲃ","Ⲅ":"ⲅ","Ⲇ":"ⲇ","Ⲉ":"ⲉ","Ⲋ":"ⲋ","Ⲍ":"ⲍ","Ⲏ":"ⲏ","Ⲑ":"ⲑ","Ⲓ":"ⲓ","Ⲕ":"ⲕ","Ⲗ":"ⲗ","Ⲙ":"ⲙ","Ⲛ":"ⲛ","Ⲝ":"ⲝ","Ⲟ":"ⲟ","Ⲡ":"ⲡ","Ⲣ":"ⲣ","Ⲥ":"ⲥ","Ⲧ":"ⲧ","Ⲩ":"ⲩ","Ⲫ":"ⲫ","Ⲭ":"ⲭ","Ⲯ":"ⲯ","Ⲱ":"ⲱ","Ⲳ":"ⲳ","Ⲵ":"ⲵ","Ⲷ":"ⲷ","Ⲹ":"ⲹ","Ⲻ":"ⲻ","Ⲽ":"ⲽ","Ⲿ":"ⲿ","Ⳁ":"ⳁ","Ⳃ":"ⳃ","Ⳅ":"ⳅ","Ⳇ":"ⳇ","Ⳉ":"ⳉ","Ⳋ":"ⳋ","Ⳍ":"ⳍ","Ⳏ":"ⳏ","Ⳑ":"ⳑ","Ⳓ":"ⳓ","Ⳕ":"ⳕ","Ⳗ":"ⳗ","Ⳙ":"ⳙ","Ⳛ":"ⳛ","Ⳝ":"ⳝ","Ⳟ":"ⳟ","Ⳡ":"ⳡ","Ⳣ":"ⳣ","Ⳬ":"ⳬ","Ⳮ":"ⳮ","Ⳳ":"ⳳ","Ꙁ":"ꙁ","Ꙃ":"ꙃ","Ꙅ":"ꙅ","Ꙇ":"ꙇ","Ꙉ":"ꙉ","Ꙋ":"ꙋ","Ꙍ":"ꙍ","Ꙏ":"ꙏ","Ꙑ":"ꙑ","Ꙓ":"ꙓ","Ꙕ":"ꙕ","Ꙗ":"ꙗ","Ꙙ":"ꙙ","Ꙛ":"ꙛ","Ꙝ":"ꙝ","Ꙟ":"ꙟ","Ꙡ":"ꙡ","Ꙣ":"ꙣ","Ꙥ":"ꙥ","Ꙧ":"ꙧ","Ꙩ":"ꙩ","Ꙫ":"ꙫ","Ꙭ":"ꙭ","Ꚁ":"ꚁ","Ꚃ":"ꚃ","Ꚅ":"ꚅ","Ꚇ":"ꚇ","Ꚉ":"ꚉ","Ꚋ":"ꚋ","Ꚍ":"ꚍ","Ꚏ":"ꚏ","Ꚑ":"ꚑ","Ꚓ":"ꚓ","Ꚕ":"ꚕ","Ꚗ":"ꚗ","Ꚙ":"ꚙ","Ꚛ":"ꚛ","Ꜣ":"ꜣ","Ꜥ":"ꜥ","Ꜧ":"ꜧ","Ꜩ":"ꜩ","Ꜫ":"ꜫ","Ꜭ":"ꜭ","Ꜯ":"ꜯ","Ꜳ":"ꜳ","Ꜵ":"ꜵ","Ꜷ":"ꜷ","Ꜹ":"ꜹ","Ꜻ":"ꜻ","Ꜽ":"ꜽ","Ꜿ":"ꜿ","Ꝁ":"ꝁ","Ꝃ":"ꝃ","Ꝅ":"ꝅ","Ꝇ":"ꝇ","Ꝉ":"ꝉ","Ꝋ":"ꝋ","Ꝍ":"ꝍ","Ꝏ":"ꝏ","Ꝑ":"ꝑ","Ꝓ":"ꝓ","Ꝕ":"ꝕ","Ꝗ":"ꝗ","Ꝙ":"ꝙ","Ꝛ":"ꝛ","Ꝝ":"ꝝ","Ꝟ":"ꝟ","Ꝡ":"ꝡ","Ꝣ":"ꝣ","Ꝥ":"ꝥ","Ꝧ":"ꝧ","Ꝩ":"ꝩ","Ꝫ":"ꝫ","Ꝭ":"ꝭ","Ꝯ":"ꝯ","Ꝺ":"ꝺ","Ꝼ":"ꝼ","Ᵹ":"ᵹ","Ꝿ":"ꝿ","Ꞁ":"ꞁ","Ꞃ":"ꞃ","Ꞅ":"ꞅ","Ꞇ":"ꞇ","Ꞌ":"ꞌ","Ɥ":"ɥ","Ꞑ":"ꞑ","Ꞓ":"ꞓ","Ꞗ":"ꞗ","Ꞙ":"ꞙ","Ꞛ":"ꞛ","Ꞝ":"ꞝ","Ꞟ":"ꞟ","Ꞡ":"ꞡ","Ꞣ":"ꞣ","Ꞥ":"ꞥ","Ꞧ":"ꞧ","Ꞩ":"ꞩ","Ɦ":"ɦ","Ɜ":"ɜ","Ɡ":"ɡ","Ɬ":"ɬ","Ʞ":"ʞ","Ʇ":"ʇ","Ａ":"ａ","Ｂ":"ｂ","Ｃ":"ｃ","Ｄ":"ｄ","Ｅ":"ｅ","Ｆ":"ｆ","Ｇ":"ｇ","Ｈ":"ｈ","Ｉ":"ｉ","Ｊ":"ｊ","Ｋ":"ｋ","Ｌ":"ｌ","Ｍ":"ｍ","Ｎ":"ｎ","Ｏ":"ｏ","Ｐ":"ｐ","Ｑ":"ｑ","Ｒ":"ｒ","Ｓ":"ｓ","Ｔ":"ｔ","Ｕ":"ｕ","Ｖ":"ｖ","Ｗ":"ｗ","Ｘ":"ｘ","Ｙ":"ｙ","Ｚ":"ｚ","𐐀":"𐐨","𐐁":"𐐩","𐐂":"𐐪","𐐃":"𐐫","𐐄":"𐐬","𐐅":"𐐭","𐐆":"𐐮","𐐇":"𐐯","𐐈":"𐐰","𐐉":"𐐱","𐐊":"𐐲","𐐋":"𐐳","𐐌":"𐐴","𐐍":"𐐵","𐐎":"𐐶","𐐏":"𐐷","𐐐":"𐐸","𐐑":"𐐹","𐐒":"𐐺","𐐓":"𐐻","𐐔":"𐐼","𐐕":"𐐽","𐐖":"𐐾","𐐗":"𐐿","𐐘":"𐑀","𐐙":"𐑁","𐐚":"𐑂","𐐛":"𐑃","𐐜":"𐑄","𐐝":"𐑅","𐐞":"𐑆","𐐟":"𐑇","𐐠":"𐑈","𐐡":"𐑉","𐐢":"𐑊","𐐣":"𐑋","𐐤":"𐑌","𐐥":"𐑍","𐐦":"𐑎","𐐧":"𐑏","𑢠":"𑣀","𑢡":"𑣁","𑢢":"𑣂","𑢣":"𑣃","𑢤":"𑣄","𑢥":"𑣅","𑢦":"𑣆","𑢧":"𑣇","𑢨":"𑣈","𑢩":"𑣉","𑢪":"𑣊","𑢫":"𑣋","𑢬":"𑣌","𑢭":"𑣍","𑢮":"𑣎","𑢯":"𑣏","𑢰":"𑣐","𑢱":"𑣑","𑢲":"𑣒","𑢳":"𑣓","𑢴":"𑣔","𑢵":"𑣕","𑢶":"𑣖","𑢷":"𑣗","𑢸":"𑣘","𑢹":"𑣙","𑢺":"𑣚","𑢻":"𑣛","𑢼":"𑣜","𑢽":"𑣝","𑢾":"𑣞","𑢿":"𑣟","ß":"ss","İ":"i̇","ʼn":"ʼn","ǰ":"ǰ","ΐ":"ΐ","ΰ":"ΰ","և":"եւ","ẖ":"ẖ","ẗ":"ẗ","ẘ":"ẘ","ẙ":"ẙ","ẚ":"aʾ","ẞ":"ss","ὐ":"ὐ","ὒ":"ὒ","ὔ":"ὔ","ὖ":"ὖ","ᾀ":"ἀι","ᾁ":"ἁι","ᾂ":"ἂι","ᾃ":"ἃι","ᾄ":"ἄι","ᾅ":"ἅι","ᾆ":"ἆι","ᾇ":"ἇι","ᾈ":"ἀι","ᾉ":"ἁι","ᾊ":"ἂι","ᾋ":"ἃι","ᾌ":"ἄι","ᾍ":"ἅι","ᾎ":"ἆι","ᾏ":"ἇι","ᾐ":"ἠι","ᾑ":"ἡι","ᾒ":"ἢι","ᾓ":"ἣι","ᾔ":"ἤι","ᾕ":"ἥι","ᾖ":"ἦι","ᾗ":"ἧι","ᾘ":"ἠι","ᾙ":"ἡι","ᾚ":"ἢι","ᾛ":"ἣι","ᾜ":"ἤι","ᾝ":"ἥι","ᾞ":"ἦι","ᾟ":"ἧι","ᾠ":"ὠι","ᾡ":"ὡι","ᾢ":"ὢι","ᾣ":"ὣι","ᾤ":"ὤι","ᾥ":"ὥι","ᾦ":"ὦι","ᾧ":"ὧι","ᾨ":"ὠι","ᾩ":"ὡι","ᾪ":"ὢι","ᾫ":"ὣι","ᾬ":"ὤι","ᾭ":"ὥι","ᾮ":"ὦι","ᾯ":"ὧι","ᾲ":"ὰι","ᾳ":"αι","ᾴ":"άι","ᾶ":"ᾶ","ᾷ":"ᾶι","ᾼ":"αι","ῂ":"ὴι","ῃ":"ηι","ῄ":"ήι","ῆ":"ῆ","ῇ":"ῆι","ῌ":"ηι","ῒ":"ῒ","ΐ":"ΐ","ῖ":"ῖ","ῗ":"ῗ","ῢ":"ῢ","ΰ":"ΰ","ῤ":"ῤ","ῦ":"ῦ","ῧ":"ῧ","ῲ":"ὼι","ῳ":"ωι","ῴ":"ώι","ῶ":"ῶ","ῷ":"ῶι","ῼ":"ωι","ff":"ff","fi":"fi","fl":"fl","ffi":"ffi","ffl":"ffl","ſt":"st","st":"st","ﬓ":"մն","ﬔ":"մե","ﬕ":"մի","ﬖ":"վն","ﬗ":"մխ"};e.exports=function(e){return e.slice(1,e.length-1).trim().replace(r,function(e){return i[e]||" "})}},function(e,t,n){"use strict";function r(e,t,n){if(!(this.disableTags>0)){if(this.buffer+="<"+e,t&&t.length>0)for(var r,i=0;void 0!==(r=t[i]);)this.buffer+=" "+r[0]+'="'+r[1]+'"',i++;n&&(this.buffer+=" /"),this.buffer+=">",this.lastOut=">"}}function i(e){e=e||{},e.softbreak=e.softbreak||"\n",this.disableTags=0,this.lastOut="\n",this.options=e}function o(e){this.out(e.literal)}function a(){this.lit(this.options.softbreak)}function s(){this.tag("br",[],!0),this.cr()}function u(e,t){var n=this.attrs(e);t?(this.options.safe&&O(e.destination)||n.push(["href",this.esc(e.destination,!0)]),e.title&&n.push(["title",this.esc(e.title,!0)]),this.tag("a",n)):this.tag("/a")}function l(e,t){t?(0===this.disableTags&&(this.options.safe&&O(e.destination)?this.lit('<img src="" alt="'):this.lit('<img src="'+this.esc(e.destination,!0)+'" alt="')),this.disableTags+=1):(this.disableTags-=1,0===this.disableTags&&(e.title&&this.lit('" title="'+this.esc(e.title,!0)),this.lit('" />')))}function c(e,t){this.tag(t?"em":"/em")}function p(e,t){this.tag(t?"strong":"/strong")}function f(e,t){var n=e.parent.parent,r=this.attrs(e);null!==n&&"list"===n.type&&n.listTight||(t?(this.cr(),this.tag("p",r)):(this.tag("/p"),this.cr()))}function h(e,t){var n="h"+e.level,r=this.attrs(e);t?(this.cr(),this.tag(n,r)):(this.tag("/"+n),this.cr())}function d(e){this.tag("code"),this.out(e.literal),this.tag("/code")}function m(e){var t=e.info?e.info.split(/\s+/):[],n=this.attrs(e);t.length>0&&t[0].length>0&&n.push(["class","language-"+this.esc(t[0],!0)]),this.cr(),this.tag("pre"),this.tag("code",n),this.out(e.literal),this.tag("/code"),this.tag("/pre"),this.cr()}function v(e){var t=this.attrs(e);this.cr(),this.tag("hr",t,!0),this.cr()}function g(e,t){var n=this.attrs(e);t?(this.cr(),this.tag("blockquote",n),this.cr()):(this.cr(),this.tag("/blockquote"),this.cr())}function y(e,t){var n="bullet"===e.listType?"ul":"ol",r=this.attrs(e);if(t){var i=e.listStart;null!==i&&1!==i&&r.push(["start",i.toString()]),this.cr(),this.tag(n,r),this.cr()}else this.cr(),this.tag("/"+n),this.cr()}function _(e,t){var n=this.attrs(e);t?this.tag("li",n):(this.tag("/li"),this.cr())}function b(e){this.options.safe?this.lit("\x3c!-- raw HTML omitted --\x3e"):this.lit(e.literal)}function x(e){this.cr(),this.options.safe?this.lit("\x3c!-- raw HTML omitted --\x3e"):this.lit(e.literal),this.cr()}function w(e,t){t&&e.onEnter?this.lit(e.onEnter):!t&&e.onExit&&this.lit(e.onExit)}function k(e,t){this.cr(),t&&e.onEnter?this.lit(e.onEnter):!t&&e.onExit&&this.lit(e.onExit),this.cr()}function E(e){this.lit(this.esc(e,!1))}function S(e){var t=[];if(this.options.sourcepos){var n=e.sourcepos;n&&t.push(["data-sourcepos",String(n[0][0])+":"+String(n[0][1])+"-"+String(n[1][0])+":"+String(n[1][1])])}return t}var C=n(333),A=/^javascript:|vbscript:|file:|data:/i,D=/^data:image\/(?:png|gif|jpeg|webp)/i,O=function(e){return A.test(e)&&!D.test(e)};i.prototype=Object.create(C.prototype),i.prototype.text=o,i.prototype.html_inline=b,i.prototype.html_block=x,i.prototype.softbreak=a,i.prototype.linebreak=s,i.prototype.link=u,i.prototype.image=l,i.prototype.emph=c,i.prototype.strong=p,i.prototype.paragraph=f,i.prototype.heading=h,i.prototype.code=d,i.prototype.code_block=m,i.prototype.thematic_break=v,i.prototype.block_quote=g,i.prototype.list=y,i.prototype.item=_,i.prototype.custom_inline=w,i.prototype.custom_block=k,i.prototype.esc=n(73).escapeXml,i.prototype.out=E,i.prototype.tag=r,i.prototype.attrs=S,e.exports=i},function(e,t,n){"use strict";function r(e){return e.replace(/([a-z])([A-Z])/g,"$1_$2").toLowerCase()}function i(e){e=e||{},this.disableTags=0,this.lastOut="\n",this.indentLevel=0,this.indent="  ",this.options=e}function o(e){this.buffer="";var t,n,i,o,a,s,u,l,c=e.walker(),p=this.options;for(p.time&&console.time("rendering"),this.buffer+='<?xml version="1.0" encoding="UTF-8"?>\n',this.buffer+='<!DOCTYPE document SYSTEM "CommonMark.dtd">\n';i=c.next();)if(a=i.entering,o=i.node,l=o.type,s=o.isContainer,u="thematic_break"===l||"linebreak"===l||"softbreak"===l,n=r(l),a){switch(t=[],l){case"document":t.push(["xmlns","http://commonmark.org/xml/1.0"]);break;case"list":null!==o.listType&&t.push(["type",o.listType.toLowerCase()]),null!==o.listStart&&t.push(["start",String(o.listStart)]),null!==o.listTight&&t.push(["tight",o.listTight?"true":"false"]);var f=o.listDelimiter;if(null!==f){var h="";h="."===f?"period":"paren",t.push(["delimiter",h])}break;case"code_block":o.info&&t.push(["info",o.info]);break;case"heading":t.push(["level",String(o.level)]);break;case"link":case"image":t.push(["destination",o.destination]),t.push(["title",o.title]);break;case"custom_inline":case"custom_block":t.push(["on_enter",o.onEnter]),t.push(["on_exit",o.onExit])}if(p.sourcepos){var d=o.sourcepos;d&&t.push(["sourcepos",String(d[0][0])+":"+String(d[0][1])+"-"+String(d[1][0])+":"+String(d[1][1])])}if(this.cr(),this.out(this.tag(n,t,u)),s)this.indentLevel+=1;else if(!s&&!u){var m=o.literal;m&&this.out(this.esc(m)),this.out(this.tag("/"+n))}}else this.indentLevel-=1,this.cr(),this.out(this.tag("/"+n));return p.time&&console.timeEnd("rendering"),this.buffer+="\n",this.buffer}function a(e){this.disableTags>0?this.buffer+=e.replace(c,""):this.buffer+=e,this.lastOut=e}function s(){if("\n"!==this.lastOut){this.buffer+="\n",this.lastOut="\n";for(var e=this.indentLevel;e>0;e--)this.buffer+=this.indent}}function u(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+this.esc(i[1])+'"',o++;return n&&(r+=" /"),r+=">"}var l=n(333),c=/\<[^>]*\>/;i.prototype=Object.create(l.prototype),i.prototype.render=o,i.prototype.out=a,i.prototype.cr=s,i.prototype.tag=u,i.prototype.esc=n(73).escapeXml,e.exports=i},function(e,t,n){"use strict";function r(e,t){if("string"!=typeof e)throw new TypeError("argument str must be a string");for(var n={},r=t||{},i=e.split(u),s=r.decode||a,l=0;l<i.length;l++){var c=i[l],p=c.indexOf("=");if(!(p<0)){var f=c.substr(0,p).trim(),h=c.substr(++p,c.length).trim();'"'==h[0]&&(h=h.slice(1,-1)),void 0==n[f]&&(n[f]=o(h,s))}}return n}function i(e,t,n){var r=n||{},i=r.encode||s;if("function"!=typeof i)throw new TypeError("option encode is invalid");if(!l.test(e))throw new TypeError("argument name is invalid");var o=i(t);if(o&&!l.test(o))throw new TypeError("argument val is invalid");var a=e+"="+o;if(null!=r.maxAge){var u=r.maxAge-0;if(isNaN(u))throw new Error("maxAge should be a Number");a+="; Max-Age="+Math.floor(u)}if(r.domain){if(!l.test(r.domain))throw new TypeError("option domain is invalid");a+="; Domain="+r.domain}if(r.path){if(!l.test(r.path))throw new TypeError("option path is invalid");a+="; Path="+r.path}if(r.expires){if("function"!=typeof r.expires.toUTCString)throw new TypeError("option expires is invalid");a+="; Expires="+r.expires.toUTCString()}if(r.httpOnly&&(a+="; HttpOnly"),r.secure&&(a+="; Secure"),r.sameSite){switch("string"==typeof r.sameSite?r.sameSite.toLowerCase():r.sameSite){case!0:a+="; SameSite=Strict";break;case"lax":a+="; SameSite=Lax";break;case"strict":a+="; SameSite=Strict";break;default:throw new TypeError("option sameSite is invalid")}}return a}function o(e,t){try{return t(e)}catch(t){return e}}/*!
+ * cookie
+ * Copyright(c) 2012-2014 Roman Shtylman
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+t.parse=r,t.serialize=i;var a=decodeURIComponent,s=encodeURIComponent,u=/; */,l=/^[\u0009\u0020-\u007e\u0080-\u00ff]+$/},function(e,t,n){n(679),n(683),n(690),n(366),n(674),n(675),n(680),n(684),n(686),n(670),n(671),n(672),n(673),n(676),n(677),n(678),n(681),n(682),n(685),n(687),n(688),n(689),n(666),n(667),n(668),n(669),e.exports=n(63).String},function(e,t,n){n(664),n(366),n(693),n(665),n(691),n(692),e.exports=n(63).Promise},function(e,t,n){n(103),n(621),e.exports=n(15).Array.from},function(e,t,n){n(104),n(103),e.exports=n(619)},function(e,t,n){n(104),n(103),e.exports=n(620)},function(e,t,n){var r=n(15),i=r.JSON||(r.JSON={stringify:JSON.stringify});e.exports=function(e){return i.stringify.apply(i,arguments)}},function(e,t,n){n(623),e.exports=n(15).Object.assign},function(e,t,n){n(624);var r=n(15).Object;e.exports=function(e,t){return r.create(e,t)}},function(e,t,n){n(625);var r=n(15).Object;e.exports=function(e,t,n){return r.defineProperty(e,t,n)}},function(e,t,n){n(626),e.exports=n(15).Object.getPrototypeOf},function(e,t,n){n(627),e.exports=n(15).Object.keys},function(e,t,n){n(628),e.exports=n(15).Object.setPrototypeOf},function(e,t,n){n(194),n(103),n(104),n(629),n(632),n(633),e.exports=n(15).Promise},function(e,t,n){n(630),n(194),n(634),n(635),e.exports=n(15).Symbol},function(e,t,n){n(103),n(104),e.exports=n(192).f("iterator")},function(e,t,n){n(194),n(104),n(631),n(637),n(636),e.exports=n(15).WeakMap},function(e,t){e.exports=function(){}},function(e,t,n){var r=n(75),i=n(133),o=n(618);e.exports=function(e){return function(t,n,a){var s,u=r(t),l=i(u.length),c=o(a,l);if(e&&n!=n){for(;l>c;)if((s=u[c++])!=s)return!0}else for(;l>c;c++)if((e||c in u)&&u[c]===n)return e||c||0;return!e&&-1}}},function(e,t,n){var r=n(27),i=n(337),o=n(22)("species");e.exports=function(e){var t;return i(e)&&(t=e.constructor,"function"!=typeof t||t!==Array&&!i(t.prototype)||(t=void 0),r(t)&&null===(t=t[o])&&(t=void 0)),void 0===t?Array:t}},function(e,t,n){var r=n(601);e.exports=function(e,t){return new(r(e))(t)}},function(e,t,n){"use strict";var r=n(185),i=n(131).getWeak,o=n(37),a=n(27),s=n(175),u=n(129),l=n(176),c=n(55),p=n(351),f=l(5),h=l(6),d=0,m=function(e){return e._l||(e._l=new v)},v=function(){this.a=[]},g=function(e,t){return f(e.a,function(e){return e[0]===t})};v.prototype={get:function(e){var t=g(this,e);if(t)return t[1]},has:function(e){return!!g(this,e)},set:function(e,t){var n=g(this,e);n?n[1]=t:this.a.push([e,t])},delete:function(e){var t=h(this.a,function(t){return t[0]===e});return~t&&this.a.splice(t,1),!!~t}},e.exports={getConstructor:function(e,t,n,o){var l=e(function(e,r){s(e,l,t,"_i"),e._t=t,e._i=d++,e._l=void 0,void 0!=r&&u(r,n,e[o],e)});return r(l.prototype,{delete:function(e){if(!a(e))return!1;var n=i(e);return!0===n?m(p(this,t)).delete(e):n&&c(n,this._i)&&delete n[this._i]},has:function(e){if(!a(e))return!1;var n=i(e);return!0===n?m(p(this,t)).has(e):n&&c(n,this._i)}}),l},def:function(e,t,n){var r=i(o(t),!0);return!0===r?m(e).set(t,n):r[e._i]=n,e},ufstore:m}},function(e,t,n){"use strict";var r=n(24),i=n(23),o=n(131),a=n(54),s=n(56),u=n(185),l=n(129),c=n(175),p=n(27),f=n(102),h=n(41).f,d=n(176)(0),m=n(49);e.exports=function(e,t,n,v,g,y){var _=r[e],b=_,x=g?"set":"add",w=b&&b.prototype,k={};return m&&"function"==typeof b&&(y||w.forEach&&!a(function(){(new b).entries().next()}))?(b=t(function(t,n){c(t,b,e,"_c"),t._c=new _,void 0!=n&&l(n,g,t[x],t)}),d("add,clear,delete,forEach,get,has,set,keys,values,entries,toJSON".split(","),function(e){var t="add"==e||"set"==e;e in w&&(!y||"clear"!=e)&&s(b.prototype,e,function(n,r){if(c(this,b,e),!t&&y&&!p(n))return"get"==e&&void 0;var i=this._c[e](0===n?0:n,r);return t?this:i})}),y||h(b.prototype,"size",{get:function(){return this._c.size}})):(b=v.getConstructor(t,e,g,x),u(b.prototype,n),o.NEED=!0),f(b,e),k[e]=b,i(i.G+i.W+i.F,k),y||v.setStrong(b,e,g),b}},function(e,t,n){"use strict";var r=n(41),i=n(101);e.exports=function(e,t,n){t in e?r.f(e,t,i(0,n)):e[t]=n}},function(e,t,n){var r=n(100),i=n(184),o=n(132);e.exports=function(e){var t=r(e),n=i.f;if(n)for(var a,s=n(e),u=o.f,l=0;s.length>l;)u.call(e,a=s[l++])&&t.push(a);return t}},function(e,t){e.exports=function(e,t,n){var r=void 0===n;switch(t.length){case 0:return r?e():e.call(n);case 1:return r?e(t[0]):e.call(n,t[0]);case 2:return r?e(t[0],t[1]):e.call(n,t[0],t[1]);case 3:return r?e(t[0],t[1],t[2]):e.call(n,t[0],t[1],t[2]);case 4:return r?e(t[0],t[1],t[2],t[3]):e.call(n,t[0],t[1],t[2],t[3])}return e.apply(n,t)}},function(e,t,n){"use strict";var r=n(183),i=n(101),o=n(102),a={};n(56)(a,n(22)("iterator"),function(){return this}),e.exports=function(e,t,n){e.prototype=r(a,{next:i(1,n)}),o(e,t+" Iterator")}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){var r=n(24),i=n(350).set,o=r.MutationObserver||r.WebKitMutationObserver,a=r.process,s=r.Promise,u="process"==n(99)(a);e.exports=function(){var e,t,n,l=function(){var r,i;for(u&&(r=a.domain)&&r.exit();e;){i=e.fn,e=e.next;try{i()}catch(r){throw e?n():t=void 0,r}}t=void 0,r&&r.enter()};if(u)n=function(){a.nextTick(l)};else if(!o||r.navigator&&r.navigator.standalone)if(s&&s.resolve){var c=s.resolve();n=function(){c.then(l)}}else n=function(){i.call(r,l)};else{var p=!0,f=document.createTextNode("");new o(l).observe(f,{characterData:!0}),n=function(){f.data=p=!p}}return function(r){var i={fn:r,next:void 0};t&&(t.next=i),e||(e=i,n()),t=i}}},function(e,t,n){var r=n(41),i=n(37),o=n(100);e.exports=n(49)?Object.defineProperties:function(e,t){i(e);for(var n,a=o(t),s=a.length,u=0;s>u;)r.f(e,n=a[u++],t[n]);return e}},function(e,t,n){var r=n(75),i=n(343).f,o={}.toString,a="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(e){try{return i(e)}catch(e){return a.slice()}};e.exports.f=function(e){return a&&"[object Window]"==o.call(e)?s(e):i(r(e))}},function(e,t,n){"use strict";var r=n(23),i=n(98),o=n(53),a=n(129);e.exports=function(e){r(r.S,e,{from:function(e){var t,n,r,s,u=arguments[1];return i(this),t=void 0!==u,t&&i(u),void 0==e?new this:(n=[],t?(r=0,s=o(u,arguments[2],2),a(e,!1,function(e){n.push(s(e,r++))})):a(e,!1,n.push,n),new this(n))}})}},function(e,t,n){"use strict";var r=n(23);e.exports=function(e){r(r.S,e,{of:function(){for(var e=arguments.length,t=new Array(e);e--;)t[e]=arguments[e];return new this(t)}})}},function(e,t,n){var r=n(27),i=n(37),o=function(e,t){if(i(e),!r(t)&&null!==t)throw TypeError(t+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,t,r){try{r=n(53)(Function.call,n(342).f(Object.prototype,"__proto__").set,2),r(e,[]),t=!(e instanceof Array)}catch(e){t=!0}return function(e,n){return o(e,n),t?e.__proto__=n:r(e,n),e}}({},!1):void 0),check:o}},function(e,t,n){"use strict";var r=n(24),i=n(15),o=n(41),a=n(49),s=n(22)("species");e.exports=function(e){var t="function"==typeof i[e]?i[e]:r[e];a&&t&&!t[s]&&o.f(t,s,{configurable:!0,get:function(){return this}})}},function(e,t,n){var r=n(189),i=n(178);e.exports=function(e){return function(t,n){var o,a,s=String(i(t)),u=r(n),l=s.length;return u<0||u>=l?e?"":void 0:(o=s.charCodeAt(u),o<55296||o>56319||u+1===l||(a=s.charCodeAt(u+1))<56320||a>57343?e?s.charAt(u):o:e?s.slice(u,u+2):a-56320+(o-55296<<10)+65536)}}},function(e,t,n){var r=n(189),i=Math.max,o=Math.min;e.exports=function(e,t){return e=r(e),e<0?i(e+t,0):o(e,t)}},function(e,t,n){var r=n(37),i=n(193);e.exports=n(15).getIterator=function(e){var t=i(e);if("function"!=typeof t)throw TypeError(e+" is not iterable!");return r(t.call(e))}},function(e,t,n){var r=n(177),i=n(22)("iterator"),o=n(74);e.exports=n(15).isIterable=function(e){var t=Object(e);return void 0!==t[i]||"@@iterator"in t||o.hasOwnProperty(r(t))}},function(e,t,n){"use strict";var r=n(53),i=n(23),o=n(76),a=n(338),s=n(336),u=n(133),l=n(605),c=n(193);i(i.S+i.F*!n(340)(function(e){Array.from(e)}),"Array",{from:function(e){var t,n,i,p,f=o(e),h="function"==typeof this?this:Array,d=arguments.length,m=d>1?arguments[1]:void 0,v=void 0!==m,g=0,y=c(f);if(v&&(m=r(m,d>2?arguments[2]:void 0,2)),void 0==y||h==Array&&s(y))for(t=u(f.length),n=new h(t);t>g;g++)l(n,g,v?m(f[g],g):f[g]);else for(p=y.call(f),n=new h;!(i=p.next()).done;g++)l(n,g,v?a(p,m,[i.value,g],!0):i.value);return n.length=g,n}})},function(e,t,n){"use strict";var r=n(599),i=n(609),o=n(74),a=n(75);e.exports=n(339)(Array,"Array",function(e,t){this._t=a(e),this._i=0,this._k=t},function(){var e=this._t,t=this._k,n=this._i++;return!e||n>=e.length?(this._t=void 0,i(1)):"keys"==t?i(0,n):"values"==t?i(0,e[n]):i(0,[n,e[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(e,t,n){var r=n(23);r(r.S+r.F,"Object",{assign:n(341)})},function(e,t,n){var r=n(23);r(r.S,"Object",{create:n(183)})},function(e,t,n){var r=n(23);r(r.S+r.F*!n(49),"Object",{defineProperty:n(41).f})},function(e,t,n){var r=n(76),i=n(344);n(346)("getPrototypeOf",function(){return function(e){return i(r(e))}})},function(e,t,n){var r=n(76),i=n(100);n(346)("keys",function(){return function(e){return i(r(e))}})},function(e,t,n){var r=n(23);r(r.S,"Object",{setPrototypeOf:n(615).set})},function(e,t,n){"use strict";var r,i,o,a,s=n(130),u=n(24),l=n(53),c=n(177),p=n(23),f=n(27),h=n(98),d=n(175),m=n(129),v=n(349),g=n(350).set,y=n(610)(),_=n(182),b=n(347),x=n(348),w=u.TypeError,k=u.process,E=u.Promise,S="process"==c(k),C=function(){},A=i=_.f,D=!!function(){try{var e=E.resolve(1),t=(e.constructor={})[n(22)("species")]=function(e){e(C,C)};return(S||"function"==typeof PromiseRejectionEvent)&&e.then(C)instanceof t}catch(e){}}(),O=function(e){var t;return!(!f(e)||"function"!=typeof(t=e.then))&&t},M=function(e,t){if(!e._n){e._n=!0;var n=e._c;y(function(){for(var r=e._v,i=1==e._s,o=0;n.length>o;)!function(t){var n,o,a=i?t.ok:t.fail,s=t.resolve,u=t.reject,l=t.domain;try{a?(i||(2==e._h&&I(e),e._h=1),!0===a?n=r:(l&&l.enter(),n=a(r),l&&l.exit()),n===t.promise?u(w("Promise-chain cycle")):(o=O(n))?o.call(n,s,u):s(n)):u(r)}catch(e){u(e)}}(n[o++]);e._c=[],e._n=!1,t&&!e._h&&T(e)})}},T=function(e){g.call(u,function(){var t,n,r,i=e._v,o=P(e);if(o&&(t=b(function(){S?k.emit("unhandledRejection",i,e):(n=u.onunhandledrejection)?n({promise:e,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),e._h=S||P(e)?2:1),e._a=void 0,o&&t.e)throw t.v})},P=function(e){return 1!==e._h&&0===(e._a||e._c).length},I=function(e){g.call(u,function(){var t;S?k.emit("rejectionHandled",e):(t=u.onrejectionhandled)&&t({promise:e,reason:e._v})})},R=function(e){var t=this;t._d||(t._d=!0,t=t._w||t,t._v=e,t._s=2,t._a||(t._a=t._c.slice()),M(t,!0))},j=function(e){var t,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===e)throw w("Promise can't be resolved itself");(t=O(e))?y(function(){var r={_w:n,_d:!1};try{t.call(e,l(j,r,1),l(R,r,1))}catch(e){R.call(r,e)}}):(n._v=e,n._s=1,M(n,!1))}catch(e){R.call({_w:n,_d:!1},e)}}};D||(E=function(e){d(this,E,"Promise","_h"),h(e),r.call(this);try{e(l(j,this,1),l(R,this,1))}catch(e){R.call(this,e)}},r=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(185)(E.prototype,{then:function(e,t){var n=A(v(this,E));return n.ok="function"!=typeof e||e,n.fail="function"==typeof t&&t,n.domain=S?k.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&M(this,!1),n.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new r;this.promise=e,this.resolve=l(j,e,1),this.reject=l(R,e,1)},_.f=A=function(e){return e===E||e===a?new o(e):i(e)}),p(p.G+p.W+p.F*!D,{Promise:E}),n(102)(E,"Promise"),n(616)("Promise"),a=n(15).Promise,p(p.S+p.F*!D,"Promise",{reject:function(e){var t=A(this);return(0,t.reject)(e),t.promise}}),p(p.S+p.F*(s||!D),"Promise",{resolve:function(e){return x(s&&this===a?E:this,e)}}),p(p.S+p.F*!(D&&n(340)(function(e){E.all(e).catch(C)})),"Promise",{all:function(e){var t=this,n=A(t),r=n.resolve,i=n.reject,o=b(function(){var n=[],o=0,a=1;m(e,!1,function(e){var s=o++,u=!1;n.push(void 0),a++,t.resolve(e).then(function(e){u||(u=!0,n[s]=e,--a||r(n))},i)}),--a||r(n)});return o.e&&i(o.v),n.promise},race:function(e){var t=this,n=A(t),r=n.reject,i=b(function(){m(e,!1,function(e){t.resolve(e).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(e,t,n){"use strict";var r=n(24),i=n(55),o=n(49),a=n(23),s=n(186),u=n(131).KEY,l=n(54),c=n(188),p=n(102),f=n(134),h=n(22),d=n(192),m=n(191),v=n(606),g=n(337),y=n(37),_=n(27),b=n(75),x=n(190),w=n(101),k=n(183),E=n(612),S=n(342),C=n(41),A=n(100),D=S.f,O=C.f,M=E.f,T=r.Symbol,P=r.JSON,I=P&&P.stringify,R=h("_hidden"),j=h("toPrimitive"),F={}.propertyIsEnumerable,N=c("symbol-registry"),B=c("symbols"),L=c("op-symbols"),q=Object.prototype,z="function"==typeof T,U=r.QObject,W=!U||!U.prototype||!U.prototype.findChild,V=o&&l(function(){return 7!=k(O({},"a",{get:function(){return O(this,"a",{value:7}).a}})).a})?function(e,t,n){var r=D(q,t);r&&delete q[t],O(e,t,n),r&&e!==q&&O(q,t,r)}:O,H=function(e){var t=B[e]=k(T.prototype);return t._k=e,t},G=z&&"symbol"==typeof T.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof T},J=function(e,t,n){return e===q&&J(L,t,n),y(e),t=x(t,!0),y(n),i(B,t)?(n.enumerable?(i(e,R)&&e[R][t]&&(e[R][t]=!1),n=k(n,{enumerable:w(0,!1)})):(i(e,R)||O(e,R,w(1,{})),e[R][t]=!0),V(e,t,n)):O(e,t,n)},K=function(e,t){y(e);for(var n,r=v(t=b(t)),i=0,o=r.length;o>i;)J(e,n=r[i++],t[n]);return e},X=function(e,t){return void 0===t?k(e):K(k(e),t)},Y=function(e){var t=F.call(this,e=x(e,!0));return!(this===q&&i(B,e)&&!i(L,e))&&(!(t||!i(this,e)||!i(B,e)||i(this,R)&&this[R][e])||t)},$=function(e,t){if(e=b(e),t=x(t,!0),e!==q||!i(B,t)||i(L,t)){var n=D(e,t);return!n||!i(B,t)||i(e,R)&&e[R][t]||(n.enumerable=!0),n}},Z=function(e){for(var t,n=M(b(e)),r=[],o=0;n.length>o;)i(B,t=n[o++])||t==R||t==u||r.push(t);return r},Q=function(e){for(var t,n=e===q,r=M(n?L:b(e)),o=[],a=0;r.length>a;)!i(B,t=r[a++])||n&&!i(q,t)||o.push(B[t]);return o};z||(T=function(){if(this instanceof T)throw TypeError("Symbol is not a constructor!");var e=f(arguments.length>0?arguments[0]:void 0),t=function(n){this===q&&t.call(L,n),i(this,R)&&i(this[R],e)&&(this[R][e]=!1),V(this,e,w(1,n))};return o&&W&&V(q,e,{configurable:!0,set:t}),H(e)},s(T.prototype,"toString",function(){return this._k}),S.f=$,C.f=J,n(343).f=E.f=Z,n(132).f=Y,n(184).f=Q,o&&!n(130)&&s(q,"propertyIsEnumerable",Y,!0),d.f=function(e){return H(h(e))}),a(a.G+a.W+a.F*!z,{Symbol:T});for(var ee="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),te=0;ee.length>te;)h(ee[te++]);for(var ne=A(h.store),re=0;ne.length>re;)m(ne[re++]);a(a.S+a.F*!z,"Symbol",{for:function(e){return i(N,e+="")?N[e]:N[e]=T(e)},keyFor:function(e){if(!G(e))throw TypeError(e+" is not a symbol!");for(var t in N)if(N[t]===e)return t},useSetter:function(){W=!0},useSimple:function(){W=!1}}),a(a.S+a.F*!z,"Object",{create:X,defineProperty:J,defineProperties:K,getOwnPropertyDescriptor:$,getOwnPropertyNames:Z,getOwnPropertySymbols:Q}),P&&a(a.S+a.F*(!z||l(function(){var e=T();return"[null]"!=I([e])||"{}"!=I({a:e})||"{}"!=I(Object(e))})),"JSON",{stringify:function(e){for(var t,n,r=[e],i=1;arguments.length>i;)r.push(arguments[i++]);if(n=t=r[1],(_(t)||void 0!==e)&&!G(e))return g(t)||(t=function(e,t){if("function"==typeof n&&(t=n.call(this,e,t)),!G(t))return t}),r[1]=t,I.apply(P,r)}}),T.prototype[j]||n(56)(T.prototype,j,T.prototype.valueOf),p(T,"Symbol"),p(Math,"Math",!0),p(r.JSON,"JSON",!0)},function(e,t,n){"use strict";var r,i=n(176)(0),o=n(186),a=n(131),s=n(341),u=n(603),l=n(27),c=n(54),p=n(351),f=a.getWeak,h=Object.isExtensible,d=u.ufstore,m={},v=function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}},g={get:function(e){if(l(e)){var t=f(e);return!0===t?d(p(this,"WeakMap")).get(e):t?t[this._i]:void 0}},set:function(e,t){return u.def(p(this,"WeakMap"),e,t)}},y=e.exports=n(604)("WeakMap",v,g,u,!0,!0);c(function(){return 7!=(new y).set((Object.freeze||Object)(m),7).get(m)})&&(r=u.getConstructor(v,"WeakMap"),s(r.prototype,g),a.NEED=!0,i(["delete","has","get","set"],function(e){var t=y.prototype,n=t[e];o(t,e,function(t,i){if(l(t)&&!h(t)){this._f||(this._f=new r);var o=this._f[e](t,i);return"set"==e?this:o}return n.call(this,t,i)})}))},function(e,t,n){"use strict";var r=n(23),i=n(15),o=n(24),a=n(349),s=n(348);r(r.P+r.R,"Promise",{finally:function(e){var t=a(this,i.Promise||o.Promise),n="function"==typeof e;return this.then(n?function(n){return s(t,e()).then(function(){return n})}:e,n?function(n){return s(t,e()).then(function(){throw n})}:e)}})},function(e,t,n){"use strict";var r=n(23),i=n(182),o=n(347);r(r.S,"Promise",{try:function(e){var t=i.f(this),n=o(e);return(n.e?t.reject:t.resolve)(n.v),t.promise}})},function(e,t,n){n(191)("asyncIterator")},function(e,t,n){n(191)("observable")},function(e,t,n){n(613)("WeakMap")},function(e,t,n){n(614)("WeakMap")},function(e,t,n){var r=n(19)("unscopables"),i=Array.prototype;void 0==i[r]&&n(64)(i,r,{}),e.exports=function(e){i[r][e]=!0}},function(e,t){e.exports=function(e,t,n,r){if(!(e instanceof t)||void 0!==r&&r in e)throw TypeError(n+": incorrect invocation!");return e}},function(e,t,n){var r=n(140),i=n(110),o=n(365);e.exports=function(e){return function(t,n,a){var s,u=r(t),l=i(u.length),c=o(a,l);if(e&&n!=n){for(;l>c;)if((s=u[c++])!=s)return!0}else for(;l>c;c++)if((e||c in u)&&u[c]===n)return e||c||0;return!e&&-1}}},function(e,t,n){var r=n(136),i=n(646),o=n(645),a=n(62),s=n(110),u=n(662),l={},c={},t=e.exports=function(e,t,n,p,f){var h,d,m,v,g=f?function(){return e}:u(e),y=r(n,p,t?2:1),_=0;if("function"!=typeof g)throw TypeError(e+" is not iterable!");if(o(g)){for(h=s(e.length);h>_;_++)if((v=t?y(a(d=e[_])[0],d[1]):y(e[_]))===l||v===c)return v}else for(m=g.call(e);!(d=m.next()).done;)if((v=i(m,y,d.value,t))===l||v===c)return v};t.BREAK=l,t.RETURN=c},function(e,t,n){e.exports=!n(106)&&!n(107)(function(){return 7!=Object.defineProperty(n(196)("div"),"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e,t,n){var r=void 0===n;switch(t.length){case 0:return r?e():e.call(n);case 1:return r?e(t[0]):e.call(n,t[0]);case 2:return r?e(t[0],t[1]):e.call(n,t[0],t[1]);case 3:return r?e(t[0],t[1],t[2]):e.call(n,t[0],t[1],t[2]);case 4:return r?e(t[0],t[1],t[2],t[3]):e.call(n,t[0],t[1],t[2],t[3])}return e.apply(n,t)}},function(e,t,n){var r=n(105);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,t,n){var r=n(109),i=n(19)("iterator"),o=Array.prototype;e.exports=function(e){return void 0!==e&&(r.Array===e||o[i]===e)}},function(e,t,n){var r=n(62);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(t){var o=e.return;throw void 0!==o&&r(o.call(e)),t}}},function(e,t,n){"use strict";var r=n(651),i=n(360),o=n(199),a={};n(64)(a,n(19)("iterator"),function(){return this}),e.exports=function(e,t,n){e.prototype=r(a,{next:i(1,n)}),o(e,t+" Iterator")}},function(e,t,n){var r=n(19)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(e){}e.exports=function(e,t){if(!t&&!i)return!1;var n=!1;try{var o=[7],a=o[r]();a.next=function(){return{done:n=!0}},o[r]=function(){return a},e(o)}catch(e){}return n}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){var r=n(31),i=n(364).set,o=r.MutationObserver||r.WebKitMutationObserver,a=r.process,s=r.Promise,u="process"==n(105)(a);e.exports=function(){var e,t,n,l=function(){var r,i;for(u&&(r=a.domain)&&r.exit();e;){i=e.fn,e=e.next;try{i()}catch(r){throw e?n():t=void 0,r}}t=void 0,r&&r.enter()};if(u)n=function(){a.nextTick(l)};else if(!o||r.navigator&&r.navigator.standalone)if(s&&s.resolve){var c=s.resolve();n=function(){c.then(l)}}else n=function(){i.call(r,l)};else{var p=!0,f=document.createTextNode("");new o(l).observe(f,{characterData:!0}),n=function(){f.data=p=!p}}return function(r){var i={fn:r,next:void 0};t&&(t.next=i),e||(e=i,n()),t=i}}},function(e,t,n){var r=n(62),i=n(652),o=n(352),a=n(200)("IE_PROTO"),s=function(){},u=function(){var e,t=n(196)("iframe"),r=o.length;for(t.style.display="none",n(353).appendChild(t),t.src="javascript:",e=t.contentWindow.document,e.open(),e.write("<script>document.F=Object<\/script>"),e.close(),u=e.F;r--;)delete u.prototype[o[r]];return u()};e.exports=Object.create||function(e,t){var n;return null!==e?(s.prototype=r(e),n=new s,s.prototype=null,n[a]=e):n=u(),void 0===t?n:i(n,t)}},function(e,t,n){var r=n(138),i=n(62),o=n(357);e.exports=n(106)?Object.defineProperties:function(e,t){i(e);for(var n,a=o(t),s=a.length,u=0;s>u;)r.f(e,n=a[u++],t[n]);return e}},function(e,t,n){var r=n(108),i=n(660),o=n(200)("IE_PROTO"),a=Object.prototype;e.exports=Object.getPrototypeOf||function(e){return e=i(e),r(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?a:null}},function(e,t,n){var r=n(108),i=n(140),o=n(640)(!1),a=n(200)("IE_PROTO");e.exports=function(e,t){var n,s=i(e),u=0,l=[];for(n in s)n!=a&&r(s,n)&&l.push(n);for(;t.length>u;)r(s,n=t[u++])&&(~o(l,n)||l.push(n));return l}},function(e,t,n){var r=n(78);e.exports=function(e,t,n){for(var i in t)r(e,i,t[i],n);return e}},function(e,t,n){"use strict";var r=n(31),i=n(138),o=n(106),a=n(19)("species");e.exports=function(e){var t=r[e];o&&t&&!t[a]&&i.f(t,a,{configurable:!0,get:function(){return this}})}},function(e,t,n){"use strict";var r=n(139),i=n(57);e.exports=function(e){var t=String(i(this)),n="",o=r(e);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(t+=t))1&o&&(n+=t);return n}},function(e,t,n){var r=n(28),i=n(57),o=n(107),a=n(659),s="["+a+"]",u="​…",l=RegExp("^"+s+s+"*"),c=RegExp(s+s+"*$"),p=function(e,t,n){var i={},s=o(function(){return!!a[e]()||u[e]()!=u}),l=i[e]=s?t(f):a[e];n&&(i[n]=l),r(r.P+r.F*s,"String",i)},f=p.trim=function(e,t){return e=String(i(e)),1&t&&(e=e.replace(l,"")),2&t&&(e=e.replace(c,"")),e};e.exports=p},function(e,t){e.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(e,t,n){var r=n(57);e.exports=function(e){return Object(r(e))}},function(e,t,n){var r=n(77);e.exports=function(e,t){if(!r(e))return e;var n,i;if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i;if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(195),i=n(19)("iterator"),o=n(109);e.exports=n(63).getIteratorMethod=function(e){if(void 0!=e)return e[i]||e["@@iterator"]||o[r(e)]}},function(e,t,n){"use strict";var r=n(638),i=n(649),o=n(109),a=n(140);e.exports=n(355)(Array,"Array",function(e,t){this._t=a(e),this._i=0,this._k=t},function(){var e=this._t,t=this._k,n=this._i++;return!e||n>=e.length?(this._t=void 0,i(1)):"keys"==t?i(0,n):"values"==t?i(0,e[n]):i(0,[n,e[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(e,t,n){"use strict";var r=n(195),i={};i[n(19)("toStringTag")]="z",i+""!="[object z]"&&n(78)(Object.prototype,"toString",function(){return"[object "+r(this)+"]"},!0)},function(e,t,n){"use strict";var r,i,o,a,s=n(356),u=n(31),l=n(136),c=n(195),p=n(28),f=n(77),h=n(135),d=n(639),m=n(641),v=n(362),g=n(364).set,y=n(650)(),_=n(198),b=n(358),x=n(359),w=u.TypeError,k=u.process,E=u.Promise,S="process"==c(k),C=function(){},A=i=_.f,D=!!function(){try{var e=E.resolve(1),t=(e.constructor={})[n(19)("species")]=function(e){e(C,C)};return(S||"function"==typeof PromiseRejectionEvent)&&e.then(C)instanceof t}catch(e){}}(),O=function(e){var t;return!(!f(e)||"function"!=typeof(t=e.then))&&t},M=function(e,t){if(!e._n){e._n=!0;var n=e._c;y(function(){for(var r=e._v,i=1==e._s,o=0;n.length>o;)!function(t){var n,o,a=i?t.ok:t.fail,s=t.resolve,u=t.reject,l=t.domain;try{a?(i||(2==e._h&&I(e),e._h=1),!0===a?n=r:(l&&l.enter(),n=a(r),l&&l.exit()),n===t.promise?u(w("Promise-chain cycle")):(o=O(n))?o.call(n,s,u):s(n)):u(r)}catch(e){u(e)}}(n[o++]);e._c=[],e._n=!1,t&&!e._h&&T(e)})}},T=function(e){g.call(u,function(){var t,n,r,i=e._v,o=P(e);if(o&&(t=b(function(){S?k.emit("unhandledRejection",i,e):(n=u.onunhandledrejection)?n({promise:e,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),e._h=S||P(e)?2:1),e._a=void 0,o&&t.e)throw t.v})},P=function(e){return 1!==e._h&&0===(e._a||e._c).length},I=function(e){g.call(u,function(){var t;S?k.emit("rejectionHandled",e):(t=u.onrejectionhandled)&&t({promise:e,reason:e._v})})},R=function(e){var t=this;t._d||(t._d=!0,t=t._w||t,t._v=e,t._s=2,t._a||(t._a=t._c.slice()),M(t,!0))},j=function(e){var t,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===e)throw w("Promise can't be resolved itself");(t=O(e))?y(function(){var r={_w:n,_d:!1};try{t.call(e,l(j,r,1),l(R,r,1))}catch(e){R.call(r,e)}}):(n._v=e,n._s=1,M(n,!1))}catch(e){R.call({_w:n,_d:!1},e)}}};D||(E=function(e){d(this,E,"Promise","_h"),h(e),r.call(this);try{e(l(j,this,1),l(R,this,1))}catch(e){R.call(this,e)}},r=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(655)(E.prototype,{then:function(e,t){var n=A(v(this,E));return n.ok="function"!=typeof e||e,n.fail="function"==typeof t&&t,n.domain=S?k.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&M(this,!1),n.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new r;this.promise=e,this.resolve=l(j,e,1),this.reject=l(R,e,1)},_.f=A=function(e){return e===E||e===a?new o(e):i(e)}),p(p.G+p.W+p.F*!D,{Promise:E}),n(199)(E,"Promise"),n(656)("Promise"),a=n(63).Promise,p(p.S+p.F*!D,"Promise",{reject:function(e){var t=A(this);return(0,t.reject)(e),t.promise}}),p(p.S+p.F*(s||!D),"Promise",{resolve:function(e){return x(s&&this===a?E:this,e)}}),p(p.S+p.F*!(D&&n(648)(function(e){E.all(e).catch(C)})),"Promise",{all:function(e){var t=this,n=A(t),r=n.resolve,i=n.reject,o=b(function(){var n=[],o=0,a=1;m(e,!1,function(e){var s=o++,u=!1;n.push(void 0),a++,t.resolve(e).then(function(e){u||(u=!0,n[s]=e,--a||r(n))},i)}),--a||r(n)});return o.e&&i(o.v),n.promise},race:function(e){var t=this,n=A(t),r=n.reject,i=b(function(){m(e,!1,function(e){t.resolve(e).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(e,t,n){n(137)("match",1,function(e,t,n){return[function(n){"use strict";var r=e(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,r):new RegExp(n)[t](String(r))},n]})},function(e,t,n){n(137)("replace",2,function(e,t,n){return[function(r,i){"use strict";var o=e(this),a=void 0==r?void 0:r[t];return void 0!==a?a.call(r,o,i):n.call(String(o),r,i)},n]})},function(e,t,n){n(137)("search",1,function(e,t,n){return[function(n){"use strict";var r=e(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,r):new RegExp(n)[t](String(r))},n]})},function(e,t,n){n(137)("split",2,function(e,t,r){"use strict";var i=n(354),o=r,a=[].push,s="length";if("c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[s]||2!="ab".split(/(?:ab)*/)[s]||4!=".".split(/(.?)(.?)/)[s]||".".split(/()()/)[s]>1||"".split(/.?/)[s]){var u=void 0===/()??/.exec("")[1];r=function(e,t){var n=String(this);if(void 0===e&&0===t)return[];if(!i(e))return o.call(n,e,t);var r,l,c,p,f,h=[],d=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),m=0,v=void 0===t?4294967295:t>>>0,g=new RegExp(e.source,d+"g");for(u||(r=new RegExp("^"+g.source+"$(?!\\s)",d));(l=g.exec(n))&&!((c=l.index+l[0][s])>m&&(h.push(n.slice(m,l.index)),!u&&l[s]>1&&l[0].replace(r,function(){for(f=1;f<arguments[s]-2;f++)void 0===arguments[f]&&(l[f]=void 0)}),l[s]>1&&l.index<n[s]&&a.apply(h,l.slice(1)),p=l[0][s],m=c,h[s]>=v));)g.lastIndex===l.index&&g.lastIndex++;return m===n[s]?!p&&g.test("")||h.push(""):h.push(n.slice(m)),h[s]>v?h.slice(0,v):h}}else"0".split(void 0,0)[s]&&(r=function(e,t){return void 0===e&&0===t?[]:o.call(this,e,t)});return[function(n,i){var o=e(this),a=void 0==n?void 0:n[t];return void 0!==a?a.call(n,o,i):r.call(String(o),n,i)},r]})},function(e,t,n){"use strict";n(29)("anchor",function(e){return function(t){return e(this,"a","name",t)}})},function(e,t,n){"use strict";n(29)("big",function(e){return function(){return e(this,"big","","")}})},function(e,t,n){"use strict";n(29)("blink",function(e){return function(){return e(this,"blink","","")}})},function(e,t,n){"use strict";n(29)("bold",function(e){return function(){return e(this,"b","","")}})},function(e,t,n){"use strict";var r=n(28),i=n(363)(!1);r(r.P,"String",{codePointAt:function(e){return i(this,e)}})},function(e,t,n){"use strict";var r=n(28),i=n(110),o=n(201),a="".endsWith;r(r.P+r.F*n(197)("endsWith"),"String",{endsWith:function(e){var t=o(this,e,"endsWith"),n=arguments.length>1?arguments[1]:void 0,r=i(t.length),s=void 0===n?r:Math.min(i(n),r),u=String(e);return a?a.call(t,u,s):t.slice(s-u.length,s)===u}})},function(e,t,n){"use strict";n(29)("fixed",function(e){return function(){return e(this,"tt","","")}})},function(e,t,n){"use strict";n(29)("fontcolor",function(e){return function(t){return e(this,"font","color",t)}})},function(e,t,n){"use strict";n(29)("fontsize",function(e){return function(t){return e(this,"font","size",t)}})},function(e,t,n){var r=n(28),i=n(365),o=String.fromCharCode,a=String.fromCodePoint;r(r.S+r.F*(!!a&&1!=a.length),"String",{fromCodePoint:function(e){for(var t,n=[],r=arguments.length,a=0;r>a;){if(t=+arguments[a++],i(t,1114111)!==t)throw RangeError(t+" is not a valid code point");n.push(t<65536?o(t):o(55296+((t-=65536)>>10),t%1024+56320))}return n.join("")}})},function(e,t,n){"use strict";var r=n(28),i=n(201);r(r.P+r.F*n(197)("includes"),"String",{includes:function(e){return!!~i(this,e,"includes").indexOf(e,arguments.length>1?arguments[1]:void 0)}})},function(e,t,n){"use strict";n(29)("italics",function(e){return function(){return e(this,"i","","")}})},function(e,t,n){"use strict";n(29)("link",function(e){return function(t){return e(this,"a","href",t)}})},function(e,t,n){var r=n(28),i=n(140),o=n(110);r(r.S,"String",{raw:function(e){for(var t=i(e.raw),n=o(t.length),r=arguments.length,a=[],s=0;n>s;)a.push(String(t[s++])),s<r&&a.push(String(arguments[s]));return a.join("")}})},function(e,t,n){var r=n(28);r(r.P,"String",{repeat:n(657)})},function(e,t,n){"use strict";n(29)("small",function(e){return function(){return e(this,"small","","")}})},function(e,t,n){"use strict";var r=n(28),i=n(110),o=n(201),a="".startsWith;r(r.P+r.F*n(197)("startsWith"),"String",{startsWith:function(e){var t=o(this,e,"startsWith"),n=i(Math.min(arguments.length>1?arguments[1]:void 0,t.length)),r=String(e);return a?a.call(t,r,n):t.slice(n,n+r.length)===r}})},function(e,t,n){"use strict";n(29)("strike",function(e){return function(){return e(this,"strike","","")}})},function(e,t,n){"use strict";n(29)("sub",function(e){return function(){return e(this,"sub","","")}})},function(e,t,n){"use strict";n(29)("sup",function(e){return function(){return e(this,"sup","","")}})},function(e,t,n){"use strict";n(658)("trim",function(e){return function(){return e(this,3)}})},function(e,t,n){"use strict";var r=n(28),i=n(63),o=n(31),a=n(362),s=n(359);r(r.P+r.R,"Promise",{finally:function(e){var t=a(this,i.Promise||o.Promise),n="function"==typeof e;return this.then(n?function(n){return s(t,e()).then(function(){return n})}:e,n?function(n){return s(t,e()).then(function(){throw n})}:e)}})},function(e,t,n){"use strict";var r=n(28),i=n(198),o=n(358);r(r.S,"Promise",{try:function(e){var t=i.f(this),n=o(e);return(n.e?t.reject:t.resolve)(n.v),t.promise}})},function(e,t,n){for(var r=n(663),i=n(357),o=n(78),a=n(31),s=n(64),u=n(109),l=n(19),c=l("iterator"),p=l("toStringTag"),f=u.Array,h={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},d=i(h),m=0;m<d.length;m++){var v,g=d[m],y=h[g],_=a[g],b=_&&_.prototype;if(b&&(b[c]||s(b,c,f),b[p]||s(b,p,g),u[g]=f,y))for(v in r)b[v]||o(b,v,r[v],!0)}},function(e,t,n){"use strict";function r(e){return e}function i(e,t,n){function i(e,t){var n=y.hasOwnProperty(t)?y[t]:null;w.hasOwnProperty(t)&&s("OVERRIDE_BASE"===n,"ReactClassInterface: You are attempting to override `%s` from your class specification. Ensure that your method names do not overlap with React methods.",t),e&&s("DEFINE_MANY"===n||"DEFINE_MANY_MERGED"===n,"ReactClassInterface: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",t)}function l(e,n){if(n){s("function"!=typeof n,"ReactClass: You're attempting to use a component class or function as a mixin. Instead, just use a regular object."),s(!t(n),"ReactClass: You're attempting to use a component as a mixin. Instead, just use a regular object.");var r=e.prototype,o=r.__reactAutoBindPairs;n.hasOwnProperty(u)&&_.mixins(e,n.mixins);for(var a in n)if(n.hasOwnProperty(a)&&a!==u){var l=n[a],c=r.hasOwnProperty(a);if(i(c,a),_.hasOwnProperty(a))_[a](e,l);else{var p=y.hasOwnProperty(a),d="function"==typeof l,m=d&&!p&&!c&&!1!==n.autobind;if(m)o.push(a,l),r[a]=l;else if(c){var v=y[a];s(p&&("DEFINE_MANY_MERGED"===v||"DEFINE_MANY"===v),"ReactClass: Unexpected spec policy %s for key %s when mixing in component specs.",v,a),"DEFINE_MANY_MERGED"===v?r[a]=f(r[a],l):"DEFINE_MANY"===v&&(r[a]=h(r[a],l))}else r[a]=l}}}else;}function c(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var i=n in _;s(!i,'ReactClass: You are attempting to define a reserved property, `%s`, that shouldn\'t be on the "statics" key. Define it as an instance property instead; it will still be accessible on the constructor.',n);var o=n in e;s(!o,"ReactClass: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",n),e[n]=r}}}function p(e,t){s(e&&t&&"object"==typeof e&&"object"==typeof t,"mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.");for(var n in t)t.hasOwnProperty(n)&&(s(void 0===e[n],"mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the same key: `%s`. This conflict may be due to a mixin; in particular, this may be caused by two getInitialState() or getDefaultProps() methods returning objects with clashing keys.",n),e[n]=t[n]);return e}function f(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var i={};return p(i,n),p(i,r),i}}function h(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function d(e,t){var n=t.bind(e);return n}function m(e){for(var t=e.__reactAutoBindPairs,n=0;n<t.length;n+=2){var r=t[n],i=t[n+1];e[r]=d(e,i)}}function v(e){var t=r(function(e,r,i){this.__reactAutoBindPairs.length&&m(this),this.props=e,this.context=r,this.refs=a,this.updater=i||n,this.state=null;var o=this.getInitialState?this.getInitialState():null;s("object"==typeof o&&!Array.isArray(o),"%s.getInitialState(): must return an object or null",t.displayName||"ReactCompositeComponent"),this.state=o});t.prototype=new k,t.prototype.constructor=t,t.prototype.__reactAutoBindPairs=[],g.forEach(l.bind(null,t)),l(t,b),l(t,e),l(t,x),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),s(t.prototype.render,"createClass(...): Class specification must implement a `render` method.");for(var i in y)t.prototype[i]||(t.prototype[i]=null);return t}var g=[],y={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},_={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)l(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=o({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=o({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=f(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=o({},e.propTypes,t)},statics:function(e,t){c(e,t)},autobind:function(){}},b={componentDidMount:function(){this.__isMounted=!0}},x={componentWillUnmount:function(){this.__isMounted=!1}},w={replaceState:function(e,t){this.updater.enqueueReplaceState(this,e,t)},isMounted:function(){return!!this.__isMounted}},k=function(){};return o(k.prototype,e.prototype,w),v}var o=n(13),a=n(144),s=n(8),u="mixins";e.exports=i},function(e,t){!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function i(e){this.map={},e instanceof i?e.forEach(function(e,t){this.append(t,e)},this):Array.isArray(e)?e.forEach(function(e){this.append(e[0],e[1])},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function o(e){if(e.bodyUsed)return Promise.reject(new TypeError("Already read"));e.bodyUsed=!0}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&_(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!b(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?o(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(d)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return x.indexOf(t)>-1?t:e}function h(e,t){var n=(t=t||{}).body;if(e instanceof h){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new i(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new i(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function d(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),i=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(i))}}),t}function m(e){var t=new i;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var i=n.join(":").trim();t.append(r,i)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new i(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],_=function(e){return e&&DataView.prototype.isPrototypeOf(e)},b=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};i.prototype.append=function(e,r){e=t(e),r=n(r);var i=this.map[e];this.map[e]=i?i+","+r:r},i.prototype.delete=function(e){delete this.map[t(e)]},i.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},i.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},i.prototype.set=function(e,r){this.map[t(e)]=n(r)},i.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},i.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},i.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},i.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(i.prototype[Symbol.iterator]=i.prototype.entries);var x=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];h.prototype.clone=function(){return new h(this,{body:this._bodyInit})},p.call(h.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new i(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(-1===w.indexOf(t))throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=i,e.Request=h,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var i=new h(e,t),o=new XMLHttpRequest;o.onload=function(){var e={status:o.status,statusText:o.statusText,headers:m(o.getAllResponseHeaders()||"")};e.url="responseURL"in o?o.responseURL:e.headers.get("X-Request-URL");var t="response"in o?o.response:o.responseText;n(new v(t,e))},o.onerror=function(){r(new TypeError("Network request failed"))},o.ontimeout=function(){r(new TypeError("Network request failed"))},o.open(i.method,i.url,!0),"include"===i.credentials&&(o.withCredentials=!0),"responseType"in o&&g.blob&&(o.responseType="blob"),i.headers.forEach(function(e,t){o.setRequestHeader(t,e)}),o.send(void 0===i._bodyInit?null:i._bodyInit)})},e.fetch.polyfill=!0}}("undefined"!=typeof self?self:this)},function(e,t){var n={};!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function i(e){this.map={},e instanceof i?e.forEach(function(e,t){this.append(t,e)},this):Array.isArray(e)?e.forEach(function(e){this.append(e[0],e[1])},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function o(e){if(e.bodyUsed)return Promise.reject(new TypeError("Already read"));e.bodyUsed=!0}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&_(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!b(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?o(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=o(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(d)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return x.indexOf(t)>-1?t:e}function h(e,t){var n=(t=t||{}).body;if(e instanceof h){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new i(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new i(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function d(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),i=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(i))}}),t}function m(e){var t=new i;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var i=n.join(":").trim();t.append(r,i)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new i(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],_=function(e){return e&&DataView.prototype.isPrototypeOf(e)},b=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};i.prototype.append=function(e,r){e=t(e),r=n(r);var i=this.map[e];this.map[e]=i?i+","+r:r},i.prototype.delete=function(e){delete this.map[t(e)]},i.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},i.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},i.prototype.set=function(e,r){this.map[t(e)]=n(r)},i.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},i.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},i.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},i.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(i.prototype[Symbol.iterator]=i.prototype.entries);var x=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];h.prototype.clone=function(){return new h(this,{body:this._bodyInit})},p.call(h.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new i(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(-1===w.indexOf(t))throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=i,e.Request=h,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var i=new h(e,t),o=new XMLHttpRequest;o.onload=function(){var e={status:o.status,statusText:o.statusText,headers:m(o.getAllResponseHeaders()||"")};e.url="responseURL"in o?o.responseURL:e.headers.get("X-Request-URL");var t="response"in o?o.response:o.responseText;n(new v(t,e))},o.onerror=function(){r(new TypeError("Network request failed"))},o.ontimeout=function(){r(new TypeError("Network request failed"))},o.open(i.method,i.url,!0),"include"===i.credentials&&(o.withCredentials=!0),"responseType"in o&&g.blob&&(o.responseType="blob"),i.headers.forEach(function(e,t){o.setRequestHeader(t,e)}),o.send(void 0===i._bodyInit?null:i._bodyInit)})},e.fetch.polyfill=!0}}(void 0!==n?n:this),e.exports=n},function(e,t,n){(function(t){!function(t,n){e.exports=n(t)}(void 0!==t?t:this,function(e){if(e.CSS&&e.CSS.escape)return e.CSS.escape;var t=function(e){if(0==arguments.length)throw new TypeError("`CSS.escape` requires an argument.");for(var t,n=String(e),r=n.length,i=-1,o="",a=n.charCodeAt(0);++i<r;)t=n.charCodeAt(i),o+=0!=t?t>=1&&t<=31||127==t||0==i&&t>=48&&t<=57||1==i&&t>=48&&t<=57&&45==a?"\\"+t.toString(16)+" ":(0!=i||1!=r||45!=t)&&(t>=128||45==t||95==t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122)?n.charAt(i):"\\"+n.charAt(i):"�";return o};return e.CSS||(e.CSS={}),e.CSS.escape=t,t})}).call(t,n(17))},function(e,t,n){function r(e,t){if(e){var n,r="";for(var i in e)n=e[i],r&&(r+=" "),!n&&p[i]?r+=i:r+=i+'="'+(t.decodeEntities?c.encodeXML(n):n)+'"';return r}}function i(e,t){"svg"===e.name&&(t={decodeEntities:t.decodeEntities,xmlMode:!0});var n="<"+e.name,i=r(e.attribs,t);return i&&(n+=" "+i),!t.xmlMode||e.children&&0!==e.children.length?(n+=">",e.children&&(n+=d(e.children,t)),h[e.name]&&!t.xmlMode||(n+="</"+e.name+">")):n+="/>",n}function o(e){return"<"+e.data+">"}function a(e,t){var n=e.data||"";return!t.decodeEntities||e.parent&&e.parent.name in f||(n=c.encodeXML(n)),n}function s(e){return"<![CDATA["+e.children[0].data+"]]>"}function u(e){return"\x3c!--"+e.data+"--\x3e"}var l=n(699),c=n(114),p={__proto__:null,allowfullscreen:!0,async:!0,autofocus:!0,autoplay:!0,checked:!0,controls:!0,default:!0,defer:!0,disabled:!0,hidden:!0,ismap:!0,loop:!0,multiple:!0,muted:!0,open:!0,readonly:!0,required:!0,reversed:!0,scoped:!0,seamless:!0,selected:!0,typemustmatch:!0},f={__proto__:null,style:!0,script:!0,xmp:!0,iframe:!0,noembed:!0,noframes:!0,plaintext:!0,noscript:!0},h={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},d=e.exports=function(e,t){Array.isArray(e)||e.cheerio||(e=[e]),t=t||{};for(var n="",r=0;r<e.length;r++){var c=e[r];"root"===c.type?n+=d(c.children,t):l.isTag(c)?n+=i(c,t):c.type===l.Directive?n+=o(c):c.type===l.Comment?n+=u(c):c.type===l.CDATA?n+=s(c):n+=a(c,t)}return n}},function(e,t){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},function(e,t,n){function r(e,t,n){"object"==typeof e?(n=t,t=e,e=null):"function"==typeof t&&(n=t,t=u),this._callback=e,this._options=t||u,this._elementCB=n,this.dom=[],this._done=!1,this._tagStack=[],this._parser=this._parser||null}var i=n(113),o=/\s+/g,a=n(368),s=n(701),u={normalizeWhitespace:!1,withStartIndices:!1,withEndIndices:!1};r.prototype.onparserinit=function(e){this._parser=e},r.prototype.onreset=function(){r.call(this,this._callback,this._options,this._elementCB)},r.prototype.onend=function(){this._done||(this._done=!0,this._parser=null,this._handleCallback(null))},r.prototype._handleCallback=r.prototype.onerror=function(e){if("function"==typeof this._callback)this._callback(e,this.dom);else if(e)throw e},r.prototype.onclosetag=function(){var e=this._tagStack.pop();this._options.withEndIndices&&(e.endIndex=this._parser.endIndex),this._elementCB&&this._elementCB(e)},r.prototype._createDomElement=function(e){if(!this._options.withDomLvl1)return e;var t;t="tag"===e.type?Object.create(s):Object.create(a);for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},r.prototype._addDomElement=function(e){var t=this._tagStack[this._tagStack.length-1],n=t?t.children:this.dom,r=n[n.length-1];e.next=null,this._options.withStartIndices&&(e.startIndex=this._parser.startIndex),this._options.withEndIndices&&(e.endIndex=this._parser.endIndex),r?(e.prev=r,r.next=e):e.prev=null,n.push(e),e.parent=t||null},r.prototype.onopentag=function(e,t){var n={type:"script"===e?i.Script:"style"===e?i.Style:i.Tag,name:e,attribs:t,children:[]},r=this._createDomElement(n);this._addDomElement(r),this._tagStack.push(r)},r.prototype.ontext=function(e){var t,n=this._options.normalizeWhitespace||this._options.ignoreWhitespace;if(!this._tagStack.length&&this.dom.length&&(t=this.dom[this.dom.length-1]).type===i.Text)n?t.data=(t.data+e).replace(o," "):t.data+=e;else if(this._tagStack.length&&(t=this._tagStack[this._tagStack.length-1])&&(t=t.children[t.children.length-1])&&t.type===i.Text)n?t.data=(t.data+e).replace(o," "):t.data+=e;else{n&&(e=e.replace(o," "));var r=this._createDomElement({data:e,type:i.Text});this._addDomElement(r)}},r.prototype.oncomment=function(e){var t=this._tagStack[this._tagStack.length-1];if(t&&t.type===i.Comment)return void(t.data+=e);var n={data:e,type:i.Comment},r=this._createDomElement(n);this._addDomElement(r),this._tagStack.push(r)},r.prototype.oncdatastart=function(){var e={children:[{data:"",type:i.Text}],type:i.CDATA},t=this._createDomElement(e);this._addDomElement(t),this._tagStack.push(t)},r.prototype.oncommentend=r.prototype.oncdataend=function(){this._tagStack.pop()},r.prototype.onprocessinginstruction=function(e,t){var n=this._createDomElement({name:e,data:t,type:i.Directive});this._addDomElement(n)},e.exports=r},function(e,t,n){var r=n(368),i=e.exports=Object.create(r),o={tagName:"name"};Object.keys(o).forEach(function(e){var t=o[e];Object.defineProperty(i,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},function(e,t,n){var r=e.exports;[n(707),n(708),n(705),n(706),n(704),n(703)].forEach(function(e){Object.keys(e).forEach(function(t){r[t]=e[t].bind(r)})})},function(e,t){t.removeSubsets=function(e){for(var t,n,r,i=e.length;--i>-1;){for(t=n=e[i],e[i]=null,r=!0;n;){if(e.indexOf(n)>-1){r=!1,e.splice(i,1);break}n=n.parent}r&&(e[i]=t)}return e};var n={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16},r=t.compareDocumentPosition=function(e,t){var r,i,o,a,s,u,l=[],c=[];if(e===t)return 0;for(r=e;r;)l.unshift(r),r=r.parent;for(r=t;r;)c.unshift(r),r=r.parent;for(u=0;l[u]===c[u];)u++;return 0===u?n.DISCONNECTED:(i=l[u-1],o=i.children,a=l[u],s=c[u],o.indexOf(a)>o.indexOf(s)?i===t?n.FOLLOWING|n.CONTAINED_BY:n.FOLLOWING:i===e?n.PRECEDING|n.CONTAINS:n.PRECEDING)};t.uniqueSort=function(e){var t,i,o=e.length;for(e=e.slice();--o>-1;)t=e[o],(i=e.indexOf(t))>-1&&i<o&&e.splice(o,1);return e.sort(function(e,t){var i=r(e,t);return i&n.PRECEDING?-1:i&n.FOLLOWING?1:0}),e}},function(e,t,n){function r(e,t){return"function"==typeof t?function(n){return n.attribs&&t(n.attribs[e])}:function(n){return n.attribs&&n.attribs[e]===t}}function i(e,t){return function(n){return e(n)||t(n)}}var o=n(113),a=t.isTag=o.isTag;t.testElement=function(e,t){for(var n in e)if(e.hasOwnProperty(n)){if("tag_name"===n){if(!a(t)||!e.tag_name(t.name))return!1}else if("tag_type"===n){if(!e.tag_type(t.type))return!1}else if("tag_contains"===n){if(a(t)||!e.tag_contains(t.data))return!1}else if(!t.attribs||!e[n](t.attribs[n]))return!1}else;return!0};var s={tag_name:function(e){return"function"==typeof e?function(t){return a(t)&&e(t.name)}:"*"===e?a:function(t){return a(t)&&t.name===e}},tag_type:function(e){return"function"==typeof e?function(t){return e(t.type)}:function(t){return t.type===e}},tag_contains:function(e){return"function"==typeof e?function(t){return!a(t)&&e(t.data)}:function(t){return!a(t)&&t.data===e}}};t.getElements=function(e,t,n,o){var a=Object.keys(e).map(function(t){var n=e[t];return t in s?s[t](n):r(t,n)});return 0===a.length?[]:this.filter(a.reduce(i),t,n,o)},t.getElementById=function(e,t,n){return Array.isArray(t)||(t=[t]),this.findOne(r("id",e),t,!1!==n)},t.getElementsByTagName=function(e,t,n,r){return this.filter(s.tag_name(e),t,n,r)},t.getElementsByTagType=function(e,t,n,r){return this.filter(s.tag_type(e),t,n,r)}},function(e,t){t.removeElement=function(e){if(e.prev&&(e.prev.next=e.next),e.next&&(e.next.prev=e.prev),e.parent){var t=e.parent.children;t.splice(t.lastIndexOf(e),1)}},t.replaceElement=function(e,t){var n=t.prev=e.prev;n&&(n.next=t);var r=t.next=e.next;r&&(r.prev=t);var i=t.parent=e.parent;if(i){var o=i.children;o[o.lastIndexOf(e)]=t}},t.appendChild=function(e,t){if(t.parent=e,1!==e.children.push(t)){var n=e.children[e.children.length-2];n.next=t,t.prev=n,t.next=null}},t.append=function(e,t){var n=e.parent,r=e.next;if(t.next=r,t.prev=e,e.next=t,t.parent=n,r){if(r.prev=t,n){var i=n.children;i.splice(i.lastIndexOf(r),0,t)}}else n&&n.children.push(t)},t.prepend=function(e,t){var n=e.parent;if(n){var r=n.children;r.splice(r.lastIndexOf(e),0,t)}e.prev&&(e.prev.next=t),t.parent=n,t.prev=e.prev,t.next=e,e.prev=t}},function(e,t,n){function r(e,t,n,r){return Array.isArray(t)||(t=[t]),"number"==typeof r&&isFinite(r)||(r=1/0),i(e,t,!1!==n,r)}function i(e,t,n,r){for(var o,a=[],s=0,u=t.length;s<u&&!(e(t[s])&&(a.push(t[s]),--r<=0))&&(o=t[s].children,!(n&&o&&o.length>0&&(o=i(e,o,n,r),a=a.concat(o),(r-=o.length)<=0)));s++);return a}function o(e,t){for(var n=0,r=t.length;n<r;n++)if(e(t[n]))return t[n];return null}function a(e,t){for(var n=null,r=0,i=t.length;r<i&&!n;r++)l(t[r])&&(e(t[r])?n=t[r]:t[r].children.length>0&&(n=a(e,t[r].children)));return n}function s(e,t){for(var n=0,r=t.length;n<r;n++)if(l(t[n])&&(e(t[n])||t[n].children.length>0&&s(e,t[n].children)))return!0;return!1}function u(e,t){for(var n=[],r=[t];r.length;){for(var i=r.pop(),o=0,a=i.length;o<a;o++)l(i[o])&&e(i[o])&&n.push(i[o]);for(;a-- >0;)i[a].children&&i[a].children.length>0&&r.push(i[a].children)}return n}var l=n(113).isTag;e.exports={filter:r,find:i,findOneChild:o,findOne:a,existsOne:s,findAll:u}},function(e,t,n){function r(e,t){return e.children?e.children.map(function(e){return a(e,t)}).join(""):""}function i(e){return Array.isArray(e)?e.map(i).join(""):s(e)?"br"===e.name?"\n":i(e.children):e.type===o.CDATA?i(e.children):e.type===o.Text?e.data:""}var o=n(113),a=n(698),s=o.isTag;e.exports={getInnerHTML:r,getOuterHTML:a,getText:i}},function(e,t){var n=t.getChildren=function(e){return e.children},r=t.getParent=function(e){return e.parent};t.getSiblings=function(e){var t=r(e);return t?n(t):[e]},t.getAttributeValue=function(e,t){return e.attribs&&e.attribs[t]},t.hasAttrib=function(e,t){return!!e.attribs&&hasOwnProperty.call(e.attribs,t)},t.getName=function(e){return e.name}},function(e,t,n){"use strict";var r=function(e){return encodeURIComponent(e).replace(/[!'()*]/g,function(e){return"%"+e.charCodeAt(0).toString(16).toUpperCase()})};e.exports=r},function(e,t,n){function r(e){var t=Object.keys(e).join("|"),n=o(e);t+="|#[xX][\\da-fA-F]+|#\\d+";var r=new RegExp("&(?:"+t+");","g");return function(e){return String(e).replace(r,n)}}function i(e,t){return e<t?1:-1}function o(e){return function(t){return"#"===t.charAt(1)?l("X"===t.charAt(2)||"x"===t.charAt(2)?parseInt(t.substr(3),16):parseInt(t.substr(2),10)):e[t.slice(1,-1)]}}var a=n(204),s=n(370),u=n(205),l=n(369),c=r(u),p=r(a),f=function(){function e(e){return";"!==e.substr(-1)&&(e+=";"),c(e)}for(var t=Object.keys(s).sort(i),n=Object.keys(a).sort(i),r=0,u=0;r<n.length;r++)t[u]===n[r]?(n[r]+=";?",u++):n[r]+=";";var l=new RegExp("&(?:"+n.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),c=o(a);return function(t){return String(t).replace(l,e)}}();e.exports={XML:c,HTML:f,HTMLStrict:p}},function(e,t,n){function r(e){return Object.keys(e).sort().reduce(function(t,n){return t[e[n]]="&"+n+";",t},{})}function i(e){var t=[],n=[];return Object.keys(e).forEach(function(e){1===e.length?t.push("\\"+e):n.push(e)}),n.unshift("["+t.join("")+"]"),new RegExp(n.join("|"),"g")}function o(e){return"&#x"+e.charCodeAt(0).toString(16).toUpperCase()+";"}function a(e){return"&#x"+(1024*(e.charCodeAt(0)-55296)+e.charCodeAt(1)-56320+65536).toString(16).toUpperCase()+";"}function s(e,t){function n(t){return e[t]}return function(e){return e.replace(t,n).replace(d,a).replace(h,o)}}function u(e){return e.replace(m,o).replace(d,a).replace(h,o)}var l=r(n(205)),c=i(l);t.XML=s(l,c);var p=r(n(204)),f=i(p);t.HTML=s(p,f);var h=/[^\0-\x7F]/g,d=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,m=i(l);t.escape=u},function(e,t){e.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},function(e,t,n){"use strict";e.exports=function(){var e,t,n=Array.from;return"function"==typeof n&&(e=["raz","dwa"],t=n(e),Boolean(t&&t!==e&&"dwa"===t[1]))}},function(e,t,n){"use strict";var r=n(738).iterator,i=n(717),o=n(718),a=n(65),s=n(58),u=n(115),l=n(79),c=n(737),p=Array.isArray,f=Function.prototype.call,h={configurable:!0,enumerable:!0,writable:!0,value:null},d=Object.defineProperty;e.exports=function(e){var t,n,m,v,g,y,_,b,x,w,k=arguments[1],E=arguments[2];if(e=Object(u(e)),l(k)&&s(k),this&&this!==Array&&o(this))t=this;else{if(!k){if(i(e))return 1!==(g=e.length)?Array.apply(null,e):(v=new Array(1),v[0]=e[0],v);if(p(e)){for(v=new Array(g=e.length),n=0;n<g;++n)v[n]=e[n];return v}}v=[]}if(!p(e))if(void 0!==(x=e[r])){for(_=s(x).call(e),t&&(v=new t),b=_.next(),n=0;!b.done;)w=k?f.call(k,E,b.value,n):b.value,t?(h.value=w,d(v,n,h)):v[n]=w,b=_.next(),++n;g=n}else if(c(e)){for(g=e.length,t&&(v=new t),n=0,m=0;n<g;++n)w=e[n],n+1<g&&(y=w.charCodeAt(0))>=55296&&y<=56319&&(w+=e[++n]),w=k?f.call(k,E,w,m):w,t?(h.value=w,d(v,m,h)):v[m]=w,++m;g=m}if(void 0===g)for(g=a(e.length),t&&(v=new t(g)),n=0;n<g;++n)w=k?f.call(k,E,e[n],n):e[n],t?(h.value=w,d(v,n,h)):v[n]=w;return t&&(h.value=null,v.length=g),v}},function(e,t,n){"use strict";var r=n(207),i=Array.isArray;e.exports=function(e){return i(e)?e:r(e)}},function(e,t,n){"use strict";var r=n(373),i=n(730),o=n(79),a=Error.captureStackTrace;t=e.exports=function(e){var n=new Error(e),s=arguments[1],u=arguments[2];return o(u)||i(s)&&(u=s,s=null),o(u)&&r(n,u),o(s)&&(n.code=s),a&&a(n,t),n}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call(function(){return arguments}());e.exports=function(e){return r.call(e)===i}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call(n(372));e.exports=function(e){return"function"==typeof e&&r.call(e)===i}},function(e,t,n){"use strict";e.exports=n(720)()?Math.sign:n(721)},function(e,t,n){"use strict";e.exports=function(){var e=Math.sign;return"function"==typeof e&&(1===e(10)&&-1===e(-20))}},function(e,t,n){"use strict";e.exports=function(e){return e=Number(e),isNaN(e)||0===e?e:e>0?1:-1}},function(e,t,n){"use strict";e.exports=n(723)()?Number.isNaN:n(724)},function(e,t,n){"use strict";e.exports=function(){var e=Number.isNaN;return"function"==typeof e&&(!e({})&&e(NaN)&&!e(34))}},function(e,t,n){"use strict";e.exports=function(e){return e!==e}},function(e,t,n){"use strict";var r=n(719),i=Math.abs,o=Math.floor;e.exports=function(e){return isNaN(e)?0:(e=Number(e),0!==e&&isFinite(e)?r(e)*o(i(e)):e)}},function(e,t,n){"use strict";var r=n(58),i=n(115),o=Function.prototype.bind,a=Function.prototype.call,s=Object.keys,u=Object.prototype.propertyIsEnumerable;e.exports=function(e,t){return function(n,l){var c,p=arguments[2],f=arguments[3];return n=Object(i(n)),r(l),c=s(n),f&&c.sort("function"==typeof f?o.call(f,n):void 0),"function"!=typeof e&&(e=c[e]),a.call(e,c,function(e,r){return u.call(n,e)?a.call(l,p,n[e],e,n,r):t})}}},function(e,t,n){"use strict";e.exports=function(){var e,t=Object.assign;return"function"==typeof t&&(e={foo:"raz"},t(e,{bar:"dwa"},{trzy:"trzy"}),e.foo+e.bar+e.trzy==="razdwatrzy")}},function(e,t,n){"use strict";var r=n(731),i=n(115),o=Math.max;e.exports=function(e,t){var n,a,s,u=o(arguments.length,2);for(e=Object(i(e)),s=function(r){try{e[r]=t[r]}catch(e){n||(n=e)}},a=1;a<u;++a)t=arguments[a],r(t).forEach(s);if(void 0!==n)throw n;return e}},function(e,t,n){"use strict";e.exports=function(e){return"function"==typeof e}},function(e,t,n){"use strict";var r=n(79),i={function:!0,object:!0};e.exports=function(e){return r(e)&&i[typeof e]||!1}},function(e,t,n){"use strict";e.exports=n(732)()?Object.keys:n(733)},function(e,t,n){"use strict";e.exports=function(){try{return Object.keys("primitive"),!0}catch(e){return!1}}},function(e,t,n){"use strict";var r=n(79),i=Object.keys;e.exports=function(e){return i(r(e)?Object(e):e)}},function(e,t,n){"use strict";e.exports=n(735)()?String.prototype.contains:n(736)},function(e,t,n){"use strict";var r="razdwatrzy";e.exports=function(){return"function"==typeof r.contains&&(!0===r.contains("dwa")&&!1===r.contains("foo"))}},function(e,t,n){"use strict";var r=String.prototype.indexOf;e.exports=function(e){return r.call(this,e,arguments[1])>-1}},function(e,t,n){"use strict";var r=Object.prototype.toString,i=r.call("");e.exports=function(e){return"string"==typeof e||e&&"object"==typeof e&&(e instanceof String||r.call(e)===i)||!1}},function(e,t,n){"use strict";e.exports=n(739)()?Symbol:n(741)},function(e,t,n){"use strict";var r={object:!0,symbol:!0};e.exports=function(){var e;if("function"!=typeof Symbol)return!1;e=Symbol("test symbol");try{String(e)}catch(e){return!1}return!!r[typeof Symbol.iterator]&&(!!r[typeof Symbol.toPrimitive]&&!!r[typeof Symbol.toStringTag])}},function(e,t,n){"use strict";e.exports=function(e){return!!e&&("symbol"==typeof e||!!e.constructor&&("Symbol"===e.constructor.name&&"Symbol"===e[e.constructor.toStringTag]))}},function(e,t,n){"use strict";var r,i,o,a,s=n(141),u=n(742),l=Object.create,c=Object.defineProperties,p=Object.defineProperty,f=Object.prototype,h=l(null);if("function"==typeof Symbol){r=Symbol;try{String(r()),a=!0}catch(e){}}var d=function(){var e=l(null);return function(t){for(var n,r,i=0;e[t+(i||"")];)++i;return t+=i||"",e[t]=!0,n="@@"+t,p(f,n,s.gs(null,function(e){r||(r=!0,p(this,n,s(e)),r=!1)})),n}}();o=function(e){if(this instanceof o)throw new TypeError("Symbol is not a constructor");return i(e)},e.exports=i=function e(t){var n;if(this instanceof e)throw new TypeError("Symbol is not a constructor");return a?r(t):(n=l(o.prototype),t=void 0===t?"":String(t),c(n,{__description__:s("",t),__name__:s("",d(t))}))},c(i,{for:s(function(e){return h[e]?h[e]:h[e]=i(String(e))}),keyFor:s(function(e){var t;u(e);for(t in h)if(h[t]===e)return t}),hasInstance:s("",r&&r.hasInstance||i("hasInstance")),isConcatSpreadable:s("",r&&r.isConcatSpreadable||i("isConcatSpreadable")),iterator:s("",r&&r.iterator||i("iterator")),match:s("",r&&r.match||i("match")),replace:s("",r&&r.replace||i("replace")),search:s("",r&&r.search||i("search")),species:s("",r&&r.species||i("species")),split:s("",r&&r.split||i("split")),toPrimitive:s("",r&&r.toPrimitive||i("toPrimitive")),toStringTag:s("",r&&r.toStringTag||i("toStringTag")),unscopables:s("",r&&r.unscopables||i("unscopables"))}),c(o.prototype,{constructor:s(i),toString:s("",function(){return this.__name__})}),c(i.prototype,{toString:s(function(){return"Symbol ("+u(this).__description__+")"}),valueOf:s(function(){return u(this)})}),p(i.prototype,i.toPrimitive,s("",function(){var e=u(this);return"symbol"==typeof e?e:e.toString()})),p(i.prototype,i.toStringTag,s("c","Symbol")),p(o.prototype,i.toStringTag,s("c",i.prototype[i.toStringTag])),p(o.prototype,i.toPrimitive,s("c",i.prototype[i.toPrimitive]))},function(e,t,n){"use strict";var r=n(740);e.exports=function(e){if(!r(e))throw new TypeError(e+" is not a symbol");return e}},function(e,t,n){!function(t,n){e.exports=n()}(0,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return e[r].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function r(e,t,n){var r=null,i=function(e,t){n&&n(e,t),r&&r.visit(e,t)},o="function"==typeof n?i:null,a=!1;if(t){a="boolean"==typeof t.comment&&t.comment;var c="boolean"==typeof t.attachComment&&t.attachComment;(a||c)&&(r=new s.CommentHandler,r.attach=c,t.comment=!0,o=i)}var p=!1;t&&"string"==typeof t.sourceType&&(p="module"===t.sourceType);var f;f=t&&"boolean"==typeof t.jsx&&t.jsx?new u.JSXParser(e,t,o):new l.Parser(e,t,o);var h=p?f.parseModule():f.parseScript(),d=h;return a&&r&&(d.comments=r.comments),f.config.tokens&&(d.tokens=f.tokens),f.config.tolerant&&(d.errors=f.errorHandler.errors),d}function i(e,t,n){var i=t||{};return i.sourceType="module",r(e,i,n)}function o(e,t,n){var i=t||{};return i.sourceType="script",r(e,i,n)}function a(e,t,n){var r,i=new c.Tokenizer(e,t);r=[];try{for(;;){var o=i.getNextToken();if(!o)break;n&&(o=n(o)),r.push(o)}}catch(e){i.errorHandler.tolerate(e)}return i.errorHandler.tolerant&&(r.errors=i.errors()),r}Object.defineProperty(t,"__esModule",{value:!0});var s=n(1),u=n(3),l=n(8),c=n(15);t.parse=r,t.parseModule=i,t.parseScript=o,t.tokenize=a;var p=n(2);t.Syntax=p.Syntax,t.version="4.0.0"},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(){function e(){this.attach=!1,this.comments=[],this.stack=[],this.leading=[],this.trailing=[]}return e.prototype.insertInnerComments=function(e,t){if(e.type===r.Syntax.BlockStatement&&0===e.body.length){for(var n=[],i=this.leading.length-1;i>=0;--i){var o=this.leading[i];t.end.offset>=o.start&&(n.unshift(o.comment),this.leading.splice(i,1),this.trailing.splice(i,1))}n.length&&(e.innerComments=n)}},e.prototype.findTrailingComments=function(e){var t=[];if(this.trailing.length>0){for(var n=this.trailing.length-1;n>=0;--n){var r=this.trailing[n];r.start>=e.end.offset&&t.unshift(r.comment)}return this.trailing.length=0,t}var i=this.stack[this.stack.length-1];if(i&&i.node.trailingComments){var o=i.node.trailingComments[0];o&&o.range[0]>=e.end.offset&&(t=i.node.trailingComments,delete i.node.trailingComments)}return t},e.prototype.findLeadingComments=function(e){for(var t,n=[];this.stack.length>0;){var r=this.stack[this.stack.length-1];if(!(r&&r.start>=e.start.offset))break;t=r.node,this.stack.pop()}if(t){for(var i=t.leadingComments?t.leadingComments.length:0,o=i-1;o>=0;--o){var a=t.leadingComments[o];a.range[1]<=e.start.offset&&(n.unshift(a),t.leadingComments.splice(o,1))}return t.leadingComments&&0===t.leadingComments.length&&delete t.leadingComments,n}for(var o=this.leading.length-1;o>=0;--o){var r=this.leading[o];r.start<=e.start.offset&&(n.unshift(r.comment),this.leading.splice(o,1))}return n},e.prototype.visitNode=function(e,t){if(!(e.type===r.Syntax.Program&&e.body.length>0)){this.insertInnerComments(e,t);var n=this.findTrailingComments(t),i=this.findLeadingComments(t);i.length>0&&(e.leadingComments=i),n.length>0&&(e.trailingComments=n),this.stack.push({node:e,start:t.start.offset})}},e.prototype.visitComment=function(e,t){var n="L"===e.type[0]?"Line":"Block",r={type:n,value:e.value};if(e.range&&(r.range=e.range),e.loc&&(r.loc=e.loc),this.comments.push(r),this.attach){var i={comment:{type:n,value:e.value,range:[t.start.offset,t.end.offset]},start:t.start.offset};e.loc&&(i.comment.loc=e.loc),e.type=n,this.leading.push(i),this.trailing.push(i)}},e.prototype.visit=function(e,t){"LineComment"===e.type?this.visitComment(e,t):"BlockComment"===e.type?this.visitComment(e,t):this.attach&&this.visitNode(e,t)},e}();t.CommentHandler=i},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Syntax={AssignmentExpression:"AssignmentExpression",AssignmentPattern:"AssignmentPattern",ArrayExpression:"ArrayExpression",ArrayPattern:"ArrayPattern",ArrowFunctionExpression:"ArrowFunctionExpression",AwaitExpression:"AwaitExpression",BlockStatement:"BlockStatement",BinaryExpression:"BinaryExpression",BreakStatement:"BreakStatement",CallExpression:"CallExpression",CatchClause:"CatchClause",ClassBody:"ClassBody",ClassDeclaration:"ClassDeclaration",ClassExpression:"ClassExpression",ConditionalExpression:"ConditionalExpression",ContinueStatement:"ContinueStatement",DoWhileStatement:"DoWhileStatement",DebuggerStatement:"DebuggerStatement",EmptyStatement:"EmptyStatement",ExportAllDeclaration:"ExportAllDeclaration",ExportDefaultDeclaration:"ExportDefaultDeclaration",ExportNamedDeclaration:"ExportNamedDeclaration",ExportSpecifier:"ExportSpecifier",ExpressionStatement:"ExpressionStatement",ForStatement:"ForStatement",ForOfStatement:"ForOfStatement",ForInStatement:"ForInStatement",FunctionDeclaration:"FunctionDeclaration",FunctionExpression:"FunctionExpression",Identifier:"Identifier",IfStatement:"IfStatement",ImportDeclaration:"ImportDeclaration",ImportDefaultSpecifier:"ImportDefaultSpecifier",ImportNamespaceSpecifier:"ImportNamespaceSpecifier",ImportSpecifier:"ImportSpecifier",Literal:"Literal",LabeledStatement:"LabeledStatement",LogicalExpression:"LogicalExpression",MemberExpression:"MemberExpression",MetaProperty:"MetaProperty",MethodDefinition:"MethodDefinition",NewExpression:"NewExpression",ObjectExpression:"ObjectExpression",ObjectPattern:"ObjectPattern",Program:"Program",Property:"Property",RestElement:"RestElement",ReturnStatement:"ReturnStatement",SequenceExpression:"SequenceExpression",SpreadElement:"SpreadElement",Super:"Super",SwitchCase:"SwitchCase",SwitchStatement:"SwitchStatement",TaggedTemplateExpression:"TaggedTemplateExpression",TemplateElement:"TemplateElement",TemplateLiteral:"TemplateLiteral",ThisExpression:"ThisExpression",ThrowStatement:"ThrowStatement",TryStatement:"TryStatement",UnaryExpression:"UnaryExpression",UpdateExpression:"UpdateExpression",VariableDeclaration:"VariableDeclaration",VariableDeclarator:"VariableDeclarator",WhileStatement:"WhileStatement",WithStatement:"WithStatement",YieldExpression:"YieldExpression"}},function(e,t,n){"use strict";function r(e){var t;switch(e.type){case s.JSXSyntax.JSXIdentifier:t=e.name;break;case s.JSXSyntax.JSXNamespacedName:var n=e;t=r(n.namespace)+":"+r(n.name);break;case s.JSXSyntax.JSXMemberExpression:var i=e;t=r(i.object)+"."+r(i.property)}return t}var i=this&&this.__extends||function(){var e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(t,"__esModule",{value:!0});var o=n(4),a=n(5),s=n(6),u=n(7),l=n(8),c=n(13),p=n(14);c.TokenName[100]="JSXIdentifier",c.TokenName[101]="JSXText";var f=function(e){function t(t,n,r){return e.call(this,t,n,r)||this}return i(t,e),t.prototype.parsePrimaryExpression=function(){return this.match("<")?this.parseJSXRoot():e.prototype.parsePrimaryExpression.call(this)},t.prototype.startJSX=function(){this.scanner.index=this.startMarker.index,this.scanner.lineNumber=this.startMarker.line,this.scanner.lineStart=this.startMarker.index-this.startMarker.column},t.prototype.finishJSX=function(){this.nextToken()},t.prototype.reenterJSX=function(){this.startJSX(),this.expectJSX("}"),this.config.tokens&&this.tokens.pop()},t.prototype.createJSXNode=function(){return this.collectComments(),{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},t.prototype.createJSXChildNode=function(){return{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},t.prototype.scanXHTMLEntity=function(e){for(var t="&",n=!0,r=!1,i=!1,a=!1;!this.scanner.eof()&&n&&!r;){var s=this.scanner.source[this.scanner.index];if(s===e)break;if(r=";"===s,t+=s,++this.scanner.index,!r)switch(t.length){case 2:i="#"===s;break;case 3:i&&(a="x"===s,n=a||o.Character.isDecimalDigit(s.charCodeAt(0)),i=i&&!a);break;default:n=n&&!(i&&!o.Character.isDecimalDigit(s.charCodeAt(0))),n=n&&!(a&&!o.Character.isHexDigit(s.charCodeAt(0)))}}if(n&&r&&t.length>2){var u=t.substr(1,t.length-2);i&&u.length>1?t=String.fromCharCode(parseInt(u.substr(1),10)):a&&u.length>2?t=String.fromCharCode(parseInt("0"+u.substr(1),16)):i||a||!p.XHTMLEntities[u]||(t=p.XHTMLEntities[u])}return t},t.prototype.lexJSX=function(){var e=this.scanner.source.charCodeAt(this.scanner.index);if(60===e||62===e||47===e||58===e||61===e||123===e||125===e){var t=this.scanner.source[this.scanner.index++];return{type:7,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index-1,end:this.scanner.index}}if(34===e||39===e){for(var n=this.scanner.index,r=this.scanner.source[this.scanner.index++],i="";!this.scanner.eof();){var a=this.scanner.source[this.scanner.index++];if(a===r)break;i+="&"===a?this.scanXHTMLEntity(r):a}return{type:8,value:i,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(46===e){var s=this.scanner.source.charCodeAt(this.scanner.index+1),u=this.scanner.source.charCodeAt(this.scanner.index+2),t=46===s&&46===u?"...":".",n=this.scanner.index;return this.scanner.index+=t.length,{type:7,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(96===e)return{type:10,value:"",lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index,end:this.scanner.index};if(o.Character.isIdentifierStart(e)&&92!==e){var n=this.scanner.index;for(++this.scanner.index;!this.scanner.eof();){var a=this.scanner.source.charCodeAt(this.scanner.index);if(o.Character.isIdentifierPart(a)&&92!==a)++this.scanner.index;else{if(45!==a)break;++this.scanner.index}}return{type:100,value:this.scanner.source.slice(n,this.scanner.index),lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}return this.scanner.lex()},t.prototype.nextJSXToken=function(){this.collectComments(),this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;var e=this.lexJSX();return this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.config.tokens&&this.tokens.push(this.convertToken(e)),e},t.prototype.nextJSXText=function(){this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;for(var e=this.scanner.index,t="";!this.scanner.eof();){var n=this.scanner.source[this.scanner.index];if("{"===n||"<"===n)break;++this.scanner.index,t+=n,o.Character.isLineTerminator(n.charCodeAt(0))&&(++this.scanner.lineNumber,"\r"===n&&"\n"===this.scanner.source[this.scanner.index]&&++this.scanner.index,this.scanner.lineStart=this.scanner.index)}this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart;var r={type:101,value:t,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:e,end:this.scanner.index};return t.length>0&&this.config.tokens&&this.tokens.push(this.convertToken(r)),r},t.prototype.peekJSXToken=function(){var e=this.scanner.saveState();this.scanner.scanComments();var t=this.lexJSX();return this.scanner.restoreState(e),t},t.prototype.expectJSX=function(e){var t=this.nextJSXToken();7===t.type&&t.value===e||this.throwUnexpectedToken(t)},t.prototype.matchJSX=function(e){var t=this.peekJSXToken();return 7===t.type&&t.value===e},t.prototype.parseJSXIdentifier=function(){var e=this.createJSXNode(),t=this.nextJSXToken();return 100!==t.type&&this.throwUnexpectedToken(t),this.finalize(e,new a.JSXIdentifier(t.value))},t.prototype.parseJSXElementName=function(){var e=this.createJSXNode(),t=this.parseJSXIdentifier();if(this.matchJSX(":")){var n=t;this.expectJSX(":");var r=this.parseJSXIdentifier();t=this.finalize(e,new a.JSXNamespacedName(n,r))}else if(this.matchJSX("."))for(;this.matchJSX(".");){var i=t;this.expectJSX(".");var o=this.parseJSXIdentifier();t=this.finalize(e,new a.JSXMemberExpression(i,o))}return t},t.prototype.parseJSXAttributeName=function(){var e,t=this.createJSXNode(),n=this.parseJSXIdentifier();if(this.matchJSX(":")){var r=n;this.expectJSX(":");var i=this.parseJSXIdentifier();e=this.finalize(t,new a.JSXNamespacedName(r,i))}else e=n;return e},t.prototype.parseJSXStringLiteralAttribute=function(){var e=this.createJSXNode(),t=this.nextJSXToken();8!==t.type&&this.throwUnexpectedToken(t);var n=this.getTokenRaw(t);return this.finalize(e,new u.Literal(t.value,n))},t.prototype.parseJSXExpressionAttribute=function(){var e=this.createJSXNode();this.expectJSX("{"),this.finishJSX(),this.match("}")&&this.tolerateError("JSX attributes must only be assigned a non-empty expression");var t=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(e,new a.JSXExpressionContainer(t))},t.prototype.parseJSXAttributeValue=function(){return this.matchJSX("{")?this.parseJSXExpressionAttribute():this.matchJSX("<")?this.parseJSXElement():this.parseJSXStringLiteralAttribute()},t.prototype.parseJSXNameValueAttribute=function(){var e=this.createJSXNode(),t=this.parseJSXAttributeName(),n=null;return this.matchJSX("=")&&(this.expectJSX("="),n=this.parseJSXAttributeValue()),this.finalize(e,new a.JSXAttribute(t,n))},t.prototype.parseJSXSpreadAttribute=function(){var e=this.createJSXNode();this.expectJSX("{"),this.expectJSX("..."),this.finishJSX();var t=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(e,new a.JSXSpreadAttribute(t))},t.prototype.parseJSXAttributes=function(){for(var e=[];!this.matchJSX("/")&&!this.matchJSX(">");){var t=this.matchJSX("{")?this.parseJSXSpreadAttribute():this.parseJSXNameValueAttribute();e.push(t)}return e},t.prototype.parseJSXOpeningElement=function(){var e=this.createJSXNode();this.expectJSX("<");var t=this.parseJSXElementName(),n=this.parseJSXAttributes(),r=this.matchJSX("/");return r&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(e,new a.JSXOpeningElement(t,r,n))},t.prototype.parseJSXBoundaryElement=function(){var e=this.createJSXNode();if(this.expectJSX("<"),this.matchJSX("/")){this.expectJSX("/");var t=this.parseJSXElementName();return this.expectJSX(">"),this.finalize(e,new a.JSXClosingElement(t))}var n=this.parseJSXElementName(),r=this.parseJSXAttributes(),i=this.matchJSX("/");return i&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(e,new a.JSXOpeningElement(n,i,r))},t.prototype.parseJSXEmptyExpression=function(){var e=this.createJSXChildNode();return this.collectComments(),this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.finalize(e,new a.JSXEmptyExpression)},t.prototype.parseJSXExpressionContainer=function(){var e=this.createJSXNode();this.expectJSX("{");var t;return this.matchJSX("}")?(t=this.parseJSXEmptyExpression(),this.expectJSX("}")):(this.finishJSX(),t=this.parseAssignmentExpression(),this.reenterJSX()),this.finalize(e,new a.JSXExpressionContainer(t))},t.prototype.parseJSXChildren=function(){for(var e=[];!this.scanner.eof();){var t=this.createJSXChildNode(),n=this.nextJSXText();if(n.start<n.end){var r=this.getTokenRaw(n),i=this.finalize(t,new a.JSXText(n.value,r));e.push(i)}if("{"!==this.scanner.source[this.scanner.index])break;var o=this.parseJSXExpressionContainer();e.push(o)}return e},t.prototype.parseComplexJSXElement=function(e){for(var t=[];!this.scanner.eof();){e.children=e.children.concat(this.parseJSXChildren());var n=this.createJSXChildNode(),i=this.parseJSXBoundaryElement();if(i.type===s.JSXSyntax.JSXOpeningElement){var o=i;if(o.selfClosing){var u=this.finalize(n,new a.JSXElement(o,[],null));e.children.push(u)}else t.push(e),e={node:n,opening:o,closing:null,children:[]}}if(i.type===s.JSXSyntax.JSXClosingElement){e.closing=i;var l=r(e.opening.name);if(l!==r(e.closing.name)&&this.tolerateError("Expected corresponding JSX closing tag for %0",l),!(t.length>0))break;var u=this.finalize(e.node,new a.JSXElement(e.opening,e.children,e.closing));e=t[t.length-1],e.children.push(u),t.pop()}}return e},t.prototype.parseJSXElement=function(){var e=this.createJSXNode(),t=this.parseJSXOpeningElement(),n=[],r=null;if(!t.selfClosing){var i=this.parseComplexJSXElement({node:e,opening:t,closing:r,children:n});n=i.children,r=i.closing}return this.finalize(e,new a.JSXElement(t,n,r))},t.prototype.parseJSXRoot=function(){this.config.tokens&&this.tokens.pop(),this.startJSX();var e=this.parseJSXElement();return this.finishJSX(),e},t.prototype.isStartOfExpression=function(){return e.prototype.isStartOfExpression.call(this)||this.match("<")},t}(l.Parser);t.JSXParser=f},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};t.Character={fromCodePoint:function(e){return e<65536?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10))+String.fromCharCode(56320+(e-65536&1023))},isWhiteSpace:function(e){return 32===e||9===e||11===e||12===e||160===e||e>=5760&&[5760,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].indexOf(e)>=0},isLineTerminator:function(e){return 10===e||13===e||8232===e||8233===e},isIdentifierStart:function(e){return 36===e||95===e||e>=65&&e<=90||e>=97&&e<=122||92===e||e>=128&&n.NonAsciiIdentifierStart.test(t.Character.fromCodePoint(e))},isIdentifierPart:function(e){return 36===e||95===e||e>=65&&e<=90||e>=97&&e<=122||e>=48&&e<=57||92===e||e>=128&&n.NonAsciiIdentifierPart.test(t.Character.fromCodePoint(e))},isDecimalDigit:function(e){return e>=48&&e<=57},isHexDigit:function(e){return e>=48&&e<=57||e>=65&&e<=70||e>=97&&e<=102},isOctalDigit:function(e){return e>=48&&e<=55}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(6),i=function(){function e(e){this.type=r.JSXSyntax.JSXClosingElement,this.name=e}return e}();t.JSXClosingElement=i;var o=function(){function e(e,t,n){this.type=r.JSXSyntax.JSXElement,this.openingElement=e,this.children=t,this.closingElement=n}return e}();t.JSXElement=o;var a=function(){function e(){this.type=r.JSXSyntax.JSXEmptyExpression}return e}();t.JSXEmptyExpression=a;var s=function(){function e(e){this.type=r.JSXSyntax.JSXExpressionContainer,this.expression=e}return e}();t.JSXExpressionContainer=s;var u=function(){function e(e){this.type=r.JSXSyntax.JSXIdentifier,this.name=e}return e}();t.JSXIdentifier=u;var l=function(){function e(e,t){this.type=r.JSXSyntax.JSXMemberExpression,this.object=e,this.property=t}return e}();t.JSXMemberExpression=l;var c=function(){function e(e,t){this.type=r.JSXSyntax.JSXAttribute,this.name=e,this.value=t}return e}();t.JSXAttribute=c;var p=function(){function e(e,t){this.type=r.JSXSyntax.JSXNamespacedName,this.namespace=e,this.name=t}return e}();t.JSXNamespacedName=p;var f=function(){function e(e,t,n){this.type=r.JSXSyntax.JSXOpeningElement,this.name=e,this.selfClosing=t,this.attributes=n}return e}();t.JSXOpeningElement=f;var h=function(){function e(e){this.type=r.JSXSyntax.JSXSpreadAttribute,this.argument=e}return e}();t.JSXSpreadAttribute=h;var d=function(){function e(e,t){this.type=r.JSXSyntax.JSXText,this.value=e,this.raw=t}return e}();t.JSXText=d},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.JSXSyntax={JSXAttribute:"JSXAttribute",JSXClosingElement:"JSXClosingElement",JSXElement:"JSXElement",JSXEmptyExpression:"JSXEmptyExpression",JSXExpressionContainer:"JSXExpressionContainer",JSXIdentifier:"JSXIdentifier",JSXMemberExpression:"JSXMemberExpression",JSXNamespacedName:"JSXNamespacedName",JSXOpeningElement:"JSXOpeningElement",JSXSpreadAttribute:"JSXSpreadAttribute",JSXText:"JSXText"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(){function e(e){this.type=r.Syntax.ArrayExpression,this.elements=e}return e}();t.ArrayExpression=i;var o=function(){function e(e){this.type=r.Syntax.ArrayPattern,this.elements=e}return e}();t.ArrayPattern=o;var a=function(){function e(e,t,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=e,this.body=t,this.generator=!1,this.expression=n,this.async=!1}return e}();t.ArrowFunctionExpression=a;var s=function(){function e(e,t,n){this.type=r.Syntax.AssignmentExpression,this.operator=e,this.left=t,this.right=n}return e}();t.AssignmentExpression=s;var u=function(){function e(e,t){this.type=r.Syntax.AssignmentPattern,this.left=e,this.right=t}return e}();t.AssignmentPattern=u;var l=function(){function e(e,t,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=e,this.body=t,this.generator=!1,this.expression=n,this.async=!0}return e}();t.AsyncArrowFunctionExpression=l;var c=function(){function e(e,t,n){this.type=r.Syntax.FunctionDeclaration,this.id=e,this.params=t,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return e}();t.AsyncFunctionDeclaration=c;var p=function(){function e(e,t,n){this.type=r.Syntax.FunctionExpression,this.id=e,this.params=t,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return e}();t.AsyncFunctionExpression=p;var f=function(){function e(e){this.type=r.Syntax.AwaitExpression,this.argument=e}return e}();t.AwaitExpression=f;var h=function(){function e(e,t,n){var i="||"===e||"&&"===e;this.type=i?r.Syntax.LogicalExpression:r.Syntax.BinaryExpression,this.operator=e,this.left=t,this.right=n}return e}();t.BinaryExpression=h;var d=function(){function e(e){this.type=r.Syntax.BlockStatement,this.body=e}return e}();t.BlockStatement=d;var m=function(){function e(e){this.type=r.Syntax.BreakStatement,this.label=e}return e}();t.BreakStatement=m;var v=function(){function e(e,t){this.type=r.Syntax.CallExpression,this.callee=e,this.arguments=t}return e}();t.CallExpression=v;var g=function(){function e(e,t){this.type=r.Syntax.CatchClause,this.param=e,this.body=t}return e}();t.CatchClause=g;var y=function(){function e(e){this.type=r.Syntax.ClassBody,this.body=e}return e}();t.ClassBody=y;var _=function(){function e(e,t,n){this.type=r.Syntax.ClassDeclaration,this.id=e,this.superClass=t,this.body=n}return e}();t.ClassDeclaration=_;var b=function(){function e(e,t,n){this.type=r.Syntax.ClassExpression,this.id=e,this.superClass=t,this.body=n}return e}();t.ClassExpression=b;var x=function(){function e(e,t){this.type=r.Syntax.MemberExpression,this.computed=!0,this.object=e,this.property=t}return e}();t.ComputedMemberExpression=x;var w=function(){function e(e,t,n){this.type=r.Syntax.ConditionalExpression,this.test=e,this.consequent=t,this.alternate=n}return e}();t.ConditionalExpression=w;var k=function(){function e(e){this.type=r.Syntax.ContinueStatement,this.label=e}return e}();t.ContinueStatement=k;var E=function(){function e(){this.type=r.Syntax.DebuggerStatement}return e}();t.DebuggerStatement=E;var S=function(){function e(e,t){this.type=r.Syntax.ExpressionStatement,this.expression=e,this.directive=t}return e}();t.Directive=S;var C=function(){function e(e,t){this.type=r.Syntax.DoWhileStatement,this.body=e,this.test=t}return e}();t.DoWhileStatement=C;var A=function(){function e(){this.type=r.Syntax.EmptyStatement}return e}();t.EmptyStatement=A;var D=function(){function e(e){this.type=r.Syntax.ExportAllDeclaration,this.source=e}return e}();t.ExportAllDeclaration=D;var O=function(){function e(e){this.type=r.Syntax.ExportDefaultDeclaration,this.declaration=e}return e}();t.ExportDefaultDeclaration=O;var M=function(){function e(e,t,n){this.type=r.Syntax.ExportNamedDeclaration,this.declaration=e,this.specifiers=t,this.source=n}return e}();t.ExportNamedDeclaration=M;var T=function(){function e(e,t){this.type=r.Syntax.ExportSpecifier,this.exported=t,this.local=e}return e}();t.ExportSpecifier=T;var P=function(){function e(e){this.type=r.Syntax.ExpressionStatement,this.expression=e}return e}();t.ExpressionStatement=P;var I=function(){function e(e,t,n){this.type=r.Syntax.ForInStatement,this.left=e,this.right=t,this.body=n,this.each=!1}return e}();t.ForInStatement=I;var R=function(){function e(e,t,n){this.type=r.Syntax.ForOfStatement,this.left=e,this.right=t,this.body=n}return e}();t.ForOfStatement=R;var j=function(){function e(e,t,n,i){this.type=r.Syntax.ForStatement,this.init=e,this.test=t,this.update=n,this.body=i}return e}();t.ForStatement=j;var F=function(){function e(e,t,n,i){this.type=r.Syntax.FunctionDeclaration,this.id=e,this.params=t,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return e}();t.FunctionDeclaration=F;var N=function(){function e(e,t,n,i){this.type=r.Syntax.FunctionExpression,this.id=e,this.params=t,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return e}();t.FunctionExpression=N;var B=function(){function e(e){this.type=r.Syntax.Identifier,this.name=e}return e}();t.Identifier=B;var L=function(){function e(e,t,n){this.type=r.Syntax.IfStatement,this.test=e,this.consequent=t,this.alternate=n}return e}();t.IfStatement=L;var q=function(){function e(e,t){this.type=r.Syntax.ImportDeclaration,this.specifiers=e,this.source=t}return e}();t.ImportDeclaration=q;var z=function(){function e(e){this.type=r.Syntax.ImportDefaultSpecifier,this.local=e}return e}();t.ImportDefaultSpecifier=z;var U=function(){function e(e){this.type=r.Syntax.ImportNamespaceSpecifier,this.local=e}return e}();t.ImportNamespaceSpecifier=U;var W=function(){function e(e,t){this.type=r.Syntax.ImportSpecifier,this.local=e,this.imported=t}return e}();t.ImportSpecifier=W;var V=function(){function e(e,t){this.type=r.Syntax.LabeledStatement,this.label=e,this.body=t}return e}();t.LabeledStatement=V;var H=function(){function e(e,t){this.type=r.Syntax.Literal,this.value=e,this.raw=t}return e}();t.Literal=H;var G=function(){function e(e,t){this.type=r.Syntax.MetaProperty,this.meta=e,this.property=t}return e}();t.MetaProperty=G;var J=function(){function e(e,t,n,i,o){this.type=r.Syntax.MethodDefinition,this.key=e,this.computed=t,this.value=n,this.kind=i,this.static=o}return e}();t.MethodDefinition=J;var K=function(){function e(e){this.type=r.Syntax.Program,this.body=e,this.sourceType="module"}return e}();t.Module=K;var X=function(){function e(e,t){this.type=r.Syntax.NewExpression,this.callee=e,this.arguments=t}return e}();t.NewExpression=X;var Y=function(){function e(e){this.type=r.Syntax.ObjectExpression,this.properties=e}return e}();t.ObjectExpression=Y;var $=function(){function e(e){this.type=r.Syntax.ObjectPattern,this.properties=e}return e}();t.ObjectPattern=$;var Z=function(){function e(e,t,n,i,o,a){this.type=r.Syntax.Property,this.key=t,this.computed=n,this.value=i,this.kind=e,this.method=o,this.shorthand=a}return e}();t.Property=Z;var Q=function(){function e(e,t,n,i){this.type=r.Syntax.Literal,this.value=e,this.raw=t,this.regex={pattern:n,flags:i}}return e}();t.RegexLiteral=Q;var ee=function(){function e(e){this.type=r.Syntax.RestElement,this.argument=e}return e}();t.RestElement=ee;var te=function(){function e(e){this.type=r.Syntax.ReturnStatement,this.argument=e}return e}();t.ReturnStatement=te;var ne=function(){function e(e){this.type=r.Syntax.Program,this.body=e,this.sourceType="script"}return e}();t.Script=ne;var re=function(){function e(e){this.type=r.Syntax.SequenceExpression,this.expressions=e}return e}();t.SequenceExpression=re;var ie=function(){function e(e){this.type=r.Syntax.SpreadElement,this.argument=e}return e}();t.SpreadElement=ie;var oe=function(){function e(e,t){this.type=r.Syntax.MemberExpression,this.computed=!1,this.object=e,this.property=t}return e}();t.StaticMemberExpression=oe;var ae=function(){function e(){this.type=r.Syntax.Super}return e}();t.Super=ae;var se=function(){function e(e,t){this.type=r.Syntax.SwitchCase,this.test=e,this.consequent=t}return e}();t.SwitchCase=se;var ue=function(){function e(e,t){this.type=r.Syntax.SwitchStatement,this.discriminant=e,this.cases=t}return e}();t.SwitchStatement=ue;var le=function(){function e(e,t){this.type=r.Syntax.TaggedTemplateExpression,this.tag=e,this.quasi=t}return e}();t.TaggedTemplateExpression=le;var ce=function(){function e(e,t){this.type=r.Syntax.TemplateElement,this.value=e,this.tail=t}return e}();t.TemplateElement=ce;var pe=function(){function e(e,t){this.type=r.Syntax.TemplateLiteral,this.quasis=e,this.expressions=t}return e}();t.TemplateLiteral=pe;var fe=function(){function e(){this.type=r.Syntax.ThisExpression}return e}();t.ThisExpression=fe;var he=function(){function e(e){this.type=r.Syntax.ThrowStatement,this.argument=e}return e}();t.ThrowStatement=he;var de=function(){function e(e,t,n){this.type=r.Syntax.TryStatement,this.block=e,this.handler=t,this.finalizer=n}return e}();t.TryStatement=de;var me=function(){function e(e,t){this.type=r.Syntax.UnaryExpression,this.operator=e,this.argument=t,this.prefix=!0}return e}();t.UnaryExpression=me;var ve=function(){function e(e,t,n){this.type=r.Syntax.UpdateExpression,this.operator=e,this.argument=t,this.prefix=n}return e}();t.UpdateExpression=ve;var ge=function(){function e(e,t){this.type=r.Syntax.VariableDeclaration,this.declarations=e,this.kind=t}return e}();t.VariableDeclaration=ge;var ye=function(){function e(e,t){this.type=r.Syntax.VariableDeclarator,this.id=e,this.init=t}return e}();t.VariableDeclarator=ye;var _e=function(){function e(e,t){this.type=r.Syntax.WhileStatement,this.test=e,this.body=t}return e}();t.WhileStatement=_e;var be=function(){function e(e,t){this.type=r.Syntax.WithStatement,this.object=e,this.body=t}return e}();t.WithStatement=be;var xe=function(){function e(e,t){this.type=r.Syntax.YieldExpression,this.argument=e,this.delegate=t}return e}();t.YieldExpression=xe},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(9),i=n(10),o=n(11),a=n(7),s=n(12),u=n(2),l=n(13),c=function(){function e(e,t,n){void 0===t&&(t={}),this.config={range:"boolean"==typeof t.range&&t.range,loc:"boolean"==typeof t.loc&&t.loc,source:null,tokens:"boolean"==typeof t.tokens&&t.tokens,comment:"boolean"==typeof t.comment&&t.comment,tolerant:"boolean"==typeof t.tolerant&&t.tolerant},this.config.loc&&t.source&&null!==t.source&&(this.config.source=String(t.source)),this.delegate=n,this.errorHandler=new i.ErrorHandler,this.errorHandler.tolerant=this.config.tolerant,this.scanner=new s.Scanner(e,this.errorHandler),this.scanner.trackComment=this.config.comment,this.operatorPrecedence={")":0,";":0,",":0,"=":0,"]":0,"||":1,"&&":2,"|":3,"^":4,"&":5,"==":6,"!=":6,"===":6,"!==":6,"<":7,">":7,"<=":7,">=":7,"<<":8,">>":8,">>>":8,"+":9,"-":9,"*":11,"/":11,"%":11},this.lookahead={type:2,value:"",lineNumber:this.scanner.lineNumber,lineStart:0,start:0,end:0},this.hasLineTerminator=!1,this.context={isModule:!1,await:!1,allowIn:!0,allowStrictDirective:!0,allowYield:!0,firstCoverInitializedNameError:null,isAssignmentTarget:!1,isBindingElement:!1,inFunctionBody:!1,inIteration:!1,inSwitch:!1,labelSet:{},strict:!1},this.tokens=[],this.startMarker={index:0,line:this.scanner.lineNumber,column:0},this.lastMarker={index:0,line:this.scanner.lineNumber,column:0},this.nextToken(),this.lastMarker={index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}return e.prototype.throwError=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=e.replace(/%(\d)/g,function(e,t){return r.assert(t<i.length,"Message reference must be in range"),i[t]}),a=this.lastMarker.index,s=this.lastMarker.line,u=this.lastMarker.column+1;throw this.errorHandler.createError(a,s,u,o)},e.prototype.tolerateError=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=e.replace(/%(\d)/g,function(e,t){return r.assert(t<i.length,"Message reference must be in range"),i[t]}),a=this.lastMarker.index,s=this.scanner.lineNumber,u=this.lastMarker.column+1;this.errorHandler.tolerateError(a,s,u,o)},e.prototype.unexpectedTokenError=function(e,t){var n,r=t||o.Messages.UnexpectedToken;if(e?(t||(r=2===e.type?o.Messages.UnexpectedEOS:3===e.type?o.Messages.UnexpectedIdentifier:6===e.type?o.Messages.UnexpectedNumber:8===e.type?o.Messages.UnexpectedString:10===e.type?o.Messages.UnexpectedTemplate:o.Messages.UnexpectedToken,4===e.type&&(this.scanner.isFutureReservedWord(e.value)?r=o.Messages.UnexpectedReserved:this.context.strict&&this.scanner.isStrictModeReservedWord(e.value)&&(r=o.Messages.StrictReservedWord))),n=e.value):n="ILLEGAL",r=r.replace("%0",n),e&&"number"==typeof e.lineNumber){var i=e.start,a=e.lineNumber,s=this.lastMarker.index-this.lastMarker.column,u=e.start-s+1;return this.errorHandler.createError(i,a,u,r)}var i=this.lastMarker.index,a=this.lastMarker.line,u=this.lastMarker.column+1;return this.errorHandler.createError(i,a,u,r)},e.prototype.throwUnexpectedToken=function(e,t){throw this.unexpectedTokenError(e,t)},e.prototype.tolerateUnexpectedToken=function(e,t){this.errorHandler.tolerate(this.unexpectedTokenError(e,t))},e.prototype.collectComments=function(){if(this.config.comment){var e=this.scanner.scanComments();if(e.length>0&&this.delegate)for(var t=0;t<e.length;++t){var n=e[t],r=void 0;r={type:n.multiLine?"BlockComment":"LineComment",value:this.scanner.source.slice(n.slice[0],n.slice[1])},this.config.range&&(r.range=n.range),this.config.loc&&(r.loc=n.loc);var i={start:{line:n.loc.start.line,column:n.loc.start.column,offset:n.range[0]},end:{line:n.loc.end.line,column:n.loc.end.column,offset:n.range[1]}};this.delegate(r,i)}}else this.scanner.scanComments()},e.prototype.getTokenRaw=function(e){return this.scanner.source.slice(e.start,e.end)},e.prototype.convertToken=function(e){var t={type:l.TokenName[e.type],value:this.getTokenRaw(e)};if(this.config.range&&(t.range=[e.start,e.end]),this.config.loc&&(t.loc={start:{line:this.startMarker.line,column:this.startMarker.column},end:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}),9===e.type){var n=e.pattern,r=e.flags;t.regex={pattern:n,flags:r}}return t},e.prototype.nextToken=function(){var e=this.lookahead;this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.collectComments(),this.scanner.index!==this.startMarker.index&&(this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart);var t=this.scanner.lex();return this.hasLineTerminator=e.lineNumber!==t.lineNumber,t&&this.context.strict&&3===t.type&&this.scanner.isStrictModeReservedWord(t.value)&&(t.type=4),this.lookahead=t,this.config.tokens&&2!==t.type&&this.tokens.push(this.convertToken(t)),e},e.prototype.nextRegexToken=function(){this.collectComments();var e=this.scanner.scanRegExp();return this.config.tokens&&(this.tokens.pop(),this.tokens.push(this.convertToken(e))),this.lookahead=e,this.nextToken(),e},e.prototype.createNode=function(){return{index:this.startMarker.index,line:this.startMarker.line,column:this.startMarker.column}},e.prototype.startNode=function(e){return{index:e.start,line:e.lineNumber,column:e.start-e.lineStart}},e.prototype.finalize=function(e,t){if(this.config.range&&(t.range=[e.index,this.lastMarker.index]),this.config.loc&&(t.loc={start:{line:e.line,column:e.column},end:{line:this.lastMarker.line,column:this.lastMarker.column}},this.config.source&&(t.loc.source=this.config.source)),this.delegate){var n={start:{line:e.line,column:e.column,offset:e.index},end:{line:this.lastMarker.line,column:this.lastMarker.column,offset:this.lastMarker.index}};this.delegate(t,n)}return t},e.prototype.expect=function(e){var t=this.nextToken();7===t.type&&t.value===e||this.throwUnexpectedToken(t)},e.prototype.expectCommaSeparator=function(){if(this.config.tolerant){var e=this.lookahead;7===e.type&&","===e.value?this.nextToken():7===e.type&&";"===e.value?(this.nextToken(),this.tolerateUnexpectedToken(e)):this.tolerateUnexpectedToken(e,o.Messages.UnexpectedToken)}else this.expect(",")},e.prototype.expectKeyword=function(e){var t=this.nextToken();4===t.type&&t.value===e||this.throwUnexpectedToken(t)},e.prototype.match=function(e){return 7===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchKeyword=function(e){return 4===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchContextualKeyword=function(e){return 3===this.lookahead.type&&this.lookahead.value===e},e.prototype.matchAssign=function(){if(7!==this.lookahead.type)return!1;var e=this.lookahead.value;return"="===e||"*="===e||"**="===e||"/="===e||"%="===e||"+="===e||"-="===e||"<<="===e||">>="===e||">>>="===e||"&="===e||"^="===e||"|="===e},e.prototype.isolateCoverGrammar=function(e){var t=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=e.call(this);return null!==this.context.firstCoverInitializedNameError&&this.throwUnexpectedToken(this.context.firstCoverInitializedNameError),this.context.isBindingElement=t,this.context.isAssignmentTarget=n,this.context.firstCoverInitializedNameError=r,i},e.prototype.inheritCoverGrammar=function(e){var t=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=e.call(this);return this.context.isBindingElement=this.context.isBindingElement&&t,this.context.isAssignmentTarget=this.context.isAssignmentTarget&&n,this.context.firstCoverInitializedNameError=r||this.context.firstCoverInitializedNameError,i},e.prototype.consumeSemicolon=function(){this.match(";")?this.nextToken():this.hasLineTerminator||(2===this.lookahead.type||this.match("}")||this.throwUnexpectedToken(this.lookahead),this.lastMarker.index=this.startMarker.index,this.lastMarker.line=this.startMarker.line,this.lastMarker.column=this.startMarker.column)},e.prototype.parsePrimaryExpression=function(){var e,t,n,r=this.createNode();switch(this.lookahead.type){case 3:(this.context.isModule||this.context.await)&&"await"===this.lookahead.value&&this.tolerateUnexpectedToken(this.lookahead),e=this.matchAsyncFunction()?this.parseFunctionExpression():this.finalize(r,new a.Identifier(this.nextToken().value));break;case 6:case 8:this.context.strict&&this.lookahead.octal&&this.tolerateUnexpectedToken(this.lookahead,o.Messages.StrictOctalLiteral),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal(t.value,n));break;case 1:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal("true"===t.value,n));break;case 5:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,t=this.nextToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.Literal(null,n));break;case 10:e=this.parseTemplateLiteral();break;case 7:switch(this.lookahead.value){case"(":this.context.isBindingElement=!1,e=this.inheritCoverGrammar(this.parseGroupExpression);break;case"[":e=this.inheritCoverGrammar(this.parseArrayInitializer);break;case"{":e=this.inheritCoverGrammar(this.parseObjectInitializer);break;case"/":case"/=":this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.scanner.index=this.startMarker.index,t=this.nextRegexToken(),n=this.getTokenRaw(t),e=this.finalize(r,new a.RegexLiteral(t.regex,n,t.pattern,t.flags));break;default:e=this.throwUnexpectedToken(this.nextToken())}break;case 4:!this.context.strict&&this.context.allowYield&&this.matchKeyword("yield")?e=this.parseIdentifierName():!this.context.strict&&this.matchKeyword("let")?e=this.finalize(r,new a.Identifier(this.nextToken().value)):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.matchKeyword("function")?e=this.parseFunctionExpression():this.matchKeyword("this")?(this.nextToken(),e=this.finalize(r,new a.ThisExpression)):e=this.matchKeyword("class")?this.parseClassExpression():this.throwUnexpectedToken(this.nextToken()));break;default:e=this.throwUnexpectedToken(this.nextToken())}return e},e.prototype.parseSpreadElement=function(){var e=this.createNode();this.expect("...");var t=this.inheritCoverGrammar(this.parseAssignmentExpression);return this.finalize(e,new a.SpreadElement(t))},e.prototype.parseArrayInitializer=function(){var e=this.createNode(),t=[];for(this.expect("[");!this.match("]");)if(this.match(","))this.nextToken(),t.push(null);else if(this.match("...")){var n=this.parseSpreadElement();this.match("]")||(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.expect(",")),t.push(n)}else t.push(this.inheritCoverGrammar(this.parseAssignmentExpression)),this.match("]")||this.expect(",");return this.expect("]"),this.finalize(e,new a.ArrayExpression(t))},e.prototype.parsePropertyMethod=function(e){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var t=this.context.strict,n=this.context.allowStrictDirective;this.context.allowStrictDirective=e.simple;var r=this.isolateCoverGrammar(this.parseFunctionSourceElements);return this.context.strict&&e.firstRestricted&&this.tolerateUnexpectedToken(e.firstRestricted,e.message),this.context.strict&&e.stricted&&this.tolerateUnexpectedToken(e.stricted,e.message),this.context.strict=t,this.context.allowStrictDirective=n,r},e.prototype.parsePropertyMethodFunction=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters(),r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parsePropertyMethodAsyncFunction=function(){var e=this.createNode(),t=this.context.allowYield,n=this.context.await;this.context.allowYield=!1,this.context.await=!0;var r=this.parseFormalParameters(),i=this.parsePropertyMethod(r);return this.context.allowYield=t,this.context.await=n,this.finalize(e,new a.AsyncFunctionExpression(null,r.params,i))},e.prototype.parseObjectPropertyKey=function(){var e,t=this.createNode(),n=this.nextToken();switch(n.type){case 8:case 6:this.context.strict&&n.octal&&this.tolerateUnexpectedToken(n,o.Messages.StrictOctalLiteral);var r=this.getTokenRaw(n);e=this.finalize(t,new a.Literal(n.value,r));break;case 3:case 1:case 5:case 4:e=this.finalize(t,new a.Identifier(n.value));break;case 7:"["===n.value?(e=this.isolateCoverGrammar(this.parseAssignmentExpression),this.expect("]")):e=this.throwUnexpectedToken(n);break;default:e=this.throwUnexpectedToken(n)}return e},e.prototype.isPropertyKey=function(e,t){return e.type===u.Syntax.Identifier&&e.name===t||e.type===u.Syntax.Literal&&e.value===t},e.prototype.parseObjectProperty=function(e){var t,n=this.createNode(),r=this.lookahead,i=null,s=null,u=!1,l=!1,c=!1,p=!1;if(3===r.type){var f=r.value;this.nextToken(),u=this.match("["),p=!(this.hasLineTerminator||"async"!==f||this.match(":")||this.match("(")||this.match("*")),i=p?this.parseObjectPropertyKey():this.finalize(n,new a.Identifier(f))}else this.match("*")?this.nextToken():(u=this.match("["),i=this.parseObjectPropertyKey());var h=this.qualifiedPropertyName(this.lookahead);if(3===r.type&&!p&&"get"===r.value&&h)t="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,s=this.parseGetterMethod();else if(3===r.type&&!p&&"set"===r.value&&h)t="set",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseSetterMethod();else if(7===r.type&&"*"===r.value&&h)t="init",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseGeneratorMethod(),l=!0;else if(i||this.throwUnexpectedToken(this.lookahead),t="init",this.match(":")&&!p)!u&&this.isPropertyKey(i,"__proto__")&&(e.value&&this.tolerateError(o.Messages.DuplicateProtoProperty),e.value=!0),this.nextToken(),s=this.inheritCoverGrammar(this.parseAssignmentExpression);else if(this.match("("))s=p?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),l=!0;else if(3===r.type){var f=this.finalize(n,new a.Identifier(r.value));if(this.match("=")){this.context.firstCoverInitializedNameError=this.lookahead,this.nextToken(),c=!0;var d=this.isolateCoverGrammar(this.parseAssignmentExpression);s=this.finalize(n,new a.AssignmentPattern(f,d))}else c=!0,s=f}else this.throwUnexpectedToken(this.nextToken());return this.finalize(n,new a.Property(t,i,u,s,l,c))},e.prototype.parseObjectInitializer=function(){var e=this.createNode();this.expect("{");for(var t=[],n={value:!1};!this.match("}");)t.push(this.parseObjectProperty(n)),this.match("}")||this.expectCommaSeparator();return this.expect("}"),this.finalize(e,new a.ObjectExpression(t))},e.prototype.parseTemplateHead=function(){r.assert(this.lookahead.head,"Template literal must start with a template head");var e=this.createNode(),t=this.nextToken(),n=t.value,i=t.cooked;return this.finalize(e,new a.TemplateElement({raw:n,cooked:i},t.tail))},e.prototype.parseTemplateElement=function(){10!==this.lookahead.type&&this.throwUnexpectedToken();var e=this.createNode(),t=this.nextToken(),n=t.value,r=t.cooked;return this.finalize(e,new a.TemplateElement({raw:n,cooked:r},t.tail))},e.prototype.parseTemplateLiteral=function(){var e=this.createNode(),t=[],n=[],r=this.parseTemplateHead();for(n.push(r);!r.tail;)t.push(this.parseExpression()),r=this.parseTemplateElement(),n.push(r);return this.finalize(e,new a.TemplateLiteral(n,t))},e.prototype.reinterpretExpressionAsPattern=function(e){switch(e.type){case u.Syntax.Identifier:case u.Syntax.MemberExpression:case u.Syntax.RestElement:case u.Syntax.AssignmentPattern:break;case u.Syntax.SpreadElement:e.type=u.Syntax.RestElement,this.reinterpretExpressionAsPattern(e.argument);break;case u.Syntax.ArrayExpression:e.type=u.Syntax.ArrayPattern;for(var t=0;t<e.elements.length;t++)null!==e.elements[t]&&this.reinterpretExpressionAsPattern(e.elements[t]);break;case u.Syntax.ObjectExpression:e.type=u.Syntax.ObjectPattern;for(var t=0;t<e.properties.length;t++)this.reinterpretExpressionAsPattern(e.properties[t].value);break;case u.Syntax.AssignmentExpression:e.type=u.Syntax.AssignmentPattern,delete e.operator,this.reinterpretExpressionAsPattern(e.left)}},e.prototype.parseGroupExpression=function(){var e;if(this.expect("("),this.match(")"))this.nextToken(),this.match("=>")||this.expect("=>"),e={type:"ArrowParameterPlaceHolder",params:[],async:!1};else{var t=this.lookahead,n=[];if(this.match("..."))e=this.parseRestElement(n),this.expect(")"),this.match("=>")||this.expect("=>"),e={type:"ArrowParameterPlaceHolder",params:[e],async:!1};else{var r=!1;if(this.context.isBindingElement=!0,e=this.inheritCoverGrammar(this.parseAssignmentExpression),this.match(",")){var i=[];for(this.context.isAssignmentTarget=!1,i.push(e);2!==this.lookahead.type&&this.match(",");){if(this.nextToken(),this.match(")")){this.nextToken();for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,e={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else if(this.match("...")){this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),i.push(this.parseRestElement(n)),this.expect(")"),this.match("=>")||this.expect("=>"),this.context.isBindingElement=!1;for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,e={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else i.push(this.inheritCoverGrammar(this.parseAssignmentExpression));if(r)break}r||(e=this.finalize(this.startNode(t),new a.SequenceExpression(i)))}if(!r){if(this.expect(")"),this.match("=>")&&(e.type===u.Syntax.Identifier&&"yield"===e.name&&(r=!0,e={type:"ArrowParameterPlaceHolder",params:[e],async:!1}),!r)){if(this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),e.type===u.Syntax.SequenceExpression)for(var o=0;o<e.expressions.length;o++)this.reinterpretExpressionAsPattern(e.expressions[o]);else this.reinterpretExpressionAsPattern(e);e={type:"ArrowParameterPlaceHolder",params:e.type===u.Syntax.SequenceExpression?e.expressions:[e],async:!1}}this.context.isBindingElement=!1}}}return e},e.prototype.parseArguments=function(){this.expect("(");var e=[];if(!this.match(")"))for(;;){var t=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAssignmentExpression);if(e.push(t),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),e},e.prototype.isIdentifierName=function(e){return 3===e.type||4===e.type||1===e.type||5===e.type},e.prototype.parseIdentifierName=function(){var e=this.createNode(),t=this.nextToken();return this.isIdentifierName(t)||this.throwUnexpectedToken(t),this.finalize(e,new a.Identifier(t.value))},e.prototype.parseNewExpression=function(){var e=this.createNode(),t=this.parseIdentifierName();r.assert("new"===t.name,"New expression must start with `new`");var n;if(this.match("."))if(this.nextToken(),3===this.lookahead.type&&this.context.inFunctionBody&&"target"===this.lookahead.value){var i=this.parseIdentifierName();n=new a.MetaProperty(t,i)}else this.throwUnexpectedToken(this.lookahead);else{var o=this.isolateCoverGrammar(this.parseLeftHandSideExpression),s=this.match("(")?this.parseArguments():[];n=new a.NewExpression(o,s),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return this.finalize(e,n)},e.prototype.parseAsyncArgument=function(){var e=this.parseAssignmentExpression();return this.context.firstCoverInitializedNameError=null,e},e.prototype.parseAsyncArguments=function(){this.expect("(");var e=[];if(!this.match(")"))for(;;){var t=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAsyncArgument);if(e.push(t),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),e},e.prototype.parseLeftHandSideExpressionAllowCall=function(){var e=this.lookahead,t=this.matchContextualKeyword("async"),n=this.context.allowIn;this.context.allowIn=!0;var r;for(this.matchKeyword("super")&&this.context.inFunctionBody?(r=this.createNode(),this.nextToken(),r=this.finalize(r,new a.Super),this.match("(")||this.match(".")||this.match("[")||this.throwUnexpectedToken(this.lookahead)):r=this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var i=this.parseIdentifierName();r=this.finalize(this.startNode(e),new a.StaticMemberExpression(r,i))}else if(this.match("(")){var o=t&&e.lineNumber===this.lookahead.lineNumber;this.context.isBindingElement=!1,this.context.isAssignmentTarget=!1;var s=o?this.parseAsyncArguments():this.parseArguments();if(r=this.finalize(this.startNode(e),new a.CallExpression(r,s)),o&&this.match("=>")){for(var u=0;u<s.length;++u)this.reinterpretExpressionAsPattern(s[u]);r={type:"ArrowParameterPlaceHolder",params:s,async:!0}}}else if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var i=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),r=this.finalize(this.startNode(e),new a.ComputedMemberExpression(r,i))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var l=this.parseTemplateLiteral();r=this.finalize(this.startNode(e),new a.TaggedTemplateExpression(r,l))}return this.context.allowIn=n,r},e.prototype.parseSuper=function(){var e=this.createNode();return this.expectKeyword("super"),this.match("[")||this.match(".")||this.throwUnexpectedToken(this.lookahead),this.finalize(e,new a.Super)},e.prototype.parseLeftHandSideExpression=function(){r.assert(this.context.allowIn,"callee of new expression always allow in keyword.");for(var e=this.startNode(this.lookahead),t=this.matchKeyword("super")&&this.context.inFunctionBody?this.parseSuper():this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var n=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),t=this.finalize(e,new a.ComputedMemberExpression(t,n))}else if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var n=this.parseIdentifierName();t=this.finalize(e,new a.StaticMemberExpression(t,n))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var i=this.parseTemplateLiteral();t=this.finalize(e,new a.TaggedTemplateExpression(t,i))}return t},e.prototype.parseUpdateExpression=function(){var e,t=this.lookahead;if(this.match("++")||this.match("--")){var n=this.startNode(t),r=this.nextToken();e=this.inheritCoverGrammar(this.parseUnaryExpression),this.context.strict&&e.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(e.name)&&this.tolerateError(o.Messages.StrictLHSPrefix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment);var i=!0;e=this.finalize(n,new a.UpdateExpression(r.value,e,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else if(e=this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall),!this.hasLineTerminator&&7===this.lookahead.type&&(this.match("++")||this.match("--"))){this.context.strict&&e.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(e.name)&&this.tolerateError(o.Messages.StrictLHSPostfix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var s=this.nextToken().value,i=!1;e=this.finalize(this.startNode(t),new a.UpdateExpression(s,e,i))}return e},e.prototype.parseAwaitExpression=function(){var e=this.createNode();this.nextToken();var t=this.parseUnaryExpression();return this.finalize(e,new a.AwaitExpression(t))},e.prototype.parseUnaryExpression=function(){var e;if(this.match("+")||this.match("-")||this.match("~")||this.match("!")||this.matchKeyword("delete")||this.matchKeyword("void")||this.matchKeyword("typeof")){var t=this.startNode(this.lookahead),n=this.nextToken();e=this.inheritCoverGrammar(this.parseUnaryExpression),e=this.finalize(t,new a.UnaryExpression(n.value,e)),this.context.strict&&"delete"===e.operator&&e.argument.type===u.Syntax.Identifier&&this.tolerateError(o.Messages.StrictDelete),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else e=this.context.await&&this.matchContextualKeyword("await")?this.parseAwaitExpression():this.parseUpdateExpression();return e},e.prototype.parseExponentiationExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseUnaryExpression);if(t.type!==u.Syntax.UnaryExpression&&this.match("**")){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var n=t,r=this.isolateCoverGrammar(this.parseExponentiationExpression);t=this.finalize(this.startNode(e),new a.BinaryExpression("**",n,r))}return t},e.prototype.binaryPrecedence=function(e){var t=e.value;return 7===e.type?this.operatorPrecedence[t]||0:4===e.type&&("instanceof"===t||this.context.allowIn&&"in"===t)?7:0},e.prototype.parseBinaryExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseExponentiationExpression),n=this.lookahead,r=this.binaryPrecedence(n);if(r>0){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;for(var i=[e,this.lookahead],o=t,s=this.isolateCoverGrammar(this.parseExponentiationExpression),u=[o,n.value,s],l=[r];;){if((r=this.binaryPrecedence(this.lookahead))<=0)break;for(;u.length>2&&r<=l[l.length-1];){s=u.pop();var c=u.pop();l.pop(),o=u.pop(),i.pop();var p=this.startNode(i[i.length-1]);u.push(this.finalize(p,new a.BinaryExpression(c,o,s)))}u.push(this.nextToken().value),l.push(r),i.push(this.lookahead),u.push(this.isolateCoverGrammar(this.parseExponentiationExpression))}var f=u.length-1;for(t=u[f],i.pop();f>1;){var p=this.startNode(i.pop()),c=u[f-1];t=this.finalize(p,new a.BinaryExpression(c,u[f-2],t)),f-=2}}return t},e.prototype.parseConditionalExpression=function(){var e=this.lookahead,t=this.inheritCoverGrammar(this.parseBinaryExpression);if(this.match("?")){this.nextToken();var n=this.context.allowIn;this.context.allowIn=!0;var r=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowIn=n,this.expect(":");var i=this.isolateCoverGrammar(this.parseAssignmentExpression);t=this.finalize(this.startNode(e),new a.ConditionalExpression(t,r,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return t},e.prototype.checkPatternParam=function(e,t){switch(t.type){case u.Syntax.Identifier:this.validateParam(e,t,t.name);break;case u.Syntax.RestElement:this.checkPatternParam(e,t.argument);break;case u.Syntax.AssignmentPattern:this.checkPatternParam(e,t.left);break;case u.Syntax.ArrayPattern:for(var n=0;n<t.elements.length;n++)null!==t.elements[n]&&this.checkPatternParam(e,t.elements[n]);break;case u.Syntax.ObjectPattern:for(var n=0;n<t.properties.length;n++)this.checkPatternParam(e,t.properties[n].value)}e.simple=e.simple&&t instanceof a.Identifier},e.prototype.reinterpretAsCoverFormalsList=function(e){var t,n=[e],r=!1;switch(e.type){case u.Syntax.Identifier:break;case"ArrowParameterPlaceHolder":n=e.params,r=e.async;break;default:return null}t={simple:!0,paramSet:{}};for(var i=0;i<n.length;++i){var a=n[i];a.type===u.Syntax.AssignmentPattern?a.right.type===u.Syntax.YieldExpression&&(a.right.argument&&this.throwUnexpectedToken(this.lookahead),a.right.type=u.Syntax.Identifier,a.right.name="yield",delete a.right.argument,delete a.right.delegate):r&&a.type===u.Syntax.Identifier&&"await"===a.name&&this.throwUnexpectedToken(this.lookahead),this.checkPatternParam(t,a),n[i]=a}if(this.context.strict||!this.context.allowYield)for(var i=0;i<n.length;++i){var a=n[i];a.type===u.Syntax.YieldExpression&&this.throwUnexpectedToken(this.lookahead)}if(t.message===o.Messages.StrictParamDupe){var s=this.context.strict?t.stricted:t.firstRestricted;this.throwUnexpectedToken(s,t.message)}return{simple:t.simple,params:n,stricted:t.stricted,firstRestricted:t.firstRestricted,message:t.message}},e.prototype.parseAssignmentExpression=function(){var e;if(!this.context.allowYield&&this.matchKeyword("yield"))e=this.parseYieldExpression();else{var t=this.lookahead,n=t;if(e=this.parseConditionalExpression(),3===n.type&&n.lineNumber===this.lookahead.lineNumber&&"async"===n.value&&(3===this.lookahead.type||this.matchKeyword("yield"))){var r=this.parsePrimaryExpression();this.reinterpretExpressionAsPattern(r),e={type:"ArrowParameterPlaceHolder",params:[r],async:!0}}if("ArrowParameterPlaceHolder"===e.type||this.match("=>")){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var i=e.async,s=this.reinterpretAsCoverFormalsList(e);if(s){this.hasLineTerminator&&this.tolerateUnexpectedToken(this.lookahead),this.context.firstCoverInitializedNameError=null;var l=this.context.strict,c=this.context.allowStrictDirective;this.context.allowStrictDirective=s.simple;var p=this.context.allowYield,f=this.context.await;this.context.allowYield=!0,this.context.await=i;var h=this.startNode(t);this.expect("=>");var d=void 0;if(this.match("{")){var m=this.context.allowIn;this.context.allowIn=!0,d=this.parseFunctionSourceElements(),this.context.allowIn=m}else d=this.isolateCoverGrammar(this.parseAssignmentExpression);var v=d.type!==u.Syntax.BlockStatement;this.context.strict&&s.firstRestricted&&this.throwUnexpectedToken(s.firstRestricted,s.message),this.context.strict&&s.stricted&&this.tolerateUnexpectedToken(s.stricted,s.message),e=i?this.finalize(h,new a.AsyncArrowFunctionExpression(s.params,d,v)):this.finalize(h,new a.ArrowFunctionExpression(s.params,d,v)),this.context.strict=l,this.context.allowStrictDirective=c,this.context.allowYield=p,this.context.await=f}}else if(this.matchAssign()){if(this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.strict&&e.type===u.Syntax.Identifier){var g=e;this.scanner.isRestrictedWord(g.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictLHSAssignment),this.scanner.isStrictModeReservedWord(g.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord)}this.match("=")?this.reinterpretExpressionAsPattern(e):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1),n=this.nextToken();var y=n.value,_=this.isolateCoverGrammar(this.parseAssignmentExpression);e=this.finalize(this.startNode(t),new a.AssignmentExpression(y,e,_)),this.context.firstCoverInitializedNameError=null}}return e},e.prototype.parseExpression=function(){var e=this.lookahead,t=this.isolateCoverGrammar(this.parseAssignmentExpression);if(this.match(",")){var n=[];for(n.push(t);2!==this.lookahead.type&&this.match(",");)this.nextToken(),n.push(this.isolateCoverGrammar(this.parseAssignmentExpression));t=this.finalize(this.startNode(e),new a.SequenceExpression(n))}return t},e.prototype.parseStatementListItem=function(){var e;if(this.context.isAssignmentTarget=!0,this.context.isBindingElement=!0,4===this.lookahead.type)switch(this.lookahead.value){case"export":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalExportDeclaration),e=this.parseExportDeclaration();break;case"import":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalImportDeclaration),e=this.parseImportDeclaration();break;case"const":e=this.parseLexicalDeclaration({inFor:!1});break;case"function":e=this.parseFunctionDeclaration();break;case"class":e=this.parseClassDeclaration();break;case"let":e=this.isLexicalDeclaration()?this.parseLexicalDeclaration({inFor:!1}):this.parseStatement();break;default:e=this.parseStatement()}else e=this.parseStatement();return e},e.prototype.parseBlock=function(){var e=this.createNode();this.expect("{");for(var t=[];;){if(this.match("}"))break;t.push(this.parseStatementListItem())}return this.expect("}"),this.finalize(e,new a.BlockStatement(t))},e.prototype.parseLexicalBinding=function(e,t){var n=this.createNode(),r=[],i=this.parsePattern(r,e);this.context.strict&&i.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(i.name)&&this.tolerateError(o.Messages.StrictVarName);var s=null;return"const"===e?this.matchKeyword("in")||this.matchContextualKeyword("of")||(this.match("=")?(this.nextToken(),s=this.isolateCoverGrammar(this.parseAssignmentExpression)):this.throwError(o.Messages.DeclarationMissingInitializer,"const")):(!t.inFor&&i.type!==u.Syntax.Identifier||this.match("="))&&(this.expect("="),s=this.isolateCoverGrammar(this.parseAssignmentExpression)),this.finalize(n,new a.VariableDeclarator(i,s))},e.prototype.parseBindingList=function(e,t){for(var n=[this.parseLexicalBinding(e,t)];this.match(",");)this.nextToken(),n.push(this.parseLexicalBinding(e,t));return n},e.prototype.isLexicalDeclaration=function(){var e=this.scanner.saveState();this.scanner.scanComments();var t=this.scanner.lex();return this.scanner.restoreState(e),3===t.type||7===t.type&&"["===t.value||7===t.type&&"{"===t.value||4===t.type&&"let"===t.value||4===t.type&&"yield"===t.value},e.prototype.parseLexicalDeclaration=function(e){var t=this.createNode(),n=this.nextToken().value;r.assert("let"===n||"const"===n,"Lexical declaration must be either let or const");var i=this.parseBindingList(n,e);return this.consumeSemicolon(),this.finalize(t,new a.VariableDeclaration(i,n))},e.prototype.parseBindingRestElement=function(e,t){var n=this.createNode();this.expect("...");var r=this.parsePattern(e,t);return this.finalize(n,new a.RestElement(r))},e.prototype.parseArrayPattern=function(e,t){var n=this.createNode();this.expect("[");for(var r=[];!this.match("]");)if(this.match(","))this.nextToken(),r.push(null);else{if(this.match("...")){r.push(this.parseBindingRestElement(e,t));break}r.push(this.parsePatternWithDefault(e,t)),this.match("]")||this.expect(",")}return this.expect("]"),this.finalize(n,new a.ArrayPattern(r))},e.prototype.parsePropertyPattern=function(e,t){var n,r,i=this.createNode(),o=!1,s=!1;if(3===this.lookahead.type){var u=this.lookahead;n=this.parseVariableIdentifier();var l=this.finalize(i,new a.Identifier(u.value));if(this.match("=")){e.push(u),s=!0,this.nextToken();var c=this.parseAssignmentExpression();r=this.finalize(this.startNode(u),new a.AssignmentPattern(l,c))}else this.match(":")?(this.expect(":"),r=this.parsePatternWithDefault(e,t)):(e.push(u),s=!0,r=l)}else o=this.match("["),n=this.parseObjectPropertyKey(),this.expect(":"),r=this.parsePatternWithDefault(e,t);return this.finalize(i,new a.Property("init",n,o,r,!1,s))},e.prototype.parseObjectPattern=function(e,t){var n=this.createNode(),r=[];for(this.expect("{");!this.match("}");)r.push(this.parsePropertyPattern(e,t)),this.match("}")||this.expect(",");return this.expect("}"),this.finalize(n,new a.ObjectPattern(r))},e.prototype.parsePattern=function(e,t){var n;return this.match("[")?n=this.parseArrayPattern(e,t):this.match("{")?n=this.parseObjectPattern(e,t):(!this.matchKeyword("let")||"const"!==t&&"let"!==t||this.tolerateUnexpectedToken(this.lookahead,o.Messages.LetInLexicalBinding),e.push(this.lookahead),n=this.parseVariableIdentifier(t)),n},e.prototype.parsePatternWithDefault=function(e,t){var n=this.lookahead,r=this.parsePattern(e,t);if(this.match("=")){this.nextToken();var i=this.context.allowYield;this.context.allowYield=!0;var o=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowYield=i,r=this.finalize(this.startNode(n),new a.AssignmentPattern(r,o))}return r},e.prototype.parseVariableIdentifier=function(e){var t=this.createNode(),n=this.nextToken();return 4===n.type&&"yield"===n.value?this.context.strict?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):this.context.allowYield||this.throwUnexpectedToken(n):3!==n.type?this.context.strict&&4===n.type&&this.scanner.isStrictModeReservedWord(n.value)?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):(this.context.strict||"let"!==n.value||"var"!==e)&&this.throwUnexpectedToken(n):(this.context.isModule||this.context.await)&&3===n.type&&"await"===n.value&&this.tolerateUnexpectedToken(n),this.finalize(t,new a.Identifier(n.value))},e.prototype.parseVariableDeclaration=function(e){var t=this.createNode(),n=[],r=this.parsePattern(n,"var");this.context.strict&&r.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(r.name)&&this.tolerateError(o.Messages.StrictVarName);var i=null;return this.match("=")?(this.nextToken(),i=this.isolateCoverGrammar(this.parseAssignmentExpression)):r.type===u.Syntax.Identifier||e.inFor||this.expect("="),this.finalize(t,new a.VariableDeclarator(r,i))},e.prototype.parseVariableDeclarationList=function(e){var t={inFor:e.inFor},n=[];for(n.push(this.parseVariableDeclaration(t));this.match(",");)this.nextToken(),n.push(this.parseVariableDeclaration(t));return n},e.prototype.parseVariableStatement=function(){var e=this.createNode();this.expectKeyword("var");var t=this.parseVariableDeclarationList({inFor:!1});return this.consumeSemicolon(),this.finalize(e,new a.VariableDeclaration(t,"var"))},e.prototype.parseEmptyStatement=function(){var e=this.createNode();return this.expect(";"),this.finalize(e,new a.EmptyStatement)},e.prototype.parseExpressionStatement=function(){var e=this.createNode(),t=this.parseExpression();return this.consumeSemicolon(),this.finalize(e,new a.ExpressionStatement(t))},e.prototype.parseIfClause=function(){return this.context.strict&&this.matchKeyword("function")&&this.tolerateError(o.Messages.StrictFunction),this.parseStatement()},e.prototype.parseIfStatement=function(){var e,t=this.createNode(),n=null;this.expectKeyword("if"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement)):(this.expect(")"),e=this.parseIfClause(),this.matchKeyword("else")&&(this.nextToken(),n=this.parseIfClause())),this.finalize(t,new a.IfStatement(r,e,n))},e.prototype.parseDoWhileStatement=function(){var e=this.createNode();this.expectKeyword("do");var t=this.context.inIteration;this.context.inIteration=!0;var n=this.parseStatement();this.context.inIteration=t,this.expectKeyword("while"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?this.tolerateUnexpectedToken(this.nextToken()):(this.expect(")"),this.match(";")&&this.nextToken()),this.finalize(e,new a.DoWhileStatement(n,r))},e.prototype.parseWhileStatement=function(){var e,t=this.createNode();this.expectKeyword("while"),this.expect("(");var n=this.parseExpression();if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement);else{this.expect(")");var r=this.context.inIteration;this.context.inIteration=!0,e=this.parseStatement(),this.context.inIteration=r}return this.finalize(t,new a.WhileStatement(n,e))},e.prototype.parseForStatement=function(){var e,t,n=null,r=null,i=null,s=!0,l=this.createNode();if(this.expectKeyword("for"),this.expect("("),this.match(";"))this.nextToken();else if(this.matchKeyword("var")){n=this.createNode(),this.nextToken();var c=this.context.allowIn;this.context.allowIn=!1;var p=this.parseVariableDeclarationList({inFor:!0});if(this.context.allowIn=c,1===p.length&&this.matchKeyword("in")){var f=p[0];f.init&&(f.id.type===u.Syntax.ArrayPattern||f.id.type===u.Syntax.ObjectPattern||this.context.strict)&&this.tolerateError(o.Messages.ForInOfLoopInitializer,"for-in"),n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.nextToken(),e=n,t=this.parseExpression(),n=null}else 1===p.length&&null===p[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.nextToken(),e=n,t=this.parseAssignmentExpression(),n=null,s=!1):(n=this.finalize(n,new a.VariableDeclaration(p,"var")),this.expect(";"))}else if(this.matchKeyword("const")||this.matchKeyword("let")){n=this.createNode();var h=this.nextToken().value;if(this.context.strict||"in"!==this.lookahead.value){var c=this.context.allowIn;this.context.allowIn=!1;var p=this.parseBindingList(h,{inFor:!0});this.context.allowIn=c,1===p.length&&null===p[0].init&&this.matchKeyword("in")?(n=this.finalize(n,new a.VariableDeclaration(p,h)),this.nextToken(),e=n,t=this.parseExpression(),n=null):1===p.length&&null===p[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new a.VariableDeclaration(p,h)),this.nextToken(),e=n,t=this.parseAssignmentExpression(),n=null,s=!1):(this.consumeSemicolon(),n=this.finalize(n,new a.VariableDeclaration(p,h)))}else n=this.finalize(n,new a.Identifier(h)),this.nextToken(),e=n,t=this.parseExpression(),n=null}else{var d=this.lookahead,c=this.context.allowIn;if(this.context.allowIn=!1,n=this.inheritCoverGrammar(this.parseAssignmentExpression),this.context.allowIn=c,this.matchKeyword("in"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForIn),this.nextToken(),this.reinterpretExpressionAsPattern(n),e=n,t=this.parseExpression(),n=null;else if(this.matchContextualKeyword("of"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForLoop),this.nextToken(),this.reinterpretExpressionAsPattern(n),e=n,t=this.parseAssignmentExpression(),n=null,s=!1;else{if(this.match(",")){for(var m=[n];this.match(",");)this.nextToken(),m.push(this.isolateCoverGrammar(this.parseAssignmentExpression));n=this.finalize(this.startNode(d),new a.SequenceExpression(m))}this.expect(";")}}void 0===e&&(this.match(";")||(r=this.parseExpression()),this.expect(";"),this.match(")")||(i=this.parseExpression()));var v;if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),v=this.finalize(this.createNode(),new a.EmptyStatement);else{this.expect(")");var g=this.context.inIteration;this.context.inIteration=!0,v=this.isolateCoverGrammar(this.parseStatement),this.context.inIteration=g}return void 0===e?this.finalize(l,new a.ForStatement(n,r,i,v)):s?this.finalize(l,new a.ForInStatement(e,t,v)):this.finalize(l,new a.ForOfStatement(e,t,v))},e.prototype.parseContinueStatement=function(){var e=this.createNode();this.expectKeyword("continue");var t=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier();t=n;var r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name)}return this.consumeSemicolon(),null!==t||this.context.inIteration||this.throwError(o.Messages.IllegalContinue),this.finalize(e,new a.ContinueStatement(t))},e.prototype.parseBreakStatement=function(){var e=this.createNode();this.expectKeyword("break");var t=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier(),r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name),t=n}return this.consumeSemicolon(),null!==t||this.context.inIteration||this.context.inSwitch||this.throwError(o.Messages.IllegalBreak),this.finalize(e,new a.BreakStatement(t))},e.prototype.parseReturnStatement=function(){this.context.inFunctionBody||this.tolerateError(o.Messages.IllegalReturn);var e=this.createNode();this.expectKeyword("return");var t=!this.match(";")&&!this.match("}")&&!this.hasLineTerminator&&2!==this.lookahead.type,n=t?this.parseExpression():null;return this.consumeSemicolon(),this.finalize(e,new a.ReturnStatement(n))},e.prototype.parseWithStatement=function(){this.context.strict&&this.tolerateError(o.Messages.StrictModeWith);var e,t=this.createNode();this.expectKeyword("with"),this.expect("(");var n=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),e=this.finalize(this.createNode(),new a.EmptyStatement)):(this.expect(")"),e=this.parseStatement()),this.finalize(t,new a.WithStatement(n,e))},e.prototype.parseSwitchCase=function(){var e,t=this.createNode();this.matchKeyword("default")?(this.nextToken(),e=null):(this.expectKeyword("case"),e=this.parseExpression()),this.expect(":");for(var n=[];;){if(this.match("}")||this.matchKeyword("default")||this.matchKeyword("case"))break;n.push(this.parseStatementListItem())}return this.finalize(t,new a.SwitchCase(e,n))},e.prototype.parseSwitchStatement=function(){var e=this.createNode();this.expectKeyword("switch"),this.expect("(");var t=this.parseExpression();this.expect(")");var n=this.context.inSwitch;this.context.inSwitch=!0;var r=[],i=!1;for(this.expect("{");;){if(this.match("}"))break;var s=this.parseSwitchCase();null===s.test&&(i&&this.throwError(o.Messages.MultipleDefaultsInSwitch),i=!0),r.push(s)}return this.expect("}"),this.context.inSwitch=n,this.finalize(e,new a.SwitchStatement(t,r))},e.prototype.parseLabelledStatement=function(){var e,t=this.createNode(),n=this.parseExpression();if(n.type===u.Syntax.Identifier&&this.match(":")){this.nextToken();var r=n,i="$"+r.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,i)&&this.throwError(o.Messages.Redeclaration,"Label",r.name),this.context.labelSet[i]=!0;var s=void 0;if(this.matchKeyword("class"))this.tolerateUnexpectedToken(this.lookahead),s=this.parseClassDeclaration();else if(this.matchKeyword("function")){var l=this.lookahead,c=this.parseFunctionDeclaration();this.context.strict?this.tolerateUnexpectedToken(l,o.Messages.StrictFunction):c.generator&&this.tolerateUnexpectedToken(l,o.Messages.GeneratorInLegacyContext),s=c}else s=this.parseStatement();delete this.context.labelSet[i],e=new a.LabeledStatement(r,s)}else this.consumeSemicolon(),e=new a.ExpressionStatement(n);return this.finalize(t,e)},e.prototype.parseThrowStatement=function(){var e=this.createNode();this.expectKeyword("throw"),this.hasLineTerminator&&this.throwError(o.Messages.NewlineAfterThrow);var t=this.parseExpression();return this.consumeSemicolon(),this.finalize(e,new a.ThrowStatement(t))},e.prototype.parseCatchClause=function(){var e=this.createNode();this.expectKeyword("catch"),this.expect("("),this.match(")")&&this.throwUnexpectedToken(this.lookahead);for(var t=[],n=this.parsePattern(t),r={},i=0;i<t.length;i++){var s="$"+t[i].value;Object.prototype.hasOwnProperty.call(r,s)&&this.tolerateError(o.Messages.DuplicateBinding,t[i].value),r[s]=!0}this.context.strict&&n.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(n.name)&&this.tolerateError(o.Messages.StrictCatchVariable),this.expect(")");var l=this.parseBlock();return this.finalize(e,new a.CatchClause(n,l))},e.prototype.parseFinallyClause=function(){return this.expectKeyword("finally"),this.parseBlock()},e.prototype.parseTryStatement=function(){var e=this.createNode();this.expectKeyword("try");var t=this.parseBlock(),n=this.matchKeyword("catch")?this.parseCatchClause():null,r=this.matchKeyword("finally")?this.parseFinallyClause():null;return n||r||this.throwError(o.Messages.NoCatchOrFinally),this.finalize(e,new a.TryStatement(t,n,r))},e.prototype.parseDebuggerStatement=function(){var e=this.createNode();return this.expectKeyword("debugger"),this.consumeSemicolon(),this.finalize(e,new a.DebuggerStatement)},e.prototype.parseStatement=function(){var e;switch(this.lookahead.type){case 1:case 5:case 6:case 8:case 10:case 9:e=this.parseExpressionStatement();break;case 7:var t=this.lookahead.value;e="{"===t?this.parseBlock():"("===t?this.parseExpressionStatement():";"===t?this.parseEmptyStatement():this.parseExpressionStatement();break;case 3:e=this.matchAsyncFunction()?this.parseFunctionDeclaration():this.parseLabelledStatement();break;case 4:switch(this.lookahead.value){case"break":e=this.parseBreakStatement();break;case"continue":e=this.parseContinueStatement();break;case"debugger":e=this.parseDebuggerStatement();break;case"do":e=this.parseDoWhileStatement();break;case"for":e=this.parseForStatement();break;case"function":e=this.parseFunctionDeclaration();break;case"if":e=this.parseIfStatement();break;case"return":e=this.parseReturnStatement();break;case"switch":e=this.parseSwitchStatement();break;case"throw":e=this.parseThrowStatement();break;case"try":e=this.parseTryStatement();break;case"var":e=this.parseVariableStatement();break;case"while":e=this.parseWhileStatement();break;case"with":e=this.parseWithStatement();break;default:e=this.parseExpressionStatement()}break;default:e=this.throwUnexpectedToken(this.lookahead)}return e},e.prototype.parseFunctionSourceElements=function(){var e=this.createNode();this.expect("{");var t=this.parseDirectivePrologues(),n=this.context.labelSet,r=this.context.inIteration,i=this.context.inSwitch,o=this.context.inFunctionBody;for(this.context.labelSet={},this.context.inIteration=!1,this.context.inSwitch=!1,this.context.inFunctionBody=!0;2!==this.lookahead.type&&!this.match("}");)t.push(this.parseStatementListItem());return this.expect("}"),this.context.labelSet=n,this.context.inIteration=r,this.context.inSwitch=i,this.context.inFunctionBody=o,this.finalize(e,new a.BlockStatement(t))},e.prototype.validateParam=function(e,t,n){var r="$"+n;this.context.strict?(this.scanner.isRestrictedWord(n)&&(e.stricted=t,e.message=o.Messages.StrictParamName),Object.prototype.hasOwnProperty.call(e.paramSet,r)&&(e.stricted=t,e.message=o.Messages.StrictParamDupe)):e.firstRestricted||(this.scanner.isRestrictedWord(n)?(e.firstRestricted=t,e.message=o.Messages.StrictParamName):this.scanner.isStrictModeReservedWord(n)?(e.firstRestricted=t,e.message=o.Messages.StrictReservedWord):Object.prototype.hasOwnProperty.call(e.paramSet,r)&&(e.stricted=t,e.message=o.Messages.StrictParamDupe)),"function"==typeof Object.defineProperty?Object.defineProperty(e.paramSet,r,{value:!0,enumerable:!0,writable:!0,configurable:!0}):e.paramSet[r]=!0},e.prototype.parseRestElement=function(e){var t=this.createNode();this.expect("...");var n=this.parsePattern(e);return this.match("=")&&this.throwError(o.Messages.DefaultRestParameter),this.match(")")||this.throwError(o.Messages.ParameterAfterRestParameter),this.finalize(t,new a.RestElement(n))},e.prototype.parseFormalParameter=function(e){for(var t=[],n=this.match("...")?this.parseRestElement(t):this.parsePatternWithDefault(t),r=0;r<t.length;r++)this.validateParam(e,t[r],t[r].value);e.simple=e.simple&&n instanceof a.Identifier,e.params.push(n)},e.prototype.parseFormalParameters=function(e){var t;if(t={simple:!0,params:[],firstRestricted:e},this.expect("("),!this.match(")"))for(t.paramSet={};2!==this.lookahead.type&&(this.parseFormalParameter(t),!this.match(")"))&&(this.expect(","),!this.match(")")););return this.expect(")"),{simple:t.simple,params:t.params,stricted:t.stricted,firstRestricted:t.firstRestricted,message:t.message}},e.prototype.matchAsyncFunction=function(){var e=this.matchContextualKeyword("async");if(e){var t=this.scanner.saveState();this.scanner.scanComments();var n=this.scanner.lex();this.scanner.restoreState(t),e=t.lineNumber===n.lineNumber&&4===n.type&&"function"===n.value}return e},e.prototype.parseFunctionDeclaration=function(e){var t=this.createNode(),n=this.matchContextualKeyword("async");n&&this.nextToken(),this.expectKeyword("function");var r=!n&&this.match("*");r&&this.nextToken();var i,s=null,u=null;if(!e||!this.match("(")){var l=this.lookahead;s=this.parseVariableIdentifier(),this.context.strict?this.scanner.isRestrictedWord(l.value)&&this.tolerateUnexpectedToken(l,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(l.value)?(u=l,i=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(l.value)&&(u=l,i=o.Messages.StrictReservedWord)}var c=this.context.await,p=this.context.allowYield;this.context.await=n,this.context.allowYield=!r;var f=this.parseFormalParameters(u),h=f.params,d=f.stricted;u=f.firstRestricted,f.message&&(i=f.message);var m=this.context.strict,v=this.context.allowStrictDirective;this.context.allowStrictDirective=f.simple;var g=this.parseFunctionSourceElements();return this.context.strict&&u&&this.throwUnexpectedToken(u,i),this.context.strict&&d&&this.tolerateUnexpectedToken(d,i),this.context.strict=m,this.context.allowStrictDirective=v,this.context.await=c,this.context.allowYield=p,n?this.finalize(t,new a.AsyncFunctionDeclaration(s,h,g)):this.finalize(t,new a.FunctionDeclaration(s,h,g,r))},e.prototype.parseFunctionExpression=function(){var e=this.createNode(),t=this.matchContextualKeyword("async");t&&this.nextToken(),this.expectKeyword("function");var n=!t&&this.match("*");n&&this.nextToken();var r,i,s=null,u=this.context.await,l=this.context.allowYield;if(this.context.await=t,this.context.allowYield=!n,!this.match("(")){var c=this.lookahead;s=this.context.strict||n||!this.matchKeyword("yield")?this.parseVariableIdentifier():this.parseIdentifierName(),this.context.strict?this.scanner.isRestrictedWord(c.value)&&this.tolerateUnexpectedToken(c,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(c.value)?(i=c,r=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(c.value)&&(i=c,r=o.Messages.StrictReservedWord)}var p=this.parseFormalParameters(i),f=p.params,h=p.stricted;i=p.firstRestricted,p.message&&(r=p.message);var d=this.context.strict,m=this.context.allowStrictDirective;this.context.allowStrictDirective=p.simple;var v=this.parseFunctionSourceElements();return this.context.strict&&i&&this.throwUnexpectedToken(i,r),this.context.strict&&h&&this.tolerateUnexpectedToken(h,r),this.context.strict=d,this.context.allowStrictDirective=m,this.context.await=u,this.context.allowYield=l,t?this.finalize(e,new a.AsyncFunctionExpression(s,f,v)):this.finalize(e,new a.FunctionExpression(s,f,v,n))},e.prototype.parseDirective=function(){var e=this.lookahead,t=this.createNode(),n=this.parseExpression(),r=n.type===u.Syntax.Literal?this.getTokenRaw(e).slice(1,-1):null;return this.consumeSemicolon(),this.finalize(t,r?new a.Directive(n,r):new a.ExpressionStatement(n))},e.prototype.parseDirectivePrologues=function(){for(var e=null,t=[];;){var n=this.lookahead;if(8!==n.type)break;var r=this.parseDirective();t.push(r);var i=r.directive;if("string"!=typeof i)break;"use strict"===i?(this.context.strict=!0,e&&this.tolerateUnexpectedToken(e,o.Messages.StrictOctalLiteral),this.context.allowStrictDirective||this.tolerateUnexpectedToken(n,o.Messages.IllegalLanguageModeDirective)):!e&&n.octal&&(e=n)}return t},e.prototype.qualifiedPropertyName=function(e){switch(e.type){case 3:case 8:case 1:case 5:case 6:case 4:return!0;case 7:return"["===e.value}return!1},e.prototype.parseGetterMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();n.params.length>0&&this.tolerateError(o.Messages.BadGetterArity);var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parseSetterMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();1!==n.params.length?this.tolerateError(o.Messages.BadSetterArity):n.params[0]instanceof a.RestElement&&this.tolerateError(o.Messages.BadSetterRestParameter);var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!1))},e.prototype.parseGeneratorMethod=function(){var e=this.createNode(),t=this.context.allowYield;this.context.allowYield=!0;var n=this.parseFormalParameters();this.context.allowYield=!1;var r=this.parsePropertyMethod(n);return this.context.allowYield=t,this.finalize(e,new a.FunctionExpression(null,n.params,r,!0))},e.prototype.isStartOfExpression=function(){var e=!0,t=this.lookahead.value;switch(this.lookahead.type){case 7:e="["===t||"("===t||"{"===t||"+"===t||"-"===t||"!"===t||"~"===t||"++"===t||"--"===t||"/"===t||"/="===t;break;case 4:e="class"===t||"delete"===t||"function"===t||"let"===t||"new"===t||"super"===t||"this"===t||"typeof"===t||"void"===t||"yield"===t}return e},e.prototype.parseYieldExpression=function(){var e=this.createNode();this.expectKeyword("yield");var t=null,n=!1;if(!this.hasLineTerminator){var r=this.context.allowYield;this.context.allowYield=!1,n=this.match("*"),n?(this.nextToken(),t=this.parseAssignmentExpression()):this.isStartOfExpression()&&(t=this.parseAssignmentExpression()),this.context.allowYield=r}return this.finalize(e,new a.YieldExpression(t,n))},e.prototype.parseClassElement=function(e){var t=this.lookahead,n=this.createNode(),r="",i=null,s=null,u=!1,l=!1,c=!1,p=!1;if(this.match("*"))this.nextToken();else{u=this.match("["),i=this.parseObjectPropertyKey();if("static"===i.name&&(this.qualifiedPropertyName(this.lookahead)||this.match("*"))&&(t=this.lookahead,c=!0,u=this.match("["),this.match("*")?this.nextToken():i=this.parseObjectPropertyKey()),3===t.type&&!this.hasLineTerminator&&"async"===t.value){var f=this.lookahead.value;":"!==f&&"("!==f&&"*"!==f&&(p=!0,t=this.lookahead,i=this.parseObjectPropertyKey(),3===t.type&&("get"===t.value||"set"===t.value?this.tolerateUnexpectedToken(t):"constructor"===t.value&&this.tolerateUnexpectedToken(t,o.Messages.ConstructorIsAsync)))}}var h=this.qualifiedPropertyName(this.lookahead);return 3===t.type?"get"===t.value&&h?(r="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,s=this.parseGetterMethod()):"set"===t.value&&h&&(r="set",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseSetterMethod()):7===t.type&&"*"===t.value&&h&&(r="init",u=this.match("["),i=this.parseObjectPropertyKey(),s=this.parseGeneratorMethod(),l=!0),!r&&i&&this.match("(")&&(r="init",s=p?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),l=!0),r||this.throwUnexpectedToken(this.lookahead),"init"===r&&(r="method"),u||(c&&this.isPropertyKey(i,"prototype")&&this.throwUnexpectedToken(t,o.Messages.StaticPrototype),!c&&this.isPropertyKey(i,"constructor")&&(("method"!==r||!l||s&&s.generator)&&this.throwUnexpectedToken(t,o.Messages.ConstructorSpecialMethod),e.value?this.throwUnexpectedToken(t,o.Messages.DuplicateConstructor):e.value=!0,r="constructor")),this.finalize(n,new a.MethodDefinition(i,u,s,r,c))},e.prototype.parseClassElementList=function(){var e=[],t={value:!1};for(this.expect("{");!this.match("}");)this.match(";")?this.nextToken():e.push(this.parseClassElement(t));return this.expect("}"),e},e.prototype.parseClassBody=function(){var e=this.createNode(),t=this.parseClassElementList();return this.finalize(e,new a.ClassBody(t))},e.prototype.parseClassDeclaration=function(e){var t=this.createNode(),n=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var r=e&&3!==this.lookahead.type?null:this.parseVariableIdentifier(),i=null;this.matchKeyword("extends")&&(this.nextToken(),i=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var o=this.parseClassBody();return this.context.strict=n,this.finalize(t,new a.ClassDeclaration(r,i,o))},e.prototype.parseClassExpression=function(){var e=this.createNode(),t=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var n=3===this.lookahead.type?this.parseVariableIdentifier():null,r=null;this.matchKeyword("extends")&&(this.nextToken(),r=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var i=this.parseClassBody();return this.context.strict=t,this.finalize(e,new a.ClassExpression(n,r,i))},e.prototype.parseModule=function(){this.context.strict=!0,this.context.isModule=!0;for(var e=this.createNode(),t=this.parseDirectivePrologues();2!==this.lookahead.type;)t.push(this.parseStatementListItem());return this.finalize(e,new a.Module(t))},e.prototype.parseScript=function(){for(var e=this.createNode(),t=this.parseDirectivePrologues();2!==this.lookahead.type;)t.push(this.parseStatementListItem());return this.finalize(e,new a.Script(t))},e.prototype.parseModuleSpecifier=function(){var e=this.createNode();8!==this.lookahead.type&&this.throwError(o.Messages.InvalidModuleSpecifier);var t=this.nextToken(),n=this.getTokenRaw(t);return this.finalize(e,new a.Literal(t.value,n))},e.prototype.parseImportSpecifier=function(){var e,t,n=this.createNode();return 3===this.lookahead.type?(e=this.parseVariableIdentifier(),t=e,this.matchContextualKeyword("as")&&(this.nextToken(),t=this.parseVariableIdentifier())):(e=this.parseIdentifierName(),t=e,this.matchContextualKeyword("as")?(this.nextToken(),t=this.parseVariableIdentifier()):this.throwUnexpectedToken(this.nextToken())),this.finalize(n,new a.ImportSpecifier(t,e))},e.prototype.parseNamedImports=function(){this.expect("{");for(var e=[];!this.match("}");)e.push(this.parseImportSpecifier()),this.match("}")||this.expect(",");return this.expect("}"),e},e.prototype.parseImportDefaultSpecifier=function(){var e=this.createNode(),t=this.parseIdentifierName();return this.finalize(e,new a.ImportDefaultSpecifier(t))},e.prototype.parseImportNamespaceSpecifier=function(){var e=this.createNode();this.expect("*"),this.matchContextualKeyword("as")||this.throwError(o.Messages.NoAsAfterImportNamespace),this.nextToken();var t=this.parseIdentifierName();return this.finalize(e,new a.ImportNamespaceSpecifier(t))},e.prototype.parseImportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalImportDeclaration);var e=this.createNode();this.expectKeyword("import");var t,n=[];if(8===this.lookahead.type)t=this.parseModuleSpecifier();else{if(this.match("{")?n=n.concat(this.parseNamedImports()):this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.isIdentifierName(this.lookahead)&&!this.matchKeyword("default")?(n.push(this.parseImportDefaultSpecifier()),this.match(",")&&(this.nextToken(),this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.match("{")?n=n.concat(this.parseNamedImports()):this.throwUnexpectedToken(this.lookahead))):this.throwUnexpectedToken(this.nextToken()),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken(),t=this.parseModuleSpecifier()}return this.consumeSemicolon(),this.finalize(e,new a.ImportDeclaration(n,t))},e.prototype.parseExportSpecifier=function(){var e=this.createNode(),t=this.parseIdentifierName(),n=t;return this.matchContextualKeyword("as")&&(this.nextToken(),n=this.parseIdentifierName()),this.finalize(e,new a.ExportSpecifier(t,n))},e.prototype.parseExportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalExportDeclaration);var e=this.createNode();this.expectKeyword("export");var t;if(this.matchKeyword("default"))if(this.nextToken(),this.matchKeyword("function")){var n=this.parseFunctionDeclaration(!0);t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.matchKeyword("class")){var n=this.parseClassDeclaration(!0);t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.matchContextualKeyword("async")){var n=this.matchAsyncFunction()?this.parseFunctionDeclaration(!0):this.parseAssignmentExpression();t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else{this.matchContextualKeyword("from")&&this.throwError(o.Messages.UnexpectedToken,this.lookahead.value);var n=this.match("{")?this.parseObjectInitializer():this.match("[")?this.parseArrayInitializer():this.parseAssignmentExpression();this.consumeSemicolon(),t=this.finalize(e,new a.ExportDefaultDeclaration(n))}else if(this.match("*")){if(this.nextToken(),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken();var i=this.parseModuleSpecifier();this.consumeSemicolon(),t=this.finalize(e,new a.ExportAllDeclaration(i))}else if(4===this.lookahead.type){var n=void 0;switch(this.lookahead.value){case"let":case"const":n=this.parseLexicalDeclaration({inFor:!1});break;case"var":case"class":case"function":n=this.parseStatementListItem();break;default:this.throwUnexpectedToken(this.lookahead)}t=this.finalize(e,new a.ExportNamedDeclaration(n,[],null))}else if(this.matchAsyncFunction()){var n=this.parseFunctionDeclaration();t=this.finalize(e,new a.ExportNamedDeclaration(n,[],null))}else{var s=[],u=null,l=!1;for(this.expect("{");!this.match("}");)l=l||this.matchKeyword("default"),s.push(this.parseExportSpecifier()),this.match("}")||this.expect(",");if(this.expect("}"),this.matchContextualKeyword("from"))this.nextToken(),u=this.parseModuleSpecifier(),this.consumeSemicolon();else if(l){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}else this.consumeSemicolon();t=this.finalize(e,new a.ExportNamedDeclaration(null,s,u))}return t},e}();t.Parser=c},function(e,t){"use strict";function n(e,t){if(!e)throw new Error("ASSERT: "+t)}Object.defineProperty(t,"__esModule",{value:!0}),t.assert=n},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=function(){function e(){this.errors=[],this.tolerant=!1}return e.prototype.recordError=function(e){this.errors.push(e)},e.prototype.tolerate=function(e){if(!this.tolerant)throw e;this.recordError(e)},e.prototype.constructError=function(e,t){var n=new Error(e);try{throw n}catch(e){Object.create&&Object.defineProperty&&(n=Object.create(e),Object.defineProperty(n,"column",{value:t}))}return n},e.prototype.createError=function(e,t,n,r){var i="Line "+t+": "+r,o=this.constructError(i,n);return o.index=e,o.lineNumber=t,o.description=r,o},e.prototype.throwError=function(e,t,n,r){throw this.createError(e,t,n,r)},e.prototype.tolerateError=function(e,t,n,r){var i=this.createError(e,t,n,r);if(!this.tolerant)throw i;this.recordError(i)},e}();t.ErrorHandler=n},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Messages={BadGetterArity:"Getter must not have any formal parameters",BadSetterArity:"Setter must have exactly one formal parameter",BadSetterRestParameter:"Setter function argument must not be a rest parameter",ConstructorIsAsync:"Class constructor may not be an async method",ConstructorSpecialMethod:"Class constructor may not be an accessor",DeclarationMissingInitializer:"Missing initializer in %0 declaration",DefaultRestParameter:"Unexpected token =",DuplicateBinding:"Duplicate binding %0",DuplicateConstructor:"A class may only have one constructor",DuplicateProtoProperty:"Duplicate __proto__ fields are not allowed in object literals",ForInOfLoopInitializer:"%0 loop variable declaration may not have an initializer",GeneratorInLegacyContext:"Generator declarations are not allowed in legacy contexts",IllegalBreak:"Illegal break statement",IllegalContinue:"Illegal continue statement",IllegalExportDeclaration:"Unexpected token",IllegalImportDeclaration:"Unexpected token",IllegalLanguageModeDirective:"Illegal 'use strict' directive in function with non-simple parameter list",IllegalReturn:"Illegal return statement",InvalidEscapedReservedWord:"Keyword must not contain escaped characters",InvalidHexEscapeSequence:"Invalid hexadecimal escape sequence",InvalidLHSInAssignment:"Invalid left-hand side in assignment",InvalidLHSInForIn:"Invalid left-hand side in for-in",InvalidLHSInForLoop:"Invalid left-hand side in for-loop",InvalidModuleSpecifier:"Unexpected token",InvalidRegExp:"Invalid regular expression",LetInLexicalBinding:"let is disallowed as a lexically bound name",MissingFromClause:"Unexpected token",MultipleDefaultsInSwitch:"More than one default clause in switch statement",NewlineAfterThrow:"Illegal newline after throw",NoAsAfterImportNamespace:"Unexpected token",NoCatchOrFinally:"Missing catch or finally after try",ParameterAfterRestParameter:"Rest parameter must be last formal parameter",Redeclaration:"%0 '%1' has already been declared",StaticPrototype:"Classes may not have static property named prototype",StrictCatchVariable:"Catch variable may not be eval or arguments in strict mode",StrictDelete:"Delete of an unqualified identifier in strict mode.",StrictFunction:"In strict mode code, functions can only be declared at top level or inside a block",StrictFunctionName:"Function name may not be eval or arguments in strict mode",StrictLHSAssignment:"Assignment to eval or arguments is not allowed in strict mode",StrictLHSPostfix:"Postfix increment/decrement may not have eval or arguments operand in strict mode",StrictLHSPrefix:"Prefix increment/decrement may not have eval or arguments operand in strict mode",StrictModeWith:"Strict mode code may not include a with statement",StrictOctalLiteral:"Octal literals are not allowed in strict mode.",StrictParamDupe:"Strict mode function may not have duplicate parameter names",StrictParamName:"Parameter name eval or arguments is not allowed in strict mode",StrictReservedWord:"Use of future reserved word in strict mode",StrictVarName:"Variable name may not be eval or arguments in strict mode",TemplateOctalLiteral:"Octal literals are not allowed in template strings.",UnexpectedEOS:"Unexpected end of input",UnexpectedIdentifier:"Unexpected identifier",UnexpectedNumber:"Unexpected number",UnexpectedReserved:"Unexpected reserved word",UnexpectedString:"Unexpected string",UnexpectedTemplate:"Unexpected quasi %0",UnexpectedToken:"Unexpected token %0",UnexpectedTokenIllegal:"Unexpected token ILLEGAL",UnknownLabel:"Undefined label '%0'",UnterminatedRegExp:"Invalid regular expression: missing /"}},function(e,t,n){"use strict";function r(e){return"0123456789abcdef".indexOf(e.toLowerCase())}function i(e){return"01234567".indexOf(e)}Object.defineProperty(t,"__esModule",{value:!0});var o=n(9),a=n(4),s=n(11),u=function(){function e(e,t){this.source=e,this.errorHandler=t,this.trackComment=!1,this.length=e.length,this.index=0,this.lineNumber=e.length>0?1:0,this.lineStart=0,this.curlyStack=[]}return e.prototype.saveState=function(){return{index:this.index,lineNumber:this.lineNumber,lineStart:this.lineStart}},e.prototype.restoreState=function(e){this.index=e.index,this.lineNumber=e.lineNumber,this.lineStart=e.lineStart},e.prototype.eof=function(){return this.index>=this.length},e.prototype.throwUnexpectedToken=function(e){return void 0===e&&(e=s.Messages.UnexpectedTokenIllegal),this.errorHandler.throwError(this.index,this.lineNumber,this.index-this.lineStart+1,e)},e.prototype.tolerateUnexpectedToken=function(e){void 0===e&&(e=s.Messages.UnexpectedTokenIllegal),this.errorHandler.tolerateError(this.index,this.lineNumber,this.index-this.lineStart+1,e)},e.prototype.skipSingleLineComment=function(e){var t,n,r=[];for(this.trackComment&&(r=[],t=this.index-e,n={start:{line:this.lineNumber,column:this.index-this.lineStart-e},end:{}});!this.eof();){var i=this.source.charCodeAt(this.index);if(++this.index,a.Character.isLineTerminator(i)){if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart-1};var o={multiLine:!1,slice:[t+e,this.index-1],range:[t,this.index-1],loc:n};r.push(o)}return 13===i&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,r}}if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart};var o={multiLine:!1,slice:[t+e,this.index],range:[t,this.index],loc:n};r.push(o)}return r},e.prototype.skipMultiLineComment=function(){var e,t,n=[];for(this.trackComment&&(n=[],e=this.index-2,t={start:{line:this.lineNumber,column:this.index-this.lineStart-2},end:{}});!this.eof();){var r=this.source.charCodeAt(this.index);if(a.Character.isLineTerminator(r))13===r&&10===this.source.charCodeAt(this.index+1)&&++this.index,++this.lineNumber,++this.index,this.lineStart=this.index;else if(42===r){if(47===this.source.charCodeAt(this.index+1)){if(this.index+=2,this.trackComment){t.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[e+2,this.index-2],range:[e,this.index],loc:t};n.push(i)}return n}++this.index}else++this.index}if(this.trackComment){t.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[e+2,this.index],range:[e,this.index],loc:t};n.push(i)}return this.tolerateUnexpectedToken(),n},e.prototype.scanComments=function(){var e;this.trackComment&&(e=[]);for(var t=0===this.index;!this.eof();){var n=this.source.charCodeAt(this.index);if(a.Character.isWhiteSpace(n))++this.index;else if(a.Character.isLineTerminator(n))++this.index,13===n&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,t=!0;else if(47===n)if(47===(n=this.source.charCodeAt(this.index+1))){this.index+=2;var r=this.skipSingleLineComment(2);this.trackComment&&(e=e.concat(r)),t=!0}else{if(42!==n)break;this.index+=2;var r=this.skipMultiLineComment();this.trackComment&&(e=e.concat(r))}else if(t&&45===n){if(45!==this.source.charCodeAt(this.index+1)||62!==this.source.charCodeAt(this.index+2))break;this.index+=3;var r=this.skipSingleLineComment(3);this.trackComment&&(e=e.concat(r))}else{if(60!==n)break;if("!--"!==this.source.slice(this.index+1,this.index+4))break;this.index+=4;var r=this.skipSingleLineComment(4);this.trackComment&&(e=e.concat(r))}}return e},e.prototype.isFutureReservedWord=function(e){switch(e){case"enum":case"export":case"import":case"super":return!0;default:return!1}},e.prototype.isStrictModeReservedWord=function(e){switch(e){case"implements":case"interface":case"package":case"private":case"protected":case"public":case"static":case"yield":case"let":return!0;default:return!1}},e.prototype.isRestrictedWord=function(e){return"eval"===e||"arguments"===e},e.prototype.isKeyword=function(e){switch(e.length){case 2:return"if"===e||"in"===e||"do"===e;case 3:return"var"===e||"for"===e||"new"===e||"try"===e||"let"===e;case 4:return"this"===e||"else"===e||"case"===e||"void"===e||"with"===e||"enum"===e;case 5:return"while"===e||"break"===e||"catch"===e||"throw"===e||"const"===e||"yield"===e||"class"===e||"super"===e;case 6:return"return"===e||"typeof"===e||"delete"===e||"switch"===e||"export"===e||"import"===e;case 7:return"default"===e||"finally"===e||"extends"===e;case 8:return"function"===e||"continue"===e||"debugger"===e;case 10:return"instanceof"===e;default:return!1}},e.prototype.codePointAt=function(e){var t=this.source.charCodeAt(e);if(t>=55296&&t<=56319){var n=this.source.charCodeAt(e+1);if(n>=56320&&n<=57343){t=1024*(t-55296)+n-56320+65536}}return t},e.prototype.scanHexEscape=function(e){for(var t="u"===e?4:2,n=0,i=0;i<t;++i){if(this.eof()||!a.Character.isHexDigit(this.source.charCodeAt(this.index)))return null;n=16*n+r(this.source[this.index++])}return String.fromCharCode(n)},e.prototype.scanUnicodeCodePointEscape=function(){var e=this.source[this.index],t=0;for("}"===e&&this.throwUnexpectedToken();!this.eof()&&(e=this.source[this.index++],a.Character.isHexDigit(e.charCodeAt(0)));)t=16*t+r(e);return(t>1114111||"}"!==e)&&this.throwUnexpectedToken(),a.Character.fromCodePoint(t)},e.prototype.getIdentifier=function(){for(var e=this.index++;!this.eof();){var t=this.source.charCodeAt(this.index);if(92===t)return this.index=e,this.getComplexIdentifier();if(t>=55296&&t<57343)return this.index=e,this.getComplexIdentifier();if(!a.Character.isIdentifierPart(t))break;++this.index}return this.source.slice(e,this.index)},e.prototype.getComplexIdentifier=function(){var e=this.codePointAt(this.index),t=a.Character.fromCodePoint(e);this.index+=t.length;var n;for(92===e&&(117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&a.Character.isIdentifierStart(n.charCodeAt(0))||this.throwUnexpectedToken(),t=n);!this.eof()&&(e=this.codePointAt(this.index),a.Character.isIdentifierPart(e));)n=a.Character.fromCodePoint(e),t+=n,this.index+=n.length,92===e&&(t=t.substr(0,t.length-1),117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&a.Character.isIdentifierPart(n.charCodeAt(0))||this.throwUnexpectedToken(),t+=n);return t},e.prototype.octalToDecimal=function(e){var t="0"!==e,n=i(e);return!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(t=!0,n=8*n+i(this.source[this.index++]),"0123".indexOf(e)>=0&&!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(n=8*n+i(this.source[this.index++]))),{code:n,octal:t}},e.prototype.scanIdentifier=function(){var e,t=this.index,n=92===this.source.charCodeAt(t)?this.getComplexIdentifier():this.getIdentifier();if(3!==(e=1===n.length?3:this.isKeyword(n)?4:"null"===n?5:"true"===n||"false"===n?1:3)&&t+n.length!==this.index){var r=this.index;this.index=t,this.tolerateUnexpectedToken(s.Messages.InvalidEscapedReservedWord),this.index=r}return{type:e,value:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},e.prototype.scanPunctuator=function(){var e=this.index,t=this.source[this.index];switch(t){case"(":case"{":"{"===t&&this.curlyStack.push("{"),++this.index;break;case".":++this.index,"."===this.source[this.index]&&"."===this.source[this.index+1]&&(this.index+=2,t="...");break;case"}":++this.index,this.curlyStack.pop();break;case")":case";":case",":case"[":case"]":case":":case"?":case"~":++this.index;break;default:t=this.source.substr(this.index,4),">>>="===t?this.index+=4:(t=t.substr(0,3),"==="===t||"!=="===t||">>>"===t||"<<="===t||">>="===t||"**="===t?this.index+=3:(t=t.substr(0,2),"&&"===t||"||"===t||"=="===t||"!="===t||"+="===t||"-="===t||"*="===t||"/="===t||"++"===t||"--"===t||"<<"===t||">>"===t||"&="===t||"|="===t||"^="===t||"%="===t||"<="===t||">="===t||"=>"===t||"**"===t?this.index+=2:(t=this.source[this.index],"<>=!+-*%&|^/".indexOf(t)>=0&&++this.index)))}return this.index===e&&this.throwUnexpectedToken(),{type:7,value:t,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanHexLiteral=function(e){for(var t="";!this.eof()&&a.Character.isHexDigit(this.source.charCodeAt(this.index));)t+=this.source[this.index++];return 0===t.length&&this.throwUnexpectedToken(),a.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseInt("0x"+t,16),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanBinaryLiteral=function(e){for(var t,n="";!this.eof()&&("0"===(t=this.source[this.index])||"1"===t);)n+=this.source[this.index++];return 0===n.length&&this.throwUnexpectedToken(),this.eof()||(t=this.source.charCodeAt(this.index),(a.Character.isIdentifierStart(t)||a.Character.isDecimalDigit(t))&&this.throwUnexpectedToken()),{type:6,value:parseInt(n,2),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanOctalLiteral=function(e,t){var n="",r=!1;for(a.Character.isOctalDigit(e.charCodeAt(0))?(r=!0,n="0"+this.source[this.index++]):++this.index;!this.eof()&&a.Character.isOctalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];return r||0!==n.length||this.throwUnexpectedToken(),(a.Character.isIdentifierStart(this.source.charCodeAt(this.index))||a.Character.isDecimalDigit(this.source.charCodeAt(this.index)))&&this.throwUnexpectedToken(),{type:6,value:parseInt(n,8),octal:r,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},e.prototype.isImplicitOctalLiteral=function(){for(var e=this.index+1;e<this.length;++e){var t=this.source[e];if("8"===t||"9"===t)return!1;if(!a.Character.isOctalDigit(t.charCodeAt(0)))return!0}return!0},e.prototype.scanNumericLiteral=function(){var e=this.index,t=this.source[e];o.assert(a.Character.isDecimalDigit(t.charCodeAt(0))||"."===t,"Numeric literal must start with a decimal digit or a decimal point");var n="";if("."!==t){if(n=this.source[this.index++],t=this.source[this.index],"0"===n){if("x"===t||"X"===t)return++this.index,this.scanHexLiteral(e);if("b"===t||"B"===t)return++this.index,this.scanBinaryLiteral(e);if("o"===t||"O"===t)return this.scanOctalLiteral(t,e);if(t&&a.Character.isOctalDigit(t.charCodeAt(0))&&this.isImplicitOctalLiteral())return this.scanOctalLiteral(t,e)}for(;a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];t=this.source[this.index]}if("."===t){for(n+=this.source[this.index++];a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];t=this.source[this.index]}if("e"===t||"E"===t)if(n+=this.source[this.index++],t=this.source[this.index],"+"!==t&&"-"!==t||(n+=this.source[this.index++]),a.Character.isDecimalDigit(this.source.charCodeAt(this.index)))for(;a.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];else this.throwUnexpectedToken();return a.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseFloat(n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanStringLiteral=function(){var e=this.index,t=this.source[e];o.assert("'"===t||'"'===t,"String literal must starts with a quote"),++this.index;for(var n=!1,r="";!this.eof();){var i=this.source[this.index++];if(i===t){t="";break}if("\\"===i)if((i=this.source[this.index++])&&a.Character.isLineTerminator(i.charCodeAt(0)))++this.lineNumber,"\r"===i&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(i){case"u":if("{"===this.source[this.index])++this.index,r+=this.scanUnicodeCodePointEscape();else{var u=this.scanHexEscape(i);null===u&&this.throwUnexpectedToken(),r+=u}break;case"x":var l=this.scanHexEscape(i);null===l&&this.throwUnexpectedToken(s.Messages.InvalidHexEscapeSequence),r+=l;break;case"n":r+="\n";break;case"r":r+="\r";break;case"t":r+="\t";break;case"b":r+="\b";break;case"f":r+="\f";break;case"v":r+="\v";break;case"8":case"9":r+=i,this.tolerateUnexpectedToken();break;default:if(i&&a.Character.isOctalDigit(i.charCodeAt(0))){var c=this.octalToDecimal(i);n=c.octal||n,r+=String.fromCharCode(c.code)}else r+=i}else{if(a.Character.isLineTerminator(i.charCodeAt(0)))break;r+=i}}return""!==t&&(this.index=e,this.throwUnexpectedToken()),{type:8,value:r,octal:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.scanTemplate=function(){var e="",t=!1,n=this.index,r="`"===this.source[n],i=!1,o=2;for(++this.index;!this.eof();){var u=this.source[this.index++];if("`"===u){o=1,i=!0,t=!0;break}if("$"===u){if("{"===this.source[this.index]){this.curlyStack.push("${"),++this.index,t=!0;break}e+=u}else if("\\"===u)if(u=this.source[this.index++],a.Character.isLineTerminator(u.charCodeAt(0)))++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(u){case"n":e+="\n";break;case"r":e+="\r";break;case"t":e+="\t";break;case"u":if("{"===this.source[this.index])++this.index,e+=this.scanUnicodeCodePointEscape();else{var l=this.index,c=this.scanHexEscape(u);null!==c?e+=c:(this.index=l,e+=u)}break;case"x":var p=this.scanHexEscape(u);null===p&&this.throwUnexpectedToken(s.Messages.InvalidHexEscapeSequence),e+=p;break;case"b":e+="\b";break;case"f":e+="\f";break;case"v":e+="\v";break;default:"0"===u?(a.Character.isDecimalDigit(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(s.Messages.TemplateOctalLiteral),e+="\0"):a.Character.isOctalDigit(u.charCodeAt(0))?this.throwUnexpectedToken(s.Messages.TemplateOctalLiteral):e+=u}else a.Character.isLineTerminator(u.charCodeAt(0))?(++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index,e+="\n"):e+=u}return t||this.throwUnexpectedToken(),r||this.curlyStack.pop(),{type:10,value:this.source.slice(n+1,this.index-o),cooked:e,head:r,tail:i,lineNumber:this.lineNumber,lineStart:this.lineStart,start:n,end:this.index}},e.prototype.testRegExp=function(e,t){var n=e,r=this;t.indexOf("u")>=0&&(n=n.replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g,function(e,t,n){var i=parseInt(t||n,16);return i>1114111&&r.throwUnexpectedToken(s.Messages.InvalidRegExp),i<=65535?String.fromCharCode(i):"￿"}).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"￿"));try{RegExp(n)}catch(e){this.throwUnexpectedToken(s.Messages.InvalidRegExp)}try{return new RegExp(e,t)}catch(e){return null}},e.prototype.scanRegExpBody=function(){var e=this.source[this.index];o.assert("/"===e,"Regular expression literal must start with a slash");for(var t=this.source[this.index++],n=!1,r=!1;!this.eof();)if(e=this.source[this.index++],t+=e,"\\"===e)e=this.source[this.index++],a.Character.isLineTerminator(e.charCodeAt(0))&&this.throwUnexpectedToken(s.Messages.UnterminatedRegExp),t+=e;else if(a.Character.isLineTerminator(e.charCodeAt(0)))this.throwUnexpectedToken(s.Messages.UnterminatedRegExp);else if(n)"]"===e&&(n=!1);else{if("/"===e){r=!0;break}"["===e&&(n=!0)}return r||this.throwUnexpectedToken(s.Messages.UnterminatedRegExp),t.substr(1,t.length-2)},e.prototype.scanRegExpFlags=function(){for(var e="",t="";!this.eof();){var n=this.source[this.index];if(!a.Character.isIdentifierPart(n.charCodeAt(0)))break;if(++this.index,"\\"!==n||this.eof())t+=n,e+=n;else if("u"===(n=this.source[this.index])){++this.index;var r=this.index,i=this.scanHexEscape("u");if(null!==i)for(t+=i,e+="\\u";r<this.index;++r)e+=this.source[r];else this.index=r,t+="u",e+="\\u";this.tolerateUnexpectedToken()}else e+="\\",this.tolerateUnexpectedToken()}return t},e.prototype.scanRegExp=function(){var e=this.index,t=this.scanRegExpBody(),n=this.scanRegExpFlags();return{type:9,value:"",pattern:t,flags:n,regex:this.testRegExp(t,n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},e.prototype.lex=function(){if(this.eof())return{type:2,value:"",lineNumber:this.lineNumber,lineStart:this.lineStart,start:this.index,end:this.index};var e=this.source.charCodeAt(this.index);return a.Character.isIdentifierStart(e)?this.scanIdentifier():40===e||41===e||59===e?this.scanPunctuator():39===e||34===e?this.scanStringLiteral():46===e?a.Character.isDecimalDigit(this.source.charCodeAt(this.index+1))?this.scanNumericLiteral():this.scanPunctuator():a.Character.isDecimalDigit(e)?this.scanNumericLiteral():96===e||125===e&&"${"===this.curlyStack[this.curlyStack.length-1]?this.scanTemplate():e>=55296&&e<57343&&a.Character.isIdentifierStart(this.codePointAt(this.index))?this.scanIdentifier():this.scanPunctuator()},e}();t.Scanner=u},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.TokenName={},t.TokenName[1]="Boolean",t.TokenName[2]="<end>",t.TokenName[3]="Identifier",t.TokenName[4]="Keyword",t.TokenName[5]="Null",t.TokenName[6]="Numeric",t.TokenName[7]="Punctuator",t.TokenName[8]="String",t.TokenName[9]="RegularExpression",t.TokenName[10]="Template"},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.XHTMLEntities={quot:'"',amp:"&",apos:"'",gt:">",nbsp:" ",iexcl:"¡",cent:"¢",pound:"£",curren:"¤",yen:"¥",brvbar:"¦",sect:"§",uml:"¨",copy:"©",ordf:"ª",laquo:"«",not:"¬",shy:"­",reg:"®",macr:"¯",deg:"°",plusmn:"±",sup2:"²",sup3:"³",acute:"´",micro:"µ",para:"¶",middot:"·",cedil:"¸",sup1:"¹",ordm:"º",raquo:"»",frac14:"¼",frac12:"½",frac34:"¾",iquest:"¿",Agrave:"À",Aacute:"Á",Acirc:"Â",Atilde:"Ã",Auml:"Ä",Aring:"Å",AElig:"Æ",Ccedil:"Ç",Egrave:"È",Eacute:"É",Ecirc:"Ê",Euml:"Ë",Igrave:"Ì",Iacute:"Í",Icirc:"Î",Iuml:"Ï",ETH:"Ð",Ntilde:"Ñ",Ograve:"Ò",Oacute:"Ó",Ocirc:"Ô",Otilde:"Õ",Ouml:"Ö",times:"×",Oslash:"Ø",Ugrave:"Ù",Uacute:"Ú",Ucirc:"Û",Uuml:"Ü",Yacute:"Ý",THORN:"Þ",szlig:"ß",agrave:"à",aacute:"á",acirc:"â",atilde:"ã",auml:"ä",aring:"å",aelig:"æ",ccedil:"ç",egrave:"è",eacute:"é",ecirc:"ê",euml:"ë",igrave:"ì",iacute:"í",icirc:"î",iuml:"ï",eth:"ð",ntilde:"ñ",ograve:"ò",oacute:"ó",ocirc:"ô",otilde:"õ",ouml:"ö",divide:"÷",oslash:"ø",ugrave:"ù",uacute:"ú",ucirc:"û",uuml:"ü",yacute:"ý",thorn:"þ",yuml:"ÿ",OElig:"Œ",oelig:"œ",Scaron:"Š",scaron:"š",Yuml:"Ÿ",fnof:"ƒ",circ:"ˆ",tilde:"˜",Alpha:"Α",Beta:"Β",Gamma:"Γ",Delta:"Δ",Epsilon:"Ε",Zeta:"Ζ",Eta:"Η",Theta:"Θ",Iota:"Ι",Kappa:"Κ",Lambda:"Λ",Mu:"Μ",Nu:"Ν",Xi:"Ξ",Omicron:"Ο",Pi:"Π",Rho:"Ρ",Sigma:"Σ",Tau:"Τ",Upsilon:"Υ",Phi:"Φ",Chi:"Χ",Psi:"Ψ",Omega:"Ω",alpha:"α",beta:"β",gamma:"γ",delta:"δ",epsilon:"ε",zeta:"ζ",eta:"η",theta:"θ",iota:"ι",kappa:"κ",lambda:"λ",mu:"μ",nu:"ν",xi:"ξ",omicron:"ο",pi:"π",rho:"ρ",sigmaf:"ς",sigma:"σ",tau:"τ",upsilon:"υ",phi:"φ",chi:"χ",psi:"ψ",omega:"ω",thetasym:"ϑ",upsih:"ϒ",piv:"ϖ",ensp:" ",emsp:" ",thinsp:" ",zwnj:"‌",zwj:"‍",lrm:"‎",rlm:"‏",ndash:"–",mdash:"—",lsquo:"‘",rsquo:"’",sbquo:"‚",ldquo:"“",rdquo:"”",bdquo:"„",dagger:"†",Dagger:"‡",bull:"•",hellip:"…",permil:"‰",prime:"′",Prime:"″",lsaquo:"‹",rsaquo:"›",oline:"‾",frasl:"⁄",euro:"€",image:"ℑ",weierp:"℘",real:"ℜ",trade:"™",alefsym:"ℵ",larr:"←",uarr:"↑",rarr:"→",darr:"↓",harr:"↔",crarr:"↵",lArr:"⇐",uArr:"⇑",rArr:"⇒",dArr:"⇓",hArr:"⇔",forall:"∀",part:"∂",exist:"∃",empty:"∅",nabla:"∇",isin:"∈",notin:"∉",ni:"∋",prod:"∏",sum:"∑",minus:"−",lowast:"∗",radic:"√",prop:"∝",infin:"∞",ang:"∠",and:"∧",or:"∨",cap:"∩",cup:"∪",int:"∫",there4:"∴",sim:"∼",cong:"≅",asymp:"≈",ne:"≠",equiv:"≡",le:"≤",ge:"≥",sub:"⊂",sup:"⊃",nsub:"⊄",sube:"⊆",supe:"⊇",oplus:"⊕",otimes:"⊗",perp:"⊥",sdot:"⋅",lceil:"⌈",rceil:"⌉",lfloor:"⌊",rfloor:"⌋",loz:"◊",spades:"♠",clubs:"♣",hearts:"♥",diams:"♦",lang:"⟨",rang:"⟩"}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(10),i=n(12),o=n(13),a=function(){function e(){this.values=[],this.curly=this.paren=-1}return e.prototype.beforeFunctionExpression=function(e){return["(","{","[","in","typeof","instanceof","new","return","case","delete","throw","void","=","+=","-=","*=","**=","/=","%=","<<=",">>=",">>>=","&=","|=","^=",",","+","-","*","**","/","%","++","--","<<",">>",">>>","&","|","^","!","~","&&","||","?",":","===","==",">=","<=","<",">","!=","!=="].indexOf(e)>=0},e.prototype.isRegexStart=function(){var e=this.values[this.values.length-1],t=null!==e;switch(e){case"this":case"]":t=!1;break;case")":var n=this.values[this.paren-1];t="if"===n||"while"===n||"for"===n||"with"===n;break;case"}":if(t=!1,"function"===this.values[this.curly-3]){var r=this.values[this.curly-4];t=!!r&&!this.beforeFunctionExpression(r)}else if("function"===this.values[this.curly-4]){var r=this.values[this.curly-5];t=!r||!this.beforeFunctionExpression(r)}}return t},e.prototype.push=function(e){7===e.type||4===e.type?("{"===e.value?this.curly=this.values.length:"("===e.value&&(this.paren=this.values.length),this.values.push(e.value)):this.values.push(null)},e}(),s=function(){function e(e,t){this.errorHandler=new r.ErrorHandler,this.errorHandler.tolerant=!!t&&("boolean"==typeof t.tolerant&&t.tolerant),this.scanner=new i.Scanner(e,this.errorHandler),this.scanner.trackComment=!!t&&("boolean"==typeof t.comment&&t.comment),this.trackRange=!!t&&("boolean"==typeof t.range&&t.range),this.trackLoc=!!t&&("boolean"==typeof t.loc&&t.loc),this.buffer=[],this.reader=new a}return e.prototype.errors=function(){return this.errorHandler.errors},e.prototype.getNextToken=function(){if(0===this.buffer.length){var e=this.scanner.scanComments();if(this.scanner.trackComment)for(var t=0;t<e.length;++t){var n=e[t],r=this.scanner.source.slice(n.slice[0],n.slice[1]),i={type:n.multiLine?"BlockComment":"LineComment",value:r};this.trackRange&&(i.range=n.range),this.trackLoc&&(i.loc=n.loc),this.buffer.push(i)}if(!this.scanner.eof()){var a=void 0;this.trackLoc&&(a={start:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},end:{}});var s="/"===this.scanner.source[this.scanner.index]&&this.reader.isRegexStart(),u=s?this.scanner.scanRegExp():this.scanner.lex();this.reader.push(u);var l={type:o.TokenName[u.type],value:this.scanner.source.slice(u.start,u.end)};if(this.trackRange&&(l.range=[u.start,u.end]),this.trackLoc&&(a.end={line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},l.loc=a),9===u.type){var c=u.pattern,p=u.flags;l.regex={pattern:c,flags:p}}this.buffer.push(l)}}return this.buffer.shift()},e}();t.Tokenizer=s}])})},function(e,t,n){"use strict";var r,i,o,a,s,u,l,c=n(141),p=n(58),f=Function.prototype.apply,h=Function.prototype.call,d=Object.create,m=Object.defineProperty,v=Object.defineProperties,g=Object.prototype.hasOwnProperty,y={configurable:!0,enumerable:!1,writable:!0};r=function(e,t){var n;return p(t),g.call(this,"__ee__")?n=this.__ee__:(n=y.value=d(null),m(this,"__ee__",y),y.value=null),n[e]?"object"==typeof n[e]?n[e].push(t):n[e]=[n[e],t]:n[e]=t,this},i=function(e,t){var n,i;return p(t),i=this,r.call(this,e,n=function(){o.call(i,e,n),f.call(t,this,arguments)}),n.__eeOnceListener__=t,this},o=function(e,t){var n,r,i,o;if(p(t),!g.call(this,"__ee__"))return this;if(n=this.__ee__,!n[e])return this;if("object"==typeof(r=n[e]))for(o=0;i=r[o];++o)i!==t&&i.__eeOnceListener__!==t||(2===r.length?n[e]=r[o?0:1]:r.splice(o,1));else r!==t&&r.__eeOnceListener__!==t||delete n[e];return this},a=function(e){var t,n,r,i,o;if(g.call(this,"__ee__")&&(i=this.__ee__[e]))if("object"==typeof i){for(n=arguments.length,o=new Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];for(i=i.slice(),t=0;r=i[t];++t)f.call(r,this,o)}else switch(arguments.length){case 1:h.call(i,this);break;case 2:h.call(i,this,arguments[1]);break;case 3:h.call(i,this,arguments[1],arguments[2]);break;default:for(n=arguments.length,o=new Array(n-1),t=1;t<n;++t)o[t-1]=arguments[t];f.call(i,this,o)}},s={on:r,once:i,off:o,emit:a},u={on:c(r),once:c(i),off:c(o),emit:c(a)},l=v({},u),e.exports=t=function(e){return null==e?d(l):v(Object(e),u)},t.methods=s},function(e,t){/*!
+ * https://github.com/Starcounter-Jack/JSON-Patch
+ * json-patch-duplex.js version: 1.2.2
+ * (c) 2013 Joachim Wester
+ * MIT license
+ */
+var n;if(function(e){function t(e,n){switch(typeof e){case"undefined":case"boolean":case"string":case"number":return e===n;case"object":if(null===e)return null===n;if(k(e)){if(!k(n)||e.length!==n.length)return!1;for(var r=0,i=e.length;r<i;r++)if(!t(e[r],n[r]))return!1;return!0}for(var o=E(e),a=E(n),s=0;s<o.length;s++){var u=o[s];if(!t(e[u],n[u]))return!1;var l=a.indexOf(u);l>=0&&a.splice(l,1)}for(var c=0;c<a.length;c++){var p=a[c];if(!t(e[p],n[p]))return!1}return!0;default:return!1}}function n(e){for(var t=0,n=A.length;t<n;t++)if(A[t].obj===e)return A[t]}function r(e,t){for(var n=0,r=e.observers.length;n<r;n++)if(e.observers[n].callback===t)return e.observers[n].observer}function i(e,t){for(var n=0,r=e.observers.length;n<r;n++)if(e.observers[n].observer===t)return void e.observers.splice(n,1)}function o(e,t){t.unobserve()}function a(e,t){var o,a=[],u=n(e);if(u?o=r(u,t):(u=new D(e),A.push(u)),o)return o;if(o={},u.value=c(e),t){o.callback=t,o.next=null;var l=function(){s(o)},p=function(){clearTimeout(o.next),o.next=setTimeout(l)};"undefined"!=typeof window&&(window.addEventListener?(window.addEventListener("mouseup",p),window.addEventListener("keyup",p),window.addEventListener("mousedown",p),window.addEventListener("keydown",p),window.addEventListener("change",p)):(document.documentElement.attachEvent("onmouseup",p),document.documentElement.attachEvent("onkeyup",p),document.documentElement.attachEvent("onmousedown",p),document.documentElement.attachEvent("onkeydown",p),document.documentElement.attachEvent("onchange",p)))}return o.patches=a,o.object=e,o.unobserve=function(){s(o),clearTimeout(o.next),i(u,o),"undefined"!=typeof window&&(window.removeEventListener?(window.removeEventListener("mouseup",p),window.removeEventListener("keyup",p),window.removeEventListener("mousedown",p),window.removeEventListener("keydown",p)):(document.documentElement.detachEvent("onmouseup",p),document.documentElement.detachEvent("onkeyup",p),document.documentElement.detachEvent("onmousedown",p),document.documentElement.detachEvent("onkeydown",p)))},u.observers.push(new O(t,o)),o}function s(e){for(var t,n=0,r=A.length;n<r;n++)if(A[n].obj===e.object){t=A[n];break}u(t.value,e.object,e.patches,""),e.patches.length&&m(t.value,e.patches);var i=e.patches;return i.length>0&&(e.patches=[],e.callback&&e.callback(i)),i}function u(e,t,n,r){if(t!==e){"function"==typeof t.toJSON&&(t=t.toJSON());for(var i=E(t),o=E(e),a=!1,s=o.length-1;s>=0;s--){var l=o[s],f=e[l];if(!t.hasOwnProperty(l)||void 0===t[l]&&void 0!==f&&!1===k(t))n.push({op:"remove",path:r+"/"+p(l)}),a=!0;else{var h=t[l];"object"==typeof f&&null!=f&&"object"==typeof h&&null!=h?u(f,h,n,r+"/"+p(l)):f!==h&&(!0,n.push({op:"replace",path:r+"/"+p(l),value:c(h)}))}}if(a||i.length!=o.length)for(var s=0;s<i.length;s++){var l=i[s];e.hasOwnProperty(l)||void 0===t[l]||n.push({op:"add",path:r+"/"+p(l),value:c(t[l])})}}}function l(e){for(var t,n=0,r=e.length;n<r;){t=e.charCodeAt(n);{if(!(t>=48&&t<=57))return!1;n++}}return!0}function c(e){switch(typeof e){case"object":return JSON.parse(JSON.stringify(e));case"undefined":return null;default:return e}}function p(e){return-1===e.indexOf("/")&&-1===e.indexOf("~")?e:e.replace(/~/g,"~0").replace(/\//g,"~1")}function f(e){return e.replace(/~1/g,"/").replace(/~0/g,"~")}function h(e,t){if(""==t)return e;var n={op:"_get",path:t};return d(e,n),n.value}function d(e,n,r,i){if(void 0===r&&(r=!1),void 0===i&&(i=!0),r&&("function"==typeof r?r(n,0,e,n.path):b(n,0)),""===n.path){var o={newDocument:e};if("add"===n.op)return o.newDocument=n.value,o;if("replace"===n.op)return o.newDocument=n.value,o.removed=e,o;if("move"===n.op||"copy"===n.op)return o.newDocument=h(e,n.from),"move"===n.op&&(o.removed=e),o;if("test"===n.op){if(o.test=t(e,n.value),!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o.newDocument=e,o}if("remove"===n.op)return o.removed=e,o.newDocument=null,o;if("_get"===n.op)return n.value=e,o;if(r)throw new M("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",0,n,e);return o}i||(e=c(e));var a=n.path||"",s=a.split("/"),u=e,p=1,d=s.length,m=void 0,v=void 0,g=void 0;for(g="function"==typeof r?r:b;;){if(v=s[p],r&&void 0===m&&(void 0===u[v]?m=s.slice(0,p).join("/"):p==d-1&&(m=n.path),void 0!==m&&g(n,0,e,m)),p++,k(u)){if("-"===v)v=u.length;else{if(r&&!l(v))throw new M("Expected an unsigned base-10 integer value, making the new referenced value the array element with the zero-based index","OPERATION_PATH_ILLEGAL_ARRAY_INDEX",0,n.path,n);v=~~v}if(p>=d){if(r&&"add"===n.op&&v>u.length)throw new M("The specified index MUST NOT be greater than the number of elements in the array","OPERATION_VALUE_OUT_OF_BOUNDS",0,n.path,n);var o=C[n.op].call(n,u,v,e);if(!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o}}else if(v&&-1!=v.indexOf("~")&&(v=f(v)),p>=d){var o=S[n.op].call(n,u,v,e);if(!1===o.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,n,e);return o}u=u[v]}}function m(e,t,n){for(var r=new Array(t.length),i=0,o=t.length;i<o;i++)r[i]=d(e,t[i],n),e=r[i].newDocument;return r.newDocument=e,r}function v(e,t,n){console.warn("jsonpatch.apply is deprecated, please use `applyPatch` for applying patch sequences, or `applyOperation` to apply individual operations.");for(var r=new Array(t.length),i=0,o=t.length;i<o;i++)!function(i,o){if(""==t[i].path&&"remove"!=t[i].op&&"test"!=t[i].op){var a;if("_get"==t[i].op)return t[i].value=e,"continue";"replace"!=t[i].op&&"move"!=t[i].op||(r[i]=c(e)),"copy"!=t[i].op&&"move"!=t[i].op||(a=h(e,t[i].from)),"replace"!=t[i].op&&"add"!=t[i].op||(a=t[i].value),Object.keys(e).forEach(function(t){return delete e[t]}),Object.keys(a).forEach(function(t){return e[t]=a[t]})}else r[i]=d(e,t[i],n),r[i]=r[i].removed||r[i].test}(i);return r}function g(e,t){var n=d(e,t);if(!1===n.test)throw new M("Test operation failed","TEST_OPERATION_FAILED",0,t,e);return n.newDocument}function y(e,t){function n(){this.constructor=e}for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}function _(e){if(void 0===e)return!0;if(e)if(k(e)){for(var t=0,n=e.length;t<n;t++)if(_(e[t]))return!0}else if("object"==typeof e)for(var r=E(e),i=r.length,t=0;t<i;t++)if(_(e[r[t]]))return!0;return!1}function b(e,t,n,r){if("object"!=typeof e||null===e||k(e))throw new M("Operation is not an object","OPERATION_NOT_AN_OBJECT",t,e,n);if(!S[e.op])throw new M("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",t,e,n);if("string"!=typeof e.path)throw new M("Operation `path` property is not a string","OPERATION_PATH_INVALID",t,e,n);if(0!==e.path.indexOf("/")&&e.path.length>0)throw new M('Operation `path` property must start with "/"',"OPERATION_PATH_INVALID",t,e,n);if(("move"===e.op||"copy"===e.op)&&"string"!=typeof e.from)throw new M("Operation `from` property is not present (applicable in `move` and `copy` operations)","OPERATION_FROM_REQUIRED",t,e,n);if(("add"===e.op||"replace"===e.op||"test"===e.op)&&void 0===e.value)throw new M("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)","OPERATION_VALUE_REQUIRED",t,e,n);if(("add"===e.op||"replace"===e.op||"test"===e.op)&&_(e.value))throw new M("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)","OPERATION_VALUE_CANNOT_CONTAIN_UNDEFINED",t,e,n);if(n)if("add"==e.op){var i=e.path.split("/").length,o=r.split("/").length;if(i!==o+1&&i!==o)throw new M("Cannot perform an `add` operation at the desired path","OPERATION_PATH_CANNOT_ADD",t,e,n)}else if("replace"===e.op||"remove"===e.op||"_get"===e.op){if(e.path!==r)throw new M("Cannot perform the operation at a path that does not exist","OPERATION_PATH_UNRESOLVABLE",t,e,n)}else if("move"===e.op||"copy"===e.op){var a={op:"_get",path:e.from,value:void 0},s=x([a],n);if(s&&"OPERATION_PATH_UNRESOLVABLE"===s.name)throw new M("Cannot perform the operation from a path that does not exist","OPERATION_FROM_UNRESOLVABLE",t,e,n)}}function x(e,t,n){try{if(!k(e))throw new M("Patch sequence must be an array","SEQUENCE_NOT_AN_ARRAY");if(t)m(c(t),c(e),n||!0);else{n=n||b;for(var r=0;r<e.length;r++)n(e[r],r,t,void 0)}}catch(e){if(e instanceof M)return e;throw e}}function w(e,t){var n=[];return u(e,t,n,""),n}var k,E=function(e){if(k(e)){for(var t=new Array(e.length),n=0;n<t.length;n++)t[n]=""+n;return t}if(Object.keys)return Object.keys(e);var t=[];for(var r in e)e.hasOwnProperty(r)&&t.push(r);return t},S={add:function(e,t,n){return e[t]=this.value,{newDocument:n}},remove:function(e,t,n){var r=e[t];return delete e[t],{newDocument:n,removed:r}},replace:function(e,t,n){var r=e[t];return e[t]=this.value,{newDocument:n,removed:r}},move:function(e,t,n){var r=h(n,this.path);r&&(r=c(r));var i=d(n,{op:"remove",path:this.from}).removed;return d(n,{op:"add",path:this.path,value:i}),{newDocument:n,removed:r}},copy:function(e,t,n){var r=h(n,this.from);return d(n,{op:"add",path:this.path,value:c(r)}),{newDocument:n}},test:function(e,n,r){return{newDocument:r,test:t(e[n],this.value)}},_get:function(e,t,n){return this.value=e[t],{newDocument:n}}},C={add:function(e,t,n){return e.splice(t,0,this.value),{newDocument:n,index:t}},remove:function(e,t,n){return{newDocument:n,removed:e.splice(t,1)[0]}},replace:function(e,t,n){var r=e[t];return e[t]=this.value,{newDocument:n,removed:r}},move:S.move,copy:S.copy,test:S.test,_get:S._get};k=Array.isArray?Array.isArray:function(e){return e.push&&"number"==typeof e.length};var A=[],D=function(){function e(e){this.observers=[],this.obj=e}return e}(),O=function(){function e(e,t){this.callback=e,this.observer=t}return e}();e.unobserve=o,e.observe=a,e.generate=s;var k;k=Array.isArray?Array.isArray:function(e){return e.push&&"number"==typeof e.length},e.deepClone=c,e.escapePathComponent=p,e.unescapePathComponent=f,e.getValueByPointer=h,e.applyOperation=d,e.applyPatch=m,e.apply=v,e.applyReducer=g;var M=function(e){function t(t,n,r,i,o){e.call(this,t),this.message=t,this.name=n,this.index=r,this.operation=i,this.tree=o}return y(t,e),t}(Error);e.JsonPatchError=M,e.validator=b,e.validate=x,e.compare=w}(n||(n={})),void 0!==t)t.apply=n.apply,t.applyPatch=n.applyPatch,t.applyOperation=n.applyOperation,t.applyReducer=n.applyReducer,t.getValueByPointer=n.getValueByPointer,t.deepClone=n.deepClone,t.escapePathComponent=n.escapePathComponent,t.unescapePathComponent=n.unescapePathComponent,t.observe=n.observe,t.unobserve=n.unobserve,t.generate=n.generate,t.compare=n.compare,t.validate=n.validate,t.validator=n.validator,t.JsonPatchError=n.JsonPatchError;else var t={},r=!0;Object.defineProperty(t,"__esModule",{value:!0}),t.default=n,r&&(t=void 0)},function(e,t,n){"use strict";function r(e){return e.replace(i,function(e,t){return t.toUpperCase()})}var i=/-(.)/g;e.exports=r},function(e,t,n){"use strict";function r(e){return i(e.replace(o,"ms-"))}var i=n(746),o=/^-ms-/;e.exports=r},function(e,t,n){"use strict";function r(e,t){return!(!e||!t)&&(e===t||!i(e)&&(i(t)?r(e,t.parentNode):"contains"in e?e.contains(t):!!e.compareDocumentPosition&&!!(16&e.compareDocumentPosition(t))))}var i=n(756);e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.length;if((Array.isArray(e)||"object"!=typeof e&&"function"!=typeof e)&&a(!1),"number"!=typeof t&&a(!1),0===t||t-1 in e||a(!1),"function"==typeof e.callee&&a(!1),e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(e){}for(var n=Array(t),r=0;r<t;r++)n[r]=e[r];return n}function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"length"in e&&!("setInterval"in e)&&"number"!=typeof e.nodeType&&(Array.isArray(e)||"callee"in e||"item"in e)}function o(e){return i(e)?Array.isArray(e)?e.slice():r(e):[e]}var a=n(8);e.exports=o},function(e,t,n){"use strict";function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function i(e,t){var n=l;l||u(!1);var i=r(e),o=i&&s(i);if(o){n.innerHTML=o[1]+e+o[2];for(var c=o[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName("script");p.length&&(t||u(!1),a(p).forEach(t));for(var f=Array.from(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return f}var o=n(25),a=n(749),s=n(751),u=n(8),l=o.canUseDOM?document.createElement("div"):null,c=/^\s*<(\w+)/;e.exports=i},function(e,t,n){"use strict";function r(e){return a||o(!1),f.hasOwnProperty(e)||(e="*"),s.hasOwnProperty(e)||(a.innerHTML="*"===e?"<link />":"<"+e+"></"+e+">",s[e]=!a.firstChild),s[e]?f[e]:null}var i=n(25),o=n(8),a=i.canUseDOM?document.createElement("div"):null,s={},u=[1,'<select multiple="true">',"</select>"],l=[1,"<table>","</table>"],c=[3,"<table><tbody><tr>","</tr></tbody></table>"],p=[1,'<svg xmlns="http://www.w3.org/2000/svg">',"</svg>"],f={"*":[1,"?<div>","</div>"],area:[1,"<map>","</map>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],legend:[1,"<fieldset>","</fieldset>"],param:[1,"<object>","</object>"],tr:[2,"<table><tbody>","</tbody></table>"],optgroup:u,option:u,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c};["circle","clipPath","defs","ellipse","g","image","line","linearGradient","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","text","tspan"].forEach(function(e){f[e]=p,s[e]=!0}),e.exports=r},function(e,t,n){"use strict";function r(e){return e.Window&&e instanceof e.Window?{x:e.pageXOffset||e.document.documentElement.scrollLeft,y:e.pageYOffset||e.document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}e.exports=r},function(e,t,n){"use strict";function r(e){return e.replace(i,"-$1").toLowerCase()}var i=/([A-Z])/g;e.exports=r},function(e,t,n){"use strict";function r(e){return i(e).replace(o,"-ms-")}var i=n(753),o=/^ms-/;e.exports=r},function(e,t,n){"use strict";function r(e){var t=e?e.ownerDocument||e:document,n=t.defaultView||window;return!(!e||!("function"==typeof n.Node?e instanceof n.Node:"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName))}e.exports=r},function(e,t,n){"use strict";function r(e){return i(e)&&3==e.nodeType}var i=n(755);e.exports=r},function(e,t,n){"use strict";function r(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}e.exports=r},function(e,t,n){"use strict";var r={childContextTypes:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,mixins:!0,propTypes:!0,type:!0},i={name:!0,length:!0,prototype:!0,caller:!0,arguments:!0,arity:!0},o="function"==typeof Object.getOwnPropertySymbols;e.exports=function(e,t,n){if("string"!=typeof t){var a=Object.getOwnPropertyNames(t);o&&(a=a.concat(Object.getOwnPropertySymbols(t)));for(var s=0;s<a.length;++s)if(!(r[a[s]]||i[a[s]]||n&&n[a[s]]))try{e[a[s]]=t[a[s]]}catch(e){}}return e}},function(e,t,n){function r(e){this._cbs=e||{},this.events=[]}e.exports=r;var i=n(116).EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this.events.push([e]),this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this.events.push([e,t]),this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this.events.push([e,t,n]),this._cbs[e]&&this._cbs[e](t,n)}}}),r.prototype.onreset=function(){this.events=[],this._cbs.onreset&&this._cbs.onreset()},r.prototype.restart=function(){this._cbs.onreset&&this._cbs.onreset();for(var e=0,t=this.events.length;e<t;e++)if(this._cbs[this.events[e][0]]){var n=this.events[e].length;1===n?this._cbs[this.events[e][0]]():2===n?this._cbs[this.events[e][0]](this.events[e][1]):this._cbs[this.events[e][0]](this.events[e][1],this.events[e][2])}}},function(e,t,n){function r(e,t){this.init(e,t)}function i(e,t){return c.getElementsByTagName(e,t,!0)}function o(e,t){return c.getElementsByTagName(e,t,!0,1)[0]}function a(e,t,n){return c.getText(c.getElementsByTagName(e,t,n,1)).trim()}function s(e,t,n,r,i){var o=a(n,r,i);o&&(e[t]=o)}var u=n(116),l=u.DomHandler,c=u.DomUtils;n(42)(r,l),r.prototype.init=l;var p=function(e){return"rss"===e||"feed"===e||"rdf:RDF"===e};r.prototype.onend=function(){var e,t,n={},r=o(p,this.dom);r&&("feed"===r.name?(t=r.children,n.type="atom",s(n,"id","id",t),s(n,"title","title",t),(e=o("link",t))&&(e=e.attribs)&&(e=e.href)&&(n.link=e),s(n,"description","subtitle",t),(e=a("updated",t))&&(n.updated=new Date(e)),s(n,"author","email",t,!0),n.items=i("entry",t).map(function(e){var t,n={};return e=e.children,s(n,"id","id",e),s(n,"title","title",e),(t=o("link",e))&&(t=t.attribs)&&(t=t.href)&&(n.link=t),(t=a("summary",e)||a("content",e))&&(n.description=t),(t=a("updated",e))&&(n.pubDate=new Date(t)),n})):(t=o("channel",r.children).children,n.type=r.name.substr(0,3),n.id="",s(n,"title","title",t),s(n,"link","link",t),s(n,"description","description",t),(e=a("lastBuildDate",t))&&(n.updated=new Date(e)),s(n,"author","managingEditor",t,!0),n.items=i("item",r.children).map(function(e){var t,n={};return e=e.children,s(n,"id","guid",e),s(n,"title","title",e),s(n,"link","link",e),s(n,"description","description",e),(t=a("pubDate",e))&&(n.pubDate=new Date(t)),n}))),this.dom=n,l.prototype._handleCallback.call(this,r?null:Error("couldn't find root of feed"))},e.exports=r},function(e,t,n){function r(e){this._cbs=e||{}}e.exports=r;var i=n(116).EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this._cbs[e]&&this._cbs[e](t,n)}}})},function(e,t,n){function r(e){o.call(this,new i(this),e)}function i(e){this.scope=e}e.exports=r;var o=n(382);n(42)(r,o),r.prototype.readable=!0;var a=n(116).EVENTS;Object.keys(a).forEach(function(e){if(0===a[e])i.prototype["on"+e]=function(){this.scope.emit(e)};else if(1===a[e])i.prototype["on"+e]=function(t){this.scope.emit(e,t)};else{if(2!==a[e])throw Error("wrong number of arguments!");i.prototype["on"+e]=function(t,n){this.scope.emit(e,t,n)}}})},function(e,t,n){"use strict";function r(e){return e in a?a[e]:a[e]=e.replace(i,"-$&").toLowerCase().replace(o,"-ms-")}var i=/[A-Z]/g,o=/^ms-/,a={};e.exports=r},function(e,t){t.read=function(e,t,n,r,i){var o,a,s=8*i-r-1,u=(1<<s)-1,l=u>>1,c=-7,p=n?i-1:0,f=n?-1:1,h=e[t+p];for(p+=f,o=h&(1<<-c)-1,h>>=-c,c+=s;c>0;o=256*o+e[t+p],p+=f,c-=8);for(a=o&(1<<-c)-1,o>>=-c,c+=r;c>0;a=256*a+e[t+p],p+=f,c-=8);if(0===o)o=1-l;else{if(o===u)return a?NaN:1/0*(h?-1:1);a+=Math.pow(2,r),o-=l}return(h?-1:1)*a*Math.pow(2,o-r)},t.write=function(e,t,n,r,i,o){var a,s,u,l=8*o-i-1,c=(1<<l)-1,p=c>>1,f=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,h=r?0:o-1,d=r?1:-1,m=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,a=c):(a=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-a))<1&&(a--,u*=2),t+=a+p>=1?f/u:f*Math.pow(2,1-p),t*u>=2&&(a++,u/=2),a+p>=c?(s=0,a=c):a+p>=1?(s=(t*u-1)*Math.pow(2,i),a+=p):(s=t*Math.pow(2,p-1)*Math.pow(2,i),a=0));i>=8;e[n+h]=255&s,h+=d,s/=256,i-=8);for(a=a<<i|s,l+=i;l>0;e[n+h]=255&a,h+=d,a/=256,l-=8);e[n+h-d]|=128*m}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){var t=e.prefixMap,n=e.plugins,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(e){return e};return function(){function e(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};i(this,e);var r="undefined"!=typeof navigator?navigator.userAgent:void 0;if(this._userAgent=n.userAgent||r,this._keepUnprefixed=n.keepUnprefixed||!1,this._userAgent&&(this._browserInfo=(0,u.default)(this._userAgent)),!this._browserInfo||!this._browserInfo.cssPrefix)return this._useFallback=!0,!1;this.prefixedKeyframes=(0,c.default)(this._browserInfo.browserName,this._browserInfo.browserVersion,this._browserInfo.cssPrefix);var o=this._browserInfo.browserName&&t[this._browserInfo.browserName];if(o){this._requiresPrefix={};for(var a in o)o[a]>=this._browserInfo.browserVersion&&(this._requiresPrefix[a]=!0);this._hasPropsRequiringPrefix=Object.keys(this._requiresPrefix).length>0}else this._useFallback=!0;this._metaData={browserVersion:this._browserInfo.browserVersion,browserName:this._browserInfo.browserName,cssPrefix:this._browserInfo.cssPrefix,jsPrefix:this._browserInfo.jsPrefix,keepUnprefixed:this._keepUnprefixed,requiresPrefix:this._requiresPrefix}}return a(e,[{key:"prefix",value:function(e){return this._useFallback?r(e):this._hasPropsRequiringPrefix?this._prefixStyle(e):e}},{key:"_prefixStyle",value:function(e){for(var t in e){var r=e[t];if((0,v.default)(r))e[t]=this.prefix(r);else if(Array.isArray(r)){for(var i=[],o=0,a=r.length;o<a;++o){var s=(0,y.default)(n,t,r[o],e,this._metaData);(0,d.default)(i,s||r[o])}i.length>0&&(e[t]=i)}else{var u=(0,y.default)(n,t,r,e,this._metaData);u&&(e[t]=u),this._requiresPrefix.hasOwnProperty(t)&&(e[this._browserInfo.jsPrefix+(0,f.default)(t)]=r,this._keepUnprefixed||delete e[t])}}return e}}],[{key:"prefixAll",value:function(e){return r(e)}}]),e}()}Object.defineProperty(t,"__esModule",{value:!0});var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}();t.default=o;var s=n(790),u=r(s),l=n(791),c=r(l),p=n(210),f=r(p),h=n(383),d=r(h),m=n(384),v=r(m),g=n(385),y=r(g);e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={plugins:[],prefixMap:{chrome:{appearance:64,userSelect:53,textEmphasisPosition:64,textEmphasis:64,textEmphasisStyle:64,textEmphasisColor:64,boxDecorationBreak:64,clipPath:54,maskImage:64,maskMode:64,maskRepeat:64,maskPosition:64,maskClip:64,maskOrigin:64,maskSize:64,maskComposite:64,mask:64,maskBorderSource:64,maskBorderMode:64,maskBorderSlice:64,maskBorderWidth:64,maskBorderOutset:64,maskBorderRepeat:64,maskBorder:64,maskType:64,textDecorationStyle:56,textDecorationSkip:56,textDecorationLine:56,textDecorationColor:56,filter:52,fontFeatureSettings:47,breakAfter:49,breakBefore:49,breakInside:49,columnCount:49,columnFill:49,columnGap:49,columnRule:49,columnRuleColor:49,columnRuleStyle:49,columnRuleWidth:49,columns:49,columnSpan:49,columnWidth:49,writingMode:47},safari:{flex:8,flexBasis:8,flexDirection:8,flexGrow:8,flexFlow:8,flexShrink:8,flexWrap:8,alignContent:8,alignItems:8,alignSelf:8,justifyContent:8,order:8,transform:8,transformOrigin:8,transformOriginX:8,transformOriginY:8,backfaceVisibility:8,perspective:8,perspectiveOrigin:8,transformStyle:8,transformOriginZ:8,animation:8,animationDelay:8,animationDirection:8,animationFillMode:8,animationDuration:8,animationIterationCount:8,animationName:8,animationPlayState:8,animationTimingFunction:8,appearance:11,userSelect:11,backdropFilter:11,fontKerning:9,scrollSnapType:10.1,scrollSnapPointsX:10.1,scrollSnapPointsY:10.1,scrollSnapDestination:10.1,scrollSnapCoordinate:10.1,boxDecorationBreak:11,clipPath:11,maskImage:11,maskMode:11,maskRepeat:11,maskPosition:11,maskClip:11,maskOrigin:11,maskSize:11,maskComposite:11,mask:11,maskBorderSource:11,maskBorderMode:11,maskBorderSlice:11,maskBorderWidth:11,maskBorderOutset:11,maskBorderRepeat:11,maskBorder:11,maskType:11,textDecorationStyle:11,textDecorationSkip:11,textDecorationLine:11,textDecorationColor:11,shapeImageThreshold:10,shapeImageMargin:10,shapeImageOutside:10,filter:9,hyphens:11,flowInto:11,flowFrom:11,breakBefore:8,breakAfter:8,breakInside:8,regionFragment:11,columnCount:8,columnFill:8,columnGap:8,columnRule:8,columnRuleColor:8,columnRuleStyle:8,columnRuleWidth:8,columns:8,columnSpan:8,columnWidth:8,writingMode:11},firefox:{appearance:58,userSelect:58,textAlignLast:48,tabSize:58,hyphens:42,breakAfter:51,breakBefore:51,breakInside:51,columnCount:51,columnFill:51,columnGap:51,columnRule:51,columnRuleColor:51,columnRuleStyle:51,columnRuleWidth:51,columns:51,columnSpan:51,columnWidth:51},opera:{flex:16,flexBasis:16,flexDirection:16,flexGrow:16,flexFlow:16,flexShrink:16,flexWrap:16,alignContent:16,alignItems:16,alignSelf:16,justifyContent:16,order:16,transform:22,transformOrigin:22,transformOriginX:22,transformOriginY:22,backfaceVisibility:22,perspective:22,perspectiveOrigin:22,transformStyle:22,transformOriginZ:22,animation:29,animationDelay:29,animationDirection:29,animationFillMode:29,animationDuration:29,animationIterationCount:29,animationName:29,animationPlayState:29,animationTimingFunction:29,appearance:49,userSelect:40,fontKerning:19,textEmphasisPosition:49,textEmphasis:49,textEmphasisStyle:49,textEmphasisColor:49,boxDecorationBreak:49,clipPath:41,maskImage:49,maskMode:49,maskRepeat:49,maskPosition:49,maskClip:49,maskOrigin:49,maskSize:49,maskComposite:49,mask:49,maskBorderSource:49,maskBorderMode:49,maskBorderSlice:49,maskBorderWidth:49,maskBorderOutset:49,maskBorderRepeat:49,maskBorder:49,maskType:49,textDecorationStyle:43,textDecorationSkip:43,textDecorationLine:43,textDecorationColor:43,filter:39,fontFeatureSettings:34,breakAfter:36,breakBefore:36,breakInside:36,columnCount:36,columnFill:36,columnGap:36,columnRule:36,columnRuleColor:36,columnRuleStyle:36,columnRuleWidth:36,columns:36,columnSpan:36,columnWidth:36,writingMode:34},ie:{userSelect:11,wrapFlow:11,wrapThrough:11,wrapMargin:11,scrollSnapType:11,scrollSnapPointsX:11,scrollSnapPointsY:11,scrollSnapDestination:11,scrollSnapCoordinate:11,hyphens:11,flowInto:11,flowFrom:11,breakBefore:11,breakAfter:11,breakInside:11,regionFragment:11,gridTemplateColumns:11,gridTemplateRows:11,gridTemplateAreas:11,gridTemplate:11,gridAutoColumns:11,gridAutoRows:11,gridAutoFlow:11,grid:11,gridRowStart:11,gridColumnStart:11,gridRowEnd:11,gridRow:11,gridColumn:11,gridColumnEnd:11,gridColumnGap:11,gridRowGap:11,gridArea:11,gridGap:11,textSizeAdjust:11,writingMode:11},edge:{userSelect:16,wrapFlow:16,wrapThrough:16,wrapMargin:16,scrollSnapType:16,scrollSnapPointsX:16,scrollSnapPointsY:16,scrollSnapDestination:16,scrollSnapCoordinate:16,hyphens:16,flowInto:16,flowFrom:16,breakBefore:16,breakAfter:16,breakInside:16,regionFragment:16,gridTemplateColumns:15,gridTemplateRows:15,gridTemplateAreas:15,gridTemplate:15,gridAutoColumns:15,gridAutoRows:15,gridAutoFlow:15,grid:15,gridRowStart:15,gridColumnStart:15,gridRowEnd:15,gridRow:15,gridColumn:15,gridColumnEnd:15,gridColumnGap:15,gridRowGap:15,gridArea:15,gridGap:15},ios_saf:{flex:8.1,flexBasis:8.1,flexDirection:8.1,flexGrow:8.1,flexFlow:8.1,flexShrink:8.1,flexWrap:8.1,alignContent:8.1,alignItems:8.1,alignSelf:8.1,justifyContent:8.1,order:8.1,transform:8.1,transformOrigin:8.1,transformOriginX:8.1,transformOriginY:8.1,backfaceVisibility:8.1,perspective:8.1,perspectiveOrigin:8.1,transformStyle:8.1,transformOriginZ:8.1,animation:8.1,animationDelay:8.1,animationDirection:8.1,animationFillMode:8.1,animationDuration:8.1,animationIterationCount:8.1,animationName:8.1,animationPlayState:8.1,animationTimingFunction:8.1,appearance:11,userSelect:11,backdropFilter:11,fontKerning:11,scrollSnapType:11,scrollSnapPointsX:11,scrollSnapPointsY:11,scrollSnapDestination:11,scrollSnapCoordinate:11,boxDecorationBreak:11,clipPath:11,maskImage:11,maskMode:11,maskRepeat:11,maskPosition:11,maskClip:11,maskOrigin:11,maskSize:11,maskComposite:11,mask:11,maskBorderSource:11,maskBorderMode:11,maskBorderSlice:11,maskBorderWidth:11,maskBorderOutset:11,maskBorderRepeat:11,maskBorder:11,maskType:11,textSizeAdjust:11,textDecorationStyle:11,textDecorationSkip:11,textDecorationLine:11,textDecorationColor:11,shapeImageThreshold:10,shapeImageMargin:10,shapeImageOutside:10,filter:9,hyphens:11,flowInto:11,flowFrom:11,breakBefore:8.1,breakAfter:8.1,breakInside:8.1,regionFragment:11,columnCount:8.1,columnFill:8.1,columnGap:8.1,columnRule:8.1,columnRuleColor:8.1,columnRuleStyle:8.1,columnRuleWidth:8.1,columns:8.1,columnSpan:8.1,columnWidth:8.1,writingMode:11},android:{borderImage:4.2,borderImageOutset:4.2,borderImageRepeat:4.2,borderImageSlice:4.2,borderImageSource:4.2,borderImageWidth:4.2,flex:4.2,flexBasis:4.2,flexDirection:4.2,flexGrow:4.2,flexFlow:4.2,flexShrink:4.2,flexWrap:4.2,alignContent:4.2,alignItems:4.2,alignSelf:4.2,justifyContent:4.2,order:4.2,transition:4.2,transitionDelay:4.2,transitionDuration:4.2,transitionProperty:4.2,transitionTimingFunction:4.2,transform:4.4,transformOrigin:4.4,transformOriginX:4.4,transformOriginY:4.4,backfaceVisibility:4.4,perspective:4.4,perspectiveOrigin:4.4,transformStyle:4.4,transformOriginZ:4.4,animation:4.4,animationDelay:4.4,animationDirection:4.4,animationFillMode:4.4,animationDuration:4.4,animationIterationCount:4.4,animationName:4.4,animationPlayState:4.4,animationTimingFunction:4.4,appearance:56,userSelect:4.4,fontKerning:4.4,textEmphasisPosition:56,textEmphasis:56,textEmphasisStyle:56,textEmphasisColor:56,boxDecorationBreak:56,clipPath:4.4,maskImage:56,maskMode:56,maskRepeat:56,maskPosition:56,maskClip:56,maskOrigin:56,maskSize:56,maskComposite:56,mask:56,maskBorderSource:56,maskBorderMode:56,maskBorderSlice:56,maskBorderWidth:56,maskBorderOutset:56,maskBorderRepeat:56,maskBorder:56,maskType:56,filter:4.4,fontFeatureSettings:4.4,breakAfter:4.4,breakBefore:4.4,breakInside:4.4,columnCount:4.4,columnFill:4.4,columnGap:4.4,columnRule:4.4,columnRuleColor:4.4,columnRuleStyle:4.4,columnRuleWidth:4.4,columns:4.4,columnSpan:4.4,columnWidth:4.4,writingMode:4.4},and_chr:{appearance:61,textEmphasisPosition:61,textEmphasis:61,textEmphasisStyle:61,textEmphasisColor:61,boxDecorationBreak:61,maskImage:61,maskMode:61,maskRepeat:61,maskPosition:61,maskClip:61,maskOrigin:61,maskSize:61,maskComposite:61,mask:61,maskBorderSource:61,maskBorderMode:61,maskBorderSlice:61,maskBorderWidth:61,maskBorderOutset:61,maskBorderRepeat:61,maskBorder:61,maskType:61},and_uc:{flex:11.4,flexBasis:11.4,flexDirection:11.4,flexGrow:11.4,flexFlow:11.4,flexShrink:11.4,flexWrap:11.4,alignContent:11.4,alignItems:11.4,alignSelf:11.4,justifyContent:11.4,order:11.4,transform:11.4,transformOrigin:11.4,transformOriginX:11.4,transformOriginY:11.4,backfaceVisibility:11.4,perspective:11.4,perspectiveOrigin:11.4,transformStyle:11.4,transformOriginZ:11.4,animation:11.4,animationDelay:11.4,animationDirection:11.4,animationFillMode:11.4,animationDuration:11.4,animationIterationCount:11.4,animationName:11.4,animationPlayState:11.4,animationTimingFunction:11.4,appearance:11.4,userSelect:11.4,textEmphasisPosition:11.4,textEmphasis:11.4,textEmphasisStyle:11.4,textEmphasisColor:11.4,clipPath:11.4,maskImage:11.4,maskMode:11.4,maskRepeat:11.4,maskPosition:11.4,maskClip:11.4,maskOrigin:11.4,maskSize:11.4,maskComposite:11.4,mask:11.4,maskBorderSource:11.4,maskBorderMode:11.4,maskBorderSlice:11.4,maskBorderWidth:11.4,maskBorderOutset:11.4,maskBorderRepeat:11.4,maskBorder:11.4,maskType:11.4,textSizeAdjust:11.4,filter:11.4,hyphens:11.4,fontFeatureSettings:11.4,breakAfter:11.4,breakBefore:11.4,breakInside:11.4,columnCount:11.4,columnFill:11.4,columnGap:11.4,columnRule:11.4,columnRuleColor:11.4,columnRuleStyle:11.4,columnRuleWidth:11.4,columns:11.4,columnSpan:11.4,columnWidth:11.4,writingMode:11.4},op_mini:{}}},e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.browserVersion,s=r.cssPrefix,u=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("cross-fade(")>-1&&("chrome"===i||"opera"===i||"and_chr"===i||("ios_saf"===i||"safari"===i)&&a<10))return(0,o.default)(t.replace(/cross-fade\(/g,s+"cross-fade("),t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,u=r.browserVersion,l=r.cssPrefix,c=r.keepUnprefixed;return"cursor"!==e||!a[t]||"firefox"!==i&&"chrome"!==i&&"safari"!==i&&"opera"!==i?"cursor"===e&&s[t]&&("firefox"===i&&u<24||"chrome"===i&&u<37||"safari"===i&&u<9||"opera"===i&&u<24)?(0,o.default)(l+t,t,c):void 0:(0,o.default)(l+t,t,c)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={grab:!0,grabbing:!0},s={"zoom-in":!0,"zoom-out":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.browserVersion,s=r.cssPrefix,u=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("filter(")>-1&&("ios_saf"===i||"safari"===i&&a<9.1))return(0,o.default)(t.replace(/filter\(/g,s+"filter("),t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,s=r.browserVersion,u=r.cssPrefix,l=r.keepUnprefixed;if("display"===e&&a[t]&&("chrome"===i&&s<29&&s>20||("safari"===i||"ios_saf"===i)&&s<9&&s>6||"opera"===i&&(15===s||16===s)))return(0,o.default)(u+t,t,l)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={flex:!0,"inline-flex":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,u=r.browserVersion,c=r.cssPrefix,p=r.keepUnprefixed,f=r.requiresPrefix;if((l.indexOf(e)>-1||"display"===e&&"string"==typeof t&&t.indexOf("flex")>-1)&&("firefox"===i&&u<22||"chrome"===i&&u<21||("safari"===i||"ios_saf"===i)&&u<=6.1||"android"===i&&u<4.4||"and_uc"===i)){if(delete f[e],p||Array.isArray(n[e])||delete n[e],"flexDirection"===e&&"string"==typeof t&&(t.indexOf("column")>-1?n.WebkitBoxOrient="vertical":n.WebkitBoxOrient="horizontal",t.indexOf("reverse")>-1?n.WebkitBoxDirection="reverse":n.WebkitBoxDirection="normal"),"display"===e&&a.hasOwnProperty(t))return(0,o.default)(c+a[t],t,p);s.hasOwnProperty(e)&&(n[s[e]]=a[t]||t)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={"space-around":"justify","space-between":"justify","flex-start":"start","flex-end":"end","wrap-reverse":"multiple",wrap:"multiple",flex:"box","inline-flex":"inline-box"},s={alignItems:"WebkitBoxAlign",justifyContent:"WebkitBoxPack",flexWrap:"WebkitBoxLines"},u=["alignContent","alignSelf","order","flexGrow","flexShrink","flexBasis","flexDirection"],l=Object.keys(s).concat(u);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,s=r.browserVersion,u=r.cssPrefix,l=r.keepUnprefixed;if("string"==typeof t&&a.test(t)&&("firefox"===i&&s<16||"chrome"===i&&s<26||("safari"===i||"ios_saf"===i)&&s<7||("opera"===i||"op_mini"===i)&&s<12.1||"android"===i&&s<4.4||"and_uc"===i))return(0,o.default)(u+t,t,l)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=/linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/;e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.cssPrefix,s=r.keepUnprefixed;if("string"==typeof t&&t.indexOf("image-set(")>-1&&("chrome"===i||"opera"===i||"and_chr"===i||"and_uc"===i||"ios_saf"===i||"safari"===i))return(0,o.default)(t.replace(/image-set\(/g,a+"image-set("),t,s)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.browserName,a=r.cssPrefix,s=r.keepUnprefixed;if("position"===e&&"sticky"===t&&("safari"===i||"ios_saf"===i))return(0,o.default)(a+t,t,s)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.cssPrefix,u=r.keepUnprefixed;if(a.hasOwnProperty(e)&&s.hasOwnProperty(t))return(0,o.default)(i+t,t,u)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(50),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={maxHeight:!0,maxWidth:!0,width:!0,height:!0,columnWidth:!0,minWidth:!0,minHeight:!0},s={"min-content":!0,"max-content":!0,"fill-available":!0,"fit-content":!0,"contain-floats":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n,r){var i=r.cssPrefix,u=r.keepUnprefixed,l=r.requiresPrefix;if("string"==typeof t&&a.hasOwnProperty(e)){s||(s=Object.keys(l).map(function(e){return(0,o.default)(e)}));var c=t.split(/,(?![^()]*(?:\([^()]*\))?\))/g);return s.forEach(function(e){c.forEach(function(t,n){t.indexOf(e)>-1&&"order"!==e&&(c[n]=t.replace(e,i+e)+(u?","+t:""))})}),c.join(",")}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(367),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a={transition:!0,transitionProperty:!0,WebkitTransition:!0,WebkitTransitionProperty:!0,MozTransition:!0,MozTransitionProperty:!0},s=void 0;e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){function t(e){for(var i in e){var o=e[i];if((0,f.default)(o))e[i]=t(o);else if(Array.isArray(o)){for(var s=[],l=0,p=o.length;l<p;++l){var h=(0,u.default)(r,i,o[l],e,n);(0,c.default)(s,h||o[l])}s.length>0&&(e[i]=s)}else{var d=(0,u.default)(r,i,o,e,n);d&&(e[i]=d),(0,a.default)(n,i,e)}}return e}var n=e.prefixMap,r=e.plugins;return t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(792),a=r(o),s=n(385),u=r(s),l=n(383),c=r(l),p=n(384),f=r(p);e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(777),o=r(i),a=n(789),s=r(a),u=n(780),l=r(u),c=n(779),p=r(c),f=n(781),h=r(f),d=n(782),m=r(d),v=n(783),g=r(v),y=n(784),_=r(y),b=n(785),x=r(b),w=n(786),k=r(w),E=n(787),S=r(E),C=n(788),A=r(C),D=[p.default,l.default,h.default,g.default,_.default,x.default,k.default,S.default,A.default,m.default];t.default=(0,o.default)({prefixMap:s.default.prefixMap,plugins:D}),e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("cross-fade(")>-1)return a.map(function(e){return t.replace(/cross-fade\(/g,e+"cross-fade(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("cursor"===e&&o.hasOwnProperty(t))return i.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=["-webkit-","-moz-",""],o={"zoom-in":!0,"zoom-out":!0,grab:!0,grabbing:!0};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("filter(")>-1)return a.map(function(e){return t.replace(/filter\(/g,e+"filter(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("display"===e&&i.hasOwnProperty(t))return i[t]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i={flex:["-webkit-box","-moz-box","-ms-flexbox","-webkit-flex","flex"],"inline-flex":["-webkit-inline-box","-moz-inline-box","-ms-inline-flexbox","-webkit-inline-flex","inline-flex"]};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){"flexDirection"===e&&"string"==typeof t&&(t.indexOf("column")>-1?n.WebkitBoxOrient="vertical":n.WebkitBoxOrient="horizontal",t.indexOf("reverse")>-1?n.WebkitBoxDirection="reverse":n.WebkitBoxDirection="normal"),o.hasOwnProperty(e)&&(n[o[e]]=i[t]||t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i={"space-around":"justify","space-between":"justify","flex-start":"start","flex-end":"end","wrap-reverse":"multiple",wrap:"multiple"},o={alignItems:"WebkitBoxAlign",justifyContent:"WebkitBoxPack",flexWrap:"WebkitBoxLines"};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&s.test(t))return a.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-","-moz-",""],s=/linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient/;e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("string"==typeof t&&!(0,o.default)(t)&&t.indexOf("image-set(")>-1)return a.map(function(e){return t.replace(/image-set\(/g,e+"image-set(")})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(112),o=function(e){return e&&e.__esModule?e:{default:e}}(i),a=["-webkit-",""];e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if("position"===e&&"sticky"===t)return["-webkit-sticky","sticky"]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(o.hasOwnProperty(e)&&a.hasOwnProperty(t))return i.map(function(e){return e+t})}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=["-webkit-","-moz-",""],o={maxHeight:!0,maxWidth:!0,width:!0,height:!0,columnWidth:!0,minWidth:!0,minHeight:!0},a={"min-content":!0,"max-content":!0,"fill-available":!0,"fit-content":!0,"contain-floats":!0};e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if((0,l.default)(e))return e;for(var n=e.split(/,(?![^()]*(?:\([^()]*\))?\))/g),r=0,i=n.length;r<i;++r){var o=n[r],a=[o];for(var u in t){var c=(0,s.default)(u);if(o.indexOf(c)>-1&&"order"!==c)for(var p=t[u],f=0,d=p.length;f<d;++f)a.unshift(o.replace(c,h[p[f]]+c))}n[r]=a.join(",")}return n.join(",")}function o(e,t,n,r){if("string"==typeof t&&f.hasOwnProperty(e)){var o=i(t,r),a=o.split(/,(?![^()]*(?:\([^()]*\))?\))/g).filter(function(e){return!/-moz-|-ms-/.test(e)}).join(",");if(e.indexOf("Webkit")>-1)return a;var s=o.split(/,(?![^()]*(?:\([^()]*\))?\))/g).filter(function(e){return!/-webkit-|-ms-/.test(e)}).join(",");return e.indexOf("Moz")>-1?s:(n["Webkit"+(0,p.default)(e)]=a,n["Moz"+(0,p.default)(e)]=s,o)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var a=n(367),s=r(a),u=n(112),l=r(u),c=n(210),p=r(c),f={transition:!0,transitionProperty:!0,WebkitTransition:!0,WebkitTransitionProperty:!0,MozTransition:!0,MozTransitionProperty:!0},h={Webkit:"-webkit-",Moz:"-moz-",ms:"-ms-"};e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=["Webkit"],i=["Moz"],o=["ms"],a=["Webkit","Moz"],s=["Webkit","ms"],u=["Webkit","Moz","ms"];t.default={plugins:[],prefixMap:{appearance:a,userSelect:u,textEmphasisPosition:r,textEmphasis:r,textEmphasisStyle:r,textEmphasisColor:r,boxDecorationBreak:r,clipPath:r,maskImage:r,maskMode:r,maskRepeat:r,maskPosition:r,maskClip:r,maskOrigin:r,maskSize:r,maskComposite:r,mask:r,maskBorderSource:r,maskBorderMode:r,maskBorderSlice:r,maskBorderWidth:r,maskBorderOutset:r,maskBorderRepeat:r,maskBorder:r,maskType:r,textDecorationStyle:r,textDecorationSkip:r,textDecorationLine:r,textDecorationColor:r,filter:r,fontFeatureSettings:r,breakAfter:u,breakBefore:u,breakInside:u,columnCount:a,columnFill:a,columnGap:a,columnRule:a,columnRuleColor:a,columnRuleStyle:a,columnRuleWidth:a,columns:a,columnSpan:a,columnWidth:a,writingMode:s,flex:r,flexBasis:r,flexDirection:r,flexGrow:r,flexFlow:r,flexShrink:r,flexWrap:r,alignContent:r,alignItems:r,alignSelf:r,justifyContent:r,order:r,transform:r,transformOrigin:r,transformOriginX:r,transformOriginY:r,backfaceVisibility:r,perspective:r,perspectiveOrigin:r,transformStyle:r,transformOriginZ:r,animation:r,animationDelay:r,animationDirection:r,animationFillMode:r,animationDuration:r,animationIterationCount:r,animationName:r,animationPlayState:r,animationTimingFunction:r,backdropFilter:r,fontKerning:r,scrollSnapType:s,scrollSnapPointsX:s,scrollSnapPointsY:s,scrollSnapDestination:s,scrollSnapCoordinate:s,shapeImageThreshold:r,shapeImageMargin:r,shapeImageOutside:r,hyphens:u,flowInto:s,flowFrom:s,regionFragment:s,textAlignLast:i,tabSize:i,wrapFlow:o,wrapThrough:o,wrapMargin:o,gridTemplateColumns:o,gridTemplateRows:o,gridTemplateAreas:o,gridTemplate:o,gridAutoColumns:o,gridAutoRows:o,gridAutoFlow:o,grid:o,gridRowStart:o,gridColumnStart:o,gridRowEnd:o,gridRow:o,gridColumn:o,gridColumnEnd:o,gridColumnGap:o,gridRowGap:o,gridArea:o,gridGap:o,textSizeAdjust:s,borderImage:r,borderImageOutset:r,borderImageRepeat:r,borderImageSlice:r,borderImageSource:r,borderImageWidth:r,transitionDelay:r,transitionDuration:r,transitionProperty:r,transitionTimingFunction:r}},e.exports=t.default},function(e,t,n){"use strict";function r(e){if(e.firefox)return"firefox";if(e.mobile||e.tablet){if(e.ios)return"ios_saf";if(e.android)return"android";if(e.opera)return"op_mini"}for(var t in u)if(e.hasOwnProperty(t))return u[t]}function i(e){var t=a.default._detect(e);t.yandexbrowser&&(t=a.default._detect(e.replace(/YaBrowser\/[0-9.]*/,"")));for(var n in s)if(t.hasOwnProperty(n)){var i=s[n];t.jsPrefix=i,t.cssPrefix="-"+i.toLowerCase()+"-";break}return t.browserName=r(t),t.version?t.browserVersion=parseFloat(t.version):t.browserVersion=parseInt(parseFloat(t.osversion),10),t.osVersion=parseFloat(t.osversion),"ios_saf"===t.browserName&&t.browserVersion>t.osVersion&&(t.browserVersion=t.osVersion),"android"===t.browserName&&t.chrome&&t.browserVersion>37&&(t.browserName="and_chr"),"android"===t.browserName&&t.osVersion<5&&(t.browserVersion=t.osVersion),"android"===t.browserName&&t.samsungBrowser&&(t.browserName="and_chr",t.browserVersion=44),t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(571),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s={chrome:"Webkit",safari:"Webkit",ios:"Webkit",android:"Webkit",phantom:"Webkit",opera:"Webkit",webos:"Webkit",blackberry:"Webkit",bada:"Webkit",tizen:"Webkit",chromium:"Webkit",vivaldi:"Webkit",firefox:"Moz",seamoney:"Moz",sailfish:"Moz",msie:"ms",msedge:"ms"},u={chrome:"chrome",chromium:"chrome",safari:"safari",firfox:"firefox",msedge:"edge",opera:"opera",vivaldi:"opera",msie:"ie"};e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){return"chrome"===e&&t<43||("safari"===e||"ios_saf"===e)&&t<9||"opera"===e&&t<30||"android"===e&&t<=4.4||"and_uc"===e?n+"keyframes":"keyframes"}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){if(e.hasOwnProperty(t))for(var r=e[t],i=0,a=r.length;i<a;++i)n[r[i]+(0,o.default)(t)]=n[t]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(210),o=function(e){return e&&e.__esModule?e:{default:e}}(i);e.exports=t.default},function(e,t,n){"use strict";var r=function(e,t,n,r,i,o,a,s){if(!e){var u;if(void 0===t)u=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,i,o,a,s],c=0;u=new Error(t.replace(/%s/g,function(){return l[c++]})),u.name="Invariant Violation"}throw u.framesToPop=1,u}};e.exports=r},function(e,t){e.exports=FormData},function(e,t,n){"use strict";function r(e){return function(){throw new Error("Function "+e+" is deprecated and cannot be used.")}}var i=n(797),o=n(796);e.exports.Type=n(16),e.exports.Schema=n(81),e.exports.FAILSAFE_SCHEMA=n(212),e.exports.JSON_SCHEMA=n(389),e.exports.CORE_SCHEMA=n(388),e.exports.DEFAULT_SAFE_SCHEMA=n(118),e.exports.DEFAULT_FULL_SCHEMA=n(145),e.exports.load=i.load,e.exports.loadAll=i.loadAll,e.exports.safeLoad=i.safeLoad,e.exports.safeLoadAll=i.safeLoadAll,e.exports.dump=o.dump,e.exports.safeDump=o.safeDump,e.exports.YAMLException=n(117),e.exports.MINIMAL_SCHEMA=n(212),e.exports.SAFE_SCHEMA=n(118),e.exports.DEFAULT_SCHEMA=n(145),e.exports.scan=r("scan"),e.exports.parse=r("parse"),e.exports.compose=r("compose"),e.exports.addConstructor=r("addConstructor")},function(e,t,n){"use strict";function r(e,t){var n,r,i,o,a,s,u;if(null===t)return{};for(n={},r=Object.keys(t),i=0,o=r.length;i<o;i+=1)a=r[i],s=String(t[a]),"!!"===a.slice(0,2)&&(a="tag:yaml.org,2002:"+a.slice(2)),u=e.compiledTypeMap.fallback[a],u&&j.call(u.styleAliases,s)&&(s=u.styleAliases[s]),n[a]=s;return n}function i(e){var t,n,r;if(t=e.toString(16).toUpperCase(),e<=255)n="x",r=2;else if(e<=65535)n="u",r=4;else{if(!(e<=4294967295))throw new T("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+M.repeat("0",r-t.length)+t}function o(e){this.schema=e.schema||P,this.indent=Math.max(1,e.indent||2),this.skipInvalid=e.skipInvalid||!1,this.flowLevel=M.isNothing(e.flowLevel)?-1:e.flowLevel,this.styleMap=r(this.schema,e.styles||null),this.sortKeys=e.sortKeys||!1,this.lineWidth=e.lineWidth||80,this.noRefs=e.noRefs||!1,this.noCompatMode=e.noCompatMode||!1,this.condenseFlow=e.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function a(e,t){for(var n,r=M.repeat(" ",t),i=0,o=-1,a="",s=e.length;i<s;)o=e.indexOf("\n",i),-1===o?(n=e.slice(i),i=s):(n=e.slice(i,o+1),i=o+1),n.length&&"\n"!==n&&(a+=r),a+=n;return a}function s(e,t){return"\n"+M.repeat(" ",e.indent*t)}function u(e,t){var n,r,i;for(n=0,r=e.implicitTypes.length;n<r;n+=1)if(i=e.implicitTypes[n],i.resolve(t))return!0;return!1}function l(e){return e===B||e===F}function c(e){return 32<=e&&e<=126||161<=e&&e<=55295&&8232!==e&&8233!==e||57344<=e&&e<=65533&&65279!==e||65536<=e&&e<=1114111}function p(e){return c(e)&&65279!==e&&e!==G&&e!==Z&&e!==Q&&e!==te&&e!==re&&e!==K&&e!==z}function f(e){return c(e)&&65279!==e&&!l(e)&&e!==J&&e!==Y&&e!==K&&e!==G&&e!==Z&&e!==Q&&e!==te&&e!==re&&e!==z&&e!==W&&e!==H&&e!==L&&e!==ne&&e!==X&&e!==V&&e!==q&&e!==U&&e!==$&&e!==ee}function h(e,t,n,r,i){var o,a,s=!1,u=!1,h=-1!==r,d=-1,m=f(e.charCodeAt(0))&&!l(e.charCodeAt(e.length-1));if(t)for(o=0;o<e.length;o++){if(a=e.charCodeAt(o),!c(a))return ce;m=m&&p(a)}else{for(o=0;o<e.length;o++){if((a=e.charCodeAt(o))===N)s=!0,h&&(u=u||o-d-1>r&&" "!==e[d+1],d=o);else if(!c(a))return ce;m=m&&p(a)}u=u||h&&o-d-1>r&&" "!==e[d+1]}return s||u?" "===e[0]&&n>9?ce:u?le:ue:m&&!i(e)?ae:se}function d(e,t,n,r){e.dump=function(){function i(t){return u(e,t)}if(0===t.length)return"''";if(!e.noCompatMode&&-1!==oe.indexOf(t))return"'"+t+"'";var o=e.indent*Math.max(1,n),s=-1===e.lineWidth?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-o),l=r||e.flowLevel>-1&&n>=e.flowLevel;switch(h(t,l,e.indent,s,i)){case ae:return t;case se:return"'"+t.replace(/'/g,"''")+"'";case ue:return"|"+m(t,e.indent)+v(a(t,o));case le:return">"+m(t,e.indent)+v(a(g(t,s),o));case ce:return'"'+_(t)+'"';default:throw new T("impossible error: invalid scalar style")}}()}function m(e,t){var n=" "===e[0]?String(t):"",r="\n"===e[e.length-1];return n+(!r||"\n"!==e[e.length-2]&&"\n"!==e?r?"":"-":"+")+"\n"}function v(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function g(e,t){for(var n,r,i=/(\n+)([^\n]*)/g,o=function(){var n=e.indexOf("\n");return n=-1!==n?n:e.length,i.lastIndex=n,y(e.slice(0,n),t)}(),a="\n"===e[0]||" "===e[0];r=i.exec(e);){var s=r[1],u=r[2];n=" "===u[0],o+=s+(a||n||""===u?"":"\n")+y(u,t),a=n}return o}function y(e,t){if(""===e||" "===e[0])return e;for(var n,r,i=/ [^ ]/g,o=0,a=0,s=0,u="";n=i.exec(e);)s=n.index,s-o>t&&(r=a>o?a:s,u+="\n"+e.slice(o,r),o=r+1),a=s;return u+="\n",e.length-o>t&&a>o?u+=e.slice(o,a)+"\n"+e.slice(a+1):u+=e.slice(o),u.slice(1)}function _(e){for(var t,n,r,o="",a=0;a<e.length;a++)t=e.charCodeAt(a),t>=55296&&t<=56319&&(n=e.charCodeAt(a+1))>=56320&&n<=57343?(o+=i(1024*(t-55296)+n-56320+65536),a++):(r=ie[t],o+=!r&&c(t)?e[a]:r||i(t));return o}function b(e,t,n){var r,i,o="",a=e.tag;for(r=0,i=n.length;r<i;r+=1)S(e,t,n[r],!1,!1)&&(0!==r&&(o+=","+(e.condenseFlow?"":" ")),o+=e.dump);e.tag=a,e.dump="["+o+"]"}function x(e,t,n,r){var i,o,a="",u=e.tag;for(i=0,o=n.length;i<o;i+=1)S(e,t+1,n[i],!0,!0)&&(r&&0===i||(a+=s(e,t)),e.dump&&N===e.dump.charCodeAt(0)?a+="-":a+="- ",a+=e.dump);e.tag=u,e.dump=a||"[]"}function w(e,t,n){var r,i,o,a,s,u="",l=e.tag,c=Object.keys(n);for(r=0,i=c.length;r<i;r+=1)s=e.condenseFlow?'"':"",0!==r&&(s+=", "),o=c[r],a=n[o],S(e,t,o,!1,!1)&&(e.dump.length>1024&&(s+="? "),s+=e.dump+(e.condenseFlow?'"':"")+":"+(e.condenseFlow?"":" "),S(e,t,a,!1,!1)&&(s+=e.dump,u+=s));e.tag=l,e.dump="{"+u+"}"}function k(e,t,n,r){var i,o,a,u,l,c,p="",f=e.tag,h=Object.keys(n);if(!0===e.sortKeys)h.sort();else if("function"==typeof e.sortKeys)h.sort(e.sortKeys);else if(e.sortKeys)throw new T("sortKeys must be a boolean or a function");for(i=0,o=h.length;i<o;i+=1)c="",r&&0===i||(c+=s(e,t)),a=h[i],u=n[a],S(e,t+1,a,!0,!0,!0)&&(l=null!==e.tag&&"?"!==e.tag||e.dump&&e.dump.length>1024,l&&(e.dump&&N===e.dump.charCodeAt(0)?c+="?":c+="? "),c+=e.dump,l&&(c+=s(e,t)),S(e,t+1,u,!0,l)&&(e.dump&&N===e.dump.charCodeAt(0)?c+=":":c+=": ",c+=e.dump,p+=c));e.tag=f,e.dump=p||"{}"}function E(e,t,n){var r,i,o,a,s,u;for(i=n?e.explicitTypes:e.implicitTypes,o=0,a=i.length;o<a;o+=1)if(s=i[o],(s.instanceOf||s.predicate)&&(!s.instanceOf||"object"==typeof t&&t instanceof s.instanceOf)&&(!s.predicate||s.predicate(t))){if(e.tag=n?s.tag:"?",s.represent){if(u=e.styleMap[s.tag]||s.defaultStyle,"[object Function]"===R.call(s.represent))r=s.represent(t,u);else{if(!j.call(s.represent,u))throw new T("!<"+s.tag+'> tag resolver accepts not "'+u+'" style');r=s.represent[u](t,u)}e.dump=r}return!0}return!1}function S(e,t,n,r,i,o){e.tag=null,e.dump=n,E(e,n,!1)||E(e,n,!0);var a=R.call(e.dump);r&&(r=e.flowLevel<0||e.flowLevel>t);var s,u,l="[object Object]"===a||"[object Array]"===a;if(l&&(s=e.duplicates.indexOf(n),u=-1!==s),(null!==e.tag&&"?"!==e.tag||u||2!==e.indent&&t>0)&&(i=!1),u&&e.usedDuplicates[s])e.dump="*ref_"+s;else{if(l&&u&&!e.usedDuplicates[s]&&(e.usedDuplicates[s]=!0),"[object Object]"===a)r&&0!==Object.keys(e.dump).length?(k(e,t,e.dump,i),u&&(e.dump="&ref_"+s+e.dump)):(w(e,t,e.dump),u&&(e.dump="&ref_"+s+" "+e.dump));else if("[object Array]"===a)r&&0!==e.dump.length?(x(e,t,e.dump,i),u&&(e.dump="&ref_"+s+e.dump)):(b(e,t,e.dump),u&&(e.dump="&ref_"+s+" "+e.dump));else{if("[object String]"!==a){if(e.skipInvalid)return!1;throw new T("unacceptable kind of an object to dump "+a)}"?"!==e.tag&&d(e,e.dump,t,o)}null!==e.tag&&"?"!==e.tag&&(e.dump="!<"+e.tag+"> "+e.dump)}return!0}function C(e,t){var n,r,i=[],o=[];for(A(e,i,o),n=0,r=o.length;n<r;n+=1)t.duplicates.push(i[o[n]]);t.usedDuplicates=new Array(r)}function A(e,t,n){var r,i,o;if(null!==e&&"object"==typeof e)if(-1!==(i=t.indexOf(e)))-1===n.indexOf(i)&&n.push(i);else if(t.push(e),Array.isArray(e))for(i=0,o=e.length;i<o;i+=1)A(e[i],t,n);else for(r=Object.keys(e),i=0,o=r.length;i<o;i+=1)A(e[r[i]],t,n)}function D(e,t){t=t||{};var n=new o(t);return n.noRefs||C(e,n),S(n,0,e,!0,!0)?n.dump+"\n":""}function O(e,t){return D(e,M.extend({schema:I},t))}var M=n(80),T=n(117),P=n(145),I=n(118),R=Object.prototype.toString,j=Object.prototype.hasOwnProperty,F=9,N=10,B=32,L=33,q=34,z=35,U=37,W=38,V=39,H=42,G=44,J=45,K=58,X=62,Y=63,$=64,Z=91,Q=93,ee=96,te=123,ne=124,re=125,ie={};ie[0]="\\0",ie[7]="\\a",ie[8]="\\b",ie[9]="\\t",ie[10]="\\n",ie[11]="\\v",ie[12]="\\f",ie[13]="\\r",ie[27]="\\e",ie[34]='\\"',ie[92]="\\\\",ie[133]="\\N",ie[160]="\\_",ie[8232]="\\L",ie[8233]="\\P";var oe=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],ae=1,se=2,ue=3,le=4,ce=5;e.exports.dump=D,e.exports.safeDump=O},function(e,t,n){"use strict";function r(e){return 10===e||13===e}function i(e){return 9===e||32===e}function o(e){return 9===e||32===e||10===e||13===e}function a(e){return 44===e||91===e||93===e||123===e||125===e}function s(e){var t;return 48<=e&&e<=57?e-48:(t=32|e,97<=t&&t<=102?t-97+10:-1)}function u(e){return 120===e?2:117===e?4:85===e?8:0}function l(e){return 48<=e&&e<=57?e-48:-1}function c(e){return 48===e?"\0":97===e?"":98===e?"\b":116===e?"\t":9===e?"\t":110===e?"\n":118===e?"\v":102===e?"\f":114===e?"\r":101===e?"":32===e?" ":34===e?'"':47===e?"/":92===e?"\\":78===e?"…":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function p(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}function f(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||V,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function h(e,t){return new z(t,new U(e.filename,e.input,e.position,e.line,e.position-e.lineStart))}function d(e,t){throw h(e,t)}function m(e,t){e.onWarning&&e.onWarning.call(null,h(e,t))}function v(e,t,n,r){var i,o,a,s;if(t<n){if(s=e.input.slice(t,n),r)for(i=0,o=s.length;i<o;i+=1)9===(a=s.charCodeAt(i))||32<=a&&a<=1114111||d(e,"expected valid JSON character");else Q.test(s)&&d(e,"the stream contains non-printable characters");e.result+=s}}function g(e,t,n,r){var i,o,a,s;for(q.isObject(n)||d(e,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),a=0,s=i.length;a<s;a+=1)o=i[a],H.call(t,o)||(t[o]=n[o],r[o]=!0)}function y(e,t,n,r,i,o,a,s){var u,l;if(i=String(i),null===t&&(t={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(o))for(u=0,l=o.length;u<l;u+=1)g(e,t,o[u],n);else g(e,t,o,n);else e.json||H.call(n,i)||!H.call(t,i)||(e.line=a||e.line,e.position=s||e.position,d(e,"duplicated mapping key")),t[i]=o,delete n[i];return t}function _(e){var t;t=e.input.charCodeAt(e.position),10===t?e.position++:13===t?(e.position++,10===e.input.charCodeAt(e.position)&&e.position++):d(e,"a line break is expected"),e.line+=1,e.lineStart=e.position}function b(e,t,n){for(var o=0,a=e.input.charCodeAt(e.position);0!==a;){for(;i(a);)a=e.input.charCodeAt(++e.position);if(t&&35===a)do{a=e.input.charCodeAt(++e.position)}while(10!==a&&13!==a&&0!==a);if(!r(a))break;for(_(e),a=e.input.charCodeAt(e.position),o++,e.lineIndent=0;32===a;)e.lineIndent++,a=e.input.charCodeAt(++e.position)}return-1!==n&&0!==o&&e.lineIndent<n&&m(e,"deficient indentation"),o}function x(e){var t,n=e.position;return!(45!==(t=e.input.charCodeAt(n))&&46!==t||t!==e.input.charCodeAt(n+1)||t!==e.input.charCodeAt(n+2)||(n+=3,0!==(t=e.input.charCodeAt(n))&&!o(t)))}function w(e,t){1===t?e.result+=" ":t>1&&(e.result+=q.repeat("\n",t-1))}function k(e,t,n){var s,u,l,c,p,f,h,d,m,g=e.kind,y=e.result;if(m=e.input.charCodeAt(e.position),o(m)||a(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(u=e.input.charCodeAt(e.position+1),o(u)||n&&a(u)))return!1;for(e.kind="scalar",e.result="",l=c=e.position,p=!1;0!==m;){if(58===m){if(u=e.input.charCodeAt(e.position+1),o(u)||n&&a(u))break}else if(35===m){if(s=e.input.charCodeAt(e.position-1),o(s))break}else{if(e.position===e.lineStart&&x(e)||n&&a(m))break;if(r(m)){if(f=e.line,h=e.lineStart,d=e.lineIndent,b(e,!1,-1),e.lineIndent>=t){p=!0,m=e.input.charCodeAt(e.position);continue}e.position=c,e.line=f,e.lineStart=h,e.lineIndent=d;break}}p&&(v(e,l,c,!1),w(e,e.line-f),l=c=e.position,p=!1),i(m)||(c=e.position+1),m=e.input.charCodeAt(++e.position)}return v(e,l,c,!1),!!e.result||(e.kind=g,e.result=y,!1)}function E(e,t){var n,i,o;if(39!==(n=e.input.charCodeAt(e.position)))return!1;for(e.kind="scalar",e.result="",e.position++,i=o=e.position;0!==(n=e.input.charCodeAt(e.position));)if(39===n){if(v(e,i,e.position,!0),39!==(n=e.input.charCodeAt(++e.position)))return!0;i=e.position,e.position++,o=e.position}else r(n)?(v(e,i,o,!0),w(e,b(e,!1,t)),i=o=e.position):e.position===e.lineStart&&x(e)?d(e,"unexpected end of the document within a single quoted scalar"):(e.position++,o=e.position);d(e,"unexpected end of the stream within a single quoted scalar")}function S(e,t){var n,i,o,a,l,c;if(34!==(c=e.input.charCodeAt(e.position)))return!1;for(e.kind="scalar",e.result="",e.position++,n=i=e.position;0!==(c=e.input.charCodeAt(e.position));){if(34===c)return v(e,n,e.position,!0),e.position++,!0;if(92===c){if(v(e,n,e.position,!0),c=e.input.charCodeAt(++e.position),r(c))b(e,!1,t);else if(c<256&&ie[c])e.result+=oe[c],e.position++;else if((l=u(c))>0){for(o=l,a=0;o>0;o--)c=e.input.charCodeAt(++e.position),(l=s(c))>=0?a=(a<<4)+l:d(e,"expected hexadecimal character");e.result+=p(a),e.position++}else d(e,"unknown escape sequence");n=i=e.position}else r(c)?(v(e,n,i,!0),w(e,b(e,!1,t)),n=i=e.position):e.position===e.lineStart&&x(e)?d(e,"unexpected end of the document within a double quoted scalar"):(e.position++,i=e.position)}d(e,"unexpected end of the stream within a double quoted scalar")}function C(e,t){var n,r,i,a,s,u,l,c,p,f,h,m=!0,v=e.tag,g=e.anchor,_={};if(91===(h=e.input.charCodeAt(e.position)))a=93,l=!1,r=[];else{if(123!==h)return!1;a=125,l=!0,r={}}for(null!==e.anchor&&(e.anchorMap[e.anchor]=r),h=e.input.charCodeAt(++e.position);0!==h;){if(b(e,!0,t),(h=e.input.charCodeAt(e.position))===a)return e.position++,e.tag=v,e.anchor=g,e.kind=l?"mapping":"sequence",e.result=r,!0;m||d(e,"missed comma between flow collection entries"),p=c=f=null,s=u=!1,63===h&&(i=e.input.charCodeAt(e.position+1),o(i)&&(s=u=!0,e.position++,b(e,!0,t))),n=e.line,I(e,t,G,!1,!0),p=e.tag,c=e.result,b(e,!0,t),h=e.input.charCodeAt(e.position),!u&&e.line!==n||58!==h||(s=!0,h=e.input.charCodeAt(++e.position),b(e,!0,t),I(e,t,G,!1,!0),f=e.result),l?y(e,r,_,p,c,f):s?r.push(y(e,null,_,p,c,f)):r.push(c),b(e,!0,t),h=e.input.charCodeAt(e.position),44===h?(m=!0,h=e.input.charCodeAt(++e.position)):m=!1}d(e,"unexpected end of the stream within a flow collection")}function A(e,t){var n,o,a,s,u=Y,c=!1,p=!1,f=t,h=0,m=!1;if(124===(s=e.input.charCodeAt(e.position)))o=!1;else{if(62!==s)return!1;o=!0}for(e.kind="scalar",e.result="";0!==s;)if(43===(s=e.input.charCodeAt(++e.position))||45===s)Y===u?u=43===s?Z:$:d(e,"repeat of a chomping mode identifier");else{if(!((a=l(s))>=0))break;0===a?d(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):p?d(e,"repeat of an indentation width identifier"):(f=t+a-1,p=!0)}if(i(s)){do{s=e.input.charCodeAt(++e.position)}while(i(s));if(35===s)do{s=e.input.charCodeAt(++e.position)}while(!r(s)&&0!==s)}for(;0!==s;){for(_(e),e.lineIndent=0,s=e.input.charCodeAt(e.position);(!p||e.lineIndent<f)&&32===s;)e.lineIndent++,s=e.input.charCodeAt(++e.position);if(!p&&e.lineIndent>f&&(f=e.lineIndent),r(s))h++;else{if(e.lineIndent<f){u===Z?e.result+=q.repeat("\n",c?1+h:h):u===Y&&c&&(e.result+="\n");break}for(o?i(s)?(m=!0,e.result+=q.repeat("\n",c?1+h:h)):m?(m=!1,e.result+=q.repeat("\n",h+1)):0===h?c&&(e.result+=" "):e.result+=q.repeat("\n",h):e.result+=q.repeat("\n",c?1+h:h),c=!0,p=!0,h=0,n=e.position;!r(s)&&0!==s;)s=e.input.charCodeAt(++e.position);v(e,n,e.position,!1)}}return!0}function D(e,t){var n,r,i,a=e.tag,s=e.anchor,u=[],l=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=u),i=e.input.charCodeAt(e.position);0!==i&&45===i&&(r=e.input.charCodeAt(e.position+1),o(r));)if(l=!0,e.position++,b(e,!0,-1)&&e.lineIndent<=t)u.push(null),i=e.input.charCodeAt(e.position);else if(n=e.line,I(e,t,K,!1,!0),u.push(e.result),b(e,!0,-1),i=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==i)d(e,"bad indentation of a sequence entry");else if(e.lineIndent<t)break;return!!l&&(e.tag=a,e.anchor=s,e.kind="sequence",e.result=u,!0)}function O(e,t,n){var r,a,s,u,l,c=e.tag,p=e.anchor,f={},h={},m=null,v=null,g=null,_=!1,x=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=f),l=e.input.charCodeAt(e.position);0!==l;){if(r=e.input.charCodeAt(e.position+1),s=e.line,u=e.position,63!==l&&58!==l||!o(r)){if(!I(e,n,J,!1,!0))break;if(e.line===s){for(l=e.input.charCodeAt(e.position);i(l);)l=e.input.charCodeAt(++e.position);if(58===l)l=e.input.charCodeAt(++e.position),o(l)||d(e,"a whitespace character is expected after the key-value separator within a block mapping"),_&&(y(e,f,h,m,v,null),m=v=g=null),x=!0,_=!1,a=!1,m=e.tag,v=e.result;else{if(!x)return e.tag=c,e.anchor=p,!0;d(e,"can not read an implicit mapping pair; a colon is missed")}}else{if(!x)return e.tag=c,e.anchor=p,!0;d(e,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===l?(_&&(y(e,f,h,m,v,null),m=v=g=null),x=!0,_=!0,a=!0):_?(_=!1,a=!0):d(e,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),e.position+=1,l=r;if((e.line===s||e.lineIndent>t)&&(I(e,t,X,!0,a)&&(_?v=e.result:g=e.result),_||(y(e,f,h,m,v,g,s,u),m=v=g=null),b(e,!0,-1),l=e.input.charCodeAt(e.position)),e.lineIndent>t&&0!==l)d(e,"bad indentation of a mapping entry");else if(e.lineIndent<t)break}return _&&y(e,f,h,m,v,null),x&&(e.tag=c,e.anchor=p,e.kind="mapping",e.result=f),x}function M(e){var t,n,r,i,a=!1,s=!1;if(33!==(i=e.input.charCodeAt(e.position)))return!1;if(null!==e.tag&&d(e,"duplication of a tag property"),i=e.input.charCodeAt(++e.position),60===i?(a=!0,i=e.input.charCodeAt(++e.position)):33===i?(s=!0,n="!!",i=e.input.charCodeAt(++e.position)):n="!",t=e.position,a){do{i=e.input.charCodeAt(++e.position)}while(0!==i&&62!==i);e.position<e.length?(r=e.input.slice(t,e.position),i=e.input.charCodeAt(++e.position)):d(e,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!o(i);)33===i&&(s?d(e,"tag suffix cannot contain exclamation marks"):(n=e.input.slice(t-1,e.position+1),ne.test(n)||d(e,"named tag handle cannot contain such characters"),s=!0,t=e.position+1)),i=e.input.charCodeAt(++e.position);r=e.input.slice(t,e.position),te.test(r)&&d(e,"tag suffix cannot contain flow indicator characters")}return r&&!re.test(r)&&d(e,"tag name cannot contain such characters: "+r),a?e.tag=r:H.call(e.tagMap,n)?e.tag=e.tagMap[n]+r:"!"===n?e.tag="!"+r:"!!"===n?e.tag="tag:yaml.org,2002:"+r:d(e,'undeclared tag handle "'+n+'"'),!0}function T(e){var t,n;if(38!==(n=e.input.charCodeAt(e.position)))return!1;for(null!==e.anchor&&d(e,"duplication of an anchor property"),n=e.input.charCodeAt(++e.position),t=e.position;0!==n&&!o(n)&&!a(n);)n=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an anchor node must contain at least one character"),e.anchor=e.input.slice(t,e.position),!0}function P(e){var t,n,r;if(42!==(r=e.input.charCodeAt(e.position)))return!1;for(r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!o(r)&&!a(r);)r=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),e.anchorMap.hasOwnProperty(n)||d(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],b(e,!0,-1),!0}function I(e,t,n,r,i){var o,a,s,u,l,c,p,f,h=1,m=!1,v=!1;if(null!==e.listener&&e.listener("open",e),e.tag=null,e.anchor=null,e.kind=null,e.result=null,o=a=s=X===n||K===n,r&&b(e,!0,-1)&&(m=!0,e.lineIndent>t?h=1:e.lineIndent===t?h=0:e.lineIndent<t&&(h=-1)),1===h)for(;M(e)||T(e);)b(e,!0,-1)?(m=!0,s=o,e.lineIndent>t?h=1:e.lineIndent===t?h=0:e.lineIndent<t&&(h=-1)):s=!1;if(s&&(s=m||i),1!==h&&X!==n||(p=G===n||J===n?t:t+1,f=e.position-e.lineStart,1===h?s&&(D(e,f)||O(e,f,p))||C(e,p)?v=!0:(a&&A(e,p)||E(e,p)||S(e,p)?v=!0:P(e)?(v=!0,null===e.tag&&null===e.anchor||d(e,"alias node should not have any properties")):k(e,p,G===n)&&(v=!0,null===e.tag&&(e.tag="?")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===h&&(v=s&&D(e,f))),null!==e.tag&&"!"!==e.tag)if("?"===e.tag){for(u=0,l=e.implicitTypes.length;u<l;u+=1)if(c=e.implicitTypes[u],c.resolve(e.result)){e.result=c.construct(e.result),e.tag=c.tag,null!==e.anchor&&(e.anchorMap[e.anchor]=e.result);break}}else H.call(e.typeMap[e.kind||"fallback"],e.tag)?(c=e.typeMap[e.kind||"fallback"][e.tag],null!==e.result&&c.kind!==e.kind&&d(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+c.kind+'", not "'+e.kind+'"'),c.resolve(e.result)?(e.result=c.construct(e.result),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):d(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")):d(e,"unknown tag !<"+e.tag+">");return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||v}function R(e){var t,n,a,s,u=e.position,l=!1;for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap={},e.anchorMap={};0!==(s=e.input.charCodeAt(e.position))&&(b(e,!0,-1),s=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==s));){for(l=!0,s=e.input.charCodeAt(++e.position),t=e.position;0!==s&&!o(s);)s=e.input.charCodeAt(++e.position);for(n=e.input.slice(t,e.position),a=[],n.length<1&&d(e,"directive name must not be less than one character in length");0!==s;){for(;i(s);)s=e.input.charCodeAt(++e.position);if(35===s){do{s=e.input.charCodeAt(++e.position)}while(0!==s&&!r(s));break}if(r(s))break;for(t=e.position;0!==s&&!o(s);)s=e.input.charCodeAt(++e.position);a.push(e.input.slice(t,e.position))}0!==s&&_(e),H.call(se,n)?se[n](e,n,a):m(e,'unknown document directive "'+n+'"')}if(b(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,b(e,!0,-1)):l&&d(e,"directives end mark is expected"),I(e,e.lineIndent-1,X,!1,!0),b(e,!0,-1),e.checkLineBreaks&&ee.test(e.input.slice(u,e.position))&&m(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&x(e))return void(46===e.input.charCodeAt(e.position)&&(e.position+=3,b(e,!0,-1)));e.position<e.length-1&&d(e,"end of the stream or a document separator is expected")}function j(e,t){e=String(e),t=t||{},0!==e.length&&(10!==e.charCodeAt(e.length-1)&&13!==e.charCodeAt(e.length-1)&&(e+="\n"),65279===e.charCodeAt(0)&&(e=e.slice(1)));var n=new f(e,t);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)R(n);return n.documents}function F(e,t,n){var r,i,o=j(e,n);if("function"!=typeof t)return o;for(r=0,i=o.length;r<i;r+=1)t(o[r])}function N(e,t){var n=j(e,t);if(0!==n.length){if(1===n.length)return n[0];throw new z("expected a single document in the stream, but found more")}}function B(e,t,n){if("function"!=typeof t)return F(e,q.extend({schema:W},n));F(e,t,q.extend({schema:W},n))}function L(e,t){return N(e,q.extend({schema:W},t))}for(var q=n(80),z=n(117),U=n(798),W=n(118),V=n(145),H=Object.prototype.hasOwnProperty,G=1,J=2,K=3,X=4,Y=1,$=2,Z=3,Q=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,ee=/[\x85\u2028\u2029]/,te=/[,\[\]\{\}]/,ne=/^(?:!|!!|![a-z\-]+!)$/i,re=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,ie=new Array(256),oe=new Array(256),ae=0;ae<256;ae++)ie[ae]=c(ae)?1:0,oe[ae]=c(ae);var se={YAML:function(e,t,n){var r,i,o;null!==e.version&&d(e,"duplication of %YAML directive"),1!==n.length&&d(e,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(e,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),o=parseInt(r[2],10),1!==i&&d(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=o<2,1!==o&&2!==o&&m(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var r,i;2!==n.length&&d(e,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],ne.test(r)||d(e,"ill-formed tag handle (first argument) of the TAG directive"),H.call(e.tagMap,r)&&d(e,'there is a previously declared suffix for "'+r+'" tag handle'),re.test(i)||d(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[r]=i}};e.exports.loadAll=F,e.exports.load=N,e.exports.safeLoadAll=B,e.exports.safeLoad=L},function(e,t,n){"use strict";function r(e,t,n,r,i){this.name=e,this.buffer=t,this.position=n,this.line=r,this.column=i}var i=n(80);r.prototype.getSnippet=function(e,t){var n,r,o,a,s;if(!this.buffer)return null;for(e=e||4,t=t||75,n="",r=this.position;r>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1));)if(r-=1,this.position-r>t/2-1){n=" ... ",r+=5;break}for(o="",a=this.position;a<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(a));)if((a+=1)-this.position>t/2-1){o=" ... ",a-=5;break}return s=this.buffer.slice(r,a),i.repeat(" ",e)+n+s+o+"\n"+i.repeat(" ",e+this.position-r+n.length)+"^"},r.prototype.toString=function(e){var t,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet())&&(n+=":\n"+t),n},e.exports=r},function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t,n,r=0,i=e.length,o=l;for(n=0;n<i;n++)if(!((t=o.indexOf(e.charAt(n)))>64)){if(t<0)return!1;r+=6}return r%8==0}function i(e){var t,n,r=e.replace(/[\r\n=]/g,""),i=r.length,o=l,a=0,u=[];for(t=0;t<i;t++)t%4==0&&t&&(u.push(a>>16&255),u.push(a>>8&255),u.push(255&a)),a=a<<6|o.indexOf(r.charAt(t));return n=i%4*6,0===n?(u.push(a>>16&255),u.push(a>>8&255),u.push(255&a)):18===n?(u.push(a>>10&255),u.push(a>>2&255)):12===n&&u.push(a>>4&255),s?s.from?s.from(u):new s(u):u}function o(e){var t,n,r="",i=0,o=e.length,a=l;for(t=0;t<o;t++)t%3==0&&t&&(r+=a[i>>18&63],r+=a[i>>12&63],r+=a[i>>6&63],r+=a[63&i]),i=(i<<8)+e[t];return n=o%3,0===n?(r+=a[i>>18&63],r+=a[i>>12&63],r+=a[i>>6&63],r+=a[63&i]):2===n?(r+=a[i>>10&63],r+=a[i>>4&63],r+=a[i<<2&63],r+=a[64]):1===n&&(r+=a[i>>2&63],r+=a[i<<4&63],r+=a[64],r+=a[64]),r}function a(e){return s&&s.isBuffer(e)}var s;try{s=n(40).Buffer}catch(e){}var u=n(16),l="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";e.exports=new u("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t=e.length;return 4===t&&("true"===e||"True"===e||"TRUE"===e)||5===t&&("false"===e||"False"===e||"FALSE"===e)}function i(e){return"true"===e||"True"===e||"TRUE"===e}function o(e){return"[object Boolean]"===Object.prototype.toString.call(e)}var a=n(16);e.exports=new a("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{lowercase:function(e){return e?"true":"false"},uppercase:function(e){return e?"TRUE":"FALSE"},camelcase:function(e){return e?"True":"False"}},defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){return null!==e&&!(!l.test(e)||"_"===e[e.length-1])}function i(e){var t,n,r,i;return t=e.replace(/_/g,"").toLowerCase(),n="-"===t[0]?-1:1,i=[],"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:t.indexOf(":")>=0?(t.split(":").forEach(function(e){i.unshift(parseFloat(e,10))}),t=0,r=1,i.forEach(function(e){t+=e*r,r*=60}),n*t):n*parseFloat(t,10)}function o(e,t){var n;if(isNaN(e))switch(t){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(s.isNegativeZero(e))return"-0.0";return n=e.toString(10),c.test(n)?n.replace("e",".e"):n}function a(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!=0||s.isNegativeZero(e))}var s=n(80),u=n(16),l=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),c=/^[-+]?[0-9]+e/;e.exports=new u("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o,defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){return 48<=e&&e<=57||65<=e&&e<=70||97<=e&&e<=102}function i(e){return 48<=e&&e<=55}function o(e){return 48<=e&&e<=57}function a(e){if(null===e)return!1;var t,n=e.length,a=0,s=!1;if(!n)return!1;if(t=e[a],"-"!==t&&"+"!==t||(t=e[++a]),"0"===t){if(a+1===n)return!0;if("b"===(t=e[++a])){for(a++;a<n;a++)if("_"!==(t=e[a])){if("0"!==t&&"1"!==t)return!1;s=!0}return s&&"_"!==t}if("x"===t){for(a++;a<n;a++)if("_"!==(t=e[a])){if(!r(e.charCodeAt(a)))return!1;s=!0}return s&&"_"!==t}for(;a<n;a++)if("_"!==(t=e[a])){if(!i(e.charCodeAt(a)))return!1;s=!0}return s&&"_"!==t}if("_"===t)return!1;for(;a<n;a++)if("_"!==(t=e[a])){if(":"===t)break;if(!o(e.charCodeAt(a)))return!1;s=!0}return!(!s||"_"===t)&&(":"!==t||/^(:[0-5]?[0-9])+$/.test(e.slice(a)))}function s(e){var t,n,r=e,i=1,o=[];return-1!==r.indexOf("_")&&(r=r.replace(/_/g,"")),t=r[0],"-"!==t&&"+"!==t||("-"===t&&(i=-1),r=r.slice(1),t=r[0]),"0"===r?0:"0"===t?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):-1!==r.indexOf(":")?(r.split(":").forEach(function(e){o.unshift(parseInt(e,10))}),r=0,n=1,o.forEach(function(e){r+=e*n,n*=60}),i*r):i*parseInt(r,10)}function u(e){return"[object Number]"===Object.prototype.toString.call(e)&&e%1==0&&!l.isNegativeZero(e)}var l=n(80),c=n(16);e.exports=new c("tag:yaml.org,2002:int",{kind:"scalar",resolve:a,construct:s,predicate:u,represent:{binary:function(e){return"0b"+e.toString(2)},octal:function(e){return"0"+e.toString(8)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return"0x"+e.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;try{var t="("+e+")",n=s.parse(t,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(e){return!1}}function i(e){var t,n="("+e+")",r=s.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(e){i.push(e.name)}),t=r.body[0].expression.body.range,new Function(i,n.slice(t[0]+1,t[1]-1))}function o(e){return e.toString()}function a(e){return"[object Function]"===Object.prototype.toString.call(e)}var s;try{s=n(743)}catch(e){"undefined"!=typeof window&&(s=window.esprima)}var u=n(16);e.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(e){if(null===e)return!1;if(0===e.length)return!1;var t=e,n=/\/([gim]*)$/.exec(e),r="";if("/"===t[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==t[t.length-r.length-1])return!1}return!0}function i(e){var t=e,n=/\/([gim]*)$/.exec(e),r="";return"/"===t[0]&&(n&&(r=n[1]),t=t.slice(1,t.length-r.length-1)),new RegExp(t,r)}function o(e){var t="/"+e.source+"/";return e.global&&(t+="g"),e.multiline&&(t+="m"),e.ignoreCase&&(t+="i"),t}function a(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var s=n(16);e.exports=new s("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";function r(){return!0}function i(){}function o(){return""}function a(e){return void 0===e}var s=n(16);e.exports=new s("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:o})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(e){return null!==e?e:{}}})},function(e,t,n){"use strict";function r(e){return"<<"===e||null===e}var i=n(16);e.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t=e.length;return 1===t&&"~"===e||4===t&&("null"===e||"Null"===e||"NULL"===e)}function i(){return null}function o(e){return null===e}var a=n(16);e.exports=new a("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,o,u=[],l=e;for(t=0,n=l.length;t<n;t+=1){if(r=l[t],o=!1,"[object Object]"!==s.call(r))return!1;for(i in r)if(a.call(r,i)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==u.indexOf(i))return!1;u.push(i)}return!0}function i(e){return null!==e?e:[]}var o=n(16),a=Object.prototype.hasOwnProperty,s=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,o,s=e;for(o=new Array(s.length),t=0,n=s.length;t<n;t+=1){if(r=s[t],"[object Object]"!==a.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;o[t]=[i[0],r[i[0]]]}return!0}function i(e){if(null===e)return[];var t,n,r,i,o,a=e;for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1)r=a[t],i=Object.keys(r),o[t]=[i[0],r[i[0]]];return o}var o=n(16),a=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(e){return null!==e?e:[]}})},function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n=e;for(t in n)if(a.call(n,t)&&null!==n[t])return!1;return!0}function i(e){return null!==e?e:{}}var o=n(16),a=Object.prototype.hasOwnProperty;e.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},function(e,t,n){"use strict";var r=n(16);e.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(e){return null!==e?e:""}})},function(e,t,n){"use strict";function r(e){return null!==e&&(null!==s.exec(e)||null!==u.exec(e))}function i(e){var t,n,r,i,o,a,l,c,p,f,h=0,d=null;if(t=s.exec(e),null===t&&(t=u.exec(e)),null===t)throw new Error("Date resolve error");if(n=+t[1],r=+t[2]-1,i=+t[3],!t[4])return new Date(Date.UTC(n,r,i));if(o=+t[4],a=+t[5],l=+t[6],t[7]){for(h=t[7].slice(0,3);h.length<3;)h+="0";h=+h}return t[9]&&(c=+t[10],p=+(t[11]||0),d=6e4*(60*c+p),"-"===t[9]&&(d=-d)),f=new Date(Date.UTC(n,r,i,o,a,l,h)),d&&f.setTime(f.getTime()-d),f}function o(e){return e.toISOString()}var a=n(16),s=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),u=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");e.exports=new a("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:o})},function(e,t,n){"use strict";function r(e){return null==e?void 0===e?u:s:l&&l in Object(e)?n.i(o.a)(e):n.i(a.a)(e)}var i=n(390),o=n(818),a=n(819),s="[object Null]",u="[object Undefined]",l=i.a?i.a.toStringTag:void 0;t.a=r},function(e,t,n){"use strict";(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.a=n}).call(t,n(17))},function(e,t,n){"use strict";var r=n(820),i=n.i(r.a)(Object.getPrototypeOf,Object);t.a=i},function(e,t,n){"use strict";function r(e){var t=a.call(e,u),n=e[u];try{e[u]=void 0;var r=!0}catch(e){}var i=s.call(e);return r&&(t?e[u]=n:delete e[u]),i}var i=n(390),o=Object.prototype,a=o.hasOwnProperty,s=o.toString,u=i.a?i.a.toStringTag:void 0;t.a=r},function(e,t,n){"use strict";function r(e){return o.call(e)}var i=Object.prototype,o=i.toString;t.a=r},function(e,t,n){"use strict";function r(e,t){return function(n){return e(t(n))}}t.a=r},function(e,t,n){"use strict";var r=n(816),i="object"==typeof self&&self&&self.Object===Object&&self,o=r.a||i||Function("return this")();t.a=o},function(e,t,n){"use strict";function r(e){return null!=e&&"object"==typeof e}t.a=r},function(e,t){function n(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function r(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function i(e,t){var n=I(e)||h(e)?r(e.length,String):[],i=n.length,o=!!i;for(var a in e)!t&&!A.call(e,a)||o&&("length"==a||l(a,i))||n.push(a);return n}function o(e,t,n){var r=e[t];A.call(e,t)&&f(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function a(e){if(!p(e))return M(e);var t=[];for(var n in Object(e))A.call(e,n)&&"constructor"!=n&&t.push(n);return t}function s(e,t){return t=T(void 0===t?e.length-1:t,0),function(){for(var r=arguments,i=-1,o=T(r.length-t,0),a=Array(o);++i<o;)a[i]=r[t+i];i=-1;for(var s=Array(t+1);++i<t;)s[i]=r[i];return s[t]=a,n(e,this,s)}}function u(e,t,n,r){n||(n={});for(var i=-1,a=t.length;++i<a;){var s=t[i],u=r?r(n[s],e[s],s,n,e):void 0;o(n,s,void 0===u?e[s]:u)}return n}function l(e,t){return!!(t=null==t?x:t)&&("number"==typeof e||S.test(e))&&e>-1&&e%1==0&&e<t}function c(e,t,n){if(!y(n))return!1;var r=typeof t;return!!("number"==r?d(n)&&l(t,n.length):"string"==r&&t in n)&&f(n[t],e)}function p(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||C)}function f(e,t){return e===t||e!==e&&t!==t}function h(e){return m(e)&&A.call(e,"callee")&&(!O.call(e,"callee")||D.call(e)==w)}function d(e){return null!=e&&g(e.length)&&!v(e)}function m(e){return _(e)&&d(e)}function v(e){var t=y(e)?D.call(e):"";return t==k||t==E}function g(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=x}function y(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function _(e){return!!e&&"object"==typeof e}function b(e){return d(e)?i(e):a(e)}var x=9007199254740991,w="[object Arguments]",k="[object Function]",E="[object GeneratorFunction]",S=/^(?:0|[1-9]\d*)$/,C=Object.prototype,A=C.hasOwnProperty,D=C.toString,O=C.propertyIsEnumerable,M=function(e,t){return function(n){return e(t(n))}}(Object.keys,Object),T=Math.max,P=!O.call({valueOf:1},"valueOf"),I=Array.isArray,R=function(e){return s(function(t,n){var r=-1,i=n.length,o=i>1?n[i-1]:void 0,a=i>2?n[2]:void 0;for(o=e.length>3&&"function"==typeof o?(i--,o):void 0,a&&c(n[0],n[1],a)&&(o=i<3?void 0:o,i=1),t=Object(t);++r<i;){var s=n[r];s&&e(t,s,r,o)}return t})}(function(e,t){if(P||p(t)||d(t))return void u(t,b(t),e);for(var n in t)A.call(t,n)&&o(e,n,t[n])});e.exports=R},function(e,t,n){(function(e,n){function r(e,t){return e.set(t[0],t[1]),e}function i(e,t){return e.add(t),e}function o(e,t){for(var n=-1,r=e?e.length:0;++n<r&&!1!==t(e[n],n,e););return e}function a(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}function s(e,t,n,r){var i=-1,o=e?e.length:0;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}function u(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function l(e,t){return null==e?void 0:e[t]}function c(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function p(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function f(e,t){return function(n){return e(t(n))}}function h(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}function d(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function m(){this.__data__=jt?jt(null):{}}function v(e){return this.has(e)&&delete this.__data__[e]}function g(e){var t=this.__data__;if(jt){var n=t[e];return n===Oe?void 0:n}return gt.call(t,e)?t[e]:void 0}function y(e){var t=this.__data__;return jt?void 0!==t[e]:gt.call(t,e)}function _(e,t){return this.__data__[e]=jt&&void 0===t?Oe:t,this}function b(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function x(){this.__data__=[]}function w(e){var t=this.__data__,n=q(t,e);return!(n<0)&&(n==t.length-1?t.pop():Ct.call(t,n,1),!0)}function k(e){var t=this.__data__,n=q(t,e);return n<0?void 0:t[n][1]}function E(e){return q(this.__data__,e)>-1}function S(e,t){var n=this.__data__,r=q(n,e);return r<0?n.push([e,t]):n[r][1]=t,this}function C(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function A(){this.__data__={hash:new d,map:new(Tt||b),string:new d}}function D(e){return ae(this,e).delete(e)}function O(e){return ae(this,e).get(e)}function M(e){return ae(this,e).has(e)}function T(e,t){return ae(this,e).set(e,t),this}function P(e){this.__data__=new b(e)}function I(){this.__data__=new b}function R(e){return this.__data__.delete(e)}function j(e){return this.__data__.get(e)}function F(e){return this.__data__.has(e)}function N(e,t){var n=this.__data__;if(n instanceof b){var r=n.__data__;if(!Tt||r.length<De-1)return r.push([e,t]),this;n=this.__data__=new C(r)}return n.set(e,t),this}function B(e,t){var n=Ht(e)||ye(e)?u(e.length,String):[],r=n.length,i=!!r;for(var o in e)!t&&!gt.call(e,o)||i&&("length"==o||pe(o,r))||n.push(o);return n}function L(e,t,n){var r=e[t];gt.call(e,t)&&ge(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function q(e,t){for(var n=e.length;n--;)if(ge(e[n][0],t))return n;return-1}function z(e,t){return e&&re(t,Se(t),e)}function U(e,t,n,r,i,a,s){var u;if(r&&(u=a?r(e,i,a,s):r(e)),void 0!==u)return u;if(!ke(e))return e;var l=Ht(e);if(l){if(u=ue(e),!t)return ne(e,u)}else{var p=Vt(e),f=p==Re||p==je;if(Gt(e))return K(e,t);if(p==Be||p==Te||f&&!a){if(c(e))return a?e:{};if(u=le(f?{}:e),!t)return ie(e,z(u,e))}else{if(!it[p])return a?e:{};u=ce(e,p,U,t)}}s||(s=new P);var h=s.get(e);if(h)return h;if(s.set(e,u),!l)var d=n?oe(e):Se(e);return o(d||e,function(i,o){d&&(o=i,i=e[o]),L(u,o,U(i,t,n,r,o,e,s))}),u}function W(e){return ke(e)?Et(e):{}}function V(e,t,n){var r=t(e);return Ht(e)?r:a(r,n(e))}function H(e){return yt.call(e)}function G(e){return!(!ke(e)||he(e))&&(xe(e)||c(e)?_t:nt).test(me(e))}function J(e){if(!de(e))return Ot(e);var t=[];for(var n in Object(e))gt.call(e,n)&&"constructor"!=n&&t.push(n);return t}function K(e,t){if(t)return e.slice();var n=new e.constructor(e.length);return e.copy(n),n}function X(e){var t=new e.constructor(e.byteLength);return new wt(t).set(new wt(e)),t}function Y(e,t){var n=t?X(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}function $(e,t,n){return s(t?n(p(e),!0):p(e),r,new e.constructor)}function Z(e){var t=new e.constructor(e.source,tt.exec(e));return t.lastIndex=e.lastIndex,t}function Q(e,t,n){return s(t?n(h(e),!0):h(e),i,new e.constructor)}function ee(e){return Ut?Object(Ut.call(e)):{}}function te(e,t){var n=t?X(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function ne(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}function re(e,t,n,r){n||(n={});for(var i=-1,o=t.length;++i<o;){var a=t[i],s=r?r(n[a],e[a],a,n,e):void 0;L(n,a,void 0===s?e[a]:s)}return n}function ie(e,t){return re(e,Wt(e),t)}function oe(e){return V(e,Se,Wt)}function ae(e,t){var n=e.__data__;return fe(t)?n["string"==typeof t?"string":"hash"]:n.map}function se(e,t){var n=l(e,t);return G(n)?n:void 0}function ue(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&gt.call(e,"index")&&(n.index=e.index,n.input=e.input),n}function le(e){return"function"!=typeof e.constructor||de(e)?{}:W(kt(e))}function ce(e,t,n,r){var i=e.constructor;switch(t){case We:return X(e);case Pe:case Ie:return new i(+e);case Ve:return Y(e,r);case He:case Ge:case Je:case Ke:case Xe:case Ye:case $e:case Ze:case Qe:return te(e,r);case Fe:return $(e,r,n);case Ne:case ze:return new i(e);case Le:return Z(e);case qe:return Q(e,r,n);case Ue:return ee(e)}}function pe(e,t){return!!(t=null==t?Me:t)&&("number"==typeof e||rt.test(e))&&e>-1&&e%1==0&&e<t}function fe(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}function he(e){return!!mt&&mt in e}function de(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||ht)}function me(e){if(null!=e){try{return vt.call(e)}catch(e){}try{return e+""}catch(e){}}return""}function ve(e){return U(e,!0,!0)}function ge(e,t){return e===t||e!==e&&t!==t}function ye(e){return be(e)&&gt.call(e,"callee")&&(!St.call(e,"callee")||yt.call(e)==Te)}function _e(e){return null!=e&&we(e.length)&&!xe(e)}function be(e){return Ee(e)&&_e(e)}function xe(e){var t=ke(e)?yt.call(e):"";return t==Re||t==je}function we(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=Me}function ke(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Ee(e){return!!e&&"object"==typeof e}function Se(e){return _e(e)?B(e):J(e)}function Ce(){return[]}function Ae(){return!1}var De=200,Oe="__lodash_hash_undefined__",Me=9007199254740991,Te="[object Arguments]",Pe="[object Boolean]",Ie="[object Date]",Re="[object Function]",je="[object GeneratorFunction]",Fe="[object Map]",Ne="[object Number]",Be="[object Object]",Le="[object RegExp]",qe="[object Set]",ze="[object String]",Ue="[object Symbol]",We="[object ArrayBuffer]",Ve="[object DataView]",He="[object Float32Array]",Ge="[object Float64Array]",Je="[object Int8Array]",Ke="[object Int16Array]",Xe="[object Int32Array]",Ye="[object Uint8Array]",$e="[object Uint8ClampedArray]",Ze="[object Uint16Array]",Qe="[object Uint32Array]",et=/[\\^$.*+?()[\]{}|]/g,tt=/\w*$/,nt=/^\[object .+?Constructor\]$/,rt=/^(?:0|[1-9]\d*)$/,it={};it[Te]=it["[object Array]"]=it[We]=it[Ve]=it[Pe]=it[Ie]=it[He]=it[Ge]=it[Je]=it[Ke]=it[Xe]=it[Fe]=it[Ne]=it[Be]=it[Le]=it[qe]=it[ze]=it[Ue]=it[Ye]=it[$e]=it[Ze]=it[Qe]=!0,it["[object Error]"]=it[Re]=it["[object WeakMap]"]=!1;var ot="object"==typeof e&&e&&e.Object===Object&&e,at="object"==typeof self&&self&&self.Object===Object&&self,st=ot||at||Function("return this")(),ut="object"==typeof t&&t&&!t.nodeType&&t,lt=ut&&"object"==typeof n&&n&&!n.nodeType&&n,ct=lt&&lt.exports===ut,pt=Array.prototype,ft=Function.prototype,ht=Object.prototype,dt=st["__core-js_shared__"],mt=function(){var e=/[^.]+$/.exec(dt&&dt.keys&&dt.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}(),vt=ft.toString,gt=ht.hasOwnProperty,yt=ht.toString,_t=RegExp("^"+vt.call(gt).replace(et,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),bt=ct?st.Buffer:void 0,xt=st.Symbol,wt=st.Uint8Array,kt=f(Object.getPrototypeOf,Object),Et=Object.create,St=ht.propertyIsEnumerable,Ct=pt.splice,At=Object.getOwnPropertySymbols,Dt=bt?bt.isBuffer:void 0,Ot=f(Object.keys,Object),Mt=se(st,"DataView"),Tt=se(st,"Map"),Pt=se(st,"Promise"),It=se(st,"Set"),Rt=se(st,"WeakMap"),jt=se(Object,"create"),Ft=me(Mt),Nt=me(Tt),Bt=me(Pt),Lt=me(It),qt=me(Rt),zt=xt?xt.prototype:void 0,Ut=zt?zt.valueOf:void 0;d.prototype.clear=m,d.prototype.delete=v,d.prototype.get=g,d.prototype.has=y,d.prototype.set=_,b.prototype.clear=x,b.prototype.delete=w,b.prototype.get=k,b.prototype.has=E,b.prototype.set=S,C.prototype.clear=A,C.prototype.delete=D,C.prototype.get=O,C.prototype.has=M,C.prototype.set=T,P.prototype.clear=I,P.prototype.delete=R,P.prototype.get=j,P.prototype.has=F,P.prototype.set=N;var Wt=At?f(At,Object):Ce,Vt=H;(Mt&&Vt(new Mt(new ArrayBuffer(1)))!=Ve||Tt&&Vt(new Tt)!=Fe||Pt&&"[object Promise]"!=Vt(Pt.resolve())||It&&Vt(new It)!=qe||Rt&&"[object WeakMap]"!=Vt(new Rt))&&(Vt=function(e){var t=yt.call(e),n=t==Be?e.constructor:void 0,r=n?me(n):void 0;if(r)switch(r){case Ft:return Ve;case Nt:return Fe;case Bt:return"[object Promise]";case Lt:return qe;case qt:return"[object WeakMap]"}return t});var Ht=Array.isArray,Gt=Dt||Ae;n.exports=ve}).call(t,n(17),n(72)(e))},function(e,t,n){(function(t){function n(e){if("string"==typeof e)return e;if(i(e))return y?y.call(e):"";var t=e+"";return"0"==t&&1/e==-s?"-0":t}function r(e){return!!e&&"object"==typeof e}function i(e){return"symbol"==typeof e||r(e)&&m.call(e)==u}function o(e){return null==e?"":n(e)}function a(e){return e=o(e),e&&c.test(e)?e.replace(l,"\\$&"):e}var s=1/0,u="[object Symbol]",l=/[\\^$.*+?()[\]{}|]/g,c=RegExp(l.source),p="object"==typeof t&&t&&t.Object===Object&&t,f="object"==typeof self&&self&&self.Object===Object&&self,h=p||f||Function("return this")(),d=Object.prototype,m=d.toString,v=h.Symbol,g=v?v.prototype:void 0,y=g?g.toString:void 0;e.exports=a}).call(t,n(17))},function(e,t){function n(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function r(e){return!!e&&"object"==typeof e}function i(e){if(!r(e)||p.call(e)!=o||n(e))return!1;var t=f(e);if(null===t)return!0;var i=l.call(t,"constructor")&&t.constructor;return"function"==typeof i&&i instanceof i&&u.call(i)==c}var o="[object Object]",a=Function.prototype,s=Object.prototype,u=a.toString,l=s.hasOwnProperty,c=u.call(Object),p=s.toString,f=function(e,t){return function(n){return e(t(n))}}(Object.getPrototypeOf,Object);e.exports=i},function(e,t,n){(function(e,n){function r(e,t){return e.set(t[0],t[1]),e}function i(e,t){return e.add(t),e}function o(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function a(e,t){for(var n=-1,r=e?e.length:0;++n<r&&!1!==t(e[n],n,e););return e}function s(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}function u(e,t,n,r){var i=-1,o=e?e.length:0;for(r&&o&&(n=e[++i]);++i<o;)n=t(n,e[i],i,e);return n}function l(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function c(e,t){return null==e?void 0:e[t]}function p(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}function f(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function h(e,t){return function(n){return e(t(n))}}function d(e){var t=-1,n=Array(e.size);return e.forEach(function(e){n[++t]=e}),n}function m(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function v(){this.__data__=Qt?Qt(null):{}}function g(e){return this.has(e)&&delete this.__data__[e]}function y(e){var t=this.__data__;if(Qt){var n=t[e];return n===qe?void 0:n}return It.call(t,e)?t[e]:void 0}function _(e){var t=this.__data__;return Qt?void 0!==t[e]:It.call(t,e)}function b(e,t){return this.__data__[e]=Qt&&void 0===t?qe:t,this}function x(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function w(){this.__data__=[]}function k(e){var t=this.__data__,n=U(t,e);return!(n<0)&&(n==t.length-1?t.pop():Wt.call(t,n,1),!0)}function E(e){var t=this.__data__,n=U(t,e);return n<0?void 0:t[n][1]}function S(e){return U(this.__data__,e)>-1}function C(e,t){var n=this.__data__,r=U(n,e);return r<0?n.push([e,t]):n[r][1]=t,this}function A(e){var t=-1,n=e?e.length:0;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}function D(){this.__data__={hash:new m,map:new(Xt||x),string:new m}}function O(e){return he(this,e).delete(e)}function M(e){return he(this,e).get(e)}function T(e){return he(this,e).has(e)}function P(e,t){return he(this,e).set(e,t),this}function I(e){this.__data__=new x(e)}function R(){this.__data__=new x}function j(e){return this.__data__.delete(e)}function F(e){return this.__data__.get(e)}function N(e){return this.__data__.has(e)}function B(e,t){var n=this.__data__;if(n instanceof x){var r=n.__data__;if(!Xt||r.length<Le-1)return r.push([e,t]),this;n=this.__data__=new A(r)}return n.set(e,t),this}function L(e,t){var n=cn(e)||Ce(e)?l(e.length,String):[],r=n.length,i=!!r;for(var o in e)!t&&!It.call(e,o)||i&&("length"==o||ye(o,r))||n.push(o);return n}function q(e,t,n){(void 0===n||Se(e[t],n))&&("number"!=typeof t||void 0!==n||t in e)||(e[t]=n)}function z(e,t,n){var r=e[t];It.call(e,t)&&Se(r,n)&&(void 0!==n||t in e)||(e[t]=n)}function U(e,t){for(var n=e.length;n--;)if(Se(e[n][0],t))return n;return-1}function W(e,t){return e&&ce(t,je(t),e)}function V(e,t,n,r,i,o,s){var u;if(r&&(u=o?r(e,i,o,s):r(e)),void 0!==u)return u;if(!Te(e))return e;var l=cn(e);if(l){if(u=me(e),!t)return le(e,u)}else{var c=ln(e),f=c==He||c==Ge;if(pn(e))return te(e,t);if(c==Xe||c==Ue||f&&!o){if(p(e))return o?e:{};if(u=ve(f?{}:e),!t)return pe(e,W(u,e))}else{if(!gt[c])return o?e:{};u=ge(e,c,V,t)}}s||(s=new I);var h=s.get(e);if(h)return h;if(s.set(e,u),!l)var d=n?fe(e):je(e);return a(d||e,function(i,o){d&&(o=i,i=e[o]),z(u,o,V(i,t,n,r,o,e,s))}),u}function H(e){return Te(e)?zt(e):{}}function G(e,t,n){var r=t(e);return cn(e)?r:s(r,n(e))}function J(e){return jt.call(e)}function K(e){return!(!Te(e)||xe(e))&&(Oe(e)||p(e)?Ft:dt).test(Ee(e))}function X(e){return Pe(e)&&Me(e.length)&&!!vt[jt.call(e)]}function Y(e){if(!we(e))return Gt(e);var t=[];for(var n in Object(e))It.call(e,n)&&"constructor"!=n&&t.push(n);return t}function $(e){if(!Te(e))return ke(e);var t=we(e),n=[];for(var r in e)("constructor"!=r||!t&&It.call(e,r))&&n.push(r);return n}function Z(e,t,n,r,i){if(e!==t){if(!cn(t)&&!fn(t))var o=$(t);a(o||t,function(a,s){if(o&&(s=a,a=t[s]),Te(a))i||(i=new I),Q(e,t,s,n,Z,r,i);else{var u=r?r(e[s],a,s+"",e,t,i):void 0;void 0===u&&(u=a),q(e,s,u)}})}}function Q(e,t,n,r,i,o,a){var s=e[n],u=t[n],l=a.get(u);if(l)return void q(e,n,l);var c=o?o(s,u,n+"",e,t,a):void 0,p=void 0===c;p&&(c=u,cn(u)||fn(u)?cn(s)?c=s:De(s)?c=le(s):(p=!1,c=V(u,!0)):Ie(u)||Ce(u)?Ce(s)?c=Re(s):!Te(s)||r&&Oe(s)?(p=!1,c=V(u,!0)):c=s:p=!1),p&&(a.set(u,c),i(c,u,r,o,a),a.delete(u)),q(e,n,c)}function ee(e,t){return t=Jt(void 0===t?e.length-1:t,0),function(){for(var n=arguments,r=-1,i=Jt(n.length-t,0),a=Array(i);++r<i;)a[r]=n[t+r];r=-1;for(var s=Array(t+1);++r<t;)s[r]=n[r];return s[t]=a,o(e,this,s)}}function te(e,t){if(t)return e.slice();var n=new e.constructor(e.length);return e.copy(n),n}function ne(e){var t=new e.constructor(e.byteLength);return new Lt(t).set(new Lt(e)),t}function re(e,t){var n=t?ne(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}function ie(e,t,n){return u(t?n(f(e),!0):f(e),r,new e.constructor)}function oe(e){var t=new e.constructor(e.source,ht.exec(e));return t.lastIndex=e.lastIndex,t}function ae(e,t,n){return u(t?n(d(e),!0):d(e),i,new e.constructor)}function se(e){return sn?Object(sn.call(e)):{}}function ue(e,t){var n=t?ne(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function le(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}function ce(e,t,n,r){n||(n={});for(var i=-1,o=t.length;++i<o;){var a=t[i],s=r?r(n[a],e[a],a,n,e):void 0;z(n,a,void 0===s?e[a]:s)}return n}function pe(e,t){return ce(e,un(e),t)}function fe(e){return G(e,je,un)}function he(e,t){var n=e.__data__;return be(t)?n["string"==typeof t?"string":"hash"]:n.map}function de(e,t){var n=c(e,t);return K(n)?n:void 0}function me(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&It.call(e,"index")&&(n.index=e.index,n.input=e.input),n}function ve(e){return"function"!=typeof e.constructor||we(e)?{}:H(qt(e))}function ge(e,t,n,r){var i=e.constructor;switch(t){case tt:return ne(e);case We:case Ve:return new i(+e);case nt:return re(e,r);case rt:case it:case ot:case at:case st:case ut:case lt:case ct:case pt:return ue(e,r);case Je:return ie(e,r,n);case Ke:case Ze:return new i(e);case Ye:return oe(e);case $e:return ae(e,r,n);case Qe:return se(e)}}function ye(e,t){return!!(t=null==t?ze:t)&&("number"==typeof e||mt.test(e))&&e>-1&&e%1==0&&e<t}function _e(e,t,n){if(!Te(n))return!1;var r=typeof t;return!!("number"==r?Ae(n)&&ye(t,n.length):"string"==r&&t in n)&&Se(n[t],e)}function be(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}function xe(e){return!!Tt&&Tt in e}function we(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||Ot)}function ke(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}function Ee(e){if(null!=e){try{return Pt.call(e)}catch(e){}try{return e+""}catch(e){}}return""}function Se(e,t){return e===t||e!==e&&t!==t}function Ce(e){return De(e)&&It.call(e,"callee")&&(!Ut.call(e,"callee")||jt.call(e)==Ue)}function Ae(e){return null!=e&&Me(e.length)&&!Oe(e)}function De(e){return Pe(e)&&Ae(e)}function Oe(e){var t=Te(e)?jt.call(e):"";return t==He||t==Ge}function Me(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=ze}function Te(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Pe(e){return!!e&&"object"==typeof e}function Ie(e){if(!Pe(e)||jt.call(e)!=Xe||p(e))return!1;var t=qt(e);if(null===t)return!0;var n=It.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&Pt.call(n)==Rt}function Re(e){return ce(e,Fe(e))}function je(e){return Ae(e)?L(e):Y(e)}function Fe(e){return Ae(e)?L(e,!0):$(e)}function Ne(){return[]}function Be(){return!1}var Le=200,qe="__lodash_hash_undefined__",ze=9007199254740991,Ue="[object Arguments]",We="[object Boolean]",Ve="[object Date]",He="[object Function]",Ge="[object GeneratorFunction]",Je="[object Map]",Ke="[object Number]",Xe="[object Object]",Ye="[object RegExp]",$e="[object Set]",Ze="[object String]",Qe="[object Symbol]",et="[object WeakMap]",tt="[object ArrayBuffer]",nt="[object DataView]",rt="[object Float32Array]",it="[object Float64Array]",ot="[object Int8Array]",at="[object Int16Array]",st="[object Int32Array]",ut="[object Uint8Array]",lt="[object Uint8ClampedArray]",ct="[object Uint16Array]",pt="[object Uint32Array]",ft=/[\\^$.*+?()[\]{}|]/g,ht=/\w*$/,dt=/^\[object .+?Constructor\]$/,mt=/^(?:0|[1-9]\d*)$/,vt={};vt[rt]=vt[it]=vt[ot]=vt[at]=vt[st]=vt[ut]=vt[lt]=vt[ct]=vt[pt]=!0,vt[Ue]=vt["[object Array]"]=vt[tt]=vt[We]=vt[nt]=vt[Ve]=vt["[object Error]"]=vt[He]=vt[Je]=vt[Ke]=vt[Xe]=vt[Ye]=vt[$e]=vt[Ze]=vt[et]=!1;var gt={};gt[Ue]=gt["[object Array]"]=gt[tt]=gt[nt]=gt[We]=gt[Ve]=gt[rt]=gt[it]=gt[ot]=gt[at]=gt[st]=gt[Je]=gt[Ke]=gt[Xe]=gt[Ye]=gt[$e]=gt[Ze]=gt[Qe]=gt[ut]=gt[lt]=gt[ct]=gt[pt]=!0,gt["[object Error]"]=gt[He]=gt[et]=!1;var yt="object"==typeof e&&e&&e.Object===Object&&e,_t="object"==typeof self&&self&&self.Object===Object&&self,bt=yt||_t||Function("return this")(),xt="object"==typeof t&&t&&!t.nodeType&&t,wt=xt&&"object"==typeof n&&n&&!n.nodeType&&n,kt=wt&&wt.exports===xt,Et=kt&&yt.process,St=function(){try{return Et&&Et.binding("util")}catch(e){}}(),Ct=St&&St.isTypedArray,At=Array.prototype,Dt=Function.prototype,Ot=Object.prototype,Mt=bt["__core-js_shared__"],Tt=function(){var e=/[^.]+$/.exec(Mt&&Mt.keys&&Mt.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}(),Pt=Dt.toString,It=Ot.hasOwnProperty,Rt=Pt.call(Object),jt=Ot.toString,Ft=RegExp("^"+Pt.call(It).replace(ft,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Nt=kt?bt.Buffer:void 0,Bt=bt.Symbol,Lt=bt.Uint8Array,qt=h(Object.getPrototypeOf,Object),zt=Object.create,Ut=Ot.propertyIsEnumerable,Wt=At.splice,Vt=Object.getOwnPropertySymbols,Ht=Nt?Nt.isBuffer:void 0,Gt=h(Object.keys,Object),Jt=Math.max,Kt=de(bt,"DataView"),Xt=de(bt,"Map"),Yt=de(bt,"Promise"),$t=de(bt,"Set"),Zt=de(bt,"WeakMap"),Qt=de(Object,"create"),en=Ee(Kt),tn=Ee(Xt),nn=Ee(Yt),rn=Ee($t),on=Ee(Zt),an=Bt?Bt.prototype:void 0,sn=an?an.valueOf:void 0;m.prototype.clear=v,m.prototype.delete=g,m.prototype.get=y,m.prototype.has=_,m.prototype.set=b,x.prototype.clear=w,x.prototype.delete=k,x.prototype.get=E,x.prototype.has=S,x.prototype.set=C,A.prototype.clear=D,A.prototype.delete=O,A.prototype.get=M,A.prototype.has=T,A.prototype.set=P,I.prototype.clear=R,I.prototype.delete=j,I.prototype.get=F,I.prototype.has=N,I.prototype.set=B;var un=Vt?h(Vt,Object):Ne,ln=J;(Kt&&ln(new Kt(new ArrayBuffer(1)))!=nt||Xt&&ln(new Xt)!=Je||Yt&&"[object Promise]"!=ln(Yt.resolve())||$t&&ln(new $t)!=$e||Zt&&ln(new Zt)!=et)&&(ln=function(e){var t=jt.call(e),n=t==Xe?e.constructor:void 0,r=n?Ee(n):void 0;if(r)switch(r){case en:return nt;case tn:return Je;case nn:return"[object Promise]";case rn:return $e;case on:return et}return t});var cn=Array.isArray,pn=Ht||Be,fn=Ct?function(e){return function(t){return e(t)}}(Ct):X,hn=function(e){return ee(function(t,n){var r=-1,i=n.length,o=i>1?n[i-1]:void 0,a=i>2?n[2]:void 0;for(o=e.length>3&&"function"==typeof o?(i--,o):void 0,a&&_e(n[0],n[1],a)&&(o=i<3?void 0:o,i=1),t=Object(t);++r<i;){var s=n[r];s&&e(t,s,r,o)}return t})}(function(e,t,n,r){Z(e,t,n,r)});n.exports=hn}).call(t,n(17),n(72)(e))},function(e,t,n){var r=n(67),i=n(43),o=r(i,"DataView");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}var i=n(900),o=n(901),a=n(902),s=n(903),u=n(904);r.prototype.clear=i,r.prototype.delete=o,r.prototype.get=a,r.prototype.has=s,r.prototype.set=u,e.exports=r},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Promise");e.exports=o},function(e,t,n){var r=n(67),i=n(43),o=r(i,"Set");e.exports=o},function(e,t,n){function r(e){var t=-1,n=null==e?0:e.length;for(this.__data__=new i;++t<n;)this.add(e[t])}var i=n(214),o=n(927),a=n(928);r.prototype.add=r.prototype.push=o,r.prototype.has=a,e.exports=r},function(e,t,n){var r=n(67),i=n(43),o=r(i,"WeakMap");e.exports=o},function(e,t){function n(e,t){return e.set(t[0],t[1]),e}e.exports=n},function(e,t){function n(e,t){return e.add(t),e}e.exports=n},function(e,t){function n(e,t,n){switch(n.length){case 0:return e.call(t);case 1:return e.call(t,n[0]);case 2:return e.call(t,n[0],n[1]);case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length;++n<r&&!1!==t(e[n],n,e););return e}e.exports=n},function(e,t){function n(e,t){for(var n=-1,r=null==e?0:e.length,i=0,o=[];++n<r;){var a=e[n];t(a,n,e)&&(o[i++]=a)}return o}e.exports=n},function(e,t){function n(e){return e.split("")}e.exports=n},function(e,t){function n(e){return e.match(r)||[]}var r=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;e.exports=n},function(e,t,n){function r(e,t){return e&&i(t,o(t),e)}var i=n(84),o=n(59);e.exports=r},function(e,t,n){function r(e,t){return e&&i(t,o(t),e)}var i=n(84),o=n(424);e.exports=r},function(e,t){function n(e,t,n){return e===e&&(void 0!==n&&(e=e<=n?e:n),void 0!==t&&(e=e>=t?e:t)),e}e.exports=n},function(e,t,n){var r=n(38),i=Object.create,o=function(){function e(){}return function(t){if(!r(t))return{};if(i)return i(t);e.prototype=t;var n=new e;return e.prototype=void 0,n}}();e.exports=o},function(e,t,n){function r(e,t){var n=[];return i(e,function(e,r,i){t(e,r,i)&&n.push(e)}),n}var i=n(217);e.exports=r},function(e,t){function n(e,t,n,r){for(var i=e.length,o=n+(r?1:-1);r?o--:++o<i;)if(t(e[o],o,e))return o;return-1}e.exports=n},function(e,t,n){function r(e,t,n,a,s){var u=-1,l=e.length;for(n||(n=o),s||(s=[]);++u<l;){var c=e[u];t>0&&n(c)?t>1?r(c,t-1,n,a,s):i(s,c):a||(s[s.length]=c)}return s}var i=n(216),o=n(908);e.exports=r},function(e,t,n){var r=n(888),i=r();e.exports=i},function(e,t,n){function r(e,t){return e&&i(e,t,o)}var i=n(848),o=n(59);e.exports=r},function(e,t){function n(e,t){return null!=e&&t in Object(e)}e.exports=n},function(e,t,n){function r(e){return o(e)&&i(e)==a}var i=n(66),o=n(68),a="[object Arguments]";e.exports=r},function(e,t,n){function r(e,t,n,r,v,y){var _=l(e),b=l(t),x=d,w=d;_||(x=u(e),x=x==h?m:x),b||(w=u(t),w=w==h?m:w);var k=x==m,E=w==m,S=x==w;if(S&&c(e)){if(!c(t))return!1;_=!0,k=!1}if(S&&!k)return y||(y=new i),_||p(e)?o(e,t,n,r,v,y):a(e,t,x,n,r,v,y);if(!(n&f)){var C=k&&g.call(e,"__wrapped__"),A=E&&g.call(t,"__wrapped__");if(C||A){var D=C?e.value():e,O=A?t.value():t;return y||(y=new i),v(D,O,n,r,y)}}return!!S&&(y||(y=new i),s(e,t,n,r,v,y))}var i=n(215),o=n(404),a=n(892),s=n(893),u=n(409),l=n(20),c=n(227),p=n(423),f=1,h="[object Arguments]",d="[object Array]",m="[object Object]",v=Object.prototype,g=v.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t,n,r){var u=n.length,l=u,c=!r;if(null==e)return!l;for(e=Object(e);u--;){var p=n[u];if(c&&p[2]?p[1]!==e[p[0]]:!(p[0]in e))return!1}for(;++u<l;){p=n[u];var f=p[0],h=e[f],d=p[1];if(c&&p[2]){if(void 0===h&&!(f in e))return!1}else{var m=new i;if(r)var v=r(h,d,f,e,t,m);if(!(void 0===v?o(d,h,a|s,r,m):v))return!1}}return!0}var i=n(215),o=n(399),a=1,s=2;e.exports=r},function(e,t,n){function r(e){return!(!a(e)||o(e))&&(i(e)?d:l).test(s(e))}var i=n(420),o=n(910),a=n(38),s=n(418),u=/[\\^$.*+?()[\]{}|]/g,l=/^\[object .+?Constructor\]$/,c=Function.prototype,p=Object.prototype,f=c.toString,h=p.hasOwnProperty,d=RegExp("^"+f.call(h).replace(u,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");e.exports=r},function(e,t,n){function r(e){return a(e)&&o(e.length)&&!!s[i(e)]}var i=n(66),o=n(228),a=n(68),s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s["[object Arguments]"]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s["[object Function]"]=s["[object Map]"]=s["[object Number]"]=s["[object Object]"]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1,e.exports=r},function(e,t,n){function r(e){if(!i(e))return o(e);var t=[];for(var n in Object(e))s.call(e,n)&&"constructor"!=n&&t.push(n);return t}var i=n(153),o=n(922),a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){if(!i(e))return a(e);var t=o(e),n=[];for(var r in e)("constructor"!=r||!t&&u.call(e,r))&&n.push(r);return n}var i=n(38),o=n(153),a=n(923),s=Object.prototype,u=s.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){var t=o(e);return 1==t.length&&t[0][2]?a(t[0][0],t[0][1]):function(n){return n===e||i(n,e,t)}}var i=n(853),o=n(895),a=n(414);e.exports=r},function(e,t,n){function r(e,t){return s(e)&&u(t)?l(c(e),t):function(n){var r=o(n,e);return void 0===r&&r===t?a(n,e):i(t,r,p|f)}}var i=n(399),o=n(224),a=n(419),s=n(221),u=n(412),l=n(414),c=n(85),p=1,f=2;e.exports=r},function(e,t,n){function r(e,t){return e=Object(e),i(e,t,function(t,n){return o(e,n)})}var i=n(861),o=n(419);e.exports=r},function(e,t,n){function r(e,t,n){for(var r=-1,s=t.length,u={};++r<s;){var l=t[r],c=i(e,l);n(c,l)&&o(u,a(l,e),c)}return u}var i=n(150),o=n(867),a=n(83);e.exports=r},function(e,t){function n(e){return function(t){return null==t?void 0:t[e]}}e.exports=n},function(e,t,n){function r(e){return function(t){return i(t,e)}}var i=n(150);e.exports=r},function(e,t){function n(e){return function(t){return null==e?void 0:e[t]}}e.exports=n},function(e,t){function n(e,t,n,r,i){return i(e,function(e,i,o){n=r?(r=!1,e):t(n,e,i,o)}),n}e.exports=n},function(e,t,n){function r(e,t){return a(o(e,t,i),e+"")}var i=n(225),o=n(415),a=n(417);e.exports=r},function(e,t,n){function r(e,t,n,r){if(!s(e))return e;t=o(t,e);for(var l=-1,c=t.length,p=c-1,f=e;null!=f&&++l<c;){var h=u(t[l]),d=n;if(l!=p){var m=f[h];d=r?r(m,h,f):void 0,void 0===d&&(d=s(m)?m:a(t[l+1])?[]:{})}i(f,h,d),f=f[h]}return e}var i=n(148),o=n(83),a=n(152),s=n(38),u=n(85);e.exports=r},function(e,t,n){var r=n(943),i=n(403),o=n(225),a=i?function(e,t){return i(e,"toString",{configurable:!0,enumerable:!1,value:r(t),writable:!0})}:o;e.exports=a},function(e,t,n){function r(e,t){var n;return i(e,function(e,r,i){return!(n=t(e,r,i))}),!!n}var i=n(217);e.exports=r},function(e,t){function n(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}e.exports=n},function(e,t){function n(e){return function(t){return e(t)}}e.exports=n},function(e,t,n){function r(e,t){return t=i(t,e),null==(e=a(e,t))||delete e[s(o(t))]}var i=n(83),o=n(947),a=n(926),s=n(85);e.exports=r},function(e,t){function n(e,t){return e.has(t)}e.exports=n},function(e,t,n){function r(e,t,n){var r=e.length;return n=void 0===n?r:n,!t&&n>=r?e:i(e,t,n)}var i=n(400);e.exports=r},function(e,t,n){(function(e){function r(e,t){if(t)return e.slice();var n=e.length,r=l?l(n):new e.constructor(n);return e.copy(r),r}var i=n(43),o="object"==typeof t&&t&&!t.nodeType&&t,a=o&&"object"==typeof e&&e&&!e.nodeType&&e,s=a&&a.exports===o,u=s?i.Buffer:void 0,l=u?u.allocUnsafe:void 0;e.exports=r}).call(t,n(72)(e))},function(e,t,n){function r(e,t){var n=t?i(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}var i=n(218);e.exports=r},function(e,t,n){function r(e,t,n){var r=t?n(a(e),s):a(e);return o(r,i,new e.constructor)}var i=n(834),o=n(147),a=n(413),s=1;e.exports=r},function(e,t){function n(e){var t=new e.constructor(e.source,r.exec(e));return t.lastIndex=e.lastIndex,t}var r=/\w*$/;e.exports=n},function(e,t,n){function r(e,t,n){var r=t?n(a(e),s):a(e);return o(r,i,new e.constructor)}var i=n(835),o=n(147),a=n(416),s=1;e.exports=r},function(e,t,n){function r(e){return a?Object(a.call(e)):{}}var i=n(82),o=i?i.prototype:void 0,a=o?o.valueOf:void 0;e.exports=r},function(e,t,n){function r(e,t){var n=t?i(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}var i=n(218);e.exports=r},function(e,t){function n(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}e.exports=n},function(e,t,n){function r(e,t){return i(e,o(e),t)}var i=n(84),o=n(220);e.exports=r},function(e,t,n){function r(e,t){return i(e,o(e),t)}var i=n(84),o=n(408);e.exports=r},function(e,t,n){var r=n(43),i=r["__core-js_shared__"];e.exports=i},function(e,t,n){function r(e){return i(function(t,n){var r=-1,i=n.length,a=i>1?n[i-1]:void 0,s=i>2?n[2]:void 0;for(a=e.length>3&&"function"==typeof a?(i--,a):void 0,s&&o(n[0],n[1],s)&&(a=i<3?void 0:a,i=1),t=Object(t);++r<i;){var u=n[r];u&&e(t,u,r,a)}return t})}var i=n(866),o=n(411);e.exports=r},function(e,t,n){function r(e,t){return function(n,r){if(null==n)return n;if(!i(n))return e(n,r);for(var o=n.length,a=t?o:-1,s=Object(n);(t?a--:++a<o)&&!1!==r(s[a],a,s););return n}}var i=n(86);e.exports=r},function(e,t){function n(e){return function(t,n,r){for(var i=-1,o=Object(t),a=r(t),s=a.length;s--;){var u=a[e?s:++i];if(!1===n(o[u],u,o))break}return t}}e.exports=n},function(e,t,n){function r(e){return function(t){t=s(t);var n=o(t)?a(t):void 0,r=n?n[0]:t.charAt(0),u=n?i(n,1).join(""):t.slice(1);return r[e]()+u}}var i=n(874),o=n(410),a=n(935),s=n(87);e.exports=r},function(e,t,n){function r(e){return function(t,n,r){var s=Object(t);if(!o(t)){var u=i(n,3);t=a(t),n=function(e){return u(s[e],e,s)}}var l=e(t,n,r);return l>-1?s[u?t[l]:l]:void 0}}var i=n(119),o=n(86),a=n(59);e.exports=r},function(e,t,n){var r=n(864),i={"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"},o=r(i);e.exports=o},function(e,t,n){function r(e,t,n,r,i,k,S){switch(n){case w:if(e.byteLength!=t.byteLength||e.byteOffset!=t.byteOffset)return!1;e=e.buffer,t=t.buffer;case x:return!(e.byteLength!=t.byteLength||!k(new o(e),new o(t)));case f:case h:case v:return a(+e,+t);case d:return e.name==t.name&&e.message==t.message;case g:case _:return e==t+"";case m:var C=u;case y:var A=r&c;if(C||(C=l),e.size!=t.size&&!A)return!1;var D=S.get(e);if(D)return D==t;r|=p,S.set(e,t);var O=s(C(e),C(t),r,i,k,S);return S.delete(e),O;case b:if(E)return E.call(e)==E.call(t)}return!1}var i=n(82),o=n(392),a=n(120),s=n(404),u=n(413),l=n(416),c=1,p=2,f="[object Boolean]",h="[object Date]",d="[object Error]",m="[object Map]",v="[object Number]",g="[object RegExp]",y="[object Set]",_="[object String]",b="[object Symbol]",x="[object ArrayBuffer]",w="[object DataView]",k=i?i.prototype:void 0,E=k?k.valueOf:void 0;e.exports=r},function(e,t,n){function r(e,t,n,r,a,u){var l=n&o,c=i(e),p=c.length;if(p!=i(t).length&&!l)return!1;for(var f=p;f--;){var h=c[f];if(!(l?h in t:s.call(t,h)))return!1}var d=u.get(e);if(d&&u.get(t))return d==t;var m=!0;u.set(e,t),u.set(t,e);for(var v=l;++f<p;){h=c[f];var g=e[h],y=t[h];if(r)var _=l?r(y,g,h,t,e,u):r(g,y,h,e,t,u);if(!(void 0===_?g===y||a(g,y,n,r,u):_)){m=!1;break}v||(v="constructor"==h)}if(m&&!v){var b=e.constructor,x=t.constructor;b!=x&&"constructor"in e&&"constructor"in t&&!("function"==typeof b&&b instanceof b&&"function"==typeof x&&x instanceof x)&&(m=!1)}return u.delete(e),u.delete(t),m}var i=n(59),o=1,a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){return i(e,a,o)}var i=n(398),o=n(220),a=n(59);e.exports=r},function(e,t,n){function r(e){for(var t=o(e),n=t.length;n--;){var r=t[n],a=e[r];t[n]=[r,a,i(a)]}return t}var i=n(412),o=n(59);e.exports=r},function(e,t,n){function r(e){var t=a.call(e,u),n=e[u];try{e[u]=void 0;var r=!0}catch(e){}var i=s.call(e);return r&&(t?e[u]=n:delete e[u]),i}var i=n(82),o=Object.prototype,a=o.hasOwnProperty,s=o.toString,u=i?i.toStringTag:void 0;e.exports=r},function(e,t){function n(e,t){return null==e?void 0:e[t]}e.exports=n},function(e,t,n){function r(e,t,n){t=i(t,e);for(var r=-1,c=t.length,p=!1;++r<c;){var f=l(t[r]);if(!(p=null!=e&&n(e,f)))break;e=e[f]}return p||++r!=c?p:!!(c=null==e?0:e.length)&&u(c)&&s(f,c)&&(a(e)||o(e))}var i=n(83),o=n(226),a=n(20),s=n(152),u=n(228),l=n(85);e.exports=r},function(e,t){function n(e){return r.test(e)}var r=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;e.exports=n},function(e,t,n){function r(){this.__data__=i?i(null):{},this.size=0}var i=n(154);e.exports=r},function(e,t){function n(e){var t=this.has(e)&&delete this.__data__[e];return this.size-=t?1:0,t}e.exports=n},function(e,t,n){function r(e){var t=this.__data__;if(i){var n=t[e];return n===o?void 0:n}return s.call(t,e)?t[e]:void 0}var i=n(154),o="__lodash_hash_undefined__",a=Object.prototype,s=a.hasOwnProperty;e.exports=r},function(e,t,n){function r(e){var t=this.__data__;return i?void 0!==t[e]:a.call(t,e)}var i=n(154),o=Object.prototype,a=o.hasOwnProperty;e.exports=r},function(e,t,n){function r(e,t){var n=this.__data__;return this.size+=this.has(e)?0:1,n[e]=i&&void 0===t?o:t,this}var i=n(154),o="__lodash_hash_undefined__";e.exports=r},function(e,t){function n(e){var t=e.length,n=e.constructor(t);return t&&"string"==typeof e[0]&&i.call(e,"index")&&(n.index=e.index,n.input=e.input),n}var r=Object.prototype,i=r.hasOwnProperty;e.exports=n},function(e,t,n){function r(e,t,n,r){var M=e.constructor;switch(t){case _:return i(e);case p:case f:return new M(+e);case b:return o(e,r);case x:case w:case k:case E:case S:case C:case A:case D:case O:return c(e,r);case h:return a(e,r,n);case d:case g:return new M(e);case m:return s(e);case v:return u(e,r,n);case y:return l(e)}}var i=n(218),o=n(876),a=n(877),s=n(878),u=n(879),l=n(880),c=n(881),p="[object Boolean]",f="[object Date]",h="[object Map]",d="[object Number]",m="[object RegExp]",v="[object Set]",g="[object String]",y="[object Symbol]",_="[object ArrayBuffer]",b="[object DataView]",x="[object Float32Array]",w="[object Float64Array]",k="[object Int8Array]",E="[object Int16Array]",S="[object Int32Array]",C="[object Uint8Array]",A="[object Uint8ClampedArray]",D="[object Uint16Array]",O="[object Uint32Array]";e.exports=r},function(e,t,n){function r(e){return"function"!=typeof e.constructor||a(e)?{}:i(o(e))}var i=n(844),o=n(219),a=n(153);e.exports=r},function(e,t,n){function r(e){return a(e)||o(e)||!!(s&&e&&e[s])}var i=n(82),o=n(226),a=n(20),s=i?i.isConcatSpreadable:void 0;e.exports=r},function(e,t){function n(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}e.exports=n},function(e,t,n){function r(e){return!!o&&o in e}var i=n(885),o=function(){var e=/[^.]+$/.exec(i&&i.keys&&i.keys.IE_PROTO||"");return e?"Symbol(src)_1."+e:""}();e.exports=r},function(e,t){function n(){this.__data__=[],this.size=0}e.exports=n},function(e,t,n){function r(e){var t=this.__data__,n=i(t,e);return!(n<0)&&(n==t.length-1?t.pop():a.call(t,n,1),--this.size,!0)}var i=n(149),o=Array.prototype,a=o.splice;e.exports=r},function(e,t,n){function r(e){var t=this.__data__,n=i(t,e);return n<0?void 0:t[n][1]}var i=n(149);e.exports=r},function(e,t,n){function r(e){return i(this.__data__,e)>-1}var i=n(149);e.exports=r},function(e,t,n){function r(e,t){var n=this.__data__,r=i(n,e);return r<0?(++this.size,n.push([e,t])):n[r][1]=t,this}var i=n(149);e.exports=r},function(e,t,n){function r(){this.size=0,this.__data__={hash:new i,map:new(a||o),string:new i}}var i=n(829),o=n(146),a=n(213);e.exports=r},function(e,t,n){function r(e){var t=i(this,e).delete(e);return this.size-=t?1:0,t}var i=n(151);e.exports=r},function(e,t,n){function r(e){return i(this,e).get(e)}var i=n(151);e.exports=r},function(e,t,n){function r(e){return i(this,e).has(e)}var i=n(151);e.exports=r},function(e,t,n){function r(e,t){var n=i(this,e),r=n.size;return n.set(e,t),this.size+=n.size==r?0:1,this}var i=n(151);e.exports=r},function(e,t,n){function r(e){var t=i(e,function(e){return n.size===o&&n.clear(),e}),n=t.cache;return t}var i=n(425),o=500;e.exports=r},function(e,t,n){var r=n(222),i=r(Object.keys,Object);e.exports=i},function(e,t){function n(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}e.exports=n},function(e,t,n){(function(e){var r=n(406),i="object"==typeof t&&t&&!t.nodeType&&t,o=i&&"object"==typeof e&&e&&!e.nodeType&&e,a=o&&o.exports===i,s=a&&r.process,u=function(){try{return s&&s.binding&&s.binding("util")}catch(e){}}();e.exports=u}).call(t,n(72)(e))},function(e,t){function n(e){return i.call(e)}var r=Object.prototype,i=r.toString;e.exports=n},function(e,t,n){function r(e,t){return t.length<2?e:i(e,o(t,0,-1))}var i=n(150),o=n(400);e.exports=r},function(e,t){function n(e){return this.__data__.set(e,r),this}var r="__lodash_hash_undefined__";e.exports=n},function(e,t){function n(e){return this.__data__.has(e)}e.exports=n},function(e,t){function n(e){var t=0,n=0;return function(){var a=o(),s=i-(a-n);if(n=a,s>0){if(++t>=r)return arguments[0]}else t=0;return e.apply(void 0,arguments)}}var r=800,i=16,o=Date.now;e.exports=n},function(e,t,n){function r(){this.__data__=new i,this.size=0}var i=n(146);e.exports=r},function(e,t){function n(e){var t=this.__data__,n=t.delete(e);return this.size=t.size,n}e.exports=n},function(e,t){function n(e){return this.__data__.get(e)}e.exports=n},function(e,t){function n(e){return this.__data__.has(e)}e.exports=n},function(e,t,n){function r(e,t){var n=this.__data__;if(n instanceof i){var r=n.__data__;if(!o||r.length<s-1)return r.push([e,t]),this.size=++n.size,this;n=this.__data__=new a(r)}return n.set(e,t),this.size=n.size,this}var i=n(146),o=n(213),a=n(214),s=200;e.exports=r},function(e,t,n){function r(e){return o(e)?a(e):i(e)}var i=n(839),o=n(410),a=n(937);e.exports=r},function(e,t,n){var r=n(921),i=/^\./,o=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,a=/\\(\\)?/g,s=r(function(e){var t=[];return i.test(e)&&t.push(""),e.replace(o,function(e,n,r,i){t.push(r?i.replace(a,"$1"):n||e)}),t});e.exports=s},function(e,t){function n(e){return e.match(p)||[]}var r="[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]",i="\\ud83c[\\udffb-\\udfff]",o="(?:\\ud83c[\\udde6-\\uddff]){2}",a="[\\ud800-\\udbff][\\udc00-\\udfff]",s="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",u="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",o,a].join("|")+")[\\ufe0e\\ufe0f]?"+s+")*",l="[\\ufe0e\\ufe0f]?"+s+u,c="(?:"+["[^\\ud800-\\udfff]"+r+"?",r,o,a,"[\\ud800-\\udfff]"].join("|")+")",p=RegExp(i+"(?="+i+")|"+c+l,"g");e.exports=n},function(e,t){function n(e){return e.match(m)||[]}var r="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",i="["+r+"]",o="[a-z\\xdf-\\xf6\\xf8-\\xff]",a="[^\\ud800-\\udfff"+r+"\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde]",s="(?:\\ud83c[\\udde6-\\uddff]){2}",u="[\\ud800-\\udbff][\\udc00-\\udfff]",l="[A-Z\\xc0-\\xd6\\xd8-\\xde]",c="(?:"+o+"|"+a+")",p="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",f="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",s,u].join("|")+")[\\ufe0e\\ufe0f]?"+p+")*",h="[\\ufe0e\\ufe0f]?"+p+f,d="(?:"+["[\\u2700-\\u27bf]",s,u].join("|")+")"+h,m=RegExp([l+"?"+o+"+(?:['’](?:d|ll|m|re|s|t|ve))?(?="+[i,l,"$"].join("|")+")","(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['’](?:D|LL|M|RE|S|T|VE))?(?="+[i,l+c,"$"].join("|")+")",l+"?"+c+"+(?:['’](?:d|ll|m|re|s|t|ve))?",l+"+(?:['’](?:D|LL|M|RE|S|T|VE))?","\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)","\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)","\\d+",d].join("|"),"g");e.exports=n},function(e,t,n){var r=n(148),i=n(84),o=n(886),a=n(86),s=n(153),u=n(59),l=Object.prototype,c=l.hasOwnProperty,p=o(function(e,t){if(s(t)||a(t))return void i(t,u(t),e);for(var n in t)c.call(t,n)&&r(e,n,t[n])});e.exports=p},function(e,t,n){var r=n(941),i=n(402),o=i(function(e,t,n){return t=t.toLowerCase(),e+(n?r(t):t)});e.exports=o},function(e,t,n){function r(e){return o(i(e).toLowerCase())}var i=n(87),o=n(428);e.exports=r},function(e,t,n){function r(e){return i(e,o|a)}var i=n(397),o=1,a=4;e.exports=r},function(e,t){function n(e){return function(){return e}}e.exports=n},function(e,t,n){function r(e){return(e=o(e))&&e.replace(a,i).replace(s,"")}var i=n(891),o=n(87),a=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,s=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]","g");e.exports=r},function(e,t,n){function r(e,t,n){var r=null==e?0:e.length;if(!r)return-1;var u=null==n?0:a(n);return u<0&&(u=s(r+u,0)),i(e,o(t,3),u)}var i=n(846),o=n(119),a=n(427),s=Math.max;e.exports=r},function(e,t,n){function r(e){return(null==e?0:e.length)?i(e,1):[]}var i=n(847);e.exports=r},function(e,t){function n(e){var t=null==e?0:e.length;return t?e[t-1]:void 0}e.exports=n},function(e,t,n){var r=n(402),i=r(function(e,t,n){return e+(n?" ":"")+t.toLowerCase()});e.exports=i},function(e,t){function n(e){if("function"!=typeof e)throw new TypeError(r);return function(){var t=arguments;switch(t.length){case 0:return!e.call(this);case 1:return!e.call(this,t[0]);case 2:return!e.call(this,t[0],t[1]);case 3:return!e.call(this,t[0],t[1],t[2])}return!e.apply(this,t)}}var r="Expected a function";e.exports=n},function(e,t,n){var r=n(394),i=n(397),o=n(872),a=n(83),s=n(84),u=n(405),l=n(407),c=u(function(e,t){var n={};if(null==e)return n;var u=!1;t=r(t,function(t){return t=a(t,e),u||(u=t.length>1),t}),s(e,l(e),n),u&&(n=i(n,7));for(var c=t.length;c--;)o(n,t[c]);return n});e.exports=c},function(e,t,n){var r=n(860),i=n(405),o=i(function(e,t){return null==e?{}:r(e,t)});e.exports=o},function(e,t,n){function r(e){return a(e)?i(s(e)):o(e)}var i=n(862),o=n(863),a=n(221),s=n(85);e.exports=r},function(e,t,n){function r(e,t,n){var r=u(e)?i:s,l=arguments.length<3;return r(e,a(t,4),n,l,o)}var i=n(147),o=n(217),a=n(119),s=n(865),u=n(20);e.exports=r},function(e,t,n){function r(e,t){return(s(e)?i:o)(e,u(a(t,3)))}var i=n(838),o=n(845),a=n(119),s=n(20),u=n(949);e.exports=r},function(e,t,n){function r(e,t,n){var r=s(e)?i:a;return n&&u(e,t,n)&&(t=void 0),r(e,o(t,3))}var i=n(395),o=n(119),a=n(869),s=n(20),u=n(411);e.exports=r},function(e,t,n){function r(e,t,n){return e=s(e),n=i(a(n),0,e.length),t=o(t),e.slice(n,n+t.length)==t}var i=n(843),o=n(401),a=n(427),s=n(87);e.exports=r},function(e,t){function n(){return!1}e.exports=n},function(e,t,n){function r(e){if(!e)return 0===e?e:0;if((e=i(e))===o||e===-o){return(e<0?-1:1)*a}return e===e?e:0}var i=n(959),o=1/0,a=1.7976931348623157e308;e.exports=r},function(e,t,n){function r(e){if("number"==typeof e)return e;if(o(e))return a;if(i(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=i(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(s,"");var n=l.test(e);return n||c.test(e)?p(e.slice(2),n?2:8):u.test(e)?a:+e}var i=n(38),o=n(155),a=NaN,s=/^\s+|\s+$/g,u=/^[-+]0x[0-9a-f]+$/i,l=/^0b[01]+$/i,c=/^0o[0-7]+$/i,p=parseInt;e.exports=r},function(e,t,n){function r(e,t,n){return e=a(e),t=n?void 0:t,void 0===t?o(e)?s(e):i(e):e.match(t)||[]}var i=n(840),o=n(899),a=n(87),s=n(938);e.exports=r},function(e,t,n){"use strict";var r=n(65),i=Object.create,o=Object.prototype.hasOwnProperty;e.exports=function(e){var t,n=0,a=1,s=i(null),u=i(null),l=0;return e=r(e),{hit:function(r){var i=u[r],c=++l;if(s[c]=r,u[r]=c,!i){if(++n<=e)return;return r=s[a],t(r),r}if(delete s[i],a===i)for(;!o.call(s,++a);)continue},delete:t=function(e){var t=u[e];if(t&&(delete s[t],delete u[e],--n,a===t)){if(!n)return l=0,void(a=1);for(;!o.call(s,++a);)continue}},clear:function(){n=0,a=1,s=i(null),u=i(null),l=0}}}},function(e,t,n){"use strict";var r=n(207),i=n(374),o=n(375),a=n(371),s=n(229),u=Array.prototype.slice,l=Function.prototype.apply,c=Object.create,p=Object.prototype.hasOwnProperty;n(69).async=function(e,t){var n,f,h,d=c(null),m=c(null),v=t.memoized,g=t.original;t.memoized=a(function(e){var t=arguments,r=t[t.length-1];return"function"==typeof r&&(n=r,t=u.call(t,0,-1)),v.apply(f=this,h=t)},v);try{o(t.memoized,v)}catch(e){}t.on("get",function(e){var r,i,o;if(n){if(d[e])return"function"==typeof d[e]?d[e]=[d[e],n]:d[e].push(n),void(n=null);r=n,i=f,o=h,n=f=h=null,s(function(){var a;p.call(m,e)?(a=m[e],t.emit("getasync",e,o,i),l.call(r,a.context,a.args)):(n=r,f=i,h=o,v.apply(i,o))})}}),t.original=function(){var e,i,o,a;return n?(e=r(arguments),i=function e(n){var i,o,u=e.id;return null==u?void s(l.bind(e,this,arguments)):(delete e.id,i=d[u],delete d[u],i?(o=r(arguments),t.has(u)&&(n?t.delete(u):(m[u]={context:this,args:o},t.emit("setasync",u,"function"==typeof i?1:i.length))),"function"==typeof i?a=l.call(i,this,o):i.forEach(function(e){a=l.call(e,this,o)},this),a):void 0)},o=n,n=f=h=null,e.push(i),a=l.call(g,this,e),i.cb=o,n=i,a):l.call(g,this,arguments)},t.on("set",function(e){if(!n)return void t.delete(e);d[e]?"function"==typeof d[e]?d[e]=[d[e],n.cb]:d[e].push(n.cb):d[e]=n.cb,delete n.cb,n.id=e,n=null}),t.on("delete",function(e){var n;p.call(d,e)||m[e]&&(n=m[e],delete m[e],t.emit("deleteasync",e,u.call(n.args,1)))}),t.on("clear",function(){var e=m;m=c(null),t.emit("clearasync",i(e,function(e){return u.call(e.args,1)}))})}},function(e,t,n){"use strict";var r=n(58),i=n(142),o=n(69),a=Function.prototype.apply;o.dispose=function(e,t,n){var s;if(r(e),n.async&&o.async||n.promise&&o.promise)return t.on("deleteasync",s=function(t,n){a.call(e,null,n)}),void t.on("clearasync",function(e){i(e,function(e,t){s(t,e)})});t.on("delete",s=function(t,n){e(n)}),t.on("clear",function(e){i(e,function(e,t){s(t,e)})})}},function(e,t,n){"use strict";var r=n(207),i=n(142),o=n(229),a=n(386),s=n(1186),u=n(69),l=Function.prototype,c=Math.max,p=Math.min,f=Object.create;u.maxAge=function(e,t,n){var h,d,m,v;(e=s(e))&&(h=f(null),d=n.async&&u.async||n.promise&&u.promise?"async":"",t.on("set"+d,function(n){h[n]=setTimeout(function(){t.delete(n)},e),v&&(v[n]&&"nextTick"!==v[n]&&clearTimeout(v[n]),v[n]=setTimeout(function(){delete v[n]},m))}),t.on("delete"+d,function(e){clearTimeout(h[e]),delete h[e],v&&("nextTick"!==v[e]&&clearTimeout(v[e]),delete v[e])}),n.preFetch&&(m=!0===n.preFetch||isNaN(n.preFetch)?.333:c(p(Number(n.preFetch),1),0))&&(v={},m=(1-m)*e,t.on("get"+d,function(e,i,s){v[e]||(v[e]="nextTick",o(function(){var o;"nextTick"===v[e]&&(delete v[e],t.delete(e),n.async&&(i=r(i),i.push(l)),o=t.memoized.apply(s,i),n.promise&&a(o)&&("function"==typeof o.done?o.done(l,l):o.then(l,l)))}))})),t.on("clear"+d,function(){i(h,function(e){clearTimeout(e)}),h={},v&&(i(v,function(e){"nextTick"!==e&&clearTimeout(e)}),v={})}))}},function(e,t,n){"use strict";var r=n(65),i=n(961),o=n(69);o.max=function(e,t,n){var a,s,u;(e=r(e))&&(s=i(e),a=n.async&&o.async||n.promise&&o.promise?"async":"",t.on("set"+a,u=function(e){void 0!==(e=s.hit(e))&&t.delete(e)}),t.on("get"+a,u),t.on("delete"+a,s.delete),t.on("clear"+a,s.clear))}},function(e,t,n){"use strict";var r=n(374),i=n(386),o=n(229),a=Object.create,s=Object.prototype.hasOwnProperty;n(69).promise=function(e,t){var n=a(null),u=a(null),l=a(null);t.on("set",function(r,a,s){if(!i(s))return u[r]=s,void t.emit("setasync",r,1);n[r]=1,l[r]=s;var c=function(e){var i=n[r];i&&(delete n[r],u[r]=e,t.emit("setasync",r,i))},p=function(){n[r]&&(delete n[r],delete l[r],t.delete(r))};"then"!==e&&"function"==typeof s.done?"done"!==e&&"function"==typeof s.finally?(s.done(c),s.finally(p)):s.done(c,p):s.then(function(e){o(c.bind(this,e))},function(){o(p)})}),t.on("get",function(e,r,a){var s;if(n[e])return void++n[e];s=l[e];var u=function(){t.emit("getasync",e,r,a)};i(s)?"function"==typeof s.done?s.done(u):s.then(function(){o(u)}):u()}),t.on("delete",function(e){if(delete l[e],n[e])return void delete n[e];if(s.call(u,e)){var r=u[e];delete u[e],t.emit("deleteasync",e,[r])}}),t.on("clear",function(){var e=u;u=a(null),n=a(null),l=a(null),t.emit("clearasync",r(e,function(e){return[e]}))})}},function(e,t,n){"use strict";var r=n(141),i=n(69),o=Object.create,a=Object.defineProperties;i.refCounter=function(e,t,n){var s,u;s=o(null),u=n.async&&i.async||n.promise&&i.promise?"async":"",t.on("set"+u,function(e,t){s[e]=t||1}),t.on("get"+u,function(e){++s[e]}),t.on("delete"+u,function(e){delete s[e]}),t.on("clear"+u,function(){s={}}),a(t.memoized,{deleteRef:r(function(){var e=t.get(arguments);return null===e?null:s[e]?!--s[e]&&(t.delete(e),!0):null}),getRefCount:r(function(){var e=t.get(arguments);return null===e?0:s[e]?s[e]:0})})}},function(e,t,n){"use strict";var r=n(376),i=n(431),o=n(977);e.exports=function(e){var t,a=r(arguments[1]);return a.normalizer||0!==(t=a.length=i(a.length,e.length,a.async))&&(a.primitive?!1===t?a.normalizer=n(976):t>1&&(a.normalizer=n(974)(t)):a.normalizer=!1===t?n(975)():1===t?n(972)():n(973)(t)),a.async&&n(962),a.promise&&n(966),a.dispose&&n(963),a.maxAge&&n(964),a.max&&n(965),a.refCounter&&n(967),o(e,a)}},function(e,t,n){"use strict";var r=n(716),i=n(371),o=n(141),a=n(744).methods,s=n(971),u=n(970),l=Function.prototype.apply,c=Function.prototype.call,p=Object.create,f=Object.prototype.hasOwnProperty,h=Object.defineProperties,d=a.on,m=a.emit;e.exports=function(e,t,n){var a,v,g,y,_,b,x,w,k,E,S,C,A,D=p(null);return v=!1!==t?t:isNaN(e.length)?1:e.length,n.normalizer&&(w=u(n.normalizer),g=w.get,y=w.set,_=w.delete,b=w.clear),null!=n.resolvers&&(A=s(n.resolvers)),C=g?i(function(t){var n,i,o=arguments;if(A&&(o=A(o)),null!==(n=g(o))&&f.call(D,n))return k&&a.emit("get",n,o,this),D[n];if(i=1===o.length?c.call(e,this,o[0]):l.call(e,this,o),null===n){if(null!==(n=g(o)))throw r("Circular invocation","CIRCULAR_INVOCATION");n=y(o)}else if(f.call(D,n))throw r("Circular invocation","CIRCULAR_INVOCATION");return D[n]=i,E&&a.emit("set",n,null,i),i},v):0===t?function(){var t;if(f.call(D,"data"))return k&&a.emit("get","data",arguments,this),D.data;if(t=arguments.length?l.call(e,this,arguments):c.call(e,this),f.call(D,"data"))throw r("Circular invocation","CIRCULAR_INVOCATION");return D.data=t,E&&a.emit("set","data",null,t),t}:function(t){var n,i,o=arguments;if(A&&(o=A(arguments)),i=String(o[0]),f.call(D,i))return k&&a.emit("get",i,o,this),D[i];if(n=1===o.length?c.call(e,this,o[0]):l.call(e,this,o),f.call(D,i))throw r("Circular invocation","CIRCULAR_INVOCATION");return D[i]=n,E&&a.emit("set",i,null,n),n},a={original:e,memoized:C,get:function(e){return A&&(e=A(e)),g?g(e):String(e[0])},has:function(e){return f.call(D,e)},delete:function(e){var t;f.call(D,e)&&(_&&_(e),t=D[e],delete D[e],S&&a.emit("delete",e,t))},clear:function(){var e=D;b&&b(),D=p(null),a.emit("clear",e)},on:function(e,t){return"get"===e?k=!0:"set"===e?E=!0:"delete"===e&&(S=!0),d.call(this,e,t)},emit:m,updateEnv:function(){e=a.original}},x=g?i(function(e){var t,n=arguments;A&&(n=A(n)),null!==(t=g(n))&&a.delete(t)},v):0===t?function(){return a.delete("data")}:function(e){return A&&(e=A(arguments)[0]),a.delete(e)},h(C,{__memoized__:o(!0),delete:o(x),clear:o(a.clear)}),a}},function(e,t,n){"use strict";var r=n(58);e.exports=function(e){var t;return"function"==typeof e?{set:e,get:e}:(t={get:r(e.get)},void 0!==e.set?(t.set=r(e.set),t.delete=r(e.delete),t.clear=r(e.clear),t):(t.set=t.get,t))}},function(e,t,n){"use strict";var r,i=n(715),o=n(58),a=Array.prototype.slice;r=function(e){return this.map(function(t,n){return t?t(e[n]):e[n]}).concat(a.call(e,this.length))},e.exports=function(e){return e=i(e),e.forEach(function(e){null!=e&&o(e)}),r.bind(e)}},function(e,t,n){"use strict";var r=n(206);e.exports=function(){var e=0,t=[],n=[];return{get:function(e){var i=r.call(t,e[0]);return-1===i?null:n[i]},set:function(r){return t.push(r[0]),n.push(++e),e},delete:function(e){var i=r.call(n,e);-1!==i&&(t.splice(i,1),n.splice(i,1))},clear:function(){t=[],n=[]}}}},function(e,t,n){"use strict";var r=n(206),i=Object.create;e.exports=function(e){var t=0,n=[[],[]],o=i(null);return{get:function(t){for(var i,o=0,a=n;o<e-1;){if(-1===(i=r.call(a[0],t[o])))return null;a=a[1][i],++o}return i=r.call(a[0],t[o]),-1===i?null:a[1][i]||null},set:function(i){for(var a,s=0,u=n;s<e-1;)a=r.call(u[0],i[s]),-1===a&&(a=u[0].push(i[s])-1,u[1].push([[],[]])),u=u[1][a],++s;return a=r.call(u[0],i[s]),-1===a&&(a=u[0].push(i[s])-1),u[1][a]=++t,o[t]=i,t},delete:function(t){for(var i,a=0,s=n,u=[],l=o[t];a<e-1;){if(-1===(i=r.call(s[0],l[a])))return;u.push(s,i),s=s[1][i],++a}if(-1!==(i=r.call(s[0],l[a]))){for(t=s[1][i],s[0].splice(i,1),s[1].splice(i,1);!s[0].length&&u.length;)i=u.pop(),s=u.pop(),s[0].splice(i,1),s[1].splice(i,1);delete o[t]}},clear:function(){n=[[],[]],o=i(null)}}}},function(e,t,n){"use strict";e.exports=function(e){return e?function(t){for(var n=String(t[0]),r=0,i=e;--i;)n+="
"+t[++r];return n}:function(){return""}}},function(e,t,n){"use strict";var r=n(206),i=Object.create;e.exports=function(){var e=0,t=[],n=i(null);return{get:function(e){var n,i=0,o=t,a=e.length;if(0===a)return o[a]||null;if(o=o[a]){for(;i<a-1;){if(-1===(n=r.call(o[0],e[i])))return null;o=o[1][n],++i}return n=r.call(o[0],e[i]),-1===n?null:o[1][n]||null}return null},set:function(i){var o,a=0,s=t,u=i.length;if(0===u)s[u]=++e;else{for(s[u]||(s[u]=[[],[]]),s=s[u];a<u-1;)o=r.call(s[0],i[a]),-1===o&&(o=s[0].push(i[a])-1,s[1].push([[],[]])),s=s[1][o],++a;o=r.call(s[0],i[a]),-1===o&&(o=s[0].push(i[a])-1),s[1][o]=++e}return n[e]=i,e},delete:function(e){var i,o=0,a=t,s=n[e],u=s.length,l=[];if(0===u)delete a[u];else if(a=a[u]){for(;o<u-1;){if(-1===(i=r.call(a[0],s[o])))return;l.push(a,i),a=a[1][i],++o}if(-1===(i=r.call(a[0],s[o])))return;for(e=a[1][i],a[0].splice(i,1),a[1].splice(i,1);!a[0].length&&l.length;)i=l.pop(),a=l.pop(),a[0].splice(i,1),a[1].splice(i,1)}delete n[e]},clear:function(){t=[],n=i(null)}}}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r=e.length;if(!r)return"";for(t=String(e[n=0]);--r;)t+="
"+e[++n];return t}},function(e,t,n){"use strict";var r=n(58),i=n(142),o=n(69),a=n(969),s=n(431),u=Object.prototype.hasOwnProperty;e.exports=function e(t){var n,l,c;if(r(t),n=Object(arguments[1]),n.async&&n.promise)throw new Error("Options 'async' and 'promise' cannot be used together");return u.call(t,"__memoized__")&&!n.force?t:(l=s(n.length,t.length,n.async&&o.async),c=a(t,l,n),i(o,function(e,t){n[t]&&e(n[t],c,n)}),e.__profiler__&&e.__profiler__(c),c.updateEnv(),c.memoized)}},function(e,t,n){"use strict";e.exports=Number.isNaN||function(e){return e!==e}},function(e,t){/*!
+ * pascalcase <https://github.com/jonschlinkert/pascalcase>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+function n(e){if("string"!=typeof e)throw new TypeError("expected a string.");return e=e.replace(/([A-Z])/g," $1"),1===e.length?e.toUpperCase():(e=e.replace(/^[\W_]+|[\W_]+$/g,"").toLowerCase(),e=e.charAt(0).toUpperCase()+e.slice(1),e.replace(/[\W_]+(\w|$)/g,function(e,t){return t.toUpperCase()}))}e.exports=n},function(e,t,n){"use strict";(function(r){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var a=n(442),s=i(a),u=n(230),l=i(u),c=function(){function e(t,n,r){o(this,e),this.stringify=t,this.mapOpts=r.map||{},this.root=n,this.opts=r}return e.prototype.isMap=function(){return void 0!==this.opts.map?!!this.opts.map:this.previous().length>0},e.prototype.previous=function(){var e=this;return this.previousMaps||(this.previousMaps=[],this.root.walk(function(t){if(t.source&&t.source.input.map){var n=t.source.input.map;-1===e.previousMaps.indexOf(n)&&e.previousMaps.push(n)}})),this.previousMaps},e.prototype.isInline=function(){if(void 0!==this.mapOpts.inline)return this.mapOpts.inline;var e=this.mapOpts.annotation;return(void 0===e||!0===e)&&(!this.previous().length||this.previous().some(function(e){return e.inline}))},e.prototype.isSourcesContent=function(){return void 0!==this.mapOpts.sourcesContent?this.mapOpts.sourcesContent:!this.previous().length||this.previous().some(function(e){return e.withContent()})},e.prototype.clearAnnotation=function(){if(!1!==this.mapOpts.annotation)for(var e=void 0,t=this.root.nodes.length-1;t>=0;t--)e=this.root.nodes[t],"comment"===e.type&&0===e.text.indexOf("# sourceMappingURL=")&&this.root.removeChild(t)},e.prototype.setSourcesContent=function(){var e=this,t={};this.root.walk(function(n){if(n.source){var r=n.source.input.from;if(r&&!t[r]){t[r]=!0;var i=e.relative(r);e.map.setSourceContent(i,n.source.input.css)}}})},e.prototype.applyPrevMaps=function(){for(var e=this.previous(),t=Array.isArray(e),n=0,e=t?e:e[Symbol.iterator]();;){var r;if(t){if(n>=e.length)break;r=e[n++]}else{if(n=e.next(),n.done)break;r=n.value}var i=r,o=this.relative(i.file),a=i.root||l.default.dirname(i.file),u=void 0;!1===this.mapOpts.sourcesContent?(u=new s.default.SourceMapConsumer(i.text),u.sourcesContent&&(u.sourcesContent=u.sourcesContent.map(function(){return null}))):u=i.consumer(),this.map.applySourceMap(u,o,this.relative(a))}},e.prototype.isAnnotation=function(){return!!this.isInline()||(void 0!==this.mapOpts.annotation?this.mapOpts.annotation:!this.previous().length||this.previous().some(function(e){return e.annotation}))},e.prototype.toBase64=function(e){return r?r.from&&r.from!==Uint8Array.from?r.from(e).toString("base64"):new r(e).toString("base64"):window.btoa(unescape(encodeURIComponent(e)))},e.prototype.addAnnotation=function(){var e=void 0;e=this.isInline()?"data:application/json;base64,"+this.toBase64(this.map.toString()):"string"==typeof this.mapOpts.annotation?this.mapOpts.annotation:this.outputFile()+".map";var t="\n";-1!==this.css.indexOf("\r\n")&&(t="\r\n"),this.css+=t+"/*# sourceMappingURL="+e+" */"},e.prototype.outputFile=function(){return this.opts.to?this.relative(this.opts.to):this.opts.from?this.relative(this.opts.from):"to.css"},e.prototype.generateMap=function(){return this.generateString(),this.isSourcesContent()&&this.setSourcesContent(),this.previous().length>0&&this.applyPrevMaps(),this.isAnnotation()&&this.addAnnotation(),this.isInline()?[this.css]:[this.css,this.map]},e.prototype.relative=function(e){if(0===e.indexOf("<"))return e;if(/^\w+:\/\//.test(e))return e;var t=this.opts.to?l.default.dirname(this.opts.to):".";return"string"==typeof this.mapOpts.annotation&&(t=l.default.dirname(l.default.resolve(t,this.mapOpts.annotation))),e=l.default.relative(t,e),"\\"===l.default.sep?e.replace(/\\/g,"/"):e},e.prototype.sourcePath=function(e){return this.mapOpts.from?this.mapOpts.from:this.relative(e.source.input.from)},e.prototype.generateString=function(){var e=this;this.css="",this.map=new s.default.SourceMapGenerator({file:this.outputFile()});var t=1,n=1,r=void 0,i=void 0;this.stringify(this.root,function(o,a,s){e.css+=o,a&&"end"!==s&&(a.source&&a.source.start?e.map.addMapping({source:e.sourcePath(a),generated:{line:t,column:n-1},original:{line:a.source.start.line,column:a.source.start.column-1}}):e.map.addMapping({source:"<no source>",original:{line:1,column:0},generated:{line:t,column:n-1}})),r=o.match(/\n/g),r?(t+=r.length,i=o.lastIndexOf("\n"),n=o.length-i):n+=o.length,a&&"start"!==s&&(a.source&&a.source.end?e.map.addMapping({source:e.sourcePath(a),generated:{line:t,column:n-1},original:{line:a.source.end.line,column:a.source.end.column}}):e.map.addMapping({source:"<no source>",original:{line:1,column:0},generated:{line:t,column:n-1}}))})},e.prototype.generate=function(){if(this.clearAnnotation(),this.isMap())return this.generateMap();var e="";return this.stringify(this.root,function(t){e+=t}),[e]},e}();t.default=c,e.exports=t.default}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var o=n(234),a=r(o),s=n(438),u=r(s),l=n(232),c=r(l),p=n(156),f=r(p),h=n(237),d=r(h),m=n(157),v=r(m),g=function(){function e(t){i(this,e),this.input=t,this.root=new d.default,this.current=this.root,this.spaces="",this.semicolon=!1,this.createTokenizer(),this.root.source={input:t,start:{line:1,column:1}}}return e.prototype.createTokenizer=function(){this.tokenizer=(0,u.default)(this.input)},e.prototype.parse=function(){for(var e=void 0;!this.tokenizer.endOfFile();)switch(e=this.tokenizer.nextToken(),e[0]){case"space":this.spaces+=e[1];break;case";":this.freeSemicolon(e);break;case"}":this.end(e);break;case"comment":this.comment(e);break;case"at-word":this.atrule(e);break;case"{":this.emptyRule(e);break;default:this.other(e)}this.endFile()},e.prototype.comment=function(e){var t=new c.default;this.init(t,e[2],e[3]),t.source.end={line:e[4],column:e[5]};var n=e[1].slice(2,-2);if(/^\s*$/.test(n))t.text="",t.raws.left=n,t.raws.right="";else{var r=n.match(/^(\s*)([^]*[^\s])(\s*)$/);t.text=r[2],t.raws.left=r[1],t.raws.right=r[3]}},e.prototype.emptyRule=function(e){var t=new v.default;this.init(t,e[2],e[3]),t.selector="",t.raws.between="",this.current=t},e.prototype.other=function(e){for(var t=!1,n=null,r=!1,i=null,o=[],a=[],s=e;s;){if(n=s[0],a.push(s),"("===n||"["===n)i||(i=s),o.push("("===n?")":"]");else if(0===o.length){if(";"===n){if(r)return void this.decl(a);break}if("{"===n)return void this.rule(a);if("}"===n){this.tokenizer.back(a.pop()),t=!0;break}":"===n&&(r=!0)}else n===o[o.length-1]&&(o.pop(),0===o.length&&(i=null));s=this.tokenizer.nextToken()}if(this.tokenizer.endOfFile()&&(t=!0),o.length>0&&this.unclosedBracket(i),t&&r){for(;a.length&&("space"===(s=a[a.length-1][0])||"comment"===s);)this.tokenizer.back(a.pop());return void this.decl(a)}this.unknownWord(a)},e.prototype.rule=function(e){e.pop();var t=new v.default;this.init(t,e[0][2],e[0][3]),t.raws.between=this.spacesAndCommentsFromEnd(e),this.raw(t,"selector",e),this.current=t},e.prototype.decl=function(e){var t=new a.default;this.init(t);var n=e[e.length-1];for(";"===n[0]&&(this.semicolon=!0,e.pop()),n[4]?t.source.end={line:n[4],column:n[5]}:t.source.end={line:n[2],column:n[3]};"word"!==e[0][0];)1===e.length&&this.unknownWord(e),t.raws.before+=e.shift()[1];for(t.source.start={line:e[0][2],column:e[0][3]},t.prop="";e.length;){var r=e[0][0];if(":"===r||"space"===r||"comment"===r)break;t.prop+=e.shift()[1]}t.raws.between="";for(var i=void 0;e.length;){if(i=e.shift(),":"===i[0]){t.raws.between+=i[1];break}t.raws.between+=i[1]}"_"!==t.prop[0]&&"*"!==t.prop[0]||(t.raws.before+=t.prop[0],t.prop=t.prop.slice(1)),t.raws.between+=this.spacesAndCommentsFromStart(e),this.precheckMissedSemicolon(e);for(var o=e.length-1;o>0;o--){if(i=e[o],"!important"===i[1].toLowerCase()){t.important=!0;var s=this.stringFrom(e,o);s=this.spacesFromEnd(e)+s," !important"!==s&&(t.raws.important=s);break}if("important"===i[1].toLowerCase()){for(var u=e.slice(0),l="",c=o;c>0;c--){var p=u[c][0];if(0===l.trim().indexOf("!")&&"space"!==p)break;l=u.pop()[1]+l}0===l.trim().indexOf("!")&&(t.important=!0,t.raws.important=l,e=u)}if("space"!==i[0]&&"comment"!==i[0])break}this.raw(t,"value",e),-1!==t.value.indexOf(":")&&this.checkMissedSemicolon(e)},e.prototype.atrule=function(e){var t=new f.default;t.name=e[1].slice(1),""===t.name&&this.unnamedAtrule(t,e),this.init(t,e[2],e[3]);for(var n=void 0,r=void 0,i=!1,o=!1,a=[];!this.tokenizer.endOfFile();){if(e=this.tokenizer.nextToken(),";"===e[0]){t.source.end={line:e[2],column:e[3]},this.semicolon=!0;break}if("{"===e[0]){o=!0;break}if("}"===e[0]){if(a.length>0){for(r=a.length-1,n=a[r];n&&"space"===n[0];)n=a[--r];n&&(t.source.end={line:n[4],column:n[5]})}this.end(e);break}if(a.push(e),this.tokenizer.endOfFile()){i=!0;break}}t.raws.between=this.spacesAndCommentsFromEnd(a),a.length?(t.raws.afterName=this.spacesAndCommentsFromStart(a),this.raw(t,"params",a),i&&(e=a[a.length-1],t.source.end={line:e[4],column:e[5]},this.spaces=t.raws.between,t.raws.between="")):(t.raws.afterName="",t.params=""),o&&(t.nodes=[],this.current=t)},e.prototype.end=function(e){this.current.nodes&&this.current.nodes.length&&(this.current.raws.semicolon=this.semicolon),this.semicolon=!1,this.current.raws.after=(this.current.raws.after||"")+this.spaces,this.spaces="",this.current.parent?(this.current.source.end={line:e[2],column:e[3]},this.current=this.current.parent):this.unexpectedClose(e)},e.prototype.endFile=function(){this.current.parent&&this.unclosedBlock(),this.current.nodes&&this.current.nodes.length&&(this.current.raws.semicolon=this.semicolon),this.current.raws.after=(this.current.raws.after||"")+this.spaces},e.prototype.freeSemicolon=function(e){if(this.spaces+=e[1],this.current.nodes){var t=this.current.nodes[this.current.nodes.length-1];t&&"rule"===t.type&&!t.raws.ownSemicolon&&(t.raws.ownSemicolon=this.spaces,this.spaces="")}},e.prototype.init=function(e,t,n){this.current.push(e),e.source={start:{line:t,column:n},input:this.input},e.raws.before=this.spaces,this.spaces="","comment"!==e.type&&(this.semicolon=!1)},e.prototype.raw=function(e,t,n){for(var r=void 0,i=void 0,o=n.length,a="",s=!0,u=0;u<o;u+=1)r=n[u],i=r[0],"comment"===i||"space"===i&&u===o-1?s=!1:a+=r[1];if(!s){var l=n.reduce(function(e,t){return e+t[1]},"");e.raws[t]={value:a,raw:l}}e[t]=a},e.prototype.spacesAndCommentsFromEnd=function(e){for(var t=void 0,n="";e.length&&("space"===(t=e[e.length-1][0])||"comment"===t);)n=e.pop()[1]+n;return n},e.prototype.spacesAndCommentsFromStart=function(e){for(var t=void 0,n="";e.length&&("space"===(t=e[0][0])||"comment"===t);)n+=e.shift()[1];return n},e.prototype.spacesFromEnd=function(e){for(var t="";e.length&&"space"===e[e.length-1][0];)t=e.pop()[1]+t;return t},e.prototype.stringFrom=function(e,t){for(var n="",r=t;r<e.length;r++)n+=e[r][1];return e.splice(t,e.length-t),n},e.prototype.colon=function(e){for(var t=0,n=void 0,r=void 0,i=void 0,o=0;o<e.length;o++){if(n=e[o],"("===(r=n[0]))t+=1;else if(")"===r)t-=1;else if(0===t&&":"===r){if(i){if("word"===i[0]&&"progid"===i[1])continue;return o}this.doubleColon(n)}i=n}return!1},e.prototype.unclosedBracket=function(e){throw this.input.error("Unclosed bracket",e[2],e[3])},e.prototype.unknownWord=function(e){throw this.input.error("Unknown word",e[0][2],e[0][3])},e.prototype.unexpectedClose=function(e){throw this.input.error("Unexpected }",e[2],e[3])},e.prototype.unclosedBlock=function(){var e=this.current.source.start;throw this.input.error("Unclosed block",e.line,e.column)},e.prototype.doubleColon=function(e){throw this.input.error("Double colon",e[2],e[3])},e.prototype.unnamedAtrule=function(e,t){throw this.input.error("At-rule without name",t[2],t[3])},e.prototype.precheckMissedSemicolon=function(e){},e.prototype.checkMissedSemicolon=function(e){var t=this.colon(e);if(!1!==t){for(var n=0,r=void 0,i=t-1;i>=0&&(r=e[i],"space"===r[0]||2!==(n+=1));i--);throw this.input.error("Missed semicolon",r[2],r[3])}},e}();t.default=g,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return 1===t.length&&Array.isArray(t[0])&&(t=t[0]),new u.default(t)}t.__esModule=!0;var o=n(234),a=r(o),s=n(436),u=r(s),l=n(238),c=r(l),p=n(232),f=r(p),h=n(156),d=r(h),m=n(986),v=r(m),g=n(236),y=r(g),_=n(435),b=r(_),x=n(157),w=r(x),k=n(237),E=r(k);i.plugin=function(e,t){var n=function(){var n=t.apply(void 0,arguments);return n.postcssPlugin=e,n.postcssVersion=(new u.default).version,n},r=void 0;return Object.defineProperty(n,"postcss",{get:function(){return r||(r=n()),r}}),n.process=function(e,t,r){return i([n(r)]).process(e,t)},n},i.stringify=c.default,i.parse=y.default,i.vendor=v.default,i.list=b.default,i.comment=function(e){return new f.default(e)},i.atRule=function(e){return new d.default(e)},i.decl=function(e){return new a.default(e)},i.rule=function(e){return new w.default(e)},i.root=function(e){return new E.default(e)},t.default=i,e.exports=t.default},function(e,t,n){"use strict";(function(r){function i(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e){return r?r.from&&r.from!==Uint8Array.from?r.from(e,"base64").toString():new r(e,"base64").toString():window.atob(e)}t.__esModule=!0;var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=n(442),l=i(u),c=n(230),p=i(c),f=n(1210),h=i(f),d=function(){function e(t,n){o(this,e),this.loadAnnotation(t),this.inline=this.startWith(this.annotation,"data:");var r=n.map?n.map.prev:void 0,i=this.loadMap(n.from,r);i&&(this.text=i)}return e.prototype.consumer=function(){return this.consumerCache||(this.consumerCache=new l.default.SourceMapConsumer(this.text)),this.consumerCache},e.prototype.withContent=function(){return!!(this.consumer().sourcesContent&&this.consumer().sourcesContent.length>0)},e.prototype.startWith=function(e,t){return!!e&&e.substr(0,t.length)===t},e.prototype.loadAnnotation=function(e){var t=e.match(/\/\*\s*# sourceMappingURL=(.*)\s*\*\//);t&&(this.annotation=t[1].trim())},e.prototype.decodeInline=function(e){var t=/^data:application\/json;(?:charset=utf-?8;)?base64,/,n="data:application/json,";if(this.startWith(e,n))return decodeURIComponent(e.substr(n.length));if(t.test(e))return a(e.substr(RegExp.lastMatch.length));var r=e.match(/data:application\/json;([^,]+),/)[1];throw new Error("Unsupported source map encoding "+r)},e.prototype.loadMap=function(e,t){if(!1===t)return!1;if(t){if("string"==typeof t)return t;if("function"==typeof t){var n=t(e);if(n&&h.default.existsSync&&h.default.existsSync(n))return h.default.readFileSync(n,"utf-8").toString().trim();throw new Error("Unable to load previous source map: "+n.toString())}if(t instanceof l.default.SourceMapConsumer)return l.default.SourceMapGenerator.fromSourceMap(t).toString();if(t instanceof l.default.SourceMapGenerator)return t.toString();if(this.isMap(t))return JSON.stringify(t);throw new Error("Unsupported previous source map format: "+t.toString())}if(this.inline)return this.decodeInline(this.annotation);if(this.annotation){var r=this.annotation;return e&&(r=p.default.join(p.default.dirname(e),r)),this.root=p.default.dirname(r),!(!h.default.existsSync||!h.default.existsSync(r))&&h.default.readFileSync(r,"utf-8").toString().trim()}},e.prototype.isMap=function(e){return"object"===(void 0===e?"undefined":s(e))&&("string"==typeof e.mappings||"string"==typeof e._mappings)},e}();t.default=d,e.exports=t.default}).call(t,n(40).Buffer)},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=n(988),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=function(){function e(t,n,i){r(this,e),this.processor=t,this.messages=[],this.root=n,this.opts=i,this.css=void 0,this.map=void 0}return e.prototype.toString=function(){return this.css},e.prototype.warn=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};t.plugin||this.lastPlugin&&this.lastPlugin.postcssPlugin&&(t.plugin=this.lastPlugin.postcssPlugin);var n=new a.default(e,t);return this.messages.push(n),n},e.prototype.warnings=function(){return this.messages.filter(function(e){return"warning"===e.type})},i(e,[{key:"content",get:function(){return this.css}}]),e}();t.default=s,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n=e[0],r=e[1];if("word"===n){if("."===r[0])return"class";if("#"===r[0])return"hash"}if(!t.endOfFile()){var i=t.nextToken();if(t.back(i),"brackets"===i[0]||"("===i[0])return"call"}return n}function o(e){for(var t=(0,l.default)(new p.default(e),{ignoreErrors:!0}),n="";!t.endOfFile();)!function(){var e=t.nextToken(),r=f[i(e,t)];n+=r?e[1].split(/\r?\n/).map(function(e){return r(e)}).join("\n"):e[1]}();return n}t.__esModule=!0;var a=n(503),s=r(a),u=n(438),l=r(u),c=n(433),p=r(c),f={brackets:s.default.cyan,"at-word":s.default.cyan,call:s.default.cyan,comment:s.default.gray,string:s.default.green,class:s.default.yellow,hash:s.default.magenta,"(":s.default.cyan,")":s.default.cyan,"{":s.default.yellow,"}":s.default.yellow,"[":s.default.yellow,"]":s.default.yellow,":":s.default.yellow,";":s.default.yellow};t.default=o,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var r={prefix:function(e){var t=e.match(/^(-\w+-)/);return t?t[0]:""},unprefixed:function(e){return e.replace(/^-\w+-/,"")}};t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e){i[e]||(i[e]=!0,"undefined"!=typeof console&&console.warn&&console.warn(e))}t.__esModule=!0,t.default=r;var i={};e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}t.__esModule=!0;var i=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(r(this,e),this.type="warning",this.text=t,n.node&&n.node.source){var i=n.node.positionBy(n);this.line=i.line,this.column=i.column}for(var o in n)this[o]=n[o]}return e.prototype.toString=function(){return this.node?this.node.error(this.text,{plugin:this.plugin,index:this.index,word:this.word}).message:this.plugin?this.plugin+": "+this.text:this.text},e}();t.default=i,e.exports=t.default},function(e,t){var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");t.encode=function(e){if(0<=e&&e<n.length)return n[e];throw new TypeError("Must be between 0 and 63: "+e)},t.decode=function(e){return 65<=e&&e<=90?e-65:97<=e&&e<=122?e-97+26:48<=e&&e<=57?e-48+52:43==e?62:47==e?63:-1}},function(e,t){function n(e,r,i,o,a,s){var u=Math.floor((r-e)/2)+e,l=a(i,o[u],!0);return 0===l?u:l>0?r-u>1?n(u,r,i,o,a,s):s==t.LEAST_UPPER_BOUND?r<o.length?r:-1:u:u-e>1?n(e,u,i,o,a,s):s==t.LEAST_UPPER_BOUND?u:e<0?-1:e}t.GREATEST_LOWER_BOUND=1,t.LEAST_UPPER_BOUND=2,t.search=function(e,r,i,o){if(0===r.length)return-1;var a=n(-1,r.length,e,r,i,o||t.GREATEST_LOWER_BOUND);if(a<0)return-1;for(;a-1>=0&&0===i(r[a],r[a-1],!0);)--a;return a}},function(e,t,n){function r(e,t){var n=e.generatedLine,r=t.generatedLine,i=e.generatedColumn,a=t.generatedColumn;return r>n||r==n&&a>=i||o.compareByGeneratedPositionsInflated(e,t)<=0}function i(){this._array=[],this._sorted=!0,this._last={generatedLine:-1,generatedColumn:0}}var o=n(121);i.prototype.unsortedForEach=function(e,t){this._array.forEach(e,t)},i.prototype.add=function(e){r(this._last,e)?(this._last=e,this._array.push(e)):(this._sorted=!1,this._array.push(e))},i.prototype.toArray=function(){return this._sorted||(this._array.sort(o.compareByGeneratedPositionsInflated),this._sorted=!0),this._array},t.MappingList=i},function(e,t){function n(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function r(e,t){return Math.round(e+Math.random()*(t-e))}function i(e,t,o,a){if(o<a){var s=r(o,a),u=o-1;n(e,s,a);for(var l=e[a],c=o;c<a;c++)t(e[c],l)<=0&&(u+=1,n(e,u,c));n(e,u+1,c);var p=u+1;i(e,t,o,p-1),i(e,t,p+1,a)}}t.quickSort=function(e,t){i(e,t,0,e.length-1)}},function(e,t,n){function r(e,t){var n=e;return"string"==typeof e&&(n=s.parseSourceMapInput(e)),null!=n.sections?new a(n,t):new i(n,t)}function i(e,t){var n=e;"string"==typeof e&&(n=s.parseSourceMapInput(e));var r=s.getArg(n,"version"),i=s.getArg(n,"sources"),o=s.getArg(n,"names",[]),a=s.getArg(n,"sourceRoot",null),u=s.getArg(n,"sourcesContent",null),c=s.getArg(n,"mappings"),p=s.getArg(n,"file",null);if(r!=this._version)throw new Error("Unsupported version: "+r);a&&(a=s.normalize(a)),i=i.map(String).map(s.normalize).map(function(e){return a&&s.isAbsolute(a)&&s.isAbsolute(e)?s.relative(a,e):e}),this._names=l.fromArray(o.map(String),!0),this._sources=l.fromArray(i,!0),this._absoluteSources=this._sources.toArray().map(function(e){return s.computeSourceURL(a,e,t)}),this.sourceRoot=a,this.sourcesContent=u,this._mappings=c,this._sourceMapURL=t,this.file=p}function o(){this.generatedLine=0,this.generatedColumn=0,this.source=null,this.originalLine=null,this.originalColumn=null,this.name=null}function a(e,t){var n=e;"string"==typeof e&&(n=s.parseSourceMapInput(e));var i=s.getArg(n,"version"),o=s.getArg(n,"sections");if(i!=this._version)throw new Error("Unsupported version: "+i);this._sources=new l,this._names=new l;var a={line:-1,column:0};this._sections=o.map(function(e){if(e.url)throw new Error("Support for url field in sections not implemented.");var n=s.getArg(e,"offset"),i=s.getArg(n,"line"),o=s.getArg(n,"column");if(i<a.line||i===a.line&&o<a.column)throw new Error("Section offsets must be ordered and non-overlapping.");return a=n,{generatedOffset:{generatedLine:i+1,generatedColumn:o+1},consumer:new r(s.getArg(e,"map"),t)}})}var s=n(121),u=n(990),l=n(439).ArraySet,c=n(440),p=n(992).quickSort;r.fromSourceMap=function(e,t){return i.fromSourceMap(e,t)},r.prototype._version=3,r.prototype.__generatedMappings=null,Object.defineProperty(r.prototype,"_generatedMappings",{configurable:!0,enumerable:!0,get:function(){return this.__generatedMappings||this._parseMappings(this._mappings,this.sourceRoot),this.__generatedMappings}}),r.prototype.__originalMappings=null,Object.defineProperty(r.prototype,"_originalMappings",{configurable:!0,enumerable:!0,get:function(){return this.__originalMappings||this._parseMappings(this._mappings,this.sourceRoot),this.__originalMappings}}),r.prototype._charIsMappingSeparator=function(e,t){var n=e.charAt(t);return";"===n||","===n},r.prototype._parseMappings=function(e,t){throw new Error("Subclasses must implement _parseMappings")},r.GENERATED_ORDER=1,r.ORIGINAL_ORDER=2,r.GREATEST_LOWER_BOUND=1,r.LEAST_UPPER_BOUND=2,r.prototype.eachMapping=function(e,t,n){var i,o=t||null,a=n||r.GENERATED_ORDER;switch(a){case r.GENERATED_ORDER:i=this._generatedMappings;break;case r.ORIGINAL_ORDER:i=this._originalMappings;break;default:throw new Error("Unknown order of iteration.")}var u=this.sourceRoot;i.map(function(e){var t=null===e.source?null:this._sources.at(e.source);return t=s.computeSourceURL(u,t,this._sourceMapURL),{source:t,generatedLine:e.generatedLine,generatedColumn:e.generatedColumn,originalLine:e.originalLine,originalColumn:e.originalColumn,name:null===e.name?null:this._names.at(e.name)}},this).forEach(e,o)},r.prototype.allGeneratedPositionsFor=function(e){var t=s.getArg(e,"line"),n={source:s.getArg(e,"source"),originalLine:t,originalColumn:s.getArg(e,"column",0)};if(n.source=this._findSourceIndex(n.source),n.source<0)return[];var r=[],i=this._findMapping(n,this._originalMappings,"originalLine","originalColumn",s.compareByOriginalPositions,u.LEAST_UPPER_BOUND);if(i>=0){var o=this._originalMappings[i];if(void 0===e.column)for(var a=o.originalLine;o&&o.originalLine===a;)r.push({line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}),o=this._originalMappings[++i];else for(var l=o.originalColumn;o&&o.originalLine===t&&o.originalColumn==l;)r.push({line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}),o=this._originalMappings[++i]}return r},t.SourceMapConsumer=r,i.prototype=Object.create(r.prototype),i.prototype.consumer=r,i.prototype._findSourceIndex=function(e){var t=e;if(null!=this.sourceRoot&&(t=s.relative(this.sourceRoot,t)),this._sources.has(t))return this._sources.indexOf(t);var n;for(n=0;n<this._absoluteSources.length;++n)if(this._absoluteSources[n]==e)return n;return-1},i.fromSourceMap=function(e,t){var n=Object.create(i.prototype),r=n._names=l.fromArray(e._names.toArray(),!0),a=n._sources=l.fromArray(e._sources.toArray(),!0);n.sourceRoot=e._sourceRoot,n.sourcesContent=e._generateSourcesContent(n._sources.toArray(),n.sourceRoot),n.file=e._file,n._sourceMapURL=t,n._absoluteSources=n._sources.toArray().map(function(e){return s.computeSourceURL(n.sourceRoot,e,t)});for(var u=e._mappings.toArray().slice(),c=n.__generatedMappings=[],f=n.__originalMappings=[],h=0,d=u.length;h<d;h++){var m=u[h],v=new o;v.generatedLine=m.generatedLine,v.generatedColumn=m.generatedColumn,m.source&&(v.source=a.indexOf(m.source),v.originalLine=m.originalLine,v.originalColumn=m.originalColumn,m.name&&(v.name=r.indexOf(m.name)),f.push(v)),c.push(v)}return p(n.__originalMappings,s.compareByOriginalPositions),n},i.prototype._version=3,Object.defineProperty(i.prototype,"sources",{get:function(){return this._absoluteSources.slice()}}),i.prototype._parseMappings=function(e,t){for(var n,r,i,a,u,l=1,f=0,h=0,d=0,m=0,v=0,g=e.length,y=0,_={},b={},x=[],w=[];y<g;)if(";"===e.charAt(y))l++,y++,f=0;else if(","===e.charAt(y))y++;else{for(n=new o,n.generatedLine=l,a=y;a<g&&!this._charIsMappingSeparator(e,a);a++);if(r=e.slice(y,a),i=_[r])y+=r.length;else{for(i=[];y<a;)c.decode(e,y,b),u=b.value,y=b.rest,i.push(u);if(2===i.length)throw new Error("Found a source, but no line and column");if(3===i.length)throw new Error("Found a source and line, but no column");_[r]=i}n.generatedColumn=f+i[0],f=n.generatedColumn,i.length>1&&(n.source=m+i[1],m+=i[1],n.originalLine=h+i[2],h=n.originalLine,n.originalLine+=1,n.originalColumn=d+i[3],d=n.originalColumn,i.length>4&&(n.name=v+i[4],v+=i[4])),w.push(n),"number"==typeof n.originalLine&&x.push(n)}p(w,s.compareByGeneratedPositionsDeflated),this.__generatedMappings=w,p(x,s.compareByOriginalPositions),this.__originalMappings=x},i.prototype._findMapping=function(e,t,n,r,i,o){if(e[n]<=0)throw new TypeError("Line must be greater than or equal to 1, got "+e[n]);if(e[r]<0)throw new TypeError("Column must be greater than or equal to 0, got "+e[r]);return u.search(e,t,i,o)},i.prototype.computeColumnSpans=function(){for(var e=0;e<this._generatedMappings.length;++e){var t=this._generatedMappings[e];if(e+1<this._generatedMappings.length){var n=this._generatedMappings[e+1];if(t.generatedLine===n.generatedLine){t.lastGeneratedColumn=n.generatedColumn-1;continue}}t.lastGeneratedColumn=1/0}},i.prototype.originalPositionFor=function(e){var t={generatedLine:s.getArg(e,"line"),generatedColumn:s.getArg(e,"column")},n=this._findMapping(t,this._generatedMappings,"generatedLine","generatedColumn",s.compareByGeneratedPositionsDeflated,s.getArg(e,"bias",r.GREATEST_LOWER_BOUND));if(n>=0){var i=this._generatedMappings[n];if(i.generatedLine===t.generatedLine){var o=s.getArg(i,"source",null);null!==o&&(o=this._sources.at(o),o=s.computeSourceURL(this.sourceRoot,o,this._sourceMapURL));var a=s.getArg(i,"name",null);return null!==a&&(a=this._names.at(a)),{source:o,line:s.getArg(i,"originalLine",null),column:s.getArg(i,"originalColumn",null),name:a}}}return{source:null,line:null,column:null,name:null}},i.prototype.hasContentsOfAllSources=function(){return!!this.sourcesContent&&(this.sourcesContent.length>=this._sources.size()&&!this.sourcesContent.some(function(e){return null==e}))},i.prototype.sourceContentFor=function(e,t){if(!this.sourcesContent)return null;var n=this._findSourceIndex(e);if(n>=0)return this.sourcesContent[n];var r=e;null!=this.sourceRoot&&(r=s.relative(this.sourceRoot,r));var i;if(null!=this.sourceRoot&&(i=s.urlParse(this.sourceRoot))){var o=r.replace(/^file:\/\//,"");if("file"==i.scheme&&this._sources.has(o))return this.sourcesContent[this._sources.indexOf(o)];if((!i.path||"/"==i.path)&&this._sources.has("/"+r))return this.sourcesContent[this._sources.indexOf("/"+r)]}if(t)return null;throw new Error('"'+r+'" is not in the SourceMap.')},i.prototype.generatedPositionFor=function(e){var t=s.getArg(e,"source");if((t=this._findSourceIndex(t))<0)return{line:null,column:null,lastColumn:null};var n={source:t,originalLine:s.getArg(e,"line"),originalColumn:s.getArg(e,"column")},i=this._findMapping(n,this._originalMappings,"originalLine","originalColumn",s.compareByOriginalPositions,s.getArg(e,"bias",r.GREATEST_LOWER_BOUND));if(i>=0){var o=this._originalMappings[i];if(o.source===n.source)return{line:s.getArg(o,"generatedLine",null),column:s.getArg(o,"generatedColumn",null),lastColumn:s.getArg(o,"lastGeneratedColumn",null)}}return{line:null,column:null,lastColumn:null}},t.BasicSourceMapConsumer=i,a.prototype=Object.create(r.prototype),a.prototype.constructor=r,a.prototype._version=3,Object.defineProperty(a.prototype,"sources",{get:function(){for(var e=[],t=0;t<this._sections.length;t++)for(var n=0;n<this._sections[t].consumer.sources.length;n++)e.push(this._sections[t].consumer.sources[n]);return e}}),a.prototype.originalPositionFor=function(e){var t={generatedLine:s.getArg(e,"line"),generatedColumn:s.getArg(e,"column")},n=u.search(t,this._sections,function(e,t){var n=e.generatedLine-t.generatedOffset.generatedLine;return n||e.generatedColumn-t.generatedOffset.generatedColumn}),r=this._sections[n];return r?r.consumer.originalPositionFor({line:t.generatedLine-(r.generatedOffset.generatedLine-1),column:t.generatedColumn-(r.generatedOffset.generatedLine===t.generatedLine?r.generatedOffset.generatedColumn-1:0),bias:e.bias}):{source:null,line:null,column:null,name:null}},a.prototype.hasContentsOfAllSources=function(){return this._sections.every(function(e){return e.consumer.hasContentsOfAllSources()})},a.prototype.sourceContentFor=function(e,t){for(var n=0;n<this._sections.length;n++){var r=this._sections[n],i=r.consumer.sourceContentFor(e,!0);if(i)return i}if(t)return null;throw new Error('"'+e+'" is not in the SourceMap.')},a.prototype.generatedPositionFor=function(e){for(var t=0;t<this._sections.length;t++){var n=this._sections[t];if(-1!==n.consumer._findSourceIndex(s.getArg(e,"source"))){var r=n.consumer.generatedPositionFor(e);if(r){return{line:r.line+(n.generatedOffset.generatedLine-1),column:r.column+(n.generatedOffset.generatedLine===r.line?n.generatedOffset.generatedColumn-1:0)}}}}return{line:null,column:null}},a.prototype._parseMappings=function(e,t){this.__generatedMappings=[],this.__originalMappings=[];for(var n=0;n<this._sections.length;n++)for(var r=this._sections[n],i=r.consumer._generatedMappings,o=0;o<i.length;o++){var a=i[o],u=r.consumer._sources.at(a.source);u=s.computeSourceURL(r.consumer.sourceRoot,u,this._sourceMapURL),this._sources.add(u),u=this._sources.indexOf(u);var l=null;a.name&&(l=r.consumer._names.at(a.name),this._names.add(l),l=this._names.indexOf(l));var c={source:u,generatedLine:a.generatedLine+(r.generatedOffset.generatedLine-1),generatedColumn:a.generatedColumn+(r.generatedOffset.generatedLine===a.generatedLine?r.generatedOffset.generatedColumn-1:0),originalLine:a.originalLine,originalColumn:a.originalColumn,name:l};this.__generatedMappings.push(c),"number"==typeof c.originalLine&&this.__originalMappings.push(c)}p(this.__generatedMappings,s.compareByGeneratedPositionsDeflated),p(this.__originalMappings,s.compareByOriginalPositions)},t.IndexedSourceMapConsumer=a},function(e,t,n){function r(e,t,n,r,i){this.children=[],this.sourceContents={},this.line=null==e?null:e,this.column=null==t?null:t,this.source=null==n?null:n,this.name=null==i?null:i,this[s]=!0,null!=r&&this.add(r)}var i=n(441).SourceMapGenerator,o=n(121),a=/(\r?\n)/,s="$$$isSourceNode$$$";r.fromStringWithSourceMap=function(e,t,n){function i(e,t){if(null===e||void 0===e.source)s.add(t);else{var i=n?o.join(n,e.source):e.source;s.add(new r(e.originalLine,e.originalColumn,i,t,e.name))}}var s=new r,u=e.split(a),l=0,c=function(){function e(){return l<u.length?u[l++]:void 0}return e()+(e()||"")},p=1,f=0,h=null;return t.eachMapping(function(e){if(null!==h){if(!(p<e.generatedLine)){var t=u[l]||"",n=t.substr(0,e.generatedColumn-f);return u[l]=t.substr(e.generatedColumn-f),f=e.generatedColumn,i(h,n),void(h=e)}i(h,c()),p++,f=0}for(;p<e.generatedLine;)s.add(c()),p++;if(f<e.generatedColumn){var t=u[l]||"";s.add(t.substr(0,e.generatedColumn)),u[l]=t.substr(e.generatedColumn),f=e.generatedColumn}h=e},this),l<u.length&&(h&&i(h,c()),s.add(u.splice(l).join(""))),t.sources.forEach(function(e){var r=t.sourceContentFor(e);null!=r&&(null!=n&&(e=o.join(n,e)),s.setSourceContent(e,r))}),s},r.prototype.add=function(e){if(Array.isArray(e))e.forEach(function(e){this.add(e)},this);else{if(!e[s]&&"string"!=typeof e)throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got "+e);e&&this.children.push(e)}return this},r.prototype.prepend=function(e){if(Array.isArray(e))for(var t=e.length-1;t>=0;t--)this.prepend(e[t]);else{if(!e[s]&&"string"!=typeof e)throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got "+e);this.children.unshift(e)}return this},r.prototype.walk=function(e){for(var t,n=0,r=this.children.length;n<r;n++)t=this.children[n],t[s]?t.walk(e):""!==t&&e(t,{source:this.source,line:this.line,column:this.column,name:this.name})},r.prototype.join=function(e){var t,n,r=this.children.length;if(r>0){for(t=[],n=0;n<r-1;n++)t.push(this.children[n]),t.push(e);t.push(this.children[n]),this.children=t}return this},r.prototype.replaceRight=function(e,t){var n=this.children[this.children.length-1];return n[s]?n.replaceRight(e,t):"string"==typeof n?this.children[this.children.length-1]=n.replace(e,t):this.children.push("".replace(e,t)),this},r.prototype.setSourceContent=function(e,t){this.sourceContents[o.toSetString(e)]=t},r.prototype.walkSourceContents=function(e){for(var t=0,n=this.children.length;t<n;t++)this.children[t][s]&&this.children[t].walkSourceContents(e);for(var r=Object.keys(this.sourceContents),t=0,n=r.length;t<n;t++)e(o.fromSetString(r[t]),this.sourceContents[r[t]])},r.prototype.toString=function(){var e="";return this.walk(function(t){e+=t}),e},r.prototype.toStringWithSourceMap=function(e){var t={code:"",line:1,column:0},n=new i(e),r=!1,o=null,a=null,s=null,u=null;return this.walk(function(e,i){t.code+=e,null!==i.source&&null!==i.line&&null!==i.column?(o===i.source&&a===i.line&&s===i.column&&u===i.name||n.addMapping({source:i.source,original:{line:i.line,column:i.column},generated:{line:t.line,column:t.column},name:i.name}),o=i.source,a=i.line,s=i.column,u=i.name,r=!0):r&&(n.addMapping({generated:{line:t.line,column:t.column}}),o=null,r=!1);for(var l=0,c=e.length;l<c;l++)10===e.charCodeAt(l)?(t.line++,t.column=0,l+1===c?(o=null,r=!1):r&&n.addMapping({source:i.source,original:{line:i.line,column:i.column},generated:{line:t.line,column:t.column},name:i.name})):t.column++}),this.walkSourceContents(function(e,t){n.setSourceContent(e,t)}),{code:t.code,map:n}},t.SourceNode=r},function(e,t,n){"use strict";function r(e,t,n,r,i){}e.exports=r},function(e,t,n){"use strict";var r=n(32),i=n(8),o=n(444);e.exports=function(){function e(e,t,n,r,a,s){s!==o&&i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=r,n.PropTypes=n,n}},function(e,t,n){"use strict";var r=n(32),i=n(8),o=n(10),a=n(13),s=n(444),u=n(995);e.exports=function(e,t){function n(e){var t=e&&(C&&e[C]||e[A]);if("function"==typeof t)return t}function l(e,t){return e===t?0!==e||1/e==1/t:e!==e&&t!==t}function c(e){this.message=e,this.stack=""}function p(e){function n(n,r,o,a,u,l,p){if(a=a||D,l=l||o,p!==s)if(t)i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[o]?n?new c(null===r[o]?"The "+u+" `"+l+"` is marked as required in `"+a+"`, but its value is `null`.":"The "+u+" `"+l+"` is marked as required in `"+a+"`, but its value is `undefined`."):null:e(r,o,a,u,l)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function f(e){function t(t,n,r,i,o,a){var s=t[n];if(w(s)!==e)return new c("Invalid "+i+" `"+o+"` of type `"+k(s)+"` supplied to `"+r+"`, expected `"+e+"`.");return null}return p(t)}function h(e){function t(t,n,r,i,o){if("function"!=typeof e)return new c("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var a=t[n];if(!Array.isArray(a)){return new c("Invalid "+i+" `"+o+"` of type `"+w(a)+"` supplied to `"+r+"`, expected an array.")}for(var u=0;u<a.length;u++){var l=e(a,u,r,i,o+"["+u+"]",s);if(l instanceof Error)return l}return null}return p(t)}function d(e){function t(t,n,r,i,o){if(!(t[n]instanceof e)){var a=e.name||D;return new c("Invalid "+i+" `"+o+"` of type `"+S(t[n])+"` supplied to `"+r+"`, expected instance of `"+a+"`.")}return null}return p(t)}function m(e){function t(t,n,r,i,o){for(var a=t[n],s=0;s<e.length;s++)if(l(a,e[s]))return null;return new c("Invalid "+i+" `"+o+"` of value `"+a+"` supplied to `"+r+"`, expected one of "+JSON.stringify(e)+".")}return Array.isArray(e)?p(t):r.thatReturnsNull}function v(e){function t(t,n,r,i,o){if("function"!=typeof e)return new c("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var a=t[n],u=w(a);if("object"!==u)return new c("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected an object.");for(var l in a)if(a.hasOwnProperty(l)){var p=e(a,l,r,i,o+"."+l,s);if(p instanceof Error)return p}return null}return p(t)}function g(e){function t(t,n,r,i,o){for(var a=0;a<e.length;a++){if(null==(0,e[a])(t,n,r,i,o,s))return null}return new c("Invalid "+i+" `"+o+"` supplied to `"+r+"`.")}if(!Array.isArray(e))return r.thatReturnsNull;for(var n=0;n<e.length;n++){var i=e[n];if("function"!=typeof i)return o(!1,"Invalid argument supplied to oneOfType. Expected an array of check functions, but received %s at index %s.",E(i),n),r.thatReturnsNull}return p(t)}function y(e){function t(t,n,r,i,o){var a=t[n],u=w(a);if("object"!==u)return new c("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected `object`.");for(var l in e){var p=e[l];if(p){var f=p(a,l,r,i,o+"."+l,s);if(f)return f}}return null}return p(t)}function _(e){function t(t,n,r,i,o){var u=t[n],l=w(u);if("object"!==l)return new c("Invalid "+i+" `"+o+"` of type `"+l+"` supplied to `"+r+"`, expected `object`.");var p=a({},t[n],e);for(var f in p){var h=e[f];if(!h)return new c("Invalid "+i+" `"+o+"` key `"+f+"` supplied to `"+r+"`.\nBad object: "+JSON.stringify(t[n],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(e),null,"  "));var d=h(u,f,r,i,o+"."+f,s);if(d)return d}return null}return p(t)}function b(t){switch(typeof t){case"number":case"string":case"undefined":return!0;case"boolean":return!t;case"object":if(Array.isArray(t))return t.every(b);if(null===t||e(t))return!0;var r=n(t);if(!r)return!1;var i,o=r.call(t);if(r!==t.entries){for(;!(i=o.next()).done;)if(!b(i.value))return!1}else for(;!(i=o.next()).done;){var a=i.value;if(a&&!b(a[1]))return!1}return!0;default:return!1}}function x(e,t){return"symbol"===e||("Symbol"===t["@@toStringTag"]||"function"==typeof Symbol&&t instanceof Symbol)}function w(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":x(t,e)?"symbol":t}function k(e){if(void 0===e||null===e)return""+e;var t=w(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}function E(e){var t=k(e);switch(t){case"array":case"object":return"an "+t;case"boolean":case"date":case"regexp":return"a "+t;default:return t}}function S(e){return e.constructor&&e.constructor.name?e.constructor.name:D}var C="function"==typeof Symbol&&Symbol.iterator,A="@@iterator",D="<<anonymous>>",O={array:f("array"),bool:f("boolean"),func:f("function"),number:f("number"),object:f("object"),string:f("string"),symbol:f("symbol"),any:function(){return p(r.thatReturnsNull)}(),arrayOf:h,element:function(){function t(t,n,r,i,o){var a=t[n];if(!e(a)){return new c("Invalid "+i+" `"+o+"` of type `"+w(a)+"` supplied to `"+r+"`, expected a single ReactElement.")}return null}return p(t)}(),instanceOf:d,node:function(){function e(e,t,n,r,i){return b(e[t])?null:new c("Invalid "+r+" `"+i+"` supplied to `"+n+"`, expected a ReactNode.")}return p(e)}(),objectOf:v,oneOf:m,oneOfType:g,shape:y,exact:_};return c.prototype=Error.prototype,O.checkPropTypes=u,O.PropTypes=O,O}},function(e,t,n){(function(e,r){var i;!function(o){function a(e){throw RangeError(P[e])}function s(e,t){for(var n=e.length,r=[];n--;)r[n]=t(e[n]);return r}function u(e,t){var n=e.split("@"),r="";return n.length>1&&(r=n[0]+"@",e=n[1]),e=e.replace(T,"."),r+s(e.split("."),t).join(".")}function l(e){for(var t,n,r=[],i=0,o=e.length;i<o;)t=e.charCodeAt(i++),t>=55296&&t<=56319&&i<o?(n=e.charCodeAt(i++),56320==(64512&n)?r.push(((1023&t)<<10)+(1023&n)+65536):(r.push(t),i--)):r.push(t);return r}function c(e){return s(e,function(e){var t="";return e>65535&&(e-=65536,t+=j(e>>>10&1023|55296),e=56320|1023&e),t+=j(e)}).join("")}function p(e){return e-48<10?e-22:e-65<26?e-65:e-97<26?e-97:x}function f(e,t){return e+22+75*(e<26)-((0!=t)<<5)}function h(e,t,n){var r=0;for(e=n?R(e/S):e>>1,e+=R(e/t);e>I*k>>1;r+=x)e=R(e/I);return R(r+(I+1)*e/(e+E))}function d(e){var t,n,r,i,o,s,u,l,f,d,m=[],v=e.length,g=0,y=A,_=C;for(n=e.lastIndexOf(D),n<0&&(n=0),r=0;r<n;++r)e.charCodeAt(r)>=128&&a("not-basic"),m.push(e.charCodeAt(r));for(i=n>0?n+1:0;i<v;){for(o=g,s=1,u=x;i>=v&&a("invalid-input"),l=p(e.charCodeAt(i++)),(l>=x||l>R((b-g)/s))&&a("overflow"),g+=l*s,f=u<=_?w:u>=_+k?k:u-_,!(l<f);u+=x)d=x-f,s>R(b/d)&&a("overflow"),s*=d;t=m.length+1,_=h(g-o,t,0==o),R(g/t)>b-y&&a("overflow"),y+=R(g/t),g%=t,m.splice(g++,0,y)}return c(m)}function m(e){var t,n,r,i,o,s,u,c,p,d,m,v,g,y,_,E=[];for(e=l(e),v=e.length,t=A,n=0,o=C,s=0;s<v;++s)(m=e[s])<128&&E.push(j(m));for(r=i=E.length,i&&E.push(D);r<v;){for(u=b,s=0;s<v;++s)(m=e[s])>=t&&m<u&&(u=m);for(g=r+1,u-t>R((b-n)/g)&&a("overflow"),n+=(u-t)*g,t=u,s=0;s<v;++s)if(m=e[s],m<t&&++n>b&&a("overflow"),m==t){for(c=n,p=x;d=p<=o?w:p>=o+k?k:p-o,!(c<d);p+=x)_=c-d,y=x-d,E.push(j(f(d+_%y,0))),c=R(_/y);E.push(j(f(c,0))),o=h(n,g,r==i),n=0,++r}++n,++t}return E.join("")}function v(e){return u(e,function(e){return O.test(e)?d(e.slice(4).toLowerCase()):e})}function g(e){return u(e,function(e){return M.test(e)?"xn--"+m(e):e})}var y=("object"==typeof t&&t&&t.nodeType,"object"==typeof e&&e&&e.nodeType,"object"==typeof r&&r);var _,b=2147483647,x=36,w=1,k=26,E=38,S=700,C=72,A=128,D="-",O=/^xn--/,M=/[^\x20-\x7E]/,T=/[\x2E\u3002\uFF0E\uFF61]/g,P={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},I=x-w,R=Math.floor,j=String.fromCharCode;_={version:"1.3.2",ucs2:{decode:l,encode:c},decode:d,encode:m,toASCII:g,toUnicode:v},void 0!==(i=function(){return _}.call(t,n,t,e))&&(e.exports=i)}()}).call(t,n(72)(e),n(17))},function(e,t,n){"use strict";var r=n(1001),i=n(1e3),o=n(445);e.exports={formats:o,parse:i,stringify:r}},function(e,t,n){"use strict";var r=n(446),i=Object.prototype.hasOwnProperty,o={allowDots:!1,allowPrototypes:!1,arrayLimit:20,decoder:r.decode,delimiter:"&",depth:5,parameterLimit:1e3,plainObjects:!1,strictNullHandling:!1},a=function(e,t){for(var n={},r=t.ignoreQueryPrefix?e.replace(/^\?/,""):e,a=t.parameterLimit===1/0?void 0:t.parameterLimit,s=r.split(t.delimiter,a),u=0;u<s.length;++u){var l,c,p=s[u],f=p.indexOf("]="),h=-1===f?p.indexOf("="):f+1;-1===h?(l=t.decoder(p,o.decoder),c=t.strictNullHandling?null:""):(l=t.decoder(p.slice(0,h),o.decoder),c=t.decoder(p.slice(h+1),o.decoder)),i.call(n,l)?n[l]=[].concat(n[l]).concat(c):n[l]=c}return n},s=function(e,t,n){for(var r=t,i=e.length-1;i>=0;--i){var o,a=e[i];if("[]"===a)o=[],o=o.concat(r);else{o=n.plainObjects?Object.create(null):{};var s="["===a.charAt(0)&&"]"===a.charAt(a.length-1)?a.slice(1,-1):a,u=parseInt(s,10);!isNaN(u)&&a!==s&&String(u)===s&&u>=0&&n.parseArrays&&u<=n.arrayLimit?(o=[],o[u]=r):o[s]=r}r=o}return r},u=function(e,t,n){if(e){var r=n.allowDots?e.replace(/\.([^.[]+)/g,"[$1]"):e,o=/(\[[^[\]]*])/,a=/(\[[^[\]]*])/g,u=o.exec(r),l=u?r.slice(0,u.index):r,c=[];if(l){if(!n.plainObjects&&i.call(Object.prototype,l)&&!n.allowPrototypes)return;c.push(l)}for(var p=0;null!==(u=a.exec(r))&&p<n.depth;){if(p+=1,!n.plainObjects&&i.call(Object.prototype,u[1].slice(1,-1))&&!n.allowPrototypes)return;c.push(u[1])}return u&&c.push("["+r.slice(u.index)+"]"),s(c,t,n)}};e.exports=function(e,t){var n=t?r.assign({},t):{};if(null!==n.decoder&&void 0!==n.decoder&&"function"!=typeof n.decoder)throw new TypeError("Decoder has to be a function.");if(n.ignoreQueryPrefix=!0===n.ignoreQueryPrefix,n.delimiter="string"==typeof n.delimiter||r.isRegExp(n.delimiter)?n.delimiter:o.delimiter,n.depth="number"==typeof n.depth?n.depth:o.depth,n.arrayLimit="number"==typeof n.arrayLimit?n.arrayLimit:o.arrayLimit,n.parseArrays=!1!==n.parseArrays,n.decoder="function"==typeof n.decoder?n.decoder:o.decoder,n.allowDots="boolean"==typeof n.allowDots?n.allowDots:o.allowDots,n.plainObjects="boolean"==typeof n.plainObjects?n.plainObjects:o.plainObjects,n.allowPrototypes="boolean"==typeof n.allowPrototypes?n.allowPrototypes:o.allowPrototypes,n.parameterLimit="number"==typeof n.parameterLimit?n.parameterLimit:o.parameterLimit,n.strictNullHandling="boolean"==typeof n.strictNullHandling?n.strictNullHandling:o.strictNullHandling,""===e||null===e||void 0===e)return n.plainObjects?Object.create(null):{};for(var i="string"==typeof e?a(e,n):e,s=n.plainObjects?Object.create(null):{},l=Object.keys(i),c=0;c<l.length;++c){var p=l[c],f=u(p,i[p],n);s=r.merge(s,f,n)}return r.compact(s)}},function(e,t,n){"use strict";var r=n(446),i=n(445),o={brackets:function(e){return e+"[]"},indices:function(e,t){return e+"["+t+"]"},repeat:function(e){return e}},a=Date.prototype.toISOString,s={delimiter:"&",encode:!0,encoder:r.encode,encodeValuesOnly:!1,serializeDate:function(e){return a.call(e)},skipNulls:!1,strictNullHandling:!1},u=function e(t,n,i,o,a,u,l,c,p,f,h,d){var m=t;if("function"==typeof l)m=l(n,m);else if(m instanceof Date)m=f(m);else if(null===m){if(o)return u&&!d?u(n,s.encoder):n;m=""}if("string"==typeof m||"number"==typeof m||"boolean"==typeof m||r.isBuffer(m)){if(u){return[h(d?n:u(n,s.encoder))+"="+h(u(m,s.encoder))]}return[h(n)+"="+h(String(m))]}var v=[];if(void 0===m)return v;var g;if(Array.isArray(l))g=l;else{var y=Object.keys(m);g=c?y.sort(c):y}for(var _=0;_<g.length;++_){var b=g[_];a&&null===m[b]||(v=Array.isArray(m)?v.concat(e(m[b],i(n,b),i,o,a,u,l,c,p,f,h,d)):v.concat(e(m[b],n+(p?"."+b:"["+b+"]"),i,o,a,u,l,c,p,f,h,d)))}return v};e.exports=function(e,t){var n=e,a=t?r.assign({},t):{};if(null!==a.encoder&&void 0!==a.encoder&&"function"!=typeof a.encoder)throw new TypeError("Encoder has to be a function.");var l=void 0===a.delimiter?s.delimiter:a.delimiter,c="boolean"==typeof a.strictNullHandling?a.strictNullHandling:s.strictNullHandling,p="boolean"==typeof a.skipNulls?a.skipNulls:s.skipNulls,f="boolean"==typeof a.encode?a.encode:s.encode,h="function"==typeof a.encoder?a.encoder:s.encoder,d="function"==typeof a.sort?a.sort:null,m=void 0!==a.allowDots&&a.allowDots,v="function"==typeof a.serializeDate?a.serializeDate:s.serializeDate,g="boolean"==typeof a.encodeValuesOnly?a.encodeValuesOnly:s.encodeValuesOnly;if(void 0===a.format)a.format=i.default;else if(!Object.prototype.hasOwnProperty.call(i.formatters,a.format))throw new TypeError("Unknown format option provided.");var y,_,b=i.formatters[a.format];"function"==typeof a.filter?(_=a.filter,n=_("",n)):Array.isArray(a.filter)&&(_=a.filter,y=_);var x=[];if("object"!=typeof n||null===n)return"";var w;w=a.arrayFormat in o?a.arrayFormat:"indices"in a?a.indices?"indices":"repeat":"indices";var k=o[w];y||(y=Object.keys(n)),d&&y.sort(d);for(var E=0;E<y.length;++E){var S=y[E];p&&null===n[S]||(x=x.concat(u(n[S],S,k,c,p,f?h:null,_,d,m,v,b,g)))}var C=x.join(l),A=!0===a.addQueryPrefix?"?":"";return C.length>0?A+C:""}},function(e,t,n){"use strict";function r(e,t){return Object.prototype.hasOwnProperty.call(e,t)}e.exports=function(e,t,n,o){t=t||"&",n=n||"=";var a={};if("string"!=typeof e||0===e.length)return a;var s=/\+/g;e=e.split(t);var u=1e3;o&&"number"==typeof o.maxKeys&&(u=o.maxKeys);var l=e.length;u>0&&l>u&&(l=u);for(var c=0;c<l;++c){var p,f,h,d,m=e[c].replace(s,"%20"),v=m.indexOf(n);v>=0?(p=m.substr(0,v),f=m.substr(v+1)):(p=m,f=""),h=decodeURIComponent(p),d=decodeURIComponent(f),r(a,h)?i(a[h])?a[h].push(d):a[h]=[a[h],d]:a[h]=d}return a};var i=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},function(e,t,n){"use strict";function r(e,t){if(e.map)return e.map(t);for(var n=[],r=0;r<e.length;r++)n.push(t(e[r],r));return n}var i=function(e){switch(typeof e){case"string":return e;case"boolean":return e?"true":"false";case"number":return isFinite(e)?e:"";default:return""}};e.exports=function(e,t,n,s){return t=t||"&",n=n||"=",null===e&&(e=void 0),"object"==typeof e?r(a(e),function(a){var s=encodeURIComponent(i(a))+n;return o(e[a])?r(e[a],function(e){return s+encodeURIComponent(i(e))}).join(t):s+encodeURIComponent(i(e[a]))}).join(t):s?encodeURIComponent(i(s))+n+encodeURIComponent(i(e)):""};var o=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},a=Object.keys||function(e){var t=[];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.push(n);return t}},function(e,t,n){"use strict";t.decode=t.parse=n(1002),t.encode=t.stringify=n(1003)},function(e,t,n){"use strict";function r(e){return decodeURIComponent(e.replace(/\+/g," "))}function i(e){for(var t,n=/([^=?&]+)=?([^&]*)/g,i={};t=n.exec(e);i[r(t[1])]=r(t[2]));return i}function o(e,t){t=t||"";var n=[];"string"!=typeof t&&(t="?");for(var r in e)a.call(e,r)&&n.push(encodeURIComponent(r)+"="+encodeURIComponent(e[r]));return n.length?t+n.join("&"):""}var a=Object.prototype.hasOwnProperty;t.stringify=o,t.parse=i},function(e,t,n){(function(t){(function(){var n,r,i,o,a,s;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(n()-a)/1e6},r=t.hrtime,n=function(){var e;return e=r(),1e9*e[0]+e[1]},o=n(),s=1e9*t.uptime(),a=o-s):Date.now?(e.exports=function(){return Date.now()-i},i=Date.now()):(e.exports=function(){return(new Date).getTime()-i},i=(new Date).getTime())}).call(this)}).call(t,n(33))},function(e,t){e.exports='---\nurl: "http://petstore.swagger.io/v2/swagger.json"\ndom_id: "#swagger-ui"\nvalidatorUrl: "https://online.swagger.io/validator"\noauth2RedirectUrl: "http://localhost:3200/oauth2-redirect.html"\n'},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.UnmountClosed=void 0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(447);(t.UnmountClosed=function(e){function t(e){o(this,t);var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.componentWillReceiveProps=function(e){var t=e.isOpened;!n.props.isOpened&&t&&n.setState({forceInitialAnimation:!0,shouldUnmount:!1})},n.onRest=function(){var e=n.props,t=e.isOpened,r=e.onRest;t||n.setState({shouldUnmount:!0}),r&&r.apply(void 0,arguments)},n.state={shouldUnmount:!n.props.isOpened,forceInitialAnimation:!n.props.isOpened},n}return s(t,e),l(t,[{key:"render",value:function(){var e=this.props,t=e.isOpened,n=(e.onRest,i(e,["isOpened","onRest"])),r=this.state,o=r.forceInitialAnimation;return r.shouldUnmount?null:p.default.createElement(d.Collapse,u({forceInitialAnimation:o,isOpened:t,onRest:this.onRest},n))}}]),t}(p.default.PureComponent)).propTypes={isOpened:h.default.bool.isRequired,onRest:h.default.func}},function(e,t,n){"use strict";var r={Properties:{"aria-current":0,"aria-details":0,"aria-disabled":0,"aria-hidden":0,"aria-invalid":0,"aria-keyshortcuts":0,"aria-label":0,"aria-roledescription":0,"aria-autocomplete":0,"aria-checked":0,"aria-expanded":0,"aria-haspopup":0,"aria-level":0,"aria-modal":0,"aria-multiline":0,"aria-multiselectable":0,"aria-orientation":0,"aria-placeholder":0,"aria-pressed":0,"aria-readonly":0,"aria-required":0,"aria-selected":0,"aria-sort":0,"aria-valuemax":0,"aria-valuemin":0,"aria-valuenow":0,"aria-valuetext":0,"aria-atomic":0,"aria-busy":0,"aria-live":0,"aria-relevant":0,"aria-dropeffect":0,"aria-grabbed":0,"aria-activedescendant":0,"aria-colcount":0,"aria-colindex":0,"aria-colspan":0,"aria-controls":0,"aria-describedby":0,"aria-errormessage":0,"aria-flowto":0,"aria-labelledby":0,"aria-owns":0,"aria-posinset":0,"aria-rowcount":0,"aria-rowindex":0,"aria-rowspan":0,"aria-setsize":0},DOMAttributeNames:{},DOMPropertyNames:{}};e.exports=r},function(e,t,n){"use strict";var r=n(14),i=n(378),o={focusDOMComponent:function(){i(r.getNodeFromInstance(this))}};e.exports=o},function(e,t,n){"use strict";function r(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case"topCompositionStart":return S.compositionStart;case"topCompositionEnd":return S.compositionEnd;case"topCompositionUpdate":return S.compositionUpdate}}function o(e,t){return"topKeyDown"===e&&t.keyCode===y}function a(e,t){switch(e){case"topKeyUp":return-1!==g.indexOf(t.keyCode);case"topKeyDown":return t.keyCode!==y;case"topKeyPress":case"topMouseDown":case"topBlur":return!0;default:return!1}}function s(e){var t=e.detail;return"object"==typeof t&&"data"in t?t.data:null}function u(e,t,n,r){var u,l;if(_?u=i(e):A?a(e,n)&&(u=S.compositionEnd):o(e,n)&&(u=S.compositionStart),!u)return null;w&&(A||u!==S.compositionStart?u===S.compositionEnd&&A&&(l=A.getData()):A=d.getPooled(r));var c=m.getPooled(u,t,n,r);if(l)c.data=l;else{var p=s(n);null!==p&&(c.data=p)}return f.accumulateTwoPhaseDispatches(c),c}function l(e,t){switch(e){case"topCompositionEnd":return s(t);case"topKeyPress":return t.which!==k?null:(C=!0,E);case"topTextInput":var n=t.data;return n===E&&C?null:n;default:return null}}function c(e,t){if(A){if("topCompositionEnd"===e||!_&&a(e,t)){var n=A.getData();return d.release(A),A=null,n}return null}switch(e){case"topPaste":return null;case"topKeyPress":return t.which&&!r(t)?String.fromCharCode(t.which):null;case"topCompositionEnd":return w?null:t.data;default:return null}}function p(e,t,n,r){var i;if(!(i=x?l(e,n):c(e,n)))return null;var o=v.getPooled(S.beforeInput,t,n,r);return o.data=i,f.accumulateTwoPhaseDispatches(o),o}var f=n(123),h=n(25),d=n(1017),m=n(1054),v=n(1057),g=[9,13,27,32],y=229,_=h.canUseDOM&&"CompositionEvent"in window,b=null;h.canUseDOM&&"documentMode"in document&&(b=document.documentMode);var x=h.canUseDOM&&"TextEvent"in window&&!b&&!function(){var e=window.opera;return"object"==typeof e&&"function"==typeof e.version&&parseInt(e.version(),10)<=12}(),w=h.canUseDOM&&(!_||b&&b>8&&b<=11),k=32,E=String.fromCharCode(k),S={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["topCompositionEnd","topKeyPress","topTextInput","topPaste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:["topBlur","topCompositionEnd","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:["topBlur","topCompositionStart","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:["topBlur","topCompositionUpdate","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]}},C=!1,A=null,D={eventTypes:S,extractEvents:function(e,t,n,r){return[u(e,t,n,r),p(e,t,n,r)]}};e.exports=D},function(e,t,n){"use strict";var r=n(450),i=n(25),o=(n(39),n(747),n(1063)),a=n(754),s=n(757),u=(n(10),s(function(e){return a(e)})),l=!1,c="cssFloat";if(i.canUseDOM){var p=document.createElement("div").style;try{p.font=""}catch(e){l=!0}void 0===document.documentElement.style.cssFloat&&(c="styleFloat")}var f={createMarkupForStyles:function(e,t){var n="";for(var r in e)if(e.hasOwnProperty(r)){var i=0===r.indexOf("--"),a=e[r];null!=a&&(n+=u(r)+":",n+=o(r,a,t,i)+";")}return n||null},setValueForStyles:function(e,t,n){var i=e.style;for(var a in t)if(t.hasOwnProperty(a)){var s=0===a.indexOf("--"),u=o(a,t[a],n,s);if("float"!==a&&"cssFloat"!==a||(a=c),s)i.setProperty(a,u);else if(u)i[a]=u;else{var p=l&&r.shorthandPropertyExpansions[a];if(p)for(var f in p)i[f]="";else i[a]=""}}}};e.exports=f},function(e,t,n){"use strict";function r(e,t,n){var r=C.getPooled(T.change,e,t,n);return r.type="change",w.accumulateTwoPhaseDispatches(r),r}function i(e){var t=e.nodeName&&e.nodeName.toLowerCase();return"select"===t||"input"===t&&"file"===e.type}function o(e){var t=r(I,e,D(e));S.batchedUpdates(a,t)}function a(e){x.enqueueEvents(e),x.processEventQueue(!1)}function s(e,t){P=e,I=t,P.attachEvent("onchange",o)}function u(){P&&(P.detachEvent("onchange",o),P=null,I=null)}function l(e,t){var n=A.updateValueIfChanged(e),r=!0===t.simulated&&F._allowSimulatedPassThrough;if(n||r)return e}function c(e,t){if("topChange"===e)return t}function p(e,t,n){"topFocus"===e?(u(),s(t,n)):"topBlur"===e&&u()}function f(e,t){P=e,I=t,P.attachEvent("onpropertychange",d)}function h(){P&&(P.detachEvent("onpropertychange",d),P=null,I=null)}function d(e){"value"===e.propertyName&&l(I,e)&&o(e)}function m(e,t,n){"topFocus"===e?(h(),f(t,n)):"topBlur"===e&&h()}function v(e,t,n){if("topSelectionChange"===e||"topKeyUp"===e||"topKeyDown"===e)return l(I,n)}function g(e){var t=e.nodeName;return t&&"input"===t.toLowerCase()&&("checkbox"===e.type||"radio"===e.type)}function y(e,t,n){if("topClick"===e)return l(t,n)}function _(e,t,n){if("topInput"===e||"topChange"===e)return l(t,n)}function b(e,t){if(null!=e){var n=e._wrapperState||t._wrapperState;if(n&&n.controlled&&"number"===t.type){var r=""+t.value;t.getAttribute("value")!==r&&t.setAttribute("value",r)}}}var x=n(122),w=n(123),k=n(25),E=n(14),S=n(44),C=n(51),A=n(466),D=n(252),O=n(253),M=n(468),T={change:{phasedRegistrationNames:{bubbled:"onChange",captured:"onChangeCapture"},dependencies:["topBlur","topChange","topClick","topFocus","topInput","topKeyDown","topKeyUp","topSelectionChange"]}},P=null,I=null,R=!1;k.canUseDOM&&(R=O("change")&&(!document.documentMode||document.documentMode>8));var j=!1;k.canUseDOM&&(j=O("input")&&(!document.documentMode||document.documentMode>9));var F={eventTypes:T,_allowSimulatedPassThrough:!0,_isInputEventSupported:j,extractEvents:function(e,t,n,o){var a,s,u=t?E.getNodeFromInstance(t):window;if(i(u)?R?a=c:s=p:M(u)?j?a=_:(a=v,s=m):g(u)&&(a=y),a){var l=a(e,t,n);if(l){return r(l,n,o)}}s&&s(e,u,t),"topBlur"===e&&b(t,u)}};e.exports=F},function(e,t,n){"use strict";var r=n(11),i=n(88),o=n(25),a=n(750),s=n(32),u=(n(8),{dangerouslyReplaceNodeWithMarkup:function(e,t){if(o.canUseDOM||r("56"),t||r("57"),"HTML"===e.nodeName&&r("58"),"string"==typeof t){var n=a(t,s)[0];e.parentNode.replaceChild(n,e)}else i.replaceChildWithTree(e,t)}});e.exports=u},function(e,t,n){"use strict";var r=["ResponderEventPlugin","SimpleEventPlugin","TapEventPlugin","EnterLeaveEventPlugin","ChangeEventPlugin","SelectEventPlugin","BeforeInputEventPlugin"];e.exports=r},function(e,t,n){"use strict";var r=n(123),i=n(14),o=n(160),a={mouseEnter:{registrationName:"onMouseEnter",dependencies:["topMouseOut","topMouseOver"]},mouseLeave:{registrationName:"onMouseLeave",dependencies:["topMouseOut","topMouseOver"]}},s={eventTypes:a,extractEvents:function(e,t,n,s){if("topMouseOver"===e&&(n.relatedTarget||n.fromElement))return null;if("topMouseOut"!==e&&"topMouseOver"!==e)return null;var u;if(s.window===s)u=s;else{var l=s.ownerDocument;u=l?l.defaultView||l.parentWindow:window}var c,p;if("topMouseOut"===e){c=t;var f=n.relatedTarget||n.toElement;p=f?i.getClosestInstanceFromNode(f):null}else c=null,p=t;if(c===p)return null;var h=null==c?u:i.getNodeFromInstance(c),d=null==p?u:i.getNodeFromInstance(p),m=o.getPooled(a.mouseLeave,c,n,s);m.type="mouseleave",m.target=h,m.relatedTarget=d;var v=o.getPooled(a.mouseEnter,p,n,s);return v.type="mouseenter",v.target=d,v.relatedTarget=h,r.accumulateEnterLeaveDispatches(m,v,c,p),[m,v]}};e.exports=s},function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var i=n(13),o=n(70),a=n(465);i(r.prototype,{destructor:function(){this._root=null,this._startText=null,this._fallbackText=null},getText:function(){return"value"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,i=this.getText(),o=i.length;for(e=0;e<r&&n[e]===i[e];e++);var a=r-e;for(t=1;t<=a&&n[r-t]===i[o-t];t++);var s=t>1?1-t:void 0;return this._fallbackText=i.slice(e,s),this._fallbackText}}),o.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";var r=n(89),i=r.injection.MUST_USE_PROPERTY,o=r.injection.HAS_BOOLEAN_VALUE,a=r.injection.HAS_NUMERIC_VALUE,s=r.injection.HAS_POSITIVE_NUMERIC_VALUE,u=r.injection.HAS_OVERLOADED_BOOLEAN_VALUE,l={isCustomAttribute:RegExp.prototype.test.bind(new RegExp("^(data|aria)-["+r.ATTRIBUTE_NAME_CHAR+"]*$")),Properties:{accept:0,acceptCharset:0,accessKey:0,action:0,allowFullScreen:o,allowTransparency:0,alt:0,as:0,async:o,autoComplete:0,autoPlay:o,capture:o,cellPadding:0,cellSpacing:0,charSet:0,challenge:0,checked:i|o,cite:0,classID:0,className:0,cols:s,colSpan:0,content:0,contentEditable:0,contextMenu:0,controls:o,controlsList:0,coords:0,crossOrigin:0,data:0,dateTime:0,default:o,defer:o,dir:0,disabled:o,download:u,draggable:0,encType:0,form:0,formAction:0,formEncType:0,formMethod:0,formNoValidate:o,formTarget:0,frameBorder:0,headers:0,height:0,hidden:o,high:0,href:0,hrefLang:0,htmlFor:0,httpEquiv:0,icon:0,id:0,inputMode:0,integrity:0,is:0,keyParams:0,keyType:0,kind:0,label:0,lang:0,list:0,loop:o,low:0,manifest:0,marginHeight:0,marginWidth:0,max:0,maxLength:0,media:0,mediaGroup:0,method:0,min:0,minLength:0,multiple:i|o,muted:i|o,name:0,nonce:0,noValidate:o,open:o,optimum:0,pattern:0,placeholder:0,playsInline:o,poster:0,preload:0,profile:0,radioGroup:0,readOnly:o,referrerPolicy:0,rel:0,required:o,reversed:o,role:0,rows:s,rowSpan:a,sandbox:0,scope:0,scoped:o,scrolling:0,seamless:o,selected:i|o,shape:0,size:s,sizes:0,span:s,spellCheck:0,src:0,srcDoc:0,srcLang:0,srcSet:0,start:a,step:0,style:0,summary:0,tabIndex:0,target:0,title:0,type:0,useMap:0,value:0,width:0,wmode:0,wrap:0,about:0,datatype:0,inlist:0,prefix:0,property:0,resource:0,typeof:0,vocab:0,autoCapitalize:0,autoCorrect:0,autoSave:0,color:0,itemProp:0,itemScope:o,itemType:0,itemID:0,itemRef:0,results:0,security:0,unselectable:0},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{},DOMMutationMethods:{value:function(e,t){if(null==t)return e.removeAttribute("value");"number"!==e.type||!1===e.hasAttribute("value")?e.setAttribute("value",""+t):e.validity&&!e.validity.badInput&&e.ownerDocument.activeElement!==e&&e.setAttribute("value",""+t)}}};e.exports=l},function(e,t,n){"use strict";(function(t){function r(e,t,n,r){var i=void 0===e[n];null!=t&&i&&(e[n]=o(t,!0))}var i=n(90),o=n(467),a=(n(244),n(254)),s=n(470);n(10);void 0!==t&&n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1});var u={instantiateChildren:function(e,t,n,i){if(null==e)return null;var o={};return s(e,r,o),o},updateChildren:function(e,t,n,r,s,u,l,c,p){if(t||e){var f,h;for(f in t)if(t.hasOwnProperty(f)){h=e&&e[f];var d=h&&h._currentElement,m=t[f];if(null!=h&&a(d,m))i.receiveComponent(h,m,s,c),t[f]=h;else{h&&(r[f]=i.getHostNode(h),i.unmountComponent(h,!1));var v=o(m,!0);t[f]=v;var g=i.mountComponent(v,s,u,l,c,p);n.push(g)}}for(f in e)!e.hasOwnProperty(f)||t&&t.hasOwnProperty(f)||(h=e[f],r[f]=i.getHostNode(h),i.unmountComponent(h,!1))}},unmountChildren:function(e,t){for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];i.unmountComponent(r,t)}}};e.exports=u}).call(t,n(33))},function(e,t,n){"use strict";var r=n(240),i=n(1027),o={processChildrenUpdates:i.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkup:r.dangerouslyReplaceNodeWithMarkup};e.exports=o},function(e,t,n){"use strict";function r(e){}function i(e){return!(!e.prototype||!e.prototype.isReactComponent)}function o(e){return!(!e.prototype||!e.prototype.isPureReactComponent)}var a=n(11),s=n(13),u=n(92),l=n(246),c=n(52),p=n(247),f=n(124),h=(n(39),n(460)),d=n(90),m=n(144),v=(n(8),n(208)),g=n(254),y=(n(10),{ImpureClass:0,PureClass:1,StatelessFunctional:2});r.prototype.render=function(){var e=f.get(this)._currentElement.type,t=e(this.props,this.context,this.updater);return t};var _=1,b={construct:function(e){this._currentElement=e,this._rootNodeID=0,this._compositeType=null,this._instance=null,this._hostParent=null,this._hostContainerInfo=null,this._updateBatchNumber=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedNodeType=null,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._topLevelWrapper=null,this._pendingCallbacks=null,this._calledComponentWillUnmount=!1},mountComponent:function(e,t,n,s){this._context=s,this._mountOrder=_++,this._hostParent=t,this._hostContainerInfo=n;var l,c=this._currentElement.props,p=this._processContext(s),h=this._currentElement.type,d=e.getUpdateQueue(),v=i(h),g=this._constructComponent(v,c,p,d);v||null!=g&&null!=g.render?o(h)?this._compositeType=y.PureClass:this._compositeType=y.ImpureClass:(l=g,null===g||!1===g||u.isValidElement(g)||a("105",h.displayName||h.name||"Component"),g=new r(h),this._compositeType=y.StatelessFunctional);g.props=c,g.context=p,g.refs=m,g.updater=d,this._instance=g,f.set(g,this);var b=g.state;void 0===b&&(g.state=b=null),("object"!=typeof b||Array.isArray(b))&&a("106",this.getName()||"ReactCompositeComponent"),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var x;return x=g.unstable_handleError?this.performInitialMountWithErrorHandling(l,t,n,e,s):this.performInitialMount(l,t,n,e,s),g.componentDidMount&&e.getReactMountReady().enqueue(g.componentDidMount,g),x},_constructComponent:function(e,t,n,r){return this._constructComponentWithoutOwner(e,t,n,r)},_constructComponentWithoutOwner:function(e,t,n,r){var i=this._currentElement.type;return e?new i(t,n,r):i(t,n,r)},performInitialMountWithErrorHandling:function(e,t,n,r,i){var o,a=r.checkpoint();try{o=this.performInitialMount(e,t,n,r,i)}catch(s){r.rollback(a),this._instance.unstable_handleError(s),this._pendingStateQueue&&(this._instance.state=this._processPendingState(this._instance.props,this._instance.context)),a=r.checkpoint(),this._renderedComponent.unmountComponent(!0),r.rollback(a),o=this.performInitialMount(e,t,n,r,i)}return o},performInitialMount:function(e,t,n,r,i){var o=this._instance,a=0;o.componentWillMount&&(o.componentWillMount(),this._pendingStateQueue&&(o.state=this._processPendingState(o.props,o.context))),void 0===e&&(e=this._renderValidatedComponent());var s=h.getType(e);this._renderedNodeType=s;var u=this._instantiateReactComponent(e,s!==h.EMPTY);this._renderedComponent=u;var l=d.mountComponent(u,r,t,n,this._processChildContext(i),a);return l},getHostNode:function(){return d.getHostNode(this._renderedComponent)},unmountComponent:function(e){if(this._renderedComponent){var t=this._instance;if(t.componentWillUnmount&&!t._calledComponentWillUnmount)if(t._calledComponentWillUnmount=!0,e){var n=this.getName()+".componentWillUnmount()";p.invokeGuardedCallback(n,t.componentWillUnmount.bind(t))}else t.componentWillUnmount();this._renderedComponent&&(d.unmountComponent(this._renderedComponent,e),this._renderedNodeType=null,this._renderedComponent=null,this._instance=null),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=0,this._topLevelWrapper=null,f.remove(t)}},_maskContext:function(e){var t=this._currentElement.type,n=t.contextTypes;if(!n)return m;var r={};for(var i in n)r[i]=e[i];return r},_processContext:function(e){var t=this._maskContext(e);return t},_processChildContext:function(e){var t,n=this._currentElement.type,r=this._instance;if(r.getChildContext&&(t=r.getChildContext()),t){"object"!=typeof n.childContextTypes&&a("107",this.getName()||"ReactCompositeComponent");for(var i in t)i in n.childContextTypes||a("108",this.getName()||"ReactCompositeComponent",i);return s({},e,t)}return e},_checkContextTypes:function(e,t,n){},receiveComponent:function(e,t,n){var r=this._currentElement,i=this._context;this._pendingElement=null,this.updateComponent(t,r,e,i,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement?d.receiveComponent(this,this._pendingElement,e,this._context):null!==this._pendingStateQueue||this._pendingForceUpdate?this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context):this._updateBatchNumber=null},updateComponent:function(e,t,n,r,i){var o=this._instance;null==o&&a("136",this.getName()||"ReactCompositeComponent");var s,u=!1;this._context===i?s=o.context:(s=this._processContext(i),u=!0);var l=t.props,c=n.props;t!==n&&(u=!0),u&&o.componentWillReceiveProps&&o.componentWillReceiveProps(c,s);var p=this._processPendingState(c,s),f=!0;this._pendingForceUpdate||(o.shouldComponentUpdate?f=o.shouldComponentUpdate(c,p,s):this._compositeType===y.PureClass&&(f=!v(l,c)||!v(o.state,p))),this._updateBatchNumber=null,f?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,c,p,s,e,i)):(this._currentElement=n,this._context=i,o.props=c,o.state=p,o.context=s)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,i=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;if(i&&1===r.length)return r[0];for(var o=s({},i?r[0]:n.state),a=i?1:0;a<r.length;a++){var u=r[a];s(o,"function"==typeof u?u.call(n,o,e,t):u)}return o},_performComponentUpdate:function(e,t,n,r,i,o){var a,s,u,l=this._instance,c=Boolean(l.componentDidUpdate);c&&(a=l.props,s=l.state,u=l.context),l.componentWillUpdate&&l.componentWillUpdate(t,n,r),this._currentElement=e,this._context=o,l.props=t,l.state=n,l.context=r,this._updateRenderedComponent(i,o),c&&i.getReactMountReady().enqueue(l.componentDidUpdate.bind(l,a,s,u),l)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,i=this._renderValidatedComponent(),o=0;if(g(r,i))d.receiveComponent(n,i,e,this._processChildContext(t));else{var a=d.getHostNode(n);d.unmountComponent(n,!1);var s=h.getType(i);this._renderedNodeType=s;var u=this._instantiateReactComponent(i,s!==h.EMPTY);this._renderedComponent=u;var l=d.mountComponent(u,e,this._hostParent,this._hostContainerInfo,this._processChildContext(t),o);this._replaceNodeWithMarkup(a,l,n)}},_replaceNodeWithMarkup:function(e,t,n){l.replaceNodeWithMarkup(e,t,n)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e=this._instance;return e.render()},_renderValidatedComponent:function(){var e;if(this._compositeType!==y.StatelessFunctional){c.current=this;try{e=this._renderValidatedComponentWithoutOwnerOrContext()}finally{c.current=null}}else e=this._renderValidatedComponentWithoutOwnerOrContext();return null===e||!1===e||u.isValidElement(e)||a("109",this.getName()||"ReactCompositeComponent"),e},attachRef:function(e,t){var n=this.getPublicInstance();null==n&&a("110");var r=t.getPublicInstance();(n.refs===m?n.refs={}:n.refs)[e]=r},detachRef:function(e){delete this.getPublicInstance().refs[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){var e=this._instance;return this._compositeType===y.StatelessFunctional?null:e},_instantiateReactComponent:null};e.exports=b},function(e,t,n){"use strict";var r=n(14),i=n(1035),o=n(459),a=n(90),s=n(44),u=n(1048),l=n(1064),c=n(464),p=n(1071);n(10);i.inject();var f={findDOMNode:l,render:o.render,unmountComponentAtNode:o.unmountComponentAtNode,version:u,unstable_batchedUpdates:s.batchedUpdates,unstable_renderSubtreeIntoContainer:p};"undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({ComponentTree:{getClosestInstanceFromNode:r.getClosestInstanceFromNode,getNodeFromInstance:function(e){return e._renderedComponent&&(e=c(e)),e?r.getNodeFromInstance(e):null}},Mount:o,Reconciler:a});e.exports=f},function(e,t,n){"use strict";function r(e){if(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return" This DOM node was rendered by `"+n+"`."}}return""}function i(e,t){t&&(X[e._tag]&&(null!=t.children||null!=t.dangerouslySetInnerHTML)&&v("137",e._tag,e._currentElement._owner?" Check the render method of "+e._currentElement._owner.getName()+".":""),null!=t.dangerouslySetInnerHTML&&(null!=t.children&&v("60"),"object"==typeof t.dangerouslySetInnerHTML&&W in t.dangerouslySetInnerHTML||v("61")),null!=t.style&&"object"!=typeof t.style&&v("62",r(e)))}function o(e,t,n,r){if(!(r instanceof R)){var i=e._hostContainerInfo,o=i._node&&i._node.nodeType===H,s=o?i._node:i._ownerDocument;q(t,s),r.getReactMountReady().enqueue(a,{inst:e,registrationName:t,listener:n})}}function a(){var e=this;E.putListener(e.inst,e.registrationName,e.listener)}function s(){var e=this;O.postMountWrapper(e)}function u(){var e=this;P.postMountWrapper(e)}function l(){var e=this;M.postMountWrapper(e)}function c(){F.track(this)}function p(){var e=this;e._rootNodeID||v("63");var t=L(e);switch(t||v("64"),e._tag){case"iframe":case"object":e._wrapperState.listeners=[C.trapBubbledEvent("topLoad","load",t)];break;case"video":case"audio":e._wrapperState.listeners=[];for(var n in G)G.hasOwnProperty(n)&&e._wrapperState.listeners.push(C.trapBubbledEvent(n,G[n],t));break;case"source":e._wrapperState.listeners=[C.trapBubbledEvent("topError","error",t)];break;case"img":e._wrapperState.listeners=[C.trapBubbledEvent("topError","error",t),C.trapBubbledEvent("topLoad","load",t)];break;case"form":e._wrapperState.listeners=[C.trapBubbledEvent("topReset","reset",t),C.trapBubbledEvent("topSubmit","submit",t)];break;case"input":case"select":case"textarea":e._wrapperState.listeners=[C.trapBubbledEvent("topInvalid","invalid",t)]}}function f(){T.postUpdateWrapper(this)}function h(e){Z.call($,e)||(Y.test(e)||v("65",e),$[e]=!0)}function d(e,t){return e.indexOf("-")>=0||null!=t.is}function m(e){var t=e.type;h(t),this._currentElement=e,this._tag=t.toLowerCase(),this._namespaceURI=null,this._renderedChildren=null,this._previousStyle=null,this._previousStyleCopy=null,this._hostNode=null,this._hostParent=null,this._rootNodeID=0,this._domID=0,this._hostContainerInfo=null,this._wrapperState=null,this._topLevelWrapper=null,this._flags=0}var v=n(11),g=n(13),y=n(1010),_=n(1012),b=n(88),x=n(241),w=n(89),k=n(452),E=n(122),S=n(242),C=n(159),A=n(453),D=n(14),O=n(1028),M=n(1029),T=n(454),P=n(1032),I=(n(39),n(1041)),R=n(1046),j=(n(32),n(162)),F=(n(8),n(253),n(208),n(466)),N=(n(255),n(10),A),B=E.deleteListener,L=D.getNodeFromInstance,q=C.listenTo,z=S.registrationNameModules,U={string:!0,number:!0},W="__html",V={children:null,dangerouslySetInnerHTML:null,suppressContentEditableWarning:null},H=11,G={topAbort:"abort",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topSeeked:"seeked",topSeeking:"seeking",topStalled:"stalled",topSuspend:"suspend",topTimeUpdate:"timeupdate",topVolumeChange:"volumechange",topWaiting:"waiting"},J={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},K={listing:!0,pre:!0,textarea:!0},X=g({menuitem:!0},J),Y=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,$={},Z={}.hasOwnProperty,Q=1;m.displayName="ReactDOMComponent",m.Mixin={mountComponent:function(e,t,n,r){this._rootNodeID=Q++,this._domID=n._idCounter++,this._hostParent=t,this._hostContainerInfo=n;var o=this._currentElement.props;switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":this._wrapperState={listeners:null},e.getReactMountReady().enqueue(p,this);break;case"input":O.mountWrapper(this,o,t),o=O.getHostProps(this,o),e.getReactMountReady().enqueue(c,this),e.getReactMountReady().enqueue(p,this);break;case"option":M.mountWrapper(this,o,t),o=M.getHostProps(this,o);break;case"select":T.mountWrapper(this,o,t),o=T.getHostProps(this,o),e.getReactMountReady().enqueue(p,this);break;case"textarea":P.mountWrapper(this,o,t),o=P.getHostProps(this,o),e.getReactMountReady().enqueue(c,this),e.getReactMountReady().enqueue(p,this)}i(this,o);var a,f;null!=t?(a=t._namespaceURI,f=t._tag):n._tag&&(a=n._namespaceURI,f=n._tag),(null==a||a===x.svg&&"foreignobject"===f)&&(a=x.html),a===x.html&&("svg"===this._tag?a=x.svg:"math"===this._tag&&(a=x.mathml)),this._namespaceURI=a;var h;if(e.useCreateElement){var d,m=n._ownerDocument;if(a===x.html)if("script"===this._tag){var v=m.createElement("div"),g=this._currentElement.type;v.innerHTML="<"+g+"></"+g+">",d=v.removeChild(v.firstChild)}else d=o.is?m.createElement(this._currentElement.type,o.is):m.createElement(this._currentElement.type);else d=m.createElementNS(a,this._currentElement.type);D.precacheNode(this,d),this._flags|=N.hasCachedChildNodes,this._hostParent||k.setAttributeForRoot(d),this._updateDOMProperties(null,o,e);var _=b(d);this._createInitialChildren(e,o,r,_),h=_}else{var w=this._createOpenTagMarkupAndPutListeners(e,o),E=this._createContentMarkup(e,o,r);h=!E&&J[this._tag]?w+"/>":w+">"+E+"</"+this._currentElement.type+">"}switch(this._tag){case"input":e.getReactMountReady().enqueue(s,this),o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"textarea":e.getReactMountReady().enqueue(u,this),o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"select":case"button":o.autoFocus&&e.getReactMountReady().enqueue(y.focusDOMComponent,this);break;case"option":e.getReactMountReady().enqueue(l,this)}return h},_createOpenTagMarkupAndPutListeners:function(e,t){var n="<"+this._currentElement.type;for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if(null!=i)if(z.hasOwnProperty(r))i&&o(this,r,i,e);else{"style"===r&&(i&&(i=this._previousStyleCopy=g({},t.style)),i=_.createMarkupForStyles(i,this));var a=null;null!=this._tag&&d(this._tag,t)?V.hasOwnProperty(r)||(a=k.createMarkupForCustomAttribute(r,i)):a=k.createMarkupForProperty(r,i),a&&(n+=" "+a)}}return e.renderToStaticMarkup?n:(this._hostParent||(n+=" "+k.createMarkupForRoot()),n+=" "+k.createMarkupForID(this._domID))},_createContentMarkup:function(e,t,n){var r="",i=t.dangerouslySetInnerHTML;if(null!=i)null!=i.__html&&(r=i.__html);else{var o=U[typeof t.children]?t.children:null,a=null!=o?null:t.children;if(null!=o)r=j(o);else if(null!=a){var s=this.mountChildren(a,e,n);r=s.join("")}}return K[this._tag]&&"\n"===r.charAt(0)?"\n"+r:r},_createInitialChildren:function(e,t,n,r){var i=t.dangerouslySetInnerHTML;if(null!=i)null!=i.__html&&b.queueHTML(r,i.__html);else{var o=U[typeof t.children]?t.children:null,a=null!=o?null:t.children;if(null!=o)""!==o&&b.queueText(r,o);else if(null!=a)for(var s=this.mountChildren(a,e,n),u=0;u<s.length;u++)b.queueChild(r,s[u])}},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,r){var o=t.props,a=this._currentElement.props;switch(this._tag){case"input":o=O.getHostProps(this,o),a=O.getHostProps(this,a);break;case"option":o=M.getHostProps(this,o),a=M.getHostProps(this,a);break;case"select":o=T.getHostProps(this,o),a=T.getHostProps(this,a);break;case"textarea":o=P.getHostProps(this,o),a=P.getHostProps(this,a)}switch(i(this,a),this._updateDOMProperties(o,a,e),this._updateDOMChildren(o,a,e,r),this._tag){case"input":O.updateWrapper(this),F.updateValueIfChanged(this);break;case"textarea":P.updateWrapper(this);break;case"select":e.getReactMountReady().enqueue(f,this)}},_updateDOMProperties:function(e,t,n){var r,i,a;for(r in e)if(!t.hasOwnProperty(r)&&e.hasOwnProperty(r)&&null!=e[r])if("style"===r){var s=this._previousStyleCopy;for(i in s)s.hasOwnProperty(i)&&(a=a||{},a[i]="");this._previousStyleCopy=null}else z.hasOwnProperty(r)?e[r]&&B(this,r):d(this._tag,e)?V.hasOwnProperty(r)||k.deleteValueForAttribute(L(this),r):(w.properties[r]||w.isCustomAttribute(r))&&k.deleteValueForProperty(L(this),r);for(r in t){var u=t[r],l="style"===r?this._previousStyleCopy:null!=e?e[r]:void 0;if(t.hasOwnProperty(r)&&u!==l&&(null!=u||null!=l))if("style"===r)if(u?u=this._previousStyleCopy=g({},u):this._previousStyleCopy=null,l){for(i in l)!l.hasOwnProperty(i)||u&&u.hasOwnProperty(i)||(a=a||{},a[i]="");for(i in u)u.hasOwnProperty(i)&&l[i]!==u[i]&&(a=a||{},a[i]=u[i])}else a=u;else if(z.hasOwnProperty(r))u?o(this,r,u,n):l&&B(this,r);else if(d(this._tag,t))V.hasOwnProperty(r)||k.setValueForAttribute(L(this),r,u);else if(w.properties[r]||w.isCustomAttribute(r)){var c=L(this);null!=u?k.setValueForProperty(c,r,u):k.deleteValueForProperty(c,r)}}a&&_.setValueForStyles(L(this),a,this)},_updateDOMChildren:function(e,t,n,r){var i=U[typeof e.children]?e.children:null,o=U[typeof t.children]?t.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,s=t.dangerouslySetInnerHTML&&t.dangerouslySetInnerHTML.__html,u=null!=i?null:e.children,l=null!=o?null:t.children,c=null!=i||null!=a,p=null!=o||null!=s;null!=u&&null==l?this.updateChildren(null,n,r):c&&!p&&this.updateTextContent(""),null!=o?i!==o&&this.updateTextContent(""+o):null!=s?a!==s&&this.updateMarkup(""+s):null!=l&&this.updateChildren(l,n,r)},getHostNode:function(){return L(this)},unmountComponent:function(e){switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":var t=this._wrapperState.listeners;if(t)for(var n=0;n<t.length;n++)t[n].remove();break;case"input":case"textarea":F.stopTracking(this);break;case"html":case"head":case"body":v("66",this._tag)}this.unmountChildren(e),D.uncacheNode(this),E.deleteAllListeners(this),this._rootNodeID=0,this._domID=0,this._wrapperState=null},getPublicInstance:function(){return L(this)}},g(m.prototype,m.Mixin,I.Mixin),e.exports=m},function(e,t,n){"use strict";function r(e,t){var n={_topLevelWrapper:e,_idCounter:1,_ownerDocument:t?t.nodeType===i?t:t.ownerDocument:null,_node:t,_tag:t?t.nodeName.toLowerCase():null,_namespaceURI:t?t.namespaceURI:null};return n}var i=(n(255),9);e.exports=r},function(e,t,n){"use strict";var r=n(13),i=n(88),o=n(14),a=function(e){this._currentElement=null,this._hostNode=null,this._hostParent=null,this._hostContainerInfo=null,this._domID=0};r(a.prototype,{mountComponent:function(e,t,n,r){var a=n._idCounter++;this._domID=a,this._hostParent=t,this._hostContainerInfo=n;var s=" react-empty: "+this._domID+" ";if(e.useCreateElement){var u=n._ownerDocument,l=u.createComment(s);return o.precacheNode(this,l),i(l)}return e.renderToStaticMarkup?"":"\x3c!--"+s+"--\x3e"},receiveComponent:function(){},getHostNode:function(){return o.getNodeFromInstance(this)},unmountComponent:function(){o.uncacheNode(this)}}),e.exports=a},function(e,t,n){"use strict";var r={useCreateElement:!0,useFiber:!1};e.exports=r},function(e,t,n){"use strict";var r=n(240),i=n(14),o={dangerouslyProcessChildrenUpdates:function(e,t){var n=i.getNodeFromInstance(e);r.processUpdates(n,t)}};e.exports=o},function(e,t,n){"use strict";function r(){this._rootNodeID&&f.updateWrapper(this)}function i(e){return"checkbox"===e.type||"radio"===e.type?null!=e.checked:null!=e.value}function o(e){var t=this._currentElement.props,n=l.executeOnChange(t,e);p.asap(r,this);var i=t.name;if("radio"===t.type&&null!=i){for(var o=c.getNodeFromInstance(this),s=o;s.parentNode;)s=s.parentNode;for(var u=s.querySelectorAll("input[name="+JSON.stringify(""+i)+'][type="radio"]'),f=0;f<u.length;f++){var h=u[f];if(h!==o&&h.form===o.form){var d=c.getInstanceFromNode(h);d||a("90"),p.asap(r,d)}}}return n}var a=n(11),s=n(13),u=n(452),l=n(245),c=n(14),p=n(44),f=(n(8),n(10),{getHostProps:function(e,t){var n=l.getValue(t),r=l.getChecked(t);return s({type:void 0,step:void 0,min:void 0,max:void 0},t,{defaultChecked:void 0,defaultValue:void 0,value:null!=n?n:e._wrapperState.initialValue,checked:null!=r?r:e._wrapperState.initialChecked,onChange:e._wrapperState.onChange})},mountWrapper:function(e,t){var n=t.defaultValue;e._wrapperState={initialChecked:null!=t.checked?t.checked:t.defaultChecked,initialValue:null!=t.value?t.value:n,listeners:null,onChange:o.bind(e),controlled:i(t)}},updateWrapper:function(e){var t=e._currentElement.props,n=t.checked;null!=n&&u.setValueForProperty(c.getNodeFromInstance(e),"checked",n||!1);var r=c.getNodeFromInstance(e),i=l.getValue(t);if(null!=i)if(0===i&&""===r.value)r.value="0";else if("number"===t.type){var o=parseFloat(r.value,10)||0;(i!=o||i==o&&r.value!=i)&&(r.value=""+i)}else r.value!==""+i&&(r.value=""+i);else null==t.value&&null!=t.defaultValue&&r.defaultValue!==""+t.defaultValue&&(r.defaultValue=""+t.defaultValue),null==t.checked&&null!=t.defaultChecked&&(r.defaultChecked=!!t.defaultChecked)},postMountWrapper:function(e){var t=e._currentElement.props,n=c.getNodeFromInstance(e);switch(t.type){case"submit":case"reset":break;case"color":case"date":case"datetime":case"datetime-local":case"month":case"time":case"week":n.value="",n.value=n.defaultValue;break;default:n.value=n.value}var r=n.name;""!==r&&(n.name=""),n.defaultChecked=!n.defaultChecked,n.defaultChecked=!n.defaultChecked,""!==r&&(n.name=r)}});e.exports=f},function(e,t,n){"use strict";function r(e){var t="";return o.Children.forEach(e,function(e){null!=e&&("string"==typeof e||"number"==typeof e?t+=e:u||(u=!0))}),t}var i=n(13),o=n(92),a=n(14),s=n(454),u=(n(10),!1),l={mountWrapper:function(e,t,n){var i=null;if(null!=n){var o=n;"optgroup"===o._tag&&(o=o._hostParent),null!=o&&"select"===o._tag&&(i=s.getSelectValueContext(o))}var a=null;if(null!=i){var u;if(u=null!=t.value?t.value+"":r(t.children),a=!1,Array.isArray(i)){for(var l=0;l<i.length;l++)if(""+i[l]===u){a=!0;break}}else a=""+i===u}e._wrapperState={selected:a}},postMountWrapper:function(e){var t=e._currentElement.props;if(null!=t.value){a.getNodeFromInstance(e).setAttribute("value",t.value)}},getHostProps:function(e,t){var n=i({selected:void 0,children:void 0},t);null!=e._wrapperState.selected&&(n.selected=e._wrapperState.selected);var o=r(t.children);return o&&(n.children=o),n}};e.exports=l},function(e,t,n){"use strict";function r(e,t,n,r){return e===n&&t===r}function i(e){var t=document.selection,n=t.createRange(),r=n.text.length,i=n.duplicate();i.moveToElementText(e),i.setEndPoint("EndToStart",n);var o=i.text.length;return{start:o,end:o+r}}function o(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,i=t.anchorOffset,o=t.focusNode,a=t.focusOffset,s=t.getRangeAt(0);try{s.startContainer.nodeType,s.endContainer.nodeType}catch(e){return null}var u=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=u?0:s.toString().length,c=s.cloneRange();c.selectNodeContents(e),c.setEnd(s.startContainer,s.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),f=p?0:c.toString().length,h=f+l,d=document.createRange();d.setStart(n,i),d.setEnd(o,a);var m=d.collapsed;return{start:m?h:f,end:m?f:h}}function a(e,t){var n,r,i=document.selection.createRange().duplicate();void 0===t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),i.moveToElementText(e),i.moveStart("character",n),i.setEndPoint("EndToStart",i),i.moveEnd("character",r-n),i.select()}function s(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,i=Math.min(t.start,r),o=void 0===t.end?i:Math.min(t.end,r);if(!n.extend&&i>o){var a=o;o=i,i=a}var s=l(e,i),u=l(e,o);if(s&&u){var p=document.createRange();p.setStart(s.node,s.offset),n.removeAllRanges(),i>o?(n.addRange(p),n.extend(u.node,u.offset)):(p.setEnd(u.node,u.offset),n.addRange(p))}}}var u=n(25),l=n(1068),c=n(465),p=u.canUseDOM&&"selection"in document&&!("getSelection"in window),f={getOffsets:p?i:o,setOffsets:p?a:s};e.exports=f},function(e,t,n){"use strict";var r=n(11),i=n(13),o=n(240),a=n(88),s=n(14),u=n(162),l=(n(8),n(255),function(e){this._currentElement=e,this._stringText=""+e,this._hostNode=null,this._hostParent=null,this._domID=0,this._mountIndex=0,this._closingComment=null,this._commentNodes=null});i(l.prototype,{mountComponent:function(e,t,n,r){var i=n._idCounter++,o=" react-text: "+i+" ";if(this._domID=i,this._hostParent=t,e.useCreateElement){var l=n._ownerDocument,c=l.createComment(o),p=l.createComment(" /react-text "),f=a(l.createDocumentFragment());return a.queueChild(f,a(c)),this._stringText&&a.queueChild(f,a(l.createTextNode(this._stringText))),a.queueChild(f,a(p)),s.precacheNode(this,c),this._closingComment=p,f}var h=u(this._stringText);return e.renderToStaticMarkup?h:"\x3c!--"+o+"--\x3e"+h+"\x3c!-- /react-text --\x3e"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;if(n!==this._stringText){this._stringText=n;var r=this.getHostNode();o.replaceDelimitedText(r[0],r[1],n)}}},getHostNode:function(){var e=this._commentNodes;if(e)return e;if(!this._closingComment)for(var t=s.getNodeFromInstance(this),n=t.nextSibling;;){if(null==n&&r("67",this._domID),8===n.nodeType&&" /react-text "===n.nodeValue){this._closingComment=n;break}n=n.nextSibling}return e=[this._hostNode,this._closingComment],this._commentNodes=e,e},unmountComponent:function(){this._closingComment=null,this._commentNodes=null,s.uncacheNode(this)}}),e.exports=l},function(e,t,n){"use strict";function r(){this._rootNodeID&&c.updateWrapper(this)}function i(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return l.asap(r,this),n}var o=n(11),a=n(13),s=n(245),u=n(14),l=n(44),c=(n(8),n(10),{getHostProps:function(e,t){return null!=t.dangerouslySetInnerHTML&&o("91"),a({},t,{value:void 0,defaultValue:void 0,children:""+e._wrapperState.initialValue,onChange:e._wrapperState.onChange})},mountWrapper:function(e,t){var n=s.getValue(t),r=n;if(null==n){var a=t.defaultValue,u=t.children;null!=u&&(null!=a&&o("92"),Array.isArray(u)&&(u.length<=1||o("93"),u=u[0]),a=""+u),null==a&&(a=""),r=a}e._wrapperState={initialValue:""+r,listeners:null,onChange:i.bind(e)}},updateWrapper:function(e){var t=e._currentElement.props,n=u.getNodeFromInstance(e),r=s.getValue(t);if(null!=r){var i=""+r;i!==n.value&&(n.value=i),null==t.defaultValue&&(n.defaultValue=i)}null!=t.defaultValue&&(n.defaultValue=t.defaultValue)},postMountWrapper:function(e){var t=u.getNodeFromInstance(e),n=t.textContent;n===e._wrapperState.initialValue&&(t.value=n)}});e.exports=c},function(e,t,n){"use strict";function r(e,t){"_hostNode"in e||u("33"),"_hostNode"in t||u("33");for(var n=0,r=e;r;r=r._hostParent)n++;for(var i=0,o=t;o;o=o._hostParent)i++;for(;n-i>0;)e=e._hostParent,n--;for(;i-n>0;)t=t._hostParent,i--;for(var a=n;a--;){if(e===t)return e;e=e._hostParent,t=t._hostParent}return null}function i(e,t){"_hostNode"in e||u("35"),"_hostNode"in t||u("35");for(;t;){if(t===e)return!0;t=t._hostParent}return!1}function o(e){return"_hostNode"in e||u("36"),e._hostParent}function a(e,t,n){for(var r=[];e;)r.push(e),e=e._hostParent;var i;for(i=r.length;i-- >0;)t(r[i],"captured",n);for(i=0;i<r.length;i++)t(r[i],"bubbled",n)}function s(e,t,n,i,o){for(var a=e&&t?r(e,t):null,s=[];e&&e!==a;)s.push(e),e=e._hostParent;for(var u=[];t&&t!==a;)u.push(t),t=t._hostParent;var l;for(l=0;l<s.length;l++)n(s[l],"bubbled",i);for(l=u.length;l-- >0;)n(u[l],"captured",o)}var u=n(11);n(8);e.exports={isAncestor:i,getLowestCommonAncestor:r,getParentInstance:o,traverseTwoPhase:a,traverseEnterLeave:s}},function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var i=n(13),o=n(44),a=n(161),s=n(32),u={initialize:s,close:function(){f.isBatchingUpdates=!1}},l={initialize:s,close:o.flushBatchedUpdates.bind(o)},c=[l,u];i(r.prototype,a,{getTransactionWrappers:function(){return c}});var p=new r,f={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,i,o){var a=f.isBatchingUpdates;return f.isBatchingUpdates=!0,a?e(t,n,r,i,o):p.perform(e,null,t,n,r,i,o)}};e.exports=f},function(e,t,n){"use strict";function r(){k||(k=!0,y.EventEmitter.injectReactEventListener(g),y.EventPluginHub.injectEventPluginOrder(s),y.EventPluginUtils.injectComponentTree(f),y.EventPluginUtils.injectTreeTraversal(d),y.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:w,EnterLeaveEventPlugin:u,ChangeEventPlugin:a,SelectEventPlugin:x,BeforeInputEventPlugin:o}),y.HostComponent.injectGenericComponentClass(p),y.HostComponent.injectTextComponentClass(m),y.DOMProperty.injectDOMPropertyConfig(i),y.DOMProperty.injectDOMPropertyConfig(l),y.DOMProperty.injectDOMPropertyConfig(b),y.EmptyComponent.injectEmptyComponentFactory(function(e){return new h(e)}),y.Updates.injectReconcileTransaction(_),y.Updates.injectBatchingStrategy(v),y.Component.injectEnvironment(c))}var i=n(1009),o=n(1011),a=n(1013),s=n(1015),u=n(1016),l=n(1018),c=n(1020),p=n(1023),f=n(14),h=n(1025),d=n(1033),m=n(1031),v=n(1034),g=n(1038),y=n(1039),_=n(1044),b=n(1049),x=n(1050),w=n(1051),k=!1;e.exports={inject:r}},function(e,t,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=r},function(e,t,n){"use strict";function r(e){i.enqueueEvents(e),i.processEventQueue(!1)}var i=n(122),o={handleTopLevel:function(e,t,n,o){r(i.extractEvents(e,t,n,o))}};e.exports=o},function(e,t,n){"use strict";function r(e){for(;e._hostParent;)e=e._hostParent;var t=p.getNodeFromInstance(e),n=t.parentNode;return p.getClosestInstanceFromNode(n)}function i(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function o(e){var t=h(e.nativeEvent),n=p.getClosestInstanceFromNode(t),i=n;do{e.ancestors.push(i),i=i&&r(i)}while(i);for(var o=0;o<e.ancestors.length;o++)n=e.ancestors[o],m._handleTopLevel(e.topLevelType,n,e.nativeEvent,h(e.nativeEvent))}function a(e){e(d(window))}var s=n(13),u=n(377),l=n(25),c=n(70),p=n(14),f=n(44),h=n(252),d=n(752);s(i.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),c.addPoolingTo(i,c.twoArgumentPooler);var m={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:l.canUseDOM?window:null,setHandleTopLevel:function(e){m._handleTopLevel=e},setEnabled:function(e){m._enabled=!!e},isEnabled:function(){return m._enabled},trapBubbledEvent:function(e,t,n){return n?u.listen(n,t,m.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){return n?u.capture(n,t,m.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,"scroll",t)},dispatchEvent:function(e,t){if(m._enabled){var n=i.getPooled(e,t);try{f.batchedUpdates(o,n)}finally{i.release(n)}}}};e.exports=m},function(e,t,n){"use strict";var r=n(89),i=n(122),o=n(243),a=n(246),s=n(455),u=n(159),l=n(457),c=n(44),p={Component:a.injection,DOMProperty:r.injection,EmptyComponent:s.injection,EventPluginHub:i.injection,EventPluginUtils:o.injection,EventEmitter:u.injection,HostComponent:l.injection,Updates:c.injection};e.exports=p},function(e,t,n){"use strict";var r=n(1062),i=/\/?>/,o=/^<\!\-\-/,a={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return o.test(e)?e:e.replace(i," "+a.CHECKSUM_ATTR_NAME+'="'+t+'"$&')},canReuseMarkup:function(e,t){var n=t.getAttribute(a.CHECKSUM_ATTR_NAME);return n=n&&parseInt(n,10),r(e)===n}};e.exports=a},function(e,t,n){"use strict";function r(e,t,n){return{type:"INSERT_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:n,afterNode:t}}function i(e,t,n){return{type:"MOVE_EXISTING",content:null,fromIndex:e._mountIndex,fromNode:f.getHostNode(e),toIndex:n,afterNode:t}}function o(e,t){return{type:"REMOVE_NODE",content:null,fromIndex:e._mountIndex,fromNode:t,toIndex:null,afterNode:null}}function a(e){return{type:"SET_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function s(e){return{type:"TEXT_CONTENT",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function u(e,t){return t&&(e=e||[],e.push(t)),e}function l(e,t){p.processChildrenUpdates(e,t)}var c=n(11),p=n(246),f=(n(124),n(39),n(52),n(90)),h=n(1019),d=(n(32),n(1065)),m=(n(8),{Mixin:{_reconcilerInstantiateChildren:function(e,t,n){return h.instantiateChildren(e,t,n)},_reconcilerUpdateChildren:function(e,t,n,r,i,o){var a,s=0;return a=d(t,s),h.updateChildren(e,a,n,r,i,this,this._hostContainerInfo,o,s),a},mountChildren:function(e,t,n){var r=this._reconcilerInstantiateChildren(e,t,n);this._renderedChildren=r;var i=[],o=0;for(var a in r)if(r.hasOwnProperty(a)){var s=r[a],u=0,l=f.mountComponent(s,t,this,this._hostContainerInfo,n,u);s._mountIndex=o++,i.push(l)}return i},updateTextContent:function(e){var t=this._renderedChildren;h.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");l(this,[s(e)])},updateMarkup:function(e){var t=this._renderedChildren;h.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");l(this,[a(e)])},updateChildren:function(e,t,n){this._updateChildren(e,t,n)},_updateChildren:function(e,t,n){var r=this._renderedChildren,i={},o=[],a=this._reconcilerUpdateChildren(r,e,o,i,t,n);if(a||r){var s,c=null,p=0,h=0,d=0,m=null;for(s in a)if(a.hasOwnProperty(s)){var v=r&&r[s],g=a[s];v===g?(c=u(c,this.moveChild(v,m,p,h)),h=Math.max(v._mountIndex,h),v._mountIndex=p):(v&&(h=Math.max(v._mountIndex,h)),c=u(c,this._mountChildAtIndex(g,o[d],m,p,t,n)),d++),p++,m=f.getHostNode(g)}for(s in i)i.hasOwnProperty(s)&&(c=u(c,this._unmountChild(r[s],i[s])));c&&l(this,c),this._renderedChildren=a}},unmountChildren:function(e){var t=this._renderedChildren;h.unmountChildren(t,e),this._renderedChildren=null},moveChild:function(e,t,n,r){if(e._mountIndex<r)return i(e,t,n)},createChild:function(e,t,n){return r(n,t,e._mountIndex)},removeChild:function(e,t){return o(e,t)},_mountChildAtIndex:function(e,t,n,r,i,o){return e._mountIndex=r,this.createChild(e,n,t)},_unmountChild:function(e,t){var n=this.removeChild(e,t);return e._mountIndex=null,n}}});e.exports=m},function(e,t,n){"use strict";function r(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)}var i=n(11),o=(n(8),{addComponentAsRefTo:function(e,t,n){r(n)||i("119"),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(n)||i("120");var o=n.getPublicInstance();o&&o.refs[t]===e.getPublicInstance()&&n.detachRef(t)}});e.exports=o},function(e,t,n){"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=o.getPooled(null),this.useCreateElement=e}var i=n(13),o=n(451),a=n(70),s=n(159),u=n(458),l=(n(39),n(161)),c=n(248),p={initialize:u.getSelectionInformation,close:u.restoreSelection},f={initialize:function(){var e=s.isEnabled();return s.setEnabled(!1),e},close:function(e){s.setEnabled(e)}},h={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},d=[p,f,h],m={getTransactionWrappers:function(){return d},getReactMountReady:function(){return this.reactMountReady},getUpdateQueue:function(){return c},checkpoint:function(){return this.reactMountReady.checkpoint()},rollback:function(e){this.reactMountReady.rollback(e)},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null}};i(r.prototype,l,m),a.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):o.addComponentAsRefTo(t,e,n)}function i(e,t,n){"function"==typeof e?e(null):o.removeComponentAsRefFrom(t,e,n)}var o=n(1042),a={};a.attachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&r(n,e,t._owner)}},a.shouldUpdateRefs=function(e,t){var n=null,r=null;null!==e&&"object"==typeof e&&(n=e.ref,r=e._owner);var i=null,o=null;return null!==t&&"object"==typeof t&&(i=t.ref,o=t._owner),n!==i||"string"==typeof i&&o!==r},a.detachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&i(n,e,t._owner)}},e.exports=a},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.useCreateElement=!1,this.updateQueue=new s(this)}var i=n(13),o=n(70),a=n(161),s=(n(39),n(1047)),u=[],l={enqueue:function(){}},c={getTransactionWrappers:function(){return u},getReactMountReady:function(){return l},getUpdateQueue:function(){return this.updateQueue},destructor:function(){},checkpoint:function(){},rollback:function(){}};i(r.prototype,a,c),o.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=n(248),o=(n(10),function(){function e(t){r(this,e),this.transaction=t}return e.prototype.isMounted=function(e){return!1},e.prototype.enqueueCallback=function(e,t,n){this.transaction.isInTransaction()&&i.enqueueCallback(e,t,n)},e.prototype.enqueueForceUpdate=function(e){this.transaction.isInTransaction()&&i.enqueueForceUpdate(e)},e.prototype.enqueueReplaceState=function(e,t){this.transaction.isInTransaction()&&i.enqueueReplaceState(e,t)},e.prototype.enqueueSetState=function(e,t){this.transaction.isInTransaction()&&i.enqueueSetState(e,t)},e}());e.exports=o},function(e,t,n){"use strict";e.exports="15.6.2"},function(e,t,n){"use strict";var r={xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace"},i={accentHeight:"accent-height",accumulate:0,additive:0,alignmentBaseline:"alignment-baseline",allowReorder:"allowReorder",alphabetic:0,amplitude:0,arabicForm:"arabic-form",ascent:0,attributeName:"attributeName",attributeType:"attributeType",autoReverse:"autoReverse",azimuth:0,baseFrequency:"baseFrequency",baseProfile:"baseProfile",baselineShift:"baseline-shift",bbox:0,begin:0,bias:0,by:0,calcMode:"calcMode",capHeight:"cap-height",clip:0,clipPath:"clip-path",clipRule:"clip-rule",clipPathUnits:"clipPathUnits",colorInterpolation:"color-interpolation",colorInterpolationFilters:"color-interpolation-filters",colorProfile:"color-profile",colorRendering:"color-rendering",contentScriptType:"contentScriptType",contentStyleType:"contentStyleType",cursor:0,cx:0,cy:0,d:0,decelerate:0,descent:0,diffuseConstant:"diffuseConstant",direction:0,display:0,divisor:0,dominantBaseline:"dominant-baseline",dur:0,dx:0,dy:0,edgeMode:"edgeMode",elevation:0,enableBackground:"enable-background",end:0,exponent:0,externalResourcesRequired:"externalResourcesRequired",fill:0,fillOpacity:"fill-opacity",fillRule:"fill-rule",filter:0,filterRes:"filterRes",filterUnits:"filterUnits",floodColor:"flood-color",floodOpacity:"flood-opacity",focusable:0,fontFamily:"font-family",fontSize:"font-size",fontSizeAdjust:"font-size-adjust",fontStretch:"font-stretch",fontStyle:"font-style",fontVariant:"font-variant",fontWeight:"font-weight",format:0,from:0,fx:0,fy:0,g1:0,g2:0,glyphName:"glyph-name",glyphOrientationHorizontal:"glyph-orientation-horizontal",glyphOrientationVertical:"glyph-orientation-vertical",glyphRef:"glyphRef",gradientTransform:"gradientTransform",gradientUnits:"gradientUnits",hanging:0,horizAdvX:"horiz-adv-x",horizOriginX:"horiz-origin-x",ideographic:0,imageRendering:"image-rendering",in:0,in2:0,intercept:0,k:0,k1:0,k2:0,k3:0,k4:0,kernelMatrix:"kernelMatrix",kernelUnitLength:"kernelUnitLength",kerning:0,keyPoints:"keyPoints",keySplines:"keySplines",keyTimes:"keyTimes",lengthAdjust:"lengthAdjust",letterSpacing:"letter-spacing",lightingColor:"lighting-color",limitingConeAngle:"limitingConeAngle",local:0,markerEnd:"marker-end",markerMid:"marker-mid",markerStart:"marker-start",markerHeight:"markerHeight",markerUnits:"markerUnits",markerWidth:"markerWidth",mask:0,maskContentUnits:"maskContentUnits",maskUnits:"maskUnits",mathematical:0,mode:0,numOctaves:"numOctaves",offset:0,opacity:0,operator:0,order:0,orient:0,orientation:0,origin:0,overflow:0,overlinePosition:"overline-position",overlineThickness:"overline-thickness",paintOrder:"paint-order",panose1:"panose-1",pathLength:"pathLength",patternContentUnits:"patternContentUnits",patternTransform:"patternTransform",patternUnits:"patternUnits",pointerEvents:"pointer-events",points:0,pointsAtX:"pointsAtX",pointsAtY:"pointsAtY",pointsAtZ:"pointsAtZ",preserveAlpha:"preserveAlpha",preserveAspectRatio:"preserveAspectRatio",primitiveUnits:"primitiveUnits",r:0,radius:0,refX:"refX",refY:"refY",renderingIntent:"rendering-intent",repeatCount:"repeatCount",repeatDur:"repeatDur",requiredExtensions:"requiredExtensions",requiredFeatures:"requiredFeatures",restart:0,result:0,rotate:0,rx:0,ry:0,scale:0,seed:0,shapeRendering:"shape-rendering",slope:0,spacing:0,specularConstant:"specularConstant",specularExponent:"specularExponent",speed:0,spreadMethod:"spreadMethod",startOffset:"startOffset",stdDeviation:"stdDeviation",stemh:0,stemv:0,stitchTiles:"stitchTiles",stopColor:"stop-color",stopOpacity:"stop-opacity",strikethroughPosition:"strikethrough-position",strikethroughThickness:"strikethrough-thickness",string:0,stroke:0,strokeDasharray:"stroke-dasharray",strokeDashoffset:"stroke-dashoffset",strokeLinecap:"stroke-linecap",strokeLinejoin:"stroke-linejoin",strokeMiterlimit:"stroke-miterlimit",strokeOpacity:"stroke-opacity",strokeWidth:"stroke-width",surfaceScale:"surfaceScale",systemLanguage:"systemLanguage",tableValues:"tableValues",targetX:"targetX",targetY:"targetY",textAnchor:"text-anchor",textDecoration:"text-decoration",textRendering:"text-rendering",textLength:"textLength",to:0,transform:0,u1:0,u2:0,underlinePosition:"underline-position",underlineThickness:"underline-thickness",unicode:0,unicodeBidi:"unicode-bidi",unicodeRange:"unicode-range",unitsPerEm:"units-per-em",vAlphabetic:"v-alphabetic",vHanging:"v-hanging",vIdeographic:"v-ideographic",vMathematical:"v-mathematical",values:0,vectorEffect:"vector-effect",version:0,vertAdvY:"vert-adv-y",vertOriginX:"vert-origin-x",vertOriginY:"vert-origin-y",viewBox:"viewBox",viewTarget:"viewTarget",visibility:0,widths:0,wordSpacing:"word-spacing",writingMode:"writing-mode",x:0,xHeight:"x-height",x1:0,x2:0,xChannelSelector:"xChannelSelector",xlinkActuate:"xlink:actuate",xlinkArcrole:"xlink:arcrole",xlinkHref:"xlink:href",xlinkRole:"xlink:role",xlinkShow:"xlink:show",xlinkTitle:"xlink:title",xlinkType:"xlink:type",xmlBase:"xml:base",xmlns:0,xmlnsXlink:"xmlns:xlink",xmlLang:"xml:lang",xmlSpace:"xml:space",y:0,y1:0,y2:0,yChannelSelector:"yChannelSelector",z:0,zoomAndPan:"zoomAndPan"},o={Properties:{},DOMAttributeNamespaces:{xlinkActuate:r.xlink,xlinkArcrole:r.xlink,xlinkHref:r.xlink,xlinkRole:r.xlink,xlinkShow:r.xlink,xlinkTitle:r.xlink,xlinkType:r.xlink,xmlBase:r.xml,xmlLang:r.xml,xmlSpace:r.xml},DOMAttributeNames:{}};Object.keys(i).forEach(function(e){o.Properties[e]=0,i[e]&&(o.DOMAttributeNames[e]=i[e])}),e.exports=o},function(e,t,n){"use strict";function r(e){if("selectionStart"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function i(e,t){if(y||null==m||m!==c())return null;var n=r(m);if(!g||!f(g,n)){g=n;var i=l.getPooled(d.select,v,e,t);return i.type="select",i.target=m,o.accumulateTwoPhaseDispatches(i),i}return null}var o=n(123),a=n(25),s=n(14),u=n(458),l=n(51),c=n(379),p=n(468),f=n(208),h=a.canUseDOM&&"documentMode"in document&&document.documentMode<=11,d={select:{phasedRegistrationNames:{bubbled:"onSelect",captured:"onSelectCapture"},dependencies:["topBlur","topContextMenu","topFocus","topKeyDown","topKeyUp","topMouseDown","topMouseUp","topSelectionChange"]}},m=null,v=null,g=null,y=!1,_=!1,b={eventTypes:d,extractEvents:function(e,t,n,r){if(!_)return null;var o=t?s.getNodeFromInstance(t):window;switch(e){case"topFocus":(p(o)||"true"===o.contentEditable)&&(m=o,v=t,g=null);break;case"topBlur":m=null,v=null,g=null;break;case"topMouseDown":y=!0;break;case"topContextMenu":case"topMouseUp":return y=!1,i(n,r);case"topSelectionChange":if(h)break;case"topKeyDown":case"topKeyUp":return i(n,r)}return null},didPutListener:function(e,t,n){"onSelect"===t&&(_=!0)}};e.exports=b},function(e,t,n){"use strict";function r(e){return"."+e._rootNodeID}function i(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}var o=n(11),a=n(377),s=n(123),u=n(14),l=n(1052),c=n(1053),p=n(51),f=n(1056),h=n(1058),d=n(160),m=n(1055),v=n(1059),g=n(1060),y=n(125),_=n(1061),b=n(32),x=n(250),w=(n(8),{}),k={};["abort","animationEnd","animationIteration","animationStart","blur","canPlay","canPlayThrough","click","contextMenu","copy","cut","doubleClick","drag","dragEnd","dragEnter","dragExit","dragLeave","dragOver","dragStart","drop","durationChange","emptied","encrypted","ended","error","focus","input","invalid","keyDown","keyPress","keyUp","load","loadedData","loadedMetadata","loadStart","mouseDown","mouseMove","mouseOut","mouseOver","mouseUp","paste","pause","play","playing","progress","rateChange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeUpdate","touchCancel","touchEnd","touchMove","touchStart","transitionEnd","volumeChange","waiting","wheel"].forEach(function(e){var t=e[0].toUpperCase()+e.slice(1),n="on"+t,r="top"+t,i={phasedRegistrationNames:{bubbled:n,captured:n+"Capture"},dependencies:[r]};w[e]=i,k[r]=i});var E={},S={eventTypes:w,extractEvents:function(e,t,n,r){var i=k[e];if(!i)return null;var a;switch(e){case"topAbort":case"topCanPlay":case"topCanPlayThrough":case"topDurationChange":case"topEmptied":case"topEncrypted":case"topEnded":case"topError":case"topInput":case"topInvalid":case"topLoad":case"topLoadedData":case"topLoadedMetadata":case"topLoadStart":case"topPause":case"topPlay":case"topPlaying":case"topProgress":case"topRateChange":case"topReset":case"topSeeked":case"topSeeking":case"topStalled":case"topSubmit":case"topSuspend":case"topTimeUpdate":case"topVolumeChange":case"topWaiting":a=p;break;case"topKeyPress":if(0===x(n))return null;case"topKeyDown":case"topKeyUp":a=h;break;case"topBlur":case"topFocus":a=f;break;case"topClick":if(2===n.button)return null;case"topDoubleClick":case"topMouseDown":case"topMouseMove":case"topMouseUp":case"topMouseOut":case"topMouseOver":case"topContextMenu":a=d;break;case"topDrag":case"topDragEnd":case"topDragEnter":case"topDragExit":case"topDragLeave":case"topDragOver":case"topDragStart":case"topDrop":a=m;break;case"topTouchCancel":case"topTouchEnd":case"topTouchMove":case"topTouchStart":a=v;break;case"topAnimationEnd":case"topAnimationIteration":case"topAnimationStart":a=l;break;case"topTransitionEnd":a=g;break;case"topScroll":a=y;break;case"topWheel":a=_;break;case"topCopy":case"topCut":case"topPaste":a=c}a||o("86",e);var u=a.getPooled(i,t,n,r);return s.accumulateTwoPhaseDispatches(u),u},didPutListener:function(e,t,n){if("onClick"===t&&!i(e._tag)){var o=r(e),s=u.getNodeFromInstance(e);E[o]||(E[o]=a.listen(s,"click",b))}},willDeleteListener:function(e,t){if("onClick"===t&&!i(e._tag)){var n=r(e);E[n].remove(),delete E[n]}}};e.exports=S},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={animationName:null,elapsedTime:null,pseudoElement:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={data:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(160),o={dataTransfer:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o={relatedTarget:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={data:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(250),a=n(1066),s=n(251),u={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:s,charCode:function(e){return"keypress"===e.type?o(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?o(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}};i.augmentClass(r,u),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(125),o=n(251),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:o};i.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(51),o={propertyName:null,elapsedTime:null,pseudoElement:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return i.call(this,e,t,n,r)}var i=n(160),o={deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};i.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e){for(var t=1,n=0,r=0,o=e.length,a=-4&o;r<a;){for(var s=Math.min(r+4096,a);r<s;r+=4)n+=(t+=e.charCodeAt(r))+(t+=e.charCodeAt(r+1))+(t+=e.charCodeAt(r+2))+(t+=e.charCodeAt(r+3));t%=i,n%=i}for(;r<o;r++)n+=t+=e.charCodeAt(r);return t%=i,n%=i,t|n<<16}var i=65521;e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){if(null==t||"boolean"==typeof t||""===t)return"";var i=isNaN(t);if(r||i||0===t||o.hasOwnProperty(e)&&o[e])return""+t;if("string"==typeof t){t=t.trim()}return t+"px"}var i=n(450),o=(n(10),i.isUnitlessNumber);e.exports=r},function(e,t,n){"use strict";function r(e){if(null==e)return null;if(1===e.nodeType)return e;var t=a.get(e);if(t)return t=s(t),t?o.getNodeFromInstance(t):null;"function"==typeof e.render?i("44"):i("45",Object.keys(e))}var i=n(11),o=(n(52),n(14)),a=n(124),s=n(464);n(8),n(10);e.exports=r},function(e,t,n){"use strict";(function(t){function r(e,t,n,r){if(e&&"object"==typeof e){var i=e,o=void 0===i[n];o&&null!=t&&(i[n]=t)}}function i(e,t){if(null==e)return e;var n={};return o(e,r,n),n}var o=(n(244),n(470));n(10);void 0!==t&&n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1}),e.exports=i}).call(t,n(33))},function(e,t,n){"use strict";function r(e){if(e.key){var t=o[e.key]||e.key;if("Unidentified"!==t)return t}if("keypress"===e.type){var n=i(e);return 13===n?"Enter":String.fromCharCode(n)}return"keydown"===e.type||"keyup"===e.type?a[e.keyCode]||"Unidentified":""}var i=n(250),o={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},a={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};e.exports=r},function(e,t,n){"use strict";function r(e){var t=e&&(i&&e[i]||e[o]);if("function"==typeof t)return t}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=r},function(e,t,n){"use strict";function r(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function i(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function o(e,t){for(var n=r(e),o=0,a=0;n;){if(3===n.nodeType){if(a=o+n.textContent.length,o<=t&&a>=t)return{node:n,offset:t-o};o=a}n=r(i(n))}}e.exports=o},function(e,t,n){"use strict";function r(e,t){var n={};return n[e.toLowerCase()]=t.toLowerCase(),n["Webkit"+e]="webkit"+t,n["Moz"+e]="moz"+t,n["ms"+e]="MS"+t,n["O"+e]="o"+t.toLowerCase(),n}function i(e){if(s[e])return s[e];if(!a[e])return e;var t=a[e];for(var n in t)if(t.hasOwnProperty(n)&&n in u)return s[e]=t[n];return""}var o=n(25),a={animationend:r("Animation","AnimationEnd"),animationiteration:r("Animation","AnimationIteration"),animationstart:r("Animation","AnimationStart"),transitionend:r("Transition","TransitionEnd")},s={},u={};o.canUseDOM&&(u=document.createElement("div").style,"AnimationEvent"in window||(delete a.animationend.animation,delete a.animationiteration.animation,delete a.animationstart.animation),"TransitionEvent"in window||delete a.transitionend.transition),e.exports=i},function(e,t,n){"use strict";function r(e){return'"'+i(e)+'"'}var i=n(162);e.exports=r},function(e,t,n){"use strict";var r=n(459);e.exports=r.renderSubtreeIntoContainer},function(e,t,n){!function(e,r){r(t,n(0),n(7))}(0,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t=t&&"default"in t?t.default:t;var a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=function(e){function t(){return r(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return o(t,e),s(t,[{key:"shouldComponentUpdate",value:function(e){var t=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=this.state||{};return!(this.updateOnProps||Object.keys(a({},e,this.props))).every(function(r){return n.is(e[r],t.props[r])})||!(this.updateOnStates||Object.keys(a({},r,i))).every(function(e){return n.is(r[e],i[e])})}}]),t}(t.Component);e.ImmutablePureComponent=u,e.default=u,Object.defineProperty(e,"__esModule",{value:!0})})},function(e,t,n){"use strict";function r(e){return{doc:new B,blocks:M,blockStarts:T,tip:this.doc,oldtip:this.doc,currentLine:"",lineNumber:0,offset:0,column:0,nextNonspace:0,nextNonspaceColumn:0,indent:0,indented:!1,blank:!1,allClosed:!0,lastMatchedContainer:this.doc,refmap:{},lastLineLength:0,inlineParser:new u(e),findNextNonspace:R,advanceOffset:P,advanceNextNonspace:I,breakOutOfLists:E,addLine:S,addChild:C,incorporateLine:j,finalize:F,processInlines:N,closeUnmatchedBlocks:O,parse:L,options:e||{}}}var i=n(256),o=n(91).unescapeString,a=n(91).OPENTAG,s=n(91).CLOSETAG,u=n(1077),l=[/./,/^<(?:script|pre|style)(?:\s|>|$)/i,/^<!--/,/^<[?]/,/^<![A-Z]/,/^<!\[CDATA\[/,/^<[\/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[\/]?[>]|$)/i,new RegExp("^(?:"+a+"|"+s+")s*$","i")],c=[/./,/<\/(?:script|pre|style)>/i,/-->/,/\?>/,/>/,/\]\]>/],p=/^(?:(?:\* *){3,}|(?:_ *){3,}|(?:- *){3,}) *$/,f=/^[#`~*+_=<>0-9-]/,h=/[^ \t\f\v\r\n]/,d=/^[*+-]/,m=/^(\d{1,9})([.)])/,v=/^#{1,6}(?: +|$)/,g=/^`{3,}(?!.*`)|^~{3,}(?!.*~)/,y=/^(?:`{3,}|~{3,})(?= *$)/,_=/^(?:=+|-+) *$/,b=/\r\n|\n|\r/,x=function(e){return!h.test(e)},w=function(e,t){return t<e.length?e.charCodeAt(t):-1},k=function(e){for(;e;){if(e._lastLineBlank)return!0;var t=e.type;if("List"!==t&&"Item"!==t)break;e=e._lastChild}return!1},E=function(e){var t=e,n=null;do{"List"===t.type&&(n=t),t=t._parent}while(t);if(n){for(;e!==n;)this.finalize(e,this.lineNumber),e=e._parent;this.finalize(n,this.lineNumber),this.tip=n._parent}},S=function(){this.tip._string_content+=this.currentLine.slice(this.offset)+"\n"},C=function(e,t){for(;!this.blocks[this.tip.type].canContain(e);)this.finalize(this.tip,this.lineNumber-1);var n=t+1,r=new i(e,[[this.lineNumber,n],[0,0]]);return r._string_content="",this.tip.appendChild(r),this.tip=r,r},A=function(e){var t,n,r,i,o=e.currentLine.slice(e.nextNonspace),a={type:null,tight:!0,bulletChar:null,start:null,delimiter:null,padding:null,markerOffset:e.indent};if(t=o.match(d))a.type="Bullet",a.bulletChar=t[0][0];else{if(!(t=o.match(m)))return null;a.type="Ordered",a.start=parseInt(t[1]),a.delimiter=t[2]}if(-1!==(n=w(e.currentLine,e.nextNonspace+t[0].length))&&9!==n&&32!==n)return null;e.advanceNextNonspace(),e.advanceOffset(t[0].length,!0),r=e.column,i=e.offset;do{e.advanceOffset(1,!0),n=w(e.currentLine,e.offset)}while(e.column-r<5&&(32===n||9===n));var s=-1===w(e.currentLine,e.offset),u=e.column-r;return u>=5||u<1||s?(a.padding=t[0].length+1,e.column=r,e.offset=i,32===w(e.currentLine,e.offset)&&e.advanceOffset(1,!0)):a.padding=t[0].length+u,a},D=function(e,t){return e.type===t.type&&e.delimiter===t.delimiter&&e.bulletChar===t.bulletChar},O=function(){if(!this.allClosed){for(;this.oldtip!==this.lastMatchedContainer;){var e=this.oldtip._parent;this.finalize(this.oldtip,this.lineNumber-1),this.oldtip=e}this.allClosed=!0}},M={Document:{continue:function(){return 0},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},List:{continue:function(){return 0},finalize:function(e,t){for(var n=t._firstChild;n;){if(k(n)&&n._next){t._listData.tight=!1;break}for(var r=n._firstChild;r;){if(k(r)&&(n._next||r._next)){t._listData.tight=!1;break}r=r._next}n=n._next}},canContain:function(e){return"Item"===e},acceptsLines:!1},BlockQuote:{continue:function(e){var t=e.currentLine;return e.indented||62!==w(t,e.nextNonspace)?1:(e.advanceNextNonspace(),e.advanceOffset(1,!1),32===w(t,e.offset)&&e.offset++,0)},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},Item:{continue:function(e,t){if(e.blank&&null!==t._firstChild)e.advanceNextNonspace();else{if(!(e.indent>=t._listData.markerOffset+t._listData.padding))return 1;e.advanceOffset(t._listData.markerOffset+t._listData.padding,!0)}return 0},finalize:function(){},canContain:function(e){return"Item"!==e},acceptsLines:!1},Heading:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},ThematicBreak:{continue:function(){return 1},finalize:function(){},canContain:function(){return!1},acceptsLines:!1},CodeBlock:{continue:function(e,t){var n=e.currentLine,r=e.indent;if(t._isFenced){var i=r<=3&&n.charAt(e.nextNonspace)===t._fenceChar&&n.slice(e.nextNonspace).match(y);if(i&&i[0].length>=t._fenceLength)return e.finalize(t,e.lineNumber),2;for(var o=t._fenceOffset;o>0&&32===w(n,e.offset);)e.advanceOffset(1,!1),o--}else if(r>=4)e.advanceOffset(4,!0);else{if(!e.blank)return 1;e.advanceNextNonspace()}return 0},finalize:function(e,t){if(t._isFenced){var n=t._string_content,r=n.indexOf("\n"),i=n.slice(0,r),a=n.slice(r+1);t.info=o(i.trim()),t._literal=a}else t._literal=t._string_content.replace(/(\n *)+$/,"\n");t._string_content=null},canContain:function(){return!1},acceptsLines:!0},HtmlBlock:{continue:function(e,t){return!e.blank||6!==t._htmlBlockType&&7!==t._htmlBlockType?0:1},finalize:function(e,t){t._literal=t._string_content.replace(/(\n *)+$/,""),t._string_content=null},canContain:function(){return!1},acceptsLines:!0},Paragraph:{continue:function(e){return e.blank?1:0},finalize:function(e,t){for(var n,r=!1;91===w(t._string_content,0)&&(n=e.inlineParser.parseReference(t._string_content,e.refmap));)t._string_content=t._string_content.slice(n),r=!0;r&&x(t._string_content)&&t.unlink()},canContain:function(){return!1},acceptsLines:!0}},T=[function(e){return e.indented||62!==w(e.currentLine,e.nextNonspace)?0:(e.advanceNextNonspace(),e.advanceOffset(1,!1),32===w(e.currentLine,e.offset)&&e.advanceOffset(1,!1),e.closeUnmatchedBlocks(),e.addChild("BlockQuote",e.nextNonspace),1)},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(v))){e.advanceNextNonspace(),e.advanceOffset(t[0].length,!1),e.closeUnmatchedBlocks();var n=e.addChild("Heading",e.nextNonspace);return n.level=t[0].trim().length,n._string_content=e.currentLine.slice(e.offset).replace(/^ *#+ *$/,"").replace(/ +#+ *$/,""),e.advanceOffset(e.currentLine.length-e.offset),2}return 0},function(e){var t;if(!e.indented&&(t=e.currentLine.slice(e.nextNonspace).match(g))){var n=t[0].length;e.closeUnmatchedBlocks();var r=e.addChild("CodeBlock",e.nextNonspace);return r._isFenced=!0,r._fenceLength=n,r._fenceChar=t[0][0],r._fenceOffset=e.indent,e.advanceNextNonspace(),e.advanceOffset(n,!1),2}return 0},function(e,t){if(!e.indented&&60===w(e.currentLine,e.nextNonspace)){var n,r=e.currentLine.slice(e.nextNonspace);for(n=1;n<=7;n++)if(l[n].test(r)&&(n<7||"Paragraph"!==t.type)){e.closeUnmatchedBlocks();var i=e.addChild("HtmlBlock",e.offset);return i._htmlBlockType=n,2}}return 0},function(e,t){var n;if(!e.indented&&"Paragraph"===t.type&&(n=e.currentLine.slice(e.nextNonspace).match(_))){e.closeUnmatchedBlocks();var r=new i("Heading",t.sourcepos);return r.level="="===n[0][0]?1:2,r._string_content=t._string_content,t.insertAfter(r),t.unlink(),e.tip=r,e.advanceOffset(e.currentLine.length-e.offset,!1),2}return 0},function(e){return!e.indented&&p.test(e.currentLine.slice(e.nextNonspace))?(e.closeUnmatchedBlocks(),e.addChild("ThematicBreak",e.nextNonspace),e.advanceOffset(e.currentLine.length-e.offset,!1),2):0},function(e,t){var n;return e.indented&&"List"!==t.type||!(n=A(e))?0:(e.closeUnmatchedBlocks(),"List"===e.tip.type&&D(t._listData,n)||(t=e.addChild("List",e.nextNonspace),t._listData=n),t=e.addChild("Item",e.nextNonspace),t._listData=n,1)},function(e){return e.indented&&"Paragraph"!==e.tip.type&&!e.blank?(e.advanceOffset(4,!0),e.closeUnmatchedBlocks(),e.addChild("CodeBlock",e.offset),2):0}],P=function(e,t){for(var n,r,i=0,o=this.currentLine;e>0&&(r=o[this.offset]);)"\t"===r?(n=4-this.column%4,this.column+=n,this.offset+=1,e-=t?n:1):(i+=1,this.offset+=1,this.column+=1,e-=1)},I=function(){this.offset=this.nextNonspace,this.column=this.nextNonspaceColumn},R=function(){for(var e,t=this.currentLine,n=this.offset,r=this.column;""!==(e=t.charAt(n));)if(" "===e)n++,r++;else{if("\t"!==e)break;n++,r+=4-r%4}this.blank="\n"===e||"\r"===e||""===e,this.nextNonspace=n,this.nextNonspaceColumn=r,this.indent=this.nextNonspaceColumn-this.column,this.indented=this.indent>=4},j=function(e){var t,n=!0,r=this.doc;this.oldtip=this.tip,this.offset=0,this.column=0,this.lineNumber+=1,-1!==e.indexOf("\0")&&(e=e.replace(/\0/g,"�")),this.currentLine=e;for(var i;(i=r._lastChild)&&i._open;){switch(r=i,this.findNextNonspace(),this.blocks[r.type].continue(this,r)){case 0:break;case 1:n=!1;break;case 2:return void(this.lastLineLength=e.length);default:throw"continue returned illegal value, must be 0, 1, or 2"}if(!n){r=r._parent;break}}this.allClosed=r===this.oldtip,this.lastMatchedContainer=r,this.blank&&r._lastLineBlank&&(this.breakOutOfLists(r),r=this.tip);for(var o="Paragraph"!==r.type&&M[r.type].acceptsLines,a=this.blockStarts,s=a.length;!o;){if(this.findNextNonspace(),!this.indented&&!f.test(e.slice(this.nextNonspace))){this.advanceNextNonspace();break}for(var u=0;u<s;){var l=a[u](this,r);if(1===l){r=this.tip;break}if(2===l){r=this.tip,o=!0;break}u++}if(u===s){this.advanceNextNonspace();break}}if(this.allClosed||this.blank||"Paragraph"!==this.tip.type){this.closeUnmatchedBlocks(),this.blank&&r.lastChild&&(r.lastChild._lastLineBlank=!0),t=r.type;for(var p=this.blank&&!("BlockQuote"===t||"CodeBlock"===t&&r._isFenced||"Item"===t&&!r._firstChild&&r.sourcepos[0][0]===this.lineNumber),h=r;h;)h._lastLineBlank=p,h=h._parent;this.blocks[t].acceptsLines?(this.addLine(),"HtmlBlock"===t&&r._htmlBlockType>=1&&r._htmlBlockType<=5&&c[r._htmlBlockType].test(this.currentLine.slice(this.offset))&&this.finalize(r,this.lineNumber)):this.offset<e.length&&!this.blank&&(r=this.addChild("Paragraph",this.offset),this.advanceNextNonspace(),this.addLine())}else this.addLine();this.lastLineLength=e.length},F=function(e,t){var n=e._parent;e._open=!1,e.sourcepos[1]=[t,this.lastLineLength],this.blocks[e.type].finalize(this,e),this.tip=n},N=function(e){var t,n,r,i=e.walker();for(this.inlineParser.refmap=this.refmap,this.inlineParser.options=this.options;n=i.next();)t=n.node,r=t.type,n.entering||"Paragraph"!==r&&"Heading"!==r||this.inlineParser.parse(t)},B=function(){return new i("Document",[[1,1],[0,0]])},L=function(e){this.doc=new B,this.tip=this.doc,this.refmap={},this.lineNumber=0,this.lastLineLength=0,this.offset=0,this.column=0,this.lastMatchedContainer=this.doc,this.currentLine="",this.options.time&&console.time("preparing input");var t=e.split(b),n=t.length;10===e.charCodeAt(e.length-1)&&(n-=1),this.options.time&&console.timeEnd("preparing input"),this.options.time&&console.time("block parsing");for(var r=0;r<n;r++)this.incorporateLine(t[r]);for(;this.tip;)this.finalize(this.tip,n);return this.options.time&&console.timeEnd("block parsing"),this.options.time&&console.time("inline parsing"),this.processInlines(this.doc),this.options.time&&console.timeEnd("inline parsing"),this.doc};e.exports=r},function(e,t,n){"use strict";/*! http://mths.be/fromcodepoint v0.2.1 by @mathias */
+if(String.fromCodePoint)e.exports=function(e){try{return String.fromCodePoint(e)}catch(e){if(e instanceof RangeError)return String.fromCharCode(65533);throw e}};else{var r=String.fromCharCode,i=Math.floor,o=function(){var e,t,n=[],o=-1,a=arguments.length;if(!a)return"";for(var s="";++o<a;){var u=Number(arguments[o]);if(!isFinite(u)||u<0||u>1114111||i(u)!==u)return String.fromCharCode(65533);u<=65535?n.push(u):(u-=65536,e=55296+(u>>10),t=u%1024+56320,n.push(e,t)),(o+1===a||n.length>16384)&&(s+=r.apply(null,n),n.length=0)}return s};e.exports=o}},function(e,t,n){"use strict";function r(e){return{softbreak:"\n",escape:i,options:e||{},render:c}}var i=n(91).escapeXml,o=function(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+i[1]+'"',o++;return n&&(r+=" /"),r+=">"},a=/\<[^>]*\>/,s=/^javascript:|vbscript:|file:|data:/i,u=/^data:image\/(?:png|gif|jpeg|webp)/i,l=function(e){return s.test(e)&&!u.test(e)},c=function(e){var t,n,r,i,s,u,c,p=e.walker(),f="",h="\n",d=0,m=function(e){f+=d>0?e.replace(a,""):e,h=e},v=this.escape,g=function(){"\n"!==h&&(f+="\n",h="\n")},y=this.options;for(y.time&&console.time("rendering");i=p.next();){if(u=i.entering,s=i.node,t=[],y.sourcepos){var _=s.sourcepos;_&&t.push(["data-sourcepos",String(_[0][0])+":"+String(_[0][1])+"-"+String(_[1][0])+":"+String(_[1][1])])}switch(s.type){case"Text":m(v(s.literal,!1));break;case"Softbreak":m(this.softbreak);break;case"Hardbreak":m(o("br",[],!0)),g();break;case"Emph":m(o(u?"em":"/em"));break;case"Strong":m(o(u?"strong":"/strong"));break;case"HtmlInline":m(y.safe?"\x3c!-- raw HTML omitted --\x3e":s.literal);break;case"CustomInline":u&&s.onEnter?m(s.onEnter):!u&&s.onExit&&m(s.onExit);break;case"Link":u?(y.safe&&l(s.destination)||t.push(["href",v(s.destination,!0)]),s.title&&t.push(["title",v(s.title,!0)]),m(o("a",t))):m(o("/a"));break;case"Image":u?(0===d&&m(y.safe&&l(s.destination)?'<img src="" alt="':'<img src="'+v(s.destination,!0)+'" alt="'),d+=1):0===(d-=1)&&(s.title&&m('" title="'+v(s.title,!0)),m('" />'));break;case"Code":m(o("code")+v(s.literal,!1)+o("/code"));break;case"Document":break;case"Paragraph":if(null!==(c=s.parent.parent)&&"List"===c.type&&c.listTight)break;u?(g(),m(o("p",t))):(m(o("/p")),g());break;case"BlockQuote":u?(g(),m(o("blockquote",t)),g()):(g(),m(o("/blockquote")),g());break;case"Item":u?m(o("li",t)):(m(o("/li")),g());break;case"List":if(r="Bullet"===s.listType?"ul":"ol",u){var b=s.listStart;null!==b&&1!==b&&t.push(["start",b.toString()]),g(),m(o(r,t)),g()}else g(),m(o("/"+r)),g();break;case"Heading":r="h"+s.level,u?(g(),m(o(r,t))):(m(o("/"+r)),g());break;case"CodeBlock":n=s.info?s.info.split(/\s+/):[],n.length>0&&n[0].length>0&&t.push(["class","language-"+v(n[0],!0)]),g(),m(o("pre")+o("code",t)),m(v(s.literal,!1)),m(o("/code")+o("/pre")),g();break;case"HtmlBlock":g(),m(y.safe?"\x3c!-- raw HTML omitted --\x3e":s.literal),g();break;case"CustomBlock":g(),u&&s.onEnter?m(s.onEnter):!u&&s.onExit&&m(s.onExit),g();break;case"ThematicBreak":g(),m(o("hr",t,!0)),g();break;default:throw"Unknown node type "+s.type}}return y.time&&console.timeEnd("rendering"),f};e.exports=r},function(e,t,n){"use strict";e.exports.version="0.24.0",e.exports.Node=n(256),e.exports.Parser=n(1073),e.exports.HtmlRenderer=n(1075),e.exports.XmlRenderer=n(1079)},function(e,t,n){"use strict";function r(e){return{subject:"",delimiters:null,pos:0,refmap:{},match:N,peek:B,spnl:L,parseBackticks:q,parseBackslash:z,parseAutolink:U,parseHtmlTag:W,scanDelims:V,handleDelim:H,parseLinkTitle:X,parseLinkDestination:Y,parseLinkLabel:$,parseOpenBracket:Z,parseCloseBracket:ee,parseBang:Q,parseEntity:te,parseString:ne,parseNewline:re,parseReference:ie,parseInline:oe,processEmphasis:K,removeDelimiter:G,options:e||{},parse:ae}}var i=n(256),o=n(91),a=n(1078),s=o.normalizeURI,u=o.unescapeString,l=n(1074),c=n(114).decodeHTML;n(494);var p=o.ESCAPABLE,f="\\\\"+p,h="\\(([^\\\\()\\x00-\\x20]|"+f+"|\\\\)*\\)",d=o.ENTITY,m=o.reHtmlTag,v=new RegExp(/^[\u2000-\u206F\u2E00-\u2E7F\\'!"#\$%&\(\)\*\+,\-\.\/:;<=>\?@\[\]\^_`\{\|\}~]/),g=new RegExp('^(?:"('+f+'|[^"\\x00])*"|\'('+f+"|[^'\\x00])*'|\\(("+f+"|[^)\\x00])*\\))"),y=new RegExp("^(?:[<](?:[^ <>\\t\\n\\\\\\x00]|"+f+"|\\\\)*[>])"),_=new RegExp("^(?:[^\\\\()\\x00-\\x20]+|"+f+"|\\\\|"+h+")*"),b=new RegExp("^"+p),x=new RegExp("^"+d,"i"),w=/`+/,k=/^`+/,E=/\.\.\./g,S=/--+/g,C=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,A=/^<[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*>/i,D=/^ *(?:\n *)?/,O=/^\s/,M=/\s+/g,T=/ *$/,P=/^ */,I=/^ *(?:\n|$)/,R=new RegExp("^\\[(?:[^\\\\\\[\\]]|"+f+"|\\\\){0,1000}\\]"),j=/^[^\n`\[\]\\!<&*_'"]+/m,F=function(e){var t=new i("Text");return t._literal=e,t},N=function(e){var t=e.exec(this.subject.slice(this.pos));return null===t?null:(this.pos+=t.index+t[0].length,t[0])},B=function(){return this.pos<this.subject.length?this.subject.charCodeAt(this.pos):-1},L=function(){return this.match(D),!0},q=function(e){var t=this.match(k);if(null===t)return!1;for(var n,r,o=this.pos;null!==(n=this.match(w));)if(n===t)return r=new i("Code"),r._literal=this.subject.slice(o,this.pos-t.length).trim().replace(M," "),e.appendChild(r),!0;return this.pos=o,e.appendChild(F(t)),!0},z=function(e){var t,n=this.subject;return this.pos+=1,10===this.peek()?(this.pos+=1,t=new i("Hardbreak"),e.appendChild(t)):b.test(n.charAt(this.pos))?(e.appendChild(F(n.charAt(this.pos))),this.pos+=1):e.appendChild(F("\\")),!0},U=function(e){var t,n,r;return(t=this.match(C))?(n=t.slice(1,t.length-1),r=new i("Link"),r._destination=s("mailto:"+n),r._title="",r.appendChild(F(n)),e.appendChild(r),!0):!!(t=this.match(A))&&(n=t.slice(1,t.length-1),r=new i("Link"),r._destination=s(n),r._title="",r.appendChild(F(n)),e.appendChild(r),!0)},W=function(e){var t=this.match(m);if(null===t)return!1;var n=new i("HtmlInline");return n._literal=t,e.appendChild(n),!0},V=function(e){var t,n,r,i,o,a,s,u,c,p,f,h=0,d=this.pos;if(39===e||34===e)h++,this.pos++;else for(;this.peek()===e;)h++,this.pos++;return 0===h?null:(t=0===d?"\n":this.subject.charAt(d-1),r=this.peek(),n=-1===r?"\n":l(r),u=O.test(n),c=v.test(n),p=O.test(t),f=v.test(t),i=!(u||c&&!p&&!f),o=!(p||f&&!u&&!c),95===e?(a=i&&(!o||f),s=o&&(!i||c)):39===e||34===e?(a=i&&!o,s=o):(a=i,s=o),this.pos=d,{numdelims:h,can_open:a,can_close:s})},H=function(e,t){var n=this.scanDelims(e);if(!n)return!1;var r,i=n.numdelims,o=this.pos;this.pos+=i,r=39===e?"’":34===e?"“":this.subject.slice(o,this.pos);var a=F(r);return t.appendChild(a),this.delimiters={cc:e,numdelims:i,node:a,previous:this.delimiters,next:null,can_open:n.can_open,can_close:n.can_close,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},G=function(e){null!==e.previous&&(e.previous.next=e.next),null===e.next?this.delimiters=e.previous:e.next.previous=e.previous},J=function(e,t){e.next!==t&&(e.next=t,t.previous=e)},K=function(e){var t,n,r,o,a,s,u,l,c,p,f=[];for(f[95]=e,f[42]=e,f[39]=e,f[34]=e,n=this.delimiters;null!==n&&n.previous!==e;)n=n.previous;for(;null!==n;){var h=n.cc;if(!n.can_close||95!==h&&42!==h&&39!==h&&34!==h)n=n.next;else{for(t=n.previous,p=!1;null!==t&&t!==e&&t!==f[h];){if(t.cc===n.cc&&t.can_open){p=!0;break}t=t.previous}if(r=n,42===h||95===h)if(p){u=n.numdelims<3||t.numdelims<3?n.numdelims<=t.numdelims?n.numdelims:t.numdelims:n.numdelims%2==0?2:1,o=t.node,a=n.node,t.numdelims-=u,n.numdelims-=u,o._literal=o._literal.slice(0,o._literal.length-u),a._literal=a._literal.slice(0,a._literal.length-u);var d=new i(1===u?"Emph":"Strong");for(l=o._next;l&&l!==a;)c=l._next,l.unlink(),d.appendChild(l),l=c;o.insertAfter(d),J(t,n),0===t.numdelims&&(o.unlink(),this.removeDelimiter(t)),0===n.numdelims&&(a.unlink(),s=n.next,this.removeDelimiter(n),n=s)}else n=n.next;else 39===h?(n.node._literal="’",p&&(t.node._literal="‘"),n=n.next):34===h&&(n.node._literal="”",p&&(t.node.literal="“"),n=n.next);p||(f[h]=r.previous,r.can_open||this.removeDelimiter(r))}}for(;null!==this.delimiters&&this.delimiters!==e;)this.removeDelimiter(this.delimiters)},X=function(){var e=this.match(g);return null===e?null:u(e.substr(1,e.length-2))},Y=function(){var e=this.match(y);return null===e?(e=this.match(_),null===e?null:s(u(e))):s(u(e.substr(1,e.length-2)))},$=function(){var e=this.match(R);return null===e||e.length>1001?0:e.length},Z=function(e){var t=this.pos;this.pos+=1;var n=F("[");return e.appendChild(n),this.delimiters={cc:91,numdelims:1,node:n,previous:this.delimiters,next:null,can_open:!0,can_close:!1,index:t,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters),!0},Q=function(e){var t=this.pos;if(this.pos+=1,91===this.peek()){this.pos+=1;var n=F("![");e.appendChild(n),this.delimiters={cc:33,numdelims:1,node:n,previous:this.delimiters,next:null,can_open:!0,can_close:!1,index:t+1,active:!0},null!==this.delimiters.previous&&(this.delimiters.previous.next=this.delimiters)}else e.appendChild(F("!"));return!0},ee=function(e){var t,n,r,o,s,u,l=!1;for(this.pos+=1,t=this.pos,u=this.delimiters;null!==u&&91!==u.cc&&33!==u.cc;)u=u.previous;if(null===u)return e.appendChild(F("]")),!0;if(!u.active)return e.appendChild(F("]")),this.removeDelimiter(u),!0;if(n=33===u.cc,40===this.peek())this.pos++,this.spnl()&&null!==(r=this.parseLinkDestination())&&this.spnl()&&(O.test(this.subject.charAt(this.pos-1))&&(o=this.parseLinkTitle()),!0)&&this.spnl()&&41===this.peek()&&(this.pos+=1,l=!0);else{var c=this.pos,p=this.pos,f=this.parseLinkLabel();s=0===f||2===f?this.subject.slice(u.index,t):this.subject.slice(p,p+f),0===f&&(this.pos=c);var h=this.refmap[a(s)];h&&(r=h.destination,o=h.title,l=!0)}if(l){var d=new i(n?"Image":"Link");d._destination=r,d._title=o||"";var m,v;for(m=u.node._next;m;)v=m._next,m.unlink(),d.appendChild(m),m=v;if(e.appendChild(d),this.processEmphasis(u.previous),u.node.unlink(),!n)for(u=this.delimiters;null!==u;)91===u.cc&&(u.active=!1),u=u.previous;return!0}return this.removeDelimiter(u),this.pos=t,e.appendChild(F("]")),!0},te=function(e){var t;return!!(t=this.match(x))&&(e.appendChild(F(c(t))),!0)},ne=function(e){var t;return!!(t=this.match(j))&&(this.options.smart?e.appendChild(F(t.replace(E,"…").replace(S,function(e){var t=0,n=0;return e.length%3==0?n=e.length/3:e.length%2==0?t=e.length/2:e.length%3==2?(t=1,n=(e.length-2)/3):(t=2,n=(e.length-4)/3),"—".repeat(n)+"–".repeat(t)}))):e.appendChild(F(t)),!0)},re=function(e){this.pos+=1;var t=e._lastChild;if(t&&"Text"===t.type&&" "===t._literal[t._literal.length-1]){var n=" "===t._literal[t._literal.length-2];t._literal=t._literal.replace(T,""),e.appendChild(new i(n?"Hardbreak":"Softbreak"))}else e.appendChild(new i("Softbreak"));return this.match(P),!0},ie=function(e,t){this.subject=e,this.pos=0;var n,r,i,o,s=this.pos;if(0===(o=this.parseLinkLabel()))return 0;if(n=this.subject.substr(0,o),58!==this.peek())return this.pos=s,0;if(this.pos++,this.spnl(),null===(r=this.parseLinkDestination())||0===r.length)return this.pos=s,0;var u=this.pos;this.spnl(),null===(i=this.parseLinkTitle())&&(i="",this.pos=u);var l=!0;if(null===this.match(I)&&(""===i?l=!1:(i="",this.pos=u,l=null!==this.match(I))),!l)return this.pos=s,0;var c=a(n);return""===c?(this.pos=s,0):(t[c]||(t[c]={destination:r,title:i}),this.pos-s)},oe=function(e){var t=!1,n=this.peek();if(-1===n)return!1;switch(n){case 10:t=this.parseNewline(e);break;case 92:t=this.parseBackslash(e);break;case 96:t=this.parseBackticks(e);break;case 42:case 95:t=this.handleDelim(n,e);break;case 39:case 34:t=this.options.smart&&this.handleDelim(n,e);break;case 91:t=this.parseOpenBracket(e);break;case 33:t=this.parseBang(e);break;case 93:t=this.parseCloseBracket(e);break;case 60:t=this.parseAutolink(e)||this.parseHtmlTag(e);break;case 38:t=this.parseEntity(e);break;default:t=this.parseString(e)}return t||(this.pos+=1,e.appendChild(F(l(n)))),!0},ae=function(e){for(this.subject=e._string_content.trim(),this.pos=0,this.delimiters=null;this.parseInline(e););e._string_content=null,this.processEmphasis(null)};e.exports=r},function(e,t,n){"use strict";var r=/[ \t\r\n]+|[A-Z\xB5\xC0-\xD6\xD8-\xDF\u0100\u0102\u0104\u0106\u0108\u010A\u010C\u010E\u0110\u0112\u0114\u0116\u0118\u011A\u011C\u011E\u0120\u0122\u0124\u0126\u0128\u012A\u012C\u012E\u0130\u0132\u0134\u0136\u0139\u013B\u013D\u013F\u0141\u0143\u0145\u0147\u0149\u014A\u014C\u014E\u0150\u0152\u0154\u0156\u0158\u015A\u015C\u015E\u0160\u0162\u0164\u0166\u0168\u016A\u016C\u016E\u0170\u0172\u0174\u0176\u0178\u0179\u017B\u017D\u017F\u0181\u0182\u0184\u0186\u0187\u0189-\u018B\u018E-\u0191\u0193\u0194\u0196-\u0198\u019C\u019D\u019F\u01A0\u01A2\u01A4\u01A6\u01A7\u01A9\u01AC\u01AE\u01AF\u01B1-\u01B3\u01B5\u01B7\u01B8\u01BC\u01C4\u01C5\u01C7\u01C8\u01CA\u01CB\u01CD\u01CF\u01D1\u01D3\u01D5\u01D7\u01D9\u01DB\u01DE\u01E0\u01E2\u01E4\u01E6\u01E8\u01EA\u01EC\u01EE\u01F0-\u01F2\u01F4\u01F6-\u01F8\u01FA\u01FC\u01FE\u0200\u0202\u0204\u0206\u0208\u020A\u020C\u020E\u0210\u0212\u0214\u0216\u0218\u021A\u021C\u021E\u0220\u0222\u0224\u0226\u0228\u022A\u022C\u022E\u0230\u0232\u023A\u023B\u023D\u023E\u0241\u0243-\u0246\u0248\u024A\u024C\u024E\u0345\u0370\u0372\u0376\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03AB\u03B0\u03C2\u03CF-\u03D1\u03D5\u03D6\u03D8\u03DA\u03DC\u03DE\u03E0\u03E2\u03E4\u03E6\u03E8\u03EA\u03EC\u03EE\u03F0\u03F1\u03F4\u03F5\u03F7\u03F9\u03FA\u03FD-\u042F\u0460\u0462\u0464\u0466\u0468\u046A\u046C\u046E\u0470\u0472\u0474\u0476\u0478\u047A\u047C\u047E\u0480\u048A\u048C\u048E\u0490\u0492\u0494\u0496\u0498\u049A\u049C\u049E\u04A0\u04A2\u04A4\u04A6\u04A8\u04AA\u04AC\u04AE\u04B0\u04B2\u04B4\u04B6\u04B8\u04BA\u04BC\u04BE\u04C0\u04C1\u04C3\u04C5\u04C7\u04C9\u04CB\u04CD\u04D0\u04D2\u04D4\u04D6\u04D8\u04DA\u04DC\u04DE\u04E0\u04E2\u04E4\u04E6\u04E8\u04EA\u04EC\u04EE\u04F0\u04F2\u04F4\u04F6\u04F8\u04FA\u04FC\u04FE\u0500\u0502\u0504\u0506\u0508\u050A\u050C\u050E\u0510\u0512\u0514\u0516\u0518\u051A\u051C\u051E\u0520\u0522\u0524\u0526\u0528\u052A\u052C\u052E\u0531-\u0556\u0587\u10A0-\u10C5\u10C7\u10CD\u1E00\u1E02\u1E04\u1E06\u1E08\u1E0A\u1E0C\u1E0E\u1E10\u1E12\u1E14\u1E16\u1E18\u1E1A\u1E1C\u1E1E\u1E20\u1E22\u1E24\u1E26\u1E28\u1E2A\u1E2C\u1E2E\u1E30\u1E32\u1E34\u1E36\u1E38\u1E3A\u1E3C\u1E3E\u1E40\u1E42\u1E44\u1E46\u1E48\u1E4A\u1E4C\u1E4E\u1E50\u1E52\u1E54\u1E56\u1E58\u1E5A\u1E5C\u1E5E\u1E60\u1E62\u1E64\u1E66\u1E68\u1E6A\u1E6C\u1E6E\u1E70\u1E72\u1E74\u1E76\u1E78\u1E7A\u1E7C\u1E7E\u1E80\u1E82\u1E84\u1E86\u1E88\u1E8A\u1E8C\u1E8E\u1E90\u1E92\u1E94\u1E96-\u1E9B\u1E9E\u1EA0\u1EA2\u1EA4\u1EA6\u1EA8\u1EAA\u1EAC\u1EAE\u1EB0\u1EB2\u1EB4\u1EB6\u1EB8\u1EBA\u1EBC\u1EBE\u1EC0\u1EC2\u1EC4\u1EC6\u1EC8\u1ECA\u1ECC\u1ECE\u1ED0\u1ED2\u1ED4\u1ED6\u1ED8\u1EDA\u1EDC\u1EDE\u1EE0\u1EE2\u1EE4\u1EE6\u1EE8\u1EEA\u1EEC\u1EEE\u1EF0\u1EF2\u1EF4\u1EF6\u1EF8\u1EFA\u1EFC\u1EFE\u1F08-\u1F0F\u1F18-\u1F1D\u1F28-\u1F2F\u1F38-\u1F3F\u1F48-\u1F4D\u1F50\u1F52\u1F54\u1F56\u1F59\u1F5B\u1F5D\u1F5F\u1F68-\u1F6F\u1F80-\u1FAF\u1FB2-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD2\u1FD3\u1FD6-\u1FDB\u1FE2-\u1FE4\u1FE6-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A\u212B\u2132\u2160-\u216F\u2183\u24B6-\u24CF\u2C00-\u2C2E\u2C60\u2C62-\u2C64\u2C67\u2C69\u2C6B\u2C6D-\u2C70\u2C72\u2C75\u2C7E-\u2C80\u2C82\u2C84\u2C86\u2C88\u2C8A\u2C8C\u2C8E\u2C90\u2C92\u2C94\u2C96\u2C98\u2C9A\u2C9C\u2C9E\u2CA0\u2CA2\u2CA4\u2CA6\u2CA8\u2CAA\u2CAC\u2CAE\u2CB0\u2CB2\u2CB4\u2CB6\u2CB8\u2CBA\u2CBC\u2CBE\u2CC0\u2CC2\u2CC4\u2CC6\u2CC8\u2CCA\u2CCC\u2CCE\u2CD0\u2CD2\u2CD4\u2CD6\u2CD8\u2CDA\u2CDC\u2CDE\u2CE0\u2CE2\u2CEB\u2CED\u2CF2\uA640\uA642\uA644\uA646\uA648\uA64A\uA64C\uA64E\uA650\uA652\uA654\uA656\uA658\uA65A\uA65C\uA65E\uA660\uA662\uA664\uA666\uA668\uA66A\uA66C\uA680\uA682\uA684\uA686\uA688\uA68A\uA68C\uA68E\uA690\uA692\uA694\uA696\uA698\uA69A\uA722\uA724\uA726\uA728\uA72A\uA72C\uA72E\uA732\uA734\uA736\uA738\uA73A\uA73C\uA73E\uA740\uA742\uA744\uA746\uA748\uA74A\uA74C\uA74E\uA750\uA752\uA754\uA756\uA758\uA75A\uA75C\uA75E\uA760\uA762\uA764\uA766\uA768\uA76A\uA76C\uA76E\uA779\uA77B\uA77D\uA77E\uA780\uA782\uA784\uA786\uA78B\uA78D\uA790\uA792\uA796\uA798\uA79A\uA79C\uA79E\uA7A0\uA7A2\uA7A4\uA7A6\uA7A8\uA7AA-\uA7AD\uA7B0\uA7B1\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A]|\uD801[\uDC00-\uDC27]|\uD806[\uDCA0-\uDCBF]/g,i={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","µ":"μ","À":"à","Á":"á","Â":"â","Ã":"ã","Ä":"ä","Å":"å","Æ":"æ","Ç":"ç","È":"è","É":"é","Ê":"ê","Ë":"ë","Ì":"ì","Í":"í","Î":"î","Ï":"ï","Ð":"ð","Ñ":"ñ","Ò":"ò","Ó":"ó","Ô":"ô","Õ":"õ","Ö":"ö","Ø":"ø","Ù":"ù","Ú":"ú","Û":"û","Ü":"ü","Ý":"ý","Þ":"þ","Ā":"ā","Ă":"ă","Ą":"ą","Ć":"ć","Ĉ":"ĉ","Ċ":"ċ","Č":"č","Ď":"ď","Đ":"đ","Ē":"ē","Ĕ":"ĕ","Ė":"ė","Ę":"ę","Ě":"ě","Ĝ":"ĝ","Ğ":"ğ","Ġ":"ġ","Ģ":"ģ","Ĥ":"ĥ","Ħ":"ħ","Ĩ":"ĩ","Ī":"ī","Ĭ":"ĭ","Į":"į","IJ":"ij","Ĵ":"ĵ","Ķ":"ķ","Ĺ":"ĺ","Ļ":"ļ","Ľ":"ľ","Ŀ":"ŀ","Ł":"ł","Ń":"ń","Ņ":"ņ","Ň":"ň","Ŋ":"ŋ","Ō":"ō","Ŏ":"ŏ","Ő":"ő","Œ":"œ","Ŕ":"ŕ","Ŗ":"ŗ","Ř":"ř","Ś":"ś","Ŝ":"ŝ","Ş":"ş","Š":"š","Ţ":"ţ","Ť":"ť","Ŧ":"ŧ","Ũ":"ũ","Ū":"ū","Ŭ":"ŭ","Ů":"ů","Ű":"ű","Ų":"ų","Ŵ":"ŵ","Ŷ":"ŷ","Ÿ":"ÿ","Ź":"ź","Ż":"ż","Ž":"ž","ſ":"s","Ɓ":"ɓ","Ƃ":"ƃ","Ƅ":"ƅ","Ɔ":"ɔ","Ƈ":"ƈ","Ɖ":"ɖ","Ɗ":"ɗ","Ƌ":"ƌ","Ǝ":"ǝ","Ə":"ə","Ɛ":"ɛ","Ƒ":"ƒ","Ɠ":"ɠ","Ɣ":"ɣ","Ɩ":"ɩ","Ɨ":"ɨ","Ƙ":"ƙ","Ɯ":"ɯ","Ɲ":"ɲ","Ɵ":"ɵ","Ơ":"ơ","Ƣ":"ƣ","Ƥ":"ƥ","Ʀ":"ʀ","Ƨ":"ƨ","Ʃ":"ʃ","Ƭ":"ƭ","Ʈ":"ʈ","Ư":"ư","Ʊ":"ʊ","Ʋ":"ʋ","Ƴ":"ƴ","Ƶ":"ƶ","Ʒ":"ʒ","Ƹ":"ƹ","Ƽ":"ƽ","DŽ":"dž","Dž":"dž","LJ":"lj","Lj":"lj","NJ":"nj","Nj":"nj","Ǎ":"ǎ","Ǐ":"ǐ","Ǒ":"ǒ","Ǔ":"ǔ","Ǖ":"ǖ","Ǘ":"ǘ","Ǚ":"ǚ","Ǜ":"ǜ","Ǟ":"ǟ","Ǡ":"ǡ","Ǣ":"ǣ","Ǥ":"ǥ","Ǧ":"ǧ","Ǩ":"ǩ","Ǫ":"ǫ","Ǭ":"ǭ","Ǯ":"ǯ","DZ":"dz","Dz":"dz","Ǵ":"ǵ","Ƕ":"ƕ","Ƿ":"ƿ","Ǹ":"ǹ","Ǻ":"ǻ","Ǽ":"ǽ","Ǿ":"ǿ","Ȁ":"ȁ","Ȃ":"ȃ","Ȅ":"ȅ","Ȇ":"ȇ","Ȉ":"ȉ","Ȋ":"ȋ","Ȍ":"ȍ","Ȏ":"ȏ","Ȑ":"ȑ","Ȓ":"ȓ","Ȕ":"ȕ","Ȗ":"ȗ","Ș":"ș","Ț":"ț","Ȝ":"ȝ","Ȟ":"ȟ","Ƞ":"ƞ","Ȣ":"ȣ","Ȥ":"ȥ","Ȧ":"ȧ","Ȩ":"ȩ","Ȫ":"ȫ","Ȭ":"ȭ","Ȯ":"ȯ","Ȱ":"ȱ","Ȳ":"ȳ","Ⱥ":"ⱥ","Ȼ":"ȼ","Ƚ":"ƚ","Ⱦ":"ⱦ","Ɂ":"ɂ","Ƀ":"ƀ","Ʉ":"ʉ","Ʌ":"ʌ","Ɇ":"ɇ","Ɉ":"ɉ","Ɋ":"ɋ","Ɍ":"ɍ","Ɏ":"ɏ","ͅ":"ι","Ͱ":"ͱ","Ͳ":"ͳ","Ͷ":"ͷ","Ϳ":"ϳ","Ά":"ά","Έ":"έ","Ή":"ή","Ί":"ί","Ό":"ό","Ύ":"ύ","Ώ":"ώ","Α":"α","Β":"β","Γ":"γ","Δ":"δ","Ε":"ε","Ζ":"ζ","Η":"η","Θ":"θ","Ι":"ι","Κ":"κ","Λ":"λ","Μ":"μ","Ν":"ν","Ξ":"ξ","Ο":"ο","Π":"π","Ρ":"ρ","Σ":"σ","Τ":"τ","Υ":"υ","Φ":"φ","Χ":"χ","Ψ":"ψ","Ω":"ω","Ϊ":"ϊ","Ϋ":"ϋ","ς":"σ","Ϗ":"ϗ","ϐ":"β","ϑ":"θ","ϕ":"φ","ϖ":"π","Ϙ":"ϙ","Ϛ":"ϛ","Ϝ":"ϝ","Ϟ":"ϟ","Ϡ":"ϡ","Ϣ":"ϣ","Ϥ":"ϥ","Ϧ":"ϧ","Ϩ":"ϩ","Ϫ":"ϫ","Ϭ":"ϭ","Ϯ":"ϯ","ϰ":"κ","ϱ":"ρ","ϴ":"θ","ϵ":"ε","Ϸ":"ϸ","Ϲ":"ϲ","Ϻ":"ϻ","Ͻ":"ͻ","Ͼ":"ͼ","Ͽ":"ͽ","Ѐ":"ѐ","Ё":"ё","Ђ":"ђ","Ѓ":"ѓ","Є":"є","Ѕ":"ѕ","І":"і","Ї":"ї","Ј":"ј","Љ":"љ","Њ":"њ","Ћ":"ћ","Ќ":"ќ","Ѝ":"ѝ","Ў":"ў","Џ":"џ","А":"а","Б":"б","В":"в","Г":"г","Д":"д","Е":"е","Ж":"ж","З":"з","И":"и","Й":"й","К":"к","Л":"л","М":"м","Н":"н","О":"о","П":"п","Р":"р","С":"с","Т":"т","У":"у","Ф":"ф","Х":"х","Ц":"ц","Ч":"ч","Ш":"ш","Щ":"щ","Ъ":"ъ","Ы":"ы","Ь":"ь","Э":"э","Ю":"ю","Я":"я","Ѡ":"ѡ","Ѣ":"ѣ","Ѥ":"ѥ","Ѧ":"ѧ","Ѩ":"ѩ","Ѫ":"ѫ","Ѭ":"ѭ","Ѯ":"ѯ","Ѱ":"ѱ","Ѳ":"ѳ","Ѵ":"ѵ","Ѷ":"ѷ","Ѹ":"ѹ","Ѻ":"ѻ","Ѽ":"ѽ","Ѿ":"ѿ","Ҁ":"ҁ","Ҋ":"ҋ","Ҍ":"ҍ","Ҏ":"ҏ","Ґ":"ґ","Ғ":"ғ","Ҕ":"ҕ","Җ":"җ","Ҙ":"ҙ","Қ":"қ","Ҝ":"ҝ","Ҟ":"ҟ","Ҡ":"ҡ","Ң":"ң","Ҥ":"ҥ","Ҧ":"ҧ","Ҩ":"ҩ","Ҫ":"ҫ","Ҭ":"ҭ","Ү":"ү","Ұ":"ұ","Ҳ":"ҳ","Ҵ":"ҵ","Ҷ":"ҷ","Ҹ":"ҹ","Һ":"һ","Ҽ":"ҽ","Ҿ":"ҿ","Ӏ":"ӏ","Ӂ":"ӂ","Ӄ":"ӄ","Ӆ":"ӆ","Ӈ":"ӈ","Ӊ":"ӊ","Ӌ":"ӌ","Ӎ":"ӎ","Ӑ":"ӑ","Ӓ":"ӓ","Ӕ":"ӕ","Ӗ":"ӗ","Ә":"ә","Ӛ":"ӛ","Ӝ":"ӝ","Ӟ":"ӟ","Ӡ":"ӡ","Ӣ":"ӣ","Ӥ":"ӥ","Ӧ":"ӧ","Ө":"ө","Ӫ":"ӫ","Ӭ":"ӭ","Ӯ":"ӯ","Ӱ":"ӱ","Ӳ":"ӳ","Ӵ":"ӵ","Ӷ":"ӷ","Ӹ":"ӹ","Ӻ":"ӻ","Ӽ":"ӽ","Ӿ":"ӿ","Ԁ":"ԁ","Ԃ":"ԃ","Ԅ":"ԅ","Ԇ":"ԇ","Ԉ":"ԉ","Ԋ":"ԋ","Ԍ":"ԍ","Ԏ":"ԏ","Ԑ":"ԑ","Ԓ":"ԓ","Ԕ":"ԕ","Ԗ":"ԗ","Ԙ":"ԙ","Ԛ":"ԛ","Ԝ":"ԝ","Ԟ":"ԟ","Ԡ":"ԡ","Ԣ":"ԣ","Ԥ":"ԥ","Ԧ":"ԧ","Ԩ":"ԩ","Ԫ":"ԫ","Ԭ":"ԭ","Ԯ":"ԯ","Ա":"ա","Բ":"բ","Գ":"գ","Դ":"դ","Ե":"ե","Զ":"զ","Է":"է","Ը":"ը","Թ":"թ","Ժ":"ժ","Ի":"ի","Լ":"լ","Խ":"խ","Ծ":"ծ","Կ":"կ","Հ":"հ","Ձ":"ձ","Ղ":"ղ","Ճ":"ճ","Մ":"մ","Յ":"յ","Ն":"ն","Շ":"շ","Ո":"ո","Չ":"չ","Պ":"պ","Ջ":"ջ","Ռ":"ռ","Ս":"ս","Վ":"վ","Տ":"տ","Ր":"ր","Ց":"ց","Ւ":"ւ","Փ":"փ","Ք":"ք","Օ":"օ","Ֆ":"ֆ","Ⴀ":"ⴀ","Ⴁ":"ⴁ","Ⴂ":"ⴂ","Ⴃ":"ⴃ","Ⴄ":"ⴄ","Ⴅ":"ⴅ","Ⴆ":"ⴆ","Ⴇ":"ⴇ","Ⴈ":"ⴈ","Ⴉ":"ⴉ","Ⴊ":"ⴊ","Ⴋ":"ⴋ","Ⴌ":"ⴌ","Ⴍ":"ⴍ","Ⴎ":"ⴎ","Ⴏ":"ⴏ","Ⴐ":"ⴐ","Ⴑ":"ⴑ","Ⴒ":"ⴒ","Ⴓ":"ⴓ","Ⴔ":"ⴔ","Ⴕ":"ⴕ","Ⴖ":"ⴖ","Ⴗ":"ⴗ","Ⴘ":"ⴘ","Ⴙ":"ⴙ","Ⴚ":"ⴚ","Ⴛ":"ⴛ","Ⴜ":"ⴜ","Ⴝ":"ⴝ","Ⴞ":"ⴞ","Ⴟ":"ⴟ","Ⴠ":"ⴠ","Ⴡ":"ⴡ","Ⴢ":"ⴢ","Ⴣ":"ⴣ","Ⴤ":"ⴤ","Ⴥ":"ⴥ","Ⴧ":"ⴧ","Ⴭ":"ⴭ","Ḁ":"ḁ","Ḃ":"ḃ","Ḅ":"ḅ","Ḇ":"ḇ","Ḉ":"ḉ","Ḋ":"ḋ","Ḍ":"ḍ","Ḏ":"ḏ","Ḑ":"ḑ","Ḓ":"ḓ","Ḕ":"ḕ","Ḗ":"ḗ","Ḙ":"ḙ","Ḛ":"ḛ","Ḝ":"ḝ","Ḟ":"ḟ","Ḡ":"ḡ","Ḣ":"ḣ","Ḥ":"ḥ","Ḧ":"ḧ","Ḩ":"ḩ","Ḫ":"ḫ","Ḭ":"ḭ","Ḯ":"ḯ","Ḱ":"ḱ","Ḳ":"ḳ","Ḵ":"ḵ","Ḷ":"ḷ","Ḹ":"ḹ","Ḻ":"ḻ","Ḽ":"ḽ","Ḿ":"ḿ","Ṁ":"ṁ","Ṃ":"ṃ","Ṅ":"ṅ","Ṇ":"ṇ","Ṉ":"ṉ","Ṋ":"ṋ","Ṍ":"ṍ","Ṏ":"ṏ","Ṑ":"ṑ","Ṓ":"ṓ","Ṕ":"ṕ","Ṗ":"ṗ","Ṙ":"ṙ","Ṛ":"ṛ","Ṝ":"ṝ","Ṟ":"ṟ","Ṡ":"ṡ","Ṣ":"ṣ","Ṥ":"ṥ","Ṧ":"ṧ","Ṩ":"ṩ","Ṫ":"ṫ","Ṭ":"ṭ","Ṯ":"ṯ","Ṱ":"ṱ","Ṳ":"ṳ","Ṵ":"ṵ","Ṷ":"ṷ","Ṹ":"ṹ","Ṻ":"ṻ","Ṽ":"ṽ","Ṿ":"ṿ","Ẁ":"ẁ","Ẃ":"ẃ","Ẅ":"ẅ","Ẇ":"ẇ","Ẉ":"ẉ","Ẋ":"ẋ","Ẍ":"ẍ","Ẏ":"ẏ","Ẑ":"ẑ","Ẓ":"ẓ","Ẕ":"ẕ","ẛ":"ṡ","Ạ":"ạ","Ả":"ả","Ấ":"ấ","Ầ":"ầ","Ẩ":"ẩ","Ẫ":"ẫ","Ậ":"ậ","Ắ":"ắ","Ằ":"ằ","Ẳ":"ẳ","Ẵ":"ẵ","Ặ":"ặ","Ẹ":"ẹ","Ẻ":"ẻ","Ẽ":"ẽ","Ế":"ế","Ề":"ề","Ể":"ể","Ễ":"ễ","Ệ":"ệ","Ỉ":"ỉ","Ị":"ị","Ọ":"ọ","Ỏ":"ỏ","Ố":"ố","Ồ":"ồ","Ổ":"ổ","Ỗ":"ỗ","Ộ":"ộ","Ớ":"ớ","Ờ":"ờ","Ở":"ở","Ỡ":"ỡ","Ợ":"ợ","Ụ":"ụ","Ủ":"ủ","Ứ":"ứ","Ừ":"ừ","Ử":"ử","Ữ":"ữ","Ự":"ự","Ỳ":"ỳ","Ỵ":"ỵ","Ỷ":"ỷ","Ỹ":"ỹ","Ỻ":"ỻ","Ỽ":"ỽ","Ỿ":"ỿ","Ἀ":"ἀ","Ἁ":"ἁ","Ἂ":"ἂ","Ἃ":"ἃ","Ἄ":"ἄ","Ἅ":"ἅ","Ἆ":"ἆ","Ἇ":"ἇ","Ἐ":"ἐ","Ἑ":"ἑ","Ἒ":"ἒ","Ἓ":"ἓ","Ἔ":"ἔ","Ἕ":"ἕ","Ἠ":"ἠ","Ἡ":"ἡ","Ἢ":"ἢ","Ἣ":"ἣ","Ἤ":"ἤ","Ἥ":"ἥ","Ἦ":"ἦ","Ἧ":"ἧ","Ἰ":"ἰ","Ἱ":"ἱ","Ἲ":"ἲ","Ἳ":"ἳ","Ἴ":"ἴ","Ἵ":"ἵ","Ἶ":"ἶ","Ἷ":"ἷ","Ὀ":"ὀ","Ὁ":"ὁ","Ὂ":"ὂ","Ὃ":"ὃ","Ὄ":"ὄ","Ὅ":"ὅ","Ὑ":"ὑ","Ὓ":"ὓ","Ὕ":"ὕ","Ὗ":"ὗ","Ὠ":"ὠ","Ὡ":"ὡ","Ὢ":"ὢ","Ὣ":"ὣ","Ὤ":"ὤ","Ὥ":"ὥ","Ὦ":"ὦ","Ὧ":"ὧ","Ᾰ":"ᾰ","Ᾱ":"ᾱ","Ὰ":"ὰ","Ά":"ά","ι":"ι","Ὲ":"ὲ","Έ":"έ","Ὴ":"ὴ","Ή":"ή","Ῐ":"ῐ","Ῑ":"ῑ","Ὶ":"ὶ","Ί":"ί","Ῠ":"ῠ","Ῡ":"ῡ","Ὺ":"ὺ","Ύ":"ύ","Ῥ":"ῥ","Ὸ":"ὸ","Ό":"ό","Ὼ":"ὼ","Ώ":"ώ","Ω":"ω","K":"k","Å":"å","Ⅎ":"ⅎ","Ⅰ":"ⅰ","Ⅱ":"ⅱ","Ⅲ":"ⅲ","Ⅳ":"ⅳ","Ⅴ":"ⅴ","Ⅵ":"ⅵ","Ⅶ":"ⅶ","Ⅷ":"ⅷ","Ⅸ":"ⅸ","Ⅹ":"ⅹ","Ⅺ":"ⅺ","Ⅻ":"ⅻ","Ⅼ":"ⅼ","Ⅽ":"ⅽ","Ⅾ":"ⅾ","Ⅿ":"ⅿ","Ↄ":"ↄ","Ⓐ":"ⓐ","Ⓑ":"ⓑ","Ⓒ":"ⓒ","Ⓓ":"ⓓ","Ⓔ":"ⓔ","Ⓕ":"ⓕ","Ⓖ":"ⓖ","Ⓗ":"ⓗ","Ⓘ":"ⓘ","Ⓙ":"ⓙ","Ⓚ":"ⓚ","Ⓛ":"ⓛ","Ⓜ":"ⓜ","Ⓝ":"ⓝ","Ⓞ":"ⓞ","Ⓟ":"ⓟ","Ⓠ":"ⓠ","Ⓡ":"ⓡ","Ⓢ":"ⓢ","Ⓣ":"ⓣ","Ⓤ":"ⓤ","Ⓥ":"ⓥ","Ⓦ":"ⓦ","Ⓧ":"ⓧ","Ⓨ":"ⓨ","Ⓩ":"ⓩ","Ⰰ":"ⰰ","Ⰱ":"ⰱ","Ⰲ":"ⰲ","Ⰳ":"ⰳ","Ⰴ":"ⰴ","Ⰵ":"ⰵ","Ⰶ":"ⰶ","Ⰷ":"ⰷ","Ⰸ":"ⰸ","Ⰹ":"ⰹ","Ⰺ":"ⰺ","Ⰻ":"ⰻ","Ⰼ":"ⰼ","Ⰽ":"ⰽ","Ⰾ":"ⰾ","Ⰿ":"ⰿ","Ⱀ":"ⱀ","Ⱁ":"ⱁ","Ⱂ":"ⱂ","Ⱃ":"ⱃ","Ⱄ":"ⱄ","Ⱅ":"ⱅ","Ⱆ":"ⱆ","Ⱇ":"ⱇ","Ⱈ":"ⱈ","Ⱉ":"ⱉ","Ⱊ":"ⱊ","Ⱋ":"ⱋ","Ⱌ":"ⱌ","Ⱍ":"ⱍ","Ⱎ":"ⱎ","Ⱏ":"ⱏ","Ⱐ":"ⱐ","Ⱑ":"ⱑ","Ⱒ":"ⱒ","Ⱓ":"ⱓ","Ⱔ":"ⱔ","Ⱕ":"ⱕ","Ⱖ":"ⱖ","Ⱗ":"ⱗ","Ⱘ":"ⱘ","Ⱙ":"ⱙ","Ⱚ":"ⱚ","Ⱛ":"ⱛ","Ⱜ":"ⱜ","Ⱝ":"ⱝ","Ⱞ":"ⱞ","Ⱡ":"ⱡ","Ɫ":"ɫ","Ᵽ":"ᵽ","Ɽ":"ɽ","Ⱨ":"ⱨ","Ⱪ":"ⱪ","Ⱬ":"ⱬ","Ɑ":"ɑ","Ɱ":"ɱ","Ɐ":"ɐ","Ɒ":"ɒ","Ⱳ":"ⱳ","Ⱶ":"ⱶ","Ȿ":"ȿ","Ɀ":"ɀ","Ⲁ":"ⲁ","Ⲃ":"ⲃ","Ⲅ":"ⲅ","Ⲇ":"ⲇ","Ⲉ":"ⲉ","Ⲋ":"ⲋ","Ⲍ":"ⲍ","Ⲏ":"ⲏ","Ⲑ":"ⲑ","Ⲓ":"ⲓ","Ⲕ":"ⲕ","Ⲗ":"ⲗ","Ⲙ":"ⲙ","Ⲛ":"ⲛ","Ⲝ":"ⲝ","Ⲟ":"ⲟ","Ⲡ":"ⲡ","Ⲣ":"ⲣ","Ⲥ":"ⲥ","Ⲧ":"ⲧ","Ⲩ":"ⲩ","Ⲫ":"ⲫ","Ⲭ":"ⲭ","Ⲯ":"ⲯ","Ⲱ":"ⲱ","Ⲳ":"ⲳ","Ⲵ":"ⲵ","Ⲷ":"ⲷ","Ⲹ":"ⲹ","Ⲻ":"ⲻ","Ⲽ":"ⲽ","Ⲿ":"ⲿ","Ⳁ":"ⳁ","Ⳃ":"ⳃ","Ⳅ":"ⳅ","Ⳇ":"ⳇ","Ⳉ":"ⳉ","Ⳋ":"ⳋ","Ⳍ":"ⳍ","Ⳏ":"ⳏ","Ⳑ":"ⳑ","Ⳓ":"ⳓ","Ⳕ":"ⳕ","Ⳗ":"ⳗ","Ⳙ":"ⳙ","Ⳛ":"ⳛ","Ⳝ":"ⳝ","Ⳟ":"ⳟ","Ⳡ":"ⳡ","Ⳣ":"ⳣ","Ⳬ":"ⳬ","Ⳮ":"ⳮ","Ⳳ":"ⳳ","Ꙁ":"ꙁ","Ꙃ":"ꙃ","Ꙅ":"ꙅ","Ꙇ":"ꙇ","Ꙉ":"ꙉ","Ꙋ":"ꙋ","Ꙍ":"ꙍ","Ꙏ":"ꙏ","Ꙑ":"ꙑ","Ꙓ":"ꙓ","Ꙕ":"ꙕ","Ꙗ":"ꙗ","Ꙙ":"ꙙ","Ꙛ":"ꙛ","Ꙝ":"ꙝ","Ꙟ":"ꙟ","Ꙡ":"ꙡ","Ꙣ":"ꙣ","Ꙥ":"ꙥ","Ꙧ":"ꙧ","Ꙩ":"ꙩ","Ꙫ":"ꙫ","Ꙭ":"ꙭ","Ꚁ":"ꚁ","Ꚃ":"ꚃ","Ꚅ":"ꚅ","Ꚇ":"ꚇ","Ꚉ":"ꚉ","Ꚋ":"ꚋ","Ꚍ":"ꚍ","Ꚏ":"ꚏ","Ꚑ":"ꚑ","Ꚓ":"ꚓ","Ꚕ":"ꚕ","Ꚗ":"ꚗ","Ꚙ":"ꚙ","Ꚛ":"ꚛ","Ꜣ":"ꜣ","Ꜥ":"ꜥ","Ꜧ":"ꜧ","Ꜩ":"ꜩ","Ꜫ":"ꜫ","Ꜭ":"ꜭ","Ꜯ":"ꜯ","Ꜳ":"ꜳ","Ꜵ":"ꜵ","Ꜷ":"ꜷ","Ꜹ":"ꜹ","Ꜻ":"ꜻ","Ꜽ":"ꜽ","Ꜿ":"ꜿ","Ꝁ":"ꝁ","Ꝃ":"ꝃ","Ꝅ":"ꝅ","Ꝇ":"ꝇ","Ꝉ":"ꝉ","Ꝋ":"ꝋ","Ꝍ":"ꝍ","Ꝏ":"ꝏ","Ꝑ":"ꝑ","Ꝓ":"ꝓ","Ꝕ":"ꝕ","Ꝗ":"ꝗ","Ꝙ":"ꝙ","Ꝛ":"ꝛ","Ꝝ":"ꝝ","Ꝟ":"ꝟ","Ꝡ":"ꝡ","Ꝣ":"ꝣ","Ꝥ":"ꝥ","Ꝧ":"ꝧ","Ꝩ":"ꝩ","Ꝫ":"ꝫ","Ꝭ":"ꝭ","Ꝯ":"ꝯ","Ꝺ":"ꝺ","Ꝼ":"ꝼ","Ᵹ":"ᵹ","Ꝿ":"ꝿ","Ꞁ":"ꞁ","Ꞃ":"ꞃ","Ꞅ":"ꞅ","Ꞇ":"ꞇ","Ꞌ":"ꞌ","Ɥ":"ɥ","Ꞑ":"ꞑ","Ꞓ":"ꞓ","Ꞗ":"ꞗ","Ꞙ":"ꞙ","Ꞛ":"ꞛ","Ꞝ":"ꞝ","Ꞟ":"ꞟ","Ꞡ":"ꞡ","Ꞣ":"ꞣ","Ꞥ":"ꞥ","Ꞧ":"ꞧ","Ꞩ":"ꞩ","Ɦ":"ɦ","Ɜ":"ɜ","Ɡ":"ɡ","Ɬ":"ɬ","Ʞ":"ʞ","Ʇ":"ʇ","Ａ":"ａ","Ｂ":"ｂ","Ｃ":"ｃ","Ｄ":"ｄ","Ｅ":"ｅ","Ｆ":"ｆ","Ｇ":"ｇ","Ｈ":"ｈ","Ｉ":"ｉ","Ｊ":"ｊ","Ｋ":"ｋ","Ｌ":"ｌ","Ｍ":"ｍ","Ｎ":"ｎ","Ｏ":"ｏ","Ｐ":"ｐ","Ｑ":"ｑ","Ｒ":"ｒ","Ｓ":"ｓ","Ｔ":"ｔ","Ｕ":"ｕ","Ｖ":"ｖ","Ｗ":"ｗ","Ｘ":"ｘ","Ｙ":"ｙ","Ｚ":"ｚ","𐐀":"𐐨","𐐁":"𐐩","𐐂":"𐐪","𐐃":"𐐫","𐐄":"𐐬","𐐅":"𐐭","𐐆":"𐐮","𐐇":"𐐯","𐐈":"𐐰","𐐉":"𐐱","𐐊":"𐐲","𐐋":"𐐳","𐐌":"𐐴","𐐍":"𐐵","𐐎":"𐐶","𐐏":"𐐷","𐐐":"𐐸","𐐑":"𐐹","𐐒":"𐐺","𐐓":"𐐻","𐐔":"𐐼","𐐕":"𐐽","𐐖":"𐐾","𐐗":"𐐿","𐐘":"𐑀","𐐙":"𐑁","𐐚":"𐑂","𐐛":"𐑃","𐐜":"𐑄","𐐝":"𐑅","𐐞":"𐑆","𐐟":"𐑇","𐐠":"𐑈","𐐡":"𐑉","𐐢":"𐑊","𐐣":"𐑋","𐐤":"𐑌","𐐥":"𐑍","𐐦":"𐑎","𐐧":"𐑏","𑢠":"𑣀","𑢡":"𑣁","𑢢":"𑣂","𑢣":"𑣃","𑢤":"𑣄","𑢥":"𑣅","𑢦":"𑣆","𑢧":"𑣇","𑢨":"𑣈","𑢩":"𑣉","𑢪":"𑣊","𑢫":"𑣋","𑢬":"𑣌","𑢭":"𑣍","𑢮":"𑣎","𑢯":"𑣏","𑢰":"𑣐","𑢱":"𑣑","𑢲":"𑣒","𑢳":"𑣓","𑢴":"𑣔","𑢵":"𑣕","𑢶":"𑣖","𑢷":"𑣗","𑢸":"𑣘","𑢹":"𑣙","𑢺":"𑣚","𑢻":"𑣛","𑢼":"𑣜","𑢽":"𑣝","𑢾":"𑣞","𑢿":"𑣟","ß":"ss","İ":"i̇","ʼn":"ʼn","ǰ":"ǰ","ΐ":"ΐ","ΰ":"ΰ","և":"եւ","ẖ":"ẖ","ẗ":"ẗ","ẘ":"ẘ","ẙ":"ẙ","ẚ":"aʾ","ẞ":"ss","ὐ":"ὐ","ὒ":"ὒ","ὔ":"ὔ","ὖ":"ὖ","ᾀ":"ἀι","ᾁ":"ἁι","ᾂ":"ἂι","ᾃ":"ἃι","ᾄ":"ἄι","ᾅ":"ἅι","ᾆ":"ἆι","ᾇ":"ἇι","ᾈ":"ἀι","ᾉ":"ἁι","ᾊ":"ἂι","ᾋ":"ἃι","ᾌ":"ἄι","ᾍ":"ἅι","ᾎ":"ἆι","ᾏ":"ἇι","ᾐ":"ἠι","ᾑ":"ἡι","ᾒ":"ἢι","ᾓ":"ἣι","ᾔ":"ἤι","ᾕ":"ἥι","ᾖ":"ἦι","ᾗ":"ἧι","ᾘ":"ἠι","ᾙ":"ἡι","ᾚ":"ἢι","ᾛ":"ἣι","ᾜ":"ἤι","ᾝ":"ἥι","ᾞ":"ἦι","ᾟ":"ἧι","ᾠ":"ὠι","ᾡ":"ὡι","ᾢ":"ὢι","ᾣ":"ὣι","ᾤ":"ὤι","ᾥ":"ὥι","ᾦ":"ὦι","ᾧ":"ὧι","ᾨ":"ὠι","ᾩ":"ὡι","ᾪ":"ὢι","ᾫ":"ὣι","ᾬ":"ὤι","ᾭ":"ὥι","ᾮ":"ὦι","ᾯ":"ὧι","ᾲ":"ὰι","ᾳ":"αι","ᾴ":"άι","ᾶ":"ᾶ","ᾷ":"ᾶι","ᾼ":"αι","ῂ":"ὴι","ῃ":"ηι","ῄ":"ήι","ῆ":"ῆ","ῇ":"ῆι","ῌ":"ηι","ῒ":"ῒ","ΐ":"ΐ","ῖ":"ῖ","ῗ":"ῗ","ῢ":"ῢ","ΰ":"ΰ","ῤ":"ῤ","ῦ":"ῦ","ῧ":"ῧ","ῲ":"ὼι","ῳ":"ωι","ῴ":"ώι","ῶ":"ῶ","ῷ":"ῶι","ῼ":"ωι","ff":"ff","fi":"fi","fl":"fl","ffi":"ffi","ffl":"ffl","ſt":"st","st":"st","ﬓ":"մն","ﬔ":"մե","ﬕ":"մի","ﬖ":"վն","ﬗ":"մխ"};e.exports=function(e){return e.slice(1,e.length-1).trim().replace(r,function(e){return i[e]||" "})}},function(e,t,n){"use strict";function r(e){return{softbreak:"\n",escape:i,options:e||{},render:s}}var i=n(91).escapeXml,o=function(e,t,n){var r="<"+e;if(t&&t.length>0)for(var i,o=0;void 0!==(i=t[o]);)r+=" "+i[0]+'="'+i[1]+'"',o++;return n&&(r+=" /"),r+=">"},a=function(e){return e.replace(/([a-z])([A-Z])/g,"$1_$2").toLowerCase()},s=function(e){var t,n,r,i,s,u,l,c,p=e.walker(),f="",h="\n",d=0,m=function(e){f+=e,h=e},v=this.escape,g=function(){if("\n"!==h){f+="\n",h="\n";for(var e=d;e>0;e--)f+="  "}},y=this.options;for(y.time&&console.time("rendering"),f+='<?xml version="1.0" encoding="UTF-8"?>\n',f+='<!DOCTYPE CommonMark SYSTEM "CommonMark.dtd">\n';r=p.next();)if(s=r.entering,i=r.node,c=i.type,u=i.isContainer,l="ThematicBreak"===c||"Hardbreak"===c||"Softbreak"===c,n=a(c),s){switch(t=[],c){case"Document":t.push(["xmlns","http://commonmark.org/xml/1.0"]);break;case"List":null!==i.listType&&t.push(["type",i.listType.toLowerCase()]),null!==i.listStart&&t.push(["start",String(i.listStart)]),null!==i.listTight&&t.push(["tight",i.listTight?"true":"false"]);var _=i.listDelimiter;if(null!==_){var b="";b="."===_?"period":"paren",t.push(["delimiter",b])}break;case"CodeBlock":i.info&&t.push(["info",i.info]);break;case"Heading":t.push(["level",String(i.level)]);break;case"Link":case"Image":t.push(["destination",i.destination]),t.push(["title",i.title]);break;case"CustomInline":case"CustomBlock":t.push(["on_enter",i.onEnter]),t.push(["on_exit",i.onExit])}if(y.sourcepos){var x=i.sourcepos;x&&t.push(["sourcepos",String(x[0][0])+":"+String(x[0][1])+"-"+String(x[1][0])+":"+String(x[1][1])])}if(g(),m(o(n,t,l)),u)d+=1;else if(!u&&!l){var w=i.literal;w&&m(v(w)),m(o("/"+n))}}else d-=1,g(),m(o("/"+n));return y.time&&console.timeEnd("rendering"),f+="\n"};e.exports=r},function(e,t,n){"use strict";function r(e){i.Component.call(this,e)}var i=n(0),o=n(1076).Parser,a=n(574),s=n(1);r.prototype=Object.create(i.Component.prototype),r.prototype.constructor=r,r.prototype.render=function(){var e=this.props.containerProps||{},t=new a(this.props),n=new o(this.props.parserOptions),r=n.parse(this.props.source||"");if(this.props.walker)for(var s,u=r.walker();s=u.next();)this.props.walker.call(this,s,u);return this.props.className&&(e.className=this.props.className),i.createElement.apply(i,[this.props.containerTagName,e,this.props.childBefore].concat(t.render(r).concat([this.props.childAfter])))},r.propTypes={className:s.string,containerProps:s.object,source:s.string.isRequired,containerTagName:s.string,childBefore:s.object,childAfter:s.object,sourcePos:s.bool,escapeHtml:s.bool,skipHtml:s.bool,softBreak:s.string,allowNode:s.func,allowedTypes:s.array,disallowedTypes:s.array,transformLinkUri:s.func,transformImageUri:s.func,unwrapDisallowed:s.bool,renderers:s.object,walker:s.func,parserOptions:s.object},r.defaultProps={containerTagName:"div",parserOptions:{}},r.types=a.types,r.renderers=a.renderers,r.uriTransformer=a.uriTransformer,e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(257),l=r(u),c=n(164),p=r(c),f=n(259),h=r(f),d=n(231),m=r(d),v=n(239),g=r(v),y=n(258),_=r(y),b=n(0),x=r(b),w=n(1),k=r(w),E=1e3/60,S=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.wasAnimating=!1,this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyle=null,this.clearUnreadPropStyle=function(e){var t=!1,n=r.state,i=n.currentStyle,o=n.currentVelocity,s=n.lastIdealStyle,u=n.lastIdealVelocity;for(var l in e)if(Object.prototype.hasOwnProperty.call(e,l)){var c=e[l];"number"==typeof c&&(t||(t=!0,i=a({},i),o=a({},o),s=a({},s),u=a({},u)),i[l]=c,o[l]=0,s[l]=c,u[l]=0)}t&&r.setState({currentStyle:i,currentVelocity:o,lastIdealStyle:s,lastIdealVelocity:u})},this.startAnimationIfNecessary=function(){r.animationID=g.default(function(e){var t=r.props.style;if(_.default(r.state.currentStyle,t,r.state.currentVelocity))return r.wasAnimating&&r.props.onRest&&r.props.onRest(),r.animationID=null,r.wasAnimating=!1,void(r.accumulatedTime=0);r.wasAnimating=!0;var n=e||m.default(),i=n-r.prevTime;if(r.prevTime=n,r.accumulatedTime=r.accumulatedTime+i,r.accumulatedTime>10*E&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();var o=(r.accumulatedTime-Math.floor(r.accumulatedTime/E)*E)/E,a=Math.floor(r.accumulatedTime/E),s={},u={},l={},c={};for(var p in t)if(Object.prototype.hasOwnProperty.call(t,p)){var f=t[p];if("number"==typeof f)l[p]=f,c[p]=0,s[p]=f,u[p]=0;else{for(var d=r.state.lastIdealStyle[p],v=r.state.lastIdealVelocity[p],g=0;g<a;g++){var y=h.default(E/1e3,d,v,f.val,f.stiffness,f.damping,f.precision);d=y[0],v=y[1]}var b=h.default(E/1e3,d,v,f.val,f.stiffness,f.damping,f.precision),x=b[0],w=b[1];l[p]=d+(x-d)*o,c[p]=v+(w-v)*o,s[p]=d,u[p]=v}}r.animationID=null,r.accumulatedTime-=a*E,r.setState({currentStyle:l,currentVelocity:c,lastIdealStyle:s,lastIdealVelocity:u}),r.unreadPropStyle=null,r.startAnimationIfNecessary()})},this.state=this.defaultState()}return o(t,e),s(t,null,[{key:"propTypes",value:{defaultStyle:k.default.objectOf(k.default.number),style:k.default.objectOf(k.default.oneOfType([k.default.number,k.default.object])).isRequired,children:k.default.func.isRequired,onRest:k.default.func},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyle,n=e.style,r=t||p.default(n),i=l.default(r);return{currentStyle:r,currentVelocity:i,lastIdealStyle:r,lastIdealVelocity:i}},t.prototype.componentDidMount=function(){this.prevTime=m.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){null!=this.unreadPropStyle&&this.clearUnreadPropStyle(this.unreadPropStyle),this.unreadPropStyle=e.style,null==this.animationID&&(this.prevTime=m.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){null!=this.animationID&&(g.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=this.props.children(this.state.currentStyle);return e&&x.default.Children.only(e)},t}(x.default.Component);t.default=S,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t,n){for(var r=0;r<e.length;r++)if(!b.default(e[r],t[r],n[r]))return!1;return!0}t.__esModule=!0;var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(257),c=r(l),p=n(164),f=r(p),h=n(259),d=r(h),m=n(231),v=r(m),g=n(239),y=r(g),_=n(258),b=r(_),x=n(0),w=r(x),k=n(1),E=r(k),S=1e3/60,C=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyles=null,this.clearUnreadPropStyle=function(e){for(var t=r.state,n=t.currentStyles,i=t.currentVelocities,o=t.lastIdealStyles,a=t.lastIdealVelocities,u=!1,l=0;l<e.length;l++){var c=e[l],p=!1;for(var f in c)if(Object.prototype.hasOwnProperty.call(c,f)){var h=c[f];"number"==typeof h&&(p||(p=!0,u=!0,n[l]=s({},n[l]),i[l]=s({},i[l]),o[l]=s({},o[l]),a[l]=s({},a[l])),n[l][f]=h,i[l][f]=0,o[l][f]=h,a[l][f]=0)}}u&&r.setState({currentStyles:n,currentVelocities:i,lastIdealStyles:o,lastIdealVelocities:a})},this.startAnimationIfNecessary=function(){r.animationID=y.default(function(e){var t=r.props.styles(r.state.lastIdealStyles);if(a(r.state.currentStyles,t,r.state.currentVelocities))return r.animationID=null,void(r.accumulatedTime=0);var n=e||v.default(),i=n-r.prevTime;if(r.prevTime=n,r.accumulatedTime=r.accumulatedTime+i,r.accumulatedTime>10*S&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();for(var o=(r.accumulatedTime-Math.floor(r.accumulatedTime/S)*S)/S,s=Math.floor(r.accumulatedTime/S),u=[],l=[],c=[],p=[],f=0;f<t.length;f++){var h=t[f],m={},g={},y={},_={};for(var b in h)if(Object.prototype.hasOwnProperty.call(h,b)){var x=h[b];if("number"==typeof x)m[b]=x,g[b]=0,y[b]=x,_[b]=0;else{for(var w=r.state.lastIdealStyles[f][b],k=r.state.lastIdealVelocities[f][b],E=0;E<s;E++){var C=d.default(S/1e3,w,k,x.val,x.stiffness,x.damping,x.precision);w=C[0],k=C[1]}var A=d.default(S/1e3,w,k,x.val,x.stiffness,x.damping,x.precision),D=A[0],O=A[1];m[b]=w+(D-w)*o,g[b]=k+(O-k)*o,y[b]=w,_[b]=k}}c[f]=m,p[f]=g,u[f]=y,l[f]=_}r.animationID=null,r.accumulatedTime-=s*S,r.setState({currentStyles:c,currentVelocities:p,lastIdealStyles:u,lastIdealVelocities:l}),r.unreadPropStyles=null,r.startAnimationIfNecessary()})},this.state=this.defaultState()}return o(t,e),u(t,null,[{key:"propTypes",value:{defaultStyles:E.default.arrayOf(E.default.objectOf(E.default.number)),styles:E.default.func.isRequired,children:E.default.func.isRequired},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyles,n=e.styles,r=t||n().map(f.default),i=r.map(function(e){return c.default(e)});return{currentStyles:r,currentVelocities:i,lastIdealStyles:r,lastIdealVelocities:i}},t.prototype.componentDidMount=function(){this.prevTime=v.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){null!=this.unreadPropStyles&&this.clearUnreadPropStyle(this.unreadPropStyles),this.unreadPropStyles=e.styles(this.state.lastIdealStyles),null==this.animationID&&(this.prevTime=v.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){null!=this.animationID&&(y.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=this.props.children(this.state.currentStyles);return e&&w.default.Children.only(e)},t}(w.default.Component);t.default=C,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function a(e,t,n){var r=t;return null==r?e.map(function(e,t){return{key:e.key,data:e.data,style:n[t]}}):e.map(function(e,t){for(var i=0;i<r.length;i++)if(r[i].key===e.key)return{key:r[i].key,data:r[i].data,style:n[t]};return{key:e.key,data:e.data,style:n[t]}})}function s(e,t,n,r){if(r.length!==t.length)return!1;for(var i=0;i<r.length;i++)if(r[i].key!==t[i].key)return!1;for(var i=0;i<r.length;i++)if(!E.default(e[i],t[i].style,n[i]))return!1;return!0}function u(e,t,n,r,i,o,a,s,u){for(var l=y.default(r,i,function(e,r){var i=t(r);return null==i?(n({key:r.key,data:r.data}),null):E.default(o[e],i,a[e])?(n({key:r.key,data:r.data}),null):{key:r.key,data:r.data,style:i}}),c=[],p=[],h=[],d=[],m=0;m<l.length;m++){for(var v=l[m],g=null,_=0;_<r.length;_++)if(r[_].key===v.key){g=_;break}if(null==g){var b=e(v);c[m]=b,h[m]=b;var x=f.default(v.style);p[m]=x,d[m]=x}else c[m]=o[g],h[m]=s[g],p[m]=a[g],d[m]=u[g]}return[l,c,p,h,d]}t.__esModule=!0;var l=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},c=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),p=n(257),f=r(p),h=n(164),d=r(h),m=n(259),v=r(m),g=n(1084),y=r(g),_=n(231),b=r(_),x=n(239),w=r(x),k=n(258),E=r(k),S=n(0),C=r(S),A=n(1),D=r(A),O=1e3/60,M=function(e){function t(n){var r=this;i(this,t),e.call(this,n),this.unmounting=!1,this.animationID=null,this.prevTime=0,this.accumulatedTime=0,this.unreadPropStyles=null,this.clearUnreadPropStyle=function(e){for(var t=u(r.props.willEnter,r.props.willLeave,r.props.didLeave,r.state.mergedPropsStyles,e,r.state.currentStyles,r.state.currentVelocities,r.state.lastIdealStyles,r.state.lastIdealVelocities),n=t[0],i=t[1],o=t[2],a=t[3],s=t[4],c=0;c<e.length;c++){var p=e[c].style,f=!1;for(var h in p)if(Object.prototype.hasOwnProperty.call(p,h)){var d=p[h];"number"==typeof d&&(f||(f=!0,i[c]=l({},i[c]),o[c]=l({},o[c]),a[c]=l({},a[c]),s[c]=l({},s[c]),n[c]={key:n[c].key,data:n[c].data,style:l({},n[c].style)}),i[c][h]=d,o[c][h]=0,a[c][h]=d,s[c][h]=0,n[c].style[h]=d)}}r.setState({currentStyles:i,currentVelocities:o,mergedPropsStyles:n,lastIdealStyles:a,lastIdealVelocities:s})},this.startAnimationIfNecessary=function(){r.unmounting||(r.animationID=w.default(function(e){if(!r.unmounting){var t=r.props.styles,n="function"==typeof t?t(a(r.state.mergedPropsStyles,r.unreadPropStyles,r.state.lastIdealStyles)):t;if(s(r.state.currentStyles,n,r.state.currentVelocities,r.state.mergedPropsStyles))return r.animationID=null,void(r.accumulatedTime=0);var i=e||b.default(),o=i-r.prevTime;if(r.prevTime=i,r.accumulatedTime=r.accumulatedTime+o,r.accumulatedTime>10*O&&(r.accumulatedTime=0),0===r.accumulatedTime)return r.animationID=null,void r.startAnimationIfNecessary();for(var l=(r.accumulatedTime-Math.floor(r.accumulatedTime/O)*O)/O,c=Math.floor(r.accumulatedTime/O),p=u(r.props.willEnter,r.props.willLeave,r.props.didLeave,r.state.mergedPropsStyles,n,r.state.currentStyles,r.state.currentVelocities,r.state.lastIdealStyles,r.state.lastIdealVelocities),f=p[0],h=p[1],d=p[2],m=p[3],g=p[4],y=0;y<f.length;y++){var _=f[y].style,x={},w={},k={},E={};for(var S in _)if(Object.prototype.hasOwnProperty.call(_,S)){var C=_[S];if("number"==typeof C)x[S]=C,w[S]=0,k[S]=C,E[S]=0;else{for(var A=m[y][S],D=g[y][S],M=0;M<c;M++){var T=v.default(O/1e3,A,D,C.val,C.stiffness,C.damping,C.precision);A=T[0],D=T[1]}var P=v.default(O/1e3,A,D,C.val,C.stiffness,C.damping,C.precision),I=P[0],R=P[1];x[S]=A+(I-A)*l,w[S]=D+(R-D)*l,k[S]=A,E[S]=D}}m[y]=k,g[y]=E,h[y]=x,d[y]=w}r.animationID=null,r.accumulatedTime-=c*O,r.setState({currentStyles:h,currentVelocities:d,lastIdealStyles:m,lastIdealVelocities:g,mergedPropsStyles:f}),r.unreadPropStyles=null,r.startAnimationIfNecessary()}}))},this.state=this.defaultState()}return o(t,e),c(t,null,[{key:"propTypes",value:{defaultStyles:D.default.arrayOf(D.default.shape({key:D.default.string.isRequired,data:D.default.any,style:D.default.objectOf(D.default.number).isRequired})),styles:D.default.oneOfType([D.default.func,D.default.arrayOf(D.default.shape({key:D.default.string.isRequired,data:D.default.any,style:D.default.objectOf(D.default.oneOfType([D.default.number,D.default.object])).isRequired}))]).isRequired,children:D.default.func.isRequired,willEnter:D.default.func,willLeave:D.default.func,didLeave:D.default.func},enumerable:!0},{key:"defaultProps",value:{willEnter:function(e){return d.default(e.style)},willLeave:function(){return null},didLeave:function(){}},enumerable:!0}]),t.prototype.defaultState=function(){var e=this.props,t=e.defaultStyles,n=e.styles,r=e.willEnter,i=e.willLeave,o=e.didLeave,a="function"==typeof n?n(t):n,s=void 0;s=null==t?a:t.map(function(e){for(var t=0;t<a.length;t++)if(a[t].key===e.key)return a[t];return e});var l=null==t?a.map(function(e){return d.default(e.style)}):t.map(function(e){return d.default(e.style)}),c=null==t?a.map(function(e){return f.default(e.style)}):t.map(function(e){return f.default(e.style)}),p=u(r,i,o,s,a,l,c,l,c),h=p[0];return{currentStyles:p[1],currentVelocities:p[2],lastIdealStyles:p[3],lastIdealVelocities:p[4],mergedPropsStyles:h}},t.prototype.componentDidMount=function(){this.prevTime=b.default(),this.startAnimationIfNecessary()},t.prototype.componentWillReceiveProps=function(e){this.unreadPropStyles&&this.clearUnreadPropStyle(this.unreadPropStyles);var t=e.styles;this.unreadPropStyles="function"==typeof t?t(a(this.state.mergedPropsStyles,this.unreadPropStyles,this.state.lastIdealStyles)):t,null==this.animationID&&(this.prevTime=b.default(),this.startAnimationIfNecessary())},t.prototype.componentWillUnmount=function(){this.unmounting=!0,null!=this.animationID&&(w.default.cancel(this.animationID),this.animationID=null)},t.prototype.render=function(){var e=a(this.state.mergedPropsStyles,this.unreadPropStyles,this.state.currentStyles),t=this.props.children(e);return t&&C.default.Children.only(t)},t}(C.default.Component);t.default=M,e.exports=t.default},function(e,t,n){"use strict";function r(e,t,n){for(var r={},i=0;i<e.length;i++)r[e[i].key]=i;for(var o={},i=0;i<t.length;i++)o[t[i].key]=i;for(var a=[],i=0;i<t.length;i++)a[i]=t[i];for(var i=0;i<e.length;i++)if(!Object.prototype.hasOwnProperty.call(o,e[i].key)){var s=n(i,e[i]);null!=s&&a.push(s)}return a.sort(function(e,n){var i=o[e.key],a=o[n.key],s=r[e.key],u=r[n.key];if(null!=i&&null!=a)return o[e.key]-o[n.key];if(null!=s&&null!=u)return r[e.key]-r[n.key];if(null!=i){for(var l=0;l<t.length;l++){var c=t[l].key;if(Object.prototype.hasOwnProperty.call(r,c)){if(i<o[c]&&u>r[c])return-1;if(i>o[c]&&u<r[c])return 1}}return 1}for(var l=0;l<t.length;l++){var c=t[l].key;if(Object.prototype.hasOwnProperty.call(r,c)){if(a<o[c]&&s>r[c])return 1;if(a>o[c]&&s<r[c])return-1}}return-1})}t.__esModule=!0,t.default=r,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e.default:e}t.__esModule=!0;var i=n(1081);t.Motion=r(i);var o=n(1082);t.StaggeredMotion=r(o);var a=n(1083);t.TransitionMotion=r(a);var s=n(1087);t.spring=r(s);var u=n(471);t.presets=r(u);var l=n(164);t.stripStyle=r(l);var c=n(1086);t.reorderKeys=r(c)},function(e,t,n){"use strict";function r(){}t.__esModule=!0,t.default=r;e.exports=t.default},function(e,t,n){"use strict";function r(e,t){return i({},s,t,{val:e})}t.__esModule=!0;var i=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t.default=r;var o=n(471),a=function(e){return e&&e.__esModule?e:{default:e}}(o),s=i({},a.default.noWobble,{precision:.01});e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0,t.default=void 0;var s=n(0),u=n(1),l=r(u),c=n(472),p=r(c),f=n(473),h=(r(f),function(e){function t(n,r){i(this,t);var a=o(this,e.call(this,n,r));return a.store=n.store,a}return a(t,e),t.prototype.getChildContext=function(){return{store:this.store}},t.prototype.render=function(){return s.Children.only(this.props.children)},t}(s.Component));t.default=h,h.propTypes={store:p.default.isRequired,children:l.default.element.isRequired},h.childContextTypes={store:p.default.isRequired}},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e){return e.displayName||e.name||"Component"}function u(e,t){try{return e.apply(t)}catch(e){return A.value=e,A}}function l(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},l=Boolean(e),f=e||E,d=void 0;d="function"==typeof t?t:t?(0,g.default)(t):S;var v=n||C,y=r.pure,_=void 0===y||y,b=r.withRef,w=void 0!==b&&b,O=_&&v!==C,M=D++;return function(e){function t(e,t,n){var r=v(e,t,n);return r}var n="Connect("+s(e)+")",r=function(r){function s(e,t){i(this,s);var a=o(this,r.call(this,e,t));a.version=M,a.store=e.store||t.store,(0,k.default)(a.store,'Could not find "store" in either the context or props of "'+n+'". Either wrap the root component in a <Provider>, or explicitly pass "store" as a prop to "'+n+'".');var u=a.store.getState();return a.state={storeState:u},a.clearCache(),a}return a(s,r),s.prototype.shouldComponentUpdate=function(){return!_||this.haveOwnPropsChanged||this.hasStoreStateChanged},s.prototype.computeStateProps=function(e,t){if(!this.finalMapStateToProps)return this.configureFinalMapState(e,t);var n=e.getState(),r=this.doStatePropsDependOnOwnProps?this.finalMapStateToProps(n,t):this.finalMapStateToProps(n);return r},s.prototype.configureFinalMapState=function(e,t){var n=f(e.getState(),t),r="function"==typeof n;return this.finalMapStateToProps=r?n:f,this.doStatePropsDependOnOwnProps=1!==this.finalMapStateToProps.length,r?this.computeStateProps(e,t):n},s.prototype.computeDispatchProps=function(e,t){if(!this.finalMapDispatchToProps)return this.configureFinalMapDispatch(e,t);var n=e.dispatch,r=this.doDispatchPropsDependOnOwnProps?this.finalMapDispatchToProps(n,t):this.finalMapDispatchToProps(n);return r},s.prototype.configureFinalMapDispatch=function(e,t){var n=d(e.dispatch,t),r="function"==typeof n;return this.finalMapDispatchToProps=r?n:d,this.doDispatchPropsDependOnOwnProps=1!==this.finalMapDispatchToProps.length,r?this.computeDispatchProps(e,t):n},s.prototype.updateStatePropsIfNeeded=function(){var e=this.computeStateProps(this.store,this.props);return(!this.stateProps||!(0,m.default)(e,this.stateProps))&&(this.stateProps=e,!0)},s.prototype.updateDispatchPropsIfNeeded=function(){var e=this.computeDispatchProps(this.store,this.props);return(!this.dispatchProps||!(0,m.default)(e,this.dispatchProps))&&(this.dispatchProps=e,!0)},s.prototype.updateMergedPropsIfNeeded=function(){var e=t(this.stateProps,this.dispatchProps,this.props);return!(this.mergedProps&&O&&(0,m.default)(e,this.mergedProps))&&(this.mergedProps=e,!0)},s.prototype.isSubscribed=function(){return"function"==typeof this.unsubscribe},s.prototype.trySubscribe=function(){l&&!this.unsubscribe&&(this.unsubscribe=this.store.subscribe(this.handleChange.bind(this)),this.handleChange())},s.prototype.tryUnsubscribe=function(){this.unsubscribe&&(this.unsubscribe(),this.unsubscribe=null)},s.prototype.componentDidMount=function(){this.trySubscribe()},s.prototype.componentWillReceiveProps=function(e){_&&(0,m.default)(e,this.props)||(this.haveOwnPropsChanged=!0)},s.prototype.componentWillUnmount=function(){this.tryUnsubscribe(),this.clearCache()},s.prototype.clearCache=function(){this.dispatchProps=null,this.stateProps=null,this.mergedProps=null,this.haveOwnPropsChanged=!0,this.hasStoreStateChanged=!0,this.haveStatePropsBeenPrecalculated=!1,this.statePropsPrecalculationError=null,this.renderedElement=null,this.finalMapDispatchToProps=null,this.finalMapStateToProps=null},s.prototype.handleChange=function(){if(this.unsubscribe){var e=this.store.getState(),t=this.state.storeState;if(!_||t!==e){if(_&&!this.doStatePropsDependOnOwnProps){var n=u(this.updateStatePropsIfNeeded,this);if(!n)return;n===A&&(this.statePropsPrecalculationError=A.value),this.haveStatePropsBeenPrecalculated=!0}this.hasStoreStateChanged=!0,this.setState({storeState:e})}}},s.prototype.getWrappedInstance=function(){return(0,k.default)(w,"To access the wrapped instance, you need to specify { withRef: true } as the fourth argument of the connect() call."),this.refs.wrappedInstance},s.prototype.render=function(){var t=this.haveOwnPropsChanged,n=this.hasStoreStateChanged,r=this.haveStatePropsBeenPrecalculated,i=this.statePropsPrecalculationError,o=this.renderedElement;if(this.haveOwnPropsChanged=!1,this.hasStoreStateChanged=!1,this.haveStatePropsBeenPrecalculated=!1,this.statePropsPrecalculationError=null,i)throw i;var a=!0,s=!0;_&&o&&(a=n||t&&this.doStatePropsDependOnOwnProps,s=t&&this.doDispatchPropsDependOnOwnProps);var u=!1,l=!1;r?u=!0:a&&(u=this.updateStatePropsIfNeeded()),s&&(l=this.updateDispatchPropsIfNeeded());return!(!!(u||l||t)&&this.updateMergedPropsIfNeeded())&&o?o:(this.renderedElement=w?(0,p.createElement)(e,c({},this.mergedProps,{ref:"wrappedInstance"})):(0,p.createElement)(e,this.mergedProps),this.renderedElement)},s}(p.Component);return r.displayName=n,r.WrappedComponent=e,r.contextTypes={store:h.default},r.propTypes={store:h.default},(0,x.default)(r,e)}}t.__esModule=!0;var c=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t.default=l;var p=n(0),f=n(472),h=r(f),d=n(1091),m=r(d),v=n(1092),g=r(v),y=n(473),_=(r(y),n(421)),b=(r(_),n(758)),x=r(b),w=n(793),k=r(w),E=function(e){return{}},S=function(e){return{dispatch:e}},C=function(e,t,n){return c({},n,e,t)},A={value:null},D=0},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}t.__esModule=!0,t.connect=t.Provider=void 0;var i=n(1088),o=r(i),a=n(1089),s=r(a);t.Provider=o.default,t.connect=s.default},function(e,t,n){"use strict";function r(e,t){if(e===t)return!0;var n=Object.keys(e),r=Object.keys(t);if(n.length!==r.length)return!1;for(var i=Object.prototype.hasOwnProperty,o=0;o<n.length;o++)if(!i.call(t,n[o])||e[n[o]]!==t[n[o]])return!1;return!0}t.__esModule=!0,t.default=r},function(e,t,n){"use strict";function r(e){return function(t){return(0,i.bindActionCreators)(e,t)}}t.__esModule=!0,t.default=r;var i=n(486)},function(e,t,n){var r=n(1096);e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),l=n(0),c=r(l),p=n(1),f=r(p),h=n(209),d=r(h),m=n(260),v=r(m),g="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",y=function(e){function t(e){i(this,t);var n=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.state={size:n.props.size},n}return a(t,e),u(t,[{key:"render",value:function(){var e=this.props,t=e.children,n=e.className,r=e.prefixer,i=e.split,o=e.style,a=this.state.size,u=["Pane",i,n],l=s({},o||{},{flex:1,position:"relative",outline:"none"});return void 0!==a&&("vertical"===i?l.width=a:(l.height=a,l.display="flex"),l.flex="none"),c.default.createElement("div",{className:u.join(" "),style:r.prefix(l)},t)}}]),t}(c.default.Component);y.propTypes={className:f.default.string.isRequired,children:f.default.node.isRequired,prefixer:f.default.instanceOf(d.default).isRequired,size:f.default.oneOfType([f.default.string,f.default.number]),split:f.default.oneOf(["vertical","horizontal"]),style:v.default},y.defaultProps={prefixer:new d.default({userAgent:g})},t.default=y,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.RESIZER_DEFAULT_CLASSNAME=void 0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(0),l=r(u),c=n(1),p=r(c),f=n(209),h=r(f),d=n(260),m=r(d),v="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",g=t.RESIZER_DEFAULT_CLASSNAME="Resizer",y=function(e){function t(){return i(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function(){var e=this.props,t=e.className,n=e.onClick,r=e.onDoubleClick,i=e.onMouseDown,o=e.onTouchEnd,a=e.onTouchStart,s=e.prefixer,u=e.resizerClassName,c=e.split,p=e.style,f=[u,c,t];return l.default.createElement("span",{className:f.join(" "),style:s.prefix(p)||{},onMouseDown:function(e){return i(e)},onTouchStart:function(e){e.preventDefault(),a(e)},onTouchEnd:function(e){e.preventDefault(),o(e)},onClick:function(e){n&&(e.preventDefault(),n(e))},onDoubleClick:function(e){r&&(e.preventDefault(),r(e))}})}}]),t}(l.default.Component);y.propTypes={className:p.default.string.isRequired,onClick:p.default.func,onDoubleClick:p.default.func,onMouseDown:p.default.func.isRequired,onTouchStart:p.default.func.isRequired,onTouchEnd:p.default.func.isRequired,prefixer:p.default.instanceOf(h.default).isRequired,split:p.default.oneOf(["vertical","horizontal"]),style:m.default,resizerClassName:p.default.string.isRequired},y.defaultProps={prefixer:new h.default({userAgent:v}),resizerClassName:g},t.default=y},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e,t){if(e.selection)e.selection.empty();else try{t.getSelection().removeAllRanges()}catch(e){}}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),c=n(0),p=r(c),f=n(1),h=r(f),d=n(449),m=r(d),v=n(209),g=r(v),y=n(260),_=r(y),b=n(1094),x=r(b),w=n(1095),k=r(w),E="undefined"!=typeof navigator?navigator.userAgent:"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.2 (KHTML, like Gecko) Safari/537.2",S=function(e){function t(){i(this,t);var e=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return e.onMouseDown=e.onMouseDown.bind(e),e.onTouchStart=e.onTouchStart.bind(e),e.onMouseMove=e.onMouseMove.bind(e),e.onTouchMove=e.onTouchMove.bind(e),e.onMouseUp=e.onMouseUp.bind(e),e.state={active:!1,resized:!1},e}return a(t,e),l(t,[{key:"componentDidMount",value:function(){this.setSize(this.props,this.state),document.addEventListener("mouseup",this.onMouseUp),document.addEventListener("mousemove",this.onMouseMove),document.addEventListener("touchmove",this.onTouchMove)}},{key:"componentWillReceiveProps",value:function(e){this.setSize(e,this.state)}},{key:"componentWillUnmount",value:function(){document.removeEventListener("mouseup",this.onMouseUp),document.removeEventListener("mousemove",this.onMouseMove),document.removeEventListener("touchmove",this.onTouchMove)}},{key:"onMouseDown",value:function(e){var t=u({},e,{touches:[{clientX:e.clientX,clientY:e.clientY}]});this.onTouchStart(t)}},{key:"onTouchStart",value:function(e){var t=this.props,n=t.allowResize,r=t.onDragStarted,i=t.split;if(n){s(document,window);var o="vertical"===i?e.touches[0].clientX:e.touches[0].clientY;"function"==typeof r&&r(),this.setState({active:!0,position:o})}}},{key:"onMouseMove",value:function(e){var t=u({},e,{touches:[{clientX:e.clientX,clientY:e.clientY}]});this.onTouchMove(t)}},{key:"onTouchMove",value:function(e){var t=this.props,n=t.allowResize,r=t.maxSize,i=t.minSize,o=t.onChange,a=t.split,u=t.step,l=this.state,c=l.active,p=l.position;if(n&&c){s(document,window);var f="first"===this.props.primary,h=f?this.pane1:this.pane2;if(h){var d=m.default.findDOMNode(h);if(d.getBoundingClientRect){var v=d.getBoundingClientRect().width,g=d.getBoundingClientRect().height,y="vertical"===a?e.touches[0].clientX:e.touches[0].clientY,_="vertical"===a?v:g,b=p-y;if(u){if(Math.abs(b)<u)return;b=~~(b/u)*u}var x=f?b:-b,w=r;if(void 0!==r&&r<=0){var k=this.splitPane;w="vertical"===a?k.getBoundingClientRect().width+r:k.getBoundingClientRect().height+r}var E=_-x,S=p-b;E<i?E=i:void 0!==r&&E>w?E=w:this.setState({position:S,resized:!0}),o&&o(E),this.setState({draggedSize:E}),h.setState({size:E})}}}}},{key:"onMouseUp",value:function(){var e=this.props,t=e.allowResize,n=e.onDragFinished,r=this.state,i=r.active,o=r.draggedSize;t&&i&&("function"==typeof n&&n(o),this.setState({active:!1}))}},{key:"setSize",value:function(e,t){var n=this.props.primary,r="first"===n?this.pane1:this.pane2,i=void 0;r&&(i=e.size||t&&t.draggedSize||e.defaultSize||e.minSize,r.setState({size:i}),e.size!==t.draggedSize&&this.setState({draggedSize:i}))}},{key:"render",value:function(){var e=this,t=this.props,n=t.allowResize,r=t.children,i=t.className,o=t.defaultSize,a=t.minSize,s=t.onResizerClick,l=t.onResizerDoubleClick,c=t.paneClassName,f=t.pane1ClassName,h=t.pane2ClassName,d=t.paneStyle,m=t.pane1Style,v=t.pane2Style,g=t.primary,y=t.prefixer,_=t.resizerClassName,b=t.resizerStyle,E=t.size,S=t.split,C=t.style,A=n?"":"disabled",D=_?_+" "+w.RESIZER_DEFAULT_CLASSNAME:_,O=u({},{display:"flex",flex:1,height:"100%",position:"absolute",outline:"none",overflow:"hidden",MozUserSelect:"text",WebkitUserSelect:"text",msUserSelect:"text",userSelect:"text"},C||{});"vertical"===S?u(O,{flexDirection:"row",left:0,right:0}):u(O,{bottom:0,flexDirection:"column",minHeight:"100%",top:0,width:"100%"});var M=["SplitPane",i,S,A],T=y.prefix(u({},d||{},m||{})),P=y.prefix(u({},d||{},v||{})),I=["Pane1",c,f].join(" "),R=["Pane2",c,h].join(" ");return p.default.createElement("div",{className:M.join(" "),ref:function(t){e.splitPane=t},style:y.prefix(O)},p.default.createElement(x.default,{className:I,key:"pane1",ref:function(t){e.pane1=t},size:"first"===g?E||o||a:void 0,split:S,style:T},r[0]),p.default.createElement(k.default,{className:A,onClick:s,onDoubleClick:l,onMouseDown:this.onMouseDown,onTouchStart:this.onTouchStart,onTouchEnd:this.onMouseUp,key:"resizer",ref:function(t){e.resizer=t},resizerClassName:D,split:S,style:b||{}}),p.default.createElement(x.default,{className:R,key:"pane2",ref:function(t){e.pane2=t},size:"second"===g?E||o||a:void 0,split:S,style:P},r[1]))}}]),t}(p.default.Component);S.propTypes={allowResize:h.default.bool,children:h.default.arrayOf(h.default.node).isRequired,className:h.default.string,primary:h.default.oneOf(["first","second"]),minSize:h.default.oneOfType([h.default.string,h.default.number]),maxSize:h.default.oneOfType([h.default.string,h.default.number]),defaultSize:h.default.oneOfType([h.default.string,h.default.number]),size:h.default.oneOfType([h.default.string,h.default.number]),split:h.default.oneOf(["vertical","horizontal"]),onDragStarted:h.default.func,onDragFinished:h.default.func,onChange:h.default.func,onResizerClick:h.default.func,onResizerDoubleClick:h.default.func,prefixer:h.default.instanceOf(g.default).isRequired,style:_.default,resizerStyle:_.default,paneClassName:h.default.string,pane1ClassName:h.default.string,pane2ClassName:h.default.string,paneStyle:_.default,pane1Style:_.default,pane2Style:_.default,resizerClassName:h.default.string,step:h.default.number},S.defaultProps={allowResize:!0,minSize:50,prefixer:new g.default({userAgent:E}),primary:"first",split:"vertical",paneClassName:"",pane1ClassName:"",pane2ClassName:""},t.default=S,e.exports=t.default},function(e,t){e.exports=["alignContent","MozAlignContent","WebkitAlignContent","MSAlignContent","OAlignContent","alignItems","MozAlignItems","WebkitAlignItems","MSAlignItems","OAlignItems","alignSelf","MozAlignSelf","WebkitAlignSelf","MSAlignSelf","OAlignSelf","all","MozAll","WebkitAll","MSAll","OAll","animation","MozAnimation","WebkitAnimation","MSAnimation","OAnimation","animationDelay","MozAnimationDelay","WebkitAnimationDelay","MSAnimationDelay","OAnimationDelay","animationDirection","MozAnimationDirection","WebkitAnimationDirection","MSAnimationDirection","OAnimationDirection","animationDuration","MozAnimationDuration","WebkitAnimationDuration","MSAnimationDuration","OAnimationDuration","animationFillMode","MozAnimationFillMode","WebkitAnimationFillMode","MSAnimationFillMode","OAnimationFillMode","animationIterationCount","MozAnimationIterationCount","WebkitAnimationIterationCount","MSAnimationIterationCount","OAnimationIterationCount","animationName","MozAnimationName","WebkitAnimationName","MSAnimationName","OAnimationName","animationPlayState","MozAnimationPlayState","WebkitAnimationPlayState","MSAnimationPlayState","OAnimationPlayState","animationTimingFunction","MozAnimationTimingFunction","WebkitAnimationTimingFunction","MSAnimationTimingFunction","OAnimationTimingFunction","backfaceVisibility","MozBackfaceVisibility","WebkitBackfaceVisibility","MSBackfaceVisibility","OBackfaceVisibility","background","MozBackground","WebkitBackground","MSBackground","OBackground","backgroundAttachment","MozBackgroundAttachment","WebkitBackgroundAttachment","MSBackgroundAttachment","OBackgroundAttachment","backgroundBlendMode","MozBackgroundBlendMode","WebkitBackgroundBlendMode","MSBackgroundBlendMode","OBackgroundBlendMode","backgroundClip","MozBackgroundClip","WebkitBackgroundClip","MSBackgroundClip","OBackgroundClip","backgroundColor","MozBackgroundColor","WebkitBackgroundColor","MSBackgroundColor","OBackgroundColor","backgroundImage","MozBackgroundImage","WebkitBackgroundImage","MSBackgroundImage","OBackgroundImage","backgroundOrigin","MozBackgroundOrigin","WebkitBackgroundOrigin","MSBackgroundOrigin","OBackgroundOrigin","backgroundPosition","MozBackgroundPosition","WebkitBackgroundPosition","MSBackgroundPosition","OBackgroundPosition","backgroundRepeat","MozBackgroundRepeat","WebkitBackgroundRepeat","MSBackgroundRepeat","OBackgroundRepeat","backgroundSize","MozBackgroundSize","WebkitBackgroundSize","MSBackgroundSize","OBackgroundSize","blockSize","MozBlockSize","WebkitBlockSize","MSBlockSize","OBlockSize","border","MozBorder","WebkitBorder","MSBorder","OBorder","borderBlockEnd","MozBorderBlockEnd","WebkitBorderBlockEnd","MSBorderBlockEnd","OBorderBlockEnd","borderBlockEndColor","MozBorderBlockEndColor","WebkitBorderBlockEndColor","MSBorderBlockEndColor","OBorderBlockEndColor","borderBlockEndStyle","MozBorderBlockEndStyle","WebkitBorderBlockEndStyle","MSBorderBlockEndStyle","OBorderBlockEndStyle","borderBlockEndWidth","MozBorderBlockEndWidth","WebkitBorderBlockEndWidth","MSBorderBlockEndWidth","OBorderBlockEndWidth","borderBlockStart","MozBorderBlockStart","WebkitBorderBlockStart","MSBorderBlockStart","OBorderBlockStart","borderBlockStartColor","MozBorderBlockStartColor","WebkitBorderBlockStartColor","MSBorderBlockStartColor","OBorderBlockStartColor","borderBlockStartStyle","MozBorderBlockStartStyle","WebkitBorderBlockStartStyle","MSBorderBlockStartStyle","OBorderBlockStartStyle","borderBlockStartWidth","MozBorderBlockStartWidth","WebkitBorderBlockStartWidth","MSBorderBlockStartWidth","OBorderBlockStartWidth","borderBottom","MozBorderBottom","WebkitBorderBottom","MSBorderBottom","OBorderBottom","borderBottomColor","MozBorderBottomColor","WebkitBorderBottomColor","MSBorderBottomColor","OBorderBottomColor","borderBottomLeftRadius","MozBorderBottomLeftRadius","WebkitBorderBottomLeftRadius","MSBorderBottomLeftRadius","OBorderBottomLeftRadius","borderBottomRightRadius","MozBorderBottomRightRadius","WebkitBorderBottomRightRadius","MSBorderBottomRightRadius","OBorderBottomRightRadius","borderBottomStyle","MozBorderBottomStyle","WebkitBorderBottomStyle","MSBorderBottomStyle","OBorderBottomStyle","borderBottomWidth","MozBorderBottomWidth","WebkitBorderBottomWidth","MSBorderBottomWidth","OBorderBottomWidth","borderCollapse","MozBorderCollapse","WebkitBorderCollapse","MSBorderCollapse","OBorderCollapse","borderColor","MozBorderColor","WebkitBorderColor","MSBorderColor","OBorderColor","borderImage","MozBorderImage","WebkitBorderImage","MSBorderImage","OBorderImage","borderImageOutset","MozBorderImageOutset","WebkitBorderImageOutset","MSBorderImageOutset","OBorderImageOutset","borderImageRepeat","MozBorderImageRepeat","WebkitBorderImageRepeat","MSBorderImageRepeat","OBorderImageRepeat","borderImageSlice","MozBorderImageSlice","WebkitBorderImageSlice","MSBorderImageSlice","OBorderImageSlice","borderImageSource","MozBorderImageSource","WebkitBorderImageSource","MSBorderImageSource","OBorderImageSource","borderImageWidth","MozBorderImageWidth","WebkitBorderImageWidth","MSBorderImageWidth","OBorderImageWidth","borderInlineEnd","MozBorderInlineEnd","WebkitBorderInlineEnd","MSBorderInlineEnd","OBorderInlineEnd","borderInlineEndColor","MozBorderInlineEndColor","WebkitBorderInlineEndColor","MSBorderInlineEndColor","OBorderInlineEndColor","borderInlineEndStyle","MozBorderInlineEndStyle","WebkitBorderInlineEndStyle","MSBorderInlineEndStyle","OBorderInlineEndStyle","borderInlineEndWidth","MozBorderInlineEndWidth","WebkitBorderInlineEndWidth","MSBorderInlineEndWidth","OBorderInlineEndWidth","borderInlineStart","MozBorderInlineStart","WebkitBorderInlineStart","MSBorderInlineStart","OBorderInlineStart","borderInlineStartColor","MozBorderInlineStartColor","WebkitBorderInlineStartColor","MSBorderInlineStartColor","OBorderInlineStartColor","borderInlineStartStyle","MozBorderInlineStartStyle","WebkitBorderInlineStartStyle","MSBorderInlineStartStyle","OBorderInlineStartStyle","borderInlineStartWidth","MozBorderInlineStartWidth","WebkitBorderInlineStartWidth","MSBorderInlineStartWidth","OBorderInlineStartWidth","borderLeft","MozBorderLeft","WebkitBorderLeft","MSBorderLeft","OBorderLeft","borderLeftColor","MozBorderLeftColor","WebkitBorderLeftColor","MSBorderLeftColor","OBorderLeftColor","borderLeftStyle","MozBorderLeftStyle","WebkitBorderLeftStyle","MSBorderLeftStyle","OBorderLeftStyle","borderLeftWidth","MozBorderLeftWidth","WebkitBorderLeftWidth","MSBorderLeftWidth","OBorderLeftWidth","borderRadius","MozBorderRadius","WebkitBorderRadius","MSBorderRadius","OBorderRadius","borderRight","MozBorderRight","WebkitBorderRight","MSBorderRight","OBorderRight","borderRightColor","MozBorderRightColor","WebkitBorderRightColor","MSBorderRightColor","OBorderRightColor","borderRightStyle","MozBorderRightStyle","WebkitBorderRightStyle","MSBorderRightStyle","OBorderRightStyle","borderRightWidth","MozBorderRightWidth","WebkitBorderRightWidth","MSBorderRightWidth","OBorderRightWidth","borderSpacing","MozBorderSpacing","WebkitBorderSpacing","MSBorderSpacing","OBorderSpacing","borderStyle","MozBorderStyle","WebkitBorderStyle","MSBorderStyle","OBorderStyle","borderTop","MozBorderTop","WebkitBorderTop","MSBorderTop","OBorderTop","borderTopColor","MozBorderTopColor","WebkitBorderTopColor","MSBorderTopColor","OBorderTopColor","borderTopLeftRadius","MozBorderTopLeftRadius","WebkitBorderTopLeftRadius","MSBorderTopLeftRadius","OBorderTopLeftRadius","borderTopRightRadius","MozBorderTopRightRadius","WebkitBorderTopRightRadius","MSBorderTopRightRadius","OBorderTopRightRadius","borderTopStyle","MozBorderTopStyle","WebkitBorderTopStyle","MSBorderTopStyle","OBorderTopStyle","borderTopWidth","MozBorderTopWidth","WebkitBorderTopWidth","MSBorderTopWidth","OBorderTopWidth","borderWidth","MozBorderWidth","WebkitBorderWidth","MSBorderWidth","OBorderWidth","bottom","MozBottom","WebkitBottom","MSBottom","OBottom","boxDecorationBreak","MozBoxDecorationBreak","WebkitBoxDecorationBreak","MSBoxDecorationBreak","OBoxDecorationBreak","boxShadow","MozBoxShadow","WebkitBoxShadow","MSBoxShadow","OBoxShadow","boxSizing","MozBoxSizing","WebkitBoxSizing","MSBoxSizing","OBoxSizing","breakAfter","MozBreakAfter","WebkitBreakAfter","MSBreakAfter","OBreakAfter","breakBefore","MozBreakBefore","WebkitBreakBefore","MSBreakBefore","OBreakBefore","breakInside","MozBreakInside","WebkitBreakInside","MSBreakInside","OBreakInside","captionSide","MozCaptionSide","WebkitCaptionSide","MSCaptionSide","OCaptionSide","caretColor","MozCaretColor","WebkitCaretColor","MSCaretColor","OCaretColor","ch","MozCh","WebkitCh","MSCh","OCh","clear","MozClear","WebkitClear","MSClear","OClear","clip","MozClip","WebkitClip","MSClip","OClip","clipPath","MozClipPath","WebkitClipPath","MSClipPath","OClipPath","cm","MozCm","WebkitCm","MSCm","OCm","color","MozColor","WebkitColor","MSColor","OColor","columnCount","MozColumnCount","WebkitColumnCount","MSColumnCount","OColumnCount","columnFill","MozColumnFill","WebkitColumnFill","MSColumnFill","OColumnFill","columnGap","MozColumnGap","WebkitColumnGap","MSColumnGap","OColumnGap","columnRule","MozColumnRule","WebkitColumnRule","MSColumnRule","OColumnRule","columnRuleColor","MozColumnRuleColor","WebkitColumnRuleColor","MSColumnRuleColor","OColumnRuleColor","columnRuleStyle","MozColumnRuleStyle","WebkitColumnRuleStyle","MSColumnRuleStyle","OColumnRuleStyle","columnRuleWidth","MozColumnRuleWidth","WebkitColumnRuleWidth","MSColumnRuleWidth","OColumnRuleWidth","columnSpan","MozColumnSpan","WebkitColumnSpan","MSColumnSpan","OColumnSpan","columnWidth","MozColumnWidth","WebkitColumnWidth","MSColumnWidth","OColumnWidth","columns","MozColumns","WebkitColumns","MSColumns","OColumns","content","MozContent","WebkitContent","MSContent","OContent","counterIncrement","MozCounterIncrement","WebkitCounterIncrement","MSCounterIncrement","OCounterIncrement","counterReset","MozCounterReset","WebkitCounterReset","MSCounterReset","OCounterReset","cursor","MozCursor","WebkitCursor","MSCursor","OCursor","deg","MozDeg","WebkitDeg","MSDeg","ODeg","direction","MozDirection","WebkitDirection","MSDirection","ODirection","display","MozDisplay","WebkitDisplay","MSDisplay","ODisplay","dpcm","MozDpcm","WebkitDpcm","MSDpcm","ODpcm","dpi","MozDpi","WebkitDpi","MSDpi","ODpi","dppx","MozDppx","WebkitDppx","MSDppx","ODppx","em","MozEm","WebkitEm","MSEm","OEm","emptyCells","MozEmptyCells","WebkitEmptyCells","MSEmptyCells","OEmptyCells","ex","MozEx","WebkitEx","MSEx","OEx","filter","MozFilter","WebkitFilter","MSFilter","OFilter","flexBasis","MozFlexBasis","WebkitFlexBasis","MSFlexBasis","OFlexBasis","flexDirection","MozFlexDirection","WebkitFlexDirection","MSFlexDirection","OFlexDirection","flexFlow","MozFlexFlow","WebkitFlexFlow","MSFlexFlow","OFlexFlow","flexGrow","MozFlexGrow","WebkitFlexGrow","MSFlexGrow","OFlexGrow","flexShrink","MozFlexShrink","WebkitFlexShrink","MSFlexShrink","OFlexShrink","flexWrap","MozFlexWrap","WebkitFlexWrap","MSFlexWrap","OFlexWrap","float","MozFloat","WebkitFloat","MSFloat","OFloat","font","MozFont","WebkitFont","MSFont","OFont","fontFamily","MozFontFamily","WebkitFontFamily","MSFontFamily","OFontFamily","fontFeatureSettings","MozFontFeatureSettings","WebkitFontFeatureSettings","MSFontFeatureSettings","OFontFeatureSettings","fontKerning","MozFontKerning","WebkitFontKerning","MSFontKerning","OFontKerning","fontLanguageOverride","MozFontLanguageOverride","WebkitFontLanguageOverride","MSFontLanguageOverride","OFontLanguageOverride","fontSize","MozFontSize","WebkitFontSize","MSFontSize","OFontSize","fontSizeAdjust","MozFontSizeAdjust","WebkitFontSizeAdjust","MSFontSizeAdjust","OFontSizeAdjust","fontStretch","MozFontStretch","WebkitFontStretch","MSFontStretch","OFontStretch","fontStyle","MozFontStyle","WebkitFontStyle","MSFontStyle","OFontStyle","fontSynthesis","MozFontSynthesis","WebkitFontSynthesis","MSFontSynthesis","OFontSynthesis","fontVariant","MozFontVariant","WebkitFontVariant","MSFontVariant","OFontVariant","fontVariantAlternates","MozFontVariantAlternates","WebkitFontVariantAlternates","MSFontVariantAlternates","OFontVariantAlternates","fontVariantCaps","MozFontVariantCaps","WebkitFontVariantCaps","MSFontVariantCaps","OFontVariantCaps","fontVariantEastAsian","MozFontVariantEastAsian","WebkitFontVariantEastAsian","MSFontVariantEastAsian","OFontVariantEastAsian","fontVariantLigatures","MozFontVariantLigatures","WebkitFontVariantLigatures","MSFontVariantLigatures","OFontVariantLigatures","fontVariantNumeric","MozFontVariantNumeric","WebkitFontVariantNumeric","MSFontVariantNumeric","OFontVariantNumeric","fontVariantPosition","MozFontVariantPosition","WebkitFontVariantPosition","MSFontVariantPosition","OFontVariantPosition","fontWeight","MozFontWeight","WebkitFontWeight","MSFontWeight","OFontWeight","fr","MozFr","WebkitFr","MSFr","OFr","grad","MozGrad","WebkitGrad","MSGrad","OGrad","grid","MozGrid","WebkitGrid","MSGrid","OGrid","gridArea","MozGridArea","WebkitGridArea","MSGridArea","OGridArea","gridAutoColumns","MozGridAutoColumns","WebkitGridAutoColumns","MSGridAutoColumns","OGridAutoColumns","gridAutoFlow","MozGridAutoFlow","WebkitGridAutoFlow","MSGridAutoFlow","OGridAutoFlow","gridAutoRows","MozGridAutoRows","WebkitGridAutoRows","MSGridAutoRows","OGridAutoRows","gridColumn","MozGridColumn","WebkitGridColumn","MSGridColumn","OGridColumn","gridColumnEnd","MozGridColumnEnd","WebkitGridColumnEnd","MSGridColumnEnd","OGridColumnEnd","gridColumnGap","MozGridColumnGap","WebkitGridColumnGap","MSGridColumnGap","OGridColumnGap","gridColumnStart","MozGridColumnStart","WebkitGridColumnStart","MSGridColumnStart","OGridColumnStart","gridGap","MozGridGap","WebkitGridGap","MSGridGap","OGridGap","gridRow","MozGridRow","WebkitGridRow","MSGridRow","OGridRow","gridRowEnd","MozGridRowEnd","WebkitGridRowEnd","MSGridRowEnd","OGridRowEnd","gridRowGap","MozGridRowGap","WebkitGridRowGap","MSGridRowGap","OGridRowGap","gridRowStart","MozGridRowStart","WebkitGridRowStart","MSGridRowStart","OGridRowStart","gridTemplate","MozGridTemplate","WebkitGridTemplate","MSGridTemplate","OGridTemplate","gridTemplateAreas","MozGridTemplateAreas","WebkitGridTemplateAreas","MSGridTemplateAreas","OGridTemplateAreas","gridTemplateColumns","MozGridTemplateColumns","WebkitGridTemplateColumns","MSGridTemplateColumns","OGridTemplateColumns","gridTemplateRows","MozGridTemplateRows","WebkitGridTemplateRows","MSGridTemplateRows","OGridTemplateRows","height","MozHeight","WebkitHeight","MSHeight","OHeight","hyphens","MozHyphens","WebkitHyphens","MSHyphens","OHyphens","hz","MozHz","WebkitHz","MSHz","OHz","imageOrientation","MozImageOrientation","WebkitImageOrientation","MSImageOrientation","OImageOrientation","imageRendering","MozImageRendering","WebkitImageRendering","MSImageRendering","OImageRendering","imageResolution","MozImageResolution","WebkitImageResolution","MSImageResolution","OImageResolution","imeMode","MozImeMode","WebkitImeMode","MSImeMode","OImeMode","in","MozIn","WebkitIn","MSIn","OIn","inherit","MozInherit","WebkitInherit","MSInherit","OInherit","initial","MozInitial","WebkitInitial","MSInitial","OInitial","inlineSize","MozInlineSize","WebkitInlineSize","MSInlineSize","OInlineSize","isolation","MozIsolation","WebkitIsolation","MSIsolation","OIsolation","justifyContent","MozJustifyContent","WebkitJustifyContent","MSJustifyContent","OJustifyContent","khz","MozKhz","WebkitKhz","MSKhz","OKhz","left","MozLeft","WebkitLeft","MSLeft","OLeft","letterSpacing","MozLetterSpacing","WebkitLetterSpacing","MSLetterSpacing","OLetterSpacing","lineBreak","MozLineBreak","WebkitLineBreak","MSLineBreak","OLineBreak","lineHeight","MozLineHeight","WebkitLineHeight","MSLineHeight","OLineHeight","listStyle","MozListStyle","WebkitListStyle","MSListStyle","OListStyle","listStyleImage","MozListStyleImage","WebkitListStyleImage","MSListStyleImage","OListStyleImage","listStylePosition","MozListStylePosition","WebkitListStylePosition","MSListStylePosition","OListStylePosition","listStyleType","MozListStyleType","WebkitListStyleType","MSListStyleType","OListStyleType","margin","MozMargin","WebkitMargin","MSMargin","OMargin","marginBlockEnd","MozMarginBlockEnd","WebkitMarginBlockEnd","MSMarginBlockEnd","OMarginBlockEnd","marginBlockStart","MozMarginBlockStart","WebkitMarginBlockStart","MSMarginBlockStart","OMarginBlockStart","marginBottom","MozMarginBottom","WebkitMarginBottom","MSMarginBottom","OMarginBottom","marginInlineEnd","MozMarginInlineEnd","WebkitMarginInlineEnd","MSMarginInlineEnd","OMarginInlineEnd","marginInlineStart","MozMarginInlineStart","WebkitMarginInlineStart","MSMarginInlineStart","OMarginInlineStart","marginLeft","MozMarginLeft","WebkitMarginLeft","MSMarginLeft","OMarginLeft","marginRight","MozMarginRight","WebkitMarginRight","MSMarginRight","OMarginRight","marginTop","MozMarginTop","WebkitMarginTop","MSMarginTop","OMarginTop","mask","MozMask","WebkitMask","MSMask","OMask","maskClip","MozMaskClip","WebkitMaskClip","MSMaskClip","OMaskClip","maskComposite","MozMaskComposite","WebkitMaskComposite","MSMaskComposite","OMaskComposite","maskImage","MozMaskImage","WebkitMaskImage","MSMaskImage","OMaskImage","maskMode","MozMaskMode","WebkitMaskMode","MSMaskMode","OMaskMode","maskOrigin","MozMaskOrigin","WebkitMaskOrigin","MSMaskOrigin","OMaskOrigin","maskPosition","MozMaskPosition","WebkitMaskPosition","MSMaskPosition","OMaskPosition","maskRepeat","MozMaskRepeat","WebkitMaskRepeat","MSMaskRepeat","OMaskRepeat","maskSize","MozMaskSize","WebkitMaskSize","MSMaskSize","OMaskSize","maskType","MozMaskType","WebkitMaskType","MSMaskType","OMaskType","maxHeight","MozMaxHeight","WebkitMaxHeight","MSMaxHeight","OMaxHeight","maxWidth","MozMaxWidth","WebkitMaxWidth","MSMaxWidth","OMaxWidth","minBlockSize","MozMinBlockSize","WebkitMinBlockSize","MSMinBlockSize","OMinBlockSize","minHeight","MozMinHeight","WebkitMinHeight","MSMinHeight","OMinHeight","minInlineSize","MozMinInlineSize","WebkitMinInlineSize","MSMinInlineSize","OMinInlineSize","minWidth","MozMinWidth","WebkitMinWidth","MSMinWidth","OMinWidth","mixBlendMode","MozMixBlendMode","WebkitMixBlendMode","MSMixBlendMode","OMixBlendMode","mm","MozMm","WebkitMm","MSMm","OMm","ms","MozMs","WebkitMs","MSMs","OMs","objectFit","MozObjectFit","WebkitObjectFit","MSObjectFit","OObjectFit","objectPosition","MozObjectPosition","WebkitObjectPosition","MSObjectPosition","OObjectPosition","offsetBlockEnd","MozOffsetBlockEnd","WebkitOffsetBlockEnd","MSOffsetBlockEnd","OOffsetBlockEnd","offsetBlockStart","MozOffsetBlockStart","WebkitOffsetBlockStart","MSOffsetBlockStart","OOffsetBlockStart","offsetInlineEnd","MozOffsetInlineEnd","WebkitOffsetInlineEnd","MSOffsetInlineEnd","OOffsetInlineEnd","offsetInlineStart","MozOffsetInlineStart","WebkitOffsetInlineStart","MSOffsetInlineStart","OOffsetInlineStart","opacity","MozOpacity","WebkitOpacity","MSOpacity","OOpacity","order","MozOrder","WebkitOrder","MSOrder","OOrder","orphans","MozOrphans","WebkitOrphans","MSOrphans","OOrphans","outline","MozOutline","WebkitOutline","MSOutline","OOutline","outlineColor","MozOutlineColor","WebkitOutlineColor","MSOutlineColor","OOutlineColor","outlineOffset","MozOutlineOffset","WebkitOutlineOffset","MSOutlineOffset","OOutlineOffset","outlineStyle","MozOutlineStyle","WebkitOutlineStyle","MSOutlineStyle","OOutlineStyle","outlineWidth","MozOutlineWidth","WebkitOutlineWidth","MSOutlineWidth","OOutlineWidth","overflow","MozOverflow","WebkitOverflow","MSOverflow","OOverflow","overflowWrap","MozOverflowWrap","WebkitOverflowWrap","MSOverflowWrap","OOverflowWrap","overflowX","MozOverflowX","WebkitOverflowX","MSOverflowX","OOverflowX","overflowY","MozOverflowY","WebkitOverflowY","MSOverflowY","OOverflowY","padding","MozPadding","WebkitPadding","MSPadding","OPadding","paddingBlockEnd","MozPaddingBlockEnd","WebkitPaddingBlockEnd","MSPaddingBlockEnd","OPaddingBlockEnd","paddingBlockStart","MozPaddingBlockStart","WebkitPaddingBlockStart","MSPaddingBlockStart","OPaddingBlockStart","paddingBottom","MozPaddingBottom","WebkitPaddingBottom","MSPaddingBottom","OPaddingBottom","paddingInlineEnd","MozPaddingInlineEnd","WebkitPaddingInlineEnd","MSPaddingInlineEnd","OPaddingInlineEnd","paddingInlineStart","MozPaddingInlineStart","WebkitPaddingInlineStart","MSPaddingInlineStart","OPaddingInlineStart","paddingLeft","MozPaddingLeft","WebkitPaddingLeft","MSPaddingLeft","OPaddingLeft","paddingRight","MozPaddingRight","WebkitPaddingRight","MSPaddingRight","OPaddingRight","paddingTop","MozPaddingTop","WebkitPaddingTop","MSPaddingTop","OPaddingTop","pageBreakAfter","MozPageBreakAfter","WebkitPageBreakAfter","MSPageBreakAfter","OPageBreakAfter","pageBreakBefore","MozPageBreakBefore","WebkitPageBreakBefore","MSPageBreakBefore","OPageBreakBefore","pageBreakInside","MozPageBreakInside","WebkitPageBreakInside","MSPageBreakInside","OPageBreakInside","pc","MozPc","WebkitPc","MSPc","OPc","perspective","MozPerspective","WebkitPerspective","MSPerspective","OPerspective","perspectiveOrigin","MozPerspectiveOrigin","WebkitPerspectiveOrigin","MSPerspectiveOrigin","OPerspectiveOrigin","pointerEvents","MozPointerEvents","WebkitPointerEvents","MSPointerEvents","OPointerEvents","position","MozPosition","WebkitPosition","MSPosition","OPosition","pt","MozPt","WebkitPt","MSPt","OPt","px","MozPx","WebkitPx","MSPx","OPx","q","MozQ","WebkitQ","MSQ","OQ","quotes","MozQuotes","WebkitQuotes","MSQuotes","OQuotes","rad","MozRad","WebkitRad","MSRad","ORad","rem","MozRem","WebkitRem","MSRem","ORem","resize","MozResize","WebkitResize","MSResize","OResize","revert","MozRevert","WebkitRevert","MSRevert","ORevert","right","MozRight","WebkitRight","MSRight","ORight","rubyAlign","MozRubyAlign","WebkitRubyAlign","MSRubyAlign","ORubyAlign","rubyMerge","MozRubyMerge","WebkitRubyMerge","MSRubyMerge","ORubyMerge","rubyPosition","MozRubyPosition","WebkitRubyPosition","MSRubyPosition","ORubyPosition","s","MozS","WebkitS","MSS","OS","scrollBehavior","MozScrollBehavior","WebkitScrollBehavior","MSScrollBehavior","OScrollBehavior","scrollSnapCoordinate","MozScrollSnapCoordinate","WebkitScrollSnapCoordinate","MSScrollSnapCoordinate","OScrollSnapCoordinate","scrollSnapDestination","MozScrollSnapDestination","WebkitScrollSnapDestination","MSScrollSnapDestination","OScrollSnapDestination","scrollSnapType","MozScrollSnapType","WebkitScrollSnapType","MSScrollSnapType","OScrollSnapType","shapeImageThreshold","MozShapeImageThreshold","WebkitShapeImageThreshold","MSShapeImageThreshold","OShapeImageThreshold","shapeMargin","MozShapeMargin","WebkitShapeMargin","MSShapeMargin","OShapeMargin","shapeOutside","MozShapeOutside","WebkitShapeOutside","MSShapeOutside","OShapeOutside","tabSize","MozTabSize","WebkitTabSize","MSTabSize","OTabSize","tableLayout","MozTableLayout","WebkitTableLayout","MSTableLayout","OTableLayout","textAlign","MozTextAlign","WebkitTextAlign","MSTextAlign","OTextAlign","textAlignLast","MozTextAlignLast","WebkitTextAlignLast","MSTextAlignLast","OTextAlignLast","textCombineUpright","MozTextCombineUpright","WebkitTextCombineUpright","MSTextCombineUpright","OTextCombineUpright","textDecoration","MozTextDecoration","WebkitTextDecoration","MSTextDecoration","OTextDecoration","textDecorationColor","MozTextDecorationColor","WebkitTextDecorationColor","MSTextDecorationColor","OTextDecorationColor","textDecorationLine","MozTextDecorationLine","WebkitTextDecorationLine","MSTextDecorationLine","OTextDecorationLine","textDecorationStyle","MozTextDecorationStyle","WebkitTextDecorationStyle","MSTextDecorationStyle","OTextDecorationStyle","textEmphasis","MozTextEmphasis","WebkitTextEmphasis","MSTextEmphasis","OTextEmphasis","textEmphasisColor","MozTextEmphasisColor","WebkitTextEmphasisColor","MSTextEmphasisColor","OTextEmphasisColor","textEmphasisPosition","MozTextEmphasisPosition","WebkitTextEmphasisPosition","MSTextEmphasisPosition","OTextEmphasisPosition","textEmphasisStyle","MozTextEmphasisStyle","WebkitTextEmphasisStyle","MSTextEmphasisStyle","OTextEmphasisStyle","textIndent","MozTextIndent","WebkitTextIndent","MSTextIndent","OTextIndent","textOrientation","MozTextOrientation","WebkitTextOrientation","MSTextOrientation","OTextOrientation","textOverflow","MozTextOverflow","WebkitTextOverflow","MSTextOverflow","OTextOverflow","textRendering","MozTextRendering","WebkitTextRendering","MSTextRendering","OTextRendering","textShadow","MozTextShadow","WebkitTextShadow","MSTextShadow","OTextShadow","textTransform","MozTextTransform","WebkitTextTransform","MSTextTransform","OTextTransform","textUnderlinePosition","MozTextUnderlinePosition","WebkitTextUnderlinePosition","MSTextUnderlinePosition","OTextUnderlinePosition","top","MozTop","WebkitTop","MSTop","OTop","touchAction","MozTouchAction","WebkitTouchAction","MSTouchAction","OTouchAction","transform","MozTransform","WebkitTransform","msTransform","OTransform","transformBox","MozTransformBox","WebkitTransformBox","MSTransformBox","OTransformBox","transformOrigin","MozTransformOrigin","WebkitTransformOrigin","MSTransformOrigin","OTransformOrigin","transformStyle","MozTransformStyle","WebkitTransformStyle","MSTransformStyle","OTransformStyle","transition","MozTransition","WebkitTransition","MSTransition","OTransition","transitionDelay","MozTransitionDelay","WebkitTransitionDelay","MSTransitionDelay","OTransitionDelay","transitionDuration","MozTransitionDuration","WebkitTransitionDuration","MSTransitionDuration","OTransitionDuration","transitionProperty","MozTransitionProperty","WebkitTransitionProperty","MSTransitionProperty","OTransitionProperty","transitionTimingFunction","MozTransitionTimingFunction","WebkitTransitionTimingFunction","MSTransitionTimingFunction","OTransitionTimingFunction","turn","MozTurn","WebkitTurn","MSTurn","OTurn","unicodeBidi","MozUnicodeBidi","WebkitUnicodeBidi","MSUnicodeBidi","OUnicodeBidi","unset","MozUnset","WebkitUnset","MSUnset","OUnset","verticalAlign","MozVerticalAlign","WebkitVerticalAlign","MSVerticalAlign","OVerticalAlign","vh","MozVh","WebkitVh","MSVh","OVh","visibility","MozVisibility","WebkitVisibility","MSVisibility","OVisibility","vmax","MozVmax","WebkitVmax","MSVmax","OVmax","vmin","MozVmin","WebkitVmin","MSVmin","OVmin","vw","MozVw","WebkitVw","MSVw","OVw","whiteSpace","MozWhiteSpace","WebkitWhiteSpace","MSWhiteSpace","OWhiteSpace","widows","MozWidows","WebkitWidows","MSWidows","OWidows","width","MozWidth","WebkitWidth","MSWidth","OWidth","willChange","MozWillChange","WebkitWillChange","MSWillChange","OWillChange","wordBreak","MozWordBreak","WebkitWordBreak","MSWordBreak","OWordBreak","wordSpacing","MozWordSpacing","WebkitWordSpacing","MSWordSpacing","OWordSpacing","wordWrap","MozWordWrap","WebkitWordWrap","MSWordWrap","OWordWrap","writingMode","MozWritingMode","WebkitWritingMode","MSWritingMode","OWritingMode","zIndex","MozZIndex","WebkitZIndex","MSZIndex","OZIndex","fontSize","MozFontSize","WebkitFontSize","MSFontSize","OFontSize","flex","MozFlex","WebkitFlex","MSFlex","OFlex","fr","MozFr","WebkitFr","MSFr","OFr","overflowScrolling","MozOverflowScrolling","WebkitOverflowScrolling","MSOverflowScrolling","OOverflowScrolling"]},function(e,t,n){"use strict";function r(e){var t={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,function(e){return t[e]})}function i(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1))).replace(t,function(e){return n[e]})}var o={escape:r,unescape:i};e.exports=o},function(e,t,n){"use strict";var r=n(126),i=(n(8),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),o=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,e,t,n),i}return new r(e,t,n)},s=function(e,t,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,e,t,n,r),o}return new i(e,t,n,r)},u=function(e){var t=this;e instanceof t||r("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=i,c=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||l,n.poolSize||(n.poolSize=10),n.release=u,n},p={addPoolingTo:c,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:a,fourArgumentPooler:s};e.exports=p},function(e,t,n){"use strict";function r(e){return(""+e).replace(b,"$&/")}function i(e,t){this.func=e,this.context=t,this.count=0}function o(e,t,n){var r=e.func,i=e.context;r.call(i,t,e.count++)}function a(e,t,n){if(null==e)return e;var r=i.getPooled(t,n);g(e,o,r),i.release(r)}function s(e,t,n,r){this.result=e,this.keyPrefix=t,this.func=n,this.context=r,this.count=0}function u(e,t,n){var i=e.result,o=e.keyPrefix,a=e.func,s=e.context,u=a.call(s,t,e.count++);Array.isArray(u)?l(u,i,n,v.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,o+(!u.key||t&&t.key===u.key?"":r(u.key)+"/")+n)),i.push(u))}function l(e,t,n,i,o){var a="";null!=n&&(a=r(n)+"/");var l=s.getPooled(t,a,i,o);g(e,u,l),s.release(l)}function c(e,t,n){if(null==e)return e;var r=[];return l(e,r,null,t,n),r}function p(e,t,n){return null}function f(e,t){return g(e,p,null)}function h(e){var t=[];return l(e,t,null,v.thatReturnsArgument),t}var d=n(1099),m=n(93),v=n(32),g=n(1109),y=d.twoArgumentPooler,_=d.fourArgumentPooler,b=/\/+/g;i.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},d.addPoolingTo(i,y),s.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},d.addPoolingTo(s,_);var x={forEach:a,map:c,mapIntoWithKeyPrefixInternal:l,count:f,toArray:h};e.exports=x},function(e,t,n){"use strict";var r=n(93),i=r.createFactory,o={a:i("a"),abbr:i("abbr"),address:i("address"),area:i("area"),article:i("article"),aside:i("aside"),audio:i("audio"),b:i("b"),base:i("base"),bdi:i("bdi"),bdo:i("bdo"),big:i("big"),blockquote:i("blockquote"),body:i("body"),br:i("br"),button:i("button"),canvas:i("canvas"),caption:i("caption"),cite:i("cite"),code:i("code"),col:i("col"),colgroup:i("colgroup"),data:i("data"),datalist:i("datalist"),dd:i("dd"),del:i("del"),details:i("details"),dfn:i("dfn"),dialog:i("dialog"),div:i("div"),dl:i("dl"),dt:i("dt"),em:i("em"),embed:i("embed"),fieldset:i("fieldset"),figcaption:i("figcaption"),figure:i("figure"),footer:i("footer"),form:i("form"),h1:i("h1"),h2:i("h2"),h3:i("h3"),h4:i("h4"),h5:i("h5"),h6:i("h6"),head:i("head"),header:i("header"),hgroup:i("hgroup"),hr:i("hr"),html:i("html"),i:i("i"),iframe:i("iframe"),img:i("img"),input:i("input"),ins:i("ins"),kbd:i("kbd"),keygen:i("keygen"),label:i("label"),legend:i("legend"),li:i("li"),link:i("link"),main:i("main"),map:i("map"),mark:i("mark"),menu:i("menu"),menuitem:i("menuitem"),meta:i("meta"),meter:i("meter"),nav:i("nav"),noscript:i("noscript"),object:i("object"),ol:i("ol"),optgroup:i("optgroup"),option:i("option"),output:i("output"),p:i("p"),param:i("param"),picture:i("picture"),pre:i("pre"),progress:i("progress"),q:i("q"),rp:i("rp"),rt:i("rt"),ruby:i("ruby"),s:i("s"),samp:i("samp"),script:i("script"),section:i("section"),select:i("select"),small:i("small"),source:i("source"),span:i("span"),strong:i("strong"),style:i("style"),sub:i("sub"),summary:i("summary"),sup:i("sup"),table:i("table"),tbody:i("tbody"),td:i("td"),textarea:i("textarea"),tfoot:i("tfoot"),th:i("th"),thead:i("thead"),time:i("time"),title:i("title"),tr:i("tr"),track:i("track"),u:i("u"),ul:i("ul"),var:i("var"),video:i("video"),wbr:i("wbr"),circle:i("circle"),clipPath:i("clipPath"),defs:i("defs"),ellipse:i("ellipse"),g:i("g"),image:i("image"),line:i("line"),linearGradient:i("linearGradient"),mask:i("mask"),path:i("path"),pattern:i("pattern"),polygon:i("polygon"),polyline:i("polyline"),radialGradient:i("radialGradient"),rect:i("rect"),stop:i("stop"),svg:i("svg"),text:i("text"),tspan:i("tspan")};e.exports=o},function(e,t,n){"use strict";var r=n(93),i=r.isValidElement,o=n(443);e.exports=o(i)},function(e,t,n){"use strict";e.exports="15.6.2"},function(e,t,n){"use strict";var r=n(474),i=r.Component,o=n(93),a=o.isValidElement,s=n(477),u=n(694);e.exports=u(i,a,s)},function(e,t,n){"use strict";function r(e){var t=e&&(i&&e[i]||e[o]);if("function"==typeof t)return t}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=r},function(e,t,n){"use strict";function r(){return i++}var i=1;e.exports=r},function(e,t,n){"use strict";var r=function(){};e.exports=r},function(e,t,n){"use strict";function r(e){return o.isValidElement(e)||i("143"),e}var i=n(126),o=n(93);n(8);e.exports=r},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function i(e,t,n,o){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(o,e,""===t?c+r(e,0):t),1;var h,d,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)h=e[g],d=v+r(h,g),m+=i(h,d,n,o);else{var y=u(e);if(y){var _,b=y.call(e);if(y!==e.entries)for(var x=0;!(_=b.next()).done;)h=_.value,d=v+r(h,x++),m+=i(h,d,n,o);else for(;!(_=b.next()).done;){var w=_.value;w&&(h=w[1],d=v+l.escape(w[0])+p+r(h,0),m+=i(h,d,n,o))}}else if("object"===f){var k="",E=String(e);a("31","[object Object]"===E?"object with keys {"+Object.keys(e).join(", ")+"}":E,k)}}return m}function o(e,t,n){return null==e?0:i(e,"",t,n)}var a=n(126),s=(n(52),n(476)),u=n(1105),l=(n(8),n(1098)),c=(n(10),"."),p=":";e.exports=o},function(e,t,n){e.exports=n(71)},function(e,t,n){"use strict";function r(e){if(!(this instanceof r))return new r(e);i.call(this,e)}e.exports=r;var i=n(480),o=n(111);o.inherits=n(42),o.inherits(r,i),r.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t,n){e.copy(t,n)}var o=n(167).Buffer;e.exports=function(){function e(){r(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return o.alloc(0);if(1===this.length)return this.head.data;for(var t=o.allocUnsafe(e>>>0),n=this.head,r=0;n;)i(n.data,t,r),r+=n.data.length,n=n.next;return t},e}()},function(e,t,n){e.exports=n(262).PassThrough},function(e,t,n){e.exports=n(262).Transform},function(e,t,n){e.exports=n(261)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(7),i=function(e){return e&&e.__esModule?e:{default:e}}(r),o=n(1119);t.default=function(e){var t=Object.keys(e);return function(){var n=arguments.length<=0||void 0===arguments[0]?i.default.Map():arguments[0],r=arguments[1];return n.withMutations(function(n){t.forEach(function(t){var i=e[t],a=n.get(t),s=i(a,r);(0,o.validateNextState)(s,t,r),n.set(t,s)})})}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.combineReducers=void 0;var r=n(1116),i=function(e){return e&&e.__esModule?e:{default:e}}(r);t.combineReducers=i.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var i=n(7),o=r(i),a=n(483),s=r(a);t.default=function(e,t,n){var r=Object.keys(t);if(!r.length)return"Store does not have a valid reducer. Make sure the argument passed to combineReducers is an object whose values are reducers.";var i=(0,s.default)(n);if(!o.default.Iterable.isIterable(e))return"The "+i+' is of unexpected type. Expected argument to be an instance of Immutable.Iterable with the following properties: "'+r.join('", "')+'".';var a=e.keySeq().toArray().filter(function(e){return!t.hasOwnProperty(e)});return a.length>0?"Unexpected "+(1===a.length?"property":"properties")+' "'+a.join('", "')+'" found in '+i+'. Expected to find one of the known reducer property names instead: "'+r.join('", "')+'". Unexpected properties will be ignored.':null},e.exports=t.default},function(e,t,n){"use strict";"create index";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.validateNextState=t.getUnexpectedInvocationParameterMessage=t.getStateName=void 0;var i=n(483),o=r(i),a=n(1118),s=r(a),u=n(1120),l=r(u);t.getStateName=o.default,t.getUnexpectedInvocationParameterMessage=s.default,t.validateNextState=l.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t,n){if(void 0===e)throw new Error('Reducer "'+t+'" returned undefined when handling "'+n.type+'" action. To ignore an action, you must explicitly return the previous state.');return null},e.exports=t.default},function(e,t,n){"use strict";function r(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];return function(e){return function(n,r,a){var s=e(n,r,a),u=s.dispatch,l=[],c={getState:s.getState,dispatch:function(e){return u(e)}};return l=t.map(function(e){return e(c)}),u=i.a.apply(void 0,l)(s.dispatch),o({},s,{dispatch:u})}}}t.a=r;var i=n(484),o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}},function(e,t,n){"use strict";function r(e,t){return function(){return t(e.apply(void 0,arguments))}}function i(e,t){if("function"==typeof e)return r(e,t);if("object"!=typeof e||null===e)throw new Error("bindActionCreators expected an object or a function, instead received "+(null===e?"null":typeof e)+'. Did you write "import ActionCreators from" instead of "import * as ActionCreators from"?');for(var n=Object.keys(e),i={},o=0;o<n.length;o++){var a=n[o],s=e[a];"function"==typeof s&&(i[a]=r(s,t))}return i}t.a=i},function(e,t,n){"use strict";function r(e,t){var n=t&&t.type;return"Given action "+(n&&'"'+n.toString()+'"'||"an action")+', reducer "'+e+'" returned undefined. To ignore an action, you must explicitly return the previous state. If you want this reducer to hold no value, you can return null instead of undefined.'}function i(e){Object.keys(e).forEach(function(t){var n=e[t];if(void 0===n(void 0,{type:a.b.INIT}))throw new Error('Reducer "'+t+"\" returned undefined during initialization. If the state passed to the reducer is undefined, you must explicitly return the initial state. The initial state may not be undefined. If you don't want to set a value for this reducer, you can use null instead of undefined.");if(void 0===n(void 0,{type:"@@redux/PROBE_UNKNOWN_ACTION_"+Math.random().toString(36).substring(7).split("").join(".")}))throw new Error('Reducer "'+t+"\" returned undefined when probed with a random type. Don't try to handle "+a.b.INIT+' or other actions in "redux/*" namespace. They are considered private. Instead, you must return the current state for any unknown actions, unless it is undefined, in which case you must return the initial state, regardless of the action type. The initial state may not be undefined, but can be null.')})}function o(e){for(var t=Object.keys(e),n={},o=0;o<t.length;o++){var a=t[o];"function"==typeof e[a]&&(n[a]=e[a])}var s=Object.keys(n),u=void 0;try{i(n)}catch(e){u=e}return function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments[1];if(u)throw u;for(var i=!1,o={},a=0;a<s.length;a++){var l=s[a],c=n[l],p=e[l],f=c(p,t);if(void 0===f){var h=r(l,t);throw new Error(h)}o[l]=f,i=i||f!==p}return i?o:e}}t.a=o;var a=n(485);n(391),n(487)},function(e,t,n){var r=function(){return this}()||Function("return this")(),i=r.regeneratorRuntime&&Object.getOwnPropertyNames(r).indexOf("regeneratorRuntime")>=0,o=i&&r.regeneratorRuntime;if(r.regeneratorRuntime=void 0,e.exports=n(1125),i)r.regeneratorRuntime=o;else try{delete r.regeneratorRuntime}catch(e){r.regeneratorRuntime=void 0}},function(e,t){!function(t){"use strict";function n(e,t,n,r){var o=t&&t.prototype instanceof i?t:i,a=Object.create(o.prototype),s=new h(r||[]);return a._invoke=l(e,n,s),a}function r(e,t,n){try{return{type:"normal",arg:e.call(t,n)}}catch(e){return{type:"throw",arg:e}}}function i(){}function o(){}function a(){}function s(e){["next","throw","return"].forEach(function(t){e[t]=function(e){return this._invoke(t,e)}})}function u(e){function t(n,i,o,a){var s=r(e[n],e,i);if("throw"!==s.type){var u=s.arg,l=u.value;return l&&"object"==typeof l&&y.call(l,"__await")?Promise.resolve(l.__await).then(function(e){t("next",e,o,a)},function(e){t("throw",e,o,a)}):Promise.resolve(l).then(function(e){u.value=e,o(u)},a)}a(s.arg)}function n(e,n){function r(){return new Promise(function(r,i){t(e,n,r,i)})}return i=i?i.then(r,r):r()}var i;this._invoke=n}function l(e,t,n){var i=S;return function(o,a){if(i===A)throw new Error("Generator is already running");if(i===D){if("throw"===o)throw a;return m()}for(n.method=o,n.arg=a;;){var s=n.delegate;if(s){var u=c(s,n);if(u){if(u===O)continue;return u}}if("next"===n.method)n.sent=n._sent=n.arg;else if("throw"===n.method){if(i===S)throw i=D,n.arg;n.dispatchException(n.arg)}else"return"===n.method&&n.abrupt("return",n.arg);i=A;var l=r(e,t,n);if("normal"===l.type){if(i=n.done?D:C,l.arg===O)continue;return{value:l.arg,done:n.done}}"throw"===l.type&&(i=D,n.method="throw",n.arg=l.arg)}}}function c(e,t){var n=e.iterator[t.method];if(n===v){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=v,c(e,t),"throw"===t.method))return O;t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return O}var i=r(n,e.iterator,t.arg);if("throw"===i.type)return t.method="throw",t.arg=i.arg,t.delegate=null,O;var o=i.arg;return o?o.done?(t[e.resultName]=o.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=v),t.delegate=null,O):o:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,O)}function p(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function f(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function h(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(p,this),this.reset(!0)}function d(e){if(e){var t=e[b];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var n=-1,r=function t(){for(;++n<e.length;)if(y.call(e,n))return t.value=e[n],t.done=!1,t;return t.value=v,t.done=!0,t};return r.next=r}}return{next:m}}function m(){return{value:v,done:!0}}var v,g=Object.prototype,y=g.hasOwnProperty,_="function"==typeof Symbol?Symbol:{},b=_.iterator||"@@iterator",x=_.asyncIterator||"@@asyncIterator",w=_.toStringTag||"@@toStringTag",k="object"==typeof e,E=t.regeneratorRuntime;if(E)return void(k&&(e.exports=E));E=t.regeneratorRuntime=k?e.exports:{},E.wrap=n;var S="suspendedStart",C="suspendedYield",A="executing",D="completed",O={},M={};M[b]=function(){return this};var T=Object.getPrototypeOf,P=T&&T(T(d([])));P&&P!==g&&y.call(P,b)&&(M=P);var I=a.prototype=i.prototype=Object.create(M);o.prototype=I.constructor=a,a.constructor=o,a[w]=o.displayName="GeneratorFunction",E.isGeneratorFunction=function(e){var t="function"==typeof e&&e.constructor;return!!t&&(t===o||"GeneratorFunction"===(t.displayName||t.name))},E.mark=function(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,w in e||(e[w]="GeneratorFunction")),e.prototype=Object.create(I),e},E.awrap=function(e){return{__await:e}},s(u.prototype),u.prototype[x]=function(){return this},E.AsyncIterator=u,E.async=function(e,t,r,i){var o=new u(n(e,t,r,i));return E.isGeneratorFunction(t)?o:o.next().then(function(e){return e.done?e.value:o.next()})},s(I),I[w]="Generator",I[b]=function(){return this},I.toString=function(){return"[object Generator]"},E.keys=function(e){var t=[];for(var n in e)t.push(n);return t.reverse(),function n(){for(;t.length;){var r=t.pop();if(r in e)return n.value=r,n.done=!1,n}return n.done=!0,n}},E.values=d,h.prototype={constructor:h,reset:function(e){if(this.prev=0,this.next=0,this.sent=this._sent=v,this.done=!1,this.delegate=null,this.method="next",this.arg=v,this.tryEntries.forEach(f),!e)for(var t in this)"t"===t.charAt(0)&&y.call(this,t)&&!isNaN(+t.slice(1))&&(this[t]=v)},stop:function(){this.done=!0;var e=this.tryEntries[0],t=e.completion;if("throw"===t.type)throw t.arg;return this.rval},dispatchException:function(e){function t(t,r){return o.type="throw",o.arg=e,n.next=t,r&&(n.method="next",n.arg=v),!!r}if(this.done)throw e;for(var n=this,r=this.tryEntries.length-1;r>=0;--r){var i=this.tryEntries[r],o=i.completion;if("root"===i.tryLoc)return t("end");if(i.tryLoc<=this.prev){var a=y.call(i,"catchLoc"),s=y.call(i,"finallyLoc");if(a&&s){if(this.prev<i.catchLoc)return t(i.catchLoc,!0);if(this.prev<i.finallyLoc)return t(i.finallyLoc)}else if(a){if(this.prev<i.catchLoc)return t(i.catchLoc,!0)}else{if(!s)throw new Error("try statement without catch or finally");if(this.prev<i.finallyLoc)return t(i.finallyLoc)}}}},abrupt:function(e,t){for(var n=this.tryEntries.length-1;n>=0;--n){var r=this.tryEntries[n];if(r.tryLoc<=this.prev&&y.call(r,"finallyLoc")&&this.prev<r.finallyLoc){var i=r;break}}i&&("break"===e||"continue"===e)&&i.tryLoc<=t&&t<=i.finallyLoc&&(i=null);var o=i?i.completion:{};return o.type=e,o.arg=t,i?(this.method="next",this.next=i.finallyLoc,O):this.complete(o)},complete:function(e,t){if("throw"===e.type)throw e.arg;return"break"===e.type||"continue"===e.type?this.next=e.arg:"return"===e.type?(this.rval=this.arg=e.arg,this.method="return",this.next="end"):"normal"===e.type&&t&&(this.next=t),O},finish:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var n=this.tryEntries[t];if(n.finallyLoc===e)return this.complete(n.completion,n.afterLoc),f(n),O}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var n=this.tryEntries[t];if(n.tryLoc===e){var r=n.completion;if("throw"===r.type){var i=r.arg;f(n)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,n){return this.delegate={iterator:d(e),resultName:t,nextLoc:n},"next"===this.method&&(this.arg=v),O}}}(function(){return this}()||Function("return this")())},function(e,t,n){"use strict";e.exports=n(1133)},function(e,t,n){"use strict";var r={};["article","aside","button","blockquote","body","canvas","caption","col","colgroup","dd","div","dl","dt","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","hr","iframe","li","map","object","ol","output","p","pre","progress","script","section","style","table","tbody","td","textarea","tfoot","th","tr","thead","ul","video"].forEach(function(e){r[e]=!0}),e.exports=r},function(e,t,n){"use strict";function r(e,t){return e=e.source,t=t||"",function n(r,i){return r?(i=i.source||i,e=e.replace(r,i),n):new RegExp(e,t)}}var i=/[a-zA-Z_:][a-zA-Z0-9:._-]*/,o=/[^"'=<>`\x00-\x20]+/,a=/'[^']*'/,s=/"[^"]*"/,u=r(/(?:unquoted|single_quoted|double_quoted)/)("unquoted",o)("single_quoted",a)("double_quoted",s)(),l=r(/(?:\s+attr_name(?:\s*=\s*attr_value)?)/)("attr_name",i)("attr_value",u)(),c=r(/<[A-Za-z][A-Za-z0-9]*attribute*\s*\/?>/)("attribute",l)(),p=/<\/[A-Za-z][A-Za-z0-9]*\s*>/,f=/<!--([^-]+|[-][^-]+)*-->/,h=/<[?].*?[?]>/,d=/<![A-Z]+\s+[^>]*>/,m=/<!\[CDATA\[([^\]]+|\][^\]]|\]\][^>])*\]\]>/,v=r(/^(?:open_tag|close_tag|comment|processing|declaration|cdata)/)("open_tag",c)("close_tag",p)("comment",f)("processing",h)("declaration",d)("cdata",m)();e.exports.HTML_TAG_RE=v},function(e,t,n){"use strict";e.exports=["coap","doi","javascript","aaa","aaas","about","acap","cap","cid","crid","data","dav","dict","dns","file","ftp","geo","go","gopher","h323","http","https","iax","icap","im","imap","info","ipp","iris","iris.beep","iris.xpc","iris.xpcs","iris.lwz","ldap","mailto","mid","msrp","msrps","mtqp","mupdate","news","nfs","ni","nih","nntp","opaquelocktoken","pop","pres","rtsp","service","session","shttp","sieve","sip","sips","sms","snmp","soap.beep","soap.beeps","tag","tel","telnet","tftp","thismessage","tn3270","tip","tv","urn","vemmi","ws","wss","xcon","xcon-userid","xmlrpc.beep","xmlrpc.beeps","xmpp","z39.50r","z39.50s","adiumxtra","afp","afs","aim","apt","attachment","aw","beshare","bitcoin","bolo","callto","chrome","chrome-extension","com-eventbrite-attendee","content","cvs","dlna-playsingle","dlna-playcontainer","dtn","dvb","ed2k","facetime","feed","finger","fish","gg","git","gizmoproject","gtalk","hcp","icon","ipn","irc","irc6","ircs","itms","jar","jms","keyparc","lastfm","ldaps","magnet","maps","market","message","mms","ms-help","msnim","mumble","mvn","notes","oid","palm","paparazzi","platform","proxy","psyc","query","res","resource","rmi","rsync","rtmp","secondlife","sftp","sgn","skype","smb","soldat","spotify","ssh","steam","svn","teamspeak","things","udp","unreal","ut2004","ventrilo","view-source","webcal","wtai","wyciwyg","xfire","xri","ymsgr"]},function(e,t,n){"use strict";e.exports={options:{html:!0,xhtmlOut:!0,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{rules:["block","inline","references","abbr2"]},block:{rules:["blockquote","code","fences","heading","hr","htmlblock","lheading","list","paragraph"]},inline:{rules:["autolink","backticks","emphasis","entity","escape","htmltag","links","newline","text"]}}}},function(e,t,n){"use strict";e.exports={options:{html:!1,xhtmlOut:!1,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{rules:["block","inline","references","replacements","linkify","smartquotes","references","abbr2","footnote_tail"]},block:{rules:["blockquote","code","fences","footnote","heading","hr","htmlblock","lheading","list","paragraph","table"]},inline:{rules:["autolink","backticks","del","emphasis","entity","escape","footnote_ref","htmltag","links","newline","text"]}}}},function(e,t,n){"use strict";e.exports={options:{html:!1,xhtmlOut:!1,breaks:!1,langPrefix:"language-",linkify:!1,linkTarget:"",typographer:!1,quotes:"“”‘’",highlight:null,maxNesting:20},components:{core:{},block:{},inline:{}}}},function(e,t,n){"use strict";function r(e,t,n){this.src=t,this.env=n,this.options=e.options,this.tokens=[],this.inlineMode=!1,this.inline=e.inline,this.block=e.block,this.renderer=e.renderer,this.typographer=e.typographer}function i(e,t){"string"!=typeof e&&(t=e,e="default"),this.inline=new l,this.block=new u,this.core=new s,this.renderer=new a,this.ruler=new c,this.options={},this.configure(p[e]),this.set(t||{})}var o=n(26).assign,a=n(1137),s=n(1135),u=n(1134),l=n(1136),c=n(166),p={default:n(1131),full:n(1132),commonmark:n(1130)};i.prototype.set=function(e){o(this.options,e)},i.prototype.configure=function(e){var t=this;if(!e)throw new Error("Wrong `remarkable` preset, check name/content");e.options&&t.set(e.options),e.components&&Object.keys(e.components).forEach(function(n){e.components[n].rules&&t[n].ruler.enable(e.components[n].rules,!0)})},i.prototype.use=function(e,t){return e(this,t),this},i.prototype.parse=function(e,t){var n=new r(this,e,t);return this.core.process(n),n.tokens},i.prototype.render=function(e,t){return t=t||{},this.renderer.render(this.parse(e,t),this.options,t)},i.prototype.parseInline=function(e,t){var n=new r(this,e,t);return n.inlineMode=!0,this.core.process(n),n.tokens},i.prototype.renderInline=function(e,t){return t=t||{},this.renderer.render(this.parseInline(e,t),this.options,t)},e.exports=i,e.exports.utils=n(26)},function(e,t,n){"use strict";function r(){this.ruler=new i;for(var e=0;e<a.length;e++)this.ruler.push(a[e][0],a[e][1],{alt:(a[e][2]||[]).slice()})}var i=n(166),o=n(1150),a=[["code",n(1140)],["fences",n(1142),["paragraph","blockquote","list"]],["blockquote",n(1139),["paragraph","blockquote","list"]],["hr",n(1145),["paragraph","blockquote","list"]],["list",n(1148),["paragraph","blockquote"]],["footnote",n(1143),["paragraph"]],["heading",n(1144),["paragraph","blockquote"]],["lheading",n(1147)],["htmlblock",n(1146),["paragraph","blockquote"]],["table",n(1151),["paragraph"]],["deflist",n(1141),["paragraph"]],["paragraph",n(1149)]];r.prototype.tokenize=function(e,t,n){for(var r,i=this.ruler.getRules(""),o=i.length,a=t,s=!1;a<n&&(e.line=a=e.skipEmptyLines(a),!(a>=n))&&!(e.tShift[a]<e.blkIndent);){for(r=0;r<o&&!i[r](e,a,n,!1);r++);if(e.tight=!s,e.isEmpty(e.line-1)&&(s=!0),(a=e.line)<n&&e.isEmpty(a)){if(s=!0,++a<n&&"list"===e.parentType&&e.isEmpty(a))break;e.line=a}}};var s=/[\n\t]/g,u=/\r[\n\u0085]|[\u2424\u2028\u0085]/g,l=/\u00a0/g;r.prototype.parse=function(e,t,n,r){var i,a=0,c=0;if(!e)return[];e=e.replace(l," "),e=e.replace(u,"\n"),e.indexOf("\t")>=0&&(e=e.replace(s,function(t,n){var r;return 10===e.charCodeAt(n)?(a=n+1,c=0,t):(r="    ".slice((n-a-c)%4),c=n-a+1,r)})),i=new o(e,this,t,n,r),this.tokenize(i,i.line,i.lineMax)},e.exports=r},function(e,t,n){"use strict";function r(){this.options={},this.ruler=new i;for(var e=0;e<o.length;e++)this.ruler.push(o[e][0],o[e][1])}var i=n(166),o=[["block",n(1154)],["abbr",n(1152)],["references",n(1158)],["inline",n(1156)],["footnote_tail",n(1155)],["abbr2",n(1153)],["replacements",n(1159)],["smartquotes",n(1160)],["linkify",n(1157)]];r.prototype.process=function(e){var t,n,r;for(r=this.ruler.getRules(""),t=0,n=r.length;t<n;t++)r[t](e)},e.exports=r},function(e,t,n){"use strict";function r(){this.ruler=new o;for(var e=0;e<u.length;e++)this.ruler.push(u[e][0],u[e][1]);this.validateLink=i}function i(e){var t=["vbscript","javascript","file","data"],n=e.trim().toLowerCase();return n=s.replaceEntities(n),-1===n.indexOf(":")||-1===t.indexOf(n.split(":")[0])}var o=n(166),a=n(263),s=n(26),u=[["text",n(1176)],["newline",n(1173)],["escape",n(1166)],["backticks",n(1162)],["del",n(1163)],["ins",n(1170)],["mark",n(1172)],["emphasis",n(1164)],["sub",n(1174)],["sup",n(1175)],["links",n(1171)],["footnote_inline",n(1167)],["footnote_ref",n(1168)],["autolink",n(1161)],["htmltag",n(1169)],["entity",n(1165)]];r.prototype.skipToken=function(e){var t,n,r=this.ruler.getRules(""),i=r.length,o=e.pos;if((n=e.cacheGet(o))>0)return void(e.pos=n);for(t=0;t<i;t++)if(r[t](e,!0))return void e.cacheSet(o,e.pos);e.pos++,e.cacheSet(o,e.pos)},r.prototype.tokenize=function(e){for(var t,n,r=this.ruler.getRules(""),i=r.length,o=e.posMax;e.pos<o;){for(n=0;n<i&&!(t=r[n](e,!1));n++);if(t){if(e.pos>=o)break}else e.pending+=e.src[e.pos++]}e.pending&&e.pushPending()},r.prototype.parse=function(e,t,n,r){var i=new a(e,this,t,n,r);this.tokenize(i)},e.exports=r},function(e,t,n){"use strict";function r(){this.rules=i.assign({},o),this.getBreak=o.getBreak}var i=n(26),o=n(1138);e.exports=r,r.prototype.renderInline=function(e,t,n){for(var r=this.rules,i=e.length,o=0,a="";i--;)a+=r[e[o].type](e,o++,t,n,this);return a},r.prototype.render=function(e,t,n){for(var r=this.rules,i=e.length,o=-1,a="";++o<i;)"inline"===e[o].type?a+=this.renderInline(e[o].children,t,n):a+=r[e[o].type](e,o,t,n,this);return a}},function(e,t,n){"use strict";function r(e,t){return++t>=e.length-2?t:"paragraph_open"===e[t].type&&e[t].tight&&"inline"===e[t+1].type&&0===e[t+1].content.length&&"paragraph_close"===e[t+2].type&&e[t+2].tight?r(e,t+2):t}var i=n(26).has,o=n(26).unescapeMd,a=n(26).replaceEntities,s=n(26).escapeHtml,u={};u.blockquote_open=function(){return"<blockquote>\n"},u.blockquote_close=function(e,t){return"</blockquote>"+l(e,t)},u.code=function(e,t){return e[t].block?"<pre><code>"+s(e[t].content)+"</code></pre>"+l(e,t):"<code>"+s(e[t].content)+"</code>"},u.fence=function(e,t,n,r,u){var c,p,f,h=e[t],d="",m=n.langPrefix,v="";if(h.params){if(c=h.params.split(/\s+/g),p=c.join(" "),i(u.rules.fence_custom,c[0]))return u.rules.fence_custom[c[0]](e,t,n,r,u);v=s(a(o(p))),d=' class="'+m+v+'"'}return f=n.highlight?n.highlight.apply(n.highlight,[h.content].concat(c))||s(h.content):s(h.content),"<pre><code"+d+">"+f+"</code></pre>"+l(e,t)},u.fence_custom={},u.heading_open=function(e,t){return"<h"+e[t].hLevel+">"},u.heading_close=function(e,t){return"</h"+e[t].hLevel+">\n"},u.hr=function(e,t,n){return(n.xhtmlOut?"<hr />":"<hr>")+l(e,t)},u.bullet_list_open=function(){return"<ul>\n"},u.bullet_list_close=function(e,t){return"</ul>"+l(e,t)},u.list_item_open=function(){return"<li>"},u.list_item_close=function(){return"</li>\n"},u.ordered_list_open=function(e,t){var n=e[t];return"<ol"+(n.order>1?' start="'+n.order+'"':"")+">\n"},u.ordered_list_close=function(e,t){return"</ol>"+l(e,t)},u.paragraph_open=function(e,t){return e[t].tight?"":"<p>"},u.paragraph_close=function(e,t){var n=!(e[t].tight&&t&&"inline"===e[t-1].type&&!e[t-1].content);return(e[t].tight?"":"</p>")+(n?l(e,t):"")},u.link_open=function(e,t,n){var r=e[t].title?' title="'+s(a(e[t].title))+'"':"",i=n.linkTarget?' target="'+n.linkTarget+'"':"";return'<a href="'+s(e[t].href)+'"'+r+i+">"},u.link_close=function(){return"</a>"},u.image=function(e,t,n){var r=' src="'+s(e[t].src)+'"',i=e[t].title?' title="'+s(a(e[t].title))+'"':"";return"<img"+r+' alt="'+(e[t].alt?s(a(o(e[t].alt))):"")+'"'+i+(n.xhtmlOut?" /":"")+">"},u.table_open=function(){return"<table>\n"},u.table_close=function(){return"</table>\n"},u.thead_open=function(){return"<thead>\n"},u.thead_close=function(){return"</thead>\n"},u.tbody_open=function(){return"<tbody>\n"},u.tbody_close=function(){return"</tbody>\n"},u.tr_open=function(){return"<tr>"},u.tr_close=function(){return"</tr>\n"},u.th_open=function(e,t){var n=e[t];return"<th"+(n.align?' style="text-align:'+n.align+'"':"")+">"},u.th_close=function(){return"</th>"},u.td_open=function(e,t){var n=e[t];return"<td"+(n.align?' style="text-align:'+n.align+'"':"")+">"},u.td_close=function(){return"</td>"},u.strong_open=function(){return"<strong>"},u.strong_close=function(){return"</strong>"},u.em_open=function(){return"<em>"},u.em_close=function(){return"</em>"},u.del_open=function(){return"<del>"},u.del_close=function(){return"</del>"},u.ins_open=function(){return"<ins>"},u.ins_close=function(){return"</ins>"},u.mark_open=function(){return"<mark>"},u.mark_close=function(){return"</mark>"},u.sub=function(e,t){return"<sub>"+s(e[t].content)+"</sub>"},u.sup=function(e,t){return"<sup>"+s(e[t].content)+"</sup>"},u.hardbreak=function(e,t,n){return n.xhtmlOut?"<br />\n":"<br>\n"},u.softbreak=function(e,t,n){return n.breaks?n.xhtmlOut?"<br />\n":"<br>\n":"\n"},u.text=function(e,t){return s(e[t].content)},u.htmlblock=function(e,t){return e[t].content},u.htmltag=function(e,t){return e[t].content},u.abbr_open=function(e,t){return'<abbr title="'+s(a(e[t].title))+'">'},u.abbr_close=function(){return"</abbr>"},u.footnote_ref=function(e,t){var n=Number(e[t].id+1).toString(),r="fnref"+n;return e[t].subId>0&&(r+=":"+e[t].subId),'<sup class="footnote-ref"><a href="#fn'+n+'" id="'+r+'">['+n+"]</a></sup>"},u.footnote_block_open=function(e,t,n){return(n.xhtmlOut?'<hr class="footnotes-sep" />\n':'<hr class="footnotes-sep">\n')+'<section class="footnotes">\n<ol class="footnotes-list">\n'},u.footnote_block_close=function(){return"</ol>\n</section>\n"},u.footnote_open=function(e,t){return'<li id="fn'+Number(e[t].id+1).toString()+'"  class="footnote-item">'},u.footnote_close=function(){return"</li>\n"},u.footnote_anchor=function(e,t){var n=Number(e[t].id+1).toString(),r="fnref"+n;return e[t].subId>0&&(r+=":"+e[t].subId),' <a href="#'+r+'" class="footnote-backref">↩</a>'},u.dl_open=function(){return"<dl>\n"},u.dt_open=function(){return"<dt>"},u.dd_open=function(){return"<dd>"},u.dl_close=function(){return"</dl>\n"},u.dt_close=function(){return"</dt>\n"},u.dd_close=function(){return"</dd>\n"};var l=u.getBreak=function(e,t){return t=r(e,t),t<e.length&&"list_item_close"===e[t].type?"":"\n"};e.exports=u},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l,c,p,f,h,d,m=e.bMarks[t]+e.tShift[t],v=e.eMarks[t];if(m>v)return!1;if(62!==e.src.charCodeAt(m++))return!1;if(e.level>=e.options.maxNesting)return!1;if(r)return!0;for(32===e.src.charCodeAt(m)&&m++,u=e.blkIndent,e.blkIndent=0,s=[e.bMarks[t]],e.bMarks[t]=m,m=m<v?e.skipSpaces(m):m,o=m>=v,a=[e.tShift[t]],e.tShift[t]=m-e.bMarks[t],p=e.parser.ruler.getRules("blockquote"),i=t+1;i<n&&(m=e.bMarks[i]+e.tShift[i],v=e.eMarks[i],!(m>=v));i++)if(62!==e.src.charCodeAt(m++)){if(o)break;for(d=!1,f=0,h=p.length;f<h;f++)if(p[f](e,i,n,!0)){d=!0;break}if(d)break;s.push(e.bMarks[i]),a.push(e.tShift[i]),e.tShift[i]=-1337}else 32===e.src.charCodeAt(m)&&m++,s.push(e.bMarks[i]),e.bMarks[i]=m,m=m<v?e.skipSpaces(m):m,o=m>=v,a.push(e.tShift[i]),e.tShift[i]=m-e.bMarks[i];for(l=e.parentType,e.parentType="blockquote",e.tokens.push({type:"blockquote_open",lines:c=[t,0],level:e.level++}),e.parser.tokenize(e,t,i),e.tokens.push({type:"blockquote_close",level:--e.level}),e.parentType=l,c[1]=e.line,f=0;f<a.length;f++)e.bMarks[f+t]=s[f],e.tShift[f+t]=a[f];return e.blkIndent=u,!0}},function(e,t,n){"use strict";e.exports=function(e,t,n){var r,i;if(e.tShift[t]-e.blkIndent<4)return!1;for(i=r=t+1;r<n;)if(e.isEmpty(r))r++;else{if(!(e.tShift[r]-e.blkIndent>=4))break;r++,i=r}return e.line=r,e.tokens.push({type:"code",content:e.getLines(t,i,4+e.blkIndent,!0),block:!0,lines:[t,e.line],level:e.level}),!0}},function(e,t,n){"use strict";function r(e,t){var n,r,i=e.bMarks[t]+e.tShift[t],o=e.eMarks[t];return i>=o?-1:126!==(r=e.src.charCodeAt(i++))&&58!==r?-1:(n=e.skipSpaces(i),i===n?-1:n>=o?-1:n)}function i(e,t){var n,r,i=e.level+2;for(n=t+2,r=e.tokens.length-2;n<r;n++)e.tokens[n].level===i&&"paragraph_open"===e.tokens[n].type&&(e.tokens[n+2].tight=!0,e.tokens[n].tight=!0,n+=2)}e.exports=function(e,t,n,o){var a,s,u,l,c,p,f,h,d,m,v,g,y,_;if(o)return!(e.ddIndent<0)&&r(e,t)>=0;if(f=t+1,e.isEmpty(f)&&++f>n)return!1;if(e.tShift[f]<e.blkIndent)return!1;if((a=r(e,f))<0)return!1;if(e.level>=e.options.maxNesting)return!1;p=e.tokens.length,e.tokens.push({type:"dl_open",lines:c=[t,0],level:e.level++}),u=t,s=f;e:for(;;){for(_=!0,y=!1,e.tokens.push({type:"dt_open",lines:[u,u],level:e.level++}),e.tokens.push({type:"inline",content:e.getLines(u,u+1,e.blkIndent,!1).trim(),level:e.level+1,lines:[u,u],children:[]}),e.tokens.push({type:"dt_close",level:--e.level});;){if(e.tokens.push({type:"dd_open",lines:l=[f,0],level:e.level++}),g=e.tight,d=e.ddIndent,h=e.blkIndent,v=e.tShift[s],m=e.parentType,e.blkIndent=e.ddIndent=e.tShift[s]+2,e.tShift[s]=a-e.bMarks[s],e.tight=!0,e.parentType="deflist",e.parser.tokenize(e,s,n,!0),e.tight&&!y||(_=!1),y=e.line-s>1&&e.isEmpty(e.line-1),e.tShift[s]=v,e.tight=g,e.parentType=m,e.blkIndent=h,e.ddIndent=d,e.tokens.push({type:"dd_close",level:--e.level}),l[1]=f=e.line,f>=n)break e;if(e.tShift[f]<e.blkIndent)break e;if((a=r(e,f))<0)break;s=f}if(f>=n)break;if(u=f,e.isEmpty(u))break;if(e.tShift[u]<e.blkIndent)break;if((s=u+1)>=n)break;if(e.isEmpty(s)&&s++,s>=n)break;if(e.tShift[s]<e.blkIndent)break;if((a=r(e,s))<0)break}return e.tokens.push({type:"dl_close",level:--e.level}),c[1]=f,e.line=f,_&&i(e,p),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l=!1,c=e.bMarks[t]+e.tShift[t],p=e.eMarks[t];if(c+3>p)return!1;if(126!==(i=e.src.charCodeAt(c))&&96!==i)return!1;if(u=c,c=e.skipChars(c,i),(o=c-u)<3)return!1;if(a=e.src.slice(c,p).trim(),a.indexOf("`")>=0)return!1;if(r)return!0;for(s=t;!(++s>=n)&&(c=u=e.bMarks[s]+e.tShift[s],p=e.eMarks[s],!(c<p&&e.tShift[s]<e.blkIndent));)if(e.src.charCodeAt(c)===i&&!(e.tShift[s]-e.blkIndent>=4||(c=e.skipChars(c,i))-u<o||(c=e.skipSpaces(c))<p)){l=!0;break}return o=e.tShift[t],e.line=s+(l?1:0),e.tokens.push({type:"fence",params:a,content:e.getLines(t+1,s,o,!0),lines:[t,e.line],level:e.level}),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s,u,l=e.bMarks[t]+e.tShift[t],c=e.eMarks[t];if(l+4>c)return!1;if(91!==e.src.charCodeAt(l))return!1;if(94!==e.src.charCodeAt(l+1))return!1;if(e.level>=e.options.maxNesting)return!1;for(s=l+2;s<c;s++){if(32===e.src.charCodeAt(s))return!1;if(93===e.src.charCodeAt(s))break}return s!==l+2&&(!(s+1>=c||58!==e.src.charCodeAt(++s))&&(!!r||(s++,e.env.footnotes||(e.env.footnotes={}),e.env.footnotes.refs||(e.env.footnotes.refs={}),u=e.src.slice(l+2,s-2),e.env.footnotes.refs[":"+u]=-1,e.tokens.push({type:"footnote_reference_open",label:u,level:e.level++}),i=e.bMarks[t],o=e.tShift[t],a=e.parentType,e.tShift[t]=e.skipSpaces(s)-s,e.bMarks[t]=s,e.blkIndent+=4,e.parentType="footnote",e.tShift[t]<e.blkIndent&&(e.tShift[t]+=e.blkIndent,e.bMarks[t]-=e.blkIndent),e.parser.tokenize(e,t,n,!0),e.parentType=a,e.blkIndent-=4,e.tShift[t]=o,e.bMarks[t]=i,e.tokens.push({type:"footnote_reference_close",level:--e.level}),!0)))}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s=e.bMarks[t]+e.tShift[t],u=e.eMarks[t];if(s>=u)return!1;if(35!==(i=e.src.charCodeAt(s))||s>=u)return!1;for(o=1,i=e.src.charCodeAt(++s);35===i&&s<u&&o<=6;)o++,i=e.src.charCodeAt(++s);return!(o>6||s<u&&32!==i)&&(!!r||(u=e.skipCharsBack(u,32,s),a=e.skipCharsBack(u,35,s),a>s&&32===e.src.charCodeAt(a-1)&&(u=a),e.line=t+1,e.tokens.push({type:"heading_open",hLevel:o,lines:[t,e.line],level:e.level}),s<u&&e.tokens.push({type:"inline",content:e.src.slice(s,u).trim(),level:e.level+1,lines:[t,e.line],children:[]}),e.tokens.push({type:"heading_close",hLevel:o,level:e.level}),!0))}},function(e,t,n){"use strict";e.exports=function(e,t,n,r){var i,o,a,s=e.bMarks[t],u=e.eMarks[t];if((s+=e.tShift[t])>u)return!1;if(42!==(i=e.src.charCodeAt(s++))&&45!==i&&95!==i)return!1;for(o=1;s<u;){if((a=e.src.charCodeAt(s++))!==i&&32!==a)return!1;a===i&&o++}return!(o<3)&&(!!r||(e.line=t+1,e.tokens.push({type:"hr",lines:[t,e.line],level:e.level}),!0))}},function(e,t,n){"use strict";function r(e){var t=32|e;return t>=97&&t<=122}var i=n(1127),o=/^<([a-zA-Z]{1,15})[\s\/>]/,a=/^<\/([a-zA-Z]{1,15})[\s>]/;e.exports=function(e,t,n,s){var u,l,c,p=e.bMarks[t],f=e.eMarks[t],h=e.tShift[t];if(p+=h,!e.options.html)return!1;if(h>3||p+2>=f)return!1;if(60!==e.src.charCodeAt(p))return!1;if(33===(u=e.src.charCodeAt(p+1))||63===u){if(s)return!0}else{if(47!==u&&!r(u))return!1;if(47===u){if(!(l=e.src.slice(p,f).match(a)))return!1}else if(!(l=e.src.slice(p,f).match(o)))return!1;if(!0!==i[l[1].toLowerCase()])return!1;if(s)return!0}for(c=t+1;c<e.lineMax&&!e.isEmpty(c);)c++;return e.line=c,e.tokens.push({type:"htmlblock",level:e.level,lines:[t,e.line],content:e.getLines(t,c,0,!0)}),!0}},function(e,t,n){"use strict";e.exports=function(e,t,n){var r,i,o,a=t+1;return!(a>=n)&&(!(e.tShift[a]<e.blkIndent)&&(!(e.tShift[a]-e.blkIndent>3)&&(i=e.bMarks[a]+e.tShift[a],o=e.eMarks[a],!(i>=o)&&((45===(r=e.src.charCodeAt(i))||61===r)&&(i=e.skipChars(i,r),!((i=e.skipSpaces(i))<o)&&(i=e.bMarks[t]+e.tShift[t],e.line=a+1,e.tokens.push({type:"heading_open",hLevel:61===r?1:2,lines:[t,e.line],level:e.level}),e.tokens.push({type:"inline",content:e.src.slice(i,e.eMarks[t]).trim(),level:e.level+1,lines:[t,e.line-1],children:[]}),e.tokens.push({type:"heading_close",hLevel:61===r?1:2,level:e.level}),!0))))))}},function(e,t,n){"use strict";function r(e,t){var n,r,i;return r=e.bMarks[t]+e.tShift[t],i=e.eMarks[t],r>=i?-1:(n=e.src.charCodeAt(r++),42!==n&&45!==n&&43!==n?-1:r<i&&32!==e.src.charCodeAt(r)?-1:r)}function i(e,t){var n,r=e.bMarks[t]+e.tShift[t],i=e.eMarks[t];if(r+1>=i)return-1;if((n=e.src.charCodeAt(r++))<48||n>57)return-1;for(;;){if(r>=i)return-1;if(!((n=e.src.charCodeAt(r++))>=48&&n<=57)){if(41===n||46===n)break;return-1}}return r<i&&32!==e.src.charCodeAt(r)?-1:r}function o(e,t){var n,r,i=e.level+2;for(n=t+2,r=e.tokens.length-2;n<r;n++)e.tokens[n].level===i&&"paragraph_open"===e.tokens[n].type&&(e.tokens[n+2].tight=!0,e.tokens[n].tight=!0,n+=2)}e.exports=function(e,t,n,a){var s,u,l,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E,S,C,A,D,O=!0;if((d=i(e,t))>=0)_=!0;else{if(!((d=r(e,t))>=0))return!1;_=!1}if(e.level>=e.options.maxNesting)return!1;if(y=e.src.charCodeAt(d-1),a)return!0;for(x=e.tokens.length,_?(h=e.bMarks[t]+e.tShift[t],g=Number(e.src.substr(h,d-h-1)),e.tokens.push({type:"ordered_list_open",order:g,lines:k=[t,0],level:e.level++})):e.tokens.push({type:"bullet_list_open",lines:k=[t,0],level:e.level++}),s=t,w=!1,S=e.parser.ruler.getRules("list");!(!(s<n)||(b=e.skipSpaces(d),m=e.eMarks[s],v=b>=m?1:b-d,v>4&&(v=1),v<1&&(v=1),u=d-e.bMarks[s]+v,e.tokens.push({type:"list_item_open",lines:E=[t,0],level:e.level++}),c=e.blkIndent,p=e.tight,l=e.tShift[t],f=e.parentType,e.tShift[t]=b-e.bMarks[t],e.blkIndent=u,e.tight=!0,e.parentType="list",e.parser.tokenize(e,t,n,!0),e.tight&&!w||(O=!1),w=e.line-t>1&&e.isEmpty(e.line-1),e.blkIndent=c,e.tShift[t]=l,e.tight=p,e.parentType=f,e.tokens.push({type:"list_item_close",level:--e.level}),s=t=e.line,E[1]=s,b=e.bMarks[t],s>=n)||e.isEmpty(s)||e.tShift[s]<e.blkIndent);){for(D=!1,C=0,A=S.length;C<A;C++)if(S[C](e,s,n,!0)){D=!0;break}if(D)break;if(_){if((d=i(e,s))<0)break}else if((d=r(e,s))<0)break;if(y!==e.src.charCodeAt(d-1))break}return e.tokens.push({type:_?"ordered_list_close":"bullet_list_close",level:--e.level}),k[1]=s,e.line=s,O&&o(e,x),!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s,u=t+1;if(n=e.lineMax,u<n&&!e.isEmpty(u))for(s=e.parser.ruler.getRules("paragraph");u<n&&!e.isEmpty(u);u++)if(!(e.tShift[u]-e.blkIndent>3)){for(i=!1,o=0,a=s.length;o<a;o++)if(s[o](e,u,n,!0)){i=!0;break}if(i)break}return r=e.getLines(t,u,e.blkIndent,!1).trim(),e.line=u,r.length&&(e.tokens.push({type:"paragraph_open",tight:!1,lines:[t,e.line],level:e.level}),e.tokens.push({type:"inline",content:r,level:e.level+1,lines:[t,e.line],children:[]}),e.tokens.push({type:"paragraph_close",tight:!1,level:e.level})),!0}},function(e,t,n){"use strict";function r(e,t,n,r,i){var o,a,s,u,l,c,p;for(this.src=e,this.parser=t,this.options=n,this.env=r,this.tokens=i,this.bMarks=[],this.eMarks=[],this.tShift=[],this.blkIndent=0,this.line=0,this.lineMax=0,this.tight=!1,this.parentType="root",this.ddIndent=-1,this.level=0,this.result="",a=this.src,c=0,p=!1,s=u=c=0,l=a.length;u<l;u++){if(o=a.charCodeAt(u),!p){if(32===o){c++;continue}p=!0}10!==o&&u!==l-1||(10!==o&&u++,this.bMarks.push(s),this.eMarks.push(u),this.tShift.push(c),p=!1,c=0,s=u+1)}this.bMarks.push(a.length),this.eMarks.push(a.length),this.tShift.push(0),this.lineMax=this.bMarks.length-1}r.prototype.isEmpty=function(e){return this.bMarks[e]+this.tShift[e]>=this.eMarks[e]},r.prototype.skipEmptyLines=function(e){for(var t=this.lineMax;e<t&&!(this.bMarks[e]+this.tShift[e]<this.eMarks[e]);e++);return e},r.prototype.skipSpaces=function(e){for(var t=this.src.length;e<t&&32===this.src.charCodeAt(e);e++);return e},r.prototype.skipChars=function(e,t){for(var n=this.src.length;e<n&&this.src.charCodeAt(e)===t;e++);return e},r.prototype.skipCharsBack=function(e,t,n){if(e<=n)return e;for(;e>n;)if(t!==this.src.charCodeAt(--e))return e+1;return e},r.prototype.getLines=function(e,t,n,r){var i,o,a,s,u,l=e;if(e>=t)return"";if(l+1===t)return o=this.bMarks[l]+Math.min(this.tShift[l],n),a=r?this.eMarks[l]+1:this.eMarks[l],this.src.slice(o,a);for(s=new Array(t-e),i=0;l<t;l++,i++)u=this.tShift[l],u>n&&(u=n),u<0&&(u=0),o=this.bMarks[l]+u,a=l+1<t||r?this.eMarks[l]+1:this.eMarks[l],s[i]=this.src.slice(o,a);return s.join("")},e.exports=r},function(e,t,n){"use strict";function r(e,t){var n=e.bMarks[t]+e.blkIndent,r=e.eMarks[t];return e.src.substr(n,r-n)}e.exports=function(e,t,n,i){var o,a,s,u,l,c,p,f,h,d,m;if(t+2>n)return!1;if(l=t+1,e.tShift[l]<e.blkIndent)return!1;if((s=e.bMarks[l]+e.tShift[l])>=e.eMarks[l])return!1;if(124!==(o=e.src.charCodeAt(s))&&45!==o&&58!==o)return!1;if(a=r(e,t+1),!/^[-:| ]+$/.test(a))return!1;if((c=a.split("|"))<=2)return!1;for(f=[],u=0;u<c.length;u++){if(!(h=c[u].trim())){if(0===u||u===c.length-1)continue;return!1}if(!/^:?-+:?$/.test(h))return!1;58===h.charCodeAt(h.length-1)?f.push(58===h.charCodeAt(0)?"center":"right"):58===h.charCodeAt(0)?f.push("left"):f.push("")}if(a=r(e,t).trim(),-1===a.indexOf("|"))return!1;if(c=a.replace(/^\||\|$/g,"").split("|"),f.length!==c.length)return!1;if(i)return!0;for(e.tokens.push({type:"table_open",lines:d=[t,0],level:e.level++}),e.tokens.push({type:"thead_open",lines:[t,t+1],level:e.level++}),e.tokens.push({type:"tr_open",lines:[t,t+1],level:e.level++}),u=0;u<c.length;u++)e.tokens.push({type:"th_open",align:f[u],lines:[t,t+1],level:e.level++}),e.tokens.push({type:"inline",content:c[u].trim(),lines:[t,t+1],level:e.level,children:[]}),e.tokens.push({type:"th_close",level:--e.level});for(e.tokens.push({type:"tr_close",level:--e.level}),e.tokens.push({type:"thead_close",level:--e.level}),e.tokens.push({type:"tbody_open",lines:m=[t+2,0],level:e.level++}),l=t+2;l<n&&!(e.tShift[l]<e.blkIndent)&&(a=r(e,l).trim(),-1!==a.indexOf("|"));l++){for(c=a.replace(/^\||\|$/g,"").split("|"),e.tokens.push({type:"tr_open",level:e.level++}),u=0;u<c.length;u++)e.tokens.push({type:"td_open",align:f[u],level:e.level++}),p=c[u].substring(124===c[u].charCodeAt(0)?1:0,124===c[u].charCodeAt(c[u].length-1)?c[u].length-1:c[u].length).trim(),e.tokens.push({type:"inline",content:p,level:e.level,children:[]}),e.tokens.push({type:"td_close",level:--e.level});e.tokens.push({type:"tr_close",level:--e.level})}return e.tokens.push({type:"tbody_close",level:--e.level}),e.tokens.push({type:"table_close",level:--e.level}),d[1]=m[1]=l,e.line=l,!0}},function(e,t,n){"use strict";function r(e,t,n,r){var a,s,u,l,c,p;if(42!==e.charCodeAt(0))return-1;if(91!==e.charCodeAt(1))return-1;if(-1===e.indexOf("]:"))return-1;if(a=new i(e,t,n,r,[]),(s=o(a,1))<0||58!==e.charCodeAt(s+1))return-1;for(l=a.posMax,u=s+2;u<l&&10!==a.src.charCodeAt(u);u++);return c=e.slice(2,s),p=e.slice(s+2,u).trim(),0===p.length?-1:(r.abbreviations||(r.abbreviations={}),void 0===r.abbreviations[":"+c]&&(r.abbreviations[":"+c]=p),u)}var i=n(263),o=n(165);e.exports=function(e){var t,n,i,o,a=e.tokens;if(!e.inlineMode)for(t=1,n=a.length-1;t<n;t++)if("paragraph_open"===a[t-1].type&&"inline"===a[t].type&&"paragraph_close"===a[t+1].type){for(i=a[t].content;i.length&&!((o=r(i,e.inline,e.options,e.env))<0);)i=i.slice(o).trim();a[t].content=i,i.length||(a[t-1].tight=!0,a[t+1].tight=!0)}}},function(e,t,n){"use strict";function r(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1")}var i=" \n()[]'\".,!?-";e.exports=function(e){var t,n,o,a,s,u,l,c,p,f,h,d,m=e.tokens;if(e.env.abbreviations)for(e.env.abbrRegExp||(d="(^|["+i.split("").map(r).join("")+"])("+Object.keys(e.env.abbreviations).map(function(e){return e.substr(1)}).sort(function(e,t){return t.length-e.length}).map(r).join("|")+")($|["+i.split("").map(r).join("")+"])",e.env.abbrRegExp=new RegExp(d,"g")),f=e.env.abbrRegExp,n=0,o=m.length;n<o;n++)if("inline"===m[n].type)for(a=m[n].children,t=a.length-1;t>=0;t--)if(s=a[t],"text"===s.type){for(c=0,u=s.content,f.lastIndex=0,p=s.level,l=[];h=f.exec(u);)f.lastIndex>c&&l.push({type:"text",content:u.slice(c,h.index+h[1].length),level:p}),l.push({type:"abbr_open",title:e.env.abbreviations[":"+h[2]],level:p++}),l.push({type:"text",content:h[2],level:p}),l.push({type:"abbr_close",level:--p}),c=f.lastIndex-h[3].length;l.length&&(c<u.length&&l.push({type:"text",content:u.slice(c),level:p}),m[n].children=a=[].concat(a.slice(0,t),l,a.slice(t+1)))}}},function(e,t,n){"use strict";e.exports=function(e){e.inlineMode?e.tokens.push({type:"inline",content:e.src.replace(/\n/g," ").trim(),level:0,lines:[0,1],children:[]}):e.block.parse(e.src,e.options,e.env,e.tokens)}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r,i,o,a,s,u,l,c=0,p=!1,f={};if(e.env.footnotes&&(e.tokens=e.tokens.filter(function(e){return"footnote_reference_open"===e.type?(p=!0,u=[],l=e.label,!1):"footnote_reference_close"===e.type?(p=!1,f[":"+l]=u,!1):(p&&u.push(e),!p)}),e.env.footnotes.list)){for(a=e.env.footnotes.list,e.tokens.push({type:"footnote_block_open",level:c++}),t=0,n=a.length;t<n;t++){for(e.tokens.push({type:"footnote_open",id:t,level:c++}),a[t].tokens?(s=[],s.push({type:"paragraph_open",tight:!1,level:c++}),s.push({type:"inline",content:"",level:c,children:a[t].tokens}),s.push({type:"paragraph_close",tight:!1,level:--c})):a[t].label&&(s=f[":"+a[t].label]),e.tokens=e.tokens.concat(s),o="paragraph_close"===e.tokens[e.tokens.length-1].type?e.tokens.pop():null,i=a[t].count>0?a[t].count:1,r=0;r<i;r++)e.tokens.push({type:"footnote_anchor",id:t,subId:r,level:c});o&&e.tokens.push(o),e.tokens.push({type:"footnote_close",level:--c})}e.tokens.push({type:"footnote_block_close",level:--c})}}},function(e,t,n){"use strict";e.exports=function(e){var t,n,r,i=e.tokens;for(n=0,r=i.length;n<r;n++)t=i[n],"inline"===t.type&&e.inline.parse(t.content,e.options,e.env,t.children)}},function(e,t,n){"use strict";function r(e){return/^<a[>\s]/i.test(e)}function i(e){return/^<\/a\s*>/i.test(e)}function o(){var e=[],t=new a({stripPrefix:!1,url:!0,email:!0,twitter:!1,replaceFn:function(t,n){switch(n.getType()){case"url":e.push({text:n.matchedText,url:n.getUrl()});break;case"email":e.push({text:n.matchedText,url:"mailto:"+n.getEmail().replace(/^mailto:/i,"")})}return!1}});return{links:e,autolinker:t}}var a=n(508),s=/www|@|\:\/\//;e.exports=function(e){var t,n,a,u,l,c,p,f,h,d,m,v,g,y=e.tokens,_=null;if(e.options.linkify)for(n=0,a=y.length;n<a;n++)if("inline"===y[n].type)for(u=y[n].children,m=0,t=u.length-1;t>=0;t--)if(l=u[t],"link_close"!==l.type){if("htmltag"===l.type&&(r(l.content)&&m>0&&m--,i(l.content)&&m++),!(m>0)&&"text"===l.type&&s.test(l.content)){if(_||(_=o(),v=_.links,g=_.autolinker),c=l.content,v.length=0,g.link(c),!v.length)continue;for(p=[],d=l.level,f=0;f<v.length;f++)e.inline.validateLink(v[f].url)&&(h=c.indexOf(v[f].text),h&&(d=d,p.push({type:"text",content:c.slice(0,h),level:d})),p.push({type:"link_open",href:v[f].url,title:"",level:d++}),p.push({type:"text",content:v[f].text,level:d}),p.push({type:"link_close",level:--d}),c=c.slice(h+v[f].text.length));c.length&&p.push({type:"text",content:c,level:d}),y[n].children=u=[].concat(u.slice(0,t),p,u.slice(t+1))}}else for(t--;u[t].level!==l.level&&"link_open"!==u[t].type;)t--}},function(e,t,n){"use strict";function r(e,t,n,r){var l,c,p,f,h,d,m,v,g;if(91!==e.charCodeAt(0))return-1;if(-1===e.indexOf("]:"))return-1;if(l=new i(e,t,n,r,[]),(c=o(l,0))<0||58!==e.charCodeAt(c+1))return-1;for(f=l.posMax,p=c+2;p<f&&(32===(h=l.src.charCodeAt(p))||10===h);p++);if(!a(l,p))return-1;for(m=l.linkContent,p=l.pos,d=p,p+=1;p<f&&(32===(h=l.src.charCodeAt(p))||10===h);p++);for(p<f&&d!==p&&s(l,p)?(v=l.linkContent,p=l.pos):(v="",p=d);p<f&&32===l.src.charCodeAt(p);)p++;return p<f&&10!==l.src.charCodeAt(p)?-1:(g=u(e.slice(1,c)),void 0===r.references[g]&&(r.references[g]={title:v,href:m}),p)}var i=n(263),o=n(165),a=n(491),s=n(492),u=n(490);e.exports=function(e){var t,n,i,o,a=e.tokens;if(e.env.references=e.env.references||{},!e.inlineMode)for(t=1,n=a.length-1;t<n;t++)if("inline"===a[t].type&&"paragraph_open"===a[t-1].type&&"paragraph_close"===a[t+1].type){for(i=a[t].content;i.length&&!((o=r(i,e.inline,e.options,e.env))<0);)i=i.slice(o).trim();a[t].content=i,i.length||(a[t-1].tight=!0,a[t+1].tight=!0)}}},function(e,t,n){"use strict";function r(e){return e.indexOf("(")<0?e:e.replace(o,function(e,t){return a[t.toLowerCase()]})}var i=/\+-|\.\.|\?\?\?\?|!!!!|,,|--/,o=/\((c|tm|r|p)\)/gi,a={c:"©",r:"®",p:"§",tm:"™"};e.exports=function(e){var t,n,o,a,s;if(e.options.typographer)for(s=e.tokens.length-1;s>=0;s--)if("inline"===e.tokens[s].type)for(a=e.tokens[s].children,t=a.length-1;t>=0;t--)n=a[t],"text"===n.type&&(o=n.content,o=r(o),i.test(o)&&(o=o.replace(/\+-/g,"±").replace(/\.{2,}/g,"…").replace(/([?!])…/g,"$1..").replace(/([?!]){4,}/g,"$1$1$1").replace(/,{2,}/g,",").replace(/(^|[^-])---([^-]|$)/gm,"$1—$2").replace(/(^|\s)--(\s|$)/gm,"$1–$2").replace(/(^|[^-\s])--([^-\s]|$)/gm,"$1–$2")),n.content=o)}},function(e,t,n){"use strict";function r(e,t){return!(t<0||t>=e.length)&&!s.test(e[t])}function i(e,t,n){return e.substr(0,t)+n+e.substr(t+1)}var o=/['"]/,a=/['"]/g,s=/[-\s()\[\]]/;e.exports=function(e){var t,n,s,u,l,c,p,f,h,d,m,v,g,y,_,b,x;if(e.options.typographer)for(x=[],_=e.tokens.length-1;_>=0;_--)if("inline"===e.tokens[_].type)for(b=e.tokens[_].children,x.length=0,t=0;t<b.length;t++)if(n=b[t],"text"===n.type&&!o.test(n.text)){for(p=b[t].level,g=x.length-1;g>=0&&!(x[g].level<=p);g--);x.length=g+1,s=n.content,l=0,c=s.length;e:for(;l<c&&(a.lastIndex=l,u=a.exec(s));)if(f=!r(s,u.index-1),l=u.index+1,y="'"===u[0],(h=!r(s,l))||f){if(m=!h,v=!f)for(g=x.length-1;g>=0&&(d=x[g],!(x[g].level<p));g--)if(d.single===y&&x[g].level===p){d=x[g],y?(b[d.token].content=i(b[d.token].content,d.pos,e.options.quotes[2]),n.content=i(n.content,u.index,e.options.quotes[3])):(b[d.token].content=i(b[d.token].content,d.pos,e.options.quotes[0]),n.content=i(n.content,u.index,e.options.quotes[1])),x.length=g;continue e}m?x.push({token:t,pos:u.index,single:y,level:p}):v&&y&&(n.content=i(n.content,u.index,"’"))}else y&&(n.content=i(n.content,u.index,"’"))}}},function(e,t,n){"use strict";var r=n(1129),i=n(489),o=/^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/,a=/^<([a-zA-Z.\-]{1,25}):([^<>\x00-\x20]*)>/;e.exports=function(e,t){var n,s,u,l,c,p=e.pos;return 60===e.src.charCodeAt(p)&&(n=e.src.slice(p),!(n.indexOf(">")<0)&&((s=n.match(a))?!(r.indexOf(s[1].toLowerCase())<0)&&(l=s[0].slice(1,-1),c=i(l),!!e.parser.validateLink(l)&&(t||(e.push({type:"link_open",href:c,level:e.level}),e.push({type:"text",content:l,level:e.level+1}),e.push({type:"link_close",level:e.level})),e.pos+=s[0].length,!0)):!!(u=n.match(o))&&(l=u[0].slice(1,-1),c=i("mailto:"+l),!!e.parser.validateLink(c)&&(t||(e.push({type:"link_open",href:c,level:e.level}),e.push({type:"text",content:l,level:e.level+1}),e.push({type:"link_close",level:e.level})),e.pos+=u[0].length,!0))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.pos;if(96!==e.src.charCodeAt(s))return!1;for(n=s,s++,r=e.posMax;s<r&&96===e.src.charCodeAt(s);)s++;for(i=e.src.slice(n,s),o=a=s;-1!==(o=e.src.indexOf("`",a));){for(a=o+1;a<r&&96===e.src.charCodeAt(a);)a++;if(a-o===i.length)return t||e.push({type:"code",content:e.src.slice(s,o).replace(/[ \n]+/g," ").trim(),block:!1,level:e.level}),e.pos=a,!0}return t||(e.pending+=i),e.pos+=i.length,!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(126!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(126!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),126===o)return!1;if(126===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&126===e.src.charCodeAt(r);)r++;if(r>u+3)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(126===e.src.charCodeAt(e.pos)&&126===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),126!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&126!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"del_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"del_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";function r(e){return e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122}function i(e,t){var n,i,o,a=t,s=!0,u=!0,l=e.posMax,c=e.src.charCodeAt(t);for(n=t>0?e.src.charCodeAt(t-1):-1;a<l&&e.src.charCodeAt(a)===c;)a++;return a>=l&&(s=!1),o=a-t,o>=4?s=u=!1:(i=a<l?e.src.charCodeAt(a):-1,32!==i&&10!==i||(s=!1),32!==n&&10!==n||(u=!1),95===c&&(r(n)&&(s=!1),r(i)&&(u=!1))),{can_open:s,can_close:u,delims:o}}e.exports=function(e,t){var n,r,o,a,s,u,l,c=e.posMax,p=e.pos,f=e.src.charCodeAt(p);if(95!==f&&42!==f)return!1;if(t)return!1;if(l=i(e,p),n=l.delims,!l.can_open)return e.pos+=n,t||(e.pending+=e.src.slice(p,e.pos)),!0;if(e.level>=e.options.maxNesting)return!1;for(e.pos=p+n,u=[n];e.pos<c;)if(e.src.charCodeAt(e.pos)!==f)e.parser.skipToken(e);else{if(l=i(e,e.pos),r=l.delims,l.can_close){for(a=u.pop(),s=r;a!==s;){if(s<a){u.push(a-s);break}if(s-=a,0===u.length)break;e.pos+=a,a=u.pop()}if(0===u.length){n=a,o=!0;break}e.pos+=r;continue}l.can_open&&u.push(r),e.pos+=r}return o?(e.posMax=e.pos,e.pos=p+n,t||(2!==n&&3!==n||e.push({type:"strong_open",level:e.level++}),1!==n&&3!==n||e.push({type:"em_open",level:e.level++}),e.parser.tokenize(e),1!==n&&3!==n||e.push({type:"em_close",level:--e.level}),2!==n&&3!==n||e.push({type:"strong_close",level:--e.level})),e.pos=e.posMax+n,e.posMax=c,!0):(e.pos=p,!1)}},function(e,t,n){"use strict";var r=n(488),i=n(26).has,o=n(26).isValidEntityCode,a=n(26).fromCodePoint,s=/^&#((?:x[a-f0-9]{1,8}|[0-9]{1,8}));/i,u=/^&([a-z][a-z0-9]{1,31});/i;e.exports=function(e,t){var n,l,c=e.pos,p=e.posMax;if(38!==e.src.charCodeAt(c))return!1;if(c+1<p)if(35===e.src.charCodeAt(c+1)){if(l=e.src.slice(c).match(s))return t||(n="x"===l[1][0].toLowerCase()?parseInt(l[1].slice(1),16):parseInt(l[1],10),e.pending+=a(o(n)?n:65533)),e.pos+=l[0].length,!0}else if((l=e.src.slice(c).match(u))&&i(r,l[1]))return t||(e.pending+=r[l[1]]),e.pos+=l[0].length,!0;return t||(e.pending+="&"),e.pos++,!0}},function(e,t,n){"use strict";for(var r=[],i=0;i<256;i++)r.push(0);"\\!\"#$%&'()*+,./:;<=>?@[]^_`{|}~-".split("").forEach(function(e){r[e.charCodeAt(0)]=1}),e.exports=function(e,t){var n,i=e.pos,o=e.posMax;if(92!==e.src.charCodeAt(i))return!1;if(++i<o){if((n=e.src.charCodeAt(i))<256&&0!==r[n])return t||(e.pending+=e.src[i]),e.pos+=2,!0;if(10===n){for(t||e.push({type:"hardbreak",level:e.level}),i++;i<o&&32===e.src.charCodeAt(i);)i++;return e.pos=i,!0}}return t||(e.pending+="\\"),e.pos++,!0}},function(e,t,n){"use strict";var r=n(165);e.exports=function(e,t){var n,i,o,a,s=e.posMax,u=e.pos;return!(u+2>=s)&&(94===e.src.charCodeAt(u)&&(91===e.src.charCodeAt(u+1)&&(!(e.level>=e.options.maxNesting)&&(n=u+2,!((i=r(e,u+1))<0)&&(t||(e.env.footnotes||(e.env.footnotes={}),e.env.footnotes.list||(e.env.footnotes.list=[]),o=e.env.footnotes.list.length,e.pos=n,e.posMax=i,e.push({type:"footnote_ref",id:o,level:e.level}),e.linkLevel++,a=e.tokens.length,e.parser.tokenize(e),e.env.footnotes.list[o]={tokens:e.tokens.splice(a)},e.linkLevel--),e.pos=i+1,e.posMax=s,!0)))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a=e.posMax,s=e.pos;if(s+3>a)return!1;if(!e.env.footnotes||!e.env.footnotes.refs)return!1;if(91!==e.src.charCodeAt(s))return!1;if(94!==e.src.charCodeAt(s+1))return!1;if(e.level>=e.options.maxNesting)return!1;for(r=s+2;r<a;r++){if(32===e.src.charCodeAt(r))return!1;if(10===e.src.charCodeAt(r))return!1;if(93===e.src.charCodeAt(r))break}return r!==s+2&&(!(r>=a)&&(r++,n=e.src.slice(s+2,r-1),void 0!==e.env.footnotes.refs[":"+n]&&(t||(e.env.footnotes.list||(e.env.footnotes.list=[]),e.env.footnotes.refs[":"+n]<0?(i=e.env.footnotes.list.length,e.env.footnotes.list[i]={label:n,count:0},e.env.footnotes.refs[":"+n]=i):i=e.env.footnotes.refs[":"+n],o=e.env.footnotes.list[i].count,e.env.footnotes.list[i].count++,e.push({type:"footnote_ref",id:i,subId:o,level:e.level})),e.pos=r,e.posMax=a,!0)))}},function(e,t,n){"use strict";function r(e){var t=32|e;return t>=97&&t<=122}var i=n(1128).HTML_TAG_RE;e.exports=function(e,t){var n,o,a,s=e.pos;return!!e.options.html&&(a=e.posMax,!(60!==e.src.charCodeAt(s)||s+2>=a)&&(!(33!==(n=e.src.charCodeAt(s+1))&&63!==n&&47!==n&&!r(n))&&(!!(o=e.src.slice(s).match(i))&&(t||e.push({type:"htmltag",content:e.src.slice(s,s+o[0].length),level:e.level}),e.pos+=o[0].length,!0))))}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(43!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(43!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),43===o)return!1;if(43===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&43===e.src.charCodeAt(r);)r++;if(r!==u+2)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(43===e.src.charCodeAt(e.pos)&&43===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),43!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&43!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"ins_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"ins_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";var r=n(165),i=n(491),o=n(492),a=n(490);e.exports=function(e,t){var n,s,u,l,c,p,f,h,d=!1,m=e.pos,v=e.posMax,g=e.pos,y=e.src.charCodeAt(g);if(33===y&&(d=!0,y=e.src.charCodeAt(++g)),91!==y)return!1;if(e.level>=e.options.maxNesting)return!1;if(n=g+1,(s=r(e,g))<0)return!1;if((p=s+1)<v&&40===e.src.charCodeAt(p)){for(p++;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p>=v)return!1;for(g=p,i(e,p)?(l=e.linkContent,p=e.pos):l="",g=p;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p<v&&g!==p&&o(e,p))for(c=e.linkContent,p=e.pos;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);else c="";if(p>=v||41!==e.src.charCodeAt(p))return e.pos=m,!1;p++}else{if(e.linkLevel>0)return!1;for(;p<v&&(32===(h=e.src.charCodeAt(p))||10===h);p++);if(p<v&&91===e.src.charCodeAt(p)&&(g=p+1,p=r(e,p),p>=0?u=e.src.slice(g,p++):p=g-1),u||(void 0===u&&(p=s+1),u=e.src.slice(n,s)),!(f=e.env.references[a(u)]))return e.pos=m,!1;l=f.href,c=f.title}return t||(e.pos=n,e.posMax=s,d?e.push({type:"image",src:l,title:c,alt:e.src.substr(n,s-n),level:e.level}):(e.push({type:"link_open",href:l,title:c,level:e.level++}),e.linkLevel++,e.parser.tokenize(e),e.linkLevel--,e.push({type:"link_close",level:--e.level}))),e.pos=p,e.posMax=v,!0}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i,o,a,s=e.posMax,u=e.pos;if(61!==e.src.charCodeAt(u))return!1;if(t)return!1;if(u+4>=s)return!1;if(61!==e.src.charCodeAt(u+1))return!1;if(e.level>=e.options.maxNesting)return!1;if(o=u>0?e.src.charCodeAt(u-1):-1,a=e.src.charCodeAt(u+2),61===o)return!1;if(61===a)return!1;if(32===a||10===a)return!1;for(r=u+2;r<s&&61===e.src.charCodeAt(r);)r++;if(r!==u+2)return e.pos+=r-u,t||(e.pending+=e.src.slice(u,r)),!0;for(e.pos=u+2,i=1;e.pos+1<s;){if(61===e.src.charCodeAt(e.pos)&&61===e.src.charCodeAt(e.pos+1)&&(o=e.src.charCodeAt(e.pos-1),61!==(a=e.pos+2<s?e.src.charCodeAt(e.pos+2):-1)&&61!==o&&(32!==o&&10!==o?i--:32!==a&&10!==a&&i++,i<=0))){n=!0;break}e.parser.skipToken(e)}return n?(e.posMax=e.pos,e.pos=u+2,t||(e.push({type:"mark_open",level:e.level++}),e.parser.tokenize(e),e.push({type:"mark_close",level:--e.level})),e.pos=e.posMax+2,e.posMax=s,!0):(e.pos=u,!1)}},function(e,t,n){"use strict";e.exports=function(e,t){var n,r,i=e.pos;if(10!==e.src.charCodeAt(i))return!1;if(n=e.pending.length-1,r=e.posMax,!t)if(n>=0&&32===e.pending.charCodeAt(n))if(n>=1&&32===e.pending.charCodeAt(n-1)){for(var o=n-2;o>=0;o--)if(32!==e.pending.charCodeAt(o)){e.pending=e.pending.substring(0,o+1);break}e.push({type:"hardbreak",level:e.level})}else e.pending=e.pending.slice(0,-1),e.push({type:"softbreak",level:e.level});else e.push({type:"softbreak",level:e.level});for(i++;i<r&&32===e.src.charCodeAt(i);)i++;return e.pos=i,!0}},function(e,t,n){"use strict";var r=/\\([ \\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g;e.exports=function(e,t){var n,i,o=e.posMax,a=e.pos;if(126!==e.src.charCodeAt(a))return!1;if(t)return!1;if(a+2>=o)return!1;if(e.level>=e.options.maxNesting)return!1;for(e.pos=a+1;e.pos<o;){if(126===e.src.charCodeAt(e.pos)){n=!0;break}e.parser.skipToken(e)}return n&&a+1!==e.pos?(i=e.src.slice(a+1,e.pos),i.match(/(^|[^\\])(\\\\)*\s/)?(e.pos=a,!1):(e.posMax=e.pos,e.pos=a+1,t||e.push({type:"sub",level:e.level,content:i.replace(r,"$1")}),e.pos=e.posMax+1,e.posMax=o,!0)):(e.pos=a,!1)}},function(e,t,n){"use strict";var r=/\\([ \\!"#$%&'()*+,.\/:;<=>?@[\]^_`{|}~-])/g;e.exports=function(e,t){var n,i,o=e.posMax,a=e.pos;if(94!==e.src.charCodeAt(a))return!1;if(t)return!1;if(a+2>=o)return!1;if(e.level>=e.options.maxNesting)return!1;for(e.pos=a+1;e.pos<o;){if(94===e.src.charCodeAt(e.pos)){n=!0;break}e.parser.skipToken(e)}return n&&a+1!==e.pos?(i=e.src.slice(a+1,e.pos),i.match(/(^|[^\\])(\\\\)*\s/)?(e.pos=a,!1):(e.posMax=e.pos,e.pos=a+1,t||e.push({type:"sup",level:e.level,content:i.replace(r,"$1")}),e.pos=e.posMax+1,e.posMax=o,!0)):(e.pos=a,!1)}},function(e,t,n){"use strict";function r(e){switch(e){case 10:case 92:case 96:case 42:case 95:case 94:case 91:case 93:case 33:case 38:case 60:case 62:case 123:case 125:case 36:case 37:case 64:case 126:case 43:case 61:case 58:return!0;default:return!1}}e.exports=function(e,t){for(var n=e.pos;n<e.posMax&&!r(e.src.charCodeAt(n));)n++;return n!==e.pos&&(t||(e.pending+=e.src.slice(e.pos,n)),e.pos=n,!0)}},function(e,t,n){"use strict";function r(e,t){if("string"!=typeof e)throw new TypeError("expected a string");if(1===t)return e;if(2===t)return e+e;var n=e.length*t;if(i!==e||void 0===i)i=e,o="";else if(o.length>=n)return o.substr(0,n);for(;n>o.length&&t>1;)1&t&&(o+=e),t>>=1,e+=e;return o+=e,o=o.substr(0,n)}/*!
+ * repeat-string <https://github.com/jonschlinkert/repeat-string>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+var i,o="";e.exports=r},function(e,t,n){"use strict";e.exports=function(e,t){if(t=t.split(":")[0],!(e=+e))return!1;switch(t){case"http":case"ws":return 80!==e;case"https":case"wss":return 443!==e;case"ftp":return 21!==e;case"gopher":return 70!==e;case"file":return!1}return 0!==e}},function(e,t,n){"use strict";function r(e,t){e&&Object.keys(e).forEach(function(n){t(e[n],n)})}function i(e,t){return{}.hasOwnProperty.call(e,t)}function o(e,t){var n=[];return r(e,function(e){t(e)&&n.push(e)}),n}function a(e,t,n){function g(e,t){var n=this;this.tag=e,this.attribs=t||{},this.tagPosition=E.length,this.text="",this.updateParentNodeText=function(){if(P.length){P[P.length-1].text+=n.text}}}function y(e){return"string"!=typeof e&&(e+=""),e.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function _(e,n){n=n.replace(/[\x00-\x20]+/g,""),n=n.replace(/<\!\-\-.*?\-\-\>/g,"");var r=n.match(/^([a-zA-Z]+)\:/);if(!r)return!!n.match(/^[\/\\]{2}/)&&!t.allowProtocolRelative;var o=r[1].toLowerCase();return i(t.allowedSchemesByTag,e)?-1===t.allowedSchemesByTag[e].indexOf(o):!t.allowedSchemes||-1===t.allowedSchemes.indexOf(o)}function b(e,t){if(!t)return e;var n,r=c(e),i=e.nodes[0];return n=t[i.selector]&&t["*"]?p(c(t[i.selector]),t["*"],function(e,t){if(Array.isArray(e))return e.concat(t)}):t[i.selector]||t["*"],n&&(r.nodes[0].nodes=i.nodes.reduce(w(n),[])),r}function x(e){return e.nodes[0].nodes.reduce(function(e,t){return e.push(t.prop+":"+t.value+";"),e},[]).join("")}function w(e){return function(t,n){if(e.hasOwnProperty(n.prop)){e[n.prop].some(function(e){return e.test(n.value)})&&t.push(n)}return t}}function k(e,t){return t?(e=e.split(/\s+/),e.filter(function(e){return-1!==t.indexOf(e)}).join(" ")):e}var E="";t?(t=u(a.defaults,t),t.parser?t.parser=u(v,t.parser):t.parser=v):(t=a.defaults,t.parser=v);var S,C,A=t.nonTextTags||["script","style","textarea"];t.allowedAttributes&&(S={},C={},r(t.allowedAttributes,function(e,t){S[t]=[];var n=[];e.forEach(function(e){e.indexOf("*")>=0?n.push(l(e).replace(/\\\*/g,".*")):S[t].push(e)}),C[t]=new RegExp("^("+n.join("|")+")$")}));var D={};r(t.allowedClasses,function(e,t){S&&(i(S,t)||(S[t]=[]),S[t].push("class")),D[t]=e});var O,M={};r(t.transformTags,function(e,t){var n;"function"==typeof e?n=e:"string"==typeof e&&(n=a.simpleTransform(e)),"*"===t?O=n:M[t]=n});var T=0,P=[],I={},R={},j=!1,F=0,N=new s.Parser({onopentag:function(e,n){if(j)return void F++;var a=new g(e,n);P.push(a);var s,u=!1,l=!!a.text;i(M,e)&&(s=M[e](e,n),a.attribs=n=s.attribs,void 0!==s.text&&(a.innerText=s.text),e!==s.tagName&&(a.name=e=s.tagName,R[T]=s.tagName)),O&&(s=O(e,n),a.attribs=n=s.attribs,e!==s.tagName&&(a.name=e=s.tagName,R[T]=s.tagName)),t.allowedTags&&-1===t.allowedTags.indexOf(e)&&(u=!0,-1!==A.indexOf(e)&&(j=!0,F=1),I[T]=!0),T++,u||(E+="<"+e,(!S||i(S,e)||S["*"])&&r(n,function(n,s){if(!m.test(s))return void delete a.attribs[s];var u;if(!S||i(S,e)&&-1!==S[e].indexOf(s)||S["*"]&&-1!==S["*"].indexOf(s)||i(C,e)&&C[e].test(s)||C["*"]&&C["*"].test(s)){if(("href"===s||"src"===s)&&_(e,n))return void delete a.attribs[s];if("iframe"===e&&"src"===s){if("//"===n.substring(0,2)){n="https:".concat(n)}try{if(u=d.parse(n),t.allowedIframeHostnames){if(!t.allowedIframeHostnames.find(function(e){return e===u.hostname}))return void delete a.attribs[s]}}catch(e){return void delete a.attribs[s]}}if("srcset"===s)try{if(u=f.parse(n),r(u,function(e){_("srcset",e.url)&&(e.evil=!0)}),u=o(u,function(e){return!e.evil}),!u.length)return void delete a.attribs[s];n=f.stringify(o(u,function(e){return!e.evil})),a.attribs[s]=n}catch(e){return void delete a.attribs[s]}if("class"===s&&(n=k(n,D[e]),!n.length))return void delete a.attribs[s];if("style"===s)try{if(n=x(b(h.parse(e+" {"+n+"}"),t.allowedStyles)),0===n.length)return void delete a.attribs[s]}catch(e){return void delete a.attribs[s]}E+=" "+s,n.length&&(E+='="'+y(n)+'"')}else delete a.attribs[s]}),-1!==t.selfClosing.indexOf(e)?E+=" />":(E+=">",!a.innerText||l||t.textFilter||(E+=a.innerText)))},ontext:function(e){if(!j){var n,r=P[P.length-1];if(r&&(n=r.tag,e=void 0!==r.innerText?r.innerText:e),"script"===n||"style"===n)E+=e;else{var i=y(e);t.textFilter?E+=t.textFilter(i):E+=i}if(P.length){P[P.length-1].text+=e}}},onclosetag:function(e){if(j){if(--F)return;j=!1}var n=P.pop();if(n){if(j=!1,T--,I[T])return delete I[T],void n.updateParentNodeText();if(R[T]&&(e=R[T],delete R[T]),t.exclusiveFilter&&t.exclusiveFilter(n))return void(E=E.substr(0,n.tagPosition));n.updateParentNodeText(),-1===t.selfClosing.indexOf(e)&&(E+="</"+e+">")}}},t.parser);return N.write(e),N.end(),E}var s=n(116),u=n(1200),l=n(825),c=n(824),p=n(827),f=n(1181),h=n(982),d=n(497);e.exports=a;var m=/^[^\0\t\n\f\r \/<=>]+$/,v={decodeEntities:!0};a.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre","iframe"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{},allowProtocolRelative:!0},a.simpleTransform=function(e,t,n){return n=void 0===n||n,t=t||{},function(r,i){var o;if(n)for(o in t)i[o]=t[o];else i=t;return{tagName:e,attribs:i}}}},function(e,t,n){(function(e,t){!function(e,n){"use strict";function r(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var r={callback:e,args:t};return l[u]=r,s(u),u++}function i(e){delete l[e]}function o(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}function a(e){if(c)setTimeout(a,0,e);else{var t=l[e];if(t){c=!0;try{o(t)}finally{i(e),c=!1}}}}if(!e.setImmediate){var s,u=1,l={},c=!1,p=e.document,f=Object.getPrototypeOf&&Object.getPrototypeOf(e);f=f&&f.setTimeout?f:e,"[object process]"==={}.toString.call(e.process)?function(){s=function(e){t.nextTick(function(){a(e)})}}():function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?function(){var t="setImmediate$"+Math.random()+"$",n=function(n){n.source===e&&"string"==typeof n.data&&0===n.data.indexOf(t)&&a(+n.data.slice(t.length))};e.addEventListener?e.addEventListener("message",n,!1):e.attachEvent("onmessage",n),s=function(n){e.postMessage(t+n,"*")}}():e.MessageChannel?function(){var e=new MessageChannel;e.port1.onmessage=function(e){a(e.data)},s=function(t){e.port2.postMessage(t)}}():p&&"onreadystatechange"in p.createElement("script")?function(){var e=p.documentElement;s=function(t){var n=p.createElement("script");n.onreadystatechange=function(){a(t),n.onreadystatechange=null,e.removeChild(n),n=null},e.appendChild(n)}}():function(){s=function(e){setTimeout(a,0,e)}}(),f.setImmediate=r,f.clearImmediate=i}}("undefined"==typeof self?void 0===e?this:e:self)}).call(t,n(17),n(33))},function(e,t,n){"use strict";function r(e){return e.sort().filter(function(t,n){return JSON.stringify(t)!==JSON.stringify(e[n-1])})}var i=n(978),o=n(507),a=/^\d+$/;t.parse=function(e){return r(e.split(",").map(function(e){var t={};return e.trim().split(/\s+/).forEach(function(e,n){if(0===n)return t.url=e;var r=e.substring(0,e.length-1),o=e[e.length-1],s=parseInt(r,10),u=parseFloat(r);if("w"===o&&a.test(r))t.width=s;else if("h"===o&&a.test(r))t.height=s;else{if("x"!==o||i(u))throw new Error("Invalid srcset descriptor: "+e+".");t.density=u}}),t}))},t.stringify=function(e){return o(e.map(function(e){if(!e.url)throw new Error("URL is required.");var t=[e.url];return e.width&&t.push(e.width+"w"),e.height&&t.push(e.height+"h"),e.density&&t.push(e.density+"x"),t.join(" ")})).join(", ")}},function(e,t,n){e.exports=n(1183)},function(e,t,n){"use strict";(function(e,r){Object.defineProperty(t,"__esModule",{value:!0});var i,o=n(1184),a=function(e){return e&&e.__esModule?e:{default:e}}(o);i="undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==e?e:r;var s=(0,a.default)(i);t.default=s}).call(t,n(17),n(72)(e))},function(e,t,n){"use strict";function r(e){var t,n=e.Symbol;return"function"==typeof n?n.observable?t=n.observable:(t=n("observable"),n.observable=t):t="@@observable",t}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t,n){"use strict";e.exports=2147483647},function(e,t,n){"use strict";var r=n(65),i=n(1185);e.exports=function(e){if((e=r(e))>i)throw new TypeError(e+" exceeds maximum possible timeout");return e}},function(e,t,n){"use strict";(function(t){function r(e){e=e||t.location||{};var n,r={},i=typeof e;if("blob:"===e.protocol)r=new a(unescape(e.pathname),{});else if("string"===i){r=new a(e,{});for(n in d)delete r[n]}else if("object"===i){for(n in e)n in d||(r[n]=e[n]);void 0===r.slashes&&(r.slashes=f.test(e.href))}return r}function i(e){var t=p.exec(e);return{protocol:t[1]?t[1].toLowerCase():"",slashes:!!t[2],rest:t[3]}}function o(e,t){for(var n=(t||"/").split("/").slice(0,-1).concat(e.split("/")),r=n.length,i=n[r-1],o=!1,a=0;r--;)"."===n[r]?n.splice(r,1):".."===n[r]?(n.splice(r,1),a++):a&&(0===r&&(o=!0),n.splice(r,1),a--);return o&&n.unshift(""),"."!==i&&".."!==i||n.push(""),n.join("/")}function a(e,t,n){if(!(this instanceof a))return new a(e,t,n);var s,u,p,f,d,m,v=h.slice(),g=typeof t,y=this,_=0;for("object"!==g&&"string"!==g&&(n=t,t=null),n&&"function"!=typeof n&&(n=c.parse),t=r(t),u=i(e||""),s=!u.protocol&&!u.slashes,y.slashes=u.slashes||s&&t.slashes,y.protocol=u.protocol||t.protocol||"",e=u.rest,u.slashes||(v[2]=[/(.*)/,"pathname"]);_<v.length;_++)f=v[_],p=f[0],m=f[1],p!==p?y[m]=e:"string"==typeof p?~(d=e.indexOf(p))&&("number"==typeof f[2]?(y[m]=e.slice(0,d),e=e.slice(d+f[2])):(y[m]=e.slice(d),e=e.slice(0,d))):(d=p.exec(e))&&(y[m]=d[1],e=e.slice(0,d.index)),y[m]=y[m]||(s&&f[3]?t[m]||"":""),f[4]&&(y[m]=y[m].toLowerCase());n&&(y.query=n(y.query)),s&&t.slashes&&"/"!==y.pathname.charAt(0)&&(""!==y.pathname||""!==t.pathname)&&(y.pathname=o(y.pathname,t.pathname)),l(y.port,y.protocol)||(y.host=y.hostname,y.port=""),y.username=y.password="",y.auth&&(f=y.auth.split(":"),y.username=f[0]||"",y.password=f[1]||""),y.origin=y.protocol&&y.host&&"file:"!==y.protocol?y.protocol+"//"+y.host:"null",y.href=y.toString()}function s(e,t,n){var r=this;switch(e){case"query":"string"==typeof t&&t.length&&(t=(n||c.parse)(t)),r[e]=t;break;case"port":r[e]=t,l(t,r.protocol)?t&&(r.host=r.hostname+":"+t):(r.host=r.hostname,r[e]="");break;case"hostname":r[e]=t,r.port&&(t+=":"+r.port),r.host=t;break;case"host":r[e]=t,/:\d+$/.test(t)?(t=t.split(":"),r.port=t.pop(),r.hostname=t.join(":")):(r.hostname=t,r.port="");break;case"protocol":r.protocol=t.toLowerCase(),r.slashes=!n;break;case"pathname":case"hash":if(t){var i="pathname"===e?"/":"#";r[e]=t.charAt(0)!==i?i+t:t}else r[e]=t;break;default:r[e]=t}for(var o=0;o<h.length;o++){var a=h[o];a[4]&&(r[a[1]]=r[a[1]].toLowerCase())}return r.origin=r.protocol&&r.host&&"file:"!==r.protocol?r.protocol+"//"+r.host:"null",r.href=r.toString(),r}function u(e){e&&"function"==typeof e||(e=c.stringify);var t,n=this,r=n.protocol;r&&":"!==r.charAt(r.length-1)&&(r+=":");var i=r+(n.slashes?"//":"");return n.username&&(i+=n.username,n.password&&(i+=":"+n.password),i+="@"),i+=n.host+n.pathname,t="object"==typeof n.query?e(n.query):n.query,t&&(i+="?"!==t.charAt(0)?"?"+t:t),n.hash&&(i+=n.hash),i}var l=n(1178),c=n(1005),p=/^([a-z][a-z0-9.+-]*:)?(\/\/)?([\S\s]*)/i,f=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,h=[["#","hash"],["?","query"],["/","pathname"],["@","auth",1],[NaN,"host",void 0,1,1],[/:(\d+)$/,"port",void 0,1],[NaN,"hostname",void 0,1,1]],d={hash:1,query:1};a.prototype={set:s,toString:u},a.extractProtocol=i,a.location=r,a.qs=c,e.exports=a}).call(t,n(17))},function(e,t,n){"use strict";e.exports={isString:function(e){return"string"==typeof e},isObject:function(e){return"object"==typeof e&&null!==e},isNull:function(e){return null===e},isNullOrUndefined:function(e){return null==e}}},function(e,t){e.exports=function(e){for(var t=[],n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r>=55296&&r<=56319&&n+1<e.length){var i=e.charCodeAt(n+1);if(i>=56320&&i<=57343){var o=1024*(r-55296)+i-56320+65536;t.push(240+Math.floor(o/64/64/64),128+Math.floor(o/64/64)%64,128+Math.floor(o/64)%64,128+o%64),n+=1;continue}}r>=2048?t.push(224+Math.floor(r/64/64),128+Math.floor(r/64)%64,128+r%64):r>=128?t.push(192+Math.floor(r/64),128+r%64):t.push(r)}return t}},function(e,t){!function(){function e(e,t){function n(e,t){return r(e,new RegExp(a.source,"g"),t)}function r(e,t,n){if(!i(e))return n;var r=0,o=0;do{var a=t.exec(e);if(null===a)break;if(!(o<n))break;r+=a[0].length,o++}while(null!==a);return r>=e.length?-1:r}function i(e){return s.test(e)}function o(e,n){void 0==e&&(e=["[^]"]),void 0==n&&(n="g");var r=[];return t.forEach(function(e){r.push(e.source)}),r.push(a.source),r=r.concat(e),new RegExp(r.join("|"),n)}e.findCharIndex=function(e,t){if(t>=e.length)return-1;if(!i(e))return t;for(var n=o(),r=0;null!==n.exec(e)&&!(n.lastIndex>t);)r++;return r},e.findByteIndex=function(e,t){return t>=this.length(e)?-1:r(e,o(),t)},e.charAt=function(e,t){var n=this.findByteIndex(e,t);if(n<0||n>=e.length)return"";var r=e.slice(n,n+8),i=s.exec(r);return null===i?r[0]:i[0]},e.charCodeAt=function(e,t){var r=n(e,t);if(r<0)return NaN;var i=e.charCodeAt(r);if(55296<=i&&i<=56319){return 1024*(i-55296)+(e.charCodeAt(r+1)-56320)+65536}return i},e.fromCharCode=function(e){return e>65535?(e-=65536,String.fromCharCode(55296+(e>>10),56320+(1023&e))):String.fromCharCode(e)},e.indexOf=function(e,t,n){void 0!==n&&null!==n||(n=0);var r=this.findByteIndex(e,n),i=e.indexOf(t,r);return i<0?-1:this.findCharIndex(e,i)},e.lastIndexOf=function(e,t,n){var r;if(void 0===n||null===n)r=e.lastIndexOf(t);else{var i=this.findByteIndex(e,n);r=e.lastIndexOf(t,i)}return r<0?-1:this.findCharIndex(e,r)},e.slice=function(e,t,n){var r,i=this.findByteIndex(e,t);return i<0&&(i=e.length),void 0===n||null===n?r=e.length:(r=this.findByteIndex(e,n))<0&&(r=e.length),e.slice(i,r)},e.substr=function(e,t,n){return t<0&&(t=this.length(e)+t),void 0===n||null===n?this.slice(e,t):this.slice(e,t,t+n)},e.substring=e.slice,e.length=function(e){return this.findCharIndex(e,e.length-1)+1},e.stringToCodePoints=function(e){for(var t=[],n=0;n<e.length&&(codePoint=this.charCodeAt(e,n),codePoint);n++)t.push(codePoint);return t},e.codePointsToString=function(e){for(var t=[],n=0;n<e.length;n++)t.push(this.fromCharCode(e[n]));return t.join("")},e.stringToBytes=function(e){for(var t=[],n=0;n<e.length;n++){for(var r=e.charCodeAt(n),i=[];r>0;)i.push(255&r),r>>=8;1==i.length&&i.push(0),t=t.concat(i.reverse())}return t},e.bytesToString=function(e){for(var t=[],n=0;n<e.length;n+=2){var r=e[n],i=e[n+1],o=r<<8|i;t.push(String.fromCharCode(o))}return t.join("")},e.stringToCharArray=function(e){var t=[],n=o();do{var r=n.exec(e);if(null===r)break;t.push(r[0])}while(null!==r);return t};var a=/[\uD800-\uDBFF][\uDC00-\uDFFF]/,s=o([],"")}var n;void 0!==t&&null!==t?n=t:"undefined"!=typeof window&&null!==window&&(void 0!==window.UtfString&&null!==window.UtfString||(window.UtfString={}),n=window.UtfString);var r=/\uD83C[\uDDE6-\uDDFF]\uD83C[\uDDE6-\uDDFF]/;n.visual={},e(n,[]),e(n.visual,[r])}()},function(e,t,n){(function(t){function n(e,t){function n(){if(!i){if(r("throwDeprecation"))throw new Error(t);r("traceDeprecation")?console.trace(t):console.warn(t),i=!0}return e.apply(this,arguments)}if(r("noDeprecation"))return e;var i=!1;return n}function r(e){try{if(!t.localStorage)return!1}catch(e){return!1}var n=t.localStorage[e];return null!=n&&"true"===String(n).toLowerCase()}e.exports=n}).call(t,n(17))},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t,n){(function(e,r){function i(e,n){var r={seen:[],stylize:a};return arguments.length>=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),m(n)?r.showHidden=n:n&&t._extend(r,n),x(r.showHidden)&&(r.showHidden=!1),x(r.depth)&&(r.depth=2),x(r.colors)&&(r.colors=!1),x(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=o),u(r,e,r.depth)}function o(e,t){var n=i.styles[t];return n?"["+i.colors[n][0]+"m"+e+"["+i.colors[n][1]+"m":e}function a(e,t){return e}function s(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}function u(e,n,r){if(e.customInspect&&n&&C(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var i=n.inspect(r,e);return _(i)||(i=u(e,i,r)),i}var o=l(e,n);if(o)return o;var a=Object.keys(n),m=s(a);if(e.showHidden&&(a=Object.getOwnPropertyNames(n)),S(n)&&(a.indexOf("message")>=0||a.indexOf("description")>=0))return c(n);if(0===a.length){if(C(n)){var v=n.name?": "+n.name:"";return e.stylize("[Function"+v+"]","special")}if(w(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(E(n))return e.stylize(Date.prototype.toString.call(n),"date");if(S(n))return c(n)}var g="",y=!1,b=["{","}"];if(d(n)&&(y=!0,b=["[","]"]),C(n)){g=" [Function"+(n.name?": "+n.name:"")+"]"}if(w(n)&&(g=" "+RegExp.prototype.toString.call(n)),E(n)&&(g=" "+Date.prototype.toUTCString.call(n)),S(n)&&(g=" "+c(n)),0===a.length&&(!y||0==n.length))return b[0]+g+b[1];if(r<0)return w(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special");e.seen.push(n);var x;return x=y?p(e,n,r,m,a):a.map(function(t){return f(e,n,r,m,t,y)}),e.seen.pop(),h(x,g,b)}function l(e,t){if(x(t))return e.stylize("undefined","undefined");if(_(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}return y(t)?e.stylize(""+t,"number"):m(t)?e.stylize(""+t,"boolean"):v(t)?e.stylize("null","null"):void 0}function c(e){return"["+Error.prototype.toString.call(e)+"]"}function p(e,t,n,r,i){for(var o=[],a=0,s=t.length;a<s;++a)T(t,String(a))?o.push(f(e,t,n,r,String(a),!0)):o.push("");return i.forEach(function(i){i.match(/^\d+$/)||o.push(f(e,t,n,r,i,!0))}),o}function f(e,t,n,r,i,o){var a,s,l;if(l=Object.getOwnPropertyDescriptor(t,i)||{value:t[i]},l.get?s=l.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):l.set&&(s=e.stylize("[Setter]","special")),T(r,i)||(a="["+i+"]"),s||(e.seen.indexOf(l.value)<0?(s=v(n)?u(e,l.value,null):u(e,l.value,n-1),s.indexOf("\n")>-1&&(s=o?s.split("\n").map(function(e){return"  "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return"   "+e}).join("\n"))):s=e.stylize("[Circular]","special")),x(a)){if(o&&i.match(/^\d+$/))return s;a=JSON.stringify(""+i),a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(a=a.substr(1,a.length-2),a=e.stylize(a,"name")):(a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),a=e.stylize(a,"string"))}return a+": "+s}function h(e,t,n){var r=0;return e.reduce(function(e,t){return r++,t.indexOf("\n")>=0&&r++,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60?n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n  ")+" "+n[1]:n[0]+t+" "+e.join(", ")+" "+n[1]}function d(e){return Array.isArray(e)}function m(e){return"boolean"==typeof e}function v(e){return null===e}function g(e){return null==e}function y(e){return"number"==typeof e}function _(e){return"string"==typeof e}function b(e){return"symbol"==typeof e}function x(e){return void 0===e}function w(e){return k(e)&&"[object RegExp]"===D(e)}function k(e){return"object"==typeof e&&null!==e}function E(e){return k(e)&&"[object Date]"===D(e)}function S(e){return k(e)&&("[object Error]"===D(e)||e instanceof Error)}function C(e){return"function"==typeof e}function A(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e}function D(e){return Object.prototype.toString.call(e)}function O(e){return e<10?"0"+e.toString(10):e.toString(10)}function M(){var e=new Date,t=[O(e.getHours()),O(e.getMinutes()),O(e.getSeconds())].join(":");return[e.getDate(),j[e.getMonth()],t].join(" ")}function T(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var P=/%[sdj%]/g;t.format=function(e){if(!_(e)){for(var t=[],n=0;n<arguments.length;n++)t.push(i(arguments[n]));return t.join(" ")}for(var n=1,r=arguments,o=r.length,a=String(e).replace(P,function(e){if("%%"===e)return"%";if(n>=o)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),s=r[n];n<o;s=r[++n])v(s)||!k(s)?a+=" "+s:a+=" "+i(s);return a},t.deprecate=function(n,i){function o(){if(!a){if(r.throwDeprecation)throw new Error(i);r.traceDeprecation?console.trace(i):console.error(i),a=!0}return n.apply(this,arguments)}if(x(e.process))return function(){return t.deprecate(n,i).apply(this,arguments)};if(!0===r.noDeprecation)return n;var a=!1;return o};var I,R={};t.debuglog=function(e){if(x(I)&&(I=n.i({NODE_ENV:"production",WEBPACK_INLINE_STYLES:!1}).NODE_DEBUG||""),e=e.toUpperCase(),!R[e])if(new RegExp("\\b"+e+"\\b","i").test(I)){var i=r.pid;R[e]=function(){var n=t.format.apply(t,arguments);console.error("%s %d: %s",e,i,n)}}else R[e]=function(){};return R[e]},t.inspect=i,i.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},i.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=d,t.isBoolean=m,t.isNull=v,t.isNullOrUndefined=g,t.isNumber=y,t.isString=_,t.isSymbol=b,t.isUndefined=x,t.isRegExp=w,t.isObject=k,t.isDate=E,t.isError=S,t.isFunction=C,t.isPrimitive=A,t.isBuffer=n(1193);var j=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];t.log=function(){console.log("%s - %s",M(),t.format.apply(t,arguments))},t.inherits=n(1192),t._extend=function(e,t){if(!t||!k(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e}}).call(t,n(17),n(33))},function(e,t){e.exports=function(){throw new Error("define cannot be used indirect")}},function(e,t,n){"use strict";function r(e){return a(e).map(function(e){return{value:e,type:i(e)}})}function i(e){return u(e)?"ClosingTag":c(e)?"OpeningTag":l(e)?"SelfClosingTag":"Text"}var o=n(1177),a=function(e){return e.split(/(<\/?[^>]+>)/g).filter(function(e){return""!==e.trim()})},s=function(e){return/<[^>!]+>/.test(e)},u=function(e){return/<\/+[^>]+>/.test(e)},l=function(e){return/<[^>]+\/>/.test(e)},c=function(e){return s(e)&&!u(e)&&!l(e)};e.exports=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.indentor,i=t.textNodesOnSameLine,a=0,s=[];n=n||"    ";var u=r(e).map(function(e,t,r){var u=e.value,l=e.type;"ClosingTag"===l&&a--;var c=o(n,a),p=c+u;if("OpeningTag"===l&&a++,i){var f=r[t-1],h=r[t-2];"ClosingTag"===l&&"Text"===f.type&&"OpeningTag"===h.type&&(p=""+c+h.value+f.value+u,s.push(t-2,t-1))}return p});return s.forEach(function(e){return u[e]=null}),u.filter(function(e){return!!e}).join("\n")}},function(e,t){function n(e){return e&&e.replace?e.replace(/([&"<>'])/g,function(e,t){return r[t]}):e}var r={"&":"&amp;",'"':"&quot;","'":"&apos;","<":"&lt;",">":"&gt;"};e.exports=n},function(e,t,n){(function(t){function r(e,n){function r(e){m?t.nextTick(e):e()}function i(e,t){if(void 0!==t&&(f+=t),e&&!h&&(l=l||new c,h=!0),e&&h){var n=f;r(function(){l.emit("data",n)}),f=""}}function o(e,t){s(i,a(e,d,d?1:0),t)}function u(){if(l){var e=f;r(function(){l.emit("data",e),l.emit("end"),l.readable=!1,l.emit("close")})}}"object"!=typeof n&&(n={indent:n});var l=n.stream?new c:null,f="",h=!1,d=n.indent?!0===n.indent?p:n.indent:"",m=!0;return r(function(){m=!1}),n.declaration&&function(e){var t=e.encoding||"UTF-8",n={version:"1.0",encoding:t};e.standalone&&(n.standalone=e.standalone),o({"?xml":{_attr:n}}),f=f.replace("/>","?>")}(n.declaration),e&&e.forEach?e.forEach(function(t,n){var r;n+1===e.length&&(r=u),o(t,r)}):o(e,u),l?(l.readable=!0,l):f}function i(){var e=Array.prototype.slice.call(arguments),t={_elem:a(e)};return t.push=function(e){if(!this.append)throw new Error("not assigned to a parent!");var t=this,n=this._elem.indent;s(this.append,a(e,n,this._elem.icount+(n?1:0)),function(){t.append(!0)})},t.close=function(e){void 0!==e&&this.push(e),this.end&&this.end()},t}function o(e,t){return new Array(t||0).join(e||"")}function a(e,t,n){function r(e){Object.keys(e).forEach(function(t){f.push(u(t,e[t]))})}n=n||0;var i,s=o(t,n),c=e;if("object"==typeof e){if(i=Object.keys(e)[0],(c=e[i])&&c._elem)return c._elem.name=i,c._elem.icount=n,c._elem.indent=t,c._elem.indents=s,c._elem.interrupt=c,c._elem}var p,f=[],h=[];switch(typeof c){case"object":if(null===c)break;c._attr&&r(c._attr),c._cdata&&h.push(("<![CDATA["+c._cdata).replace(/\]\]>/g,"]]]]><![CDATA[>")+"]]>"),c.forEach&&(p=!1,h.push(""),c.forEach(function(e){if("object"==typeof e){"_attr"==Object.keys(e)[0]?r(e._attr):h.push(a(e,t,n+1))}else h.pop(),p=!0,h.push(l(e))}),p||h.push(""));break;default:h.push(l(c))}return{name:i,interrupt:!1,attributes:f,content:h,icount:n,indents:s,indent:t}}function s(e,t,n){function r(){for(;t.content.length;){var r=t.content.shift();if(void 0!==r){if(i(r))return;s(e,r)}}e(!1,(o>1?t.indents:"")+(t.name?"</"+t.name+">":"")+(t.indent&&!n?"\n":"")),n&&n()}function i(t){return!!t.interrupt&&(t.interrupt.append=e,t.interrupt.end=r,t.interrupt=!1,e(!0),!0)}if("object"!=typeof t)return e(!1,t);var o=t.interrupt?1:t.content.length;if(e(!1,t.indents+(t.name?"<"+t.name:"")+(t.attributes.length?" "+t.attributes.join(" "):"")+(o?t.name?">":"":t.name?"/>":"")+(t.indent&&o>1?"\n":"")),!o)return e(!1,t.indent?"\n":"");i(t)||r()}function u(e,t){return e+'="'+l(t)+'"'}var l=n(1197),c=n(493).Stream,p="    ";e.exports=r,e.exports.element=e.exports.Element=i}).call(t,n(33))},function(e,t){function n(e,t,n){return r.yubl(t((n||r.yufull)(e)))}t._getPrivFilters=function(){function e(e){var t=e.split(k,2);return!t[0]||2!==t.length&&e.length===t[0].length?null:t[0]}function t(e,t,n,r){function i(e,n,i,a){return n?(n=Number(n[0]<="9"?n:"0"+n),r?A(n):128===n?"€":130===n?"‚":131===n?"ƒ":132===n?"„":133===n?"…":134===n?"†":135===n?"‡":136===n?"ˆ":137===n?"‰":138===n?"Š":139===n?"‹":140===n?"Œ":142===n?"Ž":145===n?"‘":146===n?"’":147===n?"“":148===n?"”":149===n?"•":150===n?"–":151===n?"—":152===n?"˜":153===n?"™":154===n?"š":155===n?"›":156===n?"œ":158===n?"ž":159===n?"Ÿ":n>=55296&&n<=57343||13===n?"�":o.frCoPt(n)):t[i||a]||e}return t=t||m,n=n||d,void 0===e?"undefined":null===e?"null":e.toString().replace(c,"�").replace(n,i)}function n(e){return"\\"+e.charCodeAt(0).toString(16).toLowerCase()+" "}function r(e){return e.replace(_,function(e){return"-x-"+e})}function i(n){n=o.yufull(t(n));var r=e(n);return r&&w[r.toLowerCase()]?"##"+n:n}var o,a=/</g,s=/"/g,u=/'/g,l=/&/g,c=/\x00/g,p=/(?:^$|[\x00\x09-\x0D "'`=<>])/g,f=/[&<>"'`]/g,h=/(?:\x00|^-*!?>|--!?>|--?!?$|\]>|\]$)/g,d=/&(?:#([xX][0-9A-Fa-f]+|\d+);?|(Tab|NewLine|colon|semi|lpar|rpar|apos|sol|comma|excl|ast|midast|ensp|emsp|thinsp);|(nbsp|amp|AMP|lt|LT|gt|GT|quot|QUOT);?)/g,m={Tab:"\t",NewLine:"\n",colon:":",semi:";",lpar:"(",rpar:")",apos:"'",sol:"/",comma:",",excl:"!",ast:"*",midast:"*",ensp:" ",emsp:" ",thinsp:" ",nbsp:" ",amp:"&",lt:"<",gt:">",quot:'"',QUOT:'"'},v=/^(?:(?!-*expression)#?[-\w]+|[+-]?(?:\d+|\d*\.\d+)(?:r?em|ex|ch|cm|mm|in|px|pt|pc|%|vh|vw|vmin|vmax)?|!important|)$/i,g=/[\x00-\x1F\x7F\[\]{}\\"]/g,y=/[\x00-\x1F\x7F\[\]{}\\']/g,_=/url[\(\u207D\u208D]+/g,b=/['\(\)]/g,x=/\/\/%5[Bb]([A-Fa-f0-9:]+)%5[Dd]/,w={javascript:1,data:1,vbscript:1,mhtml:1,"x-schema":1},k=/(?::|&#[xX]0*3[aA];?|&#0*58;?|&colon;)/,E=/(?:^[\x00-\x20]+|[\t\n\r\x00]+)/g,S={Tab:"\t",NewLine:"\n"},C=function(e,t,n){return void 0===e?"undefined":null===e?"null":e.toString().replace(t,n)},A=String.fromCodePoint||function(e){return 0===arguments.length?"":e<=65535?String.fromCharCode(e):(e-=65536,String.fromCharCode(55296+(e>>10),e%1024+56320))};return o={frCoPt:function(e){return void 0===e||null===e?"":!isFinite(e=Number(e))||e<=0||e>1114111||e>=1&&e<=8||e>=14&&e<=31||e>=127&&e<=159||e>=64976&&e<=65007||11===e||65535==(65535&e)||65534==(65535&e)?"�":A(e)},d:t,yup:function(n){return n=e(n.replace(c,"")),n?t(n,S,null,!0).replace(E,"").toLowerCase():null},y:function(e){return C(e,f,function(e){return"&"===e?"&amp;":"<"===e?"&lt;":">"===e?"&gt;":'"'===e?"&quot;":"'"===e?"&#39;":"&#96;"})},ya:function(e){return C(e,l,"&amp;")},yd:function(e){return C(e,a,"&lt;")},yc:function(e){return C(e,h,function(e){return"\0"===e?"�":"--!"===e||"--"===e||"-"===e||"]"===e?e+" ":e.slice(0,-1)+" >"})},yavd:function(e){return C(e,s,"&quot;")},yavs:function(e){return C(e,u,"&#39;")},yavu:function(e){return C(e,p,function(e){return"\t"===e?"&#9;":"\n"===e?"&#10;":"\v"===e?"&#11;":"\f"===e?"&#12;":"\r"===e?"&#13;":" "===e?"&#32;":"="===e?"&#61;":"<"===e?"&lt;":">"===e?"&gt;":'"'===e?"&quot;":"'"===e?"&#39;":"`"===e?"&#96;":"�"})},yu:encodeURI,yuc:encodeURIComponent,yubl:function(e){return w[o.yup(e)]?"x-"+e:e},yufull:function(e){return o.yu(e).replace(x,function(e,t){return"//["+t+"]"})},yublf:function(e){return o.yubl(o.yufull(e))},yceu:function(e){return e=t(e),v.test(e)?e:";-x:'"+r(e.replace(y,n))+"';-v:"},yced:function(e){return r(t(e).replace(g,n))},yces:function(e){return r(t(e).replace(y,n))},yceuu:function(e){return i(e).replace(b,function(e){return"'"===e?"\\27 ":"("===e?"%28":"%29"})},yceud:function(e){return i(e)},yceus:function(e){return i(e).replace(u,"\\27 ")}}};var r=t._privFilters=t._getPrivFilters();t.inHTMLData=r.yd,t.inHTMLComment=r.yc,t.inSingleQuotedAttr=r.yavs,t.inDoubleQuotedAttr=r.yavd,t.inUnQuotedAttr=r.yavu,t.uriInSingleQuotedAttr=function(e){return n(e,r.yavs)},t.uriInDoubleQuotedAttr=function(e){return n(e,r.yavd)},t.uriInUnQuotedAttr=function(e){return n(e,r.yavu)},t.uriInHTMLData=r.yufull,t.uriInHTMLComment=function(e){return r.yc(r.yufull(e))},t.uriPathInSingleQuotedAttr=function(e){return n(e,r.yavs,r.yu)},t.uriPathInDoubleQuotedAttr=function(e){return n(e,r.yavd,r.yu)},t.uriPathInUnQuotedAttr=function(e){return n(e,r.yavu,r.yu)},t.uriPathInHTMLData=r.yu,t.uriPathInHTMLComment=function(e){return r.yc(r.yu(e))},t.uriQueryInSingleQuotedAttr=t.uriPathInSingleQuotedAttr,t.uriQueryInDoubleQuotedAttr=t.uriPathInDoubleQuotedAttr,t.uriQueryInUnQuotedAttr=t.uriPathInUnQuotedAttr,t.uriQueryInHTMLData=t.uriPathInHTMLData,t.uriQueryInHTMLComment=t.uriPathInHTMLComment,t.uriComponentInSingleQuotedAttr=function(e){return r.yavs(r.yuc(e))},t.uriComponentInDoubleQuotedAttr=function(e){return r.yavd(r.yuc(e))},t.uriComponentInUnQuotedAttr=function(e){return r.yavu(r.yuc(e))},t.uriComponentInHTMLData=r.yuc,t.uriComponentInHTMLComment=function(e){return r.yc(r.yuc(e))},t.uriFragmentInSingleQuotedAttr=function(e){return r.yubl(r.yavs(r.yuc(e)))},t.uriFragmentInDoubleQuotedAttr=function(e){return r.yubl(r.yavd(r.yuc(e)))},t.uriFragmentInUnQuotedAttr=function(e){return r.yubl(r.yavu(r.yuc(e)))},t.uriFragmentInHTMLData=t.uriComponentInHTMLData,t.uriFragmentInHTMLComment=t.uriComponentInHTMLComment},function(e,t){function n(){for(var e={},t=0;t<arguments.length;t++){var n=arguments[t];for(var i in n)r.call(n,i)&&(e[i]=n[i])}return e}e.exports=n;var r=Object.prototype.hasOwnProperty},function(e,t,n){(function(){var e,t,r,i,o,a=[].slice;o=n(61),e=n(1202),i=n(1205),t=n(1204),r=n(266),this.make_dumper=function(n,s,u,l){var c;return null==n&&(n=e.Emitter),null==s&&(s=i.Serializer),null==u&&(u=t.Representer),null==l&&(l=r.Resolver),c=[n,s,u,l],function(){function e(e,n){var r,i,o;for(null==n&&(n={}),c[0].call(this,e,n),o=c.slice(1),r=0,i=o.length;r<i;r++)t=o[r],t.call(this,n)}var t;return o.extend.apply(o,[e.prototype].concat(a.call(function(){var e,n,r;for(r=[],e=0,n=c.length;e<n;e++)t=c[e],r.push(t.prototype);return r}()))),e}()},this.Dumper=this.make_dumper()}).call(this)},function(e,t,n){(function(){var e,r,i,o,a=function(e,t){function n(){this.constructor=e}for(var r in t)s.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},s={}.hasOwnProperty,u=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};i=n(127),o=n(61),r=n(45).YAMLError,this.EmitterError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return a(t,e),t}(r),this.Emitter=function(){function n(e,t){var n;this.stream=e,this.encoding=null,this.states=[],this.state=this.expect_stream_start,this.events=[],this.event=null,this.indents=[],this.indent=null,this.flow_level=0,this.root_context=!1,this.sequence_context=!1,this.mapping_context=!1,this.simple_key_context=!1,this.line=0,this.column=0,this.whitespace=!0,this.indentation=!0,this.open_ended=!1,this.canonical=t.canonical,this.allow_unicode=t.allow_unicode,null==this.canonical&&(this.canonical=!1),null==this.allow_unicode&&(this.allow_unicode=!0),this.best_indent=1<t.indent&&t.indent<10?t.indent:2,this.best_width=t.width>2*this.indent?t.width:80,this.best_line_break="\r"===(n=t.line_break)||"\n"===n||"\r\n"===n?t.line_break:"\n",this.tag_prefixes=null,this.prepared_anchor=null,this.prepared_tag=null,this.analysis=null,this.style=null}var r,a,l;return r="\0 \t\r\n…\u2028\u2029",a={"!":"!","tag:yaml.org,2002:":"!!"},l={"\0":"0","":"a","\b":"b","\t":"t","\n":"n","\v":"v","\f":"f","\r":"r","":"e",'"':'"',"\\":"\\","…":"N"," ":"_","\u2028":"L","\u2029":"P"},n.prototype.dispose=function(){return this.states=[],this.state=null},n.prototype.emit=function(e){var t;for(this.events.push(e),t=[];!this.need_more_events();)this.event=this.events.shift(),this.state(),t.push(this.event=null);return t},n.prototype.need_more_events=function(){var e;return 0===this.events.length||(e=this.events[0],e instanceof i.DocumentStartEvent?this.need_events(1):e instanceof i.SequenceStartEvent?this.need_events(2):e instanceof i.MappingStartEvent&&this.need_events(3))},n.prototype.need_events=function(e){var t,n,r,o,a;for(o=0,a=this.events.slice(1),n=0,r=a.length;n<r;n++)if(t=a[n],t instanceof i.DocumentStartEvent||t instanceof i.CollectionStartEvent?o++:t instanceof i.DocumentEndEvent||t instanceof i.CollectionEndEvent?o--:t instanceof i.StreamEndEvent&&(o=-1),o<0)return!1;return this.events.length<e+1},n.prototype.increase_indent=function(e){return null==e&&(e={}),this.indents.push(this.indent),null==this.indent?this.indent=e.flow?this.best_indent:0:e.indentless?void 0:this.indent+=this.best_indent},n.prototype.expect_stream_start=function(){return this.event instanceof i.StreamStartEvent?(!this.event.encoding||"encoding"in this.stream||(this.encoding=this.event.encoding),this.write_stream_start(),this.state=this.expect_first_document_start):this.error("expected StreamStartEvent, but got",this.event)},n.prototype.expect_nothing=function(){return this.error("expected nothing, but got",this.event)},n.prototype.expect_first_document_start=function(){return this.expect_document_start(!0)},n.prototype.expect_document_start=function(e){var t,n,r,u,l,c,p;if(null==e&&(e=!1),this.event instanceof i.DocumentStartEvent){if((this.event.version||this.event.tags)&&this.open_ended&&(this.write_indicator("...",!0),this.write_indent()),this.event.version&&this.write_version_directive(this.prepare_version(this.event.version)),this.tag_prefixes=o.clone(a),this.event.tags)for(p=function(){var e,t;e=this.event.tags,t=[];for(u in e)s.call(e,u)&&t.push(u);return t}.call(this).sort(),r=0,l=p.length;r<l;r++)n=p[r],c=this.event.tags[n],this.tag_prefixes[c]=n,this.write_tag_directive(this.prepare_tag_handle(n),this.prepare_tag_prefix(c));return t=!e||this.event.explicit||this.canonical||this.event.version||this.event.tags||this.check_empty_document(),t&&(this.write_indent(),this.write_indicator("---",!0),this.canonical&&this.write_indent()),this.state=this.expect_document_root}return this.event instanceof i.StreamEndEvent?(this.open_ended&&(this.write_indicator("...",!0),this.write_indent()),this.write_stream_end(),this.state=this.expect_nothing):this.error("expected DocumentStartEvent, but got",this.event)},n.prototype.expect_document_end=function(){return this.event instanceof i.DocumentEndEvent?(this.write_indent(),this.event.explicit&&(this.write_indicator("...",!0),this.write_indent()),this.flush_stream(),this.state=this.expect_document_start):this.error("expected DocumentEndEvent, but got",this.event)},n.prototype.expect_document_root=function(){return this.states.push(this.expect_document_end),this.expect_node({root:!0})},n.prototype.expect_node=function(e){return null==e&&(e={}),this.root_context=!!e.root,this.sequence_context=!!e.sequence,this.mapping_context=!!e.mapping,this.simple_key_context=!!e.simple_key,this.event instanceof i.AliasEvent?this.expect_alias():this.event instanceof i.ScalarEvent||this.event instanceof i.CollectionStartEvent?(this.process_anchor("&"),this.process_tag(),this.event instanceof i.ScalarEvent?this.expect_scalar():this.event instanceof i.SequenceStartEvent?this.flow_level||this.canonical||this.event.flow_style||this.check_empty_sequence()?this.expect_flow_sequence():this.expect_block_sequence():this.event instanceof i.MappingStartEvent?this.flow_level||this.canonical||this.event.flow_style||this.check_empty_mapping()?this.expect_flow_mapping():this.expect_block_mapping():void 0):this.error("expected NodeEvent, but got",this.event)},n.prototype.expect_alias=function(){return this.event.anchor||this.error("anchor is not specified for alias"),this.process_anchor("*"),this.state=this.states.pop()},n.prototype.expect_scalar=function(){return this.increase_indent({flow:!0}),this.process_scalar(),this.indent=this.indents.pop(),this.state=this.states.pop()},n.prototype.expect_flow_sequence=function(){return this.write_indicator("[",!0,{whitespace:!0}),this.flow_level++,this.increase_indent({flow:!0}),this.state=this.expect_first_flow_sequence_item},n.prototype.expect_first_flow_sequence_item=function(){return this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.write_indicator("]",!1),this.state=this.states.pop()):((this.canonical||this.column>this.best_width)&&this.write_indent(),this.states.push(this.expect_flow_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_flow_sequence_item=function(){return this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.canonical&&(this.write_indicator(",",!1),this.write_indent()),this.write_indicator("]",!1),this.state=this.states.pop()):(this.write_indicator(",",!1),(this.canonical||this.column>this.best_width)&&this.write_indent(),this.states.push(this.expect_flow_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_flow_mapping=function(){return this.write_indicator("{",!0,{whitespace:!0}),this.flow_level++,this.increase_indent({flow:!0}),this.state=this.expect_first_flow_mapping_key},n.prototype.expect_first_flow_mapping_key=function(){return this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.write_indicator("}",!1),this.state=this.states.pop()):((this.canonical||this.column>this.best_width)&&this.write_indent(),!this.canonical&&this.check_simple_key()?(this.states.push(this.expect_flow_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0),this.states.push(this.expect_flow_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_flow_mapping_key=function(){return this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.flow_level--,this.canonical&&(this.write_indicator(",",!1),this.write_indent()),this.write_indicator("}",!1),this.state=this.states.pop()):(this.write_indicator(",",!1),(this.canonical||this.column>this.best_width)&&this.write_indent(),!this.canonical&&this.check_simple_key()?(this.states.push(this.expect_flow_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0),this.states.push(this.expect_flow_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_flow_mapping_simple_value=function(){return this.write_indicator(":",!1),this.states.push(this.expect_flow_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_flow_mapping_value=function(){return(this.canonical||this.column>this.best_width)&&this.write_indent(),this.write_indicator(":",!0),this.states.push(this.expect_flow_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_block_sequence=function(){var e;return e=this.mapping_context&&!this.indentation,this.increase_indent({indentless:e}),this.state=this.expect_first_block_sequence_item},n.prototype.expect_first_block_sequence_item=function(){return this.expect_block_sequence_item(!0)},n.prototype.expect_block_sequence_item=function(e){return null==e&&(e=!1),!e&&this.event instanceof i.SequenceEndEvent?(this.indent=this.indents.pop(),this.state=this.states.pop()):(this.write_indent(),this.write_indicator("-",!0,{indentation:!0}),this.states.push(this.expect_block_sequence_item),this.expect_node({sequence:!0}))},n.prototype.expect_block_mapping=function(){return this.increase_indent(),this.state=this.expect_first_block_mapping_key},n.prototype.expect_first_block_mapping_key=function(){return this.expect_block_mapping_key(!0)},n.prototype.expect_block_mapping_key=function(e){return null==e&&(e=!1),!e&&this.event instanceof i.MappingEndEvent?(this.indent=this.indents.pop(),this.state=this.states.pop()):(this.write_indent(),this.check_simple_key()?(this.states.push(this.expect_block_mapping_simple_value),this.expect_node({mapping:!0,simple_key:!0})):(this.write_indicator("?",!0,{indentation:!0}),this.states.push(this.expect_block_mapping_value),this.expect_node({mapping:!0})))},n.prototype.expect_block_mapping_simple_value=function(){return this.write_indicator(":",!1),this.states.push(this.expect_block_mapping_key),this.expect_node({mapping:!0})},n.prototype.expect_block_mapping_value=function(){return this.write_indent(),this.write_indicator(":",!0,{indentation:!0}),this.states.push(this.expect_block_mapping_key),this.expect_node({mapping:!0})},n.prototype.check_empty_document=function(){var e;return this.event instanceof i.DocumentStartEvent&&0!==this.events.length&&((e=this.events[0])instanceof i.ScalarEvent&&null==e.anchor&&null==e.tag&&e.implicit&&""===e.value)},n.prototype.check_empty_sequence=function(){return this.event instanceof i.SequenceStartEvent&&this.events[0]instanceof i.SequenceEndEvent},n.prototype.check_empty_mapping=function(){return this.event instanceof i.MappingStartEvent&&this.events[0]instanceof i.MappingEndEvent},n.prototype.check_simple_key=function(){var e;return e=0,this.event instanceof i.NodeEvent&&null!=this.event.anchor&&(null==this.prepared_anchor&&(this.prepared_anchor=this.prepare_anchor(this.event.anchor)),e+=this.prepared_anchor.length),null!=this.event.tag&&(this.event instanceof i.ScalarEvent||this.event instanceof i.CollectionStartEvent)&&(null==this.prepared_tag&&(this.prepared_tag=this.prepare_tag(this.event.tag)),e+=this.prepared_tag.length),this.event instanceof i.ScalarEvent&&(null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),e+=this.analysis.scalar.length),e<128&&(this.event instanceof i.AliasEvent||this.event instanceof i.ScalarEvent&&!this.analysis.empty&&!this.analysis.multiline||this.check_empty_sequence()||this.check_empty_mapping())},n.prototype.process_anchor=function(e){return null==this.event.anchor?void(this.prepared_anchor=null):(null==this.prepared_anchor&&(this.prepared_anchor=this.prepare_anchor(this.event.anchor)),this.prepared_anchor&&this.write_indicator(""+e+this.prepared_anchor,!0),this.prepared_anchor=null)},n.prototype.process_tag=function(){var e;if(e=this.event.tag,this.event instanceof i.ScalarEvent){if(null==this.style&&(this.style=this.choose_scalar_style()),(!this.canonical||null==e)&&(""===this.style&&this.event.implicit[0]||""!==this.style&&this.event.implicit[1]))return void(this.prepared_tag=null);this.event.implicit[0]&&null==e&&(e="!",this.prepared_tag=null)}else if((!this.canonical||null==e)&&this.event.implicit)return void(this.prepared_tag=null);return null==e&&this.error("tag is not specified"),null==this.prepared_tag&&(this.prepared_tag=this.prepare_tag(e)),this.write_indicator(this.prepared_tag,!0),this.prepared_tag=null},n.prototype.process_scalar=function(){var e;switch(null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),null==this.style&&(this.style=this.choose_scalar_style()),e=!this.simple_key_context,this.style){case'"':this.write_double_quoted(this.analysis.scalar,e);break;case"'":this.write_single_quoted(this.analysis.scalar,e);break;case">":this.write_folded(this.analysis.scalar);break;case"|":this.write_literal(this.analysis.scalar);break;default:this.write_plain(this.analysis.scalar,e)}return this.analysis=null,this.style=null},n.prototype.choose_scalar_style=function(){var e;return null==this.analysis&&(this.analysis=this.analyze_scalar(this.event.value)),'"'===this.event.style||this.canonical?'"':this.event.style||!this.event.implicit[0]||this.simple_key_context&&(this.analysis.empty||this.analysis.multiline)||!(this.flow_level&&this.analysis.allow_flow_plain||!this.flow_level&&this.analysis.allow_block_plain)?this.event.style&&(e=this.event.style,u.call("|>",e)>=0)&&!this.flow_level&&!this.simple_key_context&&this.analysis.allow_block?this.event.style:this.event.style&&"'"!==this.event.style||!this.analysis.allow_single_quoted||this.simple_key_context&&this.analysis.multiline?'"':"'":""},n.prototype.prepare_version=function(e){var t,n,r;return t=e[0],n=e[1],r=t+"."+n,1===t?r:this.error("unsupported YAML version",r)},n.prototype.prepare_tag_handle=function(e){var t,n,r,i;for(e||this.error("tag handle must not be empty"),"!"===e[0]&&"!"===e.slice(-1)||this.error("tag handle must start and end with '!':",e),i=e.slice(1,-1),n=0,r=i.length;n<r;n++)"0"<=(t=i[n])&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-_",t)>=0||this.error("invalid character '"+t+"' in the tag handle:",e);return e},n.prototype.prepare_tag_prefix=function(e){var t,n,r,i;for(e||this.error("tag prefix must not be empty"),n=[],i=0,r=+("!"===e[0]);r<e.length;)t=e[r],"0"<=t&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-;/?!:@&=+$,_.~*'()[]",t)>=0?r++:(i<r&&n.push(e.slice(i,r)),i=r+=1,n.push(t));return i<r&&n.push(e.slice(i,r)),n.join("")},n.prototype.prepare_tag=function(e){var t,n,r,i,o,a,l,c,p,f,h,d;if(e||this.error("tag must not be empty"),"!"===e)return e;for(i=null,h=e,p=function(){var e,t;e=this.tag_prefixes,t=[];for(a in e)s.call(e,a)&&t.push(a);return t}.call(this).sort(),o=0,l=p.length;o<l;o++)c=p[o],0===e.indexOf(c)&&("!"===c||c.length<e.length)&&(i=this.tag_prefixes[c],h=e.slice(c.length));for(n=[],f=r=0;r<h.length;)t=h[r],"0"<=t&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-;/?!:@&=+$,_.~*'()[]",t)>=0||"!"===t&&"!"!==i?r++:(f<r&&n.push(h.slice(f,r)),f=r+=1,n.push(t));return f<r&&n.push(h.slice(f,r)),d=n.join(""),i?""+i+d:"!<"+d+">"},n.prototype.prepare_anchor=function(e){var t,n,r;for(e||this.error("anchor must not be empty"),n=0,r=e.length;n<r;n++)"0"<=(t=e[n])&&t<="9"||"A"<=t&&t<="Z"||"a"<=t&&t<="z"||u.call("-_",t)>=0||this.error("invalid character '"+t+"' in the anchor:",e);return e},n.prototype.analyze_scalar=function(t){var n,i,o,a,s,l,c,p,f,h,d,m,v,g,y,_,b,x,w,k,E,S,C,A,D;for(t||new e(t,!0,!1,!1,!0,!0,!0,!1),l=!1,f=!1,_=!1,C=!1,!1,g=!1,v=!1,D=!1,A=!1,c=!1,S=!1,0!==t.indexOf("---")&&0!==t.indexOf("...")||(l=!0,f=!0),b=!0,h=1===t.length||(k=t[1],u.call("\0 \t\r\n…\u2028\u2029",k)>=0),w=!1,x=!1,m=0,m=d=0,y=t.length;d<y;m=++d)p=t[m],0===m?u.call("#,[]{}&*!|>'\"%@`",p)>=0||"-"===p&&h?(f=!0,l=!0):u.call("?:",p)>=0&&(f=!0,h&&(l=!0)):u.call(",?[]{}",p)>=0?f=!0:":"===p?(f=!0,h&&(l=!0)):"#"===p&&b&&(f=!0,l=!0),u.call("\n…\u2028\u2029",p)>=0&&(_=!0),"\n"===p||" "<=p&&p<="~"||("\ufeff"!==p&&("…"===p||" "<=p&&p<="퟿"||""<=p&&p<="�")?(!0,this.allow_unicode||(C=!0)):C=!0)," "===p?(0===m&&(g=!0),m===t.length-1&&(D=!0),x&&(c=!0),x=!1,w=!0):u.call("\n…\u2028\u2029",p)>=0?(0===m&&(v=!0),m===t.length-1&&(A=!0),w&&(S=!0),x=!0,w=!1):(x=!1,w=!1),b=u.call(r,p)>=0,h=m+2>=t.length||(E=t[m+2],u.call(r,E)>=0);return a=!0,i=!0,s=!0,o=!0,n=!0,(g||v||D||A)&&(a=i=!1),D&&(n=!1),c&&(a=i=s=!1),(S||C)&&(a=i=s=n=!1),_&&(a=i=!1),f&&(a=!1),l&&(i=!1),new e(t,!1,_,a,i,s,o,n)},n.prototype.write_stream_start=function(){if(this.encoding&&0===this.encoding.indexOf("utf-16"))return this.stream.write("\ufeff",this.encoding)},n.prototype.write_stream_end=function(){return this.flush_stream()},n.prototype.write_indicator=function(e,t,n){var r;return null==n&&(n={}),r=this.whitespace||!t?e:" "+e,this.whitespace=!!n.whitespace,this.indentation&&(this.indentation=!!n.indentation),this.column+=r.length,this.open_ended=!1,this.stream.write(r,this.encoding)},n.prototype.write_indent=function(){var e,t,n;if(t=null!=(n=this.indent)?n:0,(!this.indentation||this.column>t||this.column===t&&!this.whitespace)&&this.write_line_break(),this.column<t)return this.whitespace=!0,e=new Array(t-this.column+1).join(" "),this.column=t,this.stream.write(e,this.encoding)},n.prototype.write_line_break=function(e){return this.whitespace=!0,this.indentation=!0,this.line+=1,this.column=0,this.stream.write(null!=e?e:this.best_line_break,this.encoding)},n.prototype.write_version_directive=function(e){return this.stream.write("%YAML "+e,this.encoding),this.write_line_break()},n.prototype.write_tag_directive=function(e,t){return this.stream.write("%TAG "+e+" "+t,this.encoding),this.write_line_break()},n.prototype.write_single_quoted=function(e,t){var n,r,i,o,a,s,l,c,p,f;for(null==t&&(t=!0),this.write_indicator("'",!0),p=!1,r=!1,f=a=0;a<=e.length;){if(i=e[a],p)null!=i&&" "===i||(f+1===a&&this.column>this.best_width&&t&&0!==f&&a!==e.length?this.write_indent():(o=e.slice(f,a),this.column+=o.length,this.stream.write(o,this.encoding)),f=a);else if(r){if(null==i||u.call("\n…\u2028\u2029",i)<0){for("\n"===e[f]&&this.write_line_break(),c=e.slice(f,a),s=0,l=c.length;s<l;s++)n=c[s],"\n"===n?this.write_line_break():this.write_line_break(n);this.write_indent(),f=a}}else(null==i||u.call(" \n…\u2028\u2029",i)>=0||"'"===i)&&f<a&&(o=e.slice(f,a),this.column+=o.length,this.stream.write(o,this.encoding),f=a);"'"===i&&(this.column+=2,this.stream.write("''",this.encoding),f=a+1),null!=i&&(p=" "===i,r=u.call("\n…\u2028\u2029",i)>=0),a++}return this.write_indicator("'",!1)},n.prototype.write_double_quoted=function(e,t){var n,r,i,a;for(null==t&&(t=!0),this.write_indicator('"',!0),a=i=0;i<=e.length;)n=e[i],(null==n||u.call('"\\…\u2028\u2029\ufeff',n)>=0||!(" "<=n&&n<="~"||this.allow_unicode&&(" "<=n&&n<="퟿"||""<=n&&n<="�")))&&(a<i&&(r=e.slice(a,i),this.column+=r.length,this.stream.write(r,this.encoding),a=i),null!=n&&(r=n in l?"\\"+l[n]:n<="ÿ"?"\\x"+o.pad_left(o.to_hex(n),"0",2):n<="￿"?"\\u"+o.pad_left(o.to_hex(n),"0",4):"\\U"+o.pad_left(o.to_hex(n),"0",16),this.column+=r.length,this.stream.write(r,this.encoding),a=i+1)),t&&0<i&&i<e.length-1&&(" "===n||a>=i)&&this.column+(i-a)>this.best_width&&(r=e.slice(a,i)+"\\",a<i&&(a=i),this.column+=r.length,this.stream.write(r,this.encoding),this.write_indent(),this.whitespace=!1,this.indentation=!1," "===e[a]&&(r="\\",this.column+=r.length,this.stream.write(r,this.encoding))),i++;return this.write_indicator('"',!1)},n.prototype.write_folded=function(e){var t,n,r,i,o,a,s,l,c,p,f,h,d;for(a=this.determine_block_hints(e),this.write_indicator(">"+a,!0),"+"===a.slice(-1)&&(this.open_ended=!0),this.write_line_break(),l=!0,n=!0,h=!1,d=o=0,f=[];o<=e.length;){if(r=e[o],n){if(null==r||u.call("\n…\u2028\u2029",r)<0){for(l||null==r||" "===r||"\n"!==e[d]||this.write_line_break(),l=" "===r,p=e.slice(d,o),s=0,c=p.length;s<c;s++)t=p[s],"\n"===t?this.write_line_break():this.write_line_break(t);null!=r&&this.write_indent(),d=o}}else h?" "!==r&&(d+1===o&&this.column>this.best_width?this.write_indent():(i=e.slice(d,o),this.column+=i.length,this.stream.write(i,this.encoding)),d=o):(null==r||u.call(" \n…\u2028\u2029",r)>=0)&&(i=e.slice(d,o),this.column+=i.length,this.stream.write(i,this.encoding),null==r&&this.write_line_break(),d=o);null!=r&&(n=u.call("\n…\u2028\u2029",r)>=0,h=" "===r),f.push(o++)}return f},n.prototype.write_literal=function(e){var t,n,r,i,o,a,s,l,c,p,f;for(a=this.determine_block_hints(e),this.write_indicator("|"+a,!0),"+"===a.slice(-1)&&(this.open_ended=!0),this.write_line_break(),n=!0,f=o=0,p=[];o<=e.length;){if(r=e[o],n){if(null==r||u.call("\n…\u2028\u2029",r)<0){for(c=e.slice(f,o),s=0,l=c.length;s<l;s++)t=c[s],"\n"===t?this.write_line_break():this.write_line_break(t);null!=r&&this.write_indent(),f=o}}else(null==r||u.call("\n…\u2028\u2029",r)>=0)&&(i=e.slice(f,o),this.stream.write(i,this.encoding),null==r&&this.write_line_break(),f=o);null!=r&&(n=u.call("\n…\u2028\u2029",r)>=0),p.push(o++)}return p},n.prototype.write_plain=function(e,t){var n,r,i,o,a,s,l,c,p,f,h;if(null==t&&(t=!0),e){for(this.root_context&&(this.open_ended=!0),this.whitespace||(o=" ",this.column+=o.length,this.stream.write(o,this.encoding)),this.whitespace=!1,this.indentation=!1,f=!1,r=!1,h=a=0,p=[];a<=e.length;){if(i=e[a],f)" "!==i&&(h+1===a&&this.column>this.best_width&&t?(this.write_indent(),this.whitespace=!1,this.indentation=!1):(o=e.slice(h,a),this.column+=o.length,this.stream.write(o,this.encoding)),h=a);else if(r){if(u.call("\n…\u2028\u2029",i)<0){for("\n"===e[h]&&this.write_line_break(),c=e.slice(h,a),s=0,l=c.length;s<l;s++)n=c[s],"\n"===n?this.write_line_break():this.write_line_break(n);this.write_indent(),this.whitespace=!1,this.indentation=!1,h=a}}else(null==i||u.call(" \n…\u2028\u2029",i)>=0)&&(o=e.slice(h,a),this.column+=o.length,this.stream.write(o,this.encoding),h=a);null!=i&&(f=" "===i,r=u.call("\n…\u2028\u2029",i)>=0),p.push(a++)}return p}},n.prototype.determine_block_hints=function(e){var t,n,r,i,o;return n="",t=e[0],r=e.length-2,o=e[r++],i=e[r++],u.call(" \n…\u2028\u2029",t)>=0&&(n+=this.best_indent),u.call("\n…\u2028\u2029",i)<0?n+="-":(1===e.length||u.call("\n…\u2028\u2029",o)>=0)&&(n+="+"),n},n.prototype.flush_stream=function(){var e;return"function"==typeof(e=this.stream).flush?e.flush():void 0},n.prototype.error=function(e,n){var r,i;throw n&&(n=null!=(r=null!=n&&null!=(i=n.constructor)?i.name:void 0)?r:o.inspect(n)),new t.EmitterError(e+(n?" "+n:""))},n}(),e=function(){function e(e,t,n,r,i,o,a,s){this.scalar=e,this.empty=t,this.multiline=n,this.allow_flow_plain=r,this.allow_block_plain=i,this.allow_single_quoted=o,this.allow_double_quoted=a,this.allow_block=s}return e}()}).call(this)},function(e,t,n){(function(){var e,t,r,i,o,a,s,u=[].slice;s=n(61),i=n(501),a=n(502),r=n(500),e=n(498),o=n(266),t=n(499),this.make_loader=function(n,l,c,p,f,h){var d;return null==n&&(n=i.Reader),null==l&&(l=a.Scanner),null==c&&(c=r.Parser),null==p&&(p=e.Composer),null==f&&(f=o.Resolver),null==h&&(h=t.Constructor),d=[n,l,c,p,f,h],function(){function e(e){var n,r,i;for(d[0].call(this,e),i=d.slice(1),n=0,r=i.length;n<r;n++)t=i[n],t.call(this)}var t;return s.extend.apply(s,[e.prototype].concat(u.call(function(){var e,n,r;for(r=[],e=0,n=d.length;e<n;e++)t=d[e],r.push(t.prototype);return r}()))),e}()},this.Loader=this.make_loader()}).call(this)},function(e,t,n){(function(){var e,r,i=function(e,t){function n(){this.constructor=e}for(var r in t)o.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},o={}.hasOwnProperty;r=n(94),e=n(45).YAMLError,this.RepresenterError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return i(t,e),t}(e),this.BaseRepresenter=function(){function e(e){var t;t=null!=e?e:{},this.default_style=t.default_style,this.default_flow_style=t.default_flow_style,this.represented_objects={},this.object_keeper=[],this.alias_key=null}return e.prototype.yaml_representers_types=[],e.prototype.yaml_representers_handlers=[],e.prototype.yaml_multi_representers_types=[],e.prototype.yaml_multi_representers_handlers=[],e.add_representer=function(e,t){return this.prototype.hasOwnProperty("yaml_representers_types")||(this.prototype.yaml_representers_types=[].concat(this.prototype.yaml_representers_types)),this.prototype.hasOwnProperty("yaml_representers_handlers")||(this.prototype.yaml_representers_handlers=[].concat(this.prototype.yaml_representers_handlers)),this.prototype.yaml_representers_types.push(e),this.prototype.yaml_representers_handlers.push(t)},e.add_multi_representer=function(e,t){return this.prototype.hasOwnProperty("yaml_multi_representers_types")||(this.prototype.yaml_multi_representers_types=[].concat(this.prototype.yaml_multi_representers_types)),this.prototype.hasOwnProperty("yaml_multi_representers_handlers")||(this.prototype.yaml_multi_representers_handlers=[].concat(this.prototype.yaml_multi_representers_handlers)),this.prototype.yaml_multi_representers_types.push(e),this.prototype.yaml_multi_representers_handlers.push(t)},e.prototype.represent=function(e){var t;return t=this.represent_data(e),this.serialize(t),this.represented_objects={},this.object_keeper=[],this.alias_key=null},e.prototype.represent_data=function(e){var t,n,i,o,a,s,u;if(this.ignore_aliases(e))this.alias_key=null;else if(-1!==(n=this.object_keeper.indexOf(e))){if(this.alias_key=n,this.alias_key in this.represented_objects)return this.represented_objects[this.alias_key]}else this.alias_key=this.object_keeper.length,this.object_keeper.push(e);if(s=null,t=null===e?"null":typeof e,"object"===t&&(t=e.constructor),-1!==(n=this.yaml_representers_types.lastIndexOf(t))&&(s=this.yaml_representers_handlers[n]),null==s)for(a=this.yaml_multi_representers_types,n=i=0,o=a.length;i<o;n=++i)if(u=a[n],e instanceof u){s=this.yaml_multi_representers_handlers[n];break}return null==s&&(-1!==(n=this.yaml_multi_representers_types.lastIndexOf(void 0))?s=this.yaml_multi_representers_handlers[n]:-1!==(n=this.yaml_representers_types.lastIndexOf(void 0))&&(s=this.yaml_representers_handlers[n])),null!=s?s.call(this,e):new r.ScalarNode(null,""+e)},e.prototype.represent_scalar=function(e,t,n){var i;return null==n&&(n=this.default_style),i=new r.ScalarNode(e,t,null,null,n),null!=this.alias_key&&(this.represented_objects[this.alias_key]=i),i},e.prototype.represent_sequence=function(e,t,n){var i,o,a,s,u,l,c,p;for(p=[],u=new r.SequenceNode(e,p,null,null,n),null!=this.alias_key&&(this.represented_objects[this.alias_key]=u),i=!0,a=0,s=t.length;a<s;a++)o=t[a],l=this.represent_data(o),l instanceof r.ScalarNode||l.style||(i=!1),p.push(l);return null==n&&(u.flow_style=null!=(c=this.default_flow_style)?c:i),u},e.prototype.represent_mapping=function(e,t,n){var i,a,s,u,l,c,p,f;f=[],u=new r.MappingNode(e,f,n),this.alias_key&&(this.represented_objects[this.alias_key]=u),i=!0;for(a in t)o.call(t,a)&&(s=t[a],l=this.represent_data(a),c=this.represent_data(s),l instanceof r.ScalarNode||l.style||(i=!1),c instanceof r.ScalarNode||c.style||(i=!1),f.push([l,c]));return n||(u.flow_style=null!=(p=this.default_flow_style)?p:i),u},e.prototype.ignore_aliases=function(e){return!1},e}(),this.Representer=function(e){function n(){return n.__super__.constructor.apply(this,arguments)}return i(n,e),n.prototype.represent_boolean=function(e){return this.represent_scalar("tag:yaml.org,2002:bool",e?"true":"false")},n.prototype.represent_null=function(e){return this.represent_scalar("tag:yaml.org,2002:null","null")},n.prototype.represent_number=function(e){var t,n;return t="tag:yaml.org,2002:"+(e%1==0?"int":"float"),n=e!==e?".nan":Infinity===e?".inf":-Infinity===e?"-.inf":e.toString(),this.represent_scalar(t,n)},n.prototype.represent_string=function(e){return this.represent_scalar("tag:yaml.org,2002:str",e)},n.prototype.represent_array=function(e){return this.represent_sequence("tag:yaml.org,2002:seq",e)},n.prototype.represent_date=function(e){return this.represent_scalar("tag:yaml.org,2002:timestamp",e.toISOString())},n.prototype.represent_object=function(e){return this.represent_mapping("tag:yaml.org,2002:map",e)},n.prototype.represent_undefined=function(e){throw new t.RepresenterError("cannot represent an onbject: "+e)},n.prototype.ignore_aliases=function(e){var t;return null==e||("boolean"==(t=typeof e)||"number"===t||"string"===t)},n}(this.BaseRepresenter),this.Representer.add_representer("boolean",this.Representer.prototype.represent_boolean),this.Representer.add_representer("null",this.Representer.prototype.represent_null),this.Representer.add_representer("number",this.Representer.prototype.represent_number),this.Representer.add_representer("string",this.Representer.prototype.represent_string),this.Representer.add_representer(Array,this.Representer.prototype.represent_array),this.Representer.add_representer(Date,this.Representer.prototype.represent_date),this.Representer.add_representer(Object,this.Representer.prototype.represent_object),this.Representer.add_representer(null,this.Representer.prototype.represent_undefined)}).call(this)},function(e,t,n){(function(){var e,t,r,i,o=function(e,t){function n(){this.constructor=e}for(var r in t)a.call(t,r)&&(e[r]=t[r]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},a={}.hasOwnProperty;t=n(127),r=n(94),i=n(61),e=n(45).YAMLError,this.SerializerError=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return o(t,e),t}(e),this.Serializer=function(){function e(e){var t;t=null!=e?e:{},this.encoding=t.encoding,this.explicit_start=t.explicit_start,this.explicit_end=t.explicit_end,this.version=t.version,this.tags=t.tags,this.serialized_nodes={},this.anchors={},this.last_anchor_id=0,this.closed=null}return e.prototype.open=function(){if(null===this.closed)return this.emit(new t.StreamStartEvent(this.encoding)),this.closed=!1;throw this.closed?new SerializerError("serializer is closed"):new SerializerError("serializer is already open")},e.prototype.close=function(){if(null===this.closed)throw new SerializerError("serializer is not opened");if(!this.closed)return this.emit(new t.StreamEndEvent),this.closed=!0},e.prototype.serialize=function(e){if(null===this.closed)throw new SerializerError("serializer is not opened");if(this.closed)throw new SerializerError("serializer is closed");return null!=e&&(this.emit(new t.DocumentStartEvent(void 0,void 0,this.explicit_start,this.version,this.tags)),this.anchor_node(e),this.serialize_node(e),this.emit(new t.DocumentEndEvent(void 0,void 0,this.explicit_end))),this.serialized_nodes={},this.anchors={},this.last_anchor_id=0},e.prototype.anchor_node=function(e){var t,n,i,o,a,s,u,l,c,p,f,h,d,m;if(e.unique_id in this.anchors)return null!=(t=this.anchors)[l=e.unique_id]?t[l]:t[l]=this.generate_anchor(e);if(this.anchors[e.unique_id]=null,e instanceof r.SequenceNode){for(c=e.value,h=[],n=0,s=c.length;n<s;n++)i=c[n],h.push(this.anchor_node(i));return h}if(e instanceof r.MappingNode){for(p=e.value,d=[],o=0,u=p.length;o<u;o++)f=p[o],a=f[0],m=f[1],this.anchor_node(a),d.push(this.anchor_node(m));return d}},e.prototype.generate_anchor=function(e){return"id"+i.pad_left(++this.last_anchor_id,"0",4)},e.prototype.serialize_node=function(e,n,i){var o,a,s,u,l,c,p,f,h,d,m,v,g,y;if(o=this.anchors[e.unique_id],e.unique_id in this.serialized_nodes)return this.emit(new t.AliasEvent(o));if(this.serialized_nodes[e.unique_id]=!0,this.descend_resolver(n,i),e instanceof r.ScalarNode)s=this.resolve(r.ScalarNode,e.value,[!0,!1]),a=this.resolve(r.ScalarNode,e.value,[!1,!0]),l=[e.tag===s,e.tag===a],this.emit(new t.ScalarEvent(o,e.tag,l,e.value,void 0,void 0,e.style));else if(e instanceof r.SequenceNode){for(l=e.tag===this.resolve(r.SequenceNode,e.value,!0),this.emit(new t.SequenceStartEvent(o,e.tag,l,void 0,void 0,e.flow_style)),m=e.value,i=u=0,h=m.length;u<h;i=++u)c=m[i],this.serialize_node(c,e,i);this.emit(new t.SequenceEndEvent)}else if(e instanceof r.MappingNode){for(l=e.tag===this.resolve(r.MappingNode,e.value,!0),this.emit(new t.MappingStartEvent(o,e.tag,l,void 0,void 0,e.flow_style)),v=e.value,p=0,d=v.length;p<d;p++)g=v[p],f=g[0],y=g[1],this.serialize_node(f,e,null),this.serialize_node(y,e,f);this.emit(new t.MappingEndEvent)}return this.ascend_resolver()},e}()}).call(this)},function(e,t,n){(function(){var e,r,i;this.composer=n(498),this.constructor=n(499),e=this.dumper=n(1201),this.errors=n(45),this.events=n(127),r=this.loader=n(1203),this.nodes=n(94),this.parser=n(500),this.reader=n(501),this.resolver=n(266),this.scanner=n(502),this.tokens=n(267),i=n(61),this.scan=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_token();)i.push(n.get_token());return i},this.parse=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_event();)i.push(n.get_event());return i},this.compose=function(e,t){var n;return null==t&&(t=r.Loader),n=new t(e),n.get_single_node()},this.compose_all=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_node();)i.push(n.get_node());return i},this.load=function(e,t){var n;return null==t&&(t=r.Loader),n=new t(e),n.get_single_data()},this.load_all=function(e,t){var n,i;for(null==t&&(t=r.Loader),n=new t(e),i=[];n.check_data();)i.push(n.get_data());return i},this.emit=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(l=0,c=t.length;l<c;l++)u=t[l],a.emit(u)}finally{a.dispose()}return n||s.string},this.serialize=function(n,r,i,o){return null==i&&(i=e.Dumper),null==o&&(o={}),t.serialize_all([n],r,i,o)},this.serialize_all=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(a.open(),u=0,l=t.length;u<l;u++)c=t[u],a.serialize(c);a.close()}finally{a.dispose()}return n||s.string},this.dump=function(n,r,i,o){return null==i&&(i=e.Dumper),null==o&&(o={}),t.dump_all([n],r,i,o)},this.dump_all=function(t,n,r,o){var a,s,u,l,c;null==r&&(r=e.Dumper),null==o&&(o={}),s=n||new i.StringStream,a=new r(s,o);try{for(a.open(),l=0,c=t.length;l<c;l++)u=t[l],a.represent(u);a.close()}finally{a.dispose()}return n||s.string}}).call(this)},function(e,t,n){var r,i,o;!function(n,a){i=[],r=a(),void 0!==(o="function"==typeof r?r.apply(t,i):r)&&(e.exports=o)}(0,function(){"use strict";var e=function(e){return"getComputedStyle"in window&&"smooth"===window.getComputedStyle(e)["scroll-behavior"]};if("undefined"==typeof window||!("document"in window))return{};var t=function(t,n,r){n=n||999,r||0===r||(r=9);var i,o=function(e){i=e},a=function(){clearTimeout(i),o(0)},s=function(e){return Math.max(0,t.getTopOf(e)-r)},u=function(r,i,s){if(a(),0===i||i&&i<0||e(t.body))t.toY(r),s&&s();else{var u=t.getY(),l=Math.max(0,r)-u,c=(new Date).getTime();i=i||Math.min(Math.abs(l),n),function e(){o(setTimeout(function(){var n=Math.min(1,((new Date).getTime()-c)/i),r=Math.max(0,Math.floor(u+l*(n<.5?2*n*n:n*(4-2*n)-1)));t.toY(r),n<1&&t.getHeight()+r<t.body.scrollHeight?e():(setTimeout(a,99),s&&s())},9))}()}},l=function(e,t,n){u(s(e),t,n)},c=function(e,n,i){var o=e.getBoundingClientRect().height,a=t.getTopOf(e)+o,c=t.getHeight(),p=t.getY(),f=p+c;s(e)<p||o+r>c?l(e,n,i):a+r>f?u(a-c+r,n,i):i&&i()},p=function(e,n,r,i){u(Math.max(0,t.getTopOf(e)-t.getHeight()/2+(r||e.getBoundingClientRect().height/2)),n,i)};return{setup:function(e,t){return(0===e||e)&&(n=e),(0===t||t)&&(r=t),{defaultDuration:n,edgeOffset:r}},to:l,toY:u,intoView:c,center:p,stop:a,moving:function(){return!!i},getY:t.getY,getTopOf:t.getTopOf}},n=document.documentElement,r=function(){return window.scrollY||n.scrollTop},i=t({body:document.scrollingElement||document.body,toY:function(e){window.scrollTo(0,e)},getY:r,getHeight:function(){return window.innerHeight||n.clientHeight},getTopOf:function(e){return e.getBoundingClientRect().top+r()-n.offsetTop}});if(i.createScroller=function(e,r,i){return t({body:e,toY:function(t){e.scrollTop=t},getY:function(){return e.scrollTop},getHeight:function(){return Math.min(e.clientHeight,window.innerHeight||n.clientHeight)},getTopOf:function(e){return e.offsetTop}},r,i)},"addEventListener"in window&&!window.noZensmooth&&!e(document.body)){var o="scrollRestoration"in history;o&&(history.scrollRestoration="auto"),window.addEventListener("load",function(){o&&(setTimeout(function(){history.scrollRestoration="manual"},9),window.addEventListener("popstate",function(e){e.state&&"zenscrollY"in e.state&&i.toY(e.state.zenscrollY)},!1)),window.location.hash&&setTimeout(function(){var e=i.setup().edgeOffset;if(e){var t=document.getElementById(window.location.href.split("#")[1]);if(t){var n=Math.max(0,i.getTopOf(t)-e),r=i.getY()-n;0<=r&&r<9&&window.scrollTo(0,n)}}},9)},!1);var a=new RegExp("(^|\\s)noZensmooth(\\s|$)");window.addEventListener("click",function(e){for(var t=e.target;t&&"A"!==t.tagName;)t=t.parentNode;if(!(!t||1!==e.which||e.shiftKey||e.metaKey||e.ctrlKey||e.altKey)){if(o)try{history.replaceState({zenscrollY:i.getY()},"")}catch(e){}var n=t.getAttribute("href")||"";if(0===n.indexOf("#")&&!a.test(t.className)){var r=0,s=document.getElementById(n.substring(1));if("#"!==n){if(!s)return;r=i.getTopOf(s)}e.preventDefault();var u=function(){window.location=n},l=i.setup().edgeOffset;l&&(r=Math.max(0,r-l),u=function(){history.pushState(null,"",n)}),i.toY(r,null,u)}}},!1)}return i})},function(e,t,n){function r(e){return n(i(e))}function i(e){var t=o[e];if(!(t+1))throw new Error("Cannot find module '"+e+"'.");return t}var o={"./all.js":271,"./ast/ast.js":272,"./ast/index.js":273,"./ast/jump-to-path.jsx":274,"./auth/actions.js":168,"./auth/index.js":275,"./auth/reducers.js":276,"./auth/selectors.js":277,"./auth/spec-wrap-actions.js":278,"./configs/actions.js":169,"./configs/index.js":279,"./configs/reducers.js":280,"./configs/selectors.js":281,"./deep-linking/helpers.js":282,"./deep-linking/index.js":283,"./deep-linking/layout-wrap-actions.js":284,"./deep-linking/spec-wrap-actions.js":285,"./download-url.js":286,"./err/actions.js":128,"./err/error-transformers/hook.js":287,"./err/error-transformers/transformers/not-of-type.js":288,"./err/error-transformers/transformers/parameter-oneof.js":289,"./err/error-transformers/transformers/strip-instance.js":290,"./err/index.js":291,"./err/reducers.js":292,"./err/selectors.js":293,"./layout/actions.js":170,"./layout/index.js":294,"./layout/reducers.js":295,"./layout/selectors.js":296,"./logs/index.js":297,"./oas3/actions.js":171,"./oas3/auth-extensions/wrap-selectors.js":298,"./oas3/components/callbacks.jsx":299,"./oas3/components/http-auth.jsx":300,"./oas3/components/index.js":301,"./oas3/components/operation-link.jsx":302,"./oas3/components/operation-servers.jsx":303,"./oas3/components/request-body-editor.jsx":304,"./oas3/components/request-body.jsx":305,"./oas3/components/servers.jsx":306,"./oas3/helpers.js":34,"./oas3/index.js":307,"./oas3/reducers.js":308,"./oas3/selectors.js":309,"./oas3/spec-extensions/selectors.js":310,"./oas3/spec-extensions/wrap-selectors.js":311,"./oas3/wrap-components/auth-item.jsx":312,"./oas3/wrap-components/index.js":313,"./oas3/wrap-components/markdown.js":314,"./oas3/wrap-components/model.jsx":315,"./oas3/wrap-components/online-validator-badge.js":316,"./oas3/wrap-components/parameters.jsx":317,"./oas3/wrap-components/version-stamp.jsx":318,"./samples/fn.js":172,"./samples/index.js":319,"./spec/actions.js":173,"./spec/index.js":320,"./spec/reducers.js":321,"./spec/selectors.js":322,"./spec/wrap-actions.js":323,"./split-pane-mode/components/split-pane-mode.jsx":324,"./split-pane-mode/index.js":325,"./swagger-js/index.js":326,"./util/index.js":327,"./view/index.js":328,"./view/root-injects.js":329};r.keys=function(){return Object.keys(o)},r.resolve=i,e.exports=r,r.id=1208},function(e,t){},function(e,t){},function(e,t){},function(e,t){},function(e,t,n){n(505),e.exports=n(504)}])});
+//# sourceMappingURL=swagger-ui-bundle.js.map
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.min.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.min.js
new file mode 100644
index 0000000000000..cd5a1d0859910
--- /dev/null
+++ b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.min.js
@@ -0,0 +1,13 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.SwaggerUIStandalonePreset=e():t.SwaggerUIStandalonePreset=e()}(this,function(){return function(t){function e(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,e),i.l=!0,i.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="/dist",e(e.s=275)}([function(t,e,n){"use strict";function r(t){var e={};return null!==t&&Object.keys(t).forEach(function(n){t[n].forEach(function(t){e[String(t)]=n})}),e}function i(t,e){if(e=e||{},Object.keys(e).forEach(function(e){if(-1===s.indexOf(e))throw new o('Unknown option "'+e+'" is met in definition of "'+t+'" YAML type.')}),this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=r(e.styleAliases||null),-1===a.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}var o=n(33),s=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],a=["scalar","sequence","mapping"];t.exports=i},function(t,e,n){var r=n(103)("wks"),i=n(70),o=n(4).Symbol,s="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=s&&o[t]||(s?o:i)("Symbol."+t))}).store=r},function(t,e,n){var r=n(4),i=n(13),o=n(14),s=n(22),a=n(40),u=function(t,e,n){var c,h,l,p,f=t&u.F,d=t&u.G,m=t&u.S,y=t&u.P,v=t&u.B,x=d?r:m?r[e]||(r[e]={}):(r[e]||{}).prototype,g=d?i:i[e]||(i[e]={}),D=g.prototype||(g.prototype={});d&&(n=e);for(c in n)h=!f&&x&&void 0!==x[c],l=(h?x:n)[c],p=v&&h?a(l,r):y&&"function"==typeof l?a(Function.call,l):l,x&&s(x,c,l,t&u.U),g[c]!=l&&o(g,c,p),y&&D[c]!=l&&(D[c]=l)};r.core=i,u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,t.exports=u},function(t,e,n){var r=n(2),i=n(29),o=n(8),s=/"/g,a=function(t,e,n,r){var i=String(o(t)),a="<"+e;return""!==n&&(a+=" "+n+'="'+String(r).replace(s,"&quot;")+'"'),a+">"+i+"</"+e+">"};t.exports=function(t,e){var n={};n[t]=e(a),r(r.P+r.F*i(function(){var e=""[t]('"');return e!==e.toLowerCase()||e.split('"').length>3}),"String",n)}},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e){var n=t.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e,n){var r=n(58)("wks"),i=n(38),o=n(6).Symbol,s="function"==typeof o;(t.exports=function(t){return r[t]||(r[t]=s&&o[t]||(s?o:i)("Symbol."+t))}).store=r},function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e,n){t.exports=!n(26)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(16),i=n(83),o=n(60),s=Object.defineProperty;e.f=n(9)?Object.defineProperty:function(t,e,n){if(r(t),e=o(e,!0),r(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(21);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e){var n=t.exports={version:"2.5.3"};"number"==typeof __e&&(__e=n)},function(t,e,n){var r=n(42),i=n(102);t.exports=n(28)?function(t,e,n){return r.f(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e,n){"use strict";function r(t,e,n,r,o,s,a,u){if(i(e),!t){var c;if(void 0===e)c=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var h=[n,r,o,s,a,u],l=0;c=new Error(e.replace(/%s/g,function(){return h[l++]})),c.name="Invariant Violation"}throw c.framesToPop=1,c}}var i=function(t){};t.exports=r},function(t,e,n){var r=n(19);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e,n){var r=n(6),i=n(5),o=n(81),s=n(18),a=function(t,e,n){var u,c,h,l=t&a.F,p=t&a.G,f=t&a.S,d=t&a.P,m=t&a.B,y=t&a.W,v=p?i:i[e]||(i[e]={}),x=v.prototype,g=p?r:f?r[e]:(r[e]||{}).prototype;p&&(n=e);for(u in n)(c=!l&&g&&void 0!==g[u])&&u in v||(h=c?g[u]:n[u],v[u]=p&&"function"!=typeof g[u]?n[u]:m&&c?o(h,r):y&&g[u]==h?function(t){var e=function(e,n,r){if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(e);case 2:return new t(e,n)}return new t(e,n,r)}return t.apply(this,arguments)};return e.prototype=t.prototype,e}(h):d&&"function"==typeof h?o(Function.call,h):h,d&&((v.virtual||(v.virtual={}))[u]=h,t&a.R&&x&&!x[u]&&s(x,u,h)))};a.F=1,a.G=2,a.S=4,a.P=8,a.B=16,a.W=32,a.U=64,a.R=128,t.exports=a},function(t,e,n){var r=n(11),i=n(37);t.exports=n(9)?function(t,e,n){return r.f(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(151),i=n(50);t.exports=function(t){return r(i(t))}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(4),i=n(14),o=n(30),s=n(70)("src"),a=Function.toString,u=(""+a).split("toString");n(13).inspectSource=function(t){return a.call(t)},(t.exports=function(t,e,n,a){var c="function"==typeof n;c&&(o(n,"name")||i(n,"name",e)),t[e]!==n&&(c&&(o(n,s)||i(n,s,t[e]?""+t[e]:u.join(String(e)))),t===r?t[e]=n:a?t[e]?t[e]=n:i(t,e,n):(delete t[e],i(t,e,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[s]||a.call(this)})},function(t,e,n){"use strict";function r(t){return void 0===t||null===t}function i(t){return"object"==typeof t&&null!==t}function o(t){return Array.isArray(t)?t:r(t)?[]:[t]}function s(t,e){var n,r,i,o;if(e)for(o=Object.keys(e),n=0,r=o.length;n<r;n+=1)i=o[n],t[i]=e[i];return t}function a(t,e){var n,r="";for(n=0;n<e;n+=1)r+=t;return r}function u(t){return 0===t&&Number.NEGATIVE_INFINITY===1/t}t.exports.isNothing=r,t.exports.isObject=i,t.exports.toArray=o,t.exports.repeat=a,t.exports.isNegativeZero=u,t.exports.extend=s},function(t,e,n){"use strict";function r(t,e,n){var i=[];return t.include.forEach(function(t){n=r(t,e,n)}),t[e].forEach(function(t){n.forEach(function(e,n){e.tag===t.tag&&e.kind===t.kind&&i.push(n)}),n.push(t)}),n.filter(function(t,e){return-1===i.indexOf(e)})}function i(){function t(t){r[t.kind][t.tag]=r.fallback[t.tag]=t}var e,n,r={scalar:{},sequence:{},mapping:{},fallback:{}};for(e=0,n=arguments.length;e<n;e+=1)arguments[e].forEach(t);return r}function o(t){this.include=t.include||[],this.implicit=t.implicit||[],this.explicit=t.explicit||[],this.implicit.forEach(function(t){if(t.loadKind&&"scalar"!==t.loadKind)throw new a("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var s=n(23),a=n(33),u=n(0);o.DEFAULT=null,o.create=function(){var t,e;switch(arguments.length){case 1:t=o.DEFAULT,e=arguments[0];break;case 2:t=arguments[0],e=arguments[1];break;default:throw new a("Wrong number of arguments for Schema.create function")}if(t=s.toArray(t),e=s.toArray(e),!t.every(function(t){return t instanceof o}))throw new a("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!e.every(function(t){return t instanceof u}))throw new a("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:t,explicit:e})},t.exports=o},function(t,e,n){"use strict";function r(t){return void 0!==t.ref}function i(t){return void 0!==t.key}var o=n(35),s=n(115),a=(n(46),n(118),Object.prototype.hasOwnProperty),u=n(116),c={key:!0,ref:!0,__self:!0,__source:!0},h=function(t,e,n,r,i,o,s){var a={$$typeof:u,type:t,key:e,ref:n,props:s,_owner:o};return a};h.createElement=function(t,e,n){var o,u={},l=null,p=null;if(null!=e){r(e)&&(p=e.ref),i(e)&&(l=""+e.key),void 0===e.__self?null:e.__self,void 0===e.__source?null:e.__source;for(o in e)a.call(e,o)&&!c.hasOwnProperty(o)&&(u[o]=e[o])}var f=arguments.length-2;if(1===f)u.children=n;else if(f>1){for(var d=Array(f),m=0;m<f;m++)d[m]=arguments[m+2];u.children=d}if(t&&t.defaultProps){var y=t.defaultProps;for(o in y)void 0===u[o]&&(u[o]=y[o])}return h(t,l,p,0,0,s.current,u)},h.createFactory=function(t){var e=h.createElement.bind(null,t);return e.type=t,e},h.cloneAndReplaceKey=function(t,e){return h(t.type,e,t.ref,t._self,t._source,t._owner,t.props)},h.cloneElement=function(t,e,n){var u,l=o({},t.props),p=t.key,f=t.ref,d=(t._self,t._source,t._owner);if(null!=e){r(e)&&(f=e.ref,d=s.current),i(e)&&(p=""+e.key);var m;t.type&&t.type.defaultProps&&(m=t.type.defaultProps);for(u in e)a.call(e,u)&&!c.hasOwnProperty(u)&&(void 0===e[u]&&void 0!==m?l[u]=m[u]:l[u]=e[u])}var y=arguments.length-2;if(1===y)l.children=n;else if(y>1){for(var v=Array(y),x=0;x<y;x++)v[x]=arguments[x+2];l.children=v}return h(t.type,p,f,0,0,d,l)},h.isValidElement=function(t){return"object"==typeof t&&null!==t&&t.$$typeof===u},t.exports=h},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e,n){t.exports=!n(29)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e){t.exports={}},function(t,e,n){var r=n(43),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){"use strict";function r(t,e){Error.call(this),this.name="YAMLException",this.reason=t,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(t){var e=this.name+": ";return e+=this.reason||"(unknown reason)",!t&&this.mark&&(e+=" "+this.mark.toString()),e},t.exports=r},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(110)],implicit:[n(255),n(248)],explicit:[n(240),n(250),n(251),n(253)]})},function(t,e,n){"use strict";function r(t){if(null===t||void 0===t)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(t)}/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+var i=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,s=Object.prototype.propertyIsEnumerable;t.exports=function(){try{if(!Object.assign)return!1;var t=new String("abc");if(t[5]="de","5"===Object.getOwnPropertyNames(t)[0])return!1;for(var e={},n=0;n<10;n++)e["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(e).map(function(t){return e[t]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(t){r[t]=t}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(t){return!1}}()?Object.assign:function(t,e){for(var n,a,u=r(t),c=1;c<arguments.length;c++){n=Object(arguments[c]);for(var h in n)o.call(n,h)&&(u[h]=n[h]);if(i){a=i(n);for(var l=0;l<a.length;l++)s.call(n,a[l])&&(u[a[l]]=n[a[l]])}}return u}},function(t,e){t.exports={}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e,n){var r=n(39);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){"use strict";var r=n(14),i=n(22),o=n(29),s=n(8),a=n(1);t.exports=function(t,e,n){var u=a(t),c=n(s,u,""[t]),h=c[0],l=c[1];o(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(i(String.prototype,t,h),r(RegExp.prototype,u,2==e?function(t,e){return l.call(t,this,e)}:function(t){return l.call(t,this)}))}},function(t,e,n){var r=n(12),i=n(178),o=n(197),s=Object.defineProperty;e.f=n(28)?Object.defineProperty:function(t,e,n){if(r(t),e=o(e,!0),r(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(180),i=n(8);t.exports=function(t){return r(i(t))}},function(t,e,n){"use strict";function r(t){return function(){return t}}var i=function(){};i.thatReturns=r,i.thatReturnsFalse=r(!1),i.thatReturnsTrue=r(!0),i.thatReturnsNull=r(null),i.thatReturnsThis=function(){return this},i.thatReturnsArgument=function(t){return t},t.exports=i},function(t,e,n){"use strict";var r=n(45),i=r;t.exports=i},function(t,e,n){"use strict";var r=n(24);t.exports=r.DEFAULT=new r({include:[n(34)],explicit:[n(246),n(245),n(244)]})},function(t,e,n){"use strict";function r(t){for(var e=arguments.length-1,n="Minified React error #"+t+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+t,r=0;r<e;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var i=new Error(n);throw i.name="Invariant Violation",i.framesToPop=1,i}t.exports=r},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e){t.exports=!0},function(t,e,n){var r=n(16),i=n(156),o=n(51),s=n(57)("IE_PROTO"),a=function(){},u=function(){var t,e=n(82)("iframe"),r=o.length;for(e.style.display="none",n(150).appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("<script>document.F=Object<\/script>"),t.close(),u=t.F;r--;)delete u.prototype[o[r]];return u()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[s]=t):n=u(),void 0===e?n:i(n,e)}},function(t,e,n){var r=n(89),i=n(51);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e){e.f={}.propertyIsEnumerable},function(t,e,n){var r=n(11).f,i=n(10),o=n(7)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(58)("keys"),i=n(38);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,e,n){var r=n(6),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return i[t]||(i[t]={})}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(19);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r=n(6),i=n(5),o=n(52),s=n(62),a=n(11).f;t.exports=function(t){var e=i.Symbol||(i.Symbol=o?{}:r.Symbol||{});"_"==t.charAt(0)||t in e||a(e,t,{value:s.f(t)})}},function(t,e,n){e.f=n(7)},function(t,e,n){var r=n(27),i=n(1)("toStringTag"),o="Arguments"==r(function(){return arguments}()),s=function(t,e){try{return t[e]}catch(t){}};t.exports=function(t){var e,n,a;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=s(e=Object(t),i))?n:o?r(e):"Object"==(a=r(e))&&"function"==typeof e.callee?"Arguments":a}},function(t,e,n){var r=n(21),i=n(4).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,e,n){var r=n(1)("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,!"/./"[t](e)}catch(t){}}return!0}},function(t,e,n){"use strict";function r(t){var e,n;this.promise=new t(function(t,r){if(void 0!==e||void 0!==n)throw TypeError("Bad Promise constructor");e=t,n=r}),this.resolve=i(e),this.reject=i(n)}var i=n(39);t.exports.f=function(t){return new r(t)}},function(t,e,n){var r=n(42).f,i=n(30),o=n(1)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(103)("keys"),i=n(70);t.exports=function(t){return r[t]||(r[t]=i(t))}},function(t,e,n){var r=n(96),i=n(8);t.exports=function(t,e,n){if(r(e))throw TypeError("String#"+n+" doesn't accept regex!");return String(i(t))}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e,n){"use strict";var r=n(24);t.exports=new r({explicit:[n(254),n(252),n(247)]})},function(t,e,n){"use strict";function r(t,e){return{type:a,payload:(0,s.default)({},t,e)}}function i(t){return{type:u,payload:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.TOGGLE_CONFIGS=e.UPDATE_CONFIGS=void 0;var o=n(77),s=function(t){return t&&t.__esModule?t:{default:t}}(o);e.update=r,e.toggle=i;var a=e.UPDATE_CONFIGS="configs_update",u=e.TOGGLE_CONFIGS="configs_toggle"},function(t,e,n){t.exports={default:n(140),__esModule:!0}},function(t,e,n){t.exports={default:n(141),__esModule:!0}},function(t,e,n){"use strict";e.__esModule=!0,e.default=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}},function(t,e,n){"use strict";e.__esModule=!0;var r=n(73),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),(0,i.default)(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}()},function(t,e,n){"use strict";e.__esModule=!0;var r=n(73),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(t,e,n){return e in t?(0,i.default)(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var i=n(131),o=r(i),s=n(130),a=r(s),u=n(80),c=r(u);e.default=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+(void 0===e?"undefined":(0,c.default)(e)));t.prototype=(0,a.default)(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(o.default?(0,o.default)(t,e):t.__proto__=e)}},function(t,e,n){"use strict";e.__esModule=!0;var r=n(80),i=function(t){return t&&t.__esModule?t:{default:t}}(r);e.default=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!==(void 0===e?"undefined":(0,i.default)(e))&&"function"!=typeof e?t:e}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var i=n(133),o=r(i),s=n(132),a=r(s),u="function"==typeof a.default&&"symbol"==typeof o.default?function(t){return typeof t}:function(t){return t&&"function"==typeof a.default&&t.constructor===a.default&&t!==a.default.prototype?"symbol":typeof t};e.default="function"==typeof a.default&&"symbol"===u(o.default)?function(t){return void 0===t?"undefined":u(t)}:function(t){return t&&"function"==typeof a.default&&t.constructor===a.default&&t!==a.default.prototype?"symbol":void 0===t?"undefined":u(t)}},function(t,e,n){var r=n(145);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r=n(19),i=n(6).document,o=r(i)&&r(i.createElement);t.exports=function(t){return o?i.createElement(t):{}}},function(t,e,n){t.exports=!n(9)&&!n(26)(function(){return 7!=Object.defineProperty(n(82)("div"),"a",{get:function(){return 7}}).a})},function(t,e,n){"use strict";var r=n(52),i=n(17),o=n(90),s=n(18),a=n(10),u=n(36),c=n(153),h=n(56),l=n(88),p=n(7)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,m,y,v,x){c(n,e,m);var g,D,E,A=function(t){if(!f&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",w="values"==y,C=!1,_=t.prototype,b=_[p]||_["@@iterator"]||y&&_[y],F=!f&&b||A(y),k=y?w?A("entries"):F:void 0,I="Array"==e?_.entries||b:b;if(I&&(E=l(I.call(new t)))!==Object.prototype&&E.next&&(h(E,S,!0),r||a(E,p)||s(E,p,d)),w&&b&&"values"!==b.name&&(C=!0,F=function(){return b.call(this)}),r&&!x||!f&&!C&&_[p]||s(_,p,F),u[e]=F,u[S]=d,y)if(g={values:w?F:A("values"),keys:v?F:A("keys"),entries:k},x)for(D in g)D in _||o(_,D,g[D]);else i(i.P+i.F*(f||C),e,g);return g}},function(t,e,n){var r=n(55),i=n(37),o=n(20),s=n(60),a=n(10),u=n(83),c=Object.getOwnPropertyDescriptor;e.f=n(9)?c:function(t,e){if(t=o(t),e=s(e,!0),u)try{return c(t,e)}catch(t){}if(a(t,e))return i(!r.f.call(t,e),t[e])}},function(t,e,n){var r=n(89),i=n(51).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,i)}},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e,n){var r=n(10),i=n(91),o=n(57)("IE_PROTO"),s=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?s:null}},function(t,e,n){var r=n(10),i=n(20),o=n(147)(!1),s=n(57)("IE_PROTO");t.exports=function(t,e){var n,a=i(t),u=0,c=[];for(n in a)n!=s&&r(a,n)&&c.push(n);for(;e.length>u;)r(a,n=e[u++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){t.exports=n(18)},function(t,e,n){var r=n(50);t.exports=function(t){return Object(r(t))}},function(t,e,n){"use strict";var r=n(160)(!0);n(84)(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})},function(t,e,n){n(165);for(var r=n(6),i=n(18),o=n(36),s=n(7)("toStringTag"),a="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),u=0;u<a.length;u++){var c=a[u],h=r[c],l=h&&h.prototype;l&&!l[s]&&i(l,s,c),o[c]=o.Array}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e,n){var r=n(4).document;t.exports=r&&r.documentElement},function(t,e,n){var r=n(21),i=n(27),o=n(1)("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==i(t))}},function(t,e,n){"use strict";var r=n(98),i=n(2),o=n(22),s=n(14),a=n(30),u=n(31),c=n(183),h=n(67),l=n(189),p=n(1)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,m,y,v,x){c(n,e,m);var g,D,E,A=function(t){if(!f&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",w="values"==y,C=!1,_=t.prototype,b=_[p]||_["@@iterator"]||y&&_[y],F=!f&&b||A(y),k=y?w?A("entries"):F:void 0,I="Array"==e?_.entries||b:b;if(I&&(E=l(I.call(new t)))!==Object.prototype&&E.next&&(h(E,S,!0),r||a(E,p)||s(E,p,d)),w&&b&&"values"!==b.name&&(C=!0,F=function(){return b.call(this)}),r&&!x||!f&&!C&&_[p]||s(_,p,F),u[e]=F,u[S]=d,y)if(g={values:w?F:A("values"),keys:v?F:A("keys"),entries:k},x)for(D in g)D in _||o(_,D,g[D]);else i(i.P+i.F*(f||C),e,g);return g}},function(t,e){t.exports=!1},function(t,e,n){var r=n(190),i=n(94);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e){t.exports=function(t){try{return{e:!1,v:t()}}catch(t){return{e:!0,v:t}}}},function(t,e,n){var r=n(12),i=n(21),o=n(66);t.exports=function(t,e){if(r(t),i(e)&&e.constructor===t)return e;var n=o.f(t);return(0,n.resolve)(e),n.promise}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,n){var r=n(4),i=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return i[t]||(i[t]={})}},function(t,e,n){var r=n(12),i=n(39),o=n(1)("species");t.exports=function(t,e){var n,s=r(t).constructor;return void 0===s||void 0==(n=r(s)[o])?e:i(n)}},function(t,e,n){var r=n(43),i=n(8);t.exports=function(t){return function(e,n){var o,s,a=String(i(e)),u=r(n),c=a.length;return u<0||u>=c?t?"":void 0:(o=a.charCodeAt(u),o<55296||o>56319||u+1===c||(s=a.charCodeAt(u+1))<56320||s>57343?t?a.charAt(u):o:t?a.slice(u,u+2):s-56320+(o-55296<<10)+65536)}}},function(t,e,n){var r,i,o,s=n(40),a=n(179),u=n(95),c=n(64),h=n(4),l=h.process,p=h.setImmediate,f=h.clearImmediate,d=h.MessageChannel,m=h.Dispatch,y=0,v={},x=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},g=function(t){x.call(t.data)};p&&f||(p=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++y]=function(){a("function"==typeof t?t:Function(t),e)},r(y),y},f=function(t){delete v[t]},"process"==n(27)(l)?r=function(t){l.nextTick(s(x,t,1))}:m&&m.now?r=function(t){m.now(s(x,t,1))}:d?(i=new d,o=i.port2,i.port1.onmessage=g,r=s(o.postMessage,o,1)):h.addEventListener&&"function"==typeof postMessage&&!h.importScripts?(r=function(t){h.postMessage(t+"","*")},h.addEventListener("message",g,!1)):r="onreadystatechange"in c("script")?function(t){u.appendChild(c("script")).onreadystatechange=function(){u.removeChild(this),x.call(t)}}:function(t){setTimeout(s(x,t,1),0)}),t.exports={set:p,clear:f}},function(t,e,n){var r=n(43),i=Math.max,o=Math.min;t.exports=function(t,e){return t=r(t),t<0?i(t+e,0):o(t,e)}},function(t,e,n){"use strict";var r=n(105)(!0);n(97)(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})},function(t,e,n){"use strict";var r={};t.exports=r},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(111)]})},function(t,e,n){"use strict";var r=n(24);t.exports=new r({include:[n(71)],implicit:[n(249),n(241),n(243),n(242)]})},function(t,e,n){t.exports=n(258)()},function(t,e,n){"use strict";t.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},function(t,e,n){"use strict";function r(t,e,n){this.props=t,this.context=e,this.refs=c,this.updater=n||u}function i(t,e,n){this.props=t,this.context=e,this.refs=c,this.updater=n||u}function o(){}var s=n(48),a=n(35),u=n(117),c=(n(118),n(109));n(15),n(270);r.prototype.isReactComponent={},r.prototype.setState=function(t,e){"object"!=typeof t&&"function"!=typeof t&&null!=t&&s("85"),this.updater.enqueueSetState(this,t),e&&this.updater.enqueueCallback(this,e,"setState")},r.prototype.forceUpdate=function(t){this.updater.enqueueForceUpdate(this),t&&this.updater.enqueueCallback(this,t,"forceUpdate")};o.prototype=r.prototype,i.prototype=new o,i.prototype.constructor=i,a(i.prototype,r.prototype),i.prototype.isPureReactComponent=!0,t.exports={Component:r,PureComponent:i}},function(t,e,n){"use strict";var r={current:null};t.exports=r},function(t,e,n){"use strict";var r="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;t.exports=r},function(t,e,n){"use strict";var r=(n(46),{isMounted:function(t){return!1},enqueueCallback:function(t,e){},enqueueForceUpdate:function(t){},enqueueReplaceState:function(t,e){},enqueueSetState:function(t,e){}});t.exports=r},function(t,e,n){"use strict";var r=!1;t.exports=r},function(t,e,n){"use strict";t.exports=n(263)},function(t,e,n){"use strict";var r=n(125);void 0===function(t){return t&&t.__esModule?t:{default:t}}(r).default.Promise&&n(137),String.prototype.startsWith||n(136)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}var i=n(128),o=r(i),s=n(126),a=r(s),u=n(122),c=r(u),h=[a.default,c.default,function(){return{components:{StandaloneLayout:o.default}}}];t.exports=h},function(t,e,n){"use strict";function r(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e.default=t,e}function i(t){return t&&t.__esModule?t:{default:t}}function o(){return{statePlugins:{spec:{actions:v,selectors:x},configs:{reducers:m.default,actions:l,selectors:f}}}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=o;var s=n(235),a=i(s),u=n(260),c=i(u),h=n(72),l=r(h),p=n(124),f=r(p),d=n(123),m=i(d),y=function(t,e){try{return a.default.safeLoad(t)}catch(t){return e&&e.errActions.newThrownErr(new Error(t)),{}}},v={downloadConfig:function(t){return function(e){return(0,e.fn.fetch)(t)}},getConfigByUrl:function(t,e){return function(n){function r(n){n instanceof Error||n.status>=400?(i.updateLoadingStatus("failedConfig"),i.updateLoadingStatus("failedConfig"),i.updateUrl(""),console.error(n.statusText+" "+t),e(null)):e(y(n.text))}var i=n.specActions;if(t)return i.downloadConfig(t).then(r,r)}}},x={getLocalConfig:function(){return y(c.default)}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r,i=n(77),o=function(t){return t&&t.__esModule?t:{default:t}}(i),s=n(233),a=n(72);e.default=(r={},(0,o.default)(r,a.UPDATE_CONFIGS,function(t,e){return t.merge((0,s.fromJS)(e.payload))}),(0,o.default)(r,a.TOGGLE_CONFIGS,function(t,e){var n=e.payload,r=t.get(n);return t.set(n,!r)}),r)},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});e.get=function(t,e){return t.getIn(Array.isArray(e)?e:[e])}},function(t,e,n){"use strict";var r=n(129),i=function(t){return t&&t.__esModule?t:{default:t}}(r);t.exports=function(){var t={location:{},history:{},open:function(){},close:function(){},File:function(){}};if("undefined"==typeof window)return t;try{t=window;var e=["File","Blob","FormData"],n=!0,r=!1,o=void 0;try{for(var s,a=(0,i.default)(e);!(n=(s=a.next()).done);n=!0){var u=s.value;u in window&&(t[u]=window[u])}}catch(t){r=!0,o=t}finally{try{!n&&a.return&&a.return()}finally{if(r)throw o}}}catch(t){console.error(t)}return t}()},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){return{components:{Topbar:i.default}}};var r=n(127),i=function(t){return t&&t.__esModule?t:{default:t}}(r)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var i=n(74),o=r(i),s=n(75),a=r(s),u=n(76),c=r(u),h=n(79),l=r(h),p=n(78),f=r(p),d=n(119),m=r(d),y=n(112),v=r(y),x=n(273),g=r(x),D=function(t){function e(t,n){(0,a.default)(this,e);var r=(0,l.default)(this,(e.__proto__||(0,o.default)(e)).call(this,t,n));return r.onUrlChange=function(t){var e=t.target.value;r.setState({url:e})},r.loadSpec=function(t){r.props.specActions.updateUrl(t),r.props.specActions.download(t)},r.onUrlSelect=function(t){var e=t.target.value||t.target.href;r.loadSpec(e),r.setSelectedUrl(e),t.preventDefault()},r.downloadUrl=function(t){r.loadSpec(r.state.url),t.preventDefault()},r.setSelectedUrl=function(t){var e=r.props.getConfigs(),n=e.urls||[];n&&n.length&&t&&n.forEach(function(e,n){e.url===t&&r.setState({selectedIndex:n})})},r.onFilterChange=function(t){var e=t.target.value;r.props.layoutActions.updateFilter(e)},r.state={url:t.specSelectors.url(),selectedIndex:0},r}return(0,f.default)(e,t),(0,c.default)(e,[{key:"componentWillReceiveProps",value:function(t){this.setState({url:t.specSelectors.url()})}},{key:"componentWillMount",value:function(){var t=this,e=this.props.getConfigs(),n=e.urls||[];if(n&&n.length){var r=e["urls.primaryName"];r&&n.forEach(function(e,n){e.name===r&&t.setState({selectedIndex:n})})}}},{key:"componentDidMount",value:function(){var t=this.props.getConfigs().urls||[];t&&t.length&&this.loadSpec(t[this.state.selectedIndex].url)}},{key:"render",value:function(){var t=this.props,e=t.getComponent,n=t.specSelectors,r=t.getConfigs,i=e("Button"),o=e("Link"),s="loading"===n.loadingStatus(),a="failed"===n.loadingStatus(),u={};a&&(u.color="red"),s&&(u.color="#aaa");var c=r(),h=c.urls,l=[],p=null;if(h){var f=[];h.forEach(function(t,e){f.push(m.default.createElement("option",{key:e,value:t.url},t.name))}),l.push(m.default.createElement("label",{className:"select-label",htmlFor:"select"},m.default.createElement("span",null,"Select a spec"),m.default.createElement("select",{id:"select",disabled:s,onChange:this.onUrlSelect,value:h[this.state.selectedIndex].url},f)))}else p=this.downloadUrl,l.push(m.default.createElement("input",{className:"download-url-input",type:"text",onChange:this.onUrlChange,value:this.state.url,disabled:s,style:u})),l.push(m.default.createElement(i,{className:"download-url-button",onClick:this.downloadUrl},"Explore"));return m.default.createElement("div",{className:"topbar"},m.default.createElement("div",{className:"wrapper"},m.default.createElement("div",{className:"topbar-wrapper"},m.default.createElement(o,{href:"#"},m.default.createElement("img",{height:"30",width:"30",src:g.default,alt:"Swagger UI"}),m.default.createElement("span",null,"swagger")),m.default.createElement("form",{className:"download-url-wrapper",onSubmit:p},l.map(function(t,e){return(0,d.cloneElement)(t,{key:e})})))))}}]),e}(m.default.Component);D.propTypes={layoutActions:v.default.object.isRequired},e.default=D,D.propTypes={specSelectors:v.default.object.isRequired,specActions:v.default.object.isRequired,getComponent:v.default.func.isRequired,getConfigs:v.default.func.isRequired}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var i=n(74),o=r(i),s=n(75),a=r(s),u=n(76),c=r(u),h=n(79),l=r(h),p=n(78),f=r(p),d=n(119),m=r(d),y=n(112),v=r(y),x=function(t){function e(){return(0,a.default)(this,e),(0,l.default)(this,(e.__proto__||(0,o.default)(e)).apply(this,arguments))}return(0,f.default)(e,t),(0,c.default)(e,[{key:"render",value:function(){var t=this.props,e=t.getComponent,n=t.specSelectors,r=t.errSelectors,i=e("Container"),o=e("Row"),s=e("Col"),a=e("Topbar",!0),u=e("BaseLayout",!0),c=e("onlineValidatorBadge",!0),h=n.loadingStatus(),l=r.lastError(),p=l?l.get("message"):"";return m.default.createElement(i,{className:"swagger-ui"},a?m.default.createElement(a,null):null,"loading"===h&&m.default.createElement("div",{className:"info"},m.default.createElement("div",{className:"loading-container"},m.default.createElement("div",{className:"loading"}))),"failed"===h&&m.default.createElement("div",{className:"info"},m.default.createElement("div",{className:"loading-container"},m.default.createElement("h4",{className:"title"},"Failed to load API definition."),m.default.createElement("p",null,p))),"failedConfig"===h&&m.default.createElement("div",{className:"info",style:{maxWidth:"880px",marginLeft:"auto",marginRight:"auto",textAlign:"center"}},m.default.createElement("div",{className:"loading-container"},m.default.createElement("h4",{className:"title"},"Failed to load remote configuration."),m.default.createElement("p",null,p))),!h||"success"===h&&m.default.createElement(u,null),m.default.createElement(o,null,m.default.createElement(s,null,m.default.createElement(c,null))))}}]),e}(m.default.Component);x.propTypes={errSelectors:v.default.object.isRequired,errActions:v.default.object.isRequired,specActions:v.default.object.isRequired,specSelectors:v.default.object.isRequired,layoutSelectors:v.default.object.isRequired,layoutActions:v.default.object.isRequired,getComponent:v.default.func.isRequired},e.default=x},function(t,e,n){t.exports={default:n(138),__esModule:!0}},function(t,e,n){t.exports={default:n(139),__esModule:!0}},function(t,e,n){t.exports={default:n(142),__esModule:!0}},function(t,e,n){t.exports={default:n(143),__esModule:!0}},function(t,e,n){t.exports={default:n(144),__esModule:!0}},function(t,e,n){"use strict";function r(t){var e=t.length;if(e%4>0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===t[e-2]?2:"="===t[e-1]?1:0}function i(t){return 3*t.length/4-r(t)}function o(t){var e,n,i,o,s,a=t.length;o=r(t),s=new l(3*a/4-o),n=o>0?a-4:a;var u=0;for(e=0;e<n;e+=4)i=h[t.charCodeAt(e)]<<18|h[t.charCodeAt(e+1)]<<12|h[t.charCodeAt(e+2)]<<6|h[t.charCodeAt(e+3)],s[u++]=i>>16&255,s[u++]=i>>8&255,s[u++]=255&i;return 2===o?(i=h[t.charCodeAt(e)]<<2|h[t.charCodeAt(e+1)]>>4,s[u++]=255&i):1===o&&(i=h[t.charCodeAt(e)]<<10|h[t.charCodeAt(e+1)]<<4|h[t.charCodeAt(e+2)]>>2,s[u++]=i>>8&255,s[u++]=255&i),s}function s(t){return c[t>>18&63]+c[t>>12&63]+c[t>>6&63]+c[63&t]}function a(t,e,n){for(var r,i=[],o=e;o<n;o+=3)r=(t[o]<<16)+(t[o+1]<<8)+t[o+2],i.push(s(r));return i.join("")}function u(t){for(var e,n=t.length,r=n%3,i="",o=[],s=0,u=n-r;s<u;s+=16383)o.push(a(t,s,s+16383>u?u:s+16383));return 1===r?(e=t[n-1],i+=c[e>>2],i+=c[e<<4&63],i+="=="):2===r&&(e=(t[n-2]<<8)+t[n-1],i+=c[e>>10],i+=c[e>>4&63],i+=c[e<<2&63],i+="="),o.push(i),o.join("")}e.byteLength=i,e.toByteArray=o,e.fromByteArray=u;for(var c=[],h=[],l="undefined"!=typeof Uint8Array?Uint8Array:Array,p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",f=0,d=p.length;f<d;++f)c[f]=p[f],h[p.charCodeAt(f)]=f;h["-".charCodeAt(0)]=62,h["_".charCodeAt(0)]=63},function(t,e,n){"use strict";(function(t){function r(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(t,e){if(r()<e)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(t=new Uint8Array(e),t.__proto__=o.prototype):(null===t&&(t=new o(e)),t.length=e),t}function o(t,e,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(t,e,n);if("number"==typeof t){if("string"==typeof e)throw new Error("If encoding is specified then the first argument must be a string");return c(this,t)}return s(this,t,e,n)}function s(t,e,n,r){if("number"==typeof e)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&e instanceof ArrayBuffer?p(t,e,n,r):"string"==typeof e?h(t,e,n):f(t,e)}function a(t){if("number"!=typeof t)throw new TypeError('"size" argument must be a number');if(t<0)throw new RangeError('"size" argument must not be negative')}function u(t,e,n,r){return a(e),e<=0?i(t,e):void 0!==n?"string"==typeof r?i(t,e).fill(n,r):i(t,e).fill(n):i(t,e)}function c(t,e){if(a(e),t=i(t,e<0?0:0|d(e)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<e;++n)t[n]=0;return t}function h(t,e,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|y(e,n);t=i(t,r);var s=t.write(e,n);return s!==r&&(t=t.slice(0,s)),t}function l(t,e){var n=e.length<0?0:0|d(e.length);t=i(t,n);for(var r=0;r<n;r+=1)t[r]=255&e[r];return t}function p(t,e,n,r){if(e.byteLength,n<0||e.byteLength<n)throw new RangeError("'offset' is out of bounds");if(e.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return e=void 0===n&&void 0===r?new Uint8Array(e):void 0===r?new Uint8Array(e,n):new Uint8Array(e,n,r),o.TYPED_ARRAY_SUPPORT?(t=e,t.__proto__=o.prototype):t=l(t,e),t}function f(t,e){if(o.isBuffer(e)){var n=0|d(e.length);return t=i(t,n),0===t.length?t:(e.copy(t,0,0,n),t)}if(e){if("undefined"!=typeof ArrayBuffer&&e.buffer instanceof ArrayBuffer||"length"in e)return"number"!=typeof e.length||H(e.length)?i(t,0):l(t,e);if("Buffer"===e.type&&Z(e.data))return l(t,e.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function d(t){if(t>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|t}function m(t){return+t!=t&&(t=0),o.alloc(+t)}function y(t,e){if(o.isBuffer(t))return t.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(t)||t instanceof ArrayBuffer))return t.byteLength;"string"!=typeof t&&(t=""+t);var n=t.length;if(0===n)return 0;for(var r=!1;;)switch(e){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return q(t).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return W(t).length;default:if(r)return q(t).length;e=(""+e).toLowerCase(),r=!0}}function v(t,e,n){var r=!1;if((void 0===e||e<0)&&(e=0),e>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,e>>>=0,n<=e)return"";for(t||(t="utf8");;)switch(t){case"hex":return B(this,e,n);case"utf8":case"utf-8":return F(this,e,n);case"ascii":return I(this,e,n);case"latin1":case"binary":return T(this,e,n);case"base64":return b(this,e,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return M(this,e,n);default:if(r)throw new TypeError("Unknown encoding: "+t);t=(t+"").toLowerCase(),r=!0}}function x(t,e,n){var r=t[e];t[e]=t[n],t[n]=r}function g(t,e,n,r,i){if(0===t.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:t.length-1),n<0&&(n=t.length+n),n>=t.length){if(i)return-1;n=t.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof e&&(e=o.from(e,r)),o.isBuffer(e))return 0===e.length?-1:D(t,e,n,r,i);if("number"==typeof e)return e&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(t,e,n):Uint8Array.prototype.lastIndexOf.call(t,e,n):D(t,[e],n,r,i);throw new TypeError("val must be string, number or Buffer")}function D(t,e,n,r,i){function o(t,e){return 1===s?t[e]:t.readUInt16BE(e*s)}var s=1,a=t.length,u=e.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(t.length<2||e.length<2)return-1;s=2,a/=2,u/=2,n/=2}var c;if(i){var h=-1;for(c=n;c<a;c++)if(o(t,c)===o(e,-1===h?0:c-h)){if(-1===h&&(h=c),c-h+1===u)return h*s}else-1!==h&&(c-=c-h),h=-1}else for(n+u>a&&(n=a-u),c=n;c>=0;c--){for(var l=!0,p=0;p<u;p++)if(o(t,c+p)!==o(e,p)){l=!1;break}if(l)return c}return-1}function E(t,e,n,r){n=Number(n)||0;var i=t.length-n;r?(r=Number(r))>i&&(r=i):r=i;var o=e.length;if(o%2!=0)throw new TypeError("Invalid hex string");r>o/2&&(r=o/2);for(var s=0;s<r;++s){var a=parseInt(e.substr(2*s,2),16);if(isNaN(a))return s;t[n+s]=a}return s}function A(t,e,n,r){return G(q(e,t.length-n),t,n,r)}function S(t,e,n,r){return G(K(e),t,n,r)}function w(t,e,n,r){return S(t,e,n,r)}function C(t,e,n,r){return G(W(e),t,n,r)}function _(t,e,n,r){return G(Y(e,t.length-n),t,n,r)}function b(t,e,n){return 0===e&&n===t.length?V.fromByteArray(t):V.fromByteArray(t.slice(e,n))}function F(t,e,n){n=Math.min(t.length,n);for(var r=[],i=e;i<n;){var o=t[i],s=null,a=o>239?4:o>223?3:o>191?2:1;if(i+a<=n){var u,c,h,l;switch(a){case 1:o<128&&(s=o);break;case 2:u=t[i+1],128==(192&u)&&(l=(31&o)<<6|63&u)>127&&(s=l);break;case 3:u=t[i+1],c=t[i+2],128==(192&u)&&128==(192&c)&&(l=(15&o)<<12|(63&u)<<6|63&c)>2047&&(l<55296||l>57343)&&(s=l);break;case 4:u=t[i+1],c=t[i+2],h=t[i+3],128==(192&u)&&128==(192&c)&&128==(192&h)&&(l=(15&o)<<18|(63&u)<<12|(63&c)<<6|63&h)>65535&&l<1114112&&(s=l)}}null===s?(s=65533,a=1):s>65535&&(s-=65536,r.push(s>>>10&1023|55296),s=56320|1023&s),r.push(s),i+=a}return k(r)}function k(t){var e=t.length;if(e<=Q)return String.fromCharCode.apply(String,t);for(var n="",r=0;r<e;)n+=String.fromCharCode.apply(String,t.slice(r,r+=Q));return n}function I(t,e,n){var r="";n=Math.min(t.length,n);for(var i=e;i<n;++i)r+=String.fromCharCode(127&t[i]);return r}function T(t,e,n){var r="";n=Math.min(t.length,n);for(var i=e;i<n;++i)r+=String.fromCharCode(t[i]);return r}function B(t,e,n){var r=t.length;(!e||e<0)&&(e=0),(!n||n<0||n>r)&&(n=r);for(var i="",o=e;o<n;++o)i+=X(t[o]);return i}function M(t,e,n){for(var r=t.slice(e,n),i="",o=0;o<r.length;o+=2)i+=String.fromCharCode(r[o]+256*r[o+1]);return i}function P(t,e,n){if(t%1!=0||t<0)throw new RangeError("offset is not uint");if(t+e>n)throw new RangeError("Trying to access beyond buffer length")}function N(t,e,n,r,i,s){if(!o.isBuffer(t))throw new TypeError('"buffer" argument must be a Buffer instance');if(e>i||e<s)throw new RangeError('"value" argument is out of bounds');if(n+r>t.length)throw new RangeError("Index out of range")}function O(t,e,n,r){e<0&&(e=65535+e+1);for(var i=0,o=Math.min(t.length-n,2);i<o;++i)t[n+i]=(e&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function R(t,e,n,r){e<0&&(e=4294967295+e+1);for(var i=0,o=Math.min(t.length-n,4);i<o;++i)t[n+i]=e>>>8*(r?i:3-i)&255}function U(t,e,n,r,i,o){if(n+r>t.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function j(t,e,n,r,i){return i||U(t,e,n,4,3.4028234663852886e38,-3.4028234663852886e38),$.write(t,e,n,r,23,4),n+4}function L(t,e,n,r,i){return i||U(t,e,n,8,1.7976931348623157e308,-1.7976931348623157e308),$.write(t,e,n,r,52,8),n+8}function z(t){if(t=J(t).replace(tt,""),t.length<2)return"";for(;t.length%4!=0;)t+="=";return t}function J(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function X(t){return t<16?"0"+t.toString(16):t.toString(16)}function q(t,e){e=e||1/0;for(var n,r=t.length,i=null,o=[],s=0;s<r;++s){if((n=t.charCodeAt(s))>55295&&n<57344){if(!i){if(n>56319){(e-=3)>-1&&o.push(239,191,189);continue}if(s+1===r){(e-=3)>-1&&o.push(239,191,189);continue}i=n;continue}if(n<56320){(e-=3)>-1&&o.push(239,191,189),i=n;continue}n=65536+(i-55296<<10|n-56320)}else i&&(e-=3)>-1&&o.push(239,191,189);if(i=null,n<128){if((e-=1)<0)break;o.push(n)}else if(n<2048){if((e-=2)<0)break;o.push(n>>6|192,63&n|128)}else if(n<65536){if((e-=3)<0)break;o.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((e-=4)<0)break;o.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return o}function K(t){for(var e=[],n=0;n<t.length;++n)e.push(255&t.charCodeAt(n));return e}function Y(t,e){for(var n,r,i,o=[],s=0;s<t.length&&!((e-=2)<0);++s)n=t.charCodeAt(s),r=n>>8,i=n%256,o.push(i),o.push(r);return o}function W(t){return V.toByteArray(z(t))}function G(t,e,n,r){for(var i=0;i<r&&!(i+n>=e.length||i>=t.length);++i)e[i+n]=t[i];return i}function H(t){return t!==t}/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @license  MIT
+ */
+var V=n(134),$=n(232),Z=n(234);e.Buffer=o,e.SlowBuffer=m,e.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==t.TYPED_ARRAY_SUPPORT?t.TYPED_ARRAY_SUPPORT:function(){try{var t=new Uint8Array(1);return t.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===t.foo()&&"function"==typeof t.subarray&&0===t.subarray(1,1).byteLength}catch(t){return!1}}(),e.kMaxLength=r(),o.poolSize=8192,o._augment=function(t){return t.__proto__=o.prototype,t},o.from=function(t,e,n){return s(null,t,e,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(t,e,n){return u(null,t,e,n)},o.allocUnsafe=function(t){return c(null,t)},o.allocUnsafeSlow=function(t){return c(null,t)},o.isBuffer=function(t){return!(null==t||!t._isBuffer)},o.compare=function(t,e){if(!o.isBuffer(t)||!o.isBuffer(e))throw new TypeError("Arguments must be Buffers");if(t===e)return 0;for(var n=t.length,r=e.length,i=0,s=Math.min(n,r);i<s;++i)if(t[i]!==e[i]){n=t[i],r=e[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(t){switch(String(t).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(t,e){if(!Z(t))throw new TypeError('"list" argument must be an Array of Buffers');if(0===t.length)return o.alloc(0);var n;if(void 0===e)for(e=0,n=0;n<t.length;++n)e+=t[n].length;var r=o.allocUnsafe(e),i=0;for(n=0;n<t.length;++n){var s=t[n];if(!o.isBuffer(s))throw new TypeError('"list" argument must be an Array of Buffers');s.copy(r,i),i+=s.length}return r},o.byteLength=y,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var t=this.length;if(t%2!=0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var e=0;e<t;e+=2)x(this,e,e+1);return this},o.prototype.swap32=function(){var t=this.length;if(t%4!=0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var e=0;e<t;e+=4)x(this,e,e+3),x(this,e+1,e+2);return this},o.prototype.swap64=function(){var t=this.length;if(t%8!=0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var e=0;e<t;e+=8)x(this,e,e+7),x(this,e+1,e+6),x(this,e+2,e+5),x(this,e+3,e+4);return this},o.prototype.toString=function(){var t=0|this.length;return 0===t?"":0===arguments.length?F(this,0,t):v.apply(this,arguments)},o.prototype.equals=function(t){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");return this===t||0===o.compare(this,t)},o.prototype.inspect=function(){var t="",n=e.INSPECT_MAX_BYTES;return this.length>0&&(t=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(t+=" ... ")),"<Buffer "+t+">"},o.prototype.compare=function(t,e,n,r,i){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");if(void 0===e&&(e=0),void 0===n&&(n=t?t.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),e<0||n>t.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&e>=n)return 0;if(r>=i)return-1;if(e>=n)return 1;if(e>>>=0,n>>>=0,r>>>=0,i>>>=0,this===t)return 0;for(var s=i-r,a=n-e,u=Math.min(s,a),c=this.slice(r,i),h=t.slice(e,n),l=0;l<u;++l)if(c[l]!==h[l]){s=c[l],a=h[l];break}return s<a?-1:a<s?1:0},o.prototype.includes=function(t,e,n){return-1!==this.indexOf(t,e,n)},o.prototype.indexOf=function(t,e,n){return g(this,t,e,n,!0)},o.prototype.lastIndexOf=function(t,e,n){return g(this,t,e,n,!1)},o.prototype.write=function(t,e,n,r){if(void 0===e)r="utf8",n=this.length,e=0;else if(void 0===n&&"string"==typeof e)r=e,n=this.length,e=0;else{if(!isFinite(e))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");e|=0,isFinite(n)?(n|=0,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-e;if((void 0===n||n>i)&&(n=i),t.length>0&&(n<0||e<0)||e>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return E(this,t,e,n);case"utf8":case"utf-8":return A(this,t,e,n);case"ascii":return S(this,t,e,n);case"latin1":case"binary":return w(this,t,e,n);case"base64":return C(this,t,e,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return _(this,t,e,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Q=4096;o.prototype.slice=function(t,e){var n=this.length;t=~~t,e=void 0===e?n:~~e,t<0?(t+=n)<0&&(t=0):t>n&&(t=n),e<0?(e+=n)<0&&(e=0):e>n&&(e=n),e<t&&(e=t);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(t,e),r.__proto__=o.prototype;else{var i=e-t;r=new o(i,void 0);for(var s=0;s<i;++s)r[s]=this[s+t]}return r},o.prototype.readUIntLE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t],i=1,o=0;++o<e&&(i*=256);)r+=this[t+o]*i;return r},o.prototype.readUIntBE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t+--e],i=1;e>0&&(i*=256);)r+=this[t+--e]*i;return r},o.prototype.readUInt8=function(t,e){return e||P(t,1,this.length),this[t]},o.prototype.readUInt16LE=function(t,e){return e||P(t,2,this.length),this[t]|this[t+1]<<8},o.prototype.readUInt16BE=function(t,e){return e||P(t,2,this.length),this[t]<<8|this[t+1]},o.prototype.readUInt32LE=function(t,e){return e||P(t,4,this.length),(this[t]|this[t+1]<<8|this[t+2]<<16)+16777216*this[t+3]},o.prototype.readUInt32BE=function(t,e){return e||P(t,4,this.length),16777216*this[t]+(this[t+1]<<16|this[t+2]<<8|this[t+3])},o.prototype.readIntLE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=this[t],i=1,o=0;++o<e&&(i*=256);)r+=this[t+o]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*e)),r},o.prototype.readIntBE=function(t,e,n){t|=0,e|=0,n||P(t,e,this.length);for(var r=e,i=1,o=this[t+--r];r>0&&(i*=256);)o+=this[t+--r]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*e)),o},o.prototype.readInt8=function(t,e){return e||P(t,1,this.length),128&this[t]?-1*(255-this[t]+1):this[t]},o.prototype.readInt16LE=function(t,e){e||P(t,2,this.length);var n=this[t]|this[t+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(t,e){e||P(t,2,this.length);var n=this[t+1]|this[t]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(t,e){return e||P(t,4,this.length),this[t]|this[t+1]<<8|this[t+2]<<16|this[t+3]<<24},o.prototype.readInt32BE=function(t,e){return e||P(t,4,this.length),this[t]<<24|this[t+1]<<16|this[t+2]<<8|this[t+3]},o.prototype.readFloatLE=function(t,e){return e||P(t,4,this.length),$.read(this,t,!0,23,4)},o.prototype.readFloatBE=function(t,e){return e||P(t,4,this.length),$.read(this,t,!1,23,4)},o.prototype.readDoubleLE=function(t,e){return e||P(t,8,this.length),$.read(this,t,!0,52,8)},o.prototype.readDoubleBE=function(t,e){return e||P(t,8,this.length),$.read(this,t,!1,52,8)},o.prototype.writeUIntLE=function(t,e,n,r){if(t=+t,e|=0,n|=0,!r){N(this,t,e,n,Math.pow(2,8*n)-1,0)}var i=1,o=0;for(this[e]=255&t;++o<n&&(i*=256);)this[e+o]=t/i&255;return e+n},o.prototype.writeUIntBE=function(t,e,n,r){if(t=+t,e|=0,n|=0,!r){N(this,t,e,n,Math.pow(2,8*n)-1,0)}var i=n-1,o=1;for(this[e+i]=255&t;--i>=0&&(o*=256);)this[e+i]=t/o&255;return e+n},o.prototype.writeUInt8=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,1,255,0),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),this[e]=255&t,e+1},o.prototype.writeUInt16LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):O(this,t,e,!0),e+2},o.prototype.writeUInt16BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):O(this,t,e,!1),e+2},o.prototype.writeUInt32LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e+3]=t>>>24,this[e+2]=t>>>16,this[e+1]=t>>>8,this[e]=255&t):R(this,t,e,!0),e+4},o.prototype.writeUInt32BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeIntLE=function(t,e,n,r){if(t=+t,e|=0,!r){var i=Math.pow(2,8*n-1);N(this,t,e,n,i-1,-i)}var o=0,s=1,a=0;for(this[e]=255&t;++o<n&&(s*=256);)t<0&&0===a&&0!==this[e+o-1]&&(a=1),this[e+o]=(t/s>>0)-a&255;return e+n},o.prototype.writeIntBE=function(t,e,n,r){if(t=+t,e|=0,!r){var i=Math.pow(2,8*n-1);N(this,t,e,n,i-1,-i)}var o=n-1,s=1,a=0;for(this[e+o]=255&t;--o>=0&&(s*=256);)t<0&&0===a&&0!==this[e+o+1]&&(a=1),this[e+o]=(t/s>>0)-a&255;return e+n},o.prototype.writeInt8=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,1,127,-128),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),t<0&&(t=255+t+1),this[e]=255&t,e+1},o.prototype.writeInt16LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):O(this,t,e,!0),e+2},o.prototype.writeInt16BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):O(this,t,e,!1),e+2},o.prototype.writeInt32LE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8,this[e+2]=t>>>16,this[e+3]=t>>>24):R(this,t,e,!0),e+4},o.prototype.writeInt32BE=function(t,e,n){return t=+t,e|=0,n||N(this,t,e,4,2147483647,-2147483648),t<0&&(t=4294967295+t+1),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeFloatLE=function(t,e,n){return j(this,t,e,!0,n)},o.prototype.writeFloatBE=function(t,e,n){return j(this,t,e,!1,n)},o.prototype.writeDoubleLE=function(t,e,n){return L(this,t,e,!0,n)},o.prototype.writeDoubleBE=function(t,e,n){return L(this,t,e,!1,n)},o.prototype.copy=function(t,e,n,r){if(n||(n=0),r||0===r||(r=this.length),e>=t.length&&(e=t.length),e||(e=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===t.length||0===this.length)return 0;if(e<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),t.length-e<r-n&&(r=t.length-e+n);var i,s=r-n;if(this===t&&n<e&&e<r)for(i=s-1;i>=0;--i)t[i+e]=this[i+n];else if(s<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<s;++i)t[i+e]=this[i+n];else Uint8Array.prototype.set.call(t,this.subarray(n,n+s),e);return s},o.prototype.fill=function(t,e,n,r){if("string"==typeof t){if("string"==typeof e?(r=e,e=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===t.length){var i=t.charCodeAt(0);i<256&&(t=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof t&&(t&=255);if(e<0||this.length<e||this.length<n)throw new RangeError("Out of range index");if(n<=e)return this;e>>>=0,n=void 0===n?this.length:n>>>0,t||(t=0);var s;if("number"==typeof t)for(s=e;s<n;++s)this[s]=t;else{var a=o.isBuffer(t)?t:q(new o(t,r).toString()),u=a.length;for(s=0;s<n-e;++s)this[s+e]=a[s%u]}return this};var tt=/[^+\/0-9A-Za-z-_]/g}).call(e,n(274))},function(t,e,n){n(215),n(219),n(226),n(108),n(210),n(211),n(216),n(220),n(222),n(206),n(207),n(208),n(209),n(212),n(213),n(214),n(217),n(218),n(221),n(223),n(224),n(225),n(202),n(203),n(204),n(205),t.exports=n(13).String},function(t,e,n){n(200),n(108),n(229),n(201),n(227),n(228),t.exports=n(13).Promise},function(t,e,n){n(93),n(92),t.exports=n(164)},function(t,e,n){n(166);var r=n(5).Object;t.exports=function(t,e){return r.create(t,e)}},function(t,e,n){n(167);var r=n(5).Object;t.exports=function(t,e,n){return r.defineProperty(t,e,n)}},function(t,e,n){n(168),t.exports=n(5).Object.getPrototypeOf},function(t,e,n){n(169),t.exports=n(5).Object.setPrototypeOf},function(t,e,n){n(171),n(170),n(172),n(173),t.exports=n(5).Symbol},function(t,e,n){n(92),n(93),t.exports=n(62).f("iterator")},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e){t.exports=function(){}},function(t,e,n){var r=n(20),i=n(162),o=n(161);t.exports=function(t){return function(e,n,s){var a,u=r(e),c=i(u.length),h=o(s,c);if(t&&n!=n){for(;c>h;)if((a=u[h++])!=a)return!0}else for(;c>h;h++)if((t||h in u)&&u[h]===n)return t||h||0;return!t&&-1}}},function(t,e,n){var r=n(49),i=n(7)("toStringTag"),o="Arguments"==r(function(){return arguments}()),s=function(t,e){try{return t[e]}catch(t){}};t.exports=function(t){var e,n,a;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=s(e=Object(t),i))?n:o?r(e):"Object"==(a=r(e))&&"function"==typeof e.callee?"Arguments":a}},function(t,e,n){var r=n(54),i=n(87),o=n(55);t.exports=function(t){var e=r(t),n=i.f;if(n)for(var s,a=n(t),u=o.f,c=0;a.length>c;)u.call(t,s=a[c++])&&e.push(s);return e}},function(t,e,n){var r=n(6).document;t.exports=r&&r.documentElement},function(t,e,n){var r=n(49);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e,n){var r=n(49);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){"use strict";var r=n(53),i=n(37),o=n(56),s={};n(18)(s,n(7)("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(s,{next:i(1,n)}),o(t,e+" Iterator")}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){var r=n(38)("meta"),i=n(19),o=n(10),s=n(11).f,a=0,u=Object.isExtensible||function(){return!0},c=!n(26)(function(){return u(Object.preventExtensions({}))}),h=function(t){s(t,r,{value:{i:"O"+ ++a,w:{}}})},l=function(t,e){if(!i(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!o(t,r)){if(!u(t))return"F";if(!e)return"E";h(t)}return t[r].i},p=function(t,e){if(!o(t,r)){if(!u(t))return!0;if(!e)return!1;h(t)}return t[r].w},f=function(t){return c&&d.NEED&&u(t)&&!o(t,r)&&h(t),t},d=t.exports={KEY:r,NEED:!1,fastKey:l,getWeak:p,onFreeze:f}},function(t,e,n){var r=n(11),i=n(16),o=n(54);t.exports=n(9)?Object.defineProperties:function(t,e){i(t);for(var n,s=o(e),a=s.length,u=0;a>u;)r.f(t,n=s[u++],e[n]);return t}},function(t,e,n){var r=n(20),i=n(86).f,o={}.toString,s="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],a=function(t){try{return i(t)}catch(t){return s.slice()}};t.exports.f=function(t){return s&&"[object Window]"==o.call(t)?a(t):i(r(t))}},function(t,e,n){var r=n(17),i=n(5),o=n(26);t.exports=function(t,e){var n=(i.Object||{})[t]||Object[t],s={};s[t]=e(n),r(r.S+r.F*o(function(){n(1)}),"Object",s)}},function(t,e,n){var r=n(19),i=n(16),o=function(t,e){if(i(t),!r(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};t.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(t,e,r){try{r=n(81)(Function.call,n(85).f(Object.prototype,"__proto__").set,2),r(t,[]),e=!(t instanceof Array)}catch(t){e=!0}return function(t,n){return o(t,n),e?t.__proto__=n:r(t,n),t}}({},!1):void 0),check:o}},function(t,e,n){var r=n(59),i=n(50);t.exports=function(t){return function(e,n){var o,s,a=String(i(e)),u=r(n),c=a.length;return u<0||u>=c?t?"":void 0:(o=a.charCodeAt(u),o<55296||o>56319||u+1===c||(s=a.charCodeAt(u+1))<56320||s>57343?t?a.charAt(u):o:t?a.slice(u,u+2):s-56320+(o-55296<<10)+65536)}}},function(t,e,n){var r=n(59),i=Math.max,o=Math.min;t.exports=function(t,e){return t=r(t),t<0?i(t+e,0):o(t,e)}},function(t,e,n){var r=n(59),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){var r=n(148),i=n(7)("iterator"),o=n(36);t.exports=n(5).getIteratorMethod=function(t){if(void 0!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,e,n){var r=n(16),i=n(163);t.exports=n(5).getIterator=function(t){var e=i(t);if("function"!=typeof e)throw TypeError(t+" is not iterable!");return r(e.call(t))}},function(t,e,n){"use strict";var r=n(146),i=n(154),o=n(36),s=n(20);t.exports=n(84)(Array,"Array",function(t,e){this._t=s(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,i(1)):"keys"==e?i(0,n):"values"==e?i(0,t[n]):i(0,[n,t[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,e,n){var r=n(17);r(r.S,"Object",{create:n(53)})},function(t,e,n){var r=n(17);r(r.S+r.F*!n(9),"Object",{defineProperty:n(11).f})},function(t,e,n){var r=n(91),i=n(88);n(158)("getPrototypeOf",function(){return function(t){return i(r(t))}})},function(t,e,n){var r=n(17);r(r.S,"Object",{setPrototypeOf:n(159).set})},function(t,e){},function(t,e,n){"use strict";var r=n(6),i=n(10),o=n(9),s=n(17),a=n(90),u=n(155).KEY,c=n(26),h=n(58),l=n(56),p=n(38),f=n(7),d=n(62),m=n(61),y=n(149),v=n(152),x=n(16),g=n(19),D=n(20),E=n(60),A=n(37),S=n(53),w=n(157),C=n(85),_=n(11),b=n(54),F=C.f,k=_.f,I=w.f,T=r.Symbol,B=r.JSON,M=B&&B.stringify,P=f("_hidden"),N=f("toPrimitive"),O={}.propertyIsEnumerable,R=h("symbol-registry"),U=h("symbols"),j=h("op-symbols"),L=Object.prototype,z="function"==typeof T,J=r.QObject,X=!J||!J.prototype||!J.prototype.findChild,q=o&&c(function(){return 7!=S(k({},"a",{get:function(){return k(this,"a",{value:7}).a}})).a})?function(t,e,n){var r=F(L,e);r&&delete L[e],k(t,e,n),r&&t!==L&&k(L,e,r)}:k,K=function(t){var e=U[t]=S(T.prototype);return e._k=t,e},Y=z&&"symbol"==typeof T.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof T},W=function(t,e,n){return t===L&&W(j,e,n),x(t),e=E(e,!0),x(n),i(U,e)?(n.enumerable?(i(t,P)&&t[P][e]&&(t[P][e]=!1),n=S(n,{enumerable:A(0,!1)})):(i(t,P)||k(t,P,A(1,{})),t[P][e]=!0),q(t,e,n)):k(t,e,n)},G=function(t,e){x(t);for(var n,r=y(e=D(e)),i=0,o=r.length;o>i;)W(t,n=r[i++],e[n]);return t},H=function(t,e){return void 0===e?S(t):G(S(t),e)},V=function(t){var e=O.call(this,t=E(t,!0));return!(this===L&&i(U,t)&&!i(j,t))&&(!(e||!i(this,t)||!i(U,t)||i(this,P)&&this[P][t])||e)},$=function(t,e){if(t=D(t),e=E(e,!0),t!==L||!i(U,e)||i(j,e)){var n=F(t,e);return!n||!i(U,e)||i(t,P)&&t[P][e]||(n.enumerable=!0),n}},Z=function(t){for(var e,n=I(D(t)),r=[],o=0;n.length>o;)i(U,e=n[o++])||e==P||e==u||r.push(e);return r},Q=function(t){for(var e,n=t===L,r=I(n?j:D(t)),o=[],s=0;r.length>s;)!i(U,e=r[s++])||n&&!i(L,e)||o.push(U[e]);return o};z||(T=function(){if(this instanceof T)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===L&&e.call(j,n),i(this,P)&&i(this[P],t)&&(this[P][t]=!1),q(this,t,A(1,n))};return o&&X&&q(L,t,{configurable:!0,set:e}),K(t)},a(T.prototype,"toString",function(){return this._k}),C.f=$,_.f=W,n(86).f=w.f=Z,n(55).f=V,n(87).f=Q,o&&!n(52)&&a(L,"propertyIsEnumerable",V,!0),d.f=function(t){return K(f(t))}),s(s.G+s.W+s.F*!z,{Symbol:T});for(var tt="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),et=0;tt.length>et;)f(tt[et++]);for(var nt=b(f.store),rt=0;nt.length>rt;)m(nt[rt++]);s(s.S+s.F*!z,"Symbol",{for:function(t){return i(R,t+="")?R[t]:R[t]=T(t)},keyFor:function(t){if(!Y(t))throw TypeError(t+" is not a symbol!");for(var e in R)if(R[e]===t)return e},useSetter:function(){X=!0},useSimple:function(){X=!1}}),s(s.S+s.F*!z,"Object",{create:H,defineProperty:W,defineProperties:G,getOwnPropertyDescriptor:$,getOwnPropertyNames:Z,getOwnPropertySymbols:Q}),B&&s(s.S+s.F*(!z||c(function(){var t=T();return"[null]"!=M([t])||"{}"!=M({a:t})||"{}"!=M(Object(t))})),"JSON",{stringify:function(t){for(var e,n,r=[t],i=1;arguments.length>i;)r.push(arguments[i++]);if(n=e=r[1],(g(e)||void 0!==t)&&!Y(t))return v(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!Y(e))return e}),r[1]=e,M.apply(B,r)}}),T.prototype[N]||n(18)(T.prototype,N,T.prototype.valueOf),l(T,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},function(t,e,n){n(61)("asyncIterator")},function(t,e,n){n(61)("observable")},function(t,e,n){var r=n(1)("unscopables"),i=Array.prototype;void 0==i[r]&&n(14)(i,r,{}),t.exports=function(t){i[r][t]=!0}},function(t,e){t.exports=function(t,e,n,r){if(!(t instanceof e)||void 0!==r&&r in t)throw TypeError(n+": incorrect invocation!");return t}},function(t,e,n){var r=n(44),i=n(32),o=n(107);t.exports=function(t){return function(e,n,s){var a,u=r(e),c=i(u.length),h=o(s,c);if(t&&n!=n){for(;c>h;)if((a=u[h++])!=a)return!0}else for(;c>h;h++)if((t||h in u)&&u[h]===n)return t||h||0;return!t&&-1}}},function(t,e,n){var r=n(40),i=n(182),o=n(181),s=n(12),a=n(32),u=n(198),c={},h={},e=t.exports=function(t,e,n,l,p){var f,d,m,y,v=p?function(){return t}:u(t),x=r(n,l,e?2:1),g=0;if("function"!=typeof v)throw TypeError(t+" is not iterable!");if(o(v)){for(f=a(t.length);f>g;g++)if((y=e?x(s(d=t[g])[0],d[1]):x(t[g]))===c||y===h)return y}else for(m=v.call(t);!(d=m.next()).done;)if((y=i(m,x,d.value,e))===c||y===h)return y};e.BREAK=c,e.RETURN=h},function(t,e,n){t.exports=!n(28)&&!n(29)(function(){return 7!=Object.defineProperty(n(64)("div"),"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},function(t,e,n){var r=n(27);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e,n){var r=n(31),i=n(1)("iterator"),o=Array.prototype;t.exports=function(t){return void 0!==t&&(r.Array===t||o[i]===t)}},function(t,e,n){var r=n(12);t.exports=function(t,e,n,i){try{return i?e(r(n)[0],n[1]):e(n)}catch(e){var o=t.return;throw void 0!==o&&r(o.call(t)),e}}},function(t,e,n){"use strict";var r=n(187),i=n(102),o=n(67),s={};n(14)(s,n(1)("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(s,{next:i(1,n)}),o(t,e+" Iterator")}},function(t,e,n){var r=n(1)("iterator"),i=!1;try{var o=[7][r]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(t){}t.exports=function(t,e){if(!e&&!i)return!1;var n=!1;try{var o=[7],s=o[r]();s.next=function(){return{done:n=!0}},o[r]=function(){return s},t(o)}catch(t){}return n}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){var r=n(4),i=n(106).set,o=r.MutationObserver||r.WebKitMutationObserver,s=r.process,a=r.Promise,u="process"==n(27)(s);t.exports=function(){var t,e,n,c=function(){var r,i;for(u&&(r=s.domain)&&r.exit();t;){i=t.fn,t=t.next;try{i()}catch(r){throw t?n():e=void 0,r}}e=void 0,r&&r.enter()};if(u)n=function(){s.nextTick(c)};else if(!o||r.navigator&&r.navigator.standalone)if(a&&a.resolve){var h=a.resolve();n=function(){h.then(c)}}else n=function(){i.call(r,c)};else{var l=!0,p=document.createTextNode("");new o(c).observe(p,{characterData:!0}),n=function(){p.data=l=!l}}return function(r){var i={fn:r,next:void 0};e&&(e.next=i),t||(t=i,n()),e=i}}},function(t,e,n){var r=n(12),i=n(188),o=n(94),s=n(68)("IE_PROTO"),a=function(){},u=function(){var t,e=n(64)("iframe"),r=o.length;for(e.style.display="none",n(95).appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("<script>document.F=Object<\/script>"),t.close(),u=t.F;r--;)delete u.prototype[o[r]];return u()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[s]=t):n=u(),void 0===e?n:i(n,e)}},function(t,e,n){var r=n(42),i=n(12),o=n(99);t.exports=n(28)?Object.defineProperties:function(t,e){i(t);for(var n,s=o(e),a=s.length,u=0;a>u;)r.f(t,n=s[u++],e[n]);return t}},function(t,e,n){var r=n(30),i=n(196),o=n(68)("IE_PROTO"),s=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=i(t),r(t,o)?t[o]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?s:null}},function(t,e,n){var r=n(30),i=n(44),o=n(176)(!1),s=n(68)("IE_PROTO");t.exports=function(t,e){var n,a=i(t),u=0,c=[];for(n in a)n!=s&&r(a,n)&&c.push(n);for(;e.length>u;)r(a,n=e[u++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){var r=n(22);t.exports=function(t,e,n){for(var i in e)r(t,i,e[i],n);return t}},function(t,e,n){"use strict";var r=n(4),i=n(42),o=n(28),s=n(1)("species");t.exports=function(t){var e=r[t];o&&e&&!e[s]&&i.f(e,s,{configurable:!0,get:function(){return this}})}},function(t,e,n){"use strict";var r=n(43),i=n(8);t.exports=function(t){var e=String(i(this)),n="",o=r(t);if(o<0||o==1/0)throw RangeError("Count can't be negative");for(;o>0;(o>>>=1)&&(e+=e))1&o&&(n+=e);return n}},function(t,e,n){var r=n(2),i=n(8),o=n(29),s=n(195),a="["+s+"]",u="​…",c=RegExp("^"+a+a+"*"),h=RegExp(a+a+"*$"),l=function(t,e,n){var i={},a=o(function(){return!!s[t]()||u[t]()!=u}),c=i[t]=a?e(p):s[t];n&&(i[n]=c),r(r.P+r.F*a,"String",i)},p=l.trim=function(t,e){return t=String(i(t)),1&e&&(t=t.replace(c,"")),2&e&&(t=t.replace(h,"")),t};t.exports=l},function(t,e){t.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},function(t,e,n){var r=n(8);t.exports=function(t){return Object(r(t))}},function(t,e,n){var r=n(21);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){var r=n(63),i=n(1)("iterator"),o=n(31);t.exports=n(13).getIteratorMethod=function(t){if(void 0!=t)return t[i]||t["@@iterator"]||o[r(t)]}},function(t,e,n){"use strict";var r=n(174),i=n(185),o=n(31),s=n(44);t.exports=n(97)(Array,"Array",function(t,e){this._t=s(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,i(1)):"keys"==e?i(0,n):"values"==e?i(0,t[n]):i(0,[n,t[n]])},"values"),o.Arguments=o.Array,r("keys"),r("values"),r("entries")},function(t,e,n){"use strict";var r=n(63),i={};i[n(1)("toStringTag")]="z",i+""!="[object z]"&&n(22)(Object.prototype,"toString",function(){return"[object "+r(this)+"]"},!0)},function(t,e,n){"use strict";var r,i,o,s,a=n(98),u=n(4),c=n(40),h=n(63),l=n(2),p=n(21),f=n(39),d=n(175),m=n(177),y=n(104),v=n(106).set,x=n(186)(),g=n(66),D=n(100),E=n(101),A=u.TypeError,S=u.process,w=u.Promise,C="process"==h(S),_=function(){},b=i=g.f,F=!!function(){try{var t=w.resolve(1),e=(t.constructor={})[n(1)("species")]=function(t){t(_,_)};return(C||"function"==typeof PromiseRejectionEvent)&&t.then(_)instanceof e}catch(t){}}(),k=function(t){var e;return!(!p(t)||"function"!=typeof(e=t.then))&&e},I=function(t,e){if(!t._n){t._n=!0;var n=t._c;x(function(){for(var r=t._v,i=1==t._s,o=0;n.length>o;)!function(e){var n,o,s=i?e.ok:e.fail,a=e.resolve,u=e.reject,c=e.domain;try{s?(i||(2==t._h&&M(t),t._h=1),!0===s?n=r:(c&&c.enter(),n=s(r),c&&c.exit()),n===e.promise?u(A("Promise-chain cycle")):(o=k(n))?o.call(n,a,u):a(n)):u(r)}catch(t){u(t)}}(n[o++]);t._c=[],t._n=!1,e&&!t._h&&T(t)})}},T=function(t){v.call(u,function(){var e,n,r,i=t._v,o=B(t);if(o&&(e=D(function(){C?S.emit("unhandledRejection",i,t):(n=u.onunhandledrejection)?n({promise:t,reason:i}):(r=u.console)&&r.error&&r.error("Unhandled promise rejection",i)}),t._h=C||B(t)?2:1),t._a=void 0,o&&e.e)throw e.v})},B=function(t){return 1!==t._h&&0===(t._a||t._c).length},M=function(t){v.call(u,function(){var e;C?S.emit("rejectionHandled",t):(e=u.onrejectionhandled)&&e({promise:t,reason:t._v})})},P=function(t){var e=this;e._d||(e._d=!0,e=e._w||e,e._v=t,e._s=2,e._a||(e._a=e._c.slice()),I(e,!0))},N=function(t){var e,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===t)throw A("Promise can't be resolved itself");(e=k(t))?x(function(){var r={_w:n,_d:!1};try{e.call(t,c(N,r,1),c(P,r,1))}catch(t){P.call(r,t)}}):(n._v=t,n._s=1,I(n,!1))}catch(t){P.call({_w:n,_d:!1},t)}}};F||(w=function(t){d(this,w,"Promise","_h"),f(t),r.call(this);try{t(c(N,this,1),c(P,this,1))}catch(t){P.call(this,t)}},r=function(t){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1},r.prototype=n(191)(w.prototype,{then:function(t,e){var n=b(y(this,w));return n.ok="function"!=typeof t||t,n.fail="function"==typeof e&&e,n.domain=C?S.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&I(this,!1),n.promise},catch:function(t){return this.then(void 0,t)}}),o=function(){var t=new r;this.promise=t,this.resolve=c(N,t,1),this.reject=c(P,t,1)},g.f=b=function(t){return t===w||t===s?new o(t):i(t)}),l(l.G+l.W+l.F*!F,{Promise:w}),n(67)(w,"Promise"),n(192)("Promise"),s=n(13).Promise,l(l.S+l.F*!F,"Promise",{reject:function(t){var e=b(this);return(0,e.reject)(t),e.promise}}),l(l.S+l.F*(a||!F),"Promise",{resolve:function(t){return E(a&&this===s?w:this,t)}}),l(l.S+l.F*!(F&&n(184)(function(t){w.all(t).catch(_)})),"Promise",{all:function(t){var e=this,n=b(e),r=n.resolve,i=n.reject,o=D(function(){var n=[],o=0,s=1;m(t,!1,function(t){var a=o++,u=!1;n.push(void 0),s++,e.resolve(t).then(function(t){u||(u=!0,n[a]=t,--s||r(n))},i)}),--s||r(n)});return o.e&&i(o.v),n.promise},race:function(t){var e=this,n=b(e),r=n.reject,i=D(function(){m(t,!1,function(t){e.resolve(t).then(n.resolve,r)})});return i.e&&r(i.v),n.promise}})},function(t,e,n){n(41)("match",1,function(t,e,n){return[function(n){"use strict";var r=t(this),i=void 0==n?void 0:n[e];return void 0!==i?i.call(n,r):new RegExp(n)[e](String(r))},n]})},function(t,e,n){n(41)("replace",2,function(t,e,n){return[function(r,i){"use strict";var o=t(this),s=void 0==r?void 0:r[e];return void 0!==s?s.call(r,o,i):n.call(String(o),r,i)},n]})},function(t,e,n){n(41)("search",1,function(t,e,n){return[function(n){"use strict";var r=t(this),i=void 0==n?void 0:n[e];return void 0!==i?i.call(n,r):new RegExp(n)[e](String(r))},n]})},function(t,e,n){n(41)("split",2,function(t,e,r){"use strict";var i=n(96),o=r,s=[].push,a="length";if("c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[a]||2!="ab".split(/(?:ab)*/)[a]||4!=".".split(/(.?)(.?)/)[a]||".".split(/()()/)[a]>1||"".split(/.?/)[a]){var u=void 0===/()??/.exec("")[1];r=function(t,e){var n=String(this);if(void 0===t&&0===e)return[];if(!i(t))return o.call(n,t,e);var r,c,h,l,p,f=[],d=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),m=0,y=void 0===e?4294967295:e>>>0,v=new RegExp(t.source,d+"g");for(u||(r=new RegExp("^"+v.source+"$(?!\\s)",d));(c=v.exec(n))&&!((h=c.index+c[0][a])>m&&(f.push(n.slice(m,c.index)),!u&&c[a]>1&&c[0].replace(r,function(){for(p=1;p<arguments[a]-2;p++)void 0===arguments[p]&&(c[p]=void 0)}),c[a]>1&&c.index<n[a]&&s.apply(f,c.slice(1)),l=c[0][a],m=h,f[a]>=y));)v.lastIndex===c.index&&v.lastIndex++;return m===n[a]?!l&&v.test("")||f.push(""):f.push(n.slice(m)),f[a]>y?f.slice(0,y):f}}else"0".split(void 0,0)[a]&&(r=function(t,e){return void 0===t&&0===e?[]:o.call(this,t,e)});return[function(n,i){var o=t(this),s=void 0==n?void 0:n[e];return void 0!==s?s.call(n,o,i):r.call(String(o),n,i)},r]})},function(t,e,n){"use strict";n(3)("anchor",function(t){return function(e){return t(this,"a","name",e)}})},function(t,e,n){"use strict";n(3)("big",function(t){return function(){return t(this,"big","","")}})},function(t,e,n){"use strict";n(3)("blink",function(t){return function(){return t(this,"blink","","")}})},function(t,e,n){"use strict";n(3)("bold",function(t){return function(){return t(this,"b","","")}})},function(t,e,n){"use strict";var r=n(2),i=n(105)(!1);r(r.P,"String",{codePointAt:function(t){return i(this,t)}})},function(t,e,n){"use strict";var r=n(2),i=n(32),o=n(69),s="".endsWith;r(r.P+r.F*n(65)("endsWith"),"String",{endsWith:function(t){var e=o(this,t,"endsWith"),n=arguments.length>1?arguments[1]:void 0,r=i(e.length),a=void 0===n?r:Math.min(i(n),r),u=String(t);return s?s.call(e,u,a):e.slice(a-u.length,a)===u}})},function(t,e,n){"use strict";n(3)("fixed",function(t){return function(){return t(this,"tt","","")}})},function(t,e,n){"use strict";n(3)("fontcolor",function(t){return function(e){return t(this,"font","color",e)}})},function(t,e,n){"use strict";n(3)("fontsize",function(t){return function(e){return t(this,"font","size",e)}})},function(t,e,n){var r=n(2),i=n(107),o=String.fromCharCode,s=String.fromCodePoint;r(r.S+r.F*(!!s&&1!=s.length),"String",{fromCodePoint:function(t){for(var e,n=[],r=arguments.length,s=0;r>s;){if(e=+arguments[s++],i(e,1114111)!==e)throw RangeError(e+" is not a valid code point");n.push(e<65536?o(e):o(55296+((e-=65536)>>10),e%1024+56320))}return n.join("")}})},function(t,e,n){"use strict";var r=n(2),i=n(69);r(r.P+r.F*n(65)("includes"),"String",{includes:function(t){return!!~i(this,t,"includes").indexOf(t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){"use strict";n(3)("italics",function(t){return function(){return t(this,"i","","")}})},function(t,e,n){"use strict";n(3)("link",function(t){return function(e){return t(this,"a","href",e)}})},function(t,e,n){var r=n(2),i=n(44),o=n(32);r(r.S,"String",{raw:function(t){for(var e=i(t.raw),n=o(e.length),r=arguments.length,s=[],a=0;n>a;)s.push(String(e[a++])),a<r&&s.push(String(arguments[a]));return s.join("")}})},function(t,e,n){var r=n(2);r(r.P,"String",{repeat:n(193)})},function(t,e,n){"use strict";n(3)("small",function(t){return function(){return t(this,"small","","")}})},function(t,e,n){"use strict";var r=n(2),i=n(32),o=n(69),s="".startsWith;r(r.P+r.F*n(65)("startsWith"),"String",{startsWith:function(t){var e=o(this,t,"startsWith"),n=i(Math.min(arguments.length>1?arguments[1]:void 0,e.length)),r=String(t);return s?s.call(e,r,n):e.slice(n,n+r.length)===r}})},function(t,e,n){"use strict";n(3)("strike",function(t){return function(){return t(this,"strike","","")}})},function(t,e,n){"use strict";n(3)("sub",function(t){return function(){return t(this,"sub","","")}})},function(t,e,n){"use strict";n(3)("sup",function(t){return function(){return t(this,"sup","","")}})},function(t,e,n){"use strict";n(194)("trim",function(t){return function(){return t(this,3)}})},function(t,e,n){"use strict";var r=n(2),i=n(13),o=n(4),s=n(104),a=n(101);r(r.P+r.R,"Promise",{finally:function(t){var e=s(this,i.Promise||o.Promise),n="function"==typeof t;return this.then(n?function(n){return a(e,t()).then(function(){return n})}:t,n?function(n){return a(e,t()).then(function(){throw n})}:t)}})},function(t,e,n){"use strict";var r=n(2),i=n(66),o=n(100);r(r.S,"Promise",{try:function(t){var e=i.f(this),n=o(t);return(n.e?e.reject:e.resolve)(n.v),e.promise}})},function(t,e,n){for(var r=n(199),i=n(99),o=n(22),s=n(4),a=n(14),u=n(31),c=n(1),h=c("iterator"),l=c("toStringTag"),p=u.Array,f={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},d=i(f),m=0;m<d.length;m++){var y,v=d[m],x=f[v],g=s[v],D=g&&g.prototype;if(D&&(D[h]||a(D,h,p),D[l]||a(D,l,v),u[v]=p,x))for(y in r)D[y]||o(D,y,r[y],!0)}},function(t,e,n){"use strict";function r(t){return t}function i(t,e,n){function i(t,e){var n=x.hasOwnProperty(e)?x[e]:null;A.hasOwnProperty(e)&&a("OVERRIDE_BASE"===n,"ReactClassInterface: You are attempting to override `%s` from your class specification. Ensure that your method names do not overlap with React methods.",e),t&&a("DEFINE_MANY"===n||"DEFINE_MANY_MERGED"===n,"ReactClassInterface: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",e)}function c(t,n){if(n){a("function"!=typeof n,"ReactClass: You're attempting to use a component class or function as a mixin. Instead, just use a regular object."),a(!e(n),"ReactClass: You're attempting to use a component as a mixin. Instead, just use a regular object.");var r=t.prototype,o=r.__reactAutoBindPairs;n.hasOwnProperty(u)&&g.mixins(t,n.mixins);for(var s in n)if(n.hasOwnProperty(s)&&s!==u){var c=n[s],h=r.hasOwnProperty(s);if(i(h,s),g.hasOwnProperty(s))g[s](t,c);else{var l=x.hasOwnProperty(s),d="function"==typeof c,m=d&&!l&&!h&&!1!==n.autobind;if(m)o.push(s,c),r[s]=c;else if(h){var y=x[s];a(l&&("DEFINE_MANY_MERGED"===y||"DEFINE_MANY"===y),"ReactClass: Unexpected spec policy %s for key %s when mixing in component specs.",y,s),"DEFINE_MANY_MERGED"===y?r[s]=p(r[s],c):"DEFINE_MANY"===y&&(r[s]=f(r[s],c))}else r[s]=c}}}else;}function h(t,e){if(e)for(var n in e){var r=e[n];if(e.hasOwnProperty(n)){var i=n in g;a(!i,'ReactClass: You are attempting to define a reserved property, `%s`, that shouldn\'t be on the "statics" key. Define it as an instance property instead; it will still be accessible on the constructor.',n);var o=n in t;a(!o,"ReactClass: You are attempting to define `%s` on your component more than once. This conflict may be due to a mixin.",n),t[n]=r}}}function l(t,e){a(t&&e&&"object"==typeof t&&"object"==typeof e,"mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.");for(var n in e)e.hasOwnProperty(n)&&(a(void 0===t[n],"mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the same key: `%s`. This conflict may be due to a mixin; in particular, this may be caused by two getInitialState() or getDefaultProps() methods returning objects with clashing keys.",n),t[n]=e[n]);return t}function p(t,e){return function(){var n=t.apply(this,arguments),r=e.apply(this,arguments);if(null==n)return r;if(null==r)return n;var i={};return l(i,n),l(i,r),i}}function f(t,e){return function(){t.apply(this,arguments),e.apply(this,arguments)}}function d(t,e){var n=e.bind(t);return n}function m(t){for(var e=t.__reactAutoBindPairs,n=0;n<e.length;n+=2){var r=e[n],i=e[n+1];t[r]=d(t,i)}}function y(t){var e=r(function(t,r,i){this.__reactAutoBindPairs.length&&m(this),this.props=t,this.context=r,this.refs=s,this.updater=i||n,this.state=null;var o=this.getInitialState?this.getInitialState():null;a("object"==typeof o&&!Array.isArray(o),"%s.getInitialState(): must return an object or null",e.displayName||"ReactCompositeComponent"),this.state=o});e.prototype=new S,e.prototype.constructor=e,e.prototype.__reactAutoBindPairs=[],v.forEach(c.bind(null,e)),c(e,D),c(e,t),c(e,E),e.getDefaultProps&&(e.defaultProps=e.getDefaultProps()),a(e.prototype.render,"createClass(...): Class specification must implement a `render` method.");for(var i in x)e.prototype[i]||(e.prototype[i]=null);return e}var v=[],x={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},g={displayName:function(t,e){t.displayName=e},mixins:function(t,e){if(e)for(var n=0;n<e.length;n++)c(t,e[n])},childContextTypes:function(t,e){t.childContextTypes=o({},t.childContextTypes,e)},contextTypes:function(t,e){t.contextTypes=o({},t.contextTypes,e)},getDefaultProps:function(t,e){t.getDefaultProps?t.getDefaultProps=p(t.getDefaultProps,e):t.getDefaultProps=e},propTypes:function(t,e){t.propTypes=o({},t.propTypes,e)},statics:function(t,e){h(t,e)},autobind:function(){}},D={componentDidMount:function(){this.__isMounted=!0}},E={componentWillUnmount:function(){this.__isMounted=!1}},A={replaceState:function(t,e){this.updater.enqueueReplaceState(this,t,e)},isMounted:function(){return!!this.__isMounted}},S=function(){};return o(S.prototype,t.prototype,A),y}var o=n(35),s=n(109),a=n(15),u="mixins";t.exports=i},function(t,e,n){!function(e,n){t.exports=n()}(0,function(){return function(t){function e(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return t[r].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){"use strict";function r(t,e,n){var r=null,i=function(t,e){n&&n(t,e),r&&r.visit(t,e)},o="function"==typeof n?i:null,s=!1;if(e){s="boolean"==typeof e.comment&&e.comment;var h="boolean"==typeof e.attachComment&&e.attachComment;(s||h)&&(r=new a.CommentHandler,r.attach=h,e.comment=!0,o=i)}var l=!1;e&&"string"==typeof e.sourceType&&(l="module"===e.sourceType);var p;p=e&&"boolean"==typeof e.jsx&&e.jsx?new u.JSXParser(t,e,o):new c.Parser(t,e,o);var f=l?p.parseModule():p.parseScript(),d=f;return s&&r&&(d.comments=r.comments),p.config.tokens&&(d.tokens=p.tokens),p.config.tolerant&&(d.errors=p.errorHandler.errors),d}function i(t,e,n){var i=e||{};return i.sourceType="module",r(t,i,n)}function o(t,e,n){var i=e||{};return i.sourceType="script",r(t,i,n)}function s(t,e,n){var r,i=new h.Tokenizer(t,e);r=[];try{for(;;){var o=i.getNextToken();if(!o)break;n&&(o=n(o)),r.push(o)}}catch(t){i.errorHandler.tolerate(t)}return i.errorHandler.tolerant&&(r.errors=i.errors()),r}Object.defineProperty(e,"__esModule",{value:!0});var a=n(1),u=n(3),c=n(8),h=n(15);e.parse=r,e.parseModule=i,e.parseScript=o,e.tokenize=s;var l=n(2);e.Syntax=l.Syntax,e.version="4.0.0"},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),i=function(){function t(){this.attach=!1,this.comments=[],this.stack=[],this.leading=[],this.trailing=[]}return t.prototype.insertInnerComments=function(t,e){if(t.type===r.Syntax.BlockStatement&&0===t.body.length){for(var n=[],i=this.leading.length-1;i>=0;--i){var o=this.leading[i];e.end.offset>=o.start&&(n.unshift(o.comment),this.leading.splice(i,1),this.trailing.splice(i,1))}n.length&&(t.innerComments=n)}},t.prototype.findTrailingComments=function(t){var e=[];if(this.trailing.length>0){for(var n=this.trailing.length-1;n>=0;--n){var r=this.trailing[n];r.start>=t.end.offset&&e.unshift(r.comment)}return this.trailing.length=0,e}var i=this.stack[this.stack.length-1];if(i&&i.node.trailingComments){var o=i.node.trailingComments[0];o&&o.range[0]>=t.end.offset&&(e=i.node.trailingComments,delete i.node.trailingComments)}return e},t.prototype.findLeadingComments=function(t){for(var e,n=[];this.stack.length>0;){var r=this.stack[this.stack.length-1];if(!(r&&r.start>=t.start.offset))break;e=r.node,this.stack.pop()}if(e){for(var i=e.leadingComments?e.leadingComments.length:0,o=i-1;o>=0;--o){var s=e.leadingComments[o];s.range[1]<=t.start.offset&&(n.unshift(s),e.leadingComments.splice(o,1))}return e.leadingComments&&0===e.leadingComments.length&&delete e.leadingComments,n}for(var o=this.leading.length-1;o>=0;--o){var r=this.leading[o];r.start<=t.start.offset&&(n.unshift(r.comment),this.leading.splice(o,1))}return n},t.prototype.visitNode=function(t,e){if(!(t.type===r.Syntax.Program&&t.body.length>0)){this.insertInnerComments(t,e);var n=this.findTrailingComments(e),i=this.findLeadingComments(e);i.length>0&&(t.leadingComments=i),n.length>0&&(t.trailingComments=n),this.stack.push({node:t,start:e.start.offset})}},t.prototype.visitComment=function(t,e){var n="L"===t.type[0]?"Line":"Block",r={type:n,value:t.value};if(t.range&&(r.range=t.range),t.loc&&(r.loc=t.loc),this.comments.push(r),this.attach){var i={comment:{type:n,value:t.value,range:[e.start.offset,e.end.offset]},start:e.start.offset};t.loc&&(i.comment.loc=t.loc),t.type=n,this.leading.push(i),this.trailing.push(i)}},t.prototype.visit=function(t,e){"LineComment"===t.type?this.visitComment(t,e):"BlockComment"===t.type?this.visitComment(t,e):this.attach&&this.visitNode(t,e)},t}();e.CommentHandler=i},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Syntax={AssignmentExpression:"AssignmentExpression",AssignmentPattern:"AssignmentPattern",ArrayExpression:"ArrayExpression",ArrayPattern:"ArrayPattern",ArrowFunctionExpression:"ArrowFunctionExpression",AwaitExpression:"AwaitExpression",BlockStatement:"BlockStatement",BinaryExpression:"BinaryExpression",BreakStatement:"BreakStatement",CallExpression:"CallExpression",CatchClause:"CatchClause",ClassBody:"ClassBody",ClassDeclaration:"ClassDeclaration",ClassExpression:"ClassExpression",ConditionalExpression:"ConditionalExpression",ContinueStatement:"ContinueStatement",DoWhileStatement:"DoWhileStatement",DebuggerStatement:"DebuggerStatement",EmptyStatement:"EmptyStatement",ExportAllDeclaration:"ExportAllDeclaration",ExportDefaultDeclaration:"ExportDefaultDeclaration",ExportNamedDeclaration:"ExportNamedDeclaration",ExportSpecifier:"ExportSpecifier",ExpressionStatement:"ExpressionStatement",ForStatement:"ForStatement",ForOfStatement:"ForOfStatement",ForInStatement:"ForInStatement",FunctionDeclaration:"FunctionDeclaration",FunctionExpression:"FunctionExpression",Identifier:"Identifier",IfStatement:"IfStatement",ImportDeclaration:"ImportDeclaration",ImportDefaultSpecifier:"ImportDefaultSpecifier",ImportNamespaceSpecifier:"ImportNamespaceSpecifier",ImportSpecifier:"ImportSpecifier",Literal:"Literal",LabeledStatement:"LabeledStatement",LogicalExpression:"LogicalExpression",MemberExpression:"MemberExpression",MetaProperty:"MetaProperty",MethodDefinition:"MethodDefinition",NewExpression:"NewExpression",ObjectExpression:"ObjectExpression",ObjectPattern:"ObjectPattern",Program:"Program",Property:"Property",RestElement:"RestElement",ReturnStatement:"ReturnStatement",SequenceExpression:"SequenceExpression",SpreadElement:"SpreadElement",Super:"Super",SwitchCase:"SwitchCase",SwitchStatement:"SwitchStatement",TaggedTemplateExpression:"TaggedTemplateExpression",TemplateElement:"TemplateElement",TemplateLiteral:"TemplateLiteral",ThisExpression:"ThisExpression",ThrowStatement:"ThrowStatement",TryStatement:"TryStatement",UnaryExpression:"UnaryExpression",UpdateExpression:"UpdateExpression",VariableDeclaration:"VariableDeclaration",VariableDeclarator:"VariableDeclarator",WhileStatement:"WhileStatement",WithStatement:"WithStatement",YieldExpression:"YieldExpression"}},function(t,e,n){"use strict";function r(t){var e;switch(t.type){case a.JSXSyntax.JSXIdentifier:e=t.name;break;case a.JSXSyntax.JSXNamespacedName:var n=t;e=r(n.namespace)+":"+r(n.name);break;case a.JSXSyntax.JSXMemberExpression:var i=t;e=r(i.object)+"."+r(i.property)}return e}var i=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(4),s=n(5),a=n(6),u=n(7),c=n(8),h=n(13),l=n(14);h.TokenName[100]="JSXIdentifier",h.TokenName[101]="JSXText";var p=function(t){function e(e,n,r){return t.call(this,e,n,r)||this}return i(e,t),e.prototype.parsePrimaryExpression=function(){return this.match("<")?this.parseJSXRoot():t.prototype.parsePrimaryExpression.call(this)},e.prototype.startJSX=function(){this.scanner.index=this.startMarker.index,this.scanner.lineNumber=this.startMarker.line,this.scanner.lineStart=this.startMarker.index-this.startMarker.column},e.prototype.finishJSX=function(){this.nextToken()},e.prototype.reenterJSX=function(){this.startJSX(),this.expectJSX("}"),this.config.tokens&&this.tokens.pop()},e.prototype.createJSXNode=function(){return this.collectComments(),{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},e.prototype.createJSXChildNode=function(){return{index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}},e.prototype.scanXHTMLEntity=function(t){for(var e="&",n=!0,r=!1,i=!1,s=!1;!this.scanner.eof()&&n&&!r;){var a=this.scanner.source[this.scanner.index];if(a===t)break;if(r=";"===a,e+=a,++this.scanner.index,!r)switch(e.length){case 2:i="#"===a;break;case 3:i&&(s="x"===a,n=s||o.Character.isDecimalDigit(a.charCodeAt(0)),i=i&&!s);break;default:n=n&&!(i&&!o.Character.isDecimalDigit(a.charCodeAt(0))),n=n&&!(s&&!o.Character.isHexDigit(a.charCodeAt(0)))}}if(n&&r&&e.length>2){var u=e.substr(1,e.length-2);i&&u.length>1?e=String.fromCharCode(parseInt(u.substr(1),10)):s&&u.length>2?e=String.fromCharCode(parseInt("0"+u.substr(1),16)):i||s||!l.XHTMLEntities[u]||(e=l.XHTMLEntities[u])}return e},e.prototype.lexJSX=function(){var t=this.scanner.source.charCodeAt(this.scanner.index);if(60===t||62===t||47===t||58===t||61===t||123===t||125===t){var e=this.scanner.source[this.scanner.index++];return{type:7,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index-1,end:this.scanner.index}}if(34===t||39===t){for(var n=this.scanner.index,r=this.scanner.source[this.scanner.index++],i="";!this.scanner.eof();){var s=this.scanner.source[this.scanner.index++];if(s===r)break;i+="&"===s?this.scanXHTMLEntity(r):s}return{type:8,value:i,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(46===t){var a=this.scanner.source.charCodeAt(this.scanner.index+1),u=this.scanner.source.charCodeAt(this.scanner.index+2),e=46===a&&46===u?"...":".",n=this.scanner.index;return this.scanner.index+=e.length,{type:7,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}if(96===t)return{type:10,value:"",lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:this.scanner.index,end:this.scanner.index};if(o.Character.isIdentifierStart(t)&&92!==t){var n=this.scanner.index;for(++this.scanner.index;!this.scanner.eof();){var s=this.scanner.source.charCodeAt(this.scanner.index);if(o.Character.isIdentifierPart(s)&&92!==s)++this.scanner.index;else{if(45!==s)break;++this.scanner.index}}return{type:100,value:this.scanner.source.slice(n,this.scanner.index),lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:n,end:this.scanner.index}}return this.scanner.lex()},e.prototype.nextJSXToken=function(){this.collectComments(),this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;var t=this.lexJSX();return this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.config.tokens&&this.tokens.push(this.convertToken(t)),t},e.prototype.nextJSXText=function(){this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart;for(var t=this.scanner.index,e="";!this.scanner.eof();){var n=this.scanner.source[this.scanner.index];if("{"===n||"<"===n)break;++this.scanner.index,e+=n,o.Character.isLineTerminator(n.charCodeAt(0))&&(++this.scanner.lineNumber,"\r"===n&&"\n"===this.scanner.source[this.scanner.index]&&++this.scanner.index,this.scanner.lineStart=this.scanner.index)}this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart;var r={type:101,value:e,lineNumber:this.scanner.lineNumber,lineStart:this.scanner.lineStart,start:t,end:this.scanner.index};return e.length>0&&this.config.tokens&&this.tokens.push(this.convertToken(r)),r},e.prototype.peekJSXToken=function(){var t=this.scanner.saveState();this.scanner.scanComments();var e=this.lexJSX();return this.scanner.restoreState(t),e},e.prototype.expectJSX=function(t){var e=this.nextJSXToken();7===e.type&&e.value===t||this.throwUnexpectedToken(e)},e.prototype.matchJSX=function(t){var e=this.peekJSXToken();return 7===e.type&&e.value===t},e.prototype.parseJSXIdentifier=function(){var t=this.createJSXNode(),e=this.nextJSXToken();return 100!==e.type&&this.throwUnexpectedToken(e),this.finalize(t,new s.JSXIdentifier(e.value))},e.prototype.parseJSXElementName=function(){var t=this.createJSXNode(),e=this.parseJSXIdentifier();if(this.matchJSX(":")){var n=e;this.expectJSX(":");var r=this.parseJSXIdentifier();e=this.finalize(t,new s.JSXNamespacedName(n,r))}else if(this.matchJSX("."))for(;this.matchJSX(".");){var i=e;this.expectJSX(".");var o=this.parseJSXIdentifier();e=this.finalize(t,new s.JSXMemberExpression(i,o))}return e},e.prototype.parseJSXAttributeName=function(){var t,e=this.createJSXNode(),n=this.parseJSXIdentifier();if(this.matchJSX(":")){var r=n;this.expectJSX(":");var i=this.parseJSXIdentifier();t=this.finalize(e,new s.JSXNamespacedName(r,i))}else t=n;return t},e.prototype.parseJSXStringLiteralAttribute=function(){var t=this.createJSXNode(),e=this.nextJSXToken();8!==e.type&&this.throwUnexpectedToken(e);var n=this.getTokenRaw(e);return this.finalize(t,new u.Literal(e.value,n))},e.prototype.parseJSXExpressionAttribute=function(){var t=this.createJSXNode();this.expectJSX("{"),this.finishJSX(),this.match("}")&&this.tolerateError("JSX attributes must only be assigned a non-empty expression");var e=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(t,new s.JSXExpressionContainer(e))},e.prototype.parseJSXAttributeValue=function(){return this.matchJSX("{")?this.parseJSXExpressionAttribute():this.matchJSX("<")?this.parseJSXElement():this.parseJSXStringLiteralAttribute()},e.prototype.parseJSXNameValueAttribute=function(){var t=this.createJSXNode(),e=this.parseJSXAttributeName(),n=null;return this.matchJSX("=")&&(this.expectJSX("="),n=this.parseJSXAttributeValue()),this.finalize(t,new s.JSXAttribute(e,n))},e.prototype.parseJSXSpreadAttribute=function(){var t=this.createJSXNode();this.expectJSX("{"),this.expectJSX("..."),this.finishJSX();var e=this.parseAssignmentExpression();return this.reenterJSX(),this.finalize(t,new s.JSXSpreadAttribute(e))},e.prototype.parseJSXAttributes=function(){for(var t=[];!this.matchJSX("/")&&!this.matchJSX(">");){var e=this.matchJSX("{")?this.parseJSXSpreadAttribute():this.parseJSXNameValueAttribute();t.push(e)}return t},e.prototype.parseJSXOpeningElement=function(){var t=this.createJSXNode();this.expectJSX("<");var e=this.parseJSXElementName(),n=this.parseJSXAttributes(),r=this.matchJSX("/");return r&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(t,new s.JSXOpeningElement(e,r,n))},e.prototype.parseJSXBoundaryElement=function(){var t=this.createJSXNode();if(this.expectJSX("<"),this.matchJSX("/")){this.expectJSX("/");var e=this.parseJSXElementName();return this.expectJSX(">"),this.finalize(t,new s.JSXClosingElement(e))}var n=this.parseJSXElementName(),r=this.parseJSXAttributes(),i=this.matchJSX("/");return i&&this.expectJSX("/"),this.expectJSX(">"),this.finalize(t,new s.JSXOpeningElement(n,i,r))},e.prototype.parseJSXEmptyExpression=function(){var t=this.createJSXChildNode();return this.collectComments(),this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.finalize(t,new s.JSXEmptyExpression)},e.prototype.parseJSXExpressionContainer=function(){var t=this.createJSXNode();this.expectJSX("{");var e;return this.matchJSX("}")?(e=this.parseJSXEmptyExpression(),this.expectJSX("}")):(this.finishJSX(),e=this.parseAssignmentExpression(),this.reenterJSX()),this.finalize(t,new s.JSXExpressionContainer(e))},e.prototype.parseJSXChildren=function(){for(var t=[];!this.scanner.eof();){var e=this.createJSXChildNode(),n=this.nextJSXText();if(n.start<n.end){var r=this.getTokenRaw(n),i=this.finalize(e,new s.JSXText(n.value,r));t.push(i)}if("{"!==this.scanner.source[this.scanner.index])break;var o=this.parseJSXExpressionContainer();t.push(o)}return t},e.prototype.parseComplexJSXElement=function(t){for(var e=[];!this.scanner.eof();){t.children=t.children.concat(this.parseJSXChildren());var n=this.createJSXChildNode(),i=this.parseJSXBoundaryElement();if(i.type===a.JSXSyntax.JSXOpeningElement){var o=i;if(o.selfClosing){var u=this.finalize(n,new s.JSXElement(o,[],null));t.children.push(u)}else e.push(t),t={node:n,opening:o,closing:null,children:[]}}if(i.type===a.JSXSyntax.JSXClosingElement){t.closing=i;var c=r(t.opening.name);if(c!==r(t.closing.name)&&this.tolerateError("Expected corresponding JSX closing tag for %0",c),!(e.length>0))break;var u=this.finalize(t.node,new s.JSXElement(t.opening,t.children,t.closing));t=e[e.length-1],t.children.push(u),e.pop()}}return t},e.prototype.parseJSXElement=function(){var t=this.createJSXNode(),e=this.parseJSXOpeningElement(),n=[],r=null;if(!e.selfClosing){var i=this.parseComplexJSXElement({node:t,opening:e,closing:r,children:n});n=i.children,r=i.closing}return this.finalize(t,new s.JSXElement(e,n,r))},e.prototype.parseJSXRoot=function(){this.config.tokens&&this.tokens.pop(),this.startJSX();var t=this.parseJSXElement();return this.finishJSX(),t},e.prototype.isStartOfExpression=function(){return t.prototype.isStartOfExpression.call(this)||this.match("<")},e}(c.Parser);e.JSXParser=p},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};e.Character={fromCodePoint:function(t){return t<65536?String.fromCharCode(t):String.fromCharCode(55296+(t-65536>>10))+String.fromCharCode(56320+(t-65536&1023))},isWhiteSpace:function(t){return 32===t||9===t||11===t||12===t||160===t||t>=5760&&[5760,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].indexOf(t)>=0},isLineTerminator:function(t){return 10===t||13===t||8232===t||8233===t},isIdentifierStart:function(t){return 36===t||95===t||t>=65&&t<=90||t>=97&&t<=122||92===t||t>=128&&n.NonAsciiIdentifierStart.test(e.Character.fromCodePoint(t))},isIdentifierPart:function(t){return 36===t||95===t||t>=65&&t<=90||t>=97&&t<=122||t>=48&&t<=57||92===t||t>=128&&n.NonAsciiIdentifierPart.test(e.Character.fromCodePoint(t))},isDecimalDigit:function(t){return t>=48&&t<=57},isHexDigit:function(t){return t>=48&&t<=57||t>=65&&t<=70||t>=97&&t<=102},isOctalDigit:function(t){return t>=48&&t<=55}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(6),i=function(){function t(t){this.type=r.JSXSyntax.JSXClosingElement,this.name=t}return t}();e.JSXClosingElement=i;var o=function(){function t(t,e,n){this.type=r.JSXSyntax.JSXElement,this.openingElement=t,this.children=e,this.closingElement=n}return t}();e.JSXElement=o;var s=function(){function t(){this.type=r.JSXSyntax.JSXEmptyExpression}return t}();e.JSXEmptyExpression=s;var a=function(){function t(t){this.type=r.JSXSyntax.JSXExpressionContainer,this.expression=t}return t}();e.JSXExpressionContainer=a;var u=function(){function t(t){this.type=r.JSXSyntax.JSXIdentifier,this.name=t}return t}();e.JSXIdentifier=u;var c=function(){function t(t,e){this.type=r.JSXSyntax.JSXMemberExpression,this.object=t,this.property=e}return t}();e.JSXMemberExpression=c;var h=function(){function t(t,e){this.type=r.JSXSyntax.JSXAttribute,this.name=t,this.value=e}return t}();e.JSXAttribute=h;var l=function(){function t(t,e){this.type=r.JSXSyntax.JSXNamespacedName,this.namespace=t,this.name=e}return t}();e.JSXNamespacedName=l;var p=function(){function t(t,e,n){this.type=r.JSXSyntax.JSXOpeningElement,this.name=t,this.selfClosing=e,this.attributes=n}return t}();e.JSXOpeningElement=p;var f=function(){function t(t){this.type=r.JSXSyntax.JSXSpreadAttribute,this.argument=t}return t}();e.JSXSpreadAttribute=f;var d=function(){function t(t,e){this.type=r.JSXSyntax.JSXText,this.value=t,this.raw=e}return t}();e.JSXText=d},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.JSXSyntax={JSXAttribute:"JSXAttribute",JSXClosingElement:"JSXClosingElement",JSXElement:"JSXElement",JSXEmptyExpression:"JSXEmptyExpression",JSXExpressionContainer:"JSXExpressionContainer",JSXIdentifier:"JSXIdentifier",JSXMemberExpression:"JSXMemberExpression",JSXNamespacedName:"JSXNamespacedName",JSXOpeningElement:"JSXOpeningElement",JSXSpreadAttribute:"JSXSpreadAttribute",JSXText:"JSXText"}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),i=function(){function t(t){this.type=r.Syntax.ArrayExpression,this.elements=t}return t}();e.ArrayExpression=i;var o=function(){function t(t){this.type=r.Syntax.ArrayPattern,this.elements=t}return t}();e.ArrayPattern=o;var s=function(){function t(t,e,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=t,this.body=e,this.generator=!1,this.expression=n,this.async=!1}return t}();e.ArrowFunctionExpression=s;var a=function(){function t(t,e,n){this.type=r.Syntax.AssignmentExpression,this.operator=t,this.left=e,this.right=n}return t}();e.AssignmentExpression=a;var u=function(){function t(t,e){this.type=r.Syntax.AssignmentPattern,this.left=t,this.right=e}return t}();e.AssignmentPattern=u;var c=function(){function t(t,e,n){this.type=r.Syntax.ArrowFunctionExpression,this.id=null,this.params=t,this.body=e,this.generator=!1,this.expression=n,this.async=!0}return t}();e.AsyncArrowFunctionExpression=c;var h=function(){function t(t,e,n){this.type=r.Syntax.FunctionDeclaration,this.id=t,this.params=e,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return t}();e.AsyncFunctionDeclaration=h;var l=function(){function t(t,e,n){this.type=r.Syntax.FunctionExpression,this.id=t,this.params=e,this.body=n,this.generator=!1,this.expression=!1,this.async=!0}return t}();e.AsyncFunctionExpression=l;var p=function(){function t(t){this.type=r.Syntax.AwaitExpression,this.argument=t}return t}();e.AwaitExpression=p;var f=function(){function t(t,e,n){var i="||"===t||"&&"===t;this.type=i?r.Syntax.LogicalExpression:r.Syntax.BinaryExpression,this.operator=t,this.left=e,this.right=n}return t}();e.BinaryExpression=f;var d=function(){function t(t){this.type=r.Syntax.BlockStatement,this.body=t}return t}();e.BlockStatement=d;var m=function(){function t(t){this.type=r.Syntax.BreakStatement,this.label=t}return t}();e.BreakStatement=m;var y=function(){function t(t,e){this.type=r.Syntax.CallExpression,this.callee=t,this.arguments=e}return t}();e.CallExpression=y;var v=function(){function t(t,e){this.type=r.Syntax.CatchClause,this.param=t,this.body=e}return t}();e.CatchClause=v;var x=function(){function t(t){this.type=r.Syntax.ClassBody,this.body=t}return t}();e.ClassBody=x;var g=function(){function t(t,e,n){this.type=r.Syntax.ClassDeclaration,this.id=t,this.superClass=e,this.body=n}return t}();e.ClassDeclaration=g;var D=function(){function t(t,e,n){this.type=r.Syntax.ClassExpression,this.id=t,this.superClass=e,this.body=n}return t}();e.ClassExpression=D;var E=function(){function t(t,e){this.type=r.Syntax.MemberExpression,this.computed=!0,this.object=t,this.property=e}return t}();e.ComputedMemberExpression=E;var A=function(){function t(t,e,n){this.type=r.Syntax.ConditionalExpression,this.test=t,this.consequent=e,this.alternate=n}return t}();e.ConditionalExpression=A;var S=function(){function t(t){this.type=r.Syntax.ContinueStatement,this.label=t}return t}();e.ContinueStatement=S;var w=function(){function t(){this.type=r.Syntax.DebuggerStatement}return t}();e.DebuggerStatement=w;var C=function(){function t(t,e){this.type=r.Syntax.ExpressionStatement,this.expression=t,this.directive=e}return t}();e.Directive=C;var _=function(){function t(t,e){this.type=r.Syntax.DoWhileStatement,this.body=t,this.test=e}return t}();e.DoWhileStatement=_;var b=function(){function t(){this.type=r.Syntax.EmptyStatement}return t}();e.EmptyStatement=b;var F=function(){function t(t){this.type=r.Syntax.ExportAllDeclaration,this.source=t}return t}();e.ExportAllDeclaration=F;var k=function(){function t(t){this.type=r.Syntax.ExportDefaultDeclaration,this.declaration=t}return t}();e.ExportDefaultDeclaration=k;var I=function(){function t(t,e,n){this.type=r.Syntax.ExportNamedDeclaration,this.declaration=t,this.specifiers=e,this.source=n}return t}();e.ExportNamedDeclaration=I;var T=function(){function t(t,e){this.type=r.Syntax.ExportSpecifier,this.exported=e,this.local=t}return t}();e.ExportSpecifier=T;var B=function(){function t(t){this.type=r.Syntax.ExpressionStatement,this.expression=t}return t}();e.ExpressionStatement=B;var M=function(){function t(t,e,n){this.type=r.Syntax.ForInStatement,this.left=t,this.right=e,this.body=n,this.each=!1}return t}();e.ForInStatement=M;var P=function(){function t(t,e,n){this.type=r.Syntax.ForOfStatement,this.left=t,this.right=e,this.body=n}return t}();e.ForOfStatement=P;var N=function(){function t(t,e,n,i){this.type=r.Syntax.ForStatement,this.init=t,this.test=e,this.update=n,this.body=i}return t}();e.ForStatement=N;var O=function(){function t(t,e,n,i){this.type=r.Syntax.FunctionDeclaration,this.id=t,this.params=e,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return t}();e.FunctionDeclaration=O;var R=function(){function t(t,e,n,i){this.type=r.Syntax.FunctionExpression,this.id=t,this.params=e,this.body=n,this.generator=i,this.expression=!1,this.async=!1}return t}();e.FunctionExpression=R;var U=function(){function t(t){this.type=r.Syntax.Identifier,this.name=t}return t}();e.Identifier=U;var j=function(){function t(t,e,n){this.type=r.Syntax.IfStatement,this.test=t,this.consequent=e,this.alternate=n}return t}();e.IfStatement=j;var L=function(){function t(t,e){this.type=r.Syntax.ImportDeclaration,this.specifiers=t,this.source=e}return t}();e.ImportDeclaration=L;var z=function(){function t(t){this.type=r.Syntax.ImportDefaultSpecifier,this.local=t}return t}();e.ImportDefaultSpecifier=z;var J=function(){function t(t){this.type=r.Syntax.ImportNamespaceSpecifier,this.local=t}return t}();e.ImportNamespaceSpecifier=J;var X=function(){function t(t,e){this.type=r.Syntax.ImportSpecifier,this.local=t,this.imported=e}return t}();e.ImportSpecifier=X;var q=function(){function t(t,e){this.type=r.Syntax.LabeledStatement,this.label=t,this.body=e}return t}();e.LabeledStatement=q;var K=function(){function t(t,e){this.type=r.Syntax.Literal,this.value=t,this.raw=e}return t}();e.Literal=K;var Y=function(){function t(t,e){this.type=r.Syntax.MetaProperty,this.meta=t,this.property=e}return t}();e.MetaProperty=Y;var W=function(){function t(t,e,n,i,o){this.type=r.Syntax.MethodDefinition,this.key=t,this.computed=e,this.value=n,this.kind=i,this.static=o}return t}();e.MethodDefinition=W;var G=function(){function t(t){this.type=r.Syntax.Program,this.body=t,this.sourceType="module"}return t}();e.Module=G;var H=function(){function t(t,e){this.type=r.Syntax.NewExpression,this.callee=t,this.arguments=e}return t}();e.NewExpression=H;var V=function(){function t(t){this.type=r.Syntax.ObjectExpression,this.properties=t}return t}();e.ObjectExpression=V;var $=function(){function t(t){this.type=r.Syntax.ObjectPattern,this.properties=t}return t}();e.ObjectPattern=$;var Z=function(){function t(t,e,n,i,o,s){this.type=r.Syntax.Property,this.key=e,this.computed=n,this.value=i,this.kind=t,this.method=o,this.shorthand=s}return t}();e.Property=Z;var Q=function(){function t(t,e,n,i){this.type=r.Syntax.Literal,this.value=t,this.raw=e,this.regex={pattern:n,flags:i}}return t}();e.RegexLiteral=Q;var tt=function(){function t(t){this.type=r.Syntax.RestElement,this.argument=t}return t}();e.RestElement=tt;var et=function(){function t(t){this.type=r.Syntax.ReturnStatement,this.argument=t}return t}();e.ReturnStatement=et;var nt=function(){function t(t){this.type=r.Syntax.Program,this.body=t,this.sourceType="script"}return t}();e.Script=nt;var rt=function(){function t(t){this.type=r.Syntax.SequenceExpression,this.expressions=t}return t}();e.SequenceExpression=rt;var it=function(){function t(t){this.type=r.Syntax.SpreadElement,this.argument=t}return t}();e.SpreadElement=it;var ot=function(){function t(t,e){this.type=r.Syntax.MemberExpression,this.computed=!1,this.object=t,this.property=e}return t}();e.StaticMemberExpression=ot;var st=function(){function t(){this.type=r.Syntax.Super}return t}();e.Super=st;var at=function(){function t(t,e){this.type=r.Syntax.SwitchCase,this.test=t,this.consequent=e}return t}();e.SwitchCase=at;var ut=function(){function t(t,e){this.type=r.Syntax.SwitchStatement,this.discriminant=t,this.cases=e}return t}();e.SwitchStatement=ut;var ct=function(){function t(t,e){this.type=r.Syntax.TaggedTemplateExpression,this.tag=t,this.quasi=e}return t}();e.TaggedTemplateExpression=ct;var ht=function(){function t(t,e){this.type=r.Syntax.TemplateElement,this.value=t,this.tail=e}return t}();e.TemplateElement=ht;var lt=function(){function t(t,e){this.type=r.Syntax.TemplateLiteral,this.quasis=t,this.expressions=e}return t}();e.TemplateLiteral=lt;var pt=function(){function t(){this.type=r.Syntax.ThisExpression}return t}();e.ThisExpression=pt;var ft=function(){function t(t){this.type=r.Syntax.ThrowStatement,this.argument=t}return t}();e.ThrowStatement=ft;var dt=function(){function t(t,e,n){this.type=r.Syntax.TryStatement,this.block=t,this.handler=e,this.finalizer=n}return t}();e.TryStatement=dt;var mt=function(){function t(t,e){this.type=r.Syntax.UnaryExpression,this.operator=t,this.argument=e,this.prefix=!0}return t}();e.UnaryExpression=mt;var yt=function(){function t(t,e,n){this.type=r.Syntax.UpdateExpression,this.operator=t,this.argument=e,this.prefix=n}return t}();e.UpdateExpression=yt;var vt=function(){function t(t,e){this.type=r.Syntax.VariableDeclaration,this.declarations=t,this.kind=e}return t}();e.VariableDeclaration=vt;var xt=function(){function t(t,e){this.type=r.Syntax.VariableDeclarator,this.id=t,this.init=e}return t}();e.VariableDeclarator=xt;var gt=function(){function t(t,e){this.type=r.Syntax.WhileStatement,this.test=t,this.body=e}return t}();e.WhileStatement=gt;var Dt=function(){function t(t,e){this.type=r.Syntax.WithStatement,this.object=t,this.body=e}return t}();e.WithStatement=Dt;var Et=function(){function t(t,e){this.type=r.Syntax.YieldExpression,this.argument=t,this.delegate=e}return t}();e.YieldExpression=Et},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(9),i=n(10),o=n(11),s=n(7),a=n(12),u=n(2),c=n(13),h=function(){function t(t,e,n){void 0===e&&(e={}),this.config={range:"boolean"==typeof e.range&&e.range,loc:"boolean"==typeof e.loc&&e.loc,source:null,tokens:"boolean"==typeof e.tokens&&e.tokens,comment:"boolean"==typeof e.comment&&e.comment,tolerant:"boolean"==typeof e.tolerant&&e.tolerant},this.config.loc&&e.source&&null!==e.source&&(this.config.source=String(e.source)),this.delegate=n,this.errorHandler=new i.ErrorHandler,this.errorHandler.tolerant=this.config.tolerant,this.scanner=new a.Scanner(t,this.errorHandler),this.scanner.trackComment=this.config.comment,this.operatorPrecedence={")":0,";":0,",":0,"=":0,"]":0,"||":1,"&&":2,"|":3,"^":4,"&":5,"==":6,"!=":6,"===":6,"!==":6,"<":7,">":7,"<=":7,">=":7,"<<":8,">>":8,">>>":8,"+":9,"-":9,"*":11,"/":11,"%":11},this.lookahead={type:2,value:"",lineNumber:this.scanner.lineNumber,lineStart:0,start:0,end:0},this.hasLineTerminator=!1,this.context={isModule:!1,await:!1,allowIn:!0,allowStrictDirective:!0,allowYield:!0,firstCoverInitializedNameError:null,isAssignmentTarget:!1,isBindingElement:!1,inFunctionBody:!1,inIteration:!1,inSwitch:!1,labelSet:{},strict:!1},this.tokens=[],this.startMarker={index:0,line:this.scanner.lineNumber,column:0},this.lastMarker={index:0,line:this.scanner.lineNumber,column:0},this.nextToken(),this.lastMarker={index:this.scanner.index,line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}return t.prototype.throwError=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=t.replace(/%(\d)/g,function(t,e){return r.assert(e<i.length,"Message reference must be in range"),i[e]}),s=this.lastMarker.index,a=this.lastMarker.line,u=this.lastMarker.column+1;throw this.errorHandler.createError(s,a,u,o)},t.prototype.tolerateError=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n];var i=Array.prototype.slice.call(arguments,1),o=t.replace(/%(\d)/g,function(t,e){return r.assert(e<i.length,"Message reference must be in range"),i[e]}),s=this.lastMarker.index,a=this.scanner.lineNumber,u=this.lastMarker.column+1;this.errorHandler.tolerateError(s,a,u,o)},t.prototype.unexpectedTokenError=function(t,e){var n,r=e||o.Messages.UnexpectedToken;if(t?(e||(r=2===t.type?o.Messages.UnexpectedEOS:3===t.type?o.Messages.UnexpectedIdentifier:6===t.type?o.Messages.UnexpectedNumber:8===t.type?o.Messages.UnexpectedString:10===t.type?o.Messages.UnexpectedTemplate:o.Messages.UnexpectedToken,4===t.type&&(this.scanner.isFutureReservedWord(t.value)?r=o.Messages.UnexpectedReserved:this.context.strict&&this.scanner.isStrictModeReservedWord(t.value)&&(r=o.Messages.StrictReservedWord))),n=t.value):n="ILLEGAL",r=r.replace("%0",n),t&&"number"==typeof t.lineNumber){var i=t.start,s=t.lineNumber,a=this.lastMarker.index-this.lastMarker.column,u=t.start-a+1;return this.errorHandler.createError(i,s,u,r)}var i=this.lastMarker.index,s=this.lastMarker.line,u=this.lastMarker.column+1;return this.errorHandler.createError(i,s,u,r)},t.prototype.throwUnexpectedToken=function(t,e){throw this.unexpectedTokenError(t,e)},t.prototype.tolerateUnexpectedToken=function(t,e){this.errorHandler.tolerate(this.unexpectedTokenError(t,e))},t.prototype.collectComments=function(){if(this.config.comment){var t=this.scanner.scanComments();if(t.length>0&&this.delegate)for(var e=0;e<t.length;++e){var n=t[e],r=void 0;r={type:n.multiLine?"BlockComment":"LineComment",value:this.scanner.source.slice(n.slice[0],n.slice[1])},this.config.range&&(r.range=n.range),this.config.loc&&(r.loc=n.loc);var i={start:{line:n.loc.start.line,column:n.loc.start.column,offset:n.range[0]},end:{line:n.loc.end.line,column:n.loc.end.column,offset:n.range[1]}};this.delegate(r,i)}}else this.scanner.scanComments()},t.prototype.getTokenRaw=function(t){return this.scanner.source.slice(t.start,t.end)},t.prototype.convertToken=function(t){var e={type:c.TokenName[t.type],value:this.getTokenRaw(t)};if(this.config.range&&(e.range=[t.start,t.end]),this.config.loc&&(e.loc={start:{line:this.startMarker.line,column:this.startMarker.column},end:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart}}),9===t.type){var n=t.pattern,r=t.flags;e.regex={pattern:n,flags:r}}return e},t.prototype.nextToken=function(){var t=this.lookahead;this.lastMarker.index=this.scanner.index,this.lastMarker.line=this.scanner.lineNumber,this.lastMarker.column=this.scanner.index-this.scanner.lineStart,this.collectComments(),this.scanner.index!==this.startMarker.index&&(this.startMarker.index=this.scanner.index,this.startMarker.line=this.scanner.lineNumber,this.startMarker.column=this.scanner.index-this.scanner.lineStart);var e=this.scanner.lex();return this.hasLineTerminator=t.lineNumber!==e.lineNumber,e&&this.context.strict&&3===e.type&&this.scanner.isStrictModeReservedWord(e.value)&&(e.type=4),this.lookahead=e,this.config.tokens&&2!==e.type&&this.tokens.push(this.convertToken(e)),t},t.prototype.nextRegexToken=function(){this.collectComments();var t=this.scanner.scanRegExp();return this.config.tokens&&(this.tokens.pop(),this.tokens.push(this.convertToken(t))),this.lookahead=t,this.nextToken(),t},t.prototype.createNode=function(){return{index:this.startMarker.index,line:this.startMarker.line,column:this.startMarker.column}},t.prototype.startNode=function(t){return{index:t.start,line:t.lineNumber,column:t.start-t.lineStart}},t.prototype.finalize=function(t,e){if(this.config.range&&(e.range=[t.index,this.lastMarker.index]),this.config.loc&&(e.loc={start:{line:t.line,column:t.column},end:{line:this.lastMarker.line,column:this.lastMarker.column}},this.config.source&&(e.loc.source=this.config.source)),this.delegate){var n={start:{line:t.line,column:t.column,offset:t.index},end:{line:this.lastMarker.line,column:this.lastMarker.column,offset:this.lastMarker.index}};this.delegate(e,n)}return e},t.prototype.expect=function(t){var e=this.nextToken();7===e.type&&e.value===t||this.throwUnexpectedToken(e)},t.prototype.expectCommaSeparator=function(){if(this.config.tolerant){var t=this.lookahead;7===t.type&&","===t.value?this.nextToken():7===t.type&&";"===t.value?(this.nextToken(),this.tolerateUnexpectedToken(t)):this.tolerateUnexpectedToken(t,o.Messages.UnexpectedToken)}else this.expect(",")},t.prototype.expectKeyword=function(t){var e=this.nextToken();4===e.type&&e.value===t||this.throwUnexpectedToken(e)},t.prototype.match=function(t){return 7===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchKeyword=function(t){return 4===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchContextualKeyword=function(t){return 3===this.lookahead.type&&this.lookahead.value===t},t.prototype.matchAssign=function(){if(7!==this.lookahead.type)return!1;var t=this.lookahead.value;return"="===t||"*="===t||"**="===t||"/="===t||"%="===t||"+="===t||"-="===t||"<<="===t||">>="===t||">>>="===t||"&="===t||"^="===t||"|="===t},t.prototype.isolateCoverGrammar=function(t){var e=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=t.call(this);return null!==this.context.firstCoverInitializedNameError&&this.throwUnexpectedToken(this.context.firstCoverInitializedNameError),this.context.isBindingElement=e,this.context.isAssignmentTarget=n,this.context.firstCoverInitializedNameError=r,i},t.prototype.inheritCoverGrammar=function(t){var e=this.context.isBindingElement,n=this.context.isAssignmentTarget,r=this.context.firstCoverInitializedNameError;this.context.isBindingElement=!0,this.context.isAssignmentTarget=!0,this.context.firstCoverInitializedNameError=null;var i=t.call(this);return this.context.isBindingElement=this.context.isBindingElement&&e,this.context.isAssignmentTarget=this.context.isAssignmentTarget&&n,this.context.firstCoverInitializedNameError=r||this.context.firstCoverInitializedNameError,i},t.prototype.consumeSemicolon=function(){this.match(";")?this.nextToken():this.hasLineTerminator||(2===this.lookahead.type||this.match("}")||this.throwUnexpectedToken(this.lookahead),this.lastMarker.index=this.startMarker.index,this.lastMarker.line=this.startMarker.line,this.lastMarker.column=this.startMarker.column)},t.prototype.parsePrimaryExpression=function(){var t,e,n,r=this.createNode();switch(this.lookahead.type){case 3:(this.context.isModule||this.context.await)&&"await"===this.lookahead.value&&this.tolerateUnexpectedToken(this.lookahead),t=this.matchAsyncFunction()?this.parseFunctionExpression():this.finalize(r,new s.Identifier(this.nextToken().value));break;case 6:case 8:this.context.strict&&this.lookahead.octal&&this.tolerateUnexpectedToken(this.lookahead,o.Messages.StrictOctalLiteral),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal(e.value,n));break;case 1:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal("true"===e.value,n));break;case 5:this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,e=this.nextToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.Literal(null,n));break;case 10:t=this.parseTemplateLiteral();break;case 7:switch(this.lookahead.value){case"(":this.context.isBindingElement=!1,t=this.inheritCoverGrammar(this.parseGroupExpression);break;case"[":t=this.inheritCoverGrammar(this.parseArrayInitializer);break;case"{":t=this.inheritCoverGrammar(this.parseObjectInitializer);break;case"/":case"/=":this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.scanner.index=this.startMarker.index,e=this.nextRegexToken(),n=this.getTokenRaw(e),t=this.finalize(r,new s.RegexLiteral(e.regex,n,e.pattern,e.flags));break;default:t=this.throwUnexpectedToken(this.nextToken())}break;case 4:!this.context.strict&&this.context.allowYield&&this.matchKeyword("yield")?t=this.parseIdentifierName():!this.context.strict&&this.matchKeyword("let")?t=this.finalize(r,new s.Identifier(this.nextToken().value)):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.matchKeyword("function")?t=this.parseFunctionExpression():this.matchKeyword("this")?(this.nextToken(),t=this.finalize(r,new s.ThisExpression)):t=this.matchKeyword("class")?this.parseClassExpression():this.throwUnexpectedToken(this.nextToken()));break;default:t=this.throwUnexpectedToken(this.nextToken())}return t},t.prototype.parseSpreadElement=function(){var t=this.createNode();this.expect("...");var e=this.inheritCoverGrammar(this.parseAssignmentExpression);return this.finalize(t,new s.SpreadElement(e))},t.prototype.parseArrayInitializer=function(){var t=this.createNode(),e=[];for(this.expect("[");!this.match("]");)if(this.match(","))this.nextToken(),e.push(null);else if(this.match("...")){var n=this.parseSpreadElement();this.match("]")||(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1,this.expect(",")),e.push(n)}else e.push(this.inheritCoverGrammar(this.parseAssignmentExpression)),this.match("]")||this.expect(",");return this.expect("]"),this.finalize(t,new s.ArrayExpression(e))},t.prototype.parsePropertyMethod=function(t){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var e=this.context.strict,n=this.context.allowStrictDirective;this.context.allowStrictDirective=t.simple;var r=this.isolateCoverGrammar(this.parseFunctionSourceElements);return this.context.strict&&t.firstRestricted&&this.tolerateUnexpectedToken(t.firstRestricted,t.message),this.context.strict&&t.stricted&&this.tolerateUnexpectedToken(t.stricted,t.message),this.context.strict=e,this.context.allowStrictDirective=n,r},t.prototype.parsePropertyMethodFunction=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters(),r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parsePropertyMethodAsyncFunction=function(){var t=this.createNode(),e=this.context.allowYield,n=this.context.await;this.context.allowYield=!1,this.context.await=!0;var r=this.parseFormalParameters(),i=this.parsePropertyMethod(r);return this.context.allowYield=e,this.context.await=n,this.finalize(t,new s.AsyncFunctionExpression(null,r.params,i))},t.prototype.parseObjectPropertyKey=function(){var t,e=this.createNode(),n=this.nextToken();switch(n.type){case 8:case 6:this.context.strict&&n.octal&&this.tolerateUnexpectedToken(n,o.Messages.StrictOctalLiteral);var r=this.getTokenRaw(n);t=this.finalize(e,new s.Literal(n.value,r));break;case 3:case 1:case 5:case 4:t=this.finalize(e,new s.Identifier(n.value));break;case 7:"["===n.value?(t=this.isolateCoverGrammar(this.parseAssignmentExpression),this.expect("]")):t=this.throwUnexpectedToken(n);break;default:t=this.throwUnexpectedToken(n)}return t},t.prototype.isPropertyKey=function(t,e){return t.type===u.Syntax.Identifier&&t.name===e||t.type===u.Syntax.Literal&&t.value===e},t.prototype.parseObjectProperty=function(t){var e,n=this.createNode(),r=this.lookahead,i=null,a=null,u=!1,c=!1,h=!1,l=!1;if(3===r.type){var p=r.value;this.nextToken(),u=this.match("["),l=!(this.hasLineTerminator||"async"!==p||this.match(":")||this.match("(")||this.match("*")),i=l?this.parseObjectPropertyKey():this.finalize(n,new s.Identifier(p))}else this.match("*")?this.nextToken():(u=this.match("["),i=this.parseObjectPropertyKey());var f=this.qualifiedPropertyName(this.lookahead);if(3===r.type&&!l&&"get"===r.value&&f)e="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,a=this.parseGetterMethod();else if(3===r.type&&!l&&"set"===r.value&&f)e="set",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseSetterMethod();else if(7===r.type&&"*"===r.value&&f)e="init",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseGeneratorMethod(),c=!0;else if(i||this.throwUnexpectedToken(this.lookahead),e="init",this.match(":")&&!l)!u&&this.isPropertyKey(i,"__proto__")&&(t.value&&this.tolerateError(o.Messages.DuplicateProtoProperty),t.value=!0),this.nextToken(),a=this.inheritCoverGrammar(this.parseAssignmentExpression);else if(this.match("("))a=l?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),c=!0;else if(3===r.type){var p=this.finalize(n,new s.Identifier(r.value));if(this.match("=")){this.context.firstCoverInitializedNameError=this.lookahead,this.nextToken(),h=!0;var d=this.isolateCoverGrammar(this.parseAssignmentExpression);a=this.finalize(n,new s.AssignmentPattern(p,d))}else h=!0,a=p}else this.throwUnexpectedToken(this.nextToken());return this.finalize(n,new s.Property(e,i,u,a,c,h))},t.prototype.parseObjectInitializer=function(){var t=this.createNode();this.expect("{");for(var e=[],n={value:!1};!this.match("}");)e.push(this.parseObjectProperty(n)),this.match("}")||this.expectCommaSeparator();return this.expect("}"),this.finalize(t,new s.ObjectExpression(e))},t.prototype.parseTemplateHead=function(){r.assert(this.lookahead.head,"Template literal must start with a template head");var t=this.createNode(),e=this.nextToken(),n=e.value,i=e.cooked;return this.finalize(t,new s.TemplateElement({raw:n,cooked:i},e.tail))},t.prototype.parseTemplateElement=function(){10!==this.lookahead.type&&this.throwUnexpectedToken();var t=this.createNode(),e=this.nextToken(),n=e.value,r=e.cooked;return this.finalize(t,new s.TemplateElement({raw:n,cooked:r},e.tail))},t.prototype.parseTemplateLiteral=function(){var t=this.createNode(),e=[],n=[],r=this.parseTemplateHead();for(n.push(r);!r.tail;)e.push(this.parseExpression()),r=this.parseTemplateElement(),n.push(r);return this.finalize(t,new s.TemplateLiteral(n,e))},t.prototype.reinterpretExpressionAsPattern=function(t){switch(t.type){case u.Syntax.Identifier:case u.Syntax.MemberExpression:case u.Syntax.RestElement:case u.Syntax.AssignmentPattern:break;case u.Syntax.SpreadElement:t.type=u.Syntax.RestElement,this.reinterpretExpressionAsPattern(t.argument);break;case u.Syntax.ArrayExpression:t.type=u.Syntax.ArrayPattern;for(var e=0;e<t.elements.length;e++)null!==t.elements[e]&&this.reinterpretExpressionAsPattern(t.elements[e]);break;case u.Syntax.ObjectExpression:t.type=u.Syntax.ObjectPattern;for(var e=0;e<t.properties.length;e++)this.reinterpretExpressionAsPattern(t.properties[e].value);break;case u.Syntax.AssignmentExpression:t.type=u.Syntax.AssignmentPattern,delete t.operator,this.reinterpretExpressionAsPattern(t.left)}},t.prototype.parseGroupExpression=function(){var t;if(this.expect("("),this.match(")"))this.nextToken(),this.match("=>")||this.expect("=>"),t={type:"ArrowParameterPlaceHolder",params:[],async:!1};else{var e=this.lookahead,n=[];if(this.match("..."))t=this.parseRestElement(n),this.expect(")"),this.match("=>")||this.expect("=>"),t={type:"ArrowParameterPlaceHolder",params:[t],async:!1};else{var r=!1;if(this.context.isBindingElement=!0,t=this.inheritCoverGrammar(this.parseAssignmentExpression),this.match(",")){var i=[];for(this.context.isAssignmentTarget=!1,i.push(t);2!==this.lookahead.type&&this.match(",");){if(this.nextToken(),this.match(")")){this.nextToken();for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,t={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else if(this.match("...")){this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),i.push(this.parseRestElement(n)),this.expect(")"),this.match("=>")||this.expect("=>"),this.context.isBindingElement=!1;for(var o=0;o<i.length;o++)this.reinterpretExpressionAsPattern(i[o]);r=!0,t={type:"ArrowParameterPlaceHolder",params:i,async:!1}}else i.push(this.inheritCoverGrammar(this.parseAssignmentExpression));if(r)break}r||(t=this.finalize(this.startNode(e),new s.SequenceExpression(i)))}if(!r){if(this.expect(")"),this.match("=>")&&(t.type===u.Syntax.Identifier&&"yield"===t.name&&(r=!0,t={type:"ArrowParameterPlaceHolder",params:[t],async:!1}),!r)){if(this.context.isBindingElement||this.throwUnexpectedToken(this.lookahead),t.type===u.Syntax.SequenceExpression)for(var o=0;o<t.expressions.length;o++)this.reinterpretExpressionAsPattern(t.expressions[o]);else this.reinterpretExpressionAsPattern(t);t={type:"ArrowParameterPlaceHolder",params:t.type===u.Syntax.SequenceExpression?t.expressions:[t],async:!1}}this.context.isBindingElement=!1}}}return t},t.prototype.parseArguments=function(){this.expect("(");var t=[];if(!this.match(")"))for(;;){var e=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAssignmentExpression);if(t.push(e),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),t},t.prototype.isIdentifierName=function(t){return 3===t.type||4===t.type||1===t.type||5===t.type},t.prototype.parseIdentifierName=function(){var t=this.createNode(),e=this.nextToken();return this.isIdentifierName(e)||this.throwUnexpectedToken(e),this.finalize(t,new s.Identifier(e.value))},t.prototype.parseNewExpression=function(){var t=this.createNode(),e=this.parseIdentifierName();r.assert("new"===e.name,"New expression must start with `new`");var n;if(this.match("."))if(this.nextToken(),3===this.lookahead.type&&this.context.inFunctionBody&&"target"===this.lookahead.value){var i=this.parseIdentifierName();n=new s.MetaProperty(e,i)}else this.throwUnexpectedToken(this.lookahead);else{var o=this.isolateCoverGrammar(this.parseLeftHandSideExpression),a=this.match("(")?this.parseArguments():[];n=new s.NewExpression(o,a),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return this.finalize(t,n)},t.prototype.parseAsyncArgument=function(){var t=this.parseAssignmentExpression();return this.context.firstCoverInitializedNameError=null,t},t.prototype.parseAsyncArguments=function(){this.expect("(");var t=[];if(!this.match(")"))for(;;){var e=this.match("...")?this.parseSpreadElement():this.isolateCoverGrammar(this.parseAsyncArgument);if(t.push(e),this.match(")"))break;if(this.expectCommaSeparator(),this.match(")"))break}return this.expect(")"),t},t.prototype.parseLeftHandSideExpressionAllowCall=function(){var t=this.lookahead,e=this.matchContextualKeyword("async"),n=this.context.allowIn;this.context.allowIn=!0;var r;for(this.matchKeyword("super")&&this.context.inFunctionBody?(r=this.createNode(),this.nextToken(),r=this.finalize(r,new s.Super),this.match("(")||this.match(".")||this.match("[")||this.throwUnexpectedToken(this.lookahead)):r=this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var i=this.parseIdentifierName();r=this.finalize(this.startNode(t),new s.StaticMemberExpression(r,i))}else if(this.match("(")){var o=e&&t.lineNumber===this.lookahead.lineNumber;this.context.isBindingElement=!1,this.context.isAssignmentTarget=!1;var a=o?this.parseAsyncArguments():this.parseArguments();if(r=this.finalize(this.startNode(t),new s.CallExpression(r,a)),o&&this.match("=>")){for(var u=0;u<a.length;++u)this.reinterpretExpressionAsPattern(a[u]);r={type:"ArrowParameterPlaceHolder",params:a,async:!0}}}else if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var i=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),r=this.finalize(this.startNode(t),new s.ComputedMemberExpression(r,i))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var c=this.parseTemplateLiteral();r=this.finalize(this.startNode(t),new s.TaggedTemplateExpression(r,c))}return this.context.allowIn=n,r},t.prototype.parseSuper=function(){var t=this.createNode();return this.expectKeyword("super"),this.match("[")||this.match(".")||this.throwUnexpectedToken(this.lookahead),this.finalize(t,new s.Super)},t.prototype.parseLeftHandSideExpression=function(){r.assert(this.context.allowIn,"callee of new expression always allow in keyword.");for(var t=this.startNode(this.lookahead),e=this.matchKeyword("super")&&this.context.inFunctionBody?this.parseSuper():this.inheritCoverGrammar(this.matchKeyword("new")?this.parseNewExpression:this.parsePrimaryExpression);;)if(this.match("[")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect("[");var n=this.isolateCoverGrammar(this.parseExpression);this.expect("]"),e=this.finalize(t,new s.ComputedMemberExpression(e,n))}else if(this.match(".")){this.context.isBindingElement=!1,this.context.isAssignmentTarget=!0,this.expect(".");var n=this.parseIdentifierName();e=this.finalize(t,new s.StaticMemberExpression(e,n))}else{if(10!==this.lookahead.type||!this.lookahead.head)break;var i=this.parseTemplateLiteral();e=this.finalize(t,new s.TaggedTemplateExpression(e,i))}return e},t.prototype.parseUpdateExpression=function(){var t,e=this.lookahead;if(this.match("++")||this.match("--")){var n=this.startNode(e),r=this.nextToken();t=this.inheritCoverGrammar(this.parseUnaryExpression),this.context.strict&&t.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(t.name)&&this.tolerateError(o.Messages.StrictLHSPrefix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment);var i=!0;t=this.finalize(n,new s.UpdateExpression(r.value,t,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else if(t=this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall),!this.hasLineTerminator&&7===this.lookahead.type&&(this.match("++")||this.match("--"))){this.context.strict&&t.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(t.name)&&this.tolerateError(o.Messages.StrictLHSPostfix),this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var a=this.nextToken().value,i=!1;t=this.finalize(this.startNode(e),new s.UpdateExpression(a,t,i))}return t},t.prototype.parseAwaitExpression=function(){var t=this.createNode();this.nextToken();var e=this.parseUnaryExpression();return this.finalize(t,new s.AwaitExpression(e))},t.prototype.parseUnaryExpression=function(){var t;if(this.match("+")||this.match("-")||this.match("~")||this.match("!")||this.matchKeyword("delete")||this.matchKeyword("void")||this.matchKeyword("typeof")){var e=this.startNode(this.lookahead),n=this.nextToken();t=this.inheritCoverGrammar(this.parseUnaryExpression),t=this.finalize(e,new s.UnaryExpression(n.value,t)),this.context.strict&&"delete"===t.operator&&t.argument.type===u.Syntax.Identifier&&this.tolerateError(o.Messages.StrictDelete),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}else t=this.context.await&&this.matchContextualKeyword("await")?this.parseAwaitExpression():this.parseUpdateExpression();return t},t.prototype.parseExponentiationExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseUnaryExpression);if(e.type!==u.Syntax.UnaryExpression&&this.match("**")){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var n=e,r=this.isolateCoverGrammar(this.parseExponentiationExpression);e=this.finalize(this.startNode(t),new s.BinaryExpression("**",n,r))}return e},t.prototype.binaryPrecedence=function(t){var e=t.value;return 7===t.type?this.operatorPrecedence[e]||0:4===t.type&&("instanceof"===e||this.context.allowIn&&"in"===e)?7:0},t.prototype.parseBinaryExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseExponentiationExpression),n=this.lookahead,r=this.binaryPrecedence(n);if(r>0){this.nextToken(),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;for(var i=[t,this.lookahead],o=e,a=this.isolateCoverGrammar(this.parseExponentiationExpression),u=[o,n.value,a],c=[r];;){if((r=this.binaryPrecedence(this.lookahead))<=0)break;for(;u.length>2&&r<=c[c.length-1];){a=u.pop();var h=u.pop();c.pop(),o=u.pop(),i.pop();var l=this.startNode(i[i.length-1]);u.push(this.finalize(l,new s.BinaryExpression(h,o,a)))}u.push(this.nextToken().value),c.push(r),i.push(this.lookahead),u.push(this.isolateCoverGrammar(this.parseExponentiationExpression))}var p=u.length-1;for(e=u[p],i.pop();p>1;){var l=this.startNode(i.pop()),h=u[p-1];e=this.finalize(l,new s.BinaryExpression(h,u[p-2],e)),p-=2}}return e},t.prototype.parseConditionalExpression=function(){var t=this.lookahead,e=this.inheritCoverGrammar(this.parseBinaryExpression);if(this.match("?")){this.nextToken();var n=this.context.allowIn;this.context.allowIn=!0;var r=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowIn=n,this.expect(":");var i=this.isolateCoverGrammar(this.parseAssignmentExpression);e=this.finalize(this.startNode(t),new s.ConditionalExpression(e,r,i)),this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1}return e},t.prototype.checkPatternParam=function(t,e){switch(e.type){case u.Syntax.Identifier:this.validateParam(t,e,e.name);break;case u.Syntax.RestElement:this.checkPatternParam(t,e.argument);break;case u.Syntax.AssignmentPattern:this.checkPatternParam(t,e.left);break;case u.Syntax.ArrayPattern:for(var n=0;n<e.elements.length;n++)null!==e.elements[n]&&this.checkPatternParam(t,e.elements[n]);break;case u.Syntax.ObjectPattern:for(var n=0;n<e.properties.length;n++)this.checkPatternParam(t,e.properties[n].value)}t.simple=t.simple&&e instanceof s.Identifier},t.prototype.reinterpretAsCoverFormalsList=function(t){var e,n=[t],r=!1;switch(t.type){case u.Syntax.Identifier:break;case"ArrowParameterPlaceHolder":n=t.params,r=t.async;break;default:return null}e={simple:!0,paramSet:{}};for(var i=0;i<n.length;++i){var s=n[i];s.type===u.Syntax.AssignmentPattern?s.right.type===u.Syntax.YieldExpression&&(s.right.argument&&this.throwUnexpectedToken(this.lookahead),s.right.type=u.Syntax.Identifier,s.right.name="yield",delete s.right.argument,delete s.right.delegate):r&&s.type===u.Syntax.Identifier&&"await"===s.name&&this.throwUnexpectedToken(this.lookahead),this.checkPatternParam(e,s),n[i]=s}if(this.context.strict||!this.context.allowYield)for(var i=0;i<n.length;++i){var s=n[i];s.type===u.Syntax.YieldExpression&&this.throwUnexpectedToken(this.lookahead)}if(e.message===o.Messages.StrictParamDupe){var a=this.context.strict?e.stricted:e.firstRestricted;this.throwUnexpectedToken(a,e.message)}return{simple:e.simple,params:n,stricted:e.stricted,firstRestricted:e.firstRestricted,message:e.message}},t.prototype.parseAssignmentExpression=function(){var t;if(!this.context.allowYield&&this.matchKeyword("yield"))t=this.parseYieldExpression();else{var e=this.lookahead,n=e;if(t=this.parseConditionalExpression(),3===n.type&&n.lineNumber===this.lookahead.lineNumber&&"async"===n.value&&(3===this.lookahead.type||this.matchKeyword("yield"))){var r=this.parsePrimaryExpression();this.reinterpretExpressionAsPattern(r),t={type:"ArrowParameterPlaceHolder",params:[r],async:!0}}if("ArrowParameterPlaceHolder"===t.type||this.match("=>")){this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1;var i=t.async,a=this.reinterpretAsCoverFormalsList(t);if(a){this.hasLineTerminator&&this.tolerateUnexpectedToken(this.lookahead),this.context.firstCoverInitializedNameError=null;var c=this.context.strict,h=this.context.allowStrictDirective;this.context.allowStrictDirective=a.simple;var l=this.context.allowYield,p=this.context.await;this.context.allowYield=!0,this.context.await=i;var f=this.startNode(e);this.expect("=>");var d=void 0;if(this.match("{")){var m=this.context.allowIn;this.context.allowIn=!0,d=this.parseFunctionSourceElements(),this.context.allowIn=m}else d=this.isolateCoverGrammar(this.parseAssignmentExpression);var y=d.type!==u.Syntax.BlockStatement;this.context.strict&&a.firstRestricted&&this.throwUnexpectedToken(a.firstRestricted,a.message),this.context.strict&&a.stricted&&this.tolerateUnexpectedToken(a.stricted,a.message),t=i?this.finalize(f,new s.AsyncArrowFunctionExpression(a.params,d,y)):this.finalize(f,new s.ArrowFunctionExpression(a.params,d,y)),this.context.strict=c,this.context.allowStrictDirective=h,this.context.allowYield=l,this.context.await=p}}else if(this.matchAssign()){if(this.context.isAssignmentTarget||this.tolerateError(o.Messages.InvalidLHSInAssignment),this.context.strict&&t.type===u.Syntax.Identifier){var v=t;this.scanner.isRestrictedWord(v.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictLHSAssignment),this.scanner.isStrictModeReservedWord(v.name)&&this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord)}this.match("=")?this.reinterpretExpressionAsPattern(t):(this.context.isAssignmentTarget=!1,this.context.isBindingElement=!1),n=this.nextToken();var x=n.value,g=this.isolateCoverGrammar(this.parseAssignmentExpression);t=this.finalize(this.startNode(e),new s.AssignmentExpression(x,t,g)),this.context.firstCoverInitializedNameError=null}}return t},t.prototype.parseExpression=function(){var t=this.lookahead,e=this.isolateCoverGrammar(this.parseAssignmentExpression);if(this.match(",")){var n=[];for(n.push(e);2!==this.lookahead.type&&this.match(",");)this.nextToken(),n.push(this.isolateCoverGrammar(this.parseAssignmentExpression));e=this.finalize(this.startNode(t),new s.SequenceExpression(n))}return e},t.prototype.parseStatementListItem=function(){var t;if(this.context.isAssignmentTarget=!0,this.context.isBindingElement=!0,4===this.lookahead.type)switch(this.lookahead.value){case"export":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalExportDeclaration),t=this.parseExportDeclaration();break;case"import":this.context.isModule||this.tolerateUnexpectedToken(this.lookahead,o.Messages.IllegalImportDeclaration),t=this.parseImportDeclaration();break;case"const":t=this.parseLexicalDeclaration({inFor:!1});break;case"function":t=this.parseFunctionDeclaration();break;case"class":t=this.parseClassDeclaration();break;case"let":t=this.isLexicalDeclaration()?this.parseLexicalDeclaration({inFor:!1}):this.parseStatement();break;default:t=this.parseStatement()}else t=this.parseStatement();return t},t.prototype.parseBlock=function(){var t=this.createNode();this.expect("{");for(var e=[];;){if(this.match("}"))break;e.push(this.parseStatementListItem())}return this.expect("}"),this.finalize(t,new s.BlockStatement(e))},t.prototype.parseLexicalBinding=function(t,e){var n=this.createNode(),r=[],i=this.parsePattern(r,t);this.context.strict&&i.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(i.name)&&this.tolerateError(o.Messages.StrictVarName);var a=null;return"const"===t?this.matchKeyword("in")||this.matchContextualKeyword("of")||(this.match("=")?(this.nextToken(),a=this.isolateCoverGrammar(this.parseAssignmentExpression)):this.throwError(o.Messages.DeclarationMissingInitializer,"const")):(!e.inFor&&i.type!==u.Syntax.Identifier||this.match("="))&&(this.expect("="),a=this.isolateCoverGrammar(this.parseAssignmentExpression)),this.finalize(n,new s.VariableDeclarator(i,a))},t.prototype.parseBindingList=function(t,e){for(var n=[this.parseLexicalBinding(t,e)];this.match(",");)this.nextToken(),n.push(this.parseLexicalBinding(t,e));return n},t.prototype.isLexicalDeclaration=function(){var t=this.scanner.saveState();this.scanner.scanComments();var e=this.scanner.lex();return this.scanner.restoreState(t),3===e.type||7===e.type&&"["===e.value||7===e.type&&"{"===e.value||4===e.type&&"let"===e.value||4===e.type&&"yield"===e.value},t.prototype.parseLexicalDeclaration=function(t){var e=this.createNode(),n=this.nextToken().value;r.assert("let"===n||"const"===n,"Lexical declaration must be either let or const");var i=this.parseBindingList(n,t);return this.consumeSemicolon(),this.finalize(e,new s.VariableDeclaration(i,n))},t.prototype.parseBindingRestElement=function(t,e){var n=this.createNode();this.expect("...");var r=this.parsePattern(t,e);return this.finalize(n,new s.RestElement(r))},t.prototype.parseArrayPattern=function(t,e){var n=this.createNode();this.expect("[");for(var r=[];!this.match("]");)if(this.match(","))this.nextToken(),r.push(null);else{if(this.match("...")){r.push(this.parseBindingRestElement(t,e));break}r.push(this.parsePatternWithDefault(t,e)),this.match("]")||this.expect(",")}return this.expect("]"),this.finalize(n,new s.ArrayPattern(r))},t.prototype.parsePropertyPattern=function(t,e){var n,r,i=this.createNode(),o=!1,a=!1;if(3===this.lookahead.type){var u=this.lookahead;n=this.parseVariableIdentifier();var c=this.finalize(i,new s.Identifier(u.value));if(this.match("=")){t.push(u),a=!0,this.nextToken();var h=this.parseAssignmentExpression();r=this.finalize(this.startNode(u),new s.AssignmentPattern(c,h))}else this.match(":")?(this.expect(":"),r=this.parsePatternWithDefault(t,e)):(t.push(u),a=!0,r=c)}else o=this.match("["),n=this.parseObjectPropertyKey(),this.expect(":"),r=this.parsePatternWithDefault(t,e);return this.finalize(i,new s.Property("init",n,o,r,!1,a))},t.prototype.parseObjectPattern=function(t,e){var n=this.createNode(),r=[];for(this.expect("{");!this.match("}");)r.push(this.parsePropertyPattern(t,e)),this.match("}")||this.expect(",");return this.expect("}"),this.finalize(n,new s.ObjectPattern(r))},t.prototype.parsePattern=function(t,e){var n;return this.match("[")?n=this.parseArrayPattern(t,e):this.match("{")?n=this.parseObjectPattern(t,e):(!this.matchKeyword("let")||"const"!==e&&"let"!==e||this.tolerateUnexpectedToken(this.lookahead,o.Messages.LetInLexicalBinding),t.push(this.lookahead),n=this.parseVariableIdentifier(e)),n},t.prototype.parsePatternWithDefault=function(t,e){var n=this.lookahead,r=this.parsePattern(t,e);if(this.match("=")){this.nextToken();var i=this.context.allowYield;this.context.allowYield=!0;var o=this.isolateCoverGrammar(this.parseAssignmentExpression);this.context.allowYield=i,r=this.finalize(this.startNode(n),new s.AssignmentPattern(r,o))}return r},t.prototype.parseVariableIdentifier=function(t){var e=this.createNode(),n=this.nextToken();return 4===n.type&&"yield"===n.value?this.context.strict?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):this.context.allowYield||this.throwUnexpectedToken(n):3!==n.type?this.context.strict&&4===n.type&&this.scanner.isStrictModeReservedWord(n.value)?this.tolerateUnexpectedToken(n,o.Messages.StrictReservedWord):(this.context.strict||"let"!==n.value||"var"!==t)&&this.throwUnexpectedToken(n):(this.context.isModule||this.context.await)&&3===n.type&&"await"===n.value&&this.tolerateUnexpectedToken(n),this.finalize(e,new s.Identifier(n.value))},t.prototype.parseVariableDeclaration=function(t){var e=this.createNode(),n=[],r=this.parsePattern(n,"var");this.context.strict&&r.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(r.name)&&this.tolerateError(o.Messages.StrictVarName);var i=null;return this.match("=")?(this.nextToken(),i=this.isolateCoverGrammar(this.parseAssignmentExpression)):r.type===u.Syntax.Identifier||t.inFor||this.expect("="),this.finalize(e,new s.VariableDeclarator(r,i))},t.prototype.parseVariableDeclarationList=function(t){var e={inFor:t.inFor},n=[];for(n.push(this.parseVariableDeclaration(e));this.match(",");)this.nextToken(),n.push(this.parseVariableDeclaration(e));return n},t.prototype.parseVariableStatement=function(){var t=this.createNode();this.expectKeyword("var");var e=this.parseVariableDeclarationList({inFor:!1});return this.consumeSemicolon(),this.finalize(t,new s.VariableDeclaration(e,"var"))},t.prototype.parseEmptyStatement=function(){var t=this.createNode();return this.expect(";"),this.finalize(t,new s.EmptyStatement)},t.prototype.parseExpressionStatement=function(){var t=this.createNode(),e=this.parseExpression();return this.consumeSemicolon(),this.finalize(t,new s.ExpressionStatement(e))},t.prototype.parseIfClause=function(){return this.context.strict&&this.matchKeyword("function")&&this.tolerateError(o.Messages.StrictFunction),this.parseStatement()},t.prototype.parseIfStatement=function(){var t,e=this.createNode(),n=null;this.expectKeyword("if"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement)):(this.expect(")"),t=this.parseIfClause(),this.matchKeyword("else")&&(this.nextToken(),n=this.parseIfClause())),this.finalize(e,new s.IfStatement(r,t,n))},t.prototype.parseDoWhileStatement=function(){var t=this.createNode();this.expectKeyword("do");var e=this.context.inIteration;this.context.inIteration=!0;var n=this.parseStatement();this.context.inIteration=e,this.expectKeyword("while"),this.expect("(");var r=this.parseExpression();return!this.match(")")&&this.config.tolerant?this.tolerateUnexpectedToken(this.nextToken()):(this.expect(")"),this.match(";")&&this.nextToken()),this.finalize(t,new s.DoWhileStatement(n,r))},t.prototype.parseWhileStatement=function(){var t,e=this.createNode();this.expectKeyword("while"),this.expect("(");var n=this.parseExpression();if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement);else{this.expect(")");var r=this.context.inIteration;this.context.inIteration=!0,t=this.parseStatement(),this.context.inIteration=r}return this.finalize(e,new s.WhileStatement(n,t))},t.prototype.parseForStatement=function(){var t,e,n=null,r=null,i=null,a=!0,c=this.createNode();if(this.expectKeyword("for"),this.expect("("),this.match(";"))this.nextToken();else if(this.matchKeyword("var")){n=this.createNode(),this.nextToken();var h=this.context.allowIn;this.context.allowIn=!1;var l=this.parseVariableDeclarationList({inFor:!0});if(this.context.allowIn=h,1===l.length&&this.matchKeyword("in")){var p=l[0];p.init&&(p.id.type===u.Syntax.ArrayPattern||p.id.type===u.Syntax.ObjectPattern||this.context.strict)&&this.tolerateError(o.Messages.ForInOfLoopInitializer,"for-in"),n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.nextToken(),t=n,e=this.parseExpression(),n=null}else 1===l.length&&null===l[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.nextToken(),t=n,e=this.parseAssignmentExpression(),n=null,a=!1):(n=this.finalize(n,new s.VariableDeclaration(l,"var")),this.expect(";"))}else if(this.matchKeyword("const")||this.matchKeyword("let")){n=this.createNode();var f=this.nextToken().value;if(this.context.strict||"in"!==this.lookahead.value){var h=this.context.allowIn;this.context.allowIn=!1;var l=this.parseBindingList(f,{inFor:!0});this.context.allowIn=h,1===l.length&&null===l[0].init&&this.matchKeyword("in")?(n=this.finalize(n,new s.VariableDeclaration(l,f)),this.nextToken(),t=n,e=this.parseExpression(),n=null):1===l.length&&null===l[0].init&&this.matchContextualKeyword("of")?(n=this.finalize(n,new s.VariableDeclaration(l,f)),this.nextToken(),t=n,e=this.parseAssignmentExpression(),n=null,a=!1):(this.consumeSemicolon(),n=this.finalize(n,new s.VariableDeclaration(l,f)))}else n=this.finalize(n,new s.Identifier(f)),this.nextToken(),t=n,e=this.parseExpression(),n=null}else{var d=this.lookahead,h=this.context.allowIn;if(this.context.allowIn=!1,n=this.inheritCoverGrammar(this.parseAssignmentExpression),this.context.allowIn=h,this.matchKeyword("in"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForIn),this.nextToken(),this.reinterpretExpressionAsPattern(n),t=n,e=this.parseExpression(),n=null;else if(this.matchContextualKeyword("of"))this.context.isAssignmentTarget&&n.type!==u.Syntax.AssignmentExpression||this.tolerateError(o.Messages.InvalidLHSInForLoop),this.nextToken(),this.reinterpretExpressionAsPattern(n),t=n,e=this.parseAssignmentExpression(),n=null,a=!1;else{if(this.match(",")){for(var m=[n];this.match(",");)this.nextToken(),m.push(this.isolateCoverGrammar(this.parseAssignmentExpression));n=this.finalize(this.startNode(d),new s.SequenceExpression(m))}this.expect(";")}}void 0===t&&(this.match(";")||(r=this.parseExpression()),this.expect(";"),this.match(")")||(i=this.parseExpression()));var y;if(!this.match(")")&&this.config.tolerant)this.tolerateUnexpectedToken(this.nextToken()),y=this.finalize(this.createNode(),new s.EmptyStatement);else{this.expect(")");var v=this.context.inIteration;this.context.inIteration=!0,y=this.isolateCoverGrammar(this.parseStatement),this.context.inIteration=v}return void 0===t?this.finalize(c,new s.ForStatement(n,r,i,y)):a?this.finalize(c,new s.ForInStatement(t,e,y)):this.finalize(c,new s.ForOfStatement(t,e,y))},t.prototype.parseContinueStatement=function(){var t=this.createNode();this.expectKeyword("continue");var e=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier();e=n;var r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name)}return this.consumeSemicolon(),null!==e||this.context.inIteration||this.throwError(o.Messages.IllegalContinue),this.finalize(t,new s.ContinueStatement(e))},t.prototype.parseBreakStatement=function(){var t=this.createNode();this.expectKeyword("break");var e=null;if(3===this.lookahead.type&&!this.hasLineTerminator){var n=this.parseVariableIdentifier(),r="$"+n.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,r)||this.throwError(o.Messages.UnknownLabel,n.name),e=n}return this.consumeSemicolon(),null!==e||this.context.inIteration||this.context.inSwitch||this.throwError(o.Messages.IllegalBreak),this.finalize(t,new s.BreakStatement(e))},t.prototype.parseReturnStatement=function(){this.context.inFunctionBody||this.tolerateError(o.Messages.IllegalReturn);var t=this.createNode();this.expectKeyword("return");var e=!this.match(";")&&!this.match("}")&&!this.hasLineTerminator&&2!==this.lookahead.type,n=e?this.parseExpression():null;return this.consumeSemicolon(),this.finalize(t,new s.ReturnStatement(n))},t.prototype.parseWithStatement=function(){this.context.strict&&this.tolerateError(o.Messages.StrictModeWith);var t,e=this.createNode();this.expectKeyword("with"),this.expect("(");var n=this.parseExpression();return!this.match(")")&&this.config.tolerant?(this.tolerateUnexpectedToken(this.nextToken()),t=this.finalize(this.createNode(),new s.EmptyStatement)):(this.expect(")"),t=this.parseStatement()),this.finalize(e,new s.WithStatement(n,t))},t.prototype.parseSwitchCase=function(){var t,e=this.createNode();this.matchKeyword("default")?(this.nextToken(),t=null):(this.expectKeyword("case"),t=this.parseExpression()),this.expect(":");for(var n=[];;){if(this.match("}")||this.matchKeyword("default")||this.matchKeyword("case"))break;n.push(this.parseStatementListItem())}return this.finalize(e,new s.SwitchCase(t,n))},t.prototype.parseSwitchStatement=function(){var t=this.createNode();this.expectKeyword("switch"),this.expect("(");var e=this.parseExpression();this.expect(")");var n=this.context.inSwitch;this.context.inSwitch=!0;var r=[],i=!1;for(this.expect("{");;){if(this.match("}"))break;var a=this.parseSwitchCase();null===a.test&&(i&&this.throwError(o.Messages.MultipleDefaultsInSwitch),i=!0),r.push(a)}return this.expect("}"),this.context.inSwitch=n,this.finalize(t,new s.SwitchStatement(e,r))},t.prototype.parseLabelledStatement=function(){var t,e=this.createNode(),n=this.parseExpression();if(n.type===u.Syntax.Identifier&&this.match(":")){this.nextToken();var r=n,i="$"+r.name;Object.prototype.hasOwnProperty.call(this.context.labelSet,i)&&this.throwError(o.Messages.Redeclaration,"Label",r.name),this.context.labelSet[i]=!0;var a=void 0;if(this.matchKeyword("class"))this.tolerateUnexpectedToken(this.lookahead),a=this.parseClassDeclaration();else if(this.matchKeyword("function")){var c=this.lookahead,h=this.parseFunctionDeclaration();this.context.strict?this.tolerateUnexpectedToken(c,o.Messages.StrictFunction):h.generator&&this.tolerateUnexpectedToken(c,o.Messages.GeneratorInLegacyContext),a=h}else a=this.parseStatement();delete this.context.labelSet[i],t=new s.LabeledStatement(r,a)}else this.consumeSemicolon(),t=new s.ExpressionStatement(n);return this.finalize(e,t)},t.prototype.parseThrowStatement=function(){var t=this.createNode();this.expectKeyword("throw"),this.hasLineTerminator&&this.throwError(o.Messages.NewlineAfterThrow);var e=this.parseExpression();return this.consumeSemicolon(),this.finalize(t,new s.ThrowStatement(e))},t.prototype.parseCatchClause=function(){var t=this.createNode();this.expectKeyword("catch"),this.expect("("),this.match(")")&&this.throwUnexpectedToken(this.lookahead);for(var e=[],n=this.parsePattern(e),r={},i=0;i<e.length;i++){var a="$"+e[i].value;Object.prototype.hasOwnProperty.call(r,a)&&this.tolerateError(o.Messages.DuplicateBinding,e[i].value),r[a]=!0}this.context.strict&&n.type===u.Syntax.Identifier&&this.scanner.isRestrictedWord(n.name)&&this.tolerateError(o.Messages.StrictCatchVariable),this.expect(")");var c=this.parseBlock();return this.finalize(t,new s.CatchClause(n,c))},t.prototype.parseFinallyClause=function(){return this.expectKeyword("finally"),this.parseBlock()},t.prototype.parseTryStatement=function(){var t=this.createNode();this.expectKeyword("try");var e=this.parseBlock(),n=this.matchKeyword("catch")?this.parseCatchClause():null,r=this.matchKeyword("finally")?this.parseFinallyClause():null;return n||r||this.throwError(o.Messages.NoCatchOrFinally),this.finalize(t,new s.TryStatement(e,n,r))},t.prototype.parseDebuggerStatement=function(){var t=this.createNode();return this.expectKeyword("debugger"),this.consumeSemicolon(),this.finalize(t,new s.DebuggerStatement)},t.prototype.parseStatement=function(){var t;switch(this.lookahead.type){case 1:case 5:case 6:case 8:case 10:case 9:t=this.parseExpressionStatement();break;case 7:var e=this.lookahead.value;t="{"===e?this.parseBlock():"("===e?this.parseExpressionStatement():";"===e?this.parseEmptyStatement():this.parseExpressionStatement();break;case 3:t=this.matchAsyncFunction()?this.parseFunctionDeclaration():this.parseLabelledStatement();break;case 4:switch(this.lookahead.value){case"break":t=this.parseBreakStatement();break;case"continue":t=this.parseContinueStatement();break;case"debugger":t=this.parseDebuggerStatement();break;case"do":t=this.parseDoWhileStatement();break;case"for":t=this.parseForStatement();break;case"function":t=this.parseFunctionDeclaration();break;case"if":t=this.parseIfStatement();break;case"return":t=this.parseReturnStatement();break;case"switch":t=this.parseSwitchStatement();break;case"throw":t=this.parseThrowStatement();break;case"try":t=this.parseTryStatement();break;case"var":t=this.parseVariableStatement();break;case"while":t=this.parseWhileStatement();break;case"with":t=this.parseWithStatement();break;default:t=this.parseExpressionStatement()}break;default:t=this.throwUnexpectedToken(this.lookahead)}return t},t.prototype.parseFunctionSourceElements=function(){var t=this.createNode();this.expect("{");var e=this.parseDirectivePrologues(),n=this.context.labelSet,r=this.context.inIteration,i=this.context.inSwitch,o=this.context.inFunctionBody;for(this.context.labelSet={},this.context.inIteration=!1,this.context.inSwitch=!1,this.context.inFunctionBody=!0;2!==this.lookahead.type&&!this.match("}");)e.push(this.parseStatementListItem());return this.expect("}"),this.context.labelSet=n,this.context.inIteration=r,this.context.inSwitch=i,this.context.inFunctionBody=o,this.finalize(t,new s.BlockStatement(e))},t.prototype.validateParam=function(t,e,n){var r="$"+n;this.context.strict?(this.scanner.isRestrictedWord(n)&&(t.stricted=e,t.message=o.Messages.StrictParamName),Object.prototype.hasOwnProperty.call(t.paramSet,r)&&(t.stricted=e,t.message=o.Messages.StrictParamDupe)):t.firstRestricted||(this.scanner.isRestrictedWord(n)?(t.firstRestricted=e,t.message=o.Messages.StrictParamName):this.scanner.isStrictModeReservedWord(n)?(t.firstRestricted=e,t.message=o.Messages.StrictReservedWord):Object.prototype.hasOwnProperty.call(t.paramSet,r)&&(t.stricted=e,t.message=o.Messages.StrictParamDupe)),"function"==typeof Object.defineProperty?Object.defineProperty(t.paramSet,r,{value:!0,enumerable:!0,writable:!0,configurable:!0}):t.paramSet[r]=!0},t.prototype.parseRestElement=function(t){var e=this.createNode();this.expect("...");var n=this.parsePattern(t);return this.match("=")&&this.throwError(o.Messages.DefaultRestParameter),this.match(")")||this.throwError(o.Messages.ParameterAfterRestParameter),this.finalize(e,new s.RestElement(n))},t.prototype.parseFormalParameter=function(t){for(var e=[],n=this.match("...")?this.parseRestElement(e):this.parsePatternWithDefault(e),r=0;r<e.length;r++)this.validateParam(t,e[r],e[r].value);t.simple=t.simple&&n instanceof s.Identifier,t.params.push(n)},t.prototype.parseFormalParameters=function(t){var e;if(e={simple:!0,params:[],firstRestricted:t},this.expect("("),!this.match(")"))for(e.paramSet={};2!==this.lookahead.type&&(this.parseFormalParameter(e),!this.match(")"))&&(this.expect(","),!this.match(")")););return this.expect(")"),{simple:e.simple,params:e.params,stricted:e.stricted,firstRestricted:e.firstRestricted,message:e.message}},t.prototype.matchAsyncFunction=function(){var t=this.matchContextualKeyword("async");if(t){var e=this.scanner.saveState();this.scanner.scanComments();var n=this.scanner.lex();this.scanner.restoreState(e),t=e.lineNumber===n.lineNumber&&4===n.type&&"function"===n.value}return t},t.prototype.parseFunctionDeclaration=function(t){var e=this.createNode(),n=this.matchContextualKeyword("async");n&&this.nextToken(),this.expectKeyword("function");var r=!n&&this.match("*");r&&this.nextToken();var i,a=null,u=null;if(!t||!this.match("(")){var c=this.lookahead;a=this.parseVariableIdentifier(),this.context.strict?this.scanner.isRestrictedWord(c.value)&&this.tolerateUnexpectedToken(c,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(c.value)?(u=c,i=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(c.value)&&(u=c,i=o.Messages.StrictReservedWord)}var h=this.context.await,l=this.context.allowYield;this.context.await=n,this.context.allowYield=!r;var p=this.parseFormalParameters(u),f=p.params,d=p.stricted;u=p.firstRestricted,p.message&&(i=p.message);var m=this.context.strict,y=this.context.allowStrictDirective;this.context.allowStrictDirective=p.simple;var v=this.parseFunctionSourceElements();return this.context.strict&&u&&this.throwUnexpectedToken(u,i),this.context.strict&&d&&this.tolerateUnexpectedToken(d,i),this.context.strict=m,this.context.allowStrictDirective=y,this.context.await=h,this.context.allowYield=l,n?this.finalize(e,new s.AsyncFunctionDeclaration(a,f,v)):this.finalize(e,new s.FunctionDeclaration(a,f,v,r))},t.prototype.parseFunctionExpression=function(){var t=this.createNode(),e=this.matchContextualKeyword("async");e&&this.nextToken(),this.expectKeyword("function");var n=!e&&this.match("*");n&&this.nextToken();var r,i,a=null,u=this.context.await,c=this.context.allowYield;if(this.context.await=e,this.context.allowYield=!n,!this.match("(")){var h=this.lookahead;a=this.context.strict||n||!this.matchKeyword("yield")?this.parseVariableIdentifier():this.parseIdentifierName(),this.context.strict?this.scanner.isRestrictedWord(h.value)&&this.tolerateUnexpectedToken(h,o.Messages.StrictFunctionName):this.scanner.isRestrictedWord(h.value)?(i=h,r=o.Messages.StrictFunctionName):this.scanner.isStrictModeReservedWord(h.value)&&(i=h,r=o.Messages.StrictReservedWord)}var l=this.parseFormalParameters(i),p=l.params,f=l.stricted;i=l.firstRestricted,l.message&&(r=l.message);var d=this.context.strict,m=this.context.allowStrictDirective;this.context.allowStrictDirective=l.simple;var y=this.parseFunctionSourceElements();return this.context.strict&&i&&this.throwUnexpectedToken(i,r),this.context.strict&&f&&this.tolerateUnexpectedToken(f,r),this.context.strict=d,this.context.allowStrictDirective=m,this.context.await=u,this.context.allowYield=c,e?this.finalize(t,new s.AsyncFunctionExpression(a,p,y)):this.finalize(t,new s.FunctionExpression(a,p,y,n))},t.prototype.parseDirective=function(){var t=this.lookahead,e=this.createNode(),n=this.parseExpression(),r=n.type===u.Syntax.Literal?this.getTokenRaw(t).slice(1,-1):null;return this.consumeSemicolon(),this.finalize(e,r?new s.Directive(n,r):new s.ExpressionStatement(n))},t.prototype.parseDirectivePrologues=function(){for(var t=null,e=[];;){var n=this.lookahead;if(8!==n.type)break;var r=this.parseDirective();e.push(r);var i=r.directive;if("string"!=typeof i)break;"use strict"===i?(this.context.strict=!0,t&&this.tolerateUnexpectedToken(t,o.Messages.StrictOctalLiteral),this.context.allowStrictDirective||this.tolerateUnexpectedToken(n,o.Messages.IllegalLanguageModeDirective)):!t&&n.octal&&(t=n)}return e},t.prototype.qualifiedPropertyName=function(t){switch(t.type){case 3:case 8:case 1:case 5:case 6:case 4:return!0;case 7:return"["===t.value}return!1},t.prototype.parseGetterMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();n.params.length>0&&this.tolerateError(o.Messages.BadGetterArity);var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parseSetterMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!1;var n=this.parseFormalParameters();1!==n.params.length?this.tolerateError(o.Messages.BadSetterArity):n.params[0]instanceof s.RestElement&&this.tolerateError(o.Messages.BadSetterRestParameter);var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!1))},t.prototype.parseGeneratorMethod=function(){var t=this.createNode(),e=this.context.allowYield;this.context.allowYield=!0;var n=this.parseFormalParameters();this.context.allowYield=!1;var r=this.parsePropertyMethod(n);return this.context.allowYield=e,this.finalize(t,new s.FunctionExpression(null,n.params,r,!0))},t.prototype.isStartOfExpression=function(){var t=!0,e=this.lookahead.value;switch(this.lookahead.type){case 7:t="["===e||"("===e||"{"===e||"+"===e||"-"===e||"!"===e||"~"===e||"++"===e||"--"===e||"/"===e||"/="===e;break;case 4:t="class"===e||"delete"===e||"function"===e||"let"===e||"new"===e||"super"===e||"this"===e||"typeof"===e||"void"===e||"yield"===e}return t},t.prototype.parseYieldExpression=function(){var t=this.createNode();this.expectKeyword("yield");var e=null,n=!1;if(!this.hasLineTerminator){var r=this.context.allowYield;this.context.allowYield=!1,n=this.match("*"),n?(this.nextToken(),e=this.parseAssignmentExpression()):this.isStartOfExpression()&&(e=this.parseAssignmentExpression()),this.context.allowYield=r}return this.finalize(t,new s.YieldExpression(e,n))},t.prototype.parseClassElement=function(t){var e=this.lookahead,n=this.createNode(),r="",i=null,a=null,u=!1,c=!1,h=!1,l=!1;if(this.match("*"))this.nextToken();else{u=this.match("["),i=this.parseObjectPropertyKey();if("static"===i.name&&(this.qualifiedPropertyName(this.lookahead)||this.match("*"))&&(e=this.lookahead,h=!0,u=this.match("["),this.match("*")?this.nextToken():i=this.parseObjectPropertyKey()),3===e.type&&!this.hasLineTerminator&&"async"===e.value){var p=this.lookahead.value;":"!==p&&"("!==p&&"*"!==p&&(l=!0,e=this.lookahead,i=this.parseObjectPropertyKey(),3===e.type&&("get"===e.value||"set"===e.value?this.tolerateUnexpectedToken(e):"constructor"===e.value&&this.tolerateUnexpectedToken(e,o.Messages.ConstructorIsAsync)))}}var f=this.qualifiedPropertyName(this.lookahead);return 3===e.type?"get"===e.value&&f?(r="get",u=this.match("["),i=this.parseObjectPropertyKey(),this.context.allowYield=!1,a=this.parseGetterMethod()):"set"===e.value&&f&&(r="set",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseSetterMethod()):7===e.type&&"*"===e.value&&f&&(r="init",u=this.match("["),i=this.parseObjectPropertyKey(),a=this.parseGeneratorMethod(),c=!0),!r&&i&&this.match("(")&&(r="init",a=l?this.parsePropertyMethodAsyncFunction():this.parsePropertyMethodFunction(),c=!0),r||this.throwUnexpectedToken(this.lookahead),"init"===r&&(r="method"),u||(h&&this.isPropertyKey(i,"prototype")&&this.throwUnexpectedToken(e,o.Messages.StaticPrototype),!h&&this.isPropertyKey(i,"constructor")&&(("method"!==r||!c||a&&a.generator)&&this.throwUnexpectedToken(e,o.Messages.ConstructorSpecialMethod),t.value?this.throwUnexpectedToken(e,o.Messages.DuplicateConstructor):t.value=!0,r="constructor")),this.finalize(n,new s.MethodDefinition(i,u,a,r,h))},t.prototype.parseClassElementList=function(){var t=[],e={value:!1};for(this.expect("{");!this.match("}");)this.match(";")?this.nextToken():t.push(this.parseClassElement(e));return this.expect("}"),t},t.prototype.parseClassBody=function(){var t=this.createNode(),e=this.parseClassElementList();return this.finalize(t,new s.ClassBody(e))},t.prototype.parseClassDeclaration=function(t){var e=this.createNode(),n=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var r=t&&3!==this.lookahead.type?null:this.parseVariableIdentifier(),i=null;this.matchKeyword("extends")&&(this.nextToken(),i=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var o=this.parseClassBody();return this.context.strict=n,this.finalize(e,new s.ClassDeclaration(r,i,o))},t.prototype.parseClassExpression=function(){var t=this.createNode(),e=this.context.strict;this.context.strict=!0,this.expectKeyword("class");var n=3===this.lookahead.type?this.parseVariableIdentifier():null,r=null;this.matchKeyword("extends")&&(this.nextToken(),r=this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall));var i=this.parseClassBody();return this.context.strict=e,this.finalize(t,new s.ClassExpression(n,r,i))},t.prototype.parseModule=function(){this.context.strict=!0,this.context.isModule=!0;for(var t=this.createNode(),e=this.parseDirectivePrologues();2!==this.lookahead.type;)e.push(this.parseStatementListItem());return this.finalize(t,new s.Module(e))},t.prototype.parseScript=function(){for(var t=this.createNode(),e=this.parseDirectivePrologues();2!==this.lookahead.type;)e.push(this.parseStatementListItem());return this.finalize(t,new s.Script(e))},t.prototype.parseModuleSpecifier=function(){var t=this.createNode();8!==this.lookahead.type&&this.throwError(o.Messages.InvalidModuleSpecifier);var e=this.nextToken(),n=this.getTokenRaw(e);return this.finalize(t,new s.Literal(e.value,n))},t.prototype.parseImportSpecifier=function(){var t,e,n=this.createNode();return 3===this.lookahead.type?(t=this.parseVariableIdentifier(),e=t,this.matchContextualKeyword("as")&&(this.nextToken(),e=this.parseVariableIdentifier())):(t=this.parseIdentifierName(),e=t,this.matchContextualKeyword("as")?(this.nextToken(),e=this.parseVariableIdentifier()):this.throwUnexpectedToken(this.nextToken())),this.finalize(n,new s.ImportSpecifier(e,t))},t.prototype.parseNamedImports=function(){this.expect("{");for(var t=[];!this.match("}");)t.push(this.parseImportSpecifier()),this.match("}")||this.expect(",");return this.expect("}"),t},t.prototype.parseImportDefaultSpecifier=function(){var t=this.createNode(),e=this.parseIdentifierName();return this.finalize(t,new s.ImportDefaultSpecifier(e))},t.prototype.parseImportNamespaceSpecifier=function(){var t=this.createNode();this.expect("*"),this.matchContextualKeyword("as")||this.throwError(o.Messages.NoAsAfterImportNamespace),this.nextToken();var e=this.parseIdentifierName();return this.finalize(t,new s.ImportNamespaceSpecifier(e))},t.prototype.parseImportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalImportDeclaration);var t=this.createNode();this.expectKeyword("import");var e,n=[];if(8===this.lookahead.type)e=this.parseModuleSpecifier();else{if(this.match("{")?n=n.concat(this.parseNamedImports()):this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.isIdentifierName(this.lookahead)&&!this.matchKeyword("default")?(n.push(this.parseImportDefaultSpecifier()),this.match(",")&&(this.nextToken(),this.match("*")?n.push(this.parseImportNamespaceSpecifier()):this.match("{")?n=n.concat(this.parseNamedImports()):this.throwUnexpectedToken(this.lookahead))):this.throwUnexpectedToken(this.nextToken()),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken(),e=this.parseModuleSpecifier()}return this.consumeSemicolon(),this.finalize(t,new s.ImportDeclaration(n,e))},t.prototype.parseExportSpecifier=function(){var t=this.createNode(),e=this.parseIdentifierName(),n=e;return this.matchContextualKeyword("as")&&(this.nextToken(),n=this.parseIdentifierName()),this.finalize(t,new s.ExportSpecifier(e,n))},t.prototype.parseExportDeclaration=function(){this.context.inFunctionBody&&this.throwError(o.Messages.IllegalExportDeclaration);var t=this.createNode();this.expectKeyword("export");var e;if(this.matchKeyword("default"))if(this.nextToken(),this.matchKeyword("function")){var n=this.parseFunctionDeclaration(!0);e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.matchKeyword("class")){var n=this.parseClassDeclaration(!0);e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.matchContextualKeyword("async")){var n=this.matchAsyncFunction()?this.parseFunctionDeclaration(!0):this.parseAssignmentExpression();e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else{this.matchContextualKeyword("from")&&this.throwError(o.Messages.UnexpectedToken,this.lookahead.value);var n=this.match("{")?this.parseObjectInitializer():this.match("[")?this.parseArrayInitializer():this.parseAssignmentExpression();this.consumeSemicolon(),e=this.finalize(t,new s.ExportDefaultDeclaration(n))}else if(this.match("*")){if(this.nextToken(),!this.matchContextualKeyword("from")){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}this.nextToken();var i=this.parseModuleSpecifier();this.consumeSemicolon(),e=this.finalize(t,new s.ExportAllDeclaration(i))}else if(4===this.lookahead.type){var n=void 0;switch(this.lookahead.value){case"let":case"const":n=this.parseLexicalDeclaration({inFor:!1});break;case"var":case"class":case"function":n=this.parseStatementListItem();break;default:this.throwUnexpectedToken(this.lookahead)}e=this.finalize(t,new s.ExportNamedDeclaration(n,[],null))}else if(this.matchAsyncFunction()){var n=this.parseFunctionDeclaration();e=this.finalize(t,new s.ExportNamedDeclaration(n,[],null))}else{var a=[],u=null,c=!1;for(this.expect("{");!this.match("}");)c=c||this.matchKeyword("default"),a.push(this.parseExportSpecifier()),this.match("}")||this.expect(",");if(this.expect("}"),this.matchContextualKeyword("from"))this.nextToken(),u=this.parseModuleSpecifier(),this.consumeSemicolon();else if(c){var r=this.lookahead.value?o.Messages.UnexpectedToken:o.Messages.MissingFromClause;this.throwError(r,this.lookahead.value)}else this.consumeSemicolon();e=this.finalize(t,new s.ExportNamedDeclaration(null,a,u))}return e},t}();e.Parser=h},function(t,e){"use strict";function n(t,e){if(!t)throw new Error("ASSERT: "+e)}Object.defineProperty(e,"__esModule",{value:!0}),e.assert=n},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=function(){function t(){this.errors=[],this.tolerant=!1}return t.prototype.recordError=function(t){this.errors.push(t)},t.prototype.tolerate=function(t){if(!this.tolerant)throw t;this.recordError(t)},t.prototype.constructError=function(t,e){var n=new Error(t);try{throw n}catch(t){Object.create&&Object.defineProperty&&(n=Object.create(t),Object.defineProperty(n,"column",{value:e}))}return n},t.prototype.createError=function(t,e,n,r){var i="Line "+e+": "+r,o=this.constructError(i,n);return o.index=t,o.lineNumber=e,o.description=r,o},t.prototype.throwError=function(t,e,n,r){throw this.createError(t,e,n,r)},t.prototype.tolerateError=function(t,e,n,r){var i=this.createError(t,e,n,r);if(!this.tolerant)throw i;this.recordError(i)},t}();e.ErrorHandler=n},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Messages={BadGetterArity:"Getter must not have any formal parameters",BadSetterArity:"Setter must have exactly one formal parameter",BadSetterRestParameter:"Setter function argument must not be a rest parameter",ConstructorIsAsync:"Class constructor may not be an async method",ConstructorSpecialMethod:"Class constructor may not be an accessor",DeclarationMissingInitializer:"Missing initializer in %0 declaration",DefaultRestParameter:"Unexpected token =",DuplicateBinding:"Duplicate binding %0",DuplicateConstructor:"A class may only have one constructor",DuplicateProtoProperty:"Duplicate __proto__ fields are not allowed in object literals",ForInOfLoopInitializer:"%0 loop variable declaration may not have an initializer",GeneratorInLegacyContext:"Generator declarations are not allowed in legacy contexts",IllegalBreak:"Illegal break statement",IllegalContinue:"Illegal continue statement",IllegalExportDeclaration:"Unexpected token",IllegalImportDeclaration:"Unexpected token",IllegalLanguageModeDirective:"Illegal 'use strict' directive in function with non-simple parameter list",IllegalReturn:"Illegal return statement",InvalidEscapedReservedWord:"Keyword must not contain escaped characters",InvalidHexEscapeSequence:"Invalid hexadecimal escape sequence",InvalidLHSInAssignment:"Invalid left-hand side in assignment",InvalidLHSInForIn:"Invalid left-hand side in for-in",InvalidLHSInForLoop:"Invalid left-hand side in for-loop",InvalidModuleSpecifier:"Unexpected token",InvalidRegExp:"Invalid regular expression",LetInLexicalBinding:"let is disallowed as a lexically bound name",MissingFromClause:"Unexpected token",MultipleDefaultsInSwitch:"More than one default clause in switch statement",NewlineAfterThrow:"Illegal newline after throw",NoAsAfterImportNamespace:"Unexpected token",NoCatchOrFinally:"Missing catch or finally after try",ParameterAfterRestParameter:"Rest parameter must be last formal parameter",Redeclaration:"%0 '%1' has already been declared",StaticPrototype:"Classes may not have static property named prototype",StrictCatchVariable:"Catch variable may not be eval or arguments in strict mode",StrictDelete:"Delete of an unqualified identifier in strict mode.",StrictFunction:"In strict mode code, functions can only be declared at top level or inside a block",StrictFunctionName:"Function name may not be eval or arguments in strict mode",StrictLHSAssignment:"Assignment to eval or arguments is not allowed in strict mode",StrictLHSPostfix:"Postfix increment/decrement may not have eval or arguments operand in strict mode",StrictLHSPrefix:"Prefix increment/decrement may not have eval or arguments operand in strict mode",StrictModeWith:"Strict mode code may not include a with statement",StrictOctalLiteral:"Octal literals are not allowed in strict mode.",StrictParamDupe:"Strict mode function may not have duplicate parameter names",StrictParamName:"Parameter name eval or arguments is not allowed in strict mode",StrictReservedWord:"Use of future reserved word in strict mode",StrictVarName:"Variable name may not be eval or arguments in strict mode",TemplateOctalLiteral:"Octal literals are not allowed in template strings.",UnexpectedEOS:"Unexpected end of input",UnexpectedIdentifier:"Unexpected identifier",UnexpectedNumber:"Unexpected number",UnexpectedReserved:"Unexpected reserved word",UnexpectedString:"Unexpected string",UnexpectedTemplate:"Unexpected quasi %0",UnexpectedToken:"Unexpected token %0",UnexpectedTokenIllegal:"Unexpected token ILLEGAL",UnknownLabel:"Undefined label '%0'",UnterminatedRegExp:"Invalid regular expression: missing /"}},function(t,e,n){"use strict";function r(t){return"0123456789abcdef".indexOf(t.toLowerCase())}function i(t){return"01234567".indexOf(t)}Object.defineProperty(e,"__esModule",{value:!0});var o=n(9),s=n(4),a=n(11),u=function(){function t(t,e){this.source=t,this.errorHandler=e,this.trackComment=!1,this.length=t.length,this.index=0,this.lineNumber=t.length>0?1:0,this.lineStart=0,this.curlyStack=[]}return t.prototype.saveState=function(){return{index:this.index,lineNumber:this.lineNumber,lineStart:this.lineStart}},t.prototype.restoreState=function(t){this.index=t.index,this.lineNumber=t.lineNumber,this.lineStart=t.lineStart},t.prototype.eof=function(){return this.index>=this.length},t.prototype.throwUnexpectedToken=function(t){return void 0===t&&(t=a.Messages.UnexpectedTokenIllegal),this.errorHandler.throwError(this.index,this.lineNumber,this.index-this.lineStart+1,t)},t.prototype.tolerateUnexpectedToken=function(t){void 0===t&&(t=a.Messages.UnexpectedTokenIllegal),this.errorHandler.tolerateError(this.index,this.lineNumber,this.index-this.lineStart+1,t)},t.prototype.skipSingleLineComment=function(t){var e,n,r=[];for(this.trackComment&&(r=[],e=this.index-t,n={start:{line:this.lineNumber,column:this.index-this.lineStart-t},end:{}});!this.eof();){var i=this.source.charCodeAt(this.index);if(++this.index,s.Character.isLineTerminator(i)){if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart-1};var o={multiLine:!1,slice:[e+t,this.index-1],range:[e,this.index-1],loc:n};r.push(o)}return 13===i&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,r}}if(this.trackComment){n.end={line:this.lineNumber,column:this.index-this.lineStart};var o={multiLine:!1,slice:[e+t,this.index],range:[e,this.index],loc:n};r.push(o)}return r},t.prototype.skipMultiLineComment=function(){var t,e,n=[];for(this.trackComment&&(n=[],t=this.index-2,e={start:{line:this.lineNumber,column:this.index-this.lineStart-2},end:{}});!this.eof();){var r=this.source.charCodeAt(this.index);if(s.Character.isLineTerminator(r))13===r&&10===this.source.charCodeAt(this.index+1)&&++this.index,++this.lineNumber,++this.index,this.lineStart=this.index;else if(42===r){if(47===this.source.charCodeAt(this.index+1)){if(this.index+=2,this.trackComment){e.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[t+2,this.index-2],range:[t,this.index],loc:e};n.push(i)}return n}++this.index}else++this.index}if(this.trackComment){e.end={line:this.lineNumber,column:this.index-this.lineStart};var i={multiLine:!0,slice:[t+2,this.index],range:[t,this.index],loc:e};n.push(i)}return this.tolerateUnexpectedToken(),n},t.prototype.scanComments=function(){var t;this.trackComment&&(t=[]);for(var e=0===this.index;!this.eof();){var n=this.source.charCodeAt(this.index);if(s.Character.isWhiteSpace(n))++this.index;else if(s.Character.isLineTerminator(n))++this.index,13===n&&10===this.source.charCodeAt(this.index)&&++this.index,++this.lineNumber,this.lineStart=this.index,e=!0;else if(47===n)if(47===(n=this.source.charCodeAt(this.index+1))){this.index+=2;var r=this.skipSingleLineComment(2);this.trackComment&&(t=t.concat(r)),e=!0}else{if(42!==n)break;this.index+=2;var r=this.skipMultiLineComment();this.trackComment&&(t=t.concat(r))}else if(e&&45===n){if(45!==this.source.charCodeAt(this.index+1)||62!==this.source.charCodeAt(this.index+2))break;this.index+=3;var r=this.skipSingleLineComment(3);this.trackComment&&(t=t.concat(r))}else{if(60!==n)break;if("!--"!==this.source.slice(this.index+1,this.index+4))break;this.index+=4;var r=this.skipSingleLineComment(4);this.trackComment&&(t=t.concat(r))}}return t},t.prototype.isFutureReservedWord=function(t){switch(t){case"enum":case"export":case"import":case"super":return!0;default:return!1}},t.prototype.isStrictModeReservedWord=function(t){switch(t){case"implements":case"interface":case"package":case"private":case"protected":case"public":case"static":case"yield":case"let":return!0;default:return!1}},t.prototype.isRestrictedWord=function(t){return"eval"===t||"arguments"===t},t.prototype.isKeyword=function(t){switch(t.length){case 2:return"if"===t||"in"===t||"do"===t;case 3:return"var"===t||"for"===t||"new"===t||"try"===t||"let"===t;case 4:return"this"===t||"else"===t||"case"===t||"void"===t||"with"===t||"enum"===t;case 5:return"while"===t||"break"===t||"catch"===t||"throw"===t||"const"===t||"yield"===t||"class"===t||"super"===t;case 6:return"return"===t||"typeof"===t||"delete"===t||"switch"===t||"export"===t||"import"===t;case 7:return"default"===t||"finally"===t||"extends"===t;case 8:return"function"===t||"continue"===t||"debugger"===t;case 10:return"instanceof"===t;default:return!1}},t.prototype.codePointAt=function(t){var e=this.source.charCodeAt(t);if(e>=55296&&e<=56319){var n=this.source.charCodeAt(t+1);if(n>=56320&&n<=57343){e=1024*(e-55296)+n-56320+65536}}return e},t.prototype.scanHexEscape=function(t){for(var e="u"===t?4:2,n=0,i=0;i<e;++i){if(this.eof()||!s.Character.isHexDigit(this.source.charCodeAt(this.index)))return null;n=16*n+r(this.source[this.index++])}return String.fromCharCode(n)},t.prototype.scanUnicodeCodePointEscape=function(){var t=this.source[this.index],e=0;for("}"===t&&this.throwUnexpectedToken();!this.eof()&&(t=this.source[this.index++],s.Character.isHexDigit(t.charCodeAt(0)));)e=16*e+r(t);return(e>1114111||"}"!==t)&&this.throwUnexpectedToken(),s.Character.fromCodePoint(e)},t.prototype.getIdentifier=function(){for(var t=this.index++;!this.eof();){var e=this.source.charCodeAt(this.index);if(92===e)return this.index=t,this.getComplexIdentifier();if(e>=55296&&e<57343)return this.index=t,this.getComplexIdentifier();if(!s.Character.isIdentifierPart(e))break;++this.index}return this.source.slice(t,this.index)},t.prototype.getComplexIdentifier=function(){var t=this.codePointAt(this.index),e=s.Character.fromCodePoint(t);this.index+=e.length;var n;for(92===t&&(117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&s.Character.isIdentifierStart(n.charCodeAt(0))||this.throwUnexpectedToken(),e=n);!this.eof()&&(t=this.codePointAt(this.index),s.Character.isIdentifierPart(t));)n=s.Character.fromCodePoint(t),e+=n,this.index+=n.length,92===t&&(e=e.substr(0,e.length-1),117!==this.source.charCodeAt(this.index)&&this.throwUnexpectedToken(),++this.index,"{"===this.source[this.index]?(++this.index,n=this.scanUnicodeCodePointEscape()):null!==(n=this.scanHexEscape("u"))&&"\\"!==n&&s.Character.isIdentifierPart(n.charCodeAt(0))||this.throwUnexpectedToken(),e+=n);return e},t.prototype.octalToDecimal=function(t){var e="0"!==t,n=i(t);return!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(e=!0,n=8*n+i(this.source[this.index++]),"0123".indexOf(t)>=0&&!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index))&&(n=8*n+i(this.source[this.index++]))),{code:n,octal:e}},t.prototype.scanIdentifier=function(){var t,e=this.index,n=92===this.source.charCodeAt(e)?this.getComplexIdentifier():this.getIdentifier();if(3!==(t=1===n.length?3:this.isKeyword(n)?4:"null"===n?5:"true"===n||"false"===n?1:3)&&e+n.length!==this.index){var r=this.index;this.index=e,this.tolerateUnexpectedToken(a.Messages.InvalidEscapedReservedWord),this.index=r}return{type:t,value:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},t.prototype.scanPunctuator=function(){var t=this.index,e=this.source[this.index];switch(e){case"(":case"{":"{"===e&&this.curlyStack.push("{"),++this.index;break;case".":++this.index,"."===this.source[this.index]&&"."===this.source[this.index+1]&&(this.index+=2,e="...");break;case"}":++this.index,this.curlyStack.pop();break;case")":case";":case",":case"[":case"]":case":":case"?":case"~":++this.index;break;default:e=this.source.substr(this.index,4),">>>="===e?this.index+=4:(e=e.substr(0,3),"==="===e||"!=="===e||">>>"===e||"<<="===e||">>="===e||"**="===e?this.index+=3:(e=e.substr(0,2),"&&"===e||"||"===e||"=="===e||"!="===e||"+="===e||"-="===e||"*="===e||"/="===e||"++"===e||"--"===e||"<<"===e||">>"===e||"&="===e||"|="===e||"^="===e||"%="===e||"<="===e||">="===e||"=>"===e||"**"===e?this.index+=2:(e=this.source[this.index],"<>=!+-*%&|^/".indexOf(e)>=0&&++this.index)))}return this.index===t&&this.throwUnexpectedToken(),{type:7,value:e,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanHexLiteral=function(t){for(var e="";!this.eof()&&s.Character.isHexDigit(this.source.charCodeAt(this.index));)e+=this.source[this.index++];return 0===e.length&&this.throwUnexpectedToken(),s.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseInt("0x"+e,16),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanBinaryLiteral=function(t){for(var e,n="";!this.eof()&&("0"===(e=this.source[this.index])||"1"===e);)n+=this.source[this.index++];return 0===n.length&&this.throwUnexpectedToken(),this.eof()||(e=this.source.charCodeAt(this.index),(s.Character.isIdentifierStart(e)||s.Character.isDecimalDigit(e))&&this.throwUnexpectedToken()),{type:6,value:parseInt(n,2),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanOctalLiteral=function(t,e){var n="",r=!1;for(s.Character.isOctalDigit(t.charCodeAt(0))?(r=!0,n="0"+this.source[this.index++]):++this.index;!this.eof()&&s.Character.isOctalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];return r||0!==n.length||this.throwUnexpectedToken(),(s.Character.isIdentifierStart(this.source.charCodeAt(this.index))||s.Character.isDecimalDigit(this.source.charCodeAt(this.index)))&&this.throwUnexpectedToken(),{type:6,value:parseInt(n,8),octal:r,lineNumber:this.lineNumber,lineStart:this.lineStart,start:e,end:this.index}},t.prototype.isImplicitOctalLiteral=function(){for(var t=this.index+1;t<this.length;++t){var e=this.source[t];if("8"===e||"9"===e)return!1;if(!s.Character.isOctalDigit(e.charCodeAt(0)))return!0}return!0},t.prototype.scanNumericLiteral=function(){var t=this.index,e=this.source[t];o.assert(s.Character.isDecimalDigit(e.charCodeAt(0))||"."===e,"Numeric literal must start with a decimal digit or a decimal point");var n="";if("."!==e){if(n=this.source[this.index++],e=this.source[this.index],"0"===n){if("x"===e||"X"===e)return++this.index,this.scanHexLiteral(t);if("b"===e||"B"===e)return++this.index,this.scanBinaryLiteral(t);if("o"===e||"O"===e)return this.scanOctalLiteral(e,t);if(e&&s.Character.isOctalDigit(e.charCodeAt(0))&&this.isImplicitOctalLiteral())return this.scanOctalLiteral(e,t)}for(;s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];e=this.source[this.index]}if("."===e){for(n+=this.source[this.index++];s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];e=this.source[this.index]}if("e"===e||"E"===e)if(n+=this.source[this.index++],e=this.source[this.index],"+"!==e&&"-"!==e||(n+=this.source[this.index++]),s.Character.isDecimalDigit(this.source.charCodeAt(this.index)))for(;s.Character.isDecimalDigit(this.source.charCodeAt(this.index));)n+=this.source[this.index++];else this.throwUnexpectedToken();return s.Character.isIdentifierStart(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(),{type:6,value:parseFloat(n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanStringLiteral=function(){var t=this.index,e=this.source[t];o.assert("'"===e||'"'===e,"String literal must starts with a quote"),++this.index;for(var n=!1,r="";!this.eof();){var i=this.source[this.index++];if(i===e){e="";break}if("\\"===i)if((i=this.source[this.index++])&&s.Character.isLineTerminator(i.charCodeAt(0)))++this.lineNumber,"\r"===i&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(i){case"u":if("{"===this.source[this.index])++this.index,r+=this.scanUnicodeCodePointEscape();else{var u=this.scanHexEscape(i);null===u&&this.throwUnexpectedToken(),r+=u}break;case"x":var c=this.scanHexEscape(i);null===c&&this.throwUnexpectedToken(a.Messages.InvalidHexEscapeSequence),r+=c;break;case"n":r+="\n";break;case"r":r+="\r";break;case"t":r+="\t";break;case"b":r+="\b";break;case"f":r+="\f";break;case"v":r+="\v";break;case"8":case"9":r+=i,this.tolerateUnexpectedToken();break;default:if(i&&s.Character.isOctalDigit(i.charCodeAt(0))){var h=this.octalToDecimal(i);n=h.octal||n,r+=String.fromCharCode(h.code)}else r+=i}else{if(s.Character.isLineTerminator(i.charCodeAt(0)))break;r+=i}}return""!==e&&(this.index=t,this.throwUnexpectedToken()),{type:8,value:r,octal:n,lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.scanTemplate=function(){var t="",e=!1,n=this.index,r="`"===this.source[n],i=!1,o=2;for(++this.index;!this.eof();){var u=this.source[this.index++];if("`"===u){o=1,i=!0,e=!0;break}if("$"===u){if("{"===this.source[this.index]){this.curlyStack.push("${"),++this.index,e=!0;break}t+=u}else if("\\"===u)if(u=this.source[this.index++],s.Character.isLineTerminator(u.charCodeAt(0)))++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index;else switch(u){case"n":t+="\n";break;case"r":t+="\r";break;case"t":t+="\t";break;case"u":if("{"===this.source[this.index])++this.index,t+=this.scanUnicodeCodePointEscape();else{var c=this.index,h=this.scanHexEscape(u);null!==h?t+=h:(this.index=c,t+=u)}break;case"x":var l=this.scanHexEscape(u);null===l&&this.throwUnexpectedToken(a.Messages.InvalidHexEscapeSequence),t+=l;break;case"b":t+="\b";break;case"f":t+="\f";break;case"v":t+="\v";break;default:"0"===u?(s.Character.isDecimalDigit(this.source.charCodeAt(this.index))&&this.throwUnexpectedToken(a.Messages.TemplateOctalLiteral),t+="\0"):s.Character.isOctalDigit(u.charCodeAt(0))?this.throwUnexpectedToken(a.Messages.TemplateOctalLiteral):t+=u}else s.Character.isLineTerminator(u.charCodeAt(0))?(++this.lineNumber,"\r"===u&&"\n"===this.source[this.index]&&++this.index,this.lineStart=this.index,t+="\n"):t+=u}return e||this.throwUnexpectedToken(),r||this.curlyStack.pop(),{type:10,value:this.source.slice(n+1,this.index-o),cooked:t,head:r,tail:i,lineNumber:this.lineNumber,lineStart:this.lineStart,start:n,end:this.index}},t.prototype.testRegExp=function(t,e){var n=t,r=this;e.indexOf("u")>=0&&(n=n.replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g,function(t,e,n){var i=parseInt(e||n,16);return i>1114111&&r.throwUnexpectedToken(a.Messages.InvalidRegExp),i<=65535?String.fromCharCode(i):"￿"}).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"￿"));try{RegExp(n)}catch(t){this.throwUnexpectedToken(a.Messages.InvalidRegExp)}try{return new RegExp(t,e)}catch(t){return null}},t.prototype.scanRegExpBody=function(){var t=this.source[this.index];o.assert("/"===t,"Regular expression literal must start with a slash");for(var e=this.source[this.index++],n=!1,r=!1;!this.eof();)if(t=this.source[this.index++],e+=t,"\\"===t)t=this.source[this.index++],s.Character.isLineTerminator(t.charCodeAt(0))&&this.throwUnexpectedToken(a.Messages.UnterminatedRegExp),e+=t;else if(s.Character.isLineTerminator(t.charCodeAt(0)))this.throwUnexpectedToken(a.Messages.UnterminatedRegExp);else if(n)"]"===t&&(n=!1);else{if("/"===t){r=!0;break}"["===t&&(n=!0)}return r||this.throwUnexpectedToken(a.Messages.UnterminatedRegExp),e.substr(1,e.length-2)},t.prototype.scanRegExpFlags=function(){for(var t="",e="";!this.eof();){var n=this.source[this.index];if(!s.Character.isIdentifierPart(n.charCodeAt(0)))break;if(++this.index,"\\"!==n||this.eof())e+=n,t+=n;else if("u"===(n=this.source[this.index])){++this.index;var r=this.index,i=this.scanHexEscape("u");if(null!==i)for(e+=i,t+="\\u";r<this.index;++r)t+=this.source[r];else this.index=r,e+="u",t+="\\u";this.tolerateUnexpectedToken()}else t+="\\",this.tolerateUnexpectedToken()}return e},t.prototype.scanRegExp=function(){var t=this.index,e=this.scanRegExpBody(),n=this.scanRegExpFlags();return{type:9,value:"",pattern:e,flags:n,regex:this.testRegExp(e,n),lineNumber:this.lineNumber,lineStart:this.lineStart,start:t,end:this.index}},t.prototype.lex=function(){if(this.eof())return{type:2,value:"",lineNumber:this.lineNumber,lineStart:this.lineStart,start:this.index,end:this.index};var t=this.source.charCodeAt(this.index);return s.Character.isIdentifierStart(t)?this.scanIdentifier():40===t||41===t||59===t?this.scanPunctuator():39===t||34===t?this.scanStringLiteral():46===t?s.Character.isDecimalDigit(this.source.charCodeAt(this.index+1))?this.scanNumericLiteral():this.scanPunctuator():s.Character.isDecimalDigit(t)?this.scanNumericLiteral():96===t||125===t&&"${"===this.curlyStack[this.curlyStack.length-1]?this.scanTemplate():t>=55296&&t<57343&&s.Character.isIdentifierStart(this.codePointAt(this.index))?this.scanIdentifier():this.scanPunctuator()},t}();e.Scanner=u},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.TokenName={},e.TokenName[1]="Boolean",e.TokenName[2]="<end>",e.TokenName[3]="Identifier",e.TokenName[4]="Keyword",e.TokenName[5]="Null",e.TokenName[6]="Numeric",e.TokenName[7]="Punctuator",e.TokenName[8]="String",e.TokenName[9]="RegularExpression",e.TokenName[10]="Template"},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.XHTMLEntities={quot:'"',amp:"&",apos:"'",gt:">",nbsp:" ",iexcl:"¡",cent:"¢",pound:"£",curren:"¤",yen:"¥",brvbar:"¦",sect:"§",uml:"¨",copy:"©",ordf:"ª",laquo:"«",not:"¬",shy:"­",reg:"®",macr:"¯",deg:"°",plusmn:"±",sup2:"²",sup3:"³",acute:"´",micro:"µ",para:"¶",middot:"·",cedil:"¸",sup1:"¹",ordm:"º",raquo:"»",frac14:"¼",frac12:"½",frac34:"¾",iquest:"¿",Agrave:"À",Aacute:"Á",Acirc:"Â",Atilde:"Ã",Auml:"Ä",Aring:"Å",AElig:"Æ",Ccedil:"Ç",Egrave:"È",Eacute:"É",Ecirc:"Ê",Euml:"Ë",Igrave:"Ì",Iacute:"Í",Icirc:"Î",Iuml:"Ï",ETH:"Ð",Ntilde:"Ñ",Ograve:"Ò",Oacute:"Ó",Ocirc:"Ô",Otilde:"Õ",Ouml:"Ö",times:"×",Oslash:"Ø",Ugrave:"Ù",Uacute:"Ú",Ucirc:"Û",Uuml:"Ü",Yacute:"Ý",THORN:"Þ",szlig:"ß",agrave:"à",aacute:"á",acirc:"â",atilde:"ã",auml:"ä",aring:"å",aelig:"æ",ccedil:"ç",egrave:"è",eacute:"é",ecirc:"ê",euml:"ë",igrave:"ì",iacute:"í",icirc:"î",iuml:"ï",eth:"ð",ntilde:"ñ",ograve:"ò",oacute:"ó",ocirc:"ô",otilde:"õ",ouml:"ö",divide:"÷",oslash:"ø",ugrave:"ù",uacute:"ú",ucirc:"û",uuml:"ü",yacute:"ý",thorn:"þ",yuml:"ÿ",OElig:"Œ",oelig:"œ",Scaron:"Š",scaron:"š",Yuml:"Ÿ",fnof:"ƒ",circ:"ˆ",tilde:"˜",Alpha:"Α",Beta:"Β",Gamma:"Γ",Delta:"Δ",Epsilon:"Ε",Zeta:"Ζ",Eta:"Η",Theta:"Θ",Iota:"Ι",Kappa:"Κ",Lambda:"Λ",Mu:"Μ",Nu:"Ν",Xi:"Ξ",Omicron:"Ο",Pi:"Π",Rho:"Ρ",Sigma:"Σ",Tau:"Τ",Upsilon:"Υ",Phi:"Φ",Chi:"Χ",Psi:"Ψ",Omega:"Ω",alpha:"α",beta:"β",gamma:"γ",delta:"δ",epsilon:"ε",zeta:"ζ",eta:"η",theta:"θ",iota:"ι",kappa:"κ",lambda:"λ",mu:"μ",nu:"ν",xi:"ξ",omicron:"ο",pi:"π",rho:"ρ",sigmaf:"ς",sigma:"σ",tau:"τ",upsilon:"υ",phi:"φ",chi:"χ",psi:"ψ",omega:"ω",thetasym:"ϑ",upsih:"ϒ",piv:"ϖ",ensp:" ",emsp:" ",thinsp:" ",zwnj:"‌",zwj:"‍",lrm:"‎",rlm:"‏",ndash:"–",mdash:"—",lsquo:"‘",rsquo:"’",sbquo:"‚",ldquo:"“",rdquo:"”",bdquo:"„",dagger:"†",Dagger:"‡",bull:"•",hellip:"…",permil:"‰",prime:"′",Prime:"″",lsaquo:"‹",rsaquo:"›",oline:"‾",frasl:"⁄",euro:"€",image:"ℑ",weierp:"℘",real:"ℜ",trade:"™",alefsym:"ℵ",larr:"←",uarr:"↑",rarr:"→",darr:"↓",harr:"↔",crarr:"↵",lArr:"⇐",uArr:"⇑",rArr:"⇒",dArr:"⇓",hArr:"⇔",forall:"∀",part:"∂",exist:"∃",empty:"∅",nabla:"∇",isin:"∈",notin:"∉",ni:"∋",prod:"∏",sum:"∑",minus:"−",lowast:"∗",radic:"√",prop:"∝",infin:"∞",ang:"∠",and:"∧",or:"∨",cap:"∩",cup:"∪",int:"∫",there4:"∴",sim:"∼",cong:"≅",asymp:"≈",ne:"≠",equiv:"≡",le:"≤",ge:"≥",sub:"⊂",sup:"⊃",nsub:"⊄",sube:"⊆",supe:"⊇",oplus:"⊕",otimes:"⊗",perp:"⊥",sdot:"⋅",lceil:"⌈",rceil:"⌉",lfloor:"⌊",rfloor:"⌋",loz:"◊",spades:"♠",clubs:"♣",hearts:"♥",diams:"♦",lang:"⟨",rang:"⟩"}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(10),i=n(12),o=n(13),s=function(){function t(){this.values=[],this.curly=this.paren=-1}return t.prototype.beforeFunctionExpression=function(t){return["(","{","[","in","typeof","instanceof","new","return","case","delete","throw","void","=","+=","-=","*=","**=","/=","%=","<<=",">>=",">>>=","&=","|=","^=",",","+","-","*","**","/","%","++","--","<<",">>",">>>","&","|","^","!","~","&&","||","?",":","===","==",">=","<=","<",">","!=","!=="].indexOf(t)>=0},t.prototype.isRegexStart=function(){var t=this.values[this.values.length-1],e=null!==t;switch(t){case"this":case"]":e=!1;break;case")":var n=this.values[this.paren-1];e="if"===n||"while"===n||"for"===n||"with"===n;break;case"}":if(e=!1,"function"===this.values[this.curly-3]){var r=this.values[this.curly-4];e=!!r&&!this.beforeFunctionExpression(r)}else if("function"===this.values[this.curly-4]){var r=this.values[this.curly-5];e=!r||!this.beforeFunctionExpression(r)}}return e},t.prototype.push=function(t){7===t.type||4===t.type?("{"===t.value?this.curly=this.values.length:"("===t.value&&(this.paren=this.values.length),this.values.push(t.value)):this.values.push(null)},t}(),a=function(){function t(t,e){this.errorHandler=new r.ErrorHandler,this.errorHandler.tolerant=!!e&&("boolean"==typeof e.tolerant&&e.tolerant),this.scanner=new i.Scanner(t,this.errorHandler),this.scanner.trackComment=!!e&&("boolean"==typeof e.comment&&e.comment),this.trackRange=!!e&&("boolean"==typeof e.range&&e.range),this.trackLoc=!!e&&("boolean"==typeof e.loc&&e.loc),this.buffer=[],this.reader=new s}return t.prototype.errors=function(){return this.errorHandler.errors},t.prototype.getNextToken=function(){if(0===this.buffer.length){var t=this.scanner.scanComments();if(this.scanner.trackComment)for(var e=0;e<t.length;++e){var n=t[e],r=this.scanner.source.slice(n.slice[0],n.slice[1]),i={type:n.multiLine?"BlockComment":"LineComment",value:r};this.trackRange&&(i.range=n.range),this.trackLoc&&(i.loc=n.loc),this.buffer.push(i)}if(!this.scanner.eof()){var s=void 0;this.trackLoc&&(s={start:{line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},end:{}});var a="/"===this.scanner.source[this.scanner.index]&&this.reader.isRegexStart(),u=a?this.scanner.scanRegExp():this.scanner.lex();this.reader.push(u);var c={type:o.TokenName[u.type],value:this.scanner.source.slice(u.start,u.end)};if(this.trackRange&&(c.range=[u.start,u.end]),this.trackLoc&&(s.end={line:this.scanner.lineNumber,column:this.scanner.index-this.scanner.lineStart},c.loc=s),9===u.type){var h=u.pattern,l=u.flags;c.regex={pattern:h,flags:l}}this.buffer.push(c)}}return this.buffer.shift()},t}();e.Tokenizer=a}])})},function(t,e){e.read=function(t,e,n,r,i){var o,s,a=8*i-r-1,u=(1<<a)-1,c=u>>1,h=-7,l=n?i-1:0,p=n?-1:1,f=t[e+l];for(l+=p,o=f&(1<<-h)-1,f>>=-h,h+=a;h>0;o=256*o+t[e+l],l+=p,h-=8);for(s=o&(1<<-h)-1,o>>=-h,h+=r;h>0;s=256*s+t[e+l],l+=p,h-=8);if(0===o)o=1-c;else{if(o===u)return s?NaN:1/0*(f?-1:1);s+=Math.pow(2,r),o-=c}return(f?-1:1)*s*Math.pow(2,o-r)},e.write=function(t,e,n,r,i,o){var s,a,u,c=8*o-i-1,h=(1<<c)-1,l=h>>1,p=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,f=r?0:o-1,d=r?1:-1,m=e<0||0===e&&1/e<0?1:0;for(e=Math.abs(e),isNaN(e)||e===1/0?(a=isNaN(e)?1:0,s=h):(s=Math.floor(Math.log(e)/Math.LN2),e*(u=Math.pow(2,-s))<1&&(s--,u*=2),e+=s+l>=1?p/u:p*Math.pow(2,1-l),e*u>=2&&(s++,u/=2),s+l>=h?(a=0,s=h):s+l>=1?(a=(e*u-1)*Math.pow(2,i),s+=l):(a=e*Math.pow(2,l-1)*Math.pow(2,i),s=0));i>=8;t[n+f]=255&a,f+=d,a/=256,i-=8);for(s=s<<i|a,c+=i;c>0;t[n+f]=255&s,f+=d,s/=256,c-=8);t[n+f-d]|=128*m}},function(t,e,n){!function(e,n){t.exports=n()}(0,function(){"use strict";function t(t,e){e&&(t.prototype=Object.create(e.prototype)),t.prototype.constructor=t}function e(t){return o(t)?t:k(t)}function n(t){return s(t)?t:I(t)}function r(t){return a(t)?t:T(t)}function i(t){return o(t)&&!u(t)?t:B(t)}function o(t){return!(!t||!t[cn])}function s(t){return!(!t||!t[hn])}function a(t){return!(!t||!t[ln])}function u(t){return s(t)||a(t)}function c(t){return!(!t||!t[pn])}function h(t){return t.value=!1,t}function l(t){t&&(t.value=!0)}function p(){}function f(t,e){e=e||0;for(var n=Math.max(0,t.length-e),r=new Array(n),i=0;i<n;i++)r[i]=t[i+e];return r}function d(t){return void 0===t.size&&(t.size=t.__iterate(y)),t.size}function m(t,e){if("number"!=typeof e){var n=e>>>0;if(""+n!==e||4294967295===n)return NaN;e=n}return e<0?d(t)+e:e}function y(){return!0}function v(t,e,n){return(0===t||void 0!==n&&t<=-n)&&(void 0===e||void 0!==n&&e>=n)}function x(t,e){return D(t,e,0)}function g(t,e){return D(t,e,e)}function D(t,e,n){return void 0===t?n:t<0?Math.max(0,e+t):void 0===e?t:Math.min(e,t)}function E(t){this.next=t}function A(t,e,n,r){var i=0===t?e:1===t?n:[e,n];return r?r.value=i:r={value:i,done:!1},r}function S(){return{value:void 0,done:!0}}function w(t){return!!b(t)}function C(t){return t&&"function"==typeof t.next}function _(t){var e=b(t);return e&&e.call(t)}function b(t){var e=t&&(An&&t[An]||t[Sn]);if("function"==typeof e)return e}function F(t){return t&&"number"==typeof t.length}function k(t){return null===t||void 0===t?U():o(t)?t.toSeq():z(t)}function I(t){return null===t||void 0===t?U().toKeyedSeq():o(t)?s(t)?t.toSeq():t.fromEntrySeq():j(t)}function T(t){return null===t||void 0===t?U():o(t)?s(t)?t.entrySeq():t.toIndexedSeq():L(t)}function B(t){return(null===t||void 0===t?U():o(t)?s(t)?t.entrySeq():t:L(t)).toSetSeq()}function M(t){this._array=t,this.size=t.length}function P(t){var e=Object.keys(t);this._object=t,this._keys=e,this.size=e.length}function N(t){this._iterable=t,this.size=t.length||t.size}function O(t){this._iterator=t,this._iteratorCache=[]}function R(t){return!(!t||!t[Cn])}function U(){return _n||(_n=new M([]))}function j(t){var e=Array.isArray(t)?new M(t).fromEntrySeq():C(t)?new O(t).fromEntrySeq():w(t)?new N(t).fromEntrySeq():"object"==typeof t?new P(t):void 0;if(!e)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+t);return e}function L(t){var e=J(t);if(!e)throw new TypeError("Expected Array or iterable object of values: "+t);return e}function z(t){var e=J(t)||"object"==typeof t&&new P(t);if(!e)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+t);return e}function J(t){return F(t)?new M(t):C(t)?new O(t):w(t)?new N(t):void 0}function X(t,e,n,r){var i=t._cache;if(i){for(var o=i.length-1,s=0;s<=o;s++){var a=i[n?o-s:s];if(!1===e(a[1],r?a[0]:s,t))return s+1}return s}return t.__iterateUncached(e,n)}function q(t,e,n,r){var i=t._cache;if(i){var o=i.length-1,s=0;return new E(function(){var t=i[n?o-s:s];return s++>o?S():A(e,r?t[0]:s-1,t[1])})}return t.__iteratorUncached(e,n)}function K(t,e){return e?Y(e,t,"",{"":t}):W(t)}function Y(t,e,n,r){return Array.isArray(e)?t.call(r,n,T(e).map(function(n,r){return Y(t,n,r,e)})):G(e)?t.call(r,n,I(e).map(function(n,r){return Y(t,n,r,e)})):e}function W(t){return Array.isArray(t)?T(t).map(W).toList():G(t)?I(t).map(W).toMap():t}function G(t){return t&&(t.constructor===Object||void 0===t.constructor)}function H(t,e){if(t===e||t!==t&&e!==e)return!0;if(!t||!e)return!1;if("function"==typeof t.valueOf&&"function"==typeof e.valueOf){if(t=t.valueOf(),e=e.valueOf(),t===e||t!==t&&e!==e)return!0;if(!t||!e)return!1}return!("function"!=typeof t.equals||"function"!=typeof e.equals||!t.equals(e))}function V(t,e){if(t===e)return!0;if(!o(e)||void 0!==t.size&&void 0!==e.size&&t.size!==e.size||void 0!==t.__hash&&void 0!==e.__hash&&t.__hash!==e.__hash||s(t)!==s(e)||a(t)!==a(e)||c(t)!==c(e))return!1;if(0===t.size&&0===e.size)return!0;var n=!u(t);if(c(t)){var r=t.entries();return e.every(function(t,e){var i=r.next().value;return i&&H(i[1],t)&&(n||H(i[0],e))})&&r.next().done}var i=!1;if(void 0===t.size)if(void 0===e.size)"function"==typeof t.cacheResult&&t.cacheResult();else{i=!0;var h=t;t=e,e=h}var l=!0,p=e.__iterate(function(e,r){if(n?!t.has(e):i?!H(e,t.get(r,yn)):!H(t.get(r,yn),e))return l=!1,!1});return l&&t.size===p}function $(t,e){if(!(this instanceof $))return new $(t,e);if(this._value=t,this.size=void 0===e?1/0:Math.max(0,e),0===this.size){if(bn)return bn;bn=this}}function Z(t,e){if(!t)throw new Error(e)}function Q(t,e,n){if(!(this instanceof Q))return new Q(t,e,n);if(Z(0!==n,"Cannot step a Range by 0"),t=t||0,void 0===e&&(e=1/0),n=void 0===n?1:Math.abs(n),e<t&&(n=-n),this._start=t,this._end=e,this._step=n,this.size=Math.max(0,Math.ceil((e-t)/n-1)+1),0===this.size){if(Fn)return Fn;Fn=this}}function tt(){throw TypeError("Abstract")}function et(){}function nt(){}function rt(){}function it(t){return t>>>1&1073741824|3221225471&t}function ot(t){if(!1===t||null===t||void 0===t)return 0;if("function"==typeof t.valueOf&&(!1===(t=t.valueOf())||null===t||void 0===t))return 0;if(!0===t)return 1;var e=typeof t;if("number"===e){if(t!==t||t===1/0)return 0;var n=0|t;for(n!==t&&(n^=4294967295*t);t>4294967295;)t/=4294967295,n^=t;return it(n)}if("string"===e)return t.length>On?st(t):at(t);if("function"==typeof t.hashCode)return t.hashCode();if("object"===e)return ut(t);if("function"==typeof t.toString)return at(t.toString());throw new Error("Value type "+e+" cannot be hashed.")}function st(t){var e=jn[t];return void 0===e&&(e=at(t),Un===Rn&&(Un=0,jn={}),Un++,jn[t]=e),e}function at(t){for(var e=0,n=0;n<t.length;n++)e=31*e+t.charCodeAt(n)|0;return it(e)}function ut(t){var e;if(Mn&&void 0!==(e=kn.get(t)))return e;if(void 0!==(e=t[Nn]))return e;if(!Bn){if(void 0!==(e=t.propertyIsEnumerable&&t.propertyIsEnumerable[Nn]))return e;if(void 0!==(e=ct(t)))return e}if(e=++Pn,1073741824&Pn&&(Pn=0),Mn)kn.set(t,e);else{if(void 0!==Tn&&!1===Tn(t))throw new Error("Non-extensible objects are not allowed as keys.");if(Bn)Object.defineProperty(t,Nn,{enumerable:!1,configurable:!1,writable:!1,value:e});else if(void 0!==t.propertyIsEnumerable&&t.propertyIsEnumerable===t.constructor.prototype.propertyIsEnumerable)t.propertyIsEnumerable=function(){return this.constructor.prototype.propertyIsEnumerable.apply(this,arguments)},t.propertyIsEnumerable[Nn]=e;else{if(void 0===t.nodeType)throw new Error("Unable to set a non-enumerable property on object.");t[Nn]=e}}return e}function ct(t){if(t&&t.nodeType>0)switch(t.nodeType){case 1:return t.uniqueID;case 9:return t.documentElement&&t.documentElement.uniqueID}}function ht(t){Z(t!==1/0,"Cannot perform this action with an infinite size.")}function lt(t){return null===t||void 0===t?At():pt(t)&&!c(t)?t:At().withMutations(function(e){var r=n(t);ht(r.size),r.forEach(function(t,n){return e.set(n,t)})})}function pt(t){return!(!t||!t[Ln])}function ft(t,e){this.ownerID=t,this.entries=e}function dt(t,e,n){this.ownerID=t,this.bitmap=e,this.nodes=n}function mt(t,e,n){this.ownerID=t,this.count=e,this.nodes=n}function yt(t,e,n){this.ownerID=t,this.keyHash=e,this.entries=n}function vt(t,e,n){this.ownerID=t,this.keyHash=e,this.entry=n}function xt(t,e,n){this._type=e,this._reverse=n,this._stack=t._root&&Dt(t._root)}function gt(t,e){return A(t,e[0],e[1])}function Dt(t,e){return{node:t,index:0,__prev:e}}function Et(t,e,n,r){var i=Object.create(zn);return i.size=t,i._root=e,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function At(){return Jn||(Jn=Et(0))}function St(t,e,n){var r,i;if(t._root){var o=h(vn),s=h(xn);if(r=wt(t._root,t.__ownerID,0,void 0,e,n,o,s),!s.value)return t;i=t.size+(o.value?n===yn?-1:1:0)}else{if(n===yn)return t;i=1,r=new ft(t.__ownerID,[[e,n]])}return t.__ownerID?(t.size=i,t._root=r,t.__hash=void 0,t.__altered=!0,t):r?Et(i,r):At()}function wt(t,e,n,r,i,o,s,a){return t?t.update(e,n,r,i,o,s,a):o===yn?t:(l(a),l(s),new vt(e,r,[i,o]))}function Ct(t){return t.constructor===vt||t.constructor===yt}function _t(t,e,n,r,i){if(t.keyHash===r)return new yt(e,r,[t.entry,i]);var o,s=(0===n?t.keyHash:t.keyHash>>>n)&mn,a=(0===n?r:r>>>n)&mn;return new dt(e,1<<s|1<<a,s===a?[_t(t,e,n+fn,r,i)]:(o=new vt(e,r,i),s<a?[t,o]:[o,t]))}function bt(t,e,n,r){t||(t=new p);for(var i=new vt(t,ot(n),[n,r]),o=0;o<e.length;o++){var s=e[o];i=i.update(t,0,void 0,s[0],s[1])}return i}function Ft(t,e,n,r){for(var i=0,o=0,s=new Array(n),a=0,u=1,c=e.length;a<c;a++,u<<=1){var h=e[a];void 0!==h&&a!==r&&(i|=u,s[o++]=h)}return new dt(t,i,s)}function kt(t,e,n,r,i){for(var o=0,s=new Array(dn),a=0;0!==n;a++,n>>>=1)s[a]=1&n?e[o++]:void 0;return s[r]=i,new mt(t,o+1,s)}function It(t,e,r){for(var i=[],s=0;s<r.length;s++){var a=r[s],u=n(a);o(a)||(u=u.map(function(t){return K(t)})),i.push(u)}return Mt(t,e,i)}function Tt(t,e,n){return t&&t.mergeDeep&&o(e)?t.mergeDeep(e):H(t,e)?t:e}function Bt(t){return function(e,n,r){if(e&&e.mergeDeepWith&&o(n))return e.mergeDeepWith(t,n);var i=t(e,n,r);return H(e,i)?e:i}}function Mt(t,e,n){return n=n.filter(function(t){return 0!==t.size}),0===n.length?t:0!==t.size||t.__ownerID||1!==n.length?t.withMutations(function(t){for(var r=e?function(n,r){t.update(r,yn,function(t){return t===yn?n:e(t,n,r)})}:function(e,n){t.set(n,e)},i=0;i<n.length;i++)n[i].forEach(r)}):t.constructor(n[0])}function Pt(t,e,n,r){var i=t===yn,o=e.next();if(o.done){var s=i?n:t,a=r(s);return a===s?t:a}Z(i||t&&t.set,"invalid keyPath");var u=o.value,c=i?yn:t.get(u,yn),h=Pt(c,e,n,r);return h===c?t:h===yn?t.remove(u):(i?At():t).set(u,h)}function Nt(t){return t-=t>>1&1431655765,t=(858993459&t)+(t>>2&858993459),t=t+(t>>4)&252645135,t+=t>>8,127&(t+=t>>16)}function Ot(t,e,n,r){var i=r?t:f(t);return i[e]=n,i}function Rt(t,e,n,r){var i=t.length+1;if(r&&e+1===i)return t[e]=n,t;for(var o=new Array(i),s=0,a=0;a<i;a++)a===e?(o[a]=n,s=-1):o[a]=t[a+s];return o}function Ut(t,e,n){var r=t.length-1;if(n&&e===r)return t.pop(),t;for(var i=new Array(r),o=0,s=0;s<r;s++)s===e&&(o=1),i[s]=t[s+o];return i}function jt(t){var e=qt();if(null===t||void 0===t)return e;if(Lt(t))return t;var n=r(t),i=n.size;return 0===i?e:(ht(i),i>0&&i<dn?Xt(0,i,fn,null,new zt(n.toArray())):e.withMutations(function(t){t.setSize(i),n.forEach(function(e,n){return t.set(n,e)})}))}function Lt(t){return!(!t||!t[Yn])}function zt(t,e){this.array=t,this.ownerID=e}function Jt(t,e){function n(t,e,n){return 0===e?r(t,n):i(t,e,n)}function r(t,n){var r=n===a?u&&u.array:t&&t.array,i=n>o?0:o-n,c=s-n;return c>dn&&(c=dn),function(){if(i===c)return Hn;var t=e?--c:i++;return r&&r[t]}}function i(t,r,i){var a,u=t&&t.array,c=i>o?0:o-i>>r,h=1+(s-i>>r);return h>dn&&(h=dn),function(){for(;;){if(a){var t=a();if(t!==Hn)return t;a=null}if(c===h)return Hn;var o=e?--h:c++;a=n(u&&u[o],r-fn,i+(o<<r))}}}var o=t._origin,s=t._capacity,a=$t(s),u=t._tail;return n(t._root,t._level,0)}function Xt(t,e,n,r,i,o,s){var a=Object.create(Wn);return a.size=e-t,a._origin=t,a._capacity=e,a._level=n,a._root=r,a._tail=i,a.__ownerID=o,a.__hash=s,a.__altered=!1,a}function qt(){return Gn||(Gn=Xt(0,0,fn))}function Kt(t,e,n){if((e=m(t,e))!==e)return t;if(e>=t.size||e<0)return t.withMutations(function(t){e<0?Ht(t,e).set(0,n):Ht(t,0,e+1).set(e,n)});e+=t._origin;var r=t._tail,i=t._root,o=h(xn);return e>=$t(t._capacity)?r=Yt(r,t.__ownerID,0,e,n,o):i=Yt(i,t.__ownerID,t._level,e,n,o),o.value?t.__ownerID?(t._root=i,t._tail=r,t.__hash=void 0,t.__altered=!0,t):Xt(t._origin,t._capacity,t._level,i,r):t}function Yt(t,e,n,r,i,o){var s=r>>>n&mn,a=t&&s<t.array.length;if(!a&&void 0===i)return t;var u;if(n>0){var c=t&&t.array[s],h=Yt(c,e,n-fn,r,i,o);return h===c?t:(u=Wt(t,e),u.array[s]=h,u)}return a&&t.array[s]===i?t:(l(o),u=Wt(t,e),void 0===i&&s===u.array.length-1?u.array.pop():u.array[s]=i,u)}function Wt(t,e){return e&&t&&e===t.ownerID?t:new zt(t?t.array.slice():[],e)}function Gt(t,e){if(e>=$t(t._capacity))return t._tail;if(e<1<<t._level+fn){for(var n=t._root,r=t._level;n&&r>0;)n=n.array[e>>>r&mn],r-=fn;return n}}function Ht(t,e,n){void 0!==e&&(e|=0),void 0!==n&&(n|=0);var r=t.__ownerID||new p,i=t._origin,o=t._capacity,s=i+e,a=void 0===n?o:n<0?o+n:i+n;if(s===i&&a===o)return t;if(s>=a)return t.clear();for(var u=t._level,c=t._root,h=0;s+h<0;)c=new zt(c&&c.array.length?[void 0,c]:[],r),u+=fn,h+=1<<u;h&&(s+=h,i+=h,a+=h,o+=h);for(var l=$t(o),f=$t(a);f>=1<<u+fn;)c=new zt(c&&c.array.length?[c]:[],r),u+=fn;var d=t._tail,m=f<l?Gt(t,a-1):f>l?new zt([],r):d;if(d&&f>l&&s<o&&d.array.length){c=Wt(c,r);for(var y=c,v=u;v>fn;v-=fn){var x=l>>>v&mn;y=y.array[x]=Wt(y.array[x],r)}y.array[l>>>fn&mn]=d}if(a<o&&(m=m&&m.removeAfter(r,0,a)),s>=f)s-=f,a-=f,u=fn,c=null,m=m&&m.removeBefore(r,0,s);else if(s>i||f<l){for(h=0;c;){var g=s>>>u&mn;if(g!==f>>>u&mn)break;g&&(h+=(1<<u)*g),u-=fn,c=c.array[g]}c&&s>i&&(c=c.removeBefore(r,u,s-h)),c&&f<l&&(c=c.removeAfter(r,u,f-h)),h&&(s-=h,a-=h)}return t.__ownerID?(t.size=a-s,t._origin=s,t._capacity=a,t._level=u,t._root=c,t._tail=m,t.__hash=void 0,t.__altered=!0,t):Xt(s,a,u,c,m)}function Vt(t,e,n){for(var i=[],s=0,a=0;a<n.length;a++){var u=n[a],c=r(u);c.size>s&&(s=c.size),o(u)||(c=c.map(function(t){return K(t)})),i.push(c)}return s>t.size&&(t=t.setSize(s)),Mt(t,e,i)}function $t(t){return t<dn?0:t-1>>>fn<<fn}function Zt(t){return null===t||void 0===t?ee():Qt(t)?t:ee().withMutations(function(e){var r=n(t);ht(r.size),r.forEach(function(t,n){return e.set(n,t)})})}function Qt(t){return pt(t)&&c(t)}function te(t,e,n,r){var i=Object.create(Zt.prototype);return i.size=t?t.size:0,i._map=t,i._list=e,i.__ownerID=n,i.__hash=r,i}function ee(){return Vn||(Vn=te(At(),qt()))}function ne(t,e,n){var r,i,o=t._map,s=t._list,a=o.get(e),u=void 0!==a;if(n===yn){if(!u)return t;s.size>=dn&&s.size>=2*o.size?(i=s.filter(function(t,e){return void 0!==t&&a!==e}),r=i.toKeyedSeq().map(function(t){return t[0]}).flip().toMap(),t.__ownerID&&(r.__ownerID=i.__ownerID=t.__ownerID)):(r=o.remove(e),i=a===s.size-1?s.pop():s.set(a,void 0))}else if(u){if(n===s.get(a)[1])return t;r=o,i=s.set(a,[e,n])}else r=o.set(e,s.size),i=s.set(s.size,[e,n]);return t.__ownerID?(t.size=r.size,t._map=r,t._list=i,t.__hash=void 0,t):te(r,i)}function re(t,e){this._iter=t,this._useKeys=e,this.size=t.size}function ie(t){this._iter=t,this.size=t.size}function oe(t){this._iter=t,this.size=t.size}function se(t){this._iter=t,this.size=t.size}function ae(t){var e=Fe(t);return e._iter=t,e.size=t.size,e.flip=function(){return t},e.reverse=function(){var e=t.reverse.apply(this);return e.flip=function(){return t.reverse()},e},e.has=function(e){return t.includes(e)},e.includes=function(e){return t.has(e)},e.cacheResult=ke,e.__iterateUncached=function(e,n){var r=this;return t.__iterate(function(t,n){return!1!==e(n,t,r)},n)},e.__iteratorUncached=function(e,n){if(e===En){var r=t.__iterator(e,n);return new E(function(){var t=r.next();if(!t.done){var e=t.value[0];t.value[0]=t.value[1],t.value[1]=e}return t})}return t.__iterator(e===Dn?gn:Dn,n)},e}function ue(t,e,n){var r=Fe(t);return r.size=t.size,r.has=function(e){return t.has(e)},r.get=function(r,i){var o=t.get(r,yn);return o===yn?i:e.call(n,o,r,t)},r.__iterateUncached=function(r,i){var o=this;return t.__iterate(function(t,i,s){return!1!==r(e.call(n,t,i,s),i,o)},i)},r.__iteratorUncached=function(r,i){var o=t.__iterator(En,i);return new E(function(){var i=o.next();if(i.done)return i;var s=i.value,a=s[0];return A(r,a,e.call(n,s[1],a,t),i)})},r}function ce(t,e){var n=Fe(t);return n._iter=t,n.size=t.size,n.reverse=function(){return t},t.flip&&(n.flip=function(){var e=ae(t);return e.reverse=function(){return t.flip()},e}),n.get=function(n,r){return t.get(e?n:-1-n,r)},n.has=function(n){return t.has(e?n:-1-n)},n.includes=function(e){return t.includes(e)},n.cacheResult=ke,n.__iterate=function(e,n){var r=this;return t.__iterate(function(t,n){return e(t,n,r)},!n)},n.__iterator=function(e,n){return t.__iterator(e,!n)},n}function he(t,e,n,r){var i=Fe(t);return r&&(i.has=function(r){var i=t.get(r,yn);return i!==yn&&!!e.call(n,i,r,t)},i.get=function(r,i){var o=t.get(r,yn);return o!==yn&&e.call(n,o,r,t)?o:i}),i.__iterateUncached=function(i,o){var s=this,a=0;return t.__iterate(function(t,o,u){if(e.call(n,t,o,u))return a++,i(t,r?o:a-1,s)},o),a},i.__iteratorUncached=function(i,o){var s=t.__iterator(En,o),a=0;return new E(function(){for(;;){var o=s.next();if(o.done)return o;var u=o.value,c=u[0],h=u[1];if(e.call(n,h,c,t))return A(i,r?c:a++,h,o)}})},i}function le(t,e,n){var r=lt().asMutable();return t.__iterate(function(i,o){r.update(e.call(n,i,o,t),0,function(t){return t+1})}),r.asImmutable()}function pe(t,e,n){var r=s(t),i=(c(t)?Zt():lt()).asMutable();t.__iterate(function(o,s){i.update(e.call(n,o,s,t),function(t){return t=t||[],t.push(r?[s,o]:o),t})});var o=be(t);return i.map(function(e){return we(t,o(e))})}function fe(t,e,n,r){var i=t.size;if(void 0!==e&&(e|=0),void 0!==n&&(n===1/0?n=i:n|=0),v(e,n,i))return t;var o=x(e,i),s=g(n,i);if(o!==o||s!==s)return fe(t.toSeq().cacheResult(),e,n,r);var a,u=s-o;u===u&&(a=u<0?0:u);var c=Fe(t);return c.size=0===a?a:t.size&&a||void 0,!r&&R(t)&&a>=0&&(c.get=function(e,n){return e=m(this,e),e>=0&&e<a?t.get(e+o,n):n}),c.__iterateUncached=function(e,n){var i=this;if(0===a)return 0;if(n)return this.cacheResult().__iterate(e,n);var s=0,u=!0,c=0;return t.__iterate(function(t,n){if(!u||!(u=s++<o))return c++,!1!==e(t,r?n:c-1,i)&&c!==a}),c},c.__iteratorUncached=function(e,n){if(0!==a&&n)return this.cacheResult().__iterator(e,n);var i=0!==a&&t.__iterator(e,n),s=0,u=0;return new E(function(){for(;s++<o;)i.next();if(++u>a)return S();var t=i.next();return r||e===Dn?t:e===gn?A(e,u-1,void 0,t):A(e,u-1,t.value[1],t)})},c}function de(t,e,n){var r=Fe(t);return r.__iterateUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterate(r,i);var s=0;return t.__iterate(function(t,i,a){return e.call(n,t,i,a)&&++s&&r(t,i,o)}),s},r.__iteratorUncached=function(r,i){var o=this;if(i)return this.cacheResult().__iterator(r,i);var s=t.__iterator(En,i),a=!0;return new E(function(){if(!a)return S();var t=s.next();if(t.done)return t;var i=t.value,u=i[0],c=i[1];return e.call(n,c,u,o)?r===En?t:A(r,u,c,t):(a=!1,S())})},r}function me(t,e,n,r){var i=Fe(t);return i.__iterateUncached=function(i,o){var s=this;if(o)return this.cacheResult().__iterate(i,o);var a=!0,u=0;return t.__iterate(function(t,o,c){if(!a||!(a=e.call(n,t,o,c)))return u++,i(t,r?o:u-1,s)}),u},i.__iteratorUncached=function(i,o){var s=this;if(o)return this.cacheResult().__iterator(i,o);var a=t.__iterator(En,o),u=!0,c=0;return new E(function(){var t,o,h;do{if(t=a.next(),t.done)return r||i===Dn?t:i===gn?A(i,c++,void 0,t):A(i,c++,t.value[1],t);var l=t.value;o=l[0],h=l[1],u&&(u=e.call(n,h,o,s))}while(u);return i===En?t:A(i,o,h,t)})},i}function ye(t,e){var r=s(t),i=[t].concat(e).map(function(t){return o(t)?r&&(t=n(t)):t=r?j(t):L(Array.isArray(t)?t:[t]),t}).filter(function(t){return 0!==t.size});if(0===i.length)return t;if(1===i.length){var u=i[0];if(u===t||r&&s(u)||a(t)&&a(u))return u}var c=new M(i);return r?c=c.toKeyedSeq():a(t)||(c=c.toSetSeq()),c=c.flatten(!0),c.size=i.reduce(function(t,e){if(void 0!==t){var n=e.size;if(void 0!==n)return t+n}},0),c}function ve(t,e,n){var r=Fe(t);return r.__iterateUncached=function(r,i){function s(t,c){var h=this;t.__iterate(function(t,i){return(!e||c<e)&&o(t)?s(t,c+1):!1===r(t,n?i:a++,h)&&(u=!0),!u},i)}var a=0,u=!1;return s(t,0),a},r.__iteratorUncached=function(r,i){var s=t.__iterator(r,i),a=[],u=0;return new E(function(){for(;s;){var t=s.next();if(!1===t.done){var c=t.value;if(r===En&&(c=c[1]),e&&!(a.length<e)||!o(c))return n?t:A(r,u++,c,t);a.push(s),s=c.__iterator(r,i)}else s=a.pop()}return S()})},r}function xe(t,e,n){var r=be(t);return t.toSeq().map(function(i,o){return r(e.call(n,i,o,t))}).flatten(!0)}function ge(t,e){var n=Fe(t);return n.size=t.size&&2*t.size-1,n.__iterateUncached=function(n,r){var i=this,o=0;return t.__iterate(function(t,r){return(!o||!1!==n(e,o++,i))&&!1!==n(t,o++,i)},r),o},n.__iteratorUncached=function(n,r){var i,o=t.__iterator(Dn,r),s=0;return new E(function(){return(!i||s%2)&&(i=o.next(),i.done)?i:s%2?A(n,s++,e):A(n,s++,i.value,i)})},n}function De(t,e,n){e||(e=Ie);var r=s(t),i=0,o=t.toSeq().map(function(e,r){return[r,e,i++,n?n(e,r,t):e]}).toArray();return o.sort(function(t,n){return e(t[3],n[3])||t[2]-n[2]}).forEach(r?function(t,e){o[e].length=2}:function(t,e){o[e]=t[1]}),r?I(o):a(t)?T(o):B(o)}function Ee(t,e,n){if(e||(e=Ie),n){var r=t.toSeq().map(function(e,r){return[e,n(e,r,t)]}).reduce(function(t,n){return Ae(e,t[1],n[1])?n:t});return r&&r[0]}return t.reduce(function(t,n){return Ae(e,t,n)?n:t})}function Ae(t,e,n){var r=t(n,e);return 0===r&&n!==e&&(void 0===n||null===n||n!==n)||r>0}function Se(t,n,r){var i=Fe(t);return i.size=new M(r).map(function(t){return t.size}).min(),i.__iterate=function(t,e){for(var n,r=this.__iterator(Dn,e),i=0;!(n=r.next()).done&&!1!==t(n.value,i++,this););return i},i.__iteratorUncached=function(t,i){var o=r.map(function(t){return t=e(t),_(i?t.reverse():t)}),s=0,a=!1;return new E(function(){var e;return a||(e=o.map(function(t){return t.next()}),a=e.some(function(t){return t.done})),a?S():A(t,s++,n.apply(null,e.map(function(t){return t.value})))})},i}function we(t,e){return R(t)?e:t.constructor(e)}function Ce(t){if(t!==Object(t))throw new TypeError("Expected [K, V] tuple: "+t)}function _e(t){return ht(t.size),d(t)}function be(t){return s(t)?n:a(t)?r:i}function Fe(t){return Object.create((s(t)?I:a(t)?T:B).prototype)}function ke(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):k.prototype.cacheResult.call(this)}function Ie(t,e){return t>e?1:t<e?-1:0}function Te(t){var n=_(t);if(!n){if(!F(t))throw new TypeError("Expected iterable or array-like: "+t);n=_(e(t))}return n}function Be(t,e){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var s=Object.keys(t);Ne(i,s),i.size=s.length,i._name=e,i._keys=s,i._defaultValues=t}this._map=lt(o)},i=r.prototype=Object.create($n);return i.constructor=r,r}function Me(t,e,n){var r=Object.create(Object.getPrototypeOf(t));return r._map=e,r.__ownerID=n,r}function Pe(t){return t._name||t.constructor.name||"Record"}function Ne(t,e){try{e.forEach(Oe.bind(void 0,t))}catch(t){}}function Oe(t,e){Object.defineProperty(t,e,{get:function(){return this.get(e)},set:function(t){Z(this.__ownerID,"Cannot set on an immutable record."),this.set(e,t)}})}function Re(t){return null===t||void 0===t?ze():Ue(t)&&!c(t)?t:ze().withMutations(function(e){var n=i(t);ht(n.size),n.forEach(function(t){return e.add(t)})})}function Ue(t){return!(!t||!t[Zn])}function je(t,e){return t.__ownerID?(t.size=e.size,t._map=e,t):e===t._map?t:0===e.size?t.__empty():t.__make(e)}function Le(t,e){var n=Object.create(Qn);return n.size=t?t.size:0,n._map=t,n.__ownerID=e,n}function ze(){return tr||(tr=Le(At()))}function Je(t){return null===t||void 0===t?Ke():Xe(t)?t:Ke().withMutations(function(e){var n=i(t);ht(n.size),n.forEach(function(t){return e.add(t)})})}function Xe(t){return Ue(t)&&c(t)}function qe(t,e){var n=Object.create(er);return n.size=t?t.size:0,n._map=t,n.__ownerID=e,n}function Ke(){return nr||(nr=qe(ee()))}function Ye(t){return null===t||void 0===t?He():We(t)?t:He().unshiftAll(t)}function We(t){return!(!t||!t[rr])}function Ge(t,e,n,r){var i=Object.create(ir);return i.size=t,i._head=e,i.__ownerID=n,i.__hash=r,i.__altered=!1,i}function He(){return or||(or=Ge(0))}function Ve(t,e){var n=function(n){t.prototype[n]=e[n]};return Object.keys(e).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(e).forEach(n),t}function $e(t,e){return e}function Ze(t,e){return[e,t]}function Qe(t){return function(){return!t.apply(this,arguments)}}function tn(t){return function(){return-t.apply(this,arguments)}}function en(t){return"string"==typeof t?JSON.stringify(t):String(t)}function nn(){return f(arguments)}function rn(t,e){return t<e?1:t>e?-1:0}function on(t){if(t.size===1/0)return 0;var e=c(t),n=s(t),r=e?1:0;return sn(t.__iterate(n?e?function(t,e){r=31*r+an(ot(t),ot(e))|0}:function(t,e){r=r+an(ot(t),ot(e))|0}:e?function(t){r=31*r+ot(t)|0}:function(t){r=r+ot(t)|0}),r)}function sn(t,e){return e=In(e,3432918353),e=In(e<<15|e>>>-15,461845907),e=In(e<<13|e>>>-13,5),e=(e+3864292196|0)^t,e=In(e^e>>>16,2246822507),e=In(e^e>>>13,3266489909),e=it(e^e>>>16)}function an(t,e){return t^e+2654435769+(t<<6)+(t>>2)|0}var un=Array.prototype.slice;t(n,e),t(r,e),t(i,e),e.isIterable=o,e.isKeyed=s,e.isIndexed=a,e.isAssociative=u,e.isOrdered=c,e.Keyed=n,e.Indexed=r,e.Set=i;var cn="@@__IMMUTABLE_ITERABLE__@@",hn="@@__IMMUTABLE_KEYED__@@",ln="@@__IMMUTABLE_INDEXED__@@",pn="@@__IMMUTABLE_ORDERED__@@",fn=5,dn=1<<fn,mn=dn-1,yn={},vn={value:!1},xn={value:!1},gn=0,Dn=1,En=2,An="function"==typeof Symbol&&Symbol.iterator,Sn="@@iterator",wn=An||Sn;E.prototype.toString=function(){return"[Iterator]"},E.KEYS=gn,E.VALUES=Dn,E.ENTRIES=En,E.prototype.inspect=E.prototype.toSource=function(){return this.toString()},E.prototype[wn]=function(){return this},t(k,e),k.of=function(){return k(arguments)},k.prototype.toSeq=function(){return this},k.prototype.toString=function(){return this.__toString("Seq {","}")},k.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},k.prototype.__iterate=function(t,e){return X(this,t,e,!0)},k.prototype.__iterator=function(t,e){return q(this,t,e,!0)},t(I,k),I.prototype.toKeyedSeq=function(){return this},t(T,k),T.of=function(){return T(arguments)},T.prototype.toIndexedSeq=function(){return this},T.prototype.toString=function(){return this.__toString("Seq [","]")},T.prototype.__iterate=function(t,e){return X(this,t,e,!1)},T.prototype.__iterator=function(t,e){return q(this,t,e,!1)},t(B,k),B.of=function(){return B(arguments)},B.prototype.toSetSeq=function(){return this},k.isSeq=R,k.Keyed=I,k.Set=B,k.Indexed=T;var Cn="@@__IMMUTABLE_SEQ__@@";k.prototype[Cn]=!0,t(M,T),M.prototype.get=function(t,e){return this.has(t)?this._array[m(this,t)]:e},M.prototype.__iterate=function(t,e){for(var n=this._array,r=n.length-1,i=0;i<=r;i++)if(!1===t(n[e?r-i:i],i,this))return i+1;return i},M.prototype.__iterator=function(t,e){var n=this._array,r=n.length-1,i=0;return new E(function(){return i>r?S():A(t,i,n[e?r-i++:i++])})},t(P,I),P.prototype.get=function(t,e){return void 0===e||this.has(t)?this._object[t]:e},P.prototype.has=function(t){return this._object.hasOwnProperty(t)},P.prototype.__iterate=function(t,e){for(var n=this._object,r=this._keys,i=r.length-1,o=0;o<=i;o++){var s=r[e?i-o:o];if(!1===t(n[s],s,this))return o+1}return o},P.prototype.__iterator=function(t,e){var n=this._object,r=this._keys,i=r.length-1,o=0;return new E(function(){var s=r[e?i-o:o];return o++>i?S():A(t,s,n[s])})},P.prototype[pn]=!0,t(N,T),N.prototype.__iterateUncached=function(t,e){if(e)return this.cacheResult().__iterate(t,e);var n=this._iterable,r=_(n),i=0;if(C(r))for(var o;!(o=r.next()).done&&!1!==t(o.value,i++,this););return i},N.prototype.__iteratorUncached=function(t,e){if(e)return this.cacheResult().__iterator(t,e);var n=this._iterable,r=_(n);if(!C(r))return new E(S);var i=0;return new E(function(){var e=r.next();return e.done?e:A(t,i++,e.value)})},t(O,T),O.prototype.__iterateUncached=function(t,e){if(e)return this.cacheResult().__iterate(t,e);for(var n=this._iterator,r=this._iteratorCache,i=0;i<r.length;)if(!1===t(r[i],i++,this))return i;for(var o;!(o=n.next()).done;){var s=o.value;if(r[i]=s,!1===t(s,i++,this))break}return i},O.prototype.__iteratorUncached=function(t,e){if(e)return this.cacheResult().__iterator(t,e);var n=this._iterator,r=this._iteratorCache,i=0;return new E(function(){if(i>=r.length){var e=n.next();if(e.done)return e;r[i]=e.value}return A(t,i,r[i++])})};var _n;t($,T),$.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},$.prototype.get=function(t,e){return this.has(t)?this._value:e},$.prototype.includes=function(t){return H(this._value,t)},$.prototype.slice=function(t,e){var n=this.size;return v(t,e,n)?this:new $(this._value,g(e,n)-x(t,n))},$.prototype.reverse=function(){return this},$.prototype.indexOf=function(t){return H(this._value,t)?0:-1},$.prototype.lastIndexOf=function(t){return H(this._value,t)?this.size:-1},$.prototype.__iterate=function(t,e){for(var n=0;n<this.size;n++)if(!1===t(this._value,n,this))return n+1;return n},$.prototype.__iterator=function(t,e){var n=this,r=0;return new E(function(){return r<n.size?A(t,r++,n._value):S()})},$.prototype.equals=function(t){return t instanceof $?H(this._value,t._value):V(t)};var bn;t(Q,T),Q.prototype.toString=function(){return 0===this.size?"Range []":"Range [ "+this._start+"..."+this._end+(1!==this._step?" by "+this._step:"")+" ]"},Q.prototype.get=function(t,e){return this.has(t)?this._start+m(this,t)*this._step:e},Q.prototype.includes=function(t){var e=(t-this._start)/this._step;return e>=0&&e<this.size&&e===Math.floor(e)},Q.prototype.slice=function(t,e){return v(t,e,this.size)?this:(t=x(t,this.size),e=g(e,this.size),e<=t?new Q(0,0):new Q(this.get(t,this._end),this.get(e,this._end),this._step))},Q.prototype.indexOf=function(t){var e=t-this._start;if(e%this._step==0){var n=e/this._step;if(n>=0&&n<this.size)return n}return-1},Q.prototype.lastIndexOf=function(t){return this.indexOf(t)},Q.prototype.__iterate=function(t,e){for(var n=this.size-1,r=this._step,i=e?this._start+n*r:this._start,o=0;o<=n;o++){if(!1===t(i,o,this))return o+1;i+=e?-r:r}return o},Q.prototype.__iterator=function(t,e){var n=this.size-1,r=this._step,i=e?this._start+n*r:this._start,o=0;return new E(function(){var s=i;return i+=e?-r:r,o>n?S():A(t,o++,s)})},Q.prototype.equals=function(t){return t instanceof Q?this._start===t._start&&this._end===t._end&&this._step===t._step:V(this,t)};var Fn;t(tt,e),t(et,tt),t(nt,tt),t(rt,tt),tt.Keyed=et,tt.Indexed=nt,tt.Set=rt;var kn,In="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(t,e){t|=0,e|=0;var n=65535&t,r=65535&e;return n*r+((t>>>16)*r+n*(e>>>16)<<16>>>0)|0},Tn=Object.isExtensible,Bn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(t){return!1}}(),Mn="function"==typeof WeakMap;Mn&&(kn=new WeakMap);var Pn=0,Nn="__immutablehash__";"function"==typeof Symbol&&(Nn=Symbol(Nn));var On=16,Rn=255,Un=0,jn={};t(lt,et),lt.of=function(){var t=un.call(arguments,0);return At().withMutations(function(e){for(var n=0;n<t.length;n+=2){if(n+1>=t.length)throw new Error("Missing value for key: "+t[n]);e.set(t[n],t[n+1])}})},lt.prototype.toString=function(){return this.__toString("Map {","}")},lt.prototype.get=function(t,e){return this._root?this._root.get(0,void 0,t,e):e},lt.prototype.set=function(t,e){return St(this,t,e)},lt.prototype.setIn=function(t,e){return this.updateIn(t,yn,function(){return e})},lt.prototype.remove=function(t){return St(this,t,yn)},lt.prototype.deleteIn=function(t){return this.updateIn(t,function(){return yn})},lt.prototype.update=function(t,e,n){return 1===arguments.length?t(this):this.updateIn([t],e,n)},lt.prototype.updateIn=function(t,e,n){n||(n=e,e=void 0);var r=Pt(this,Te(t),e,n);return r===yn?void 0:r},lt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):At()},lt.prototype.merge=function(){return It(this,void 0,arguments)},lt.prototype.mergeWith=function(t){return It(this,t,un.call(arguments,1))},lt.prototype.mergeIn=function(t){var e=un.call(arguments,1);return this.updateIn(t,At(),function(t){return"function"==typeof t.merge?t.merge.apply(t,e):e[e.length-1]})},lt.prototype.mergeDeep=function(){return It(this,Tt,arguments)},lt.prototype.mergeDeepWith=function(t){var e=un.call(arguments,1);return It(this,Bt(t),e)},lt.prototype.mergeDeepIn=function(t){var e=un.call(arguments,1);return this.updateIn(t,At(),function(t){return"function"==typeof t.mergeDeep?t.mergeDeep.apply(t,e):e[e.length-1]})},lt.prototype.sort=function(t){return Zt(De(this,t))},lt.prototype.sortBy=function(t,e){return Zt(De(this,e,t))},lt.prototype.withMutations=function(t){var e=this.asMutable();return t(e),e.wasAltered()?e.__ensureOwner(this.__ownerID):this},lt.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new p)},lt.prototype.asImmutable=function(){return this.__ensureOwner()},lt.prototype.wasAltered=function(){return this.__altered},lt.prototype.__iterator=function(t,e){return new xt(this,t,e)},lt.prototype.__iterate=function(t,e){var n=this,r=0;return this._root&&this._root.iterate(function(e){return r++,t(e[1],e[0],n)},e),r},lt.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Et(this.size,this._root,t,this.__hash):(this.__ownerID=t,this.__altered=!1,this)},lt.isMap=pt;var Ln="@@__IMMUTABLE_MAP__@@",zn=lt.prototype;zn[Ln]=!0,zn.delete=zn.remove,zn.removeIn=zn.deleteIn,ft.prototype.get=function(t,e,n,r){for(var i=this.entries,o=0,s=i.length;o<s;o++)if(H(n,i[o][0]))return i[o][1];return r},ft.prototype.update=function(t,e,n,r,i,o,s){for(var a=i===yn,u=this.entries,c=0,h=u.length;c<h&&!H(r,u[c][0]);c++);var p=c<h;if(p?u[c][1]===i:a)return this;if(l(s),(a||!p)&&l(o),!a||1!==u.length){if(!p&&!a&&u.length>=Xn)return bt(t,u,r,i);var d=t&&t===this.ownerID,m=d?u:f(u);return p?a?c===h-1?m.pop():m[c]=m.pop():m[c]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new ft(t,m)}},dt.prototype.get=function(t,e,n,r){void 0===e&&(e=ot(n));var i=1<<((0===t?e:e>>>t)&mn),o=this.bitmap;return 0==(o&i)?r:this.nodes[Nt(o&i-1)].get(t+fn,e,n,r)},dt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=(0===e?n:n>>>e)&mn,u=1<<a,c=this.bitmap,h=0!=(c&u);if(!h&&i===yn)return this;var l=Nt(c&u-1),p=this.nodes,f=h?p[l]:void 0,d=wt(f,t,e+fn,n,r,i,o,s);if(d===f)return this;if(!h&&d&&p.length>=qn)return kt(t,p,c,a,d);if(h&&!d&&2===p.length&&Ct(p[1^l]))return p[1^l];if(h&&d&&1===p.length&&Ct(d))return d;var m=t&&t===this.ownerID,y=h?d?c:c^u:c|u,v=h?d?Ot(p,l,d,m):Ut(p,l,m):Rt(p,l,d,m);return m?(this.bitmap=y,this.nodes=v,this):new dt(t,y,v)},mt.prototype.get=function(t,e,n,r){void 0===e&&(e=ot(n));var i=(0===t?e:e>>>t)&mn,o=this.nodes[i];return o?o.get(t+fn,e,n,r):r},mt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=(0===e?n:n>>>e)&mn,u=i===yn,c=this.nodes,h=c[a];if(u&&!h)return this;var l=wt(h,t,e+fn,n,r,i,o,s);if(l===h)return this;var p=this.count;if(h){if(!l&&--p<Kn)return Ft(t,c,p,a)}else p++;var f=t&&t===this.ownerID,d=Ot(c,a,l,f);return f?(this.count=p,this.nodes=d,this):new mt(t,p,d)},yt.prototype.get=function(t,e,n,r){for(var i=this.entries,o=0,s=i.length;o<s;o++)if(H(n,i[o][0]))return i[o][1];return r},yt.prototype.update=function(t,e,n,r,i,o,s){void 0===n&&(n=ot(r));var a=i===yn;if(n!==this.keyHash)return a?this:(l(s),l(o),_t(this,t,e,n,[r,i]));for(var u=this.entries,c=0,h=u.length;c<h&&!H(r,u[c][0]);c++);var p=c<h;if(p?u[c][1]===i:a)return this;if(l(s),(a||!p)&&l(o),a&&2===h)return new vt(t,this.keyHash,u[1^c]);var d=t&&t===this.ownerID,m=d?u:f(u);return p?a?c===h-1?m.pop():m[c]=m.pop():m[c]=[r,i]:m.push([r,i]),d?(this.entries=m,this):new yt(t,this.keyHash,m)},vt.prototype.get=function(t,e,n,r){return H(n,this.entry[0])?this.entry[1]:r},vt.prototype.update=function(t,e,n,r,i,o,s){var a=i===yn,u=H(r,this.entry[0]);return(u?i===this.entry[1]:a)?this:(l(s),a?void l(o):u?t&&t===this.ownerID?(this.entry[1]=i,this):new vt(t,this.keyHash,[r,i]):(l(o),_t(this,t,e,ot(r),[r,i])))},ft.prototype.iterate=yt.prototype.iterate=function(t,e){for(var n=this.entries,r=0,i=n.length-1;r<=i;r++)if(!1===t(n[e?i-r:r]))return!1},dt.prototype.iterate=mt.prototype.iterate=function(t,e){for(var n=this.nodes,r=0,i=n.length-1;r<=i;r++){var o=n[e?i-r:r];if(o&&!1===o.iterate(t,e))return!1}},vt.prototype.iterate=function(t,e){return t(this.entry)},t(xt,E),xt.prototype.next=function(){for(var t=this._type,e=this._stack;e;){var n,r=e.node,i=e.index++;if(r.entry){if(0===i)return gt(t,r.entry)}else if(r.entries){if(n=r.entries.length-1,i<=n)return gt(t,r.entries[this._reverse?n-i:i])}else if(n=r.nodes.length-1,i<=n){var o=r.nodes[this._reverse?n-i:i];if(o){if(o.entry)return gt(t,o.entry);e=this._stack=Dt(o,e)}continue}e=this._stack=this._stack.__prev}return S()};var Jn,Xn=dn/4,qn=dn/2,Kn=dn/4;t(jt,nt),jt.of=function(){return this(arguments)},jt.prototype.toString=function(){return this.__toString("List [","]")},jt.prototype.get=function(t,e){if((t=m(this,t))>=0&&t<this.size){t+=this._origin;var n=Gt(this,t);return n&&n.array[t&mn]}return e},jt.prototype.set=function(t,e){return Kt(this,t,e)},jt.prototype.remove=function(t){return this.has(t)?0===t?this.shift():t===this.size-1?this.pop():this.splice(t,1):this},jt.prototype.insert=function(t,e){return this.splice(t,0,e)},jt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=fn,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):qt()},jt.prototype.push=function(){var t=arguments,e=this.size;return this.withMutations(function(n){Ht(n,0,e+t.length);for(var r=0;r<t.length;r++)n.set(e+r,t[r])})},jt.prototype.pop=function(){return Ht(this,0,-1)},jt.prototype.unshift=function(){var t=arguments;return this.withMutations(function(e){Ht(e,-t.length);for(var n=0;n<t.length;n++)e.set(n,t[n])})},jt.prototype.shift=function(){return Ht(this,1)},jt.prototype.merge=function(){return Vt(this,void 0,arguments)},jt.prototype.mergeWith=function(t){return Vt(this,t,un.call(arguments,1))},jt.prototype.mergeDeep=function(){return Vt(this,Tt,arguments)},jt.prototype.mergeDeepWith=function(t){var e=un.call(arguments,1);return Vt(this,Bt(t),e)},jt.prototype.setSize=function(t){return Ht(this,0,t)},jt.prototype.slice=function(t,e){var n=this.size;return v(t,e,n)?this:Ht(this,x(t,n),g(e,n))},jt.prototype.__iterator=function(t,e){var n=0,r=Jt(this,e);return new E(function(){var e=r();return e===Hn?S():A(t,n++,e)})},jt.prototype.__iterate=function(t,e){for(var n,r=0,i=Jt(this,e);(n=i())!==Hn&&!1!==t(n,r++,this););return r},jt.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Xt(this._origin,this._capacity,this._level,this._root,this._tail,t,this.__hash):(this.__ownerID=t,this)},jt.isList=Lt;var Yn="@@__IMMUTABLE_LIST__@@",Wn=jt.prototype;Wn[Yn]=!0,Wn.delete=Wn.remove,Wn.setIn=zn.setIn,Wn.deleteIn=Wn.removeIn=zn.removeIn,Wn.update=zn.update,Wn.updateIn=zn.updateIn,Wn.mergeIn=zn.mergeIn,Wn.mergeDeepIn=zn.mergeDeepIn,Wn.withMutations=zn.withMutations,Wn.asMutable=zn.asMutable,Wn.asImmutable=zn.asImmutable,Wn.wasAltered=zn.wasAltered,zt.prototype.removeBefore=function(t,e,n){if(n===e?1<<e:0===this.array.length)return this;var r=n>>>e&mn;if(r>=this.array.length)return new zt([],t);var i,o=0===r;if(e>0){var s=this.array[r];if((i=s&&s.removeBefore(t,e-fn,n))===s&&o)return this}if(o&&!i)return this;var a=Wt(this,t);if(!o)for(var u=0;u<r;u++)a.array[u]=void 0;return i&&(a.array[r]=i),a},zt.prototype.removeAfter=function(t,e,n){if(n===(e?1<<e:0)||0===this.array.length)return this;var r=n-1>>>e&mn;if(r>=this.array.length)return this;var i;if(e>0){var o=this.array[r];if((i=o&&o.removeAfter(t,e-fn,n))===o&&r===this.array.length-1)return this}var s=Wt(this,t);return s.array.splice(r+1),i&&(s.array[r]=i),s};var Gn,Hn={};t(Zt,lt),Zt.of=function(){return this(arguments)},Zt.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Zt.prototype.get=function(t,e){var n=this._map.get(t);return void 0!==n?this._list.get(n)[1]:e},Zt.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):ee()},Zt.prototype.set=function(t,e){return ne(this,t,e)},Zt.prototype.remove=function(t){return ne(this,t,yn)},Zt.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Zt.prototype.__iterate=function(t,e){var n=this;return this._list.__iterate(function(e){return e&&t(e[1],e[0],n)},e)},Zt.prototype.__iterator=function(t,e){return this._list.fromEntrySeq().__iterator(t,e)},Zt.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map.__ensureOwner(t),n=this._list.__ensureOwner(t);return t?te(e,n,t,this.__hash):(this.__ownerID=t,this._map=e,this._list=n,this)},Zt.isOrderedMap=Qt,Zt.prototype[pn]=!0,Zt.prototype.delete=Zt.prototype.remove;var Vn;t(re,I),re.prototype.get=function(t,e){return this._iter.get(t,e)},re.prototype.has=function(t){return this._iter.has(t)},re.prototype.valueSeq=function(){return this._iter.valueSeq()},re.prototype.reverse=function(){var t=this,e=ce(this,!0);return this._useKeys||(e.valueSeq=function(){return t._iter.toSeq().reverse()}),e},re.prototype.map=function(t,e){var n=this,r=ue(this,t,e);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(t,e)}),r},re.prototype.__iterate=function(t,e){var n,r=this;return this._iter.__iterate(this._useKeys?function(e,n){return t(e,n,r)}:(n=e?_e(this):0,function(i){return t(i,e?--n:n++,r)}),e)},re.prototype.__iterator=function(t,e){if(this._useKeys)return this._iter.__iterator(t,e);var n=this._iter.__iterator(Dn,e),r=e?_e(this):0;return new E(function(){var i=n.next();return i.done?i:A(t,e?--r:r++,i.value,i)})},re.prototype[pn]=!0,t(ie,T),ie.prototype.includes=function(t){return this._iter.includes(t)},ie.prototype.__iterate=function(t,e){var n=this,r=0;return this._iter.__iterate(function(e){return t(e,r++,n)},e)},ie.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e),r=0;return new E(function(){var e=n.next();return e.done?e:A(t,r++,e.value,e)})},t(oe,B),oe.prototype.has=function(t){return this._iter.includes(t)},oe.prototype.__iterate=function(t,e){var n=this;return this._iter.__iterate(function(e){return t(e,e,n)},e)},oe.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e);return new E(function(){var e=n.next();return e.done?e:A(t,e.value,e.value,e)})},t(se,I),se.prototype.entrySeq=function(){return this._iter.toSeq()},se.prototype.__iterate=function(t,e){var n=this;return this._iter.__iterate(function(e){if(e){Ce(e);var r=o(e);return t(r?e.get(1):e[1],r?e.get(0):e[0],n)}},e)},se.prototype.__iterator=function(t,e){var n=this._iter.__iterator(Dn,e);return new E(function(){for(;;){var e=n.next();if(e.done)return e;var r=e.value;if(r){Ce(r);var i=o(r);return A(t,i?r.get(0):r[0],i?r.get(1):r[1],e)}}})},ie.prototype.cacheResult=re.prototype.cacheResult=oe.prototype.cacheResult=se.prototype.cacheResult=ke,t(Be,et),Be.prototype.toString=function(){return this.__toString(Pe(this)+" {","}")},Be.prototype.has=function(t){return this._defaultValues.hasOwnProperty(t)},Be.prototype.get=function(t,e){if(!this.has(t))return e;var n=this._defaultValues[t];return this._map?this._map.get(t,n):n},Be.prototype.clear=function(){if(this.__ownerID)return this._map&&this._map.clear(),this;var t=this.constructor;return t._empty||(t._empty=Me(this,At()))},Be.prototype.set=function(t,e){if(!this.has(t))throw new Error('Cannot set unknown key "'+t+'" on '+Pe(this));if(this._map&&!this._map.has(t)){if(e===this._defaultValues[t])return this}var n=this._map&&this._map.set(t,e);return this.__ownerID||n===this._map?this:Me(this,n)},Be.prototype.remove=function(t){if(!this.has(t))return this;var e=this._map&&this._map.remove(t);return this.__ownerID||e===this._map?this:Me(this,e)},Be.prototype.wasAltered=function(){return this._map.wasAltered()},Be.prototype.__iterator=function(t,e){var r=this;return n(this._defaultValues).map(function(t,e){return r.get(e)}).__iterator(t,e)},Be.prototype.__iterate=function(t,e){var r=this;return n(this._defaultValues).map(function(t,e){return r.get(e)}).__iterate(t,e)},Be.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map&&this._map.__ensureOwner(t);return t?Me(this,e,t):(this.__ownerID=t,this._map=e,this)};var $n=Be.prototype;$n.delete=$n.remove,$n.deleteIn=$n.removeIn=zn.removeIn,$n.merge=zn.merge,$n.mergeWith=zn.mergeWith,$n.mergeIn=zn.mergeIn,$n.mergeDeep=zn.mergeDeep,$n.mergeDeepWith=zn.mergeDeepWith,$n.mergeDeepIn=zn.mergeDeepIn,$n.setIn=zn.setIn,$n.update=zn.update,$n.updateIn=zn.updateIn,$n.withMutations=zn.withMutations,$n.asMutable=zn.asMutable,$n.asImmutable=zn.asImmutable,t(Re,rt),Re.of=function(){return this(arguments)},Re.fromKeys=function(t){return this(n(t).keySeq())},Re.prototype.toString=function(){return this.__toString("Set {","}")},Re.prototype.has=function(t){return this._map.has(t)},Re.prototype.add=function(t){return je(this,this._map.set(t,!0))},Re.prototype.remove=function(t){return je(this,this._map.remove(t))},Re.prototype.clear=function(){return je(this,this._map.clear())},Re.prototype.union=function(){var t=un.call(arguments,0);return t=t.filter(function(t){return 0!==t.size}),0===t.length?this:0!==this.size||this.__ownerID||1!==t.length?this.withMutations(function(e){for(var n=0;n<t.length;n++)i(t[n]).forEach(function(t){return e.add(t)})}):this.constructor(t[0])},Re.prototype.intersect=function(){var t=un.call(arguments,0);if(0===t.length)return this;t=t.map(function(t){return i(t)});var e=this;return this.withMutations(function(n){e.forEach(function(e){t.every(function(t){return t.includes(e)})||n.remove(e)})})},Re.prototype.subtract=function(){var t=un.call(arguments,0);if(0===t.length)return this;t=t.map(function(t){return i(t)});var e=this;return this.withMutations(function(n){e.forEach(function(e){t.some(function(t){return t.includes(e)})&&n.remove(e)})})},Re.prototype.merge=function(){return this.union.apply(this,arguments)},Re.prototype.mergeWith=function(t){var e=un.call(arguments,1);return this.union.apply(this,e)},Re.prototype.sort=function(t){return Je(De(this,t))},Re.prototype.sortBy=function(t,e){return Je(De(this,e,t))},Re.prototype.wasAltered=function(){return this._map.wasAltered()},Re.prototype.__iterate=function(t,e){var n=this;return this._map.__iterate(function(e,r){return t(r,r,n)},e)},Re.prototype.__iterator=function(t,e){return this._map.map(function(t,e){return e}).__iterator(t,e)},Re.prototype.__ensureOwner=function(t){if(t===this.__ownerID)return this;var e=this._map.__ensureOwner(t);return t?this.__make(e,t):(this.__ownerID=t,this._map=e,this)},Re.isSet=Ue;var Zn="@@__IMMUTABLE_SET__@@",Qn=Re.prototype;Qn[Zn]=!0,Qn.delete=Qn.remove,Qn.mergeDeep=Qn.merge,Qn.mergeDeepWith=Qn.mergeWith,Qn.withMutations=zn.withMutations,Qn.asMutable=zn.asMutable,Qn.asImmutable=zn.asImmutable,Qn.__empty=ze,Qn.__make=Le;var tr;t(Je,Re),Je.of=function(){return this(arguments)},Je.fromKeys=function(t){return this(n(t).keySeq())},Je.prototype.toString=function(){return this.__toString("OrderedSet {","}")},Je.isOrderedSet=Xe;var er=Je.prototype;er[pn]=!0,er.__empty=Ke,er.__make=qe;var nr;t(Ye,nt),Ye.of=function(){return this(arguments)},Ye.prototype.toString=function(){return this.__toString("Stack [","]")},Ye.prototype.get=function(t,e){var n=this._head;for(t=m(this,t);n&&t--;)n=n.next;return n?n.value:e},Ye.prototype.peek=function(){return this._head&&this._head.value},Ye.prototype.push=function(){if(0===arguments.length)return this;for(var t=this.size+arguments.length,e=this._head,n=arguments.length-1;n>=0;n--)e={value:arguments[n],next:e};return this.__ownerID?(this.size=t,this._head=e,this.__hash=void 0,this.__altered=!0,this):Ge(t,e)},Ye.prototype.pushAll=function(t){if(t=r(t),0===t.size)return this;ht(t.size);var e=this.size,n=this._head;return t.reverse().forEach(function(t){e++,n={value:t,next:n}}),this.__ownerID?(this.size=e,this._head=n,this.__hash=void 0,this.__altered=!0,this):Ge(e,n)},Ye.prototype.pop=function(){return this.slice(1)},Ye.prototype.unshift=function(){return this.push.apply(this,arguments)},Ye.prototype.unshiftAll=function(t){return this.pushAll(t)},Ye.prototype.shift=function(){return this.pop.apply(this,arguments)},Ye.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):He()},Ye.prototype.slice=function(t,e){if(v(t,e,this.size))return this;var n=x(t,this.size);if(g(e,this.size)!==this.size)return nt.prototype.slice.call(this,t,e);for(var r=this.size-n,i=this._head;n--;)i=i.next;return this.__ownerID?(this.size=r,this._head=i,this.__hash=void 0,this.__altered=!0,this):Ge(r,i)},Ye.prototype.__ensureOwner=function(t){return t===this.__ownerID?this:t?Ge(this.size,this._head,t,this.__hash):(this.__ownerID=t,this.__altered=!1,this)},Ye.prototype.__iterate=function(t,e){if(e)return this.reverse().__iterate(t);for(var n=0,r=this._head;r&&!1!==t(r.value,n++,this);)r=r.next;return n},Ye.prototype.__iterator=function(t,e){if(e)return this.reverse().__iterator(t);var n=0,r=this._head;return new E(function(){if(r){var e=r.value;return r=r.next,A(t,n++,e)}return S()})},Ye.isStack=We;var rr="@@__IMMUTABLE_STACK__@@",ir=Ye.prototype;ir[rr]=!0,ir.withMutations=zn.withMutations,ir.asMutable=zn.asMutable,ir.asImmutable=zn.asImmutable,ir.wasAltered=zn.wasAltered;var or;e.Iterator=E,Ve(e,{toArray:function(){ht(this.size);var t=new Array(this.size||0);return this.valueSeq().__iterate(function(e,n){t[n]=e}),t},toIndexedSeq:function(){return new ie(this)},toJS:function(){return this.toSeq().map(function(t){return t&&"function"==typeof t.toJS?t.toJS():t}).__toJS()},toJSON:function(){return this.toSeq().map(function(t){return t&&"function"==typeof t.toJSON?t.toJSON():t}).__toJS()},toKeyedSeq:function(){return new re(this,!0)},toMap:function(){return lt(this.toKeyedSeq())},toObject:function(){ht(this.size);var t={};return this.__iterate(function(e,n){t[n]=e}),t},toOrderedMap:function(){return Zt(this.toKeyedSeq())},toOrderedSet:function(){return Je(s(this)?this.valueSeq():this)},toSet:function(){return Re(s(this)?this.valueSeq():this)},toSetSeq:function(){return new oe(this)},toSeq:function(){return a(this)?this.toIndexedSeq():s(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Ye(s(this)?this.valueSeq():this)},toList:function(){return jt(s(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(t,e){return 0===this.size?t+e:t+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+e},concat:function(){return we(this,ye(this,un.call(arguments,0)))},includes:function(t){return this.some(function(e){return H(e,t)})},entries:function(){return this.__iterator(En)},every:function(t,e){ht(this.size);var n=!0;return this.__iterate(function(r,i,o){if(!t.call(e,r,i,o))return n=!1,!1}),n},filter:function(t,e){return we(this,he(this,t,e,!0))},find:function(t,e,n){var r=this.findEntry(t,e);return r?r[1]:n},forEach:function(t,e){return ht(this.size),this.__iterate(e?t.bind(e):t)},join:function(t){ht(this.size),t=void 0!==t?""+t:",";var e="",n=!0;return this.__iterate(function(r){n?n=!1:e+=t,e+=null!==r&&void 0!==r?r.toString():""}),e},keys:function(){return this.__iterator(gn)},map:function(t,e){return we(this,ue(this,t,e))},reduce:function(t,e,n){ht(this.size);var r,i;return arguments.length<2?i=!0:r=e,this.__iterate(function(e,o,s){i?(i=!1,r=e):r=t.call(n,r,e,o,s)}),r},reduceRight:function(t,e,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return we(this,ce(this,!0))},slice:function(t,e){return we(this,fe(this,t,e,!0))},some:function(t,e){return!this.every(Qe(t),e)},sort:function(t){return we(this,De(this,t))},values:function(){return this.__iterator(Dn)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some(function(){return!0})},count:function(t,e){return d(t?this.toSeq().filter(t,e):this)},countBy:function(t,e){return le(this,t,e)},equals:function(t){return V(this,t)},entrySeq:function(){var t=this;if(t._cache)return new M(t._cache);var e=t.toSeq().map(Ze).toIndexedSeq();return e.fromEntrySeq=function(){return t.toSeq()},e},filterNot:function(t,e){return this.filter(Qe(t),e)},findEntry:function(t,e,n){var r=n;return this.__iterate(function(n,i,o){if(t.call(e,n,i,o))return r=[i,n],!1}),r},findKey:function(t,e){var n=this.findEntry(t,e);return n&&n[0]},findLast:function(t,e,n){return this.toKeyedSeq().reverse().find(t,e,n)},findLastEntry:function(t,e,n){return this.toKeyedSeq().reverse().findEntry(t,e,n)},findLastKey:function(t,e){return this.toKeyedSeq().reverse().findKey(t,e)},first:function(){return this.find(y)},flatMap:function(t,e){return we(this,xe(this,t,e))},flatten:function(t){return we(this,ve(this,t,!0))},fromEntrySeq:function(){return new se(this)},get:function(t,e){return this.find(function(e,n){return H(n,t)},void 0,e)},getIn:function(t,e){for(var n,r=this,i=Te(t);!(n=i.next()).done;){var o=n.value;if((r=r&&r.get?r.get(o,yn):yn)===yn)return e}return r},groupBy:function(t,e){return pe(this,t,e)},has:function(t){return this.get(t,yn)!==yn},hasIn:function(t){return this.getIn(t,yn)!==yn},isSubset:function(t){return t="function"==typeof t.includes?t:e(t),this.every(function(e){return t.includes(e)})},isSuperset:function(t){return t="function"==typeof t.isSubset?t:e(t),t.isSubset(this)},keyOf:function(t){return this.findKey(function(e){return H(e,t)})},keySeq:function(){return this.toSeq().map($e).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(t){return this.toKeyedSeq().reverse().keyOf(t)},max:function(t){return Ee(this,t)},maxBy:function(t,e){return Ee(this,e,t)},min:function(t){return Ee(this,t?tn(t):rn)},minBy:function(t,e){return Ee(this,e?tn(e):rn,t)},rest:function(){return this.slice(1)},skip:function(t){return this.slice(Math.max(0,t))},skipLast:function(t){return we(this,this.toSeq().reverse().skip(t).reverse())},skipWhile:function(t,e){return we(this,me(this,t,e,!0))},skipUntil:function(t,e){return this.skipWhile(Qe(t),e)},sortBy:function(t,e){return we(this,De(this,e,t))},take:function(t){return this.slice(0,Math.max(0,t))},takeLast:function(t){return we(this,this.toSeq().reverse().take(t).reverse())},takeWhile:function(t,e){return we(this,de(this,t,e))},takeUntil:function(t,e){return this.takeWhile(Qe(t),e)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=on(this))}});var sr=e.prototype;sr[cn]=!0,sr[wn]=sr.values,sr.__toJS=sr.toArray,sr.__toStringMapper=en,sr.inspect=sr.toSource=function(){return this.toString()},sr.chain=sr.flatMap,sr.contains=sr.includes,Ve(n,{flip:function(){return we(this,ae(this))},mapEntries:function(t,e){var n=this,r=0;return we(this,this.toSeq().map(function(i,o){return t.call(e,[o,i],r++,n)}).fromEntrySeq())},mapKeys:function(t,e){var n=this;return we(this,this.toSeq().flip().map(function(r,i){return t.call(e,r,i,n)}).flip())}});var ar=n.prototype;return ar[hn]=!0,ar[wn]=sr.entries,ar.__toJS=sr.toObject,ar.__toStringMapper=function(t,e){return JSON.stringify(e)+": "+en(t)},Ve(r,{toKeyedSeq:function(){return new re(this,!1)},filter:function(t,e){return we(this,he(this,t,e,!1))},findIndex:function(t,e){var n=this.findEntry(t,e);return n?n[0]:-1},indexOf:function(t){var e=this.keyOf(t);return void 0===e?-1:e},lastIndexOf:function(t){var e=this.lastKeyOf(t);return void 0===e?-1:e},reverse:function(){return we(this,ce(this,!1))},slice:function(t,e){return we(this,fe(this,t,e,!1))},splice:function(t,e){var n=arguments.length;if(e=Math.max(0|e,0),0===n||2===n&&!e)return this;t=x(t,t<0?this.count():this.size);var r=this.slice(0,t);return we(this,1===n?r:r.concat(f(arguments,2),this.slice(t+e)))},findLastIndex:function(t,e){var n=this.findLastEntry(t,e);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(t){return we(this,ve(this,t,!1))},get:function(t,e){return t=m(this,t),t<0||this.size===1/0||void 0!==this.size&&t>this.size?e:this.find(function(e,n){return n===t},void 0,e)},has:function(t){return(t=m(this,t))>=0&&(void 0!==this.size?this.size===1/0||t<this.size:-1!==this.indexOf(t))},interpose:function(t){return we(this,ge(this,t))},interleave:function(){var t=[this].concat(f(arguments)),e=Se(this.toSeq(),T.of,t),n=e.flatten(!0);return e.size&&(n.size=e.size*t.length),we(this,n)},keySeq:function(){return Q(0,this.size)},last:function(){return this.get(-1)},skipWhile:function(t,e){return we(this,me(this,t,e,!1))},zip:function(){return we(this,Se(this,nn,[this].concat(f(arguments))))},zipWith:function(t){var e=f(arguments);return e[0]=this,we(this,Se(this,t,e))}}),r.prototype[ln]=!0,r.prototype[pn]=!0,Ve(i,{get:function(t,e){return this.has(t)?t:e},includes:function(t){return this.has(t)},keySeq:function(){return this.valueSeq()}}),i.prototype.has=sr.includes,i.prototype.contains=i.prototype.includes,Ve(I,n.prototype),Ve(T,r.prototype),Ve(B,i.prototype),Ve(et,n.prototype),Ve(nt,r.prototype),Ve(rt,i.prototype),{Iterable:e,Seq:k,Collection:tt,Map:lt,OrderedMap:Zt,List:jt,Stack:Ye,Set:Re,OrderedSet:Je,Record:Be,Range:Q,Repeat:$,is:H,fromJS:K}})},function(t,e){var n={}.toString;t.exports=Array.isArray||function(t){return"[object Array]"==n.call(t)}},function(t,e,n){"use strict";var r=n(236);t.exports=r},function(t,e,n){"use strict";function r(t){return function(){throw new Error("Function "+t+" is deprecated and cannot be used.")}}var i=n(238),o=n(237);t.exports.Type=n(0),t.exports.Schema=n(24),t.exports.FAILSAFE_SCHEMA=n(71),t.exports.JSON_SCHEMA=n(111),t.exports.CORE_SCHEMA=n(110),t.exports.DEFAULT_SAFE_SCHEMA=n(34),t.exports.DEFAULT_FULL_SCHEMA=n(47),t.exports.load=i.load,t.exports.loadAll=i.loadAll,t.exports.safeLoad=i.safeLoad,t.exports.safeLoadAll=i.safeLoadAll,t.exports.dump=o.dump,t.exports.safeDump=o.safeDump,t.exports.YAMLException=n(33),t.exports.MINIMAL_SCHEMA=n(71),t.exports.SAFE_SCHEMA=n(34),t.exports.DEFAULT_SCHEMA=n(47),t.exports.scan=r("scan"),t.exports.parse=r("parse"),t.exports.compose=r("compose"),t.exports.addConstructor=r("addConstructor")},function(t,e,n){"use strict";function r(t,e){var n,r,i,o,s,a,u;if(null===e)return{};for(n={},r=Object.keys(e),i=0,o=r.length;i<o;i+=1)s=r[i],a=String(e[s]),"!!"===s.slice(0,2)&&(s="tag:yaml.org,2002:"+s.slice(2)),u=t.compiledTypeMap.fallback[s],u&&N.call(u.styleAliases,a)&&(a=u.styleAliases[a]),n[s]=a;return n}function i(t){var e,n,r;if(e=t.toString(16).toUpperCase(),t<=255)n="x",r=2;else if(t<=65535)n="u",r=4;else{if(!(t<=4294967295))throw new T("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+I.repeat("0",r-e.length)+e}function o(t){this.schema=t.schema||B,this.indent=Math.max(1,t.indent||2),this.skipInvalid=t.skipInvalid||!1,this.flowLevel=I.isNothing(t.flowLevel)?-1:t.flowLevel,this.styleMap=r(this.schema,t.styles||null),this.sortKeys=t.sortKeys||!1,this.lineWidth=t.lineWidth||80,this.noRefs=t.noRefs||!1,this.noCompatMode=t.noCompatMode||!1,this.condenseFlow=t.condenseFlow||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function s(t,e){for(var n,r=I.repeat(" ",e),i=0,o=-1,s="",a=t.length;i<a;)o=t.indexOf("\n",i),-1===o?(n=t.slice(i),i=a):(n=t.slice(i,o+1),i=o+1),n.length&&"\n"!==n&&(s+=r),s+=n;return s}function a(t,e){return"\n"+I.repeat(" ",t.indent*e)}function u(t,e){var n,r,i;for(n=0,r=t.implicitTypes.length;n<r;n+=1)if(i=t.implicitTypes[n],i.resolve(e))return!0;return!1}function c(t){return t===U||t===O}function h(t){return 32<=t&&t<=126||161<=t&&t<=55295&&8232!==t&&8233!==t||57344<=t&&t<=65533&&65279!==t||65536<=t&&t<=1114111}function l(t){return h(t)&&65279!==t&&t!==Y&&t!==Z&&t!==Q&&t!==et&&t!==rt&&t!==G&&t!==z}function p(t){return h(t)&&65279!==t&&!c(t)&&t!==W&&t!==V&&t!==G&&t!==Y&&t!==Z&&t!==Q&&t!==et&&t!==rt&&t!==z&&t!==X&&t!==K&&t!==j&&t!==nt&&t!==H&&t!==q&&t!==L&&t!==J&&t!==$&&t!==tt}function f(t,e,n,r,i){var o,s,a=!1,u=!1,f=-1!==r,d=-1,m=p(t.charCodeAt(0))&&!c(t.charCodeAt(t.length-1));if(e)for(o=0;o<t.length;o++){if(s=t.charCodeAt(o),!h(s))return ht;m=m&&l(s)}else{for(o=0;o<t.length;o++){if((s=t.charCodeAt(o))===R)a=!0,f&&(u=u||o-d-1>r&&" "!==t[d+1],d=o);else if(!h(s))return ht;m=m&&l(s)}u=u||f&&o-d-1>r&&" "!==t[d+1]}return a||u?" "===t[0]&&n>9?ht:u?ct:ut:m&&!i(t)?st:at}function d(t,e,n,r){t.dump=function(){function i(e){return u(t,e)}if(0===e.length)return"''";if(!t.noCompatMode&&-1!==ot.indexOf(e))return"'"+e+"'";var o=t.indent*Math.max(1,n),a=-1===t.lineWidth?-1:Math.max(Math.min(t.lineWidth,40),t.lineWidth-o),c=r||t.flowLevel>-1&&n>=t.flowLevel;switch(f(e,c,t.indent,a,i)){case st:return e;case at:return"'"+e.replace(/'/g,"''")+"'";case ut:return"|"+m(e,t.indent)+y(s(e,o));case ct:return">"+m(e,t.indent)+y(s(v(e,a),o));case ht:return'"'+g(e)+'"';default:throw new T("impossible error: invalid scalar style")}}()}function m(t,e){var n=" "===t[0]?String(e):"",r="\n"===t[t.length-1];return n+(!r||"\n"!==t[t.length-2]&&"\n"!==t?r?"":"-":"+")+"\n"}function y(t){return"\n"===t[t.length-1]?t.slice(0,-1):t}function v(t,e){for(var n,r,i=/(\n+)([^\n]*)/g,o=function(){var n=t.indexOf("\n");return n=-1!==n?n:t.length,i.lastIndex=n,x(t.slice(0,n),e)}(),s="\n"===t[0]||" "===t[0];r=i.exec(t);){var a=r[1],u=r[2];n=" "===u[0],o+=a+(s||n||""===u?"":"\n")+x(u,e),s=n}return o}function x(t,e){if(""===t||" "===t[0])return t;for(var n,r,i=/ [^ ]/g,o=0,s=0,a=0,u="";n=i.exec(t);)a=n.index,a-o>e&&(r=s>o?s:a,u+="\n"+t.slice(o,r),o=r+1),s=a;return u+="\n",t.length-o>e&&s>o?u+=t.slice(o,s)+"\n"+t.slice(s+1):u+=t.slice(o),u.slice(1)}function g(t){for(var e,n,r,o="",s=0;s<t.length;s++)e=t.charCodeAt(s),e>=55296&&e<=56319&&(n=t.charCodeAt(s+1))>=56320&&n<=57343?(o+=i(1024*(e-55296)+n-56320+65536),s++):(r=it[e],o+=!r&&h(e)?t[s]:r||i(e));return o}function D(t,e,n){var r,i,o="",s=t.tag;for(r=0,i=n.length;r<i;r+=1)C(t,e,n[r],!1,!1)&&(0!==r&&(o+=","+(t.condenseFlow?"":" ")),o+=t.dump);t.tag=s,t.dump="["+o+"]"}function E(t,e,n,r){var i,o,s="",u=t.tag;for(i=0,o=n.length;i<o;i+=1)C(t,e+1,n[i],!0,!0)&&(r&&0===i||(s+=a(t,e)),t.dump&&R===t.dump.charCodeAt(0)?s+="-":s+="- ",s+=t.dump);t.tag=u,t.dump=s||"[]"}function A(t,e,n){var r,i,o,s,a,u="",c=t.tag,h=Object.keys(n);for(r=0,i=h.length;r<i;r+=1)a=t.condenseFlow?'"':"",0!==r&&(a+=", "),o=h[r],s=n[o],C(t,e,o,!1,!1)&&(t.dump.length>1024&&(a+="? "),a+=t.dump+(t.condenseFlow?'"':"")+":"+(t.condenseFlow?"":" "),C(t,e,s,!1,!1)&&(a+=t.dump,u+=a));t.tag=c,t.dump="{"+u+"}"}function S(t,e,n,r){var i,o,s,u,c,h,l="",p=t.tag,f=Object.keys(n);if(!0===t.sortKeys)f.sort();else if("function"==typeof t.sortKeys)f.sort(t.sortKeys);else if(t.sortKeys)throw new T("sortKeys must be a boolean or a function");for(i=0,o=f.length;i<o;i+=1)h="",r&&0===i||(h+=a(t,e)),s=f[i],u=n[s],C(t,e+1,s,!0,!0,!0)&&(c=null!==t.tag&&"?"!==t.tag||t.dump&&t.dump.length>1024,c&&(t.dump&&R===t.dump.charCodeAt(0)?h+="?":h+="? "),h+=t.dump,c&&(h+=a(t,e)),C(t,e+1,u,!0,c)&&(t.dump&&R===t.dump.charCodeAt(0)?h+=":":h+=": ",h+=t.dump,l+=h));t.tag=p,t.dump=l||"{}"}function w(t,e,n){var r,i,o,s,a,u;for(i=n?t.explicitTypes:t.implicitTypes,o=0,s=i.length;o<s;o+=1)if(a=i[o],(a.instanceOf||a.predicate)&&(!a.instanceOf||"object"==typeof e&&e instanceof a.instanceOf)&&(!a.predicate||a.predicate(e))){if(t.tag=n?a.tag:"?",a.represent){if(u=t.styleMap[a.tag]||a.defaultStyle,"[object Function]"===P.call(a.represent))r=a.represent(e,u);else{if(!N.call(a.represent,u))throw new T("!<"+a.tag+'> tag resolver accepts not "'+u+'" style');r=a.represent[u](e,u)}t.dump=r}return!0}return!1}function C(t,e,n,r,i,o){t.tag=null,t.dump=n,w(t,n,!1)||w(t,n,!0);var s=P.call(t.dump);r&&(r=t.flowLevel<0||t.flowLevel>e);var a,u,c="[object Object]"===s||"[object Array]"===s;if(c&&(a=t.duplicates.indexOf(n),u=-1!==a),(null!==t.tag&&"?"!==t.tag||u||2!==t.indent&&e>0)&&(i=!1),u&&t.usedDuplicates[a])t.dump="*ref_"+a;else{if(c&&u&&!t.usedDuplicates[a]&&(t.usedDuplicates[a]=!0),"[object Object]"===s)r&&0!==Object.keys(t.dump).length?(S(t,e,t.dump,i),u&&(t.dump="&ref_"+a+t.dump)):(A(t,e,t.dump),u&&(t.dump="&ref_"+a+" "+t.dump));else if("[object Array]"===s)r&&0!==t.dump.length?(E(t,e,t.dump,i),u&&(t.dump="&ref_"+a+t.dump)):(D(t,e,t.dump),u&&(t.dump="&ref_"+a+" "+t.dump));else{if("[object String]"!==s){if(t.skipInvalid)return!1;throw new T("unacceptable kind of an object to dump "+s)}"?"!==t.tag&&d(t,t.dump,e,o)}null!==t.tag&&"?"!==t.tag&&(t.dump="!<"+t.tag+"> "+t.dump)}return!0}function _(t,e){var n,r,i=[],o=[];for(b(t,i,o),n=0,r=o.length;n<r;n+=1)e.duplicates.push(i[o[n]]);e.usedDuplicates=new Array(r)}function b(t,e,n){var r,i,o;if(null!==t&&"object"==typeof t)if(-1!==(i=e.indexOf(t)))-1===n.indexOf(i)&&n.push(i);else if(e.push(t),Array.isArray(t))for(i=0,o=t.length;i<o;i+=1)b(t[i],e,n);else for(r=Object.keys(t),i=0,o=r.length;i<o;i+=1)b(t[r[i]],e,n)}function F(t,e){e=e||{};var n=new o(e);return n.noRefs||_(t,n),C(n,0,t,!0,!0)?n.dump+"\n":""}function k(t,e){return F(t,I.extend({schema:M},e))}var I=n(23),T=n(33),B=n(47),M=n(34),P=Object.prototype.toString,N=Object.prototype.hasOwnProperty,O=9,R=10,U=32,j=33,L=34,z=35,J=37,X=38,q=39,K=42,Y=44,W=45,G=58,H=62,V=63,$=64,Z=91,Q=93,tt=96,et=123,nt=124,rt=125,it={};it[0]="\\0",it[7]="\\a",it[8]="\\b",it[9]="\\t",it[10]="\\n",it[11]="\\v",it[12]="\\f",it[13]="\\r",it[27]="\\e",it[34]='\\"',it[92]="\\\\",it[133]="\\N",it[160]="\\_",it[8232]="\\L",it[8233]="\\P";var ot=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],st=1,at=2,ut=3,ct=4,ht=5;t.exports.dump=F,t.exports.safeDump=k},function(t,e,n){"use strict";function r(t){return 10===t||13===t}function i(t){return 9===t||32===t}function o(t){return 9===t||32===t||10===t||13===t}function s(t){return 44===t||91===t||93===t||123===t||125===t}function a(t){var e;return 48<=t&&t<=57?t-48:(e=32|t,97<=e&&e<=102?e-97+10:-1)}function u(t){return 120===t?2:117===t?4:85===t?8:0}function c(t){return 48<=t&&t<=57?t-48:-1}function h(t){return 48===t?"\0":97===t?"":98===t?"\b":116===t?"\t":9===t?"\t":110===t?"\n":118===t?"\v":102===t?"\f":114===t?"\r":101===t?"":32===t?" ":34===t?'"':47===t?"/":92===t?"\\":78===t?"…":95===t?" ":76===t?"\u2028":80===t?"\u2029":""}function l(t){return t<=65535?String.fromCharCode(t):String.fromCharCode(55296+(t-65536>>10),56320+(t-65536&1023))}function p(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||q,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function f(t,e){return new z(e,new J(t.filename,t.input,t.position,t.line,t.position-t.lineStart))}function d(t,e){throw f(t,e)}function m(t,e){t.onWarning&&t.onWarning.call(null,f(t,e))}function y(t,e,n,r){var i,o,s,a;if(e<n){if(a=t.input.slice(e,n),r)for(i=0,o=a.length;i<o;i+=1)9===(s=a.charCodeAt(i))||32<=s&&s<=1114111||d(t,"expected valid JSON character");else Q.test(a)&&d(t,"the stream contains non-printable characters");t.result+=a}}function v(t,e,n,r){var i,o,s,a;for(L.isObject(n)||d(t,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),s=0,a=i.length;s<a;s+=1)o=i[s],K.call(e,o)||(e[o]=n[o],r[o]=!0)}function x(t,e,n,r,i,o,s,a){var u,c;if(i=String(i),null===e&&(e={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(o))for(u=0,c=o.length;u<c;u+=1)v(t,e,o[u],n);else v(t,e,o,n);else t.json||K.call(n,i)||!K.call(e,i)||(t.line=s||t.line,t.position=a||t.position,d(t,"duplicated mapping key")),e[i]=o,delete n[i];return e}function g(t){var e;e=t.input.charCodeAt(t.position),10===e?t.position++:13===e?(t.position++,10===t.input.charCodeAt(t.position)&&t.position++):d(t,"a line break is expected"),t.line+=1,t.lineStart=t.position}function D(t,e,n){for(var o=0,s=t.input.charCodeAt(t.position);0!==s;){for(;i(s);)s=t.input.charCodeAt(++t.position);if(e&&35===s)do{s=t.input.charCodeAt(++t.position)}while(10!==s&&13!==s&&0!==s);if(!r(s))break;for(g(t),s=t.input.charCodeAt(t.position),o++,t.lineIndent=0;32===s;)t.lineIndent++,s=t.input.charCodeAt(++t.position)}return-1!==n&&0!==o&&t.lineIndent<n&&m(t,"deficient indentation"),o}function E(t){var e,n=t.position;return!(45!==(e=t.input.charCodeAt(n))&&46!==e||e!==t.input.charCodeAt(n+1)||e!==t.input.charCodeAt(n+2)||(n+=3,0!==(e=t.input.charCodeAt(n))&&!o(e)))}function A(t,e){1===e?t.result+=" ":e>1&&(t.result+=L.repeat("\n",e-1))}function S(t,e,n){var a,u,c,h,l,p,f,d,m,v=t.kind,x=t.result;if(m=t.input.charCodeAt(t.position),o(m)||s(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(u=t.input.charCodeAt(t.position+1),o(u)||n&&s(u)))return!1;for(t.kind="scalar",t.result="",c=h=t.position,l=!1;0!==m;){if(58===m){if(u=t.input.charCodeAt(t.position+1),o(u)||n&&s(u))break}else if(35===m){if(a=t.input.charCodeAt(t.position-1),o(a))break}else{if(t.position===t.lineStart&&E(t)||n&&s(m))break;if(r(m)){if(p=t.line,f=t.lineStart,d=t.lineIndent,D(t,!1,-1),t.lineIndent>=e){l=!0,m=t.input.charCodeAt(t.position);continue}t.position=h,t.line=p,t.lineStart=f,t.lineIndent=d;break}}l&&(y(t,c,h,!1),A(t,t.line-p),c=h=t.position,l=!1),i(m)||(h=t.position+1),m=t.input.charCodeAt(++t.position)}return y(t,c,h,!1),!!t.result||(t.kind=v,t.result=x,!1)}function w(t,e){var n,i,o;if(39!==(n=t.input.charCodeAt(t.position)))return!1;for(t.kind="scalar",t.result="",t.position++,i=o=t.position;0!==(n=t.input.charCodeAt(t.position));)if(39===n){if(y(t,i,t.position,!0),39!==(n=t.input.charCodeAt(++t.position)))return!0;i=t.position,t.position++,o=t.position}else r(n)?(y(t,i,o,!0),A(t,D(t,!1,e)),i=o=t.position):t.position===t.lineStart&&E(t)?d(t,"unexpected end of the document within a single quoted scalar"):(t.position++,o=t.position);d(t,"unexpected end of the stream within a single quoted scalar")}function C(t,e){var n,i,o,s,c,h;if(34!==(h=t.input.charCodeAt(t.position)))return!1;for(t.kind="scalar",t.result="",t.position++,n=i=t.position;0!==(h=t.input.charCodeAt(t.position));){if(34===h)return y(t,n,t.position,!0),t.position++,!0;if(92===h){if(y(t,n,t.position,!0),h=t.input.charCodeAt(++t.position),r(h))D(t,!1,e);else if(h<256&&it[h])t.result+=ot[h],t.position++;else if((c=u(h))>0){for(o=c,s=0;o>0;o--)h=t.input.charCodeAt(++t.position),(c=a(h))>=0?s=(s<<4)+c:d(t,"expected hexadecimal character");t.result+=l(s),t.position++}else d(t,"unknown escape sequence");n=i=t.position}else r(h)?(y(t,n,i,!0),A(t,D(t,!1,e)),n=i=t.position):t.position===t.lineStart&&E(t)?d(t,"unexpected end of the document within a double quoted scalar"):(t.position++,i=t.position)}d(t,"unexpected end of the stream within a double quoted scalar")}function _(t,e){var n,r,i,s,a,u,c,h,l,p,f,m=!0,y=t.tag,v=t.anchor,g={};if(91===(f=t.input.charCodeAt(t.position)))s=93,c=!1,r=[];else{if(123!==f)return!1;s=125,c=!0,r={}}for(null!==t.anchor&&(t.anchorMap[t.anchor]=r),f=t.input.charCodeAt(++t.position);0!==f;){if(D(t,!0,e),(f=t.input.charCodeAt(t.position))===s)return t.position++,t.tag=y,t.anchor=v,t.kind=c?"mapping":"sequence",t.result=r,!0;m||d(t,"missed comma between flow collection entries"),l=h=p=null,a=u=!1,63===f&&(i=t.input.charCodeAt(t.position+1),o(i)&&(a=u=!0,t.position++,D(t,!0,e))),n=t.line,M(t,e,Y,!1,!0),l=t.tag,h=t.result,D(t,!0,e),f=t.input.charCodeAt(t.position),!u&&t.line!==n||58!==f||(a=!0,f=t.input.charCodeAt(++t.position),D(t,!0,e),M(t,e,Y,!1,!0),p=t.result),c?x(t,r,g,l,h,p):a?r.push(x(t,null,g,l,h,p)):r.push(h),D(t,!0,e),f=t.input.charCodeAt(t.position),44===f?(m=!0,f=t.input.charCodeAt(++t.position)):m=!1}d(t,"unexpected end of the stream within a flow collection")}function b(t,e){var n,o,s,a,u=V,h=!1,l=!1,p=e,f=0,m=!1;if(124===(a=t.input.charCodeAt(t.position)))o=!1;else{if(62!==a)return!1;o=!0}for(t.kind="scalar",t.result="";0!==a;)if(43===(a=t.input.charCodeAt(++t.position))||45===a)V===u?u=43===a?Z:$:d(t,"repeat of a chomping mode identifier");else{if(!((s=c(a))>=0))break;0===s?d(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):l?d(t,"repeat of an indentation width identifier"):(p=e+s-1,l=!0)}if(i(a)){do{a=t.input.charCodeAt(++t.position)}while(i(a));if(35===a)do{a=t.input.charCodeAt(++t.position)}while(!r(a)&&0!==a)}for(;0!==a;){for(g(t),t.lineIndent=0,a=t.input.charCodeAt(t.position);(!l||t.lineIndent<p)&&32===a;)t.lineIndent++,a=t.input.charCodeAt(++t.position);if(!l&&t.lineIndent>p&&(p=t.lineIndent),r(a))f++;else{if(t.lineIndent<p){u===Z?t.result+=L.repeat("\n",h?1+f:f):u===V&&h&&(t.result+="\n");break}for(o?i(a)?(m=!0,t.result+=L.repeat("\n",h?1+f:f)):m?(m=!1,t.result+=L.repeat("\n",f+1)):0===f?h&&(t.result+=" "):t.result+=L.repeat("\n",f):t.result+=L.repeat("\n",h?1+f:f),h=!0,l=!0,f=0,n=t.position;!r(a)&&0!==a;)a=t.input.charCodeAt(++t.position);y(t,n,t.position,!1)}}return!0}function F(t,e){var n,r,i,s=t.tag,a=t.anchor,u=[],c=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=u),i=t.input.charCodeAt(t.position);0!==i&&45===i&&(r=t.input.charCodeAt(t.position+1),o(r));)if(c=!0,t.position++,D(t,!0,-1)&&t.lineIndent<=e)u.push(null),i=t.input.charCodeAt(t.position);else if(n=t.line,M(t,e,G,!1,!0),u.push(t.result),D(t,!0,-1),i=t.input.charCodeAt(t.position),(t.line===n||t.lineIndent>e)&&0!==i)d(t,"bad indentation of a sequence entry");else if(t.lineIndent<e)break;return!!c&&(t.tag=s,t.anchor=a,t.kind="sequence",t.result=u,!0)}function k(t,e,n){var r,s,a,u,c,h=t.tag,l=t.anchor,p={},f={},m=null,y=null,v=null,g=!1,E=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=p),c=t.input.charCodeAt(t.position);0!==c;){if(r=t.input.charCodeAt(t.position+1),a=t.line,u=t.position,63!==c&&58!==c||!o(r)){if(!M(t,n,W,!1,!0))break;if(t.line===a){for(c=t.input.charCodeAt(t.position);i(c);)c=t.input.charCodeAt(++t.position);if(58===c)c=t.input.charCodeAt(++t.position),o(c)||d(t,"a whitespace character is expected after the key-value separator within a block mapping"),g&&(x(t,p,f,m,y,null),m=y=v=null),E=!0,g=!1,s=!1,m=t.tag,y=t.result;else{if(!E)return t.tag=h,t.anchor=l,!0;d(t,"can not read an implicit mapping pair; a colon is missed")}}else{if(!E)return t.tag=h,t.anchor=l,!0;d(t,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===c?(g&&(x(t,p,f,m,y,null),m=y=v=null),E=!0,g=!0,s=!0):g?(g=!1,s=!0):d(t,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),t.position+=1,c=r;if((t.line===a||t.lineIndent>e)&&(M(t,e,H,!0,s)&&(g?y=t.result:v=t.result),g||(x(t,p,f,m,y,v,a,u),m=y=v=null),D(t,!0,-1),c=t.input.charCodeAt(t.position)),t.lineIndent>e&&0!==c)d(t,"bad indentation of a mapping entry");else if(t.lineIndent<e)break}return g&&x(t,p,f,m,y,null),E&&(t.tag=h,t.anchor=l,t.kind="mapping",t.result=p),E}function I(t){var e,n,r,i,s=!1,a=!1;if(33!==(i=t.input.charCodeAt(t.position)))return!1;if(null!==t.tag&&d(t,"duplication of a tag property"),i=t.input.charCodeAt(++t.position),60===i?(s=!0,i=t.input.charCodeAt(++t.position)):33===i?(a=!0,n="!!",i=t.input.charCodeAt(++t.position)):n="!",e=t.position,s){do{i=t.input.charCodeAt(++t.position)}while(0!==i&&62!==i);t.position<t.length?(r=t.input.slice(e,t.position),i=t.input.charCodeAt(++t.position)):d(t,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!o(i);)33===i&&(a?d(t,"tag suffix cannot contain exclamation marks"):(n=t.input.slice(e-1,t.position+1),nt.test(n)||d(t,"named tag handle cannot contain such characters"),a=!0,e=t.position+1)),i=t.input.charCodeAt(++t.position);r=t.input.slice(e,t.position),et.test(r)&&d(t,"tag suffix cannot contain flow indicator characters")}return r&&!rt.test(r)&&d(t,"tag name cannot contain such characters: "+r),s?t.tag=r:K.call(t.tagMap,n)?t.tag=t.tagMap[n]+r:"!"===n?t.tag="!"+r:"!!"===n?t.tag="tag:yaml.org,2002:"+r:d(t,'undeclared tag handle "'+n+'"'),!0}function T(t){var e,n;if(38!==(n=t.input.charCodeAt(t.position)))return!1;for(null!==t.anchor&&d(t,"duplication of an anchor property"),n=t.input.charCodeAt(++t.position),e=t.position;0!==n&&!o(n)&&!s(n);)n=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an anchor node must contain at least one character"),t.anchor=t.input.slice(e,t.position),!0}function B(t){var e,n,r;if(42!==(r=t.input.charCodeAt(t.position)))return!1;for(r=t.input.charCodeAt(++t.position),e=t.position;0!==r&&!o(r)&&!s(r);)r=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an alias node must contain at least one character"),n=t.input.slice(e,t.position),t.anchorMap.hasOwnProperty(n)||d(t,'unidentified alias "'+n+'"'),t.result=t.anchorMap[n],D(t,!0,-1),!0}function M(t,e,n,r,i){var o,s,a,u,c,h,l,p,f=1,m=!1,y=!1;if(null!==t.listener&&t.listener("open",t),t.tag=null,t.anchor=null,t.kind=null,t.result=null,o=s=a=H===n||G===n,r&&D(t,!0,-1)&&(m=!0,t.lineIndent>e?f=1:t.lineIndent===e?f=0:t.lineIndent<e&&(f=-1)),1===f)for(;I(t)||T(t);)D(t,!0,-1)?(m=!0,a=o,t.lineIndent>e?f=1:t.lineIndent===e?f=0:t.lineIndent<e&&(f=-1)):a=!1;if(a&&(a=m||i),1!==f&&H!==n||(l=Y===n||W===n?e:e+1,p=t.position-t.lineStart,1===f?a&&(F(t,p)||k(t,p,l))||_(t,l)?y=!0:(s&&b(t,l)||w(t,l)||C(t,l)?y=!0:B(t)?(y=!0,null===t.tag&&null===t.anchor||d(t,"alias node should not have any properties")):S(t,l,Y===n)&&(y=!0,null===t.tag&&(t.tag="?")),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):0===f&&(y=a&&F(t,p))),null!==t.tag&&"!"!==t.tag)if("?"===t.tag){for(u=0,c=t.implicitTypes.length;u<c;u+=1)if(h=t.implicitTypes[u],h.resolve(t.result)){t.result=h.construct(t.result),t.tag=h.tag,null!==t.anchor&&(t.anchorMap[t.anchor]=t.result);break}}else K.call(t.typeMap[t.kind||"fallback"],t.tag)?(h=t.typeMap[t.kind||"fallback"][t.tag],null!==t.result&&h.kind!==t.kind&&d(t,"unacceptable node kind for !<"+t.tag+'> tag; it should be "'+h.kind+'", not "'+t.kind+'"'),h.resolve(t.result)?(t.result=h.construct(t.result),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):d(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")):d(t,"unknown tag !<"+t.tag+">");return null!==t.listener&&t.listener("close",t),null!==t.tag||null!==t.anchor||y}function P(t){var e,n,s,a,u=t.position,c=!1;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap={},t.anchorMap={};0!==(a=t.input.charCodeAt(t.position))&&(D(t,!0,-1),a=t.input.charCodeAt(t.position),!(t.lineIndent>0||37!==a));){for(c=!0,a=t.input.charCodeAt(++t.position),e=t.position;0!==a&&!o(a);)a=t.input.charCodeAt(++t.position);for(n=t.input.slice(e,t.position),s=[],n.length<1&&d(t,"directive name must not be less than one character in length");0!==a;){for(;i(a);)a=t.input.charCodeAt(++t.position);if(35===a){do{a=t.input.charCodeAt(++t.position)}while(0!==a&&!r(a));break}if(r(a))break;for(e=t.position;0!==a&&!o(a);)a=t.input.charCodeAt(++t.position);s.push(t.input.slice(e,t.position))}0!==a&&g(t),K.call(at,n)?at[n](t,n,s):m(t,'unknown document directive "'+n+'"')}if(D(t,!0,-1),0===t.lineIndent&&45===t.input.charCodeAt(t.position)&&45===t.input.charCodeAt(t.position+1)&&45===t.input.charCodeAt(t.position+2)?(t.position+=3,D(t,!0,-1)):c&&d(t,"directives end mark is expected"),M(t,t.lineIndent-1,H,!1,!0),D(t,!0,-1),t.checkLineBreaks&&tt.test(t.input.slice(u,t.position))&&m(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&E(t))return void(46===t.input.charCodeAt(t.position)&&(t.position+=3,D(t,!0,-1)));t.position<t.length-1&&d(t,"end of the stream or a document separator is expected")}function N(t,e){t=String(t),e=e||{},0!==t.length&&(10!==t.charCodeAt(t.length-1)&&13!==t.charCodeAt(t.length-1)&&(t+="\n"),65279===t.charCodeAt(0)&&(t=t.slice(1)));var n=new p(t,e);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)P(n);return n.documents}function O(t,e,n){var r,i,o=N(t,n);if("function"!=typeof e)return o;for(r=0,i=o.length;r<i;r+=1)e(o[r])}function R(t,e){var n=N(t,e);if(0!==n.length){if(1===n.length)return n[0];throw new z("expected a single document in the stream, but found more")}}function U(t,e,n){if("function"!=typeof e)return O(t,L.extend({schema:X},n));O(t,e,L.extend({schema:X},n))}function j(t,e){return R(t,L.extend({schema:X},e))}for(var L=n(23),z=n(33),J=n(239),X=n(34),q=n(47),K=Object.prototype.hasOwnProperty,Y=1,W=2,G=3,H=4,V=1,$=2,Z=3,Q=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,tt=/[\x85\u2028\u2029]/,et=/[,\[\]\{\}]/,nt=/^(?:!|!!|![a-z\-]+!)$/i,rt=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,it=new Array(256),ot=new Array(256),st=0;st<256;st++)it[st]=h(st)?1:0,ot[st]=h(st);var at={YAML:function(t,e,n){var r,i,o;null!==t.version&&d(t,"duplication of %YAML directive"),1!==n.length&&d(t,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(t,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),o=parseInt(r[2],10),1!==i&&d(t,"unacceptable YAML version of the document"),t.version=n[0],t.checkLineBreaks=o<2,1!==o&&2!==o&&m(t,"unsupported YAML version of the document")},TAG:function(t,e,n){var r,i;2!==n.length&&d(t,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],nt.test(r)||d(t,"ill-formed tag handle (first argument) of the TAG directive"),K.call(t.tagMap,r)&&d(t,'there is a previously declared suffix for "'+r+'" tag handle'),rt.test(i)||d(t,"ill-formed tag prefix (second argument) of the TAG directive"),t.tagMap[r]=i}};t.exports.loadAll=O,t.exports.load=R,t.exports.safeLoadAll=U,t.exports.safeLoad=j},function(t,e,n){"use strict";function r(t,e,n,r,i){this.name=t,this.buffer=e,this.position=n,this.line=r,this.column=i}var i=n(23);r.prototype.getSnippet=function(t,e){var n,r,o,s,a;if(!this.buffer)return null;for(t=t||4,e=e||75,n="",r=this.position;r>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1));)if(r-=1,this.position-r>e/2-1){n=" ... ",r+=5;break}for(o="",s=this.position;s<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(s));)if((s+=1)-this.position>e/2-1){o=" ... ",s-=5;break}return a=this.buffer.slice(r,s),i.repeat(" ",t)+n+a+o+"\n"+i.repeat(" ",t+this.position-r+n.length)+"^"},r.prototype.toString=function(t){var e,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),t||(e=this.getSnippet())&&(n+=":\n"+e),n},t.exports=r},function(t,e,n){"use strict";function r(t){if(null===t)return!1;var e,n,r=0,i=t.length,o=c;for(n=0;n<i;n++)if(!((e=o.indexOf(t.charAt(n)))>64)){if(e<0)return!1;r+=6}return r%8==0}function i(t){var e,n,r=t.replace(/[\r\n=]/g,""),i=r.length,o=c,s=0,u=[];for(e=0;e<i;e++)e%4==0&&e&&(u.push(s>>16&255),u.push(s>>8&255),u.push(255&s)),s=s<<6|o.indexOf(r.charAt(e));return n=i%4*6,0===n?(u.push(s>>16&255),u.push(s>>8&255),u.push(255&s)):18===n?(u.push(s>>10&255),u.push(s>>2&255)):12===n&&u.push(s>>4&255),a?a.from?a.from(u):new a(u):u}function o(t){var e,n,r="",i=0,o=t.length,s=c;for(e=0;e<o;e++)e%3==0&&e&&(r+=s[i>>18&63],r+=s[i>>12&63],r+=s[i>>6&63],r+=s[63&i]),i=(i<<8)+t[e];return n=o%3,0===n?(r+=s[i>>18&63],r+=s[i>>12&63],r+=s[i>>6&63],r+=s[63&i]):2===n?(r+=s[i>>10&63],r+=s[i>>4&63],r+=s[i<<2&63],r+=s[64]):1===n&&(r+=s[i>>2&63],r+=s[i<<4&63],r+=s[64],r+=s[64]),r}function s(t){return a&&a.isBuffer(t)}var a;try{a=n(135).Buffer}catch(t){}var u=n(0),c="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";t.exports=new u("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;var e=t.length;return 4===e&&("true"===t||"True"===t||"TRUE"===t)||5===e&&("false"===t||"False"===t||"FALSE"===t)}function i(t){return"true"===t||"True"===t||"TRUE"===t}function o(t){return"[object Boolean]"===Object.prototype.toString.call(t)}var s=n(0);t.exports=new s("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{lowercase:function(t){return t?"true":"false"},uppercase:function(t){return t?"TRUE":"FALSE"},camelcase:function(t){return t?"True":"False"}},defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){return null!==t&&!(!c.test(t)||"_"===t[t.length-1])}function i(t){var e,n,r,i;return e=t.replace(/_/g,"").toLowerCase(),n="-"===e[0]?-1:1,i=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),".inf"===e?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===e?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(t){i.unshift(parseFloat(t,10))}),e=0,r=1,i.forEach(function(t){e+=t*r,r*=60}),n*e):n*parseFloat(e,10)}function o(t,e){var n;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(a.isNegativeZero(t))return"-0.0";return n=t.toString(10),h.test(n)?n.replace("e",".e"):n}function s(t){return"[object Number]"===Object.prototype.toString.call(t)&&(t%1!=0||a.isNegativeZero(t))}var a=n(23),u=n(0),c=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),h=/^[-+]?[0-9]+e/;t.exports=new u("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o,defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){return 48<=t&&t<=57||65<=t&&t<=70||97<=t&&t<=102}function i(t){return 48<=t&&t<=55}function o(t){return 48<=t&&t<=57}function s(t){if(null===t)return!1;var e,n=t.length,s=0,a=!1;if(!n)return!1;if(e=t[s],"-"!==e&&"+"!==e||(e=t[++s]),"0"===e){if(s+1===n)return!0;if("b"===(e=t[++s])){for(s++;s<n;s++)if("_"!==(e=t[s])){if("0"!==e&&"1"!==e)return!1;a=!0}return a&&"_"!==e}if("x"===e){for(s++;s<n;s++)if("_"!==(e=t[s])){if(!r(t.charCodeAt(s)))return!1;a=!0}return a&&"_"!==e}for(;s<n;s++)if("_"!==(e=t[s])){if(!i(t.charCodeAt(s)))return!1;a=!0}return a&&"_"!==e}if("_"===e)return!1;for(;s<n;s++)if("_"!==(e=t[s])){if(":"===e)break;if(!o(t.charCodeAt(s)))return!1;a=!0}return!(!a||"_"===e)&&(":"!==e||/^(:[0-5]?[0-9])+$/.test(t.slice(s)))}function a(t){var e,n,r=t,i=1,o=[];return-1!==r.indexOf("_")&&(r=r.replace(/_/g,"")),e=r[0],"-"!==e&&"+"!==e||("-"===e&&(i=-1),r=r.slice(1),e=r[0]),"0"===r?0:"0"===e?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):-1!==r.indexOf(":")?(r.split(":").forEach(function(t){o.unshift(parseInt(t,10))}),r=0,n=1,o.forEach(function(t){r+=t*n,n*=60}),i*r):i*parseInt(r,10)}function u(t){return"[object Number]"===Object.prototype.toString.call(t)&&t%1==0&&!c.isNegativeZero(t)}var c=n(23),h=n(0);t.exports=new h("tag:yaml.org,2002:int",{kind:"scalar",resolve:s,construct:a,predicate:u,represent:{binary:function(t){return"0b"+t.toString(2)},octal:function(t){return"0"+t.toString(8)},decimal:function(t){return t.toString(10)},hexadecimal:function(t){return"0x"+t.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;try{var e="("+t+")",n=a.parse(e,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(t){return!1}}function i(t){var e,n="("+t+")",r=a.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(t){i.push(t.name)}),e=r.body[0].expression.body.range,new Function(i,n.slice(e[0]+1,e[1]-1))}function o(t){return t.toString()}function s(t){return"[object Function]"===Object.prototype.toString.call(t)}var a;try{a=n(231)}catch(t){"undefined"!=typeof window&&(a=window.esprima)}var u=n(0);t.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(t){if(null===t)return!1;if(0===t.length)return!1;var e=t,n=/\/([gim]*)$/.exec(t),r="";if("/"===e[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==e[e.length-r.length-1])return!1}return!0}function i(t){var e=t,n=/\/([gim]*)$/.exec(t),r="";return"/"===e[0]&&(n&&(r=n[1]),e=e.slice(1,e.length-r.length-1)),new RegExp(e,r)}function o(t){var e="/"+t.source+"/";return t.global&&(e+="g"),t.multiline&&(e+="m"),t.ignoreCase&&(e+="i"),e}function s(t){return"[object RegExp]"===Object.prototype.toString.call(t)}var a=n(0);t.exports=new a("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";function r(){return!0}function i(){}function o(){return""}function s(t){return void 0===t}var a=n(0);t.exports=new a("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:s,represent:o})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(t){return null!==t?t:{}}})},function(t,e,n){"use strict";function r(t){return"<<"===t||null===t}var i=n(0);t.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e=t.length;return 1===e&&"~"===t||4===e&&("null"===t||"Null"===t||"NULL"===t)}function i(){return null}function o(t){return null===t}var s=n(0);t.exports=new s("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n,r,i,o,u=[],c=t;for(e=0,n=c.length;e<n;e+=1){if(r=c[e],o=!1,"[object Object]"!==a.call(r))return!1;for(i in r)if(s.call(r,i)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==u.indexOf(i))return!1;u.push(i)}return!0}function i(t){return null!==t?t:[]}var o=n(0),s=Object.prototype.hasOwnProperty,a=Object.prototype.toString;t.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n,r,i,o,a=t;for(o=new Array(a.length),e=0,n=a.length;e<n;e+=1){if(r=a[e],"[object Object]"!==s.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;o[e]=[i[0],r[i[0]]]}return!0}function i(t){if(null===t)return[];var e,n,r,i,o,s=t;for(o=new Array(s.length),e=0,n=s.length;e<n;e+=1)r=s[e],i=Object.keys(r),o[e]=[i[0],r[i[0]]];return o}var o=n(0),s=Object.prototype.toString;t.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(t){return null!==t?t:[]}})},function(t,e,n){"use strict";function r(t){if(null===t)return!0;var e,n=t;for(e in n)if(s.call(n,e)&&null!==n[e])return!1;return!0}function i(t){return null!==t?t:{}}var o=n(0),s=Object.prototype.hasOwnProperty;t.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},function(t,e,n){"use strict";var r=n(0);t.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(t){return null!==t?t:""}})},function(t,e,n){"use strict";function r(t){return null!==t&&(null!==a.exec(t)||null!==u.exec(t))}function i(t){var e,n,r,i,o,s,c,h,l,p,f=0,d=null;if(e=a.exec(t),null===e&&(e=u.exec(t)),null===e)throw new Error("Date resolve error");if(n=+e[1],r=+e[2]-1,i=+e[3],!e[4])return new Date(Date.UTC(n,r,i));if(o=+e[4],s=+e[5],c=+e[6],e[7]){for(f=e[7].slice(0,3);f.length<3;)f+="0";f=+f}return e[9]&&(h=+e[10],l=+(e[11]||0),d=6e4*(60*h+l),"-"===e[9]&&(d=-d)),p=new Date(Date.UTC(n,r,i,o,s,c,f)),d&&p.setTime(p.getTime()-d),p}function o(t){return t.toISOString()}var s=n(0),a=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),u=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");t.exports=new s("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:o})},function(t,e,n){"use strict";function r(t,e,n,r,i){}t.exports=r},function(t,e,n){"use strict";var r=n(259);t.exports=function(t){return r(t,!1)}},function(t,e,n){"use strict";var r=n(45),i=n(15),o=n(113);t.exports=function(){function t(t,e,n,r,s,a){a!==o&&i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types")}function e(){return t}t.isRequired=t;var n={array:t,bool:t,func:t,number:t,object:t,string:t,symbol:t,any:t,arrayOf:e,element:t,instanceOf:e,node:t,objectOf:e,oneOf:e,oneOfType:e,shape:e,exact:e};return n.checkPropTypes=r,n.PropTypes=n,n}},function(t,e,n){"use strict";var r=n(45),i=n(15),o=n(46),s=n(35),a=n(113),u=n(256);t.exports=function(t,e){function n(t){var e=t&&(_&&t[_]||t[b]);if("function"==typeof e)return e}function c(t,e){return t===e?0!==t||1/t==1/e:t!==t&&e!==e}function h(t){this.message=t,this.stack=""}function l(t){function n(n,r,o,s,u,c,l){if(s=s||F,c=c||o,l!==a)if(e)i(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[o]?n?new h(null===r[o]?"The "+u+" `"+c+"` is marked as required in `"+s+"`, but its value is `null`.":"The "+u+" `"+c+"` is marked as required in `"+s+"`, but its value is `undefined`."):null:t(r,o,s,u,c)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function p(t){function e(e,n,r,i,o,s){var a=e[n];if(A(a)!==t)return new h("Invalid "+i+" `"+o+"` of type `"+S(a)+"` supplied to `"+r+"`, expected `"+t+"`.");return null}return l(e)}function f(t){function e(e,n,r,i,o){if("function"!=typeof t)return new h("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var s=e[n];if(!Array.isArray(s)){return new h("Invalid "+i+" `"+o+"` of type `"+A(s)+"` supplied to `"+r+"`, expected an array.")}for(var u=0;u<s.length;u++){var c=t(s,u,r,i,o+"["+u+"]",a);if(c instanceof Error)return c}return null}return l(e)}function d(t){function e(e,n,r,i,o){if(!(e[n]instanceof t)){var s=t.name||F;return new h("Invalid "+i+" `"+o+"` of type `"+C(e[n])+"` supplied to `"+r+"`, expected instance of `"+s+"`.")}return null}return l(e)}function m(t){function e(e,n,r,i,o){for(var s=e[n],a=0;a<t.length;a++)if(c(s,t[a]))return null;return new h("Invalid "+i+" `"+o+"` of value `"+s+"` supplied to `"+r+"`, expected one of "+JSON.stringify(t)+".")}return Array.isArray(t)?l(e):r.thatReturnsNull}function y(t){function e(e,n,r,i,o){if("function"!=typeof t)return new h("Property `"+o+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var s=e[n],u=A(s);if("object"!==u)return new h("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected an object.");for(var c in s)if(s.hasOwnProperty(c)){var l=t(s,c,r,i,o+"."+c,a);if(l instanceof Error)return l}return null}return l(e)}function v(t){function e(e,n,r,i,o){for(var s=0;s<t.length;s++){if(null==(0,t[s])(e,n,r,i,o,a))return null}return new h("Invalid "+i+" `"+o+"` supplied to `"+r+"`.")}if(!Array.isArray(t))return r.thatReturnsNull;for(var n=0;n<t.length;n++){var i=t[n];if("function"!=typeof i)return o(!1,"Invalid argument supplied to oneOfType. Expected an array of check functions, but received %s at index %s.",w(i),n),r.thatReturnsNull}return l(e)}function x(t){function e(e,n,r,i,o){var s=e[n],u=A(s);if("object"!==u)return new h("Invalid "+i+" `"+o+"` of type `"+u+"` supplied to `"+r+"`, expected `object`.");for(var c in t){var l=t[c];if(l){var p=l(s,c,r,i,o+"."+c,a);if(p)return p}}return null}return l(e)}function g(t){function e(e,n,r,i,o){var u=e[n],c=A(u);if("object"!==c)return new h("Invalid "+i+" `"+o+"` of type `"+c+"` supplied to `"+r+"`, expected `object`.");var l=s({},e[n],t);for(var p in l){var f=t[p];if(!f)return new h("Invalid "+i+" `"+o+"` key `"+p+"` supplied to `"+r+"`.\nBad object: "+JSON.stringify(e[n],null,"  ")+"\nValid keys: "+JSON.stringify(Object.keys(t),null,"  "));var d=f(u,p,r,i,o+"."+p,a);if(d)return d}return null}return l(e)}function D(e){switch(typeof e){case"number":case"string":case"undefined":return!0;case"boolean":return!e;case"object":if(Array.isArray(e))return e.every(D);if(null===e||t(e))return!0;var r=n(e);if(!r)return!1;var i,o=r.call(e);if(r!==e.entries){for(;!(i=o.next()).done;)if(!D(i.value))return!1}else for(;!(i=o.next()).done;){var s=i.value;if(s&&!D(s[1]))return!1}return!0;default:return!1}}function E(t,e){return"symbol"===t||("Symbol"===e["@@toStringTag"]||"function"==typeof Symbol&&e instanceof Symbol)}function A(t){var e=typeof t;return Array.isArray(t)?"array":t instanceof RegExp?"object":E(e,t)?"symbol":e}function S(t){if(void 0===t||null===t)return""+t;var e=A(t);if("object"===e){if(t instanceof Date)return"date";if(t instanceof RegExp)return"regexp"}return e}function w(t){var e=S(t);switch(e){case"array":case"object":return"an "+e;case"boolean":case"date":case"regexp":return"a "+e;default:return e}}function C(t){return t.constructor&&t.constructor.name?t.constructor.name:F}var _="function"==typeof Symbol&&Symbol.iterator,b="@@iterator",F="<<anonymous>>",k={array:p("array"),bool:p("boolean"),func:p("function"),number:p("number"),object:p("object"),string:p("string"),symbol:p("symbol"),any:function(){return l(r.thatReturnsNull)}(),arrayOf:f,element:function(){function e(e,n,r,i,o){var s=e[n];if(!t(s)){return new h("Invalid "+i+" `"+o+"` of type `"+A(s)+"` supplied to `"+r+"`, expected a single ReactElement.")}return null}return l(e)}(),instanceOf:d,node:function(){function t(t,e,n,r,i){return D(t[e])?null:new h("Invalid "+r+" `"+i+"` supplied to `"+n+"`, expected a ReactNode.")}return l(t)}(),objectOf:y,oneOf:m,oneOfType:v,shape:x,exact:g};return h.prototype=Error.prototype,k.checkPropTypes=u,k.PropTypes=k,k}},function(t,e){t.exports='---\nurl: "http://petstore.swagger.io/v2/swagger.json"\ndom_id: "#swagger-ui"\nvalidatorUrl: "https://online.swagger.io/validator"\noauth2RedirectUrl: "http://localhost:3200/oauth2-redirect.html"\n'},function(t,e,n){"use strict";function r(t){var e={"=":"=0",":":"=2"};return"$"+(""+t).replace(/[=:]/g,function(t){return e[t]})}function i(t){var e=/(=0|=2)/g,n={"=0":"=","=2":":"};return(""+("."===t[0]&&"$"===t[1]?t.substring(2):t.substring(1))).replace(e,function(t){return n[t]})}var o={escape:r,unescape:i};t.exports=o},function(t,e,n){"use strict";var r=n(48),i=(n(15),function(t){var e=this;if(e.instancePool.length){var n=e.instancePool.pop();return e.call(n,t),n}return new e(t)}),o=function(t,e){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,t,e),r}return new n(t,e)},s=function(t,e,n){var r=this;if(r.instancePool.length){var i=r.instancePool.pop();return r.call(i,t,e,n),i}return new r(t,e,n)},a=function(t,e,n,r){var i=this;if(i.instancePool.length){var o=i.instancePool.pop();return i.call(o,t,e,n,r),o}return new i(t,e,n,r)},u=function(t){var e=this;t instanceof e||r("25"),t.destructor(),e.instancePool.length<e.poolSize&&e.instancePool.push(t)},c=i,h=function(t,e){var n=t;return n.instancePool=[],n.getPooled=e||c,n.poolSize||(n.poolSize=10),n.release=u,n},l={addPoolingTo:h,oneArgumentPooler:i,twoArgumentPooler:o,threeArgumentPooler:s,fourArgumentPooler:a};t.exports=l},function(t,e,n){"use strict";var r=n(35),i=n(114),o=n(264),s=n(265),a=n(25),u=n(266),c=n(267),h=n(268),l=n(271),p=a.createElement,f=a.createFactory,d=a.cloneElement,m=r,y=function(t){return t},v={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:l},Component:i.Component,PureComponent:i.PureComponent,createElement:p,cloneElement:d,isValidElement:a.isValidElement,PropTypes:u,createClass:h,createFactory:f,createMixin:y,DOM:s,version:c,__spread:m};t.exports=v},function(t,e,n){"use strict";function r(t){return(""+t).replace(D,"$&/")}function i(t,e){this.func=t,this.context=e,this.count=0}function o(t,e,n){var r=t.func,i=t.context;r.call(i,e,t.count++)}function s(t,e,n){if(null==t)return t;var r=i.getPooled(e,n);v(t,o,r),i.release(r)}function a(t,e,n,r){this.result=t,this.keyPrefix=e,this.func=n,this.context=r,this.count=0}function u(t,e,n){var i=t.result,o=t.keyPrefix,s=t.func,a=t.context,u=s.call(a,e,t.count++);Array.isArray(u)?c(u,i,n,y.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,o+(!u.key||e&&e.key===u.key?"":r(u.key)+"/")+n)),i.push(u))}function c(t,e,n,i,o){var s="";null!=n&&(s=r(n)+"/");var c=a.getPooled(e,s,i,o);v(t,u,c),a.release(c)}function h(t,e,n){if(null==t)return t;var r=[];return c(t,r,null,e,n),r}function l(t,e,n){return null}function p(t,e){return v(t,l,null)}function f(t){var e=[];return c(t,e,null,y.thatReturnsArgument),e}var d=n(262),m=n(25),y=n(45),v=n(272),x=d.twoArgumentPooler,g=d.fourArgumentPooler,D=/\/+/g;i.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},d.addPoolingTo(i,x),a.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},d.addPoolingTo(a,g);var E={forEach:s,map:h,mapIntoWithKeyPrefixInternal:c,count:p,toArray:f};t.exports=E},function(t,e,n){"use strict";var r=n(25),i=r.createFactory,o={a:i("a"),abbr:i("abbr"),address:i("address"),area:i("area"),article:i("article"),aside:i("aside"),audio:i("audio"),b:i("b"),base:i("base"),bdi:i("bdi"),bdo:i("bdo"),big:i("big"),blockquote:i("blockquote"),body:i("body"),br:i("br"),button:i("button"),canvas:i("canvas"),caption:i("caption"),cite:i("cite"),code:i("code"),col:i("col"),colgroup:i("colgroup"),data:i("data"),datalist:i("datalist"),dd:i("dd"),del:i("del"),details:i("details"),dfn:i("dfn"),dialog:i("dialog"),div:i("div"),dl:i("dl"),dt:i("dt"),em:i("em"),embed:i("embed"),fieldset:i("fieldset"),figcaption:i("figcaption"),figure:i("figure"),footer:i("footer"),form:i("form"),h1:i("h1"),h2:i("h2"),h3:i("h3"),h4:i("h4"),h5:i("h5"),h6:i("h6"),head:i("head"),header:i("header"),hgroup:i("hgroup"),hr:i("hr"),html:i("html"),i:i("i"),iframe:i("iframe"),img:i("img"),input:i("input"),ins:i("ins"),kbd:i("kbd"),keygen:i("keygen"),label:i("label"),legend:i("legend"),li:i("li"),link:i("link"),main:i("main"),map:i("map"),mark:i("mark"),menu:i("menu"),menuitem:i("menuitem"),meta:i("meta"),meter:i("meter"),nav:i("nav"),noscript:i("noscript"),object:i("object"),ol:i("ol"),optgroup:i("optgroup"),option:i("option"),output:i("output"),p:i("p"),param:i("param"),picture:i("picture"),pre:i("pre"),progress:i("progress"),q:i("q"),rp:i("rp"),rt:i("rt"),ruby:i("ruby"),s:i("s"),samp:i("samp"),script:i("script"),section:i("section"),select:i("select"),small:i("small"),source:i("source"),span:i("span"),strong:i("strong"),style:i("style"),sub:i("sub"),summary:i("summary"),sup:i("sup"),table:i("table"),tbody:i("tbody"),td:i("td"),textarea:i("textarea"),tfoot:i("tfoot"),th:i("th"),thead:i("thead"),time:i("time"),title:i("title"),tr:i("tr"),track:i("track"),u:i("u"),ul:i("ul"),var:i("var"),video:i("video"),wbr:i("wbr"),circle:i("circle"),clipPath:i("clipPath"),defs:i("defs"),ellipse:i("ellipse"),g:i("g"),image:i("image"),line:i("line"),linearGradient:i("linearGradient"),mask:i("mask"),path:i("path"),pattern:i("pattern"),polygon:i("polygon"),polyline:i("polyline"),radialGradient:i("radialGradient"),rect:i("rect"),stop:i("stop"),svg:i("svg"),text:i("text"),tspan:i("tspan")};t.exports=o},function(t,e,n){"use strict";var r=n(25),i=r.isValidElement,o=n(257);t.exports=o(i)},function(t,e,n){"use strict";t.exports="15.6.2"},function(t,e,n){"use strict";var r=n(114),i=r.Component,o=n(25),s=o.isValidElement,a=n(117),u=n(230);t.exports=u(i,s,a)},function(t,e,n){"use strict";function r(t){var e=t&&(i&&t[i]||t[o]);if("function"==typeof e)return e}var i="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";t.exports=r},function(t,e,n){"use strict";var r=function(){};t.exports=r},function(t,e,n){"use strict";function r(t){return o.isValidElement(t)||i("143"),t}var i=n(48),o=n(25);n(15);t.exports=r},function(t,e,n){"use strict";function r(t,e){return t&&"object"==typeof t&&null!=t.key?c.escape(t.key):e.toString(36)}function i(t,e,n,o){var p=typeof t;if("undefined"!==p&&"boolean"!==p||(t=null),null===t||"string"===p||"number"===p||"object"===p&&t.$$typeof===a)return n(o,t,""===e?h+r(t,0):e),1;var f,d,m=0,y=""===e?h:e+l;if(Array.isArray(t))for(var v=0;v<t.length;v++)f=t[v],d=y+r(f,v),m+=i(f,d,n,o);else{var x=u(t);if(x){var g,D=x.call(t);if(x!==t.entries)for(var E=0;!(g=D.next()).done;)f=g.value,d=y+r(f,E++),m+=i(f,d,n,o);else for(;!(g=D.next()).done;){var A=g.value;A&&(f=A[1],d=y+c.escape(A[0])+l+r(f,0),m+=i(f,d,n,o))}}else if("object"===p){var S="",w=String(t);s("31","[object Object]"===w?"object with keys {"+Object.keys(t).join(", ")+"}":w,S)}}return m}function o(t,e,n){return null==t?0:i(t,"",e,n)}var s=n(48),a=(n(115),n(116)),u=n(269),c=(n(15),n(261)),h=(n(46),"."),l=":";t.exports=o},function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAAYFBMVEUAAABUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwB0lzB/n0BfhxBpjyC0x4////+qv4CJp1D09++ft3C/z5/K16/U379UfwDf58/q79+Ur2D2RCk9AAAAHXRSTlMAEEAwn9//z3Agv4/vYID/////////////////UMeji1kAAAD8SURBVHgBlZMFAoQwDATRxbXB7f+vPKnlXAZn6k2cf3A9z/PfOC8IIYni5FmmABM8FMhwT17c9hnhiZL1CwvEL1tmPD0qSKq6gaStW/kMXanVmAVRDUlH1OvuuTINo6k90Sxf8qsOtF6g4ff1osP3OnMcV7d4pzdIUtu1oA4V0DZoKmxmlEYvtDUjjS3tmKmqB+pYy8pD1VPf7jPE0I40HHcaBwnue6fGzgyS5tXIU96PV7rkDWHNLV0DK4FkoKmFpN5oUnvi8KoeA2/JXsmXQuokx0siR1G8tLkN6eB9sLwJp/yymcyaP/TrP+RPmbMMixcJVgTR1aUZ93oGXsgXQAaG6EwAAAAASUVORK5CYII="},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){n(120),t.exports=n(121)}])});
+//# sourceMappingURL=swagger-ui-standalone-preset.js.map
diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js
deleted file mode 100644
index ab72fa0ef2dea..0000000000000
--- a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js
+++ /dev/null
@@ -1,25344 +0,0 @@
-/**
- * swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
- * @version v2.2.10
- * @link http://swagger.io
- * @license Apache-2.0
- */
-(function(){/* jshint ignore:start */ 
- {(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['apikey_auth'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "                <span class=\"key_auth__value\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.value : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</span>\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    return "                <input placeholder=\"api_key\" class=\"auth_input input_apiKey_entry\" name=\"apiKey\" type=\"text\"/>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<div class=\"key_input_container\">\n    <h3 class=\"auth__title\">Api key authorization</h3>\n    <div class=\"auth__description\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>\n    <div>\n        <div class=\"key_auth__field\">\n            <span class=\"key_auth__label\">name:</span>\n            <span class=\"key_auth__value\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</span>\n        </div>\n        <div class=\"key_auth__field\">\n            <span class=\"key_auth__label\">in:</span>\n            <span class=\"key_auth__value\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0["in"] : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</span>\n        </div>\n        <div class=\"key_auth__field\">\n            <span class=\"key_auth__label\">value:</span>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
-    + "        </div>\n    </div>\n</div>\n";
-},"useData":true});
-templates['auth_button'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    return "<a class='authorize__btn' href=\"#\">Authorize</a>\n";
-},"useData":true});
-templates['auth_button_operation'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return "        authorize__btn_operation_login\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    return "        authorize__btn_operation_logout\n";
-},"5":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "        <ul class=\"authorize-scopes\">\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.scopes : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "        </ul>\n";
-},"6":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "                <li class=\"authorize__scope\" title=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</li>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "<div class=\"authorize__btn authorize__btn_operation\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
-    + "\">\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.scopes : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</div>\n";
-},"useData":true});
-templates['auth_view'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return "            <button type=\"button\" class=\"auth__button auth_submit__button\" data-sw-translate>Authorize</button>\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    return "            <button type=\"button\" class=\"auth__button auth_logout__button\" data-sw-translate>Logout</button>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "<div class=\"auth_container\">\n\n    <div class=\"auth_inner\"></div>\n    <div class=\"auth_submit\">\n"
-    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isAuthorized : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n</div>\n";
-},"useData":true});
-templates['basic_auth'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return " - authorized";
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "                <span class=\"basic_auth__value\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.username : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</span>\n";
-},"5":function(container,depth0,helpers,partials,data) {
-    return "                <input required placeholder=\"username\" class=\"basic_auth__username auth_input\" name=\"username\" type=\"text\"/>\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    return "            <div class=\"auth_label\">\n                <span class=\"basic_auth__label\" data-sw-translate>password:</span>\n                <input required placeholder=\"password\" class=\"basic_auth__password auth_input\" name=\"password\" type=\"password\"/></label>\n            </div>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "<div class='basic_auth_container'>\n    <h3 class=\"auth__title\">Basic authentication"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</h3>\n    <form class=\"basic_input_container\">\n        <div class=\"auth__description\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>\n        <div class=\"auth_label\">\n            <span class=\"basic_auth__label\" data-sw-translate>username:</span>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.program(5, data, 0),"data":data})) != null ? stack1 : "")
-    + "        </div>\n"
-    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </form>\n</div>\n";
-},"useData":true});
-templates['content_type'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "	<option value=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</option>\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    return "  <option value=\"application/json\">application/json</option>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<label data-sw-translate for=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">Response Content Type</label>\n<select name=\"contentType\" id=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.produces : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
-    + "</select>\n";
-},"useData":true});
-templates['main'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "  <div class=\"info_title\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>\n  <div class=\"info_description markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.description : stack1),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.externalDocs : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "  "
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n  "
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n  "
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n  "
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n  "
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1),{"name":"if","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n";
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "  <p>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.description : stack1),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</p>\n  <a href=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" target=\"_blank\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</a>\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "<div class=\"info_tos\"><a target=\"_blank\" href=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" data-sw-translate>Terms of service</a></div>";
-},"6":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "<div><div class='info_name' style=\"display: inline\" data-sw-translate>Created by </div> "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>";
-},"8":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<div class='info_url' data-sw-translate>See more at <a href=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</a></div>";
-},"10":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<div class='info_email'><a target=\"_parent\" href=\"mailto:"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "?subject="
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" data-sw-translate>Contact the developer</a></div>";
-},"12":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<div class='info_license'><a target=\"_blank\" href='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.name : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</a></div>";
-},"14":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "  , <span style=\"font-variant: small-caps\" data-sw-translate>api version</span>: "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n    ";
-},"16":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "    <span style=\"float:right\"><a target=\"_blank\" href=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "/debug?url="
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\"><img id=\"validator\" src=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "?url="
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\"></a>\n    </span>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "<div class='info' id='api_info'>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.info : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</div>\n<div class='container' id='resources_container'>\n  <div class='authorize-wrapper'></div>\n\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.basePath : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{"name":"if","hash":{},"fn":container.program(14, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "]\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{"name":"if","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </h4>\n    </div>\n</div>\n";
-},"useData":true});
-templates['oauth2'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "<p>Authorization URL: "
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.authorizationUrl : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</p>";
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "<p>Token URL: "
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tokenUrl : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</p>";
-},"5":function(container,depth0,helpers,partials,data) {
-    return "        <p>Please input username and password for password flow authorization</p>\n        <fieldset>\n            <div><label>Username: <input class=\"oauth-username\" type=\"text\" name=\"username\"></label></div>\n            <div><label>Password: <input class=\"oauth-password\" type=\"password\" name=\"password\"></label></div>\n        </fieldset>\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "        <p>Setup client authentication."
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.requireClientAuthenticaiton : depth0),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</p>\n        <fieldset>\n            <div><label>Type:\n                <select class=\"oauth-client-authentication-type\" name=\"client-authentication-type\">\n                    <option value=\"none\" selected>None or other</option>\n                    <option value=\"basic\">Basic auth</option>\n                    <option value=\"request-body\">Request body</option>\n                </select>\n            </label></div>\n            <div class=\"oauth-client-authentication\" hidden>\n                <div><label>ClientId: <input class=\"oauth-client-id\" type=\"text\" name=\"client-id\"></label></div>\n                <div><label>Secret: <input class=\"oauth-client-secret\" type=\"text\" name=\"client-secret\"></label></div>\n            </div>\n        </fieldset>\n";
-},"8":function(container,depth0,helpers,partials,data) {
-    return "(Required)";
-},"10":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "            <li>\n                <input class=\"oauth-scope\" type=\"checkbox\" data-scope=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" oauthtype=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\"/>\n                <label>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</label><br/>\n                <span class=\"api-scope-desc\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "                </span>\n            </li>\n";
-},"11":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "                        ("
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.OAuthSchemeKey : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + ")\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<div>\n    <h3 class=\"auth__title\">OAuth2.0</h3>\n    <p>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</p>\n    "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.authorizationUrl : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n    "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tokenUrl : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n    <p>flow: "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.flow : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</p>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isPasswordFlow : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.clientAuthentication : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    <p><strong> "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.appName : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + " </strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>\n    <p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.\n        <a href=\"#\">Learn how to use</a>\n    </p>\n    <ul class=\"api-popup-scopes\">\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.scopes : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </ul>\n</div>";
-},"useData":true});
-templates['operation'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return "deprecated";
-},"3":function(container,depth0,helpers,partials,data) {
-    return "            <h4><span data-sw-translate>Warning: Deprecated</span></h4>\n";
-},"5":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "        <h4><span data-sw-translate>Implementation Notes</span></h4>\n        <div class=\"markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    return "            <div class='authorize-wrapper authorize-wrapper_operation'></div>\n";
-},"9":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "          <div class=\"response-class\">\n            <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.successCode : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + ")</h4>\n              "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.successDescription : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n            <p><span class=\"model-signature\" /></p>\n            <br/>\n            <div class=\"response-content-type\" />\n            </div>\n";
-},"10":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "<div class=\"markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.successDescription : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</div>";
-},"12":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "          <h4 data-sw-translate>Headers</h4>\n          <table class=\"headers\">\n            <thead>\n              <tr>\n                <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Header</th>\n                <th style=\"width: 310px; max-width: 310px\" data-sw-translate>Description</th>\n                <th style=\"width: 200px; max-width: 200px\" data-sw-translate>Type</th>\n                <th style=\"width: 320px; max-width: 320px\" data-sw-translate>Other</th>\n              </tr>\n            </thead>\n            <tbody>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.headers : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "            </tbody>\n          </table>\n";
-},"13":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "              <tr>\n                <td>"
-    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"key","hash":{},"data":data}) : helper)))
-    + "</td>\n                <td>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n                <td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n                <td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.other : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n              </tr>\n";
-},"15":function(container,depth0,helpers,partials,data) {
-    return "          <h4 data-sw-translate>Parameters</h4>\n          <table class='fullwidth parameters'>\n          <thead>\n            <tr>\n            <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Parameter</th>\n            <th style=\"width: 310px; max-width: 310px\" data-sw-translate>Value</th>\n            <th style=\"width: 200px; max-width: 200px\" data-sw-translate>Description</th>\n            <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Parameter Type</th>\n            <th style=\"width: 220px; max-width: 230px\" data-sw-translate>Data Type</th>\n            </tr>\n          </thead>\n          <tbody class=\"operation-params\">\n\n          </tbody>\n          </table>\n";
-},"17":function(container,depth0,helpers,partials,data) {
-    return "          <div style='margin:0;padding:0;display:inline'></div>\n          <h4 data-sw-translate>Response Messages</h4>\n          <table class='fullwidth response-messages'>\n            <thead>\n            <tr>\n              <th data-sw-translate>HTTP Status Code</th>\n              <th data-sw-translate>Reason</th>\n              <th data-sw-translate>Response Model</th>\n              <th data-sw-translate>Headers</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            </tbody>\n          </table>\n";
-},"19":function(container,depth0,helpers,partials,data) {
-    return "";
-},"21":function(container,depth0,helpers,partials,data) {
-    return "          <div class='sandbox_header'>\n            <input class='submit' type='submit' value='Try it out!' data-sw-translate/>\n            <a href='#' class='response_hider' style='display:none' data-sw-translate>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n";
-},"23":function(container,depth0,helpers,partials,data) {
-    return "          <h4 data-sw-translate>Request Headers</h4>\n          <div class='block request_headers'></div>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3=container.escapeExpression;
-
-  return "  <ul class='operations' >\n    <li class='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + " operation' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.parentId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "_"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "/"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "' class=\"toggleOperation\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</a>\n          </span>\n          <span class='path'>\n          <a href='#!/"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "/"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "' class=\"toggleOperation "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.path : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "/"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "' class=\"toggleOperation\"><span class=\"markdown\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</span></a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "_"
-    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "_content' style='display:none'>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.security : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.type : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.headers : depth0),{"name":"if","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.parameters : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.responseMessages : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isReadOnly : depth0),{"name":"if","hash":{},"fn":container.program(19, data, 0),"inverse":container.program(21, data, 0),"data":data})) != null ? stack1 : "")
-    + "        </form>\n        <div class='response' style='display:none'>\n          <h4 class='curl'>Curl</h4>\n          <div class='block curl'></div>\n          <h4 data-sw-translate>Request URL</h4>\n          <div class='block request_url'></div>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.showRequestHeaders : depth0),{"name":"if","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "          <h4 data-sw-translate>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4 data-sw-translate>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4 data-sw-translate>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";
-},"useData":true});
-templates['param'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "			<input type=\"file\" name='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'/>\n			<div class=\"parameter-content-type\" />\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "");
-},"5":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "				<div class=\"editor_holder\"></div>\n				<textarea class='body-textarea' name='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "				<textarea class='body-textarea' name='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'></textarea>\n				<div class=\"editor_holder\"></div>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
-},"9":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(10, data, 0),"data":data})) != null ? stack1 : "");
-},"10":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{"name":"renderTextParam","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"11":function(container,depth0,helpers,partials,data) {
-    return "";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<td class='code'><label for='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</label></td>\n<td>\n\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "")
-    + "\n</td>\n<td class=\"markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td>\n	<span class=\"model-signature\"></span>\n</td>\n";
-},"useData":true});
-templates['param_list'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return " required";
-},"3":function(container,depth0,helpers,partials,data) {
-    return " multiple=\"multiple\"";
-},"5":function(container,depth0,helpers,partials,data) {
-    return " required ";
-},"7":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "      <option "
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.hasDefault : depth0),{"name":"unless","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + " value=''></option>\n";
-},"8":function(container,depth0,helpers,partials,data) {
-    return "  selected=\"\" ";
-},"10":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "\n      <option "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "  value='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "'> "
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + " "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + " </option>\n\n";
-},"11":function(container,depth0,helpers,partials,data) {
-    return " selected=\"\"  ";
-},"13":function(container,depth0,helpers,partials,data) {
-    return " (default) ";
-},"15":function(container,depth0,helpers,partials,data) {
-    return "<strong>";
-},"17":function(container,depth0,helpers,partials,data) {
-    return "</strong>";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<td class='code"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "'><label for='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</label></td>\n<td>\n  <select "
-    + ((stack1 = (helpers.isArray || (depth0 && depth0.isArray) || alias2).call(alias1,depth0,{"name":"isArray","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + " class=\"parameter "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\" name=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" id=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">\n\n"
-    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = helpers.each.call(alias1,((stack1 = (depth0 != null ? depth0.allowableValues : depth0)) != null ? stack1.descriptiveValues : stack1),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n  </select>\n</td>\n<td class=\"markdown\">"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"description","hash":{},"data":data}) : helper))) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</td>\n<td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-templates['param_readonly'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "        <textarea class='body-textarea' readonly='readonly' name='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</textarea>\n        <div class=\"parameter-content-type\" />\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(6, data, 0),"data":data})) != null ? stack1 : "");
-},"4":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "            "
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n";
-},"6":function(container,depth0,helpers,partials,data) {
-    return "            (empty)\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<td class='code'><label for='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</label></td>\n<td>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
-    + "</td>\n<td class=\"markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-templates['param_readonly_required'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</textarea>\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(6, data, 0),"data":data})) != null ? stack1 : "");
-},"4":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "            "
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n";
-},"6":function(container,depth0,helpers,partials,data) {
-    return "            (empty)\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<td class='code required'><label for='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</label></td>\n<td>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
-    + "</td>\n<td class=\"markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-templates['param_required'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "			<input type=\"file\" name='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'/>\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "");
-},"5":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "				<div class=\"editor_holder\"></div>\n				<textarea class='body-textarea required' placeholder='(required)' name='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id=\""
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "				<textarea class='body-textarea required' placeholder='(required)' name='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'></textarea>\n				<div class=\"editor_holder\"></div>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
-},"9":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
-},"10":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "			<input class='parameter required' type='file' name='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'/>\n";
-},"12":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{"name":"renderTextParam","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"13":function(container,depth0,helpers,partials,data) {
-    return "";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<td class='code required'><label for='"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "'>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</label></td>\n<td>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "")
-    + "</td>\n<td>\n	<strong><span class=\"markdown\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</span></strong>\n</td>\n<td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-templates['parameter_content_type'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.consumes : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "  <option value=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</option>\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    return "  <option value=\"application/json\">application/json</option>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<label for=\""
-    + container.escapeExpression(((helper = (helper = helpers.parameterContentTypeId || (depth0 != null ? depth0.parameterContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"parameterContentTypeId","hash":{},"data":data}) : helper)))
-    + "\" data-sw-translate>Parameter content type:</label>\n<select name=\"parameterContentType\" id=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.parameterContentTypeId : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.consumes : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
-    + "</select>\n";
-},"useData":true});
-templates['popup'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var helper;
-
-  return "<div class=\"api-popup-dialog-wrapper\">\n    <div class=\"api-popup-title\">"
-    + container.escapeExpression(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"title","hash":{},"data":data}) : helper)))
-    + "</div>\n    <div class=\"api-popup-content\"></div>\n    <p class=\"error-msg\"></p>\n    <div class=\"api-popup-actions\">\n        <button class=\"api-popup-cancel api-button gray\" type=\"button\">Cancel</button>\n    </div>\n</div>\n<div class=\"api-popup-dialog-shadow\"></div>";
-},"useData":true});
-templates['resource'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return " : ";
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "    <li>\n      <a href='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.url : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' data-sw-translate>Raw</a>\n    </li>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, buffer = 
-  "<div class='heading'>\n  <h2>\n    <a href='#!/"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' class=\"toggleEndpointList\" data-id=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</a> ";
-  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : alias2),(options={"name":"summary","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(alias1,options) : helper));
-  if (!helpers.summary) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' id='endpointListTogger_"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "' class=\"toggleEndpointList\" data-id=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" data-sw-translate>Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" data-sw-translate>\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\" data-sw-translate>\n        Expand Operations\n      </a>\n    </li>\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.url : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "  </ul>\n</div>\n<ul class='endpoints' id='"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "_endpoint_list' style='display:none'>\n\n</ul>\n";
-},"useData":true});
-templates['response_content_type'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "  <option value=\""
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "\">"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</option>\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    return "  <option value=\"application/json\">application/json</option>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
-
-  return "<label data-sw-translate for=\""
-    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"responseContentTypeId","hash":{},"data":data}) : helper)))
-    + "\">Response Content Type</label>\n<select name=\"responseContentType\" id=\""
-    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"responseContentTypeId","hash":{},"data":data}) : helper)))
-    + "\">\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.produces : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
-    + "</select>\n";
-},"useData":true});
-templates['signature'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "\n<div>\n<ul class=\"signature-nav\">\n  <li><a class=\"description-link\" href=\"#\" data-sw-translate>Model</a></li>\n  <li><a class=\"snippet-link\" href=\"#\" data-sw-translate>Example Value</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n  <div class=\"description\">\n      "
-    + container.escapeExpression((helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.signature : depth0),{"name":"sanitize","hash":{},"data":data}))
-    + "\n  </div>\n\n  <div class=\"snippet\">\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "  </div>\n</div>\n";
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "      <div class=\"snippet_json\">\n        <pre><code>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</code></pre>\n        "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n      </div>\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    return "<small class=\"notice\" data-sw-translate></small>";
-},"5":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return "    <div class=\"snippet_xml\">\n      <pre><code>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</code></pre>\n      "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n    </div>\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "    "
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.signature : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = (helpers.ifCond || (depth0 && depth0.ifCond) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.sampleJSON : depth0),"||",(depth0 != null ? depth0.sampleXML : depth0),{"name":"ifCond","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "");
-},"useData":true});
-templates['status_code'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "      <tr>\n        <td>"
-    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"key","hash":{},"data":data}) : helper)))
-    + "</td>\n        <td>"
-    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n        <td>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n      </tr>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
-
-  return "<td width='15%' class='code'>"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.code : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td class=\"markdown\">"
-    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.message : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
-    + "</td>\n<td width='50%'><span class=\"model-signature\" /></td>\n<td class=\"headers\">\n  <table>\n    <tbody>\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.headers : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </tbody>\n  </table>\n</td>";
-},"useData":true});
-})();} 
- /* jshint ignore:end */
-'use strict';
-
-
-$(function() {
-
-	// Helper function for vertically aligning DOM elements
-	// http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
-	$.fn.vAlign = function() {
-		return this.each(function(){
-			var ah = $(this).height();
-			var ph = $(this).parent().height();
-			var mh = (ph - ah) / 2;
-			$(this).css('margin-top', mh);
-		});
-	};
-
-	$.fn.stretchFormtasticInputWidthToParent = function() {
-		return this.each(function(){
-			var p_width = $(this).closest("form").innerWidth();
-			var p_padding = parseInt($(this).closest("form").css('padding-left') ,10) + parseInt($(this).closest('form').css('padding-right'), 10);
-			var this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);
-			$(this).css('width', p_width - p_padding - this_padding);
-		});
-	};
-
-	$('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();
-
-	// Vertically center these paragraphs
-	// Parent may need a min-height for this to work..
-	$('ul.downplayed li div.content p').vAlign();
-
-	// When a sandbox form is submitted..
-	$("form.sandbox").submit(function(){
-
-		var error_free = true;
-
-		// Cycle through the forms required inputs
- 		$(this).find("input.required").each(function() {
-
-			// Remove any existing error styles from the input
-			$(this).removeClass('error');
-
-			// Tack the error style on if the input is empty..
-			if ($(this).val() === '') {
-				$(this).addClass('error');
-				$(this).wiggle();
-				error_free = false;
-			}
-
-		});
-
-		return error_free;
-	});
-
-});
-
-function clippyCopiedCallback() {
-  $('#api_key_copied').fadeIn().delay(1000).fadeOut();
-
-  // var b = $("#clippy_tooltip_" + a);
-  // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"), setTimeout(function() {
-  //   b.attr("title", "copy to clipboard")
-  // },
-  // 500))
-}
-
-// Logging function that accounts for browsers that don't have window.console
-function log(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-    console.log( Array.prototype.slice.call(arguments)[0] );
-  }
-}
-
-// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)
-if (Function.prototype.bind && console && typeof console.log === "object") {
-    [
-      "log","info","warn","error","assert","dir","clear","profile","profileEnd"
-    ].forEach(function (method) {
-        console[method] = this.bind(console[method], console);
-    }, Function.prototype.call);
-}
-
-window.Docs = {
-
-	shebang: function() {
-
-		// If shebang has an operation nickname in it..
-		// e.g. /docs/#!/words/get_search
-		var fragments = $.param.fragment().split('/');
-		fragments.shift(); // get rid of the bang
-
-		switch (fragments.length) {
-			case 1:
-        if (fragments[0].length > 0) { // prevent matching "#/"
-          // Expand all operations for the resource and scroll to it
-          var dom_id = 'resource_' + fragments[0];
-
-          Docs.expandEndpointListForResource(fragments[0]);
-          $("#"+dom_id).slideto({highlight: false});
-        }
-				break;
-			case 2:
-				// Refer to the endpoint DOM element, e.g. #words_get_search
-
-        // Expand Resource
-        Docs.expandEndpointListForResource(fragments[0]);
-        $("#"+dom_id).slideto({highlight: false});
-
-            // Expand operation
-            var li_dom_id = fragments.join('_');
-            var li_content_dom_id = li_dom_id + "_content";
-
-
-            Docs.expandOperation($('#'+li_content_dom_id));
-            $('#'+li_dom_id).slideto({highlight: false});
-            break;
-		}
-	},
-
-	toggleEndpointListForResource: function(resource) {
-		var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
-		if (elem.is(':visible')) {
-			$.bbq.pushState('#/', 2);
-			Docs.collapseEndpointListForResource(resource);
-		} else {
-            $.bbq.pushState('#/' + resource, 2);
-			Docs.expandEndpointListForResource(resource);
-		}
-	},
-
-	// Expand resource
-	expandEndpointListForResource: function(resource) {
-		var resource = Docs.escapeResourceName(resource);
-		if (resource == '') {
-			$('.resource ul.endpoints').slideDown();
-			return;
-		}
-
-		$('li#resource_' + resource).addClass('active');
-
-		var elem = $('li#resource_' + resource + ' ul.endpoints');
-		elem.slideDown();
-	},
-
-	// Collapse resource and mark as explicitly closed
-	collapseEndpointListForResource: function(resource) {
-		var resource = Docs.escapeResourceName(resource);
-		if (resource == '') {
-			$('.resource ul.endpoints').slideUp();
-			return;
-		}
-
-		$('li#resource_' + resource).removeClass('active');
-
-		var elem = $('li#resource_' + resource + ' ul.endpoints');
-		elem.slideUp();
-	},
-
-	expandOperationsForResource: function(resource) {
-		// Make sure the resource container is open..
-		Docs.expandEndpointListForResource(resource);
-
-		if (resource == '') {
-			$('.resource ul.endpoints li.operation div.content').slideDown();
-			return;
-		}
-
-		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
-			Docs.expandOperation($(this));
-		});
-	},
-
-	collapseOperationsForResource: function(resource) {
-		// Make sure the resource container is open..
-		Docs.expandEndpointListForResource(resource);
-
-		if (resource == '') {
-			$('.resource ul.endpoints li.operation div.content').slideUp();
-			return;
-		}
-
-		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
-			Docs.collapseOperation($(this));
-		});
-	},
-
-	escapeResourceName: function(resource) {
-		return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&");
-	},
-
-	expandOperation: function(elem) {
-		elem.slideDown();
-	},
-
-	collapseOperation: function(elem) {
-		elem.slideUp();
-	}
-};
-
-/*!
- * https://github.com/es-shims/es5-shim
- * @license es5-shim Copyright 2009-2015 by contributors, MIT License
- * see https://github.com/es-shims/es5-shim/blob/master/LICENSE
- */
-
-// vim: ts=4 sts=4 sw=4 expandtab
-
-// Add semicolon to prevent IIFE from being passed as argument to concatenated code.
-;
-
-// UMD (Universal Module Definition)
-// see https://github.com/umdjs/umd/blob/master/templates/returnExports.js
-(function (root, factory) {
-    'use strict';
-
-    /* global define, exports, module */
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(factory);
-    } else if (typeof exports === 'object') {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like enviroments that support module.exports,
-        // like Node.
-        module.exports = factory();
-    } else {
-        // Browser globals (root is window)
-        root.returnExports = factory();
-    }
-}(this, function () {
-    /**
-     * Brings an environment as close to ECMAScript 5 compliance
-     * as is possible with the facilities of erstwhile engines.
-     *
-     * Annotated ES5: http://es5.github.com/ (specific links below)
-     * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
-     * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/
-     */
-
-    // Shortcut to an often accessed properties, in order to avoid multiple
-    // dereference that costs universally. This also holds a reference to known-good
-    // functions.
-    var $Array = Array;
-    var ArrayPrototype = $Array.prototype;
-    var $Object = Object;
-    var ObjectPrototype = $Object.prototype;
-    var $Function = Function;
-    var FunctionPrototype = $Function.prototype;
-    var $String = String;
-    var StringPrototype = $String.prototype;
-    var $Number = Number;
-    var NumberPrototype = $Number.prototype;
-    var array_slice = ArrayPrototype.slice;
-    var array_splice = ArrayPrototype.splice;
-    var array_push = ArrayPrototype.push;
-    var array_unshift = ArrayPrototype.unshift;
-    var array_concat = ArrayPrototype.concat;
-    var array_join = ArrayPrototype.join;
-    var call = FunctionPrototype.call;
-    var apply = FunctionPrototype.apply;
-    var max = Math.max;
-    var min = Math.min;
-
-    // Having a toString local variable name breaks in Opera so use to_string.
-    var to_string = ObjectPrototype.toString;
-
-    /* global Symbol */
-    /* eslint-disable one-var-declaration-per-line, no-redeclare, max-statements-per-line */
-    var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-    var isCallable; /* inlined from https://npmjs.com/is-callable */ var fnToStr = Function.prototype.toString, constructorRegex = /^\s*class /, isES6ClassFn = function isES6ClassFn(value) { try { var fnStr = fnToStr.call(value); var singleStripped = fnStr.replace(/\/\/.*\n/g, ''); var multiStripped = singleStripped.replace(/\/\*[.\s\S]*\*\//g, ''); var spaceStripped = multiStripped.replace(/\n/mg, ' ').replace(/ {2}/g, ' '); return constructorRegex.test(spaceStripped); } catch (e) { return false; /* not a function */ } }, tryFunctionObject = function tryFunctionObject(value) { try { if (isES6ClassFn(value)) { return false; } fnToStr.call(value); return true; } catch (e) { return false; } }, fnClass = '[object Function]', genClass = '[object GeneratorFunction]', isCallable = function isCallable(value) { if (!value) { return false; } if (typeof value !== 'function' && typeof value !== 'object') { return false; } if (hasToStringTag) { return tryFunctionObject(value); } if (isES6ClassFn(value)) { return false; } var strClass = to_string.call(value); return strClass === fnClass || strClass === genClass; };
-
-    var isRegex; /* inlined from https://npmjs.com/is-regex */ var regexExec = RegExp.prototype.exec, tryRegexExec = function tryRegexExec(value) { try { regexExec.call(value); return true; } catch (e) { return false; } }, regexClass = '[object RegExp]'; isRegex = function isRegex(value) { if (typeof value !== 'object') { return false; } return hasToStringTag ? tryRegexExec(value) : to_string.call(value) === regexClass; };
-    var isString; /* inlined from https://npmjs.com/is-string */ var strValue = String.prototype.valueOf, tryStringObject = function tryStringObject(value) { try { strValue.call(value); return true; } catch (e) { return false; } }, stringClass = '[object String]'; isString = function isString(value) { if (typeof value === 'string') { return true; } if (typeof value !== 'object') { return false; } return hasToStringTag ? tryStringObject(value) : to_string.call(value) === stringClass; };
-    /* eslint-enable one-var-declaration-per-line, no-redeclare, max-statements-per-line */
-
-    /* inlined from http://npmjs.com/define-properties */
-    var supportsDescriptors = $Object.defineProperty && (function () {
-        try {
-            var obj = {};
-            $Object.defineProperty(obj, 'x', { enumerable: false, value: obj });
-            for (var _ in obj) { // jscs:ignore disallowUnusedVariables
-                return false;
-            }
-            return obj.x === obj;
-        } catch (e) { /* this is ES3 */
-            return false;
-        }
-    }());
-    var defineProperties = (function (has) {
-        // Define configurable, writable, and non-enumerable props
-        // if they don't exist.
-        var defineProperty;
-        if (supportsDescriptors) {
-            defineProperty = function (object, name, method, forceAssign) {
-                if (!forceAssign && (name in object)) {
-                    return;
-                }
-                $Object.defineProperty(object, name, {
-                    configurable: true,
-                    enumerable: false,
-                    writable: true,
-                    value: method
-                });
-            };
-        } else {
-            defineProperty = function (object, name, method, forceAssign) {
-                if (!forceAssign && (name in object)) {
-                    return;
-                }
-                object[name] = method;
-            };
-        }
-        return function defineProperties(object, map, forceAssign) {
-            for (var name in map) {
-                if (has.call(map, name)) {
-                    defineProperty(object, name, map[name], forceAssign);
-                }
-            }
-        };
-    }(ObjectPrototype.hasOwnProperty));
-
-    //
-    // Util
-    // ======
-    //
-
-    /* replaceable with https://npmjs.com/package/es-abstract /helpers/isPrimitive */
-    var isPrimitive = function isPrimitive(input) {
-        var type = typeof input;
-        return input === null || (type !== 'object' && type !== 'function');
-    };
-
-    var isActualNaN = $Number.isNaN || function isActualNaN(x) {
-        return x !== x;
-    };
-
-    var ES = {
-        // ES5 9.4
-        // http://es5.github.com/#x9.4
-        // http://jsperf.com/to-integer
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToInteger */
-        ToInteger: function ToInteger(num) {
-            var n = +num;
-            if (isActualNaN(n)) {
-                n = 0;
-            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
-                n = (n > 0 || -1) * Math.floor(Math.abs(n));
-            }
-            return n;
-        },
-
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToPrimitive */
-        ToPrimitive: function ToPrimitive(input) {
-            var val, valueOf, toStr;
-            if (isPrimitive(input)) {
-                return input;
-            }
-            valueOf = input.valueOf;
-            if (isCallable(valueOf)) {
-                val = valueOf.call(input);
-                if (isPrimitive(val)) {
-                    return val;
-                }
-            }
-            toStr = input.toString;
-            if (isCallable(toStr)) {
-                val = toStr.call(input);
-                if (isPrimitive(val)) {
-                    return val;
-                }
-            }
-            throw new TypeError();
-        },
-
-        // ES5 9.9
-        // http://es5.github.com/#x9.9
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToObject */
-        ToObject: function (o) {
-            if (o == null) { // this matches both null and undefined
-                throw new TypeError("can't convert " + o + ' to object');
-            }
-            return $Object(o);
-        },
-
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToUint32 */
-        ToUint32: function ToUint32(x) {
-            return x >>> 0;
-        }
-    };
-
-    //
-    // Function
-    // ========
-    //
-
-    // ES-5 15.3.4.5
-    // http://es5.github.com/#x15.3.4.5
-
-    var Empty = function Empty() {};
-
-    defineProperties(FunctionPrototype, {
-        bind: function bind(that) { // .length is 1
-            // 1. Let Target be the this value.
-            var target = this;
-            // 2. If IsCallable(Target) is false, throw a TypeError exception.
-            if (!isCallable(target)) {
-                throw new TypeError('Function.prototype.bind called on incompatible ' + target);
-            }
-            // 3. Let A be a new (possibly empty) internal list of all of the
-            //   argument values provided after thisArg (arg1, arg2 etc), in order.
-            // XXX slicedArgs will stand in for "A" if used
-            var args = array_slice.call(arguments, 1); // for normal call
-            // 4. Let F be a new native ECMAScript object.
-            // 11. Set the [[Prototype]] internal property of F to the standard
-            //   built-in Function prototype object as specified in 15.3.3.1.
-            // 12. Set the [[Call]] internal property of F as described in
-            //   15.3.4.5.1.
-            // 13. Set the [[Construct]] internal property of F as described in
-            //   15.3.4.5.2.
-            // 14. Set the [[HasInstance]] internal property of F as described in
-            //   15.3.4.5.3.
-            var bound;
-            var binder = function () {
-
-                if (this instanceof bound) {
-                    // 15.3.4.5.2 [[Construct]]
-                    // When the [[Construct]] internal method of a function object,
-                    // F that was created using the bind function is called with a
-                    // list of arguments ExtraArgs, the following steps are taken:
-                    // 1. Let target be the value of F's [[TargetFunction]]
-                    //   internal property.
-                    // 2. If target has no [[Construct]] internal method, a
-                    //   TypeError exception is thrown.
-                    // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                    //   property.
-                    // 4. Let args be a new list containing the same values as the
-                    //   list boundArgs in the same order followed by the same
-                    //   values as the list ExtraArgs in the same order.
-                    // 5. Return the result of calling the [[Construct]] internal
-                    //   method of target providing args as the arguments.
-
-                    var result = apply.call(
-                        target,
-                        this,
-                        array_concat.call(args, array_slice.call(arguments))
-                    );
-                    if ($Object(result) === result) {
-                        return result;
-                    }
-                    return this;
-
-                } else {
-                    // 15.3.4.5.1 [[Call]]
-                    // When the [[Call]] internal method of a function object, F,
-                    // which was created using the bind function is called with a
-                    // this value and a list of arguments ExtraArgs, the following
-                    // steps are taken:
-                    // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                    //   property.
-                    // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                    //   property.
-                    // 3. Let target be the value of F's [[TargetFunction]] internal
-                    //   property.
-                    // 4. Let args be a new list containing the same values as the
-                    //   list boundArgs in the same order followed by the same
-                    //   values as the list ExtraArgs in the same order.
-                    // 5. Return the result of calling the [[Call]] internal method
-                    //   of target providing boundThis as the this value and
-                    //   providing args as the arguments.
-
-                    // equiv: target.call(this, ...boundArgs, ...args)
-                    return apply.call(
-                        target,
-                        that,
-                        array_concat.call(args, array_slice.call(arguments))
-                    );
-
-                }
-
-            };
-
-            // 15. If the [[Class]] internal property of Target is "Function", then
-            //     a. Let L be the length property of Target minus the length of A.
-            //     b. Set the length own property of F to either 0 or L, whichever is
-            //       larger.
-            // 16. Else set the length own property of F to 0.
-
-            var boundLength = max(0, target.length - args.length);
-
-            // 17. Set the attributes of the length own property of F to the values
-            //   specified in 15.3.5.1.
-            var boundArgs = [];
-            for (var i = 0; i < boundLength; i++) {
-                array_push.call(boundArgs, '$' + i);
-            }
-
-            // XXX Build a dynamic function with desired amount of arguments is the only
-            // way to set the length property of a function.
-            // In environments where Content Security Policies enabled (Chrome extensions,
-            // for ex.) all use of eval or Function costructor throws an exception.
-            // However in all of these environments Function.prototype.bind exists
-            // and so this code will never be executed.
-            bound = $Function('binder', 'return function (' + array_join.call(boundArgs, ',') + '){ return binder.apply(this, arguments); }')(binder);
-
-            if (target.prototype) {
-                Empty.prototype = target.prototype;
-                bound.prototype = new Empty();
-                // Clean up dangling references.
-                Empty.prototype = null;
-            }
-
-            // TODO
-            // 18. Set the [[Extensible]] internal property of F to true.
-
-            // TODO
-            // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-            // 20. Call the [[DefineOwnProperty]] internal method of F with
-            //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-            //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
-            //   false.
-            // 21. Call the [[DefineOwnProperty]] internal method of F with
-            //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
-            //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-            //   and false.
-
-            // TODO
-            // NOTE Function objects created using Function.prototype.bind do not
-            // have a prototype property or the [[Code]], [[FormalParameters]], and
-            // [[Scope]] internal properties.
-            // XXX can't delete prototype in pure-js.
-
-            // 22. Return F.
-            return bound;
-        }
-    });
-
-    // _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-    // use it in defining shortcuts.
-    var owns = call.bind(ObjectPrototype.hasOwnProperty);
-    var toStr = call.bind(ObjectPrototype.toString);
-    var arraySlice = call.bind(array_slice);
-    var arraySliceApply = apply.bind(array_slice);
-    var strSlice = call.bind(StringPrototype.slice);
-    var strSplit = call.bind(StringPrototype.split);
-    var strIndexOf = call.bind(StringPrototype.indexOf);
-    var pushCall = call.bind(array_push);
-    var isEnum = call.bind(ObjectPrototype.propertyIsEnumerable);
-    var arraySort = call.bind(ArrayPrototype.sort);
-
-    //
-    // Array
-    // =====
-    //
-
-    var isArray = $Array.isArray || function isArray(obj) {
-        return toStr(obj) === '[object Array]';
-    };
-
-    // ES5 15.4.4.12
-    // http://es5.github.com/#x15.4.4.13
-    // Return len+argCount.
-    // [bugfix, ielt8]
-    // IE < 8 bug: [].unshift(0) === undefined but should be "1"
-    var hasUnshiftReturnValueBug = [].unshift(0) !== 1;
-    defineProperties(ArrayPrototype, {
-        unshift: function () {
-            array_unshift.apply(this, arguments);
-            return this.length;
-        }
-    }, hasUnshiftReturnValueBug);
-
-    // ES5 15.4.3.2
-    // http://es5.github.com/#x15.4.3.2
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-    defineProperties($Array, { isArray: isArray });
-
-    // The IsCallable() check in the Array functions
-    // has been replaced with a strict check on the
-    // internal class of the object to trap cases where
-    // the provided function was actually a regular
-    // expression literal, which in V8 and
-    // JavaScriptCore is a typeof "function".  Only in
-    // V8 are regular expression literals permitted as
-    // reduce parameters, so it is desirable in the
-    // general case for the shim to match the more
-    // strict and common behavior of rejecting regular
-    // expressions.
-
-    // ES5 15.4.4.18
-    // http://es5.github.com/#x15.4.4.18
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-
-    // Check failure of by-index access of string characters (IE < 9)
-    // and failure of `0 in boxedString` (Rhino)
-    var boxedString = $Object('a');
-    var splitString = boxedString[0] !== 'a' || !(0 in boxedString);
-
-    var properlyBoxesContext = function properlyBoxed(method) {
-        // Check node 0.6.21 bug where third parameter is not boxed
-        var properlyBoxesNonStrict = true;
-        var properlyBoxesStrict = true;
-        var threwException = false;
-        if (method) {
-            try {
-                method.call('foo', function (_, __, context) {
-                    if (typeof context !== 'object') {
-                        properlyBoxesNonStrict = false;
-                    }
-                });
-
-                method.call([1], function () {
-                    'use strict';
-
-                    properlyBoxesStrict = typeof this === 'string';
-                }, 'x');
-            } catch (e) {
-                threwException = true;
-            }
-        }
-        return !!method && !threwException && properlyBoxesNonStrict && properlyBoxesStrict;
-    };
-
-    defineProperties(ArrayPrototype, {
-        forEach: function forEach(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var i = -1;
-            var length = ES.ToUint32(self.length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.forEach callback must be a function');
-            }
-
-            while (++i < length) {
-                if (i in self) {
-                    // Invoke the callback function with call, passing arguments:
-                    // context, property value, property key, thisArg object
-                    if (typeof T === 'undefined') {
-                        callbackfn(self[i], i, object);
-                    } else {
-                        callbackfn.call(T, self[i], i, object);
-                    }
-                }
-            }
-        }
-    }, !properlyBoxesContext(ArrayPrototype.forEach));
-
-    // ES5 15.4.4.19
-    // http://es5.github.com/#x15.4.4.19
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-    defineProperties(ArrayPrototype, {
-        map: function map(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var result = $Array(length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.map callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self) {
-                    if (typeof T === 'undefined') {
-                        result[i] = callbackfn(self[i], i, object);
-                    } else {
-                        result[i] = callbackfn.call(T, self[i], i, object);
-                    }
-                }
-            }
-            return result;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.map));
-
-    // ES5 15.4.4.20
-    // http://es5.github.com/#x15.4.4.20
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-    defineProperties(ArrayPrototype, {
-        filter: function filter(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var result = [];
-            var value;
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.filter callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self) {
-                    value = self[i];
-                    if (typeof T === 'undefined' ? callbackfn(value, i, object) : callbackfn.call(T, value, i, object)) {
-                        pushCall(result, value);
-                    }
-                }
-            }
-            return result;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.filter));
-
-    // ES5 15.4.4.16
-    // http://es5.github.com/#x15.4.4.16
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-    defineProperties(ArrayPrototype, {
-        every: function every(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.every callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self && !(typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.every));
-
-    // ES5 15.4.4.17
-    // http://es5.github.com/#x15.4.4.17
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-    defineProperties(ArrayPrototype, {
-        some: function some(callbackfn/*, thisArg */) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.some callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self && (typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.some));
-
-    // ES5 15.4.4.21
-    // http://es5.github.com/#x15.4.4.21
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-    var reduceCoercesToObject = false;
-    if (ArrayPrototype.reduce) {
-        reduceCoercesToObject = typeof ArrayPrototype.reduce.call('es5', function (_, __, ___, list) {
-            return list;
-        }) === 'object';
-    }
-    defineProperties(ArrayPrototype, {
-        reduce: function reduce(callbackfn/*, initialValue*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.reduce callback must be a function');
-            }
-
-            // no value to return if no initial value and an empty array
-            if (length === 0 && arguments.length === 1) {
-                throw new TypeError('reduce of empty array with no initial value');
-            }
-
-            var i = 0;
-            var result;
-            if (arguments.length >= 2) {
-                result = arguments[1];
-            } else {
-                do {
-                    if (i in self) {
-                        result = self[i++];
-                        break;
-                    }
-
-                    // if array contains no values, no initial value to return
-                    if (++i >= length) {
-                        throw new TypeError('reduce of empty array with no initial value');
-                    }
-                } while (true);
-            }
-
-            for (; i < length; i++) {
-                if (i in self) {
-                    result = callbackfn(result, self[i], i, object);
-                }
-            }
-
-            return result;
-        }
-    }, !reduceCoercesToObject);
-
-    // ES5 15.4.4.22
-    // http://es5.github.com/#x15.4.4.22
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-    var reduceRightCoercesToObject = false;
-    if (ArrayPrototype.reduceRight) {
-        reduceRightCoercesToObject = typeof ArrayPrototype.reduceRight.call('es5', function (_, __, ___, list) {
-            return list;
-        }) === 'object';
-    }
-    defineProperties(ArrayPrototype, {
-        reduceRight: function reduceRight(callbackfn/*, initial*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.reduceRight callback must be a function');
-            }
-
-            // no value to return if no initial value, empty array
-            if (length === 0 && arguments.length === 1) {
-                throw new TypeError('reduceRight of empty array with no initial value');
-            }
-
-            var result;
-            var i = length - 1;
-            if (arguments.length >= 2) {
-                result = arguments[1];
-            } else {
-                do {
-                    if (i in self) {
-                        result = self[i--];
-                        break;
-                    }
-
-                    // if array contains no values, no initial value to return
-                    if (--i < 0) {
-                        throw new TypeError('reduceRight of empty array with no initial value');
-                    }
-                } while (true);
-            }
-
-            if (i < 0) {
-                return result;
-            }
-
-            do {
-                if (i in self) {
-                    result = callbackfn(result, self[i], i, object);
-                }
-            } while (i--);
-
-            return result;
-        }
-    }, !reduceRightCoercesToObject);
-
-    // ES5 15.4.4.14
-    // http://es5.github.com/#x15.4.4.14
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-    var hasFirefox2IndexOfBug = ArrayPrototype.indexOf && [0, 1].indexOf(1, 2) !== -1;
-    defineProperties(ArrayPrototype, {
-        indexOf: function indexOf(searchElement/*, fromIndex */) {
-            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);
-            var length = ES.ToUint32(self.length);
-
-            if (length === 0) {
-                return -1;
-            }
-
-            var i = 0;
-            if (arguments.length > 1) {
-                i = ES.ToInteger(arguments[1]);
-            }
-
-            // handle negative indices
-            i = i >= 0 ? i : max(0, length + i);
-            for (; i < length; i++) {
-                if (i in self && self[i] === searchElement) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }, hasFirefox2IndexOfBug);
-
-    // ES5 15.4.4.15
-    // http://es5.github.com/#x15.4.4.15
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-    var hasFirefox2LastIndexOfBug = ArrayPrototype.lastIndexOf && [0, 1].lastIndexOf(0, -3) !== -1;
-    defineProperties(ArrayPrototype, {
-        lastIndexOf: function lastIndexOf(searchElement/*, fromIndex */) {
-            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);
-            var length = ES.ToUint32(self.length);
-
-            if (length === 0) {
-                return -1;
-            }
-            var i = length - 1;
-            if (arguments.length > 1) {
-                i = min(i, ES.ToInteger(arguments[1]));
-            }
-            // handle negative indices
-            i = i >= 0 ? i : length - Math.abs(i);
-            for (; i >= 0; i--) {
-                if (i in self && searchElement === self[i]) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }, hasFirefox2LastIndexOfBug);
-
-    // ES5 15.4.4.12
-    // http://es5.github.com/#x15.4.4.12
-    var spliceNoopReturnsEmptyArray = (function () {
-        var a = [1, 2];
-        var result = a.splice();
-        return a.length === 2 && isArray(result) && result.length === 0;
-    }());
-    defineProperties(ArrayPrototype, {
-        // Safari 5.0 bug where .splice() returns undefined
-        splice: function splice(start, deleteCount) {
-            if (arguments.length === 0) {
-                return [];
-            } else {
-                return array_splice.apply(this, arguments);
-            }
-        }
-    }, !spliceNoopReturnsEmptyArray);
-
-    var spliceWorksWithEmptyObject = (function () {
-        var obj = {};
-        ArrayPrototype.splice.call(obj, 0, 0, 1);
-        return obj.length === 1;
-    }());
-    defineProperties(ArrayPrototype, {
-        splice: function splice(start, deleteCount) {
-            if (arguments.length === 0) {
-                return [];
-            }
-            var args = arguments;
-            this.length = max(ES.ToInteger(this.length), 0);
-            if (arguments.length > 0 && typeof deleteCount !== 'number') {
-                args = arraySlice(arguments);
-                if (args.length < 2) {
-                    pushCall(args, this.length - start);
-                } else {
-                    args[1] = ES.ToInteger(deleteCount);
-                }
-            }
-            return array_splice.apply(this, args);
-        }
-    }, !spliceWorksWithEmptyObject);
-    var spliceWorksWithLargeSparseArrays = (function () {
-        // Per https://github.com/es-shims/es5-shim/issues/295
-        // Safari 7/8 breaks with sparse arrays of size 1e5 or greater
-        var arr = new $Array(1e5);
-        // note: the index MUST be 8 or larger or the test will false pass
-        arr[8] = 'x';
-        arr.splice(1, 1);
-        // note: this test must be defined *after* the indexOf shim
-        // per https://github.com/es-shims/es5-shim/issues/313
-        return arr.indexOf('x') === 7;
-    }());
-    var spliceWorksWithSmallSparseArrays = (function () {
-        // Per https://github.com/es-shims/es5-shim/issues/295
-        // Opera 12.15 breaks on this, no idea why.
-        var n = 256;
-        var arr = [];
-        arr[n] = 'a';
-        arr.splice(n + 1, 0, 'b');
-        return arr[n] === 'a';
-    }());
-    defineProperties(ArrayPrototype, {
-        splice: function splice(start, deleteCount) {
-            var O = ES.ToObject(this);
-            var A = [];
-            var len = ES.ToUint32(O.length);
-            var relativeStart = ES.ToInteger(start);
-            var actualStart = relativeStart < 0 ? max((len + relativeStart), 0) : min(relativeStart, len);
-            var actualDeleteCount = min(max(ES.ToInteger(deleteCount), 0), len - actualStart);
-
-            var k = 0;
-            var from;
-            while (k < actualDeleteCount) {
-                from = $String(actualStart + k);
-                if (owns(O, from)) {
-                    A[k] = O[from];
-                }
-                k += 1;
-            }
-
-            var items = arraySlice(arguments, 2);
-            var itemCount = items.length;
-            var to;
-            if (itemCount < actualDeleteCount) {
-                k = actualStart;
-                var maxK = len - actualDeleteCount;
-                while (k < maxK) {
-                    from = $String(k + actualDeleteCount);
-                    to = $String(k + itemCount);
-                    if (owns(O, from)) {
-                        O[to] = O[from];
-                    } else {
-                        delete O[to];
-                    }
-                    k += 1;
-                }
-                k = len;
-                var minK = len - actualDeleteCount + itemCount;
-                while (k > minK) {
-                    delete O[k - 1];
-                    k -= 1;
-                }
-            } else if (itemCount > actualDeleteCount) {
-                k = len - actualDeleteCount;
-                while (k > actualStart) {
-                    from = $String(k + actualDeleteCount - 1);
-                    to = $String(k + itemCount - 1);
-                    if (owns(O, from)) {
-                        O[to] = O[from];
-                    } else {
-                        delete O[to];
-                    }
-                    k -= 1;
-                }
-            }
-            k = actualStart;
-            for (var i = 0; i < items.length; ++i) {
-                O[k] = items[i];
-                k += 1;
-            }
-            O.length = len - actualDeleteCount + itemCount;
-
-            return A;
-        }
-    }, !spliceWorksWithLargeSparseArrays || !spliceWorksWithSmallSparseArrays);
-
-    var originalJoin = ArrayPrototype.join;
-    var hasStringJoinBug;
-    try {
-        hasStringJoinBug = Array.prototype.join.call('123', ',') !== '1,2,3';
-    } catch (e) {
-        hasStringJoinBug = true;
-    }
-    if (hasStringJoinBug) {
-        defineProperties(ArrayPrototype, {
-            join: function join(separator) {
-                var sep = typeof separator === 'undefined' ? ',' : separator;
-                return originalJoin.call(isString(this) ? strSplit(this, '') : this, sep);
-            }
-        }, hasStringJoinBug);
-    }
-
-    var hasJoinUndefinedBug = [1, 2].join(undefined) !== '1,2';
-    if (hasJoinUndefinedBug) {
-        defineProperties(ArrayPrototype, {
-            join: function join(separator) {
-                var sep = typeof separator === 'undefined' ? ',' : separator;
-                return originalJoin.call(this, sep);
-            }
-        }, hasJoinUndefinedBug);
-    }
-
-    var pushShim = function push(item) {
-        var O = ES.ToObject(this);
-        var n = ES.ToUint32(O.length);
-        var i = 0;
-        while (i < arguments.length) {
-            O[n + i] = arguments[i];
-            i += 1;
-        }
-        O.length = n + i;
-        return n + i;
-    };
-
-    var pushIsNotGeneric = (function () {
-        var obj = {};
-        var result = Array.prototype.push.call(obj, undefined);
-        return result !== 1 || obj.length !== 1 || typeof obj[0] !== 'undefined' || !owns(obj, 0);
-    }());
-    defineProperties(ArrayPrototype, {
-        push: function push(item) {
-            if (isArray(this)) {
-                return array_push.apply(this, arguments);
-            }
-            return pushShim.apply(this, arguments);
-        }
-    }, pushIsNotGeneric);
-
-    // This fixes a very weird bug in Opera 10.6 when pushing `undefined
-    var pushUndefinedIsWeird = (function () {
-        var arr = [];
-        var result = arr.push(undefined);
-        return result !== 1 || arr.length !== 1 || typeof arr[0] !== 'undefined' || !owns(arr, 0);
-    }());
-    defineProperties(ArrayPrototype, { push: pushShim }, pushUndefinedIsWeird);
-
-    // ES5 15.2.3.14
-    // http://es5.github.io/#x15.4.4.10
-    // Fix boxed string bug
-    defineProperties(ArrayPrototype, {
-        slice: function (start, end) {
-            var arr = isString(this) ? strSplit(this, '') : this;
-            return arraySliceApply(arr, arguments);
-        }
-    }, splitString);
-
-    var sortIgnoresNonFunctions = (function () {
-        try {
-            [1, 2].sort(null);
-            [1, 2].sort({});
-            return true;
-        } catch (e) {}
-        return false;
-    }());
-    var sortThrowsOnRegex = (function () {
-        // this is a problem in Firefox 4, in which `typeof /a/ === 'function'`
-        try {
-            [1, 2].sort(/a/);
-            return false;
-        } catch (e) {}
-        return true;
-    }());
-    var sortIgnoresUndefined = (function () {
-        // applies in IE 8, for one.
-        try {
-            [1, 2].sort(undefined);
-            return true;
-        } catch (e) {}
-        return false;
-    }());
-    defineProperties(ArrayPrototype, {
-        sort: function sort(compareFn) {
-            if (typeof compareFn === 'undefined') {
-                return arraySort(this);
-            }
-            if (!isCallable(compareFn)) {
-                throw new TypeError('Array.prototype.sort callback must be a function');
-            }
-            return arraySort(this, compareFn);
-        }
-    }, sortIgnoresNonFunctions || !sortIgnoresUndefined || !sortThrowsOnRegex);
-
-    //
-    // Object
-    // ======
-    //
-
-    // ES5 15.2.3.14
-    // http://es5.github.com/#x15.2.3.14
-
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = !isEnum({ 'toString': null }, 'toString');
-    var hasProtoEnumBug = isEnum(function () {}, 'prototype');
-    var hasStringEnumBug = !owns('x', '0');
-    var equalsConstructorPrototype = function (o) {
-        var ctor = o.constructor;
-        return ctor && ctor.prototype === o;
-    };
-    var blacklistedKeys = {
-        $window: true,
-        $console: true,
-        $parent: true,
-        $self: true,
-        $frame: true,
-        $frames: true,
-        $frameElement: true,
-        $webkitIndexedDB: true,
-        $webkitStorageInfo: true,
-        $external: true
-    };
-    var hasAutomationEqualityBug = (function () {
-        /* globals window */
-        if (typeof window === 'undefined') {
-            return false;
-        }
-        for (var k in window) {
-            try {
-                if (!blacklistedKeys['$' + k] && owns(window, k) && window[k] !== null && typeof window[k] === 'object') {
-                    equalsConstructorPrototype(window[k]);
-                }
-            } catch (e) {
-                return true;
-            }
-        }
-        return false;
-    }());
-    var equalsConstructorPrototypeIfNotBuggy = function (object) {
-        if (typeof window === 'undefined' || !hasAutomationEqualityBug) {
-            return equalsConstructorPrototype(object);
-        }
-        try {
-            return equalsConstructorPrototype(object);
-        } catch (e) {
-            return false;
-        }
-    };
-    var dontEnums = [
-        'toString',
-        'toLocaleString',
-        'valueOf',
-        'hasOwnProperty',
-        'isPrototypeOf',
-        'propertyIsEnumerable',
-        'constructor'
-    ];
-    var dontEnumsLength = dontEnums.length;
-
-    // taken directly from https://github.com/ljharb/is-arguments/blob/master/index.js
-    // can be replaced with require('is-arguments') if we ever use a build process instead
-    var isStandardArguments = function isArguments(value) {
-        return toStr(value) === '[object Arguments]';
-    };
-    var isLegacyArguments = function isArguments(value) {
-        return value !== null &&
-            typeof value === 'object' &&
-            typeof value.length === 'number' &&
-            value.length >= 0 &&
-            !isArray(value) &&
-            isCallable(value.callee);
-    };
-    var isArguments = isStandardArguments(arguments) ? isStandardArguments : isLegacyArguments;
-
-    defineProperties($Object, {
-        keys: function keys(object) {
-            var isFn = isCallable(object);
-            var isArgs = isArguments(object);
-            var isObject = object !== null && typeof object === 'object';
-            var isStr = isObject && isString(object);
-
-            if (!isObject && !isFn && !isArgs) {
-                throw new TypeError('Object.keys called on a non-object');
-            }
-
-            var theKeys = [];
-            var skipProto = hasProtoEnumBug && isFn;
-            if ((isStr && hasStringEnumBug) || isArgs) {
-                for (var i = 0; i < object.length; ++i) {
-                    pushCall(theKeys, $String(i));
-                }
-            }
-
-            if (!isArgs) {
-                for (var name in object) {
-                    if (!(skipProto && name === 'prototype') && owns(object, name)) {
-                        pushCall(theKeys, $String(name));
-                    }
-                }
-            }
-
-            if (hasDontEnumBug) {
-                var skipConstructor = equalsConstructorPrototypeIfNotBuggy(object);
-                for (var j = 0; j < dontEnumsLength; j++) {
-                    var dontEnum = dontEnums[j];
-                    if (!(skipConstructor && dontEnum === 'constructor') && owns(object, dontEnum)) {
-                        pushCall(theKeys, dontEnum);
-                    }
-                }
-            }
-            return theKeys;
-        }
-    });
-
-    var keysWorksWithArguments = $Object.keys && (function () {
-        // Safari 5.0 bug
-        return $Object.keys(arguments).length === 2;
-    }(1, 2));
-    var keysHasArgumentsLengthBug = $Object.keys && (function () {
-        var argKeys = $Object.keys(arguments);
-        return arguments.length !== 1 || argKeys.length !== 1 || argKeys[0] !== 1;
-    }(1));
-    var originalKeys = $Object.keys;
-    defineProperties($Object, {
-        keys: function keys(object) {
-            if (isArguments(object)) {
-                return originalKeys(arraySlice(object));
-            } else {
-                return originalKeys(object);
-            }
-        }
-    }, !keysWorksWithArguments || keysHasArgumentsLengthBug);
-
-    //
-    // Date
-    // ====
-    //
-
-    var hasNegativeMonthYearBug = new Date(-3509827329600292).getUTCMonth() !== 0;
-    var aNegativeTestDate = new Date(-1509842289600292);
-    var aPositiveTestDate = new Date(1449662400000);
-    var hasToUTCStringFormatBug = aNegativeTestDate.toUTCString() !== 'Mon, 01 Jan -45875 11:59:59 GMT';
-    var hasToDateStringFormatBug;
-    var hasToStringFormatBug;
-    var timeZoneOffset = aNegativeTestDate.getTimezoneOffset();
-    if (timeZoneOffset < -720) {
-        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Tue Jan 02 -45875';
-        hasToStringFormatBug = !(/^Thu Dec 10 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/).test(aPositiveTestDate.toString());
-    } else {
-        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Mon Jan 01 -45875';
-        hasToStringFormatBug = !(/^Wed Dec 09 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/).test(aPositiveTestDate.toString());
-    }
-
-    var originalGetFullYear = call.bind(Date.prototype.getFullYear);
-    var originalGetMonth = call.bind(Date.prototype.getMonth);
-    var originalGetDate = call.bind(Date.prototype.getDate);
-    var originalGetUTCFullYear = call.bind(Date.prototype.getUTCFullYear);
-    var originalGetUTCMonth = call.bind(Date.prototype.getUTCMonth);
-    var originalGetUTCDate = call.bind(Date.prototype.getUTCDate);
-    var originalGetUTCDay = call.bind(Date.prototype.getUTCDay);
-    var originalGetUTCHours = call.bind(Date.prototype.getUTCHours);
-    var originalGetUTCMinutes = call.bind(Date.prototype.getUTCMinutes);
-    var originalGetUTCSeconds = call.bind(Date.prototype.getUTCSeconds);
-    var originalGetUTCMilliseconds = call.bind(Date.prototype.getUTCMilliseconds);
-    var dayName = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    var monthName = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-    var daysInMonth = function daysInMonth(month, year) {
-        return originalGetDate(new Date(year, month, 0));
-    };
-
-    defineProperties(Date.prototype, {
-        getFullYear: function getFullYear() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetFullYear(this);
-            if (year < 0 && originalGetMonth(this) > 11) {
-                return year + 1;
-            }
-            return year;
-        },
-        getMonth: function getMonth() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetFullYear(this);
-            var month = originalGetMonth(this);
-            if (year < 0 && month > 11) {
-                return 0;
-            }
-            return month;
-        },
-        getDate: function getDate() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetFullYear(this);
-            var month = originalGetMonth(this);
-            var date = originalGetDate(this);
-            if (year < 0 && month > 11) {
-                if (month === 12) {
-                    return date;
-                }
-                var days = daysInMonth(0, year + 1);
-                return (days - date) + 1;
-            }
-            return date;
-        },
-        getUTCFullYear: function getUTCFullYear() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetUTCFullYear(this);
-            if (year < 0 && originalGetUTCMonth(this) > 11) {
-                return year + 1;
-            }
-            return year;
-        },
-        getUTCMonth: function getUTCMonth() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetUTCFullYear(this);
-            var month = originalGetUTCMonth(this);
-            if (year < 0 && month > 11) {
-                return 0;
-            }
-            return month;
-        },
-        getUTCDate: function getUTCDate() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetUTCFullYear(this);
-            var month = originalGetUTCMonth(this);
-            var date = originalGetUTCDate(this);
-            if (year < 0 && month > 11) {
-                if (month === 12) {
-                    return date;
-                }
-                var days = daysInMonth(0, year + 1);
-                return (days - date) + 1;
-            }
-            return date;
-        }
-    }, hasNegativeMonthYearBug);
-
-    defineProperties(Date.prototype, {
-        toUTCString: function toUTCString() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var day = originalGetUTCDay(this);
-            var date = originalGetUTCDate(this);
-            var month = originalGetUTCMonth(this);
-            var year = originalGetUTCFullYear(this);
-            var hour = originalGetUTCHours(this);
-            var minute = originalGetUTCMinutes(this);
-            var second = originalGetUTCSeconds(this);
-            return dayName[day] + ', ' +
-                (date < 10 ? '0' + date : date) + ' ' +
-                monthName[month] + ' ' +
-                year + ' ' +
-                (hour < 10 ? '0' + hour : hour) + ':' +
-                (minute < 10 ? '0' + minute : minute) + ':' +
-                (second < 10 ? '0' + second : second) + ' GMT';
-        }
-    }, hasNegativeMonthYearBug || hasToUTCStringFormatBug);
-
-    // Opera 12 has `,`
-    defineProperties(Date.prototype, {
-        toDateString: function toDateString() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var day = this.getDay();
-            var date = this.getDate();
-            var month = this.getMonth();
-            var year = this.getFullYear();
-            return dayName[day] + ' ' +
-                monthName[month] + ' ' +
-                (date < 10 ? '0' + date : date) + ' ' +
-                year;
-        }
-    }, hasNegativeMonthYearBug || hasToDateStringFormatBug);
-
-    // can't use defineProperties here because of toString enumeration issue in IE <= 8
-    if (hasNegativeMonthYearBug || hasToStringFormatBug) {
-        Date.prototype.toString = function toString() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var day = this.getDay();
-            var date = this.getDate();
-            var month = this.getMonth();
-            var year = this.getFullYear();
-            var hour = this.getHours();
-            var minute = this.getMinutes();
-            var second = this.getSeconds();
-            var timezoneOffset = this.getTimezoneOffset();
-            var hoursOffset = Math.floor(Math.abs(timezoneOffset) / 60);
-            var minutesOffset = Math.floor(Math.abs(timezoneOffset) % 60);
-            return dayName[day] + ' ' +
-                monthName[month] + ' ' +
-                (date < 10 ? '0' + date : date) + ' ' +
-                year + ' ' +
-                (hour < 10 ? '0' + hour : hour) + ':' +
-                (minute < 10 ? '0' + minute : minute) + ':' +
-                (second < 10 ? '0' + second : second) + ' GMT' +
-                (timezoneOffset > 0 ? '-' : '+') +
-                (hoursOffset < 10 ? '0' + hoursOffset : hoursOffset) +
-                (minutesOffset < 10 ? '0' + minutesOffset : minutesOffset);
-        };
-        if (supportsDescriptors) {
-            $Object.defineProperty(Date.prototype, 'toString', {
-                configurable: true,
-                enumerable: false,
-                writable: true
-            });
-        }
-    }
-
-    // ES5 15.9.5.43
-    // http://es5.github.com/#x15.9.5.43
-    // This function returns a String value represent the instance in time
-    // represented by this Date object. The format of the String is the Date Time
-    // string format defined in 15.9.1.15. All fields are present in the String.
-    // The time zone is always UTC, denoted by the suffix Z. If the time value of
-    // this object is not a finite Number a RangeError exception is thrown.
-    var negativeDate = -62198755200000;
-    var negativeYearString = '-000001';
-    var hasNegativeDateBug = Date.prototype.toISOString && new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1;
-    var hasSafari51DateBug = Date.prototype.toISOString && new Date(-1).toISOString() !== '1969-12-31T23:59:59.999Z';
-
-    var getTime = call.bind(Date.prototype.getTime);
-
-    defineProperties(Date.prototype, {
-        toISOString: function toISOString() {
-            if (!isFinite(this) || !isFinite(getTime(this))) {
-                // Adope Photoshop requires the second check.
-                throw new RangeError('Date.prototype.toISOString called on non-finite value.');
-            }
-
-            var year = originalGetUTCFullYear(this);
-
-            var month = originalGetUTCMonth(this);
-            // see https://github.com/es-shims/es5-shim/issues/111
-            year += Math.floor(month / 12);
-            month = (month % 12 + 12) % 12;
-
-            // the date time string format is specified in 15.9.1.15.
-            var result = [month + 1, originalGetUTCDate(this), originalGetUTCHours(this), originalGetUTCMinutes(this), originalGetUTCSeconds(this)];
-            year = (
-                (year < 0 ? '-' : (year > 9999 ? '+' : '')) +
-                strSlice('00000' + Math.abs(year), (0 <= year && year <= 9999) ? -4 : -6)
-            );
-
-            for (var i = 0; i < result.length; ++i) {
-                // pad months, days, hours, minutes, and seconds to have two digits.
-                result[i] = strSlice('00' + result[i], -2);
-            }
-            // pad milliseconds to have three digits.
-            return (
-                year + '-' + arraySlice(result, 0, 2).join('-') +
-                'T' + arraySlice(result, 2).join(':') + '.' +
-                strSlice('000' + originalGetUTCMilliseconds(this), -3) + 'Z'
-            );
-        }
-    }, hasNegativeDateBug || hasSafari51DateBug);
-
-    // ES5 15.9.5.44
-    // http://es5.github.com/#x15.9.5.44
-    // This function provides a String representation of a Date object for use by
-    // JSON.stringify (15.12.3).
-    var dateToJSONIsSupported = (function () {
-        try {
-            return Date.prototype.toJSON &&
-                new Date(NaN).toJSON() === null &&
-                new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&
-                Date.prototype.toJSON.call({ // generic
-                    toISOString: function () { return true; }
-                });
-        } catch (e) {
-            return false;
-        }
-    }());
-    if (!dateToJSONIsSupported) {
-        Date.prototype.toJSON = function toJSON(key) {
-            // When the toJSON method is called with argument key, the following
-            // steps are taken:
-
-            // 1.  Let O be the result of calling ToObject, giving it the this
-            // value as its argument.
-            // 2. Let tv be ES.ToPrimitive(O, hint Number).
-            var O = $Object(this);
-            var tv = ES.ToPrimitive(O);
-            // 3. If tv is a Number and is not finite, return null.
-            if (typeof tv === 'number' && !isFinite(tv)) {
-                return null;
-            }
-            // 4. Let toISO be the result of calling the [[Get]] internal method of
-            // O with argument "toISOString".
-            var toISO = O.toISOString;
-            // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-            if (!isCallable(toISO)) {
-                throw new TypeError('toISOString property is not callable');
-            }
-            // 6. Return the result of calling the [[Call]] internal method of
-            //  toISO with O as the this value and an empty argument list.
-            return toISO.call(O);
-
-            // NOTE 1 The argument is ignored.
-
-            // NOTE 2 The toJSON function is intentionally generic; it does not
-            // require that its this value be a Date object. Therefore, it can be
-            // transferred to other kinds of objects for use as a method. However,
-            // it does require that any such object have a toISOString method. An
-            // object is free to use the argument key to filter its
-            // stringification.
-        };
-    }
-
-    // ES5 15.9.4.2
-    // http://es5.github.com/#x15.9.4.2
-    // based on work shared by Daniel Friesen (dantman)
-    // http://gist.github.com/303249
-    var supportsExtendedYears = Date.parse('+033658-09-27T01:46:40.000Z') === 1e15;
-    var acceptsInvalidDates = !isNaN(Date.parse('2012-04-04T24:00:00.500Z')) || !isNaN(Date.parse('2012-11-31T23:59:59.000Z')) || !isNaN(Date.parse('2012-12-31T23:59:60.000Z'));
-    var doesNotParseY2KNewYear = isNaN(Date.parse('2000-01-01T00:00:00.000Z'));
-    if (doesNotParseY2KNewYear || acceptsInvalidDates || !supportsExtendedYears) {
-        // XXX global assignment won't work in embeddings that use
-        // an alternate object for the context.
-        /* global Date: true */
-        /* eslint-disable no-undef */
-        var maxSafeUnsigned32Bit = Math.pow(2, 31) - 1;
-        var hasSafariSignedIntBug = isActualNaN(new Date(1970, 0, 1, 0, 0, 0, maxSafeUnsigned32Bit + 1).getTime());
-        /* eslint-disable no-implicit-globals */
-        Date = (function (NativeDate) {
-        /* eslint-enable no-implicit-globals */
-        /* eslint-enable no-undef */
-            // Date.length === 7
-            var DateShim = function Date(Y, M, D, h, m, s, ms) {
-                var length = arguments.length;
-                var date;
-                if (this instanceof NativeDate) {
-                    var seconds = s;
-                    var millis = ms;
-                    if (hasSafariSignedIntBug && length >= 7 && ms > maxSafeUnsigned32Bit) {
-                        // work around a Safari 8/9 bug where it treats the seconds as signed
-                        var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;
-                        var sToShift = Math.floor(msToShift / 1e3);
-                        seconds += sToShift;
-                        millis -= sToShift * 1e3;
-                    }
-                    date = length === 1 && $String(Y) === Y ? // isString(Y)
-                        // We explicitly pass it through parse:
-                        new NativeDate(DateShim.parse(Y)) :
-                        // We have to manually make calls depending on argument
-                        // length here
-                        length >= 7 ? new NativeDate(Y, M, D, h, m, seconds, millis) :
-                        length >= 6 ? new NativeDate(Y, M, D, h, m, seconds) :
-                        length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                        length >= 4 ? new NativeDate(Y, M, D, h) :
-                        length >= 3 ? new NativeDate(Y, M, D) :
-                        length >= 2 ? new NativeDate(Y, M) :
-                        length >= 1 ? new NativeDate(Y instanceof NativeDate ? +Y : Y) :
-                                      new NativeDate();
-                } else {
-                    date = NativeDate.apply(this, arguments);
-                }
-                if (!isPrimitive(date)) {
-                    // Prevent mixups with unfixed Date object
-                    defineProperties(date, { constructor: DateShim }, true);
-                }
-                return date;
-            };
-
-            // 15.9.1.15 Date Time String Format.
-            var isoDateExpression = new RegExp('^' +
-                '(\\d{4}|[+-]\\d{6})' + // four-digit year capture or sign +
-                                          // 6-digit extended year
-                '(?:-(\\d{2})' + // optional month capture
-                '(?:-(\\d{2})' + // optional day capture
-                '(?:' + // capture hours:minutes:seconds.milliseconds
-                    'T(\\d{2})' + // hours capture
-                    ':(\\d{2})' + // minutes capture
-                    '(?:' + // optional :seconds.milliseconds
-                        ':(\\d{2})' + // seconds capture
-                        '(?:(\\.\\d{1,}))?' + // milliseconds capture
-                    ')?' +
-                '(' + // capture UTC offset component
-                    'Z|' + // UTC capture
-                    '(?:' + // offset specifier +/-hours:minutes
-                        '([-+])' + // sign capture
-                        '(\\d{2})' + // hours offset capture
-                        ':(\\d{2})' + // minutes offset capture
-                    ')' +
-                ')?)?)?)?' +
-            '$');
-
-            var months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];
-
-            var dayFromMonth = function dayFromMonth(year, month) {
-                var t = month > 1 ? 1 : 0;
-                return (
-                    months[month] +
-                    Math.floor((year - 1969 + t) / 4) -
-                    Math.floor((year - 1901 + t) / 100) +
-                    Math.floor((year - 1601 + t) / 400) +
-                    365 * (year - 1970)
-                );
-            };
-
-            var toUTC = function toUTC(t) {
-                var s = 0;
-                var ms = t;
-                if (hasSafariSignedIntBug && ms > maxSafeUnsigned32Bit) {
-                    // work around a Safari 8/9 bug where it treats the seconds as signed
-                    var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;
-                    var sToShift = Math.floor(msToShift / 1e3);
-                    s += sToShift;
-                    ms -= sToShift * 1e3;
-                }
-                return $Number(new NativeDate(1970, 0, 1, 0, 0, s, ms));
-            };
-
-            // Copy any custom methods a 3rd party library may have added
-            for (var key in NativeDate) {
-                if (owns(NativeDate, key)) {
-                    DateShim[key] = NativeDate[key];
-                }
-            }
-
-            // Copy "native" methods explicitly; they may be non-enumerable
-            defineProperties(DateShim, {
-                now: NativeDate.now,
-                UTC: NativeDate.UTC
-            }, true);
-            DateShim.prototype = NativeDate.prototype;
-            defineProperties(DateShim.prototype, {
-                constructor: DateShim
-            }, true);
-
-            // Upgrade Date.parse to handle simplified ISO 8601 strings
-            var parseShim = function parse(string) {
-                var match = isoDateExpression.exec(string);
-                if (match) {
-                    // parse months, days, hours, minutes, seconds, and milliseconds
-                    // provide default values if necessary
-                    // parse the UTC offset component
-                    var year = $Number(match[1]),
-                        month = $Number(match[2] || 1) - 1,
-                        day = $Number(match[3] || 1) - 1,
-                        hour = $Number(match[4] || 0),
-                        minute = $Number(match[5] || 0),
-                        second = $Number(match[6] || 0),
-                        millisecond = Math.floor($Number(match[7] || 0) * 1000),
-                        // When time zone is missed, local offset should be used
-                        // (ES 5.1 bug)
-                        // see https://bugs.ecmascript.org/show_bug.cgi?id=112
-                        isLocalTime = Boolean(match[4] && !match[8]),
-                        signOffset = match[9] === '-' ? 1 : -1,
-                        hourOffset = $Number(match[10] || 0),
-                        minuteOffset = $Number(match[11] || 0),
-                        result;
-                    var hasMinutesOrSecondsOrMilliseconds = minute > 0 || second > 0 || millisecond > 0;
-                    if (
-                        hour < (hasMinutesOrSecondsOrMilliseconds ? 24 : 25) &&
-                        minute < 60 && second < 60 && millisecond < 1000 &&
-                        month > -1 && month < 12 && hourOffset < 24 &&
-                        minuteOffset < 60 && // detect invalid offsets
-                        day > -1 &&
-                        day < (dayFromMonth(year, month + 1) - dayFromMonth(year, month))
-                    ) {
-                        result = (
-                            (dayFromMonth(year, month) + day) * 24 +
-                            hour +
-                            hourOffset * signOffset
-                        ) * 60;
-                        result = (
-                            (result + minute + minuteOffset * signOffset) * 60 +
-                            second
-                        ) * 1000 + millisecond;
-                        if (isLocalTime) {
-                            result = toUTC(result);
-                        }
-                        if (-8.64e15 <= result && result <= 8.64e15) {
-                            return result;
-                        }
-                    }
-                    return NaN;
-                }
-                return NativeDate.parse.apply(this, arguments);
-            };
-            defineProperties(DateShim, { parse: parseShim });
-
-            return DateShim;
-        }(Date));
-        /* global Date: false */
-    }
-
-    // ES5 15.9.4.4
-    // http://es5.github.com/#x15.9.4.4
-    if (!Date.now) {
-        Date.now = function now() {
-            return new Date().getTime();
-        };
-    }
-
-    //
-    // Number
-    // ======
-    //
-
-    // ES5.1 15.7.4.5
-    // http://es5.github.com/#x15.7.4.5
-    var hasToFixedBugs = NumberPrototype.toFixed && (
-      (0.00008).toFixed(3) !== '0.000' ||
-      (0.9).toFixed(0) !== '1' ||
-      (1.255).toFixed(2) !== '1.25' ||
-      (1000000000000000128).toFixed(0) !== '1000000000000000128'
-    );
-
-    var toFixedHelpers = {
-        base: 1e7,
-        size: 6,
-        data: [0, 0, 0, 0, 0, 0],
-        multiply: function multiply(n, c) {
-            var i = -1;
-            var c2 = c;
-            while (++i < toFixedHelpers.size) {
-                c2 += n * toFixedHelpers.data[i];
-                toFixedHelpers.data[i] = c2 % toFixedHelpers.base;
-                c2 = Math.floor(c2 / toFixedHelpers.base);
-            }
-        },
-        divide: function divide(n) {
-            var i = toFixedHelpers.size;
-            var c = 0;
-            while (--i >= 0) {
-                c += toFixedHelpers.data[i];
-                toFixedHelpers.data[i] = Math.floor(c / n);
-                c = (c % n) * toFixedHelpers.base;
-            }
-        },
-        numToString: function numToString() {
-            var i = toFixedHelpers.size;
-            var s = '';
-            while (--i >= 0) {
-                if (s !== '' || i === 0 || toFixedHelpers.data[i] !== 0) {
-                    var t = $String(toFixedHelpers.data[i]);
-                    if (s === '') {
-                        s = t;
-                    } else {
-                        s += strSlice('0000000', 0, 7 - t.length) + t;
-                    }
-                }
-            }
-            return s;
-        },
-        pow: function pow(x, n, acc) {
-            return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));
-        },
-        log: function log(x) {
-            var n = 0;
-            var x2 = x;
-            while (x2 >= 4096) {
-                n += 12;
-                x2 /= 4096;
-            }
-            while (x2 >= 2) {
-                n += 1;
-                x2 /= 2;
-            }
-            return n;
-        }
-    };
-
-    var toFixedShim = function toFixed(fractionDigits) {
-        var f, x, s, m, e, z, j, k;
-
-        // Test for NaN and round fractionDigits down
-        f = $Number(fractionDigits);
-        f = isActualNaN(f) ? 0 : Math.floor(f);
-
-        if (f < 0 || f > 20) {
-            throw new RangeError('Number.toFixed called with invalid number of decimals');
-        }
-
-        x = $Number(this);
-
-        if (isActualNaN(x)) {
-            return 'NaN';
-        }
-
-        // If it is too big or small, return the string value of the number
-        if (x <= -1e21 || x >= 1e21) {
-            return $String(x);
-        }
-
-        s = '';
-
-        if (x < 0) {
-            s = '-';
-            x = -x;
-        }
-
-        m = '0';
-
-        if (x > 1e-21) {
-            // 1e-21 < x < 1e21
-            // -70 < log2(x) < 70
-            e = toFixedHelpers.log(x * toFixedHelpers.pow(2, 69, 1)) - 69;
-            z = (e < 0 ? x * toFixedHelpers.pow(2, -e, 1) : x / toFixedHelpers.pow(2, e, 1));
-            z *= 0x10000000000000; // Math.pow(2, 52);
-            e = 52 - e;
-
-            // -18 < e < 122
-            // x = z / 2 ^ e
-            if (e > 0) {
-                toFixedHelpers.multiply(0, z);
-                j = f;
-
-                while (j >= 7) {
-                    toFixedHelpers.multiply(1e7, 0);
-                    j -= 7;
-                }
-
-                toFixedHelpers.multiply(toFixedHelpers.pow(10, j, 1), 0);
-                j = e - 1;
-
-                while (j >= 23) {
-                    toFixedHelpers.divide(1 << 23);
-                    j -= 23;
-                }
-
-                toFixedHelpers.divide(1 << j);
-                toFixedHelpers.multiply(1, 1);
-                toFixedHelpers.divide(2);
-                m = toFixedHelpers.numToString();
-            } else {
-                toFixedHelpers.multiply(0, z);
-                toFixedHelpers.multiply(1 << (-e), 0);
-                m = toFixedHelpers.numToString() + strSlice('0.00000000000000000000', 2, 2 + f);
-            }
-        }
-
-        if (f > 0) {
-            k = m.length;
-
-            if (k <= f) {
-                m = s + strSlice('0.0000000000000000000', 0, f - k + 2) + m;
-            } else {
-                m = s + strSlice(m, 0, k - f) + '.' + strSlice(m, k - f);
-            }
-        } else {
-            m = s + m;
-        }
-
-        return m;
-    };
-    defineProperties(NumberPrototype, { toFixed: toFixedShim }, hasToFixedBugs);
-
-    var hasToPrecisionUndefinedBug = (function () {
-        try {
-            return 1.0.toPrecision(undefined) === '1';
-        } catch (e) {
-            return true;
-        }
-    }());
-    var originalToPrecision = NumberPrototype.toPrecision;
-    defineProperties(NumberPrototype, {
-        toPrecision: function toPrecision(precision) {
-            return typeof precision === 'undefined' ? originalToPrecision.call(this) : originalToPrecision.call(this, precision);
-        }
-    }, hasToPrecisionUndefinedBug);
-
-    //
-    // String
-    // ======
-    //
-
-    // ES5 15.5.4.14
-    // http://es5.github.com/#x15.5.4.14
-
-    // [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]
-    // Many browsers do not split properly with regular expressions or they
-    // do not perform the split correctly under obscure conditions.
-    // See http://blog.stevenlevithan.com/archives/cross-browser-split
-    // I've tested in many browsers and this seems to cover the deviant ones:
-    //    'ab'.split(/(?:ab)*/) should be ["", ""], not [""]
-    //    '.'.split(/(.?)(.?)/) should be ["", ".", "", ""], not ["", ""]
-    //    'tesst'.split(/(s)*/) should be ["t", undefined, "e", "s", "t"], not
-    //       [undefined, "t", undefined, "e", ...]
-    //    ''.split(/.?/) should be [], not [""]
-    //    '.'.split(/()()/) should be ["."], not ["", "", "."]
-
-    if (
-        'ab'.split(/(?:ab)*/).length !== 2 ||
-        '.'.split(/(.?)(.?)/).length !== 4 ||
-        'tesst'.split(/(s)*/)[1] === 't' ||
-        'test'.split(/(?:)/, -1).length !== 4 ||
-        ''.split(/.?/).length ||
-        '.'.split(/()()/).length > 1
-    ) {
-        (function () {
-            var compliantExecNpcg = typeof (/()??/).exec('')[1] === 'undefined'; // NPCG: nonparticipating capturing group
-            var maxSafe32BitInt = Math.pow(2, 32) - 1;
-
-            StringPrototype.split = function (separator, limit) {
-                var string = String(this);
-                if (typeof separator === 'undefined' && limit === 0) {
-                    return [];
-                }
-
-                // If `separator` is not a regex, use native split
-                if (!isRegex(separator)) {
-                    return strSplit(this, separator, limit);
-                }
-
-                var output = [];
-                var flags = (separator.ignoreCase ? 'i' : '') +
-                            (separator.multiline ? 'm' : '') +
-                            (separator.unicode ? 'u' : '') + // in ES6
-                            (separator.sticky ? 'y' : ''), // Firefox 3+ and ES6
-                    lastLastIndex = 0,
-                    // Make `global` and avoid `lastIndex` issues by working with a copy
-                    separator2, match, lastIndex, lastLength;
-                var separatorCopy = new RegExp(separator.source, flags + 'g');
-                if (!compliantExecNpcg) {
-                    // Doesn't need flags gy, but they don't hurt
-                    separator2 = new RegExp('^' + separatorCopy.source + '$(?!\\s)', flags);
-                }
-                /* Values for `limit`, per the spec:
-                 * If undefined: 4294967295 // maxSafe32BitInt
-                 * If 0, Infinity, or NaN: 0
-                 * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
-                 * If negative number: 4294967296 - Math.floor(Math.abs(limit))
-                 * If other: Type-convert, then use the above rules
-                 */
-                var splitLimit = typeof limit === 'undefined' ? maxSafe32BitInt : ES.ToUint32(limit);
-                match = separatorCopy.exec(string);
-                while (match) {
-                    // `separatorCopy.lastIndex` is not reliable cross-browser
-                    lastIndex = match.index + match[0].length;
-                    if (lastIndex > lastLastIndex) {
-                        pushCall(output, strSlice(string, lastLastIndex, match.index));
-                        // Fix browsers whose `exec` methods don't consistently return `undefined` for
-                        // nonparticipating capturing groups
-                        if (!compliantExecNpcg && match.length > 1) {
-                            /* eslint-disable no-loop-func */
-                            match[0].replace(separator2, function () {
-                                for (var i = 1; i < arguments.length - 2; i++) {
-                                    if (typeof arguments[i] === 'undefined') {
-                                        match[i] = void 0;
-                                    }
-                                }
-                            });
-                            /* eslint-enable no-loop-func */
-                        }
-                        if (match.length > 1 && match.index < string.length) {
-                            array_push.apply(output, arraySlice(match, 1));
-                        }
-                        lastLength = match[0].length;
-                        lastLastIndex = lastIndex;
-                        if (output.length >= splitLimit) {
-                            break;
-                        }
-                    }
-                    if (separatorCopy.lastIndex === match.index) {
-                        separatorCopy.lastIndex++; // Avoid an infinite loop
-                    }
-                    match = separatorCopy.exec(string);
-                }
-                if (lastLastIndex === string.length) {
-                    if (lastLength || !separatorCopy.test('')) {
-                        pushCall(output, '');
-                    }
-                } else {
-                    pushCall(output, strSlice(string, lastLastIndex));
-                }
-                return output.length > splitLimit ? arraySlice(output, 0, splitLimit) : output;
-            };
-        }());
-
-    // [bugfix, chrome]
-    // If separator is undefined, then the result array contains just one String,
-    // which is the this value (converted to a String). If limit is not undefined,
-    // then the output array is truncated so that it contains no more than limit
-    // elements.
-    // "0".split(undefined, 0) -> []
-    } else if ('0'.split(void 0, 0).length) {
-        StringPrototype.split = function split(separator, limit) {
-            if (typeof separator === 'undefined' && limit === 0) {
-                return [];
-            }
-            return strSplit(this, separator, limit);
-        };
-    }
-
-    var str_replace = StringPrototype.replace;
-    var replaceReportsGroupsCorrectly = (function () {
-        var groups = [];
-        'x'.replace(/x(.)?/g, function (match, group) {
-            pushCall(groups, group);
-        });
-        return groups.length === 1 && typeof groups[0] === 'undefined';
-    }());
-
-    if (!replaceReportsGroupsCorrectly) {
-        StringPrototype.replace = function replace(searchValue, replaceValue) {
-            var isFn = isCallable(replaceValue);
-            var hasCapturingGroups = isRegex(searchValue) && (/\)[*?]/).test(searchValue.source);
-            if (!isFn || !hasCapturingGroups) {
-                return str_replace.call(this, searchValue, replaceValue);
-            } else {
-                var wrappedReplaceValue = function (match) {
-                    var length = arguments.length;
-                    var originalLastIndex = searchValue.lastIndex;
-                    searchValue.lastIndex = 0;
-                    var args = searchValue.exec(match) || [];
-                    searchValue.lastIndex = originalLastIndex;
-                    pushCall(args, arguments[length - 2], arguments[length - 1]);
-                    return replaceValue.apply(this, args);
-                };
-                return str_replace.call(this, searchValue, wrappedReplaceValue);
-            }
-        };
-    }
-
-    // ECMA-262, 3rd B.2.3
-    // Not an ECMAScript standard, although ECMAScript 3rd Edition has a
-    // non-normative section suggesting uniform semantics and it should be
-    // normalized across all browsers
-    // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
-    var string_substr = StringPrototype.substr;
-    var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';
-    defineProperties(StringPrototype, {
-        substr: function substr(start, length) {
-            var normalizedStart = start;
-            if (start < 0) {
-                normalizedStart = max(this.length + start, 0);
-            }
-            return string_substr.call(this, normalizedStart, length);
-        }
-    }, hasNegativeSubstrBug);
-
-    // ES5 15.5.4.20
-    // whitespace from: http://es5.github.io/#x15.5.4.20
-    var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
-        '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028' +
-        '\u2029\uFEFF';
-    var zeroWidth = '\u200b';
-    var wsRegexChars = '[' + ws + ']';
-    var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');
-    var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');
-    var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());
-    defineProperties(StringPrototype, {
-        // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-        // http://perfectionkills.com/whitespace-deviations/
-        trim: function trim() {
-            if (typeof this === 'undefined' || this === null) {
-                throw new TypeError("can't convert " + this + ' to object');
-            }
-            return $String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');
-        }
-    }, hasTrimWhitespaceBug);
-    var trim = call.bind(String.prototype.trim);
-
-    var hasLastIndexBug = StringPrototype.lastIndexOf && 'abcあい'.lastIndexOf('あい', 2) !== -1;
-    defineProperties(StringPrototype, {
-        lastIndexOf: function lastIndexOf(searchString) {
-            if (typeof this === 'undefined' || this === null) {
-                throw new TypeError("can't convert " + this + ' to object');
-            }
-            var S = $String(this);
-            var searchStr = $String(searchString);
-            var numPos = arguments.length > 1 ? $Number(arguments[1]) : NaN;
-            var pos = isActualNaN(numPos) ? Infinity : ES.ToInteger(numPos);
-            var start = min(max(pos, 0), S.length);
-            var searchLen = searchStr.length;
-            var k = start + searchLen;
-            while (k > 0) {
-                k = max(0, k - searchLen);
-                var index = strIndexOf(strSlice(S, k, start + searchLen), searchStr);
-                if (index !== -1) {
-                    return k + index;
-                }
-            }
-            return -1;
-        }
-    }, hasLastIndexBug);
-
-    var originalLastIndexOf = StringPrototype.lastIndexOf;
-    defineProperties(StringPrototype, {
-        lastIndexOf: function lastIndexOf(searchString) {
-            return originalLastIndexOf.apply(this, arguments);
-        }
-    }, StringPrototype.lastIndexOf.length !== 1);
-
-    // ES-5 15.1.2.2
-    /* eslint-disable radix */
-    if (parseInt(ws + '08') !== 8 || parseInt(ws + '0x16') !== 22) {
-    /* eslint-enable radix */
-        /* global parseInt: true */
-        parseInt = (function (origParseInt) {
-            var hexRegex = /^[\-+]?0[xX]/;
-            return function parseInt(str, radix) {
-                var string = trim(String(str));
-                var defaultedRadix = $Number(radix) || (hexRegex.test(string) ? 16 : 10);
-                return origParseInt(string, defaultedRadix);
-            };
-        }(parseInt));
-    }
-
-    // https://es5.github.io/#x15.1.2.3
-    if (1 / parseFloat('-0') !== -Infinity) {
-        /* global parseFloat: true */
-        parseFloat = (function (origParseFloat) {
-            return function parseFloat(string) {
-                var inputString = trim(String(string));
-                var result = origParseFloat(inputString);
-                return result === 0 && strSlice(inputString, 0, 1) === '-' ? -0 : result;
-            };
-        }(parseFloat));
-    }
-
-    if (String(new RangeError('test')) !== 'RangeError: test') {
-        var errorToStringShim = function toString() {
-            if (typeof this === 'undefined' || this === null) {
-                throw new TypeError("can't convert " + this + ' to object');
-            }
-            var name = this.name;
-            if (typeof name === 'undefined') {
-                name = 'Error';
-            } else if (typeof name !== 'string') {
-                name = $String(name);
-            }
-            var msg = this.message;
-            if (typeof msg === 'undefined') {
-                msg = '';
-            } else if (typeof msg !== 'string') {
-                msg = $String(msg);
-            }
-            if (!name) {
-                return msg;
-            }
-            if (!msg) {
-                return name;
-            }
-            return name + ': ' + msg;
-        };
-        // can't use defineProperties here because of toString enumeration issue in IE <= 8
-        Error.prototype.toString = errorToStringShim;
-    }
-
-    if (supportsDescriptors) {
-        var ensureNonEnumerable = function (obj, prop) {
-            if (isEnum(obj, prop)) {
-                var desc = Object.getOwnPropertyDescriptor(obj, prop);
-                if (desc.configurable) {
-                    desc.enumerable = false;
-                    Object.defineProperty(obj, prop, desc);
-                }
-            }
-        };
-        ensureNonEnumerable(Error.prototype, 'message');
-        if (Error.prototype.message !== '') {
-            Error.prototype.message = '';
-        }
-        ensureNonEnumerable(Error.prototype, 'name');
-    }
-
-    if (String(/a/mig) !== '/a/gim') {
-        var regexToString = function toString() {
-            var str = '/' + this.source + '/';
-            if (this.global) {
-                str += 'g';
-            }
-            if (this.ignoreCase) {
-                str += 'i';
-            }
-            if (this.multiline) {
-                str += 'm';
-            }
-            return str;
-        };
-        // can't use defineProperties here because of toString enumeration issue in IE <= 8
-        RegExp.prototype.toString = regexToString;
-    }
-}));
-
-'use strict';
-/*jslint eqeq: true*/
-
-Handlebars.registerHelper('sanitize', function (text) {
-    var result;
-
-    if (text === undefined) { return ''; }
-
-    result = sanitizeHtml(text, {
-        allowedTags: [ 'div', 'span', 'b', 'i', 'em', 'strong', 'a', 'br', 'table', 'tbody', 'tr', 'th', 'td' ],
-        allowedAttributes: {
-            'div': [ 'class' ],
-            'span': [ 'class' ],
-            'table': [ 'class' ],
-            'td': [ 'class' ],
-            'th': [ 'colspan' ],
-            'a': [ 'href' ]
-        }
-    });
-
-    return new Handlebars.SafeString(result);
-});
-
-Handlebars.registerHelper('renderTextParam', function(param) {
-    var result, type = 'text', idAtt = '';
-    var paramType = param.type || param.schema && param.schema.type || '';
-    var isArray = paramType.toLowerCase() === 'array' || param.allowMultiple;
-    var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\n') : param.default;
-    var name = Handlebars.Utils.escapeExpression(param.name);
-    var valueId = Handlebars.Utils.escapeExpression(param.valueId);
-    paramType = Handlebars.Utils.escapeExpression(paramType);
-
-    var dataVendorExtensions = Object.keys(param).filter(function(property) {
-        // filter X-data- properties
-        return property.match(/^X-data-/i) !== null;
-    }).reduce(function(result, property) {
-        // remove X- from property name, so it results in html attributes like data-foo='bar'
-        return result += ' ' + property.substring(2, property.length) + '=\'' + param[property] + '\'';
-    }, '');
-
-    if(param.format && param.format === 'password') {
-        type = 'password';
-    }
-
-    if(valueId) {
-        idAtt = ' id=\'' + valueId + '\'';
-    }
-
-    if (defaultValue) {
-      defaultValue = sanitizeHtml(defaultValue);
-    } else {
-      defaultValue = '';
-    }
-
-    if(isArray) {
-        result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + name + '\'' + idAtt + dataVendorExtensions;
-        result += ' placeholder=\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\'>';
-        result += defaultValue + '</textarea>';
-    } else {
-        var parameterClass = 'parameter';
-        if(param.required) {
-          parameterClass += ' required';
-        }
-        result = '<input class=\'' + parameterClass + '\' minlength=\'' + (param.required ? 1 : 0) + '\'';
-        result += ' name=\'' + name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'' + idAtt + dataVendorExtensions;
-        result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>';
-    }
-    return new Handlebars.SafeString(result);
-});
-
-Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
-
-    switch (operator) {
-        case '==':
-            return (v1 == v2) ? options.fn(this) : options.inverse(this);
-        case '===':
-            return (v1 === v2) ? options.fn(this) : options.inverse(this);
-        case '<':
-            return (v1 < v2) ? options.fn(this) : options.inverse(this);
-        case '<=':
-            return (v1 <= v2) ? options.fn(this) : options.inverse(this);
-        case '>':
-            return (v1 > v2) ? options.fn(this) : options.inverse(this);
-        case '>=':
-            return (v1 >= v2) ? options.fn(this) : options.inverse(this);
-        case '&&':
-            return (v1 && v2) ? options.fn(this) : options.inverse(this);
-        case '||':
-            return (v1 || v2) ? options.fn(this) : options.inverse(this);
-        default:
-            return options.inverse(this);
-    }
-});
-
-Handlebars.registerHelper('escape', function (value) {
-    var text = Handlebars.Utils.escapeExpression(value);
-
-    return new Handlebars.SafeString(text);
-});
-
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.sanitizeHtml=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){var htmlparser=require("htmlparser2");var extend=require("xtend");var quoteRegexp=require("regexp-quote");function each(obj,cb){if(obj)Object.keys(obj).forEach(function(key){cb(obj[key],key)})}function has(obj,key){return{}.hasOwnProperty.call(obj,key)}module.exports=sanitizeHtml;function sanitizeHtml(html,options,_recursing){var result="";function Frame(tag,attribs){var that=this;this.tag=tag;this.attribs=attribs||{};this.tagPosition=result.length;this.text="";this.updateParentNodeText=function(){if(stack.length){var parentFrame=stack[stack.length-1];parentFrame.text+=that.text}}}if(!options){options=sanitizeHtml.defaults;options.parser=htmlParserDefaults}else{options=extend(sanitizeHtml.defaults,options);if(options.parser){options.parser=extend(htmlParserDefaults,options.parser)}else{options.parser=htmlParserDefaults}}var nonTextTagsArray=options.nonTextTags||["script","style","textarea"];var allowedAttributesMap;var allowedAttributesGlobMap;if(options.allowedAttributes){allowedAttributesMap={};allowedAttributesGlobMap={};each(options.allowedAttributes,function(attributes,tag){allowedAttributesMap[tag]=[];var globRegex=[];attributes.forEach(function(name){if(name.indexOf("*")>=0){globRegex.push(quoteRegexp(name).replace(/\\\*/g,".*"))}else{allowedAttributesMap[tag].push(name)}});allowedAttributesGlobMap[tag]=new RegExp("^("+globRegex.join("|")+")$")})}var allowedClassesMap={};each(options.allowedClasses,function(classes,tag){if(allowedAttributesMap){if(!has(allowedAttributesMap,tag)){allowedAttributesMap[tag]=[]}allowedAttributesMap[tag].push("class")}allowedClassesMap[tag]=classes});var transformTagsMap={};var transformTagsAll;each(options.transformTags,function(transform,tag){var transFun;if(typeof transform==="function"){transFun=transform}else if(typeof transform==="string"){transFun=sanitizeHtml.simpleTransform(transform)}if(tag==="*"){transformTagsAll=transFun}else{transformTagsMap[tag]=transFun}});var depth=0;var stack=[];var skipMap={};var transformMap={};var skipText=false;var skipTextDepth=0;var parser=new htmlparser.Parser({onopentag:function(name,attribs){if(skipText){skipTextDepth++;return}var frame=new Frame(name,attribs);stack.push(frame);var skip=false;var hasText=frame.text?true:false;var transformedTag;if(has(transformTagsMap,name)){transformedTag=transformTagsMap[name](name,attribs);frame.attribs=attribs=transformedTag.attribs;if(transformedTag.text!==undefined){frame.innerText=transformedTag.text}if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(transformTagsAll){transformedTag=transformTagsAll(name,attribs);frame.attribs=attribs=transformedTag.attribs;if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(options.allowedTags&&options.allowedTags.indexOf(name)===-1){skip=true;if(nonTextTagsArray.indexOf(name)!==-1){skipText=true;skipTextDepth=1}skipMap[depth]=true}depth++;if(skip){return}result+="<"+name;if(!allowedAttributesMap||has(allowedAttributesMap,name)||allowedAttributesMap["*"]){each(attribs,function(value,a){if(!allowedAttributesMap||has(allowedAttributesMap,name)&&allowedAttributesMap[name].indexOf(a)!==-1||allowedAttributesMap["*"]&&allowedAttributesMap["*"].indexOf(a)!==-1||has(allowedAttributesGlobMap,name)&&allowedAttributesGlobMap[name].test(a)||allowedAttributesGlobMap["*"]&&allowedAttributesGlobMap["*"].test(a)){if(a==="href"||a==="src"){if(naughtyHref(name,value)){delete frame.attribs[a];return}}if(a==="class"){value=filterClasses(value,allowedClassesMap[name]);if(!value.length){delete frame.attribs[a];return}}result+=" "+a;if(value.length){result+='="'+escapeHtml(value)+'"'}}else{delete frame.attribs[a]}})}if(options.selfClosing.indexOf(name)!==-1){result+=" />"}else{result+=">";if(frame.innerText&&!hasText&&!options.textFilter){result+=frame.innerText}}},ontext:function(text){if(skipText){return}var lastFrame=stack[stack.length-1];var tag;if(lastFrame){tag=lastFrame.tag;text=lastFrame.innerText!==undefined?lastFrame.innerText:text}if(tag==="script"||tag==="style"){result+=text}else{var escaped=escapeHtml(text);if(options.textFilter){result+=options.textFilter(escaped)}else{result+=escaped}}if(stack.length){var frame=stack[stack.length-1];frame.text+=text}},onclosetag:function(name){if(skipText){skipTextDepth--;if(!skipTextDepth){skipText=false}else{return}}var frame=stack.pop();if(!frame){return}skipText=false;depth--;if(skipMap[depth]){delete skipMap[depth];frame.updateParentNodeText();return}if(transformMap[depth]){name=transformMap[depth];delete transformMap[depth]}if(options.exclusiveFilter&&options.exclusiveFilter(frame)){result=result.substr(0,frame.tagPosition);return}frame.updateParentNodeText();if(options.selfClosing.indexOf(name)!==-1){return}result+="</"+name+">"}},options.parser);parser.write(html);parser.end();return result;function escapeHtml(s){if(typeof s!=="string"){s=s+""}return s.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function naughtyHref(name,href){href=href.replace(/[\x00-\x20]+/g,"");href=href.replace(/<\!\-\-.*?\-\-\>/g,"");var matches=href.match(/^([a-zA-Z]+)\:/);if(!matches){return false}var scheme=matches[1].toLowerCase();if(has(options.allowedSchemesByTag,name)){return options.allowedSchemesByTag[name].indexOf(scheme)===-1}return!options.allowedSchemes||options.allowedSchemes.indexOf(scheme)===-1}function filterClasses(classes,allowed){if(!allowed){return classes}classes=classes.split(/\s+/);return classes.filter(function(clss){return allowed.indexOf(clss)!==-1}).join(" ")}}var htmlParserDefaults={decodeEntities:true};sanitizeHtml.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{}};sanitizeHtml.simpleTransform=function(newTagName,newAttribs,merge){merge=merge===undefined?true:merge;newAttribs=newAttribs||{};return function(tagName,attribs){var attrib;if(merge){for(attrib in newAttribs){attribs[attrib]=newAttribs[attrib]}}else{attribs=newAttribs}return{tagName:newTagName,attribs:attribs}}}},{htmlparser2:36,"regexp-quote":54,xtend:58}],2:[function(require,module,exports){"use strict";exports.toByteArray=toByteArray;exports.fromByteArray=fromByteArray;var lookup=[];var revLookup=[];var Arr=typeof Uint8Array!=="undefined"?Uint8Array:Array;function init(){var code="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";for(var i=0,len=code.length;i<len;++i){lookup[i]=code[i];revLookup[code.charCodeAt(i)]=i}revLookup["-".charCodeAt(0)]=62;revLookup["_".charCodeAt(0)]=63}init();function toByteArray(b64){var i,j,l,tmp,placeHolders,arr;var len=b64.length;if(len%4>0){throw new Error("Invalid string. Length must be a multiple of 4")}placeHolders=b64[len-2]==="="?2:b64[len-1]==="="?1:0;arr=new Arr(len*3/4-placeHolders);l=placeHolders>0?len-4:len;var L=0;for(i=0,j=0;i<l;i+=4,j+=3){tmp=revLookup[b64.charCodeAt(i)]<<18|revLookup[b64.charCodeAt(i+1)]<<12|revLookup[b64.charCodeAt(i+2)]<<6|revLookup[b64.charCodeAt(i+3)];arr[L++]=tmp>>16&255;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}if(placeHolders===2){tmp=revLookup[b64.charCodeAt(i)]<<2|revLookup[b64.charCodeAt(i+1)]>>4;arr[L++]=tmp&255}else if(placeHolders===1){tmp=revLookup[b64.charCodeAt(i)]<<10|revLookup[b64.charCodeAt(i+1)]<<4|revLookup[b64.charCodeAt(i+2)]>>2;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}return arr}function tripletToBase64(num){return lookup[num>>18&63]+lookup[num>>12&63]+lookup[num>>6&63]+lookup[num&63]}function encodeChunk(uint8,start,end){var tmp;var output=[];for(var i=start;i<end;i+=3){tmp=(uint8[i]<<16)+(uint8[i+1]<<8)+uint8[i+2];output.push(tripletToBase64(tmp))}return output.join("")}function fromByteArray(uint8){var tmp;var len=uint8.length;var extraBytes=len%3;var output="";var parts=[];var maxChunkLength=16383;for(var i=0,len2=len-extraBytes;i<len2;i+=maxChunkLength){parts.push(encodeChunk(uint8,i,i+maxChunkLength>len2?len2:i+maxChunkLength))}if(extraBytes===1){tmp=uint8[len-1];output+=lookup[tmp>>2];output+=lookup[tmp<<4&63];output+="=="}else if(extraBytes===2){tmp=(uint8[len-2]<<8)+uint8[len-1];output+=lookup[tmp>>10];output+=lookup[tmp>>4&63];output+=lookup[tmp<<2&63];output+="="}parts.push(output);return parts.join("")}},{}],3:[function(require,module,exports){},{}],4:[function(require,module,exports){(function(global){"use strict";var buffer=require("buffer");var Buffer=buffer.Buffer;var SlowBuffer=buffer.SlowBuffer;var MAX_LEN=buffer.kMaxLength||2147483647;exports.alloc=function alloc(size,fill,encoding){if(typeof Buffer.alloc==="function"){return Buffer.alloc(size,fill,encoding)}if(typeof encoding==="number"){throw new TypeError("encoding must not be number")}if(typeof size!=="number"){throw new TypeError("size must be a number")}if(size>MAX_LEN){throw new RangeError("size is too large")}var enc=encoding;var _fill=fill;if(_fill===undefined){enc=undefined;_fill=0}var buf=new Buffer(size);if(typeof _fill==="string"){var fillBuf=new Buffer(_fill,enc);var flen=fillBuf.length;var i=-1;while(++i<size){buf[i]=fillBuf[i%flen]}}else{buf.fill(_fill)}return buf};exports.allocUnsafe=function allocUnsafe(size){if(typeof Buffer.allocUnsafe==="function"){return Buffer.allocUnsafe(size)}if(typeof size!=="number"){throw new TypeError("size must be a number")}if(size>MAX_LEN){throw new RangeError("size is too large")}return new Buffer(size)};exports.from=function from(value,encodingOrOffset,length){if(typeof Buffer.from==="function"&&(!global.Uint8Array||Uint8Array.from!==Buffer.from)){return Buffer.from(value,encodingOrOffset,length)}if(typeof value==="number"){throw new TypeError('"value" argument must not be a number')}if(typeof value==="string"){return new Buffer(value,encodingOrOffset)}if(typeof ArrayBuffer!=="undefined"&&value instanceof ArrayBuffer){var offset=encodingOrOffset;if(arguments.length===1){return new Buffer(value)}if(typeof offset==="undefined"){offset=0}var len=length;if(typeof len==="undefined"){len=value.byteLength-offset}if(offset>=value.byteLength){throw new RangeError("'offset' is out of bounds")}if(len>value.byteLength-offset){throw new RangeError("'length' is out of bounds")}return new Buffer(value.slice(offset,offset+len))}if(Buffer.isBuffer(value)){var out=new Buffer(value.length);value.copy(out,0,0,value.length);return out}if(value){if(Array.isArray(value)||typeof ArrayBuffer!=="undefined"&&value.buffer instanceof ArrayBuffer||"length"in value){return new Buffer(value)}if(value.type==="Buffer"&&Array.isArray(value.data)){return new Buffer(value.data)}}throw new TypeError("First argument must be a string, Buffer, "+"ArrayBuffer, Array, or array-like object.")};exports.allocUnsafeSlow=function allocUnsafeSlow(size){if(typeof Buffer.allocUnsafeSlow==="function"){return Buffer.allocUnsafeSlow(size)}if(typeof size!=="number"){throw new TypeError("size must be a number")}if(size>=MAX_LEN){throw new RangeError("size is too large")}return new SlowBuffer(size)}}).call(this,typeof global!=="undefined"?global:typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{buffer:5}],5:[function(require,module,exports){(function(global){"use strict";var base64=require("base64-js");var ieee754=require("ieee754");var isArray=require("isarray");exports.Buffer=Buffer;exports.SlowBuffer=SlowBuffer;exports.INSPECT_MAX_BYTES=50;Buffer.TYPED_ARRAY_SUPPORT=global.TYPED_ARRAY_SUPPORT!==undefined?global.TYPED_ARRAY_SUPPORT:typedArraySupport();exports.kMaxLength=kMaxLength();function typedArraySupport(){try{var arr=new Uint8Array(1);arr.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}};return arr.foo()===42&&typeof arr.subarray==="function"&&arr.subarray(1,1).byteLength===0}catch(e){return false}}function kMaxLength(){return Buffer.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function createBuffer(that,length){if(kMaxLength()<length){throw new RangeError("Invalid typed array length")}if(Buffer.TYPED_ARRAY_SUPPORT){that=new Uint8Array(length);that.__proto__=Buffer.prototype}else{if(that===null){that=new Buffer(length)}that.length=length}return that}function Buffer(arg,encodingOrOffset,length){if(!Buffer.TYPED_ARRAY_SUPPORT&&!(this instanceof Buffer)){return new Buffer(arg,encodingOrOffset,length)}if(typeof arg==="number"){if(typeof encodingOrOffset==="string"){throw new Error("If encoding is specified then the first argument must be a string")}return allocUnsafe(this,arg)}return from(this,arg,encodingOrOffset,length)}Buffer.poolSize=8192;Buffer._augment=function(arr){arr.__proto__=Buffer.prototype;return arr};function from(that,value,encodingOrOffset,length){if(typeof value==="number"){throw new TypeError('"value" argument must not be a number')}if(typeof ArrayBuffer!=="undefined"&&value instanceof ArrayBuffer){return fromArrayBuffer(that,value,encodingOrOffset,length)}if(typeof value==="string"){return fromString(that,value,encodingOrOffset)}return fromObject(that,value)}Buffer.from=function(value,encodingOrOffset,length){return from(null,value,encodingOrOffset,length)};if(Buffer.TYPED_ARRAY_SUPPORT){Buffer.prototype.__proto__=Uint8Array.prototype;Buffer.__proto__=Uint8Array;if(typeof Symbol!=="undefined"&&Symbol.species&&Buffer[Symbol.species]===Buffer){Object.defineProperty(Buffer,Symbol.species,{value:null,configurable:true})}}function assertSize(size){if(typeof size!=="number"){throw new TypeError('"size" argument must be a number')}else if(size<0){throw new RangeError('"size" argument must not be negative')}}function alloc(that,size,fill,encoding){assertSize(size);if(size<=0){return createBuffer(that,size)}if(fill!==undefined){return typeof encoding==="string"?createBuffer(that,size).fill(fill,encoding):createBuffer(that,size).fill(fill)}return createBuffer(that,size)}Buffer.alloc=function(size,fill,encoding){return alloc(null,size,fill,encoding)};function allocUnsafe(that,size){assertSize(size);that=createBuffer(that,size<0?0:checked(size)|0);if(!Buffer.TYPED_ARRAY_SUPPORT){for(var i=0;i<size;++i){that[i]=0}}return that}Buffer.allocUnsafe=function(size){return allocUnsafe(null,size)};Buffer.allocUnsafeSlow=function(size){return allocUnsafe(null,size)};function fromString(that,string,encoding){if(typeof encoding!=="string"||encoding===""){encoding="utf8"}if(!Buffer.isEncoding(encoding)){throw new TypeError('"encoding" must be a valid string encoding')}var length=byteLength(string,encoding)|0;that=createBuffer(that,length);var actual=that.write(string,encoding);if(actual!==length){that=that.slice(0,actual)}return that}function fromArrayLike(that,array){var length=array.length<0?0:checked(array.length)|0;that=createBuffer(that,length);for(var i=0;i<length;i+=1){that[i]=array[i]&255}return that}function fromArrayBuffer(that,array,byteOffset,length){array.byteLength;if(byteOffset<0||array.byteLength<byteOffset){throw new RangeError("'offset' is out of bounds")}if(array.byteLength<byteOffset+(length||0)){throw new RangeError("'length' is out of bounds")}if(byteOffset===undefined&&length===undefined){array=new Uint8Array(array)}else if(length===undefined){array=new Uint8Array(array,byteOffset)}else{array=new Uint8Array(array,byteOffset,length)}if(Buffer.TYPED_ARRAY_SUPPORT){that=array;that.__proto__=Buffer.prototype}else{that=fromArrayLike(that,array)}return that}function fromObject(that,obj){if(Buffer.isBuffer(obj)){var len=checked(obj.length)|0;that=createBuffer(that,len);if(that.length===0){return that}obj.copy(that,0,0,len);return that}if(obj){if(typeof ArrayBuffer!=="undefined"&&obj.buffer instanceof ArrayBuffer||"length"in obj){if(typeof obj.length!=="number"||isnan(obj.length)){return createBuffer(that,0)}return fromArrayLike(that,obj)}if(obj.type==="Buffer"&&isArray(obj.data)){return fromArrayLike(that,obj.data)}}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function checked(length){if(length>=kMaxLength()){throw new RangeError("Attempt to allocate Buffer larger than maximum "+"size: 0x"+kMaxLength().toString(16)+" bytes")}return length|0}function SlowBuffer(length){if(+length!=length){length=0}return Buffer.alloc(+length)}Buffer.isBuffer=function isBuffer(b){return!!(b!=null&&b._isBuffer)};Buffer.compare=function compare(a,b){if(!Buffer.isBuffer(a)||!Buffer.isBuffer(b)){throw new TypeError("Arguments must be Buffers")}if(a===b)return 0;var x=a.length;var y=b.length;for(var i=0,len=Math.min(x,y);i<len;++i){if(a[i]!==b[i]){x=a[i];y=b[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};Buffer.isEncoding=function isEncoding(encoding){switch(String(encoding).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return true;default:return false}};Buffer.concat=function concat(list,length){if(!isArray(list)){throw new TypeError('"list" argument must be an Array of Buffers')}if(list.length===0){return Buffer.alloc(0)}var i;if(length===undefined){length=0;for(i=0;i<list.length;++i){length+=list[i].length}}var buffer=Buffer.allocUnsafe(length);var pos=0;for(i=0;i<list.length;++i){var buf=list[i];if(!Buffer.isBuffer(buf)){throw new TypeError('"list" argument must be an Array of Buffers')}buf.copy(buffer,pos);pos+=buf.length}return buffer};function byteLength(string,encoding){if(Buffer.isBuffer(string)){return string.length}if(typeof ArrayBuffer!=="undefined"&&typeof ArrayBuffer.isView==="function"&&(ArrayBuffer.isView(string)||string instanceof ArrayBuffer)){return string.byteLength}if(typeof string!=="string"){string=""+string}var len=string.length;if(len===0)return 0;var loweredCase=false;for(;;){switch(encoding){case"ascii":case"latin1":case"binary":return len;case"utf8":case"utf-8":case undefined:return utf8ToBytes(string).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return len*2;case"hex":return len>>>1;case"base64":return base64ToBytes(string).length;default:if(loweredCase)return utf8ToBytes(string).length;encoding=(""+encoding).toLowerCase();loweredCase=true}}}Buffer.byteLength=byteLength;function slowToString(encoding,start,end){var loweredCase=false;if(start===undefined||start<0){start=0}if(start>this.length){return""}if(end===undefined||end>this.length){end=this.length}if(end<=0){return""}end>>>=0;start>>>=0;if(end<=start){return""}if(!encoding)encoding="utf8";while(true){switch(encoding){case"hex":return hexSlice(this,start,end);case"utf8":case"utf-8":return utf8Slice(this,start,end);case"ascii":return asciiSlice(this,start,end);case"latin1":case"binary":return latin1Slice(this,start,end);case"base64":return base64Slice(this,start,end);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return utf16leSlice(this,start,end);default:if(loweredCase)throw new TypeError("Unknown encoding: "+encoding);encoding=(encoding+"").toLowerCase();loweredCase=true}}}Buffer.prototype._isBuffer=true;function swap(b,n,m){var i=b[n];b[n]=b[m];b[m]=i}Buffer.prototype.swap16=function swap16(){var len=this.length;if(len%2!==0){throw new RangeError("Buffer size must be a multiple of 16-bits")}for(var i=0;i<len;i+=2){swap(this,i,i+1)}return this};Buffer.prototype.swap32=function swap32(){var len=this.length;if(len%4!==0){throw new RangeError("Buffer size must be a multiple of 32-bits")}for(var i=0;i<len;i+=4){swap(this,i,i+3);swap(this,i+1,i+2)}return this};Buffer.prototype.swap64=function swap64(){var len=this.length;if(len%8!==0){throw new RangeError("Buffer size must be a multiple of 64-bits")}for(var i=0;i<len;i+=8){swap(this,i,i+7);swap(this,i+1,i+6);swap(this,i+2,i+5);swap(this,i+3,i+4)}return this};Buffer.prototype.toString=function toString(){var length=this.length|0;if(length===0)return"";if(arguments.length===0)return utf8Slice(this,0,length);return slowToString.apply(this,arguments)};Buffer.prototype.equals=function equals(b){if(!Buffer.isBuffer(b))throw new TypeError("Argument must be a Buffer");if(this===b)return true;return Buffer.compare(this,b)===0};Buffer.prototype.inspect=function inspect(){var str="";var max=exports.INSPECT_MAX_BYTES;if(this.length>0){str=this.toString("hex",0,max).match(/.{2}/g).join(" ");if(this.length>max)str+=" ... "}return"<Buffer "+str+">"};Buffer.prototype.compare=function compare(target,start,end,thisStart,thisEnd){if(!Buffer.isBuffer(target)){throw new TypeError("Argument must be a Buffer")}if(start===undefined){start=0}if(end===undefined){end=target?target.length:0}if(thisStart===undefined){thisStart=0}if(thisEnd===undefined){thisEnd=this.length}if(start<0||end>target.length||thisStart<0||thisEnd>this.length){throw new RangeError("out of range index")}if(thisStart>=thisEnd&&start>=end){return 0}if(thisStart>=thisEnd){return-1}if(start>=end){return 1}start>>>=0;end>>>=0;thisStart>>>=0;thisEnd>>>=0;if(this===target)return 0;var x=thisEnd-thisStart;var y=end-start;var len=Math.min(x,y);var thisCopy=this.slice(thisStart,thisEnd);var targetCopy=target.slice(start,end);for(var i=0;i<len;++i){if(thisCopy[i]!==targetCopy[i]){x=thisCopy[i];y=targetCopy[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};function bidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){if(buffer.length===0)return-1;if(typeof byteOffset==="string"){encoding=byteOffset;byteOffset=0}else if(byteOffset>2147483647){byteOffset=2147483647}else if(byteOffset<-2147483648){byteOffset=-2147483648}byteOffset=+byteOffset;if(isNaN(byteOffset)){byteOffset=dir?0:buffer.length-1}if(byteOffset<0)byteOffset=buffer.length+byteOffset;if(byteOffset>=buffer.length){if(dir)return-1;else byteOffset=buffer.length-1}else if(byteOffset<0){if(dir)byteOffset=0;else return-1}if(typeof val==="string"){val=Buffer.from(val,encoding)}if(Buffer.isBuffer(val)){if(val.length===0){return-1}return arrayIndexOf(buffer,val,byteOffset,encoding,dir)}else if(typeof val==="number"){val=val&255;if(Buffer.TYPED_ARRAY_SUPPORT&&typeof Uint8Array.prototype.indexOf==="function"){if(dir){return Uint8Array.prototype.indexOf.call(buffer,val,byteOffset)}else{return Uint8Array.prototype.lastIndexOf.call(buffer,val,byteOffset)}}return arrayIndexOf(buffer,[val],byteOffset,encoding,dir)}throw new TypeError("val must be string, number or Buffer")}function arrayIndexOf(arr,val,byteOffset,encoding,dir){var indexSize=1;var arrLength=arr.length;var valLength=val.length;if(encoding!==undefined){encoding=String(encoding).toLowerCase();if(encoding==="ucs2"||encoding==="ucs-2"||encoding==="utf16le"||encoding==="utf-16le"){if(arr.length<2||val.length<2){return-1}indexSize=2;arrLength/=2;valLength/=2;byteOffset/=2}}function read(buf,i){if(indexSize===1){return buf[i]}else{return buf.readUInt16BE(i*indexSize)}}var i;if(dir){var foundIndex=-1;for(i=byteOffset;i<arrLength;i++){if(read(arr,i)===read(val,foundIndex===-1?0:i-foundIndex)){if(foundIndex===-1)foundIndex=i;if(i-foundIndex+1===valLength)return foundIndex*indexSize}else{if(foundIndex!==-1)i-=i-foundIndex;foundIndex=-1}}}else{if(byteOffset+valLength>arrLength)byteOffset=arrLength-valLength;for(i=byteOffset;i>=0;i--){var found=true;for(var j=0;j<valLength;j++){if(read(arr,i+j)!==read(val,j)){found=false;break}}if(found)return i}}return-1}Buffer.prototype.includes=function includes(val,byteOffset,encoding){return this.indexOf(val,byteOffset,encoding)!==-1};Buffer.prototype.indexOf=function indexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,true)};Buffer.prototype.lastIndexOf=function lastIndexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,false)};function hexWrite(buf,string,offset,length){offset=Number(offset)||0;var remaining=buf.length-offset;if(!length){length=remaining}else{length=Number(length);if(length>remaining){length=remaining}}var strLen=string.length;if(strLen%2!==0)throw new TypeError("Invalid hex string");if(length>strLen/2){length=strLen/2}for(var i=0;i<length;++i){var parsed=parseInt(string.substr(i*2,2),16);if(isNaN(parsed))return i;buf[offset+i]=parsed}return i}function utf8Write(buf,string,offset,length){return blitBuffer(utf8ToBytes(string,buf.length-offset),buf,offset,length)}function asciiWrite(buf,string,offset,length){return blitBuffer(asciiToBytes(string),buf,offset,length)}function latin1Write(buf,string,offset,length){return asciiWrite(buf,string,offset,length)}function base64Write(buf,string,offset,length){return blitBuffer(base64ToBytes(string),buf,offset,length)}function ucs2Write(buf,string,offset,length){return blitBuffer(utf16leToBytes(string,buf.length-offset),buf,offset,length)}Buffer.prototype.write=function write(string,offset,length,encoding){if(offset===undefined){encoding="utf8";length=this.length;offset=0}else if(length===undefined&&typeof offset==="string"){encoding=offset;length=this.length;offset=0}else if(isFinite(offset)){offset=offset|0;if(isFinite(length)){length=length|0;if(encoding===undefined)encoding="utf8"}else{encoding=length;length=undefined}}else{throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported")}var remaining=this.length-offset;if(length===undefined||length>remaining)length=remaining;if(string.length>0&&(length<0||offset<0)||offset>this.length){throw new RangeError("Attempt to write outside buffer bounds")}if(!encoding)encoding="utf8";var loweredCase=false;for(;;){switch(encoding){case"hex":return hexWrite(this,string,offset,length);case"utf8":case"utf-8":return utf8Write(this,string,offset,length);case"ascii":return asciiWrite(this,string,offset,length);case"latin1":case"binary":return latin1Write(this,string,offset,length);case"base64":return base64Write(this,string,offset,length);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return ucs2Write(this,string,offset,length);default:if(loweredCase)throw new TypeError("Unknown encoding: "+encoding);encoding=(""+encoding).toLowerCase();loweredCase=true}}};Buffer.prototype.toJSON=function toJSON(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};function base64Slice(buf,start,end){if(start===0&&end===buf.length){return base64.fromByteArray(buf)}else{return base64.fromByteArray(buf.slice(start,end))}}function utf8Slice(buf,start,end){end=Math.min(buf.length,end);var res=[];var i=start;while(i<end){var firstByte=buf[i];var codePoint=null;var bytesPerSequence=firstByte>239?4:firstByte>223?3:firstByte>191?2:1;if(i+bytesPerSequence<=end){var secondByte,thirdByte,fourthByte,tempCodePoint;switch(bytesPerSequence){case 1:if(firstByte<128){codePoint=firstByte}break;case 2:secondByte=buf[i+1];if((secondByte&192)===128){tempCodePoint=(firstByte&31)<<6|secondByte&63;if(tempCodePoint>127){codePoint=tempCodePoint}}break;case 3:secondByte=buf[i+1];thirdByte=buf[i+2];if((secondByte&192)===128&&(thirdByte&192)===128){tempCodePoint=(firstByte&15)<<12|(secondByte&63)<<6|thirdByte&63;if(tempCodePoint>2047&&(tempCodePoint<55296||tempCodePoint>57343)){codePoint=tempCodePoint}}break;case 4:secondByte=buf[i+1];thirdByte=buf[i+2];fourthByte=buf[i+3];if((secondByte&192)===128&&(thirdByte&192)===128&&(fourthByte&192)===128){tempCodePoint=(firstByte&15)<<18|(secondByte&63)<<12|(thirdByte&63)<<6|fourthByte&63;if(tempCodePoint>65535&&tempCodePoint<1114112){codePoint=tempCodePoint}}}}if(codePoint===null){codePoint=65533;bytesPerSequence=1}else if(codePoint>65535){codePoint-=65536;res.push(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}res.push(codePoint);i+=bytesPerSequence}return decodeCodePointsArray(res)}var MAX_ARGUMENTS_LENGTH=4096;function decodeCodePointsArray(codePoints){var len=codePoints.length;if(len<=MAX_ARGUMENTS_LENGTH){return String.fromCharCode.apply(String,codePoints)}var res="";var i=0;while(i<len){res+=String.fromCharCode.apply(String,codePoints.slice(i,i+=MAX_ARGUMENTS_LENGTH))}return res}function asciiSlice(buf,start,end){var ret="";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i]&127)}return ret}function latin1Slice(buf,start,end){var ret="";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i])}return ret}function hexSlice(buf,start,end){var len=buf.length;if(!start||start<0)start=0;if(!end||end<0||end>len)end=len;var out="";for(var i=start;i<end;++i){out+=toHex(buf[i])}return out}function utf16leSlice(buf,start,end){var bytes=buf.slice(start,end);var res="";for(var i=0;i<bytes.length;i+=2){res+=String.fromCharCode(bytes[i]+bytes[i+1]*256)}return res}Buffer.prototype.slice=function slice(start,end){var len=this.length;start=~~start;end=end===undefined?len:~~end;if(start<0){start+=len;if(start<0)start=0}else if(start>len){start=len}if(end<0){end+=len;if(end<0)end=0}else if(end>len){end=len}if(end<start)end=start;var newBuf;if(Buffer.TYPED_ARRAY_SUPPORT){newBuf=this.subarray(start,end);newBuf.__proto__=Buffer.prototype}else{var sliceLen=end-start;newBuf=new Buffer(sliceLen,undefined);for(var i=0;i<sliceLen;++i){newBuf[i]=this[i+start]}}return newBuf};function checkOffset(offset,ext,length){if(offset%1!==0||offset<0)throw new RangeError("offset is not uint");if(offset+ext>length)throw new RangeError("Trying to access beyond buffer length")}Buffer.prototype.readUIntLE=function readUIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}return val};Buffer.prototype.readUIntBE=function readUIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert){checkOffset(offset,byteLength,this.length)}var val=this[offset+--byteLength];var mul=1;while(byteLength>0&&(mul*=256)){val+=this[offset+--byteLength]*mul}return val};Buffer.prototype.readUInt8=function readUInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);return this[offset]};Buffer.prototype.readUInt16LE=function readUInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]|this[offset+1]<<8};Buffer.prototype.readUInt16BE=function readUInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]<<8|this[offset+1]};Buffer.prototype.readUInt32LE=function readUInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return(this[offset]|this[offset+1]<<8|this[offset+2]<<16)+this[offset+3]*16777216};Buffer.prototype.readUInt32BE=function readUInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]*16777216+(this[offset+1]<<16|this[offset+2]<<8|this[offset+3])};Buffer.prototype.readIntLE=function readIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readIntBE=function readIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);
-var i=byteLength;var mul=1;var val=this[offset+--i];while(i>0&&(mul*=256)){val+=this[offset+--i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readInt8=function readInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);if(!(this[offset]&128))return this[offset];return(255-this[offset]+1)*-1};Buffer.prototype.readInt16LE=function readInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset]|this[offset+1]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt16BE=function readInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset+1]|this[offset]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt32LE=function readInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]|this[offset+1]<<8|this[offset+2]<<16|this[offset+3]<<24};Buffer.prototype.readInt32BE=function readInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]<<24|this[offset+1]<<16|this[offset+2]<<8|this[offset+3]};Buffer.prototype.readFloatLE=function readFloatLE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,true,23,4)};Buffer.prototype.readFloatBE=function readFloatBE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,false,23,4)};Buffer.prototype.readDoubleLE=function readDoubleLE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,true,52,8)};Buffer.prototype.readDoubleBE=function readDoubleBE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,false,52,8)};function checkInt(buf,value,offset,ext,max,min){if(!Buffer.isBuffer(buf))throw new TypeError('"buffer" argument must be a Buffer instance');if(value>max||value<min)throw new RangeError('"value" argument is out of bounds');if(offset+ext>buf.length)throw new RangeError("Index out of range")}Buffer.prototype.writeUIntLE=function writeUIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var mul=1;var i=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUIntBE=function writeUIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var i=byteLength-1;var mul=1;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUInt8=function writeUInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,255,0);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);this[offset]=value&255;return offset+1};function objectWriteUInt16(buf,value,offset,littleEndian){if(value<0)value=65535+value+1;for(var i=0,j=Math.min(buf.length-offset,2);i<j;++i){buf[offset+i]=(value&255<<8*(littleEndian?i:1-i))>>>(littleEndian?i:1-i)*8}}Buffer.prototype.writeUInt16LE=function writeUInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeUInt16BE=function writeUInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};function objectWriteUInt32(buf,value,offset,littleEndian){if(value<0)value=4294967295+value+1;for(var i=0,j=Math.min(buf.length-offset,4);i<j;++i){buf[offset+i]=value>>>(littleEndian?i:3-i)*8&255}}Buffer.prototype.writeUInt32LE=function writeUInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset+3]=value>>>24;this[offset+2]=value>>>16;this[offset+1]=value>>>8;this[offset]=value&255}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeUInt32BE=function writeUInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};Buffer.prototype.writeIntLE=function writeIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=0;var mul=1;var sub=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){if(value<0&&sub===0&&this[offset+i-1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeIntBE=function writeIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=byteLength-1;var mul=1;var sub=0;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){if(value<0&&sub===0&&this[offset+i+1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeInt8=function writeInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,127,-128);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);if(value<0)value=255+value+1;this[offset]=value&255;return offset+1};Buffer.prototype.writeInt16LE=function writeInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeInt16BE=function writeInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};Buffer.prototype.writeInt32LE=function writeInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8;this[offset+2]=value>>>16;this[offset+3]=value>>>24}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeInt32BE=function writeInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(value<0)value=4294967295+value+1;if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};function checkIEEE754(buf,value,offset,ext,max,min){if(offset+ext>buf.length)throw new RangeError("Index out of range");if(offset<0)throw new RangeError("Index out of range")}function writeFloat(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,4,3.4028234663852886e38,-3.4028234663852886e38)}ieee754.write(buf,value,offset,littleEndian,23,4);return offset+4}Buffer.prototype.writeFloatLE=function writeFloatLE(value,offset,noAssert){return writeFloat(this,value,offset,true,noAssert)};Buffer.prototype.writeFloatBE=function writeFloatBE(value,offset,noAssert){return writeFloat(this,value,offset,false,noAssert)};function writeDouble(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,8,1.7976931348623157e308,-1.7976931348623157e308)}ieee754.write(buf,value,offset,littleEndian,52,8);return offset+8}Buffer.prototype.writeDoubleLE=function writeDoubleLE(value,offset,noAssert){return writeDouble(this,value,offset,true,noAssert)};Buffer.prototype.writeDoubleBE=function writeDoubleBE(value,offset,noAssert){return writeDouble(this,value,offset,false,noAssert)};Buffer.prototype.copy=function copy(target,targetStart,start,end){if(!start)start=0;if(!end&&end!==0)end=this.length;if(targetStart>=target.length)targetStart=target.length;if(!targetStart)targetStart=0;if(end>0&&end<start)end=start;if(end===start)return 0;if(target.length===0||this.length===0)return 0;if(targetStart<0){throw new RangeError("targetStart out of bounds")}if(start<0||start>=this.length)throw new RangeError("sourceStart out of bounds");if(end<0)throw new RangeError("sourceEnd out of bounds");if(end>this.length)end=this.length;if(target.length-targetStart<end-start){end=target.length-targetStart+start}var len=end-start;var i;if(this===target&&start<targetStart&&targetStart<end){for(i=len-1;i>=0;--i){target[i+targetStart]=this[i+start]}}else if(len<1e3||!Buffer.TYPED_ARRAY_SUPPORT){for(i=0;i<len;++i){target[i+targetStart]=this[i+start]}}else{Uint8Array.prototype.set.call(target,this.subarray(start,start+len),targetStart)}return len};Buffer.prototype.fill=function fill(val,start,end,encoding){if(typeof val==="string"){if(typeof start==="string"){encoding=start;start=0;end=this.length}else if(typeof end==="string"){encoding=end;end=this.length}if(val.length===1){var code=val.charCodeAt(0);if(code<256){val=code}}if(encoding!==undefined&&typeof encoding!=="string"){throw new TypeError("encoding must be a string")}if(typeof encoding==="string"&&!Buffer.isEncoding(encoding)){throw new TypeError("Unknown encoding: "+encoding)}}else if(typeof val==="number"){val=val&255}if(start<0||this.length<start||this.length<end){throw new RangeError("Out of range index")}if(end<=start){return this}start=start>>>0;end=end===undefined?this.length:end>>>0;if(!val)val=0;var i;if(typeof val==="number"){for(i=start;i<end;++i){this[i]=val}}else{var bytes=Buffer.isBuffer(val)?val:utf8ToBytes(new Buffer(val,encoding).toString());var len=bytes.length;for(i=0;i<end-start;++i){this[i+start]=bytes[i%len]}}return this};var INVALID_BASE64_RE=/[^+\/0-9A-Za-z-_]/g;function base64clean(str){str=stringtrim(str).replace(INVALID_BASE64_RE,"");if(str.length<2)return"";while(str.length%4!==0){str=str+"="}return str}function stringtrim(str){if(str.trim)return str.trim();return str.replace(/^\s+|\s+$/g,"")}function toHex(n){if(n<16)return"0"+n.toString(16);return n.toString(16)}function utf8ToBytes(string,units){units=units||Infinity;var codePoint;var length=string.length;var leadSurrogate=null;var bytes=[];for(var i=0;i<length;++i){codePoint=string.charCodeAt(i);if(codePoint>55295&&codePoint<57344){if(!leadSurrogate){if(codePoint>56319){if((units-=3)>-1)bytes.push(239,191,189);continue}else if(i+1===length){if((units-=3)>-1)bytes.push(239,191,189);continue}leadSurrogate=codePoint;continue}if(codePoint<56320){if((units-=3)>-1)bytes.push(239,191,189);leadSurrogate=codePoint;continue}codePoint=(leadSurrogate-55296<<10|codePoint-56320)+65536}else if(leadSurrogate){if((units-=3)>-1)bytes.push(239,191,189)}leadSurrogate=null;if(codePoint<128){if((units-=1)<0)break;bytes.push(codePoint)}else if(codePoint<2048){if((units-=2)<0)break;bytes.push(codePoint>>6|192,codePoint&63|128)}else if(codePoint<65536){if((units-=3)<0)break;bytes.push(codePoint>>12|224,codePoint>>6&63|128,codePoint&63|128)}else if(codePoint<1114112){if((units-=4)<0)break;bytes.push(codePoint>>18|240,codePoint>>12&63|128,codePoint>>6&63|128,codePoint&63|128)}else{throw new Error("Invalid code point")}}return bytes}function asciiToBytes(str){var byteArray=[];for(var i=0;i<str.length;++i){byteArray.push(str.charCodeAt(i)&255)}return byteArray}function utf16leToBytes(str,units){var c,hi,lo;var byteArray=[];for(var i=0;i<str.length;++i){if((units-=2)<0)break;c=str.charCodeAt(i);hi=c>>8;lo=c%256;byteArray.push(lo);byteArray.push(hi)}return byteArray}function base64ToBytes(str){return base64.toByteArray(base64clean(str))}function blitBuffer(src,dst,offset,length){for(var i=0;i<length;++i){if(i+offset>=dst.length||i>=src.length)break;dst[i+offset]=src[i]}return i}function isnan(val){return val!==val}}).call(this,typeof global!=="undefined"?global:typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"base64-js":2,ieee754:37,isarray:40}],6:[function(require,module,exports){(function(Buffer){function isArray(arg){if(Array.isArray){return Array.isArray(arg)}return objectToString(arg)==="[object Array]"}exports.isArray=isArray;function isBoolean(arg){return typeof arg==="boolean"}exports.isBoolean=isBoolean;function isNull(arg){return arg===null}exports.isNull=isNull;function isNullOrUndefined(arg){return arg==null}exports.isNullOrUndefined=isNullOrUndefined;function isNumber(arg){return typeof arg==="number"}exports.isNumber=isNumber;function isString(arg){return typeof arg==="string"}exports.isString=isString;function isSymbol(arg){return typeof arg==="symbol"}exports.isSymbol=isSymbol;function isUndefined(arg){return arg===void 0}exports.isUndefined=isUndefined;function isRegExp(re){return objectToString(re)==="[object RegExp]"}exports.isRegExp=isRegExp;function isObject(arg){return typeof arg==="object"&&arg!==null}exports.isObject=isObject;function isDate(d){return objectToString(d)==="[object Date]"}exports.isDate=isDate;function isError(e){return objectToString(e)==="[object Error]"||e instanceof Error}exports.isError=isError;function isFunction(arg){return typeof arg==="function"}exports.isFunction=isFunction;function isPrimitive(arg){return arg===null||typeof arg==="boolean"||typeof arg==="number"||typeof arg==="string"||typeof arg==="symbol"||typeof arg==="undefined"}exports.isPrimitive=isPrimitive;exports.isBuffer=Buffer.isBuffer;function objectToString(o){return Object.prototype.toString.call(o)}}).call(this,{isBuffer:require("../../is-buffer/index.js")})},{"../../is-buffer/index.js":39}],7:[function(require,module,exports){var ElementType=require("domelementtype");var entities=require("entities");var booleanAttributes={__proto__:null,allowfullscreen:true,async:true,autofocus:true,autoplay:true,checked:true,controls:true,default:true,defer:true,disabled:true,hidden:true,ismap:true,loop:true,multiple:true,muted:true,open:true,readonly:true,required:true,reversed:true,scoped:true,seamless:true,selected:true,typemustmatch:true};var unencodedElements={__proto__:null,style:true,script:true,xmp:true,iframe:true,noembed:true,noframes:true,plaintext:true,noscript:true};function formatAttrs(attributes,opts){if(!attributes)return;var output="",value;for(var key in attributes){value=attributes[key];if(output){output+=" "}if(!value&&booleanAttributes[key]){output+=key}else{output+=key+'="'+(opts.decodeEntities?entities.encodeXML(value):value)+'"'}}return output}var singleTag={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true};var render=module.exports=function(dom,opts){if(!Array.isArray(dom)&&!dom.cheerio)dom=[dom];opts=opts||{};var output="";for(var i=0;i<dom.length;i++){var elem=dom[i];if(elem.type==="root")output+=render(elem.children,opts);else if(ElementType.isTag(elem))output+=renderTag(elem,opts);else if(elem.type===ElementType.Directive)output+=renderDirective(elem);else if(elem.type===ElementType.Comment)output+=renderComment(elem);else if(elem.type===ElementType.CDATA)output+=renderCdata(elem);else output+=renderText(elem,opts)}return output};function renderTag(elem,opts){if(elem.name==="svg")opts={decodeEntities:opts.decodeEntities,xmlMode:true};var tag="<"+elem.name,attribs=formatAttrs(elem.attribs,opts);if(attribs){tag+=" "+attribs}if(opts.xmlMode&&(!elem.children||elem.children.length===0)){tag+="/>"}else{tag+=">";if(elem.children){tag+=render(elem.children,opts)}if(!singleTag[elem.name]||opts.xmlMode){tag+="</"+elem.name+">"}}return tag}function renderDirective(elem){return"<"+elem.data+">"}function renderText(elem,opts){var data=elem.data||"";if(opts.decodeEntities&&!(elem.parent&&elem.parent.name in unencodedElements)){data=entities.encodeXML(data)}return data}function renderCdata(elem){return"<![CDATA["+elem.children[0].data+"]]>"}function renderComment(elem){return"<!--"+elem.data+"-->"}},{domelementtype:8,entities:20}],8:[function(require,module,exports){module.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(elem){return elem.type==="tag"||elem.type==="script"||elem.type==="style"}}},{}],9:[function(require,module,exports){module.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(elem){return elem.type==="tag"||elem.type==="script"||elem.type==="style"}}},{}],10:[function(require,module,exports){var ElementType=require("domelementtype");var re_whitespace=/\s+/g;var NodePrototype=require("./lib/node");var ElementPrototype=require("./lib/element");function DomHandler(callback,options,elementCB){if(typeof callback==="object"){elementCB=options;options=callback;callback=null}else if(typeof options==="function"){elementCB=options;options=defaultOpts}this._callback=callback;this._options=options||defaultOpts;this._elementCB=elementCB;this.dom=[];this._done=false;this._tagStack=[];this._parser=this._parser||null}var defaultOpts={normalizeWhitespace:false,withStartIndices:false};DomHandler.prototype.onparserinit=function(parser){this._parser=parser};DomHandler.prototype.onreset=function(){DomHandler.call(this,this._callback,this._options,this._elementCB)};DomHandler.prototype.onend=function(){if(this._done)return;this._done=true;this._parser=null;this._handleCallback(null)};DomHandler.prototype._handleCallback=DomHandler.prototype.onerror=function(error){if(typeof this._callback==="function"){this._callback(error,this.dom)}else{if(error)throw error}};DomHandler.prototype.onclosetag=function(){var elem=this._tagStack.pop();if(this._elementCB)this._elementCB(elem)};DomHandler.prototype._addDomElement=function(element){var parent=this._tagStack[this._tagStack.length-1];var siblings=parent?parent.children:this.dom;var previousSibling=siblings[siblings.length-1];element.next=null;if(this._options.withStartIndices){element.startIndex=this._parser.startIndex}if(this._options.withDomLvl1){element.__proto__=element.type==="tag"?ElementPrototype:NodePrototype}if(previousSibling){element.prev=previousSibling;previousSibling.next=element}else{element.prev=null}siblings.push(element);element.parent=parent||null};DomHandler.prototype.onopentag=function(name,attribs){var element={type:name==="script"?ElementType.Script:name==="style"?ElementType.Style:ElementType.Tag,name:name,attribs:attribs,children:[]};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.ontext=function(data){var normalize=this._options.normalizeWhitespace||this._options.ignoreWhitespace;var lastTag;if(!this._tagStack.length&&this.dom.length&&(lastTag=this.dom[this.dom.length-1]).type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace," ")}else{lastTag.data+=data}}else{if(this._tagStack.length&&(lastTag=this._tagStack[this._tagStack.length-1])&&(lastTag=lastTag.children[lastTag.children.length-1])&&lastTag.type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace," ")}else{lastTag.data+=data}}else{if(normalize){data=data.replace(re_whitespace," ")}this._addDomElement({data:data,type:ElementType.Text})}}};DomHandler.prototype.oncomment=function(data){var lastTag=this._tagStack[this._tagStack.length-1];if(lastTag&&lastTag.type===ElementType.Comment){lastTag.data+=data;return}var element={data:data,type:ElementType.Comment};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncdatastart=function(){var element={children:[{data:"",type:ElementType.Text}],type:ElementType.CDATA};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncommentend=DomHandler.prototype.oncdataend=function(){this._tagStack.pop()};DomHandler.prototype.onprocessinginstruction=function(name,data){this._addDomElement({name:name,data:data,type:ElementType.Directive})};module.exports=DomHandler},{"./lib/element":11,"./lib/node":12,domelementtype:9}],11:[function(require,module,exports){var NodePrototype=require("./node");var ElementPrototype=module.exports=Object.create(NodePrototype);var domLvl1={tagName:"name"};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(ElementPrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{"./node":12}],12:[function(require,module,exports){var NodePrototype=module.exports={get firstChild(){var children=this.children;return children&&children[0]||null},get lastChild(){var children=this.children;return children&&children[children.length-1]||null},get nodeType(){return nodeTypes[this.type]||nodeTypes.element}};var domLvl1={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"};var nodeTypes={element:1,text:3,cdata:4,comment:8};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(NodePrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{}],13:[function(require,module,exports){var DomUtils=module.exports;[require("./lib/stringify"),require("./lib/traversal"),require("./lib/manipulation"),require("./lib/querying"),require("./lib/legacy"),require("./lib/helpers")].forEach(function(ext){Object.keys(ext).forEach(function(key){DomUtils[key]=ext[key].bind(DomUtils)})})},{"./lib/helpers":14,"./lib/legacy":15,"./lib/manipulation":16,"./lib/querying":17,"./lib/stringify":18,"./lib/traversal":19}],14:[function(require,module,exports){exports.removeSubsets=function(nodes){var idx=nodes.length,node,ancestor,replace;while(--idx>-1){node=ancestor=nodes[idx];nodes[idx]=null;replace=true;while(ancestor){if(nodes.indexOf(ancestor)>-1){replace=false;nodes.splice(idx,1);break}ancestor=ancestor.parent}if(replace){nodes[idx]=node}}return nodes};var POSITION={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16};var comparePos=exports.compareDocumentPosition=function(nodeA,nodeB){var aParents=[];var bParents=[];var current,sharedParent,siblings,aSibling,bSibling,idx;if(nodeA===nodeB){return 0}current=nodeA;while(current){aParents.unshift(current);current=current.parent}current=nodeB;while(current){bParents.unshift(current);current=current.parent}idx=0;while(aParents[idx]===bParents[idx]){idx++}if(idx===0){return POSITION.DISCONNECTED}sharedParent=aParents[idx-1];siblings=sharedParent.children;aSibling=aParents[idx];bSibling=bParents[idx];if(siblings.indexOf(aSibling)>siblings.indexOf(bSibling)){if(sharedParent===nodeB){return POSITION.FOLLOWING|POSITION.CONTAINED_BY}return POSITION.FOLLOWING}else{if(sharedParent===nodeA){return POSITION.PRECEDING|POSITION.CONTAINS}return POSITION.PRECEDING}};exports.uniqueSort=function(nodes){var idx=nodes.length,node,position;nodes=nodes.slice();while(--idx>-1){node=nodes[idx];position=nodes.indexOf(node);if(position>-1&&position<idx){nodes.splice(idx,1)}}nodes.sort(function(a,b){var relative=comparePos(a,b);if(relative&POSITION.PRECEDING){return-1}else if(relative&POSITION.FOLLOWING){return 1}return 0});return nodes}},{}],15:[function(require,module,exports){var ElementType=require("domelementtype");var isTag=exports.isTag=ElementType.isTag;exports.testElement=function(options,element){for(var key in options){if(!options.hasOwnProperty(key));else if(key==="tag_name"){if(!isTag(element)||!options.tag_name(element.name)){return false}}else if(key==="tag_type"){if(!options.tag_type(element.type))return false}else if(key==="tag_contains"){if(isTag(element)||!options.tag_contains(element.data)){return false}}else if(!element.attribs||!options[key](element.attribs[key])){return false}}return true};var Checks={tag_name:function(name){if(typeof name==="function"){return function(elem){return isTag(elem)&&name(elem.name)}}else if(name==="*"){return isTag}else{return function(elem){return isTag(elem)&&elem.name===name}}},tag_type:function(type){if(typeof type==="function"){return function(elem){return type(elem.type)}}else{return function(elem){return elem.type===type}}},tag_contains:function(data){if(typeof data==="function"){return function(elem){return!isTag(elem)&&data(elem.data)}}else{return function(elem){return!isTag(elem)&&elem.data===data}}}};function getAttribCheck(attrib,value){if(typeof value==="function"){return function(elem){return elem.attribs&&value(elem.attribs[attrib])}}else{return function(elem){return elem.attribs&&elem.attribs[attrib]===value}}}function combineFuncs(a,b){return function(elem){return a(elem)||b(elem)}}exports.getElements=function(options,element,recurse,limit){var funcs=Object.keys(options).map(function(key){var value=options[key];return key in Checks?Checks[key](value):getAttribCheck(key,value)});return funcs.length===0?[]:this.filter(funcs.reduce(combineFuncs),element,recurse,limit)};exports.getElementById=function(id,element,recurse){if(!Array.isArray(element))element=[element];return this.findOne(getAttribCheck("id",id),element,recurse!==false)};exports.getElementsByTagName=function(name,element,recurse,limit){return this.filter(Checks.tag_name(name),element,recurse,limit)};exports.getElementsByTagType=function(type,element,recurse,limit){return this.filter(Checks.tag_type(type),element,recurse,limit)}},{domelementtype:9}],16:[function(require,module,exports){exports.removeElement=function(elem){if(elem.prev)elem.prev.next=elem.next;if(elem.next)elem.next.prev=elem.prev;if(elem.parent){var childs=elem.parent.children;childs.splice(childs.lastIndexOf(elem),1)}};exports.replaceElement=function(elem,replacement){var prev=replacement.prev=elem.prev;if(prev){prev.next=replacement}var next=replacement.next=elem.next;if(next){next.prev=replacement}var parent=replacement.parent=elem.parent;if(parent){var childs=parent.children;childs[childs.lastIndexOf(elem)]=replacement}};exports.appendChild=function(elem,child){child.parent=elem;if(elem.children.push(child)!==1){var sibling=elem.children[elem.children.length-2];sibling.next=child;child.prev=sibling;child.next=null}};exports.append=function(elem,next){var parent=elem.parent,currNext=elem.next;next.next=currNext;next.prev=elem;elem.next=next;next.parent=parent;if(currNext){currNext.prev=next;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(currNext),0,next)}}else if(parent){parent.children.push(next)}};exports.prepend=function(elem,prev){var parent=elem.parent;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(elem),0,prev)}if(elem.prev){elem.prev.next=prev}prev.parent=parent;prev.prev=elem.prev;prev.next=elem;elem.prev=prev}},{}],17:[function(require,module,exports){var isTag=require("domelementtype").isTag;module.exports={filter:filter,find:find,findOneChild:findOneChild,findOne:findOne,existsOne:existsOne,findAll:findAll};function filter(test,element,recurse,limit){if(!Array.isArray(element))element=[element];if(typeof limit!=="number"||!isFinite(limit)){limit=Infinity}return find(test,element,recurse!==false,limit)}function find(test,elems,recurse,limit){var result=[],childs;for(var i=0,j=elems.length;i<j;i++){if(test(elems[i])){result.push(elems[i]);if(--limit<=0)break}childs=elems[i].children;if(recurse&&childs&&childs.length>0){childs=find(test,childs,recurse,limit);result=result.concat(childs);limit-=childs.length;if(limit<=0)break}}return result}function findOneChild(test,elems){for(var i=0,l=elems.length;i<l;i++){if(test(elems[i]))return elems[i]}return null}function findOne(test,elems){var elem=null;for(var i=0,l=elems.length;i<l&&!elem;i++){if(!isTag(elems[i])){continue}else if(test(elems[i])){elem=elems[i]}else if(elems[i].children.length>0){elem=findOne(test,elems[i].children)}}return elem}function existsOne(test,elems){for(var i=0,l=elems.length;i<l;i++){if(isTag(elems[i])&&(test(elems[i])||elems[i].children.length>0&&existsOne(test,elems[i].children))){return true}}return false}function findAll(test,elems){var result=[];for(var i=0,j=elems.length;i<j;i++){if(!isTag(elems[i]))continue;if(test(elems[i]))result.push(elems[i]);if(elems[i].children.length>0){result=result.concat(findAll(test,elems[i].children))}}return result}},{domelementtype:9}],18:[function(require,module,exports){var ElementType=require("domelementtype"),getOuterHTML=require("dom-serializer"),isTag=ElementType.isTag;module.exports={getInnerHTML:getInnerHTML,getOuterHTML:getOuterHTML,getText:getText};function getInnerHTML(elem,opts){return elem.children?elem.children.map(function(elem){return getOuterHTML(elem,opts)}).join(""):""}function getText(elem){if(Array.isArray(elem))return elem.map(getText).join("");if(isTag(elem)||elem.type===ElementType.CDATA)return getText(elem.children);if(elem.type===ElementType.Text)return elem.data;return""}},{"dom-serializer":7,domelementtype:9}],19:[function(require,module,exports){var getChildren=exports.getChildren=function(elem){return elem.children};var getParent=exports.getParent=function(elem){return elem.parent};exports.getSiblings=function(elem){var parent=getParent(elem);return parent?getChildren(parent):[elem]};exports.getAttributeValue=function(elem,name){return elem.attribs&&elem.attribs[name]};exports.hasAttrib=function(elem,name){return!!elem.attribs&&hasOwnProperty.call(elem.attribs,name)};exports.getName=function(elem){return elem.name}},{}],20:[function(require,module,exports){var encode=require("./lib/encode.js"),decode=require("./lib/decode.js");exports.decode=function(data,level){return(!level||level<=0?decode.XML:decode.HTML)(data)};exports.decodeStrict=function(data,level){return(!level||level<=0?decode.XML:decode.HTMLStrict)(data)};exports.encode=function(data,level){return(!level||level<=0?encode.XML:encode.HTML)(data)};exports.encodeXML=encode.XML;exports.encodeHTML4=exports.encodeHTML5=exports.encodeHTML=encode.HTML;exports.decodeXML=exports.decodeXMLStrict=decode.XML;exports.decodeHTML4=exports.decodeHTML5=exports.decodeHTML=decode.HTML;exports.decodeHTML4Strict=exports.decodeHTML5Strict=exports.decodeHTMLStrict=decode.HTMLStrict;exports.escape=encode.escape},{"./lib/decode.js":21,"./lib/encode.js":23}],21:[function(require,module,exports){var entityMap=require("../maps/entities.json"),legacyMap=require("../maps/legacy.json"),xmlMap=require("../maps/xml.json"),decodeCodePoint=require("./decode_codepoint.js");var decodeXMLStrict=getStrictDecoder(xmlMap),decodeHTMLStrict=getStrictDecoder(entityMap);function getStrictDecoder(map){var keys=Object.keys(map).join("|"),replace=getReplacer(map);keys+="|#[xX][\\da-fA-F]+|#\\d+";var re=new RegExp("&(?:"+keys+");","g");return function(str){return String(str).replace(re,replace)}}var decodeHTML=function(){var legacy=Object.keys(legacyMap).sort(sorter);var keys=Object.keys(entityMap).sort(sorter);for(var i=0,j=0;i<keys.length;i++){if(legacy[j]===keys[i]){keys[i]+=";?";j++}else{keys[i]+=";"}}var re=new RegExp("&(?:"+keys.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),replace=getReplacer(entityMap);function replacer(str){if(str.substr(-1)!==";")str+=";";return replace(str)}return function(str){return String(str).replace(re,replacer)}}();function sorter(a,b){return a<b?1:-1}function getReplacer(map){return function replace(str){if(str.charAt(1)==="#"){if(str.charAt(2)==="X"||str.charAt(2)==="x"){return decodeCodePoint(parseInt(str.substr(3),16))}return decodeCodePoint(parseInt(str.substr(2),10))}return map[str.slice(1,-1)];
-}}module.exports={XML:decodeXMLStrict,HTML:decodeHTML,HTMLStrict:decodeHTMLStrict}},{"../maps/entities.json":25,"../maps/legacy.json":26,"../maps/xml.json":27,"./decode_codepoint.js":22}],22:[function(require,module,exports){var decodeMap=require("../maps/decode.json");module.exports=decodeCodePoint;function decodeCodePoint(codePoint){if(codePoint>=55296&&codePoint<=57343||codePoint>1114111){return"�"}if(codePoint in decodeMap){codePoint=decodeMap[codePoint]}var output="";if(codePoint>65535){codePoint-=65536;output+=String.fromCharCode(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}output+=String.fromCharCode(codePoint);return output}},{"../maps/decode.json":24}],23:[function(require,module,exports){var inverseXML=getInverseObj(require("../maps/xml.json")),xmlReplacer=getInverseReplacer(inverseXML);exports.XML=getInverse(inverseXML,xmlReplacer);var inverseHTML=getInverseObj(require("../maps/entities.json")),htmlReplacer=getInverseReplacer(inverseHTML);exports.HTML=getInverse(inverseHTML,htmlReplacer);function getInverseObj(obj){return Object.keys(obj).sort().reduce(function(inverse,name){inverse[obj[name]]="&"+name+";";return inverse},{})}function getInverseReplacer(inverse){var single=[],multiple=[];Object.keys(inverse).forEach(function(k){if(k.length===1){single.push("\\"+k)}else{multiple.push(k)}});multiple.unshift("["+single.join("")+"]");return new RegExp(multiple.join("|"),"g")}var re_nonASCII=/[^\0-\x7F]/g,re_astralSymbols=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g;function singleCharReplacer(c){return"&#x"+c.charCodeAt(0).toString(16).toUpperCase()+";"}function astralReplacer(c){var high=c.charCodeAt(0);var low=c.charCodeAt(1);var codePoint=(high-55296)*1024+low-56320+65536;return"&#x"+codePoint.toString(16).toUpperCase()+";"}function getInverse(inverse,re){function func(name){return inverse[name]}return function(data){return data.replace(re,func).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}}var re_xmlChars=getInverseReplacer(inverseXML);function escapeXML(data){return data.replace(re_xmlChars,singleCharReplacer).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}exports.escape=escapeXML},{"../maps/entities.json":25,"../maps/xml.json":27}],24:[function(require,module,exports){module.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},{}],25:[function(require,module,exports){module.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅",in:"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺",int:"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},{}],26:[function(require,module,exports){module.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},{}],27:[function(require,module,exports){module.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},{}],28:[function(require,module,exports){function EventEmitter(){this._events=this._events||{};this._maxListeners=this._maxListeners||undefined}module.exports=EventEmitter;EventEmitter.EventEmitter=EventEmitter;EventEmitter.prototype._events=undefined;EventEmitter.prototype._maxListeners=undefined;EventEmitter.defaultMaxListeners=10;EventEmitter.prototype.setMaxListeners=function(n){if(!isNumber(n)||n<0||isNaN(n))throw TypeError("n must be a positive number");this._maxListeners=n;return this};EventEmitter.prototype.emit=function(type){var er,handler,len,args,i,listeners;if(!this._events)this._events={};if(type==="error"){if(!this._events.error||isObject(this._events.error)&&!this._events.error.length){er=arguments[1];if(er instanceof Error){throw er}else{var err=new Error('Uncaught, unspecified "error" event. ('+er+")");err.context=er;throw err}}}handler=this._events[type];if(isUndefined(handler))return false;if(isFunction(handler)){switch(arguments.length){case 1:handler.call(this);break;case 2:handler.call(this,arguments[1]);break;case 3:handler.call(this,arguments[1],arguments[2]);break;default:args=Array.prototype.slice.call(arguments,1);handler.apply(this,args)}}else if(isObject(handler)){args=Array.prototype.slice.call(arguments,1);listeners=handler.slice();len=listeners.length;for(i=0;i<len;i++)listeners[i].apply(this,args)}return true};EventEmitter.prototype.addListener=function(type,listener){var m;if(!isFunction(listener))throw TypeError("listener must be a function");if(!this._events)this._events={};if(this._events.newListener)this.emit("newListener",type,isFunction(listener.listener)?listener.listener:listener);if(!this._events[type])this._events[type]=listener;else if(isObject(this._events[type]))this._events[type].push(listener);else this._events[type]=[this._events[type],listener];if(isObject(this._events[type])&&!this._events[type].warned){if(!isUndefined(this._maxListeners)){m=this._maxListeners}else{m=EventEmitter.defaultMaxListeners}if(m&&m>0&&this._events[type].length>m){this._events[type].warned=true;console.error("(node) warning: possible EventEmitter memory "+"leak detected. %d listeners added. "+"Use emitter.setMaxListeners() to increase limit.",this._events[type].length);if(typeof console.trace==="function"){console.trace()}}}return this};EventEmitter.prototype.on=EventEmitter.prototype.addListener;EventEmitter.prototype.once=function(type,listener){if(!isFunction(listener))throw TypeError("listener must be a function");var fired=false;function g(){this.removeListener(type,g);if(!fired){fired=true;listener.apply(this,arguments)}}g.listener=listener;this.on(type,g);return this};EventEmitter.prototype.removeListener=function(type,listener){var list,position,length,i;if(!isFunction(listener))throw TypeError("listener must be a function");if(!this._events||!this._events[type])return this;list=this._events[type];length=list.length;position=-1;if(list===listener||isFunction(list.listener)&&list.listener===listener){delete this._events[type];if(this._events.removeListener)this.emit("removeListener",type,listener)}else if(isObject(list)){for(i=length;i-- >0;){if(list[i]===listener||list[i].listener&&list[i].listener===listener){position=i;break}}if(position<0)return this;if(list.length===1){list.length=0;delete this._events[type]}else{list.splice(position,1);
-}if(this._events.removeListener)this.emit("removeListener",type,listener)}return this};EventEmitter.prototype.removeAllListeners=function(type){var key,listeners;if(!this._events)return this;if(!this._events.removeListener){if(arguments.length===0)this._events={};else if(this._events[type])delete this._events[type];return this}if(arguments.length===0){for(key in this._events){if(key==="removeListener")continue;this.removeAllListeners(key)}this.removeAllListeners("removeListener");this._events={};return this}listeners=this._events[type];if(isFunction(listeners)){this.removeListener(type,listeners)}else if(listeners){while(listeners.length)this.removeListener(type,listeners[listeners.length-1])}delete this._events[type];return this};EventEmitter.prototype.listeners=function(type){var ret;if(!this._events||!this._events[type])ret=[];else if(isFunction(this._events[type]))ret=[this._events[type]];else ret=this._events[type].slice();return ret};EventEmitter.prototype.listenerCount=function(type){if(this._events){var evlistener=this._events[type];if(isFunction(evlistener))return 1;else if(evlistener)return evlistener.length}return 0};EventEmitter.listenerCount=function(emitter,type){return emitter.listenerCount(type)};function isFunction(arg){return typeof arg==="function"}function isNumber(arg){return typeof arg==="number"}function isObject(arg){return typeof arg==="object"&&arg!==null}function isUndefined(arg){return arg===void 0}},{}],29:[function(require,module,exports){module.exports=CollectingHandler;function CollectingHandler(cbs){this._cbs=cbs||{};this.events=[]}var EVENTS=require("./").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name="on"+name;CollectingHandler.prototype[name]=function(){this.events.push([name]);if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name="on"+name;CollectingHandler.prototype[name]=function(a){this.events.push([name,a]);if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name="on"+name;CollectingHandler.prototype[name]=function(a,b){this.events.push([name,a,b]);if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error("wrong number of arguments")}});CollectingHandler.prototype.onreset=function(){this.events=[];if(this._cbs.onreset)this._cbs.onreset()};CollectingHandler.prototype.restart=function(){if(this._cbs.onreset)this._cbs.onreset();for(var i=0,len=this.events.length;i<len;i++){if(this._cbs[this.events[i][0]]){var num=this.events[i].length;if(num===1){this._cbs[this.events[i][0]]()}else if(num===2){this._cbs[this.events[i][0]](this.events[i][1])}else{this._cbs[this.events[i][0]](this.events[i][1],this.events[i][2])}}}}},{"./":36}],30:[function(require,module,exports){var index=require("./index.js"),DomHandler=index.DomHandler,DomUtils=index.DomUtils;function FeedHandler(callback,options){this.init(callback,options)}require("inherits")(FeedHandler,DomHandler);FeedHandler.prototype.init=DomHandler;function getElements(what,where){return DomUtils.getElementsByTagName(what,where,true)}function getOneElement(what,where){return DomUtils.getElementsByTagName(what,where,true,1)[0]}function fetch(what,where,recurse){return DomUtils.getText(DomUtils.getElementsByTagName(what,where,recurse,1)).trim()}function addConditionally(obj,prop,what,where,recurse){var tmp=fetch(what,where,recurse);if(tmp)obj[prop]=tmp}var isValidFeed=function(value){return value==="rss"||value==="feed"||value==="rdf:RDF"};FeedHandler.prototype.onend=function(){var feed={},feedRoot=getOneElement(isValidFeed,this.dom),tmp,childs;if(feedRoot){if(feedRoot.name==="feed"){childs=feedRoot.children;feed.type="atom";addConditionally(feed,"id","id",childs);addConditionally(feed,"title","title",childs);if((tmp=getOneElement("link",childs))&&(tmp=tmp.attribs)&&(tmp=tmp.href))feed.link=tmp;addConditionally(feed,"description","subtitle",childs);if(tmp=fetch("updated",childs))feed.updated=new Date(tmp);addConditionally(feed,"author","email",childs,true);feed.items=getElements("entry",childs).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,"id","id",item);addConditionally(entry,"title","title",item);if((tmp=getOneElement("link",item))&&(tmp=tmp.attribs)&&(tmp=tmp.href))entry.link=tmp;if(tmp=fetch("summary",item)||fetch("content",item))entry.description=tmp;if(tmp=fetch("updated",item))entry.pubDate=new Date(tmp);return entry})}else{childs=getOneElement("channel",feedRoot.children).children;feed.type=feedRoot.name.substr(0,3);feed.id="";addConditionally(feed,"title","title",childs);addConditionally(feed,"link","link",childs);addConditionally(feed,"description","description",childs);if(tmp=fetch("lastBuildDate",childs))feed.updated=new Date(tmp);addConditionally(feed,"author","managingEditor",childs,true);feed.items=getElements("item",feedRoot.children).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,"id","guid",item);addConditionally(entry,"title","title",item);addConditionally(entry,"link","link",item);addConditionally(entry,"description","description",item);if(tmp=fetch("pubDate",item))entry.pubDate=new Date(tmp);return entry})}}this.dom=feed;DomHandler.prototype._handleCallback.call(this,feedRoot?null:Error("couldn't find root of feed"))};module.exports=FeedHandler},{"./index.js":36,inherits:38}],31:[function(require,module,exports){var Tokenizer=require("./Tokenizer.js");var formTags={input:true,option:true,optgroup:true,select:true,button:true,datalist:true,textarea:true};var openImpliesClose={tr:{tr:true,th:true,td:true},th:{th:true},td:{thead:true,th:true,td:true},body:{head:true,link:true,script:true},li:{li:true},p:{p:true},h1:{p:true},h2:{p:true},h3:{p:true},h4:{p:true},h5:{p:true},h6:{p:true},select:formTags,input:formTags,output:formTags,button:formTags,datalist:formTags,textarea:formTags,option:{option:true},optgroup:{optgroup:true}};var voidElements={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true,path:true,circle:true,ellipse:true,line:true,rect:true,use:true,stop:true,polyline:true,polygon:true};var re_nameEnd=/\s|\//;function Parser(cbs,options){this._options=options||{};this._cbs=cbs||{};this._tagname="";this._attribname="";this._attribvalue="";this._attribs=null;this._stack=[];this.startIndex=0;this.endIndex=null;this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode;this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode;if(this._options.Tokenizer){Tokenizer=this._options.Tokenizer}this._tokenizer=new Tokenizer(this._options,this);if(this._cbs.onparserinit)this._cbs.onparserinit(this)}require("inherits")(Parser,require("events").EventEmitter);Parser.prototype._updatePosition=function(initialOffset){if(this.endIndex===null){if(this._tokenizer._sectionStart<=initialOffset){this.startIndex=0}else{this.startIndex=this._tokenizer._sectionStart-initialOffset}}else this.startIndex=this.endIndex+1;this.endIndex=this._tokenizer.getAbsoluteIndex()};Parser.prototype.ontext=function(data){this._updatePosition(1);this.endIndex--;if(this._cbs.ontext)this._cbs.ontext(data)};Parser.prototype.onopentagname=function(name){if(this._lowerCaseTagNames){name=name.toLowerCase()}this._tagname=name;if(!this._options.xmlMode&&name in openImpliesClose){for(var el;(el=this._stack[this._stack.length-1])in openImpliesClose[name];this.onclosetag(el));}if(this._options.xmlMode||!(name in voidElements)){this._stack.push(name)}if(this._cbs.onopentagname)this._cbs.onopentagname(name);if(this._cbs.onopentag)this._attribs={}};Parser.prototype.onopentagend=function(){this._updatePosition(1);if(this._attribs){if(this._cbs.onopentag)this._cbs.onopentag(this._tagname,this._attribs);this._attribs=null}if(!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in voidElements){this._cbs.onclosetag(this._tagname)}this._tagname=""};Parser.prototype.onclosetag=function(name){this._updatePosition(1);if(this._lowerCaseTagNames){name=name.toLowerCase()}if(this._stack.length&&(!(name in voidElements)||this._options.xmlMode)){var pos=this._stack.lastIndexOf(name);if(pos!==-1){if(this._cbs.onclosetag){pos=this._stack.length-pos;while(pos--)this._cbs.onclosetag(this._stack.pop())}else this._stack.length=pos}else if(name==="p"&&!this._options.xmlMode){this.onopentagname(name);this._closeCurrentTag()}}else if(!this._options.xmlMode&&(name==="br"||name==="p")){this.onopentagname(name);this._closeCurrentTag()}};Parser.prototype.onselfclosingtag=function(){if(this._options.xmlMode||this._options.recognizeSelfClosing){this._closeCurrentTag()}else{this.onopentagend()}};Parser.prototype._closeCurrentTag=function(){var name=this._tagname;this.onopentagend();if(this._stack[this._stack.length-1]===name){if(this._cbs.onclosetag){this._cbs.onclosetag(name)}this._stack.pop()}};Parser.prototype.onattribname=function(name){if(this._lowerCaseAttributeNames){name=name.toLowerCase()}this._attribname=name};Parser.prototype.onattribdata=function(value){this._attribvalue+=value};Parser.prototype.onattribend=function(){if(this._cbs.onattribute)this._cbs.onattribute(this._attribname,this._attribvalue);if(this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)){this._attribs[this._attribname]=this._attribvalue}this._attribname="";this._attribvalue=""};Parser.prototype._getInstructionName=function(value){var idx=value.search(re_nameEnd),name=idx<0?value:value.substr(0,idx);if(this._lowerCaseTagNames){name=name.toLowerCase()}return name};Parser.prototype.ondeclaration=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction("!"+name,"!"+value)}};Parser.prototype.onprocessinginstruction=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction("?"+name,"?"+value)}};Parser.prototype.oncomment=function(value){this._updatePosition(4);if(this._cbs.oncomment)this._cbs.oncomment(value);if(this._cbs.oncommentend)this._cbs.oncommentend()};Parser.prototype.oncdata=function(value){this._updatePosition(1);if(this._options.xmlMode||this._options.recognizeCDATA){if(this._cbs.oncdatastart)this._cbs.oncdatastart();if(this._cbs.ontext)this._cbs.ontext(value);if(this._cbs.oncdataend)this._cbs.oncdataend()}else{this.oncomment("[CDATA["+value+"]]")}};Parser.prototype.onerror=function(err){if(this._cbs.onerror)this._cbs.onerror(err)};Parser.prototype.onend=function(){if(this._cbs.onclosetag){for(var i=this._stack.length;i>0;this._cbs.onclosetag(this._stack[--i]));}if(this._cbs.onend)this._cbs.onend()};Parser.prototype.reset=function(){if(this._cbs.onreset)this._cbs.onreset();this._tokenizer.reset();this._tagname="";this._attribname="";this._attribs=null;this._stack=[];if(this._cbs.onparserinit)this._cbs.onparserinit(this)};Parser.prototype.parseComplete=function(data){this.reset();this.end(data)};Parser.prototype.write=function(chunk){this._tokenizer.write(chunk)};Parser.prototype.end=function(chunk){this._tokenizer.end(chunk)};Parser.prototype.pause=function(){this._tokenizer.pause()};Parser.prototype.resume=function(){this._tokenizer.resume()};Parser.prototype.parseChunk=Parser.prototype.write;Parser.prototype.done=Parser.prototype.end;module.exports=Parser},{"./Tokenizer.js":34,events:28,inherits:38}],32:[function(require,module,exports){module.exports=ProxyHandler;function ProxyHandler(cbs){this._cbs=cbs||{}}var EVENTS=require("./").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name="on"+name;ProxyHandler.prototype[name]=function(){if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name="on"+name;ProxyHandler.prototype[name]=function(a){if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name="on"+name;ProxyHandler.prototype[name]=function(a,b){if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error("wrong number of arguments")}})},{"./":36}],33:[function(require,module,exports){module.exports=Stream;var Parser=require("./WritableStream.js");function Stream(options){Parser.call(this,new Cbs(this),options)}require("inherits")(Stream,Parser);Stream.prototype.readable=true;function Cbs(scope){this.scope=scope}var EVENTS=require("../").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){Cbs.prototype["on"+name]=function(){this.scope.emit(name)}}else if(EVENTS[name]===1){Cbs.prototype["on"+name]=function(a){this.scope.emit(name,a)}}else if(EVENTS[name]===2){Cbs.prototype["on"+name]=function(a,b){this.scope.emit(name,a,b)}}else{throw Error("wrong number of arguments!")}})},{"../":36,"./WritableStream.js":35,inherits:38}],34:[function(require,module,exports){module.exports=Tokenizer;var decodeCodePoint=require("entities/lib/decode_codepoint.js"),entityMap=require("entities/maps/entities.json"),legacyMap=require("entities/maps/legacy.json"),xmlMap=require("entities/maps/xml.json"),i=0,TEXT=i++,BEFORE_TAG_NAME=i++,IN_TAG_NAME=i++,IN_SELF_CLOSING_TAG=i++,BEFORE_CLOSING_TAG_NAME=i++,IN_CLOSING_TAG_NAME=i++,AFTER_CLOSING_TAG_NAME=i++,BEFORE_ATTRIBUTE_NAME=i++,IN_ATTRIBUTE_NAME=i++,AFTER_ATTRIBUTE_NAME=i++,BEFORE_ATTRIBUTE_VALUE=i++,IN_ATTRIBUTE_VALUE_DQ=i++,IN_ATTRIBUTE_VALUE_SQ=i++,IN_ATTRIBUTE_VALUE_NQ=i++,BEFORE_DECLARATION=i++,IN_DECLARATION=i++,IN_PROCESSING_INSTRUCTION=i++,BEFORE_COMMENT=i++,IN_COMMENT=i++,AFTER_COMMENT_1=i++,AFTER_COMMENT_2=i++,BEFORE_CDATA_1=i++,BEFORE_CDATA_2=i++,BEFORE_CDATA_3=i++,BEFORE_CDATA_4=i++,BEFORE_CDATA_5=i++,BEFORE_CDATA_6=i++,IN_CDATA=i++,AFTER_CDATA_1=i++,AFTER_CDATA_2=i++,BEFORE_SPECIAL=i++,BEFORE_SPECIAL_END=i++,BEFORE_SCRIPT_1=i++,BEFORE_SCRIPT_2=i++,BEFORE_SCRIPT_3=i++,BEFORE_SCRIPT_4=i++,BEFORE_SCRIPT_5=i++,AFTER_SCRIPT_1=i++,AFTER_SCRIPT_2=i++,AFTER_SCRIPT_3=i++,AFTER_SCRIPT_4=i++,AFTER_SCRIPT_5=i++,BEFORE_STYLE_1=i++,BEFORE_STYLE_2=i++,BEFORE_STYLE_3=i++,BEFORE_STYLE_4=i++,AFTER_STYLE_1=i++,AFTER_STYLE_2=i++,AFTER_STYLE_3=i++,AFTER_STYLE_4=i++,BEFORE_ENTITY=i++,BEFORE_NUMERIC_ENTITY=i++,IN_NAMED_ENTITY=i++,IN_NUMERIC_ENTITY=i++,IN_HEX_ENTITY=i++,j=0,SPECIAL_NONE=j++,SPECIAL_SCRIPT=j++,SPECIAL_STYLE=j++;function whitespace(c){return c===" "||c==="\n"||c==="\t"||c==="\f"||c==="\r"}function characterState(char,SUCCESS){return function(c){if(c===char)this._state=SUCCESS}}function ifElseState(upper,SUCCESS,FAILURE){var lower=upper.toLowerCase();if(upper===lower){return function(c){if(c===lower){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}else{return function(c){if(c===lower||c===upper){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}}function consumeSpecialNameChar(upper,NEXT_STATE){var lower=upper.toLowerCase();return function(c){if(c===lower||c===upper){this._state=NEXT_STATE}else{this._state=IN_TAG_NAME;this._index--}}}function Tokenizer(options,cbs){this._state=TEXT;this._buffer="";this._sectionStart=0;this._index=0;this._bufferOffset=0;this._baseState=TEXT;this._special=SPECIAL_NONE;this._cbs=cbs;this._running=true;this._ended=false;this._xmlMode=!!(options&&options.xmlMode);this._decodeEntities=!!(options&&options.decodeEntities)}Tokenizer.prototype._stateText=function(c){if(c==="<"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._state=BEFORE_TAG_NAME;this._sectionStart=this._index}else if(this._decodeEntities&&this._special===SPECIAL_NONE&&c==="&"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._baseState=TEXT;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeTagName=function(c){if(c==="/"){this._state=BEFORE_CLOSING_TAG_NAME}else if(c==="<"){this._cbs.ontext(this._getSection());this._sectionStart=this._index}else if(c===">"||this._special!==SPECIAL_NONE||whitespace(c)){this._state=TEXT}else if(c==="!"){this._state=BEFORE_DECLARATION;this._sectionStart=this._index+1}else if(c==="?"){this._state=IN_PROCESSING_INSTRUCTION;this._sectionStart=this._index+1}else{this._state=!this._xmlMode&&(c==="s"||c==="S")?BEFORE_SPECIAL:IN_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInTagName=function(c){if(c==="/"||c===">"||whitespace(c)){this._emitToken("onopentagname");this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateBeforeCloseingTagName=function(c){if(whitespace(c));else if(c===">"){this._state=TEXT}else if(this._special!==SPECIAL_NONE){if(c==="s"||c==="S"){this._state=BEFORE_SPECIAL_END}else{this._state=TEXT;this._index--}}else{this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInCloseingTagName=function(c){if(c===">"||whitespace(c)){this._emitToken("onclosetag");this._state=AFTER_CLOSING_TAG_NAME;this._index--}};Tokenizer.prototype._stateAfterCloseingTagName=function(c){if(c===">"){this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeAttributeName=function(c){if(c===">"){this._cbs.onopentagend();this._state=TEXT;this._sectionStart=this._index+1}else if(c==="/"){this._state=IN_SELF_CLOSING_TAG}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInSelfClosingTag=function(c){if(c===">"){this._cbs.onselfclosingtag();this._state=TEXT;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateInAttributeName=function(c){if(c==="="||c==="/"||c===">"||whitespace(c)){this._cbs.onattribname(this._getSection());this._sectionStart=-1;this._state=AFTER_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateAfterAttributeName=function(c){if(c==="="){this._state=BEFORE_ATTRIBUTE_VALUE}else if(c==="/"||c===">"){this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(!whitespace(c)){this._cbs.onattribend();this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeAttributeValue=function(c){if(c==='"'){this._state=IN_ATTRIBUTE_VALUE_DQ;this._sectionStart=this._index+1}else if(c==="'"){this._state=IN_ATTRIBUTE_VALUE_SQ;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_VALUE_NQ;this._sectionStart=this._index;this._index--}};Tokenizer.prototype._stateInAttributeValueDoubleQuotes=function(c){if(c==='"'){this._emitToken("onattribdata");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c==="&"){this._emitToken("onattribdata");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueSingleQuotes=function(c){if(c==="'"){this._emitToken("onattribdata");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c==="&"){this._emitToken("onattribdata");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueNoQuotes=function(c){if(whitespace(c)||c===">"){this._emitToken("onattribdata");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(this._decodeEntities&&c==="&"){this._emitToken("onattribdata");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeDeclaration=function(c){this._state=c==="["?BEFORE_CDATA_1:c==="-"?BEFORE_COMMENT:IN_DECLARATION};Tokenizer.prototype._stateInDeclaration=function(c){if(c===">"){this._cbs.ondeclaration(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateInProcessingInstruction=function(c){if(c===">"){this._cbs.onprocessinginstruction(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeComment=function(c){if(c==="-"){this._state=IN_COMMENT;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION}};Tokenizer.prototype._stateInComment=function(c){if(c==="-")this._state=AFTER_COMMENT_1};Tokenizer.prototype._stateAfterComment1=function(c){if(c==="-"){this._state=AFTER_COMMENT_2}else{this._state=IN_COMMENT}};Tokenizer.prototype._stateAfterComment2=function(c){if(c===">"){this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!=="-"){this._state=IN_COMMENT}};Tokenizer.prototype._stateBeforeCdata1=ifElseState("C",BEFORE_CDATA_2,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata2=ifElseState("D",BEFORE_CDATA_3,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata3=ifElseState("A",BEFORE_CDATA_4,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata4=ifElseState("T",BEFORE_CDATA_5,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata5=ifElseState("A",BEFORE_CDATA_6,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata6=function(c){if(c==="["){this._state=IN_CDATA;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION;this._index--}};Tokenizer.prototype._stateInCdata=function(c){if(c==="]")this._state=AFTER_CDATA_1};Tokenizer.prototype._stateAfterCdata1=characterState("]",AFTER_CDATA_2);Tokenizer.prototype._stateAfterCdata2=function(c){if(c===">"){this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!=="]"){this._state=IN_CDATA}};Tokenizer.prototype._stateBeforeSpecial=function(c){if(c==="c"||c==="C"){this._state=BEFORE_SCRIPT_1}else if(c==="t"||c==="T"){this._state=BEFORE_STYLE_1}else{this._state=IN_TAG_NAME;this._index--}};Tokenizer.prototype._stateBeforeSpecialEnd=function(c){if(this._special===SPECIAL_SCRIPT&&(c==="c"||c==="C")){this._state=AFTER_SCRIPT_1}else if(this._special===SPECIAL_STYLE&&(c==="t"||c==="T")){this._state=AFTER_STYLE_1}else this._state=TEXT};Tokenizer.prototype._stateBeforeScript1=consumeSpecialNameChar("R",BEFORE_SCRIPT_2);Tokenizer.prototype._stateBeforeScript2=consumeSpecialNameChar("I",BEFORE_SCRIPT_3);Tokenizer.prototype._stateBeforeScript3=consumeSpecialNameChar("P",BEFORE_SCRIPT_4);Tokenizer.prototype._stateBeforeScript4=consumeSpecialNameChar("T",BEFORE_SCRIPT_5);Tokenizer.prototype._stateBeforeScript5=function(c){if(c==="/"||c===">"||whitespace(c)){this._special=SPECIAL_SCRIPT}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterScript1=ifElseState("R",AFTER_SCRIPT_2,TEXT);Tokenizer.prototype._stateAfterScript2=ifElseState("I",AFTER_SCRIPT_3,TEXT);Tokenizer.prototype._stateAfterScript3=ifElseState("P",AFTER_SCRIPT_4,TEXT);Tokenizer.prototype._stateAfterScript4=ifElseState("T",AFTER_SCRIPT_5,TEXT);Tokenizer.prototype._stateAfterScript5=function(c){if(c===">"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-6;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeStyle1=consumeSpecialNameChar("Y",BEFORE_STYLE_2);Tokenizer.prototype._stateBeforeStyle2=consumeSpecialNameChar("L",BEFORE_STYLE_3);Tokenizer.prototype._stateBeforeStyle3=consumeSpecialNameChar("E",BEFORE_STYLE_4);Tokenizer.prototype._stateBeforeStyle4=function(c){if(c==="/"||c===">"||whitespace(c)){this._special=SPECIAL_STYLE}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterStyle1=ifElseState("Y",AFTER_STYLE_2,TEXT);Tokenizer.prototype._stateAfterStyle2=ifElseState("L",AFTER_STYLE_3,TEXT);Tokenizer.prototype._stateAfterStyle3=ifElseState("E",AFTER_STYLE_4,TEXT);Tokenizer.prototype._stateAfterStyle4=function(c){if(c===">"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-5;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeEntity=ifElseState("#",BEFORE_NUMERIC_ENTITY,IN_NAMED_ENTITY);Tokenizer.prototype._stateBeforeNumericEntity=ifElseState("X",IN_HEX_ENTITY,IN_NUMERIC_ENTITY);Tokenizer.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var entity=this._buffer.substring(this._sectionStart+1,this._index),map=this._xmlMode?xmlMap:entityMap;if(map.hasOwnProperty(entity)){this._emitPartial(map[entity]);this._sectionStart=this._index+1}}};Tokenizer.prototype._parseLegacyEntity=function(){var start=this._sectionStart+1,limit=this._index-start;if(limit>6)limit=6;while(limit>=2){var entity=this._buffer.substr(start,limit);if(legacyMap.hasOwnProperty(entity)){this._emitPartial(legacyMap[entity]);this._sectionStart+=limit+1;return}else{limit--}}};Tokenizer.prototype._stateInNamedEntity=function(c){if(c===";"){this._parseNamedEntityStrict();if(this._sectionStart+1<this._index&&!this._xmlMode){this._parseLegacyEntity()}this._state=this._baseState}else if((c<"a"||c>"z")&&(c<"A"||c>"Z")&&(c<"0"||c>"9")){if(this._xmlMode);else if(this._sectionStart+1===this._index);else if(this._baseState!==TEXT){if(c!=="="){this._parseNamedEntityStrict()}}else{this._parseLegacyEntity()}this._state=this._baseState;this._index--}};Tokenizer.prototype._decodeNumericEntity=function(offset,base){var sectionStart=this._sectionStart+offset;if(sectionStart!==this._index){var entity=this._buffer.substring(sectionStart,this._index);var parsed=parseInt(entity,base);this._emitPartial(decodeCodePoint(parsed));this._sectionStart=this._index}else{this._sectionStart--}this._state=this._baseState};Tokenizer.prototype._stateInNumericEntity=function(c){if(c===";"){this._decodeNumericEntity(2,10);this._sectionStart++}else if(c<"0"||c>"9"){if(!this._xmlMode){this._decodeNumericEntity(2,10)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._stateInHexEntity=function(c){if(c===";"){this._decodeNumericEntity(3,16);this._sectionStart++}else if((c<"a"||c>"f")&&(c<"A"||c>"F")&&(c<"0"||c>"9")){if(!this._xmlMode){this._decodeNumericEntity(3,16)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._cleanup=function(){if(this._sectionStart<0){this._buffer="";this._index=0;this._bufferOffset+=this._index}else if(this._running){if(this._state===TEXT){if(this._sectionStart!==this._index){this._cbs.ontext(this._buffer.substr(this._sectionStart))}this._buffer="";this._bufferOffset+=this._index;this._index=0}else if(this._sectionStart===this._index){this._buffer="";this._bufferOffset+=this._index;this._index=0}else{this._buffer=this._buffer.substr(this._sectionStart);this._index-=this._sectionStart;this._bufferOffset+=this._sectionStart}this._sectionStart=0}};Tokenizer.prototype.write=function(chunk){if(this._ended)this._cbs.onerror(Error(".write() after done!"));this._buffer+=chunk;this._parse()};Tokenizer.prototype._parse=function(){while(this._index<this._buffer.length&&this._running){var c=this._buffer.charAt(this._index);if(this._state===TEXT){this._stateText(c)}else if(this._state===BEFORE_TAG_NAME){this._stateBeforeTagName(c)}else if(this._state===IN_TAG_NAME){this._stateInTagName(c)}else if(this._state===BEFORE_CLOSING_TAG_NAME){this._stateBeforeCloseingTagName(c)}else if(this._state===IN_CLOSING_TAG_NAME){this._stateInCloseingTagName(c)}else if(this._state===AFTER_CLOSING_TAG_NAME){this._stateAfterCloseingTagName(c)}else if(this._state===IN_SELF_CLOSING_TAG){this._stateInSelfClosingTag(c)}else if(this._state===BEFORE_ATTRIBUTE_NAME){this._stateBeforeAttributeName(c)}else if(this._state===IN_ATTRIBUTE_NAME){this._stateInAttributeName(c)}else if(this._state===AFTER_ATTRIBUTE_NAME){this._stateAfterAttributeName(c)}else if(this._state===BEFORE_ATTRIBUTE_VALUE){this._stateBeforeAttributeValue(c)}else if(this._state===IN_ATTRIBUTE_VALUE_DQ){this._stateInAttributeValueDoubleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_SQ){this._stateInAttributeValueSingleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_NQ){this._stateInAttributeValueNoQuotes(c)}else if(this._state===BEFORE_DECLARATION){this._stateBeforeDeclaration(c)}else if(this._state===IN_DECLARATION){this._stateInDeclaration(c)}else if(this._state===IN_PROCESSING_INSTRUCTION){this._stateInProcessingInstruction(c)}else if(this._state===BEFORE_COMMENT){this._stateBeforeComment(c)}else if(this._state===IN_COMMENT){this._stateInComment(c)}else if(this._state===AFTER_COMMENT_1){this._stateAfterComment1(c)}else if(this._state===AFTER_COMMENT_2){this._stateAfterComment2(c)}else if(this._state===BEFORE_CDATA_1){this._stateBeforeCdata1(c)}else if(this._state===BEFORE_CDATA_2){this._stateBeforeCdata2(c)}else if(this._state===BEFORE_CDATA_3){this._stateBeforeCdata3(c)}else if(this._state===BEFORE_CDATA_4){this._stateBeforeCdata4(c)}else if(this._state===BEFORE_CDATA_5){this._stateBeforeCdata5(c)}else if(this._state===BEFORE_CDATA_6){this._stateBeforeCdata6(c)}else if(this._state===IN_CDATA){this._stateInCdata(c)}else if(this._state===AFTER_CDATA_1){this._stateAfterCdata1(c)}else if(this._state===AFTER_CDATA_2){this._stateAfterCdata2(c)}else if(this._state===BEFORE_SPECIAL){this._stateBeforeSpecial(c)}else if(this._state===BEFORE_SPECIAL_END){this._stateBeforeSpecialEnd(c)}else if(this._state===BEFORE_SCRIPT_1){this._stateBeforeScript1(c)}else if(this._state===BEFORE_SCRIPT_2){this._stateBeforeScript2(c)}else if(this._state===BEFORE_SCRIPT_3){this._stateBeforeScript3(c)}else if(this._state===BEFORE_SCRIPT_4){this._stateBeforeScript4(c)}else if(this._state===BEFORE_SCRIPT_5){this._stateBeforeScript5(c)}else if(this._state===AFTER_SCRIPT_1){this._stateAfterScript1(c)}else if(this._state===AFTER_SCRIPT_2){this._stateAfterScript2(c)}else if(this._state===AFTER_SCRIPT_3){this._stateAfterScript3(c)}else if(this._state===AFTER_SCRIPT_4){this._stateAfterScript4(c)}else if(this._state===AFTER_SCRIPT_5){this._stateAfterScript5(c)}else if(this._state===BEFORE_STYLE_1){this._stateBeforeStyle1(c)}else if(this._state===BEFORE_STYLE_2){this._stateBeforeStyle2(c)}else if(this._state===BEFORE_STYLE_3){this._stateBeforeStyle3(c)}else if(this._state===BEFORE_STYLE_4){this._stateBeforeStyle4(c)}else if(this._state===AFTER_STYLE_1){this._stateAfterStyle1(c)}else if(this._state===AFTER_STYLE_2){this._stateAfterStyle2(c)}else if(this._state===AFTER_STYLE_3){this._stateAfterStyle3(c)}else if(this._state===AFTER_STYLE_4){this._stateAfterStyle4(c)}else if(this._state===BEFORE_ENTITY){this._stateBeforeEntity(c)}else if(this._state===BEFORE_NUMERIC_ENTITY){this._stateBeforeNumericEntity(c)}else if(this._state===IN_NAMED_ENTITY){this._stateInNamedEntity(c)}else if(this._state===IN_NUMERIC_ENTITY){this._stateInNumericEntity(c)}else if(this._state===IN_HEX_ENTITY){this._stateInHexEntity(c)}else{this._cbs.onerror(Error("unknown _state"),this._state)}this._index++}this._cleanup()};Tokenizer.prototype.pause=function(){this._running=false};Tokenizer.prototype.resume=function(){this._running=true;if(this._index<this._buffer.length){this._parse()}if(this._ended){this._finish()}};Tokenizer.prototype.end=function(chunk){if(this._ended)this._cbs.onerror(Error(".end() after done!"));if(chunk)this.write(chunk);this._ended=true;if(this._running)this._finish()};Tokenizer.prototype._finish=function(){if(this._sectionStart<this._index){this._handleTrailingData()}this._cbs.onend()};Tokenizer.prototype._handleTrailingData=function(){var data=this._buffer.substr(this._sectionStart);if(this._state===IN_CDATA||this._state===AFTER_CDATA_1||this._state===AFTER_CDATA_2){this._cbs.oncdata(data)}else if(this._state===IN_COMMENT||this._state===AFTER_COMMENT_1||this._state===AFTER_COMMENT_2){this._cbs.oncomment(data)}else if(this._state===IN_NAMED_ENTITY&&!this._xmlMode){this._parseLegacyEntity();if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_NUMERIC_ENTITY&&!this._xmlMode){this._decodeNumericEntity(2,10);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_HEX_ENTITY&&!this._xmlMode){this._decodeNumericEntity(3,16);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state!==IN_TAG_NAME&&this._state!==BEFORE_ATTRIBUTE_NAME&&this._state!==BEFORE_ATTRIBUTE_VALUE&&this._state!==AFTER_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_VALUE_SQ&&this._state!==IN_ATTRIBUTE_VALUE_DQ&&this._state!==IN_ATTRIBUTE_VALUE_NQ&&this._state!==IN_CLOSING_TAG_NAME){
-this._cbs.ontext(data)}};Tokenizer.prototype.reset=function(){Tokenizer.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)};Tokenizer.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index};Tokenizer.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)};Tokenizer.prototype._emitToken=function(name){this._cbs[name](this._getSection());this._sectionStart=-1};Tokenizer.prototype._emitPartial=function(value){if(this._baseState!==TEXT){this._cbs.onattribdata(value)}else{this._cbs.ontext(value)}}},{"entities/lib/decode_codepoint.js":22,"entities/maps/entities.json":25,"entities/maps/legacy.json":26,"entities/maps/xml.json":27}],35:[function(require,module,exports){module.exports=Stream;var Parser=require("./Parser.js"),WritableStream=require("stream").Writable||require("readable-stream").Writable,StringDecoder=require("string_decoder").StringDecoder,Buffer=require("buffer").Buffer;function Stream(cbs,options){var parser=this._parser=new Parser(cbs,options);var decoder=this._decoder=new StringDecoder;WritableStream.call(this,{decodeStrings:false});this.once("finish",function(){parser.end(decoder.end())})}require("inherits")(Stream,WritableStream);WritableStream.prototype._write=function(chunk,encoding,cb){if(chunk instanceof Buffer)chunk=this._decoder.write(chunk);this._parser.write(chunk);cb()}},{"./Parser.js":31,buffer:5,inherits:38,"readable-stream":3,stream:55,string_decoder:56}],36:[function(require,module,exports){var Parser=require("./Parser.js"),DomHandler=require("domhandler");function defineProp(name,value){delete module.exports[name];module.exports[name]=value;return value}module.exports={Parser:Parser,Tokenizer:require("./Tokenizer.js"),ElementType:require("domelementtype"),DomHandler:DomHandler,get FeedHandler(){return defineProp("FeedHandler",require("./FeedHandler.js"))},get Stream(){return defineProp("Stream",require("./Stream.js"))},get WritableStream(){return defineProp("WritableStream",require("./WritableStream.js"))},get ProxyHandler(){return defineProp("ProxyHandler",require("./ProxyHandler.js"))},get DomUtils(){return defineProp("DomUtils",require("domutils"))},get CollectingHandler(){return defineProp("CollectingHandler",require("./CollectingHandler.js"))},DefaultHandler:DomHandler,get RssHandler(){return defineProp("RssHandler",this.FeedHandler)},parseDOM:function(data,options){var handler=new DomHandler(options);new Parser(handler,options).end(data);return handler.dom},parseFeed:function(feed,options){var handler=new module.exports.FeedHandler(options);new Parser(handler,options).end(feed);return handler.dom},createDomStream:function(cb,options,elementCb){var handler=new DomHandler(cb,options,elementCb);return new Parser(handler,options)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},{"./CollectingHandler.js":29,"./FeedHandler.js":30,"./Parser.js":31,"./ProxyHandler.js":32,"./Stream.js":33,"./Tokenizer.js":34,"./WritableStream.js":35,domelementtype:9,domhandler:10,domutils:13}],37:[function(require,module,exports){exports.read=function(buffer,offset,isLE,mLen,nBytes){var e,m;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var nBits=-7;var i=isLE?nBytes-1:0;var d=isLE?-1:1;var s=buffer[offset+i];i+=d;e=s&(1<<-nBits)-1;s>>=-nBits;nBits+=eLen;for(;nBits>0;e=e*256+buffer[offset+i],i+=d,nBits-=8){}m=e&(1<<-nBits)-1;e>>=-nBits;nBits+=mLen;for(;nBits>0;m=m*256+buffer[offset+i],i+=d,nBits-=8){}if(e===0){e=1-eBias}else if(e===eMax){return m?NaN:(s?-1:1)*Infinity}else{m=m+Math.pow(2,mLen);e=e-eBias}return(s?-1:1)*m*Math.pow(2,e-mLen)};exports.write=function(buffer,value,offset,isLE,mLen,nBytes){var e,m,c;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var rt=mLen===23?Math.pow(2,-24)-Math.pow(2,-77):0;var i=isLE?0:nBytes-1;var d=isLE?1:-1;var s=value<0||value===0&&1/value<0?1:0;value=Math.abs(value);if(isNaN(value)||value===Infinity){m=isNaN(value)?1:0;e=eMax}else{e=Math.floor(Math.log(value)/Math.LN2);if(value*(c=Math.pow(2,-e))<1){e--;c*=2}if(e+eBias>=1){value+=rt/c}else{value+=rt*Math.pow(2,1-eBias)}if(value*c>=2){e++;c/=2}if(e+eBias>=eMax){m=0;e=eMax}else if(e+eBias>=1){m=(value*c-1)*Math.pow(2,mLen);e=e+eBias}else{m=value*Math.pow(2,eBias-1)*Math.pow(2,mLen);e=0}}for(;mLen>=8;buffer[offset+i]=m&255,i+=d,m/=256,mLen-=8){}e=e<<mLen|m;eLen+=mLen;for(;eLen>0;buffer[offset+i]=e&255,i+=d,e/=256,eLen-=8){}buffer[offset+i-d]|=s*128}},{}],38:[function(require,module,exports){if(typeof Object.create==="function"){module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;ctor.prototype=Object.create(superCtor.prototype,{constructor:{value:ctor,enumerable:false,writable:true,configurable:true}})}}else{module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;var TempCtor=function(){};TempCtor.prototype=superCtor.prototype;ctor.prototype=new TempCtor;ctor.prototype.constructor=ctor}}},{}],39:[function(require,module,exports){module.exports=function(obj){return obj!=null&&(isBuffer(obj)||isSlowBuffer(obj)||!!obj._isBuffer)};function isBuffer(obj){return!!obj.constructor&&typeof obj.constructor.isBuffer==="function"&&obj.constructor.isBuffer(obj)}function isSlowBuffer(obj){return typeof obj.readFloatLE==="function"&&typeof obj.slice==="function"&&isBuffer(obj.slice(0,0))}},{}],40:[function(require,module,exports){var toString={}.toString;module.exports=Array.isArray||function(arr){return toString.call(arr)=="[object Array]"}},{}],41:[function(require,module,exports){(function(process){"use strict";if(!process.version||process.version.indexOf("v0.")===0||process.version.indexOf("v1.")===0&&process.version.indexOf("v1.8.")!==0){module.exports=nextTick}else{module.exports=process.nextTick}function nextTick(fn,arg1,arg2,arg3){if(typeof fn!=="function"){throw new TypeError('"callback" argument must be a function')}var len=arguments.length;var args,i;switch(len){case 0:case 1:return process.nextTick(fn);case 2:return process.nextTick(function afterTickOne(){fn.call(null,arg1)});case 3:return process.nextTick(function afterTickTwo(){fn.call(null,arg1,arg2)});case 4:return process.nextTick(function afterTickThree(){fn.call(null,arg1,arg2,arg3)});default:args=new Array(len-1);i=0;while(i<args.length){args[i++]=arguments[i]}return process.nextTick(function afterTick(){fn.apply(null,args)})}}}).call(this,require("_process"))},{_process:42}],42:[function(require,module,exports){var process=module.exports={};var cachedSetTimeout;var cachedClearTimeout;function defaultSetTimout(){throw new Error("setTimeout has not been defined")}function defaultClearTimeout(){throw new Error("clearTimeout has not been defined")}(function(){try{if(typeof setTimeout==="function"){cachedSetTimeout=setTimeout}else{cachedSetTimeout=defaultSetTimout}}catch(e){cachedSetTimeout=defaultSetTimout}try{if(typeof clearTimeout==="function"){cachedClearTimeout=clearTimeout}else{cachedClearTimeout=defaultClearTimeout}}catch(e){cachedClearTimeout=defaultClearTimeout}})();function runTimeout(fun){if(cachedSetTimeout===setTimeout){return setTimeout(fun,0)}if((cachedSetTimeout===defaultSetTimout||!cachedSetTimeout)&&setTimeout){cachedSetTimeout=setTimeout;return setTimeout(fun,0)}try{return cachedSetTimeout(fun,0)}catch(e){try{return cachedSetTimeout.call(null,fun,0)}catch(e){return cachedSetTimeout.call(this,fun,0)}}}function runClearTimeout(marker){if(cachedClearTimeout===clearTimeout){return clearTimeout(marker)}if((cachedClearTimeout===defaultClearTimeout||!cachedClearTimeout)&&clearTimeout){cachedClearTimeout=clearTimeout;return clearTimeout(marker)}try{return cachedClearTimeout(marker)}catch(e){try{return cachedClearTimeout.call(null,marker)}catch(e){return cachedClearTimeout.call(this,marker)}}}var queue=[];var draining=false;var currentQueue;var queueIndex=-1;function cleanUpNextTick(){if(!draining||!currentQueue){return}draining=false;if(currentQueue.length){queue=currentQueue.concat(queue)}else{queueIndex=-1}if(queue.length){drainQueue()}}function drainQueue(){if(draining){return}var timeout=runTimeout(cleanUpNextTick);draining=true;var len=queue.length;while(len){currentQueue=queue;queue=[];while(++queueIndex<len){if(currentQueue){currentQueue[queueIndex].run()}}queueIndex=-1;len=queue.length}currentQueue=null;draining=false;runClearTimeout(timeout)}process.nextTick=function(fun){var args=new Array(arguments.length-1);if(arguments.length>1){for(var i=1;i<arguments.length;i++){args[i-1]=arguments[i]}}queue.push(new Item(fun,args));if(queue.length===1&&!draining){runTimeout(drainQueue)}};function Item(fun,array){this.fun=fun;this.array=array}Item.prototype.run=function(){this.fun.apply(null,this.array)};process.title="browser";process.browser=true;process.env={};process.argv=[];process.version="";process.versions={};function noop(){}process.on=noop;process.addListener=noop;process.once=noop;process.off=noop;process.removeListener=noop;process.removeAllListeners=noop;process.emit=noop;process.binding=function(name){throw new Error("process.binding is not supported")};process.cwd=function(){return"/"};process.chdir=function(dir){throw new Error("process.chdir is not supported")};process.umask=function(){return 0}},{}],43:[function(require,module,exports){module.exports=require("./lib/_stream_duplex.js")},{"./lib/_stream_duplex.js":44}],44:[function(require,module,exports){"use strict";var objectKeys=Object.keys||function(obj){var keys=[];for(var key in obj){keys.push(key)}return keys};module.exports=Duplex;var processNextTick=require("process-nextick-args");var util=require("core-util-is");util.inherits=require("inherits");var Readable=require("./_stream_readable");var Writable=require("./_stream_writable");util.inherits(Duplex,Readable);var keys=objectKeys(Writable.prototype);for(var v=0;v<keys.length;v++){var method=keys[v];if(!Duplex.prototype[method])Duplex.prototype[method]=Writable.prototype[method]}function Duplex(options){if(!(this instanceof Duplex))return new Duplex(options);Readable.call(this,options);Writable.call(this,options);if(options&&options.readable===false)this.readable=false;if(options&&options.writable===false)this.writable=false;this.allowHalfOpen=true;if(options&&options.allowHalfOpen===false)this.allowHalfOpen=false;this.once("end",onend)}function onend(){if(this.allowHalfOpen||this._writableState.ended)return;processNextTick(onEndNT,this)}function onEndNT(self){self.end()}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}},{"./_stream_readable":46,"./_stream_writable":48,"core-util-is":6,inherits:38,"process-nextick-args":41}],45:[function(require,module,exports){"use strict";module.exports=PassThrough;var Transform=require("./_stream_transform");var util=require("core-util-is");util.inherits=require("inherits");util.inherits(PassThrough,Transform);function PassThrough(options){if(!(this instanceof PassThrough))return new PassThrough(options);Transform.call(this,options)}PassThrough.prototype._transform=function(chunk,encoding,cb){cb(null,chunk)}},{"./_stream_transform":47,"core-util-is":6,inherits:38}],46:[function(require,module,exports){(function(process){"use strict";module.exports=Readable;var processNextTick=require("process-nextick-args");var isArray=require("isarray");Readable.ReadableState=ReadableState;var EE=require("events").EventEmitter;var EElistenerCount=function(emitter,type){return emitter.listeners(type).length};var Stream;(function(){try{Stream=require("st"+"ream")}catch(_){}finally{if(!Stream)Stream=require("events").EventEmitter}})();var Buffer=require("buffer").Buffer;var bufferShim=require("buffer-shims");var util=require("core-util-is");util.inherits=require("inherits");var debugUtil=require("util");var debug=void 0;if(debugUtil&&debugUtil.debuglog){debug=debugUtil.debuglog("stream")}else{debug=function(){}}var BufferList=require("./internal/streams/BufferList");var StringDecoder;util.inherits(Readable,Stream);function prependListener(emitter,event,fn){if(typeof emitter.prependListener==="function"){return emitter.prependListener(event,fn)}else{if(!emitter._events||!emitter._events[event])emitter.on(event,fn);else if(isArray(emitter._events[event]))emitter._events[event].unshift(fn);else emitter._events[event]=[fn,emitter._events[event]]}}var Duplex;function ReadableState(options,stream){Duplex=Duplex||require("./_stream_duplex");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.readableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.buffer=new BufferList;this.length=0;this.pipes=null;this.pipesCount=0;this.flowing=null;this.ended=false;this.endEmitted=false;this.reading=false;this.sync=true;this.needReadable=false;this.emittedReadable=false;this.readableListening=false;this.resumeScheduled=false;this.defaultEncoding=options.defaultEncoding||"utf8";this.ranOut=false;this.awaitDrain=0;this.readingMore=false;this.decoder=null;this.encoding=null;if(options.encoding){if(!StringDecoder)StringDecoder=require("string_decoder/").StringDecoder;this.decoder=new StringDecoder(options.encoding);this.encoding=options.encoding}}var Duplex;function Readable(options){Duplex=Duplex||require("./_stream_duplex");if(!(this instanceof Readable))return new Readable(options);this._readableState=new ReadableState(options,this);this.readable=true;if(options&&typeof options.read==="function")this._read=options.read;Stream.call(this)}Readable.prototype.push=function(chunk,encoding){var state=this._readableState;if(!state.objectMode&&typeof chunk==="string"){encoding=encoding||state.defaultEncoding;if(encoding!==state.encoding){chunk=bufferShim.from(chunk,encoding);encoding=""}}return readableAddChunk(this,state,chunk,encoding,false)};Readable.prototype.unshift=function(chunk){var state=this._readableState;return readableAddChunk(this,state,chunk,"",true)};Readable.prototype.isPaused=function(){return this._readableState.flowing===false};function readableAddChunk(stream,state,chunk,encoding,addToFront){var er=chunkInvalid(state,chunk);if(er){stream.emit("error",er)}else if(chunk===null){state.reading=false;onEofChunk(stream,state)}else if(state.objectMode||chunk&&chunk.length>0){if(state.ended&&!addToFront){var e=new Error("stream.push() after EOF");stream.emit("error",e)}else if(state.endEmitted&&addToFront){var _e=new Error("stream.unshift() after end event");stream.emit("error",_e)}else{var skipAdd;if(state.decoder&&!addToFront&&!encoding){chunk=state.decoder.write(chunk);skipAdd=!state.objectMode&&chunk.length===0}if(!addToFront)state.reading=false;if(!skipAdd){if(state.flowing&&state.length===0&&!state.sync){stream.emit("data",chunk);stream.read(0)}else{state.length+=state.objectMode?1:chunk.length;if(addToFront)state.buffer.unshift(chunk);else state.buffer.push(chunk);if(state.needReadable)emitReadable(stream)}}maybeReadMore(stream,state)}}else if(!addToFront){state.reading=false}return needMoreData(state)}function needMoreData(state){return!state.ended&&(state.needReadable||state.length<state.highWaterMark||state.length===0)}Readable.prototype.setEncoding=function(enc){if(!StringDecoder)StringDecoder=require("string_decoder/").StringDecoder;this._readableState.decoder=new StringDecoder(enc);this._readableState.encoding=enc;return this};var MAX_HWM=8388608;function computeNewHighWaterMark(n){if(n>=MAX_HWM){n=MAX_HWM}else{n--;n|=n>>>1;n|=n>>>2;n|=n>>>4;n|=n>>>8;n|=n>>>16;n++}return n}function howMuchToRead(n,state){if(n<=0||state.length===0&&state.ended)return 0;if(state.objectMode)return 1;if(n!==n){if(state.flowing&&state.length)return state.buffer.head.data.length;else return state.length}if(n>state.highWaterMark)state.highWaterMark=computeNewHighWaterMark(n);if(n<=state.length)return n;if(!state.ended){state.needReadable=true;return 0}return state.length}Readable.prototype.read=function(n){debug("read",n);n=parseInt(n,10);var state=this._readableState;var nOrig=n;if(n!==0)state.emittedReadable=false;if(n===0&&state.needReadable&&(state.length>=state.highWaterMark||state.ended)){debug("read: emitReadable",state.length,state.ended);if(state.length===0&&state.ended)endReadable(this);else emitReadable(this);return null}n=howMuchToRead(n,state);if(n===0&&state.ended){if(state.length===0)endReadable(this);return null}var doRead=state.needReadable;debug("need readable",doRead);if(state.length===0||state.length-n<state.highWaterMark){doRead=true;debug("length less than watermark",doRead)}if(state.ended||state.reading){doRead=false;debug("reading or ended",doRead)}else if(doRead){debug("do read");state.reading=true;state.sync=true;if(state.length===0)state.needReadable=true;this._read(state.highWaterMark);state.sync=false;if(!state.reading)n=howMuchToRead(nOrig,state)}var ret;if(n>0)ret=fromList(n,state);else ret=null;if(ret===null){state.needReadable=true;n=0}else{state.length-=n}if(state.length===0){if(!state.ended)state.needReadable=true;if(nOrig!==n&&state.ended)endReadable(this)}if(ret!==null)this.emit("data",ret);return ret};function chunkInvalid(state,chunk){var er=null;if(!Buffer.isBuffer(chunk)&&typeof chunk!=="string"&&chunk!==null&&chunk!==undefined&&!state.objectMode){er=new TypeError("Invalid non-string/buffer chunk")}return er}function onEofChunk(stream,state){if(state.ended)return;if(state.decoder){var chunk=state.decoder.end();if(chunk&&chunk.length){state.buffer.push(chunk);state.length+=state.objectMode?1:chunk.length}}state.ended=true;emitReadable(stream)}function emitReadable(stream){var state=stream._readableState;state.needReadable=false;if(!state.emittedReadable){debug("emitReadable",state.flowing);state.emittedReadable=true;if(state.sync)processNextTick(emitReadable_,stream);else emitReadable_(stream)}}function emitReadable_(stream){debug("emit readable");stream.emit("readable");flow(stream)}function maybeReadMore(stream,state){if(!state.readingMore){state.readingMore=true;processNextTick(maybeReadMore_,stream,state)}}function maybeReadMore_(stream,state){var len=state.length;while(!state.reading&&!state.flowing&&!state.ended&&state.length<state.highWaterMark){debug("maybeReadMore read 0");stream.read(0);if(len===state.length)break;else len=state.length}state.readingMore=false}Readable.prototype._read=function(n){this.emit("error",new Error("not implemented"))};Readable.prototype.pipe=function(dest,pipeOpts){var src=this;var state=this._readableState;switch(state.pipesCount){case 0:state.pipes=dest;break;case 1:state.pipes=[state.pipes,dest];break;default:state.pipes.push(dest);break}state.pipesCount+=1;debug("pipe count=%d opts=%j",state.pipesCount,pipeOpts);var doEnd=(!pipeOpts||pipeOpts.end!==false)&&dest!==process.stdout&&dest!==process.stderr;var endFn=doEnd?onend:cleanup;if(state.endEmitted)processNextTick(endFn);else src.once("end",endFn);dest.on("unpipe",onunpipe);function onunpipe(readable){debug("onunpipe");if(readable===src){cleanup()}}function onend(){debug("onend");dest.end()}var ondrain=pipeOnDrain(src);dest.on("drain",ondrain);var cleanedUp=false;function cleanup(){debug("cleanup");dest.removeListener("close",onclose);dest.removeListener("finish",onfinish);dest.removeListener("drain",ondrain);dest.removeListener("error",onerror);dest.removeListener("unpipe",onunpipe);src.removeListener("end",onend);src.removeListener("end",cleanup);src.removeListener("data",ondata);cleanedUp=true;if(state.awaitDrain&&(!dest._writableState||dest._writableState.needDrain))ondrain()}var increasedAwaitDrain=false;src.on("data",ondata);function ondata(chunk){debug("ondata");increasedAwaitDrain=false;var ret=dest.write(chunk);if(false===ret&&!increasedAwaitDrain){if((state.pipesCount===1&&state.pipes===dest||state.pipesCount>1&&indexOf(state.pipes,dest)!==-1)&&!cleanedUp){debug("false write response, pause",src._readableState.awaitDrain);src._readableState.awaitDrain++;increasedAwaitDrain=true}src.pause()}}function onerror(er){debug("onerror",er);unpipe();dest.removeListener("error",onerror);if(EElistenerCount(dest,"error")===0)dest.emit("error",er)}prependListener(dest,"error",onerror);function onclose(){dest.removeListener("finish",onfinish);unpipe()}dest.once("close",onclose);function onfinish(){debug("onfinish");dest.removeListener("close",onclose);unpipe()}dest.once("finish",onfinish);function unpipe(){debug("unpipe");src.unpipe(dest)}dest.emit("pipe",src);if(!state.flowing){debug("pipe resume");src.resume()}return dest};function pipeOnDrain(src){return function(){var state=src._readableState;debug("pipeOnDrain",state.awaitDrain);if(state.awaitDrain)state.awaitDrain--;if(state.awaitDrain===0&&EElistenerCount(src,"data")){state.flowing=true;flow(src)}}}Readable.prototype.unpipe=function(dest){var state=this._readableState;if(state.pipesCount===0)return this;if(state.pipesCount===1){if(dest&&dest!==state.pipes)return this;if(!dest)dest=state.pipes;state.pipes=null;state.pipesCount=0;state.flowing=false;if(dest)dest.emit("unpipe",this);return this}if(!dest){var dests=state.pipes;var len=state.pipesCount;state.pipes=null;state.pipesCount=0;state.flowing=false;for(var _i=0;_i<len;_i++){dests[_i].emit("unpipe",this)}return this}var i=indexOf(state.pipes,dest);if(i===-1)return this;state.pipes.splice(i,1);state.pipesCount-=1;if(state.pipesCount===1)state.pipes=state.pipes[0];dest.emit("unpipe",this);return this};Readable.prototype.on=function(ev,fn){var res=Stream.prototype.on.call(this,ev,fn);if(ev==="data"){if(this._readableState.flowing!==false)this.resume()}else if(ev==="readable"){var state=this._readableState;if(!state.endEmitted&&!state.readableListening){state.readableListening=state.needReadable=true;state.emittedReadable=false;if(!state.reading){processNextTick(nReadingNextTick,this)}else if(state.length){emitReadable(this,state)}}}return res};Readable.prototype.addListener=Readable.prototype.on;function nReadingNextTick(self){debug("readable nexttick read 0");self.read(0)}Readable.prototype.resume=function(){var state=this._readableState;if(!state.flowing){debug("resume");state.flowing=true;resume(this,state)}return this};function resume(stream,state){if(!state.resumeScheduled){state.resumeScheduled=true;processNextTick(resume_,stream,state)}}function resume_(stream,state){if(!state.reading){debug("resume read 0");stream.read(0)}state.resumeScheduled=false;state.awaitDrain=0;stream.emit("resume");flow(stream);if(state.flowing&&!state.reading)stream.read(0)}Readable.prototype.pause=function(){debug("call pause flowing=%j",this._readableState.flowing);if(false!==this._readableState.flowing){debug("pause");this._readableState.flowing=false;this.emit("pause")}return this};function flow(stream){var state=stream._readableState;debug("flow",state.flowing);while(state.flowing&&stream.read()!==null){}}Readable.prototype.wrap=function(stream){var state=this._readableState;var paused=false;var self=this;stream.on("end",function(){debug("wrapped end");if(state.decoder&&!state.ended){var chunk=state.decoder.end();if(chunk&&chunk.length)self.push(chunk)}self.push(null)});stream.on("data",function(chunk){debug("wrapped data");if(state.decoder)chunk=state.decoder.write(chunk);if(state.objectMode&&(chunk===null||chunk===undefined))return;else if(!state.objectMode&&(!chunk||!chunk.length))return;var ret=self.push(chunk);if(!ret){paused=true;stream.pause()}});for(var i in stream){if(this[i]===undefined&&typeof stream[i]==="function"){this[i]=function(method){return function(){return stream[method].apply(stream,arguments)}}(i)}}var events=["error","close","destroy","pause","resume"];forEach(events,function(ev){stream.on(ev,self.emit.bind(self,ev))});self._read=function(n){debug("wrapped _read",n);if(paused){paused=false;stream.resume()}};return self};Readable._fromList=fromList;function fromList(n,state){if(state.length===0)return null;var ret;if(state.objectMode)ret=state.buffer.shift();else if(!n||n>=state.length){if(state.decoder)ret=state.buffer.join("");else if(state.buffer.length===1)ret=state.buffer.head.data;else ret=state.buffer.concat(state.length);state.buffer.clear()}else{ret=fromListPartial(n,state.buffer,state.decoder)}return ret}function fromListPartial(n,list,hasStrings){var ret;if(n<list.head.data.length){ret=list.head.data.slice(0,n);list.head.data=list.head.data.slice(n)}else if(n===list.head.data.length){ret=list.shift()}else{ret=hasStrings?copyFromBufferString(n,list):copyFromBuffer(n,list)}return ret}function copyFromBufferString(n,list){var p=list.head;var c=1;var ret=p.data;n-=ret.length;while(p=p.next){var str=p.data;var nb=n>str.length?str.length:n;if(nb===str.length)ret+=str;else ret+=str.slice(0,n);n-=nb;if(n===0){if(nb===str.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=str.slice(nb)}break}++c}list.length-=c;return ret}function copyFromBuffer(n,list){var ret=bufferShim.allocUnsafe(n);var p=list.head;var c=1;p.data.copy(ret);n-=p.data.length;while(p=p.next){var buf=p.data;var nb=n>buf.length?buf.length:n;buf.copy(ret,ret.length-n,0,nb);n-=nb;if(n===0){if(nb===buf.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=buf.slice(nb)}break}++c}list.length-=c;return ret}function endReadable(stream){var state=stream._readableState;if(state.length>0)throw new Error('"endReadable()" called on non-empty stream');if(!state.endEmitted){state.ended=true;processNextTick(endReadableNT,state,stream)}}function endReadableNT(state,stream){if(!state.endEmitted&&state.length===0){state.endEmitted=true;stream.readable=false;stream.emit("end")}}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}function indexOf(xs,x){for(var i=0,l=xs.length;i<l;i++){if(xs[i]===x)return i}return-1}}).call(this,require("_process"))},{"./_stream_duplex":44,"./internal/streams/BufferList":49,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,isarray:40,"process-nextick-args":41,"string_decoder/":56,util:3}],47:[function(require,module,exports){"use strict";module.exports=Transform;var Duplex=require("./_stream_duplex");var util=require("core-util-is");util.inherits=require("inherits");util.inherits(Transform,Duplex);function TransformState(stream){this.afterTransform=function(er,data){return afterTransform(stream,er,data)};this.needTransform=false;this.transforming=false;this.writecb=null;this.writechunk=null;this.writeencoding=null}function afterTransform(stream,er,data){var ts=stream._transformState;ts.transforming=false;var cb=ts.writecb;if(!cb)return stream.emit("error",new Error("no writecb in Transform class"));ts.writechunk=null;ts.writecb=null;if(data!==null&&data!==undefined)stream.push(data);cb(er);var rs=stream._readableState;rs.reading=false;if(rs.needReadable||rs.length<rs.highWaterMark){stream._read(rs.highWaterMark)}}function Transform(options){if(!(this instanceof Transform))return new Transform(options);Duplex.call(this,options);this._transformState=new TransformState(this);var stream=this;this._readableState.needReadable=true;this._readableState.sync=false;if(options){if(typeof options.transform==="function")this._transform=options.transform;if(typeof options.flush==="function")this._flush=options.flush}this.once("prefinish",function(){if(typeof this._flush==="function")this._flush(function(er){done(stream,er)});else done(stream)})}Transform.prototype.push=function(chunk,encoding){this._transformState.needTransform=false;return Duplex.prototype.push.call(this,chunk,encoding)};Transform.prototype._transform=function(chunk,encoding,cb){throw new Error("Not implemented")};Transform.prototype._write=function(chunk,encoding,cb){var ts=this._transformState;ts.writecb=cb;ts.writechunk=chunk;ts.writeencoding=encoding;if(!ts.transforming){var rs=this._readableState;if(ts.needTransform||rs.needReadable||rs.length<rs.highWaterMark)this._read(rs.highWaterMark)}};Transform.prototype._read=function(n){var ts=this._transformState;if(ts.writechunk!==null&&ts.writecb&&!ts.transforming){ts.transforming=true;this._transform(ts.writechunk,ts.writeencoding,ts.afterTransform)}else{ts.needTransform=true}};function done(stream,er){if(er)return stream.emit("error",er);var ws=stream._writableState;var ts=stream._transformState;if(ws.length)throw new Error("Calling transform done when ws.length != 0");if(ts.transforming)throw new Error("Calling transform done when still transforming");return stream.push(null)}},{"./_stream_duplex":44,"core-util-is":6,inherits:38}],48:[function(require,module,exports){(function(process){"use strict";module.exports=Writable;var processNextTick=require("process-nextick-args");var asyncWrite=!process.browser&&["v0.10","v0.9."].indexOf(process.version.slice(0,5))>-1?setImmediate:processNextTick;Writable.WritableState=WritableState;var util=require("core-util-is");util.inherits=require("inherits");var internalUtil={deprecate:require("util-deprecate")};var Stream;(function(){try{Stream=require("st"+"ream")}catch(_){}finally{if(!Stream)Stream=require("events").EventEmitter}})();var Buffer=require("buffer").Buffer;var bufferShim=require("buffer-shims");util.inherits(Writable,Stream);function nop(){}function WriteReq(chunk,encoding,cb){this.chunk=chunk;this.encoding=encoding;this.callback=cb;this.next=null}var Duplex;function WritableState(options,stream){Duplex=Duplex||require("./_stream_duplex");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.writableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.needDrain=false;this.ending=false;this.ended=false;this.finished=false;var noDecode=options.decodeStrings===false;this.decodeStrings=!noDecode;this.defaultEncoding=options.defaultEncoding||"utf8";this.length=0;this.writing=false;this.corked=0;this.sync=true;this.bufferProcessing=false;this.onwrite=function(er){onwrite(stream,er)};this.writecb=null;this.writelen=0;this.bufferedRequest=null;this.lastBufferedRequest=null;this.pendingcb=0;this.prefinished=false;this.errorEmitted=false;this.bufferedRequestCount=0;this.corkedRequestsFree=new CorkedRequest(this)}WritableState.prototype.getBuffer=function writableStateGetBuffer(){var current=this.bufferedRequest;var out=[];while(current){out.push(current);current=current.next}return out};(function(){try{Object.defineProperty(WritableState.prototype,"buffer",{get:internalUtil.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer "+"instead.")})}catch(_){}})();var Duplex;function Writable(options){Duplex=Duplex||require("./_stream_duplex");if(!(this instanceof Writable)&&!(this instanceof Duplex))return new Writable(options);this._writableState=new WritableState(options,this);this.writable=true;if(options){if(typeof options.write==="function")this._write=options.write;if(typeof options.writev==="function")this._writev=options.writev}Stream.call(this)}Writable.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))};function writeAfterEnd(stream,cb){var er=new Error("write after end");stream.emit("error",er);processNextTick(cb,er)}function validChunk(stream,state,chunk,cb){var valid=true;var er=false;if(chunk===null){er=new TypeError("May not write null values to stream")}else if(!Buffer.isBuffer(chunk)&&typeof chunk!=="string"&&chunk!==undefined&&!state.objectMode){er=new TypeError("Invalid non-string/buffer chunk")}if(er){stream.emit("error",er);processNextTick(cb,er);valid=false}return valid}Writable.prototype.write=function(chunk,encoding,cb){var state=this._writableState;var ret=false;if(typeof encoding==="function"){cb=encoding;encoding=null}if(Buffer.isBuffer(chunk))encoding="buffer";else if(!encoding)encoding=state.defaultEncoding;if(typeof cb!=="function")cb=nop;if(state.ended)writeAfterEnd(this,cb);else if(validChunk(this,state,chunk,cb)){
-state.pendingcb++;ret=writeOrBuffer(this,state,chunk,encoding,cb)}return ret};Writable.prototype.cork=function(){var state=this._writableState;state.corked++};Writable.prototype.uncork=function(){var state=this._writableState;if(state.corked){state.corked--;if(!state.writing&&!state.corked&&!state.finished&&!state.bufferProcessing&&state.bufferedRequest)clearBuffer(this,state)}};Writable.prototype.setDefaultEncoding=function setDefaultEncoding(encoding){if(typeof encoding==="string")encoding=encoding.toLowerCase();if(!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((encoding+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+encoding);this._writableState.defaultEncoding=encoding;return this};function decodeChunk(state,chunk,encoding){if(!state.objectMode&&state.decodeStrings!==false&&typeof chunk==="string"){chunk=bufferShim.from(chunk,encoding)}return chunk}function writeOrBuffer(stream,state,chunk,encoding,cb){chunk=decodeChunk(state,chunk,encoding);if(Buffer.isBuffer(chunk))encoding="buffer";var len=state.objectMode?1:chunk.length;state.length+=len;var ret=state.length<state.highWaterMark;if(!ret)state.needDrain=true;if(state.writing||state.corked){var last=state.lastBufferedRequest;state.lastBufferedRequest=new WriteReq(chunk,encoding,cb);if(last){last.next=state.lastBufferedRequest}else{state.bufferedRequest=state.lastBufferedRequest}state.bufferedRequestCount+=1}else{doWrite(stream,state,false,len,chunk,encoding,cb)}return ret}function doWrite(stream,state,writev,len,chunk,encoding,cb){state.writelen=len;state.writecb=cb;state.writing=true;state.sync=true;if(writev)stream._writev(chunk,state.onwrite);else stream._write(chunk,encoding,state.onwrite);state.sync=false}function onwriteError(stream,state,sync,er,cb){--state.pendingcb;if(sync)processNextTick(cb,er);else cb(er);stream._writableState.errorEmitted=true;stream.emit("error",er)}function onwriteStateUpdate(state){state.writing=false;state.writecb=null;state.length-=state.writelen;state.writelen=0}function onwrite(stream,er){var state=stream._writableState;var sync=state.sync;var cb=state.writecb;onwriteStateUpdate(state);if(er)onwriteError(stream,state,sync,er,cb);else{var finished=needFinish(state);if(!finished&&!state.corked&&!state.bufferProcessing&&state.bufferedRequest){clearBuffer(stream,state)}if(sync){asyncWrite(afterWrite,stream,state,finished,cb)}else{afterWrite(stream,state,finished,cb)}}}function afterWrite(stream,state,finished,cb){if(!finished)onwriteDrain(stream,state);state.pendingcb--;cb();finishMaybe(stream,state)}function onwriteDrain(stream,state){if(state.length===0&&state.needDrain){state.needDrain=false;stream.emit("drain")}}function clearBuffer(stream,state){state.bufferProcessing=true;var entry=state.bufferedRequest;if(stream._writev&&entry&&entry.next){var l=state.bufferedRequestCount;var buffer=new Array(l);var holder=state.corkedRequestsFree;holder.entry=entry;var count=0;while(entry){buffer[count]=entry;entry=entry.next;count+=1}doWrite(stream,state,true,state.length,buffer,"",holder.finish);state.pendingcb++;state.lastBufferedRequest=null;if(holder.next){state.corkedRequestsFree=holder.next;holder.next=null}else{state.corkedRequestsFree=new CorkedRequest(state)}}else{while(entry){var chunk=entry.chunk;var encoding=entry.encoding;var cb=entry.callback;var len=state.objectMode?1:chunk.length;doWrite(stream,state,false,len,chunk,encoding,cb);entry=entry.next;if(state.writing){break}}if(entry===null)state.lastBufferedRequest=null}state.bufferedRequestCount=0;state.bufferedRequest=entry;state.bufferProcessing=false}Writable.prototype._write=function(chunk,encoding,cb){cb(new Error("not implemented"))};Writable.prototype._writev=null;Writable.prototype.end=function(chunk,encoding,cb){var state=this._writableState;if(typeof chunk==="function"){cb=chunk;chunk=null;encoding=null}else if(typeof encoding==="function"){cb=encoding;encoding=null}if(chunk!==null&&chunk!==undefined)this.write(chunk,encoding);if(state.corked){state.corked=1;this.uncork()}if(!state.ending&&!state.finished)endWritable(this,state,cb)};function needFinish(state){return state.ending&&state.length===0&&state.bufferedRequest===null&&!state.finished&&!state.writing}function prefinish(stream,state){if(!state.prefinished){state.prefinished=true;stream.emit("prefinish")}}function finishMaybe(stream,state){var need=needFinish(state);if(need){if(state.pendingcb===0){prefinish(stream,state);state.finished=true;stream.emit("finish")}else{prefinish(stream,state)}}return need}function endWritable(stream,state,cb){state.ending=true;finishMaybe(stream,state);if(cb){if(state.finished)processNextTick(cb);else stream.once("finish",cb)}state.ended=true;stream.writable=false}function CorkedRequest(state){var _this=this;this.next=null;this.entry=null;this.finish=function(err){var entry=_this.entry;_this.entry=null;while(entry){var cb=entry.callback;state.pendingcb--;cb(err);entry=entry.next}if(state.corkedRequestsFree){state.corkedRequestsFree.next=_this}else{state.corkedRequestsFree=_this}}}}).call(this,require("_process"))},{"./_stream_duplex":44,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,"process-nextick-args":41,"util-deprecate":57}],49:[function(require,module,exports){"use strict";var Buffer=require("buffer").Buffer;var bufferShim=require("buffer-shims");module.exports=BufferList;function BufferList(){this.head=null;this.tail=null;this.length=0}BufferList.prototype.push=function(v){var entry={data:v,next:null};if(this.length>0)this.tail.next=entry;else this.head=entry;this.tail=entry;++this.length};BufferList.prototype.unshift=function(v){var entry={data:v,next:this.head};if(this.length===0)this.tail=entry;this.head=entry;++this.length};BufferList.prototype.shift=function(){if(this.length===0)return;var ret=this.head.data;if(this.length===1)this.head=this.tail=null;else this.head=this.head.next;--this.length;return ret};BufferList.prototype.clear=function(){this.head=this.tail=null;this.length=0};BufferList.prototype.join=function(s){if(this.length===0)return"";var p=this.head;var ret=""+p.data;while(p=p.next){ret+=s+p.data}return ret};BufferList.prototype.concat=function(n){if(this.length===0)return bufferShim.alloc(0);if(this.length===1)return this.head.data;var ret=bufferShim.allocUnsafe(n>>>0);var p=this.head;var i=0;while(p){p.data.copy(ret,i);i+=p.data.length;p=p.next}return ret}},{buffer:5,"buffer-shims":4}],50:[function(require,module,exports){module.exports=require("./lib/_stream_passthrough.js")},{"./lib/_stream_passthrough.js":45}],51:[function(require,module,exports){(function(process){var Stream=function(){try{return require("st"+"ream")}catch(_){}}();exports=module.exports=require("./lib/_stream_readable.js");exports.Stream=Stream||exports;exports.Readable=exports;exports.Writable=require("./lib/_stream_writable.js");exports.Duplex=require("./lib/_stream_duplex.js");exports.Transform=require("./lib/_stream_transform.js");exports.PassThrough=require("./lib/_stream_passthrough.js");if(!process.browser&&process.env.READABLE_STREAM==="disable"&&Stream){module.exports=Stream}}).call(this,require("_process"))},{"./lib/_stream_duplex.js":44,"./lib/_stream_passthrough.js":45,"./lib/_stream_readable.js":46,"./lib/_stream_transform.js":47,"./lib/_stream_writable.js":48,_process:42}],52:[function(require,module,exports){module.exports=require("./lib/_stream_transform.js")},{"./lib/_stream_transform.js":47}],53:[function(require,module,exports){module.exports=require("./lib/_stream_writable.js")},{"./lib/_stream_writable.js":48}],54:[function(require,module,exports){module.exports=function(string){return string.replace(/[-\\^$*+?.()|[\]{}]/g,"\\$&")}},{}],55:[function(require,module,exports){module.exports=Stream;var EE=require("events").EventEmitter;var inherits=require("inherits");inherits(Stream,EE);Stream.Readable=require("readable-stream/readable.js");Stream.Writable=require("readable-stream/writable.js");Stream.Duplex=require("readable-stream/duplex.js");Stream.Transform=require("readable-stream/transform.js");Stream.PassThrough=require("readable-stream/passthrough.js");Stream.Stream=Stream;function Stream(){EE.call(this)}Stream.prototype.pipe=function(dest,options){var source=this;function ondata(chunk){if(dest.writable){if(false===dest.write(chunk)&&source.pause){source.pause()}}}source.on("data",ondata);function ondrain(){if(source.readable&&source.resume){source.resume()}}dest.on("drain",ondrain);if(!dest._isStdio&&(!options||options.end!==false)){source.on("end",onend);source.on("close",onclose)}var didOnEnd=false;function onend(){if(didOnEnd)return;didOnEnd=true;dest.end()}function onclose(){if(didOnEnd)return;didOnEnd=true;if(typeof dest.destroy==="function")dest.destroy()}function onerror(er){cleanup();if(EE.listenerCount(this,"error")===0){throw er}}source.on("error",onerror);dest.on("error",onerror);function cleanup(){source.removeListener("data",ondata);dest.removeListener("drain",ondrain);source.removeListener("end",onend);source.removeListener("close",onclose);source.removeListener("error",onerror);dest.removeListener("error",onerror);source.removeListener("end",cleanup);source.removeListener("close",cleanup);dest.removeListener("close",cleanup)}source.on("end",cleanup);source.on("close",cleanup);dest.on("close",cleanup);dest.emit("pipe",source);return dest}},{events:28,inherits:38,"readable-stream/duplex.js":43,"readable-stream/passthrough.js":50,"readable-stream/readable.js":51,"readable-stream/transform.js":52,"readable-stream/writable.js":53}],56:[function(require,module,exports){var Buffer=require("buffer").Buffer;var isBufferEncoding=Buffer.isEncoding||function(encoding){switch(encoding&&encoding.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return true;default:return false}};function assertEncoding(encoding){if(encoding&&!isBufferEncoding(encoding)){throw new Error("Unknown encoding: "+encoding)}}var StringDecoder=exports.StringDecoder=function(encoding){this.encoding=(encoding||"utf8").toLowerCase().replace(/[-_]/,"");assertEncoding(encoding);switch(this.encoding){case"utf8":this.surrogateSize=3;break;case"ucs2":case"utf16le":this.surrogateSize=2;this.detectIncompleteChar=utf16DetectIncompleteChar;break;case"base64":this.surrogateSize=3;this.detectIncompleteChar=base64DetectIncompleteChar;break;default:this.write=passThroughWrite;return}this.charBuffer=new Buffer(6);this.charReceived=0;this.charLength=0};StringDecoder.prototype.write=function(buffer){var charStr="";while(this.charLength){var available=buffer.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:buffer.length;buffer.copy(this.charBuffer,this.charReceived,0,available);this.charReceived+=available;if(this.charReceived<this.charLength){return""}buffer=buffer.slice(available,buffer.length);charStr=this.charBuffer.slice(0,this.charLength).toString(this.encoding);var charCode=charStr.charCodeAt(charStr.length-1);if(charCode>=55296&&charCode<=56319){this.charLength+=this.surrogateSize;charStr="";continue}this.charReceived=this.charLength=0;if(buffer.length===0){return charStr}break}this.detectIncompleteChar(buffer);var end=buffer.length;if(this.charLength){buffer.copy(this.charBuffer,0,buffer.length-this.charReceived,end);end-=this.charReceived}charStr+=buffer.toString(this.encoding,0,end);var end=charStr.length-1;var charCode=charStr.charCodeAt(end);if(charCode>=55296&&charCode<=56319){var size=this.surrogateSize;this.charLength+=size;this.charReceived+=size;this.charBuffer.copy(this.charBuffer,size,0,size);buffer.copy(this.charBuffer,0,0,size);return charStr.substring(0,end)}return charStr};StringDecoder.prototype.detectIncompleteChar=function(buffer){var i=buffer.length>=3?3:buffer.length;for(;i>0;i--){var c=buffer[buffer.length-i];if(i==1&&c>>5==6){this.charLength=2;break}if(i<=2&&c>>4==14){this.charLength=3;break}if(i<=3&&c>>3==30){this.charLength=4;break}}this.charReceived=i};StringDecoder.prototype.end=function(buffer){var res="";if(buffer&&buffer.length)res=this.write(buffer);if(this.charReceived){var cr=this.charReceived;var buf=this.charBuffer;var enc=this.encoding;res+=buf.slice(0,cr).toString(enc)}return res};function passThroughWrite(buffer){return buffer.toString(this.encoding)}function utf16DetectIncompleteChar(buffer){this.charReceived=buffer.length%2;this.charLength=this.charReceived?2:0}function base64DetectIncompleteChar(buffer){this.charReceived=buffer.length%3;this.charLength=this.charReceived?3:0}},{buffer:5}],57:[function(require,module,exports){(function(global){module.exports=deprecate;function deprecate(fn,msg){if(config("noDeprecation")){return fn}var warned=false;function deprecated(){if(!warned){if(config("throwDeprecation")){throw new Error(msg)}else if(config("traceDeprecation")){console.trace(msg)}else{console.warn(msg)}warned=true}return fn.apply(this,arguments)}return deprecated}function config(name){try{if(!global.localStorage)return false}catch(_){return false}var val=global.localStorage[name];if(null==val)return false;return String(val).toLowerCase()==="true"}}).call(this,typeof global!=="undefined"?global:typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{}],58:[function(require,module,exports){module.exports=extend;var hasOwnProperty=Object.prototype.hasOwnProperty;function extend(){var target={};for(var i=0;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(hasOwnProperty.call(source,key)){target[key]=source[key]}}}return target}},{}]},{},[1])(1)});
-
-/**
- * swagger-client - swagger-client is a javascript client for use with swaggering APIs.
- * @version v2.1.29
- * @link http://swagger.io
- * @license Apache-2.0
- */
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.SwaggerClient = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-'use strict';
-
-var auth = require('./lib/auth');
-var helpers = require('./lib/helpers');
-var SwaggerClient = require('./lib/client');
-var deprecationWrapper = function (url, options) {
-  helpers.log('This is deprecated, use "new SwaggerClient" instead.');
-
-  return new SwaggerClient(url, options);
-};
-
-/* Here for IE8 Support */
-if (!Array.prototype.indexOf) {
-  Array.prototype.indexOf = function(obj, start) {
-    for (var i = (start || 0), j = this.length; i < j; i++) {
-      if (this[i] === obj) { return i; }
-    }
-    return -1;
-  };
-}
-
-/* Here for IE8 Support */
-if (!String.prototype.trim) {
-  String.prototype.trim = function () {
-    return this.replace(/^\s+|\s+$/g, '');
-  };
-}
-
-/* Here for node 10.x support */
-if (!String.prototype.endsWith) {
-  String.prototype.endsWith = function(suffix) {
-    return this.indexOf(suffix, this.length - suffix.length) !== -1;
-  };
-}
-
-module.exports = SwaggerClient;
-
-SwaggerClient.ApiKeyAuthorization = auth.ApiKeyAuthorization;
-SwaggerClient.PasswordAuthorization = auth.PasswordAuthorization;
-SwaggerClient.CookieAuthorization = auth.CookieAuthorization;
-SwaggerClient.SwaggerApi = deprecationWrapper;
-SwaggerClient.SwaggerClient = deprecationWrapper;
-SwaggerClient.SchemaMarkup = require('./lib/schema-markup');
-
-},{"./lib/auth":2,"./lib/client":3,"./lib/helpers":4,"./lib/schema-markup":7}],2:[function(require,module,exports){
-'use strict';
-
-var helpers = require('./helpers');
-var btoa = require('btoa'); // jshint ignore:line
-var CookieJar = require('cookiejar').CookieJar;
-var _ = {
-  each: require('lodash-compat/collection/each'),
-  includes: require('lodash-compat/collection/includes'),
-  isObject: require('lodash-compat/lang/isObject'),
-  isArray: require('lodash-compat/lang/isArray')
-};
-
-/**
- * SwaggerAuthorizations applies the correct authorization to an operation being executed
- */
-var SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (authz) {
-  this.authz = authz || {};
-};
-
-/**
- * Add auths to the hash
- * Will overwrite any existing
- *
- */
-SwaggerAuthorizations.prototype.add = function (name, auth) {
-  if(_.isObject(name)) {
-    for (var key in name) {
-      this.authz[key] = name[key];
-    }
-  } else if(typeof name === 'string' ){
-    this.authz[name] = auth;
-  }
-
-  return auth;
-};
-
-SwaggerAuthorizations.prototype.remove = function (name) {
-  return delete this.authz[name];
-};
-
-SwaggerAuthorizations.prototype.apply = function (obj, securities) {
-  var status = true;
-  var applyAll = !securities;
-  var flattenedSecurities = [];
-
-  // favor the object-level authorizations over global
-  var authz = obj.clientAuthorizations || this.authz;
-
-  // Securities could be [ {} ]
-  _.each(securities, function (obj, key) {
-
-    // Make sure we account for securities being [ str ]
-    if(typeof key === 'string') {
-      flattenedSecurities.push(key);
-    }
-
-    // Flatten keys in to our array
-    _.each(obj, function (val, key) {
-      flattenedSecurities.push(key);
-    });
-  });
-
-  _.each(authz, function (auth, authName) {
-    if(applyAll || _.includes(flattenedSecurities, authName)) {
-      var newStatus = auth.apply(obj);
-      status = status && !!newStatus; // logical ORs regarding status
-    }
-  });
-
-  return status;
-};
-
-/**
- * ApiKeyAuthorization allows a query param or header to be injected
- */
-var ApiKeyAuthorization = module.exports.ApiKeyAuthorization = function (name, value, type) {
-  this.name = name;
-  this.value = value;
-  this.type = type;
-};
-
-ApiKeyAuthorization.prototype.apply = function (obj) {
-  if (this.type === 'query') {
-    // see if already applied.  If so, don't do it again
-
-    var qp;
-    if (obj.url.indexOf('?') > 0) {
-      qp = obj.url.substring(obj.url.indexOf('?') + 1);
-      var parts = qp.split('&');
-      if(parts && parts.length > 0) {
-        for(var i = 0; i < parts.length; i++) {
-          var kv = parts[i].split('=');
-          if(kv && kv.length > 0) {
-            if (kv[0] === this.name) {
-              // skip it
-              return false;
-            }
-          }
-        }
-      }
-    }
-
-    if (obj.url.indexOf('?') > 0) {
-      obj.url = obj.url + '&' + this.name + '=' + this.value;
-    } else {
-      obj.url = obj.url + '?' + this.name + '=' + this.value;
-    }
-
-    return true;
-  } else if (this.type === 'header') {
-    if(typeof obj.headers[this.name] === 'undefined') {
-      obj.headers[this.name] = this.value;
-    }
-
-    return true;
-  }
-};
-
-var CookieAuthorization = module.exports.CookieAuthorization = function (cookie) {
-  this.cookie = cookie;
-};
-
-CookieAuthorization.prototype.apply = function (obj) {
-  obj.cookieJar = obj.cookieJar || new CookieJar();
-  obj.cookieJar.setCookie(this.cookie);
-
-  return true;
-};
-
-/**
- * Password Authorization is a basic auth implementation
- */
-var PasswordAuthorization = module.exports.PasswordAuthorization = function (username, password) {
-  if (arguments.length === 3) {
-    helpers.log('PasswordAuthorization: the \'name\' argument has been removed, pass only username and password');
-    username = arguments[1];
-    password = arguments[2];
-  }
-  this.username = username;
-  this.password = password;
-};
-
-PasswordAuthorization.prototype.apply = function (obj) {
-  if(typeof obj.headers.Authorization === 'undefined') {
-    obj.headers.Authorization = 'Basic ' + btoa(this.username + ':' + this.password);
-  }
-
-  return true;
-};
-
-},{"./helpers":4,"btoa":13,"cookiejar":18,"lodash-compat/collection/each":52,"lodash-compat/collection/includes":55,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isObject":144}],3:[function(require,module,exports){
-'use strict';
-
-var _ = {
-  bind: require('lodash-compat/function/bind'),
-  cloneDeep: require('lodash-compat/lang/cloneDeep'),
-  find: require('lodash-compat/collection/find'),
-  forEach: require('lodash-compat/collection/forEach'),
-  indexOf: require('lodash-compat/array/indexOf'),
-  isArray: require('lodash-compat/lang/isArray'),
-  isObject: require('lodash-compat/lang/isObject'),
-  isFunction: require('lodash-compat/lang/isFunction'),
-  isPlainObject: require('lodash-compat/lang/isPlainObject'),
-  isUndefined: require('lodash-compat/lang/isUndefined')
-};
-var auth = require('./auth');
-var helpers = require('./helpers');
-var Model = require('./types/model');
-var Operation = require('./types/operation');
-var OperationGroup = require('./types/operationGroup');
-var Resolver = require('./resolver');
-var SwaggerHttp = require('./http');
-var SwaggerSpecConverter = require('./spec-converter');
-var Q = require('q');
-
-// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the
-// following usage: 'client.{tagName}'
-var reservedClientTags = [
-  'apis',
-  'authorizationScheme',
-  'authorizations',
-  'basePath',
-  'build',
-  'buildFrom1_1Spec',
-  'buildFrom1_2Spec',
-  'buildFromSpec',
-  'clientAuthorizations',
-  'convertInfo',
-  'debug',
-  'defaultErrorCallback',
-  'defaultSuccessCallback',
-  'enableCookies',
-  'fail',
-  'failure',
-  'finish',
-  'help',
-  'host',
-  'idFromOp',
-  'info',
-  'initialize',
-  'isBuilt',
-  'isValid',
-  'modelPropertyMacro',
-  'models',
-  'modelsArray',
-  'options',
-  'parameterMacro',
-  'parseUri',
-  'progress',
-  'resourceCount',
-  'sampleModels',
-  'selfReflect',
-  'setConsolidatedModels',
-  'spec',
-  'supportedSubmitMethods',
-  'swaggerRequestHeaders',
-  'tagFromLabel',
-  'title',
-  'url',
-  'useJQuery',
-  'jqueryAjaxCache'
-];
-// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the
-// following usage: 'client.apis.{tagName}'
-var reservedApiTags = [
-  'apis',
-  'asCurl',
-  'description',
-  'externalDocs',
-  'help',
-  'label',
-  'name',
-  'operation',
-  'operations',
-  'operationsArray',
-  'path',
-  'tag'
-];
-var supportedOperationMethods = ['delete', 'get', 'head', 'options', 'patch', 'post', 'put'];
-var SwaggerClient = module.exports = function (url, options) {
-  this.authorizations = null;
-  this.authorizationScheme = null;
-  this.basePath = null;
-  this.debug = false;
-  this.enableCookies = false;
-  this.info = null;
-  this.isBuilt = false;
-  this.isValid = false;
-  this.modelsArray = [];
-  this.resourceCount = 0;
-  this.url = null;
-  this.useJQuery = false;
-  this.jqueryAjaxCache = false;
-  this.swaggerObject = {};
-  this.deferredClient = undefined;
-
-  this.clientAuthorizations = new auth.SwaggerAuthorizations();
-
-  if (typeof url !== 'undefined') {
-    return this.initialize(url, options);
-  } else {
-    return this;
-  }
-};
-
-SwaggerClient.prototype.initialize = function (url, options) {
-  this.models = {};
-  this.sampleModels = {};
-
-  if (typeof url === 'string') {
-    this.url = url;
-  } else if (_.isObject(url)) {
-    options = url;
-    this.url = options.url;
-  }
-
-  if(this.url && this.url.indexOf('http:') === -1 && this.url.indexOf('https:') === -1) {
-    // no protocol, so we can only use window if it exists
-    if(typeof(window) !== 'undefined' && window && window.location) {
-      this.url = window.location.origin + this.url;
-    }
-  }
-
-  options = options || {};
-  this.clientAuthorizations.add(options.authorizations);
-  this.swaggerRequestHeaders = options.swaggerRequestHeaders || 'application/json;charset=utf-8,*/*';
-  this.defaultSuccessCallback = options.defaultSuccessCallback || null;
-  this.defaultErrorCallback = options.defaultErrorCallback || null;
-  this.modelPropertyMacro = options.modelPropertyMacro || null;
-  this.connectionAgent = options.connectionAgent || null;
-  this.parameterMacro = options.parameterMacro || null;
-  this.usePromise = options.usePromise || null;
-
-  // operation request timeout default
-  this.timeout = options.timeout || null;
-  // default to request timeout when not specified
-  this.fetchSpecTimeout = typeof options.fetchSpecTimeout !== 'undefined' ?
-      options.fetchSpecTimeout : options.timeout || null;
-
-  if(this.usePromise) {
-    this.deferredClient = Q.defer();
-  }
-
-  if (typeof options.success === 'function') {
-    this.success = options.success;
-  }
-  if (options.useJQuery) {
-    this.useJQuery = options.useJQuery;
-  }
-
-  if (options.jqueryAjaxCache) {
-    this.jqueryAjaxCache = options.jqueryAjaxCache;
-  }
-
-  if (options.enableCookies) {
-    this.enableCookies = options.enableCookies;
-  }
-
-  this.options = options || {};
-
-  // maybe don't need this?
-  this.options.timeout = this.timeout;
-  this.options.fetchSpecTimeout = this.fetchSpecTimeout;
-
-  this.supportedSubmitMethods = options.supportedSubmitMethods || [];
-  this.failure = options.failure || function (err) { throw err; };
-  this.progress = options.progress || function () {};
-  this.spec = _.cloneDeep(options.spec); // Clone so we do not alter the provided document
-
-  if (options.scheme) {
-    this.scheme = options.scheme;
-  }
-
-  if (this.usePromise || typeof options.success === 'function') {
-    this.ready = true;
-    return this.build();
-  }
-};
-
-SwaggerClient.prototype.build = function (mock) {
-  if (this.isBuilt) {
-    return this;
-  }
-
-  var self = this;
-
-  if (this.spec) {
-    this.progress('fetching resource list; Please wait.');
-  } else {
-    this.progress('fetching resource list: ' + this.url + '; Please wait.');
-  }
-
-  var obj = {
-    useJQuery: this.useJQuery,
-    jqueryAjaxCache: this.jqueryAjaxCache,
-    connectionAgent: this.connectionAgent,
-    enableCookies: this.enableCookies,
-    url: this.url,
-    method: 'get',
-    headers: {
-      accept: this.swaggerRequestHeaders
-    },
-    on: {
-      error: function (response) {
-        if (self.url.substring(0, 4) !== 'http') {
-          return self.fail('Please specify the protocol for ' + self.url);
-        } else if (response.errObj && (response.errObj.code === 'ECONNABORTED' || response.errObj.message.indexOf('timeout') !== -1)) {
-          return self.fail('Request timed out after ' + self.fetchSpecTimeout + 'ms');
-        } else if (response.status === 0) {
-          return self.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
-        } else if (response.status === 404) {
-          return self.fail('Can\'t read swagger JSON from ' + self.url);
-        } else {
-          return self.fail(response.status + ' : ' + response.statusText + ' ' + self.url);
-        }
-      },
-      response: function (resp) {
-
-        var responseObj = resp.obj;
-        if(!responseObj) {
-          return self.fail('failed to parse JSON/YAML response');
-        }
-
-        self.swaggerVersion = responseObj.swaggerVersion;
-        self.swaggerObject = responseObj;
-
-        if (responseObj.swagger && parseInt(responseObj.swagger) === 2) {
-          self.swaggerVersion = responseObj.swagger;
-
-          new Resolver().resolve(responseObj, self.url, self.buildFromSpec, self);
-
-          self.isValid = true;
-        } else {
-          var converter = new SwaggerSpecConverter();
-          self.oldSwaggerObject = self.swaggerObject;
-
-          converter.setDocumentationLocation(self.url);
-          converter.convert(responseObj, self.clientAuthorizations, self.options, function(spec) {
-            self.swaggerObject = spec;
-            new Resolver().resolve(spec, self.url, self.buildFromSpec, self);
-            self.isValid = true;
-          });
-        }
-      }
-    }
-  };
-
-  // only set timeout when specified
-  if (this.fetchSpecTimeout) {
-    obj.timeout = this.fetchSpecTimeout;
-  }
-
-  if (this.spec) {
-    self.swaggerObject = this.spec;
-    setTimeout(function () {
-      new Resolver().resolve(self.spec, self.url, self.buildFromSpec, self);
-    }, 10);
-  } else {
-    this.clientAuthorizations.apply(obj);
-
-    if (mock) {
-      return obj;
-    }
-
-    new SwaggerHttp().execute(obj, this.options);
-  }
-
-  return (this.usePromise) ? this.deferredClient.promise : this;
-};
-
-SwaggerClient.prototype.buildFromSpec = function (response) {
-  if (this.isBuilt) {
-    return this;
-  }
-
-  this.apis = {};
-  this.apisArray = [];
-  this.basePath = response.basePath || '';
-  this.consumes = response.consumes;
-  this.host = response.host || '';
-  this.info = response.info || {};
-  this.produces = response.produces;
-  this.schemes = response.schemes || [];
-  this.securityDefinitions = _.cloneDeep(response.securityDefinitions);
-  this.security = response.security;
-  this.title = response.title || '';
-
-  var key, definedTags = {}, k, location, self = this, i;
-
-  if (response.externalDocs) {
-    this.externalDocs = response.externalDocs;
-  }
-
-  // legacy support
-  this.authSchemes = this.securityDefinitions;
-
-  if(this.securityDefinitions) {
-    for(key in this.securityDefinitions) {
-      var securityDefinition = this.securityDefinitions[key];
-      securityDefinition.vendorExtensions = {};
-      for(var ext in securityDefinition) {
-        helpers.extractExtensions(ext, securityDefinition);
-        if (ext === 'scopes') {
-          var scopes = securityDefinition[ext];
-          if(typeof scopes === 'object') {
-            scopes.vendorExtensions = {};
-            for (var s in scopes) {
-              helpers.extractExtensions(s, scopes);
-              if(s.indexOf('x-') === 0) {
-                delete scopes[s];
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (Array.isArray(response.tags)) {
-    definedTags = {};
-
-    for (k = 0; k < response.tags.length; k++) {
-      var t = _.cloneDeep(response.tags[k]);
-      definedTags[t.name] = t;
-      for(i in t) {
-        if(i === 'externalDocs' && typeof t[i] === 'object') {
-          for(var j in t[i]) {
-            helpers.extractExtensions(j, t[i]);
-          }
-        }
-        helpers.extractExtensions(i, t);
-      }
-    }
-  }
-
-
-  if (typeof this.url === 'string') {
-    location = this.parseUri(this.url);
-    if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {
-      if(typeof window !== 'undefined') {
-        // use the window scheme
-        this.scheme = window.location.protocol.replace(':','');
-      }
-      else {
-        this.scheme = location.scheme || 'http';
-      }
-    } else if (typeof window !== 'undefined' && window.location.protocol.indexOf('chrome-extension') === 0) {
-		// if it is chrome swagger ui extension scheme then let swagger doc url scheme decide the protocol
-		this.scheme = location.scheme;
-	} else if (typeof this.scheme === 'undefined') {
-      if(typeof window !== 'undefined') {
-        var scheme = window.location.protocol.replace(':','');
-        if(scheme === 'https' && this.schemes.indexOf(scheme) === -1) {
-          // can't call http from https served page in a browser!
-          helpers.log('Cannot call a http server from https inside a browser!');
-          this.scheme = 'http';
-        }
-        else if(this.schemes.indexOf(scheme) !== -1) {
-          this.scheme = scheme;
-        }
-        else {
-          if(this.schemes.indexOf('https') !== -1) {
-            this.scheme = 'https';
-          }
-          else {
-            this.scheme = 'http';
-          }
-        }
-      }
-      else {
-        this.scheme = this.schemes[0] || location.scheme;
-      }
-    }
-
-    if (typeof this.host === 'undefined' || this.host === '') {
-      this.host = location.host;
-
-      if (location.port) {
-        this.host = this.host + ':' + location.port;
-      }
-    }
-  }
-  else {
-    if (typeof this.schemes === 'undefined' || this.schemes.length === 0) {
-      this.scheme = 'http';
-    }
-    else if (typeof this.scheme === 'undefined') {
-      this.scheme = this.schemes[0];
-    }
-  }
-
-  this.definitions = response.definitions;
-
-  for (key in this.definitions) {
-    var model = new Model(key, this.definitions[key], this.models, this.modelPropertyMacro);
-
-    if (model) {
-      this.models[key] = model;
-    }
-  }
-
-  // get paths, create functions for each operationId
-
-  // Bind help to 'client.apis'
-  self.apis.help = _.bind(self.help, self);
-
-  _.forEach(response.paths, function (pathObj, path) {
-    // Only process a path if it's an object
-    if (!_.isPlainObject(pathObj)) {
-      return;
-    }
-
-    _.forEach(supportedOperationMethods, function (method) {
-      var operation = pathObj[method];
-
-      if (_.isUndefined(operation)) {
-        // Operation does not exist
-        return;
-      } else if (!_.isPlainObject(operation)) {
-        // Operation exists but it is not an Operation Object.  Since this is invalid, log it.
-        helpers.log('The \'' + method + '\' operation for \'' + path + '\' path is not an Operation Object');
-
-        return;
-      }
-
-      var tags = operation.tags;
-
-      if (_.isUndefined(tags) || !_.isArray(tags) || tags.length === 0) {
-        tags = operation.tags = [ 'default' ];
-      }
-
-      var operationId = self.idFromOp(path, method, operation);
-
-      var operationObject = new Operation(self,
-        operation.scheme,
-        operationId,
-        method,
-        path,
-        operation,
-        self.definitions,
-        self.models,
-        self.clientAuthorizations);
-
-      operationObject.connectionAgent = self.connectionAgent;
-      operationObject.vendorExtensions = {};
-      for(i in operation) {
-        helpers.extractExtensions(i, operationObject, operation[i]);
-      }
-      operationObject.externalDocs = operation.externalDocs;
-      if(operationObject.externalDocs) {
-        operationObject.externalDocs = _.cloneDeep(operationObject.externalDocs);
-        operationObject.externalDocs.vendorExtensions = {};
-        for(i in operationObject.externalDocs) {
-          helpers.extractExtensions(i, operationObject.externalDocs);
-        }
-      }
-
-      // bind self operation's execute command to the api
-      _.forEach(tags, function (tag) {
-        var clientProperty = _.indexOf(reservedClientTags, tag) > -1 ? '_' + tag : tag;
-        var apiProperty = _.indexOf(reservedApiTags, tag) > -1 ? '_' + tag : tag;
-        var operationGroup = self[clientProperty];
-
-        if (clientProperty !== tag) {
-          helpers.log('The \'' + tag + '\' tag conflicts with a SwaggerClient function/property name.  Use \'client.' +
-                      clientProperty + '\' or \'client.apis.' + tag + '\' instead of \'client.' + tag + '\'.');
-        }
-
-        if (apiProperty !== tag) {
-          helpers.log('The \'' + tag + '\' tag conflicts with a SwaggerClient operation function/property name.  Use ' +
-                      '\'client.apis.' + apiProperty + '\' instead of \'client.apis.' + tag + '\'.');
-        }
-
-        if (_.indexOf(reservedApiTags, operationId) > -1) {
-          helpers.log('The \'' + operationId + '\' operationId conflicts with a SwaggerClient operation ' +
-                      'function/property name.  Use \'client.apis.' + apiProperty + '._' + operationId +
-                      '\' instead of \'client.apis.' + apiProperty + '.' + operationId + '\'.');
-
-          operationId = '_' + operationId;
-          operationObject.nickname = operationId; // So 'client.apis.[tag].operationId.help() works properly
-        }
-
-        if (_.isUndefined(operationGroup)) {
-          operationGroup = self[clientProperty] = self.apis[apiProperty] = {};
-
-          operationGroup.operations = {};
-          operationGroup.label = apiProperty;
-          operationGroup.apis = {};
-
-          var tagDef = definedTags[tag];
-
-          if (!_.isUndefined(tagDef)) {
-            operationGroup.description = tagDef.description;
-            operationGroup.externalDocs = tagDef.externalDocs;
-            operationGroup.vendorExtensions = tagDef.vendorExtensions;
-          }
-
-          self[clientProperty].help = _.bind(self.help, operationGroup);
-          self.apisArray.push(new OperationGroup(tag, operationGroup.description, operationGroup.externalDocs, operationObject));
-        }
-
-        operationId = self.makeUniqueOperationId(operationId, self.apis[apiProperty]);
-
-        // Bind tag help
-        if (!_.isFunction(operationGroup.help)) {
-          operationGroup.help = _.bind(self.help, operationGroup);
-        }
-
-        // bind to the apis object
-        self.apis[apiProperty][operationId] = operationGroup[operationId] = _.bind(operationObject.execute,
-                                                                                  operationObject);
-        self.apis[apiProperty][operationId].help = operationGroup[operationId].help = _.bind(operationObject.help,
-                                                                                             operationObject);
-        self.apis[apiProperty][operationId].asCurl = operationGroup[operationId].asCurl = _.bind(operationObject.asCurl,
-                                                                                                 operationObject);
-
-        operationGroup.apis[operationId] = operationGroup.operations[operationId] = operationObject;
-
-        // legacy UI feature
-        var api = _.find(self.apisArray, function (api) {
-          return api.tag === tag;
-        });
-
-        if (api) {
-          api.operationsArray.push(operationObject);
-        }
-      });
-    });
-  });
-
-  // sort the apisArray according to the tags
-  var sortedApis = [];
-  _.forEach(Object.keys(definedTags), function (tag) {
-    var pos;
-    for(pos in self.apisArray) {
-      var _api = self.apisArray[pos];
-      if(_api && tag === _api.name) {
-        sortedApis.push(_api);
-        self.apisArray[pos] = null;
-      }
-    }
-  });
-  // add anything left
-  _.forEach(self.apisArray, function (api) {
-    if(api) {
-      sortedApis.push(api);
-    }
-  });
-  self.apisArray = sortedApis;
-
-  _.forEach(response.definitions, function (definitionObj, definition) {
-    definitionObj.id = definition.toLowerCase();
-    definitionObj.name = definition;
-    self.modelsArray.push(definitionObj);
-  });
-
-  this.isBuilt = true;
-
-  if (this.usePromise) {
-    this.isValid = true;
-    this.isBuilt = true;
-    this.deferredClient.resolve(this);
-
-    return this.deferredClient.promise;
-  }
-
-  if (this.success) {
-    this.success();
-  }
-
-  return this;
-};
-
-SwaggerClient.prototype.makeUniqueOperationId = function(operationId, api) {
-  var count = 0;
-  var name = operationId;
-
-  // make unique across this operation group
-  while(true) {
-    var matched = false;
-    _.forEach(api.operations, function (operation) {
-      if(operation.nickname === name) {
-        matched = true;
-      }
-    });
-    if(!matched) {
-      return name;
-    }
-    name = operationId + '_' + count;
-    count ++;
-  }
-
-  return operationId;
-};
-
-SwaggerClient.prototype.parseUri = function (uri) {
-  var urlParseRE = /^(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/;
-  var parts = urlParseRE.exec(uri);
-
-  return {
-    scheme: parts[4] ? parts[4].replace(':','') : undefined,
-    host: parts[11],
-    port: parts[12],
-    path: parts[15]
-  };
-};
-
-SwaggerClient.prototype.help = function (dontPrint) {
-  var output = '';
-
-  if (this instanceof SwaggerClient) {
-    _.forEach(this.apis, function (api, name) {
-      if (_.isPlainObject(api)) {
-        output += 'operations for the \'' + name + '\' tag\n';
-
-        _.forEach(api.operations, function (operation, name) {
-          output += '  * ' + name + ': ' + operation.summary + '\n';
-        });
-      }
-    });
-  } else if (this instanceof OperationGroup || _.isPlainObject(this)) {
-    output += 'operations for the \'' + this.label + '\' tag\n';
-
-    _.forEach(this.apis, function (operation, name) {
-      output += '  * ' + name + ': ' + operation.summary + '\n';
-    });
-  }
-
-  if (dontPrint) {
-    return output;
-  } else {
-    helpers.log(output);
-
-    return output;
-  }
-};
-
-SwaggerClient.prototype.tagFromLabel = function (label) {
-  return label;
-};
-
-SwaggerClient.prototype.idFromOp = function (path, httpMethod, op) {
-  if(!op || !op.operationId) {
-    op = op || {};
-    op.operationId = httpMethod + '_' + path;
-  }
-  var opId = op.operationId.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_') || (path.substring(1) + '_' + httpMethod);
-
-  opId = opId.replace(/((_){2,})/g, '_');
-  opId = opId.replace(/^(_)*/g, '');
-  opId = opId.replace(/([_])*$/g, '');
-
-  return opId;
-};
-
-SwaggerClient.prototype.setHost = function (host) {
-  this.host = host;
-
-  if(this.apis) {
-    _.forEach(this.apis, function(api) {
-      if(api.operations) {
-        _.forEach(api.operations, function(operation) {
-          operation.host = host;
-        });
-      }
-    });
-  }
-};
-
-SwaggerClient.prototype.setBasePath = function (basePath) {
-  this.basePath = basePath;
-
-  if(this.apis) {
-    _.forEach(this.apis, function(api) {
-      if(api.operations) {
-        _.forEach(api.operations, function(operation) {
-          operation.basePath = basePath;
-        });
-      }
-    });
-  }
-};
-
-SwaggerClient.prototype.setSchemes = function (schemes) {
-  this.schemes = schemes;
-
-  if(schemes && schemes.length > 0) {
-    if(this.apis) {
-      _.forEach(this.apis, function (api) {
-        if (api.operations) {
-          _.forEach(api.operations, function (operation) {
-            operation.scheme = schemes[0];
-          });
-        }
-      });
-    }
-  }
-};
-
-SwaggerClient.prototype.fail = function (message) {
-  if (this.usePromise) {
-    this.deferredClient.reject(message);
-    return this.deferredClient.promise;
-  } else {
-    if (this.failure) {
-      this.failure(message);
-    }
-    else {
-      this.failure(message);
-    }
-  }
-};
-
-},{"./auth":2,"./helpers":4,"./http":5,"./resolver":6,"./spec-converter":8,"./types/model":9,"./types/operation":10,"./types/operationGroup":11,"lodash-compat/array/indexOf":49,"lodash-compat/collection/find":53,"lodash-compat/collection/forEach":54,"lodash-compat/function/bind":58,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isFunction":142,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isUndefined":148,"q":157}],4:[function(require,module,exports){
-(function (process){
-'use strict';
-
-var _ = {
-  isPlainObject: require('lodash-compat/lang/isPlainObject'),
-  indexOf: require('lodash-compat/array/indexOf')
-};
-
-module.exports.__bind = function (fn, me) {
-  return function(){
-    return fn.apply(me, arguments);
-  };
-};
-
-var log = module.exports.log = function() {
-  // Only log if available and we're not testing
-  if (console && process.env.NODE_ENV !== 'test') {
-    console.log(Array.prototype.slice.call(arguments)[0]);
-  }
-};
-
-module.exports.fail = function (message) {
-  log(message);
-};
-
-module.exports.optionHtml = function (label, value) {
-  return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
-};
-
-var resolveSchema = module.exports.resolveSchema = function (schema) {
-  if (_.isPlainObject(schema.schema)) {
-    schema = resolveSchema(schema.schema);
-  }
-
-  return schema;
-};
-
-module.exports.simpleRef = function (name) {
-  if (typeof name === 'undefined') {
-    return null;
-  }
-
-  if (name.indexOf('#/definitions/') === 0) {
-    return name.substring('#/definitions/'.length);
-  } else {
-    return name;
-  }
-};
-
-/**
- * helper to remove extensions and add them to an object
- *
- * @param keyname
- * @param obj
- */
-module.exports.extractExtensions = function (keyname, obj, value) {
-  if(!keyname || !obj) {
-    return;
-  }
-
-  if (typeof keyname === 'string' && keyname.indexOf('x-') === 0) {
-    obj.vendorExtensions = obj.vendorExtensions || {};
-    if(value) {
-      obj.vendorExtensions[keyname] = value;
-    }
-    else {
-      obj.vendorExtensions[keyname] = obj[keyname];
-    }
-  }
-};
-}).call(this,require('_process'))
-
-},{"_process":12,"lodash-compat/array/indexOf":49,"lodash-compat/lang/isPlainObject":145}],5:[function(require,module,exports){
-(function (Buffer){
-'use strict';
-
-var helpers = require('./helpers');
-var request = require('superagent');
-var jsyaml = require('js-yaml');
-var _ = {
-  isObject: require('lodash-compat/lang/isObject'),
-  keys: require('lodash-compat/object/keys')
-};
-
-/*
- * JQueryHttpClient is a light-weight, node or browser HTTP client
- */
-var JQueryHttpClient = function () {
-  this.type = 'JQueryHttpClient';
-};
-
-/*
- * SuperagentHttpClient is a light-weight, node or browser HTTP client
- */
-var SuperagentHttpClient = function () {
-  this.type = 'SuperagentHttpClient';
-};
-
-/**
- * SwaggerHttp is a wrapper for executing requests
- */
-var SwaggerHttp = module.exports = function () {};
-
-SwaggerHttp.prototype.execute = function (obj, opts) {
-  var client;
-
-  if(opts && opts.client) {
-    client = opts.client;
-  }
-  else {
-    client = new SuperagentHttpClient(opts);
-  }
-  client.opts = opts || {};
-
-  if (opts && opts.requestAgent) {
-    request = opts.requestAgent;
-  }
-
-  // legacy support
-  var hasJQuery = false;
-  if(typeof window !== 'undefined') {
-    if(typeof window.jQuery !== 'undefined') {
-      hasJQuery = true;
-    }
-  }
-  // OPTIONS support
-  if(obj.method.toLowerCase() === 'options' && client.type === 'SuperagentHttpClient') {
-    log('forcing jQuery as OPTIONS are not supported by SuperAgent');
-    obj.useJQuery = true;
-  }
-  if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {
-    throw new Error('Unsupported configuration! JQuery is required but not available');
-  }
-  if ((obj && obj.useJQuery === true) || this.isInternetExplorer() && hasJQuery) {
-    client = new JQueryHttpClient(opts);
-  }
-
-  var success = obj.on.response;
-  var error = obj.on.error;
-
-  var requestInterceptor = function(data) {
-    if(opts && opts.requestInterceptor) {
-      data = opts.requestInterceptor.apply(data);
-    }
-    return data;
-  };
-
-  var responseInterceptor = function(data) {
-    if(opts && opts.responseInterceptor) {
-      data = opts.responseInterceptor.apply(data, [obj]);
-    }
-    return success(data);
-  };
-
-  var errorInterceptor = function(data) {
-    if(opts && opts.responseInterceptor) {
-      data = opts.responseInterceptor.apply(data, [obj]);
-    }
-    error(data);
-  };
-
-  obj.on.error = function(data) {
-    errorInterceptor(data);
-  };
-
-  obj.on.response = function(data) {
-    if(data && data.status >= 400) {
-      errorInterceptor(data);
-    }
-    else {
-      responseInterceptor(data);
-    }
-  };
-
-  if (_.isObject(obj) && _.isObject(obj.body)) {
-    // special processing for file uploads via jquery
-    if (obj.body.type && obj.body.type === 'formData'){
-      if(opts.useJQuery) {
-        obj.contentType = false;
-        obj.processData = false;
-        delete obj.headers['Content-Type'];
-      }
-    }
-  }
-
-  obj = requestInterceptor(obj) || obj;
-  if (obj.beforeSend) {
-    obj.beforeSend(function(_obj) {
-      client.execute(_obj || obj);
-    });
-  } else {
-    client.execute(obj);
-  }
-
-  return (obj.deferred) ? obj.deferred.promise : obj;
-};
-
-SwaggerHttp.prototype.isInternetExplorer = function () {
-  var detectedIE = false;
-
-  if (typeof navigator !== 'undefined' && navigator.userAgent) {
-    var nav = navigator.userAgent.toLowerCase();
-
-    if (nav.indexOf('msie') !== -1) {
-      var version = parseInt(nav.split('msie')[1]);
-
-      if (version <= 8) {
-        detectedIE = true;
-      }
-    }
-  }
-
-  return detectedIE;
-};
-
-JQueryHttpClient.prototype.execute = function (obj) {
-  var jq = this.jQuery || (typeof window !== 'undefined' && window.jQuery);
-  var cb = obj.on;
-  var request = obj;
-
-  if(typeof jq === 'undefined' || jq === false) {
-    throw new Error('Unsupported configuration! JQuery is required but not available');
-  }
-
-  obj.type = obj.method;
-  obj.cache = obj.jqueryAjaxCache;
-  obj.data = obj.body;
-  delete obj.jqueryAjaxCache;
-  delete obj.useJQuery;
-  delete obj.body;
-
-  obj.complete = function (response) {
-    var headers = {};
-    var headerArray = response.getAllResponseHeaders().split('\n');
-
-    for (var i = 0; i < headerArray.length; i++) {
-      var toSplit = headerArray[i].trim();
-
-      if (toSplit.length === 0) {
-        continue;
-      }
-
-      var separator = toSplit.indexOf(':');
-
-      if (separator === -1) {
-        // Name but no value in the header
-        headers[toSplit] = null;
-
-        continue;
-      }
-
-      var name = toSplit.substring(0, separator).trim();
-      var value = toSplit.substring(separator + 1).trim();
-
-      headers[name] = value;
-    }
-
-    var out = {
-      url: request.url,
-      method: request.method,
-      status: response.status,
-      statusText: response.statusText,
-      data: response.responseText,
-      headers: headers
-    };
-
-    try {
-      var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);
-      out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;
-    } catch (ex) {
-      // do not set out.obj
-      helpers.log('unable to parse JSON/YAML content');
-    }
-
-    // I can throw, or parse null?
-    out.obj = out.obj || null;
-
-    if (response.status >= 200 && response.status < 300) {
-      cb.response(out);
-    } else if (response.status === 0 || (response.status >= 400 && response.status < 599)) {
-      cb.error(out);
-    } else {
-      return cb.response(out);
-    }
-  };
-
-  jq.support.cors = true;
-
-  return jq.ajax(obj);
-};
-
-SuperagentHttpClient.prototype.execute = function (obj) {
-  var method = obj.method.toLowerCase();
-  var timeout = obj.timeout;
-
-  if (method === 'delete') {
-    method = 'del';
-  }
-  var headers = obj.headers || {};
-
-  var r = request[method](obj.url);
-
-  if (obj.connectionAgent) {
-    r.agent(obj.connectionAgent);
-  }
-
-  if (timeout) {
-    r.timeout(timeout);
-  }
-
-  if (obj.enableCookies) {
-    r.withCredentials();
-  }
-
-  var accept = obj.headers.Accept;
-
-  if(this.binaryRequest(accept)) {
-    r.on('request', function () {
-      if(this.xhr) {
-        this.xhr.responseType = 'blob';
-      }
-    });
-  }
-
-  if(obj.body) {
-    if(_.isObject(obj.body)) {
-      var contentType = obj.headers['Content-Type'] || '';
-      if (contentType.indexOf('multipart/form-data') === 0) {
-        delete headers['Content-Type'];
-        if({}.toString.apply(obj.body) === '[object FormData]') {
-          r.send(obj.body);
-        }
-        else {
-          var keyname, value, v;
-          for (keyname in obj.body) {
-            value = obj.body[keyname];
-            if(Array.isArray(value)) {
-              for(v in value) {
-                r.field(keyname, v);
-              }
-            }
-            else {
-              r.field(keyname, value);
-            }
-          }
-        }
-      }
-      else if (_.isObject(obj.body)) {
-        // non multipart/form-data
-        obj.body = JSON.stringify(obj.body);
-        r.send(obj.body);
-      }
-    }
-    else {
-      r.send(obj.body);
-    }
-  }
-
-  var name;
-  for (name in headers) {
-    r.set(name, headers[name]);
-  }
-
-  if(typeof r.buffer === 'function') {
-    r.buffer(); // force superagent to populate res.text with the raw response data
-  }
-
-  r.end(function (err, res) {
-    res = res || {
-      status: 0,
-      headers: {error: 'no response from server'}
-    };
-    var response = {
-      url: obj.url,
-      method: obj.method,
-      headers: res.headers
-    };
-    var cb;
-
-    if (!err && res.error) {
-      err = res.error;
-    }
-
-    if (err && obj.on && obj.on.error) {
-      response.errObj = err;
-      response.status = res ? res.status : 500;
-      response.statusText = res ? res.text : err.message;
-      if (res.headers && res.headers['content-type']) {
-        if (res.headers['content-type'].indexOf('application/json') >= 0) {
-          try {
-            response.obj = JSON.parse(response.statusText);
-          }
-          catch (e) {
-            response.obj = null;
-          }
-        }
-      }
-      cb = obj.on.error;
-    } else if (res && obj.on && obj.on.response) {
-      var possibleObj;
-
-      // Already parsed by by superagent?
-      if (res.body && _.keys(res.body).length > 0) {
-        possibleObj = res.body;
-      } else {
-        try {
-          possibleObj = jsyaml.safeLoad(res.text);
-          // can parse into a string... which we don't need running around in the system
-          possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;
-        } catch (e) {
-          helpers.log('cannot parse JSON/YAML content');
-        }
-      }
-
-      // null means we can't parse into object
-      if(typeof Buffer === 'function' && Buffer.isBuffer(possibleObj)) {
-        response.data = possibleObj;
-      }
-      else {
-        response.obj = (typeof possibleObj === 'object') ? possibleObj : null;
-      }
-
-      response.status = res.status;
-      response.statusText = res.text;
-      cb = obj.on.response;
-    }
-    if (res.xhr && res.xhr.response) {
-      response.data = res.xhr.response;
-    }
-    else if(!response.data) {
-      response.data = response.statusText;
-    }
-
-    if (cb) {
-      cb(response);
-    }
-  });
-};
-
-SuperagentHttpClient.prototype. binaryRequest = function (accept) {
-  if(!accept) {
-    return false;
-  }
-  return (/^image/i).test(accept)
-    || (/^application\/pdf/).test(accept)
-    || (/^application\/octet-stream/).test(accept);
-};
-
-}).call(this,require("buffer").Buffer)
-
-},{"./helpers":4,"buffer":14,"js-yaml":19,"lodash-compat/lang/isObject":144,"lodash-compat/object/keys":149,"superagent":158}],6:[function(require,module,exports){
-'use strict';
-
-var SwaggerHttp = require('./http');
-var _ = {
-  isObject: require('lodash-compat/lang/isObject'),
-  cloneDeep: require('lodash-compat/lang/cloneDeep'),
-  isArray: require('lodash-compat/lang/isArray'),
-  isString: require('lodash-compat/lang/isString')
-};
-
-
-/**
- * Resolves a spec's remote references
- */
-var Resolver = module.exports = function () {
-  this.failedUrls = [];
-  this.resolverCache = {};
-  this.pendingUrls = {};
-};
-
-Resolver.prototype.processAllOf = function(root, name, definition, resolutionTable, unresolvedRefs, spec) {
-  var i, location, property;
-
-  definition['x-resolved-from'] = [ '#/definitions/' + name ];
-  var allOf = definition.allOf;
-  // the refs go first
-  allOf.sort(function(a, b) {
-    if(a.$ref && b.$ref) { return 0; }
-    else if(a.$ref) { return -1; }
-    else { return 1; }
-  });
-  for (i = 0; i < allOf.length; i++) {
-    property = allOf[i];
-    location = '/definitions/' + name + '/allOf';
-    this.resolveInline(root, spec, property, resolutionTable, unresolvedRefs, location);
-  }
-};
-
-Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
-  this.spec = spec;
-  var root = arg1, callback = arg2, scope = arg3, opts = {}, location, i;
-  if(typeof arg1 === 'function') {
-    root = null;
-    callback = arg1;
-    scope = arg2;
-  }
-  var _root = root, modelName;
-  this.scope = (scope || this);
-  this.iteration = this.iteration || 0;
-
-  if(this.scope.options && this.scope.options.requestInterceptor){
-    opts.requestInterceptor = this.scope.options.requestInterceptor;
-  }
-
-  if(this.scope.options && this.scope.options.responseInterceptor){
-    opts.responseInterceptor = this.scope.options.responseInterceptor;
-  }
-
-  var name, path, property, propertyName, parameter, done, counter;
-  var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};
-  var resolutionTable = []; // store objects for dereferencing
-
-  spec.definitions = spec.definitions || {};
-  // definitions
-  for (name in spec.definitions) {
-    var definition = spec.definitions[name];
-    if(definition.$ref) {
-      this.resolveInline(root, spec, definition, resolutionTable, unresolvedRefs, definition);
-    }
-    else {
-      for (propertyName in definition.properties) {
-        property = definition.properties[propertyName];
-        if (_.isArray(property.allOf)) {
-          this.processAllOf(root, name, property, resolutionTable, unresolvedRefs, spec);
-        }
-        else {
-          this.resolveTo(root, property, resolutionTable, '/definitions');
-        }
-      }
-
-      if (definition.allOf) {
-        this.processAllOf(root, name, definition, resolutionTable, unresolvedRefs, spec);
-      }
-    }
-  }
-
-  // shared parameters
-  spec.parameters = spec.parameters || {};
-  for(name in spec.parameters) {
-    parameter = spec.parameters[name];
-    if (parameter.in === 'body' && parameter.schema) {
-      if(_.isArray(parameter.schema.allOf)) {
-        // move to a definition
-        modelName = 'inline_model';
-        var _name = modelName;
-        done = false; counter = 0;
-        while(!done) {
-          if(typeof spec.definitions[_name] === 'undefined') {
-            done = true;
-            break;
-          }
-          _name = modelName + '_' + counter;
-          counter ++;
-        }
-        spec.definitions[_name] = { allOf: parameter.schema.allOf };
-        delete parameter.schema.allOf;
-        parameter.schema.$ref = '#/definitions/' + _name;
-        this.processAllOf(root, _name, spec.definitions[_name], resolutionTable, unresolvedRefs, spec);
-      }
-      else {
-        this.resolveTo(root, parameter.schema, resolutionTable, location);
-      }
-    }
-
-    if (parameter.$ref) {
-      // parameter reference
-      this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
-    }
-  }
-
-  // operations
-  for (name in spec.paths) {
-    var method, operation, responseCode;
-    path = spec.paths[name];
-
-    if(typeof path === 'object') {
-      for (method in path) {
-        // operation reference
-        if (method === '$ref') {
-          // location = path[method];
-          location = '/paths' + name;
-          this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);
-        }
-        else {
-          operation = path[method];
-          var sharedParameters = path.parameters || [];
-          var parameters = operation.parameters || [];
-
-          sharedParameters.forEach(function(parameter) {
-            parameters.unshift(parameter);
-          });
-
-          if (method !== 'parameters' && _.isObject(operation)) {
-            operation.parameters = operation.parameters || parameters;
-          }
-
-          for (i in parameters) {
-            parameter = parameters[i];
-            location = '/paths' + name + '/' + method + '/parameters';
-
-            if (parameter.in === 'body' && parameter.schema) {
-              if (_.isArray(parameter.schema.allOf)) {
-                // move to a definition
-                modelName = 'inline_model';
-                name = modelName;
-                done = false;
-                counter = 0;
-                while (!done) {
-                  if (typeof spec.definitions[name] === 'undefined') {
-                    done = true;
-                    break;
-                  }
-                  name = modelName + '_' + counter;
-                  counter++;
-                }
-                spec.definitions[name] = {allOf: parameter.schema.allOf};
-                delete parameter.schema.allOf;
-                parameter.schema.$ref = '#/definitions/' + name;
-                this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
-              }
-              else {
-                this.resolveTo(root, parameter.schema, resolutionTable, location);
-              }
-            }
-
-            if (parameter.$ref) {
-              // parameter reference
-              this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
-            }
-          }
-
-          for (responseCode in operation.responses) {
-            var response = operation.responses[responseCode];
-            location = '/paths' + name + '/' + method + '/responses/' + responseCode;
-
-            if (_.isObject(response)) {
-              if (response.$ref) {
-                // response reference
-                this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
-              }
-              if (response.schema) {
-                var responseObj = response;
-                if (_.isArray(responseObj.schema.allOf)) {
-                  // move to a definition
-                  modelName = 'inline_model';
-                  name = modelName;
-                  done = false;
-                  counter = 0;
-                  while (!done) {
-                    if (typeof spec.definitions[name] === 'undefined') {
-                      done = true;
-                      break;
-                    }
-                    name = modelName + '_' + counter;
-                    counter++;
-                  }
-                  spec.definitions[name] = {allOf: responseObj.schema.allOf};
-                  delete responseObj.schema.allOf;
-                  delete responseObj.schema.type;
-                  responseObj.schema.$ref = '#/definitions/' + name;
-                  this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
-                }
-                else if ('array' === responseObj.schema.type) {
-                  if (responseObj.schema.items && responseObj.schema.items.$ref) {
-                    // response reference
-                    this.resolveInline(root, spec, responseObj.schema.items, resolutionTable, unresolvedRefs, location);
-                  }
-                }
-                else {
-                  this.resolveTo(root, response.schema, resolutionTable, location);
-                }
-              }
-            }
-          }
-        }
-      }
-      // clear them out to avoid multiple resolutions
-      path.parameters = [];
-    }
-  }
-
-  var expectedCalls = 0, toResolve = [];
-  // if the root is same as obj[i].root we can resolve locally
-  var all = resolutionTable;
-
-  var parts;
-  for(i = 0; i < all.length; i++) {
-    var a = all[i];
-    if(root === a.root) {
-      if(a.resolveAs === 'ref') {
-        // resolve any path walking
-        var joined = ((a.root || '') + '/' + a.key).split('/');
-        var normalized = [];
-        var url = '';
-        var k;
-
-        if(a.key.indexOf('../') >= 0) {
-          for(var j = 0; j < joined.length; j++) {
-            if(joined[j] === '..') {
-              normalized = normalized.slice(0, normalized.length-1);
-            }
-            else {
-              normalized.push(joined[j]);
-            }
-          }
-          for(k = 0; k < normalized.length; k ++) {
-            if(k > 0) {
-              url += '/';
-            }
-            url += normalized[k];
-          }
-          // we now have to remote resolve this because the path has changed
-          a.root = url;
-          toResolve.push(a);
-        }
-        else {
-          parts = a.key.split('#');
-          if(parts.length === 2) {
-            if(parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0) {
-              a.root = parts[0];
-            }
-            location = parts[1].split('/');
-            var r;
-            var s = spec;
-            for(k = 0; k < location.length; k++) {
-              var part = location[k];
-              if(part !== '') {
-                s = s[part];
-                if(typeof s !== 'undefined') {
-                  r = s;
-                }
-                else {
-                  r = null;
-                  break;
-                }
-              }
-            }
-            if(r === null) {
-              // must resolve this too
-              toResolve.push(a);
-            }
-          }
-        }
-      }
-      else {
-        if (a.resolveAs === 'inline') {
-          if(a.key && a.key.indexOf('#') === -1 && a.key.charAt(0) !== '/') {
-            // handle relative schema
-            parts = a.root.split('/');
-            location = '';
-            for(i = 0; i < parts.length - 1; i++) {
-              location += parts[i] + '/';
-            }
-            location += a.key;
-            a.root = location;
-            a.location = '';
-          }
-          toResolve.push(a);
-        }
-      }
-    }
-    else {
-      toResolve.push(a);
-    }
-  }
-  expectedCalls = toResolve.length;
-
-  // resolve anything that is local
-
-  var lock = {};
-  for(var ii = 0; ii < toResolve.length; ii++) {
-    (function(item, spec, self, lock, ii) {
-      if(!item.root || item.root === root) {
-        // local resolve
-        self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);
-        processedCalls += 1;
-
-        if(processedCalls === expectedCalls) {
-          self.finish(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, true);
-        }
-      }
-      else if(self.failedUrls.indexOf(item.root) === -1) {
-        var obj = {
-          useJQuery: false,  // TODO
-          url: item.root,
-          method: 'get',
-          headers: {
-            accept: self.scope.swaggerRequestHeaders || 'application/json'
-          },
-          on: {
-            error: function (error) {
-              processedCalls += 1;
-              console.log('failed url: ' + obj.url);
-              self.failedUrls.push(obj.url);
-              if (lock) {
-                delete lock[item.root];
-              }
-              unresolvedRefs[item.key] = {
-                root: item.root,
-                location: item.location
-              };
-
-              if (processedCalls === expectedCalls) {
-                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);
-              }
-            },  // jshint ignore:line
-            response: function (response) {
-              var swagger = response.obj;
-              if (lock) {
-                delete lock[item.root];
-              }
-              if (self.resolverCache) {
-                self.resolverCache[item.root] = swagger;
-              }
-              self.resolveItem(swagger, item.root, resolutionTable, resolvedRefs, unresolvedRefs, item);
-              processedCalls += 1;
-
-              if (processedCalls === expectedCalls) {
-                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);
-              }
-            }
-          } // jshint ignore:line
-        };
-
-        // apply timeout only when specified
-        if (scope && scope.fetchSpecTimeout) {
-          obj.timeout = scope.fetchSpecTimeout;
-        }
-
-        if (scope && scope.clientAuthorizations) {
-          scope.clientAuthorizations.apply(obj);
-        }
-
-        (function waitForUnlock() {
-          setTimeout(function() {
-            if (lock[obj.url]) {
-              waitForUnlock();
-            }
-            else {
-              var cached = self.resolverCache[obj.url];
-              if (_.isObject(cached)) {
-                obj.on.response({obj: cached});
-              }
-              else {
-                lock[obj.url] = true;
-                new SwaggerHttp().execute(obj, opts);
-              }
-            }
-          }, 0);
-        })();
-      }
-
-      else {
-        processedCalls += 1;
-        unresolvedRefs[item.key] = {
-          root: item.root,
-          location: item.location
-        };
-        if (processedCalls === expectedCalls) {
-          self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);
-        }
-      }
-    }(toResolve[ii], spec, this, lock, ii));
-  }
-
-  if (Object.keys(toResolve).length === 0) {
-    this.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);
-  }
-};
-
-Resolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, item) {
-  var path = item.location;
-  var location = spec, parts = path.split('/');
-  if(path !== '') {
-    for (var j = 0; j < parts.length; j++) {
-      var segment = parts[j];
-      if (segment.indexOf('~1') !== -1) {
-        segment = parts[j].replace(/~0/g, '~').replace(/~1/g, '/');
-        if (segment.charAt(0) !== '/') {
-          segment = '/' + segment;
-        }
-      }
-      if (typeof location === 'undefined' || location === null) {
-        break;
-      }
-      if (segment === '' && j === (parts.length - 1) && parts.length > 1) {
-        location = null;
-        break;
-      }
-      if (segment.length > 0) {
-        location = location[segment];
-      }
-    }
-  }
-  var resolved = item.key;
-  parts = item.key.split('/');
-  var resolvedName = parts[parts.length-1];
-
-  if(resolvedName.indexOf('#') >= 0) {
-    resolvedName = resolvedName.split('#')[1];
-  }
-
-  if (location !== null && typeof location !== 'undefined') {
-    resolvedRefs[resolved] = {
-      name: resolvedName,
-      obj: location,
-      key: item.key,
-      root: item.root
-    };
-  } else {
-    unresolvedRefs[resolved] = {
-      root: item.root,
-      location: item.location
-    };
-  }
-};
-
-Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, localResolve) {
-  // walk resolution table and replace with resolved refs
-  var ref, abs;
-  for (ref in resolutionTable) {
-    var item = resolutionTable[ref];
-
-    var key = item.key;
-    var resolvedTo = resolvedRefs[key];
-    if (resolvedTo) {
-      spec.definitions = spec.definitions || {};
-      if (item.resolveAs === 'ref') {
-        if (localResolve !== true) {
-          // don't retain root for local definitions
-          for (key in resolvedTo.obj) {
-            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);
-            resolvedTo.obj[key] = abs;
-          }
-        }
-        spec.definitions[resolvedTo.name] = resolvedTo.obj;
-        item.obj.$ref = '#/definitions/' + resolvedTo.name;
-      } else if (item.resolveAs === 'inline') {
-        var targetObj = item.obj;
-        targetObj['x-resolved-from'] = [ item.key ];
-        delete targetObj.$ref;
-
-        for (key in resolvedTo.obj) {
-          abs = resolvedTo.obj[key];
-
-          if (localResolve !== true) {
-            // don't retain root for local definitions
-            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);
-          }
-          targetObj[key] = abs;
-        }
-      }
-    }
-  }
-  var existingUnresolved = this.countUnresolvedRefs(spec);
-
-  if(existingUnresolved === 0 || this.iteration > 5) {
-    this.resolveAllOf(spec.definitions);
-    this.resolverCache = null;
-    callback.call(this.scope, spec, unresolvedRefs);
-  }
-  else {
-    this.iteration += 1;
-    this.resolve(spec, root, callback, this.scope);
-  }
-};
-
-Resolver.prototype.countUnresolvedRefs = function(spec) {
-  var i;
-  var refs = this.getRefs(spec);
-  var keys = [];
-  var unresolvedKeys = [];
-  for(i in refs) {
-    if(i.indexOf('#') === 0) {
-      keys.push(i.substring(1));
-    }
-    else {
-      unresolvedKeys.push(i);
-    }
-  }
-
-  // verify possible keys
-  for (i = 0; i < keys.length; i++) {
-    var part = keys[i];
-    var parts = part.split('/');
-    var obj = spec;
-
-    for (var k = 0; k < parts.length; k++) {
-      var key = parts[k];
-      if(key !== '') {
-        obj = obj[key];
-        if(typeof obj === 'undefined') {
-          unresolvedKeys.push(part);
-          break;
-        }
-      }
-    }
-  }
-  return unresolvedKeys.length;
-};
-
-Resolver.prototype.getRefs = function(spec, obj) {
-  obj = obj || spec;
-  var output = {};
-  for(var key in obj) {
-    if (!obj.hasOwnProperty(key)) {
-      continue;
-    }
-    var item = obj[key];
-    if(key === '$ref' && typeof item === 'string') {
-      output[item] = null;
-    }
-    else if(_.isObject(item)) {
-      var o = this.getRefs(item);
-      for(var k in o) {
-        output[k] = null;
-      }
-    }
-  }
-  return output;
-};
-
-function splitUrl(url) {
-  var result = {};
-  var proto = /[a-z]+:\/\//i.exec(url);
-  if (proto) {
-    result.proto = proto[0].slice(0, -3);
-    url = url.slice(result.proto.length + 1);
-  }
-  if (url.slice(0, 2) === '//') {
-    result.domain = url.slice(2).split('/')[0];
-    url = url.slice(2 + result.domain.length);
-  }
-  var p = url.split('#');
-  if (p[0].length) {
-    result.path = p[0];
-  }
-  if (p.length > 1) {
-    result.fragment = p.slice(1).join('#');
-  }
-  return result;
-}
-
-function unsplitUrl(url) {
-  var result = url.path;
-  if (result === undefined) {
-    result = '';
-  }
-  if (url.fragment !== undefined) {
-    result += '#' + url.fragment;
-  }
-  if (url.domain !== undefined) {
-    if (result.slice(0, 1) === '/') {
-      result = result.slice(1);
-    }
-    result = '//' + url.domain + '/' + result;
-    if (url.proto !== undefined) {
-      result = url.proto + ':' + result;
-    }
-  }
-  return result;
-}
-
-function joinUrl(base, rel) {
-  var relsp = splitUrl(rel);
-  if (relsp.domain !== undefined) {
-    return rel;
-  }
-  var result = splitUrl(base);
-  if (relsp.path === undefined) {
-    // change only fragment part
-    result.fragment = relsp.fragment;
-  } else if (relsp.path.slice(0, 1) === '/') {
-    // relative to domain
-    result.path = relsp.path;
-    result.fragment = relsp.fragment;
-  } else {
-    // relative to path
-    var path = result.path === undefined ? [] : result.path.split('/');
-    var relpath = relsp.path.split('/');
-    if (path.length) {
-      path.pop();
-    }
-    while (relpath[0] === '..' || relpath[0] === '.') {
-      if (relpath[0] === '..') {
-        path.pop();
-      }
-      relpath.shift();
-    }
-    result.path = path.concat(relpath).join('/');
-    result.fragment = relsp.fragment;
-  }
-  return unsplitUrl(result);
-}
-
-Resolver.prototype.retainRoot = function(origKey, obj, root) {
-  // walk object and look for relative $refs
-  if(_.isObject(obj)) {
-    for(var key in obj) {
-      var item = obj[key];
-      if (key === '$ref' && typeof item === 'string') {
-        obj[key] = joinUrl(root, item);
-      }
-      else if (_.isObject(item)) {
-        this.retainRoot(key, item, root);
-      }
-    }
-  }
-  else if(_.isString(obj) && origKey === '$ref') {
-    obj = joinUrl(root, obj);
-  }
-  return obj;
-};
-
-/**
- * immediately in-lines local refs, queues remote refs
- * for inline resolution
- */
-Resolver.prototype.resolveInline = function (root, spec, property, resolutionTable, unresolvedRefs, location) {
-  var key = property.$ref, ref = property.$ref, i, p, p2, rs;
-  var rootTrimmed = false;
-
-  root = root || ''; // Guard against .split. @fehguy, you'll need to check if this logic fits
-  // More imporantly is how do we gracefully handle relative urls, when provided just a 'spec', not a 'url' ?
-
-  if (ref) {
-    if(ref.indexOf('../') === 0) {
-      // reset root
-      p = ref.split('../');
-      p2 = root.split('/');
-      ref = '';
-      for(i = 0; i < p.length; i++) {
-        if(p[i] === '') {
-          p2 = p2.slice(0, p2.length-1);
-        }
-        else {
-          ref += p[i];
-        }
-      }
-      root = '';
-      for(i = 0; i < p2.length - 1; i++) {
-        if(i > 0) { root += '/'; }
-        root += p2[i];
-      }
-      rootTrimmed = true;
-    }
-    if(ref.indexOf('#') >= 0) {
-      if(ref.indexOf('/') === 0) {
-        rs = ref.split('#');
-        p  = root.split('//');
-        p2 = p[1].split('/');
-        root = p[0] + '//' + p2[0] + rs[0];
-        location = rs[1];
-      }
-      else {
-        rs = ref.split('#');
-        if(rs[0] !== '') {
-          p2 = root.split('/');
-          p2 = p2.slice(0, p2.length - 1);
-          if(!rootTrimmed) {
-            root = '';
-            for (var k = 0; k < p2.length; k++) {
-              if(k > 0) { root += '/'; }
-              root += p2[k];
-            }
-          }
-          root += '/' + ref.split('#')[0];
-        }
-        location = rs[1];
-      }
-    }
-    if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {
-      if(ref.indexOf('#') >= 0) {
-        root = ref.split('#')[0];
-        location = ref.split('#')[1];
-      }
-      else {
-        root = ref;
-        location = '';
-      }
-      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
-    } else if (ref.indexOf('#') === 0) {
-      location = ref.split('#')[1];
-      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
-    } else if (ref.indexOf('/') === 0 && ref.indexOf('#') === -1) {
-      location = ref;
-      var matches = root.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
-      if(matches) {
-        root = matches[0] + ref.substring(1);
-        location = '';
-      }
-      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
-    }
-    else {
-      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
-    }
-  }
-  else if (property.type === 'array') {
-    this.resolveTo(root, property.items, resolutionTable, location);
-  }
-};
-
-Resolver.prototype.resolveTo = function (root, property, resolutionTable, location) {
-  var sp, i;
-  var ref = property.$ref;
-  var lroot = root;
-  if ((typeof ref !== 'undefined') && (ref !== null)) {
-    if(ref.indexOf('#') >= 0) {
-      var parts = ref.split('#');
-
-      // #/definitions/foo
-      // foo.json#/bar
-      if(parts[0] && ref.indexOf('/') === 0) {
-
-      }
-      else if(parts[0] && (parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0)) {
-        lroot = parts[0];
-        ref = parts[1];
-      }
-      else if(parts[0] && parts[0].length > 0) {
-        // relative file
-        sp = root.split('/');
-        lroot = '';
-        for(i = 0; i < sp.length - 1; i++) {
-          lroot += sp[i] + '/';
-        }
-        lroot += parts[0];
-      }
-      else {
-
-      }
-
-      location = parts[1];
-    }
-    else if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {
-      lroot = ref;
-      location = '';
-    }
-    else {
-      // relative file
-      sp = root.split('/');
-      lroot = '';
-      for(i = 0; i < sp.length - 1; i++) {
-        lroot += sp[i] + '/';
-      }
-      lroot += ref;
-      location = '';
-    }
-    resolutionTable.push({
-      obj: property, resolveAs: 'ref', root: lroot, key: ref, location: location
-    });
-  } else if (property.type === 'array') {
-    var items = property.items;
-    this.resolveTo(root, items, resolutionTable, location);
-  } else {
-    if(property && (property.properties || property.additionalProperties)) {
-      var name = this.uniqueName('inline_model');
-      if (property.title) {
-        name = this.uniqueName(property.title);
-      }
-      delete property.title;
-      this.spec.definitions[name] = _.cloneDeep(property);
-      property.$ref = '#/definitions/' + name;
-      delete property.type;
-      delete property.properties;
-    }
-  }
-};
-
-Resolver.prototype.uniqueName = function(base) {
-  var name = base;
-  var count = 0;
-  while(true) {
-    if(!_.isObject(this.spec.definitions[name])) {
-      return name;
-    }
-    name = base + '_' + count;
-    count++;
-  }
-};
-
-Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
-  depth = depth || 0;
-  obj = obj || spec;
-  var name;
-  for(var key in obj) {
-    if (!obj.hasOwnProperty(key)) {
-      continue;
-    }
-    var item = obj[key];
-    if(item === null) {
-      throw new TypeError('Swagger 2.0 does not support null types (' + obj + ').  See https://github.com/swagger-api/swagger-spec/issues/229.');
-    }
-    if(typeof item === 'object') {
-      this.resolveAllOf(spec, item, depth + 1);
-    }
-    if(item && typeof item.allOf !== 'undefined') {
-      var allOf = item.allOf;
-      if(_.isArray(allOf)) {
-        var output = _.cloneDeep(item);
-        delete output.allOf;
-
-        output['x-composed'] = true;
-        if (typeof item['x-resolved-from'] !== 'undefined') {
-          output['x-resolved-from'] = item['x-resolved-from'];
-        }
-
-        for(var i = 0; i < allOf.length; i++) {
-          var component = allOf[i];
-          var source = 'self';
-          if(typeof component['x-resolved-from'] !== 'undefined') {
-            source = component['x-resolved-from'][0];
-          }
-
-          for(var part in component) {
-            if(!output.hasOwnProperty(part)) {
-              output[part] = _.cloneDeep(component[part]);
-              if(part === 'properties') {
-                for(name in output[part]) {
-                  output[part][name]['x-resolved-from'] = source;
-                }
-              }
-            }
-            else {
-              if(part === 'properties') {
-                var properties = component[part];
-                for(name in properties) {
-                  output.properties[name] = _.cloneDeep(properties[name]);
-                  var resolvedFrom = properties[name]['x-resolved-from'];
-                  if (typeof resolvedFrom === 'undefined' || resolvedFrom === 'self') {
-                    resolvedFrom = source;
-                  }
-                  output.properties[name]['x-resolved-from'] = resolvedFrom;
-                }
-              }
-              else if(part === 'required') {
-                // merge & dedup the required array
-                var a = output.required.concat(component[part]);
-                for(var k = 0; k < a.length; ++k) {
-                  for(var j = k + 1; j < a.length; ++j) {
-                    if(a[k] === a[j]) { a.splice(j--, 1); }
-                  }
-                }
-                output.required = a;
-              }
-              else if(part === 'x-resolved-from') {
-                output['x-resolved-from'].push(source);
-              }
-              else {
-                // TODO: need to merge this property
-                // console.log('what to do with ' + part)
-              }
-            }
-          }
-        }
-        obj[key] = output;
-      }
-    }
-  }
-};
-
-},{"./http":5,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isString":146}],7:[function(require,module,exports){
-'use strict';
-
-var Helpers = require('./helpers');
-
-var _ = {
-  isPlainObject: require('lodash-compat/lang/isPlainObject'),
-  isUndefined: require('lodash-compat/lang/isUndefined'),
-  isArray: require('lodash-compat/lang/isArray'),
-  isObject: require('lodash-compat/lang/isObject'),
-  isEmpty: require('lodash-compat/lang/isEmpty'),
-  map: require('lodash-compat/collection/map'),
-  indexOf: require('lodash-compat/array/indexOf'),
-  cloneDeep: require('lodash-compat/lang/cloneDeep'),
-  keys: require('lodash-compat/object/keys'),
-  forEach: require('lodash-compat/collection/forEach')
-};
-
-var optionHtml = module.exports.optionHtml = function  (label, value) {
-  return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
-};
-
-module.exports.typeFromJsonSchema = function (type, format) {
-  var str;
-
-  if (type === 'integer' && format === 'int32') {
-    str = 'integer';
-  } else if (type === 'integer' && format === 'int64') {
-    str = 'long';
-  } else if (type === 'integer' && typeof format === 'undefined') {
-    str = 'long';
-  } else if (type === 'string' && format === 'date-time') {
-    str = 'date-time';
-  } else if (type === 'string' && format === 'date') {
-    str = 'date';
-  } else if (type === 'number' && format === 'float') {
-    str = 'float';
-  } else if (type === 'number' && format === 'double') {
-    str = 'double';
-  } else if (type === 'number' && typeof format === 'undefined') {
-    str = 'double';
-  } else if (type === 'boolean') {
-    str = 'boolean';
-  } else if (type === 'string') {
-    str = 'string';
-  }
-
-  return str;
-};
-
-var getStringSignature = module.exports.getStringSignature = function (obj, baseComponent) {
-  var str = '';
-
-  if (typeof obj.$ref !== 'undefined') {
-    str += Helpers.simpleRef(obj.$ref);
-  } else if (typeof obj.type === 'undefined') {
-    str += 'object';
-  } else if (obj.type === 'array') {
-    if (baseComponent) {
-      str += getStringSignature((obj.items || obj.$ref || {}));
-    } else {
-      str += 'Array[';
-      str += getStringSignature((obj.items || obj.$ref || {}));
-      str += ']';
-    }
-  } else if (obj.type === 'integer' && obj.format === 'int32') {
-    str += 'integer';
-  } else if (obj.type === 'integer' && obj.format === 'int64') {
-    str += 'long';
-  } else if (obj.type === 'integer' && typeof obj.format === 'undefined') {
-    str += 'long';
-  } else if (obj.type === 'string' && obj.format === 'date-time') {
-    str += 'date-time';
-  } else if (obj.type === 'string' && obj.format === 'date') {
-    str += 'date';
-  } else if (obj.type === 'string' && typeof obj.format === 'undefined') {
-    str += 'string';
-  } else if (obj.type === 'number' && obj.format === 'float') {
-    str += 'float';
-  } else if (obj.type === 'number' && obj.format === 'double') {
-    str += 'double';
-  } else if (obj.type === 'number' && typeof obj.format === 'undefined') {
-    str += 'double';
-  } else if (obj.type === 'boolean') {
-    str += 'boolean';
-  } else if (obj.$ref) {
-    str += Helpers.simpleRef(obj.$ref);
-  } else {
-    str += obj.type;
-  }
-
-  return str;
-};
-
-var schemaToJSON = module.exports.schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {
-  // Resolve the schema (Handle nested schemas)
-  schema = Helpers.resolveSchema(schema);
-
-  if(typeof modelPropertyMacro !== 'function') {
-    modelPropertyMacro = function(prop){
-      return (prop || {}).default;
-    };
-  }
-
-  modelsToIgnore= modelsToIgnore || {};
-
-  var type = schema.type || 'object';
-  var format = schema.format;
-  var model;
-  var output;
-
-  if (!_.isUndefined(schema.example)) {
-    output = schema.example;
-  } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {
-    output = schema.enum[0];
-  }
-
-  if (_.isUndefined(output)) {
-    if (schema.$ref) {
-      model = models[Helpers.simpleRef(schema.$ref)];
-
-      if (!_.isUndefined(model)) {
-        if (_.isUndefined(modelsToIgnore[model.name])) {
-          modelsToIgnore[model.name] = model;
-          output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);
-          delete modelsToIgnore[model.name];
-        } else {
-          if (model.type === 'array') {
-            output = [];
-          } else {
-            output = {};
-          }
-        }
-      }
-    } else if (!_.isUndefined(schema.default)) {
-      output = schema.default;
-    } else if (type === 'string') {
-      if (format === 'date-time') {
-        output = new Date().toISOString();
-      } else if (format === 'date') {
-        output = new Date().toISOString().split('T')[0];
-      } else {
-        output = 'string';
-      }
-    } else if (type === 'integer') {
-      output = 0;
-    } else if (type === 'number') {
-      output = 0.0;
-    } else if (type === 'boolean') {
-      output = true;
-    } else if (type === 'object') {
-      output = {};
-
-      _.forEach(schema.properties, function (property, name) {
-        var cProperty = _.cloneDeep(property);
-
-        // Allow macro to set the default value
-        cProperty.default = modelPropertyMacro(property);
-
-        output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);
-      });
-    } else if (type === 'array') {
-      output = [];
-
-      if (_.isArray(schema.items)) {
-        _.forEach(schema.items, function (item) {
-          output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));
-        });
-      } else if (_.isPlainObject(schema.items)) {
-        output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));
-      } else if (_.isUndefined(schema.items)) {
-        output.push({});
-      } else {
-        Helpers.log('Array type\'s \'items\' property is not an array or an object, cannot process');
-      }
-    }
-  }
-
-  return output;
-};
-
-module.exports.schemaToHTML =function (name, schema, models, modelPropertyMacro) {
-  var strongOpen = '<span class="strong">';
-  var strongClose = '</span>';
-
-  // Allow for ignoring the 'name' argument.... shifting the rest
-  if(_.isObject(arguments[0])) {
-    name = void 0;
-    schema = arguments[0];
-    models = arguments[1];
-    modelPropertyMacro = arguments[2];
-  }
-
-  models = models || {};
-
-  // Resolve the schema (Handle nested schemas)
-  schema = Helpers.resolveSchema(schema);
-
-  // Return for empty object
-  if(_.isEmpty(schema)) {
-    return strongOpen + 'Empty' + strongClose;
-  }
-
-  // Dereference $ref from 'models'
-  if(typeof schema.$ref === 'string') {
-    name = Helpers.simpleRef(schema.$ref);
-    schema = models[name];
-    if(typeof schema === 'undefined')
-    {
-      return strongOpen + name + ' is not defined!' + strongClose;
-    }
-  }
-
-  if(typeof name !== 'string') {
-    name = schema.title || 'Inline Model';
-  }
-
-  // If we are a Model object... adjust accordingly
-  if(schema.definition) {
-    schema = schema.definition;
-  }
-
-  if(typeof modelPropertyMacro !== 'function') {
-    modelPropertyMacro = function(prop){
-      return (prop || {}).default;
-    };
-  }
-
-  var references = {};
-  var seenModels = [];
-  var inlineModels = 0;
-
-
-
-  // Generate current HTML
-  var html = processModel(schema, name);
-
-  // Generate references HTML
-  while (_.keys(references).length > 0) {
-    /* jshint ignore:start */
-    _.forEach(references, function (schema, name) {
-      var seenModel = _.indexOf(seenModels, name) > -1;
-
-      delete references[name];
-
-      if (!seenModel) {
-        seenModels.push(name);
-
-        html += '<br />' + processModel(schema, name);
-      }
-    });
-    /* jshint ignore:end */
-  }
-
-  return html;
-
-  /////////////////////////////////
-
-  function addReference(schema, name, skipRef) {
-    var modelName = name;
-    var model;
-
-    if (schema.$ref) {
-      modelName = schema.title || Helpers.simpleRef(schema.$ref);
-      model = models[modelName];
-    } else if (_.isUndefined(name)) {
-      modelName = schema.title || 'Inline Model ' + (++inlineModels);
-      model = {definition: schema};
-    }
-
-    if (skipRef !== true) {
-      references[modelName] = _.isUndefined(model) ? {} : model.definition;
-    }
-
-    return modelName;
-  }
-
-  function primitiveToHTML(schema) {
-    var html = '<span class="propType">';
-    var type = schema.type || 'object';
-
-    if (schema.$ref) {
-      html += addReference(schema, Helpers.simpleRef(schema.$ref));
-    } else if (type === 'object') {
-      if (!_.isUndefined(schema.properties)) {
-        html += addReference(schema);
-      } else {
-        html += 'object';
-      }
-    } else if (type === 'array') {
-      html += 'Array[';
-
-      if (_.isArray(schema.items)) {
-        html += _.map(schema.items, addReference).join(',');
-      } else if (_.isPlainObject(schema.items)) {
-        if (_.isUndefined(schema.items.$ref)) {
-          if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {
-            html += schema.items.type;
-          } else {
-            html += addReference(schema.items);
-          }
-        } else {
-          html += addReference(schema.items, Helpers.simpleRef(schema.items.$ref));
-        }
-      } else {
-        Helpers.log('Array type\'s \'items\' schema is not an array or an object, cannot process');
-        html += 'object';
-      }
-
-      html += ']';
-    } else {
-      html += schema.type;
-    }
-
-    html += '</span>';
-
-    return html;
-  }
-
-  function primitiveToOptionsHTML(schema, html) {
-    var options = '';
-    var type = schema.type || 'object';
-    var isArray = type === 'array';
-
-    if (isArray) {
-      if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {
-        type = schema.items.type;
-      } else {
-        type = 'object';
-      }
-    }
-
-    if (!_.isUndefined(schema.default)) {
-      options += optionHtml('Default', schema.default);
-    }
-
-    switch (type) {
-    case 'string':
-      if (schema.minLength) {
-        options += optionHtml('Min. Length', schema.minLength);
-      }
-
-      if (schema.maxLength) {
-        options += optionHtml('Max. Length', schema.maxLength);
-      }
-
-      if (schema.pattern) {
-        options += optionHtml('Reg. Exp.', schema.pattern);
-      }
-      break;
-    case 'integer':
-    case 'number':
-      if (schema.minimum) {
-        options += optionHtml('Min. Value', schema.minimum);
-      }
-
-      if (schema.exclusiveMinimum) {
-        options += optionHtml('Exclusive Min.', 'true');
-      }
-
-      if (schema.maximum) {
-        options += optionHtml('Max. Value', schema.maximum);
-      }
-
-      if (schema.exclusiveMaximum) {
-        options += optionHtml('Exclusive Max.', 'true');
-      }
-
-      if (schema.multipleOf) {
-        options += optionHtml('Multiple Of', schema.multipleOf);
-      }
-
-      break;
-    }
-
-    if (isArray) {
-      if (schema.minItems) {
-        options += optionHtml('Min. Items', schema.minItems);
-      }
-
-      if (schema.maxItems) {
-        options += optionHtml('Max. Items', schema.maxItems);
-      }
-
-      if (schema.uniqueItems) {
-        options += optionHtml('Unique Items', 'true');
-      }
-
-      if (schema.collectionFormat) {
-        options += optionHtml('Coll. Format', schema.collectionFormat);
-      }
-    }
-
-    if (_.isUndefined(schema.items)) {
-      if (_.isArray(schema.enum)) {
-        var enumString;
-
-        if (type === 'number' || type === 'integer') {
-          enumString = schema.enum.join(', ');
-        } else {
-          enumString = '"' + schema.enum.join('", "') + '"';
-        }
-
-        options += optionHtml('Enum', enumString);
-      }
-    }
-
-    if (options.length > 0) {
-      html = '<span class="propWrap">' + html + '<table class="optionsWrapper"><tr><th colspan="2">' + type + '</th></tr>' + options + '</table></span>';
-    }
-
-    return html;
-  }
-
-  function processModel(schema, name) {
-    var type = schema.type || 'object';
-    var isArray = schema.type === 'array';
-    var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;
-
-    if (name) {
-      seenModels.push(name);
-    }
-
-    if (isArray) {
-      if (_.isArray(schema.items)) {
-        html += '<div>' + _.map(schema.items, function (item) {
-          var type = item.type || 'object';
-
-          if (_.isUndefined(item.$ref)) {
-            if (_.indexOf(['array', 'object'], type) > -1) {
-              if (type === 'object' && _.isUndefined(item.properties)) {
-                return 'object';
-              } else {
-                return addReference(item);
-              }
-            } else {
-              return primitiveToOptionsHTML(item, type);
-            }
-          } else {
-            return addReference(item, Helpers.simpleRef(item.$ref));
-          }
-        }).join(',</div><div>');
-      } else if (_.isPlainObject(schema.items)) {
-        if (_.isUndefined(schema.items.$ref)) {
-          if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {
-            if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {
-              html += '<div>object</div>';
-            } else {
-              html += '<div>' + addReference(schema.items) + '</div>';
-            }
-          } else {
-            html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';
-          }
-        } else {
-          html += '<div>' + addReference(schema.items, Helpers.simpleRef(schema.items.$ref)) + '</div>';
-        }
-      } else {
-        Helpers.log('Array type\'s \'items\' property is not an array or an object, cannot process');
-        html += '<div>object</div>';
-      }
-    } else {
-      if (schema.$ref) {
-        html += '<div>' + addReference(schema, name) + '</div>';
-      } else if (type === 'object') {
-        if (_.isPlainObject(schema.properties)) {
-          var contents = _.map(schema.properties, function (property, name) {
-            var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);
-            var cProperty = _.cloneDeep(property);
-
-            var requiredClass = propertyIsRequired ? 'required' : '';
-            var html = '<span class="propName ' + requiredClass + '">' + name + '</span> (';
-            var model;
-            var propDescription;
-
-            // Allow macro to set the default value
-            cProperty.default = modelPropertyMacro(cProperty);
-
-            // Resolve the schema (Handle nested schemas)
-            cProperty = Helpers.resolveSchema(cProperty);
-
-            propDescription = property.description || cProperty.description;
-
-            // We need to handle property references to primitives (Issue 339)
-            if (!_.isUndefined(cProperty.$ref)) {
-              model = models[Helpers.simpleRef(cProperty.$ref)];
-
-              if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {
-                // Use referenced schema
-                cProperty = Helpers.resolveSchema(model.definition);
-              }
-            }
-
-            html += primitiveToHTML(cProperty);
-
-            if(!propertyIsRequired) {
-              html += ', <span class="propOptKey">optional</span>';
-            }
-
-            if(property.readOnly) {
-                html += ', <span class="propReadOnly">read only</span>';
-            }
-
-            html += ')';
-
-            if (!_.isUndefined(propDescription)) {
-              html += ': ' + '<span class="propDesc">' + propDescription + '</span>';
-            }
-
-            if (cProperty.enum) {
-              html += ' = <span class="propVals">[\'' + cProperty.enum.join('\', \'') + '\']</span>';
-            }
-
-            return '<div' + (property.readOnly ? ' class="readOnly"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);
-          }).join(',</div>');
-
-          if (contents) {
-            html += contents + '</div>';
-          }
-        }
-      } else {
-        html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';
-      }
-    }
-
-    return html + strongOpen + (isArray ? ']' : '}') + strongClose;
-  }
-};
-},{"./helpers":4,"lodash-compat/array/indexOf":49,"lodash-compat/collection/forEach":54,"lodash-compat/collection/map":56,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isEmpty":141,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isUndefined":148,"lodash-compat/object/keys":149}],8:[function(require,module,exports){
-'use strict';
-
-var SwaggerHttp = require('./http');
-var _ = {
-  isObject: require('lodash-compat/lang/isObject')
-};
-
-var SwaggerSpecConverter = module.exports = function () {
-  this.errors = [];
-  this.warnings = [];
-  this.modelMap = {};
-};
-
-SwaggerSpecConverter.prototype.setDocumentationLocation = function (location) {
-  this.docLocation = location;
-};
-
-/**
- * converts a resource listing OR api declaration
- **/
-SwaggerSpecConverter.prototype.convert = function (obj, clientAuthorizations, opts, callback) {
-  // not a valid spec
-  if(!obj || !Array.isArray(obj.apis)) {
-    return this.finish(callback, null);
-  }
-  this.clientAuthorizations = clientAuthorizations;
-
-  // create a new swagger object to return
-  var swagger = { swagger: '2.0' };
-
-  swagger.originalVersion = obj.swaggerVersion;
-
-  // add the info
-  this.apiInfo(obj, swagger);
-
-  // add security definitions
-  this.securityDefinitions(obj, swagger);
-
-  // take basePath into account
-  if (obj.basePath) {
-    this.setDocumentationLocation(obj.basePath);
-  }
-
-  // see if this is a single-file swagger definition
-  var isSingleFileSwagger = false;
-  var i;
-  for(i = 0; i < obj.apis.length; i++) {
-    var api = obj.apis[i];
-    if(Array.isArray(api.operations)) {
-      isSingleFileSwagger = true;
-    }
-  }
-  if(isSingleFileSwagger) {
-    this.declaration(obj, swagger);
-    this.finish(callback, swagger);
-  }
-  else {
-    this.resourceListing(obj, swagger, opts, callback);
-  }
-};
-
-SwaggerSpecConverter.prototype.declaration = function(obj, swagger) {
-  var name, i, p, pos;
-  if(!obj.apis) {
-    return;
-  }
-
-  if (obj.basePath.indexOf('http://') === 0) {
-    p = obj.basePath.substring('http://'.length);
-    pos = p.indexOf('/');
-    if (pos > 0) {
-      swagger.host = p.substring(0, pos);
-      swagger.basePath = p.substring(pos);
-    }
-    else {
-      swagger.host = p;
-      swagger.basePath = '/';
-    }
-  } else if (obj.basePath.indexOf('https://') === 0) {
-    p = obj.basePath.substring('https://'.length);
-    pos = p.indexOf('/');
-    if (pos > 0) {
-      swagger.host = p.substring(0, pos);
-      swagger.basePath = p.substring(pos);
-    }
-    else {
-      swagger.host = p;
-      swagger.basePath = '/';
-    }
-  } else {
-    swagger.basePath = obj.basePath;
-  }
-
-  var resourceLevelAuth;
-  if(obj.authorizations) {
-    resourceLevelAuth = obj.authorizations;
-  }
-  if(obj.consumes) {
-    swagger.consumes = obj.consumes;
-  }
-  if(obj.produces) {
-    swagger.produces = obj.produces;
-  }
-
-  // build a mapping of id to name for 1.0 model resolutions
-  if(_.isObject(obj)) {
-    for(name in obj.models) {
-      var existingModel = obj.models[name];
-      var key = (existingModel.id || name);
-      this.modelMap[key] = name;
-    }
-  }
-
-  for(i = 0; i < obj.apis.length; i++) {
-    var api = obj.apis[i];
-    var path = api.path;
-    var operations = api.operations;
-    this.operations(path, obj.resourcePath, operations, resourceLevelAuth, swagger);
-  }
-
-  var models = obj.models || {};
-  this.models(models, swagger);
-};
-
-SwaggerSpecConverter.prototype.models = function(obj, swagger) {
-  if(!_.isObject(obj)) {
-    return;
-  }
-  var name;
-
-  swagger.definitions = swagger.definitions || {};
-  for(name in obj) {
-    var existingModel = obj[name];
-    var _required = [];
-    var schema = { properties: {}};
-    var propertyName;
-    for(propertyName in existingModel.properties) {
-      var existingProperty = existingModel.properties[propertyName];
-      var property = {};
-      this.dataType(existingProperty, property);
-      if(existingProperty.description) {
-        property.description = existingProperty.description;
-      }
-      if(existingProperty['enum']) {
-        property['enum'] = existingProperty['enum'];
-      }
-      if(typeof existingProperty.required === 'boolean' && existingProperty.required === true) {
-        _required.push(propertyName);
-      }
-      if(typeof existingProperty.required === 'string' && existingProperty.required === 'true') {
-        _required.push(propertyName);
-      }
-      schema.properties[propertyName] = property;
-    }
-    if(_required.length > 0) {
-      schema.required = _required;
-    } else {
-      schema.required = existingModel.required;
-    }
-    swagger.definitions[name] = schema;
-  }
-};
-
-SwaggerSpecConverter.prototype.extractTag = function(resourcePath) {
-  var pathString = resourcePath || 'default';
-  if(pathString.indexOf('http:') === 0 || pathString.indexOf('https:') === 0) {
-    pathString = pathString.split(['/']);
-    pathString = pathString[pathString.length -1].substring();
-  }
-  if(pathString.endsWith('.json')) {
-    pathString = pathString.substring(0, pathString.length - '.json'.length);
-  }
-  return pathString.replace('/','');
-};
-
-SwaggerSpecConverter.prototype.operations = function(path, resourcePath, obj, resourceLevelAuth, swagger) {
-  if(!Array.isArray(obj)) {
-    return;
-  }
-  var i;
-
-  if(!swagger.paths) {
-    swagger.paths = {};
-  }
-
-  var pathObj = swagger.paths[path] || {};
-  var tag = this.extractTag(resourcePath);
-  swagger.tags = swagger.tags || [];
-  var matched = false;
-  for(i = 0; i < swagger.tags.length; i++) {
-    var tagObject = swagger.tags[i];
-    if(tagObject.name === tag) {
-      matched = true;
-    }
-  }
-  if(!matched) {
-    swagger.tags.push({name: tag});
-  }
-
-  for(i = 0; i < obj.length; i++) {
-    var existingOperation = obj[i];
-    var method = (existingOperation.method || existingOperation.httpMethod).toLowerCase();
-    var operation = {tags: [tag]};
-    var existingAuthorizations = existingOperation.authorizations;
-
-    if(existingAuthorizations && Object.keys(existingAuthorizations).length === 0) {
-      existingAuthorizations = resourceLevelAuth;
-    }
-
-    if(typeof existingAuthorizations !== 'undefined') {
-      var scopesObject;
-      for(var key in existingAuthorizations) {
-        operation.security = operation.security || [];
-        var scopes = existingAuthorizations[key];
-        if(scopes) {
-          var securityScopes = [];
-          for(var j in scopes) {
-            securityScopes.push(scopes[j].scope);
-          }
-          scopesObject = {};
-          scopesObject[key] = securityScopes;
-          operation.security.push(scopesObject);
-        }
-        else {
-          scopesObject = {};
-          scopesObject[key] = [];
-          operation.security.push(scopesObject);
-        }
-      }
-    }
-
-    if(existingOperation.consumes) {
-      operation.consumes = existingOperation.consumes;
-    }
-    else if(swagger.consumes) {
-      operation.consumes = swagger.consumes;
-    }
-    if(existingOperation.produces) {
-      operation.produces = existingOperation.produces;
-    }
-    else if(swagger.produces) {
-      operation.produces = swagger.produces;
-    }
-    if(existingOperation.summary) {
-      operation.summary = existingOperation.summary;
-    }
-    if(existingOperation.notes) {
-      operation.description = existingOperation.notes;
-    }
-    if(existingOperation.nickname) {
-      operation.operationId = existingOperation.nickname;
-    }
-    if(existingOperation.deprecated) {
-      operation.deprecated = existingOperation.deprecated;
-    }
-
-    this.authorizations(existingAuthorizations, swagger);
-    this.parameters(operation, existingOperation.parameters, swagger);
-    this.responseMessages(operation, existingOperation, swagger);
-
-    pathObj[method] = operation;
-  }
-
-  swagger.paths[path] = pathObj;
-};
-
-SwaggerSpecConverter.prototype.responseMessages = function(operation, existingOperation) {
-  if(!_.isObject(existingOperation)) {
-    return;
-  }
-  // build default response from the operation (1.x)
-  var defaultResponse = {};
-  this.dataType(existingOperation, defaultResponse);
-  // TODO: look into the real problem of rendering responses in swagger-ui
-  // ....should reponseType have an implicit schema?
-  if(!defaultResponse.schema && defaultResponse.type) {
-    defaultResponse = {schema: defaultResponse};
-  }
-
-  operation.responses = operation.responses || {};
-
-  // grab from responseMessages (1.2)
-  var has200 = false;
-  if(Array.isArray(existingOperation.responseMessages)) {
-    var i;
-    var existingResponses = existingOperation.responseMessages;
-    for(i = 0; i < existingResponses.length; i++) {
-      var existingResponse = existingResponses[i];
-      var response = { description: existingResponse.message };
-      if(existingResponse.code === 200) {
-        has200 = true;
-      }
-      // Convert responseModel -> schema{$ref: responseModel}
-      if(existingResponse.responseModel) {
-        response.schema = {'$ref': '#/definitions/' + existingResponse.responseModel};
-      }
-      operation.responses['' + existingResponse.code] = response;
-    }
-  }
-
-  if(has200) {
-    operation.responses['default'] = defaultResponse;
-  }
-  else {
-    operation.responses['200'] = defaultResponse;
-  }
-};
-
-SwaggerSpecConverter.prototype.authorizations = function(obj) {
-  // TODO
-  if(!_.isObject(obj)) {
-    return;
-  }
-};
-
-SwaggerSpecConverter.prototype.parameters = function(operation, obj) {
-  if(!Array.isArray(obj)) {
-    return;
-  }
-  var i;
-  for(i = 0; i < obj.length; i++) {
-    var existingParameter = obj[i];
-    var parameter = {};
-    parameter.name = existingParameter.name;
-    parameter.description = existingParameter.description;
-    parameter.required = existingParameter.required;
-    parameter.in = existingParameter.paramType;
-
-    // per #168
-    if(parameter.in === 'body') {
-      parameter.name = 'body';
-    }
-    if(parameter.in === 'form') {
-      parameter.in = 'formData';
-    }
-
-    if(existingParameter.enum) {
-      parameter.enum = existingParameter.enum;
-    }
-
-    if(existingParameter.allowMultiple === true || existingParameter.allowMultiple === 'true') {
-      var innerType = {};
-      this.dataType(existingParameter, innerType);
-      parameter.type = 'array';
-      parameter.items = innerType;
-
-      if(existingParameter.allowableValues) {
-        var av = existingParameter.allowableValues;
-        if(av.valueType === 'LIST') {
-          parameter['enum'] = av.values;
-        }
-      }
-    }
-    else {
-      this.dataType(existingParameter, parameter);
-    }
-    if(typeof existingParameter.defaultValue !== 'undefined') {
-      parameter.default = existingParameter.defaultValue;
-    }
-
-    operation.parameters = operation.parameters || [];
-    operation.parameters.push(parameter);
-  }
-};
-
-SwaggerSpecConverter.prototype.dataType = function(source, target) {
-  if(!_.isObject(source)) {
-    return;
-  }
-
-  if(source.minimum) {
-    target.minimum = source.minimum;
-  }
-  if(source.maximum) {
-    target.maximum = source.maximum;
-  }
-  if (source.format) {
-    target.format = source.format;
-  }
-
-  // default can be 'false'
-  if(typeof source.defaultValue !== 'undefined') {
-    target.default = source.defaultValue;
-  }
-
-  var jsonSchemaType = this.toJsonSchema(source);
-  if(jsonSchemaType) {
-    target = target || {};
-    if(jsonSchemaType.type) {
-      target.type = jsonSchemaType.type;
-    }
-    if(jsonSchemaType.format) {
-      target.format = jsonSchemaType.format;
-    }
-    if(jsonSchemaType.$ref) {
-      target.schema = {$ref: jsonSchemaType.$ref};
-    }
-    if(jsonSchemaType.items) {
-      target.items = jsonSchemaType.items;
-    }
-  }
-};
-
-SwaggerSpecConverter.prototype.toJsonSchema = function(source) {
-  if(!source) {
-    return 'object';
-  }
-  var detectedType = (source.type || source.dataType || source.responseClass || '');
-  var lcType = detectedType.toLowerCase();
-  var format = (source.format || '').toLowerCase();
-
-  if(lcType.indexOf('list[') === 0) {
-    var innerType = detectedType.substring(5, detectedType.length - 1);
-    var jsonType = this.toJsonSchema({type: innerType});
-    return {type: 'array', items: jsonType};
-  } else if(lcType === 'int' || (lcType === 'integer' && format === 'int32')) {
-    {return {type: 'integer', format: 'int32'};}
-  } else if(lcType === 'long' || (lcType === 'integer' && format === 'int64')) {
-    {return {type: 'integer', format: 'int64'};}
-  } else if(lcType === 'integer') {
-    {return {type: 'integer', format: 'int64'};}
-  } else if(lcType === 'float' || (lcType === 'number' && format === 'float')) {
-    {return {type: 'number', format: 'float'};}
-  } else if(lcType === 'double' || (lcType === 'number' && format === 'double')) {
-    {return {type: 'number', format: 'double'};}
-  } else if((lcType === 'string' && format === 'date-time') || (lcType === 'date')) {
-    {return {type: 'string', format: 'date-time'};}
-  } else if(lcType === 'string') {
-    {return {type: 'string'};}
-  } else if(lcType === 'file') {
-    {return {type: 'file'};}
-  } else if(lcType === 'boolean') {
-    {return {type: 'boolean'};}
-  } else if(lcType === 'boolean') {
-    {return {type: 'boolean'};}
-  } else if(lcType === 'array' || lcType === 'list') {
-    if(source.items) {
-      var it = this.toJsonSchema(source.items);
-      return {type: 'array', items: it};
-    }
-    else {
-      return {type: 'array', items: {type: 'object'}};
-    }
-  } else if(source.$ref) {
-    return {$ref: this.modelMap[source.$ref] ? '#/definitions/' + this.modelMap[source.$ref] : source.$ref};
-  } else if(lcType === 'void' || lcType === '') {
-    {return {};}
-  } else if (this.modelMap[source.type]) {
-    // If this a model using `type` instead of `$ref`, that's fine.
-    return {$ref: '#/definitions/' + this.modelMap[source.type]};
-  } else {
-    // Unknown model type or 'object', pass it along.
-    return {type: source.type};
-  }
-};
-
-SwaggerSpecConverter.prototype.resourceListing = function(obj, swagger, opts, callback) {
-  var i;
-  var processedCount = 0;   // jshint ignore:line
-  var self = this;          // jshint ignore:line
-  var expectedCount = obj.apis.length;
-  var _swagger = swagger;   // jshint ignore:line
-  var _opts = {};
-
-  if(opts && opts.requestInterceptor){
-    _opts.requestInterceptor = opts.requestInterceptor;
-  }
-
-  if(opts && opts.responseInterceptor){
-    _opts.responseInterceptor = opts.responseInterceptor;
-  }
-
-  var swaggerRequestHeaders = 'application/json';
-
-  if(opts && opts.swaggerRequestHeaders) {
-    swaggerRequestHeaders = opts.swaggerRequestHeaders;
-  }
-
-  if(expectedCount === 0) {
-    this.finish(callback, swagger);
-  }
-
-  for(i = 0; i < expectedCount; i++) {
-    var api = obj.apis[i];
-    var path = api.path;
-    var absolutePath = this.getAbsolutePath(obj.swaggerVersion, this.docLocation, path);
-
-    if(api.description) {
-      swagger.tags = swagger.tags || [];
-      swagger.tags.push({
-        name : this.extractTag(api.path),
-        description : api.description || ''
-      });
-    }
-    var http = {
-      url: absolutePath,
-      headers: { accept: swaggerRequestHeaders },
-      on: {},
-      method: 'get',
-      timeout: opts.timeout
-    };
-    /* jshint ignore:start */
-    http.on.response = function(data) {
-      processedCount += 1;
-      var obj = data.obj;
-      if(obj) {
-        self.declaration(obj, _swagger);
-      }
-      if(processedCount === expectedCount) {
-        self.finish(callback, _swagger);
-      }
-    };
-    http.on.error = function(data) {
-      console.error(data);
-      processedCount += 1;
-      if(processedCount === expectedCount) {
-        self.finish(callback, _swagger);
-      }
-    };
-    /* jshint ignore:end */
-
-    if(this.clientAuthorizations && typeof this.clientAuthorizations.apply === 'function') {
-      this.clientAuthorizations.apply(http);
-    }
-
-    new SwaggerHttp().execute(http, _opts);
-  }
-};
-
-SwaggerSpecConverter.prototype.getAbsolutePath = function(version, docLocation, path)  {
-  if(version === '1.0') {
-    if(docLocation.endsWith('.json')) {
-      // get root path
-      var pos = docLocation.lastIndexOf('/');
-      if(pos > 0) {
-        docLocation = docLocation.substring(0, pos);
-      }
-    }
-  }
-
-  var location = docLocation;
-  if(path.indexOf('http:') === 0 || path.indexOf('https:') === 0) {
-    location = path;
-  }
-  else {
-    if(docLocation.endsWith('/')) {
-      location = docLocation.substring(0, docLocation.length - 1);
-    }
-    location += path;
-  }
-  location = location.replace('{format}', 'json');
-  return location;
-};
-
-SwaggerSpecConverter.prototype.securityDefinitions = function(obj, swagger) {
-  if(obj.authorizations) {
-    var name;
-    for(name in obj.authorizations) {
-      var isValid = false;
-      var securityDefinition = {
-        vendorExtensions: {}
-      };
-      var definition = obj.authorizations[name];
-      if(definition.type === 'apiKey') {
-        securityDefinition.type = 'apiKey';
-        securityDefinition.in = definition.passAs;
-        securityDefinition.name = definition.keyname || name;
-        isValid = true;
-      }
-      else if(definition.type === 'basicAuth') {
-        securityDefinition.type = 'basicAuth';
-        isValid = true;
-      }
-      else if(definition.type === 'oauth2') {
-        var existingScopes = definition.scopes || [];
-        var scopes = {};
-        var i;
-        for(i in existingScopes) {
-          var scope = existingScopes[i];
-          scopes[scope.scope] = scope.description;
-        }
-        securityDefinition.type = 'oauth2';
-        if(i > 0) {
-          securityDefinition.scopes = scopes;
-        }
-        if(definition.grantTypes) {
-          if(definition.grantTypes.implicit) {
-            var implicit = definition.grantTypes.implicit;
-            securityDefinition.flow = 'implicit';
-            securityDefinition.authorizationUrl = implicit.loginEndpoint;
-            isValid = true;
-          }
-          /* jshint ignore:start */
-          if(definition.grantTypes['authorization_code']) {
-            if(!securityDefinition.flow) {
-              // cannot set if flow is already defined
-              var authCode = definition.grantTypes['authorization_code'];
-              securityDefinition.flow = 'accessCode';
-              securityDefinition.authorizationUrl = authCode.tokenRequestEndpoint.url;
-              securityDefinition.tokenUrl = authCode.tokenEndpoint.url;
-              isValid = true;
-            }
-          }
-          /* jshint ignore:end */
-        }
-      }
-      if(isValid) {
-        swagger.securityDefinitions = swagger.securityDefinitions || {};
-        swagger.securityDefinitions[name] = securityDefinition;
-      }
-    }
-  }
-};
-
-SwaggerSpecConverter.prototype.apiInfo = function(obj, swagger) {
-  // info section
-  if(obj.info) {
-    var info = obj.info;
-    swagger.info = {};
-
-    if(info.contact) {
-      swagger.info.contact = {};
-      swagger.info.contact.email = info.contact;
-    }
-    if(info.description) {
-      swagger.info.description = info.description;
-    }
-    if(info.title) {
-      swagger.info.title = info.title;
-    }
-    if(info.termsOfServiceUrl) {
-      swagger.info.termsOfService = info.termsOfServiceUrl;
-    }
-    if(info.license || info.licenseUrl) {
-      swagger.license = {};
-      if(info.license) {
-        swagger.license.name = info.license;
-      }
-      if(info.licenseUrl) {
-        swagger.license.url = info.licenseUrl;
-      }
-    }
-  }
-  else {
-    this.warnings.push('missing info section');
-  }
-};
-
-SwaggerSpecConverter.prototype.finish = function (callback, obj) {
-  callback(obj);
-};
-
-},{"./http":5,"lodash-compat/lang/isObject":144}],9:[function(require,module,exports){
-'use strict';
-
-var log = require('../helpers').log;
-var _ = {
-  isPlainObject: require('lodash-compat/lang/isPlainObject'),
-  isString: require('lodash-compat/lang/isString'),
-};
-
-var SchemaMarkup = require('../schema-markup.js');
-var jsyaml = require('js-yaml');
-
-var Model = module.exports = function (name, definition, models, modelPropertyMacro) {
-  this.definition = definition || {};
-  this.isArray = definition.type === 'array';
-  this.models = models || {};
-  this.name = name || definition.title || 'Inline Model';
-  this.modelPropertyMacro = modelPropertyMacro || function (property) {
-    return property.default;
-  };
-
-  return this;
-};
-
-// Note!  This function will be removed in 2.2.x!
-Model.prototype.createJSONSample = Model.prototype.getSampleValue = function (modelsToIgnore) {
-  modelsToIgnore = modelsToIgnore || {};
-
-  modelsToIgnore[this.name] = this;
-
-  // Response support
-  if (this.examples && _.isPlainObject(this.examples) && this.examples['application/json']) {
-    this.definition.example = this.examples['application/json'];
-
-    if (_.isString(this.definition.example)) {
-      this.definition.example = jsyaml.safeLoad(this.definition.example);
-    }
-  } else if (!this.definition.example) {
-    this.definition.example = this.examples;
-  }
-
-  return SchemaMarkup.schemaToJSON(this.definition, this.models, modelsToIgnore, this.modelPropertyMacro);
-};
-
-Model.prototype.getMockSignature = function () {
-  return SchemaMarkup.schemaToHTML(this.name, this.definition, this.models, this.modelPropertyMacro);
-};
-
-},{"../helpers":4,"../schema-markup.js":7,"js-yaml":19,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isString":146}],10:[function(require,module,exports){
-'use strict';
-
-var _ = {
-  cloneDeep: require('lodash-compat/lang/cloneDeep'),
-  isUndefined: require('lodash-compat/lang/isUndefined'),
-  isEmpty: require('lodash-compat/lang/isEmpty'),
-  isObject: require('lodash-compat/lang/isObject')
-};
-var helpers = require('../helpers');
-var Model = require('./model');
-var SwaggerHttp = require('../http');
-var Q = require('q');
-
-var Operation = module.exports = function (parent, scheme, operationId, httpMethod, path, args, definitions, models, clientAuthorizations) {
-  var errors = [];
-
-  parent = parent || {};
-  args = args || {};
-
-  if(parent && parent.options) {
-    this.client = parent.options.client || null;
-    this.requestInterceptor = parent.options.requestInterceptor || null;
-    this.responseInterceptor = parent.options.responseInterceptor || null;
-    this.requestAgent = parent.options.requestAgent;
-  }
-  this.authorizations = args.security;
-  this.basePath = parent.basePath || '/';
-  this.clientAuthorizations = clientAuthorizations;
-  this.consumes = args.consumes || parent.consumes || ['application/json'];
-  this.produces = args.produces || parent.produces || ['application/json'];
-  this.deprecated = args.deprecated;
-  this.description = args.description;
-  this.host = parent.host;
-  this.method = (httpMethod || errors.push('Operation ' + operationId + ' is missing method.'));
-  this.models = models || {};
-  this.nickname = (operationId || errors.push('Operations must have a nickname.'));
-  this.operation = args;
-  this.operations = {};
-  this.parameters = args !== null ? (args.parameters || []) : {};
-  this.parent = parent;
-  this.path = (path || errors.push('Operation ' + this.nickname + ' is missing path.'));
-  this.responses = (args.responses || {});
-  this.scheme = scheme || parent.scheme || 'http';
-  this.schemes = args.schemes || parent.schemes;
-  this.security = args.security || parent.security;
-  this.summary = args.summary || '';
-  this.timeout = parent.timeout;
-  this.type = null;
-  this.useJQuery = parent.useJQuery;
-  this.jqueryAjaxCache = parent.jqueryAjaxCache;
-  this.enableCookies = parent.enableCookies;
-
-  var key;
-
-  if(!this.host) {
-    if(typeof window !== 'undefined') {
-      this.host = window.location.host;
-    }
-    else {
-      this.host = 'localhost';
-    }
-  }
-  this.parameterMacro = parent.parameterMacro || function (operation, parameter) {
-    return parameter.default;
-  };
-
-  this.inlineModels = [];
-
-  if(this.basePath !== '/' && this.basePath.slice(-1) === '/') {
-    this.basePath = this.basePath.slice(0, -1);
-  }
-
-  if (typeof this.deprecated === 'string') {
-    switch(this.deprecated.toLowerCase()) {
-      case 'true': case 'yes': case '1': {
-        this.deprecated = true;
-        break;
-      }
-
-      case 'false': case 'no': case '0': case null: {
-        this.deprecated = false;
-        break;
-      }
-
-      default: this.deprecated = Boolean(this.deprecated);
-    }
-  }
-
-  var i, model;
-
-  if (definitions) {
-    // add to global models
-    for (key in definitions) {
-      model = new Model(key, definitions[key], this.models, parent.modelPropertyMacro);
-
-      if (model) {
-        this.models[key] = model;
-      }
-    }
-  }
-  else {
-    definitions = {};
-  }
-
-  for (i = 0; i < this.parameters.length; i++) {
-    var d, param = this.parameters[i];
-
-    // Allow macro to set the default value
-    param.default = this.parameterMacro(this, param);
-
-    if (param.type === 'array') {
-      param.isList = true;
-      param.allowMultiple = true;
-    }
-
-    var innerType = this.getType(param);
-
-    if (innerType && innerType.toString().toLowerCase() === 'boolean') {
-      param.allowableValues = {};
-      param.isList = true;
-      param['enum'] = [true, false]; // use actual primitives
-    }
-
-    for(key in param) {
-      helpers.extractExtensions(key, param);
-    }
-    if(typeof param['x-example'] !== 'undefined') {
-      d = param['x-example'];
-      param.default = d;
-    }
-    if(param['x-examples']) {
-      d = param['x-examples'].default;
-      if(typeof d !== 'undefined') {
-        param.default = d;
-      }
-    }
-
-    var enumValues = param['enum'] || (param.items && param.items['enum']);
-
-    if (typeof enumValues !== 'undefined') {
-      var id;
-
-      param.allowableValues = {};
-      param.allowableValues.values = [];
-      param.allowableValues.descriptiveValues = [];
-
-      for (id = 0; id < enumValues.length; id++) {
-        var value = enumValues[id];
-        var isDefault = (value === param.default || value+'' === param.default);
-
-        param.allowableValues.values.push(value);
-        // Always have string for descriptive values....
-        param.allowableValues.descriptiveValues.push({value : value+'', isDefault: isDefault});
-      }
-    }
-
-    if (param.type === 'array') {
-      innerType = [innerType];
-
-      if (typeof param.allowableValues === 'undefined') {
-        // can't show as a list if no values to select from
-        delete param.isList;
-        delete param.allowMultiple;
-      }
-    }
-
-    param.modelSignature = {type: innerType, definitions: this.models};
-    param.signature = this.getModelSignature(innerType, this.models).toString();
-    param.sampleJSON = this.getModelSampleJSON(innerType, this.models);
-    param.responseClassSignature = param.signature;
-  }
-
-  var keyname, defaultResponseCode, response, responses = this.responses;
-
-  if (responses['200']) {
-    response = responses['200'];
-    defaultResponseCode = '200';
-  } else if (responses['201']) {
-    response = responses['201'];
-    defaultResponseCode = '201';
-  } else if (responses['202']) {
-    response = responses['202'];
-    defaultResponseCode = '202';
-  } else if (responses['203']) {
-    response = responses['203'];
-    defaultResponseCode = '203';
-  } else if (responses['204']) {
-    response = responses['204'];
-    defaultResponseCode = '204';
-  } else if (responses['205']) {
-    response = responses['205'];
-    defaultResponseCode = '205';
-  } else if (responses['206']) {
-    response = responses['206'];
-    defaultResponseCode = '206';
-  } else if (responses['default']) {
-    response = responses['default'];
-    defaultResponseCode = 'default';
-  }
-
-  for(keyname in responses) {
-    helpers.extractExtensions(keyname, responses);
-    if(typeof keyname === 'string' && keyname.indexOf('x-') === -1) {
-      var responseObject = responses[keyname];
-      if(typeof responseObject === 'object' && typeof responseObject.headers === 'object') {
-        var headers = responseObject.headers;
-        for(var headerName in headers) {
-          var header = headers[headerName];
-          if(typeof header === 'object') {
-            for(var headerKey in header) {
-              helpers.extractExtensions(headerKey, header);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (response) {
-    for(keyname in response) {
-      helpers.extractExtensions(keyname, response);
-    }
-  }
-
-  if (response && response.schema) {
-    var resolvedModel = this.resolveModel(response.schema, definitions);
-    var successResponse;
-
-    delete responses[defaultResponseCode];
-
-    if (resolvedModel) {
-      this.successResponse = {};
-      successResponse = this.successResponse[defaultResponseCode] = resolvedModel;
-    } else if (!response.schema.type || response.schema.type === 'object' || response.schema.type === 'array') {
-      // Inline model
-      this.successResponse = {};
-      successResponse = this.successResponse[defaultResponseCode] = new Model(undefined, response.schema || {}, this.models, parent.modelPropertyMacro);
-    } else {
-      // Primitive
-      this.successResponse = {};
-      successResponse = this.successResponse[defaultResponseCode] = response.schema;
-    }
-
-    if (successResponse) {
-      successResponse.vendorExtensions = response.vendorExtensions;
-      // Attach response properties
-      if (response.description) {
-        successResponse.description = response.description;
-      }
-
-      if (response.examples) {
-        successResponse.examples = response.examples;
-      }
-
-      if (response.headers) {
-        successResponse.headers = response.headers;
-      }
-    }
-
-    this.type = response;
-  }
-
-  if (errors.length > 0) {
-    if (this.resource && this.resource.api && this.resource.api.fail) {
-      this.resource.api.fail(errors);
-    }
-  }
-
-  return this;
-};
-
-Operation.prototype.isDefaultArrayItemValue = function(value, param) {
-  if (param.default && Array.isArray(param.default)) {
-    return param.default.indexOf(value) !== -1;
-  }
-  return value === param.default;
-};
-
-Operation.prototype.getType = function (param) {
-  var type = param.type;
-  var format = param.format;
-  var isArray = false;
-  var str;
-
-  if (type === 'integer' && format === 'int32') {
-    str = 'integer';
-  } else if (type === 'integer' && format === 'int64') {
-    str = 'long';
-  } else if (type === 'integer') {
-    str = 'integer';
-  } else if (type === 'string') {
-    if (format === 'date-time') {
-      str = 'date-time';
-    } else if (format === 'date') {
-      str = 'date';
-    } else {
-      str = 'string';
-    }
-  } else if (type === 'number' && format === 'float') {
-    str = 'float';
-  } else if (type === 'number' && format === 'double') {
-    str = 'double';
-  } else if (type === 'number') {
-    str = 'double';
-  } else if (type === 'boolean') {
-    str = 'boolean';
-  } else if (type === 'array') {
-    isArray = true;
-
-    if (param.items) {
-      str = this.getType(param.items);
-    }
-  } else if (type === 'file') {
-    str = 'file';
-  }
-
-  if (param.$ref) {
-    str = helpers.simpleRef(param.$ref);
-  }
-
-  var schema = param.schema;
-
-  if (schema) {
-    var ref = schema.$ref;
-
-    if (ref) {
-      ref = helpers.simpleRef(ref);
-
-      if (isArray) {
-        return [ ref ];
-      } else {
-        return ref;
-      }
-    } else {
-      // If inline schema, we add it our interal hash -> which gives us it's ID (int)
-      if(schema.type === 'object') {
-        return this.addInlineModel(schema);
-      }
-      return this.getType(schema);
-    }
-  }
-  if (isArray) {
-    return [ str ];
-  } else {
-    return str;
-  }
-};
-
-/**
- * adds an inline schema (model) to a hash, where we can ref it later
- * @param {object} schema a schema
- * @return {number} the ID of the schema being added, or null
- **/
-Operation.prototype.addInlineModel = function (schema) {
-  var len = this.inlineModels.length;
-  var model = this.resolveModel(schema, {});
-  if(model) {
-    this.inlineModels.push(model);
-    return 'Inline Model '+len; // return string ref of the inline model (used with #getInlineModel)
-  }
-  return null; // report errors?
-};
-
-/**
- * gets the internal ref to an inline model
- * @param {string} inline_str a string reference to an inline model
- * @return {Model} the model being referenced. Or null
- **/
-Operation.prototype.getInlineModel = function(inlineStr) {
-  if(/^Inline Model \d+$/.test(inlineStr)) {
-    var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //
-    var model = this.inlineModels[id];
-    return model;
-  }
-  // I'm returning null here, should I rather throw an error?
-  return null;
-};
-
-Operation.prototype.resolveModel = function (schema, definitions) {
-  if (typeof schema.$ref !== 'undefined') {
-    var ref = schema.$ref;
-
-    if (ref.indexOf('#/definitions/') === 0) {
-      ref = ref.substring('#/definitions/'.length);
-    }
-
-    if (definitions[ref]) {
-      return new Model(ref, definitions[ref], this.models, this.parent.modelPropertyMacro);
-    }
-  // schema must at least be an object to get resolved to an inline Model
-  } else if (schema && typeof schema === 'object' &&
-            (schema.type === 'object' || _.isUndefined(schema.type))) {
-    return new Model(undefined, schema, this.models, this.parent.modelPropertyMacro);
-  }
-
-  return null;
-};
-
-Operation.prototype.help = function (dontPrint) {
-  var out = this.nickname + ': ' + this.summary + '\n';
-
-  for (var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    var typeInfo = param.signature;
-
-    out += '\n  * ' + param.name + ' (' + typeInfo + '): ' + param.description;
-  }
-
-  if (typeof dontPrint === 'undefined') {
-    helpers.log(out);
-  }
-
-  return out;
-};
-
-Operation.prototype.getModelSignature = function (type, definitions) {
-  var isPrimitive, listType;
-
-  if (type instanceof Array) {
-    listType = true;
-    type = type[0];
-  }
-
-  // Convert undefined to string of 'undefined'
-  if (typeof type === 'undefined') {
-    type = 'undefined';
-    isPrimitive = true;
-
-  } else if (definitions[type]){
-    // a model def exists?
-    type = definitions[type]; /* Model */
-    isPrimitive = false;
-
-  } else if (this.getInlineModel(type)) {
-    type = this.getInlineModel(type); /* Model */
-    isPrimitive = false;
-
-  } else {
-    // We default to primitive
-    isPrimitive = true;
-  }
-
-  if (isPrimitive) {
-    if (listType) {
-      return 'Array[' + type + ']';
-    } else {
-      return type.toString();
-    }
-  } else {
-    if (listType) {
-      return 'Array[' + type.getMockSignature() + ']';
-    } else {
-      return type.getMockSignature();
-    }
-  }
-};
-
-Operation.prototype.supportHeaderParams = function () {
-  return true;
-};
-
-Operation.prototype.supportedSubmitMethods = function () {
-  return this.parent.supportedSubmitMethods;
-};
-
-Operation.prototype.getHeaderParams = function (args) {
-  var headers = this.setContentTypes(args, {});
-  var headerParamsByLowerCase = {};
-
-  for (var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-
-    if (param.in === 'header') {
-      headerParamsByLowerCase[param.name.toLowerCase()] = param;
-    }
-  }
-
-  for (var arg in args) {
-    var headerParam = headerParamsByLowerCase[arg.toLowerCase()];
-    if (typeof headerParam !== 'undefined') {
-      var value = args[arg];
-
-      if (Array.isArray(value)) {
-        value = value.toString();
-      }
-
-      headers[headerParam.name] = value;
-    }
-  }
-
-  return headers;
-};
-
-Operation.prototype.urlify = function (args, maskPasswords) {
-  var formParams = {};
-  var requestUrl = this.path.replace(/#.*/, ''); // remove URL fragment
-  var querystring = ''; // grab params from the args, build the querystring along the way
-
-  for (var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-
-    if (typeof args[param.name] !== 'undefined') {
-      var isPassword;
-      if(param.type === 'string' && param.format === 'password' && maskPasswords) {
-        isPassword = true;
-      }
-
-      if (param.in === 'path') {
-        var reg = new RegExp('\{' + param.name + '\}', 'gi');
-        var value = args[param.name];
-
-        if (Array.isArray(value)) {
-          value = this.encodePathCollection(param.collectionFormat, param.name, value, isPassword);
-        } else {
-          value = this.encodePathParam(value, isPassword);
-        }
-
-        requestUrl = requestUrl.replace(reg, value);
-      } else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {
-        if (querystring === '' && requestUrl.indexOf('?') < 0) {
-          querystring += '?';
-        } else {
-          querystring += '&';
-        }
-
-        if (typeof param.collectionFormat !== 'undefined') {
-          var qp = args[param.name];
-
-          if (Array.isArray(qp)) {
-            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp, isPassword);
-          } else {
-            querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);
-          }
-        } else {
-          querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);
-        }
-      } else if (param.in === 'formData') {
-        formParams[param.name] = args[param.name];
-      }
-    }
-  }
-  var url = this.scheme + '://' + this.host;
-
-  if (this.basePath !== '/') {
-    url += this.basePath;
-  }
-  return url + requestUrl + querystring;
-};
-
-Operation.prototype.getMissingParams = function (args) {
-  var missingParams = []; // check required params, track the ones that are missing
-  var i;
-
-  for (i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-
-    if (param.required === true) {
-      if (typeof args[param.name] === 'undefined') {
-        missingParams = param.name;
-      }
-    }
-  }
-
-  return missingParams;
-};
-
-Operation.prototype.getBody = function (headers, args, opts) {
-  var formParams = {}, hasFormParams, param, body, key, value, hasBody = false;
-
-  // look at each param and put form params in an object
-  for (var i = 0; i < this.parameters.length; i++) {
-    param = this.parameters[i];
-    if (typeof args[param.name] !== 'undefined') {
-      var isPassword;
-      if(param.type === 'string' && param.format === 'password') {
-        isPassword = 'password';
-      }
-      if (param.in === 'body') {
-        body = args[param.name];
-      } else if (param.in === 'formData') {
-        formParams[param.name] = {
-          param: param,
-          value: args[param.name],
-          password: isPassword
-        };
-        hasFormParams = true;
-      }
-    }
-    else {
-      if(param.in === 'body') {
-        hasBody = true;
-      }
-    }
-  }
-
-  // if body is null and hasBody is true, AND a JSON body is requested, send empty {}
-  if(hasBody && typeof body === 'undefined') {
-    var contentType = headers['Content-Type'];
-    if(contentType && contentType.indexOf('application/json') === 0) {
-      body = '{}';
-    }
-  }
-
-  var isMultiPart = false;
-  if(headers['Content-Type'] && headers['Content-Type'].indexOf('multipart/form-data') >= 0) {
-    isMultiPart = true;
-  }
-
-  // handle form params
-  if (hasFormParams && !isMultiPart) {
-    var encoded = '';
-
-    for (key in formParams) {
-      param = formParams[key].param;
-      value = formParams[key].value;
-      var password;
-
-      if(opts && opts.maskPasswords) {
-        password = formParams[key].password;
-      }
-
-      if (typeof value !== 'undefined') {
-        if (Array.isArray(value)) {
-          if (encoded !== '') {
-            encoded += '&';
-          }
-          encoded += this.encodeQueryCollection(param.collectionFormat, key, value, password);
-        }
-        else {
-          if (encoded !== '') {
-            encoded += '&';
-          }
-
-          encoded += encodeURIComponent(key) + '=' + mask(encodeURIComponent(value), password);
-        }
-      }
-    }
-
-    body = encoded;
-  } else if (isMultiPart) {
-    var bodyParam;
-    if (typeof FormData === 'function') {
-      bodyParam = new FormData();
-
-      bodyParam.type = 'formData';
-
-      for (key in formParams) {
-        param = formParams[key].param;
-        value = args[key];
-
-        if (typeof value !== 'undefined') {
-          if({}.toString.apply(value) === '[object File]') {
-            bodyParam.append(key, value);
-          }
-          else if (value.type === 'file' && value.value) {
-            bodyParam.append(key, value.value);
-          } else {
-            if (Array.isArray(value)) {
-              if(param.collectionFormat === 'multi') {
-                bodyParam.delete(key);
-                for(var v in value) {
-                  bodyParam.append(key, value[v]);
-                }
-              }
-              else {
-                bodyParam.append(key, this.encodeQueryCollection(param.collectionFormat, key, value).split('=').slice(1).join('='));
-              }
-            }
-            else {
-              bodyParam.append(key, value);
-            }
-          }
-        }
-      }
-      body = bodyParam;
-    }
-    else {
-      bodyParam = {};
-      for (key in formParams) {
-        value = args[key];
-        if (Array.isArray(value)) {
-          var delimeter;
-          var format = param.collectionFormat || 'multi';
-          if(format === 'ssv') {
-            delimeter = ' ';
-          }
-          else if(format === 'pipes') {
-            delimeter = '|';
-          }
-          else if(format === 'tsv') {
-            delimeter = '\t';
-          }
-          else if(format === 'multi') {
-            bodyParam[key] = value;
-            break;
-          }
-          else {
-            delimeter = ',';
-          }
-          var data;
-          value.forEach(function(v) {
-            if(data) {
-              data += delimeter;
-            }
-            else {
-              data = '';
-            }
-            data += v;
-          });
-          bodyParam[key] = data;
-        }
-        else {
-          bodyParam[key] = value;
-        }
-      }
-      body = bodyParam;
-    }
-    headers['Content-Type'] = 'multipart/form-data';
-  }
-
-  return body;
-};
-
-/**
- * gets sample response for a single operation
- **/
-Operation.prototype.getModelSampleJSON = function (type, models) {
-  var listType, sampleJson, innerType;
-  models = models || {};
-
-  listType = (type instanceof Array);
-  innerType = listType ? type[0] : type;
-
-  if(models[innerType]) {
-    sampleJson = models[innerType].createJSONSample();
-  } else if (this.getInlineModel(innerType)){
-    sampleJson = this.getInlineModel(innerType).createJSONSample(); // may return null, if type isn't correct
-  }
-
-
-  if (sampleJson) {
-    sampleJson = listType ? [sampleJson] : sampleJson;
-
-    if (typeof sampleJson === 'string') {
-      return sampleJson;
-    } else if (_.isObject(sampleJson)) {
-      var t = sampleJson;
-
-      if (sampleJson instanceof Array && sampleJson.length > 0) {
-        t = sampleJson[0];
-      }
-
-      if (t.nodeName && typeof t === 'Node') {
-        var xmlString = new XMLSerializer().serializeToString(t);
-
-        return this.formatXml(xmlString);
-      } else {
-        return JSON.stringify(sampleJson, null, 2);
-      }
-    } else {
-      return sampleJson;
-    }
-  }
-};
-
-/**
- * legacy binding
- **/
-Operation.prototype.do = function (args, opts, callback, error, parent) {
-  return this.execute(args, opts, callback, error, parent);
-};
-
-/**
- * executes an operation
- **/
-Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
-  var args = arg1 || {};
-  var opts = {}, success, error, deferred, timeout;
-
-  if (_.isObject(arg2)) {
-    opts = arg2;
-    success = arg3;
-    error = arg4;
-  }
-
-  timeout = typeof opts.timeout !== 'undefined' ? opts.timeout : this.timeout;
-
-  if(this.client) {
-    opts.client = this.client;
-  }
-
-  if(this.requestAgent) {
-    opts.requestAgent = this.requestAgent;
-  }
-
-  // add the request interceptor from parent, if none sent from client
-  if(!opts.requestInterceptor && this.requestInterceptor ) {
-    opts.requestInterceptor = this.requestInterceptor ;
-  }
-
-  if(!opts.responseInterceptor && this.responseInterceptor) {
-    opts.responseInterceptor = this.responseInterceptor;
-  }
-
-  if (typeof arg2 === 'function') {
-    success = arg2;
-    error = arg3;
-  }
-
-  if (this.parent.usePromise) {
-    deferred = Q.defer();
-  } else {
-    success = (success || this.parent.defaultSuccessCallback || helpers.log);
-    error = (error || this.parent.defaultErrorCallback || helpers.log);
-  }
-
-  if (typeof opts.useJQuery === 'undefined') {
-    opts.useJQuery = this.useJQuery;
-  }
-
-  if (typeof opts.jqueryAjaxCache === 'undefined') {
-    opts.jqueryAjaxCache = this.jqueryAjaxCache;
-  }
-
-  if (typeof opts.enableCookies === 'undefined') {
-    opts.enableCookies = this.enableCookies;
-  }
-
-  var missingParams = this.getMissingParams(args);
-
-  if (missingParams.length > 0) {
-    var message = 'missing required params: ' + missingParams;
-
-    helpers.fail(message);
-
-    if (this.parent.usePromise) {
-      deferred.reject(message);
-      return deferred.promise;
-    } else {
-      error(message, parent);
-      return {};
-    }
-  }
-
-  var allHeaders = this.getHeaderParams(args);
-  var contentTypeHeaders = this.setContentTypes(args, opts);
-  var headers = {}, attrname;
-
-  for (attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }
-  for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }
-
-  var body = this.getBody(contentTypeHeaders, args, opts);
-  var url = this.urlify(args, opts.maskPasswords);
-
-  if(url.indexOf('.{format}') > 0) {
-    if(headers) {
-      var format = headers.Accept || headers.accept;
-      if(format && format.indexOf('json') > 0) {
-        url = url.replace('.{format}', '.json');
-      }
-      else if(format && format.indexOf('xml') > 0) {
-        url = url.replace('.{format}', '.xml');
-      }
-    }
-  }
-
-  var obj = {
-    url: url,
-    method: this.method.toUpperCase(),
-    body: body,
-    enableCookies: opts.enableCookies,
-    useJQuery: opts.useJQuery,
-    jqueryAjaxCache: opts.jqueryAjaxCache,
-    deferred: deferred,
-    headers: headers,
-    clientAuthorizations: opts.clientAuthorizations,
-    operation: this,
-    connectionAgent: this.connectionAgent,
-    on: {
-      response: function (response) {
-        if (deferred) {
-          deferred.resolve(response);
-          return deferred.promise;
-        } else {
-          return success(response, parent);
-        }
-      },
-      error: function (response) {
-        if (deferred) {
-          deferred.reject(response);
-          return deferred.promise;
-        } else {
-          return error(response, parent);
-        }
-      }
-    }
-  };
-
-  if (timeout) {
-    obj.timeout = timeout;
-  }
-
-  this.clientAuthorizations.apply(obj, this.operation.security);
-  if (opts.mock === true) {
-    return obj;
-  } else {
-    return new SwaggerHttp().execute(obj, opts);
-  }
-};
-
-function itemByPriority(col, itemPriority) {
-
-  // No priorities? return first...
-  if(_.isEmpty(itemPriority)) {
-    return col[0];
-  }
-
-  for (var i = 0, len = itemPriority.length; i < len; i++) {
-    if(col.indexOf(itemPriority[i]) > -1) {
-      return itemPriority[i];
-    }
-  }
-
-  // Otherwise return first
-  return col[0];
-}
-
-Operation.prototype.setContentTypes = function (args, opts) {
-  // default type
-  var allDefinedParams = this.parameters;
-  var body;
-  var consumes = args.parameterContentType || itemByPriority(this.consumes, ['application/json', 'application/yaml']);
-  var accepts = opts.responseContentType || itemByPriority(this.produces, ['application/json', 'application/yaml']);
-  var definedFileParams = [];
-  var definedFormParams = [];
-  var headers = {};
-  var i;
-
-  // get params from the operation and set them in definedFileParams, definedFormParams, headers
-  for (i = 0; i < allDefinedParams.length; i++) {
-    var param = allDefinedParams[i];
-
-    if (param.in === 'formData') {
-      if (param.type === 'file') {
-        definedFileParams.push(param);
-      } else {
-        definedFormParams.push(param);
-      }
-    } else if (param.in === 'header' && opts) {
-      var key = param.name;
-      var headerValue = opts[param.name];
-
-      if (typeof opts[param.name] !== 'undefined') {
-        headers[key] = headerValue;
-      }
-    } else if (param.in === 'body' && typeof args[param.name] !== 'undefined') {
-      body = args[param.name];
-    }
-  }
-
-  // if there's a body, need to set the consumes header via requestContentType
-  var hasBody = body || definedFileParams.length || definedFormParams.length;
-  if (this.method === 'post' || this.method === 'put' || this.method === 'patch' ||
-      ((this.method === 'delete' || this.method === 'get') && hasBody)) {
-    if (opts.requestContentType) {
-      consumes = opts.requestContentType;
-    }
-    // if any form params, content type must be set
-    if (definedFormParams.length > 0) {
-      consumes = undefined;
-      if (opts.requestContentType) {             // override if set
-        consumes = opts.requestContentType;
-      } else if (definedFileParams.length > 0) { // if a file, must be multipart/form-data
-        consumes = 'multipart/form-data';
-      } else {
-        if (this.consumes && this.consumes.length > 0) {
-          // use the consumes setting
-          for(var c in this.consumes) {
-            var chk = this.consumes[c];
-            if(chk.indexOf('application/x-www-form-urlencoded') === 0 || chk.indexOf('multipart/form-data') === 0) {
-              consumes = chk;
-            }
-          }
-        }
-      }
-      if(typeof consumes === 'undefined') {
-        // default to x-www-from-urlencoded
-        consumes = 'application/x-www-form-urlencoded';
-      }
-    }
-  }
-  else {
-    consumes = null;
-  }
-
-  if (consumes && this.consumes) {
-    if (this.consumes.indexOf(consumes) === -1) {
-      helpers.log('server doesn\'t consume ' + consumes + ', try ' + JSON.stringify(this.consumes));
-    }
-  }
-
-  if (!this.matchesAccept(accepts)) {
-    helpers.log('server can\'t produce ' + accepts);
-  }
-
-  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded')) {
-    headers['Content-Type'] = consumes;
-  }
-  else if(this.consumes && this.consumes.length > 0 && this.consumes[0] === 'application/x-www-form-urlencoded') {
-    headers['Content-Type'] = this.consumes[0];
-  }
-
-  if (accepts) {
-    headers.Accept = accepts;
-  }
-
-  return headers;
-};
-
-/**
- * Returns true if the request accepts header matches anything in this.produces.
- *  If this.produces contains * / *, ignore the accept header.
- * @param {string=} accepts The client request accept header.
- * @return {boolean}
- */
-Operation.prototype.matchesAccept = function(accepts) {
-  // no accepts or produces, no problem!
-  if (!accepts || !this.produces) {
-    return true;
-  }
-  return this.produces.indexOf(accepts) !== -1 || this.produces.indexOf('*/*') !== -1;
-};
-
-Operation.prototype.asCurl = function (args1, args2) {
-  var opts = {mock: true, maskPasswords: true};
-  if (typeof args2 === 'object') {
-    for (var argKey in args2) {
-      opts[argKey] = args2[argKey];
-    }
-  }
-  var obj = this.execute(args1, opts);
-
-  this.clientAuthorizations.apply(obj, this.operation.security);
-
-  var results = [];
-
-  results.push('-X ' + this.method.toUpperCase());
-
-  if (typeof obj.headers !== 'undefined') {
-    var key;
-
-    for (key in obj.headers) {
-      var value = obj.headers[key];
-      if(typeof value === 'string'){
-        value = value.replace(/\'/g, '\\u0027');
-      }
-      results.push('--header \'' + key + ': ' + value + '\'');
-    }
-  }
-  var isFormData = false;
-  var isMultipart = false;
-
-  var type = obj.headers['Content-Type'];
-  if(type && type.indexOf('application/x-www-form-urlencoded') === 0) {
-    isFormData = true;
-  }
-  else if (type && type.indexOf('multipart/form-data') === 0) {
-    isFormData = true;
-    isMultipart = true;
-  }
-
-  if (obj.body) {
-    var body;
-    if (_.isObject(obj.body)) {
-      if(isMultipart) {
-        isMultipart = true;
-        // add the form data
-        for(var i = 0; i < this.parameters.length; i++) {
-          var parameter = this.parameters[i];
-          if(parameter.in === 'formData') {
-            if (!body) {
-              body = '';
-            }
-
-            var paramValue;
-            if(typeof FormData === 'function' && obj.body instanceof FormData) {
-              paramValue = obj.body.getAll(parameter.name);
-            }
-            else {
-              paramValue = obj.body[parameter.name];
-            }
-            if (paramValue) {
-              if (parameter.type === 'file') {
-                if(paramValue.name) {
-                  body += '-F ' + parameter.name + '=@"' + paramValue.name + '" ';
-                }
-              }
-              else {
-                if (Array.isArray(paramValue)) {
-                  if(parameter.collectionFormat === 'multi') {
-                    for(var v in paramValue) {
-                      body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue[v], parameter.format) + ' ';
-                    }
-                  }
-                  else {
-                    body += '-F ' + this.encodeQueryCollection(parameter.collectionFormat, parameter.name, mask(paramValue, parameter.format)) + ' ';
-                  }
-                } else {
-                  body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue, parameter.format) + ' ';
-                }
-              }
-            }
-          }
-        }
-      }
-      if(!body) {
-        body = JSON.stringify(obj.body);
-      }
-    } else {
-      body = obj.body;
-    }
-    // escape @ => %40, ' => %27
-    body = body.replace(/\'/g, '%27').replace(/\n/g, ' \\ \n ');
-
-    if(!isFormData) {
-      // escape & => %26
-      body = body.replace(/&/g, '%26');
-    }
-    if(isMultipart) {
-      results.push(body);
-    }
-    else {
-      results.push('-d \'' + body.replace(/@/g, '%40') + '\'');
-    }
-  }
-
-  return 'curl ' + (results.join(' ')) + ' \'' + obj.url + '\'';
-};
-
-Operation.prototype.encodePathCollection = function (type, name, value, maskPasswords) {
-  var encoded = '';
-  var i;
-  var separator = '';
-
-  if (type === 'ssv') {
-    separator = '%20';
-  } else if (type === 'tsv') {
-    separator = '%09';
-  } else if (type === 'pipes') {
-    separator = '|';
-  } else {
-    separator = ',';
-  }
-
-  for (i = 0; i < value.length; i++) {
-    if (i === 0) {
-      encoded = this.encodeQueryParam(value[i], maskPasswords);
-    } else {
-      encoded += separator + this.encodeQueryParam(value[i], maskPasswords);
-    }
-  }
-
-  return encoded;
-};
-
-Operation.prototype.encodeQueryCollection = function (type, name, value, maskPasswords) {
-  var encoded = '';
-  var i;
-
-  type = type || 'default';
-  if (type === 'default' || type === 'multi') {
-    for (i = 0; i < value.length; i++) {
-      if (i > 0) {encoded += '&';}
-
-      encoded += this.encodeQueryKey(name) + '=' + mask(this.encodeQueryParam(value[i]), maskPasswords);
-    }
-  } else {
-    var separator = '';
-
-    if (type === 'csv') {
-      separator = ',';
-    } else if (type === 'ssv') {
-      separator = '%20';
-    } else if (type === 'tsv') {
-      separator = '%09';
-    } else if (type === 'pipes') {
-      separator = '|';
-    } else if (type === 'brackets') {
-      for (i = 0; i < value.length; i++) {
-        if (i !== 0) {
-          encoded += '&';
-        }
-        encoded += this.encodeQueryKey(name) + '[]=' + mask(this.encodeQueryParam(value[i]), maskPasswords);
-      }
-    }
-
-    if (separator !== '') {
-      for (i = 0; i < value.length; i++) {
-        if (i === 0) {
-          encoded = this.encodeQueryKey(name) + '=' + this.encodeQueryParam(value[i]);
-        } else {
-          encoded += separator + this.encodeQueryParam(value[i]);
-        }
-      }
-    }
-  }
-
-  return encoded;
-};
-
-Operation.prototype.encodeQueryKey = function (arg) {
-  return encodeURIComponent(arg)
-      .replace('%5B','[').replace('%5D', ']').replace('%24', '$');
-};
-
-Operation.prototype.encodeQueryParam = function (arg, maskPasswords) {
-  if(maskPasswords) {
-    return "******";
-  }
-  return encodeURIComponent(arg);
-};
-
-/**
- * TODO revisit, might not want to leave '/'
- **/
-Operation.prototype.encodePathParam = function (pathParam, maskPasswords) {
-  return encodeURIComponent(pathParam, maskPasswords);
-};
-
-var mask = function(value, format) {
-  if(typeof format === 'string' && format === 'password') {
-    return '******';
-  }
-  return value;
-}
-},{"../helpers":4,"../http":5,"./model":9,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isEmpty":141,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isUndefined":148,"q":157}],11:[function(require,module,exports){
-'use strict';
-
-var OperationGroup = module.exports = function (tag, description, externalDocs, operation) {
-  this.description = description;
-  this.externalDocs = externalDocs;
-  this.name = tag;
-  this.operation = operation;
-  this.operationsArray = [];
-  this.path = tag;
-  this.tag = tag;
-};
-
-OperationGroup.prototype.sort = function () {
-
-};
-
-
-},{}],12:[function(require,module,exports){
-// shim for using process in browser
-
-var process = module.exports = {};
-var queue = [];
-var draining = false;
-
-function drainQueue() {
-    if (draining) {
-        return;
-    }
-    draining = true;
-    var currentQueue;
-    var len = queue.length;
-    while(len) {
-        currentQueue = queue;
-        queue = [];
-        var i = -1;
-        while (++i < len) {
-            currentQueue[i]();
-        }
-        len = queue.length;
-    }
-    draining = false;
-}
-process.nextTick = function (fun) {
-    queue.push(fun);
-    if (!draining) {
-        setTimeout(drainQueue, 0);
-    }
-};
-
-process.title = 'browser';
-process.browser = true;
-process.env = {};
-process.argv = [];
-process.version = ''; // empty string to avoid regexp issues
-process.versions = {};
-
-function noop() {}
-
-process.on = noop;
-process.addListener = noop;
-process.once = noop;
-process.off = noop;
-process.removeListener = noop;
-process.removeAllListeners = noop;
-process.emit = noop;
-
-process.binding = function (name) {
-    throw new Error('process.binding is not supported');
-};
-
-// TODO(shtylman)
-process.cwd = function () { return '/' };
-process.chdir = function (dir) {
-    throw new Error('process.chdir is not supported');
-};
-process.umask = function() { return 0; };
-
-},{}],13:[function(require,module,exports){
-(function (Buffer){
-(function () {
-  "use strict";
-
-  function btoa(str) {
-    var buffer
-      ;
-
-    if (str instanceof Buffer) {
-      buffer = str;
-    } else {
-      buffer = new Buffer(str.toString(), 'binary');
-    }
-
-    return buffer.toString('base64');
-  }
-
-  module.exports = btoa;
-}());
-
-}).call(this,require("buffer").Buffer)
-
-},{"buffer":14}],14:[function(require,module,exports){
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
- * @license  MIT
- */
-
-var base64 = require('base64-js')
-var ieee754 = require('ieee754')
-var isArray = require('is-array')
-
-exports.Buffer = Buffer
-exports.SlowBuffer = SlowBuffer
-exports.INSPECT_MAX_BYTES = 50
-Buffer.poolSize = 8192 // not used by this implementation
-
-var rootParent = {}
-
-/**
- * If `Buffer.TYPED_ARRAY_SUPPORT`:
- *   === true    Use Uint8Array implementation (fastest)
- *   === false   Use Object implementation (most compatible, even IE6)
- *
- * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+,
- * Opera 11.6+, iOS 4.2+.
- *
- * Due to various browser bugs, sometimes the Object implementation will be used even
- * when the browser supports typed arrays.
- *
- * Note:
- *
- *   - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances,
- *     See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438.
- *
- *   - Safari 5-7 lacks support for changing the `Object.prototype.constructor` property
- *     on objects.
- *
- *   - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function.
- *
- *   - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of
- *     incorrect length in some situations.
-
- * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they
- * get the Object implementation, which is slower but behaves correctly.
- */
-Buffer.TYPED_ARRAY_SUPPORT = (function () {
-  function Bar () {}
-  try {
-    var arr = new Uint8Array(1)
-    arr.foo = function () { return 42 }
-    arr.constructor = Bar
-    return arr.foo() === 42 && // typed array instances can be augmented
-        arr.constructor === Bar && // constructor can be set
-        typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
-        arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`
-  } catch (e) {
-    return false
-  }
-})()
-
-function kMaxLength () {
-  return Buffer.TYPED_ARRAY_SUPPORT
-    ? 0x7fffffff
-    : 0x3fffffff
-}
-
-/**
- * Class: Buffer
- * =============
- *
- * The Buffer constructor returns instances of `Uint8Array` that are augmented
- * with function properties for all the node `Buffer` API functions. We use
- * `Uint8Array` so that square bracket notation works as expected -- it returns
- * a single octet.
- *
- * By augmenting the instances, we can avoid modifying the `Uint8Array`
- * prototype.
- */
-function Buffer (arg) {
-  if (!(this instanceof Buffer)) {
-    // Avoid going through an ArgumentsAdaptorTrampoline in the common case.
-    if (arguments.length > 1) return new Buffer(arg, arguments[1])
-    return new Buffer(arg)
-  }
-
-  this.length = 0
-  this.parent = undefined
-
-  // Common case.
-  if (typeof arg === 'number') {
-    return fromNumber(this, arg)
-  }
-
-  // Slightly less common case.
-  if (typeof arg === 'string') {
-    return fromString(this, arg, arguments.length > 1 ? arguments[1] : 'utf8')
-  }
-
-  // Unusual.
-  return fromObject(this, arg)
-}
-
-function fromNumber (that, length) {
-  that = allocate(that, length < 0 ? 0 : checked(length) | 0)
-  if (!Buffer.TYPED_ARRAY_SUPPORT) {
-    for (var i = 0; i < length; i++) {
-      that[i] = 0
-    }
-  }
-  return that
-}
-
-function fromString (that, string, encoding) {
-  if (typeof encoding !== 'string' || encoding === '') encoding = 'utf8'
-
-  // Assumption: byteLength() return value is always < kMaxLength.
-  var length = byteLength(string, encoding) | 0
-  that = allocate(that, length)
-
-  that.write(string, encoding)
-  return that
-}
-
-function fromObject (that, object) {
-  if (Buffer.isBuffer(object)) return fromBuffer(that, object)
-
-  if (isArray(object)) return fromArray(that, object)
-
-  if (object == null) {
-    throw new TypeError('must start with number, buffer, array or string')
-  }
-
-  if (typeof ArrayBuffer !== 'undefined') {
-    if (object.buffer instanceof ArrayBuffer) {
-      return fromTypedArray(that, object)
-    }
-    if (object instanceof ArrayBuffer) {
-      return fromArrayBuffer(that, object)
-    }
-  }
-
-  if (object.length) return fromArrayLike(that, object)
-
-  return fromJsonObject(that, object)
-}
-
-function fromBuffer (that, buffer) {
-  var length = checked(buffer.length) | 0
-  that = allocate(that, length)
-  buffer.copy(that, 0, 0, length)
-  return that
-}
-
-function fromArray (that, array) {
-  var length = checked(array.length) | 0
-  that = allocate(that, length)
-  for (var i = 0; i < length; i += 1) {
-    that[i] = array[i] & 255
-  }
-  return that
-}
-
-// Duplicate of fromArray() to keep fromArray() monomorphic.
-function fromTypedArray (that, array) {
-  var length = checked(array.length) | 0
-  that = allocate(that, length)
-  // Truncating the elements is probably not what people expect from typed
-  // arrays with BYTES_PER_ELEMENT > 1 but it's compatible with the behavior
-  // of the old Buffer constructor.
-  for (var i = 0; i < length; i += 1) {
-    that[i] = array[i] & 255
-  }
-  return that
-}
-
-function fromArrayBuffer (that, array) {
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    // Return an augmented `Uint8Array` instance, for best performance
-    array.byteLength
-    that = Buffer._augment(new Uint8Array(array))
-  } else {
-    // Fallback: Return an object instance of the Buffer class
-    that = fromTypedArray(that, new Uint8Array(array))
-  }
-  return that
-}
-
-function fromArrayLike (that, array) {
-  var length = checked(array.length) | 0
-  that = allocate(that, length)
-  for (var i = 0; i < length; i += 1) {
-    that[i] = array[i] & 255
-  }
-  return that
-}
-
-// Deserialize { type: 'Buffer', data: [1,2,3,...] } into a Buffer object.
-// Returns a zero-length buffer for inputs that don't conform to the spec.
-function fromJsonObject (that, object) {
-  var array
-  var length = 0
-
-  if (object.type === 'Buffer' && isArray(object.data)) {
-    array = object.data
-    length = checked(array.length) | 0
-  }
-  that = allocate(that, length)
-
-  for (var i = 0; i < length; i += 1) {
-    that[i] = array[i] & 255
-  }
-  return that
-}
-
-function allocate (that, length) {
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    // Return an augmented `Uint8Array` instance, for best performance
-    that = Buffer._augment(new Uint8Array(length))
-  } else {
-    // Fallback: Return an object instance of the Buffer class
-    that.length = length
-    that._isBuffer = true
-  }
-
-  var fromPool = length !== 0 && length <= Buffer.poolSize >>> 1
-  if (fromPool) that.parent = rootParent
-
-  return that
-}
-
-function checked (length) {
-  // Note: cannot use `length < kMaxLength` here because that fails when
-  // length is NaN (which is otherwise coerced to zero.)
-  if (length >= kMaxLength()) {
-    throw new RangeError('Attempt to allocate Buffer larger than maximum ' +
-                         'size: 0x' + kMaxLength().toString(16) + ' bytes')
-  }
-  return length | 0
-}
-
-function SlowBuffer (subject, encoding) {
-  if (!(this instanceof SlowBuffer)) return new SlowBuffer(subject, encoding)
-
-  var buf = new Buffer(subject, encoding)
-  delete buf.parent
-  return buf
-}
-
-Buffer.isBuffer = function isBuffer (b) {
-  return !!(b != null && b._isBuffer)
-}
-
-Buffer.compare = function compare (a, b) {
-  if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) {
-    throw new TypeError('Arguments must be Buffers')
-  }
-
-  if (a === b) return 0
-
-  var x = a.length
-  var y = b.length
-
-  var i = 0
-  var len = Math.min(x, y)
-  while (i < len) {
-    if (a[i] !== b[i]) break
-
-    ++i
-  }
-
-  if (i !== len) {
-    x = a[i]
-    y = b[i]
-  }
-
-  if (x < y) return -1
-  if (y < x) return 1
-  return 0
-}
-
-Buffer.isEncoding = function isEncoding (encoding) {
-  switch (String(encoding).toLowerCase()) {
-    case 'hex':
-    case 'utf8':
-    case 'utf-8':
-    case 'ascii':
-    case 'binary':
-    case 'base64':
-    case 'raw':
-    case 'ucs2':
-    case 'ucs-2':
-    case 'utf16le':
-    case 'utf-16le':
-      return true
-    default:
-      return false
-  }
-}
-
-Buffer.concat = function concat (list, length) {
-  if (!isArray(list)) throw new TypeError('list argument must be an Array of Buffers.')
-
-  if (list.length === 0) {
-    return new Buffer(0)
-  }
-
-  var i
-  if (length === undefined) {
-    length = 0
-    for (i = 0; i < list.length; i++) {
-      length += list[i].length
-    }
-  }
-
-  var buf = new Buffer(length)
-  var pos = 0
-  for (i = 0; i < list.length; i++) {
-    var item = list[i]
-    item.copy(buf, pos)
-    pos += item.length
-  }
-  return buf
-}
-
-function byteLength (string, encoding) {
-  if (typeof string !== 'string') string = '' + string
-
-  var len = string.length
-  if (len === 0) return 0
-
-  // Use a for loop to avoid recursion
-  var loweredCase = false
-  for (;;) {
-    switch (encoding) {
-      case 'ascii':
-      case 'binary':
-      // Deprecated
-      case 'raw':
-      case 'raws':
-        return len
-      case 'utf8':
-      case 'utf-8':
-        return utf8ToBytes(string).length
-      case 'ucs2':
-      case 'ucs-2':
-      case 'utf16le':
-      case 'utf-16le':
-        return len * 2
-      case 'hex':
-        return len >>> 1
-      case 'base64':
-        return base64ToBytes(string).length
-      default:
-        if (loweredCase) return utf8ToBytes(string).length // assume utf8
-        encoding = ('' + encoding).toLowerCase()
-        loweredCase = true
-    }
-  }
-}
-Buffer.byteLength = byteLength
-
-// pre-set for values that may exist in the future
-Buffer.prototype.length = undefined
-Buffer.prototype.parent = undefined
-
-function slowToString (encoding, start, end) {
-  var loweredCase = false
-
-  start = start | 0
-  end = end === undefined || end === Infinity ? this.length : end | 0
-
-  if (!encoding) encoding = 'utf8'
-  if (start < 0) start = 0
-  if (end > this.length) end = this.length
-  if (end <= start) return ''
-
-  while (true) {
-    switch (encoding) {
-      case 'hex':
-        return hexSlice(this, start, end)
-
-      case 'utf8':
-      case 'utf-8':
-        return utf8Slice(this, start, end)
-
-      case 'ascii':
-        return asciiSlice(this, start, end)
-
-      case 'binary':
-        return binarySlice(this, start, end)
-
-      case 'base64':
-        return base64Slice(this, start, end)
-
-      case 'ucs2':
-      case 'ucs-2':
-      case 'utf16le':
-      case 'utf-16le':
-        return utf16leSlice(this, start, end)
-
-      default:
-        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)
-        encoding = (encoding + '').toLowerCase()
-        loweredCase = true
-    }
-  }
-}
-
-Buffer.prototype.toString = function toString () {
-  var length = this.length | 0
-  if (length === 0) return ''
-  if (arguments.length === 0) return utf8Slice(this, 0, length)
-  return slowToString.apply(this, arguments)
-}
-
-Buffer.prototype.equals = function equals (b) {
-  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')
-  if (this === b) return true
-  return Buffer.compare(this, b) === 0
-}
-
-Buffer.prototype.inspect = function inspect () {
-  var str = ''
-  var max = exports.INSPECT_MAX_BYTES
-  if (this.length > 0) {
-    str = this.toString('hex', 0, max).match(/.{2}/g).join(' ')
-    if (this.length > max) str += ' ... '
-  }
-  return '<Buffer ' + str + '>'
-}
-
-Buffer.prototype.compare = function compare (b) {
-  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')
-  if (this === b) return 0
-  return Buffer.compare(this, b)
-}
-
-Buffer.prototype.indexOf = function indexOf (val, byteOffset) {
-  if (byteOffset > 0x7fffffff) byteOffset = 0x7fffffff
-  else if (byteOffset < -0x80000000) byteOffset = -0x80000000
-  byteOffset >>= 0
-
-  if (this.length === 0) return -1
-  if (byteOffset >= this.length) return -1
-
-  // Negative offsets start from the end of the buffer
-  if (byteOffset < 0) byteOffset = Math.max(this.length + byteOffset, 0)
-
-  if (typeof val === 'string') {
-    if (val.length === 0) return -1 // special case: looking for empty string always fails
-    return String.prototype.indexOf.call(this, val, byteOffset)
-  }
-  if (Buffer.isBuffer(val)) {
-    return arrayIndexOf(this, val, byteOffset)
-  }
-  if (typeof val === 'number') {
-    if (Buffer.TYPED_ARRAY_SUPPORT && Uint8Array.prototype.indexOf === 'function') {
-      return Uint8Array.prototype.indexOf.call(this, val, byteOffset)
-    }
-    return arrayIndexOf(this, [ val ], byteOffset)
-  }
-
-  function arrayIndexOf (arr, val, byteOffset) {
-    var foundIndex = -1
-    for (var i = 0; byteOffset + i < arr.length; i++) {
-      if (arr[byteOffset + i] === val[foundIndex === -1 ? 0 : i - foundIndex]) {
-        if (foundIndex === -1) foundIndex = i
-        if (i - foundIndex + 1 === val.length) return byteOffset + foundIndex
-      } else {
-        foundIndex = -1
-      }
-    }
-    return -1
-  }
-
-  throw new TypeError('val must be string, number or Buffer')
-}
-
-// `get` is deprecated
-Buffer.prototype.get = function get (offset) {
-  console.log('.get() is deprecated. Access using array indexes instead.')
-  return this.readUInt8(offset)
-}
-
-// `set` is deprecated
-Buffer.prototype.set = function set (v, offset) {
-  console.log('.set() is deprecated. Access using array indexes instead.')
-  return this.writeUInt8(v, offset)
-}
-
-function hexWrite (buf, string, offset, length) {
-  offset = Number(offset) || 0
-  var remaining = buf.length - offset
-  if (!length) {
-    length = remaining
-  } else {
-    length = Number(length)
-    if (length > remaining) {
-      length = remaining
-    }
-  }
-
-  // must be an even number of digits
-  var strLen = string.length
-  if (strLen % 2 !== 0) throw new Error('Invalid hex string')
-
-  if (length > strLen / 2) {
-    length = strLen / 2
-  }
-  for (var i = 0; i < length; i++) {
-    var parsed = parseInt(string.substr(i * 2, 2), 16)
-    if (isNaN(parsed)) throw new Error('Invalid hex string')
-    buf[offset + i] = parsed
-  }
-  return i
-}
-
-function utf8Write (buf, string, offset, length) {
-  return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length)
-}
-
-function asciiWrite (buf, string, offset, length) {
-  return blitBuffer(asciiToBytes(string), buf, offset, length)
-}
-
-function binaryWrite (buf, string, offset, length) {
-  return asciiWrite(buf, string, offset, length)
-}
-
-function base64Write (buf, string, offset, length) {
-  return blitBuffer(base64ToBytes(string), buf, offset, length)
-}
-
-function ucs2Write (buf, string, offset, length) {
-  return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length)
-}
-
-Buffer.prototype.write = function write (string, offset, length, encoding) {
-  // Buffer#write(string)
-  if (offset === undefined) {
-    encoding = 'utf8'
-    length = this.length
-    offset = 0
-  // Buffer#write(string, encoding)
-  } else if (length === undefined && typeof offset === 'string') {
-    encoding = offset
-    length = this.length
-    offset = 0
-  // Buffer#write(string, offset[, length][, encoding])
-  } else if (isFinite(offset)) {
-    offset = offset | 0
-    if (isFinite(length)) {
-      length = length | 0
-      if (encoding === undefined) encoding = 'utf8'
-    } else {
-      encoding = length
-      length = undefined
-    }
-  // legacy write(string, encoding, offset, length) - remove in v0.13
-  } else {
-    var swap = encoding
-    encoding = offset
-    offset = length | 0
-    length = swap
-  }
-
-  var remaining = this.length - offset
-  if (length === undefined || length > remaining) length = remaining
-
-  if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) {
-    throw new RangeError('attempt to write outside buffer bounds')
-  }
-
-  if (!encoding) encoding = 'utf8'
-
-  var loweredCase = false
-  for (;;) {
-    switch (encoding) {
-      case 'hex':
-        return hexWrite(this, string, offset, length)
-
-      case 'utf8':
-      case 'utf-8':
-        return utf8Write(this, string, offset, length)
-
-      case 'ascii':
-        return asciiWrite(this, string, offset, length)
-
-      case 'binary':
-        return binaryWrite(this, string, offset, length)
-
-      case 'base64':
-        // Warning: maxLength not taken into account in base64Write
-        return base64Write(this, string, offset, length)
-
-      case 'ucs2':
-      case 'ucs-2':
-      case 'utf16le':
-      case 'utf-16le':
-        return ucs2Write(this, string, offset, length)
-
-      default:
-        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)
-        encoding = ('' + encoding).toLowerCase()
-        loweredCase = true
-    }
-  }
-}
-
-Buffer.prototype.toJSON = function toJSON () {
-  return {
-    type: 'Buffer',
-    data: Array.prototype.slice.call(this._arr || this, 0)
-  }
-}
-
-function base64Slice (buf, start, end) {
-  if (start === 0 && end === buf.length) {
-    return base64.fromByteArray(buf)
-  } else {
-    return base64.fromByteArray(buf.slice(start, end))
-  }
-}
-
-function utf8Slice (buf, start, end) {
-  end = Math.min(buf.length, end)
-  var res = []
-
-  var i = start
-  while (i < end) {
-    var firstByte = buf[i]
-    var codePoint = null
-    var bytesPerSequence = (firstByte > 0xEF) ? 4
-      : (firstByte > 0xDF) ? 3
-      : (firstByte > 0xBF) ? 2
-      : 1
-
-    if (i + bytesPerSequence <= end) {
-      var secondByte, thirdByte, fourthByte, tempCodePoint
-
-      switch (bytesPerSequence) {
-        case 1:
-          if (firstByte < 0x80) {
-            codePoint = firstByte
-          }
-          break
-        case 2:
-          secondByte = buf[i + 1]
-          if ((secondByte & 0xC0) === 0x80) {
-            tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F)
-            if (tempCodePoint > 0x7F) {
-              codePoint = tempCodePoint
-            }
-          }
-          break
-        case 3:
-          secondByte = buf[i + 1]
-          thirdByte = buf[i + 2]
-          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) {
-            tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F)
-            if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) {
-              codePoint = tempCodePoint
-            }
-          }
-          break
-        case 4:
-          secondByte = buf[i + 1]
-          thirdByte = buf[i + 2]
-          fourthByte = buf[i + 3]
-          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) {
-            tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F)
-            if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) {
-              codePoint = tempCodePoint
-            }
-          }
-      }
-    }
-
-    if (codePoint === null) {
-      // we did not generate a valid codePoint so insert a
-      // replacement char (U+FFFD) and advance only 1 byte
-      codePoint = 0xFFFD
-      bytesPerSequence = 1
-    } else if (codePoint > 0xFFFF) {
-      // encode to utf16 (surrogate pair dance)
-      codePoint -= 0x10000
-      res.push(codePoint >>> 10 & 0x3FF | 0xD800)
-      codePoint = 0xDC00 | codePoint & 0x3FF
-    }
-
-    res.push(codePoint)
-    i += bytesPerSequence
-  }
-
-  return decodeCodePointsArray(res)
-}
-
-// Based on http://stackoverflow.com/a/22747272/680742, the browser with
-// the lowest limit is Chrome, with 0x10000 args.
-// We go 1 magnitude less, for safety
-var MAX_ARGUMENTS_LENGTH = 0x1000
-
-function decodeCodePointsArray (codePoints) {
-  var len = codePoints.length
-  if (len <= MAX_ARGUMENTS_LENGTH) {
-    return String.fromCharCode.apply(String, codePoints) // avoid extra slice()
-  }
-
-  // Decode in chunks to avoid "call stack size exceeded".
-  var res = ''
-  var i = 0
-  while (i < len) {
-    res += String.fromCharCode.apply(
-      String,
-      codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH)
-    )
-  }
-  return res
-}
-
-function asciiSlice (buf, start, end) {
-  var ret = ''
-  end = Math.min(buf.length, end)
-
-  for (var i = start; i < end; i++) {
-    ret += String.fromCharCode(buf[i] & 0x7F)
-  }
-  return ret
-}
-
-function binarySlice (buf, start, end) {
-  var ret = ''
-  end = Math.min(buf.length, end)
-
-  for (var i = start; i < end; i++) {
-    ret += String.fromCharCode(buf[i])
-  }
-  return ret
-}
-
-function hexSlice (buf, start, end) {
-  var len = buf.length
-
-  if (!start || start < 0) start = 0
-  if (!end || end < 0 || end > len) end = len
-
-  var out = ''
-  for (var i = start; i < end; i++) {
-    out += toHex(buf[i])
-  }
-  return out
-}
-
-function utf16leSlice (buf, start, end) {
-  var bytes = buf.slice(start, end)
-  var res = ''
-  for (var i = 0; i < bytes.length; i += 2) {
-    res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256)
-  }
-  return res
-}
-
-Buffer.prototype.slice = function slice (start, end) {
-  var len = this.length
-  start = ~~start
-  end = end === undefined ? len : ~~end
-
-  if (start < 0) {
-    start += len
-    if (start < 0) start = 0
-  } else if (start > len) {
-    start = len
-  }
-
-  if (end < 0) {
-    end += len
-    if (end < 0) end = 0
-  } else if (end > len) {
-    end = len
-  }
-
-  if (end < start) end = start
-
-  var newBuf
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    newBuf = Buffer._augment(this.subarray(start, end))
-  } else {
-    var sliceLen = end - start
-    newBuf = new Buffer(sliceLen, undefined)
-    for (var i = 0; i < sliceLen; i++) {
-      newBuf[i] = this[i + start]
-    }
-  }
-
-  if (newBuf.length) newBuf.parent = this.parent || this
-
-  return newBuf
-}
-
-/*
- * Need to make sure that buffer isn't trying to write out of bounds.
- */
-function checkOffset (offset, ext, length) {
-  if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint')
-  if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length')
-}
-
-Buffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) {
-  offset = offset | 0
-  byteLength = byteLength | 0
-  if (!noAssert) checkOffset(offset, byteLength, this.length)
-
-  var val = this[offset]
-  var mul = 1
-  var i = 0
-  while (++i < byteLength && (mul *= 0x100)) {
-    val += this[offset + i] * mul
-  }
-
-  return val
-}
-
-Buffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) {
-  offset = offset | 0
-  byteLength = byteLength | 0
-  if (!noAssert) {
-    checkOffset(offset, byteLength, this.length)
-  }
-
-  var val = this[offset + --byteLength]
-  var mul = 1
-  while (byteLength > 0 && (mul *= 0x100)) {
-    val += this[offset + --byteLength] * mul
-  }
-
-  return val
-}
-
-Buffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 1, this.length)
-  return this[offset]
-}
-
-Buffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 2, this.length)
-  return this[offset] | (this[offset + 1] << 8)
-}
-
-Buffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 2, this.length)
-  return (this[offset] << 8) | this[offset + 1]
-}
-
-Buffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 4, this.length)
-
-  return ((this[offset]) |
-      (this[offset + 1] << 8) |
-      (this[offset + 2] << 16)) +
-      (this[offset + 3] * 0x1000000)
-}
-
-Buffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 4, this.length)
-
-  return (this[offset] * 0x1000000) +
-    ((this[offset + 1] << 16) |
-    (this[offset + 2] << 8) |
-    this[offset + 3])
-}
-
-Buffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) {
-  offset = offset | 0
-  byteLength = byteLength | 0
-  if (!noAssert) checkOffset(offset, byteLength, this.length)
-
-  var val = this[offset]
-  var mul = 1
-  var i = 0
-  while (++i < byteLength && (mul *= 0x100)) {
-    val += this[offset + i] * mul
-  }
-  mul *= 0x80
-
-  if (val >= mul) val -= Math.pow(2, 8 * byteLength)
-
-  return val
-}
-
-Buffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) {
-  offset = offset | 0
-  byteLength = byteLength | 0
-  if (!noAssert) checkOffset(offset, byteLength, this.length)
-
-  var i = byteLength
-  var mul = 1
-  var val = this[offset + --i]
-  while (i > 0 && (mul *= 0x100)) {
-    val += this[offset + --i] * mul
-  }
-  mul *= 0x80
-
-  if (val >= mul) val -= Math.pow(2, 8 * byteLength)
-
-  return val
-}
-
-Buffer.prototype.readInt8 = function readInt8 (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 1, this.length)
-  if (!(this[offset] & 0x80)) return (this[offset])
-  return ((0xff - this[offset] + 1) * -1)
-}
-
-Buffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 2, this.length)
-  var val = this[offset] | (this[offset + 1] << 8)
-  return (val & 0x8000) ? val | 0xFFFF0000 : val
-}
-
-Buffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 2, this.length)
-  var val = this[offset + 1] | (this[offset] << 8)
-  return (val & 0x8000) ? val | 0xFFFF0000 : val
-}
-
-Buffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 4, this.length)
-
-  return (this[offset]) |
-    (this[offset + 1] << 8) |
-    (this[offset + 2] << 16) |
-    (this[offset + 3] << 24)
-}
-
-Buffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 4, this.length)
-
-  return (this[offset] << 24) |
-    (this[offset + 1] << 16) |
-    (this[offset + 2] << 8) |
-    (this[offset + 3])
-}
-
-Buffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 4, this.length)
-  return ieee754.read(this, offset, true, 23, 4)
-}
-
-Buffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 4, this.length)
-  return ieee754.read(this, offset, false, 23, 4)
-}
-
-Buffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 8, this.length)
-  return ieee754.read(this, offset, true, 52, 8)
-}
-
-Buffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) {
-  if (!noAssert) checkOffset(offset, 8, this.length)
-  return ieee754.read(this, offset, false, 52, 8)
-}
-
-function checkInt (buf, value, offset, ext, max, min) {
-  if (!Buffer.isBuffer(buf)) throw new TypeError('buffer must be a Buffer instance')
-  if (value > max || value < min) throw new RangeError('value is out of bounds')
-  if (offset + ext > buf.length) throw new RangeError('index out of range')
-}
-
-Buffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) {
-  value = +value
-  offset = offset | 0
-  byteLength = byteLength | 0
-  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)
-
-  var mul = 1
-  var i = 0
-  this[offset] = value & 0xFF
-  while (++i < byteLength && (mul *= 0x100)) {
-    this[offset + i] = (value / mul) & 0xFF
-  }
-
-  return offset + byteLength
-}
-
-Buffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) {
-  value = +value
-  offset = offset | 0
-  byteLength = byteLength | 0
-  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)
-
-  var i = byteLength - 1
-  var mul = 1
-  this[offset + i] = value & 0xFF
-  while (--i >= 0 && (mul *= 0x100)) {
-    this[offset + i] = (value / mul) & 0xFF
-  }
-
-  return offset + byteLength
-}
-
-Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0)
-  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)
-  this[offset] = value
-  return offset + 1
-}
-
-function objectWriteUInt16 (buf, value, offset, littleEndian) {
-  if (value < 0) value = 0xffff + value + 1
-  for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {
-    buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>
-      (littleEndian ? i : 1 - i) * 8
-  }
-}
-
-Buffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = value
-    this[offset + 1] = (value >>> 8)
-  } else {
-    objectWriteUInt16(this, value, offset, true)
-  }
-  return offset + 2
-}
-
-Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = (value >>> 8)
-    this[offset + 1] = value
-  } else {
-    objectWriteUInt16(this, value, offset, false)
-  }
-  return offset + 2
-}
-
-function objectWriteUInt32 (buf, value, offset, littleEndian) {
-  if (value < 0) value = 0xffffffff + value + 1
-  for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {
-    buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff
-  }
-}
-
-Buffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset + 3] = (value >>> 24)
-    this[offset + 2] = (value >>> 16)
-    this[offset + 1] = (value >>> 8)
-    this[offset] = value
-  } else {
-    objectWriteUInt32(this, value, offset, true)
-  }
-  return offset + 4
-}
-
-Buffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = (value >>> 24)
-    this[offset + 1] = (value >>> 16)
-    this[offset + 2] = (value >>> 8)
-    this[offset + 3] = value
-  } else {
-    objectWriteUInt32(this, value, offset, false)
-  }
-  return offset + 4
-}
-
-Buffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) {
-    var limit = Math.pow(2, 8 * byteLength - 1)
-
-    checkInt(this, value, offset, byteLength, limit - 1, -limit)
-  }
-
-  var i = 0
-  var mul = 1
-  var sub = value < 0 ? 1 : 0
-  this[offset] = value & 0xFF
-  while (++i < byteLength && (mul *= 0x100)) {
-    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF
-  }
-
-  return offset + byteLength
-}
-
-Buffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) {
-    var limit = Math.pow(2, 8 * byteLength - 1)
-
-    checkInt(this, value, offset, byteLength, limit - 1, -limit)
-  }
-
-  var i = byteLength - 1
-  var mul = 1
-  var sub = value < 0 ? 1 : 0
-  this[offset + i] = value & 0xFF
-  while (--i >= 0 && (mul *= 0x100)) {
-    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF
-  }
-
-  return offset + byteLength
-}
-
-Buffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80)
-  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)
-  if (value < 0) value = 0xff + value + 1
-  this[offset] = value
-  return offset + 1
-}
-
-Buffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = value
-    this[offset + 1] = (value >>> 8)
-  } else {
-    objectWriteUInt16(this, value, offset, true)
-  }
-  return offset + 2
-}
-
-Buffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = (value >>> 8)
-    this[offset + 1] = value
-  } else {
-    objectWriteUInt16(this, value, offset, false)
-  }
-  return offset + 2
-}
-
-Buffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = value
-    this[offset + 1] = (value >>> 8)
-    this[offset + 2] = (value >>> 16)
-    this[offset + 3] = (value >>> 24)
-  } else {
-    objectWriteUInt32(this, value, offset, true)
-  }
-  return offset + 4
-}
-
-Buffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) {
-  value = +value
-  offset = offset | 0
-  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)
-  if (value < 0) value = 0xffffffff + value + 1
-  if (Buffer.TYPED_ARRAY_SUPPORT) {
-    this[offset] = (value >>> 24)
-    this[offset + 1] = (value >>> 16)
-    this[offset + 2] = (value >>> 8)
-    this[offset + 3] = value
-  } else {
-    objectWriteUInt32(this, value, offset, false)
-  }
-  return offset + 4
-}
-
-function checkIEEE754 (buf, value, offset, ext, max, min) {
-  if (value > max || value < min) throw new RangeError('value is out of bounds')
-  if (offset + ext > buf.length) throw new RangeError('index out of range')
-  if (offset < 0) throw new RangeError('index out of range')
-}
-
-function writeFloat (buf, value, offset, littleEndian, noAssert) {
-  if (!noAssert) {
-    checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38)
-  }
-  ieee754.write(buf, value, offset, littleEndian, 23, 4)
-  return offset + 4
-}
-
-Buffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) {
-  return writeFloat(this, value, offset, true, noAssert)
-}
-
-Buffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) {
-  return writeFloat(this, value, offset, false, noAssert)
-}
-
-function writeDouble (buf, value, offset, littleEndian, noAssert) {
-  if (!noAssert) {
-    checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308)
-  }
-  ieee754.write(buf, value, offset, littleEndian, 52, 8)
-  return offset + 8
-}
-
-Buffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) {
-  return writeDouble(this, value, offset, true, noAssert)
-}
-
-Buffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) {
-  return writeDouble(this, value, offset, false, noAssert)
-}
-
-// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)
-Buffer.prototype.copy = function copy (target, targetStart, start, end) {
-  if (!start) start = 0
-  if (!end && end !== 0) end = this.length
-  if (targetStart >= target.length) targetStart = target.length
-  if (!targetStart) targetStart = 0
-  if (end > 0 && end < start) end = start
-
-  // Copy 0 bytes; we're done
-  if (end === start) return 0
-  if (target.length === 0 || this.length === 0) return 0
-
-  // Fatal error conditions
-  if (targetStart < 0) {
-    throw new RangeError('targetStart out of bounds')
-  }
-  if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds')
-  if (end < 0) throw new RangeError('sourceEnd out of bounds')
-
-  // Are we oob?
-  if (end > this.length) end = this.length
-  if (target.length - targetStart < end - start) {
-    end = target.length - targetStart + start
-  }
-
-  var len = end - start
-  var i
-
-  if (this === target && start < targetStart && targetStart < end) {
-    // descending copy from end
-    for (i = len - 1; i >= 0; i--) {
-      target[i + targetStart] = this[i + start]
-    }
-  } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
-    // ascending copy from start
-    for (i = 0; i < len; i++) {
-      target[i + targetStart] = this[i + start]
-    }
-  } else {
-    target._set(this.subarray(start, start + len), targetStart)
-  }
-
-  return len
-}
-
-// fill(value, start=0, end=buffer.length)
-Buffer.prototype.fill = function fill (value, start, end) {
-  if (!value) value = 0
-  if (!start) start = 0
-  if (!end) end = this.length
-
-  if (end < start) throw new RangeError('end < start')
-
-  // Fill 0 bytes; we're done
-  if (end === start) return
-  if (this.length === 0) return
-
-  if (start < 0 || start >= this.length) throw new RangeError('start out of bounds')
-  if (end < 0 || end > this.length) throw new RangeError('end out of bounds')
-
-  var i
-  if (typeof value === 'number') {
-    for (i = start; i < end; i++) {
-      this[i] = value
-    }
-  } else {
-    var bytes = utf8ToBytes(value.toString())
-    var len = bytes.length
-    for (i = start; i < end; i++) {
-      this[i] = bytes[i % len]
-    }
-  }
-
-  return this
-}
-
-/**
- * Creates a new `ArrayBuffer` with the *copied* memory of the buffer instance.
- * Added in Node 0.12. Only available in browsers that support ArrayBuffer.
- */
-Buffer.prototype.toArrayBuffer = function toArrayBuffer () {
-  if (typeof Uint8Array !== 'undefined') {
-    if (Buffer.TYPED_ARRAY_SUPPORT) {
-      return (new Buffer(this)).buffer
-    } else {
-      var buf = new Uint8Array(this.length)
-      for (var i = 0, len = buf.length; i < len; i += 1) {
-        buf[i] = this[i]
-      }
-      return buf.buffer
-    }
-  } else {
-    throw new TypeError('Buffer.toArrayBuffer not supported in this browser')
-  }
-}
-
-// HELPER FUNCTIONS
-// ================
-
-var BP = Buffer.prototype
-
-/**
- * Augment a Uint8Array *instance* (not the Uint8Array class!) with Buffer methods
- */
-Buffer._augment = function _augment (arr) {
-  arr.constructor = Buffer
-  arr._isBuffer = true
-
-  // save reference to original Uint8Array set method before overwriting
-  arr._set = arr.set
-
-  // deprecated
-  arr.get = BP.get
-  arr.set = BP.set
-
-  arr.write = BP.write
-  arr.toString = BP.toString
-  arr.toLocaleString = BP.toString
-  arr.toJSON = BP.toJSON
-  arr.equals = BP.equals
-  arr.compare = BP.compare
-  arr.indexOf = BP.indexOf
-  arr.copy = BP.copy
-  arr.slice = BP.slice
-  arr.readUIntLE = BP.readUIntLE
-  arr.readUIntBE = BP.readUIntBE
-  arr.readUInt8 = BP.readUInt8
-  arr.readUInt16LE = BP.readUInt16LE
-  arr.readUInt16BE = BP.readUInt16BE
-  arr.readUInt32LE = BP.readUInt32LE
-  arr.readUInt32BE = BP.readUInt32BE
-  arr.readIntLE = BP.readIntLE
-  arr.readIntBE = BP.readIntBE
-  arr.readInt8 = BP.readInt8
-  arr.readInt16LE = BP.readInt16LE
-  arr.readInt16BE = BP.readInt16BE
-  arr.readInt32LE = BP.readInt32LE
-  arr.readInt32BE = BP.readInt32BE
-  arr.readFloatLE = BP.readFloatLE
-  arr.readFloatBE = BP.readFloatBE
-  arr.readDoubleLE = BP.readDoubleLE
-  arr.readDoubleBE = BP.readDoubleBE
-  arr.writeUInt8 = BP.writeUInt8
-  arr.writeUIntLE = BP.writeUIntLE
-  arr.writeUIntBE = BP.writeUIntBE
-  arr.writeUInt16LE = BP.writeUInt16LE
-  arr.writeUInt16BE = BP.writeUInt16BE
-  arr.writeUInt32LE = BP.writeUInt32LE
-  arr.writeUInt32BE = BP.writeUInt32BE
-  arr.writeIntLE = BP.writeIntLE
-  arr.writeIntBE = BP.writeIntBE
-  arr.writeInt8 = BP.writeInt8
-  arr.writeInt16LE = BP.writeInt16LE
-  arr.writeInt16BE = BP.writeInt16BE
-  arr.writeInt32LE = BP.writeInt32LE
-  arr.writeInt32BE = BP.writeInt32BE
-  arr.writeFloatLE = BP.writeFloatLE
-  arr.writeFloatBE = BP.writeFloatBE
-  arr.writeDoubleLE = BP.writeDoubleLE
-  arr.writeDoubleBE = BP.writeDoubleBE
-  arr.fill = BP.fill
-  arr.inspect = BP.inspect
-  arr.toArrayBuffer = BP.toArrayBuffer
-
-  return arr
-}
-
-var INVALID_BASE64_RE = /[^+\/0-9A-Za-z-_]/g
-
-function base64clean (str) {
-  // Node strips out invalid characters like \n and \t from the string, base64-js does not
-  str = stringtrim(str).replace(INVALID_BASE64_RE, '')
-  // Node converts strings with length < 2 to ''
-  if (str.length < 2) return ''
-  // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not
-  while (str.length % 4 !== 0) {
-    str = str + '='
-  }
-  return str
-}
-
-function stringtrim (str) {
-  if (str.trim) return str.trim()
-  return str.replace(/^\s+|\s+$/g, '')
-}
-
-function toHex (n) {
-  if (n < 16) return '0' + n.toString(16)
-  return n.toString(16)
-}
-
-function utf8ToBytes (string, units) {
-  units = units || Infinity
-  var codePoint
-  var length = string.length
-  var leadSurrogate = null
-  var bytes = []
-
-  for (var i = 0; i < length; i++) {
-    codePoint = string.charCodeAt(i)
-
-    // is surrogate component
-    if (codePoint > 0xD7FF && codePoint < 0xE000) {
-      // last char was a lead
-      if (!leadSurrogate) {
-        // no lead yet
-        if (codePoint > 0xDBFF) {
-          // unexpected trail
-          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
-          continue
-        } else if (i + 1 === length) {
-          // unpaired lead
-          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
-          continue
-        }
-
-        // valid lead
-        leadSurrogate = codePoint
-
-        continue
-      }
-
-      // 2 leads in a row
-      if (codePoint < 0xDC00) {
-        if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
-        leadSurrogate = codePoint
-        continue
-      }
-
-      // valid surrogate pair
-      codePoint = leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00 | 0x10000
-    } else if (leadSurrogate) {
-      // valid bmp char, but last char was a lead
-      if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)
-    }
-
-    leadSurrogate = null
-
-    // encode utf8
-    if (codePoint < 0x80) {
-      if ((units -= 1) < 0) break
-      bytes.push(codePoint)
-    } else if (codePoint < 0x800) {
-      if ((units -= 2) < 0) break
-      bytes.push(
-        codePoint >> 0x6 | 0xC0,
-        codePoint & 0x3F | 0x80
-      )
-    } else if (codePoint < 0x10000) {
-      if ((units -= 3) < 0) break
-      bytes.push(
-        codePoint >> 0xC | 0xE0,
-        codePoint >> 0x6 & 0x3F | 0x80,
-        codePoint & 0x3F | 0x80
-      )
-    } else if (codePoint < 0x110000) {
-      if ((units -= 4) < 0) break
-      bytes.push(
-        codePoint >> 0x12 | 0xF0,
-        codePoint >> 0xC & 0x3F | 0x80,
-        codePoint >> 0x6 & 0x3F | 0x80,
-        codePoint & 0x3F | 0x80
-      )
-    } else {
-      throw new Error('Invalid code point')
-    }
-  }
-
-  return bytes
-}
-
-function asciiToBytes (str) {
-  var byteArray = []
-  for (var i = 0; i < str.length; i++) {
-    // Node's code seems to be doing this and not & 0x7F..
-    byteArray.push(str.charCodeAt(i) & 0xFF)
-  }
-  return byteArray
-}
-
-function utf16leToBytes (str, units) {
-  var c, hi, lo
-  var byteArray = []
-  for (var i = 0; i < str.length; i++) {
-    if ((units -= 2) < 0) break
-
-    c = str.charCodeAt(i)
-    hi = c >> 8
-    lo = c % 256
-    byteArray.push(lo)
-    byteArray.push(hi)
-  }
-
-  return byteArray
-}
-
-function base64ToBytes (str) {
-  return base64.toByteArray(base64clean(str))
-}
-
-function blitBuffer (src, dst, offset, length) {
-  for (var i = 0; i < length; i++) {
-    if ((i + offset >= dst.length) || (i >= src.length)) break
-    dst[i + offset] = src[i]
-  }
-  return i
-}
-
-},{"base64-js":15,"ieee754":16,"is-array":17}],15:[function(require,module,exports){
-var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-
-;(function (exports) {
-	'use strict';
-
-  var Arr = (typeof Uint8Array !== 'undefined')
-    ? Uint8Array
-    : Array
-
-	var PLUS   = '+'.charCodeAt(0)
-	var SLASH  = '/'.charCodeAt(0)
-	var NUMBER = '0'.charCodeAt(0)
-	var LOWER  = 'a'.charCodeAt(0)
-	var UPPER  = 'A'.charCodeAt(0)
-	var PLUS_URL_SAFE = '-'.charCodeAt(0)
-	var SLASH_URL_SAFE = '_'.charCodeAt(0)
-
-	function decode (elt) {
-		var code = elt.charCodeAt(0)
-		if (code === PLUS ||
-		    code === PLUS_URL_SAFE)
-			return 62 // '+'
-		if (code === SLASH ||
-		    code === SLASH_URL_SAFE)
-			return 63 // '/'
-		if (code < NUMBER)
-			return -1 //no match
-		if (code < NUMBER + 10)
-			return code - NUMBER + 26 + 26
-		if (code < UPPER + 26)
-			return code - UPPER
-		if (code < LOWER + 26)
-			return code - LOWER + 26
-	}
-
-	function b64ToByteArray (b64) {
-		var i, j, l, tmp, placeHolders, arr
-
-		if (b64.length % 4 > 0) {
-			throw new Error('Invalid string. Length must be a multiple of 4')
-		}
-
-		// the number of equal signs (place holders)
-		// if there are two placeholders, than the two characters before it
-		// represent one byte
-		// if there is only one, then the three characters before it represent 2 bytes
-		// this is just a cheap hack to not do indexOf twice
-		var len = b64.length
-		placeHolders = '=' === b64.charAt(len - 2) ? 2 : '=' === b64.charAt(len - 1) ? 1 : 0
-
-		// base64 is 4/3 + up to two characters of the original data
-		arr = new Arr(b64.length * 3 / 4 - placeHolders)
-
-		// if there are placeholders, only get up to the last complete 4 chars
-		l = placeHolders > 0 ? b64.length - 4 : b64.length
-
-		var L = 0
-
-		function push (v) {
-			arr[L++] = v
-		}
-
-		for (i = 0, j = 0; i < l; i += 4, j += 3) {
-			tmp = (decode(b64.charAt(i)) << 18) | (decode(b64.charAt(i + 1)) << 12) | (decode(b64.charAt(i + 2)) << 6) | decode(b64.charAt(i + 3))
-			push((tmp & 0xFF0000) >> 16)
-			push((tmp & 0xFF00) >> 8)
-			push(tmp & 0xFF)
-		}
-
-		if (placeHolders === 2) {
-			tmp = (decode(b64.charAt(i)) << 2) | (decode(b64.charAt(i + 1)) >> 4)
-			push(tmp & 0xFF)
-		} else if (placeHolders === 1) {
-			tmp = (decode(b64.charAt(i)) << 10) | (decode(b64.charAt(i + 1)) << 4) | (decode(b64.charAt(i + 2)) >> 2)
-			push((tmp >> 8) & 0xFF)
-			push(tmp & 0xFF)
-		}
-
-		return arr
-	}
-
-	function uint8ToBase64 (uint8) {
-		var i,
-			extraBytes = uint8.length % 3, // if we have 1 byte left, pad 2 bytes
-			output = "",
-			temp, length
-
-		function encode (num) {
-			return lookup.charAt(num)
-		}
-
-		function tripletToBase64 (num) {
-			return encode(num >> 18 & 0x3F) + encode(num >> 12 & 0x3F) + encode(num >> 6 & 0x3F) + encode(num & 0x3F)
-		}
-
-		// go through the array every three bytes, we'll deal with trailing stuff later
-		for (i = 0, length = uint8.length - extraBytes; i < length; i += 3) {
-			temp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2])
-			output += tripletToBase64(temp)
-		}
-
-		// pad the end with zeros, but make sure to not forget the extra bytes
-		switch (extraBytes) {
-			case 1:
-				temp = uint8[uint8.length - 1]
-				output += encode(temp >> 2)
-				output += encode((temp << 4) & 0x3F)
-				output += '=='
-				break
-			case 2:
-				temp = (uint8[uint8.length - 2] << 8) + (uint8[uint8.length - 1])
-				output += encode(temp >> 10)
-				output += encode((temp >> 4) & 0x3F)
-				output += encode((temp << 2) & 0x3F)
-				output += '='
-				break
-		}
-
-		return output
-	}
-
-	exports.toByteArray = b64ToByteArray
-	exports.fromByteArray = uint8ToBase64
-}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))
-
-},{}],16:[function(require,module,exports){
-exports.read = function (buffer, offset, isLE, mLen, nBytes) {
-  var e, m
-  var eLen = nBytes * 8 - mLen - 1
-  var eMax = (1 << eLen) - 1
-  var eBias = eMax >> 1
-  var nBits = -7
-  var i = isLE ? (nBytes - 1) : 0
-  var d = isLE ? -1 : 1
-  var s = buffer[offset + i]
-
-  i += d
-
-  e = s & ((1 << (-nBits)) - 1)
-  s >>= (-nBits)
-  nBits += eLen
-  for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}
-
-  m = e & ((1 << (-nBits)) - 1)
-  e >>= (-nBits)
-  nBits += mLen
-  for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}
-
-  if (e === 0) {
-    e = 1 - eBias
-  } else if (e === eMax) {
-    return m ? NaN : ((s ? -1 : 1) * Infinity)
-  } else {
-    m = m + Math.pow(2, mLen)
-    e = e - eBias
-  }
-  return (s ? -1 : 1) * m * Math.pow(2, e - mLen)
-}
-
-exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
-  var e, m, c
-  var eLen = nBytes * 8 - mLen - 1
-  var eMax = (1 << eLen) - 1
-  var eBias = eMax >> 1
-  var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)
-  var i = isLE ? 0 : (nBytes - 1)
-  var d = isLE ? 1 : -1
-  var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0
-
-  value = Math.abs(value)
-
-  if (isNaN(value) || value === Infinity) {
-    m = isNaN(value) ? 1 : 0
-    e = eMax
-  } else {
-    e = Math.floor(Math.log(value) / Math.LN2)
-    if (value * (c = Math.pow(2, -e)) < 1) {
-      e--
-      c *= 2
-    }
-    if (e + eBias >= 1) {
-      value += rt / c
-    } else {
-      value += rt * Math.pow(2, 1 - eBias)
-    }
-    if (value * c >= 2) {
-      e++
-      c /= 2
-    }
-
-    if (e + eBias >= eMax) {
-      m = 0
-      e = eMax
-    } else if (e + eBias >= 1) {
-      m = (value * c - 1) * Math.pow(2, mLen)
-      e = e + eBias
-    } else {
-      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)
-      e = 0
-    }
-  }
-
-  for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {}
-
-  e = (e << mLen) | m
-  eLen += mLen
-  for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {}
-
-  buffer[offset + i - d] |= s * 128
-}
-
-},{}],17:[function(require,module,exports){
-
-/**
- * isArray
- */
-
-var isArray = Array.isArray;
-
-/**
- * toString
- */
-
-var str = Object.prototype.toString;
-
-/**
- * Whether or not the given `val`
- * is an array.
- *
- * example:
- *
- *        isArray([]);
- *        // > true
- *        isArray(arguments);
- *        // > false
- *        isArray('');
- *        // > false
- *
- * @param {mixed} val
- * @return {bool}
- */
-
-module.exports = isArray || function (val) {
-  return !! val && '[object Array]' == str.call(val);
-};
-
-},{}],18:[function(require,module,exports){
-/* jshint node: true */
-(function () {
-    "use strict";
-
-    function CookieAccessInfo(domain, path, secure, script) {
-        if (this instanceof CookieAccessInfo) {
-            this.domain = domain || undefined;
-            this.path = path || "/";
-            this.secure = !!secure;
-            this.script = !!script;
-            return this;
-        }
-        return new CookieAccessInfo(domain, path, secure, script);
-    }
-    exports.CookieAccessInfo = CookieAccessInfo;
-
-    function Cookie(cookiestr, request_domain, request_path) {
-        if (cookiestr instanceof Cookie) {
-            return cookiestr;
-        }
-        if (this instanceof Cookie) {
-            this.name = null;
-            this.value = null;
-            this.expiration_date = Infinity;
-            this.path = String(request_path || "/");
-            this.explicit_path = false;
-            this.domain = request_domain || null;
-            this.explicit_domain = false;
-            this.secure = false; //how to define default?
-            this.noscript = false; //httponly
-            if (cookiestr) {
-                this.parse(cookiestr, request_domain, request_path);
-            }
-            return this;
-        }
-        return new Cookie(cookiestr, request_domain, request_path);
-    }
-    exports.Cookie = Cookie;
-
-    Cookie.prototype.toString = function toString() {
-        var str = [this.name + "=" + this.value];
-        if (this.expiration_date !== Infinity) {
-            str.push("expires=" + (new Date(this.expiration_date)).toGMTString());
-        }
-        if (this.domain) {
-            str.push("domain=" + this.domain);
-        }
-        if (this.path) {
-            str.push("path=" + this.path);
-        }
-        if (this.secure) {
-            str.push("secure");
-        }
-        if (this.noscript) {
-            str.push("httponly");
-        }
-        return str.join("; ");
-    };
-
-    Cookie.prototype.toValueString = function toValueString() {
-        return this.name + "=" + this.value;
-    };
-
-    var cookie_str_splitter = /[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g;
-    Cookie.prototype.parse = function parse(str, request_domain, request_path) {
-        if (this instanceof Cookie) {
-            var parts = str.split(";").filter(function (value) {
-                    return !!value;
-                }),
-                pair = parts[0].match(/([^=]+)=([\s\S]*)/),
-                key = pair[1],
-                value = pair[2],
-                i;
-            this.name = key;
-            this.value = value;
-
-            for (i = 1; i < parts.length; i += 1) {
-                pair = parts[i].match(/([^=]+)(?:=([\s\S]*))?/);
-                key = pair[1].trim().toLowerCase();
-                value = pair[2];
-                switch (key) {
-                case "httponly":
-                    this.noscript = true;
-                    break;
-                case "expires":
-                    this.expiration_date = value ?
-                            Number(Date.parse(value)) :
-                            Infinity;
-                    break;
-                case "path":
-                    this.path = value ?
-                            value.trim() :
-                            "";
-                    this.explicit_path = true;
-                    break;
-                case "domain":
-                    this.domain = value ?
-                            value.trim() :
-                            "";
-                    this.explicit_domain = !!this.domain;
-                    break;
-                case "secure":
-                    this.secure = true;
-                    break;
-                }
-            }
-
-            if (!this.explicit_path) {
-               this.path = request_path || "/";
-            }
-            if (!this.explicit_domain) {
-               this.domain = request_domain;
-            }
-
-            return this;
-        }
-        return new Cookie().parse(str, request_domain, request_path);
-    };
-
-    Cookie.prototype.matches = function matches(access_info) {
-        if (this.noscript && access_info.script ||
-                this.secure && !access_info.secure ||
-                !this.collidesWith(access_info)) {
-            return false;
-        }
-        return true;
-    };
-
-    Cookie.prototype.collidesWith = function collidesWith(access_info) {
-        if ((this.path && !access_info.path) || (this.domain && !access_info.domain)) {
-            return false;
-        }
-        if (this.path && access_info.path.indexOf(this.path) !== 0) {
-            return false;
-        }
-        if (this.explicit_path && access_info.path.indexOf( this.path ) !== 0) {
-           return false;
-        }
-        var access_domain = access_info.domain && access_info.domain.replace(/^[\.]/,'');
-        var cookie_domain = this.domain && this.domain.replace(/^[\.]/,'');
-        if (cookie_domain === access_domain) {
-            return true;
-        }
-        if (cookie_domain) {
-            if (!this.explicit_domain) {
-                return false; // we already checked if the domains were exactly the same
-            }
-            var wildcard = access_domain.indexOf(cookie_domain);
-            if (wildcard === -1 || wildcard !== access_domain.length - cookie_domain.length) {
-                return false;
-            }
-            return true;
-        }
-        return true;
-    };
-
-    function CookieJar() {
-        var cookies, cookies_list, collidable_cookie;
-        if (this instanceof CookieJar) {
-            cookies = Object.create(null); //name: [Cookie]
-
-            this.setCookie = function setCookie(cookie, request_domain, request_path) {
-                var remove, i;
-                cookie = new Cookie(cookie, request_domain, request_path);
-                //Delete the cookie if the set is past the current time
-                remove = cookie.expiration_date <= Date.now();
-                if (cookies[cookie.name] !== undefined) {
-                    cookies_list = cookies[cookie.name];
-                    for (i = 0; i < cookies_list.length; i += 1) {
-                        collidable_cookie = cookies_list[i];
-                        if (collidable_cookie.collidesWith(cookie)) {
-                            if (remove) {
-                                cookies_list.splice(i, 1);
-                                if (cookies_list.length === 0) {
-                                    delete cookies[cookie.name];
-                                }
-                                return false;
-                            }
-                            cookies_list[i] = cookie;
-                            return cookie;
-                        }
-                    }
-                    if (remove) {
-                        return false;
-                    }
-                    cookies_list.push(cookie);
-                    return cookie;
-                }
-                if (remove) {
-                    return false;
-                }
-                cookies[cookie.name] = [cookie];
-                return cookies[cookie.name];
-            };
-            //returns a cookie
-            this.getCookie = function getCookie(cookie_name, access_info) {
-                var cookie, i;
-                cookies_list = cookies[cookie_name];
-                if (!cookies_list) {
-                    return;
-                }
-                for (i = 0; i < cookies_list.length; i += 1) {
-                    cookie = cookies_list[i];
-                    if (cookie.expiration_date <= Date.now()) {
-                        if (cookies_list.length === 0) {
-                            delete cookies[cookie.name];
-                        }
-                        continue;
-                    }
-
-                    if (cookie.matches(access_info)) {
-                        return cookie;
-                    }
-                }
-            };
-            //returns a list of cookies
-            this.getCookies = function getCookies(access_info) {
-                var matches = [], cookie_name, cookie;
-                for (cookie_name in cookies) {
-                    cookie = this.getCookie(cookie_name, access_info);
-                    if (cookie) {
-                        matches.push(cookie);
-                    }
-                }
-                matches.toString = function toString() {
-                    return matches.join(":");
-                };
-                matches.toValueString = function toValueString() {
-                    return matches.map(function (c) {
-                        return c.toValueString();
-                    }).join(';');
-                };
-                return matches;
-            };
-
-            return this;
-        }
-        return new CookieJar();
-    }
-    exports.CookieJar = CookieJar;
-
-    //returns list of cookies that were set correctly. Cookies that are expired and removed are not returned.
-    CookieJar.prototype.setCookies = function setCookies(cookies, request_domain, request_path) {
-        cookies = Array.isArray(cookies) ?
-                cookies :
-                cookies.split(cookie_str_splitter);
-        var successful = [],
-            i,
-            cookie;
-        cookies = cookies.map(function(item){
-            return new Cookie(item, request_domain, request_path);
-        });
-        for (i = 0; i < cookies.length; i += 1) {
-            cookie = cookies[i];
-            if (this.setCookie(cookie, request_domain, request_path)) {
-                successful.push(cookie);
-            }
-        }
-        return successful;
-    };
-}());
-
-},{}],19:[function(require,module,exports){
-'use strict';
-
-
-var yaml = require('./lib/js-yaml.js');
-
-
-module.exports = yaml;
-
-},{"./lib/js-yaml.js":20}],20:[function(require,module,exports){
-'use strict';
-
-
-var loader = require('./js-yaml/loader');
-var dumper = require('./js-yaml/dumper');
-
-
-function deprecated(name) {
-  return function () {
-    throw new Error('Function ' + name + ' is deprecated and cannot be used.');
-  };
-}
-
-
-module.exports.Type                = require('./js-yaml/type');
-module.exports.Schema              = require('./js-yaml/schema');
-module.exports.FAILSAFE_SCHEMA     = require('./js-yaml/schema/failsafe');
-module.exports.JSON_SCHEMA         = require('./js-yaml/schema/json');
-module.exports.CORE_SCHEMA         = require('./js-yaml/schema/core');
-module.exports.DEFAULT_SAFE_SCHEMA = require('./js-yaml/schema/default_safe');
-module.exports.DEFAULT_FULL_SCHEMA = require('./js-yaml/schema/default_full');
-module.exports.load                = loader.load;
-module.exports.loadAll             = loader.loadAll;
-module.exports.safeLoad            = loader.safeLoad;
-module.exports.safeLoadAll         = loader.safeLoadAll;
-module.exports.dump                = dumper.dump;
-module.exports.safeDump            = dumper.safeDump;
-module.exports.YAMLException       = require('./js-yaml/exception');
-
-// Deprecated schema names from JS-YAML 2.0.x
-module.exports.MINIMAL_SCHEMA = require('./js-yaml/schema/failsafe');
-module.exports.SAFE_SCHEMA    = require('./js-yaml/schema/default_safe');
-module.exports.DEFAULT_SCHEMA = require('./js-yaml/schema/default_full');
-
-// Deprecated functions from JS-YAML 1.x.x
-module.exports.scan           = deprecated('scan');
-module.exports.parse          = deprecated('parse');
-module.exports.compose        = deprecated('compose');
-module.exports.addConstructor = deprecated('addConstructor');
-
-},{"./js-yaml/dumper":22,"./js-yaml/exception":23,"./js-yaml/loader":24,"./js-yaml/schema":26,"./js-yaml/schema/core":27,"./js-yaml/schema/default_full":28,"./js-yaml/schema/default_safe":29,"./js-yaml/schema/failsafe":30,"./js-yaml/schema/json":31,"./js-yaml/type":32}],21:[function(require,module,exports){
-'use strict';
-
-
-function isNothing(subject) {
-  return (typeof subject === 'undefined') || (subject === null);
-}
-
-
-function isObject(subject) {
-  return (typeof subject === 'object') && (subject !== null);
-}
-
-
-function toArray(sequence) {
-  if (Array.isArray(sequence)) return sequence;
-  else if (isNothing(sequence)) return [];
-
-  return [ sequence ];
-}
-
-
-function extend(target, source) {
-  var index, length, key, sourceKeys;
-
-  if (source) {
-    sourceKeys = Object.keys(source);
-
-    for (index = 0, length = sourceKeys.length; index < length; index += 1) {
-      key = sourceKeys[index];
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
-
-function repeat(string, count) {
-  var result = '', cycle;
-
-  for (cycle = 0; cycle < count; cycle += 1) {
-    result += string;
-  }
-
-  return result;
-}
-
-
-function isNegativeZero(number) {
-  return (number === 0) && (Number.NEGATIVE_INFINITY === 1 / number);
-}
-
-
-module.exports.isNothing      = isNothing;
-module.exports.isObject       = isObject;
-module.exports.toArray        = toArray;
-module.exports.repeat         = repeat;
-module.exports.isNegativeZero = isNegativeZero;
-module.exports.extend         = extend;
-
-},{}],22:[function(require,module,exports){
-'use strict';
-
-/*eslint-disable no-use-before-define*/
-
-var common              = require('./common');
-var YAMLException       = require('./exception');
-var DEFAULT_FULL_SCHEMA = require('./schema/default_full');
-var DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');
-
-var _toString       = Object.prototype.toString;
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-
-var CHAR_TAB                  = 0x09; /* Tab */
-var CHAR_LINE_FEED            = 0x0A; /* LF */
-var CHAR_SPACE                = 0x20; /* Space */
-var CHAR_EXCLAMATION          = 0x21; /* ! */
-var CHAR_DOUBLE_QUOTE         = 0x22; /* " */
-var CHAR_SHARP                = 0x23; /* # */
-var CHAR_PERCENT              = 0x25; /* % */
-var CHAR_AMPERSAND            = 0x26; /* & */
-var CHAR_SINGLE_QUOTE         = 0x27; /* ' */
-var CHAR_ASTERISK             = 0x2A; /* * */
-var CHAR_COMMA                = 0x2C; /* , */
-var CHAR_MINUS                = 0x2D; /* - */
-var CHAR_COLON                = 0x3A; /* : */
-var CHAR_GREATER_THAN         = 0x3E; /* > */
-var CHAR_QUESTION             = 0x3F; /* ? */
-var CHAR_COMMERCIAL_AT        = 0x40; /* @ */
-var CHAR_LEFT_SQUARE_BRACKET  = 0x5B; /* [ */
-var CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */
-var CHAR_GRAVE_ACCENT         = 0x60; /* ` */
-var CHAR_LEFT_CURLY_BRACKET   = 0x7B; /* { */
-var CHAR_VERTICAL_LINE        = 0x7C; /* | */
-var CHAR_RIGHT_CURLY_BRACKET  = 0x7D; /* } */
-
-var ESCAPE_SEQUENCES = {};
-
-ESCAPE_SEQUENCES[0x00]   = '\\0';
-ESCAPE_SEQUENCES[0x07]   = '\\a';
-ESCAPE_SEQUENCES[0x08]   = '\\b';
-ESCAPE_SEQUENCES[0x09]   = '\\t';
-ESCAPE_SEQUENCES[0x0A]   = '\\n';
-ESCAPE_SEQUENCES[0x0B]   = '\\v';
-ESCAPE_SEQUENCES[0x0C]   = '\\f';
-ESCAPE_SEQUENCES[0x0D]   = '\\r';
-ESCAPE_SEQUENCES[0x1B]   = '\\e';
-ESCAPE_SEQUENCES[0x22]   = '\\"';
-ESCAPE_SEQUENCES[0x5C]   = '\\\\';
-ESCAPE_SEQUENCES[0x85]   = '\\N';
-ESCAPE_SEQUENCES[0xA0]   = '\\_';
-ESCAPE_SEQUENCES[0x2028] = '\\L';
-ESCAPE_SEQUENCES[0x2029] = '\\P';
-
-var DEPRECATED_BOOLEANS_SYNTAX = [
-  'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON',
-  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'
-];
-
-function compileStyleMap(schema, map) {
-  var result, keys, index, length, tag, style, type;
-
-  if (map === null) return {};
-
-  result = {};
-  keys = Object.keys(map);
-
-  for (index = 0, length = keys.length; index < length; index += 1) {
-    tag = keys[index];
-    style = String(map[tag]);
-
-    if (tag.slice(0, 2) === '!!') {
-      tag = 'tag:yaml.org,2002:' + tag.slice(2);
-    }
-
-    type = schema.compiledTypeMap[tag];
-
-    if (type && _hasOwnProperty.call(type.styleAliases, style)) {
-      style = type.styleAliases[style];
-    }
-
-    result[tag] = style;
-  }
-
-  return result;
-}
-
-function encodeHex(character) {
-  var string, handle, length;
-
-  string = character.toString(16).toUpperCase();
-
-  if (character <= 0xFF) {
-    handle = 'x';
-    length = 2;
-  } else if (character <= 0xFFFF) {
-    handle = 'u';
-    length = 4;
-  } else if (character <= 0xFFFFFFFF) {
-    handle = 'U';
-    length = 8;
-  } else {
-    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');
-  }
-
-  return '\\' + handle + common.repeat('0', length - string.length) + string;
-}
-
-function State(options) {
-  this.schema       = options['schema'] || DEFAULT_FULL_SCHEMA;
-  this.indent       = Math.max(1, (options['indent'] || 2));
-  this.skipInvalid  = options['skipInvalid'] || false;
-  this.flowLevel    = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);
-  this.styleMap     = compileStyleMap(this.schema, options['styles'] || null);
-  this.sortKeys     = options['sortKeys'] || false;
-  this.lineWidth    = options['lineWidth'] || 80;
-  this.noRefs       = options['noRefs'] || false;
-  this.noCompatMode = options['noCompatMode'] || false;
-
-  this.implicitTypes = this.schema.compiledImplicit;
-  this.explicitTypes = this.schema.compiledExplicit;
-
-  this.tag = null;
-  this.result = '';
-
-  this.duplicates = [];
-  this.usedDuplicates = null;
-}
-
-// Indents every line in a string. Empty lines (\n only) are not indented.
-function indentString(string, spaces) {
-  var ind = common.repeat(' ', spaces),
-      position = 0,
-      next = -1,
-      result = '',
-      line,
-      length = string.length;
-
-  while (position < length) {
-    next = string.indexOf('\n', position);
-    if (next === -1) {
-      line = string.slice(position);
-      position = length;
-    } else {
-      line = string.slice(position, next + 1);
-      position = next + 1;
-    }
-
-    if (line.length && line !== '\n') result += ind;
-
-    result += line;
-  }
-
-  return result;
-}
-
-function generateNextLine(state, level) {
-  return '\n' + common.repeat(' ', state.indent * level);
-}
-
-function testImplicitResolving(state, str) {
-  var index, length, type;
-
-  for (index = 0, length = state.implicitTypes.length; index < length; index += 1) {
-    type = state.implicitTypes[index];
-
-    if (type.resolve(str)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// [33] s-white ::= s-space | s-tab
-function isWhitespace(c) {
-  return c === CHAR_SPACE || c === CHAR_TAB;
-}
-
-// Returns true if the character can be printed without escaping.
-// From YAML 1.2: "any allowed characters known to be non-printable
-// should also be escaped. [However,] This isn’t mandatory"
-// Derived from nb-char - \t - #x85 - #xA0 - #x2028 - #x2029.
-function isPrintable(c) {
-  return  (0x00020 <= c && c <= 0x00007E)
-      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)
-      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)
-      ||  (0x10000 <= c && c <= 0x10FFFF);
-}
-
-// Simplified test for values allowed after the first character in plain style.
-function isPlainSafe(c) {
-  // Uses a subset of nb-char - c-flow-indicator - ":" - "#"
-  // where nb-char ::= c-printable - b-char - c-byte-order-mark.
-  return isPrintable(c) && c !== 0xFEFF
-    // - c-flow-indicator
-    && c !== CHAR_COMMA
-    && c !== CHAR_LEFT_SQUARE_BRACKET
-    && c !== CHAR_RIGHT_SQUARE_BRACKET
-    && c !== CHAR_LEFT_CURLY_BRACKET
-    && c !== CHAR_RIGHT_CURLY_BRACKET
-    // - ":" - "#"
-    && c !== CHAR_COLON
-    && c !== CHAR_SHARP;
-}
-
-// Simplified test for values allowed as the first character in plain style.
-function isPlainSafeFirst(c) {
-  // Uses a subset of ns-char - c-indicator
-  // where ns-char = nb-char - s-white.
-  return isPrintable(c) && c !== 0xFEFF
-    && !isWhitespace(c) // - s-white
-    // - (c-indicator ::=
-    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”
-    && c !== CHAR_MINUS
-    && c !== CHAR_QUESTION
-    && c !== CHAR_COLON
-    && c !== CHAR_COMMA
-    && c !== CHAR_LEFT_SQUARE_BRACKET
-    && c !== CHAR_RIGHT_SQUARE_BRACKET
-    && c !== CHAR_LEFT_CURLY_BRACKET
-    && c !== CHAR_RIGHT_CURLY_BRACKET
-    // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “"”
-    && c !== CHAR_SHARP
-    && c !== CHAR_AMPERSAND
-    && c !== CHAR_ASTERISK
-    && c !== CHAR_EXCLAMATION
-    && c !== CHAR_VERTICAL_LINE
-    && c !== CHAR_GREATER_THAN
-    && c !== CHAR_SINGLE_QUOTE
-    && c !== CHAR_DOUBLE_QUOTE
-    // | “%” | “@” | “`”)
-    && c !== CHAR_PERCENT
-    && c !== CHAR_COMMERCIAL_AT
-    && c !== CHAR_GRAVE_ACCENT;
-}
-
-var STYLE_PLAIN   = 1,
-    STYLE_SINGLE  = 2,
-    STYLE_LITERAL = 3,
-    STYLE_FOLDED  = 4,
-    STYLE_DOUBLE  = 5;
-
-// Determines which scalar styles are possible and returns the preferred style.
-// lineWidth = -1 => no limit.
-// Pre-conditions: str.length > 0.
-// Post-conditions:
-//    STYLE_PLAIN or STYLE_SINGLE => no \n are in the string.
-//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).
-//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).
-function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {
-  var i;
-  var char;
-  var hasLineBreak = false;
-  var hasFoldableLine = false; // only checked if shouldTrackWidth
-  var shouldTrackWidth = lineWidth !== -1;
-  var previousLineBreak = -1; // count the first line correctly
-  var plain = isPlainSafeFirst(string.charCodeAt(0))
-          && !isWhitespace(string.charCodeAt(string.length - 1));
-
-  if (singleLineOnly) {
-    // Case: no block styles.
-    // Check for disallowed characters to rule out plain and single.
-    for (i = 0; i < string.length; i++) {
-      char = string.charCodeAt(i);
-      if (!isPrintable(char)) {
-        return STYLE_DOUBLE;
-      }
-      plain = plain && isPlainSafe(char);
-    }
-  } else {
-    // Case: block styles permitted.
-    for (i = 0; i < string.length; i++) {
-      char = string.charCodeAt(i);
-      if (char === CHAR_LINE_FEED) {
-        hasLineBreak = true;
-        // Check if any line can be folded.
-        if (shouldTrackWidth) {
-          hasFoldableLine = hasFoldableLine ||
-            // Foldable line = too long, and not more-indented.
-            (i - previousLineBreak - 1 > lineWidth &&
-             string[previousLineBreak + 1] !== ' ');
-          previousLineBreak = i;
-        }
-      } else if (!isPrintable(char)) {
-        return STYLE_DOUBLE;
-      }
-      plain = plain && isPlainSafe(char);
-    }
-    // in case the end is missing a \n
-    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&
-      (i - previousLineBreak - 1 > lineWidth &&
-       string[previousLineBreak + 1] !== ' '));
-  }
-  // Although every style can represent \n without escaping, prefer block styles
-  // for multiline, since they're more readable and they don't add empty lines.
-  // Also prefer folding a super-long line.
-  if (!hasLineBreak && !hasFoldableLine) {
-    // Strings interpretable as another type have to be quoted;
-    // e.g. the string 'true' vs. the boolean true.
-    return plain && !testAmbiguousType(string)
-      ? STYLE_PLAIN : STYLE_SINGLE;
-  }
-  // Edge case: block indentation indicator can only have one digit.
-  if (string[0] === ' ' && indentPerLevel > 9) {
-    return STYLE_DOUBLE;
-  }
-  // At this point we know block styles are valid.
-  // Prefer literal style unless we want to fold.
-  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;
-}
-
-// Note: line breaking/folding is implemented for only the folded style.
-// NB. We drop the last trailing newline (if any) of a returned block scalar
-//  since the dumper adds its own newline. This always works:
-//    • No ending newline => unaffected; already using strip "-" chomping.
-//    • Ending newline    => removed then restored.
-//  Importantly, this keeps the "+" chomp indicator from gaining an extra line.
-function writeScalar(state, string, level, iskey) {
-  state.dump = (function () {
-    if (string.length === 0) {
-      return "''";
-    }
-    if (!state.noCompatMode &&
-        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {
-      return "'" + string + "'";
-    }
-
-    var indent = state.indent * Math.max(1, level); // no 0-indent scalars
-    // As indentation gets deeper, let the width decrease monotonically
-    // to the lower bound min(state.lineWidth, 40).
-    // Note that this implies
-    //  state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound.
-    //  state.lineWidth > 40 + state.indent: width decreases until the lower bound.
-    // This behaves better than a constant minimum width which disallows narrower options,
-    // or an indent threshold which causes the width to suddenly increase.
-    var lineWidth = state.lineWidth === -1
-      ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent);
-
-    // Without knowing if keys are implicit/explicit, assume implicit for safety.
-    var singleLineOnly = iskey
-      // No block styles in flow mode.
-      || (state.flowLevel > -1 && level >= state.flowLevel);
-    function testAmbiguity(string) {
-      return testImplicitResolving(state, string);
-    }
-
-    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {
-      case STYLE_PLAIN:
-        return string;
-      case STYLE_SINGLE:
-        return "'" + string.replace(/'/g, "''") + "'";
-      case STYLE_LITERAL:
-        return '|' + blockHeader(string, state.indent)
-          + dropEndingNewline(indentString(string, indent));
-      case STYLE_FOLDED:
-        return '>' + blockHeader(string, state.indent)
-          + dropEndingNewline(indentString(foldString(string, lineWidth), indent));
-      case STYLE_DOUBLE:
-        return '"' + escapeString(string, lineWidth) + '"';
-      default:
-        throw new YAMLException('impossible error: invalid scalar style');
-    }
-  }());
-}
-
-// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9.
-function blockHeader(string, indentPerLevel) {
-  var indentIndicator = (string[0] === ' ') ? String(indentPerLevel) : '';
-
-  // note the special case: the string '\n' counts as a "trailing" empty line.
-  var clip =          string[string.length - 1] === '\n';
-  var keep = clip && (string[string.length - 2] === '\n' || string === '\n');
-  var chomp = keep ? '+' : (clip ? '' : '-');
-
-  return indentIndicator + chomp + '\n';
-}
-
-// (See the note for writeScalar.)
-function dropEndingNewline(string) {
-  return string[string.length - 1] === '\n' ? string.slice(0, -1) : string;
-}
-
-// Note: a long line without a suitable break point will exceed the width limit.
-// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0.
-function foldString(string, width) {
-  // In folded style, $k$ consecutive newlines output as $k+1$ newlines—
-  // unless they're before or after a more-indented line, or at the very
-  // beginning or end, in which case $k$ maps to $k$.
-  // Therefore, parse each chunk as newline(s) followed by a content line.
-  var lineRe = /(\n+)([^\n]*)/g;
-
-  // first line (possibly an empty line)
-  var result = (function () {
-    var nextLF = string.indexOf('\n');
-    nextLF = nextLF !== -1 ? nextLF : string.length;
-    lineRe.lastIndex = nextLF;
-    return foldLine(string.slice(0, nextLF), width);
-  }());
-  // If we haven't reached the first content line yet, don't add an extra \n.
-  var prevMoreIndented = string[0] === '\n' || string[0] === ' ';
-  var moreIndented;
-
-  // rest of the lines
-  var match;
-  while ((match = lineRe.exec(string))) {
-    var prefix = match[1], line = match[2];
-    moreIndented = (line[0] === ' ');
-    result += prefix
-      + (!prevMoreIndented && !moreIndented && line !== ''
-        ? '\n' : '')
-      + foldLine(line, width);
-    prevMoreIndented = moreIndented;
-  }
-
-  return result;
-}
-
-// Greedy line breaking.
-// Picks the longest line under the limit each time,
-// otherwise settles for the shortest line over the limit.
-// NB. More-indented lines *cannot* be folded, as that would add an extra \n.
-function foldLine(line, width) {
-  if (line === '' || line[0] === ' ') return line;
-
-  // Since a more-indented line adds a \n, breaks can't be followed by a space.
-  var breakRe = / [^ ]/g; // note: the match index will always be <= length-2.
-  var match;
-  // start is an inclusive index. end, curr, and next are exclusive.
-  var start = 0, end, curr = 0, next = 0;
-  var result = '';
-
-  // Invariants: 0 <= start <= length-1.
-  //   0 <= curr <= next <= max(0, length-2). curr - start <= width.
-  // Inside the loop:
-  //   A match implies length >= 2, so curr and next are <= length-2.
-  while ((match = breakRe.exec(line))) {
-    next = match.index;
-    // maintain invariant: curr - start <= width
-    if (next - start > width) {
-      end = (curr > start) ? curr : next; // derive end <= length-2
-      result += '\n' + line.slice(start, end);
-      // skip the space that was output as \n
-      start = end + 1;                    // derive start <= length-1
-    }
-    curr = next;
-  }
-
-  // By the invariants, start <= length-1, so there is something left over.
-  // It is either the whole string or a part starting from non-whitespace.
-  result += '\n';
-  // Insert a break if the remainder is too long and there is a break available.
-  if (line.length - start > width && curr > start) {
-    result += line.slice(start, curr) + '\n' + line.slice(curr + 1);
-  } else {
-    result += line.slice(start);
-  }
-
-  return result.slice(1); // drop extra \n joiner
-}
-
-// Escapes a double-quoted string.
-function escapeString(string) {
-  var result = '';
-  var char;
-  var escapeSeq;
-
-  for (var i = 0; i < string.length; i++) {
-    char = string.charCodeAt(i);
-    escapeSeq = ESCAPE_SEQUENCES[char];
-    result += !escapeSeq && isPrintable(char)
-      ? string[i]
-      : escapeSeq || encodeHex(char);
-  }
-
-  return result;
-}
-
-function writeFlowSequence(state, level, object) {
-  var _result = '',
-      _tag    = state.tag,
-      index,
-      length;
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    // Write only valid elements.
-    if (writeNode(state, level, object[index], false, false)) {
-      if (index !== 0) _result += ', ';
-      _result += state.dump;
-    }
-  }
-
-  state.tag = _tag;
-  state.dump = '[' + _result + ']';
-}
-
-function writeBlockSequence(state, level, object, compact) {
-  var _result = '',
-      _tag    = state.tag,
-      index,
-      length;
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    // Write only valid elements.
-    if (writeNode(state, level + 1, object[index], true, true)) {
-      if (!compact || index !== 0) {
-        _result += generateNextLine(state, level);
-      }
-      _result += '- ' + state.dump;
-    }
-  }
-
-  state.tag = _tag;
-  state.dump = _result || '[]'; // Empty sequence if no valid values.
-}
-
-function writeFlowMapping(state, level, object) {
-  var _result       = '',
-      _tag          = state.tag,
-      objectKeyList = Object.keys(object),
-      index,
-      length,
-      objectKey,
-      objectValue,
-      pairBuffer;
-
-  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-    pairBuffer = '';
-
-    if (index !== 0) pairBuffer += ', ';
-
-    objectKey = objectKeyList[index];
-    objectValue = object[objectKey];
-
-    if (!writeNode(state, level, objectKey, false, false)) {
-      continue; // Skip this pair because of invalid key;
-    }
-
-    if (state.dump.length > 1024) pairBuffer += '? ';
-
-    pairBuffer += state.dump + ': ';
-
-    if (!writeNode(state, level, objectValue, false, false)) {
-      continue; // Skip this pair because of invalid value.
-    }
-
-    pairBuffer += state.dump;
-
-    // Both key and value are valid.
-    _result += pairBuffer;
-  }
-
-  state.tag = _tag;
-  state.dump = '{' + _result + '}';
-}
-
-function writeBlockMapping(state, level, object, compact) {
-  var _result       = '',
-      _tag          = state.tag,
-      objectKeyList = Object.keys(object),
-      index,
-      length,
-      objectKey,
-      objectValue,
-      explicitPair,
-      pairBuffer;
-
-  // Allow sorting keys so that the output file is deterministic
-  if (state.sortKeys === true) {
-    // Default sorting
-    objectKeyList.sort();
-  } else if (typeof state.sortKeys === 'function') {
-    // Custom sort function
-    objectKeyList.sort(state.sortKeys);
-  } else if (state.sortKeys) {
-    // Something is wrong
-    throw new YAMLException('sortKeys must be a boolean or a function');
-  }
-
-  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-    pairBuffer = '';
-
-    if (!compact || index !== 0) {
-      pairBuffer += generateNextLine(state, level);
-    }
-
-    objectKey = objectKeyList[index];
-    objectValue = object[objectKey];
-
-    if (!writeNode(state, level + 1, objectKey, true, true, true)) {
-      continue; // Skip this pair because of invalid key.
-    }
-
-    explicitPair = (state.tag !== null && state.tag !== '?') ||
-                   (state.dump && state.dump.length > 1024);
-
-    if (explicitPair) {
-      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
-        pairBuffer += '?';
-      } else {
-        pairBuffer += '? ';
-      }
-    }
-
-    pairBuffer += state.dump;
-
-    if (explicitPair) {
-      pairBuffer += generateNextLine(state, level);
-    }
-
-    if (!writeNode(state, level + 1, objectValue, true, explicitPair)) {
-      continue; // Skip this pair because of invalid value.
-    }
-
-    if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
-      pairBuffer += ':';
-    } else {
-      pairBuffer += ': ';
-    }
-
-    pairBuffer += state.dump;
-
-    // Both key and value are valid.
-    _result += pairBuffer;
-  }
-
-  state.tag = _tag;
-  state.dump = _result || '{}'; // Empty mapping if no valid pairs.
-}
-
-function detectType(state, object, explicit) {
-  var _result, typeList, index, length, type, style;
-
-  typeList = explicit ? state.explicitTypes : state.implicitTypes;
-
-  for (index = 0, length = typeList.length; index < length; index += 1) {
-    type = typeList[index];
-
-    if ((type.instanceOf  || type.predicate) &&
-        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&
-        (!type.predicate  || type.predicate(object))) {
-
-      state.tag = explicit ? type.tag : '?';
-
-      if (type.represent) {
-        style = state.styleMap[type.tag] || type.defaultStyle;
-
-        if (_toString.call(type.represent) === '[object Function]') {
-          _result = type.represent(object, style);
-        } else if (_hasOwnProperty.call(type.represent, style)) {
-          _result = type.represent[style](object, style);
-        } else {
-          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not "' + style + '" style');
-        }
-
-        state.dump = _result;
-      }
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// Serializes `object` and writes it to global `result`.
-// Returns true on success, or false on invalid object.
-//
-function writeNode(state, level, object, block, compact, iskey) {
-  state.tag = null;
-  state.dump = object;
-
-  if (!detectType(state, object, false)) {
-    detectType(state, object, true);
-  }
-
-  var type = _toString.call(state.dump);
-
-  if (block) {
-    block = (state.flowLevel < 0 || state.flowLevel > level);
-  }
-
-  var objectOrArray = type === '[object Object]' || type === '[object Array]',
-      duplicateIndex,
-      duplicate;
-
-  if (objectOrArray) {
-    duplicateIndex = state.duplicates.indexOf(object);
-    duplicate = duplicateIndex !== -1;
-  }
-
-  if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) {
-    compact = false;
-  }
-
-  if (duplicate && state.usedDuplicates[duplicateIndex]) {
-    state.dump = '*ref_' + duplicateIndex;
-  } else {
-    if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {
-      state.usedDuplicates[duplicateIndex] = true;
-    }
-    if (type === '[object Object]') {
-      if (block && (Object.keys(state.dump).length !== 0)) {
-        writeBlockMapping(state, level, state.dump, compact);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + state.dump;
-        }
-      } else {
-        writeFlowMapping(state, level, state.dump);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
-        }
-      }
-    } else if (type === '[object Array]') {
-      if (block && (state.dump.length !== 0)) {
-        writeBlockSequence(state, level, state.dump, compact);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + state.dump;
-        }
-      } else {
-        writeFlowSequence(state, level, state.dump);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
-        }
-      }
-    } else if (type === '[object String]') {
-      if (state.tag !== '?') {
-        writeScalar(state, state.dump, level, iskey);
-      }
-    } else {
-      if (state.skipInvalid) return false;
-      throw new YAMLException('unacceptable kind of an object to dump ' + type);
-    }
-
-    if (state.tag !== null && state.tag !== '?') {
-      state.dump = '!<' + state.tag + '> ' + state.dump;
-    }
-  }
-
-  return true;
-}
-
-function getDuplicateReferences(object, state) {
-  var objects = [],
-      duplicatesIndexes = [],
-      index,
-      length;
-
-  inspectNode(object, objects, duplicatesIndexes);
-
-  for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) {
-    state.duplicates.push(objects[duplicatesIndexes[index]]);
-  }
-  state.usedDuplicates = new Array(length);
-}
-
-function inspectNode(object, objects, duplicatesIndexes) {
-  var objectKeyList,
-      index,
-      length;
-
-  if (object !== null && typeof object === 'object') {
-    index = objects.indexOf(object);
-    if (index !== -1) {
-      if (duplicatesIndexes.indexOf(index) === -1) {
-        duplicatesIndexes.push(index);
-      }
-    } else {
-      objects.push(object);
-
-      if (Array.isArray(object)) {
-        for (index = 0, length = object.length; index < length; index += 1) {
-          inspectNode(object[index], objects, duplicatesIndexes);
-        }
-      } else {
-        objectKeyList = Object.keys(object);
-
-        for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-          inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes);
-        }
-      }
-    }
-  }
-}
-
-function dump(input, options) {
-  options = options || {};
-
-  var state = new State(options);
-
-  if (!state.noRefs) getDuplicateReferences(input, state);
-
-  if (writeNode(state, 0, input, true, true)) return state.dump + '\n';
-
-  return '';
-}
-
-function safeDump(input, options) {
-  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-}
-
-module.exports.dump     = dump;
-module.exports.safeDump = safeDump;
-
-},{"./common":21,"./exception":23,"./schema/default_full":28,"./schema/default_safe":29}],23:[function(require,module,exports){
-// YAML error class. http://stackoverflow.com/questions/8458984
-//
-'use strict';
-
-function YAMLException(reason, mark) {
-  // Super constructor
-  Error.call(this);
-
-  // Include stack trace in error object
-  if (Error.captureStackTrace) {
-    // Chrome and NodeJS
-    Error.captureStackTrace(this, this.constructor);
-  } else {
-    // FF, IE 10+ and Safari 6+. Fallback for others
-    this.stack = (new Error()).stack || '';
-  }
-
-  this.name = 'YAMLException';
-  this.reason = reason;
-  this.mark = mark;
-  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');
-}
-
-
-// Inherit from Error
-YAMLException.prototype = Object.create(Error.prototype);
-YAMLException.prototype.constructor = YAMLException;
-
-
-YAMLException.prototype.toString = function toString(compact) {
-  var result = this.name + ': ';
-
-  result += this.reason || '(unknown reason)';
-
-  if (!compact && this.mark) {
-    result += ' ' + this.mark.toString();
-  }
-
-  return result;
-};
-
-
-module.exports = YAMLException;
-
-},{}],24:[function(require,module,exports){
-'use strict';
-
-/*eslint-disable max-len,no-use-before-define*/
-
-var common              = require('./common');
-var YAMLException       = require('./exception');
-var Mark                = require('./mark');
-var DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');
-var DEFAULT_FULL_SCHEMA = require('./schema/default_full');
-
-
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-
-
-var CONTEXT_FLOW_IN   = 1;
-var CONTEXT_FLOW_OUT  = 2;
-var CONTEXT_BLOCK_IN  = 3;
-var CONTEXT_BLOCK_OUT = 4;
-
-
-var CHOMPING_CLIP  = 1;
-var CHOMPING_STRIP = 2;
-var CHOMPING_KEEP  = 3;
-
-
-var PATTERN_NON_PRINTABLE         = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/;
-var PATTERN_NON_ASCII_LINE_BREAKS = /[\x85\u2028\u2029]/;
-var PATTERN_FLOW_INDICATORS       = /[,\[\]\{\}]/;
-var PATTERN_TAG_HANDLE            = /^(?:!|!!|![a-z\-]+!)$/i;
-var PATTERN_TAG_URI               = /^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;
-
-
-function is_EOL(c) {
-  return (c === 0x0A/* LF */) || (c === 0x0D/* CR */);
-}
-
-function is_WHITE_SPACE(c) {
-  return (c === 0x09/* Tab */) || (c === 0x20/* Space */);
-}
-
-function is_WS_OR_EOL(c) {
-  return (c === 0x09/* Tab */) ||
-         (c === 0x20/* Space */) ||
-         (c === 0x0A/* LF */) ||
-         (c === 0x0D/* CR */);
-}
-
-function is_FLOW_INDICATOR(c) {
-  return c === 0x2C/* , */ ||
-         c === 0x5B/* [ */ ||
-         c === 0x5D/* ] */ ||
-         c === 0x7B/* { */ ||
-         c === 0x7D/* } */;
-}
-
-function fromHexCode(c) {
-  var lc;
-
-  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {
-    return c - 0x30;
-  }
-
-  /*eslint-disable no-bitwise*/
-  lc = c | 0x20;
-
-  if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) {
-    return lc - 0x61 + 10;
-  }
-
-  return -1;
-}
-
-function escapedHexLen(c) {
-  if (c === 0x78/* x */) { return 2; }
-  if (c === 0x75/* u */) { return 4; }
-  if (c === 0x55/* U */) { return 8; }
-  return 0;
-}
-
-function fromDecimalCode(c) {
-  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {
-    return c - 0x30;
-  }
-
-  return -1;
-}
-
-function simpleEscapeSequence(c) {
-  return (c === 0x30/* 0 */) ? '\x00' :
-        (c === 0x61/* a */) ? '\x07' :
-        (c === 0x62/* b */) ? '\x08' :
-        (c === 0x74/* t */) ? '\x09' :
-        (c === 0x09/* Tab */) ? '\x09' :
-        (c === 0x6E/* n */) ? '\x0A' :
-        (c === 0x76/* v */) ? '\x0B' :
-        (c === 0x66/* f */) ? '\x0C' :
-        (c === 0x72/* r */) ? '\x0D' :
-        (c === 0x65/* e */) ? '\x1B' :
-        (c === 0x20/* Space */) ? ' ' :
-        (c === 0x22/* " */) ? '\x22' :
-        (c === 0x2F/* / */) ? '/' :
-        (c === 0x5C/* \ */) ? '\x5C' :
-        (c === 0x4E/* N */) ? '\x85' :
-        (c === 0x5F/* _ */) ? '\xA0' :
-        (c === 0x4C/* L */) ? '\u2028' :
-        (c === 0x50/* P */) ? '\u2029' : '';
-}
-
-function charFromCodepoint(c) {
-  if (c <= 0xFFFF) {
-    return String.fromCharCode(c);
-  }
-  // Encode UTF-16 surrogate pair
-  // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF
-  return String.fromCharCode(((c - 0x010000) >> 10) + 0xD800,
-                             ((c - 0x010000) & 0x03FF) + 0xDC00);
-}
-
-var simpleEscapeCheck = new Array(256); // integer, for fast access
-var simpleEscapeMap = new Array(256);
-for (var i = 0; i < 256; i++) {
-  simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;
-  simpleEscapeMap[i] = simpleEscapeSequence(i);
-}
-
-
-function State(input, options) {
-  this.input = input;
-
-  this.filename  = options['filename']  || null;
-  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;
-  this.onWarning = options['onWarning'] || null;
-  this.legacy    = options['legacy']    || false;
-  this.json      = options['json']      || false;
-  this.listener  = options['listener']  || null;
-
-  this.implicitTypes = this.schema.compiledImplicit;
-  this.typeMap       = this.schema.compiledTypeMap;
-
-  this.length     = input.length;
-  this.position   = 0;
-  this.line       = 0;
-  this.lineStart  = 0;
-  this.lineIndent = 0;
-
-  this.documents = [];
-
-  /*
-  this.version;
-  this.checkLineBreaks;
-  this.tagMap;
-  this.anchorMap;
-  this.tag;
-  this.anchor;
-  this.kind;
-  this.result;*/
-
-}
-
-
-function generateError(state, message) {
-  return new YAMLException(
-    message,
-    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));
-}
-
-function throwError(state, message) {
-  throw generateError(state, message);
-}
-
-function throwWarning(state, message) {
-  if (state.onWarning) {
-    state.onWarning.call(null, generateError(state, message));
-  }
-}
-
-
-var directiveHandlers = {
-
-  YAML: function handleYamlDirective(state, name, args) {
-
-    var match, major, minor;
-
-    if (state.version !== null) {
-      throwError(state, 'duplication of %YAML directive');
-    }
-
-    if (args.length !== 1) {
-      throwError(state, 'YAML directive accepts exactly one argument');
-    }
-
-    match = /^([0-9]+)\.([0-9]+)$/.exec(args[0]);
-
-    if (match === null) {
-      throwError(state, 'ill-formed argument of the YAML directive');
-    }
-
-    major = parseInt(match[1], 10);
-    minor = parseInt(match[2], 10);
-
-    if (major !== 1) {
-      throwError(state, 'unacceptable YAML version of the document');
-    }
-
-    state.version = args[0];
-    state.checkLineBreaks = (minor < 2);
-
-    if (minor !== 1 && minor !== 2) {
-      throwWarning(state, 'unsupported YAML version of the document');
-    }
-  },
-
-  TAG: function handleTagDirective(state, name, args) {
-
-    var handle, prefix;
-
-    if (args.length !== 2) {
-      throwError(state, 'TAG directive accepts exactly two arguments');
-    }
-
-    handle = args[0];
-    prefix = args[1];
-
-    if (!PATTERN_TAG_HANDLE.test(handle)) {
-      throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');
-    }
-
-    if (_hasOwnProperty.call(state.tagMap, handle)) {
-      throwError(state, 'there is a previously declared suffix for "' + handle + '" tag handle');
-    }
-
-    if (!PATTERN_TAG_URI.test(prefix)) {
-      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');
-    }
-
-    state.tagMap[handle] = prefix;
-  }
-};
-
-
-function captureSegment(state, start, end, checkJson) {
-  var _position, _length, _character, _result;
-
-  if (start < end) {
-    _result = state.input.slice(start, end);
-
-    if (checkJson) {
-      for (_position = 0, _length = _result.length;
-           _position < _length;
-           _position += 1) {
-        _character = _result.charCodeAt(_position);
-        if (!(_character === 0x09 ||
-              (0x20 <= _character && _character <= 0x10FFFF))) {
-          throwError(state, 'expected valid JSON character');
-        }
-      }
-    } else if (PATTERN_NON_PRINTABLE.test(_result)) {
-      throwError(state, 'the stream contains non-printable characters');
-    }
-
-    state.result += _result;
-  }
-}
-
-function mergeMappings(state, destination, source, overridableKeys) {
-  var sourceKeys, key, index, quantity;
-
-  if (!common.isObject(source)) {
-    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');
-  }
-
-  sourceKeys = Object.keys(source);
-
-  for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {
-    key = sourceKeys[index];
-
-    if (!_hasOwnProperty.call(destination, key)) {
-      destination[key] = source[key];
-      overridableKeys[key] = true;
-    }
-  }
-}
-
-function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode) {
-  var index, quantity;
-
-  keyNode = String(keyNode);
-
-  if (_result === null) {
-    _result = {};
-  }
-
-  if (keyTag === 'tag:yaml.org,2002:merge') {
-    if (Array.isArray(valueNode)) {
-      for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {
-        mergeMappings(state, _result, valueNode[index], overridableKeys);
-      }
-    } else {
-      mergeMappings(state, _result, valueNode, overridableKeys);
-    }
-  } else {
-    if (!state.json &&
-        !_hasOwnProperty.call(overridableKeys, keyNode) &&
-        _hasOwnProperty.call(_result, keyNode)) {
-      throwError(state, 'duplicated mapping key');
-    }
-    _result[keyNode] = valueNode;
-    delete overridableKeys[keyNode];
-  }
-
-  return _result;
-}
-
-function readLineBreak(state) {
-  var ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch === 0x0A/* LF */) {
-    state.position++;
-  } else if (ch === 0x0D/* CR */) {
-    state.position++;
-    if (state.input.charCodeAt(state.position) === 0x0A/* LF */) {
-      state.position++;
-    }
-  } else {
-    throwError(state, 'a line break is expected');
-  }
-
-  state.line += 1;
-  state.lineStart = state.position;
-}
-
-function skipSeparationSpace(state, allowComments, checkIndent) {
-  var lineBreaks = 0,
-      ch = state.input.charCodeAt(state.position);
-
-  while (ch !== 0) {
-    while (is_WHITE_SPACE(ch)) {
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    if (allowComments && ch === 0x23/* # */) {
-      do {
-        ch = state.input.charCodeAt(++state.position);
-      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0);
-    }
-
-    if (is_EOL(ch)) {
-      readLineBreak(state);
-
-      ch = state.input.charCodeAt(state.position);
-      lineBreaks++;
-      state.lineIndent = 0;
-
-      while (ch === 0x20/* Space */) {
-        state.lineIndent++;
-        ch = state.input.charCodeAt(++state.position);
-      }
-    } else {
-      break;
-    }
-  }
-
-  if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) {
-    throwWarning(state, 'deficient indentation');
-  }
-
-  return lineBreaks;
-}
-
-function testDocumentSeparator(state) {
-  var _position = state.position,
-      ch;
-
-  ch = state.input.charCodeAt(_position);
-
-  // Condition state.position === state.lineStart is tested
-  // in parent on each call, for efficiency. No needs to test here again.
-  if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) &&
-      ch === state.input.charCodeAt(_position + 1) &&
-      ch === state.input.charCodeAt(_position + 2)) {
-
-    _position += 3;
-
-    ch = state.input.charCodeAt(_position);
-
-    if (ch === 0 || is_WS_OR_EOL(ch)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-function writeFoldedLines(state, count) {
-  if (count === 1) {
-    state.result += ' ';
-  } else if (count > 1) {
-    state.result += common.repeat('\n', count - 1);
-  }
-}
-
-
-function readPlainScalar(state, nodeIndent, withinFlowCollection) {
-  var preceding,
-      following,
-      captureStart,
-      captureEnd,
-      hasPendingContent,
-      _line,
-      _lineStart,
-      _lineIndent,
-      _kind = state.kind,
-      _result = state.result,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (is_WS_OR_EOL(ch)      ||
-      is_FLOW_INDICATOR(ch) ||
-      ch === 0x23/* # */    ||
-      ch === 0x26/* & */    ||
-      ch === 0x2A/* * */    ||
-      ch === 0x21/* ! */    ||
-      ch === 0x7C/* | */    ||
-      ch === 0x3E/* > */    ||
-      ch === 0x27/* ' */    ||
-      ch === 0x22/* " */    ||
-      ch === 0x25/* % */    ||
-      ch === 0x40/* @ */    ||
-      ch === 0x60/* ` */) {
-    return false;
-  }
-
-  if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) {
-    following = state.input.charCodeAt(state.position + 1);
-
-    if (is_WS_OR_EOL(following) ||
-        withinFlowCollection && is_FLOW_INDICATOR(following)) {
-      return false;
-    }
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-  captureStart = captureEnd = state.position;
-  hasPendingContent = false;
-
-  while (ch !== 0) {
-    if (ch === 0x3A/* : */) {
-      following = state.input.charCodeAt(state.position + 1);
-
-      if (is_WS_OR_EOL(following) ||
-          withinFlowCollection && is_FLOW_INDICATOR(following)) {
-        break;
-      }
-
-    } else if (ch === 0x23/* # */) {
-      preceding = state.input.charCodeAt(state.position - 1);
-
-      if (is_WS_OR_EOL(preceding)) {
-        break;
-      }
-
-    } else if ((state.position === state.lineStart && testDocumentSeparator(state)) ||
-               withinFlowCollection && is_FLOW_INDICATOR(ch)) {
-      break;
-
-    } else if (is_EOL(ch)) {
-      _line = state.line;
-      _lineStart = state.lineStart;
-      _lineIndent = state.lineIndent;
-      skipSeparationSpace(state, false, -1);
-
-      if (state.lineIndent >= nodeIndent) {
-        hasPendingContent = true;
-        ch = state.input.charCodeAt(state.position);
-        continue;
-      } else {
-        state.position = captureEnd;
-        state.line = _line;
-        state.lineStart = _lineStart;
-        state.lineIndent = _lineIndent;
-        break;
-      }
-    }
-
-    if (hasPendingContent) {
-      captureSegment(state, captureStart, captureEnd, false);
-      writeFoldedLines(state, state.line - _line);
-      captureStart = captureEnd = state.position;
-      hasPendingContent = false;
-    }
-
-    if (!is_WHITE_SPACE(ch)) {
-      captureEnd = state.position + 1;
-    }
-
-    ch = state.input.charCodeAt(++state.position);
-  }
-
-  captureSegment(state, captureStart, captureEnd, false);
-
-  if (state.result) {
-    return true;
-  }
-
-  state.kind = _kind;
-  state.result = _result;
-  return false;
-}
-
-function readSingleQuotedScalar(state, nodeIndent) {
-  var ch,
-      captureStart, captureEnd;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x27/* ' */) {
-    return false;
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-  state.position++;
-  captureStart = captureEnd = state.position;
-
-  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
-    if (ch === 0x27/* ' */) {
-      captureSegment(state, captureStart, state.position, true);
-      ch = state.input.charCodeAt(++state.position);
-
-      if (ch === 0x27/* ' */) {
-        captureStart = captureEnd = state.position;
-        state.position++;
-      } else {
-        return true;
-      }
-
-    } else if (is_EOL(ch)) {
-      captureSegment(state, captureStart, captureEnd, true);
-      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));
-      captureStart = captureEnd = state.position;
-
-    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {
-      throwError(state, 'unexpected end of the document within a single quoted scalar');
-
-    } else {
-      state.position++;
-      captureEnd = state.position;
-    }
-  }
-
-  throwError(state, 'unexpected end of the stream within a single quoted scalar');
-}
-
-function readDoubleQuotedScalar(state, nodeIndent) {
-  var captureStart,
-      captureEnd,
-      hexLength,
-      hexResult,
-      tmp,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x22/* " */) {
-    return false;
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-  state.position++;
-  captureStart = captureEnd = state.position;
-
-  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
-    if (ch === 0x22/* " */) {
-      captureSegment(state, captureStart, state.position, true);
-      state.position++;
-      return true;
-
-    } else if (ch === 0x5C/* \ */) {
-      captureSegment(state, captureStart, state.position, true);
-      ch = state.input.charCodeAt(++state.position);
-
-      if (is_EOL(ch)) {
-        skipSeparationSpace(state, false, nodeIndent);
-
-        // TODO: rework to inline fn with no type cast?
-      } else if (ch < 256 && simpleEscapeCheck[ch]) {
-        state.result += simpleEscapeMap[ch];
-        state.position++;
-
-      } else if ((tmp = escapedHexLen(ch)) > 0) {
-        hexLength = tmp;
-        hexResult = 0;
-
-        for (; hexLength > 0; hexLength--) {
-          ch = state.input.charCodeAt(++state.position);
-
-          if ((tmp = fromHexCode(ch)) >= 0) {
-            hexResult = (hexResult << 4) + tmp;
-
-          } else {
-            throwError(state, 'expected hexadecimal character');
-          }
-        }
-
-        state.result += charFromCodepoint(hexResult);
-
-        state.position++;
-
-      } else {
-        throwError(state, 'unknown escape sequence');
-      }
-
-      captureStart = captureEnd = state.position;
-
-    } else if (is_EOL(ch)) {
-      captureSegment(state, captureStart, captureEnd, true);
-      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));
-      captureStart = captureEnd = state.position;
-
-    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {
-      throwError(state, 'unexpected end of the document within a double quoted scalar');
-
-    } else {
-      state.position++;
-      captureEnd = state.position;
-    }
-  }
-
-  throwError(state, 'unexpected end of the stream within a double quoted scalar');
-}
-
-function readFlowCollection(state, nodeIndent) {
-  var readNext = true,
-      _line,
-      _tag     = state.tag,
-      _result,
-      _anchor  = state.anchor,
-      following,
-      terminator,
-      isPair,
-      isExplicitPair,
-      isMapping,
-      overridableKeys = {},
-      keyNode,
-      keyTag,
-      valueNode,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch === 0x5B/* [ */) {
-    terminator = 0x5D;/* ] */
-    isMapping = false;
-    _result = [];
-  } else if (ch === 0x7B/* { */) {
-    terminator = 0x7D;/* } */
-    isMapping = true;
-    _result = {};
-  } else {
-    return false;
-  }
-
-  if (state.anchor !== null) {
-    state.anchorMap[state.anchor] = _result;
-  }
-
-  ch = state.input.charCodeAt(++state.position);
-
-  while (ch !== 0) {
-    skipSeparationSpace(state, true, nodeIndent);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if (ch === terminator) {
-      state.position++;
-      state.tag = _tag;
-      state.anchor = _anchor;
-      state.kind = isMapping ? 'mapping' : 'sequence';
-      state.result = _result;
-      return true;
-    } else if (!readNext) {
-      throwError(state, 'missed comma between flow collection entries');
-    }
-
-    keyTag = keyNode = valueNode = null;
-    isPair = isExplicitPair = false;
-
-    if (ch === 0x3F/* ? */) {
-      following = state.input.charCodeAt(state.position + 1);
-
-      if (is_WS_OR_EOL(following)) {
-        isPair = isExplicitPair = true;
-        state.position++;
-        skipSeparationSpace(state, true, nodeIndent);
-      }
-    }
-
-    _line = state.line;
-    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
-    keyTag = state.tag;
-    keyNode = state.result;
-    skipSeparationSpace(state, true, nodeIndent);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) {
-      isPair = true;
-      ch = state.input.charCodeAt(++state.position);
-      skipSeparationSpace(state, true, nodeIndent);
-      composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
-      valueNode = state.result;
-    }
-
-    if (isMapping) {
-      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
-    } else if (isPair) {
-      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));
-    } else {
-      _result.push(keyNode);
-    }
-
-    skipSeparationSpace(state, true, nodeIndent);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if (ch === 0x2C/* , */) {
-      readNext = true;
-      ch = state.input.charCodeAt(++state.position);
-    } else {
-      readNext = false;
-    }
-  }
-
-  throwError(state, 'unexpected end of the stream within a flow collection');
-}
-
-function readBlockScalar(state, nodeIndent) {
-  var captureStart,
-      folding,
-      chomping       = CHOMPING_CLIP,
-      didReadContent = false,
-      detectedIndent = false,
-      textIndent     = nodeIndent,
-      emptyLines     = 0,
-      atMoreIndented = false,
-      tmp,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch === 0x7C/* | */) {
-    folding = false;
-  } else if (ch === 0x3E/* > */) {
-    folding = true;
-  } else {
-    return false;
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-
-  while (ch !== 0) {
-    ch = state.input.charCodeAt(++state.position);
-
-    if (ch === 0x2B/* + */ || ch === 0x2D/* - */) {
-      if (CHOMPING_CLIP === chomping) {
-        chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP;
-      } else {
-        throwError(state, 'repeat of a chomping mode identifier');
-      }
-
-    } else if ((tmp = fromDecimalCode(ch)) >= 0) {
-      if (tmp === 0) {
-        throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one');
-      } else if (!detectedIndent) {
-        textIndent = nodeIndent + tmp - 1;
-        detectedIndent = true;
-      } else {
-        throwError(state, 'repeat of an indentation width identifier');
-      }
-
-    } else {
-      break;
-    }
-  }
-
-  if (is_WHITE_SPACE(ch)) {
-    do { ch = state.input.charCodeAt(++state.position); }
-    while (is_WHITE_SPACE(ch));
-
-    if (ch === 0x23/* # */) {
-      do { ch = state.input.charCodeAt(++state.position); }
-      while (!is_EOL(ch) && (ch !== 0));
-    }
-  }
-
-  while (ch !== 0) {
-    readLineBreak(state);
-    state.lineIndent = 0;
-
-    ch = state.input.charCodeAt(state.position);
-
-    while ((!detectedIndent || state.lineIndent < textIndent) &&
-           (ch === 0x20/* Space */)) {
-      state.lineIndent++;
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    if (!detectedIndent && state.lineIndent > textIndent) {
-      textIndent = state.lineIndent;
-    }
-
-    if (is_EOL(ch)) {
-      emptyLines++;
-      continue;
-    }
-
-    // End of the scalar.
-    if (state.lineIndent < textIndent) {
-
-      // Perform the chomping.
-      if (chomping === CHOMPING_KEEP) {
-        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
-      } else if (chomping === CHOMPING_CLIP) {
-        if (didReadContent) { // i.e. only if the scalar is not empty.
-          state.result += '\n';
-        }
-      }
-
-      // Break this `while` cycle and go to the funciton's epilogue.
-      break;
-    }
-
-    // Folded style: use fancy rules to handle line breaks.
-    if (folding) {
-
-      // Lines starting with white space characters (more-indented lines) are not folded.
-      if (is_WHITE_SPACE(ch)) {
-        atMoreIndented = true;
-        // except for the first content line (cf. Example 8.1)
-        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
-
-      // End of more-indented block.
-      } else if (atMoreIndented) {
-        atMoreIndented = false;
-        state.result += common.repeat('\n', emptyLines + 1);
-
-      // Just one line break - perceive as the same line.
-      } else if (emptyLines === 0) {
-        if (didReadContent) { // i.e. only if we have already read some scalar content.
-          state.result += ' ';
-        }
-
-      // Several line breaks - perceive as different lines.
-      } else {
-        state.result += common.repeat('\n', emptyLines);
-      }
-
-    // Literal style: just add exact number of line breaks between content lines.
-    } else {
-      // Keep all line breaks except the header line break.
-      state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
-    }
-
-    didReadContent = true;
-    detectedIndent = true;
-    emptyLines = 0;
-    captureStart = state.position;
-
-    while (!is_EOL(ch) && (ch !== 0)) {
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    captureSegment(state, captureStart, state.position, false);
-  }
-
-  return true;
-}
-
-function readBlockSequence(state, nodeIndent) {
-  var _line,
-      _tag      = state.tag,
-      _anchor   = state.anchor,
-      _result   = [],
-      following,
-      detected  = false,
-      ch;
-
-  if (state.anchor !== null) {
-    state.anchorMap[state.anchor] = _result;
-  }
-
-  ch = state.input.charCodeAt(state.position);
-
-  while (ch !== 0) {
-
-    if (ch !== 0x2D/* - */) {
-      break;
-    }
-
-    following = state.input.charCodeAt(state.position + 1);
-
-    if (!is_WS_OR_EOL(following)) {
-      break;
-    }
-
-    detected = true;
-    state.position++;
-
-    if (skipSeparationSpace(state, true, -1)) {
-      if (state.lineIndent <= nodeIndent) {
-        _result.push(null);
-        ch = state.input.charCodeAt(state.position);
-        continue;
-      }
-    }
-
-    _line = state.line;
-    composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true);
-    _result.push(state.result);
-    skipSeparationSpace(state, true, -1);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {
-      throwError(state, 'bad indentation of a sequence entry');
-    } else if (state.lineIndent < nodeIndent) {
-      break;
-    }
-  }
-
-  if (detected) {
-    state.tag = _tag;
-    state.anchor = _anchor;
-    state.kind = 'sequence';
-    state.result = _result;
-    return true;
-  }
-  return false;
-}
-
-function readBlockMapping(state, nodeIndent, flowIndent) {
-  var following,
-      allowCompact,
-      _line,
-      _tag          = state.tag,
-      _anchor       = state.anchor,
-      _result       = {},
-      overridableKeys = {},
-      keyTag        = null,
-      keyNode       = null,
-      valueNode     = null,
-      atExplicitKey = false,
-      detected      = false,
-      ch;
-
-  if (state.anchor !== null) {
-    state.anchorMap[state.anchor] = _result;
-  }
-
-  ch = state.input.charCodeAt(state.position);
-
-  while (ch !== 0) {
-    following = state.input.charCodeAt(state.position + 1);
-    _line = state.line; // Save the current line.
-
-    //
-    // Explicit notation case. There are two separate blocks:
-    // first for the key (denoted by "?") and second for the value (denoted by ":")
-    //
-    if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) {
-
-      if (ch === 0x3F/* ? */) {
-        if (atExplicitKey) {
-          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
-          keyTag = keyNode = valueNode = null;
-        }
-
-        detected = true;
-        atExplicitKey = true;
-        allowCompact = true;
-
-      } else if (atExplicitKey) {
-        // i.e. 0x3A/* : */ === character after the explicit key.
-        atExplicitKey = false;
-        allowCompact = true;
-
-      } else {
-        throwError(state, 'incomplete explicit mapping pair; a key node is missed');
-      }
-
-      state.position += 1;
-      ch = following;
-
-    //
-    // Implicit notation case. Flow-style node as the key first, then ":", and the value.
-    //
-    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {
-
-      if (state.line === _line) {
-        ch = state.input.charCodeAt(state.position);
-
-        while (is_WHITE_SPACE(ch)) {
-          ch = state.input.charCodeAt(++state.position);
-        }
-
-        if (ch === 0x3A/* : */) {
-          ch = state.input.charCodeAt(++state.position);
-
-          if (!is_WS_OR_EOL(ch)) {
-            throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping');
-          }
-
-          if (atExplicitKey) {
-            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
-            keyTag = keyNode = valueNode = null;
-          }
-
-          detected = true;
-          atExplicitKey = false;
-          allowCompact = false;
-          keyTag = state.tag;
-          keyNode = state.result;
-
-        } else if (detected) {
-          throwError(state, 'can not read an implicit mapping pair; a colon is missed');
-
-        } else {
-          state.tag = _tag;
-          state.anchor = _anchor;
-          return true; // Keep the result of `composeNode`.
-        }
-
-      } else if (detected) {
-        throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key');
-
-      } else {
-        state.tag = _tag;
-        state.anchor = _anchor;
-        return true; // Keep the result of `composeNode`.
-      }
-
-    } else {
-      break; // Reading is done. Go to the epilogue.
-    }
-
-    //
-    // Common reading code for both explicit and implicit notations.
-    //
-    if (state.line === _line || state.lineIndent > nodeIndent) {
-      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {
-        if (atExplicitKey) {
-          keyNode = state.result;
-        } else {
-          valueNode = state.result;
-        }
-      }
-
-      if (!atExplicitKey) {
-        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
-        keyTag = keyNode = valueNode = null;
-      }
-
-      skipSeparationSpace(state, true, -1);
-      ch = state.input.charCodeAt(state.position);
-    }
-
-    if (state.lineIndent > nodeIndent && (ch !== 0)) {
-      throwError(state, 'bad indentation of a mapping entry');
-    } else if (state.lineIndent < nodeIndent) {
-      break;
-    }
-  }
-
-  //
-  // Epilogue.
-  //
-
-  // Special case: last mapping's node contains only the key in explicit notation.
-  if (atExplicitKey) {
-    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
-  }
-
-  // Expose the resulting mapping.
-  if (detected) {
-    state.tag = _tag;
-    state.anchor = _anchor;
-    state.kind = 'mapping';
-    state.result = _result;
-  }
-
-  return detected;
-}
-
-function readTagProperty(state) {
-  var _position,
-      isVerbatim = false,
-      isNamed    = false,
-      tagHandle,
-      tagName,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x21/* ! */) return false;
-
-  if (state.tag !== null) {
-    throwError(state, 'duplication of a tag property');
-  }
-
-  ch = state.input.charCodeAt(++state.position);
-
-  if (ch === 0x3C/* < */) {
-    isVerbatim = true;
-    ch = state.input.charCodeAt(++state.position);
-
-  } else if (ch === 0x21/* ! */) {
-    isNamed = true;
-    tagHandle = '!!';
-    ch = state.input.charCodeAt(++state.position);
-
-  } else {
-    tagHandle = '!';
-  }
-
-  _position = state.position;
-
-  if (isVerbatim) {
-    do { ch = state.input.charCodeAt(++state.position); }
-    while (ch !== 0 && ch !== 0x3E/* > */);
-
-    if (state.position < state.length) {
-      tagName = state.input.slice(_position, state.position);
-      ch = state.input.charCodeAt(++state.position);
-    } else {
-      throwError(state, 'unexpected end of the stream within a verbatim tag');
-    }
-  } else {
-    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
-
-      if (ch === 0x21/* ! */) {
-        if (!isNamed) {
-          tagHandle = state.input.slice(_position - 1, state.position + 1);
-
-          if (!PATTERN_TAG_HANDLE.test(tagHandle)) {
-            throwError(state, 'named tag handle cannot contain such characters');
-          }
-
-          isNamed = true;
-          _position = state.position + 1;
-        } else {
-          throwError(state, 'tag suffix cannot contain exclamation marks');
-        }
-      }
-
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    tagName = state.input.slice(_position, state.position);
-
-    if (PATTERN_FLOW_INDICATORS.test(tagName)) {
-      throwError(state, 'tag suffix cannot contain flow indicator characters');
-    }
-  }
-
-  if (tagName && !PATTERN_TAG_URI.test(tagName)) {
-    throwError(state, 'tag name cannot contain such characters: ' + tagName);
-  }
-
-  if (isVerbatim) {
-    state.tag = tagName;
-
-  } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {
-    state.tag = state.tagMap[tagHandle] + tagName;
-
-  } else if (tagHandle === '!') {
-    state.tag = '!' + tagName;
-
-  } else if (tagHandle === '!!') {
-    state.tag = 'tag:yaml.org,2002:' + tagName;
-
-  } else {
-    throwError(state, 'undeclared tag handle "' + tagHandle + '"');
-  }
-
-  return true;
-}
-
-function readAnchorProperty(state) {
-  var _position,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x26/* & */) return false;
-
-  if (state.anchor !== null) {
-    throwError(state, 'duplication of an anchor property');
-  }
-
-  ch = state.input.charCodeAt(++state.position);
-  _position = state.position;
-
-  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
-    ch = state.input.charCodeAt(++state.position);
-  }
-
-  if (state.position === _position) {
-    throwError(state, 'name of an anchor node must contain at least one character');
-  }
-
-  state.anchor = state.input.slice(_position, state.position);
-  return true;
-}
-
-function readAlias(state) {
-  var _position, alias,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x2A/* * */) return false;
-
-  ch = state.input.charCodeAt(++state.position);
-  _position = state.position;
-
-  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
-    ch = state.input.charCodeAt(++state.position);
-  }
-
-  if (state.position === _position) {
-    throwError(state, 'name of an alias node must contain at least one character');
-  }
-
-  alias = state.input.slice(_position, state.position);
-
-  if (!state.anchorMap.hasOwnProperty(alias)) {
-    throwError(state, 'unidentified alias "' + alias + '"');
-  }
-
-  state.result = state.anchorMap[alias];
-  skipSeparationSpace(state, true, -1);
-  return true;
-}
-
-function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) {
-  var allowBlockStyles,
-      allowBlockScalars,
-      allowBlockCollections,
-      indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this<parent
-      atNewLine  = false,
-      hasContent = false,
-      typeIndex,
-      typeQuantity,
-      type,
-      flowIndent,
-      blockIndent;
-
-  if (state.listener !== null) {
-    state.listener('open', state);
-  }
-
-  state.tag    = null;
-  state.anchor = null;
-  state.kind   = null;
-  state.result = null;
-
-  allowBlockStyles = allowBlockScalars = allowBlockCollections =
-    CONTEXT_BLOCK_OUT === nodeContext ||
-    CONTEXT_BLOCK_IN  === nodeContext;
-
-  if (allowToSeek) {
-    if (skipSeparationSpace(state, true, -1)) {
-      atNewLine = true;
-
-      if (state.lineIndent > parentIndent) {
-        indentStatus = 1;
-      } else if (state.lineIndent === parentIndent) {
-        indentStatus = 0;
-      } else if (state.lineIndent < parentIndent) {
-        indentStatus = -1;
-      }
-    }
-  }
-
-  if (indentStatus === 1) {
-    while (readTagProperty(state) || readAnchorProperty(state)) {
-      if (skipSeparationSpace(state, true, -1)) {
-        atNewLine = true;
-        allowBlockCollections = allowBlockStyles;
-
-        if (state.lineIndent > parentIndent) {
-          indentStatus = 1;
-        } else if (state.lineIndent === parentIndent) {
-          indentStatus = 0;
-        } else if (state.lineIndent < parentIndent) {
-          indentStatus = -1;
-        }
-      } else {
-        allowBlockCollections = false;
-      }
-    }
-  }
-
-  if (allowBlockCollections) {
-    allowBlockCollections = atNewLine || allowCompact;
-  }
-
-  if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {
-    if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {
-      flowIndent = parentIndent;
-    } else {
-      flowIndent = parentIndent + 1;
-    }
-
-    blockIndent = state.position - state.lineStart;
-
-    if (indentStatus === 1) {
-      if (allowBlockCollections &&
-          (readBlockSequence(state, blockIndent) ||
-           readBlockMapping(state, blockIndent, flowIndent)) ||
-          readFlowCollection(state, flowIndent)) {
-        hasContent = true;
-      } else {
-        if ((allowBlockScalars && readBlockScalar(state, flowIndent)) ||
-            readSingleQuotedScalar(state, flowIndent) ||
-            readDoubleQuotedScalar(state, flowIndent)) {
-          hasContent = true;
-
-        } else if (readAlias(state)) {
-          hasContent = true;
-
-          if (state.tag !== null || state.anchor !== null) {
-            throwError(state, 'alias node should not have any properties');
-          }
-
-        } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {
-          hasContent = true;
-
-          if (state.tag === null) {
-            state.tag = '?';
-          }
-        }
-
-        if (state.anchor !== null) {
-          state.anchorMap[state.anchor] = state.result;
-        }
-      }
-    } else if (indentStatus === 0) {
-      // Special case: block sequences are allowed to have same indentation level as the parent.
-      // http://www.yaml.org/spec/1.2/spec.html#id2799784
-      hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);
-    }
-  }
-
-  if (state.tag !== null && state.tag !== '!') {
-    if (state.tag === '?') {
-      for (typeIndex = 0, typeQuantity = state.implicitTypes.length;
-           typeIndex < typeQuantity;
-           typeIndex += 1) {
-        type = state.implicitTypes[typeIndex];
-
-        // Implicit resolving is not allowed for non-scalar types, and '?'
-        // non-specific tag is only assigned to plain scalars. So, it isn't
-        // needed to check for 'kind' conformity.
-
-        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched
-          state.result = type.construct(state.result);
-          state.tag = type.tag;
-          if (state.anchor !== null) {
-            state.anchorMap[state.anchor] = state.result;
-          }
-          break;
-        }
-      }
-    } else if (_hasOwnProperty.call(state.typeMap, state.tag)) {
-      type = state.typeMap[state.tag];
-
-      if (state.result !== null && type.kind !== state.kind) {
-        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');
-      }
-
-      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched
-        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');
-      } else {
-        state.result = type.construct(state.result);
-        if (state.anchor !== null) {
-          state.anchorMap[state.anchor] = state.result;
-        }
-      }
-    } else {
-      throwError(state, 'unknown tag !<' + state.tag + '>');
-    }
-  }
-
-  if (state.listener !== null) {
-    state.listener('close', state);
-  }
-  return state.tag !== null ||  state.anchor !== null || hasContent;
-}
-
-function readDocument(state) {
-  var documentStart = state.position,
-      _position,
-      directiveName,
-      directiveArgs,
-      hasDirectives = false,
-      ch;
-
-  state.version = null;
-  state.checkLineBreaks = state.legacy;
-  state.tagMap = {};
-  state.anchorMap = {};
-
-  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
-    skipSeparationSpace(state, true, -1);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if (state.lineIndent > 0 || ch !== 0x25/* % */) {
-      break;
-    }
-
-    hasDirectives = true;
-    ch = state.input.charCodeAt(++state.position);
-    _position = state.position;
-
-    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    directiveName = state.input.slice(_position, state.position);
-    directiveArgs = [];
-
-    if (directiveName.length < 1) {
-      throwError(state, 'directive name must not be less than one character in length');
-    }
-
-    while (ch !== 0) {
-      while (is_WHITE_SPACE(ch)) {
-        ch = state.input.charCodeAt(++state.position);
-      }
-
-      if (ch === 0x23/* # */) {
-        do { ch = state.input.charCodeAt(++state.position); }
-        while (ch !== 0 && !is_EOL(ch));
-        break;
-      }
-
-      if (is_EOL(ch)) break;
-
-      _position = state.position;
-
-      while (ch !== 0 && !is_WS_OR_EOL(ch)) {
-        ch = state.input.charCodeAt(++state.position);
-      }
-
-      directiveArgs.push(state.input.slice(_position, state.position));
-    }
-
-    if (ch !== 0) readLineBreak(state);
-
-    if (_hasOwnProperty.call(directiveHandlers, directiveName)) {
-      directiveHandlers[directiveName](state, directiveName, directiveArgs);
-    } else {
-      throwWarning(state, 'unknown document directive "' + directiveName + '"');
-    }
-  }
-
-  skipSeparationSpace(state, true, -1);
-
-  if (state.lineIndent === 0 &&
-      state.input.charCodeAt(state.position)     === 0x2D/* - */ &&
-      state.input.charCodeAt(state.position + 1) === 0x2D/* - */ &&
-      state.input.charCodeAt(state.position + 2) === 0x2D/* - */) {
-    state.position += 3;
-    skipSeparationSpace(state, true, -1);
-
-  } else if (hasDirectives) {
-    throwError(state, 'directives end mark is expected');
-  }
-
-  composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true);
-  skipSeparationSpace(state, true, -1);
-
-  if (state.checkLineBreaks &&
-      PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) {
-    throwWarning(state, 'non-ASCII line breaks are interpreted as content');
-  }
-
-  state.documents.push(state.result);
-
-  if (state.position === state.lineStart && testDocumentSeparator(state)) {
-
-    if (state.input.charCodeAt(state.position) === 0x2E/* . */) {
-      state.position += 3;
-      skipSeparationSpace(state, true, -1);
-    }
-    return;
-  }
-
-  if (state.position < (state.length - 1)) {
-    throwError(state, 'end of the stream or a document separator is expected');
-  } else {
-    return;
-  }
-}
-
-
-function loadDocuments(input, options) {
-  input = String(input);
-  options = options || {};
-
-  if (input.length !== 0) {
-
-    // Add tailing `\n` if not exists
-    if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ &&
-        input.charCodeAt(input.length - 1) !== 0x0D/* CR */) {
-      input += '\n';
-    }
-
-    // Strip BOM
-    if (input.charCodeAt(0) === 0xFEFF) {
-      input = input.slice(1);
-    }
-  }
-
-  var state = new State(input, options);
-
-  // Use 0 as string terminator. That significantly simplifies bounds check.
-  state.input += '\0';
-
-  while (state.input.charCodeAt(state.position) === 0x20/* Space */) {
-    state.lineIndent += 1;
-    state.position += 1;
-  }
-
-  while (state.position < (state.length - 1)) {
-    readDocument(state);
-  }
-
-  return state.documents;
-}
-
-
-function loadAll(input, iterator, options) {
-  var documents = loadDocuments(input, options), index, length;
-
-  for (index = 0, length = documents.length; index < length; index += 1) {
-    iterator(documents[index]);
-  }
-}
-
-
-function load(input, options) {
-  var documents = loadDocuments(input, options);
-
-  if (documents.length === 0) {
-    /*eslint-disable no-undefined*/
-    return undefined;
-  } else if (documents.length === 1) {
-    return documents[0];
-  }
-  throw new YAMLException('expected a single document in the stream, but found more');
-}
-
-
-function safeLoadAll(input, output, options) {
-  loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-}
-
-
-function safeLoad(input, options) {
-  return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-}
-
-
-module.exports.loadAll     = loadAll;
-module.exports.load        = load;
-module.exports.safeLoadAll = safeLoadAll;
-module.exports.safeLoad    = safeLoad;
-
-},{"./common":21,"./exception":23,"./mark":25,"./schema/default_full":28,"./schema/default_safe":29}],25:[function(require,module,exports){
-'use strict';
-
-
-var common = require('./common');
-
-
-function Mark(name, buffer, position, line, column) {
-  this.name     = name;
-  this.buffer   = buffer;
-  this.position = position;
-  this.line     = line;
-  this.column   = column;
-}
-
-
-Mark.prototype.getSnippet = function getSnippet(indent, maxLength) {
-  var head, start, tail, end, snippet;
-
-  if (!this.buffer) return null;
-
-  indent = indent || 4;
-  maxLength = maxLength || 75;
-
-  head = '';
-  start = this.position;
-
-  while (start > 0 && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {
-    start -= 1;
-    if (this.position - start > (maxLength / 2 - 1)) {
-      head = ' ... ';
-      start += 5;
-      break;
-    }
-  }
-
-  tail = '';
-  end = this.position;
-
-  while (end < this.buffer.length && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end)) === -1) {
-    end += 1;
-    if (end - this.position > (maxLength / 2 - 1)) {
-      tail = ' ... ';
-      end -= 5;
-      break;
-    }
-  }
-
-  snippet = this.buffer.slice(start, end);
-
-  return common.repeat(' ', indent) + head + snippet + tail + '\n' +
-         common.repeat(' ', indent + this.position - start + head.length) + '^';
-};
-
-
-Mark.prototype.toString = function toString(compact) {
-  var snippet, where = '';
-
-  if (this.name) {
-    where += 'in "' + this.name + '" ';
-  }
-
-  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);
-
-  if (!compact) {
-    snippet = this.getSnippet();
-
-    if (snippet) {
-      where += ':\n' + snippet;
-    }
-  }
-
-  return where;
-};
-
-
-module.exports = Mark;
-
-},{"./common":21}],26:[function(require,module,exports){
-'use strict';
-
-/*eslint-disable max-len*/
-
-var common        = require('./common');
-var YAMLException = require('./exception');
-var Type          = require('./type');
-
-
-function compileList(schema, name, result) {
-  var exclude = [];
-
-  schema.include.forEach(function (includedSchema) {
-    result = compileList(includedSchema, name, result);
-  });
-
-  schema[name].forEach(function (currentType) {
-    result.forEach(function (previousType, previousIndex) {
-      if (previousType.tag === currentType.tag) {
-        exclude.push(previousIndex);
-      }
-    });
-
-    result.push(currentType);
-  });
-
-  return result.filter(function (type, index) {
-    return exclude.indexOf(index) === -1;
-  });
-}
-
-
-function compileMap(/* lists... */) {
-  var result = {}, index, length;
-
-  function collectType(type) {
-    result[type.tag] = type;
-  }
-
-  for (index = 0, length = arguments.length; index < length; index += 1) {
-    arguments[index].forEach(collectType);
-  }
-
-  return result;
-}
-
-
-function Schema(definition) {
-  this.include  = definition.include  || [];
-  this.implicit = definition.implicit || [];
-  this.explicit = definition.explicit || [];
-
-  this.implicit.forEach(function (type) {
-    if (type.loadKind && type.loadKind !== 'scalar') {
-      throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');
-    }
-  });
-
-  this.compiledImplicit = compileList(this, 'implicit', []);
-  this.compiledExplicit = compileList(this, 'explicit', []);
-  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);
-}
-
-
-Schema.DEFAULT = null;
-
-
-Schema.create = function createSchema() {
-  var schemas, types;
-
-  switch (arguments.length) {
-    case 1:
-      schemas = Schema.DEFAULT;
-      types = arguments[0];
-      break;
-
-    case 2:
-      schemas = arguments[0];
-      types = arguments[1];
-      break;
-
-    default:
-      throw new YAMLException('Wrong number of arguments for Schema.create function');
-  }
-
-  schemas = common.toArray(schemas);
-  types = common.toArray(types);
-
-  if (!schemas.every(function (schema) { return schema instanceof Schema; })) {
-    throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');
-  }
-
-  if (!types.every(function (type) { return type instanceof Type; })) {
-    throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.');
-  }
-
-  return new Schema({
-    include: schemas,
-    explicit: types
-  });
-};
-
-
-module.exports = Schema;
-
-},{"./common":21,"./exception":23,"./type":32}],27:[function(require,module,exports){
-// Standard YAML's Core schema.
-// http://www.yaml.org/spec/1.2/spec.html#id2804923
-//
-// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.
-// So, Core schema has no distinctions from JSON schema is JS-YAML.
-
-
-'use strict';
-
-
-var Schema = require('../schema');
-
-
-module.exports = new Schema({
-  include: [
-    require('./json')
-  ]
-});
-
-},{"../schema":26,"./json":31}],28:[function(require,module,exports){
-// JS-YAML's default schema for `load` function.
-// It is not described in the YAML specification.
-//
-// This schema is based on JS-YAML's default safe schema and includes
-// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function.
-//
-// Also this schema is used as default base schema at `Schema.create` function.
-
-
-'use strict';
-
-
-var Schema = require('../schema');
-
-
-module.exports = Schema.DEFAULT = new Schema({
-  include: [
-    require('./default_safe')
-  ],
-  explicit: [
-    require('../type/js/undefined'),
-    require('../type/js/regexp'),
-    require('../type/js/function')
-  ]
-});
-
-},{"../schema":26,"../type/js/function":37,"../type/js/regexp":38,"../type/js/undefined":39,"./default_safe":29}],29:[function(require,module,exports){
-// JS-YAML's default schema for `safeLoad` function.
-// It is not described in the YAML specification.
-//
-// This schema is based on standard YAML's Core schema and includes most of
-// extra types described at YAML tag repository. (http://yaml.org/type/)
-
-
-'use strict';
-
-
-var Schema = require('../schema');
-
-
-module.exports = new Schema({
-  include: [
-    require('./core')
-  ],
-  implicit: [
-    require('../type/timestamp'),
-    require('../type/merge')
-  ],
-  explicit: [
-    require('../type/binary'),
-    require('../type/omap'),
-    require('../type/pairs'),
-    require('../type/set')
-  ]
-});
-
-},{"../schema":26,"../type/binary":33,"../type/merge":41,"../type/omap":43,"../type/pairs":44,"../type/set":46,"../type/timestamp":48,"./core":27}],30:[function(require,module,exports){
-// Standard YAML's Failsafe schema.
-// http://www.yaml.org/spec/1.2/spec.html#id2802346
-
-
-'use strict';
-
-
-var Schema = require('../schema');
-
-
-module.exports = new Schema({
-  explicit: [
-    require('../type/str'),
-    require('../type/seq'),
-    require('../type/map')
-  ]
-});
-
-},{"../schema":26,"../type/map":40,"../type/seq":45,"../type/str":47}],31:[function(require,module,exports){
-// Standard YAML's JSON schema.
-// http://www.yaml.org/spec/1.2/spec.html#id2803231
-//
-// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.
-// So, this schema is not such strict as defined in the YAML specification.
-// It allows numbers in binary notaion, use `Null` and `NULL` as `null`, etc.
-
-
-'use strict';
-
-
-var Schema = require('../schema');
-
-
-module.exports = new Schema({
-  include: [
-    require('./failsafe')
-  ],
-  implicit: [
-    require('../type/null'),
-    require('../type/bool'),
-    require('../type/int'),
-    require('../type/float')
-  ]
-});
-
-},{"../schema":26,"../type/bool":34,"../type/float":35,"../type/int":36,"../type/null":42,"./failsafe":30}],32:[function(require,module,exports){
-'use strict';
-
-var YAMLException = require('./exception');
-
-var TYPE_CONSTRUCTOR_OPTIONS = [
-  'kind',
-  'resolve',
-  'construct',
-  'instanceOf',
-  'predicate',
-  'represent',
-  'defaultStyle',
-  'styleAliases'
-];
-
-var YAML_NODE_KINDS = [
-  'scalar',
-  'sequence',
-  'mapping'
-];
-
-function compileStyleAliases(map) {
-  var result = {};
-
-  if (map !== null) {
-    Object.keys(map).forEach(function (style) {
-      map[style].forEach(function (alias) {
-        result[String(alias)] = style;
-      });
-    });
-  }
-
-  return result;
-}
-
-function Type(tag, options) {
-  options = options || {};
-
-  Object.keys(options).forEach(function (name) {
-    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {
-      throw new YAMLException('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.');
-    }
-  });
-
-  // TODO: Add tag format check.
-  this.tag          = tag;
-  this.kind         = options['kind']         || null;
-  this.resolve      = options['resolve']      || function () { return true; };
-  this.construct    = options['construct']    || function (data) { return data; };
-  this.instanceOf   = options['instanceOf']   || null;
-  this.predicate    = options['predicate']    || null;
-  this.represent    = options['represent']    || null;
-  this.defaultStyle = options['defaultStyle'] || null;
-  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);
-
-  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {
-    throw new YAMLException('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.');
-  }
-}
-
-module.exports = Type;
-
-},{"./exception":23}],33:[function(require,module,exports){
-'use strict';
-
-/*eslint-disable no-bitwise*/
-
-var NodeBuffer;
-
-try {
-  // A trick for browserified version, to not include `Buffer` shim
-  var _require = require;
-  NodeBuffer = _require('buffer').Buffer;
-} catch (__) {}
-
-var Type       = require('../type');
-
-
-// [ 64, 65, 66 ] -> [ padding, CR, LF ]
-var BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r';
-
-
-function resolveYamlBinary(data) {
-  if (data === null) return false;
-
-  var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;
-
-  // Convert one by one.
-  for (idx = 0; idx < max; idx++) {
-    code = map.indexOf(data.charAt(idx));
-
-    // Skip CR/LF
-    if (code > 64) continue;
-
-    // Fail on illegal characters
-    if (code < 0) return false;
-
-    bitlen += 6;
-  }
-
-  // If there are any bits left, source was corrupted
-  return (bitlen % 8) === 0;
-}
-
-function constructYamlBinary(data) {
-  var idx, tailbits,
-      input = data.replace(/[\r\n=]/g, ''), // remove CR/LF & padding to simplify scan
-      max = input.length,
-      map = BASE64_MAP,
-      bits = 0,
-      result = [];
-
-  // Collect by 6*4 bits (3 bytes)
-
-  for (idx = 0; idx < max; idx++) {
-    if ((idx % 4 === 0) && idx) {
-      result.push((bits >> 16) & 0xFF);
-      result.push((bits >> 8) & 0xFF);
-      result.push(bits & 0xFF);
-    }
-
-    bits = (bits << 6) | map.indexOf(input.charAt(idx));
-  }
-
-  // Dump tail
-
-  tailbits = (max % 4) * 6;
-
-  if (tailbits === 0) {
-    result.push((bits >> 16) & 0xFF);
-    result.push((bits >> 8) & 0xFF);
-    result.push(bits & 0xFF);
-  } else if (tailbits === 18) {
-    result.push((bits >> 10) & 0xFF);
-    result.push((bits >> 2) & 0xFF);
-  } else if (tailbits === 12) {
-    result.push((bits >> 4) & 0xFF);
-  }
-
-  // Wrap into Buffer for NodeJS and leave Array for browser
-  if (NodeBuffer) return new NodeBuffer(result);
-
-  return result;
-}
-
-function representYamlBinary(object /*, style*/) {
-  var result = '', bits = 0, idx, tail,
-      max = object.length,
-      map = BASE64_MAP;
-
-  // Convert every three bytes to 4 ASCII characters.
-
-  for (idx = 0; idx < max; idx++) {
-    if ((idx % 3 === 0) && idx) {
-      result += map[(bits >> 18) & 0x3F];
-      result += map[(bits >> 12) & 0x3F];
-      result += map[(bits >> 6) & 0x3F];
-      result += map[bits & 0x3F];
-    }
-
-    bits = (bits << 8) + object[idx];
-  }
-
-  // Dump tail
-
-  tail = max % 3;
-
-  if (tail === 0) {
-    result += map[(bits >> 18) & 0x3F];
-    result += map[(bits >> 12) & 0x3F];
-    result += map[(bits >> 6) & 0x3F];
-    result += map[bits & 0x3F];
-  } else if (tail === 2) {
-    result += map[(bits >> 10) & 0x3F];
-    result += map[(bits >> 4) & 0x3F];
-    result += map[(bits << 2) & 0x3F];
-    result += map[64];
-  } else if (tail === 1) {
-    result += map[(bits >> 2) & 0x3F];
-    result += map[(bits << 4) & 0x3F];
-    result += map[64];
-    result += map[64];
-  }
-
-  return result;
-}
-
-function isBinary(object) {
-  return NodeBuffer && NodeBuffer.isBuffer(object);
-}
-
-module.exports = new Type('tag:yaml.org,2002:binary', {
-  kind: 'scalar',
-  resolve: resolveYamlBinary,
-  construct: constructYamlBinary,
-  predicate: isBinary,
-  represent: representYamlBinary
-});
-
-},{"../type":32}],34:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-function resolveYamlBoolean(data) {
-  if (data === null) return false;
-
-  var max = data.length;
-
-  return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) ||
-         (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE'));
-}
-
-function constructYamlBoolean(data) {
-  return data === 'true' ||
-         data === 'True' ||
-         data === 'TRUE';
-}
-
-function isBoolean(object) {
-  return Object.prototype.toString.call(object) === '[object Boolean]';
-}
-
-module.exports = new Type('tag:yaml.org,2002:bool', {
-  kind: 'scalar',
-  resolve: resolveYamlBoolean,
-  construct: constructYamlBoolean,
-  predicate: isBoolean,
-  represent: {
-    lowercase: function (object) { return object ? 'true' : 'false'; },
-    uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; },
-    camelcase: function (object) { return object ? 'True' : 'False'; }
-  },
-  defaultStyle: 'lowercase'
-});
-
-},{"../type":32}],35:[function(require,module,exports){
-'use strict';
-
-var common = require('../common');
-var Type   = require('../type');
-
-var YAML_FLOAT_PATTERN = new RegExp(
-  '^(?:[-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+][0-9]+)?' +
-  '|\\.[0-9_]+(?:[eE][-+][0-9]+)?' +
-  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*' +
-  '|[-+]?\\.(?:inf|Inf|INF)' +
-  '|\\.(?:nan|NaN|NAN))$');
-
-function resolveYamlFloat(data) {
-  if (data === null) return false;
-
-  if (!YAML_FLOAT_PATTERN.test(data)) return false;
-
-  return true;
-}
-
-function constructYamlFloat(data) {
-  var value, sign, base, digits;
-
-  value  = data.replace(/_/g, '').toLowerCase();
-  sign   = value[0] === '-' ? -1 : 1;
-  digits = [];
-
-  if ('+-'.indexOf(value[0]) >= 0) {
-    value = value.slice(1);
-  }
-
-  if (value === '.inf') {
-    return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
-
-  } else if (value === '.nan') {
-    return NaN;
-
-  } else if (value.indexOf(':') >= 0) {
-    value.split(':').forEach(function (v) {
-      digits.unshift(parseFloat(v, 10));
-    });
-
-    value = 0.0;
-    base = 1;
-
-    digits.forEach(function (d) {
-      value += d * base;
-      base *= 60;
-    });
-
-    return sign * value;
-
-  }
-  return sign * parseFloat(value, 10);
-}
-
-
-var SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/;
-
-function representYamlFloat(object, style) {
-  var res;
-
-  if (isNaN(object)) {
-    switch (style) {
-      case 'lowercase': return '.nan';
-      case 'uppercase': return '.NAN';
-      case 'camelcase': return '.NaN';
-    }
-  } else if (Number.POSITIVE_INFINITY === object) {
-    switch (style) {
-      case 'lowercase': return '.inf';
-      case 'uppercase': return '.INF';
-      case 'camelcase': return '.Inf';
-    }
-  } else if (Number.NEGATIVE_INFINITY === object) {
-    switch (style) {
-      case 'lowercase': return '-.inf';
-      case 'uppercase': return '-.INF';
-      case 'camelcase': return '-.Inf';
-    }
-  } else if (common.isNegativeZero(object)) {
-    return '-0.0';
-  }
-
-  res = object.toString(10);
-
-  // JS stringifier can build scientific format without dots: 5e-100,
-  // while YAML requres dot: 5.e-100. Fix it with simple hack
-
-  return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res;
-}
-
-function isFloat(object) {
-  return (Object.prototype.toString.call(object) === '[object Number]') &&
-         (object % 1 !== 0 || common.isNegativeZero(object));
-}
-
-module.exports = new Type('tag:yaml.org,2002:float', {
-  kind: 'scalar',
-  resolve: resolveYamlFloat,
-  construct: constructYamlFloat,
-  predicate: isFloat,
-  represent: representYamlFloat,
-  defaultStyle: 'lowercase'
-});
-
-},{"../common":21,"../type":32}],36:[function(require,module,exports){
-'use strict';
-
-var common = require('../common');
-var Type   = require('../type');
-
-function isHexCode(c) {
-  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||
-         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||
-         ((0x61/* a */ <= c) && (c <= 0x66/* f */));
-}
-
-function isOctCode(c) {
-  return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */));
-}
-
-function isDecCode(c) {
-  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */));
-}
-
-function resolveYamlInteger(data) {
-  if (data === null) return false;
-
-  var max = data.length,
-      index = 0,
-      hasDigits = false,
-      ch;
-
-  if (!max) return false;
-
-  ch = data[index];
-
-  // sign
-  if (ch === '-' || ch === '+') {
-    ch = data[++index];
-  }
-
-  if (ch === '0') {
-    // 0
-    if (index + 1 === max) return true;
-    ch = data[++index];
-
-    // base 2, base 8, base 16
-
-    if (ch === 'b') {
-      // base 2
-      index++;
-
-      for (; index < max; index++) {
-        ch = data[index];
-        if (ch === '_') continue;
-        if (ch !== '0' && ch !== '1') return false;
-        hasDigits = true;
-      }
-      return hasDigits;
-    }
-
-
-    if (ch === 'x') {
-      // base 16
-      index++;
-
-      for (; index < max; index++) {
-        ch = data[index];
-        if (ch === '_') continue;
-        if (!isHexCode(data.charCodeAt(index))) return false;
-        hasDigits = true;
-      }
-      return hasDigits;
-    }
-
-    // base 8
-    for (; index < max; index++) {
-      ch = data[index];
-      if (ch === '_') continue;
-      if (!isOctCode(data.charCodeAt(index))) return false;
-      hasDigits = true;
-    }
-    return hasDigits;
-  }
-
-  // base 10 (except 0) or base 60
-
-  for (; index < max; index++) {
-    ch = data[index];
-    if (ch === '_') continue;
-    if (ch === ':') break;
-    if (!isDecCode(data.charCodeAt(index))) {
-      return false;
-    }
-    hasDigits = true;
-  }
-
-  if (!hasDigits) return false;
-
-  // if !base60 - done;
-  if (ch !== ':') return true;
-
-  // base60 almost not used, no needs to optimize
-  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));
-}
-
-function constructYamlInteger(data) {
-  var value = data, sign = 1, ch, base, digits = [];
-
-  if (value.indexOf('_') !== -1) {
-    value = value.replace(/_/g, '');
-  }
-
-  ch = value[0];
-
-  if (ch === '-' || ch === '+') {
-    if (ch === '-') sign = -1;
-    value = value.slice(1);
-    ch = value[0];
-  }
-
-  if (value === '0') return 0;
-
-  if (ch === '0') {
-    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);
-    if (value[1] === 'x') return sign * parseInt(value, 16);
-    return sign * parseInt(value, 8);
-  }
-
-  if (value.indexOf(':') !== -1) {
-    value.split(':').forEach(function (v) {
-      digits.unshift(parseInt(v, 10));
-    });
-
-    value = 0;
-    base = 1;
-
-    digits.forEach(function (d) {
-      value += (d * base);
-      base *= 60;
-    });
-
-    return sign * value;
-
-  }
-
-  return sign * parseInt(value, 10);
-}
-
-function isInteger(object) {
-  return (Object.prototype.toString.call(object)) === '[object Number]' &&
-         (object % 1 === 0 && !common.isNegativeZero(object));
-}
-
-module.exports = new Type('tag:yaml.org,2002:int', {
-  kind: 'scalar',
-  resolve: resolveYamlInteger,
-  construct: constructYamlInteger,
-  predicate: isInteger,
-  represent: {
-    binary:      function (object) { return '0b' + object.toString(2); },
-    octal:       function (object) { return '0'  + object.toString(8); },
-    decimal:     function (object) { return        object.toString(10); },
-    hexadecimal: function (object) { return '0x' + object.toString(16).toUpperCase(); }
-  },
-  defaultStyle: 'decimal',
-  styleAliases: {
-    binary:      [ 2,  'bin' ],
-    octal:       [ 8,  'oct' ],
-    decimal:     [ 10, 'dec' ],
-    hexadecimal: [ 16, 'hex' ]
-  }
-});
-
-},{"../common":21,"../type":32}],37:[function(require,module,exports){
-'use strict';
-
-var esprima;
-
-// Browserified version does not have esprima
-//
-// 1. For node.js just require module as deps
-// 2. For browser try to require mudule via external AMD system.
-//    If not found - try to fallback to window.esprima. If not
-//    found too - then fail to parse.
-//
-try {
-  // workaround to exclude package from browserify list.
-  var _require = require;
-  esprima = _require('esprima');
-} catch (_) {
-  /*global window */
-  if (typeof window !== 'undefined') esprima = window.esprima;
-}
-
-var Type = require('../../type');
-
-function resolveJavascriptFunction(data) {
-  if (data === null) return false;
-
-  try {
-    var source = '(' + data + ')',
-        ast    = esprima.parse(source, { range: true });
-
-    if (ast.type                    !== 'Program'             ||
-        ast.body.length             !== 1                     ||
-        ast.body[0].type            !== 'ExpressionStatement' ||
-        ast.body[0].expression.type !== 'FunctionExpression') {
-      return false;
-    }
-
-    return true;
-  } catch (err) {
-    return false;
-  }
-}
-
-function constructJavascriptFunction(data) {
-  /*jslint evil:true*/
-
-  var source = '(' + data + ')',
-      ast    = esprima.parse(source, { range: true }),
-      params = [],
-      body;
-
-  if (ast.type                    !== 'Program'             ||
-      ast.body.length             !== 1                     ||
-      ast.body[0].type            !== 'ExpressionStatement' ||
-      ast.body[0].expression.type !== 'FunctionExpression') {
-    throw new Error('Failed to resolve function');
-  }
-
-  ast.body[0].expression.params.forEach(function (param) {
-    params.push(param.name);
-  });
-
-  body = ast.body[0].expression.body.range;
-
-  // Esprima's ranges include the first '{' and the last '}' characters on
-  // function expressions. So cut them out.
-  /*eslint-disable no-new-func*/
-  return new Function(params, source.slice(body[0] + 1, body[1] - 1));
-}
-
-function representJavascriptFunction(object /*, style*/) {
-  return object.toString();
-}
-
-function isFunction(object) {
-  return Object.prototype.toString.call(object) === '[object Function]';
-}
-
-module.exports = new Type('tag:yaml.org,2002:js/function', {
-  kind: 'scalar',
-  resolve: resolveJavascriptFunction,
-  construct: constructJavascriptFunction,
-  predicate: isFunction,
-  represent: representJavascriptFunction
-});
-
-},{"../../type":32}],38:[function(require,module,exports){
-'use strict';
-
-var Type = require('../../type');
-
-function resolveJavascriptRegExp(data) {
-  if (data === null) return false;
-  if (data.length === 0) return false;
-
-  var regexp = data,
-      tail   = /\/([gim]*)$/.exec(data),
-      modifiers = '';
-
-  // if regexp starts with '/' it can have modifiers and must be properly closed
-  // `/foo/gim` - modifiers tail can be maximum 3 chars
-  if (regexp[0] === '/') {
-    if (tail) modifiers = tail[1];
-
-    if (modifiers.length > 3) return false;
-    // if expression starts with /, is should be properly terminated
-    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;
-  }
-
-  return true;
-}
-
-function constructJavascriptRegExp(data) {
-  var regexp = data,
-      tail   = /\/([gim]*)$/.exec(data),
-      modifiers = '';
-
-  // `/foo/gim` - tail can be maximum 4 chars
-  if (regexp[0] === '/') {
-    if (tail) modifiers = tail[1];
-    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);
-  }
-
-  return new RegExp(regexp, modifiers);
-}
-
-function representJavascriptRegExp(object /*, style*/) {
-  var result = '/' + object.source + '/';
-
-  if (object.global) result += 'g';
-  if (object.multiline) result += 'm';
-  if (object.ignoreCase) result += 'i';
-
-  return result;
-}
-
-function isRegExp(object) {
-  return Object.prototype.toString.call(object) === '[object RegExp]';
-}
-
-module.exports = new Type('tag:yaml.org,2002:js/regexp', {
-  kind: 'scalar',
-  resolve: resolveJavascriptRegExp,
-  construct: constructJavascriptRegExp,
-  predicate: isRegExp,
-  represent: representJavascriptRegExp
-});
-
-},{"../../type":32}],39:[function(require,module,exports){
-'use strict';
-
-var Type = require('../../type');
-
-function resolveJavascriptUndefined() {
-  return true;
-}
-
-function constructJavascriptUndefined() {
-  /*eslint-disable no-undefined*/
-  return undefined;
-}
-
-function representJavascriptUndefined() {
-  return '';
-}
-
-function isUndefined(object) {
-  return typeof object === 'undefined';
-}
-
-module.exports = new Type('tag:yaml.org,2002:js/undefined', {
-  kind: 'scalar',
-  resolve: resolveJavascriptUndefined,
-  construct: constructJavascriptUndefined,
-  predicate: isUndefined,
-  represent: representJavascriptUndefined
-});
-
-},{"../../type":32}],40:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-module.exports = new Type('tag:yaml.org,2002:map', {
-  kind: 'mapping',
-  construct: function (data) { return data !== null ? data : {}; }
-});
-
-},{"../type":32}],41:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-function resolveYamlMerge(data) {
-  return data === '<<' || data === null;
-}
-
-module.exports = new Type('tag:yaml.org,2002:merge', {
-  kind: 'scalar',
-  resolve: resolveYamlMerge
-});
-
-},{"../type":32}],42:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-function resolveYamlNull(data) {
-  if (data === null) return true;
-
-  var max = data.length;
-
-  return (max === 1 && data === '~') ||
-         (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL'));
-}
-
-function constructYamlNull() {
-  return null;
-}
-
-function isNull(object) {
-  return object === null;
-}
-
-module.exports = new Type('tag:yaml.org,2002:null', {
-  kind: 'scalar',
-  resolve: resolveYamlNull,
-  construct: constructYamlNull,
-  predicate: isNull,
-  represent: {
-    canonical: function () { return '~';    },
-    lowercase: function () { return 'null'; },
-    uppercase: function () { return 'NULL'; },
-    camelcase: function () { return 'Null'; }
-  },
-  defaultStyle: 'lowercase'
-});
-
-},{"../type":32}],43:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-var _toString       = Object.prototype.toString;
-
-function resolveYamlOmap(data) {
-  if (data === null) return true;
-
-  var objectKeys = [], index, length, pair, pairKey, pairHasKey,
-      object = data;
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    pair = object[index];
-    pairHasKey = false;
-
-    if (_toString.call(pair) !== '[object Object]') return false;
-
-    for (pairKey in pair) {
-      if (_hasOwnProperty.call(pair, pairKey)) {
-        if (!pairHasKey) pairHasKey = true;
-        else return false;
-      }
-    }
-
-    if (!pairHasKey) return false;
-
-    if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);
-    else return false;
-  }
-
-  return true;
-}
-
-function constructYamlOmap(data) {
-  return data !== null ? data : [];
-}
-
-module.exports = new Type('tag:yaml.org,2002:omap', {
-  kind: 'sequence',
-  resolve: resolveYamlOmap,
-  construct: constructYamlOmap
-});
-
-},{"../type":32}],44:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-var _toString = Object.prototype.toString;
-
-function resolveYamlPairs(data) {
-  if (data === null) return true;
-
-  var index, length, pair, keys, result,
-      object = data;
-
-  result = new Array(object.length);
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    pair = object[index];
-
-    if (_toString.call(pair) !== '[object Object]') return false;
-
-    keys = Object.keys(pair);
-
-    if (keys.length !== 1) return false;
-
-    result[index] = [ keys[0], pair[keys[0]] ];
-  }
-
-  return true;
-}
-
-function constructYamlPairs(data) {
-  if (data === null) return [];
-
-  var index, length, pair, keys, result,
-      object = data;
-
-  result = new Array(object.length);
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    pair = object[index];
-
-    keys = Object.keys(pair);
-
-    result[index] = [ keys[0], pair[keys[0]] ];
-  }
-
-  return result;
-}
-
-module.exports = new Type('tag:yaml.org,2002:pairs', {
-  kind: 'sequence',
-  resolve: resolveYamlPairs,
-  construct: constructYamlPairs
-});
-
-},{"../type":32}],45:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-module.exports = new Type('tag:yaml.org,2002:seq', {
-  kind: 'sequence',
-  construct: function (data) { return data !== null ? data : []; }
-});
-
-},{"../type":32}],46:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-
-function resolveYamlSet(data) {
-  if (data === null) return true;
-
-  var key, object = data;
-
-  for (key in object) {
-    if (_hasOwnProperty.call(object, key)) {
-      if (object[key] !== null) return false;
-    }
-  }
-
-  return true;
-}
-
-function constructYamlSet(data) {
-  return data !== null ? data : {};
-}
-
-module.exports = new Type('tag:yaml.org,2002:set', {
-  kind: 'mapping',
-  resolve: resolveYamlSet,
-  construct: constructYamlSet
-});
-
-},{"../type":32}],47:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-module.exports = new Type('tag:yaml.org,2002:str', {
-  kind: 'scalar',
-  construct: function (data) { return data !== null ? data : ''; }
-});
-
-},{"../type":32}],48:[function(require,module,exports){
-'use strict';
-
-var Type = require('../type');
-
-var YAML_DATE_REGEXP = new RegExp(
-  '^([0-9][0-9][0-9][0-9])'          + // [1] year
-  '-([0-9][0-9])'                    + // [2] month
-  '-([0-9][0-9])$');                   // [3] day
-
-var YAML_TIMESTAMP_REGEXP = new RegExp(
-  '^([0-9][0-9][0-9][0-9])'          + // [1] year
-  '-([0-9][0-9]?)'                   + // [2] month
-  '-([0-9][0-9]?)'                   + // [3] day
-  '(?:[Tt]|[ \\t]+)'                 + // ...
-  '([0-9][0-9]?)'                    + // [4] hour
-  ':([0-9][0-9])'                    + // [5] minute
-  ':([0-9][0-9])'                    + // [6] second
-  '(?:\\.([0-9]*))?'                 + // [7] fraction
-  '(?:[ \\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour
-  '(?::([0-9][0-9]))?))?$');           // [11] tz_minute
-
-function resolveYamlTimestamp(data) {
-  if (data === null) return false;
-  if (YAML_DATE_REGEXP.exec(data) !== null) return true;
-  if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;
-  return false;
-}
-
-function constructYamlTimestamp(data) {
-  var match, year, month, day, hour, minute, second, fraction = 0,
-      delta = null, tz_hour, tz_minute, date;
-
-  match = YAML_DATE_REGEXP.exec(data);
-  if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);
-
-  if (match === null) throw new Error('Date resolve error');
-
-  // match: [1] year [2] month [3] day
-
-  year = +(match[1]);
-  month = +(match[2]) - 1; // JS month starts with 0
-  day = +(match[3]);
-
-  if (!match[4]) { // no hour
-    return new Date(Date.UTC(year, month, day));
-  }
-
-  // match: [4] hour [5] minute [6] second [7] fraction
-
-  hour = +(match[4]);
-  minute = +(match[5]);
-  second = +(match[6]);
-
-  if (match[7]) {
-    fraction = match[7].slice(0, 3);
-    while (fraction.length < 3) { // milli-seconds
-      fraction += '0';
-    }
-    fraction = +fraction;
-  }
-
-  // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute
-
-  if (match[9]) {
-    tz_hour = +(match[10]);
-    tz_minute = +(match[11] || 0);
-    delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds
-    if (match[9] === '-') delta = -delta;
-  }
-
-  date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
-
-  if (delta) date.setTime(date.getTime() - delta);
-
-  return date;
-}
-
-function representYamlTimestamp(object /*, style*/) {
-  return object.toISOString();
-}
-
-module.exports = new Type('tag:yaml.org,2002:timestamp', {
-  kind: 'scalar',
-  resolve: resolveYamlTimestamp,
-  construct: constructYamlTimestamp,
-  instanceOf: Date,
-  represent: representYamlTimestamp
-});
-
-},{"../type":32}],49:[function(require,module,exports){
-var baseIndexOf = require('../internal/baseIndexOf'),
-    binaryIndex = require('../internal/binaryIndex');
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * Gets the index at which the first occurrence of `value` is found in `array`
- * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
- * for equality comparisons. If `fromIndex` is negative, it's used as the offset
- * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
- * performs a faster binary search.
- *
- * @static
- * @memberOf _
- * @category Array
- * @param {Array} array The array to search.
- * @param {*} value The value to search for.
- * @param {boolean|number} [fromIndex=0] The index to search from or `true`
- *  to perform a binary search on a sorted array.
- * @returns {number} Returns the index of the matched value, else `-1`.
- * @example
- *
- * _.indexOf([1, 2, 1, 2], 2);
- * // => 1
- *
- * // using `fromIndex`
- * _.indexOf([1, 2, 1, 2], 2, 2);
- * // => 3
- *
- * // performing a binary search
- * _.indexOf([1, 1, 2, 2], 2, true);
- * // => 2
- */
-function indexOf(array, value, fromIndex) {
-  var length = array ? array.length : 0;
-  if (!length) {
-    return -1;
-  }
-  if (typeof fromIndex == 'number') {
-    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;
-  } else if (fromIndex) {
-    var index = binaryIndex(array, value);
-    if (index < length &&
-        (value === value ? (value === array[index]) : (array[index] !== array[index]))) {
-      return index;
-    }
-    return -1;
-  }
-  return baseIndexOf(array, value, fromIndex || 0);
-}
-
-module.exports = indexOf;
-
-},{"../internal/baseIndexOf":78,"../internal/binaryIndex":92}],50:[function(require,module,exports){
-/**
- * Gets the last element of `array`.
- *
- * @static
- * @memberOf _
- * @category Array
- * @param {Array} array The array to query.
- * @returns {*} Returns the last element of `array`.
- * @example
- *
- * _.last([1, 2, 3]);
- * // => 3
- */
-function last(array) {
-  var length = array ? array.length : 0;
-  return length ? array[length - 1] : undefined;
-}
-
-module.exports = last;
-
-},{}],51:[function(require,module,exports){
-var LazyWrapper = require('../internal/LazyWrapper'),
-    LodashWrapper = require('../internal/LodashWrapper'),
-    baseLodash = require('../internal/baseLodash'),
-    isArray = require('../lang/isArray'),
-    isObjectLike = require('../internal/isObjectLike'),
-    wrapperClone = require('../internal/wrapperClone');
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Creates a `lodash` object which wraps `value` to enable implicit chaining.
- * Methods that operate on and return arrays, collections, and functions can
- * be chained together. Methods that retrieve a single value or may return a
- * primitive value will automatically end the chain returning the unwrapped
- * value. Explicit chaining may be enabled using `_.chain`. The execution of
- * chained methods is lazy, that is, execution is deferred until `_#value`
- * is implicitly or explicitly called.
- *
- * Lazy evaluation allows several methods to support shortcut fusion. Shortcut
- * fusion is an optimization strategy which merge iteratee calls; this can help
- * to avoid the creation of intermediate data structures and greatly reduce the
- * number of iteratee executions.
- *
- * Chaining is supported in custom builds as long as the `_#value` method is
- * directly or indirectly included in the build.
- *
- * In addition to lodash methods, wrappers have `Array` and `String` methods.
- *
- * The wrapper `Array` methods are:
- * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`,
- * `splice`, and `unshift`
- *
- * The wrapper `String` methods are:
- * `replace` and `split`
- *
- * The wrapper methods that support shortcut fusion are:
- * `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`,
- * `first`, `initial`, `last`, `map`, `pluck`, `reject`, `rest`, `reverse`,
- * `slice`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `toArray`,
- * and `where`
- *
- * The chainable wrapper methods are:
- * `after`, `ary`, `assign`, `at`, `before`, `bind`, `bindAll`, `bindKey`,
- * `callback`, `chain`, `chunk`, `commit`, `compact`, `concat`, `constant`,
- * `countBy`, `create`, `curry`, `debounce`, `defaults`, `defaultsDeep`,
- * `defer`, `delay`, `difference`, `drop`, `dropRight`, `dropRightWhile`,
- * `dropWhile`, `fill`, `filter`, `flatten`, `flattenDeep`, `flow`, `flowRight`,
- * `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, `forOwnRight`,
- * `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, `invert`,
- * `invoke`, `keys`, `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`,
- * `matchesProperty`, `memoize`, `merge`, `method`, `methodOf`, `mixin`,
- * `modArgs`, `negate`, `omit`, `once`, `pairs`, `partial`, `partialRight`,
- * `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`,
- * `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `restParam`,
- * `reverse`, `set`, `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`,
- * `sortByOrder`, `splice`, `spread`, `take`, `takeRight`, `takeRightWhile`,
- * `takeWhile`, `tap`, `throttle`, `thru`, `times`, `toArray`, `toPlainObject`,
- * `transform`, `union`, `uniq`, `unshift`, `unzip`, `unzipWith`, `values`,
- * `valuesIn`, `where`, `without`, `wrap`, `xor`, `zip`, `zipObject`, `zipWith`
- *
- * The wrapper methods that are **not** chainable by default are:
- * `add`, `attempt`, `camelCase`, `capitalize`, `ceil`, `clone`, `cloneDeep`,
- * `deburr`, `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`,
- * `findKey`, `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`,
- * `floor`, `get`, `gt`, `gte`, `has`, `identity`, `includes`, `indexOf`,
- * `inRange`, `isArguments`, `isArray`, `isBoolean`, `isDate`, `isElement`,
- * `isEmpty`, `isEqual`, `isError`, `isFinite` `isFunction`, `isMatch`,
- * `isNative`, `isNaN`, `isNull`, `isNumber`, `isObject`, `isPlainObject`,
- * `isRegExp`, `isString`, `isUndefined`, `isTypedArray`, `join`, `kebabCase`,
- * `last`, `lastIndexOf`, `lt`, `lte`, `max`, `min`, `noConflict`, `noop`,
- * `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, `random`, `reduce`,
- * `reduceRight`, `repeat`, `result`, `round`, `runInContext`, `shift`, `size`,
- * `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, `startCase`,
- * `startsWith`, `sum`, `template`, `trim`, `trimLeft`, `trimRight`, `trunc`,
- * `unescape`, `uniqueId`, `value`, and `words`
- *
- * The wrapper method `sample` will return a wrapped value when `n` is provided,
- * otherwise an unwrapped value is returned.
- *
- * @name _
- * @constructor
- * @category Chain
- * @param {*} value The value to wrap in a `lodash` instance.
- * @returns {Object} Returns the new `lodash` wrapper instance.
- * @example
- *
- * var wrapped = _([1, 2, 3]);
- *
- * // returns an unwrapped value
- * wrapped.reduce(function(total, n) {
- *   return total + n;
- * });
- * // => 6
- *
- * // returns a wrapped value
- * var squares = wrapped.map(function(n) {
- *   return n * n;
- * });
- *
- * _.isArray(squares);
- * // => false
- *
- * _.isArray(squares.value());
- * // => true
- */
-function lodash(value) {
-  if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {
-    if (value instanceof LodashWrapper) {
-      return value;
-    }
-    if (hasOwnProperty.call(value, '__chain__') && hasOwnProperty.call(value, '__wrapped__')) {
-      return wrapperClone(value);
-    }
-  }
-  return new LodashWrapper(value);
-}
-
-// Ensure wrappers are instances of `baseLodash`.
-lodash.prototype = baseLodash.prototype;
-
-module.exports = lodash;
-
-},{"../internal/LazyWrapper":60,"../internal/LodashWrapper":61,"../internal/baseLodash":82,"../internal/isObjectLike":126,"../internal/wrapperClone":137,"../lang/isArray":140}],52:[function(require,module,exports){
-module.exports = require('./forEach');
-
-},{"./forEach":54}],53:[function(require,module,exports){
-var baseEach = require('../internal/baseEach'),
-    createFind = require('../internal/createFind');
-
-/**
- * Iterates over elements of `collection`, returning the first element
- * `predicate` returns truthy for. The predicate is bound to `thisArg` and
- * invoked with three arguments: (value, index|key, collection).
- *
- * If a property name is provided for `predicate` the created `_.property`
- * style callback returns the property value of the given element.
- *
- * If a value is also provided for `thisArg` the created `_.matchesProperty`
- * style callback returns `true` for elements that have a matching property
- * value, else `false`.
- *
- * If an object is provided for `predicate` the created `_.matches` style
- * callback returns `true` for elements that have the properties of the given
- * object, else `false`.
- *
- * @static
- * @memberOf _
- * @alias detect
- * @category Collection
- * @param {Array|Object|string} collection The collection to search.
- * @param {Function|Object|string} [predicate=_.identity] The function invoked
- *  per iteration.
- * @param {*} [thisArg] The `this` binding of `predicate`.
- * @returns {*} Returns the matched element, else `undefined`.
- * @example
- *
- * var users = [
- *   { 'user': 'barney',  'age': 36, 'active': true },
- *   { 'user': 'fred',    'age': 40, 'active': false },
- *   { 'user': 'pebbles', 'age': 1,  'active': true }
- * ];
- *
- * _.result(_.find(users, function(chr) {
- *   return chr.age < 40;
- * }), 'user');
- * // => 'barney'
- *
- * // using the `_.matches` callback shorthand
- * _.result(_.find(users, { 'age': 1, 'active': true }), 'user');
- * // => 'pebbles'
- *
- * // using the `_.matchesProperty` callback shorthand
- * _.result(_.find(users, 'active', false), 'user');
- * // => 'fred'
- *
- * // using the `_.property` callback shorthand
- * _.result(_.find(users, 'active'), 'user');
- * // => 'barney'
- */
-var find = createFind(baseEach);
-
-module.exports = find;
-
-},{"../internal/baseEach":71,"../internal/createFind":102}],54:[function(require,module,exports){
-var arrayEach = require('../internal/arrayEach'),
-    baseEach = require('../internal/baseEach'),
-    createForEach = require('../internal/createForEach');
-
-/**
- * Iterates over elements of `collection` invoking `iteratee` for each element.
- * The `iteratee` is bound to `thisArg` and invoked with three arguments:
- * (value, index|key, collection). Iteratee functions may exit iteration early
- * by explicitly returning `false`.
- *
- * **Note:** As with other "Collections" methods, objects with a "length" property
- * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn`
- * may be used for object iteration.
- *
- * @static
- * @memberOf _
- * @alias each
- * @category Collection
- * @param {Array|Object|string} collection The collection to iterate over.
- * @param {Function} [iteratee=_.identity] The function invoked per iteration.
- * @param {*} [thisArg] The `this` binding of `iteratee`.
- * @returns {Array|Object|string} Returns `collection`.
- * @example
- *
- * _([1, 2]).forEach(function(n) {
- *   console.log(n);
- * }).value();
- * // => logs each value from left to right and returns the array
- *
- * _.forEach({ 'a': 1, 'b': 2 }, function(n, key) {
- *   console.log(n, key);
- * });
- * // => logs each value-key pair and returns the object (iteration order is not guaranteed)
- */
-var forEach = createForEach(arrayEach, baseEach);
-
-module.exports = forEach;
-
-},{"../internal/arrayEach":63,"../internal/baseEach":71,"../internal/createForEach":103}],55:[function(require,module,exports){
-var baseIndexOf = require('../internal/baseIndexOf'),
-    getLength = require('../internal/getLength'),
-    isArray = require('../lang/isArray'),
-    isIterateeCall = require('../internal/isIterateeCall'),
-    isLength = require('../internal/isLength'),
-    isString = require('../lang/isString'),
-    values = require('../object/values');
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * Checks if `target` is in `collection` using
- * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
- * for equality comparisons. If `fromIndex` is negative, it's used as the offset
- * from the end of `collection`.
- *
- * @static
- * @memberOf _
- * @alias contains, include
- * @category Collection
- * @param {Array|Object|string} collection The collection to search.
- * @param {*} target The value to search for.
- * @param {number} [fromIndex=0] The index to search from.
- * @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.
- * @returns {boolean} Returns `true` if a matching element is found, else `false`.
- * @example
- *
- * _.includes([1, 2, 3], 1);
- * // => true
- *
- * _.includes([1, 2, 3], 1, 2);
- * // => false
- *
- * _.includes({ 'user': 'fred', 'age': 40 }, 'fred');
- * // => true
- *
- * _.includes('pebbles', 'eb');
- * // => true
- */
-function includes(collection, target, fromIndex, guard) {
-  var length = collection ? getLength(collection) : 0;
-  if (!isLength(length)) {
-    collection = values(collection);
-    length = collection.length;
-  }
-  if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {
-    fromIndex = 0;
-  } else {
-    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);
-  }
-  return (typeof collection == 'string' || !isArray(collection) && isString(collection))
-    ? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1)
-    : (!!length && baseIndexOf(collection, target, fromIndex) > -1);
-}
-
-module.exports = includes;
-
-},{"../internal/baseIndexOf":78,"../internal/getLength":112,"../internal/isIterateeCall":122,"../internal/isLength":125,"../lang/isArray":140,"../lang/isString":146,"../object/values":152}],56:[function(require,module,exports){
-var arrayMap = require('../internal/arrayMap'),
-    baseCallback = require('../internal/baseCallback'),
-    baseMap = require('../internal/baseMap'),
-    isArray = require('../lang/isArray');
-
-/**
- * Creates an array of values by running each element in `collection` through
- * `iteratee`. The `iteratee` is bound to `thisArg` and invoked with three
- * arguments: (value, index|key, collection).
- *
- * If a property name is provided for `iteratee` the created `_.property`
- * style callback returns the property value of the given element.
- *
- * If a value is also provided for `thisArg` the created `_.matchesProperty`
- * style callback returns `true` for elements that have a matching property
- * value, else `false`.
- *
- * If an object is provided for `iteratee` the created `_.matches` style
- * callback returns `true` for elements that have the properties of the given
- * object, else `false`.
- *
- * Many lodash methods are guarded to work as iteratees for methods like
- * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.
- *
- * The guarded methods are:
- * `ary`, `callback`, `chunk`, `clone`, `create`, `curry`, `curryRight`,
- * `drop`, `dropRight`, `every`, `fill`, `flatten`, `invert`, `max`, `min`,
- * `parseInt`, `slice`, `sortBy`, `take`, `takeRight`, `template`, `trim`,
- * `trimLeft`, `trimRight`, `trunc`, `random`, `range`, `sample`, `some`,
- * `sum`, `uniq`, and `words`
- *
- * @static
- * @memberOf _
- * @alias collect
- * @category Collection
- * @param {Array|Object|string} collection The collection to iterate over.
- * @param {Function|Object|string} [iteratee=_.identity] The function invoked
- *  per iteration.
- * @param {*} [thisArg] The `this` binding of `iteratee`.
- * @returns {Array} Returns the new mapped array.
- * @example
- *
- * function timesThree(n) {
- *   return n * 3;
- * }
- *
- * _.map([1, 2], timesThree);
- * // => [3, 6]
- *
- * _.map({ 'a': 1, 'b': 2 }, timesThree);
- * // => [3, 6] (iteration order is not guaranteed)
- *
- * var users = [
- *   { 'user': 'barney' },
- *   { 'user': 'fred' }
- * ];
- *
- * // using the `_.property` callback shorthand
- * _.map(users, 'user');
- * // => ['barney', 'fred']
- */
-function map(collection, iteratee, thisArg) {
-  var func = isArray(collection) ? arrayMap : baseMap;
-  iteratee = baseCallback(iteratee, thisArg, 3);
-  return func(collection, iteratee);
-}
-
-module.exports = map;
-
-},{"../internal/arrayMap":64,"../internal/baseCallback":67,"../internal/baseMap":83,"../lang/isArray":140}],57:[function(require,module,exports){
-var getNative = require('../internal/getNative');
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeNow = getNative(Date, 'now');
-
-/**
- * Gets the number of milliseconds that have elapsed since the Unix epoch
- * (1 January 1970 00:00:00 UTC).
- *
- * @static
- * @memberOf _
- * @category Date
- * @example
- *
- * _.defer(function(stamp) {
- *   console.log(_.now() - stamp);
- * }, _.now());
- * // => logs the number of milliseconds it took for the deferred function to be invoked
- */
-var now = nativeNow || function() {
-  return new Date().getTime();
-};
-
-module.exports = now;
-
-},{"../internal/getNative":114}],58:[function(require,module,exports){
-var createWrapper = require('../internal/createWrapper'),
-    replaceHolders = require('../internal/replaceHolders'),
-    restParam = require('./restParam');
-
-/** Used to compose bitmasks for wrapper metadata. */
-var BIND_FLAG = 1,
-    PARTIAL_FLAG = 32;
-
-/**
- * Creates a function that invokes `func` with the `this` binding of `thisArg`
- * and prepends any additional `_.bind` arguments to those provided to the
- * bound function.
- *
- * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,
- * may be used as a placeholder for partially applied arguments.
- *
- * **Note:** Unlike native `Function#bind` this method does not set the "length"
- * property of bound functions.
- *
- * @static
- * @memberOf _
- * @category Function
- * @param {Function} func The function to bind.
- * @param {*} thisArg The `this` binding of `func`.
- * @param {...*} [partials] The arguments to be partially applied.
- * @returns {Function} Returns the new bound function.
- * @example
- *
- * var greet = function(greeting, punctuation) {
- *   return greeting + ' ' + this.user + punctuation;
- * };
- *
- * var object = { 'user': 'fred' };
- *
- * var bound = _.bind(greet, object, 'hi');
- * bound('!');
- * // => 'hi fred!'
- *
- * // using placeholders
- * var bound = _.bind(greet, object, _, '!');
- * bound('hi');
- * // => 'hi fred!'
- */
-var bind = restParam(function(func, thisArg, partials) {
-  var bitmask = BIND_FLAG;
-  if (partials.length) {
-    var holders = replaceHolders(partials, bind.placeholder);
-    bitmask |= PARTIAL_FLAG;
-  }
-  return createWrapper(func, bitmask, thisArg, partials, holders);
-});
-
-// Assign default placeholders.
-bind.placeholder = {};
-
-module.exports = bind;
-
-},{"../internal/createWrapper":106,"../internal/replaceHolders":132,"./restParam":59}],59:[function(require,module,exports){
-/** Used as the `TypeError` message for "Functions" methods. */
-var FUNC_ERROR_TEXT = 'Expected a function';
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * Creates a function that invokes `func` with the `this` binding of the
- * created function and arguments from `start` and beyond provided as an array.
- *
- * **Note:** This method is based on the [rest parameter](https://developer.mozilla.org/Web/JavaScript/Reference/Functions/rest_parameters).
- *
- * @static
- * @memberOf _
- * @category Function
- * @param {Function} func The function to apply a rest parameter to.
- * @param {number} [start=func.length-1] The start position of the rest parameter.
- * @returns {Function} Returns the new function.
- * @example
- *
- * var say = _.restParam(function(what, names) {
- *   return what + ' ' + _.initial(names).join(', ') +
- *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);
- * });
- *
- * say('hello', 'fred', 'barney', 'pebbles');
- * // => 'hello fred, barney, & pebbles'
- */
-function restParam(func, start) {
-  if (typeof func != 'function') {
-    throw new TypeError(FUNC_ERROR_TEXT);
-  }
-  start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0);
-  return function() {
-    var args = arguments,
-        index = -1,
-        length = nativeMax(args.length - start, 0),
-        rest = Array(length);
-
-    while (++index < length) {
-      rest[index] = args[start + index];
-    }
-    switch (start) {
-      case 0: return func.call(this, rest);
-      case 1: return func.call(this, args[0], rest);
-      case 2: return func.call(this, args[0], args[1], rest);
-    }
-    var otherArgs = Array(start + 1);
-    index = -1;
-    while (++index < start) {
-      otherArgs[index] = args[index];
-    }
-    otherArgs[start] = rest;
-    return func.apply(this, otherArgs);
-  };
-}
-
-module.exports = restParam;
-
-},{}],60:[function(require,module,exports){
-var baseCreate = require('./baseCreate'),
-    baseLodash = require('./baseLodash');
-
-/** Used as references for `-Infinity` and `Infinity`. */
-var POSITIVE_INFINITY = Number.POSITIVE_INFINITY;
-
-/**
- * Creates a lazy wrapper object which wraps `value` to enable lazy evaluation.
- *
- * @private
- * @param {*} value The value to wrap.
- */
-function LazyWrapper(value) {
-  this.__wrapped__ = value;
-  this.__actions__ = [];
-  this.__dir__ = 1;
-  this.__filtered__ = false;
-  this.__iteratees__ = [];
-  this.__takeCount__ = POSITIVE_INFINITY;
-  this.__views__ = [];
-}
-
-LazyWrapper.prototype = baseCreate(baseLodash.prototype);
-LazyWrapper.prototype.constructor = LazyWrapper;
-
-module.exports = LazyWrapper;
-
-},{"./baseCreate":70,"./baseLodash":82}],61:[function(require,module,exports){
-var baseCreate = require('./baseCreate'),
-    baseLodash = require('./baseLodash');
-
-/**
- * The base constructor for creating `lodash` wrapper objects.
- *
- * @private
- * @param {*} value The value to wrap.
- * @param {boolean} [chainAll] Enable chaining for all wrapper methods.
- * @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.
- */
-function LodashWrapper(value, chainAll, actions) {
-  this.__wrapped__ = value;
-  this.__actions__ = actions || [];
-  this.__chain__ = !!chainAll;
-}
-
-LodashWrapper.prototype = baseCreate(baseLodash.prototype);
-LodashWrapper.prototype.constructor = LodashWrapper;
-
-module.exports = LodashWrapper;
-
-},{"./baseCreate":70,"./baseLodash":82}],62:[function(require,module,exports){
-/**
- * Copies the values of `source` to `array`.
- *
- * @private
- * @param {Array} source The array to copy values from.
- * @param {Array} [array=[]] The array to copy values to.
- * @returns {Array} Returns `array`.
- */
-function arrayCopy(source, array) {
-  var index = -1,
-      length = source.length;
-
-  array || (array = Array(length));
-  while (++index < length) {
-    array[index] = source[index];
-  }
-  return array;
-}
-
-module.exports = arrayCopy;
-
-},{}],63:[function(require,module,exports){
-/**
- * A specialized version of `_.forEach` for arrays without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Array} array The array to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns `array`.
- */
-function arrayEach(array, iteratee) {
-  var index = -1,
-      length = array.length;
-
-  while (++index < length) {
-    if (iteratee(array[index], index, array) === false) {
-      break;
-    }
-  }
-  return array;
-}
-
-module.exports = arrayEach;
-
-},{}],64:[function(require,module,exports){
-/**
- * A specialized version of `_.map` for arrays without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Array} array The array to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns the new mapped array.
- */
-function arrayMap(array, iteratee) {
-  var index = -1,
-      length = array.length,
-      result = Array(length);
-
-  while (++index < length) {
-    result[index] = iteratee(array[index], index, array);
-  }
-  return result;
-}
-
-module.exports = arrayMap;
-
-},{}],65:[function(require,module,exports){
-/**
- * A specialized version of `_.some` for arrays without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Array} array The array to iterate over.
- * @param {Function} predicate The function invoked per iteration.
- * @returns {boolean} Returns `true` if any element passes the predicate check,
- *  else `false`.
- */
-function arraySome(array, predicate) {
-  var index = -1,
-      length = array.length;
-
-  while (++index < length) {
-    if (predicate(array[index], index, array)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-module.exports = arraySome;
-
-},{}],66:[function(require,module,exports){
-var baseCopy = require('./baseCopy'),
-    keys = require('../object/keys');
-
-/**
- * The base implementation of `_.assign` without support for argument juggling,
- * multiple sources, and `customizer` functions.
- *
- * @private
- * @param {Object} object The destination object.
- * @param {Object} source The source object.
- * @returns {Object} Returns `object`.
- */
-function baseAssign(object, source) {
-  return source == null
-    ? object
-    : baseCopy(source, keys(source), object);
-}
-
-module.exports = baseAssign;
-
-},{"../object/keys":149,"./baseCopy":69}],67:[function(require,module,exports){
-var baseMatches = require('./baseMatches'),
-    baseMatchesProperty = require('./baseMatchesProperty'),
-    bindCallback = require('./bindCallback'),
-    identity = require('../utility/identity'),
-    property = require('../utility/property');
-
-/**
- * The base implementation of `_.callback` which supports specifying the
- * number of arguments to provide to `func`.
- *
- * @private
- * @param {*} [func=_.identity] The value to convert to a callback.
- * @param {*} [thisArg] The `this` binding of `func`.
- * @param {number} [argCount] The number of arguments to provide to `func`.
- * @returns {Function} Returns the callback.
- */
-function baseCallback(func, thisArg, argCount) {
-  var type = typeof func;
-  if (type == 'function') {
-    return thisArg === undefined
-      ? func
-      : bindCallback(func, thisArg, argCount);
-  }
-  if (func == null) {
-    return identity;
-  }
-  if (type == 'object') {
-    return baseMatches(func);
-  }
-  return thisArg === undefined
-    ? property(func)
-    : baseMatchesProperty(func, thisArg);
-}
-
-module.exports = baseCallback;
-
-},{"../utility/identity":154,"../utility/property":156,"./baseMatches":84,"./baseMatchesProperty":85,"./bindCallback":94}],68:[function(require,module,exports){
-var arrayCopy = require('./arrayCopy'),
-    arrayEach = require('./arrayEach'),
-    baseAssign = require('./baseAssign'),
-    baseForOwn = require('./baseForOwn'),
-    initCloneArray = require('./initCloneArray'),
-    initCloneByTag = require('./initCloneByTag'),
-    initCloneObject = require('./initCloneObject'),
-    isArray = require('../lang/isArray'),
-    isHostObject = require('./isHostObject'),
-    isObject = require('../lang/isObject');
-
-/** `Object#toString` result references. */
-var argsTag = '[object Arguments]',
-    arrayTag = '[object Array]',
-    boolTag = '[object Boolean]',
-    dateTag = '[object Date]',
-    errorTag = '[object Error]',
-    funcTag = '[object Function]',
-    mapTag = '[object Map]',
-    numberTag = '[object Number]',
-    objectTag = '[object Object]',
-    regexpTag = '[object RegExp]',
-    setTag = '[object Set]',
-    stringTag = '[object String]',
-    weakMapTag = '[object WeakMap]';
-
-var arrayBufferTag = '[object ArrayBuffer]',
-    float32Tag = '[object Float32Array]',
-    float64Tag = '[object Float64Array]',
-    int8Tag = '[object Int8Array]',
-    int16Tag = '[object Int16Array]',
-    int32Tag = '[object Int32Array]',
-    uint8Tag = '[object Uint8Array]',
-    uint8ClampedTag = '[object Uint8ClampedArray]',
-    uint16Tag = '[object Uint16Array]',
-    uint32Tag = '[object Uint32Array]';
-
-/** Used to identify `toStringTag` values supported by `_.clone`. */
-var cloneableTags = {};
-cloneableTags[argsTag] = cloneableTags[arrayTag] =
-cloneableTags[arrayBufferTag] = cloneableTags[boolTag] =
-cloneableTags[dateTag] = cloneableTags[float32Tag] =
-cloneableTags[float64Tag] = cloneableTags[int8Tag] =
-cloneableTags[int16Tag] = cloneableTags[int32Tag] =
-cloneableTags[numberTag] = cloneableTags[objectTag] =
-cloneableTags[regexpTag] = cloneableTags[stringTag] =
-cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
-cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
-cloneableTags[errorTag] = cloneableTags[funcTag] =
-cloneableTags[mapTag] = cloneableTags[setTag] =
-cloneableTags[weakMapTag] = false;
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/**
- * The base implementation of `_.clone` without support for argument juggling
- * and `this` binding `customizer` functions.
- *
- * @private
- * @param {*} value The value to clone.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @param {Function} [customizer] The function to customize cloning values.
- * @param {string} [key] The key of `value`.
- * @param {Object} [object] The object `value` belongs to.
- * @param {Array} [stackA=[]] Tracks traversed source objects.
- * @param {Array} [stackB=[]] Associates clones with source counterparts.
- * @returns {*} Returns the cloned value.
- */
-function baseClone(value, isDeep, customizer, key, object, stackA, stackB) {
-  var result;
-  if (customizer) {
-    result = object ? customizer(value, key, object) : customizer(value);
-  }
-  if (result !== undefined) {
-    return result;
-  }
-  if (!isObject(value)) {
-    return value;
-  }
-  var isArr = isArray(value);
-  if (isArr) {
-    result = initCloneArray(value);
-    if (!isDeep) {
-      return arrayCopy(value, result);
-    }
-  } else {
-    var tag = objToString.call(value),
-        isFunc = tag == funcTag;
-
-    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
-      if (isHostObject(value)) {
-        return object ? value : {};
-      }
-      result = initCloneObject(isFunc ? {} : value);
-      if (!isDeep) {
-        return baseAssign(result, value);
-      }
-    } else {
-      return cloneableTags[tag]
-        ? initCloneByTag(value, tag, isDeep)
-        : (object ? value : {});
-    }
-  }
-  // Check for circular references and return its corresponding clone.
-  stackA || (stackA = []);
-  stackB || (stackB = []);
-
-  var length = stackA.length;
-  while (length--) {
-    if (stackA[length] == value) {
-      return stackB[length];
-    }
-  }
-  // Add the source value to the stack of traversed objects and associate it with its clone.
-  stackA.push(value);
-  stackB.push(result);
-
-  // Recursively populate clone (susceptible to call stack limits).
-  (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {
-    result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB);
-  });
-  return result;
-}
-
-module.exports = baseClone;
-
-},{"../lang/isArray":140,"../lang/isObject":144,"./arrayCopy":62,"./arrayEach":63,"./baseAssign":66,"./baseForOwn":76,"./initCloneArray":116,"./initCloneByTag":117,"./initCloneObject":118,"./isHostObject":120}],69:[function(require,module,exports){
-/**
- * Copies properties of `source` to `object`.
- *
- * @private
- * @param {Object} source The object to copy properties from.
- * @param {Array} props The property names to copy.
- * @param {Object} [object={}] The object to copy properties to.
- * @returns {Object} Returns `object`.
- */
-function baseCopy(source, props, object) {
-  object || (object = {});
-
-  var index = -1,
-      length = props.length;
-
-  while (++index < length) {
-    var key = props[index];
-    object[key] = source[key];
-  }
-  return object;
-}
-
-module.exports = baseCopy;
-
-},{}],70:[function(require,module,exports){
-var isObject = require('../lang/isObject');
-
-/**
- * The base implementation of `_.create` without support for assigning
- * properties to the created object.
- *
- * @private
- * @param {Object} prototype The object to inherit from.
- * @returns {Object} Returns the new object.
- */
-var baseCreate = (function() {
-  function object() {}
-  return function(prototype) {
-    if (isObject(prototype)) {
-      object.prototype = prototype;
-      var result = new object;
-      object.prototype = undefined;
-    }
-    return result || {};
-  };
-}());
-
-module.exports = baseCreate;
-
-},{"../lang/isObject":144}],71:[function(require,module,exports){
-var baseForOwn = require('./baseForOwn'),
-    createBaseEach = require('./createBaseEach');
-
-/**
- * The base implementation of `_.forEach` without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Array|Object|string} collection The collection to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array|Object|string} Returns `collection`.
- */
-var baseEach = createBaseEach(baseForOwn);
-
-module.exports = baseEach;
-
-},{"./baseForOwn":76,"./createBaseEach":98}],72:[function(require,module,exports){
-/**
- * The base implementation of `_.find`, `_.findLast`, `_.findKey`, and `_.findLastKey`,
- * without support for callback shorthands and `this` binding, which iterates
- * over `collection` using the provided `eachFunc`.
- *
- * @private
- * @param {Array|Object|string} collection The collection to search.
- * @param {Function} predicate The function invoked per iteration.
- * @param {Function} eachFunc The function to iterate over `collection`.
- * @param {boolean} [retKey] Specify returning the key of the found element
- *  instead of the element itself.
- * @returns {*} Returns the found element or its key, else `undefined`.
- */
-function baseFind(collection, predicate, eachFunc, retKey) {
-  var result;
-  eachFunc(collection, function(value, key, collection) {
-    if (predicate(value, key, collection)) {
-      result = retKey ? key : value;
-      return false;
-    }
-  });
-  return result;
-}
-
-module.exports = baseFind;
-
-},{}],73:[function(require,module,exports){
-/**
- * The base implementation of `_.findIndex` and `_.findLastIndex` without
- * support for callback shorthands and `this` binding.
- *
- * @private
- * @param {Array} array The array to search.
- * @param {Function} predicate The function invoked per iteration.
- * @param {boolean} [fromRight] Specify iterating from right to left.
- * @returns {number} Returns the index of the matched value, else `-1`.
- */
-function baseFindIndex(array, predicate, fromRight) {
-  var length = array.length,
-      index = fromRight ? length : -1;
-
-  while ((fromRight ? index-- : ++index < length)) {
-    if (predicate(array[index], index, array)) {
-      return index;
-    }
-  }
-  return -1;
-}
-
-module.exports = baseFindIndex;
-
-},{}],74:[function(require,module,exports){
-var createBaseFor = require('./createBaseFor');
-
-/**
- * The base implementation of `baseForIn` and `baseForOwn` which iterates
- * over `object` properties returned by `keysFunc` invoking `iteratee` for
- * each property. Iteratee functions may exit iteration early by explicitly
- * returning `false`.
- *
- * @private
- * @param {Object} object The object to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @param {Function} keysFunc The function to get the keys of `object`.
- * @returns {Object} Returns `object`.
- */
-var baseFor = createBaseFor();
-
-module.exports = baseFor;
-
-},{"./createBaseFor":99}],75:[function(require,module,exports){
-var baseFor = require('./baseFor'),
-    keysIn = require('../object/keysIn');
-
-/**
- * The base implementation of `_.forIn` without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Object} object The object to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Object} Returns `object`.
- */
-function baseForIn(object, iteratee) {
-  return baseFor(object, iteratee, keysIn);
-}
-
-module.exports = baseForIn;
-
-},{"../object/keysIn":150,"./baseFor":74}],76:[function(require,module,exports){
-var baseFor = require('./baseFor'),
-    keys = require('../object/keys');
-
-/**
- * The base implementation of `_.forOwn` without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Object} object The object to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Object} Returns `object`.
- */
-function baseForOwn(object, iteratee) {
-  return baseFor(object, iteratee, keys);
-}
-
-module.exports = baseForOwn;
-
-},{"../object/keys":149,"./baseFor":74}],77:[function(require,module,exports){
-var toObject = require('./toObject');
-
-/**
- * The base implementation of `get` without support for string paths
- * and default values.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Array} path The path of the property to get.
- * @param {string} [pathKey] The key representation of path.
- * @returns {*} Returns the resolved value.
- */
-function baseGet(object, path, pathKey) {
-  if (object == null) {
-    return;
-  }
-  object = toObject(object);
-  if (pathKey !== undefined && pathKey in object) {
-    path = [pathKey];
-  }
-  var index = 0,
-      length = path.length;
-
-  while (object != null && index < length) {
-    object = toObject(object)[path[index++]];
-  }
-  return (index && index == length) ? object : undefined;
-}
-
-module.exports = baseGet;
-
-},{"./toObject":135}],78:[function(require,module,exports){
-var indexOfNaN = require('./indexOfNaN');
-
-/**
- * The base implementation of `_.indexOf` without support for binary searches.
- *
- * @private
- * @param {Array} array The array to search.
- * @param {*} value The value to search for.
- * @param {number} fromIndex The index to search from.
- * @returns {number} Returns the index of the matched value, else `-1`.
- */
-function baseIndexOf(array, value, fromIndex) {
-  if (value !== value) {
-    return indexOfNaN(array, fromIndex);
-  }
-  var index = fromIndex - 1,
-      length = array.length;
-
-  while (++index < length) {
-    if (array[index] === value) {
-      return index;
-    }
-  }
-  return -1;
-}
-
-module.exports = baseIndexOf;
-
-},{"./indexOfNaN":115}],79:[function(require,module,exports){
-var baseIsEqualDeep = require('./baseIsEqualDeep'),
-    isObject = require('../lang/isObject'),
-    isObjectLike = require('./isObjectLike');
-
-/**
- * The base implementation of `_.isEqual` without support for `this` binding
- * `customizer` functions.
- *
- * @private
- * @param {*} value The value to compare.
- * @param {*} other The other value to compare.
- * @param {Function} [customizer] The function to customize comparing values.
- * @param {boolean} [isLoose] Specify performing partial comparisons.
- * @param {Array} [stackA] Tracks traversed `value` objects.
- * @param {Array} [stackB] Tracks traversed `other` objects.
- * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
- */
-function baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {
-  if (value === other) {
-    return true;
-  }
-  if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) {
-    return value !== value && other !== other;
-  }
-  return baseIsEqualDeep(value, other, baseIsEqual, customizer, isLoose, stackA, stackB);
-}
-
-module.exports = baseIsEqual;
-
-},{"../lang/isObject":144,"./baseIsEqualDeep":80,"./isObjectLike":126}],80:[function(require,module,exports){
-var equalArrays = require('./equalArrays'),
-    equalByTag = require('./equalByTag'),
-    equalObjects = require('./equalObjects'),
-    isArray = require('../lang/isArray'),
-    isHostObject = require('./isHostObject'),
-    isTypedArray = require('../lang/isTypedArray');
-
-/** `Object#toString` result references. */
-var argsTag = '[object Arguments]',
-    arrayTag = '[object Array]',
-    objectTag = '[object Object]';
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/**
- * A specialized version of `baseIsEqual` for arrays and objects which performs
- * deep comparisons and tracks traversed objects enabling objects with circular
- * references to be compared.
- *
- * @private
- * @param {Object} object The object to compare.
- * @param {Object} other The other object to compare.
- * @param {Function} equalFunc The function to determine equivalents of values.
- * @param {Function} [customizer] The function to customize comparing objects.
- * @param {boolean} [isLoose] Specify performing partial comparisons.
- * @param {Array} [stackA=[]] Tracks traversed `value` objects.
- * @param {Array} [stackB=[]] Tracks traversed `other` objects.
- * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
- */
-function baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, stackB) {
-  var objIsArr = isArray(object),
-      othIsArr = isArray(other),
-      objTag = arrayTag,
-      othTag = arrayTag;
-
-  if (!objIsArr) {
-    objTag = objToString.call(object);
-    if (objTag == argsTag) {
-      objTag = objectTag;
-    } else if (objTag != objectTag) {
-      objIsArr = isTypedArray(object);
-    }
-  }
-  if (!othIsArr) {
-    othTag = objToString.call(other);
-    if (othTag == argsTag) {
-      othTag = objectTag;
-    } else if (othTag != objectTag) {
-      othIsArr = isTypedArray(other);
-    }
-  }
-  var objIsObj = objTag == objectTag && !isHostObject(object),
-      othIsObj = othTag == objectTag && !isHostObject(other),
-      isSameTag = objTag == othTag;
-
-  if (isSameTag && !(objIsArr || objIsObj)) {
-    return equalByTag(object, other, objTag);
-  }
-  if (!isLoose) {
-    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
-        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
-
-    if (objIsWrapped || othIsWrapped) {
-      return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, isLoose, stackA, stackB);
-    }
-  }
-  if (!isSameTag) {
-    return false;
-  }
-  // Assume cyclic values are equal.
-  // For more information on detecting circular references see https://es5.github.io/#JO.
-  stackA || (stackA = []);
-  stackB || (stackB = []);
-
-  var length = stackA.length;
-  while (length--) {
-    if (stackA[length] == object) {
-      return stackB[length] == other;
-    }
-  }
-  // Add `object` and `other` to the stack of traversed objects.
-  stackA.push(object);
-  stackB.push(other);
-
-  var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, isLoose, stackA, stackB);
-
-  stackA.pop();
-  stackB.pop();
-
-  return result;
-}
-
-module.exports = baseIsEqualDeep;
-
-},{"../lang/isArray":140,"../lang/isTypedArray":147,"./equalArrays":107,"./equalByTag":108,"./equalObjects":109,"./isHostObject":120}],81:[function(require,module,exports){
-var baseIsEqual = require('./baseIsEqual'),
-    toObject = require('./toObject');
-
-/**
- * The base implementation of `_.isMatch` without support for callback
- * shorthands and `this` binding.
- *
- * @private
- * @param {Object} object The object to inspect.
- * @param {Array} matchData The propery names, values, and compare flags to match.
- * @param {Function} [customizer] The function to customize comparing objects.
- * @returns {boolean} Returns `true` if `object` is a match, else `false`.
- */
-function baseIsMatch(object, matchData, customizer) {
-  var index = matchData.length,
-      length = index,
-      noCustomizer = !customizer;
-
-  if (object == null) {
-    return !length;
-  }
-  object = toObject(object);
-  while (index--) {
-    var data = matchData[index];
-    if ((noCustomizer && data[2])
-          ? data[1] !== object[data[0]]
-          : !(data[0] in object)
-        ) {
-      return false;
-    }
-  }
-  while (++index < length) {
-    data = matchData[index];
-    var key = data[0],
-        objValue = object[key],
-        srcValue = data[1];
-
-    if (noCustomizer && data[2]) {
-      if (objValue === undefined && !(key in object)) {
-        return false;
-      }
-    } else {
-      var result = customizer ? customizer(objValue, srcValue, key) : undefined;
-      if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, true) : result)) {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-module.exports = baseIsMatch;
-
-},{"./baseIsEqual":79,"./toObject":135}],82:[function(require,module,exports){
-/**
- * The function whose prototype all chaining wrappers inherit from.
- *
- * @private
- */
-function baseLodash() {
-  // No operation performed.
-}
-
-module.exports = baseLodash;
-
-},{}],83:[function(require,module,exports){
-var baseEach = require('./baseEach'),
-    isArrayLike = require('./isArrayLike');
-
-/**
- * The base implementation of `_.map` without support for callback shorthands
- * and `this` binding.
- *
- * @private
- * @param {Array|Object|string} collection The collection to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns the new mapped array.
- */
-function baseMap(collection, iteratee) {
-  var index = -1,
-      result = isArrayLike(collection) ? Array(collection.length) : [];
-
-  baseEach(collection, function(value, key, collection) {
-    result[++index] = iteratee(value, key, collection);
-  });
-  return result;
-}
-
-module.exports = baseMap;
-
-},{"./baseEach":71,"./isArrayLike":119}],84:[function(require,module,exports){
-var baseIsMatch = require('./baseIsMatch'),
-    getMatchData = require('./getMatchData'),
-    toObject = require('./toObject');
-
-/**
- * The base implementation of `_.matches` which does not clone `source`.
- *
- * @private
- * @param {Object} source The object of property values to match.
- * @returns {Function} Returns the new function.
- */
-function baseMatches(source) {
-  var matchData = getMatchData(source);
-  if (matchData.length == 1 && matchData[0][2]) {
-    var key = matchData[0][0],
-        value = matchData[0][1];
-
-    return function(object) {
-      if (object == null) {
-        return false;
-      }
-      object = toObject(object);
-      return object[key] === value && (value !== undefined || (key in object));
-    };
-  }
-  return function(object) {
-    return baseIsMatch(object, matchData);
-  };
-}
-
-module.exports = baseMatches;
-
-},{"./baseIsMatch":81,"./getMatchData":113,"./toObject":135}],85:[function(require,module,exports){
-var baseGet = require('./baseGet'),
-    baseIsEqual = require('./baseIsEqual'),
-    baseSlice = require('./baseSlice'),
-    isArray = require('../lang/isArray'),
-    isKey = require('./isKey'),
-    isStrictComparable = require('./isStrictComparable'),
-    last = require('../array/last'),
-    toObject = require('./toObject'),
-    toPath = require('./toPath');
-
-/**
- * The base implementation of `_.matchesProperty` which does not clone `srcValue`.
- *
- * @private
- * @param {string} path The path of the property to get.
- * @param {*} srcValue The value to compare.
- * @returns {Function} Returns the new function.
- */
-function baseMatchesProperty(path, srcValue) {
-  var isArr = isArray(path),
-      isCommon = isKey(path) && isStrictComparable(srcValue),
-      pathKey = (path + '');
-
-  path = toPath(path);
-  return function(object) {
-    if (object == null) {
-      return false;
-    }
-    var key = pathKey;
-    object = toObject(object);
-    if ((isArr || !isCommon) && !(key in object)) {
-      object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));
-      if (object == null) {
-        return false;
-      }
-      key = last(path);
-      object = toObject(object);
-    }
-    return object[key] === srcValue
-      ? (srcValue !== undefined || (key in object))
-      : baseIsEqual(srcValue, object[key], undefined, true);
-  };
-}
-
-module.exports = baseMatchesProperty;
-
-},{"../array/last":50,"../lang/isArray":140,"./baseGet":77,"./baseIsEqual":79,"./baseSlice":89,"./isKey":123,"./isStrictComparable":127,"./toObject":135,"./toPath":136}],86:[function(require,module,exports){
-var toObject = require('./toObject');
-
-/**
- * The base implementation of `_.property` without support for deep paths.
- *
- * @private
- * @param {string} key The key of the property to get.
- * @returns {Function} Returns the new function.
- */
-function baseProperty(key) {
-  return function(object) {
-    return object == null ? undefined : toObject(object)[key];
-  };
-}
-
-module.exports = baseProperty;
-
-},{"./toObject":135}],87:[function(require,module,exports){
-var baseGet = require('./baseGet'),
-    toPath = require('./toPath');
-
-/**
- * A specialized version of `baseProperty` which supports deep paths.
- *
- * @private
- * @param {Array|string} path The path of the property to get.
- * @returns {Function} Returns the new function.
- */
-function basePropertyDeep(path) {
-  var pathKey = (path + '');
-  path = toPath(path);
-  return function(object) {
-    return baseGet(object, path, pathKey);
-  };
-}
-
-module.exports = basePropertyDeep;
-
-},{"./baseGet":77,"./toPath":136}],88:[function(require,module,exports){
-var identity = require('../utility/identity'),
-    metaMap = require('./metaMap');
-
-/**
- * The base implementation of `setData` without support for hot loop detection.
- *
- * @private
- * @param {Function} func The function to associate metadata with.
- * @param {*} data The metadata.
- * @returns {Function} Returns `func`.
- */
-var baseSetData = !metaMap ? identity : function(func, data) {
-  metaMap.set(func, data);
-  return func;
-};
-
-module.exports = baseSetData;
-
-},{"../utility/identity":154,"./metaMap":129}],89:[function(require,module,exports){
-/**
- * The base implementation of `_.slice` without an iteratee call guard.
- *
- * @private
- * @param {Array} array The array to slice.
- * @param {number} [start=0] The start position.
- * @param {number} [end=array.length] The end position.
- * @returns {Array} Returns the slice of `array`.
- */
-function baseSlice(array, start, end) {
-  var index = -1,
-      length = array.length;
-
-  start = start == null ? 0 : (+start || 0);
-  if (start < 0) {
-    start = -start > length ? 0 : (length + start);
-  }
-  end = (end === undefined || end > length) ? length : (+end || 0);
-  if (end < 0) {
-    end += length;
-  }
-  length = start > end ? 0 : ((end - start) >>> 0);
-  start >>>= 0;
-
-  var result = Array(length);
-  while (++index < length) {
-    result[index] = array[index + start];
-  }
-  return result;
-}
-
-module.exports = baseSlice;
-
-},{}],90:[function(require,module,exports){
-/**
- * Converts `value` to a string if it's not one. An empty string is returned
- * for `null` or `undefined` values.
- *
- * @private
- * @param {*} value The value to process.
- * @returns {string} Returns the string.
- */
-function baseToString(value) {
-  return value == null ? '' : (value + '');
-}
-
-module.exports = baseToString;
-
-},{}],91:[function(require,module,exports){
-/**
- * The base implementation of `_.values` and `_.valuesIn` which creates an
- * array of `object` property values corresponding to the property names
- * of `props`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Array} props The property names to get values for.
- * @returns {Object} Returns the array of property values.
- */
-function baseValues(object, props) {
-  var index = -1,
-      length = props.length,
-      result = Array(length);
-
-  while (++index < length) {
-    result[index] = object[props[index]];
-  }
-  return result;
-}
-
-module.exports = baseValues;
-
-},{}],92:[function(require,module,exports){
-var binaryIndexBy = require('./binaryIndexBy'),
-    identity = require('../utility/identity');
-
-/** Used as references for the maximum length and index of an array. */
-var MAX_ARRAY_LENGTH = 4294967295,
-    HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;
-
-/**
- * Performs a binary search of `array` to determine the index at which `value`
- * should be inserted into `array` in order to maintain its sort order.
- *
- * @private
- * @param {Array} array The sorted array to inspect.
- * @param {*} value The value to evaluate.
- * @param {boolean} [retHighest] Specify returning the highest qualified index.
- * @returns {number} Returns the index at which `value` should be inserted
- *  into `array`.
- */
-function binaryIndex(array, value, retHighest) {
-  var low = 0,
-      high = array ? array.length : low;
-
-  if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {
-    while (low < high) {
-      var mid = (low + high) >>> 1,
-          computed = array[mid];
-
-      if ((retHighest ? (computed <= value) : (computed < value)) && computed !== null) {
-        low = mid + 1;
-      } else {
-        high = mid;
-      }
-    }
-    return high;
-  }
-  return binaryIndexBy(array, value, identity, retHighest);
-}
-
-module.exports = binaryIndex;
-
-},{"../utility/identity":154,"./binaryIndexBy":93}],93:[function(require,module,exports){
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeFloor = Math.floor,
-    nativeMin = Math.min;
-
-/** Used as references for the maximum length and index of an array. */
-var MAX_ARRAY_LENGTH = 4294967295,
-    MAX_ARRAY_INDEX = MAX_ARRAY_LENGTH - 1;
-
-/**
- * This function is like `binaryIndex` except that it invokes `iteratee` for
- * `value` and each element of `array` to compute their sort ranking. The
- * iteratee is invoked with one argument; (value).
- *
- * @private
- * @param {Array} array The sorted array to inspect.
- * @param {*} value The value to evaluate.
- * @param {Function} iteratee The function invoked per iteration.
- * @param {boolean} [retHighest] Specify returning the highest qualified index.
- * @returns {number} Returns the index at which `value` should be inserted
- *  into `array`.
- */
-function binaryIndexBy(array, value, iteratee, retHighest) {
-  value = iteratee(value);
-
-  var low = 0,
-      high = array ? array.length : 0,
-      valIsNaN = value !== value,
-      valIsNull = value === null,
-      valIsUndef = value === undefined;
-
-  while (low < high) {
-    var mid = nativeFloor((low + high) / 2),
-        computed = iteratee(array[mid]),
-        isDef = computed !== undefined,
-        isReflexive = computed === computed;
-
-    if (valIsNaN) {
-      var setLow = isReflexive || retHighest;
-    } else if (valIsNull) {
-      setLow = isReflexive && isDef && (retHighest || computed != null);
-    } else if (valIsUndef) {
-      setLow = isReflexive && (retHighest || isDef);
-    } else if (computed == null) {
-      setLow = false;
-    } else {
-      setLow = retHighest ? (computed <= value) : (computed < value);
-    }
-    if (setLow) {
-      low = mid + 1;
-    } else {
-      high = mid;
-    }
-  }
-  return nativeMin(high, MAX_ARRAY_INDEX);
-}
-
-module.exports = binaryIndexBy;
-
-},{}],94:[function(require,module,exports){
-var identity = require('../utility/identity');
-
-/**
- * A specialized version of `baseCallback` which only supports `this` binding
- * and specifying the number of arguments to provide to `func`.
- *
- * @private
- * @param {Function} func The function to bind.
- * @param {*} thisArg The `this` binding of `func`.
- * @param {number} [argCount] The number of arguments to provide to `func`.
- * @returns {Function} Returns the callback.
- */
-function bindCallback(func, thisArg, argCount) {
-  if (typeof func != 'function') {
-    return identity;
-  }
-  if (thisArg === undefined) {
-    return func;
-  }
-  switch (argCount) {
-    case 1: return function(value) {
-      return func.call(thisArg, value);
-    };
-    case 3: return function(value, index, collection) {
-      return func.call(thisArg, value, index, collection);
-    };
-    case 4: return function(accumulator, value, index, collection) {
-      return func.call(thisArg, accumulator, value, index, collection);
-    };
-    case 5: return function(value, other, key, object, source) {
-      return func.call(thisArg, value, other, key, object, source);
-    };
-  }
-  return function() {
-    return func.apply(thisArg, arguments);
-  };
-}
-
-module.exports = bindCallback;
-
-},{"../utility/identity":154}],95:[function(require,module,exports){
-(function (global){
-/** Native method references. */
-var ArrayBuffer = global.ArrayBuffer,
-    Uint8Array = global.Uint8Array;
-
-/**
- * Creates a clone of the given array buffer.
- *
- * @private
- * @param {ArrayBuffer} buffer The array buffer to clone.
- * @returns {ArrayBuffer} Returns the cloned array buffer.
- */
-function bufferClone(buffer) {
-  var result = new ArrayBuffer(buffer.byteLength),
-      view = new Uint8Array(result);
-
-  view.set(new Uint8Array(buffer));
-  return result;
-}
-
-module.exports = bufferClone;
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-
-},{}],96:[function(require,module,exports){
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * Creates an array that is the composition of partially applied arguments,
- * placeholders, and provided arguments into a single array of arguments.
- *
- * @private
- * @param {Array|Object} args The provided arguments.
- * @param {Array} partials The arguments to prepend to those provided.
- * @param {Array} holders The `partials` placeholder indexes.
- * @returns {Array} Returns the new array of composed arguments.
- */
-function composeArgs(args, partials, holders) {
-  var holdersLength = holders.length,
-      argsIndex = -1,
-      argsLength = nativeMax(args.length - holdersLength, 0),
-      leftIndex = -1,
-      leftLength = partials.length,
-      result = Array(leftLength + argsLength);
-
-  while (++leftIndex < leftLength) {
-    result[leftIndex] = partials[leftIndex];
-  }
-  while (++argsIndex < holdersLength) {
-    result[holders[argsIndex]] = args[argsIndex];
-  }
-  while (argsLength--) {
-    result[leftIndex++] = args[argsIndex++];
-  }
-  return result;
-}
-
-module.exports = composeArgs;
-
-},{}],97:[function(require,module,exports){
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * This function is like `composeArgs` except that the arguments composition
- * is tailored for `_.partialRight`.
- *
- * @private
- * @param {Array|Object} args The provided arguments.
- * @param {Array} partials The arguments to append to those provided.
- * @param {Array} holders The `partials` placeholder indexes.
- * @returns {Array} Returns the new array of composed arguments.
- */
-function composeArgsRight(args, partials, holders) {
-  var holdersIndex = -1,
-      holdersLength = holders.length,
-      argsIndex = -1,
-      argsLength = nativeMax(args.length - holdersLength, 0),
-      rightIndex = -1,
-      rightLength = partials.length,
-      result = Array(argsLength + rightLength);
-
-  while (++argsIndex < argsLength) {
-    result[argsIndex] = args[argsIndex];
-  }
-  var offset = argsIndex;
-  while (++rightIndex < rightLength) {
-    result[offset + rightIndex] = partials[rightIndex];
-  }
-  while (++holdersIndex < holdersLength) {
-    result[offset + holders[holdersIndex]] = args[argsIndex++];
-  }
-  return result;
-}
-
-module.exports = composeArgsRight;
-
-},{}],98:[function(require,module,exports){
-var getLength = require('./getLength'),
-    isLength = require('./isLength'),
-    toObject = require('./toObject');
-
-/**
- * Creates a `baseEach` or `baseEachRight` function.
- *
- * @private
- * @param {Function} eachFunc The function to iterate over a collection.
- * @param {boolean} [fromRight] Specify iterating from right to left.
- * @returns {Function} Returns the new base function.
- */
-function createBaseEach(eachFunc, fromRight) {
-  return function(collection, iteratee) {
-    var length = collection ? getLength(collection) : 0;
-    if (!isLength(length)) {
-      return eachFunc(collection, iteratee);
-    }
-    var index = fromRight ? length : -1,
-        iterable = toObject(collection);
-
-    while ((fromRight ? index-- : ++index < length)) {
-      if (iteratee(iterable[index], index, iterable) === false) {
-        break;
-      }
-    }
-    return collection;
-  };
-}
-
-module.exports = createBaseEach;
-
-},{"./getLength":112,"./isLength":125,"./toObject":135}],99:[function(require,module,exports){
-var toObject = require('./toObject');
-
-/**
- * Creates a base function for `_.forIn` or `_.forInRight`.
- *
- * @private
- * @param {boolean} [fromRight] Specify iterating from right to left.
- * @returns {Function} Returns the new base function.
- */
-function createBaseFor(fromRight) {
-  return function(object, iteratee, keysFunc) {
-    var iterable = toObject(object),
-        props = keysFunc(object),
-        length = props.length,
-        index = fromRight ? length : -1;
-
-    while ((fromRight ? index-- : ++index < length)) {
-      var key = props[index];
-      if (iteratee(iterable[key], key, iterable) === false) {
-        break;
-      }
-    }
-    return object;
-  };
-}
-
-module.exports = createBaseFor;
-
-},{"./toObject":135}],100:[function(require,module,exports){
-(function (global){
-var createCtorWrapper = require('./createCtorWrapper');
-
-/**
- * Creates a function that wraps `func` and invokes it with the `this`
- * binding of `thisArg`.
- *
- * @private
- * @param {Function} func The function to bind.
- * @param {*} [thisArg] The `this` binding of `func`.
- * @returns {Function} Returns the new bound function.
- */
-function createBindWrapper(func, thisArg) {
-  var Ctor = createCtorWrapper(func);
-
-  function wrapper() {
-    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;
-    return fn.apply(thisArg, arguments);
-  }
-  return wrapper;
-}
-
-module.exports = createBindWrapper;
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-
-},{"./createCtorWrapper":101}],101:[function(require,module,exports){
-var baseCreate = require('./baseCreate'),
-    isObject = require('../lang/isObject');
-
-/**
- * Creates a function that produces an instance of `Ctor` regardless of
- * whether it was invoked as part of a `new` expression or by `call` or `apply`.
- *
- * @private
- * @param {Function} Ctor The constructor to wrap.
- * @returns {Function} Returns the new wrapped function.
- */
-function createCtorWrapper(Ctor) {
-  return function() {
-    // Use a `switch` statement to work with class constructors.
-    // See http://ecma-international.org/ecma-262/6.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist
-    // for more details.
-    var args = arguments;
-    switch (args.length) {
-      case 0: return new Ctor;
-      case 1: return new Ctor(args[0]);
-      case 2: return new Ctor(args[0], args[1]);
-      case 3: return new Ctor(args[0], args[1], args[2]);
-      case 4: return new Ctor(args[0], args[1], args[2], args[3]);
-      case 5: return new Ctor(args[0], args[1], args[2], args[3], args[4]);
-      case 6: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5]);
-      case 7: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-    }
-    var thisBinding = baseCreate(Ctor.prototype),
-        result = Ctor.apply(thisBinding, args);
-
-    // Mimic the constructor's `return` behavior.
-    // See https://es5.github.io/#x13.2.2 for more details.
-    return isObject(result) ? result : thisBinding;
-  };
-}
-
-module.exports = createCtorWrapper;
-
-},{"../lang/isObject":144,"./baseCreate":70}],102:[function(require,module,exports){
-var baseCallback = require('./baseCallback'),
-    baseFind = require('./baseFind'),
-    baseFindIndex = require('./baseFindIndex'),
-    isArray = require('../lang/isArray');
-
-/**
- * Creates a `_.find` or `_.findLast` function.
- *
- * @private
- * @param {Function} eachFunc The function to iterate over a collection.
- * @param {boolean} [fromRight] Specify iterating from right to left.
- * @returns {Function} Returns the new find function.
- */
-function createFind(eachFunc, fromRight) {
-  return function(collection, predicate, thisArg) {
-    predicate = baseCallback(predicate, thisArg, 3);
-    if (isArray(collection)) {
-      var index = baseFindIndex(collection, predicate, fromRight);
-      return index > -1 ? collection[index] : undefined;
-    }
-    return baseFind(collection, predicate, eachFunc);
-  };
-}
-
-module.exports = createFind;
-
-},{"../lang/isArray":140,"./baseCallback":67,"./baseFind":72,"./baseFindIndex":73}],103:[function(require,module,exports){
-var bindCallback = require('./bindCallback'),
-    isArray = require('../lang/isArray');
-
-/**
- * Creates a function for `_.forEach` or `_.forEachRight`.
- *
- * @private
- * @param {Function} arrayFunc The function to iterate over an array.
- * @param {Function} eachFunc The function to iterate over a collection.
- * @returns {Function} Returns the new each function.
- */
-function createForEach(arrayFunc, eachFunc) {
-  return function(collection, iteratee, thisArg) {
-    return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection))
-      ? arrayFunc(collection, iteratee)
-      : eachFunc(collection, bindCallback(iteratee, thisArg, 3));
-  };
-}
-
-module.exports = createForEach;
-
-},{"../lang/isArray":140,"./bindCallback":94}],104:[function(require,module,exports){
-(function (global){
-var arrayCopy = require('./arrayCopy'),
-    composeArgs = require('./composeArgs'),
-    composeArgsRight = require('./composeArgsRight'),
-    createCtorWrapper = require('./createCtorWrapper'),
-    isLaziable = require('./isLaziable'),
-    reorder = require('./reorder'),
-    replaceHolders = require('./replaceHolders'),
-    setData = require('./setData');
-
-/** Used to compose bitmasks for wrapper metadata. */
-var BIND_FLAG = 1,
-    BIND_KEY_FLAG = 2,
-    CURRY_BOUND_FLAG = 4,
-    CURRY_FLAG = 8,
-    CURRY_RIGHT_FLAG = 16,
-    PARTIAL_FLAG = 32,
-    PARTIAL_RIGHT_FLAG = 64,
-    ARY_FLAG = 128;
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * Creates a function that wraps `func` and invokes it with optional `this`
- * binding of, partial application, and currying.
- *
- * @private
- * @param {Function|string} func The function or method name to reference.
- * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.
- * @param {*} [thisArg] The `this` binding of `func`.
- * @param {Array} [partials] The arguments to prepend to those provided to the new function.
- * @param {Array} [holders] The `partials` placeholder indexes.
- * @param {Array} [partialsRight] The arguments to append to those provided to the new function.
- * @param {Array} [holdersRight] The `partialsRight` placeholder indexes.
- * @param {Array} [argPos] The argument positions of the new function.
- * @param {number} [ary] The arity cap of `func`.
- * @param {number} [arity] The arity of `func`.
- * @returns {Function} Returns the new wrapped function.
- */
-function createHybridWrapper(func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity) {
-  var isAry = bitmask & ARY_FLAG,
-      isBind = bitmask & BIND_FLAG,
-      isBindKey = bitmask & BIND_KEY_FLAG,
-      isCurry = bitmask & CURRY_FLAG,
-      isCurryBound = bitmask & CURRY_BOUND_FLAG,
-      isCurryRight = bitmask & CURRY_RIGHT_FLAG,
-      Ctor = isBindKey ? undefined : createCtorWrapper(func);
-
-  function wrapper() {
-    // Avoid `arguments` object use disqualifying optimizations by
-    // converting it to an array before providing it to other functions.
-    var length = arguments.length,
-        index = length,
-        args = Array(length);
-
-    while (index--) {
-      args[index] = arguments[index];
-    }
-    if (partials) {
-      args = composeArgs(args, partials, holders);
-    }
-    if (partialsRight) {
-      args = composeArgsRight(args, partialsRight, holdersRight);
-    }
-    if (isCurry || isCurryRight) {
-      var placeholder = wrapper.placeholder,
-          argsHolders = replaceHolders(args, placeholder);
-
-      length -= argsHolders.length;
-      if (length < arity) {
-        var newArgPos = argPos ? arrayCopy(argPos) : undefined,
-            newArity = nativeMax(arity - length, 0),
-            newsHolders = isCurry ? argsHolders : undefined,
-            newHoldersRight = isCurry ? undefined : argsHolders,
-            newPartials = isCurry ? args : undefined,
-            newPartialsRight = isCurry ? undefined : args;
-
-        bitmask |= (isCurry ? PARTIAL_FLAG : PARTIAL_RIGHT_FLAG);
-        bitmask &= ~(isCurry ? PARTIAL_RIGHT_FLAG : PARTIAL_FLAG);
-
-        if (!isCurryBound) {
-          bitmask &= ~(BIND_FLAG | BIND_KEY_FLAG);
-        }
-        var newData = [func, bitmask, thisArg, newPartials, newsHolders, newPartialsRight, newHoldersRight, newArgPos, ary, newArity],
-            result = createHybridWrapper.apply(undefined, newData);
-
-        if (isLaziable(func)) {
-          setData(result, newData);
-        }
-        result.placeholder = placeholder;
-        return result;
-      }
-    }
-    var thisBinding = isBind ? thisArg : this,
-        fn = isBindKey ? thisBinding[func] : func;
-
-    if (argPos) {
-      args = reorder(args, argPos);
-    }
-    if (isAry && ary < args.length) {
-      args.length = ary;
-    }
-    if (this && this !== global && this instanceof wrapper) {
-      fn = Ctor || createCtorWrapper(func);
-    }
-    return fn.apply(thisBinding, args);
-  }
-  return wrapper;
-}
-
-module.exports = createHybridWrapper;
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-
-},{"./arrayCopy":62,"./composeArgs":96,"./composeArgsRight":97,"./createCtorWrapper":101,"./isLaziable":124,"./reorder":131,"./replaceHolders":132,"./setData":133}],105:[function(require,module,exports){
-(function (global){
-var createCtorWrapper = require('./createCtorWrapper');
-
-/** Used to compose bitmasks for wrapper metadata. */
-var BIND_FLAG = 1;
-
-/**
- * Creates a function that wraps `func` and invokes it with the optional `this`
- * binding of `thisArg` and the `partials` prepended to those provided to
- * the wrapper.
- *
- * @private
- * @param {Function} func The function to partially apply arguments to.
- * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.
- * @param {*} thisArg The `this` binding of `func`.
- * @param {Array} partials The arguments to prepend to those provided to the new function.
- * @returns {Function} Returns the new bound function.
- */
-function createPartialWrapper(func, bitmask, thisArg, partials) {
-  var isBind = bitmask & BIND_FLAG,
-      Ctor = createCtorWrapper(func);
-
-  function wrapper() {
-    // Avoid `arguments` object use disqualifying optimizations by
-    // converting it to an array before providing it `func`.
-    var argsIndex = -1,
-        argsLength = arguments.length,
-        leftIndex = -1,
-        leftLength = partials.length,
-        args = Array(leftLength + argsLength);
-
-    while (++leftIndex < leftLength) {
-      args[leftIndex] = partials[leftIndex];
-    }
-    while (argsLength--) {
-      args[leftIndex++] = arguments[++argsIndex];
-    }
-    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;
-    return fn.apply(isBind ? thisArg : this, args);
-  }
-  return wrapper;
-}
-
-module.exports = createPartialWrapper;
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-
-},{"./createCtorWrapper":101}],106:[function(require,module,exports){
-var baseSetData = require('./baseSetData'),
-    createBindWrapper = require('./createBindWrapper'),
-    createHybridWrapper = require('./createHybridWrapper'),
-    createPartialWrapper = require('./createPartialWrapper'),
-    getData = require('./getData'),
-    mergeData = require('./mergeData'),
-    setData = require('./setData');
-
-/** Used to compose bitmasks for wrapper metadata. */
-var BIND_FLAG = 1,
-    BIND_KEY_FLAG = 2,
-    PARTIAL_FLAG = 32,
-    PARTIAL_RIGHT_FLAG = 64;
-
-/** Used as the `TypeError` message for "Functions" methods. */
-var FUNC_ERROR_TEXT = 'Expected a function';
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMax = Math.max;
-
-/**
- * Creates a function that either curries or invokes `func` with optional
- * `this` binding and partially applied arguments.
- *
- * @private
- * @param {Function|string} func The function or method name to reference.
- * @param {number} bitmask The bitmask of flags.
- *  The bitmask may be composed of the following flags:
- *     1 - `_.bind`
- *     2 - `_.bindKey`
- *     4 - `_.curry` or `_.curryRight` of a bound function
- *     8 - `_.curry`
- *    16 - `_.curryRight`
- *    32 - `_.partial`
- *    64 - `_.partialRight`
- *   128 - `_.rearg`
- *   256 - `_.ary`
- * @param {*} [thisArg] The `this` binding of `func`.
- * @param {Array} [partials] The arguments to be partially applied.
- * @param {Array} [holders] The `partials` placeholder indexes.
- * @param {Array} [argPos] The argument positions of the new function.
- * @param {number} [ary] The arity cap of `func`.
- * @param {number} [arity] The arity of `func`.
- * @returns {Function} Returns the new wrapped function.
- */
-function createWrapper(func, bitmask, thisArg, partials, holders, argPos, ary, arity) {
-  var isBindKey = bitmask & BIND_KEY_FLAG;
-  if (!isBindKey && typeof func != 'function') {
-    throw new TypeError(FUNC_ERROR_TEXT);
-  }
-  var length = partials ? partials.length : 0;
-  if (!length) {
-    bitmask &= ~(PARTIAL_FLAG | PARTIAL_RIGHT_FLAG);
-    partials = holders = undefined;
-  }
-  length -= (holders ? holders.length : 0);
-  if (bitmask & PARTIAL_RIGHT_FLAG) {
-    var partialsRight = partials,
-        holdersRight = holders;
-
-    partials = holders = undefined;
-  }
-  var data = isBindKey ? undefined : getData(func),
-      newData = [func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity];
-
-  if (data) {
-    mergeData(newData, data);
-    bitmask = newData[1];
-    arity = newData[9];
-  }
-  newData[9] = arity == null
-    ? (isBindKey ? 0 : func.length)
-    : (nativeMax(arity - length, 0) || 0);
-
-  if (bitmask == BIND_FLAG) {
-    var result = createBindWrapper(newData[0], newData[2]);
-  } else if ((bitmask == PARTIAL_FLAG || bitmask == (BIND_FLAG | PARTIAL_FLAG)) && !newData[4].length) {
-    result = createPartialWrapper.apply(undefined, newData);
-  } else {
-    result = createHybridWrapper.apply(undefined, newData);
-  }
-  var setter = data ? baseSetData : setData;
-  return setter(result, newData);
-}
-
-module.exports = createWrapper;
-
-},{"./baseSetData":88,"./createBindWrapper":100,"./createHybridWrapper":104,"./createPartialWrapper":105,"./getData":110,"./mergeData":128,"./setData":133}],107:[function(require,module,exports){
-var arraySome = require('./arraySome');
-
-/**
- * A specialized version of `baseIsEqualDeep` for arrays with support for
- * partial deep comparisons.
- *
- * @private
- * @param {Array} array The array to compare.
- * @param {Array} other The other array to compare.
- * @param {Function} equalFunc The function to determine equivalents of values.
- * @param {Function} [customizer] The function to customize comparing arrays.
- * @param {boolean} [isLoose] Specify performing partial comparisons.
- * @param {Array} [stackA] Tracks traversed `value` objects.
- * @param {Array} [stackB] Tracks traversed `other` objects.
- * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
- */
-function equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stackB) {
-  var index = -1,
-      arrLength = array.length,
-      othLength = other.length;
-
-  if (arrLength != othLength && !(isLoose && othLength > arrLength)) {
-    return false;
-  }
-  // Ignore non-index properties.
-  while (++index < arrLength) {
-    var arrValue = array[index],
-        othValue = other[index],
-        result = customizer ? customizer(isLoose ? othValue : arrValue, isLoose ? arrValue : othValue, index) : undefined;
-
-    if (result !== undefined) {
-      if (result) {
-        continue;
-      }
-      return false;
-    }
-    // Recursively compare arrays (susceptible to call stack limits).
-    if (isLoose) {
-      if (!arraySome(other, function(othValue) {
-            return arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);
-          })) {
-        return false;
-      }
-    } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB))) {
-      return false;
-    }
-  }
-  return true;
-}
-
-module.exports = equalArrays;
-
-},{"./arraySome":65}],108:[function(require,module,exports){
-/** `Object#toString` result references. */
-var boolTag = '[object Boolean]',
-    dateTag = '[object Date]',
-    errorTag = '[object Error]',
-    numberTag = '[object Number]',
-    regexpTag = '[object RegExp]',
-    stringTag = '[object String]';
-
-/**
- * A specialized version of `baseIsEqualDeep` for comparing objects of
- * the same `toStringTag`.
- *
- * **Note:** This function only supports comparing values with tags of
- * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
- *
- * @private
- * @param {Object} object The object to compare.
- * @param {Object} other The other object to compare.
- * @param {string} tag The `toStringTag` of the objects to compare.
- * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
- */
-function equalByTag(object, other, tag) {
-  switch (tag) {
-    case boolTag:
-    case dateTag:
-      // Coerce dates and booleans to numbers, dates to milliseconds and booleans
-      // to `1` or `0` treating invalid dates coerced to `NaN` as not equal.
-      return +object == +other;
-
-    case errorTag:
-      return object.name == other.name && object.message == other.message;
-
-    case numberTag:
-      // Treat `NaN` vs. `NaN` as equal.
-      return (object != +object)
-        ? other != +other
-        : object == +other;
-
-    case regexpTag:
-    case stringTag:
-      // Coerce regexes to strings and treat strings primitives and string
-      // objects as equal. See https://es5.github.io/#x15.10.6.4 for more details.
-      return object == (other + '');
-  }
-  return false;
-}
-
-module.exports = equalByTag;
-
-},{}],109:[function(require,module,exports){
-var keys = require('../object/keys');
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * A specialized version of `baseIsEqualDeep` for objects with support for
- * partial deep comparisons.
- *
- * @private
- * @param {Object} object The object to compare.
- * @param {Object} other The other object to compare.
- * @param {Function} equalFunc The function to determine equivalents of values.
- * @param {Function} [customizer] The function to customize comparing values.
- * @param {boolean} [isLoose] Specify performing partial comparisons.
- * @param {Array} [stackA] Tracks traversed `value` objects.
- * @param {Array} [stackB] Tracks traversed `other` objects.
- * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
- */
-function equalObjects(object, other, equalFunc, customizer, isLoose, stackA, stackB) {
-  var objProps = keys(object),
-      objLength = objProps.length,
-      othProps = keys(other),
-      othLength = othProps.length;
-
-  if (objLength != othLength && !isLoose) {
-    return false;
-  }
-  var index = objLength;
-  while (index--) {
-    var key = objProps[index];
-    if (!(isLoose ? key in other : hasOwnProperty.call(other, key))) {
-      return false;
-    }
-  }
-  var skipCtor = isLoose;
-  while (++index < objLength) {
-    key = objProps[index];
-    var objValue = object[key],
-        othValue = other[key],
-        result = customizer ? customizer(isLoose ? othValue : objValue, isLoose? objValue : othValue, key) : undefined;
-
-    // Recursively compare objects (susceptible to call stack limits).
-    if (!(result === undefined ? equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB) : result)) {
-      return false;
-    }
-    skipCtor || (skipCtor = key == 'constructor');
-  }
-  if (!skipCtor) {
-    var objCtor = object.constructor,
-        othCtor = other.constructor;
-
-    // Non `Object` object instances with different constructors are not equal.
-    if (objCtor != othCtor &&
-        ('constructor' in object && 'constructor' in other) &&
-        !(typeof objCtor == 'function' && objCtor instanceof objCtor &&
-          typeof othCtor == 'function' && othCtor instanceof othCtor)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-module.exports = equalObjects;
-
-},{"../object/keys":149}],110:[function(require,module,exports){
-var metaMap = require('./metaMap'),
-    noop = require('../utility/noop');
-
-/**
- * Gets metadata for `func`.
- *
- * @private
- * @param {Function} func The function to query.
- * @returns {*} Returns the metadata for `func`.
- */
-var getData = !metaMap ? noop : function(func) {
-  return metaMap.get(func);
-};
-
-module.exports = getData;
-
-},{"../utility/noop":155,"./metaMap":129}],111:[function(require,module,exports){
-var realNames = require('./realNames');
-
-/**
- * Gets the name of `func`.
- *
- * @private
- * @param {Function} func The function to query.
- * @returns {string} Returns the function name.
- */
-function getFuncName(func) {
-  var result = (func.name + ''),
-      array = realNames[result],
-      length = array ? array.length : 0;
-
-  while (length--) {
-    var data = array[length],
-        otherFunc = data.func;
-    if (otherFunc == null || otherFunc == func) {
-      return data.name;
-    }
-  }
-  return result;
-}
-
-module.exports = getFuncName;
-
-},{"./realNames":130}],112:[function(require,module,exports){
-var baseProperty = require('./baseProperty');
-
-/**
- * Gets the "length" property value of `object`.
- *
- * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)
- * that affects Safari on at least iOS 8.1-8.3 ARM64.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {*} Returns the "length" value.
- */
-var getLength = baseProperty('length');
-
-module.exports = getLength;
-
-},{"./baseProperty":86}],113:[function(require,module,exports){
-var isStrictComparable = require('./isStrictComparable'),
-    pairs = require('../object/pairs');
-
-/**
- * Gets the propery names, values, and compare flags of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the match data of `object`.
- */
-function getMatchData(object) {
-  var result = pairs(object),
-      length = result.length;
-
-  while (length--) {
-    result[length][2] = isStrictComparable(result[length][1]);
-  }
-  return result;
-}
-
-module.exports = getMatchData;
-
-},{"../object/pairs":151,"./isStrictComparable":127}],114:[function(require,module,exports){
-var isNative = require('../lang/isNative');
-
-/**
- * Gets the native function at `key` of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {string} key The key of the method to get.
- * @returns {*} Returns the function if it's native, else `undefined`.
- */
-function getNative(object, key) {
-  var value = object == null ? undefined : object[key];
-  return isNative(value) ? value : undefined;
-}
-
-module.exports = getNative;
-
-},{"../lang/isNative":143}],115:[function(require,module,exports){
-/**
- * Gets the index at which the first occurrence of `NaN` is found in `array`.
- *
- * @private
- * @param {Array} array The array to search.
- * @param {number} fromIndex The index to search from.
- * @param {boolean} [fromRight] Specify iterating from right to left.
- * @returns {number} Returns the index of the matched `NaN`, else `-1`.
- */
-function indexOfNaN(array, fromIndex, fromRight) {
-  var length = array.length,
-      index = fromIndex + (fromRight ? 0 : -1);
-
-  while ((fromRight ? index-- : ++index < length)) {
-    var other = array[index];
-    if (other !== other) {
-      return index;
-    }
-  }
-  return -1;
-}
-
-module.exports = indexOfNaN;
-
-},{}],116:[function(require,module,exports){
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Initializes an array clone.
- *
- * @private
- * @param {Array} array The array to clone.
- * @returns {Array} Returns the initialized clone.
- */
-function initCloneArray(array) {
-  var length = array.length,
-      result = new array.constructor(length);
-
-  // Add array properties assigned by `RegExp#exec`.
-  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
-    result.index = array.index;
-    result.input = array.input;
-  }
-  return result;
-}
-
-module.exports = initCloneArray;
-
-},{}],117:[function(require,module,exports){
-(function (global){
-var bufferClone = require('./bufferClone');
-
-/** `Object#toString` result references. */
-var boolTag = '[object Boolean]',
-    dateTag = '[object Date]',
-    numberTag = '[object Number]',
-    regexpTag = '[object RegExp]',
-    stringTag = '[object String]';
-
-var arrayBufferTag = '[object ArrayBuffer]',
-    float32Tag = '[object Float32Array]',
-    float64Tag = '[object Float64Array]',
-    int8Tag = '[object Int8Array]',
-    int16Tag = '[object Int16Array]',
-    int32Tag = '[object Int32Array]',
-    uint8Tag = '[object Uint8Array]',
-    uint8ClampedTag = '[object Uint8ClampedArray]',
-    uint16Tag = '[object Uint16Array]',
-    uint32Tag = '[object Uint32Array]';
-
-/** Used to match `RegExp` flags from their coerced string values. */
-var reFlags = /\w*$/;
-
-/** Native method references. */
-var Uint8Array = global.Uint8Array;
-
-/** Used to lookup a type array constructors by `toStringTag`. */
-var ctorByTag = {};
-ctorByTag[float32Tag] = global.Float32Array;
-ctorByTag[float64Tag] = global.Float64Array;
-ctorByTag[int8Tag] = global.Int8Array;
-ctorByTag[int16Tag] = global.Int16Array;
-ctorByTag[int32Tag] = global.Int32Array;
-ctorByTag[uint8Tag] = Uint8Array;
-ctorByTag[uint8ClampedTag] = global.Uint8ClampedArray;
-ctorByTag[uint16Tag] = global.Uint16Array;
-ctorByTag[uint32Tag] = global.Uint32Array;
-
-/**
- * Initializes an object clone based on its `toStringTag`.
- *
- * **Note:** This function only supports cloning values with tags of
- * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
- *
- * @private
- * @param {Object} object The object to clone.
- * @param {string} tag The `toStringTag` of the object to clone.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Object} Returns the initialized clone.
- */
-function initCloneByTag(object, tag, isDeep) {
-  var Ctor = object.constructor;
-  switch (tag) {
-    case arrayBufferTag:
-      return bufferClone(object);
-
-    case boolTag:
-    case dateTag:
-      return new Ctor(+object);
-
-    case float32Tag: case float64Tag:
-    case int8Tag: case int16Tag: case int32Tag:
-    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
-      // Safari 5 mobile incorrectly has `Object` as the constructor of typed arrays.
-      if (Ctor instanceof Ctor) {
-        Ctor = ctorByTag[tag];
-      }
-      var buffer = object.buffer;
-      return new Ctor(isDeep ? bufferClone(buffer) : buffer, object.byteOffset, object.length);
-
-    case numberTag:
-    case stringTag:
-      return new Ctor(object);
-
-    case regexpTag:
-      var result = new Ctor(object.source, reFlags.exec(object));
-      result.lastIndex = object.lastIndex;
-  }
-  return result;
-}
-
-module.exports = initCloneByTag;
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-
-},{"./bufferClone":95}],118:[function(require,module,exports){
-/**
- * Initializes an object clone.
- *
- * @private
- * @param {Object} object The object to clone.
- * @returns {Object} Returns the initialized clone.
- */
-function initCloneObject(object) {
-  var Ctor = object.constructor;
-  if (!(typeof Ctor == 'function' && Ctor instanceof Ctor)) {
-    Ctor = Object;
-  }
-  return new Ctor;
-}
-
-module.exports = initCloneObject;
-
-},{}],119:[function(require,module,exports){
-var getLength = require('./getLength'),
-    isLength = require('./isLength');
-
-/**
- * Checks if `value` is array-like.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
- */
-function isArrayLike(value) {
-  return value != null && isLength(getLength(value));
-}
-
-module.exports = isArrayLike;
-
-},{"./getLength":112,"./isLength":125}],120:[function(require,module,exports){
-/**
- * Checks if `value` is a host object in IE < 9.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
- */
-var isHostObject = (function() {
-  try {
-    Object({ 'toString': 0 } + '');
-  } catch(e) {
-    return function() { return false; };
-  }
-  return function(value) {
-    // IE < 9 presents many host objects as `Object` objects that can coerce
-    // to strings despite having improperly defined `toString` methods.
-    return typeof value.toString != 'function' && typeof (value + '') == 'string';
-  };
-}());
-
-module.exports = isHostObject;
-
-},{}],121:[function(require,module,exports){
-/** Used to detect unsigned integer values. */
-var reIsUint = /^\d+$/;
-
-/**
- * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
- * of an array-like value.
- */
-var MAX_SAFE_INTEGER = 9007199254740991;
-
-/**
- * Checks if `value` is a valid array-like index.
- *
- * @private
- * @param {*} value The value to check.
- * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
- * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
- */
-function isIndex(value, length) {
-  value = (typeof value == 'number' || reIsUint.test(value)) ? +value : -1;
-  length = length == null ? MAX_SAFE_INTEGER : length;
-  return value > -1 && value % 1 == 0 && value < length;
-}
-
-module.exports = isIndex;
-
-},{}],122:[function(require,module,exports){
-var isArrayLike = require('./isArrayLike'),
-    isIndex = require('./isIndex'),
-    isObject = require('../lang/isObject');
-
-/**
- * Checks if the provided arguments are from an iteratee call.
- *
- * @private
- * @param {*} value The potential iteratee value argument.
- * @param {*} index The potential iteratee index or key argument.
- * @param {*} object The potential iteratee object argument.
- * @returns {boolean} Returns `true` if the arguments are from an iteratee call, else `false`.
- */
-function isIterateeCall(value, index, object) {
-  if (!isObject(object)) {
-    return false;
-  }
-  var type = typeof index;
-  if (type == 'number'
-      ? (isArrayLike(object) && isIndex(index, object.length))
-      : (type == 'string' && index in object)) {
-    var other = object[index];
-    return value === value ? (value === other) : (other !== other);
-  }
-  return false;
-}
-
-module.exports = isIterateeCall;
-
-},{"../lang/isObject":144,"./isArrayLike":119,"./isIndex":121}],123:[function(require,module,exports){
-var isArray = require('../lang/isArray'),
-    toObject = require('./toObject');
-
-/** Used to match property names within property paths. */
-var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,
-    reIsPlainProp = /^\w*$/;
-
-/**
- * Checks if `value` is a property name and not a property path.
- *
- * @private
- * @param {*} value The value to check.
- * @param {Object} [object] The object to query keys on.
- * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
- */
-function isKey(value, object) {
-  var type = typeof value;
-  if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') {
-    return true;
-  }
-  if (isArray(value)) {
-    return false;
-  }
-  var result = !reIsDeepProp.test(value);
-  return result || (object != null && value in toObject(object));
-}
-
-module.exports = isKey;
-
-},{"../lang/isArray":140,"./toObject":135}],124:[function(require,module,exports){
-var LazyWrapper = require('./LazyWrapper'),
-    getData = require('./getData'),
-    getFuncName = require('./getFuncName'),
-    lodash = require('../chain/lodash');
-
-/**
- * Checks if `func` has a lazy counterpart.
- *
- * @private
- * @param {Function} func The function to check.
- * @returns {boolean} Returns `true` if `func` has a lazy counterpart, else `false`.
- */
-function isLaziable(func) {
-  var funcName = getFuncName(func),
-      other = lodash[funcName];
-
-  if (typeof other != 'function' || !(funcName in LazyWrapper.prototype)) {
-    return false;
-  }
-  if (func === other) {
-    return true;
-  }
-  var data = getData(other);
-  return !!data && func === data[0];
-}
-
-module.exports = isLaziable;
-
-},{"../chain/lodash":51,"./LazyWrapper":60,"./getData":110,"./getFuncName":111}],125:[function(require,module,exports){
-/**
- * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
- * of an array-like value.
- */
-var MAX_SAFE_INTEGER = 9007199254740991;
-
-/**
- * Checks if `value` is a valid array-like length.
- *
- * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
- */
-function isLength(value) {
-  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
-}
-
-module.exports = isLength;
-
-},{}],126:[function(require,module,exports){
-/**
- * Checks if `value` is object-like.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
- */
-function isObjectLike(value) {
-  return !!value && typeof value == 'object';
-}
-
-module.exports = isObjectLike;
-
-},{}],127:[function(require,module,exports){
-var isObject = require('../lang/isObject');
-
-/**
- * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` if suitable for strict
- *  equality comparisons, else `false`.
- */
-function isStrictComparable(value) {
-  return value === value && !isObject(value);
-}
-
-module.exports = isStrictComparable;
-
-},{"../lang/isObject":144}],128:[function(require,module,exports){
-var arrayCopy = require('./arrayCopy'),
-    composeArgs = require('./composeArgs'),
-    composeArgsRight = require('./composeArgsRight'),
-    replaceHolders = require('./replaceHolders');
-
-/** Used to compose bitmasks for wrapper metadata. */
-var BIND_FLAG = 1,
-    CURRY_BOUND_FLAG = 4,
-    CURRY_FLAG = 8,
-    ARY_FLAG = 128,
-    REARG_FLAG = 256;
-
-/** Used as the internal argument placeholder. */
-var PLACEHOLDER = '__lodash_placeholder__';
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMin = Math.min;
-
-/**
- * Merges the function metadata of `source` into `data`.
- *
- * Merging metadata reduces the number of wrappers required to invoke a function.
- * This is possible because methods like `_.bind`, `_.curry`, and `_.partial`
- * may be applied regardless of execution order. Methods like `_.ary` and `_.rearg`
- * augment function arguments, making the order in which they are executed important,
- * preventing the merging of metadata. However, we make an exception for a safe
- * common case where curried functions have `_.ary` and or `_.rearg` applied.
- *
- * @private
- * @param {Array} data The destination metadata.
- * @param {Array} source The source metadata.
- * @returns {Array} Returns `data`.
- */
-function mergeData(data, source) {
-  var bitmask = data[1],
-      srcBitmask = source[1],
-      newBitmask = bitmask | srcBitmask,
-      isCommon = newBitmask < ARY_FLAG;
-
-  var isCombo =
-    (srcBitmask == ARY_FLAG && bitmask == CURRY_FLAG) ||
-    (srcBitmask == ARY_FLAG && bitmask == REARG_FLAG && data[7].length <= source[8]) ||
-    (srcBitmask == (ARY_FLAG | REARG_FLAG) && bitmask == CURRY_FLAG);
-
-  // Exit early if metadata can't be merged.
-  if (!(isCommon || isCombo)) {
-    return data;
-  }
-  // Use source `thisArg` if available.
-  if (srcBitmask & BIND_FLAG) {
-    data[2] = source[2];
-    // Set when currying a bound function.
-    newBitmask |= (bitmask & BIND_FLAG) ? 0 : CURRY_BOUND_FLAG;
-  }
-  // Compose partial arguments.
-  var value = source[3];
-  if (value) {
-    var partials = data[3];
-    data[3] = partials ? composeArgs(partials, value, source[4]) : arrayCopy(value);
-    data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : arrayCopy(source[4]);
-  }
-  // Compose partial right arguments.
-  value = source[5];
-  if (value) {
-    partials = data[5];
-    data[5] = partials ? composeArgsRight(partials, value, source[6]) : arrayCopy(value);
-    data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : arrayCopy(source[6]);
-  }
-  // Use source `argPos` if available.
-  value = source[7];
-  if (value) {
-    data[7] = arrayCopy(value);
-  }
-  // Use source `ary` if it's smaller.
-  if (srcBitmask & ARY_FLAG) {
-    data[8] = data[8] == null ? source[8] : nativeMin(data[8], source[8]);
-  }
-  // Use source `arity` if one is not provided.
-  if (data[9] == null) {
-    data[9] = source[9];
-  }
-  // Use source `func` and merge bitmasks.
-  data[0] = source[0];
-  data[1] = newBitmask;
-
-  return data;
-}
-
-module.exports = mergeData;
-
-},{"./arrayCopy":62,"./composeArgs":96,"./composeArgsRight":97,"./replaceHolders":132}],129:[function(require,module,exports){
-(function (global){
-var getNative = require('./getNative');
-
-/** Native method references. */
-var WeakMap = getNative(global, 'WeakMap');
-
-/** Used to store function metadata. */
-var metaMap = WeakMap && new WeakMap;
-
-module.exports = metaMap;
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-
-},{"./getNative":114}],130:[function(require,module,exports){
-/** Used to lookup unminified function names. */
-var realNames = {};
-
-module.exports = realNames;
-
-},{}],131:[function(require,module,exports){
-var arrayCopy = require('./arrayCopy'),
-    isIndex = require('./isIndex');
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeMin = Math.min;
-
-/**
- * Reorder `array` according to the specified indexes where the element at
- * the first index is assigned as the first element, the element at
- * the second index is assigned as the second element, and so on.
- *
- * @private
- * @param {Array} array The array to reorder.
- * @param {Array} indexes The arranged array indexes.
- * @returns {Array} Returns `array`.
- */
-function reorder(array, indexes) {
-  var arrLength = array.length,
-      length = nativeMin(indexes.length, arrLength),
-      oldArray = arrayCopy(array);
-
-  while (length--) {
-    var index = indexes[length];
-    array[length] = isIndex(index, arrLength) ? oldArray[index] : undefined;
-  }
-  return array;
-}
-
-module.exports = reorder;
-
-},{"./arrayCopy":62,"./isIndex":121}],132:[function(require,module,exports){
-/** Used as the internal argument placeholder. */
-var PLACEHOLDER = '__lodash_placeholder__';
-
-/**
- * Replaces all `placeholder` elements in `array` with an internal placeholder
- * and returns an array of their indexes.
- *
- * @private
- * @param {Array} array The array to modify.
- * @param {*} placeholder The placeholder to replace.
- * @returns {Array} Returns the new array of placeholder indexes.
- */
-function replaceHolders(array, placeholder) {
-  var index = -1,
-      length = array.length,
-      resIndex = -1,
-      result = [];
-
-  while (++index < length) {
-    if (array[index] === placeholder) {
-      array[index] = PLACEHOLDER;
-      result[++resIndex] = index;
-    }
-  }
-  return result;
-}
-
-module.exports = replaceHolders;
-
-},{}],133:[function(require,module,exports){
-var baseSetData = require('./baseSetData'),
-    now = require('../date/now');
-
-/** Used to detect when a function becomes hot. */
-var HOT_COUNT = 150,
-    HOT_SPAN = 16;
-
-/**
- * Sets metadata for `func`.
- *
- * **Note:** If this function becomes hot, i.e. is invoked a lot in a short
- * period of time, it will trip its breaker and transition to an identity function
- * to avoid garbage collection pauses in V8. See [V8 issue 2070](https://code.google.com/p/v8/issues/detail?id=2070)
- * for more details.
- *
- * @private
- * @param {Function} func The function to associate metadata with.
- * @param {*} data The metadata.
- * @returns {Function} Returns `func`.
- */
-var setData = (function() {
-  var count = 0,
-      lastCalled = 0;
-
-  return function(key, value) {
-    var stamp = now(),
-        remaining = HOT_SPAN - (stamp - lastCalled);
-
-    lastCalled = stamp;
-    if (remaining > 0) {
-      if (++count >= HOT_COUNT) {
-        return key;
-      }
-    } else {
-      count = 0;
-    }
-    return baseSetData(key, value);
-  };
-}());
-
-module.exports = setData;
-
-},{"../date/now":57,"./baseSetData":88}],134:[function(require,module,exports){
-var isArguments = require('../lang/isArguments'),
-    isArray = require('../lang/isArray'),
-    isIndex = require('./isIndex'),
-    isLength = require('./isLength'),
-    isString = require('../lang/isString'),
-    keysIn = require('../object/keysIn');
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * A fallback implementation of `Object.keys` which creates an array of the
- * own enumerable property names of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- */
-function shimKeys(object) {
-  var props = keysIn(object),
-      propsLength = props.length,
-      length = propsLength && object.length;
-
-  var allowIndexes = !!length && isLength(length) &&
-    (isArray(object) || isArguments(object) || isString(object));
-
-  var index = -1,
-      result = [];
-
-  while (++index < propsLength) {
-    var key = props[index];
-    if ((allowIndexes && isIndex(key, length)) || hasOwnProperty.call(object, key)) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-
-module.exports = shimKeys;
-
-},{"../lang/isArguments":139,"../lang/isArray":140,"../lang/isString":146,"../object/keysIn":150,"./isIndex":121,"./isLength":125}],135:[function(require,module,exports){
-var isObject = require('../lang/isObject'),
-    isString = require('../lang/isString'),
-    support = require('../support');
-
-/**
- * Converts `value` to an object if it's not one.
- *
- * @private
- * @param {*} value The value to process.
- * @returns {Object} Returns the object.
- */
-function toObject(value) {
-  if (support.unindexedChars && isString(value)) {
-    var index = -1,
-        length = value.length,
-        result = Object(value);
-
-    while (++index < length) {
-      result[index] = value.charAt(index);
-    }
-    return result;
-  }
-  return isObject(value) ? value : Object(value);
-}
-
-module.exports = toObject;
-
-},{"../lang/isObject":144,"../lang/isString":146,"../support":153}],136:[function(require,module,exports){
-var baseToString = require('./baseToString'),
-    isArray = require('../lang/isArray');
-
-/** Used to match property names within property paths. */
-var rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g;
-
-/** Used to match backslashes in property paths. */
-var reEscapeChar = /\\(\\)?/g;
-
-/**
- * Converts `value` to property path array if it's not one.
- *
- * @private
- * @param {*} value The value to process.
- * @returns {Array} Returns the property path array.
- */
-function toPath(value) {
-  if (isArray(value)) {
-    return value;
-  }
-  var result = [];
-  baseToString(value).replace(rePropName, function(match, number, quote, string) {
-    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));
-  });
-  return result;
-}
-
-module.exports = toPath;
-
-},{"../lang/isArray":140,"./baseToString":90}],137:[function(require,module,exports){
-var LazyWrapper = require('./LazyWrapper'),
-    LodashWrapper = require('./LodashWrapper'),
-    arrayCopy = require('./arrayCopy');
-
-/**
- * Creates a clone of `wrapper`.
- *
- * @private
- * @param {Object} wrapper The wrapper to clone.
- * @returns {Object} Returns the cloned wrapper.
- */
-function wrapperClone(wrapper) {
-  return wrapper instanceof LazyWrapper
-    ? wrapper.clone()
-    : new LodashWrapper(wrapper.__wrapped__, wrapper.__chain__, arrayCopy(wrapper.__actions__));
-}
-
-module.exports = wrapperClone;
-
-},{"./LazyWrapper":60,"./LodashWrapper":61,"./arrayCopy":62}],138:[function(require,module,exports){
-var baseClone = require('../internal/baseClone'),
-    bindCallback = require('../internal/bindCallback');
-
-/**
- * Creates a deep clone of `value`. If `customizer` is provided it's invoked
- * to produce the cloned values. If `customizer` returns `undefined` cloning
- * is handled by the method instead. The `customizer` is bound to `thisArg`
- * and invoked with up to three argument; (value [, index|key, object]).
- *
- * **Note:** This method is loosely based on the
- * [structured clone algorithm](http://www.w3.org/TR/html5/infrastructure.html#internal-structured-cloning-algorithm).
- * The enumerable properties of `arguments` objects and objects created by
- * constructors other than `Object` are cloned to plain `Object` objects. An
- * empty object is returned for uncloneable values such as functions, DOM nodes,
- * Maps, Sets, and WeakMaps.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to deep clone.
- * @param {Function} [customizer] The function to customize cloning values.
- * @param {*} [thisArg] The `this` binding of `customizer`.
- * @returns {*} Returns the deep cloned value.
- * @example
- *
- * var users = [
- *   { 'user': 'barney' },
- *   { 'user': 'fred' }
- * ];
- *
- * var deep = _.cloneDeep(users);
- * deep[0] === users[0];
- * // => false
- *
- * // using a customizer callback
- * var el = _.cloneDeep(document.body, function(value) {
- *   if (_.isElement(value)) {
- *     return value.cloneNode(true);
- *   }
- * });
- *
- * el === document.body
- * // => false
- * el.nodeName
- * // => BODY
- * el.childNodes.length;
- * // => 20
- */
-function cloneDeep(value, customizer, thisArg) {
-  return typeof customizer == 'function'
-    ? baseClone(value, true, bindCallback(customizer, thisArg, 3))
-    : baseClone(value, true);
-}
-
-module.exports = cloneDeep;
-
-},{"../internal/baseClone":68,"../internal/bindCallback":94}],139:[function(require,module,exports){
-var isArrayLike = require('../internal/isArrayLike'),
-    isObjectLike = require('../internal/isObjectLike');
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/** Native method references. */
-var propertyIsEnumerable = objectProto.propertyIsEnumerable;
-
-/**
- * Checks if `value` is classified as an `arguments` object.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
- * @example
- *
- * _.isArguments(function() { return arguments; }());
- * // => true
- *
- * _.isArguments([1, 2, 3]);
- * // => false
- */
-function isArguments(value) {
-  return isObjectLike(value) && isArrayLike(value) &&
-    hasOwnProperty.call(value, 'callee') && !propertyIsEnumerable.call(value, 'callee');
-}
-
-module.exports = isArguments;
-
-},{"../internal/isArrayLike":119,"../internal/isObjectLike":126}],140:[function(require,module,exports){
-var getNative = require('../internal/getNative'),
-    isLength = require('../internal/isLength'),
-    isObjectLike = require('../internal/isObjectLike');
-
-/** `Object#toString` result references. */
-var arrayTag = '[object Array]';
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeIsArray = getNative(Array, 'isArray');
-
-/**
- * Checks if `value` is classified as an `Array` object.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
- * @example
- *
- * _.isArray([1, 2, 3]);
- * // => true
- *
- * _.isArray(function() { return arguments; }());
- * // => false
- */
-var isArray = nativeIsArray || function(value) {
-  return isObjectLike(value) && isLength(value.length) && objToString.call(value) == arrayTag;
-};
-
-module.exports = isArray;
-
-},{"../internal/getNative":114,"../internal/isLength":125,"../internal/isObjectLike":126}],141:[function(require,module,exports){
-var isArguments = require('./isArguments'),
-    isArray = require('./isArray'),
-    isArrayLike = require('../internal/isArrayLike'),
-    isFunction = require('./isFunction'),
-    isObjectLike = require('../internal/isObjectLike'),
-    isString = require('./isString'),
-    keys = require('../object/keys');
-
-/**
- * Checks if `value` is empty. A value is considered empty unless it's an
- * `arguments` object, array, string, or jQuery-like collection with a length
- * greater than `0` or an object with own enumerable properties.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {Array|Object|string} value The value to inspect.
- * @returns {boolean} Returns `true` if `value` is empty, else `false`.
- * @example
- *
- * _.isEmpty(null);
- * // => true
- *
- * _.isEmpty(true);
- * // => true
- *
- * _.isEmpty(1);
- * // => true
- *
- * _.isEmpty([1, 2, 3]);
- * // => false
- *
- * _.isEmpty({ 'a': 1 });
- * // => false
- */
-function isEmpty(value) {
-  if (value == null) {
-    return true;
-  }
-  if (isArrayLike(value) && (isArray(value) || isString(value) || isArguments(value) ||
-      (isObjectLike(value) && isFunction(value.splice)))) {
-    return !value.length;
-  }
-  return !keys(value).length;
-}
-
-module.exports = isEmpty;
-
-},{"../internal/isArrayLike":119,"../internal/isObjectLike":126,"../object/keys":149,"./isArguments":139,"./isArray":140,"./isFunction":142,"./isString":146}],142:[function(require,module,exports){
-var isObject = require('./isObject');
-
-/** `Object#toString` result references. */
-var funcTag = '[object Function]';
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/**
- * Checks if `value` is classified as a `Function` object.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
- * @example
- *
- * _.isFunction(_);
- * // => true
- *
- * _.isFunction(/abc/);
- * // => false
- */
-function isFunction(value) {
-  // The use of `Object#toString` avoids issues with the `typeof` operator
-  // in older versions of Chrome and Safari which return 'function' for regexes
-  // and Safari 8 which returns 'object' for typed array constructors.
-  return isObject(value) && objToString.call(value) == funcTag;
-}
-
-module.exports = isFunction;
-
-},{"./isObject":144}],143:[function(require,module,exports){
-var isFunction = require('./isFunction'),
-    isHostObject = require('../internal/isHostObject'),
-    isObjectLike = require('../internal/isObjectLike');
-
-/** Used to detect host constructors (Safari > 5). */
-var reIsHostCtor = /^\[object .+?Constructor\]$/;
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to resolve the decompiled source of functions. */
-var fnToString = Function.prototype.toString;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/** Used to detect if a method is native. */
-var reIsNative = RegExp('^' +
-  fnToString.call(hasOwnProperty).replace(/[\\^$.*+?()[\]{}|]/g, '\\$&')
-  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
-);
-
-/**
- * Checks if `value` is a native function.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a native function, else `false`.
- * @example
- *
- * _.isNative(Array.prototype.push);
- * // => true
- *
- * _.isNative(_);
- * // => false
- */
-function isNative(value) {
-  if (value == null) {
-    return false;
-  }
-  if (isFunction(value)) {
-    return reIsNative.test(fnToString.call(value));
-  }
-  return isObjectLike(value) && (isHostObject(value) ? reIsNative : reIsHostCtor).test(value);
-}
-
-module.exports = isNative;
-
-},{"../internal/isHostObject":120,"../internal/isObjectLike":126,"./isFunction":142}],144:[function(require,module,exports){
-/**
- * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
- * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an object, else `false`.
- * @example
- *
- * _.isObject({});
- * // => true
- *
- * _.isObject([1, 2, 3]);
- * // => true
- *
- * _.isObject(1);
- * // => false
- */
-function isObject(value) {
-  // Avoid a V8 JIT bug in Chrome 19-20.
-  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
-  var type = typeof value;
-  return !!value && (type == 'object' || type == 'function');
-}
-
-module.exports = isObject;
-
-},{}],145:[function(require,module,exports){
-var baseForIn = require('../internal/baseForIn'),
-    isArguments = require('./isArguments'),
-    isHostObject = require('../internal/isHostObject'),
-    isObjectLike = require('../internal/isObjectLike'),
-    support = require('../support');
-
-/** `Object#toString` result references. */
-var objectTag = '[object Object]';
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/**
- * Checks if `value` is a plain object, that is, an object created by the
- * `Object` constructor or one with a `[[Prototype]]` of `null`.
- *
- * **Note:** This method assumes objects created by the `Object` constructor
- * have no inherited enumerable properties.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- * }
- *
- * _.isPlainObject(new Foo);
- * // => false
- *
- * _.isPlainObject([1, 2, 3]);
- * // => false
- *
- * _.isPlainObject({ 'x': 0, 'y': 0 });
- * // => true
- *
- * _.isPlainObject(Object.create(null));
- * // => true
- */
-function isPlainObject(value) {
-  var Ctor;
-
-  // Exit early for non `Object` objects.
-  if (!(isObjectLike(value) && objToString.call(value) == objectTag && !isHostObject(value) && !isArguments(value)) ||
-      (!hasOwnProperty.call(value, 'constructor') && (Ctor = value.constructor, typeof Ctor == 'function' && !(Ctor instanceof Ctor)))) {
-    return false;
-  }
-  // IE < 9 iterates inherited properties before own properties. If the first
-  // iterated property is an object's own property then there are no inherited
-  // enumerable properties.
-  var result;
-  if (support.ownLast) {
-    baseForIn(value, function(subValue, key, object) {
-      result = hasOwnProperty.call(object, key);
-      return false;
-    });
-    return result !== false;
-  }
-  // In most environments an object's own properties are iterated before
-  // its inherited properties. If the last iterated property is an object's
-  // own property then there are no inherited enumerable properties.
-  baseForIn(value, function(subValue, key) {
-    result = key;
-  });
-  return result === undefined || hasOwnProperty.call(value, result);
-}
-
-module.exports = isPlainObject;
-
-},{"../internal/baseForIn":75,"../internal/isHostObject":120,"../internal/isObjectLike":126,"../support":153,"./isArguments":139}],146:[function(require,module,exports){
-var isObjectLike = require('../internal/isObjectLike');
-
-/** `Object#toString` result references. */
-var stringTag = '[object String]';
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/**
- * Checks if `value` is classified as a `String` primitive or object.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
- * @example
- *
- * _.isString('abc');
- * // => true
- *
- * _.isString(1);
- * // => false
- */
-function isString(value) {
-  return typeof value == 'string' || (isObjectLike(value) && objToString.call(value) == stringTag);
-}
-
-module.exports = isString;
-
-},{"../internal/isObjectLike":126}],147:[function(require,module,exports){
-var isLength = require('../internal/isLength'),
-    isObjectLike = require('../internal/isObjectLike');
-
-/** `Object#toString` result references. */
-var argsTag = '[object Arguments]',
-    arrayTag = '[object Array]',
-    boolTag = '[object Boolean]',
-    dateTag = '[object Date]',
-    errorTag = '[object Error]',
-    funcTag = '[object Function]',
-    mapTag = '[object Map]',
-    numberTag = '[object Number]',
-    objectTag = '[object Object]',
-    regexpTag = '[object RegExp]',
-    setTag = '[object Set]',
-    stringTag = '[object String]',
-    weakMapTag = '[object WeakMap]';
-
-var arrayBufferTag = '[object ArrayBuffer]',
-    float32Tag = '[object Float32Array]',
-    float64Tag = '[object Float64Array]',
-    int8Tag = '[object Int8Array]',
-    int16Tag = '[object Int16Array]',
-    int32Tag = '[object Int32Array]',
-    uint8Tag = '[object Uint8Array]',
-    uint8ClampedTag = '[object Uint8ClampedArray]',
-    uint16Tag = '[object Uint16Array]',
-    uint32Tag = '[object Uint32Array]';
-
-/** Used to identify `toStringTag` values of typed arrays. */
-var typedArrayTags = {};
-typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
-typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
-typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
-typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
-typedArrayTags[uint32Tag] = true;
-typedArrayTags[argsTag] = typedArrayTags[arrayTag] =
-typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =
-typedArrayTags[dateTag] = typedArrayTags[errorTag] =
-typedArrayTags[funcTag] = typedArrayTags[mapTag] =
-typedArrayTags[numberTag] = typedArrayTags[objectTag] =
-typedArrayTags[regexpTag] = typedArrayTags[setTag] =
-typedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/**
- * Checks if `value` is classified as a typed array.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
- * @example
- *
- * _.isTypedArray(new Uint8Array);
- * // => true
- *
- * _.isTypedArray([]);
- * // => false
- */
-function isTypedArray(value) {
-  return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[objToString.call(value)];
-}
-
-module.exports = isTypedArray;
-
-},{"../internal/isLength":125,"../internal/isObjectLike":126}],148:[function(require,module,exports){
-/**
- * Checks if `value` is `undefined`.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
- * @example
- *
- * _.isUndefined(void 0);
- * // => true
- *
- * _.isUndefined(null);
- * // => false
- */
-function isUndefined(value) {
-  return value === undefined;
-}
-
-module.exports = isUndefined;
-
-},{}],149:[function(require,module,exports){
-var getNative = require('../internal/getNative'),
-    isArrayLike = require('../internal/isArrayLike'),
-    isObject = require('../lang/isObject'),
-    shimKeys = require('../internal/shimKeys'),
-    support = require('../support');
-
-/* Native method references for those with the same name as other `lodash` methods. */
-var nativeKeys = getNative(Object, 'keys');
-
-/**
- * Creates an array of the own enumerable property names of `object`.
- *
- * **Note:** Non-object values are coerced to objects. See the
- * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)
- * for more details.
- *
- * @static
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.keys(new Foo);
- * // => ['a', 'b'] (iteration order is not guaranteed)
- *
- * _.keys('hi');
- * // => ['0', '1']
- */
-var keys = !nativeKeys ? shimKeys : function(object) {
-  var Ctor = object == null ? undefined : object.constructor;
-  if ((typeof Ctor == 'function' && Ctor.prototype === object) ||
-      (typeof object == 'function' ? support.enumPrototypes : isArrayLike(object))) {
-    return shimKeys(object);
-  }
-  return isObject(object) ? nativeKeys(object) : [];
-};
-
-module.exports = keys;
-
-},{"../internal/getNative":114,"../internal/isArrayLike":119,"../internal/shimKeys":134,"../lang/isObject":144,"../support":153}],150:[function(require,module,exports){
-var arrayEach = require('../internal/arrayEach'),
-    isArguments = require('../lang/isArguments'),
-    isArray = require('../lang/isArray'),
-    isFunction = require('../lang/isFunction'),
-    isIndex = require('../internal/isIndex'),
-    isLength = require('../internal/isLength'),
-    isObject = require('../lang/isObject'),
-    isString = require('../lang/isString'),
-    support = require('../support');
-
-/** `Object#toString` result references. */
-var arrayTag = '[object Array]',
-    boolTag = '[object Boolean]',
-    dateTag = '[object Date]',
-    errorTag = '[object Error]',
-    funcTag = '[object Function]',
-    numberTag = '[object Number]',
-    objectTag = '[object Object]',
-    regexpTag = '[object RegExp]',
-    stringTag = '[object String]';
-
-/** Used to fix the JScript `[[DontEnum]]` bug. */
-var shadowProps = [
-  'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable',
-  'toLocaleString', 'toString', 'valueOf'
-];
-
-/** Used for native method references. */
-var errorProto = Error.prototype,
-    objectProto = Object.prototype,
-    stringProto = String.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objToString = objectProto.toString;
-
-/** Used to avoid iterating over non-enumerable properties in IE < 9. */
-var nonEnumProps = {};
-nonEnumProps[arrayTag] = nonEnumProps[dateTag] = nonEnumProps[numberTag] = { 'constructor': true, 'toLocaleString': true, 'toString': true, 'valueOf': true };
-nonEnumProps[boolTag] = nonEnumProps[stringTag] = { 'constructor': true, 'toString': true, 'valueOf': true };
-nonEnumProps[errorTag] = nonEnumProps[funcTag] = nonEnumProps[regexpTag] = { 'constructor': true, 'toString': true };
-nonEnumProps[objectTag] = { 'constructor': true };
-
-arrayEach(shadowProps, function(key) {
-  for (var tag in nonEnumProps) {
-    if (hasOwnProperty.call(nonEnumProps, tag)) {
-      var props = nonEnumProps[tag];
-      props[key] = hasOwnProperty.call(props, key);
-    }
-  }
-});
-
-/**
- * Creates an array of the own and inherited enumerable property names of `object`.
- *
- * **Note:** Non-object values are coerced to objects.
- *
- * @static
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.keysIn(new Foo);
- * // => ['a', 'b', 'c'] (iteration order is not guaranteed)
- */
-function keysIn(object) {
-  if (object == null) {
-    return [];
-  }
-  if (!isObject(object)) {
-    object = Object(object);
-  }
-  var length = object.length;
-
-  length = (length && isLength(length) &&
-    (isArray(object) || isArguments(object) || isString(object)) && length) || 0;
-
-  var Ctor = object.constructor,
-      index = -1,
-      proto = (isFunction(Ctor) && Ctor.prototype) || objectProto,
-      isProto = proto === object,
-      result = Array(length),
-      skipIndexes = length > 0,
-      skipErrorProps = support.enumErrorProps && (object === errorProto || object instanceof Error),
-      skipProto = support.enumPrototypes && isFunction(object);
-
-  while (++index < length) {
-    result[index] = (index + '');
-  }
-  // lodash skips the `constructor` property when it infers it's iterating
-  // over a `prototype` object because IE < 9 can't set the `[[Enumerable]]`
-  // attribute of an existing property and the `constructor` property of a
-  // prototype defaults to non-enumerable.
-  for (var key in object) {
-    if (!(skipProto && key == 'prototype') &&
-        !(skipErrorProps && (key == 'message' || key == 'name')) &&
-        !(skipIndexes && isIndex(key, length)) &&
-        !(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {
-      result.push(key);
-    }
-  }
-  if (support.nonEnumShadows && object !== objectProto) {
-    var tag = object === stringProto ? stringTag : (object === errorProto ? errorTag : objToString.call(object)),
-        nonEnums = nonEnumProps[tag] || nonEnumProps[objectTag];
-
-    if (tag == objectTag) {
-      proto = objectProto;
-    }
-    length = shadowProps.length;
-    while (length--) {
-      key = shadowProps[length];
-      var nonEnum = nonEnums[key];
-      if (!(isProto && nonEnum) &&
-          (nonEnum ? hasOwnProperty.call(object, key) : object[key] !== proto[key])) {
-        result.push(key);
-      }
-    }
-  }
-  return result;
-}
-
-module.exports = keysIn;
-
-},{"../internal/arrayEach":63,"../internal/isIndex":121,"../internal/isLength":125,"../lang/isArguments":139,"../lang/isArray":140,"../lang/isFunction":142,"../lang/isObject":144,"../lang/isString":146,"../support":153}],151:[function(require,module,exports){
-var keys = require('./keys'),
-    toObject = require('../internal/toObject');
-
-/**
- * Creates a two dimensional array of the key-value pairs for `object`,
- * e.g. `[[key1, value1], [key2, value2]]`.
- *
- * @static
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the new array of key-value pairs.
- * @example
- *
- * _.pairs({ 'barney': 36, 'fred': 40 });
- * // => [['barney', 36], ['fred', 40]] (iteration order is not guaranteed)
- */
-function pairs(object) {
-  object = toObject(object);
-
-  var index = -1,
-      props = keys(object),
-      length = props.length,
-      result = Array(length);
-
-  while (++index < length) {
-    var key = props[index];
-    result[index] = [key, object[key]];
-  }
-  return result;
-}
-
-module.exports = pairs;
-
-},{"../internal/toObject":135,"./keys":149}],152:[function(require,module,exports){
-var baseValues = require('../internal/baseValues'),
-    keys = require('./keys');
-
-/**
- * Creates an array of the own enumerable property values of `object`.
- *
- * **Note:** Non-object values are coerced to objects.
- *
- * @static
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property values.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.values(new Foo);
- * // => [1, 2] (iteration order is not guaranteed)
- *
- * _.values('hi');
- * // => ['h', 'i']
- */
-function values(object) {
-  return baseValues(object, keys(object));
-}
-
-module.exports = values;
-
-},{"../internal/baseValues":91,"./keys":149}],153:[function(require,module,exports){
-/** Used for native method references. */
-var arrayProto = Array.prototype,
-    errorProto = Error.prototype,
-    objectProto = Object.prototype;
-
-/** Native method references. */
-var propertyIsEnumerable = objectProto.propertyIsEnumerable,
-    splice = arrayProto.splice;
-
-/**
- * An object environment feature flags.
- *
- * @static
- * @memberOf _
- * @type Object
- */
-var support = {};
-
-(function(x) {
-  var Ctor = function() { this.x = x; },
-      object = { '0': x, 'length': x },
-      props = [];
-
-  Ctor.prototype = { 'valueOf': x, 'y': x };
-  for (var key in new Ctor) { props.push(key); }
-
-  /**
-   * Detect if `name` or `message` properties of `Error.prototype` are
-   * enumerable by default (IE < 9, Safari < 5.1).
-   *
-   * @memberOf _.support
-   * @type boolean
-   */
-  support.enumErrorProps = propertyIsEnumerable.call(errorProto, 'message') ||
-    propertyIsEnumerable.call(errorProto, 'name');
-
-  /**
-   * Detect if `prototype` properties are enumerable by default.
-   *
-   * Firefox < 3.6, Opera > 9.50 - Opera < 11.60, and Safari < 5.1
-   * (if the prototype or a property on the prototype has been set)
-   * incorrectly set the `[[Enumerable]]` value of a function's `prototype`
-   * property to `true`.
-   *
-   * @memberOf _.support
-   * @type boolean
-   */
-  support.enumPrototypes = propertyIsEnumerable.call(Ctor, 'prototype');
-
-  /**
-   * Detect if properties shadowing those on `Object.prototype` are non-enumerable.
-   *
-   * In IE < 9 an object's own properties, shadowing non-enumerable ones,
-   * are made non-enumerable as well (a.k.a the JScript `[[DontEnum]]` bug).
-   *
-   * @memberOf _.support
-   * @type boolean
-   */
-  support.nonEnumShadows = !/valueOf/.test(props);
-
-  /**
-   * Detect if own properties are iterated after inherited properties (IE < 9).
-   *
-   * @memberOf _.support
-   * @type boolean
-   */
-  support.ownLast = props[0] != 'x';
-
-  /**
-   * Detect if `Array#shift` and `Array#splice` augment array-like objects
-   * correctly.
-   *
-   * Firefox < 10, compatibility modes of IE 8, and IE < 9 have buggy Array
-   * `shift()` and `splice()` functions that fail to remove the last element,
-   * `value[0]`, of array-like objects even though the "length" property is
-   * set to `0`. The `shift()` method is buggy in compatibility modes of IE 8,
-   * while `splice()` is buggy regardless of mode in IE < 9.
-   *
-   * @memberOf _.support
-   * @type boolean
-   */
-  support.spliceObjects = (splice.call(object, 0, 1), !object[0]);
-
-  /**
-   * Detect lack of support for accessing string characters by index.
-   *
-   * IE < 8 can't access characters by index. IE 8 can only access characters
-   * by index on string literals, not string objects.
-   *
-   * @memberOf _.support
-   * @type boolean
-   */
-  support.unindexedChars = ('x'[0] + Object('x')[0]) != 'xx';
-}(1, 0));
-
-module.exports = support;
-
-},{}],154:[function(require,module,exports){
-/**
- * This method returns the first argument provided to it.
- *
- * @static
- * @memberOf _
- * @category Utility
- * @param {*} value Any value.
- * @returns {*} Returns `value`.
- * @example
- *
- * var object = { 'user': 'fred' };
- *
- * _.identity(object) === object;
- * // => true
- */
-function identity(value) {
-  return value;
-}
-
-module.exports = identity;
-
-},{}],155:[function(require,module,exports){
-/**
- * A no-operation function that returns `undefined` regardless of the
- * arguments it receives.
- *
- * @static
- * @memberOf _
- * @category Utility
- * @example
- *
- * var object = { 'user': 'fred' };
- *
- * _.noop(object) === undefined;
- * // => true
- */
-function noop() {
-  // No operation performed.
-}
-
-module.exports = noop;
-
-},{}],156:[function(require,module,exports){
-var baseProperty = require('../internal/baseProperty'),
-    basePropertyDeep = require('../internal/basePropertyDeep'),
-    isKey = require('../internal/isKey');
-
-/**
- * Creates a function that returns the property value at `path` on a
- * given object.
- *
- * @static
- * @memberOf _
- * @category Utility
- * @param {Array|string} path The path of the property to get.
- * @returns {Function} Returns the new function.
- * @example
- *
- * var objects = [
- *   { 'a': { 'b': { 'c': 2 } } },
- *   { 'a': { 'b': { 'c': 1 } } }
- * ];
- *
- * _.map(objects, _.property('a.b.c'));
- * // => [2, 1]
- *
- * _.pluck(_.sortBy(objects, _.property(['a', 'b', 'c'])), 'a.b.c');
- * // => [1, 2]
- */
-function property(path) {
-  return isKey(path) ? baseProperty(path) : basePropertyDeep(path);
-}
-
-module.exports = property;
-
-},{"../internal/baseProperty":86,"../internal/basePropertyDeep":87,"../internal/isKey":123}],157:[function(require,module,exports){
-(function (process){
-// vim:ts=4:sts=4:sw=4:
-/*!
- *
- * Copyright 2009-2012 Kris Kowal under the terms of the MIT
- * license found at http://github.com/kriskowal/q/raw/master/LICENSE
- *
- * With parts by Tyler Close
- * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found
- * at http://www.opensource.org/licenses/mit-license.html
- * Forked at ref_send.js version: 2009-05-11
- *
- * With parts by Mark Miller
- * Copyright (C) 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-(function (definition) {
-    "use strict";
-
-    // This file will function properly as a <script> tag, or a module
-    // using CommonJS and NodeJS or RequireJS module formats.  In
-    // Common/Node/RequireJS, the module exports the Q API and when
-    // executed as a simple <script>, it creates a Q global instead.
-
-    // Montage Require
-    if (typeof bootstrap === "function") {
-        bootstrap("promise", definition);
-
-    // CommonJS
-    } else if (typeof exports === "object" && typeof module === "object") {
-        module.exports = definition();
-
-    // RequireJS
-    } else if (typeof define === "function" && define.amd) {
-        define(definition);
-
-    // SES (Secure EcmaScript)
-    } else if (typeof ses !== "undefined") {
-        if (!ses.ok()) {
-            return;
-        } else {
-            ses.makeQ = definition;
-        }
-
-    // <script>
-    } else if (typeof window !== "undefined" || typeof self !== "undefined") {
-        // Prefer window over self for add-on scripts. Use self for
-        // non-windowed contexts.
-        var global = typeof window !== "undefined" ? window : self;
-
-        // Get the `window` object, save the previous Q global
-        // and initialize Q as a global.
-        var previousQ = global.Q;
-        global.Q = definition();
-
-        // Add a noConflict function so Q can be removed from the
-        // global namespace.
-        global.Q.noConflict = function () {
-            global.Q = previousQ;
-            return this;
-        };
-
-    } else {
-        throw new Error("This environment was not anticipated by Q. Please file a bug.");
-    }
-
-})(function () {
-"use strict";
-
-var hasStacks = false;
-try {
-    throw new Error();
-} catch (e) {
-    hasStacks = !!e.stack;
-}
-
-// All code after this point will be filtered from stack traces reported
-// by Q.
-var qStartingLine = captureLine();
-var qFileName;
-
-// shims
-
-// used for fallback in "allResolved"
-var noop = function () {};
-
-// Use the fastest possible means to execute a task in a future turn
-// of the event loop.
-var nextTick =(function () {
-    // linked list of tasks (single, with head node)
-    var head = {task: void 0, next: null};
-    var tail = head;
-    var flushing = false;
-    var requestTick = void 0;
-    var isNodeJS = false;
-    // queue for late tasks, used by unhandled rejection tracking
-    var laterQueue = [];
-
-    function flush() {
-        /* jshint loopfunc: true */
-        var task, domain;
-
-        while (head.next) {
-            head = head.next;
-            task = head.task;
-            head.task = void 0;
-            domain = head.domain;
-
-            if (domain) {
-                head.domain = void 0;
-                domain.enter();
-            }
-            runSingle(task, domain);
-
-        }
-        while (laterQueue.length) {
-            task = laterQueue.pop();
-            runSingle(task);
-        }
-        flushing = false;
-    }
-    // runs a single function in the async queue
-    function runSingle(task, domain) {
-        try {
-            task();
-
-        } catch (e) {
-            if (isNodeJS) {
-                // In node, uncaught exceptions are considered fatal errors.
-                // Re-throw them synchronously to interrupt flushing!
-
-                // Ensure continuation if the uncaught exception is suppressed
-                // listening "uncaughtException" events (as domains does).
-                // Continue in next event to avoid tick recursion.
-                if (domain) {
-                    domain.exit();
-                }
-                setTimeout(flush, 0);
-                if (domain) {
-                    domain.enter();
-                }
-
-                throw e;
-
-            } else {
-                // In browsers, uncaught exceptions are not fatal.
-                // Re-throw them asynchronously to avoid slow-downs.
-                setTimeout(function () {
-                    throw e;
-                }, 0);
-            }
-        }
-
-        if (domain) {
-            domain.exit();
-        }
-    }
-
-    nextTick = function (task) {
-        tail = tail.next = {
-            task: task,
-            domain: isNodeJS && process.domain,
-            next: null
-        };
-
-        if (!flushing) {
-            flushing = true;
-            requestTick();
-        }
-    };
-
-    if (typeof process === "object" &&
-        process.toString() === "[object process]" && process.nextTick) {
-        // Ensure Q is in a real Node environment, with a `process.nextTick`.
-        // To see through fake Node environments:
-        // * Mocha test runner - exposes a `process` global without a `nextTick`
-        // * Browserify - exposes a `process.nexTick` function that uses
-        //   `setTimeout`. In this case `setImmediate` is preferred because
-        //    it is faster. Browserify's `process.toString()` yields
-        //   "[object Object]", while in a real Node environment
-        //   `process.nextTick()` yields "[object process]".
-        isNodeJS = true;
-
-        requestTick = function () {
-            process.nextTick(flush);
-        };
-
-    } else if (typeof setImmediate === "function") {
-        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate
-        if (typeof window !== "undefined") {
-            requestTick = setImmediate.bind(window, flush);
-        } else {
-            requestTick = function () {
-                setImmediate(flush);
-            };
-        }
-
-    } else if (typeof MessageChannel !== "undefined") {
-        // modern browsers
-        // http://www.nonblocking.io/2011/06/windownexttick.html
-        var channel = new MessageChannel();
-        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create
-        // working message ports the first time a page loads.
-        channel.port1.onmessage = function () {
-            requestTick = requestPortTick;
-            channel.port1.onmessage = flush;
-            flush();
-        };
-        var requestPortTick = function () {
-            // Opera requires us to provide a message payload, regardless of
-            // whether we use it.
-            channel.port2.postMessage(0);
-        };
-        requestTick = function () {
-            setTimeout(flush, 0);
-            requestPortTick();
-        };
-
-    } else {
-        // old browsers
-        requestTick = function () {
-            setTimeout(flush, 0);
-        };
-    }
-    // runs a task after all other tasks have been run
-    // this is useful for unhandled rejection tracking that needs to happen
-    // after all `then`d tasks have been run.
-    nextTick.runAfter = function (task) {
-        laterQueue.push(task);
-        if (!flushing) {
-            flushing = true;
-            requestTick();
-        }
-    };
-    return nextTick;
-})();
-
-// Attempt to make generics safe in the face of downstream
-// modifications.
-// There is no situation where this is necessary.
-// If you need a security guarantee, these primordials need to be
-// deeply frozen anyway, and if you don’t need a security guarantee,
-// this is just plain paranoid.
-// However, this **might** have the nice side-effect of reducing the size of
-// the minified code by reducing x.call() to merely x()
-// See Mark Miller’s explanation of what this does.
-// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming
-var call = Function.call;
-function uncurryThis(f) {
-    return function () {
-        return call.apply(f, arguments);
-    };
-}
-// This is equivalent, but slower:
-// uncurryThis = Function_bind.bind(Function_bind.call);
-// http://jsperf.com/uncurrythis
-
-var array_slice = uncurryThis(Array.prototype.slice);
-
-var array_reduce = uncurryThis(
-    Array.prototype.reduce || function (callback, basis) {
-        var index = 0,
-            length = this.length;
-        // concerning the initial value, if one is not provided
-        if (arguments.length === 1) {
-            // seek to the first value in the array, accounting
-            // for the possibility that is is a sparse array
-            do {
-                if (index in this) {
-                    basis = this[index++];
-                    break;
-                }
-                if (++index >= length) {
-                    throw new TypeError();
-                }
-            } while (1);
-        }
-        // reduce
-        for (; index < length; index++) {
-            // account for the possibility that the array is sparse
-            if (index in this) {
-                basis = callback(basis, this[index], index);
-            }
-        }
-        return basis;
-    }
-);
-
-var array_indexOf = uncurryThis(
-    Array.prototype.indexOf || function (value) {
-        // not a very good shim, but good enough for our one use of it
-        for (var i = 0; i < this.length; i++) {
-            if (this[i] === value) {
-                return i;
-            }
-        }
-        return -1;
-    }
-);
-
-var array_map = uncurryThis(
-    Array.prototype.map || function (callback, thisp) {
-        var self = this;
-        var collect = [];
-        array_reduce(self, function (undefined, value, index) {
-            collect.push(callback.call(thisp, value, index, self));
-        }, void 0);
-        return collect;
-    }
-);
-
-var object_create = Object.create || function (prototype) {
-    function Type() { }
-    Type.prototype = prototype;
-    return new Type();
-};
-
-var object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);
-
-var object_keys = Object.keys || function (object) {
-    var keys = [];
-    for (var key in object) {
-        if (object_hasOwnProperty(object, key)) {
-            keys.push(key);
-        }
-    }
-    return keys;
-};
-
-var object_toString = uncurryThis(Object.prototype.toString);
-
-function isObject(value) {
-    return value === Object(value);
-}
-
-// generator related shims
-
-// FIXME: Remove this function once ES6 generators are in SpiderMonkey.
-function isStopIteration(exception) {
-    return (
-        object_toString(exception) === "[object StopIteration]" ||
-        exception instanceof QReturnValue
-    );
-}
-
-// FIXME: Remove this helper and Q.return once ES6 generators are in
-// SpiderMonkey.
-var QReturnValue;
-if (typeof ReturnValue !== "undefined") {
-    QReturnValue = ReturnValue;
-} else {
-    QReturnValue = function (value) {
-        this.value = value;
-    };
-}
-
-// long stack traces
-
-var STACK_JUMP_SEPARATOR = "From previous event:";
-
-function makeStackTraceLong(error, promise) {
-    // If possible, transform the error stack trace by removing Node and Q
-    // cruft, then concatenating with the stack trace of `promise`. See #57.
-    if (hasStacks &&
-        promise.stack &&
-        typeof error === "object" &&
-        error !== null &&
-        error.stack &&
-        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1
-    ) {
-        var stacks = [];
-        for (var p = promise; !!p; p = p.source) {
-            if (p.stack) {
-                stacks.unshift(p.stack);
-            }
-        }
-        stacks.unshift(error.stack);
-
-        var concatedStacks = stacks.join("\n" + STACK_JUMP_SEPARATOR + "\n");
-        error.stack = filterStackString(concatedStacks);
-    }
-}
-
-function filterStackString(stackString) {
-    var lines = stackString.split("\n");
-    var desiredLines = [];
-    for (var i = 0; i < lines.length; ++i) {
-        var line = lines[i];
-
-        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {
-            desiredLines.push(line);
-        }
-    }
-    return desiredLines.join("\n");
-}
-
-function isNodeFrame(stackLine) {
-    return stackLine.indexOf("(module.js:") !== -1 ||
-           stackLine.indexOf("(node.js:") !== -1;
-}
-
-function getFileNameAndLineNumber(stackLine) {
-    // Named functions: "at functionName (filename:lineNumber:columnNumber)"
-    // In IE10 function name can have spaces ("Anonymous function") O_o
-    var attempt1 = /at .+ \((.+):(\d+):(?:\d+)\)$/.exec(stackLine);
-    if (attempt1) {
-        return [attempt1[1], Number(attempt1[2])];
-    }
-
-    // Anonymous functions: "at filename:lineNumber:columnNumber"
-    var attempt2 = /at ([^ ]+):(\d+):(?:\d+)$/.exec(stackLine);
-    if (attempt2) {
-        return [attempt2[1], Number(attempt2[2])];
-    }
-
-    // Firefox style: "function@filename:lineNumber or @filename:lineNumber"
-    var attempt3 = /.*@(.+):(\d+)$/.exec(stackLine);
-    if (attempt3) {
-        return [attempt3[1], Number(attempt3[2])];
-    }
-}
-
-function isInternalFrame(stackLine) {
-    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);
-
-    if (!fileNameAndLineNumber) {
-        return false;
-    }
-
-    var fileName = fileNameAndLineNumber[0];
-    var lineNumber = fileNameAndLineNumber[1];
-
-    return fileName === qFileName &&
-        lineNumber >= qStartingLine &&
-        lineNumber <= qEndingLine;
-}
-
-// discover own file name and line number range for filtering stack
-// traces
-function captureLine() {
-    if (!hasStacks) {
-        return;
-    }
-
-    try {
-        throw new Error();
-    } catch (e) {
-        var lines = e.stack.split("\n");
-        var firstLine = lines[0].indexOf("@") > 0 ? lines[1] : lines[2];
-        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);
-        if (!fileNameAndLineNumber) {
-            return;
-        }
-
-        qFileName = fileNameAndLineNumber[0];
-        return fileNameAndLineNumber[1];
-    }
-}
-
-function deprecate(callback, name, alternative) {
-    return function () {
-        if (typeof console !== "undefined" &&
-            typeof console.warn === "function") {
-            console.warn(name + " is deprecated, use " + alternative +
-                         " instead.", new Error("").stack);
-        }
-        return callback.apply(callback, arguments);
-    };
-}
-
-// end of shims
-// beginning of real work
-
-/**
- * Constructs a promise for an immediate reference, passes promises through, or
- * coerces promises from different systems.
- * @param value immediate reference or promise
- */
-function Q(value) {
-    // If the object is already a Promise, return it directly.  This enables
-    // the resolve function to both be used to created references from objects,
-    // but to tolerably coerce non-promises to promises.
-    if (value instanceof Promise) {
-        return value;
-    }
-
-    // assimilate thenables
-    if (isPromiseAlike(value)) {
-        return coerce(value);
-    } else {
-        return fulfill(value);
-    }
-}
-Q.resolve = Q;
-
-/**
- * Performs a task in a future turn of the event loop.
- * @param {Function} task
- */
-Q.nextTick = nextTick;
-
-/**
- * Controls whether or not long stack traces will be on
- */
-Q.longStackSupport = false;
-
-// enable long stacks if Q_DEBUG is set
-if (typeof process === "object" && process && process.env && process.env.Q_DEBUG) {
-    Q.longStackSupport = true;
-}
-
-/**
- * Constructs a {promise, resolve, reject} object.
- *
- * `resolve` is a callback to invoke with a more resolved value for the
- * promise. To fulfill the promise, invoke `resolve` with any value that is
- * not a thenable. To reject the promise, invoke `resolve` with a rejected
- * thenable, or invoke `reject` with the reason directly. To resolve the
- * promise to another thenable, thus putting it in the same state, invoke
- * `resolve` with that other thenable.
- */
-Q.defer = defer;
-function defer() {
-    // if "messages" is an "Array", that indicates that the promise has not yet
-    // been resolved.  If it is "undefined", it has been resolved.  Each
-    // element of the messages array is itself an array of complete arguments to
-    // forward to the resolved promise.  We coerce the resolution value to a
-    // promise using the `resolve` function because it handles both fully
-    // non-thenable values and other thenables gracefully.
-    var messages = [], progressListeners = [], resolvedPromise;
-
-    var deferred = object_create(defer.prototype);
-    var promise = object_create(Promise.prototype);
-
-    promise.promiseDispatch = function (resolve, op, operands) {
-        var args = array_slice(arguments);
-        if (messages) {
-            messages.push(args);
-            if (op === "when" && operands[1]) { // progress operand
-                progressListeners.push(operands[1]);
-            }
-        } else {
-            Q.nextTick(function () {
-                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);
-            });
-        }
-    };
-
-    // XXX deprecated
-    promise.valueOf = function () {
-        if (messages) {
-            return promise;
-        }
-        var nearerValue = nearer(resolvedPromise);
-        if (isPromise(nearerValue)) {
-            resolvedPromise = nearerValue; // shorten chain
-        }
-        return nearerValue;
-    };
-
-    promise.inspect = function () {
-        if (!resolvedPromise) {
-            return { state: "pending" };
-        }
-        return resolvedPromise.inspect();
-    };
-
-    if (Q.longStackSupport && hasStacks) {
-        try {
-            throw new Error();
-        } catch (e) {
-            // NOTE: don't try to use `Error.captureStackTrace` or transfer the
-            // accessor around; that causes memory leaks as per GH-111. Just
-            // reify the stack trace as a string ASAP.
-            //
-            // At the same time, cut off the first line; it's always just
-            // "[object Promise]\n", as per the `toString`.
-            promise.stack = e.stack.substring(e.stack.indexOf("\n") + 1);
-        }
-    }
-
-    // NOTE: we do the checks for `resolvedPromise` in each method, instead of
-    // consolidating them into `become`, since otherwise we'd create new
-    // promises with the lines `become(whatever(value))`. See e.g. GH-252.
-
-    function become(newPromise) {
-        resolvedPromise = newPromise;
-        promise.source = newPromise;
-
-        array_reduce(messages, function (undefined, message) {
-            Q.nextTick(function () {
-                newPromise.promiseDispatch.apply(newPromise, message);
-            });
-        }, void 0);
-
-        messages = void 0;
-        progressListeners = void 0;
-    }
-
-    deferred.promise = promise;
-    deferred.resolve = function (value) {
-        if (resolvedPromise) {
-            return;
-        }
-
-        become(Q(value));
-    };
-
-    deferred.fulfill = function (value) {
-        if (resolvedPromise) {
-            return;
-        }
-
-        become(fulfill(value));
-    };
-    deferred.reject = function (reason) {
-        if (resolvedPromise) {
-            return;
-        }
-
-        become(reject(reason));
-    };
-    deferred.notify = function (progress) {
-        if (resolvedPromise) {
-            return;
-        }
-
-        array_reduce(progressListeners, function (undefined, progressListener) {
-            Q.nextTick(function () {
-                progressListener(progress);
-            });
-        }, void 0);
-    };
-
-    return deferred;
-}
-
-/**
- * Creates a Node-style callback that will resolve or reject the deferred
- * promise.
- * @returns a nodeback
- */
-defer.prototype.makeNodeResolver = function () {
-    var self = this;
-    return function (error, value) {
-        if (error) {
-            self.reject(error);
-        } else if (arguments.length > 2) {
-            self.resolve(array_slice(arguments, 1));
-        } else {
-            self.resolve(value);
-        }
-    };
-};
-
-/**
- * @param resolver {Function} a function that returns nothing and accepts
- * the resolve, reject, and notify functions for a deferred.
- * @returns a promise that may be resolved with the given resolve and reject
- * functions, or rejected by a thrown exception in resolver
- */
-Q.Promise = promise; // ES6
-Q.promise = promise;
-function promise(resolver) {
-    if (typeof resolver !== "function") {
-        throw new TypeError("resolver must be a function.");
-    }
-    var deferred = defer();
-    try {
-        resolver(deferred.resolve, deferred.reject, deferred.notify);
-    } catch (reason) {
-        deferred.reject(reason);
-    }
-    return deferred.promise;
-}
-
-promise.race = race; // ES6
-promise.all = all; // ES6
-promise.reject = reject; // ES6
-promise.resolve = Q; // ES6
-
-// XXX experimental.  This method is a way to denote that a local value is
-// serializable and should be immediately dispatched to a remote upon request,
-// instead of passing a reference.
-Q.passByCopy = function (object) {
-    //freeze(object);
-    //passByCopies.set(object, true);
-    return object;
-};
-
-Promise.prototype.passByCopy = function () {
-    //freeze(object);
-    //passByCopies.set(object, true);
-    return this;
-};
-
-/**
- * If two promises eventually fulfill to the same value, promises that value,
- * but otherwise rejects.
- * @param x {Any*}
- * @param y {Any*}
- * @returns {Any*} a promise for x and y if they are the same, but a rejection
- * otherwise.
- *
- */
-Q.join = function (x, y) {
-    return Q(x).join(y);
-};
-
-Promise.prototype.join = function (that) {
-    return Q([this, that]).spread(function (x, y) {
-        if (x === y) {
-            // TODO: "===" should be Object.is or equiv
-            return x;
-        } else {
-            throw new Error("Can't join: not the same: " + x + " " + y);
-        }
-    });
-};
-
-/**
- * Returns a promise for the first of an array of promises to become settled.
- * @param answers {Array[Any*]} promises to race
- * @returns {Any*} the first promise to be settled
- */
-Q.race = race;
-function race(answerPs) {
-    return promise(function (resolve, reject) {
-        // Switch to this once we can assume at least ES5
-        // answerPs.forEach(function (answerP) {
-        //     Q(answerP).then(resolve, reject);
-        // });
-        // Use this in the meantime
-        for (var i = 0, len = answerPs.length; i < len; i++) {
-            Q(answerPs[i]).then(resolve, reject);
-        }
-    });
-}
-
-Promise.prototype.race = function () {
-    return this.then(Q.race);
-};
-
-/**
- * Constructs a Promise with a promise descriptor object and optional fallback
- * function.  The descriptor contains methods like when(rejected), get(name),
- * set(name, value), post(name, args), and delete(name), which all
- * return either a value, a promise for a value, or a rejection.  The fallback
- * accepts the operation name, a resolver, and any further arguments that would
- * have been forwarded to the appropriate method above had a method been
- * provided with the proper name.  The API makes no guarantees about the nature
- * of the returned object, apart from that it is usable whereever promises are
- * bought and sold.
- */
-Q.makePromise = Promise;
-function Promise(descriptor, fallback, inspect) {
-    if (fallback === void 0) {
-        fallback = function (op) {
-            return reject(new Error(
-                "Promise does not support operation: " + op
-            ));
-        };
-    }
-    if (inspect === void 0) {
-        inspect = function () {
-            return {state: "unknown"};
-        };
-    }
-
-    var promise = object_create(Promise.prototype);
-
-    promise.promiseDispatch = function (resolve, op, args) {
-        var result;
-        try {
-            if (descriptor[op]) {
-                result = descriptor[op].apply(promise, args);
-            } else {
-                result = fallback.call(promise, op, args);
-            }
-        } catch (exception) {
-            result = reject(exception);
-        }
-        if (resolve) {
-            resolve(result);
-        }
-    };
-
-    promise.inspect = inspect;
-
-    // XXX deprecated `valueOf` and `exception` support
-    if (inspect) {
-        var inspected = inspect();
-        if (inspected.state === "rejected") {
-            promise.exception = inspected.reason;
-        }
-
-        promise.valueOf = function () {
-            var inspected = inspect();
-            if (inspected.state === "pending" ||
-                inspected.state === "rejected") {
-                return promise;
-            }
-            return inspected.value;
-        };
-    }
-
-    return promise;
-}
-
-Promise.prototype.toString = function () {
-    return "[object Promise]";
-};
-
-Promise.prototype.then = function (fulfilled, rejected, progressed) {
-    var self = this;
-    var deferred = defer();
-    var done = false;   // ensure the untrusted promise makes at most a
-                        // single call to one of the callbacks
-
-    function _fulfilled(value) {
-        try {
-            return typeof fulfilled === "function" ? fulfilled(value) : value;
-        } catch (exception) {
-            return reject(exception);
-        }
-    }
-
-    function _rejected(exception) {
-        if (typeof rejected === "function") {
-            makeStackTraceLong(exception, self);
-            try {
-                return rejected(exception);
-            } catch (newException) {
-                return reject(newException);
-            }
-        }
-        return reject(exception);
-    }
-
-    function _progressed(value) {
-        return typeof progressed === "function" ? progressed(value) : value;
-    }
-
-    Q.nextTick(function () {
-        self.promiseDispatch(function (value) {
-            if (done) {
-                return;
-            }
-            done = true;
-
-            deferred.resolve(_fulfilled(value));
-        }, "when", [function (exception) {
-            if (done) {
-                return;
-            }
-            done = true;
-
-            deferred.resolve(_rejected(exception));
-        }]);
-    });
-
-    // Progress propagator need to be attached in the current tick.
-    self.promiseDispatch(void 0, "when", [void 0, function (value) {
-        var newValue;
-        var threw = false;
-        try {
-            newValue = _progressed(value);
-        } catch (e) {
-            threw = true;
-            if (Q.onerror) {
-                Q.onerror(e);
-            } else {
-                throw e;
-            }
-        }
-
-        if (!threw) {
-            deferred.notify(newValue);
-        }
-    }]);
-
-    return deferred.promise;
-};
-
-Q.tap = function (promise, callback) {
-    return Q(promise).tap(callback);
-};
-
-/**
- * Works almost like "finally", but not called for rejections.
- * Original resolution value is passed through callback unaffected.
- * Callback may return a promise that will be awaited for.
- * @param {Function} callback
- * @returns {Q.Promise}
- * @example
- * doSomething()
- *   .then(...)
- *   .tap(console.log)
- *   .then(...);
- */
-Promise.prototype.tap = function (callback) {
-    callback = Q(callback);
-
-    return this.then(function (value) {
-        return callback.fcall(value).thenResolve(value);
-    });
-};
-
-/**
- * Registers an observer on a promise.
- *
- * Guarantees:
- *
- * 1. that fulfilled and rejected will be called only once.
- * 2. that either the fulfilled callback or the rejected callback will be
- *    called, but not both.
- * 3. that fulfilled and rejected will not be called in this turn.
- *
- * @param value      promise or immediate reference to observe
- * @param fulfilled  function to be called with the fulfilled value
- * @param rejected   function to be called with the rejection exception
- * @param progressed function to be called on any progress notifications
- * @return promise for the return value from the invoked callback
- */
-Q.when = when;
-function when(value, fulfilled, rejected, progressed) {
-    return Q(value).then(fulfilled, rejected, progressed);
-}
-
-Promise.prototype.thenResolve = function (value) {
-    return this.then(function () { return value; });
-};
-
-Q.thenResolve = function (promise, value) {
-    return Q(promise).thenResolve(value);
-};
-
-Promise.prototype.thenReject = function (reason) {
-    return this.then(function () { throw reason; });
-};
-
-Q.thenReject = function (promise, reason) {
-    return Q(promise).thenReject(reason);
-};
-
-/**
- * If an object is not a promise, it is as "near" as possible.
- * If a promise is rejected, it is as "near" as possible too.
- * If it’s a fulfilled promise, the fulfillment value is nearer.
- * If it’s a deferred promise and the deferred has been resolved, the
- * resolution is "nearer".
- * @param object
- * @returns most resolved (nearest) form of the object
- */
-
-// XXX should we re-do this?
-Q.nearer = nearer;
-function nearer(value) {
-    if (isPromise(value)) {
-        var inspected = value.inspect();
-        if (inspected.state === "fulfilled") {
-            return inspected.value;
-        }
-    }
-    return value;
-}
-
-/**
- * @returns whether the given object is a promise.
- * Otherwise it is a fulfilled value.
- */
-Q.isPromise = isPromise;
-function isPromise(object) {
-    return object instanceof Promise;
-}
-
-Q.isPromiseAlike = isPromiseAlike;
-function isPromiseAlike(object) {
-    return isObject(object) && typeof object.then === "function";
-}
-
-/**
- * @returns whether the given object is a pending promise, meaning not
- * fulfilled or rejected.
- */
-Q.isPending = isPending;
-function isPending(object) {
-    return isPromise(object) && object.inspect().state === "pending";
-}
-
-Promise.prototype.isPending = function () {
-    return this.inspect().state === "pending";
-};
-
-/**
- * @returns whether the given object is a value or fulfilled
- * promise.
- */
-Q.isFulfilled = isFulfilled;
-function isFulfilled(object) {
-    return !isPromise(object) || object.inspect().state === "fulfilled";
-}
-
-Promise.prototype.isFulfilled = function () {
-    return this.inspect().state === "fulfilled";
-};
-
-/**
- * @returns whether the given object is a rejected promise.
- */
-Q.isRejected = isRejected;
-function isRejected(object) {
-    return isPromise(object) && object.inspect().state === "rejected";
-}
-
-Promise.prototype.isRejected = function () {
-    return this.inspect().state === "rejected";
-};
-
-//// BEGIN UNHANDLED REJECTION TRACKING
-
-// This promise library consumes exceptions thrown in handlers so they can be
-// handled by a subsequent promise.  The exceptions get added to this array when
-// they are created, and removed when they are handled.  Note that in ES6 or
-// shimmed environments, this would naturally be a `Set`.
-var unhandledReasons = [];
-var unhandledRejections = [];
-var reportedUnhandledRejections = [];
-var trackUnhandledRejections = true;
-
-function resetUnhandledRejections() {
-    unhandledReasons.length = 0;
-    unhandledRejections.length = 0;
-
-    if (!trackUnhandledRejections) {
-        trackUnhandledRejections = true;
-    }
-}
-
-function trackRejection(promise, reason) {
-    if (!trackUnhandledRejections) {
-        return;
-    }
-    if (typeof process === "object" && typeof process.emit === "function") {
-        Q.nextTick.runAfter(function () {
-            if (array_indexOf(unhandledRejections, promise) !== -1) {
-                process.emit("unhandledRejection", reason, promise);
-                reportedUnhandledRejections.push(promise);
-            }
-        });
-    }
-
-    unhandledRejections.push(promise);
-    if (reason && typeof reason.stack !== "undefined") {
-        unhandledReasons.push(reason.stack);
-    } else {
-        unhandledReasons.push("(no stack) " + reason);
-    }
-}
-
-function untrackRejection(promise) {
-    if (!trackUnhandledRejections) {
-        return;
-    }
-
-    var at = array_indexOf(unhandledRejections, promise);
-    if (at !== -1) {
-        if (typeof process === "object" && typeof process.emit === "function") {
-            Q.nextTick.runAfter(function () {
-                var atReport = array_indexOf(reportedUnhandledRejections, promise);
-                if (atReport !== -1) {
-                    process.emit("rejectionHandled", unhandledReasons[at], promise);
-                    reportedUnhandledRejections.splice(atReport, 1);
-                }
-            });
-        }
-        unhandledRejections.splice(at, 1);
-        unhandledReasons.splice(at, 1);
-    }
-}
-
-Q.resetUnhandledRejections = resetUnhandledRejections;
-
-Q.getUnhandledReasons = function () {
-    // Make a copy so that consumers can't interfere with our internal state.
-    return unhandledReasons.slice();
-};
-
-Q.stopUnhandledRejectionTracking = function () {
-    resetUnhandledRejections();
-    trackUnhandledRejections = false;
-};
-
-resetUnhandledRejections();
-
-//// END UNHANDLED REJECTION TRACKING
-
-/**
- * Constructs a rejected promise.
- * @param reason value describing the failure
- */
-Q.reject = reject;
-function reject(reason) {
-    var rejection = Promise({
-        "when": function (rejected) {
-            // note that the error has been handled
-            if (rejected) {
-                untrackRejection(this);
-            }
-            return rejected ? rejected(reason) : this;
-        }
-    }, function fallback() {
-        return this;
-    }, function inspect() {
-        return { state: "rejected", reason: reason };
-    });
-
-    // Note that the reason has not been handled.
-    trackRejection(rejection, reason);
-
-    return rejection;
-}
-
-/**
- * Constructs a fulfilled promise for an immediate reference.
- * @param value immediate reference
- */
-Q.fulfill = fulfill;
-function fulfill(value) {
-    return Promise({
-        "when": function () {
-            return value;
-        },
-        "get": function (name) {
-            return value[name];
-        },
-        "set": function (name, rhs) {
-            value[name] = rhs;
-        },
-        "delete": function (name) {
-            delete value[name];
-        },
-        "post": function (name, args) {
-            // Mark Miller proposes that post with no name should apply a
-            // promised function.
-            if (name === null || name === void 0) {
-                return value.apply(void 0, args);
-            } else {
-                return value[name].apply(value, args);
-            }
-        },
-        "apply": function (thisp, args) {
-            return value.apply(thisp, args);
-        },
-        "keys": function () {
-            return object_keys(value);
-        }
-    }, void 0, function inspect() {
-        return { state: "fulfilled", value: value };
-    });
-}
-
-/**
- * Converts thenables to Q promises.
- * @param promise thenable promise
- * @returns a Q promise
- */
-function coerce(promise) {
-    var deferred = defer();
-    Q.nextTick(function () {
-        try {
-            promise.then(deferred.resolve, deferred.reject, deferred.notify);
-        } catch (exception) {
-            deferred.reject(exception);
-        }
-    });
-    return deferred.promise;
-}
-
-/**
- * Annotates an object such that it will never be
- * transferred away from this process over any promise
- * communication channel.
- * @param object
- * @returns promise a wrapping of that object that
- * additionally responds to the "isDef" message
- * without a rejection.
- */
-Q.master = master;
-function master(object) {
-    return Promise({
-        "isDef": function () {}
-    }, function fallback(op, args) {
-        return dispatch(object, op, args);
-    }, function () {
-        return Q(object).inspect();
-    });
-}
-
-/**
- * Spreads the values of a promised array of arguments into the
- * fulfillment callback.
- * @param fulfilled callback that receives variadic arguments from the
- * promised array
- * @param rejected callback that receives the exception if the promise
- * is rejected.
- * @returns a promise for the return value or thrown exception of
- * either callback.
- */
-Q.spread = spread;
-function spread(value, fulfilled, rejected) {
-    return Q(value).spread(fulfilled, rejected);
-}
-
-Promise.prototype.spread = function (fulfilled, rejected) {
-    return this.all().then(function (array) {
-        return fulfilled.apply(void 0, array);
-    }, rejected);
-};
-
-/**
- * The async function is a decorator for generator functions, turning
- * them into asynchronous generators.  Although generators are only part
- * of the newest ECMAScript 6 drafts, this code does not cause syntax
- * errors in older engines.  This code should continue to work and will
- * in fact improve over time as the language improves.
- *
- * ES6 generators are currently part of V8 version 3.19 with the
- * --harmony-generators runtime flag enabled.  SpiderMonkey has had them
- * for longer, but under an older Python-inspired form.  This function
- * works on both kinds of generators.
- *
- * Decorates a generator function such that:
- *  - it may yield promises
- *  - execution will continue when that promise is fulfilled
- *  - the value of the yield expression will be the fulfilled value
- *  - it returns a promise for the return value (when the generator
- *    stops iterating)
- *  - the decorated function returns a promise for the return value
- *    of the generator or the first rejected promise among those
- *    yielded.
- *  - if an error is thrown in the generator, it propagates through
- *    every following yield until it is caught, or until it escapes
- *    the generator function altogether, and is translated into a
- *    rejection for the promise returned by the decorated generator.
- */
-Q.async = async;
-function async(makeGenerator) {
-    return function () {
-        // when verb is "send", arg is a value
-        // when verb is "throw", arg is an exception
-        function continuer(verb, arg) {
-            var result;
-
-            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only
-            // engine that has a deployed base of browsers that support generators.
-            // However, SM's generators use the Python-inspired semantics of
-            // outdated ES6 drafts.  We would like to support ES6, but we'd also
-            // like to make it possible to use generators in deployed browsers, so
-            // we also support Python-style generators.  At some point we can remove
-            // this block.
-
-            if (typeof StopIteration === "undefined") {
-                // ES6 Generators
-                try {
-                    result = generator[verb](arg);
-                } catch (exception) {
-                    return reject(exception);
-                }
-                if (result.done) {
-                    return Q(result.value);
-                } else {
-                    return when(result.value, callback, errback);
-                }
-            } else {
-                // SpiderMonkey Generators
-                // FIXME: Remove this case when SM does ES6 generators.
-                try {
-                    result = generator[verb](arg);
-                } catch (exception) {
-                    if (isStopIteration(exception)) {
-                        return Q(exception.value);
-                    } else {
-                        return reject(exception);
-                    }
-                }
-                return when(result, callback, errback);
-            }
-        }
-        var generator = makeGenerator.apply(this, arguments);
-        var callback = continuer.bind(continuer, "next");
-        var errback = continuer.bind(continuer, "throw");
-        return callback();
-    };
-}
-
-/**
- * The spawn function is a small wrapper around async that immediately
- * calls the generator and also ends the promise chain, so that any
- * unhandled errors are thrown instead of forwarded to the error
- * handler. This is useful because it's extremely common to run
- * generators at the top-level to work with libraries.
- */
-Q.spawn = spawn;
-function spawn(makeGenerator) {
-    Q.done(Q.async(makeGenerator)());
-}
-
-// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.
-/**
- * Throws a ReturnValue exception to stop an asynchronous generator.
- *
- * This interface is a stop-gap measure to support generator return
- * values in older Firefox/SpiderMonkey.  In browsers that support ES6
- * generators like Chromium 29, just use "return" in your generator
- * functions.
- *
- * @param value the return value for the surrounding generator
- * @throws ReturnValue exception with the value.
- * @example
- * // ES6 style
- * Q.async(function* () {
- *      var foo = yield getFooPromise();
- *      var bar = yield getBarPromise();
- *      return foo + bar;
- * })
- * // Older SpiderMonkey style
- * Q.async(function () {
- *      var foo = yield getFooPromise();
- *      var bar = yield getBarPromise();
- *      Q.return(foo + bar);
- * })
- */
-Q["return"] = _return;
-function _return(value) {
-    throw new QReturnValue(value);
-}
-
-/**
- * The promised function decorator ensures that any promise arguments
- * are settled and passed as values (`this` is also settled and passed
- * as a value).  It will also ensure that the result of a function is
- * always a promise.
- *
- * @example
- * var add = Q.promised(function (a, b) {
- *     return a + b;
- * });
- * add(Q(a), Q(B));
- *
- * @param {function} callback The function to decorate
- * @returns {function} a function that has been decorated.
- */
-Q.promised = promised;
-function promised(callback) {
-    return function () {
-        return spread([this, all(arguments)], function (self, args) {
-            return callback.apply(self, args);
-        });
-    };
-}
-
-/**
- * sends a message to a value in a future turn
- * @param object* the recipient
- * @param op the name of the message operation, e.g., "when",
- * @param args further arguments to be forwarded to the operation
- * @returns result {Promise} a promise for the result of the operation
- */
-Q.dispatch = dispatch;
-function dispatch(object, op, args) {
-    return Q(object).dispatch(op, args);
-}
-
-Promise.prototype.dispatch = function (op, args) {
-    var self = this;
-    var deferred = defer();
-    Q.nextTick(function () {
-        self.promiseDispatch(deferred.resolve, op, args);
-    });
-    return deferred.promise;
-};
-
-/**
- * Gets the value of a property in a future turn.
- * @param object    promise or immediate reference for target object
- * @param name      name of property to get
- * @return promise for the property value
- */
-Q.get = function (object, key) {
-    return Q(object).dispatch("get", [key]);
-};
-
-Promise.prototype.get = function (key) {
-    return this.dispatch("get", [key]);
-};
-
-/**
- * Sets the value of a property in a future turn.
- * @param object    promise or immediate reference for object object
- * @param name      name of property to set
- * @param value     new value of property
- * @return promise for the return value
- */
-Q.set = function (object, key, value) {
-    return Q(object).dispatch("set", [key, value]);
-};
-
-Promise.prototype.set = function (key, value) {
-    return this.dispatch("set", [key, value]);
-};
-
-/**
- * Deletes a property in a future turn.
- * @param object    promise or immediate reference for target object
- * @param name      name of property to delete
- * @return promise for the return value
- */
-Q.del = // XXX legacy
-Q["delete"] = function (object, key) {
-    return Q(object).dispatch("delete", [key]);
-};
-
-Promise.prototype.del = // XXX legacy
-Promise.prototype["delete"] = function (key) {
-    return this.dispatch("delete", [key]);
-};
-
-/**
- * Invokes a method in a future turn.
- * @param object    promise or immediate reference for target object
- * @param name      name of method to invoke
- * @param value     a value to post, typically an array of
- *                  invocation arguments for promises that
- *                  are ultimately backed with `resolve` values,
- *                  as opposed to those backed with URLs
- *                  wherein the posted value can be any
- *                  JSON serializable object.
- * @return promise for the return value
- */
-// bound locally because it is used by other methods
-Q.mapply = // XXX As proposed by "Redsandro"
-Q.post = function (object, name, args) {
-    return Q(object).dispatch("post", [name, args]);
-};
-
-Promise.prototype.mapply = // XXX As proposed by "Redsandro"
-Promise.prototype.post = function (name, args) {
-    return this.dispatch("post", [name, args]);
-};
-
-/**
- * Invokes a method in a future turn.
- * @param object    promise or immediate reference for target object
- * @param name      name of method to invoke
- * @param ...args   array of invocation arguments
- * @return promise for the return value
- */
-Q.send = // XXX Mark Miller's proposed parlance
-Q.mcall = // XXX As proposed by "Redsandro"
-Q.invoke = function (object, name /*...args*/) {
-    return Q(object).dispatch("post", [name, array_slice(arguments, 2)]);
-};
-
-Promise.prototype.send = // XXX Mark Miller's proposed parlance
-Promise.prototype.mcall = // XXX As proposed by "Redsandro"
-Promise.prototype.invoke = function (name /*...args*/) {
-    return this.dispatch("post", [name, array_slice(arguments, 1)]);
-};
-
-/**
- * Applies the promised function in a future turn.
- * @param object    promise or immediate reference for target function
- * @param args      array of application arguments
- */
-Q.fapply = function (object, args) {
-    return Q(object).dispatch("apply", [void 0, args]);
-};
-
-Promise.prototype.fapply = function (args) {
-    return this.dispatch("apply", [void 0, args]);
-};
-
-/**
- * Calls the promised function in a future turn.
- * @param object    promise or immediate reference for target function
- * @param ...args   array of application arguments
- */
-Q["try"] =
-Q.fcall = function (object /* ...args*/) {
-    return Q(object).dispatch("apply", [void 0, array_slice(arguments, 1)]);
-};
-
-Promise.prototype.fcall = function (/*...args*/) {
-    return this.dispatch("apply", [void 0, array_slice(arguments)]);
-};
-
-/**
- * Binds the promised function, transforming return values into a fulfilled
- * promise and thrown errors into a rejected one.
- * @param object    promise or immediate reference for target function
- * @param ...args   array of application arguments
- */
-Q.fbind = function (object /*...args*/) {
-    var promise = Q(object);
-    var args = array_slice(arguments, 1);
-    return function fbound() {
-        return promise.dispatch("apply", [
-            this,
-            args.concat(array_slice(arguments))
-        ]);
-    };
-};
-Promise.prototype.fbind = function (/*...args*/) {
-    var promise = this;
-    var args = array_slice(arguments);
-    return function fbound() {
-        return promise.dispatch("apply", [
-            this,
-            args.concat(array_slice(arguments))
-        ]);
-    };
-};
-
-/**
- * Requests the names of the owned properties of a promised
- * object in a future turn.
- * @param object    promise or immediate reference for target object
- * @return promise for the keys of the eventually settled object
- */
-Q.keys = function (object) {
-    return Q(object).dispatch("keys", []);
-};
-
-Promise.prototype.keys = function () {
-    return this.dispatch("keys", []);
-};
-
-/**
- * Turns an array of promises into a promise for an array.  If any of
- * the promises gets rejected, the whole array is rejected immediately.
- * @param {Array*} an array (or promise for an array) of values (or
- * promises for values)
- * @returns a promise for an array of the corresponding values
- */
-// By Mark Miller
-// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled
-Q.all = all;
-function all(promises) {
-    return when(promises, function (promises) {
-        var pendingCount = 0;
-        var deferred = defer();
-        array_reduce(promises, function (undefined, promise, index) {
-            var snapshot;
-            if (
-                isPromise(promise) &&
-                (snapshot = promise.inspect()).state === "fulfilled"
-            ) {
-                promises[index] = snapshot.value;
-            } else {
-                ++pendingCount;
-                when(
-                    promise,
-                    function (value) {
-                        promises[index] = value;
-                        if (--pendingCount === 0) {
-                            deferred.resolve(promises);
-                        }
-                    },
-                    deferred.reject,
-                    function (progress) {
-                        deferred.notify({ index: index, value: progress });
-                    }
-                );
-            }
-        }, void 0);
-        if (pendingCount === 0) {
-            deferred.resolve(promises);
-        }
-        return deferred.promise;
-    });
-}
-
-Promise.prototype.all = function () {
-    return all(this);
-};
-
-/**
- * Returns the first resolved promise of an array. Prior rejected promises are
- * ignored.  Rejects only if all promises are rejected.
- * @param {Array*} an array containing values or promises for values
- * @returns a promise fulfilled with the value of the first resolved promise,
- * or a rejected promise if all promises are rejected.
- */
-Q.any = any;
-
-function any(promises) {
-    if (promises.length === 0) {
-        return Q.resolve();
-    }
-
-    var deferred = Q.defer();
-    var pendingCount = 0;
-    array_reduce(promises, function (prev, current, index) {
-        var promise = promises[index];
-
-        pendingCount++;
-
-        when(promise, onFulfilled, onRejected, onProgress);
-        function onFulfilled(result) {
-            deferred.resolve(result);
-        }
-        function onRejected() {
-            pendingCount--;
-            if (pendingCount === 0) {
-                deferred.reject(new Error(
-                    "Can't get fulfillment value from any promise, all " +
-                    "promises were rejected."
-                ));
-            }
-        }
-        function onProgress(progress) {
-            deferred.notify({
-                index: index,
-                value: progress
-            });
-        }
-    }, undefined);
-
-    return deferred.promise;
-}
-
-Promise.prototype.any = function () {
-    return any(this);
-};
-
-/**
- * Waits for all promises to be settled, either fulfilled or
- * rejected.  This is distinct from `all` since that would stop
- * waiting at the first rejection.  The promise returned by
- * `allResolved` will never be rejected.
- * @param promises a promise for an array (or an array) of promises
- * (or values)
- * @return a promise for an array of promises
- */
-Q.allResolved = deprecate(allResolved, "allResolved", "allSettled");
-function allResolved(promises) {
-    return when(promises, function (promises) {
-        promises = array_map(promises, Q);
-        return when(all(array_map(promises, function (promise) {
-            return when(promise, noop, noop);
-        })), function () {
-            return promises;
-        });
-    });
-}
-
-Promise.prototype.allResolved = function () {
-    return allResolved(this);
-};
-
-/**
- * @see Promise#allSettled
- */
-Q.allSettled = allSettled;
-function allSettled(promises) {
-    return Q(promises).allSettled();
-}
-
-/**
- * Turns an array of promises into a promise for an array of their states (as
- * returned by `inspect`) when they have all settled.
- * @param {Array[Any*]} values an array (or promise for an array) of values (or
- * promises for values)
- * @returns {Array[State]} an array of states for the respective values.
- */
-Promise.prototype.allSettled = function () {
-    return this.then(function (promises) {
-        return all(array_map(promises, function (promise) {
-            promise = Q(promise);
-            function regardless() {
-                return promise.inspect();
-            }
-            return promise.then(regardless, regardless);
-        }));
-    });
-};
-
-/**
- * Captures the failure of a promise, giving an oportunity to recover
- * with a callback.  If the given promise is fulfilled, the returned
- * promise is fulfilled.
- * @param {Any*} promise for something
- * @param {Function} callback to fulfill the returned promise if the
- * given promise is rejected
- * @returns a promise for the return value of the callback
- */
-Q.fail = // XXX legacy
-Q["catch"] = function (object, rejected) {
-    return Q(object).then(void 0, rejected);
-};
-
-Promise.prototype.fail = // XXX legacy
-Promise.prototype["catch"] = function (rejected) {
-    return this.then(void 0, rejected);
-};
-
-/**
- * Attaches a listener that can respond to progress notifications from a
- * promise's originating deferred. This listener receives the exact arguments
- * passed to ``deferred.notify``.
- * @param {Any*} promise for something
- * @param {Function} callback to receive any progress notifications
- * @returns the given promise, unchanged
- */
-Q.progress = progress;
-function progress(object, progressed) {
-    return Q(object).then(void 0, void 0, progressed);
-}
-
-Promise.prototype.progress = function (progressed) {
-    return this.then(void 0, void 0, progressed);
-};
-
-/**
- * Provides an opportunity to observe the settling of a promise,
- * regardless of whether the promise is fulfilled or rejected.  Forwards
- * the resolution to the returned promise when the callback is done.
- * The callback can return a promise to defer completion.
- * @param {Any*} promise
- * @param {Function} callback to observe the resolution of the given
- * promise, takes no arguments.
- * @returns a promise for the resolution of the given promise when
- * ``fin`` is done.
- */
-Q.fin = // XXX legacy
-Q["finally"] = function (object, callback) {
-    return Q(object)["finally"](callback);
-};
-
-Promise.prototype.fin = // XXX legacy
-Promise.prototype["finally"] = function (callback) {
-    callback = Q(callback);
-    return this.then(function (value) {
-        return callback.fcall().then(function () {
-            return value;
-        });
-    }, function (reason) {
-        // TODO attempt to recycle the rejection with "this".
-        return callback.fcall().then(function () {
-            throw reason;
-        });
-    });
-};
-
-/**
- * Terminates a chain of promises, forcing rejections to be
- * thrown as exceptions.
- * @param {Any*} promise at the end of a chain of promises
- * @returns nothing
- */
-Q.done = function (object, fulfilled, rejected, progress) {
-    return Q(object).done(fulfilled, rejected, progress);
-};
-
-Promise.prototype.done = function (fulfilled, rejected, progress) {
-    var onUnhandledError = function (error) {
-        // forward to a future turn so that ``when``
-        // does not catch it and turn it into a rejection.
-        Q.nextTick(function () {
-            makeStackTraceLong(error, promise);
-            if (Q.onerror) {
-                Q.onerror(error);
-            } else {
-                throw error;
-            }
-        });
-    };
-
-    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.
-    var promise = fulfilled || rejected || progress ?
-        this.then(fulfilled, rejected, progress) :
-        this;
-
-    if (typeof process === "object" && process && process.domain) {
-        onUnhandledError = process.domain.bind(onUnhandledError);
-    }
-
-    promise.then(void 0, onUnhandledError);
-};
-
-/**
- * Causes a promise to be rejected if it does not get fulfilled before
- * some milliseconds time out.
- * @param {Any*} promise
- * @param {Number} milliseconds timeout
- * @param {Any*} custom error message or Error object (optional)
- * @returns a promise for the resolution of the given promise if it is
- * fulfilled before the timeout, otherwise rejected.
- */
-Q.timeout = function (object, ms, error) {
-    return Q(object).timeout(ms, error);
-};
-
-Promise.prototype.timeout = function (ms, error) {
-    var deferred = defer();
-    var timeoutId = setTimeout(function () {
-        if (!error || "string" === typeof error) {
-            error = new Error(error || "Timed out after " + ms + " ms");
-            error.code = "ETIMEDOUT";
-        }
-        deferred.reject(error);
-    }, ms);
-
-    this.then(function (value) {
-        clearTimeout(timeoutId);
-        deferred.resolve(value);
-    }, function (exception) {
-        clearTimeout(timeoutId);
-        deferred.reject(exception);
-    }, deferred.notify);
-
-    return deferred.promise;
-};
-
-/**
- * Returns a promise for the given value (or promised value), some
- * milliseconds after it resolved. Passes rejections immediately.
- * @param {Any*} promise
- * @param {Number} milliseconds
- * @returns a promise for the resolution of the given promise after milliseconds
- * time has elapsed since the resolution of the given promise.
- * If the given promise rejects, that is passed immediately.
- */
-Q.delay = function (object, timeout) {
-    if (timeout === void 0) {
-        timeout = object;
-        object = void 0;
-    }
-    return Q(object).delay(timeout);
-};
-
-Promise.prototype.delay = function (timeout) {
-    return this.then(function (value) {
-        var deferred = defer();
-        setTimeout(function () {
-            deferred.resolve(value);
-        }, timeout);
-        return deferred.promise;
-    });
-};
-
-/**
- * Passes a continuation to a Node function, which is called with the given
- * arguments provided as an array, and returns a promise.
- *
- *      Q.nfapply(FS.readFile, [__filename])
- *      .then(function (content) {
- *      })
- *
- */
-Q.nfapply = function (callback, args) {
-    return Q(callback).nfapply(args);
-};
-
-Promise.prototype.nfapply = function (args) {
-    var deferred = defer();
-    var nodeArgs = array_slice(args);
-    nodeArgs.push(deferred.makeNodeResolver());
-    this.fapply(nodeArgs).fail(deferred.reject);
-    return deferred.promise;
-};
-
-/**
- * Passes a continuation to a Node function, which is called with the given
- * arguments provided individually, and returns a promise.
- * @example
- * Q.nfcall(FS.readFile, __filename)
- * .then(function (content) {
- * })
- *
- */
-Q.nfcall = function (callback /*...args*/) {
-    var args = array_slice(arguments, 1);
-    return Q(callback).nfapply(args);
-};
-
-Promise.prototype.nfcall = function (/*...args*/) {
-    var nodeArgs = array_slice(arguments);
-    var deferred = defer();
-    nodeArgs.push(deferred.makeNodeResolver());
-    this.fapply(nodeArgs).fail(deferred.reject);
-    return deferred.promise;
-};
-
-/**
- * Wraps a NodeJS continuation passing function and returns an equivalent
- * version that returns a promise.
- * @example
- * Q.nfbind(FS.readFile, __filename)("utf-8")
- * .then(console.log)
- * .done()
- */
-Q.nfbind =
-Q.denodeify = function (callback /*...args*/) {
-    var baseArgs = array_slice(arguments, 1);
-    return function () {
-        var nodeArgs = baseArgs.concat(array_slice(arguments));
-        var deferred = defer();
-        nodeArgs.push(deferred.makeNodeResolver());
-        Q(callback).fapply(nodeArgs).fail(deferred.reject);
-        return deferred.promise;
-    };
-};
-
-Promise.prototype.nfbind =
-Promise.prototype.denodeify = function (/*...args*/) {
-    var args = array_slice(arguments);
-    args.unshift(this);
-    return Q.denodeify.apply(void 0, args);
-};
-
-Q.nbind = function (callback, thisp /*...args*/) {
-    var baseArgs = array_slice(arguments, 2);
-    return function () {
-        var nodeArgs = baseArgs.concat(array_slice(arguments));
-        var deferred = defer();
-        nodeArgs.push(deferred.makeNodeResolver());
-        function bound() {
-            return callback.apply(thisp, arguments);
-        }
-        Q(bound).fapply(nodeArgs).fail(deferred.reject);
-        return deferred.promise;
-    };
-};
-
-Promise.prototype.nbind = function (/*thisp, ...args*/) {
-    var args = array_slice(arguments, 0);
-    args.unshift(this);
-    return Q.nbind.apply(void 0, args);
-};
-
-/**
- * Calls a method of a Node-style object that accepts a Node-style
- * callback with a given array of arguments, plus a provided callback.
- * @param object an object that has the named method
- * @param {String} name name of the method of object
- * @param {Array} args arguments to pass to the method; the callback
- * will be provided by Q and appended to these arguments.
- * @returns a promise for the value or error
- */
-Q.nmapply = // XXX As proposed by "Redsandro"
-Q.npost = function (object, name, args) {
-    return Q(object).npost(name, args);
-};
-
-Promise.prototype.nmapply = // XXX As proposed by "Redsandro"
-Promise.prototype.npost = function (name, args) {
-    var nodeArgs = array_slice(args || []);
-    var deferred = defer();
-    nodeArgs.push(deferred.makeNodeResolver());
-    this.dispatch("post", [name, nodeArgs]).fail(deferred.reject);
-    return deferred.promise;
-};
-
-/**
- * Calls a method of a Node-style object that accepts a Node-style
- * callback, forwarding the given variadic arguments, plus a provided
- * callback argument.
- * @param object an object that has the named method
- * @param {String} name name of the method of object
- * @param ...args arguments to pass to the method; the callback will
- * be provided by Q and appended to these arguments.
- * @returns a promise for the value or error
- */
-Q.nsend = // XXX Based on Mark Miller's proposed "send"
-Q.nmcall = // XXX Based on "Redsandro's" proposal
-Q.ninvoke = function (object, name /*...args*/) {
-    var nodeArgs = array_slice(arguments, 2);
-    var deferred = defer();
-    nodeArgs.push(deferred.makeNodeResolver());
-    Q(object).dispatch("post", [name, nodeArgs]).fail(deferred.reject);
-    return deferred.promise;
-};
-
-Promise.prototype.nsend = // XXX Based on Mark Miller's proposed "send"
-Promise.prototype.nmcall = // XXX Based on "Redsandro's" proposal
-Promise.prototype.ninvoke = function (name /*...args*/) {
-    var nodeArgs = array_slice(arguments, 1);
-    var deferred = defer();
-    nodeArgs.push(deferred.makeNodeResolver());
-    this.dispatch("post", [name, nodeArgs]).fail(deferred.reject);
-    return deferred.promise;
-};
-
-/**
- * If a function would like to support both Node continuation-passing-style and
- * promise-returning-style, it can end its internal promise chain with
- * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user
- * elects to use a nodeback, the result will be sent there.  If they do not
- * pass a nodeback, they will receive the result promise.
- * @param object a result (or a promise for a result)
- * @param {Function} nodeback a Node.js-style callback
- * @returns either the promise or nothing
- */
-Q.nodeify = nodeify;
-function nodeify(object, nodeback) {
-    return Q(object).nodeify(nodeback);
-}
-
-Promise.prototype.nodeify = function (nodeback) {
-    if (nodeback) {
-        this.then(function (value) {
-            Q.nextTick(function () {
-                nodeback(null, value);
-            });
-        }, function (error) {
-            Q.nextTick(function () {
-                nodeback(error);
-            });
-        });
-    } else {
-        return this;
-    }
-};
-
-Q.noConflict = function() {
-    throw new Error("Q.noConflict only works when Q is used as a global");
-};
-
-// All code before this point will be filtered from stack traces.
-var qEndingLine = captureLine();
-
-return Q;
-
-});
-
-}).call(this,require('_process'))
-
-},{"_process":12}],158:[function(require,module,exports){
-/**
- * Root reference for iframes.
- */
-
-var root;
-if (typeof window !== 'undefined') { // Browser window
-  root = window;
-} else if (typeof self !== 'undefined') { // Web Worker
-  root = self;
-} else { // Other environments
-  console.warn("Using browser-only version of superagent in non-browser environment");
-  root = this;
-}
-
-var Emitter = require('emitter');
-var requestBase = require('./request-base');
-var isObject = require('./is-object');
-
-/**
- * Noop.
- */
-
-function noop(){};
-
-/**
- * Expose `request`.
- */
-
-var request = module.exports = require('./request').bind(null, Request);
-
-/**
- * Determine XHR.
- */
-
-request.getXHR = function () {
-  if (root.XMLHttpRequest
-      && (!root.location || 'file:' != root.location.protocol
-          || !root.ActiveXObject)) {
-    return new XMLHttpRequest;
-  } else {
-    try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}
-    try { return new ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch(e) {}
-    try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}
-    try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
-  }
-  throw Error("Browser-only verison of superagent could not find XHR");
-};
-
-/**
- * Removes leading and trailing whitespace, added to support IE.
- *
- * @param {String} s
- * @return {String}
- * @api private
- */
-
-var trim = ''.trim
-  ? function(s) { return s.trim(); }
-  : function(s) { return s.replace(/(^\s*|\s*$)/g, ''); };
-
-/**
- * Serialize the given `obj`.
- *
- * @param {Object} obj
- * @return {String}
- * @api private
- */
-
-function serialize(obj) {
-  if (!isObject(obj)) return obj;
-  var pairs = [];
-  for (var key in obj) {
-    pushEncodedKeyValuePair(pairs, key, obj[key]);
-  }
-  return pairs.join('&');
-}
-
-/**
- * Helps 'serialize' with serializing arrays.
- * Mutates the pairs array.
- *
- * @param {Array} pairs
- * @param {String} key
- * @param {Mixed} val
- */
-
-function pushEncodedKeyValuePair(pairs, key, val) {
-  if (val != null) {
-    if (Array.isArray(val)) {
-      val.forEach(function(v) {
-        pushEncodedKeyValuePair(pairs, key, v);
-      });
-    } else if (isObject(val)) {
-      for(var subkey in val) {
-        pushEncodedKeyValuePair(pairs, key + '[' + subkey + ']', val[subkey]);
-      }
-    } else {
-      pairs.push(encodeURIComponent(key)
-        + '=' + encodeURIComponent(val));
-    }
-  } else if (val === null) {
-    pairs.push(encodeURIComponent(key));
-  }
-}
-
-/**
- * Expose serialization method.
- */
-
- request.serializeObject = serialize;
-
- /**
-  * Parse the given x-www-form-urlencoded `str`.
-  *
-  * @param {String} str
-  * @return {Object}
-  * @api private
-  */
-
-function parseString(str) {
-  var obj = {};
-  var pairs = str.split('&');
-  var pair;
-  var pos;
-
-  for (var i = 0, len = pairs.length; i < len; ++i) {
-    pair = pairs[i];
-    pos = pair.indexOf('=');
-    if (pos == -1) {
-      obj[decodeURIComponent(pair)] = '';
-    } else {
-      obj[decodeURIComponent(pair.slice(0, pos))] =
-        decodeURIComponent(pair.slice(pos + 1));
-    }
-  }
-
-  return obj;
-}
-
-/**
- * Expose parser.
- */
-
-request.parseString = parseString;
-
-/**
- * Default MIME type map.
- *
- *     superagent.types.xml = 'application/xml';
- *
- */
-
-request.types = {
-  html: 'text/html',
-  json: 'application/json',
-  xml: 'application/xml',
-  urlencoded: 'application/x-www-form-urlencoded',
-  'form': 'application/x-www-form-urlencoded',
-  'form-data': 'application/x-www-form-urlencoded'
-};
-
-/**
- * Default serialization map.
- *
- *     superagent.serialize['application/xml'] = function(obj){
- *       return 'generated xml here';
- *     };
- *
- */
-
- request.serialize = {
-   'application/x-www-form-urlencoded': serialize,
-   'application/json': JSON.stringify
- };
-
- /**
-  * Default parsers.
-  *
-  *     superagent.parse['application/xml'] = function(str){
-  *       return { object parsed from str };
-  *     };
-  *
-  */
-
-request.parse = {
-  'application/x-www-form-urlencoded': parseString,
-  'application/json': JSON.parse
-};
-
-/**
- * Parse the given header `str` into
- * an object containing the mapped fields.
- *
- * @param {String} str
- * @return {Object}
- * @api private
- */
-
-function parseHeader(str) {
-  var lines = str.split(/\r?\n/);
-  var fields = {};
-  var index;
-  var line;
-  var field;
-  var val;
-
-  lines.pop(); // trailing CRLF
-
-  for (var i = 0, len = lines.length; i < len; ++i) {
-    line = lines[i];
-    index = line.indexOf(':');
-    field = line.slice(0, index).toLowerCase();
-    val = trim(line.slice(index + 1));
-    fields[field] = val;
-  }
-
-  return fields;
-}
-
-/**
- * Check if `mime` is json or has +json structured syntax suffix.
- *
- * @param {String} mime
- * @return {Boolean}
- * @api private
- */
-
-function isJSON(mime) {
-  return /[\/+]json\b/.test(mime);
-}
-
-/**
- * Return the mime type for the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-function type(str){
-  return str.split(/ *; */).shift();
-};
-
-/**
- * Return header field parameters.
- *
- * @param {String} str
- * @return {Object}
- * @api private
- */
-
-function params(str){
-  return str.split(/ *; */).reduce(function(obj, str){
-    var parts = str.split(/ *= */),
-        key = parts.shift(),
-        val = parts.shift();
-
-    if (key && val) obj[key] = val;
-    return obj;
-  }, {});
-};
-
-/**
- * Initialize a new `Response` with the given `xhr`.
- *
- *  - set flags (.ok, .error, etc)
- *  - parse header
- *
- * Examples:
- *
- *  Aliasing `superagent` as `request` is nice:
- *
- *      request = superagent;
- *
- *  We can use the promise-like API, or pass callbacks:
- *
- *      request.get('/').end(function(res){});
- *      request.get('/', function(res){});
- *
- *  Sending data can be chained:
- *
- *      request
- *        .post('/user')
- *        .send({ name: 'tj' })
- *        .end(function(res){});
- *
- *  Or passed to `.send()`:
- *
- *      request
- *        .post('/user')
- *        .send({ name: 'tj' }, function(res){});
- *
- *  Or passed to `.post()`:
- *
- *      request
- *        .post('/user', { name: 'tj' })
- *        .end(function(res){});
- *
- * Or further reduced to a single call for simple cases:
- *
- *      request
- *        .post('/user', { name: 'tj' }, function(res){});
- *
- * @param {XMLHTTPRequest} xhr
- * @param {Object} options
- * @api private
- */
-
-function Response(req, options) {
-  options = options || {};
-  this.req = req;
-  this.xhr = this.req.xhr;
-  // responseText is accessible only if responseType is '' or 'text' and on older browsers
-  this.text = ((this.req.method !='HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text')) || typeof this.xhr.responseType === 'undefined')
-     ? this.xhr.responseText
-     : null;
-  this.statusText = this.req.xhr.statusText;
-  this._setStatusProperties(this.xhr.status);
-  this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());
-  // getAllResponseHeaders sometimes falsely returns "" for CORS requests, but
-  // getResponseHeader still works. so we get content-type even if getting
-  // other headers fails.
-  this.header['content-type'] = this.xhr.getResponseHeader('content-type');
-  this._setHeaderProperties(this.header);
-  this.body = this.req.method != 'HEAD'
-    ? this._parseBody(this.text ? this.text : this.xhr.response)
-    : null;
-}
-
-/**
- * Get case-insensitive `field` value.
- *
- * @param {String} field
- * @return {String}
- * @api public
- */
-
-Response.prototype.get = function(field){
-  return this.header[field.toLowerCase()];
-};
-
-/**
- * Set header related properties:
- *
- *   - `.type` the content type without params
- *
- * A response of "Content-Type: text/plain; charset=utf-8"
- * will provide you with a `.type` of "text/plain".
- *
- * @param {Object} header
- * @api private
- */
-
-Response.prototype._setHeaderProperties = function(header){
-  // content-type
-  var ct = this.header['content-type'] || '';
-  this.type = type(ct);
-
-  // params
-  var obj = params(ct);
-  for (var key in obj) this[key] = obj[key];
-};
-
-/**
- * Parse the given body `str`.
- *
- * Used for auto-parsing of bodies. Parsers
- * are defined on the `superagent.parse` object.
- *
- * @param {String} str
- * @return {Mixed}
- * @api private
- */
-
-Response.prototype._parseBody = function(str){
-  var parse = request.parse[this.type];
-  if (!parse && isJSON(this.type)) {
-    parse = request.parse['application/json'];
-  }
-  return parse && str && (str.length || str instanceof Object)
-    ? parse(str)
-    : null;
-};
-
-/**
- * Set flags such as `.ok` based on `status`.
- *
- * For example a 2xx response will give you a `.ok` of __true__
- * whereas 5xx will be __false__ and `.error` will be __true__. The
- * `.clientError` and `.serverError` are also available to be more
- * specific, and `.statusType` is the class of error ranging from 1..5
- * sometimes useful for mapping respond colors etc.
- *
- * "sugar" properties are also defined for common cases. Currently providing:
- *
- *   - .noContent
- *   - .badRequest
- *   - .unauthorized
- *   - .notAcceptable
- *   - .notFound
- *
- * @param {Number} status
- * @api private
- */
-
-Response.prototype._setStatusProperties = function(status){
-  // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request
-  if (status === 1223) {
-    status = 204;
-  }
-
-  var type = status / 100 | 0;
-
-  // status / class
-  this.status = this.statusCode = status;
-  this.statusType = type;
-
-  // basics
-  this.info = 1 == type;
-  this.ok = 2 == type;
-  this.clientError = 4 == type;
-  this.serverError = 5 == type;
-  this.error = (4 == type || 5 == type)
-    ? this.toError()
-    : false;
-
-  // sugar
-  this.accepted = 202 == status;
-  this.noContent = 204 == status;
-  this.badRequest = 400 == status;
-  this.unauthorized = 401 == status;
-  this.notAcceptable = 406 == status;
-  this.notFound = 404 == status;
-  this.forbidden = 403 == status;
-};
-
-/**
- * Return an `Error` representative of this response.
- *
- * @return {Error}
- * @api public
- */
-
-Response.prototype.toError = function(){
-  var req = this.req;
-  var method = req.method;
-  var url = req.url;
-
-  var msg = 'cannot ' + method + ' ' + url + ' (' + this.status + ')';
-  var err = new Error(msg);
-  err.status = this.status;
-  err.method = method;
-  err.url = url;
-
-  return err;
-};
-
-/**
- * Expose `Response`.
- */
-
-request.Response = Response;
-
-/**
- * Initialize a new `Request` with the given `method` and `url`.
- *
- * @param {String} method
- * @param {String} url
- * @api public
- */
-
-function Request(method, url) {
-  var self = this;
-  this._query = this._query || [];
-  this.method = method;
-  this.url = url;
-  this.header = {}; // preserves header name case
-  this._header = {}; // coerces header names to lowercase
-  this.on('end', function(){
-    var err = null;
-    var res = null;
-
-    try {
-      res = new Response(self);
-    } catch(e) {
-      err = new Error('Parser is unable to parse the response');
-      err.parse = true;
-      err.original = e;
-      // issue #675: return the raw response if the response parsing fails
-      err.rawResponse = self.xhr && self.xhr.responseText ? self.xhr.responseText : null;
-      // issue #876: return the http status code if the response parsing fails
-      err.statusCode = self.xhr && self.xhr.status ? self.xhr.status : null;
-      return self.callback(err);
-    }
-
-    self.emit('response', res);
-
-    var new_err;
-    try {
-      if (res.status < 200 || res.status >= 300) {
-        new_err = new Error(res.statusText || 'Unsuccessful HTTP response');
-        new_err.original = err;
-        new_err.response = res;
-        new_err.status = res.status;
-      }
-    } catch(e) {
-      new_err = e; // #985 touching res may cause INVALID_STATE_ERR on old Android
-    }
-
-    // #1000 don't catch errors from the callback to avoid double calling it
-    if (new_err) {
-      self.callback(new_err, res);
-    } else {
-      self.callback(null, res);
-    }
-  });
-}
-
-/**
- * Mixin `Emitter` and `requestBase`.
- */
-
-Emitter(Request.prototype);
-for (var key in requestBase) {
-  Request.prototype[key] = requestBase[key];
-}
-
-/**
- * Set Content-Type to `type`, mapping values from `request.types`.
- *
- * Examples:
- *
- *      superagent.types.xml = 'application/xml';
- *
- *      request.post('/')
- *        .type('xml')
- *        .send(xmlstring)
- *        .end(callback);
- *
- *      request.post('/')
- *        .type('application/xml')
- *        .send(xmlstring)
- *        .end(callback);
- *
- * @param {String} type
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.type = function(type){
-  this.set('Content-Type', request.types[type] || type);
-  return this;
-};
-
-/**
- * Set responseType to `val`. Presently valid responseTypes are 'blob' and
- * 'arraybuffer'.
- *
- * Examples:
- *
- *      req.get('/')
- *        .responseType('blob')
- *        .end(callback);
- *
- * @param {String} val
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.responseType = function(val){
-  this._responseType = val;
-  return this;
-};
-
-/**
- * Set Accept to `type`, mapping values from `request.types`.
- *
- * Examples:
- *
- *      superagent.types.json = 'application/json';
- *
- *      request.get('/agent')
- *        .accept('json')
- *        .end(callback);
- *
- *      request.get('/agent')
- *        .accept('application/json')
- *        .end(callback);
- *
- * @param {String} accept
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.accept = function(type){
-  this.set('Accept', request.types[type] || type);
-  return this;
-};
-
-/**
- * Set Authorization field value with `user` and `pass`.
- *
- * @param {String} user
- * @param {String} pass
- * @param {Object} options with 'type' property 'auto' or 'basic' (default 'basic')
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.auth = function(user, pass, options){
-  if (!options) {
-    options = {
-      type: 'basic'
-    }
-  }
-
-  switch (options.type) {
-    case 'basic':
-      var str = btoa(user + ':' + pass);
-      this.set('Authorization', 'Basic ' + str);
-    break;
-
-    case 'auto':
-      this.username = user;
-      this.password = pass;
-    break;
-  }
-  return this;
-};
-
-/**
-* Add query-string `val`.
-*
-* Examples:
-*
-*   request.get('/shoes')
-*     .query('size=10')
-*     .query({ color: 'blue' })
-*
-* @param {Object|String} val
-* @return {Request} for chaining
-* @api public
-*/
-
-Request.prototype.query = function(val){
-  if ('string' != typeof val) val = serialize(val);
-  if (val) this._query.push(val);
-  return this;
-};
-
-/**
- * Queue the given `file` as an attachment to the specified `field`,
- * with optional `filename`.
- *
- * ``` js
- * request.post('/upload')
- *   .attach('content', new Blob(['<a id="a"><b id="b">hey!</b></a>'], { type: "text/html"}))
- *   .end(callback);
- * ```
- *
- * @param {String} field
- * @param {Blob|File} file
- * @param {String} filename
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.attach = function(field, file, filename){
-  this._getFormData().append(field, file, filename || file.name);
-  return this;
-};
-
-Request.prototype._getFormData = function(){
-  if (!this._formData) {
-    this._formData = new root.FormData();
-  }
-  return this._formData;
-};
-
-/**
- * Invoke the callback with `err` and `res`
- * and handle arity check.
- *
- * @param {Error} err
- * @param {Response} res
- * @api private
- */
-
-Request.prototype.callback = function(err, res){
-  var fn = this._callback;
-  this.clearTimeout();
-  fn(err, res);
-};
-
-/**
- * Invoke callback with x-domain error.
- *
- * @api private
- */
-
-Request.prototype.crossDomainError = function(){
-  var err = new Error('Request has been terminated\nPossible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.');
-  err.crossDomain = true;
-
-  err.status = this.status;
-  err.method = this.method;
-  err.url = this.url;
-
-  this.callback(err);
-};
-
-/**
- * Invoke callback with timeout error.
- *
- * @api private
- */
-
-Request.prototype._timeoutError = function(){
-  var timeout = this._timeout;
-  var err = new Error('timeout of ' + timeout + 'ms exceeded');
-  err.timeout = timeout;
-  this.callback(err);
-};
-
-/**
- * Compose querystring to append to req.url
- *
- * @api private
- */
-
-Request.prototype._appendQueryString = function(){
-  var query = this._query.join('&');
-  if (query) {
-    this.url += ~this.url.indexOf('?')
-      ? '&' + query
-      : '?' + query;
-  }
-};
-
-/**
- * Initiate request, invoking callback `fn(res)`
- * with an instanceof `Response`.
- *
- * @param {Function} fn
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.end = function(fn){
-  var self = this;
-  var xhr = this.xhr = request.getXHR();
-  var timeout = this._timeout;
-  var data = this._formData || this._data;
-
-  // store callback
-  this._callback = fn || noop;
-
-  // state change
-  xhr.onreadystatechange = function(){
-    if (4 != xhr.readyState) return;
-
-    // In IE9, reads to any property (e.g. status) off of an aborted XHR will
-    // result in the error "Could not complete the operation due to error c00c023f"
-    var status;
-    try { status = xhr.status } catch(e) { status = 0; }
-
-    if (0 == status) {
-      if (self.timedout) return self._timeoutError();
-      if (self._aborted) return;
-      return self.crossDomainError();
-    }
-    self.emit('end');
-  };
-
-  // progress
-  var handleProgress = function(e){
-    if (e.total > 0) {
-      e.percent = e.loaded / e.total * 100;
-    }
-    e.direction = 'download';
-    self.emit('progress', e);
-  };
-  if (this.hasListeners('progress')) {
-    xhr.onprogress = handleProgress;
-  }
-  try {
-    if (xhr.upload && this.hasListeners('progress')) {
-      xhr.upload.onprogress = handleProgress;
-    }
-  } catch(e) {
-    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.
-    // Reported here:
-    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context
-  }
-
-  // timeout
-  if (timeout && !this._timer) {
-    this._timer = setTimeout(function(){
-      self.timedout = true;
-      self.abort();
-    }, timeout);
-  }
-
-  // querystring
-  this._appendQueryString();
-
-  // initiate request
-  if (this.username && this.password) {
-    xhr.open(this.method, this.url, true, this.username, this.password);
-  } else {
-    xhr.open(this.method, this.url, true);
-  }
-
-  // CORS
-  if (this._withCredentials) xhr.withCredentials = true;
-
-  // body
-  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !this._isHost(data)) {
-    // serialize stuff
-    var contentType = this._header['content-type'];
-    var serialize = this._serializer || request.serialize[contentType ? contentType.split(';')[0] : ''];
-    if (!serialize && isJSON(contentType)) serialize = request.serialize['application/json'];
-    if (serialize) data = serialize(data);
-  }
-
-  // set header fields
-  for (var field in this.header) {
-    if (null == this.header[field]) continue;
-    xhr.setRequestHeader(field, this.header[field]);
-  }
-
-  if (this._responseType) {
-    xhr.responseType = this._responseType;
-  }
-
-  // send stuff
-  this.emit('request', this);
-
-  // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)
-  // We need null here if data is undefined
-  xhr.send(typeof data !== 'undefined' ? data : null);
-  return this;
-};
-
-
-/**
- * Expose `Request`.
- */
-
-request.Request = Request;
-
-/**
- * GET `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} [data] or fn
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-request.get = function(url, data, fn){
-  var req = request('GET', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.query(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * HEAD `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} [data] or fn
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-request.head = function(url, data, fn){
-  var req = request('HEAD', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * OPTIONS query to `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} [data] or fn
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-request.options = function(url, data, fn){
-  var req = request('OPTIONS', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * DELETE `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-function del(url, fn){
-  var req = request('DELETE', url);
-  if (fn) req.end(fn);
-  return req;
-};
-
-request['del'] = del;
-request['delete'] = del;
-
-/**
- * PATCH `url` with optional `data` and callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed} [data]
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-request.patch = function(url, data, fn){
-  var req = request('PATCH', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * POST `url` with optional `data` and callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed} [data]
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-request.post = function(url, data, fn){
-  var req = request('POST', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * PUT `url` with optional `data` and callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} [data] or fn
- * @param {Function} [fn]
- * @return {Request}
- * @api public
- */
-
-request.put = function(url, data, fn){
-  var req = request('PUT', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-},{"./is-object":159,"./request":161,"./request-base":160,"emitter":162}],159:[function(require,module,exports){
-/**
- * Check if `obj` is an object.
- *
- * @param {Object} obj
- * @return {Boolean}
- * @api private
- */
-
-function isObject(obj) {
-  return null !== obj && 'object' === typeof obj;
-}
-
-module.exports = isObject;
-
-},{}],160:[function(require,module,exports){
-/**
- * Module of mixed-in functions shared between node and client code
- */
-var isObject = require('./is-object');
-
-/**
- * Clear previous timeout.
- *
- * @return {Request} for chaining
- * @api public
- */
-
-exports.clearTimeout = function _clearTimeout(){
-  this._timeout = 0;
-  clearTimeout(this._timer);
-  return this;
-};
-
-/**
- * Override default response body parser
- *
- * This function will be called to convert incoming data into request.body
- *
- * @param {Function}
- * @api public
- */
-
-exports.parse = function parse(fn){
-  this._parser = fn;
-  return this;
-};
-
-/**
- * Override default request body serializer
- *
- * This function will be called to convert data set via .send or .attach into payload to send
- *
- * @param {Function}
- * @api public
- */
-
-exports.serialize = function serialize(fn){
-  this._serializer = fn;
-  return this;
-};
-
-/**
- * Set timeout to `ms`.
- *
- * @param {Number} ms
- * @return {Request} for chaining
- * @api public
- */
-
-exports.timeout = function timeout(ms){
-  this._timeout = ms;
-  return this;
-};
-
-/**
- * Promise support
- *
- * @param {Function} resolve
- * @param {Function} reject
- * @return {Request}
- */
-
-exports.then = function then(resolve, reject) {
-  if (!this._fullfilledPromise) {
-    var self = this;
-    this._fullfilledPromise = new Promise(function(innerResolve, innerReject){
-      self.end(function(err, res){
-        if (err) innerReject(err); else innerResolve(res);
-      });
-    });
-  }
-  return this._fullfilledPromise.then(resolve, reject);
-}
-
-/**
- * Allow for extension
- */
-
-exports.use = function use(fn) {
-  fn(this);
-  return this;
-}
-
-
-/**
- * Get request header `field`.
- * Case-insensitive.
- *
- * @param {String} field
- * @return {String}
- * @api public
- */
-
-exports.get = function(field){
-  return this._header[field.toLowerCase()];
-};
-
-/**
- * Get case-insensitive header `field` value.
- * This is a deprecated internal API. Use `.get(field)` instead.
- *
- * (getHeader is no longer used internally by the superagent code base)
- *
- * @param {String} field
- * @return {String}
- * @api private
- * @deprecated
- */
-
-exports.getHeader = exports.get;
-
-/**
- * Set header `field` to `val`, or multiple fields with one object.
- * Case-insensitive.
- *
- * Examples:
- *
- *      req.get('/')
- *        .set('Accept', 'application/json')
- *        .set('X-API-Key', 'foobar')
- *        .end(callback);
- *
- *      req.get('/')
- *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })
- *        .end(callback);
- *
- * @param {String|Object} field
- * @param {String} val
- * @return {Request} for chaining
- * @api public
- */
-
-exports.set = function(field, val){
-  if (isObject(field)) {
-    for (var key in field) {
-      this.set(key, field[key]);
-    }
-    return this;
-  }
-  this._header[field.toLowerCase()] = val;
-  this.header[field] = val;
-  return this;
-};
-
-/**
- * Remove header `field`.
- * Case-insensitive.
- *
- * Example:
- *
- *      req.get('/')
- *        .unset('User-Agent')
- *        .end(callback);
- *
- * @param {String} field
- */
-exports.unset = function(field){
-  delete this._header[field.toLowerCase()];
-  delete this.header[field];
-  return this;
-};
-
-/**
- * Write the field `name` and `val` for "multipart/form-data"
- * request bodies.
- *
- * ``` js
- * request.post('/upload')
- *   .field('foo', 'bar')
- *   .end(callback);
- * ```
- *
- * @param {String} name
- * @param {String|Blob|File|Buffer|fs.ReadStream} val
- * @return {Request} for chaining
- * @api public
- */
-exports.field = function(name, val) {
-  this._getFormData().append(name, val);
-  return this;
-};
-
-/**
- * Abort the request, and clear potential timeout.
- *
- * @return {Request}
- * @api public
- */
-exports.abort = function(){
-  if (this._aborted) {
-    return this;
-  }
-  this._aborted = true;
-  this.xhr && this.xhr.abort(); // browser
-  this.req && this.req.abort(); // node
-  this.clearTimeout();
-  this.emit('abort');
-  return this;
-};
-
-/**
- * Enable transmission of cookies with x-domain requests.
- *
- * Note that for this to work the origin must not be
- * using "Access-Control-Allow-Origin" with a wildcard,
- * and also must set "Access-Control-Allow-Credentials"
- * to "true".
- *
- * @api public
- */
-
-exports.withCredentials = function(){
-  // This is browser-only functionality. Node side is no-op.
-  this._withCredentials = true;
-  return this;
-};
-
-/**
- * Set the max redirects to `n`. Does noting in browser XHR implementation.
- *
- * @param {Number} n
- * @return {Request} for chaining
- * @api public
- */
-
-exports.redirects = function(n){
-  this._maxRedirects = n;
-  return this;
-};
-
-/**
- * Convert to a plain javascript object (not JSON string) of scalar properties.
- * Note as this method is designed to return a useful non-this value,
- * it cannot be chained.
- *
- * @return {Object} describing method, url, and data of this request
- * @api public
- */
-
-exports.toJSON = function(){
-  return {
-    method: this.method,
-    url: this.url,
-    data: this._data,
-    headers: this._header
-  };
-};
-
-/**
- * Check if `obj` is a host object,
- * we don't want to serialize these :)
- *
- * TODO: future proof, move to compoent land
- *
- * @param {Object} obj
- * @return {Boolean}
- * @api private
- */
-
-exports._isHost = function _isHost(obj) {
-  var str = {}.toString.call(obj);
-
-  switch (str) {
-    case '[object File]':
-    case '[object Blob]':
-    case '[object FormData]':
-      return true;
-    default:
-      return false;
-  }
-}
-
-/**
- * Send `data` as the request body, defaulting the `.type()` to "json" when
- * an object is given.
- *
- * Examples:
- *
- *       // manual json
- *       request.post('/user')
- *         .type('json')
- *         .send('{"name":"tj"}')
- *         .end(callback)
- *
- *       // auto json
- *       request.post('/user')
- *         .send({ name: 'tj' })
- *         .end(callback)
- *
- *       // manual x-www-form-urlencoded
- *       request.post('/user')
- *         .type('form')
- *         .send('name=tj')
- *         .end(callback)
- *
- *       // auto x-www-form-urlencoded
- *       request.post('/user')
- *         .type('form')
- *         .send({ name: 'tj' })
- *         .end(callback)
- *
- *       // defaults to x-www-form-urlencoded
- *      request.post('/user')
- *        .send('name=tobi')
- *        .send('species=ferret')
- *        .end(callback)
- *
- * @param {String|Object} data
- * @return {Request} for chaining
- * @api public
- */
-
-exports.send = function(data){
-  var obj = isObject(data);
-  var type = this._header['content-type'];
-
-  // merge
-  if (obj && isObject(this._data)) {
-    for (var key in data) {
-      this._data[key] = data[key];
-    }
-  } else if ('string' == typeof data) {
-    // default to x-www-form-urlencoded
-    if (!type) this.type('form');
-    type = this._header['content-type'];
-    if ('application/x-www-form-urlencoded' == type) {
-      this._data = this._data
-        ? this._data + '&' + data
-        : data;
-    } else {
-      this._data = (this._data || '') + data;
-    }
-  } else {
-    this._data = data;
-  }
-
-  if (!obj || this._isHost(data)) return this;
-
-  // default to json
-  if (!type) this.type('json');
-  return this;
-};
-
-},{"./is-object":159}],161:[function(require,module,exports){
-// The node and browser modules expose versions of this with the
-// appropriate constructor function bound as first argument
-/**
- * Issue a request:
- *
- * Examples:
- *
- *    request('GET', '/users').end(callback)
- *    request('/users').end(callback)
- *    request('/users', callback)
- *
- * @param {String} method
- * @param {String|Function} url or callback
- * @return {Request}
- * @api public
- */
-
-function request(RequestConstructor, method, url) {
-  // callback
-  if ('function' == typeof url) {
-    return new RequestConstructor('GET', method).end(url);
-  }
-
-  // url first
-  if (2 == arguments.length) {
-    return new RequestConstructor('GET', method);
-  }
-
-  return new RequestConstructor(method, url);
-}
-
-module.exports = request;
-
-},{}],162:[function(require,module,exports){
-
-/**
- * Expose `Emitter`.
- */
-
-if (typeof module !== 'undefined') {
-  module.exports = Emitter;
-}
-
-/**
- * Initialize a new `Emitter`.
- *
- * @api public
- */
-
-function Emitter(obj) {
-  if (obj) return mixin(obj);
-};
-
-/**
- * Mixin the emitter properties.
- *
- * @param {Object} obj
- * @return {Object}
- * @api private
- */
-
-function mixin(obj) {
-  for (var key in Emitter.prototype) {
-    obj[key] = Emitter.prototype[key];
-  }
-  return obj;
-}
-
-/**
- * Listen on the given `event` with `fn`.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.on =
-Emitter.prototype.addEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
-    .push(fn);
-  return this;
-};
-
-/**
- * Adds an `event` listener that will be invoked a single
- * time then automatically removed.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.once = function(event, fn){
-  function on() {
-    this.off(event, on);
-    fn.apply(this, arguments);
-  }
-
-  on.fn = fn;
-  this.on(event, on);
-  return this;
-};
-
-/**
- * Remove the given callback for `event` or all
- * registered callbacks.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.off =
-Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners =
-Emitter.prototype.removeEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
-  var callbacks = this._callbacks['$' + event];
-  if (!callbacks) return this;
-
-  // remove all handlers
-  if (1 == arguments.length) {
-    delete this._callbacks['$' + event];
-    return this;
-  }
-
-  // remove specific handler
-  var cb;
-  for (var i = 0; i < callbacks.length; i++) {
-    cb = callbacks[i];
-    if (cb === fn || cb.fn === fn) {
-      callbacks.splice(i, 1);
-      break;
-    }
-  }
-  return this;
-};
-
-/**
- * Emit `event` with the given args.
- *
- * @param {String} event
- * @param {Mixed} ...
- * @return {Emitter}
- */
-
-Emitter.prototype.emit = function(event){
-  this._callbacks = this._callbacks || {};
-  var args = [].slice.call(arguments, 1)
-    , callbacks = this._callbacks['$' + event];
-
-  if (callbacks) {
-    callbacks = callbacks.slice(0);
-    for (var i = 0, len = callbacks.length; i < len; ++i) {
-      callbacks[i].apply(this, args);
-    }
-  }
-
-  return this;
-};
-
-/**
- * Return array of callbacks for `event`.
- *
- * @param {String} event
- * @return {Array}
- * @api public
- */
-
-Emitter.prototype.listeners = function(event){
-  this._callbacks = this._callbacks || {};
-  return this._callbacks['$' + event] || [];
-};
-
-/**
- * Check if this emitter has `event` handlers.
- *
- * @param {String} event
- * @return {Boolean}
- * @api public
- */
-
-Emitter.prototype.hasListeners = function(event){
-  return !! this.listeners(event).length;
-};
-
-},{}]},{},[1])(1)
-});
-
-
- /*global JSONEditor*/
-'use strict';
-
-window.SwaggerUi = Backbone.Router.extend({
-
-  dom_id: 'swagger_ui',
-
-  // Attributes
-  options: null,
-  api: null,
-  headerView: null,
-  mainView: null,
-
-  // SwaggerUi accepts all the same options as SwaggerApi
-  initialize: function(options) {
-    options = options || {};
-
-    if (options.defaultModelRendering !== 'model') {
-      options.defaultModelRendering = 'schema';
-    }
-
-    if (!options.highlightSizeThreshold) {
-      options.highlightSizeThreshold = 100000;
-    }
-
-    // Allow dom_id to be overridden
-    if (options.dom_id) {
-      this.dom_id = options.dom_id;
-      delete options.dom_id;
-    }
-
-    if (!options.supportedSubmitMethods){
-      options.supportedSubmitMethods = [
-        'get',
-        'put',
-        'post',
-        'delete',
-        'head',
-        'options',
-        'patch'
-      ];
-    }
-
-    if (typeof options.oauth2RedirectUrl === 'string') {
-      window.oAuthRedirectUrl = options.oauth2RedirectUrl;
-    }
-
-    // Create an empty div which contains the dom_id
-    if (! $('#' + this.dom_id).length){
-      $('body').append('<div id="' + this.dom_id + '"></div>') ;
-    }
-
-    this.options = options;
-
-    // set marked options
-    marked.setOptions({gfm: true});
-
-    // Set the callbacks
-    var that = this;
-    this.options.success = function() { return that.render(); };
-    this.options.progress = function(d) { return that.showMessage(d); };
-    this.options.failure = function(d) { return that.onLoadFailure(d); };
-
-    // Create view to handle the header inputs
-    this.headerView = new SwaggerUi.Views.HeaderView({el: $('#header')});
-
-    // Event handler for when the baseUrl/apiKey is entered by user
-    this.headerView.on('update-swagger-ui', function(data) {
-      return that.updateSwaggerUi(data);
-    });
-
-    // JSon Editor custom theming
-     JSONEditor.defaults.iconlibs.swagger = JSONEditor.AbstractIconLib.extend({
-      mapping: {
-        collapse: 'collapse',
-        expand: 'expand'
-        },
-      icon_prefix: 'swagger-'
-      });
-
-  },
-
-  // Set an option after initializing
-  setOption: function(option, value) {
-    this.options[option] = value;
-  },
-
-  // Get the value of a previously set option
-  getOption: function(option) {
-    return this.options[option];
-  },
-
-  // Event handler for when url/key is received from user
-  updateSwaggerUi: function(data){
-    this.options.url = data.url;
-    this.load();
-  },
-
-  // Create an api and render
-  load: function(){
-    // Initialize the API object
-    if (this.mainView) {
-      this.mainView.clear();
-    }
-
-    if (this.authView) {
-      this.authView.remove();
-    }
-    var url = this.options.url;
-    if (url && url.indexOf('http') !== 0) {
-      url = this.buildUrl(window.location.href.toString(), url);
-    }
-    if(this.api) {
-      this.options.authorizations = this.api.clientAuthorizations.authz;
-    }
-    this.options.url = url;
-    this.headerView.update(url);
-
-    this.api = new SwaggerClient(this.options);
-  },
-
-  // collapse all sections
-  collapseAll: function(){
-    Docs.collapseEndpointListForResource('');
-  },
-
-  // list operations for all sections
-  listAll: function(){
-    Docs.collapseOperationsForResource('');
-  },
-
-  // expand operations for all sections
-  expandAll: function(){
-    Docs.expandOperationsForResource('');
-  },
-
-  // This is bound to success handler for SwaggerApi
-  //  so it gets called when SwaggerApi completes loading
-  render: function(){
-    var authsModel;
-    this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
-    this.mainView = new SwaggerUi.Views.MainView({
-      model: this.api,
-      el: $('#' + this.dom_id),
-      swaggerOptions: this.options,
-      router: this
-    }).render();
-    if (!_.isEmpty(this.api.securityDefinitions)){
-      authsModel = _.map(this.api.securityDefinitions, function (auth, name) {
-        var result = {};
-        result[name] = auth;
-        return result;
-      });
-      this.authView = new SwaggerUi.Views.AuthButtonView({
-        data: SwaggerUi.utils.parseSecurityDefinitions(authsModel),
-        router: this
-      });
-      $('#auth_container').append(this.authView.render().el);
-    }
-    this.showMessage();
-    switch (this.options.docExpansion) {
-      case 'full':
-        this.expandAll(); break;
-      case 'list':
-        this.listAll(); break;
-      default:
-        break;
-    }
-    this.renderGFM();
-
-    if (this.options.onComplete){
-      this.options.onComplete(this.api, this);
-    }
-
-    setTimeout(Docs.shebang.bind(this), 100);
-  },
-
-  buildUrl: function(base, url){
-    if (url.indexOf('/') === 0) {
-      var parts = base.split('/');
-      base = parts[0] + '//' + parts[2];
-      return base + url;
-    } else {
-      var endOfPath = base.length;
-
-      if (base.indexOf('?') > -1){
-        endOfPath = Math.min(endOfPath, base.indexOf('?'));
-      }
-
-      if (base.indexOf('#') > -1){
-        endOfPath = Math.min(endOfPath, base.indexOf('#'));
-      }
-
-      base = base.substring(0, endOfPath);
-
-      if (base.indexOf('/', base.length - 1 ) !== -1){
-        return base + url;
-      }
-
-      return base + '/' + url;
-    }
-  },
-
-  // Shows message on topbar of the ui
-  showMessage: function(data){
-    if (data === undefined) {
-      data = '';
-    }
-    var $msgbar = $('#message-bar');
-    $msgbar.removeClass('message-fail');
-    $msgbar.addClass('message-success');
-    $msgbar.text(data);
-    if(window.SwaggerTranslator) {
-      window.SwaggerTranslator.translate($msgbar);
-    }
-  },
-
-  // shows message in red
-  onLoadFailure: function(data){
-    if (data === undefined) {
-      data = '';
-    }
-    $('#message-bar').removeClass('message-success');
-    $('#message-bar').addClass('message-fail');
-
-    var val = $('#message-bar').text(data);
-
-    if (this.options.onFailure) {
-      this.options.onFailure(data);
-    }
-
-    return val;
-  },
-
-  // Renders GFM for elements with 'markdown' class
-  renderGFM: function(){
-    $('.markdown').each(function(){
-      $(this).html(marked($(this).html()));
-    });
-
-    $('.propDesc', '.model-signature .description').each(function () {
-      $(this).html(marked($(this).html())).addClass('markdown');
-    });
-  }
-
-});
-
-window.SwaggerUi.Views = {};
-window.SwaggerUi.Models = {};
-window.SwaggerUi.Collections = {};
-window.SwaggerUi.partials = {};
-window.SwaggerUi.utils = {};
-
-// don't break backward compatibility with previous versions and warn users to upgrade their code
-(function(){
-  window.authorizations = {
-    add: function() {
-      warn('Using window.authorizations is deprecated. Please use SwaggerUi.api.clientAuthorizations.add().');
-
-      if (typeof window.swaggerUi === 'undefined') {
-        throw new TypeError('window.swaggerUi is not defined');
-      }
-
-      if (window.swaggerUi instanceof SwaggerUi) {
-        window.swaggerUi.api.clientAuthorizations.add.apply(window.swaggerUi.api.clientAuthorizations, arguments);
-      }
-    }
-  };
-
-  window.ApiKeyAuthorization = function() {
-    warn('window.ApiKeyAuthorization is deprecated. Please use SwaggerClient.ApiKeyAuthorization.');
-    SwaggerClient.ApiKeyAuthorization.apply(window, arguments);
-  };
-
-  window.PasswordAuthorization = function() {
-    warn('window.PasswordAuthorization is deprecated. Please use SwaggerClient.PasswordAuthorization.');
-    SwaggerClient.PasswordAuthorization.apply(window, arguments);
-  };
-
-  function warn(message) {
-    if ('console' in window && typeof window.console.warn === 'function') {
-      console.warn(message);
-    }
-  }
-})();
-
-
-// UMD
-(function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(['b'], function (b) {
-            return (root.SwaggerUi = factory(b));
-        });
-    } else if (typeof exports === 'object') {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like environments that support module.exports,
-        // like Node.
-        module.exports = factory(require('b'));
-    } else {
-        // Browser globals
-        root.SwaggerUi = factory(root.b);
-    }
-}(this, function () {
-    return SwaggerUi;
-}));
-
-'use strict';
-
-window.SwaggerUi.utils = {
-    parseSecurityDefinitions: function (security, securityDefinitions) {
-        var auths = Object.assign({}, securityDefinitions);
-        var oauth2Arr = [];
-        var authsArr = [];
-        var scopes = [];
-        var utils = window.SwaggerUi.utils;
-
-        if (!Array.isArray(security)) { return null; }
-
-        security.forEach(function (item) {
-            var singleSecurity = {};
-            var singleOauth2Security = {};
-
-            for (var key in item) {
-                if (Array.isArray(item[key])) {
-                    if (!auths[key]) { continue; }
-                    auths[key] = auths[key] || {};
-                    if (auths[key].type === 'oauth2') {
-                        singleOauth2Security[key] = Object.assign({}, auths[key]);
-                        singleOauth2Security[key].scopes = Object.assign({}, auths[key].scopes);
-                        for (var i in singleOauth2Security[key].scopes) {
-                            if (item[key].indexOf(i) < 0) {
-                                delete singleOauth2Security[key].scopes[i];
-                            }
-                        }
-                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);
-                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);
-                    } else {
-                        singleSecurity[key] = Object.assign({}, auths[key]);
-                    }
-                } else {
-                    if (item[key].type === 'oauth2') {
-                        singleOauth2Security[key] = Object.assign({}, item[key]);
-                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);
-                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);
-                    } else {
-                        singleSecurity[key] = item[key];
-                    }
-                }
-            }
-
-            if (!_.isEmpty(singleSecurity)) {
-                authsArr.push(singleSecurity);
-            }
-
-            if (!_.isEmpty(singleOauth2Security)){
-                oauth2Arr.push(singleOauth2Security);
-            }
-        });
-
-        return {
-            auths : authsArr,
-            oauth2: oauth2Arr,
-            scopes: scopes
-        };
-    },
-
-    parseOauth2Scopes: function (data) {
-        var scopes = Object.assign({}, data);
-        var result = [];
-        var key;
-
-        for (key in scopes) {
-            result.push({scope: key, description: scopes[key]});
-        }
-
-        return result;
-    },
-
-    sanitize: function(html) {
-        // Strip the script tags from the html and inline evenhandlers
-        html = html.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
-        html = html.replace(/(on\w+="[^"]*")*(on\w+='[^']*')*(on\w+=\w*\(\w*\))*/gi, '');
-
-        return html;
-    }
-};
-'use strict';
-
-SwaggerUi.Models.ApiKeyAuthModel = Backbone.Model.extend({
-    defaults: {
-        'in': '',
-        name: '',
-        title: '',
-        value: ''
-    },
-
-    initialize: function () {
-        this.on('change', this.validate);
-    },
-
-    validate: function () {
-        var valid = !!this.get('value');
-
-        this.set('valid', valid);
-
-        return valid;
-    }
-});
-'use strict';
-
-SwaggerUi.Views.ApiKeyAuthView = Backbone.View.extend({ // TODO: append this to global SwaggerUi
-
-    events: {
-        'change .input_apiKey_entry': 'apiKeyChange'
-    },
-
-    selectors: {
-        apikeyInput: '.input_apiKey_entry'
-    },
-
-    template: Handlebars.templates.apikey_auth,
-
-    initialize: function(opts) {
-        this.options = opts || {};
-        this.router = this.options.router;
-    },
-
-    render: function (){
-        this.$el.html(this.template(this.model.toJSON()));
-
-        return this;
-    },
-
-    apiKeyChange: function (e) {
-        var val = $(e.target).val();
-        if (val) {
-            this.$(this.selectors.apikeyInput).removeClass('error');
-        }
-
-        this.model.set('value', val);
-    },
-
-    isValid: function () {
-        return this.model.validate();
-    },
-
-    highlightInvalid: function () {
-        if (!this.isValid()) {
-            this.$(this.selectors.apikeyInput).addClass('error');
-        }
-    }
-
-});
-'use strict';
-
-SwaggerUi.Views.AuthButtonView = Backbone.View.extend({
-    events: {
-        'click .authorize__btn': 'authorizeBtnClick'
-    },
-
-    tpls: {
-        popup: Handlebars.templates.popup,
-        authBtn: Handlebars.templates.auth_button,
-        authBtnOperation: Handlebars.templates.auth_button_operation
-    },
-
-    initialize: function(opts) {
-        this.options = opts || {};
-        this.options.data = this.options.data || {};
-        this.isOperation = this.options.isOperation;
-        this.model = this.model || {};
-        this.router = this.options.router;
-        this.auths = this.options.data.oauth2.concat(this.options.data.auths);
-    },
-
-    render: function () {
-        var tplName = this.isOperation ? 'authBtnOperation' : 'authBtn';
-
-        this.$authEl = this.renderAuths(this.auths);
-        this.$el.html(this.tpls[tplName](this.model));
-
-        return this;
-    },
-
-    authorizeBtnClick: function (e) {
-        var authsModel;
-
-        e.preventDefault();
-
-        authsModel = {
-            title: 'Available authorizations',
-            content: this.$authEl
-        };
-
-        // The content of the popup is removed and all events unbound after clicking the 'Cancel' button of the popup.
-        // We'll have to re-render the contents before creating a new popup view.
-        this.render();
-
-        this.popup = new SwaggerUi.Views.PopupView({model: authsModel});
-        this.popup.render();
-    },
-
-    renderAuths: function (auths) {
-        var $el = $('<div>');
-        var isLogout = false;
-
-        auths.forEach(function (auth) {
-            var authView = new SwaggerUi.Views.AuthView({data: auth, router: this.router});
-            var authEl = authView.render().el;
-            $el.append(authEl);
-            if (authView.isLogout) {
-                isLogout = true;
-            }
-        }, this);
-
-        this.model.isLogout = isLogout;
-
-        return $el;
-    }
-
-});
-
-'use strict';
-
-SwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({
-    constructor: function() {
-        var args = Array.prototype.slice.call(arguments);
-
-        args[0] = this.parse(args[0]);
-
-        Backbone.Collection.apply(this, args);
-    },
-
-    add: function (model) {
-        var args = Array.prototype.slice.call(arguments);
-
-        if (Array.isArray(model)) {
-            args[0] = _.map(model, function(val) {
-                return this.handleOne(val);
-            }, this);
-        } else {
-            args[0] = this.handleOne(model);
-        }
-
-        Backbone.Collection.prototype.add.apply(this, args);
-    },
-
-    handleOne: function (model) {
-        var result = model;
-
-        if (! (model instanceof Backbone.Model) ) {
-            switch (model.type) {
-                case 'oauth2':
-                    result = new SwaggerUi.Models.Oauth2Model(model);
-                    break;
-                case 'basic':
-                    result = new SwaggerUi.Models.BasicAuthModel(model);
-                    break;
-                case 'apiKey':
-                    result = new SwaggerUi.Models.ApiKeyAuthModel(model);
-                    break;
-                default:
-                    result = new Backbone.Model(model);
-            }
-        }
-
-        return result;
-    },
-
-    isValid: function () {
-        var valid = true;
-
-        this.models.forEach(function(model) {
-            if (!model.validate()) {
-                valid = false;
-            }
-        });
-
-        return valid;
-    },
-
-    isAuthorized: function () {
-        return this.length === this.where({ isLogout: true }).length;
-    },
-
-    isPartiallyAuthorized: function () {
-        return this.where({ isLogout: true }).length > 0;
-    },
-
-    parse: function (data) {
-        var authz = {};
-
-        if(typeof window.swaggerUi !== 'undefined') {
-            authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz);
-        }
-
-        return _.map(data, function (auth, name) {
-            var isBasic = authz[name] && auth.type === 'basic' && authz[name].username && authz[name].password;
-
-            _.extend(auth, {
-                title: name
-            });
-
-            if (authz[name] || isBasic) {
-                _.extend(auth, {
-                    isLogout: true,
-                    value: isBasic ? undefined : authz[name].value,
-                    username: isBasic ? authz[name].username : undefined,
-                    password: isBasic ? authz[name].password : undefined,
-                    valid: true
-                });
-            }
-
-            return auth;
-        });
-    }
-});
-'use strict';
-
-SwaggerUi.Views.AuthsCollectionView = Backbone.View.extend({
-
-    initialize: function(opts) {
-        this.options = opts || {};
-        this.options.data = this.options.data || {};
-        this.router = this.options.router;
-
-        this.collection = new SwaggerUi.Collections.AuthsCollection(opts.data);
-
-        this.$innerEl = $('<div>');
-        this.authViews = [];
-    },
-
-    render: function () {
-        this.collection.each(function (auth) {
-            this.renderOneAuth(auth);
-        }, this);
-
-        this.$el.html(this.$innerEl.html() ? this.$innerEl : '');
-
-        return this;
-    },
-
-    renderOneAuth: function (authModel) {
-        var authViewEl, authView, authViewName;
-        var type = authModel.get('type');
-
-        if (type === 'apiKey') {
-            authViewName = 'ApiKeyAuthView';
-        } else if (type === 'basic' && this.$innerEl.find('.basic_auth_container').length === 0) {
-            authViewName = 'BasicAuthView';
-        } else if (type === 'oauth2') {
-            authViewName = 'Oauth2View';
-        }
-
-        if (authViewName) {
-            authView = new SwaggerUi.Views[authViewName]({model: authModel, router: this.router});
-            authViewEl = authView.render().el;
-            this.authViews.push(authView);
-        }
-
-        this.$innerEl.append(authViewEl);
-    },
-
-    highlightInvalid: function () {
-        this.authViews.forEach(function (view) {
-            view.highlightInvalid();
-        }, this);
-    }
-
-});
-
-'use strict';
-
-/* global redirect_uri:true */
-/* global clientId */
-/* global scopeSeparator */
-/* global additionalQueryStringParams */
-/* global clientSecret */
-/* global onOAuthComplete */
-/* global realm */
-/*jshint unused:false*/
-
-SwaggerUi.Views.AuthView = Backbone.View.extend({
-    events: {
-        'click .auth_submit__button': 'authorizeClick',
-        'click .auth_logout__button': 'logoutClick'
-    },
-
-    tpls: {
-        main: Handlebars.templates.auth_view
-    },
-
-    selectors: {
-        innerEl: '.auth_inner',
-        authBtn: '.auth_submit__button'
-    },
-
-    initialize: function(opts) {
-        this.options = opts || {};
-        opts.data = opts.data || {};
-        this.router = this.options.router;
-
-        this.authsCollectionView = new SwaggerUi.Views.AuthsCollectionView({data: opts.data});
-
-        this.$el.html(this.tpls.main({
-            isLogout: this.authsCollectionView.collection.isAuthorized(),
-            isAuthorized: this.authsCollectionView.collection.isPartiallyAuthorized()
-        }));
-        this.$innerEl = this.$(this.selectors.innerEl);
-        this.isLogout = this.authsCollectionView.collection.isPartiallyAuthorized();
-    },
-
-    render: function () {
-        this.$innerEl.html(this.authsCollectionView.render().el);
-
-        return this;
-    },
-
-    authorizeClick: function (e) {
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (this.authsCollectionView.collection.isValid()) {
-            this.authorize();
-        } else {
-            this.authsCollectionView.highlightInvalid();
-        }
-    },
-
-    authorize: function () {
-        this.authsCollectionView.collection.forEach(function (auth) {
-            var keyAuth, basicAuth;
-            var type = auth.get('type');
-
-            if (type === 'apiKey') {
-                keyAuth = new SwaggerClient.ApiKeyAuthorization(
-                    auth.get('name'),
-                    auth.get('value'),
-                    auth.get('in')
-                );
-
-                this.router.api.clientAuthorizations.add(auth.get('title'), keyAuth);
-            } else if (type === 'basic') {
-                basicAuth = new SwaggerClient.PasswordAuthorization(auth.get('username'), auth.get('password'));
-                this.router.api.clientAuthorizations.add(auth.get('title'), basicAuth);
-            } else if (type === 'oauth2') {
-                this.handleOauth2Login(auth);
-            }
-        }, this);
-
-        this.router.load();
-    },
-
-    logoutClick: function (e) {
-        e.preventDefault();
-
-        this.authsCollectionView.collection.forEach(function (auth) {
-            window.swaggerUi.api.clientAuthorizations.remove(auth.get('title'));
-        });
-
-        this.router.load();
-    },
-
-    // taken from lib/swagger-oauth.js
-    handleOauth2Login: function (auth) {
-        var host = window.location;
-        var pathname = location.pathname.substring(0, location.pathname.lastIndexOf('/'));
-        var defaultRedirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';
-        var redirectUrl = window.oAuthRedirectUrl || defaultRedirectUrl;
-        var url = null;
-        var scopes = _.map(auth.get('scopes'), function (scope) {
-            if(scope.checked) {
-                return scope.scope;
-            }
-        });
-        var container = window.swaggerUiAuth || (window.swaggerUiAuth = {});
-        var state, dets, ep;
-        container.OAuthSchemeKey = auth.get('title');
-
-        window.enabledScopes = scopes;
-        var flow = auth.get('flow');
-
-        /**
-         * Returns the name of the access token parameter returned by the server.
-         *
-         * @param dets
-         *     The authorisation scheme configuration.
-         * @return the name of the access token parameter
-         */
-        function getTokenName(dets) {
-            return dets.vendorExtensions['x-tokenName'] || dets.tokenName;
-        }
-
-        if(auth.get('type') === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {
-            dets = auth.attributes;
-            url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');
-            container.tokenName = getTokenName(dets) || 'access_token';
-            container.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);
-            state = container.OAuthSchemeKey;
-        }
-        else if(auth.get('type') === 'oauth2' && flow && (flow === 'application')) {
-            dets = auth.attributes;
-            container.tokenName = getTokenName(dets) || 'access_token';
-            this.clientCredentialsFlow(scopes, dets, container.OAuthSchemeKey);
-            return;
-        }
-        else if(auth.get('type') === 'oauth2' && flow && (flow === 'password')) {
-            dets = auth.attributes;
-            container.tokenName = getTokenName(dets) || 'access_token';
-            this.passwordFlow(scopes, dets, container.OAuthSchemeKey);
-            return;
-        }
-        else if(auth.get('grantTypes')) {
-            // 1.2 support
-            var o = auth.get('grantTypes');
-            for(var t in o) {
-                if(o.hasOwnProperty(t) && t === 'implicit') {
-                    dets = o[t];
-                    ep = dets.loginEndpoint.url;
-                    url = dets.loginEndpoint.url + '?response_type=token';
-                    container.tokenName = getTokenName(dets);
-                }
-                else if (o.hasOwnProperty(t) && t === 'accessCode') {
-                    dets = o[t];
-                    ep = dets.tokenRequestEndpoint.url;
-                    url = dets.tokenRequestEndpoint.url + '?response_type=code';
-                    container.tokenName = getTokenName(dets);
-                }
-            }
-        }
-
-        redirect_uri = redirectUrl;
-
-        url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-        url += '&realm=' + encodeURIComponent(realm);
-        url += '&client_id=' + encodeURIComponent(clientId);
-        url += '&scope=' + encodeURIComponent(scopes.join(scopeSeparator));
-        url += '&state=' + encodeURIComponent(state);
-        for (var key in additionalQueryStringParams) {
-            url += '&' + key + '=' + encodeURIComponent(additionalQueryStringParams[key]);
-        }
-
-        window.open(url);
-    },
-
-    // taken from lib/swagger-oauth.js
-    clientCredentialsFlow: function (scopes, oauth, OAuthSchemeKey) {
-        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'client_credentials');
-    },
-
-    passwordFlow: function (scopes, oauth, OAuthSchemeKey) {
-        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'password', {
-            'username': oauth.username,
-            'password': oauth.password
-        });
-    },
-
-    accessTokenRequest: function (scopes, oauth, OAuthSchemeKey, grantType, params) {
-        params = $.extend({}, {
-            'scope': scopes.join(' '),
-            'grant_type': grantType
-        }, params);
-
-        var headers= {};
-
-        switch (oauth.clientAuthenticationType) {
-            case 'basic':
-                headers.Authorization = 'Basic ' + btoa(oauth.clientId + ':' + oauth.clientSecret);
-                break;
-            case 'request-body':
-                params.client_id = oauth.clientId;
-                params.client_secret = oauth.clientSecret;
-                break;
-        }
-
-        $.ajax({
-            url : oauth.tokenUrl,
-            type: 'POST',
-            data: params,
-            headers: headers,
-            success: function (data)
-            {
-                onOAuthComplete(data, OAuthSchemeKey);
-            },
-            error: function ()
-            {
-                onOAuthComplete('');
-            }
-        });
-    }
-});
-
-'use strict';
-
-SwaggerUi.Models.BasicAuthModel = Backbone.Model.extend({
-    defaults: {
-        username: '',
-        password: '',
-        title: 'basic'
-    },
-
-    initialize: function () {
-        this.on('change', this.validate);
-    },
-
-    validate: function () {
-        var valid = !!this.get('password') && !!this.get('username');
-
-        this.set('valid', valid);
-
-        return valid;
-    }
-});
-'use strict';
-
-SwaggerUi.Views.BasicAuthView = Backbone.View.extend({
-
-    initialize: function (opts) {
-        this.options = opts || {};
-        this.router = this.options.router;
-    },
-
-    events: {
-        'change .auth_input': 'inputChange'
-    },
-
-    selectors: {
-        usernameInput: '.basic_auth__username',
-        passwordInput: '.basic_auth__password'
-    },
-
-    cls: {
-        error: 'error'
-    },
-
-    template: Handlebars.templates.basic_auth,
-
-    render: function(){
-        $(this.el).html(this.template(this.model.toJSON()));
-
-        return this;
-    },
-
-    inputChange: function (e) {
-        var $el = $(e.target);
-        var val = $el.val();
-        var attr = $el.prop('name');
-
-        if (val) {
-            $el.removeClass(this.cls.error);
-        }
-
-        this.model.set(attr, val);
-    },
-
-    isValid: function () {
-        return this.model.validate();
-    },
-
-    highlightInvalid: function () {
-        if (!this.model.get('username')) {
-            this.$(this.selectors.usernameInput).addClass(this.cls.error);
-        }
-    }
-});
-
-'use strict';
-
-SwaggerUi.Views.ContentTypeView = Backbone.View.extend({
-  initialize: function() {},
-
-  render: function(){
-  	this.model.contentTypeId = 'ct' + Math.random();
-    $(this.el).html(Handlebars.templates.content_type(this.model));
-    return this;
-  }
-});
-'use strict';
-
-SwaggerUi.Views.HeaderView = Backbone.View.extend({
-  events: {
-    'click #show-pet-store-icon'    : 'showPetStore',
-    'click #explore'                : 'showCustom',
-    'submit #api_selector'          : 'showCustom',
-    'keyup #input_baseUrl'          : 'showCustomOnKeyup',
-    'keyup #input_apiKey'           : 'showCustomOnKeyup'
-  },
-
-  initialize: function(){},
-
-  showPetStore: function(){
-    this.trigger('update-swagger-ui', {
-      url:'http://petstore.swagger.io/v2/swagger.json'
-    });
-  },
-
-  showCustomOnKeyup: function(e){
-    if (e.keyCode === 13) {
-      this.showCustom();
-    }
-  },
-
-  showCustom: function(e){
-    if (e) {
-      e.preventDefault();
-    }
-
-    this.trigger('update-swagger-ui', {
-      url: $('#input_baseUrl').val()
-    });
-  },
-
-  update: function(url, apiKey, trigger){
-    if (trigger === undefined) {
-      trigger = false;
-    }
-
-    $('#input_baseUrl').val(url);
-
-    if (trigger) {
-      this.trigger('update-swagger-ui', {url:url});
-    }
-  }
-});
-
-'use strict';
-
-SwaggerUi.Views.MainView = Backbone.View.extend({
-  apisSorter : {
-    alpha   : function(a,b){ return a.name.localeCompare(b.name); }
-  },
-  operationsSorters : {
-    alpha   : function(a,b){ return a.path.localeCompare(b.path); },
-    method  : function(a,b){ return a.method.localeCompare(b.method); }
-  },
-  initialize: function(opts){
-    var sorterOption, sorterFn, key, value;
-    opts = opts || {};
-
-    this.router = opts.router;
-
-    // Sort APIs
-    if (opts.swaggerOptions.apisSorter) {
-      sorterOption = opts.swaggerOptions.apisSorter;
-      if (_.isFunction(sorterOption)) {
-        sorterFn = sorterOption;
-      } else {
-        sorterFn = this.apisSorter[sorterOption];
-      }
-      if (_.isFunction(sorterFn)) {
-        this.model.apisArray.sort(sorterFn);
-      }
-    }
-    // Sort operations of each API
-    if (opts.swaggerOptions.operationsSorter) {
-      sorterOption = opts.swaggerOptions.operationsSorter;
-      if (_.isFunction(sorterOption)) {
-        sorterFn = sorterOption;
-      } else {
-        sorterFn = this.operationsSorters[sorterOption];
-      }
-      if (_.isFunction(sorterFn)) {
-        for (key in this.model.apisArray) {
-          this.model.apisArray[key].operationsArray.sort(sorterFn);
-        }
-      }
-    }
-
-    // set up the UI for input
-    this.model.auths = [];
-
-    for (key in this.model.securityDefinitions) {
-      value = this.model.securityDefinitions[key];
-
-      this.model.auths.push({
-        name: key,
-        type: value.type,
-        value: value
-      });
-    }
-
-    if ('validatorUrl' in opts.swaggerOptions) {
-      // Validator URL specified explicitly
-      this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
-    } else if (this.model.url.indexOf('localhost') > 0 || this.model.url.indexOf('127.0.0.1') > 0) {
-      // Localhost override
-      this.model.validatorUrl = null;
-    } else {
-      this.model.validatorUrl = '//online.swagger.io/validator';
-    }
-
-    // JSonEditor requires type='object' to be present on defined types, we add it if it's missing
-    // is there any valid case were it should not be added ?
-    var def;
-    for(def in this.model.definitions){
-      if (!this.model.definitions[def].type){
-        this.model.definitions[def].type = 'object';
-      }
-    }
-
-  },
-
-  render: function () {
-    $(this.el).html(Handlebars.templates.main(this.model));
-    this.info = this.$('.info')[0];
-
-    if (this.info) {
-      this.info.addEventListener('click', this.onLinkClick, true);
-    }
-
-    this.model.securityDefinitions = this.model.securityDefinitions || {};
-
-    // Render each resource
-
-    var resources = {};
-    var counter = 0;
-    for (var i = 0; i < this.model.apisArray.length; i++) {
-      var resource = this.model.apisArray[i];
-      var id = resource.name;
-      while (typeof resources[id] !== 'undefined') {
-        id = id + '_' + counter;
-        counter += 1;
-      }
-      resource.id = sanitizeHtml(id);
-      resources[id] = resource;
-      this.addResource(resource, this.model.auths);
-    }
-
-    $('.propWrap').hover(function onHover(){
-      $('.optionsWrapper', $(this)).show();
-    }, function offhover(){
-      $('.optionsWrapper', $(this)).hide();
-    });
-    return this;
-  },
-
-  addResource: function(resource, auths){
-    // Render a resource and add it to resources li
-    resource.id = resource.id.replace(/[^a-zA-Z\d]/g, function(str) { return str.charCodeAt(0); });
-
-    // Make all definitions available at the root of the resource so that they can
-    // be loaded by the JSonEditor
-    resource.definitions = this.model.definitions;
-
-    var resourceView = new SwaggerUi.Views.ResourceView({
-      model: resource,
-      router: this.router,
-      tagName: 'li',
-      id: 'resource_' + resource.id,
-      className: 'resource',
-      auths: auths,
-      swaggerOptions: this.options.swaggerOptions
-    });
-    $('#resources', this.el).append(resourceView.render().el);
-  },
-
-  clear: function(){
-    $(this.el).html('');
-  },
-
-  onLinkClick: function (e) {
-    var el = e.target;
-
-    if (el.tagName === 'A' && el.href && !el.target) {
-        e.preventDefault();
-        window.open(el.href, '_blank');
-    }
-  }
-});
-
-'use strict';
-
-SwaggerUi.Models.Oauth2Model = Backbone.Model.extend({
-    defaults: {
-        scopes: {},
-        isPasswordFlow: false,
-        clientAuthenticationType: 'none'
-    },
-
-    initialize: function () {
-        if(this.attributes && this.attributes.scopes) {
-            var attributes = _.cloneDeep(this.attributes);
-            var i, scopes = [];
-            for(i in attributes.scopes) {
-                var scope = attributes.scopes[i];
-                if(typeof scope.description === 'string') {
-                    scopes[scope] = attributes.scopes[i];
-                    scopes.push(attributes.scopes[i]);
-                }
-            }
-            attributes.scopes = scopes;
-            this.attributes = attributes;
-        }
-
-        if (this.attributes && this.attributes.flow) {
-            var flow = this.attributes.flow;
-            this.set('isPasswordFlow', flow === 'password');
-            this.set('requireClientAuthentication', flow === 'application');
-            this.set('clientAuthentication', flow === 'password' || flow === 'application');
-        }
-        this.on('change', this.validate);
-    },
-
-    setScopes: function (name, val) {
-        var auth = _.extend({}, this.attributes);
-        var index = _.findIndex(auth.scopes, function(o) {
-            return o.scope === name;
-        });
-        auth.scopes[index].checked = val;
-
-        this.set(auth);
-        this.validate();
-    },
-
-    validate: function () {
-      var valid = false;
-      if (this.get('isPasswordFlow') &&
-          (!this.get('username'))) {
-          return false;
-      }
-
-      if (this.get('clientAuthenticationType') in ['basic', 'request-body'] &&
-          (!this.get('clientId'))) {
-          return false;
-      }
-
-      var scp = this.get('scopes');
-      var idx =  _.findIndex(scp, function (o) {
-         return o.checked === true;
-      });
-
-      if(scp.length > 0 && idx >= 0) {
-          valid = true;
-      }
-
-      if(scp.length === 0) {
-          valid = true;
-      }
-
-      this.set('valid', valid);
-
-      return valid;
-    }
-});
-
-'use strict';
-
-SwaggerUi.Views.Oauth2View = Backbone.View.extend({
-    events: {
-        'change .oauth-scope': 'scopeChange',
-        'change .oauth-username': 'setUsername',
-        'change .oauth-password': 'setPassword',
-        'change .oauth-client-authentication-type': 'setClientAuthenticationType',
-        'change .oauth-client-id': 'setClientId',
-        'change .oauth-client-secret': 'setClientSecret'
-    },
-
-    template: Handlebars.templates.oauth2,
-
-    cls: {
-        error: 'error'
-    },
-
-    render: function () {
-        this.$el.html(this.template(this.model.toJSON()));
-
-        return this;
-    },
-
-    scopeChange: function (e) {
-        var val = $(e.target).prop('checked');
-        var scope = $(e.target).data('scope');
-
-        this.model.setScopes(scope, val);
-    },
-
-    setUsername: function (e) {
-        var val= $(e.target).val();
-        this.model.set('username', val);
-        if (val) {
-            $(e.target).removeClass(this.cls.error);
-        }
-    },
-
-    setPassword: function (e) {
-        this.model.set('password', $(e.target).val());
-    },
-
-    setClientAuthenticationType: function (e) {
-        var type = $(e.target).val();
-        var $el = this.$el;
-        this.model.set('clientAuthenticationType', type);
-
-        switch(type) {
-            case 'none':
-                $el.find('.oauth-client-authentication').hide();
-                break;
-            case 'basic':
-            case 'request-body':
-                $el.find('.oauth-client-id').removeClass(this.cls.error);
-                $el.find('.oauth-client-authentication').show();
-                break;
-        }
-    },
-
-    setClientId: function (e) {
-        var val = $(e.target).val();
-        this.model.set('clientId', val);
-        if (val) {
-            $(e.target).removeClass(this.cls.error);
-        }
-    },
-
-    setClientSecret: function (e) {
-        this.model.set('clientSecret', $(e.target).val());
-        $(e.target).removeClass('error');
-    },
-
-    highlightInvalid: function () {
-        if (!this.model.get('username')) {
-            this.$el.find('.oauth-username').addClass(this.cls.error);
-        }
-
-        if (!this.model.get('clientId')) {
-            this.$el.find('.oauth-client-id').addClass(this.cls.error);
-        }
-    }
-});
-'use strict';
-
-SwaggerUi.Views.OperationView = Backbone.View.extend({
-  invocationUrl: null,
-
-  events: {
-    'submit .sandbox'         : 'submitOperation',
-    'click .submit'           : 'submitOperation',
-    'click .response_hider'   : 'hideResponse',
-    'click .toggleOperation'  : 'toggleOperationContent',
-    'mouseenter .api-ic'      : 'mouseEnter',
-    'dblclick .curl'          : 'selectText',
-    'change [name=responseContentType]' : 'showSnippet'
-  },
-
-  initialize: function(opts) {
-    opts = opts || {};
-    this.router = opts.router;
-    this.auths = opts.auths;
-    this.parentId = this.model.parentId;
-    this.nickname = this.model.nickname;
-    this.model.encodedParentId = encodeURIComponent(this.parentId);
-
-    if (opts.swaggerOptions) {
-      this.model.defaultRendering = opts.swaggerOptions.defaultModelRendering;
-
-      if (opts.swaggerOptions.showRequestHeaders) {
-        this.model.showRequestHeaders = true;
-      }
-
-      if (opts.swaggerOptions.showOperationIds) {
-        this.model.showOperationIds = true;
-      }
-    }
-    return this;
-  },
-
-  selectText: function(event) {
-    var doc = document,
-        text = event.target.firstChild,
-        range,
-        selection;
-    if (doc.body.createTextRange) {
-      range = document.body.createTextRange();
-      range.moveToElementText(text);
-      range.select();
-    } else if (window.getSelection) {
-      selection = window.getSelection();
-      range = document.createRange();
-      range.selectNodeContents(text);
-      selection.removeAllRanges();
-      selection.addRange(range);
-    }
-  },
-
-  mouseEnter: function(e) {
-    var elem = $(this.el).find('.content');
-    var x = e.pageX;
-    var y = e.pageY;
-    var scX = $(window).scrollLeft();
-    var scY = $(window).scrollTop();
-    var scMaxX = scX + $(window).width();
-    var scMaxY = scY + $(window).height();
-    var wd = elem.width();
-    var hgh = elem.height();
-
-    if (x + wd > scMaxX) {
-      x = scMaxX - wd;
-    }
-
-    if (x < scX) {
-      x = scX;
-    }
-
-    if (y + hgh > scMaxY) {
-      y = scMaxY - hgh;
-    }
-
-    if (y < scY) {
-      y = scY;
-    }
-
-    var pos = {};
-    pos.top = y;
-    pos.left = x;
-    elem.css(pos);
-  },
-
-  // Note: copied from CoffeeScript compiled file
-  // TODO: refactor
-  render: function() {
-    var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, l, len, len1, len2, len3, len4, m, modelAuths, n, o, p, param, q, ref, ref1, ref2, ref3, ref4, ref5, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value, produces, isXML, isJSON;
-    isMethodSubmissionSupported = jQuery.inArray(this.model.method, this.model.supportedSubmitMethods()) >= 0;
-    if (!isMethodSubmissionSupported) {
-      this.model.isReadOnly = true;
-    }
-    this.model.description = this.model.description || this.model.notes;
-    this.model.oauth = null;
-    modelAuths = this.model.authorizations || this.model.security;
-    if (modelAuths) {
-      if (Array.isArray(modelAuths)) {
-        for (l = 0, len = modelAuths.length; l < len; l++) {
-          auths = modelAuths[l];
-          for (key in auths) {
-            for (a in this.auths) {
-              auth = this.auths[a];
-              if (key === auth.name) {
-                if (auth.type === 'oauth2') {
-                  this.model.oauth = {};
-                  this.model.oauth.scopes = [];
-                  ref1 = auth.value.scopes;
-                  for (k in ref1) {
-                    v = ref1[k];
-                    scopeIndex = auths[key].indexOf(k);
-                    if (scopeIndex >= 0) {
-                      o = {
-                        scope: k,
-                        description: v
-                      };
-                      this.model.oauth.scopes.push(o);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      } else {
-        for (k in modelAuths) {
-          v = modelAuths[k];
-          if (k === 'oauth2') {
-            if (this.model.oauth === null) {
-              this.model.oauth = {};
-            }
-            if (this.model.oauth.scopes === void 0) {
-              this.model.oauth.scopes = [];
-            }
-            for (m = 0, len1 = v.length; m < len1; m++) {
-              o = v[m];
-              this.model.oauth.scopes.push(o);
-            }
-          }
-        }
-      }
-    }
-    if (typeof this.model.responses !== 'undefined') {
-      this.model.responseMessages = [];
-      ref2 = this.model.responses;
-      for (code in ref2) {
-        value = ref2[code];
-        schema = null;
-        schemaObj = this.model.responses[code].schema;
-        if (schemaObj && schemaObj.$ref) {
-          schema = schemaObj.$ref;
-          if (schema.indexOf('#/definitions/') !== -1) {
-            schema = schema.replace(/^.*#\/definitions\//, '');
-          }
-        }
-        this.model.responseMessages.push({
-          code: code,
-          message: value.description,
-          responseModel: schema,
-          headers: value.headers,
-          schema: schemaObj
-        });
-      }
-    }
-    if (typeof this.model.responseMessages === 'undefined') {
-      this.model.responseMessages = [];
-    }
-    signatureModel = null;
-    produces = this.model.produces;
-    isXML = this.contains(produces, 'xml');
-    isJSON = isXML ? this.contains(produces, 'json') : true;
-
-    if (this.model.successResponse) {
-      successResponse = this.model.successResponse;
-      for (key in successResponse) {
-        value = successResponse[key];
-        this.model.successCode = key;
-        if (typeof value === 'object' && typeof value.createJSONSample === 'function') {
-          this.model.successDescription = value.description;
-          this.model.headers = this.parseResponseHeaders(value.headers);
-          signatureModel = {
-            sampleJSON: isJSON ? JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2) : false,
-            isParam: false,
-            sampleXML: isXML ? SwaggerUi.partials.signature.createXMLSample(value.name, value.definition, value.models) : false,
-            signature: SwaggerUi.partials.signature.getModelSignature(value.name, value.definition, value.models, value.modelPropertyMacro)
-          };
-        } else {
-          signatureModel = {
-            signature: SwaggerUi.partials.signature.getPrimitiveSignature(value)
-          };
-        }
-      }
-    } else if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {
-      signatureModel = {
-        sampleJSON: this.model.responseSampleJSON,
-        isParam: false,
-        signature: this.model.responseClassSignature
-      };
-    }
-    $(this.el).html(Handlebars.templates.operation(this.model));
-    if (signatureModel) {
-      signatureModel.defaultRendering = this.model.defaultRendering;
-      responseSignatureView = new SwaggerUi.Views.SignatureView({
-        model: signatureModel,
-        router: this.router,
-        tagName: 'div'
-      });
-      $('.model-signature', $(this.el)).append(responseSignatureView.render().el);
-    } else {
-      this.model.responseClassSignature = 'string';
-      $('.model-signature', $(this.el)).html(this.model.type);
-    }
-    contentTypeModel = {
-      isParam: false
-    };
-    contentTypeModel.consumes = this.model.consumes;
-    contentTypeModel.produces = this.model.produces;
-    ref3 = this.model.parameters;
-    for (n = 0, len2 = ref3.length; n < len2; n++) {
-      param = ref3[n];
-      type = param.type || param.dataType || '';
-      if (typeof type === 'undefined') {
-        schema = param.schema;
-        if (schema && schema.$ref) {
-          ref = schema.$ref;
-          if (ref.indexOf('#/definitions/') === 0) {
-            type = ref.substring('#/definitions/'.length);
-          } else {
-            type = ref;
-          }
-        }
-      }
-      if (type && type.toLowerCase() === 'file') {
-        if (!contentTypeModel.consumes) {
-          contentTypeModel.consumes = 'multipart/form-data';
-        }
-      }
-      param.type = type;
-    }
-    responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({
-      model: contentTypeModel,
-      router: this.router
-    });
-    $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-    ref4 = this.model.parameters;
-    for (p = 0, len3 = ref4.length; p < len3; p++) {
-      param = ref4[p];
-      this.addParameter(param, contentTypeModel.consumes);
-    }
-    ref5 = this.model.responseMessages;
-    for (q = 0, len4 = ref5.length; q < len4; q++) {
-      statusCode = ref5[q];
-      statusCode.isXML = isXML;
-      statusCode.isJSON = isJSON;
-      if (!_.isUndefined(statusCode.headers)) {
-        statusCode.headers = this.parseHeadersType(statusCode.headers);
-      }
-      this.addStatusCode(statusCode);
-    }
-
-    if (Array.isArray(this.model.security)) {
-      var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security, this.model.parent.securityDefinitions);
-
-      authsModel.isLogout = !_.isEmpty(this.model.clientAuthorizations.authz);
-      this.authView = new SwaggerUi.Views.AuthButtonView({
-        data: authsModel,
-        router: this.router,
-        isOperation: true,
-        model: {
-          scopes: authsModel.scopes
-        }
-      });
-      this.$('.authorize-wrapper').append(this.authView.render().el);
-    }
-
-    this.showSnippet();
-    return this;
-  },
-
-  parseHeadersType: function (headers) {
-    var map = {
-      'string': {
-        'date-time': 'dateTime',
-        'date'     : 'date'
-      }
-    };
-
-    _.forEach(headers, function (header) {
-      var value;
-      header = header || {};
-      value = map[header.type] && map[header.type][header.format];
-      if (!_.isUndefined(value)) {
-        header.type = value;
-      }
-    });
-
-    return headers;
-  },
-
-  contains: function (produces, type) {
-    return produces.filter(function (val) {
-      if (val.indexOf(type) > -1) {
-        return true;
-      }
-    }).length;
-  },
-
-  parseResponseHeaders: function (data) {
-    var HEADERS_SEPARATOR = '; ';
-    var headers = _.clone(data);
-
-    _.forEach(headers, function (header) {
-      var other = [];
-      _.forEach(header, function (value, key) {
-        var properties = ['type', 'description'];
-        if (properties.indexOf(key.toLowerCase()) === -1) {
-          other.push(key + ': ' + value);
-        }
-      });
-
-      other.join(HEADERS_SEPARATOR);
-      header.other = other;
-    });
-
-    return headers;
-  },
-
-  addParameter: function(param, consumes) {
-    // Render a parameter
-    param.consumes = consumes;
-    param.defaultRendering = this.model.defaultRendering;
-
-    // Copy this param JSON spec so that it will be available for JsonEditor
-    if(param.schema){
-      $.extend(true, param.schema, this.model.definitions[param.type]);
-      param.schema.definitions = this.model.definitions;
-      // This is required for JsonEditor to display the root properly
-      if(!param.schema.type){
-        param.schema.type = 'object';
-      }
-      // This is the title that will be used by JsonEditor for the root
-      // Since we already display the parameter's name in the Parameter column
-      // We set this to space, we can't set it to null or space otherwise JsonEditor
-      // will replace it with the text "root" which won't look good on screen
-      if(!param.schema.title){
-        param.schema.title = ' ';
-      }
-    }
-
-    var paramView = new SwaggerUi.Views.ParameterView({
-      model: param,
-      tagName: 'tr',
-      readOnly: this.model.isReadOnly,
-      swaggerOptions: this.options.swaggerOptions
-    });
-    $('.operation-params', $(this.el)).append(paramView.render().el);
-  },
-
-  addStatusCode: function(statusCode) {
-    // Render status codes
-    statusCode.defaultRendering = this.model.defaultRendering;
-    var statusCodeView = new SwaggerUi.Views.StatusCodeView({
-      model: statusCode,
-      tagName: 'tr',
-      router: this.router
-    });
-    $('.operation-status', $(this.el)).append(statusCodeView.render().el);
-  },
-
-  // Note: copied from CoffeeScript compiled file
-  // TODO: redactor
-  submitOperation: function(e) {
-    var error_free, form, isFileUpload, map, opts;
-    if (e !== null) {
-      e.preventDefault();
-    }
-    form = $('.sandbox', $(this.el));
-    error_free = true;
-    form.find('input.required').each(function() {
-      $(this).removeClass('error');
-      if (jQuery.trim($(this).val()) === '') {
-        $(this).addClass('error');
-        $(this).wiggle({
-          callback: (function(_this) {
-            return function() {
-              $(_this).focus();
-            };
-          })(this)
-        });
-        error_free = false;
-      }
-    });
-    form.find('textarea.required:visible').each(function() {
-      $(this).removeClass('error');
-      if (jQuery.trim($(this).val()) === '') {
-        $(this).addClass('error');
-        $(this).wiggle({
-          callback: (function(_this) {
-            return function() {
-              return $(_this).focus();
-            };
-          })(this)
-        });
-        error_free = false;
-      }
-    });
-    form.find('select.required').each(function() {
-      $(this).removeClass('error');
-      if (this.selectedIndex === -1) {
-        $(this).addClass('error');
-        $(this).wiggle({
-          callback: (function(_this) {
-            return function() {
-              $(_this).focus();
-            };
-          })(this)
-        });
-        error_free = false;
-      }
-    });
-    if (error_free) {
-      map = this.getInputMap(form);
-      isFileUpload = this.isFileUpload(form);
-      opts = {
-        parent: this
-      };
-      if (this.options.swaggerOptions) {
-        for(var key in this.options.swaggerOptions) {
-          opts[key] = this.options.swaggerOptions[key];
-        }
-      }
-
-      var pi;
-      for(pi = 0; pi < this.model.parameters.length; pi++){
-        var p = this.model.parameters[pi];
-        if( p.jsonEditor && p.jsonEditor.isEnabled()){
-          var json = p.jsonEditor.getValue();
-          map[p.name] = JSON.stringify(json);
-        }
-      }
-
-      opts.responseContentType = $('div select[name=responseContentType]', $(this.el)).val();
-      opts.requestContentType = $('div select[name=parameterContentType]', $(this.el)).val();
-      $('.response_throbber', $(this.el)).show();
-      if (isFileUpload) {
-        $('.request_url', $(this.el)).html('<pre></pre>');
-        $('.request_url pre', $(this.el)).text(this.invocationUrl);
-
-        opts.useJQuery = true;
-        map.parameterContentType = 'multipart/form-data';
-        this.map = map;
-        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);
-      } else {
-        this.map = map;
-        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);
-      }
-    }
-  },
-
-  getInputMap: function (form) {
-    var map, ref1, l, len, o, ref2, m, len1, val, ref3, n, len2;
-    map = {};
-    ref1 = form.find('input');
-    for (l = 0, len = ref1.length; l < len; l++) {
-      o = ref1[l];
-      if ((o.value !== null) && jQuery.trim(o.value).length > 0) {
-        map[o.name] = o.value;
-      }
-      if (o.type === 'file') {
-        map[o.name] = o.files[0];
-      }
-    }
-    ref2 = form.find('textarea');
-    for (m = 0, len1 = ref2.length; m < len1; m++) {
-      o = ref2[m];
-      val = this.getTextAreaValue(o);
-      if ((val !== null) && jQuery.trim(val).length > 0) {
-        map[o.name] = val;
-      }
-    }
-    ref3 = form.find('select');
-    for (n = 0, len2 = ref3.length; n < len2; n++) {
-      o = ref3[n];
-      val = this.getSelectedValue(o);
-      if ((val !== null) && jQuery.trim(val).length > 0) {
-        map[o.name] = val;
-      }
-    }
-    return map;
-  },
-
-  isFileUpload: function (form) {
-    var ref1, l, len, o;
-    var isFileUpload = false;
-    ref1 = form.find('input');
-    for (l = 0, len = ref1.length; l < len; l++) {
-      o = ref1[l];
-      if (o.type === 'file') {
-        isFileUpload = true;
-      }
-    }
-    return isFileUpload;
-  },
-
-  success: function(response, parent) {
-    parent.showCompleteStatus(response);
-  },
-
-  // wraps a jquery response as a shred response
-  wrap: function(data) {
-    var h, headerArray, headers, i, l, len, o;
-    headers = {};
-    headerArray = data.getAllResponseHeaders().split('\r');
-    for (l = 0, len = headerArray.length; l < len; l++) {
-      i = headerArray[l];
-      h = i.match(/^([^:]*?):(.*)$/);
-      if (!h) {
-        h = [];
-      }
-      h.shift();
-      if (h[0] !== void 0 && h[1] !== void 0) {
-        headers[h[0].trim()] = h[1].trim();
-      }
-    }
-    o = {};
-    o.content = {};
-    o.content.data = data.responseText;
-    o.headers = headers;
-    o.request = {};
-    o.request.url = this.invocationUrl;
-    o.status = data.status;
-    return o;
-  },
-
-  getSelectedValue: function(select) {
-    if (!select.multiple) {
-      return select.value;
-    } else {
-      var options = [];
-      for (var l = 0, len = select.options.length; l < len; l++) {
-        var opt = select.options[l];
-        if (opt.selected) {
-          options.push(opt.value);
-        }
-      }
-      if (options.length > 0) {
-        return options;
-      } else {
-        return null;
-      }
-    }
-  },
-
-  // handler for hide response link
-  hideResponse: function(e) {
-    if (e) { e.preventDefault(); }
-    $('.response', $(this.el)).slideUp();
-    $('.response_hider', $(this.el)).fadeOut();
-  },
-
-  // Show response from server
-  showResponse: function(response) {
-    var prettyJson = JSON.stringify(response, null, '\t').replace(/\n/g, '<br>');
-    $('.response_body', $(this.el)).html(_.escape(prettyJson));
-  },
-
-  // Show error from server
-  showErrorStatus: function(data, parent) {
-    parent.showStatus(data);
-  },
-
-  // show the status codes
-  showCompleteStatus: function(data, parent){
-    parent.showStatus(data);
-  },
-
-  // Adapted from http://stackoverflow.com/a/2893259/454004
-  // Note: directly ported from CoffeeScript
-  // TODO: Cleanup CoffeeScript artifacts
-  formatXml: function(xml) {
-    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;
-    reg = /(>)(<)(\/*)/g;
-    wsexp = /[ ]*(.*)[ ]+\n/g;
-    contexp = /(<.+>)(.+\n)/g;
-    xml = xml.replace(/\r\n/g, '\n').replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-    pad = 0;
-    formatted = '';
-    lines = xml.split('\n');
-    indent = 0;
-    lastType = 'other';
-    transitions = {
-      'single->single': 0,
-      'single->closing': -1,
-      'single->opening': 0,
-      'single->other': 0,
-      'closing->single': 0,
-      'closing->closing': -1,
-      'closing->opening': 0,
-      'closing->other': 0,
-      'opening->single': 1,
-      'opening->closing': 0,
-      'opening->opening': 1,
-      'opening->other': 1,
-      'other->single': 0,
-      'other->closing': -1,
-      'other->opening': 0,
-      'other->other': 0
-    };
-    fn = function(ln) {
-      var fromTo, j, key, padding, type, types, value;
-      types = {
-        single: Boolean(ln.match(/<.+\/>/)),
-        closing: Boolean(ln.match(/<\/.+>/)),
-        opening: Boolean(ln.match(/<[^!?].*>/))
-      };
-      type = ((function() {
-        var results;
-        results = [];
-        for (key in types) {
-          value = types[key];
-          if (value) {
-            results.push(key);
-          }
-        }
-        return results;
-      })())[0];
-      type = type === void 0 ? 'other' : type;
-      fromTo = lastType + '->' + type;
-      lastType = type;
-      padding = '';
-      indent += transitions[fromTo];
-      padding = ((function() {
-        var m, ref1, results;
-        results = [];
-        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {
-          results.push('  ');
-        }
-        return results;
-      })()).join('');
-      if (fromTo === 'opening->closing') {
-        formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-      } else {
-        formatted += padding + ln + '\n';
-      }
-    };
-    for (l = 0, len = lines.length; l < len; l++) {
-      ln = lines[l];
-      fn(ln);
-    }
-    return formatted;
-  },
-
-  // puts the response data in UI
-  showStatus: function(response) {
-    var url, content;
-    if (response.content === undefined) {
-      content = response.data;
-      url = response.url;
-    } else {
-      content = response.content.data;
-      url = response.request.url;
-    }
-    var headers = response.headers;
-    if(typeof content === 'string') {
-      content = jQuery.trim(content);
-    }
-
-    // if server is nice, and sends content-type back, we can use it
-    var contentType = null;
-    if (headers) {
-      contentType = headers['Content-Type'] || headers['content-type'];
-      if (contentType) {
-        contentType = contentType.split(';')[0].trim();
-      }
-    }
-
-    $('.response_body', $(this.el)).removeClass('json');
-    $('.response_body', $(this.el)).removeClass('xml');
-
-    var supportsAudioPlayback = function(contentType){
-      var audioElement = document.createElement('audio');
-      return !!(audioElement.canPlayType && audioElement.canPlayType(contentType).replace(/no/, ''));
-    };
-
-    var pre;
-    var code;
-    var skipHighlight = false;
-    if (!content) {
-      code = $('<code />').text('no content');
-      pre = $('<pre class="json" />').append(code);
-
-      // JSON
-    } else if (
-        contentType === 'application/octet-stream' ||
-        headers['Content-Disposition'] && (/attachment/).test(headers['Content-Disposition']) ||
-        headers['content-disposition'] && (/attachment/).test(headers['content-disposition']) ||
-        headers['Content-Description'] && (/File Transfer/).test(headers['Content-Description']) ||
-        headers['content-description'] && (/File Transfer/).test(headers['content-description'])) {
-
-      if ('Blob' in window) {
-        var type = contentType || 'text/html';
-        var a = document.createElement('a');
-        var href;
-
-        if({}.toString.apply(content) === '[object Blob]') {
-          href = window.URL.createObjectURL(content);
-        }
-        else {
-          var binaryData = [];
-          binaryData.push(content);
-          href = window.URL.createObjectURL(new Blob(binaryData, {type: type}));
-        }
-        var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);
-        var download = [type, fileName, href].join(':');
-
-        // Use filename from response header
-        var disposition = headers['content-disposition'] || headers['Content-Disposition'];
-        if(typeof disposition !== 'undefined') {
-          var responseFilename = /filename=([^;]*);?/.exec(disposition);
-          if(responseFilename !== null && responseFilename.length > 1) {
-            download = responseFilename[1];
-            fileName = download;
-          }
-        }
-
-        a.setAttribute('href', href);
-        a.setAttribute('download', download);
-        a.innerText = 'Download ' + fileName;
-
-        pre = $('<div/>').append(a);
-        skipHighlight = true;
-      } else {
-        pre = $('<pre class="json" />').append('Download headers detected but your browser does not support downloading binary via XHR (Blob).');
-      }
-    } else if (contentType === 'application/json' || /\+json$/.test(contentType)) {
-      var json = null;
-      try {
-        json = JSON.stringify(JSON.parse(content), null, '  ');
-      } catch (_error) {
-        json = 'can\'t parse JSON.  Raw result:\n\n' + content;
-      }
-      code = $('<code />').text(json);
-      pre = $('<pre class="json" />').append(code);
-
-      // XML
-    } else if (contentType === 'application/xml' || /\+xml$/.test(contentType)) {
-      code = $('<code />').text(this.formatXml(content));
-      pre = $('<pre class="xml" />').append(code);
-
-      // HTML
-    } else if (contentType === 'text/html') {
-      code = $('<code />').html(_.escape(content));
-      pre = $('<pre class="xml" />').append(code);
-
-      // Plain Text
-    } else if (/text\/plain/.test(contentType)) {
-      code = $('<code />').text(content);
-      pre = $('<pre class="plain" />').append(code);
-
-      // Image
-    } else if (/^image\//.test(contentType)) {
-      var urlCreator = window.URL || window.webkitURL;
-      var imageUrl = urlCreator.createObjectURL(content);
-
-      pre = $('<img>').attr( 'src', imageUrl);
-      // Audio
-    } else if (/^audio\//.test(contentType) && supportsAudioPlayback(contentType)) {
-      pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));
-    } else if(headers.location || headers.Location) {
-      // Location header based redirect download
-      window.location = response.url;
-
-      // Anything else (CORS)
-    } else {
-      code = $('<code />').text(content);
-      pre = $('<pre class="json" />').append(code);
-    }
-    var response_body = pre;
-    $('.request_url', $(this.el)).html('<pre></pre>');
-    $('.request_url pre', $(this.el)).text(url);
-    $('.response_code', $(this.el)).html('<pre>' + response.status + '</pre>');
-    $('.response_body', $(this.el)).html(response_body);
-    $('.response_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(response.headers, null, '  ')).replace(/\n/g, '<br>') + '</pre>');
-    $('.response', $(this.el)).slideDown();
-    $('.response_hider', $(this.el)).show();
-    $('.response_throbber', $(this.el)).hide();
-
-
-    // adds curl output
-    var curlCommand = this.model.asCurl(this.map, {responseContentType: contentType});
-    curlCommand = curlCommand.replace('!', '&#33;');
-    $( 'div.curl', $(this.el)).html('<pre>' + _.escape(curlCommand) + '</pre>');
-
-    // only highlight the response if response is less than threshold, default state is highlight response
-    var opts = this.options.swaggerOptions;
-
-    if (opts.showRequestHeaders) {
-      var form = $('.sandbox', $(this.el)),
-          map = this.getInputMap(form),
-          requestHeaders = this.model.getHeaderParams(map);
-      delete requestHeaders['Content-Type'];
-      $('.request_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(requestHeaders, null, '  ')).replace(/\n/g, '<br>') + '</pre>');
-    }
-
-    // Call user-defined hook
-    if (opts.responseHooks && opts.responseHooks[this.nickname]) {
-      opts.responseHooks[this.nickname](response, this);
-    }
-
-    var response_body_el = $('.response_body', $(this.el))[0];
-    // only highlight the response if response is less than threshold, default state is highlight response
-    if (opts.highlightSizeThreshold && typeof response.data !== 'undefined' && response.data.length > opts.highlightSizeThreshold || skipHighlight) {
-      return response_body_el;
-    } else {
-      return hljs.highlightBlock(response_body_el);
-    }
-  },
-
-  toggleOperationContent: function (event) {
-    var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content'));
-    if (elem.is(':visible')){
-      $.bbq.pushState('#/', 2);
-      event.preventDefault();
-      Docs.collapseOperation(elem);
-    } else {
-      Docs.expandOperation(elem);
-    }
-  },
-
-  getTextAreaValue: function(textArea) {
-    var param, parsed, result, i;
-    if (textArea.value === null || jQuery.trim(textArea.value).length === 0) {
-      return null;
-    }
-    param = this.getParamByName(textArea.name);
-    if (param && param.type && param.type.toLowerCase() === 'array') {
-      parsed = textArea.value.split('\n');
-      result = [];
-      for (i = 0; i < parsed.length; i++) {
-        if (parsed[i] !== null && jQuery.trim(parsed[i]).length > 0) {
-          result.push(parsed[i]);
-        }
-      }
-      return result.length > 0 ? result : null;
-    } else {
-      return textArea.value;
-    }
-  },
-
-  showSnippet: function () {
-    var contentTypeEl = this.$('[name=responseContentType]');
-    var xmlSnippetEl = this.$('.operation-status .snippet_xml, .response-class .snippet_xml');
-    var jsonSnippetEl = this.$('.operation-status .snippet_json, .response-class .snippet_json');
-    var contentType;
-
-    if (!contentTypeEl.length) { return; }
-    contentType = contentTypeEl.val();
-
-    if (contentType.indexOf('xml') > -1) {
-      xmlSnippetEl.show();
-      jsonSnippetEl.hide();
-    } else {
-      jsonSnippetEl.show();
-      xmlSnippetEl.hide();
-    }
-  },
-
-  getParamByName: function(name) {
-    var i;
-    if (this.model.parameters) {
-      for(i = 0; i < this.model.parameters.length; i++) {
-        if (this.model.parameters[i].name === name) {
-          return this.model.parameters[i];
-        }
-      }
-    }
-    return null;
-  }
-
-});
-
-'use strict';
-
-SwaggerUi.Views.ParameterContentTypeView = Backbone.View.extend({
-  initialize: function  () {},
-
-  render: function(){
-    this.model.parameterContentTypeId = 'pct' + Math.random();
-    $(this.el).html(Handlebars.templates.parameter_content_type(this.model));
-    return this;
-  }
-
-});
-'use strict';
-
-SwaggerUi.Views.ParameterView = Backbone.View.extend({
-  events: {
-    'change [name=parameterContentType]' : 'toggleParameterSnippet'
-  },
-
-  initialize: function(){
-    Handlebars.registerHelper('isArray', function(param, opts) {
-      var paramType = param.type && param.type.toLowerCase();
-      if (paramType === 'array' || param.allowMultiple) {
-        return opts.fn(this);
-      } else {
-        return opts.inverse(this);
-      }
-    });
-  },
-
-  render: function() {
-    var type = this.model.type || this.model.dataType;
-    var modelType = this.model.modelSignature.type;
-    var modelDefinitions = this.model.modelSignature.definitions;
-    var schema = this.model.schema || {};
-    var consumes = this.model.consumes || [];
-    var sampleJSON, signatureView;
-
-    if (typeof type === 'undefined') {
-      if (schema.$ref) {
-        var ref = schema.$ref;
-        if (ref.indexOf('#/definitions/') === 0) {
-          type = ref.substring('#/definitions/'.length);
-        } else {
-          type = ref;
-        }
-      }
-    }
-
-    this.model.type = type;
-    this.model.paramType = this.model.in || this.model.paramType;
-    this.model.isBody = this.model.paramType === 'body' || this.model.in === 'body';
-    this.model.isFile = type && type.toLowerCase() === 'file';
-
-    // Allow for default === false
-    if(typeof this.model.default === 'undefined') {
-      this.model.default = this.model.defaultValue;
-    }
-
-    this.model.hasDefault = (typeof this.model.default !== 'undefined');
-    this.model.valueId = 'm' + this.model.name + Math.random();
-
-    if (this.model.allowableValues) {
-      this.model.isList = true;
-    }
-
-    var isXML = this.contains(consumes, 'xml');
-    var isJSON = isXML ? this.contains(consumes, 'json') : true;
-    sampleJSON = SwaggerUi.partials.signature.createParameterJSONSample(modelType, modelDefinitions);
-
-    var template = this.template();
-    $(this.el).html(template(this.model));
-
-    var signatureModel = {
-      sampleJSON: isJSON ? sampleJSON : false,
-      sampleXML: sampleJSON && isXML ? SwaggerUi.partials.signature.createXMLSample('', schema, modelDefinitions, true) : false,
-      isParam: true,
-      signature: SwaggerUi.partials.signature.getParameterModelSignature(modelType, modelDefinitions),
-      defaultRendering: this.model.defaultRendering
-    };
-
-    if (sampleJSON) {
-      signatureView = new SwaggerUi.Views.SignatureView({model: signatureModel, tagName: 'div'});
-      $('.model-signature', $(this.el)).append(signatureView.render().el);
-    }
-    else {
-      $('.model-signature', $(this.el)).html(this.model.signature);
-    }
-
-    var isParam = false;
-
-    if( this.options.swaggerOptions.jsonEditor && this.model.isBody && this.model.schema){
-      var $self = $(this.el);
-      this.model.jsonEditor =
-        /* global JSONEditor */
-        new JSONEditor($('.editor_holder', $self)[0],
-                       {schema: this.model.schema, startval : this.model.default,
-                        ajax:true,
-                        disable_properties:true,
-                        disable_edit_json:true,
-                        iconlib: 'swagger' });
-      // This is so that the signature can send back the sample to the json editor
-      // TODO: SignatureView should expose an event "onSampleClicked" instead
-      signatureModel.jsonEditor = this.model.jsonEditor;
-      $('.body-textarea', $self).hide();
-      $('.editor_holder', $self).show();
-      $('.parameter-content-type', $self)
-        .change(function(e){
-            if(e.target.value === 'application/xml'){
-              $('.body-textarea', $self).show();
-              $('.editor_holder', $self).hide();
-              this.model.jsonEditor.disable();
-            }
-            else {
-              $('.body-textarea', $self).hide();
-              $('.editor_holder', $self).show();
-              this.model.jsonEditor.enable();
-            }
-        });
-      }
-
-
-    if (this.model.isBody) {
-      isParam = true;
-    }
-
-    var contentTypeModel = {
-      isParam: isParam
-    };
-
-    contentTypeModel.consumes = this.model.consumes;
-
-    if (isParam) {
-      var parameterContentTypeView = new SwaggerUi.Views.ParameterContentTypeView({model: contentTypeModel});
-      $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);
-      this.toggleParameterSnippet();
-    }
-
-    else {
-      var responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({model: contentTypeModel});
-      $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      this.toggleResponseSnippet();
-    }
-
-    return this;
-  },
-
-  contains: function (consumes, type) {
-    return consumes.filter(function (val) {
-      if (val.indexOf(type) > -1) {
-        return true;
-      }
-    }).length;
-  },
-
-  toggleParameterSnippet: function () {
-    var contentType = this.$('[name=parameterContentType]').val();
-
-    this.toggleSnippet(contentType);
-  },
-
-  toggleResponseSnippet: function () {
-    var contentEl = this.$('[name=responseContentType]');
-
-    if (!contentEl.length) { return; }
-
-    this.toggleSnippet(contentEl.val());
-  },
-
-  toggleSnippet: function (type) {
-    type = type || '';
-    if (type.indexOf('xml') > -1) {
-      this.$('.snippet_xml').show();
-      this.$('.snippet_json').hide();
-    } else {
-      this.$('.snippet_json').show();
-      this.$('.snippet_xml').hide();
-    }
-  },
-
-  // Return an appropriate template based on if the parameter is a list, readonly, required
-  template: function(){
-    if (this.model.isList) {
-      return Handlebars.templates.param_list;
-    } else {
-      if (this.options.readOnly) {
-        if (this.model.required) {
-          return Handlebars.templates.param_readonly_required;
-        } else {
-          return Handlebars.templates.param_readonly;
-        }
-      } else {
-        if (this.model.required) {
-          return Handlebars.templates.param_required;
-        } else {
-          return Handlebars.templates.param;
-        }
-      }
-    }
-  }
-});
-
-'use strict';
-
-/* jshint -W122 */
-SwaggerUi.partials.signature = (function () {
-  // copy-pasted from swagger-js
-  var resolveSchema = function (schema) {
-    if (_.isPlainObject(schema.schema)) {
-      schema = resolveSchema(schema.schema);
-    }
-
-    return schema;
-  };
-
-  // copy-pasted from swagger-js
-  var simpleRef = function (name) {
-    if (typeof name === 'undefined') {
-      return null;
-    }
-
-    if (name.indexOf('#/definitions/') === 0) {
-      return name.substring('#/definitions/'.length);
-    } else {
-      return name;
-    }
-  };
-
-  // copy-pasted from swagger-js
-  var getInlineModel = function(inlineStr) {
-    if(/^Inline Model \d+$/.test(inlineStr) && this.inlineModels) {
-      var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //
-      var model = this.inlineModels[id];
-      return model;
-    }
-    // I'm returning null here, should I rather throw an error?
-    return null;
-  };
-
-  // copy-pasted from swagger-js
-  var formatXml = function(xml) {
-    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;
-    reg = /(>)(<)(\/*)/g;
-    wsexp = /[ ]*(.*)[ ]+\n/g;
-    contexp = /(<.+>)(.+\n)/g;
-    xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-    pad = 0;
-    formatted = '';
-    lines = xml.split('\n');
-    indent = 0;
-    lastType = 'other';
-    transitions = {
-      'single->single': 0,
-      'single->closing': -1,
-      'single->opening': 0,
-      'single->other': 0,
-      'closing->single': 0,
-      'closing->closing': -1,
-      'closing->opening': 0,
-      'closing->other': 0,
-      'opening->single': 1,
-      'opening->closing': 0,
-      'opening->opening': 1,
-      'opening->other': 1,
-      'other->single': 0,
-      'other->closing': -1,
-      'other->opening': 0,
-      'other->other': 0
-    };
-    fn = function(ln) {
-      var fromTo, j, key, padding, type, types, value;
-      types = {
-        single: Boolean(ln.match(/<.+\/>/)),
-        closing: Boolean(ln.match(/<\/.+>/)),
-        opening: Boolean(ln.match(/<[^!?].*>/))
-      };
-      type = ((function() {
-        var results;
-        results = [];
-        for (key in types) {
-          value = types[key];
-          if (value) {
-            results.push(key);
-          }
-        }
-        return results;
-      })())[0];
-      type = type === void 0 ? 'other' : type;
-      fromTo = lastType + '->' + type;
-      lastType = type;
-      padding = '';
-      indent += transitions[fromTo];
-      padding = ((function() {
-        var m, ref1, results;
-        results = [];
-        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {
-          results.push('  ');
-        }
-        return results;
-      })()).join('');
-      if (fromTo === 'opening->closing') {
-        formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-      } else {
-        formatted += padding + ln + '\n';
-      }
-    };
-    for (l = 0, len = lines.length; l < len; l++) {
-      ln = lines[l];
-      fn(ln);
-    }
-    return formatted;
-  };
-
-  // copy-pasted from swagger-js
-  var getModelSignature = function (name, schema, models, modelPropertyMacro) {
-    var strongOpen = '<span class="strong">';
-    var strongClose = '</span>';
-
-    var optionHtml = function (label, value) {
-      return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
-    };
-
-
-    // Allow for ignoring the 'name' argument.... shifting the rest
-    if(_.isObject(arguments[0])) {
-      name = void 0;
-      schema = arguments[0];
-      models = arguments[1];
-      modelPropertyMacro = arguments[2];
-    }
-
-    models = models || {};
-
-    // Resolve the schema (Handle nested schemas)
-    schema = resolveSchema(schema);
-
-    // Return for empty object
-    if(_.isEmpty(schema)) {
-      return strongOpen + 'Empty' + strongClose;
-    }
-
-    // Dereference $ref from 'models'
-    if(typeof schema.$ref === 'string') {
-      name = simpleRef(schema.$ref);
-      schema = models[name];
-      if(typeof schema === 'undefined')
-      {
-        return strongOpen + name + ' is not defined!' + strongClose;
-      }
-    }
-
-    if(typeof name !== 'string') {
-      name = schema.title || 'Inline Model';
-    }
-
-    // If we are a Model object... adjust accordingly
-    if(schema.definition) {
-      schema = schema.definition;
-    }
-
-    if(typeof modelPropertyMacro !== 'function') {
-      modelPropertyMacro = function(prop){
-        return (prop || {}).default;
-      };
-    }
-
-    var references = {};
-    var seenModels = [];
-    var inlineModels = 0;
-
-    // Generate current HTML
-    var html = processModel(schema, name);
-
-    // Generate references HTML
-    while (_.keys(references).length > 0) {
-      /* jshint ignore:start */
-      _.forEach(references, function (schema, name) {
-        var seenModel = _.indexOf(seenModels, name) > -1;
-
-        delete references[name];
-
-        if (!seenModel) {
-          seenModels.push(name);
-
-          html += '<br />' + processModel(schema, name);
-        }
-      });
-      /* jshint ignore:end */
-    }
-
-    return html;
-
-
-    function addReference(schema, name, skipRef) {
-      var modelName = name;
-      var model;
-
-      if (schema.$ref) {
-        modelName = schema.title || simpleRef(schema.$ref);
-        model = models[simpleRef(schema.$ref)];
-      } else if (_.isUndefined(name)) {
-        modelName = schema.title || 'Inline Model ' + (++inlineModels);
-        model = {definition: schema};
-      }
-
-      if (skipRef !== true) {
-        references[modelName] = _.isUndefined(model) ? {} : model.definition;
-      }
-
-      return modelName;
-    }
-
-    function primitiveToHTML(schema) {
-      var html = '<span class="propType">';
-      var type = schema.type || 'object';
-
-      if (schema.$ref) {
-        html += addReference(schema, simpleRef(schema.$ref));
-      } else if (type === 'object') {
-        if (!_.isUndefined(schema.properties)) {
-          html += addReference(schema);
-        } else {
-          html += 'object';
-        }
-      } else if (type === 'array') {
-        html += 'Array[';
-
-        if (_.isArray(schema.items)) {
-          html += _.map(schema.items, addReference).join(',');
-        } else if (_.isPlainObject(schema.items)) {
-          if (_.isUndefined(schema.items.$ref)) {
-            if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {
-              html += schema.items.type;
-            } else {
-              html += addReference(schema.items);
-            }
-          } else {
-            html += addReference(schema.items, simpleRef(schema.items.$ref));
-          }
-        } else {
-          console.log('Array type\'s \'items\' schema is not an array or an object, cannot process');
-          html += 'object';
-        }
-
-        html += ']';
-      } else {
-        html += schema.type;
-      }
-
-      html += '</span>';
-
-      return html;
-    }
-
-    function primitiveToOptionsHTML(schema, html) {
-      var options = '';
-      var type = schema.type || 'object';
-      var isArray = type === 'array';
-
-      if (!_.isUndefined(schema.description)) {
-        html += ': ' + '<span class="propDesc">' + schema.description + '</span>';
-      }
-
-      if (schema.enum) {
-        html += ' = <span class="propVals">[\'' + schema.enum.join('\', \'') + '\']</span>';
-      }
-
-      if (isArray) {
-        if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {
-          type = schema.items.type;
-        } else {
-          type = 'object';
-        }
-      }
-
-      if (!_.isUndefined(schema.default)) {
-        options += optionHtml('Default', schema.default);
-      }
-
-      switch (type) {
-      case 'string':
-        if (schema.minLength) {
-          options += optionHtml('Min. Length', schema.minLength);
-        }
-
-        if (schema.maxLength) {
-          options += optionHtml('Max. Length', schema.maxLength);
-        }
-
-        if (schema.pattern) {
-          options += optionHtml('Reg. Exp.', schema.pattern);
-        }
-        break;
-      case 'integer':
-      case 'number':
-        if (schema.minimum) {
-          options += optionHtml('Min. Value', schema.minimum);
-        }
-
-        if (schema.exclusiveMinimum) {
-          options += optionHtml('Exclusive Min.', 'true');
-        }
-
-        if (schema.maximum) {
-          options += optionHtml('Max. Value', schema.maximum);
-        }
-
-        if (schema.exclusiveMaximum) {
-          options += optionHtml('Exclusive Max.', 'true');
-        }
-
-        if (schema.multipleOf) {
-          options += optionHtml('Multiple Of', schema.multipleOf);
-        }
-
-        break;
-      }
-
-      if (isArray) {
-        if (schema.minItems) {
-          options += optionHtml('Min. Items', schema.minItems);
-        }
-
-        if (schema.maxItems) {
-          options += optionHtml('Max. Items', schema.maxItems);
-        }
-
-        if (schema.uniqueItems) {
-          options += optionHtml('Unique Items', 'true');
-        }
-
-        if (schema.collectionFormat) {
-          options += optionHtml('Coll. Format', schema.collectionFormat);
-        }
-      }
-
-      if (_.isUndefined(schema.items)) {
-        if (_.isArray(schema.enum)) {
-          var enumString;
-
-          if (type === 'number' || type === 'integer') {
-            enumString = schema.enum.join(', ');
-          } else {
-            enumString = '"' + schema.enum.join('", "') + '"';
-          }
-
-          options += optionHtml('Enum', enumString);
-        }
-      }
-
-      if (options.length > 0) {
-        html = '<span class="propWrap">' + html + '<table class="optionsWrapper"><tr><th colspan="2">' + type + '</th></tr>' + options + '</table></span>';
-      }
-
-      return html;
-    }
-
-    function processModel(schema, name) {
-      var type = schema.type || 'object';
-      var isArray = schema.type === 'array';
-      var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;
-      var contents;
-
-      if (name) {
-        seenModels.push(name);
-      }
-
-      if (isArray) {
-        if (_.isArray(schema.items)) {
-          html += '<div>' + _.map(schema.items, function (item) {
-            var type = item.type || 'object';
-
-            if (_.isUndefined(item.$ref)) {
-              if (_.indexOf(['array', 'object'], type) > -1) {
-                if (type === 'object' && _.isUndefined(item.properties)) {
-                  return 'object';
-                } else {
-                  return addReference(item);
-                }
-              } else {
-                return primitiveToOptionsHTML(item, type);
-              }
-            } else {
-              return addReference(item, simpleRef(item.$ref));
-            }
-          }).join(',</div><div>');
-        } else if (_.isPlainObject(schema.items)) {
-          if (_.isUndefined(schema.items.$ref)) {
-            if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {
-              if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {
-                html += '<div>object</div>';
-              } else {
-                html += '<div>' + addReference(schema.items) + '</div>';
-              }
-            } else {
-              html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';
-            }
-          } else {
-            html += '<div>' + addReference(schema.items, simpleRef(schema.items.$ref)) + '</div>';
-          }
-        } else {
-          console.log('Array type\'s \'items\' property is not an array or an object, cannot process');
-          html += '<div>object</div>';
-        }
-      } else {
-        if (schema.$ref) {
-          html += '<div>' + addReference(schema, name) + '</div>';
-        } else if (type === 'object') {
-          if (_.isPlainObject(schema.properties)) {
-            contents = _.map(schema.properties, function (property, name) {
-              var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);
-              var cProperty = _.cloneDeep(property);
-
-              var requiredClass = propertyIsRequired ? 'required' : '';
-              var html = '<span class="propName ' + requiredClass + '">' + name + '</span> (';
-              var model;
-
-              // Allow macro to set the default value
-              cProperty.default = modelPropertyMacro(cProperty);
-
-              // Resolve the schema (Handle nested schemas)
-              cProperty = resolveSchema(cProperty);
-
-              // We need to handle property references to primitives (Issue 339)
-              if (!_.isUndefined(cProperty.$ref)) {
-                model = models[simpleRef(cProperty.$ref)];
-
-                if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {
-                  // Use referenced schema
-                  cProperty = resolveSchema(model.definition);
-                }
-              }
-
-              html += primitiveToHTML(cProperty);
-
-              if(!propertyIsRequired) {
-                html += ', <span class="propOptKey">optional</span>';
-              }
-
-              if(property.readOnly) {
-                  html += ', <span class="propReadOnly">read only</span>';
-              }
-
-              html += ')';
-
-              return '<div' + (property.readOnly ? ' class="readOnly"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);
-            }).join(',</div>');
-          }
-
-          if (contents) {
-            html += contents + '</div>';
-          }
-        } else {
-          html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';
-        }
-      }
-
-      return html + strongOpen + (isArray ? ']' : '}') + strongClose;
-    }
-
-  };
-
-  // copy-pasted from swagger-js
-  var schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {
-    // Resolve the schema (Handle nested schemas)
-    schema = resolveSchema(schema);
-
-    if(typeof modelPropertyMacro !== 'function') {
-      modelPropertyMacro = function(prop){
-        return (prop || {}).default;
-      };
-    }
-
-    modelsToIgnore= modelsToIgnore || {};
-
-    var type = schema.type || 'object';
-    var format = schema.format;
-    var model;
-    var output;
-
-    if (!_.isUndefined(schema.example)) {
-      output = schema.example;
-    } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {
-      output = schema.enum[0];
-    }
-
-    if (_.isUndefined(output)) {
-      if (schema.$ref) {
-        model = models[simpleRef(schema.$ref)];
-
-        if (!_.isUndefined(model)) {
-          if (_.isUndefined(modelsToIgnore[model.name])) {
-            modelsToIgnore[model.name] = model;
-            output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);
-            delete modelsToIgnore[model.name];
-          } else {
-            if (model.type === 'array') {
-              output = [];
-            } else {
-              output = {};
-            }
-          }
-        }
-      } else if (!_.isUndefined(schema.default)) {
-        output = schema.default;
-      } else if (type === 'string') {
-        if (format === 'date-time') {
-          output = new Date().toISOString();
-        } else if (format === 'date') {
-          output = new Date().toISOString().split('T')[0];
-        } else {
-          output = 'string';
-        }
-      } else if (type === 'integer') {
-        output = 0;
-      } else if (type === 'number') {
-        output = 0.0;
-      } else if (type === 'boolean') {
-        output = true;
-      } else if (type === 'object') {
-        output = {};
-
-        _.forEach(schema.properties, function (property, name) {
-          var cProperty = _.cloneDeep(property);
-
-          // Allow macro to set the default value
-          cProperty.default = modelPropertyMacro(property);
-
-          output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);
-        });
-      } else if (type === 'array') {
-        output = [];
-
-        if (_.isArray(schema.items)) {
-          _.forEach(schema.items, function (item) {
-            output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));
-          });
-        } else if (_.isPlainObject(schema.items)) {
-          output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));
-        } else if (_.isUndefined(schema.items)) {
-          output.push({});
-        } else {
-          console.log('Array type\'s \'items\' property is not an array or an object, cannot process');
-        }
-      }
-    }
-
-    return output;
-  };
-
-  // copy-pasted from swagger-js
-  var createJSONSample = function (value, modelsToIgnore) {
-    modelsToIgnore = modelsToIgnore || {};
-
-    modelsToIgnore[value.name] = value;
-
-    // Response support
-    if (value.examples && _.isPlainObject(value.examples)) {
-      value = _.cloneDeep(value);
-      var keys = Object.keys(value.examples);
-
-      _.forEach(keys, function(key) {
-        if(key.indexOf('application/json') === 0) {
-          var example = value.examples[key];
-          if (_.isString(example)) {
-            example = jsyaml.safeLoad(example);
-          }
-          value.definition.example = example;
-          return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);
-        }
-      });
-    }
-
-    if (value.examples) {
-      value = _.cloneDeep(value);
-      var example = value.examples;
-      if (_.isString(example)) {
-        example = jsyaml.safeLoad(example);
-      }
-      value.definition.example = example;
-      return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);
-    }
-
-    return schemaToJSON(value.definition, value.models, modelsToIgnore, value.modelPropertyMacro);
-  };
-
-  // copy-pasted from swagger-js
-  var getParameterModelSignature = function (type, definitions) {
-      var isPrimitive, listType;
-
-      if (type instanceof Array) {
-        listType = true;
-        type = type[0];
-      }
-
-      // Convert undefined to string of 'undefined'
-      if (typeof type === 'undefined') {
-        type = 'undefined';
-        isPrimitive = true;
-
-      } else if (definitions[type]){
-        // a model def exists?
-        type = definitions[type]; /* Model */
-        isPrimitive = false;
-
-      } else if (getInlineModel(type)) {
-        type = getInlineModel(type); /* Model */
-        isPrimitive = false;
-
-      } else {
-        // We default to primitive
-        isPrimitive = true;
-      }
-
-      if (isPrimitive) {
-        if (listType) {
-          return 'Array[' + type + ']';
-        } else {
-          return type.toString();
-        }
-      } else {
-        if (listType) {
-          return 'Array[' + getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro) + ']';
-        } else {
-          return getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro);
-        }
-      }
-  };
-
-  // copy-pasted from swagger-js
-  var createParameterJSONSample = function (type, models) {
-    var listType, sampleJson, innerType;
-    models = models || {};
-
-    listType = (type instanceof Array);
-    innerType = listType ? type[0] : type;
-
-    if(models[innerType]) {
-      sampleJson = createJSONSample(models[innerType]);
-    } else if (getInlineModel(innerType)){
-      sampleJson = createJSONSample(getInlineModel(innerType)); // may return null, if type isn't correct
-    }
-
-
-    if (sampleJson) {
-      sampleJson = listType ? [sampleJson] : sampleJson;
-
-      if (typeof sampleJson === 'string') {
-        return sampleJson;
-      } else if (_.isObject(sampleJson)) {
-        var t = sampleJson;
-
-        if (sampleJson instanceof Array && sampleJson.length > 0) {
-          t = sampleJson[0];
-        }
-
-        if (t.nodeName && typeof t === 'Node') {
-          var xmlString = new XMLSerializer().serializeToString(t);
-
-          return formatXml(xmlString);
-        } else {
-          return JSON.stringify(sampleJson, null, 2);
-        }
-      } else {
-        return sampleJson;
-      }
-    }
-  };
-
-  var wrapTag = function (name, value, attrs) {
-    var str, attributes;
-
-    attrs = attrs || [];
-
-    attributes = attrs.map(function (attr) {
-      return ' ' + attr.name + '="' + attr.value + '"';
-    }).join('');
-
-    if (!name) {
-      return getErrorMessage('Node name is not provided');
-    }
-
-    str = [
-      '<', name,
-      attributes,
-      '>',
-      value,
-      '</', name, '>'
-    ];
-
-    return str.join('');
-  };
-
-  // Commenting this funtion as the names are now determined beforehand and the prefix part is exposed as a separate function | https://github.com/swagger-api/swagger-ui/issues/2577
- /** var getName = function (name, xml) {
-    var result = name || '';
-
-    xml = xml || {};
-
-    if (xml.name) {
-      result = xml.name;
-    }
-
-    if (xml.prefix) {
-      result = xml.prefix + ':' + result;
-    }
-
-    return result;
-  };
-  */
-  
-  var getPrefix = function (name, xml) {
-    var result = name || '';
-
-    xml = xml || {};
-
-    if (xml.prefix) {
-      result = xml.prefix + ':' + result;
-    }
-
-    return result;
-  };
-
-  var getNamespace = function (xml) {
-    var namespace = '';
-    var name = 'xmlns';
-
-    xml = xml || {};
-
-    if (xml.namespace) {
-      namespace = xml.namespace;
-    } else {
-      return namespace;
-    }
-
-    if (xml.prefix) {
-      name += ':' + xml.prefix;
-    }
-
-    return {
-      name: name,
-      value: namespace
-    };
-  };
-
-  var createArrayXML = function (descriptor) {
-    var name = descriptor.name;
-    var config = descriptor.config;
-    var definition = descriptor.definition;
-    var models = descriptor.models;
-    var value;
-    var items = definition.items;
-    var xml = definition.xml || {};
-    var namespace = getNamespace(xml);
-    var attributes = [];
-
-    if (!items) { return getErrorMessage(); }
-    var key = name;
-    // If there is a name specified for the array elements, use that for the array elements name | https://github.com/swagger-api/swagger-ui/issues/2577
-    if(items.xml && items.xml.name) {
-        key = items.xml.name;
-    }
-    value = createSchemaXML(key, items, models, config);
-    if (namespace) {
-      attributes.push(namespace);
-    }
-
-    if (xml.wrapped) {
-      value = wrapTag(name, value, attributes);
-    }
-
-    return value;
-  };
-
-  var getPrimitiveSignature = function (schema) {
-    var type, items;
-
-    schema = schema || {};
-    items = schema.items || {};
-    type = schema.type || '';
-
-    switch (type) {
-      case 'object': return 'Object is not a primitive';
-      case 'array' : return 'Array[' + (items.format || items.type) + ']';
-      default: return schema.format || type;
-    }
-  };
-
-  var createPrimitiveXML = function (descriptor) {
-    var name = descriptor.name;
-    var definition = descriptor.definition;
-    var primitivesMap = {
-      'string': {
-        'date': new Date(1).toISOString().split('T')[0],
-        'date-time' : new Date(1).toISOString(),
-        'default': 'string'
-      },
-      'integer': {
-        'default': 1
-      },
-      'number': {
-        'default': 1.1
-      },
-      'boolean': {
-        'default': true
-      }
-    };
-    var type = definition.type;
-    var format = definition.format;
-    var xml = definition.xml || {};
-    var namespace = getNamespace(xml);
-    var attributes = [];
-    var value;
-
-    if (_.keys(primitivesMap).indexOf(type) < 0) { return getErrorMessage(); }
-
-    if (_.isArray(definition.enum)){
-      value = definition.enum[0];
-    } else {
-      value = definition.example || primitivesMap[type][format] || primitivesMap[type].default;
-    }
-
-    if (xml.attribute) {
-      return {name: name, value: value};
-    }
-
-    if (namespace) {
-      attributes.push(namespace);
-    }
-
-    return wrapTag(name, value, attributes);
-  };
-
-  function createObjectXML (descriptor) {
-    var name = descriptor.name;
-    var definition = descriptor.definition;
-    var config = descriptor.config;
-    var models = descriptor.models;
-    var isParam = descriptor.config.isParam;
-    var serializedProperties;
-    var attrs = [];
-    var properties = definition.properties;
-    var additionalProperties = definition.additionalProperties;
-    var xml = definition.xml;
-    var namespace = getNamespace(xml);
-
-    if (namespace) {
-      attrs.push(namespace);
-    }   
-
-    if (!properties && !additionalProperties) { return getErrorMessage(); }
-
-    properties = properties || {};
-
-    serializedProperties = _.map(properties, function (prop, key) {
-      var xml, result;
-
-      if (isParam && prop.readOnly) {
-        return '';
-      }
-
-      xml = prop.xml || {};
-      result = createSchemaXML(key, prop, models, config);
-
-      if (xml.attribute) {
-        attrs.push(result);
-        return '';
-      }
-
-      return result;
-    }).join('');
-
-    if (additionalProperties) {
-      serializedProperties += '<!-- additional elements allowed -->';
-    }
-
-    return wrapTag(name, serializedProperties, attrs);
-  }
-
-  function getInfiniteLoopMessage (name, loopTo) {
-    return wrapTag(name, '<!-- Infinite loop $ref:' + loopTo + ' -->');
-  }
-
-  function getErrorMessage (details) {
-    details = details ? ': ' + details : '';
-    return '<!-- invalid XML' + details + ' -->';
-  }
-
-  function createSchemaXML (name, definition, models, config) {
-    var $ref = _.isObject(definition) ? definition.$ref : null;
-    var output, index;
-    config = config || {};
-    config.modelsToIgnore = config.modelsToIgnore || [];
-   
-    var descriptor = _.isString($ref) ? getDescriptorByRef($ref, name, models, config)
-        : getDescriptor(name, definition, models, config);
-    
-    if (!descriptor) {
-      return getErrorMessage();
-    }
-
-    switch (descriptor.type) {
-      case 'array':
-        output = createArrayXML(descriptor); break;
-      case 'object':
-        output = createObjectXML(descriptor); break;
-      case 'loop':
-        output = getInfiniteLoopMessage(descriptor.name, descriptor.config.loopTo); break;
-      default:
-        output = createPrimitiveXML(descriptor);
-    }
-
-    if ($ref && descriptor.type !== 'loop') {
-      index = config.modelsToIgnore.indexOf($ref);
-      if (index > -1) {
-        config.modelsToIgnore.splice(index, 1);
-      }
-    }
-
-    return output;
-  }
-
-  function Descriptor (name, type, definition, models, config) {
-    if (arguments.length < 4) {
-      throw new Error();
-    }
-    this.config = config || {};
-    this.config.modelsToIgnore = this.config.modelsToIgnore || [];
-    // name is already set by getDescriptorByRef or getDescriptor function depending on the type. Only prefix, if present is needed to be set here | https://github.com/swagger-api/swagger-ui/issues/2577
-    this.name = getPrefix(name, definition.xml);
-    this.definition = definition;
-    this.models = models;
-    this.type = type;
-  }
-
-  function getDescriptorByRef($ref, name, models, config) {
-    var modelType = simpleRef($ref);
-    var model = models[modelType] || {};
-    var type = model.definition && model.definition.type ? model.definition.type : 'object';
-    // If model definition xml name is present, then that will be preferred over model name. This is the case of preferring XmlElement name over XmlRootElement name if XmlElement name is provided | https://github.com/swagger-api/swagger-ui/issues/2577
-    if(model.definition && model.definition.xml && model.definition.xml.name) {
-        name = name || model.definition.xml.name || model.name;
-    }
-    // else only model name will be considered for determination | https://github.com/swagger-api/swagger-ui/issues/2577
-    else {
-        name = name || model.name;
-    }
-    
-    if (config.modelsToIgnore.indexOf($ref) > -1) {
-      type = 'loop';
-      config.loopTo = modelType;
-    } else {
-      config.modelsToIgnore.push($ref);
-    }
-
-    if (!model.definition) {
-      return null;
-    }
-    return new Descriptor(name, type, model.definition, models, config);    
-  }
-
-  function getDescriptor (name, definition, models, config){
-    var type = definition.type || 'object';
-    // If definition xml name is present, then that will be preferred over name | https://github.com/swagger-api/swagger-ui/issues/2577
-    if(definition.xml && definition.xml.name) {
-        name = definition.xml.name || name;
-    }
-    if (!definition) {
-      return null;
-    }
-
-    return new Descriptor(name, type, definition, models, config);
-  }
-
-  function createXMLSample (name, definition, models, isParam) {
-    var prolog = '<?xml version="1.0"?>';
-
-    return formatXml(prolog + createSchemaXML(name, definition, models, { isParam: isParam } ));
-  }
-
-  return {
-      getModelSignature: getModelSignature,
-      createJSONSample: createJSONSample,
-      getParameterModelSignature: getParameterModelSignature,
-      createParameterJSONSample: createParameterJSONSample,
-      createSchemaXML: createSchemaXML,
-      createXMLSample: createXMLSample,
-      getPrimitiveSignature: getPrimitiveSignature
-  };
-
-})();
-
-'use strict';
-
-SwaggerUi.Views.PopupView = Backbone.View.extend({
-    events: {
-        'click .api-popup-cancel': 'cancelClick'
-    },
-
-    template: Handlebars.templates.popup,
-    className: 'api-popup-dialog',
-
-    selectors: {
-        content: '.api-popup-content',
-        main   : '#swagger-ui-container'
-    },
-
-    initialize: function(){
-        this.$el.html(this.template(this.model));
-    },
-
-    render: function () {
-        this.$(this.selectors.content).append(this.model.content);
-        $(this.selectors.main).first().append(this.el);
-        this.showPopup();
-
-        return this;
-    },
-
-    showPopup: function () {
-        this.$el.show();
-    },
-
-    cancelClick: function () {
-        this.remove();
-    }
-
-});
-
-'use strict';
-
-SwaggerUi.Views.ResourceView = Backbone.View.extend({
-  initialize: function(opts) {
-    opts = opts || {};
-    this.router = opts.router;
-    this.auths = opts.auths;
-    if ('' === this.model.description) {
-      this.model.description = null;
-    }
-    if (this.model.description) {
-      this.model.summary = this.model.description;
-    }
-    this.number = 0;
-  },
-
-  render: function(){
-    var methods = {};
-
-
-    $(this.el).html(Handlebars.templates.resource(this.model));
-
-    // Render each operation
-    for (var i = 0; i < this.model.operationsArray.length; i++) {
-      var operation = this.model.operationsArray[i];
-      var counter = 0;
-      var id = operation.nickname;
-
-      while (typeof methods[id] !== 'undefined') {
-        id = id + '_' + counter;
-        counter += 1;
-      }
-
-      methods[id] = operation;
-
-      operation.nickname = id;
-      operation.parentId = this.model.id;
-      operation.definitions = this.model.definitions; // make Json Schema available for JSonEditor in this operation
-      this.addOperation(operation);
-    }
-
-    $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
-    $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
-    $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
-
-    return this;
-  },
-
-  addOperation: function(operation) {
-
-    operation.number = this.number;
-
-    // Render an operation and add it to operations li
-    var operationView = new SwaggerUi.Views.OperationView({
-      model: operation,
-      router: this.router,
-      tagName: 'li',
-      className: 'endpoint',
-      swaggerOptions: this.options.swaggerOptions,
-      auths: this.auths
-    });
-
-    $('.endpoints', $(this.el)).append(operationView.render().el);
-
-    this.number++;
-
-  },
-  // Generic Event handler (`Docs` is global)
-
-
-  callDocs: function(fnName, e) {
-    e.preventDefault();
-    Docs[fnName](e.currentTarget.getAttribute('data-id'));
-  }
-});
-
-'use strict';
-
-SwaggerUi.Views.ResponseContentTypeView = Backbone.View.extend({
-  initialize: function(){},
-
-  render: function(){
-    this.model.responseContentTypeId = 'rct' + Math.random();
-    $(this.el).html(Handlebars.templates.response_content_type(this.model));
-    return this;
-  }
-});
-'use strict';
-
-SwaggerUi.Views.SignatureView = Backbone.View.extend({
-  events: {
-    'click a.description-link'       : 'switchToDescription',
-    'click a.snippet-link'           : 'switchToSnippet',
-    'mousedown .snippet_json'          : 'jsonSnippetMouseDown',
-    'mousedown .snippet_xml'          : 'xmlSnippetMouseDown'
-  },
-
-  initialize: function () {
-  },
-
-  render: function(){
-
-    $(this.el).html(Handlebars.templates.signature(this.model));
-
-    if (this.model.defaultRendering === 'model') {
-      this.switchToDescription();
-    } else {
-      this.switchToSnippet();
-    }
-
-    return this;
-  },
-
-  // handler for show signature
-  switchToDescription: function(e){
-    if (e) { e.preventDefault(); }
-
-    $('.snippet', $(this.el)).hide();
-    $('.description', $(this.el)).show();
-    $('.description-link', $(this.el)).addClass('selected');
-    $('.snippet-link', $(this.el)).removeClass('selected');
-  },
-
-  // handler for show sample
-  switchToSnippet: function(e){
-    if (e) { e.preventDefault(); }
-
-    $('.snippet', $(this.el)).show();
-    $('.description', $(this.el)).hide();
-    $('.snippet-link', $(this.el)).addClass('selected');
-    $('.description-link', $(this.el)).removeClass('selected');
-  },
-
-  // handler for snippet to text area
-  snippetToTextArea: function(val) {
-    var textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));
-
-    // Fix for bug in IE 10/11 which causes placeholder text to be copied to "value"
-    if ($.trim(textArea.val()) === '' || textArea.prop('placeholder') === textArea.val()) {
-      textArea.val(val);
-      // TODO move this code outside of the view and expose an event instead
-      if( this.model.jsonEditor && this.model.jsonEditor.isEnabled()){
-        this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON));
-      }
-    }
-  },
-
-  jsonSnippetMouseDown: function (e) {
-    if (this.model.isParam) {
-      if (e) { e.preventDefault(); }
-
-      this.snippetToTextArea(this.model.sampleJSON);
-    }
-  },
-
-  xmlSnippetMouseDown: function (e) {
-    if (this.model.isParam) {
-      if (e) { e.preventDefault(); }
-
-      this.snippetToTextArea(this.model.sampleXML);
-    }
-  }
-});
-'use strict';
-
-SwaggerUi.Views.StatusCodeView = Backbone.View.extend({
-  initialize: function (opts) {
-    this.options = opts || {};
-    this.router = this.options.router;
-  },
-
-  render: function(){
-    var responseModel, responseModelView;
-    var value = this.router.api.models[this.model.responseModel];
-    $(this.el).html(Handlebars.templates.status_code(this.model));
-
-    if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {
-      responseModel = {
-        sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),
-        sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample('', this.model.schema, this.router.api.models) : false,
-        isParam: false,
-        signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),
-        defaultRendering: this.model.defaultRendering
-      };
-    } else {
-      responseModel = {
-        signature: SwaggerUi.partials.signature.getPrimitiveSignature(this.model.schema)
-      };
-    }
-
-    responseModelView = new SwaggerUi.Views.SignatureView({model: responseModel, tagName: 'div'});
-    $('.model-signature', this.$el).append(responseModelView.render().el);
-    return this;
-  }
-});}).call(this);
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["templates.js","doc.js","es5-shim.js","helpers/handlebars.js","sanitize-html.min.js","node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","lib/auth.js","lib/client.js","lib/helpers.js","lib/http.js","lib/resolver.js","lib/schema-markup.js","lib/spec-converter.js","lib/types/model.js","lib/types/operation.js","lib/types/operationGroup.js","node_modules/browserify/node_modules/process/browser.js","node_modules/btoa/index.js","node_modules/buffer/index.js","node_modules/buffer/node_modules/base64-js/lib/b64.js","node_modules/buffer/node_modules/ieee754/index.js","node_modules/buffer/node_modules/is-array/index.js","node_modules/cookiejar/cookiejar.js","node_modules/js-yaml/index.js","node_modules/js-yaml/lib/js-yaml.js","node_modules/js-yaml/lib/js-yaml/common.js","node_modules/js-yaml/lib/js-yaml/dumper.js","node_modules/js-yaml/lib/js-yaml/exception.js","node_modules/js-yaml/lib/js-yaml/loader.js","node_modules/js-yaml/lib/js-yaml/mark.js","node_modules/js-yaml/lib/js-yaml/schema.js","node_modules/js-yaml/lib/js-yaml/schema/core.js","node_modules/js-yaml/lib/js-yaml/schema/default_full.js","node_modules/js-yaml/lib/js-yaml/schema/default_safe.js","node_modules/js-yaml/lib/js-yaml/schema/failsafe.js","node_modules/js-yaml/lib/js-yaml/schema/json.js","node_modules/js-yaml/lib/js-yaml/type.js","node_modules/js-yaml/lib/js-yaml/type/binary.js","node_modules/js-yaml/lib/js-yaml/type/bool.js","node_modules/js-yaml/lib/js-yaml/type/float.js","node_modules/js-yaml/lib/js-yaml/type/int.js","node_modules/js-yaml/lib/js-yaml/type/js/function.js","node_modules/js-yaml/lib/js-yaml/type/js/regexp.js","node_modules/js-yaml/lib/js-yaml/type/js/undefined.js","node_modules/js-yaml/lib/js-yaml/type/map.js","node_modules/js-yaml/lib/js-yaml/type/merge.js","node_modules/js-yaml/lib/js-yaml/type/null.js","node_modules/js-yaml/lib/js-yaml/type/omap.js","node_modules/js-yaml/lib/js-yaml/type/pairs.js","node_modules/js-yaml/lib/js-yaml/type/seq.js","node_modules/js-yaml/lib/js-yaml/type/set.js","node_modules/js-yaml/lib/js-yaml/type/str.js","node_modules/js-yaml/lib/js-yaml/type/timestamp.js","node_modules/lodash-compat/array/indexOf.js","node_modules/lodash-compat/array/last.js","node_modules/lodash-compat/chain/lodash.js","node_modules/lodash-compat/collection/each.js","node_modules/lodash-compat/collection/find.js","node_modules/lodash-compat/collection/forEach.js","node_modules/lodash-compat/collection/includes.js","node_modules/lodash-compat/collection/map.js","node_modules/lodash-compat/date/now.js","node_modules/lodash-compat/function/bind.js","node_modules/lodash-compat/function/restParam.js","node_modules/lodash-compat/internal/LazyWrapper.js","node_modules/lodash-compat/internal/LodashWrapper.js","node_modules/lodash-compat/internal/arrayCopy.js","node_modules/lodash-compat/internal/arrayEach.js","node_modules/lodash-compat/internal/arrayMap.js","node_modules/lodash-compat/internal/arraySome.js","node_modules/lodash-compat/internal/baseAssign.js","node_modules/lodash-compat/internal/baseCallback.js","node_modules/lodash-compat/internal/baseClone.js","node_modules/lodash-compat/internal/baseCopy.js","node_modules/lodash-compat/internal/baseCreate.js","node_modules/lodash-compat/internal/baseEach.js","node_modules/lodash-compat/internal/baseFind.js","node_modules/lodash-compat/internal/baseFindIndex.js","node_modules/lodash-compat/internal/baseFor.js","node_modules/lodash-compat/internal/baseForIn.js","node_modules/lodash-compat/internal/baseForOwn.js","node_modules/lodash-compat/internal/baseGet.js","node_modules/lodash-compat/internal/baseIndexOf.js","node_modules/lodash-compat/internal/baseIsEqual.js","node_modules/lodash-compat/internal/baseIsEqualDeep.js","node_modules/lodash-compat/internal/baseIsMatch.js","node_modules/lodash-compat/internal/baseLodash.js","node_modules/lodash-compat/internal/baseMap.js","node_modules/lodash-compat/internal/baseMatches.js","node_modules/lodash-compat/internal/baseMatchesProperty.js","node_modules/lodash-compat/internal/baseProperty.js","node_modules/lodash-compat/internal/basePropertyDeep.js","node_modules/lodash-compat/internal/baseSetData.js","node_modules/lodash-compat/internal/baseSlice.js","node_modules/lodash-compat/internal/baseToString.js","node_modules/lodash-compat/internal/baseValues.js","node_modules/lodash-compat/internal/binaryIndex.js","node_modules/lodash-compat/internal/binaryIndexBy.js","node_modules/lodash-compat/internal/bindCallback.js","node_modules/lodash-compat/internal/bufferClone.js","node_modules/lodash-compat/internal/composeArgs.js","node_modules/lodash-compat/internal/composeArgsRight.js","node_modules/lodash-compat/internal/createBaseEach.js","node_modules/lodash-compat/internal/createBaseFor.js","node_modules/lodash-compat/internal/createBindWrapper.js","node_modules/lodash-compat/internal/createCtorWrapper.js","node_modules/lodash-compat/internal/createFind.js","node_modules/lodash-compat/internal/createForEach.js","node_modules/lodash-compat/internal/createHybridWrapper.js","node_modules/lodash-compat/internal/createPartialWrapper.js","node_modules/lodash-compat/internal/createWrapper.js","node_modules/lodash-compat/internal/equalArrays.js","node_modules/lodash-compat/internal/equalByTag.js","node_modules/lodash-compat/internal/equalObjects.js","node_modules/lodash-compat/internal/getData.js","node_modules/lodash-compat/internal/getFuncName.js","node_modules/lodash-compat/internal/getLength.js","node_modules/lodash-compat/internal/getMatchData.js","node_modules/lodash-compat/internal/getNative.js","node_modules/lodash-compat/internal/indexOfNaN.js","node_modules/lodash-compat/internal/initCloneArray.js","node_modules/lodash-compat/internal/initCloneByTag.js","node_modules/lodash-compat/internal/initCloneObject.js","node_modules/lodash-compat/internal/isArrayLike.js","node_modules/lodash-compat/internal/isHostObject.js","node_modules/lodash-compat/internal/isIndex.js","node_modules/lodash-compat/internal/isIterateeCall.js","node_modules/lodash-compat/internal/isKey.js","node_modules/lodash-compat/internal/isLaziable.js","node_modules/lodash-compat/internal/isLength.js","node_modules/lodash-compat/internal/isObjectLike.js","node_modules/lodash-compat/internal/isStrictComparable.js","node_modules/lodash-compat/internal/mergeData.js","node_modules/lodash-compat/internal/metaMap.js","node_modules/lodash-compat/internal/realNames.js","node_modules/lodash-compat/internal/reorder.js","node_modules/lodash-compat/internal/replaceHolders.js","node_modules/lodash-compat/internal/setData.js","node_modules/lodash-compat/internal/shimKeys.js","node_modules/lodash-compat/internal/toObject.js","node_modules/lodash-compat/internal/toPath.js","node_modules/lodash-compat/internal/wrapperClone.js","node_modules/lodash-compat/lang/cloneDeep.js","node_modules/lodash-compat/lang/isArguments.js","node_modules/lodash-compat/lang/isArray.js","node_modules/lodash-compat/lang/isEmpty.js","node_modules/lodash-compat/lang/isFunction.js","node_modules/lodash-compat/lang/isNative.js","node_modules/lodash-compat/lang/isObject.js","node_modules/lodash-compat/lang/isPlainObject.js","node_modules/lodash-compat/lang/isString.js","node_modules/lodash-compat/lang/isTypedArray.js","node_modules/lodash-compat/lang/isUndefined.js","node_modules/lodash-compat/object/keys.js","node_modules/lodash-compat/object/keysIn.js","node_modules/lodash-compat/object/pairs.js","node_modules/lodash-compat/object/values.js","node_modules/lodash-compat/support.js","node_modules/lodash-compat/utility/identity.js","node_modules/lodash-compat/utility/noop.js","node_modules/lodash-compat/utility/property.js","node_modules/q/q.js","node_modules/superagent/lib/client.js","node_modules/superagent/lib/is-object.js","node_modules/superagent/lib/request-base.js","node_modules/superagent/lib/request.js","node_modules/superagent/node_modules/component-emitter/index.js","SwaggerUi.js","utils/utils.js","view/ApiKeyAuthModel.js","view/ApiKeyAuthView.js","view/AuthButtonView.js","view/AuthsCollection.js","view/AuthsCollectionView.js","view/AuthView.js","view/BasicAuthModel.js","view/BasicAuthView.js","view/ContentTypeView.js","view/HeaderView.js","view/MainView.js","view/Oauth2Model.js","view/Oauth2View.js","view/OperationView.js","view/ParameterContentTypeView.js","view/ParameterView.js","view/partials/signature.js","view/PopupView.js","view/ResourceView.js","view/ResponseContentTypeView.js","view/SignatureView.js","view/StatusCodeView.js"],"names":[],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1xBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACxMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACjhEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnGA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;ACNA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxXA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC94BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7gBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3oBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACltCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5HA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClyBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACljDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7HA;AACA;;ACDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;;ACJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACngEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACh9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3VA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACnKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC/EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC9FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC5NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AChJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACn3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACXA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7LA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC79BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC3EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC3EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"swagger-ui.js","sourcesContent":["/* jshint ignore:start */ \n {(function() {\n  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};\ntemplates['apikey_auth'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"                <span class=\\\"key_auth__value\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.value : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"                <input placeholder=\\\"api_key\\\" class=\\\"auth_input input_apiKey_entry\\\" name=\\\"apiKey\\\" type=\\\"text\\\"/>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class=\\\"key_input_container\\\">\\n    <h3 class=\\\"auth__title\\\">Api key authorization</h3>\\n    <div class=\\\"auth__description\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n    <div>\\n        <div class=\\\"key_auth__field\\\">\\n            <span class=\\\"key_auth__label\\\">name:</span>\\n            <span class=\\\"key_auth__value\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n        </div>\\n        <div class=\\\"key_auth__field\\\">\\n            <span class=\\\"key_auth__label\\\">in:</span>\\n            <span class=\\\"key_auth__value\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0[\"in\"] : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n        </div>\\n        <div class=\\\"key_auth__field\\\">\\n            <span class=\\\"key_auth__label\\\">value:</span>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"        </div>\\n    </div>\\n</div>\\n\";\n},\"useData\":true});\ntemplates['auth_button'] = template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    return \"<a class='authorize__btn' href=\\\"#\\\">Authorize</a>\\n\";\n},\"useData\":true});\ntemplates['auth_button_operation'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \"        authorize__btn_operation_login\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"        authorize__btn_operation_logout\\n\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"        <ul class=\\\"authorize-scopes\\\">\\n\"\n    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.scopes : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(6, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"        </ul>\\n\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"                <li class=\\\"authorize__scope\\\" title=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</li>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class=\\\"authorize__btn authorize__btn_operation\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.scopes : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n\";\n},\"useData\":true});\ntemplates['auth_view'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \"            <button type=\\\"button\\\" class=\\\"auth__button auth_submit__button\\\" data-sw-translate>Authorize</button>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"            <button type=\\\"button\\\" class=\\\"auth__button auth_logout__button\\\" data-sw-translate>Logout</button>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class=\\\"auth_container\\\">\\n\\n    <div class=\\\"auth_inner\\\"></div>\\n    <div class=\\\"auth_submit\\\">\\n\"\n    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isAuthorized : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </div>\\n\\n</div>\\n\";\n},\"useData\":true});\ntemplates['basic_auth'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \" - authorized\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"                <span class=\\\"basic_auth__value\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.username : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    return \"                <input required placeholder=\\\"username\\\" class=\\\"basic_auth__username auth_input\\\" name=\\\"username\\\" type=\\\"text\\\"/>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    return \"            <div class=\\\"auth_label\\\">\\n                <span class=\\\"basic_auth__label\\\" data-sw-translate>password:</span>\\n                <input required placeholder=\\\"password\\\" class=\\\"basic_auth__password auth_input\\\" name=\\\"password\\\" type=\\\"password\\\"/></label>\\n            </div>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class='basic_auth_container'>\\n    <h3 class=\\\"auth__title\\\">Basic authentication\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</h3>\\n    <form class=\\\"basic_input_container\\\">\\n        <div class=\\\"auth__description\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n        <div class=\\\"auth_label\\\">\\n            <span class=\\\"basic_auth__label\\\" data-sw-translate>username:</span>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.program(5, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"        </div>\\n\"\n    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </form>\\n</div>\\n\";\n},\"useData\":true});\ntemplates['content_type'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t<option value=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</option>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    return \"  <option value=\\\"application/json\\\">application/json</option>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<label data-sw-translate for=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">Response Content Type</label>\\n<select name=\\\"contentType\\\" id=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.produces : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</select>\\n\";\n},\"useData\":true});\ntemplates['main'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <div class=\\\"info_title\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n  <div class=\\\"info_description markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.description : stack1),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.externalDocs : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(4, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(6, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(8, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(12, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <p>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.description : stack1),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n  <a href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" target=\\\"_blank\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<div class=\\\"info_tos\\\"><a target=\\\"_blank\\\" href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>Terms of service</a></div>\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<div><div class='info_name' style=\\\"display: inline\\\" data-sw-translate>Created by </div> \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\";\n},\"8\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class='info_url' data-sw-translate>See more at <a href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a></div>\";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class='info_email'><a target=\\\"_parent\\\" href=\\\"mailto:\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"?subject=\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>Contact the developer</a></div>\";\n},\"12\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class='info_license'><a target=\\\"_blank\\\" href='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.name : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a></div>\";\n},\"14\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"  , <span style=\\\"font-variant: small-caps\\\" data-sw-translate>api version</span>: \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    \";\n},\"16\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"    <span style=\\\"float:right\\\"><a target=\\\"_blank\\\" href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"/debug?url=\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\"><img id=\\\"validator\\\" src=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"?url=\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\"></a>\\n    </span>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class='info' id='api_info'>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.info : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n<div class='container' id='resources_container'>\\n  <div class='authorize-wrapper'></div>\\n\\n  <ul id='resources'></ul>\\n\\n  <div class=\\\"footer\\\">\\n    <h4 style=\\\"color: #999\\\">[ <span style=\\\"font-variant: small-caps\\\">base url</span>: \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.basePath : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(14, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"]\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(16, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </h4>\\n    </div>\\n</div>\\n\";\n},\"useData\":true});\ntemplates['oauth2'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<p>Authorization URL: \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.authorizationUrl : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<p>Token URL: \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tokenUrl : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    return \"        <p>Please input username and password for password flow authorization</p>\\n        <fieldset>\\n            <div><label>Username: <input class=\\\"oauth-username\\\" type=\\\"text\\\" name=\\\"username\\\"></label></div>\\n            <div><label>Password: <input class=\\\"oauth-password\\\" type=\\\"password\\\" name=\\\"password\\\"></label></div>\\n        </fieldset>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"        <p>Setup client authentication.\"\n    + ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.requireClientAuthenticaiton : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(8, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n        <fieldset>\\n            <div><label>Type:\\n                <select class=\\\"oauth-client-authentication-type\\\" name=\\\"client-authentication-type\\\">\\n                    <option value=\\\"none\\\" selected>None or other</option>\\n                    <option value=\\\"basic\\\">Basic auth</option>\\n                    <option value=\\\"request-body\\\">Request body</option>\\n                </select>\\n            </label></div>\\n            <div class=\\\"oauth-client-authentication\\\" hidden>\\n                <div><label>ClientId: <input class=\\\"oauth-client-id\\\" type=\\\"text\\\" name=\\\"client-id\\\"></label></div>\\n                <div><label>Secret: <input class=\\\"oauth-client-secret\\\" type=\\\"text\\\" name=\\\"client-secret\\\"></label></div>\\n            </div>\\n        </fieldset>\\n\";\n},\"8\":function(container,depth0,helpers,partials,data) {\n    return \"(Required)\";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"            <li>\\n                <input class=\\\"oauth-scope\\\" type=\\\"checkbox\\\" data-scope=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" oauthtype=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\"/>\\n                <label>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label><br/>\\n                <span class=\\\"api-scope-desc\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(11, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"                </span>\\n            </li>\\n\";\n},\"11\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"                        (\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.OAuthSchemeKey : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \")\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div>\\n    <h3 class=\\\"auth__title\\\">OAuth2.0</h3>\\n    <p>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n    \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.authorizationUrl : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.tokenUrl : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    <p>flow: \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.flow : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isPasswordFlow : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.clientAuthentication : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    <p><strong> \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.appName : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \" </strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>\\n    <p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.\\n        <a href=\\\"#\\\">Learn how to use</a>\\n    </p>\\n    <ul class=\\\"api-popup-scopes\\\">\\n\"\n    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.scopes : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </ul>\\n</div>\";\n},\"useData\":true});\ntemplates['operation'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \"deprecated\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"            <h4><span data-sw-translate>Warning: Deprecated</span></h4>\\n\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"        <h4><span data-sw-translate>Implementation Notes</span></h4>\\n        <div class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    return \"            <div class='authorize-wrapper authorize-wrapper_operation'></div>\\n\";\n},\"9\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"          <div class=\\\"response-class\\\">\\n            <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.successCode : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \")</h4>\\n              \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.successDescription : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n            <p><span class=\\\"model-signature\\\" /></p>\\n            <br/>\\n            <div class=\\\"response-content-type\\\" />\\n            </div>\\n\";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<div class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.successDescription : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\";\n},\"12\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"          <h4 data-sw-translate>Headers</h4>\\n          <table class=\\\"headers\\\">\\n            <thead>\\n              <tr>\\n                <th style=\\\"width: 100px; max-width: 100px\\\" data-sw-translate>Header</th>\\n                <th style=\\\"width: 310px; max-width: 310px\\\" data-sw-translate>Description</th>\\n                <th style=\\\"width: 200px; max-width: 200px\\\" data-sw-translate>Type</th>\\n                <th style=\\\"width: 320px; max-width: 320px\\\" data-sw-translate>Other</th>\\n              </tr>\\n            </thead>\\n            <tbody>\\n\"\n    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.headers : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(13, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"            </tbody>\\n          </table>\\n\";\n},\"13\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"              <tr>\\n                <td>\"\n    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"key\",\"hash\":{},\"data\":data}) : helper)))\n    + \"</td>\\n                <td>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n                <td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n                <td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.other : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n              </tr>\\n\";\n},\"15\":function(container,depth0,helpers,partials,data) {\n    return \"          <h4 data-sw-translate>Parameters</h4>\\n          <table class='fullwidth parameters'>\\n          <thead>\\n            <tr>\\n            <th style=\\\"width: 100px; max-width: 100px\\\" data-sw-translate>Parameter</th>\\n            <th style=\\\"width: 310px; max-width: 310px\\\" data-sw-translate>Value</th>\\n            <th style=\\\"width: 200px; max-width: 200px\\\" data-sw-translate>Description</th>\\n            <th style=\\\"width: 100px; max-width: 100px\\\" data-sw-translate>Parameter Type</th>\\n            <th style=\\\"width: 220px; max-width: 230px\\\" data-sw-translate>Data Type</th>\\n            </tr>\\n          </thead>\\n          <tbody class=\\\"operation-params\\\">\\n\\n          </tbody>\\n          </table>\\n\";\n},\"17\":function(container,depth0,helpers,partials,data) {\n    return \"          <div style='margin:0;padding:0;display:inline'></div>\\n          <h4 data-sw-translate>Response Messages</h4>\\n          <table class='fullwidth response-messages'>\\n            <thead>\\n            <tr>\\n              <th data-sw-translate>HTTP Status Code</th>\\n              <th data-sw-translate>Reason</th>\\n              <th data-sw-translate>Response Model</th>\\n              <th data-sw-translate>Headers</th>\\n            </tr>\\n            </thead>\\n            <tbody class=\\\"operation-status\\\">\\n            </tbody>\\n          </table>\\n\";\n},\"19\":function(container,depth0,helpers,partials,data) {\n    return \"\";\n},\"21\":function(container,depth0,helpers,partials,data) {\n    return \"          <div class='sandbox_header'>\\n            <input class='submit' type='submit' value='Try it out!' data-sw-translate/>\\n            <a href='#' class='response_hider' style='display:none' data-sw-translate>Hide Response</a>\\n            <span class='response_throbber' style='display:none'></span>\\n          </div>\\n\";\n},\"23\":function(container,depth0,helpers,partials,data) {\n    return \"          <h4 data-sw-translate>Request Headers</h4>\\n          <div class='block request_headers'></div>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3=container.escapeExpression;\n\n  return \"  <ul class='operations' >\\n    <li class='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \" operation' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.parentId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"_\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\\n      <div class='heading'>\\n        <h3>\\n          <span class='http_method'>\\n          <a href='#!/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"' class=\\\"toggleOperation\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a>\\n          </span>\\n          <span class='path'>\\n          <a href='#!/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"' class=\\\"toggleOperation \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.path : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a>\\n          </span>\\n        </h3>\\n        <ul class='options'>\\n          <li>\\n          <a href='#!/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"' class=\\\"toggleOperation\\\"><span class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span></a>\\n          </li>\\n        </ul>\\n      </div>\\n      <div class='content' id='\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"_\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"_content' style='display:none'>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.security : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.type : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(9, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.headers : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(12, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n        <form accept-charset='UTF-8' class='sandbox'>\\n          <div style='margin:0;padding:0;display:inline'></div>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.parameters : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(15, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.responseMessages : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(17, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isReadOnly : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(19, data, 0),\"inverse\":container.program(21, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"        </form>\\n        <div class='response' style='display:none'>\\n          <h4 class='curl'>Curl</h4>\\n          <div class='block curl'></div>\\n          <h4 data-sw-translate>Request URL</h4>\\n          <div class='block request_url'></div>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.showRequestHeaders : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(23, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"          <h4 data-sw-translate>Response Body</h4>\\n          <div class='block response_body'></div>\\n          <h4 data-sw-translate>Response Code</h4>\\n          <div class='block response_code'></div>\\n          <h4 data-sw-translate>Response Headers</h4>\\n          <div class='block response_headers'></div>\\n        </div>\\n      </div>\\n    </li>\\n  </ul>\\n\";\n},\"useData\":true});\ntemplates['param'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t<input type=\\\"file\\\" name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'/>\\n\t\t\t<div class=\\\"parameter-content-type\\\" />\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.program(7, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<textarea class='body-textarea' name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n        <br />\\n        <div class=\\\"parameter-content-type\\\" />\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<textarea class='body-textarea' name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'></textarea>\\n\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<br />\\n\t\t\t\t<div class=\\\"parameter-content-type\\\" />\\n\";\n},\"9\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.program(10, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{\"name\":\"renderTextParam\",\"hash\":{},\"fn\":container.program(11, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"11\":function(container,depth0,helpers,partials,data) {\n    return \"\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(9, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\\n\t<span class=\\\"model-signature\\\"></span>\\n</td>\\n\";\n},\"useData\":true});\ntemplates['param_list'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \" required\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \" multiple=\\\"multiple\\\"\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    return \" required \";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"      <option \"\n    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.hasDefault : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(8, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \" value=''></option>\\n\";\n},\"8\":function(container,depth0,helpers,partials,data) {\n    return \"  selected=\\\"\\\" \";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\\n      <option \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(11, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  value='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'> \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \" \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(13, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \" </option>\\n\\n\";\n},\"11\":function(container,depth0,helpers,partials,data) {\n    return \" selected=\\\"\\\"  \";\n},\"13\":function(container,depth0,helpers,partials,data) {\n    return \" (default) \";\n},\"15\":function(container,depth0,helpers,partials,data) {\n    return \"<strong>\";\n},\"17\":function(container,depth0,helpers,partials,data) {\n    return \"</strong>\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n  <select \"\n    + ((stack1 = (helpers.isArray || (depth0 && depth0.isArray) || alias2).call(alias1,depth0,{\"name\":\"isArray\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \" class=\\\"parameter \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" name=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" id=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\\n\"\n    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers.each.call(alias1,((stack1 = (depth0 != null ? depth0.allowableValues : depth0)) != null ? stack1.descriptiveValues : stack1),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  </select>\\n</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(15, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"description\",\"hash\":{},\"data\":data}) : helper))) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(17, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['param_readonly'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"        <textarea class='body-textarea' readonly='readonly' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n        <div class=\\\"parameter-content-type\\\" />\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(4, data, 0),\"inverse\":container.program(6, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"            \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    return \"            (empty)\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['param_readonly_required'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(4, data, 0),\"inverse\":container.program(6, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"            \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    return \"            (empty)\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code required'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['param_required'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t<input type=\\\"file\\\" name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'/>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.program(7, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<textarea class='body-textarea required' placeholder='(required)' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n        <br />\\n        <div class=\\\"parameter-content-type\\\" />\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<textarea class='body-textarea required' placeholder='(required)' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'></textarea>\\n\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<br />\\n\t\t\t\t<div class=\\\"parameter-content-type\\\" />\\n\";\n},\"9\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.program(12, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t<input class='parameter required' type='file' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'/>\\n\";\n},\"12\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{\"name\":\"renderTextParam\",\"hash\":{},\"fn\":container.program(13, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"13\":function(container,depth0,helpers,partials,data) {\n    return \"\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code required'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(9, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\\n\t<strong><span class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span></strong>\\n</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['parameter_content_type'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.consumes : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <option value=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</option>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    return \"  <option value=\\\"application/json\\\">application/json</option>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<label for=\\\"\"\n    + container.escapeExpression(((helper = (helper = helpers.parameterContentTypeId || (depth0 != null ? depth0.parameterContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"parameterContentTypeId\",\"hash\":{},\"data\":data}) : helper)))\n    + \"\\\" data-sw-translate>Parameter content type:</label>\\n<select name=\\\"parameterContentType\\\" id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.parameterContentTypeId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.consumes : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</select>\\n\";\n},\"useData\":true});\ntemplates['popup'] = template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var helper;\n\n  return \"<div class=\\\"api-popup-dialog-wrapper\\\">\\n    <div class=\\\"api-popup-title\\\">\"\n    + container.escapeExpression(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === \"function\" ? helper.call(depth0 != null ? depth0 : {},{\"name\":\"title\",\"hash\":{},\"data\":data}) : helper)))\n    + \"</div>\\n    <div class=\\\"api-popup-content\\\"></div>\\n    <p class=\\\"error-msg\\\"></p>\\n    <div class=\\\"api-popup-actions\\\">\\n        <button class=\\\"api-popup-cancel api-button gray\\\" type=\\\"button\\\">Cancel</button>\\n    </div>\\n</div>\\n<div class=\\\"api-popup-dialog-shadow\\\"></div>\";\n},\"useData\":true});\ntemplates['resource'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \" : \";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"    <li>\\n      <a href='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.url : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' data-sw-translate>Raw</a>\\n    </li>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, buffer = \n  \"<div class='heading'>\\n  <h2>\\n    <a href='#!/\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' class=\\\"toggleEndpointList\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a> \";\n  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : alias2),(options={\"name\":\"summary\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data}),(typeof helper === \"function\" ? helper.call(alias1,options) : helper));\n  if (!helpers.summary) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}\n  if (stack1 != null) { buffer += stack1; }\n  return buffer + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  </h2>\\n  <ul class='options'>\\n    <li>\\n      <a href='#!/\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='endpointListTogger_\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' class=\\\"toggleEndpointList\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>Show/Hide</a>\\n    </li>\\n    <li>\\n      <a href='#' class=\\\"collapseResource\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>\\n        List Operations\\n      </a>\\n    </li>\\n    <li>\\n      <a href='#' class=\\\"expandResource\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>\\n        Expand Operations\\n      </a>\\n    </li>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.url : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  </ul>\\n</div>\\n<ul class='endpoints' id='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"_endpoint_list' style='display:none'>\\n\\n</ul>\\n\";\n},\"useData\":true});\ntemplates['response_content_type'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <option value=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</option>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    return \"  <option value=\\\"application/json\\\">application/json</option>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3=\"function\", alias4=container.escapeExpression;\n\n  return \"<label data-sw-translate for=\\\"\"\n    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{\"name\":\"responseContentTypeId\",\"hash\":{},\"data\":data}) : helper)))\n    + \"\\\">Response Content Type</label>\\n<select name=\\\"responseContentType\\\" id=\\\"\"\n    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{\"name\":\"responseContentTypeId\",\"hash\":{},\"data\":data}) : helper)))\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.produces : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</select>\\n\";\n},\"useData\":true});\ntemplates['signature'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"\\n<div>\\n<ul class=\\\"signature-nav\\\">\\n  <li><a class=\\\"description-link\\\" href=\\\"#\\\" data-sw-translate>Model</a></li>\\n  <li><a class=\\\"snippet-link\\\" href=\\\"#\\\" data-sw-translate>Example Value</a></li>\\n</ul>\\n<div>\\n\\n<div class=\\\"signature-container\\\">\\n  <div class=\\\"description\\\">\\n      \"\n    + container.escapeExpression((helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.signature : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"\\n  </div>\\n\\n  <div class=\\\"snippet\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  </div>\\n</div>\\n\";\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"      <div class=\\\"snippet_json\\\">\\n        <pre><code>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</code></pre>\\n        \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n      </div>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"<small class=\\\"notice\\\" data-sw-translate></small>\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"    <div class=\\\"snippet_xml\\\">\\n      <pre><code>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</code></pre>\\n      \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    </div>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"    \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.signature : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = (helpers.ifCond || (depth0 && depth0.ifCond) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.sampleJSON : depth0),\"||\",(depth0 != null ? depth0.sampleXML : depth0),{\"name\":\"ifCond\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(7, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"useData\":true});\ntemplates['status_code'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"      <tr>\\n        <td>\"\n    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"key\",\"hash\":{},\"data\":data}) : helper)))\n    + \"</td>\\n        <td>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n        <td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n      </tr>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td width='15%' class='code'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.code : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.message : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td width='50%'><span class=\\\"model-signature\\\" /></td>\\n<td class=\\\"headers\\\">\\n  <table>\\n    <tbody>\\n\"\n    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.headers : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </tbody>\\n  </table>\\n</td>\";\n},\"useData\":true});\n})();} \n /* jshint ignore:end */","'use strict';\n\n\n$(function() {\n\n\t// Helper function for vertically aligning DOM elements\n\t// http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/\n\t$.fn.vAlign = function() {\n\t\treturn this.each(function(){\n\t\t\tvar ah = $(this).height();\n\t\t\tvar ph = $(this).parent().height();\n\t\t\tvar mh = (ph - ah) / 2;\n\t\t\t$(this).css('margin-top', mh);\n\t\t});\n\t};\n\n\t$.fn.stretchFormtasticInputWidthToParent = function() {\n\t\treturn this.each(function(){\n\t\t\tvar p_width = $(this).closest(\"form\").innerWidth();\n\t\t\tvar p_padding = parseInt($(this).closest(\"form\").css('padding-left') ,10) + parseInt($(this).closest('form').css('padding-right'), 10);\n\t\t\tvar this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);\n\t\t\t$(this).css('width', p_width - p_padding - this_padding);\n\t\t});\n\t};\n\n\t$('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();\n\n\t// Vertically center these paragraphs\n\t// Parent may need a min-height for this to work..\n\t$('ul.downplayed li div.content p').vAlign();\n\n\t// When a sandbox form is submitted..\n\t$(\"form.sandbox\").submit(function(){\n\n\t\tvar error_free = true;\n\n\t\t// Cycle through the forms required inputs\n \t\t$(this).find(\"input.required\").each(function() {\n\n\t\t\t// Remove any existing error styles from the input\n\t\t\t$(this).removeClass('error');\n\n\t\t\t// Tack the error style on if the input is empty..\n\t\t\tif ($(this).val() === '') {\n\t\t\t\t$(this).addClass('error');\n\t\t\t\t$(this).wiggle();\n\t\t\t\terror_free = false;\n\t\t\t}\n\n\t\t});\n\n\t\treturn error_free;\n\t});\n\n});\n\nfunction clippyCopiedCallback() {\n  $('#api_key_copied').fadeIn().delay(1000).fadeOut();\n\n  // var b = $(\"#clippy_tooltip_\" + a);\n  // b.length != 0 && (b.attr(\"title\", \"copied!\").trigger(\"tipsy.reload\"), setTimeout(function() {\n  //   b.attr(\"title\", \"copy to clipboard\")\n  // },\n  // 500))\n}\n\n// Logging function that accounts for browsers that don't have window.console\nfunction log(){\n  log.history = log.history || [];\n  log.history.push(arguments);\n  if(this.console){\n    console.log( Array.prototype.slice.call(arguments)[0] );\n  }\n}\n\n// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)\nif (Function.prototype.bind && console && typeof console.log === \"object\") {\n    [\n      \"log\",\"info\",\"warn\",\"error\",\"assert\",\"dir\",\"clear\",\"profile\",\"profileEnd\"\n    ].forEach(function (method) {\n        console[method] = this.bind(console[method], console);\n    }, Function.prototype.call);\n}\n\nwindow.Docs = {\n\n\tshebang: function() {\n\n\t\t// If shebang has an operation nickname in it..\n\t\t// e.g. /docs/#!/words/get_search\n\t\tvar fragments = $.param.fragment().split('/');\n\t\tfragments.shift(); // get rid of the bang\n\n\t\tswitch (fragments.length) {\n\t\t\tcase 1:\n        if (fragments[0].length > 0) { // prevent matching \"#/\"\n          // Expand all operations for the resource and scroll to it\n          var dom_id = 'resource_' + fragments[0];\n\n          Docs.expandEndpointListForResource(fragments[0]);\n          $(\"#\"+dom_id).slideto({highlight: false});\n        }\n\t\t\t\tbreak;\n\t\t\tcase 2:\n\t\t\t\t// Refer to the endpoint DOM element, e.g. #words_get_search\n\n        // Expand Resource\n        Docs.expandEndpointListForResource(fragments[0]);\n        $(\"#\"+dom_id).slideto({highlight: false});\n\n            // Expand operation\n            var li_dom_id = fragments.join('_');\n            var li_content_dom_id = li_dom_id + \"_content\";\n\n\n            Docs.expandOperation($('#'+li_content_dom_id));\n            $('#'+li_dom_id).slideto({highlight: false});\n            break;\n\t\t}\n\t},\n\n\ttoggleEndpointListForResource: function(resource) {\n\t\tvar elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');\n\t\tif (elem.is(':visible')) {\n\t\t\t$.bbq.pushState('#/', 2);\n\t\t\tDocs.collapseEndpointListForResource(resource);\n\t\t} else {\n            $.bbq.pushState('#/' + resource, 2);\n\t\t\tDocs.expandEndpointListForResource(resource);\n\t\t}\n\t},\n\n\t// Expand resource\n\texpandEndpointListForResource: function(resource) {\n\t\tvar resource = Docs.escapeResourceName(resource);\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints').slideDown();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + resource).addClass('active');\n\n\t\tvar elem = $('li#resource_' + resource + ' ul.endpoints');\n\t\telem.slideDown();\n\t},\n\n\t// Collapse resource and mark as explicitly closed\n\tcollapseEndpointListForResource: function(resource) {\n\t\tvar resource = Docs.escapeResourceName(resource);\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints').slideUp();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + resource).removeClass('active');\n\n\t\tvar elem = $('li#resource_' + resource + ' ul.endpoints');\n\t\telem.slideUp();\n\t},\n\n\texpandOperationsForResource: function(resource) {\n\t\t// Make sure the resource container is open..\n\t\tDocs.expandEndpointListForResource(resource);\n\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints li.operation div.content').slideDown();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {\n\t\t\tDocs.expandOperation($(this));\n\t\t});\n\t},\n\n\tcollapseOperationsForResource: function(resource) {\n\t\t// Make sure the resource container is open..\n\t\tDocs.expandEndpointListForResource(resource);\n\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints li.operation div.content').slideUp();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {\n\t\t\tDocs.collapseOperation($(this));\n\t\t});\n\t},\n\n\tescapeResourceName: function(resource) {\n\t\treturn resource.replace(/[!\"#$%&'()*+,.\\/:;<=>?@\\[\\\\\\]\\^`{|}~]/g, \"\\\\$&\");\n\t},\n\n\texpandOperation: function(elem) {\n\t\telem.slideDown();\n\t},\n\n\tcollapseOperation: function(elem) {\n\t\telem.slideUp();\n\t}\n};\n","/*!\n * https://github.com/es-shims/es5-shim\n * @license es5-shim Copyright 2009-2015 by contributors, MIT License\n * see https://github.com/es-shims/es5-shim/blob/master/LICENSE\n */\n\n// vim: ts=4 sts=4 sw=4 expandtab\n\n// Add semicolon to prevent IIFE from being passed as argument to concatenated code.\n;\n\n// UMD (Universal Module Definition)\n// see https://github.com/umdjs/umd/blob/master/templates/returnExports.js\n(function (root, factory) {\n    'use strict';\n\n    /* global define, exports, module */\n    if (typeof define === 'function' && define.amd) {\n        // AMD. Register as an anonymous module.\n        define(factory);\n    } else if (typeof exports === 'object') {\n        // Node. Does not work with strict CommonJS, but\n        // only CommonJS-like enviroments that support module.exports,\n        // like Node.\n        module.exports = factory();\n    } else {\n        // Browser globals (root is window)\n        root.returnExports = factory();\n    }\n}(this, function () {\n    /**\n     * Brings an environment as close to ECMAScript 5 compliance\n     * as is possible with the facilities of erstwhile engines.\n     *\n     * Annotated ES5: http://es5.github.com/ (specific links below)\n     * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf\n     * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/\n     */\n\n    // Shortcut to an often accessed properties, in order to avoid multiple\n    // dereference that costs universally. This also holds a reference to known-good\n    // functions.\n    var $Array = Array;\n    var ArrayPrototype = $Array.prototype;\n    var $Object = Object;\n    var ObjectPrototype = $Object.prototype;\n    var $Function = Function;\n    var FunctionPrototype = $Function.prototype;\n    var $String = String;\n    var StringPrototype = $String.prototype;\n    var $Number = Number;\n    var NumberPrototype = $Number.prototype;\n    var array_slice = ArrayPrototype.slice;\n    var array_splice = ArrayPrototype.splice;\n    var array_push = ArrayPrototype.push;\n    var array_unshift = ArrayPrototype.unshift;\n    var array_concat = ArrayPrototype.concat;\n    var array_join = ArrayPrototype.join;\n    var call = FunctionPrototype.call;\n    var apply = FunctionPrototype.apply;\n    var max = Math.max;\n    var min = Math.min;\n\n    // Having a toString local variable name breaks in Opera so use to_string.\n    var to_string = ObjectPrototype.toString;\n\n    /* global Symbol */\n    /* eslint-disable one-var-declaration-per-line, no-redeclare, max-statements-per-line */\n    var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';\n    var isCallable; /* inlined from https://npmjs.com/is-callable */ var fnToStr = Function.prototype.toString, constructorRegex = /^\\s*class /, isES6ClassFn = function isES6ClassFn(value) { try { var fnStr = fnToStr.call(value); var singleStripped = fnStr.replace(/\\/\\/.*\\n/g, ''); var multiStripped = singleStripped.replace(/\\/\\*[.\\s\\S]*\\*\\//g, ''); var spaceStripped = multiStripped.replace(/\\n/mg, ' ').replace(/ {2}/g, ' '); return constructorRegex.test(spaceStripped); } catch (e) { return false; /* not a function */ } }, tryFunctionObject = function tryFunctionObject(value) { try { if (isES6ClassFn(value)) { return false; } fnToStr.call(value); return true; } catch (e) { return false; } }, fnClass = '[object Function]', genClass = '[object GeneratorFunction]', isCallable = function isCallable(value) { if (!value) { return false; } if (typeof value !== 'function' && typeof value !== 'object') { return false; } if (hasToStringTag) { return tryFunctionObject(value); } if (isES6ClassFn(value)) { return false; } var strClass = to_string.call(value); return strClass === fnClass || strClass === genClass; };\n\n    var isRegex; /* inlined from https://npmjs.com/is-regex */ var regexExec = RegExp.prototype.exec, tryRegexExec = function tryRegexExec(value) { try { regexExec.call(value); return true; } catch (e) { return false; } }, regexClass = '[object RegExp]'; isRegex = function isRegex(value) { if (typeof value !== 'object') { return false; } return hasToStringTag ? tryRegexExec(value) : to_string.call(value) === regexClass; };\n    var isString; /* inlined from https://npmjs.com/is-string */ var strValue = String.prototype.valueOf, tryStringObject = function tryStringObject(value) { try { strValue.call(value); return true; } catch (e) { return false; } }, stringClass = '[object String]'; isString = function isString(value) { if (typeof value === 'string') { return true; } if (typeof value !== 'object') { return false; } return hasToStringTag ? tryStringObject(value) : to_string.call(value) === stringClass; };\n    /* eslint-enable one-var-declaration-per-line, no-redeclare, max-statements-per-line */\n\n    /* inlined from http://npmjs.com/define-properties */\n    var supportsDescriptors = $Object.defineProperty && (function () {\n        try {\n            var obj = {};\n            $Object.defineProperty(obj, 'x', { enumerable: false, value: obj });\n            for (var _ in obj) { // jscs:ignore disallowUnusedVariables\n                return false;\n            }\n            return obj.x === obj;\n        } catch (e) { /* this is ES3 */\n            return false;\n        }\n    }());\n    var defineProperties = (function (has) {\n        // Define configurable, writable, and non-enumerable props\n        // if they don't exist.\n        var defineProperty;\n        if (supportsDescriptors) {\n            defineProperty = function (object, name, method, forceAssign) {\n                if (!forceAssign && (name in object)) {\n                    return;\n                }\n                $Object.defineProperty(object, name, {\n                    configurable: true,\n                    enumerable: false,\n                    writable: true,\n                    value: method\n                });\n            };\n        } else {\n            defineProperty = function (object, name, method, forceAssign) {\n                if (!forceAssign && (name in object)) {\n                    return;\n                }\n                object[name] = method;\n            };\n        }\n        return function defineProperties(object, map, forceAssign) {\n            for (var name in map) {\n                if (has.call(map, name)) {\n                    defineProperty(object, name, map[name], forceAssign);\n                }\n            }\n        };\n    }(ObjectPrototype.hasOwnProperty));\n\n    //\n    // Util\n    // ======\n    //\n\n    /* replaceable with https://npmjs.com/package/es-abstract /helpers/isPrimitive */\n    var isPrimitive = function isPrimitive(input) {\n        var type = typeof input;\n        return input === null || (type !== 'object' && type !== 'function');\n    };\n\n    var isActualNaN = $Number.isNaN || function isActualNaN(x) {\n        return x !== x;\n    };\n\n    var ES = {\n        // ES5 9.4\n        // http://es5.github.com/#x9.4\n        // http://jsperf.com/to-integer\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToInteger */\n        ToInteger: function ToInteger(num) {\n            var n = +num;\n            if (isActualNaN(n)) {\n                n = 0;\n            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {\n                n = (n > 0 || -1) * Math.floor(Math.abs(n));\n            }\n            return n;\n        },\n\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToPrimitive */\n        ToPrimitive: function ToPrimitive(input) {\n            var val, valueOf, toStr;\n            if (isPrimitive(input)) {\n                return input;\n            }\n            valueOf = input.valueOf;\n            if (isCallable(valueOf)) {\n                val = valueOf.call(input);\n                if (isPrimitive(val)) {\n                    return val;\n                }\n            }\n            toStr = input.toString;\n            if (isCallable(toStr)) {\n                val = toStr.call(input);\n                if (isPrimitive(val)) {\n                    return val;\n                }\n            }\n            throw new TypeError();\n        },\n\n        // ES5 9.9\n        // http://es5.github.com/#x9.9\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToObject */\n        ToObject: function (o) {\n            if (o == null) { // this matches both null and undefined\n                throw new TypeError(\"can't convert \" + o + ' to object');\n            }\n            return $Object(o);\n        },\n\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToUint32 */\n        ToUint32: function ToUint32(x) {\n            return x >>> 0;\n        }\n    };\n\n    //\n    // Function\n    // ========\n    //\n\n    // ES-5 15.3.4.5\n    // http://es5.github.com/#x15.3.4.5\n\n    var Empty = function Empty() {};\n\n    defineProperties(FunctionPrototype, {\n        bind: function bind(that) { // .length is 1\n            // 1. Let Target be the this value.\n            var target = this;\n            // 2. If IsCallable(Target) is false, throw a TypeError exception.\n            if (!isCallable(target)) {\n                throw new TypeError('Function.prototype.bind called on incompatible ' + target);\n            }\n            // 3. Let A be a new (possibly empty) internal list of all of the\n            //   argument values provided after thisArg (arg1, arg2 etc), in order.\n            // XXX slicedArgs will stand in for \"A\" if used\n            var args = array_slice.call(arguments, 1); // for normal call\n            // 4. Let F be a new native ECMAScript object.\n            // 11. Set the [[Prototype]] internal property of F to the standard\n            //   built-in Function prototype object as specified in 15.3.3.1.\n            // 12. Set the [[Call]] internal property of F as described in\n            //   15.3.4.5.1.\n            // 13. Set the [[Construct]] internal property of F as described in\n            //   15.3.4.5.2.\n            // 14. Set the [[HasInstance]] internal property of F as described in\n            //   15.3.4.5.3.\n            var bound;\n            var binder = function () {\n\n                if (this instanceof bound) {\n                    // 15.3.4.5.2 [[Construct]]\n                    // When the [[Construct]] internal method of a function object,\n                    // F that was created using the bind function is called with a\n                    // list of arguments ExtraArgs, the following steps are taken:\n                    // 1. Let target be the value of F's [[TargetFunction]]\n                    //   internal property.\n                    // 2. If target has no [[Construct]] internal method, a\n                    //   TypeError exception is thrown.\n                    // 3. Let boundArgs be the value of F's [[BoundArgs]] internal\n                    //   property.\n                    // 4. Let args be a new list containing the same values as the\n                    //   list boundArgs in the same order followed by the same\n                    //   values as the list ExtraArgs in the same order.\n                    // 5. Return the result of calling the [[Construct]] internal\n                    //   method of target providing args as the arguments.\n\n                    var result = apply.call(\n                        target,\n                        this,\n                        array_concat.call(args, array_slice.call(arguments))\n                    );\n                    if ($Object(result) === result) {\n                        return result;\n                    }\n                    return this;\n\n                } else {\n                    // 15.3.4.5.1 [[Call]]\n                    // When the [[Call]] internal method of a function object, F,\n                    // which was created using the bind function is called with a\n                    // this value and a list of arguments ExtraArgs, the following\n                    // steps are taken:\n                    // 1. Let boundArgs be the value of F's [[BoundArgs]] internal\n                    //   property.\n                    // 2. Let boundThis be the value of F's [[BoundThis]] internal\n                    //   property.\n                    // 3. Let target be the value of F's [[TargetFunction]] internal\n                    //   property.\n                    // 4. Let args be a new list containing the same values as the\n                    //   list boundArgs in the same order followed by the same\n                    //   values as the list ExtraArgs in the same order.\n                    // 5. Return the result of calling the [[Call]] internal method\n                    //   of target providing boundThis as the this value and\n                    //   providing args as the arguments.\n\n                    // equiv: target.call(this, ...boundArgs, ...args)\n                    return apply.call(\n                        target,\n                        that,\n                        array_concat.call(args, array_slice.call(arguments))\n                    );\n\n                }\n\n            };\n\n            // 15. If the [[Class]] internal property of Target is \"Function\", then\n            //     a. Let L be the length property of Target minus the length of A.\n            //     b. Set the length own property of F to either 0 or L, whichever is\n            //       larger.\n            // 16. Else set the length own property of F to 0.\n\n            var boundLength = max(0, target.length - args.length);\n\n            // 17. Set the attributes of the length own property of F to the values\n            //   specified in 15.3.5.1.\n            var boundArgs = [];\n            for (var i = 0; i < boundLength; i++) {\n                array_push.call(boundArgs, '$' + i);\n            }\n\n            // XXX Build a dynamic function with desired amount of arguments is the only\n            // way to set the length property of a function.\n            // In environments where Content Security Policies enabled (Chrome extensions,\n            // for ex.) all use of eval or Function costructor throws an exception.\n            // However in all of these environments Function.prototype.bind exists\n            // and so this code will never be executed.\n            bound = $Function('binder', 'return function (' + array_join.call(boundArgs, ',') + '){ return binder.apply(this, arguments); }')(binder);\n\n            if (target.prototype) {\n                Empty.prototype = target.prototype;\n                bound.prototype = new Empty();\n                // Clean up dangling references.\n                Empty.prototype = null;\n            }\n\n            // TODO\n            // 18. Set the [[Extensible]] internal property of F to true.\n\n            // TODO\n            // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).\n            // 20. Call the [[DefineOwnProperty]] internal method of F with\n            //   arguments \"caller\", PropertyDescriptor {[[Get]]: thrower, [[Set]]:\n            //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and\n            //   false.\n            // 21. Call the [[DefineOwnProperty]] internal method of F with\n            //   arguments \"arguments\", PropertyDescriptor {[[Get]]: thrower,\n            //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},\n            //   and false.\n\n            // TODO\n            // NOTE Function objects created using Function.prototype.bind do not\n            // have a prototype property or the [[Code]], [[FormalParameters]], and\n            // [[Scope]] internal properties.\n            // XXX can't delete prototype in pure-js.\n\n            // 22. Return F.\n            return bound;\n        }\n    });\n\n    // _Please note: Shortcuts are defined after `Function.prototype.bind` as we\n    // use it in defining shortcuts.\n    var owns = call.bind(ObjectPrototype.hasOwnProperty);\n    var toStr = call.bind(ObjectPrototype.toString);\n    var arraySlice = call.bind(array_slice);\n    var arraySliceApply = apply.bind(array_slice);\n    var strSlice = call.bind(StringPrototype.slice);\n    var strSplit = call.bind(StringPrototype.split);\n    var strIndexOf = call.bind(StringPrototype.indexOf);\n    var pushCall = call.bind(array_push);\n    var isEnum = call.bind(ObjectPrototype.propertyIsEnumerable);\n    var arraySort = call.bind(ArrayPrototype.sort);\n\n    //\n    // Array\n    // =====\n    //\n\n    var isArray = $Array.isArray || function isArray(obj) {\n        return toStr(obj) === '[object Array]';\n    };\n\n    // ES5 15.4.4.12\n    // http://es5.github.com/#x15.4.4.13\n    // Return len+argCount.\n    // [bugfix, ielt8]\n    // IE < 8 bug: [].unshift(0) === undefined but should be \"1\"\n    var hasUnshiftReturnValueBug = [].unshift(0) !== 1;\n    defineProperties(ArrayPrototype, {\n        unshift: function () {\n            array_unshift.apply(this, arguments);\n            return this.length;\n        }\n    }, hasUnshiftReturnValueBug);\n\n    // ES5 15.4.3.2\n    // http://es5.github.com/#x15.4.3.2\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray\n    defineProperties($Array, { isArray: isArray });\n\n    // The IsCallable() check in the Array functions\n    // has been replaced with a strict check on the\n    // internal class of the object to trap cases where\n    // the provided function was actually a regular\n    // expression literal, which in V8 and\n    // JavaScriptCore is a typeof \"function\".  Only in\n    // V8 are regular expression literals permitted as\n    // reduce parameters, so it is desirable in the\n    // general case for the shim to match the more\n    // strict and common behavior of rejecting regular\n    // expressions.\n\n    // ES5 15.4.4.18\n    // http://es5.github.com/#x15.4.4.18\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach\n\n    // Check failure of by-index access of string characters (IE < 9)\n    // and failure of `0 in boxedString` (Rhino)\n    var boxedString = $Object('a');\n    var splitString = boxedString[0] !== 'a' || !(0 in boxedString);\n\n    var properlyBoxesContext = function properlyBoxed(method) {\n        // Check node 0.6.21 bug where third parameter is not boxed\n        var properlyBoxesNonStrict = true;\n        var properlyBoxesStrict = true;\n        var threwException = false;\n        if (method) {\n            try {\n                method.call('foo', function (_, __, context) {\n                    if (typeof context !== 'object') {\n                        properlyBoxesNonStrict = false;\n                    }\n                });\n\n                method.call([1], function () {\n                    'use strict';\n\n                    properlyBoxesStrict = typeof this === 'string';\n                }, 'x');\n            } catch (e) {\n                threwException = true;\n            }\n        }\n        return !!method && !threwException && properlyBoxesNonStrict && properlyBoxesStrict;\n    };\n\n    defineProperties(ArrayPrototype, {\n        forEach: function forEach(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var i = -1;\n            var length = ES.ToUint32(self.length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.forEach callback must be a function');\n            }\n\n            while (++i < length) {\n                if (i in self) {\n                    // Invoke the callback function with call, passing arguments:\n                    // context, property value, property key, thisArg object\n                    if (typeof T === 'undefined') {\n                        callbackfn(self[i], i, object);\n                    } else {\n                        callbackfn.call(T, self[i], i, object);\n                    }\n                }\n            }\n        }\n    }, !properlyBoxesContext(ArrayPrototype.forEach));\n\n    // ES5 15.4.4.19\n    // http://es5.github.com/#x15.4.4.19\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map\n    defineProperties(ArrayPrototype, {\n        map: function map(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var result = $Array(length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.map callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self) {\n                    if (typeof T === 'undefined') {\n                        result[i] = callbackfn(self[i], i, object);\n                    } else {\n                        result[i] = callbackfn.call(T, self[i], i, object);\n                    }\n                }\n            }\n            return result;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.map));\n\n    // ES5 15.4.4.20\n    // http://es5.github.com/#x15.4.4.20\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter\n    defineProperties(ArrayPrototype, {\n        filter: function filter(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var result = [];\n            var value;\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.filter callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self) {\n                    value = self[i];\n                    if (typeof T === 'undefined' ? callbackfn(value, i, object) : callbackfn.call(T, value, i, object)) {\n                        pushCall(result, value);\n                    }\n                }\n            }\n            return result;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.filter));\n\n    // ES5 15.4.4.16\n    // http://es5.github.com/#x15.4.4.16\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every\n    defineProperties(ArrayPrototype, {\n        every: function every(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.every callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self && !(typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {\n                    return false;\n                }\n            }\n            return true;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.every));\n\n    // ES5 15.4.4.17\n    // http://es5.github.com/#x15.4.4.17\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some\n    defineProperties(ArrayPrototype, {\n        some: function some(callbackfn/*, thisArg */) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.some callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self && (typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {\n                    return true;\n                }\n            }\n            return false;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.some));\n\n    // ES5 15.4.4.21\n    // http://es5.github.com/#x15.4.4.21\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce\n    var reduceCoercesToObject = false;\n    if (ArrayPrototype.reduce) {\n        reduceCoercesToObject = typeof ArrayPrototype.reduce.call('es5', function (_, __, ___, list) {\n            return list;\n        }) === 'object';\n    }\n    defineProperties(ArrayPrototype, {\n        reduce: function reduce(callbackfn/*, initialValue*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.reduce callback must be a function');\n            }\n\n            // no value to return if no initial value and an empty array\n            if (length === 0 && arguments.length === 1) {\n                throw new TypeError('reduce of empty array with no initial value');\n            }\n\n            var i = 0;\n            var result;\n            if (arguments.length >= 2) {\n                result = arguments[1];\n            } else {\n                do {\n                    if (i in self) {\n                        result = self[i++];\n                        break;\n                    }\n\n                    // if array contains no values, no initial value to return\n                    if (++i >= length) {\n                        throw new TypeError('reduce of empty array with no initial value');\n                    }\n                } while (true);\n            }\n\n            for (; i < length; i++) {\n                if (i in self) {\n                    result = callbackfn(result, self[i], i, object);\n                }\n            }\n\n            return result;\n        }\n    }, !reduceCoercesToObject);\n\n    // ES5 15.4.4.22\n    // http://es5.github.com/#x15.4.4.22\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight\n    var reduceRightCoercesToObject = false;\n    if (ArrayPrototype.reduceRight) {\n        reduceRightCoercesToObject = typeof ArrayPrototype.reduceRight.call('es5', function (_, __, ___, list) {\n            return list;\n        }) === 'object';\n    }\n    defineProperties(ArrayPrototype, {\n        reduceRight: function reduceRight(callbackfn/*, initial*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.reduceRight callback must be a function');\n            }\n\n            // no value to return if no initial value, empty array\n            if (length === 0 && arguments.length === 1) {\n                throw new TypeError('reduceRight of empty array with no initial value');\n            }\n\n            var result;\n            var i = length - 1;\n            if (arguments.length >= 2) {\n                result = arguments[1];\n            } else {\n                do {\n                    if (i in self) {\n                        result = self[i--];\n                        break;\n                    }\n\n                    // if array contains no values, no initial value to return\n                    if (--i < 0) {\n                        throw new TypeError('reduceRight of empty array with no initial value');\n                    }\n                } while (true);\n            }\n\n            if (i < 0) {\n                return result;\n            }\n\n            do {\n                if (i in self) {\n                    result = callbackfn(result, self[i], i, object);\n                }\n            } while (i--);\n\n            return result;\n        }\n    }, !reduceRightCoercesToObject);\n\n    // ES5 15.4.4.14\n    // http://es5.github.com/#x15.4.4.14\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf\n    var hasFirefox2IndexOfBug = ArrayPrototype.indexOf && [0, 1].indexOf(1, 2) !== -1;\n    defineProperties(ArrayPrototype, {\n        indexOf: function indexOf(searchElement/*, fromIndex */) {\n            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);\n            var length = ES.ToUint32(self.length);\n\n            if (length === 0) {\n                return -1;\n            }\n\n            var i = 0;\n            if (arguments.length > 1) {\n                i = ES.ToInteger(arguments[1]);\n            }\n\n            // handle negative indices\n            i = i >= 0 ? i : max(0, length + i);\n            for (; i < length; i++) {\n                if (i in self && self[i] === searchElement) {\n                    return i;\n                }\n            }\n            return -1;\n        }\n    }, hasFirefox2IndexOfBug);\n\n    // ES5 15.4.4.15\n    // http://es5.github.com/#x15.4.4.15\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf\n    var hasFirefox2LastIndexOfBug = ArrayPrototype.lastIndexOf && [0, 1].lastIndexOf(0, -3) !== -1;\n    defineProperties(ArrayPrototype, {\n        lastIndexOf: function lastIndexOf(searchElement/*, fromIndex */) {\n            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);\n            var length = ES.ToUint32(self.length);\n\n            if (length === 0) {\n                return -1;\n            }\n            var i = length - 1;\n            if (arguments.length > 1) {\n                i = min(i, ES.ToInteger(arguments[1]));\n            }\n            // handle negative indices\n            i = i >= 0 ? i : length - Math.abs(i);\n            for (; i >= 0; i--) {\n                if (i in self && searchElement === self[i]) {\n                    return i;\n                }\n            }\n            return -1;\n        }\n    }, hasFirefox2LastIndexOfBug);\n\n    // ES5 15.4.4.12\n    // http://es5.github.com/#x15.4.4.12\n    var spliceNoopReturnsEmptyArray = (function () {\n        var a = [1, 2];\n        var result = a.splice();\n        return a.length === 2 && isArray(result) && result.length === 0;\n    }());\n    defineProperties(ArrayPrototype, {\n        // Safari 5.0 bug where .splice() returns undefined\n        splice: function splice(start, deleteCount) {\n            if (arguments.length === 0) {\n                return [];\n            } else {\n                return array_splice.apply(this, arguments);\n            }\n        }\n    }, !spliceNoopReturnsEmptyArray);\n\n    var spliceWorksWithEmptyObject = (function () {\n        var obj = {};\n        ArrayPrototype.splice.call(obj, 0, 0, 1);\n        return obj.length === 1;\n    }());\n    defineProperties(ArrayPrototype, {\n        splice: function splice(start, deleteCount) {\n            if (arguments.length === 0) {\n                return [];\n            }\n            var args = arguments;\n            this.length = max(ES.ToInteger(this.length), 0);\n            if (arguments.length > 0 && typeof deleteCount !== 'number') {\n                args = arraySlice(arguments);\n                if (args.length < 2) {\n                    pushCall(args, this.length - start);\n                } else {\n                    args[1] = ES.ToInteger(deleteCount);\n                }\n            }\n            return array_splice.apply(this, args);\n        }\n    }, !spliceWorksWithEmptyObject);\n    var spliceWorksWithLargeSparseArrays = (function () {\n        // Per https://github.com/es-shims/es5-shim/issues/295\n        // Safari 7/8 breaks with sparse arrays of size 1e5 or greater\n        var arr = new $Array(1e5);\n        // note: the index MUST be 8 or larger or the test will false pass\n        arr[8] = 'x';\n        arr.splice(1, 1);\n        // note: this test must be defined *after* the indexOf shim\n        // per https://github.com/es-shims/es5-shim/issues/313\n        return arr.indexOf('x') === 7;\n    }());\n    var spliceWorksWithSmallSparseArrays = (function () {\n        // Per https://github.com/es-shims/es5-shim/issues/295\n        // Opera 12.15 breaks on this, no idea why.\n        var n = 256;\n        var arr = [];\n        arr[n] = 'a';\n        arr.splice(n + 1, 0, 'b');\n        return arr[n] === 'a';\n    }());\n    defineProperties(ArrayPrototype, {\n        splice: function splice(start, deleteCount) {\n            var O = ES.ToObject(this);\n            var A = [];\n            var len = ES.ToUint32(O.length);\n            var relativeStart = ES.ToInteger(start);\n            var actualStart = relativeStart < 0 ? max((len + relativeStart), 0) : min(relativeStart, len);\n            var actualDeleteCount = min(max(ES.ToInteger(deleteCount), 0), len - actualStart);\n\n            var k = 0;\n            var from;\n            while (k < actualDeleteCount) {\n                from = $String(actualStart + k);\n                if (owns(O, from)) {\n                    A[k] = O[from];\n                }\n                k += 1;\n            }\n\n            var items = arraySlice(arguments, 2);\n            var itemCount = items.length;\n            var to;\n            if (itemCount < actualDeleteCount) {\n                k = actualStart;\n                var maxK = len - actualDeleteCount;\n                while (k < maxK) {\n                    from = $String(k + actualDeleteCount);\n                    to = $String(k + itemCount);\n                    if (owns(O, from)) {\n                        O[to] = O[from];\n                    } else {\n                        delete O[to];\n                    }\n                    k += 1;\n                }\n                k = len;\n                var minK = len - actualDeleteCount + itemCount;\n                while (k > minK) {\n                    delete O[k - 1];\n                    k -= 1;\n                }\n            } else if (itemCount > actualDeleteCount) {\n                k = len - actualDeleteCount;\n                while (k > actualStart) {\n                    from = $String(k + actualDeleteCount - 1);\n                    to = $String(k + itemCount - 1);\n                    if (owns(O, from)) {\n                        O[to] = O[from];\n                    } else {\n                        delete O[to];\n                    }\n                    k -= 1;\n                }\n            }\n            k = actualStart;\n            for (var i = 0; i < items.length; ++i) {\n                O[k] = items[i];\n                k += 1;\n            }\n            O.length = len - actualDeleteCount + itemCount;\n\n            return A;\n        }\n    }, !spliceWorksWithLargeSparseArrays || !spliceWorksWithSmallSparseArrays);\n\n    var originalJoin = ArrayPrototype.join;\n    var hasStringJoinBug;\n    try {\n        hasStringJoinBug = Array.prototype.join.call('123', ',') !== '1,2,3';\n    } catch (e) {\n        hasStringJoinBug = true;\n    }\n    if (hasStringJoinBug) {\n        defineProperties(ArrayPrototype, {\n            join: function join(separator) {\n                var sep = typeof separator === 'undefined' ? ',' : separator;\n                return originalJoin.call(isString(this) ? strSplit(this, '') : this, sep);\n            }\n        }, hasStringJoinBug);\n    }\n\n    var hasJoinUndefinedBug = [1, 2].join(undefined) !== '1,2';\n    if (hasJoinUndefinedBug) {\n        defineProperties(ArrayPrototype, {\n            join: function join(separator) {\n                var sep = typeof separator === 'undefined' ? ',' : separator;\n                return originalJoin.call(this, sep);\n            }\n        }, hasJoinUndefinedBug);\n    }\n\n    var pushShim = function push(item) {\n        var O = ES.ToObject(this);\n        var n = ES.ToUint32(O.length);\n        var i = 0;\n        while (i < arguments.length) {\n            O[n + i] = arguments[i];\n            i += 1;\n        }\n        O.length = n + i;\n        return n + i;\n    };\n\n    var pushIsNotGeneric = (function () {\n        var obj = {};\n        var result = Array.prototype.push.call(obj, undefined);\n        return result !== 1 || obj.length !== 1 || typeof obj[0] !== 'undefined' || !owns(obj, 0);\n    }());\n    defineProperties(ArrayPrototype, {\n        push: function push(item) {\n            if (isArray(this)) {\n                return array_push.apply(this, arguments);\n            }\n            return pushShim.apply(this, arguments);\n        }\n    }, pushIsNotGeneric);\n\n    // This fixes a very weird bug in Opera 10.6 when pushing `undefined\n    var pushUndefinedIsWeird = (function () {\n        var arr = [];\n        var result = arr.push(undefined);\n        return result !== 1 || arr.length !== 1 || typeof arr[0] !== 'undefined' || !owns(arr, 0);\n    }());\n    defineProperties(ArrayPrototype, { push: pushShim }, pushUndefinedIsWeird);\n\n    // ES5 15.2.3.14\n    // http://es5.github.io/#x15.4.4.10\n    // Fix boxed string bug\n    defineProperties(ArrayPrototype, {\n        slice: function (start, end) {\n            var arr = isString(this) ? strSplit(this, '') : this;\n            return arraySliceApply(arr, arguments);\n        }\n    }, splitString);\n\n    var sortIgnoresNonFunctions = (function () {\n        try {\n            [1, 2].sort(null);\n            [1, 2].sort({});\n            return true;\n        } catch (e) {}\n        return false;\n    }());\n    var sortThrowsOnRegex = (function () {\n        // this is a problem in Firefox 4, in which `typeof /a/ === 'function'`\n        try {\n            [1, 2].sort(/a/);\n            return false;\n        } catch (e) {}\n        return true;\n    }());\n    var sortIgnoresUndefined = (function () {\n        // applies in IE 8, for one.\n        try {\n            [1, 2].sort(undefined);\n            return true;\n        } catch (e) {}\n        return false;\n    }());\n    defineProperties(ArrayPrototype, {\n        sort: function sort(compareFn) {\n            if (typeof compareFn === 'undefined') {\n                return arraySort(this);\n            }\n            if (!isCallable(compareFn)) {\n                throw new TypeError('Array.prototype.sort callback must be a function');\n            }\n            return arraySort(this, compareFn);\n        }\n    }, sortIgnoresNonFunctions || !sortIgnoresUndefined || !sortThrowsOnRegex);\n\n    //\n    // Object\n    // ======\n    //\n\n    // ES5 15.2.3.14\n    // http://es5.github.com/#x15.2.3.14\n\n    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation\n    var hasDontEnumBug = !isEnum({ 'toString': null }, 'toString');\n    var hasProtoEnumBug = isEnum(function () {}, 'prototype');\n    var hasStringEnumBug = !owns('x', '0');\n    var equalsConstructorPrototype = function (o) {\n        var ctor = o.constructor;\n        return ctor && ctor.prototype === o;\n    };\n    var blacklistedKeys = {\n        $window: true,\n        $console: true,\n        $parent: true,\n        $self: true,\n        $frame: true,\n        $frames: true,\n        $frameElement: true,\n        $webkitIndexedDB: true,\n        $webkitStorageInfo: true,\n        $external: true\n    };\n    var hasAutomationEqualityBug = (function () {\n        /* globals window */\n        if (typeof window === 'undefined') {\n            return false;\n        }\n        for (var k in window) {\n            try {\n                if (!blacklistedKeys['$' + k] && owns(window, k) && window[k] !== null && typeof window[k] === 'object') {\n                    equalsConstructorPrototype(window[k]);\n                }\n            } catch (e) {\n                return true;\n            }\n        }\n        return false;\n    }());\n    var equalsConstructorPrototypeIfNotBuggy = function (object) {\n        if (typeof window === 'undefined' || !hasAutomationEqualityBug) {\n            return equalsConstructorPrototype(object);\n        }\n        try {\n            return equalsConstructorPrototype(object);\n        } catch (e) {\n            return false;\n        }\n    };\n    var dontEnums = [\n        'toString',\n        'toLocaleString',\n        'valueOf',\n        'hasOwnProperty',\n        'isPrototypeOf',\n        'propertyIsEnumerable',\n        'constructor'\n    ];\n    var dontEnumsLength = dontEnums.length;\n\n    // taken directly from https://github.com/ljharb/is-arguments/blob/master/index.js\n    // can be replaced with require('is-arguments') if we ever use a build process instead\n    var isStandardArguments = function isArguments(value) {\n        return toStr(value) === '[object Arguments]';\n    };\n    var isLegacyArguments = function isArguments(value) {\n        return value !== null &&\n            typeof value === 'object' &&\n            typeof value.length === 'number' &&\n            value.length >= 0 &&\n            !isArray(value) &&\n            isCallable(value.callee);\n    };\n    var isArguments = isStandardArguments(arguments) ? isStandardArguments : isLegacyArguments;\n\n    defineProperties($Object, {\n        keys: function keys(object) {\n            var isFn = isCallable(object);\n            var isArgs = isArguments(object);\n            var isObject = object !== null && typeof object === 'object';\n            var isStr = isObject && isString(object);\n\n            if (!isObject && !isFn && !isArgs) {\n                throw new TypeError('Object.keys called on a non-object');\n            }\n\n            var theKeys = [];\n            var skipProto = hasProtoEnumBug && isFn;\n            if ((isStr && hasStringEnumBug) || isArgs) {\n                for (var i = 0; i < object.length; ++i) {\n                    pushCall(theKeys, $String(i));\n                }\n            }\n\n            if (!isArgs) {\n                for (var name in object) {\n                    if (!(skipProto && name === 'prototype') && owns(object, name)) {\n                        pushCall(theKeys, $String(name));\n                    }\n                }\n            }\n\n            if (hasDontEnumBug) {\n                var skipConstructor = equalsConstructorPrototypeIfNotBuggy(object);\n                for (var j = 0; j < dontEnumsLength; j++) {\n                    var dontEnum = dontEnums[j];\n                    if (!(skipConstructor && dontEnum === 'constructor') && owns(object, dontEnum)) {\n                        pushCall(theKeys, dontEnum);\n                    }\n                }\n            }\n            return theKeys;\n        }\n    });\n\n    var keysWorksWithArguments = $Object.keys && (function () {\n        // Safari 5.0 bug\n        return $Object.keys(arguments).length === 2;\n    }(1, 2));\n    var keysHasArgumentsLengthBug = $Object.keys && (function () {\n        var argKeys = $Object.keys(arguments);\n        return arguments.length !== 1 || argKeys.length !== 1 || argKeys[0] !== 1;\n    }(1));\n    var originalKeys = $Object.keys;\n    defineProperties($Object, {\n        keys: function keys(object) {\n            if (isArguments(object)) {\n                return originalKeys(arraySlice(object));\n            } else {\n                return originalKeys(object);\n            }\n        }\n    }, !keysWorksWithArguments || keysHasArgumentsLengthBug);\n\n    //\n    // Date\n    // ====\n    //\n\n    var hasNegativeMonthYearBug = new Date(-3509827329600292).getUTCMonth() !== 0;\n    var aNegativeTestDate = new Date(-1509842289600292);\n    var aPositiveTestDate = new Date(1449662400000);\n    var hasToUTCStringFormatBug = aNegativeTestDate.toUTCString() !== 'Mon, 01 Jan -45875 11:59:59 GMT';\n    var hasToDateStringFormatBug;\n    var hasToStringFormatBug;\n    var timeZoneOffset = aNegativeTestDate.getTimezoneOffset();\n    if (timeZoneOffset < -720) {\n        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Tue Jan 02 -45875';\n        hasToStringFormatBug = !(/^Thu Dec 10 2015 \\d\\d:\\d\\d:\\d\\d GMT[-\\+]\\d\\d\\d\\d(?: |$)/).test(aPositiveTestDate.toString());\n    } else {\n        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Mon Jan 01 -45875';\n        hasToStringFormatBug = !(/^Wed Dec 09 2015 \\d\\d:\\d\\d:\\d\\d GMT[-\\+]\\d\\d\\d\\d(?: |$)/).test(aPositiveTestDate.toString());\n    }\n\n    var originalGetFullYear = call.bind(Date.prototype.getFullYear);\n    var originalGetMonth = call.bind(Date.prototype.getMonth);\n    var originalGetDate = call.bind(Date.prototype.getDate);\n    var originalGetUTCFullYear = call.bind(Date.prototype.getUTCFullYear);\n    var originalGetUTCMonth = call.bind(Date.prototype.getUTCMonth);\n    var originalGetUTCDate = call.bind(Date.prototype.getUTCDate);\n    var originalGetUTCDay = call.bind(Date.prototype.getUTCDay);\n    var originalGetUTCHours = call.bind(Date.prototype.getUTCHours);\n    var originalGetUTCMinutes = call.bind(Date.prototype.getUTCMinutes);\n    var originalGetUTCSeconds = call.bind(Date.prototype.getUTCSeconds);\n    var originalGetUTCMilliseconds = call.bind(Date.prototype.getUTCMilliseconds);\n    var dayName = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];\n    var monthName = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];\n    var daysInMonth = function daysInMonth(month, year) {\n        return originalGetDate(new Date(year, month, 0));\n    };\n\n    defineProperties(Date.prototype, {\n        getFullYear: function getFullYear() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetFullYear(this);\n            if (year < 0 && originalGetMonth(this) > 11) {\n                return year + 1;\n            }\n            return year;\n        },\n        getMonth: function getMonth() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetFullYear(this);\n            var month = originalGetMonth(this);\n            if (year < 0 && month > 11) {\n                return 0;\n            }\n            return month;\n        },\n        getDate: function getDate() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetFullYear(this);\n            var month = originalGetMonth(this);\n            var date = originalGetDate(this);\n            if (year < 0 && month > 11) {\n                if (month === 12) {\n                    return date;\n                }\n                var days = daysInMonth(0, year + 1);\n                return (days - date) + 1;\n            }\n            return date;\n        },\n        getUTCFullYear: function getUTCFullYear() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetUTCFullYear(this);\n            if (year < 0 && originalGetUTCMonth(this) > 11) {\n                return year + 1;\n            }\n            return year;\n        },\n        getUTCMonth: function getUTCMonth() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetUTCFullYear(this);\n            var month = originalGetUTCMonth(this);\n            if (year < 0 && month > 11) {\n                return 0;\n            }\n            return month;\n        },\n        getUTCDate: function getUTCDate() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetUTCFullYear(this);\n            var month = originalGetUTCMonth(this);\n            var date = originalGetUTCDate(this);\n            if (year < 0 && month > 11) {\n                if (month === 12) {\n                    return date;\n                }\n                var days = daysInMonth(0, year + 1);\n                return (days - date) + 1;\n            }\n            return date;\n        }\n    }, hasNegativeMonthYearBug);\n\n    defineProperties(Date.prototype, {\n        toUTCString: function toUTCString() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var day = originalGetUTCDay(this);\n            var date = originalGetUTCDate(this);\n            var month = originalGetUTCMonth(this);\n            var year = originalGetUTCFullYear(this);\n            var hour = originalGetUTCHours(this);\n            var minute = originalGetUTCMinutes(this);\n            var second = originalGetUTCSeconds(this);\n            return dayName[day] + ', ' +\n                (date < 10 ? '0' + date : date) + ' ' +\n                monthName[month] + ' ' +\n                year + ' ' +\n                (hour < 10 ? '0' + hour : hour) + ':' +\n                (minute < 10 ? '0' + minute : minute) + ':' +\n                (second < 10 ? '0' + second : second) + ' GMT';\n        }\n    }, hasNegativeMonthYearBug || hasToUTCStringFormatBug);\n\n    // Opera 12 has `,`\n    defineProperties(Date.prototype, {\n        toDateString: function toDateString() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var day = this.getDay();\n            var date = this.getDate();\n            var month = this.getMonth();\n            var year = this.getFullYear();\n            return dayName[day] + ' ' +\n                monthName[month] + ' ' +\n                (date < 10 ? '0' + date : date) + ' ' +\n                year;\n        }\n    }, hasNegativeMonthYearBug || hasToDateStringFormatBug);\n\n    // can't use defineProperties here because of toString enumeration issue in IE <= 8\n    if (hasNegativeMonthYearBug || hasToStringFormatBug) {\n        Date.prototype.toString = function toString() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var day = this.getDay();\n            var date = this.getDate();\n            var month = this.getMonth();\n            var year = this.getFullYear();\n            var hour = this.getHours();\n            var minute = this.getMinutes();\n            var second = this.getSeconds();\n            var timezoneOffset = this.getTimezoneOffset();\n            var hoursOffset = Math.floor(Math.abs(timezoneOffset) / 60);\n            var minutesOffset = Math.floor(Math.abs(timezoneOffset) % 60);\n            return dayName[day] + ' ' +\n                monthName[month] + ' ' +\n                (date < 10 ? '0' + date : date) + ' ' +\n                year + ' ' +\n                (hour < 10 ? '0' + hour : hour) + ':' +\n                (minute < 10 ? '0' + minute : minute) + ':' +\n                (second < 10 ? '0' + second : second) + ' GMT' +\n                (timezoneOffset > 0 ? '-' : '+') +\n                (hoursOffset < 10 ? '0' + hoursOffset : hoursOffset) +\n                (minutesOffset < 10 ? '0' + minutesOffset : minutesOffset);\n        };\n        if (supportsDescriptors) {\n            $Object.defineProperty(Date.prototype, 'toString', {\n                configurable: true,\n                enumerable: false,\n                writable: true\n            });\n        }\n    }\n\n    // ES5 15.9.5.43\n    // http://es5.github.com/#x15.9.5.43\n    // This function returns a String value represent the instance in time\n    // represented by this Date object. The format of the String is the Date Time\n    // string format defined in 15.9.1.15. All fields are present in the String.\n    // The time zone is always UTC, denoted by the suffix Z. If the time value of\n    // this object is not a finite Number a RangeError exception is thrown.\n    var negativeDate = -62198755200000;\n    var negativeYearString = '-000001';\n    var hasNegativeDateBug = Date.prototype.toISOString && new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1;\n    var hasSafari51DateBug = Date.prototype.toISOString && new Date(-1).toISOString() !== '1969-12-31T23:59:59.999Z';\n\n    var getTime = call.bind(Date.prototype.getTime);\n\n    defineProperties(Date.prototype, {\n        toISOString: function toISOString() {\n            if (!isFinite(this) || !isFinite(getTime(this))) {\n                // Adope Photoshop requires the second check.\n                throw new RangeError('Date.prototype.toISOString called on non-finite value.');\n            }\n\n            var year = originalGetUTCFullYear(this);\n\n            var month = originalGetUTCMonth(this);\n            // see https://github.com/es-shims/es5-shim/issues/111\n            year += Math.floor(month / 12);\n            month = (month % 12 + 12) % 12;\n\n            // the date time string format is specified in 15.9.1.15.\n            var result = [month + 1, originalGetUTCDate(this), originalGetUTCHours(this), originalGetUTCMinutes(this), originalGetUTCSeconds(this)];\n            year = (\n                (year < 0 ? '-' : (year > 9999 ? '+' : '')) +\n                strSlice('00000' + Math.abs(year), (0 <= year && year <= 9999) ? -4 : -6)\n            );\n\n            for (var i = 0; i < result.length; ++i) {\n                // pad months, days, hours, minutes, and seconds to have two digits.\n                result[i] = strSlice('00' + result[i], -2);\n            }\n            // pad milliseconds to have three digits.\n            return (\n                year + '-' + arraySlice(result, 0, 2).join('-') +\n                'T' + arraySlice(result, 2).join(':') + '.' +\n                strSlice('000' + originalGetUTCMilliseconds(this), -3) + 'Z'\n            );\n        }\n    }, hasNegativeDateBug || hasSafari51DateBug);\n\n    // ES5 15.9.5.44\n    // http://es5.github.com/#x15.9.5.44\n    // This function provides a String representation of a Date object for use by\n    // JSON.stringify (15.12.3).\n    var dateToJSONIsSupported = (function () {\n        try {\n            return Date.prototype.toJSON &&\n                new Date(NaN).toJSON() === null &&\n                new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&\n                Date.prototype.toJSON.call({ // generic\n                    toISOString: function () { return true; }\n                });\n        } catch (e) {\n            return false;\n        }\n    }());\n    if (!dateToJSONIsSupported) {\n        Date.prototype.toJSON = function toJSON(key) {\n            // When the toJSON method is called with argument key, the following\n            // steps are taken:\n\n            // 1.  Let O be the result of calling ToObject, giving it the this\n            // value as its argument.\n            // 2. Let tv be ES.ToPrimitive(O, hint Number).\n            var O = $Object(this);\n            var tv = ES.ToPrimitive(O);\n            // 3. If tv is a Number and is not finite, return null.\n            if (typeof tv === 'number' && !isFinite(tv)) {\n                return null;\n            }\n            // 4. Let toISO be the result of calling the [[Get]] internal method of\n            // O with argument \"toISOString\".\n            var toISO = O.toISOString;\n            // 5. If IsCallable(toISO) is false, throw a TypeError exception.\n            if (!isCallable(toISO)) {\n                throw new TypeError('toISOString property is not callable');\n            }\n            // 6. Return the result of calling the [[Call]] internal method of\n            //  toISO with O as the this value and an empty argument list.\n            return toISO.call(O);\n\n            // NOTE 1 The argument is ignored.\n\n            // NOTE 2 The toJSON function is intentionally generic; it does not\n            // require that its this value be a Date object. Therefore, it can be\n            // transferred to other kinds of objects for use as a method. However,\n            // it does require that any such object have a toISOString method. An\n            // object is free to use the argument key to filter its\n            // stringification.\n        };\n    }\n\n    // ES5 15.9.4.2\n    // http://es5.github.com/#x15.9.4.2\n    // based on work shared by Daniel Friesen (dantman)\n    // http://gist.github.com/303249\n    var supportsExtendedYears = Date.parse('+033658-09-27T01:46:40.000Z') === 1e15;\n    var acceptsInvalidDates = !isNaN(Date.parse('2012-04-04T24:00:00.500Z')) || !isNaN(Date.parse('2012-11-31T23:59:59.000Z')) || !isNaN(Date.parse('2012-12-31T23:59:60.000Z'));\n    var doesNotParseY2KNewYear = isNaN(Date.parse('2000-01-01T00:00:00.000Z'));\n    if (doesNotParseY2KNewYear || acceptsInvalidDates || !supportsExtendedYears) {\n        // XXX global assignment won't work in embeddings that use\n        // an alternate object for the context.\n        /* global Date: true */\n        /* eslint-disable no-undef */\n        var maxSafeUnsigned32Bit = Math.pow(2, 31) - 1;\n        var hasSafariSignedIntBug = isActualNaN(new Date(1970, 0, 1, 0, 0, 0, maxSafeUnsigned32Bit + 1).getTime());\n        /* eslint-disable no-implicit-globals */\n        Date = (function (NativeDate) {\n        /* eslint-enable no-implicit-globals */\n        /* eslint-enable no-undef */\n            // Date.length === 7\n            var DateShim = function Date(Y, M, D, h, m, s, ms) {\n                var length = arguments.length;\n                var date;\n                if (this instanceof NativeDate) {\n                    var seconds = s;\n                    var millis = ms;\n                    if (hasSafariSignedIntBug && length >= 7 && ms > maxSafeUnsigned32Bit) {\n                        // work around a Safari 8/9 bug where it treats the seconds as signed\n                        var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;\n                        var sToShift = Math.floor(msToShift / 1e3);\n                        seconds += sToShift;\n                        millis -= sToShift * 1e3;\n                    }\n                    date = length === 1 && $String(Y) === Y ? // isString(Y)\n                        // We explicitly pass it through parse:\n                        new NativeDate(DateShim.parse(Y)) :\n                        // We have to manually make calls depending on argument\n                        // length here\n                        length >= 7 ? new NativeDate(Y, M, D, h, m, seconds, millis) :\n                        length >= 6 ? new NativeDate(Y, M, D, h, m, seconds) :\n                        length >= 5 ? new NativeDate(Y, M, D, h, m) :\n                        length >= 4 ? new NativeDate(Y, M, D, h) :\n                        length >= 3 ? new NativeDate(Y, M, D) :\n                        length >= 2 ? new NativeDate(Y, M) :\n                        length >= 1 ? new NativeDate(Y instanceof NativeDate ? +Y : Y) :\n                                      new NativeDate();\n                } else {\n                    date = NativeDate.apply(this, arguments);\n                }\n                if (!isPrimitive(date)) {\n                    // Prevent mixups with unfixed Date object\n                    defineProperties(date, { constructor: DateShim }, true);\n                }\n                return date;\n            };\n\n            // 15.9.1.15 Date Time String Format.\n            var isoDateExpression = new RegExp('^' +\n                '(\\\\d{4}|[+-]\\\\d{6})' + // four-digit year capture or sign +\n                                          // 6-digit extended year\n                '(?:-(\\\\d{2})' + // optional month capture\n                '(?:-(\\\\d{2})' + // optional day capture\n                '(?:' + // capture hours:minutes:seconds.milliseconds\n                    'T(\\\\d{2})' + // hours capture\n                    ':(\\\\d{2})' + // minutes capture\n                    '(?:' + // optional :seconds.milliseconds\n                        ':(\\\\d{2})' + // seconds capture\n                        '(?:(\\\\.\\\\d{1,}))?' + // milliseconds capture\n                    ')?' +\n                '(' + // capture UTC offset component\n                    'Z|' + // UTC capture\n                    '(?:' + // offset specifier +/-hours:minutes\n                        '([-+])' + // sign capture\n                        '(\\\\d{2})' + // hours offset capture\n                        ':(\\\\d{2})' + // minutes offset capture\n                    ')' +\n                ')?)?)?)?' +\n            '$');\n\n            var months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];\n\n            var dayFromMonth = function dayFromMonth(year, month) {\n                var t = month > 1 ? 1 : 0;\n                return (\n                    months[month] +\n                    Math.floor((year - 1969 + t) / 4) -\n                    Math.floor((year - 1901 + t) / 100) +\n                    Math.floor((year - 1601 + t) / 400) +\n                    365 * (year - 1970)\n                );\n            };\n\n            var toUTC = function toUTC(t) {\n                var s = 0;\n                var ms = t;\n                if (hasSafariSignedIntBug && ms > maxSafeUnsigned32Bit) {\n                    // work around a Safari 8/9 bug where it treats the seconds as signed\n                    var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;\n                    var sToShift = Math.floor(msToShift / 1e3);\n                    s += sToShift;\n                    ms -= sToShift * 1e3;\n                }\n                return $Number(new NativeDate(1970, 0, 1, 0, 0, s, ms));\n            };\n\n            // Copy any custom methods a 3rd party library may have added\n            for (var key in NativeDate) {\n                if (owns(NativeDate, key)) {\n                    DateShim[key] = NativeDate[key];\n                }\n            }\n\n            // Copy \"native\" methods explicitly; they may be non-enumerable\n            defineProperties(DateShim, {\n                now: NativeDate.now,\n                UTC: NativeDate.UTC\n            }, true);\n            DateShim.prototype = NativeDate.prototype;\n            defineProperties(DateShim.prototype, {\n                constructor: DateShim\n            }, true);\n\n            // Upgrade Date.parse to handle simplified ISO 8601 strings\n            var parseShim = function parse(string) {\n                var match = isoDateExpression.exec(string);\n                if (match) {\n                    // parse months, days, hours, minutes, seconds, and milliseconds\n                    // provide default values if necessary\n                    // parse the UTC offset component\n                    var year = $Number(match[1]),\n                        month = $Number(match[2] || 1) - 1,\n                        day = $Number(match[3] || 1) - 1,\n                        hour = $Number(match[4] || 0),\n                        minute = $Number(match[5] || 0),\n                        second = $Number(match[6] || 0),\n                        millisecond = Math.floor($Number(match[7] || 0) * 1000),\n                        // When time zone is missed, local offset should be used\n                        // (ES 5.1 bug)\n                        // see https://bugs.ecmascript.org/show_bug.cgi?id=112\n                        isLocalTime = Boolean(match[4] && !match[8]),\n                        signOffset = match[9] === '-' ? 1 : -1,\n                        hourOffset = $Number(match[10] || 0),\n                        minuteOffset = $Number(match[11] || 0),\n                        result;\n                    var hasMinutesOrSecondsOrMilliseconds = minute > 0 || second > 0 || millisecond > 0;\n                    if (\n                        hour < (hasMinutesOrSecondsOrMilliseconds ? 24 : 25) &&\n                        minute < 60 && second < 60 && millisecond < 1000 &&\n                        month > -1 && month < 12 && hourOffset < 24 &&\n                        minuteOffset < 60 && // detect invalid offsets\n                        day > -1 &&\n                        day < (dayFromMonth(year, month + 1) - dayFromMonth(year, month))\n                    ) {\n                        result = (\n                            (dayFromMonth(year, month) + day) * 24 +\n                            hour +\n                            hourOffset * signOffset\n                        ) * 60;\n                        result = (\n                            (result + minute + minuteOffset * signOffset) * 60 +\n                            second\n                        ) * 1000 + millisecond;\n                        if (isLocalTime) {\n                            result = toUTC(result);\n                        }\n                        if (-8.64e15 <= result && result <= 8.64e15) {\n                            return result;\n                        }\n                    }\n                    return NaN;\n                }\n                return NativeDate.parse.apply(this, arguments);\n            };\n            defineProperties(DateShim, { parse: parseShim });\n\n            return DateShim;\n        }(Date));\n        /* global Date: false */\n    }\n\n    // ES5 15.9.4.4\n    // http://es5.github.com/#x15.9.4.4\n    if (!Date.now) {\n        Date.now = function now() {\n            return new Date().getTime();\n        };\n    }\n\n    //\n    // Number\n    // ======\n    //\n\n    // ES5.1 15.7.4.5\n    // http://es5.github.com/#x15.7.4.5\n    var hasToFixedBugs = NumberPrototype.toFixed && (\n      (0.00008).toFixed(3) !== '0.000' ||\n      (0.9).toFixed(0) !== '1' ||\n      (1.255).toFixed(2) !== '1.25' ||\n      (1000000000000000128).toFixed(0) !== '1000000000000000128'\n    );\n\n    var toFixedHelpers = {\n        base: 1e7,\n        size: 6,\n        data: [0, 0, 0, 0, 0, 0],\n        multiply: function multiply(n, c) {\n            var i = -1;\n            var c2 = c;\n            while (++i < toFixedHelpers.size) {\n                c2 += n * toFixedHelpers.data[i];\n                toFixedHelpers.data[i] = c2 % toFixedHelpers.base;\n                c2 = Math.floor(c2 / toFixedHelpers.base);\n            }\n        },\n        divide: function divide(n) {\n            var i = toFixedHelpers.size;\n            var c = 0;\n            while (--i >= 0) {\n                c += toFixedHelpers.data[i];\n                toFixedHelpers.data[i] = Math.floor(c / n);\n                c = (c % n) * toFixedHelpers.base;\n            }\n        },\n        numToString: function numToString() {\n            var i = toFixedHelpers.size;\n            var s = '';\n            while (--i >= 0) {\n                if (s !== '' || i === 0 || toFixedHelpers.data[i] !== 0) {\n                    var t = $String(toFixedHelpers.data[i]);\n                    if (s === '') {\n                        s = t;\n                    } else {\n                        s += strSlice('0000000', 0, 7 - t.length) + t;\n                    }\n                }\n            }\n            return s;\n        },\n        pow: function pow(x, n, acc) {\n            return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));\n        },\n        log: function log(x) {\n            var n = 0;\n            var x2 = x;\n            while (x2 >= 4096) {\n                n += 12;\n                x2 /= 4096;\n            }\n            while (x2 >= 2) {\n                n += 1;\n                x2 /= 2;\n            }\n            return n;\n        }\n    };\n\n    var toFixedShim = function toFixed(fractionDigits) {\n        var f, x, s, m, e, z, j, k;\n\n        // Test for NaN and round fractionDigits down\n        f = $Number(fractionDigits);\n        f = isActualNaN(f) ? 0 : Math.floor(f);\n\n        if (f < 0 || f > 20) {\n            throw new RangeError('Number.toFixed called with invalid number of decimals');\n        }\n\n        x = $Number(this);\n\n        if (isActualNaN(x)) {\n            return 'NaN';\n        }\n\n        // If it is too big or small, return the string value of the number\n        if (x <= -1e21 || x >= 1e21) {\n            return $String(x);\n        }\n\n        s = '';\n\n        if (x < 0) {\n            s = '-';\n            x = -x;\n        }\n\n        m = '0';\n\n        if (x > 1e-21) {\n            // 1e-21 < x < 1e21\n            // -70 < log2(x) < 70\n            e = toFixedHelpers.log(x * toFixedHelpers.pow(2, 69, 1)) - 69;\n            z = (e < 0 ? x * toFixedHelpers.pow(2, -e, 1) : x / toFixedHelpers.pow(2, e, 1));\n            z *= 0x10000000000000; // Math.pow(2, 52);\n            e = 52 - e;\n\n            // -18 < e < 122\n            // x = z / 2 ^ e\n            if (e > 0) {\n                toFixedHelpers.multiply(0, z);\n                j = f;\n\n                while (j >= 7) {\n                    toFixedHelpers.multiply(1e7, 0);\n                    j -= 7;\n                }\n\n                toFixedHelpers.multiply(toFixedHelpers.pow(10, j, 1), 0);\n                j = e - 1;\n\n                while (j >= 23) {\n                    toFixedHelpers.divide(1 << 23);\n                    j -= 23;\n                }\n\n                toFixedHelpers.divide(1 << j);\n                toFixedHelpers.multiply(1, 1);\n                toFixedHelpers.divide(2);\n                m = toFixedHelpers.numToString();\n            } else {\n                toFixedHelpers.multiply(0, z);\n                toFixedHelpers.multiply(1 << (-e), 0);\n                m = toFixedHelpers.numToString() + strSlice('0.00000000000000000000', 2, 2 + f);\n            }\n        }\n\n        if (f > 0) {\n            k = m.length;\n\n            if (k <= f) {\n                m = s + strSlice('0.0000000000000000000', 0, f - k + 2) + m;\n            } else {\n                m = s + strSlice(m, 0, k - f) + '.' + strSlice(m, k - f);\n            }\n        } else {\n            m = s + m;\n        }\n\n        return m;\n    };\n    defineProperties(NumberPrototype, { toFixed: toFixedShim }, hasToFixedBugs);\n\n    var hasToPrecisionUndefinedBug = (function () {\n        try {\n            return 1.0.toPrecision(undefined) === '1';\n        } catch (e) {\n            return true;\n        }\n    }());\n    var originalToPrecision = NumberPrototype.toPrecision;\n    defineProperties(NumberPrototype, {\n        toPrecision: function toPrecision(precision) {\n            return typeof precision === 'undefined' ? originalToPrecision.call(this) : originalToPrecision.call(this, precision);\n        }\n    }, hasToPrecisionUndefinedBug);\n\n    //\n    // String\n    // ======\n    //\n\n    // ES5 15.5.4.14\n    // http://es5.github.com/#x15.5.4.14\n\n    // [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]\n    // Many browsers do not split properly with regular expressions or they\n    // do not perform the split correctly under obscure conditions.\n    // See http://blog.stevenlevithan.com/archives/cross-browser-split\n    // I've tested in many browsers and this seems to cover the deviant ones:\n    //    'ab'.split(/(?:ab)*/) should be [\"\", \"\"], not [\"\"]\n    //    '.'.split(/(.?)(.?)/) should be [\"\", \".\", \"\", \"\"], not [\"\", \"\"]\n    //    'tesst'.split(/(s)*/) should be [\"t\", undefined, \"e\", \"s\", \"t\"], not\n    //       [undefined, \"t\", undefined, \"e\", ...]\n    //    ''.split(/.?/) should be [], not [\"\"]\n    //    '.'.split(/()()/) should be [\".\"], not [\"\", \"\", \".\"]\n\n    if (\n        'ab'.split(/(?:ab)*/).length !== 2 ||\n        '.'.split(/(.?)(.?)/).length !== 4 ||\n        'tesst'.split(/(s)*/)[1] === 't' ||\n        'test'.split(/(?:)/, -1).length !== 4 ||\n        ''.split(/.?/).length ||\n        '.'.split(/()()/).length > 1\n    ) {\n        (function () {\n            var compliantExecNpcg = typeof (/()??/).exec('')[1] === 'undefined'; // NPCG: nonparticipating capturing group\n            var maxSafe32BitInt = Math.pow(2, 32) - 1;\n\n            StringPrototype.split = function (separator, limit) {\n                var string = String(this);\n                if (typeof separator === 'undefined' && limit === 0) {\n                    return [];\n                }\n\n                // If `separator` is not a regex, use native split\n                if (!isRegex(separator)) {\n                    return strSplit(this, separator, limit);\n                }\n\n                var output = [];\n                var flags = (separator.ignoreCase ? 'i' : '') +\n                            (separator.multiline ? 'm' : '') +\n                            (separator.unicode ? 'u' : '') + // in ES6\n                            (separator.sticky ? 'y' : ''), // Firefox 3+ and ES6\n                    lastLastIndex = 0,\n                    // Make `global` and avoid `lastIndex` issues by working with a copy\n                    separator2, match, lastIndex, lastLength;\n                var separatorCopy = new RegExp(separator.source, flags + 'g');\n                if (!compliantExecNpcg) {\n                    // Doesn't need flags gy, but they don't hurt\n                    separator2 = new RegExp('^' + separatorCopy.source + '$(?!\\\\s)', flags);\n                }\n                /* Values for `limit`, per the spec:\n                 * If undefined: 4294967295 // maxSafe32BitInt\n                 * If 0, Infinity, or NaN: 0\n                 * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;\n                 * If negative number: 4294967296 - Math.floor(Math.abs(limit))\n                 * If other: Type-convert, then use the above rules\n                 */\n                var splitLimit = typeof limit === 'undefined' ? maxSafe32BitInt : ES.ToUint32(limit);\n                match = separatorCopy.exec(string);\n                while (match) {\n                    // `separatorCopy.lastIndex` is not reliable cross-browser\n                    lastIndex = match.index + match[0].length;\n                    if (lastIndex > lastLastIndex) {\n                        pushCall(output, strSlice(string, lastLastIndex, match.index));\n                        // Fix browsers whose `exec` methods don't consistently return `undefined` for\n                        // nonparticipating capturing groups\n                        if (!compliantExecNpcg && match.length > 1) {\n                            /* eslint-disable no-loop-func */\n                            match[0].replace(separator2, function () {\n                                for (var i = 1; i < arguments.length - 2; i++) {\n                                    if (typeof arguments[i] === 'undefined') {\n                                        match[i] = void 0;\n                                    }\n                                }\n                            });\n                            /* eslint-enable no-loop-func */\n                        }\n                        if (match.length > 1 && match.index < string.length) {\n                            array_push.apply(output, arraySlice(match, 1));\n                        }\n                        lastLength = match[0].length;\n                        lastLastIndex = lastIndex;\n                        if (output.length >= splitLimit) {\n                            break;\n                        }\n                    }\n                    if (separatorCopy.lastIndex === match.index) {\n                        separatorCopy.lastIndex++; // Avoid an infinite loop\n                    }\n                    match = separatorCopy.exec(string);\n                }\n                if (lastLastIndex === string.length) {\n                    if (lastLength || !separatorCopy.test('')) {\n                        pushCall(output, '');\n                    }\n                } else {\n                    pushCall(output, strSlice(string, lastLastIndex));\n                }\n                return output.length > splitLimit ? arraySlice(output, 0, splitLimit) : output;\n            };\n        }());\n\n    // [bugfix, chrome]\n    // If separator is undefined, then the result array contains just one String,\n    // which is the this value (converted to a String). If limit is not undefined,\n    // then the output array is truncated so that it contains no more than limit\n    // elements.\n    // \"0\".split(undefined, 0) -> []\n    } else if ('0'.split(void 0, 0).length) {\n        StringPrototype.split = function split(separator, limit) {\n            if (typeof separator === 'undefined' && limit === 0) {\n                return [];\n            }\n            return strSplit(this, separator, limit);\n        };\n    }\n\n    var str_replace = StringPrototype.replace;\n    var replaceReportsGroupsCorrectly = (function () {\n        var groups = [];\n        'x'.replace(/x(.)?/g, function (match, group) {\n            pushCall(groups, group);\n        });\n        return groups.length === 1 && typeof groups[0] === 'undefined';\n    }());\n\n    if (!replaceReportsGroupsCorrectly) {\n        StringPrototype.replace = function replace(searchValue, replaceValue) {\n            var isFn = isCallable(replaceValue);\n            var hasCapturingGroups = isRegex(searchValue) && (/\\)[*?]/).test(searchValue.source);\n            if (!isFn || !hasCapturingGroups) {\n                return str_replace.call(this, searchValue, replaceValue);\n            } else {\n                var wrappedReplaceValue = function (match) {\n                    var length = arguments.length;\n                    var originalLastIndex = searchValue.lastIndex;\n                    searchValue.lastIndex = 0;\n                    var args = searchValue.exec(match) || [];\n                    searchValue.lastIndex = originalLastIndex;\n                    pushCall(args, arguments[length - 2], arguments[length - 1]);\n                    return replaceValue.apply(this, args);\n                };\n                return str_replace.call(this, searchValue, wrappedReplaceValue);\n            }\n        };\n    }\n\n    // ECMA-262, 3rd B.2.3\n    // Not an ECMAScript standard, although ECMAScript 3rd Edition has a\n    // non-normative section suggesting uniform semantics and it should be\n    // normalized across all browsers\n    // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE\n    var string_substr = StringPrototype.substr;\n    var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';\n    defineProperties(StringPrototype, {\n        substr: function substr(start, length) {\n            var normalizedStart = start;\n            if (start < 0) {\n                normalizedStart = max(this.length + start, 0);\n            }\n            return string_substr.call(this, normalizedStart, length);\n        }\n    }, hasNegativeSubstrBug);\n\n    // ES5 15.5.4.20\n    // whitespace from: http://es5.github.io/#x15.5.4.20\n    var ws = '\\x09\\x0A\\x0B\\x0C\\x0D\\x20\\xA0\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003' +\n        '\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000\\u2028' +\n        '\\u2029\\uFEFF';\n    var zeroWidth = '\\u200b';\n    var wsRegexChars = '[' + ws + ']';\n    var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');\n    var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');\n    var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());\n    defineProperties(StringPrototype, {\n        // http://blog.stevenlevithan.com/archives/faster-trim-javascript\n        // http://perfectionkills.com/whitespace-deviations/\n        trim: function trim() {\n            if (typeof this === 'undefined' || this === null) {\n                throw new TypeError(\"can't convert \" + this + ' to object');\n            }\n            return $String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');\n        }\n    }, hasTrimWhitespaceBug);\n    var trim = call.bind(String.prototype.trim);\n\n    var hasLastIndexBug = StringPrototype.lastIndexOf && 'abcあい'.lastIndexOf('あい', 2) !== -1;\n    defineProperties(StringPrototype, {\n        lastIndexOf: function lastIndexOf(searchString) {\n            if (typeof this === 'undefined' || this === null) {\n                throw new TypeError(\"can't convert \" + this + ' to object');\n            }\n            var S = $String(this);\n            var searchStr = $String(searchString);\n            var numPos = arguments.length > 1 ? $Number(arguments[1]) : NaN;\n            var pos = isActualNaN(numPos) ? Infinity : ES.ToInteger(numPos);\n            var start = min(max(pos, 0), S.length);\n            var searchLen = searchStr.length;\n            var k = start + searchLen;\n            while (k > 0) {\n                k = max(0, k - searchLen);\n                var index = strIndexOf(strSlice(S, k, start + searchLen), searchStr);\n                if (index !== -1) {\n                    return k + index;\n                }\n            }\n            return -1;\n        }\n    }, hasLastIndexBug);\n\n    var originalLastIndexOf = StringPrototype.lastIndexOf;\n    defineProperties(StringPrototype, {\n        lastIndexOf: function lastIndexOf(searchString) {\n            return originalLastIndexOf.apply(this, arguments);\n        }\n    }, StringPrototype.lastIndexOf.length !== 1);\n\n    // ES-5 15.1.2.2\n    /* eslint-disable radix */\n    if (parseInt(ws + '08') !== 8 || parseInt(ws + '0x16') !== 22) {\n    /* eslint-enable radix */\n        /* global parseInt: true */\n        parseInt = (function (origParseInt) {\n            var hexRegex = /^[\\-+]?0[xX]/;\n            return function parseInt(str, radix) {\n                var string = trim(String(str));\n                var defaultedRadix = $Number(radix) || (hexRegex.test(string) ? 16 : 10);\n                return origParseInt(string, defaultedRadix);\n            };\n        }(parseInt));\n    }\n\n    // https://es5.github.io/#x15.1.2.3\n    if (1 / parseFloat('-0') !== -Infinity) {\n        /* global parseFloat: true */\n        parseFloat = (function (origParseFloat) {\n            return function parseFloat(string) {\n                var inputString = trim(String(string));\n                var result = origParseFloat(inputString);\n                return result === 0 && strSlice(inputString, 0, 1) === '-' ? -0 : result;\n            };\n        }(parseFloat));\n    }\n\n    if (String(new RangeError('test')) !== 'RangeError: test') {\n        var errorToStringShim = function toString() {\n            if (typeof this === 'undefined' || this === null) {\n                throw new TypeError(\"can't convert \" + this + ' to object');\n            }\n            var name = this.name;\n            if (typeof name === 'undefined') {\n                name = 'Error';\n            } else if (typeof name !== 'string') {\n                name = $String(name);\n            }\n            var msg = this.message;\n            if (typeof msg === 'undefined') {\n                msg = '';\n            } else if (typeof msg !== 'string') {\n                msg = $String(msg);\n            }\n            if (!name) {\n                return msg;\n            }\n            if (!msg) {\n                return name;\n            }\n            return name + ': ' + msg;\n        };\n        // can't use defineProperties here because of toString enumeration issue in IE <= 8\n        Error.prototype.toString = errorToStringShim;\n    }\n\n    if (supportsDescriptors) {\n        var ensureNonEnumerable = function (obj, prop) {\n            if (isEnum(obj, prop)) {\n                var desc = Object.getOwnPropertyDescriptor(obj, prop);\n                if (desc.configurable) {\n                    desc.enumerable = false;\n                    Object.defineProperty(obj, prop, desc);\n                }\n            }\n        };\n        ensureNonEnumerable(Error.prototype, 'message');\n        if (Error.prototype.message !== '') {\n            Error.prototype.message = '';\n        }\n        ensureNonEnumerable(Error.prototype, 'name');\n    }\n\n    if (String(/a/mig) !== '/a/gim') {\n        var regexToString = function toString() {\n            var str = '/' + this.source + '/';\n            if (this.global) {\n                str += 'g';\n            }\n            if (this.ignoreCase) {\n                str += 'i';\n            }\n            if (this.multiline) {\n                str += 'm';\n            }\n            return str;\n        };\n        // can't use defineProperties here because of toString enumeration issue in IE <= 8\n        RegExp.prototype.toString = regexToString;\n    }\n}));\n","'use strict';\n/*jslint eqeq: true*/\n\nHandlebars.registerHelper('sanitize', function (text) {\n    var result;\n\n    if (text === undefined) { return ''; }\n\n    result = sanitizeHtml(text, {\n        allowedTags: [ 'div', 'span', 'b', 'i', 'em', 'strong', 'a', 'br', 'table', 'tbody', 'tr', 'th', 'td' ],\n        allowedAttributes: {\n            'div': [ 'class' ],\n            'span': [ 'class' ],\n            'table': [ 'class' ],\n            'td': [ 'class' ],\n            'th': [ 'colspan' ],\n            'a': [ 'href' ]\n        }\n    });\n\n    return new Handlebars.SafeString(result);\n});\n\nHandlebars.registerHelper('renderTextParam', function(param) {\n    var result, type = 'text', idAtt = '';\n    var paramType = param.type || param.schema && param.schema.type || '';\n    var isArray = paramType.toLowerCase() === 'array' || param.allowMultiple;\n    var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\\n') : param.default;\n    var name = Handlebars.Utils.escapeExpression(param.name);\n    var valueId = Handlebars.Utils.escapeExpression(param.valueId);\n    paramType = Handlebars.Utils.escapeExpression(paramType);\n\n    var dataVendorExtensions = Object.keys(param).filter(function(property) {\n        // filter X-data- properties\n        return property.match(/^X-data-/i) !== null;\n    }).reduce(function(result, property) {\n        // remove X- from property name, so it results in html attributes like data-foo='bar'\n        return result += ' ' + property.substring(2, property.length) + '=\\'' + param[property] + '\\'';\n    }, '');\n\n    if(param.format && param.format === 'password') {\n        type = 'password';\n    }\n\n    if(valueId) {\n        idAtt = ' id=\\'' + valueId + '\\'';\n    }\n\n    if (defaultValue) {\n      defaultValue = sanitizeHtml(defaultValue);\n    } else {\n      defaultValue = '';\n    }\n\n    if(isArray) {\n        result = '<textarea class=\\'body-textarea' + (param.required ? ' required' : '') + '\\' name=\\'' + name + '\\'' + idAtt + dataVendorExtensions;\n        result += ' placeholder=\\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\\'>';\n        result += defaultValue + '</textarea>';\n    } else {\n        var parameterClass = 'parameter';\n        if(param.required) {\n          parameterClass += ' required';\n        }\n        result = '<input class=\\'' + parameterClass + '\\' minlength=\\'' + (param.required ? 1 : 0) + '\\'';\n        result += ' name=\\'' + name +'\\' placeholder=\\'' + (param.required ? '(required)' : '') + '\\'' + idAtt + dataVendorExtensions;\n        result += ' type=\\'' + type + '\\' value=\\'' + defaultValue + '\\'/>';\n    }\n    return new Handlebars.SafeString(result);\n});\n\nHandlebars.registerHelper('ifCond', function (v1, operator, v2, options) {\n\n    switch (operator) {\n        case '==':\n            return (v1 == v2) ? options.fn(this) : options.inverse(this);\n        case '===':\n            return (v1 === v2) ? options.fn(this) : options.inverse(this);\n        case '<':\n            return (v1 < v2) ? options.fn(this) : options.inverse(this);\n        case '<=':\n            return (v1 <= v2) ? options.fn(this) : options.inverse(this);\n        case '>':\n            return (v1 > v2) ? options.fn(this) : options.inverse(this);\n        case '>=':\n            return (v1 >= v2) ? options.fn(this) : options.inverse(this);\n        case '&&':\n            return (v1 && v2) ? options.fn(this) : options.inverse(this);\n        case '||':\n            return (v1 || v2) ? options.fn(this) : options.inverse(this);\n        default:\n            return options.inverse(this);\n    }\n});\n\nHandlebars.registerHelper('escape', function (value) {\n    var text = Handlebars.Utils.escapeExpression(value);\n\n    return new Handlebars.SafeString(text);\n});\n","(function(f){if(typeof exports===\"object\"&&typeof module!==\"undefined\"){module.exports=f()}else if(typeof define===\"function\"&&define.amd){define([],f)}else{var g;if(typeof window!==\"undefined\"){g=window}else if(typeof global!==\"undefined\"){g=global}else if(typeof self!==\"undefined\"){g=self}else{g=this}g.sanitizeHtml=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){var htmlparser=require(\"htmlparser2\");var extend=require(\"xtend\");var quoteRegexp=require(\"regexp-quote\");function each(obj,cb){if(obj)Object.keys(obj).forEach(function(key){cb(obj[key],key)})}function has(obj,key){return{}.hasOwnProperty.call(obj,key)}module.exports=sanitizeHtml;function sanitizeHtml(html,options,_recursing){var result=\"\";function Frame(tag,attribs){var that=this;this.tag=tag;this.attribs=attribs||{};this.tagPosition=result.length;this.text=\"\";this.updateParentNodeText=function(){if(stack.length){var parentFrame=stack[stack.length-1];parentFrame.text+=that.text}}}if(!options){options=sanitizeHtml.defaults;options.parser=htmlParserDefaults}else{options=extend(sanitizeHtml.defaults,options);if(options.parser){options.parser=extend(htmlParserDefaults,options.parser)}else{options.parser=htmlParserDefaults}}var nonTextTagsArray=options.nonTextTags||[\"script\",\"style\",\"textarea\"];var allowedAttributesMap;var allowedAttributesGlobMap;if(options.allowedAttributes){allowedAttributesMap={};allowedAttributesGlobMap={};each(options.allowedAttributes,function(attributes,tag){allowedAttributesMap[tag]=[];var globRegex=[];attributes.forEach(function(name){if(name.indexOf(\"*\")>=0){globRegex.push(quoteRegexp(name).replace(/\\\\\\*/g,\".*\"))}else{allowedAttributesMap[tag].push(name)}});allowedAttributesGlobMap[tag]=new RegExp(\"^(\"+globRegex.join(\"|\")+\")$\")})}var allowedClassesMap={};each(options.allowedClasses,function(classes,tag){if(allowedAttributesMap){if(!has(allowedAttributesMap,tag)){allowedAttributesMap[tag]=[]}allowedAttributesMap[tag].push(\"class\")}allowedClassesMap[tag]=classes});var transformTagsMap={};var transformTagsAll;each(options.transformTags,function(transform,tag){var transFun;if(typeof transform===\"function\"){transFun=transform}else if(typeof transform===\"string\"){transFun=sanitizeHtml.simpleTransform(transform)}if(tag===\"*\"){transformTagsAll=transFun}else{transformTagsMap[tag]=transFun}});var depth=0;var stack=[];var skipMap={};var transformMap={};var skipText=false;var skipTextDepth=0;var parser=new htmlparser.Parser({onopentag:function(name,attribs){if(skipText){skipTextDepth++;return}var frame=new Frame(name,attribs);stack.push(frame);var skip=false;var hasText=frame.text?true:false;var transformedTag;if(has(transformTagsMap,name)){transformedTag=transformTagsMap[name](name,attribs);frame.attribs=attribs=transformedTag.attribs;if(transformedTag.text!==undefined){frame.innerText=transformedTag.text}if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(transformTagsAll){transformedTag=transformTagsAll(name,attribs);frame.attribs=attribs=transformedTag.attribs;if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(options.allowedTags&&options.allowedTags.indexOf(name)===-1){skip=true;if(nonTextTagsArray.indexOf(name)!==-1){skipText=true;skipTextDepth=1}skipMap[depth]=true}depth++;if(skip){return}result+=\"<\"+name;if(!allowedAttributesMap||has(allowedAttributesMap,name)||allowedAttributesMap[\"*\"]){each(attribs,function(value,a){if(!allowedAttributesMap||has(allowedAttributesMap,name)&&allowedAttributesMap[name].indexOf(a)!==-1||allowedAttributesMap[\"*\"]&&allowedAttributesMap[\"*\"].indexOf(a)!==-1||has(allowedAttributesGlobMap,name)&&allowedAttributesGlobMap[name].test(a)||allowedAttributesGlobMap[\"*\"]&&allowedAttributesGlobMap[\"*\"].test(a)){if(a===\"href\"||a===\"src\"){if(naughtyHref(name,value)){delete frame.attribs[a];return}}if(a===\"class\"){value=filterClasses(value,allowedClassesMap[name]);if(!value.length){delete frame.attribs[a];return}}result+=\" \"+a;if(value.length){result+='=\"'+escapeHtml(value)+'\"'}}else{delete frame.attribs[a]}})}if(options.selfClosing.indexOf(name)!==-1){result+=\" />\"}else{result+=\">\";if(frame.innerText&&!hasText&&!options.textFilter){result+=frame.innerText}}},ontext:function(text){if(skipText){return}var lastFrame=stack[stack.length-1];var tag;if(lastFrame){tag=lastFrame.tag;text=lastFrame.innerText!==undefined?lastFrame.innerText:text}if(tag===\"script\"||tag===\"style\"){result+=text}else{var escaped=escapeHtml(text);if(options.textFilter){result+=options.textFilter(escaped)}else{result+=escaped}}if(stack.length){var frame=stack[stack.length-1];frame.text+=text}},onclosetag:function(name){if(skipText){skipTextDepth--;if(!skipTextDepth){skipText=false}else{return}}var frame=stack.pop();if(!frame){return}skipText=false;depth--;if(skipMap[depth]){delete skipMap[depth];frame.updateParentNodeText();return}if(transformMap[depth]){name=transformMap[depth];delete transformMap[depth]}if(options.exclusiveFilter&&options.exclusiveFilter(frame)){result=result.substr(0,frame.tagPosition);return}frame.updateParentNodeText();if(options.selfClosing.indexOf(name)!==-1){return}result+=\"</\"+name+\">\"}},options.parser);parser.write(html);parser.end();return result;function escapeHtml(s){if(typeof s!==\"string\"){s=s+\"\"}return s.replace(/\\&/g,\"&amp;\").replace(/</g,\"&lt;\").replace(/\\>/g,\"&gt;\").replace(/\\\"/g,\"&quot;\")}function naughtyHref(name,href){href=href.replace(/[\\x00-\\x20]+/g,\"\");href=href.replace(/<\\!\\-\\-.*?\\-\\-\\>/g,\"\");var matches=href.match(/^([a-zA-Z]+)\\:/);if(!matches){return false}var scheme=matches[1].toLowerCase();if(has(options.allowedSchemesByTag,name)){return options.allowedSchemesByTag[name].indexOf(scheme)===-1}return!options.allowedSchemes||options.allowedSchemes.indexOf(scheme)===-1}function filterClasses(classes,allowed){if(!allowed){return classes}classes=classes.split(/\\s+/);return classes.filter(function(clss){return allowed.indexOf(clss)!==-1}).join(\" \")}}var htmlParserDefaults={decodeEntities:true};sanitizeHtml.defaults={allowedTags:[\"h3\",\"h4\",\"h5\",\"h6\",\"blockquote\",\"p\",\"a\",\"ul\",\"ol\",\"nl\",\"li\",\"b\",\"i\",\"strong\",\"em\",\"strike\",\"code\",\"hr\",\"br\",\"div\",\"table\",\"thead\",\"caption\",\"tbody\",\"tr\",\"th\",\"td\",\"pre\"],allowedAttributes:{a:[\"href\",\"name\",\"target\"],img:[\"src\"]},selfClosing:[\"img\",\"br\",\"hr\",\"area\",\"base\",\"basefont\",\"input\",\"link\",\"meta\"],allowedSchemes:[\"http\",\"https\",\"ftp\",\"mailto\"],allowedSchemesByTag:{}};sanitizeHtml.simpleTransform=function(newTagName,newAttribs,merge){merge=merge===undefined?true:merge;newAttribs=newAttribs||{};return function(tagName,attribs){var attrib;if(merge){for(attrib in newAttribs){attribs[attrib]=newAttribs[attrib]}}else{attribs=newAttribs}return{tagName:newTagName,attribs:attribs}}}},{htmlparser2:36,\"regexp-quote\":54,xtend:58}],2:[function(require,module,exports){\"use strict\";exports.toByteArray=toByteArray;exports.fromByteArray=fromByteArray;var lookup=[];var revLookup=[];var Arr=typeof Uint8Array!==\"undefined\"?Uint8Array:Array;function init(){var code=\"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\";for(var i=0,len=code.length;i<len;++i){lookup[i]=code[i];revLookup[code.charCodeAt(i)]=i}revLookup[\"-\".charCodeAt(0)]=62;revLookup[\"_\".charCodeAt(0)]=63}init();function toByteArray(b64){var i,j,l,tmp,placeHolders,arr;var len=b64.length;if(len%4>0){throw new Error(\"Invalid string. Length must be a multiple of 4\")}placeHolders=b64[len-2]===\"=\"?2:b64[len-1]===\"=\"?1:0;arr=new Arr(len*3/4-placeHolders);l=placeHolders>0?len-4:len;var L=0;for(i=0,j=0;i<l;i+=4,j+=3){tmp=revLookup[b64.charCodeAt(i)]<<18|revLookup[b64.charCodeAt(i+1)]<<12|revLookup[b64.charCodeAt(i+2)]<<6|revLookup[b64.charCodeAt(i+3)];arr[L++]=tmp>>16&255;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}if(placeHolders===2){tmp=revLookup[b64.charCodeAt(i)]<<2|revLookup[b64.charCodeAt(i+1)]>>4;arr[L++]=tmp&255}else if(placeHolders===1){tmp=revLookup[b64.charCodeAt(i)]<<10|revLookup[b64.charCodeAt(i+1)]<<4|revLookup[b64.charCodeAt(i+2)]>>2;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}return arr}function tripletToBase64(num){return lookup[num>>18&63]+lookup[num>>12&63]+lookup[num>>6&63]+lookup[num&63]}function encodeChunk(uint8,start,end){var tmp;var output=[];for(var i=start;i<end;i+=3){tmp=(uint8[i]<<16)+(uint8[i+1]<<8)+uint8[i+2];output.push(tripletToBase64(tmp))}return output.join(\"\")}function fromByteArray(uint8){var tmp;var len=uint8.length;var extraBytes=len%3;var output=\"\";var parts=[];var maxChunkLength=16383;for(var i=0,len2=len-extraBytes;i<len2;i+=maxChunkLength){parts.push(encodeChunk(uint8,i,i+maxChunkLength>len2?len2:i+maxChunkLength))}if(extraBytes===1){tmp=uint8[len-1];output+=lookup[tmp>>2];output+=lookup[tmp<<4&63];output+=\"==\"}else if(extraBytes===2){tmp=(uint8[len-2]<<8)+uint8[len-1];output+=lookup[tmp>>10];output+=lookup[tmp>>4&63];output+=lookup[tmp<<2&63];output+=\"=\"}parts.push(output);return parts.join(\"\")}},{}],3:[function(require,module,exports){},{}],4:[function(require,module,exports){(function(global){\"use strict\";var buffer=require(\"buffer\");var Buffer=buffer.Buffer;var SlowBuffer=buffer.SlowBuffer;var MAX_LEN=buffer.kMaxLength||2147483647;exports.alloc=function alloc(size,fill,encoding){if(typeof Buffer.alloc===\"function\"){return Buffer.alloc(size,fill,encoding)}if(typeof encoding===\"number\"){throw new TypeError(\"encoding must not be number\")}if(typeof size!==\"number\"){throw new TypeError(\"size must be a number\")}if(size>MAX_LEN){throw new RangeError(\"size is too large\")}var enc=encoding;var _fill=fill;if(_fill===undefined){enc=undefined;_fill=0}var buf=new Buffer(size);if(typeof _fill===\"string\"){var fillBuf=new Buffer(_fill,enc);var flen=fillBuf.length;var i=-1;while(++i<size){buf[i]=fillBuf[i%flen]}}else{buf.fill(_fill)}return buf};exports.allocUnsafe=function allocUnsafe(size){if(typeof Buffer.allocUnsafe===\"function\"){return Buffer.allocUnsafe(size)}if(typeof size!==\"number\"){throw new TypeError(\"size must be a number\")}if(size>MAX_LEN){throw new RangeError(\"size is too large\")}return new Buffer(size)};exports.from=function from(value,encodingOrOffset,length){if(typeof Buffer.from===\"function\"&&(!global.Uint8Array||Uint8Array.from!==Buffer.from)){return Buffer.from(value,encodingOrOffset,length)}if(typeof value===\"number\"){throw new TypeError('\"value\" argument must not be a number')}if(typeof value===\"string\"){return new Buffer(value,encodingOrOffset)}if(typeof ArrayBuffer!==\"undefined\"&&value instanceof ArrayBuffer){var offset=encodingOrOffset;if(arguments.length===1){return new Buffer(value)}if(typeof offset===\"undefined\"){offset=0}var len=length;if(typeof len===\"undefined\"){len=value.byteLength-offset}if(offset>=value.byteLength){throw new RangeError(\"'offset' is out of bounds\")}if(len>value.byteLength-offset){throw new RangeError(\"'length' is out of bounds\")}return new Buffer(value.slice(offset,offset+len))}if(Buffer.isBuffer(value)){var out=new Buffer(value.length);value.copy(out,0,0,value.length);return out}if(value){if(Array.isArray(value)||typeof ArrayBuffer!==\"undefined\"&&value.buffer instanceof ArrayBuffer||\"length\"in value){return new Buffer(value)}if(value.type===\"Buffer\"&&Array.isArray(value.data)){return new Buffer(value.data)}}throw new TypeError(\"First argument must be a string, Buffer, \"+\"ArrayBuffer, Array, or array-like object.\")};exports.allocUnsafeSlow=function allocUnsafeSlow(size){if(typeof Buffer.allocUnsafeSlow===\"function\"){return Buffer.allocUnsafeSlow(size)}if(typeof size!==\"number\"){throw new TypeError(\"size must be a number\")}if(size>=MAX_LEN){throw new RangeError(\"size is too large\")}return new SlowBuffer(size)}}).call(this,typeof global!==\"undefined\"?global:typeof self!==\"undefined\"?self:typeof window!==\"undefined\"?window:{})},{buffer:5}],5:[function(require,module,exports){(function(global){\"use strict\";var base64=require(\"base64-js\");var ieee754=require(\"ieee754\");var isArray=require(\"isarray\");exports.Buffer=Buffer;exports.SlowBuffer=SlowBuffer;exports.INSPECT_MAX_BYTES=50;Buffer.TYPED_ARRAY_SUPPORT=global.TYPED_ARRAY_SUPPORT!==undefined?global.TYPED_ARRAY_SUPPORT:typedArraySupport();exports.kMaxLength=kMaxLength();function typedArraySupport(){try{var arr=new Uint8Array(1);arr.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}};return arr.foo()===42&&typeof arr.subarray===\"function\"&&arr.subarray(1,1).byteLength===0}catch(e){return false}}function kMaxLength(){return Buffer.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function createBuffer(that,length){if(kMaxLength()<length){throw new RangeError(\"Invalid typed array length\")}if(Buffer.TYPED_ARRAY_SUPPORT){that=new Uint8Array(length);that.__proto__=Buffer.prototype}else{if(that===null){that=new Buffer(length)}that.length=length}return that}function Buffer(arg,encodingOrOffset,length){if(!Buffer.TYPED_ARRAY_SUPPORT&&!(this instanceof Buffer)){return new Buffer(arg,encodingOrOffset,length)}if(typeof arg===\"number\"){if(typeof encodingOrOffset===\"string\"){throw new Error(\"If encoding is specified then the first argument must be a string\")}return allocUnsafe(this,arg)}return from(this,arg,encodingOrOffset,length)}Buffer.poolSize=8192;Buffer._augment=function(arr){arr.__proto__=Buffer.prototype;return arr};function from(that,value,encodingOrOffset,length){if(typeof value===\"number\"){throw new TypeError('\"value\" argument must not be a number')}if(typeof ArrayBuffer!==\"undefined\"&&value instanceof ArrayBuffer){return fromArrayBuffer(that,value,encodingOrOffset,length)}if(typeof value===\"string\"){return fromString(that,value,encodingOrOffset)}return fromObject(that,value)}Buffer.from=function(value,encodingOrOffset,length){return from(null,value,encodingOrOffset,length)};if(Buffer.TYPED_ARRAY_SUPPORT){Buffer.prototype.__proto__=Uint8Array.prototype;Buffer.__proto__=Uint8Array;if(typeof Symbol!==\"undefined\"&&Symbol.species&&Buffer[Symbol.species]===Buffer){Object.defineProperty(Buffer,Symbol.species,{value:null,configurable:true})}}function assertSize(size){if(typeof size!==\"number\"){throw new TypeError('\"size\" argument must be a number')}else if(size<0){throw new RangeError('\"size\" argument must not be negative')}}function alloc(that,size,fill,encoding){assertSize(size);if(size<=0){return createBuffer(that,size)}if(fill!==undefined){return typeof encoding===\"string\"?createBuffer(that,size).fill(fill,encoding):createBuffer(that,size).fill(fill)}return createBuffer(that,size)}Buffer.alloc=function(size,fill,encoding){return alloc(null,size,fill,encoding)};function allocUnsafe(that,size){assertSize(size);that=createBuffer(that,size<0?0:checked(size)|0);if(!Buffer.TYPED_ARRAY_SUPPORT){for(var i=0;i<size;++i){that[i]=0}}return that}Buffer.allocUnsafe=function(size){return allocUnsafe(null,size)};Buffer.allocUnsafeSlow=function(size){return allocUnsafe(null,size)};function fromString(that,string,encoding){if(typeof encoding!==\"string\"||encoding===\"\"){encoding=\"utf8\"}if(!Buffer.isEncoding(encoding)){throw new TypeError('\"encoding\" must be a valid string encoding')}var length=byteLength(string,encoding)|0;that=createBuffer(that,length);var actual=that.write(string,encoding);if(actual!==length){that=that.slice(0,actual)}return that}function fromArrayLike(that,array){var length=array.length<0?0:checked(array.length)|0;that=createBuffer(that,length);for(var i=0;i<length;i+=1){that[i]=array[i]&255}return that}function fromArrayBuffer(that,array,byteOffset,length){array.byteLength;if(byteOffset<0||array.byteLength<byteOffset){throw new RangeError(\"'offset' is out of bounds\")}if(array.byteLength<byteOffset+(length||0)){throw new RangeError(\"'length' is out of bounds\")}if(byteOffset===undefined&&length===undefined){array=new Uint8Array(array)}else if(length===undefined){array=new Uint8Array(array,byteOffset)}else{array=new Uint8Array(array,byteOffset,length)}if(Buffer.TYPED_ARRAY_SUPPORT){that=array;that.__proto__=Buffer.prototype}else{that=fromArrayLike(that,array)}return that}function fromObject(that,obj){if(Buffer.isBuffer(obj)){var len=checked(obj.length)|0;that=createBuffer(that,len);if(that.length===0){return that}obj.copy(that,0,0,len);return that}if(obj){if(typeof ArrayBuffer!==\"undefined\"&&obj.buffer instanceof ArrayBuffer||\"length\"in obj){if(typeof obj.length!==\"number\"||isnan(obj.length)){return createBuffer(that,0)}return fromArrayLike(that,obj)}if(obj.type===\"Buffer\"&&isArray(obj.data)){return fromArrayLike(that,obj.data)}}throw new TypeError(\"First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.\")}function checked(length){if(length>=kMaxLength()){throw new RangeError(\"Attempt to allocate Buffer larger than maximum \"+\"size: 0x\"+kMaxLength().toString(16)+\" bytes\")}return length|0}function SlowBuffer(length){if(+length!=length){length=0}return Buffer.alloc(+length)}Buffer.isBuffer=function isBuffer(b){return!!(b!=null&&b._isBuffer)};Buffer.compare=function compare(a,b){if(!Buffer.isBuffer(a)||!Buffer.isBuffer(b)){throw new TypeError(\"Arguments must be Buffers\")}if(a===b)return 0;var x=a.length;var y=b.length;for(var i=0,len=Math.min(x,y);i<len;++i){if(a[i]!==b[i]){x=a[i];y=b[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};Buffer.isEncoding=function isEncoding(encoding){switch(String(encoding).toLowerCase()){case\"hex\":case\"utf8\":case\"utf-8\":case\"ascii\":case\"latin1\":case\"binary\":case\"base64\":case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return true;default:return false}};Buffer.concat=function concat(list,length){if(!isArray(list)){throw new TypeError('\"list\" argument must be an Array of Buffers')}if(list.length===0){return Buffer.alloc(0)}var i;if(length===undefined){length=0;for(i=0;i<list.length;++i){length+=list[i].length}}var buffer=Buffer.allocUnsafe(length);var pos=0;for(i=0;i<list.length;++i){var buf=list[i];if(!Buffer.isBuffer(buf)){throw new TypeError('\"list\" argument must be an Array of Buffers')}buf.copy(buffer,pos);pos+=buf.length}return buffer};function byteLength(string,encoding){if(Buffer.isBuffer(string)){return string.length}if(typeof ArrayBuffer!==\"undefined\"&&typeof ArrayBuffer.isView===\"function\"&&(ArrayBuffer.isView(string)||string instanceof ArrayBuffer)){return string.byteLength}if(typeof string!==\"string\"){string=\"\"+string}var len=string.length;if(len===0)return 0;var loweredCase=false;for(;;){switch(encoding){case\"ascii\":case\"latin1\":case\"binary\":return len;case\"utf8\":case\"utf-8\":case undefined:return utf8ToBytes(string).length;case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return len*2;case\"hex\":return len>>>1;case\"base64\":return base64ToBytes(string).length;default:if(loweredCase)return utf8ToBytes(string).length;encoding=(\"\"+encoding).toLowerCase();loweredCase=true}}}Buffer.byteLength=byteLength;function slowToString(encoding,start,end){var loweredCase=false;if(start===undefined||start<0){start=0}if(start>this.length){return\"\"}if(end===undefined||end>this.length){end=this.length}if(end<=0){return\"\"}end>>>=0;start>>>=0;if(end<=start){return\"\"}if(!encoding)encoding=\"utf8\";while(true){switch(encoding){case\"hex\":return hexSlice(this,start,end);case\"utf8\":case\"utf-8\":return utf8Slice(this,start,end);case\"ascii\":return asciiSlice(this,start,end);case\"latin1\":case\"binary\":return latin1Slice(this,start,end);case\"base64\":return base64Slice(this,start,end);case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return utf16leSlice(this,start,end);default:if(loweredCase)throw new TypeError(\"Unknown encoding: \"+encoding);encoding=(encoding+\"\").toLowerCase();loweredCase=true}}}Buffer.prototype._isBuffer=true;function swap(b,n,m){var i=b[n];b[n]=b[m];b[m]=i}Buffer.prototype.swap16=function swap16(){var len=this.length;if(len%2!==0){throw new RangeError(\"Buffer size must be a multiple of 16-bits\")}for(var i=0;i<len;i+=2){swap(this,i,i+1)}return this};Buffer.prototype.swap32=function swap32(){var len=this.length;if(len%4!==0){throw new RangeError(\"Buffer size must be a multiple of 32-bits\")}for(var i=0;i<len;i+=4){swap(this,i,i+3);swap(this,i+1,i+2)}return this};Buffer.prototype.swap64=function swap64(){var len=this.length;if(len%8!==0){throw new RangeError(\"Buffer size must be a multiple of 64-bits\")}for(var i=0;i<len;i+=8){swap(this,i,i+7);swap(this,i+1,i+6);swap(this,i+2,i+5);swap(this,i+3,i+4)}return this};Buffer.prototype.toString=function toString(){var length=this.length|0;if(length===0)return\"\";if(arguments.length===0)return utf8Slice(this,0,length);return slowToString.apply(this,arguments)};Buffer.prototype.equals=function equals(b){if(!Buffer.isBuffer(b))throw new TypeError(\"Argument must be a Buffer\");if(this===b)return true;return Buffer.compare(this,b)===0};Buffer.prototype.inspect=function inspect(){var str=\"\";var max=exports.INSPECT_MAX_BYTES;if(this.length>0){str=this.toString(\"hex\",0,max).match(/.{2}/g).join(\" \");if(this.length>max)str+=\" ... \"}return\"<Buffer \"+str+\">\"};Buffer.prototype.compare=function compare(target,start,end,thisStart,thisEnd){if(!Buffer.isBuffer(target)){throw new TypeError(\"Argument must be a Buffer\")}if(start===undefined){start=0}if(end===undefined){end=target?target.length:0}if(thisStart===undefined){thisStart=0}if(thisEnd===undefined){thisEnd=this.length}if(start<0||end>target.length||thisStart<0||thisEnd>this.length){throw new RangeError(\"out of range index\")}if(thisStart>=thisEnd&&start>=end){return 0}if(thisStart>=thisEnd){return-1}if(start>=end){return 1}start>>>=0;end>>>=0;thisStart>>>=0;thisEnd>>>=0;if(this===target)return 0;var x=thisEnd-thisStart;var y=end-start;var len=Math.min(x,y);var thisCopy=this.slice(thisStart,thisEnd);var targetCopy=target.slice(start,end);for(var i=0;i<len;++i){if(thisCopy[i]!==targetCopy[i]){x=thisCopy[i];y=targetCopy[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};function bidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){if(buffer.length===0)return-1;if(typeof byteOffset===\"string\"){encoding=byteOffset;byteOffset=0}else if(byteOffset>2147483647){byteOffset=2147483647}else if(byteOffset<-2147483648){byteOffset=-2147483648}byteOffset=+byteOffset;if(isNaN(byteOffset)){byteOffset=dir?0:buffer.length-1}if(byteOffset<0)byteOffset=buffer.length+byteOffset;if(byteOffset>=buffer.length){if(dir)return-1;else byteOffset=buffer.length-1}else if(byteOffset<0){if(dir)byteOffset=0;else return-1}if(typeof val===\"string\"){val=Buffer.from(val,encoding)}if(Buffer.isBuffer(val)){if(val.length===0){return-1}return arrayIndexOf(buffer,val,byteOffset,encoding,dir)}else if(typeof val===\"number\"){val=val&255;if(Buffer.TYPED_ARRAY_SUPPORT&&typeof Uint8Array.prototype.indexOf===\"function\"){if(dir){return Uint8Array.prototype.indexOf.call(buffer,val,byteOffset)}else{return Uint8Array.prototype.lastIndexOf.call(buffer,val,byteOffset)}}return arrayIndexOf(buffer,[val],byteOffset,encoding,dir)}throw new TypeError(\"val must be string, number or Buffer\")}function arrayIndexOf(arr,val,byteOffset,encoding,dir){var indexSize=1;var arrLength=arr.length;var valLength=val.length;if(encoding!==undefined){encoding=String(encoding).toLowerCase();if(encoding===\"ucs2\"||encoding===\"ucs-2\"||encoding===\"utf16le\"||encoding===\"utf-16le\"){if(arr.length<2||val.length<2){return-1}indexSize=2;arrLength/=2;valLength/=2;byteOffset/=2}}function read(buf,i){if(indexSize===1){return buf[i]}else{return buf.readUInt16BE(i*indexSize)}}var i;if(dir){var foundIndex=-1;for(i=byteOffset;i<arrLength;i++){if(read(arr,i)===read(val,foundIndex===-1?0:i-foundIndex)){if(foundIndex===-1)foundIndex=i;if(i-foundIndex+1===valLength)return foundIndex*indexSize}else{if(foundIndex!==-1)i-=i-foundIndex;foundIndex=-1}}}else{if(byteOffset+valLength>arrLength)byteOffset=arrLength-valLength;for(i=byteOffset;i>=0;i--){var found=true;for(var j=0;j<valLength;j++){if(read(arr,i+j)!==read(val,j)){found=false;break}}if(found)return i}}return-1}Buffer.prototype.includes=function includes(val,byteOffset,encoding){return this.indexOf(val,byteOffset,encoding)!==-1};Buffer.prototype.indexOf=function indexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,true)};Buffer.prototype.lastIndexOf=function lastIndexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,false)};function hexWrite(buf,string,offset,length){offset=Number(offset)||0;var remaining=buf.length-offset;if(!length){length=remaining}else{length=Number(length);if(length>remaining){length=remaining}}var strLen=string.length;if(strLen%2!==0)throw new TypeError(\"Invalid hex string\");if(length>strLen/2){length=strLen/2}for(var i=0;i<length;++i){var parsed=parseInt(string.substr(i*2,2),16);if(isNaN(parsed))return i;buf[offset+i]=parsed}return i}function utf8Write(buf,string,offset,length){return blitBuffer(utf8ToBytes(string,buf.length-offset),buf,offset,length)}function asciiWrite(buf,string,offset,length){return blitBuffer(asciiToBytes(string),buf,offset,length)}function latin1Write(buf,string,offset,length){return asciiWrite(buf,string,offset,length)}function base64Write(buf,string,offset,length){return blitBuffer(base64ToBytes(string),buf,offset,length)}function ucs2Write(buf,string,offset,length){return blitBuffer(utf16leToBytes(string,buf.length-offset),buf,offset,length)}Buffer.prototype.write=function write(string,offset,length,encoding){if(offset===undefined){encoding=\"utf8\";length=this.length;offset=0}else if(length===undefined&&typeof offset===\"string\"){encoding=offset;length=this.length;offset=0}else if(isFinite(offset)){offset=offset|0;if(isFinite(length)){length=length|0;if(encoding===undefined)encoding=\"utf8\"}else{encoding=length;length=undefined}}else{throw new Error(\"Buffer.write(string, encoding, offset[, length]) is no longer supported\")}var remaining=this.length-offset;if(length===undefined||length>remaining)length=remaining;if(string.length>0&&(length<0||offset<0)||offset>this.length){throw new RangeError(\"Attempt to write outside buffer bounds\")}if(!encoding)encoding=\"utf8\";var loweredCase=false;for(;;){switch(encoding){case\"hex\":return hexWrite(this,string,offset,length);case\"utf8\":case\"utf-8\":return utf8Write(this,string,offset,length);case\"ascii\":return asciiWrite(this,string,offset,length);case\"latin1\":case\"binary\":return latin1Write(this,string,offset,length);case\"base64\":return base64Write(this,string,offset,length);case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return ucs2Write(this,string,offset,length);default:if(loweredCase)throw new TypeError(\"Unknown encoding: \"+encoding);encoding=(\"\"+encoding).toLowerCase();loweredCase=true}}};Buffer.prototype.toJSON=function toJSON(){return{type:\"Buffer\",data:Array.prototype.slice.call(this._arr||this,0)}};function base64Slice(buf,start,end){if(start===0&&end===buf.length){return base64.fromByteArray(buf)}else{return base64.fromByteArray(buf.slice(start,end))}}function utf8Slice(buf,start,end){end=Math.min(buf.length,end);var res=[];var i=start;while(i<end){var firstByte=buf[i];var codePoint=null;var bytesPerSequence=firstByte>239?4:firstByte>223?3:firstByte>191?2:1;if(i+bytesPerSequence<=end){var secondByte,thirdByte,fourthByte,tempCodePoint;switch(bytesPerSequence){case 1:if(firstByte<128){codePoint=firstByte}break;case 2:secondByte=buf[i+1];if((secondByte&192)===128){tempCodePoint=(firstByte&31)<<6|secondByte&63;if(tempCodePoint>127){codePoint=tempCodePoint}}break;case 3:secondByte=buf[i+1];thirdByte=buf[i+2];if((secondByte&192)===128&&(thirdByte&192)===128){tempCodePoint=(firstByte&15)<<12|(secondByte&63)<<6|thirdByte&63;if(tempCodePoint>2047&&(tempCodePoint<55296||tempCodePoint>57343)){codePoint=tempCodePoint}}break;case 4:secondByte=buf[i+1];thirdByte=buf[i+2];fourthByte=buf[i+3];if((secondByte&192)===128&&(thirdByte&192)===128&&(fourthByte&192)===128){tempCodePoint=(firstByte&15)<<18|(secondByte&63)<<12|(thirdByte&63)<<6|fourthByte&63;if(tempCodePoint>65535&&tempCodePoint<1114112){codePoint=tempCodePoint}}}}if(codePoint===null){codePoint=65533;bytesPerSequence=1}else if(codePoint>65535){codePoint-=65536;res.push(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}res.push(codePoint);i+=bytesPerSequence}return decodeCodePointsArray(res)}var MAX_ARGUMENTS_LENGTH=4096;function decodeCodePointsArray(codePoints){var len=codePoints.length;if(len<=MAX_ARGUMENTS_LENGTH){return String.fromCharCode.apply(String,codePoints)}var res=\"\";var i=0;while(i<len){res+=String.fromCharCode.apply(String,codePoints.slice(i,i+=MAX_ARGUMENTS_LENGTH))}return res}function asciiSlice(buf,start,end){var ret=\"\";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i]&127)}return ret}function latin1Slice(buf,start,end){var ret=\"\";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i])}return ret}function hexSlice(buf,start,end){var len=buf.length;if(!start||start<0)start=0;if(!end||end<0||end>len)end=len;var out=\"\";for(var i=start;i<end;++i){out+=toHex(buf[i])}return out}function utf16leSlice(buf,start,end){var bytes=buf.slice(start,end);var res=\"\";for(var i=0;i<bytes.length;i+=2){res+=String.fromCharCode(bytes[i]+bytes[i+1]*256)}return res}Buffer.prototype.slice=function slice(start,end){var len=this.length;start=~~start;end=end===undefined?len:~~end;if(start<0){start+=len;if(start<0)start=0}else if(start>len){start=len}if(end<0){end+=len;if(end<0)end=0}else if(end>len){end=len}if(end<start)end=start;var newBuf;if(Buffer.TYPED_ARRAY_SUPPORT){newBuf=this.subarray(start,end);newBuf.__proto__=Buffer.prototype}else{var sliceLen=end-start;newBuf=new Buffer(sliceLen,undefined);for(var i=0;i<sliceLen;++i){newBuf[i]=this[i+start]}}return newBuf};function checkOffset(offset,ext,length){if(offset%1!==0||offset<0)throw new RangeError(\"offset is not uint\");if(offset+ext>length)throw new RangeError(\"Trying to access beyond buffer length\")}Buffer.prototype.readUIntLE=function readUIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}return val};Buffer.prototype.readUIntBE=function readUIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert){checkOffset(offset,byteLength,this.length)}var val=this[offset+--byteLength];var mul=1;while(byteLength>0&&(mul*=256)){val+=this[offset+--byteLength]*mul}return val};Buffer.prototype.readUInt8=function readUInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);return this[offset]};Buffer.prototype.readUInt16LE=function readUInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]|this[offset+1]<<8};Buffer.prototype.readUInt16BE=function readUInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]<<8|this[offset+1]};Buffer.prototype.readUInt32LE=function readUInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return(this[offset]|this[offset+1]<<8|this[offset+2]<<16)+this[offset+3]*16777216};Buffer.prototype.readUInt32BE=function readUInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]*16777216+(this[offset+1]<<16|this[offset+2]<<8|this[offset+3])};Buffer.prototype.readIntLE=function readIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readIntBE=function readIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);\nvar i=byteLength;var mul=1;var val=this[offset+--i];while(i>0&&(mul*=256)){val+=this[offset+--i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readInt8=function readInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);if(!(this[offset]&128))return this[offset];return(255-this[offset]+1)*-1};Buffer.prototype.readInt16LE=function readInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset]|this[offset+1]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt16BE=function readInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset+1]|this[offset]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt32LE=function readInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]|this[offset+1]<<8|this[offset+2]<<16|this[offset+3]<<24};Buffer.prototype.readInt32BE=function readInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]<<24|this[offset+1]<<16|this[offset+2]<<8|this[offset+3]};Buffer.prototype.readFloatLE=function readFloatLE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,true,23,4)};Buffer.prototype.readFloatBE=function readFloatBE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,false,23,4)};Buffer.prototype.readDoubleLE=function readDoubleLE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,true,52,8)};Buffer.prototype.readDoubleBE=function readDoubleBE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,false,52,8)};function checkInt(buf,value,offset,ext,max,min){if(!Buffer.isBuffer(buf))throw new TypeError('\"buffer\" argument must be a Buffer instance');if(value>max||value<min)throw new RangeError('\"value\" argument is out of bounds');if(offset+ext>buf.length)throw new RangeError(\"Index out of range\")}Buffer.prototype.writeUIntLE=function writeUIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var mul=1;var i=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUIntBE=function writeUIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var i=byteLength-1;var mul=1;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUInt8=function writeUInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,255,0);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);this[offset]=value&255;return offset+1};function objectWriteUInt16(buf,value,offset,littleEndian){if(value<0)value=65535+value+1;for(var i=0,j=Math.min(buf.length-offset,2);i<j;++i){buf[offset+i]=(value&255<<8*(littleEndian?i:1-i))>>>(littleEndian?i:1-i)*8}}Buffer.prototype.writeUInt16LE=function writeUInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeUInt16BE=function writeUInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};function objectWriteUInt32(buf,value,offset,littleEndian){if(value<0)value=4294967295+value+1;for(var i=0,j=Math.min(buf.length-offset,4);i<j;++i){buf[offset+i]=value>>>(littleEndian?i:3-i)*8&255}}Buffer.prototype.writeUInt32LE=function writeUInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset+3]=value>>>24;this[offset+2]=value>>>16;this[offset+1]=value>>>8;this[offset]=value&255}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeUInt32BE=function writeUInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};Buffer.prototype.writeIntLE=function writeIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=0;var mul=1;var sub=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){if(value<0&&sub===0&&this[offset+i-1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeIntBE=function writeIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=byteLength-1;var mul=1;var sub=0;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){if(value<0&&sub===0&&this[offset+i+1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeInt8=function writeInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,127,-128);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);if(value<0)value=255+value+1;this[offset]=value&255;return offset+1};Buffer.prototype.writeInt16LE=function writeInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeInt16BE=function writeInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};Buffer.prototype.writeInt32LE=function writeInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8;this[offset+2]=value>>>16;this[offset+3]=value>>>24}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeInt32BE=function writeInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(value<0)value=4294967295+value+1;if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};function checkIEEE754(buf,value,offset,ext,max,min){if(offset+ext>buf.length)throw new RangeError(\"Index out of range\");if(offset<0)throw new RangeError(\"Index out of range\")}function writeFloat(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,4,3.4028234663852886e38,-3.4028234663852886e38)}ieee754.write(buf,value,offset,littleEndian,23,4);return offset+4}Buffer.prototype.writeFloatLE=function writeFloatLE(value,offset,noAssert){return writeFloat(this,value,offset,true,noAssert)};Buffer.prototype.writeFloatBE=function writeFloatBE(value,offset,noAssert){return writeFloat(this,value,offset,false,noAssert)};function writeDouble(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,8,1.7976931348623157e308,-1.7976931348623157e308)}ieee754.write(buf,value,offset,littleEndian,52,8);return offset+8}Buffer.prototype.writeDoubleLE=function writeDoubleLE(value,offset,noAssert){return writeDouble(this,value,offset,true,noAssert)};Buffer.prototype.writeDoubleBE=function writeDoubleBE(value,offset,noAssert){return writeDouble(this,value,offset,false,noAssert)};Buffer.prototype.copy=function copy(target,targetStart,start,end){if(!start)start=0;if(!end&&end!==0)end=this.length;if(targetStart>=target.length)targetStart=target.length;if(!targetStart)targetStart=0;if(end>0&&end<start)end=start;if(end===start)return 0;if(target.length===0||this.length===0)return 0;if(targetStart<0){throw new RangeError(\"targetStart out of bounds\")}if(start<0||start>=this.length)throw new RangeError(\"sourceStart out of bounds\");if(end<0)throw new RangeError(\"sourceEnd out of bounds\");if(end>this.length)end=this.length;if(target.length-targetStart<end-start){end=target.length-targetStart+start}var len=end-start;var i;if(this===target&&start<targetStart&&targetStart<end){for(i=len-1;i>=0;--i){target[i+targetStart]=this[i+start]}}else if(len<1e3||!Buffer.TYPED_ARRAY_SUPPORT){for(i=0;i<len;++i){target[i+targetStart]=this[i+start]}}else{Uint8Array.prototype.set.call(target,this.subarray(start,start+len),targetStart)}return len};Buffer.prototype.fill=function fill(val,start,end,encoding){if(typeof val===\"string\"){if(typeof start===\"string\"){encoding=start;start=0;end=this.length}else if(typeof end===\"string\"){encoding=end;end=this.length}if(val.length===1){var code=val.charCodeAt(0);if(code<256){val=code}}if(encoding!==undefined&&typeof encoding!==\"string\"){throw new TypeError(\"encoding must be a string\")}if(typeof encoding===\"string\"&&!Buffer.isEncoding(encoding)){throw new TypeError(\"Unknown encoding: \"+encoding)}}else if(typeof val===\"number\"){val=val&255}if(start<0||this.length<start||this.length<end){throw new RangeError(\"Out of range index\")}if(end<=start){return this}start=start>>>0;end=end===undefined?this.length:end>>>0;if(!val)val=0;var i;if(typeof val===\"number\"){for(i=start;i<end;++i){this[i]=val}}else{var bytes=Buffer.isBuffer(val)?val:utf8ToBytes(new Buffer(val,encoding).toString());var len=bytes.length;for(i=0;i<end-start;++i){this[i+start]=bytes[i%len]}}return this};var INVALID_BASE64_RE=/[^+\\/0-9A-Za-z-_]/g;function base64clean(str){str=stringtrim(str).replace(INVALID_BASE64_RE,\"\");if(str.length<2)return\"\";while(str.length%4!==0){str=str+\"=\"}return str}function stringtrim(str){if(str.trim)return str.trim();return str.replace(/^\\s+|\\s+$/g,\"\")}function toHex(n){if(n<16)return\"0\"+n.toString(16);return n.toString(16)}function utf8ToBytes(string,units){units=units||Infinity;var codePoint;var length=string.length;var leadSurrogate=null;var bytes=[];for(var i=0;i<length;++i){codePoint=string.charCodeAt(i);if(codePoint>55295&&codePoint<57344){if(!leadSurrogate){if(codePoint>56319){if((units-=3)>-1)bytes.push(239,191,189);continue}else if(i+1===length){if((units-=3)>-1)bytes.push(239,191,189);continue}leadSurrogate=codePoint;continue}if(codePoint<56320){if((units-=3)>-1)bytes.push(239,191,189);leadSurrogate=codePoint;continue}codePoint=(leadSurrogate-55296<<10|codePoint-56320)+65536}else if(leadSurrogate){if((units-=3)>-1)bytes.push(239,191,189)}leadSurrogate=null;if(codePoint<128){if((units-=1)<0)break;bytes.push(codePoint)}else if(codePoint<2048){if((units-=2)<0)break;bytes.push(codePoint>>6|192,codePoint&63|128)}else if(codePoint<65536){if((units-=3)<0)break;bytes.push(codePoint>>12|224,codePoint>>6&63|128,codePoint&63|128)}else if(codePoint<1114112){if((units-=4)<0)break;bytes.push(codePoint>>18|240,codePoint>>12&63|128,codePoint>>6&63|128,codePoint&63|128)}else{throw new Error(\"Invalid code point\")}}return bytes}function asciiToBytes(str){var byteArray=[];for(var i=0;i<str.length;++i){byteArray.push(str.charCodeAt(i)&255)}return byteArray}function utf16leToBytes(str,units){var c,hi,lo;var byteArray=[];for(var i=0;i<str.length;++i){if((units-=2)<0)break;c=str.charCodeAt(i);hi=c>>8;lo=c%256;byteArray.push(lo);byteArray.push(hi)}return byteArray}function base64ToBytes(str){return base64.toByteArray(base64clean(str))}function blitBuffer(src,dst,offset,length){for(var i=0;i<length;++i){if(i+offset>=dst.length||i>=src.length)break;dst[i+offset]=src[i]}return i}function isnan(val){return val!==val}}).call(this,typeof global!==\"undefined\"?global:typeof self!==\"undefined\"?self:typeof window!==\"undefined\"?window:{})},{\"base64-js\":2,ieee754:37,isarray:40}],6:[function(require,module,exports){(function(Buffer){function isArray(arg){if(Array.isArray){return Array.isArray(arg)}return objectToString(arg)===\"[object Array]\"}exports.isArray=isArray;function isBoolean(arg){return typeof arg===\"boolean\"}exports.isBoolean=isBoolean;function isNull(arg){return arg===null}exports.isNull=isNull;function isNullOrUndefined(arg){return arg==null}exports.isNullOrUndefined=isNullOrUndefined;function isNumber(arg){return typeof arg===\"number\"}exports.isNumber=isNumber;function isString(arg){return typeof arg===\"string\"}exports.isString=isString;function isSymbol(arg){return typeof arg===\"symbol\"}exports.isSymbol=isSymbol;function isUndefined(arg){return arg===void 0}exports.isUndefined=isUndefined;function isRegExp(re){return objectToString(re)===\"[object RegExp]\"}exports.isRegExp=isRegExp;function isObject(arg){return typeof arg===\"object\"&&arg!==null}exports.isObject=isObject;function isDate(d){return objectToString(d)===\"[object Date]\"}exports.isDate=isDate;function isError(e){return objectToString(e)===\"[object Error]\"||e instanceof Error}exports.isError=isError;function isFunction(arg){return typeof arg===\"function\"}exports.isFunction=isFunction;function isPrimitive(arg){return arg===null||typeof arg===\"boolean\"||typeof arg===\"number\"||typeof arg===\"string\"||typeof arg===\"symbol\"||typeof arg===\"undefined\"}exports.isPrimitive=isPrimitive;exports.isBuffer=Buffer.isBuffer;function objectToString(o){return Object.prototype.toString.call(o)}}).call(this,{isBuffer:require(\"../../is-buffer/index.js\")})},{\"../../is-buffer/index.js\":39}],7:[function(require,module,exports){var ElementType=require(\"domelementtype\");var entities=require(\"entities\");var booleanAttributes={__proto__:null,allowfullscreen:true,async:true,autofocus:true,autoplay:true,checked:true,controls:true,default:true,defer:true,disabled:true,hidden:true,ismap:true,loop:true,multiple:true,muted:true,open:true,readonly:true,required:true,reversed:true,scoped:true,seamless:true,selected:true,typemustmatch:true};var unencodedElements={__proto__:null,style:true,script:true,xmp:true,iframe:true,noembed:true,noframes:true,plaintext:true,noscript:true};function formatAttrs(attributes,opts){if(!attributes)return;var output=\"\",value;for(var key in attributes){value=attributes[key];if(output){output+=\" \"}if(!value&&booleanAttributes[key]){output+=key}else{output+=key+'=\"'+(opts.decodeEntities?entities.encodeXML(value):value)+'\"'}}return output}var singleTag={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true};var render=module.exports=function(dom,opts){if(!Array.isArray(dom)&&!dom.cheerio)dom=[dom];opts=opts||{};var output=\"\";for(var i=0;i<dom.length;i++){var elem=dom[i];if(elem.type===\"root\")output+=render(elem.children,opts);else if(ElementType.isTag(elem))output+=renderTag(elem,opts);else if(elem.type===ElementType.Directive)output+=renderDirective(elem);else if(elem.type===ElementType.Comment)output+=renderComment(elem);else if(elem.type===ElementType.CDATA)output+=renderCdata(elem);else output+=renderText(elem,opts)}return output};function renderTag(elem,opts){if(elem.name===\"svg\")opts={decodeEntities:opts.decodeEntities,xmlMode:true};var tag=\"<\"+elem.name,attribs=formatAttrs(elem.attribs,opts);if(attribs){tag+=\" \"+attribs}if(opts.xmlMode&&(!elem.children||elem.children.length===0)){tag+=\"/>\"}else{tag+=\">\";if(elem.children){tag+=render(elem.children,opts)}if(!singleTag[elem.name]||opts.xmlMode){tag+=\"</\"+elem.name+\">\"}}return tag}function renderDirective(elem){return\"<\"+elem.data+\">\"}function renderText(elem,opts){var data=elem.data||\"\";if(opts.decodeEntities&&!(elem.parent&&elem.parent.name in unencodedElements)){data=entities.encodeXML(data)}return data}function renderCdata(elem){return\"<![CDATA[\"+elem.children[0].data+\"]]>\"}function renderComment(elem){return\"<!--\"+elem.data+\"-->\"}},{domelementtype:8,entities:20}],8:[function(require,module,exports){module.exports={Text:\"text\",Directive:\"directive\",Comment:\"comment\",Script:\"script\",Style:\"style\",Tag:\"tag\",CDATA:\"cdata\",isTag:function(elem){return elem.type===\"tag\"||elem.type===\"script\"||elem.type===\"style\"}}},{}],9:[function(require,module,exports){module.exports={Text:\"text\",Directive:\"directive\",Comment:\"comment\",Script:\"script\",Style:\"style\",Tag:\"tag\",CDATA:\"cdata\",Doctype:\"doctype\",isTag:function(elem){return elem.type===\"tag\"||elem.type===\"script\"||elem.type===\"style\"}}},{}],10:[function(require,module,exports){var ElementType=require(\"domelementtype\");var re_whitespace=/\\s+/g;var NodePrototype=require(\"./lib/node\");var ElementPrototype=require(\"./lib/element\");function DomHandler(callback,options,elementCB){if(typeof callback===\"object\"){elementCB=options;options=callback;callback=null}else if(typeof options===\"function\"){elementCB=options;options=defaultOpts}this._callback=callback;this._options=options||defaultOpts;this._elementCB=elementCB;this.dom=[];this._done=false;this._tagStack=[];this._parser=this._parser||null}var defaultOpts={normalizeWhitespace:false,withStartIndices:false};DomHandler.prototype.onparserinit=function(parser){this._parser=parser};DomHandler.prototype.onreset=function(){DomHandler.call(this,this._callback,this._options,this._elementCB)};DomHandler.prototype.onend=function(){if(this._done)return;this._done=true;this._parser=null;this._handleCallback(null)};DomHandler.prototype._handleCallback=DomHandler.prototype.onerror=function(error){if(typeof this._callback===\"function\"){this._callback(error,this.dom)}else{if(error)throw error}};DomHandler.prototype.onclosetag=function(){var elem=this._tagStack.pop();if(this._elementCB)this._elementCB(elem)};DomHandler.prototype._addDomElement=function(element){var parent=this._tagStack[this._tagStack.length-1];var siblings=parent?parent.children:this.dom;var previousSibling=siblings[siblings.length-1];element.next=null;if(this._options.withStartIndices){element.startIndex=this._parser.startIndex}if(this._options.withDomLvl1){element.__proto__=element.type===\"tag\"?ElementPrototype:NodePrototype}if(previousSibling){element.prev=previousSibling;previousSibling.next=element}else{element.prev=null}siblings.push(element);element.parent=parent||null};DomHandler.prototype.onopentag=function(name,attribs){var element={type:name===\"script\"?ElementType.Script:name===\"style\"?ElementType.Style:ElementType.Tag,name:name,attribs:attribs,children:[]};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.ontext=function(data){var normalize=this._options.normalizeWhitespace||this._options.ignoreWhitespace;var lastTag;if(!this._tagStack.length&&this.dom.length&&(lastTag=this.dom[this.dom.length-1]).type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace,\" \")}else{lastTag.data+=data}}else{if(this._tagStack.length&&(lastTag=this._tagStack[this._tagStack.length-1])&&(lastTag=lastTag.children[lastTag.children.length-1])&&lastTag.type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace,\" \")}else{lastTag.data+=data}}else{if(normalize){data=data.replace(re_whitespace,\" \")}this._addDomElement({data:data,type:ElementType.Text})}}};DomHandler.prototype.oncomment=function(data){var lastTag=this._tagStack[this._tagStack.length-1];if(lastTag&&lastTag.type===ElementType.Comment){lastTag.data+=data;return}var element={data:data,type:ElementType.Comment};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncdatastart=function(){var element={children:[{data:\"\",type:ElementType.Text}],type:ElementType.CDATA};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncommentend=DomHandler.prototype.oncdataend=function(){this._tagStack.pop()};DomHandler.prototype.onprocessinginstruction=function(name,data){this._addDomElement({name:name,data:data,type:ElementType.Directive})};module.exports=DomHandler},{\"./lib/element\":11,\"./lib/node\":12,domelementtype:9}],11:[function(require,module,exports){var NodePrototype=require(\"./node\");var ElementPrototype=module.exports=Object.create(NodePrototype);var domLvl1={tagName:\"name\"};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(ElementPrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{\"./node\":12}],12:[function(require,module,exports){var NodePrototype=module.exports={get firstChild(){var children=this.children;return children&&children[0]||null},get lastChild(){var children=this.children;return children&&children[children.length-1]||null},get nodeType(){return nodeTypes[this.type]||nodeTypes.element}};var domLvl1={tagName:\"name\",childNodes:\"children\",parentNode:\"parent\",previousSibling:\"prev\",nextSibling:\"next\",nodeValue:\"data\"};var nodeTypes={element:1,text:3,cdata:4,comment:8};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(NodePrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{}],13:[function(require,module,exports){var DomUtils=module.exports;[require(\"./lib/stringify\"),require(\"./lib/traversal\"),require(\"./lib/manipulation\"),require(\"./lib/querying\"),require(\"./lib/legacy\"),require(\"./lib/helpers\")].forEach(function(ext){Object.keys(ext).forEach(function(key){DomUtils[key]=ext[key].bind(DomUtils)})})},{\"./lib/helpers\":14,\"./lib/legacy\":15,\"./lib/manipulation\":16,\"./lib/querying\":17,\"./lib/stringify\":18,\"./lib/traversal\":19}],14:[function(require,module,exports){exports.removeSubsets=function(nodes){var idx=nodes.length,node,ancestor,replace;while(--idx>-1){node=ancestor=nodes[idx];nodes[idx]=null;replace=true;while(ancestor){if(nodes.indexOf(ancestor)>-1){replace=false;nodes.splice(idx,1);break}ancestor=ancestor.parent}if(replace){nodes[idx]=node}}return nodes};var POSITION={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16};var comparePos=exports.compareDocumentPosition=function(nodeA,nodeB){var aParents=[];var bParents=[];var current,sharedParent,siblings,aSibling,bSibling,idx;if(nodeA===nodeB){return 0}current=nodeA;while(current){aParents.unshift(current);current=current.parent}current=nodeB;while(current){bParents.unshift(current);current=current.parent}idx=0;while(aParents[idx]===bParents[idx]){idx++}if(idx===0){return POSITION.DISCONNECTED}sharedParent=aParents[idx-1];siblings=sharedParent.children;aSibling=aParents[idx];bSibling=bParents[idx];if(siblings.indexOf(aSibling)>siblings.indexOf(bSibling)){if(sharedParent===nodeB){return POSITION.FOLLOWING|POSITION.CONTAINED_BY}return POSITION.FOLLOWING}else{if(sharedParent===nodeA){return POSITION.PRECEDING|POSITION.CONTAINS}return POSITION.PRECEDING}};exports.uniqueSort=function(nodes){var idx=nodes.length,node,position;nodes=nodes.slice();while(--idx>-1){node=nodes[idx];position=nodes.indexOf(node);if(position>-1&&position<idx){nodes.splice(idx,1)}}nodes.sort(function(a,b){var relative=comparePos(a,b);if(relative&POSITION.PRECEDING){return-1}else if(relative&POSITION.FOLLOWING){return 1}return 0});return nodes}},{}],15:[function(require,module,exports){var ElementType=require(\"domelementtype\");var isTag=exports.isTag=ElementType.isTag;exports.testElement=function(options,element){for(var key in options){if(!options.hasOwnProperty(key));else if(key===\"tag_name\"){if(!isTag(element)||!options.tag_name(element.name)){return false}}else if(key===\"tag_type\"){if(!options.tag_type(element.type))return false}else if(key===\"tag_contains\"){if(isTag(element)||!options.tag_contains(element.data)){return false}}else if(!element.attribs||!options[key](element.attribs[key])){return false}}return true};var Checks={tag_name:function(name){if(typeof name===\"function\"){return function(elem){return isTag(elem)&&name(elem.name)}}else if(name===\"*\"){return isTag}else{return function(elem){return isTag(elem)&&elem.name===name}}},tag_type:function(type){if(typeof type===\"function\"){return function(elem){return type(elem.type)}}else{return function(elem){return elem.type===type}}},tag_contains:function(data){if(typeof data===\"function\"){return function(elem){return!isTag(elem)&&data(elem.data)}}else{return function(elem){return!isTag(elem)&&elem.data===data}}}};function getAttribCheck(attrib,value){if(typeof value===\"function\"){return function(elem){return elem.attribs&&value(elem.attribs[attrib])}}else{return function(elem){return elem.attribs&&elem.attribs[attrib]===value}}}function combineFuncs(a,b){return function(elem){return a(elem)||b(elem)}}exports.getElements=function(options,element,recurse,limit){var funcs=Object.keys(options).map(function(key){var value=options[key];return key in Checks?Checks[key](value):getAttribCheck(key,value)});return funcs.length===0?[]:this.filter(funcs.reduce(combineFuncs),element,recurse,limit)};exports.getElementById=function(id,element,recurse){if(!Array.isArray(element))element=[element];return this.findOne(getAttribCheck(\"id\",id),element,recurse!==false)};exports.getElementsByTagName=function(name,element,recurse,limit){return this.filter(Checks.tag_name(name),element,recurse,limit)};exports.getElementsByTagType=function(type,element,recurse,limit){return this.filter(Checks.tag_type(type),element,recurse,limit)}},{domelementtype:9}],16:[function(require,module,exports){exports.removeElement=function(elem){if(elem.prev)elem.prev.next=elem.next;if(elem.next)elem.next.prev=elem.prev;if(elem.parent){var childs=elem.parent.children;childs.splice(childs.lastIndexOf(elem),1)}};exports.replaceElement=function(elem,replacement){var prev=replacement.prev=elem.prev;if(prev){prev.next=replacement}var next=replacement.next=elem.next;if(next){next.prev=replacement}var parent=replacement.parent=elem.parent;if(parent){var childs=parent.children;childs[childs.lastIndexOf(elem)]=replacement}};exports.appendChild=function(elem,child){child.parent=elem;if(elem.children.push(child)!==1){var sibling=elem.children[elem.children.length-2];sibling.next=child;child.prev=sibling;child.next=null}};exports.append=function(elem,next){var parent=elem.parent,currNext=elem.next;next.next=currNext;next.prev=elem;elem.next=next;next.parent=parent;if(currNext){currNext.prev=next;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(currNext),0,next)}}else if(parent){parent.children.push(next)}};exports.prepend=function(elem,prev){var parent=elem.parent;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(elem),0,prev)}if(elem.prev){elem.prev.next=prev}prev.parent=parent;prev.prev=elem.prev;prev.next=elem;elem.prev=prev}},{}],17:[function(require,module,exports){var isTag=require(\"domelementtype\").isTag;module.exports={filter:filter,find:find,findOneChild:findOneChild,findOne:findOne,existsOne:existsOne,findAll:findAll};function filter(test,element,recurse,limit){if(!Array.isArray(element))element=[element];if(typeof limit!==\"number\"||!isFinite(limit)){limit=Infinity}return find(test,element,recurse!==false,limit)}function find(test,elems,recurse,limit){var result=[],childs;for(var i=0,j=elems.length;i<j;i++){if(test(elems[i])){result.push(elems[i]);if(--limit<=0)break}childs=elems[i].children;if(recurse&&childs&&childs.length>0){childs=find(test,childs,recurse,limit);result=result.concat(childs);limit-=childs.length;if(limit<=0)break}}return result}function findOneChild(test,elems){for(var i=0,l=elems.length;i<l;i++){if(test(elems[i]))return elems[i]}return null}function findOne(test,elems){var elem=null;for(var i=0,l=elems.length;i<l&&!elem;i++){if(!isTag(elems[i])){continue}else if(test(elems[i])){elem=elems[i]}else if(elems[i].children.length>0){elem=findOne(test,elems[i].children)}}return elem}function existsOne(test,elems){for(var i=0,l=elems.length;i<l;i++){if(isTag(elems[i])&&(test(elems[i])||elems[i].children.length>0&&existsOne(test,elems[i].children))){return true}}return false}function findAll(test,elems){var result=[];for(var i=0,j=elems.length;i<j;i++){if(!isTag(elems[i]))continue;if(test(elems[i]))result.push(elems[i]);if(elems[i].children.length>0){result=result.concat(findAll(test,elems[i].children))}}return result}},{domelementtype:9}],18:[function(require,module,exports){var ElementType=require(\"domelementtype\"),getOuterHTML=require(\"dom-serializer\"),isTag=ElementType.isTag;module.exports={getInnerHTML:getInnerHTML,getOuterHTML:getOuterHTML,getText:getText};function getInnerHTML(elem,opts){return elem.children?elem.children.map(function(elem){return getOuterHTML(elem,opts)}).join(\"\"):\"\"}function getText(elem){if(Array.isArray(elem))return elem.map(getText).join(\"\");if(isTag(elem)||elem.type===ElementType.CDATA)return getText(elem.children);if(elem.type===ElementType.Text)return elem.data;return\"\"}},{\"dom-serializer\":7,domelementtype:9}],19:[function(require,module,exports){var getChildren=exports.getChildren=function(elem){return elem.children};var getParent=exports.getParent=function(elem){return elem.parent};exports.getSiblings=function(elem){var parent=getParent(elem);return parent?getChildren(parent):[elem]};exports.getAttributeValue=function(elem,name){return elem.attribs&&elem.attribs[name]};exports.hasAttrib=function(elem,name){return!!elem.attribs&&hasOwnProperty.call(elem.attribs,name)};exports.getName=function(elem){return elem.name}},{}],20:[function(require,module,exports){var encode=require(\"./lib/encode.js\"),decode=require(\"./lib/decode.js\");exports.decode=function(data,level){return(!level||level<=0?decode.XML:decode.HTML)(data)};exports.decodeStrict=function(data,level){return(!level||level<=0?decode.XML:decode.HTMLStrict)(data)};exports.encode=function(data,level){return(!level||level<=0?encode.XML:encode.HTML)(data)};exports.encodeXML=encode.XML;exports.encodeHTML4=exports.encodeHTML5=exports.encodeHTML=encode.HTML;exports.decodeXML=exports.decodeXMLStrict=decode.XML;exports.decodeHTML4=exports.decodeHTML5=exports.decodeHTML=decode.HTML;exports.decodeHTML4Strict=exports.decodeHTML5Strict=exports.decodeHTMLStrict=decode.HTMLStrict;exports.escape=encode.escape},{\"./lib/decode.js\":21,\"./lib/encode.js\":23}],21:[function(require,module,exports){var entityMap=require(\"../maps/entities.json\"),legacyMap=require(\"../maps/legacy.json\"),xmlMap=require(\"../maps/xml.json\"),decodeCodePoint=require(\"./decode_codepoint.js\");var decodeXMLStrict=getStrictDecoder(xmlMap),decodeHTMLStrict=getStrictDecoder(entityMap);function getStrictDecoder(map){var keys=Object.keys(map).join(\"|\"),replace=getReplacer(map);keys+=\"|#[xX][\\\\da-fA-F]+|#\\\\d+\";var re=new RegExp(\"&(?:\"+keys+\");\",\"g\");return function(str){return String(str).replace(re,replace)}}var decodeHTML=function(){var legacy=Object.keys(legacyMap).sort(sorter);var keys=Object.keys(entityMap).sort(sorter);for(var i=0,j=0;i<keys.length;i++){if(legacy[j]===keys[i]){keys[i]+=\";?\";j++}else{keys[i]+=\";\"}}var re=new RegExp(\"&(?:\"+keys.join(\"|\")+\"|#[xX][\\\\da-fA-F]+;?|#\\\\d+;?)\",\"g\"),replace=getReplacer(entityMap);function replacer(str){if(str.substr(-1)!==\";\")str+=\";\";return replace(str)}return function(str){return String(str).replace(re,replacer)}}();function sorter(a,b){return a<b?1:-1}function getReplacer(map){return function replace(str){if(str.charAt(1)===\"#\"){if(str.charAt(2)===\"X\"||str.charAt(2)===\"x\"){return decodeCodePoint(parseInt(str.substr(3),16))}return decodeCodePoint(parseInt(str.substr(2),10))}return map[str.slice(1,-1)];\n}}module.exports={XML:decodeXMLStrict,HTML:decodeHTML,HTMLStrict:decodeHTMLStrict}},{\"../maps/entities.json\":25,\"../maps/legacy.json\":26,\"../maps/xml.json\":27,\"./decode_codepoint.js\":22}],22:[function(require,module,exports){var decodeMap=require(\"../maps/decode.json\");module.exports=decodeCodePoint;function decodeCodePoint(codePoint){if(codePoint>=55296&&codePoint<=57343||codePoint>1114111){return\"�\"}if(codePoint in decodeMap){codePoint=decodeMap[codePoint]}var output=\"\";if(codePoint>65535){codePoint-=65536;output+=String.fromCharCode(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}output+=String.fromCharCode(codePoint);return output}},{\"../maps/decode.json\":24}],23:[function(require,module,exports){var inverseXML=getInverseObj(require(\"../maps/xml.json\")),xmlReplacer=getInverseReplacer(inverseXML);exports.XML=getInverse(inverseXML,xmlReplacer);var inverseHTML=getInverseObj(require(\"../maps/entities.json\")),htmlReplacer=getInverseReplacer(inverseHTML);exports.HTML=getInverse(inverseHTML,htmlReplacer);function getInverseObj(obj){return Object.keys(obj).sort().reduce(function(inverse,name){inverse[obj[name]]=\"&\"+name+\";\";return inverse},{})}function getInverseReplacer(inverse){var single=[],multiple=[];Object.keys(inverse).forEach(function(k){if(k.length===1){single.push(\"\\\\\"+k)}else{multiple.push(k)}});multiple.unshift(\"[\"+single.join(\"\")+\"]\");return new RegExp(multiple.join(\"|\"),\"g\")}var re_nonASCII=/[^\\0-\\x7F]/g,re_astralSymbols=/[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]/g;function singleCharReplacer(c){return\"&#x\"+c.charCodeAt(0).toString(16).toUpperCase()+\";\"}function astralReplacer(c){var high=c.charCodeAt(0);var low=c.charCodeAt(1);var codePoint=(high-55296)*1024+low-56320+65536;return\"&#x\"+codePoint.toString(16).toUpperCase()+\";\"}function getInverse(inverse,re){function func(name){return inverse[name]}return function(data){return data.replace(re,func).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}}var re_xmlChars=getInverseReplacer(inverseXML);function escapeXML(data){return data.replace(re_xmlChars,singleCharReplacer).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}exports.escape=escapeXML},{\"../maps/entities.json\":25,\"../maps/xml.json\":27}],24:[function(require,module,exports){module.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},{}],25:[function(require,module,exports){module.exports={Aacute:\"Á\",aacute:\"á\",Abreve:\"Ă\",abreve:\"ă\",ac:\"∾\",acd:\"∿\",acE:\"∾̳\",Acirc:\"Â\",acirc:\"â\",acute:\"´\",Acy:\"А\",acy:\"а\",AElig:\"Æ\",aelig:\"æ\",af:\"⁡\",Afr:\"𝔄\",afr:\"𝔞\",Agrave:\"À\",agrave:\"à\",alefsym:\"ℵ\",aleph:\"ℵ\",Alpha:\"Α\",alpha:\"α\",Amacr:\"Ā\",amacr:\"ā\",amalg:\"⨿\",amp:\"&\",AMP:\"&\",andand:\"⩕\",And:\"⩓\",and:\"∧\",andd:\"⩜\",andslope:\"⩘\",andv:\"⩚\",ang:\"∠\",ange:\"⦤\",angle:\"∠\",angmsdaa:\"⦨\",angmsdab:\"⦩\",angmsdac:\"⦪\",angmsdad:\"⦫\",angmsdae:\"⦬\",angmsdaf:\"⦭\",angmsdag:\"⦮\",angmsdah:\"⦯\",angmsd:\"∡\",angrt:\"∟\",angrtvb:\"⊾\",angrtvbd:\"⦝\",angsph:\"∢\",angst:\"Å\",angzarr:\"⍼\",Aogon:\"Ą\",aogon:\"ą\",Aopf:\"𝔸\",aopf:\"𝕒\",apacir:\"⩯\",ap:\"≈\",apE:\"⩰\",ape:\"≊\",apid:\"≋\",apos:\"'\",ApplyFunction:\"⁡\",approx:\"≈\",approxeq:\"≊\",Aring:\"Å\",aring:\"å\",Ascr:\"𝒜\",ascr:\"𝒶\",Assign:\"≔\",ast:\"*\",asymp:\"≈\",asympeq:\"≍\",Atilde:\"Ã\",atilde:\"ã\",Auml:\"Ä\",auml:\"ä\",awconint:\"∳\",awint:\"⨑\",backcong:\"≌\",backepsilon:\"϶\",backprime:\"‵\",backsim:\"∽\",backsimeq:\"⋍\",Backslash:\"∖\",Barv:\"⫧\",barvee:\"⊽\",barwed:\"⌅\",Barwed:\"⌆\",barwedge:\"⌅\",bbrk:\"⎵\",bbrktbrk:\"⎶\",bcong:\"≌\",Bcy:\"Б\",bcy:\"б\",bdquo:\"„\",becaus:\"∵\",because:\"∵\",Because:\"∵\",bemptyv:\"⦰\",bepsi:\"϶\",bernou:\"ℬ\",Bernoullis:\"ℬ\",Beta:\"Β\",beta:\"β\",beth:\"ℶ\",between:\"≬\",Bfr:\"𝔅\",bfr:\"𝔟\",bigcap:\"⋂\",bigcirc:\"◯\",bigcup:\"⋃\",bigodot:\"⨀\",bigoplus:\"⨁\",bigotimes:\"⨂\",bigsqcup:\"⨆\",bigstar:\"★\",bigtriangledown:\"▽\",bigtriangleup:\"△\",biguplus:\"⨄\",bigvee:\"⋁\",bigwedge:\"⋀\",bkarow:\"⤍\",blacklozenge:\"⧫\",blacksquare:\"▪\",blacktriangle:\"▴\",blacktriangledown:\"▾\",blacktriangleleft:\"◂\",blacktriangleright:\"▸\",blank:\"␣\",blk12:\"▒\",blk14:\"░\",blk34:\"▓\",block:\"█\",bne:\"=⃥\",bnequiv:\"≡⃥\",bNot:\"⫭\",bnot:\"⌐\",Bopf:\"𝔹\",bopf:\"𝕓\",bot:\"⊥\",bottom:\"⊥\",bowtie:\"⋈\",boxbox:\"⧉\",boxdl:\"┐\",boxdL:\"╕\",boxDl:\"╖\",boxDL:\"╗\",boxdr:\"┌\",boxdR:\"╒\",boxDr:\"╓\",boxDR:\"╔\",boxh:\"─\",boxH:\"═\",boxhd:\"┬\",boxHd:\"╤\",boxhD:\"╥\",boxHD:\"╦\",boxhu:\"┴\",boxHu:\"╧\",boxhU:\"╨\",boxHU:\"╩\",boxminus:\"⊟\",boxplus:\"⊞\",boxtimes:\"⊠\",boxul:\"┘\",boxuL:\"╛\",boxUl:\"╜\",boxUL:\"╝\",boxur:\"└\",boxuR:\"╘\",boxUr:\"╙\",boxUR:\"╚\",boxv:\"│\",boxV:\"║\",boxvh:\"┼\",boxvH:\"╪\",boxVh:\"╫\",boxVH:\"╬\",boxvl:\"┤\",boxvL:\"╡\",boxVl:\"╢\",boxVL:\"╣\",boxvr:\"├\",boxvR:\"╞\",boxVr:\"╟\",boxVR:\"╠\",bprime:\"‵\",breve:\"˘\",Breve:\"˘\",brvbar:\"¦\",bscr:\"𝒷\",Bscr:\"ℬ\",bsemi:\"⁏\",bsim:\"∽\",bsime:\"⋍\",bsolb:\"⧅\",bsol:\"\\\\\",bsolhsub:\"⟈\",bull:\"•\",bullet:\"•\",bump:\"≎\",bumpE:\"⪮\",bumpe:\"≏\",Bumpeq:\"≎\",bumpeq:\"≏\",Cacute:\"Ć\",cacute:\"ć\",capand:\"⩄\",capbrcup:\"⩉\",capcap:\"⩋\",cap:\"∩\",Cap:\"⋒\",capcup:\"⩇\",capdot:\"⩀\",CapitalDifferentialD:\"ⅅ\",caps:\"∩︀\",caret:\"⁁\",caron:\"ˇ\",Cayleys:\"ℭ\",ccaps:\"⩍\",Ccaron:\"Č\",ccaron:\"č\",Ccedil:\"Ç\",ccedil:\"ç\",Ccirc:\"Ĉ\",ccirc:\"ĉ\",Cconint:\"∰\",ccups:\"⩌\",ccupssm:\"⩐\",Cdot:\"Ċ\",cdot:\"ċ\",cedil:\"¸\",Cedilla:\"¸\",cemptyv:\"⦲\",cent:\"¢\",centerdot:\"·\",CenterDot:\"·\",cfr:\"𝔠\",Cfr:\"ℭ\",CHcy:\"Ч\",chcy:\"ч\",check:\"✓\",checkmark:\"✓\",Chi:\"Χ\",chi:\"χ\",circ:\"ˆ\",circeq:\"≗\",circlearrowleft:\"↺\",circlearrowright:\"↻\",circledast:\"⊛\",circledcirc:\"⊚\",circleddash:\"⊝\",CircleDot:\"⊙\",circledR:\"®\",circledS:\"Ⓢ\",CircleMinus:\"⊖\",CirclePlus:\"⊕\",CircleTimes:\"⊗\",cir:\"○\",cirE:\"⧃\",cire:\"≗\",cirfnint:\"⨐\",cirmid:\"⫯\",cirscir:\"⧂\",ClockwiseContourIntegral:\"∲\",CloseCurlyDoubleQuote:\"”\",CloseCurlyQuote:\"’\",clubs:\"♣\",clubsuit:\"♣\",colon:\":\",Colon:\"∷\",Colone:\"⩴\",colone:\"≔\",coloneq:\"≔\",comma:\",\",commat:\"@\",comp:\"∁\",compfn:\"∘\",complement:\"∁\",complexes:\"ℂ\",cong:\"≅\",congdot:\"⩭\",Congruent:\"≡\",conint:\"∮\",Conint:\"∯\",ContourIntegral:\"∮\",copf:\"𝕔\",Copf:\"ℂ\",coprod:\"∐\",Coproduct:\"∐\",copy:\"©\",COPY:\"©\",copysr:\"℗\",CounterClockwiseContourIntegral:\"∳\",crarr:\"↵\",cross:\"✗\",Cross:\"⨯\",Cscr:\"𝒞\",cscr:\"𝒸\",csub:\"⫏\",csube:\"⫑\",csup:\"⫐\",csupe:\"⫒\",ctdot:\"⋯\",cudarrl:\"⤸\",cudarrr:\"⤵\",cuepr:\"⋞\",cuesc:\"⋟\",cularr:\"↶\",cularrp:\"⤽\",cupbrcap:\"⩈\",cupcap:\"⩆\",CupCap:\"≍\",cup:\"∪\",Cup:\"⋓\",cupcup:\"⩊\",cupdot:\"⊍\",cupor:\"⩅\",cups:\"∪︀\",curarr:\"↷\",curarrm:\"⤼\",curlyeqprec:\"⋞\",curlyeqsucc:\"⋟\",curlyvee:\"⋎\",curlywedge:\"⋏\",curren:\"¤\",curvearrowleft:\"↶\",curvearrowright:\"↷\",cuvee:\"⋎\",cuwed:\"⋏\",cwconint:\"∲\",cwint:\"∱\",cylcty:\"⌭\",dagger:\"†\",Dagger:\"‡\",daleth:\"ℸ\",darr:\"↓\",Darr:\"↡\",dArr:\"⇓\",dash:\"‐\",Dashv:\"⫤\",dashv:\"⊣\",dbkarow:\"⤏\",dblac:\"˝\",Dcaron:\"Ď\",dcaron:\"ď\",Dcy:\"Д\",dcy:\"д\",ddagger:\"‡\",ddarr:\"⇊\",DD:\"ⅅ\",dd:\"ⅆ\",DDotrahd:\"⤑\",ddotseq:\"⩷\",deg:\"°\",Del:\"∇\",Delta:\"Δ\",delta:\"δ\",demptyv:\"⦱\",dfisht:\"⥿\",Dfr:\"𝔇\",dfr:\"𝔡\",dHar:\"⥥\",dharl:\"⇃\",dharr:\"⇂\",DiacriticalAcute:\"´\",DiacriticalDot:\"˙\",DiacriticalDoubleAcute:\"˝\",DiacriticalGrave:\"`\",DiacriticalTilde:\"˜\",diam:\"⋄\",diamond:\"⋄\",Diamond:\"⋄\",diamondsuit:\"♦\",diams:\"♦\",die:\"¨\",DifferentialD:\"ⅆ\",digamma:\"ϝ\",disin:\"⋲\",div:\"÷\",divide:\"÷\",divideontimes:\"⋇\",divonx:\"⋇\",DJcy:\"Ђ\",djcy:\"ђ\",dlcorn:\"⌞\",dlcrop:\"⌍\",dollar:\"$\",Dopf:\"𝔻\",dopf:\"𝕕\",Dot:\"¨\",dot:\"˙\",DotDot:\"⃜\",doteq:\"≐\",doteqdot:\"≑\",DotEqual:\"≐\",dotminus:\"∸\",dotplus:\"∔\",dotsquare:\"⊡\",doublebarwedge:\"⌆\",DoubleContourIntegral:\"∯\",DoubleDot:\"¨\",DoubleDownArrow:\"⇓\",DoubleLeftArrow:\"⇐\",DoubleLeftRightArrow:\"⇔\",DoubleLeftTee:\"⫤\",DoubleLongLeftArrow:\"⟸\",DoubleLongLeftRightArrow:\"⟺\",DoubleLongRightArrow:\"⟹\",DoubleRightArrow:\"⇒\",DoubleRightTee:\"⊨\",DoubleUpArrow:\"⇑\",DoubleUpDownArrow:\"⇕\",DoubleVerticalBar:\"∥\",DownArrowBar:\"⤓\",downarrow:\"↓\",DownArrow:\"↓\",Downarrow:\"⇓\",DownArrowUpArrow:\"⇵\",DownBreve:\"̑\",downdownarrows:\"⇊\",downharpoonleft:\"⇃\",downharpoonright:\"⇂\",DownLeftRightVector:\"⥐\",DownLeftTeeVector:\"⥞\",DownLeftVectorBar:\"⥖\",DownLeftVector:\"↽\",DownRightTeeVector:\"⥟\",DownRightVectorBar:\"⥗\",DownRightVector:\"⇁\",DownTeeArrow:\"↧\",DownTee:\"⊤\",drbkarow:\"⤐\",drcorn:\"⌟\",drcrop:\"⌌\",Dscr:\"𝒟\",dscr:\"𝒹\",DScy:\"Ѕ\",dscy:\"ѕ\",dsol:\"⧶\",Dstrok:\"Đ\",dstrok:\"đ\",dtdot:\"⋱\",dtri:\"▿\",dtrif:\"▾\",duarr:\"⇵\",duhar:\"⥯\",dwangle:\"⦦\",DZcy:\"Џ\",dzcy:\"џ\",dzigrarr:\"⟿\",Eacute:\"É\",eacute:\"é\",easter:\"⩮\",Ecaron:\"Ě\",ecaron:\"ě\",Ecirc:\"Ê\",ecirc:\"ê\",ecir:\"≖\",ecolon:\"≕\",Ecy:\"Э\",ecy:\"э\",eDDot:\"⩷\",Edot:\"Ė\",edot:\"ė\",eDot:\"≑\",ee:\"ⅇ\",efDot:\"≒\",Efr:\"𝔈\",efr:\"𝔢\",eg:\"⪚\",Egrave:\"È\",egrave:\"è\",egs:\"⪖\",egsdot:\"⪘\",el:\"⪙\",Element:\"∈\",elinters:\"⏧\",ell:\"ℓ\",els:\"⪕\",elsdot:\"⪗\",Emacr:\"Ē\",emacr:\"ē\",empty:\"∅\",emptyset:\"∅\",EmptySmallSquare:\"◻\",emptyv:\"∅\",EmptyVerySmallSquare:\"▫\",emsp13:\" \",emsp14:\" \",emsp:\" \",ENG:\"Ŋ\",eng:\"ŋ\",ensp:\" \",Eogon:\"Ę\",eogon:\"ę\",Eopf:\"𝔼\",eopf:\"𝕖\",epar:\"⋕\",eparsl:\"⧣\",eplus:\"⩱\",epsi:\"ε\",Epsilon:\"Ε\",epsilon:\"ε\",epsiv:\"ϵ\",eqcirc:\"≖\",eqcolon:\"≕\",eqsim:\"≂\",eqslantgtr:\"⪖\",eqslantless:\"⪕\",Equal:\"⩵\",equals:\"=\",EqualTilde:\"≂\",equest:\"≟\",Equilibrium:\"⇌\",equiv:\"≡\",equivDD:\"⩸\",eqvparsl:\"⧥\",erarr:\"⥱\",erDot:\"≓\",escr:\"ℯ\",Escr:\"ℰ\",esdot:\"≐\",Esim:\"⩳\",esim:\"≂\",Eta:\"Η\",eta:\"η\",ETH:\"Ð\",eth:\"ð\",Euml:\"Ë\",euml:\"ë\",euro:\"€\",excl:\"!\",exist:\"∃\",Exists:\"∃\",expectation:\"ℰ\",exponentiale:\"ⅇ\",ExponentialE:\"ⅇ\",fallingdotseq:\"≒\",Fcy:\"Ф\",fcy:\"ф\",female:\"♀\",ffilig:\"ﬃ\",fflig:\"ﬀ\",ffllig:\"ﬄ\",Ffr:\"𝔉\",ffr:\"𝔣\",filig:\"ﬁ\",FilledSmallSquare:\"◼\",FilledVerySmallSquare:\"▪\",fjlig:\"fj\",flat:\"♭\",fllig:\"ﬂ\",fltns:\"▱\",fnof:\"ƒ\",Fopf:\"𝔽\",fopf:\"𝕗\",forall:\"∀\",ForAll:\"∀\",fork:\"⋔\",forkv:\"⫙\",Fouriertrf:\"ℱ\",fpartint:\"⨍\",frac12:\"½\",frac13:\"⅓\",frac14:\"¼\",frac15:\"⅕\",frac16:\"⅙\",frac18:\"⅛\",frac23:\"⅔\",frac25:\"⅖\",frac34:\"¾\",frac35:\"⅗\",frac38:\"⅜\",frac45:\"⅘\",frac56:\"⅚\",frac58:\"⅝\",frac78:\"⅞\",frasl:\"⁄\",frown:\"⌢\",fscr:\"𝒻\",Fscr:\"ℱ\",gacute:\"ǵ\",Gamma:\"Γ\",gamma:\"γ\",Gammad:\"Ϝ\",gammad:\"ϝ\",gap:\"⪆\",Gbreve:\"Ğ\",gbreve:\"ğ\",Gcedil:\"Ģ\",Gcirc:\"Ĝ\",gcirc:\"ĝ\",Gcy:\"Г\",gcy:\"г\",Gdot:\"Ġ\",gdot:\"ġ\",ge:\"≥\",gE:\"≧\",gEl:\"⪌\",gel:\"⋛\",geq:\"≥\",geqq:\"≧\",geqslant:\"⩾\",gescc:\"⪩\",ges:\"⩾\",gesdot:\"⪀\",gesdoto:\"⪂\",gesdotol:\"⪄\",gesl:\"⋛︀\",gesles:\"⪔\",Gfr:\"𝔊\",gfr:\"𝔤\",gg:\"≫\",Gg:\"⋙\",ggg:\"⋙\",gimel:\"ℷ\",GJcy:\"Ѓ\",gjcy:\"ѓ\",gla:\"⪥\",gl:\"≷\",glE:\"⪒\",glj:\"⪤\",gnap:\"⪊\",gnapprox:\"⪊\",gne:\"⪈\",gnE:\"≩\",gneq:\"⪈\",gneqq:\"≩\",gnsim:\"⋧\",Gopf:\"𝔾\",gopf:\"𝕘\",grave:\"`\",GreaterEqual:\"≥\",GreaterEqualLess:\"⋛\",GreaterFullEqual:\"≧\",GreaterGreater:\"⪢\",GreaterLess:\"≷\",GreaterSlantEqual:\"⩾\",GreaterTilde:\"≳\",Gscr:\"𝒢\",gscr:\"ℊ\",gsim:\"≳\",gsime:\"⪎\",gsiml:\"⪐\",gtcc:\"⪧\",gtcir:\"⩺\",gt:\">\",GT:\">\",Gt:\"≫\",gtdot:\"⋗\",gtlPar:\"⦕\",gtquest:\"⩼\",gtrapprox:\"⪆\",gtrarr:\"⥸\",gtrdot:\"⋗\",gtreqless:\"⋛\",gtreqqless:\"⪌\",gtrless:\"≷\",gtrsim:\"≳\",gvertneqq:\"≩︀\",gvnE:\"≩︀\",Hacek:\"ˇ\",hairsp:\" \",half:\"½\",hamilt:\"ℋ\",HARDcy:\"Ъ\",hardcy:\"ъ\",harrcir:\"⥈\",harr:\"↔\",hArr:\"⇔\",harrw:\"↭\",Hat:\"^\",hbar:\"ℏ\",Hcirc:\"Ĥ\",hcirc:\"ĥ\",hearts:\"♥\",heartsuit:\"♥\",hellip:\"…\",hercon:\"⊹\",hfr:\"𝔥\",Hfr:\"ℌ\",HilbertSpace:\"ℋ\",hksearow:\"⤥\",hkswarow:\"⤦\",hoarr:\"⇿\",homtht:\"∻\",hookleftarrow:\"↩\",hookrightarrow:\"↪\",hopf:\"𝕙\",Hopf:\"ℍ\",horbar:\"―\",HorizontalLine:\"─\",hscr:\"𝒽\",Hscr:\"ℋ\",hslash:\"ℏ\",Hstrok:\"Ħ\",hstrok:\"ħ\",HumpDownHump:\"≎\",HumpEqual:\"≏\",hybull:\"⁃\",hyphen:\"‐\",Iacute:\"Í\",iacute:\"í\",ic:\"⁣\",Icirc:\"Î\",icirc:\"î\",Icy:\"И\",icy:\"и\",Idot:\"İ\",IEcy:\"Е\",iecy:\"е\",iexcl:\"¡\",iff:\"⇔\",ifr:\"𝔦\",Ifr:\"ℑ\",Igrave:\"Ì\",igrave:\"ì\",ii:\"ⅈ\",iiiint:\"⨌\",iiint:\"∭\",iinfin:\"⧜\",iiota:\"℩\",IJlig:\"Ĳ\",ijlig:\"ĳ\",Imacr:\"Ī\",imacr:\"ī\",image:\"ℑ\",ImaginaryI:\"ⅈ\",imagline:\"ℐ\",imagpart:\"ℑ\",imath:\"ı\",Im:\"ℑ\",imof:\"⊷\",imped:\"Ƶ\",Implies:\"⇒\",incare:\"℅\",in:\"∈\",infin:\"∞\",infintie:\"⧝\",inodot:\"ı\",intcal:\"⊺\",int:\"∫\",Int:\"∬\",integers:\"ℤ\",Integral:\"∫\",intercal:\"⊺\",Intersection:\"⋂\",intlarhk:\"⨗\",intprod:\"⨼\",InvisibleComma:\"⁣\",InvisibleTimes:\"⁢\",IOcy:\"Ё\",iocy:\"ё\",Iogon:\"Į\",iogon:\"į\",Iopf:\"𝕀\",iopf:\"𝕚\",Iota:\"Ι\",iota:\"ι\",iprod:\"⨼\",iquest:\"¿\",iscr:\"𝒾\",Iscr:\"ℐ\",isin:\"∈\",isindot:\"⋵\",isinE:\"⋹\",isins:\"⋴\",isinsv:\"⋳\",isinv:\"∈\",it:\"⁢\",Itilde:\"Ĩ\",itilde:\"ĩ\",Iukcy:\"І\",iukcy:\"і\",Iuml:\"Ï\",iuml:\"ï\",Jcirc:\"Ĵ\",jcirc:\"ĵ\",Jcy:\"Й\",jcy:\"й\",Jfr:\"𝔍\",jfr:\"𝔧\",jmath:\"ȷ\",Jopf:\"𝕁\",jopf:\"𝕛\",Jscr:\"𝒥\",jscr:\"𝒿\",Jsercy:\"Ј\",jsercy:\"ј\",Jukcy:\"Є\",jukcy:\"є\",Kappa:\"Κ\",kappa:\"κ\",kappav:\"ϰ\",Kcedil:\"Ķ\",kcedil:\"ķ\",Kcy:\"К\",kcy:\"к\",Kfr:\"𝔎\",kfr:\"𝔨\",kgreen:\"ĸ\",KHcy:\"Х\",khcy:\"х\",KJcy:\"Ќ\",kjcy:\"ќ\",Kopf:\"𝕂\",kopf:\"𝕜\",Kscr:\"𝒦\",kscr:\"𝓀\",lAarr:\"⇚\",Lacute:\"Ĺ\",lacute:\"ĺ\",laemptyv:\"⦴\",lagran:\"ℒ\",Lambda:\"Λ\",lambda:\"λ\",lang:\"⟨\",Lang:\"⟪\",langd:\"⦑\",langle:\"⟨\",lap:\"⪅\",Laplacetrf:\"ℒ\",laquo:\"«\",larrb:\"⇤\",larrbfs:\"⤟\",larr:\"←\",Larr:\"↞\",lArr:\"⇐\",larrfs:\"⤝\",larrhk:\"↩\",larrlp:\"↫\",larrpl:\"⤹\",larrsim:\"⥳\",larrtl:\"↢\",latail:\"⤙\",lAtail:\"⤛\",lat:\"⪫\",late:\"⪭\",lates:\"⪭︀\",lbarr:\"⤌\",lBarr:\"⤎\",lbbrk:\"❲\",lbrace:\"{\",lbrack:\"[\",lbrke:\"⦋\",lbrksld:\"⦏\",lbrkslu:\"⦍\",Lcaron:\"Ľ\",lcaron:\"ľ\",Lcedil:\"Ļ\",lcedil:\"ļ\",lceil:\"⌈\",lcub:\"{\",Lcy:\"Л\",lcy:\"л\",ldca:\"⤶\",ldquo:\"“\",ldquor:\"„\",ldrdhar:\"⥧\",ldrushar:\"⥋\",ldsh:\"↲\",le:\"≤\",lE:\"≦\",LeftAngleBracket:\"⟨\",LeftArrowBar:\"⇤\",leftarrow:\"←\",LeftArrow:\"←\",Leftarrow:\"⇐\",LeftArrowRightArrow:\"⇆\",leftarrowtail:\"↢\",LeftCeiling:\"⌈\",LeftDoubleBracket:\"⟦\",LeftDownTeeVector:\"⥡\",LeftDownVectorBar:\"⥙\",LeftDownVector:\"⇃\",LeftFloor:\"⌊\",leftharpoondown:\"↽\",leftharpoonup:\"↼\",leftleftarrows:\"⇇\",leftrightarrow:\"↔\",LeftRightArrow:\"↔\",Leftrightarrow:\"⇔\",leftrightarrows:\"⇆\",leftrightharpoons:\"⇋\",leftrightsquigarrow:\"↭\",LeftRightVector:\"⥎\",LeftTeeArrow:\"↤\",LeftTee:\"⊣\",LeftTeeVector:\"⥚\",leftthreetimes:\"⋋\",LeftTriangleBar:\"⧏\",LeftTriangle:\"⊲\",LeftTriangleEqual:\"⊴\",LeftUpDownVector:\"⥑\",LeftUpTeeVector:\"⥠\",LeftUpVectorBar:\"⥘\",LeftUpVector:\"↿\",LeftVectorBar:\"⥒\",LeftVector:\"↼\",lEg:\"⪋\",leg:\"⋚\",leq:\"≤\",leqq:\"≦\",leqslant:\"⩽\",lescc:\"⪨\",les:\"⩽\",lesdot:\"⩿\",lesdoto:\"⪁\",lesdotor:\"⪃\",lesg:\"⋚︀\",lesges:\"⪓\",lessapprox:\"⪅\",lessdot:\"⋖\",lesseqgtr:\"⋚\",lesseqqgtr:\"⪋\",LessEqualGreater:\"⋚\",LessFullEqual:\"≦\",LessGreater:\"≶\",lessgtr:\"≶\",LessLess:\"⪡\",lesssim:\"≲\",LessSlantEqual:\"⩽\",LessTilde:\"≲\",lfisht:\"⥼\",lfloor:\"⌊\",Lfr:\"𝔏\",lfr:\"𝔩\",lg:\"≶\",lgE:\"⪑\",lHar:\"⥢\",lhard:\"↽\",lharu:\"↼\",lharul:\"⥪\",lhblk:\"▄\",LJcy:\"Љ\",ljcy:\"љ\",llarr:\"⇇\",ll:\"≪\",Ll:\"⋘\",llcorner:\"⌞\",Lleftarrow:\"⇚\",llhard:\"⥫\",lltri:\"◺\",Lmidot:\"Ŀ\",lmidot:\"ŀ\",lmoustache:\"⎰\",lmoust:\"⎰\",lnap:\"⪉\",lnapprox:\"⪉\",lne:\"⪇\",lnE:\"≨\",lneq:\"⪇\",lneqq:\"≨\",lnsim:\"⋦\",loang:\"⟬\",loarr:\"⇽\",lobrk:\"⟦\",longleftarrow:\"⟵\",LongLeftArrow:\"⟵\",Longleftarrow:\"⟸\",longleftrightarrow:\"⟷\",LongLeftRightArrow:\"⟷\",Longleftrightarrow:\"⟺\",longmapsto:\"⟼\",longrightarrow:\"⟶\",LongRightArrow:\"⟶\",Longrightarrow:\"⟹\",looparrowleft:\"↫\",looparrowright:\"↬\",lopar:\"⦅\",Lopf:\"𝕃\",lopf:\"𝕝\",loplus:\"⨭\",lotimes:\"⨴\",lowast:\"∗\",lowbar:\"_\",LowerLeftArrow:\"↙\",LowerRightArrow:\"↘\",loz:\"◊\",lozenge:\"◊\",lozf:\"⧫\",lpar:\"(\",lparlt:\"⦓\",lrarr:\"⇆\",lrcorner:\"⌟\",lrhar:\"⇋\",lrhard:\"⥭\",lrm:\"‎\",lrtri:\"⊿\",lsaquo:\"‹\",lscr:\"𝓁\",Lscr:\"ℒ\",lsh:\"↰\",Lsh:\"↰\",lsim:\"≲\",lsime:\"⪍\",lsimg:\"⪏\",lsqb:\"[\",lsquo:\"‘\",lsquor:\"‚\",Lstrok:\"Ł\",lstrok:\"ł\",ltcc:\"⪦\",ltcir:\"⩹\",lt:\"<\",LT:\"<\",Lt:\"≪\",ltdot:\"⋖\",lthree:\"⋋\",ltimes:\"⋉\",ltlarr:\"⥶\",ltquest:\"⩻\",ltri:\"◃\",ltrie:\"⊴\",ltrif:\"◂\",ltrPar:\"⦖\",lurdshar:\"⥊\",luruhar:\"⥦\",lvertneqq:\"≨︀\",lvnE:\"≨︀\",macr:\"¯\",male:\"♂\",malt:\"✠\",maltese:\"✠\",Map:\"⤅\",map:\"↦\",mapsto:\"↦\",mapstodown:\"↧\",mapstoleft:\"↤\",mapstoup:\"↥\",marker:\"▮\",mcomma:\"⨩\",Mcy:\"М\",mcy:\"м\",mdash:\"—\",mDDot:\"∺\",measuredangle:\"∡\",MediumSpace:\" \",Mellintrf:\"ℳ\",Mfr:\"𝔐\",mfr:\"𝔪\",mho:\"℧\",micro:\"µ\",midast:\"*\",midcir:\"⫰\",mid:\"∣\",middot:\"·\",minusb:\"⊟\",minus:\"−\",minusd:\"∸\",minusdu:\"⨪\",MinusPlus:\"∓\",mlcp:\"⫛\",mldr:\"…\",mnplus:\"∓\",models:\"⊧\",Mopf:\"𝕄\",mopf:\"𝕞\",mp:\"∓\",mscr:\"𝓂\",Mscr:\"ℳ\",mstpos:\"∾\",Mu:\"Μ\",mu:\"μ\",multimap:\"⊸\",mumap:\"⊸\",nabla:\"∇\",Nacute:\"Ń\",nacute:\"ń\",nang:\"∠⃒\",nap:\"≉\",napE:\"⩰̸\",napid:\"≋̸\",napos:\"ŉ\",napprox:\"≉\",natural:\"♮\",naturals:\"ℕ\",natur:\"♮\",nbsp:\" \",nbump:\"≎̸\",nbumpe:\"≏̸\",ncap:\"⩃\",Ncaron:\"Ň\",ncaron:\"ň\",Ncedil:\"Ņ\",ncedil:\"ņ\",ncong:\"≇\",ncongdot:\"⩭̸\",ncup:\"⩂\",Ncy:\"Н\",ncy:\"н\",ndash:\"–\",nearhk:\"⤤\",nearr:\"↗\",neArr:\"⇗\",nearrow:\"↗\",ne:\"≠\",nedot:\"≐̸\",NegativeMediumSpace:\"​\",NegativeThickSpace:\"​\",NegativeThinSpace:\"​\",NegativeVeryThinSpace:\"​\",nequiv:\"≢\",nesear:\"⤨\",nesim:\"≂̸\",NestedGreaterGreater:\"≫\",NestedLessLess:\"≪\",NewLine:\"\\n\",nexist:\"∄\",nexists:\"∄\",Nfr:\"𝔑\",nfr:\"𝔫\",ngE:\"≧̸\",nge:\"≱\",ngeq:\"≱\",ngeqq:\"≧̸\",ngeqslant:\"⩾̸\",nges:\"⩾̸\",nGg:\"⋙̸\",ngsim:\"≵\",nGt:\"≫⃒\",ngt:\"≯\",ngtr:\"≯\",nGtv:\"≫̸\",nharr:\"↮\",nhArr:\"⇎\",nhpar:\"⫲\",ni:\"∋\",nis:\"⋼\",nisd:\"⋺\",niv:\"∋\",NJcy:\"Њ\",njcy:\"њ\",nlarr:\"↚\",nlArr:\"⇍\",nldr:\"‥\",nlE:\"≦̸\",nle:\"≰\",nleftarrow:\"↚\",nLeftarrow:\"⇍\",nleftrightarrow:\"↮\",nLeftrightarrow:\"⇎\",nleq:\"≰\",nleqq:\"≦̸\",nleqslant:\"⩽̸\",nles:\"⩽̸\",nless:\"≮\",nLl:\"⋘̸\",nlsim:\"≴\",nLt:\"≪⃒\",nlt:\"≮\",nltri:\"⋪\",nltrie:\"⋬\",nLtv:\"≪̸\",nmid:\"∤\",NoBreak:\"⁠\",NonBreakingSpace:\" \",nopf:\"𝕟\",Nopf:\"ℕ\",Not:\"⫬\",not:\"¬\",NotCongruent:\"≢\",NotCupCap:\"≭\",NotDoubleVerticalBar:\"∦\",NotElement:\"∉\",NotEqual:\"≠\",NotEqualTilde:\"≂̸\",NotExists:\"∄\",NotGreater:\"≯\",NotGreaterEqual:\"≱\",NotGreaterFullEqual:\"≧̸\",NotGreaterGreater:\"≫̸\",NotGreaterLess:\"≹\",NotGreaterSlantEqual:\"⩾̸\",NotGreaterTilde:\"≵\",NotHumpDownHump:\"≎̸\",NotHumpEqual:\"≏̸\",notin:\"∉\",notindot:\"⋵̸\",notinE:\"⋹̸\",notinva:\"∉\",notinvb:\"⋷\",notinvc:\"⋶\",NotLeftTriangleBar:\"⧏̸\",NotLeftTriangle:\"⋪\",NotLeftTriangleEqual:\"⋬\",NotLess:\"≮\",NotLessEqual:\"≰\",NotLessGreater:\"≸\",NotLessLess:\"≪̸\",NotLessSlantEqual:\"⩽̸\",NotLessTilde:\"≴\",NotNestedGreaterGreater:\"⪢̸\",NotNestedLessLess:\"⪡̸\",notni:\"∌\",notniva:\"∌\",notnivb:\"⋾\",notnivc:\"⋽\",NotPrecedes:\"⊀\",NotPrecedesEqual:\"⪯̸\",NotPrecedesSlantEqual:\"⋠\",NotReverseElement:\"∌\",NotRightTriangleBar:\"⧐̸\",NotRightTriangle:\"⋫\",NotRightTriangleEqual:\"⋭\",NotSquareSubset:\"⊏̸\",NotSquareSubsetEqual:\"⋢\",NotSquareSuperset:\"⊐̸\",NotSquareSupersetEqual:\"⋣\",NotSubset:\"⊂⃒\",NotSubsetEqual:\"⊈\",NotSucceeds:\"⊁\",NotSucceedsEqual:\"⪰̸\",NotSucceedsSlantEqual:\"⋡\",NotSucceedsTilde:\"≿̸\",NotSuperset:\"⊃⃒\",NotSupersetEqual:\"⊉\",NotTilde:\"≁\",NotTildeEqual:\"≄\",NotTildeFullEqual:\"≇\",NotTildeTilde:\"≉\",NotVerticalBar:\"∤\",nparallel:\"∦\",npar:\"∦\",nparsl:\"⫽⃥\",npart:\"∂̸\",npolint:\"⨔\",npr:\"⊀\",nprcue:\"⋠\",nprec:\"⊀\",npreceq:\"⪯̸\",npre:\"⪯̸\",nrarrc:\"⤳̸\",nrarr:\"↛\",nrArr:\"⇏\",nrarrw:\"↝̸\",nrightarrow:\"↛\",nRightarrow:\"⇏\",nrtri:\"⋫\",nrtrie:\"⋭\",nsc:\"⊁\",nsccue:\"⋡\",nsce:\"⪰̸\",Nscr:\"𝒩\",nscr:\"𝓃\",nshortmid:\"∤\",nshortparallel:\"∦\",nsim:\"≁\",nsime:\"≄\",nsimeq:\"≄\",nsmid:\"∤\",nspar:\"∦\",nsqsube:\"⋢\",nsqsupe:\"⋣\",nsub:\"⊄\",nsubE:\"⫅̸\",nsube:\"⊈\",nsubset:\"⊂⃒\",nsubseteq:\"⊈\",nsubseteqq:\"⫅̸\",nsucc:\"⊁\",nsucceq:\"⪰̸\",nsup:\"⊅\",nsupE:\"⫆̸\",nsupe:\"⊉\",nsupset:\"⊃⃒\",nsupseteq:\"⊉\",nsupseteqq:\"⫆̸\",ntgl:\"≹\",Ntilde:\"Ñ\",ntilde:\"ñ\",ntlg:\"≸\",ntriangleleft:\"⋪\",ntrianglelefteq:\"⋬\",ntriangleright:\"⋫\",ntrianglerighteq:\"⋭\",Nu:\"Ν\",nu:\"ν\",num:\"#\",numero:\"№\",numsp:\" \",nvap:\"≍⃒\",nvdash:\"⊬\",nvDash:\"⊭\",nVdash:\"⊮\",nVDash:\"⊯\",nvge:\"≥⃒\",nvgt:\">⃒\",nvHarr:\"⤄\",nvinfin:\"⧞\",nvlArr:\"⤂\",nvle:\"≤⃒\",nvlt:\"<⃒\",nvltrie:\"⊴⃒\",nvrArr:\"⤃\",nvrtrie:\"⊵⃒\",nvsim:\"∼⃒\",nwarhk:\"⤣\",nwarr:\"↖\",nwArr:\"⇖\",nwarrow:\"↖\",nwnear:\"⤧\",Oacute:\"Ó\",oacute:\"ó\",oast:\"⊛\",Ocirc:\"Ô\",ocirc:\"ô\",ocir:\"⊚\",Ocy:\"О\",ocy:\"о\",odash:\"⊝\",Odblac:\"Ő\",odblac:\"ő\",odiv:\"⨸\",odot:\"⊙\",odsold:\"⦼\",OElig:\"Œ\",oelig:\"œ\",ofcir:\"⦿\",Ofr:\"𝔒\",ofr:\"𝔬\",ogon:\"˛\",Ograve:\"Ò\",ograve:\"ò\",ogt:\"⧁\",ohbar:\"⦵\",ohm:\"Ω\",oint:\"∮\",olarr:\"↺\",olcir:\"⦾\",olcross:\"⦻\",oline:\"‾\",olt:\"⧀\",Omacr:\"Ō\",omacr:\"ō\",Omega:\"Ω\",omega:\"ω\",Omicron:\"Ο\",omicron:\"ο\",omid:\"⦶\",ominus:\"⊖\",Oopf:\"𝕆\",oopf:\"𝕠\",opar:\"⦷\",OpenCurlyDoubleQuote:\"“\",OpenCurlyQuote:\"‘\",operp:\"⦹\",oplus:\"⊕\",orarr:\"↻\",Or:\"⩔\",or:\"∨\",ord:\"⩝\",order:\"ℴ\",orderof:\"ℴ\",ordf:\"ª\",ordm:\"º\",origof:\"⊶\",oror:\"⩖\",orslope:\"⩗\",orv:\"⩛\",oS:\"Ⓢ\",Oscr:\"𝒪\",oscr:\"ℴ\",Oslash:\"Ø\",oslash:\"ø\",osol:\"⊘\",Otilde:\"Õ\",otilde:\"õ\",otimesas:\"⨶\",Otimes:\"⨷\",otimes:\"⊗\",Ouml:\"Ö\",ouml:\"ö\",ovbar:\"⌽\",OverBar:\"‾\",OverBrace:\"⏞\",OverBracket:\"⎴\",OverParenthesis:\"⏜\",para:\"¶\",parallel:\"∥\",par:\"∥\",parsim:\"⫳\",parsl:\"⫽\",part:\"∂\",PartialD:\"∂\",Pcy:\"П\",pcy:\"п\",percnt:\"%\",period:\".\",permil:\"‰\",perp:\"⊥\",pertenk:\"‱\",Pfr:\"𝔓\",pfr:\"𝔭\",Phi:\"Φ\",phi:\"φ\",phiv:\"ϕ\",phmmat:\"ℳ\",phone:\"☎\",Pi:\"Π\",pi:\"π\",pitchfork:\"⋔\",piv:\"ϖ\",planck:\"ℏ\",planckh:\"ℎ\",plankv:\"ℏ\",plusacir:\"⨣\",plusb:\"⊞\",pluscir:\"⨢\",plus:\"+\",plusdo:\"∔\",plusdu:\"⨥\",pluse:\"⩲\",PlusMinus:\"±\",plusmn:\"±\",plussim:\"⨦\",plustwo:\"⨧\",pm:\"±\",Poincareplane:\"ℌ\",pointint:\"⨕\",popf:\"𝕡\",Popf:\"ℙ\",pound:\"£\",prap:\"⪷\",Pr:\"⪻\",pr:\"≺\",prcue:\"≼\",precapprox:\"⪷\",prec:\"≺\",preccurlyeq:\"≼\",Precedes:\"≺\",PrecedesEqual:\"⪯\",PrecedesSlantEqual:\"≼\",PrecedesTilde:\"≾\",preceq:\"⪯\",precnapprox:\"⪹\",precneqq:\"⪵\",precnsim:\"⋨\",pre:\"⪯\",prE:\"⪳\",precsim:\"≾\",prime:\"′\",Prime:\"″\",primes:\"ℙ\",prnap:\"⪹\",prnE:\"⪵\",prnsim:\"⋨\",prod:\"∏\",Product:\"∏\",profalar:\"⌮\",profline:\"⌒\",profsurf:\"⌓\",prop:\"∝\",Proportional:\"∝\",Proportion:\"∷\",propto:\"∝\",prsim:\"≾\",prurel:\"⊰\",Pscr:\"𝒫\",pscr:\"𝓅\",Psi:\"Ψ\",psi:\"ψ\",puncsp:\" \",Qfr:\"𝔔\",qfr:\"𝔮\",qint:\"⨌\",qopf:\"𝕢\",Qopf:\"ℚ\",qprime:\"⁗\",Qscr:\"𝒬\",qscr:\"𝓆\",quaternions:\"ℍ\",quatint:\"⨖\",quest:\"?\",questeq:\"≟\",quot:'\"',QUOT:'\"',rAarr:\"⇛\",race:\"∽̱\",Racute:\"Ŕ\",racute:\"ŕ\",radic:\"√\",raemptyv:\"⦳\",rang:\"⟩\",Rang:\"⟫\",rangd:\"⦒\",range:\"⦥\",rangle:\"⟩\",raquo:\"»\",rarrap:\"⥵\",rarrb:\"⇥\",rarrbfs:\"⤠\",rarrc:\"⤳\",rarr:\"→\",Rarr:\"↠\",rArr:\"⇒\",rarrfs:\"⤞\",rarrhk:\"↪\",rarrlp:\"↬\",rarrpl:\"⥅\",rarrsim:\"⥴\",Rarrtl:\"⤖\",rarrtl:\"↣\",rarrw:\"↝\",ratail:\"⤚\",rAtail:\"⤜\",ratio:\"∶\",rationals:\"ℚ\",rbarr:\"⤍\",rBarr:\"⤏\",RBarr:\"⤐\",rbbrk:\"❳\",rbrace:\"}\",rbrack:\"]\",rbrke:\"⦌\",rbrksld:\"⦎\",rbrkslu:\"⦐\",Rcaron:\"Ř\",rcaron:\"ř\",Rcedil:\"Ŗ\",rcedil:\"ŗ\",rceil:\"⌉\",rcub:\"}\",Rcy:\"Р\",rcy:\"р\",rdca:\"⤷\",rdldhar:\"⥩\",rdquo:\"”\",rdquor:\"”\",rdsh:\"↳\",real:\"ℜ\",realine:\"ℛ\",realpart:\"ℜ\",reals:\"ℝ\",Re:\"ℜ\",rect:\"▭\",reg:\"®\",REG:\"®\",ReverseElement:\"∋\",ReverseEquilibrium:\"⇋\",ReverseUpEquilibrium:\"⥯\",rfisht:\"⥽\",rfloor:\"⌋\",rfr:\"𝔯\",Rfr:\"ℜ\",rHar:\"⥤\",rhard:\"⇁\",rharu:\"⇀\",rharul:\"⥬\",Rho:\"Ρ\",rho:\"ρ\",rhov:\"ϱ\",RightAngleBracket:\"⟩\",RightArrowBar:\"⇥\",rightarrow:\"→\",RightArrow:\"→\",Rightarrow:\"⇒\",RightArrowLeftArrow:\"⇄\",rightarrowtail:\"↣\",RightCeiling:\"⌉\",RightDoubleBracket:\"⟧\",RightDownTeeVector:\"⥝\",RightDownVectorBar:\"⥕\",RightDownVector:\"⇂\",RightFloor:\"⌋\",rightharpoondown:\"⇁\",rightharpoonup:\"⇀\",rightleftarrows:\"⇄\",rightleftharpoons:\"⇌\",rightrightarrows:\"⇉\",rightsquigarrow:\"↝\",RightTeeArrow:\"↦\",RightTee:\"⊢\",RightTeeVector:\"⥛\",rightthreetimes:\"⋌\",RightTriangleBar:\"⧐\",RightTriangle:\"⊳\",RightTriangleEqual:\"⊵\",RightUpDownVector:\"⥏\",RightUpTeeVector:\"⥜\",RightUpVectorBar:\"⥔\",RightUpVector:\"↾\",RightVectorBar:\"⥓\",RightVector:\"⇀\",ring:\"˚\",risingdotseq:\"≓\",rlarr:\"⇄\",rlhar:\"⇌\",rlm:\"‏\",rmoustache:\"⎱\",rmoust:\"⎱\",rnmid:\"⫮\",roang:\"⟭\",roarr:\"⇾\",robrk:\"⟧\",ropar:\"⦆\",ropf:\"𝕣\",Ropf:\"ℝ\",roplus:\"⨮\",rotimes:\"⨵\",RoundImplies:\"⥰\",rpar:\")\",rpargt:\"⦔\",rppolint:\"⨒\",rrarr:\"⇉\",Rrightarrow:\"⇛\",rsaquo:\"›\",rscr:\"𝓇\",Rscr:\"ℛ\",rsh:\"↱\",Rsh:\"↱\",rsqb:\"]\",rsquo:\"’\",rsquor:\"’\",rthree:\"⋌\",rtimes:\"⋊\",rtri:\"▹\",rtrie:\"⊵\",rtrif:\"▸\",rtriltri:\"⧎\",RuleDelayed:\"⧴\",ruluhar:\"⥨\",rx:\"℞\",Sacute:\"Ś\",sacute:\"ś\",sbquo:\"‚\",scap:\"⪸\",Scaron:\"Š\",scaron:\"š\",Sc:\"⪼\",sc:\"≻\",sccue:\"≽\",sce:\"⪰\",scE:\"⪴\",Scedil:\"Ş\",scedil:\"ş\",Scirc:\"Ŝ\",scirc:\"ŝ\",scnap:\"⪺\",scnE:\"⪶\",scnsim:\"⋩\",scpolint:\"⨓\",scsim:\"≿\",Scy:\"С\",scy:\"с\",sdotb:\"⊡\",sdot:\"⋅\",sdote:\"⩦\",searhk:\"⤥\",searr:\"↘\",seArr:\"⇘\",searrow:\"↘\",sect:\"§\",semi:\";\",seswar:\"⤩\",setminus:\"∖\",setmn:\"∖\",sext:\"✶\",Sfr:\"𝔖\",sfr:\"𝔰\",sfrown:\"⌢\",sharp:\"♯\",SHCHcy:\"Щ\",shchcy:\"щ\",SHcy:\"Ш\",shcy:\"ш\",ShortDownArrow:\"↓\",ShortLeftArrow:\"←\",shortmid:\"∣\",shortparallel:\"∥\",ShortRightArrow:\"→\",ShortUpArrow:\"↑\",shy:\"­\",Sigma:\"Σ\",sigma:\"σ\",sigmaf:\"ς\",sigmav:\"ς\",sim:\"∼\",simdot:\"⩪\",sime:\"≃\",simeq:\"≃\",simg:\"⪞\",simgE:\"⪠\",siml:\"⪝\",simlE:\"⪟\",simne:\"≆\",simplus:\"⨤\",simrarr:\"⥲\",slarr:\"←\",SmallCircle:\"∘\",smallsetminus:\"∖\",smashp:\"⨳\",smeparsl:\"⧤\",smid:\"∣\",smile:\"⌣\",smt:\"⪪\",smte:\"⪬\",smtes:\"⪬︀\",SOFTcy:\"Ь\",softcy:\"ь\",solbar:\"⌿\",solb:\"⧄\",sol:\"/\",Sopf:\"𝕊\",sopf:\"𝕤\",spades:\"♠\",spadesuit:\"♠\",spar:\"∥\",sqcap:\"⊓\",sqcaps:\"⊓︀\",sqcup:\"⊔\",sqcups:\"⊔︀\",Sqrt:\"√\",sqsub:\"⊏\",sqsube:\"⊑\",sqsubset:\"⊏\",sqsubseteq:\"⊑\",sqsup:\"⊐\",sqsupe:\"⊒\",sqsupset:\"⊐\",sqsupseteq:\"⊒\",square:\"□\",Square:\"□\",SquareIntersection:\"⊓\",SquareSubset:\"⊏\",SquareSubsetEqual:\"⊑\",SquareSuperset:\"⊐\",SquareSupersetEqual:\"⊒\",SquareUnion:\"⊔\",squarf:\"▪\",squ:\"□\",squf:\"▪\",srarr:\"→\",Sscr:\"𝒮\",sscr:\"𝓈\",ssetmn:\"∖\",ssmile:\"⌣\",sstarf:\"⋆\",Star:\"⋆\",star:\"☆\",starf:\"★\",straightepsilon:\"ϵ\",straightphi:\"ϕ\",strns:\"¯\",sub:\"⊂\",Sub:\"⋐\",subdot:\"⪽\",subE:\"⫅\",sube:\"⊆\",subedot:\"⫃\",submult:\"⫁\",subnE:\"⫋\",subne:\"⊊\",subplus:\"⪿\",subrarr:\"⥹\",subset:\"⊂\",Subset:\"⋐\",subseteq:\"⊆\",subseteqq:\"⫅\",SubsetEqual:\"⊆\",subsetneq:\"⊊\",subsetneqq:\"⫋\",subsim:\"⫇\",subsub:\"⫕\",subsup:\"⫓\",succapprox:\"⪸\",succ:\"≻\",succcurlyeq:\"≽\",Succeeds:\"≻\",SucceedsEqual:\"⪰\",SucceedsSlantEqual:\"≽\",SucceedsTilde:\"≿\",succeq:\"⪰\",succnapprox:\"⪺\",succneqq:\"⪶\",succnsim:\"⋩\",succsim:\"≿\",SuchThat:\"∋\",sum:\"∑\",Sum:\"∑\",sung:\"♪\",sup1:\"¹\",sup2:\"²\",sup3:\"³\",sup:\"⊃\",Sup:\"⋑\",supdot:\"⪾\",supdsub:\"⫘\",supE:\"⫆\",supe:\"⊇\",supedot:\"⫄\",Superset:\"⊃\",SupersetEqual:\"⊇\",suphsol:\"⟉\",suphsub:\"⫗\",suplarr:\"⥻\",supmult:\"⫂\",supnE:\"⫌\",supne:\"⊋\",supplus:\"⫀\",supset:\"⊃\",Supset:\"⋑\",supseteq:\"⊇\",supseteqq:\"⫆\",supsetneq:\"⊋\",supsetneqq:\"⫌\",supsim:\"⫈\",supsub:\"⫔\",supsup:\"⫖\",swarhk:\"⤦\",swarr:\"↙\",swArr:\"⇙\",swarrow:\"↙\",swnwar:\"⤪\",szlig:\"ß\",Tab:\"\\t\",target:\"⌖\",Tau:\"Τ\",tau:\"τ\",tbrk:\"⎴\",Tcaron:\"Ť\",tcaron:\"ť\",Tcedil:\"Ţ\",tcedil:\"ţ\",Tcy:\"Т\",tcy:\"т\",tdot:\"⃛\",telrec:\"⌕\",Tfr:\"𝔗\",tfr:\"𝔱\",there4:\"∴\",therefore:\"∴\",Therefore:\"∴\",Theta:\"Θ\",theta:\"θ\",thetasym:\"ϑ\",thetav:\"ϑ\",thickapprox:\"≈\",thicksim:\"∼\",ThickSpace:\"  \",ThinSpace:\" \",thinsp:\" \",thkap:\"≈\",thksim:\"∼\",THORN:\"Þ\",thorn:\"þ\",tilde:\"˜\",Tilde:\"∼\",TildeEqual:\"≃\",TildeFullEqual:\"≅\",TildeTilde:\"≈\",timesbar:\"⨱\",timesb:\"⊠\",times:\"×\",timesd:\"⨰\",tint:\"∭\",toea:\"⤨\",topbot:\"⌶\",topcir:\"⫱\",top:\"⊤\",Topf:\"𝕋\",topf:\"𝕥\",topfork:\"⫚\",tosa:\"⤩\",tprime:\"‴\",trade:\"™\",TRADE:\"™\",triangle:\"▵\",triangledown:\"▿\",triangleleft:\"◃\",trianglelefteq:\"⊴\",triangleq:\"≜\",triangleright:\"▹\",trianglerighteq:\"⊵\",tridot:\"◬\",trie:\"≜\",triminus:\"⨺\",TripleDot:\"⃛\",triplus:\"⨹\",trisb:\"⧍\",tritime:\"⨻\",trpezium:\"⏢\",Tscr:\"𝒯\",tscr:\"𝓉\",TScy:\"Ц\",tscy:\"ц\",TSHcy:\"Ћ\",tshcy:\"ћ\",Tstrok:\"Ŧ\",tstrok:\"ŧ\",twixt:\"≬\",twoheadleftarrow:\"↞\",twoheadrightarrow:\"↠\",Uacute:\"Ú\",uacute:\"ú\",uarr:\"↑\",Uarr:\"↟\",uArr:\"⇑\",Uarrocir:\"⥉\",Ubrcy:\"Ў\",ubrcy:\"ў\",Ubreve:\"Ŭ\",ubreve:\"ŭ\",Ucirc:\"Û\",ucirc:\"û\",Ucy:\"У\",ucy:\"у\",udarr:\"⇅\",Udblac:\"Ű\",udblac:\"ű\",udhar:\"⥮\",ufisht:\"⥾\",Ufr:\"𝔘\",ufr:\"𝔲\",Ugrave:\"Ù\",ugrave:\"ù\",uHar:\"⥣\",uharl:\"↿\",uharr:\"↾\",uhblk:\"▀\",ulcorn:\"⌜\",ulcorner:\"⌜\",ulcrop:\"⌏\",ultri:\"◸\",Umacr:\"Ū\",umacr:\"ū\",uml:\"¨\",UnderBar:\"_\",UnderBrace:\"⏟\",UnderBracket:\"⎵\",UnderParenthesis:\"⏝\",Union:\"⋃\",UnionPlus:\"⊎\",Uogon:\"Ų\",uogon:\"ų\",Uopf:\"𝕌\",uopf:\"𝕦\",UpArrowBar:\"⤒\",uparrow:\"↑\",UpArrow:\"↑\",Uparrow:\"⇑\",UpArrowDownArrow:\"⇅\",updownarrow:\"↕\",UpDownArrow:\"↕\",Updownarrow:\"⇕\",UpEquilibrium:\"⥮\",upharpoonleft:\"↿\",upharpoonright:\"↾\",uplus:\"⊎\",UpperLeftArrow:\"↖\",UpperRightArrow:\"↗\",upsi:\"υ\",Upsi:\"ϒ\",upsih:\"ϒ\",Upsilon:\"Υ\",upsilon:\"υ\",UpTeeArrow:\"↥\",UpTee:\"⊥\",upuparrows:\"⇈\",urcorn:\"⌝\",urcorner:\"⌝\",urcrop:\"⌎\",Uring:\"Ů\",uring:\"ů\",urtri:\"◹\",Uscr:\"𝒰\",uscr:\"𝓊\",utdot:\"⋰\",Utilde:\"Ũ\",utilde:\"ũ\",utri:\"▵\",utrif:\"▴\",uuarr:\"⇈\",Uuml:\"Ü\",uuml:\"ü\",uwangle:\"⦧\",vangrt:\"⦜\",varepsilon:\"ϵ\",varkappa:\"ϰ\",varnothing:\"∅\",varphi:\"ϕ\",varpi:\"ϖ\",varpropto:\"∝\",varr:\"↕\",vArr:\"⇕\",varrho:\"ϱ\",varsigma:\"ς\",varsubsetneq:\"⊊︀\",varsubsetneqq:\"⫋︀\",varsupsetneq:\"⊋︀\",varsupsetneqq:\"⫌︀\",vartheta:\"ϑ\",vartriangleleft:\"⊲\",vartriangleright:\"⊳\",vBar:\"⫨\",Vbar:\"⫫\",vBarv:\"⫩\",Vcy:\"В\",vcy:\"в\",vdash:\"⊢\",vDash:\"⊨\",Vdash:\"⊩\",VDash:\"⊫\",Vdashl:\"⫦\",veebar:\"⊻\",vee:\"∨\",Vee:\"⋁\",veeeq:\"≚\",vellip:\"⋮\",verbar:\"|\",Verbar:\"‖\",vert:\"|\",Vert:\"‖\",VerticalBar:\"∣\",VerticalLine:\"|\",VerticalSeparator:\"❘\",VerticalTilde:\"≀\",VeryThinSpace:\" \",Vfr:\"𝔙\",vfr:\"𝔳\",vltri:\"⊲\",vnsub:\"⊂⃒\",vnsup:\"⊃⃒\",Vopf:\"𝕍\",vopf:\"𝕧\",vprop:\"∝\",vrtri:\"⊳\",Vscr:\"𝒱\",vscr:\"𝓋\",vsubnE:\"⫋︀\",vsubne:\"⊊︀\",vsupnE:\"⫌︀\",vsupne:\"⊋︀\",Vvdash:\"⊪\",vzigzag:\"⦚\",Wcirc:\"Ŵ\",wcirc:\"ŵ\",wedbar:\"⩟\",wedge:\"∧\",Wedge:\"⋀\",wedgeq:\"≙\",weierp:\"℘\",Wfr:\"𝔚\",wfr:\"𝔴\",Wopf:\"𝕎\",wopf:\"𝕨\",wp:\"℘\",wr:\"≀\",wreath:\"≀\",Wscr:\"𝒲\",wscr:\"𝓌\",xcap:\"⋂\",xcirc:\"◯\",xcup:\"⋃\",xdtri:\"▽\",Xfr:\"𝔛\",xfr:\"𝔵\",xharr:\"⟷\",xhArr:\"⟺\",Xi:\"Ξ\",xi:\"ξ\",xlarr:\"⟵\",xlArr:\"⟸\",xmap:\"⟼\",xnis:\"⋻\",xodot:\"⨀\",Xopf:\"𝕏\",xopf:\"𝕩\",xoplus:\"⨁\",xotime:\"⨂\",xrarr:\"⟶\",xrArr:\"⟹\",Xscr:\"𝒳\",xscr:\"𝓍\",xsqcup:\"⨆\",xuplus:\"⨄\",xutri:\"△\",xvee:\"⋁\",xwedge:\"⋀\",Yacute:\"Ý\",yacute:\"ý\",YAcy:\"Я\",yacy:\"я\",Ycirc:\"Ŷ\",ycirc:\"ŷ\",Ycy:\"Ы\",ycy:\"ы\",yen:\"¥\",Yfr:\"𝔜\",yfr:\"𝔶\",YIcy:\"Ї\",yicy:\"ї\",Yopf:\"𝕐\",yopf:\"𝕪\",Yscr:\"𝒴\",yscr:\"𝓎\",YUcy:\"Ю\",yucy:\"ю\",yuml:\"ÿ\",Yuml:\"Ÿ\",Zacute:\"Ź\",zacute:\"ź\",Zcaron:\"Ž\",zcaron:\"ž\",Zcy:\"З\",zcy:\"з\",Zdot:\"Ż\",zdot:\"ż\",zeetrf:\"ℨ\",ZeroWidthSpace:\"​\",Zeta:\"Ζ\",zeta:\"ζ\",zfr:\"𝔷\",Zfr:\"ℨ\",ZHcy:\"Ж\",zhcy:\"ж\",zigrarr:\"⇝\",zopf:\"𝕫\",Zopf:\"ℤ\",Zscr:\"𝒵\",zscr:\"𝓏\",zwj:\"‍\",zwnj:\"‌\"}},{}],26:[function(require,module,exports){module.exports={Aacute:\"Á\",aacute:\"á\",Acirc:\"Â\",acirc:\"â\",acute:\"´\",AElig:\"Æ\",aelig:\"æ\",Agrave:\"À\",agrave:\"à\",amp:\"&\",AMP:\"&\",Aring:\"Å\",aring:\"å\",Atilde:\"Ã\",atilde:\"ã\",Auml:\"Ä\",auml:\"ä\",brvbar:\"¦\",Ccedil:\"Ç\",ccedil:\"ç\",cedil:\"¸\",cent:\"¢\",copy:\"©\",COPY:\"©\",curren:\"¤\",deg:\"°\",divide:\"÷\",Eacute:\"É\",eacute:\"é\",Ecirc:\"Ê\",ecirc:\"ê\",Egrave:\"È\",egrave:\"è\",ETH:\"Ð\",eth:\"ð\",Euml:\"Ë\",euml:\"ë\",frac12:\"½\",frac14:\"¼\",frac34:\"¾\",gt:\">\",GT:\">\",Iacute:\"Í\",iacute:\"í\",Icirc:\"Î\",icirc:\"î\",iexcl:\"¡\",Igrave:\"Ì\",igrave:\"ì\",iquest:\"¿\",Iuml:\"Ï\",iuml:\"ï\",laquo:\"«\",lt:\"<\",LT:\"<\",macr:\"¯\",micro:\"µ\",middot:\"·\",nbsp:\" \",not:\"¬\",Ntilde:\"Ñ\",ntilde:\"ñ\",Oacute:\"Ó\",oacute:\"ó\",Ocirc:\"Ô\",ocirc:\"ô\",Ograve:\"Ò\",ograve:\"ò\",ordf:\"ª\",ordm:\"º\",Oslash:\"Ø\",oslash:\"ø\",Otilde:\"Õ\",otilde:\"õ\",Ouml:\"Ö\",ouml:\"ö\",para:\"¶\",plusmn:\"±\",pound:\"£\",quot:'\"',QUOT:'\"',raquo:\"»\",reg:\"®\",REG:\"®\",sect:\"§\",shy:\"­\",sup1:\"¹\",sup2:\"²\",sup3:\"³\",szlig:\"ß\",THORN:\"Þ\",thorn:\"þ\",times:\"×\",Uacute:\"Ú\",uacute:\"ú\",Ucirc:\"Û\",ucirc:\"û\",Ugrave:\"Ù\",ugrave:\"ù\",uml:\"¨\",Uuml:\"Ü\",uuml:\"ü\",Yacute:\"Ý\",yacute:\"ý\",yen:\"¥\",yuml:\"ÿ\"}},{}],27:[function(require,module,exports){module.exports={amp:\"&\",apos:\"'\",gt:\">\",lt:\"<\",quot:'\"'}},{}],28:[function(require,module,exports){function EventEmitter(){this._events=this._events||{};this._maxListeners=this._maxListeners||undefined}module.exports=EventEmitter;EventEmitter.EventEmitter=EventEmitter;EventEmitter.prototype._events=undefined;EventEmitter.prototype._maxListeners=undefined;EventEmitter.defaultMaxListeners=10;EventEmitter.prototype.setMaxListeners=function(n){if(!isNumber(n)||n<0||isNaN(n))throw TypeError(\"n must be a positive number\");this._maxListeners=n;return this};EventEmitter.prototype.emit=function(type){var er,handler,len,args,i,listeners;if(!this._events)this._events={};if(type===\"error\"){if(!this._events.error||isObject(this._events.error)&&!this._events.error.length){er=arguments[1];if(er instanceof Error){throw er}else{var err=new Error('Uncaught, unspecified \"error\" event. ('+er+\")\");err.context=er;throw err}}}handler=this._events[type];if(isUndefined(handler))return false;if(isFunction(handler)){switch(arguments.length){case 1:handler.call(this);break;case 2:handler.call(this,arguments[1]);break;case 3:handler.call(this,arguments[1],arguments[2]);break;default:args=Array.prototype.slice.call(arguments,1);handler.apply(this,args)}}else if(isObject(handler)){args=Array.prototype.slice.call(arguments,1);listeners=handler.slice();len=listeners.length;for(i=0;i<len;i++)listeners[i].apply(this,args)}return true};EventEmitter.prototype.addListener=function(type,listener){var m;if(!isFunction(listener))throw TypeError(\"listener must be a function\");if(!this._events)this._events={};if(this._events.newListener)this.emit(\"newListener\",type,isFunction(listener.listener)?listener.listener:listener);if(!this._events[type])this._events[type]=listener;else if(isObject(this._events[type]))this._events[type].push(listener);else this._events[type]=[this._events[type],listener];if(isObject(this._events[type])&&!this._events[type].warned){if(!isUndefined(this._maxListeners)){m=this._maxListeners}else{m=EventEmitter.defaultMaxListeners}if(m&&m>0&&this._events[type].length>m){this._events[type].warned=true;console.error(\"(node) warning: possible EventEmitter memory \"+\"leak detected. %d listeners added. \"+\"Use emitter.setMaxListeners() to increase limit.\",this._events[type].length);if(typeof console.trace===\"function\"){console.trace()}}}return this};EventEmitter.prototype.on=EventEmitter.prototype.addListener;EventEmitter.prototype.once=function(type,listener){if(!isFunction(listener))throw TypeError(\"listener must be a function\");var fired=false;function g(){this.removeListener(type,g);if(!fired){fired=true;listener.apply(this,arguments)}}g.listener=listener;this.on(type,g);return this};EventEmitter.prototype.removeListener=function(type,listener){var list,position,length,i;if(!isFunction(listener))throw TypeError(\"listener must be a function\");if(!this._events||!this._events[type])return this;list=this._events[type];length=list.length;position=-1;if(list===listener||isFunction(list.listener)&&list.listener===listener){delete this._events[type];if(this._events.removeListener)this.emit(\"removeListener\",type,listener)}else if(isObject(list)){for(i=length;i-- >0;){if(list[i]===listener||list[i].listener&&list[i].listener===listener){position=i;break}}if(position<0)return this;if(list.length===1){list.length=0;delete this._events[type]}else{list.splice(position,1);\n}if(this._events.removeListener)this.emit(\"removeListener\",type,listener)}return this};EventEmitter.prototype.removeAllListeners=function(type){var key,listeners;if(!this._events)return this;if(!this._events.removeListener){if(arguments.length===0)this._events={};else if(this._events[type])delete this._events[type];return this}if(arguments.length===0){for(key in this._events){if(key===\"removeListener\")continue;this.removeAllListeners(key)}this.removeAllListeners(\"removeListener\");this._events={};return this}listeners=this._events[type];if(isFunction(listeners)){this.removeListener(type,listeners)}else if(listeners){while(listeners.length)this.removeListener(type,listeners[listeners.length-1])}delete this._events[type];return this};EventEmitter.prototype.listeners=function(type){var ret;if(!this._events||!this._events[type])ret=[];else if(isFunction(this._events[type]))ret=[this._events[type]];else ret=this._events[type].slice();return ret};EventEmitter.prototype.listenerCount=function(type){if(this._events){var evlistener=this._events[type];if(isFunction(evlistener))return 1;else if(evlistener)return evlistener.length}return 0};EventEmitter.listenerCount=function(emitter,type){return emitter.listenerCount(type)};function isFunction(arg){return typeof arg===\"function\"}function isNumber(arg){return typeof arg===\"number\"}function isObject(arg){return typeof arg===\"object\"&&arg!==null}function isUndefined(arg){return arg===void 0}},{}],29:[function(require,module,exports){module.exports=CollectingHandler;function CollectingHandler(cbs){this._cbs=cbs||{};this.events=[]}var EVENTS=require(\"./\").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name=\"on\"+name;CollectingHandler.prototype[name]=function(){this.events.push([name]);if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name=\"on\"+name;CollectingHandler.prototype[name]=function(a){this.events.push([name,a]);if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name=\"on\"+name;CollectingHandler.prototype[name]=function(a,b){this.events.push([name,a,b]);if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error(\"wrong number of arguments\")}});CollectingHandler.prototype.onreset=function(){this.events=[];if(this._cbs.onreset)this._cbs.onreset()};CollectingHandler.prototype.restart=function(){if(this._cbs.onreset)this._cbs.onreset();for(var i=0,len=this.events.length;i<len;i++){if(this._cbs[this.events[i][0]]){var num=this.events[i].length;if(num===1){this._cbs[this.events[i][0]]()}else if(num===2){this._cbs[this.events[i][0]](this.events[i][1])}else{this._cbs[this.events[i][0]](this.events[i][1],this.events[i][2])}}}}},{\"./\":36}],30:[function(require,module,exports){var index=require(\"./index.js\"),DomHandler=index.DomHandler,DomUtils=index.DomUtils;function FeedHandler(callback,options){this.init(callback,options)}require(\"inherits\")(FeedHandler,DomHandler);FeedHandler.prototype.init=DomHandler;function getElements(what,where){return DomUtils.getElementsByTagName(what,where,true)}function getOneElement(what,where){return DomUtils.getElementsByTagName(what,where,true,1)[0]}function fetch(what,where,recurse){return DomUtils.getText(DomUtils.getElementsByTagName(what,where,recurse,1)).trim()}function addConditionally(obj,prop,what,where,recurse){var tmp=fetch(what,where,recurse);if(tmp)obj[prop]=tmp}var isValidFeed=function(value){return value===\"rss\"||value===\"feed\"||value===\"rdf:RDF\"};FeedHandler.prototype.onend=function(){var feed={},feedRoot=getOneElement(isValidFeed,this.dom),tmp,childs;if(feedRoot){if(feedRoot.name===\"feed\"){childs=feedRoot.children;feed.type=\"atom\";addConditionally(feed,\"id\",\"id\",childs);addConditionally(feed,\"title\",\"title\",childs);if((tmp=getOneElement(\"link\",childs))&&(tmp=tmp.attribs)&&(tmp=tmp.href))feed.link=tmp;addConditionally(feed,\"description\",\"subtitle\",childs);if(tmp=fetch(\"updated\",childs))feed.updated=new Date(tmp);addConditionally(feed,\"author\",\"email\",childs,true);feed.items=getElements(\"entry\",childs).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,\"id\",\"id\",item);addConditionally(entry,\"title\",\"title\",item);if((tmp=getOneElement(\"link\",item))&&(tmp=tmp.attribs)&&(tmp=tmp.href))entry.link=tmp;if(tmp=fetch(\"summary\",item)||fetch(\"content\",item))entry.description=tmp;if(tmp=fetch(\"updated\",item))entry.pubDate=new Date(tmp);return entry})}else{childs=getOneElement(\"channel\",feedRoot.children).children;feed.type=feedRoot.name.substr(0,3);feed.id=\"\";addConditionally(feed,\"title\",\"title\",childs);addConditionally(feed,\"link\",\"link\",childs);addConditionally(feed,\"description\",\"description\",childs);if(tmp=fetch(\"lastBuildDate\",childs))feed.updated=new Date(tmp);addConditionally(feed,\"author\",\"managingEditor\",childs,true);feed.items=getElements(\"item\",feedRoot.children).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,\"id\",\"guid\",item);addConditionally(entry,\"title\",\"title\",item);addConditionally(entry,\"link\",\"link\",item);addConditionally(entry,\"description\",\"description\",item);if(tmp=fetch(\"pubDate\",item))entry.pubDate=new Date(tmp);return entry})}}this.dom=feed;DomHandler.prototype._handleCallback.call(this,feedRoot?null:Error(\"couldn't find root of feed\"))};module.exports=FeedHandler},{\"./index.js\":36,inherits:38}],31:[function(require,module,exports){var Tokenizer=require(\"./Tokenizer.js\");var formTags={input:true,option:true,optgroup:true,select:true,button:true,datalist:true,textarea:true};var openImpliesClose={tr:{tr:true,th:true,td:true},th:{th:true},td:{thead:true,th:true,td:true},body:{head:true,link:true,script:true},li:{li:true},p:{p:true},h1:{p:true},h2:{p:true},h3:{p:true},h4:{p:true},h5:{p:true},h6:{p:true},select:formTags,input:formTags,output:formTags,button:formTags,datalist:formTags,textarea:formTags,option:{option:true},optgroup:{optgroup:true}};var voidElements={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true,path:true,circle:true,ellipse:true,line:true,rect:true,use:true,stop:true,polyline:true,polygon:true};var re_nameEnd=/\\s|\\//;function Parser(cbs,options){this._options=options||{};this._cbs=cbs||{};this._tagname=\"\";this._attribname=\"\";this._attribvalue=\"\";this._attribs=null;this._stack=[];this.startIndex=0;this.endIndex=null;this._lowerCaseTagNames=\"lowerCaseTags\"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode;this._lowerCaseAttributeNames=\"lowerCaseAttributeNames\"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode;if(this._options.Tokenizer){Tokenizer=this._options.Tokenizer}this._tokenizer=new Tokenizer(this._options,this);if(this._cbs.onparserinit)this._cbs.onparserinit(this)}require(\"inherits\")(Parser,require(\"events\").EventEmitter);Parser.prototype._updatePosition=function(initialOffset){if(this.endIndex===null){if(this._tokenizer._sectionStart<=initialOffset){this.startIndex=0}else{this.startIndex=this._tokenizer._sectionStart-initialOffset}}else this.startIndex=this.endIndex+1;this.endIndex=this._tokenizer.getAbsoluteIndex()};Parser.prototype.ontext=function(data){this._updatePosition(1);this.endIndex--;if(this._cbs.ontext)this._cbs.ontext(data)};Parser.prototype.onopentagname=function(name){if(this._lowerCaseTagNames){name=name.toLowerCase()}this._tagname=name;if(!this._options.xmlMode&&name in openImpliesClose){for(var el;(el=this._stack[this._stack.length-1])in openImpliesClose[name];this.onclosetag(el));}if(this._options.xmlMode||!(name in voidElements)){this._stack.push(name)}if(this._cbs.onopentagname)this._cbs.onopentagname(name);if(this._cbs.onopentag)this._attribs={}};Parser.prototype.onopentagend=function(){this._updatePosition(1);if(this._attribs){if(this._cbs.onopentag)this._cbs.onopentag(this._tagname,this._attribs);this._attribs=null}if(!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in voidElements){this._cbs.onclosetag(this._tagname)}this._tagname=\"\"};Parser.prototype.onclosetag=function(name){this._updatePosition(1);if(this._lowerCaseTagNames){name=name.toLowerCase()}if(this._stack.length&&(!(name in voidElements)||this._options.xmlMode)){var pos=this._stack.lastIndexOf(name);if(pos!==-1){if(this._cbs.onclosetag){pos=this._stack.length-pos;while(pos--)this._cbs.onclosetag(this._stack.pop())}else this._stack.length=pos}else if(name===\"p\"&&!this._options.xmlMode){this.onopentagname(name);this._closeCurrentTag()}}else if(!this._options.xmlMode&&(name===\"br\"||name===\"p\")){this.onopentagname(name);this._closeCurrentTag()}};Parser.prototype.onselfclosingtag=function(){if(this._options.xmlMode||this._options.recognizeSelfClosing){this._closeCurrentTag()}else{this.onopentagend()}};Parser.prototype._closeCurrentTag=function(){var name=this._tagname;this.onopentagend();if(this._stack[this._stack.length-1]===name){if(this._cbs.onclosetag){this._cbs.onclosetag(name)}this._stack.pop()}};Parser.prototype.onattribname=function(name){if(this._lowerCaseAttributeNames){name=name.toLowerCase()}this._attribname=name};Parser.prototype.onattribdata=function(value){this._attribvalue+=value};Parser.prototype.onattribend=function(){if(this._cbs.onattribute)this._cbs.onattribute(this._attribname,this._attribvalue);if(this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)){this._attribs[this._attribname]=this._attribvalue}this._attribname=\"\";this._attribvalue=\"\"};Parser.prototype._getInstructionName=function(value){var idx=value.search(re_nameEnd),name=idx<0?value:value.substr(0,idx);if(this._lowerCaseTagNames){name=name.toLowerCase()}return name};Parser.prototype.ondeclaration=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction(\"!\"+name,\"!\"+value)}};Parser.prototype.onprocessinginstruction=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction(\"?\"+name,\"?\"+value)}};Parser.prototype.oncomment=function(value){this._updatePosition(4);if(this._cbs.oncomment)this._cbs.oncomment(value);if(this._cbs.oncommentend)this._cbs.oncommentend()};Parser.prototype.oncdata=function(value){this._updatePosition(1);if(this._options.xmlMode||this._options.recognizeCDATA){if(this._cbs.oncdatastart)this._cbs.oncdatastart();if(this._cbs.ontext)this._cbs.ontext(value);if(this._cbs.oncdataend)this._cbs.oncdataend()}else{this.oncomment(\"[CDATA[\"+value+\"]]\")}};Parser.prototype.onerror=function(err){if(this._cbs.onerror)this._cbs.onerror(err)};Parser.prototype.onend=function(){if(this._cbs.onclosetag){for(var i=this._stack.length;i>0;this._cbs.onclosetag(this._stack[--i]));}if(this._cbs.onend)this._cbs.onend()};Parser.prototype.reset=function(){if(this._cbs.onreset)this._cbs.onreset();this._tokenizer.reset();this._tagname=\"\";this._attribname=\"\";this._attribs=null;this._stack=[];if(this._cbs.onparserinit)this._cbs.onparserinit(this)};Parser.prototype.parseComplete=function(data){this.reset();this.end(data)};Parser.prototype.write=function(chunk){this._tokenizer.write(chunk)};Parser.prototype.end=function(chunk){this._tokenizer.end(chunk)};Parser.prototype.pause=function(){this._tokenizer.pause()};Parser.prototype.resume=function(){this._tokenizer.resume()};Parser.prototype.parseChunk=Parser.prototype.write;Parser.prototype.done=Parser.prototype.end;module.exports=Parser},{\"./Tokenizer.js\":34,events:28,inherits:38}],32:[function(require,module,exports){module.exports=ProxyHandler;function ProxyHandler(cbs){this._cbs=cbs||{}}var EVENTS=require(\"./\").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name=\"on\"+name;ProxyHandler.prototype[name]=function(){if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name=\"on\"+name;ProxyHandler.prototype[name]=function(a){if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name=\"on\"+name;ProxyHandler.prototype[name]=function(a,b){if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error(\"wrong number of arguments\")}})},{\"./\":36}],33:[function(require,module,exports){module.exports=Stream;var Parser=require(\"./WritableStream.js\");function Stream(options){Parser.call(this,new Cbs(this),options)}require(\"inherits\")(Stream,Parser);Stream.prototype.readable=true;function Cbs(scope){this.scope=scope}var EVENTS=require(\"../\").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){Cbs.prototype[\"on\"+name]=function(){this.scope.emit(name)}}else if(EVENTS[name]===1){Cbs.prototype[\"on\"+name]=function(a){this.scope.emit(name,a)}}else if(EVENTS[name]===2){Cbs.prototype[\"on\"+name]=function(a,b){this.scope.emit(name,a,b)}}else{throw Error(\"wrong number of arguments!\")}})},{\"../\":36,\"./WritableStream.js\":35,inherits:38}],34:[function(require,module,exports){module.exports=Tokenizer;var decodeCodePoint=require(\"entities/lib/decode_codepoint.js\"),entityMap=require(\"entities/maps/entities.json\"),legacyMap=require(\"entities/maps/legacy.json\"),xmlMap=require(\"entities/maps/xml.json\"),i=0,TEXT=i++,BEFORE_TAG_NAME=i++,IN_TAG_NAME=i++,IN_SELF_CLOSING_TAG=i++,BEFORE_CLOSING_TAG_NAME=i++,IN_CLOSING_TAG_NAME=i++,AFTER_CLOSING_TAG_NAME=i++,BEFORE_ATTRIBUTE_NAME=i++,IN_ATTRIBUTE_NAME=i++,AFTER_ATTRIBUTE_NAME=i++,BEFORE_ATTRIBUTE_VALUE=i++,IN_ATTRIBUTE_VALUE_DQ=i++,IN_ATTRIBUTE_VALUE_SQ=i++,IN_ATTRIBUTE_VALUE_NQ=i++,BEFORE_DECLARATION=i++,IN_DECLARATION=i++,IN_PROCESSING_INSTRUCTION=i++,BEFORE_COMMENT=i++,IN_COMMENT=i++,AFTER_COMMENT_1=i++,AFTER_COMMENT_2=i++,BEFORE_CDATA_1=i++,BEFORE_CDATA_2=i++,BEFORE_CDATA_3=i++,BEFORE_CDATA_4=i++,BEFORE_CDATA_5=i++,BEFORE_CDATA_6=i++,IN_CDATA=i++,AFTER_CDATA_1=i++,AFTER_CDATA_2=i++,BEFORE_SPECIAL=i++,BEFORE_SPECIAL_END=i++,BEFORE_SCRIPT_1=i++,BEFORE_SCRIPT_2=i++,BEFORE_SCRIPT_3=i++,BEFORE_SCRIPT_4=i++,BEFORE_SCRIPT_5=i++,AFTER_SCRIPT_1=i++,AFTER_SCRIPT_2=i++,AFTER_SCRIPT_3=i++,AFTER_SCRIPT_4=i++,AFTER_SCRIPT_5=i++,BEFORE_STYLE_1=i++,BEFORE_STYLE_2=i++,BEFORE_STYLE_3=i++,BEFORE_STYLE_4=i++,AFTER_STYLE_1=i++,AFTER_STYLE_2=i++,AFTER_STYLE_3=i++,AFTER_STYLE_4=i++,BEFORE_ENTITY=i++,BEFORE_NUMERIC_ENTITY=i++,IN_NAMED_ENTITY=i++,IN_NUMERIC_ENTITY=i++,IN_HEX_ENTITY=i++,j=0,SPECIAL_NONE=j++,SPECIAL_SCRIPT=j++,SPECIAL_STYLE=j++;function whitespace(c){return c===\" \"||c===\"\\n\"||c===\"\\t\"||c===\"\\f\"||c===\"\\r\"}function characterState(char,SUCCESS){return function(c){if(c===char)this._state=SUCCESS}}function ifElseState(upper,SUCCESS,FAILURE){var lower=upper.toLowerCase();if(upper===lower){return function(c){if(c===lower){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}else{return function(c){if(c===lower||c===upper){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}}function consumeSpecialNameChar(upper,NEXT_STATE){var lower=upper.toLowerCase();return function(c){if(c===lower||c===upper){this._state=NEXT_STATE}else{this._state=IN_TAG_NAME;this._index--}}}function Tokenizer(options,cbs){this._state=TEXT;this._buffer=\"\";this._sectionStart=0;this._index=0;this._bufferOffset=0;this._baseState=TEXT;this._special=SPECIAL_NONE;this._cbs=cbs;this._running=true;this._ended=false;this._xmlMode=!!(options&&options.xmlMode);this._decodeEntities=!!(options&&options.decodeEntities)}Tokenizer.prototype._stateText=function(c){if(c===\"<\"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._state=BEFORE_TAG_NAME;this._sectionStart=this._index}else if(this._decodeEntities&&this._special===SPECIAL_NONE&&c===\"&\"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._baseState=TEXT;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeTagName=function(c){if(c===\"/\"){this._state=BEFORE_CLOSING_TAG_NAME}else if(c===\"<\"){this._cbs.ontext(this._getSection());this._sectionStart=this._index}else if(c===\">\"||this._special!==SPECIAL_NONE||whitespace(c)){this._state=TEXT}else if(c===\"!\"){this._state=BEFORE_DECLARATION;this._sectionStart=this._index+1}else if(c===\"?\"){this._state=IN_PROCESSING_INSTRUCTION;this._sectionStart=this._index+1}else{this._state=!this._xmlMode&&(c===\"s\"||c===\"S\")?BEFORE_SPECIAL:IN_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInTagName=function(c){if(c===\"/\"||c===\">\"||whitespace(c)){this._emitToken(\"onopentagname\");this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateBeforeCloseingTagName=function(c){if(whitespace(c));else if(c===\">\"){this._state=TEXT}else if(this._special!==SPECIAL_NONE){if(c===\"s\"||c===\"S\"){this._state=BEFORE_SPECIAL_END}else{this._state=TEXT;this._index--}}else{this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInCloseingTagName=function(c){if(c===\">\"||whitespace(c)){this._emitToken(\"onclosetag\");this._state=AFTER_CLOSING_TAG_NAME;this._index--}};Tokenizer.prototype._stateAfterCloseingTagName=function(c){if(c===\">\"){this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeAttributeName=function(c){if(c===\">\"){this._cbs.onopentagend();this._state=TEXT;this._sectionStart=this._index+1}else if(c===\"/\"){this._state=IN_SELF_CLOSING_TAG}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInSelfClosingTag=function(c){if(c===\">\"){this._cbs.onselfclosingtag();this._state=TEXT;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateInAttributeName=function(c){if(c===\"=\"||c===\"/\"||c===\">\"||whitespace(c)){this._cbs.onattribname(this._getSection());this._sectionStart=-1;this._state=AFTER_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateAfterAttributeName=function(c){if(c===\"=\"){this._state=BEFORE_ATTRIBUTE_VALUE}else if(c===\"/\"||c===\">\"){this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(!whitespace(c)){this._cbs.onattribend();this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeAttributeValue=function(c){if(c==='\"'){this._state=IN_ATTRIBUTE_VALUE_DQ;this._sectionStart=this._index+1}else if(c===\"'\"){this._state=IN_ATTRIBUTE_VALUE_SQ;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_VALUE_NQ;this._sectionStart=this._index;this._index--}};Tokenizer.prototype._stateInAttributeValueDoubleQuotes=function(c){if(c==='\"'){this._emitToken(\"onattribdata\");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c===\"&\"){this._emitToken(\"onattribdata\");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueSingleQuotes=function(c){if(c===\"'\"){this._emitToken(\"onattribdata\");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c===\"&\"){this._emitToken(\"onattribdata\");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueNoQuotes=function(c){if(whitespace(c)||c===\">\"){this._emitToken(\"onattribdata\");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(this._decodeEntities&&c===\"&\"){this._emitToken(\"onattribdata\");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeDeclaration=function(c){this._state=c===\"[\"?BEFORE_CDATA_1:c===\"-\"?BEFORE_COMMENT:IN_DECLARATION};Tokenizer.prototype._stateInDeclaration=function(c){if(c===\">\"){this._cbs.ondeclaration(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateInProcessingInstruction=function(c){if(c===\">\"){this._cbs.onprocessinginstruction(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeComment=function(c){if(c===\"-\"){this._state=IN_COMMENT;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION}};Tokenizer.prototype._stateInComment=function(c){if(c===\"-\")this._state=AFTER_COMMENT_1};Tokenizer.prototype._stateAfterComment1=function(c){if(c===\"-\"){this._state=AFTER_COMMENT_2}else{this._state=IN_COMMENT}};Tokenizer.prototype._stateAfterComment2=function(c){if(c===\">\"){this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!==\"-\"){this._state=IN_COMMENT}};Tokenizer.prototype._stateBeforeCdata1=ifElseState(\"C\",BEFORE_CDATA_2,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata2=ifElseState(\"D\",BEFORE_CDATA_3,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata3=ifElseState(\"A\",BEFORE_CDATA_4,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata4=ifElseState(\"T\",BEFORE_CDATA_5,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata5=ifElseState(\"A\",BEFORE_CDATA_6,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata6=function(c){if(c===\"[\"){this._state=IN_CDATA;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION;this._index--}};Tokenizer.prototype._stateInCdata=function(c){if(c===\"]\")this._state=AFTER_CDATA_1};Tokenizer.prototype._stateAfterCdata1=characterState(\"]\",AFTER_CDATA_2);Tokenizer.prototype._stateAfterCdata2=function(c){if(c===\">\"){this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!==\"]\"){this._state=IN_CDATA}};Tokenizer.prototype._stateBeforeSpecial=function(c){if(c===\"c\"||c===\"C\"){this._state=BEFORE_SCRIPT_1}else if(c===\"t\"||c===\"T\"){this._state=BEFORE_STYLE_1}else{this._state=IN_TAG_NAME;this._index--}};Tokenizer.prototype._stateBeforeSpecialEnd=function(c){if(this._special===SPECIAL_SCRIPT&&(c===\"c\"||c===\"C\")){this._state=AFTER_SCRIPT_1}else if(this._special===SPECIAL_STYLE&&(c===\"t\"||c===\"T\")){this._state=AFTER_STYLE_1}else this._state=TEXT};Tokenizer.prototype._stateBeforeScript1=consumeSpecialNameChar(\"R\",BEFORE_SCRIPT_2);Tokenizer.prototype._stateBeforeScript2=consumeSpecialNameChar(\"I\",BEFORE_SCRIPT_3);Tokenizer.prototype._stateBeforeScript3=consumeSpecialNameChar(\"P\",BEFORE_SCRIPT_4);Tokenizer.prototype._stateBeforeScript4=consumeSpecialNameChar(\"T\",BEFORE_SCRIPT_5);Tokenizer.prototype._stateBeforeScript5=function(c){if(c===\"/\"||c===\">\"||whitespace(c)){this._special=SPECIAL_SCRIPT}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterScript1=ifElseState(\"R\",AFTER_SCRIPT_2,TEXT);Tokenizer.prototype._stateAfterScript2=ifElseState(\"I\",AFTER_SCRIPT_3,TEXT);Tokenizer.prototype._stateAfterScript3=ifElseState(\"P\",AFTER_SCRIPT_4,TEXT);Tokenizer.prototype._stateAfterScript4=ifElseState(\"T\",AFTER_SCRIPT_5,TEXT);Tokenizer.prototype._stateAfterScript5=function(c){if(c===\">\"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-6;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeStyle1=consumeSpecialNameChar(\"Y\",BEFORE_STYLE_2);Tokenizer.prototype._stateBeforeStyle2=consumeSpecialNameChar(\"L\",BEFORE_STYLE_3);Tokenizer.prototype._stateBeforeStyle3=consumeSpecialNameChar(\"E\",BEFORE_STYLE_4);Tokenizer.prototype._stateBeforeStyle4=function(c){if(c===\"/\"||c===\">\"||whitespace(c)){this._special=SPECIAL_STYLE}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterStyle1=ifElseState(\"Y\",AFTER_STYLE_2,TEXT);Tokenizer.prototype._stateAfterStyle2=ifElseState(\"L\",AFTER_STYLE_3,TEXT);Tokenizer.prototype._stateAfterStyle3=ifElseState(\"E\",AFTER_STYLE_4,TEXT);Tokenizer.prototype._stateAfterStyle4=function(c){if(c===\">\"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-5;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeEntity=ifElseState(\"#\",BEFORE_NUMERIC_ENTITY,IN_NAMED_ENTITY);Tokenizer.prototype._stateBeforeNumericEntity=ifElseState(\"X\",IN_HEX_ENTITY,IN_NUMERIC_ENTITY);Tokenizer.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var entity=this._buffer.substring(this._sectionStart+1,this._index),map=this._xmlMode?xmlMap:entityMap;if(map.hasOwnProperty(entity)){this._emitPartial(map[entity]);this._sectionStart=this._index+1}}};Tokenizer.prototype._parseLegacyEntity=function(){var start=this._sectionStart+1,limit=this._index-start;if(limit>6)limit=6;while(limit>=2){var entity=this._buffer.substr(start,limit);if(legacyMap.hasOwnProperty(entity)){this._emitPartial(legacyMap[entity]);this._sectionStart+=limit+1;return}else{limit--}}};Tokenizer.prototype._stateInNamedEntity=function(c){if(c===\";\"){this._parseNamedEntityStrict();if(this._sectionStart+1<this._index&&!this._xmlMode){this._parseLegacyEntity()}this._state=this._baseState}else if((c<\"a\"||c>\"z\")&&(c<\"A\"||c>\"Z\")&&(c<\"0\"||c>\"9\")){if(this._xmlMode);else if(this._sectionStart+1===this._index);else if(this._baseState!==TEXT){if(c!==\"=\"){this._parseNamedEntityStrict()}}else{this._parseLegacyEntity()}this._state=this._baseState;this._index--}};Tokenizer.prototype._decodeNumericEntity=function(offset,base){var sectionStart=this._sectionStart+offset;if(sectionStart!==this._index){var entity=this._buffer.substring(sectionStart,this._index);var parsed=parseInt(entity,base);this._emitPartial(decodeCodePoint(parsed));this._sectionStart=this._index}else{this._sectionStart--}this._state=this._baseState};Tokenizer.prototype._stateInNumericEntity=function(c){if(c===\";\"){this._decodeNumericEntity(2,10);this._sectionStart++}else if(c<\"0\"||c>\"9\"){if(!this._xmlMode){this._decodeNumericEntity(2,10)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._stateInHexEntity=function(c){if(c===\";\"){this._decodeNumericEntity(3,16);this._sectionStart++}else if((c<\"a\"||c>\"f\")&&(c<\"A\"||c>\"F\")&&(c<\"0\"||c>\"9\")){if(!this._xmlMode){this._decodeNumericEntity(3,16)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._cleanup=function(){if(this._sectionStart<0){this._buffer=\"\";this._index=0;this._bufferOffset+=this._index}else if(this._running){if(this._state===TEXT){if(this._sectionStart!==this._index){this._cbs.ontext(this._buffer.substr(this._sectionStart))}this._buffer=\"\";this._bufferOffset+=this._index;this._index=0}else if(this._sectionStart===this._index){this._buffer=\"\";this._bufferOffset+=this._index;this._index=0}else{this._buffer=this._buffer.substr(this._sectionStart);this._index-=this._sectionStart;this._bufferOffset+=this._sectionStart}this._sectionStart=0}};Tokenizer.prototype.write=function(chunk){if(this._ended)this._cbs.onerror(Error(\".write() after done!\"));this._buffer+=chunk;this._parse()};Tokenizer.prototype._parse=function(){while(this._index<this._buffer.length&&this._running){var c=this._buffer.charAt(this._index);if(this._state===TEXT){this._stateText(c)}else if(this._state===BEFORE_TAG_NAME){this._stateBeforeTagName(c)}else if(this._state===IN_TAG_NAME){this._stateInTagName(c)}else if(this._state===BEFORE_CLOSING_TAG_NAME){this._stateBeforeCloseingTagName(c)}else if(this._state===IN_CLOSING_TAG_NAME){this._stateInCloseingTagName(c)}else if(this._state===AFTER_CLOSING_TAG_NAME){this._stateAfterCloseingTagName(c)}else if(this._state===IN_SELF_CLOSING_TAG){this._stateInSelfClosingTag(c)}else if(this._state===BEFORE_ATTRIBUTE_NAME){this._stateBeforeAttributeName(c)}else if(this._state===IN_ATTRIBUTE_NAME){this._stateInAttributeName(c)}else if(this._state===AFTER_ATTRIBUTE_NAME){this._stateAfterAttributeName(c)}else if(this._state===BEFORE_ATTRIBUTE_VALUE){this._stateBeforeAttributeValue(c)}else if(this._state===IN_ATTRIBUTE_VALUE_DQ){this._stateInAttributeValueDoubleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_SQ){this._stateInAttributeValueSingleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_NQ){this._stateInAttributeValueNoQuotes(c)}else if(this._state===BEFORE_DECLARATION){this._stateBeforeDeclaration(c)}else if(this._state===IN_DECLARATION){this._stateInDeclaration(c)}else if(this._state===IN_PROCESSING_INSTRUCTION){this._stateInProcessingInstruction(c)}else if(this._state===BEFORE_COMMENT){this._stateBeforeComment(c)}else if(this._state===IN_COMMENT){this._stateInComment(c)}else if(this._state===AFTER_COMMENT_1){this._stateAfterComment1(c)}else if(this._state===AFTER_COMMENT_2){this._stateAfterComment2(c)}else if(this._state===BEFORE_CDATA_1){this._stateBeforeCdata1(c)}else if(this._state===BEFORE_CDATA_2){this._stateBeforeCdata2(c)}else if(this._state===BEFORE_CDATA_3){this._stateBeforeCdata3(c)}else if(this._state===BEFORE_CDATA_4){this._stateBeforeCdata4(c)}else if(this._state===BEFORE_CDATA_5){this._stateBeforeCdata5(c)}else if(this._state===BEFORE_CDATA_6){this._stateBeforeCdata6(c)}else if(this._state===IN_CDATA){this._stateInCdata(c)}else if(this._state===AFTER_CDATA_1){this._stateAfterCdata1(c)}else if(this._state===AFTER_CDATA_2){this._stateAfterCdata2(c)}else if(this._state===BEFORE_SPECIAL){this._stateBeforeSpecial(c)}else if(this._state===BEFORE_SPECIAL_END){this._stateBeforeSpecialEnd(c)}else if(this._state===BEFORE_SCRIPT_1){this._stateBeforeScript1(c)}else if(this._state===BEFORE_SCRIPT_2){this._stateBeforeScript2(c)}else if(this._state===BEFORE_SCRIPT_3){this._stateBeforeScript3(c)}else if(this._state===BEFORE_SCRIPT_4){this._stateBeforeScript4(c)}else if(this._state===BEFORE_SCRIPT_5){this._stateBeforeScript5(c)}else if(this._state===AFTER_SCRIPT_1){this._stateAfterScript1(c)}else if(this._state===AFTER_SCRIPT_2){this._stateAfterScript2(c)}else if(this._state===AFTER_SCRIPT_3){this._stateAfterScript3(c)}else if(this._state===AFTER_SCRIPT_4){this._stateAfterScript4(c)}else if(this._state===AFTER_SCRIPT_5){this._stateAfterScript5(c)}else if(this._state===BEFORE_STYLE_1){this._stateBeforeStyle1(c)}else if(this._state===BEFORE_STYLE_2){this._stateBeforeStyle2(c)}else if(this._state===BEFORE_STYLE_3){this._stateBeforeStyle3(c)}else if(this._state===BEFORE_STYLE_4){this._stateBeforeStyle4(c)}else if(this._state===AFTER_STYLE_1){this._stateAfterStyle1(c)}else if(this._state===AFTER_STYLE_2){this._stateAfterStyle2(c)}else if(this._state===AFTER_STYLE_3){this._stateAfterStyle3(c)}else if(this._state===AFTER_STYLE_4){this._stateAfterStyle4(c)}else if(this._state===BEFORE_ENTITY){this._stateBeforeEntity(c)}else if(this._state===BEFORE_NUMERIC_ENTITY){this._stateBeforeNumericEntity(c)}else if(this._state===IN_NAMED_ENTITY){this._stateInNamedEntity(c)}else if(this._state===IN_NUMERIC_ENTITY){this._stateInNumericEntity(c)}else if(this._state===IN_HEX_ENTITY){this._stateInHexEntity(c)}else{this._cbs.onerror(Error(\"unknown _state\"),this._state)}this._index++}this._cleanup()};Tokenizer.prototype.pause=function(){this._running=false};Tokenizer.prototype.resume=function(){this._running=true;if(this._index<this._buffer.length){this._parse()}if(this._ended){this._finish()}};Tokenizer.prototype.end=function(chunk){if(this._ended)this._cbs.onerror(Error(\".end() after done!\"));if(chunk)this.write(chunk);this._ended=true;if(this._running)this._finish()};Tokenizer.prototype._finish=function(){if(this._sectionStart<this._index){this._handleTrailingData()}this._cbs.onend()};Tokenizer.prototype._handleTrailingData=function(){var data=this._buffer.substr(this._sectionStart);if(this._state===IN_CDATA||this._state===AFTER_CDATA_1||this._state===AFTER_CDATA_2){this._cbs.oncdata(data)}else if(this._state===IN_COMMENT||this._state===AFTER_COMMENT_1||this._state===AFTER_COMMENT_2){this._cbs.oncomment(data)}else if(this._state===IN_NAMED_ENTITY&&!this._xmlMode){this._parseLegacyEntity();if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_NUMERIC_ENTITY&&!this._xmlMode){this._decodeNumericEntity(2,10);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_HEX_ENTITY&&!this._xmlMode){this._decodeNumericEntity(3,16);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state!==IN_TAG_NAME&&this._state!==BEFORE_ATTRIBUTE_NAME&&this._state!==BEFORE_ATTRIBUTE_VALUE&&this._state!==AFTER_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_VALUE_SQ&&this._state!==IN_ATTRIBUTE_VALUE_DQ&&this._state!==IN_ATTRIBUTE_VALUE_NQ&&this._state!==IN_CLOSING_TAG_NAME){\nthis._cbs.ontext(data)}};Tokenizer.prototype.reset=function(){Tokenizer.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)};Tokenizer.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index};Tokenizer.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)};Tokenizer.prototype._emitToken=function(name){this._cbs[name](this._getSection());this._sectionStart=-1};Tokenizer.prototype._emitPartial=function(value){if(this._baseState!==TEXT){this._cbs.onattribdata(value)}else{this._cbs.ontext(value)}}},{\"entities/lib/decode_codepoint.js\":22,\"entities/maps/entities.json\":25,\"entities/maps/legacy.json\":26,\"entities/maps/xml.json\":27}],35:[function(require,module,exports){module.exports=Stream;var Parser=require(\"./Parser.js\"),WritableStream=require(\"stream\").Writable||require(\"readable-stream\").Writable,StringDecoder=require(\"string_decoder\").StringDecoder,Buffer=require(\"buffer\").Buffer;function Stream(cbs,options){var parser=this._parser=new Parser(cbs,options);var decoder=this._decoder=new StringDecoder;WritableStream.call(this,{decodeStrings:false});this.once(\"finish\",function(){parser.end(decoder.end())})}require(\"inherits\")(Stream,WritableStream);WritableStream.prototype._write=function(chunk,encoding,cb){if(chunk instanceof Buffer)chunk=this._decoder.write(chunk);this._parser.write(chunk);cb()}},{\"./Parser.js\":31,buffer:5,inherits:38,\"readable-stream\":3,stream:55,string_decoder:56}],36:[function(require,module,exports){var Parser=require(\"./Parser.js\"),DomHandler=require(\"domhandler\");function defineProp(name,value){delete module.exports[name];module.exports[name]=value;return value}module.exports={Parser:Parser,Tokenizer:require(\"./Tokenizer.js\"),ElementType:require(\"domelementtype\"),DomHandler:DomHandler,get FeedHandler(){return defineProp(\"FeedHandler\",require(\"./FeedHandler.js\"))},get Stream(){return defineProp(\"Stream\",require(\"./Stream.js\"))},get WritableStream(){return defineProp(\"WritableStream\",require(\"./WritableStream.js\"))},get ProxyHandler(){return defineProp(\"ProxyHandler\",require(\"./ProxyHandler.js\"))},get DomUtils(){return defineProp(\"DomUtils\",require(\"domutils\"))},get CollectingHandler(){return defineProp(\"CollectingHandler\",require(\"./CollectingHandler.js\"))},DefaultHandler:DomHandler,get RssHandler(){return defineProp(\"RssHandler\",this.FeedHandler)},parseDOM:function(data,options){var handler=new DomHandler(options);new Parser(handler,options).end(data);return handler.dom},parseFeed:function(feed,options){var handler=new module.exports.FeedHandler(options);new Parser(handler,options).end(feed);return handler.dom},createDomStream:function(cb,options,elementCb){var handler=new DomHandler(cb,options,elementCb);return new Parser(handler,options)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},{\"./CollectingHandler.js\":29,\"./FeedHandler.js\":30,\"./Parser.js\":31,\"./ProxyHandler.js\":32,\"./Stream.js\":33,\"./Tokenizer.js\":34,\"./WritableStream.js\":35,domelementtype:9,domhandler:10,domutils:13}],37:[function(require,module,exports){exports.read=function(buffer,offset,isLE,mLen,nBytes){var e,m;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var nBits=-7;var i=isLE?nBytes-1:0;var d=isLE?-1:1;var s=buffer[offset+i];i+=d;e=s&(1<<-nBits)-1;s>>=-nBits;nBits+=eLen;for(;nBits>0;e=e*256+buffer[offset+i],i+=d,nBits-=8){}m=e&(1<<-nBits)-1;e>>=-nBits;nBits+=mLen;for(;nBits>0;m=m*256+buffer[offset+i],i+=d,nBits-=8){}if(e===0){e=1-eBias}else if(e===eMax){return m?NaN:(s?-1:1)*Infinity}else{m=m+Math.pow(2,mLen);e=e-eBias}return(s?-1:1)*m*Math.pow(2,e-mLen)};exports.write=function(buffer,value,offset,isLE,mLen,nBytes){var e,m,c;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var rt=mLen===23?Math.pow(2,-24)-Math.pow(2,-77):0;var i=isLE?0:nBytes-1;var d=isLE?1:-1;var s=value<0||value===0&&1/value<0?1:0;value=Math.abs(value);if(isNaN(value)||value===Infinity){m=isNaN(value)?1:0;e=eMax}else{e=Math.floor(Math.log(value)/Math.LN2);if(value*(c=Math.pow(2,-e))<1){e--;c*=2}if(e+eBias>=1){value+=rt/c}else{value+=rt*Math.pow(2,1-eBias)}if(value*c>=2){e++;c/=2}if(e+eBias>=eMax){m=0;e=eMax}else if(e+eBias>=1){m=(value*c-1)*Math.pow(2,mLen);e=e+eBias}else{m=value*Math.pow(2,eBias-1)*Math.pow(2,mLen);e=0}}for(;mLen>=8;buffer[offset+i]=m&255,i+=d,m/=256,mLen-=8){}e=e<<mLen|m;eLen+=mLen;for(;eLen>0;buffer[offset+i]=e&255,i+=d,e/=256,eLen-=8){}buffer[offset+i-d]|=s*128}},{}],38:[function(require,module,exports){if(typeof Object.create===\"function\"){module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;ctor.prototype=Object.create(superCtor.prototype,{constructor:{value:ctor,enumerable:false,writable:true,configurable:true}})}}else{module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;var TempCtor=function(){};TempCtor.prototype=superCtor.prototype;ctor.prototype=new TempCtor;ctor.prototype.constructor=ctor}}},{}],39:[function(require,module,exports){module.exports=function(obj){return obj!=null&&(isBuffer(obj)||isSlowBuffer(obj)||!!obj._isBuffer)};function isBuffer(obj){return!!obj.constructor&&typeof obj.constructor.isBuffer===\"function\"&&obj.constructor.isBuffer(obj)}function isSlowBuffer(obj){return typeof obj.readFloatLE===\"function\"&&typeof obj.slice===\"function\"&&isBuffer(obj.slice(0,0))}},{}],40:[function(require,module,exports){var toString={}.toString;module.exports=Array.isArray||function(arr){return toString.call(arr)==\"[object Array]\"}},{}],41:[function(require,module,exports){(function(process){\"use strict\";if(!process.version||process.version.indexOf(\"v0.\")===0||process.version.indexOf(\"v1.\")===0&&process.version.indexOf(\"v1.8.\")!==0){module.exports=nextTick}else{module.exports=process.nextTick}function nextTick(fn,arg1,arg2,arg3){if(typeof fn!==\"function\"){throw new TypeError('\"callback\" argument must be a function')}var len=arguments.length;var args,i;switch(len){case 0:case 1:return process.nextTick(fn);case 2:return process.nextTick(function afterTickOne(){fn.call(null,arg1)});case 3:return process.nextTick(function afterTickTwo(){fn.call(null,arg1,arg2)});case 4:return process.nextTick(function afterTickThree(){fn.call(null,arg1,arg2,arg3)});default:args=new Array(len-1);i=0;while(i<args.length){args[i++]=arguments[i]}return process.nextTick(function afterTick(){fn.apply(null,args)})}}}).call(this,require(\"_process\"))},{_process:42}],42:[function(require,module,exports){var process=module.exports={};var cachedSetTimeout;var cachedClearTimeout;function defaultSetTimout(){throw new Error(\"setTimeout has not been defined\")}function defaultClearTimeout(){throw new Error(\"clearTimeout has not been defined\")}(function(){try{if(typeof setTimeout===\"function\"){cachedSetTimeout=setTimeout}else{cachedSetTimeout=defaultSetTimout}}catch(e){cachedSetTimeout=defaultSetTimout}try{if(typeof clearTimeout===\"function\"){cachedClearTimeout=clearTimeout}else{cachedClearTimeout=defaultClearTimeout}}catch(e){cachedClearTimeout=defaultClearTimeout}})();function runTimeout(fun){if(cachedSetTimeout===setTimeout){return setTimeout(fun,0)}if((cachedSetTimeout===defaultSetTimout||!cachedSetTimeout)&&setTimeout){cachedSetTimeout=setTimeout;return setTimeout(fun,0)}try{return cachedSetTimeout(fun,0)}catch(e){try{return cachedSetTimeout.call(null,fun,0)}catch(e){return cachedSetTimeout.call(this,fun,0)}}}function runClearTimeout(marker){if(cachedClearTimeout===clearTimeout){return clearTimeout(marker)}if((cachedClearTimeout===defaultClearTimeout||!cachedClearTimeout)&&clearTimeout){cachedClearTimeout=clearTimeout;return clearTimeout(marker)}try{return cachedClearTimeout(marker)}catch(e){try{return cachedClearTimeout.call(null,marker)}catch(e){return cachedClearTimeout.call(this,marker)}}}var queue=[];var draining=false;var currentQueue;var queueIndex=-1;function cleanUpNextTick(){if(!draining||!currentQueue){return}draining=false;if(currentQueue.length){queue=currentQueue.concat(queue)}else{queueIndex=-1}if(queue.length){drainQueue()}}function drainQueue(){if(draining){return}var timeout=runTimeout(cleanUpNextTick);draining=true;var len=queue.length;while(len){currentQueue=queue;queue=[];while(++queueIndex<len){if(currentQueue){currentQueue[queueIndex].run()}}queueIndex=-1;len=queue.length}currentQueue=null;draining=false;runClearTimeout(timeout)}process.nextTick=function(fun){var args=new Array(arguments.length-1);if(arguments.length>1){for(var i=1;i<arguments.length;i++){args[i-1]=arguments[i]}}queue.push(new Item(fun,args));if(queue.length===1&&!draining){runTimeout(drainQueue)}};function Item(fun,array){this.fun=fun;this.array=array}Item.prototype.run=function(){this.fun.apply(null,this.array)};process.title=\"browser\";process.browser=true;process.env={};process.argv=[];process.version=\"\";process.versions={};function noop(){}process.on=noop;process.addListener=noop;process.once=noop;process.off=noop;process.removeListener=noop;process.removeAllListeners=noop;process.emit=noop;process.binding=function(name){throw new Error(\"process.binding is not supported\")};process.cwd=function(){return\"/\"};process.chdir=function(dir){throw new Error(\"process.chdir is not supported\")};process.umask=function(){return 0}},{}],43:[function(require,module,exports){module.exports=require(\"./lib/_stream_duplex.js\")},{\"./lib/_stream_duplex.js\":44}],44:[function(require,module,exports){\"use strict\";var objectKeys=Object.keys||function(obj){var keys=[];for(var key in obj){keys.push(key)}return keys};module.exports=Duplex;var processNextTick=require(\"process-nextick-args\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");var Readable=require(\"./_stream_readable\");var Writable=require(\"./_stream_writable\");util.inherits(Duplex,Readable);var keys=objectKeys(Writable.prototype);for(var v=0;v<keys.length;v++){var method=keys[v];if(!Duplex.prototype[method])Duplex.prototype[method]=Writable.prototype[method]}function Duplex(options){if(!(this instanceof Duplex))return new Duplex(options);Readable.call(this,options);Writable.call(this,options);if(options&&options.readable===false)this.readable=false;if(options&&options.writable===false)this.writable=false;this.allowHalfOpen=true;if(options&&options.allowHalfOpen===false)this.allowHalfOpen=false;this.once(\"end\",onend)}function onend(){if(this.allowHalfOpen||this._writableState.ended)return;processNextTick(onEndNT,this)}function onEndNT(self){self.end()}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}},{\"./_stream_readable\":46,\"./_stream_writable\":48,\"core-util-is\":6,inherits:38,\"process-nextick-args\":41}],45:[function(require,module,exports){\"use strict\";module.exports=PassThrough;var Transform=require(\"./_stream_transform\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");util.inherits(PassThrough,Transform);function PassThrough(options){if(!(this instanceof PassThrough))return new PassThrough(options);Transform.call(this,options)}PassThrough.prototype._transform=function(chunk,encoding,cb){cb(null,chunk)}},{\"./_stream_transform\":47,\"core-util-is\":6,inherits:38}],46:[function(require,module,exports){(function(process){\"use strict\";module.exports=Readable;var processNextTick=require(\"process-nextick-args\");var isArray=require(\"isarray\");Readable.ReadableState=ReadableState;var EE=require(\"events\").EventEmitter;var EElistenerCount=function(emitter,type){return emitter.listeners(type).length};var Stream;(function(){try{Stream=require(\"st\"+\"ream\")}catch(_){}finally{if(!Stream)Stream=require(\"events\").EventEmitter}})();var Buffer=require(\"buffer\").Buffer;var bufferShim=require(\"buffer-shims\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");var debugUtil=require(\"util\");var debug=void 0;if(debugUtil&&debugUtil.debuglog){debug=debugUtil.debuglog(\"stream\")}else{debug=function(){}}var BufferList=require(\"./internal/streams/BufferList\");var StringDecoder;util.inherits(Readable,Stream);function prependListener(emitter,event,fn){if(typeof emitter.prependListener===\"function\"){return emitter.prependListener(event,fn)}else{if(!emitter._events||!emitter._events[event])emitter.on(event,fn);else if(isArray(emitter._events[event]))emitter._events[event].unshift(fn);else emitter._events[event]=[fn,emitter._events[event]]}}var Duplex;function ReadableState(options,stream){Duplex=Duplex||require(\"./_stream_duplex\");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.readableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.buffer=new BufferList;this.length=0;this.pipes=null;this.pipesCount=0;this.flowing=null;this.ended=false;this.endEmitted=false;this.reading=false;this.sync=true;this.needReadable=false;this.emittedReadable=false;this.readableListening=false;this.resumeScheduled=false;this.defaultEncoding=options.defaultEncoding||\"utf8\";this.ranOut=false;this.awaitDrain=0;this.readingMore=false;this.decoder=null;this.encoding=null;if(options.encoding){if(!StringDecoder)StringDecoder=require(\"string_decoder/\").StringDecoder;this.decoder=new StringDecoder(options.encoding);this.encoding=options.encoding}}var Duplex;function Readable(options){Duplex=Duplex||require(\"./_stream_duplex\");if(!(this instanceof Readable))return new Readable(options);this._readableState=new ReadableState(options,this);this.readable=true;if(options&&typeof options.read===\"function\")this._read=options.read;Stream.call(this)}Readable.prototype.push=function(chunk,encoding){var state=this._readableState;if(!state.objectMode&&typeof chunk===\"string\"){encoding=encoding||state.defaultEncoding;if(encoding!==state.encoding){chunk=bufferShim.from(chunk,encoding);encoding=\"\"}}return readableAddChunk(this,state,chunk,encoding,false)};Readable.prototype.unshift=function(chunk){var state=this._readableState;return readableAddChunk(this,state,chunk,\"\",true)};Readable.prototype.isPaused=function(){return this._readableState.flowing===false};function readableAddChunk(stream,state,chunk,encoding,addToFront){var er=chunkInvalid(state,chunk);if(er){stream.emit(\"error\",er)}else if(chunk===null){state.reading=false;onEofChunk(stream,state)}else if(state.objectMode||chunk&&chunk.length>0){if(state.ended&&!addToFront){var e=new Error(\"stream.push() after EOF\");stream.emit(\"error\",e)}else if(state.endEmitted&&addToFront){var _e=new Error(\"stream.unshift() after end event\");stream.emit(\"error\",_e)}else{var skipAdd;if(state.decoder&&!addToFront&&!encoding){chunk=state.decoder.write(chunk);skipAdd=!state.objectMode&&chunk.length===0}if(!addToFront)state.reading=false;if(!skipAdd){if(state.flowing&&state.length===0&&!state.sync){stream.emit(\"data\",chunk);stream.read(0)}else{state.length+=state.objectMode?1:chunk.length;if(addToFront)state.buffer.unshift(chunk);else state.buffer.push(chunk);if(state.needReadable)emitReadable(stream)}}maybeReadMore(stream,state)}}else if(!addToFront){state.reading=false}return needMoreData(state)}function needMoreData(state){return!state.ended&&(state.needReadable||state.length<state.highWaterMark||state.length===0)}Readable.prototype.setEncoding=function(enc){if(!StringDecoder)StringDecoder=require(\"string_decoder/\").StringDecoder;this._readableState.decoder=new StringDecoder(enc);this._readableState.encoding=enc;return this};var MAX_HWM=8388608;function computeNewHighWaterMark(n){if(n>=MAX_HWM){n=MAX_HWM}else{n--;n|=n>>>1;n|=n>>>2;n|=n>>>4;n|=n>>>8;n|=n>>>16;n++}return n}function howMuchToRead(n,state){if(n<=0||state.length===0&&state.ended)return 0;if(state.objectMode)return 1;if(n!==n){if(state.flowing&&state.length)return state.buffer.head.data.length;else return state.length}if(n>state.highWaterMark)state.highWaterMark=computeNewHighWaterMark(n);if(n<=state.length)return n;if(!state.ended){state.needReadable=true;return 0}return state.length}Readable.prototype.read=function(n){debug(\"read\",n);n=parseInt(n,10);var state=this._readableState;var nOrig=n;if(n!==0)state.emittedReadable=false;if(n===0&&state.needReadable&&(state.length>=state.highWaterMark||state.ended)){debug(\"read: emitReadable\",state.length,state.ended);if(state.length===0&&state.ended)endReadable(this);else emitReadable(this);return null}n=howMuchToRead(n,state);if(n===0&&state.ended){if(state.length===0)endReadable(this);return null}var doRead=state.needReadable;debug(\"need readable\",doRead);if(state.length===0||state.length-n<state.highWaterMark){doRead=true;debug(\"length less than watermark\",doRead)}if(state.ended||state.reading){doRead=false;debug(\"reading or ended\",doRead)}else if(doRead){debug(\"do read\");state.reading=true;state.sync=true;if(state.length===0)state.needReadable=true;this._read(state.highWaterMark);state.sync=false;if(!state.reading)n=howMuchToRead(nOrig,state)}var ret;if(n>0)ret=fromList(n,state);else ret=null;if(ret===null){state.needReadable=true;n=0}else{state.length-=n}if(state.length===0){if(!state.ended)state.needReadable=true;if(nOrig!==n&&state.ended)endReadable(this)}if(ret!==null)this.emit(\"data\",ret);return ret};function chunkInvalid(state,chunk){var er=null;if(!Buffer.isBuffer(chunk)&&typeof chunk!==\"string\"&&chunk!==null&&chunk!==undefined&&!state.objectMode){er=new TypeError(\"Invalid non-string/buffer chunk\")}return er}function onEofChunk(stream,state){if(state.ended)return;if(state.decoder){var chunk=state.decoder.end();if(chunk&&chunk.length){state.buffer.push(chunk);state.length+=state.objectMode?1:chunk.length}}state.ended=true;emitReadable(stream)}function emitReadable(stream){var state=stream._readableState;state.needReadable=false;if(!state.emittedReadable){debug(\"emitReadable\",state.flowing);state.emittedReadable=true;if(state.sync)processNextTick(emitReadable_,stream);else emitReadable_(stream)}}function emitReadable_(stream){debug(\"emit readable\");stream.emit(\"readable\");flow(stream)}function maybeReadMore(stream,state){if(!state.readingMore){state.readingMore=true;processNextTick(maybeReadMore_,stream,state)}}function maybeReadMore_(stream,state){var len=state.length;while(!state.reading&&!state.flowing&&!state.ended&&state.length<state.highWaterMark){debug(\"maybeReadMore read 0\");stream.read(0);if(len===state.length)break;else len=state.length}state.readingMore=false}Readable.prototype._read=function(n){this.emit(\"error\",new Error(\"not implemented\"))};Readable.prototype.pipe=function(dest,pipeOpts){var src=this;var state=this._readableState;switch(state.pipesCount){case 0:state.pipes=dest;break;case 1:state.pipes=[state.pipes,dest];break;default:state.pipes.push(dest);break}state.pipesCount+=1;debug(\"pipe count=%d opts=%j\",state.pipesCount,pipeOpts);var doEnd=(!pipeOpts||pipeOpts.end!==false)&&dest!==process.stdout&&dest!==process.stderr;var endFn=doEnd?onend:cleanup;if(state.endEmitted)processNextTick(endFn);else src.once(\"end\",endFn);dest.on(\"unpipe\",onunpipe);function onunpipe(readable){debug(\"onunpipe\");if(readable===src){cleanup()}}function onend(){debug(\"onend\");dest.end()}var ondrain=pipeOnDrain(src);dest.on(\"drain\",ondrain);var cleanedUp=false;function cleanup(){debug(\"cleanup\");dest.removeListener(\"close\",onclose);dest.removeListener(\"finish\",onfinish);dest.removeListener(\"drain\",ondrain);dest.removeListener(\"error\",onerror);dest.removeListener(\"unpipe\",onunpipe);src.removeListener(\"end\",onend);src.removeListener(\"end\",cleanup);src.removeListener(\"data\",ondata);cleanedUp=true;if(state.awaitDrain&&(!dest._writableState||dest._writableState.needDrain))ondrain()}var increasedAwaitDrain=false;src.on(\"data\",ondata);function ondata(chunk){debug(\"ondata\");increasedAwaitDrain=false;var ret=dest.write(chunk);if(false===ret&&!increasedAwaitDrain){if((state.pipesCount===1&&state.pipes===dest||state.pipesCount>1&&indexOf(state.pipes,dest)!==-1)&&!cleanedUp){debug(\"false write response, pause\",src._readableState.awaitDrain);src._readableState.awaitDrain++;increasedAwaitDrain=true}src.pause()}}function onerror(er){debug(\"onerror\",er);unpipe();dest.removeListener(\"error\",onerror);if(EElistenerCount(dest,\"error\")===0)dest.emit(\"error\",er)}prependListener(dest,\"error\",onerror);function onclose(){dest.removeListener(\"finish\",onfinish);unpipe()}dest.once(\"close\",onclose);function onfinish(){debug(\"onfinish\");dest.removeListener(\"close\",onclose);unpipe()}dest.once(\"finish\",onfinish);function unpipe(){debug(\"unpipe\");src.unpipe(dest)}dest.emit(\"pipe\",src);if(!state.flowing){debug(\"pipe resume\");src.resume()}return dest};function pipeOnDrain(src){return function(){var state=src._readableState;debug(\"pipeOnDrain\",state.awaitDrain);if(state.awaitDrain)state.awaitDrain--;if(state.awaitDrain===0&&EElistenerCount(src,\"data\")){state.flowing=true;flow(src)}}}Readable.prototype.unpipe=function(dest){var state=this._readableState;if(state.pipesCount===0)return this;if(state.pipesCount===1){if(dest&&dest!==state.pipes)return this;if(!dest)dest=state.pipes;state.pipes=null;state.pipesCount=0;state.flowing=false;if(dest)dest.emit(\"unpipe\",this);return this}if(!dest){var dests=state.pipes;var len=state.pipesCount;state.pipes=null;state.pipesCount=0;state.flowing=false;for(var _i=0;_i<len;_i++){dests[_i].emit(\"unpipe\",this)}return this}var i=indexOf(state.pipes,dest);if(i===-1)return this;state.pipes.splice(i,1);state.pipesCount-=1;if(state.pipesCount===1)state.pipes=state.pipes[0];dest.emit(\"unpipe\",this);return this};Readable.prototype.on=function(ev,fn){var res=Stream.prototype.on.call(this,ev,fn);if(ev===\"data\"){if(this._readableState.flowing!==false)this.resume()}else if(ev===\"readable\"){var state=this._readableState;if(!state.endEmitted&&!state.readableListening){state.readableListening=state.needReadable=true;state.emittedReadable=false;if(!state.reading){processNextTick(nReadingNextTick,this)}else if(state.length){emitReadable(this,state)}}}return res};Readable.prototype.addListener=Readable.prototype.on;function nReadingNextTick(self){debug(\"readable nexttick read 0\");self.read(0)}Readable.prototype.resume=function(){var state=this._readableState;if(!state.flowing){debug(\"resume\");state.flowing=true;resume(this,state)}return this};function resume(stream,state){if(!state.resumeScheduled){state.resumeScheduled=true;processNextTick(resume_,stream,state)}}function resume_(stream,state){if(!state.reading){debug(\"resume read 0\");stream.read(0)}state.resumeScheduled=false;state.awaitDrain=0;stream.emit(\"resume\");flow(stream);if(state.flowing&&!state.reading)stream.read(0)}Readable.prototype.pause=function(){debug(\"call pause flowing=%j\",this._readableState.flowing);if(false!==this._readableState.flowing){debug(\"pause\");this._readableState.flowing=false;this.emit(\"pause\")}return this};function flow(stream){var state=stream._readableState;debug(\"flow\",state.flowing);while(state.flowing&&stream.read()!==null){}}Readable.prototype.wrap=function(stream){var state=this._readableState;var paused=false;var self=this;stream.on(\"end\",function(){debug(\"wrapped end\");if(state.decoder&&!state.ended){var chunk=state.decoder.end();if(chunk&&chunk.length)self.push(chunk)}self.push(null)});stream.on(\"data\",function(chunk){debug(\"wrapped data\");if(state.decoder)chunk=state.decoder.write(chunk);if(state.objectMode&&(chunk===null||chunk===undefined))return;else if(!state.objectMode&&(!chunk||!chunk.length))return;var ret=self.push(chunk);if(!ret){paused=true;stream.pause()}});for(var i in stream){if(this[i]===undefined&&typeof stream[i]===\"function\"){this[i]=function(method){return function(){return stream[method].apply(stream,arguments)}}(i)}}var events=[\"error\",\"close\",\"destroy\",\"pause\",\"resume\"];forEach(events,function(ev){stream.on(ev,self.emit.bind(self,ev))});self._read=function(n){debug(\"wrapped _read\",n);if(paused){paused=false;stream.resume()}};return self};Readable._fromList=fromList;function fromList(n,state){if(state.length===0)return null;var ret;if(state.objectMode)ret=state.buffer.shift();else if(!n||n>=state.length){if(state.decoder)ret=state.buffer.join(\"\");else if(state.buffer.length===1)ret=state.buffer.head.data;else ret=state.buffer.concat(state.length);state.buffer.clear()}else{ret=fromListPartial(n,state.buffer,state.decoder)}return ret}function fromListPartial(n,list,hasStrings){var ret;if(n<list.head.data.length){ret=list.head.data.slice(0,n);list.head.data=list.head.data.slice(n)}else if(n===list.head.data.length){ret=list.shift()}else{ret=hasStrings?copyFromBufferString(n,list):copyFromBuffer(n,list)}return ret}function copyFromBufferString(n,list){var p=list.head;var c=1;var ret=p.data;n-=ret.length;while(p=p.next){var str=p.data;var nb=n>str.length?str.length:n;if(nb===str.length)ret+=str;else ret+=str.slice(0,n);n-=nb;if(n===0){if(nb===str.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=str.slice(nb)}break}++c}list.length-=c;return ret}function copyFromBuffer(n,list){var ret=bufferShim.allocUnsafe(n);var p=list.head;var c=1;p.data.copy(ret);n-=p.data.length;while(p=p.next){var buf=p.data;var nb=n>buf.length?buf.length:n;buf.copy(ret,ret.length-n,0,nb);n-=nb;if(n===0){if(nb===buf.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=buf.slice(nb)}break}++c}list.length-=c;return ret}function endReadable(stream){var state=stream._readableState;if(state.length>0)throw new Error('\"endReadable()\" called on non-empty stream');if(!state.endEmitted){state.ended=true;processNextTick(endReadableNT,state,stream)}}function endReadableNT(state,stream){if(!state.endEmitted&&state.length===0){state.endEmitted=true;stream.readable=false;stream.emit(\"end\")}}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}function indexOf(xs,x){for(var i=0,l=xs.length;i<l;i++){if(xs[i]===x)return i}return-1}}).call(this,require(\"_process\"))},{\"./_stream_duplex\":44,\"./internal/streams/BufferList\":49,_process:42,buffer:5,\"buffer-shims\":4,\"core-util-is\":6,events:28,inherits:38,isarray:40,\"process-nextick-args\":41,\"string_decoder/\":56,util:3}],47:[function(require,module,exports){\"use strict\";module.exports=Transform;var Duplex=require(\"./_stream_duplex\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");util.inherits(Transform,Duplex);function TransformState(stream){this.afterTransform=function(er,data){return afterTransform(stream,er,data)};this.needTransform=false;this.transforming=false;this.writecb=null;this.writechunk=null;this.writeencoding=null}function afterTransform(stream,er,data){var ts=stream._transformState;ts.transforming=false;var cb=ts.writecb;if(!cb)return stream.emit(\"error\",new Error(\"no writecb in Transform class\"));ts.writechunk=null;ts.writecb=null;if(data!==null&&data!==undefined)stream.push(data);cb(er);var rs=stream._readableState;rs.reading=false;if(rs.needReadable||rs.length<rs.highWaterMark){stream._read(rs.highWaterMark)}}function Transform(options){if(!(this instanceof Transform))return new Transform(options);Duplex.call(this,options);this._transformState=new TransformState(this);var stream=this;this._readableState.needReadable=true;this._readableState.sync=false;if(options){if(typeof options.transform===\"function\")this._transform=options.transform;if(typeof options.flush===\"function\")this._flush=options.flush}this.once(\"prefinish\",function(){if(typeof this._flush===\"function\")this._flush(function(er){done(stream,er)});else done(stream)})}Transform.prototype.push=function(chunk,encoding){this._transformState.needTransform=false;return Duplex.prototype.push.call(this,chunk,encoding)};Transform.prototype._transform=function(chunk,encoding,cb){throw new Error(\"Not implemented\")};Transform.prototype._write=function(chunk,encoding,cb){var ts=this._transformState;ts.writecb=cb;ts.writechunk=chunk;ts.writeencoding=encoding;if(!ts.transforming){var rs=this._readableState;if(ts.needTransform||rs.needReadable||rs.length<rs.highWaterMark)this._read(rs.highWaterMark)}};Transform.prototype._read=function(n){var ts=this._transformState;if(ts.writechunk!==null&&ts.writecb&&!ts.transforming){ts.transforming=true;this._transform(ts.writechunk,ts.writeencoding,ts.afterTransform)}else{ts.needTransform=true}};function done(stream,er){if(er)return stream.emit(\"error\",er);var ws=stream._writableState;var ts=stream._transformState;if(ws.length)throw new Error(\"Calling transform done when ws.length != 0\");if(ts.transforming)throw new Error(\"Calling transform done when still transforming\");return stream.push(null)}},{\"./_stream_duplex\":44,\"core-util-is\":6,inherits:38}],48:[function(require,module,exports){(function(process){\"use strict\";module.exports=Writable;var processNextTick=require(\"process-nextick-args\");var asyncWrite=!process.browser&&[\"v0.10\",\"v0.9.\"].indexOf(process.version.slice(0,5))>-1?setImmediate:processNextTick;Writable.WritableState=WritableState;var util=require(\"core-util-is\");util.inherits=require(\"inherits\");var internalUtil={deprecate:require(\"util-deprecate\")};var Stream;(function(){try{Stream=require(\"st\"+\"ream\")}catch(_){}finally{if(!Stream)Stream=require(\"events\").EventEmitter}})();var Buffer=require(\"buffer\").Buffer;var bufferShim=require(\"buffer-shims\");util.inherits(Writable,Stream);function nop(){}function WriteReq(chunk,encoding,cb){this.chunk=chunk;this.encoding=encoding;this.callback=cb;this.next=null}var Duplex;function WritableState(options,stream){Duplex=Duplex||require(\"./_stream_duplex\");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.writableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.needDrain=false;this.ending=false;this.ended=false;this.finished=false;var noDecode=options.decodeStrings===false;this.decodeStrings=!noDecode;this.defaultEncoding=options.defaultEncoding||\"utf8\";this.length=0;this.writing=false;this.corked=0;this.sync=true;this.bufferProcessing=false;this.onwrite=function(er){onwrite(stream,er)};this.writecb=null;this.writelen=0;this.bufferedRequest=null;this.lastBufferedRequest=null;this.pendingcb=0;this.prefinished=false;this.errorEmitted=false;this.bufferedRequestCount=0;this.corkedRequestsFree=new CorkedRequest(this)}WritableState.prototype.getBuffer=function writableStateGetBuffer(){var current=this.bufferedRequest;var out=[];while(current){out.push(current);current=current.next}return out};(function(){try{Object.defineProperty(WritableState.prototype,\"buffer\",{get:internalUtil.deprecate(function(){return this.getBuffer()},\"_writableState.buffer is deprecated. Use _writableState.getBuffer \"+\"instead.\")})}catch(_){}})();var Duplex;function Writable(options){Duplex=Duplex||require(\"./_stream_duplex\");if(!(this instanceof Writable)&&!(this instanceof Duplex))return new Writable(options);this._writableState=new WritableState(options,this);this.writable=true;if(options){if(typeof options.write===\"function\")this._write=options.write;if(typeof options.writev===\"function\")this._writev=options.writev}Stream.call(this)}Writable.prototype.pipe=function(){this.emit(\"error\",new Error(\"Cannot pipe, not readable\"))};function writeAfterEnd(stream,cb){var er=new Error(\"write after end\");stream.emit(\"error\",er);processNextTick(cb,er)}function validChunk(stream,state,chunk,cb){var valid=true;var er=false;if(chunk===null){er=new TypeError(\"May not write null values to stream\")}else if(!Buffer.isBuffer(chunk)&&typeof chunk!==\"string\"&&chunk!==undefined&&!state.objectMode){er=new TypeError(\"Invalid non-string/buffer chunk\")}if(er){stream.emit(\"error\",er);processNextTick(cb,er);valid=false}return valid}Writable.prototype.write=function(chunk,encoding,cb){var state=this._writableState;var ret=false;if(typeof encoding===\"function\"){cb=encoding;encoding=null}if(Buffer.isBuffer(chunk))encoding=\"buffer\";else if(!encoding)encoding=state.defaultEncoding;if(typeof cb!==\"function\")cb=nop;if(state.ended)writeAfterEnd(this,cb);else if(validChunk(this,state,chunk,cb)){\nstate.pendingcb++;ret=writeOrBuffer(this,state,chunk,encoding,cb)}return ret};Writable.prototype.cork=function(){var state=this._writableState;state.corked++};Writable.prototype.uncork=function(){var state=this._writableState;if(state.corked){state.corked--;if(!state.writing&&!state.corked&&!state.finished&&!state.bufferProcessing&&state.bufferedRequest)clearBuffer(this,state)}};Writable.prototype.setDefaultEncoding=function setDefaultEncoding(encoding){if(typeof encoding===\"string\")encoding=encoding.toLowerCase();if(!([\"hex\",\"utf8\",\"utf-8\",\"ascii\",\"binary\",\"base64\",\"ucs2\",\"ucs-2\",\"utf16le\",\"utf-16le\",\"raw\"].indexOf((encoding+\"\").toLowerCase())>-1))throw new TypeError(\"Unknown encoding: \"+encoding);this._writableState.defaultEncoding=encoding;return this};function decodeChunk(state,chunk,encoding){if(!state.objectMode&&state.decodeStrings!==false&&typeof chunk===\"string\"){chunk=bufferShim.from(chunk,encoding)}return chunk}function writeOrBuffer(stream,state,chunk,encoding,cb){chunk=decodeChunk(state,chunk,encoding);if(Buffer.isBuffer(chunk))encoding=\"buffer\";var len=state.objectMode?1:chunk.length;state.length+=len;var ret=state.length<state.highWaterMark;if(!ret)state.needDrain=true;if(state.writing||state.corked){var last=state.lastBufferedRequest;state.lastBufferedRequest=new WriteReq(chunk,encoding,cb);if(last){last.next=state.lastBufferedRequest}else{state.bufferedRequest=state.lastBufferedRequest}state.bufferedRequestCount+=1}else{doWrite(stream,state,false,len,chunk,encoding,cb)}return ret}function doWrite(stream,state,writev,len,chunk,encoding,cb){state.writelen=len;state.writecb=cb;state.writing=true;state.sync=true;if(writev)stream._writev(chunk,state.onwrite);else stream._write(chunk,encoding,state.onwrite);state.sync=false}function onwriteError(stream,state,sync,er,cb){--state.pendingcb;if(sync)processNextTick(cb,er);else cb(er);stream._writableState.errorEmitted=true;stream.emit(\"error\",er)}function onwriteStateUpdate(state){state.writing=false;state.writecb=null;state.length-=state.writelen;state.writelen=0}function onwrite(stream,er){var state=stream._writableState;var sync=state.sync;var cb=state.writecb;onwriteStateUpdate(state);if(er)onwriteError(stream,state,sync,er,cb);else{var finished=needFinish(state);if(!finished&&!state.corked&&!state.bufferProcessing&&state.bufferedRequest){clearBuffer(stream,state)}if(sync){asyncWrite(afterWrite,stream,state,finished,cb)}else{afterWrite(stream,state,finished,cb)}}}function afterWrite(stream,state,finished,cb){if(!finished)onwriteDrain(stream,state);state.pendingcb--;cb();finishMaybe(stream,state)}function onwriteDrain(stream,state){if(state.length===0&&state.needDrain){state.needDrain=false;stream.emit(\"drain\")}}function clearBuffer(stream,state){state.bufferProcessing=true;var entry=state.bufferedRequest;if(stream._writev&&entry&&entry.next){var l=state.bufferedRequestCount;var buffer=new Array(l);var holder=state.corkedRequestsFree;holder.entry=entry;var count=0;while(entry){buffer[count]=entry;entry=entry.next;count+=1}doWrite(stream,state,true,state.length,buffer,\"\",holder.finish);state.pendingcb++;state.lastBufferedRequest=null;if(holder.next){state.corkedRequestsFree=holder.next;holder.next=null}else{state.corkedRequestsFree=new CorkedRequest(state)}}else{while(entry){var chunk=entry.chunk;var encoding=entry.encoding;var cb=entry.callback;var len=state.objectMode?1:chunk.length;doWrite(stream,state,false,len,chunk,encoding,cb);entry=entry.next;if(state.writing){break}}if(entry===null)state.lastBufferedRequest=null}state.bufferedRequestCount=0;state.bufferedRequest=entry;state.bufferProcessing=false}Writable.prototype._write=function(chunk,encoding,cb){cb(new Error(\"not implemented\"))};Writable.prototype._writev=null;Writable.prototype.end=function(chunk,encoding,cb){var state=this._writableState;if(typeof chunk===\"function\"){cb=chunk;chunk=null;encoding=null}else if(typeof encoding===\"function\"){cb=encoding;encoding=null}if(chunk!==null&&chunk!==undefined)this.write(chunk,encoding);if(state.corked){state.corked=1;this.uncork()}if(!state.ending&&!state.finished)endWritable(this,state,cb)};function needFinish(state){return state.ending&&state.length===0&&state.bufferedRequest===null&&!state.finished&&!state.writing}function prefinish(stream,state){if(!state.prefinished){state.prefinished=true;stream.emit(\"prefinish\")}}function finishMaybe(stream,state){var need=needFinish(state);if(need){if(state.pendingcb===0){prefinish(stream,state);state.finished=true;stream.emit(\"finish\")}else{prefinish(stream,state)}}return need}function endWritable(stream,state,cb){state.ending=true;finishMaybe(stream,state);if(cb){if(state.finished)processNextTick(cb);else stream.once(\"finish\",cb)}state.ended=true;stream.writable=false}function CorkedRequest(state){var _this=this;this.next=null;this.entry=null;this.finish=function(err){var entry=_this.entry;_this.entry=null;while(entry){var cb=entry.callback;state.pendingcb--;cb(err);entry=entry.next}if(state.corkedRequestsFree){state.corkedRequestsFree.next=_this}else{state.corkedRequestsFree=_this}}}}).call(this,require(\"_process\"))},{\"./_stream_duplex\":44,_process:42,buffer:5,\"buffer-shims\":4,\"core-util-is\":6,events:28,inherits:38,\"process-nextick-args\":41,\"util-deprecate\":57}],49:[function(require,module,exports){\"use strict\";var Buffer=require(\"buffer\").Buffer;var bufferShim=require(\"buffer-shims\");module.exports=BufferList;function BufferList(){this.head=null;this.tail=null;this.length=0}BufferList.prototype.push=function(v){var entry={data:v,next:null};if(this.length>0)this.tail.next=entry;else this.head=entry;this.tail=entry;++this.length};BufferList.prototype.unshift=function(v){var entry={data:v,next:this.head};if(this.length===0)this.tail=entry;this.head=entry;++this.length};BufferList.prototype.shift=function(){if(this.length===0)return;var ret=this.head.data;if(this.length===1)this.head=this.tail=null;else this.head=this.head.next;--this.length;return ret};BufferList.prototype.clear=function(){this.head=this.tail=null;this.length=0};BufferList.prototype.join=function(s){if(this.length===0)return\"\";var p=this.head;var ret=\"\"+p.data;while(p=p.next){ret+=s+p.data}return ret};BufferList.prototype.concat=function(n){if(this.length===0)return bufferShim.alloc(0);if(this.length===1)return this.head.data;var ret=bufferShim.allocUnsafe(n>>>0);var p=this.head;var i=0;while(p){p.data.copy(ret,i);i+=p.data.length;p=p.next}return ret}},{buffer:5,\"buffer-shims\":4}],50:[function(require,module,exports){module.exports=require(\"./lib/_stream_passthrough.js\")},{\"./lib/_stream_passthrough.js\":45}],51:[function(require,module,exports){(function(process){var Stream=function(){try{return require(\"st\"+\"ream\")}catch(_){}}();exports=module.exports=require(\"./lib/_stream_readable.js\");exports.Stream=Stream||exports;exports.Readable=exports;exports.Writable=require(\"./lib/_stream_writable.js\");exports.Duplex=require(\"./lib/_stream_duplex.js\");exports.Transform=require(\"./lib/_stream_transform.js\");exports.PassThrough=require(\"./lib/_stream_passthrough.js\");if(!process.browser&&process.env.READABLE_STREAM===\"disable\"&&Stream){module.exports=Stream}}).call(this,require(\"_process\"))},{\"./lib/_stream_duplex.js\":44,\"./lib/_stream_passthrough.js\":45,\"./lib/_stream_readable.js\":46,\"./lib/_stream_transform.js\":47,\"./lib/_stream_writable.js\":48,_process:42}],52:[function(require,module,exports){module.exports=require(\"./lib/_stream_transform.js\")},{\"./lib/_stream_transform.js\":47}],53:[function(require,module,exports){module.exports=require(\"./lib/_stream_writable.js\")},{\"./lib/_stream_writable.js\":48}],54:[function(require,module,exports){module.exports=function(string){return string.replace(/[-\\\\^$*+?.()|[\\]{}]/g,\"\\\\$&\")}},{}],55:[function(require,module,exports){module.exports=Stream;var EE=require(\"events\").EventEmitter;var inherits=require(\"inherits\");inherits(Stream,EE);Stream.Readable=require(\"readable-stream/readable.js\");Stream.Writable=require(\"readable-stream/writable.js\");Stream.Duplex=require(\"readable-stream/duplex.js\");Stream.Transform=require(\"readable-stream/transform.js\");Stream.PassThrough=require(\"readable-stream/passthrough.js\");Stream.Stream=Stream;function Stream(){EE.call(this)}Stream.prototype.pipe=function(dest,options){var source=this;function ondata(chunk){if(dest.writable){if(false===dest.write(chunk)&&source.pause){source.pause()}}}source.on(\"data\",ondata);function ondrain(){if(source.readable&&source.resume){source.resume()}}dest.on(\"drain\",ondrain);if(!dest._isStdio&&(!options||options.end!==false)){source.on(\"end\",onend);source.on(\"close\",onclose)}var didOnEnd=false;function onend(){if(didOnEnd)return;didOnEnd=true;dest.end()}function onclose(){if(didOnEnd)return;didOnEnd=true;if(typeof dest.destroy===\"function\")dest.destroy()}function onerror(er){cleanup();if(EE.listenerCount(this,\"error\")===0){throw er}}source.on(\"error\",onerror);dest.on(\"error\",onerror);function cleanup(){source.removeListener(\"data\",ondata);dest.removeListener(\"drain\",ondrain);source.removeListener(\"end\",onend);source.removeListener(\"close\",onclose);source.removeListener(\"error\",onerror);dest.removeListener(\"error\",onerror);source.removeListener(\"end\",cleanup);source.removeListener(\"close\",cleanup);dest.removeListener(\"close\",cleanup)}source.on(\"end\",cleanup);source.on(\"close\",cleanup);dest.on(\"close\",cleanup);dest.emit(\"pipe\",source);return dest}},{events:28,inherits:38,\"readable-stream/duplex.js\":43,\"readable-stream/passthrough.js\":50,\"readable-stream/readable.js\":51,\"readable-stream/transform.js\":52,\"readable-stream/writable.js\":53}],56:[function(require,module,exports){var Buffer=require(\"buffer\").Buffer;var isBufferEncoding=Buffer.isEncoding||function(encoding){switch(encoding&&encoding.toLowerCase()){case\"hex\":case\"utf8\":case\"utf-8\":case\"ascii\":case\"binary\":case\"base64\":case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":case\"raw\":return true;default:return false}};function assertEncoding(encoding){if(encoding&&!isBufferEncoding(encoding)){throw new Error(\"Unknown encoding: \"+encoding)}}var StringDecoder=exports.StringDecoder=function(encoding){this.encoding=(encoding||\"utf8\").toLowerCase().replace(/[-_]/,\"\");assertEncoding(encoding);switch(this.encoding){case\"utf8\":this.surrogateSize=3;break;case\"ucs2\":case\"utf16le\":this.surrogateSize=2;this.detectIncompleteChar=utf16DetectIncompleteChar;break;case\"base64\":this.surrogateSize=3;this.detectIncompleteChar=base64DetectIncompleteChar;break;default:this.write=passThroughWrite;return}this.charBuffer=new Buffer(6);this.charReceived=0;this.charLength=0};StringDecoder.prototype.write=function(buffer){var charStr=\"\";while(this.charLength){var available=buffer.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:buffer.length;buffer.copy(this.charBuffer,this.charReceived,0,available);this.charReceived+=available;if(this.charReceived<this.charLength){return\"\"}buffer=buffer.slice(available,buffer.length);charStr=this.charBuffer.slice(0,this.charLength).toString(this.encoding);var charCode=charStr.charCodeAt(charStr.length-1);if(charCode>=55296&&charCode<=56319){this.charLength+=this.surrogateSize;charStr=\"\";continue}this.charReceived=this.charLength=0;if(buffer.length===0){return charStr}break}this.detectIncompleteChar(buffer);var end=buffer.length;if(this.charLength){buffer.copy(this.charBuffer,0,buffer.length-this.charReceived,end);end-=this.charReceived}charStr+=buffer.toString(this.encoding,0,end);var end=charStr.length-1;var charCode=charStr.charCodeAt(end);if(charCode>=55296&&charCode<=56319){var size=this.surrogateSize;this.charLength+=size;this.charReceived+=size;this.charBuffer.copy(this.charBuffer,size,0,size);buffer.copy(this.charBuffer,0,0,size);return charStr.substring(0,end)}return charStr};StringDecoder.prototype.detectIncompleteChar=function(buffer){var i=buffer.length>=3?3:buffer.length;for(;i>0;i--){var c=buffer[buffer.length-i];if(i==1&&c>>5==6){this.charLength=2;break}if(i<=2&&c>>4==14){this.charLength=3;break}if(i<=3&&c>>3==30){this.charLength=4;break}}this.charReceived=i};StringDecoder.prototype.end=function(buffer){var res=\"\";if(buffer&&buffer.length)res=this.write(buffer);if(this.charReceived){var cr=this.charReceived;var buf=this.charBuffer;var enc=this.encoding;res+=buf.slice(0,cr).toString(enc)}return res};function passThroughWrite(buffer){return buffer.toString(this.encoding)}function utf16DetectIncompleteChar(buffer){this.charReceived=buffer.length%2;this.charLength=this.charReceived?2:0}function base64DetectIncompleteChar(buffer){this.charReceived=buffer.length%3;this.charLength=this.charReceived?3:0}},{buffer:5}],57:[function(require,module,exports){(function(global){module.exports=deprecate;function deprecate(fn,msg){if(config(\"noDeprecation\")){return fn}var warned=false;function deprecated(){if(!warned){if(config(\"throwDeprecation\")){throw new Error(msg)}else if(config(\"traceDeprecation\")){console.trace(msg)}else{console.warn(msg)}warned=true}return fn.apply(this,arguments)}return deprecated}function config(name){try{if(!global.localStorage)return false}catch(_){return false}var val=global.localStorage[name];if(null==val)return false;return String(val).toLowerCase()===\"true\"}}).call(this,typeof global!==\"undefined\"?global:typeof self!==\"undefined\"?self:typeof window!==\"undefined\"?window:{})},{}],58:[function(require,module,exports){module.exports=extend;var hasOwnProperty=Object.prototype.hasOwnProperty;function extend(){var target={};for(var i=0;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(hasOwnProperty.call(source,key)){target[key]=source[key]}}}return target}},{}]},{},[1])(1)});\n","(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\nvar auth = require('./lib/auth');\nvar helpers = require('./lib/helpers');\nvar SwaggerClient = require('./lib/client');\nvar deprecationWrapper = function (url, options) {\n  helpers.log('This is deprecated, use \"new SwaggerClient\" instead.');\n\n  return new SwaggerClient(url, options);\n};\n\n/* Here for IE8 Support */\nif (!Array.prototype.indexOf) {\n  Array.prototype.indexOf = function(obj, start) {\n    for (var i = (start || 0), j = this.length; i < j; i++) {\n      if (this[i] === obj) { return i; }\n    }\n    return -1;\n  };\n}\n\n/* Here for IE8 Support */\nif (!String.prototype.trim) {\n  String.prototype.trim = function () {\n    return this.replace(/^\\s+|\\s+$/g, '');\n  };\n}\n\n/* Here for node 10.x support */\nif (!String.prototype.endsWith) {\n  String.prototype.endsWith = function(suffix) {\n    return this.indexOf(suffix, this.length - suffix.length) !== -1;\n  };\n}\n\nmodule.exports = SwaggerClient;\n\nSwaggerClient.ApiKeyAuthorization = auth.ApiKeyAuthorization;\nSwaggerClient.PasswordAuthorization = auth.PasswordAuthorization;\nSwaggerClient.CookieAuthorization = auth.CookieAuthorization;\nSwaggerClient.SwaggerApi = deprecationWrapper;\nSwaggerClient.SwaggerClient = deprecationWrapper;\nSwaggerClient.SchemaMarkup = require('./lib/schema-markup');\n","'use strict';\n\nvar helpers = require('./helpers');\nvar btoa = require('btoa'); // jshint ignore:line\nvar CookieJar = require('cookiejar').CookieJar;\nvar _ = {\n  each: require('lodash-compat/collection/each'),\n  includes: require('lodash-compat/collection/includes'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isArray: require('lodash-compat/lang/isArray')\n};\n\n/**\n * SwaggerAuthorizations applies the correct authorization to an operation being executed\n */\nvar SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (authz) {\n  this.authz = authz || {};\n};\n\n/**\n * Add auths to the hash\n * Will overwrite any existing\n *\n */\nSwaggerAuthorizations.prototype.add = function (name, auth) {\n  if(_.isObject(name)) {\n    for (var key in name) {\n      this.authz[key] = name[key];\n    }\n  } else if(typeof name === 'string' ){\n    this.authz[name] = auth;\n  }\n\n  return auth;\n};\n\nSwaggerAuthorizations.prototype.remove = function (name) {\n  return delete this.authz[name];\n};\n\nSwaggerAuthorizations.prototype.apply = function (obj, securities) {\n  var status = true;\n  var applyAll = !securities;\n  var flattenedSecurities = [];\n\n  // favor the object-level authorizations over global\n  var authz = obj.clientAuthorizations || this.authz;\n\n  // Securities could be [ {} ]\n  _.each(securities, function (obj, key) {\n\n    // Make sure we account for securities being [ str ]\n    if(typeof key === 'string') {\n      flattenedSecurities.push(key);\n    }\n\n    // Flatten keys in to our array\n    _.each(obj, function (val, key) {\n      flattenedSecurities.push(key);\n    });\n  });\n\n  _.each(authz, function (auth, authName) {\n    if(applyAll || _.includes(flattenedSecurities, authName)) {\n      var newStatus = auth.apply(obj);\n      status = status && !!newStatus; // logical ORs regarding status\n    }\n  });\n\n  return status;\n};\n\n/**\n * ApiKeyAuthorization allows a query param or header to be injected\n */\nvar ApiKeyAuthorization = module.exports.ApiKeyAuthorization = function (name, value, type) {\n  this.name = name;\n  this.value = value;\n  this.type = type;\n};\n\nApiKeyAuthorization.prototype.apply = function (obj) {\n  if (this.type === 'query') {\n    // see if already applied.  If so, don't do it again\n\n    var qp;\n    if (obj.url.indexOf('?') > 0) {\n      qp = obj.url.substring(obj.url.indexOf('?') + 1);\n      var parts = qp.split('&');\n      if(parts && parts.length > 0) {\n        for(var i = 0; i < parts.length; i++) {\n          var kv = parts[i].split('=');\n          if(kv && kv.length > 0) {\n            if (kv[0] === this.name) {\n              // skip it\n              return false;\n            }\n          }\n        }\n      }\n    }\n\n    if (obj.url.indexOf('?') > 0) {\n      obj.url = obj.url + '&' + this.name + '=' + this.value;\n    } else {\n      obj.url = obj.url + '?' + this.name + '=' + this.value;\n    }\n\n    return true;\n  } else if (this.type === 'header') {\n    if(typeof obj.headers[this.name] === 'undefined') {\n      obj.headers[this.name] = this.value;\n    }\n\n    return true;\n  }\n};\n\nvar CookieAuthorization = module.exports.CookieAuthorization = function (cookie) {\n  this.cookie = cookie;\n};\n\nCookieAuthorization.prototype.apply = function (obj) {\n  obj.cookieJar = obj.cookieJar || new CookieJar();\n  obj.cookieJar.setCookie(this.cookie);\n\n  return true;\n};\n\n/**\n * Password Authorization is a basic auth implementation\n */\nvar PasswordAuthorization = module.exports.PasswordAuthorization = function (username, password) {\n  if (arguments.length === 3) {\n    helpers.log('PasswordAuthorization: the \\'name\\' argument has been removed, pass only username and password');\n    username = arguments[1];\n    password = arguments[2];\n  }\n  this.username = username;\n  this.password = password;\n};\n\nPasswordAuthorization.prototype.apply = function (obj) {\n  if(typeof obj.headers.Authorization === 'undefined') {\n    obj.headers.Authorization = 'Basic ' + btoa(this.username + ':' + this.password);\n  }\n\n  return true;\n};\n","'use strict';\n\nvar _ = {\n  bind: require('lodash-compat/function/bind'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  find: require('lodash-compat/collection/find'),\n  forEach: require('lodash-compat/collection/forEach'),\n  indexOf: require('lodash-compat/array/indexOf'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isFunction: require('lodash-compat/lang/isFunction'),\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isUndefined: require('lodash-compat/lang/isUndefined')\n};\nvar auth = require('./auth');\nvar helpers = require('./helpers');\nvar Model = require('./types/model');\nvar Operation = require('./types/operation');\nvar OperationGroup = require('./types/operationGroup');\nvar Resolver = require('./resolver');\nvar SwaggerHttp = require('./http');\nvar SwaggerSpecConverter = require('./spec-converter');\nvar Q = require('q');\n\n// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the\n// following usage: 'client.{tagName}'\nvar reservedClientTags = [\n  'apis',\n  'authorizationScheme',\n  'authorizations',\n  'basePath',\n  'build',\n  'buildFrom1_1Spec',\n  'buildFrom1_2Spec',\n  'buildFromSpec',\n  'clientAuthorizations',\n  'convertInfo',\n  'debug',\n  'defaultErrorCallback',\n  'defaultSuccessCallback',\n  'enableCookies',\n  'fail',\n  'failure',\n  'finish',\n  'help',\n  'host',\n  'idFromOp',\n  'info',\n  'initialize',\n  'isBuilt',\n  'isValid',\n  'modelPropertyMacro',\n  'models',\n  'modelsArray',\n  'options',\n  'parameterMacro',\n  'parseUri',\n  'progress',\n  'resourceCount',\n  'sampleModels',\n  'selfReflect',\n  'setConsolidatedModels',\n  'spec',\n  'supportedSubmitMethods',\n  'swaggerRequestHeaders',\n  'tagFromLabel',\n  'title',\n  'url',\n  'useJQuery',\n  'jqueryAjaxCache'\n];\n// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the\n// following usage: 'client.apis.{tagName}'\nvar reservedApiTags = [\n  'apis',\n  'asCurl',\n  'description',\n  'externalDocs',\n  'help',\n  'label',\n  'name',\n  'operation',\n  'operations',\n  'operationsArray',\n  'path',\n  'tag'\n];\nvar supportedOperationMethods = ['delete', 'get', 'head', 'options', 'patch', 'post', 'put'];\nvar SwaggerClient = module.exports = function (url, options) {\n  this.authorizations = null;\n  this.authorizationScheme = null;\n  this.basePath = null;\n  this.debug = false;\n  this.enableCookies = false;\n  this.info = null;\n  this.isBuilt = false;\n  this.isValid = false;\n  this.modelsArray = [];\n  this.resourceCount = 0;\n  this.url = null;\n  this.useJQuery = false;\n  this.jqueryAjaxCache = false;\n  this.swaggerObject = {};\n  this.deferredClient = undefined;\n\n  this.clientAuthorizations = new auth.SwaggerAuthorizations();\n\n  if (typeof url !== 'undefined') {\n    return this.initialize(url, options);\n  } else {\n    return this;\n  }\n};\n\nSwaggerClient.prototype.initialize = function (url, options) {\n  this.models = {};\n  this.sampleModels = {};\n\n  if (typeof url === 'string') {\n    this.url = url;\n  } else if (_.isObject(url)) {\n    options = url;\n    this.url = options.url;\n  }\n\n  if(this.url && this.url.indexOf('http:') === -1 && this.url.indexOf('https:') === -1) {\n    // no protocol, so we can only use window if it exists\n    if(typeof(window) !== 'undefined' && window && window.location) {\n      this.url = window.location.origin + this.url;\n    }\n  }\n\n  options = options || {};\n  this.clientAuthorizations.add(options.authorizations);\n  this.swaggerRequestHeaders = options.swaggerRequestHeaders || 'application/json;charset=utf-8,*/*';\n  this.defaultSuccessCallback = options.defaultSuccessCallback || null;\n  this.defaultErrorCallback = options.defaultErrorCallback || null;\n  this.modelPropertyMacro = options.modelPropertyMacro || null;\n  this.connectionAgent = options.connectionAgent || null;\n  this.parameterMacro = options.parameterMacro || null;\n  this.usePromise = options.usePromise || null;\n\n  // operation request timeout default\n  this.timeout = options.timeout || null;\n  // default to request timeout when not specified\n  this.fetchSpecTimeout = typeof options.fetchSpecTimeout !== 'undefined' ?\n      options.fetchSpecTimeout : options.timeout || null;\n\n  if(this.usePromise) {\n    this.deferredClient = Q.defer();\n  }\n\n  if (typeof options.success === 'function') {\n    this.success = options.success;\n  }\n  if (options.useJQuery) {\n    this.useJQuery = options.useJQuery;\n  }\n\n  if (options.jqueryAjaxCache) {\n    this.jqueryAjaxCache = options.jqueryAjaxCache;\n  }\n\n  if (options.enableCookies) {\n    this.enableCookies = options.enableCookies;\n  }\n\n  this.options = options || {};\n\n  // maybe don't need this?\n  this.options.timeout = this.timeout;\n  this.options.fetchSpecTimeout = this.fetchSpecTimeout;\n\n  this.supportedSubmitMethods = options.supportedSubmitMethods || [];\n  this.failure = options.failure || function (err) { throw err; };\n  this.progress = options.progress || function () {};\n  this.spec = _.cloneDeep(options.spec); // Clone so we do not alter the provided document\n\n  if (options.scheme) {\n    this.scheme = options.scheme;\n  }\n\n  if (this.usePromise || typeof options.success === 'function') {\n    this.ready = true;\n    return this.build();\n  }\n};\n\nSwaggerClient.prototype.build = function (mock) {\n  if (this.isBuilt) {\n    return this;\n  }\n\n  var self = this;\n\n  if (this.spec) {\n    this.progress('fetching resource list; Please wait.');\n  } else {\n    this.progress('fetching resource list: ' + this.url + '; Please wait.');\n  }\n\n  var obj = {\n    useJQuery: this.useJQuery,\n    jqueryAjaxCache: this.jqueryAjaxCache,\n    connectionAgent: this.connectionAgent,\n    enableCookies: this.enableCookies,\n    url: this.url,\n    method: 'get',\n    headers: {\n      accept: this.swaggerRequestHeaders\n    },\n    on: {\n      error: function (response) {\n        if (self.url.substring(0, 4) !== 'http') {\n          return self.fail('Please specify the protocol for ' + self.url);\n        } else if (response.errObj && (response.errObj.code === 'ECONNABORTED' || response.errObj.message.indexOf('timeout') !== -1)) {\n          return self.fail('Request timed out after ' + self.fetchSpecTimeout + 'ms');\n        } else if (response.status === 0) {\n          return self.fail('Can\\'t read from server.  It may not have the appropriate access-control-origin settings.');\n        } else if (response.status === 404) {\n          return self.fail('Can\\'t read swagger JSON from ' + self.url);\n        } else {\n          return self.fail(response.status + ' : ' + response.statusText + ' ' + self.url);\n        }\n      },\n      response: function (resp) {\n\n        var responseObj = resp.obj;\n        if(!responseObj) {\n          return self.fail('failed to parse JSON/YAML response');\n        }\n\n        self.swaggerVersion = responseObj.swaggerVersion;\n        self.swaggerObject = responseObj;\n\n        if (responseObj.swagger && parseInt(responseObj.swagger) === 2) {\n          self.swaggerVersion = responseObj.swagger;\n\n          new Resolver().resolve(responseObj, self.url, self.buildFromSpec, self);\n\n          self.isValid = true;\n        } else {\n          var converter = new SwaggerSpecConverter();\n          self.oldSwaggerObject = self.swaggerObject;\n\n          converter.setDocumentationLocation(self.url);\n          converter.convert(responseObj, self.clientAuthorizations, self.options, function(spec) {\n            self.swaggerObject = spec;\n            new Resolver().resolve(spec, self.url, self.buildFromSpec, self);\n            self.isValid = true;\n          });\n        }\n      }\n    }\n  };\n\n  // only set timeout when specified\n  if (this.fetchSpecTimeout) {\n    obj.timeout = this.fetchSpecTimeout;\n  }\n\n  if (this.spec) {\n    self.swaggerObject = this.spec;\n    setTimeout(function () {\n      new Resolver().resolve(self.spec, self.url, self.buildFromSpec, self);\n    }, 10);\n  } else {\n    this.clientAuthorizations.apply(obj);\n\n    if (mock) {\n      return obj;\n    }\n\n    new SwaggerHttp().execute(obj, this.options);\n  }\n\n  return (this.usePromise) ? this.deferredClient.promise : this;\n};\n\nSwaggerClient.prototype.buildFromSpec = function (response) {\n  if (this.isBuilt) {\n    return this;\n  }\n\n  this.apis = {};\n  this.apisArray = [];\n  this.basePath = response.basePath || '';\n  this.consumes = response.consumes;\n  this.host = response.host || '';\n  this.info = response.info || {};\n  this.produces = response.produces;\n  this.schemes = response.schemes || [];\n  this.securityDefinitions = _.cloneDeep(response.securityDefinitions);\n  this.security = response.security;\n  this.title = response.title || '';\n\n  var key, definedTags = {}, k, location, self = this, i;\n\n  if (response.externalDocs) {\n    this.externalDocs = response.externalDocs;\n  }\n\n  // legacy support\n  this.authSchemes = this.securityDefinitions;\n\n  if(this.securityDefinitions) {\n    for(key in this.securityDefinitions) {\n      var securityDefinition = this.securityDefinitions[key];\n      securityDefinition.vendorExtensions = {};\n      for(var ext in securityDefinition) {\n        helpers.extractExtensions(ext, securityDefinition);\n        if (ext === 'scopes') {\n          var scopes = securityDefinition[ext];\n          if(typeof scopes === 'object') {\n            scopes.vendorExtensions = {};\n            for (var s in scopes) {\n              helpers.extractExtensions(s, scopes);\n              if(s.indexOf('x-') === 0) {\n                delete scopes[s];\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (Array.isArray(response.tags)) {\n    definedTags = {};\n\n    for (k = 0; k < response.tags.length; k++) {\n      var t = _.cloneDeep(response.tags[k]);\n      definedTags[t.name] = t;\n      for(i in t) {\n        if(i === 'externalDocs' && typeof t[i] === 'object') {\n          for(var j in t[i]) {\n            helpers.extractExtensions(j, t[i]);\n          }\n        }\n        helpers.extractExtensions(i, t);\n      }\n    }\n  }\n\n\n  if (typeof this.url === 'string') {\n    location = this.parseUri(this.url);\n    if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {\n      if(typeof window !== 'undefined') {\n        // use the window scheme\n        this.scheme = window.location.protocol.replace(':','');\n      }\n      else {\n        this.scheme = location.scheme || 'http';\n      }\n    } else if (typeof window !== 'undefined' && window.location.protocol.indexOf('chrome-extension') === 0) {\n\t\t// if it is chrome swagger ui extension scheme then let swagger doc url scheme decide the protocol\n\t\tthis.scheme = location.scheme;\n\t} else if (typeof this.scheme === 'undefined') {\n      if(typeof window !== 'undefined') {\n        var scheme = window.location.protocol.replace(':','');\n        if(scheme === 'https' && this.schemes.indexOf(scheme) === -1) {\n          // can't call http from https served page in a browser!\n          helpers.log('Cannot call a http server from https inside a browser!');\n          this.scheme = 'http';\n        }\n        else if(this.schemes.indexOf(scheme) !== -1) {\n          this.scheme = scheme;\n        }\n        else {\n          if(this.schemes.indexOf('https') !== -1) {\n            this.scheme = 'https';\n          }\n          else {\n            this.scheme = 'http';\n          }\n        }\n      }\n      else {\n        this.scheme = this.schemes[0] || location.scheme;\n      }\n    }\n\n    if (typeof this.host === 'undefined' || this.host === '') {\n      this.host = location.host;\n\n      if (location.port) {\n        this.host = this.host + ':' + location.port;\n      }\n    }\n  }\n  else {\n    if (typeof this.schemes === 'undefined' || this.schemes.length === 0) {\n      this.scheme = 'http';\n    }\n    else if (typeof this.scheme === 'undefined') {\n      this.scheme = this.schemes[0];\n    }\n  }\n\n  this.definitions = response.definitions;\n\n  for (key in this.definitions) {\n    var model = new Model(key, this.definitions[key], this.models, this.modelPropertyMacro);\n\n    if (model) {\n      this.models[key] = model;\n    }\n  }\n\n  // get paths, create functions for each operationId\n\n  // Bind help to 'client.apis'\n  self.apis.help = _.bind(self.help, self);\n\n  _.forEach(response.paths, function (pathObj, path) {\n    // Only process a path if it's an object\n    if (!_.isPlainObject(pathObj)) {\n      return;\n    }\n\n    _.forEach(supportedOperationMethods, function (method) {\n      var operation = pathObj[method];\n\n      if (_.isUndefined(operation)) {\n        // Operation does not exist\n        return;\n      } else if (!_.isPlainObject(operation)) {\n        // Operation exists but it is not an Operation Object.  Since this is invalid, log it.\n        helpers.log('The \\'' + method + '\\' operation for \\'' + path + '\\' path is not an Operation Object');\n\n        return;\n      }\n\n      var tags = operation.tags;\n\n      if (_.isUndefined(tags) || !_.isArray(tags) || tags.length === 0) {\n        tags = operation.tags = [ 'default' ];\n      }\n\n      var operationId = self.idFromOp(path, method, operation);\n\n      var operationObject = new Operation(self,\n        operation.scheme,\n        operationId,\n        method,\n        path,\n        operation,\n        self.definitions,\n        self.models,\n        self.clientAuthorizations);\n\n      operationObject.connectionAgent = self.connectionAgent;\n      operationObject.vendorExtensions = {};\n      for(i in operation) {\n        helpers.extractExtensions(i, operationObject, operation[i]);\n      }\n      operationObject.externalDocs = operation.externalDocs;\n      if(operationObject.externalDocs) {\n        operationObject.externalDocs = _.cloneDeep(operationObject.externalDocs);\n        operationObject.externalDocs.vendorExtensions = {};\n        for(i in operationObject.externalDocs) {\n          helpers.extractExtensions(i, operationObject.externalDocs);\n        }\n      }\n\n      // bind self operation's execute command to the api\n      _.forEach(tags, function (tag) {\n        var clientProperty = _.indexOf(reservedClientTags, tag) > -1 ? '_' + tag : tag;\n        var apiProperty = _.indexOf(reservedApiTags, tag) > -1 ? '_' + tag : tag;\n        var operationGroup = self[clientProperty];\n\n        if (clientProperty !== tag) {\n          helpers.log('The \\'' + tag + '\\' tag conflicts with a SwaggerClient function/property name.  Use \\'client.' +\n                      clientProperty + '\\' or \\'client.apis.' + tag + '\\' instead of \\'client.' + tag + '\\'.');\n        }\n\n        if (apiProperty !== tag) {\n          helpers.log('The \\'' + tag + '\\' tag conflicts with a SwaggerClient operation function/property name.  Use ' +\n                      '\\'client.apis.' + apiProperty + '\\' instead of \\'client.apis.' + tag + '\\'.');\n        }\n\n        if (_.indexOf(reservedApiTags, operationId) > -1) {\n          helpers.log('The \\'' + operationId + '\\' operationId conflicts with a SwaggerClient operation ' +\n                      'function/property name.  Use \\'client.apis.' + apiProperty + '._' + operationId +\n                      '\\' instead of \\'client.apis.' + apiProperty + '.' + operationId + '\\'.');\n\n          operationId = '_' + operationId;\n          operationObject.nickname = operationId; // So 'client.apis.[tag].operationId.help() works properly\n        }\n\n        if (_.isUndefined(operationGroup)) {\n          operationGroup = self[clientProperty] = self.apis[apiProperty] = {};\n\n          operationGroup.operations = {};\n          operationGroup.label = apiProperty;\n          operationGroup.apis = {};\n\n          var tagDef = definedTags[tag];\n\n          if (!_.isUndefined(tagDef)) {\n            operationGroup.description = tagDef.description;\n            operationGroup.externalDocs = tagDef.externalDocs;\n            operationGroup.vendorExtensions = tagDef.vendorExtensions;\n          }\n\n          self[clientProperty].help = _.bind(self.help, operationGroup);\n          self.apisArray.push(new OperationGroup(tag, operationGroup.description, operationGroup.externalDocs, operationObject));\n        }\n\n        operationId = self.makeUniqueOperationId(operationId, self.apis[apiProperty]);\n\n        // Bind tag help\n        if (!_.isFunction(operationGroup.help)) {\n          operationGroup.help = _.bind(self.help, operationGroup);\n        }\n\n        // bind to the apis object\n        self.apis[apiProperty][operationId] = operationGroup[operationId] = _.bind(operationObject.execute,\n                                                                                  operationObject);\n        self.apis[apiProperty][operationId].help = operationGroup[operationId].help = _.bind(operationObject.help,\n                                                                                             operationObject);\n        self.apis[apiProperty][operationId].asCurl = operationGroup[operationId].asCurl = _.bind(operationObject.asCurl,\n                                                                                                 operationObject);\n\n        operationGroup.apis[operationId] = operationGroup.operations[operationId] = operationObject;\n\n        // legacy UI feature\n        var api = _.find(self.apisArray, function (api) {\n          return api.tag === tag;\n        });\n\n        if (api) {\n          api.operationsArray.push(operationObject);\n        }\n      });\n    });\n  });\n\n  // sort the apisArray according to the tags\n  var sortedApis = [];\n  _.forEach(Object.keys(definedTags), function (tag) {\n    var pos;\n    for(pos in self.apisArray) {\n      var _api = self.apisArray[pos];\n      if(_api && tag === _api.name) {\n        sortedApis.push(_api);\n        self.apisArray[pos] = null;\n      }\n    }\n  });\n  // add anything left\n  _.forEach(self.apisArray, function (api) {\n    if(api) {\n      sortedApis.push(api);\n    }\n  });\n  self.apisArray = sortedApis;\n\n  _.forEach(response.definitions, function (definitionObj, definition) {\n    definitionObj.id = definition.toLowerCase();\n    definitionObj.name = definition;\n    self.modelsArray.push(definitionObj);\n  });\n\n  this.isBuilt = true;\n\n  if (this.usePromise) {\n    this.isValid = true;\n    this.isBuilt = true;\n    this.deferredClient.resolve(this);\n\n    return this.deferredClient.promise;\n  }\n\n  if (this.success) {\n    this.success();\n  }\n\n  return this;\n};\n\nSwaggerClient.prototype.makeUniqueOperationId = function(operationId, api) {\n  var count = 0;\n  var name = operationId;\n\n  // make unique across this operation group\n  while(true) {\n    var matched = false;\n    _.forEach(api.operations, function (operation) {\n      if(operation.nickname === name) {\n        matched = true;\n      }\n    });\n    if(!matched) {\n      return name;\n    }\n    name = operationId + '_' + count;\n    count ++;\n  }\n\n  return operationId;\n};\n\nSwaggerClient.prototype.parseUri = function (uri) {\n  var urlParseRE = /^(((([^:\\/#\\?]+:)?(?:(\\/\\/)((?:(([^:@\\/#\\?]+)(?:\\:([^:@\\/#\\?]+))?)@)?(([^:\\/#\\?\\]\\[]+|\\[[^\\/\\]@#?]+\\])(?:\\:([0-9]+))?))?)?)?((\\/?(?:[^\\/\\?#]+\\/+)*)([^\\?#]*)))?(\\?[^#]+)?)(#.*)?/;\n  var parts = urlParseRE.exec(uri);\n\n  return {\n    scheme: parts[4] ? parts[4].replace(':','') : undefined,\n    host: parts[11],\n    port: parts[12],\n    path: parts[15]\n  };\n};\n\nSwaggerClient.prototype.help = function (dontPrint) {\n  var output = '';\n\n  if (this instanceof SwaggerClient) {\n    _.forEach(this.apis, function (api, name) {\n      if (_.isPlainObject(api)) {\n        output += 'operations for the \\'' + name + '\\' tag\\n';\n\n        _.forEach(api.operations, function (operation, name) {\n          output += '  * ' + name + ': ' + operation.summary + '\\n';\n        });\n      }\n    });\n  } else if (this instanceof OperationGroup || _.isPlainObject(this)) {\n    output += 'operations for the \\'' + this.label + '\\' tag\\n';\n\n    _.forEach(this.apis, function (operation, name) {\n      output += '  * ' + name + ': ' + operation.summary + '\\n';\n    });\n  }\n\n  if (dontPrint) {\n    return output;\n  } else {\n    helpers.log(output);\n\n    return output;\n  }\n};\n\nSwaggerClient.prototype.tagFromLabel = function (label) {\n  return label;\n};\n\nSwaggerClient.prototype.idFromOp = function (path, httpMethod, op) {\n  if(!op || !op.operationId) {\n    op = op || {};\n    op.operationId = httpMethod + '_' + path;\n  }\n  var opId = op.operationId.replace(/[\\s!@#$%^&*()_+=\\[{\\]};:<>|.\\/?,\\\\'\"\"-]/g, '_') || (path.substring(1) + '_' + httpMethod);\n\n  opId = opId.replace(/((_){2,})/g, '_');\n  opId = opId.replace(/^(_)*/g, '');\n  opId = opId.replace(/([_])*$/g, '');\n\n  return opId;\n};\n\nSwaggerClient.prototype.setHost = function (host) {\n  this.host = host;\n\n  if(this.apis) {\n    _.forEach(this.apis, function(api) {\n      if(api.operations) {\n        _.forEach(api.operations, function(operation) {\n          operation.host = host;\n        });\n      }\n    });\n  }\n};\n\nSwaggerClient.prototype.setBasePath = function (basePath) {\n  this.basePath = basePath;\n\n  if(this.apis) {\n    _.forEach(this.apis, function(api) {\n      if(api.operations) {\n        _.forEach(api.operations, function(operation) {\n          operation.basePath = basePath;\n        });\n      }\n    });\n  }\n};\n\nSwaggerClient.prototype.setSchemes = function (schemes) {\n  this.schemes = schemes;\n\n  if(schemes && schemes.length > 0) {\n    if(this.apis) {\n      _.forEach(this.apis, function (api) {\n        if (api.operations) {\n          _.forEach(api.operations, function (operation) {\n            operation.scheme = schemes[0];\n          });\n        }\n      });\n    }\n  }\n};\n\nSwaggerClient.prototype.fail = function (message) {\n  if (this.usePromise) {\n    this.deferredClient.reject(message);\n    return this.deferredClient.promise;\n  } else {\n    if (this.failure) {\n      this.failure(message);\n    }\n    else {\n      this.failure(message);\n    }\n  }\n};\n","(function (process){\n'use strict';\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  indexOf: require('lodash-compat/array/indexOf')\n};\n\nmodule.exports.__bind = function (fn, me) {\n  return function(){\n    return fn.apply(me, arguments);\n  };\n};\n\nvar log = module.exports.log = function() {\n  // Only log if available and we're not testing\n  if (console && process.env.NODE_ENV !== 'test') {\n    console.log(Array.prototype.slice.call(arguments)[0]);\n  }\n};\n\nmodule.exports.fail = function (message) {\n  log(message);\n};\n\nmodule.exports.optionHtml = function (label, value) {\n  return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n};\n\nvar resolveSchema = module.exports.resolveSchema = function (schema) {\n  if (_.isPlainObject(schema.schema)) {\n    schema = resolveSchema(schema.schema);\n  }\n\n  return schema;\n};\n\nmodule.exports.simpleRef = function (name) {\n  if (typeof name === 'undefined') {\n    return null;\n  }\n\n  if (name.indexOf('#/definitions/') === 0) {\n    return name.substring('#/definitions/'.length);\n  } else {\n    return name;\n  }\n};\n\n/**\n * helper to remove extensions and add them to an object\n *\n * @param keyname\n * @param obj\n */\nmodule.exports.extractExtensions = function (keyname, obj, value) {\n  if(!keyname || !obj) {\n    return;\n  }\n\n  if (typeof keyname === 'string' && keyname.indexOf('x-') === 0) {\n    obj.vendorExtensions = obj.vendorExtensions || {};\n    if(value) {\n      obj.vendorExtensions[keyname] = value;\n    }\n    else {\n      obj.vendorExtensions[keyname] = obj[keyname];\n    }\n  }\n};\n}).call(this,require('_process'))\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9oZWxwZXJzLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIF8gPSB7XG4gIGlzUGxhaW5PYmplY3Q6IHJlcXVpcmUoJ2xvZGFzaC1jb21wYXQvbGFuZy9pc1BsYWluT2JqZWN0JyksXG4gIGluZGV4T2Y6IHJlcXVpcmUoJ2xvZGFzaC1jb21wYXQvYXJyYXkvaW5kZXhPZicpXG59O1xuXG5tb2R1bGUuZXhwb3J0cy5fX2JpbmQgPSBmdW5jdGlvbiAoZm4sIG1lKSB7XG4gIHJldHVybiBmdW5jdGlvbigpe1xuICAgIHJldHVybiBmbi5hcHBseShtZSwgYXJndW1lbnRzKTtcbiAgfTtcbn07XG5cbnZhciBsb2cgPSBtb2R1bGUuZXhwb3J0cy5sb2cgPSBmdW5jdGlvbigpIHtcbiAgLy8gT25seSBsb2cgaWYgYXZhaWxhYmxlIGFuZCB3ZSdyZSBub3QgdGVzdGluZ1xuICBpZiAoY29uc29sZSAmJiBwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Rlc3QnKSB7XG4gICAgY29uc29sZS5sb2coQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzKVswXSk7XG4gIH1cbn07XG5cbm1vZHVsZS5leHBvcnRzLmZhaWwgPSBmdW5jdGlvbiAobWVzc2FnZSkge1xuICBsb2cobWVzc2FnZSk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cy5vcHRpb25IdG1sID0gZnVuY3Rpb24gKGxhYmVsLCB2YWx1ZSkge1xuICByZXR1cm4gJzx0cj48dGQgY2xhc3M9XCJvcHRpb25OYW1lXCI+JyArIGxhYmVsICsgJzo8L3RkPjx0ZD4nICsgdmFsdWUgKyAnPC90ZD48L3RyPic7XG59O1xuXG52YXIgcmVzb2x2ZVNjaGVtYSA9IG1vZHVsZS5leHBvcnRzLnJlc29sdmVTY2hlbWEgPSBmdW5jdGlvbiAoc2NoZW1hKSB7XG4gIGlmIChfLmlzUGxhaW5PYmplY3Qoc2NoZW1hLnNjaGVtYSkpIHtcbiAgICBzY2hlbWEgPSByZXNvbHZlU2NoZW1hKHNjaGVtYS5zY2hlbWEpO1xuICB9XG5cbiAgcmV0dXJuIHNjaGVtYTtcbn07XG5cbm1vZHVsZS5leHBvcnRzLnNpbXBsZVJlZiA9IGZ1bmN0aW9uIChuYW1lKSB7XG4gIGlmICh0eXBlb2YgbmFtZSA9PT0gJ3VuZGVmaW5lZCcpIHtcbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG4gIGlmIChuYW1lLmluZGV4T2YoJyMvZGVmaW5pdGlvbnMvJykgPT09IDApIHtcbiAgICByZXR1cm4gbmFtZS5zdWJzdHJpbmcoJyMvZGVmaW5pdGlvbnMvJy5sZW5ndGgpO1xuICB9IGVsc2Uge1xuICAgIHJldHVybiBuYW1lO1xuICB9XG59O1xuXG4vKipcbiAqIGhlbHBlciB0byByZW1vdmUgZXh0ZW5zaW9ucyBhbmQgYWRkIHRoZW0gdG8gYW4gb2JqZWN0XG4gKlxuICogQHBhcmFtIGtleW5hbWVcbiAqIEBwYXJhbSBvYmpcbiAqL1xubW9kdWxlLmV4cG9ydHMuZXh0cmFjdEV4dGVuc2lvbnMgPSBmdW5jdGlvbiAoa2V5bmFtZSwgb2JqLCB2YWx1ZSkge1xuICBpZigha2V5bmFtZSB8fCAhb2JqKSB7XG4gICAgcmV0dXJuO1xuICB9XG5cbiAgaWYgKHR5cGVvZiBrZXluYW1lID09PSAnc3RyaW5nJyAmJiBrZXluYW1lLmluZGV4T2YoJ3gtJykgPT09IDApIHtcbiAgICBvYmoudmVuZG9yRXh0ZW5zaW9ucyA9IG9iai52ZW5kb3JFeHRlbnNpb25zIHx8IHt9O1xuICAgIGlmKHZhbHVlKSB7XG4gICAgICBvYmoudmVuZG9yRXh0ZW5zaW9uc1trZXluYW1lXSA9IHZhbHVlO1xuICAgIH1cbiAgICBlbHNlIHtcbiAgICAgIG9iai52ZW5kb3JFeHRlbnNpb25zW2tleW5hbWVdID0gb2JqW2tleW5hbWVdO1xuICAgIH1cbiAgfVxufTsiXX0=","(function (Buffer){\n'use strict';\n\nvar helpers = require('./helpers');\nvar request = require('superagent');\nvar jsyaml = require('js-yaml');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  keys: require('lodash-compat/object/keys')\n};\n\n/*\n * JQueryHttpClient is a light-weight, node or browser HTTP client\n */\nvar JQueryHttpClient = function () {\n  this.type = 'JQueryHttpClient';\n};\n\n/*\n * SuperagentHttpClient is a light-weight, node or browser HTTP client\n */\nvar SuperagentHttpClient = function () {\n  this.type = 'SuperagentHttpClient';\n};\n\n/**\n * SwaggerHttp is a wrapper for executing requests\n */\nvar SwaggerHttp = module.exports = function () {};\n\nSwaggerHttp.prototype.execute = function (obj, opts) {\n  var client;\n\n  if(opts && opts.client) {\n    client = opts.client;\n  }\n  else {\n    client = new SuperagentHttpClient(opts);\n  }\n  client.opts = opts || {};\n\n  if (opts && opts.requestAgent) {\n    request = opts.requestAgent;\n  }\n\n  // legacy support\n  var hasJQuery = false;\n  if(typeof window !== 'undefined') {\n    if(typeof window.jQuery !== 'undefined') {\n      hasJQuery = true;\n    }\n  }\n  // OPTIONS support\n  if(obj.method.toLowerCase() === 'options' && client.type === 'SuperagentHttpClient') {\n    log('forcing jQuery as OPTIONS are not supported by SuperAgent');\n    obj.useJQuery = true;\n  }\n  if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n  if ((obj && obj.useJQuery === true) || this.isInternetExplorer() && hasJQuery) {\n    client = new JQueryHttpClient(opts);\n  }\n\n  var success = obj.on.response;\n  var error = obj.on.error;\n\n  var requestInterceptor = function(data) {\n    if(opts && opts.requestInterceptor) {\n      data = opts.requestInterceptor.apply(data);\n    }\n    return data;\n  };\n\n  var responseInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    return success(data);\n  };\n\n  var errorInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    error(data);\n  };\n\n  obj.on.error = function(data) {\n    errorInterceptor(data);\n  };\n\n  obj.on.response = function(data) {\n    if(data && data.status >= 400) {\n      errorInterceptor(data);\n    }\n    else {\n      responseInterceptor(data);\n    }\n  };\n\n  if (_.isObject(obj) && _.isObject(obj.body)) {\n    // special processing for file uploads via jquery\n    if (obj.body.type && obj.body.type === 'formData'){\n      if(opts.useJQuery) {\n        obj.contentType = false;\n        obj.processData = false;\n        delete obj.headers['Content-Type'];\n      }\n    }\n  }\n\n  obj = requestInterceptor(obj) || obj;\n  if (obj.beforeSend) {\n    obj.beforeSend(function(_obj) {\n      client.execute(_obj || obj);\n    });\n  } else {\n    client.execute(obj);\n  }\n\n  return (obj.deferred) ? obj.deferred.promise : obj;\n};\n\nSwaggerHttp.prototype.isInternetExplorer = function () {\n  var detectedIE = false;\n\n  if (typeof navigator !== 'undefined' && navigator.userAgent) {\n    var nav = navigator.userAgent.toLowerCase();\n\n    if (nav.indexOf('msie') !== -1) {\n      var version = parseInt(nav.split('msie')[1]);\n\n      if (version <= 8) {\n        detectedIE = true;\n      }\n    }\n  }\n\n  return detectedIE;\n};\n\nJQueryHttpClient.prototype.execute = function (obj) {\n  var jq = this.jQuery || (typeof window !== 'undefined' && window.jQuery);\n  var cb = obj.on;\n  var request = obj;\n\n  if(typeof jq === 'undefined' || jq === false) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n\n  obj.type = obj.method;\n  obj.cache = obj.jqueryAjaxCache;\n  obj.data = obj.body;\n  delete obj.jqueryAjaxCache;\n  delete obj.useJQuery;\n  delete obj.body;\n\n  obj.complete = function (response) {\n    var headers = {};\n    var headerArray = response.getAllResponseHeaders().split('\\n');\n\n    for (var i = 0; i < headerArray.length; i++) {\n      var toSplit = headerArray[i].trim();\n\n      if (toSplit.length === 0) {\n        continue;\n      }\n\n      var separator = toSplit.indexOf(':');\n\n      if (separator === -1) {\n        // Name but no value in the header\n        headers[toSplit] = null;\n\n        continue;\n      }\n\n      var name = toSplit.substring(0, separator).trim();\n      var value = toSplit.substring(separator + 1).trim();\n\n      headers[name] = value;\n    }\n\n    var out = {\n      url: request.url,\n      method: request.method,\n      status: response.status,\n      statusText: response.statusText,\n      data: response.responseText,\n      headers: headers\n    };\n\n    try {\n      var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);\n      out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;\n    } catch (ex) {\n      // do not set out.obj\n      helpers.log('unable to parse JSON/YAML content');\n    }\n\n    // I can throw, or parse null?\n    out.obj = out.obj || null;\n\n    if (response.status >= 200 && response.status < 300) {\n      cb.response(out);\n    } else if (response.status === 0 || (response.status >= 400 && response.status < 599)) {\n      cb.error(out);\n    } else {\n      return cb.response(out);\n    }\n  };\n\n  jq.support.cors = true;\n\n  return jq.ajax(obj);\n};\n\nSuperagentHttpClient.prototype.execute = function (obj) {\n  var method = obj.method.toLowerCase();\n  var timeout = obj.timeout;\n\n  if (method === 'delete') {\n    method = 'del';\n  }\n  var headers = obj.headers || {};\n\n  var r = request[method](obj.url);\n\n  if (obj.connectionAgent) {\n    r.agent(obj.connectionAgent);\n  }\n\n  if (timeout) {\n    r.timeout(timeout);\n  }\n\n  if (obj.enableCookies) {\n    r.withCredentials();\n  }\n\n  var accept = obj.headers.Accept;\n\n  if(this.binaryRequest(accept)) {\n    r.on('request', function () {\n      if(this.xhr) {\n        this.xhr.responseType = 'blob';\n      }\n    });\n  }\n\n  if(obj.body) {\n    if(_.isObject(obj.body)) {\n      var contentType = obj.headers['Content-Type'] || '';\n      if (contentType.indexOf('multipart/form-data') === 0) {\n        delete headers['Content-Type'];\n        if({}.toString.apply(obj.body) === '[object FormData]') {\n          r.send(obj.body);\n        }\n        else {\n          var keyname, value, v;\n          for (keyname in obj.body) {\n            value = obj.body[keyname];\n            if(Array.isArray(value)) {\n              for(v in value) {\n                r.field(keyname, v);\n              }\n            }\n            else {\n              r.field(keyname, value);\n            }\n          }\n        }\n      }\n      else if (_.isObject(obj.body)) {\n        // non multipart/form-data\n        obj.body = JSON.stringify(obj.body);\n        r.send(obj.body);\n      }\n    }\n    else {\n      r.send(obj.body);\n    }\n  }\n\n  var name;\n  for (name in headers) {\n    r.set(name, headers[name]);\n  }\n\n  if(typeof r.buffer === 'function') {\n    r.buffer(); // force superagent to populate res.text with the raw response data\n  }\n\n  r.end(function (err, res) {\n    res = res || {\n      status: 0,\n      headers: {error: 'no response from server'}\n    };\n    var response = {\n      url: obj.url,\n      method: obj.method,\n      headers: res.headers\n    };\n    var cb;\n\n    if (!err && res.error) {\n      err = res.error;\n    }\n\n    if (err && obj.on && obj.on.error) {\n      response.errObj = err;\n      response.status = res ? res.status : 500;\n      response.statusText = res ? res.text : err.message;\n      if (res.headers && res.headers['content-type']) {\n        if (res.headers['content-type'].indexOf('application/json') >= 0) {\n          try {\n            response.obj = JSON.parse(response.statusText);\n          }\n          catch (e) {\n            response.obj = null;\n          }\n        }\n      }\n      cb = obj.on.error;\n    } else if (res && obj.on && obj.on.response) {\n      var possibleObj;\n\n      // Already parsed by by superagent?\n      if (res.body && _.keys(res.body).length > 0) {\n        possibleObj = res.body;\n      } else {\n        try {\n          possibleObj = jsyaml.safeLoad(res.text);\n          // can parse into a string... which we don't need running around in the system\n          possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;\n        } catch (e) {\n          helpers.log('cannot parse JSON/YAML content');\n        }\n      }\n\n      // null means we can't parse into object\n      if(typeof Buffer === 'function' && Buffer.isBuffer(possibleObj)) {\n        response.data = possibleObj;\n      }\n      else {\n        response.obj = (typeof possibleObj === 'object') ? possibleObj : null;\n      }\n\n      response.status = res.status;\n      response.statusText = res.text;\n      cb = obj.on.response;\n    }\n    if (res.xhr && res.xhr.response) {\n      response.data = res.xhr.response;\n    }\n    else if(!response.data) {\n      response.data = response.statusText;\n    }\n\n    if (cb) {\n      cb(response);\n    }\n  });\n};\n\nSuperagentHttpClient.prototype. binaryRequest = function (accept) {\n  if(!accept) {\n    return false;\n  }\n  return (/^image/i).test(accept)\n    || (/^application\\/pdf/).test(accept)\n    || (/^application\\/octet-stream/).test(accept);\n};\n\n}).call(this,require(\"buffer\").Buffer)\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/http.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar helpers = require('./helpers');\nvar request = require('superagent');\nvar jsyaml = require('js-yaml');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  keys: require('lodash-compat/object/keys')\n};\n\n/*\n * JQueryHttpClient is a light-weight, node or browser HTTP client\n */\nvar JQueryHttpClient = function () {\n  this.type = 'JQueryHttpClient';\n};\n\n/*\n * SuperagentHttpClient is a light-weight, node or browser HTTP client\n */\nvar SuperagentHttpClient = function () {\n  this.type = 'SuperagentHttpClient';\n};\n\n/**\n * SwaggerHttp is a wrapper for executing requests\n */\nvar SwaggerHttp = module.exports = function () {};\n\nSwaggerHttp.prototype.execute = function (obj, opts) {\n  var client;\n\n  if(opts && opts.client) {\n    client = opts.client;\n  }\n  else {\n    client = new SuperagentHttpClient(opts);\n  }\n  client.opts = opts || {};\n\n  if (opts && opts.requestAgent) {\n    request = opts.requestAgent;\n  }\n\n  // legacy support\n  var hasJQuery = false;\n  if(typeof window !== 'undefined') {\n    if(typeof window.jQuery !== 'undefined') {\n      hasJQuery = true;\n    }\n  }\n  // OPTIONS support\n  if(obj.method.toLowerCase() === 'options' && client.type === 'SuperagentHttpClient') {\n    log('forcing jQuery as OPTIONS are not supported by SuperAgent');\n    obj.useJQuery = true;\n  }\n  if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n  if ((obj && obj.useJQuery === true) || this.isInternetExplorer() && hasJQuery) {\n    client = new JQueryHttpClient(opts);\n  }\n\n  var success = obj.on.response;\n  var error = obj.on.error;\n\n  var requestInterceptor = function(data) {\n    if(opts && opts.requestInterceptor) {\n      data = opts.requestInterceptor.apply(data);\n    }\n    return data;\n  };\n\n  var responseInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    return success(data);\n  };\n\n  var errorInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    error(data);\n  };\n\n  obj.on.error = function(data) {\n    errorInterceptor(data);\n  };\n\n  obj.on.response = function(data) {\n    if(data && data.status >= 400) {\n      errorInterceptor(data);\n    }\n    else {\n      responseInterceptor(data);\n    }\n  };\n\n  if (_.isObject(obj) && _.isObject(obj.body)) {\n    // special processing for file uploads via jquery\n    if (obj.body.type && obj.body.type === 'formData'){\n      if(opts.useJQuery) {\n        obj.contentType = false;\n        obj.processData = false;\n        delete obj.headers['Content-Type'];\n      }\n    }\n  }\n\n  obj = requestInterceptor(obj) || obj;\n  if (obj.beforeSend) {\n    obj.beforeSend(function(_obj) {\n      client.execute(_obj || obj);\n    });\n  } else {\n    client.execute(obj);\n  }\n\n  return (obj.deferred) ? obj.deferred.promise : obj;\n};\n\nSwaggerHttp.prototype.isInternetExplorer = function () {\n  var detectedIE = false;\n\n  if (typeof navigator !== 'undefined' && navigator.userAgent) {\n    var nav = navigator.userAgent.toLowerCase();\n\n    if (nav.indexOf('msie') !== -1) {\n      var version = parseInt(nav.split('msie')[1]);\n\n      if (version <= 8) {\n        detectedIE = true;\n      }\n    }\n  }\n\n  return detectedIE;\n};\n\nJQueryHttpClient.prototype.execute = function (obj) {\n  var jq = this.jQuery || (typeof window !== 'undefined' && window.jQuery);\n  var cb = obj.on;\n  var request = obj;\n\n  if(typeof jq === 'undefined' || jq === false) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n\n  obj.type = obj.method;\n  obj.cache = obj.jqueryAjaxCache;\n  obj.data = obj.body;\n  delete obj.jqueryAjaxCache;\n  delete obj.useJQuery;\n  delete obj.body;\n\n  obj.complete = function (response) {\n    var headers = {};\n    var headerArray = response.getAllResponseHeaders().split('\\n');\n\n    for (var i = 0; i < headerArray.length; i++) {\n      var toSplit = headerArray[i].trim();\n\n      if (toSplit.length === 0) {\n        continue;\n      }\n\n      var separator = toSplit.indexOf(':');\n\n      if (separator === -1) {\n        // Name but no value in the header\n        headers[toSplit] = null;\n\n        continue;\n      }\n\n      var name = toSplit.substring(0, separator).trim();\n      var value = toSplit.substring(separator + 1).trim();\n\n      headers[name] = value;\n    }\n\n    var out = {\n      url: request.url,\n      method: request.method,\n      status: response.status,\n      statusText: response.statusText,\n      data: response.responseText,\n      headers: headers\n    };\n\n    try {\n      var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);\n      out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;\n    } catch (ex) {\n      // do not set out.obj\n      helpers.log('unable to parse JSON/YAML content');\n    }\n\n    // I can throw, or parse null?\n    out.obj = out.obj || null;\n\n    if (response.status >= 200 && response.status < 300) {\n      cb.response(out);\n    } else if (response.status === 0 || (response.status >= 400 && response.status < 599)) {\n      cb.error(out);\n    } else {\n      return cb.response(out);\n    }\n  };\n\n  jq.support.cors = true;\n\n  return jq.ajax(obj);\n};\n\nSuperagentHttpClient.prototype.execute = function (obj) {\n  var method = obj.method.toLowerCase();\n  var timeout = obj.timeout;\n\n  if (method === 'delete') {\n    method = 'del';\n  }\n  var headers = obj.headers || {};\n\n  var r = request[method](obj.url);\n\n  if (obj.connectionAgent) {\n    r.agent(obj.connectionAgent);\n  }\n\n  if (timeout) {\n    r.timeout(timeout);\n  }\n\n  if (obj.enableCookies) {\n    r.withCredentials();\n  }\n\n  var accept = obj.headers.Accept;\n\n  if(this.binaryRequest(accept)) {\n    r.on('request', function () {\n      if(this.xhr) {\n        this.xhr.responseType = 'blob';\n      }\n    });\n  }\n\n  if(obj.body) {\n    if(_.isObject(obj.body)) {\n      var contentType = obj.headers['Content-Type'] || '';\n      if (contentType.indexOf('multipart/form-data') === 0) {\n        delete headers['Content-Type'];\n        if({}.toString.apply(obj.body) === '[object FormData]') {\n          r.send(obj.body);\n        }\n        else {\n          var keyname, value, v;\n          for (keyname in obj.body) {\n            value = obj.body[keyname];\n            if(Array.isArray(value)) {\n              for(v in value) {\n                r.field(keyname, v);\n              }\n            }\n            else {\n              r.field(keyname, value);\n            }\n          }\n        }\n      }\n      else if (_.isObject(obj.body)) {\n        // non multipart/form-data\n        obj.body = JSON.stringify(obj.body);\n        r.send(obj.body);\n      }\n    }\n    else {\n      r.send(obj.body);\n    }\n  }\n\n  var name;\n  for (name in headers) {\n    r.set(name, headers[name]);\n  }\n\n  if(typeof r.buffer === 'function') {\n    r.buffer(); // force superagent to populate res.text with the raw response data\n  }\n\n  r.end(function (err, res) {\n    res = res || {\n      status: 0,\n      headers: {error: 'no response from server'}\n    };\n    var response = {\n      url: obj.url,\n      method: obj.method,\n      headers: res.headers\n    };\n    var cb;\n\n    if (!err && res.error) {\n      err = res.error;\n    }\n\n    if (err && obj.on && obj.on.error) {\n      response.errObj = err;\n      response.status = res ? res.status : 500;\n      response.statusText = res ? res.text : err.message;\n      if (res.headers && res.headers['content-type']) {\n        if (res.headers['content-type'].indexOf('application/json') >= 0) {\n          try {\n            response.obj = JSON.parse(response.statusText);\n          }\n          catch (e) {\n            response.obj = null;\n          }\n        }\n      }\n      cb = obj.on.error;\n    } else if (res && obj.on && obj.on.response) {\n      var possibleObj;\n\n      // Already parsed by by superagent?\n      if (res.body && _.keys(res.body).length > 0) {\n        possibleObj = res.body;\n      } else {\n        try {\n          possibleObj = jsyaml.safeLoad(res.text);\n          // can parse into a string... which we don't need running around in the system\n          possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;\n        } catch (e) {\n          helpers.log('cannot parse JSON/YAML content');\n        }\n      }\n\n      // null means we can't parse into object\n      if(typeof Buffer === 'function' && Buffer.isBuffer(possibleObj)) {\n        response.data = possibleObj;\n      }\n      else {\n        response.obj = (typeof possibleObj === 'object') ? possibleObj : null;\n      }\n\n      response.status = res.status;\n      response.statusText = res.text;\n      cb = obj.on.response;\n    }\n    if (res.xhr && res.xhr.response) {\n      response.data = res.xhr.response;\n    }\n    else if(!response.data) {\n      response.data = response.statusText;\n    }\n\n    if (cb) {\n      cb(response);\n    }\n  });\n};\n\nSuperagentHttpClient.prototype. binaryRequest = function (accept) {\n  if(!accept) {\n    return false;\n  }\n  return (/^image/i).test(accept)\n    || (/^application\\/pdf/).test(accept)\n    || (/^application\\/octet-stream/).test(accept);\n};\n"]}","'use strict';\n\nvar SwaggerHttp = require('./http');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isString: require('lodash-compat/lang/isString')\n};\n\n\n/**\n * Resolves a spec's remote references\n */\nvar Resolver = module.exports = function () {\n  this.failedUrls = [];\n  this.resolverCache = {};\n  this.pendingUrls = {};\n};\n\nResolver.prototype.processAllOf = function(root, name, definition, resolutionTable, unresolvedRefs, spec) {\n  var i, location, property;\n\n  definition['x-resolved-from'] = [ '#/definitions/' + name ];\n  var allOf = definition.allOf;\n  // the refs go first\n  allOf.sort(function(a, b) {\n    if(a.$ref && b.$ref) { return 0; }\n    else if(a.$ref) { return -1; }\n    else { return 1; }\n  });\n  for (i = 0; i < allOf.length; i++) {\n    property = allOf[i];\n    location = '/definitions/' + name + '/allOf';\n    this.resolveInline(root, spec, property, resolutionTable, unresolvedRefs, location);\n  }\n};\n\nResolver.prototype.resolve = function (spec, arg1, arg2, arg3) {\n  this.spec = spec;\n  var root = arg1, callback = arg2, scope = arg3, opts = {}, location, i;\n  if(typeof arg1 === 'function') {\n    root = null;\n    callback = arg1;\n    scope = arg2;\n  }\n  var _root = root, modelName;\n  this.scope = (scope || this);\n  this.iteration = this.iteration || 0;\n\n  if(this.scope.options && this.scope.options.requestInterceptor){\n    opts.requestInterceptor = this.scope.options.requestInterceptor;\n  }\n\n  if(this.scope.options && this.scope.options.responseInterceptor){\n    opts.responseInterceptor = this.scope.options.responseInterceptor;\n  }\n\n  var name, path, property, propertyName, parameter, done, counter;\n  var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};\n  var resolutionTable = []; // store objects for dereferencing\n\n  spec.definitions = spec.definitions || {};\n  // definitions\n  for (name in spec.definitions) {\n    var definition = spec.definitions[name];\n    if(definition.$ref) {\n      this.resolveInline(root, spec, definition, resolutionTable, unresolvedRefs, definition);\n    }\n    else {\n      for (propertyName in definition.properties) {\n        property = definition.properties[propertyName];\n        if (_.isArray(property.allOf)) {\n          this.processAllOf(root, name, property, resolutionTable, unresolvedRefs, spec);\n        }\n        else {\n          this.resolveTo(root, property, resolutionTable, '/definitions');\n        }\n      }\n\n      if (definition.allOf) {\n        this.processAllOf(root, name, definition, resolutionTable, unresolvedRefs, spec);\n      }\n    }\n  }\n\n  // shared parameters\n  spec.parameters = spec.parameters || {};\n  for(name in spec.parameters) {\n    parameter = spec.parameters[name];\n    if (parameter.in === 'body' && parameter.schema) {\n      if(_.isArray(parameter.schema.allOf)) {\n        // move to a definition\n        modelName = 'inline_model';\n        var _name = modelName;\n        done = false; counter = 0;\n        while(!done) {\n          if(typeof spec.definitions[_name] === 'undefined') {\n            done = true;\n            break;\n          }\n          _name = modelName + '_' + counter;\n          counter ++;\n        }\n        spec.definitions[_name] = { allOf: parameter.schema.allOf };\n        delete parameter.schema.allOf;\n        parameter.schema.$ref = '#/definitions/' + _name;\n        this.processAllOf(root, _name, spec.definitions[_name], resolutionTable, unresolvedRefs, spec);\n      }\n      else {\n        this.resolveTo(root, parameter.schema, resolutionTable, location);\n      }\n    }\n\n    if (parameter.$ref) {\n      // parameter reference\n      this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);\n    }\n  }\n\n  // operations\n  for (name in spec.paths) {\n    var method, operation, responseCode;\n    path = spec.paths[name];\n\n    if(typeof path === 'object') {\n      for (method in path) {\n        // operation reference\n        if (method === '$ref') {\n          // location = path[method];\n          location = '/paths' + name;\n          this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);\n        }\n        else {\n          operation = path[method];\n          var sharedParameters = path.parameters || [];\n          var parameters = operation.parameters || [];\n\n          sharedParameters.forEach(function(parameter) {\n            parameters.unshift(parameter);\n          });\n\n          if (method !== 'parameters' && _.isObject(operation)) {\n            operation.parameters = operation.parameters || parameters;\n          }\n\n          for (i in parameters) {\n            parameter = parameters[i];\n            location = '/paths' + name + '/' + method + '/parameters';\n\n            if (parameter.in === 'body' && parameter.schema) {\n              if (_.isArray(parameter.schema.allOf)) {\n                // move to a definition\n                modelName = 'inline_model';\n                name = modelName;\n                done = false;\n                counter = 0;\n                while (!done) {\n                  if (typeof spec.definitions[name] === 'undefined') {\n                    done = true;\n                    break;\n                  }\n                  name = modelName + '_' + counter;\n                  counter++;\n                }\n                spec.definitions[name] = {allOf: parameter.schema.allOf};\n                delete parameter.schema.allOf;\n                parameter.schema.$ref = '#/definitions/' + name;\n                this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);\n              }\n              else {\n                this.resolveTo(root, parameter.schema, resolutionTable, location);\n              }\n            }\n\n            if (parameter.$ref) {\n              // parameter reference\n              this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);\n            }\n          }\n\n          for (responseCode in operation.responses) {\n            var response = operation.responses[responseCode];\n            location = '/paths' + name + '/' + method + '/responses/' + responseCode;\n\n            if (_.isObject(response)) {\n              if (response.$ref) {\n                // response reference\n                this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);\n              }\n              if (response.schema) {\n                var responseObj = response;\n                if (_.isArray(responseObj.schema.allOf)) {\n                  // move to a definition\n                  modelName = 'inline_model';\n                  name = modelName;\n                  done = false;\n                  counter = 0;\n                  while (!done) {\n                    if (typeof spec.definitions[name] === 'undefined') {\n                      done = true;\n                      break;\n                    }\n                    name = modelName + '_' + counter;\n                    counter++;\n                  }\n                  spec.definitions[name] = {allOf: responseObj.schema.allOf};\n                  delete responseObj.schema.allOf;\n                  delete responseObj.schema.type;\n                  responseObj.schema.$ref = '#/definitions/' + name;\n                  this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);\n                }\n                else if ('array' === responseObj.schema.type) {\n                  if (responseObj.schema.items && responseObj.schema.items.$ref) {\n                    // response reference\n                    this.resolveInline(root, spec, responseObj.schema.items, resolutionTable, unresolvedRefs, location);\n                  }\n                }\n                else {\n                  this.resolveTo(root, response.schema, resolutionTable, location);\n                }\n              }\n            }\n          }\n        }\n      }\n      // clear them out to avoid multiple resolutions\n      path.parameters = [];\n    }\n  }\n\n  var expectedCalls = 0, toResolve = [];\n  // if the root is same as obj[i].root we can resolve locally\n  var all = resolutionTable;\n\n  var parts;\n  for(i = 0; i < all.length; i++) {\n    var a = all[i];\n    if(root === a.root) {\n      if(a.resolveAs === 'ref') {\n        // resolve any path walking\n        var joined = ((a.root || '') + '/' + a.key).split('/');\n        var normalized = [];\n        var url = '';\n        var k;\n\n        if(a.key.indexOf('../') >= 0) {\n          for(var j = 0; j < joined.length; j++) {\n            if(joined[j] === '..') {\n              normalized = normalized.slice(0, normalized.length-1);\n            }\n            else {\n              normalized.push(joined[j]);\n            }\n          }\n          for(k = 0; k < normalized.length; k ++) {\n            if(k > 0) {\n              url += '/';\n            }\n            url += normalized[k];\n          }\n          // we now have to remote resolve this because the path has changed\n          a.root = url;\n          toResolve.push(a);\n        }\n        else {\n          parts = a.key.split('#');\n          if(parts.length === 2) {\n            if(parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0) {\n              a.root = parts[0];\n            }\n            location = parts[1].split('/');\n            var r;\n            var s = spec;\n            for(k = 0; k < location.length; k++) {\n              var part = location[k];\n              if(part !== '') {\n                s = s[part];\n                if(typeof s !== 'undefined') {\n                  r = s;\n                }\n                else {\n                  r = null;\n                  break;\n                }\n              }\n            }\n            if(r === null) {\n              // must resolve this too\n              toResolve.push(a);\n            }\n          }\n        }\n      }\n      else {\n        if (a.resolveAs === 'inline') {\n          if(a.key && a.key.indexOf('#') === -1 && a.key.charAt(0) !== '/') {\n            // handle relative schema\n            parts = a.root.split('/');\n            location = '';\n            for(i = 0; i < parts.length - 1; i++) {\n              location += parts[i] + '/';\n            }\n            location += a.key;\n            a.root = location;\n            a.location = '';\n          }\n          toResolve.push(a);\n        }\n      }\n    }\n    else {\n      toResolve.push(a);\n    }\n  }\n  expectedCalls = toResolve.length;\n\n  // resolve anything that is local\n\n  var lock = {};\n  for(var ii = 0; ii < toResolve.length; ii++) {\n    (function(item, spec, self, lock, ii) {\n      if(!item.root || item.root === root) {\n        // local resolve\n        self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);\n        processedCalls += 1;\n\n        if(processedCalls === expectedCalls) {\n          self.finish(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, true);\n        }\n      }\n      else if(self.failedUrls.indexOf(item.root) === -1) {\n        var obj = {\n          useJQuery: false,  // TODO\n          url: item.root,\n          method: 'get',\n          headers: {\n            accept: self.scope.swaggerRequestHeaders || 'application/json'\n          },\n          on: {\n            error: function (error) {\n              processedCalls += 1;\n              console.log('failed url: ' + obj.url);\n              self.failedUrls.push(obj.url);\n              if (lock) {\n                delete lock[item.root];\n              }\n              unresolvedRefs[item.key] = {\n                root: item.root,\n                location: item.location\n              };\n\n              if (processedCalls === expectedCalls) {\n                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n              }\n            },  // jshint ignore:line\n            response: function (response) {\n              var swagger = response.obj;\n              if (lock) {\n                delete lock[item.root];\n              }\n              if (self.resolverCache) {\n                self.resolverCache[item.root] = swagger;\n              }\n              self.resolveItem(swagger, item.root, resolutionTable, resolvedRefs, unresolvedRefs, item);\n              processedCalls += 1;\n\n              if (processedCalls === expectedCalls) {\n                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n              }\n            }\n          } // jshint ignore:line\n        };\n\n        // apply timeout only when specified\n        if (scope && scope.fetchSpecTimeout) {\n          obj.timeout = scope.fetchSpecTimeout;\n        }\n\n        if (scope && scope.clientAuthorizations) {\n          scope.clientAuthorizations.apply(obj);\n        }\n\n        (function waitForUnlock() {\n          setTimeout(function() {\n            if (lock[obj.url]) {\n              waitForUnlock();\n            }\n            else {\n              var cached = self.resolverCache[obj.url];\n              if (_.isObject(cached)) {\n                obj.on.response({obj: cached});\n              }\n              else {\n                lock[obj.url] = true;\n                new SwaggerHttp().execute(obj, opts);\n              }\n            }\n          }, 0);\n        })();\n      }\n\n      else {\n        processedCalls += 1;\n        unresolvedRefs[item.key] = {\n          root: item.root,\n          location: item.location\n        };\n        if (processedCalls === expectedCalls) {\n          self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n        }\n      }\n    }(toResolve[ii], spec, this, lock, ii));\n  }\n\n  if (Object.keys(toResolve).length === 0) {\n    this.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n  }\n};\n\nResolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, item) {\n  var path = item.location;\n  var location = spec, parts = path.split('/');\n  if(path !== '') {\n    for (var j = 0; j < parts.length; j++) {\n      var segment = parts[j];\n      if (segment.indexOf('~1') !== -1) {\n        segment = parts[j].replace(/~0/g, '~').replace(/~1/g, '/');\n        if (segment.charAt(0) !== '/') {\n          segment = '/' + segment;\n        }\n      }\n      if (typeof location === 'undefined' || location === null) {\n        break;\n      }\n      if (segment === '' && j === (parts.length - 1) && parts.length > 1) {\n        location = null;\n        break;\n      }\n      if (segment.length > 0) {\n        location = location[segment];\n      }\n    }\n  }\n  var resolved = item.key;\n  parts = item.key.split('/');\n  var resolvedName = parts[parts.length-1];\n\n  if(resolvedName.indexOf('#') >= 0) {\n    resolvedName = resolvedName.split('#')[1];\n  }\n\n  if (location !== null && typeof location !== 'undefined') {\n    resolvedRefs[resolved] = {\n      name: resolvedName,\n      obj: location,\n      key: item.key,\n      root: item.root\n    };\n  } else {\n    unresolvedRefs[resolved] = {\n      root: item.root,\n      location: item.location\n    };\n  }\n};\n\nResolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, localResolve) {\n  // walk resolution table and replace with resolved refs\n  var ref, abs;\n  for (ref in resolutionTable) {\n    var item = resolutionTable[ref];\n\n    var key = item.key;\n    var resolvedTo = resolvedRefs[key];\n    if (resolvedTo) {\n      spec.definitions = spec.definitions || {};\n      if (item.resolveAs === 'ref') {\n        if (localResolve !== true) {\n          // don't retain root for local definitions\n          for (key in resolvedTo.obj) {\n            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);\n            resolvedTo.obj[key] = abs;\n          }\n        }\n        spec.definitions[resolvedTo.name] = resolvedTo.obj;\n        item.obj.$ref = '#/definitions/' + resolvedTo.name;\n      } else if (item.resolveAs === 'inline') {\n        var targetObj = item.obj;\n        targetObj['x-resolved-from'] = [ item.key ];\n        delete targetObj.$ref;\n\n        for (key in resolvedTo.obj) {\n          abs = resolvedTo.obj[key];\n\n          if (localResolve !== true) {\n            // don't retain root for local definitions\n            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);\n          }\n          targetObj[key] = abs;\n        }\n      }\n    }\n  }\n  var existingUnresolved = this.countUnresolvedRefs(spec);\n\n  if(existingUnresolved === 0 || this.iteration > 5) {\n    this.resolveAllOf(spec.definitions);\n    this.resolverCache = null;\n    callback.call(this.scope, spec, unresolvedRefs);\n  }\n  else {\n    this.iteration += 1;\n    this.resolve(spec, root, callback, this.scope);\n  }\n};\n\nResolver.prototype.countUnresolvedRefs = function(spec) {\n  var i;\n  var refs = this.getRefs(spec);\n  var keys = [];\n  var unresolvedKeys = [];\n  for(i in refs) {\n    if(i.indexOf('#') === 0) {\n      keys.push(i.substring(1));\n    }\n    else {\n      unresolvedKeys.push(i);\n    }\n  }\n\n  // verify possible keys\n  for (i = 0; i < keys.length; i++) {\n    var part = keys[i];\n    var parts = part.split('/');\n    var obj = spec;\n\n    for (var k = 0; k < parts.length; k++) {\n      var key = parts[k];\n      if(key !== '') {\n        obj = obj[key];\n        if(typeof obj === 'undefined') {\n          unresolvedKeys.push(part);\n          break;\n        }\n      }\n    }\n  }\n  return unresolvedKeys.length;\n};\n\nResolver.prototype.getRefs = function(spec, obj) {\n  obj = obj || spec;\n  var output = {};\n  for(var key in obj) {\n    if (!obj.hasOwnProperty(key)) {\n      continue;\n    }\n    var item = obj[key];\n    if(key === '$ref' && typeof item === 'string') {\n      output[item] = null;\n    }\n    else if(_.isObject(item)) {\n      var o = this.getRefs(item);\n      for(var k in o) {\n        output[k] = null;\n      }\n    }\n  }\n  return output;\n};\n\nfunction splitUrl(url) {\n  var result = {};\n  var proto = /[a-z]+:\\/\\//i.exec(url);\n  if (proto) {\n    result.proto = proto[0].slice(0, -3);\n    url = url.slice(result.proto.length + 1);\n  }\n  if (url.slice(0, 2) === '//') {\n    result.domain = url.slice(2).split('/')[0];\n    url = url.slice(2 + result.domain.length);\n  }\n  var p = url.split('#');\n  if (p[0].length) {\n    result.path = p[0];\n  }\n  if (p.length > 1) {\n    result.fragment = p.slice(1).join('#');\n  }\n  return result;\n}\n\nfunction unsplitUrl(url) {\n  var result = url.path;\n  if (result === undefined) {\n    result = '';\n  }\n  if (url.fragment !== undefined) {\n    result += '#' + url.fragment;\n  }\n  if (url.domain !== undefined) {\n    if (result.slice(0, 1) === '/') {\n      result = result.slice(1);\n    }\n    result = '//' + url.domain + '/' + result;\n    if (url.proto !== undefined) {\n      result = url.proto + ':' + result;\n    }\n  }\n  return result;\n}\n\nfunction joinUrl(base, rel) {\n  var relsp = splitUrl(rel);\n  if (relsp.domain !== undefined) {\n    return rel;\n  }\n  var result = splitUrl(base);\n  if (relsp.path === undefined) {\n    // change only fragment part\n    result.fragment = relsp.fragment;\n  } else if (relsp.path.slice(0, 1) === '/') {\n    // relative to domain\n    result.path = relsp.path;\n    result.fragment = relsp.fragment;\n  } else {\n    // relative to path\n    var path = result.path === undefined ? [] : result.path.split('/');\n    var relpath = relsp.path.split('/');\n    if (path.length) {\n      path.pop();\n    }\n    while (relpath[0] === '..' || relpath[0] === '.') {\n      if (relpath[0] === '..') {\n        path.pop();\n      }\n      relpath.shift();\n    }\n    result.path = path.concat(relpath).join('/');\n    result.fragment = relsp.fragment;\n  }\n  return unsplitUrl(result);\n}\n\nResolver.prototype.retainRoot = function(origKey, obj, root) {\n  // walk object and look for relative $refs\n  if(_.isObject(obj)) {\n    for(var key in obj) {\n      var item = obj[key];\n      if (key === '$ref' && typeof item === 'string') {\n        obj[key] = joinUrl(root, item);\n      }\n      else if (_.isObject(item)) {\n        this.retainRoot(key, item, root);\n      }\n    }\n  }\n  else if(_.isString(obj) && origKey === '$ref') {\n    obj = joinUrl(root, obj);\n  }\n  return obj;\n};\n\n/**\n * immediately in-lines local refs, queues remote refs\n * for inline resolution\n */\nResolver.prototype.resolveInline = function (root, spec, property, resolutionTable, unresolvedRefs, location) {\n  var key = property.$ref, ref = property.$ref, i, p, p2, rs;\n  var rootTrimmed = false;\n\n  root = root || ''; // Guard against .split. @fehguy, you'll need to check if this logic fits\n  // More imporantly is how do we gracefully handle relative urls, when provided just a 'spec', not a 'url' ?\n\n  if (ref) {\n    if(ref.indexOf('../') === 0) {\n      // reset root\n      p = ref.split('../');\n      p2 = root.split('/');\n      ref = '';\n      for(i = 0; i < p.length; i++) {\n        if(p[i] === '') {\n          p2 = p2.slice(0, p2.length-1);\n        }\n        else {\n          ref += p[i];\n        }\n      }\n      root = '';\n      for(i = 0; i < p2.length - 1; i++) {\n        if(i > 0) { root += '/'; }\n        root += p2[i];\n      }\n      rootTrimmed = true;\n    }\n    if(ref.indexOf('#') >= 0) {\n      if(ref.indexOf('/') === 0) {\n        rs = ref.split('#');\n        p  = root.split('//');\n        p2 = p[1].split('/');\n        root = p[0] + '//' + p2[0] + rs[0];\n        location = rs[1];\n      }\n      else {\n        rs = ref.split('#');\n        if(rs[0] !== '') {\n          p2 = root.split('/');\n          p2 = p2.slice(0, p2.length - 1);\n          if(!rootTrimmed) {\n            root = '';\n            for (var k = 0; k < p2.length; k++) {\n              if(k > 0) { root += '/'; }\n              root += p2[k];\n            }\n          }\n          root += '/' + ref.split('#')[0];\n        }\n        location = rs[1];\n      }\n    }\n    if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {\n      if(ref.indexOf('#') >= 0) {\n        root = ref.split('#')[0];\n        location = ref.split('#')[1];\n      }\n      else {\n        root = ref;\n        location = '';\n      }\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    } else if (ref.indexOf('#') === 0) {\n      location = ref.split('#')[1];\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    } else if (ref.indexOf('/') === 0 && ref.indexOf('#') === -1) {\n      location = ref;\n      var matches = root.match(/^https?\\:\\/\\/([^\\/?#]+)(?:[\\/?#]|$)/i);\n      if(matches) {\n        root = matches[0] + ref.substring(1);\n        location = '';\n      }\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    }\n    else {\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    }\n  }\n  else if (property.type === 'array') {\n    this.resolveTo(root, property.items, resolutionTable, location);\n  }\n};\n\nResolver.prototype.resolveTo = function (root, property, resolutionTable, location) {\n  var sp, i;\n  var ref = property.$ref;\n  var lroot = root;\n  if ((typeof ref !== 'undefined') && (ref !== null)) {\n    if(ref.indexOf('#') >= 0) {\n      var parts = ref.split('#');\n\n      // #/definitions/foo\n      // foo.json#/bar\n      if(parts[0] && ref.indexOf('/') === 0) {\n\n      }\n      else if(parts[0] && (parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0)) {\n        lroot = parts[0];\n        ref = parts[1];\n      }\n      else if(parts[0] && parts[0].length > 0) {\n        // relative file\n        sp = root.split('/');\n        lroot = '';\n        for(i = 0; i < sp.length - 1; i++) {\n          lroot += sp[i] + '/';\n        }\n        lroot += parts[0];\n      }\n      else {\n\n      }\n\n      location = parts[1];\n    }\n    else if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {\n      lroot = ref;\n      location = '';\n    }\n    else {\n      // relative file\n      sp = root.split('/');\n      lroot = '';\n      for(i = 0; i < sp.length - 1; i++) {\n        lroot += sp[i] + '/';\n      }\n      lroot += ref;\n      location = '';\n    }\n    resolutionTable.push({\n      obj: property, resolveAs: 'ref', root: lroot, key: ref, location: location\n    });\n  } else if (property.type === 'array') {\n    var items = property.items;\n    this.resolveTo(root, items, resolutionTable, location);\n  } else {\n    if(property && (property.properties || property.additionalProperties)) {\n      var name = this.uniqueName('inline_model');\n      if (property.title) {\n        name = this.uniqueName(property.title);\n      }\n      delete property.title;\n      this.spec.definitions[name] = _.cloneDeep(property);\n      property.$ref = '#/definitions/' + name;\n      delete property.type;\n      delete property.properties;\n    }\n  }\n};\n\nResolver.prototype.uniqueName = function(base) {\n  var name = base;\n  var count = 0;\n  while(true) {\n    if(!_.isObject(this.spec.definitions[name])) {\n      return name;\n    }\n    name = base + '_' + count;\n    count++;\n  }\n};\n\nResolver.prototype.resolveAllOf = function(spec, obj, depth) {\n  depth = depth || 0;\n  obj = obj || spec;\n  var name;\n  for(var key in obj) {\n    if (!obj.hasOwnProperty(key)) {\n      continue;\n    }\n    var item = obj[key];\n    if(item === null) {\n      throw new TypeError('Swagger 2.0 does not support null types (' + obj + ').  See https://github.com/swagger-api/swagger-spec/issues/229.');\n    }\n    if(typeof item === 'object') {\n      this.resolveAllOf(spec, item, depth + 1);\n    }\n    if(item && typeof item.allOf !== 'undefined') {\n      var allOf = item.allOf;\n      if(_.isArray(allOf)) {\n        var output = _.cloneDeep(item);\n        delete output.allOf;\n\n        output['x-composed'] = true;\n        if (typeof item['x-resolved-from'] !== 'undefined') {\n          output['x-resolved-from'] = item['x-resolved-from'];\n        }\n\n        for(var i = 0; i < allOf.length; i++) {\n          var component = allOf[i];\n          var source = 'self';\n          if(typeof component['x-resolved-from'] !== 'undefined') {\n            source = component['x-resolved-from'][0];\n          }\n\n          for(var part in component) {\n            if(!output.hasOwnProperty(part)) {\n              output[part] = _.cloneDeep(component[part]);\n              if(part === 'properties') {\n                for(name in output[part]) {\n                  output[part][name]['x-resolved-from'] = source;\n                }\n              }\n            }\n            else {\n              if(part === 'properties') {\n                var properties = component[part];\n                for(name in properties) {\n                  output.properties[name] = _.cloneDeep(properties[name]);\n                  var resolvedFrom = properties[name]['x-resolved-from'];\n                  if (typeof resolvedFrom === 'undefined' || resolvedFrom === 'self') {\n                    resolvedFrom = source;\n                  }\n                  output.properties[name]['x-resolved-from'] = resolvedFrom;\n                }\n              }\n              else if(part === 'required') {\n                // merge & dedup the required array\n                var a = output.required.concat(component[part]);\n                for(var k = 0; k < a.length; ++k) {\n                  for(var j = k + 1; j < a.length; ++j) {\n                    if(a[k] === a[j]) { a.splice(j--, 1); }\n                  }\n                }\n                output.required = a;\n              }\n              else if(part === 'x-resolved-from') {\n                output['x-resolved-from'].push(source);\n              }\n              else {\n                // TODO: need to merge this property\n                // console.log('what to do with ' + part)\n              }\n            }\n          }\n        }\n        obj[key] = output;\n      }\n    }\n  }\n};\n","'use strict';\n\nvar Helpers = require('./helpers');\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isUndefined: require('lodash-compat/lang/isUndefined'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isEmpty: require('lodash-compat/lang/isEmpty'),\n  map: require('lodash-compat/collection/map'),\n  indexOf: require('lodash-compat/array/indexOf'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  keys: require('lodash-compat/object/keys'),\n  forEach: require('lodash-compat/collection/forEach')\n};\n\nvar optionHtml = module.exports.optionHtml = function  (label, value) {\n  return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n};\n\nmodule.exports.typeFromJsonSchema = function (type, format) {\n  var str;\n\n  if (type === 'integer' && format === 'int32') {\n    str = 'integer';\n  } else if (type === 'integer' && format === 'int64') {\n    str = 'long';\n  } else if (type === 'integer' && typeof format === 'undefined') {\n    str = 'long';\n  } else if (type === 'string' && format === 'date-time') {\n    str = 'date-time';\n  } else if (type === 'string' && format === 'date') {\n    str = 'date';\n  } else if (type === 'number' && format === 'float') {\n    str = 'float';\n  } else if (type === 'number' && format === 'double') {\n    str = 'double';\n  } else if (type === 'number' && typeof format === 'undefined') {\n    str = 'double';\n  } else if (type === 'boolean') {\n    str = 'boolean';\n  } else if (type === 'string') {\n    str = 'string';\n  }\n\n  return str;\n};\n\nvar getStringSignature = module.exports.getStringSignature = function (obj, baseComponent) {\n  var str = '';\n\n  if (typeof obj.$ref !== 'undefined') {\n    str += Helpers.simpleRef(obj.$ref);\n  } else if (typeof obj.type === 'undefined') {\n    str += 'object';\n  } else if (obj.type === 'array') {\n    if (baseComponent) {\n      str += getStringSignature((obj.items || obj.$ref || {}));\n    } else {\n      str += 'Array[';\n      str += getStringSignature((obj.items || obj.$ref || {}));\n      str += ']';\n    }\n  } else if (obj.type === 'integer' && obj.format === 'int32') {\n    str += 'integer';\n  } else if (obj.type === 'integer' && obj.format === 'int64') {\n    str += 'long';\n  } else if (obj.type === 'integer' && typeof obj.format === 'undefined') {\n    str += 'long';\n  } else if (obj.type === 'string' && obj.format === 'date-time') {\n    str += 'date-time';\n  } else if (obj.type === 'string' && obj.format === 'date') {\n    str += 'date';\n  } else if (obj.type === 'string' && typeof obj.format === 'undefined') {\n    str += 'string';\n  } else if (obj.type === 'number' && obj.format === 'float') {\n    str += 'float';\n  } else if (obj.type === 'number' && obj.format === 'double') {\n    str += 'double';\n  } else if (obj.type === 'number' && typeof obj.format === 'undefined') {\n    str += 'double';\n  } else if (obj.type === 'boolean') {\n    str += 'boolean';\n  } else if (obj.$ref) {\n    str += Helpers.simpleRef(obj.$ref);\n  } else {\n    str += obj.type;\n  }\n\n  return str;\n};\n\nvar schemaToJSON = module.exports.schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {\n  // Resolve the schema (Handle nested schemas)\n  schema = Helpers.resolveSchema(schema);\n\n  if(typeof modelPropertyMacro !== 'function') {\n    modelPropertyMacro = function(prop){\n      return (prop || {}).default;\n    };\n  }\n\n  modelsToIgnore= modelsToIgnore || {};\n\n  var type = schema.type || 'object';\n  var format = schema.format;\n  var model;\n  var output;\n\n  if (!_.isUndefined(schema.example)) {\n    output = schema.example;\n  } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {\n    output = schema.enum[0];\n  }\n\n  if (_.isUndefined(output)) {\n    if (schema.$ref) {\n      model = models[Helpers.simpleRef(schema.$ref)];\n\n      if (!_.isUndefined(model)) {\n        if (_.isUndefined(modelsToIgnore[model.name])) {\n          modelsToIgnore[model.name] = model;\n          output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);\n          delete modelsToIgnore[model.name];\n        } else {\n          if (model.type === 'array') {\n            output = [];\n          } else {\n            output = {};\n          }\n        }\n      }\n    } else if (!_.isUndefined(schema.default)) {\n      output = schema.default;\n    } else if (type === 'string') {\n      if (format === 'date-time') {\n        output = new Date().toISOString();\n      } else if (format === 'date') {\n        output = new Date().toISOString().split('T')[0];\n      } else {\n        output = 'string';\n      }\n    } else if (type === 'integer') {\n      output = 0;\n    } else if (type === 'number') {\n      output = 0.0;\n    } else if (type === 'boolean') {\n      output = true;\n    } else if (type === 'object') {\n      output = {};\n\n      _.forEach(schema.properties, function (property, name) {\n        var cProperty = _.cloneDeep(property);\n\n        // Allow macro to set the default value\n        cProperty.default = modelPropertyMacro(property);\n\n        output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);\n      });\n    } else if (type === 'array') {\n      output = [];\n\n      if (_.isArray(schema.items)) {\n        _.forEach(schema.items, function (item) {\n          output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));\n        });\n      } else if (_.isPlainObject(schema.items)) {\n        output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));\n      } else if (_.isUndefined(schema.items)) {\n        output.push({});\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n      }\n    }\n  }\n\n  return output;\n};\n\nmodule.exports.schemaToHTML =function (name, schema, models, modelPropertyMacro) {\n  var strongOpen = '<span class=\"strong\">';\n  var strongClose = '</span>';\n\n  // Allow for ignoring the 'name' argument.... shifting the rest\n  if(_.isObject(arguments[0])) {\n    name = void 0;\n    schema = arguments[0];\n    models = arguments[1];\n    modelPropertyMacro = arguments[2];\n  }\n\n  models = models || {};\n\n  // Resolve the schema (Handle nested schemas)\n  schema = Helpers.resolveSchema(schema);\n\n  // Return for empty object\n  if(_.isEmpty(schema)) {\n    return strongOpen + 'Empty' + strongClose;\n  }\n\n  // Dereference $ref from 'models'\n  if(typeof schema.$ref === 'string') {\n    name = Helpers.simpleRef(schema.$ref);\n    schema = models[name];\n    if(typeof schema === 'undefined')\n    {\n      return strongOpen + name + ' is not defined!' + strongClose;\n    }\n  }\n\n  if(typeof name !== 'string') {\n    name = schema.title || 'Inline Model';\n  }\n\n  // If we are a Model object... adjust accordingly\n  if(schema.definition) {\n    schema = schema.definition;\n  }\n\n  if(typeof modelPropertyMacro !== 'function') {\n    modelPropertyMacro = function(prop){\n      return (prop || {}).default;\n    };\n  }\n\n  var references = {};\n  var seenModels = [];\n  var inlineModels = 0;\n\n\n\n  // Generate current HTML\n  var html = processModel(schema, name);\n\n  // Generate references HTML\n  while (_.keys(references).length > 0) {\n    /* jshint ignore:start */\n    _.forEach(references, function (schema, name) {\n      var seenModel = _.indexOf(seenModels, name) > -1;\n\n      delete references[name];\n\n      if (!seenModel) {\n        seenModels.push(name);\n\n        html += '<br />' + processModel(schema, name);\n      }\n    });\n    /* jshint ignore:end */\n  }\n\n  return html;\n\n  /////////////////////////////////\n\n  function addReference(schema, name, skipRef) {\n    var modelName = name;\n    var model;\n\n    if (schema.$ref) {\n      modelName = schema.title || Helpers.simpleRef(schema.$ref);\n      model = models[modelName];\n    } else if (_.isUndefined(name)) {\n      modelName = schema.title || 'Inline Model ' + (++inlineModels);\n      model = {definition: schema};\n    }\n\n    if (skipRef !== true) {\n      references[modelName] = _.isUndefined(model) ? {} : model.definition;\n    }\n\n    return modelName;\n  }\n\n  function primitiveToHTML(schema) {\n    var html = '<span class=\"propType\">';\n    var type = schema.type || 'object';\n\n    if (schema.$ref) {\n      html += addReference(schema, Helpers.simpleRef(schema.$ref));\n    } else if (type === 'object') {\n      if (!_.isUndefined(schema.properties)) {\n        html += addReference(schema);\n      } else {\n        html += 'object';\n      }\n    } else if (type === 'array') {\n      html += 'Array[';\n\n      if (_.isArray(schema.items)) {\n        html += _.map(schema.items, addReference).join(',');\n      } else if (_.isPlainObject(schema.items)) {\n        if (_.isUndefined(schema.items.$ref)) {\n          if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {\n            html += schema.items.type;\n          } else {\n            html += addReference(schema.items);\n          }\n        } else {\n          html += addReference(schema.items, Helpers.simpleRef(schema.items.$ref));\n        }\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' schema is not an array or an object, cannot process');\n        html += 'object';\n      }\n\n      html += ']';\n    } else {\n      html += schema.type;\n    }\n\n    html += '</span>';\n\n    return html;\n  }\n\n  function primitiveToOptionsHTML(schema, html) {\n    var options = '';\n    var type = schema.type || 'object';\n    var isArray = type === 'array';\n\n    if (isArray) {\n      if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {\n        type = schema.items.type;\n      } else {\n        type = 'object';\n      }\n    }\n\n    if (!_.isUndefined(schema.default)) {\n      options += optionHtml('Default', schema.default);\n    }\n\n    switch (type) {\n    case 'string':\n      if (schema.minLength) {\n        options += optionHtml('Min. Length', schema.minLength);\n      }\n\n      if (schema.maxLength) {\n        options += optionHtml('Max. Length', schema.maxLength);\n      }\n\n      if (schema.pattern) {\n        options += optionHtml('Reg. Exp.', schema.pattern);\n      }\n      break;\n    case 'integer':\n    case 'number':\n      if (schema.minimum) {\n        options += optionHtml('Min. Value', schema.minimum);\n      }\n\n      if (schema.exclusiveMinimum) {\n        options += optionHtml('Exclusive Min.', 'true');\n      }\n\n      if (schema.maximum) {\n        options += optionHtml('Max. Value', schema.maximum);\n      }\n\n      if (schema.exclusiveMaximum) {\n        options += optionHtml('Exclusive Max.', 'true');\n      }\n\n      if (schema.multipleOf) {\n        options += optionHtml('Multiple Of', schema.multipleOf);\n      }\n\n      break;\n    }\n\n    if (isArray) {\n      if (schema.minItems) {\n        options += optionHtml('Min. Items', schema.minItems);\n      }\n\n      if (schema.maxItems) {\n        options += optionHtml('Max. Items', schema.maxItems);\n      }\n\n      if (schema.uniqueItems) {\n        options += optionHtml('Unique Items', 'true');\n      }\n\n      if (schema.collectionFormat) {\n        options += optionHtml('Coll. Format', schema.collectionFormat);\n      }\n    }\n\n    if (_.isUndefined(schema.items)) {\n      if (_.isArray(schema.enum)) {\n        var enumString;\n\n        if (type === 'number' || type === 'integer') {\n          enumString = schema.enum.join(', ');\n        } else {\n          enumString = '\"' + schema.enum.join('\", \"') + '\"';\n        }\n\n        options += optionHtml('Enum', enumString);\n      }\n    }\n\n    if (options.length > 0) {\n      html = '<span class=\"propWrap\">' + html + '<table class=\"optionsWrapper\"><tr><th colspan=\"2\">' + type + '</th></tr>' + options + '</table></span>';\n    }\n\n    return html;\n  }\n\n  function processModel(schema, name) {\n    var type = schema.type || 'object';\n    var isArray = schema.type === 'array';\n    var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;\n\n    if (name) {\n      seenModels.push(name);\n    }\n\n    if (isArray) {\n      if (_.isArray(schema.items)) {\n        html += '<div>' + _.map(schema.items, function (item) {\n          var type = item.type || 'object';\n\n          if (_.isUndefined(item.$ref)) {\n            if (_.indexOf(['array', 'object'], type) > -1) {\n              if (type === 'object' && _.isUndefined(item.properties)) {\n                return 'object';\n              } else {\n                return addReference(item);\n              }\n            } else {\n              return primitiveToOptionsHTML(item, type);\n            }\n          } else {\n            return addReference(item, Helpers.simpleRef(item.$ref));\n          }\n        }).join(',</div><div>');\n      } else if (_.isPlainObject(schema.items)) {\n        if (_.isUndefined(schema.items.$ref)) {\n          if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {\n            if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {\n              html += '<div>object</div>';\n            } else {\n              html += '<div>' + addReference(schema.items) + '</div>';\n            }\n          } else {\n            html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';\n          }\n        } else {\n          html += '<div>' + addReference(schema.items, Helpers.simpleRef(schema.items.$ref)) + '</div>';\n        }\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n        html += '<div>object</div>';\n      }\n    } else {\n      if (schema.$ref) {\n        html += '<div>' + addReference(schema, name) + '</div>';\n      } else if (type === 'object') {\n        if (_.isPlainObject(schema.properties)) {\n          var contents = _.map(schema.properties, function (property, name) {\n            var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);\n            var cProperty = _.cloneDeep(property);\n\n            var requiredClass = propertyIsRequired ? 'required' : '';\n            var html = '<span class=\"propName ' + requiredClass + '\">' + name + '</span> (';\n            var model;\n            var propDescription;\n\n            // Allow macro to set the default value\n            cProperty.default = modelPropertyMacro(cProperty);\n\n            // Resolve the schema (Handle nested schemas)\n            cProperty = Helpers.resolveSchema(cProperty);\n\n            propDescription = property.description || cProperty.description;\n\n            // We need to handle property references to primitives (Issue 339)\n            if (!_.isUndefined(cProperty.$ref)) {\n              model = models[Helpers.simpleRef(cProperty.$ref)];\n\n              if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {\n                // Use referenced schema\n                cProperty = Helpers.resolveSchema(model.definition);\n              }\n            }\n\n            html += primitiveToHTML(cProperty);\n\n            if(!propertyIsRequired) {\n              html += ', <span class=\"propOptKey\">optional</span>';\n            }\n\n            if(property.readOnly) {\n                html += ', <span class=\"propReadOnly\">read only</span>';\n            }\n\n            html += ')';\n\n            if (!_.isUndefined(propDescription)) {\n              html += ': ' + '<span class=\"propDesc\">' + propDescription + '</span>';\n            }\n\n            if (cProperty.enum) {\n              html += ' = <span class=\"propVals\">[\\'' + cProperty.enum.join('\\', \\'') + '\\']</span>';\n            }\n\n            return '<div' + (property.readOnly ? ' class=\"readOnly\"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);\n          }).join(',</div>');\n\n          if (contents) {\n            html += contents + '</div>';\n          }\n        }\n      } else {\n        html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';\n      }\n    }\n\n    return html + strongOpen + (isArray ? ']' : '}') + strongClose;\n  }\n};","'use strict';\n\nvar SwaggerHttp = require('./http');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject')\n};\n\nvar SwaggerSpecConverter = module.exports = function () {\n  this.errors = [];\n  this.warnings = [];\n  this.modelMap = {};\n};\n\nSwaggerSpecConverter.prototype.setDocumentationLocation = function (location) {\n  this.docLocation = location;\n};\n\n/**\n * converts a resource listing OR api declaration\n **/\nSwaggerSpecConverter.prototype.convert = function (obj, clientAuthorizations, opts, callback) {\n  // not a valid spec\n  if(!obj || !Array.isArray(obj.apis)) {\n    return this.finish(callback, null);\n  }\n  this.clientAuthorizations = clientAuthorizations;\n\n  // create a new swagger object to return\n  var swagger = { swagger: '2.0' };\n\n  swagger.originalVersion = obj.swaggerVersion;\n\n  // add the info\n  this.apiInfo(obj, swagger);\n\n  // add security definitions\n  this.securityDefinitions(obj, swagger);\n\n  // take basePath into account\n  if (obj.basePath) {\n    this.setDocumentationLocation(obj.basePath);\n  }\n\n  // see if this is a single-file swagger definition\n  var isSingleFileSwagger = false;\n  var i;\n  for(i = 0; i < obj.apis.length; i++) {\n    var api = obj.apis[i];\n    if(Array.isArray(api.operations)) {\n      isSingleFileSwagger = true;\n    }\n  }\n  if(isSingleFileSwagger) {\n    this.declaration(obj, swagger);\n    this.finish(callback, swagger);\n  }\n  else {\n    this.resourceListing(obj, swagger, opts, callback);\n  }\n};\n\nSwaggerSpecConverter.prototype.declaration = function(obj, swagger) {\n  var name, i, p, pos;\n  if(!obj.apis) {\n    return;\n  }\n\n  if (obj.basePath.indexOf('http://') === 0) {\n    p = obj.basePath.substring('http://'.length);\n    pos = p.indexOf('/');\n    if (pos > 0) {\n      swagger.host = p.substring(0, pos);\n      swagger.basePath = p.substring(pos);\n    }\n    else {\n      swagger.host = p;\n      swagger.basePath = '/';\n    }\n  } else if (obj.basePath.indexOf('https://') === 0) {\n    p = obj.basePath.substring('https://'.length);\n    pos = p.indexOf('/');\n    if (pos > 0) {\n      swagger.host = p.substring(0, pos);\n      swagger.basePath = p.substring(pos);\n    }\n    else {\n      swagger.host = p;\n      swagger.basePath = '/';\n    }\n  } else {\n    swagger.basePath = obj.basePath;\n  }\n\n  var resourceLevelAuth;\n  if(obj.authorizations) {\n    resourceLevelAuth = obj.authorizations;\n  }\n  if(obj.consumes) {\n    swagger.consumes = obj.consumes;\n  }\n  if(obj.produces) {\n    swagger.produces = obj.produces;\n  }\n\n  // build a mapping of id to name for 1.0 model resolutions\n  if(_.isObject(obj)) {\n    for(name in obj.models) {\n      var existingModel = obj.models[name];\n      var key = (existingModel.id || name);\n      this.modelMap[key] = name;\n    }\n  }\n\n  for(i = 0; i < obj.apis.length; i++) {\n    var api = obj.apis[i];\n    var path = api.path;\n    var operations = api.operations;\n    this.operations(path, obj.resourcePath, operations, resourceLevelAuth, swagger);\n  }\n\n  var models = obj.models || {};\n  this.models(models, swagger);\n};\n\nSwaggerSpecConverter.prototype.models = function(obj, swagger) {\n  if(!_.isObject(obj)) {\n    return;\n  }\n  var name;\n\n  swagger.definitions = swagger.definitions || {};\n  for(name in obj) {\n    var existingModel = obj[name];\n    var _required = [];\n    var schema = { properties: {}};\n    var propertyName;\n    for(propertyName in existingModel.properties) {\n      var existingProperty = existingModel.properties[propertyName];\n      var property = {};\n      this.dataType(existingProperty, property);\n      if(existingProperty.description) {\n        property.description = existingProperty.description;\n      }\n      if(existingProperty['enum']) {\n        property['enum'] = existingProperty['enum'];\n      }\n      if(typeof existingProperty.required === 'boolean' && existingProperty.required === true) {\n        _required.push(propertyName);\n      }\n      if(typeof existingProperty.required === 'string' && existingProperty.required === 'true') {\n        _required.push(propertyName);\n      }\n      schema.properties[propertyName] = property;\n    }\n    if(_required.length > 0) {\n      schema.required = _required;\n    } else {\n      schema.required = existingModel.required;\n    }\n    swagger.definitions[name] = schema;\n  }\n};\n\nSwaggerSpecConverter.prototype.extractTag = function(resourcePath) {\n  var pathString = resourcePath || 'default';\n  if(pathString.indexOf('http:') === 0 || pathString.indexOf('https:') === 0) {\n    pathString = pathString.split(['/']);\n    pathString = pathString[pathString.length -1].substring();\n  }\n  if(pathString.endsWith('.json')) {\n    pathString = pathString.substring(0, pathString.length - '.json'.length);\n  }\n  return pathString.replace('/','');\n};\n\nSwaggerSpecConverter.prototype.operations = function(path, resourcePath, obj, resourceLevelAuth, swagger) {\n  if(!Array.isArray(obj)) {\n    return;\n  }\n  var i;\n\n  if(!swagger.paths) {\n    swagger.paths = {};\n  }\n\n  var pathObj = swagger.paths[path] || {};\n  var tag = this.extractTag(resourcePath);\n  swagger.tags = swagger.tags || [];\n  var matched = false;\n  for(i = 0; i < swagger.tags.length; i++) {\n    var tagObject = swagger.tags[i];\n    if(tagObject.name === tag) {\n      matched = true;\n    }\n  }\n  if(!matched) {\n    swagger.tags.push({name: tag});\n  }\n\n  for(i = 0; i < obj.length; i++) {\n    var existingOperation = obj[i];\n    var method = (existingOperation.method || existingOperation.httpMethod).toLowerCase();\n    var operation = {tags: [tag]};\n    var existingAuthorizations = existingOperation.authorizations;\n\n    if(existingAuthorizations && Object.keys(existingAuthorizations).length === 0) {\n      existingAuthorizations = resourceLevelAuth;\n    }\n\n    if(typeof existingAuthorizations !== 'undefined') {\n      var scopesObject;\n      for(var key in existingAuthorizations) {\n        operation.security = operation.security || [];\n        var scopes = existingAuthorizations[key];\n        if(scopes) {\n          var securityScopes = [];\n          for(var j in scopes) {\n            securityScopes.push(scopes[j].scope);\n          }\n          scopesObject = {};\n          scopesObject[key] = securityScopes;\n          operation.security.push(scopesObject);\n        }\n        else {\n          scopesObject = {};\n          scopesObject[key] = [];\n          operation.security.push(scopesObject);\n        }\n      }\n    }\n\n    if(existingOperation.consumes) {\n      operation.consumes = existingOperation.consumes;\n    }\n    else if(swagger.consumes) {\n      operation.consumes = swagger.consumes;\n    }\n    if(existingOperation.produces) {\n      operation.produces = existingOperation.produces;\n    }\n    else if(swagger.produces) {\n      operation.produces = swagger.produces;\n    }\n    if(existingOperation.summary) {\n      operation.summary = existingOperation.summary;\n    }\n    if(existingOperation.notes) {\n      operation.description = existingOperation.notes;\n    }\n    if(existingOperation.nickname) {\n      operation.operationId = existingOperation.nickname;\n    }\n    if(existingOperation.deprecated) {\n      operation.deprecated = existingOperation.deprecated;\n    }\n\n    this.authorizations(existingAuthorizations, swagger);\n    this.parameters(operation, existingOperation.parameters, swagger);\n    this.responseMessages(operation, existingOperation, swagger);\n\n    pathObj[method] = operation;\n  }\n\n  swagger.paths[path] = pathObj;\n};\n\nSwaggerSpecConverter.prototype.responseMessages = function(operation, existingOperation) {\n  if(!_.isObject(existingOperation)) {\n    return;\n  }\n  // build default response from the operation (1.x)\n  var defaultResponse = {};\n  this.dataType(existingOperation, defaultResponse);\n  // TODO: look into the real problem of rendering responses in swagger-ui\n  // ....should reponseType have an implicit schema?\n  if(!defaultResponse.schema && defaultResponse.type) {\n    defaultResponse = {schema: defaultResponse};\n  }\n\n  operation.responses = operation.responses || {};\n\n  // grab from responseMessages (1.2)\n  var has200 = false;\n  if(Array.isArray(existingOperation.responseMessages)) {\n    var i;\n    var existingResponses = existingOperation.responseMessages;\n    for(i = 0; i < existingResponses.length; i++) {\n      var existingResponse = existingResponses[i];\n      var response = { description: existingResponse.message };\n      if(existingResponse.code === 200) {\n        has200 = true;\n      }\n      // Convert responseModel -> schema{$ref: responseModel}\n      if(existingResponse.responseModel) {\n        response.schema = {'$ref': '#/definitions/' + existingResponse.responseModel};\n      }\n      operation.responses['' + existingResponse.code] = response;\n    }\n  }\n\n  if(has200) {\n    operation.responses['default'] = defaultResponse;\n  }\n  else {\n    operation.responses['200'] = defaultResponse;\n  }\n};\n\nSwaggerSpecConverter.prototype.authorizations = function(obj) {\n  // TODO\n  if(!_.isObject(obj)) {\n    return;\n  }\n};\n\nSwaggerSpecConverter.prototype.parameters = function(operation, obj) {\n  if(!Array.isArray(obj)) {\n    return;\n  }\n  var i;\n  for(i = 0; i < obj.length; i++) {\n    var existingParameter = obj[i];\n    var parameter = {};\n    parameter.name = existingParameter.name;\n    parameter.description = existingParameter.description;\n    parameter.required = existingParameter.required;\n    parameter.in = existingParameter.paramType;\n\n    // per #168\n    if(parameter.in === 'body') {\n      parameter.name = 'body';\n    }\n    if(parameter.in === 'form') {\n      parameter.in = 'formData';\n    }\n\n    if(existingParameter.enum) {\n      parameter.enum = existingParameter.enum;\n    }\n\n    if(existingParameter.allowMultiple === true || existingParameter.allowMultiple === 'true') {\n      var innerType = {};\n      this.dataType(existingParameter, innerType);\n      parameter.type = 'array';\n      parameter.items = innerType;\n\n      if(existingParameter.allowableValues) {\n        var av = existingParameter.allowableValues;\n        if(av.valueType === 'LIST') {\n          parameter['enum'] = av.values;\n        }\n      }\n    }\n    else {\n      this.dataType(existingParameter, parameter);\n    }\n    if(typeof existingParameter.defaultValue !== 'undefined') {\n      parameter.default = existingParameter.defaultValue;\n    }\n\n    operation.parameters = operation.parameters || [];\n    operation.parameters.push(parameter);\n  }\n};\n\nSwaggerSpecConverter.prototype.dataType = function(source, target) {\n  if(!_.isObject(source)) {\n    return;\n  }\n\n  if(source.minimum) {\n    target.minimum = source.minimum;\n  }\n  if(source.maximum) {\n    target.maximum = source.maximum;\n  }\n  if (source.format) {\n    target.format = source.format;\n  }\n\n  // default can be 'false'\n  if(typeof source.defaultValue !== 'undefined') {\n    target.default = source.defaultValue;\n  }\n\n  var jsonSchemaType = this.toJsonSchema(source);\n  if(jsonSchemaType) {\n    target = target || {};\n    if(jsonSchemaType.type) {\n      target.type = jsonSchemaType.type;\n    }\n    if(jsonSchemaType.format) {\n      target.format = jsonSchemaType.format;\n    }\n    if(jsonSchemaType.$ref) {\n      target.schema = {$ref: jsonSchemaType.$ref};\n    }\n    if(jsonSchemaType.items) {\n      target.items = jsonSchemaType.items;\n    }\n  }\n};\n\nSwaggerSpecConverter.prototype.toJsonSchema = function(source) {\n  if(!source) {\n    return 'object';\n  }\n  var detectedType = (source.type || source.dataType || source.responseClass || '');\n  var lcType = detectedType.toLowerCase();\n  var format = (source.format || '').toLowerCase();\n\n  if(lcType.indexOf('list[') === 0) {\n    var innerType = detectedType.substring(5, detectedType.length - 1);\n    var jsonType = this.toJsonSchema({type: innerType});\n    return {type: 'array', items: jsonType};\n  } else if(lcType === 'int' || (lcType === 'integer' && format === 'int32')) {\n    {return {type: 'integer', format: 'int32'};}\n  } else if(lcType === 'long' || (lcType === 'integer' && format === 'int64')) {\n    {return {type: 'integer', format: 'int64'};}\n  } else if(lcType === 'integer') {\n    {return {type: 'integer', format: 'int64'};}\n  } else if(lcType === 'float' || (lcType === 'number' && format === 'float')) {\n    {return {type: 'number', format: 'float'};}\n  } else if(lcType === 'double' || (lcType === 'number' && format === 'double')) {\n    {return {type: 'number', format: 'double'};}\n  } else if((lcType === 'string' && format === 'date-time') || (lcType === 'date')) {\n    {return {type: 'string', format: 'date-time'};}\n  } else if(lcType === 'string') {\n    {return {type: 'string'};}\n  } else if(lcType === 'file') {\n    {return {type: 'file'};}\n  } else if(lcType === 'boolean') {\n    {return {type: 'boolean'};}\n  } else if(lcType === 'boolean') {\n    {return {type: 'boolean'};}\n  } else if(lcType === 'array' || lcType === 'list') {\n    if(source.items) {\n      var it = this.toJsonSchema(source.items);\n      return {type: 'array', items: it};\n    }\n    else {\n      return {type: 'array', items: {type: 'object'}};\n    }\n  } else if(source.$ref) {\n    return {$ref: this.modelMap[source.$ref] ? '#/definitions/' + this.modelMap[source.$ref] : source.$ref};\n  } else if(lcType === 'void' || lcType === '') {\n    {return {};}\n  } else if (this.modelMap[source.type]) {\n    // If this a model using `type` instead of `$ref`, that's fine.\n    return {$ref: '#/definitions/' + this.modelMap[source.type]};\n  } else {\n    // Unknown model type or 'object', pass it along.\n    return {type: source.type};\n  }\n};\n\nSwaggerSpecConverter.prototype.resourceListing = function(obj, swagger, opts, callback) {\n  var i;\n  var processedCount = 0;   // jshint ignore:line\n  var self = this;          // jshint ignore:line\n  var expectedCount = obj.apis.length;\n  var _swagger = swagger;   // jshint ignore:line\n  var _opts = {};\n\n  if(opts && opts.requestInterceptor){\n    _opts.requestInterceptor = opts.requestInterceptor;\n  }\n\n  if(opts && opts.responseInterceptor){\n    _opts.responseInterceptor = opts.responseInterceptor;\n  }\n\n  var swaggerRequestHeaders = 'application/json';\n\n  if(opts && opts.swaggerRequestHeaders) {\n    swaggerRequestHeaders = opts.swaggerRequestHeaders;\n  }\n\n  if(expectedCount === 0) {\n    this.finish(callback, swagger);\n  }\n\n  for(i = 0; i < expectedCount; i++) {\n    var api = obj.apis[i];\n    var path = api.path;\n    var absolutePath = this.getAbsolutePath(obj.swaggerVersion, this.docLocation, path);\n\n    if(api.description) {\n      swagger.tags = swagger.tags || [];\n      swagger.tags.push({\n        name : this.extractTag(api.path),\n        description : api.description || ''\n      });\n    }\n    var http = {\n      url: absolutePath,\n      headers: { accept: swaggerRequestHeaders },\n      on: {},\n      method: 'get',\n      timeout: opts.timeout\n    };\n    /* jshint ignore:start */\n    http.on.response = function(data) {\n      processedCount += 1;\n      var obj = data.obj;\n      if(obj) {\n        self.declaration(obj, _swagger);\n      }\n      if(processedCount === expectedCount) {\n        self.finish(callback, _swagger);\n      }\n    };\n    http.on.error = function(data) {\n      console.error(data);\n      processedCount += 1;\n      if(processedCount === expectedCount) {\n        self.finish(callback, _swagger);\n      }\n    };\n    /* jshint ignore:end */\n\n    if(this.clientAuthorizations && typeof this.clientAuthorizations.apply === 'function') {\n      this.clientAuthorizations.apply(http);\n    }\n\n    new SwaggerHttp().execute(http, _opts);\n  }\n};\n\nSwaggerSpecConverter.prototype.getAbsolutePath = function(version, docLocation, path)  {\n  if(version === '1.0') {\n    if(docLocation.endsWith('.json')) {\n      // get root path\n      var pos = docLocation.lastIndexOf('/');\n      if(pos > 0) {\n        docLocation = docLocation.substring(0, pos);\n      }\n    }\n  }\n\n  var location = docLocation;\n  if(path.indexOf('http:') === 0 || path.indexOf('https:') === 0) {\n    location = path;\n  }\n  else {\n    if(docLocation.endsWith('/')) {\n      location = docLocation.substring(0, docLocation.length - 1);\n    }\n    location += path;\n  }\n  location = location.replace('{format}', 'json');\n  return location;\n};\n\nSwaggerSpecConverter.prototype.securityDefinitions = function(obj, swagger) {\n  if(obj.authorizations) {\n    var name;\n    for(name in obj.authorizations) {\n      var isValid = false;\n      var securityDefinition = {\n        vendorExtensions: {}\n      };\n      var definition = obj.authorizations[name];\n      if(definition.type === 'apiKey') {\n        securityDefinition.type = 'apiKey';\n        securityDefinition.in = definition.passAs;\n        securityDefinition.name = definition.keyname || name;\n        isValid = true;\n      }\n      else if(definition.type === 'basicAuth') {\n        securityDefinition.type = 'basicAuth';\n        isValid = true;\n      }\n      else if(definition.type === 'oauth2') {\n        var existingScopes = definition.scopes || [];\n        var scopes = {};\n        var i;\n        for(i in existingScopes) {\n          var scope = existingScopes[i];\n          scopes[scope.scope] = scope.description;\n        }\n        securityDefinition.type = 'oauth2';\n        if(i > 0) {\n          securityDefinition.scopes = scopes;\n        }\n        if(definition.grantTypes) {\n          if(definition.grantTypes.implicit) {\n            var implicit = definition.grantTypes.implicit;\n            securityDefinition.flow = 'implicit';\n            securityDefinition.authorizationUrl = implicit.loginEndpoint;\n            isValid = true;\n          }\n          /* jshint ignore:start */\n          if(definition.grantTypes['authorization_code']) {\n            if(!securityDefinition.flow) {\n              // cannot set if flow is already defined\n              var authCode = definition.grantTypes['authorization_code'];\n              securityDefinition.flow = 'accessCode';\n              securityDefinition.authorizationUrl = authCode.tokenRequestEndpoint.url;\n              securityDefinition.tokenUrl = authCode.tokenEndpoint.url;\n              isValid = true;\n            }\n          }\n          /* jshint ignore:end */\n        }\n      }\n      if(isValid) {\n        swagger.securityDefinitions = swagger.securityDefinitions || {};\n        swagger.securityDefinitions[name] = securityDefinition;\n      }\n    }\n  }\n};\n\nSwaggerSpecConverter.prototype.apiInfo = function(obj, swagger) {\n  // info section\n  if(obj.info) {\n    var info = obj.info;\n    swagger.info = {};\n\n    if(info.contact) {\n      swagger.info.contact = {};\n      swagger.info.contact.email = info.contact;\n    }\n    if(info.description) {\n      swagger.info.description = info.description;\n    }\n    if(info.title) {\n      swagger.info.title = info.title;\n    }\n    if(info.termsOfServiceUrl) {\n      swagger.info.termsOfService = info.termsOfServiceUrl;\n    }\n    if(info.license || info.licenseUrl) {\n      swagger.license = {};\n      if(info.license) {\n        swagger.license.name = info.license;\n      }\n      if(info.licenseUrl) {\n        swagger.license.url = info.licenseUrl;\n      }\n    }\n  }\n  else {\n    this.warnings.push('missing info section');\n  }\n};\n\nSwaggerSpecConverter.prototype.finish = function (callback, obj) {\n  callback(obj);\n};\n","'use strict';\n\nvar log = require('../helpers').log;\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isString: require('lodash-compat/lang/isString'),\n};\n\nvar SchemaMarkup = require('../schema-markup.js');\nvar jsyaml = require('js-yaml');\n\nvar Model = module.exports = function (name, definition, models, modelPropertyMacro) {\n  this.definition = definition || {};\n  this.isArray = definition.type === 'array';\n  this.models = models || {};\n  this.name = name || definition.title || 'Inline Model';\n  this.modelPropertyMacro = modelPropertyMacro || function (property) {\n    return property.default;\n  };\n\n  return this;\n};\n\n// Note!  This function will be removed in 2.2.x!\nModel.prototype.createJSONSample = Model.prototype.getSampleValue = function (modelsToIgnore) {\n  modelsToIgnore = modelsToIgnore || {};\n\n  modelsToIgnore[this.name] = this;\n\n  // Response support\n  if (this.examples && _.isPlainObject(this.examples) && this.examples['application/json']) {\n    this.definition.example = this.examples['application/json'];\n\n    if (_.isString(this.definition.example)) {\n      this.definition.example = jsyaml.safeLoad(this.definition.example);\n    }\n  } else if (!this.definition.example) {\n    this.definition.example = this.examples;\n  }\n\n  return SchemaMarkup.schemaToJSON(this.definition, this.models, modelsToIgnore, this.modelPropertyMacro);\n};\n\nModel.prototype.getMockSignature = function () {\n  return SchemaMarkup.schemaToHTML(this.name, this.definition, this.models, this.modelPropertyMacro);\n};\n","'use strict';\n\nvar _ = {\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  isUndefined: require('lodash-compat/lang/isUndefined'),\n  isEmpty: require('lodash-compat/lang/isEmpty'),\n  isObject: require('lodash-compat/lang/isObject')\n};\nvar helpers = require('../helpers');\nvar Model = require('./model');\nvar SwaggerHttp = require('../http');\nvar Q = require('q');\n\nvar Operation = module.exports = function (parent, scheme, operationId, httpMethod, path, args, definitions, models, clientAuthorizations) {\n  var errors = [];\n\n  parent = parent || {};\n  args = args || {};\n\n  if(parent && parent.options) {\n    this.client = parent.options.client || null;\n    this.requestInterceptor = parent.options.requestInterceptor || null;\n    this.responseInterceptor = parent.options.responseInterceptor || null;\n    this.requestAgent = parent.options.requestAgent;\n  }\n  this.authorizations = args.security;\n  this.basePath = parent.basePath || '/';\n  this.clientAuthorizations = clientAuthorizations;\n  this.consumes = args.consumes || parent.consumes || ['application/json'];\n  this.produces = args.produces || parent.produces || ['application/json'];\n  this.deprecated = args.deprecated;\n  this.description = args.description;\n  this.host = parent.host;\n  this.method = (httpMethod || errors.push('Operation ' + operationId + ' is missing method.'));\n  this.models = models || {};\n  this.nickname = (operationId || errors.push('Operations must have a nickname.'));\n  this.operation = args;\n  this.operations = {};\n  this.parameters = args !== null ? (args.parameters || []) : {};\n  this.parent = parent;\n  this.path = (path || errors.push('Operation ' + this.nickname + ' is missing path.'));\n  this.responses = (args.responses || {});\n  this.scheme = scheme || parent.scheme || 'http';\n  this.schemes = args.schemes || parent.schemes;\n  this.security = args.security || parent.security;\n  this.summary = args.summary || '';\n  this.timeout = parent.timeout;\n  this.type = null;\n  this.useJQuery = parent.useJQuery;\n  this.jqueryAjaxCache = parent.jqueryAjaxCache;\n  this.enableCookies = parent.enableCookies;\n\n  var key;\n\n  if(!this.host) {\n    if(typeof window !== 'undefined') {\n      this.host = window.location.host;\n    }\n    else {\n      this.host = 'localhost';\n    }\n  }\n  this.parameterMacro = parent.parameterMacro || function (operation, parameter) {\n    return parameter.default;\n  };\n\n  this.inlineModels = [];\n\n  if(this.basePath !== '/' && this.basePath.slice(-1) === '/') {\n    this.basePath = this.basePath.slice(0, -1);\n  }\n\n  if (typeof this.deprecated === 'string') {\n    switch(this.deprecated.toLowerCase()) {\n      case 'true': case 'yes': case '1': {\n        this.deprecated = true;\n        break;\n      }\n\n      case 'false': case 'no': case '0': case null: {\n        this.deprecated = false;\n        break;\n      }\n\n      default: this.deprecated = Boolean(this.deprecated);\n    }\n  }\n\n  var i, model;\n\n  if (definitions) {\n    // add to global models\n    for (key in definitions) {\n      model = new Model(key, definitions[key], this.models, parent.modelPropertyMacro);\n\n      if (model) {\n        this.models[key] = model;\n      }\n    }\n  }\n  else {\n    definitions = {};\n  }\n\n  for (i = 0; i < this.parameters.length; i++) {\n    var d, param = this.parameters[i];\n\n    // Allow macro to set the default value\n    param.default = this.parameterMacro(this, param);\n\n    if (param.type === 'array') {\n      param.isList = true;\n      param.allowMultiple = true;\n    }\n\n    var innerType = this.getType(param);\n\n    if (innerType && innerType.toString().toLowerCase() === 'boolean') {\n      param.allowableValues = {};\n      param.isList = true;\n      param['enum'] = [true, false]; // use actual primitives\n    }\n\n    for(key in param) {\n      helpers.extractExtensions(key, param);\n    }\n    if(typeof param['x-example'] !== 'undefined') {\n      d = param['x-example'];\n      param.default = d;\n    }\n    if(param['x-examples']) {\n      d = param['x-examples'].default;\n      if(typeof d !== 'undefined') {\n        param.default = d;\n      }\n    }\n\n    var enumValues = param['enum'] || (param.items && param.items['enum']);\n\n    if (typeof enumValues !== 'undefined') {\n      var id;\n\n      param.allowableValues = {};\n      param.allowableValues.values = [];\n      param.allowableValues.descriptiveValues = [];\n\n      for (id = 0; id < enumValues.length; id++) {\n        var value = enumValues[id];\n        var isDefault = (value === param.default || value+'' === param.default);\n\n        param.allowableValues.values.push(value);\n        // Always have string for descriptive values....\n        param.allowableValues.descriptiveValues.push({value : value+'', isDefault: isDefault});\n      }\n    }\n\n    if (param.type === 'array') {\n      innerType = [innerType];\n\n      if (typeof param.allowableValues === 'undefined') {\n        // can't show as a list if no values to select from\n        delete param.isList;\n        delete param.allowMultiple;\n      }\n    }\n\n    param.modelSignature = {type: innerType, definitions: this.models};\n    param.signature = this.getModelSignature(innerType, this.models).toString();\n    param.sampleJSON = this.getModelSampleJSON(innerType, this.models);\n    param.responseClassSignature = param.signature;\n  }\n\n  var keyname, defaultResponseCode, response, responses = this.responses;\n\n  if (responses['200']) {\n    response = responses['200'];\n    defaultResponseCode = '200';\n  } else if (responses['201']) {\n    response = responses['201'];\n    defaultResponseCode = '201';\n  } else if (responses['202']) {\n    response = responses['202'];\n    defaultResponseCode = '202';\n  } else if (responses['203']) {\n    response = responses['203'];\n    defaultResponseCode = '203';\n  } else if (responses['204']) {\n    response = responses['204'];\n    defaultResponseCode = '204';\n  } else if (responses['205']) {\n    response = responses['205'];\n    defaultResponseCode = '205';\n  } else if (responses['206']) {\n    response = responses['206'];\n    defaultResponseCode = '206';\n  } else if (responses['default']) {\n    response = responses['default'];\n    defaultResponseCode = 'default';\n  }\n\n  for(keyname in responses) {\n    helpers.extractExtensions(keyname, responses);\n    if(typeof keyname === 'string' && keyname.indexOf('x-') === -1) {\n      var responseObject = responses[keyname];\n      if(typeof responseObject === 'object' && typeof responseObject.headers === 'object') {\n        var headers = responseObject.headers;\n        for(var headerName in headers) {\n          var header = headers[headerName];\n          if(typeof header === 'object') {\n            for(var headerKey in header) {\n              helpers.extractExtensions(headerKey, header);\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (response) {\n    for(keyname in response) {\n      helpers.extractExtensions(keyname, response);\n    }\n  }\n\n  if (response && response.schema) {\n    var resolvedModel = this.resolveModel(response.schema, definitions);\n    var successResponse;\n\n    delete responses[defaultResponseCode];\n\n    if (resolvedModel) {\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = resolvedModel;\n    } else if (!response.schema.type || response.schema.type === 'object' || response.schema.type === 'array') {\n      // Inline model\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = new Model(undefined, response.schema || {}, this.models, parent.modelPropertyMacro);\n    } else {\n      // Primitive\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = response.schema;\n    }\n\n    if (successResponse) {\n      successResponse.vendorExtensions = response.vendorExtensions;\n      // Attach response properties\n      if (response.description) {\n        successResponse.description = response.description;\n      }\n\n      if (response.examples) {\n        successResponse.examples = response.examples;\n      }\n\n      if (response.headers) {\n        successResponse.headers = response.headers;\n      }\n    }\n\n    this.type = response;\n  }\n\n  if (errors.length > 0) {\n    if (this.resource && this.resource.api && this.resource.api.fail) {\n      this.resource.api.fail(errors);\n    }\n  }\n\n  return this;\n};\n\nOperation.prototype.isDefaultArrayItemValue = function(value, param) {\n  if (param.default && Array.isArray(param.default)) {\n    return param.default.indexOf(value) !== -1;\n  }\n  return value === param.default;\n};\n\nOperation.prototype.getType = function (param) {\n  var type = param.type;\n  var format = param.format;\n  var isArray = false;\n  var str;\n\n  if (type === 'integer' && format === 'int32') {\n    str = 'integer';\n  } else if (type === 'integer' && format === 'int64') {\n    str = 'long';\n  } else if (type === 'integer') {\n    str = 'integer';\n  } else if (type === 'string') {\n    if (format === 'date-time') {\n      str = 'date-time';\n    } else if (format === 'date') {\n      str = 'date';\n    } else {\n      str = 'string';\n    }\n  } else if (type === 'number' && format === 'float') {\n    str = 'float';\n  } else if (type === 'number' && format === 'double') {\n    str = 'double';\n  } else if (type === 'number') {\n    str = 'double';\n  } else if (type === 'boolean') {\n    str = 'boolean';\n  } else if (type === 'array') {\n    isArray = true;\n\n    if (param.items) {\n      str = this.getType(param.items);\n    }\n  } else if (type === 'file') {\n    str = 'file';\n  }\n\n  if (param.$ref) {\n    str = helpers.simpleRef(param.$ref);\n  }\n\n  var schema = param.schema;\n\n  if (schema) {\n    var ref = schema.$ref;\n\n    if (ref) {\n      ref = helpers.simpleRef(ref);\n\n      if (isArray) {\n        return [ ref ];\n      } else {\n        return ref;\n      }\n    } else {\n      // If inline schema, we add it our interal hash -> which gives us it's ID (int)\n      if(schema.type === 'object') {\n        return this.addInlineModel(schema);\n      }\n      return this.getType(schema);\n    }\n  }\n  if (isArray) {\n    return [ str ];\n  } else {\n    return str;\n  }\n};\n\n/**\n * adds an inline schema (model) to a hash, where we can ref it later\n * @param {object} schema a schema\n * @return {number} the ID of the schema being added, or null\n **/\nOperation.prototype.addInlineModel = function (schema) {\n  var len = this.inlineModels.length;\n  var model = this.resolveModel(schema, {});\n  if(model) {\n    this.inlineModels.push(model);\n    return 'Inline Model '+len; // return string ref of the inline model (used with #getInlineModel)\n  }\n  return null; // report errors?\n};\n\n/**\n * gets the internal ref to an inline model\n * @param {string} inline_str a string reference to an inline model\n * @return {Model} the model being referenced. Or null\n **/\nOperation.prototype.getInlineModel = function(inlineStr) {\n  if(/^Inline Model \\d+$/.test(inlineStr)) {\n    var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //\n    var model = this.inlineModels[id];\n    return model;\n  }\n  // I'm returning null here, should I rather throw an error?\n  return null;\n};\n\nOperation.prototype.resolveModel = function (schema, definitions) {\n  if (typeof schema.$ref !== 'undefined') {\n    var ref = schema.$ref;\n\n    if (ref.indexOf('#/definitions/') === 0) {\n      ref = ref.substring('#/definitions/'.length);\n    }\n\n    if (definitions[ref]) {\n      return new Model(ref, definitions[ref], this.models, this.parent.modelPropertyMacro);\n    }\n  // schema must at least be an object to get resolved to an inline Model\n  } else if (schema && typeof schema === 'object' &&\n            (schema.type === 'object' || _.isUndefined(schema.type))) {\n    return new Model(undefined, schema, this.models, this.parent.modelPropertyMacro);\n  }\n\n  return null;\n};\n\nOperation.prototype.help = function (dontPrint) {\n  var out = this.nickname + ': ' + this.summary + '\\n';\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n    var typeInfo = param.signature;\n\n    out += '\\n  * ' + param.name + ' (' + typeInfo + '): ' + param.description;\n  }\n\n  if (typeof dontPrint === 'undefined') {\n    helpers.log(out);\n  }\n\n  return out;\n};\n\nOperation.prototype.getModelSignature = function (type, definitions) {\n  var isPrimitive, listType;\n\n  if (type instanceof Array) {\n    listType = true;\n    type = type[0];\n  }\n\n  // Convert undefined to string of 'undefined'\n  if (typeof type === 'undefined') {\n    type = 'undefined';\n    isPrimitive = true;\n\n  } else if (definitions[type]){\n    // a model def exists?\n    type = definitions[type]; /* Model */\n    isPrimitive = false;\n\n  } else if (this.getInlineModel(type)) {\n    type = this.getInlineModel(type); /* Model */\n    isPrimitive = false;\n\n  } else {\n    // We default to primitive\n    isPrimitive = true;\n  }\n\n  if (isPrimitive) {\n    if (listType) {\n      return 'Array[' + type + ']';\n    } else {\n      return type.toString();\n    }\n  } else {\n    if (listType) {\n      return 'Array[' + type.getMockSignature() + ']';\n    } else {\n      return type.getMockSignature();\n    }\n  }\n};\n\nOperation.prototype.supportHeaderParams = function () {\n  return true;\n};\n\nOperation.prototype.supportedSubmitMethods = function () {\n  return this.parent.supportedSubmitMethods;\n};\n\nOperation.prototype.getHeaderParams = function (args) {\n  var headers = this.setContentTypes(args, {});\n  var headerParamsByLowerCase = {};\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (param.in === 'header') {\n      headerParamsByLowerCase[param.name.toLowerCase()] = param;\n    }\n  }\n\n  for (var arg in args) {\n    var headerParam = headerParamsByLowerCase[arg.toLowerCase()];\n    if (typeof headerParam !== 'undefined') {\n      var value = args[arg];\n\n      if (Array.isArray(value)) {\n        value = value.toString();\n      }\n\n      headers[headerParam.name] = value;\n    }\n  }\n\n  return headers;\n};\n\nOperation.prototype.urlify = function (args, maskPasswords) {\n  var formParams = {};\n  var requestUrl = this.path.replace(/#.*/, ''); // remove URL fragment\n  var querystring = ''; // grab params from the args, build the querystring along the way\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (typeof args[param.name] !== 'undefined') {\n      var isPassword;\n      if(param.type === 'string' && param.format === 'password' && maskPasswords) {\n        isPassword = true;\n      }\n\n      if (param.in === 'path') {\n        var reg = new RegExp('\\{' + param.name + '\\}', 'gi');\n        var value = args[param.name];\n\n        if (Array.isArray(value)) {\n          value = this.encodePathCollection(param.collectionFormat, param.name, value, isPassword);\n        } else {\n          value = this.encodePathParam(value, isPassword);\n        }\n\n        requestUrl = requestUrl.replace(reg, value);\n      } else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {\n        if (querystring === '' && requestUrl.indexOf('?') < 0) {\n          querystring += '?';\n        } else {\n          querystring += '&';\n        }\n\n        if (typeof param.collectionFormat !== 'undefined') {\n          var qp = args[param.name];\n\n          if (Array.isArray(qp)) {\n            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp, isPassword);\n          } else {\n            querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);\n          }\n        } else {\n          querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);\n        }\n      } else if (param.in === 'formData') {\n        formParams[param.name] = args[param.name];\n      }\n    }\n  }\n  var url = this.scheme + '://' + this.host;\n\n  if (this.basePath !== '/') {\n    url += this.basePath;\n  }\n  return url + requestUrl + querystring;\n};\n\nOperation.prototype.getMissingParams = function (args) {\n  var missingParams = []; // check required params, track the ones that are missing\n  var i;\n\n  for (i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (param.required === true) {\n      if (typeof args[param.name] === 'undefined') {\n        missingParams = param.name;\n      }\n    }\n  }\n\n  return missingParams;\n};\n\nOperation.prototype.getBody = function (headers, args, opts) {\n  var formParams = {}, hasFormParams, param, body, key, value, hasBody = false;\n\n  // look at each param and put form params in an object\n  for (var i = 0; i < this.parameters.length; i++) {\n    param = this.parameters[i];\n    if (typeof args[param.name] !== 'undefined') {\n      var isPassword;\n      if(param.type === 'string' && param.format === 'password') {\n        isPassword = 'password';\n      }\n      if (param.in === 'body') {\n        body = args[param.name];\n      } else if (param.in === 'formData') {\n        formParams[param.name] = {\n          param: param,\n          value: args[param.name],\n          password: isPassword\n        };\n        hasFormParams = true;\n      }\n    }\n    else {\n      if(param.in === 'body') {\n        hasBody = true;\n      }\n    }\n  }\n\n  // if body is null and hasBody is true, AND a JSON body is requested, send empty {}\n  if(hasBody && typeof body === 'undefined') {\n    var contentType = headers['Content-Type'];\n    if(contentType && contentType.indexOf('application/json') === 0) {\n      body = '{}';\n    }\n  }\n\n  var isMultiPart = false;\n  if(headers['Content-Type'] && headers['Content-Type'].indexOf('multipart/form-data') >= 0) {\n    isMultiPart = true;\n  }\n\n  // handle form params\n  if (hasFormParams && !isMultiPart) {\n    var encoded = '';\n\n    for (key in formParams) {\n      param = formParams[key].param;\n      value = formParams[key].value;\n      var password;\n\n      if(opts && opts.maskPasswords) {\n        password = formParams[key].password;\n      }\n\n      if (typeof value !== 'undefined') {\n        if (Array.isArray(value)) {\n          if (encoded !== '') {\n            encoded += '&';\n          }\n          encoded += this.encodeQueryCollection(param.collectionFormat, key, value, password);\n        }\n        else {\n          if (encoded !== '') {\n            encoded += '&';\n          }\n\n          encoded += encodeURIComponent(key) + '=' + mask(encodeURIComponent(value), password);\n        }\n      }\n    }\n\n    body = encoded;\n  } else if (isMultiPart) {\n    var bodyParam;\n    if (typeof FormData === 'function') {\n      bodyParam = new FormData();\n\n      bodyParam.type = 'formData';\n\n      for (key in formParams) {\n        param = formParams[key].param;\n        value = args[key];\n\n        if (typeof value !== 'undefined') {\n          if({}.toString.apply(value) === '[object File]') {\n            bodyParam.append(key, value);\n          }\n          else if (value.type === 'file' && value.value) {\n            bodyParam.append(key, value.value);\n          } else {\n            if (Array.isArray(value)) {\n              if(param.collectionFormat === 'multi') {\n                bodyParam.delete(key);\n                for(var v in value) {\n                  bodyParam.append(key, value[v]);\n                }\n              }\n              else {\n                bodyParam.append(key, this.encodeQueryCollection(param.collectionFormat, key, value).split('=').slice(1).join('='));\n              }\n            }\n            else {\n              bodyParam.append(key, value);\n            }\n          }\n        }\n      }\n      body = bodyParam;\n    }\n    else {\n      bodyParam = {};\n      for (key in formParams) {\n        value = args[key];\n        if (Array.isArray(value)) {\n          var delimeter;\n          var format = param.collectionFormat || 'multi';\n          if(format === 'ssv') {\n            delimeter = ' ';\n          }\n          else if(format === 'pipes') {\n            delimeter = '|';\n          }\n          else if(format === 'tsv') {\n            delimeter = '\\t';\n          }\n          else if(format === 'multi') {\n            bodyParam[key] = value;\n            break;\n          }\n          else {\n            delimeter = ',';\n          }\n          var data;\n          value.forEach(function(v) {\n            if(data) {\n              data += delimeter;\n            }\n            else {\n              data = '';\n            }\n            data += v;\n          });\n          bodyParam[key] = data;\n        }\n        else {\n          bodyParam[key] = value;\n        }\n      }\n      body = bodyParam;\n    }\n    headers['Content-Type'] = 'multipart/form-data';\n  }\n\n  return body;\n};\n\n/**\n * gets sample response for a single operation\n **/\nOperation.prototype.getModelSampleJSON = function (type, models) {\n  var listType, sampleJson, innerType;\n  models = models || {};\n\n  listType = (type instanceof Array);\n  innerType = listType ? type[0] : type;\n\n  if(models[innerType]) {\n    sampleJson = models[innerType].createJSONSample();\n  } else if (this.getInlineModel(innerType)){\n    sampleJson = this.getInlineModel(innerType).createJSONSample(); // may return null, if type isn't correct\n  }\n\n\n  if (sampleJson) {\n    sampleJson = listType ? [sampleJson] : sampleJson;\n\n    if (typeof sampleJson === 'string') {\n      return sampleJson;\n    } else if (_.isObject(sampleJson)) {\n      var t = sampleJson;\n\n      if (sampleJson instanceof Array && sampleJson.length > 0) {\n        t = sampleJson[0];\n      }\n\n      if (t.nodeName && typeof t === 'Node') {\n        var xmlString = new XMLSerializer().serializeToString(t);\n\n        return this.formatXml(xmlString);\n      } else {\n        return JSON.stringify(sampleJson, null, 2);\n      }\n    } else {\n      return sampleJson;\n    }\n  }\n};\n\n/**\n * legacy binding\n **/\nOperation.prototype.do = function (args, opts, callback, error, parent) {\n  return this.execute(args, opts, callback, error, parent);\n};\n\n/**\n * executes an operation\n **/\nOperation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {\n  var args = arg1 || {};\n  var opts = {}, success, error, deferred, timeout;\n\n  if (_.isObject(arg2)) {\n    opts = arg2;\n    success = arg3;\n    error = arg4;\n  }\n\n  timeout = typeof opts.timeout !== 'undefined' ? opts.timeout : this.timeout;\n\n  if(this.client) {\n    opts.client = this.client;\n  }\n\n  if(this.requestAgent) {\n    opts.requestAgent = this.requestAgent;\n  }\n\n  // add the request interceptor from parent, if none sent from client\n  if(!opts.requestInterceptor && this.requestInterceptor ) {\n    opts.requestInterceptor = this.requestInterceptor ;\n  }\n\n  if(!opts.responseInterceptor && this.responseInterceptor) {\n    opts.responseInterceptor = this.responseInterceptor;\n  }\n\n  if (typeof arg2 === 'function') {\n    success = arg2;\n    error = arg3;\n  }\n\n  if (this.parent.usePromise) {\n    deferred = Q.defer();\n  } else {\n    success = (success || this.parent.defaultSuccessCallback || helpers.log);\n    error = (error || this.parent.defaultErrorCallback || helpers.log);\n  }\n\n  if (typeof opts.useJQuery === 'undefined') {\n    opts.useJQuery = this.useJQuery;\n  }\n\n  if (typeof opts.jqueryAjaxCache === 'undefined') {\n    opts.jqueryAjaxCache = this.jqueryAjaxCache;\n  }\n\n  if (typeof opts.enableCookies === 'undefined') {\n    opts.enableCookies = this.enableCookies;\n  }\n\n  var missingParams = this.getMissingParams(args);\n\n  if (missingParams.length > 0) {\n    var message = 'missing required params: ' + missingParams;\n\n    helpers.fail(message);\n\n    if (this.parent.usePromise) {\n      deferred.reject(message);\n      return deferred.promise;\n    } else {\n      error(message, parent);\n      return {};\n    }\n  }\n\n  var allHeaders = this.getHeaderParams(args);\n  var contentTypeHeaders = this.setContentTypes(args, opts);\n  var headers = {}, attrname;\n\n  for (attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }\n  for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }\n\n  var body = this.getBody(contentTypeHeaders, args, opts);\n  var url = this.urlify(args, opts.maskPasswords);\n\n  if(url.indexOf('.{format}') > 0) {\n    if(headers) {\n      var format = headers.Accept || headers.accept;\n      if(format && format.indexOf('json') > 0) {\n        url = url.replace('.{format}', '.json');\n      }\n      else if(format && format.indexOf('xml') > 0) {\n        url = url.replace('.{format}', '.xml');\n      }\n    }\n  }\n\n  var obj = {\n    url: url,\n    method: this.method.toUpperCase(),\n    body: body,\n    enableCookies: opts.enableCookies,\n    useJQuery: opts.useJQuery,\n    jqueryAjaxCache: opts.jqueryAjaxCache,\n    deferred: deferred,\n    headers: headers,\n    clientAuthorizations: opts.clientAuthorizations,\n    operation: this,\n    connectionAgent: this.connectionAgent,\n    on: {\n      response: function (response) {\n        if (deferred) {\n          deferred.resolve(response);\n          return deferred.promise;\n        } else {\n          return success(response, parent);\n        }\n      },\n      error: function (response) {\n        if (deferred) {\n          deferred.reject(response);\n          return deferred.promise;\n        } else {\n          return error(response, parent);\n        }\n      }\n    }\n  };\n\n  if (timeout) {\n    obj.timeout = timeout;\n  }\n\n  this.clientAuthorizations.apply(obj, this.operation.security);\n  if (opts.mock === true) {\n    return obj;\n  } else {\n    return new SwaggerHttp().execute(obj, opts);\n  }\n};\n\nfunction itemByPriority(col, itemPriority) {\n\n  // No priorities? return first...\n  if(_.isEmpty(itemPriority)) {\n    return col[0];\n  }\n\n  for (var i = 0, len = itemPriority.length; i < len; i++) {\n    if(col.indexOf(itemPriority[i]) > -1) {\n      return itemPriority[i];\n    }\n  }\n\n  // Otherwise return first\n  return col[0];\n}\n\nOperation.prototype.setContentTypes = function (args, opts) {\n  // default type\n  var allDefinedParams = this.parameters;\n  var body;\n  var consumes = args.parameterContentType || itemByPriority(this.consumes, ['application/json', 'application/yaml']);\n  var accepts = opts.responseContentType || itemByPriority(this.produces, ['application/json', 'application/yaml']);\n  var definedFileParams = [];\n  var definedFormParams = [];\n  var headers = {};\n  var i;\n\n  // get params from the operation and set them in definedFileParams, definedFormParams, headers\n  for (i = 0; i < allDefinedParams.length; i++) {\n    var param = allDefinedParams[i];\n\n    if (param.in === 'formData') {\n      if (param.type === 'file') {\n        definedFileParams.push(param);\n      } else {\n        definedFormParams.push(param);\n      }\n    } else if (param.in === 'header' && opts) {\n      var key = param.name;\n      var headerValue = opts[param.name];\n\n      if (typeof opts[param.name] !== 'undefined') {\n        headers[key] = headerValue;\n      }\n    } else if (param.in === 'body' && typeof args[param.name] !== 'undefined') {\n      body = args[param.name];\n    }\n  }\n\n  // if there's a body, need to set the consumes header via requestContentType\n  var hasBody = body || definedFileParams.length || definedFormParams.length;\n  if (this.method === 'post' || this.method === 'put' || this.method === 'patch' ||\n      ((this.method === 'delete' || this.method === 'get') && hasBody)) {\n    if (opts.requestContentType) {\n      consumes = opts.requestContentType;\n    }\n    // if any form params, content type must be set\n    if (definedFormParams.length > 0) {\n      consumes = undefined;\n      if (opts.requestContentType) {             // override if set\n        consumes = opts.requestContentType;\n      } else if (definedFileParams.length > 0) { // if a file, must be multipart/form-data\n        consumes = 'multipart/form-data';\n      } else {\n        if (this.consumes && this.consumes.length > 0) {\n          // use the consumes setting\n          for(var c in this.consumes) {\n            var chk = this.consumes[c];\n            if(chk.indexOf('application/x-www-form-urlencoded') === 0 || chk.indexOf('multipart/form-data') === 0) {\n              consumes = chk;\n            }\n          }\n        }\n      }\n      if(typeof consumes === 'undefined') {\n        // default to x-www-from-urlencoded\n        consumes = 'application/x-www-form-urlencoded';\n      }\n    }\n  }\n  else {\n    consumes = null;\n  }\n\n  if (consumes && this.consumes) {\n    if (this.consumes.indexOf(consumes) === -1) {\n      helpers.log('server doesn\\'t consume ' + consumes + ', try ' + JSON.stringify(this.consumes));\n    }\n  }\n\n  if (!this.matchesAccept(accepts)) {\n    helpers.log('server can\\'t produce ' + accepts);\n  }\n\n  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded')) {\n    headers['Content-Type'] = consumes;\n  }\n  else if(this.consumes && this.consumes.length > 0 && this.consumes[0] === 'application/x-www-form-urlencoded') {\n    headers['Content-Type'] = this.consumes[0];\n  }\n\n  if (accepts) {\n    headers.Accept = accepts;\n  }\n\n  return headers;\n};\n\n/**\n * Returns true if the request accepts header matches anything in this.produces.\n *  If this.produces contains * / *, ignore the accept header.\n * @param {string=} accepts The client request accept header.\n * @return {boolean}\n */\nOperation.prototype.matchesAccept = function(accepts) {\n  // no accepts or produces, no problem!\n  if (!accepts || !this.produces) {\n    return true;\n  }\n  return this.produces.indexOf(accepts) !== -1 || this.produces.indexOf('*/*') !== -1;\n};\n\nOperation.prototype.asCurl = function (args1, args2) {\n  var opts = {mock: true, maskPasswords: true};\n  if (typeof args2 === 'object') {\n    for (var argKey in args2) {\n      opts[argKey] = args2[argKey];\n    }\n  }\n  var obj = this.execute(args1, opts);\n\n  this.clientAuthorizations.apply(obj, this.operation.security);\n\n  var results = [];\n\n  results.push('-X ' + this.method.toUpperCase());\n\n  if (typeof obj.headers !== 'undefined') {\n    var key;\n\n    for (key in obj.headers) {\n      var value = obj.headers[key];\n      if(typeof value === 'string'){\n        value = value.replace(/\\'/g, '\\\\u0027');\n      }\n      results.push('--header \\'' + key + ': ' + value + '\\'');\n    }\n  }\n  var isFormData = false;\n  var isMultipart = false;\n\n  var type = obj.headers['Content-Type'];\n  if(type && type.indexOf('application/x-www-form-urlencoded') === 0) {\n    isFormData = true;\n  }\n  else if (type && type.indexOf('multipart/form-data') === 0) {\n    isFormData = true;\n    isMultipart = true;\n  }\n\n  if (obj.body) {\n    var body;\n    if (_.isObject(obj.body)) {\n      if(isMultipart) {\n        isMultipart = true;\n        // add the form data\n        for(var i = 0; i < this.parameters.length; i++) {\n          var parameter = this.parameters[i];\n          if(parameter.in === 'formData') {\n            if (!body) {\n              body = '';\n            }\n\n            var paramValue;\n            if(typeof FormData === 'function' && obj.body instanceof FormData) {\n              paramValue = obj.body.getAll(parameter.name);\n            }\n            else {\n              paramValue = obj.body[parameter.name];\n            }\n            if (paramValue) {\n              if (parameter.type === 'file') {\n                if(paramValue.name) {\n                  body += '-F ' + parameter.name + '=@\"' + paramValue.name + '\" ';\n                }\n              }\n              else {\n                if (Array.isArray(paramValue)) {\n                  if(parameter.collectionFormat === 'multi') {\n                    for(var v in paramValue) {\n                      body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue[v], parameter.format) + ' ';\n                    }\n                  }\n                  else {\n                    body += '-F ' + this.encodeQueryCollection(parameter.collectionFormat, parameter.name, mask(paramValue, parameter.format)) + ' ';\n                  }\n                } else {\n                  body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue, parameter.format) + ' ';\n                }\n              }\n            }\n          }\n        }\n      }\n      if(!body) {\n        body = JSON.stringify(obj.body);\n      }\n    } else {\n      body = obj.body;\n    }\n    // escape @ => %40, ' => %27\n    body = body.replace(/\\'/g, '%27').replace(/\\n/g, ' \\\\ \\n ');\n\n    if(!isFormData) {\n      // escape & => %26\n      body = body.replace(/&/g, '%26');\n    }\n    if(isMultipart) {\n      results.push(body);\n    }\n    else {\n      results.push('-d \\'' + body.replace(/@/g, '%40') + '\\'');\n    }\n  }\n\n  return 'curl ' + (results.join(' ')) + ' \\'' + obj.url + '\\'';\n};\n\nOperation.prototype.encodePathCollection = function (type, name, value, maskPasswords) {\n  var encoded = '';\n  var i;\n  var separator = '';\n\n  if (type === 'ssv') {\n    separator = '%20';\n  } else if (type === 'tsv') {\n    separator = '%09';\n  } else if (type === 'pipes') {\n    separator = '|';\n  } else {\n    separator = ',';\n  }\n\n  for (i = 0; i < value.length; i++) {\n    if (i === 0) {\n      encoded = this.encodeQueryParam(value[i], maskPasswords);\n    } else {\n      encoded += separator + this.encodeQueryParam(value[i], maskPasswords);\n    }\n  }\n\n  return encoded;\n};\n\nOperation.prototype.encodeQueryCollection = function (type, name, value, maskPasswords) {\n  var encoded = '';\n  var i;\n\n  type = type || 'default';\n  if (type === 'default' || type === 'multi') {\n    for (i = 0; i < value.length; i++) {\n      if (i > 0) {encoded += '&';}\n\n      encoded += this.encodeQueryKey(name) + '=' + mask(this.encodeQueryParam(value[i]), maskPasswords);\n    }\n  } else {\n    var separator = '';\n\n    if (type === 'csv') {\n      separator = ',';\n    } else if (type === 'ssv') {\n      separator = '%20';\n    } else if (type === 'tsv') {\n      separator = '%09';\n    } else if (type === 'pipes') {\n      separator = '|';\n    } else if (type === 'brackets') {\n      for (i = 0; i < value.length; i++) {\n        if (i !== 0) {\n          encoded += '&';\n        }\n        encoded += this.encodeQueryKey(name) + '[]=' + mask(this.encodeQueryParam(value[i]), maskPasswords);\n      }\n    }\n\n    if (separator !== '') {\n      for (i = 0; i < value.length; i++) {\n        if (i === 0) {\n          encoded = this.encodeQueryKey(name) + '=' + this.encodeQueryParam(value[i]);\n        } else {\n          encoded += separator + this.encodeQueryParam(value[i]);\n        }\n      }\n    }\n  }\n\n  return encoded;\n};\n\nOperation.prototype.encodeQueryKey = function (arg) {\n  return encodeURIComponent(arg)\n      .replace('%5B','[').replace('%5D', ']').replace('%24', '$');\n};\n\nOperation.prototype.encodeQueryParam = function (arg, maskPasswords) {\n  if(maskPasswords) {\n    return \"******\";\n  }\n  return encodeURIComponent(arg);\n};\n\n/**\n * TODO revisit, might not want to leave '/'\n **/\nOperation.prototype.encodePathParam = function (pathParam, maskPasswords) {\n  return encodeURIComponent(pathParam, maskPasswords);\n};\n\nvar mask = function(value, format) {\n  if(typeof format === 'string' && format === 'password') {\n    return '******';\n  }\n  return value;\n}","'use strict';\n\nvar OperationGroup = module.exports = function (tag, description, externalDocs, operation) {\n  this.description = description;\n  this.externalDocs = externalDocs;\n  this.name = tag;\n  this.operation = operation;\n  this.operationsArray = [];\n  this.path = tag;\n  this.tag = tag;\n};\n\nOperationGroup.prototype.sort = function () {\n\n};\n\n","// shim for using process in browser\n\nvar process = module.exports = {};\nvar queue = [];\nvar draining = false;\n\nfunction drainQueue() {\n    if (draining) {\n        return;\n    }\n    draining = true;\n    var currentQueue;\n    var len = queue.length;\n    while(len) {\n        currentQueue = queue;\n        queue = [];\n        var i = -1;\n        while (++i < len) {\n            currentQueue[i]();\n        }\n        len = queue.length;\n    }\n    draining = false;\n}\nprocess.nextTick = function (fun) {\n    queue.push(fun);\n    if (!draining) {\n        setTimeout(drainQueue, 0);\n    }\n};\n\nprocess.title = 'browser';\nprocess.browser = true;\nprocess.env = {};\nprocess.argv = [];\nprocess.version = ''; // empty string to avoid regexp issues\nprocess.versions = {};\n\nfunction noop() {}\n\nprocess.on = noop;\nprocess.addListener = noop;\nprocess.once = noop;\nprocess.off = noop;\nprocess.removeListener = noop;\nprocess.removeAllListeners = noop;\nprocess.emit = noop;\n\nprocess.binding = function (name) {\n    throw new Error('process.binding is not supported');\n};\n\n// TODO(shtylman)\nprocess.cwd = function () { return '/' };\nprocess.chdir = function (dir) {\n    throw new Error('process.chdir is not supported');\n};\nprocess.umask = function() { return 0; };\n","(function (Buffer){\n(function () {\n  \"use strict\";\n\n  function btoa(str) {\n    var buffer\n      ;\n\n    if (str instanceof Buffer) {\n      buffer = str;\n    } else {\n      buffer = new Buffer(str.toString(), 'binary');\n    }\n\n    return buffer.toString('base64');\n  }\n\n  module.exports = btoa;\n}());\n\n}).call(this,require(\"buffer\").Buffer)\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9idG9hL2luZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiKGZ1bmN0aW9uICgpIHtcbiAgXCJ1c2Ugc3RyaWN0XCI7XG5cbiAgZnVuY3Rpb24gYnRvYShzdHIpIHtcbiAgICB2YXIgYnVmZmVyXG4gICAgICA7XG5cbiAgICBpZiAoc3RyIGluc3RhbmNlb2YgQnVmZmVyKSB7XG4gICAgICBidWZmZXIgPSBzdHI7XG4gICAgfSBlbHNlIHtcbiAgICAgIGJ1ZmZlciA9IG5ldyBCdWZmZXIoc3RyLnRvU3RyaW5nKCksICdiaW5hcnknKTtcbiAgICB9XG5cbiAgICByZXR1cm4gYnVmZmVyLnRvU3RyaW5nKCdiYXNlNjQnKTtcbiAgfVxuXG4gIG1vZHVsZS5leHBvcnRzID0gYnRvYTtcbn0oKSk7XG4iXX0=","/*!\n * The buffer module from node.js, for the browser.\n *\n * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>\n * @license  MIT\n */\n\nvar base64 = require('base64-js')\nvar ieee754 = require('ieee754')\nvar isArray = require('is-array')\n\nexports.Buffer = Buffer\nexports.SlowBuffer = SlowBuffer\nexports.INSPECT_MAX_BYTES = 50\nBuffer.poolSize = 8192 // not used by this implementation\n\nvar rootParent = {}\n\n/**\n * If `Buffer.TYPED_ARRAY_SUPPORT`:\n *   === true    Use Uint8Array implementation (fastest)\n *   === false   Use Object implementation (most compatible, even IE6)\n *\n * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+,\n * Opera 11.6+, iOS 4.2+.\n *\n * Due to various browser bugs, sometimes the Object implementation will be used even\n * when the browser supports typed arrays.\n *\n * Note:\n *\n *   - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances,\n *     See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438.\n *\n *   - Safari 5-7 lacks support for changing the `Object.prototype.constructor` property\n *     on objects.\n *\n *   - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function.\n *\n *   - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of\n *     incorrect length in some situations.\n\n * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they\n * get the Object implementation, which is slower but behaves correctly.\n */\nBuffer.TYPED_ARRAY_SUPPORT = (function () {\n  function Bar () {}\n  try {\n    var arr = new Uint8Array(1)\n    arr.foo = function () { return 42 }\n    arr.constructor = Bar\n    return arr.foo() === 42 && // typed array instances can be augmented\n        arr.constructor === Bar && // constructor can be set\n        typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`\n        arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`\n  } catch (e) {\n    return false\n  }\n})()\n\nfunction kMaxLength () {\n  return Buffer.TYPED_ARRAY_SUPPORT\n    ? 0x7fffffff\n    : 0x3fffffff\n}\n\n/**\n * Class: Buffer\n * =============\n *\n * The Buffer constructor returns instances of `Uint8Array` that are augmented\n * with function properties for all the node `Buffer` API functions. We use\n * `Uint8Array` so that square bracket notation works as expected -- it returns\n * a single octet.\n *\n * By augmenting the instances, we can avoid modifying the `Uint8Array`\n * prototype.\n */\nfunction Buffer (arg) {\n  if (!(this instanceof Buffer)) {\n    // Avoid going through an ArgumentsAdaptorTrampoline in the common case.\n    if (arguments.length > 1) return new Buffer(arg, arguments[1])\n    return new Buffer(arg)\n  }\n\n  this.length = 0\n  this.parent = undefined\n\n  // Common case.\n  if (typeof arg === 'number') {\n    return fromNumber(this, arg)\n  }\n\n  // Slightly less common case.\n  if (typeof arg === 'string') {\n    return fromString(this, arg, arguments.length > 1 ? arguments[1] : 'utf8')\n  }\n\n  // Unusual.\n  return fromObject(this, arg)\n}\n\nfunction fromNumber (that, length) {\n  that = allocate(that, length < 0 ? 0 : checked(length) | 0)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) {\n    for (var i = 0; i < length; i++) {\n      that[i] = 0\n    }\n  }\n  return that\n}\n\nfunction fromString (that, string, encoding) {\n  if (typeof encoding !== 'string' || encoding === '') encoding = 'utf8'\n\n  // Assumption: byteLength() return value is always < kMaxLength.\n  var length = byteLength(string, encoding) | 0\n  that = allocate(that, length)\n\n  that.write(string, encoding)\n  return that\n}\n\nfunction fromObject (that, object) {\n  if (Buffer.isBuffer(object)) return fromBuffer(that, object)\n\n  if (isArray(object)) return fromArray(that, object)\n\n  if (object == null) {\n    throw new TypeError('must start with number, buffer, array or string')\n  }\n\n  if (typeof ArrayBuffer !== 'undefined') {\n    if (object.buffer instanceof ArrayBuffer) {\n      return fromTypedArray(that, object)\n    }\n    if (object instanceof ArrayBuffer) {\n      return fromArrayBuffer(that, object)\n    }\n  }\n\n  if (object.length) return fromArrayLike(that, object)\n\n  return fromJsonObject(that, object)\n}\n\nfunction fromBuffer (that, buffer) {\n  var length = checked(buffer.length) | 0\n  that = allocate(that, length)\n  buffer.copy(that, 0, 0, length)\n  return that\n}\n\nfunction fromArray (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\n// Duplicate of fromArray() to keep fromArray() monomorphic.\nfunction fromTypedArray (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  // Truncating the elements is probably not what people expect from typed\n  // arrays with BYTES_PER_ELEMENT > 1 but it's compatible with the behavior\n  // of the old Buffer constructor.\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\nfunction fromArrayBuffer (that, array) {\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    // Return an augmented `Uint8Array` instance, for best performance\n    array.byteLength\n    that = Buffer._augment(new Uint8Array(array))\n  } else {\n    // Fallback: Return an object instance of the Buffer class\n    that = fromTypedArray(that, new Uint8Array(array))\n  }\n  return that\n}\n\nfunction fromArrayLike (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\n// Deserialize { type: 'Buffer', data: [1,2,3,...] } into a Buffer object.\n// Returns a zero-length buffer for inputs that don't conform to the spec.\nfunction fromJsonObject (that, object) {\n  var array\n  var length = 0\n\n  if (object.type === 'Buffer' && isArray(object.data)) {\n    array = object.data\n    length = checked(array.length) | 0\n  }\n  that = allocate(that, length)\n\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\nfunction allocate (that, length) {\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    // Return an augmented `Uint8Array` instance, for best performance\n    that = Buffer._augment(new Uint8Array(length))\n  } else {\n    // Fallback: Return an object instance of the Buffer class\n    that.length = length\n    that._isBuffer = true\n  }\n\n  var fromPool = length !== 0 && length <= Buffer.poolSize >>> 1\n  if (fromPool) that.parent = rootParent\n\n  return that\n}\n\nfunction checked (length) {\n  // Note: cannot use `length < kMaxLength` here because that fails when\n  // length is NaN (which is otherwise coerced to zero.)\n  if (length >= kMaxLength()) {\n    throw new RangeError('Attempt to allocate Buffer larger than maximum ' +\n                         'size: 0x' + kMaxLength().toString(16) + ' bytes')\n  }\n  return length | 0\n}\n\nfunction SlowBuffer (subject, encoding) {\n  if (!(this instanceof SlowBuffer)) return new SlowBuffer(subject, encoding)\n\n  var buf = new Buffer(subject, encoding)\n  delete buf.parent\n  return buf\n}\n\nBuffer.isBuffer = function isBuffer (b) {\n  return !!(b != null && b._isBuffer)\n}\n\nBuffer.compare = function compare (a, b) {\n  if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) {\n    throw new TypeError('Arguments must be Buffers')\n  }\n\n  if (a === b) return 0\n\n  var x = a.length\n  var y = b.length\n\n  var i = 0\n  var len = Math.min(x, y)\n  while (i < len) {\n    if (a[i] !== b[i]) break\n\n    ++i\n  }\n\n  if (i !== len) {\n    x = a[i]\n    y = b[i]\n  }\n\n  if (x < y) return -1\n  if (y < x) return 1\n  return 0\n}\n\nBuffer.isEncoding = function isEncoding (encoding) {\n  switch (String(encoding).toLowerCase()) {\n    case 'hex':\n    case 'utf8':\n    case 'utf-8':\n    case 'ascii':\n    case 'binary':\n    case 'base64':\n    case 'raw':\n    case 'ucs2':\n    case 'ucs-2':\n    case 'utf16le':\n    case 'utf-16le':\n      return true\n    default:\n      return false\n  }\n}\n\nBuffer.concat = function concat (list, length) {\n  if (!isArray(list)) throw new TypeError('list argument must be an Array of Buffers.')\n\n  if (list.length === 0) {\n    return new Buffer(0)\n  }\n\n  var i\n  if (length === undefined) {\n    length = 0\n    for (i = 0; i < list.length; i++) {\n      length += list[i].length\n    }\n  }\n\n  var buf = new Buffer(length)\n  var pos = 0\n  for (i = 0; i < list.length; i++) {\n    var item = list[i]\n    item.copy(buf, pos)\n    pos += item.length\n  }\n  return buf\n}\n\nfunction byteLength (string, encoding) {\n  if (typeof string !== 'string') string = '' + string\n\n  var len = string.length\n  if (len === 0) return 0\n\n  // Use a for loop to avoid recursion\n  var loweredCase = false\n  for (;;) {\n    switch (encoding) {\n      case 'ascii':\n      case 'binary':\n      // Deprecated\n      case 'raw':\n      case 'raws':\n        return len\n      case 'utf8':\n      case 'utf-8':\n        return utf8ToBytes(string).length\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return len * 2\n      case 'hex':\n        return len >>> 1\n      case 'base64':\n        return base64ToBytes(string).length\n      default:\n        if (loweredCase) return utf8ToBytes(string).length // assume utf8\n        encoding = ('' + encoding).toLowerCase()\n        loweredCase = true\n    }\n  }\n}\nBuffer.byteLength = byteLength\n\n// pre-set for values that may exist in the future\nBuffer.prototype.length = undefined\nBuffer.prototype.parent = undefined\n\nfunction slowToString (encoding, start, end) {\n  var loweredCase = false\n\n  start = start | 0\n  end = end === undefined || end === Infinity ? this.length : end | 0\n\n  if (!encoding) encoding = 'utf8'\n  if (start < 0) start = 0\n  if (end > this.length) end = this.length\n  if (end <= start) return ''\n\n  while (true) {\n    switch (encoding) {\n      case 'hex':\n        return hexSlice(this, start, end)\n\n      case 'utf8':\n      case 'utf-8':\n        return utf8Slice(this, start, end)\n\n      case 'ascii':\n        return asciiSlice(this, start, end)\n\n      case 'binary':\n        return binarySlice(this, start, end)\n\n      case 'base64':\n        return base64Slice(this, start, end)\n\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return utf16leSlice(this, start, end)\n\n      default:\n        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)\n        encoding = (encoding + '').toLowerCase()\n        loweredCase = true\n    }\n  }\n}\n\nBuffer.prototype.toString = function toString () {\n  var length = this.length | 0\n  if (length === 0) return ''\n  if (arguments.length === 0) return utf8Slice(this, 0, length)\n  return slowToString.apply(this, arguments)\n}\n\nBuffer.prototype.equals = function equals (b) {\n  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')\n  if (this === b) return true\n  return Buffer.compare(this, b) === 0\n}\n\nBuffer.prototype.inspect = function inspect () {\n  var str = ''\n  var max = exports.INSPECT_MAX_BYTES\n  if (this.length > 0) {\n    str = this.toString('hex', 0, max).match(/.{2}/g).join(' ')\n    if (this.length > max) str += ' ... '\n  }\n  return '<Buffer ' + str + '>'\n}\n\nBuffer.prototype.compare = function compare (b) {\n  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')\n  if (this === b) return 0\n  return Buffer.compare(this, b)\n}\n\nBuffer.prototype.indexOf = function indexOf (val, byteOffset) {\n  if (byteOffset > 0x7fffffff) byteOffset = 0x7fffffff\n  else if (byteOffset < -0x80000000) byteOffset = -0x80000000\n  byteOffset >>= 0\n\n  if (this.length === 0) return -1\n  if (byteOffset >= this.length) return -1\n\n  // Negative offsets start from the end of the buffer\n  if (byteOffset < 0) byteOffset = Math.max(this.length + byteOffset, 0)\n\n  if (typeof val === 'string') {\n    if (val.length === 0) return -1 // special case: looking for empty string always fails\n    return String.prototype.indexOf.call(this, val, byteOffset)\n  }\n  if (Buffer.isBuffer(val)) {\n    return arrayIndexOf(this, val, byteOffset)\n  }\n  if (typeof val === 'number') {\n    if (Buffer.TYPED_ARRAY_SUPPORT && Uint8Array.prototype.indexOf === 'function') {\n      return Uint8Array.prototype.indexOf.call(this, val, byteOffset)\n    }\n    return arrayIndexOf(this, [ val ], byteOffset)\n  }\n\n  function arrayIndexOf (arr, val, byteOffset) {\n    var foundIndex = -1\n    for (var i = 0; byteOffset + i < arr.length; i++) {\n      if (arr[byteOffset + i] === val[foundIndex === -1 ? 0 : i - foundIndex]) {\n        if (foundIndex === -1) foundIndex = i\n        if (i - foundIndex + 1 === val.length) return byteOffset + foundIndex\n      } else {\n        foundIndex = -1\n      }\n    }\n    return -1\n  }\n\n  throw new TypeError('val must be string, number or Buffer')\n}\n\n// `get` is deprecated\nBuffer.prototype.get = function get (offset) {\n  console.log('.get() is deprecated. Access using array indexes instead.')\n  return this.readUInt8(offset)\n}\n\n// `set` is deprecated\nBuffer.prototype.set = function set (v, offset) {\n  console.log('.set() is deprecated. Access using array indexes instead.')\n  return this.writeUInt8(v, offset)\n}\n\nfunction hexWrite (buf, string, offset, length) {\n  offset = Number(offset) || 0\n  var remaining = buf.length - offset\n  if (!length) {\n    length = remaining\n  } else {\n    length = Number(length)\n    if (length > remaining) {\n      length = remaining\n    }\n  }\n\n  // must be an even number of digits\n  var strLen = string.length\n  if (strLen % 2 !== 0) throw new Error('Invalid hex string')\n\n  if (length > strLen / 2) {\n    length = strLen / 2\n  }\n  for (var i = 0; i < length; i++) {\n    var parsed = parseInt(string.substr(i * 2, 2), 16)\n    if (isNaN(parsed)) throw new Error('Invalid hex string')\n    buf[offset + i] = parsed\n  }\n  return i\n}\n\nfunction utf8Write (buf, string, offset, length) {\n  return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length)\n}\n\nfunction asciiWrite (buf, string, offset, length) {\n  return blitBuffer(asciiToBytes(string), buf, offset, length)\n}\n\nfunction binaryWrite (buf, string, offset, length) {\n  return asciiWrite(buf, string, offset, length)\n}\n\nfunction base64Write (buf, string, offset, length) {\n  return blitBuffer(base64ToBytes(string), buf, offset, length)\n}\n\nfunction ucs2Write (buf, string, offset, length) {\n  return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length)\n}\n\nBuffer.prototype.write = function write (string, offset, length, encoding) {\n  // Buffer#write(string)\n  if (offset === undefined) {\n    encoding = 'utf8'\n    length = this.length\n    offset = 0\n  // Buffer#write(string, encoding)\n  } else if (length === undefined && typeof offset === 'string') {\n    encoding = offset\n    length = this.length\n    offset = 0\n  // Buffer#write(string, offset[, length][, encoding])\n  } else if (isFinite(offset)) {\n    offset = offset | 0\n    if (isFinite(length)) {\n      length = length | 0\n      if (encoding === undefined) encoding = 'utf8'\n    } else {\n      encoding = length\n      length = undefined\n    }\n  // legacy write(string, encoding, offset, length) - remove in v0.13\n  } else {\n    var swap = encoding\n    encoding = offset\n    offset = length | 0\n    length = swap\n  }\n\n  var remaining = this.length - offset\n  if (length === undefined || length > remaining) length = remaining\n\n  if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) {\n    throw new RangeError('attempt to write outside buffer bounds')\n  }\n\n  if (!encoding) encoding = 'utf8'\n\n  var loweredCase = false\n  for (;;) {\n    switch (encoding) {\n      case 'hex':\n        return hexWrite(this, string, offset, length)\n\n      case 'utf8':\n      case 'utf-8':\n        return utf8Write(this, string, offset, length)\n\n      case 'ascii':\n        return asciiWrite(this, string, offset, length)\n\n      case 'binary':\n        return binaryWrite(this, string, offset, length)\n\n      case 'base64':\n        // Warning: maxLength not taken into account in base64Write\n        return base64Write(this, string, offset, length)\n\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return ucs2Write(this, string, offset, length)\n\n      default:\n        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)\n        encoding = ('' + encoding).toLowerCase()\n        loweredCase = true\n    }\n  }\n}\n\nBuffer.prototype.toJSON = function toJSON () {\n  return {\n    type: 'Buffer',\n    data: Array.prototype.slice.call(this._arr || this, 0)\n  }\n}\n\nfunction base64Slice (buf, start, end) {\n  if (start === 0 && end === buf.length) {\n    return base64.fromByteArray(buf)\n  } else {\n    return base64.fromByteArray(buf.slice(start, end))\n  }\n}\n\nfunction utf8Slice (buf, start, end) {\n  end = Math.min(buf.length, end)\n  var res = []\n\n  var i = start\n  while (i < end) {\n    var firstByte = buf[i]\n    var codePoint = null\n    var bytesPerSequence = (firstByte > 0xEF) ? 4\n      : (firstByte > 0xDF) ? 3\n      : (firstByte > 0xBF) ? 2\n      : 1\n\n    if (i + bytesPerSequence <= end) {\n      var secondByte, thirdByte, fourthByte, tempCodePoint\n\n      switch (bytesPerSequence) {\n        case 1:\n          if (firstByte < 0x80) {\n            codePoint = firstByte\n          }\n          break\n        case 2:\n          secondByte = buf[i + 1]\n          if ((secondByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F)\n            if (tempCodePoint > 0x7F) {\n              codePoint = tempCodePoint\n            }\n          }\n          break\n        case 3:\n          secondByte = buf[i + 1]\n          thirdByte = buf[i + 2]\n          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F)\n            if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) {\n              codePoint = tempCodePoint\n            }\n          }\n          break\n        case 4:\n          secondByte = buf[i + 1]\n          thirdByte = buf[i + 2]\n          fourthByte = buf[i + 3]\n          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F)\n            if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) {\n              codePoint = tempCodePoint\n            }\n          }\n      }\n    }\n\n    if (codePoint === null) {\n      // we did not generate a valid codePoint so insert a\n      // replacement char (U+FFFD) and advance only 1 byte\n      codePoint = 0xFFFD\n      bytesPerSequence = 1\n    } else if (codePoint > 0xFFFF) {\n      // encode to utf16 (surrogate pair dance)\n      codePoint -= 0x10000\n      res.push(codePoint >>> 10 & 0x3FF | 0xD800)\n      codePoint = 0xDC00 | codePoint & 0x3FF\n    }\n\n    res.push(codePoint)\n    i += bytesPerSequence\n  }\n\n  return decodeCodePointsArray(res)\n}\n\n// Based on http://stackoverflow.com/a/22747272/680742, the browser with\n// the lowest limit is Chrome, with 0x10000 args.\n// We go 1 magnitude less, for safety\nvar MAX_ARGUMENTS_LENGTH = 0x1000\n\nfunction decodeCodePointsArray (codePoints) {\n  var len = codePoints.length\n  if (len <= MAX_ARGUMENTS_LENGTH) {\n    return String.fromCharCode.apply(String, codePoints) // avoid extra slice()\n  }\n\n  // Decode in chunks to avoid \"call stack size exceeded\".\n  var res = ''\n  var i = 0\n  while (i < len) {\n    res += String.fromCharCode.apply(\n      String,\n      codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH)\n    )\n  }\n  return res\n}\n\nfunction asciiSlice (buf, start, end) {\n  var ret = ''\n  end = Math.min(buf.length, end)\n\n  for (var i = start; i < end; i++) {\n    ret += String.fromCharCode(buf[i] & 0x7F)\n  }\n  return ret\n}\n\nfunction binarySlice (buf, start, end) {\n  var ret = ''\n  end = Math.min(buf.length, end)\n\n  for (var i = start; i < end; i++) {\n    ret += String.fromCharCode(buf[i])\n  }\n  return ret\n}\n\nfunction hexSlice (buf, start, end) {\n  var len = buf.length\n\n  if (!start || start < 0) start = 0\n  if (!end || end < 0 || end > len) end = len\n\n  var out = ''\n  for (var i = start; i < end; i++) {\n    out += toHex(buf[i])\n  }\n  return out\n}\n\nfunction utf16leSlice (buf, start, end) {\n  var bytes = buf.slice(start, end)\n  var res = ''\n  for (var i = 0; i < bytes.length; i += 2) {\n    res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256)\n  }\n  return res\n}\n\nBuffer.prototype.slice = function slice (start, end) {\n  var len = this.length\n  start = ~~start\n  end = end === undefined ? len : ~~end\n\n  if (start < 0) {\n    start += len\n    if (start < 0) start = 0\n  } else if (start > len) {\n    start = len\n  }\n\n  if (end < 0) {\n    end += len\n    if (end < 0) end = 0\n  } else if (end > len) {\n    end = len\n  }\n\n  if (end < start) end = start\n\n  var newBuf\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    newBuf = Buffer._augment(this.subarray(start, end))\n  } else {\n    var sliceLen = end - start\n    newBuf = new Buffer(sliceLen, undefined)\n    for (var i = 0; i < sliceLen; i++) {\n      newBuf[i] = this[i + start]\n    }\n  }\n\n  if (newBuf.length) newBuf.parent = this.parent || this\n\n  return newBuf\n}\n\n/*\n * Need to make sure that buffer isn't trying to write out of bounds.\n */\nfunction checkOffset (offset, ext, length) {\n  if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint')\n  if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length')\n}\n\nBuffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var val = this[offset]\n  var mul = 1\n  var i = 0\n  while (++i < byteLength && (mul *= 0x100)) {\n    val += this[offset + i] * mul\n  }\n\n  return val\n}\n\nBuffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) {\n    checkOffset(offset, byteLength, this.length)\n  }\n\n  var val = this[offset + --byteLength]\n  var mul = 1\n  while (byteLength > 0 && (mul *= 0x100)) {\n    val += this[offset + --byteLength] * mul\n  }\n\n  return val\n}\n\nBuffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 1, this.length)\n  return this[offset]\n}\n\nBuffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  return this[offset] | (this[offset + 1] << 8)\n}\n\nBuffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  return (this[offset] << 8) | this[offset + 1]\n}\n\nBuffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return ((this[offset]) |\n      (this[offset + 1] << 8) |\n      (this[offset + 2] << 16)) +\n      (this[offset + 3] * 0x1000000)\n}\n\nBuffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset] * 0x1000000) +\n    ((this[offset + 1] << 16) |\n    (this[offset + 2] << 8) |\n    this[offset + 3])\n}\n\nBuffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var val = this[offset]\n  var mul = 1\n  var i = 0\n  while (++i < byteLength && (mul *= 0x100)) {\n    val += this[offset + i] * mul\n  }\n  mul *= 0x80\n\n  if (val >= mul) val -= Math.pow(2, 8 * byteLength)\n\n  return val\n}\n\nBuffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var i = byteLength\n  var mul = 1\n  var val = this[offset + --i]\n  while (i > 0 && (mul *= 0x100)) {\n    val += this[offset + --i] * mul\n  }\n  mul *= 0x80\n\n  if (val >= mul) val -= Math.pow(2, 8 * byteLength)\n\n  return val\n}\n\nBuffer.prototype.readInt8 = function readInt8 (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 1, this.length)\n  if (!(this[offset] & 0x80)) return (this[offset])\n  return ((0xff - this[offset] + 1) * -1)\n}\n\nBuffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  var val = this[offset] | (this[offset + 1] << 8)\n  return (val & 0x8000) ? val | 0xFFFF0000 : val\n}\n\nBuffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  var val = this[offset + 1] | (this[offset] << 8)\n  return (val & 0x8000) ? val | 0xFFFF0000 : val\n}\n\nBuffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset]) |\n    (this[offset + 1] << 8) |\n    (this[offset + 2] << 16) |\n    (this[offset + 3] << 24)\n}\n\nBuffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset] << 24) |\n    (this[offset + 1] << 16) |\n    (this[offset + 2] << 8) |\n    (this[offset + 3])\n}\n\nBuffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n  return ieee754.read(this, offset, true, 23, 4)\n}\n\nBuffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n  return ieee754.read(this, offset, false, 23, 4)\n}\n\nBuffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 8, this.length)\n  return ieee754.read(this, offset, true, 52, 8)\n}\n\nBuffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 8, this.length)\n  return ieee754.read(this, offset, false, 52, 8)\n}\n\nfunction checkInt (buf, value, offset, ext, max, min) {\n  if (!Buffer.isBuffer(buf)) throw new TypeError('buffer must be a Buffer instance')\n  if (value > max || value < min) throw new RangeError('value is out of bounds')\n  if (offset + ext > buf.length) throw new RangeError('index out of range')\n}\n\nBuffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)\n\n  var mul = 1\n  var i = 0\n  this[offset] = value & 0xFF\n  while (++i < byteLength && (mul *= 0x100)) {\n    this[offset + i] = (value / mul) & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)\n\n  var i = byteLength - 1\n  var mul = 1\n  this[offset + i] = value & 0xFF\n  while (--i >= 0 && (mul *= 0x100)) {\n    this[offset + i] = (value / mul) & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)\n  this[offset] = value\n  return offset + 1\n}\n\nfunction objectWriteUInt16 (buf, value, offset, littleEndian) {\n  if (value < 0) value = 0xffff + value + 1\n  for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {\n    buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>\n      (littleEndian ? i : 1 - i) * 8\n  }\n}\n\nBuffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n  } else {\n    objectWriteUInt16(this, value, offset, true)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 8)\n    this[offset + 1] = value\n  } else {\n    objectWriteUInt16(this, value, offset, false)\n  }\n  return offset + 2\n}\n\nfunction objectWriteUInt32 (buf, value, offset, littleEndian) {\n  if (value < 0) value = 0xffffffff + value + 1\n  for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {\n    buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff\n  }\n}\n\nBuffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset + 3] = (value >>> 24)\n    this[offset + 2] = (value >>> 16)\n    this[offset + 1] = (value >>> 8)\n    this[offset] = value\n  } else {\n    objectWriteUInt32(this, value, offset, true)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 24)\n    this[offset + 1] = (value >>> 16)\n    this[offset + 2] = (value >>> 8)\n    this[offset + 3] = value\n  } else {\n    objectWriteUInt32(this, value, offset, false)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) {\n    var limit = Math.pow(2, 8 * byteLength - 1)\n\n    checkInt(this, value, offset, byteLength, limit - 1, -limit)\n  }\n\n  var i = 0\n  var mul = 1\n  var sub = value < 0 ? 1 : 0\n  this[offset] = value & 0xFF\n  while (++i < byteLength && (mul *= 0x100)) {\n    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) {\n    var limit = Math.pow(2, 8 * byteLength - 1)\n\n    checkInt(this, value, offset, byteLength, limit - 1, -limit)\n  }\n\n  var i = byteLength - 1\n  var mul = 1\n  var sub = value < 0 ? 1 : 0\n  this[offset + i] = value & 0xFF\n  while (--i >= 0 && (mul *= 0x100)) {\n    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)\n  if (value < 0) value = 0xff + value + 1\n  this[offset] = value\n  return offset + 1\n}\n\nBuffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n  } else {\n    objectWriteUInt16(this, value, offset, true)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 8)\n    this[offset + 1] = value\n  } else {\n    objectWriteUInt16(this, value, offset, false)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n    this[offset + 2] = (value >>> 16)\n    this[offset + 3] = (value >>> 24)\n  } else {\n    objectWriteUInt32(this, value, offset, true)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)\n  if (value < 0) value = 0xffffffff + value + 1\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 24)\n    this[offset + 1] = (value >>> 16)\n    this[offset + 2] = (value >>> 8)\n    this[offset + 3] = value\n  } else {\n    objectWriteUInt32(this, value, offset, false)\n  }\n  return offset + 4\n}\n\nfunction checkIEEE754 (buf, value, offset, ext, max, min) {\n  if (value > max || value < min) throw new RangeError('value is out of bounds')\n  if (offset + ext > buf.length) throw new RangeError('index out of range')\n  if (offset < 0) throw new RangeError('index out of range')\n}\n\nfunction writeFloat (buf, value, offset, littleEndian, noAssert) {\n  if (!noAssert) {\n    checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38)\n  }\n  ieee754.write(buf, value, offset, littleEndian, 23, 4)\n  return offset + 4\n}\n\nBuffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) {\n  return writeFloat(this, value, offset, true, noAssert)\n}\n\nBuffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) {\n  return writeFloat(this, value, offset, false, noAssert)\n}\n\nfunction writeDouble (buf, value, offset, littleEndian, noAssert) {\n  if (!noAssert) {\n    checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308)\n  }\n  ieee754.write(buf, value, offset, littleEndian, 52, 8)\n  return offset + 8\n}\n\nBuffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) {\n  return writeDouble(this, value, offset, true, noAssert)\n}\n\nBuffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) {\n  return writeDouble(this, value, offset, false, noAssert)\n}\n\n// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)\nBuffer.prototype.copy = function copy (target, targetStart, start, end) {\n  if (!start) start = 0\n  if (!end && end !== 0) end = this.length\n  if (targetStart >= target.length) targetStart = target.length\n  if (!targetStart) targetStart = 0\n  if (end > 0 && end < start) end = start\n\n  // Copy 0 bytes; we're done\n  if (end === start) return 0\n  if (target.length === 0 || this.length === 0) return 0\n\n  // Fatal error conditions\n  if (targetStart < 0) {\n    throw new RangeError('targetStart out of bounds')\n  }\n  if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds')\n  if (end < 0) throw new RangeError('sourceEnd out of bounds')\n\n  // Are we oob?\n  if (end > this.length) end = this.length\n  if (target.length - targetStart < end - start) {\n    end = target.length - targetStart + start\n  }\n\n  var len = end - start\n  var i\n\n  if (this === target && start < targetStart && targetStart < end) {\n    // descending copy from end\n    for (i = len - 1; i >= 0; i--) {\n      target[i + targetStart] = this[i + start]\n    }\n  } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {\n    // ascending copy from start\n    for (i = 0; i < len; i++) {\n      target[i + targetStart] = this[i + start]\n    }\n  } else {\n    target._set(this.subarray(start, start + len), targetStart)\n  }\n\n  return len\n}\n\n// fill(value, start=0, end=buffer.length)\nBuffer.prototype.fill = function fill (value, start, end) {\n  if (!value) value = 0\n  if (!start) start = 0\n  if (!end) end = this.length\n\n  if (end < start) throw new RangeError('end < start')\n\n  // Fill 0 bytes; we're done\n  if (end === start) return\n  if (this.length === 0) return\n\n  if (start < 0 || start >= this.length) throw new RangeError('start out of bounds')\n  if (end < 0 || end > this.length) throw new RangeError('end out of bounds')\n\n  var i\n  if (typeof value === 'number') {\n    for (i = start; i < end; i++) {\n      this[i] = value\n    }\n  } else {\n    var bytes = utf8ToBytes(value.toString())\n    var len = bytes.length\n    for (i = start; i < end; i++) {\n      this[i] = bytes[i % len]\n    }\n  }\n\n  return this\n}\n\n/**\n * Creates a new `ArrayBuffer` with the *copied* memory of the buffer instance.\n * Added in Node 0.12. Only available in browsers that support ArrayBuffer.\n */\nBuffer.prototype.toArrayBuffer = function toArrayBuffer () {\n  if (typeof Uint8Array !== 'undefined') {\n    if (Buffer.TYPED_ARRAY_SUPPORT) {\n      return (new Buffer(this)).buffer\n    } else {\n      var buf = new Uint8Array(this.length)\n      for (var i = 0, len = buf.length; i < len; i += 1) {\n        buf[i] = this[i]\n      }\n      return buf.buffer\n    }\n  } else {\n    throw new TypeError('Buffer.toArrayBuffer not supported in this browser')\n  }\n}\n\n// HELPER FUNCTIONS\n// ================\n\nvar BP = Buffer.prototype\n\n/**\n * Augment a Uint8Array *instance* (not the Uint8Array class!) with Buffer methods\n */\nBuffer._augment = function _augment (arr) {\n  arr.constructor = Buffer\n  arr._isBuffer = true\n\n  // save reference to original Uint8Array set method before overwriting\n  arr._set = arr.set\n\n  // deprecated\n  arr.get = BP.get\n  arr.set = BP.set\n\n  arr.write = BP.write\n  arr.toString = BP.toString\n  arr.toLocaleString = BP.toString\n  arr.toJSON = BP.toJSON\n  arr.equals = BP.equals\n  arr.compare = BP.compare\n  arr.indexOf = BP.indexOf\n  arr.copy = BP.copy\n  arr.slice = BP.slice\n  arr.readUIntLE = BP.readUIntLE\n  arr.readUIntBE = BP.readUIntBE\n  arr.readUInt8 = BP.readUInt8\n  arr.readUInt16LE = BP.readUInt16LE\n  arr.readUInt16BE = BP.readUInt16BE\n  arr.readUInt32LE = BP.readUInt32LE\n  arr.readUInt32BE = BP.readUInt32BE\n  arr.readIntLE = BP.readIntLE\n  arr.readIntBE = BP.readIntBE\n  arr.readInt8 = BP.readInt8\n  arr.readInt16LE = BP.readInt16LE\n  arr.readInt16BE = BP.readInt16BE\n  arr.readInt32LE = BP.readInt32LE\n  arr.readInt32BE = BP.readInt32BE\n  arr.readFloatLE = BP.readFloatLE\n  arr.readFloatBE = BP.readFloatBE\n  arr.readDoubleLE = BP.readDoubleLE\n  arr.readDoubleBE = BP.readDoubleBE\n  arr.writeUInt8 = BP.writeUInt8\n  arr.writeUIntLE = BP.writeUIntLE\n  arr.writeUIntBE = BP.writeUIntBE\n  arr.writeUInt16LE = BP.writeUInt16LE\n  arr.writeUInt16BE = BP.writeUInt16BE\n  arr.writeUInt32LE = BP.writeUInt32LE\n  arr.writeUInt32BE = BP.writeUInt32BE\n  arr.writeIntLE = BP.writeIntLE\n  arr.writeIntBE = BP.writeIntBE\n  arr.writeInt8 = BP.writeInt8\n  arr.writeInt16LE = BP.writeInt16LE\n  arr.writeInt16BE = BP.writeInt16BE\n  arr.writeInt32LE = BP.writeInt32LE\n  arr.writeInt32BE = BP.writeInt32BE\n  arr.writeFloatLE = BP.writeFloatLE\n  arr.writeFloatBE = BP.writeFloatBE\n  arr.writeDoubleLE = BP.writeDoubleLE\n  arr.writeDoubleBE = BP.writeDoubleBE\n  arr.fill = BP.fill\n  arr.inspect = BP.inspect\n  arr.toArrayBuffer = BP.toArrayBuffer\n\n  return arr\n}\n\nvar INVALID_BASE64_RE = /[^+\\/0-9A-Za-z-_]/g\n\nfunction base64clean (str) {\n  // Node strips out invalid characters like \\n and \\t from the string, base64-js does not\n  str = stringtrim(str).replace(INVALID_BASE64_RE, '')\n  // Node converts strings with length < 2 to ''\n  if (str.length < 2) return ''\n  // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not\n  while (str.length % 4 !== 0) {\n    str = str + '='\n  }\n  return str\n}\n\nfunction stringtrim (str) {\n  if (str.trim) return str.trim()\n  return str.replace(/^\\s+|\\s+$/g, '')\n}\n\nfunction toHex (n) {\n  if (n < 16) return '0' + n.toString(16)\n  return n.toString(16)\n}\n\nfunction utf8ToBytes (string, units) {\n  units = units || Infinity\n  var codePoint\n  var length = string.length\n  var leadSurrogate = null\n  var bytes = []\n\n  for (var i = 0; i < length; i++) {\n    codePoint = string.charCodeAt(i)\n\n    // is surrogate component\n    if (codePoint > 0xD7FF && codePoint < 0xE000) {\n      // last char was a lead\n      if (!leadSurrogate) {\n        // no lead yet\n        if (codePoint > 0xDBFF) {\n          // unexpected trail\n          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n          continue\n        } else if (i + 1 === length) {\n          // unpaired lead\n          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n          continue\n        }\n\n        // valid lead\n        leadSurrogate = codePoint\n\n        continue\n      }\n\n      // 2 leads in a row\n      if (codePoint < 0xDC00) {\n        if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n        leadSurrogate = codePoint\n        continue\n      }\n\n      // valid surrogate pair\n      codePoint = leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00 | 0x10000\n    } else if (leadSurrogate) {\n      // valid bmp char, but last char was a lead\n      if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n    }\n\n    leadSurrogate = null\n\n    // encode utf8\n    if (codePoint < 0x80) {\n      if ((units -= 1) < 0) break\n      bytes.push(codePoint)\n    } else if (codePoint < 0x800) {\n      if ((units -= 2) < 0) break\n      bytes.push(\n        codePoint >> 0x6 | 0xC0,\n        codePoint & 0x3F | 0x80\n      )\n    } else if (codePoint < 0x10000) {\n      if ((units -= 3) < 0) break\n      bytes.push(\n        codePoint >> 0xC | 0xE0,\n        codePoint >> 0x6 & 0x3F | 0x80,\n        codePoint & 0x3F | 0x80\n      )\n    } else if (codePoint < 0x110000) {\n      if ((units -= 4) < 0) break\n      bytes.push(\n        codePoint >> 0x12 | 0xF0,\n        codePoint >> 0xC & 0x3F | 0x80,\n        codePoint >> 0x6 & 0x3F | 0x80,\n        codePoint & 0x3F | 0x80\n      )\n    } else {\n      throw new Error('Invalid code point')\n    }\n  }\n\n  return bytes\n}\n\nfunction asciiToBytes (str) {\n  var byteArray = []\n  for (var i = 0; i < str.length; i++) {\n    // Node's code seems to be doing this and not & 0x7F..\n    byteArray.push(str.charCodeAt(i) & 0xFF)\n  }\n  return byteArray\n}\n\nfunction utf16leToBytes (str, units) {\n  var c, hi, lo\n  var byteArray = []\n  for (var i = 0; i < str.length; i++) {\n    if ((units -= 2) < 0) break\n\n    c = str.charCodeAt(i)\n    hi = c >> 8\n    lo = c % 256\n    byteArray.push(lo)\n    byteArray.push(hi)\n  }\n\n  return byteArray\n}\n\nfunction base64ToBytes (str) {\n  return base64.toByteArray(base64clean(str))\n}\n\nfunction blitBuffer (src, dst, offset, length) {\n  for (var i = 0; i < length; i++) {\n    if ((i + offset >= dst.length) || (i >= src.length)) break\n    dst[i + offset] = src[i]\n  }\n  return i\n}\n","var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\n\n;(function (exports) {\n\t'use strict';\n\n  var Arr = (typeof Uint8Array !== 'undefined')\n    ? Uint8Array\n    : Array\n\n\tvar PLUS   = '+'.charCodeAt(0)\n\tvar SLASH  = '/'.charCodeAt(0)\n\tvar NUMBER = '0'.charCodeAt(0)\n\tvar LOWER  = 'a'.charCodeAt(0)\n\tvar UPPER  = 'A'.charCodeAt(0)\n\tvar PLUS_URL_SAFE = '-'.charCodeAt(0)\n\tvar SLASH_URL_SAFE = '_'.charCodeAt(0)\n\n\tfunction decode (elt) {\n\t\tvar code = elt.charCodeAt(0)\n\t\tif (code === PLUS ||\n\t\t    code === PLUS_URL_SAFE)\n\t\t\treturn 62 // '+'\n\t\tif (code === SLASH ||\n\t\t    code === SLASH_URL_SAFE)\n\t\t\treturn 63 // '/'\n\t\tif (code < NUMBER)\n\t\t\treturn -1 //no match\n\t\tif (code < NUMBER + 10)\n\t\t\treturn code - NUMBER + 26 + 26\n\t\tif (code < UPPER + 26)\n\t\t\treturn code - UPPER\n\t\tif (code < LOWER + 26)\n\t\t\treturn code - LOWER + 26\n\t}\n\n\tfunction b64ToByteArray (b64) {\n\t\tvar i, j, l, tmp, placeHolders, arr\n\n\t\tif (b64.length % 4 > 0) {\n\t\t\tthrow new Error('Invalid string. Length must be a multiple of 4')\n\t\t}\n\n\t\t// the number of equal signs (place holders)\n\t\t// if there are two placeholders, than the two characters before it\n\t\t// represent one byte\n\t\t// if there is only one, then the three characters before it represent 2 bytes\n\t\t// this is just a cheap hack to not do indexOf twice\n\t\tvar len = b64.length\n\t\tplaceHolders = '=' === b64.charAt(len - 2) ? 2 : '=' === b64.charAt(len - 1) ? 1 : 0\n\n\t\t// base64 is 4/3 + up to two characters of the original data\n\t\tarr = new Arr(b64.length * 3 / 4 - placeHolders)\n\n\t\t// if there are placeholders, only get up to the last complete 4 chars\n\t\tl = placeHolders > 0 ? b64.length - 4 : b64.length\n\n\t\tvar L = 0\n\n\t\tfunction push (v) {\n\t\t\tarr[L++] = v\n\t\t}\n\n\t\tfor (i = 0, j = 0; i < l; i += 4, j += 3) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 18) | (decode(b64.charAt(i + 1)) << 12) | (decode(b64.charAt(i + 2)) << 6) | decode(b64.charAt(i + 3))\n\t\t\tpush((tmp & 0xFF0000) >> 16)\n\t\t\tpush((tmp & 0xFF00) >> 8)\n\t\t\tpush(tmp & 0xFF)\n\t\t}\n\n\t\tif (placeHolders === 2) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 2) | (decode(b64.charAt(i + 1)) >> 4)\n\t\t\tpush(tmp & 0xFF)\n\t\t} else if (placeHolders === 1) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 10) | (decode(b64.charAt(i + 1)) << 4) | (decode(b64.charAt(i + 2)) >> 2)\n\t\t\tpush((tmp >> 8) & 0xFF)\n\t\t\tpush(tmp & 0xFF)\n\t\t}\n\n\t\treturn arr\n\t}\n\n\tfunction uint8ToBase64 (uint8) {\n\t\tvar i,\n\t\t\textraBytes = uint8.length % 3, // if we have 1 byte left, pad 2 bytes\n\t\t\toutput = \"\",\n\t\t\ttemp, length\n\n\t\tfunction encode (num) {\n\t\t\treturn lookup.charAt(num)\n\t\t}\n\n\t\tfunction tripletToBase64 (num) {\n\t\t\treturn encode(num >> 18 & 0x3F) + encode(num >> 12 & 0x3F) + encode(num >> 6 & 0x3F) + encode(num & 0x3F)\n\t\t}\n\n\t\t// go through the array every three bytes, we'll deal with trailing stuff later\n\t\tfor (i = 0, length = uint8.length - extraBytes; i < length; i += 3) {\n\t\t\ttemp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2])\n\t\t\toutput += tripletToBase64(temp)\n\t\t}\n\n\t\t// pad the end with zeros, but make sure to not forget the extra bytes\n\t\tswitch (extraBytes) {\n\t\t\tcase 1:\n\t\t\t\ttemp = uint8[uint8.length - 1]\n\t\t\t\toutput += encode(temp >> 2)\n\t\t\t\toutput += encode((temp << 4) & 0x3F)\n\t\t\t\toutput += '=='\n\t\t\t\tbreak\n\t\t\tcase 2:\n\t\t\t\ttemp = (uint8[uint8.length - 2] << 8) + (uint8[uint8.length - 1])\n\t\t\t\toutput += encode(temp >> 10)\n\t\t\t\toutput += encode((temp >> 4) & 0x3F)\n\t\t\t\toutput += encode((temp << 2) & 0x3F)\n\t\t\t\toutput += '='\n\t\t\t\tbreak\n\t\t}\n\n\t\treturn output\n\t}\n\n\texports.toByteArray = b64ToByteArray\n\texports.fromByteArray = uint8ToBase64\n}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))\n","exports.read = function (buffer, offset, isLE, mLen, nBytes) {\n  var e, m\n  var eLen = nBytes * 8 - mLen - 1\n  var eMax = (1 << eLen) - 1\n  var eBias = eMax >> 1\n  var nBits = -7\n  var i = isLE ? (nBytes - 1) : 0\n  var d = isLE ? -1 : 1\n  var s = buffer[offset + i]\n\n  i += d\n\n  e = s & ((1 << (-nBits)) - 1)\n  s >>= (-nBits)\n  nBits += eLen\n  for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}\n\n  m = e & ((1 << (-nBits)) - 1)\n  e >>= (-nBits)\n  nBits += mLen\n  for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}\n\n  if (e === 0) {\n    e = 1 - eBias\n  } else if (e === eMax) {\n    return m ? NaN : ((s ? -1 : 1) * Infinity)\n  } else {\n    m = m + Math.pow(2, mLen)\n    e = e - eBias\n  }\n  return (s ? -1 : 1) * m * Math.pow(2, e - mLen)\n}\n\nexports.write = function (buffer, value, offset, isLE, mLen, nBytes) {\n  var e, m, c\n  var eLen = nBytes * 8 - mLen - 1\n  var eMax = (1 << eLen) - 1\n  var eBias = eMax >> 1\n  var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)\n  var i = isLE ? 0 : (nBytes - 1)\n  var d = isLE ? 1 : -1\n  var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0\n\n  value = Math.abs(value)\n\n  if (isNaN(value) || value === Infinity) {\n    m = isNaN(value) ? 1 : 0\n    e = eMax\n  } else {\n    e = Math.floor(Math.log(value) / Math.LN2)\n    if (value * (c = Math.pow(2, -e)) < 1) {\n      e--\n      c *= 2\n    }\n    if (e + eBias >= 1) {\n      value += rt / c\n    } else {\n      value += rt * Math.pow(2, 1 - eBias)\n    }\n    if (value * c >= 2) {\n      e++\n      c /= 2\n    }\n\n    if (e + eBias >= eMax) {\n      m = 0\n      e = eMax\n    } else if (e + eBias >= 1) {\n      m = (value * c - 1) * Math.pow(2, mLen)\n      e = e + eBias\n    } else {\n      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)\n      e = 0\n    }\n  }\n\n  for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {}\n\n  e = (e << mLen) | m\n  eLen += mLen\n  for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {}\n\n  buffer[offset + i - d] |= s * 128\n}\n","\n/**\n * isArray\n */\n\nvar isArray = Array.isArray;\n\n/**\n * toString\n */\n\nvar str = Object.prototype.toString;\n\n/**\n * Whether or not the given `val`\n * is an array.\n *\n * example:\n *\n *        isArray([]);\n *        // > true\n *        isArray(arguments);\n *        // > false\n *        isArray('');\n *        // > false\n *\n * @param {mixed} val\n * @return {bool}\n */\n\nmodule.exports = isArray || function (val) {\n  return !! val && '[object Array]' == str.call(val);\n};\n","/* jshint node: true */\n(function () {\n    \"use strict\";\n\n    function CookieAccessInfo(domain, path, secure, script) {\n        if (this instanceof CookieAccessInfo) {\n            this.domain = domain || undefined;\n            this.path = path || \"/\";\n            this.secure = !!secure;\n            this.script = !!script;\n            return this;\n        }\n        return new CookieAccessInfo(domain, path, secure, script);\n    }\n    exports.CookieAccessInfo = CookieAccessInfo;\n\n    function Cookie(cookiestr, request_domain, request_path) {\n        if (cookiestr instanceof Cookie) {\n            return cookiestr;\n        }\n        if (this instanceof Cookie) {\n            this.name = null;\n            this.value = null;\n            this.expiration_date = Infinity;\n            this.path = String(request_path || \"/\");\n            this.explicit_path = false;\n            this.domain = request_domain || null;\n            this.explicit_domain = false;\n            this.secure = false; //how to define default?\n            this.noscript = false; //httponly\n            if (cookiestr) {\n                this.parse(cookiestr, request_domain, request_path);\n            }\n            return this;\n        }\n        return new Cookie(cookiestr, request_domain, request_path);\n    }\n    exports.Cookie = Cookie;\n\n    Cookie.prototype.toString = function toString() {\n        var str = [this.name + \"=\" + this.value];\n        if (this.expiration_date !== Infinity) {\n            str.push(\"expires=\" + (new Date(this.expiration_date)).toGMTString());\n        }\n        if (this.domain) {\n            str.push(\"domain=\" + this.domain);\n        }\n        if (this.path) {\n            str.push(\"path=\" + this.path);\n        }\n        if (this.secure) {\n            str.push(\"secure\");\n        }\n        if (this.noscript) {\n            str.push(\"httponly\");\n        }\n        return str.join(\"; \");\n    };\n\n    Cookie.prototype.toValueString = function toValueString() {\n        return this.name + \"=\" + this.value;\n    };\n\n    var cookie_str_splitter = /[:](?=\\s*[a-zA-Z0-9_\\-]+\\s*[=])/g;\n    Cookie.prototype.parse = function parse(str, request_domain, request_path) {\n        if (this instanceof Cookie) {\n            var parts = str.split(\";\").filter(function (value) {\n                    return !!value;\n                }),\n                pair = parts[0].match(/([^=]+)=([\\s\\S]*)/),\n                key = pair[1],\n                value = pair[2],\n                i;\n            this.name = key;\n            this.value = value;\n\n            for (i = 1; i < parts.length; i += 1) {\n                pair = parts[i].match(/([^=]+)(?:=([\\s\\S]*))?/);\n                key = pair[1].trim().toLowerCase();\n                value = pair[2];\n                switch (key) {\n                case \"httponly\":\n                    this.noscript = true;\n                    break;\n                case \"expires\":\n                    this.expiration_date = value ?\n                            Number(Date.parse(value)) :\n                            Infinity;\n                    break;\n                case \"path\":\n                    this.path = value ?\n                            value.trim() :\n                            \"\";\n                    this.explicit_path = true;\n                    break;\n                case \"domain\":\n                    this.domain = value ?\n                            value.trim() :\n                            \"\";\n                    this.explicit_domain = !!this.domain;\n                    break;\n                case \"secure\":\n                    this.secure = true;\n                    break;\n                }\n            }\n\n            if (!this.explicit_path) {\n               this.path = request_path || \"/\";\n            }\n            if (!this.explicit_domain) {\n               this.domain = request_domain;\n            }\n\n            return this;\n        }\n        return new Cookie().parse(str, request_domain, request_path);\n    };\n\n    Cookie.prototype.matches = function matches(access_info) {\n        if (this.noscript && access_info.script ||\n                this.secure && !access_info.secure ||\n                !this.collidesWith(access_info)) {\n            return false;\n        }\n        return true;\n    };\n\n    Cookie.prototype.collidesWith = function collidesWith(access_info) {\n        if ((this.path && !access_info.path) || (this.domain && !access_info.domain)) {\n            return false;\n        }\n        if (this.path && access_info.path.indexOf(this.path) !== 0) {\n            return false;\n        }\n        if (this.explicit_path && access_info.path.indexOf( this.path ) !== 0) {\n           return false;\n        }\n        var access_domain = access_info.domain && access_info.domain.replace(/^[\\.]/,'');\n        var cookie_domain = this.domain && this.domain.replace(/^[\\.]/,'');\n        if (cookie_domain === access_domain) {\n            return true;\n        }\n        if (cookie_domain) {\n            if (!this.explicit_domain) {\n                return false; // we already checked if the domains were exactly the same\n            }\n            var wildcard = access_domain.indexOf(cookie_domain);\n            if (wildcard === -1 || wildcard !== access_domain.length - cookie_domain.length) {\n                return false;\n            }\n            return true;\n        }\n        return true;\n    };\n\n    function CookieJar() {\n        var cookies, cookies_list, collidable_cookie;\n        if (this instanceof CookieJar) {\n            cookies = Object.create(null); //name: [Cookie]\n\n            this.setCookie = function setCookie(cookie, request_domain, request_path) {\n                var remove, i;\n                cookie = new Cookie(cookie, request_domain, request_path);\n                //Delete the cookie if the set is past the current time\n                remove = cookie.expiration_date <= Date.now();\n                if (cookies[cookie.name] !== undefined) {\n                    cookies_list = cookies[cookie.name];\n                    for (i = 0; i < cookies_list.length; i += 1) {\n                        collidable_cookie = cookies_list[i];\n                        if (collidable_cookie.collidesWith(cookie)) {\n                            if (remove) {\n                                cookies_list.splice(i, 1);\n                                if (cookies_list.length === 0) {\n                                    delete cookies[cookie.name];\n                                }\n                                return false;\n                            }\n                            cookies_list[i] = cookie;\n                            return cookie;\n                        }\n                    }\n                    if (remove) {\n                        return false;\n                    }\n                    cookies_list.push(cookie);\n                    return cookie;\n                }\n                if (remove) {\n                    return false;\n                }\n                cookies[cookie.name] = [cookie];\n                return cookies[cookie.name];\n            };\n            //returns a cookie\n            this.getCookie = function getCookie(cookie_name, access_info) {\n                var cookie, i;\n                cookies_list = cookies[cookie_name];\n                if (!cookies_list) {\n                    return;\n                }\n                for (i = 0; i < cookies_list.length; i += 1) {\n                    cookie = cookies_list[i];\n                    if (cookie.expiration_date <= Date.now()) {\n                        if (cookies_list.length === 0) {\n                            delete cookies[cookie.name];\n                        }\n                        continue;\n                    }\n\n                    if (cookie.matches(access_info)) {\n                        return cookie;\n                    }\n                }\n            };\n            //returns a list of cookies\n            this.getCookies = function getCookies(access_info) {\n                var matches = [], cookie_name, cookie;\n                for (cookie_name in cookies) {\n                    cookie = this.getCookie(cookie_name, access_info);\n                    if (cookie) {\n                        matches.push(cookie);\n                    }\n                }\n                matches.toString = function toString() {\n                    return matches.join(\":\");\n                };\n                matches.toValueString = function toValueString() {\n                    return matches.map(function (c) {\n                        return c.toValueString();\n                    }).join(';');\n                };\n                return matches;\n            };\n\n            return this;\n        }\n        return new CookieJar();\n    }\n    exports.CookieJar = CookieJar;\n\n    //returns list of cookies that were set correctly. Cookies that are expired and removed are not returned.\n    CookieJar.prototype.setCookies = function setCookies(cookies, request_domain, request_path) {\n        cookies = Array.isArray(cookies) ?\n                cookies :\n                cookies.split(cookie_str_splitter);\n        var successful = [],\n            i,\n            cookie;\n        cookies = cookies.map(function(item){\n            return new Cookie(item, request_domain, request_path);\n        });\n        for (i = 0; i < cookies.length; i += 1) {\n            cookie = cookies[i];\n            if (this.setCookie(cookie, request_domain, request_path)) {\n                successful.push(cookie);\n            }\n        }\n        return successful;\n    };\n}());\n","'use strict';\n\n\nvar yaml = require('./lib/js-yaml.js');\n\n\nmodule.exports = yaml;\n","'use strict';\n\n\nvar loader = require('./js-yaml/loader');\nvar dumper = require('./js-yaml/dumper');\n\n\nfunction deprecated(name) {\n  return function () {\n    throw new Error('Function ' + name + ' is deprecated and cannot be used.');\n  };\n}\n\n\nmodule.exports.Type                = require('./js-yaml/type');\nmodule.exports.Schema              = require('./js-yaml/schema');\nmodule.exports.FAILSAFE_SCHEMA     = require('./js-yaml/schema/failsafe');\nmodule.exports.JSON_SCHEMA         = require('./js-yaml/schema/json');\nmodule.exports.CORE_SCHEMA         = require('./js-yaml/schema/core');\nmodule.exports.DEFAULT_SAFE_SCHEMA = require('./js-yaml/schema/default_safe');\nmodule.exports.DEFAULT_FULL_SCHEMA = require('./js-yaml/schema/default_full');\nmodule.exports.load                = loader.load;\nmodule.exports.loadAll             = loader.loadAll;\nmodule.exports.safeLoad            = loader.safeLoad;\nmodule.exports.safeLoadAll         = loader.safeLoadAll;\nmodule.exports.dump                = dumper.dump;\nmodule.exports.safeDump            = dumper.safeDump;\nmodule.exports.YAMLException       = require('./js-yaml/exception');\n\n// Deprecated schema names from JS-YAML 2.0.x\nmodule.exports.MINIMAL_SCHEMA = require('./js-yaml/schema/failsafe');\nmodule.exports.SAFE_SCHEMA    = require('./js-yaml/schema/default_safe');\nmodule.exports.DEFAULT_SCHEMA = require('./js-yaml/schema/default_full');\n\n// Deprecated functions from JS-YAML 1.x.x\nmodule.exports.scan           = deprecated('scan');\nmodule.exports.parse          = deprecated('parse');\nmodule.exports.compose        = deprecated('compose');\nmodule.exports.addConstructor = deprecated('addConstructor');\n","'use strict';\n\n\nfunction isNothing(subject) {\n  return (typeof subject === 'undefined') || (subject === null);\n}\n\n\nfunction isObject(subject) {\n  return (typeof subject === 'object') && (subject !== null);\n}\n\n\nfunction toArray(sequence) {\n  if (Array.isArray(sequence)) return sequence;\n  else if (isNothing(sequence)) return [];\n\n  return [ sequence ];\n}\n\n\nfunction extend(target, source) {\n  var index, length, key, sourceKeys;\n\n  if (source) {\n    sourceKeys = Object.keys(source);\n\n    for (index = 0, length = sourceKeys.length; index < length; index += 1) {\n      key = sourceKeys[index];\n      target[key] = source[key];\n    }\n  }\n\n  return target;\n}\n\n\nfunction repeat(string, count) {\n  var result = '', cycle;\n\n  for (cycle = 0; cycle < count; cycle += 1) {\n    result += string;\n  }\n\n  return result;\n}\n\n\nfunction isNegativeZero(number) {\n  return (number === 0) && (Number.NEGATIVE_INFINITY === 1 / number);\n}\n\n\nmodule.exports.isNothing      = isNothing;\nmodule.exports.isObject       = isObject;\nmodule.exports.toArray        = toArray;\nmodule.exports.repeat         = repeat;\nmodule.exports.isNegativeZero = isNegativeZero;\nmodule.exports.extend         = extend;\n","'use strict';\n\n/*eslint-disable no-use-before-define*/\n\nvar common              = require('./common');\nvar YAMLException       = require('./exception');\nvar DEFAULT_FULL_SCHEMA = require('./schema/default_full');\nvar DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');\n\nvar _toString       = Object.prototype.toString;\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nvar CHAR_TAB                  = 0x09; /* Tab */\nvar CHAR_LINE_FEED            = 0x0A; /* LF */\nvar CHAR_SPACE                = 0x20; /* Space */\nvar CHAR_EXCLAMATION          = 0x21; /* ! */\nvar CHAR_DOUBLE_QUOTE         = 0x22; /* \" */\nvar CHAR_SHARP                = 0x23; /* # */\nvar CHAR_PERCENT              = 0x25; /* % */\nvar CHAR_AMPERSAND            = 0x26; /* & */\nvar CHAR_SINGLE_QUOTE         = 0x27; /* ' */\nvar CHAR_ASTERISK             = 0x2A; /* * */\nvar CHAR_COMMA                = 0x2C; /* , */\nvar CHAR_MINUS                = 0x2D; /* - */\nvar CHAR_COLON                = 0x3A; /* : */\nvar CHAR_GREATER_THAN         = 0x3E; /* > */\nvar CHAR_QUESTION             = 0x3F; /* ? */\nvar CHAR_COMMERCIAL_AT        = 0x40; /* @ */\nvar CHAR_LEFT_SQUARE_BRACKET  = 0x5B; /* [ */\nvar CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */\nvar CHAR_GRAVE_ACCENT         = 0x60; /* ` */\nvar CHAR_LEFT_CURLY_BRACKET   = 0x7B; /* { */\nvar CHAR_VERTICAL_LINE        = 0x7C; /* | */\nvar CHAR_RIGHT_CURLY_BRACKET  = 0x7D; /* } */\n\nvar ESCAPE_SEQUENCES = {};\n\nESCAPE_SEQUENCES[0x00]   = '\\\\0';\nESCAPE_SEQUENCES[0x07]   = '\\\\a';\nESCAPE_SEQUENCES[0x08]   = '\\\\b';\nESCAPE_SEQUENCES[0x09]   = '\\\\t';\nESCAPE_SEQUENCES[0x0A]   = '\\\\n';\nESCAPE_SEQUENCES[0x0B]   = '\\\\v';\nESCAPE_SEQUENCES[0x0C]   = '\\\\f';\nESCAPE_SEQUENCES[0x0D]   = '\\\\r';\nESCAPE_SEQUENCES[0x1B]   = '\\\\e';\nESCAPE_SEQUENCES[0x22]   = '\\\\\"';\nESCAPE_SEQUENCES[0x5C]   = '\\\\\\\\';\nESCAPE_SEQUENCES[0x85]   = '\\\\N';\nESCAPE_SEQUENCES[0xA0]   = '\\\\_';\nESCAPE_SEQUENCES[0x2028] = '\\\\L';\nESCAPE_SEQUENCES[0x2029] = '\\\\P';\n\nvar DEPRECATED_BOOLEANS_SYNTAX = [\n  'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON',\n  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'\n];\n\nfunction compileStyleMap(schema, map) {\n  var result, keys, index, length, tag, style, type;\n\n  if (map === null) return {};\n\n  result = {};\n  keys = Object.keys(map);\n\n  for (index = 0, length = keys.length; index < length; index += 1) {\n    tag = keys[index];\n    style = String(map[tag]);\n\n    if (tag.slice(0, 2) === '!!') {\n      tag = 'tag:yaml.org,2002:' + tag.slice(2);\n    }\n\n    type = schema.compiledTypeMap[tag];\n\n    if (type && _hasOwnProperty.call(type.styleAliases, style)) {\n      style = type.styleAliases[style];\n    }\n\n    result[tag] = style;\n  }\n\n  return result;\n}\n\nfunction encodeHex(character) {\n  var string, handle, length;\n\n  string = character.toString(16).toUpperCase();\n\n  if (character <= 0xFF) {\n    handle = 'x';\n    length = 2;\n  } else if (character <= 0xFFFF) {\n    handle = 'u';\n    length = 4;\n  } else if (character <= 0xFFFFFFFF) {\n    handle = 'U';\n    length = 8;\n  } else {\n    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');\n  }\n\n  return '\\\\' + handle + common.repeat('0', length - string.length) + string;\n}\n\nfunction State(options) {\n  this.schema       = options['schema'] || DEFAULT_FULL_SCHEMA;\n  this.indent       = Math.max(1, (options['indent'] || 2));\n  this.skipInvalid  = options['skipInvalid'] || false;\n  this.flowLevel    = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);\n  this.styleMap     = compileStyleMap(this.schema, options['styles'] || null);\n  this.sortKeys     = options['sortKeys'] || false;\n  this.lineWidth    = options['lineWidth'] || 80;\n  this.noRefs       = options['noRefs'] || false;\n  this.noCompatMode = options['noCompatMode'] || false;\n\n  this.implicitTypes = this.schema.compiledImplicit;\n  this.explicitTypes = this.schema.compiledExplicit;\n\n  this.tag = null;\n  this.result = '';\n\n  this.duplicates = [];\n  this.usedDuplicates = null;\n}\n\n// Indents every line in a string. Empty lines (\\n only) are not indented.\nfunction indentString(string, spaces) {\n  var ind = common.repeat(' ', spaces),\n      position = 0,\n      next = -1,\n      result = '',\n      line,\n      length = string.length;\n\n  while (position < length) {\n    next = string.indexOf('\\n', position);\n    if (next === -1) {\n      line = string.slice(position);\n      position = length;\n    } else {\n      line = string.slice(position, next + 1);\n      position = next + 1;\n    }\n\n    if (line.length && line !== '\\n') result += ind;\n\n    result += line;\n  }\n\n  return result;\n}\n\nfunction generateNextLine(state, level) {\n  return '\\n' + common.repeat(' ', state.indent * level);\n}\n\nfunction testImplicitResolving(state, str) {\n  var index, length, type;\n\n  for (index = 0, length = state.implicitTypes.length; index < length; index += 1) {\n    type = state.implicitTypes[index];\n\n    if (type.resolve(str)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\n// [33] s-white ::= s-space | s-tab\nfunction isWhitespace(c) {\n  return c === CHAR_SPACE || c === CHAR_TAB;\n}\n\n// Returns true if the character can be printed without escaping.\n// From YAML 1.2: \"any allowed characters known to be non-printable\n// should also be escaped. [However,] This isn’t mandatory\"\n// Derived from nb-char - \\t - #x85 - #xA0 - #x2028 - #x2029.\nfunction isPrintable(c) {\n  return  (0x00020 <= c && c <= 0x00007E)\n      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)\n      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)\n      ||  (0x10000 <= c && c <= 0x10FFFF);\n}\n\n// Simplified test for values allowed after the first character in plain style.\nfunction isPlainSafe(c) {\n  // Uses a subset of nb-char - c-flow-indicator - \":\" - \"#\"\n  // where nb-char ::= c-printable - b-char - c-byte-order-mark.\n  return isPrintable(c) && c !== 0xFEFF\n    // - c-flow-indicator\n    && c !== CHAR_COMMA\n    && c !== CHAR_LEFT_SQUARE_BRACKET\n    && c !== CHAR_RIGHT_SQUARE_BRACKET\n    && c !== CHAR_LEFT_CURLY_BRACKET\n    && c !== CHAR_RIGHT_CURLY_BRACKET\n    // - \":\" - \"#\"\n    && c !== CHAR_COLON\n    && c !== CHAR_SHARP;\n}\n\n// Simplified test for values allowed as the first character in plain style.\nfunction isPlainSafeFirst(c) {\n  // Uses a subset of ns-char - c-indicator\n  // where ns-char = nb-char - s-white.\n  return isPrintable(c) && c !== 0xFEFF\n    && !isWhitespace(c) // - s-white\n    // - (c-indicator ::=\n    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”\n    && c !== CHAR_MINUS\n    && c !== CHAR_QUESTION\n    && c !== CHAR_COLON\n    && c !== CHAR_COMMA\n    && c !== CHAR_LEFT_SQUARE_BRACKET\n    && c !== CHAR_RIGHT_SQUARE_BRACKET\n    && c !== CHAR_LEFT_CURLY_BRACKET\n    && c !== CHAR_RIGHT_CURLY_BRACKET\n    // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “\"”\n    && c !== CHAR_SHARP\n    && c !== CHAR_AMPERSAND\n    && c !== CHAR_ASTERISK\n    && c !== CHAR_EXCLAMATION\n    && c !== CHAR_VERTICAL_LINE\n    && c !== CHAR_GREATER_THAN\n    && c !== CHAR_SINGLE_QUOTE\n    && c !== CHAR_DOUBLE_QUOTE\n    // | “%” | “@” | “`”)\n    && c !== CHAR_PERCENT\n    && c !== CHAR_COMMERCIAL_AT\n    && c !== CHAR_GRAVE_ACCENT;\n}\n\nvar STYLE_PLAIN   = 1,\n    STYLE_SINGLE  = 2,\n    STYLE_LITERAL = 3,\n    STYLE_FOLDED  = 4,\n    STYLE_DOUBLE  = 5;\n\n// Determines which scalar styles are possible and returns the preferred style.\n// lineWidth = -1 => no limit.\n// Pre-conditions: str.length > 0.\n// Post-conditions:\n//    STYLE_PLAIN or STYLE_SINGLE => no \\n are in the string.\n//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).\n//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).\nfunction chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {\n  var i;\n  var char;\n  var hasLineBreak = false;\n  var hasFoldableLine = false; // only checked if shouldTrackWidth\n  var shouldTrackWidth = lineWidth !== -1;\n  var previousLineBreak = -1; // count the first line correctly\n  var plain = isPlainSafeFirst(string.charCodeAt(0))\n          && !isWhitespace(string.charCodeAt(string.length - 1));\n\n  if (singleLineOnly) {\n    // Case: no block styles.\n    // Check for disallowed characters to rule out plain and single.\n    for (i = 0; i < string.length; i++) {\n      char = string.charCodeAt(i);\n      if (!isPrintable(char)) {\n        return STYLE_DOUBLE;\n      }\n      plain = plain && isPlainSafe(char);\n    }\n  } else {\n    // Case: block styles permitted.\n    for (i = 0; i < string.length; i++) {\n      char = string.charCodeAt(i);\n      if (char === CHAR_LINE_FEED) {\n        hasLineBreak = true;\n        // Check if any line can be folded.\n        if (shouldTrackWidth) {\n          hasFoldableLine = hasFoldableLine ||\n            // Foldable line = too long, and not more-indented.\n            (i - previousLineBreak - 1 > lineWidth &&\n             string[previousLineBreak + 1] !== ' ');\n          previousLineBreak = i;\n        }\n      } else if (!isPrintable(char)) {\n        return STYLE_DOUBLE;\n      }\n      plain = plain && isPlainSafe(char);\n    }\n    // in case the end is missing a \\n\n    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&\n      (i - previousLineBreak - 1 > lineWidth &&\n       string[previousLineBreak + 1] !== ' '));\n  }\n  // Although every style can represent \\n without escaping, prefer block styles\n  // for multiline, since they're more readable and they don't add empty lines.\n  // Also prefer folding a super-long line.\n  if (!hasLineBreak && !hasFoldableLine) {\n    // Strings interpretable as another type have to be quoted;\n    // e.g. the string 'true' vs. the boolean true.\n    return plain && !testAmbiguousType(string)\n      ? STYLE_PLAIN : STYLE_SINGLE;\n  }\n  // Edge case: block indentation indicator can only have one digit.\n  if (string[0] === ' ' && indentPerLevel > 9) {\n    return STYLE_DOUBLE;\n  }\n  // At this point we know block styles are valid.\n  // Prefer literal style unless we want to fold.\n  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;\n}\n\n// Note: line breaking/folding is implemented for only the folded style.\n// NB. We drop the last trailing newline (if any) of a returned block scalar\n//  since the dumper adds its own newline. This always works:\n//    • No ending newline => unaffected; already using strip \"-\" chomping.\n//    • Ending newline    => removed then restored.\n//  Importantly, this keeps the \"+\" chomp indicator from gaining an extra line.\nfunction writeScalar(state, string, level, iskey) {\n  state.dump = (function () {\n    if (string.length === 0) {\n      return \"''\";\n    }\n    if (!state.noCompatMode &&\n        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {\n      return \"'\" + string + \"'\";\n    }\n\n    var indent = state.indent * Math.max(1, level); // no 0-indent scalars\n    // As indentation gets deeper, let the width decrease monotonically\n    // to the lower bound min(state.lineWidth, 40).\n    // Note that this implies\n    //  state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound.\n    //  state.lineWidth > 40 + state.indent: width decreases until the lower bound.\n    // This behaves better than a constant minimum width which disallows narrower options,\n    // or an indent threshold which causes the width to suddenly increase.\n    var lineWidth = state.lineWidth === -1\n      ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent);\n\n    // Without knowing if keys are implicit/explicit, assume implicit for safety.\n    var singleLineOnly = iskey\n      // No block styles in flow mode.\n      || (state.flowLevel > -1 && level >= state.flowLevel);\n    function testAmbiguity(string) {\n      return testImplicitResolving(state, string);\n    }\n\n    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {\n      case STYLE_PLAIN:\n        return string;\n      case STYLE_SINGLE:\n        return \"'\" + string.replace(/'/g, \"''\") + \"'\";\n      case STYLE_LITERAL:\n        return '|' + blockHeader(string, state.indent)\n          + dropEndingNewline(indentString(string, indent));\n      case STYLE_FOLDED:\n        return '>' + blockHeader(string, state.indent)\n          + dropEndingNewline(indentString(foldString(string, lineWidth), indent));\n      case STYLE_DOUBLE:\n        return '\"' + escapeString(string, lineWidth) + '\"';\n      default:\n        throw new YAMLException('impossible error: invalid scalar style');\n    }\n  }());\n}\n\n// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9.\nfunction blockHeader(string, indentPerLevel) {\n  var indentIndicator = (string[0] === ' ') ? String(indentPerLevel) : '';\n\n  // note the special case: the string '\\n' counts as a \"trailing\" empty line.\n  var clip =          string[string.length - 1] === '\\n';\n  var keep = clip && (string[string.length - 2] === '\\n' || string === '\\n');\n  var chomp = keep ? '+' : (clip ? '' : '-');\n\n  return indentIndicator + chomp + '\\n';\n}\n\n// (See the note for writeScalar.)\nfunction dropEndingNewline(string) {\n  return string[string.length - 1] === '\\n' ? string.slice(0, -1) : string;\n}\n\n// Note: a long line without a suitable break point will exceed the width limit.\n// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0.\nfunction foldString(string, width) {\n  // In folded style, $k$ consecutive newlines output as $k+1$ newlines—\n  // unless they're before or after a more-indented line, or at the very\n  // beginning or end, in which case $k$ maps to $k$.\n  // Therefore, parse each chunk as newline(s) followed by a content line.\n  var lineRe = /(\\n+)([^\\n]*)/g;\n\n  // first line (possibly an empty line)\n  var result = (function () {\n    var nextLF = string.indexOf('\\n');\n    nextLF = nextLF !== -1 ? nextLF : string.length;\n    lineRe.lastIndex = nextLF;\n    return foldLine(string.slice(0, nextLF), width);\n  }());\n  // If we haven't reached the first content line yet, don't add an extra \\n.\n  var prevMoreIndented = string[0] === '\\n' || string[0] === ' ';\n  var moreIndented;\n\n  // rest of the lines\n  var match;\n  while ((match = lineRe.exec(string))) {\n    var prefix = match[1], line = match[2];\n    moreIndented = (line[0] === ' ');\n    result += prefix\n      + (!prevMoreIndented && !moreIndented && line !== ''\n        ? '\\n' : '')\n      + foldLine(line, width);\n    prevMoreIndented = moreIndented;\n  }\n\n  return result;\n}\n\n// Greedy line breaking.\n// Picks the longest line under the limit each time,\n// otherwise settles for the shortest line over the limit.\n// NB. More-indented lines *cannot* be folded, as that would add an extra \\n.\nfunction foldLine(line, width) {\n  if (line === '' || line[0] === ' ') return line;\n\n  // Since a more-indented line adds a \\n, breaks can't be followed by a space.\n  var breakRe = / [^ ]/g; // note: the match index will always be <= length-2.\n  var match;\n  // start is an inclusive index. end, curr, and next are exclusive.\n  var start = 0, end, curr = 0, next = 0;\n  var result = '';\n\n  // Invariants: 0 <= start <= length-1.\n  //   0 <= curr <= next <= max(0, length-2). curr - start <= width.\n  // Inside the loop:\n  //   A match implies length >= 2, so curr and next are <= length-2.\n  while ((match = breakRe.exec(line))) {\n    next = match.index;\n    // maintain invariant: curr - start <= width\n    if (next - start > width) {\n      end = (curr > start) ? curr : next; // derive end <= length-2\n      result += '\\n' + line.slice(start, end);\n      // skip the space that was output as \\n\n      start = end + 1;                    // derive start <= length-1\n    }\n    curr = next;\n  }\n\n  // By the invariants, start <= length-1, so there is something left over.\n  // It is either the whole string or a part starting from non-whitespace.\n  result += '\\n';\n  // Insert a break if the remainder is too long and there is a break available.\n  if (line.length - start > width && curr > start) {\n    result += line.slice(start, curr) + '\\n' + line.slice(curr + 1);\n  } else {\n    result += line.slice(start);\n  }\n\n  return result.slice(1); // drop extra \\n joiner\n}\n\n// Escapes a double-quoted string.\nfunction escapeString(string) {\n  var result = '';\n  var char;\n  var escapeSeq;\n\n  for (var i = 0; i < string.length; i++) {\n    char = string.charCodeAt(i);\n    escapeSeq = ESCAPE_SEQUENCES[char];\n    result += !escapeSeq && isPrintable(char)\n      ? string[i]\n      : escapeSeq || encodeHex(char);\n  }\n\n  return result;\n}\n\nfunction writeFlowSequence(state, level, object) {\n  var _result = '',\n      _tag    = state.tag,\n      index,\n      length;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    // Write only valid elements.\n    if (writeNode(state, level, object[index], false, false)) {\n      if (index !== 0) _result += ', ';\n      _result += state.dump;\n    }\n  }\n\n  state.tag = _tag;\n  state.dump = '[' + _result + ']';\n}\n\nfunction writeBlockSequence(state, level, object, compact) {\n  var _result = '',\n      _tag    = state.tag,\n      index,\n      length;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    // Write only valid elements.\n    if (writeNode(state, level + 1, object[index], true, true)) {\n      if (!compact || index !== 0) {\n        _result += generateNextLine(state, level);\n      }\n      _result += '- ' + state.dump;\n    }\n  }\n\n  state.tag = _tag;\n  state.dump = _result || '[]'; // Empty sequence if no valid values.\n}\n\nfunction writeFlowMapping(state, level, object) {\n  var _result       = '',\n      _tag          = state.tag,\n      objectKeyList = Object.keys(object),\n      index,\n      length,\n      objectKey,\n      objectValue,\n      pairBuffer;\n\n  for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n    pairBuffer = '';\n\n    if (index !== 0) pairBuffer += ', ';\n\n    objectKey = objectKeyList[index];\n    objectValue = object[objectKey];\n\n    if (!writeNode(state, level, objectKey, false, false)) {\n      continue; // Skip this pair because of invalid key;\n    }\n\n    if (state.dump.length > 1024) pairBuffer += '? ';\n\n    pairBuffer += state.dump + ': ';\n\n    if (!writeNode(state, level, objectValue, false, false)) {\n      continue; // Skip this pair because of invalid value.\n    }\n\n    pairBuffer += state.dump;\n\n    // Both key and value are valid.\n    _result += pairBuffer;\n  }\n\n  state.tag = _tag;\n  state.dump = '{' + _result + '}';\n}\n\nfunction writeBlockMapping(state, level, object, compact) {\n  var _result       = '',\n      _tag          = state.tag,\n      objectKeyList = Object.keys(object),\n      index,\n      length,\n      objectKey,\n      objectValue,\n      explicitPair,\n      pairBuffer;\n\n  // Allow sorting keys so that the output file is deterministic\n  if (state.sortKeys === true) {\n    // Default sorting\n    objectKeyList.sort();\n  } else if (typeof state.sortKeys === 'function') {\n    // Custom sort function\n    objectKeyList.sort(state.sortKeys);\n  } else if (state.sortKeys) {\n    // Something is wrong\n    throw new YAMLException('sortKeys must be a boolean or a function');\n  }\n\n  for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n    pairBuffer = '';\n\n    if (!compact || index !== 0) {\n      pairBuffer += generateNextLine(state, level);\n    }\n\n    objectKey = objectKeyList[index];\n    objectValue = object[objectKey];\n\n    if (!writeNode(state, level + 1, objectKey, true, true, true)) {\n      continue; // Skip this pair because of invalid key.\n    }\n\n    explicitPair = (state.tag !== null && state.tag !== '?') ||\n                   (state.dump && state.dump.length > 1024);\n\n    if (explicitPair) {\n      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {\n        pairBuffer += '?';\n      } else {\n        pairBuffer += '? ';\n      }\n    }\n\n    pairBuffer += state.dump;\n\n    if (explicitPair) {\n      pairBuffer += generateNextLine(state, level);\n    }\n\n    if (!writeNode(state, level + 1, objectValue, true, explicitPair)) {\n      continue; // Skip this pair because of invalid value.\n    }\n\n    if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {\n      pairBuffer += ':';\n    } else {\n      pairBuffer += ': ';\n    }\n\n    pairBuffer += state.dump;\n\n    // Both key and value are valid.\n    _result += pairBuffer;\n  }\n\n  state.tag = _tag;\n  state.dump = _result || '{}'; // Empty mapping if no valid pairs.\n}\n\nfunction detectType(state, object, explicit) {\n  var _result, typeList, index, length, type, style;\n\n  typeList = explicit ? state.explicitTypes : state.implicitTypes;\n\n  for (index = 0, length = typeList.length; index < length; index += 1) {\n    type = typeList[index];\n\n    if ((type.instanceOf  || type.predicate) &&\n        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&\n        (!type.predicate  || type.predicate(object))) {\n\n      state.tag = explicit ? type.tag : '?';\n\n      if (type.represent) {\n        style = state.styleMap[type.tag] || type.defaultStyle;\n\n        if (_toString.call(type.represent) === '[object Function]') {\n          _result = type.represent(object, style);\n        } else if (_hasOwnProperty.call(type.represent, style)) {\n          _result = type.represent[style](object, style);\n        } else {\n          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not \"' + style + '\" style');\n        }\n\n        state.dump = _result;\n      }\n\n      return true;\n    }\n  }\n\n  return false;\n}\n\n// Serializes `object` and writes it to global `result`.\n// Returns true on success, or false on invalid object.\n//\nfunction writeNode(state, level, object, block, compact, iskey) {\n  state.tag = null;\n  state.dump = object;\n\n  if (!detectType(state, object, false)) {\n    detectType(state, object, true);\n  }\n\n  var type = _toString.call(state.dump);\n\n  if (block) {\n    block = (state.flowLevel < 0 || state.flowLevel > level);\n  }\n\n  var objectOrArray = type === '[object Object]' || type === '[object Array]',\n      duplicateIndex,\n      duplicate;\n\n  if (objectOrArray) {\n    duplicateIndex = state.duplicates.indexOf(object);\n    duplicate = duplicateIndex !== -1;\n  }\n\n  if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) {\n    compact = false;\n  }\n\n  if (duplicate && state.usedDuplicates[duplicateIndex]) {\n    state.dump = '*ref_' + duplicateIndex;\n  } else {\n    if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {\n      state.usedDuplicates[duplicateIndex] = true;\n    }\n    if (type === '[object Object]') {\n      if (block && (Object.keys(state.dump).length !== 0)) {\n        writeBlockMapping(state, level, state.dump, compact);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + state.dump;\n        }\n      } else {\n        writeFlowMapping(state, level, state.dump);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;\n        }\n      }\n    } else if (type === '[object Array]') {\n      if (block && (state.dump.length !== 0)) {\n        writeBlockSequence(state, level, state.dump, compact);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + state.dump;\n        }\n      } else {\n        writeFlowSequence(state, level, state.dump);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;\n        }\n      }\n    } else if (type === '[object String]') {\n      if (state.tag !== '?') {\n        writeScalar(state, state.dump, level, iskey);\n      }\n    } else {\n      if (state.skipInvalid) return false;\n      throw new YAMLException('unacceptable kind of an object to dump ' + type);\n    }\n\n    if (state.tag !== null && state.tag !== '?') {\n      state.dump = '!<' + state.tag + '> ' + state.dump;\n    }\n  }\n\n  return true;\n}\n\nfunction getDuplicateReferences(object, state) {\n  var objects = [],\n      duplicatesIndexes = [],\n      index,\n      length;\n\n  inspectNode(object, objects, duplicatesIndexes);\n\n  for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) {\n    state.duplicates.push(objects[duplicatesIndexes[index]]);\n  }\n  state.usedDuplicates = new Array(length);\n}\n\nfunction inspectNode(object, objects, duplicatesIndexes) {\n  var objectKeyList,\n      index,\n      length;\n\n  if (object !== null && typeof object === 'object') {\n    index = objects.indexOf(object);\n    if (index !== -1) {\n      if (duplicatesIndexes.indexOf(index) === -1) {\n        duplicatesIndexes.push(index);\n      }\n    } else {\n      objects.push(object);\n\n      if (Array.isArray(object)) {\n        for (index = 0, length = object.length; index < length; index += 1) {\n          inspectNode(object[index], objects, duplicatesIndexes);\n        }\n      } else {\n        objectKeyList = Object.keys(object);\n\n        for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n          inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes);\n        }\n      }\n    }\n  }\n}\n\nfunction dump(input, options) {\n  options = options || {};\n\n  var state = new State(options);\n\n  if (!state.noRefs) getDuplicateReferences(input, state);\n\n  if (writeNode(state, 0, input, true, true)) return state.dump + '\\n';\n\n  return '';\n}\n\nfunction safeDump(input, options) {\n  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\nmodule.exports.dump     = dump;\nmodule.exports.safeDump = safeDump;\n","// YAML error class. http://stackoverflow.com/questions/8458984\n//\n'use strict';\n\nfunction YAMLException(reason, mark) {\n  // Super constructor\n  Error.call(this);\n\n  // Include stack trace in error object\n  if (Error.captureStackTrace) {\n    // Chrome and NodeJS\n    Error.captureStackTrace(this, this.constructor);\n  } else {\n    // FF, IE 10+ and Safari 6+. Fallback for others\n    this.stack = (new Error()).stack || '';\n  }\n\n  this.name = 'YAMLException';\n  this.reason = reason;\n  this.mark = mark;\n  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');\n}\n\n\n// Inherit from Error\nYAMLException.prototype = Object.create(Error.prototype);\nYAMLException.prototype.constructor = YAMLException;\n\n\nYAMLException.prototype.toString = function toString(compact) {\n  var result = this.name + ': ';\n\n  result += this.reason || '(unknown reason)';\n\n  if (!compact && this.mark) {\n    result += ' ' + this.mark.toString();\n  }\n\n  return result;\n};\n\n\nmodule.exports = YAMLException;\n","'use strict';\n\n/*eslint-disable max-len,no-use-before-define*/\n\nvar common              = require('./common');\nvar YAMLException       = require('./exception');\nvar Mark                = require('./mark');\nvar DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');\nvar DEFAULT_FULL_SCHEMA = require('./schema/default_full');\n\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\n\nvar CONTEXT_FLOW_IN   = 1;\nvar CONTEXT_FLOW_OUT  = 2;\nvar CONTEXT_BLOCK_IN  = 3;\nvar CONTEXT_BLOCK_OUT = 4;\n\n\nvar CHOMPING_CLIP  = 1;\nvar CHOMPING_STRIP = 2;\nvar CHOMPING_KEEP  = 3;\n\n\nvar PATTERN_NON_PRINTABLE         = /[\\x00-\\x08\\x0B\\x0C\\x0E-\\x1F\\x7F-\\x84\\x86-\\x9F\\uFFFE\\uFFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]/;\nvar PATTERN_NON_ASCII_LINE_BREAKS = /[\\x85\\u2028\\u2029]/;\nvar PATTERN_FLOW_INDICATORS       = /[,\\[\\]\\{\\}]/;\nvar PATTERN_TAG_HANDLE            = /^(?:!|!!|![a-z\\-]+!)$/i;\nvar PATTERN_TAG_URI               = /^(?:!|[^,\\[\\]\\{\\}])(?:%[0-9a-f]{2}|[0-9a-z\\-#;\\/\\?:@&=\\+\\$,_\\.!~\\*'\\(\\)\\[\\]])*$/i;\n\n\nfunction is_EOL(c) {\n  return (c === 0x0A/* LF */) || (c === 0x0D/* CR */);\n}\n\nfunction is_WHITE_SPACE(c) {\n  return (c === 0x09/* Tab */) || (c === 0x20/* Space */);\n}\n\nfunction is_WS_OR_EOL(c) {\n  return (c === 0x09/* Tab */) ||\n         (c === 0x20/* Space */) ||\n         (c === 0x0A/* LF */) ||\n         (c === 0x0D/* CR */);\n}\n\nfunction is_FLOW_INDICATOR(c) {\n  return c === 0x2C/* , */ ||\n         c === 0x5B/* [ */ ||\n         c === 0x5D/* ] */ ||\n         c === 0x7B/* { */ ||\n         c === 0x7D/* } */;\n}\n\nfunction fromHexCode(c) {\n  var lc;\n\n  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {\n    return c - 0x30;\n  }\n\n  /*eslint-disable no-bitwise*/\n  lc = c | 0x20;\n\n  if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) {\n    return lc - 0x61 + 10;\n  }\n\n  return -1;\n}\n\nfunction escapedHexLen(c) {\n  if (c === 0x78/* x */) { return 2; }\n  if (c === 0x75/* u */) { return 4; }\n  if (c === 0x55/* U */) { return 8; }\n  return 0;\n}\n\nfunction fromDecimalCode(c) {\n  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {\n    return c - 0x30;\n  }\n\n  return -1;\n}\n\nfunction simpleEscapeSequence(c) {\n  return (c === 0x30/* 0 */) ? '\\x00' :\n        (c === 0x61/* a */) ? '\\x07' :\n        (c === 0x62/* b */) ? '\\x08' :\n        (c === 0x74/* t */) ? '\\x09' :\n        (c === 0x09/* Tab */) ? '\\x09' :\n        (c === 0x6E/* n */) ? '\\x0A' :\n        (c === 0x76/* v */) ? '\\x0B' :\n        (c === 0x66/* f */) ? '\\x0C' :\n        (c === 0x72/* r */) ? '\\x0D' :\n        (c === 0x65/* e */) ? '\\x1B' :\n        (c === 0x20/* Space */) ? ' ' :\n        (c === 0x22/* \" */) ? '\\x22' :\n        (c === 0x2F/* / */) ? '/' :\n        (c === 0x5C/* \\ */) ? '\\x5C' :\n        (c === 0x4E/* N */) ? '\\x85' :\n        (c === 0x5F/* _ */) ? '\\xA0' :\n        (c === 0x4C/* L */) ? '\\u2028' :\n        (c === 0x50/* P */) ? '\\u2029' : '';\n}\n\nfunction charFromCodepoint(c) {\n  if (c <= 0xFFFF) {\n    return String.fromCharCode(c);\n  }\n  // Encode UTF-16 surrogate pair\n  // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF\n  return String.fromCharCode(((c - 0x010000) >> 10) + 0xD800,\n                             ((c - 0x010000) & 0x03FF) + 0xDC00);\n}\n\nvar simpleEscapeCheck = new Array(256); // integer, for fast access\nvar simpleEscapeMap = new Array(256);\nfor (var i = 0; i < 256; i++) {\n  simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;\n  simpleEscapeMap[i] = simpleEscapeSequence(i);\n}\n\n\nfunction State(input, options) {\n  this.input = input;\n\n  this.filename  = options['filename']  || null;\n  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;\n  this.onWarning = options['onWarning'] || null;\n  this.legacy    = options['legacy']    || false;\n  this.json      = options['json']      || false;\n  this.listener  = options['listener']  || null;\n\n  this.implicitTypes = this.schema.compiledImplicit;\n  this.typeMap       = this.schema.compiledTypeMap;\n\n  this.length     = input.length;\n  this.position   = 0;\n  this.line       = 0;\n  this.lineStart  = 0;\n  this.lineIndent = 0;\n\n  this.documents = [];\n\n  /*\n  this.version;\n  this.checkLineBreaks;\n  this.tagMap;\n  this.anchorMap;\n  this.tag;\n  this.anchor;\n  this.kind;\n  this.result;*/\n\n}\n\n\nfunction generateError(state, message) {\n  return new YAMLException(\n    message,\n    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));\n}\n\nfunction throwError(state, message) {\n  throw generateError(state, message);\n}\n\nfunction throwWarning(state, message) {\n  if (state.onWarning) {\n    state.onWarning.call(null, generateError(state, message));\n  }\n}\n\n\nvar directiveHandlers = {\n\n  YAML: function handleYamlDirective(state, name, args) {\n\n    var match, major, minor;\n\n    if (state.version !== null) {\n      throwError(state, 'duplication of %YAML directive');\n    }\n\n    if (args.length !== 1) {\n      throwError(state, 'YAML directive accepts exactly one argument');\n    }\n\n    match = /^([0-9]+)\\.([0-9]+)$/.exec(args[0]);\n\n    if (match === null) {\n      throwError(state, 'ill-formed argument of the YAML directive');\n    }\n\n    major = parseInt(match[1], 10);\n    minor = parseInt(match[2], 10);\n\n    if (major !== 1) {\n      throwError(state, 'unacceptable YAML version of the document');\n    }\n\n    state.version = args[0];\n    state.checkLineBreaks = (minor < 2);\n\n    if (minor !== 1 && minor !== 2) {\n      throwWarning(state, 'unsupported YAML version of the document');\n    }\n  },\n\n  TAG: function handleTagDirective(state, name, args) {\n\n    var handle, prefix;\n\n    if (args.length !== 2) {\n      throwError(state, 'TAG directive accepts exactly two arguments');\n    }\n\n    handle = args[0];\n    prefix = args[1];\n\n    if (!PATTERN_TAG_HANDLE.test(handle)) {\n      throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');\n    }\n\n    if (_hasOwnProperty.call(state.tagMap, handle)) {\n      throwError(state, 'there is a previously declared suffix for \"' + handle + '\" tag handle');\n    }\n\n    if (!PATTERN_TAG_URI.test(prefix)) {\n      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');\n    }\n\n    state.tagMap[handle] = prefix;\n  }\n};\n\n\nfunction captureSegment(state, start, end, checkJson) {\n  var _position, _length, _character, _result;\n\n  if (start < end) {\n    _result = state.input.slice(start, end);\n\n    if (checkJson) {\n      for (_position = 0, _length = _result.length;\n           _position < _length;\n           _position += 1) {\n        _character = _result.charCodeAt(_position);\n        if (!(_character === 0x09 ||\n              (0x20 <= _character && _character <= 0x10FFFF))) {\n          throwError(state, 'expected valid JSON character');\n        }\n      }\n    } else if (PATTERN_NON_PRINTABLE.test(_result)) {\n      throwError(state, 'the stream contains non-printable characters');\n    }\n\n    state.result += _result;\n  }\n}\n\nfunction mergeMappings(state, destination, source, overridableKeys) {\n  var sourceKeys, key, index, quantity;\n\n  if (!common.isObject(source)) {\n    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');\n  }\n\n  sourceKeys = Object.keys(source);\n\n  for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {\n    key = sourceKeys[index];\n\n    if (!_hasOwnProperty.call(destination, key)) {\n      destination[key] = source[key];\n      overridableKeys[key] = true;\n    }\n  }\n}\n\nfunction storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode) {\n  var index, quantity;\n\n  keyNode = String(keyNode);\n\n  if (_result === null) {\n    _result = {};\n  }\n\n  if (keyTag === 'tag:yaml.org,2002:merge') {\n    if (Array.isArray(valueNode)) {\n      for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {\n        mergeMappings(state, _result, valueNode[index], overridableKeys);\n      }\n    } else {\n      mergeMappings(state, _result, valueNode, overridableKeys);\n    }\n  } else {\n    if (!state.json &&\n        !_hasOwnProperty.call(overridableKeys, keyNode) &&\n        _hasOwnProperty.call(_result, keyNode)) {\n      throwError(state, 'duplicated mapping key');\n    }\n    _result[keyNode] = valueNode;\n    delete overridableKeys[keyNode];\n  }\n\n  return _result;\n}\n\nfunction readLineBreak(state) {\n  var ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x0A/* LF */) {\n    state.position++;\n  } else if (ch === 0x0D/* CR */) {\n    state.position++;\n    if (state.input.charCodeAt(state.position) === 0x0A/* LF */) {\n      state.position++;\n    }\n  } else {\n    throwError(state, 'a line break is expected');\n  }\n\n  state.line += 1;\n  state.lineStart = state.position;\n}\n\nfunction skipSeparationSpace(state, allowComments, checkIndent) {\n  var lineBreaks = 0,\n      ch = state.input.charCodeAt(state.position);\n\n  while (ch !== 0) {\n    while (is_WHITE_SPACE(ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    if (allowComments && ch === 0x23/* # */) {\n      do {\n        ch = state.input.charCodeAt(++state.position);\n      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0);\n    }\n\n    if (is_EOL(ch)) {\n      readLineBreak(state);\n\n      ch = state.input.charCodeAt(state.position);\n      lineBreaks++;\n      state.lineIndent = 0;\n\n      while (ch === 0x20/* Space */) {\n        state.lineIndent++;\n        ch = state.input.charCodeAt(++state.position);\n      }\n    } else {\n      break;\n    }\n  }\n\n  if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) {\n    throwWarning(state, 'deficient indentation');\n  }\n\n  return lineBreaks;\n}\n\nfunction testDocumentSeparator(state) {\n  var _position = state.position,\n      ch;\n\n  ch = state.input.charCodeAt(_position);\n\n  // Condition state.position === state.lineStart is tested\n  // in parent on each call, for efficiency. No needs to test here again.\n  if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) &&\n      ch === state.input.charCodeAt(_position + 1) &&\n      ch === state.input.charCodeAt(_position + 2)) {\n\n    _position += 3;\n\n    ch = state.input.charCodeAt(_position);\n\n    if (ch === 0 || is_WS_OR_EOL(ch)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nfunction writeFoldedLines(state, count) {\n  if (count === 1) {\n    state.result += ' ';\n  } else if (count > 1) {\n    state.result += common.repeat('\\n', count - 1);\n  }\n}\n\n\nfunction readPlainScalar(state, nodeIndent, withinFlowCollection) {\n  var preceding,\n      following,\n      captureStart,\n      captureEnd,\n      hasPendingContent,\n      _line,\n      _lineStart,\n      _lineIndent,\n      _kind = state.kind,\n      _result = state.result,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (is_WS_OR_EOL(ch)      ||\n      is_FLOW_INDICATOR(ch) ||\n      ch === 0x23/* # */    ||\n      ch === 0x26/* & */    ||\n      ch === 0x2A/* * */    ||\n      ch === 0x21/* ! */    ||\n      ch === 0x7C/* | */    ||\n      ch === 0x3E/* > */    ||\n      ch === 0x27/* ' */    ||\n      ch === 0x22/* \" */    ||\n      ch === 0x25/* % */    ||\n      ch === 0x40/* @ */    ||\n      ch === 0x60/* ` */) {\n    return false;\n  }\n\n  if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) {\n    following = state.input.charCodeAt(state.position + 1);\n\n    if (is_WS_OR_EOL(following) ||\n        withinFlowCollection && is_FLOW_INDICATOR(following)) {\n      return false;\n    }\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  captureStart = captureEnd = state.position;\n  hasPendingContent = false;\n\n  while (ch !== 0) {\n    if (ch === 0x3A/* : */) {\n      following = state.input.charCodeAt(state.position + 1);\n\n      if (is_WS_OR_EOL(following) ||\n          withinFlowCollection && is_FLOW_INDICATOR(following)) {\n        break;\n      }\n\n    } else if (ch === 0x23/* # */) {\n      preceding = state.input.charCodeAt(state.position - 1);\n\n      if (is_WS_OR_EOL(preceding)) {\n        break;\n      }\n\n    } else if ((state.position === state.lineStart && testDocumentSeparator(state)) ||\n               withinFlowCollection && is_FLOW_INDICATOR(ch)) {\n      break;\n\n    } else if (is_EOL(ch)) {\n      _line = state.line;\n      _lineStart = state.lineStart;\n      _lineIndent = state.lineIndent;\n      skipSeparationSpace(state, false, -1);\n\n      if (state.lineIndent >= nodeIndent) {\n        hasPendingContent = true;\n        ch = state.input.charCodeAt(state.position);\n        continue;\n      } else {\n        state.position = captureEnd;\n        state.line = _line;\n        state.lineStart = _lineStart;\n        state.lineIndent = _lineIndent;\n        break;\n      }\n    }\n\n    if (hasPendingContent) {\n      captureSegment(state, captureStart, captureEnd, false);\n      writeFoldedLines(state, state.line - _line);\n      captureStart = captureEnd = state.position;\n      hasPendingContent = false;\n    }\n\n    if (!is_WHITE_SPACE(ch)) {\n      captureEnd = state.position + 1;\n    }\n\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  captureSegment(state, captureStart, captureEnd, false);\n\n  if (state.result) {\n    return true;\n  }\n\n  state.kind = _kind;\n  state.result = _result;\n  return false;\n}\n\nfunction readSingleQuotedScalar(state, nodeIndent) {\n  var ch,\n      captureStart, captureEnd;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x27/* ' */) {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  state.position++;\n  captureStart = captureEnd = state.position;\n\n  while ((ch = state.input.charCodeAt(state.position)) !== 0) {\n    if (ch === 0x27/* ' */) {\n      captureSegment(state, captureStart, state.position, true);\n      ch = state.input.charCodeAt(++state.position);\n\n      if (ch === 0x27/* ' */) {\n        captureStart = captureEnd = state.position;\n        state.position++;\n      } else {\n        return true;\n      }\n\n    } else if (is_EOL(ch)) {\n      captureSegment(state, captureStart, captureEnd, true);\n      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));\n      captureStart = captureEnd = state.position;\n\n    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {\n      throwError(state, 'unexpected end of the document within a single quoted scalar');\n\n    } else {\n      state.position++;\n      captureEnd = state.position;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a single quoted scalar');\n}\n\nfunction readDoubleQuotedScalar(state, nodeIndent) {\n  var captureStart,\n      captureEnd,\n      hexLength,\n      hexResult,\n      tmp,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x22/* \" */) {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  state.position++;\n  captureStart = captureEnd = state.position;\n\n  while ((ch = state.input.charCodeAt(state.position)) !== 0) {\n    if (ch === 0x22/* \" */) {\n      captureSegment(state, captureStart, state.position, true);\n      state.position++;\n      return true;\n\n    } else if (ch === 0x5C/* \\ */) {\n      captureSegment(state, captureStart, state.position, true);\n      ch = state.input.charCodeAt(++state.position);\n\n      if (is_EOL(ch)) {\n        skipSeparationSpace(state, false, nodeIndent);\n\n        // TODO: rework to inline fn with no type cast?\n      } else if (ch < 256 && simpleEscapeCheck[ch]) {\n        state.result += simpleEscapeMap[ch];\n        state.position++;\n\n      } else if ((tmp = escapedHexLen(ch)) > 0) {\n        hexLength = tmp;\n        hexResult = 0;\n\n        for (; hexLength > 0; hexLength--) {\n          ch = state.input.charCodeAt(++state.position);\n\n          if ((tmp = fromHexCode(ch)) >= 0) {\n            hexResult = (hexResult << 4) + tmp;\n\n          } else {\n            throwError(state, 'expected hexadecimal character');\n          }\n        }\n\n        state.result += charFromCodepoint(hexResult);\n\n        state.position++;\n\n      } else {\n        throwError(state, 'unknown escape sequence');\n      }\n\n      captureStart = captureEnd = state.position;\n\n    } else if (is_EOL(ch)) {\n      captureSegment(state, captureStart, captureEnd, true);\n      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));\n      captureStart = captureEnd = state.position;\n\n    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {\n      throwError(state, 'unexpected end of the document within a double quoted scalar');\n\n    } else {\n      state.position++;\n      captureEnd = state.position;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a double quoted scalar');\n}\n\nfunction readFlowCollection(state, nodeIndent) {\n  var readNext = true,\n      _line,\n      _tag     = state.tag,\n      _result,\n      _anchor  = state.anchor,\n      following,\n      terminator,\n      isPair,\n      isExplicitPair,\n      isMapping,\n      overridableKeys = {},\n      keyNode,\n      keyTag,\n      valueNode,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x5B/* [ */) {\n    terminator = 0x5D;/* ] */\n    isMapping = false;\n    _result = [];\n  } else if (ch === 0x7B/* { */) {\n    terminator = 0x7D;/* } */\n    isMapping = true;\n    _result = {};\n  } else {\n    return false;\n  }\n\n  if (state.anchor !== null) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n\n  while (ch !== 0) {\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (ch === terminator) {\n      state.position++;\n      state.tag = _tag;\n      state.anchor = _anchor;\n      state.kind = isMapping ? 'mapping' : 'sequence';\n      state.result = _result;\n      return true;\n    } else if (!readNext) {\n      throwError(state, 'missed comma between flow collection entries');\n    }\n\n    keyTag = keyNode = valueNode = null;\n    isPair = isExplicitPair = false;\n\n    if (ch === 0x3F/* ? */) {\n      following = state.input.charCodeAt(state.position + 1);\n\n      if (is_WS_OR_EOL(following)) {\n        isPair = isExplicitPair = true;\n        state.position++;\n        skipSeparationSpace(state, true, nodeIndent);\n      }\n    }\n\n    _line = state.line;\n    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);\n    keyTag = state.tag;\n    keyNode = state.result;\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) {\n      isPair = true;\n      ch = state.input.charCodeAt(++state.position);\n      skipSeparationSpace(state, true, nodeIndent);\n      composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);\n      valueNode = state.result;\n    }\n\n    if (isMapping) {\n      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);\n    } else if (isPair) {\n      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));\n    } else {\n      _result.push(keyNode);\n    }\n\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (ch === 0x2C/* , */) {\n      readNext = true;\n      ch = state.input.charCodeAt(++state.position);\n    } else {\n      readNext = false;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a flow collection');\n}\n\nfunction readBlockScalar(state, nodeIndent) {\n  var captureStart,\n      folding,\n      chomping       = CHOMPING_CLIP,\n      didReadContent = false,\n      detectedIndent = false,\n      textIndent     = nodeIndent,\n      emptyLines     = 0,\n      atMoreIndented = false,\n      tmp,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x7C/* | */) {\n    folding = false;\n  } else if (ch === 0x3E/* > */) {\n    folding = true;\n  } else {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n\n  while (ch !== 0) {\n    ch = state.input.charCodeAt(++state.position);\n\n    if (ch === 0x2B/* + */ || ch === 0x2D/* - */) {\n      if (CHOMPING_CLIP === chomping) {\n        chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP;\n      } else {\n        throwError(state, 'repeat of a chomping mode identifier');\n      }\n\n    } else if ((tmp = fromDecimalCode(ch)) >= 0) {\n      if (tmp === 0) {\n        throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one');\n      } else if (!detectedIndent) {\n        textIndent = nodeIndent + tmp - 1;\n        detectedIndent = true;\n      } else {\n        throwError(state, 'repeat of an indentation width identifier');\n      }\n\n    } else {\n      break;\n    }\n  }\n\n  if (is_WHITE_SPACE(ch)) {\n    do { ch = state.input.charCodeAt(++state.position); }\n    while (is_WHITE_SPACE(ch));\n\n    if (ch === 0x23/* # */) {\n      do { ch = state.input.charCodeAt(++state.position); }\n      while (!is_EOL(ch) && (ch !== 0));\n    }\n  }\n\n  while (ch !== 0) {\n    readLineBreak(state);\n    state.lineIndent = 0;\n\n    ch = state.input.charCodeAt(state.position);\n\n    while ((!detectedIndent || state.lineIndent < textIndent) &&\n           (ch === 0x20/* Space */)) {\n      state.lineIndent++;\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    if (!detectedIndent && state.lineIndent > textIndent) {\n      textIndent = state.lineIndent;\n    }\n\n    if (is_EOL(ch)) {\n      emptyLines++;\n      continue;\n    }\n\n    // End of the scalar.\n    if (state.lineIndent < textIndent) {\n\n      // Perform the chomping.\n      if (chomping === CHOMPING_KEEP) {\n        state.result += common.repeat('\\n', didReadContent ? 1 + emptyLines : emptyLines);\n      } else if (chomping === CHOMPING_CLIP) {\n        if (didReadContent) { // i.e. only if the scalar is not empty.\n          state.result += '\\n';\n        }\n      }\n\n      // Break this `while` cycle and go to the funciton's epilogue.\n      break;\n    }\n\n    // Folded style: use fancy rules to handle line breaks.\n    if (folding) {\n\n      // Lines starting with white space characters (more-indented lines) are not folded.\n      if (is_WHITE_SPACE(ch)) {\n        atMoreIndented = true;\n        // except for the first content line (cf. Example 8.1)\n        state.result += common.repeat('\\n', didReadContent ? 1 + emptyLines : emptyLines);\n\n      // End of more-indented block.\n      } else if (atMoreIndented) {\n        atMoreIndented = false;\n        state.result += common.repeat('\\n', emptyLines + 1);\n\n      // Just one line break - perceive as the same line.\n      } else if (emptyLines === 0) {\n        if (didReadContent) { // i.e. only if we have already read some scalar content.\n          state.result += ' ';\n        }\n\n      // Several line breaks - perceive as different lines.\n      } else {\n        state.result += common.repeat('\\n', emptyLines);\n      }\n\n    // Literal style: just add exact number of line breaks between content lines.\n    } else {\n      // Keep all line breaks except the header line break.\n      state.result += common.repeat('\\n', didReadContent ? 1 + emptyLines : emptyLines);\n    }\n\n    didReadContent = true;\n    detectedIndent = true;\n    emptyLines = 0;\n    captureStart = state.position;\n\n    while (!is_EOL(ch) && (ch !== 0)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    captureSegment(state, captureStart, state.position, false);\n  }\n\n  return true;\n}\n\nfunction readBlockSequence(state, nodeIndent) {\n  var _line,\n      _tag      = state.tag,\n      _anchor   = state.anchor,\n      _result   = [],\n      following,\n      detected  = false,\n      ch;\n\n  if (state.anchor !== null) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(state.position);\n\n  while (ch !== 0) {\n\n    if (ch !== 0x2D/* - */) {\n      break;\n    }\n\n    following = state.input.charCodeAt(state.position + 1);\n\n    if (!is_WS_OR_EOL(following)) {\n      break;\n    }\n\n    detected = true;\n    state.position++;\n\n    if (skipSeparationSpace(state, true, -1)) {\n      if (state.lineIndent <= nodeIndent) {\n        _result.push(null);\n        ch = state.input.charCodeAt(state.position);\n        continue;\n      }\n    }\n\n    _line = state.line;\n    composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true);\n    _result.push(state.result);\n    skipSeparationSpace(state, true, -1);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {\n      throwError(state, 'bad indentation of a sequence entry');\n    } else if (state.lineIndent < nodeIndent) {\n      break;\n    }\n  }\n\n  if (detected) {\n    state.tag = _tag;\n    state.anchor = _anchor;\n    state.kind = 'sequence';\n    state.result = _result;\n    return true;\n  }\n  return false;\n}\n\nfunction readBlockMapping(state, nodeIndent, flowIndent) {\n  var following,\n      allowCompact,\n      _line,\n      _tag          = state.tag,\n      _anchor       = state.anchor,\n      _result       = {},\n      overridableKeys = {},\n      keyTag        = null,\n      keyNode       = null,\n      valueNode     = null,\n      atExplicitKey = false,\n      detected      = false,\n      ch;\n\n  if (state.anchor !== null) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(state.position);\n\n  while (ch !== 0) {\n    following = state.input.charCodeAt(state.position + 1);\n    _line = state.line; // Save the current line.\n\n    //\n    // Explicit notation case. There are two separate blocks:\n    // first for the key (denoted by \"?\") and second for the value (denoted by \":\")\n    //\n    if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) {\n\n      if (ch === 0x3F/* ? */) {\n        if (atExplicitKey) {\n          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);\n          keyTag = keyNode = valueNode = null;\n        }\n\n        detected = true;\n        atExplicitKey = true;\n        allowCompact = true;\n\n      } else if (atExplicitKey) {\n        // i.e. 0x3A/* : */ === character after the explicit key.\n        atExplicitKey = false;\n        allowCompact = true;\n\n      } else {\n        throwError(state, 'incomplete explicit mapping pair; a key node is missed');\n      }\n\n      state.position += 1;\n      ch = following;\n\n    //\n    // Implicit notation case. Flow-style node as the key first, then \":\", and the value.\n    //\n    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {\n\n      if (state.line === _line) {\n        ch = state.input.charCodeAt(state.position);\n\n        while (is_WHITE_SPACE(ch)) {\n          ch = state.input.charCodeAt(++state.position);\n        }\n\n        if (ch === 0x3A/* : */) {\n          ch = state.input.charCodeAt(++state.position);\n\n          if (!is_WS_OR_EOL(ch)) {\n            throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping');\n          }\n\n          if (atExplicitKey) {\n            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);\n            keyTag = keyNode = valueNode = null;\n          }\n\n          detected = true;\n          atExplicitKey = false;\n          allowCompact = false;\n          keyTag = state.tag;\n          keyNode = state.result;\n\n        } else if (detected) {\n          throwError(state, 'can not read an implicit mapping pair; a colon is missed');\n\n        } else {\n          state.tag = _tag;\n          state.anchor = _anchor;\n          return true; // Keep the result of `composeNode`.\n        }\n\n      } else if (detected) {\n        throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key');\n\n      } else {\n        state.tag = _tag;\n        state.anchor = _anchor;\n        return true; // Keep the result of `composeNode`.\n      }\n\n    } else {\n      break; // Reading is done. Go to the epilogue.\n    }\n\n    //\n    // Common reading code for both explicit and implicit notations.\n    //\n    if (state.line === _line || state.lineIndent > nodeIndent) {\n      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {\n        if (atExplicitKey) {\n          keyNode = state.result;\n        } else {\n          valueNode = state.result;\n        }\n      }\n\n      if (!atExplicitKey) {\n        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);\n        keyTag = keyNode = valueNode = null;\n      }\n\n      skipSeparationSpace(state, true, -1);\n      ch = state.input.charCodeAt(state.position);\n    }\n\n    if (state.lineIndent > nodeIndent && (ch !== 0)) {\n      throwError(state, 'bad indentation of a mapping entry');\n    } else if (state.lineIndent < nodeIndent) {\n      break;\n    }\n  }\n\n  //\n  // Epilogue.\n  //\n\n  // Special case: last mapping's node contains only the key in explicit notation.\n  if (atExplicitKey) {\n    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);\n  }\n\n  // Expose the resulting mapping.\n  if (detected) {\n    state.tag = _tag;\n    state.anchor = _anchor;\n    state.kind = 'mapping';\n    state.result = _result;\n  }\n\n  return detected;\n}\n\nfunction readTagProperty(state) {\n  var _position,\n      isVerbatim = false,\n      isNamed    = false,\n      tagHandle,\n      tagName,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x21/* ! */) return false;\n\n  if (state.tag !== null) {\n    throwError(state, 'duplication of a tag property');\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n\n  if (ch === 0x3C/* < */) {\n    isVerbatim = true;\n    ch = state.input.charCodeAt(++state.position);\n\n  } else if (ch === 0x21/* ! */) {\n    isNamed = true;\n    tagHandle = '!!';\n    ch = state.input.charCodeAt(++state.position);\n\n  } else {\n    tagHandle = '!';\n  }\n\n  _position = state.position;\n\n  if (isVerbatim) {\n    do { ch = state.input.charCodeAt(++state.position); }\n    while (ch !== 0 && ch !== 0x3E/* > */);\n\n    if (state.position < state.length) {\n      tagName = state.input.slice(_position, state.position);\n      ch = state.input.charCodeAt(++state.position);\n    } else {\n      throwError(state, 'unexpected end of the stream within a verbatim tag');\n    }\n  } else {\n    while (ch !== 0 && !is_WS_OR_EOL(ch)) {\n\n      if (ch === 0x21/* ! */) {\n        if (!isNamed) {\n          tagHandle = state.input.slice(_position - 1, state.position + 1);\n\n          if (!PATTERN_TAG_HANDLE.test(tagHandle)) {\n            throwError(state, 'named tag handle cannot contain such characters');\n          }\n\n          isNamed = true;\n          _position = state.position + 1;\n        } else {\n          throwError(state, 'tag suffix cannot contain exclamation marks');\n        }\n      }\n\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    tagName = state.input.slice(_position, state.position);\n\n    if (PATTERN_FLOW_INDICATORS.test(tagName)) {\n      throwError(state, 'tag suffix cannot contain flow indicator characters');\n    }\n  }\n\n  if (tagName && !PATTERN_TAG_URI.test(tagName)) {\n    throwError(state, 'tag name cannot contain such characters: ' + tagName);\n  }\n\n  if (isVerbatim) {\n    state.tag = tagName;\n\n  } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {\n    state.tag = state.tagMap[tagHandle] + tagName;\n\n  } else if (tagHandle === '!') {\n    state.tag = '!' + tagName;\n\n  } else if (tagHandle === '!!') {\n    state.tag = 'tag:yaml.org,2002:' + tagName;\n\n  } else {\n    throwError(state, 'undeclared tag handle \"' + tagHandle + '\"');\n  }\n\n  return true;\n}\n\nfunction readAnchorProperty(state) {\n  var _position,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x26/* & */) return false;\n\n  if (state.anchor !== null) {\n    throwError(state, 'duplication of an anchor property');\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n  _position = state.position;\n\n  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  if (state.position === _position) {\n    throwError(state, 'name of an anchor node must contain at least one character');\n  }\n\n  state.anchor = state.input.slice(_position, state.position);\n  return true;\n}\n\nfunction readAlias(state) {\n  var _position, alias,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x2A/* * */) return false;\n\n  ch = state.input.charCodeAt(++state.position);\n  _position = state.position;\n\n  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  if (state.position === _position) {\n    throwError(state, 'name of an alias node must contain at least one character');\n  }\n\n  alias = state.input.slice(_position, state.position);\n\n  if (!state.anchorMap.hasOwnProperty(alias)) {\n    throwError(state, 'unidentified alias \"' + alias + '\"');\n  }\n\n  state.result = state.anchorMap[alias];\n  skipSeparationSpace(state, true, -1);\n  return true;\n}\n\nfunction composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) {\n  var allowBlockStyles,\n      allowBlockScalars,\n      allowBlockCollections,\n      indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this<parent\n      atNewLine  = false,\n      hasContent = false,\n      typeIndex,\n      typeQuantity,\n      type,\n      flowIndent,\n      blockIndent;\n\n  if (state.listener !== null) {\n    state.listener('open', state);\n  }\n\n  state.tag    = null;\n  state.anchor = null;\n  state.kind   = null;\n  state.result = null;\n\n  allowBlockStyles = allowBlockScalars = allowBlockCollections =\n    CONTEXT_BLOCK_OUT === nodeContext ||\n    CONTEXT_BLOCK_IN  === nodeContext;\n\n  if (allowToSeek) {\n    if (skipSeparationSpace(state, true, -1)) {\n      atNewLine = true;\n\n      if (state.lineIndent > parentIndent) {\n        indentStatus = 1;\n      } else if (state.lineIndent === parentIndent) {\n        indentStatus = 0;\n      } else if (state.lineIndent < parentIndent) {\n        indentStatus = -1;\n      }\n    }\n  }\n\n  if (indentStatus === 1) {\n    while (readTagProperty(state) || readAnchorProperty(state)) {\n      if (skipSeparationSpace(state, true, -1)) {\n        atNewLine = true;\n        allowBlockCollections = allowBlockStyles;\n\n        if (state.lineIndent > parentIndent) {\n          indentStatus = 1;\n        } else if (state.lineIndent === parentIndent) {\n          indentStatus = 0;\n        } else if (state.lineIndent < parentIndent) {\n          indentStatus = -1;\n        }\n      } else {\n        allowBlockCollections = false;\n      }\n    }\n  }\n\n  if (allowBlockCollections) {\n    allowBlockCollections = atNewLine || allowCompact;\n  }\n\n  if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {\n    if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {\n      flowIndent = parentIndent;\n    } else {\n      flowIndent = parentIndent + 1;\n    }\n\n    blockIndent = state.position - state.lineStart;\n\n    if (indentStatus === 1) {\n      if (allowBlockCollections &&\n          (readBlockSequence(state, blockIndent) ||\n           readBlockMapping(state, blockIndent, flowIndent)) ||\n          readFlowCollection(state, flowIndent)) {\n        hasContent = true;\n      } else {\n        if ((allowBlockScalars && readBlockScalar(state, flowIndent)) ||\n            readSingleQuotedScalar(state, flowIndent) ||\n            readDoubleQuotedScalar(state, flowIndent)) {\n          hasContent = true;\n\n        } else if (readAlias(state)) {\n          hasContent = true;\n\n          if (state.tag !== null || state.anchor !== null) {\n            throwError(state, 'alias node should not have any properties');\n          }\n\n        } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {\n          hasContent = true;\n\n          if (state.tag === null) {\n            state.tag = '?';\n          }\n        }\n\n        if (state.anchor !== null) {\n          state.anchorMap[state.anchor] = state.result;\n        }\n      }\n    } else if (indentStatus === 0) {\n      // Special case: block sequences are allowed to have same indentation level as the parent.\n      // http://www.yaml.org/spec/1.2/spec.html#id2799784\n      hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);\n    }\n  }\n\n  if (state.tag !== null && state.tag !== '!') {\n    if (state.tag === '?') {\n      for (typeIndex = 0, typeQuantity = state.implicitTypes.length;\n           typeIndex < typeQuantity;\n           typeIndex += 1) {\n        type = state.implicitTypes[typeIndex];\n\n        // Implicit resolving is not allowed for non-scalar types, and '?'\n        // non-specific tag is only assigned to plain scalars. So, it isn't\n        // needed to check for 'kind' conformity.\n\n        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched\n          state.result = type.construct(state.result);\n          state.tag = type.tag;\n          if (state.anchor !== null) {\n            state.anchorMap[state.anchor] = state.result;\n          }\n          break;\n        }\n      }\n    } else if (_hasOwnProperty.call(state.typeMap, state.tag)) {\n      type = state.typeMap[state.tag];\n\n      if (state.result !== null && type.kind !== state.kind) {\n        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be \"' + type.kind + '\", not \"' + state.kind + '\"');\n      }\n\n      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched\n        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');\n      } else {\n        state.result = type.construct(state.result);\n        if (state.anchor !== null) {\n          state.anchorMap[state.anchor] = state.result;\n        }\n      }\n    } else {\n      throwError(state, 'unknown tag !<' + state.tag + '>');\n    }\n  }\n\n  if (state.listener !== null) {\n    state.listener('close', state);\n  }\n  return state.tag !== null ||  state.anchor !== null || hasContent;\n}\n\nfunction readDocument(state) {\n  var documentStart = state.position,\n      _position,\n      directiveName,\n      directiveArgs,\n      hasDirectives = false,\n      ch;\n\n  state.version = null;\n  state.checkLineBreaks = state.legacy;\n  state.tagMap = {};\n  state.anchorMap = {};\n\n  while ((ch = state.input.charCodeAt(state.position)) !== 0) {\n    skipSeparationSpace(state, true, -1);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (state.lineIndent > 0 || ch !== 0x25/* % */) {\n      break;\n    }\n\n    hasDirectives = true;\n    ch = state.input.charCodeAt(++state.position);\n    _position = state.position;\n\n    while (ch !== 0 && !is_WS_OR_EOL(ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    directiveName = state.input.slice(_position, state.position);\n    directiveArgs = [];\n\n    if (directiveName.length < 1) {\n      throwError(state, 'directive name must not be less than one character in length');\n    }\n\n    while (ch !== 0) {\n      while (is_WHITE_SPACE(ch)) {\n        ch = state.input.charCodeAt(++state.position);\n      }\n\n      if (ch === 0x23/* # */) {\n        do { ch = state.input.charCodeAt(++state.position); }\n        while (ch !== 0 && !is_EOL(ch));\n        break;\n      }\n\n      if (is_EOL(ch)) break;\n\n      _position = state.position;\n\n      while (ch !== 0 && !is_WS_OR_EOL(ch)) {\n        ch = state.input.charCodeAt(++state.position);\n      }\n\n      directiveArgs.push(state.input.slice(_position, state.position));\n    }\n\n    if (ch !== 0) readLineBreak(state);\n\n    if (_hasOwnProperty.call(directiveHandlers, directiveName)) {\n      directiveHandlers[directiveName](state, directiveName, directiveArgs);\n    } else {\n      throwWarning(state, 'unknown document directive \"' + directiveName + '\"');\n    }\n  }\n\n  skipSeparationSpace(state, true, -1);\n\n  if (state.lineIndent === 0 &&\n      state.input.charCodeAt(state.position)     === 0x2D/* - */ &&\n      state.input.charCodeAt(state.position + 1) === 0x2D/* - */ &&\n      state.input.charCodeAt(state.position + 2) === 0x2D/* - */) {\n    state.position += 3;\n    skipSeparationSpace(state, true, -1);\n\n  } else if (hasDirectives) {\n    throwError(state, 'directives end mark is expected');\n  }\n\n  composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true);\n  skipSeparationSpace(state, true, -1);\n\n  if (state.checkLineBreaks &&\n      PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) {\n    throwWarning(state, 'non-ASCII line breaks are interpreted as content');\n  }\n\n  state.documents.push(state.result);\n\n  if (state.position === state.lineStart && testDocumentSeparator(state)) {\n\n    if (state.input.charCodeAt(state.position) === 0x2E/* . */) {\n      state.position += 3;\n      skipSeparationSpace(state, true, -1);\n    }\n    return;\n  }\n\n  if (state.position < (state.length - 1)) {\n    throwError(state, 'end of the stream or a document separator is expected');\n  } else {\n    return;\n  }\n}\n\n\nfunction loadDocuments(input, options) {\n  input = String(input);\n  options = options || {};\n\n  if (input.length !== 0) {\n\n    // Add tailing `\\n` if not exists\n    if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ &&\n        input.charCodeAt(input.length - 1) !== 0x0D/* CR */) {\n      input += '\\n';\n    }\n\n    // Strip BOM\n    if (input.charCodeAt(0) === 0xFEFF) {\n      input = input.slice(1);\n    }\n  }\n\n  var state = new State(input, options);\n\n  // Use 0 as string terminator. That significantly simplifies bounds check.\n  state.input += '\\0';\n\n  while (state.input.charCodeAt(state.position) === 0x20/* Space */) {\n    state.lineIndent += 1;\n    state.position += 1;\n  }\n\n  while (state.position < (state.length - 1)) {\n    readDocument(state);\n  }\n\n  return state.documents;\n}\n\n\nfunction loadAll(input, iterator, options) {\n  var documents = loadDocuments(input, options), index, length;\n\n  for (index = 0, length = documents.length; index < length; index += 1) {\n    iterator(documents[index]);\n  }\n}\n\n\nfunction load(input, options) {\n  var documents = loadDocuments(input, options);\n\n  if (documents.length === 0) {\n    /*eslint-disable no-undefined*/\n    return undefined;\n  } else if (documents.length === 1) {\n    return documents[0];\n  }\n  throw new YAMLException('expected a single document in the stream, but found more');\n}\n\n\nfunction safeLoadAll(input, output, options) {\n  loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\n\nfunction safeLoad(input, options) {\n  return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\n\nmodule.exports.loadAll     = loadAll;\nmodule.exports.load        = load;\nmodule.exports.safeLoadAll = safeLoadAll;\nmodule.exports.safeLoad    = safeLoad;\n","'use strict';\n\n\nvar common = require('./common');\n\n\nfunction Mark(name, buffer, position, line, column) {\n  this.name     = name;\n  this.buffer   = buffer;\n  this.position = position;\n  this.line     = line;\n  this.column   = column;\n}\n\n\nMark.prototype.getSnippet = function getSnippet(indent, maxLength) {\n  var head, start, tail, end, snippet;\n\n  if (!this.buffer) return null;\n\n  indent = indent || 4;\n  maxLength = maxLength || 75;\n\n  head = '';\n  start = this.position;\n\n  while (start > 0 && '\\x00\\r\\n\\x85\\u2028\\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {\n    start -= 1;\n    if (this.position - start > (maxLength / 2 - 1)) {\n      head = ' ... ';\n      start += 5;\n      break;\n    }\n  }\n\n  tail = '';\n  end = this.position;\n\n  while (end < this.buffer.length && '\\x00\\r\\n\\x85\\u2028\\u2029'.indexOf(this.buffer.charAt(end)) === -1) {\n    end += 1;\n    if (end - this.position > (maxLength / 2 - 1)) {\n      tail = ' ... ';\n      end -= 5;\n      break;\n    }\n  }\n\n  snippet = this.buffer.slice(start, end);\n\n  return common.repeat(' ', indent) + head + snippet + tail + '\\n' +\n         common.repeat(' ', indent + this.position - start + head.length) + '^';\n};\n\n\nMark.prototype.toString = function toString(compact) {\n  var snippet, where = '';\n\n  if (this.name) {\n    where += 'in \"' + this.name + '\" ';\n  }\n\n  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);\n\n  if (!compact) {\n    snippet = this.getSnippet();\n\n    if (snippet) {\n      where += ':\\n' + snippet;\n    }\n  }\n\n  return where;\n};\n\n\nmodule.exports = Mark;\n","'use strict';\n\n/*eslint-disable max-len*/\n\nvar common        = require('./common');\nvar YAMLException = require('./exception');\nvar Type          = require('./type');\n\n\nfunction compileList(schema, name, result) {\n  var exclude = [];\n\n  schema.include.forEach(function (includedSchema) {\n    result = compileList(includedSchema, name, result);\n  });\n\n  schema[name].forEach(function (currentType) {\n    result.forEach(function (previousType, previousIndex) {\n      if (previousType.tag === currentType.tag) {\n        exclude.push(previousIndex);\n      }\n    });\n\n    result.push(currentType);\n  });\n\n  return result.filter(function (type, index) {\n    return exclude.indexOf(index) === -1;\n  });\n}\n\n\nfunction compileMap(/* lists... */) {\n  var result = {}, index, length;\n\n  function collectType(type) {\n    result[type.tag] = type;\n  }\n\n  for (index = 0, length = arguments.length; index < length; index += 1) {\n    arguments[index].forEach(collectType);\n  }\n\n  return result;\n}\n\n\nfunction Schema(definition) {\n  this.include  = definition.include  || [];\n  this.implicit = definition.implicit || [];\n  this.explicit = definition.explicit || [];\n\n  this.implicit.forEach(function (type) {\n    if (type.loadKind && type.loadKind !== 'scalar') {\n      throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');\n    }\n  });\n\n  this.compiledImplicit = compileList(this, 'implicit', []);\n  this.compiledExplicit = compileList(this, 'explicit', []);\n  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);\n}\n\n\nSchema.DEFAULT = null;\n\n\nSchema.create = function createSchema() {\n  var schemas, types;\n\n  switch (arguments.length) {\n    case 1:\n      schemas = Schema.DEFAULT;\n      types = arguments[0];\n      break;\n\n    case 2:\n      schemas = arguments[0];\n      types = arguments[1];\n      break;\n\n    default:\n      throw new YAMLException('Wrong number of arguments for Schema.create function');\n  }\n\n  schemas = common.toArray(schemas);\n  types = common.toArray(types);\n\n  if (!schemas.every(function (schema) { return schema instanceof Schema; })) {\n    throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');\n  }\n\n  if (!types.every(function (type) { return type instanceof Type; })) {\n    throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.');\n  }\n\n  return new Schema({\n    include: schemas,\n    explicit: types\n  });\n};\n\n\nmodule.exports = Schema;\n","// Standard YAML's Core schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2804923\n//\n// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.\n// So, Core schema has no distinctions from JSON schema is JS-YAML.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./json')\n  ]\n});\n","// JS-YAML's default schema for `load` function.\n// It is not described in the YAML specification.\n//\n// This schema is based on JS-YAML's default safe schema and includes\n// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function.\n//\n// Also this schema is used as default base schema at `Schema.create` function.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = Schema.DEFAULT = new Schema({\n  include: [\n    require('./default_safe')\n  ],\n  explicit: [\n    require('../type/js/undefined'),\n    require('../type/js/regexp'),\n    require('../type/js/function')\n  ]\n});\n","// JS-YAML's default schema for `safeLoad` function.\n// It is not described in the YAML specification.\n//\n// This schema is based on standard YAML's Core schema and includes most of\n// extra types described at YAML tag repository. (http://yaml.org/type/)\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./core')\n  ],\n  implicit: [\n    require('../type/timestamp'),\n    require('../type/merge')\n  ],\n  explicit: [\n    require('../type/binary'),\n    require('../type/omap'),\n    require('../type/pairs'),\n    require('../type/set')\n  ]\n});\n","// Standard YAML's Failsafe schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2802346\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  explicit: [\n    require('../type/str'),\n    require('../type/seq'),\n    require('../type/map')\n  ]\n});\n","// Standard YAML's JSON schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2803231\n//\n// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.\n// So, this schema is not such strict as defined in the YAML specification.\n// It allows numbers in binary notaion, use `Null` and `NULL` as `null`, etc.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./failsafe')\n  ],\n  implicit: [\n    require('../type/null'),\n    require('../type/bool'),\n    require('../type/int'),\n    require('../type/float')\n  ]\n});\n","'use strict';\n\nvar YAMLException = require('./exception');\n\nvar TYPE_CONSTRUCTOR_OPTIONS = [\n  'kind',\n  'resolve',\n  'construct',\n  'instanceOf',\n  'predicate',\n  'represent',\n  'defaultStyle',\n  'styleAliases'\n];\n\nvar YAML_NODE_KINDS = [\n  'scalar',\n  'sequence',\n  'mapping'\n];\n\nfunction compileStyleAliases(map) {\n  var result = {};\n\n  if (map !== null) {\n    Object.keys(map).forEach(function (style) {\n      map[style].forEach(function (alias) {\n        result[String(alias)] = style;\n      });\n    });\n  }\n\n  return result;\n}\n\nfunction Type(tag, options) {\n  options = options || {};\n\n  Object.keys(options).forEach(function (name) {\n    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {\n      throw new YAMLException('Unknown option \"' + name + '\" is met in definition of \"' + tag + '\" YAML type.');\n    }\n  });\n\n  // TODO: Add tag format check.\n  this.tag          = tag;\n  this.kind         = options['kind']         || null;\n  this.resolve      = options['resolve']      || function () { return true; };\n  this.construct    = options['construct']    || function (data) { return data; };\n  this.instanceOf   = options['instanceOf']   || null;\n  this.predicate    = options['predicate']    || null;\n  this.represent    = options['represent']    || null;\n  this.defaultStyle = options['defaultStyle'] || null;\n  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);\n\n  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {\n    throw new YAMLException('Unknown kind \"' + this.kind + '\" is specified for \"' + tag + '\" YAML type.');\n  }\n}\n\nmodule.exports = Type;\n","'use strict';\n\n/*eslint-disable no-bitwise*/\n\nvar NodeBuffer;\n\ntry {\n  // A trick for browserified version, to not include `Buffer` shim\n  var _require = require;\n  NodeBuffer = _require('buffer').Buffer;\n} catch (__) {}\n\nvar Type       = require('../type');\n\n\n// [ 64, 65, 66 ] -> [ padding, CR, LF ]\nvar BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\\n\\r';\n\n\nfunction resolveYamlBinary(data) {\n  if (data === null) return false;\n\n  var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;\n\n  // Convert one by one.\n  for (idx = 0; idx < max; idx++) {\n    code = map.indexOf(data.charAt(idx));\n\n    // Skip CR/LF\n    if (code > 64) continue;\n\n    // Fail on illegal characters\n    if (code < 0) return false;\n\n    bitlen += 6;\n  }\n\n  // If there are any bits left, source was corrupted\n  return (bitlen % 8) === 0;\n}\n\nfunction constructYamlBinary(data) {\n  var idx, tailbits,\n      input = data.replace(/[\\r\\n=]/g, ''), // remove CR/LF & padding to simplify scan\n      max = input.length,\n      map = BASE64_MAP,\n      bits = 0,\n      result = [];\n\n  // Collect by 6*4 bits (3 bytes)\n\n  for (idx = 0; idx < max; idx++) {\n    if ((idx % 4 === 0) && idx) {\n      result.push((bits >> 16) & 0xFF);\n      result.push((bits >> 8) & 0xFF);\n      result.push(bits & 0xFF);\n    }\n\n    bits = (bits << 6) | map.indexOf(input.charAt(idx));\n  }\n\n  // Dump tail\n\n  tailbits = (max % 4) * 6;\n\n  if (tailbits === 0) {\n    result.push((bits >> 16) & 0xFF);\n    result.push((bits >> 8) & 0xFF);\n    result.push(bits & 0xFF);\n  } else if (tailbits === 18) {\n    result.push((bits >> 10) & 0xFF);\n    result.push((bits >> 2) & 0xFF);\n  } else if (tailbits === 12) {\n    result.push((bits >> 4) & 0xFF);\n  }\n\n  // Wrap into Buffer for NodeJS and leave Array for browser\n  if (NodeBuffer) return new NodeBuffer(result);\n\n  return result;\n}\n\nfunction representYamlBinary(object /*, style*/) {\n  var result = '', bits = 0, idx, tail,\n      max = object.length,\n      map = BASE64_MAP;\n\n  // Convert every three bytes to 4 ASCII characters.\n\n  for (idx = 0; idx < max; idx++) {\n    if ((idx % 3 === 0) && idx) {\n      result += map[(bits >> 18) & 0x3F];\n      result += map[(bits >> 12) & 0x3F];\n      result += map[(bits >> 6) & 0x3F];\n      result += map[bits & 0x3F];\n    }\n\n    bits = (bits << 8) + object[idx];\n  }\n\n  // Dump tail\n\n  tail = max % 3;\n\n  if (tail === 0) {\n    result += map[(bits >> 18) & 0x3F];\n    result += map[(bits >> 12) & 0x3F];\n    result += map[(bits >> 6) & 0x3F];\n    result += map[bits & 0x3F];\n  } else if (tail === 2) {\n    result += map[(bits >> 10) & 0x3F];\n    result += map[(bits >> 4) & 0x3F];\n    result += map[(bits << 2) & 0x3F];\n    result += map[64];\n  } else if (tail === 1) {\n    result += map[(bits >> 2) & 0x3F];\n    result += map[(bits << 4) & 0x3F];\n    result += map[64];\n    result += map[64];\n  }\n\n  return result;\n}\n\nfunction isBinary(object) {\n  return NodeBuffer && NodeBuffer.isBuffer(object);\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:binary', {\n  kind: 'scalar',\n  resolve: resolveYamlBinary,\n  construct: constructYamlBinary,\n  predicate: isBinary,\n  represent: representYamlBinary\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlBoolean(data) {\n  if (data === null) return false;\n\n  var max = data.length;\n\n  return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) ||\n         (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE'));\n}\n\nfunction constructYamlBoolean(data) {\n  return data === 'true' ||\n         data === 'True' ||\n         data === 'TRUE';\n}\n\nfunction isBoolean(object) {\n  return Object.prototype.toString.call(object) === '[object Boolean]';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:bool', {\n  kind: 'scalar',\n  resolve: resolveYamlBoolean,\n  construct: constructYamlBoolean,\n  predicate: isBoolean,\n  represent: {\n    lowercase: function (object) { return object ? 'true' : 'false'; },\n    uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; },\n    camelcase: function (object) { return object ? 'True' : 'False'; }\n  },\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar common = require('../common');\nvar Type   = require('../type');\n\nvar YAML_FLOAT_PATTERN = new RegExp(\n  '^(?:[-+]?(?:[0-9][0-9_]*)\\\\.[0-9_]*(?:[eE][-+][0-9]+)?' +\n  '|\\\\.[0-9_]+(?:[eE][-+][0-9]+)?' +\n  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\\\.[0-9_]*' +\n  '|[-+]?\\\\.(?:inf|Inf|INF)' +\n  '|\\\\.(?:nan|NaN|NAN))$');\n\nfunction resolveYamlFloat(data) {\n  if (data === null) return false;\n\n  if (!YAML_FLOAT_PATTERN.test(data)) return false;\n\n  return true;\n}\n\nfunction constructYamlFloat(data) {\n  var value, sign, base, digits;\n\n  value  = data.replace(/_/g, '').toLowerCase();\n  sign   = value[0] === '-' ? -1 : 1;\n  digits = [];\n\n  if ('+-'.indexOf(value[0]) >= 0) {\n    value = value.slice(1);\n  }\n\n  if (value === '.inf') {\n    return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;\n\n  } else if (value === '.nan') {\n    return NaN;\n\n  } else if (value.indexOf(':') >= 0) {\n    value.split(':').forEach(function (v) {\n      digits.unshift(parseFloat(v, 10));\n    });\n\n    value = 0.0;\n    base = 1;\n\n    digits.forEach(function (d) {\n      value += d * base;\n      base *= 60;\n    });\n\n    return sign * value;\n\n  }\n  return sign * parseFloat(value, 10);\n}\n\n\nvar SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/;\n\nfunction representYamlFloat(object, style) {\n  var res;\n\n  if (isNaN(object)) {\n    switch (style) {\n      case 'lowercase': return '.nan';\n      case 'uppercase': return '.NAN';\n      case 'camelcase': return '.NaN';\n    }\n  } else if (Number.POSITIVE_INFINITY === object) {\n    switch (style) {\n      case 'lowercase': return '.inf';\n      case 'uppercase': return '.INF';\n      case 'camelcase': return '.Inf';\n    }\n  } else if (Number.NEGATIVE_INFINITY === object) {\n    switch (style) {\n      case 'lowercase': return '-.inf';\n      case 'uppercase': return '-.INF';\n      case 'camelcase': return '-.Inf';\n    }\n  } else if (common.isNegativeZero(object)) {\n    return '-0.0';\n  }\n\n  res = object.toString(10);\n\n  // JS stringifier can build scientific format without dots: 5e-100,\n  // while YAML requres dot: 5.e-100. Fix it with simple hack\n\n  return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res;\n}\n\nfunction isFloat(object) {\n  return (Object.prototype.toString.call(object) === '[object Number]') &&\n         (object % 1 !== 0 || common.isNegativeZero(object));\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:float', {\n  kind: 'scalar',\n  resolve: resolveYamlFloat,\n  construct: constructYamlFloat,\n  predicate: isFloat,\n  represent: representYamlFloat,\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar common = require('../common');\nvar Type   = require('../type');\n\nfunction isHexCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||\n         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||\n         ((0x61/* a */ <= c) && (c <= 0x66/* f */));\n}\n\nfunction isOctCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */));\n}\n\nfunction isDecCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */));\n}\n\nfunction resolveYamlInteger(data) {\n  if (data === null) return false;\n\n  var max = data.length,\n      index = 0,\n      hasDigits = false,\n      ch;\n\n  if (!max) return false;\n\n  ch = data[index];\n\n  // sign\n  if (ch === '-' || ch === '+') {\n    ch = data[++index];\n  }\n\n  if (ch === '0') {\n    // 0\n    if (index + 1 === max) return true;\n    ch = data[++index];\n\n    // base 2, base 8, base 16\n\n    if (ch === 'b') {\n      // base 2\n      index++;\n\n      for (; index < max; index++) {\n        ch = data[index];\n        if (ch === '_') continue;\n        if (ch !== '0' && ch !== '1') return false;\n        hasDigits = true;\n      }\n      return hasDigits;\n    }\n\n\n    if (ch === 'x') {\n      // base 16\n      index++;\n\n      for (; index < max; index++) {\n        ch = data[index];\n        if (ch === '_') continue;\n        if (!isHexCode(data.charCodeAt(index))) return false;\n        hasDigits = true;\n      }\n      return hasDigits;\n    }\n\n    // base 8\n    for (; index < max; index++) {\n      ch = data[index];\n      if (ch === '_') continue;\n      if (!isOctCode(data.charCodeAt(index))) return false;\n      hasDigits = true;\n    }\n    return hasDigits;\n  }\n\n  // base 10 (except 0) or base 60\n\n  for (; index < max; index++) {\n    ch = data[index];\n    if (ch === '_') continue;\n    if (ch === ':') break;\n    if (!isDecCode(data.charCodeAt(index))) {\n      return false;\n    }\n    hasDigits = true;\n  }\n\n  if (!hasDigits) return false;\n\n  // if !base60 - done;\n  if (ch !== ':') return true;\n\n  // base60 almost not used, no needs to optimize\n  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));\n}\n\nfunction constructYamlInteger(data) {\n  var value = data, sign = 1, ch, base, digits = [];\n\n  if (value.indexOf('_') !== -1) {\n    value = value.replace(/_/g, '');\n  }\n\n  ch = value[0];\n\n  if (ch === '-' || ch === '+') {\n    if (ch === '-') sign = -1;\n    value = value.slice(1);\n    ch = value[0];\n  }\n\n  if (value === '0') return 0;\n\n  if (ch === '0') {\n    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);\n    if (value[1] === 'x') return sign * parseInt(value, 16);\n    return sign * parseInt(value, 8);\n  }\n\n  if (value.indexOf(':') !== -1) {\n    value.split(':').forEach(function (v) {\n      digits.unshift(parseInt(v, 10));\n    });\n\n    value = 0;\n    base = 1;\n\n    digits.forEach(function (d) {\n      value += (d * base);\n      base *= 60;\n    });\n\n    return sign * value;\n\n  }\n\n  return sign * parseInt(value, 10);\n}\n\nfunction isInteger(object) {\n  return (Object.prototype.toString.call(object)) === '[object Number]' &&\n         (object % 1 === 0 && !common.isNegativeZero(object));\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:int', {\n  kind: 'scalar',\n  resolve: resolveYamlInteger,\n  construct: constructYamlInteger,\n  predicate: isInteger,\n  represent: {\n    binary:      function (object) { return '0b' + object.toString(2); },\n    octal:       function (object) { return '0'  + object.toString(8); },\n    decimal:     function (object) { return        object.toString(10); },\n    hexadecimal: function (object) { return '0x' + object.toString(16).toUpperCase(); }\n  },\n  defaultStyle: 'decimal',\n  styleAliases: {\n    binary:      [ 2,  'bin' ],\n    octal:       [ 8,  'oct' ],\n    decimal:     [ 10, 'dec' ],\n    hexadecimal: [ 16, 'hex' ]\n  }\n});\n","'use strict';\n\nvar esprima;\n\n// Browserified version does not have esprima\n//\n// 1. For node.js just require module as deps\n// 2. For browser try to require mudule via external AMD system.\n//    If not found - try to fallback to window.esprima. If not\n//    found too - then fail to parse.\n//\ntry {\n  // workaround to exclude package from browserify list.\n  var _require = require;\n  esprima = _require('esprima');\n} catch (_) {\n  /*global window */\n  if (typeof window !== 'undefined') esprima = window.esprima;\n}\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptFunction(data) {\n  if (data === null) return false;\n\n  try {\n    var source = '(' + data + ')',\n        ast    = esprima.parse(source, { range: true });\n\n    if (ast.type                    !== 'Program'             ||\n        ast.body.length             !== 1                     ||\n        ast.body[0].type            !== 'ExpressionStatement' ||\n        ast.body[0].expression.type !== 'FunctionExpression') {\n      return false;\n    }\n\n    return true;\n  } catch (err) {\n    return false;\n  }\n}\n\nfunction constructJavascriptFunction(data) {\n  /*jslint evil:true*/\n\n  var source = '(' + data + ')',\n      ast    = esprima.parse(source, { range: true }),\n      params = [],\n      body;\n\n  if (ast.type                    !== 'Program'             ||\n      ast.body.length             !== 1                     ||\n      ast.body[0].type            !== 'ExpressionStatement' ||\n      ast.body[0].expression.type !== 'FunctionExpression') {\n    throw new Error('Failed to resolve function');\n  }\n\n  ast.body[0].expression.params.forEach(function (param) {\n    params.push(param.name);\n  });\n\n  body = ast.body[0].expression.body.range;\n\n  // Esprima's ranges include the first '{' and the last '}' characters on\n  // function expressions. So cut them out.\n  /*eslint-disable no-new-func*/\n  return new Function(params, source.slice(body[0] + 1, body[1] - 1));\n}\n\nfunction representJavascriptFunction(object /*, style*/) {\n  return object.toString();\n}\n\nfunction isFunction(object) {\n  return Object.prototype.toString.call(object) === '[object Function]';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/function', {\n  kind: 'scalar',\n  resolve: resolveJavascriptFunction,\n  construct: constructJavascriptFunction,\n  predicate: isFunction,\n  represent: representJavascriptFunction\n});\n","'use strict';\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptRegExp(data) {\n  if (data === null) return false;\n  if (data.length === 0) return false;\n\n  var regexp = data,\n      tail   = /\\/([gim]*)$/.exec(data),\n      modifiers = '';\n\n  // if regexp starts with '/' it can have modifiers and must be properly closed\n  // `/foo/gim` - modifiers tail can be maximum 3 chars\n  if (regexp[0] === '/') {\n    if (tail) modifiers = tail[1];\n\n    if (modifiers.length > 3) return false;\n    // if expression starts with /, is should be properly terminated\n    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;\n  }\n\n  return true;\n}\n\nfunction constructJavascriptRegExp(data) {\n  var regexp = data,\n      tail   = /\\/([gim]*)$/.exec(data),\n      modifiers = '';\n\n  // `/foo/gim` - tail can be maximum 4 chars\n  if (regexp[0] === '/') {\n    if (tail) modifiers = tail[1];\n    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);\n  }\n\n  return new RegExp(regexp, modifiers);\n}\n\nfunction representJavascriptRegExp(object /*, style*/) {\n  var result = '/' + object.source + '/';\n\n  if (object.global) result += 'g';\n  if (object.multiline) result += 'm';\n  if (object.ignoreCase) result += 'i';\n\n  return result;\n}\n\nfunction isRegExp(object) {\n  return Object.prototype.toString.call(object) === '[object RegExp]';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/regexp', {\n  kind: 'scalar',\n  resolve: resolveJavascriptRegExp,\n  construct: constructJavascriptRegExp,\n  predicate: isRegExp,\n  represent: representJavascriptRegExp\n});\n","'use strict';\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptUndefined() {\n  return true;\n}\n\nfunction constructJavascriptUndefined() {\n  /*eslint-disable no-undefined*/\n  return undefined;\n}\n\nfunction representJavascriptUndefined() {\n  return '';\n}\n\nfunction isUndefined(object) {\n  return typeof object === 'undefined';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/undefined', {\n  kind: 'scalar',\n  resolve: resolveJavascriptUndefined,\n  construct: constructJavascriptUndefined,\n  predicate: isUndefined,\n  represent: representJavascriptUndefined\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:map', {\n  kind: 'mapping',\n  construct: function (data) { return data !== null ? data : {}; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlMerge(data) {\n  return data === '<<' || data === null;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:merge', {\n  kind: 'scalar',\n  resolve: resolveYamlMerge\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlNull(data) {\n  if (data === null) return true;\n\n  var max = data.length;\n\n  return (max === 1 && data === '~') ||\n         (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL'));\n}\n\nfunction constructYamlNull() {\n  return null;\n}\n\nfunction isNull(object) {\n  return object === null;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:null', {\n  kind: 'scalar',\n  resolve: resolveYamlNull,\n  construct: constructYamlNull,\n  predicate: isNull,\n  represent: {\n    canonical: function () { return '~';    },\n    lowercase: function () { return 'null'; },\n    uppercase: function () { return 'NULL'; },\n    camelcase: function () { return 'Null'; }\n  },\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\nvar _toString       = Object.prototype.toString;\n\nfunction resolveYamlOmap(data) {\n  if (data === null) return true;\n\n  var objectKeys = [], index, length, pair, pairKey, pairHasKey,\n      object = data;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n    pairHasKey = false;\n\n    if (_toString.call(pair) !== '[object Object]') return false;\n\n    for (pairKey in pair) {\n      if (_hasOwnProperty.call(pair, pairKey)) {\n        if (!pairHasKey) pairHasKey = true;\n        else return false;\n      }\n    }\n\n    if (!pairHasKey) return false;\n\n    if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);\n    else return false;\n  }\n\n  return true;\n}\n\nfunction constructYamlOmap(data) {\n  return data !== null ? data : [];\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:omap', {\n  kind: 'sequence',\n  resolve: resolveYamlOmap,\n  construct: constructYamlOmap\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _toString = Object.prototype.toString;\n\nfunction resolveYamlPairs(data) {\n  if (data === null) return true;\n\n  var index, length, pair, keys, result,\n      object = data;\n\n  result = new Array(object.length);\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n\n    if (_toString.call(pair) !== '[object Object]') return false;\n\n    keys = Object.keys(pair);\n\n    if (keys.length !== 1) return false;\n\n    result[index] = [ keys[0], pair[keys[0]] ];\n  }\n\n  return true;\n}\n\nfunction constructYamlPairs(data) {\n  if (data === null) return [];\n\n  var index, length, pair, keys, result,\n      object = data;\n\n  result = new Array(object.length);\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n\n    keys = Object.keys(pair);\n\n    result[index] = [ keys[0], pair[keys[0]] ];\n  }\n\n  return result;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:pairs', {\n  kind: 'sequence',\n  resolve: resolveYamlPairs,\n  construct: constructYamlPairs\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:seq', {\n  kind: 'sequence',\n  construct: function (data) { return data !== null ? data : []; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nfunction resolveYamlSet(data) {\n  if (data === null) return true;\n\n  var key, object = data;\n\n  for (key in object) {\n    if (_hasOwnProperty.call(object, key)) {\n      if (object[key] !== null) return false;\n    }\n  }\n\n  return true;\n}\n\nfunction constructYamlSet(data) {\n  return data !== null ? data : {};\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:set', {\n  kind: 'mapping',\n  resolve: resolveYamlSet,\n  construct: constructYamlSet\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:str', {\n  kind: 'scalar',\n  construct: function (data) { return data !== null ? data : ''; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar YAML_DATE_REGEXP = new RegExp(\n  '^([0-9][0-9][0-9][0-9])'          + // [1] year\n  '-([0-9][0-9])'                    + // [2] month\n  '-([0-9][0-9])$');                   // [3] day\n\nvar YAML_TIMESTAMP_REGEXP = new RegExp(\n  '^([0-9][0-9][0-9][0-9])'          + // [1] year\n  '-([0-9][0-9]?)'                   + // [2] month\n  '-([0-9][0-9]?)'                   + // [3] day\n  '(?:[Tt]|[ \\\\t]+)'                 + // ...\n  '([0-9][0-9]?)'                    + // [4] hour\n  ':([0-9][0-9])'                    + // [5] minute\n  ':([0-9][0-9])'                    + // [6] second\n  '(?:\\\\.([0-9]*))?'                 + // [7] fraction\n  '(?:[ \\\\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour\n  '(?::([0-9][0-9]))?))?$');           // [11] tz_minute\n\nfunction resolveYamlTimestamp(data) {\n  if (data === null) return false;\n  if (YAML_DATE_REGEXP.exec(data) !== null) return true;\n  if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;\n  return false;\n}\n\nfunction constructYamlTimestamp(data) {\n  var match, year, month, day, hour, minute, second, fraction = 0,\n      delta = null, tz_hour, tz_minute, date;\n\n  match = YAML_DATE_REGEXP.exec(data);\n  if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);\n\n  if (match === null) throw new Error('Date resolve error');\n\n  // match: [1] year [2] month [3] day\n\n  year = +(match[1]);\n  month = +(match[2]) - 1; // JS month starts with 0\n  day = +(match[3]);\n\n  if (!match[4]) { // no hour\n    return new Date(Date.UTC(year, month, day));\n  }\n\n  // match: [4] hour [5] minute [6] second [7] fraction\n\n  hour = +(match[4]);\n  minute = +(match[5]);\n  second = +(match[6]);\n\n  if (match[7]) {\n    fraction = match[7].slice(0, 3);\n    while (fraction.length < 3) { // milli-seconds\n      fraction += '0';\n    }\n    fraction = +fraction;\n  }\n\n  // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute\n\n  if (match[9]) {\n    tz_hour = +(match[10]);\n    tz_minute = +(match[11] || 0);\n    delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds\n    if (match[9] === '-') delta = -delta;\n  }\n\n  date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));\n\n  if (delta) date.setTime(date.getTime() - delta);\n\n  return date;\n}\n\nfunction representYamlTimestamp(object /*, style*/) {\n  return object.toISOString();\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:timestamp', {\n  kind: 'scalar',\n  resolve: resolveYamlTimestamp,\n  construct: constructYamlTimestamp,\n  instanceOf: Date,\n  represent: representYamlTimestamp\n});\n","var baseIndexOf = require('../internal/baseIndexOf'),\n    binaryIndex = require('../internal/binaryIndex');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Gets the index at which the first occurrence of `value` is found in `array`\n * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)\n * for equality comparisons. If `fromIndex` is negative, it's used as the offset\n * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`\n * performs a faster binary search.\n *\n * @static\n * @memberOf _\n * @category Array\n * @param {Array} array The array to search.\n * @param {*} value The value to search for.\n * @param {boolean|number} [fromIndex=0] The index to search from or `true`\n *  to perform a binary search on a sorted array.\n * @returns {number} Returns the index of the matched value, else `-1`.\n * @example\n *\n * _.indexOf([1, 2, 1, 2], 2);\n * // => 1\n *\n * // using `fromIndex`\n * _.indexOf([1, 2, 1, 2], 2, 2);\n * // => 3\n *\n * // performing a binary search\n * _.indexOf([1, 1, 2, 2], 2, true);\n * // => 2\n */\nfunction indexOf(array, value, fromIndex) {\n  var length = array ? array.length : 0;\n  if (!length) {\n    return -1;\n  }\n  if (typeof fromIndex == 'number') {\n    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;\n  } else if (fromIndex) {\n    var index = binaryIndex(array, value);\n    if (index < length &&\n        (value === value ? (value === array[index]) : (array[index] !== array[index]))) {\n      return index;\n    }\n    return -1;\n  }\n  return baseIndexOf(array, value, fromIndex || 0);\n}\n\nmodule.exports = indexOf;\n","/**\n * Gets the last element of `array`.\n *\n * @static\n * @memberOf _\n * @category Array\n * @param {Array} array The array to query.\n * @returns {*} Returns the last element of `array`.\n * @example\n *\n * _.last([1, 2, 3]);\n * // => 3\n */\nfunction last(array) {\n  var length = array ? array.length : 0;\n  return length ? array[length - 1] : undefined;\n}\n\nmodule.exports = last;\n","var LazyWrapper = require('../internal/LazyWrapper'),\n    LodashWrapper = require('../internal/LodashWrapper'),\n    baseLodash = require('../internal/baseLodash'),\n    isArray = require('../lang/isArray'),\n    isObjectLike = require('../internal/isObjectLike'),\n    wrapperClone = require('../internal/wrapperClone');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Creates a `lodash` object which wraps `value` to enable implicit chaining.\n * Methods that operate on and return arrays, collections, and functions can\n * be chained together. Methods that retrieve a single value or may return a\n * primitive value will automatically end the chain returning the unwrapped\n * value. Explicit chaining may be enabled using `_.chain`. The execution of\n * chained methods is lazy, that is, execution is deferred until `_#value`\n * is implicitly or explicitly called.\n *\n * Lazy evaluation allows several methods to support shortcut fusion. Shortcut\n * fusion is an optimization strategy which merge iteratee calls; this can help\n * to avoid the creation of intermediate data structures and greatly reduce the\n * number of iteratee executions.\n *\n * Chaining is supported in custom builds as long as the `_#value` method is\n * directly or indirectly included in the build.\n *\n * In addition to lodash methods, wrappers have `Array` and `String` methods.\n *\n * The wrapper `Array` methods are:\n * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`,\n * `splice`, and `unshift`\n *\n * The wrapper `String` methods are:\n * `replace` and `split`\n *\n * The wrapper methods that support shortcut fusion are:\n * `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`,\n * `first`, `initial`, `last`, `map`, `pluck`, `reject`, `rest`, `reverse`,\n * `slice`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `toArray`,\n * and `where`\n *\n * The chainable wrapper methods are:\n * `after`, `ary`, `assign`, `at`, `before`, `bind`, `bindAll`, `bindKey`,\n * `callback`, `chain`, `chunk`, `commit`, `compact`, `concat`, `constant`,\n * `countBy`, `create`, `curry`, `debounce`, `defaults`, `defaultsDeep`,\n * `defer`, `delay`, `difference`, `drop`, `dropRight`, `dropRightWhile`,\n * `dropWhile`, `fill`, `filter`, `flatten`, `flattenDeep`, `flow`, `flowRight`,\n * `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, `forOwnRight`,\n * `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, `invert`,\n * `invoke`, `keys`, `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`,\n * `matchesProperty`, `memoize`, `merge`, `method`, `methodOf`, `mixin`,\n * `modArgs`, `negate`, `omit`, `once`, `pairs`, `partial`, `partialRight`,\n * `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`,\n * `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `restParam`,\n * `reverse`, `set`, `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`,\n * `sortByOrder`, `splice`, `spread`, `take`, `takeRight`, `takeRightWhile`,\n * `takeWhile`, `tap`, `throttle`, `thru`, `times`, `toArray`, `toPlainObject`,\n * `transform`, `union`, `uniq`, `unshift`, `unzip`, `unzipWith`, `values`,\n * `valuesIn`, `where`, `without`, `wrap`, `xor`, `zip`, `zipObject`, `zipWith`\n *\n * The wrapper methods that are **not** chainable by default are:\n * `add`, `attempt`, `camelCase`, `capitalize`, `ceil`, `clone`, `cloneDeep`,\n * `deburr`, `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`,\n * `findKey`, `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`,\n * `floor`, `get`, `gt`, `gte`, `has`, `identity`, `includes`, `indexOf`,\n * `inRange`, `isArguments`, `isArray`, `isBoolean`, `isDate`, `isElement`,\n * `isEmpty`, `isEqual`, `isError`, `isFinite` `isFunction`, `isMatch`,\n * `isNative`, `isNaN`, `isNull`, `isNumber`, `isObject`, `isPlainObject`,\n * `isRegExp`, `isString`, `isUndefined`, `isTypedArray`, `join`, `kebabCase`,\n * `last`, `lastIndexOf`, `lt`, `lte`, `max`, `min`, `noConflict`, `noop`,\n * `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, `random`, `reduce`,\n * `reduceRight`, `repeat`, `result`, `round`, `runInContext`, `shift`, `size`,\n * `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, `startCase`,\n * `startsWith`, `sum`, `template`, `trim`, `trimLeft`, `trimRight`, `trunc`,\n * `unescape`, `uniqueId`, `value`, and `words`\n *\n * The wrapper method `sample` will return a wrapped value when `n` is provided,\n * otherwise an unwrapped value is returned.\n *\n * @name _\n * @constructor\n * @category Chain\n * @param {*} value The value to wrap in a `lodash` instance.\n * @returns {Object} Returns the new `lodash` wrapper instance.\n * @example\n *\n * var wrapped = _([1, 2, 3]);\n *\n * // returns an unwrapped value\n * wrapped.reduce(function(total, n) {\n *   return total + n;\n * });\n * // => 6\n *\n * // returns a wrapped value\n * var squares = wrapped.map(function(n) {\n *   return n * n;\n * });\n *\n * _.isArray(squares);\n * // => false\n *\n * _.isArray(squares.value());\n * // => true\n */\nfunction lodash(value) {\n  if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {\n    if (value instanceof LodashWrapper) {\n      return value;\n    }\n    if (hasOwnProperty.call(value, '__chain__') && hasOwnProperty.call(value, '__wrapped__')) {\n      return wrapperClone(value);\n    }\n  }\n  return new LodashWrapper(value);\n}\n\n// Ensure wrappers are instances of `baseLodash`.\nlodash.prototype = baseLodash.prototype;\n\nmodule.exports = lodash;\n","module.exports = require('./forEach');\n","var baseEach = require('../internal/baseEach'),\n    createFind = require('../internal/createFind');\n\n/**\n * Iterates over elements of `collection`, returning the first element\n * `predicate` returns truthy for. The predicate is bound to `thisArg` and\n * invoked with three arguments: (value, index|key, collection).\n *\n * If a property name is provided for `predicate` the created `_.property`\n * style callback returns the property value of the given element.\n *\n * If a value is also provided for `thisArg` the created `_.matchesProperty`\n * style callback returns `true` for elements that have a matching property\n * value, else `false`.\n *\n * If an object is provided for `predicate` the created `_.matches` style\n * callback returns `true` for elements that have the properties of the given\n * object, else `false`.\n *\n * @static\n * @memberOf _\n * @alias detect\n * @category Collection\n * @param {Array|Object|string} collection The collection to search.\n * @param {Function|Object|string} [predicate=_.identity] The function invoked\n *  per iteration.\n * @param {*} [thisArg] The `this` binding of `predicate`.\n * @returns {*} Returns the matched element, else `undefined`.\n * @example\n *\n * var users = [\n *   { 'user': 'barney',  'age': 36, 'active': true },\n *   { 'user': 'fred',    'age': 40, 'active': false },\n *   { 'user': 'pebbles', 'age': 1,  'active': true }\n * ];\n *\n * _.result(_.find(users, function(chr) {\n *   return chr.age < 40;\n * }), 'user');\n * // => 'barney'\n *\n * // using the `_.matches` callback shorthand\n * _.result(_.find(users, { 'age': 1, 'active': true }), 'user');\n * // => 'pebbles'\n *\n * // using the `_.matchesProperty` callback shorthand\n * _.result(_.find(users, 'active', false), 'user');\n * // => 'fred'\n *\n * // using the `_.property` callback shorthand\n * _.result(_.find(users, 'active'), 'user');\n * // => 'barney'\n */\nvar find = createFind(baseEach);\n\nmodule.exports = find;\n","var arrayEach = require('../internal/arrayEach'),\n    baseEach = require('../internal/baseEach'),\n    createForEach = require('../internal/createForEach');\n\n/**\n * Iterates over elements of `collection` invoking `iteratee` for each element.\n * The `iteratee` is bound to `thisArg` and invoked with three arguments:\n * (value, index|key, collection). Iteratee functions may exit iteration early\n * by explicitly returning `false`.\n *\n * **Note:** As with other \"Collections\" methods, objects with a \"length\" property\n * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn`\n * may be used for object iteration.\n *\n * @static\n * @memberOf _\n * @alias each\n * @category Collection\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} [iteratee=_.identity] The function invoked per iteration.\n * @param {*} [thisArg] The `this` binding of `iteratee`.\n * @returns {Array|Object|string} Returns `collection`.\n * @example\n *\n * _([1, 2]).forEach(function(n) {\n *   console.log(n);\n * }).value();\n * // => logs each value from left to right and returns the array\n *\n * _.forEach({ 'a': 1, 'b': 2 }, function(n, key) {\n *   console.log(n, key);\n * });\n * // => logs each value-key pair and returns the object (iteration order is not guaranteed)\n */\nvar forEach = createForEach(arrayEach, baseEach);\n\nmodule.exports = forEach;\n","var baseIndexOf = require('../internal/baseIndexOf'),\n    getLength = require('../internal/getLength'),\n    isArray = require('../lang/isArray'),\n    isIterateeCall = require('../internal/isIterateeCall'),\n    isLength = require('../internal/isLength'),\n    isString = require('../lang/isString'),\n    values = require('../object/values');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Checks if `target` is in `collection` using\n * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)\n * for equality comparisons. If `fromIndex` is negative, it's used as the offset\n * from the end of `collection`.\n *\n * @static\n * @memberOf _\n * @alias contains, include\n * @category Collection\n * @param {Array|Object|string} collection The collection to search.\n * @param {*} target The value to search for.\n * @param {number} [fromIndex=0] The index to search from.\n * @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.\n * @returns {boolean} Returns `true` if a matching element is found, else `false`.\n * @example\n *\n * _.includes([1, 2, 3], 1);\n * // => true\n *\n * _.includes([1, 2, 3], 1, 2);\n * // => false\n *\n * _.includes({ 'user': 'fred', 'age': 40 }, 'fred');\n * // => true\n *\n * _.includes('pebbles', 'eb');\n * // => true\n */\nfunction includes(collection, target, fromIndex, guard) {\n  var length = collection ? getLength(collection) : 0;\n  if (!isLength(length)) {\n    collection = values(collection);\n    length = collection.length;\n  }\n  if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {\n    fromIndex = 0;\n  } else {\n    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);\n  }\n  return (typeof collection == 'string' || !isArray(collection) && isString(collection))\n    ? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1)\n    : (!!length && baseIndexOf(collection, target, fromIndex) > -1);\n}\n\nmodule.exports = includes;\n","var arrayMap = require('../internal/arrayMap'),\n    baseCallback = require('../internal/baseCallback'),\n    baseMap = require('../internal/baseMap'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates an array of values by running each element in `collection` through\n * `iteratee`. The `iteratee` is bound to `thisArg` and invoked with three\n * arguments: (value, index|key, collection).\n *\n * If a property name is provided for `iteratee` the created `_.property`\n * style callback returns the property value of the given element.\n *\n * If a value is also provided for `thisArg` the created `_.matchesProperty`\n * style callback returns `true` for elements that have a matching property\n * value, else `false`.\n *\n * If an object is provided for `iteratee` the created `_.matches` style\n * callback returns `true` for elements that have the properties of the given\n * object, else `false`.\n *\n * Many lodash methods are guarded to work as iteratees for methods like\n * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.\n *\n * The guarded methods are:\n * `ary`, `callback`, `chunk`, `clone`, `create`, `curry`, `curryRight`,\n * `drop`, `dropRight`, `every`, `fill`, `flatten`, `invert`, `max`, `min`,\n * `parseInt`, `slice`, `sortBy`, `take`, `takeRight`, `template`, `trim`,\n * `trimLeft`, `trimRight`, `trunc`, `random`, `range`, `sample`, `some`,\n * `sum`, `uniq`, and `words`\n *\n * @static\n * @memberOf _\n * @alias collect\n * @category Collection\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function|Object|string} [iteratee=_.identity] The function invoked\n *  per iteration.\n * @param {*} [thisArg] The `this` binding of `iteratee`.\n * @returns {Array} Returns the new mapped array.\n * @example\n *\n * function timesThree(n) {\n *   return n * 3;\n * }\n *\n * _.map([1, 2], timesThree);\n * // => [3, 6]\n *\n * _.map({ 'a': 1, 'b': 2 }, timesThree);\n * // => [3, 6] (iteration order is not guaranteed)\n *\n * var users = [\n *   { 'user': 'barney' },\n *   { 'user': 'fred' }\n * ];\n *\n * // using the `_.property` callback shorthand\n * _.map(users, 'user');\n * // => ['barney', 'fred']\n */\nfunction map(collection, iteratee, thisArg) {\n  var func = isArray(collection) ? arrayMap : baseMap;\n  iteratee = baseCallback(iteratee, thisArg, 3);\n  return func(collection, iteratee);\n}\n\nmodule.exports = map;\n","var getNative = require('../internal/getNative');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeNow = getNative(Date, 'now');\n\n/**\n * Gets the number of milliseconds that have elapsed since the Unix epoch\n * (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @category Date\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => logs the number of milliseconds it took for the deferred function to be invoked\n */\nvar now = nativeNow || function() {\n  return new Date().getTime();\n};\n\nmodule.exports = now;\n","var createWrapper = require('../internal/createWrapper'),\n    replaceHolders = require('../internal/replaceHolders'),\n    restParam = require('./restParam');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    PARTIAL_FLAG = 32;\n\n/**\n * Creates a function that invokes `func` with the `this` binding of `thisArg`\n * and prepends any additional `_.bind` arguments to those provided to the\n * bound function.\n *\n * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,\n * may be used as a placeholder for partially applied arguments.\n *\n * **Note:** Unlike native `Function#bind` this method does not set the \"length\"\n * property of bound functions.\n *\n * @static\n * @memberOf _\n * @category Function\n * @param {Function} func The function to bind.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {...*} [partials] The arguments to be partially applied.\n * @returns {Function} Returns the new bound function.\n * @example\n *\n * var greet = function(greeting, punctuation) {\n *   return greeting + ' ' + this.user + punctuation;\n * };\n *\n * var object = { 'user': 'fred' };\n *\n * var bound = _.bind(greet, object, 'hi');\n * bound('!');\n * // => 'hi fred!'\n *\n * // using placeholders\n * var bound = _.bind(greet, object, _, '!');\n * bound('hi');\n * // => 'hi fred!'\n */\nvar bind = restParam(function(func, thisArg, partials) {\n  var bitmask = BIND_FLAG;\n  if (partials.length) {\n    var holders = replaceHolders(partials, bind.placeholder);\n    bitmask |= PARTIAL_FLAG;\n  }\n  return createWrapper(func, bitmask, thisArg, partials, holders);\n});\n\n// Assign default placeholders.\nbind.placeholder = {};\n\nmodule.exports = bind;\n","/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that invokes `func` with the `this` binding of the\n * created function and arguments from `start` and beyond provided as an array.\n *\n * **Note:** This method is based on the [rest parameter](https://developer.mozilla.org/Web/JavaScript/Reference/Functions/rest_parameters).\n *\n * @static\n * @memberOf _\n * @category Function\n * @param {Function} func The function to apply a rest parameter to.\n * @param {number} [start=func.length-1] The start position of the rest parameter.\n * @returns {Function} Returns the new function.\n * @example\n *\n * var say = _.restParam(function(what, names) {\n *   return what + ' ' + _.initial(names).join(', ') +\n *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);\n * });\n *\n * say('hello', 'fred', 'barney', 'pebbles');\n * // => 'hello fred, barney, & pebbles'\n */\nfunction restParam(func, start) {\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0);\n  return function() {\n    var args = arguments,\n        index = -1,\n        length = nativeMax(args.length - start, 0),\n        rest = Array(length);\n\n    while (++index < length) {\n      rest[index] = args[start + index];\n    }\n    switch (start) {\n      case 0: return func.call(this, rest);\n      case 1: return func.call(this, args[0], rest);\n      case 2: return func.call(this, args[0], args[1], rest);\n    }\n    var otherArgs = Array(start + 1);\n    index = -1;\n    while (++index < start) {\n      otherArgs[index] = args[index];\n    }\n    otherArgs[start] = rest;\n    return func.apply(this, otherArgs);\n  };\n}\n\nmodule.exports = restParam;\n","var baseCreate = require('./baseCreate'),\n    baseLodash = require('./baseLodash');\n\n/** Used as references for `-Infinity` and `Infinity`. */\nvar POSITIVE_INFINITY = Number.POSITIVE_INFINITY;\n\n/**\n * Creates a lazy wrapper object which wraps `value` to enable lazy evaluation.\n *\n * @private\n * @param {*} value The value to wrap.\n */\nfunction LazyWrapper(value) {\n  this.__wrapped__ = value;\n  this.__actions__ = [];\n  this.__dir__ = 1;\n  this.__filtered__ = false;\n  this.__iteratees__ = [];\n  this.__takeCount__ = POSITIVE_INFINITY;\n  this.__views__ = [];\n}\n\nLazyWrapper.prototype = baseCreate(baseLodash.prototype);\nLazyWrapper.prototype.constructor = LazyWrapper;\n\nmodule.exports = LazyWrapper;\n","var baseCreate = require('./baseCreate'),\n    baseLodash = require('./baseLodash');\n\n/**\n * The base constructor for creating `lodash` wrapper objects.\n *\n * @private\n * @param {*} value The value to wrap.\n * @param {boolean} [chainAll] Enable chaining for all wrapper methods.\n * @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.\n */\nfunction LodashWrapper(value, chainAll, actions) {\n  this.__wrapped__ = value;\n  this.__actions__ = actions || [];\n  this.__chain__ = !!chainAll;\n}\n\nLodashWrapper.prototype = baseCreate(baseLodash.prototype);\nLodashWrapper.prototype.constructor = LodashWrapper;\n\nmodule.exports = LodashWrapper;\n","/**\n * Copies the values of `source` to `array`.\n *\n * @private\n * @param {Array} source The array to copy values from.\n * @param {Array} [array=[]] The array to copy values to.\n * @returns {Array} Returns `array`.\n */\nfunction arrayCopy(source, array) {\n  var index = -1,\n      length = source.length;\n\n  array || (array = Array(length));\n  while (++index < length) {\n    array[index] = source[index];\n  }\n  return array;\n}\n\nmodule.exports = arrayCopy;\n","/**\n * A specialized version of `_.forEach` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns `array`.\n */\nfunction arrayEach(array, iteratee) {\n  var index = -1,\n      length = array.length;\n\n  while (++index < length) {\n    if (iteratee(array[index], index, array) === false) {\n      break;\n    }\n  }\n  return array;\n}\n\nmodule.exports = arrayEach;\n","/**\n * A specialized version of `_.map` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns the new mapped array.\n */\nfunction arrayMap(array, iteratee) {\n  var index = -1,\n      length = array.length,\n      result = Array(length);\n\n  while (++index < length) {\n    result[index] = iteratee(array[index], index, array);\n  }\n  return result;\n}\n\nmodule.exports = arrayMap;\n","/**\n * A specialized version of `_.some` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} predicate The function invoked per iteration.\n * @returns {boolean} Returns `true` if any element passes the predicate check,\n *  else `false`.\n */\nfunction arraySome(array, predicate) {\n  var index = -1,\n      length = array.length;\n\n  while (++index < length) {\n    if (predicate(array[index], index, array)) {\n      return true;\n    }\n  }\n  return false;\n}\n\nmodule.exports = arraySome;\n","var baseCopy = require('./baseCopy'),\n    keys = require('../object/keys');\n\n/**\n * The base implementation of `_.assign` without support for argument juggling,\n * multiple sources, and `customizer` functions.\n *\n * @private\n * @param {Object} object The destination object.\n * @param {Object} source The source object.\n * @returns {Object} Returns `object`.\n */\nfunction baseAssign(object, source) {\n  return source == null\n    ? object\n    : baseCopy(source, keys(source), object);\n}\n\nmodule.exports = baseAssign;\n","var baseMatches = require('./baseMatches'),\n    baseMatchesProperty = require('./baseMatchesProperty'),\n    bindCallback = require('./bindCallback'),\n    identity = require('../utility/identity'),\n    property = require('../utility/property');\n\n/**\n * The base implementation of `_.callback` which supports specifying the\n * number of arguments to provide to `func`.\n *\n * @private\n * @param {*} [func=_.identity] The value to convert to a callback.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {number} [argCount] The number of arguments to provide to `func`.\n * @returns {Function} Returns the callback.\n */\nfunction baseCallback(func, thisArg, argCount) {\n  var type = typeof func;\n  if (type == 'function') {\n    return thisArg === undefined\n      ? func\n      : bindCallback(func, thisArg, argCount);\n  }\n  if (func == null) {\n    return identity;\n  }\n  if (type == 'object') {\n    return baseMatches(func);\n  }\n  return thisArg === undefined\n    ? property(func)\n    : baseMatchesProperty(func, thisArg);\n}\n\nmodule.exports = baseCallback;\n","var arrayCopy = require('./arrayCopy'),\n    arrayEach = require('./arrayEach'),\n    baseAssign = require('./baseAssign'),\n    baseForOwn = require('./baseForOwn'),\n    initCloneArray = require('./initCloneArray'),\n    initCloneByTag = require('./initCloneByTag'),\n    initCloneObject = require('./initCloneObject'),\n    isArray = require('../lang/isArray'),\n    isHostObject = require('./isHostObject'),\n    isObject = require('../lang/isObject');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    mapTag = '[object Map]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    setTag = '[object Set]',\n    stringTag = '[object String]',\n    weakMapTag = '[object WeakMap]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to identify `toStringTag` values supported by `_.clone`. */\nvar cloneableTags = {};\ncloneableTags[argsTag] = cloneableTags[arrayTag] =\ncloneableTags[arrayBufferTag] = cloneableTags[boolTag] =\ncloneableTags[dateTag] = cloneableTags[float32Tag] =\ncloneableTags[float64Tag] = cloneableTags[int8Tag] =\ncloneableTags[int16Tag] = cloneableTags[int32Tag] =\ncloneableTags[numberTag] = cloneableTags[objectTag] =\ncloneableTags[regexpTag] = cloneableTags[stringTag] =\ncloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =\ncloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;\ncloneableTags[errorTag] = cloneableTags[funcTag] =\ncloneableTags[mapTag] = cloneableTags[setTag] =\ncloneableTags[weakMapTag] = false;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * The base implementation of `_.clone` without support for argument juggling\n * and `this` binding `customizer` functions.\n *\n * @private\n * @param {*} value The value to clone.\n * @param {boolean} [isDeep] Specify a deep clone.\n * @param {Function} [customizer] The function to customize cloning values.\n * @param {string} [key] The key of `value`.\n * @param {Object} [object] The object `value` belongs to.\n * @param {Array} [stackA=[]] Tracks traversed source objects.\n * @param {Array} [stackB=[]] Associates clones with source counterparts.\n * @returns {*} Returns the cloned value.\n */\nfunction baseClone(value, isDeep, customizer, key, object, stackA, stackB) {\n  var result;\n  if (customizer) {\n    result = object ? customizer(value, key, object) : customizer(value);\n  }\n  if (result !== undefined) {\n    return result;\n  }\n  if (!isObject(value)) {\n    return value;\n  }\n  var isArr = isArray(value);\n  if (isArr) {\n    result = initCloneArray(value);\n    if (!isDeep) {\n      return arrayCopy(value, result);\n    }\n  } else {\n    var tag = objToString.call(value),\n        isFunc = tag == funcTag;\n\n    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {\n      if (isHostObject(value)) {\n        return object ? value : {};\n      }\n      result = initCloneObject(isFunc ? {} : value);\n      if (!isDeep) {\n        return baseAssign(result, value);\n      }\n    } else {\n      return cloneableTags[tag]\n        ? initCloneByTag(value, tag, isDeep)\n        : (object ? value : {});\n    }\n  }\n  // Check for circular references and return its corresponding clone.\n  stackA || (stackA = []);\n  stackB || (stackB = []);\n\n  var length = stackA.length;\n  while (length--) {\n    if (stackA[length] == value) {\n      return stackB[length];\n    }\n  }\n  // Add the source value to the stack of traversed objects and associate it with its clone.\n  stackA.push(value);\n  stackB.push(result);\n\n  // Recursively populate clone (susceptible to call stack limits).\n  (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {\n    result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB);\n  });\n  return result;\n}\n\nmodule.exports = baseClone;\n","/**\n * Copies properties of `source` to `object`.\n *\n * @private\n * @param {Object} source The object to copy properties from.\n * @param {Array} props The property names to copy.\n * @param {Object} [object={}] The object to copy properties to.\n * @returns {Object} Returns `object`.\n */\nfunction baseCopy(source, props, object) {\n  object || (object = {});\n\n  var index = -1,\n      length = props.length;\n\n  while (++index < length) {\n    var key = props[index];\n    object[key] = source[key];\n  }\n  return object;\n}\n\nmodule.exports = baseCopy;\n","var isObject = require('../lang/isObject');\n\n/**\n * The base implementation of `_.create` without support for assigning\n * properties to the created object.\n *\n * @private\n * @param {Object} prototype The object to inherit from.\n * @returns {Object} Returns the new object.\n */\nvar baseCreate = (function() {\n  function object() {}\n  return function(prototype) {\n    if (isObject(prototype)) {\n      object.prototype = prototype;\n      var result = new object;\n      object.prototype = undefined;\n    }\n    return result || {};\n  };\n}());\n\nmodule.exports = baseCreate;\n","var baseForOwn = require('./baseForOwn'),\n    createBaseEach = require('./createBaseEach');\n\n/**\n * The base implementation of `_.forEach` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array|Object|string} Returns `collection`.\n */\nvar baseEach = createBaseEach(baseForOwn);\n\nmodule.exports = baseEach;\n","/**\n * The base implementation of `_.find`, `_.findLast`, `_.findKey`, and `_.findLastKey`,\n * without support for callback shorthands and `this` binding, which iterates\n * over `collection` using the provided `eachFunc`.\n *\n * @private\n * @param {Array|Object|string} collection The collection to search.\n * @param {Function} predicate The function invoked per iteration.\n * @param {Function} eachFunc The function to iterate over `collection`.\n * @param {boolean} [retKey] Specify returning the key of the found element\n *  instead of the element itself.\n * @returns {*} Returns the found element or its key, else `undefined`.\n */\nfunction baseFind(collection, predicate, eachFunc, retKey) {\n  var result;\n  eachFunc(collection, function(value, key, collection) {\n    if (predicate(value, key, collection)) {\n      result = retKey ? key : value;\n      return false;\n    }\n  });\n  return result;\n}\n\nmodule.exports = baseFind;\n","/**\n * The base implementation of `_.findIndex` and `_.findLastIndex` without\n * support for callback shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {Function} predicate The function invoked per iteration.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction baseFindIndex(array, predicate, fromRight) {\n  var length = array.length,\n      index = fromRight ? length : -1;\n\n  while ((fromRight ? index-- : ++index < length)) {\n    if (predicate(array[index], index, array)) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = baseFindIndex;\n","var createBaseFor = require('./createBaseFor');\n\n/**\n * The base implementation of `baseForIn` and `baseForOwn` which iterates\n * over `object` properties returned by `keysFunc` invoking `iteratee` for\n * each property. Iteratee functions may exit iteration early by explicitly\n * returning `false`.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @param {Function} keysFunc The function to get the keys of `object`.\n * @returns {Object} Returns `object`.\n */\nvar baseFor = createBaseFor();\n\nmodule.exports = baseFor;\n","var baseFor = require('./baseFor'),\n    keysIn = require('../object/keysIn');\n\n/**\n * The base implementation of `_.forIn` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Object} Returns `object`.\n */\nfunction baseForIn(object, iteratee) {\n  return baseFor(object, iteratee, keysIn);\n}\n\nmodule.exports = baseForIn;\n","var baseFor = require('./baseFor'),\n    keys = require('../object/keys');\n\n/**\n * The base implementation of `_.forOwn` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Object} Returns `object`.\n */\nfunction baseForOwn(object, iteratee) {\n  return baseFor(object, iteratee, keys);\n}\n\nmodule.exports = baseForOwn;\n","var toObject = require('./toObject');\n\n/**\n * The base implementation of `get` without support for string paths\n * and default values.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array} path The path of the property to get.\n * @param {string} [pathKey] The key representation of path.\n * @returns {*} Returns the resolved value.\n */\nfunction baseGet(object, path, pathKey) {\n  if (object == null) {\n    return;\n  }\n  object = toObject(object);\n  if (pathKey !== undefined && pathKey in object) {\n    path = [pathKey];\n  }\n  var index = 0,\n      length = path.length;\n\n  while (object != null && index < length) {\n    object = toObject(object)[path[index++]];\n  }\n  return (index && index == length) ? object : undefined;\n}\n\nmodule.exports = baseGet;\n","var indexOfNaN = require('./indexOfNaN');\n\n/**\n * The base implementation of `_.indexOf` without support for binary searches.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {*} value The value to search for.\n * @param {number} fromIndex The index to search from.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction baseIndexOf(array, value, fromIndex) {\n  if (value !== value) {\n    return indexOfNaN(array, fromIndex);\n  }\n  var index = fromIndex - 1,\n      length = array.length;\n\n  while (++index < length) {\n    if (array[index] === value) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = baseIndexOf;\n","var baseIsEqualDeep = require('./baseIsEqualDeep'),\n    isObject = require('../lang/isObject'),\n    isObjectLike = require('./isObjectLike');\n\n/**\n * The base implementation of `_.isEqual` without support for `this` binding\n * `customizer` functions.\n *\n * @private\n * @param {*} value The value to compare.\n * @param {*} other The other value to compare.\n * @param {Function} [customizer] The function to customize comparing values.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the values are equivalent, else `false`.\n */\nfunction baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {\n  if (value === other) {\n    return true;\n  }\n  if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) {\n    return value !== value && other !== other;\n  }\n  return baseIsEqualDeep(value, other, baseIsEqual, customizer, isLoose, stackA, stackB);\n}\n\nmodule.exports = baseIsEqual;\n","var equalArrays = require('./equalArrays'),\n    equalByTag = require('./equalByTag'),\n    equalObjects = require('./equalObjects'),\n    isArray = require('../lang/isArray'),\n    isHostObject = require('./isHostObject'),\n    isTypedArray = require('../lang/isTypedArray');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    objectTag = '[object Object]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * A specialized version of `baseIsEqual` for arrays and objects which performs\n * deep comparisons and tracks traversed objects enabling objects with circular\n * references to be compared.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing objects.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA=[]] Tracks traversed `value` objects.\n * @param {Array} [stackB=[]] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var objIsArr = isArray(object),\n      othIsArr = isArray(other),\n      objTag = arrayTag,\n      othTag = arrayTag;\n\n  if (!objIsArr) {\n    objTag = objToString.call(object);\n    if (objTag == argsTag) {\n      objTag = objectTag;\n    } else if (objTag != objectTag) {\n      objIsArr = isTypedArray(object);\n    }\n  }\n  if (!othIsArr) {\n    othTag = objToString.call(other);\n    if (othTag == argsTag) {\n      othTag = objectTag;\n    } else if (othTag != objectTag) {\n      othIsArr = isTypedArray(other);\n    }\n  }\n  var objIsObj = objTag == objectTag && !isHostObject(object),\n      othIsObj = othTag == objectTag && !isHostObject(other),\n      isSameTag = objTag == othTag;\n\n  if (isSameTag && !(objIsArr || objIsObj)) {\n    return equalByTag(object, other, objTag);\n  }\n  if (!isLoose) {\n    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),\n        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');\n\n    if (objIsWrapped || othIsWrapped) {\n      return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, isLoose, stackA, stackB);\n    }\n  }\n  if (!isSameTag) {\n    return false;\n  }\n  // Assume cyclic values are equal.\n  // For more information on detecting circular references see https://es5.github.io/#JO.\n  stackA || (stackA = []);\n  stackB || (stackB = []);\n\n  var length = stackA.length;\n  while (length--) {\n    if (stackA[length] == object) {\n      return stackB[length] == other;\n    }\n  }\n  // Add `object` and `other` to the stack of traversed objects.\n  stackA.push(object);\n  stackB.push(other);\n\n  var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, isLoose, stackA, stackB);\n\n  stackA.pop();\n  stackB.pop();\n\n  return result;\n}\n\nmodule.exports = baseIsEqualDeep;\n","var baseIsEqual = require('./baseIsEqual'),\n    toObject = require('./toObject');\n\n/**\n * The base implementation of `_.isMatch` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to inspect.\n * @param {Array} matchData The propery names, values, and compare flags to match.\n * @param {Function} [customizer] The function to customize comparing objects.\n * @returns {boolean} Returns `true` if `object` is a match, else `false`.\n */\nfunction baseIsMatch(object, matchData, customizer) {\n  var index = matchData.length,\n      length = index,\n      noCustomizer = !customizer;\n\n  if (object == null) {\n    return !length;\n  }\n  object = toObject(object);\n  while (index--) {\n    var data = matchData[index];\n    if ((noCustomizer && data[2])\n          ? data[1] !== object[data[0]]\n          : !(data[0] in object)\n        ) {\n      return false;\n    }\n  }\n  while (++index < length) {\n    data = matchData[index];\n    var key = data[0],\n        objValue = object[key],\n        srcValue = data[1];\n\n    if (noCustomizer && data[2]) {\n      if (objValue === undefined && !(key in object)) {\n        return false;\n      }\n    } else {\n      var result = customizer ? customizer(objValue, srcValue, key) : undefined;\n      if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, true) : result)) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\nmodule.exports = baseIsMatch;\n","/**\n * The function whose prototype all chaining wrappers inherit from.\n *\n * @private\n */\nfunction baseLodash() {\n  // No operation performed.\n}\n\nmodule.exports = baseLodash;\n","var baseEach = require('./baseEach'),\n    isArrayLike = require('./isArrayLike');\n\n/**\n * The base implementation of `_.map` without support for callback shorthands\n * and `this` binding.\n *\n * @private\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns the new mapped array.\n */\nfunction baseMap(collection, iteratee) {\n  var index = -1,\n      result = isArrayLike(collection) ? Array(collection.length) : [];\n\n  baseEach(collection, function(value, key, collection) {\n    result[++index] = iteratee(value, key, collection);\n  });\n  return result;\n}\n\nmodule.exports = baseMap;\n","var baseIsMatch = require('./baseIsMatch'),\n    getMatchData = require('./getMatchData'),\n    toObject = require('./toObject');\n\n/**\n * The base implementation of `_.matches` which does not clone `source`.\n *\n * @private\n * @param {Object} source The object of property values to match.\n * @returns {Function} Returns the new function.\n */\nfunction baseMatches(source) {\n  var matchData = getMatchData(source);\n  if (matchData.length == 1 && matchData[0][2]) {\n    var key = matchData[0][0],\n        value = matchData[0][1];\n\n    return function(object) {\n      if (object == null) {\n        return false;\n      }\n      object = toObject(object);\n      return object[key] === value && (value !== undefined || (key in object));\n    };\n  }\n  return function(object) {\n    return baseIsMatch(object, matchData);\n  };\n}\n\nmodule.exports = baseMatches;\n","var baseGet = require('./baseGet'),\n    baseIsEqual = require('./baseIsEqual'),\n    baseSlice = require('./baseSlice'),\n    isArray = require('../lang/isArray'),\n    isKey = require('./isKey'),\n    isStrictComparable = require('./isStrictComparable'),\n    last = require('../array/last'),\n    toObject = require('./toObject'),\n    toPath = require('./toPath');\n\n/**\n * The base implementation of `_.matchesProperty` which does not clone `srcValue`.\n *\n * @private\n * @param {string} path The path of the property to get.\n * @param {*} srcValue The value to compare.\n * @returns {Function} Returns the new function.\n */\nfunction baseMatchesProperty(path, srcValue) {\n  var isArr = isArray(path),\n      isCommon = isKey(path) && isStrictComparable(srcValue),\n      pathKey = (path + '');\n\n  path = toPath(path);\n  return function(object) {\n    if (object == null) {\n      return false;\n    }\n    var key = pathKey;\n    object = toObject(object);\n    if ((isArr || !isCommon) && !(key in object)) {\n      object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));\n      if (object == null) {\n        return false;\n      }\n      key = last(path);\n      object = toObject(object);\n    }\n    return object[key] === srcValue\n      ? (srcValue !== undefined || (key in object))\n      : baseIsEqual(srcValue, object[key], undefined, true);\n  };\n}\n\nmodule.exports = baseMatchesProperty;\n","var toObject = require('./toObject');\n\n/**\n * The base implementation of `_.property` without support for deep paths.\n *\n * @private\n * @param {string} key The key of the property to get.\n * @returns {Function} Returns the new function.\n */\nfunction baseProperty(key) {\n  return function(object) {\n    return object == null ? undefined : toObject(object)[key];\n  };\n}\n\nmodule.exports = baseProperty;\n","var baseGet = require('./baseGet'),\n    toPath = require('./toPath');\n\n/**\n * A specialized version of `baseProperty` which supports deep paths.\n *\n * @private\n * @param {Array|string} path The path of the property to get.\n * @returns {Function} Returns the new function.\n */\nfunction basePropertyDeep(path) {\n  var pathKey = (path + '');\n  path = toPath(path);\n  return function(object) {\n    return baseGet(object, path, pathKey);\n  };\n}\n\nmodule.exports = basePropertyDeep;\n","var identity = require('../utility/identity'),\n    metaMap = require('./metaMap');\n\n/**\n * The base implementation of `setData` without support for hot loop detection.\n *\n * @private\n * @param {Function} func The function to associate metadata with.\n * @param {*} data The metadata.\n * @returns {Function} Returns `func`.\n */\nvar baseSetData = !metaMap ? identity : function(func, data) {\n  metaMap.set(func, data);\n  return func;\n};\n\nmodule.exports = baseSetData;\n","/**\n * The base implementation of `_.slice` without an iteratee call guard.\n *\n * @private\n * @param {Array} array The array to slice.\n * @param {number} [start=0] The start position.\n * @param {number} [end=array.length] The end position.\n * @returns {Array} Returns the slice of `array`.\n */\nfunction baseSlice(array, start, end) {\n  var index = -1,\n      length = array.length;\n\n  start = start == null ? 0 : (+start || 0);\n  if (start < 0) {\n    start = -start > length ? 0 : (length + start);\n  }\n  end = (end === undefined || end > length) ? length : (+end || 0);\n  if (end < 0) {\n    end += length;\n  }\n  length = start > end ? 0 : ((end - start) >>> 0);\n  start >>>= 0;\n\n  var result = Array(length);\n  while (++index < length) {\n    result[index] = array[index + start];\n  }\n  return result;\n}\n\nmodule.exports = baseSlice;\n","/**\n * Converts `value` to a string if it's not one. An empty string is returned\n * for `null` or `undefined` values.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {string} Returns the string.\n */\nfunction baseToString(value) {\n  return value == null ? '' : (value + '');\n}\n\nmodule.exports = baseToString;\n","/**\n * The base implementation of `_.values` and `_.valuesIn` which creates an\n * array of `object` property values corresponding to the property names\n * of `props`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array} props The property names to get values for.\n * @returns {Object} Returns the array of property values.\n */\nfunction baseValues(object, props) {\n  var index = -1,\n      length = props.length,\n      result = Array(length);\n\n  while (++index < length) {\n    result[index] = object[props[index]];\n  }\n  return result;\n}\n\nmodule.exports = baseValues;\n","var binaryIndexBy = require('./binaryIndexBy'),\n    identity = require('../utility/identity');\n\n/** Used as references for the maximum length and index of an array. */\nvar MAX_ARRAY_LENGTH = 4294967295,\n    HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;\n\n/**\n * Performs a binary search of `array` to determine the index at which `value`\n * should be inserted into `array` in order to maintain its sort order.\n *\n * @private\n * @param {Array} array The sorted array to inspect.\n * @param {*} value The value to evaluate.\n * @param {boolean} [retHighest] Specify returning the highest qualified index.\n * @returns {number} Returns the index at which `value` should be inserted\n *  into `array`.\n */\nfunction binaryIndex(array, value, retHighest) {\n  var low = 0,\n      high = array ? array.length : low;\n\n  if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {\n    while (low < high) {\n      var mid = (low + high) >>> 1,\n          computed = array[mid];\n\n      if ((retHighest ? (computed <= value) : (computed < value)) && computed !== null) {\n        low = mid + 1;\n      } else {\n        high = mid;\n      }\n    }\n    return high;\n  }\n  return binaryIndexBy(array, value, identity, retHighest);\n}\n\nmodule.exports = binaryIndex;\n","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeFloor = Math.floor,\n    nativeMin = Math.min;\n\n/** Used as references for the maximum length and index of an array. */\nvar MAX_ARRAY_LENGTH = 4294967295,\n    MAX_ARRAY_INDEX = MAX_ARRAY_LENGTH - 1;\n\n/**\n * This function is like `binaryIndex` except that it invokes `iteratee` for\n * `value` and each element of `array` to compute their sort ranking. The\n * iteratee is invoked with one argument; (value).\n *\n * @private\n * @param {Array} array The sorted array to inspect.\n * @param {*} value The value to evaluate.\n * @param {Function} iteratee The function invoked per iteration.\n * @param {boolean} [retHighest] Specify returning the highest qualified index.\n * @returns {number} Returns the index at which `value` should be inserted\n *  into `array`.\n */\nfunction binaryIndexBy(array, value, iteratee, retHighest) {\n  value = iteratee(value);\n\n  var low = 0,\n      high = array ? array.length : 0,\n      valIsNaN = value !== value,\n      valIsNull = value === null,\n      valIsUndef = value === undefined;\n\n  while (low < high) {\n    var mid = nativeFloor((low + high) / 2),\n        computed = iteratee(array[mid]),\n        isDef = computed !== undefined,\n        isReflexive = computed === computed;\n\n    if (valIsNaN) {\n      var setLow = isReflexive || retHighest;\n    } else if (valIsNull) {\n      setLow = isReflexive && isDef && (retHighest || computed != null);\n    } else if (valIsUndef) {\n      setLow = isReflexive && (retHighest || isDef);\n    } else if (computed == null) {\n      setLow = false;\n    } else {\n      setLow = retHighest ? (computed <= value) : (computed < value);\n    }\n    if (setLow) {\n      low = mid + 1;\n    } else {\n      high = mid;\n    }\n  }\n  return nativeMin(high, MAX_ARRAY_INDEX);\n}\n\nmodule.exports = binaryIndexBy;\n","var identity = require('../utility/identity');\n\n/**\n * A specialized version of `baseCallback` which only supports `this` binding\n * and specifying the number of arguments to provide to `func`.\n *\n * @private\n * @param {Function} func The function to bind.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {number} [argCount] The number of arguments to provide to `func`.\n * @returns {Function} Returns the callback.\n */\nfunction bindCallback(func, thisArg, argCount) {\n  if (typeof func != 'function') {\n    return identity;\n  }\n  if (thisArg === undefined) {\n    return func;\n  }\n  switch (argCount) {\n    case 1: return function(value) {\n      return func.call(thisArg, value);\n    };\n    case 3: return function(value, index, collection) {\n      return func.call(thisArg, value, index, collection);\n    };\n    case 4: return function(accumulator, value, index, collection) {\n      return func.call(thisArg, accumulator, value, index, collection);\n    };\n    case 5: return function(value, other, key, object, source) {\n      return func.call(thisArg, value, other, key, object, source);\n    };\n  }\n  return function() {\n    return func.apply(thisArg, arguments);\n  };\n}\n\nmodule.exports = bindCallback;\n","(function (global){\n/** Native method references. */\nvar ArrayBuffer = global.ArrayBuffer,\n    Uint8Array = global.Uint8Array;\n\n/**\n * Creates a clone of the given array buffer.\n *\n * @private\n * @param {ArrayBuffer} buffer The array buffer to clone.\n * @returns {ArrayBuffer} Returns the cloned array buffer.\n */\nfunction bufferClone(buffer) {\n  var result = new ArrayBuffer(buffer.byteLength),\n      view = new Uint8Array(result);\n\n  view.set(new Uint8Array(buffer));\n  return result;\n}\n\nmodule.exports = bufferClone;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2J1ZmZlckNsb25lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIi8qKiBOYXRpdmUgbWV0aG9kIHJlZmVyZW5jZXMuICovXG52YXIgQXJyYXlCdWZmZXIgPSBnbG9iYWwuQXJyYXlCdWZmZXIsXG4gICAgVWludDhBcnJheSA9IGdsb2JhbC5VaW50OEFycmF5O1xuXG4vKipcbiAqIENyZWF0ZXMgYSBjbG9uZSBvZiB0aGUgZ2l2ZW4gYXJyYXkgYnVmZmVyLlxuICpcbiAqIEBwcml2YXRlXG4gKiBAcGFyYW0ge0FycmF5QnVmZmVyfSBidWZmZXIgVGhlIGFycmF5IGJ1ZmZlciB0byBjbG9uZS5cbiAqIEByZXR1cm5zIHtBcnJheUJ1ZmZlcn0gUmV0dXJucyB0aGUgY2xvbmVkIGFycmF5IGJ1ZmZlci5cbiAqL1xuZnVuY3Rpb24gYnVmZmVyQ2xvbmUoYnVmZmVyKSB7XG4gIHZhciByZXN1bHQgPSBuZXcgQXJyYXlCdWZmZXIoYnVmZmVyLmJ5dGVMZW5ndGgpLFxuICAgICAgdmlldyA9IG5ldyBVaW50OEFycmF5KHJlc3VsdCk7XG5cbiAgdmlldy5zZXQobmV3IFVpbnQ4QXJyYXkoYnVmZmVyKSk7XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gYnVmZmVyQ2xvbmU7XG4iXX0=","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates an array that is the composition of partially applied arguments,\n * placeholders, and provided arguments into a single array of arguments.\n *\n * @private\n * @param {Array|Object} args The provided arguments.\n * @param {Array} partials The arguments to prepend to those provided.\n * @param {Array} holders The `partials` placeholder indexes.\n * @returns {Array} Returns the new array of composed arguments.\n */\nfunction composeArgs(args, partials, holders) {\n  var holdersLength = holders.length,\n      argsIndex = -1,\n      argsLength = nativeMax(args.length - holdersLength, 0),\n      leftIndex = -1,\n      leftLength = partials.length,\n      result = Array(leftLength + argsLength);\n\n  while (++leftIndex < leftLength) {\n    result[leftIndex] = partials[leftIndex];\n  }\n  while (++argsIndex < holdersLength) {\n    result[holders[argsIndex]] = args[argsIndex];\n  }\n  while (argsLength--) {\n    result[leftIndex++] = args[argsIndex++];\n  }\n  return result;\n}\n\nmodule.exports = composeArgs;\n","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * This function is like `composeArgs` except that the arguments composition\n * is tailored for `_.partialRight`.\n *\n * @private\n * @param {Array|Object} args The provided arguments.\n * @param {Array} partials The arguments to append to those provided.\n * @param {Array} holders The `partials` placeholder indexes.\n * @returns {Array} Returns the new array of composed arguments.\n */\nfunction composeArgsRight(args, partials, holders) {\n  var holdersIndex = -1,\n      holdersLength = holders.length,\n      argsIndex = -1,\n      argsLength = nativeMax(args.length - holdersLength, 0),\n      rightIndex = -1,\n      rightLength = partials.length,\n      result = Array(argsLength + rightLength);\n\n  while (++argsIndex < argsLength) {\n    result[argsIndex] = args[argsIndex];\n  }\n  var offset = argsIndex;\n  while (++rightIndex < rightLength) {\n    result[offset + rightIndex] = partials[rightIndex];\n  }\n  while (++holdersIndex < holdersLength) {\n    result[offset + holders[holdersIndex]] = args[argsIndex++];\n  }\n  return result;\n}\n\nmodule.exports = composeArgsRight;\n","var getLength = require('./getLength'),\n    isLength = require('./isLength'),\n    toObject = require('./toObject');\n\n/**\n * Creates a `baseEach` or `baseEachRight` function.\n *\n * @private\n * @param {Function} eachFunc The function to iterate over a collection.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new base function.\n */\nfunction createBaseEach(eachFunc, fromRight) {\n  return function(collection, iteratee) {\n    var length = collection ? getLength(collection) : 0;\n    if (!isLength(length)) {\n      return eachFunc(collection, iteratee);\n    }\n    var index = fromRight ? length : -1,\n        iterable = toObject(collection);\n\n    while ((fromRight ? index-- : ++index < length)) {\n      if (iteratee(iterable[index], index, iterable) === false) {\n        break;\n      }\n    }\n    return collection;\n  };\n}\n\nmodule.exports = createBaseEach;\n","var toObject = require('./toObject');\n\n/**\n * Creates a base function for `_.forIn` or `_.forInRight`.\n *\n * @private\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new base function.\n */\nfunction createBaseFor(fromRight) {\n  return function(object, iteratee, keysFunc) {\n    var iterable = toObject(object),\n        props = keysFunc(object),\n        length = props.length,\n        index = fromRight ? length : -1;\n\n    while ((fromRight ? index-- : ++index < length)) {\n      var key = props[index];\n      if (iteratee(iterable[key], key, iterable) === false) {\n        break;\n      }\n    }\n    return object;\n  };\n}\n\nmodule.exports = createBaseFor;\n","(function (global){\nvar createCtorWrapper = require('./createCtorWrapper');\n\n/**\n * Creates a function that wraps `func` and invokes it with the `this`\n * binding of `thisArg`.\n *\n * @private\n * @param {Function} func The function to bind.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @returns {Function} Returns the new bound function.\n */\nfunction createBindWrapper(func, thisArg) {\n  var Ctor = createCtorWrapper(func);\n\n  function wrapper() {\n    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;\n    return fn.apply(thisArg, arguments);\n  }\n  return wrapper;\n}\n\nmodule.exports = createBindWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUJpbmRXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggdGhlIGB0aGlzYFxuICogYmluZGluZyBvZiBgdGhpc0FyZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb259IGZ1bmMgVGhlIGZ1bmN0aW9uIHRvIGJpbmQuXG4gKiBAcGFyYW0geyp9IFt0aGlzQXJnXSBUaGUgYHRoaXNgIGJpbmRpbmcgb2YgYGZ1bmNgLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUJpbmRXcmFwcGVyKGZ1bmMsIHRoaXNBcmcpIHtcbiAgdmFyIEN0b3IgPSBjcmVhdGVDdG9yV3JhcHBlcihmdW5jKTtcblxuICBmdW5jdGlvbiB3cmFwcGVyKCkge1xuICAgIHZhciBmbiA9ICh0aGlzICYmIHRoaXMgIT09IGdsb2JhbCAmJiB0aGlzIGluc3RhbmNlb2Ygd3JhcHBlcikgPyBDdG9yIDogZnVuYztcbiAgICByZXR1cm4gZm4uYXBwbHkodGhpc0FyZywgYXJndW1lbnRzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVCaW5kV3JhcHBlcjtcbiJdfQ==","var baseCreate = require('./baseCreate'),\n    isObject = require('../lang/isObject');\n\n/**\n * Creates a function that produces an instance of `Ctor` regardless of\n * whether it was invoked as part of a `new` expression or by `call` or `apply`.\n *\n * @private\n * @param {Function} Ctor The constructor to wrap.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createCtorWrapper(Ctor) {\n  return function() {\n    // Use a `switch` statement to work with class constructors.\n    // See http://ecma-international.org/ecma-262/6.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist\n    // for more details.\n    var args = arguments;\n    switch (args.length) {\n      case 0: return new Ctor;\n      case 1: return new Ctor(args[0]);\n      case 2: return new Ctor(args[0], args[1]);\n      case 3: return new Ctor(args[0], args[1], args[2]);\n      case 4: return new Ctor(args[0], args[1], args[2], args[3]);\n      case 5: return new Ctor(args[0], args[1], args[2], args[3], args[4]);\n      case 6: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5]);\n      case 7: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);\n    }\n    var thisBinding = baseCreate(Ctor.prototype),\n        result = Ctor.apply(thisBinding, args);\n\n    // Mimic the constructor's `return` behavior.\n    // See https://es5.github.io/#x13.2.2 for more details.\n    return isObject(result) ? result : thisBinding;\n  };\n}\n\nmodule.exports = createCtorWrapper;\n","var baseCallback = require('./baseCallback'),\n    baseFind = require('./baseFind'),\n    baseFindIndex = require('./baseFindIndex'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates a `_.find` or `_.findLast` function.\n *\n * @private\n * @param {Function} eachFunc The function to iterate over a collection.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new find function.\n */\nfunction createFind(eachFunc, fromRight) {\n  return function(collection, predicate, thisArg) {\n    predicate = baseCallback(predicate, thisArg, 3);\n    if (isArray(collection)) {\n      var index = baseFindIndex(collection, predicate, fromRight);\n      return index > -1 ? collection[index] : undefined;\n    }\n    return baseFind(collection, predicate, eachFunc);\n  };\n}\n\nmodule.exports = createFind;\n","var bindCallback = require('./bindCallback'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates a function for `_.forEach` or `_.forEachRight`.\n *\n * @private\n * @param {Function} arrayFunc The function to iterate over an array.\n * @param {Function} eachFunc The function to iterate over a collection.\n * @returns {Function} Returns the new each function.\n */\nfunction createForEach(arrayFunc, eachFunc) {\n  return function(collection, iteratee, thisArg) {\n    return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection))\n      ? arrayFunc(collection, iteratee)\n      : eachFunc(collection, bindCallback(iteratee, thisArg, 3));\n  };\n}\n\nmodule.exports = createForEach;\n","(function (global){\nvar arrayCopy = require('./arrayCopy'),\n    composeArgs = require('./composeArgs'),\n    composeArgsRight = require('./composeArgsRight'),\n    createCtorWrapper = require('./createCtorWrapper'),\n    isLaziable = require('./isLaziable'),\n    reorder = require('./reorder'),\n    replaceHolders = require('./replaceHolders'),\n    setData = require('./setData');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    BIND_KEY_FLAG = 2,\n    CURRY_BOUND_FLAG = 4,\n    CURRY_FLAG = 8,\n    CURRY_RIGHT_FLAG = 16,\n    PARTIAL_FLAG = 32,\n    PARTIAL_RIGHT_FLAG = 64,\n    ARY_FLAG = 128;\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that wraps `func` and invokes it with optional `this`\n * binding of, partial application, and currying.\n *\n * @private\n * @param {Function|string} func The function or method name to reference.\n * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {Array} [partials] The arguments to prepend to those provided to the new function.\n * @param {Array} [holders] The `partials` placeholder indexes.\n * @param {Array} [partialsRight] The arguments to append to those provided to the new function.\n * @param {Array} [holdersRight] The `partialsRight` placeholder indexes.\n * @param {Array} [argPos] The argument positions of the new function.\n * @param {number} [ary] The arity cap of `func`.\n * @param {number} [arity] The arity of `func`.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createHybridWrapper(func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity) {\n  var isAry = bitmask & ARY_FLAG,\n      isBind = bitmask & BIND_FLAG,\n      isBindKey = bitmask & BIND_KEY_FLAG,\n      isCurry = bitmask & CURRY_FLAG,\n      isCurryBound = bitmask & CURRY_BOUND_FLAG,\n      isCurryRight = bitmask & CURRY_RIGHT_FLAG,\n      Ctor = isBindKey ? undefined : createCtorWrapper(func);\n\n  function wrapper() {\n    // Avoid `arguments` object use disqualifying optimizations by\n    // converting it to an array before providing it to other functions.\n    var length = arguments.length,\n        index = length,\n        args = Array(length);\n\n    while (index--) {\n      args[index] = arguments[index];\n    }\n    if (partials) {\n      args = composeArgs(args, partials, holders);\n    }\n    if (partialsRight) {\n      args = composeArgsRight(args, partialsRight, holdersRight);\n    }\n    if (isCurry || isCurryRight) {\n      var placeholder = wrapper.placeholder,\n          argsHolders = replaceHolders(args, placeholder);\n\n      length -= argsHolders.length;\n      if (length < arity) {\n        var newArgPos = argPos ? arrayCopy(argPos) : undefined,\n            newArity = nativeMax(arity - length, 0),\n            newsHolders = isCurry ? argsHolders : undefined,\n            newHoldersRight = isCurry ? undefined : argsHolders,\n            newPartials = isCurry ? args : undefined,\n            newPartialsRight = isCurry ? undefined : args;\n\n        bitmask |= (isCurry ? PARTIAL_FLAG : PARTIAL_RIGHT_FLAG);\n        bitmask &= ~(isCurry ? PARTIAL_RIGHT_FLAG : PARTIAL_FLAG);\n\n        if (!isCurryBound) {\n          bitmask &= ~(BIND_FLAG | BIND_KEY_FLAG);\n        }\n        var newData = [func, bitmask, thisArg, newPartials, newsHolders, newPartialsRight, newHoldersRight, newArgPos, ary, newArity],\n            result = createHybridWrapper.apply(undefined, newData);\n\n        if (isLaziable(func)) {\n          setData(result, newData);\n        }\n        result.placeholder = placeholder;\n        return result;\n      }\n    }\n    var thisBinding = isBind ? thisArg : this,\n        fn = isBindKey ? thisBinding[func] : func;\n\n    if (argPos) {\n      args = reorder(args, argPos);\n    }\n    if (isAry && ary < args.length) {\n      args.length = ary;\n    }\n    if (this && this !== global && this instanceof wrapper) {\n      fn = Ctor || createCtorWrapper(func);\n    }\n    return fn.apply(thisBinding, args);\n  }\n  return wrapper;\n}\n\nmodule.exports = createHybridWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUh5YnJpZFdyYXBwZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYXJyYXlDb3B5ID0gcmVxdWlyZSgnLi9hcnJheUNvcHknKSxcbiAgICBjb21wb3NlQXJncyA9IHJlcXVpcmUoJy4vY29tcG9zZUFyZ3MnKSxcbiAgICBjb21wb3NlQXJnc1JpZ2h0ID0gcmVxdWlyZSgnLi9jb21wb3NlQXJnc1JpZ2h0JyksXG4gICAgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyksXG4gICAgaXNMYXppYWJsZSA9IHJlcXVpcmUoJy4vaXNMYXppYWJsZScpLFxuICAgIHJlb3JkZXIgPSByZXF1aXJlKCcuL3Jlb3JkZXInKSxcbiAgICByZXBsYWNlSG9sZGVycyA9IHJlcXVpcmUoJy4vcmVwbGFjZUhvbGRlcnMnKSxcbiAgICBzZXREYXRhID0gcmVxdWlyZSgnLi9zZXREYXRhJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMSxcbiAgICBCSU5EX0tFWV9GTEFHID0gMixcbiAgICBDVVJSWV9CT1VORF9GTEFHID0gNCxcbiAgICBDVVJSWV9GTEFHID0gOCxcbiAgICBDVVJSWV9SSUdIVF9GTEFHID0gMTYsXG4gICAgUEFSVElBTF9GTEFHID0gMzIsXG4gICAgUEFSVElBTF9SSUdIVF9GTEFHID0gNjQsXG4gICAgQVJZX0ZMQUcgPSAxMjg7XG5cbi8qIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcyBmb3IgdGhvc2Ugd2l0aCB0aGUgc2FtZSBuYW1lIGFzIG90aGVyIGBsb2Rhc2hgIG1ldGhvZHMuICovXG52YXIgbmF0aXZlTWF4ID0gTWF0aC5tYXg7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mLCBwYXJ0aWFsIGFwcGxpY2F0aW9uLCBhbmQgY3VycnlpbmcuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb258c3RyaW5nfSBmdW5jIFRoZSBmdW5jdGlvbiBvciBtZXRob2QgbmFtZSB0byByZWZlcmVuY2UuXG4gKiBAcGFyYW0ge251bWJlcn0gYml0bWFzayBUaGUgYml0bWFzayBvZiBmbGFncy4gU2VlIGBjcmVhdGVXcmFwcGVyYCBmb3IgbW9yZSBkZXRhaWxzLlxuICogQHBhcmFtIHsqfSBbdGhpc0FyZ10gVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc10gVGhlIGFyZ3VtZW50cyB0byBwcmVwZW5kIHRvIHRob3NlIHByb3ZpZGVkIHRvIHRoZSBuZXcgZnVuY3Rpb24uXG4gKiBAcGFyYW0ge0FycmF5fSBbaG9sZGVyc10gVGhlIGBwYXJ0aWFsc2AgcGxhY2Vob2xkZXIgaW5kZXhlcy5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc1JpZ2h0XSBUaGUgYXJndW1lbnRzIHRvIGFwcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtBcnJheX0gW2hvbGRlcnNSaWdodF0gVGhlIGBwYXJ0aWFsc1JpZ2h0YCBwbGFjZWhvbGRlciBpbmRleGVzLlxuICogQHBhcmFtIHtBcnJheX0gW2FyZ1Bvc10gVGhlIGFyZ3VtZW50IHBvc2l0aW9ucyBvZiB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcnldIFRoZSBhcml0eSBjYXAgb2YgYGZ1bmNgLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcml0eV0gVGhlIGFyaXR5IG9mIGBmdW5jYC5cbiAqIEByZXR1cm5zIHtGdW5jdGlvbn0gUmV0dXJucyB0aGUgbmV3IHdyYXBwZWQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUh5YnJpZFdyYXBwZXIoZnVuYywgYml0bWFzaywgdGhpc0FyZywgcGFydGlhbHMsIGhvbGRlcnMsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCwgYXJnUG9zLCBhcnksIGFyaXR5KSB7XG4gIHZhciBpc0FyeSA9IGJpdG1hc2sgJiBBUllfRkxBRyxcbiAgICAgIGlzQmluZCA9IGJpdG1hc2sgJiBCSU5EX0ZMQUcsXG4gICAgICBpc0JpbmRLZXkgPSBiaXRtYXNrICYgQklORF9LRVlfRkxBRyxcbiAgICAgIGlzQ3VycnkgPSBiaXRtYXNrICYgQ1VSUllfRkxBRyxcbiAgICAgIGlzQ3VycnlCb3VuZCA9IGJpdG1hc2sgJiBDVVJSWV9CT1VORF9GTEFHLFxuICAgICAgaXNDdXJyeVJpZ2h0ID0gYml0bWFzayAmIENVUlJZX1JJR0hUX0ZMQUcsXG4gICAgICBDdG9yID0gaXNCaW5kS2V5ID8gdW5kZWZpbmVkIDogY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG5cbiAgZnVuY3Rpb24gd3JhcHBlcigpIHtcbiAgICAvLyBBdm9pZCBgYXJndW1lbnRzYCBvYmplY3QgdXNlIGRpc3F1YWxpZnlpbmcgb3B0aW1pemF0aW9ucyBieVxuICAgIC8vIGNvbnZlcnRpbmcgaXQgdG8gYW4gYXJyYXkgYmVmb3JlIHByb3ZpZGluZyBpdCB0byBvdGhlciBmdW5jdGlvbnMuXG4gICAgdmFyIGxlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGluZGV4ID0gbGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVuZ3RoKTtcblxuICAgIHdoaWxlIChpbmRleC0tKSB7XG4gICAgICBhcmdzW2luZGV4XSA9IGFyZ3VtZW50c1tpbmRleF07XG4gICAgfVxuICAgIGlmIChwYXJ0aWFscykge1xuICAgICAgYXJncyA9IGNvbXBvc2VBcmdzKGFyZ3MsIHBhcnRpYWxzLCBob2xkZXJzKTtcbiAgICB9XG4gICAgaWYgKHBhcnRpYWxzUmlnaHQpIHtcbiAgICAgIGFyZ3MgPSBjb21wb3NlQXJnc1JpZ2h0KGFyZ3MsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCk7XG4gICAgfVxuICAgIGlmIChpc0N1cnJ5IHx8IGlzQ3VycnlSaWdodCkge1xuICAgICAgdmFyIHBsYWNlaG9sZGVyID0gd3JhcHBlci5wbGFjZWhvbGRlcixcbiAgICAgICAgICBhcmdzSG9sZGVycyA9IHJlcGxhY2VIb2xkZXJzKGFyZ3MsIHBsYWNlaG9sZGVyKTtcblxuICAgICAgbGVuZ3RoIC09IGFyZ3NIb2xkZXJzLmxlbmd0aDtcbiAgICAgIGlmIChsZW5ndGggPCBhcml0eSkge1xuICAgICAgICB2YXIgbmV3QXJnUG9zID0gYXJnUG9zID8gYXJyYXlDb3B5KGFyZ1BvcykgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdBcml0eSA9IG5hdGl2ZU1heChhcml0eSAtIGxlbmd0aCwgMCksXG4gICAgICAgICAgICBuZXdzSG9sZGVycyA9IGlzQ3VycnkgPyBhcmdzSG9sZGVycyA6IHVuZGVmaW5lZCxcbiAgICAgICAgICAgIG5ld0hvbGRlcnNSaWdodCA9IGlzQ3VycnkgPyB1bmRlZmluZWQgOiBhcmdzSG9sZGVycyxcbiAgICAgICAgICAgIG5ld1BhcnRpYWxzID0gaXNDdXJyeSA/IGFyZ3MgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdQYXJ0aWFsc1JpZ2h0ID0gaXNDdXJyeSA/IHVuZGVmaW5lZCA6IGFyZ3M7XG5cbiAgICAgICAgYml0bWFzayB8PSAoaXNDdXJyeSA/IFBBUlRJQUxfRkxBRyA6IFBBUlRJQUxfUklHSFRfRkxBRyk7XG4gICAgICAgIGJpdG1hc2sgJj0gfihpc0N1cnJ5ID8gUEFSVElBTF9SSUdIVF9GTEFHIDogUEFSVElBTF9GTEFHKTtcblxuICAgICAgICBpZiAoIWlzQ3VycnlCb3VuZCkge1xuICAgICAgICAgIGJpdG1hc2sgJj0gfihCSU5EX0ZMQUcgfCBCSU5EX0tFWV9GTEFHKTtcbiAgICAgICAgfVxuICAgICAgICB2YXIgbmV3RGF0YSA9IFtmdW5jLCBiaXRtYXNrLCB0aGlzQXJnLCBuZXdQYXJ0aWFscywgbmV3c0hvbGRlcnMsIG5ld1BhcnRpYWxzUmlnaHQsIG5ld0hvbGRlcnNSaWdodCwgbmV3QXJnUG9zLCBhcnksIG5ld0FyaXR5XSxcbiAgICAgICAgICAgIHJlc3VsdCA9IGNyZWF0ZUh5YnJpZFdyYXBwZXIuYXBwbHkodW5kZWZpbmVkLCBuZXdEYXRhKTtcblxuICAgICAgICBpZiAoaXNMYXppYWJsZShmdW5jKSkge1xuICAgICAgICAgIHNldERhdGEocmVzdWx0LCBuZXdEYXRhKTtcbiAgICAgICAgfVxuICAgICAgICByZXN1bHQucGxhY2Vob2xkZXIgPSBwbGFjZWhvbGRlcjtcbiAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiAgICAgIH1cbiAgICB9XG4gICAgdmFyIHRoaXNCaW5kaW5nID0gaXNCaW5kID8gdGhpc0FyZyA6IHRoaXMsXG4gICAgICAgIGZuID0gaXNCaW5kS2V5ID8gdGhpc0JpbmRpbmdbZnVuY10gOiBmdW5jO1xuXG4gICAgaWYgKGFyZ1Bvcykge1xuICAgICAgYXJncyA9IHJlb3JkZXIoYXJncywgYXJnUG9zKTtcbiAgICB9XG4gICAgaWYgKGlzQXJ5ICYmIGFyeSA8IGFyZ3MubGVuZ3RoKSB7XG4gICAgICBhcmdzLmxlbmd0aCA9IGFyeTtcbiAgICB9XG4gICAgaWYgKHRoaXMgJiYgdGhpcyAhPT0gZ2xvYmFsICYmIHRoaXMgaW5zdGFuY2VvZiB3cmFwcGVyKSB7XG4gICAgICBmbiA9IEN0b3IgfHwgY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG4gICAgfVxuICAgIHJldHVybiBmbi5hcHBseSh0aGlzQmluZGluZywgYXJncyk7XG4gIH1cbiAgcmV0dXJuIHdyYXBwZXI7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gY3JlYXRlSHlicmlkV3JhcHBlcjtcbiJdfQ==","(function (global){\nvar createCtorWrapper = require('./createCtorWrapper');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1;\n\n/**\n * Creates a function that wraps `func` and invokes it with the optional `this`\n * binding of `thisArg` and the `partials` prepended to those provided to\n * the wrapper.\n *\n * @private\n * @param {Function} func The function to partially apply arguments to.\n * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {Array} partials The arguments to prepend to those provided to the new function.\n * @returns {Function} Returns the new bound function.\n */\nfunction createPartialWrapper(func, bitmask, thisArg, partials) {\n  var isBind = bitmask & BIND_FLAG,\n      Ctor = createCtorWrapper(func);\n\n  function wrapper() {\n    // Avoid `arguments` object use disqualifying optimizations by\n    // converting it to an array before providing it `func`.\n    var argsIndex = -1,\n        argsLength = arguments.length,\n        leftIndex = -1,\n        leftLength = partials.length,\n        args = Array(leftLength + argsLength);\n\n    while (++leftIndex < leftLength) {\n      args[leftIndex] = partials[leftIndex];\n    }\n    while (argsLength--) {\n      args[leftIndex++] = arguments[++argsIndex];\n    }\n    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;\n    return fn.apply(isBind ? thisArg : this, args);\n  }\n  return wrapper;\n}\n\nmodule.exports = createPartialWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZVBhcnRpYWxXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMTtcblxuLyoqXG4gKiBDcmVhdGVzIGEgZnVuY3Rpb24gdGhhdCB3cmFwcyBgZnVuY2AgYW5kIGludm9rZXMgaXQgd2l0aCB0aGUgb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mIGB0aGlzQXJnYCBhbmQgdGhlIGBwYXJ0aWFsc2AgcHJlcGVuZGVkIHRvIHRob3NlIHByb3ZpZGVkIHRvXG4gKiB0aGUgd3JhcHBlci5cbiAqXG4gKiBAcHJpdmF0ZVxuICogQHBhcmFtIHtGdW5jdGlvbn0gZnVuYyBUaGUgZnVuY3Rpb24gdG8gcGFydGlhbGx5IGFwcGx5IGFyZ3VtZW50cyB0by5cbiAqIEBwYXJhbSB7bnVtYmVyfSBiaXRtYXNrIFRoZSBiaXRtYXNrIG9mIGZsYWdzLiBTZWUgYGNyZWF0ZVdyYXBwZXJgIGZvciBtb3JlIGRldGFpbHMuXG4gKiBAcGFyYW0geyp9IHRoaXNBcmcgVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IHBhcnRpYWxzIFRoZSBhcmd1bWVudHMgdG8gcHJlcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZVBhcnRpYWxXcmFwcGVyKGZ1bmMsIGJpdG1hc2ssIHRoaXNBcmcsIHBhcnRpYWxzKSB7XG4gIHZhciBpc0JpbmQgPSBiaXRtYXNrICYgQklORF9GTEFHLFxuICAgICAgQ3RvciA9IGNyZWF0ZUN0b3JXcmFwcGVyKGZ1bmMpO1xuXG4gIGZ1bmN0aW9uIHdyYXBwZXIoKSB7XG4gICAgLy8gQXZvaWQgYGFyZ3VtZW50c2Agb2JqZWN0IHVzZSBkaXNxdWFsaWZ5aW5nIG9wdGltaXphdGlvbnMgYnlcbiAgICAvLyBjb252ZXJ0aW5nIGl0IHRvIGFuIGFycmF5IGJlZm9yZSBwcm92aWRpbmcgaXQgYGZ1bmNgLlxuICAgIHZhciBhcmdzSW5kZXggPSAtMSxcbiAgICAgICAgYXJnc0xlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGxlZnRJbmRleCA9IC0xLFxuICAgICAgICBsZWZ0TGVuZ3RoID0gcGFydGlhbHMubGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVmdExlbmd0aCArIGFyZ3NMZW5ndGgpO1xuXG4gICAgd2hpbGUgKCsrbGVmdEluZGV4IDwgbGVmdExlbmd0aCkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXhdID0gcGFydGlhbHNbbGVmdEluZGV4XTtcbiAgICB9XG4gICAgd2hpbGUgKGFyZ3NMZW5ndGgtLSkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXgrK10gPSBhcmd1bWVudHNbKythcmdzSW5kZXhdO1xuICAgIH1cbiAgICB2YXIgZm4gPSAodGhpcyAmJiB0aGlzICE9PSBnbG9iYWwgJiYgdGhpcyBpbnN0YW5jZW9mIHdyYXBwZXIpID8gQ3RvciA6IGZ1bmM7XG4gICAgcmV0dXJuIGZuLmFwcGx5KGlzQmluZCA/IHRoaXNBcmcgOiB0aGlzLCBhcmdzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVQYXJ0aWFsV3JhcHBlcjtcbiJdfQ==","var baseSetData = require('./baseSetData'),\n    createBindWrapper = require('./createBindWrapper'),\n    createHybridWrapper = require('./createHybridWrapper'),\n    createPartialWrapper = require('./createPartialWrapper'),\n    getData = require('./getData'),\n    mergeData = require('./mergeData'),\n    setData = require('./setData');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    BIND_KEY_FLAG = 2,\n    PARTIAL_FLAG = 32,\n    PARTIAL_RIGHT_FLAG = 64;\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that either curries or invokes `func` with optional\n * `this` binding and partially applied arguments.\n *\n * @private\n * @param {Function|string} func The function or method name to reference.\n * @param {number} bitmask The bitmask of flags.\n *  The bitmask may be composed of the following flags:\n *     1 - `_.bind`\n *     2 - `_.bindKey`\n *     4 - `_.curry` or `_.curryRight` of a bound function\n *     8 - `_.curry`\n *    16 - `_.curryRight`\n *    32 - `_.partial`\n *    64 - `_.partialRight`\n *   128 - `_.rearg`\n *   256 - `_.ary`\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {Array} [partials] The arguments to be partially applied.\n * @param {Array} [holders] The `partials` placeholder indexes.\n * @param {Array} [argPos] The argument positions of the new function.\n * @param {number} [ary] The arity cap of `func`.\n * @param {number} [arity] The arity of `func`.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createWrapper(func, bitmask, thisArg, partials, holders, argPos, ary, arity) {\n  var isBindKey = bitmask & BIND_KEY_FLAG;\n  if (!isBindKey && typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  var length = partials ? partials.length : 0;\n  if (!length) {\n    bitmask &= ~(PARTIAL_FLAG | PARTIAL_RIGHT_FLAG);\n    partials = holders = undefined;\n  }\n  length -= (holders ? holders.length : 0);\n  if (bitmask & PARTIAL_RIGHT_FLAG) {\n    var partialsRight = partials,\n        holdersRight = holders;\n\n    partials = holders = undefined;\n  }\n  var data = isBindKey ? undefined : getData(func),\n      newData = [func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity];\n\n  if (data) {\n    mergeData(newData, data);\n    bitmask = newData[1];\n    arity = newData[9];\n  }\n  newData[9] = arity == null\n    ? (isBindKey ? 0 : func.length)\n    : (nativeMax(arity - length, 0) || 0);\n\n  if (bitmask == BIND_FLAG) {\n    var result = createBindWrapper(newData[0], newData[2]);\n  } else if ((bitmask == PARTIAL_FLAG || bitmask == (BIND_FLAG | PARTIAL_FLAG)) && !newData[4].length) {\n    result = createPartialWrapper.apply(undefined, newData);\n  } else {\n    result = createHybridWrapper.apply(undefined, newData);\n  }\n  var setter = data ? baseSetData : setData;\n  return setter(result, newData);\n}\n\nmodule.exports = createWrapper;\n","var arraySome = require('./arraySome');\n\n/**\n * A specialized version of `baseIsEqualDeep` for arrays with support for\n * partial deep comparisons.\n *\n * @private\n * @param {Array} array The array to compare.\n * @param {Array} other The other array to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing arrays.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.\n */\nfunction equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var index = -1,\n      arrLength = array.length,\n      othLength = other.length;\n\n  if (arrLength != othLength && !(isLoose && othLength > arrLength)) {\n    return false;\n  }\n  // Ignore non-index properties.\n  while (++index < arrLength) {\n    var arrValue = array[index],\n        othValue = other[index],\n        result = customizer ? customizer(isLoose ? othValue : arrValue, isLoose ? arrValue : othValue, index) : undefined;\n\n    if (result !== undefined) {\n      if (result) {\n        continue;\n      }\n      return false;\n    }\n    // Recursively compare arrays (susceptible to call stack limits).\n    if (isLoose) {\n      if (!arraySome(other, function(othValue) {\n            return arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);\n          })) {\n        return false;\n      }\n    } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB))) {\n      return false;\n    }\n  }\n  return true;\n}\n\nmodule.exports = equalArrays;\n","/** `Object#toString` result references. */\nvar boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    numberTag = '[object Number]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\n/**\n * A specialized version of `baseIsEqualDeep` for comparing objects of\n * the same `toStringTag`.\n *\n * **Note:** This function only supports comparing values with tags of\n * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {string} tag The `toStringTag` of the objects to compare.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction equalByTag(object, other, tag) {\n  switch (tag) {\n    case boolTag:\n    case dateTag:\n      // Coerce dates and booleans to numbers, dates to milliseconds and booleans\n      // to `1` or `0` treating invalid dates coerced to `NaN` as not equal.\n      return +object == +other;\n\n    case errorTag:\n      return object.name == other.name && object.message == other.message;\n\n    case numberTag:\n      // Treat `NaN` vs. `NaN` as equal.\n      return (object != +object)\n        ? other != +other\n        : object == +other;\n\n    case regexpTag:\n    case stringTag:\n      // Coerce regexes to strings and treat strings primitives and string\n      // objects as equal. See https://es5.github.io/#x15.10.6.4 for more details.\n      return object == (other + '');\n  }\n  return false;\n}\n\nmodule.exports = equalByTag;\n","var keys = require('../object/keys');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * A specialized version of `baseIsEqualDeep` for objects with support for\n * partial deep comparisons.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing values.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction equalObjects(object, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var objProps = keys(object),\n      objLength = objProps.length,\n      othProps = keys(other),\n      othLength = othProps.length;\n\n  if (objLength != othLength && !isLoose) {\n    return false;\n  }\n  var index = objLength;\n  while (index--) {\n    var key = objProps[index];\n    if (!(isLoose ? key in other : hasOwnProperty.call(other, key))) {\n      return false;\n    }\n  }\n  var skipCtor = isLoose;\n  while (++index < objLength) {\n    key = objProps[index];\n    var objValue = object[key],\n        othValue = other[key],\n        result = customizer ? customizer(isLoose ? othValue : objValue, isLoose? objValue : othValue, key) : undefined;\n\n    // Recursively compare objects (susceptible to call stack limits).\n    if (!(result === undefined ? equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB) : result)) {\n      return false;\n    }\n    skipCtor || (skipCtor = key == 'constructor');\n  }\n  if (!skipCtor) {\n    var objCtor = object.constructor,\n        othCtor = other.constructor;\n\n    // Non `Object` object instances with different constructors are not equal.\n    if (objCtor != othCtor &&\n        ('constructor' in object && 'constructor' in other) &&\n        !(typeof objCtor == 'function' && objCtor instanceof objCtor &&\n          typeof othCtor == 'function' && othCtor instanceof othCtor)) {\n      return false;\n    }\n  }\n  return true;\n}\n\nmodule.exports = equalObjects;\n","var metaMap = require('./metaMap'),\n    noop = require('../utility/noop');\n\n/**\n * Gets metadata for `func`.\n *\n * @private\n * @param {Function} func The function to query.\n * @returns {*} Returns the metadata for `func`.\n */\nvar getData = !metaMap ? noop : function(func) {\n  return metaMap.get(func);\n};\n\nmodule.exports = getData;\n","var realNames = require('./realNames');\n\n/**\n * Gets the name of `func`.\n *\n * @private\n * @param {Function} func The function to query.\n * @returns {string} Returns the function name.\n */\nfunction getFuncName(func) {\n  var result = (func.name + ''),\n      array = realNames[result],\n      length = array ? array.length : 0;\n\n  while (length--) {\n    var data = array[length],\n        otherFunc = data.func;\n    if (otherFunc == null || otherFunc == func) {\n      return data.name;\n    }\n  }\n  return result;\n}\n\nmodule.exports = getFuncName;\n","var baseProperty = require('./baseProperty');\n\n/**\n * Gets the \"length\" property value of `object`.\n *\n * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)\n * that affects Safari on at least iOS 8.1-8.3 ARM64.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {*} Returns the \"length\" value.\n */\nvar getLength = baseProperty('length');\n\nmodule.exports = getLength;\n","var isStrictComparable = require('./isStrictComparable'),\n    pairs = require('../object/pairs');\n\n/**\n * Gets the propery names, values, and compare flags of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {Array} Returns the match data of `object`.\n */\nfunction getMatchData(object) {\n  var result = pairs(object),\n      length = result.length;\n\n  while (length--) {\n    result[length][2] = isStrictComparable(result[length][1]);\n  }\n  return result;\n}\n\nmodule.exports = getMatchData;\n","var isNative = require('../lang/isNative');\n\n/**\n * Gets the native function at `key` of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {string} key The key of the method to get.\n * @returns {*} Returns the function if it's native, else `undefined`.\n */\nfunction getNative(object, key) {\n  var value = object == null ? undefined : object[key];\n  return isNative(value) ? value : undefined;\n}\n\nmodule.exports = getNative;\n","/**\n * Gets the index at which the first occurrence of `NaN` is found in `array`.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {number} fromIndex The index to search from.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {number} Returns the index of the matched `NaN`, else `-1`.\n */\nfunction indexOfNaN(array, fromIndex, fromRight) {\n  var length = array.length,\n      index = fromIndex + (fromRight ? 0 : -1);\n\n  while ((fromRight ? index-- : ++index < length)) {\n    var other = array[index];\n    if (other !== other) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = indexOfNaN;\n","/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Initializes an array clone.\n *\n * @private\n * @param {Array} array The array to clone.\n * @returns {Array} Returns the initialized clone.\n */\nfunction initCloneArray(array) {\n  var length = array.length,\n      result = new array.constructor(length);\n\n  // Add array properties assigned by `RegExp#exec`.\n  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {\n    result.index = array.index;\n    result.input = array.input;\n  }\n  return result;\n}\n\nmodule.exports = initCloneArray;\n","(function (global){\nvar bufferClone = require('./bufferClone');\n\n/** `Object#toString` result references. */\nvar boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    numberTag = '[object Number]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to match `RegExp` flags from their coerced string values. */\nvar reFlags = /\\w*$/;\n\n/** Native method references. */\nvar Uint8Array = global.Uint8Array;\n\n/** Used to lookup a type array constructors by `toStringTag`. */\nvar ctorByTag = {};\nctorByTag[float32Tag] = global.Float32Array;\nctorByTag[float64Tag] = global.Float64Array;\nctorByTag[int8Tag] = global.Int8Array;\nctorByTag[int16Tag] = global.Int16Array;\nctorByTag[int32Tag] = global.Int32Array;\nctorByTag[uint8Tag] = Uint8Array;\nctorByTag[uint8ClampedTag] = global.Uint8ClampedArray;\nctorByTag[uint16Tag] = global.Uint16Array;\nctorByTag[uint32Tag] = global.Uint32Array;\n\n/**\n * Initializes an object clone based on its `toStringTag`.\n *\n * **Note:** This function only supports cloning values with tags of\n * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.\n *\n * @private\n * @param {Object} object The object to clone.\n * @param {string} tag The `toStringTag` of the object to clone.\n * @param {boolean} [isDeep] Specify a deep clone.\n * @returns {Object} Returns the initialized clone.\n */\nfunction initCloneByTag(object, tag, isDeep) {\n  var Ctor = object.constructor;\n  switch (tag) {\n    case arrayBufferTag:\n      return bufferClone(object);\n\n    case boolTag:\n    case dateTag:\n      return new Ctor(+object);\n\n    case float32Tag: case float64Tag:\n    case int8Tag: case int16Tag: case int32Tag:\n    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:\n      // Safari 5 mobile incorrectly has `Object` as the constructor of typed arrays.\n      if (Ctor instanceof Ctor) {\n        Ctor = ctorByTag[tag];\n      }\n      var buffer = object.buffer;\n      return new Ctor(isDeep ? bufferClone(buffer) : buffer, object.byteOffset, object.length);\n\n    case numberTag:\n    case stringTag:\n      return new Ctor(object);\n\n    case regexpTag:\n      var result = new Ctor(object.source, reFlags.exec(object));\n      result.lastIndex = object.lastIndex;\n  }\n  return result;\n}\n\nmodule.exports = initCloneByTag;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2luaXRDbG9uZUJ5VGFnLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYnVmZmVyQ2xvbmUgPSByZXF1aXJlKCcuL2J1ZmZlckNsb25lJyk7XG5cbi8qKiBgT2JqZWN0I3RvU3RyaW5nYCByZXN1bHQgcmVmZXJlbmNlcy4gKi9cbnZhciBib29sVGFnID0gJ1tvYmplY3QgQm9vbGVhbl0nLFxuICAgIGRhdGVUYWcgPSAnW29iamVjdCBEYXRlXScsXG4gICAgbnVtYmVyVGFnID0gJ1tvYmplY3QgTnVtYmVyXScsXG4gICAgcmVnZXhwVGFnID0gJ1tvYmplY3QgUmVnRXhwXScsXG4gICAgc3RyaW5nVGFnID0gJ1tvYmplY3QgU3RyaW5nXSc7XG5cbnZhciBhcnJheUJ1ZmZlclRhZyA9ICdbb2JqZWN0IEFycmF5QnVmZmVyXScsXG4gICAgZmxvYXQzMlRhZyA9ICdbb2JqZWN0IEZsb2F0MzJBcnJheV0nLFxuICAgIGZsb2F0NjRUYWcgPSAnW29iamVjdCBGbG9hdDY0QXJyYXldJyxcbiAgICBpbnQ4VGFnID0gJ1tvYmplY3QgSW50OEFycmF5XScsXG4gICAgaW50MTZUYWcgPSAnW29iamVjdCBJbnQxNkFycmF5XScsXG4gICAgaW50MzJUYWcgPSAnW29iamVjdCBJbnQzMkFycmF5XScsXG4gICAgdWludDhUYWcgPSAnW29iamVjdCBVaW50OEFycmF5XScsXG4gICAgdWludDhDbGFtcGVkVGFnID0gJ1tvYmplY3QgVWludDhDbGFtcGVkQXJyYXldJyxcbiAgICB1aW50MTZUYWcgPSAnW29iamVjdCBVaW50MTZBcnJheV0nLFxuICAgIHVpbnQzMlRhZyA9ICdbb2JqZWN0IFVpbnQzMkFycmF5XSc7XG5cbi8qKiBVc2VkIHRvIG1hdGNoIGBSZWdFeHBgIGZsYWdzIGZyb20gdGhlaXIgY29lcmNlZCBzdHJpbmcgdmFsdWVzLiAqL1xudmFyIHJlRmxhZ3MgPSAvXFx3KiQvO1xuXG4vKiogTmF0aXZlIG1ldGhvZCByZWZlcmVuY2VzLiAqL1xudmFyIFVpbnQ4QXJyYXkgPSBnbG9iYWwuVWludDhBcnJheTtcblxuLyoqIFVzZWQgdG8gbG9va3VwIGEgdHlwZSBhcnJheSBjb25zdHJ1Y3RvcnMgYnkgYHRvU3RyaW5nVGFnYC4gKi9cbnZhciBjdG9yQnlUYWcgPSB7fTtcbmN0b3JCeVRhZ1tmbG9hdDMyVGFnXSA9IGdsb2JhbC5GbG9hdDMyQXJyYXk7XG5jdG9yQnlUYWdbZmxvYXQ2NFRhZ10gPSBnbG9iYWwuRmxvYXQ2NEFycmF5O1xuY3RvckJ5VGFnW2ludDhUYWddID0gZ2xvYmFsLkludDhBcnJheTtcbmN0b3JCeVRhZ1tpbnQxNlRhZ10gPSBnbG9iYWwuSW50MTZBcnJheTtcbmN0b3JCeVRhZ1tpbnQzMlRhZ10gPSBnbG9iYWwuSW50MzJBcnJheTtcbmN0b3JCeVRhZ1t1aW50OFRhZ10gPSBVaW50OEFycmF5O1xuY3RvckJ5VGFnW3VpbnQ4Q2xhbXBlZFRhZ10gPSBnbG9iYWwuVWludDhDbGFtcGVkQXJyYXk7XG5jdG9yQnlUYWdbdWludDE2VGFnXSA9IGdsb2JhbC5VaW50MTZBcnJheTtcbmN0b3JCeVRhZ1t1aW50MzJUYWddID0gZ2xvYmFsLlVpbnQzMkFycmF5O1xuXG4vKipcbiAqIEluaXRpYWxpemVzIGFuIG9iamVjdCBjbG9uZSBiYXNlZCBvbiBpdHMgYHRvU3RyaW5nVGFnYC5cbiAqXG4gKiAqKk5vdGU6KiogVGhpcyBmdW5jdGlvbiBvbmx5IHN1cHBvcnRzIGNsb25pbmcgdmFsdWVzIHdpdGggdGFncyBvZlxuICogYEJvb2xlYW5gLCBgRGF0ZWAsIGBFcnJvcmAsIGBOdW1iZXJgLCBgUmVnRXhwYCwgb3IgYFN0cmluZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7T2JqZWN0fSBvYmplY3QgVGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7c3RyaW5nfSB0YWcgVGhlIGB0b1N0cmluZ1RhZ2Agb2YgdGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7Ym9vbGVhbn0gW2lzRGVlcF0gU3BlY2lmeSBhIGRlZXAgY2xvbmUuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBSZXR1cm5zIHRoZSBpbml0aWFsaXplZCBjbG9uZS5cbiAqL1xuZnVuY3Rpb24gaW5pdENsb25lQnlUYWcob2JqZWN0LCB0YWcsIGlzRGVlcCkge1xuICB2YXIgQ3RvciA9IG9iamVjdC5jb25zdHJ1Y3RvcjtcbiAgc3dpdGNoICh0YWcpIHtcbiAgICBjYXNlIGFycmF5QnVmZmVyVGFnOlxuICAgICAgcmV0dXJuIGJ1ZmZlckNsb25lKG9iamVjdCk7XG5cbiAgICBjYXNlIGJvb2xUYWc6XG4gICAgY2FzZSBkYXRlVGFnOlxuICAgICAgcmV0dXJuIG5ldyBDdG9yKCtvYmplY3QpO1xuXG4gICAgY2FzZSBmbG9hdDMyVGFnOiBjYXNlIGZsb2F0NjRUYWc6XG4gICAgY2FzZSBpbnQ4VGFnOiBjYXNlIGludDE2VGFnOiBjYXNlIGludDMyVGFnOlxuICAgIGNhc2UgdWludDhUYWc6IGNhc2UgdWludDhDbGFtcGVkVGFnOiBjYXNlIHVpbnQxNlRhZzogY2FzZSB1aW50MzJUYWc6XG4gICAgICAvLyBTYWZhcmkgNSBtb2JpbGUgaW5jb3JyZWN0bHkgaGFzIGBPYmplY3RgIGFzIHRoZSBjb25zdHJ1Y3RvciBvZiB0eXBlZCBhcnJheXMuXG4gICAgICBpZiAoQ3RvciBpbnN0YW5jZW9mIEN0b3IpIHtcbiAgICAgICAgQ3RvciA9IGN0b3JCeVRhZ1t0YWddO1xuICAgICAgfVxuICAgICAgdmFyIGJ1ZmZlciA9IG9iamVjdC5idWZmZXI7XG4gICAgICByZXR1cm4gbmV3IEN0b3IoaXNEZWVwID8gYnVmZmVyQ2xvbmUoYnVmZmVyKSA6IGJ1ZmZlciwgb2JqZWN0LmJ5dGVPZmZzZXQsIG9iamVjdC5sZW5ndGgpO1xuXG4gICAgY2FzZSBudW1iZXJUYWc6XG4gICAgY2FzZSBzdHJpbmdUYWc6XG4gICAgICByZXR1cm4gbmV3IEN0b3Iob2JqZWN0KTtcblxuICAgIGNhc2UgcmVnZXhwVGFnOlxuICAgICAgdmFyIHJlc3VsdCA9IG5ldyBDdG9yKG9iamVjdC5zb3VyY2UsIHJlRmxhZ3MuZXhlYyhvYmplY3QpKTtcbiAgICAgIHJlc3VsdC5sYXN0SW5kZXggPSBvYmplY3QubGFzdEluZGV4O1xuICB9XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gaW5pdENsb25lQnlUYWc7XG4iXX0=","/**\n * Initializes an object clone.\n *\n * @private\n * @param {Object} object The object to clone.\n * @returns {Object} Returns the initialized clone.\n */\nfunction initCloneObject(object) {\n  var Ctor = object.constructor;\n  if (!(typeof Ctor == 'function' && Ctor instanceof Ctor)) {\n    Ctor = Object;\n  }\n  return new Ctor;\n}\n\nmodule.exports = initCloneObject;\n","var getLength = require('./getLength'),\n    isLength = require('./isLength');\n\n/**\n * Checks if `value` is array-like.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is array-like, else `false`.\n */\nfunction isArrayLike(value) {\n  return value != null && isLength(getLength(value));\n}\n\nmodule.exports = isArrayLike;\n","/**\n * Checks if `value` is a host object in IE < 9.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a host object, else `false`.\n */\nvar isHostObject = (function() {\n  try {\n    Object({ 'toString': 0 } + '');\n  } catch(e) {\n    return function() { return false; };\n  }\n  return function(value) {\n    // IE < 9 presents many host objects as `Object` objects that can coerce\n    // to strings despite having improperly defined `toString` methods.\n    return typeof value.toString != 'function' && typeof (value + '') == 'string';\n  };\n}());\n\nmodule.exports = isHostObject;\n","/** Used to detect unsigned integer values. */\nvar reIsUint = /^\\d+$/;\n\n/**\n * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)\n * of an array-like value.\n */\nvar MAX_SAFE_INTEGER = 9007199254740991;\n\n/**\n * Checks if `value` is a valid array-like index.\n *\n * @private\n * @param {*} value The value to check.\n * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.\n * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.\n */\nfunction isIndex(value, length) {\n  value = (typeof value == 'number' || reIsUint.test(value)) ? +value : -1;\n  length = length == null ? MAX_SAFE_INTEGER : length;\n  return value > -1 && value % 1 == 0 && value < length;\n}\n\nmodule.exports = isIndex;\n","var isArrayLike = require('./isArrayLike'),\n    isIndex = require('./isIndex'),\n    isObject = require('../lang/isObject');\n\n/**\n * Checks if the provided arguments are from an iteratee call.\n *\n * @private\n * @param {*} value The potential iteratee value argument.\n * @param {*} index The potential iteratee index or key argument.\n * @param {*} object The potential iteratee object argument.\n * @returns {boolean} Returns `true` if the arguments are from an iteratee call, else `false`.\n */\nfunction isIterateeCall(value, index, object) {\n  if (!isObject(object)) {\n    return false;\n  }\n  var type = typeof index;\n  if (type == 'number'\n      ? (isArrayLike(object) && isIndex(index, object.length))\n      : (type == 'string' && index in object)) {\n    var other = object[index];\n    return value === value ? (value === other) : (other !== other);\n  }\n  return false;\n}\n\nmodule.exports = isIterateeCall;\n","var isArray = require('../lang/isArray'),\n    toObject = require('./toObject');\n\n/** Used to match property names within property paths. */\nvar reIsDeepProp = /\\.|\\[(?:[^[\\]]*|([\"'])(?:(?!\\1)[^\\n\\\\]|\\\\.)*?\\1)\\]/,\n    reIsPlainProp = /^\\w*$/;\n\n/**\n * Checks if `value` is a property name and not a property path.\n *\n * @private\n * @param {*} value The value to check.\n * @param {Object} [object] The object to query keys on.\n * @returns {boolean} Returns `true` if `value` is a property name, else `false`.\n */\nfunction isKey(value, object) {\n  var type = typeof value;\n  if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') {\n    return true;\n  }\n  if (isArray(value)) {\n    return false;\n  }\n  var result = !reIsDeepProp.test(value);\n  return result || (object != null && value in toObject(object));\n}\n\nmodule.exports = isKey;\n","var LazyWrapper = require('./LazyWrapper'),\n    getData = require('./getData'),\n    getFuncName = require('./getFuncName'),\n    lodash = require('../chain/lodash');\n\n/**\n * Checks if `func` has a lazy counterpart.\n *\n * @private\n * @param {Function} func The function to check.\n * @returns {boolean} Returns `true` if `func` has a lazy counterpart, else `false`.\n */\nfunction isLaziable(func) {\n  var funcName = getFuncName(func),\n      other = lodash[funcName];\n\n  if (typeof other != 'function' || !(funcName in LazyWrapper.prototype)) {\n    return false;\n  }\n  if (func === other) {\n    return true;\n  }\n  var data = getData(other);\n  return !!data && func === data[0];\n}\n\nmodule.exports = isLaziable;\n","/**\n * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)\n * of an array-like value.\n */\nvar MAX_SAFE_INTEGER = 9007199254740991;\n\n/**\n * Checks if `value` is a valid array-like length.\n *\n * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.\n */\nfunction isLength(value) {\n  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;\n}\n\nmodule.exports = isLength;\n","/**\n * Checks if `value` is object-like.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\nmodule.exports = isObjectLike;\n","var isObject = require('../lang/isObject');\n\n/**\n * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` if suitable for strict\n *  equality comparisons, else `false`.\n */\nfunction isStrictComparable(value) {\n  return value === value && !isObject(value);\n}\n\nmodule.exports = isStrictComparable;\n","var arrayCopy = require('./arrayCopy'),\n    composeArgs = require('./composeArgs'),\n    composeArgsRight = require('./composeArgsRight'),\n    replaceHolders = require('./replaceHolders');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    CURRY_BOUND_FLAG = 4,\n    CURRY_FLAG = 8,\n    ARY_FLAG = 128,\n    REARG_FLAG = 256;\n\n/** Used as the internal argument placeholder. */\nvar PLACEHOLDER = '__lodash_placeholder__';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMin = Math.min;\n\n/**\n * Merges the function metadata of `source` into `data`.\n *\n * Merging metadata reduces the number of wrappers required to invoke a function.\n * This is possible because methods like `_.bind`, `_.curry`, and `_.partial`\n * may be applied regardless of execution order. Methods like `_.ary` and `_.rearg`\n * augment function arguments, making the order in which they are executed important,\n * preventing the merging of metadata. However, we make an exception for a safe\n * common case where curried functions have `_.ary` and or `_.rearg` applied.\n *\n * @private\n * @param {Array} data The destination metadata.\n * @param {Array} source The source metadata.\n * @returns {Array} Returns `data`.\n */\nfunction mergeData(data, source) {\n  var bitmask = data[1],\n      srcBitmask = source[1],\n      newBitmask = bitmask | srcBitmask,\n      isCommon = newBitmask < ARY_FLAG;\n\n  var isCombo =\n    (srcBitmask == ARY_FLAG && bitmask == CURRY_FLAG) ||\n    (srcBitmask == ARY_FLAG && bitmask == REARG_FLAG && data[7].length <= source[8]) ||\n    (srcBitmask == (ARY_FLAG | REARG_FLAG) && bitmask == CURRY_FLAG);\n\n  // Exit early if metadata can't be merged.\n  if (!(isCommon || isCombo)) {\n    return data;\n  }\n  // Use source `thisArg` if available.\n  if (srcBitmask & BIND_FLAG) {\n    data[2] = source[2];\n    // Set when currying a bound function.\n    newBitmask |= (bitmask & BIND_FLAG) ? 0 : CURRY_BOUND_FLAG;\n  }\n  // Compose partial arguments.\n  var value = source[3];\n  if (value) {\n    var partials = data[3];\n    data[3] = partials ? composeArgs(partials, value, source[4]) : arrayCopy(value);\n    data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : arrayCopy(source[4]);\n  }\n  // Compose partial right arguments.\n  value = source[5];\n  if (value) {\n    partials = data[5];\n    data[5] = partials ? composeArgsRight(partials, value, source[6]) : arrayCopy(value);\n    data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : arrayCopy(source[6]);\n  }\n  // Use source `argPos` if available.\n  value = source[7];\n  if (value) {\n    data[7] = arrayCopy(value);\n  }\n  // Use source `ary` if it's smaller.\n  if (srcBitmask & ARY_FLAG) {\n    data[8] = data[8] == null ? source[8] : nativeMin(data[8], source[8]);\n  }\n  // Use source `arity` if one is not provided.\n  if (data[9] == null) {\n    data[9] = source[9];\n  }\n  // Use source `func` and merge bitmasks.\n  data[0] = source[0];\n  data[1] = newBitmask;\n\n  return data;\n}\n\nmodule.exports = mergeData;\n","(function (global){\nvar getNative = require('./getNative');\n\n/** Native method references. */\nvar WeakMap = getNative(global, 'WeakMap');\n\n/** Used to store function metadata. */\nvar metaMap = WeakMap && new WeakMap;\n\nmodule.exports = metaMap;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL21ldGFNYXAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgZ2V0TmF0aXZlID0gcmVxdWlyZSgnLi9nZXROYXRpdmUnKTtcblxuLyoqIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcy4gKi9cbnZhciBXZWFrTWFwID0gZ2V0TmF0aXZlKGdsb2JhbCwgJ1dlYWtNYXAnKTtcblxuLyoqIFVzZWQgdG8gc3RvcmUgZnVuY3Rpb24gbWV0YWRhdGEuICovXG52YXIgbWV0YU1hcCA9IFdlYWtNYXAgJiYgbmV3IFdlYWtNYXA7XG5cbm1vZHVsZS5leHBvcnRzID0gbWV0YU1hcDtcbiJdfQ==","/** Used to lookup unminified function names. */\nvar realNames = {};\n\nmodule.exports = realNames;\n","var arrayCopy = require('./arrayCopy'),\n    isIndex = require('./isIndex');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMin = Math.min;\n\n/**\n * Reorder `array` according to the specified indexes where the element at\n * the first index is assigned as the first element, the element at\n * the second index is assigned as the second element, and so on.\n *\n * @private\n * @param {Array} array The array to reorder.\n * @param {Array} indexes The arranged array indexes.\n * @returns {Array} Returns `array`.\n */\nfunction reorder(array, indexes) {\n  var arrLength = array.length,\n      length = nativeMin(indexes.length, arrLength),\n      oldArray = arrayCopy(array);\n\n  while (length--) {\n    var index = indexes[length];\n    array[length] = isIndex(index, arrLength) ? oldArray[index] : undefined;\n  }\n  return array;\n}\n\nmodule.exports = reorder;\n","/** Used as the internal argument placeholder. */\nvar PLACEHOLDER = '__lodash_placeholder__';\n\n/**\n * Replaces all `placeholder` elements in `array` with an internal placeholder\n * and returns an array of their indexes.\n *\n * @private\n * @param {Array} array The array to modify.\n * @param {*} placeholder The placeholder to replace.\n * @returns {Array} Returns the new array of placeholder indexes.\n */\nfunction replaceHolders(array, placeholder) {\n  var index = -1,\n      length = array.length,\n      resIndex = -1,\n      result = [];\n\n  while (++index < length) {\n    if (array[index] === placeholder) {\n      array[index] = PLACEHOLDER;\n      result[++resIndex] = index;\n    }\n  }\n  return result;\n}\n\nmodule.exports = replaceHolders;\n","var baseSetData = require('./baseSetData'),\n    now = require('../date/now');\n\n/** Used to detect when a function becomes hot. */\nvar HOT_COUNT = 150,\n    HOT_SPAN = 16;\n\n/**\n * Sets metadata for `func`.\n *\n * **Note:** If this function becomes hot, i.e. is invoked a lot in a short\n * period of time, it will trip its breaker and transition to an identity function\n * to avoid garbage collection pauses in V8. See [V8 issue 2070](https://code.google.com/p/v8/issues/detail?id=2070)\n * for more details.\n *\n * @private\n * @param {Function} func The function to associate metadata with.\n * @param {*} data The metadata.\n * @returns {Function} Returns `func`.\n */\nvar setData = (function() {\n  var count = 0,\n      lastCalled = 0;\n\n  return function(key, value) {\n    var stamp = now(),\n        remaining = HOT_SPAN - (stamp - lastCalled);\n\n    lastCalled = stamp;\n    if (remaining > 0) {\n      if (++count >= HOT_COUNT) {\n        return key;\n      }\n    } else {\n      count = 0;\n    }\n    return baseSetData(key, value);\n  };\n}());\n\nmodule.exports = setData;\n","var isArguments = require('../lang/isArguments'),\n    isArray = require('../lang/isArray'),\n    isIndex = require('./isIndex'),\n    isLength = require('./isLength'),\n    isString = require('../lang/isString'),\n    keysIn = require('../object/keysIn');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * A fallback implementation of `Object.keys` which creates an array of the\n * own enumerable property names of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n */\nfunction shimKeys(object) {\n  var props = keysIn(object),\n      propsLength = props.length,\n      length = propsLength && object.length;\n\n  var allowIndexes = !!length && isLength(length) &&\n    (isArray(object) || isArguments(object) || isString(object));\n\n  var index = -1,\n      result = [];\n\n  while (++index < propsLength) {\n    var key = props[index];\n    if ((allowIndexes && isIndex(key, length)) || hasOwnProperty.call(object, key)) {\n      result.push(key);\n    }\n  }\n  return result;\n}\n\nmodule.exports = shimKeys;\n","var isObject = require('../lang/isObject'),\n    isString = require('../lang/isString'),\n    support = require('../support');\n\n/**\n * Converts `value` to an object if it's not one.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {Object} Returns the object.\n */\nfunction toObject(value) {\n  if (support.unindexedChars && isString(value)) {\n    var index = -1,\n        length = value.length,\n        result = Object(value);\n\n    while (++index < length) {\n      result[index] = value.charAt(index);\n    }\n    return result;\n  }\n  return isObject(value) ? value : Object(value);\n}\n\nmodule.exports = toObject;\n","var baseToString = require('./baseToString'),\n    isArray = require('../lang/isArray');\n\n/** Used to match property names within property paths. */\nvar rePropName = /[^.[\\]]+|\\[(?:(-?\\d+(?:\\.\\d+)?)|([\"'])((?:(?!\\2)[^\\n\\\\]|\\\\.)*?)\\2)\\]/g;\n\n/** Used to match backslashes in property paths. */\nvar reEscapeChar = /\\\\(\\\\)?/g;\n\n/**\n * Converts `value` to property path array if it's not one.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {Array} Returns the property path array.\n */\nfunction toPath(value) {\n  if (isArray(value)) {\n    return value;\n  }\n  var result = [];\n  baseToString(value).replace(rePropName, function(match, number, quote, string) {\n    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));\n  });\n  return result;\n}\n\nmodule.exports = toPath;\n","var LazyWrapper = require('./LazyWrapper'),\n    LodashWrapper = require('./LodashWrapper'),\n    arrayCopy = require('./arrayCopy');\n\n/**\n * Creates a clone of `wrapper`.\n *\n * @private\n * @param {Object} wrapper The wrapper to clone.\n * @returns {Object} Returns the cloned wrapper.\n */\nfunction wrapperClone(wrapper) {\n  return wrapper instanceof LazyWrapper\n    ? wrapper.clone()\n    : new LodashWrapper(wrapper.__wrapped__, wrapper.__chain__, arrayCopy(wrapper.__actions__));\n}\n\nmodule.exports = wrapperClone;\n","var baseClone = require('../internal/baseClone'),\n    bindCallback = require('../internal/bindCallback');\n\n/**\n * Creates a deep clone of `value`. If `customizer` is provided it's invoked\n * to produce the cloned values. If `customizer` returns `undefined` cloning\n * is handled by the method instead. The `customizer` is bound to `thisArg`\n * and invoked with up to three argument; (value [, index|key, object]).\n *\n * **Note:** This method is loosely based on the\n * [structured clone algorithm](http://www.w3.org/TR/html5/infrastructure.html#internal-structured-cloning-algorithm).\n * The enumerable properties of `arguments` objects and objects created by\n * constructors other than `Object` are cloned to plain `Object` objects. An\n * empty object is returned for uncloneable values such as functions, DOM nodes,\n * Maps, Sets, and WeakMaps.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to deep clone.\n * @param {Function} [customizer] The function to customize cloning values.\n * @param {*} [thisArg] The `this` binding of `customizer`.\n * @returns {*} Returns the deep cloned value.\n * @example\n *\n * var users = [\n *   { 'user': 'barney' },\n *   { 'user': 'fred' }\n * ];\n *\n * var deep = _.cloneDeep(users);\n * deep[0] === users[0];\n * // => false\n *\n * // using a customizer callback\n * var el = _.cloneDeep(document.body, function(value) {\n *   if (_.isElement(value)) {\n *     return value.cloneNode(true);\n *   }\n * });\n *\n * el === document.body\n * // => false\n * el.nodeName\n * // => BODY\n * el.childNodes.length;\n * // => 20\n */\nfunction cloneDeep(value, customizer, thisArg) {\n  return typeof customizer == 'function'\n    ? baseClone(value, true, bindCallback(customizer, thisArg, 3))\n    : baseClone(value, true);\n}\n\nmodule.exports = cloneDeep;\n","var isArrayLike = require('../internal/isArrayLike'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/** Native method references. */\nvar propertyIsEnumerable = objectProto.propertyIsEnumerable;\n\n/**\n * Checks if `value` is classified as an `arguments` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isArguments(function() { return arguments; }());\n * // => true\n *\n * _.isArguments([1, 2, 3]);\n * // => false\n */\nfunction isArguments(value) {\n  return isObjectLike(value) && isArrayLike(value) &&\n    hasOwnProperty.call(value, 'callee') && !propertyIsEnumerable.call(value, 'callee');\n}\n\nmodule.exports = isArguments;\n","var getNative = require('../internal/getNative'),\n    isLength = require('../internal/isLength'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar arrayTag = '[object Array]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeIsArray = getNative(Array, 'isArray');\n\n/**\n * Checks if `value` is classified as an `Array` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isArray([1, 2, 3]);\n * // => true\n *\n * _.isArray(function() { return arguments; }());\n * // => false\n */\nvar isArray = nativeIsArray || function(value) {\n  return isObjectLike(value) && isLength(value.length) && objToString.call(value) == arrayTag;\n};\n\nmodule.exports = isArray;\n","var isArguments = require('./isArguments'),\n    isArray = require('./isArray'),\n    isArrayLike = require('../internal/isArrayLike'),\n    isFunction = require('./isFunction'),\n    isObjectLike = require('../internal/isObjectLike'),\n    isString = require('./isString'),\n    keys = require('../object/keys');\n\n/**\n * Checks if `value` is empty. A value is considered empty unless it's an\n * `arguments` object, array, string, or jQuery-like collection with a length\n * greater than `0` or an object with own enumerable properties.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {Array|Object|string} value The value to inspect.\n * @returns {boolean} Returns `true` if `value` is empty, else `false`.\n * @example\n *\n * _.isEmpty(null);\n * // => true\n *\n * _.isEmpty(true);\n * // => true\n *\n * _.isEmpty(1);\n * // => true\n *\n * _.isEmpty([1, 2, 3]);\n * // => false\n *\n * _.isEmpty({ 'a': 1 });\n * // => false\n */\nfunction isEmpty(value) {\n  if (value == null) {\n    return true;\n  }\n  if (isArrayLike(value) && (isArray(value) || isString(value) || isArguments(value) ||\n      (isObjectLike(value) && isFunction(value.splice)))) {\n    return !value.length;\n  }\n  return !keys(value).length;\n}\n\nmodule.exports = isEmpty;\n","var isObject = require('./isObject');\n\n/** `Object#toString` result references. */\nvar funcTag = '[object Function]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a `Function` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isFunction(_);\n * // => true\n *\n * _.isFunction(/abc/);\n * // => false\n */\nfunction isFunction(value) {\n  // The use of `Object#toString` avoids issues with the `typeof` operator\n  // in older versions of Chrome and Safari which return 'function' for regexes\n  // and Safari 8 which returns 'object' for typed array constructors.\n  return isObject(value) && objToString.call(value) == funcTag;\n}\n\nmodule.exports = isFunction;\n","var isFunction = require('./isFunction'),\n    isHostObject = require('../internal/isHostObject'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** Used to detect host constructors (Safari > 5). */\nvar reIsHostCtor = /^\\[object .+?Constructor\\]$/;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to resolve the decompiled source of functions. */\nvar fnToString = Function.prototype.toString;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/** Used to detect if a method is native. */\nvar reIsNative = RegExp('^' +\n  fnToString.call(hasOwnProperty).replace(/[\\\\^$.*+?()[\\]{}|]/g, '\\\\$&')\n  .replace(/hasOwnProperty|(function).*?(?=\\\\\\()| for .+?(?=\\\\\\])/g, '$1.*?') + '$'\n);\n\n/**\n * Checks if `value` is a native function.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a native function, else `false`.\n * @example\n *\n * _.isNative(Array.prototype.push);\n * // => true\n *\n * _.isNative(_);\n * // => false\n */\nfunction isNative(value) {\n  if (value == null) {\n    return false;\n  }\n  if (isFunction(value)) {\n    return reIsNative.test(fnToString.call(value));\n  }\n  return isObjectLike(value) && (isHostObject(value) ? reIsNative : reIsHostCtor).test(value);\n}\n\nmodule.exports = isNative;\n","/**\n * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.\n * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(1);\n * // => false\n */\nfunction isObject(value) {\n  // Avoid a V8 JIT bug in Chrome 19-20.\n  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\nmodule.exports = isObject;\n","var baseForIn = require('../internal/baseForIn'),\n    isArguments = require('./isArguments'),\n    isHostObject = require('../internal/isHostObject'),\n    isObjectLike = require('../internal/isObjectLike'),\n    support = require('../support');\n\n/** `Object#toString` result references. */\nvar objectTag = '[object Object]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is a plain object, that is, an object created by the\n * `Object` constructor or one with a `[[Prototype]]` of `null`.\n *\n * **Note:** This method assumes objects created by the `Object` constructor\n * have no inherited enumerable properties.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n * }\n *\n * _.isPlainObject(new Foo);\n * // => false\n *\n * _.isPlainObject([1, 2, 3]);\n * // => false\n *\n * _.isPlainObject({ 'x': 0, 'y': 0 });\n * // => true\n *\n * _.isPlainObject(Object.create(null));\n * // => true\n */\nfunction isPlainObject(value) {\n  var Ctor;\n\n  // Exit early for non `Object` objects.\n  if (!(isObjectLike(value) && objToString.call(value) == objectTag && !isHostObject(value) && !isArguments(value)) ||\n      (!hasOwnProperty.call(value, 'constructor') && (Ctor = value.constructor, typeof Ctor == 'function' && !(Ctor instanceof Ctor)))) {\n    return false;\n  }\n  // IE < 9 iterates inherited properties before own properties. If the first\n  // iterated property is an object's own property then there are no inherited\n  // enumerable properties.\n  var result;\n  if (support.ownLast) {\n    baseForIn(value, function(subValue, key, object) {\n      result = hasOwnProperty.call(object, key);\n      return false;\n    });\n    return result !== false;\n  }\n  // In most environments an object's own properties are iterated before\n  // its inherited properties. If the last iterated property is an object's\n  // own property then there are no inherited enumerable properties.\n  baseForIn(value, function(subValue, key) {\n    result = key;\n  });\n  return result === undefined || hasOwnProperty.call(value, result);\n}\n\nmodule.exports = isPlainObject;\n","var isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar stringTag = '[object String]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a `String` primitive or object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isString('abc');\n * // => true\n *\n * _.isString(1);\n * // => false\n */\nfunction isString(value) {\n  return typeof value == 'string' || (isObjectLike(value) && objToString.call(value) == stringTag);\n}\n\nmodule.exports = isString;\n","var isLength = require('../internal/isLength'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    mapTag = '[object Map]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    setTag = '[object Set]',\n    stringTag = '[object String]',\n    weakMapTag = '[object WeakMap]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to identify `toStringTag` values of typed arrays. */\nvar typedArrayTags = {};\ntypedArrayTags[float32Tag] = typedArrayTags[float64Tag] =\ntypedArrayTags[int8Tag] = typedArrayTags[int16Tag] =\ntypedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =\ntypedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =\ntypedArrayTags[uint32Tag] = true;\ntypedArrayTags[argsTag] = typedArrayTags[arrayTag] =\ntypedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =\ntypedArrayTags[dateTag] = typedArrayTags[errorTag] =\ntypedArrayTags[funcTag] = typedArrayTags[mapTag] =\ntypedArrayTags[numberTag] = typedArrayTags[objectTag] =\ntypedArrayTags[regexpTag] = typedArrayTags[setTag] =\ntypedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a typed array.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isTypedArray(new Uint8Array);\n * // => true\n *\n * _.isTypedArray([]);\n * // => false\n */\nfunction isTypedArray(value) {\n  return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[objToString.call(value)];\n}\n\nmodule.exports = isTypedArray;\n","/**\n * Checks if `value` is `undefined`.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.\n * @example\n *\n * _.isUndefined(void 0);\n * // => true\n *\n * _.isUndefined(null);\n * // => false\n */\nfunction isUndefined(value) {\n  return value === undefined;\n}\n\nmodule.exports = isUndefined;\n","var getNative = require('../internal/getNative'),\n    isArrayLike = require('../internal/isArrayLike'),\n    isObject = require('../lang/isObject'),\n    shimKeys = require('../internal/shimKeys'),\n    support = require('../support');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeKeys = getNative(Object, 'keys');\n\n/**\n * Creates an array of the own enumerable property names of `object`.\n *\n * **Note:** Non-object values are coerced to objects. See the\n * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)\n * for more details.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.keys(new Foo);\n * // => ['a', 'b'] (iteration order is not guaranteed)\n *\n * _.keys('hi');\n * // => ['0', '1']\n */\nvar keys = !nativeKeys ? shimKeys : function(object) {\n  var Ctor = object == null ? undefined : object.constructor;\n  if ((typeof Ctor == 'function' && Ctor.prototype === object) ||\n      (typeof object == 'function' ? support.enumPrototypes : isArrayLike(object))) {\n    return shimKeys(object);\n  }\n  return isObject(object) ? nativeKeys(object) : [];\n};\n\nmodule.exports = keys;\n","var arrayEach = require('../internal/arrayEach'),\n    isArguments = require('../lang/isArguments'),\n    isArray = require('../lang/isArray'),\n    isFunction = require('../lang/isFunction'),\n    isIndex = require('../internal/isIndex'),\n    isLength = require('../internal/isLength'),\n    isObject = require('../lang/isObject'),\n    isString = require('../lang/isString'),\n    support = require('../support');\n\n/** `Object#toString` result references. */\nvar arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\n/** Used to fix the JScript `[[DontEnum]]` bug. */\nvar shadowProps = [\n  'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable',\n  'toLocaleString', 'toString', 'valueOf'\n];\n\n/** Used for native method references. */\nvar errorProto = Error.prototype,\n    objectProto = Object.prototype,\n    stringProto = String.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/** Used to avoid iterating over non-enumerable properties in IE < 9. */\nvar nonEnumProps = {};\nnonEnumProps[arrayTag] = nonEnumProps[dateTag] = nonEnumProps[numberTag] = { 'constructor': true, 'toLocaleString': true, 'toString': true, 'valueOf': true };\nnonEnumProps[boolTag] = nonEnumProps[stringTag] = { 'constructor': true, 'toString': true, 'valueOf': true };\nnonEnumProps[errorTag] = nonEnumProps[funcTag] = nonEnumProps[regexpTag] = { 'constructor': true, 'toString': true };\nnonEnumProps[objectTag] = { 'constructor': true };\n\narrayEach(shadowProps, function(key) {\n  for (var tag in nonEnumProps) {\n    if (hasOwnProperty.call(nonEnumProps, tag)) {\n      var props = nonEnumProps[tag];\n      props[key] = hasOwnProperty.call(props, key);\n    }\n  }\n});\n\n/**\n * Creates an array of the own and inherited enumerable property names of `object`.\n *\n * **Note:** Non-object values are coerced to objects.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.keysIn(new Foo);\n * // => ['a', 'b', 'c'] (iteration order is not guaranteed)\n */\nfunction keysIn(object) {\n  if (object == null) {\n    return [];\n  }\n  if (!isObject(object)) {\n    object = Object(object);\n  }\n  var length = object.length;\n\n  length = (length && isLength(length) &&\n    (isArray(object) || isArguments(object) || isString(object)) && length) || 0;\n\n  var Ctor = object.constructor,\n      index = -1,\n      proto = (isFunction(Ctor) && Ctor.prototype) || objectProto,\n      isProto = proto === object,\n      result = Array(length),\n      skipIndexes = length > 0,\n      skipErrorProps = support.enumErrorProps && (object === errorProto || object instanceof Error),\n      skipProto = support.enumPrototypes && isFunction(object);\n\n  while (++index < length) {\n    result[index] = (index + '');\n  }\n  // lodash skips the `constructor` property when it infers it's iterating\n  // over a `prototype` object because IE < 9 can't set the `[[Enumerable]]`\n  // attribute of an existing property and the `constructor` property of a\n  // prototype defaults to non-enumerable.\n  for (var key in object) {\n    if (!(skipProto && key == 'prototype') &&\n        !(skipErrorProps && (key == 'message' || key == 'name')) &&\n        !(skipIndexes && isIndex(key, length)) &&\n        !(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {\n      result.push(key);\n    }\n  }\n  if (support.nonEnumShadows && object !== objectProto) {\n    var tag = object === stringProto ? stringTag : (object === errorProto ? errorTag : objToString.call(object)),\n        nonEnums = nonEnumProps[tag] || nonEnumProps[objectTag];\n\n    if (tag == objectTag) {\n      proto = objectProto;\n    }\n    length = shadowProps.length;\n    while (length--) {\n      key = shadowProps[length];\n      var nonEnum = nonEnums[key];\n      if (!(isProto && nonEnum) &&\n          (nonEnum ? hasOwnProperty.call(object, key) : object[key] !== proto[key])) {\n        result.push(key);\n      }\n    }\n  }\n  return result;\n}\n\nmodule.exports = keysIn;\n","var keys = require('./keys'),\n    toObject = require('../internal/toObject');\n\n/**\n * Creates a two dimensional array of the key-value pairs for `object`,\n * e.g. `[[key1, value1], [key2, value2]]`.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the new array of key-value pairs.\n * @example\n *\n * _.pairs({ 'barney': 36, 'fred': 40 });\n * // => [['barney', 36], ['fred', 40]] (iteration order is not guaranteed)\n */\nfunction pairs(object) {\n  object = toObject(object);\n\n  var index = -1,\n      props = keys(object),\n      length = props.length,\n      result = Array(length);\n\n  while (++index < length) {\n    var key = props[index];\n    result[index] = [key, object[key]];\n  }\n  return result;\n}\n\nmodule.exports = pairs;\n","var baseValues = require('../internal/baseValues'),\n    keys = require('./keys');\n\n/**\n * Creates an array of the own enumerable property values of `object`.\n *\n * **Note:** Non-object values are coerced to objects.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property values.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.values(new Foo);\n * // => [1, 2] (iteration order is not guaranteed)\n *\n * _.values('hi');\n * // => ['h', 'i']\n */\nfunction values(object) {\n  return baseValues(object, keys(object));\n}\n\nmodule.exports = values;\n","/** Used for native method references. */\nvar arrayProto = Array.prototype,\n    errorProto = Error.prototype,\n    objectProto = Object.prototype;\n\n/** Native method references. */\nvar propertyIsEnumerable = objectProto.propertyIsEnumerable,\n    splice = arrayProto.splice;\n\n/**\n * An object environment feature flags.\n *\n * @static\n * @memberOf _\n * @type Object\n */\nvar support = {};\n\n(function(x) {\n  var Ctor = function() { this.x = x; },\n      object = { '0': x, 'length': x },\n      props = [];\n\n  Ctor.prototype = { 'valueOf': x, 'y': x };\n  for (var key in new Ctor) { props.push(key); }\n\n  /**\n   * Detect if `name` or `message` properties of `Error.prototype` are\n   * enumerable by default (IE < 9, Safari < 5.1).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.enumErrorProps = propertyIsEnumerable.call(errorProto, 'message') ||\n    propertyIsEnumerable.call(errorProto, 'name');\n\n  /**\n   * Detect if `prototype` properties are enumerable by default.\n   *\n   * Firefox < 3.6, Opera > 9.50 - Opera < 11.60, and Safari < 5.1\n   * (if the prototype or a property on the prototype has been set)\n   * incorrectly set the `[[Enumerable]]` value of a function's `prototype`\n   * property to `true`.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.enumPrototypes = propertyIsEnumerable.call(Ctor, 'prototype');\n\n  /**\n   * Detect if properties shadowing those on `Object.prototype` are non-enumerable.\n   *\n   * In IE < 9 an object's own properties, shadowing non-enumerable ones,\n   * are made non-enumerable as well (a.k.a the JScript `[[DontEnum]]` bug).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.nonEnumShadows = !/valueOf/.test(props);\n\n  /**\n   * Detect if own properties are iterated after inherited properties (IE < 9).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.ownLast = props[0] != 'x';\n\n  /**\n   * Detect if `Array#shift` and `Array#splice` augment array-like objects\n   * correctly.\n   *\n   * Firefox < 10, compatibility modes of IE 8, and IE < 9 have buggy Array\n   * `shift()` and `splice()` functions that fail to remove the last element,\n   * `value[0]`, of array-like objects even though the \"length\" property is\n   * set to `0`. The `shift()` method is buggy in compatibility modes of IE 8,\n   * while `splice()` is buggy regardless of mode in IE < 9.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.spliceObjects = (splice.call(object, 0, 1), !object[0]);\n\n  /**\n   * Detect lack of support for accessing string characters by index.\n   *\n   * IE < 8 can't access characters by index. IE 8 can only access characters\n   * by index on string literals, not string objects.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.unindexedChars = ('x'[0] + Object('x')[0]) != 'xx';\n}(1, 0));\n\nmodule.exports = support;\n","/**\n * This method returns the first argument provided to it.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @param {*} value Any value.\n * @returns {*} Returns `value`.\n * @example\n *\n * var object = { 'user': 'fred' };\n *\n * _.identity(object) === object;\n * // => true\n */\nfunction identity(value) {\n  return value;\n}\n\nmodule.exports = identity;\n","/**\n * A no-operation function that returns `undefined` regardless of the\n * arguments it receives.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @example\n *\n * var object = { 'user': 'fred' };\n *\n * _.noop(object) === undefined;\n * // => true\n */\nfunction noop() {\n  // No operation performed.\n}\n\nmodule.exports = noop;\n","var baseProperty = require('../internal/baseProperty'),\n    basePropertyDeep = require('../internal/basePropertyDeep'),\n    isKey = require('../internal/isKey');\n\n/**\n * Creates a function that returns the property value at `path` on a\n * given object.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @param {Array|string} path The path of the property to get.\n * @returns {Function} Returns the new function.\n * @example\n *\n * var objects = [\n *   { 'a': { 'b': { 'c': 2 } } },\n *   { 'a': { 'b': { 'c': 1 } } }\n * ];\n *\n * _.map(objects, _.property('a.b.c'));\n * // => [2, 1]\n *\n * _.pluck(_.sortBy(objects, _.property(['a', 'b', 'c'])), 'a.b.c');\n * // => [1, 2]\n */\nfunction property(path) {\n  return isKey(path) ? baseProperty(path) : basePropertyDeep(path);\n}\n\nmodule.exports = property;\n","(function (process){\n// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n\n}).call(this,require('_process'))\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/q/q.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n"]}","/**\n * Root reference for iframes.\n */\n\nvar root;\nif (typeof window !== 'undefined') { // Browser window\n  root = window;\n} else if (typeof self !== 'undefined') { // Web Worker\n  root = self;\n} else { // Other environments\n  console.warn(\"Using browser-only version of superagent in non-browser environment\");\n  root = this;\n}\n\nvar Emitter = require('emitter');\nvar requestBase = require('./request-base');\nvar isObject = require('./is-object');\n\n/**\n * Noop.\n */\n\nfunction noop(){};\n\n/**\n * Expose `request`.\n */\n\nvar request = module.exports = require('./request').bind(null, Request);\n\n/**\n * Determine XHR.\n */\n\nrequest.getXHR = function () {\n  if (root.XMLHttpRequest\n      && (!root.location || 'file:' != root.location.protocol\n          || !root.ActiveXObject)) {\n    return new XMLHttpRequest;\n  } else {\n    try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}\n  }\n  throw Error(\"Browser-only verison of superagent could not find XHR\");\n};\n\n/**\n * Removes leading and trailing whitespace, added to support IE.\n *\n * @param {String} s\n * @return {String}\n * @api private\n */\n\nvar trim = ''.trim\n  ? function(s) { return s.trim(); }\n  : function(s) { return s.replace(/(^\\s*|\\s*$)/g, ''); };\n\n/**\n * Serialize the given `obj`.\n *\n * @param {Object} obj\n * @return {String}\n * @api private\n */\n\nfunction serialize(obj) {\n  if (!isObject(obj)) return obj;\n  var pairs = [];\n  for (var key in obj) {\n    pushEncodedKeyValuePair(pairs, key, obj[key]);\n  }\n  return pairs.join('&');\n}\n\n/**\n * Helps 'serialize' with serializing arrays.\n * Mutates the pairs array.\n *\n * @param {Array} pairs\n * @param {String} key\n * @param {Mixed} val\n */\n\nfunction pushEncodedKeyValuePair(pairs, key, val) {\n  if (val != null) {\n    if (Array.isArray(val)) {\n      val.forEach(function(v) {\n        pushEncodedKeyValuePair(pairs, key, v);\n      });\n    } else if (isObject(val)) {\n      for(var subkey in val) {\n        pushEncodedKeyValuePair(pairs, key + '[' + subkey + ']', val[subkey]);\n      }\n    } else {\n      pairs.push(encodeURIComponent(key)\n        + '=' + encodeURIComponent(val));\n    }\n  } else if (val === null) {\n    pairs.push(encodeURIComponent(key));\n  }\n}\n\n/**\n * Expose serialization method.\n */\n\n request.serializeObject = serialize;\n\n /**\n  * Parse the given x-www-form-urlencoded `str`.\n  *\n  * @param {String} str\n  * @return {Object}\n  * @api private\n  */\n\nfunction parseString(str) {\n  var obj = {};\n  var pairs = str.split('&');\n  var pair;\n  var pos;\n\n  for (var i = 0, len = pairs.length; i < len; ++i) {\n    pair = pairs[i];\n    pos = pair.indexOf('=');\n    if (pos == -1) {\n      obj[decodeURIComponent(pair)] = '';\n    } else {\n      obj[decodeURIComponent(pair.slice(0, pos))] =\n        decodeURIComponent(pair.slice(pos + 1));\n    }\n  }\n\n  return obj;\n}\n\n/**\n * Expose parser.\n */\n\nrequest.parseString = parseString;\n\n/**\n * Default MIME type map.\n *\n *     superagent.types.xml = 'application/xml';\n *\n */\n\nrequest.types = {\n  html: 'text/html',\n  json: 'application/json',\n  xml: 'application/xml',\n  urlencoded: 'application/x-www-form-urlencoded',\n  'form': 'application/x-www-form-urlencoded',\n  'form-data': 'application/x-www-form-urlencoded'\n};\n\n/**\n * Default serialization map.\n *\n *     superagent.serialize['application/xml'] = function(obj){\n *       return 'generated xml here';\n *     };\n *\n */\n\n request.serialize = {\n   'application/x-www-form-urlencoded': serialize,\n   'application/json': JSON.stringify\n };\n\n /**\n  * Default parsers.\n  *\n  *     superagent.parse['application/xml'] = function(str){\n  *       return { object parsed from str };\n  *     };\n  *\n  */\n\nrequest.parse = {\n  'application/x-www-form-urlencoded': parseString,\n  'application/json': JSON.parse\n};\n\n/**\n * Parse the given header `str` into\n * an object containing the mapped fields.\n *\n * @param {String} str\n * @return {Object}\n * @api private\n */\n\nfunction parseHeader(str) {\n  var lines = str.split(/\\r?\\n/);\n  var fields = {};\n  var index;\n  var line;\n  var field;\n  var val;\n\n  lines.pop(); // trailing CRLF\n\n  for (var i = 0, len = lines.length; i < len; ++i) {\n    line = lines[i];\n    index = line.indexOf(':');\n    field = line.slice(0, index).toLowerCase();\n    val = trim(line.slice(index + 1));\n    fields[field] = val;\n  }\n\n  return fields;\n}\n\n/**\n * Check if `mime` is json or has +json structured syntax suffix.\n *\n * @param {String} mime\n * @return {Boolean}\n * @api private\n */\n\nfunction isJSON(mime) {\n  return /[\\/+]json\\b/.test(mime);\n}\n\n/**\n * Return the mime type for the given `str`.\n *\n * @param {String} str\n * @return {String}\n * @api private\n */\n\nfunction type(str){\n  return str.split(/ *; */).shift();\n};\n\n/**\n * Return header field parameters.\n *\n * @param {String} str\n * @return {Object}\n * @api private\n */\n\nfunction params(str){\n  return str.split(/ *; */).reduce(function(obj, str){\n    var parts = str.split(/ *= */),\n        key = parts.shift(),\n        val = parts.shift();\n\n    if (key && val) obj[key] = val;\n    return obj;\n  }, {});\n};\n\n/**\n * Initialize a new `Response` with the given `xhr`.\n *\n *  - set flags (.ok, .error, etc)\n *  - parse header\n *\n * Examples:\n *\n *  Aliasing `superagent` as `request` is nice:\n *\n *      request = superagent;\n *\n *  We can use the promise-like API, or pass callbacks:\n *\n *      request.get('/').end(function(res){});\n *      request.get('/', function(res){});\n *\n *  Sending data can be chained:\n *\n *      request\n *        .post('/user')\n *        .send({ name: 'tj' })\n *        .end(function(res){});\n *\n *  Or passed to `.send()`:\n *\n *      request\n *        .post('/user')\n *        .send({ name: 'tj' }, function(res){});\n *\n *  Or passed to `.post()`:\n *\n *      request\n *        .post('/user', { name: 'tj' })\n *        .end(function(res){});\n *\n * Or further reduced to a single call for simple cases:\n *\n *      request\n *        .post('/user', { name: 'tj' }, function(res){});\n *\n * @param {XMLHTTPRequest} xhr\n * @param {Object} options\n * @api private\n */\n\nfunction Response(req, options) {\n  options = options || {};\n  this.req = req;\n  this.xhr = this.req.xhr;\n  // responseText is accessible only if responseType is '' or 'text' and on older browsers\n  this.text = ((this.req.method !='HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text')) || typeof this.xhr.responseType === 'undefined')\n     ? this.xhr.responseText\n     : null;\n  this.statusText = this.req.xhr.statusText;\n  this._setStatusProperties(this.xhr.status);\n  this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());\n  // getAllResponseHeaders sometimes falsely returns \"\" for CORS requests, but\n  // getResponseHeader still works. so we get content-type even if getting\n  // other headers fails.\n  this.header['content-type'] = this.xhr.getResponseHeader('content-type');\n  this._setHeaderProperties(this.header);\n  this.body = this.req.method != 'HEAD'\n    ? this._parseBody(this.text ? this.text : this.xhr.response)\n    : null;\n}\n\n/**\n * Get case-insensitive `field` value.\n *\n * @param {String} field\n * @return {String}\n * @api public\n */\n\nResponse.prototype.get = function(field){\n  return this.header[field.toLowerCase()];\n};\n\n/**\n * Set header related properties:\n *\n *   - `.type` the content type without params\n *\n * A response of \"Content-Type: text/plain; charset=utf-8\"\n * will provide you with a `.type` of \"text/plain\".\n *\n * @param {Object} header\n * @api private\n */\n\nResponse.prototype._setHeaderProperties = function(header){\n  // content-type\n  var ct = this.header['content-type'] || '';\n  this.type = type(ct);\n\n  // params\n  var obj = params(ct);\n  for (var key in obj) this[key] = obj[key];\n};\n\n/**\n * Parse the given body `str`.\n *\n * Used for auto-parsing of bodies. Parsers\n * are defined on the `superagent.parse` object.\n *\n * @param {String} str\n * @return {Mixed}\n * @api private\n */\n\nResponse.prototype._parseBody = function(str){\n  var parse = request.parse[this.type];\n  if (!parse && isJSON(this.type)) {\n    parse = request.parse['application/json'];\n  }\n  return parse && str && (str.length || str instanceof Object)\n    ? parse(str)\n    : null;\n};\n\n/**\n * Set flags such as `.ok` based on `status`.\n *\n * For example a 2xx response will give you a `.ok` of __true__\n * whereas 5xx will be __false__ and `.error` will be __true__. The\n * `.clientError` and `.serverError` are also available to be more\n * specific, and `.statusType` is the class of error ranging from 1..5\n * sometimes useful for mapping respond colors etc.\n *\n * \"sugar\" properties are also defined for common cases. Currently providing:\n *\n *   - .noContent\n *   - .badRequest\n *   - .unauthorized\n *   - .notAcceptable\n *   - .notFound\n *\n * @param {Number} status\n * @api private\n */\n\nResponse.prototype._setStatusProperties = function(status){\n  // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request\n  if (status === 1223) {\n    status = 204;\n  }\n\n  var type = status / 100 | 0;\n\n  // status / class\n  this.status = this.statusCode = status;\n  this.statusType = type;\n\n  // basics\n  this.info = 1 == type;\n  this.ok = 2 == type;\n  this.clientError = 4 == type;\n  this.serverError = 5 == type;\n  this.error = (4 == type || 5 == type)\n    ? this.toError()\n    : false;\n\n  // sugar\n  this.accepted = 202 == status;\n  this.noContent = 204 == status;\n  this.badRequest = 400 == status;\n  this.unauthorized = 401 == status;\n  this.notAcceptable = 406 == status;\n  this.notFound = 404 == status;\n  this.forbidden = 403 == status;\n};\n\n/**\n * Return an `Error` representative of this response.\n *\n * @return {Error}\n * @api public\n */\n\nResponse.prototype.toError = function(){\n  var req = this.req;\n  var method = req.method;\n  var url = req.url;\n\n  var msg = 'cannot ' + method + ' ' + url + ' (' + this.status + ')';\n  var err = new Error(msg);\n  err.status = this.status;\n  err.method = method;\n  err.url = url;\n\n  return err;\n};\n\n/**\n * Expose `Response`.\n */\n\nrequest.Response = Response;\n\n/**\n * Initialize a new `Request` with the given `method` and `url`.\n *\n * @param {String} method\n * @param {String} url\n * @api public\n */\n\nfunction Request(method, url) {\n  var self = this;\n  this._query = this._query || [];\n  this.method = method;\n  this.url = url;\n  this.header = {}; // preserves header name case\n  this._header = {}; // coerces header names to lowercase\n  this.on('end', function(){\n    var err = null;\n    var res = null;\n\n    try {\n      res = new Response(self);\n    } catch(e) {\n      err = new Error('Parser is unable to parse the response');\n      err.parse = true;\n      err.original = e;\n      // issue #675: return the raw response if the response parsing fails\n      err.rawResponse = self.xhr && self.xhr.responseText ? self.xhr.responseText : null;\n      // issue #876: return the http status code if the response parsing fails\n      err.statusCode = self.xhr && self.xhr.status ? self.xhr.status : null;\n      return self.callback(err);\n    }\n\n    self.emit('response', res);\n\n    var new_err;\n    try {\n      if (res.status < 200 || res.status >= 300) {\n        new_err = new Error(res.statusText || 'Unsuccessful HTTP response');\n        new_err.original = err;\n        new_err.response = res;\n        new_err.status = res.status;\n      }\n    } catch(e) {\n      new_err = e; // #985 touching res may cause INVALID_STATE_ERR on old Android\n    }\n\n    // #1000 don't catch errors from the callback to avoid double calling it\n    if (new_err) {\n      self.callback(new_err, res);\n    } else {\n      self.callback(null, res);\n    }\n  });\n}\n\n/**\n * Mixin `Emitter` and `requestBase`.\n */\n\nEmitter(Request.prototype);\nfor (var key in requestBase) {\n  Request.prototype[key] = requestBase[key];\n}\n\n/**\n * Set Content-Type to `type`, mapping values from `request.types`.\n *\n * Examples:\n *\n *      superagent.types.xml = 'application/xml';\n *\n *      request.post('/')\n *        .type('xml')\n *        .send(xmlstring)\n *        .end(callback);\n *\n *      request.post('/')\n *        .type('application/xml')\n *        .send(xmlstring)\n *        .end(callback);\n *\n * @param {String} type\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.type = function(type){\n  this.set('Content-Type', request.types[type] || type);\n  return this;\n};\n\n/**\n * Set responseType to `val`. Presently valid responseTypes are 'blob' and\n * 'arraybuffer'.\n *\n * Examples:\n *\n *      req.get('/')\n *        .responseType('blob')\n *        .end(callback);\n *\n * @param {String} val\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.responseType = function(val){\n  this._responseType = val;\n  return this;\n};\n\n/**\n * Set Accept to `type`, mapping values from `request.types`.\n *\n * Examples:\n *\n *      superagent.types.json = 'application/json';\n *\n *      request.get('/agent')\n *        .accept('json')\n *        .end(callback);\n *\n *      request.get('/agent')\n *        .accept('application/json')\n *        .end(callback);\n *\n * @param {String} accept\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.accept = function(type){\n  this.set('Accept', request.types[type] || type);\n  return this;\n};\n\n/**\n * Set Authorization field value with `user` and `pass`.\n *\n * @param {String} user\n * @param {String} pass\n * @param {Object} options with 'type' property 'auto' or 'basic' (default 'basic')\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.auth = function(user, pass, options){\n  if (!options) {\n    options = {\n      type: 'basic'\n    }\n  }\n\n  switch (options.type) {\n    case 'basic':\n      var str = btoa(user + ':' + pass);\n      this.set('Authorization', 'Basic ' + str);\n    break;\n\n    case 'auto':\n      this.username = user;\n      this.password = pass;\n    break;\n  }\n  return this;\n};\n\n/**\n* Add query-string `val`.\n*\n* Examples:\n*\n*   request.get('/shoes')\n*     .query('size=10')\n*     .query({ color: 'blue' })\n*\n* @param {Object|String} val\n* @return {Request} for chaining\n* @api public\n*/\n\nRequest.prototype.query = function(val){\n  if ('string' != typeof val) val = serialize(val);\n  if (val) this._query.push(val);\n  return this;\n};\n\n/**\n * Queue the given `file` as an attachment to the specified `field`,\n * with optional `filename`.\n *\n * ``` js\n * request.post('/upload')\n *   .attach('content', new Blob(['<a id=\"a\"><b id=\"b\">hey!</b></a>'], { type: \"text/html\"}))\n *   .end(callback);\n * ```\n *\n * @param {String} field\n * @param {Blob|File} file\n * @param {String} filename\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.attach = function(field, file, filename){\n  this._getFormData().append(field, file, filename || file.name);\n  return this;\n};\n\nRequest.prototype._getFormData = function(){\n  if (!this._formData) {\n    this._formData = new root.FormData();\n  }\n  return this._formData;\n};\n\n/**\n * Invoke the callback with `err` and `res`\n * and handle arity check.\n *\n * @param {Error} err\n * @param {Response} res\n * @api private\n */\n\nRequest.prototype.callback = function(err, res){\n  var fn = this._callback;\n  this.clearTimeout();\n  fn(err, res);\n};\n\n/**\n * Invoke callback with x-domain error.\n *\n * @api private\n */\n\nRequest.prototype.crossDomainError = function(){\n  var err = new Error('Request has been terminated\\nPossible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.');\n  err.crossDomain = true;\n\n  err.status = this.status;\n  err.method = this.method;\n  err.url = this.url;\n\n  this.callback(err);\n};\n\n/**\n * Invoke callback with timeout error.\n *\n * @api private\n */\n\nRequest.prototype._timeoutError = function(){\n  var timeout = this._timeout;\n  var err = new Error('timeout of ' + timeout + 'ms exceeded');\n  err.timeout = timeout;\n  this.callback(err);\n};\n\n/**\n * Compose querystring to append to req.url\n *\n * @api private\n */\n\nRequest.prototype._appendQueryString = function(){\n  var query = this._query.join('&');\n  if (query) {\n    this.url += ~this.url.indexOf('?')\n      ? '&' + query\n      : '?' + query;\n  }\n};\n\n/**\n * Initiate request, invoking callback `fn(res)`\n * with an instanceof `Response`.\n *\n * @param {Function} fn\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.end = function(fn){\n  var self = this;\n  var xhr = this.xhr = request.getXHR();\n  var timeout = this._timeout;\n  var data = this._formData || this._data;\n\n  // store callback\n  this._callback = fn || noop;\n\n  // state change\n  xhr.onreadystatechange = function(){\n    if (4 != xhr.readyState) return;\n\n    // In IE9, reads to any property (e.g. status) off of an aborted XHR will\n    // result in the error \"Could not complete the operation due to error c00c023f\"\n    var status;\n    try { status = xhr.status } catch(e) { status = 0; }\n\n    if (0 == status) {\n      if (self.timedout) return self._timeoutError();\n      if (self._aborted) return;\n      return self.crossDomainError();\n    }\n    self.emit('end');\n  };\n\n  // progress\n  var handleProgress = function(e){\n    if (e.total > 0) {\n      e.percent = e.loaded / e.total * 100;\n    }\n    e.direction = 'download';\n    self.emit('progress', e);\n  };\n  if (this.hasListeners('progress')) {\n    xhr.onprogress = handleProgress;\n  }\n  try {\n    if (xhr.upload && this.hasListeners('progress')) {\n      xhr.upload.onprogress = handleProgress;\n    }\n  } catch(e) {\n    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.\n    // Reported here:\n    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context\n  }\n\n  // timeout\n  if (timeout && !this._timer) {\n    this._timer = setTimeout(function(){\n      self.timedout = true;\n      self.abort();\n    }, timeout);\n  }\n\n  // querystring\n  this._appendQueryString();\n\n  // initiate request\n  if (this.username && this.password) {\n    xhr.open(this.method, this.url, true, this.username, this.password);\n  } else {\n    xhr.open(this.method, this.url, true);\n  }\n\n  // CORS\n  if (this._withCredentials) xhr.withCredentials = true;\n\n  // body\n  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !this._isHost(data)) {\n    // serialize stuff\n    var contentType = this._header['content-type'];\n    var serialize = this._serializer || request.serialize[contentType ? contentType.split(';')[0] : ''];\n    if (!serialize && isJSON(contentType)) serialize = request.serialize['application/json'];\n    if (serialize) data = serialize(data);\n  }\n\n  // set header fields\n  for (var field in this.header) {\n    if (null == this.header[field]) continue;\n    xhr.setRequestHeader(field, this.header[field]);\n  }\n\n  if (this._responseType) {\n    xhr.responseType = this._responseType;\n  }\n\n  // send stuff\n  this.emit('request', this);\n\n  // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)\n  // We need null here if data is undefined\n  xhr.send(typeof data !== 'undefined' ? data : null);\n  return this;\n};\n\n\n/**\n * Expose `Request`.\n */\n\nrequest.Request = Request;\n\n/**\n * GET `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.get = function(url, data, fn){\n  var req = request('GET', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.query(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * HEAD `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.head = function(url, data, fn){\n  var req = request('HEAD', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * OPTIONS query to `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.options = function(url, data, fn){\n  var req = request('OPTIONS', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * DELETE `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nfunction del(url, fn){\n  var req = request('DELETE', url);\n  if (fn) req.end(fn);\n  return req;\n};\n\nrequest['del'] = del;\nrequest['delete'] = del;\n\n/**\n * PATCH `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed} [data]\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.patch = function(url, data, fn){\n  var req = request('PATCH', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * POST `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed} [data]\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.post = function(url, data, fn){\n  var req = request('POST', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * PUT `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.put = function(url, data, fn){\n  var req = request('PUT', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n","/**\n * Check if `obj` is an object.\n *\n * @param {Object} obj\n * @return {Boolean}\n * @api private\n */\n\nfunction isObject(obj) {\n  return null !== obj && 'object' === typeof obj;\n}\n\nmodule.exports = isObject;\n","/**\n * Module of mixed-in functions shared between node and client code\n */\nvar isObject = require('./is-object');\n\n/**\n * Clear previous timeout.\n *\n * @return {Request} for chaining\n * @api public\n */\n\nexports.clearTimeout = function _clearTimeout(){\n  this._timeout = 0;\n  clearTimeout(this._timer);\n  return this;\n};\n\n/**\n * Override default response body parser\n *\n * This function will be called to convert incoming data into request.body\n *\n * @param {Function}\n * @api public\n */\n\nexports.parse = function parse(fn){\n  this._parser = fn;\n  return this;\n};\n\n/**\n * Override default request body serializer\n *\n * This function will be called to convert data set via .send or .attach into payload to send\n *\n * @param {Function}\n * @api public\n */\n\nexports.serialize = function serialize(fn){\n  this._serializer = fn;\n  return this;\n};\n\n/**\n * Set timeout to `ms`.\n *\n * @param {Number} ms\n * @return {Request} for chaining\n * @api public\n */\n\nexports.timeout = function timeout(ms){\n  this._timeout = ms;\n  return this;\n};\n\n/**\n * Promise support\n *\n * @param {Function} resolve\n * @param {Function} reject\n * @return {Request}\n */\n\nexports.then = function then(resolve, reject) {\n  if (!this._fullfilledPromise) {\n    var self = this;\n    this._fullfilledPromise = new Promise(function(innerResolve, innerReject){\n      self.end(function(err, res){\n        if (err) innerReject(err); else innerResolve(res);\n      });\n    });\n  }\n  return this._fullfilledPromise.then(resolve, reject);\n}\n\n/**\n * Allow for extension\n */\n\nexports.use = function use(fn) {\n  fn(this);\n  return this;\n}\n\n\n/**\n * Get request header `field`.\n * Case-insensitive.\n *\n * @param {String} field\n * @return {String}\n * @api public\n */\n\nexports.get = function(field){\n  return this._header[field.toLowerCase()];\n};\n\n/**\n * Get case-insensitive header `field` value.\n * This is a deprecated internal API. Use `.get(field)` instead.\n *\n * (getHeader is no longer used internally by the superagent code base)\n *\n * @param {String} field\n * @return {String}\n * @api private\n * @deprecated\n */\n\nexports.getHeader = exports.get;\n\n/**\n * Set header `field` to `val`, or multiple fields with one object.\n * Case-insensitive.\n *\n * Examples:\n *\n *      req.get('/')\n *        .set('Accept', 'application/json')\n *        .set('X-API-Key', 'foobar')\n *        .end(callback);\n *\n *      req.get('/')\n *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })\n *        .end(callback);\n *\n * @param {String|Object} field\n * @param {String} val\n * @return {Request} for chaining\n * @api public\n */\n\nexports.set = function(field, val){\n  if (isObject(field)) {\n    for (var key in field) {\n      this.set(key, field[key]);\n    }\n    return this;\n  }\n  this._header[field.toLowerCase()] = val;\n  this.header[field] = val;\n  return this;\n};\n\n/**\n * Remove header `field`.\n * Case-insensitive.\n *\n * Example:\n *\n *      req.get('/')\n *        .unset('User-Agent')\n *        .end(callback);\n *\n * @param {String} field\n */\nexports.unset = function(field){\n  delete this._header[field.toLowerCase()];\n  delete this.header[field];\n  return this;\n};\n\n/**\n * Write the field `name` and `val` for \"multipart/form-data\"\n * request bodies.\n *\n * ``` js\n * request.post('/upload')\n *   .field('foo', 'bar')\n *   .end(callback);\n * ```\n *\n * @param {String} name\n * @param {String|Blob|File|Buffer|fs.ReadStream} val\n * @return {Request} for chaining\n * @api public\n */\nexports.field = function(name, val) {\n  this._getFormData().append(name, val);\n  return this;\n};\n\n/**\n * Abort the request, and clear potential timeout.\n *\n * @return {Request}\n * @api public\n */\nexports.abort = function(){\n  if (this._aborted) {\n    return this;\n  }\n  this._aborted = true;\n  this.xhr && this.xhr.abort(); // browser\n  this.req && this.req.abort(); // node\n  this.clearTimeout();\n  this.emit('abort');\n  return this;\n};\n\n/**\n * Enable transmission of cookies with x-domain requests.\n *\n * Note that for this to work the origin must not be\n * using \"Access-Control-Allow-Origin\" with a wildcard,\n * and also must set \"Access-Control-Allow-Credentials\"\n * to \"true\".\n *\n * @api public\n */\n\nexports.withCredentials = function(){\n  // This is browser-only functionality. Node side is no-op.\n  this._withCredentials = true;\n  return this;\n};\n\n/**\n * Set the max redirects to `n`. Does noting in browser XHR implementation.\n *\n * @param {Number} n\n * @return {Request} for chaining\n * @api public\n */\n\nexports.redirects = function(n){\n  this._maxRedirects = n;\n  return this;\n};\n\n/**\n * Convert to a plain javascript object (not JSON string) of scalar properties.\n * Note as this method is designed to return a useful non-this value,\n * it cannot be chained.\n *\n * @return {Object} describing method, url, and data of this request\n * @api public\n */\n\nexports.toJSON = function(){\n  return {\n    method: this.method,\n    url: this.url,\n    data: this._data,\n    headers: this._header\n  };\n};\n\n/**\n * Check if `obj` is a host object,\n * we don't want to serialize these :)\n *\n * TODO: future proof, move to compoent land\n *\n * @param {Object} obj\n * @return {Boolean}\n * @api private\n */\n\nexports._isHost = function _isHost(obj) {\n  var str = {}.toString.call(obj);\n\n  switch (str) {\n    case '[object File]':\n    case '[object Blob]':\n    case '[object FormData]':\n      return true;\n    default:\n      return false;\n  }\n}\n\n/**\n * Send `data` as the request body, defaulting the `.type()` to \"json\" when\n * an object is given.\n *\n * Examples:\n *\n *       // manual json\n *       request.post('/user')\n *         .type('json')\n *         .send('{\"name\":\"tj\"}')\n *         .end(callback)\n *\n *       // auto json\n *       request.post('/user')\n *         .send({ name: 'tj' })\n *         .end(callback)\n *\n *       // manual x-www-form-urlencoded\n *       request.post('/user')\n *         .type('form')\n *         .send('name=tj')\n *         .end(callback)\n *\n *       // auto x-www-form-urlencoded\n *       request.post('/user')\n *         .type('form')\n *         .send({ name: 'tj' })\n *         .end(callback)\n *\n *       // defaults to x-www-form-urlencoded\n *      request.post('/user')\n *        .send('name=tobi')\n *        .send('species=ferret')\n *        .end(callback)\n *\n * @param {String|Object} data\n * @return {Request} for chaining\n * @api public\n */\n\nexports.send = function(data){\n  var obj = isObject(data);\n  var type = this._header['content-type'];\n\n  // merge\n  if (obj && isObject(this._data)) {\n    for (var key in data) {\n      this._data[key] = data[key];\n    }\n  } else if ('string' == typeof data) {\n    // default to x-www-form-urlencoded\n    if (!type) this.type('form');\n    type = this._header['content-type'];\n    if ('application/x-www-form-urlencoded' == type) {\n      this._data = this._data\n        ? this._data + '&' + data\n        : data;\n    } else {\n      this._data = (this._data || '') + data;\n    }\n  } else {\n    this._data = data;\n  }\n\n  if (!obj || this._isHost(data)) return this;\n\n  // default to json\n  if (!type) this.type('json');\n  return this;\n};\n","// The node and browser modules expose versions of this with the\n// appropriate constructor function bound as first argument\n/**\n * Issue a request:\n *\n * Examples:\n *\n *    request('GET', '/users').end(callback)\n *    request('/users').end(callback)\n *    request('/users', callback)\n *\n * @param {String} method\n * @param {String|Function} url or callback\n * @return {Request}\n * @api public\n */\n\nfunction request(RequestConstructor, method, url) {\n  // callback\n  if ('function' == typeof url) {\n    return new RequestConstructor('GET', method).end(url);\n  }\n\n  // url first\n  if (2 == arguments.length) {\n    return new RequestConstructor('GET', method);\n  }\n\n  return new RequestConstructor(method, url);\n}\n\nmodule.exports = request;\n","\r\n/**\r\n * Expose `Emitter`.\r\n */\r\n\r\nif (typeof module !== 'undefined') {\r\n  module.exports = Emitter;\r\n}\r\n\r\n/**\r\n * Initialize a new `Emitter`.\r\n *\r\n * @api public\r\n */\r\n\r\nfunction Emitter(obj) {\r\n  if (obj) return mixin(obj);\r\n};\r\n\r\n/**\r\n * Mixin the emitter properties.\r\n *\r\n * @param {Object} obj\r\n * @return {Object}\r\n * @api private\r\n */\r\n\r\nfunction mixin(obj) {\r\n  for (var key in Emitter.prototype) {\r\n    obj[key] = Emitter.prototype[key];\r\n  }\r\n  return obj;\r\n}\r\n\r\n/**\r\n * Listen on the given `event` with `fn`.\r\n *\r\n * @param {String} event\r\n * @param {Function} fn\r\n * @return {Emitter}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.on =\r\nEmitter.prototype.addEventListener = function(event, fn){\r\n  this._callbacks = this._callbacks || {};\r\n  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])\r\n    .push(fn);\r\n  return this;\r\n};\r\n\r\n/**\r\n * Adds an `event` listener that will be invoked a single\r\n * time then automatically removed.\r\n *\r\n * @param {String} event\r\n * @param {Function} fn\r\n * @return {Emitter}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.once = function(event, fn){\r\n  function on() {\r\n    this.off(event, on);\r\n    fn.apply(this, arguments);\r\n  }\r\n\r\n  on.fn = fn;\r\n  this.on(event, on);\r\n  return this;\r\n};\r\n\r\n/**\r\n * Remove the given callback for `event` or all\r\n * registered callbacks.\r\n *\r\n * @param {String} event\r\n * @param {Function} fn\r\n * @return {Emitter}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.off =\r\nEmitter.prototype.removeListener =\r\nEmitter.prototype.removeAllListeners =\r\nEmitter.prototype.removeEventListener = function(event, fn){\r\n  this._callbacks = this._callbacks || {};\r\n\r\n  // all\r\n  if (0 == arguments.length) {\r\n    this._callbacks = {};\r\n    return this;\r\n  }\r\n\r\n  // specific event\r\n  var callbacks = this._callbacks['$' + event];\r\n  if (!callbacks) return this;\r\n\r\n  // remove all handlers\r\n  if (1 == arguments.length) {\r\n    delete this._callbacks['$' + event];\r\n    return this;\r\n  }\r\n\r\n  // remove specific handler\r\n  var cb;\r\n  for (var i = 0; i < callbacks.length; i++) {\r\n    cb = callbacks[i];\r\n    if (cb === fn || cb.fn === fn) {\r\n      callbacks.splice(i, 1);\r\n      break;\r\n    }\r\n  }\r\n  return this;\r\n};\r\n\r\n/**\r\n * Emit `event` with the given args.\r\n *\r\n * @param {String} event\r\n * @param {Mixed} ...\r\n * @return {Emitter}\r\n */\r\n\r\nEmitter.prototype.emit = function(event){\r\n  this._callbacks = this._callbacks || {};\r\n  var args = [].slice.call(arguments, 1)\r\n    , callbacks = this._callbacks['$' + event];\r\n\r\n  if (callbacks) {\r\n    callbacks = callbacks.slice(0);\r\n    for (var i = 0, len = callbacks.length; i < len; ++i) {\r\n      callbacks[i].apply(this, args);\r\n    }\r\n  }\r\n\r\n  return this;\r\n};\r\n\r\n/**\r\n * Return array of callbacks for `event`.\r\n *\r\n * @param {String} event\r\n * @return {Array}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.listeners = function(event){\r\n  this._callbacks = this._callbacks || {};\r\n  return this._callbacks['$' + event] || [];\r\n};\r\n\r\n/**\r\n * Check if this emitter has `event` handlers.\r\n *\r\n * @param {String} event\r\n * @return {Boolean}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.hasListeners = function(event){\r\n  return !! this.listeners(event).length;\r\n};\r\n"," /*global JSONEditor*/\n'use strict';\n\nwindow.SwaggerUi = Backbone.Router.extend({\n\n  dom_id: 'swagger_ui',\n\n  // Attributes\n  options: null,\n  api: null,\n  headerView: null,\n  mainView: null,\n\n  // SwaggerUi accepts all the same options as SwaggerApi\n  initialize: function(options) {\n    options = options || {};\n\n    if (options.defaultModelRendering !== 'model') {\n      options.defaultModelRendering = 'schema';\n    }\n\n    if (!options.highlightSizeThreshold) {\n      options.highlightSizeThreshold = 100000;\n    }\n\n    // Allow dom_id to be overridden\n    if (options.dom_id) {\n      this.dom_id = options.dom_id;\n      delete options.dom_id;\n    }\n\n    if (!options.supportedSubmitMethods){\n      options.supportedSubmitMethods = [\n        'get',\n        'put',\n        'post',\n        'delete',\n        'head',\n        'options',\n        'patch'\n      ];\n    }\n\n    if (typeof options.oauth2RedirectUrl === 'string') {\n      window.oAuthRedirectUrl = options.oauth2RedirectUrl;\n    }\n\n    // Create an empty div which contains the dom_id\n    if (! $('#' + this.dom_id).length){\n      $('body').append('<div id=\"' + this.dom_id + '\"></div>') ;\n    }\n\n    this.options = options;\n\n    // set marked options\n    marked.setOptions({gfm: true});\n\n    // Set the callbacks\n    var that = this;\n    this.options.success = function() { return that.render(); };\n    this.options.progress = function(d) { return that.showMessage(d); };\n    this.options.failure = function(d) { return that.onLoadFailure(d); };\n\n    // Create view to handle the header inputs\n    this.headerView = new SwaggerUi.Views.HeaderView({el: $('#header')});\n\n    // Event handler for when the baseUrl/apiKey is entered by user\n    this.headerView.on('update-swagger-ui', function(data) {\n      return that.updateSwaggerUi(data);\n    });\n\n    // JSon Editor custom theming\n     JSONEditor.defaults.iconlibs.swagger = JSONEditor.AbstractIconLib.extend({\n      mapping: {\n        collapse: 'collapse',\n        expand: 'expand'\n        },\n      icon_prefix: 'swagger-'\n      });\n\n  },\n\n  // Set an option after initializing\n  setOption: function(option, value) {\n    this.options[option] = value;\n  },\n\n  // Get the value of a previously set option\n  getOption: function(option) {\n    return this.options[option];\n  },\n\n  // Event handler for when url/key is received from user\n  updateSwaggerUi: function(data){\n    this.options.url = data.url;\n    this.load();\n  },\n\n  // Create an api and render\n  load: function(){\n    // Initialize the API object\n    if (this.mainView) {\n      this.mainView.clear();\n    }\n\n    if (this.authView) {\n      this.authView.remove();\n    }\n    var url = this.options.url;\n    if (url && url.indexOf('http') !== 0) {\n      url = this.buildUrl(window.location.href.toString(), url);\n    }\n    if(this.api) {\n      this.options.authorizations = this.api.clientAuthorizations.authz;\n    }\n    this.options.url = url;\n    this.headerView.update(url);\n\n    this.api = new SwaggerClient(this.options);\n  },\n\n  // collapse all sections\n  collapseAll: function(){\n    Docs.collapseEndpointListForResource('');\n  },\n\n  // list operations for all sections\n  listAll: function(){\n    Docs.collapseOperationsForResource('');\n  },\n\n  // expand operations for all sections\n  expandAll: function(){\n    Docs.expandOperationsForResource('');\n  },\n\n  // This is bound to success handler for SwaggerApi\n  //  so it gets called when SwaggerApi completes loading\n  render: function(){\n    var authsModel;\n    this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');\n    this.mainView = new SwaggerUi.Views.MainView({\n      model: this.api,\n      el: $('#' + this.dom_id),\n      swaggerOptions: this.options,\n      router: this\n    }).render();\n    if (!_.isEmpty(this.api.securityDefinitions)){\n      authsModel = _.map(this.api.securityDefinitions, function (auth, name) {\n        var result = {};\n        result[name] = auth;\n        return result;\n      });\n      this.authView = new SwaggerUi.Views.AuthButtonView({\n        data: SwaggerUi.utils.parseSecurityDefinitions(authsModel),\n        router: this\n      });\n      $('#auth_container').append(this.authView.render().el);\n    }\n    this.showMessage();\n    switch (this.options.docExpansion) {\n      case 'full':\n        this.expandAll(); break;\n      case 'list':\n        this.listAll(); break;\n      default:\n        break;\n    }\n    this.renderGFM();\n\n    if (this.options.onComplete){\n      this.options.onComplete(this.api, this);\n    }\n\n    setTimeout(Docs.shebang.bind(this), 100);\n  },\n\n  buildUrl: function(base, url){\n    if (url.indexOf('/') === 0) {\n      var parts = base.split('/');\n      base = parts[0] + '//' + parts[2];\n      return base + url;\n    } else {\n      var endOfPath = base.length;\n\n      if (base.indexOf('?') > -1){\n        endOfPath = Math.min(endOfPath, base.indexOf('?'));\n      }\n\n      if (base.indexOf('#') > -1){\n        endOfPath = Math.min(endOfPath, base.indexOf('#'));\n      }\n\n      base = base.substring(0, endOfPath);\n\n      if (base.indexOf('/', base.length - 1 ) !== -1){\n        return base + url;\n      }\n\n      return base + '/' + url;\n    }\n  },\n\n  // Shows message on topbar of the ui\n  showMessage: function(data){\n    if (data === undefined) {\n      data = '';\n    }\n    var $msgbar = $('#message-bar');\n    $msgbar.removeClass('message-fail');\n    $msgbar.addClass('message-success');\n    $msgbar.text(data);\n    if(window.SwaggerTranslator) {\n      window.SwaggerTranslator.translate($msgbar);\n    }\n  },\n\n  // shows message in red\n  onLoadFailure: function(data){\n    if (data === undefined) {\n      data = '';\n    }\n    $('#message-bar').removeClass('message-success');\n    $('#message-bar').addClass('message-fail');\n\n    var val = $('#message-bar').text(data);\n\n    if (this.options.onFailure) {\n      this.options.onFailure(data);\n    }\n\n    return val;\n  },\n\n  // Renders GFM for elements with 'markdown' class\n  renderGFM: function(){\n    $('.markdown').each(function(){\n      $(this).html(marked($(this).html()));\n    });\n\n    $('.propDesc', '.model-signature .description').each(function () {\n      $(this).html(marked($(this).html())).addClass('markdown');\n    });\n  }\n\n});\n\nwindow.SwaggerUi.Views = {};\nwindow.SwaggerUi.Models = {};\nwindow.SwaggerUi.Collections = {};\nwindow.SwaggerUi.partials = {};\nwindow.SwaggerUi.utils = {};\n\n// don't break backward compatibility with previous versions and warn users to upgrade their code\n(function(){\n  window.authorizations = {\n    add: function() {\n      warn('Using window.authorizations is deprecated. Please use SwaggerUi.api.clientAuthorizations.add().');\n\n      if (typeof window.swaggerUi === 'undefined') {\n        throw new TypeError('window.swaggerUi is not defined');\n      }\n\n      if (window.swaggerUi instanceof SwaggerUi) {\n        window.swaggerUi.api.clientAuthorizations.add.apply(window.swaggerUi.api.clientAuthorizations, arguments);\n      }\n    }\n  };\n\n  window.ApiKeyAuthorization = function() {\n    warn('window.ApiKeyAuthorization is deprecated. Please use SwaggerClient.ApiKeyAuthorization.');\n    SwaggerClient.ApiKeyAuthorization.apply(window, arguments);\n  };\n\n  window.PasswordAuthorization = function() {\n    warn('window.PasswordAuthorization is deprecated. Please use SwaggerClient.PasswordAuthorization.');\n    SwaggerClient.PasswordAuthorization.apply(window, arguments);\n  };\n\n  function warn(message) {\n    if ('console' in window && typeof window.console.warn === 'function') {\n      console.warn(message);\n    }\n  }\n})();\n\n\n// UMD\n(function (root, factory) {\n    if (typeof define === 'function' && define.amd) {\n        // AMD. Register as an anonymous module.\n        define(['b'], function (b) {\n            return (root.SwaggerUi = factory(b));\n        });\n    } else if (typeof exports === 'object') {\n        // Node. Does not work with strict CommonJS, but\n        // only CommonJS-like environments that support module.exports,\n        // like Node.\n        module.exports = factory(require('b'));\n    } else {\n        // Browser globals\n        root.SwaggerUi = factory(root.b);\n    }\n}(this, function () {\n    return SwaggerUi;\n}));\n","'use strict';\n\nwindow.SwaggerUi.utils = {\n    parseSecurityDefinitions: function (security, securityDefinitions) {\n        var auths = Object.assign({}, securityDefinitions);\n        var oauth2Arr = [];\n        var authsArr = [];\n        var scopes = [];\n        var utils = window.SwaggerUi.utils;\n\n        if (!Array.isArray(security)) { return null; }\n\n        security.forEach(function (item) {\n            var singleSecurity = {};\n            var singleOauth2Security = {};\n\n            for (var key in item) {\n                if (Array.isArray(item[key])) {\n                    if (!auths[key]) { continue; }\n                    auths[key] = auths[key] || {};\n                    if (auths[key].type === 'oauth2') {\n                        singleOauth2Security[key] = Object.assign({}, auths[key]);\n                        singleOauth2Security[key].scopes = Object.assign({}, auths[key].scopes);\n                        for (var i in singleOauth2Security[key].scopes) {\n                            if (item[key].indexOf(i) < 0) {\n                                delete singleOauth2Security[key].scopes[i];\n                            }\n                        }\n                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);\n                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);\n                    } else {\n                        singleSecurity[key] = Object.assign({}, auths[key]);\n                    }\n                } else {\n                    if (item[key].type === 'oauth2') {\n                        singleOauth2Security[key] = Object.assign({}, item[key]);\n                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);\n                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);\n                    } else {\n                        singleSecurity[key] = item[key];\n                    }\n                }\n            }\n\n            if (!_.isEmpty(singleSecurity)) {\n                authsArr.push(singleSecurity);\n            }\n\n            if (!_.isEmpty(singleOauth2Security)){\n                oauth2Arr.push(singleOauth2Security);\n            }\n        });\n\n        return {\n            auths : authsArr,\n            oauth2: oauth2Arr,\n            scopes: scopes\n        };\n    },\n\n    parseOauth2Scopes: function (data) {\n        var scopes = Object.assign({}, data);\n        var result = [];\n        var key;\n\n        for (key in scopes) {\n            result.push({scope: key, description: scopes[key]});\n        }\n\n        return result;\n    },\n\n    sanitize: function(html) {\n        // Strip the script tags from the html and inline evenhandlers\n        html = html.replace(/<script\\b[^<]*(?:(?!<\\/script>)<[^<]*)*<\\/script>/gi, '');\n        html = html.replace(/(on\\w+=\"[^\"]*\")*(on\\w+='[^']*')*(on\\w+=\\w*\\(\\w*\\))*/gi, '');\n\n        return html;\n    }\n};","'use strict';\n\nSwaggerUi.Models.ApiKeyAuthModel = Backbone.Model.extend({\n    defaults: {\n        'in': '',\n        name: '',\n        title: '',\n        value: ''\n    },\n\n    initialize: function () {\n        this.on('change', this.validate);\n    },\n\n    validate: function () {\n        var valid = !!this.get('value');\n\n        this.set('valid', valid);\n\n        return valid;\n    }\n});","'use strict';\n\nSwaggerUi.Views.ApiKeyAuthView = Backbone.View.extend({ // TODO: append this to global SwaggerUi\n\n    events: {\n        'change .input_apiKey_entry': 'apiKeyChange'\n    },\n\n    selectors: {\n        apikeyInput: '.input_apiKey_entry'\n    },\n\n    template: Handlebars.templates.apikey_auth,\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        this.router = this.options.router;\n    },\n\n    render: function (){\n        this.$el.html(this.template(this.model.toJSON()));\n\n        return this;\n    },\n\n    apiKeyChange: function (e) {\n        var val = $(e.target).val();\n        if (val) {\n            this.$(this.selectors.apikeyInput).removeClass('error');\n        }\n\n        this.model.set('value', val);\n    },\n\n    isValid: function () {\n        return this.model.validate();\n    },\n\n    highlightInvalid: function () {\n        if (!this.isValid()) {\n            this.$(this.selectors.apikeyInput).addClass('error');\n        }\n    }\n\n});","'use strict';\n\nSwaggerUi.Views.AuthButtonView = Backbone.View.extend({\n    events: {\n        'click .authorize__btn': 'authorizeBtnClick'\n    },\n\n    tpls: {\n        popup: Handlebars.templates.popup,\n        authBtn: Handlebars.templates.auth_button,\n        authBtnOperation: Handlebars.templates.auth_button_operation\n    },\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        this.options.data = this.options.data || {};\n        this.isOperation = this.options.isOperation;\n        this.model = this.model || {};\n        this.router = this.options.router;\n        this.auths = this.options.data.oauth2.concat(this.options.data.auths);\n    },\n\n    render: function () {\n        var tplName = this.isOperation ? 'authBtnOperation' : 'authBtn';\n\n        this.$authEl = this.renderAuths(this.auths);\n        this.$el.html(this.tpls[tplName](this.model));\n\n        return this;\n    },\n\n    authorizeBtnClick: function (e) {\n        var authsModel;\n\n        e.preventDefault();\n\n        authsModel = {\n            title: 'Available authorizations',\n            content: this.$authEl\n        };\n\n        // The content of the popup is removed and all events unbound after clicking the 'Cancel' button of the popup.\n        // We'll have to re-render the contents before creating a new popup view.\n        this.render();\n\n        this.popup = new SwaggerUi.Views.PopupView({model: authsModel});\n        this.popup.render();\n    },\n\n    renderAuths: function (auths) {\n        var $el = $('<div>');\n        var isLogout = false;\n\n        auths.forEach(function (auth) {\n            var authView = new SwaggerUi.Views.AuthView({data: auth, router: this.router});\n            var authEl = authView.render().el;\n            $el.append(authEl);\n            if (authView.isLogout) {\n                isLogout = true;\n            }\n        }, this);\n\n        this.model.isLogout = isLogout;\n\n        return $el;\n    }\n\n});\n","'use strict';\n\nSwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({\n    constructor: function() {\n        var args = Array.prototype.slice.call(arguments);\n\n        args[0] = this.parse(args[0]);\n\n        Backbone.Collection.apply(this, args);\n    },\n\n    add: function (model) {\n        var args = Array.prototype.slice.call(arguments);\n\n        if (Array.isArray(model)) {\n            args[0] = _.map(model, function(val) {\n                return this.handleOne(val);\n            }, this);\n        } else {\n            args[0] = this.handleOne(model);\n        }\n\n        Backbone.Collection.prototype.add.apply(this, args);\n    },\n\n    handleOne: function (model) {\n        var result = model;\n\n        if (! (model instanceof Backbone.Model) ) {\n            switch (model.type) {\n                case 'oauth2':\n                    result = new SwaggerUi.Models.Oauth2Model(model);\n                    break;\n                case 'basic':\n                    result = new SwaggerUi.Models.BasicAuthModel(model);\n                    break;\n                case 'apiKey':\n                    result = new SwaggerUi.Models.ApiKeyAuthModel(model);\n                    break;\n                default:\n                    result = new Backbone.Model(model);\n            }\n        }\n\n        return result;\n    },\n\n    isValid: function () {\n        var valid = true;\n\n        this.models.forEach(function(model) {\n            if (!model.validate()) {\n                valid = false;\n            }\n        });\n\n        return valid;\n    },\n\n    isAuthorized: function () {\n        return this.length === this.where({ isLogout: true }).length;\n    },\n\n    isPartiallyAuthorized: function () {\n        return this.where({ isLogout: true }).length > 0;\n    },\n\n    parse: function (data) {\n        var authz = {};\n\n        if(typeof window.swaggerUi !== 'undefined') {\n            authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz);\n        }\n\n        return _.map(data, function (auth, name) {\n            var isBasic = authz[name] && auth.type === 'basic' && authz[name].username && authz[name].password;\n\n            _.extend(auth, {\n                title: name\n            });\n\n            if (authz[name] || isBasic) {\n                _.extend(auth, {\n                    isLogout: true,\n                    value: isBasic ? undefined : authz[name].value,\n                    username: isBasic ? authz[name].username : undefined,\n                    password: isBasic ? authz[name].password : undefined,\n                    valid: true\n                });\n            }\n\n            return auth;\n        });\n    }\n});","'use strict';\n\nSwaggerUi.Views.AuthsCollectionView = Backbone.View.extend({\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        this.options.data = this.options.data || {};\n        this.router = this.options.router;\n\n        this.collection = new SwaggerUi.Collections.AuthsCollection(opts.data);\n\n        this.$innerEl = $('<div>');\n        this.authViews = [];\n    },\n\n    render: function () {\n        this.collection.each(function (auth) {\n            this.renderOneAuth(auth);\n        }, this);\n\n        this.$el.html(this.$innerEl.html() ? this.$innerEl : '');\n\n        return this;\n    },\n\n    renderOneAuth: function (authModel) {\n        var authViewEl, authView, authViewName;\n        var type = authModel.get('type');\n\n        if (type === 'apiKey') {\n            authViewName = 'ApiKeyAuthView';\n        } else if (type === 'basic' && this.$innerEl.find('.basic_auth_container').length === 0) {\n            authViewName = 'BasicAuthView';\n        } else if (type === 'oauth2') {\n            authViewName = 'Oauth2View';\n        }\n\n        if (authViewName) {\n            authView = new SwaggerUi.Views[authViewName]({model: authModel, router: this.router});\n            authViewEl = authView.render().el;\n            this.authViews.push(authView);\n        }\n\n        this.$innerEl.append(authViewEl);\n    },\n\n    highlightInvalid: function () {\n        this.authViews.forEach(function (view) {\n            view.highlightInvalid();\n        }, this);\n    }\n\n});\n","'use strict';\n\n/* global redirect_uri:true */\n/* global clientId */\n/* global scopeSeparator */\n/* global additionalQueryStringParams */\n/* global clientSecret */\n/* global onOAuthComplete */\n/* global realm */\n/*jshint unused:false*/\n\nSwaggerUi.Views.AuthView = Backbone.View.extend({\n    events: {\n        'click .auth_submit__button': 'authorizeClick',\n        'click .auth_logout__button': 'logoutClick'\n    },\n\n    tpls: {\n        main: Handlebars.templates.auth_view\n    },\n\n    selectors: {\n        innerEl: '.auth_inner',\n        authBtn: '.auth_submit__button'\n    },\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        opts.data = opts.data || {};\n        this.router = this.options.router;\n\n        this.authsCollectionView = new SwaggerUi.Views.AuthsCollectionView({data: opts.data});\n\n        this.$el.html(this.tpls.main({\n            isLogout: this.authsCollectionView.collection.isAuthorized(),\n            isAuthorized: this.authsCollectionView.collection.isPartiallyAuthorized()\n        }));\n        this.$innerEl = this.$(this.selectors.innerEl);\n        this.isLogout = this.authsCollectionView.collection.isPartiallyAuthorized();\n    },\n\n    render: function () {\n        this.$innerEl.html(this.authsCollectionView.render().el);\n\n        return this;\n    },\n\n    authorizeClick: function (e) {\n        e.preventDefault();\n        e.stopPropagation();\n\n        if (this.authsCollectionView.collection.isValid()) {\n            this.authorize();\n        } else {\n            this.authsCollectionView.highlightInvalid();\n        }\n    },\n\n    authorize: function () {\n        this.authsCollectionView.collection.forEach(function (auth) {\n            var keyAuth, basicAuth;\n            var type = auth.get('type');\n\n            if (type === 'apiKey') {\n                keyAuth = new SwaggerClient.ApiKeyAuthorization(\n                    auth.get('name'),\n                    auth.get('value'),\n                    auth.get('in')\n                );\n\n                this.router.api.clientAuthorizations.add(auth.get('title'), keyAuth);\n            } else if (type === 'basic') {\n                basicAuth = new SwaggerClient.PasswordAuthorization(auth.get('username'), auth.get('password'));\n                this.router.api.clientAuthorizations.add(auth.get('title'), basicAuth);\n            } else if (type === 'oauth2') {\n                this.handleOauth2Login(auth);\n            }\n        }, this);\n\n        this.router.load();\n    },\n\n    logoutClick: function (e) {\n        e.preventDefault();\n\n        this.authsCollectionView.collection.forEach(function (auth) {\n            window.swaggerUi.api.clientAuthorizations.remove(auth.get('title'));\n        });\n\n        this.router.load();\n    },\n\n    // taken from lib/swagger-oauth.js\n    handleOauth2Login: function (auth) {\n        var host = window.location;\n        var pathname = location.pathname.substring(0, location.pathname.lastIndexOf('/'));\n        var defaultRedirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';\n        var redirectUrl = window.oAuthRedirectUrl || defaultRedirectUrl;\n        var url = null;\n        var scopes = _.map(auth.get('scopes'), function (scope) {\n            if(scope.checked) {\n                return scope.scope;\n            }\n        });\n        var container = window.swaggerUiAuth || (window.swaggerUiAuth = {});\n        var state, dets, ep;\n        container.OAuthSchemeKey = auth.get('title');\n\n        window.enabledScopes = scopes;\n        var flow = auth.get('flow');\n\n        /**\n         * Returns the name of the access token parameter returned by the server.\n         *\n         * @param dets\n         *     The authorisation scheme configuration.\n         * @return the name of the access token parameter\n         */\n        function getTokenName(dets) {\n            return dets.vendorExtensions['x-tokenName'] || dets.tokenName;\n        }\n\n        if(auth.get('type') === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {\n            dets = auth.attributes;\n            url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');\n            container.tokenName = getTokenName(dets) || 'access_token';\n            container.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);\n            state = container.OAuthSchemeKey;\n        }\n        else if(auth.get('type') === 'oauth2' && flow && (flow === 'application')) {\n            dets = auth.attributes;\n            container.tokenName = getTokenName(dets) || 'access_token';\n            this.clientCredentialsFlow(scopes, dets, container.OAuthSchemeKey);\n            return;\n        }\n        else if(auth.get('type') === 'oauth2' && flow && (flow === 'password')) {\n            dets = auth.attributes;\n            container.tokenName = getTokenName(dets) || 'access_token';\n            this.passwordFlow(scopes, dets, container.OAuthSchemeKey);\n            return;\n        }\n        else if(auth.get('grantTypes')) {\n            // 1.2 support\n            var o = auth.get('grantTypes');\n            for(var t in o) {\n                if(o.hasOwnProperty(t) && t === 'implicit') {\n                    dets = o[t];\n                    ep = dets.loginEndpoint.url;\n                    url = dets.loginEndpoint.url + '?response_type=token';\n                    container.tokenName = getTokenName(dets);\n                }\n                else if (o.hasOwnProperty(t) && t === 'accessCode') {\n                    dets = o[t];\n                    ep = dets.tokenRequestEndpoint.url;\n                    url = dets.tokenRequestEndpoint.url + '?response_type=code';\n                    container.tokenName = getTokenName(dets);\n                }\n            }\n        }\n\n        redirect_uri = redirectUrl;\n\n        url += '&redirect_uri=' + encodeURIComponent(redirectUrl);\n        url += '&realm=' + encodeURIComponent(realm);\n        url += '&client_id=' + encodeURIComponent(clientId);\n        url += '&scope=' + encodeURIComponent(scopes.join(scopeSeparator));\n        url += '&state=' + encodeURIComponent(state);\n        for (var key in additionalQueryStringParams) {\n            url += '&' + key + '=' + encodeURIComponent(additionalQueryStringParams[key]);\n        }\n\n        window.open(url);\n    },\n\n    // taken from lib/swagger-oauth.js\n    clientCredentialsFlow: function (scopes, oauth, OAuthSchemeKey) {\n        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'client_credentials');\n    },\n\n    passwordFlow: function (scopes, oauth, OAuthSchemeKey) {\n        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'password', {\n            'username': oauth.username,\n            'password': oauth.password\n        });\n    },\n\n    accessTokenRequest: function (scopes, oauth, OAuthSchemeKey, grantType, params) {\n        params = $.extend({}, {\n            'scope': scopes.join(' '),\n            'grant_type': grantType\n        }, params);\n\n        var headers= {};\n\n        switch (oauth.clientAuthenticationType) {\n            case 'basic':\n                headers.Authorization = 'Basic ' + btoa(oauth.clientId + ':' + oauth.clientSecret);\n                break;\n            case 'request-body':\n                params.client_id = oauth.clientId;\n                params.client_secret = oauth.clientSecret;\n                break;\n        }\n\n        $.ajax({\n            url : oauth.tokenUrl,\n            type: 'POST',\n            data: params,\n            headers: headers,\n            success: function (data)\n            {\n                onOAuthComplete(data, OAuthSchemeKey);\n            },\n            error: function ()\n            {\n                onOAuthComplete('');\n            }\n        });\n    }\n});\n","'use strict';\n\nSwaggerUi.Models.BasicAuthModel = Backbone.Model.extend({\n    defaults: {\n        username: '',\n        password: '',\n        title: 'basic'\n    },\n\n    initialize: function () {\n        this.on('change', this.validate);\n    },\n\n    validate: function () {\n        var valid = !!this.get('password') && !!this.get('username');\n\n        this.set('valid', valid);\n\n        return valid;\n    }\n});","'use strict';\n\nSwaggerUi.Views.BasicAuthView = Backbone.View.extend({\n\n    initialize: function (opts) {\n        this.options = opts || {};\n        this.router = this.options.router;\n    },\n\n    events: {\n        'change .auth_input': 'inputChange'\n    },\n\n    selectors: {\n        usernameInput: '.basic_auth__username',\n        passwordInput: '.basic_auth__password'\n    },\n\n    cls: {\n        error: 'error'\n    },\n\n    template: Handlebars.templates.basic_auth,\n\n    render: function(){\n        $(this.el).html(this.template(this.model.toJSON()));\n\n        return this;\n    },\n\n    inputChange: function (e) {\n        var $el = $(e.target);\n        var val = $el.val();\n        var attr = $el.prop('name');\n\n        if (val) {\n            $el.removeClass(this.cls.error);\n        }\n\n        this.model.set(attr, val);\n    },\n\n    isValid: function () {\n        return this.model.validate();\n    },\n\n    highlightInvalid: function () {\n        if (!this.model.get('username')) {\n            this.$(this.selectors.usernameInput).addClass(this.cls.error);\n        }\n    }\n});\n","'use strict';\n\nSwaggerUi.Views.ContentTypeView = Backbone.View.extend({\n  initialize: function() {},\n\n  render: function(){\n  \tthis.model.contentTypeId = 'ct' + Math.random();\n    $(this.el).html(Handlebars.templates.content_type(this.model));\n    return this;\n  }\n});","'use strict';\n\nSwaggerUi.Views.HeaderView = Backbone.View.extend({\n  events: {\n    'click #show-pet-store-icon'    : 'showPetStore',\n    'click #explore'                : 'showCustom',\n    'submit #api_selector'          : 'showCustom',\n    'keyup #input_baseUrl'          : 'showCustomOnKeyup',\n    'keyup #input_apiKey'           : 'showCustomOnKeyup'\n  },\n\n  initialize: function(){},\n\n  showPetStore: function(){\n    this.trigger('update-swagger-ui', {\n      url:'http://petstore.swagger.io/v2/swagger.json'\n    });\n  },\n\n  showCustomOnKeyup: function(e){\n    if (e.keyCode === 13) {\n      this.showCustom();\n    }\n  },\n\n  showCustom: function(e){\n    if (e) {\n      e.preventDefault();\n    }\n\n    this.trigger('update-swagger-ui', {\n      url: $('#input_baseUrl').val()\n    });\n  },\n\n  update: function(url, apiKey, trigger){\n    if (trigger === undefined) {\n      trigger = false;\n    }\n\n    $('#input_baseUrl').val(url);\n\n    if (trigger) {\n      this.trigger('update-swagger-ui', {url:url});\n    }\n  }\n});\n","'use strict';\n\nSwaggerUi.Views.MainView = Backbone.View.extend({\n  apisSorter : {\n    alpha   : function(a,b){ return a.name.localeCompare(b.name); }\n  },\n  operationsSorters : {\n    alpha   : function(a,b){ return a.path.localeCompare(b.path); },\n    method  : function(a,b){ return a.method.localeCompare(b.method); }\n  },\n  initialize: function(opts){\n    var sorterOption, sorterFn, key, value;\n    opts = opts || {};\n\n    this.router = opts.router;\n\n    // Sort APIs\n    if (opts.swaggerOptions.apisSorter) {\n      sorterOption = opts.swaggerOptions.apisSorter;\n      if (_.isFunction(sorterOption)) {\n        sorterFn = sorterOption;\n      } else {\n        sorterFn = this.apisSorter[sorterOption];\n      }\n      if (_.isFunction(sorterFn)) {\n        this.model.apisArray.sort(sorterFn);\n      }\n    }\n    // Sort operations of each API\n    if (opts.swaggerOptions.operationsSorter) {\n      sorterOption = opts.swaggerOptions.operationsSorter;\n      if (_.isFunction(sorterOption)) {\n        sorterFn = sorterOption;\n      } else {\n        sorterFn = this.operationsSorters[sorterOption];\n      }\n      if (_.isFunction(sorterFn)) {\n        for (key in this.model.apisArray) {\n          this.model.apisArray[key].operationsArray.sort(sorterFn);\n        }\n      }\n    }\n\n    // set up the UI for input\n    this.model.auths = [];\n\n    for (key in this.model.securityDefinitions) {\n      value = this.model.securityDefinitions[key];\n\n      this.model.auths.push({\n        name: key,\n        type: value.type,\n        value: value\n      });\n    }\n\n    if ('validatorUrl' in opts.swaggerOptions) {\n      // Validator URL specified explicitly\n      this.model.validatorUrl = opts.swaggerOptions.validatorUrl;\n    } else if (this.model.url.indexOf('localhost') > 0 || this.model.url.indexOf('127.0.0.1') > 0) {\n      // Localhost override\n      this.model.validatorUrl = null;\n    } else {\n      this.model.validatorUrl = '//online.swagger.io/validator';\n    }\n\n    // JSonEditor requires type='object' to be present on defined types, we add it if it's missing\n    // is there any valid case were it should not be added ?\n    var def;\n    for(def in this.model.definitions){\n      if (!this.model.definitions[def].type){\n        this.model.definitions[def].type = 'object';\n      }\n    }\n\n  },\n\n  render: function () {\n    $(this.el).html(Handlebars.templates.main(this.model));\n    this.info = this.$('.info')[0];\n\n    if (this.info) {\n      this.info.addEventListener('click', this.onLinkClick, true);\n    }\n\n    this.model.securityDefinitions = this.model.securityDefinitions || {};\n\n    // Render each resource\n\n    var resources = {};\n    var counter = 0;\n    for (var i = 0; i < this.model.apisArray.length; i++) {\n      var resource = this.model.apisArray[i];\n      var id = resource.name;\n      while (typeof resources[id] !== 'undefined') {\n        id = id + '_' + counter;\n        counter += 1;\n      }\n      resource.id = sanitizeHtml(id);\n      resources[id] = resource;\n      this.addResource(resource, this.model.auths);\n    }\n\n    $('.propWrap').hover(function onHover(){\n      $('.optionsWrapper', $(this)).show();\n    }, function offhover(){\n      $('.optionsWrapper', $(this)).hide();\n    });\n    return this;\n  },\n\n  addResource: function(resource, auths){\n    // Render a resource and add it to resources li\n    resource.id = resource.id.replace(/[^a-zA-Z\\d]/g, function(str) { return str.charCodeAt(0); });\n\n    // Make all definitions available at the root of the resource so that they can\n    // be loaded by the JSonEditor\n    resource.definitions = this.model.definitions;\n\n    var resourceView = new SwaggerUi.Views.ResourceView({\n      model: resource,\n      router: this.router,\n      tagName: 'li',\n      id: 'resource_' + resource.id,\n      className: 'resource',\n      auths: auths,\n      swaggerOptions: this.options.swaggerOptions\n    });\n    $('#resources', this.el).append(resourceView.render().el);\n  },\n\n  clear: function(){\n    $(this.el).html('');\n  },\n\n  onLinkClick: function (e) {\n    var el = e.target;\n\n    if (el.tagName === 'A' && el.href && !el.target) {\n        e.preventDefault();\n        window.open(el.href, '_blank');\n    }\n  }\n});\n","'use strict';\n\nSwaggerUi.Models.Oauth2Model = Backbone.Model.extend({\n    defaults: {\n        scopes: {},\n        isPasswordFlow: false,\n        clientAuthenticationType: 'none'\n    },\n\n    initialize: function () {\n        if(this.attributes && this.attributes.scopes) {\n            var attributes = _.cloneDeep(this.attributes);\n            var i, scopes = [];\n            for(i in attributes.scopes) {\n                var scope = attributes.scopes[i];\n                if(typeof scope.description === 'string') {\n                    scopes[scope] = attributes.scopes[i];\n                    scopes.push(attributes.scopes[i]);\n                }\n            }\n            attributes.scopes = scopes;\n            this.attributes = attributes;\n        }\n\n        if (this.attributes && this.attributes.flow) {\n            var flow = this.attributes.flow;\n            this.set('isPasswordFlow', flow === 'password');\n            this.set('requireClientAuthentication', flow === 'application');\n            this.set('clientAuthentication', flow === 'password' || flow === 'application');\n        }\n        this.on('change', this.validate);\n    },\n\n    setScopes: function (name, val) {\n        var auth = _.extend({}, this.attributes);\n        var index = _.findIndex(auth.scopes, function(o) {\n            return o.scope === name;\n        });\n        auth.scopes[index].checked = val;\n\n        this.set(auth);\n        this.validate();\n    },\n\n    validate: function () {\n      var valid = false;\n      if (this.get('isPasswordFlow') &&\n          (!this.get('username'))) {\n          return false;\n      }\n\n      if (this.get('clientAuthenticationType') in ['basic', 'request-body'] &&\n          (!this.get('clientId'))) {\n          return false;\n      }\n\n      var scp = this.get('scopes');\n      var idx =  _.findIndex(scp, function (o) {\n         return o.checked === true;\n      });\n\n      if(scp.length > 0 && idx >= 0) {\n          valid = true;\n      }\n\n      if(scp.length === 0) {\n          valid = true;\n      }\n\n      this.set('valid', valid);\n\n      return valid;\n    }\n});\n","'use strict';\n\nSwaggerUi.Views.Oauth2View = Backbone.View.extend({\n    events: {\n        'change .oauth-scope': 'scopeChange',\n        'change .oauth-username': 'setUsername',\n        'change .oauth-password': 'setPassword',\n        'change .oauth-client-authentication-type': 'setClientAuthenticationType',\n        'change .oauth-client-id': 'setClientId',\n        'change .oauth-client-secret': 'setClientSecret'\n    },\n\n    template: Handlebars.templates.oauth2,\n\n    cls: {\n        error: 'error'\n    },\n\n    render: function () {\n        this.$el.html(this.template(this.model.toJSON()));\n\n        return this;\n    },\n\n    scopeChange: function (e) {\n        var val = $(e.target).prop('checked');\n        var scope = $(e.target).data('scope');\n\n        this.model.setScopes(scope, val);\n    },\n\n    setUsername: function (e) {\n        var val= $(e.target).val();\n        this.model.set('username', val);\n        if (val) {\n            $(e.target).removeClass(this.cls.error);\n        }\n    },\n\n    setPassword: function (e) {\n        this.model.set('password', $(e.target).val());\n    },\n\n    setClientAuthenticationType: function (e) {\n        var type = $(e.target).val();\n        var $el = this.$el;\n        this.model.set('clientAuthenticationType', type);\n\n        switch(type) {\n            case 'none':\n                $el.find('.oauth-client-authentication').hide();\n                break;\n            case 'basic':\n            case 'request-body':\n                $el.find('.oauth-client-id').removeClass(this.cls.error);\n                $el.find('.oauth-client-authentication').show();\n                break;\n        }\n    },\n\n    setClientId: function (e) {\n        var val = $(e.target).val();\n        this.model.set('clientId', val);\n        if (val) {\n            $(e.target).removeClass(this.cls.error);\n        }\n    },\n\n    setClientSecret: function (e) {\n        this.model.set('clientSecret', $(e.target).val());\n        $(e.target).removeClass('error');\n    },\n\n    highlightInvalid: function () {\n        if (!this.model.get('username')) {\n            this.$el.find('.oauth-username').addClass(this.cls.error);\n        }\n\n        if (!this.model.get('clientId')) {\n            this.$el.find('.oauth-client-id').addClass(this.cls.error);\n        }\n    }\n});","'use strict';\n\nSwaggerUi.Views.OperationView = Backbone.View.extend({\n  invocationUrl: null,\n\n  events: {\n    'submit .sandbox'         : 'submitOperation',\n    'click .submit'           : 'submitOperation',\n    'click .response_hider'   : 'hideResponse',\n    'click .toggleOperation'  : 'toggleOperationContent',\n    'mouseenter .api-ic'      : 'mouseEnter',\n    'dblclick .curl'          : 'selectText',\n    'change [name=responseContentType]' : 'showSnippet'\n  },\n\n  initialize: function(opts) {\n    opts = opts || {};\n    this.router = opts.router;\n    this.auths = opts.auths;\n    this.parentId = this.model.parentId;\n    this.nickname = this.model.nickname;\n    this.model.encodedParentId = encodeURIComponent(this.parentId);\n\n    if (opts.swaggerOptions) {\n      this.model.defaultRendering = opts.swaggerOptions.defaultModelRendering;\n\n      if (opts.swaggerOptions.showRequestHeaders) {\n        this.model.showRequestHeaders = true;\n      }\n\n      if (opts.swaggerOptions.showOperationIds) {\n        this.model.showOperationIds = true;\n      }\n    }\n    return this;\n  },\n\n  selectText: function(event) {\n    var doc = document,\n        text = event.target.firstChild,\n        range,\n        selection;\n    if (doc.body.createTextRange) {\n      range = document.body.createTextRange();\n      range.moveToElementText(text);\n      range.select();\n    } else if (window.getSelection) {\n      selection = window.getSelection();\n      range = document.createRange();\n      range.selectNodeContents(text);\n      selection.removeAllRanges();\n      selection.addRange(range);\n    }\n  },\n\n  mouseEnter: function(e) {\n    var elem = $(this.el).find('.content');\n    var x = e.pageX;\n    var y = e.pageY;\n    var scX = $(window).scrollLeft();\n    var scY = $(window).scrollTop();\n    var scMaxX = scX + $(window).width();\n    var scMaxY = scY + $(window).height();\n    var wd = elem.width();\n    var hgh = elem.height();\n\n    if (x + wd > scMaxX) {\n      x = scMaxX - wd;\n    }\n\n    if (x < scX) {\n      x = scX;\n    }\n\n    if (y + hgh > scMaxY) {\n      y = scMaxY - hgh;\n    }\n\n    if (y < scY) {\n      y = scY;\n    }\n\n    var pos = {};\n    pos.top = y;\n    pos.left = x;\n    elem.css(pos);\n  },\n\n  // Note: copied from CoffeeScript compiled file\n  // TODO: refactor\n  render: function() {\n    var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, l, len, len1, len2, len3, len4, m, modelAuths, n, o, p, param, q, ref, ref1, ref2, ref3, ref4, ref5, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value, produces, isXML, isJSON;\n    isMethodSubmissionSupported = jQuery.inArray(this.model.method, this.model.supportedSubmitMethods()) >= 0;\n    if (!isMethodSubmissionSupported) {\n      this.model.isReadOnly = true;\n    }\n    this.model.description = this.model.description || this.model.notes;\n    this.model.oauth = null;\n    modelAuths = this.model.authorizations || this.model.security;\n    if (modelAuths) {\n      if (Array.isArray(modelAuths)) {\n        for (l = 0, len = modelAuths.length; l < len; l++) {\n          auths = modelAuths[l];\n          for (key in auths) {\n            for (a in this.auths) {\n              auth = this.auths[a];\n              if (key === auth.name) {\n                if (auth.type === 'oauth2') {\n                  this.model.oauth = {};\n                  this.model.oauth.scopes = [];\n                  ref1 = auth.value.scopes;\n                  for (k in ref1) {\n                    v = ref1[k];\n                    scopeIndex = auths[key].indexOf(k);\n                    if (scopeIndex >= 0) {\n                      o = {\n                        scope: k,\n                        description: v\n                      };\n                      this.model.oauth.scopes.push(o);\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      } else {\n        for (k in modelAuths) {\n          v = modelAuths[k];\n          if (k === 'oauth2') {\n            if (this.model.oauth === null) {\n              this.model.oauth = {};\n            }\n            if (this.model.oauth.scopes === void 0) {\n              this.model.oauth.scopes = [];\n            }\n            for (m = 0, len1 = v.length; m < len1; m++) {\n              o = v[m];\n              this.model.oauth.scopes.push(o);\n            }\n          }\n        }\n      }\n    }\n    if (typeof this.model.responses !== 'undefined') {\n      this.model.responseMessages = [];\n      ref2 = this.model.responses;\n      for (code in ref2) {\n        value = ref2[code];\n        schema = null;\n        schemaObj = this.model.responses[code].schema;\n        if (schemaObj && schemaObj.$ref) {\n          schema = schemaObj.$ref;\n          if (schema.indexOf('#/definitions/') !== -1) {\n            schema = schema.replace(/^.*#\\/definitions\\//, '');\n          }\n        }\n        this.model.responseMessages.push({\n          code: code,\n          message: value.description,\n          responseModel: schema,\n          headers: value.headers,\n          schema: schemaObj\n        });\n      }\n    }\n    if (typeof this.model.responseMessages === 'undefined') {\n      this.model.responseMessages = [];\n    }\n    signatureModel = null;\n    produces = this.model.produces;\n    isXML = this.contains(produces, 'xml');\n    isJSON = isXML ? this.contains(produces, 'json') : true;\n\n    if (this.model.successResponse) {\n      successResponse = this.model.successResponse;\n      for (key in successResponse) {\n        value = successResponse[key];\n        this.model.successCode = key;\n        if (typeof value === 'object' && typeof value.createJSONSample === 'function') {\n          this.model.successDescription = value.description;\n          this.model.headers = this.parseResponseHeaders(value.headers);\n          signatureModel = {\n            sampleJSON: isJSON ? JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2) : false,\n            isParam: false,\n            sampleXML: isXML ? SwaggerUi.partials.signature.createXMLSample(value.name, value.definition, value.models) : false,\n            signature: SwaggerUi.partials.signature.getModelSignature(value.name, value.definition, value.models, value.modelPropertyMacro)\n          };\n        } else {\n          signatureModel = {\n            signature: SwaggerUi.partials.signature.getPrimitiveSignature(value)\n          };\n        }\n      }\n    } else if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {\n      signatureModel = {\n        sampleJSON: this.model.responseSampleJSON,\n        isParam: false,\n        signature: this.model.responseClassSignature\n      };\n    }\n    $(this.el).html(Handlebars.templates.operation(this.model));\n    if (signatureModel) {\n      signatureModel.defaultRendering = this.model.defaultRendering;\n      responseSignatureView = new SwaggerUi.Views.SignatureView({\n        model: signatureModel,\n        router: this.router,\n        tagName: 'div'\n      });\n      $('.model-signature', $(this.el)).append(responseSignatureView.render().el);\n    } else {\n      this.model.responseClassSignature = 'string';\n      $('.model-signature', $(this.el)).html(this.model.type);\n    }\n    contentTypeModel = {\n      isParam: false\n    };\n    contentTypeModel.consumes = this.model.consumes;\n    contentTypeModel.produces = this.model.produces;\n    ref3 = this.model.parameters;\n    for (n = 0, len2 = ref3.length; n < len2; n++) {\n      param = ref3[n];\n      type = param.type || param.dataType || '';\n      if (typeof type === 'undefined') {\n        schema = param.schema;\n        if (schema && schema.$ref) {\n          ref = schema.$ref;\n          if (ref.indexOf('#/definitions/') === 0) {\n            type = ref.substring('#/definitions/'.length);\n          } else {\n            type = ref;\n          }\n        }\n      }\n      if (type && type.toLowerCase() === 'file') {\n        if (!contentTypeModel.consumes) {\n          contentTypeModel.consumes = 'multipart/form-data';\n        }\n      }\n      param.type = type;\n    }\n    responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({\n      model: contentTypeModel,\n      router: this.router\n    });\n    $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);\n    ref4 = this.model.parameters;\n    for (p = 0, len3 = ref4.length; p < len3; p++) {\n      param = ref4[p];\n      this.addParameter(param, contentTypeModel.consumes);\n    }\n    ref5 = this.model.responseMessages;\n    for (q = 0, len4 = ref5.length; q < len4; q++) {\n      statusCode = ref5[q];\n      statusCode.isXML = isXML;\n      statusCode.isJSON = isJSON;\n      if (!_.isUndefined(statusCode.headers)) {\n        statusCode.headers = this.parseHeadersType(statusCode.headers);\n      }\n      this.addStatusCode(statusCode);\n    }\n\n    if (Array.isArray(this.model.security)) {\n      var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security, this.model.parent.securityDefinitions);\n\n      authsModel.isLogout = !_.isEmpty(this.model.clientAuthorizations.authz);\n      this.authView = new SwaggerUi.Views.AuthButtonView({\n        data: authsModel,\n        router: this.router,\n        isOperation: true,\n        model: {\n          scopes: authsModel.scopes\n        }\n      });\n      this.$('.authorize-wrapper').append(this.authView.render().el);\n    }\n\n    this.showSnippet();\n    return this;\n  },\n\n  parseHeadersType: function (headers) {\n    var map = {\n      'string': {\n        'date-time': 'dateTime',\n        'date'     : 'date'\n      }\n    };\n\n    _.forEach(headers, function (header) {\n      var value;\n      header = header || {};\n      value = map[header.type] && map[header.type][header.format];\n      if (!_.isUndefined(value)) {\n        header.type = value;\n      }\n    });\n\n    return headers;\n  },\n\n  contains: function (produces, type) {\n    return produces.filter(function (val) {\n      if (val.indexOf(type) > -1) {\n        return true;\n      }\n    }).length;\n  },\n\n  parseResponseHeaders: function (data) {\n    var HEADERS_SEPARATOR = '; ';\n    var headers = _.clone(data);\n\n    _.forEach(headers, function (header) {\n      var other = [];\n      _.forEach(header, function (value, key) {\n        var properties = ['type', 'description'];\n        if (properties.indexOf(key.toLowerCase()) === -1) {\n          other.push(key + ': ' + value);\n        }\n      });\n\n      other.join(HEADERS_SEPARATOR);\n      header.other = other;\n    });\n\n    return headers;\n  },\n\n  addParameter: function(param, consumes) {\n    // Render a parameter\n    param.consumes = consumes;\n    param.defaultRendering = this.model.defaultRendering;\n\n    // Copy this param JSON spec so that it will be available for JsonEditor\n    if(param.schema){\n      $.extend(true, param.schema, this.model.definitions[param.type]);\n      param.schema.definitions = this.model.definitions;\n      // This is required for JsonEditor to display the root properly\n      if(!param.schema.type){\n        param.schema.type = 'object';\n      }\n      // This is the title that will be used by JsonEditor for the root\n      // Since we already display the parameter's name in the Parameter column\n      // We set this to space, we can't set it to null or space otherwise JsonEditor\n      // will replace it with the text \"root\" which won't look good on screen\n      if(!param.schema.title){\n        param.schema.title = ' ';\n      }\n    }\n\n    var paramView = new SwaggerUi.Views.ParameterView({\n      model: param,\n      tagName: 'tr',\n      readOnly: this.model.isReadOnly,\n      swaggerOptions: this.options.swaggerOptions\n    });\n    $('.operation-params', $(this.el)).append(paramView.render().el);\n  },\n\n  addStatusCode: function(statusCode) {\n    // Render status codes\n    statusCode.defaultRendering = this.model.defaultRendering;\n    var statusCodeView = new SwaggerUi.Views.StatusCodeView({\n      model: statusCode,\n      tagName: 'tr',\n      router: this.router\n    });\n    $('.operation-status', $(this.el)).append(statusCodeView.render().el);\n  },\n\n  // Note: copied from CoffeeScript compiled file\n  // TODO: redactor\n  submitOperation: function(e) {\n    var error_free, form, isFileUpload, map, opts;\n    if (e !== null) {\n      e.preventDefault();\n    }\n    form = $('.sandbox', $(this.el));\n    error_free = true;\n    form.find('input.required').each(function() {\n      $(this).removeClass('error');\n      if (jQuery.trim($(this).val()) === '') {\n        $(this).addClass('error');\n        $(this).wiggle({\n          callback: (function(_this) {\n            return function() {\n              $(_this).focus();\n            };\n          })(this)\n        });\n        error_free = false;\n      }\n    });\n    form.find('textarea.required:visible').each(function() {\n      $(this).removeClass('error');\n      if (jQuery.trim($(this).val()) === '') {\n        $(this).addClass('error');\n        $(this).wiggle({\n          callback: (function(_this) {\n            return function() {\n              return $(_this).focus();\n            };\n          })(this)\n        });\n        error_free = false;\n      }\n    });\n    form.find('select.required').each(function() {\n      $(this).removeClass('error');\n      if (this.selectedIndex === -1) {\n        $(this).addClass('error');\n        $(this).wiggle({\n          callback: (function(_this) {\n            return function() {\n              $(_this).focus();\n            };\n          })(this)\n        });\n        error_free = false;\n      }\n    });\n    if (error_free) {\n      map = this.getInputMap(form);\n      isFileUpload = this.isFileUpload(form);\n      opts = {\n        parent: this\n      };\n      if (this.options.swaggerOptions) {\n        for(var key in this.options.swaggerOptions) {\n          opts[key] = this.options.swaggerOptions[key];\n        }\n      }\n\n      var pi;\n      for(pi = 0; pi < this.model.parameters.length; pi++){\n        var p = this.model.parameters[pi];\n        if( p.jsonEditor && p.jsonEditor.isEnabled()){\n          var json = p.jsonEditor.getValue();\n          map[p.name] = JSON.stringify(json);\n        }\n      }\n\n      opts.responseContentType = $('div select[name=responseContentType]', $(this.el)).val();\n      opts.requestContentType = $('div select[name=parameterContentType]', $(this.el)).val();\n      $('.response_throbber', $(this.el)).show();\n      if (isFileUpload) {\n        $('.request_url', $(this.el)).html('<pre></pre>');\n        $('.request_url pre', $(this.el)).text(this.invocationUrl);\n\n        opts.useJQuery = true;\n        map.parameterContentType = 'multipart/form-data';\n        this.map = map;\n        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);\n      } else {\n        this.map = map;\n        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);\n      }\n    }\n  },\n\n  getInputMap: function (form) {\n    var map, ref1, l, len, o, ref2, m, len1, val, ref3, n, len2;\n    map = {};\n    ref1 = form.find('input');\n    for (l = 0, len = ref1.length; l < len; l++) {\n      o = ref1[l];\n      if ((o.value !== null) && jQuery.trim(o.value).length > 0) {\n        map[o.name] = o.value;\n      }\n      if (o.type === 'file') {\n        map[o.name] = o.files[0];\n      }\n    }\n    ref2 = form.find('textarea');\n    for (m = 0, len1 = ref2.length; m < len1; m++) {\n      o = ref2[m];\n      val = this.getTextAreaValue(o);\n      if ((val !== null) && jQuery.trim(val).length > 0) {\n        map[o.name] = val;\n      }\n    }\n    ref3 = form.find('select');\n    for (n = 0, len2 = ref3.length; n < len2; n++) {\n      o = ref3[n];\n      val = this.getSelectedValue(o);\n      if ((val !== null) && jQuery.trim(val).length > 0) {\n        map[o.name] = val;\n      }\n    }\n    return map;\n  },\n\n  isFileUpload: function (form) {\n    var ref1, l, len, o;\n    var isFileUpload = false;\n    ref1 = form.find('input');\n    for (l = 0, len = ref1.length; l < len; l++) {\n      o = ref1[l];\n      if (o.type === 'file') {\n        isFileUpload = true;\n      }\n    }\n    return isFileUpload;\n  },\n\n  success: function(response, parent) {\n    parent.showCompleteStatus(response);\n  },\n\n  // wraps a jquery response as a shred response\n  wrap: function(data) {\n    var h, headerArray, headers, i, l, len, o;\n    headers = {};\n    headerArray = data.getAllResponseHeaders().split('\\r');\n    for (l = 0, len = headerArray.length; l < len; l++) {\n      i = headerArray[l];\n      h = i.match(/^([^:]*?):(.*)$/);\n      if (!h) {\n        h = [];\n      }\n      h.shift();\n      if (h[0] !== void 0 && h[1] !== void 0) {\n        headers[h[0].trim()] = h[1].trim();\n      }\n    }\n    o = {};\n    o.content = {};\n    o.content.data = data.responseText;\n    o.headers = headers;\n    o.request = {};\n    o.request.url = this.invocationUrl;\n    o.status = data.status;\n    return o;\n  },\n\n  getSelectedValue: function(select) {\n    if (!select.multiple) {\n      return select.value;\n    } else {\n      var options = [];\n      for (var l = 0, len = select.options.length; l < len; l++) {\n        var opt = select.options[l];\n        if (opt.selected) {\n          options.push(opt.value);\n        }\n      }\n      if (options.length > 0) {\n        return options;\n      } else {\n        return null;\n      }\n    }\n  },\n\n  // handler for hide response link\n  hideResponse: function(e) {\n    if (e) { e.preventDefault(); }\n    $('.response', $(this.el)).slideUp();\n    $('.response_hider', $(this.el)).fadeOut();\n  },\n\n  // Show response from server\n  showResponse: function(response) {\n    var prettyJson = JSON.stringify(response, null, '\\t').replace(/\\n/g, '<br>');\n    $('.response_body', $(this.el)).html(_.escape(prettyJson));\n  },\n\n  // Show error from server\n  showErrorStatus: function(data, parent) {\n    parent.showStatus(data);\n  },\n\n  // show the status codes\n  showCompleteStatus: function(data, parent){\n    parent.showStatus(data);\n  },\n\n  // Adapted from http://stackoverflow.com/a/2893259/454004\n  // Note: directly ported from CoffeeScript\n  // TODO: Cleanup CoffeeScript artifacts\n  formatXml: function(xml) {\n    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;\n    reg = /(>)(<)(\\/*)/g;\n    wsexp = /[ ]*(.*)[ ]+\\n/g;\n    contexp = /(<.+>)(.+\\n)/g;\n    xml = xml.replace(/\\r\\n/g, '\\n').replace(reg, '$1\\n$2$3').replace(wsexp, '$1\\n').replace(contexp, '$1\\n$2');\n    pad = 0;\n    formatted = '';\n    lines = xml.split('\\n');\n    indent = 0;\n    lastType = 'other';\n    transitions = {\n      'single->single': 0,\n      'single->closing': -1,\n      'single->opening': 0,\n      'single->other': 0,\n      'closing->single': 0,\n      'closing->closing': -1,\n      'closing->opening': 0,\n      'closing->other': 0,\n      'opening->single': 1,\n      'opening->closing': 0,\n      'opening->opening': 1,\n      'opening->other': 1,\n      'other->single': 0,\n      'other->closing': -1,\n      'other->opening': 0,\n      'other->other': 0\n    };\n    fn = function(ln) {\n      var fromTo, j, key, padding, type, types, value;\n      types = {\n        single: Boolean(ln.match(/<.+\\/>/)),\n        closing: Boolean(ln.match(/<\\/.+>/)),\n        opening: Boolean(ln.match(/<[^!?].*>/))\n      };\n      type = ((function() {\n        var results;\n        results = [];\n        for (key in types) {\n          value = types[key];\n          if (value) {\n            results.push(key);\n          }\n        }\n        return results;\n      })())[0];\n      type = type === void 0 ? 'other' : type;\n      fromTo = lastType + '->' + type;\n      lastType = type;\n      padding = '';\n      indent += transitions[fromTo];\n      padding = ((function() {\n        var m, ref1, results;\n        results = [];\n        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {\n          results.push('  ');\n        }\n        return results;\n      })()).join('');\n      if (fromTo === 'opening->closing') {\n        formatted = formatted.substr(0, formatted.length - 1) + ln + '\\n';\n      } else {\n        formatted += padding + ln + '\\n';\n      }\n    };\n    for (l = 0, len = lines.length; l < len; l++) {\n      ln = lines[l];\n      fn(ln);\n    }\n    return formatted;\n  },\n\n  // puts the response data in UI\n  showStatus: function(response) {\n    var url, content;\n    if (response.content === undefined) {\n      content = response.data;\n      url = response.url;\n    } else {\n      content = response.content.data;\n      url = response.request.url;\n    }\n    var headers = response.headers;\n    if(typeof content === 'string') {\n      content = jQuery.trim(content);\n    }\n\n    // if server is nice, and sends content-type back, we can use it\n    var contentType = null;\n    if (headers) {\n      contentType = headers['Content-Type'] || headers['content-type'];\n      if (contentType) {\n        contentType = contentType.split(';')[0].trim();\n      }\n    }\n\n    $('.response_body', $(this.el)).removeClass('json');\n    $('.response_body', $(this.el)).removeClass('xml');\n\n    var supportsAudioPlayback = function(contentType){\n      var audioElement = document.createElement('audio');\n      return !!(audioElement.canPlayType && audioElement.canPlayType(contentType).replace(/no/, ''));\n    };\n\n    var pre;\n    var code;\n    var skipHighlight = false;\n    if (!content) {\n      code = $('<code />').text('no content');\n      pre = $('<pre class=\"json\" />').append(code);\n\n      // JSON\n    } else if (\n        contentType === 'application/octet-stream' ||\n        headers['Content-Disposition'] && (/attachment/).test(headers['Content-Disposition']) ||\n        headers['content-disposition'] && (/attachment/).test(headers['content-disposition']) ||\n        headers['Content-Description'] && (/File Transfer/).test(headers['Content-Description']) ||\n        headers['content-description'] && (/File Transfer/).test(headers['content-description'])) {\n\n      if ('Blob' in window) {\n        var type = contentType || 'text/html';\n        var a = document.createElement('a');\n        var href;\n\n        if({}.toString.apply(content) === '[object Blob]') {\n          href = window.URL.createObjectURL(content);\n        }\n        else {\n          var binaryData = [];\n          binaryData.push(content);\n          href = window.URL.createObjectURL(new Blob(binaryData, {type: type}));\n        }\n        var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);\n        var download = [type, fileName, href].join(':');\n\n        // Use filename from response header\n        var disposition = headers['content-disposition'] || headers['Content-Disposition'];\n        if(typeof disposition !== 'undefined') {\n          var responseFilename = /filename=([^;]*);?/.exec(disposition);\n          if(responseFilename !== null && responseFilename.length > 1) {\n            download = responseFilename[1];\n            fileName = download;\n          }\n        }\n\n        a.setAttribute('href', href);\n        a.setAttribute('download', download);\n        a.innerText = 'Download ' + fileName;\n\n        pre = $('<div/>').append(a);\n        skipHighlight = true;\n      } else {\n        pre = $('<pre class=\"json\" />').append('Download headers detected but your browser does not support downloading binary via XHR (Blob).');\n      }\n    } else if (contentType === 'application/json' || /\\+json$/.test(contentType)) {\n      var json = null;\n      try {\n        json = JSON.stringify(JSON.parse(content), null, '  ');\n      } catch (_error) {\n        json = 'can\\'t parse JSON.  Raw result:\\n\\n' + content;\n      }\n      code = $('<code />').text(json);\n      pre = $('<pre class=\"json\" />').append(code);\n\n      // XML\n    } else if (contentType === 'application/xml' || /\\+xml$/.test(contentType)) {\n      code = $('<code />').text(this.formatXml(content));\n      pre = $('<pre class=\"xml\" />').append(code);\n\n      // HTML\n    } else if (contentType === 'text/html') {\n      code = $('<code />').html(_.escape(content));\n      pre = $('<pre class=\"xml\" />').append(code);\n\n      // Plain Text\n    } else if (/text\\/plain/.test(contentType)) {\n      code = $('<code />').text(content);\n      pre = $('<pre class=\"plain\" />').append(code);\n\n      // Image\n    } else if (/^image\\//.test(contentType)) {\n      var urlCreator = window.URL || window.webkitURL;\n      var imageUrl = urlCreator.createObjectURL(content);\n\n      pre = $('<img>').attr( 'src', imageUrl);\n      // Audio\n    } else if (/^audio\\//.test(contentType) && supportsAudioPlayback(contentType)) {\n      pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));\n    } else if(headers.location || headers.Location) {\n      // Location header based redirect download\n      window.location = response.url;\n\n      // Anything else (CORS)\n    } else {\n      code = $('<code />').text(content);\n      pre = $('<pre class=\"json\" />').append(code);\n    }\n    var response_body = pre;\n    $('.request_url', $(this.el)).html('<pre></pre>');\n    $('.request_url pre', $(this.el)).text(url);\n    $('.response_code', $(this.el)).html('<pre>' + response.status + '</pre>');\n    $('.response_body', $(this.el)).html(response_body);\n    $('.response_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(response.headers, null, '  ')).replace(/\\n/g, '<br>') + '</pre>');\n    $('.response', $(this.el)).slideDown();\n    $('.response_hider', $(this.el)).show();\n    $('.response_throbber', $(this.el)).hide();\n\n\n    // adds curl output\n    var curlCommand = this.model.asCurl(this.map, {responseContentType: contentType});\n    curlCommand = curlCommand.replace('!', '&#33;');\n    $( 'div.curl', $(this.el)).html('<pre>' + _.escape(curlCommand) + '</pre>');\n\n    // only highlight the response if response is less than threshold, default state is highlight response\n    var opts = this.options.swaggerOptions;\n\n    if (opts.showRequestHeaders) {\n      var form = $('.sandbox', $(this.el)),\n          map = this.getInputMap(form),\n          requestHeaders = this.model.getHeaderParams(map);\n      delete requestHeaders['Content-Type'];\n      $('.request_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(requestHeaders, null, '  ')).replace(/\\n/g, '<br>') + '</pre>');\n    }\n\n    // Call user-defined hook\n    if (opts.responseHooks && opts.responseHooks[this.nickname]) {\n      opts.responseHooks[this.nickname](response, this);\n    }\n\n    var response_body_el = $('.response_body', $(this.el))[0];\n    // only highlight the response if response is less than threshold, default state is highlight response\n    if (opts.highlightSizeThreshold && typeof response.data !== 'undefined' && response.data.length > opts.highlightSizeThreshold || skipHighlight) {\n      return response_body_el;\n    } else {\n      return hljs.highlightBlock(response_body_el);\n    }\n  },\n\n  toggleOperationContent: function (event) {\n    var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content'));\n    if (elem.is(':visible')){\n      $.bbq.pushState('#/', 2);\n      event.preventDefault();\n      Docs.collapseOperation(elem);\n    } else {\n      Docs.expandOperation(elem);\n    }\n  },\n\n  getTextAreaValue: function(textArea) {\n    var param, parsed, result, i;\n    if (textArea.value === null || jQuery.trim(textArea.value).length === 0) {\n      return null;\n    }\n    param = this.getParamByName(textArea.name);\n    if (param && param.type && param.type.toLowerCase() === 'array') {\n      parsed = textArea.value.split('\\n');\n      result = [];\n      for (i = 0; i < parsed.length; i++) {\n        if (parsed[i] !== null && jQuery.trim(parsed[i]).length > 0) {\n          result.push(parsed[i]);\n        }\n      }\n      return result.length > 0 ? result : null;\n    } else {\n      return textArea.value;\n    }\n  },\n\n  showSnippet: function () {\n    var contentTypeEl = this.$('[name=responseContentType]');\n    var xmlSnippetEl = this.$('.operation-status .snippet_xml, .response-class .snippet_xml');\n    var jsonSnippetEl = this.$('.operation-status .snippet_json, .response-class .snippet_json');\n    var contentType;\n\n    if (!contentTypeEl.length) { return; }\n    contentType = contentTypeEl.val();\n\n    if (contentType.indexOf('xml') > -1) {\n      xmlSnippetEl.show();\n      jsonSnippetEl.hide();\n    } else {\n      jsonSnippetEl.show();\n      xmlSnippetEl.hide();\n    }\n  },\n\n  getParamByName: function(name) {\n    var i;\n    if (this.model.parameters) {\n      for(i = 0; i < this.model.parameters.length; i++) {\n        if (this.model.parameters[i].name === name) {\n          return this.model.parameters[i];\n        }\n      }\n    }\n    return null;\n  }\n\n});\n","'use strict';\n\nSwaggerUi.Views.ParameterContentTypeView = Backbone.View.extend({\n  initialize: function  () {},\n\n  render: function(){\n    this.model.parameterContentTypeId = 'pct' + Math.random();\n    $(this.el).html(Handlebars.templates.parameter_content_type(this.model));\n    return this;\n  }\n\n});","'use strict';\n\nSwaggerUi.Views.ParameterView = Backbone.View.extend({\n  events: {\n    'change [name=parameterContentType]' : 'toggleParameterSnippet'\n  },\n\n  initialize: function(){\n    Handlebars.registerHelper('isArray', function(param, opts) {\n      var paramType = param.type && param.type.toLowerCase();\n      if (paramType === 'array' || param.allowMultiple) {\n        return opts.fn(this);\n      } else {\n        return opts.inverse(this);\n      }\n    });\n  },\n\n  render: function() {\n    var type = this.model.type || this.model.dataType;\n    var modelType = this.model.modelSignature.type;\n    var modelDefinitions = this.model.modelSignature.definitions;\n    var schema = this.model.schema || {};\n    var consumes = this.model.consumes || [];\n    var sampleJSON, signatureView;\n\n    if (typeof type === 'undefined') {\n      if (schema.$ref) {\n        var ref = schema.$ref;\n        if (ref.indexOf('#/definitions/') === 0) {\n          type = ref.substring('#/definitions/'.length);\n        } else {\n          type = ref;\n        }\n      }\n    }\n\n    this.model.type = type;\n    this.model.paramType = this.model.in || this.model.paramType;\n    this.model.isBody = this.model.paramType === 'body' || this.model.in === 'body';\n    this.model.isFile = type && type.toLowerCase() === 'file';\n\n    // Allow for default === false\n    if(typeof this.model.default === 'undefined') {\n      this.model.default = this.model.defaultValue;\n    }\n\n    this.model.hasDefault = (typeof this.model.default !== 'undefined');\n    this.model.valueId = 'm' + this.model.name + Math.random();\n\n    if (this.model.allowableValues) {\n      this.model.isList = true;\n    }\n\n    var isXML = this.contains(consumes, 'xml');\n    var isJSON = isXML ? this.contains(consumes, 'json') : true;\n    sampleJSON = SwaggerUi.partials.signature.createParameterJSONSample(modelType, modelDefinitions);\n\n    var template = this.template();\n    $(this.el).html(template(this.model));\n\n    var signatureModel = {\n      sampleJSON: isJSON ? sampleJSON : false,\n      sampleXML: sampleJSON && isXML ? SwaggerUi.partials.signature.createXMLSample('', schema, modelDefinitions, true) : false,\n      isParam: true,\n      signature: SwaggerUi.partials.signature.getParameterModelSignature(modelType, modelDefinitions),\n      defaultRendering: this.model.defaultRendering\n    };\n\n    if (sampleJSON) {\n      signatureView = new SwaggerUi.Views.SignatureView({model: signatureModel, tagName: 'div'});\n      $('.model-signature', $(this.el)).append(signatureView.render().el);\n    }\n    else {\n      $('.model-signature', $(this.el)).html(this.model.signature);\n    }\n\n    var isParam = false;\n\n    if( this.options.swaggerOptions.jsonEditor && this.model.isBody && this.model.schema){\n      var $self = $(this.el);\n      this.model.jsonEditor =\n        /* global JSONEditor */\n        new JSONEditor($('.editor_holder', $self)[0],\n                       {schema: this.model.schema, startval : this.model.default,\n                        ajax:true,\n                        disable_properties:true,\n                        disable_edit_json:true,\n                        iconlib: 'swagger' });\n      // This is so that the signature can send back the sample to the json editor\n      // TODO: SignatureView should expose an event \"onSampleClicked\" instead\n      signatureModel.jsonEditor = this.model.jsonEditor;\n      $('.body-textarea', $self).hide();\n      $('.editor_holder', $self).show();\n      $('.parameter-content-type', $self)\n        .change(function(e){\n            if(e.target.value === 'application/xml'){\n              $('.body-textarea', $self).show();\n              $('.editor_holder', $self).hide();\n              this.model.jsonEditor.disable();\n            }\n            else {\n              $('.body-textarea', $self).hide();\n              $('.editor_holder', $self).show();\n              this.model.jsonEditor.enable();\n            }\n        });\n      }\n\n\n    if (this.model.isBody) {\n      isParam = true;\n    }\n\n    var contentTypeModel = {\n      isParam: isParam\n    };\n\n    contentTypeModel.consumes = this.model.consumes;\n\n    if (isParam) {\n      var parameterContentTypeView = new SwaggerUi.Views.ParameterContentTypeView({model: contentTypeModel});\n      $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);\n      this.toggleParameterSnippet();\n    }\n\n    else {\n      var responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({model: contentTypeModel});\n      $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);\n      this.toggleResponseSnippet();\n    }\n\n    return this;\n  },\n\n  contains: function (consumes, type) {\n    return consumes.filter(function (val) {\n      if (val.indexOf(type) > -1) {\n        return true;\n      }\n    }).length;\n  },\n\n  toggleParameterSnippet: function () {\n    var contentType = this.$('[name=parameterContentType]').val();\n\n    this.toggleSnippet(contentType);\n  },\n\n  toggleResponseSnippet: function () {\n    var contentEl = this.$('[name=responseContentType]');\n\n    if (!contentEl.length) { return; }\n\n    this.toggleSnippet(contentEl.val());\n  },\n\n  toggleSnippet: function (type) {\n    type = type || '';\n    if (type.indexOf('xml') > -1) {\n      this.$('.snippet_xml').show();\n      this.$('.snippet_json').hide();\n    } else {\n      this.$('.snippet_json').show();\n      this.$('.snippet_xml').hide();\n    }\n  },\n\n  // Return an appropriate template based on if the parameter is a list, readonly, required\n  template: function(){\n    if (this.model.isList) {\n      return Handlebars.templates.param_list;\n    } else {\n      if (this.options.readOnly) {\n        if (this.model.required) {\n          return Handlebars.templates.param_readonly_required;\n        } else {\n          return Handlebars.templates.param_readonly;\n        }\n      } else {\n        if (this.model.required) {\n          return Handlebars.templates.param_required;\n        } else {\n          return Handlebars.templates.param;\n        }\n      }\n    }\n  }\n});\n","'use strict';\n\n/* jshint -W122 */\nSwaggerUi.partials.signature = (function () {\n  // copy-pasted from swagger-js\n  var resolveSchema = function (schema) {\n    if (_.isPlainObject(schema.schema)) {\n      schema = resolveSchema(schema.schema);\n    }\n\n    return schema;\n  };\n\n  // copy-pasted from swagger-js\n  var simpleRef = function (name) {\n    if (typeof name === 'undefined') {\n      return null;\n    }\n\n    if (name.indexOf('#/definitions/') === 0) {\n      return name.substring('#/definitions/'.length);\n    } else {\n      return name;\n    }\n  };\n\n  // copy-pasted from swagger-js\n  var getInlineModel = function(inlineStr) {\n    if(/^Inline Model \\d+$/.test(inlineStr) && this.inlineModels) {\n      var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //\n      var model = this.inlineModels[id];\n      return model;\n    }\n    // I'm returning null here, should I rather throw an error?\n    return null;\n  };\n\n  // copy-pasted from swagger-js\n  var formatXml = function(xml) {\n    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;\n    reg = /(>)(<)(\\/*)/g;\n    wsexp = /[ ]*(.*)[ ]+\\n/g;\n    contexp = /(<.+>)(.+\\n)/g;\n    xml = xml.replace(reg, '$1\\n$2$3').replace(wsexp, '$1\\n').replace(contexp, '$1\\n$2');\n    pad = 0;\n    formatted = '';\n    lines = xml.split('\\n');\n    indent = 0;\n    lastType = 'other';\n    transitions = {\n      'single->single': 0,\n      'single->closing': -1,\n      'single->opening': 0,\n      'single->other': 0,\n      'closing->single': 0,\n      'closing->closing': -1,\n      'closing->opening': 0,\n      'closing->other': 0,\n      'opening->single': 1,\n      'opening->closing': 0,\n      'opening->opening': 1,\n      'opening->other': 1,\n      'other->single': 0,\n      'other->closing': -1,\n      'other->opening': 0,\n      'other->other': 0\n    };\n    fn = function(ln) {\n      var fromTo, j, key, padding, type, types, value;\n      types = {\n        single: Boolean(ln.match(/<.+\\/>/)),\n        closing: Boolean(ln.match(/<\\/.+>/)),\n        opening: Boolean(ln.match(/<[^!?].*>/))\n      };\n      type = ((function() {\n        var results;\n        results = [];\n        for (key in types) {\n          value = types[key];\n          if (value) {\n            results.push(key);\n          }\n        }\n        return results;\n      })())[0];\n      type = type === void 0 ? 'other' : type;\n      fromTo = lastType + '->' + type;\n      lastType = type;\n      padding = '';\n      indent += transitions[fromTo];\n      padding = ((function() {\n        var m, ref1, results;\n        results = [];\n        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {\n          results.push('  ');\n        }\n        return results;\n      })()).join('');\n      if (fromTo === 'opening->closing') {\n        formatted = formatted.substr(0, formatted.length - 1) + ln + '\\n';\n      } else {\n        formatted += padding + ln + '\\n';\n      }\n    };\n    for (l = 0, len = lines.length; l < len; l++) {\n      ln = lines[l];\n      fn(ln);\n    }\n    return formatted;\n  };\n\n  // copy-pasted from swagger-js\n  var getModelSignature = function (name, schema, models, modelPropertyMacro) {\n    var strongOpen = '<span class=\"strong\">';\n    var strongClose = '</span>';\n\n    var optionHtml = function (label, value) {\n      return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n    };\n\n\n    // Allow for ignoring the 'name' argument.... shifting the rest\n    if(_.isObject(arguments[0])) {\n      name = void 0;\n      schema = arguments[0];\n      models = arguments[1];\n      modelPropertyMacro = arguments[2];\n    }\n\n    models = models || {};\n\n    // Resolve the schema (Handle nested schemas)\n    schema = resolveSchema(schema);\n\n    // Return for empty object\n    if(_.isEmpty(schema)) {\n      return strongOpen + 'Empty' + strongClose;\n    }\n\n    // Dereference $ref from 'models'\n    if(typeof schema.$ref === 'string') {\n      name = simpleRef(schema.$ref);\n      schema = models[name];\n      if(typeof schema === 'undefined')\n      {\n        return strongOpen + name + ' is not defined!' + strongClose;\n      }\n    }\n\n    if(typeof name !== 'string') {\n      name = schema.title || 'Inline Model';\n    }\n\n    // If we are a Model object... adjust accordingly\n    if(schema.definition) {\n      schema = schema.definition;\n    }\n\n    if(typeof modelPropertyMacro !== 'function') {\n      modelPropertyMacro = function(prop){\n        return (prop || {}).default;\n      };\n    }\n\n    var references = {};\n    var seenModels = [];\n    var inlineModels = 0;\n\n    // Generate current HTML\n    var html = processModel(schema, name);\n\n    // Generate references HTML\n    while (_.keys(references).length > 0) {\n      /* jshint ignore:start */\n      _.forEach(references, function (schema, name) {\n        var seenModel = _.indexOf(seenModels, name) > -1;\n\n        delete references[name];\n\n        if (!seenModel) {\n          seenModels.push(name);\n\n          html += '<br />' + processModel(schema, name);\n        }\n      });\n      /* jshint ignore:end */\n    }\n\n    return html;\n\n\n    function addReference(schema, name, skipRef) {\n      var modelName = name;\n      var model;\n\n      if (schema.$ref) {\n        modelName = schema.title || simpleRef(schema.$ref);\n        model = models[simpleRef(schema.$ref)];\n      } else if (_.isUndefined(name)) {\n        modelName = schema.title || 'Inline Model ' + (++inlineModels);\n        model = {definition: schema};\n      }\n\n      if (skipRef !== true) {\n        references[modelName] = _.isUndefined(model) ? {} : model.definition;\n      }\n\n      return modelName;\n    }\n\n    function primitiveToHTML(schema) {\n      var html = '<span class=\"propType\">';\n      var type = schema.type || 'object';\n\n      if (schema.$ref) {\n        html += addReference(schema, simpleRef(schema.$ref));\n      } else if (type === 'object') {\n        if (!_.isUndefined(schema.properties)) {\n          html += addReference(schema);\n        } else {\n          html += 'object';\n        }\n      } else if (type === 'array') {\n        html += 'Array[';\n\n        if (_.isArray(schema.items)) {\n          html += _.map(schema.items, addReference).join(',');\n        } else if (_.isPlainObject(schema.items)) {\n          if (_.isUndefined(schema.items.$ref)) {\n            if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {\n              html += schema.items.type;\n            } else {\n              html += addReference(schema.items);\n            }\n          } else {\n            html += addReference(schema.items, simpleRef(schema.items.$ref));\n          }\n        } else {\n          console.log('Array type\\'s \\'items\\' schema is not an array or an object, cannot process');\n          html += 'object';\n        }\n\n        html += ']';\n      } else {\n        html += schema.type;\n      }\n\n      html += '</span>';\n\n      return html;\n    }\n\n    function primitiveToOptionsHTML(schema, html) {\n      var options = '';\n      var type = schema.type || 'object';\n      var isArray = type === 'array';\n\n      if (!_.isUndefined(schema.description)) {\n        html += ': ' + '<span class=\"propDesc\">' + schema.description + '</span>';\n      }\n\n      if (schema.enum) {\n        html += ' = <span class=\"propVals\">[\\'' + schema.enum.join('\\', \\'') + '\\']</span>';\n      }\n\n      if (isArray) {\n        if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {\n          type = schema.items.type;\n        } else {\n          type = 'object';\n        }\n      }\n\n      if (!_.isUndefined(schema.default)) {\n        options += optionHtml('Default', schema.default);\n      }\n\n      switch (type) {\n      case 'string':\n        if (schema.minLength) {\n          options += optionHtml('Min. Length', schema.minLength);\n        }\n\n        if (schema.maxLength) {\n          options += optionHtml('Max. Length', schema.maxLength);\n        }\n\n        if (schema.pattern) {\n          options += optionHtml('Reg. Exp.', schema.pattern);\n        }\n        break;\n      case 'integer':\n      case 'number':\n        if (schema.minimum) {\n          options += optionHtml('Min. Value', schema.minimum);\n        }\n\n        if (schema.exclusiveMinimum) {\n          options += optionHtml('Exclusive Min.', 'true');\n        }\n\n        if (schema.maximum) {\n          options += optionHtml('Max. Value', schema.maximum);\n        }\n\n        if (schema.exclusiveMaximum) {\n          options += optionHtml('Exclusive Max.', 'true');\n        }\n\n        if (schema.multipleOf) {\n          options += optionHtml('Multiple Of', schema.multipleOf);\n        }\n\n        break;\n      }\n\n      if (isArray) {\n        if (schema.minItems) {\n          options += optionHtml('Min. Items', schema.minItems);\n        }\n\n        if (schema.maxItems) {\n          options += optionHtml('Max. Items', schema.maxItems);\n        }\n\n        if (schema.uniqueItems) {\n          options += optionHtml('Unique Items', 'true');\n        }\n\n        if (schema.collectionFormat) {\n          options += optionHtml('Coll. Format', schema.collectionFormat);\n        }\n      }\n\n      if (_.isUndefined(schema.items)) {\n        if (_.isArray(schema.enum)) {\n          var enumString;\n\n          if (type === 'number' || type === 'integer') {\n            enumString = schema.enum.join(', ');\n          } else {\n            enumString = '\"' + schema.enum.join('\", \"') + '\"';\n          }\n\n          options += optionHtml('Enum', enumString);\n        }\n      }\n\n      if (options.length > 0) {\n        html = '<span class=\"propWrap\">' + html + '<table class=\"optionsWrapper\"><tr><th colspan=\"2\">' + type + '</th></tr>' + options + '</table></span>';\n      }\n\n      return html;\n    }\n\n    function processModel(schema, name) {\n      var type = schema.type || 'object';\n      var isArray = schema.type === 'array';\n      var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;\n      var contents;\n\n      if (name) {\n        seenModels.push(name);\n      }\n\n      if (isArray) {\n        if (_.isArray(schema.items)) {\n          html += '<div>' + _.map(schema.items, function (item) {\n            var type = item.type || 'object';\n\n            if (_.isUndefined(item.$ref)) {\n              if (_.indexOf(['array', 'object'], type) > -1) {\n                if (type === 'object' && _.isUndefined(item.properties)) {\n                  return 'object';\n                } else {\n                  return addReference(item);\n                }\n              } else {\n                return primitiveToOptionsHTML(item, type);\n              }\n            } else {\n              return addReference(item, simpleRef(item.$ref));\n            }\n          }).join(',</div><div>');\n        } else if (_.isPlainObject(schema.items)) {\n          if (_.isUndefined(schema.items.$ref)) {\n            if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {\n              if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {\n                html += '<div>object</div>';\n              } else {\n                html += '<div>' + addReference(schema.items) + '</div>';\n              }\n            } else {\n              html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';\n            }\n          } else {\n            html += '<div>' + addReference(schema.items, simpleRef(schema.items.$ref)) + '</div>';\n          }\n        } else {\n          console.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n          html += '<div>object</div>';\n        }\n      } else {\n        if (schema.$ref) {\n          html += '<div>' + addReference(schema, name) + '</div>';\n        } else if (type === 'object') {\n          if (_.isPlainObject(schema.properties)) {\n            contents = _.map(schema.properties, function (property, name) {\n              var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);\n              var cProperty = _.cloneDeep(property);\n\n              var requiredClass = propertyIsRequired ? 'required' : '';\n              var html = '<span class=\"propName ' + requiredClass + '\">' + name + '</span> (';\n              var model;\n\n              // Allow macro to set the default value\n              cProperty.default = modelPropertyMacro(cProperty);\n\n              // Resolve the schema (Handle nested schemas)\n              cProperty = resolveSchema(cProperty);\n\n              // We need to handle property references to primitives (Issue 339)\n              if (!_.isUndefined(cProperty.$ref)) {\n                model = models[simpleRef(cProperty.$ref)];\n\n                if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {\n                  // Use referenced schema\n                  cProperty = resolveSchema(model.definition);\n                }\n              }\n\n              html += primitiveToHTML(cProperty);\n\n              if(!propertyIsRequired) {\n                html += ', <span class=\"propOptKey\">optional</span>';\n              }\n\n              if(property.readOnly) {\n                  html += ', <span class=\"propReadOnly\">read only</span>';\n              }\n\n              html += ')';\n\n              return '<div' + (property.readOnly ? ' class=\"readOnly\"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);\n            }).join(',</div>');\n          }\n\n          if (contents) {\n            html += contents + '</div>';\n          }\n        } else {\n          html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';\n        }\n      }\n\n      return html + strongOpen + (isArray ? ']' : '}') + strongClose;\n    }\n\n  };\n\n  // copy-pasted from swagger-js\n  var schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {\n    // Resolve the schema (Handle nested schemas)\n    schema = resolveSchema(schema);\n\n    if(typeof modelPropertyMacro !== 'function') {\n      modelPropertyMacro = function(prop){\n        return (prop || {}).default;\n      };\n    }\n\n    modelsToIgnore= modelsToIgnore || {};\n\n    var type = schema.type || 'object';\n    var format = schema.format;\n    var model;\n    var output;\n\n    if (!_.isUndefined(schema.example)) {\n      output = schema.example;\n    } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {\n      output = schema.enum[0];\n    }\n\n    if (_.isUndefined(output)) {\n      if (schema.$ref) {\n        model = models[simpleRef(schema.$ref)];\n\n        if (!_.isUndefined(model)) {\n          if (_.isUndefined(modelsToIgnore[model.name])) {\n            modelsToIgnore[model.name] = model;\n            output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);\n            delete modelsToIgnore[model.name];\n          } else {\n            if (model.type === 'array') {\n              output = [];\n            } else {\n              output = {};\n            }\n          }\n        }\n      } else if (!_.isUndefined(schema.default)) {\n        output = schema.default;\n      } else if (type === 'string') {\n        if (format === 'date-time') {\n          output = new Date().toISOString();\n        } else if (format === 'date') {\n          output = new Date().toISOString().split('T')[0];\n        } else {\n          output = 'string';\n        }\n      } else if (type === 'integer') {\n        output = 0;\n      } else if (type === 'number') {\n        output = 0.0;\n      } else if (type === 'boolean') {\n        output = true;\n      } else if (type === 'object') {\n        output = {};\n\n        _.forEach(schema.properties, function (property, name) {\n          var cProperty = _.cloneDeep(property);\n\n          // Allow macro to set the default value\n          cProperty.default = modelPropertyMacro(property);\n\n          output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);\n        });\n      } else if (type === 'array') {\n        output = [];\n\n        if (_.isArray(schema.items)) {\n          _.forEach(schema.items, function (item) {\n            output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));\n          });\n        } else if (_.isPlainObject(schema.items)) {\n          output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));\n        } else if (_.isUndefined(schema.items)) {\n          output.push({});\n        } else {\n          console.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n        }\n      }\n    }\n\n    return output;\n  };\n\n  // copy-pasted from swagger-js\n  var createJSONSample = function (value, modelsToIgnore) {\n    modelsToIgnore = modelsToIgnore || {};\n\n    modelsToIgnore[value.name] = value;\n\n    // Response support\n    if (value.examples && _.isPlainObject(value.examples)) {\n      value = _.cloneDeep(value);\n      var keys = Object.keys(value.examples);\n\n      _.forEach(keys, function(key) {\n        if(key.indexOf('application/json') === 0) {\n          var example = value.examples[key];\n          if (_.isString(example)) {\n            example = jsyaml.safeLoad(example);\n          }\n          value.definition.example = example;\n          return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);\n        }\n      });\n    }\n\n    if (value.examples) {\n      value = _.cloneDeep(value);\n      var example = value.examples;\n      if (_.isString(example)) {\n        example = jsyaml.safeLoad(example);\n      }\n      value.definition.example = example;\n      return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);\n    }\n\n    return schemaToJSON(value.definition, value.models, modelsToIgnore, value.modelPropertyMacro);\n  };\n\n  // copy-pasted from swagger-js\n  var getParameterModelSignature = function (type, definitions) {\n      var isPrimitive, listType;\n\n      if (type instanceof Array) {\n        listType = true;\n        type = type[0];\n      }\n\n      // Convert undefined to string of 'undefined'\n      if (typeof type === 'undefined') {\n        type = 'undefined';\n        isPrimitive = true;\n\n      } else if (definitions[type]){\n        // a model def exists?\n        type = definitions[type]; /* Model */\n        isPrimitive = false;\n\n      } else if (getInlineModel(type)) {\n        type = getInlineModel(type); /* Model */\n        isPrimitive = false;\n\n      } else {\n        // We default to primitive\n        isPrimitive = true;\n      }\n\n      if (isPrimitive) {\n        if (listType) {\n          return 'Array[' + type + ']';\n        } else {\n          return type.toString();\n        }\n      } else {\n        if (listType) {\n          return 'Array[' + getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro) + ']';\n        } else {\n          return getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro);\n        }\n      }\n  };\n\n  // copy-pasted from swagger-js\n  var createParameterJSONSample = function (type, models) {\n    var listType, sampleJson, innerType;\n    models = models || {};\n\n    listType = (type instanceof Array);\n    innerType = listType ? type[0] : type;\n\n    if(models[innerType]) {\n      sampleJson = createJSONSample(models[innerType]);\n    } else if (getInlineModel(innerType)){\n      sampleJson = createJSONSample(getInlineModel(innerType)); // may return null, if type isn't correct\n    }\n\n\n    if (sampleJson) {\n      sampleJson = listType ? [sampleJson] : sampleJson;\n\n      if (typeof sampleJson === 'string') {\n        return sampleJson;\n      } else if (_.isObject(sampleJson)) {\n        var t = sampleJson;\n\n        if (sampleJson instanceof Array && sampleJson.length > 0) {\n          t = sampleJson[0];\n        }\n\n        if (t.nodeName && typeof t === 'Node') {\n          var xmlString = new XMLSerializer().serializeToString(t);\n\n          return formatXml(xmlString);\n        } else {\n          return JSON.stringify(sampleJson, null, 2);\n        }\n      } else {\n        return sampleJson;\n      }\n    }\n  };\n\n  var wrapTag = function (name, value, attrs) {\n    var str, attributes;\n\n    attrs = attrs || [];\n\n    attributes = attrs.map(function (attr) {\n      return ' ' + attr.name + '=\"' + attr.value + '\"';\n    }).join('');\n\n    if (!name) {\n      return getErrorMessage('Node name is not provided');\n    }\n\n    str = [\n      '<', name,\n      attributes,\n      '>',\n      value,\n      '</', name, '>'\n    ];\n\n    return str.join('');\n  };\n\n  // Commenting this funtion as the names are now determined beforehand and the prefix part is exposed as a separate function | https://github.com/swagger-api/swagger-ui/issues/2577\n /** var getName = function (name, xml) {\n    var result = name || '';\n\n    xml = xml || {};\n\n    if (xml.name) {\n      result = xml.name;\n    }\n\n    if (xml.prefix) {\n      result = xml.prefix + ':' + result;\n    }\n\n    return result;\n  };\n  */\n  \n  var getPrefix = function (name, xml) {\n    var result = name || '';\n\n    xml = xml || {};\n\n    if (xml.prefix) {\n      result = xml.prefix + ':' + result;\n    }\n\n    return result;\n  };\n\n  var getNamespace = function (xml) {\n    var namespace = '';\n    var name = 'xmlns';\n\n    xml = xml || {};\n\n    if (xml.namespace) {\n      namespace = xml.namespace;\n    } else {\n      return namespace;\n    }\n\n    if (xml.prefix) {\n      name += ':' + xml.prefix;\n    }\n\n    return {\n      name: name,\n      value: namespace\n    };\n  };\n\n  var createArrayXML = function (descriptor) {\n    var name = descriptor.name;\n    var config = descriptor.config;\n    var definition = descriptor.definition;\n    var models = descriptor.models;\n    var value;\n    var items = definition.items;\n    var xml = definition.xml || {};\n    var namespace = getNamespace(xml);\n    var attributes = [];\n\n    if (!items) { return getErrorMessage(); }\n    var key = name;\n    // If there is a name specified for the array elements, use that for the array elements name | https://github.com/swagger-api/swagger-ui/issues/2577\n    if(items.xml && items.xml.name) {\n        key = items.xml.name;\n    }\n    value = createSchemaXML(key, items, models, config);\n    if (namespace) {\n      attributes.push(namespace);\n    }\n\n    if (xml.wrapped) {\n      value = wrapTag(name, value, attributes);\n    }\n\n    return value;\n  };\n\n  var getPrimitiveSignature = function (schema) {\n    var type, items;\n\n    schema = schema || {};\n    items = schema.items || {};\n    type = schema.type || '';\n\n    switch (type) {\n      case 'object': return 'Object is not a primitive';\n      case 'array' : return 'Array[' + (items.format || items.type) + ']';\n      default: return schema.format || type;\n    }\n  };\n\n  var createPrimitiveXML = function (descriptor) {\n    var name = descriptor.name;\n    var definition = descriptor.definition;\n    var primitivesMap = {\n      'string': {\n        'date': new Date(1).toISOString().split('T')[0],\n        'date-time' : new Date(1).toISOString(),\n        'default': 'string'\n      },\n      'integer': {\n        'default': 1\n      },\n      'number': {\n        'default': 1.1\n      },\n      'boolean': {\n        'default': true\n      }\n    };\n    var type = definition.type;\n    var format = definition.format;\n    var xml = definition.xml || {};\n    var namespace = getNamespace(xml);\n    var attributes = [];\n    var value;\n\n    if (_.keys(primitivesMap).indexOf(type) < 0) { return getErrorMessage(); }\n\n    if (_.isArray(definition.enum)){\n      value = definition.enum[0];\n    } else {\n      value = definition.example || primitivesMap[type][format] || primitivesMap[type].default;\n    }\n\n    if (xml.attribute) {\n      return {name: name, value: value};\n    }\n\n    if (namespace) {\n      attributes.push(namespace);\n    }\n\n    return wrapTag(name, value, attributes);\n  };\n\n  function createObjectXML (descriptor) {\n    var name = descriptor.name;\n    var definition = descriptor.definition;\n    var config = descriptor.config;\n    var models = descriptor.models;\n    var isParam = descriptor.config.isParam;\n    var serializedProperties;\n    var attrs = [];\n    var properties = definition.properties;\n    var additionalProperties = definition.additionalProperties;\n    var xml = definition.xml;\n    var namespace = getNamespace(xml);\n\n    if (namespace) {\n      attrs.push(namespace);\n    }   \n\n    if (!properties && !additionalProperties) { return getErrorMessage(); }\n\n    properties = properties || {};\n\n    serializedProperties = _.map(properties, function (prop, key) {\n      var xml, result;\n\n      if (isParam && prop.readOnly) {\n        return '';\n      }\n\n      xml = prop.xml || {};\n      result = createSchemaXML(key, prop, models, config);\n\n      if (xml.attribute) {\n        attrs.push(result);\n        return '';\n      }\n\n      return result;\n    }).join('');\n\n    if (additionalProperties) {\n      serializedProperties += '<!-- additional elements allowed -->';\n    }\n\n    return wrapTag(name, serializedProperties, attrs);\n  }\n\n  function getInfiniteLoopMessage (name, loopTo) {\n    return wrapTag(name, '<!-- Infinite loop $ref:' + loopTo + ' -->');\n  }\n\n  function getErrorMessage (details) {\n    details = details ? ': ' + details : '';\n    return '<!-- invalid XML' + details + ' -->';\n  }\n\n  function createSchemaXML (name, definition, models, config) {\n    var $ref = _.isObject(definition) ? definition.$ref : null;\n    var output, index;\n    config = config || {};\n    config.modelsToIgnore = config.modelsToIgnore || [];\n   \n    var descriptor = _.isString($ref) ? getDescriptorByRef($ref, name, models, config)\n        : getDescriptor(name, definition, models, config);\n    \n    if (!descriptor) {\n      return getErrorMessage();\n    }\n\n    switch (descriptor.type) {\n      case 'array':\n        output = createArrayXML(descriptor); break;\n      case 'object':\n        output = createObjectXML(descriptor); break;\n      case 'loop':\n        output = getInfiniteLoopMessage(descriptor.name, descriptor.config.loopTo); break;\n      default:\n        output = createPrimitiveXML(descriptor);\n    }\n\n    if ($ref && descriptor.type !== 'loop') {\n      index = config.modelsToIgnore.indexOf($ref);\n      if (index > -1) {\n        config.modelsToIgnore.splice(index, 1);\n      }\n    }\n\n    return output;\n  }\n\n  function Descriptor (name, type, definition, models, config) {\n    if (arguments.length < 4) {\n      throw new Error();\n    }\n    this.config = config || {};\n    this.config.modelsToIgnore = this.config.modelsToIgnore || [];\n    // name is already set by getDescriptorByRef or getDescriptor function depending on the type. Only prefix, if present is needed to be set here | https://github.com/swagger-api/swagger-ui/issues/2577\n    this.name = getPrefix(name, definition.xml);\n    this.definition = definition;\n    this.models = models;\n    this.type = type;\n  }\n\n  function getDescriptorByRef($ref, name, models, config) {\n    var modelType = simpleRef($ref);\n    var model = models[modelType] || {};\n    var type = model.definition && model.definition.type ? model.definition.type : 'object';\n    // If model definition xml name is present, then that will be preferred over model name. This is the case of preferring XmlElement name over XmlRootElement name if XmlElement name is provided | https://github.com/swagger-api/swagger-ui/issues/2577\n    if(model.definition && model.definition.xml && model.definition.xml.name) {\n        name = name || model.definition.xml.name || model.name;\n    }\n    // else only model name will be considered for determination | https://github.com/swagger-api/swagger-ui/issues/2577\n    else {\n        name = name || model.name;\n    }\n    \n    if (config.modelsToIgnore.indexOf($ref) > -1) {\n      type = 'loop';\n      config.loopTo = modelType;\n    } else {\n      config.modelsToIgnore.push($ref);\n    }\n\n    if (!model.definition) {\n      return null;\n    }\n    return new Descriptor(name, type, model.definition, models, config);    \n  }\n\n  function getDescriptor (name, definition, models, config){\n    var type = definition.type || 'object';\n    // If definition xml name is present, then that will be preferred over name | https://github.com/swagger-api/swagger-ui/issues/2577\n    if(definition.xml && definition.xml.name) {\n        name = definition.xml.name || name;\n    }\n    if (!definition) {\n      return null;\n    }\n\n    return new Descriptor(name, type, definition, models, config);\n  }\n\n  function createXMLSample (name, definition, models, isParam) {\n    var prolog = '<?xml version=\"1.0\"?>';\n\n    return formatXml(prolog + createSchemaXML(name, definition, models, { isParam: isParam } ));\n  }\n\n  return {\n      getModelSignature: getModelSignature,\n      createJSONSample: createJSONSample,\n      getParameterModelSignature: getParameterModelSignature,\n      createParameterJSONSample: createParameterJSONSample,\n      createSchemaXML: createSchemaXML,\n      createXMLSample: createXMLSample,\n      getPrimitiveSignature: getPrimitiveSignature\n  };\n\n})();\n","'use strict';\n\nSwaggerUi.Views.PopupView = Backbone.View.extend({\n    events: {\n        'click .api-popup-cancel': 'cancelClick'\n    },\n\n    template: Handlebars.templates.popup,\n    className: 'api-popup-dialog',\n\n    selectors: {\n        content: '.api-popup-content',\n        main   : '#swagger-ui-container'\n    },\n\n    initialize: function(){\n        this.$el.html(this.template(this.model));\n    },\n\n    render: function () {\n        this.$(this.selectors.content).append(this.model.content);\n        $(this.selectors.main).first().append(this.el);\n        this.showPopup();\n\n        return this;\n    },\n\n    showPopup: function () {\n        this.$el.show();\n    },\n\n    cancelClick: function () {\n        this.remove();\n    }\n\n});\n","'use strict';\n\nSwaggerUi.Views.ResourceView = Backbone.View.extend({\n  initialize: function(opts) {\n    opts = opts || {};\n    this.router = opts.router;\n    this.auths = opts.auths;\n    if ('' === this.model.description) {\n      this.model.description = null;\n    }\n    if (this.model.description) {\n      this.model.summary = this.model.description;\n    }\n    this.number = 0;\n  },\n\n  render: function(){\n    var methods = {};\n\n\n    $(this.el).html(Handlebars.templates.resource(this.model));\n\n    // Render each operation\n    for (var i = 0; i < this.model.operationsArray.length; i++) {\n      var operation = this.model.operationsArray[i];\n      var counter = 0;\n      var id = operation.nickname;\n\n      while (typeof methods[id] !== 'undefined') {\n        id = id + '_' + counter;\n        counter += 1;\n      }\n\n      methods[id] = operation;\n\n      operation.nickname = id;\n      operation.parentId = this.model.id;\n      operation.definitions = this.model.definitions; // make Json Schema available for JSonEditor in this operation\n      this.addOperation(operation);\n    }\n\n    $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));\n    $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));\n    $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));\n\n    return this;\n  },\n\n  addOperation: function(operation) {\n\n    operation.number = this.number;\n\n    // Render an operation and add it to operations li\n    var operationView = new SwaggerUi.Views.OperationView({\n      model: operation,\n      router: this.router,\n      tagName: 'li',\n      className: 'endpoint',\n      swaggerOptions: this.options.swaggerOptions,\n      auths: this.auths\n    });\n\n    $('.endpoints', $(this.el)).append(operationView.render().el);\n\n    this.number++;\n\n  },\n  // Generic Event handler (`Docs` is global)\n\n\n  callDocs: function(fnName, e) {\n    e.preventDefault();\n    Docs[fnName](e.currentTarget.getAttribute('data-id'));\n  }\n});\n","'use strict';\n\nSwaggerUi.Views.ResponseContentTypeView = Backbone.View.extend({\n  initialize: function(){},\n\n  render: function(){\n    this.model.responseContentTypeId = 'rct' + Math.random();\n    $(this.el).html(Handlebars.templates.response_content_type(this.model));\n    return this;\n  }\n});","'use strict';\n\nSwaggerUi.Views.SignatureView = Backbone.View.extend({\n  events: {\n    'click a.description-link'       : 'switchToDescription',\n    'click a.snippet-link'           : 'switchToSnippet',\n    'mousedown .snippet_json'          : 'jsonSnippetMouseDown',\n    'mousedown .snippet_xml'          : 'xmlSnippetMouseDown'\n  },\n\n  initialize: function () {\n  },\n\n  render: function(){\n\n    $(this.el).html(Handlebars.templates.signature(this.model));\n\n    if (this.model.defaultRendering === 'model') {\n      this.switchToDescription();\n    } else {\n      this.switchToSnippet();\n    }\n\n    return this;\n  },\n\n  // handler for show signature\n  switchToDescription: function(e){\n    if (e) { e.preventDefault(); }\n\n    $('.snippet', $(this.el)).hide();\n    $('.description', $(this.el)).show();\n    $('.description-link', $(this.el)).addClass('selected');\n    $('.snippet-link', $(this.el)).removeClass('selected');\n  },\n\n  // handler for show sample\n  switchToSnippet: function(e){\n    if (e) { e.preventDefault(); }\n\n    $('.snippet', $(this.el)).show();\n    $('.description', $(this.el)).hide();\n    $('.snippet-link', $(this.el)).addClass('selected');\n    $('.description-link', $(this.el)).removeClass('selected');\n  },\n\n  // handler for snippet to text area\n  snippetToTextArea: function(val) {\n    var textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));\n\n    // Fix for bug in IE 10/11 which causes placeholder text to be copied to \"value\"\n    if ($.trim(textArea.val()) === '' || textArea.prop('placeholder') === textArea.val()) {\n      textArea.val(val);\n      // TODO move this code outside of the view and expose an event instead\n      if( this.model.jsonEditor && this.model.jsonEditor.isEnabled()){\n        this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON));\n      }\n    }\n  },\n\n  jsonSnippetMouseDown: function (e) {\n    if (this.model.isParam) {\n      if (e) { e.preventDefault(); }\n\n      this.snippetToTextArea(this.model.sampleJSON);\n    }\n  },\n\n  xmlSnippetMouseDown: function (e) {\n    if (this.model.isParam) {\n      if (e) { e.preventDefault(); }\n\n      this.snippetToTextArea(this.model.sampleXML);\n    }\n  }\n});","'use strict';\n\nSwaggerUi.Views.StatusCodeView = Backbone.View.extend({\n  initialize: function (opts) {\n    this.options = opts || {};\n    this.router = this.options.router;\n  },\n\n  render: function(){\n    var responseModel, responseModelView;\n    var value = this.router.api.models[this.model.responseModel];\n    $(this.el).html(Handlebars.templates.status_code(this.model));\n\n    if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {\n      responseModel = {\n        sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),\n        sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample('', this.model.schema, this.router.api.models) : false,\n        isParam: false,\n        signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),\n        defaultRendering: this.model.defaultRendering\n      };\n    } else {\n      responseModel = {\n        signature: SwaggerUi.partials.signature.getPrimitiveSignature(this.model.schema)\n      };\n    }\n\n    responseModelView = new SwaggerUi.Views.SignatureView({model: responseModel, tagName: 'div'});\n    $('.model-signature', this.$el).append(responseModelView.render().el);\n    return this;\n  }\n});"]}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE.txt b/app/code/Magento/SwaggerWebapi/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE.txt
rename to app/code/Magento/SwaggerWebapi/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapi/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE_AFL.txt
rename to app/code/Magento/SwaggerWebapi/LICENSE_AFL.txt
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 0000000000000..d5a8206a324e7
--- /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 0000000000000..3529848949d77
--- /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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE.txt b/app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE.txt
rename to app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE_AFL.txt
rename to app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SwaggerWebapi/Test/Mftf/README.md b/app/code/Magento/SwaggerWebapi/Test/Mftf/README.md
new file mode 100644
index 0000000000000..91d7c1522aa74
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swagger Webapi Functional Tests
+
+The Functional Test Module for **Magento Swagger Webapi** module.
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 0000000000000..776dd29b6832d
--- /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 0000000000000..5cfd6da7ca410
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-swagger-webapi",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-swagger": "*"
+    },
+    "type": "magento2-module",
+    "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 0000000000000..5b54eee0faa79
--- /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 0000000000000..b3a80d22de697
--- /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 0000000000000..595497df7cfeb
--- /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 0000000000000..4e6adf5f06fd9
--- /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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE.txt b/app/code/Magento/SwaggerWebapiAsync/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE.txt
rename to app/code/Magento/SwaggerWebapiAsync/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapiAsync/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE_AFL.txt
rename to app/code/Magento/SwaggerWebapiAsync/LICENSE_AFL.txt
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 0000000000000..52b0810dc5741
--- /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 0000000000000..373733639c65c
--- /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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE.txt b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE.txt
rename to app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE_AFL.txt
rename to app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md
new file mode 100644
index 0000000000000..46c9dc293dd7d
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swagger Webapi Async Functional Tests
+
+The Functional Test Module for **Magento Swagger Webapi Async** module.
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 0000000000000..6718780fd7952
--- /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 0000000000000..3735bcd0ee458
--- /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": "*",
+        "magento/module-swagger": "*"
+    },
+    "suggest": {
+        "magento/module-config": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "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 0000000000000..8d56182324cd4
--- /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 0000000000000..5f5333654f2a7
--- /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 0000000000000..8805b81ca28a1
--- /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 0000000000000..c64e6f15a09d4
--- /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/Adminhtml/Attribute/Edit/Options/Visual.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
index 306f01af17e71..66ecd06c646e7 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
@@ -84,15 +84,15 @@ public function getJsonConfig()
      * Parse swatch labels for template
      *
      * @codeCoverageIgnore
-     * @param null $swatchStoreValue
-     * @return string
+     * @param null|array $swatchStoreValue
+     * @return null|array
      */
     protected function reformatSwatchLabels($swatchStoreValue = null)
     {
         if ($swatchStoreValue === null) {
             return;
         }
-        $newSwatch = '';
+        $newSwatch = [];
         foreach ($swatchStoreValue as $key => $value) {
             if ($value[0] == '#') {
                 $newSwatch[$key] = 'background: '.$value;
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index aef8a25da2834..6143b8e659059 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Helper\Product as CatalogProduct;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -46,6 +47,16 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
      */
     const MEDIA_CALLBACK_ACTION = 'swatches/ajax/media';
 
+    /**
+     * Name of swatch image for json config
+     */
+    const SWATCH_IMAGE_NAME = 'swatchImage';
+
+    /**
+     * Name of swatch thumbnail for json config
+     */
+    const SWATCH_THUMBNAIL_NAME = 'swatchThumb';
+
     /**
      * @var Product
      */
@@ -76,6 +87,12 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
     private $swatchAttributesProvider;
 
     /**
+     * @var UrlBuilder
+     */
+    private $imageUrlBuilder;
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @param Context $context
      * @param ArrayUtils $arrayUtils
      * @param EncoderInterface $jsonEncoder
@@ -86,9 +103,9 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
      * @param ConfigurableAttributeData $configurableAttributeData
      * @param SwatchData $swatchHelper
      * @param Media $swatchMediaHelper
-     * @param array $data other data
-     * @param SwatchAttributesProvider $swatchAttributesProvider
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param array $data
+     * @param SwatchAttributesProvider|null $swatchAttributesProvider
+     * @param UrlBuilder|null $imageUrlBuilder
      */
     public function __construct(
         Context $context,
@@ -102,12 +119,14 @@ public function __construct(
         SwatchData $swatchHelper,
         Media $swatchMediaHelper,
         array $data = [],
-        SwatchAttributesProvider $swatchAttributesProvider = null
+        SwatchAttributesProvider $swatchAttributesProvider = null,
+        UrlBuilder $imageUrlBuilder = null
     ) {
         $this->swatchHelper = $swatchHelper;
         $this->swatchMediaHelper = $swatchMediaHelper;
         $this->swatchAttributesProvider = $swatchAttributesProvider
             ?: ObjectManager::getInstance()->get(SwatchAttributesProvider::class);
+        $this->imageUrlBuilder = $imageUrlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
         parent::__construct(
             $context,
             $arrayUtils,
@@ -358,8 +377,9 @@ protected function getSwatchProductImage(Product $childProduct, $imageType)
             $swatchImageId = $imageType == Swatch::SWATCH_IMAGE_NAME ? 'swatch_image_base' : 'swatch_thumb_base';
             $imageAttributes = ['type' => 'image'];
         }
-        if (isset($swatchImageId)) {
-            return $this->_imageHelper->init($childProduct, $swatchImageId, $imageAttributes)->getUrl();
+
+        if (!empty($swatchImageId) && !empty($imageAttributes['type'])) {
+            return $this->imageUrlBuilder->getUrl($childProduct->getData($imageAttributes['type']), $swatchImageId);
         }
     }
 
@@ -463,4 +483,22 @@ public function getIdentities()
             return [];
         }
     }
+
+    /**
+     * Get Swatch image size config data.
+     *
+     * @return string
+     */
+    public function getJsonSwatchSizeConfig()
+    {
+        $imageConfig = $this->swatchMediaHelper->getImageConfig();
+        $sizeConfig = [];
+
+        $sizeConfig[self::SWATCH_IMAGE_NAME]['width'] = $imageConfig[Swatch::SWATCH_IMAGE_NAME]['width'];
+        $sizeConfig[self::SWATCH_IMAGE_NAME]['height'] = $imageConfig[Swatch::SWATCH_IMAGE_NAME]['height'];
+        $sizeConfig[self::SWATCH_THUMBNAIL_NAME]['height'] = $imageConfig[Swatch::SWATCH_THUMBNAIL_NAME]['height'];
+        $sizeConfig[self::SWATCH_THUMBNAIL_NAME]['width'] = $imageConfig[Swatch::SWATCH_THUMBNAIL_NAME]['width'];
+
+        return $this->jsonEncoder->encode($sizeConfig);
+    }
 }
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 6a42ad1cc9849..e13373fb72558 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,95 @@
  */
 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\Catalog\Model\Product\Image\UrlBuilder;
+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;
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @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
+     * @param SwatchAttributesProvider|null $swatchAttributesProvider
+     * @param \Magento\Framework\Locale\Format|null $localeFormat
+     * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
+     */
+    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 +145,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/Controller/Adminhtml/Product/Attribute/Plugin/Save.php b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
index dfda76372df1f..72d27152d639a 100644
--- a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
+++ b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
@@ -11,11 +11,13 @@
 use Magento\Swatches\Model\Swatch;
 
 /**
- * Class Save
+ * Plugin for product attribute save controller.
  */
 class Save
 {
     /**
+     * Performs the conversion of the frontend input value.
+     *
      * @param Attribute\Save $subject
      * @param RequestInterface $request
      * @return array
@@ -24,6 +26,7 @@ class Save
     public function beforeDispatch(Attribute\Save $subject, RequestInterface $request)
     {
         $data = $request->getPostValue();
+
         if (isset($data['frontend_input'])) {
             switch ($data['frontend_input']) {
                 case 'swatch_visual':
diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php
index 079ba8f897127..2d20b9a9a4b7e 100644
--- a/app/code/Magento/Swatches/Controller/Ajax/Media.php
+++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php
@@ -12,7 +12,7 @@
 /**
  * Class Media
  */
-class Media extends \Magento\Framework\App\Action\Action
+class Media extends \Magento\Framework\App\Action\Action implements \Magento\Framework\App\Action\HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Product Factory
@@ -24,18 +24,26 @@ class Media extends \Magento\Framework\App\Action\Action
      */
     private $swatchHelper;
 
+    /**
+     * @var \Magento\PageCache\Model\Config
+     */
+    protected $config;
+
     /**
      * @param Context $context
      * @param \Magento\Catalog\Model\ProductFactory $productModelFactory
      * @param \Magento\Swatches\Helper\Data $swatchHelper
+     * @param \Magento\PageCache\Model\Config $config
      */
     public function __construct(
         Context $context,
         \Magento\Catalog\Model\ProductFactory $productModelFactory,
-        \Magento\Swatches\Helper\Data $swatchHelper
+        \Magento\Swatches\Helper\Data $swatchHelper,
+        \Magento\PageCache\Model\Config $config
     ) {
         $this->productModelFactory = $productModelFactory;
         $this->swatchHelper = $swatchHelper;
+        $this->config = $config;
 
         parent::__construct($context);
     }
@@ -44,18 +52,28 @@ public function __construct(
      * Get product media for specified configurable product variation
      *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
         $productMedia = [];
+
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+
+        /** @var \Magento\Framework\App\ResponseInterface $response */
+        $response = $this->getResponse();
+
         if ($productId = (int)$this->getRequest()->getParam('product_id')) {
+            $product = $this->productModelFactory->create()->load($productId);
             $productMedia = $this->swatchHelper->getProductMediaGallery(
-                $this->productModelFactory->create()->load($productId)
+                $product
             );
+            $resultJson->setHeader('X-Magento-Tags', implode(',', $product->getIdentities()));
+
+            $response->setPublicHeaders($this->config->getTtl());
         }
 
-        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $resultJson->setData($productMedia);
         return $resultJson;
     }
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index 7696585293546..69217ea377796 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Swatches\Helper;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterface as Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product as ModelProduct;
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -19,6 +20,7 @@
 use Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory as SwatchCollectionFactory;
 use Magento\Swatches\Model\Swatch;
 use Magento\Swatches\Model\SwatchAttributesProvider;
+use Magento\Swatches\Model\SwatchAttributeType;
 
 /**
  * Class Helper Data
@@ -57,13 +59,6 @@ class Data
      */
     protected $swatchCollectionFactory;
 
-    /**
-     * Catalog Image Helper
-     *
-     * @var Image
-     */
-    protected $imageHelper;
-
     /**
      * Product metadata pool
      *
@@ -94,42 +89,58 @@ class Data
      */
     private $serializer;
 
+    /**
+     * @var SwatchAttributeType
+     */
+    private $swatchTypeChecker;
+
+    /**
+     * @var UrlBuilder
+     */
+    private $imageUrlBuilder;
+
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param ProductRepositoryInterface $productRepository
      * @param StoreManagerInterface $storeManager
      * @param SwatchCollectionFactory $swatchCollectionFactory
-     * @param Image $imageHelper
+     * @param UrlBuilder $urlBuilder
      * @param Json|null $serializer
      * @param SwatchAttributesProvider $swatchAttributesProvider
+     * @param SwatchAttributeType|null $swatchTypeChecker
      */
     public function __construct(
         CollectionFactory $productCollectionFactory,
         ProductRepositoryInterface $productRepository,
         StoreManagerInterface $storeManager,
         SwatchCollectionFactory $swatchCollectionFactory,
-        Image $imageHelper,
+        UrlBuilder $urlBuilder,
         Json $serializer = null,
-        SwatchAttributesProvider $swatchAttributesProvider = null
+        SwatchAttributesProvider $swatchAttributesProvider = null,
+        SwatchAttributeType $swatchTypeChecker = null
     ) {
-        $this->productCollectionFactory   = $productCollectionFactory;
+        $this->productCollectionFactory = $productCollectionFactory;
         $this->productRepository = $productRepository;
         $this->storeManager = $storeManager;
         $this->swatchCollectionFactory = $swatchCollectionFactory;
-        $this->imageHelper = $imageHelper;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->create(Json::class);
         $this->swatchAttributesProvider = $swatchAttributesProvider
             ?: ObjectManager::getInstance()->get(SwatchAttributesProvider::class);
+        $this->swatchTypeChecker = $swatchTypeChecker
+            ?: ObjectManager::getInstance()->create(SwatchAttributeType::class);
+        $this->imageUrlBuilder = $urlBuilder;
     }
 
     /**
+     * Assemble Additional Data for Eav Attribute
+     *
      * @param Attribute $attribute
      * @return $this
      */
     public function assembleAdditionalDataEavAttribute(Attribute $attribute)
     {
         $initialAdditionalData = [];
-        $additionalData = (string) $attribute->getData('additional_data');
+        $additionalData = (string)$attribute->getData('additional_data');
         if (!empty($additionalData)) {
             $additionalData = $this->serializer->unserialize($additionalData);
             if (is_array($additionalData)) {
@@ -150,26 +161,30 @@ public function assembleAdditionalDataEavAttribute(Attribute $attribute)
     }
 
     /**
-     * @param Attribute $attribute
-     * @return $this
+     * Check is media attribute available
+     *
+     * @param ModelProduct $product
+     * @param string $attributeCode
+     * @return bool
      */
-    private function populateAdditionalDataEavAttribute(Attribute $attribute)
+    private function isMediaAvailable(ModelProduct $product, string $attributeCode): bool
     {
-        $serializedAdditionalData = $attribute->getData('additional_data');
-        if ($serializedAdditionalData) {
-            $additionalData = $this->serializer->unserialize($serializedAdditionalData);
-            if (isset($additionalData) && is_array($additionalData)) {
-                foreach ($this->eavAttributeAdditionalDataKeys as $key) {
-                    if (isset($additionalData[$key])) {
-                        $attribute->setData($key, $additionalData[$key]);
-                    }
-                }
+        $isAvailable = false;
+
+        $mediaGallery = $product->getMediaGalleryEntries();
+        foreach ($mediaGallery as $mediaEntry) {
+            if (in_array($attributeCode, $mediaEntry->getTypes(), true)) {
+                $isAvailable = !$mediaEntry->isDisabled();
+                break;
             }
         }
-        return $this;
+
+        return $isAvailable;
     }
 
     /**
+     * Load first variation
+     *
      * @param string $attributeCode swatch_image|image
      * @param ModelProduct $configurableProduct
      * @param array $requiredAttributes
@@ -181,8 +196,8 @@ private function loadFirstVariation($attributeCode, ModelProduct $configurablePr
             $usedProducts = $configurableProduct->getTypeInstance()->getUsedProducts($configurableProduct);
 
             foreach ($usedProducts as $simpleProduct) {
-                if (!in_array($simpleProduct->getData($attributeCode), [null, self::EMPTY_IMAGE_VALUE], true)
-                    && !array_diff_assoc($requiredAttributes, $simpleProduct->getData())
+                if (!array_diff_assoc($requiredAttributes, $simpleProduct->getData())
+                    && $this->isMediaAvailable($simpleProduct, $attributeCode)
                 ) {
                     return $simpleProduct;
                 }
@@ -193,6 +208,8 @@ private function loadFirstVariation($attributeCode, ModelProduct $configurablePr
     }
 
     /**
+     * Load first variation with swatch image
+     *
      * @param Product $configurableProduct
      * @param array $requiredAttributes
      * @return bool|Product
@@ -203,6 +220,8 @@ public function loadFirstVariationWithSwatchImage(Product $configurableProduct,
     }
 
     /**
+     * Load first variation with image
+     *
      * @param Product $configurableProduct
      * @param array $requiredAttributes
      * @return bool|Product
@@ -221,7 +240,7 @@ public function loadFirstVariationWithImage(Product $configurableProduct, array
      */
     public function loadVariationByFallback(Product $parentProduct, array $attributes)
     {
-        if (! $this->isProductHasSwatch($parentProduct)) {
+        if (!$this->isProductHasSwatch($parentProduct)) {
             return false;
         }
 
@@ -258,6 +277,8 @@ public function loadVariationByFallback(Product $parentProduct, array $attribute
     }
 
     /**
+     * Add filter by attribute
+     *
      * @param ProductCollection $productCollection
      * @param array $attributes
      * @return void
@@ -270,6 +291,8 @@ private function addFilterByAttributes(ProductCollection $productCollection, arr
     }
 
     /**
+     * Add filter by parent
+     *
      * @param ProductCollection $productCollection
      * @param integer $parentId
      * @return void
@@ -288,6 +311,7 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
 
     /**
      * Method getting full media gallery for current Product
+     *
      * Array structure: [
      *  ['image'] => 'http://url/pub/media/catalog/product/2/0/blabla.jpg',
      *  ['mediaGallery'] => [
@@ -296,72 +320,77 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
      *      ...,
      *      ]
      * ]
+     *
      * @param ModelProduct $product
+     *
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getProductMediaGallery(ModelProduct $product)
+    public function getProductMediaGallery(ModelProduct $product): array
     {
-        if (!in_array($product->getData('image'), [null, self::EMPTY_IMAGE_VALUE], true)) {
-            $baseImage = $product->getData('image');
-        } else {
-            $productMediaAttributes = array_filter($product->getMediaAttributeValues(), function ($value) {
-                return $value !== self::EMPTY_IMAGE_VALUE && $value !== null;
-            });
-            foreach ($productMediaAttributes as $attributeCode => $value) {
-                if ($attributeCode !== 'swatch_image') {
-                    $baseImage = (string)$value;
-                    break;
-                }
+        $baseImage = null;
+        $gallery = [];
+
+        $mediaGallery = $product->getMediaGalleryEntries();
+        /** @var ProductAttributeMediaGalleryEntryInterface $mediaEntry */
+        foreach ($mediaGallery as $mediaEntry) {
+            if ($mediaEntry->isDisabled()) {
+                continue;
+            }
+            if (!$baseImage || $this->isMainImage($mediaEntry)) {
+                $baseImage = $mediaEntry;
             }
+
+            $gallery[$mediaEntry->getId()] = $this->collectImageData($mediaEntry);
         }
 
-        if (empty($baseImage)) {
+        if (!$baseImage) {
             return [];
         }
 
-        $resultGallery = $this->getAllSizeImages($product, $baseImage);
-        $resultGallery['gallery'] = $this->getGalleryImages($product);
+        $resultGallery = $this->collectImageData($baseImage);
+        $resultGallery['gallery'] = $gallery;
 
         return $resultGallery;
     }
 
     /**
-     * @param ModelProduct $product
-     * @return array
+     * Checks if image is main image in gallery
+     *
+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
+     * @return bool
      */
-    private function getGalleryImages(ModelProduct $product)
+    private function isMainImage(ProductAttributeMediaGalleryEntryInterface $mediaEntry): bool
     {
-        //TODO: remove after fix MAGETWO-48040
-        $product = $this->productRepository->getById($product->getId());
+        return in_array('image', $mediaEntry->getTypes(), true);
+    }
 
-        $result = [];
-        $mediaGallery = $product->getMediaGalleryImages();
-        foreach ($mediaGallery as $media) {
-            $result[$media->getData('value_id')] = $this->getAllSizeImages(
-                $product,
-                $media->getData('file')
-            );
-        }
-        return $result;
+    /**
+     * Returns image data for swatches
+     *
+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
+     * @return array
+     */
+    private function collectImageData(ProductAttributeMediaGalleryEntryInterface $mediaEntry): array
+    {
+        $image = $this->getAllSizeImages($mediaEntry->getFile());
+        $image[ProductAttributeMediaGalleryEntryInterface::POSITION] =  $mediaEntry->getPosition();
+        $image['isMain'] =$this->isMainImage($mediaEntry);
+        return $image;
     }
 
     /**
-     * @param ModelProduct $product
+     * Get all size images
+     *
      * @param string $imageFile
      * @return array
      */
-    private function getAllSizeImages(ModelProduct $product, $imageFile)
+    private function getAllSizeImages($imageFile)
     {
         return [
-            'large' => $this->imageHelper->init($product, 'product_page_image_large_no_frame')
-                ->setImageFile($imageFile)
-                ->getUrl(),
-            'medium' => $this->imageHelper->init($product, 'product_page_image_medium_no_frame')
-                ->setImageFile($imageFile)
-                ->getUrl(),
-            'small' => $this->imageHelper->init($product, 'product_page_image_small')
-                ->setImageFile($imageFile)
-                ->getUrl(),
+            'large' => $this->imageUrlBuilder->getUrl($imageFile, 'product_swatch_image_large'),
+            'medium' => $this->imageUrlBuilder->getUrl($imageFile, 'product_swatch_image_medium'),
+            'small' => $this->imageUrlBuilder->getUrl($imageFile, 'product_swatch_image_small')
         ];
     }
 
@@ -443,6 +472,7 @@ public function getSwatchesByOptionsId(array $optionIds)
             $swatchCollection->addFilterByOptionsIds($swatchOptionIds);
 
             $swatches = [];
+            $fallbackValues = [];
             $currentStoreId = $this->storeManager->getStore()->getId();
             foreach ($swatchCollection as $item) {
                 if ($item['type'] != Swatch::SWATCH_TYPE_TEXTUAL) {
@@ -489,6 +519,8 @@ private function setCachedSwatches(array $optionIds, array $swatches)
     }
 
     /**
+     * Add fallback options
+     *
      * @param array $fallbackValues
      * @param array $swatches
      * @return array
@@ -497,9 +529,13 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
     {
         $currentStoreId = $this->storeManager->getStore()->getId();
         foreach ($fallbackValues as $optionId => $optionsArray) {
-            if (isset($optionsArray[$currentStoreId])) {
+            if (isset($optionsArray[$currentStoreId]['type'], $swatches[$optionId]['type'])
+                && $swatches[$optionId]['type'] === $optionsArray[$currentStoreId]['type']
+            ) {
+                $swatches[$optionId] = $optionsArray[$currentStoreId];
+            } elseif (isset($optionsArray[$currentStoreId])) {
                 $swatches[$optionId] = $optionsArray[$currentStoreId];
-            } else {
+            } elseif (isset($optionsArray[self::DEFAULT_STORE_ID])) {
                 $swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];
             }
         }
@@ -515,8 +551,7 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
      */
     public function isProductHasSwatch(Product $product)
     {
-        $swatchAttributes = $this->getSwatchAttributes($product);
-        return count($swatchAttributes) > 0;
+        return !empty($this->getSwatchAttributes($product));
     }
 
     /**
@@ -527,8 +562,7 @@ public function isProductHasSwatch(Product $product)
      */
     public function isSwatchAttribute(Attribute $attribute)
     {
-        $result = $this->isVisualSwatch($attribute) || $this->isTextSwatch($attribute);
-        return $result;
+        return $this->swatchTypeChecker->isSwatchAttribute($attribute);
     }
 
     /**
@@ -539,10 +573,7 @@ public function isSwatchAttribute(Attribute $attribute)
      */
     public function isVisualSwatch(Attribute $attribute)
     {
-        if (!$attribute->hasData(Swatch::SWATCH_INPUT_TYPE_KEY)) {
-            $this->populateAdditionalDataEavAttribute($attribute);
-        }
-        return $attribute->getData(Swatch::SWATCH_INPUT_TYPE_KEY) == Swatch::SWATCH_INPUT_TYPE_VISUAL;
+        return $this->swatchTypeChecker->isVisualSwatch($attribute);
     }
 
     /**
@@ -553,10 +584,7 @@ public function isVisualSwatch(Attribute $attribute)
      */
     public function isTextSwatch(Attribute $attribute)
     {
-        if (!$attribute->hasData(Swatch::SWATCH_INPUT_TYPE_KEY)) {
-            $this->populateAdditionalDataEavAttribute($attribute);
-        }
-        return $attribute->getData(Swatch::SWATCH_INPUT_TYPE_KEY) == Swatch::SWATCH_INPUT_TYPE_TEXT;
+        return $this->swatchTypeChecker->isTextSwatch($attribute);
     }
 
     /**
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
index c04b0ca945cec..f3694515ecb26 100644
--- a/app/code/Magento/Swatches/Helper/Media.php
+++ b/app/code/Magento/Swatches/Helper/Media.php
@@ -68,9 +68,9 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
     protected $swatchImageTypes = ['swatch_image', 'swatch_thumb'];
 
     /**
-     * @var \Magento\Theme\Model\ResourceModel\Theme\Collection
+     * @var array
      */
-    private $registeredThemesCache;
+    private $imageConfig;
 
     /**
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
@@ -211,7 +211,7 @@ protected function setupImageProperties(\Magento\Framework\Image $image, $isSwat
         if ($isSwatch) {
             $image->keepFrame(true);
             $image->keepTransparency(true);
-            $image->backgroundColor('#FFF');
+            $image->backgroundColor([255, 255, 255]);
         }
         return $this;
     }
@@ -256,18 +256,14 @@ public function getFolderNameSize($swatchType, $imageConfig = null)
      */
     public function getImageConfig()
     {
-        $imageConfig = [];
-        foreach ($this->getRegisteredThemes() as $theme) {
-            $config = $this->viewConfig->getViewConfig([
-                'area' => Area::AREA_FRONTEND,
-                'themeModel' => $theme,
-            ]);
-            $imageConfig = array_merge(
-                $imageConfig,
-                $config->getMediaEntities('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE)
+        if (!$this->imageConfig) {
+            $this->imageConfig = $this->viewConfig->getViewConfig()->getMediaEntities(
+                'Magento_Catalog',
+                Image::MEDIA_TYPE_CONFIG_NODE
             );
         }
-        return $imageConfig;
+
+        return $this->imageConfig;
     }
 
     /**
@@ -338,16 +334,4 @@ protected function prepareFile($file)
     {
         return ltrim(str_replace('\\', '/', $file), '/');
     }
-
-    /**
-     * @return \Magento\Theme\Model\ResourceModel\Theme\Collection
-     */
-    private function getRegisteredThemes()
-    {
-        if ($this->registeredThemesCache === null) {
-            $this->registeredThemesCache = $this->themeCollection->loadRegisteredThemes();
-        }
-
-        return $this->registeredThemesCache;
-    }
 }
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
index 599406f455281..ebbb1775aa7f8 100644
--- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Swatches\Model\ResourceModel\Swatch as SwatchResource;
 use Magento\Swatches\Model\Swatch;
 
 /**
@@ -18,6 +19,11 @@ class EavAttribute
 {
     const DEFAULT_STORE_ID = 0;
 
+    /**
+     * @var SwatchResource
+     */
+    private $swatchResource;
+
     /**
      * Base option title used for string operations to detect is option already exists or new
      */
@@ -64,17 +70,20 @@ class EavAttribute
      * @param \Magento\Swatches\Model\SwatchFactory $swatchFactory
      * @param \Magento\Swatches\Helper\Data $swatchHelper
      * @param Json|null $serializer
+     * @param SwatchResource|null $swatchResource
      */
     public function __construct(
         \Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory $collectionFactory,
         \Magento\Swatches\Model\SwatchFactory $swatchFactory,
         \Magento\Swatches\Helper\Data $swatchHelper,
-        Json $serializer = null
+        Json $serializer = null,
+        SwatchResource $swatchResource = null
     ) {
         $this->swatchCollectionFactory = $collectionFactory;
         $this->swatchFactory = $swatchFactory;
         $this->swatchHelper = $swatchHelper;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->create(Json::class);
+        $this->swatchResource = $swatchResource ?: ObjectManager::getInstance()->create(SwatchResource::class);
     }
 
     /**
@@ -148,6 +157,7 @@ protected function setProperOptionsArray(Attribute $attribute)
      * Prepare attribute for conversion from any swatch type to dropdown
      *
      * @param Attribute $attribute
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
      */
     protected function convertSwatchToDropdown(Attribute $attribute)
@@ -157,6 +167,8 @@ protected function convertSwatchToDropdown(Attribute $attribute)
             if (!empty($additionalData)) {
                 $additionalData = $this->serializer->unserialize($additionalData);
                 if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {
+                    $option = $attribute->getOption() ?: [];
+                    $this->cleanEavAttributeOptionSwatchValues($option);
                     unset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY]);
                     $attribute->setData('additional_data', $this->serializer->serialize($additionalData));
                 }
@@ -235,6 +247,8 @@ protected function saveSwatchParams(Attribute $attribute)
     {
         if ($this->swatchHelper->isVisualSwatch($attribute)) {
             $this->processVisualSwatch($attribute);
+            $attributeOptions = $attribute->getOptiontext() ?: [];
+            $this->cleanTextSwatchValuesAfterSwitch($attributeOptions);
         } elseif ($this->swatchHelper->isTextSwatch($attribute)) {
             $this->processTextualSwatch($attribute);
         }
@@ -267,6 +281,33 @@ protected function processVisualSwatch(Attribute $attribute)
         }
     }
 
+    /**
+     * Clean swatch option values after switching to the dropdown type.
+     *
+     * @param array $attributeOptions
+     * @param int|null  $swatchType
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function cleanEavAttributeOptionSwatchValues(array $attributeOptions, int $swatchType = null)
+    {
+        if (count($attributeOptions) && isset($attributeOptions['value'])) {
+            $optionsIDs = array_keys($attributeOptions['value']);
+
+            $this->swatchResource->clearSwatchOptionByOptionIdAndType($optionsIDs, $swatchType);
+        }
+    }
+
+    /**
+     * Cleaning the text type of swatch option values after switching.
+     *
+     * @param array $attributeOptions
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function cleanTextSwatchValuesAfterSwitch(array $attributeOptions)
+    {
+        $this->cleanEavAttributeOptionSwatchValues($attributeOptions, Swatch::SWATCH_TYPE_TEXTUAL);
+    }
+
     /**
      * @param string $value
      * @return int
@@ -432,7 +473,7 @@ protected function validateOptions(Attribute $attribute)
             $options = $attribute->getData('optiontext');
         }
         if ($options && !$this->isOptionsValid($options, $attribute)) {
-            throw new InputException(__('Admin is a required field in the each row'));
+            throw new InputException(__('Admin is a required field in each row'));
         }
         return true;
     }
diff --git a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
index 0569a249260f6..24f15185341dc 100644
--- a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
+++ b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
@@ -5,6 +5,15 @@
  */
 namespace Magento\Swatches\Model\Plugin;
 
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Swatches\Helper\Data;
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\Request\Http;
+use Magento\Catalog\Block\Product\AbstractProduct;
+use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
 /**
  * Class ProductImage replace original configurable product with first child
  */
@@ -20,29 +29,29 @@ class ProductImage
     /**
      * Data helper to get child product image
      *
-     * @var \Magento\Swatches\Helper\Data $productHelper
+     * @var Data $productHelper
      */
     protected $swatchHelperData;
 
     /**
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     protected $eavConfig;
 
     /**
-     * @var \Magento\Framework\App\Request\Http
+     * @var Http
      */
     protected $request;
 
     /**
-     * @param \Magento\Swatches\Helper\Data $swatchesHelperData
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\App\Request\Http $request
+     * @param Data $swatchesHelperData
+     * @param Config $eavConfig
+     * @param Http $request
      */
     public function __construct(
-        \Magento\Swatches\Helper\Data $swatchesHelperData,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\App\Request\Http $request
+        Data $swatchesHelperData,
+        Config $eavConfig,
+        Http $request
     ) {
         $this->swatchHelperData = $swatchesHelperData;
         $this->eavConfig = $eavConfig;
@@ -53,23 +62,23 @@ public function __construct(
      * Replace original configurable product with first child
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @param \Magento\Catalog\Block\Product\AbstractProduct $subject
-     * @param \Magento\Catalog\Model\Product $product
+     * @param AbstractProduct $subject
+     * @param ProductModel $product
      * @param string $location
      * @param array $attributes
      * @return array
      */
     public function beforeGetImage(
-        \Magento\Catalog\Block\Product\AbstractProduct $subject,
-        \Magento\Catalog\Model\Product $product,
+        AbstractProduct $subject,
+        ProductModel $product,
         $location,
         array $attributes = []
     ) {
-        if ($product->getTypeId() == \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE
+        if ($product->getTypeId() == Configurable::TYPE_CODE
             && ($location == self::CATEGORY_PAGE_GRID_LOCATION || $location == self::CATEGORY_PAGE_LIST_LOCATION)) {
             $request = $this->request->getParams();
             if (is_array($request)) {
-                $filterArray = $this->getFilterArray($request);
+                $filterArray = $this->getFilterArray($request, $product);
                 if (!empty($filterArray)) {
                     $product = $this->loadSimpleVariation($product, $filterArray);
                 }
@@ -79,11 +88,11 @@ public function beforeGetImage(
     }
 
     /**
-     * @param \Magento\Catalog\Model\Product $parentProduct
+     * @param Product $parentProduct
      * @param array $filterArray
-     * @return bool|\Magento\Catalog\Model\Product
+     * @return bool|Product
      */
-    protected function loadSimpleVariation(\Magento\Catalog\Model\Product $parentProduct, array $filterArray)
+    private function loadSimpleVariation(Product $parentProduct, array $filterArray)
     {
         $childProduct = $this->swatchHelperData->loadVariationByFallback($parentProduct, $filterArray);
         if ($childProduct && !$childProduct->getImage()) {
@@ -99,16 +108,17 @@ protected function loadSimpleVariation(\Magento\Catalog\Model\Product $parentPro
      * Get filters from request
      *
      * @param array $request
+     * @param \Magento\Catalog\Model\Product $product
      * @return array
      */
-    protected function getFilterArray(array $request)
+    private function getFilterArray(array $request, Product $product)
     {
         $filterArray = [];
-        $attributeCodes = $this->eavConfig->getEntityAttributeCodes(\Magento\Catalog\Model\Product::ENTITY);
+        $attributes = $this->eavConfig->getEntityAttributes(Product::ENTITY, $product);
         foreach ($request as $code => $value) {
-            if (in_array($code, $attributeCodes)) {
-                $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $code);
-                if ($attribute->getId() && $this->canReplaceImageWithSwatch($attribute)) {
+            if (isset($attributes[$code])) {
+                $attribute = $attributes[$code];
+                if ($this->canReplaceImageWithSwatch($attribute)) {
                     $filterArray[$code] = $value;
                 }
             }
@@ -119,10 +129,10 @@ protected function getFilterArray(array $request)
     /**
      * Check if we can replace original image with swatch image on catalog/category/list page
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
+     * @param Attribute $attribute
      * @return bool
      */
-    protected function canReplaceImageWithSwatch($attribute)
+    private function canReplaceImageWithSwatch($attribute)
     {
         $result = true;
         if (!$this->swatchHelperData->isSwatchAttribute($attribute)) {
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index 22eb1d4c7eef9..9dc5b3a0c816f 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -37,4 +37,24 @@ public function saveDefaultSwatchOption($id, $defaultValue)
             $this->getConnection()->update($this->getTable('eav_attribute'), $bind, $where);
         }
     }
+
+    /**
+     * Cleaned swatch option values when switching to dropdown input type.
+     *
+     * @param array $optionIDs
+     * @param int $type
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
+    {
+        if (count($optionIDs)) {
+            foreach ($optionIDs as $optionId) {
+                $where = ['option_id' => $optionId];
+                if ($type !== null) {
+                    $where['type = ?'] = $type;
+                }
+                $this->getConnection()->delete($this->getMainTable(), $where);
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/Swatches/Model/SwatchAttributeType.php b/app/code/Magento/Swatches/Model/SwatchAttributeType.php
new file mode 100644
index 0000000000000..09b2031bdbdd3
--- /dev/null
+++ b/app/code/Magento/Swatches/Model/SwatchAttributeType.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Model;
+
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Class contains swatch attribute helper methods.
+ */
+class SwatchAttributeType
+{
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * Data key which should populated to Attribute entity from "additional_data" field
+     *
+     * @var array
+     */
+    private $eavAttributeAdditionalDataKeys = [
+        Swatch::SWATCH_INPUT_TYPE_KEY,
+        'update_product_preview_image',
+        'use_product_image_for_swatch',
+    ];
+
+    /**
+     * @param Json $serializer
+     */
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Checks if attribute is Textual Swatch.
+     *
+     * @param AttributeInterface $productAttribute
+     * @return bool
+     */
+    public function isTextSwatch(AttributeInterface $productAttribute): bool
+    {
+        $this->populateAdditionalDataEavAttribute($productAttribute);
+
+        return $productAttribute->getData(Swatch::SWATCH_INPUT_TYPE_KEY) === Swatch::SWATCH_INPUT_TYPE_TEXT;
+    }
+
+    /**
+     * Checks if attribute is Visual Swatch.
+     *
+     * @param AttributeInterface $productAttribute
+     * @return bool
+     */
+    public function isVisualSwatch(AttributeInterface $productAttribute): bool
+    {
+        $this->populateAdditionalDataEavAttribute($productAttribute);
+
+        return $productAttribute->getData(Swatch::SWATCH_INPUT_TYPE_KEY) === Swatch::SWATCH_INPUT_TYPE_VISUAL;
+    }
+
+    /**
+     * Checks if an attribute is Swatch.
+     *
+     * @param AttributeInterface $productAttribute
+     * @return bool
+     */
+    public function isSwatchAttribute(AttributeInterface $productAttribute): bool
+    {
+        return $this->isTextSwatch($productAttribute) || $this->isVisualSwatch($productAttribute);
+    }
+
+    /**
+     * Unserializes attribute additional data and sets it to attribute object.
+     *
+     * @param AttributeInterface $attribute
+     * @return void
+     */
+    private function populateAdditionalDataEavAttribute(AttributeInterface $attribute): void
+    {
+        if (!$attribute->hasData(Swatch::SWATCH_INPUT_TYPE_KEY)) {
+            $serializedAdditionalData = $attribute->getData('additional_data');
+            if ($serializedAdditionalData) {
+                $additionalData = $this->serializer->unserialize($serializedAdditionalData);
+                if ($additionalData !== null && is_array($additionalData)) {
+                    foreach ($this->eavAttributeAdditionalDataKeys as $key) {
+                        if (isset($additionalData[$key])) {
+                            $attribute->setData($key, $additionalData[$key]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php b/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
index d5a1b402c9fd3..f01a75a466dfd 100644
--- a/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
+++ b/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
@@ -8,6 +8,8 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Catalog\Model\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Provide list of swatch attributes for product.
@@ -30,16 +32,25 @@ class SwatchAttributesProvider
      */
     private $attributesPerProduct;
 
+    /**
+     * @var SwatchAttributeType
+     */
+    private $swatchTypeChecker;
+
     /**
      * @param Configurable $typeConfigurable
      * @param SwatchAttributeCodes $swatchAttributeCodes
+     * @param SwatchAttributeType|null $swatchTypeChecker
      */
     public function __construct(
         Configurable $typeConfigurable,
-        SwatchAttributeCodes $swatchAttributeCodes
+        SwatchAttributeCodes $swatchAttributeCodes,
+        SwatchAttributeType $swatchTypeChecker = null
     ) {
         $this->typeConfigurable = $typeConfigurable;
         $this->swatchAttributeCodes = $swatchAttributeCodes;
+        $this->swatchTypeChecker = $swatchTypeChecker
+            ?: ObjectManager::getInstance()->create(SwatchAttributeType::class);
     }
 
     /**
@@ -61,8 +72,13 @@ public function provide(Product $product)
             $swatchAttributes = [];
             foreach ($configurableAttributes as $configurableAttribute) {
                 if (array_key_exists($configurableAttribute->getAttributeId(), $swatchAttributeCodeMap)) {
-                    $swatchAttributes[$configurableAttribute->getAttributeId()]
-                        = $configurableAttribute->getProductAttribute();
+                    /** @var AbstractAttribute $productAttribute */
+                    $productAttribute = $configurableAttribute->getProductAttribute();
+                    if ($productAttribute !== null
+                        && $this->swatchTypeChecker->isSwatchAttribute($productAttribute)
+                    ) {
+                        $swatchAttributes[$configurableAttribute->getAttributeId()] = $productAttribute;
+                    }
                 }
             }
             $this->attributesPerProduct[$product->getId()] = $swatchAttributes;
diff --git a/app/code/Magento/Swatches/Plugin/Eav/System/Config/Source/InputtypePlugin.php b/app/code/Magento/Swatches/Plugin/Eav/System/Config/Source/InputtypePlugin.php
new file mode 100644
index 0000000000000..37de7a4e5e63b
--- /dev/null
+++ b/app/code/Magento/Swatches/Plugin/Eav/System/Config/Source/InputtypePlugin.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swatches\Plugin\Eav\System\Config\Source;
+
+/**
+ * Plugin for \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype
+ *
+ * @package Magento\Swatches\Plugin\Eav\System\Config\Source
+ */
+class InputtypePlugin
+{
+    /**
+     * Append result with additional compatible input types.
+     *
+     * @param \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetVolatileInputTypes(
+        \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype $subject,
+        array $result
+    ) {
+        $result = array_merge($result, [['select', 'swatch_visual', 'swatch_text']]);
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Swatches/Setup/InstallData.php b/app/code/Magento/Swatches/Setup/InstallData.php
deleted file mode 100644
index eab2fd68607bd..0000000000000
--- a/app/code/Magento/Swatches/Setup/InstallData.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Swatches\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Eav\Setup\EavSetup;
-
-/**
- * Class InstallData
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param EavSetupFactory $eavSetupFactory
-     */
-    public function __construct(EavSetupFactory $eavSetupFactory)
-    {
-        $this->eavSetupFactory = $eavSetupFactory;
-    }
-
-    /**
-     * Install new Swatch entity
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var EavSetup $eavSetup */
-        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-
-        /**
-         * Install eav entity types to the eav/entity_type table
-         */
-        $eavSetup->addAttribute(
-            'catalog_product',
-            'swatch_image',
-            [
-                'type' => 'varchar',
-                'label' => 'Swatch',
-                'input' => 'media_image',
-                'frontend' => \Magento\Catalog\Model\Product\Attribute\Frontend\Image::class,
-                'required' => false,
-                'sort_order' => 3,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
-                'used_in_product_listing' => true
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/Swatches/Setup/InstallSchema.php b/app/code/Magento/Swatches/Setup/InstallSchema.php
deleted file mode 100644
index 2ba29c8ba46f3..0000000000000
--- a/app/code/Magento/Swatches/Setup/InstallSchema.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Swatches\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Class InstallSchema adds new table `eav_attribute_option_swatch`
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $contextInterface)
-    {
-        $setup->startSetup();
-
-        $swatchTable = $setup->getTable('eav_attribute_option_swatch');
-
-        /** Creating the main_table 'eav_attribute_option_swatch' */
-        $table = $setup->getConnection()
-            ->newTable($swatchTable)
-            ->addColumn(
-                'swatch_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Swatch ID'
-            )
-            ->addColumn(
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false],
-                'Option ID'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false],
-                'Store ID'
-            )
-            ->addColumn(
-                'type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false],
-                'Swatch type: 0 - text, 1 - visual color, 2 - visual image'
-            )
-            ->addColumn(
-                'value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                ['identity' => false, 'unsigned' => false, 'nullable' => true, 'primary' => false],
-                'Swatch Value'
-            )
-            ->addIndex(
-                $setup->getIdxName($swatchTable, ['swatch_id']),
-                ['swatch_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
-            )
-            ->addIndex(
-                $setup->getIdxName(
-                    $swatchTable,
-                    ['store_id', 'option_id'],
-                    true
-                ),
-                ['store_id', 'option_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addForeignKey(
-                $setup->getFkName($swatchTable, 'store_id', 'store', 'store_id'),
-                'store_id',
-                $setup->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->addForeignKey(
-                $setup->getFkName($swatchTable, 'option_id', 'eav_attribute_option', 'option_id'),
-                'option_id',
-                $setup->getTable('eav_attribute_option'),
-                'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
-            ->setComment('Magento Swatches table');
-
-        if (!$setup->getConnection()->tableColumnExists($setup->getTable('catalog_eav_attribute'), 'additional_data')) {
-            $setup->getConnection()
-                ->addColumn(
-                    $setup->getTable('catalog_eav_attribute'),
-                    'additional_data',
-                    [
-                        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                        'default' => null,
-                        'nullable' => true,
-                        'comment' => 'Additional swatch attributes data',
-                    ]
-                );
-        }
-
-        $setup->getConnection()->createTable($table);
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php
new file mode 100644
index 0000000000000..2dbfeba3a2e67
--- /dev/null
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Setup\Patch\Data;
+
+use Magento\Catalog\Model\Product\Attribute\Frontend\Image;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddSwatchImageAttribute
+ * @package Magento\Swatches\Setup\Patch
+ */
+class AddSwatchImageAttribute implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * AddSwatchImageAttribute constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        /**
+         * Install eav entity types to the eav/entity_type table
+         */
+        $eavSetup->addAttribute(
+            'catalog_product',
+            'swatch_image',
+            [
+                'type' => 'varchar',
+                'label' => 'Swatch',
+                'input' => 'media_image',
+                'frontend' => Image::class,
+                'required' => false,
+                'sort_order' => 3,
+                'global' => ScopedAttributeInterface::SCOPE_STORE,
+                'used_in_product_listing' => true
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php
new file mode 100644
index 0000000000000..ca5a0d38e15c3
--- /dev/null
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Setup\Patch\Data;
+
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddSwatchImageToDefaultAttribtueSet
+ * @package Magento\Swatches\Setup\Patch
+ */
+class AddSwatchImageToDefaultAttribtueSet implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $attributeSetId = $eavSetup->getDefaultAttributeSetId(Product::ENTITY);
+        $groupId = (int)$eavSetup->getAttributeGroupByCode(
+            Product::ENTITY,
+            $attributeSetId,
+            'image-management',
+            'attribute_group_id'
+        );
+        $eavSetup->addAttributeToGroup(Product::ENTITY, $attributeSetId, $groupId, 'swatch_image');
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddSwatchImageAttribute::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php b/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php
new file mode 100644
index 0000000000000..0a37e846c8f77
--- /dev/null
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertAdditionalDataToJson
+ * @package Magento\Swatches\Setup\Patch
+ */
+class ConvertAdditionalDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * ConvertAdditionalDataToJson constructor.
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        FieldDataConverterFactory $fieldDataConverterFactory,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->convertAddDataToJson();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateAdminTextSwatchValues::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert serialized additional data to json.
+     */
+    private function convertAddDataToJson()
+    {
+        $fieldConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $fieldConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('catalog_eav_attribute'),
+            'attribute_id',
+            'additional_data'
+        );
+    }
+}
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php b/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php
new file mode 100644
index 0000000000000..d63fbf1425648
--- /dev/null
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Swatches\Setup\Patch\Data;
+
+use Magento\Store\Model\Store;
+use Magento\Swatches\Model\Swatch;
+use Zend_Db;
+use Zend_Db_Expr;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateAdminTextSwatchValues
+ * @package Magento\Swatches\Setup\Patch
+ */
+class UpdateAdminTextSwatchValues implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * UpdateAdminTextSwatchValues constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->updateAdminTextSwatchValues();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddSwatchImageToDefaultAttribtueSet::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Update text swatch values for admin panel.
+     */
+    private function updateAdminTextSwatchValues()
+    {
+        $connection = $this->moduleDataSetup->getConnection();
+        $storeData = $connection
+            ->select()
+            ->from($this->moduleDataSetup->getTable('store'))
+            ->where(Store::STORE_ID . "<> ? ", Store::DEFAULT_STORE_ID)
+            ->order("sort_order desc")
+            ->limit(1)
+            ->query(Zend_Db::FETCH_ASSOC)
+            ->fetch();
+
+        if (is_array($storeData)) {
+
+            /**
+             * update eav_attribute_option_swatch as s
+             * left join eav_attribute_option_swatch as ls on ls.option_id = s.option_id and ls.store_id = 1
+             * set
+             *
+             * s.value = ls.value
+             * where s.store_id = 0 and s.`type` = 0 and s.value = ""
+             */
+
+            /** @var \Magento\Framework\DB\Select $select */
+            $select = $connection
+                ->select()
+                ->joinLeft(
+                    ["ls" => $this->moduleDataSetup->getTable('eav_attribute_option_swatch')],
+                    new Zend_Db_Expr("ls.option_id = s.option_id AND ls.store_id = " . $storeData[Store::STORE_ID]),
+                    ["value"]
+                )
+                ->where("s.store_id = ? ", Store::DEFAULT_STORE_ID)
+                ->where("s.type = ? ", Swatch::SWATCH_TYPE_TEXTUAL)
+                ->where("s.value = ?  or s.value is null", "");
+
+            $connection->query(
+                $connection->updateFromSelect(
+                    $select,
+                    ["s" => $this->moduleDataSetup->getTable('eav_attribute_option_swatch')]
+                )
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Swatches/Setup/UpgradeData.php b/app/code/Magento/Swatches/Setup/UpgradeData.php
deleted file mode 100644
index 880422a371abd..0000000000000
--- a/app/code/Magento/Swatches/Setup/UpgradeData.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Swatches\Setup;
-
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Catalog\Model\Product;
-use Magento\Store\Model\Store;
-use Magento\Swatches\Model\Swatch;
-use Zend_Db;
-use Zend_Db_Expr;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\App\ObjectManager;
-
-/**
- * Upgrade Data script
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * EAV setup factory
-     *
-     * @var EavSetupFactory
-     */
-    private $eavSetupFactory;
-
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * Init
-     * @param EavSetupFactory $eavSetupFactory
-     * @param FieldDataConverterFactory|null $fieldDataConverterFactory
-     */
-    public function __construct(
-        EavSetupFactory $eavSetupFactory,
-        FieldDataConverterFactory $fieldDataConverterFactory = null
-    ) {
-        $this->eavSetupFactory = $eavSetupFactory;
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory
-            ?: ObjectManager::getInstance()->get(FieldDataConverterFactory::class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
-            $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-            $attributeSetId = $eavSetup->getDefaultAttributeSetId(Product::ENTITY);
-            $groupId = (int)$eavSetup->getAttributeGroupByCode(
-                Product::ENTITY,
-                $attributeSetId,
-                'image-management',
-                'attribute_group_id'
-            );
-            $eavSetup->addAttributeToGroup(Product::ENTITY, $attributeSetId, $groupId, 'swatch_image');
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $this->updateAdminTextSwatchValues($setup);
-        }
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $this->convertAddDataToJson($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Add fallback for default scope.
-     *
-     * @param ModuleDataSetupInterface $setup
-     *
-     * @return void
-     */
-    private function updateAdminTextSwatchValues(ModuleDataSetupInterface $setup)
-    {
-        $storeData = $setup->getConnection()
-            ->select()
-            ->from($setup->getTable('store'))
-            ->where(Store::STORE_ID . "<> ? ", Store::DEFAULT_STORE_ID)
-            ->order("sort_order desc")
-            ->limit(1)
-            ->query(Zend_Db::FETCH_ASSOC)
-            ->fetch();
-
-        if (is_array($storeData)) {
-
-            /**
-             * update eav_attribute_option_swatch as s
-             * left join eav_attribute_option_swatch as ls on ls.option_id = s.option_id and ls.store_id = 1
-             * set
-             *
-             * s.value = ls.value
-             * where s.store_id = 0 and s.`type` = 0 and s.value = ""
-             */
-
-            /** @var \Magento\Framework\DB\Select $select */
-            $select = $setup->getConnection()
-                ->select()
-                ->joinLeft(
-                    ["ls" => $setup->getTable('eav_attribute_option_swatch')],
-                    new Zend_Db_Expr("ls.option_id = s.option_id AND ls.store_id = " . $storeData[Store::STORE_ID]),
-                    ["value"]
-                )
-                ->where("s.store_id = ? ", Store::DEFAULT_STORE_ID)
-                ->where("s.type = ? ", Swatch::SWATCH_TYPE_TEXTUAL)
-                ->where("s.value = ?  or s.value is null", "");
-
-            $setup->getConnection()->query(
-                $setup->getConnection()->updateFromSelect(
-                    $select,
-                    ["s" => $setup->getTable('eav_attribute_option_swatch')]
-                )
-            );
-        }
-    }
-
-    /**
-     * Convert additional data column from serialized view to JSON for swatch attributes.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function convertAddDataToJson(ModuleDataSetupInterface $setup)
-    {
-        $fieldConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-        $fieldConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('catalog_eav_attribute'),
-            'attribute_id',
-            'additional_data'
-        );
-    }
-}
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
new file mode 100644
index 0000000000000..60a8035dedeca
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="AddVisualSwatchToProductActionGroup">
+        <arguments>
+            <argument name="attribute" defaultValue="visualSwatchAttribute"/>
+            <argument name="option1" defaultValue="visualSwatchOption1"/>
+            <argument name="option2" defaultValue="visualSwatchOption2"/>
+        </arguments>
+
+        <seeInCurrentUrl url="{{ProductCatalogPage.url}}" stepKey="seeOnProductEditPage"/>
+        <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="openConfigurationPanel"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForSlideOut"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <waitForPageLoad stepKey="waitForIFrame"/>
+
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{attribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="{{attribute.input_type}}" stepKey="selectInputType"/>
+        <!--Add swatch options-->
+        <click selector="{{AdminNewAttributePanel.addVisualSwatchOption}}" stepKey="clickAddSwatch1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.visualSwatchOptionAdminValue('0')}}" stepKey="waitForOption1Row"/>
+        <fillField selector="{{AdminNewAttributePanel.visualSwatchOptionAdminValue('0')}}" userInput="{{option1.admin_label}}" stepKey="fillAdminLabel1"/>
+        <fillField selector="{{AdminNewAttributePanel.visualSwatchOptionDefaultStoreValue('0')}}" userInput="{{option1.default_label}}" stepKey="fillDefaultStoreLabel1"/>
+        <click selector="{{AdminNewAttributePanel.addVisualSwatchOption}}" stepKey="clickAddSwatch2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.visualSwatchOptionAdminValue('1')}}" stepKey="waitForOption2Row"/>
+        <fillField selector="{{AdminNewAttributePanel.visualSwatchOptionAdminValue('1')}}" userInput="{{option2.admin_label}}" stepKey="fillAdminLabel2"/>
+        <fillField selector="{{AdminNewAttributePanel.visualSwatchOptionDefaultStoreValue('1')}}" userInput="{{option2.default_label}}" stepKey="fillDefaultStoreLabel2"/>
+
+        <!--Save attribute-->
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+
+        <!--Find attribute in grid and select-->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.attributeCodeFilterInput}}" userInput="{{attribute.default_label}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep1"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(attribute.default_label)}}" stepKey="clickSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep2"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextStep3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml
new file mode 100644
index 0000000000000..6f991274a015b
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="setColorPickerByHex">
+        <arguments>
+            <argument name="nthColorPicker" type="string" defaultValue="1"/>
+            <argument name="hexColor" type="string" defaultValue="e74c3c"/>
+        </arguments>
+        <!-- This 6x backspace stuff is some magic that is necessary to interact with this field correctly -->
+        <pressKey selector="{{AdminColorPickerSection.hexByIndex(nthColorPicker)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,'{{hexColor}}']" stepKey="fillHex1"/>
+        <click selector="{{AdminColorPickerSection.submitByIndex(nthColorPicker)}}" stepKey="submitColor1"/>
+    </actionGroup>
+    <actionGroup name="assertSwatchColor">
+        <arguments>
+            <argument name="nthSwatch" type="string" defaultValue="1"/>
+            <argument name="expectedStyle" type="string" defaultValue="background: rgb(0, 0, 0);"/>
+        </arguments>
+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch(nthSwatch)}}" userInput="style" stepKey="grabStyle1"/>
+        <assertEquals stepKey="assertStyle1">
+            <actualResult type="string">{$grabStyle1}</actualResult>
+            <expectedResult type="string">{{expectedStyle}}</expectedResult>
+        </assertEquals>
+    </actionGroup>
+    <actionGroup name="assertStorefrontSwatchColor">
+        <arguments>
+            <argument name="nthSwatch" type="string" defaultValue="1"/>
+            <argument name="expectedRgb" type="string" defaultValue="rgb(231, 77, 60)"/>
+        </arguments>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption(nthSwatch)}}" userInput="style" stepKey="grabStyle1"/>
+        <assertEquals stepKey="assertStyle1">
+            <actualResult type="string">{$grabStyle1}</actualResult>
+            <expectedResult type="string">background: center center no-repeat {{expectedRgb}};</expectedResult>
+        </assertEquals>
+    </actionGroup>
+    <actionGroup name="openSwatchMenuByIndex">
+        <arguments>
+            <argument name="index" type="string" defaultValue="0"/>
+        </arguments>
+        <!-- I had to use executeJS to perform the click to get around the use of CSS ::before and ::after -->
+        <executeJS function="jQuery('#swatch_window_option_option_{{index}}').click()" stepKey="clickSwatch1"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
new file mode 100644
index 0000000000000..d7ee6dabce7ed
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="visualSwatchAttribute" type="SwatchAttribute">
+        <data key="default_label" unique="suffix">VisualSwatchAttr</data>
+        <data key="input_type">Visual Swatch</data>
+        <data key="attribute_code" unique="suffix">visual_swatch_attr</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
new file mode 100644
index 0000000000000..4608d1a9190a9
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="visualSwatchOption1" type="SwatchOption">
+        <data key="admin_label" unique="suffix">VisualOpt1</data>
+        <data key="default_label" unique="suffix">VisualOpt1</data>
+    </entity>
+
+    <entity name="visualSwatchOption2" type="SwatchOption">
+        <data key="admin_label" unique="suffix">VisualOpt2</data>
+        <data key="default_label" unique="suffix">VisualOpt2</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE.txt b/app/code/Magento/Swatches/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE.txt
rename to app/code/Magento/Swatches/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE_AFL.txt b/app/code/Magento/Swatches/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE_AFL.txt
rename to app/code/Magento/Swatches/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Swatches/Test/Mftf/README.md b/app/code/Magento/Swatches/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1bb664cc52d7a
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swatches Functional Tests
+
+The Functional Test Module for **Magento Swatches** module.
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
new file mode 100644
index 0000000000000..50d56d64bb67b
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminColorPickerSection">
+        <element name="hexByIndex" type="input" selector="//div[@class='colorpicker'][{{var}}]/div[@class='colorpicker_hex']/input" parameterized="true"/>
+        <element name="submitByIndex" type="button" selector="//div[@class='colorpicker'][{{var}}]/div[@class='colorpicker_submit']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
new file mode 100644
index 0000000000000..c3ef0a7324bfd
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminManageSwatchSection">
+        <element name="adminInputByIndex" type="input" selector="optionvisual[value][option_{{var}}][0]" parameterized="true"/>
+        <element name="addSwatch" type="button" selector="#add_new_swatch_visual_option_button" timeout="30"/>
+        <element name="nthSwatch" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_window" parameterized="true"/>
+        <element name="addSwatchText" type="button" selector="#add_new_swatch_text_option_button"/>
+        <element name="swatchTextByIndex" type="input" selector="input[name='swatchtext[value][option_{{index}}][0]']" parameterized="true"/>
+        <element name="nthSwatchText" type="input" selector="#swatch-text-options-panel table tbody tr:nth-of-type({{var}}) td:nth-of-type(3) input" parameterized="true"/>
+        <element name="nthIsDefault" type="input" selector="(//input[@name='defaultvisual[]'])[{{var}}]" parameterized="true"/>
+        <element name="nthSwatchAdminDescription" type="input" selector="#swatch-text-options-panel table tbody tr:nth-of-type({{var}}) td:nth-of-type(4) input" parameterized="true"/>
+        <!-- Selector for Admin Description input where the index is zero-based -->
+        <element name="swatchAdminDescriptionByIndex" type="input" selector="input[name='optiontext[value][option_{{index}}][0]']" parameterized="true"/>
+        <element name="nthChooseColor" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_row_name.colorpicker_handler" parameterized="true"/>
+        <element name="nthUploadFile" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_row_name.btn_choose_file_upload" parameterized="true"/>
+        <element name="nthDelete" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) button.delete-option" parameterized="true"/>
+        <element name="deleteBtn" type="button" selector="#manage-options-panel:nth-of-type({{var}}) button.delete-option" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
new file mode 100644
index 0000000000000..adefce9182724
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewAttributePanel">
+        <element name="addVisualSwatchOption" type="button" selector="button#add_new_swatch_visual_option_button"/>
+        <element name="addTextSwatchOption" type="button" selector="button#add_new_swatch_text_option_button"/>
+        <element name="visualSwatchOptionAdminValue" type="input" selector="[data-role='swatch-visual-options-container'] input[name='optionvisual[value][option_{{row}}][0]']" parameterized="true"/>
+        <element name="visualSwatchOptionDefaultStoreValue" type="input" selector="[data-role='swatch-visual-options-container'] input[name='optionvisual[value][option_{{row}}][1]']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategorySidebarSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
new file mode 100644
index 0000000000000..43746fc08a0da
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategorySidebarSection">
+        <element name="layeredFilterBlock" type="block" selector="#layered-filter-block"/>
+        <element name="filterOptionTitle" type="button" selector="//div[@class='filter-options-title'][text() = '{{var}}']" parameterized="true" timeout="30"/>
+        <element name="attributeNthOption" type="button" selector="div.{{attributeLabel}} a:nth-of-type({{n}}) div" parameterized="true" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..415ae88fceb52
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="swatchOptionByLabel" type="button" selector="div.swatch-option[option-label={{opt}}]" parameterized="true"/>
+        <element name="nthSwatchOption" type="button" selector="div.swatch-option:nth-of-type({{var}})" parameterized="true"/>
+        <element name="selectedSwatchValue" type="text" selector="//div[contains(@class, 'swatch-attribute') and contains(., '{{attr}}')]//span[contains(@class, 'swatch-attribute-selected-option')]" parameterized="true"/>
+        <element name="swatchAttributeOptions" type="text" selector="div.swatch-attribute-options"/>
+        <element name="nthSwatchOptionText" type="button" selector="div.swatch-option.text:nth-of-type({{n}})" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
new file mode 100644
index 0000000000000..0e294153e881e
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateImageSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches"/>
+            <title value="Admin can create product attribute with image swatch"/>
+            <description value="Admin can create product attribute with image swatch"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3077"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Begin creating a new product attribute of type "Image Swatch" -->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+
+        <!-- Select visual swatch -->
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>
+
+        <!-- This hack is because the same <input type="file"> is re-purposed used for all uploads. -->
+        <executeJS function="HTMLInputElement.prototype.click = function() { if(this.type !== 'file') HTMLElement.prototype.click.call(this); };" stepKey="disableClick"/>
+
+        <!-- Set swatch image #1 -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthUploadFile('1')}}" stepKey="clickUploadFile1"/>
+        <attachFile selector="input[name='datafile']" userInput="adobe-thumb.jpg" stepKey="attachFile1"/>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="adobe-thumb" stepKey="fillAdmin1"/>
+
+        <!-- Set swatch image #2 -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthUploadFile('2')}}" stepKey="clickUploadFile2"/>
+        <attachFile selector="input[name='datafile']" userInput="adobe-small.jpg" stepKey="attachFile2"/>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="adobe-small" stepKey="fillAdmin2"/>
+
+        <!-- Set swatch image #3 -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch3"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch3">
+            <argument name="index" value="2"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthUploadFile('3')}}" stepKey="clickUploadFile3"/>
+        <attachFile selector="input[name='datafile']" userInput="adobe-base.jpg" stepKey="attachFile3"/>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('2')}}" userInput="adobe-base" stepKey="fillAdmin3"/>
+
+        <!-- Set scope -->
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
+
+        <scrollToTopOfPage stepKey="scrollToTabs"/>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.UseInProductListing}}" stepKey="waitForTabSwitch"/>
+        <selectOption selector="{{AdvancedAttributePropertiesSection.UseInProductListing}}" userInput="Yes" stepKey="useInProductListing"/>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
+
+        <!-- Verify after round trip to the server -->
+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch('1')}}" userInput="style" stepKey="grabSwatch1"/>
+        <assertContains stepKey="assertSwatch1">
+            <expectedResult type="string">adobe-thumb</expectedResult>
+            <actualResult type="string">{$grabSwatch1}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch('2')}}" userInput="style" stepKey="grabSwatch2"/>
+        <assertContains stepKey="assertSwatch2">
+            <expectedResult type="string">adobe-small</expectedResult>
+            <actualResult type="string">{$grabSwatch2}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch('3')}}" userInput="style" stepKey="grabSwatch3"/>
+        <assertContains stepKey="assertSwatch3">
+            <expectedResult type="string">adobe-base</expectedResult>
+            <actualResult type="string">{$grabSwatch3}</actualResult>
+        </assertContains>
+
+        <!-- Create a configurable product to verify the storefront with -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+
+        <!-- Create configurations based off the Image Swatch we created earlier -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+
+        <!-- Go to the product page and see text swatch options -->
+        <amOnPage url="{{BaseConfigurableProduct.sku}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+
+        <!-- Verify the storefront -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('1')}}" userInput="style" stepKey="grabSwatch4"/>
+        <assertContains stepKey="assertSwatch4">
+            <expectedResult type="string">adobe-thumb</expectedResult>
+            <actualResult type="string">{$grabSwatch4}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('2')}}" userInput="style" stepKey="grabSwatch5"/>
+        <assertContains stepKey="assertSwatch5">
+            <expectedResult type="string">adobe-small</expectedResult>
+            <actualResult type="string">{$grabSwatch5}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('3')}}" userInput="style" stepKey="grabSwatch6"/>
+        <assertContains stepKey="assertSwatch6">
+            <expectedResult type="string">adobe-base</expectedResult>
+            <actualResult type="string">{$grabSwatch6}</actualResult>
+        </assertContains>
+
+        <!-- Go to the product listing page and see text swatch options -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPageStorefront"/>
+        <waitForPageLoad stepKey="waitForProductListingPage"/>
+
+        <!-- Verify the storefront -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('1')}}" userInput="style" stepKey="grabSwatch7"/>
+        <assertContains stepKey="assertSwatch7">
+            <expectedResult type="string">adobe-thumb</expectedResult>
+            <actualResult type="string">{$grabSwatch7}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('2')}}" userInput="style" stepKey="grabSwatch8"/>
+        <assertContains stepKey="assertSwatch8">
+            <expectedResult type="string">adobe-small</expectedResult>
+            <actualResult type="string">{$grabSwatch8}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('3')}}" userInput="style" stepKey="grabSwatch9"/>
+        <assertContains stepKey="assertSwatch9">
+            <expectedResult type="string">adobe-base</expectedResult>
+            <actualResult type="string">{$grabSwatch9}</actualResult>
+        </assertContains>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
new file mode 100644
index 0000000000000..3ef347b7aca12
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTextSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches"/>
+            <title value="Admin can create product attribute with text swatch"/>
+            <description value="Admin can create product attribute with text swatch"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3078"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a new product attribute of type "Text Swatch" -->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_text" stepKey="selectInputType"/>
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch0"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('0')}}" userInput="red" stepKey="fillSwatch0"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('0')}}" userInput="Something red." stepKey="fillDescription0"/>
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch1"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('1')}}" userInput="green" stepKey="fillSwatch1"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('1')}}" userInput="Something green." stepKey="fillDescription1"/>
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch2"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('2')}}" userInput="blue" stepKey="fillSwatch2"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('2')}}" userInput="Something blue." stepKey="fillDescription2"/>
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
+        <!-- Save and verify -->
+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSave"/>
+        <seeInField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeDefaultLabel"/>
+        <seeInField selector="{{AdminManageSwatchSection.nthSwatchText('1')}}" userInput="red" stepKey="seeSwatch0"/>
+        <seeInField selector="{{AdminManageSwatchSection.nthSwatchAdminDescription('1')}}" userInput="Something red." stepKey="seeDescription0"/>
+        <seeInField selector="{{AdminManageSwatchSection.nthSwatchText('2')}}" userInput="green" stepKey="seeSwatch1"/>
+        <seeInField selector="{{AdminManageSwatchSection.nthSwatchAdminDescription('2')}}" userInput="Something green." stepKey="seeDescription1"/>
+        <seeInField selector="{{AdminManageSwatchSection.nthSwatchText('3')}}" userInput="blue" stepKey="seeSwatch2"/>
+        <seeInField selector="{{AdminManageSwatchSection.nthSwatchAdminDescription('3')}}" userInput="Something blue." stepKey="seeDescription2"/>
+
+        <!-- Create a configurable product to verify the storefront with -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Create configurations based off the Text Swatch we created earlier -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+
+        <!-- Go to the product page and see text swatch options -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.swatchAttributeOptions}}" userInput="red" stepKey="seeRed"/>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOptionText('1')}}" userInput="option-label" stepKey="grabRedLabel"/>
+        <assertEquals stepKey="assertRedLabel">
+            <expectedResult type="string">Something red.</expectedResult>
+            <actualResult type="string">{$grabRedLabel}</actualResult>
+        </assertEquals>
+        <see selector="{{StorefrontProductInfoMainSection.swatchAttributeOptions}}" userInput="green" stepKey="seeGreen"/>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOptionText('2')}}" userInput="option-label" stepKey="grabGreenLabel"/>
+        <assertEquals stepKey="assertGreenLabel">
+            <expectedResult type="string">Something green.</expectedResult>
+            <actualResult type="string">{$grabGreenLabel}</actualResult>
+        </assertEquals>
+        <see selector="{{StorefrontProductInfoMainSection.swatchAttributeOptions}}" userInput="blue" stepKey="seeBlue"/>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOptionText('3')}}" userInput="option-label" stepKey="grabBlueLabel"/>
+        <assertEquals stepKey="assertBlueLabel">
+            <expectedResult type="string">Something blue.</expectedResult>
+            <actualResult type="string">{$grabBlueLabel}</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
new file mode 100644
index 0000000000000..90e94466351b6
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateVisualSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches"/>
+            <title value="Admin can create product attribute with picked color swatch"/>
+            <description value="Admin can create product attribute with picked color swatch"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3080"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Clean up our modifications to the existing color attribute -->
+            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+            <waitForPageLoad stepKey="waitForProductAttributes"/>
+            <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
+            <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
+            <click selector="{{AdminProductAttributeGridSection.AttributeCode('color')}}" stepKey="clickRowToEdit"/>
+            <click selector="{{AdminManageSwatchSection.nthDelete('1')}}" stepKey="deleteSwatch1"/>
+            <click selector="{{AdminManageSwatchSection.nthDelete('2')}}" stepKey="deleteSwatch2"/>
+            <click selector="{{AdminManageSwatchSection.nthDelete('3')}}" stepKey="deleteSwatch3"/>
+            <waitForPageLoad stepKey="waitToClickSave"/>
+            <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit"/>
+            <!-- Logout -->
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Go to the edit page for the "color" attribute -->
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <waitForPageLoad stepKey="waitForProductAttributes"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
+        <click selector="{{AdminProductAttributeGridSection.AttributeCode('color')}}" stepKey="clickRowToEdit"/>
+
+        <!-- Change to visual swatches -->
+        <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="swatch_visual" stepKey="selectVisualSwatch"/>
+
+        <!-- Set swatch #1 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="clickChooseColor1"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex1">
+            <argument name="nthColorPicker" value="1"/>
+            <argument name="hexColor" value="e74c3c"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="red" stepKey="fillAdmin1"/>
+        <!-- Set swatch #2 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="clickChooseColor2"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex2">
+            <argument name="nthColorPicker" value="2"/>
+            <argument name="hexColor" value="2ecc71"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="green" stepKey="fillAdmin2"/>
+        <!-- Set swatch #3 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch3"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch3">
+            <argument name="index" value="2"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('3')}}" stepKey="clickChooseColor3"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex3">
+            <argument name="nthColorPicker" value="3"/>
+            <argument name="hexColor" value="3498db"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('2')}}" userInput="blue" stepKey="fillAdmin3"/>
+        <waitForPageLoad stepKey="waitToClickSave"/>
+
+        <!-- Save -->
+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
+
+        <!-- Assert that the Save was successful after round trip to server -->
+        <actionGroup ref="assertSwatchColor" stepKey="assertSwatch1">
+            <argument name="nthSwatch" value="1"/>
+            <argument name="expectedStyle" value="background: rgb(231, 77, 60);"/>
+        </actionGroup>
+        <actionGroup ref="assertSwatchColor" stepKey="assertSwatch2">
+            <argument name="nthSwatch" value="2"/>
+            <argument name="expectedStyle" value="background: rgb(46, 204, 112);"/>
+        </actionGroup>
+        <actionGroup ref="assertSwatchColor" stepKey="assertSwatch3">
+            <argument name="nthSwatch" value="3"/>
+            <argument name="expectedStyle" value="background: rgb(52, 152, 219);"/>
+        </actionGroup>
+
+        <!-- Create a configurable product to verify the storefront with -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
+        <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
+        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+        <!-- Create configurations based off the Text Swatch we created earlier -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="color" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
+        <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="Color" stepKey="selectAttributes"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="10" stepKey="fillAttributePrice1"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="20" stepKey="fillAttributePrice2"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="30" stepKey="fillAttributePrice3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="99" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <!-- conditionalClick is necessary because this popup appears in Jenkins but not locally. I cannot figure out why. -->
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitle"/>
+
+        <!-- Go to the product page and see text swatch options -->
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+
+        <!-- Verify that the storefront shows the swatches too -->
+        <actionGroup ref="assertStorefrontSwatchColor" stepKey="assertSwatch4">
+            <argument name="nthSwatch" value="1"/>
+            <argument name="expectedRgb" value="rgb(231, 77, 60)"/>
+        </actionGroup>
+        <actionGroup ref="assertStorefrontSwatchColor" stepKey="assertSwatch5">
+            <argument name="nthSwatch" value="2"/>
+            <argument name="expectedRgb" value="rgb(46, 204, 112)"/>
+        </actionGroup>
+        <actionGroup ref="assertStorefrontSwatchColor" stepKey="assertSwatch6">
+            <argument name="nthSwatch" value="3"/>
+            <argument name="expectedRgb" value="rgb(52, 152, 219)"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
new file mode 100644
index 0000000000000..b03f771875957
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateVisualSwatchWithNonValidOptionsTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches product attribute"/>
+            <title value="Admin should be able to create swatch product attribute"/>
+            <description value="Admin should be able to create swatch product attribute"/>
+            <severity value="BLOCKER"/>
+            <testCaseId value="MC-4140"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="visualSwatchAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Set attribute properties -->
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}"
+                   userInput="{{visualSwatchAttribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.InputType}}"
+                      userInput="{{visualSwatchAttribute.input_type}}" stepKey="fillInputType"/>
+
+        <!-- Set advanced attribute properties -->
+        <click selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}"
+               stepKey="showAdvancedAttributePropertiesSection"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
+                               stepKey="waitForSlideOut"/>
+        <fillField selector="{{AdvancedAttributePropertiesSection.AttributeCode}}"
+                   userInput="{{visualSwatchAttribute.attribute_code}}"
+                   stepKey="fillAttributeCode"/>
+
+        <!-- Add new swatch option without label -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="clickChooseColor1"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex1">
+            <argument name="nthColorPicker" value="1"/>
+            <argument name="hexColor" value="ff0000"/>
+        </actionGroup>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="waitForError"/>
+
+        <!-- Fill options data -->
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}"
+                   userInput="red" stepKey="fillAdmin1"/>
+
+        <!-- Add 2 additional new swatch options -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="clickChooseColor2"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex2">
+            <argument name="nthColorPicker" value="2"/>
+            <argument name="hexColor" value="00ff00"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}"
+                   userInput="green" stepKey="fillAdmin2"/>
+
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch3"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch3">
+            <argument name="index" value="2"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('3')}}" stepKey="clickChooseColor3"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex3">
+            <argument name="nthColorPicker" value="3"/>
+            <argument name="hexColor" value="0000ff"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('2')}}"
+                   userInput="blue" stepKey="fillAdmin3"/>
+
+        <!-- Mark second option as default -->
+        <click selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="setSecondOptionAsDefault"/>
+
+        <!-- Go to Storefront Properties tab -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab"/>
+        <waitForElementVisible selector="{{StorefrontPropertiesSection.PageTitle}}" stepKey="waitTabLoad"/>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave2"/>
+        <waitForPageLoad stepKey="waitForGridPageLoad"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
+                               stepKey="waitForSuccessMessage"/>
+
+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
+            <argument name="ProductAttribute" value="visualSwatchAttribute"/>
+        </actionGroup>
+        <!-- Check attribute data -->
+        <seeCheckboxIsChecked selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="CheckDefaultOption"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml
new file mode 100644
index 0000000000000..e9df186bae5e6
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminWatermarkUploadTest">
+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Swatch Image')}}" stepKey="waitForInputVisible4" after="waitForPreviewImage3"/>
+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Swatch Image')}}" userInput="adobe-small.jpg" stepKey="attachFile4" after="waitForInputVisible4"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Swatch Image')}}" stepKey="waitForPreviewImage4" after="attachFile4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
new file mode 100644
index 0000000000000..470421776cf8f
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontDisplayAllCharactersOnTextSwatchTest" extends="StorefrontFilterByTextSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches and check the display characters length"/>
+            <title value="Admin can create product attribute with text swatch and view the display characters  in full"/>
+            <description value="Admin can create product attribute with text swatch and check the display characters in full"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-5975"/>
+            <group value="Swatches"/>
+        </annotations>
+
+        <!-- Create swatch #3 -->
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch2" after="fillDescription1"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('2')}}" userInput="1234567890123456789012341234" stepKey="fillSwatch2" after="clickAddSwatch2"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('2')}}" userInput="1234567890123456789012341234GreenD" stepKey="fillDescription2" after="fillSwatch2"/>
+
+        <!-- Create swatch #4 -->
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch3" after="fillDescription2"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('3')}}" userInput="123456789012345678901" stepKey="fillSwatch3" after="clickAddSwatch3"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('3')}}" userInput="123456789012345678901BrownD" stepKey="fillDescription3" after="fillSwatch3"/>
+
+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '3')}}" userInput="123456789012345678901" stepKey="seeGreen" after="seeBlue"/>
+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '4')}}" userInput="123456789012345678901" stepKey="seeBrown" after="seeGreen"/>
+
+        <!-- Go to the category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage2"/>
+        <waitForPageLoad stepKey="waitForCategoryPage2"/>
+
+        <!-- Verify swatch2 is present and shown in full display text characters on storefront in the layered navigation -->
+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav2"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute2"/>
+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" stepKey="filterBySwatch2"/>
+
+        <!-- Go to the category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage3"/>
+        <waitForPageLoad stepKey="waitForCategoryPage3"/>
+
+        <!-- Verify swatch3 is present and shown in full display text characters on storefront in the layered navigation -->
+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav3"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute3"/>
+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '3')}}" stepKey="filterBySwatch3"/>
+
+        <!-- Go to the category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage4"/>
+        <waitForPageLoad stepKey="waitForCategoryPage4"/>
+
+        <!-- Verify swatch4 is present and shown in full display text characters on storefront in the layered navigation -->
+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav4"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute4"/>
+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '4')}}" stepKey="filterBySwatch4"/>
+
+        <!-- Deletes the created configurable product-->
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+    </test>
+
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
new file mode 100644
index 0000000000000..e4c96ab3a2ba7
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontFilterByImageSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="View swatches in product listing"/>
+            <title value="Customers can filter products using image swatches"/>
+            <description value="Customers can filter products using image swatches"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3461"/>
+            <group value="Swatches"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Begin creating a new product attribute -->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+
+        <!-- Select visual swatch -->
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>
+
+        <!-- This hack is because the same <input type="file"> is re-purposed used for all uploads. -->
+        <executeJS function="HTMLInputElement.prototype.click = function() { if(this.type !== 'file') HTMLElement.prototype.click.call(this); };" stepKey="disableClick"/>
+
+        <!-- Set swatch #1 image using file upload -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthUploadFile('1')}}" stepKey="clickUploadFile1"/>
+        <attachFile selector="input[name='datafile']" userInput="adobe-thumb.jpg" stepKey="attachFile1"/>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="adobe-thumb" stepKey="fillAdmin1"/>
+
+        <!-- Set swatch #2 image using the file upload -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthUploadFile('2')}}" stepKey="clickUploadFile2"/>
+        <attachFile selector="input[name='datafile']" userInput="adobe-small.jpg" stepKey="attachFile2"/>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="adobe-small" stepKey="fillAdmin2"/>
+
+        <!-- Set scope to global -->
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
+
+        <!-- Set Use In Layered Navigation -->
+        <scrollToTopOfPage stepKey="scrollToTop1"/>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
+
+        <!-- Save the new attribute -->
+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
+
+        <!-- Create a configurable product to verify the storefront with -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+
+        <!-- Create configurations based off the visual swatch we created earlier -->
+        <actionGroup ref="createConfigurationsForAttribute" stepKey="createConfigurations">
+            <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
+        </actionGroup>
+
+        <!-- Go to the category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPage"/>
+
+        <!-- Verify swatches are present in the layered navigation -->
+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute"/>
+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" userInput="style" stepKey="grabSwatch1"/>
+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" userInput="style" stepKey="grabSwatch2"/>
+        <assertContains stepKey="assertSwatch1">
+            <expectedResult type="string">adobe-thumb</expectedResult>
+            <actualResult type="string">{$grabSwatch1}</actualResult>
+        </assertContains>
+        <assertContains stepKey="assertSwatch2">
+            <expectedResult type="string">adobe-small</expectedResult>
+            <actualResult type="string">{$grabSwatch2}</actualResult>
+        </assertContains>
+
+        <!-- Click a swatch and expect to see the configurable product, not see the simple product -->
+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" stepKey="filterBySwatch1"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{BaseConfigurableProduct.name}}" stepKey="seeConfigurableProduct"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeSimpleProduct"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
new file mode 100644
index 0000000000000..28df5ffd53436
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontFilterByTextSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="View swatches in product listing"/>
+            <title value="Customers can filter products using text swatches"/>
+            <description value="Customers can filter products using text swatches"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3462"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Begin creating a new product attribute -->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+
+        <!-- Select text swatch -->
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_text" stepKey="selectInputType"/>
+
+        <!-- Create swatch #1 -->
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch0"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('0')}}" userInput="red" stepKey="fillSwatch0"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('0')}}" userInput="Something red." stepKey="fillDescription0"/>
+
+        <!-- Create swatch #2 -->
+        <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch1"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('1')}}" userInput="blue" stepKey="fillSwatch1"/>
+        <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('1')}}" userInput="Something blue." stepKey="fillDescription1"/>
+
+        <!-- Set scope to global -->
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
+
+        <!-- Set Use In Layered Navigation -->
+        <scrollToTopOfPage stepKey="scrollToTop1"/>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
+
+        <!-- Workaround: click on the main tab again to ensure the values are saved, otherwise the swatches do not get saved -->
+        <scrollToTopOfPage stepKey="scrollToTop2"/>
+        <click selector="{{AttributePropertiesSection.propertiesTab}}" stepKey="goBackToPropertiesTab"/>
+
+        <!-- Save the new attribute -->
+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
+
+        <!-- Create a configurable product to verify the storefront with -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+
+        <!-- Create configurations based off the text swatch we created earlier -->
+        <actionGroup ref="createConfigurationsForAttribute" stepKey="createConfigurations">
+            <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
+        </actionGroup>
+
+        <!-- Go to the category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPage"/>
+
+        <!-- Verify swatches are present in the layered navigation -->
+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute"/>
+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" userInput="red" stepKey="seeRed"/>
+        <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" userInput="blue" stepKey="seeBlue"/>
+
+        <!-- Click a swatch and expect to see the configurable product, not see the simple product -->
+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" stepKey="filterBySwatch1"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{BaseConfigurableProduct.name}}" stepKey="seeConfigurableProduct"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeSimpleProduct"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
new file mode 100644
index 0000000000000..d12cb0433fed1
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontFilterByVisualSwatchTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="View swatches in product listing"/>
+            <title value="Customers can filter products using visual swatches"/>
+            <description value="Customers can filter products using visual swatches "/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-3082"/>
+            <group value="Swatches"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Begin creating a new product attribute -->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+
+        <!-- Select visual swatch -->
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_visual" stepKey="selectInputType"/>
+
+        <!-- Set swatch #1 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="clickChooseColor1"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex1">
+            <argument name="nthColorPicker" value="1"/>
+            <argument name="hexColor" value="e74c3c"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="red" stepKey="fillAdmin1"/>
+
+        <!-- Set swatch #2 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="clickChooseColor2"/>
+        <actionGroup ref="setColorPickerByHex" stepKey="fillHex2">
+            <argument name="nthColorPicker" value="2"/>
+            <argument name="hexColor" value="3498db"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="blue" stepKey="fillAdmin2"/>
+
+        <!-- Set scope to global -->
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
+
+        <!-- Set Use In Layered Navigation -->
+        <scrollToTopOfPage stepKey="scrollToTop1"/>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
+
+        <!-- Save the new attribute -->
+        <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
+
+        <!-- Create a configurable product to verify the storefront with -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+
+        <!-- Create configurations based off the visual watch we created earlier -->
+        <actionGroup ref="createConfigurationsForAttribute" stepKey="createConfigurations">
+            <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
+        </actionGroup>
+
+        <!-- Go to the category page -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPage"/>
+
+        <!-- Verify swatches are present in the layered navigation -->
+        <see selector="{{StorefrontCategorySidebarSection.layeredFilterBlock}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeInLayeredNav"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(ProductAttributeFrontendLabel.label)}}" stepKey="expandAttribute"/>
+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" userInput="style" stepKey="grabSwatch1"/>
+        <grabAttributeFrom selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '2')}}" userInput="style" stepKey="grabSwatch2"/>
+        <assertContains stepKey="assertSwatch1">
+            <expectedResult type="string">rgb(231, 77, 60)</expectedResult>
+            <actualResult type="string">{$grabSwatch1}</actualResult>
+        </assertContains>
+        <assertContains stepKey="assertSwatch2">
+            <expectedResult type="string">rgb(52, 152, 219)</expectedResult>
+            <actualResult type="string">{$grabSwatch2}</actualResult>
+        </assertContains>
+
+        <!-- Click a swatch and expect to see the configurable product, not see the simple product -->
+        <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '1')}}" stepKey="filterBySwatch1"/>
+        <see selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="{{BaseConfigurableProduct.name}}" stepKey="seeConfigurableProduct"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeSimpleProduct"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
new file mode 100644
index 0000000000000..7ef030ef8dfa8
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontSwatchProductWithFileCustomOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Add configurable product to cart"/>
+            <title value="Configurable product with swatch option and file custom option"/>
+            <description value="Configurable product with swatch option and file custom option. When adding to cart with an invalid filetype, the correct error message is shown, and options remain selected."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-93101"/>
+            <group value="ConfigurableProduct"/>
+            <group value="Swatches"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Create a configurable swatch product via the UI -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="searchAndSelectCategory"/>
+        <!--Add swatch attribute to configurable product-->
+        <actionGroup ref="AddVisualSwatchToProductActionGroup" stepKey="addSwatchToProduct"/>
+        <!--Add custom option to configurable product-->
+        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        
+        <!--Go to storefront-->
+        <amOnPage url="" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
+        <click selector="{{StorefrontNavigationSection.topCategory($$createCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="$$createCategory.name$$" stepKey="seeOnCategoryPage"/>
+        <!--Add configurable product to cart-->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductTitleByName(BaseConfigurableProduct.name)}}" stepKey="hoverProductInGrid"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(BaseConfigurableProduct.name)}}" stepKey="tryAddToCartFromCategoryPage"/>
+        <waitForPageLoad stepKey="waitForRedirectToProductPage"/>
+        <seeInCurrentUrl url="{{StorefrontProductPage.url(BaseConfigurableProduct.name)}}" stepKey="seeOnProductPage"/>
+        <click selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(visualSwatchOption2.default_label)}}" stepKey="clickSwatchOption"/>
+        <see selector="{{StorefrontProductInfoMainSection.selectedSwatchValue(visualSwatchAttribute.default_label)}}" userInput="{{visualSwatchOption2.default_label}}" stepKey="seeSwatchIsSelected"/>
+
+        <!--Try invalid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="lorem_ipsum.docx" stepKey="attachInvalidFile"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartInvalidFile"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForErrorMessageInvalidFile"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="The file 'lorem_ipsum.docx' for '{{ProductOptionFile.title}}' has an invalid extension." stepKey="seeMessageInvalidFile"/>
+        <!--Swatch remains selected-->
+        <see selector="{{StorefrontProductInfoMainSection.selectedSwatchValue(visualSwatchAttribute.default_label)}}" userInput="{{visualSwatchOption2.default_label}}" stepKey="seeSwatchRemainsSelected"/>
+        <!--Try valid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="attachValidFile"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$132.99" stepKey="seePriceUpdated"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartValidFile"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{BaseConfigurableProduct.name}} to your shopping cart." stepKey="seeSuccessMessage"/>
+
+        <!--Check item in cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName(BaseConfigurableProduct.name)}}" stepKey="seeProductInCart"/>
+        <see selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute(BaseConfigurableProduct.name, visualSwatchAttribute.default_label)}}" userInput="{{visualSwatchOption2.default_label}}" stepKey="seeSelectedSwatch"/>
+        <see selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute(BaseConfigurableProduct.name, ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="seeCorrectOptionFile"/>
+        <!--Delete cart item-->
+        <click selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="deleteCartItem"/>
+
+        <!--Delete product-->
+        <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+            <argument name="sku" value="{{BaseConfigurableProduct.sku}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php
index a86c745c7c810..0d0444ddda38b 100644
--- a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php
@@ -160,6 +160,9 @@ public function testGetStoreOptionValues($values)
         $this->assertEquals($result, $values);
     }
 
+    /**
+     * @return array
+     */
     public function dataForGetStoreOptionValues()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php
index aad8741735813..168a682961bc6 100644
--- a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php
@@ -21,6 +21,9 @@ public function testAddValues($values)
         $this->assertEquals($block, $result);
     }
 
+    /**
+     * @return array
+     */
     public function dataForAddValues()
     {
         $additionalData = [
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
deleted file mode 100644
index 3786887f1bf7b..0000000000000
--- a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Swatches\Test\Unit\Block\Product\Renderer;
-
-use Magento\Swatches\Block\Product\Renderer\Configurable;
-use Magento\Swatches\Model\Swatch;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ConfigurableTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var Configurable */
-    private $configurable;
-
-    /** @var \Magento\Framework\Stdlib\ArrayUtils|\PHPUnit_Framework_MockObject_MockObject */
-    private $arrayUtils;
-
-    /** @var \Magento\Framework\Json\EncoderInterface|\PHPUnit_Framework_MockObject_MockObject */
-    private $jsonEncoder;
-
-    /** @var \Magento\ConfigurableProduct\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    private $helper;
-
-    /** @var \Magento\Swatches\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    private $swatchHelper;
-
-    /** @var \Magento\Swatches\Helper\Media|\PHPUnit_Framework_MockObject_MockObject */
-    private $swatchMediaHelper;
-
-    /** @var \Magento\Catalog\Helper\Product|\PHPUnit_Framework_MockObject_MockObject */
-    private $catalogProduct;
-
-    /** @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject */
-    private $currentCustomer;
-
-    /** @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject */
-    private $priceCurrency;
-
-    /** @var \Magento\ConfigurableProduct\Model\ConfigurableAttributeData|\PHPUnit_Framework_MockObject_MockObject */
-    private $configurableAttributeData;
-
-    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
-    private $product;
-
-    /** @var \Magento\Catalog\Model\Product\Type\AbstractType|\PHPUnit_Framework_MockObject_MockObject */
-    private $typeInstance;
-
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    private $scopeConfig;
-
-    /** @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject */
-    private $imageHelper;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject  */
-    private $urlBuilder;
-
-    protected function setUp()
-    {
-        $this->arrayUtils = $this->createMock(\Magento\Framework\Stdlib\ArrayUtils::class);
-        $this->jsonEncoder = $this->createMock(\Magento\Framework\Json\EncoderInterface::class);
-        $this->helper = $this->createMock(\Magento\ConfigurableProduct\Helper\Data::class);
-        $this->swatchHelper = $this->createMock(\Magento\Swatches\Helper\Data::class);
-        $this->swatchMediaHelper = $this->createMock(\Magento\Swatches\Helper\Media::class);
-        $this->catalogProduct = $this->createMock(\Magento\Catalog\Helper\Product::class);
-        $this->currentCustomer = $this->createMock(\Magento\Customer\Helper\Session\CurrentCustomer::class);
-        $this->priceCurrency = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
-        $this->configurableAttributeData = $this->createMock(
-            \Magento\ConfigurableProduct\Model\ConfigurableAttributeData::class
-        );
-        $this->product = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $this->typeInstance = $this->createMock(\Magento\Catalog\Model\Product\Type\AbstractType::class);
-        $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);
-
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->configurable = $objectManager->getObject(
-            \Magento\Swatches\Block\Product\Renderer\Configurable::class,
-            [
-                'scopeConfig' => $this->scopeConfig,
-                'imageHelper' => $this->imageHelper,
-                'urlBuilder' => $this->urlBuilder,
-                'arrayUtils' => $this->arrayUtils,
-                'jsonEncoder' => $this->jsonEncoder,
-                'helper' => $this->helper,
-                'swatchHelper' => $this->swatchHelper,
-                'swatchMediaHelper' => $this->swatchMediaHelper,
-                'catalogProduct' => $this->catalogProduct,
-                'currentCustomer' => $this->currentCustomer,
-                'priceCurrency' => $this->priceCurrency,
-                'configurableAttributeData' => $this->configurableAttributeData,
-                'data' => [],
-            ]
-        );
-    }
-
-    public function testGetAndSetProduct()
-    {
-        $this->configurable->setProduct($this->product);
-
-        $this->assertEquals(
-            $this->product,
-            $this->configurable->getProduct()
-        );
-    }
-
-    public function testGetProductParent()
-    {
-        $this->typeInstance->expects($this->once())->method('getStoreFilter')
-            ->with($this->product)
-            ->willReturn(true);
-
-        $this->product->expects($this->once())->method('getTypeInstance')
-            ->willReturn($this->typeInstance);
-
-        $this->configurable->setData('product', $this->product);
-
-        $this->assertEquals(
-            $this->product,
-            $this->configurable->getProduct()
-        );
-    }
-
-    public function testGetNumberSwatchesPerProduct()
-    {
-        $expectedValue = 123;
-
-        $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with('catalog/frontend/swatches_per_product')
-            ->willReturn($expectedValue);
-
-        $this->assertEquals(
-            $expectedValue,
-            $this->configurable->getNumberSwatchesPerProduct()
-        );
-    }
-
-    public function testSetIsProductListingContext()
-    {
-        $this->assertEquals(
-            $this->configurable,
-            $this->configurable->setIsProductListingContext(1)
-        );
-    }
-
-    private function prepareGetJsonSwatchConfig()
-    {
-        $product1 = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $product1->expects($this->atLeastOnce())->method('isSaleable')->willReturn(true);
-        $product1->expects($this->atLeastOnce())->method('getData')->with('code')->willReturn(1);
-
-        $product2 = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $product2->expects($this->atLeastOnce())->method('isSaleable')->willReturn(true);
-        $product2->expects($this->atLeastOnce())->method('getData')->with('code')->willReturn(3);
-
-        $simpleProducts = [$product1, $product2];
-        $configurableType = $this->createMock(\Magento\ConfigurableProduct\Model\Product\Type\Configurable::class);
-        $configurableType->expects($this->atLeastOnce())->method('getUsedProducts')->with($this->product, null)
-            ->willReturn($simpleProducts);
-        $this->product->expects($this->any())->method('getTypeInstance')->willReturn($configurableType);
-
-        $productAttribute1 = $this->createMock(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class);
-        $productAttribute1->expects($this->any())->method('getId')->willReturn(1);
-        $productAttribute1->expects($this->any())->method('getAttributeCode')->willReturn('code');
-
-        $attribute1 = $this->createPartialMock(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class,
-            ['getProductAttribute']
-        );
-        $attribute1->expects($this->any())->method('getProductAttribute')->willReturn($productAttribute1);
-
-        $this->helper->expects($this->any())->method('getAllowAttributes')->with($this->product)
-            ->willReturn([$attribute1]);
-    }
-
-    public function testGetJsonSwatchConfigNotVisualImageType()
-    {
-        $this->prepareGetJsonSwatchConfig();
-        $this->configurable->setProduct($this->product);
-
-        $this->swatchHelper->expects($this->once())->method('getSwatchAttributesAsArray')
-            ->with($this->product)
-            ->willReturn([
-                1 => [
-                    'options' => [1 => 'testA', 3 => 'testB'],
-                    'use_product_image_for_swatch' => true,
-                    'attribute_code' => 'code',
-                ],
-            ]);
-
-        $this->swatchHelper->expects($this->once())->method('getSwatchesByOptionsId')
-            ->with([1, 3])
-            ->willReturn([
-                3 => ['type' => null, 'value' => 'hello']
-            ]);
-
-        $this->swatchHelper->expects($this->once())->method('loadFirstVariationWithSwatchImage')
-            ->with($this->product, ['code' => 3])
-            ->willReturn($this->product);
-
-        $this->product->expects($this->exactly(4))->method('getData')
-            ->with('swatch_image')
-            ->willReturn('/path');
-
-        $this->imageHelper->expects($this->exactly(2))->method('init')
-            ->willReturnMap([
-                [$this->product, 'swatch_image', ['type' => 'swatch_image'], $this->imageHelper],
-                [$this->product, 'swatch_thumb', ['type' => 'swatch_image'], $this->imageHelper],
-            ]);
-
-        $this->jsonEncoder->expects($this->once())->method('encode');
-
-        $this->configurable->getJsonSwatchConfig();
-    }
-
-    public function testGetJsonSwatchConfigVisualImageType()
-    {
-        $this->prepareGetJsonSwatchConfig();
-        $this->configurable->setProduct($this->product);
-
-        $this->swatchHelper->expects($this->once())->method('getSwatchAttributesAsArray')
-            ->with($this->product)
-            ->willReturn([
-                1 => [
-                    'options' => [1 => 'testA', 3 => 'testB'],
-                    'use_product_image_for_swatch' => true,
-                    'attribute_code' => 'code',
-                ],
-            ]);
-
-        $this->swatchHelper->expects($this->once())->method('getSwatchesByOptionsId')
-            ->with([1, 3])
-            ->willReturn([
-                3 => ['type' => Swatch::SWATCH_TYPE_VISUAL_IMAGE, 'value' => 'hello']
-            ]);
-
-        $this->swatchHelper->expects($this->once())->method('loadFirstVariationWithSwatchImage')
-            ->with($this->product, ['code' => 3])
-            ->willReturn($this->product);
-
-        $this->swatchMediaHelper->expects($this->exactly(2))->method('getSwatchAttributeImage')
-            ->withConsecutive(
-                ['swatch_image', 'hello'],
-                ['swatch_thumb', 'hello']
-            )
-            ->willReturn('/path');
-
-        $this->product->expects($this->exactly(6))->method('getData')
-            ->withConsecutive(['swatch_image'], ['image'], ['image'], ['swatch_image'], ['image'], ['image'])
-            ->will($this->onConsecutiveCalls(null, '/path', '/path', null, '/path', '/path'));
-
-        $this->imageHelper->expects($this->exactly(2))->method('init')
-            ->willReturnMap([
-                [$this->product, 'swatch_image_base', ['type' => 'image'], $this->imageHelper],
-                [$this->product, 'swatch_thumb_base', ['type' => 'image'], $this->imageHelper],
-            ]);
-
-        $this->jsonEncoder->expects($this->once())->method('encode');
-
-        $this->configurable->getJsonSwatchConfig();
-    }
-
-    public function testGetJsonSwatchConfigWithoutVisualImageType()
-    {
-        $this->prepareGetJsonSwatchConfig();
-
-        $this->configurable->setProduct($this->product);
-
-        $this->swatchHelper->expects($this->once())->method('getSwatchAttributesAsArray')
-            ->with($this->product)
-            ->willReturn([
-                1 => [
-                    'options' => [1 => 'testA', 3 => 'testB'],
-                    'use_product_image_for_swatch' => true,
-                    'attribute_code' => 'code',
-                ],
-            ]);
-
-        $this->swatchHelper->expects($this->once())->method('getSwatchesByOptionsId')
-            ->with([1, 3])
-            ->willReturn([
-                3 => ['type' => Swatch::SWATCH_TYPE_VISUAL_IMAGE, 'value' => 'hello']
-            ]);
-
-        $this->swatchHelper->expects($this->once())->method('loadFirstVariationWithSwatchImage')
-            ->with($this->product, ['code' => 3])
-            ->willReturn($this->product);
-
-        $this->swatchMediaHelper->expects($this->exactly(2))->method('getSwatchAttributeImage')
-            ->withConsecutive(
-                ['swatch_image', 'hello'],
-                ['swatch_thumb', 'hello']
-            )
-            ->willReturn('/path');
-
-        $this->product->expects($this->exactly(4))->method('getData')
-            ->withConsecutive(['swatch_image'], ['image'], ['swatch_image'], ['image'])
-            ->will($this->onConsecutiveCalls(null, null, null, null));
-
-        $this->imageHelper->expects($this->never())->method('init');
-        $this->imageHelper->expects($this->never())->method('resize');
-        $this->jsonEncoder->expects($this->once())->method('encode');
-
-        $this->configurable->getJsonSwatchConfig();
-    }
-
-    public function testGetMediaCallback()
-    {
-        $url = 'http://localhost/' . Configurable::MEDIA_CALLBACK_ACTION;
-
-        $this->urlBuilder->expects($this->once())
-            ->method('getUrl')
-            ->with(Configurable::MEDIA_CALLBACK_ACTION)
-            ->willReturn($url);
-
-        $this->assertEquals($url, $this->configurable->getMediaCallback());
-    }
-}
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 77369ad12fd9f..49dbb5cdc962d 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
 {
@@ -54,8 +55,11 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject */
     private $imageHelper;
 
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject  */
-    private $urlBuilder;
+    /** @var \Magento\Catalog\Model\Product\Image\UrlBuilder|\PHPUnit_Framework_MockObject_MockObject  */
+    private $imageUrlBuilder;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    private $variationPricesMock;
 
     public function setUp()
     {
@@ -74,7 +78,10 @@ public function setUp()
         $this->typeInstance = $this->createMock(\Magento\Catalog\Model\Product\Type\AbstractType::class);
         $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->imageUrlBuilder = $this->createMock(\Magento\Catalog\Model\Product\Image\UrlBuilder::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(
@@ -82,7 +89,7 @@ public function setUp()
             [
                 'scopeConfig' => $this->scopeConfig,
                 'imageHelper' => $this->imageHelper,
-                'urlBuilder' => $this->urlBuilder,
+                'imageUrlBuilder' => $this->imageUrlBuilder,
                 'arrayUtils' => $this->arrayUtils,
                 'jsonEncoder' => $this->jsonEncoder,
                 'helper' => $this->helper,
@@ -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/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
index 19a05dad151c4..a28f3db8fb392 100644
--- a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
@@ -130,6 +130,9 @@ public function testExecute($fileResult, $expectedResult)
         $this->controller->execute();
     }
 
+    /**
+     * @return array
+     */
     public function dataForExecute()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php
index 66f0d484c9e83..c9c826b3a7831 100644
--- a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php
@@ -39,6 +39,9 @@ public function testBeforeDispatch($dataRequest, $runTimes)
         $controller->beforeDispatch($subject, $request);
     }
 
+    /**
+     * @return array
+     */
     public function dataRequest()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
index 7a110c63da79e..5a11e2787bc69 100644
--- a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
@@ -20,6 +20,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $productModelFactoryMock;
 
+    /** @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    private $config;
+
     /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
     private $productMock;
 
@@ -29,6 +32,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $requestMock;
 
+    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $responseMock;
+
     /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $resultFactory;
 
@@ -57,11 +63,20 @@ protected function setUp()
             \Magento\Catalog\Model\ProductFactory::class,
             ['create']
         );
+        $this->config = $this->createMock(\Magento\PageCache\Model\Config::class);
+        $this->config->method('getTtl')->willReturn(1);
+
         $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $this->contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
 
         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $this->contextMock->method('getRequest')->willReturn($this->requestMock);
+        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setPublicHeaders'])
+            ->getMockForAbstractClass();
+        $this->responseMock->method('setPublicHeaders')->willReturnSelf();
+        $this->contextMock->method('getResponse')->willReturn($this->responseMock);
         $this->resultFactory = $this->createPartialMock(\Magento\Framework\Controller\ResultFactory::class, ['create']);
         $this->contextMock->method('getResultFactory')->willReturn($this->resultFactory);
 
@@ -73,7 +88,8 @@ protected function setUp()
             [
                 'context' => $this->contextMock,
                 'swatchHelper' => $this->swatchHelperMock,
-                'productModelFactory' => $this->productModelFactoryMock
+                'productModelFactory' => $this->productModelFactoryMock,
+                'config' => $this->config
             ]
         );
     }
@@ -86,6 +102,10 @@ public function testExecute()
             ->method('load')
             ->with(59)
             ->willReturn($this->productMock);
+        $this->productMock
+            ->expects($this->once())
+            ->method('getIdentities')
+            ->willReturn(['tags']);
 
         $this->productModelFactoryMock
             ->expects($this->once())
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
index 1b58c15b3a7df..aa44f1f114037 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Swatches\Test\Unit\Helper;
 
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Swatches\Model\ResourceModel\Swatch\Collection;
 use Magento\Swatches\Model\SwatchAttributesProvider;
 
 /**
@@ -50,7 +53,7 @@ class DataTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Api\ProductRepositoryInterface */
     protected $productRepoMock;
 
-    /** @var   \PHPUnit_Framework_MockObject_MockObject|MetadataPool*/
+    /** @var   \PHPUnit_Framework_MockObject_MockObject|MetadataPool */
     private $metaDataPoolMock;
 
     /**
@@ -58,6 +61,11 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     private $swatchAttributesProvider;
 
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product\Image\UrlBuilder
+     */
+    private $imageUrlBuilderMock;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -115,6 +123,10 @@ protected function setUp()
         $this->swatchAttributesProvider = $this->getMockBuilder(SwatchAttributesProvider::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->imageUrlBuilderMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Image\UrlBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
 
         $this->swatchHelperObject = $this->objectManager->getObject(
             \Magento\Swatches\Helper\Data::class,
@@ -124,7 +136,7 @@ protected function setUp()
                 'productRepository' => $this->productRepoMock,
                 'storeManager' => $this->storeManagerMock,
                 'swatchCollectionFactory' => $this->swatchCollectionFactoryMock,
-                'imageHelper' => $this->imageHelperMock,
+                'imageUrlBuilder' => $this->imageUrlBuilderMock,
                 'serializer' => $serializer,
                 'swatchAttributesProvider' => $this->swatchAttributesProvider,
             ]
@@ -136,6 +148,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return array
+     */
     public function dataForAdditionalData()
     {
         $additionalData = [
@@ -187,6 +202,9 @@ public function testAssembleAdditionalDataEavAttribute($dataFromDb, $attributeDa
         $this->swatchHelperObject->assembleAdditionalDataEavAttribute($this->attributeMock);
     }
 
+    /**
+     * @return array
+     */
     public function dataForAssembleEavAttribute()
     {
         $additionalData = [
@@ -220,7 +238,7 @@ public function dataForAssembleEavAttribute()
     public function testLoadFirstVariationWithSwatchImage($imageTypes, $expected, $requiredAttributes)
     {
         $this->getSwatchAttributes($this->productMock);
-        $this->getUsedProducts($imageTypes + $requiredAttributes);
+        $this->getUsedProducts($imageTypes + $requiredAttributes, $imageTypes);
 
         $result = $this->swatchHelperObject->loadFirstVariationWithSwatchImage($this->productMock, $requiredAttributes);
 
@@ -231,6 +249,9 @@ public function testLoadFirstVariationWithSwatchImage($imageTypes, $expected, $r
         }
     }
 
+    /**
+     * @return array
+     */
     public function dataForVariationWithSwatchImage()
     {
         return [
@@ -240,8 +261,9 @@ public function dataForVariationWithSwatchImage()
                     'small_image' => '/m/a/magento.png',
                     'thumbnail' => '/m/a/magento.png',
                     'swatch_image' => '/m/a/magento.png', //important
-                ], \Magento\Catalog\Model\Product::class,
-                ['color' => 31]
+                ],
+                \Magento\Catalog\Model\Product::class,
+                ['color' => 31],
             ],
             [
                 [
@@ -250,7 +272,7 @@ public function dataForVariationWithSwatchImage()
                     'thumbnail' => '/m/a/magento.png',
                 ],
                 false,
-                ['size' => 31]
+                ['size' => 31],
             ],
         ];
     }
@@ -282,7 +304,7 @@ public function testLoadVariationByFallback($product)
     public function testLoadFirstVariationWithImage($imageTypes, $expected, $requiredAttributes)
     {
         $this->getSwatchAttributes($this->productMock);
-        $this->getUsedProducts($imageTypes + $requiredAttributes);
+        $this->getUsedProducts($imageTypes + $requiredAttributes, $imageTypes);
 
         $result = $this->swatchHelperObject->loadFirstVariationWithImage($this->productMock, $requiredAttributes);
 
@@ -293,6 +315,9 @@ public function testLoadFirstVariationWithImage($imageTypes, $expected, $require
         }
     }
 
+    /**
+     * @return array
+     */
     public function dataForVariationWithImage()
     {
         return [
@@ -302,8 +327,9 @@ public function dataForVariationWithImage()
                     'small_image' => '/m/a/magento.png',
                     'thumbnail' => '/m/a/magento.png',
                     'swatch_image' => '/m/a/magento.png',
-                ], \Magento\Catalog\Model\Product::class,
-                ['color' => 31]
+                ],
+                \Magento\Catalog\Model\Product::class,
+                ['color' => 31],
             ],
             [
                 [
@@ -312,7 +338,7 @@ public function dataForVariationWithImage()
                     'swatch_image' => '/m/a/magento.png',
                 ],
                 false,
-                ['size' => 31]
+                ['size' => 31],
             ],
         ];
     }
@@ -334,46 +360,55 @@ public function testLoadVariationByFallbackWithoutProduct()
      */
     public function testGetProductMediaGallery($mediaGallery, $image)
     {
-        $this->productMock->expects($this->once())->method('getMediaAttributeValues')->willReturn($mediaGallery);
-        $this->productMock->expects($this->any())->method('getId')->willReturn(95);
-
-        $this->imageHelperMock->expects($this->any())
-            ->method('init')
-            ->willReturnMap([
-                [$this->productMock, 'product_page_image_large_no_frame', [], $this->imageHelperMock],
-                [$this->productMock, 'product_page_image_medium_no_frame', [], $this->imageHelperMock],
-                [$this->productMock, 'product_page_image_small', [], $this->imageHelperMock],
-            ]);
-
-        $this->imageHelperMock->expects($this->any())
-            ->method('setImageFile')
-            ->with($image)
-            ->willReturnSelf();
-        $this->imageHelperMock->expects($this->any())
-            ->method('getUrl')
-            ->willReturn('http://full_path_to_image/magento1.png');
-
-        $this->productRepoMock->expects($this->any())
-            ->method('getById')
-            ->with(95)
-            ->willReturn($this->productMock);
-
-        $mediaObject = $this->createMock(\Magento\Framework\DataObject::class);
-        $iterator = new \ArrayIterator([$mediaObject]);
-        $mediaCollectionMock = $this->createMock(\Magento\Framework\Data\Collection::class);
-        $mediaCollectionMock->expects($this->any())->method('getIterator')->willReturn($iterator);
-        $mediaObject->method('getData')->withConsecutive(
-            ['value_id'],
-            ['file']
-        )->willReturnOnConsecutiveCalls(
-            0,
-            $image
-        );
-        $this->productMock->method('getMediaGalleryImages')->willReturn($mediaCollectionMock);
+        $mediaGalleryEntries = [];
+        $id = 0;
+        $mediaUrls = [];
+        foreach ($mediaGallery as $mediaType => $mediaFile) {
+            $mediaGalleryEntryMock = $this->getMockBuilder(
+                \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class
+            )->getMock();
+            $mediaGalleryEntryMock->expects($this->atLeastOnce())
+                ->method('isDisabled')
+                ->willReturn(false);
+            $mediaGalleryEntryMock->expects($this->atLeastOnce())
+                ->method('getTypes')
+                ->willReturn([$mediaType]);
+            $mediaGalleryEntryMock->expects($this->atLeastOnce())
+                ->method('getFile')
+                ->willReturn($mediaFile);
+            $mediaGalleryEntryMock->expects($this->atLeastOnce())
+                ->method('getId')
+                ->willReturn(++$id);
+
+            $mediaGalleryEntries[] = $mediaGalleryEntryMock;
+            $mediaUrls[] = [$mediaFile, 'product_swatch_image_large', 'http://full_path_to_image' . $mediaFile];
+            $mediaUrls[] = [$mediaFile, 'product_swatch_image_medium' ,'http://full_path_to_image' . $mediaFile];
+            $mediaUrls[] = [$mediaFile, 'product_swatch_image_small','http://full_path_to_image' . $mediaFile];
+        }
 
-        $this->swatchHelperObject->getProductMediaGallery($this->productMock);
+        $this->productMock->expects($this->once())
+            ->method('getMediaGalleryEntries')
+            ->willReturn($mediaGalleryEntries);
+
+        if ($mediaGallery) {
+            $this->imageUrlBuilderMock->expects($this->any())
+                ->method('getUrl')
+                ->willReturnMap($mediaUrls);
+        }
+
+        $productMediaGallery = $this->swatchHelperObject->getProductMediaGallery($this->productMock);
+        if ($mediaGallery) {
+            $this->assertContains($image, $productMediaGallery['large']);
+            $this->assertContains($image, $productMediaGallery['medium']);
+            $this->assertContains($image, $productMediaGallery['small']);
+        } else {
+            $this->assertEmpty($productMediaGallery);
+        }
     }
 
+    /**
+     * @return array
+     */
     public function dataForMediaGallery()
     {
         return [
@@ -384,7 +419,7 @@ public function dataForMediaGallery()
                     'thumbnail' => '/m/a/magento3.png',
                     'swatch_image' => '/m/a/magento4.png',
                 ],
-                '/m/a/magento1.png'
+                '/m/a/magento1.png',
             ],
             [
                 [
@@ -392,7 +427,7 @@ public function dataForMediaGallery()
                     'thumbnail' => '/m/a/magento5.png',
                     'swatch_image' => '/m/a/magento6.png',
                 ],
-                '/m/a/magento4.png'
+                '/m/a/magento4.png',
             ],
             [
                 [],
@@ -411,22 +446,49 @@ protected function getSwatchAttributes()
             ->willReturn($returnFromProvideMethod);
     }
 
-    protected function getUsedProducts(array $attributes)
+    /**
+     * @param array $attributes
+     * @param array $imageTypes
+     */
+    protected function getUsedProducts(array $attributes, array $imageTypes)
     {
         $this->productMock
             ->expects($this->atLeastOnce())
             ->method('getTypeInstance')
             ->willReturn($this->configurableMock);
 
-        $product1 = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['hasData']);
-        $product1->setData($attributes);
-
-        $product2 = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['hasData']);
-        $product2->setData($attributes);
-
-        $simpleProducts = [$product2, $product1];
+        $simpleProducts = [];
+        for ($i = 0; $i < 2; $i++) {
+            $simpleProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['hasData', 'getMediaGalleryEntries'])
+                ->getMock();
+            $simpleProduct->setData($attributes);
+
+            $mediaGalleryEntries = [];
+            foreach (array_keys($imageTypes) as $mediaType) {
+                $mediaGalleryEntryMock = $this->getMockBuilder(
+                    \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class
+                )->getMock();
+                $mediaGalleryEntryMock->expects($this->any())
+                    ->method('isDisabled')
+                    ->willReturn(false);
+                $mediaGalleryEntryMock->expects($this->any())
+                    ->method('getTypes')
+                    ->willReturn([$mediaType]);
+
+                $mediaGalleryEntries[] = $mediaGalleryEntryMock;
+            }
+            $simpleProduct->expects($this->any())
+                ->method('getMediaGalleryEntries')
+                ->willReturn($mediaGalleryEntries);
+
+            $simpleProducts[] = $simpleProduct;
+        }
 
-        $this->configurableMock->expects($this->once())->method('getUsedProducts')->with($this->productMock)
+        $this->configurableMock->expects($this->once())
+            ->method('getUsedProducts')
+            ->with($this->productMock)
             ->willReturn($simpleProducts);
     }
 
@@ -473,6 +535,9 @@ protected function addfilterByParent()
         $zendDbSelectMock->method('where')->willReturn($zendDbSelectMock);
     }
 
+    /**
+     * @return array
+     */
     public function dataForCreateSwatchProduct()
     {
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
@@ -509,6 +574,9 @@ public function dataForCreateSwatchProduct()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function dataForCreateSwatchProductByFallback()
     {
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
@@ -550,6 +618,9 @@ public function testGetSwatchAttributesAsArray($optionsArray, $attributeData, $e
         $this->assertEquals($result, $expected);
     }
 
+    /**
+     * @return array
+     */
     public function dataForGettingSwatchAsArray()
     {
         return [
@@ -608,21 +679,36 @@ public function testGetSwatchesByOptionsIdIf1()
                 'option_id' => 35,
                 'id' => 423,
             ],
-        ];
-
-        $swatchMock->expects($this->at(0))->method('offsetGet')->with('type')->willReturn(1);
-        $swatchMock->expects($this->at(1))->method('offsetGet')->with('option_id')->willReturn(35);
-        $swatchMock->expects($this->at(2))->method('getData')->with('')->willReturn($optionsData[0]);
-
-        $swatchCollectionMock = $this->objectManager->getCollectionMock(
-            \Magento\Swatches\Model\ResourceModel\Swatch\Collection::class,
             [
-                $swatchMock,
+                'type' => 0,
+                'store_id' => 0,
+                'value' => 'test2',
+                'option_id' => 35,
+                'id' => 424,
             ]
-        );
-        $this->swatchCollectionFactoryMock->method('create')->willReturn($swatchCollectionMock);
+        ];
 
+        $swatchMock->expects($this->at(0))->method('offsetGet')->with('type')
+            ->willReturn($optionsData[0]['type']);
+        $swatchMock->expects($this->at(1))->method('offsetGet')->with('option_id')
+            ->willReturn($optionsData[0]['option_id']);
+        $swatchMock->expects($this->at(2))->method('getData')->with('')
+            ->willReturn($optionsData[0]);
+        $swatchMock->expects($this->at(3))->method('offsetGet')->with('type')
+            ->willReturn($optionsData[1]['type']);
+        $swatchMock->expects($this->at(4))->method('offsetGet')->with('store_id')
+            ->willReturn($optionsData[1]['store_id']);
+        $swatchMock->expects($this->at(5))->method('offsetGet')->with('store_id')
+            ->willReturn($optionsData[1]['store_id']);
+        $swatchMock->expects($this->at(6))->method('offsetGet')->with('option_id')
+            ->willReturn($optionsData[1]['option_id']);
+        $swatchMock->expects($this->at(7))->method('getData')->with('')
+            ->willReturn($optionsData[1]);
+
+        $swatchCollectionMock = $this->objectManager
+            ->getCollectionMock(Collection::class, [$swatchMock, $swatchMock]);
         $swatchCollectionMock->method('addFilterByOptionsIds')->with([35])->will($this->returnSelf());
+        $this->swatchCollectionFactoryMock->method('create')->willReturn($swatchCollectionMock);
 
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $this->storeManagerMock->method('getStore')->willReturn($storeMock);
@@ -664,7 +750,7 @@ public function testGetSwatchesByOptionsIdIf2()
         $swatchMock->expects($this->at(9))->method('getData')->with('')->willReturn($optionsData[1]);
 
         $swatchCollectionMock = $this->objectManager->getCollectionMock(
-            \Magento\Swatches\Model\ResourceModel\Swatch\Collection::class,
+            Collection::class,
             [
                 $swatchMock,
                 $swatchMock,
@@ -700,7 +786,7 @@ public function testGetSwatchesByOptionsIdIf3()
         $swatchMock->expects($this->at(4))->method('getData')->with('')->willReturn($optionsData);
 
         $swatchCollectionMock = $this->objectManager->getCollectionMock(
-            \Magento\Swatches\Model\ResourceModel\Swatch\Collection::class,
+            Collection::class,
             [
                 $swatchMock,
             ]
@@ -722,226 +808,4 @@ public function testIsProductHasSwatch()
         $result = $this->swatchHelperObject->isProductHasSwatch($this->productMock);
         $this->assertEquals(true, $result);
     }
-
-    /**
-     * @dataProvider dataIsVisualSwatch
-     */
-    public function testIsVisualSwatch($swatchType, $boolResult)
-    {
-        $this->attributeMock->method('hasData')->with('swatch_input_type')->willReturn(true);
-        $this->attributeMock
-            ->expects($this->once())
-            ->method('getData')
-            ->with('swatch_input_type')
-            ->willReturn($swatchType);
-        $result = $this->swatchHelperObject->isVisualSwatch($this->attributeMock);
-        if ($boolResult) {
-            $this->assertTrue($result);
-        } else {
-            $this->assertFalse($result);
-        }
-    }
-
-    public function dataIsVisualSwatch()
-    {
-        return [
-            [
-                'visual',
-                true,
-            ],
-            [
-                'some_other_type',
-                false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForIsVisualSwatchType
-     */
-    public function testIsVisualSwatchFalse($data, $count, $swatchType, $boolResult)
-    {
-        $this->attributeMock->method('hasData')->with('swatch_input_type')->willReturn(false);
-
-        $this->attributeMock->expects($this->exactly(2))
-            ->method('getData')
-            ->withConsecutive(
-                ['additional_data'],
-                ['swatch_input_type']
-            )
-            ->willReturnOnConsecutiveCalls(
-                $data,
-                $swatchType
-            );
-
-        $this->attributeMock
-            ->expects($this->exactly($count['setData']))
-            ->method('setData');
-
-        $result = $this->swatchHelperObject->isVisualSwatch($this->attributeMock);
-        if ($boolResult) {
-            $this->assertTrue($result);
-        } else {
-            $this->assertFalse($result);
-        }
-    }
-
-    public function dataForIsVisualSwatchType()
-    {
-        $additionalData = [
-            'swatch_input_type' => 'visual',
-            'update_product_preview_image' => 1,
-            'use_product_image_for_swatch' => 0
-        ];
-        return [
-            [
-                json_encode($additionalData),
-                [
-                    'getData' => 1,
-                    'setData' => 3,
-                ],
-                'visual',
-                true,
-            ],
-            [
-                null,
-                [
-                    'getData' => 1,
-                    'setData' => 0,
-                ],
-                'some_other_type',
-                false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForIsTextSwatchType
-     */
-    public function testIsTextSwatchFalse($data, $count, $swatchType, $boolResult)
-    {
-        $this->attributeMock->method('hasData')->with('swatch_input_type')->willReturn(false);
-
-        $this->attributeMock->expects($this->exactly(2))->method('getData')->withConsecutive(
-            ['additional_data'],
-            ['swatch_input_type']
-        )->willReturnOnConsecutiveCalls(
-            $data,
-            $swatchType
-        );
-
-        $this->attributeMock
-            ->expects($this->exactly($count['setData']))
-            ->method('setData');
-
-        $result = $this->swatchHelperObject->isTextSwatch($this->attributeMock);
-        if ($boolResult) {
-            $this->assertTrue($result);
-        } else {
-            $this->assertFalse($result);
-        }
-    }
-
-    public function dataForIsTextSwatchType()
-    {
-        $additionalData = [
-            'swatch_input_type' => 'text',
-            'update_product_preview_image' => 1,
-            'use_product_image_for_swatch' => 0
-        ];
-        return [
-            [
-                json_encode($additionalData),
-                [
-                    'getData' => 1,
-                    'setData' => 3,
-                ],
-                'text',
-                true,
-            ],
-            [
-                null,
-                [
-                    'getData' => 1,
-                    'setData' => 0,
-                ],
-                'some_other_type',
-                false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataIsTextSwatch
-     */
-    public function testIsTextSwatch($swatchType, $boolResult)
-    {
-        $this->attributeMock->method('hasData')->with('swatch_input_type')->willReturn(true);
-        $this->attributeMock
-            ->expects($this->once())
-            ->method('getData')
-            ->with('swatch_input_type')
-            ->willReturn($swatchType);
-        $result = $this->swatchHelperObject->isTextSwatch($this->attributeMock);
-        if ($boolResult) {
-            $this->assertTrue($result);
-        } else {
-            $this->assertFalse($result);
-        }
-    }
-
-    public function dataIsTextSwatch()
-    {
-        return [
-            [
-                'text',
-                true,
-            ],
-            [
-                'some_other_type',
-                false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataIsSwatchAttribute
-     */
-    public function testIsSwatchAttribute($times, $swatchType, $boolResult)
-    {
-        $this->attributeMock->method('hasData')->with('swatch_input_type')->willReturn(true);
-        $this->attributeMock
-            ->expects($this->exactly($times))
-            ->method('getData')
-            ->with('swatch_input_type')
-            ->willReturn($swatchType);
-
-        $result = $this->swatchHelperObject->isSwatchAttribute($this->attributeMock);
-        if ($boolResult) {
-            $this->assertTrue($result);
-        } else {
-            $this->assertFalse($result);
-        }
-    }
-
-    public function dataIsSwatchAttribute()
-    {
-        return [
-            [
-                1,
-                'visual',
-                true,
-            ],
-            [
-                2,
-                'text',
-                true,
-            ],
-            [
-                2,
-                'some_other_type',
-                false,
-            ],
-        ];
-    }
 }
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
index 920c35e44ebde..cb14e29ba3d64 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
@@ -30,9 +30,6 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Image\Factory */
     protected $imageFactoryMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Theme\Model\ResourceModel\Theme\Collection */
-    protected $themeCollectionMock;
-
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Config */
     protected $viewConfigMock;
 
@@ -59,10 +56,6 @@ protected function setUp()
         $this->storeManagerMock = $this->createPartialMock(\Magento\Store\Model\StoreManager::class, ['getStore']);
 
         $this->imageFactoryMock = $this->createMock(\Magento\Framework\Image\Factory::class);
-        $this->themeCollectionMock = $this->createPartialMock(
-            \Magento\Theme\Model\ResourceModel\Theme\Collection::class,
-            ['loadRegisteredThemes']
-        );
 
         $this->viewConfigMock = $this->createMock(\Magento\Framework\View\Config::class);
 
@@ -83,7 +76,6 @@ protected function setUp()
                 'fileStorageDb' => $this->fileStorageDbMock,
                 'storeManager' => $this->storeManagerMock,
                 'imageFactory' => $this->imageFactoryMock,
-                'themeCollection' => $this->themeCollectionMock,
                 'configInterface' => $this->viewConfigMock,
             ]
         );
@@ -114,6 +106,9 @@ public function testGetSwatchAttributeImage($swatchType, $expectedResult)
         $this->assertEquals($result, $expectedResult);
     }
 
+    /**
+     * @return array
+     */
     public function dataForFullPath()
     {
         return [
@@ -166,6 +161,7 @@ public function testGenerateSwatchVariations()
         $this->imageFactoryMock->expects($this->any())->method('create')->willReturn($image);
         $this->generateImageConfig();
         $image->expects($this->any())->method('resize')->will($this->returnSelf());
+        $image->expects($this->atLeastOnce())->method('backgroundColor')->with([255, 255, 255])->willReturnSelf();
         $this->mediaHelperObject->generateSwatchVariations('/e/a/earth.png');
     }
 
@@ -201,6 +197,9 @@ public function testGetFolderNameSize($swatchType, $imageConfig, $expectedResult
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public function dataForFolderName()
     {
         return [
@@ -248,10 +247,6 @@ public function testGetImageConfig()
 
     protected function generateImageConfig()
     {
-        $themeMock = $this->createMock(\Magento\Theme\Model\Theme::class);
-        $themesArrayMock = [$themeMock];
-        $this->themeCollectionMock->expects($this->any())->method('loadRegisteredThemes')->willReturn($themesArrayMock);
-
         $configMock = $this->createMock(\Magento\Framework\Config\View::class);
 
         $this->viewConfigMock
@@ -292,6 +287,9 @@ public function testGetSwatchCachePath($swatchType, $expectedResult)
         $this->assertEquals($expectedResult, $this->mediaHelperObject->getSwatchCachePath($swatchType));
     }
 
+    /**
+     * @return array
+     */
     public function getSwatchTypes()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
index 258347887ff08..317ea77107222 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
@@ -191,7 +191,7 @@ public function testBeforeSaveTextSwatch()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Admin is a required field in the each row
+     * @expectedExceptionMessage Admin is a required field in each row
      */
     public function testBeforeSaveWithFailedValidation()
     {
@@ -310,6 +310,9 @@ public function testBeforeSaveNotSwatch()
         $this->eavAttribute->beforeBeforeSave($this->attribute);
     }
 
+    /**
+     * @return array
+     */
     public function visualSwatchProvider()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
index b699d08076ef9..11a33b4d0400d 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
@@ -77,7 +77,11 @@ public function testBeforeGetImage($expected)
             ->method('getParams')
             ->willReturn($expected['getParams']);
 
-        $this->getFilterArray($expected);
+        $this->eavConfigMock
+            ->method('getEntityAttributes')
+            ->with('catalog_product')
+            ->willReturn(['color' => $this->attributeMock]);
+
         $this->canReplaceImageWithSwatch($expected);
         $this->swatchesHelperMock
             ->expects($this->exactly($expected['loadVariationByFallback_count']))
@@ -94,6 +98,9 @@ public function testBeforeGetImage($expected)
         $this->assertEquals([$this->productMock, $expected['page_handle'], []], $result);
     }
 
+    /**
+     * @param $expected
+     */
     protected function getFilterArray($expected)
     {
         $this->eavConfigMock
@@ -112,6 +119,9 @@ protected function getFilterArray($expected)
             ->willReturn($expected['getId']);
     }
 
+    /**
+     * @param $expected
+     */
     protected function canReplaceImageWithSwatch($expected)
     {
         $this->swatchesHelperMock
@@ -152,7 +162,6 @@ public function dataForTest()
                 [
                     'page_handle' => 'category_page_grid',
                     'getParams' => ['color' => 31],
-                    'attribute_codes_array' => ['color'],
                     'attribute_code' => 'color',
                     'getId_count' => 1,
                     'getId' => 332,
@@ -171,7 +180,6 @@ public function dataForTest()
                 [
                     'page_handle' => 'category_page_grid',
                     'getParams' => ['color' => 31],
-                    'attribute_codes_array' => ['color'],
                     'attribute_code' => 'color',
                     'getId_count' => 1,
                     'getId' => 332,
@@ -190,7 +198,6 @@ public function dataForTest()
                 [
                     'page_handle' => 'category_page_grid',
                     'getParams' => ['color' => 31],
-                    'attribute_codes_array' => ['color'],
                     'attribute_code' => 'color',
                     'getId_count' => 1,
                     'getId' => 332,
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductTest.php
index 791ba83b374c6..d7422786aec67 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductTest.php
@@ -39,6 +39,9 @@ public function testAfterGetMediaAttributes($productType, $hasKey)
         }
     }
 
+    /**
+     * @return array
+     */
     public function dataRoles()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeTypeTest.php b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeTypeTest.php
new file mode 100644
index 0000000000000..f2c52e2493faa
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeTypeTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Test\Unit\Model;
+
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Swatches\Model\Swatch;
+use Magento\Swatches\Model\SwatchAttributeType;
+
+/**
+ * Tests for \Magento\Swatches\Model\SwatchAttributeType class.
+ */
+class SwatchAttributeTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SwatchAttributeType
+     */
+    private $swatchType;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->swatchType = new SwatchAttributeType(new Json());
+    }
+
+    /**
+     * @dataProvider provideIsSwatchAttributeTestData
+     * @param string $dataValue
+     * @param bool $expected
+     * @return void
+     */
+    public function testIsSwatchAttribute(string $dataValue, bool $expected) : void
+    {
+        $this->assertEquals(
+            $expected,
+            $this->swatchType->isSwatchAttribute(
+                $this->createAttributeMock($dataValue)
+            )
+        );
+    }
+
+    /**
+     * DataProvider for testIsSwatchAttribute.
+     *
+     * @return array
+     */
+    public function provideIsSwatchAttributeTestData() : array
+    {
+        return [
+            [Swatch::SWATCH_INPUT_TYPE_TEXT, true],
+            [Swatch::SWATCH_INPUT_TYPE_VISUAL, true],
+            ['fake', false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideIsTextSwatchAttributeTestData
+     * @param string $dataValue
+     * @param bool $expected
+     * @return void
+     */
+    public function testIsTextSwatch(string $dataValue, bool $expected) : void
+    {
+        $this->assertEquals(
+            $expected,
+            $this->swatchType->isTextSwatch(
+                $this->createAttributeMock($dataValue)
+            )
+        );
+    }
+
+    /**
+     * DataProvider for testIsTextSwatch.
+     *
+     * @return array
+     */
+    public function provideIsTextSwatchAttributeTestData() : array
+    {
+        return [
+            [Swatch::SWATCH_INPUT_TYPE_TEXT, true],
+            [Swatch::SWATCH_INPUT_TYPE_VISUAL, false],
+            ['fake', false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideIsVisualSwatchAttributeTestData
+     * @param string $dataValue
+     * @param bool $expected
+     * @return void
+     */
+    public function testIsVisualSwatch(string $dataValue, bool $expected) : void
+    {
+        $this->assertEquals(
+            $expected,
+            $this->swatchType->isVisualSwatch(
+                $this->createAttributeMock($dataValue)
+            )
+        );
+    }
+
+    /**
+     * DataProvider for testIsTextSwatch.
+     *
+     * @return array
+     */
+    public function provideIsVisualSwatchAttributeTestData() : array
+    {
+        return [
+            [Swatch::SWATCH_INPUT_TYPE_VISUAL, true],
+            [Swatch::SWATCH_INPUT_TYPE_TEXT, false],
+            ['fake', false],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testIfAttributeHasNotAdditionData() : void
+    {
+        /** @var Json $json */
+        $json = new Json();
+        $encodedAdditionData = $json->serialize([Swatch::SWATCH_INPUT_TYPE_KEY => Swatch::SWATCH_INPUT_TYPE_TEXT]);
+
+        /** @var AttributeInterface | \PHPUnit_Framework_MockObject_MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(AttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['hasData', 'getData', 'setData'])
+            ->getMockForAbstractClass();
+
+        $attributeMock->expects($this->any())->method('hasData')->willReturn(false);
+
+        $attributeMock->expects($this->any())
+            ->method('getData')
+            ->willReturnMap(
+                [
+                    ['additional_data', $encodedAdditionData],
+                    [Swatch::SWATCH_INPUT_TYPE_KEY, Swatch::SWATCH_INPUT_TYPE_TEXT],
+                ]
+            );
+
+        $this->assertEquals(true, $this->swatchType->isTextSwatch($attributeMock));
+        $this->assertEquals(false, $this->swatchType->isVisualSwatch($attributeMock));
+    }
+
+    /**
+     * @param mixed $getDataReturns
+     * @param bool $hasDataReturns
+     * @return AttributeInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function createAttributeMock($getDataReturns, bool $hasDataReturns = true)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['hasData', 'getData', 'setData'])
+            ->getMockForAbstractClass();
+
+        $attributeMock->expects($this->any())->method('hasData')->willReturn($hasDataReturns);
+        $attributeMock->expects($this->any())->method('getData')->willReturn($getDataReturns);
+
+        return $attributeMock;
+    }
+}
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
index e00d46cfa1f3c..e9f5b580204d5 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Swatches\Test\Unit\Model;
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Swatches\Model\SwatchAttributeCodes;
 use Magento\Swatches\Model\SwatchAttributesProvider;
+use Magento\Swatches\Model\SwatchAttributeType;
 
 class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -32,20 +34,27 @@ class SwatchAttributesProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $productMock;
 
+    /**
+     * @var SwatchAttributeType | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $swatchTypeChecker;
+
     protected function setUp()
     {
         $this->typeConfigurable = $this->createPartialMock(
             Configurable::class,
-            ['getConfigurableAttributes', 'getCodes']
+            ['getConfigurableAttributes', 'getCodes', 'getProductAttribute']
         );
 
         $this->swatchAttributeCodes = $this->createMock(SwatchAttributeCodes::class);
 
         $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getId', 'getTypeId']);
+        $this->swatchTypeChecker = $this->createMock(SwatchAttributeType::class);
 
         $this->swatchAttributeProvider = (new ObjectManager($this))->getObject(SwatchAttributesProvider::class, [
             'typeConfigurable' => $this->typeConfigurable,
             'swatchAttributeCodes' => $this->swatchAttributeCodes,
+            'swatchTypeChecker' => $this->swatchTypeChecker,
         ]);
     }
 
@@ -55,9 +64,10 @@ public function testProvide()
         $this->productMock->method('getTypeId')
             ->willReturn(Configurable::TYPE_CODE);
 
-        $productAttributeMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Interception\InterceptorInterface::class
-        );
+        $attributeMock =  $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setStoreId', 'getData', 'setData', 'getSource', 'hasData'])
+            ->getMock();
 
         $configAttributeMock = $this->createPartialMock(
             Configurable\Attribute::class,
@@ -69,7 +79,7 @@ public function testProvide()
 
         $configAttributeMock
             ->method('getProductAttribute')
-            ->willReturn($productAttributeMock);
+            ->willReturn($attributeMock);
 
         $this->typeConfigurable
             ->method('getConfigurableAttributes')
@@ -81,9 +91,10 @@ public function testProvide()
             ->method('getCodes')
             ->willReturn($swatchAttributes);
 
-        $expected = [1 => $productAttributeMock];
+        $this->swatchTypeChecker->expects($this->once())->method('isSwatchAttribute')->willReturn(true);
+
         $result = $this->swatchAttributeProvider->provide($this->productMock);
 
-        $this->assertEquals($expected, $result);
+        $this->assertEquals([1 => $attributeMock], $result);
     }
 }
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
index 8292e0c2ed1bb..45c680366264b 100644
--- a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
@@ -73,6 +73,9 @@ public function testAddFields($expected)
         $this->observerMock->execute($this->eventObserverMock);
     }
 
+    /**
+     * @return array
+     */
     public function dataAddFields()
     {
         return [
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
index c24dd820e0144..f78797d93cb0d 100644
--- a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
@@ -66,6 +66,9 @@ public function testAddSwatchAttributeType($exp)
         $this->observerMock->execute($this->eventObserverMock);
     }
 
+    /**
+     * @return array
+     */
     public function dataAddSwatch()
     {
         return [
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 5e63cde9eb160..09d3e05008afe 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -5,26 +5,27 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-configurable-product": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-theme": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*"
     },
     "suggest": {
-        "magento/module-layered-navigation": "100.3.*",
-        "magento/module-swatches-sample-data": "Sample Data version:100.3.*"
+        "magento/module-layered-navigation": "*",
+        "magento/module-swatches-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Swatches/etc/adminhtml/di.xml b/app/code/Magento/Swatches/etc/adminhtml/di.xml
index 7a3b4a6fc8c60..42cd10db29799 100644
--- a/app/code/Magento/Swatches/etc/adminhtml/di.xml
+++ b/app/code/Magento/Swatches/etc/adminhtml/di.xml
@@ -27,6 +27,9 @@
     <type name="Magento\Catalog\Model\ResourceModel\Eav\Attribute">
         <plugin name="invalidate_caches_after_attribute_save" type="Magento\Swatches\Plugin\Catalog\CacheInvalidate" />
     </type>
+    <type name="Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype">
+        <plugin name="append_compatible_input_types" type="Magento\Swatches\Plugin\Eav\System\Config\Source\InputtypePlugin" />
+    </type>
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute\Validate">
         <arguments>
             <argument name="multipleAttributeList" xsi:type="array">
diff --git a/app/code/Magento/Swatches/etc/adminhtml/system.xml b/app/code/Magento/Swatches/etc/adminhtml/system.xml
index 7c61c240f9965..219fa9c913e5c 100644
--- a/app/code/Magento/Swatches/etc/adminhtml/system.xml
+++ b/app/code/Magento/Swatches/etc/adminhtml/system.xml
@@ -9,10 +9,10 @@
     <system>
         <section id="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="frontend" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                <field id="swatches_per_product" translate="label comment" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="swatches_per_product" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Swatches per Product</label>
                 </field>
-                <field id="show_swatches_in_product_list" translate="label comment" type="select" sortOrder="310" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="show_swatches_in_product_list" translate="label" type="select" sortOrder="310" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Show Swatches in Product List</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/Swatches/etc/db_schema.xml b/app/code/Magento/Swatches/etc/db_schema.xml
new file mode 100644
index 0000000000000..3dafbc3876494
--- /dev/null
+++ b/app/code/Magento/Swatches/etc/db_schema.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="catalog_eav_attribute" resource="default" comment="Catalog EAV Attribute Table">
+        <column xsi:type="text" name="additional_data" nullable="true" comment="Additional swatch attributes data"/>
+    </table>
+    <table name="eav_attribute_option_swatch" resource="default" engine="innodb" comment="Magento Swatches table">
+        <column xsi:type="int" name="swatch_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Swatch ID"/>
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Option ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="smallint" name="type" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Swatch type: 0 - text, 1 - visual color, 2 - visual image"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Swatch Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="swatch_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_STORE_STORE_ID"
+                    table="eav_attribute_option_swatch" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="EAV_ATTR_OPT_SWATCH_OPT_ID_EAV_ATTR_OPT_OPT_ID"
+                    table="eav_attribute_option_swatch" column="option_id" referenceTable="eav_attribute_option"
+                    referenceColumn="option_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_OPTION_ID">
+            <column name="store_id"/>
+            <column name="option_id"/>
+        </constraint>
+        <index referenceId="EAV_ATTRIBUTE_OPTION_SWATCH_SWATCH_ID" indexType="btree">
+            <column name="swatch_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Swatches/etc/db_schema_whitelist.json b/app/code/Magento/Swatches/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..e1b8e4c7e1798
--- /dev/null
+++ b/app/code/Magento/Swatches/etc/db_schema_whitelist.json
@@ -0,0 +1,25 @@
+{
+    "catalog_eav_attribute": {
+        "column": {
+            "additional_data": true
+        }
+    },
+    "eav_attribute_option_swatch": {
+        "column": {
+            "swatch_id": true,
+            "option_id": true,
+            "store_id": true,
+            "type": true,
+            "value": true
+        },
+        "index": {
+            "EAV_ATTRIBUTE_OPTION_SWATCH_SWATCH_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_STORE_STORE_ID": true,
+            "EAV_ATTR_OPT_SWATCH_OPT_ID_EAV_ATTR_OPT_OPT_ID": true,
+            "EAV_ATTRIBUTE_OPTION_SWATCH_STORE_ID_OPTION_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Swatches/etc/module.xml b/app/code/Magento/Swatches/etc/module.xml
index 1faec3b2792cb..4c97d8e0d8d1c 100644
--- a/app/code/Magento/Swatches/etc/module.xml
+++ b/app/code/Magento/Swatches/etc/module.xml
@@ -6,7 +6,7 @@
 */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Swatches" setup_version="2.0.3">
+    <module name="Magento_Swatches" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_ConfigurableProduct"/>
diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv
index 8954bdb9228e5..f35e9a0a46d48 100644
--- a/app/code/Magento/Swatches/i18n/en_US.csv
+++ b/app/code/Magento/Swatches/i18n/en_US.csv
@@ -1,4 +1,4 @@
-"Admin is a required field in the each row","Admin is a required field in the each row"
+"Admin is a required field in each row","Admin is a required field in each row"
 "Update Product Preview Image","Update Product Preview Image"
 "Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page"
 "Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible"
@@ -41,3 +41,4 @@ Admin,Admin
 "The value of Admin must be unique.","The value of Admin must be unique."
 "The value of Admin must be unique. (%1)","The value of Admin must be unique. (%1)"
 Description,Description
+More,More
diff --git a/app/code/Magento/Swatches/view/adminhtml/requirejs-config.js b/app/code/Magento/Swatches/view/adminhtml/requirejs-config.js
index 25e719e6b745c..ce695f2c3b6d1 100644
--- a/app/code/Magento/Swatches/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/Swatches/view/adminhtml/requirejs-config.js
@@ -6,8 +6,7 @@
 var config = {
     map: {
         '*': {
-            swatchesProductAttributes: 'Magento_Swatches/js/product-attributes',
-            swatchesTypeChange: 'Magento_Swatches/js/type-change'
+            swatchesProductAttributes: 'Magento_Swatches/js/product-attributes'
         }
     }
 };
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 13037e3aeea8e..e63e9f4b2adad 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -12,8 +12,7 @@
         "*": {
             "swatchesProductAttributes": {
                 "hiddenFields": <?= /* @escapeNotVerified */ json_encode($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields()) ?>
-            },
-            "swatchesTypeChange": { }
+            }
         }
     }
 </script>
diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
index 66626add3f671..b38e8ecc6e201 100644
--- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
@@ -13,14 +13,13 @@
                     <level>2</level>
                     <label translate="true">Swatch Image</label>
                 </settings>
-                <field name="watermark_swatch_image_image" formElement="fileUploader">
+                <field name="watermark_swatch_image_image" formElement="imageUploader">
                     <settings>
-                        <notice translate="true">Allowed file types: jpeg, gif, png.</notice>
                         <label translate="true">Image</label>
-                        <componentType>fileUploader</componentType>
+                        <componentType>imageUploader</componentType>
                     </settings>
                     <formElements>
-                        <fileUploader>
+                        <imageUploader>
                             <settings>
                                 <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
@@ -28,7 +27,7 @@
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                                 </uploaderConfig>
                             </settings>
-                        </fileUploader>
+                        </imageUploader>
                     </formElements>
                 </field>
                 <field name="watermark_swatch_image_imageOpacity" formElement="input">
diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
index 4152c06fa3ddc..2fdf5f3cd0ea9 100644
--- a/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
+++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -87,7 +87,6 @@
                 <additionalClasses>
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
-                <dataScope>text_swatch</dataScope>
                 <componentType>dynamicRows</componentType>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
@@ -96,8 +95,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">text_swatch.position</item>
-                        <item name="dataScope" xsi:type="string"/>
                     </item>
                 </argument>
                 <field name="defaulttext" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -183,15 +180,11 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
                         <dataType>text</dataType>
                         <visible>false</visible>
-                        <dataScope>position</dataScope>
                     </settings>
                 </field>
-                <actionDelete name="action_delete" component="Magento_Catalog/js/form/element/action-delete" template="Magento_Catalog/form/element/action-delete">
+                <actionDelete name="action_delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">true</item>
@@ -227,7 +220,6 @@
                     <class name="swatch-visual-options-container">true</class>
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
-                <dataScope>visual_swatch</dataScope>
                 <componentType>dynamicRows</componentType>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
@@ -236,8 +228,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">text_swatch.position</item>
-                        <item name="dataScope" xsi:type="string"/>
                     </item>
                 </argument>
                 <field name="defaultvisual" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -276,7 +266,6 @@
                             <class name="swatches-visual-col">true</class>
                         </additionalClasses>
                         <label translate="true">Swatch</label>
-                        <dataScope>swatchvisual</dataScope>
                     </settings>
                 </field>
                 <field name="optionvisual_default_store_view" component="Magento_Catalog/js/form/element/input" template="Magento_Catalog/form/element/input" formElement="input">
@@ -290,7 +279,6 @@
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Default Store View</label>
-                        <dataScope>optionvisual_default_store_view</dataScope>
                     </settings>
                 </field>
                 <field name="optionvisual_admin" component="Magento_Catalog/js/form/element/input" template="Magento_Catalog/form/element/input" formElement="input">
@@ -304,7 +292,6 @@
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Admin</label>
-                        <dataScope>optionvisual_admin</dataScope>
                     </settings>
                 </field>
                 <field name="position" component="Magento_Catalog/js/form/element/input" formElement="input">
@@ -315,15 +302,10 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
-                        <dataType>text</dataType>
-                        <visible>false</visible>
-                        <dataScope>position</dataScope>
+                         <visible>false</visible>
                     </settings>
                 </field>
-                <actionDelete name="action_delete" component="Magento_Catalog/js/form/element/action-delete" template="Magento_Catalog/form/element/action-delete">
+                <actionDelete name="action_delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">true</item>
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js b/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
index e63c9a2138a36..2fbce5aefbdeb 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
@@ -305,18 +305,30 @@ define([
          */
         initialize: function () {
             this._super()
-                .initOldCode();
+                .initOldCode()
+                .on('value', this.onChangeColor.bind(this));
 
             return this;
         },
 
+        /**
+         * Handler function that execute when color changes.
+         *
+         * @param {String} data - color
+         */
+        onChangeColor: function (data) {
+            if (!data) {
+                jQuery('.' + this.elementName).parent().removeClass('unavailable');
+            }
+        },
+
         /**
          * Initialize wrapped former implementation.
          *
          * @returns {Object} Chainable.
          */
         initOldCode: function () {
-            jQuery.async('.' + this.elementName, function (elem) {
+            jQuery.async('.' + this.elementName, this.name, function (elem) {
                 oldCode(this.value(), elem.parentElement, this.uploadUrl, this.elementName);
             }.bind(this));
 
@@ -336,9 +348,15 @@ define([
             this.elementName = this.prefixElementName + recordId;
 
             this.inputName = prefixName + '[' + this.elementName + ']';
-            this.dataScope = 'data.' + this.prefixName + '.' + this.elementName;
+            this.exportDataLink = 'data.' + this.prefixName + '.' + this.elementName;
+            this.exports.value = this.provider + ':' + this.exportDataLink;
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            this._super();
 
-            this.links.value = this.provider + ':' + this.dataScope;
+            this.source.remove(this.exportDataLink);
         },
 
         /**
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
index 226e46b7e37f5..f795f99e8112d 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
@@ -16,7 +16,8 @@ define([
     'use strict';
 
     return function (optionConfig) {
-        var swatchProductAttributes = {
+        var activePanelClass = 'selected-type-options',
+            swatchProductAttributes = {
                 frontendInput: $('#frontend_input'),
                 isFilterable: $('#is_filterable'),
                 isFilterableInSearch: $('#is_filterable_in_search'),
@@ -45,7 +46,7 @@ define([
                 get tabsFront() {
                     return this.attrTabsFront.length ? this.attrTabsFront.closest('li') : $('#front_fieldset-wrapper');
                 },
-                selectFields: ['select', 'multiselect', 'price', 'swatch_text', 'swatch_visual'],
+                selectFields: ['boolean', 'select', 'multiselect', 'price', 'swatch_text', 'swatch_visual'],
 
                 /**
                  * @this {swatchProductAttributes}
@@ -182,6 +183,7 @@ define([
                         useProductImageForSwatch = false,
                         defaultValueUpdateImage = false,
                         optionDefaultInputType = '',
+                        isFrontTabHidden = false,
                         thing = this;
 
                     if (!this.frontendInput.length) {
@@ -206,6 +208,7 @@ define([
                             break;
 
                         case 'textarea':
+                        case 'texteditor':
                             defaultValueTextareaVisibility = true;
                             break;
 
@@ -246,6 +249,7 @@ define([
                             switch (option) {
                                 case '_front_fieldset':
                                     thing.tabsFront.hide();
+                                    isFrontTabHidden = true;
                                     break;
 
                                 case '_default_value':
@@ -262,6 +266,11 @@ define([
                                     thing.setRowVisibility($('#' + option), false);
                             }
                         });
+
+                        if (!isFrontTabHidden) {
+                            thing.tabsFront.show();
+                        }
+
                     } else {
                         this.tabsFront.show();
                         this.showDefaultRows();
@@ -330,6 +339,7 @@ define([
                  */
                 _showPanel: function (el) {
                     el.closest('.fieldset').show();
+                    el.addClass(activePanelClass);
                     this._render(el.attr('id'));
                 },
 
@@ -339,6 +349,7 @@ define([
                  */
                 _hidePanel: function (el) {
                     el.closest('.fieldset').hide();
+                    el.removeClass(activePanelClass);
                 },
 
                 /**
@@ -406,6 +417,12 @@ define([
             };
 
         $(function () {
+            var editForm = $('#edit_form'),
+                swatchVisualPanel = $('#swatch-visual-options-panel'),
+                swatchTextPanel = $('#swatch-text-options-panel'),
+                tableBody = $(),
+                activePanel = $();
+
             $('#frontend_input').bind('change', function () {
                 swatchProductAttributes.bindAttributeInputType();
             });
@@ -415,10 +432,42 @@ define([
 
             swatchProductAttributes.bindAttributeInputType();
 
-            // @todo: refactor collapsable component
+            // @todo: refactor collapsible component
             $('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
                 .collapsable()
                 .collapse('hide');
+
+            editForm.on('beforeSubmit', function () {
+                var optionContainer, optionsValues;
+
+                activePanel = swatchTextPanel.hasClass(activePanelClass) ? swatchTextPanel : swatchVisualPanel;
+                optionContainer = activePanel.find('table tbody');
+
+                if (activePanel.hasClass(activePanelClass)) {
+                    optionsValues = $.map(
+                        optionContainer.find('tr'),
+                        function (row) {
+                            return $(row).find('input, select, textarea').serialize();
+                        }
+                    );
+                    $('<input>')
+                        .attr({
+                            type: 'hidden',
+                            name: 'serialized_options'
+                        })
+                        .val(JSON.stringify(optionsValues))
+                        .prependTo(editForm);
+                }
+
+                tableBody = optionContainer.detach();
+            });
+
+            editForm.on('afterValidate.error highlight.validate', function () {
+                if (activePanel.hasClass(activePanelClass)) {
+                    activePanel.find('table').append(tableBody);
+                    $('input[name="serialized_options"]').remove();
+                }
+            });
         });
 
         window.saveAttributeInNewSet = swatchProductAttributes.saveAttributeInNewSet;
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/type-change.js b/app/code/Magento/Swatches/view/adminhtml/web/js/type-change.js
deleted file mode 100644
index 40655486fdae2..0000000000000
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/type-change.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-require([
-    'jquery',
-    'mage/translate'
-], function ($) {
-    'use strict';
-
-    $(function () {
-
-        // disabled select only
-        $('select#frontend_input:disabled').each(function () {
-            var select = $(this),
-                currentValue = select.find('option:selected').val(),
-                enabledTypes = ['select', 'swatch_visual', 'swatch_text'],
-                warning = $('<label>')
-                    .hide()
-                    .text($.mage.__('These changes affect all related products.'))
-                    .addClass('mage-error')
-                    .attr({
-                        generated: true, for: select.attr('id')
-                    }),
-
-                /**
-                 * Toggle hint about changes types
-                 */
-                toggleWarning = function () {
-                    if (select.find('option:selected').val() === currentValue) {
-                        warning.hide();
-                    } else {
-                        warning.show();
-                    }
-                },
-
-                /**
-                 * Remove unsupported options
-                 */
-                removeOption = function () {
-                    if (!~enabledTypes.indexOf($(this).val())) {
-                        $(this).remove();
-                    }
-                };
-
-            // Check current type (allow only: select, swatch_visual, swatch_text)
-            if (!~enabledTypes.indexOf(currentValue)) {
-                return;
-            }
-
-            // Enable select and keep only available options (all other will be removed)
-            select.removeAttr('disabled').find('option').each(removeOption);
-
-            // Add warning on page and event for show/hide it
-            select.after(warning).on('change', toggleWarning);
-        });
-    });
-});
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html b/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html
index 271cea918b7be..8296e944a8ed3 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html
+++ b/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html
@@ -11,7 +11,7 @@
     },
     value: value
 "/>
-<div data-bind="attr: {class: 'swatch_window ' + elementName}"></div>
+<div attr="class: 'swatch_window ' + elementName" ko-style="backgroundColor: $data.value"></div>
 <div class="swatch_sub-menu_container">
     <div class="swatch_row position-relative">
         <div class="swatch_row_name colorpicker_handler">
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 7ecd6558ef6ea..c30c96fc890f7 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,39 @@
  * 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() ?>",
+                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>
             }
-        });
-    });
+        }
+    }
 </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/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index fc1de530a66bd..ebf47925434cd 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -18,8 +18,12 @@
                     echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
                 "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
                 "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
-                    'Magento_ConfigurableProduct') ?: 'replace'; ?>"
+                    'Magento_ConfigurableProduct') ?: 'replace'; ?>",
+                "jsonSwatchImageSizeConfig": <?php /* @noEscape */ echo $block->getJsonSwatchSizeConfig() ?>
             }
+        },
+        "*" : {
+            "Magento_Swatches/js/catalog-add-to-cart": {}
         }
     }
 </script>
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
index d699faae3a85f..80003ef68f1c4 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
@@ -7,11 +7,23 @@ require([
 ], function ($) {
     'use strict';
 
+    /**
+     * Add selected swatch attributes to redirect url
+     *
+     * @see Magento_Catalog/js/catalog-add-to-cart
+     */
     $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
         $(data.form).find('[name*="super"]').each(function (index, item) {
-            var $item = $(item);
+            var $item = $(item),
+                attr;
+
+            if ($item.attr('data-attr-name')) {
+                attr = $item.attr('data-attr-name');
+            } else {
+                attr = $item.parent().attr('attribute-code');
+            }
+            data.redirectParameters.push(attr + '=' + $item.val());
 
-            data.redirectParameters.push($item.attr('data-attr-name') + '=' + $item.val());
         });
     });
 });
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index d1f7c477ba8d7..938028f62502d 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -67,6 +67,8 @@ define([
      *  - option-label (string)
      *  - option-tooltip-thumb
      *  - option-tooltip-value
+     *  - thumb-width
+     *  - thumb-height
      */
     $.widget('mage.SwatchRendererTooltip', {
         options: {
@@ -86,11 +88,13 @@ define([
                 label = $this.attr('option-label'),
                 thumb = $this.attr('option-tooltip-thumb'),
                 value = $this.attr('option-tooltip-value'),
+                width = $this.attr('thumb-width'),
+                height = $this.attr('thumb-height'),
                 $image,
                 $title,
                 $corner;
 
-            if (!$element.size()) {
+            if (!$element.length) {
                 $element = $('<div class="' +
                     $widget.options.tooltipClass +
                     '"><div class="image"></div><div class="title"></div><div class="corner"></div></div>'
@@ -115,7 +119,9 @@ define([
                                 // Image
                                 $image.css({
                                     'background': 'url("' + thumb + '") no-repeat center', //Background case
-                                    'background-size': 'initial'
+                                    'background-size': 'initial',
+                                    'width': width + 'px',
+                                    'height': height + 'px'
                                 });
                                 $image.show();
                             } else if (type === 1) {
@@ -235,7 +241,7 @@ define([
             controlLabelId: '',
 
             // text for more button
-            moreButtonText: 'More',
+            moreButtonText: $t('More'),
 
             // Callback url for media
             mediaCallback: '',
@@ -268,8 +274,11 @@ define([
             // tier prise selectors start
             tierPriceTemplateSelector: '#tier-prices-template',
             tierPriceBlockSelector: '[data-role="tier-price-block"]',
-            tierPriceTemplate: ''
+            tierPriceTemplate: '',
             // tier prise selectors end
+
+            // A price label selector
+            normalPriceLabelSelector: '.normal-price .price-label'
         },
 
         /**
@@ -312,7 +321,7 @@ define([
          */
         _sortAttributes: function () {
             this.options.jsonConfig.attributes = _.sortBy(this.options.jsonConfig.attributes, function (attribute) {
-                return attribute.position;
+                return parseInt(attribute.position, 10);
             });
         },
 
@@ -473,6 +482,7 @@ define([
         _RenderSwatchOptions: function (config, controlId) {
             var optionConfig = this.options.jsonSwatchConfig[config.id],
                 optionClass = this.options.classes.optionClass,
+                sizeConfig = this.options.jsonSwatchImageSizeConfig,
                 moreLimit = parseInt(this.options.numberToShow, 10),
                 moreClass = this.options.classes.moreButton,
                 moreText = this.options.moreButtonText,
@@ -489,7 +499,11 @@ define([
                     value,
                     thumb,
                     label,
-                    attr;
+                    width,
+                    height,
+                    attr,
+                    swatchImageWidth,
+                    swatchImageHeight;
 
                 if (!optionConfig.hasOwnProperty(this.id)) {
                     return '';
@@ -504,6 +518,8 @@ define([
                 type = parseInt(optionConfig[id].type, 10);
                 value = optionConfig[id].hasOwnProperty('value') ? optionConfig[id].value : '';
                 thumb = optionConfig[id].hasOwnProperty('thumb') ? optionConfig[id].thumb : '';
+                width = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.width : 110;
+                height = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.height : 90;
                 label = this.label ? this.label : '';
                 attr =
                     ' id="' + controlId + '-item-' + id + '"' +
@@ -516,7 +532,12 @@ define([
                     ' aria-label="' + label + '"' +
                     ' option-tooltip-thumb="' + thumb + '"' +
                     ' option-tooltip-value="' + value + '"' +
-                    ' role="option"';
+                    ' role="option"' +
+                    ' thumb-width="' + width + '"' +
+                    ' thumb-height="' + height + '"';
+
+                swatchImageWidth = _.has(sizeConfig, 'swatchImage') ? sizeConfig.swatchImage.width : 30;
+                swatchImageHeight = _.has(sizeConfig, 'swatchImage') ? sizeConfig.swatchImage.height : 20;
 
                 if (!this.hasOwnProperty('products') || this.products.length <= 0) {
                     attr += ' option-empty="true"';
@@ -535,7 +556,8 @@ define([
                 } else if (type === 2) {
                     // Image
                     html += '<div class="' + optionClass + ' image" ' + attr +
-                        ' style="background: url(' + value + ') no-repeat center; background-size: initial;">' + '' +
+                        ' style="background: url(' + value + ') no-repeat center; background-size: initial;width:' +
+                        swatchImageWidth + 'px; height:' + swatchImageHeight + 'px">' + '' +
                         '</div>';
                 } else if (type === 3) {
                     // Clear
@@ -662,11 +684,21 @@ define([
                 if (!images) {
                     images = this.options.mediaGalleryInitial;
                 }
-
-                this.updateBaseImage(images, $main, !this.inProductList);
+                this.updateBaseImage(this._sortImages(images), $main, !this.inProductList);
             }
         },
 
+        /**
+         * Sorting images array
+         *
+         * @private
+         */
+        _sortImages: function (images) {
+            return _.sortBy(images, function (image) {
+                return image.position;
+            });
+        },
+
         /**
          * Event for swatch options
          *
@@ -810,7 +842,7 @@ define([
             $widget._Rewind(controls);
 
             // done if nothing selected
-            if (selected.size() <= 0) {
+            if (selected.length <= 0) {
                 return;
             }
 
@@ -820,7 +852,7 @@ define([
                     id = $this.attr('attribute-id'),
                     products = $widget._CalcProducts(id);
 
-                if (selected.size() === 1 && selected.first().attr('attribute-id') === id) {
+                if (selected.length === 1 && selected.first().attr('attribute-id') === id) {
                     return;
                 }
 
@@ -924,6 +956,22 @@ define([
             } else {
                 $(this.options.tierPriceBlockSelector).hide();
             }
+
+            $(this.options.normalPriceLabelSelector).hide();
+
+            _.each($('.' + this.options.classes.attributeOptionsWrapper), function (attribute) {
+                if ($(attribute).find('.' + this.options.classes.optionClass + '.selected').length === 0) {
+                    if ($(attribute).find('.' + this.options.classes.selectClass).length > 0) {
+                        _.each($(attribute).find('.' + this.options.classes.selectClass), function (dropdown) {
+                            if ($(dropdown).val() === '0') {
+                                $(this.options.normalPriceLabelSelector).show();
+                            }
+                        }.bind(this));
+                    } else {
+                        $(this.options.normalPriceLabelSelector).show();
+                    }
+                }
+            }.bind(this));
         },
 
         /**
@@ -935,13 +983,29 @@ define([
          * @private
          */
         _getPrices: function (newPrices, displayPrices) {
-            var $widget = this;
+            var $widget = this,
+                optionPriceDiff = 0,
+                allowedProduct, optionPrices, basePrice, optionFinalPrice;
 
             if (_.isEmpty(newPrices)) {
-                newPrices = $widget.options.jsonConfig.prices;
+                allowedProduct = this._getAllowedProductWithMinPrice(this._CalcProducts());
+                optionPrices = this.options.jsonConfig.optionPrices;
+                basePrice = parseFloat(this.options.jsonConfig.prices.basePrice.amount);
+
+                if (!_.isEmpty(allowedProduct)) {
+                    optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
+                    optionPriceDiff = optionFinalPrice - basePrice;
+                }
+
+                if (optionPriceDiff !== 0) {
+                    newPrices  = this.options.jsonConfig.optionPrices[allowedProduct];
+                } else {
+                    newPrices = $widget.options.jsonConfig.prices;
+                }
             }
 
             _.each(displayPrices, function (price, code) {
+
                 if (newPrices[code]) {
                     displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
                 }
@@ -950,6 +1014,34 @@ define([
             return displayPrices;
         },
 
+        /**
+         * Get product with minimum price from selected options.
+         *
+         * @param {Array} allowedProducts
+         * @returns {String}
+         * @private
+         */
+        _getAllowedProductWithMinPrice: function (allowedProducts) {
+            var optionPrices = this.options.jsonConfig.optionPrices,
+                product = {},
+                optionFinalPrice, optionMinPrice;
+
+            _.each(allowedProducts, function (allowedProduct) {
+                optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
+
+                if (_.isEmpty(product)) {
+                    optionMinPrice = optionFinalPrice;
+                    product = allowedProduct;
+                }
+
+                if (optionFinalPrice < optionMinPrice) {
+                    product = allowedProduct;
+                }
+            }, this);
+
+            return product;
+        },
+
         /**
          * Gets all product media and change current to the needed one
          *
@@ -996,12 +1088,14 @@ define([
                 mediaCallData.isAjax = true;
                 $widget._XhrKiller();
                 $widget._EnableProductMediaLoader($this);
-                $widget.xhr = $.get(
-                    $widget.options.mediaCallback,
-                    mediaCallData,
-                    mediaSuccessCallback,
-                    'json'
-                ).done(function () {
+                $widget.xhr = $.ajax({
+                    url: $widget.options.mediaCallback,
+                    cache: true,
+                    type: 'GET',
+                    dataType: 'json',
+                    data: mediaCallData,
+                    success: mediaSuccessCallback
+                }).done(function () {
                     $widget._XhrKiller();
                 });
             }
@@ -1016,7 +1110,7 @@ define([
         _EnableProductMediaLoader: function ($this) {
             var $widget = this;
 
-            if ($('body.catalog-product-view').size() > 0) {
+            if ($('body.catalog-product-view').length > 0) {
                 $this.parents('.column.main').find('.photo.image')
                     .addClass($widget.options.classes.loader);
             } else {
@@ -1035,7 +1129,7 @@ define([
         _DisableProductMediaLoader: function ($this) {
             var $widget = this;
 
-            if ($('body.catalog-product-view').size() > 0) {
+            if ($('body.catalog-product-view').length > 0) {
                 $this.parents('.column.main').find('.photo.image')
                     .removeClass($widget.options.classes.loader);
             } else {
@@ -1149,9 +1243,6 @@ define([
                         dataMergeStrategy: this.options.gallerySwitchStrategy
                     });
                 }
-
-                gallery.first();
-
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);
             }
@@ -1195,8 +1286,20 @@ define([
          */
         _EmulateSelected: function (selectedAttributes) {
             $.each(selectedAttributes, $.proxy(function (attributeCode, optionId) {
-                this.element.find('.' + this.options.classes.attributeClass +
-                    '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]').trigger('click');
+                var elem = this.element.find('.' + this.options.classes.attributeClass +
+                    '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]'),
+                    parentInput = elem.parent();
+
+                if (elem.hasClass('selected')) {
+                    return;
+                }
+
+                if (parentInput.hasClass(this.options.classes.selectClass)) {
+                    parentInput.val(optionId);
+                    parentInput.trigger('change');
+                } else {
+                    elem.trigger('click');
+                }
             }, this));
         },
 
diff --git a/app/code/Magento/SwatchesGraphQl/Model/Resolver/SwatchLayerFilterItemResolver.php b/app/code/Magento/SwatchesGraphQl/Model/Resolver/SwatchLayerFilterItemResolver.php
new file mode 100644
index 0000000000000..2fca92509eaf0
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/Model/Resolver/SwatchLayerFilterItemResolver.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesGraphQl\Model\Resolver;
+
+use \Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Resolver for swatches layer filter type.
+ */
+class SwatchLayerFilterItemResolver implements TypeResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveType(array $data) : string
+    {
+        if (isset($data['swatch_data'])) {
+            return 'SwatchLayerFilterItem';
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php b/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php
new file mode 100644
index 0000000000000..14c4ba62c8a47
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesGraphQl\Plugin\Filters;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters;
+use Magento\CatalogGraphQl\Model\Resolver\Layer\FiltersProvider;
+
+/**
+ * Plugin to add swatch data to filters data from filters data provider.
+ */
+class DataProviderPlugin
+{
+    /**
+     * @var FiltersProvider
+     */
+    private $filtersProvider;
+
+    /**
+     * @var \Magento\Swatches\Helper\Data
+     */
+    private $swatchHelper;
+
+    /**
+     * @var \Magento\Swatches\Block\LayeredNavigation\RenderLayered
+     */
+    private $renderLayered;
+
+    /**
+     * Filters constructor.
+     *
+     * @param FiltersProvider $filtersProvider
+     * @param \Magento\Swatches\Helper\Data $swatchHelper
+     */
+    public function __construct(
+        FiltersProvider $filtersProvider,
+        \Magento\Swatches\Helper\Data $swatchHelper,
+        \Magento\Swatches\Block\LayeredNavigation\RenderLayered $renderLayered
+    ) {
+        $this->filtersProvider = $filtersProvider;
+        $this->swatchHelper = $swatchHelper;
+        $this->renderLayered = $renderLayered;
+    }
+
+    /**
+     * Using around as layout type has to be passed.
+     *
+     * @param Filters $subject
+     * @param \Closure $proceed
+     * @param string $layerType
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function aroundGetData(Filters $subject, \Closure $proceed, string $layerType) : array
+    {
+        $swatchFilters = [];
+        /** @var AbstractFilter $filter */
+        foreach ($this->filtersProvider->getFilters($layerType) as $filter) {
+            if ($filter->hasAttributeModel()) {
+                if ($this->swatchHelper->isSwatchAttribute($filter->getAttributeModel())) {
+                    $swatchFilters[] = $filter;
+                }
+            }
+        }
+
+        $filtersData = $proceed($layerType);
+
+        foreach ($filtersData as $groupKey => $filterGroup) {
+            /** @var AbstractFilter $swatchFilter */
+            foreach ($swatchFilters as $swatchFilter) {
+                if ($filterGroup['request_var'] === $swatchFilter->getRequestVar()) {
+                    $swatchData = $this->renderLayered->setSwatchFilter($swatchFilter)->getSwatchData();
+                    foreach ($filterGroup['filter_items'] as $itemKey => $filterItem) {
+                        foreach ((array)$swatchData['swatches'] as $swatchKey => $swatchDataItem) {
+                            if ($filterItem['value_string'] == $swatchKey) {
+                                $filtersData[$groupKey]['filter_items'][$itemKey]['swatch_data'] = [
+                                    'type' => $swatchDataItem['type'],
+                                    'value' => $swatchDataItem['value']
+                                ];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $filtersData;
+    }
+}
diff --git a/app/code/Magento/SwatchesGraphQl/README.md b/app/code/Magento/SwatchesGraphQl/README.md
new file mode 100644
index 0000000000000..858c2491f33e5
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/README.md
@@ -0,0 +1,4 @@
+# SwatchesGraphQl
+
+**SwatchesGraphQl** provides type information for the GraphQl module
+to generate swatches fields for catalog and product information endpoints.
diff --git a/app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md b/app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3d31f777fa5b9
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swatches Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Swatches Graph Ql** module.
diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json
new file mode 100644
index 0000000000000..01ef35b1ccb6d
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-swatches-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-swatches": "*",
+        "magento/module-catalog": "*"
+    },
+    "suggest": {
+        "magento/module-catalog-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\SwatchesGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/SwatchesGraphQl/etc/graphql/di.xml b/app/code/Magento/SwatchesGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..34f65d8e30e57
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/etc/graphql/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\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters">
+        <plugin name="add_swatch_data_to_filters" type="Magento\SwatchesGraphQl\Plugin\Filters\DataProviderPlugin"/>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\LayerFilterItemTypeResolverComposite">
+        <arguments>
+            <argument name="typeResolvers" xsi:type="array">
+                <item name="swatch_layer_filter_item" xsi:type="object">Magento\SwatchesGraphQl\Model\Resolver\SwatchLayerFilterItemResolver</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/SwatchesGraphQl/etc/module.xml b/app/code/Magento/SwatchesGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..6689f13db754e
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_SwatchesGraphQl">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Swatches"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/SwatchesGraphQl/etc/schema.graphqls b/app/code/Magento/SwatchesGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..bdd2631e7aa10
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/etc/schema.graphqls
@@ -0,0 +1,29 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+interface ProductInterface {
+    swatch_image: String @doc(description: "The file name of a swatch image")
+}
+
+input ProductFilterInput {
+    swatch_image: FilterTypeInput @doc(description: "The file name of a swatch image")
+}
+
+input ProductSortInput {
+    swatch_image: SortEnum @doc(description: "The file name of a swatch image")
+}
+
+interface SwatchLayerFilterItemInterface @typeResolver(class: "Magento\\SwatchesGraphQl\\Model\\Resolver\\SwatchLayerFilterItemResolver")
+{
+    swatch_data: SwatchData @doc(description: "Data required to render swatch filter item")
+}
+
+type SwatchLayerFilterItem implements LayerFilterItemInterface, SwatchLayerFilterItemInterface
+{
+
+}
+
+type SwatchData {
+    type: String @doc(description: "Type of swatch filter item: 1 - text, 2 - image")
+    value: String @doc(description: "Value for swatch item (text or image link)")
+}
\ No newline at end of file
diff --git a/app/code/Magento/SwatchesGraphQl/registration.php b/app/code/Magento/SwatchesGraphQl/registration.php
new file mode 100644
index 0000000000000..824dba3fc1036
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SwatchesGraphQl', __DIR__);
diff --git a/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE.txt b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE_AFL.txt b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md
new file mode 100644
index 0000000000000..52402884b9f28
--- /dev/null
+++ b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swatches Layered Navigation Functional Tests
+
+The Functional Test Module for **Magento Swatches Layered Navigation** module.
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index 7bc4053df84f7..e11c3d9c4d423 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SwatchesLayeredNavigation/etc/module.xml b/app/code/Magento/SwatchesLayeredNavigation/etc/module.xml
index fb0ac8f1a0685..5b042ef434ddb 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/etc/module.xml
+++ b/app/code/Magento/SwatchesLayeredNavigation/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SwatchesLayeredNavigation" setup_version="2.0.0">
+    <module name="Magento_SwatchesLayeredNavigation" >
         <sequence>
             <module name="Magento_Swatches"/>
             <module name="Magento_LayeredNavigation"/>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
index 471f56cc4432b..376adba63db62 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
@@ -22,6 +22,8 @@ class Renderer extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Tax\Helper\Data
+     * @deprecated
+     * Marked as deprecated as it is unused.
      */
     protected $taxHelper;
 
@@ -46,6 +48,7 @@ class Renderer extends \Magento\Backend\Block\Template
      * @param TaxHelper $taxHelper
      * @param ItemPriceRenderer $itemPriceRenderer
      * @param array $data
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -137,7 +140,7 @@ public function getBaseTotalAmount($item)
     }
 
     /**
-     * Retrieve formated price, use different formatter depending on type of item
+     * Retrieve formatted price, use different formatter depending on type of item
      *
      * @param float $price
      * @return string
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 96fc9a40d53d1..450203486f364 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -31,7 +31,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     /**
      * @var string
      */
-    protected $_template = 'rate/form.phtml';
+    protected $_template = 'Magento_Tax::rate/form.phtml';
 
     /**
      * Tax data
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
index e1e866c06571b..9612b57f8d5d8 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
@@ -23,7 +23,7 @@ class Title extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'rate/title.phtml';
+    protected $_template = 'Magento_Tax::rate/title.phtml';
 
     /**
      * @var \Magento\Store\Model\StoreFactory
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index 80cc9673a0d38..16d828542c5b9 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -11,8 +11,6 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * @api
  * @since 100.0.2
@@ -22,7 +20,7 @@ class Add extends \Magento\Backend\Block\Template implements \Magento\Backend\Bl
     /**
      * @var string
      */
-    protected $_template = 'toolbar/rate/add.phtml';
+    protected $_template = 'Magento_Tax::toolbar/rate/add.phtml';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 19c5fab72ac4b..87e9d9e006064 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -11,12 +11,15 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
 
+/**
+ * Rate toolbar block
+ */
 class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\ContainerInterface
 {
     /**
      * @var string
      */
-    protected $_template = 'toolbar/rate/save.phtml';
+    protected $_template = 'Magento_Tax::toolbar/rate/save.phtml';
 
     /**
      * @var \Magento\Backend\Block\Widget\Button\ButtonList
@@ -46,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Init model
+     *
      * @return void
      */
     protected function _construct()
@@ -97,6 +102,8 @@ public function updateButton($buttonId, $key, $data)
     }
 
     /**
+     * Prepare layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -115,7 +122,7 @@ protected function _prepareLayout()
             ['label' => __('Reset'), 'onclick' => 'window.location.reload()', 'class' => 'reset']
         );
 
-        $rate = intval($this->getRequest()->getParam('rate'));
+        $rate = (int)$this->getRequest()->getParam('rate');
         if ($rate) {
             $this->buttonList->add(
                 'delete',
diff --git a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
index 68de4cb24a487..77af1ad99ea2c 100644
--- a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
@@ -15,7 +15,7 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
      *
      * @var string
      */
-    protected $_template = 'checkout/grandtotal.phtml';
+    protected $_template = 'Magento_Tax::checkout/grandtotal.phtml';
 
     /**
      * @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
index e9098035053be..299c586fd224c 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
@@ -15,7 +15,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
      *
      * @var string
      */
-    protected $_template = 'checkout/shipping.phtml';
+    protected $_template = 'Magento_Tax::checkout/shipping.phtml';
 
     /**
      * @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Subtotal.php b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
index 7a9059df08bab..22da07954159d 100644
--- a/app/code/Magento/Tax/Block/Checkout/Subtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
@@ -15,7 +15,7 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
      *
      * @var string
      */
-    protected $_template = 'checkout/subtotal.phtml';
+    protected $_template = 'Magento_Tax::checkout/subtotal.phtml';
 
     /**
      * @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Tax.php b/app/code/Magento/Tax/Block/Checkout/Tax.php
index f741e64019de1..0a86c0312ab1c 100644
--- a/app/code/Magento/Tax/Block/Checkout/Tax.php
+++ b/app/code/Magento/Tax/Block/Checkout/Tax.php
@@ -14,5 +14,5 @@ class Tax extends \Magento\Checkout\Block\Total\DefaultTotal
     /**
      * @var string
      */
-    protected $_template = 'checkout/tax.phtml';
+    protected $_template = 'Magento_Tax::checkout/tax.phtml';
 }
diff --git a/app/code/Magento/Tax/Block/Grid/Renderer/Codes.php b/app/code/Magento/Tax/Block/Grid/Renderer/Codes.php
index c4ed80c522c6e..6c4e754f7e316 100644
--- a/app/code/Magento/Tax/Block/Grid/Renderer/Codes.php
+++ b/app/code/Magento/Tax/Block/Grid/Renderer/Codes.php
@@ -20,6 +20,6 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $ratesCodes = $row->getTaxRatesCodes();
 
-        return is_array($ratesCodes) ? implode(', ', $ratesCodes) : '';
+        return $ratesCodes && is_array($ratesCodes) ? $this->escapeHtml(implode(', ', $ratesCodes)) : '';
     }
 }
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index 71eb629111344..4d48abbcb0982 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -264,12 +264,6 @@ protected function _initShipping()
      */
     protected function _initDiscount()
     {
-        //        $store  = $this->getStore();
-        //        $parent = $this->getParentBlock();
-        //        if ($this->_config->displaySales) {
-        //
-        //        } elseif ($this->_config->displaySales) {
-        //        }
     }
 
     /**
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
index b91eef7b6f70e..565af0e0bf93b 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rate;
 
-class Index extends \Magento\Tax\Controller\Adminhtml\Rate
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Tax\Controller\Adminhtml\Rate implements HttpGetActionInterface
 {
     /**
      * Show Main Grid
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
index 71b6d7bf39396..1e46f0ea3d24a 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Delete extends \Magento\Tax\Controller\Adminhtml\Rule
+class Delete extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpPostActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
index dc0f518802520..740d7e8afe62c 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php
@@ -6,9 +6,10 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Edit extends \Magento\Tax\Controller\Adminhtml\Rule
+class Edit extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
index ddf6099a4f832..fd774777e3ef4 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
-class Index extends \Magento\Tax\Controller\Adminhtml\Rule
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
index 847f1312e8caf..b623b6c6868e7 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
@@ -51,8 +51,8 @@ public function execute()
         }
 
         // clear the block html cache
-        $this->_cacheTypeList->cleanType('block_html');
-        $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => 'block_html']);
+        $this->_cacheTypeList->cleanType('config');
+        $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => 'config']);
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 6d79540464ea1..0e950460a26d4 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -9,7 +9,6 @@
 use Magento\Store\Model\Store;
 use Magento\Customer\Model\Address;
 use Magento\Tax\Model\Config;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Tax\Api\OrderTaxManagementInterface;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Order\Creditmemo;
@@ -734,7 +733,7 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
             $orderItemId = $orderItem->getId();
             $orderItemTax = $orderItem->getTaxAmount();
             $itemTax = $item->getTaxAmount();
-            if (!$itemTax || !floatval($orderItemTax)) {
+            if (!$itemTax || !(float)$orderItemTax) {
                 continue;
             }
             //An invoiced item or credit memo item can have a different qty than its order item qty
@@ -762,7 +761,7 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
         $originalShippingTaxAmount = $order->getShippingTaxAmount();
         if ($shippingTaxAmount && $originalShippingTaxAmount &&
-            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
+            $shippingTaxAmount != 0 && (float)$originalShippingTaxAmount
         ) {
             //An invoice or credit memo can have a different qty than its order
             $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
index afcfa1bbebcb0..bad64260cf58a 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
@@ -10,7 +10,7 @@
 abstract class AbstractAggregateCalculator extends AbstractCalculator
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
@@ -86,7 +86,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
     {
@@ -149,6 +149,7 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
         $rowTaxBeforeDiscount = array_sum($rowTaxesBeforeDiscount);
         $rowTotalInclTax = $rowTotal + $rowTaxBeforeDiscount;
         $priceInclTax = $rowTotalInclTax / $quantity;
+
         if ($round) {
             $priceInclTax = $this->calculationTool->round($priceInclTax);
         }
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index 1930ee8ec380d..e848afd7f3eca 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -124,13 +124,13 @@ public function beforeSave()
 
         if ($isEmptyValues || $isWrongRange) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Make sure all required information is valid.')
+                __('The required information is invalid. Verify the information and try again.')
             );
         }
 
         if (!is_numeric($this->getRate()) || $this->getRate() < 0) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('The Rate Percent should be a positive number.')
+                __('The Rate Percent is invalid. Enter a positive number and try again.')
             );
         }
 
@@ -139,12 +139,17 @@ public function beforeSave()
             $zipTo = $this->getZipTo();
 
             if (strlen($zipFrom) > 9 || strlen($zipTo) > 9) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Maximum zip code length is 9.'));
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __(
+                        'The ZIP Code length is invalid. '
+                        . 'Verify that the length is nine characters or fewer and try again.'
+                    )
+                );
             }
 
             if (!is_numeric($zipFrom) || !is_numeric($zipTo) || $zipFrom < 0 || $zipTo < 0) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Use digits only for the zip code.')
+                    __('The ZIP Code is invalid. Use numbers only.')
                 );
             }
 
@@ -199,7 +204,7 @@ public function beforeDelete()
     {
         if ($this->_isInRule()) {
             throw new CouldNotDeleteException(
-                __('The tax rate cannot be removed. It exists in a tax rule.')
+                __("The tax rate can't be removed because it exists in a tax rule.")
             );
         }
         return parent::beforeDelete();
diff --git a/app/code/Magento/Tax/Model/Calculation/RateRepository.php b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
index 3e7c24ce81015..f8afdf625fd87 100644
--- a/app/code/Magento/Tax/Model/Calculation/RateRepository.php
+++ b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
@@ -232,7 +232,7 @@ private function validate(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
 
         $countryCode = $taxRate->getTaxCountryId();
         if (!\Zend_Validate::is($countryCode, 'NotEmpty')) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'country_id']));
+            $exception->addError(__('"%fieldName" is required. Enter and try again.', ['fieldName' => 'country_id']));
         } elseif (!\Zend_Validate::is(
             $this->countryFactory->create()->loadByCode($countryCode)->getId(),
             'NotEmpty'
@@ -265,11 +265,13 @@ private function validate(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
         }
 
         if (!is_numeric($taxRate->getRate()) || $taxRate->getRate() < 0) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'percentage_rate']));
+            $exception->addError(
+                __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'percentage_rate'])
+            );
         }
 
         if (!\Zend_Validate::is(trim($taxRate->getCode()), 'NotEmpty')) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'code']));
+            $exception->addError(__('"%fieldName" is required. Enter and try again.', ['fieldName' => 'code']));
         }
 
         if ($taxRate->getZipIsRange()) {
@@ -292,7 +294,7 @@ private function validate(\Magento\Tax\Api\Data\TaxRateInterface $taxRate)
             }
         } else {
             if (!\Zend_Validate::is(trim($taxRate->getTaxPostcode()), 'NotEmpty')) {
-                $exception->addError(__('%fieldName is a required field.', ['fieldName' => 'postcode']));
+                $exception->addError(__('"%fieldName" is required. Enter and try again.', ['fieldName' => 'postcode']));
             }
         }
 
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
index 75923748e14cf..29601b53c7765 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Tax\Model\Calculation\Rule;
 
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Model\ClassModel as TaxClassModel;
 use Magento\Tax\Model\ClassModelRegistry;
@@ -43,7 +42,11 @@ public function isValid($value)
 
         // Position is required and must be 0 or greater
         if (!\Zend_Validate::is(trim($value->getPosition()), 'NotEmpty')) {
-            $this->addErrorMessage($messages, '%fieldName is a required field.', ['fieldName' => 'position']);
+            $this->addErrorMessage(
+                $messages,
+                '"%fieldName" is required. Enter and try again.',
+                ['fieldName' => 'position']
+            );
         }
         if (!\Zend_Validate::is(trim($value->getPosition()), 'GreaterThan', [-1])) {
             $this->addErrorMessage(
@@ -55,7 +58,11 @@ public function isValid($value)
 
         // Priority is required and must be 0 or greater
         if (!\Zend_Validate::is(trim($value->getPriority()), 'NotEmpty')) {
-            $this->addErrorMessage($messages, '%fieldName is a required field.', ['fieldName' => 'priority']);
+            $this->addErrorMessage(
+                $messages,
+                '"%fieldName" is required. Enter and try again.',
+                ['fieldName' => 'priority']
+            );
         }
         if (!\Zend_Validate::is(trim($value->getPriority()), 'GreaterThan', [-1])) {
             $this->addErrorMessage(
@@ -67,14 +74,18 @@ public function isValid($value)
 
         // Code is required
         if (!\Zend_Validate::is(trim($value->getCode()), 'NotEmpty')) {
-            $this->addErrorMessage($messages, '%fieldName is a required field.', ['fieldName' => 'code']);
+            $this->addErrorMessage(
+                $messages,
+                '"%fieldName" is required. Enter and try again.',
+                ['fieldName' => 'code']
+            );
         }
 
         // customer tax class ids is required
         if (($value->getCustomerTaxClassIds() === null) || !$value->getCustomerTaxClassIds()) {
             $this->addErrorMessage(
                 $messages,
-                '%fieldName is a required field.',
+                '"%fieldName" is required. Enter and try again.',
                 ['fieldName' => 'customer_tax_class_ids']
             );
         } else { // see if the customer tax class ids exist
@@ -106,7 +117,7 @@ public function isValid($value)
         if (($value->getProductTaxClassIds() === null) || !$value->getProductTaxClassIds()) {
             $this->addErrorMessage(
                 $messages,
-                '%fieldName is a required field.',
+                '"%fieldName" is required. Enter and try again.',
                 ['fieldName' => 'product_tax_class_ids']
             );
         } else { // see if the product tax class ids exist
@@ -136,7 +147,11 @@ public function isValid($value)
 
         // tax rate ids is required
         if (($value->getTaxRateIds() === null) || !$value->getTaxRateIds()) {
-            $this->addErrorMessage($messages, '%fieldName is a required field.', ['fieldName' => 'tax_rate_ids']);
+            $this->addErrorMessage(
+                $messages,
+                '"%fieldName" is required. Enter and try again.',
+                ['fieldName' => 'tax_rate_ids']
+            );
         }
         $this->_addMessages($messages);
         return empty($messages);
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index b30e5afb85142..09212ce90bf58 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -832,12 +832,12 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
@@ -845,7 +845,7 @@ public function needPriceConversion($store = null)
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;
diff --git a/app/code/Magento/Tax/Model/Plugin/OrderSave.php b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
index a1a3ebf861d60..38952eec02ca1 100644
--- a/app/code/Magento/Tax/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Tax\Model\Plugin;
 
+use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxExtension;
+
 class OrderSave
 {
     /**
@@ -79,8 +81,9 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
         foreach ($taxesForItems as $taxesArray) {
             foreach ($taxesArray['applied_taxes'] as $rates) {
                 if (isset($rates['extension_attributes'])) {
-                    /** @var \Magento\Tax\Api\Data\AppliedTaxRateInterface[] $taxRates */
-                    $taxRates = $rates['extension_attributes']->getRates();
+                    $taxRates = $rates['extension_attributes'] instanceof OrderTaxDetailsAppliedTaxExtension
+                        ? $rates['extension_attributes']->getRates()
+                        : $rates['extension_attributes']['rates'];
                     if (is_array($taxRates)) {
                         if (count($taxRates) == 1) {
                             $ratesIdQuoteItemId[$rates['id']][] = [
@@ -124,8 +127,9 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
         foreach ($taxes as $row) {
             $id = $row['id'];
             if (isset($row['extension_attributes'])) {
-                /** @var \Magento\Tax\Api\Data\AppliedTaxRateInterface[] $taxRates */
-                $taxRates = $row['extension_attributes']->getRates();
+                $taxRates = $row['extension_attributes'] instanceof OrderTaxDetailsAppliedTaxExtension
+                    ? $row['extension_attributes']->getRates()
+                    : $row['extension_attributes']['rates'];
                 if (is_array($taxRates)) {
                     foreach ($taxRates as $tax) {
                         if ($row['percent'] == null) {
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php
index e509f477bcd8d..91fd0f4dcffb3 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php
@@ -6,7 +6,7 @@
 namespace Magento\Tax\Model\ResourceModel\Calculation;
 
 /**
- * Tax rate resource model
+ * Tax rule resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
index ebf699db552d6..60cb6fe2898ae 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Tax\Model\ResourceModel\Report\Tax;
 
+/**
+ * Class for tax report resource model with aggregation by created at
+ */
 class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
     /**
@@ -84,7 +87,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                 'order_status' => 'e.status',
                 'percent' => 'MAX(tax.' . $connection->quoteIdentifier('percent') . ')',
                 'orders_count' => 'COUNT(DISTINCT e.entity_id)',
-                'tax_base_amount_sum' => 'SUM(tax.base_amount * e.base_to_global_rate)',
+                'tax_base_amount_sum' => 'SUM(tax.base_real_amount * e.base_to_global_rate)',
             ];
 
             $select = $connection->select()->from(
diff --git a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
index c563ee1b3084e..2e6e74a573f99 100644
--- a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
+++ b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
@@ -10,7 +10,6 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterfaceFactory as TaxDetailsDataObjectFactory;
 use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface as AppliedTax;
-use Magento\Tax\Model\Sales\Order\Tax;
 use Magento\Sales\Model\Order\Tax\Item;
 
 class TaxManagement implements \Magento\Tax\Api\OrderTaxManagementInterface
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
index 16a55dbfac3e2..ddfb6f9fd5073 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\Quote\Model\Quote\Address;
@@ -39,16 +41,23 @@ public function collect(
         $quoteDetails = $this->prepareQuoteDetails($shippingAssignment, [$shippingDataObject]);
         $taxDetails = $this->taxCalculationService
             ->calculateTax($quoteDetails, $storeId);
+        $taxDetailsItems = $taxDetails->getItems()[self::ITEM_CODE_SHIPPING];
 
         $baseQuoteDetails = $this->prepareQuoteDetails($shippingAssignment, [$baseShippingDataObject]);
         $baseTaxDetails = $this->taxCalculationService
             ->calculateTax($baseQuoteDetails, $storeId);
+        $baseTaxDetailsItems = $baseTaxDetails->getItems()[self::ITEM_CODE_SHIPPING];
+
+        $quote->getShippingAddress()
+            ->setShippingAmount($taxDetailsItems->getRowTotal());
+        $quote->getShippingAddress()
+            ->setBaseShippingAmount($baseTaxDetailsItems->getRowTotal());
 
         $this->processShippingTaxInfo(
             $shippingAssignment,
             $total,
-            $taxDetails->getItems()[self::ITEM_CODE_SHIPPING],
-            $baseTaxDetails->getItems()[self::ITEM_CODE_SHIPPING]
+            $taxDetailsItems,
+            $baseTaxDetailsItems
         );
 
         return $this;
@@ -58,6 +67,8 @@ public function collect(
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return array|null
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index de884be6bc839..4aea7ab4c5a7c 100755
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -152,12 +152,23 @@ protected function clearValues(Address\Total $total)
         $total->setBaseTotalAmount('subtotal', 0);
         $total->setTotalAmount('tax', 0);
         $total->setBaseTotalAmount('tax', 0);
+        $total->setTotalAmount('shipping', 0);
+        $total->setBaseTotalAmount('shipping', 0);
         $total->setTotalAmount('discount_tax_compensation', 0);
         $total->setBaseTotalAmount('discount_tax_compensation', 0);
         $total->setTotalAmount('shipping_discount_tax_compensation', 0);
         $total->setBaseTotalAmount('shipping_discount_tax_compensation', 0);
         $total->setSubtotalInclTax(0);
         $total->setBaseSubtotalInclTax(0);
+        $total->setShippingInclTax(0);
+        $total->setBaseShippingInclTax(0);
+        $total->setShippingTaxAmount(0);
+        $total->setBaseShippingTaxAmount(0);
+        $total->setShippingAmountForDiscount(0);
+        $total->setBaseShippingAmountForDiscount(0);
+        $total->setBaseShippingAmountForDiscount(0);
+        $total->setTotalAmount('extra_tax', 0);
+        $total->setBaseTotalAmount('extra_tax', 0);
     }
 
     /**
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
index 19731403ae74b..9707f3ae6e353 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
@@ -13,12 +13,11 @@ class Country extends \Magento\Directory\Model\Config\Source\Country
     protected $_options;
 
     /**
-     * @param bool $noEmpty
-     * @return array
+     * @inheritdoc
      */
-    public function toOptionArray($noEmpty = false)
+    public function toOptionArray($noEmpty = false, $foregroundCountries = '')
     {
-        $options = parent::toOptionArray($noEmpty);
+        $options = parent::toOptionArray($noEmpty, $foregroundCountries);
 
         if (!$noEmpty) {
             if ($options) {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Repository.php b/app/code/Magento/Tax/Model/TaxClass/Repository.php
index 245fc6964c205..cfb8f82cf0f11 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Repository.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Repository.php
@@ -179,12 +179,16 @@ protected function validateTaxClassData(\Magento\Tax\Api\Data\TaxClassInterface
         $exception = new InputException();
 
         if (!\Zend_Validate::is(trim($taxClass->getClassName()), 'NotEmpty')) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => ClassModel::KEY_NAME]));
+            $exception->addError(
+                __('"%fieldName" is required. Enter and try again.', ['fieldName' => ClassModel::KEY_NAME])
+            );
         }
 
         $classType = $taxClass->getClassType();
         if (!\Zend_Validate::is(trim($classType), 'NotEmpty')) {
-            $exception->addError(__('%fieldName is a required field.', ['fieldName' => ClassModel::KEY_TYPE]));
+            $exception->addError(
+                __('"%fieldName" is required. Enter and try again.', ['fieldName' => ClassModel::KEY_TYPE])
+            );
         } elseif ($classType !== TaxClassManagementInterface::TYPE_CUSTOMER
             && $classType !== TaxClassManagementInterface::TYPE_PRODUCT
         ) {
diff --git a/app/code/Magento/Tax/Model/TaxRuleCollection.php b/app/code/Magento/Tax/Model/TaxRuleCollection.php
index 33aaf3b22b6d6..5c6f3b1f14455 100644
--- a/app/code/Magento/Tax/Model/TaxRuleCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRuleCollection.php
@@ -27,14 +27,14 @@ class TaxRuleCollection extends AbstractServiceCollection
     /**
      * Initialize dependencies.
      *
-     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
+     * @param EntityFactory $entityFactory
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param SortOrderBuilder $sortOrderBuilder
      * @param TaxRuleRepositoryInterface $ruleService
      */
     public function __construct(
-        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+        EntityFactory $entityFactory,
         FilterBuilder $filterBuilder,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         SortOrderBuilder $sortOrderBuilder,
diff --git a/app/code/Magento/Tax/Setup/InstallData.php b/app/code/Magento/Tax/Setup/InstallData.php
deleted file mode 100644
index 31d0798847db5..0000000000000
--- a/app/code/Magento/Tax/Setup/InstallData.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Tax\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Directory\Model\RegionFactory;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Tax setup factory
-     *
-     * @var TaxSetupFactory
-     */
-    private $taxSetupFactory;
-
-    /**
-     * @var RegionFactory
-     */
-    private $directoryRegionFactory;
-
-    /**
-     * @param TaxSetupFactory $taxSetupFactory
-     * @param RegionFactory $directoryRegionFactory
-     */
-    public function __construct(
-        TaxSetupFactory $taxSetupFactory,
-        RegionFactory $directoryRegionFactory
-    ) {
-        $this->taxSetupFactory = $taxSetupFactory;
-        $this->directoryRegionFactory = $directoryRegionFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var TaxSetup $taxSetup */
-        $taxSetup = $this->taxSetupFactory->create(['resourceName' => 'tax_setup', 'setup' => $setup]);
-
-        /**
-         * Add tax_class_id attribute to the 'eav_attribute' table
-         */
-        $taxSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
-            'tax_class_id',
-            [
-                'group' => 'Product Details',
-                'sort_order' => 40,
-                'type' => 'int',
-                'backend' => '',
-                'frontend' => '',
-                'label' => 'Tax Class',
-                'input' => 'select',
-                'class' => '',
-                'source' => \Magento\Tax\Model\TaxClass\Source\Product::class,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
-                'visible' => true,
-                'required' => false,
-                'user_defined' => false,
-                'default' => '2',
-                'searchable' => true,
-                'filterable' => false,
-                'comparable' => false,
-                'visible_on_front' => false,
-                'visible_in_advanced_search' => false,
-                'used_in_product_listing' => true,
-                'unique' => false,
-                'apply_to' => implode(',', $taxSetup->getTaxableItems()),
-                'is_used_in_grid' => true,
-                'is_visible_in_grid' => false,
-                'is_filterable_in_grid' => true,
-            ]
-        );
-
-        /**
-         * install tax classes
-         */
-        $data = [
-            [
-                'class_id' => 2,
-                'class_name' => 'Taxable Goods',
-                'class_type' => \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT,
-            ],
-            [
-                'class_id' => 3,
-                'class_name' => 'Retail Customer',
-                'class_type' => \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_CUSTOMER
-            ],
-        ];
-        foreach ($data as $row) {
-            $setup->getConnection()->insertForce($setup->getTable('tax_class'), $row);
-        }
-
-        /**
-         * install tax calculation rates
-         */
-        /** @var \Magento\Directory\Model\Region $region */
-        $region = $this->directoryRegionFactory->create();
-        $data = [
-            [
-                'tax_calculation_rate_id' => 1,
-                'tax_country_id' => 'US',
-                'tax_region_id' => $region->loadByCode('CA', 'US')->getRegionId(),
-                'tax_postcode' => '*',
-                'code' => 'US-CA-*-Rate 1',
-                'rate' => '8.2500',
-            ],
-            [
-                'tax_calculation_rate_id' => 2,
-                'tax_country_id' => 'US',
-                'tax_region_id' => $region->loadByCode('NY', 'US')->getRegionId(),
-                'tax_postcode' => '*',
-                'code' => 'US-NY-*-Rate 1',
-                'rate' => '8.3750'
-            ],
-        ];
-        foreach ($data as $row) {
-            $setup->getConnection()->insertForce($setup->getTable('tax_calculation_rate'), $row);
-        }
-    }
-}
diff --git a/app/code/Magento/Tax/Setup/InstallSchema.php b/app/code/Magento/Tax/Setup/InstallSchema.php
deleted file mode 100644
index 4282b67b17773..0000000000000
--- a/app/code/Magento/Tax/Setup/InstallSchema.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Tax\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        /**
-         * Create table 'tax_class'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('tax_class')
-        )->addColumn(
-            'class_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Class Id'
-        )->addColumn(
-            'class_name',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Class Name'
-        )->addColumn(
-            'class_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            8,
-            ['nullable' => false, 'default' => 'CUSTOMER'],
-            'Class Type'
-        )->setComment(
-            'Tax Class'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'tax_calculation_rule'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('tax_calculation_rule')
-        )->addColumn(
-            'tax_calculation_rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Tax Calculation Rule Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'priority',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Priority'
-        )->addColumn(
-            'position',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Position'
-        )->addColumn(
-            'calculate_subtotal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Calculate off subtotal option'
-        )->addIndex(
-            $setup->getIdxName('tax_calculation_rule', ['priority', 'position']),
-            ['priority', 'position']
-        )->addIndex(
-            $setup->getIdxName('tax_calculation_rule', ['code']),
-            ['code']
-        )->setComment(
-            'Tax Calculation Rule'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'tax_calculation_rate'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('tax_calculation_rate')
-        )->addColumn(
-            'tax_calculation_rate_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Tax Calculation Rate Id'
-        )->addColumn(
-            'tax_country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            ['nullable' => false],
-            'Tax Country Id'
-        )->addColumn(
-            'tax_region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Tax Region Id'
-        )->addColumn(
-            'tax_postcode',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            21,
-            [],
-            'Tax Postcode'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'rate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Rate'
-        )->addColumn(
-            'zip_is_range',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            [],
-            'Zip Is Range'
-        )->addColumn(
-            'zip_from',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Zip From'
-        )->addColumn(
-            'zip_to',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true],
-            'Zip To'
-        )->addIndex(
-            $setup->getIdxName('tax_calculation_rate', ['tax_country_id', 'tax_region_id', 'tax_postcode']),
-            ['tax_country_id', 'tax_region_id', 'tax_postcode']
-        )->addIndex(
-            $setup->getIdxName('tax_calculation_rate', ['code']),
-            ['code']
-        )->addIndex(
-            $setup->getIdxName(
-                'tax_calculation_rate',
-                ['tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode']
-            ),
-            ['tax_calculation_rate_id', 'tax_country_id', 'tax_region_id', 'zip_is_range', 'tax_postcode']
-        )->setComment(
-            'Tax Calculation Rate'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'tax_calculation'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('tax_calculation')
-        )->addColumn(
-            'tax_calculation_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Tax Calculation Id'
-        )->addColumn(
-            'tax_calculation_rate_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Tax Calculation Rate Id'
-        )->addColumn(
-            'tax_calculation_rule_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Tax Calculation Rule Id'
-        )->addColumn(
-            'customer_tax_class_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false],
-            'Customer Tax Class Id'
-        )->addColumn(
-            'product_tax_class_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false],
-            'Product Tax Class Id'
-        )->addIndex(
-            $setup->getIdxName('tax_calculation', ['tax_calculation_rule_id']),
-            ['tax_calculation_rule_id']
-        )->addIndex(
-            $setup->getIdxName('tax_calculation', ['customer_tax_class_id']),
-            ['customer_tax_class_id']
-        )->addIndex(
-            $setup->getIdxName('tax_calculation', ['product_tax_class_id']),
-            ['product_tax_class_id']
-        )->addIndex(
-            $setup->getIdxName(
-                'tax_calculation',
-                ['tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id']
-            ),
-            ['tax_calculation_rate_id', 'customer_tax_class_id', 'product_tax_class_id']
-        )->addForeignKey(
-            $setup->getFkName('tax_calculation', 'product_tax_class_id', 'tax_class', 'class_id'),
-            'product_tax_class_id',
-            $setup->getTable('tax_class'),
-            'class_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName('tax_calculation', 'customer_tax_class_id', 'tax_class', 'class_id'),
-            'customer_tax_class_id',
-            $setup->getTable('tax_class'),
-            'class_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName(
-                'tax_calculation',
-                'tax_calculation_rate_id',
-                'tax_calculation_rate',
-                'tax_calculation_rate_id'
-            ),
-            'tax_calculation_rate_id',
-            $setup->getTable('tax_calculation_rate'),
-            'tax_calculation_rate_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName(
-                'tax_calculation',
-                'tax_calculation_rule_id',
-                'tax_calculation_rule',
-                'tax_calculation_rule_id'
-            ),
-            'tax_calculation_rule_id',
-            $setup->getTable('tax_calculation_rule'),
-            'tax_calculation_rule_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Tax Calculation'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'tax_calculation_rate_title'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('tax_calculation_rate_title')
-        )->addColumn(
-            'tax_calculation_rate_title_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Tax Calculation Rate Title Id'
-        )->addColumn(
-            'tax_calculation_rate_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false],
-            'Tax Calculation Rate Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Store Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Value'
-        )->addIndex(
-            $setup->getIdxName('tax_calculation_rate_title', ['tax_calculation_rate_id', 'store_id']),
-            ['tax_calculation_rate_id', 'store_id']
-        )->addIndex(
-            $setup->getIdxName('tax_calculation_rate_title', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $setup->getFkName('tax_calculation_rate_title', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $setup->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName(
-                'tax_calculation_rate_title',
-                'tax_calculation_rate_id',
-                'tax_calculation_rate',
-                'tax_calculation_rate_id'
-            ),
-            'tax_calculation_rate_id',
-            $setup->getTable('tax_calculation_rate'),
-            'tax_calculation_rate_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Tax Calculation Rate Title'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'tax_order_aggregated_created'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('tax_order_aggregated_created')
-        )->addColumn(
-            'id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Id'
-        )->addColumn(
-            'period',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => true],
-            'Period'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Store Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'order_status',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            ['nullable' => false],
-            'Order Status'
-        )->addColumn(
-            'percent',
-            \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
-            null,
-            [],
-            'Percent'
-        )->addColumn(
-            'orders_count',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Orders Count'
-        )->addColumn(
-            'tax_base_amount_sum',
-            \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
-            null,
-            [],
-            'Tax Base Amount Sum'
-        )->addIndex(
-            $setup->getIdxName(
-                'tax_order_aggregated_created',
-                ['period', 'store_id', 'code', 'percent', 'order_status'],
-                true
-            ),
-            ['period', 'store_id', 'code', 'percent', 'order_status'],
-            ['type' => 'unique']
-        )->addIndex(
-            $setup->getIdxName('tax_order_aggregated_created', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $setup->getFkName('tax_order_aggregated_created', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $setup->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Tax Order Aggregation'
-        );
-        $setup->getConnection()->createTable($table);
-
-        /**
-         * Create table 'tax_order_aggregated_updated'
-         */
-        $setup->getConnection()->createTable(
-            $setup->getConnection()->createTableByDdl(
-                $setup->getTable('tax_order_aggregated_created'),
-                $setup->getTable('tax_order_aggregated_updated')
-            )
-        );
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php b/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php
new file mode 100644
index 0000000000000..8b7b9df936009
--- /dev/null
+++ b/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Tax\Setup\Patch\Data;
+
+use Magento\Directory\Model\RegionFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Tax\Setup\TaxSetup;
+use Magento\Tax\Setup\TaxSetupFactory;
+
+/**
+ * Class AddTacAttributeAndTaxClasses
+ * @package Magento\Tax\Setup\Patch
+ */
+class AddTaxAttributeAndTaxClasses implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @param TaxSetupFactory $taxSetupFactory
+     */
+    private $taxSetupFactory;
+
+    /**
+     * @param RegionFactory $directoryRegionFactory
+     */
+    private $directoryRegionFactory;
+
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * AddTacAttributeAndTaxClasses constructor.
+     * @param TaxSetupFactory $taxSetupFactory
+     * @param RegionFactory $directoryRegionFactory
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        TaxSetupFactory $taxSetupFactory,
+        RegionFactory $directoryRegionFactory,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->taxSetupFactory = $taxSetupFactory;
+        $this->directoryRegionFactory = $directoryRegionFactory;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var TaxSetup $taxSetup */
+        $taxSetup = $this->taxSetupFactory->create(['resourceName' => 'tax_setup', 'setup' => $this->moduleDataSetup]);
+
+        /**
+         * Add tax_class_id attribute to the 'eav_attribute' table
+         */
+        $taxSetup->addAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'tax_class_id',
+            [
+                'group' => 'Product Details',
+                'sort_order' => 40,
+                'type' => 'int',
+                'backend' => '',
+                'frontend' => '',
+                'label' => 'Tax Class',
+                'input' => 'select',
+                'class' => '',
+                'source' => \Magento\Tax\Model\TaxClass\Source\Product::class,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE,
+                'visible' => true,
+                'required' => false,
+                'user_defined' => false,
+                'default' => '2',
+                'searchable' => true,
+                'filterable' => false,
+                'comparable' => false,
+                'visible_on_front' => false,
+                'visible_in_advanced_search' => false,
+                'used_in_product_listing' => true,
+                'unique' => false,
+                'apply_to' => implode(',', $taxSetup->getTaxableItems()),
+                'is_used_in_grid' => true,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => true,
+            ]
+        );
+        /**
+         * install tax classes
+         */
+        $data = [
+            [
+                'class_id' => 2,
+                'class_name' => 'Taxable Goods',
+                'class_type' => \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT,
+            ],
+            [
+                'class_id' => 3,
+                'class_name' => 'Retail Customer',
+                'class_type' => \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_CUSTOMER
+            ],
+        ];
+        foreach ($data as $row) {
+            $this->moduleDataSetup->getConnection()->insertForce(
+                $this->moduleDataSetup->getTable('tax_class'),
+                $row
+            );
+        }
+        /**
+         * install tax calculation rates
+         */
+        /** @var \Magento\Directory\Model\Region $region */
+        $region = $this->directoryRegionFactory->create();
+        $data = [
+            [
+                'tax_calculation_rate_id' => 1,
+                'tax_country_id' => 'US',
+                'tax_region_id' => $region->loadByCode('CA', 'US')->getRegionId(),
+                'tax_postcode' => '*',
+                'code' => 'US-CA-*-Rate 1',
+                'rate' => '8.2500',
+            ],
+            [
+                'tax_calculation_rate_id' => 2,
+                'tax_country_id' => 'US',
+                'tax_region_id' => $region->loadByCode('NY', 'US')->getRegionId(),
+                'tax_postcode' => '*',
+                'code' => 'US-NY-*-Rate 1',
+                'rate' => '8.3750'
+            ],
+        ];
+        foreach ($data as $row) {
+            $this->moduleDataSetup->getConnection()->insertForce(
+                $this->moduleDataSetup->getTable('tax_calculation_rate'),
+                $row
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php
new file mode 100644
index 0000000000000..24d21d513ca23
--- /dev/null
+++ b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Tax\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Tax\Setup\TaxSetup;
+use Magento\Tax\Setup\TaxSetupFactory;
+
+/**
+ * Class UpdateTaxClassAttributeVisibility
+ * @package Magento\Tax\Setup\Patch
+ */
+class UpdateTaxClassAttributeVisibility implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var TaxSetupFactory
+     */
+    private $taxSetupFactory;
+
+    /**
+     * UpdateTaxClassAttributeVisibility constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param TaxSetupFactory $taxSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        TaxSetupFactory $taxSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->taxSetupFactory = $taxSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var TaxSetup $taxSetup */
+        $taxSetup = $this->taxSetupFactory->create(['resourceName' => 'tax_setup', 'setup' => $this->moduleDataSetup]);
+
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+         //Update the tax_class_id attribute in the 'catalog_eav_attribute' table
+        $taxSetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'tax_class_id',
+            'is_visible_in_advanced_search',
+            false
+        );
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            AddTaxAttributeAndTaxClasses::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php
new file mode 100644
index 0000000000000..d2f5aac442609
--- /dev/null
+++ b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Tax\Setup\Patch\Data;
+
+use Magento\Directory\Model\RegionFactory;
+use Magento\Framework\Api\Search\SearchCriteriaFactory;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Tax\Setup\TaxSetupFactory;
+
+class UpdateTaxRegionId implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var TaxRateRepositoryInterface
+     */
+    private $taxRateRepository;
+
+    /**
+     * @var SearchCriteriaFactory
+     */
+    private $searchCriteriaFactory;
+
+    /**
+     * @var RegionFactory
+     */
+    private $regionFactory;
+
+    /**
+     * UpdateTaxRegionId constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param TaxRateRepositoryInterface $taxRateRepository
+     * @param SearchCriteriaFactory $searchCriteriaFactory
+     * @param RegionFactory $regionFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        TaxRateRepositoryInterface $taxRateRepository,
+        SearchCriteriaFactory $searchCriteriaFactory,
+        \Magento\Directory\Model\RegionFactory $regionFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->taxRateRepository = $taxRateRepository;
+        $this->searchCriteriaFactory = $searchCriteriaFactory;
+        $this->regionFactory = $regionFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        //Update the tax_region_id
+        $taxRateList = $this->taxRateRepository->getList($this->searchCriteriaFactory->create());
+        /** @var \Magento\Tax\Api\Data\TaxRateInterface $taxRateData */
+        foreach ($taxRateList->getItems() as $taxRateData) {
+            $regionCode = $this->parseRegionFromTaxCode($taxRateData->getCode());
+            if ($regionCode) {
+                /** @var \Magento\Directory\Model\Region $region */
+                $region = $this->regionFactory->create();
+                $region->loadByCode($regionCode, $taxRateData->getTaxCountryId());
+                if ($taxRateData->getTaxPostcode() === null) {
+                    $taxRateData->setTaxPostcode('*');
+                }
+                $taxRateData->setTaxRegionId($region->getRegionId());
+                $this->taxRateRepository->save($taxRateData);
+            }
+        }
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateTaxClassAttributeVisibility::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.3';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Parse region from tax code.
+     *
+     * @param string $taxCode
+     * @return string
+     */
+    private function parseRegionFromTaxCode($taxCode)
+    {
+        $result = '';
+        $parts = explode('-', $taxCode, 3);
+
+        if (isset($parts[1])) {
+            $result = $parts[1];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Tax/Setup/UpgradeData.php b/app/code/Magento/Tax/Setup/UpgradeData.php
deleted file mode 100644
index 5ede9cb6180e4..0000000000000
--- a/app/code/Magento/Tax/Setup/UpgradeData.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Tax\Setup;
-
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Directory\Model\RegionFactory;
-use Magento\Framework\Api\Search\SearchCriteriaFactory;
-use Magento\Tax\Api\TaxRateRepositoryInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * Tax setup factory
-     *
-     * @var TaxSetupFactory
-     */
-    private $taxSetupFactory;
-
-    /**
-     * Tax rate repository
-     *
-     * @var TaxRateRepositoryInterface
-     */
-    private $taxRateRepository;
-
-    /**
-     * @var SearchCriteriaFactory
-     */
-    private $searchCriteriaFactory;
-
-    /**
-     * @var RegionFactory
-     */
-    private $directoryRegionFactory;
-
-    /**
-     * Init
-     *
-     * @param TaxSetupFactory $taxSetupFactory
-     * @param TaxRateRepositoryInterface $taxRateRepository
-     * @param SearchCriteriaFactory $searchCriteriaFactory
-     * @param RegionFactory $directoryRegionFactory
-     */
-    public function __construct(
-        TaxSetupFactory $taxSetupFactory,
-        TaxRateRepositoryInterface $taxRateRepository,
-        SearchCriteriaFactory $searchCriteriaFactory,
-        RegionFactory $directoryRegionFactory
-    ) {
-        $this->taxSetupFactory = $taxSetupFactory;
-        $this->taxRateRepository = $taxRateRepository;
-        $this->searchCriteriaFactory = $searchCriteriaFactory;
-        $this->directoryRegionFactory = $directoryRegionFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var TaxSetup $taxSetup */
-        $taxSetup = $this->taxSetupFactory->create(['resourceName' => 'tax_setup', 'setup' => $setup]);
-
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-             //Update the tax_class_id attribute in the 'catalog_eav_attribute' table
-            $taxSetup->updateAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
-                'tax_class_id',
-                'is_visible_in_advanced_search',
-                false
-            );
-        }
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            //Update the tax_region_id
-            $taxRateList = $this->taxRateRepository->getList($this->searchCriteriaFactory->create());
-            /** @var \Magento\Tax\Api\Data\TaxRateInterface $taxRateData */
-            foreach ($taxRateList->getItems() as $taxRateData) {
-                $regionCode = $this->parseRegionFromTaxCode($taxRateData->getCode());
-                if ($regionCode) {
-                    /** @var \Magento\Directory\Model\Region $region */
-                    $region = $this->directoryRegionFactory->create();
-                    $region->loadByCode($regionCode, $taxRateData->getTaxCountryId());
-                    if ($taxRateData->getTaxPostcode() === null) {
-                        $taxRateData->setTaxPostcode('*');
-                    }
-                    $taxRateData->setTaxRegionId($region->getRegionId());
-                    $this->taxRateRepository->save($taxRateData);
-                }
-            }
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * Parse region code from tax code
-     *
-     * @param string $taxCode
-     * @return string
-     */
-    private function parseRegionFromTaxCode($taxCode)
-    {
-        $result = '';
-        $parts = explode('-', $taxCode, 3);
-
-        if (isset($parts[1])) {
-            $result = $parts[1];
-        }
-
-        return $result;
-    }
-}
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml
new file mode 100644
index 0000000000000..04d497b4b5246
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCustomerTaxClassActionGroup.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Add Customer Tax Class-->
+    <actionGroup name="addCustomerTaxClass">
+        <arguments>
+            <argument name="customerTaxClassName" type="string"/>
+        </arguments>
+        <!--Click Additional Settings-->
+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
+        <!--Click Product Add New Tax Class Button-->
+        <click stepKey="clickCustomerAddNewTaxClassBtn" selector="{{AdminTaxRulesSection.customerAddNewTaxClass}}"/>
+        <!--Fill field-->
+        <fillField stepKey="fillCustomerNewTaxClass" selector="{{AdminTaxRulesSection.fieldCustomerNewTaxClass}}" userInput="{{customerTaxClassName}}"/>
+        <!-- Save Product tax rate -->
+        <click stepKey="saveProdTaxRate" selector="{{AdminTaxRulesSection.saveCustomerNewTaxClass}}"/>
+    </actionGroup>
+
+    <!--Delete Product Tax Class-->
+    <actionGroup name="deleteCustomerTaxClass">
+        <arguments>
+            <argument name="taxClassName" type="string"/>
+        </arguments>
+        <!-- Go to tax rule page -->
+        <amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
+        <scrollTo stepKey="scrollToAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
+        <moveMouseOver stepKey="hoverDeleteElement" selector="{{AdminTaxRulesSection.deleteTaxClassName(taxClassName)}}"/>
+        <click stepKey="deleteFirstTaxClass" selector="{{AdminTaxRulesSection.deleteTaxClass(taxClassName)}}"/>
+        <waitForElementVisible selector="{{AdminTaxRulesSection.popUpDialogOK}}" stepKey="waitForElementBecomeVisible"/>
+        <click stepKey="acceptPopUpDialog" selector="{{AdminTaxRulesSection.popUpDialogOK}}"/>
+        <waitForPageLoad stepKey="waitForProductTaxClassDeleted"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRuleActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRuleActionGroup.xml
new file mode 100644
index 0000000000000..f6b2b7a4785ab
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRuleActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteTaxRule">
+        <arguments>
+            <argument name="taxRuleCode" type="string" />
+        </arguments>
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleGridPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{taxRuleCode}}" stepKey="fillTaxRuleCode"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch" />
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <click selector="{{AdminTaxRuleFormSection.deleteRule}}" stepKey="clickDeleteRule"/>
+        <click selector="{{AdminTaxRuleFormSection.ok}}" stepKey="clickOk"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
new file mode 100644
index 0000000000000..596b72070bf7e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Change the tax configuration to display in cart and checkout flow -->
+    <actionGroup name="editTaxConfigurationByUI">
+        <!-- navigate to the tax configuration page -->
+        <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
+        <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
+
+        <!-- change the default state to California -->
+        <scrollTo selector="#tax_defaults-head" x="0" y="-80" stepKey="scrollToTaxDefaults" />
+        <!-- conditionalClick twice to fix some flaky behavior -->
+        <conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" />
+        <conditionalClick stepKey="clickCalculationSettingsAgain" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" />
+        <uncheckOption stepKey="clickDefaultState" selector="{{AdminConfigureTaxSection.systemValueDefaultState}}"/>
+        <selectOption stepKey="selectDefaultState" selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="California"/>
+        <fillField stepKey="fillDefaultPostCode" selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput="*"/>
+
+        <!-- change the options for shopping cart display to show tax -->
+        <scrollTo selector="#tax_cart_display-head" x="0" y="-80" stepKey="scrollToTaxShoppingCartDisplay" />
+        <!-- conditionalClick twice to fix some flaky behavior -->
+        <conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="#tax_cart_display" visible="false"/>
+        <conditionalClick stepKey="clickShoppingCartDisplaySettingsAgain" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="#tax_cart_display" visible="false"/>
+        <uncheckOption stepKey="clickTaxTotalCart" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}"/>
+        <selectOption stepKey="selectTaxTotalCart" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalCart}}" userInput="Yes"/>
+        <uncheckOption stepKey="clickDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummaryCart}}"/>
+        <selectOption stepKey="selectDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.dropdownDisplayTaxSummaryCart}}" userInput="Yes"/>
+        <uncheckOption stepKey="clickDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxCart}}"/>
+        <selectOption stepKey="selectDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxCart}}" userInput="Yes"/>
+
+        <!-- change the options for orders, invoices, credit memos display to show tax -->
+        <scrollTo selector="#tax_sales_display-head" x="0" y="-80" stepKey="scrollToTaxSalesDisplay" />
+        <!-- conditionalClick twice to fix some flaky behavior -->
+        <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="#tax_sales_display" visible="false"/>
+        <conditionalClick stepKey="clickOrdersInvoicesCreditSalesAgain" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="#tax_sales_display" visible="false"/>
+        <uncheckOption stepKey="clickTaxTotalSales" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}"/>
+        <selectOption stepKey="selectTaxTotalSales" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" userInput="Yes"/>
+        <uncheckOption stepKey="clickDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}"/>
+        <selectOption stepKey="selectDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.dropdownDisplayTaxSummarySales}}" userInput="Yes"/>
+        <uncheckOption stepKey="clickDisplayZeroTaxSales" selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}"/>
+        <selectOption stepKey="selectDisplayZeroTaxSales" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxSales}}" userInput="Yes"/>
+
+        <!-- Save the settings -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="saveTaxOptions" selector="{{AdminCategoryMainActionsSection.SaveButton}}"/>
+        <waitForPageLoad stepKey="waitForTaxSaved"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
+    </actionGroup>
+
+    <actionGroup name="changeToDefaultTaxConfigurationUI">
+        <!-- navigate to the tax configuration page -->
+        <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
+        <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
+
+        <!-- change the default state to none -->
+        <!-- conditionalClick twice to fix some flaky behavior -->
+        <conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
+        <conditionalClick stepKey="clickCalculationSettingsAgain" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
+        <checkOption stepKey="clickDefaultState" selector="{{AdminConfigureTaxSection.systemValueDefaultState}}"/>
+        <selectOption stepKey="selectDefaultState" selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="California"/>
+        <fillField stepKey="fillDefaultPostCode" selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput=""/>
+
+        <!-- change the options for shopping cart display to not show tax -->
+        <!-- conditionalClick twice to fix some flaky behavior -->
+        <conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
+        <conditionalClick stepKey="clickShoppingCartDisplaySettingsAgain" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
+        <checkOption stepKey="clickTaxTotalCart" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}"/>
+        <selectOption stepKey="selectTaxTotalCart" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalCart}}" userInput="Yes"/>
+        <checkOption stepKey="clickDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummaryCart}}"/>
+        <selectOption stepKey="selectDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.dropdownDisplayTaxSummaryCart}}" userInput="Yes"/>
+        <checkOption stepKey="clickDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxCart}}"/>
+        <selectOption stepKey="selectDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxCart}}" userInput="Yes"/>
+
+        <!-- change the options for orders, invoices, credit memos display to not show tax -->
+        <!-- conditionalClick twice to fix some flaky behavior -->
+        <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
+        <conditionalClick stepKey="clickOrdersInvoicesCreditSalesAgain" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
+        <checkOption stepKey="clickTaxTotalSales" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}"/>
+        <selectOption stepKey="selectTaxTotalSales" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" userInput="Yes"/>
+        <checkOption stepKey="clickDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}"/>
+        <selectOption stepKey="selectDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.dropdownDisplayTaxSummarySales}}" userInput="Yes"/>
+        <checkOption stepKey="clickDisplayZeroTaxSales" selector="{{AdminConfigureTaxSection.systemValueDisplayZeroTaxSales}}"/>
+        <selectOption stepKey="selectDisplayZeroTaxSales" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxSales}}" userInput="Yes"/>
+
+        <!-- Save the settings -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="saveTaxOptions" selector="{{AdminCategoryMainActionsSection.SaveButton}}"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
+    </actionGroup>
+
+    <actionGroup name="addCustomTaxRate" extends="addNewTaxRateNoZip">
+        <remove keyForRemoval="fillZipCode"/>
+        <remove keyForRemoval="fillRate"/>
+        <fillField stepKey="fillZipCode" selector="{{AdminTaxRulesSection.zipCode}}" userInput="US-NY-*-Rate 2" after="fillTaxIdentifier"/>
+        <fillField stepKey="fillRate" selector="{{AdminTaxRulesSection.rate}}" userInput="0" after="selectCountry"/>
+    </actionGroup>
+
+    <!-- Action group to add a tax rate when on a tax rule configuration page -->
+    <!-- Must already be on a tax rule configuration page or a new tax rule page -->
+    <actionGroup name="addNewTaxRateNoZip">
+        <arguments>
+            <argument name="taxCode"/>
+        </arguments>
+
+        <!-- Go to the tax rate page -->
+        <click stepKey="addNewTaxRate" selector="{{AdminTaxRulesSection.addNewTaxRate}}"/>
+
+        <!-- Fill out a new tax rate -->
+        <fillField stepKey="fillTaxIdentifier" selector="{{AdminTaxRulesSection.taxIdentifier}}" userInput="{{taxCode.state}}-{{taxCode.rate}}"/>
+        <fillField stepKey="fillZipCode" selector="{{AdminTaxRulesSection.zipCode}}" userInput="{{taxCode.zip}}"/>
+        <selectOption stepKey="selectState" selector="{{AdminTaxRulesSection.state}}" userInput="{{taxCode.state}}"/>
+        <selectOption stepKey="selectCountry" selector="{{AdminTaxRulesSection.country}}" userInput="{{taxCode.country}}"/>
+        <fillField stepKey="fillRate" selector="{{AdminTaxRulesSection.rate}}" userInput="{{taxCode.rate}}"/>
+
+        <!-- Save the tax rate -->
+        <click stepKey="saveTaxRate" selector="{{AdminTaxRulesSection.save}}"/>
+    </actionGroup>
+
+    <!--Set Tax Class for Shipping-->
+    <actionGroup name="changeShippingTaxClass">
+        <!--Select Configuration menu from Store-->
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
+        <waitForPageLoad stepKey="waitForConfiguration"/>
+        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <waitForPageLoad stepKey="waitForSales"/>
+        <!--Double click the same to fix flaky issue with redirection to Dashboard-->
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
+        <waitForPageLoad stepKey="waitForConfiguration1"/>
+        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <waitForPageLoad stepKey="waitForSales1" time="5"/>
+        <!--Change default tax class for Shipping on Taxable Goods-->
+        <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
+        <waitForPageLoad stepKey="waitForPaymentMethods"/>
+        <click selector="{{AdminConfigureTaxSection.salesTax}}" stepKey="clickOnTax"/>
+        <waitForPageLoad stepKey="waitForTax"/>
+        <seeInCurrentUrl url="{{AdminTaxConfigurationPage.url}}" stepKey="adminTaxConfiguration"/>
+        <seeElement selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="taxClassSectionC"/>
+        <click selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="openTaxClassSection"/>
+        <click selector="{{AdminConfigureTaxSection.taxShippingClassSystem}}" stepKey="uncheckSystemValue"/>
+        <selectOption selector="{{AdminConfigureTaxSection.taxClassShipping}}" userInput="Taxable Goods" stepKey="setTaxClassForShipping"/>
+        <!-- Save the settings -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="saveTaxOptions" selector="{{AdminCategoryMainActionsSection.SaveButton}}"/>
+        <waitForPageLoad stepKey="waitForTaxSaved"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
+    </actionGroup>
+
+    <actionGroup name="setDefaultShippingTaxClass">
+        <!--Select Configuration menu from Store-->
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
+        <waitForPageLoad stepKey="waitForConfiguration"/>
+        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <waitForPageLoad stepKey="waitForSales"/>
+        <!--Double click the same to fix flaky issue with redirection to Dashboard-->
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
+        <waitForPageLoad stepKey="waitForConfiguration1"/>
+        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <waitForPageLoad stepKey="waitForSales1"/>
+        <!--Change default tax class for Shipping on Taxable Goods-->
+        <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
+        <waitForPageLoad stepKey="waitForPaymentMethods"/>
+        <click selector="{{AdminConfigureTaxSection.salesTax}}" stepKey="clickOnTax"/>
+        <waitForPageLoad stepKey="waitForTax"/>
+        <seeElement selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="taxClassSectionC"/>
+        <click selector="{{AdminConfigureTaxSection.taxShippingClassSystem}}" stepKey="checkSystemDefaultValue"/>
+        <click selector="{{AdminConfigureTaxSection.taxClasses}}" stepKey="closeTaxClassSection"/>
+        <!-- Save the settings -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="saveTaxOptions" selector="{{AdminCategoryMainActionsSection.SaveButton}}"/>
+        <waitForPageLoad stepKey="waitForTaxSaved"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
+    </actionGroup>
+
+    <!--Add Product Tax Class-->
+    <actionGroup name="addProductTaxClass">
+        <arguments>
+            <argument name="prodTaxClassName" type="string"/>
+        </arguments>
+        <!--Click Additional Settings-->
+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
+        <!--Click Product Add New Tax Class Button-->
+        <click stepKey="clickProdAddNewTaxClassBtn" selector="{{AdminTaxRulesSection.productAddNewTaxClass}}"/>
+        <!--Fill field-->
+        <fillField stepKey="fillProdNewTaxClass" selector="{{AdminTaxRulesSection.fieldProdNewTaxClass}}" userInput="{{prodTaxClassName}}"/>
+        <!-- Save Product tax rate -->
+        <click stepKey="saveProdTaxRate" selector="{{AdminTaxRulesSection.saveProdNewTaxClass}}"/>
+    </actionGroup>
+
+    <!--Add New Tax Rule -->
+    <actionGroup name="addNewTaxRuleActionGroup">
+        <!-- Go to tax rule page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
+        <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+    </actionGroup>
+
+    <!--Delete Product Tax Class-->
+    <actionGroup name="deleteProductTaxClass">
+        <arguments>
+            <argument name="taxClassName" type="string"/>
+        </arguments>
+        <!-- Go to tax rule page -->
+        <amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
+        <click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
+        <scrollTo stepKey="scrollToAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
+        <moveMouseOver stepKey="hoverDeleteElement" selector="{{AdminTaxRulesSection.deleteTaxClassName(taxClassName)}}"/>
+        <click stepKey="deleteFirstTaxClass" selector="{{AdminTaxRulesSection.deleteTaxClass(taxClassName)}}"/>
+        <waitForElementVisible selector="{{AdminTaxRulesSection.popUpDialogOK}}" stepKey="waitForElementBecomeVisible"/>
+        <click stepKey="acceptPopUpDialog" selector="{{AdminTaxRulesSection.popUpDialogOK}}"/>
+        <waitForPageLoad stepKey="waitForProductTaxClassDeleted"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml
new file mode 100644
index 0000000000000..0edf2d6cac142
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="defaultTaxClass" type="taxClass">
+        <data key="class_name" unique="suffix">Tax Class </data>
+    </entity>
+    <entity name="customerTaxClass" type="taxClass">
+        <data key="class_name" unique="suffix">Customer Tax Class </data>
+        <data key="class_type">CUSTOMER</data>
+    </entity>
+    <entity name="productTaxClass" type="taxClass">
+        <data key="class_name" unique="suffix">Product Tax Class </data>
+        <data key="class_type">PRODUCT</data>
+    </entity>
+    <entity name="retailCustomerTaxClass">
+        <data key="class_name">Retail Customer</data>
+        <data key="class_type">CUSTOMER</data>
+    </entity>
+    <entity name="taxableGoodsTaxClass">
+        <data key="class_name">Taxable Goods</data>
+        <data key="class_type">PRODUCT</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
new file mode 100644
index 0000000000000..27c89162b5cea
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleTaxUK" type="tax">
+        <data key="state">California</data>
+        <data key="country">United Kingdom</data>
+        <data key="zip">*</data>
+        <data key="rate">50</data>
+    </entity>
+    <entity name="SimpleTaxUKZeroRate" type="tax">
+        <data key="state">California</data>
+        <data key="country">United Kingdom</data>
+        <data key="zip">*</data>
+        <data key="rate">0</data>
+    </entity>
+    <entity name="SimpleTaxNY" type="tax">
+        <data key="state">New York</data>
+        <data key="country">United States</data>
+        <data key="zip">*</data>
+        <data key="rate">8.375</data>
+    </entity>
+    <entity name="SimpleTaxCA" type="tax">
+        <data key="state">California</data>
+        <data key="country">United States</data>
+        <data key="zip">*</data>
+        <data key="rate">8.25</data>
+    </entity>
+    <entity name="SimpleTaxSwiss" type="tax">
+        <data key="state">Aargau</data>
+        <data key="country">Switzerland</data>
+        <data key="zip">*</data>
+        <data key="rate">0</data>
+    </entity>
+    <entity name="SimpleTaxWithZipCode" type="tax">
+        <data key="state">Texas</data>
+        <data key="country">United States</data>
+        <data key="zip">78729</data>
+        <data key="rate">7.25</data>
+    </entity>
+    <entity name="SimpleSecondTaxWithZipCode" type="tax">
+        <data key="state">Texas</data>
+        <data key="country">United States</data>
+        <data key="zip">78729</data>
+        <data key="rate">0.125</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
new file mode 100644
index 0000000000000..4edf005c2fc2b
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Default Tax Destination Calculation -->
+    <entity name="CountryUS" type="country">
+        <data key="value">US</data>
+    </entity>
+    <entity name="AllPostCode" type="postcode">
+        <data key="value">*</data>
+    </entity>
+    <!-- Shopping Cart Display Settings -->
+    <entity name="IncludeTaxInOrderTotalCart" type="grandtotalCart">
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisplayFullTaxSummaryCart" type="full_summaryCart">
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisplayZeroTaxSubtotalCart" type="zero_taxCart">
+        <data key="value">1</data>
+    </entity>
+    <entity name="Tax_Config_CA" type="tax_config_state">
+    <!-- Default Tax Destination Calculation -->
+        <requiredEntity type="country">CountryUS</requiredEntity>
+        <requiredEntity type="region">Region_CA</requiredEntity>
+        <requiredEntity type="postcode">AllPostCode</requiredEntity>
+    <!-- Shopping Cart Display Settings -->
+        <requiredEntity type="grandtotalCart">IncludeTaxInOrderTotalCart</requiredEntity>
+        <requiredEntity type="full_summaryCart">DisplayFullTaxSummaryCart</requiredEntity>
+        <requiredEntity type="zero_taxCart">DisplayZeroTaxSubtotalCart</requiredEntity>
+    </entity>
+
+    <entity name="Tax_Config_NY" type="tax_config_state">
+    <!-- Default Tax Destination Calculation -->
+        <requiredEntity type="country">CountryUS</requiredEntity>
+        <requiredEntity type="region">Region_NY</requiredEntity>
+        <requiredEntity type="postcode">AllPostCode</requiredEntity>
+    <!-- Shopping Cart Display Settings -->
+        <requiredEntity type="grandtotalCart">IncludeTaxInOrderTotalCart</requiredEntity>
+        <requiredEntity type="full_summaryCart">DisplayFullTaxSummaryCart</requiredEntity>
+        <requiredEntity type="zero_taxCart">DisplayZeroTaxSubtotalCart</requiredEntity>
+    </entity>
+    <!-- Set default settings -->
+    <entity name="DefaultTaxConfig" type="tax_config_default">
+        <requiredEntity type="taxTotalFlagZero">DefaultTotalFlagZero</requiredEntity>
+        <requiredEntity type="taxPostCodeEmpty">EmptyField</requiredEntity>
+    </entity>
+    <entity name="DefaultTotalFlagZero" type="taxTotalFlagZero">
+        <data key="value">0</data>
+    </entity>
+    <entity name="EmptyField" type="taxPostCodeEmpty">
+        <data key="value"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml
new file mode 100644
index 0000000000000..887203a76fdad
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleTaxRate" type="taxRate">
+        <data key="code" unique="suffix">TaxRate</data>
+    </entity>
+    <entity name="defaultTaxRate" type="taxRate">
+        <data key="code" unique="suffix">Tax Rate </data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_region_id">12</data>
+        <data key="tax_postcode">*</data>
+        <data key="zip_is_range">0</data>
+        <data key="rate">10</data>
+    </entity>
+    <entity name="US_CA_Rate_1" type="taxRate">
+        <data key="id">1</data>
+        <data key="code">US-CA-*-Rate 1</data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_postcode">*</data>
+        <data key="rate">8.2500</data>
+    </entity>
+    <entity name="US_NY_Rate_1" type="taxRate">
+        <data key="code">US-NY-*-Rate 1</data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_postcode">*</data>
+        <data key="rate">8.3750</data>
+        <data key="id">2</data>
+    </entity>
+    <entity name="taxRate_US_NY_8_1" type="taxRate">
+        <data key="code" unique="suffix">US-NY-*-</data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_region_id">43</data>
+        <data key="tax_postcode">*</data>
+        <data key="rate">8.1</data>
+    </entity>
+    <entity name="taxRateCustomRateUS" type="taxRate">
+        <data key="code" unique="suffix">Tax Rate </data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_country">United States</data>
+        <data key="tax_region_id">12</data>
+        <data key="tax_region">California</data>
+        <data key="tax_postcode">90001</data>
+        <data key="zip_is_range">0</data>
+        <data key="rate">100.0000</data>
+    </entity>
+    <entity name="defaultTaxRateWithZipRange" type="taxRate">
+        <data key="code" unique="suffix">Tax Rate </data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_country">United States</data>
+        <data key="tax_region_id">12</data>
+        <data key="tax_region">California</data>
+        <data key="zip_is_range">1</data>
+        <data key="zip_from">90001</data>
+        <data key="zip_to">96162</data>
+        <data key="rate">15.05</data>
+    </entity>
+    <entity name="TaxRateWithFixedZipUtah" type="taxRate">
+        <data key="code" unique="suffix">Tax Rate </data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_country">United States</data>
+        <data key="tax_region_id">58</data>
+        <data key="tax_region">Utah</data>
+        <data key="zip_is_range">0</data>
+        <data key="tax_postcode">84001</data>
+        <data key="rate">20</data>
+    </entity>
+    <entity name="defaultTaxRateWithLargeRate" type="taxRate">
+        <data key="code" unique="suffix">TaxRate</data>
+        <data key="tax_country_id">GB</data>
+        <data key="tax_country">United Kingdom</data>
+        <data key="tax_postcode">*</data>
+        <data key="zip_is_range">0</data>
+        <data key="rate">777</data>
+    </entity>
+    <entity name="taxRateCustomRateCanada" type="taxRate">
+        <data key="code" unique="suffix">TaxRate</data>
+        <data key="tax_country_id">CA</data>
+        <data key="tax_country">Canada</data>
+        <data key="tax_region_id">*</data>
+        <data key="tax_postcode">180</data>
+        <data key="zip_is_range">0</data>
+        <data key="rate">25</data>
+    </entity>
+    <entity name="taxRateCustomRateUK" type="taxRate">
+        <data key="code" unique="suffix">TaxRate</data>
+        <data key="tax_country_id">GB</data>
+        <data key="tax_country">United Kingdom</data>
+        <data key="zip_is_range">1</data>
+        <data key="zip_from">1</data>
+        <data key="zip_to">7800935</data>
+        <data key="rate">12.99</data>
+    </entity>
+    <entity name="taxRateCustomRateFrance" type="taxRate">
+        <data key="code" unique="suffix">TaxRate</data>
+        <data key="tax_country_id">FR</data>
+        <data key="tax_country">France</data>
+        <data key="tax_region_id">277</data>
+        <data key="tax_region">Val-d'Oise</data>
+        <data key="tax_postcode">*</data>
+        <data key="zip_is_range">0</data>
+        <data key="rate">0.1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
new file mode 100644
index 0000000000000..353bc0a489443
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Region_NY" type="region">
+        <data key="value">43</data>
+    </entity>
+    <entity name="Region_CA" type="region">
+        <data key="value">12</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
new file mode 100644
index 0000000000000..fde43cd10e3ea
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="defaultTaxRule" type="taxRule">
+        <data key="code" unique="suffix">TaxIdentifier</data>
+        <data key="position">1</data>
+        <data key="priority">1</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+        </array>
+    </entity>
+    <entity name="SimpleTaxRule" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">0</data>
+        <data key="priority">0</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+    <entity name="taxRuleWithCustomPriorityPosition" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">1</data>
+        <data key="priority">1</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+    <entity name="taxRuleWithCustomPriority" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">0</data>
+        <data key="priority">1</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+    <entity name="taxRuleWithCustomPosition" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">1</data>
+        <data key="priority">0</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+    <entity name="taxRuleWithUpdatePriorityPosition" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">2</data>
+        <data key="priority">2</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+    <entity name="taxRuleWithCustomTaxClasses" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">0</data>
+        <data key="priority">0</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+    <entity name="TaxRule" type="taxRule">
+        <data key="name" unique="suffix">TaxName</data>
+    </entity>
+    <entity name="TaxRuleZeroRate" type="taxRule">
+        <data key="name" unique="suffix">TaxNameZeroRate</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/LICENSE.txt b/app/code/Magento/Tax/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/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/Tax/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Tax/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/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/Tax/Test/Mftf/Metadata/tax_class-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml
new file mode 100644
index 0000000000000..c2e5aac8ce6fa
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxClass" dataType="taxClass" type="create" auth="adminOauth" url="/V1/taxClasses" method="POST" returnRegex="/\d+/">
+        <contentType>application/json</contentType>
+        <object dataType="taxClass" key="taxClass">
+            <field key="id">integer</field>
+            <field key="class_id">integer</field>
+            <field key="class_name" required="true">string</field>
+            <field key="class_type">string</field>
+        </object>
+    </operation>
+    <operation name="GetTaxClass" dataType="taxClass" type="get" auth="adminOauth" url="/V1/taxClasses/{return}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="DeleteTaxClass" dataType="taxClass" type="delete" auth="adminOauth" url="/V1/taxClasses/{return}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
new file mode 100644
index 0000000000000..7383e9c580283
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxConfigDefaultsTaxDestination" dataType="tax_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="tax_config_state">
+            <object key="defaults" dataType="tax_config_state">
+                 <object key="fields" dataType="tax_config_state">
+                    <object key="country" dataType="country">
+                    <field key="value">string</field>
+                    </object>
+                    <object key="region" dataType="region">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="postcode" dataType="postcode">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+            <object key="cart_display" dataType="tax_config_state">
+                <object key="fields" dataType="tax_config_state">
+                  <object key="grandtotal" dataType="grandtotalCart">
+                      <field key="value">string</field>
+                  </object>
+                    <object key="full_summary" dataType="full_summaryCart">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="zero_tax" dataType="zero_taxCart">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="TaxConfigDefaultsTaxDestination" dataType="tax_config_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="tax_config_default">
+            <object key="calculation" dataType="tax_config_default">
+              <object key="fields" dataType="tax_config_default">
+                <object key="algorithm" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="based_on" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="price_includes_tax" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="shipping_includes_tax" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="apply_after_discount" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="discount_tax" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="apply_tax_on" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="cross_border_trade_enabled" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                </object>
+              </object>
+            </object>
+            <object key="defaults" dataType="tax_config_default">
+                 <object key="fields" dataType="tax_config_default">
+                    <object key="country" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                    <object key="region" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                    <object key="postcode" dataType="taxPostCodeEmpty">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+            <object key="cart_display" dataType="tax_config_default">
+                <object key="fields" dataType="tax_config_default">
+                  <object key="price" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="subtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="shipping" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="gift_wrapping" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="printed_card" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="grandtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                    <object key="full_summary" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                    <object key="zero_tax" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                </object>
+            </object>
+            <object key="sales_display" dataType="tax_config_default">
+                <object key="fields" dataType="tax_config_default">
+                  <object key="price" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="subtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="shipping" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="gift_wrapping" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="printed_card" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="grandtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="full_summary" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                  </object>
+                  <object key="zero_tax" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                    </object>
+                  </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml
new file mode 100644
index 0000000000000..3f192920c5cc3
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxRate" dataType="taxRate" type="create" auth="adminOauth" url="/V1/taxRates" method="POST">
+        <contentType>application/json</contentType>
+        <object key="taxRate" dataType="taxRate">
+            <field key="id">integer</field>
+            <field key="tax_country_id">string</field>
+            <field key="tax_region_id">integer</field>
+            <field key="tax_postcode">string</field>
+            <field key="zip_is_range">integer</field>
+            <field key="zip_from">integer</field>
+            <field key="zip_to">integer</field>
+            <field key="rate">integer</field>
+            <field key="code">string</field>
+        </object>
+    </operation>
+    <operation name="DeleteTaxRate" dataType="taxRate" type="delete" auth="adminOauth" url="/V1/taxRates/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
new file mode 100644
index 0000000000000..c5b781519912d
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxRule" dataType="taxRule" type="create" auth="adminOauth" url="/V1/taxRules" method="POST">
+        <contentType>application/json</contentType>
+        <object key="rule" dataType="taxRule">
+            <field key="id">integer</field>
+            <field key="code" required="true">string</field>
+            <field key="priority">integer</field>
+            <field key="position">integer</field>
+            <array key="customer_tax_class_ids">
+                <value>integer</value>
+            </array>
+            <array key="product_tax_class_ids">
+                <value>integer</value>
+            </array>
+            <array key="tax_rate_ids">
+                <value>integer</value>
+            </array>
+            <field key="calculate_subtotal">boolean</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+    <operation name="DeleteTaxRule" dataType="taxRule" type="delete" auth="adminOauth" url="/V1/taxRules/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
new file mode 100644
index 0000000000000..6aedc0014280c
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewTaxRulePage" url="tax/rule/new/" module="Magento_Tax" area="admin">
+        <section name="AdminTaxRulesSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
new file mode 100644
index 0000000000000..a9d14de18de80
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminTaxConfigurationPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Tax">
+        <section name="AdminConfigureTaxSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
new file mode 100644
index 0000000000000..716c399110470
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminTaxRateGridPage" url="tax/rate/" area="admin" module="Magento_Tax">
+        <section name="AdminSecondaryGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
new file mode 100644
index 0000000000000..3c8326e95d930
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminTaxRuleGridPage" url="tax/rule" area="admin" module="Magento_Tax">
+        <section name="AdminSecondaryGridSection"/>
+        <section name="AdminGridMainControls"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Tax/Test/Mftf/README.md b/app/code/Magento/Tax/Test/Mftf/README.md
new file mode 100644
index 0000000000000..43f3bace41c18
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tax Functional Tests
+
+The Functional Test Module for **Magento Tax** module.
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
new file mode 100644
index 0000000000000..bfb082c145f07
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminConfigureTaxSection">
+        <!-- on page /admin/admin/system_config/edit/section/tax/ -->
+        <element name="salesTax" type="button" selector="//a[contains(@class, 'admin__page-nav-link item-nav')]/span[text()='Tax']"/>
+        <element name="taxClasses" type="block" selector="#tax_classes-head" timeout="30"/>
+        <element name="taxShippingClassSystem" type="checkbox" selector="#tax_classes_shipping_tax_class_inherit"/>
+        <element name="taxClassShipping" type="select" selector="#tax_classes_shipping_tax_class"/>
+        <element name="taxClassProduct" type="select" selector="#tax_classes_default_product_tax_class"/>
+        <element name="taxClassCustomer" type="select" selector="#tax_classes_default_customer_tax_class"/>
+
+        <element name="taxCalculationSettings" type="block" selector="#tax_calculation-head" timeout="30"/>
+        <element name="taxCalculationSettingsOpened" type="block" selector="#tax_calculation-head.open" timeout="30"/>
+        <element name="taxCalculationAlgorithm" type="select" selector="#tax_calculation_algorithm"/>
+        <element name="taxCalculationAlgorithmDisabled" type="select" selector="#tax_calculation_algorithm[disabled='disabled']"/>
+        <element name="taxCalculationAlgorithmInherit" type="checkbox" selector="#tax_calculation_algorithm_inherit"/>
+        <element name="taxCalculationBased" type="select" selector="#tax_calculation_based_on"/>
+        <element name="taxCalculationBasedDisabled" type="select" selector="#tax_calculation_based_on[disabled='disabled']"/>
+        <element name="taxCalculationBasedInherit" type="checkbox" selector="#tax_calculation_based_on_inherit"/>
+        <element name="taxCalculationPrices" type="select" selector="#tax_calculation_price_includes_tax"/>
+        <element name="taxCalculationPricesDisabled" type="select" selector="#tax_calculation_price_includes_tax[disabled='disabled']"/>
+        <element name="taxCalculationPricesInherit" type="checkbox" selector="#tax_calculation_price_includes_tax_inherit"/>
+
+        <element name="defaultDestination" type="block" selector="#tax_defaults-head" timeout="30"/>
+        <element name="systemValueDefaultState" type="checkbox" selector="#row_tax_defaults_region input[type='checkbox']"/>
+        <element name="dropdownDefaultState" type="select" selector="#row_tax_defaults_region select"/>
+        <element name="defaultPostCode" type="checkbox" selector="#tax_defaults_postcode"/>
+        
+        <element name="taxPriceDisplaySettings" type="block" selector="#tax_display-head" timeout="30"/>
+        <element name="taxPriceDisplaySettingsOpened" type="block" selector="#tax_display-head.open" timeout="30"/>
+        <element name="taxDisplayProductPrices" type="select" selector="#tax_display_type"/>
+        <element name="taxDisplayProductPricesDisabled" type="select" selector="#tax_display_type[disabled='disabled']"/>
+        <element name="taxDisplayProductPricesInherit" type="checkbox" selector="#tax_display_type_inherit"/>
+
+        <element name="taxSalesDisplay" type="block" selector=".config.admin__collapsible-block#tax_sales_display" timeout="30"/>
+        <element name="shoppingCartDisplay" type="block" selector="#tax_cart_display-head" timeout="30"/>
+        <element name="systemValueIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal input[type='checkbox']"/>
+        <element name="dropdownIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal select"/>
+        <element name="systemValueDisplayTaxSummaryCart" type="checkbox" selector="#row_tax_cart_display_full_summary input[type='checkbox']"/>
+        <element name="dropdownDisplayTaxSummaryCart" type="checkbox" selector="#row_tax_cart_display_full_summary select"/>
+        <element name="systemValueDisplayZeroTaxCart" type="checkbox" selector="#row_tax_cart_display_zero_tax input[type='checkbox']"/>
+        <element name="dropdownDisplayZeroTaxCart" type="checkbox" selector="#row_tax_cart_display_zero_tax select"/>
+
+        <element name="ordersInvoicesCreditSales" type="block" selector="#tax_sales_display-head" timeout="30"/>
+        <element name="systemValueIncludeTaxTotalSales" type="checkbox" selector="#row_tax_sales_display_grandtotal input[type='checkbox']"/>
+        <element name="dropdownIncludeTaxTotalSales" type="checkbox" selector="#row_tax_sales_display_grandtotal select"/>
+        <element name="systemValueDisplayTaxSummarySales" type="checkbox" selector="#row_tax_sales_display_full_summary input[type='checkbox']"/>
+        <element name="dropdownDisplayTaxSummarySales" type="checkbox" selector="#row_tax_sales_display_full_summary select"/>
+        <element name="systemValueDisplayZeroTaxSales" type="checkbox" selector="#row_tax_sales_display_zero_tax input[type='checkbox']"/>
+        <element name="dropdownDisplayZeroTaxSales" type="checkbox" selector="#row_tax_sales_display_zero_tax select"/>
+        <element name="fixedProductTaxes" type="block" selector="#tax_weee-head" timeout="30"/>
+
+        <element name="taxClassesCondition" type="block" selector="//a[@id='tax_classes-head' and @class='open']" timeout="30"/>
+        <element name="useSystemValue" type="checkbox" selector="#tax_classes_default_product_tax_class_inherit"/>
+        <element name="productTaxClass" type="select" selector="#tax_classes_default_product_tax_class"/>
+        <element name="save" type="button" selector="#save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml
new file mode 100644
index 0000000000000..f32caf88f2133
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminProductTaxClassSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductTaxClassSection">
+        <element name="additionalSettings" type="text" selector="#details-summarybase_fieldset"/>
+        <element name="additionalSettingsCond" type="text" selector="//summary[@id='details-summarybase_fieldset' and @aria-expanded='true']"/>
+        <element name="productTaxClass" type="button" selector="//div[contains(@class, 'field-tax_product_class')]//span[text()='Add New Tax Class']"/>
+        <element name="TaxClassName" type="block" selector="//div[contains(@class, 'field-tax_product_class')]//input[@class='mselect-input']"/>
+        <element name="confirm" type="button" selector="//div[contains(@class, 'field-tax_product_class')]//span[@class='mselect-save']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateFormSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateFormSection.xml
new file mode 100644
index 0000000000000..b2efe5c47b0c0
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateFormSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminTaxRateFormSection">
+        <element name="taxIdentifier" type="input" selector="#code" />
+        <element name="deleteRate" type="button" selector="#delete" timeout="30"/>
+        <element name="ok" type="button" selector="button.action-primary.action-accept" timeout="30"/>
+        <element name="save" type="button" selector="#save" timeout="30"/>
+        <element name="country" type="select" selector="#tax_country_id"/>
+        <element name="state" type="select" selector="#tax_region_id"/>
+        <element name="rate" type="text" selector="#rate"/>
+        <element name="zipRange" type="checkbox" selector="#zip_is_range"/>
+        <element name="rangeFrom" type="text" selector="#zip_from"/>
+        <element name="rangeTo" type="text" selector="#zip_to"/>
+        <element name="zipCode" type="input" selector="#tax_postcode"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateGridSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateGridSection.xml
new file mode 100644
index 0000000000000..ba9da182d735e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRateGridSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminTaxRateGridSection">
+        <element name="grid" type="block" selector="#tax_rate_grid"/>
+        <element name="add" type="button" selector="#add" timeout="30"/>
+        <element name="search" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="filterByTaxIdentifier" type="input" selector="#tax_rate_grid_filter_code"/>
+        <element name="filterByCountry" type="input" selector="#tax_rate_grid_filter_tax_country_id"/>
+        <element name="filterByPostCode" type="input" selector="#tax_rate_grid_filter_tax_postcode"/>
+        <element name="nthRow" type="block" selector="tr[data-role='row']:nth-of-type({{var}})" parameterized="true" timeout="30"/>
+        <element name="emptyText" type="text" selector=".empty-text"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxReportsSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxReportsSection.xml
new file mode 100644
index 0000000000000..80101687e173e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxReportsSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminTaxReportsSection">
+        <element name="refreshStatistics" type="button" selector="//a[contains(text(),'here')]"/>
+        <element name="fromDate" type="input" selector="#sales_report_from"/>
+        <element name="toDate" type="input" selector="//*[@id='sales_report_to']/following-sibling::button"/>
+        <element name="goTodayButton" type="input" selector="//button[contains(text(),'Go Today')]"/>
+        <element name="showReportButton" type="button" selector="#filter_form_submit"/>
+        <element name="taxRuleAmount" type="textarea" selector="//*[contains(text(),'{{var1}}')]/following-sibling::td[contains(@class, 'col-tax-amount')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleFormSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleFormSection.xml
new file mode 100644
index 0000000000000..c77d3ad0d9444
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleFormSection.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminTaxRuleFormSection">
+        <element name="fieldTaxRate" type="block" selector="div.field-tax_rate"/>
+        <element name="taxIdentifier" type="input" selector="input.admin__control-text admin__action-multiselect-search" timeout="30"/>
+        <element name="code" type="input" selector="#code"/>
+        <element name="taxRateSearch" type="input" selector="input[data-role='advanced-select-text']"/>
+        <element name="taxRateSelected" type="input" selector="//span[contains(., '{{taxRateCode}}') and preceding-sibling::input[contains(@class, 'mselect-checked')]]" parameterized="true" />
+        <element name="taxRateOption" type="multiselect" selector="//*[@data-ui-id='tax-rate-form-fieldset-element-form-field-tax-rate']//span[.='{{taxRateCode}}']" parameterized="true" />
+        <element name="save" type="button" selector="#save" timeout="30"/>
+        <element name="deleteRule" type="button" selector="#delete" timeout="30"/>
+        <element name="ok" type="button" selector="button.action-primary.action-accept" timeout="30"/>
+        <element name="additionalSettings" type="button" selector="#details-summarybase_fieldset" timeout="30"/>
+        <element name="customerTaxClassOption" type="checkbox" selector="//*[@id='tax_customer_class']/..//span[.='{{taxCustomerClass}}']" parameterized="true"/>
+        <element name="productTaxClassOption" type="checkbox" selector="//*[@id='tax_product_class']/..//span[.='{{taxProductClass}}']" parameterized="true"/>
+        <element name="customerTaxClassSelected" type="checkbox" selector="//*[@id='tax_customer_class']/..//span[.='{{taxCustomerClass}}' and preceding-sibling::input[contains(@class, 'mselect-checked')]]" parameterized="true"/>
+        <element name="productTaxClassSelected" type="checkbox" selector="//*[@id='tax_product_class']/..//span[.='{{taxProductClass}}' and preceding-sibling::input[contains(@class, 'mselect-checked')]]" parameterized="true"/>
+        <element name="priority" type="text" selector="#priority"/>
+        <element name="sortOrder" type="text" selector="#position"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml
new file mode 100644
index 0000000000000..dfcaba8329173
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminTaxRuleGridSection">
+        <element name="add" type="button" selector="#add" timeout="30"/>
+        <element name="search" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="code" type="input" selector="#taxRuleGrid_filter_code"/>
+        <element name="taxRate" type="input" selector="#taxRuleGrid_filter_tax_rates_codes"/>
+        <element name="nthRow" type="block" selector="tr[data-role='row']:nth-of-type({{var}})" parameterized="true" timeout="30"/>
+        <element name="successMessage" type="text" selector="#messages"/>
+        <element name="emptyText" type="text" selector="td.empty-text"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
new file mode 100644
index 0000000000000..29c53242b90f6
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminTaxRulesSection">
+        <!-- on page /admin/tax/rule/new/ -->
+        <element name="customerAddNewTaxClass" type="button" selector="//*[@id='tax_customer_class']/following-sibling::section//*[contains(text(),'Add New Tax Class')]"/>
+        <element name="fieldCustomerNewTaxClass" type="input" selector="//*[@id='tax_customer_class']/following-sibling::section//input[@class='mselect-input']"/>
+        <element name="saveCustomerNewTaxClass" type="button" selector="//*[@id='tax_customer_class']/following-sibling::section//span[@class='mselect-save']"/>
+        <element name="defaultCustomerTaxClass" type="button" selector="//*[@id='tax_customer_class']/following-sibling::section//div[@class='mselect-items-wrapper']/div[1]"/>
+        <element name="ruleName" type="input" selector="#anchor-content #code"/>
+        <element name="addNewTaxRate" type="block" selector="//*[text()='Add New Tax Rate']" timeout="30"/>
+        <element name="taxIdentifier" type="input" selector="aside #code"/>
+        <element name="zipIsRange" type="checkbox" selector="#zip_is_range"/>
+        <element name="zipCode" type="input" selector="#tax_postcode"/>
+        <element name="state" type="select" selector="#tax_region_id"/>
+        <element name="country" type="select" selector="#tax_country_id"/>
+        <element name="rate" type="input" selector="#rate"/>
+        <element name="save" type="button" selector=".action-save" timeout="30"/>
+        <element name="saveRule" type="button" selector="#save" timeout="30"/>
+        <element name="additionalSettings" type="button" selector="#details-summarybase_fieldset"/>
+        <element name="productAddNewTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//*[contains(text(),'Add New Tax Class')]"/>
+        <element name="fieldProdNewTaxClass" type="input" selector="//*[@id='tax_product_class']/following-sibling::section//input[@class='mselect-input']"/>
+        <element name="saveProdNewTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//span[@class='mselect-save']"/>
+        <element name="defaultTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//div[@class='mselect-items-wrapper']/div[1]"/>
+        <element name="deleteTaxClassName" type="button" selector="//span[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="deleteTaxClass" type="button" selector="//span[contains(text(),'{{var1}}')]/../..//*[@class='mselect-delete']" parameterized="true"/>
+        <element name="popUpDialogOK" type="button" selector="//*[@class='modal-footer']//*[contains(text(),'OK')]"/>
+        <element name="taxRateMultiSelectItems" type="block" selector=".mselect-list-item"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..b89a77b8ad2ca
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="taxAmount" type="text" selector="[data-th='Tax']>span"/>
+        <element name="taxSummary" type="text" selector=".totals-tax-summary"/>
+        <element name="rate" type="text" selector=" tr.totals-tax-details.shown th.mark"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
new file mode 100644
index 0000000000000..e632f6265f438
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateDefaultsTaxRuleTest">
+        <annotations>
+            <stories value="Create tax rule"/>
+            <title value="Create tax rule, defaults"/>
+            <description value="Test log in to Create Tax Rule and Create Defaults Tax Rule"/>
+            <testCaseId value="MC-5323"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
+            </actionGroup>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <!-- Create a tax rule with defaults -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="selectNeededItem"  />
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="saveTaxRule" />
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="assertTaxRuleSuccessMessage" />
+
+        <!-- Verify we see created tax rule with defaults(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch" />
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see created tax rule with defaults on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleField" />
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"  />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
new file mode 100644
index 0000000000000..b63ca1953157f
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRateAllPostCodesTest">
+        <annotations>
+            <stories value="Create tax rate"/>
+            <title value="Create tax rate, all postcodes"/>
+            <description value="Tests log into Create tax rate and create all postcodes"/>
+            <testCaseId value="MC-5318"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <!-- Create a tax rate with * for postcodes -->
+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="fillPostCode"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="Australia" stepKey="selectCountry1"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="20" stepKey="fillRate"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify the tax rate grid page shows the tax rate we just created -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="Australia" stepKey="fillCountryFilter"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="*" stepKey="fillPostCodeFilter"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+        <see selector="{{AdminTaxRateGridSection.grid}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeRuleName"/>
+        <see selector="{{AdminTaxRateGridSection.grid}}" userInput="Australia" stepKey="seeCountry"/>
+        <see selector="{{AdminTaxRateGridSection.grid}}" userInput="*" stepKey="seePostCode"/>
+
+        <!-- Go to the tax rate edit page for our new tax rate -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex3"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter2"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+
+        <!-- Verify we see expected values on the tax rate edit page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeRuleName2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="seeZipCode"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="Australia" stepKey="seeCountry2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="20" stepKey="seeRate"/>
+
+        <!-- Go to the tax rule grid page and verify our tax rate can be used in the rule -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex"/>
+        <click selector="{{AdminGridMainControls.add}}" stepKey="clickAddNewTaxRule"/>
+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
new file mode 100644
index 0000000000000..cb79de19ce23a
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRateLargeRateTest">
+        <annotations>
+            <stories value="Create tax rate"/>
+            <title value="Create tax rate, large rate"/>
+            <description value="Test log in to Create Tax Rate and Create Large Rate"/>
+            <testCaseId value="MC-5322"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <!-- Create a tax rate for large postcodes -->
+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="fillPostCode"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="France" stepKey="selectCountry1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="Val-d'Oise" stepKey="selectState" />
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="999" stepKey="fillRate"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <!-- Create a tax rate for large postcodes and verify we see expected values on the tax rate grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="France" stepKey="selectCountry2" />
+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="*" stepKey="seeTaxPostCode1"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow3"/>
+        <!-- Verify we see expected values on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="seeZipCode"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="France" stepKey="seeCountry2"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="Val-d'Oise" stepKey="seeState"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="999" stepKey="seeRate"/>
+
+        <!-- Verify we see expected values on the tax rule form page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
new file mode 100644
index 0000000000000..696d6c4c87763
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRateSpecificPostcodeTest">
+        <annotations>
+            <stories value="Create tax rate"/>
+            <title value="Create tax rate, specific postcode"/>
+            <description value="Test log in to Create Tax Rate and Create specific Postcode"/>
+            <testCaseId value="MC-5320"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <!-- Create a tax rate with specific postcode -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField1"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="180" stepKey="fillTaxPostCode"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="Canada" stepKey="selectCountry" />
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="*" stepKey="selectState" />
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput='25' stepKey="seeRate"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <!-- Verify the tax rate grid page shows the specific postcode we just created -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="Canada" stepKey="fillCountryFilter"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="180" stepKey="fillPostCodeFilter"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+        <!-- Verify we see expected values on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="180" stepKey="seePostCode"/>
+        <seeInField selector="{{AdminTaxRateFormSection.country}}" userInput="Canada" stepKey="seeCountry2"/>
+
+        <!-- Verify we see expected values on the tax rule form page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
new file mode 100644
index 0000000000000..c6c5e318cc791
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRateWiderZipCodeRangeTest">
+        <annotations>
+            <stories value="Create tax rate"/>
+            <title value="Create tax rate, wider zip code range"/>
+            <description value="Test log in to Create Tax Rate and Create Wider Zip Code Range"/>
+            <testCaseId value="MC-5321"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <!-- Create a tax rate with range from 1-7800935 for zipCodes -->
+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange" />
+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="1" stepKey="fillZipFrom"/>
+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="7800935" stepKey="fillZipTo"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="United Kingdom" stepKey="selectCountry1"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="7.75" stepKey="seeRate"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <!-- Create a tax rate for zipCodeRange and verify we see expected values on the tax rate grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="United Kingdom" stepKey="selectCountry2" />
+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="1-7800935" stepKey="seeTaxPostCode1"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+        <!-- Verify we see expected values on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="clickZipRange"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="1" stepKey="seeTaxPostCode2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="7800935" stepKey="seeTaxPostCode3"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United Kingdom" stepKey="seeCountry2"/>
+
+        <!-- Verify we see expected values on the tax rule form page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
new file mode 100644
index 0000000000000..6d9717318efc8
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRateZipCodeRangeTest">
+        <annotations>
+            <stories value="Create tax rate"/>
+            <title value="Create tax tate, zip code range"/>
+            <description value="Test log in to Create Tax Rate and Create Zip Code Range"/>
+            <testCaseId value="MC-5319"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
+            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <!-- Create a tax rate with range from 90001-96162 for zipCodes -->
+        <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange" />
+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="90001" stepKey="fillZipFrom"/>
+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="96162" stepKey="fillZipTo"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="selectCountry1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="California" stepKey="selectState" />
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput='15.5' stepKey="seeRate"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <!-- Create a tax rate for zipCodeRange and verify we see expected values on the tax rate grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="United States" stepKey="selectCountry2" />
+        <fillField selector="{{AdminTaxRateGridSection.filterByPostCode}}" userInput="90001-96162" stepKey="seeTaxPostCode1"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow3"/>
+        <!-- Verify we see expected values on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxIdentifierField2"/>
+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="clickZipRange"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="90001" stepKey="seeTaxPostCode2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="96162" stepKey="seeTaxPostCode3"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="California" stepKey="seeState"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="seeCountry2"/>
+
+        <!-- Verify we see expected values on the tax rule form page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
new file mode 100644
index 0000000000000..03b12c8f28098
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRuleWithCustomerAndProductTaxClassTest">
+        <annotations>
+            <stories value="Create tax rule"/>
+            <title value="Create tax rule, with customer and product tax class"/>
+            <description value="Test log in to Tax Rule and Create tax rule with customer and product tax class"/>
+            <testCaseId value="MC-5324"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                <requiredEntity createDataKey="createCustomerTaxClass"/>
+            </getData>
+            <getData entity="productTaxClass" stepKey="productTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
+            </actionGroup>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate"/>
+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+
+        <!-- Create a tax rule with customer and product class -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
+        <wait stepKey="waitForSearch2" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_NY_Rate_1.code}}" stepKey="fillTaxRateSearch2"/>
+        <wait stepKey="waitForSearch3" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_NY_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem2"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <wait stepKey="waitForAdditionalSettings" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <fillField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriorityPosition.priority}}" stepKey="fillPriority"/>
+        <fillField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPriorityPosition.position}}" stepKey="fillSortOrder"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see created tax rule with customer and product class(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see created tax rule with customer and product class on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" stepKey="seeSelectNeededItem2"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
+        <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriorityPosition.priority}}" stepKey="seePriority"/>
+        <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPriorityPosition.position}}" stepKey="seeSortOrder"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
new file mode 100644
index 0000000000000..abff31803a165
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest">
+        <annotations>
+            <stories value="Create tax rule"/>
+            <title value="Test log in to Create Tax Rule and Create Tax Rule with New and Existing Tax Rate, Customer Tax Class, Product Tax Class"/>
+            <description value="Test log in to Create tax rule and Create tax rule with New and Existing Tax Rate, Customer Tax Class, Product Tax Class"/>
+            <testCaseId value="MC-5327"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="taxRate_US_NY_8_1" stepKey="TaxRateWithCustomRate"/>
+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                <requiredEntity createDataKey="createCustomerTaxClass"/>
+            </getData>
+            <getData entity="productTaxClass" stepKey="productTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
+            </actionGroup>
+            <deleteData stepKey="deleteTaxRate" createDataKey="TaxRateWithCustomRate"/>
+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+
+        <!-- Create a tax rule with new and existing tax rate, customer tax class, product tax class -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$TaxRateWithCustomRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$TaxRateWithCustomRate.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
+        <wait stepKey="waitForSearch2" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see created tax rule with new and existing tax rate, customer tax class, product tax class(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see created tax rule with new and existing tax rate, customer tax class, product tax class on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$TaxRateWithCustomRate.code$$" stepKey="fillTaxRateSearch3"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$TaxRateWithCustomRate.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch4"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
new file mode 100644
index 0000000000000..6e9b81743ddf0
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest">
+        <annotations>
+            <stories value="Create tax rule"/>
+            <title value="Creating tax rule with new tax classes and tax rate"/>
+            <description value="Test log in to Create Tax Rule and Create tax rule with New Tax Classes and Tax Rate"/>
+            <testCaseId value="MC-5325"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                <requiredEntity createDataKey="createCustomerTaxClass"/>
+            </getData>
+            <getData entity="productTaxClass" stepKey="productTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
+            </actionGroup>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate"/>
+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+
+        <!-- Create a tax rule with new tax classes and tax rate -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
+        <wait stepKey="waitForSearch2" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_NY_Rate_1.code}}" stepKey="fillTaxRateSearch2"/>
+        <wait stepKey="waitForSearch3" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_NY_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem2"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <fillField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPosition.position}}" stepKey="fillSortOrder"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see created tax rule with new tax classes and tax rate(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see created tax rule with new tax classes and tax rate on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_NY_Rate_1.code)}}" stepKey="seeSelectNeededItem2"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
+        <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPosition.position}}" stepKey="seeSortOrder"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
new file mode 100644
index 0000000000000..6a9bf30811ff5
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateTaxRuleWithZipRangeTest">
+        <annotations>
+            <stories value="Create tax rule"/>
+            <title value="Create tax rule, with zip range"/>
+            <description value="Test log in to Create Tax Rule and Create tax rule with Zip Range"/>
+            <testCaseId value="MC-5326"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultTaxRateWithZipRange" stepKey="taxRateWithZipRange"/>
+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                <requiredEntity createDataKey="createCustomerTaxClass"/>
+            </getData>
+            <getData entity="productTaxClass" stepKey="productTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
+                <argument name="taxRuleCode" value="{{SimpleTaxRule.code}}" />
+            </actionGroup>
+            <deleteData stepKey="deleteTaxRate" createDataKey="taxRateWithZipRange"/>
+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+
+        <!-- Create a tax rule with new tax classes and tax rate -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$taxRateWithZipRange.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$taxRateWithZipRange.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="{{US_CA_Rate_1.code}}" stepKey="fillTaxRateSearch1"/>
+        <wait stepKey="waitForSearch2" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.taxRateOption(US_CA_Rate_1.code)}}" dependentSelector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" visible="false" stepKey="clickSelectNeededItem1"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <wait stepKey="waitForAdditionalSettings" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <fillField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriority.priority}}" stepKey="fillPriority"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see created tax rule with zip range(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see created tax rule with zip range on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$taxRateWithZipRange.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected(US_CA_Rate_1.code)}}" stepKey="seeSelectNeededItem1"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
+        <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriority.priority}}" stepKey="seePriority"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
new file mode 100644
index 0000000000000..658f524a4a5db
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteTaxRuleTest">
+        <annotations>
+            <stories value="Delete tax rule"/>
+            <title value="Delete tax rule"/>
+            <description value="Test log in to tax rule and Delete tax rule"/>
+            <testCaseId value="MC-5823"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
+            <createData entity="ApiSimplePrice100Qty100v2" stepKey="simpleProduct"/>
+            <createData entity="Simple_US_Utah_Customer" stepKey="customer" />
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct" />
+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Delete values on the tax rule form page -->
+        <click selector="{{AdminTaxRuleFormSection.deleteRule}}" stepKey="clickDeleteRule"/>
+        <click selector="{{AdminTaxRuleFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad stepKey="waitForTaxRuleDeleted" />
+
+        <!-- Verify we see success message -->
+        <see selector="{{AdminMessagesSection.success}}" userInput="The tax rule has been deleted." stepKey="seeAssertTaxRuleDeleteMessage"/>
+
+        <!-- Confirm Deleted Tax Rule(from the above step) on the tax rule grid page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <see selector="{{AdminTaxRuleGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertTaxRuleNotFound"/>
+
+        <!-- Verify customer don't tax on the store front product page -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$customer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$simpleProduct$$" />
+            <argument name="productCount" value="1" />
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart" />
+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
+            <argument name="address" value="US_Address_Utah" />
+        </actionGroup>
+        <scrollTo selector="{{StorefrontProductPageSection.orderTotal}}" x="0" y="-80" stepKey="scrollToOrderTotal"/>
+        <see selector="{{StorefrontProductPageSection.subTotal}}" userInput="$100.00" stepKey="seeSubTotal"/>
+        <see selector="{{StorefrontProductPageSection.shipping}}" userInput="$5.00" stepKey="seeShipping"/>
+        <dontSee selector="{{StorefrontProductPageSection.tax}}" stepKey="dontSeeAssertTaxAmount" />
+        <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="$105.00" stepKey="seeAssertOrderTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
new file mode 100644
index 0000000000000..4741898b0ab86
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminTaxReportGridTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="MAGETWO-91521: Reports / Sales / Tax report show incorrect amount"/>
+            <title value="Checking Tax Report grid"/>
+            <description value="Tax Report Grid displays Tax amount in rows 'Total' and 'Subtotal' is a sum of all tax amounts"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94338"/>
+            <group value="Tax"/>
+            <skip>
+                <issueId value="MAGETWO-96193"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Go to tax rule page -->
+            <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addFirstTaxRuleActionGroup"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="TaxRule1"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxWithZipCode"/>
+            </actionGroup>
+
+            <actionGroup ref="addProductTaxClass" stepKey="addProductTaxClass">
+                <argument name="prodTaxClassName" value="TaxClasses1"/>
+            </actionGroup>
+
+            <click stepKey="disableDefaultProdTaxClass" selector="{{AdminTaxRulesSection.defaultTaxClass}}"/>
+            <waitForPageLoad stepKey="waitForTaxRulePage"/>
+            <click stepKey="clickSave" selector="{{AdminTaxRulesSection.saveRule}}"/>
+            <waitForPageLoad stepKey="waitForNewTaxRuleCreated"/>
+
+            <!-- Go to tax rule page to create second Tax Rule-->
+            <actionGroup ref="addNewTaxRuleActionGroup" stepKey="addSecondTaxRuleActionGroup"/>
+            <fillField stepKey="fillSecondRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="TaxRule2"/>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleSecondTaxWithZipCode"/>
+            </actionGroup>
+
+            <actionGroup ref="addProductTaxClass" stepKey="addSecondProductTaxClass">
+                <argument name="prodTaxClassName" value="TaxClasses2"/>
+            </actionGroup>
+
+            <click stepKey="disableSecondProdTaxClass" selector="{{AdminTaxRulesSection.defaultTaxClass}}"/>
+            <waitForPageLoad stepKey="waitForTaxRulePage2"/>
+            <click stepKey="clickSaveBtn" selector="{{AdminTaxRulesSection.saveRule}}"/>
+            <waitForPageLoad stepKey="waitForSecondTaxRuleCreated"/>
+
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="firstProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <createData entity="_defaultProduct" stepKey="secondProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!--Open Created products. In Tax Class select new created Product Tax classes.-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGrid"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="$$firstProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openFirstProductForEdit"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" stepKey="selectTexClassForFirstProduct" userInput="TaxClasses1"/>
+        <!-- Save the second product -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveFirstProduct"/>
+        <waitForPageLoad stepKey="waitForFirstProductSaved"/>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="againGoToProductIndex"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSecondProductGrid"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterSecondProductGridBySku">
+            <argument name="product" value="$$secondProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openSecondProductForEdit"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" stepKey="selectTexClassForSecondProduct" userInput="TaxClasses2"/>
+        <!-- Save the second product -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveSecondProduct"/>
+        <waitForPageLoad stepKey="waitForSecondProductSaved"/>
+
+        <!--Create an order with these 2 products in that zip code.-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+        <waitForPageLoad stepKey="waitForPage" time="60"/>
+        <!--Check if order can be submitted without the required fields including email address-->
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="seeNewOrderPageTitle"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="$$firstProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProductToOrder" after="addFirstProductToOrder">
+            <argument name="product" value="$$secondProduct$$"/>
+        </actionGroup>
+
+        <!--Fill customer group and customer email-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSecondProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" after="selectFlatRateShipping" stepKey="selectCheckMoneyPayment"/>
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" after="selectCheckMoneyPayment" stepKey="clickSubmitOrder"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+
+        <!--Create Invoice and Shipment for this Order.-->
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
+        <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
+
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction" after="waitForInvoiceSaved"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl" after="clickShipAction"/>
+        <!--Submit Shipment-->
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment" after="seeOrderShipmentUrl"/>
+        <waitForPageLoad stepKey="waitForShipmentSaved"/>
+
+        <!--Go to "Reports" -> "Sales" -> "Tax"-->
+        <amOnPage url="/admin/reports/report_sales/tax/" stepKey="navigateToReportsTaxPage"/>
+        <waitForPageLoad stepKey="waitForReportsTaxPageLoad"/>
+
+        <!--click "here" to refresh last day's statistics -->
+        <click stepKey="clickRefrashStatisticsHere" selector="{{AdminTaxReportsSection.refreshStatistics}}"/>
+        <waitForPageLoad stepKey="waitForRefresh"/>
+
+        <!--Select Dates-->
+        <fillField selector="{{AdminTaxReportsSection.fromDate}}" userInput="05/16/2018" stepKey="fillDateFrom"/>
+        <click selector="{{AdminTaxReportsSection.toDate}}" stepKey="clickDateTo"/>
+        <click selector="{{AdminTaxReportsSection.goTodayButton}}" stepKey="clickGoTodayDate"/>
+        <!--Click "Show report" in the upper right corner.-->
+        <click selector="{{AdminTaxReportsSection.showReportButton}}" stepKey="clickShowReportButton"/>
+        <waitForPageLoad time="60" stepKey="waitForReload"/>
+        <!--Tax Report Grid displays Tax amount in rows. "Total" and "Subtotal" is a sum of all tax amounts-->
+        <grabTextFrom selector="{{AdminTaxReportsSection.taxRuleAmount('Texas-0.125')}}" stepKey="amountOfFirstTaxRate"/>
+        <grabTextFrom selector="{{AdminTaxReportsSection.taxRuleAmount('Texas-7.25')}}" stepKey="amountOfSecondTaxRate"/>
+        <grabTextFrom selector="{{AdminTaxReportsSection.taxRuleAmount('Subtotal')}}" stepKey="amountOfSubtotalTaxRate"/>
+        <assertEquals stepKey="assertSubtotalFirstField">
+            <expectedResult type="string">$0.15</expectedResult>
+            <actualResult type="variable">amountOfFirstTaxRate</actualResult>
+        </assertEquals>
+
+        <assertEquals stepKey="assertSubtotalSecondField">
+            <expectedResult type="string">$8.92</expectedResult>
+            <actualResult type="variable">amountOfSecondTaxRate</actualResult>
+        </assertEquals>
+
+        <assertEquals stepKey="assertSubtotalField">
+            <expectedResult type="string">$9.07</expectedResult>
+            <actualResult type="variable">amountOfSubtotalTaxRate</actualResult>
+        </assertEquals>
+
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="TaxRule1"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteSecondRule">
+                <argument name="name" value="TaxRule2"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxWithZipCode.state}}-{{SimpleTaxWithZipCode.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleSecondTaxWithZipCode.state}}-{{SimpleSecondTaxWithZipCode.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <deleteData createDataKey="firstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="secondProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteFirstProductTaxClass">
+                <argument name="taxClassName" value="TaxClasses1"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteSecondProductTaxClass">
+                <argument name="taxClassName" value="TaxClasses2"/>
+            </actionGroup>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+         </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
new file mode 100644
index 0000000000000..0390542544060
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateDefaultTaxRuleTest">
+        <annotations>
+            <stories value="Update tax rule"/>
+            <title value="Update tax rule, tax rule default"/>
+            <description value="Test log in to Update tax rule and Update default tax rule"/>
+            <testCaseId value="MC-5819"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+            <before>
+                <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
+                <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+                <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+                <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+                <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                    <requiredEntity createDataKey="createCustomerTaxClass"/>
+                </getData>
+                <getData entity="productTaxClass" stepKey="productTaxClass">
+                    <requiredEntity createDataKey="createProductTaxClass"/>
+                </getData>
+                <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            </before>
+            <after>
+                <deleteData stepKey="deleteTaxRule" createDataKey="initialTaxRule" />
+                <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+                <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+                <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+            </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update tax rule with default -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$initialTaxRate.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <wait stepKey="waitForAdditionalSettings" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.customerTaxClassOption($$customerTaxClass.class_name$$)}}" stepKey="clickSelectCustomerTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <fillField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithUpdatePriorityPosition.priority}}" stepKey="fillPriority"/>
+        <fillField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithUpdatePriorityPosition.position}}" stepKey="fillPosition"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see updated tax rule with default(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see updated tax rule with default on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$initialTaxRate.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected($$customerTaxClass.class_name$$)}}" stepKey="seeCustomerTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithUpdatePriorityPosition.priority}}" stepKey="seePriority"/>
+        <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithUpdatePriorityPosition.position}}" stepKey="seePosition"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
new file mode 100644
index 0000000000000..0e87f268f8825
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateTaxRuleWithCustomClassesTest">
+        <annotations>
+            <stories value="Update tax rule"/>
+            <title value="Update tax rule, tax rule with custom classes"/>
+            <description value="Test log in to Update tax rule and Update tax rule with custom classes"/>
+            <testCaseId value="MC-5820"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
+            <createData entity="defaultTaxRateWithZipRange" stepKey="taxRateWithZipRange"/>
+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                <requiredEntity createDataKey="createCustomerTaxClass"/>
+            </getData>
+            <getData entity="productTaxClass" stepKey="productTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRule" createDataKey="initialTaxRule" />
+            <deleteData stepKey="deleteTaxRate" createDataKey="taxRateWithZipRange" />
+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update tax rule with custom classes -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$taxRateWithZipRange.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$taxRateWithZipRange.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <wait stepKey="waitForAdditionalSettings" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see updated tax rule with default(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see updated tax rule with default on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$taxRateWithZipRange.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" stepKey="seeRetailCustomerTaxClass" />
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" stepKey="seeTaxableGoodsTaxClass" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
new file mode 100644
index 0000000000000..3ef279e4a76a2
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateTaxRuleWithFixedZipUtahTest">
+        <annotations>
+            <stories value="Update tax rule"/>
+            <title value="Update tax rule, fixed zip Utah"/>
+            <description value="Test log in to Update tax rule and Update tax rule with fixed zip Utah"/>
+            <testCaseId value="MC-5821"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
+            <createData entity="TaxRateWithFixedZipUtah" stepKey="taxRateWithFixedZipUtah"/>
+            <createData entity="customerTaxClass" stepKey="createCustomerTaxClass"/>
+            <createData entity="productTaxClass" stepKey="createProductTaxClass"/>
+            <getData entity="customerTaxClass" stepKey="customerTaxClass">
+                <requiredEntity createDataKey="createCustomerTaxClass"/>
+            </getData>
+            <getData entity="productTaxClass" stepKey="productTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+            <createData entity="ApiSimplePrice100Qty100v2" stepKey="simpleProduct"/>
+            <createData entity="Simple_US_Utah_Customer" stepKey="customer" />
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRule" createDataKey="initialTaxRule" />
+            <deleteData stepKey="deleteTaxRate" createDataKey="taxRateWithFixedZipUtah" />
+            <deleteData stepKey="deleteCustomerTaxClass" createDataKey="createCustomerTaxClass"/>
+            <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct" />
+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
+        </after>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update tax rule with fixed zip Utah -->
+        <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$taxRateWithFixedZipUtah.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <click selector="{{AdminTaxRuleFormSection.taxRateOption($$taxRateWithFixedZipUtah.code$$)}}" stepKey="clickSelectNeededItem"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings"/>
+        <wait stepKey="waitForAdditionalSettings" time="5" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.customerTaxClassOption(retailCustomerTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.customerTaxClassSelected(retailCustomerTaxClass.class_name)}}" visible="false" stepKey="checkRetailCustomerTaxClass" />
+        <conditionalClick selector="{{AdminTaxRuleFormSection.productTaxClassOption(taxableGoodsTaxClass.class_name)}}" dependentSelector="{{AdminTaxRuleFormSection.productTaxClassSelected(taxableGoodsTaxClass.class_name)}}" visible="false" stepKey="checkTaxableGoodsTaxClass" />
+        <click selector="{{AdminTaxRuleFormSection.productTaxClassOption($$productTaxClass.class_name$$)}}" stepKey="clickSelectProductTaxClass"/>
+        <click selector="{{AdminTaxRuleFormSection.save}}" stepKey="clickSaveTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminTaxRuleGridSection.successMessage}}" userInput="You saved the tax rule." stepKey="seeAssertTaxRuleSuccessMessage"/>
+
+        <!-- Verify we see updated tax rule with fixed zip Utah(from the above step) on the tax rule grid page -->
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode2"/>
+        <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+
+        <!-- Verify we see updated tax rule with fixed zip Utah on the tax rule form page -->
+        <seeInField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="seeInTaxRuleCode"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.taxRateSelected($$taxRateWithFixedZipUtah.code$$)}}" stepKey="seeTaxRateSelected"/>
+        <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings1"/>
+        <scrollTo selector="{{AdminTaxRuleFormSection.additionalSettings}}" x="0" y="-80" stepKey="scrollToAdvancedSettings1"/>
+        <seeElement selector="{{AdminTaxRuleFormSection.productTaxClassSelected($$productTaxClass.class_name$$)}}" stepKey="seeProductTaxClass"/>
+
+        <!-- Verify if tax rule is applied on the store front product page -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$customer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$simpleProduct$$" />
+            <argument name="productCount" value="1" />
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart" />
+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
+            <argument name="address" value="US_Address_Utah" />
+        </actionGroup>
+        <scrollTo selector="{{StorefrontProductPageSection.orderTotal}}" x="0" y="-80" stepKey="scrollToOrderTotal"/>
+        <see selector="{{StorefrontProductPageSection.tax}}" userInput="$20.00" stepKey="seeAssertTaxAmount" />
+        <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="$125.00" stepKey="seeAssertGrandTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/CheckCreditMemoTotalsTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/CheckCreditMemoTotalsTest.xml
new file mode 100644
index 0000000000000..83fcfbff6de62
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/CheckCreditMemoTotalsTest.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckCreditMemoTotalsTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="MAGETWO-91769 - Credit Memo - Wrong tax calculation! #10982"/>
+            <title value="Checking Credit memo Totals"/>
+            <description value="Checking Credit memo Totals"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95175"/>
+            <group value="creditMemo"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!--Create category and product-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <!--Create tax rule and tax rate-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+            <actionGroup ref="addCustomTaxRate" stepKey="addCustomTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+            <click stepKey="expandAdditionalSettings" selector="{{AdminProductTaxClassSection.additionalSettings}}"/>
+            <waitForPageLoad stepKey="waitForPageLoad"/>
+            <click selector="{{AdminProductTaxClassSection.productTaxClass}}" stepKey="ClickToAddTaxClass"/>
+            <fillField selector="{{AdminProductTaxClassSection.TaxClassName}}" userInput="NewTaxClass" stepKey="setName"/>
+            <click selector="{{AdminProductTaxClassSection.confirm}}" stepKey="ClickToDone"/>
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage1"/>
+            <see userInput="You saved the tax rule." stepKey="VerifyRuleSaved"/>
+            <!--Search and edit product to add new created tax rule-->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="OpenEditProductOnBackend">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <waitForPageLoad stepKey="waitForPageLoad2"/>
+            <selectOption selector="{{AdminProductFormActionSection.selectTaxClass}}" userInput="NewTaxClass" stepKey="SetNewTaxClass" />
+            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+            <!--Set configs-->
+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToTaxConfigPage"/>
+            <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.taxClasses}}" dependentSelector="{{AdminConfigureTaxSection.taxClassesCondition}}" visible="false"/>
+            <click selector="{{AdminConfigureTaxSection.useSystemValue}}" stepKey="UncheckUseSystemValue"/>
+            <selectOption selector="{{AdminConfigureTaxSection.productTaxClass}}" userInput="NewTaxClass" stepKey="selectClass"/>
+            <click selector="{{AdminConfigureTaxSection.save}}" stepKey="saveConfig"/>
+            <!--flash cache-->
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!--Delete category and product-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <!--Delete customer-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!-- Reset admin order filter -->
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+            <!--Roll Back configuration-->
+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToTaxConfigPage"/>
+            <conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.taxClasses}}" dependentSelector="{{AdminConfigureTaxSection.taxClassesCondition}}" visible="false"/>
+            <selectOption selector="{{AdminConfigureTaxSection.productTaxClass}}" userInput="Taxable Goods" stepKey="selectClass"/>
+            <click selector="{{AdminConfigureTaxSection.save}}" stepKey="saveConfig"/>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <!-- Delete tax rate that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductTaxClass" stepKey="deleteFirstProductTaxClass">
+                <argument name="taxClassName" value="NewTaxClass"/>
+            </actionGroup>
+            <!--logout-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create new order-->
+        <actionGroup stepKey="CreateNewOrder" ref="navigateToNewOrderPageExistingCustomer">
+            <argument name="customer" value="Simple_US_Customer_NY"/>
+        </actionGroup>
+        <!--Add product to order-->
+        <click stepKey="clickToAddProduct" selector="{{AdminOrderFormItemsSection.addProducts}}"/>
+        <waitForPageLoad stepKey="waitForProductsOpened"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <!--Set shipping method-->
+        <actionGroup stepKey="orderSelectFlatRateShipping" ref="orderSelectFlatRateShipping"/>
+        <!--Submit order-->
+        <click stepKey="SubmitOrder" selector="{{AdminOrderFormActionSection.SubmitOrder}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <grabTextFrom stepKey="getOrderId" selector="|Order # (\d+)|"/>
+        <!--Open new created order-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$getOrderId"/>
+        </actionGroup>
+        <!--Create order invoice-->
+        <click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="clickCreatedOrderInGrid"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderProcessing"/>
+        <!--Create Credit Memo-->
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemoAction"/>
+        <fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle"/>
+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the credit memo." stepKey="seeCreditMemoSuccess"/>
+        <click selector="{{AdminCreditMemoTotalSection.creditMemoItem}}" stepKey="goToCreatedCreditMemo"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <!--View created memo and verify tax for product-->
+        <click selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="ViewMemo"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <grabTextFrom selector="{{AdminCreditMemoTotalSection.grandTotal}}" stepKey="getGrandTotal"/>
+        <assertEquals expected='$123.00' expectedType="string" actual="($getGrandTotal)" stepKey="assertGrandTotalValue"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
new file mode 100644
index 0000000000000..5f855f5bb750d
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="DeleteTaxRateEntityTest">
+        <annotations>
+            <stories value="Delete Tax Rate"/>
+            <title value="Delete tax rate"/>
+            <description value="Test log in to Tax Rate and Delete Tax Rate"/>
+            <testCaseId value="MC-5801"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Delete values on the tax rate form page -->
+        <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+        <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
+
+        <!-- Confirm Deleted TaxIdentifier(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRate.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <see selector="{{AdminTaxRateGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeSuccess"/>
+
+        <!-- Confirm Deleted TaxIdentifier on the tax rule grid page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex3"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <dontSee selector="{{AdminTaxRuleFormSection.fieldTaxRate}}" userInput="$$initialTaxRate.code$$" stepKey="dontSeeInTaxRuleForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..1cb96b37cc760
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Shopping cart taxes"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41932"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) With FPT Enable -->
+            <createData entity="Tax_Config_NY" stepKey="taxConfigurationNYWithFPTEnable"/>
+            <!--  Store>Configuration; Sales>Tax FPT Enable -->
+            <createData entity="WeeeConfigEnable" stepKey="enableFPT"/>
+            <!--  Simple product is created  Price = 10;  FPT United States/California/10,United States/New York/20 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <field key="price">10.00</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Customer is created with default addresses: -->
+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue1">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="California"/>
+                <argument name="valueForFPT" value="10"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue2">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="New York"/>
+                <argument name="valueForFPT" value="20"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        </before>
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as logged in Customer  -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!--  Step 2: Add simple product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCustomerCountry" />
+        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkFPTAmountCA" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <!--  Step 6: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxAmount}}" stepKey="scrollToTaxSummary2" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <dontSeeElement selector="{{CheckoutCartSummarySection.amountFPT}}" stepKey="checkFPTIsNotDisplayed" />
+        <!--  Step 7: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="New York" stepKey="selectNewYorkRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="12345" stepKey="inputPostCode2"/>
+        <!--  Step 8: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary3" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary3"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.84" stepKey="checkTaxAmountNY" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$20" stepKey="checkFPTAmountNY" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..190263efb2469
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Shopping cart taxes"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41933"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="taxConfigurationCA"/>
+            <!--  Virtual product is created: -->
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <field key="price">40.00</field>
+            </createData>
+            <!-- Customer is created with default addresses: -->
+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as logged in Customer  -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!--  Step 2: Add virtual product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnStorefrontVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddVirtualProductToCart">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country_id}}" stepKey="checkCustomerCountry" />
+        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
+        <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="expandTaxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxAmount}}" stepKey="scrollToTaxSummary2" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <!--  Step 6: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="90230" stepKey="inputPostCode2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary3" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary2"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.30" stepKey="checkTaxAmount2" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..bce9d895e311e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Shopping cart taxes"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41930"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="taxConfigurationForCA"/>
+            <!--  Store>Configuration; Sales>Tax FPT Enable -->
+            <createData entity="WeeeConfigEnable" stepKey="enableFPT"/>
+            <!--  Simple product is created  Price = 10;  FPT United States/California/10,United States/New York/20 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <field key="price">10.00</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+             </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue1">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="California"/>
+                <argument name="valueForFPT" value="10"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue2">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="New York"/>
+                <argument name="valueForFPT" value="20"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as Guest -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--  Step 2: Add simple product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkFPTAmountCA" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <!--  Step 6: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxAmount}}" stepKey="scrollToTaxSummary2" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <dontSeeElement selector="{{CheckoutCartSummarySection.amountFPT}}" stepKey="checkFPTIsNotDisplayed" />
+        <!--  Step 7: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="New York" stepKey="selectNewYorkRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="12345" stepKey="inputPostCode2"/>
+        <!--  Step 8: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary3" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary2"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.84" stepKey="checkTaxAmountNY" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$20" stepKey="checkFPTAmountNY" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..74233bbff4a64
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Shopping cart taxes"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41931"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+         </annotations>
+         <before>
+             <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="taxConfigurationCA"/>
+            <!--  Virtual product is created: Price = 10 -->
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <field key="price">40.00</field>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as Guest -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--  Step 2: Add virtual product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnStorefrontVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddVirtualProductToCart">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.30" stepKey="checkTaxAmountCA" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <!--  Step 6: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="New York" stepKey="selectNewYorkRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="12345" stepKey="inputPostCode2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary2" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary2"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.35" stepKey="checkTaxAmountNY" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
new file mode 100644
index 0000000000000..05ced7e61b3b7
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxQuoteCartLoggedInSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <description value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-295"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <waitForText userInput="$5.00" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" time="30" stepKey="waitForCorrectShippingAmount"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$128.00"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxCA"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+
+    <test name="StorefrontTaxQuoteCartLoggedInVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <description value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-296"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$$$virtualProduct1.price$$"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxCA"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCartGuestSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
+            <description value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Guest Customer#anch"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-297"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$128.00"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxNY"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCartGuestVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
+            <description value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-298"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$$$virtualProduct1.price$$"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxNY"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
new file mode 100644
index 0000000000000..e7bf08257ea69
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxQuoteCheckoutGuestVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <description value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-255"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="GuestCheckoutSelectPaymentAndFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="customerVar" value="Simple_US_Customer_NY"/>
+            <argument name="customerAddressVar" value="US_Address_NY"/>
+            <argument name="paymentMethod" value="Check / Money order"/>
+        </actionGroup>
+        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
+
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <see stepKey="seeEditButton" selector="{{CheckoutShippingSection.editAddressButton}}" userInput="Edit"/>
+        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCheckoutLoggedInSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <description value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-256"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxNY.state}}"/>
+        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForReviewAndPayments"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Go back to the shipping page and change the address -->
+        <click stepKey="goBackToShipping" selector="{{CheckoutShippingSection.shippingTab}}"/>
+        <click stepKey="addNewAddress" selector="{{CheckoutShippingSection.newAddressButton}}"/>
+        <waitForPageLoad stepKey="waitForAddressPopUp"/>
+
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="US_Address_CA"/>
+            <argument name="classPrefix" value="._show"/>
+        </actionGroup>
+        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.saveAddress}}"/>
+
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxCA.state}}"/>
+        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForReviewAndPayments2"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCheckoutGuestSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <description value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-258"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Fill in address for CA -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer_CA.email}}" stepKey="enterEmail"/>
+        <waitForLoadingMaskToDisappear stepKey="waitEmailLoad" />
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="US_Address_CA"/>
+        </actionGroup>
+        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForAddressToLoad"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
+        <see stepKey="seeShipTo" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxCA.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Go back to the shipping page and change the address -->
+        <click stepKey="goBackToShipping" selector="{{CheckoutShippingSection.shippingTab}}"/>
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress2">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForShippingToLoad"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+        <see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxNY.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCheckoutLoggedInVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <description value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-259"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax won't be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <click stepKey="editAddress" selector="{{CheckoutShippingSection.editAddressButton}}"/>
+        <selectOption stepKey="addNewAddress" selector="{{CheckoutShippingSection.addressDropdown}}" userInput="New Address"/>
+        <waitForPageLoad stepKey="waitForNewAddressForm"/>
+
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="US_Address_CA"/>
+            <argument name="classPrefix" value="[aria-hidden=false]"/>
+        </actionGroup>
+        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
+
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
new file mode 100644
index 0000000000000..433e390d776de
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="Update01TaxRateEntityTest">
+        <annotations>
+            <stories value="Update Tax Rate"/>
+            <title value="Update tax rate, 0.1 rate"/>
+            <description value="Test log in to Tax Rate and Update 0.1 Rate"/>
+            <testCaseId value="MC-5333"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update 0.1 tax rate on the tax rate form page -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country_id}}" stepKey="selectCountry1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region_id}}" stepKey="selectState"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="fillPostCode"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="fillRate1"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify we see updated 0.1 tax rate(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+        <!-- Verify we see updated 0.1 tax rate on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="seeRTaxIdentifier"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country}}" stepKey="seeCountry2"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region}}" stepKey="seeState2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="seeZipCode"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="seeRate2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
new file mode 100644
index 0000000000000..27a7f2c51724e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="Update100TaxRateEntityTest">
+        <annotations>
+            <stories value="Update Tax Rate"/>
+            <title value="Update tax rate, 100 rate"/>
+            <description value="Test log in to Tax Rate and Update 100 Rate"/>
+            <testCaseId value="MC-5328"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update values on the tax rate form page -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUS.tax_country_id}}" stepKey="selectCountry1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateUS.tax_region_id}}" stepKey="selectState"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateUS.tax_postcode}}" stepKey="fillPostCode"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUS.rate}}" stepKey="fillRate1"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify we see updated TaxIdentifier(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+        <!-- Verify we see updated values on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="seeRTaxIdentifier"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUS.tax_country}}" stepKey="seeCountry2"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateUS.tax_region}}" stepKey="seeState2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateUS.tax_postcode}}" stepKey="seeZipCode"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUS.rate}}" stepKey="seeRate2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
new file mode 100644
index 0000000000000..aa46a5fdae0e1
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="Update1299TaxRateEntityTest">
+        <annotations>
+            <stories value="Update Tax Rate"/>
+            <title value="Update tax rate, 12.99 rate"/>
+            <description value="Test log in to Tax Rate and Update 12.99 Rate"/>
+            <testCaseId value="MC-5332"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <!-- Search the tax identifier on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode1"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update 12.99 tax rate on the tax rate form page -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="fillTaxIdentifierField1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUK.tax_country_id}}" stepKey="selectCountry1"/>
+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange"/>
+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{taxRateCustomRateUK.zip_from}}" stepKey="fillZipFrom"/>
+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{taxRateCustomRateUK.zip_to}}"  stepKey="fillZipTo"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUK.rate}}" stepKey="fillRate1"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="fillTaxIdentifierField2"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+        <!-- Verify we see updated tax rate on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="seeRTaxIdentifier"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUK.tax_country}}" stepKey="seeCountry2"/>
+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="seeZipRange"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{taxRateCustomRateUK.zip_from}}" stepKey="seeZipFrom"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{taxRateCustomRateUK.zip_to}}" stepKey="seeZipTo"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUK.rate}}" stepKey="seeRate"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
new file mode 100644
index 0000000000000..d7b25da6c14ae
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="UpdateAnyRegionTaxRateEntityTest">
+        <annotations>
+            <stories value="Update Tax Rate"/>
+            <title value="Update tax rate, any region"/>
+            <description value="Test log in to Tax Rate and Update Any Region"/>
+            <testCaseId value="MC-5331"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update any region tax rate on the tax rate form page -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateCanada.tax_country_id}}" stepKey="selectCountry1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateCanada.tax_region_id}}" stepKey="selectState"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateCanada.tax_postcode}}" stepKey="fillPostCode"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateCanada.rate}}" stepKey="fillRate1"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify we see updated any region tax rate(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+        <!-- Verify we see updated any region tax rate on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="seeRTaxIdentifier"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateCanada.tax_country}}" stepKey="seeCountry2"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateCanada.tax_region_id}}" stepKey="seeState2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateCanada.tax_postcode}}" stepKey="seeZipCode"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateCanada.rate}}" stepKey="seeRate2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
new file mode 100644
index 0000000000000..3002452196904
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="UpdateDecimalTaxRateEntityTest">
+        <annotations>
+            <stories value="Update Tax Rate"/>
+            <title value="Update tax rate, decimal rate"/>
+            <description value="Test log in to Tax Rate and Update Decimal Tax Rate"/>
+            <testCaseId value="MC-5329"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update decimal tax rate on the tax rate form page -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithZipRange.tax_country_id}}" stepKey="selectCountry1"/>
+        <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{defaultTaxRateWithZipRange.tax_region_id}}" stepKey="selectState"/>
+        <checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange"/>
+        <fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{defaultTaxRateWithZipRange.zip_from}}" stepKey="fillZipFrom"/>
+        <fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{defaultTaxRateWithZipRange.zip_to}}"  stepKey="fillZipTo"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithZipRange.rate}}" stepKey="fillRate1"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+        <!-- Verify we see updated tax rate on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="seeRTaxIdentifier"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithZipRange.tax_country}}" stepKey="seeCountry2"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{defaultTaxRateWithZipRange.tax_region}}" stepKey="seeState2"/>
+        <seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="seeZipRange"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{defaultTaxRateWithZipRange.zip_from}}" stepKey="seeTaxPostCode2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{defaultTaxRateWithZipRange.zip_to}}" stepKey="seeTaxPostCode3"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithZipRange.rate}}" stepKey="seeRate2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
new file mode 100644
index 0000000000000..6c81a6aeb3f11
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="UpdateLargeTaxRateEntityTest">
+        <annotations>
+            <stories value="Update Tax Rate"/>
+            <title value="Update tax rate, large rate"/>
+            <description value="Test log in to Tax Rate and Update Large Rate"/>
+            <testCaseId value="MC-5330"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
+        </after>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Update large tax rate on the tax rate form page -->
+        <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="fillTaxIdentifierField2"/>
+        <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithLargeRate.tax_country_id}}" stepKey="selectCountry1"/>
+        <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{defaultTaxRateWithLargeRate.tax_postcode}}" stepKey="fillPostCode"/>
+        <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithLargeRate.rate}}" stepKey="fillRate1"/>
+        <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
+
+        <!-- Verify we see updated large tax rate(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
+        <!-- Verify we see updated large tax rate on the tax rate form page -->
+        <seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="seeRTaxIdentifier"/>
+        <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithLargeRate.tax_country}}" stepKey="seeCountry2"/>
+        <seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{defaultTaxRateWithLargeRate.tax_postcode}}" stepKey="seeZipCode"/>
+        <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithLargeRate.rate}}" stepKey="seeRate2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php b/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
index c1aa2b0c9900d..e7a11ec45ad3f 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Checkout/ShippingTest.php
@@ -44,6 +44,9 @@ public function testDisplayShipping($shippingMethod, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->displayShipping());
     }
 
+    /**
+     * @return array
+     */
     public function displayShippingDataProvider()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Grid/Renderer/CodesTest.php b/app/code/Magento/Tax/Test/Unit/Block/Grid/Renderer/CodesTest.php
index afbf65b67b3a8..dd4b3df842de6 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Grid/Renderer/CodesTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Grid/Renderer/CodesTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Tax\Test\Unit\Block\Grid\Renderer;
 
+use Magento\Backend\Block\Context;
 use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Tax\Block\Grid\Renderer\Codes;
 
@@ -24,7 +26,26 @@ class CodesTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->codes = $objectManager->getObject(Codes::class);
+        $escaper = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $escaper->expects($this->any())
+            ->method('escapeHtml')
+            ->willReturnCallback(
+                function ($str) {
+                    return 'ESCAPED:' .$str;
+                }
+            );
+        $context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $context->expects($this->any())
+            ->method('getEscaper')
+            ->willReturn($escaper);
+        $this->codes = $objectManager->getObject(
+            Codes::class,
+            ['context' => $context]
+        );
     }
 
     /**
@@ -50,10 +71,10 @@ public function testRenderCodes($ratesCodes, $expected)
     public function ratesCodesDataProvider()
     {
         return [
-            [['some_code'], 'some_code'],
-            [['some_code', 'some_code2'], 'some_code, some_code2'],
+            [['some_code'], 'ESCAPED:some_code'],
+            [['some_code', 'some_code2'], 'ESCAPED:some_code, some_code2'],
             [[], ''],
-            [null, '']
+            [null, ''],
         ];
     }
 }
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php b/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
index 1a16e69724479..90f0f09215889 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Item/Price/RendererTest.php
@@ -96,6 +96,9 @@ public function testDisplayPriceInclTax($zone, $methodName)
         $this->assertEquals($flag, $this->renderer->displayPriceInclTax());
     }
 
+    /**
+     * @return array
+     */
     public function displayPriceInclTaxDataProvider()
     {
         $data = [
@@ -143,6 +146,9 @@ public function testDisplayPriceExclTax($zone, $methodName)
         $this->assertEquals($flag, $this->renderer->displayPriceExclTax());
     }
 
+    /**
+     * @return array
+     */
     public function displayPriceExclTaxDataProvider()
     {
         $data = [
@@ -190,6 +196,9 @@ public function testDisplayBothPrices($zone, $methodName)
         $this->assertEquals($flag, $this->renderer->displayBothPrices());
     }
 
+    /**
+     * @return array
+     */
     public function displayBothPricesDataProvider()
     {
         $data = [
diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php
index 0f879a6e162f5..2035885f05e8f 100644
--- a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php
@@ -19,7 +19,7 @@ public function testExecute()
             ->getMock();
         $cacheTypeList->expects($this->once())
             ->method('cleanType')
-            ->with('block_html')
+            ->with('config')
             ->willReturn(null);
 
         $request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php b/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php
index 9684b0b9d3e82..922162501b436 100644
--- a/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php
@@ -148,7 +148,7 @@ public function testGetCalculatedTaxesForOrder()
     }
 
     /**
-     * Creat OrderTaxDetails mock from array of data
+     * Create OrderTaxDetails mock from array of data
      *
      * @param $inputArray
      * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Api\Data\OrderTaxDetailsInterface
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
index db2053efd41f6..bf49f3d479132 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
@@ -307,10 +307,14 @@ public function testSaveThrowsExceptionIfCannotSaveTitles($expectedException, $e
             ->with($rateTitles)
             ->willThrowException($expectedException);
         $this->rateRegistryMock->expects($this->never())->method('registerTaxRate')->with($rateMock);
-        $this->expectException($exceptionType, $exceptionMessage);
+        $this->expectException($exceptionType);
+        $this->expectExceptionMessage($exceptionMessage);
         $this->model->save($rateMock);
     }
 
+    /**
+     * @return array
+     */
     public function saveThrowsExceptionIfCannotSaveTitlesDataProvider()
     {
         return [
@@ -391,7 +395,7 @@ public function testValidate()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage percentage_rate is a required field.
+     * @expectedExceptionMessage "percentage_rate" is required. Enter and try again.
      */
     public function testValidateWithNoRate()
     {
@@ -429,7 +433,7 @@ public function testValidateWithNoRate()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage percentage_rate is a required field.
+     * @expectedExceptionMessage "percentage_rate" is required. Enter and try again.
      */
     public function testValidateWithWrongRate()
     {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php
index 5a5abfd828d88..7284eb46ea9d8 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Tax\Test\Unit\Model\Calculation;
 
 class RateTest extends \PHPUnit\Framework\TestCase
@@ -46,7 +47,8 @@ protected function setUp()
      */
     public function testExceptionOfValidation($exceptionMessage, $data)
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage($exceptionMessage);
         $rate = $this->objectHelper->getObject(
             \Magento\Tax\Model\Calculation\Rate::class,
             ['resource' => $this->resourceMock]
@@ -66,33 +68,77 @@ public function exceptionOfValidationDataProvider()
     {
         return [
             'fill all required fields 1' => [
-                'exceptionMessage' => 'Make sure all required information is valid.',
-                'data' => ['zip_is_range' => true, 'zip_from' => '0111', 'zip_to' => '',
-                    'code' => '', 'tax_country_id' => '', 'rate' => '', 'tax_postcode' => '', ],
+                'exceptionMessage' => 'The required information is invalid. Verify the information and try again.',
+                'data' => [
+                    'zip_is_range' => true,
+                    'zip_from' => '0111',
+                    'zip_to' => '',
+                    'code' => '',
+                    'tax_country_id' => '',
+                    'rate' => '',
+                    'tax_postcode' => '',
+                ],
             ],
             'fill all required fields 2' => [
-                'exceptionMessage' => 'Make sure all required information is valid.',
-                'data' => ['zip_is_range' => '', 'zip_from' => '', 'zip_to' => '',
-                    'code' => '', 'tax_country_id' => '', 'rate' => '0.2', 'tax_postcode' => '1234', ], ],
+                'exceptionMessage' => 'The required information is invalid. Verify the information and try again.',
+                'data' => [
+                    'zip_is_range' => '',
+                    'zip_from' => '',
+                    'zip_to' => '',
+                    'code' => '',
+                    'tax_country_id' => '',
+                    'rate' => '0.2',
+                    'tax_postcode' => '1234',
+                ],
+            ],
             'positive number' => [
-                'exceptionMessage' => 'The Rate Percent should be a positive number.',
-                'data' => ['zip_is_range' => '', 'zip_from' => '', 'zip_to' => '', 'code' => 'code',
-                    'tax_country_id' => 'US', 'rate' => '-1', 'tax_postcode' => '1234', ],
+                'exceptionMessage' => 'The Rate Percent is invalid. Enter a positive number and try again.',
+                'data' => [
+                    'zip_is_range' => '',
+                    'zip_from' => '',
+                    'zip_to' => '',
+                    'code' => 'code',
+                    'tax_country_id' => 'US',
+                    'rate' => '-1',
+                    'tax_postcode' => '1234',
+                ],
             ],
             'zip code length' => [
-                'exceptionMessage' => 'Maximum zip code length is 9.',
-                'data' => ['zip_is_range' => true, 'zip_from' => '1234567890', 'zip_to' => '1234',
-                    'code' => 'code', 'tax_country_id' => 'US', 'rate' => '1.1', 'tax_postcode' => '1234', ],
+                'exceptionMessage' => 'The ZIP Code length is invalid. '
+                    . 'Verify that the length is nine characters or fewer and try again.',
+                'data' => [
+                    'zip_is_range' => true,
+                    'zip_from' => '1234567890',
+                    'zip_to' => '1234',
+                    'code' => 'code',
+                    'tax_country_id' => 'US',
+                    'rate' => '1.1',
+                    'tax_postcode' => '1234',
+                ],
             ],
             'contain characters' => [
-                'exceptionMessage' => 'Use digits only for the zip code.',
-                'data' => ['zip_is_range' => true, 'zip_from' => 'foo', 'zip_to' => '1234', 'code' => 'code',
-                    'tax_country_id' => 'US', 'rate' => '1.1', 'tax_postcode' => '1234', ],
+                'exceptionMessage' => 'The ZIP Code is invalid. Use numbers only.',
+                'data' => [
+                    'zip_is_range' => true,
+                    'zip_from' => 'foo',
+                    'zip_to' => '1234',
+                    'code' => 'code',
+                    'tax_country_id' => 'US',
+                    'rate' => '1.1',
+                    'tax_postcode' => '1234',
+                ],
             ],
             'equal or greater' => [
                 'exceptionMessage' => 'Range To should be equal or greater than Range From.',
-                'data' => ['zip_is_range' => true, 'zip_from' => '321', 'zip_to' => '123', 'code' => 'code',
-                    'tax_country_id' => 'US', 'rate' => '1.1', 'tax_postcode' => '1234', ],
+                'data' => [
+                    'zip_is_range' => true,
+                    'zip_from' => '321',
+                    'zip_to' => '123',
+                    'code' => 'code',
+                    'tax_country_id' => 'US',
+                    'rate' => '1.1',
+                    'tax_postcode' => '1234',
+                ],
             ],
         ];
     }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
index 833520cc2855d..cbd7ed46e38d7 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
@@ -7,7 +7,7 @@
 namespace Magento\Tax\Test\Unit\Model\Calculation;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Tax\Model\Calculation\RowbaseCalculator;
+use Magento\Tax\Model\Calculation\RowBaseCalculator;
 use Magento\Tax\Model\Calculation\TotalBaseCalculator;
 
 /**
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
index 912f42af0d3cd..17246df8c5b45 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -63,6 +63,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupOrderMock()
     {
         $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
@@ -80,6 +83,9 @@ protected function setupOrderMock()
         return $orderMock;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupExtensionAttributeMock()
     {
         $orderExtensionAttributeMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionInterface::class)
@@ -95,6 +101,9 @@ protected function setupExtensionAttributeMock()
         return $orderExtensionAttributeMock;
     }
 
+    /**
+     * @param $expectedTaxes
+     */
     protected function verifyOrderTaxes($expectedTaxes)
     {
         $index = 0;
@@ -125,6 +134,9 @@ protected function verifyOrderTaxes($expectedTaxes)
         }
     }
 
+    /**
+     * @param $expectedItemTaxes
+     */
     public function verifyItemTaxes($expectedItemTaxes)
     {
         $index = 0;
@@ -210,93 +222,6 @@ public function testAfterSave(
      */
     public function afterSaveDataProvider()
     {
-        $orderTaxDetailsApplied = $this->getMockBuilder(\Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getRates'])
-            ->getMockForAbstractClass();
-
-        $orderTaxDetailsApplied->expects($this->at(0))
-            ->method('getRates')
-            ->willReturn(
-                [
-                    [
-                        'percent' => 6,
-                        'code' => 'IL',
-                        'title' => 'IL',
-                    ],
-                    [
-                        'percent' => 5,
-                        'code' => 'US',
-                        'title' => 'US',
-                    ]
-                ]
-            );
-        $orderTaxDetailsApplied->expects($this->at(1))
-            ->method('getRates')
-            ->willReturn(
-                [
-                    [
-                        'percent' => 3,
-                        'code' => 'CityTax',
-                        'title' => 'CityTax',
-                    ],
-                ]
-            );
-        $orderTaxDetailsApplied->expects($this->at(2))
-            ->method('getRates')
-            ->willReturn(
-                [
-                    [
-                        'percent' => 6,
-                        'code' => 'IL',
-                        'title' => 'IL',
-                    ],
-                    [
-                        'percent' => 5,
-                        'code' => 'US',
-                        'title' => 'US',
-                    ],
-                ]
-            );
-        $orderTaxDetailsApplied->expects($this->at(3))
-            ->method('getRates')
-            ->willReturn(
-                [
-                    [
-                        'percent' => 3,
-                        'code' => 'CityTax',
-                        'title' => 'CityTax',
-                    ],
-                ]
-            );
-        $orderTaxDetailsApplied->expects($this->at(4))
-            ->method('getRates')
-            ->willReturn(
-                [
-                    [
-                        'percent' => 6,
-                        'code' => 'IL',
-                        'title' => 'IL',
-                    ],
-                    [
-                        'percent' => 5,
-                        'code' => 'US',
-                        'title' => 'US',
-                    ],
-                ]
-            );
-        $orderTaxDetailsApplied->expects($this->at(5))
-            ->method('getRates')
-            ->willReturn(
-                [
-                    [
-                        'percent' => 3,
-                        'code' => 'CityTax',
-                        'title' => 'CityTax',
-                    ],
-                ]
-            );
-
         return [
             //one item with shipping
             //three tax rates: state and national tax rates of 6 and 5 percent with priority 0
@@ -308,14 +233,35 @@ public function afterSaveDataProvider()
                         'base_amount' => 0.66,
                         'percent' => 11,
                         'id' => 'ILUS',
-                        'extension_attributes' => $orderTaxDetailsApplied,
+                        'extension_attributes' => [
+                            'rates' => [
+                                [
+                                    'percent' => 6,
+                                    'code' => 'IL',
+                                    'title' => 'IL',
+                                ],
+                                [
+                                    'percent' => 5,
+                                    'code' => 'US',
+                                    'title' => 'US',
+                                ],
+                            ]
+                        ],
                     ],
                     [
                         'amount' => 0.2,
                         'base_amount' => 0.2,
                         'percent' => 3.33,
                         'id' => 'CityTax',
-                        'extension_attributes' => $orderTaxDetailsApplied,
+                        'extension_attributes' => [
+                            'rates' => [
+                                [
+                                    'percent' => 3,
+                                    'code' => 'CityTax',
+                                    'title' => 'CityTax',
+                                ],
+                            ]
+                        ],
                     ],
                 ],
                 'item_applied_taxes' => [
@@ -331,7 +277,20 @@ public function afterSaveDataProvider()
                                 'base_amount' => 0.11,
                                 'percent' => 11,
                                 'id' => 'ILUS',
-                                'extension_attributes' => $orderTaxDetailsApplied,
+                                'extension_attributes' => [
+                                    'rates' => [
+                                        [
+                                            'percent' => 6,
+                                            'code' => 'IL',
+                                            'title' => 'IL',
+                                        ],
+                                        [
+                                            'percent' => 5,
+                                            'code' => 'US',
+                                            'title' => 'US',
+                                        ],
+                                    ]
+                                ],
                             ],
                             //city tax
                             [
@@ -339,7 +298,15 @@ public function afterSaveDataProvider()
                                 'base_amount' => 0.03,
                                 'percent' => 3.33,
                                 'id' => 'CityTax',
-                                'extension_attributes' => $orderTaxDetailsApplied,
+                                'extension_attributes' => [
+                                    'rates' => [
+                                        [
+                                            'percent' => 3,
+                                            'code' => 'CityTax',
+                                            'title' => 'CityTax',
+                                        ],
+                                    ]
+                                ],
                             ],
                         ],
                     ],
@@ -355,7 +322,20 @@ public function afterSaveDataProvider()
                                 'base_amount' => 0.55,
                                 'percent' => 11,
                                 'id' => 'ILUS',
-                                'extension_attributes' => $orderTaxDetailsApplied,
+                                'extension_attributes' => [
+                                    'rates' => [
+                                        [
+                                            'percent' => 6,
+                                            'code' => 'IL',
+                                            'title' => 'IL',
+                                        ],
+                                        [
+                                            'percent' => 5,
+                                            'code' => 'US',
+                                            'title' => 'US',
+                                        ],
+                                    ]
+                                ],
                             ],
                             //city tax
                             [
@@ -363,7 +343,15 @@ public function afterSaveDataProvider()
                                 'base_amount' => 0.17,
                                 'percent' => 3.33,
                                 'id' => 'CityTax',
-                                'extension_attributes' => $orderTaxDetailsApplied,
+                                'extension_attributes' => [
+                                    'rates' => [
+                                        [
+                                            'percent' => 3,
+                                            'code' => 'CityTax',
+                                            'title' => 'CityTax',
+                                        ],
+                                    ]
+                                ],
                             ],
                         ],
                     ],
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
index e5bd728e180f6..4d1db6435b863 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
@@ -108,6 +108,10 @@ function ($value) {
         );
     }
 
+    /**
+     * @param array $data
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupTaxTotal(array $data)
     {
         $taxTotalMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Total::class)
@@ -121,6 +125,10 @@ protected function setupTaxTotal(array $data)
         return $taxTotalMock;
     }
 
+    /**
+     * @param array $taxRate
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupTaxRateFactoryMock(array $taxRate)
     {
         $taxRateMock = $this->getMockBuilder(\Magento\Tax\Api\Data\GrandTotalRatesInterface::class)
@@ -142,6 +150,10 @@ protected function setupTaxRateFactoryMock(array $taxRate)
         return $taxRateMock;
     }
 
+    /**
+     * @param array $taxDetails
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupTaxDetails(array $taxDetails)
     {
         $taxDetailsMock = $this->getMockBuilder(\Magento\Tax\Api\Data\GrandTotalDetailsInterface::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
index 23ce032764a8f..09f82b32137b3 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
@@ -64,6 +64,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function setupOrderExtensionAttributeMock()
     {
         $orderExtensionAttributeMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionInterface::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
index 44c827c41af56..9325ec10dc627 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -183,6 +183,9 @@ public function testGetShippingDataObject(
         }
     }
 
+    /**
+     * @return array
+     */
     public function getShippingDataObjectDataProvider()
     {
         $data = [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
index 0c1876d6fc7d7..9cfea225f2d9c 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
@@ -565,6 +565,9 @@ public function testMapQuoteExtraTaxables($itemData, $addressData)
     /*
      * @return array
      */
+    /**
+     * @return array
+     */
     public function dataProviderMapQuoteExtraTaxablesArray()
     {
         $data = [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
index a5bf80345f0b2..95dc5509ed0a3 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
@@ -93,6 +93,9 @@ public function testIsDisplayed(
         $this->assertEquals($expectedResult, $this->applyDiscountOnPricesNotification->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderIsDisplayed()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
index 3cf1421ebcf37..3fda67669fe86 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
@@ -73,6 +73,9 @@ public function testIsDisplayed(
         $this->assertEquals($expectedResult, $this->notifications->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderIsDisplayed()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
index ec640b74f8985..493eebf9e1123 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
@@ -109,6 +109,9 @@ public function testSetDefaultAddressAfterSave(
         $this->manager->setDefaultAddressAfterSave($address);
     }
 
+    /**
+     * @return array
+     */
     public function setAddressCustomerSessionAddressSaveDataProvider()
     {
         return [
@@ -151,6 +154,9 @@ public function testSetDefaultAddressAfterLogIn(
         $this->manager->setDefaultAddressAfterLogIn([$address]);
     }
 
+    /**
+     * @return array
+     */
     public function setAddressCustomerSessionLogInDataProvider()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php
index eb107c248880b..d124fc2f81902 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php
@@ -39,6 +39,9 @@ public function testCreate($classType, $className, $classTypeMock)
         $this->assertEquals($classTypeMock, $taxClassFactory->create($classMock));
     }
 
+    /**
+     * @return array
+     */
     public function createDataProvider()
     {
         $customerClassMock = $this->createMock(\Magento\Tax\Model\TaxClass\Type\Customer::class);
@@ -70,10 +73,8 @@ public function testCreateWithWrongClassType()
 
         $taxClassFactory = new \Magento\Tax\Model\TaxClass\Factory($objectManager);
 
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('Invalid type of tax class "%s"', $wrongClassType)
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(sprintf('Invalid type of tax class "%s"', $wrongClassType));
         $taxClassFactory->create($classMock);
     }
 }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
index fc27e68c8e55b..707b999c5e467 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
@@ -26,9 +26,9 @@ public function testIsAssignedToObjects()
 
         $filterBuilder->expects($this->once())->method('setField')->with(
             \Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID
-        )->willReturnself();
-        $filterBuilder->expects($this->once())->method('setValue')->willReturnself();
-        $filterBuilder->expects($this->once())->method('create')->willReturnself();
+        )->willReturnSelf();
+        $filterBuilder->expects($this->once())->method('setValue')->willReturnSelf();
+        $filterBuilder->expects($this->once())->method('create')->willReturnSelf();
 
         $filterGroupBuilder = $this->createMock(\Magento\Framework\Api\Search\FilterGroupBuilder::class);
         $searchCriteriaBuilder = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteriaBuilder::class)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
index 182e1b43d786c..3fddd5da47611 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
@@ -163,10 +163,14 @@ public function testSaveWithExceptions($exceptionObject, $exceptionName, $except
             ->willThrowException($exceptionObject);
         $this->taxRuleRegistry->expects($this->never())->method('registerTaxRule');
 
-        $this->expectException($exceptionName, $exceptionMessage);
+        $this->expectException($exceptionName);
+        $this->expectExceptionMessage($exceptionMessage);
         $this->model->save($rule);
     }
 
+    /**
+     * @return array
+     */
     public function saveExceptionsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index 14d678d02366b..96b4b81ae2817 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -138,6 +138,9 @@ public function testExecute(
         $this->session->execute($this->observerMock);
     }
 
+    /**
+     * @return array
+     */
     public function getExecuteDataProvider()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
index aaaf72b986240..97fb5472a280d 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/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
index effc54b84ac04..88dce330b1535 100644
--- a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
@@ -5,61 +5,63 @@
  */
 namespace Magento\Tax\Test\Unit\Plugin\Checkout\CustomerData;
 
-class CartTest extends \PHPUnit\Framework\TestCase
+use Magento\Checkout\CustomerData\Cart as CheckoutCart;
+use Magento\Checkout\Helper\Data;
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Tax\Block\Item\Price\Renderer;
+use Magento\Tax\Plugin\Checkout\CustomerData\Cart;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class CartTest extends TestCase
 {
-
     /**
-     * @var \Magento\Checkout\Model\Session
+     * @var Session|MockObject
      */
-    protected $checkoutSession;
+    private $checkoutSession;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    protected $checkoutHelper;
+    private $checkoutHelper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Renderer|MockObject
      */
-    protected $itemPriceRenderer;
+    private $itemPriceRenderer;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var CheckoutCart|MockObject
      */
-    protected $checkoutCart;
+    private $checkoutCart;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Quote|MockObject
      */
-    protected $quote;
+    private $quote;
 
     /**
-     * @var \Magento\Tax\Plugin\Checkout\CustomerData\Cart
+     * @var Cart
      */
-    protected $cart;
+    private $cart;
 
     protected function setUp()
     {
-        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->checkoutSession = $this->createMock(\Magento\Checkout\Model\Session::class);
-        $this->checkoutHelper = $this->createMock(\Magento\Checkout\Helper\Data::class);
-        $this->itemPriceRenderer = $this->createMock(\Magento\Tax\Block\Item\Price\Renderer::class);
-        $this->checkoutCart = $this->createMock(\Magento\Checkout\CustomerData\Cart::class);
-        $this->quote = $this->createMock(\Magento\Quote\Model\Quote::class);
-
-        $this->checkoutSession->expects(
-            $this->any()
-        )->method(
-            'getQuote'
-        )->willReturn($this->quote);
-
-        $this->cart = $helper->getObject(
-            \Magento\Tax\Plugin\Checkout\CustomerData\Cart::class,
-            [
-                'checkoutSession' => $this->checkoutSession,
-                'checkoutHelper' => $this->checkoutHelper,
-                'itemPriceRenderer' => $this->itemPriceRenderer,
-            ]
+        $this->checkoutSession = $this->createMock(Session::class);
+        $this->checkoutHelper = $this->createMock(Data::class);
+        $this->itemPriceRenderer = $this->createMock(Renderer::class);
+        $this->checkoutCart = $this->createMock(CheckoutCart::class);
+        $this->quote = $this->createMock(Quote::class);
+
+        $this->checkoutSession->method('getQuote')
+            ->willReturn($this->quote);
+        
+        $this->cart = new Cart(
+            $this->checkoutSession,
+            $this->checkoutHelper,
+            $this->itemPriceRenderer
         );
     }
 
@@ -77,49 +79,34 @@ public function testAfterGetSectionData()
             ]
         ];
 
-        $this->checkoutHelper->expects(
-            $this->atLeastOnce()
-        )->method(
-            'formatPrice'
-        )->willReturn('formatted');
-
-        $item1 = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item2 = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-
-        $item1->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getItemId'
-        )->willReturn(1);
-        $item2->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getItemId'
-        )->willReturn(2);
-
-        $this->quote->expects(
-            $this->any()
-        )->method(
-            'getAllVisibleItems'
-        )->willReturn([
-            $item1,
-            $item2,
-        ]);
-
-        $this->itemPriceRenderer->expects(
-            $this->atLeastOnce(1)
-        )->method(
-            'toHtml'
-        )->willReturn(1);
+        $this->checkoutHelper->method('formatPrice')
+            ->willReturn('formatted');
+
+        $item1 = $this->createMock(Item::class);
+        $item2 = $this->createMock(Item::class);
+
+        $item1->method('getItemId')
+            ->willReturn(1);
+        $item2->method('getItemId')
+            ->willReturn(2);
+
+        $this->quote->method('getAllVisibleItems')
+            ->willReturn([
+                $item1,
+                $item2,
+            ]);
+
+        $this->itemPriceRenderer->method('toHtml')
+            ->willReturn(1);
 
         $result = $this->cart->afterGetSectionData($this->checkoutCart, $input);
 
-        $this->assertArrayHasKey('subtotal_incl_tax', $result);
-        $this->assertArrayHasKey('subtotal_excl_tax', $result);
-        $this->assertArrayHasKey('items', $result);
-        $this->assertTrue(is_array($result['items']));
-        $this->assertEquals(2, count($result['items']));
-        $this->assertEquals(1, count($result['items'][0]['product_price']));
-        $this->assertEquals(1, count($result['items'][1]['product_price']));
+        self::assertArrayHasKey('subtotal_incl_tax', $result);
+        self::assertArrayHasKey('subtotal_excl_tax', $result);
+        self::assertArrayHasKey('items', $result);
+        self::assertTrue(is_array($result['items']));
+        self::assertEquals(2, count($result['items']));
+        self::assertEquals(1, $result['items'][0]['product_price']);
+        self::assertEquals(1, $result['items'][1]['product_price']);
     }
 }
diff --git a/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php b/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
index a92aa6a0d05eb..e7557e2164ca0 100644
--- a/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
@@ -56,6 +56,9 @@ public function testIsIncludedInBasePrice($expectedResult)
         $this->assertEquals($expectedResult, $this->adjustment->isIncludedInBasePrice());
     }
 
+    /**
+     * @return array
+     */
     public function isIncludedInBasePriceDataProvider()
     {
         return [[true], [false]];
@@ -113,6 +116,9 @@ public function testExtractAdjustment($isPriceIncludesTax, $amount, $price, $exp
         $this->assertEquals($expectedResult, $this->adjustment->extractAdjustment($amount, $object));
     }
 
+    /**
+     * @return array
+     */
     public function extractAdjustmentDataProvider()
     {
         return [
@@ -164,6 +170,9 @@ public function testIsExcludedWith($adjustmentCode, $expectedResult)
         $this->assertEquals($expectedResult, $this->adjustment->isExcludedWith($adjustmentCode));
     }
 
+    /**
+     * @return array
+     */
     public function isExcludedWithDataProvider()
     {
         return [
diff --git a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
index 4cf3f4d339e18..3f80d97ea921b 100644
--- a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
@@ -54,6 +54,9 @@ class TaxTest extends \PHPUnit\Framework\TestCase
      */
     private $formattedPriceInfoBuilder;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->priceCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
@@ -68,10 +71,12 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->priceInfoFactory = $this->getMockBuilder(PriceInfoInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
         $this->priceInfoExtensionFactory = $this->getMockBuilder(PriceInfoExtensionInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
         $this->formattedPriceInfoBuilder = $this->getMockBuilder(FormattedPriceInfoBuilder::class)
@@ -86,6 +91,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testCollect()
     {
         $amountValue = 10;
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 944823ef600ab..a09ebbd53750f 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -5,27 +5,26 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-reports": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-tax-sample-data": "Sample Data version:100.3.*"
+        "magento/module-tax-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Tax/etc/adminhtml/system.xml b/app/code/Magento/Tax/etc/adminhtml/system.xml
index c03a8aa44bf7b..7fc1744b8e27e 100644
--- a/app/code/Magento/Tax/etc/adminhtml/system.xml
+++ b/app/code/Magento/Tax/etc/adminhtml/system.xml
@@ -62,7 +62,7 @@
                     <backend_model>Magento\Tax\Model\Config\Notification</backend_model>
                     <comment>Warning: To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”.</comment>
                 </field>
-                <field id="apply_tax_on" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="apply_tax_on" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Apply Tax On</label>
                     <source_model>Magento\Tax\Model\Config\Source\Apply\On</source_model>
                 </field>
diff --git a/app/code/Magento/Tax/etc/db_schema.xml b/app/code/Magento/Tax/etc/db_schema.xml
new file mode 100644
index 0000000000000..f5227a9ef3a66
--- /dev/null
+++ b/app/code/Magento/Tax/etc/db_schema.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="tax_class" resource="default" engine="innodb" comment="Tax Class">
+        <column xsi:type="smallint" name="class_id" padding="6" unsigned="false" nullable="false" identity="true"
+                comment="Class Id"/>
+        <column xsi:type="varchar" name="class_name" nullable="false" length="255" comment="Class Name"/>
+        <column xsi:type="varchar" name="class_type" nullable="false" length="8" default="CUSTOMER"
+                comment="Class Type"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="class_id"/>
+        </constraint>
+    </table>
+    <table name="tax_calculation_rule" resource="default" engine="innodb" comment="Tax Calculation Rule">
+        <column xsi:type="int" name="tax_calculation_rule_id" padding="11" unsigned="false" nullable="false"
+                identity="true" comment="Tax Calculation Rule Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
+        <column xsi:type="int" name="priority" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Priority"/>
+        <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Position"/>
+        <column xsi:type="int" name="calculate_subtotal" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Calculate off subtotal option"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="tax_calculation_rule_id"/>
+        </constraint>
+        <index referenceId="TAX_CALCULATION_RULE_PRIORITY_POSITION" indexType="btree">
+            <column name="priority"/>
+            <column name="position"/>
+        </index>
+        <index referenceId="TAX_CALCULATION_RULE_CODE" indexType="btree">
+            <column name="code"/>
+        </index>
+    </table>
+    <table name="tax_calculation_rate" resource="default" engine="innodb" comment="Tax Calculation Rate">
+        <column xsi:type="int" name="tax_calculation_rate_id" padding="11" unsigned="false" nullable="false"
+                identity="true" comment="Tax Calculation Rate Id"/>
+        <column xsi:type="varchar" name="tax_country_id" nullable="false" length="2" comment="Tax Country Id"/>
+        <column xsi:type="int" name="tax_region_id" padding="11" unsigned="false" nullable="false" identity="false"
+                comment="Tax Region Id"/>
+        <column xsi:type="varchar" name="tax_postcode" nullable="true" length="21" comment="Tax Postcode"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
+        <column xsi:type="decimal" name="rate" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Rate"/>
+        <column xsi:type="smallint" name="zip_is_range" padding="6" unsigned="false" nullable="true" identity="false"
+                comment="Zip Is Range"/>
+        <column xsi:type="int" name="zip_from" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Zip From"/>
+        <column xsi:type="int" name="zip_to" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Zip To"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="tax_calculation_rate_id"/>
+        </constraint>
+        <index referenceId="TAX_CALCULATION_RATE_TAX_COUNTRY_ID_TAX_REGION_ID_TAX_POSTCODE" indexType="btree">
+            <column name="tax_country_id"/>
+            <column name="tax_region_id"/>
+            <column name="tax_postcode"/>
+        </index>
+        <index referenceId="TAX_CALCULATION_RATE_CODE" indexType="btree">
+            <column name="code"/>
+        </index>
+        <index referenceId="IDX_CA799F1E2CB843495F601E56C84A626D" indexType="btree">
+            <column name="tax_calculation_rate_id"/>
+            <column name="tax_country_id"/>
+            <column name="tax_region_id"/>
+            <column name="zip_is_range"/>
+            <column name="tax_postcode"/>
+        </index>
+    </table>
+    <table name="tax_calculation" resource="default" engine="innodb" comment="Tax Calculation">
+        <column xsi:type="int" name="tax_calculation_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Tax Calculation Id"/>
+        <column xsi:type="int" name="tax_calculation_rate_id" padding="11" unsigned="false" nullable="false"
+                identity="false" comment="Tax Calculation Rate Id"/>
+        <column xsi:type="int" name="tax_calculation_rule_id" padding="11" unsigned="false" nullable="false"
+                identity="false" comment="Tax Calculation Rule Id"/>
+        <column xsi:type="smallint" name="customer_tax_class_id" padding="6" unsigned="false" nullable="false"
+                identity="false" comment="Customer Tax Class Id"/>
+        <column xsi:type="smallint" name="product_tax_class_id" padding="6" unsigned="false" nullable="false"
+                identity="false" comment="Product Tax Class Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="tax_calculation_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TAX_CALCULATION_PRODUCT_TAX_CLASS_ID_TAX_CLASS_CLASS_ID"
+                    table="tax_calculation" column="product_tax_class_id" referenceTable="tax_class"
+                    referenceColumn="class_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID_TAX_CLASS_CLASS_ID"
+                    table="tax_calculation" column="customer_tax_class_id" referenceTable="tax_class"
+                    referenceColumn="class_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="TAX_CALC_TAX_CALC_RATE_ID_TAX_CALC_RATE_TAX_CALC_RATE_ID"
+                    table="tax_calculation" column="tax_calculation_rate_id" referenceTable="tax_calculation_rate"
+                    referenceColumn="tax_calculation_rate_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="TAX_CALC_TAX_CALC_RULE_ID_TAX_CALC_RULE_TAX_CALC_RULE_ID"
+                    table="tax_calculation" column="tax_calculation_rule_id" referenceTable="tax_calculation_rule"
+                    referenceColumn="tax_calculation_rule_id" onDelete="CASCADE"/>
+        <index referenceId="TAX_CALCULATION_TAX_CALCULATION_RULE_ID" indexType="btree">
+            <column name="tax_calculation_rule_id"/>
+        </index>
+        <index referenceId="TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID" indexType="btree">
+            <column name="customer_tax_class_id"/>
+        </index>
+        <index referenceId="TAX_CALCULATION_PRODUCT_TAX_CLASS_ID" indexType="btree">
+            <column name="product_tax_class_id"/>
+        </index>
+        <index referenceId="TAX_CALC_TAX_CALC_RATE_ID_CSTR_TAX_CLASS_ID_PRD_TAX_CLASS_ID" indexType="btree">
+            <column name="tax_calculation_rate_id"/>
+            <column name="customer_tax_class_id"/>
+            <column name="product_tax_class_id"/>
+        </index>
+    </table>
+    <table name="tax_calculation_rate_title" resource="default" engine="innodb" comment="Tax Calculation Rate Title">
+        <column xsi:type="int" name="tax_calculation_rate_title_id" padding="11" unsigned="false" nullable="false"
+                identity="true" comment="Tax Calculation Rate Title Id"/>
+        <column xsi:type="int" name="tax_calculation_rate_id" padding="11" unsigned="false" nullable="false"
+                identity="false" comment="Tax Calculation Rate Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="value" nullable="false" length="255" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="tax_calculation_rate_title_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TAX_CALCULATION_RATE_TITLE_STORE_ID_STORE_STORE_ID"
+                    table="tax_calculation_rate_title" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_37FB965F786AD5897BB3AE90470C42AB" table="tax_calculation_rate_title"
+                    column="tax_calculation_rate_id" referenceTable="tax_calculation_rate"
+                    referenceColumn="tax_calculation_rate_id" onDelete="CASCADE"/>
+        <index referenceId="TAX_CALCULATION_RATE_TITLE_TAX_CALCULATION_RATE_ID_STORE_ID" indexType="btree">
+            <column name="tax_calculation_rate_id"/>
+            <column name="store_id"/>
+        </index>
+        <index referenceId="TAX_CALCULATION_RATE_TITLE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="tax_order_aggregated_created" resource="sales" engine="innodb" comment="Tax Order Aggregation">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
+        <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
+        <column xsi:type="float" name="percent" unsigned="false" nullable="true" comment="Percent"/>
+        <column xsi:type="int" name="orders_count" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="float" name="tax_base_amount_sum" unsigned="false" nullable="true"
+                comment="Tax Base Amount Sum"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TAX_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID"
+                    table="tax_order_aggregated_created" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="TAX_ORDER_AGGRED_CREATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="code"/>
+            <column name="percent"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="TAX_ORDER_AGGREGATED_CREATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="tax_order_aggregated_updated" resource="sales" engine="innodb"
+           comment="Tax Order Aggregated Updated">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="date" name="period" comment="Period"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
+        <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
+        <column xsi:type="float" name="percent" unsigned="false" nullable="true" comment="Percent"/>
+        <column xsi:type="int" name="orders_count" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Orders Count"/>
+        <column xsi:type="float" name="tax_base_amount_sum" unsigned="false" nullable="true"
+                comment="Tax Base Amount Sum"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TAX_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID"
+                    table="tax_order_aggregated_updated" column="store_id" referenceTable="store"
+                    referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="TAX_ORDER_AGGRED_UPDATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS">
+            <column name="period"/>
+            <column name="store_id"/>
+            <column name="code"/>
+            <column name="percent"/>
+            <column name="order_status"/>
+        </constraint>
+        <index referenceId="TAX_ORDER_AGGREGATED_UPDATED_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Tax/etc/db_schema_whitelist.json b/app/code/Magento/Tax/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..36a1dee1b455a
--- /dev/null
+++ b/app/code/Magento/Tax/etc/db_schema_whitelist.json
@@ -0,0 +1,128 @@
+{
+    "tax_class": {
+        "column": {
+            "class_id": true,
+            "class_name": true,
+            "class_type": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "tax_calculation_rule": {
+        "column": {
+            "tax_calculation_rule_id": true,
+            "code": true,
+            "priority": true,
+            "position": true,
+            "calculate_subtotal": true
+        },
+        "index": {
+            "TAX_CALCULATION_RULE_PRIORITY_POSITION": true,
+            "TAX_CALCULATION_RULE_CODE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "tax_calculation_rate": {
+        "column": {
+            "tax_calculation_rate_id": true,
+            "tax_country_id": true,
+            "tax_region_id": true,
+            "tax_postcode": true,
+            "code": true,
+            "rate": true,
+            "zip_is_range": true,
+            "zip_from": true,
+            "zip_to": true
+        },
+        "index": {
+            "TAX_CALCULATION_RATE_TAX_COUNTRY_ID_TAX_REGION_ID_TAX_POSTCODE": true,
+            "TAX_CALCULATION_RATE_CODE": true,
+            "IDX_CA799F1E2CB843495F601E56C84A626D": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "tax_calculation": {
+        "column": {
+            "tax_calculation_id": true,
+            "tax_calculation_rate_id": true,
+            "tax_calculation_rule_id": true,
+            "customer_tax_class_id": true,
+            "product_tax_class_id": true
+        },
+        "index": {
+            "TAX_CALCULATION_TAX_CALCULATION_RULE_ID": true,
+            "TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID": true,
+            "TAX_CALCULATION_PRODUCT_TAX_CLASS_ID": true,
+            "TAX_CALC_TAX_CALC_RATE_ID_CSTR_TAX_CLASS_ID_PRD_TAX_CLASS_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "TAX_CALCULATION_PRODUCT_TAX_CLASS_ID_TAX_CLASS_CLASS_ID": true,
+            "TAX_CALCULATION_CUSTOMER_TAX_CLASS_ID_TAX_CLASS_CLASS_ID": true,
+            "TAX_CALC_TAX_CALC_RATE_ID_TAX_CALC_RATE_TAX_CALC_RATE_ID": true,
+            "TAX_CALC_TAX_CALC_RULE_ID_TAX_CALC_RULE_TAX_CALC_RULE_ID": true
+        }
+    },
+    "tax_calculation_rate_title": {
+        "column": {
+            "tax_calculation_rate_title_id": true,
+            "tax_calculation_rate_id": true,
+            "store_id": true,
+            "value": true
+        },
+        "index": {
+            "TAX_CALCULATION_RATE_TITLE_TAX_CALCULATION_RATE_ID_STORE_ID": true,
+            "TAX_CALCULATION_RATE_TITLE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "TAX_CALCULATION_RATE_TITLE_STORE_ID_STORE_STORE_ID": true,
+            "FK_37FB965F786AD5897BB3AE90470C42AB": true
+        }
+    },
+    "tax_order_aggregated_created": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "code": true,
+            "order_status": true,
+            "percent": true,
+            "orders_count": true,
+            "tax_base_amount_sum": true
+        },
+        "index": {
+            "TAX_ORDER_AGGREGATED_CREATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "TAX_ORDER_AGGREGATED_CREATED_STORE_ID_STORE_STORE_ID": true,
+            "TAX_ORDER_AGGRED_CREATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS": true
+        }
+    },
+    "tax_order_aggregated_updated": {
+        "column": {
+            "id": true,
+            "period": true,
+            "store_id": true,
+            "code": true,
+            "order_status": true,
+            "percent": true,
+            "orders_count": true,
+            "tax_base_amount_sum": true
+        },
+        "index": {
+            "TAX_ORDER_AGGREGATED_UPDATED_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "TAX_ORDER_AGGREGATED_UPDATED_STORE_ID_STORE_STORE_ID": true,
+            "TAX_ORDER_AGGRED_UPDATED_PERIOD_STORE_ID_CODE_PERCENT_ORDER_STS": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 66b23f24e1095..096f8359fadd3 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -116,6 +116,7 @@
                 <item name="zip_is_range" xsi:type="string">main_table.zip_is_range</item>
                 <item name="zip_from" xsi:type="string">main_table.zip_from</item>
                 <item name="zip_to" xsi:type="string">main_table.zip_to</item>
+                <item name="region_name" xsi:type="string">region_table.code</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/app/code/Magento/Tax/etc/module.xml b/app/code/Magento/Tax/etc/module.xml
index a100b0ac01181..6233161192ab9 100644
--- a/app/code/Magento/Tax/etc/module.xml
+++ b/app/code/Magento/Tax/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Tax" setup_version="2.0.3">
+    <module name="Magento_Tax" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Checkout"/>
diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv
index 2314f27b92928..836221e2ec974 100644
--- a/app/code/Magento/Tax/i18n/en_US.csv
+++ b/app/code/Magento/Tax/i18n/en_US.csv
@@ -176,4 +176,6 @@ Rate,Rate
 "Order Total Incl. Tax","Order Total Incl. Tax"
 "Order Total","Order Total"
 "Your credit card will be charged for","Your credit card will be charged for"
-"An error occurred while loading tax rates.","An error occurred while loading tax rates."
\ No newline at end of file
+"An error occurred while loading tax rates.","An error occurred while loading tax rates."
+"You will be charged for","You will be charged for"
+"Not yet calculated", "Not yet calculated"
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
index 8930a4de28fe5..18e86549a1ff9 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
@@ -11,10 +11,10 @@
     <?= $block->getSaveButtonHtml() ?>
 </div>
 <?= $block->getRenameFormHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>').mage('form').mage('validation');
-
-});
+<script type="text/x-magento-init">
+    {
+        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
+            "Magento_Tax/js/page/validate": {}
+        }
+    }
 </script>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index d16c4faeede28..fced077015f4e 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -111,6 +111,7 @@ require([
 
         TaxRateEditableMultiselect.prototype.init = function () {
             var options = {
+                mselectContainer: '#tax_rate + section.mselect-list',
                 toggleAddButton:false,
                 addText: '<?= /* @escapeNotVerified */ __('Add New Tax Rate') ?>',
                 parse: null,
diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
new file mode 100644
index 0000000000000..a49f199ba56b6
--- /dev/null
+++ b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function (jQuery) {
+    'use strict';
+
+    return function (data, element) {
+        jQuery(element).mage('form').mage('validation');
+    };
+});
diff --git a/app/code/Magento/Tax/view/base/web/js/price/adjustment.js b/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
index 9af15f84562f4..a17d130d9282a 100644
--- a/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
+++ b/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
@@ -62,7 +62,7 @@ define([
         },
 
         /**
-         * Set price taax type.
+         * Set price tax type.
          *
          * @param {String} priceType
          * @return {Object}
diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml
index 7041ab3793a07..ac0f0852c6c1c 100644
--- a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml
@@ -34,7 +34,7 @@
                         <item name="block-totals" xsi:type="array">
                             <item name="children" xsi:type="array">
                                 <item name="subtotal" xsi:type="array">
-                                    <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
+                                    <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
                                     <item name="config" xsi:type="array">
                                         <item name="template" xsi:type="string">Magento_Tax/checkout/summary/subtotal</item>
                                         <item name="excludingTaxMessage" xsi:type="string" translate="true">(Excl. Tax)</item>
@@ -42,7 +42,7 @@
                                     </item>
                                 </item>
                                 <item name="shipping" xsi:type="array">
-                                    <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/shipping</item>
+                                    <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/shipping</item>
                                     <item name="sortOrder" xsi:type="string">20</item>
                                     <item name="config" xsi:type="array">
                                         <item name="template" xsi:type="string">Magento_Tax/checkout/cart/totals/shipping</item>
@@ -51,21 +51,21 @@
                                     </item>
                                 </item>
                                 <item name="before_grandtotal" xsi:type="array">
-                                    <item name="component"  xsi:type="string">uiComponent</item>
+                                    <item name="component" xsi:type="string">uiComponent</item>
                                     <item name="sortOrder" xsi:type="string">30</item>
                                     <item name="children" xsi:type="array">
                                         <!-- merge your components here -->
                                     </item>
                                 </item>
                                 <item name="tax" xsi:type="array">
-                                    <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/tax</item>
+                                    <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/tax</item>
                                     <item name="config" xsi:type="array">
                                         <item name="template" xsi:type="string">Magento_Tax/checkout/cart/totals/tax</item>
                                         <item name="title" xsi:type="string" translate="true">Tax</item>
                                     </item>
                                 </item>
                                 <item name="grand-total" xsi:type="array">
-                                    <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/grand-total</item>
+                                    <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/grand-total</item>
                                     <item name="config" xsi:type="array">
                                         <item name="template" xsi:type="string">Magento_Tax/checkout/cart/totals/grand-total</item>
                                         <item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
index 6d867fcb71f2e..8f60ba15d8a1a 100644
--- a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
@@ -38,14 +38,14 @@
                                                         <!-- sort order for this totals is configured on admin panel-->
                                                         <!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
                                                         <item name="subtotal" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
+                                                            <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
                                                                 <item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
                                                             </item>
                                                         </item>
                                                         <item name="shipping" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/shipping</item>
+                                                            <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/shipping</item>
                                                             <item name="sortOrder" xsi:type="string">20</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
@@ -53,24 +53,24 @@
                                                             </item>
                                                         </item>
                                                         <item name="before_grandtotal" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">uiComponent</item>
+                                                            <item name="component" xsi:type="string">uiComponent</item>
                                                             <item name="sortOrder" xsi:type="string">30</item>
                                                             <item name="children" xsi:type="array">
                                                                 <!-- merge your components here -->
                                                             </item>
                                                         </item>
                                                         <item name="tax" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/tax</item>
+                                                            <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/tax</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="title" xsi:type="string" translate="true">Tax</item>
                                                             </item>
                                                         </item>
                                                         <item name="grand-total" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/grand-total</item>
+                                                            <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/grand-total</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
                                                                 <item name="inclTaxLabel" xsi:type="string" translate="true">Order Total Incl. Tax</item>
-                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">Your credit card will be charged for</item>
+                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">You will be charged for</item>
                                                                 <item name="title" xsi:type="string" translate="true">Order Total</item>
                                                             </item>
                                                         </item>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml
deleted file mode 100644
index 75f04eae82159..0000000000000
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 5409aa1822bdf..50fa6c425c223 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -38,7 +38,6 @@
 </tr>
 
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
-    <?php $isTop = 1; ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) {
             continue;
@@ -64,7 +63,6 @@
                 <?php endif; ?>
             </tr>
             <?php $isFirst = 0; ?>
-            <?php $isTop = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
index c86c3b4d1ab06..b21be98531ba9 100644
--- a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
+++ b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
@@ -11,8 +11,9 @@ define([
     'ko',
     'Magento_Checkout/js/view/summary/abstract-total',
     'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/totals'
-], function (ko, Component, quote, totals) {
+    'Magento_Checkout/js/model/totals',
+    'mage/translate'
+], function (ko, Component, quote, totals, $t) {
     'use strict';
 
     var isTaxDisplayedInGrandTotal = window.checkoutConfig.includeTaxInGrandTotal,
@@ -22,7 +23,7 @@ define([
     return Component.extend({
         defaults: {
             isTaxDisplayedInGrandTotal: isTaxDisplayedInGrandTotal,
-            notCalculatedMessage: 'Not yet calculated',
+            notCalculatedMessage: $t('Not yet calculated'),
             template: 'Magento_Tax/checkout/summary/tax'
         },
         totals: quote.getTotals(),
diff --git a/app/code/Magento/TaxGraphQl/README.md b/app/code/Magento/TaxGraphQl/README.md
new file mode 100644
index 0000000000000..2bb28f94219e0
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/README.md
@@ -0,0 +1,4 @@
+# TaxGraphQl
+
+**TaxGraphQl** provides type information for the GraphQl module
+to generate tax fields for catalog and product information endpoints.
diff --git a/app/code/Magento/TaxGraphQl/Test/Mftf/README.md b/app/code/Magento/TaxGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8914dc0865ada
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tax Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Tax Graph Ql** module.
diff --git a/app/code/Magento/TaxGraphQl/composer.json b/app/code/Magento/TaxGraphQl/composer.json
new file mode 100644
index 0000000000000..33f87dd35d40f
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-tax-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-tax": "*",
+        "magento/module-catalog-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\TaxGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/TaxGraphQl/etc/module.xml b/app/code/Magento/TaxGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..b8a7a3aaeb79c
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TaxGraphQl" />
+</config>
diff --git a/app/code/Magento/TaxGraphQl/etc/schema.graphqls b/app/code/Magento/TaxGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..2b81983478447
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/etc/schema.graphqls
@@ -0,0 +1,6 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+enum PriceAdjustmentCodesEnum {
+    TAX
+}
diff --git a/app/code/Magento/TaxGraphQl/registration.php b/app/code/Magento/TaxGraphQl/registration.php
new file mode 100644
index 0000000000000..70bfb57d94ed9
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TaxGraphQl', __DIR__);
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
index a42877b3ecf8a..ab64567f4fe28 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
@@ -14,7 +14,7 @@ class ImportExport extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'importExport.phtml';
+    protected $_template = 'Magento_TaxImportExport::importExport.phtml';
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
index 8897e9b2083e9..e223adc3adb1a 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
@@ -16,5 +16,5 @@ class ImportExportHeader extends \Magento\Backend\Block\Widget
      *
      * @var string
      */
-    protected $_template = 'importExportHeader.phtml';
+    protected $_template = 'Magento_TaxImportExport::importExportHeader.phtml';
 }
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
index 929c9db01a298..4264f5c3b7765 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
index 8ec871a182ab4..c8cba30c9cd25 100644
--- a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
+++ b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -237,7 +237,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
         $countryCode = $rateData[1];
         $country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');
         if (!$country->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));
         }
         $regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);
 
diff --git a/app/code/Magento/TaxImportExport/Test/Mftf/LICENSE.txt b/app/code/Magento/TaxImportExport/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/TaxImportExport/Test/Mftf/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/TaxImportExport/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/TaxImportExport/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/TaxImportExport/Test/Mftf/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/TaxImportExport/Test/Mftf/README.md b/app/code/Magento/TaxImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e53dd041cb34a
--- /dev/null
+++ b/app/code/Magento/TaxImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tax Import Export Functional Tests
+
+The Functional Test Module for **Magento Tax Import Export** module.
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 69d6cc4162f8d..f234cc9bc249b 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -5,15 +5,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-directory": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/TaxImportExport/etc/acl.xml b/app/code/Magento/TaxImportExport/etc/acl.xml
index 35c811e8441eb..7a7ac16743225 100644
--- a/app/code/Magento/TaxImportExport/etc/acl.xml
+++ b/app/code/Magento/TaxImportExport/etc/acl.xml
@@ -11,7 +11,7 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Backend::system">
                     <resource id="Magento_Backend::convert">
-                        <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
+                        <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" translate="title" sortOrder="30" />
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/TaxImportExport/etc/module.xml b/app/code/Magento/TaxImportExport/etc/module.xml
index 192c817c29087..6df24c959d9c2 100644
--- a/app/code/Magento/TaxImportExport/etc/module.xml
+++ b/app/code/Magento/TaxImportExport/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TaxImportExport" setup_version="2.0.0">
+    <module name="Magento_TaxImportExport" >
         <sequence>
             <module name="Magento_Tax"/>
         </sequence>
diff --git a/app/code/Magento/TaxImportExport/i18n/en_US.csv b/app/code/Magento/TaxImportExport/i18n/en_US.csv
index cadecc39a391c..95f94dcfd3b2c 100644
--- a/app/code/Magento/TaxImportExport/i18n/en_US.csv
+++ b/app/code/Magento/TaxImportExport/i18n/en_US.csv
@@ -12,8 +12,9 @@ Rate,Rate
 "Invalid file upload attempt","Invalid file upload attempt"
 "Invalid file upload attempt.","Invalid file upload attempt."
 "Invalid file format.","Invalid file format."
-"One of the countries has invalid code.","One of the countries has invalid code."
+"Country code is invalid: %1","Country code is invalid: %1"
 "Import Tax Rates","Import Tax Rates"
 "Export Tax Rates","Export Tax Rates"
 CSV,CSV
 "Excel XML","Excel XML"
+"Import/Export Tax Rates","Import/Export Tax Rates"
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
index 223b3e9888eea..75f04eae82159 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
@@ -2,4 +2,4 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */;
+ */
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
index 8e7f4c9cc680c..e99500dbd0694 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
@@ -19,7 +19,7 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
      *
      * @var string
      */
-    protected $_template = 'browser/content/uploader.phtml';
+    protected $_template = 'Magento_Theme::browser/content/uploader.phtml';
 
     /**
      * @var \Magento\Theme\Helper\Storage
diff --git a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
index c1f8ea620ef41..cff87fc8726bd 100644
--- a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
+++ b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
@@ -21,7 +21,7 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
      *
      * @var string
      */
-    protected $_template = 'html/breadcrumbs.phtml';
+    protected $_template = 'Magento_Theme::html/breadcrumbs.phtml';
 
     /**
      * List of available breadcrumb properties
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
index 4cd63462ec754..cdb350336f38f 100644
--- a/app/code/Magento/Theme/Block/Html/Footer.php
+++ b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -57,7 +57,6 @@ protected function _construct()
     {
         $this->addData(
             [
-                'cache_lifetime' => false,
                 'cache_tags' => [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG],
             ]
         );
@@ -123,4 +122,14 @@ public function getIdentities()
     {
         return [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG];
     }
+
+    /**
+     * Get block cache life time
+     *
+     * @return int
+     */
+    protected function getCacheLifetime()
+    {
+        return parent::getCacheLifetime() ?: 3600;
+    }
 }
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index f597b4034da92..2663a4da15011 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -19,7 +19,7 @@ class Header extends \Magento\Framework\View\Element\Template
      *
      * @var string
      */
-    protected $_template = 'html/header.phtml';
+    protected $_template = 'Magento_Theme::html/header.phtml';
 
     /**
      * Retrieve welcome text
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 5b0c2eaf04c45..b51f624c20339 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -19,7 +19,7 @@ class Logo extends \Magento\Framework\View\Element\Template
      *
      * @var string
      */
-    protected $_template = 'html/header/logo.phtml';
+    protected $_template = 'Magento_Theme::html/header/logo.phtml';
 
     /**
      * @var \Magento\MediaStorage\Helper\File\Storage\Database
@@ -43,6 +43,10 @@ public function __construct(
     /**
      * Check if current url is url for home page
      *
+     * @deprecated This function is no longer used. It was previously used by
+     * Magento/Theme/view/frontend/templates/html/header/logo.phtml
+     * to check if the logo should be clickable on the homepage.
+     *
      * @return bool
      */
     public function isHomePage()
diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
index d4cfe544f4792..ad3f4aad676eb 100644
--- a/app/code/Magento/Theme/Block/Html/Pager.php
+++ b/app/code/Magento/Theme/Block/Html/Pager.php
@@ -184,6 +184,8 @@ public function setCollection($collection)
     }
 
     /**
+     * Returns data collection
+     *
      * @return \Magento\Framework\Data\Collection
      */
     public function getCollection()
@@ -192,7 +194,10 @@ public function getCollection()
     }
 
     /**
+     * Set page variable name
+     *
      * @param string $varName
+     *
      * @return $this
      */
     public function setPageVarName($varName)
@@ -202,6 +207,8 @@ public function setPageVarName($varName)
     }
 
     /**
+     * Get page variable name
+     *
      * @return string
      */
     public function getPageVarName()
@@ -210,7 +217,10 @@ public function getPageVarName()
     }
 
     /**
+     * Set show per page param
+     *
      * @param bool $varName
+     *
      * @return $this
      */
     public function setShowPerPage($varName)
@@ -220,6 +230,8 @@ public function setShowPerPage($varName)
     }
 
     /**
+     * Is show per page
+     *
      * @return bool
      */
     public function isShowPerPage()
@@ -234,6 +246,7 @@ public function isShowPerPage()
      * Set the name for pager limit data
      *
      * @param string $varName
+     *
      * @return $this
      */
     public function setLimitVarName($varName)
@@ -275,6 +288,8 @@ public function getAvailableLimit()
     }
 
     /**
+     * Get first number
+     *
      * @return int
      */
     public function getFirstNum()
@@ -284,6 +299,8 @@ public function getFirstNum()
     }
 
     /**
+     * Get last number
+     *
      * @return int
      */
     public function getLastNum()
@@ -333,7 +350,10 @@ public function isLastPage()
     }
 
     /**
+     * Is limit current
+     *
      * @param int $limit
+     *
      * @return bool
      */
     public function isLimitCurrent($limit)
@@ -342,7 +362,10 @@ public function isLimitCurrent($limit)
     }
 
     /**
+     * Is page current
+     *
      * @param int $page
+     *
      * @return bool
      */
     public function isPageCurrent($page)
@@ -351,6 +374,8 @@ public function isPageCurrent($page)
     }
 
     /**
+     * Get pages
+     *
      * @return array
      */
     public function getPages()
@@ -377,6 +402,8 @@ public function getPages()
     }
 
     /**
+     * Get first page url
+     *
      * @return string
      */
     public function getFirstPageUrl()
@@ -418,6 +445,7 @@ public function getLastPageUrl()
      * Retrieve page URL
      *
      * @param string $page
+     *
      * @return string
      */
     public function getPageUrl($page)
@@ -426,7 +454,10 @@ public function getPageUrl($page)
     }
 
     /**
+     * Get limit url
+     *
      * @param int $limit
+     *
      * @return string
      */
     public function getLimitUrl($limit)
@@ -438,6 +469,7 @@ public function getLimitUrl($limit)
      * Retrieve page URL by defined parameters
      *
      * @param array $params
+     *
      * @return string
      */
     public function getPagerUrl($params = [])
@@ -453,6 +485,8 @@ public function getPagerUrl($params = [])
     }
 
     /**
+     * Get path
+     *
      * @return string
      */
     protected function getPath()
@@ -580,7 +614,7 @@ public function getJump()
      */
     public function setFrameLength($frame)
     {
-        $frame = abs(intval($frame));
+        $frame = abs((int)$frame);
         if ($frame == 0) {
             $frame = $this->_frameLength;
         }
@@ -600,7 +634,7 @@ public function setFrameLength($frame)
      */
     public function setJump($jump)
     {
-        $jump = abs(intval($jump));
+        $jump = abs((int)$jump);
         if ($this->getJump() != $jump) {
             $this->_setFrameInitialized(false);
             $this->_jump = $jump;
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index b1b22e06d7172..242947d19b321 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 = '';
 
@@ -235,10 +235,16 @@ protected function _getHtml(
 
             if ($childLevel == 0 && $outermostClass) {
                 $outermostClassCode = ' class="' . $outermostClass . '" ';
-                $child->setClass($outermostClass);
+                $currentClass = $child->getClass();
+
+                if (empty($currentClass)) {
+                    $child->setClass($outermostClass);
+                } else {
+                    $child->setClass($currentClass . ' ' . $outermostClass);
+                }
             }
 
-            if (count($colBrakes) && $colBrakes[$counter]['colbrake']) {
+            if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$counter]['colbrake']) {
                 $html .= '</ul></li><li class="column"><ul>';
             }
 
@@ -255,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>';
         }
 
@@ -303,6 +309,10 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
         $classes[] = 'level' . $item->getLevel();
         $classes[] = $item->getPositionClass();
 
+        if ($item->getIsCategory()) {
+            $classes[] = 'category-item';
+        }
+
         if ($item->getIsFirst()) {
             $classes[] = 'first';
         }
@@ -331,7 +341,7 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
     /**
      * Add identity
      *
-     * @param array $identity
+     * @param string|array $identity
      * @return void
      */
     public function addIdentity($identity)
@@ -351,19 +361,6 @@ public function getIdentities()
         return $this->identities;
     }
 
-    /**
-     * Get cache key informative items
-     *
-     * @return array
-     * @since 100.1.0
-     */
-    public function getCacheKeyInfo()
-    {
-        $keyInfo = parent::getCacheKeyInfo();
-        $keyInfo[] = $this->getUrl('*/*/*', ['_current' => true, '_query' => '']);
-        return $keyInfo;
-    }
-
     /**
      * Get tags array for saving cache
      *
diff --git a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
index 4c8d6bca52edc..404e2f3c49c4f 100644
--- a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
+++ b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
@@ -6,8 +6,9 @@
 
 namespace Magento\Theme\Console\Command;
 
-use Magento\Framework\App\Area;
 use Magento\Framework\App\Cache;
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Composer\ComposerInformation;
@@ -39,13 +40,6 @@ class ThemeUninstallCommand extends Command
     const INPUT_KEY_THEMES = 'theme';
     const INPUT_KEY_CLEAR_STATIC_CONTENT = 'clear-static-content';
 
-    /**
-     * Maintenance Mode
-     *
-     * @var MaintenanceMode
-     */
-    private $maintenanceMode;
-
     /**
      * Composer general dependency checker
      *
@@ -116,13 +110,18 @@ class ThemeUninstallCommand extends Command
      */
     private $themeDependencyChecker;
 
+    /**
+     * @var MaintenanceModeEnabler
+     */
+    private $maintenanceModeEnabler;
+
     /**
      * Constructor
      *
      * @param Cache $cache
      * @param CleanupFiles $cleanupFiles
      * @param ComposerInformation $composer
-     * @param MaintenanceMode $maintenanceMode
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param DependencyChecker $dependencyChecker
      * @param Collection $themeCollection
      * @param BackupRollbackFactory $backupRollbackFactory
@@ -130,6 +129,9 @@ class ThemeUninstallCommand extends Command
      * @param ThemePackageInfo $themePackageInfo
      * @param ThemeUninstaller $themeUninstaller
      * @param ThemeDependencyChecker $themeDependencyChecker
+     * @param MaintenanceModeEnabler $maintenanceModeEnabler
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Cache $cache,
@@ -142,12 +144,12 @@ public function __construct(
         ThemeValidator $themeValidator,
         ThemePackageInfo $themePackageInfo,
         ThemeUninstaller $themeUninstaller,
-        ThemeDependencyChecker $themeDependencyChecker
+        ThemeDependencyChecker $themeDependencyChecker,
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         $this->cache = $cache;
         $this->cleanupFiles = $cleanupFiles;
         $this->composer = $composer;
-        $this->maintenanceMode = $maintenanceMode;
         $this->dependencyChecker = $dependencyChecker;
         $this->themeCollection = $themeCollection;
         $this->backupRollbackFactory = $backupRollbackFactory;
@@ -155,6 +157,8 @@ public function __construct(
         $this->themePackageInfo = $themePackageInfo;
         $this->themeUninstaller = $themeUninstaller;
         $this->themeDependencyChecker = $themeDependencyChecker;
+        $this->maintenanceModeEnabler =
+            $maintenanceModeEnabler ?: ObjectManager::getInstance()->get(MaintenanceModeEnabler::class);
         parent::__construct();
     }
 
@@ -214,27 +218,32 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
 
-        try {
-            $output->writeln('<info>Enabling maintenance mode</info>');
-            $this->maintenanceMode->set(true);
-            if ($input->getOption(self::INPUT_KEY_BACKUP_CODE)) {
-                $time = time();
-                $codeBackup = $this->backupRollbackFactory->create($output);
-                $codeBackup->codeBackup($time);
-            }
-
-            $this->themeUninstaller->uninstallRegistry($output, $themePaths);
-            $this->themeUninstaller->uninstallCode($output, $themePaths);
+        $result = $this->maintenanceModeEnabler->executeInMaintenanceMode(
+            function () use ($input, $output, $themePaths) {
+                try {
+                    if ($input->getOption(self::INPUT_KEY_BACKUP_CODE)) {
+                        $time = time();
+                        $codeBackup = $this->backupRollbackFactory->create($output);
+                        $codeBackup->codeBackup($time);
+                    }
+
+                    $this->themeUninstaller->uninstallRegistry($output, $themePaths);
+                    $this->themeUninstaller->uninstallCode($output, $themePaths);
+
+                    $this->cleanup($input, $output);
+                    return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+                } catch (\Exception $e) {
+                    $output->writeln('<error>' . $e->getMessage() . '</error>');
+                    $output->writeln('<error>Please disable maintenance mode after you resolved above issues</error>');
+                    // we must have an exit code higher than zero to indicate something was wrong
+                    return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+                }
+            },
+            $output,
+            true
+        );
 
-            $this->cleanup($input, $output);
-            $output->writeln('<info>Disabling maintenance mode</info>');
-            $this->maintenanceMode->set(false);
-        } catch (\Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $output->writeln('<error>Please disable maintenance mode after you resolved above issues</error>');
-            // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-        }
+        return $result;
     }
 
     /**
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php
index 657fbb25795d9..4f7a1cd47af58 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php
@@ -7,6 +7,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Theme\Model\DesignConfigRepository;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Exception\LocalizedException;
@@ -62,9 +63,15 @@ protected function _isAllowed()
 
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
+     *
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
         $resultRedirect = $this->resultRedirectFactory->create();
         $scope = $this->getRequest()->getParam('scope');
         $scopeId = (int)$this->getRequest()->getParam('scope_id');
@@ -73,7 +80,7 @@ public function execute()
         try {
             $designConfigData = $this->configFactory->create($scope, $scopeId, $data);
             $this->designConfigRepository->save($designConfigData);
-            $this->messageManager->addSuccess(__('You saved the configuration.'));
+            $this->messageManager->addSuccessMessage(__('You saved the configuration.'));
 
             $this->dataPersistor->clear('theme_design_config');
 
@@ -86,10 +93,10 @@ public function execute()
         } catch (LocalizedException $e) {
             $messages = explode("\n", $e->getMessage());
             foreach ($messages as $message) {
-                $this->messageManager->addError(__('%1', $message));
+                $this->messageManager->addErrorMessage(__('%1', $message));
             }
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('Something went wrong while saving this configuration:') . ' ' . $e->getMessage()
             );
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
index 4bae57f80209e..1a136cca4d62a 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php
@@ -6,11 +6,13 @@
  */
 namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
 /**
  * Class Index
  * @deprecated 100.2.0
  */
-class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
+class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme implements HttpGetActionInterface
 {
     /**
      * Index action
@@ -21,6 +23,7 @@ public function execute()
     {
         $this->_view->loadLayout();
         $this->_setActiveMenu('Magento_Theme::system_design_theme');
+        $this->_view->getLayout()->getBlock('page.title')->setPageTitle('Themes');
         $this->_view->renderLayout();
     }
 }
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
index fd297bbb24047..e87e70e21b9de 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
@@ -8,7 +8,7 @@
 
 /**
  * Class UploadJs
- * @depecated
+ * @deprecated
  */
 class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
 {
diff --git a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
index 145493b8e44d8..83172df748a47 100644
--- a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
@@ -5,9 +5,12 @@
  */
 namespace Magento\Theme\Controller\Result;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Translate\Inline\ParserInterface;
+use Magento\Framework\Translate\InlineInterface;
 
 /**
  * Plugin for putting messages to cookies
@@ -44,26 +47,34 @@ class MessagePlugin
      */
     private $serializer;
 
+    /**
+     * @var InlineInterface
+     */
+    private $inlineTranslate;
+
     /**
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\View\Element\Message\InterpretationStrategyInterface $interpretationStrategy
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param InlineInterface|null $inlineTranslate
      */
     public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Framework\View\Element\Message\InterpretationStrategyInterface $interpretationStrategy,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        InlineInterface $inlineTranslate = null
     ) {
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->messageManager = $messageManager;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->interpretationStrategy = $interpretationStrategy;
+        $this->inlineTranslate = $inlineTranslate ?: ObjectManager::getInstance()->get(InlineInterface::class);
     }
 
     /**
@@ -112,6 +123,12 @@ public function afterRenderResult(
     private function setCookie(array $messages)
     {
         if (!empty($messages)) {
+            if ($this->inlineTranslate->isAllowed()) {
+                foreach ($messages as &$message) {
+                    $message['text'] = $this->convertMessageText($message['text']);
+                }
+            }
+
             $publicCookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata();
             $publicCookieMetadata->setDurationOneYear();
             $publicCookieMetadata->setPath('/');
@@ -125,6 +142,21 @@ private function setCookie(array $messages)
         }
     }
 
+    /**
+     * Replace wrapping translation with html body.
+     *
+     * @param string $text
+     * @return string
+     */
+    private function convertMessageText(string $text): string
+    {
+        if (preg_match('#' . ParserInterface::REGEXP_TOKEN . '#', $text, $matches)) {
+            $text = $matches[1];
+        }
+
+        return $text;
+    }
+
     /**
      * Return messages array and clean message manager messages
      *
diff --git a/app/code/Magento/Theme/Model/Config/Processor/DesignTheme.php b/app/code/Magento/Theme/Model/Config/Processor/DesignTheme.php
index 258be67979ed2..d9d2c0e041e99 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/Data/Design/ConfigFactory.php b/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php
index 84aae4f7e51fe..e0b77a1657447 100644
--- a/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php
+++ b/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Model\Data\Design;
 
 use Magento\Framework\App\ScopeValidatorInterface;
@@ -88,7 +89,7 @@ public function __construct(
     public function create($scope, $scopeId, array $data = [])
     {
         if (!$this->scopeValidator->isValidScope($scope, $scopeId)) {
-            throw new LocalizedException(__('Invalid scope or scope id'));
+            throw new LocalizedException(__('The scope or scope ID is invalid. Verify both and try again.'));
         }
         $designConfigData = $this->getDesignConfigData($scope, $scopeId);
 
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 1e32cb36b4aea..b37628e54aa30 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/Model/Design/Config/FileUploader/FileProcessor.php b/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
index 1e574d525b457..ecf5bcbea6dfc 100644
--- a/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
+++ b/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Model\Design\Config\FileUploader;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -160,7 +161,7 @@ protected function getBackendModel($code)
     {
         $metadata = $this->metadataProvider->get();
         if (!(isset($metadata[$code]) && isset($metadata[$code]['backend_model']))) {
-            throw new LocalizedException(__('Backend model is not specified for %1', $code));
+            throw new LocalizedException(__('The backend model isn\'t specified for "%1".', $code));
         }
         return $this->backendModelFactory->createByPath($metadata[$code]['path']);
     }
diff --git a/app/code/Magento/Theme/Model/Design/Config/Storage.php b/app/code/Magento/Theme/Model/Design/Config/Storage.php
index a73f70efa0adf..c97114f963a09 100644
--- a/app/code/Magento/Theme/Model/Design/Config/Storage.php
+++ b/app/code/Magento/Theme/Model/Design/Config/Storage.php
@@ -87,10 +87,13 @@ public function load($scope, $scopeId)
                 $scopeId,
                 $fieldData->getFieldConfig()
             );
-            if ($value !== null) {
-                $fieldData->setValue($value);
+
+            if ($value === null) {
+                $value = '';
             }
+            $fieldData->setValue($value);
         }
+
         return $designConfig;
     }
 
diff --git a/app/code/Magento/Theme/Model/Design/Config/Validator.php b/app/code/Magento/Theme/Model/Design/Config/Validator.php
index 8ac36a31d2ef5..1279d9d9ccd20 100644
--- a/app/code/Magento/Theme/Model/Design/Config/Validator.php
+++ b/app/code/Magento/Theme/Model/Design/Config/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Model\Design\Config;
 
 use \Magento\Framework\Exception\LocalizedException;
@@ -74,12 +75,12 @@ public function validate(DesignConfigInterface $designConfig)
                     if (isset($params['config_path']) && $params['config_path'] == $data['config_path']) {
                         throw new LocalizedException(
                             __(
-                                "The %templateName contains an incorrect configuration. The template has " .
-                                "a reference to itself. Either remove or change the reference.",
+                                'The "%templateName" template contains an incorrect configuration, with a reference '
+                                . 'to itself. Remove or change the reference, then try again.',
                                 ["templateName" => $name]
                             )
                         );
-                    };
+                    }
                 }
             }
         }
@@ -113,6 +114,7 @@ private function getTemplateText($templateId, DesignConfigInterface $designConfi
         if (is_numeric($templateId)) {
             $template->load($templateId);
         } else {
+            $template->setForcedArea($templateId);
             $template->loadDefault($templateId);
         }
         $text = $template->getTemplateText();
diff --git a/app/code/Magento/Theme/Model/DesignConfigRepository.php b/app/code/Magento/Theme/Model/DesignConfigRepository.php
index 9664a4eb6fa79..3a81b8c24b455 100644
--- a/app/code/Magento/Theme/Model/DesignConfigRepository.php
+++ b/app/code/Magento/Theme/Model/DesignConfigRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Model;
 
 use Magento\Framework\Indexer\IndexerRegistry;
@@ -85,7 +86,9 @@ public function save(DesignConfigInterface $designConfig)
         if (!($designConfig->getExtensionAttributes() &&
             $designConfig->getExtensionAttributes()->getDesignConfigData())
         ) {
-            throw new LocalizedException(__('Can not save empty config'));
+            throw new LocalizedException(
+                __("The config can't be saved because it's empty. Complete the config and try again.")
+            );
         }
 
         $this->getValidator()->validate($designConfig);
@@ -105,7 +108,9 @@ public function delete(DesignConfigInterface $designConfig)
         if (!($designConfig->getExtensionAttributes() &&
             $designConfig->getExtensionAttributes()->getDesignConfigData())
         ) {
-            throw new LocalizedException(__('Can not save empty config'));
+            throw new LocalizedException(
+                __("The config can't be saved because it's empty. Complete the config and try again.")
+            );
         }
 
         $this->configStorage->delete($designConfig);
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
index f2f95d24a368b..f9dd501520109 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Collection.php
@@ -17,6 +17,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     const DEFAULT_PAGE_SIZE = 6;
 
+    /**
+     * @var string
+     */
+    protected $_idFieldName = 'theme_id';
+
     /**
      * Collection initialization
      *
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
index f708b3c7889f3..c4a7bb11a78f7 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
@@ -7,13 +7,15 @@
 
 /**
  * Theme grid collection
+ * @deprecated
+ * @see \Magento\Theme\Ui\Component\Theme\DataProvider\SearchResult
  */
 class Collection extends \Magento\Theme\Model\ResourceModel\Theme\Collection
 {
     /**
      * Add area filter
      *
-     * @return \Magento\Theme\Model\ResourceModel\Theme\Collection
+     * @return $this
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index 82206b8eb1c65..2c3350e695a85 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -11,6 +11,11 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * Class Storage
+ *
+ * @package Magento\Theme\Model\Wysiwyg
+ */
 class Storage
 {
     /**
@@ -127,14 +132,6 @@ public function uploadFile($targetPath)
 
         $this->_createThumbnail($targetPath . '/' . $uploader->getUploadedFileName());
 
-        $result['cookie'] = [
-            'name' => $this->_helper->getSession()->getName(),
-            'value' => $this->_helper->getSession()->getSessionId(),
-            'lifetime' => $this->_helper->getSession()->getCookieLifetime(),
-            'path' => $this->_helper->getSession()->getCookiePath(),
-            'domain' => $this->_helper->getSession()->getCookieDomain()
-        ];
-
         return $result;
     }
 
diff --git a/app/code/Magento/Theme/Setup/InstallData.php b/app/code/Magento/Theme/Setup/InstallData.php
deleted file mode 100644
index 51d5cd23f6e94..0000000000000
--- a/app/code/Magento/Theme/Setup/InstallData.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Theme\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Theme\Model\Theme\Registration;
-
-/**
- * Register themes
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * @var Registration
-     */
-    private $themeRegistration;
-
-    /**
-     * Initialize dependencies
-     *
-     * @param Registration $themeRegistration
-     */
-    public function __construct(Registration $themeRegistration)
-    {
-        $this->themeRegistration = $themeRegistration;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $this->themeRegistration->register();
-    }
-}
diff --git a/app/code/Magento/Theme/Setup/InstallSchema.php b/app/code/Magento/Theme/Setup/InstallSchema.php
deleted file mode 100644
index b1bc59596f2a7..0000000000000
--- a/app/code/Magento/Theme/Setup/InstallSchema.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Theme\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        /* @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */
-        $connection = $installer->getConnection();
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'theme'
-         */
-        $table = $connection->newTable(
-            $installer->getTable('theme')
-        )->addColumn(
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Theme identifier'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => true],
-            'Parent Id'
-        )->addColumn(
-            'theme_path',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Theme Path'
-        )->addColumn(
-            'theme_title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Theme Title'
-        )->addColumn(
-            'preview_image',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Preview Image'
-        )->addColumn(
-            'is_featured',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-            null,
-            ['nullable' => false, 'default' => 0],
-            'Is Theme Featured'
-        )->addColumn(
-            'area',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Theme Area'
-        )->addColumn(
-            'type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false],
-            'Theme type: 0:physical, 1:virtual, 2:staging'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            [],
-            'Full theme code, including package'
-        )->setComment(
-            'Core theme'
-        );
-        $connection->createTable($table);
-
-        /**
-         * Create table 'theme_file'
-         */
-        $table = $connection->newTable(
-            $installer->getTable('theme_file')
-        )->addColumn(
-            'theme_files_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Theme files identifier'
-        )->addColumn(
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'unsigned' => true],
-            'Theme Id'
-        )->addColumn(
-            'file_path',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true],
-            'Relative path to file'
-        )->addColumn(
-            'file_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => false],
-            'File Type'
-        )->addColumn(
-            'content',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
-            ['nullable' => false],
-            'File Content'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => 0],
-            'Sort Order'
-        )->addColumn(
-            'is_temporary',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-            null,
-            ['nullable' => false, 'default' => 0],
-            'Is Temporary File'
-        )->addForeignKey(
-            $installer->getFkName('theme_file', 'theme_id', 'theme', 'theme_id'),
-            'theme_id',
-            $installer->getTable('theme'),
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Core theme files'
-        );
-        $connection->createTable($table);
-
-        /**
-         * Create table 'design_change'
-         */
-        $table = $connection->newTable(
-            $installer->getTable('design_change')
-        )->addColumn(
-            'design_change_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Design Change Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'design',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Design'
-        )->addColumn(
-            'date_from',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'First Date of Design Activity'
-        )->addColumn(
-            'date_to',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Last Date of Design Activity'
-        )->addIndex(
-            $installer->getIdxName('design_change', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('design_change', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Design Changes'
-        );
-        $connection->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php
new file mode 100644
index 0000000000000..0e132eb429f60
--- /dev/null
+++ b/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Theme\Setup\Patch\Data;
+
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedData
+ * @package Magento\Theme\Setup\Patch
+ */
+class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * @var QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * ConvertSerializedData constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     * @param QueryModifierFactory $queryModifierFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        FieldDataConverterFactory $fieldDataConverterFactory,
+        QueryModifierFactory $queryModifierFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+        $this->queryModifierFactory = $queryModifierFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->convertSerializedData();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            RegisterThemes::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert native php serialized data to json.
+     */
+    private function convertSerializedData()
+    {
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $queryModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'path' => [
+                        'design/theme/ua_regexp',
+                    ]
+                ]
+            ]
+        );
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('core_config_data'),
+            'config_id',
+            'value',
+            $queryModifier
+        );
+    }
+}
diff --git a/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php b/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php
new file mode 100644
index 0000000000000..31b6c6b47773e
--- /dev/null
+++ b/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Theme\Setup\Patch\Data;
+
+use Magento\Theme\Model\Theme\Registration;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class RegisterThemes
+ * @package Magento\Theme\Setup\Patch
+ */
+class RegisterThemes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+    /**
+     * @var Registration
+     */
+    private $themeRegistration;
+
+    /**
+     * RegisterThemes constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param Registration $themeRegistration
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        Registration $themeRegistration
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->themeRegistration = $themeRegistration;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->themeRegistration->register();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Theme/Setup/RecurringData.php b/app/code/Magento/Theme/Setup/RecurringData.php
index 9b2a9ab931304..972b60dc67f89 100644
--- a/app/code/Magento/Theme/Setup/RecurringData.php
+++ b/app/code/Magento/Theme/Setup/RecurringData.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Theme\Setup;
 
+use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Theme\Model\Theme\Registration;
+use Magento\Theme\Model\Data\Design\Config;
 
 /**
  * Upgrade registered themes
@@ -23,14 +25,21 @@ class RecurringData implements InstallDataInterface
      */
     private $themeRegistration;
 
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
     /**
      * Init
      *
      * @param Registration $themeRegistration
+     * @param IndexerRegistry $indexerRegistry
      */
-    public function __construct(Registration $themeRegistration)
+    public function __construct(Registration $themeRegistration, IndexerRegistry $indexerRegistry)
     {
         $this->themeRegistration = $themeRegistration;
+        $this->indexerRegistry = $indexerRegistry;
     }
 
     /**
@@ -38,6 +47,8 @@ public function __construct(Registration $themeRegistration)
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
+        $indexer = $this->indexerRegistry->get(Config::DESIGN_CONFIG_GRID_INDEXER_ID);
+        $indexer->reindexAll();
         $this->themeRegistration->register();
     }
 }
diff --git a/app/code/Magento/Theme/Setup/UpgradeData.php b/app/code/Magento/Theme/Setup/UpgradeData.php
deleted file mode 100644
index 366e5387b46e5..0000000000000
--- a/app/code/Magento/Theme/Setup/UpgradeData.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Theme\Setup;
-
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Theme\Model\Data\Design\Config;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * @var QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * @var IndexerRegistry
-     */
-    protected $indexerRegistry;
-
-    /**
-     * UpgradeData constructor
-     *
-     * @param IndexerRegistry $indexerRegistry
-     * @param FieldDataConverterFactory $fieldDataConverterFactory
-     * @param QueryModifierFactory $queryModifierFactory
-     */
-    public function __construct(
-        IndexerRegistry $indexerRegistry,
-        FieldDataConverterFactory $fieldDataConverterFactory,
-        QueryModifierFactory $queryModifierFactory
-    ) {
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-        $this->queryModifierFactory = $queryModifierFactory;
-        $this->indexerRegistry = $indexerRegistry;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        $indexer = $this->indexerRegistry->get(Config::DESIGN_CONFIG_GRID_INDEXER_ID);
-        $indexer->reindexAll();
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $this->upgradeToVersionTwoZeroTwo($setup);
-        }
-        $setup->endSetup();
-    }
-
-    /**
-     * Upgrade to version 2.0.2, convert data for `value` field in `core_config_data table`
-     * from php-serialized to JSON format
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeToVersionTwoZeroTwo(ModuleDataSetupInterface $setup)
-    {
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-        $queryModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'path' => [
-                        'design/theme/ua_regexp',
-                    ]
-                ]
-            ]
-        );
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('core_config_data'),
-            'config_id',
-            'value',
-            $queryModifier
-        );
-    }
-}
diff --git a/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml b/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml
new file mode 100644
index 0000000000000..ec28e8ed7a999
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Layout" type="page_layout">
+        <data key="1column">1 column</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Theme/Test/Mftf/LICENSE.txt b/app/code/Magento/Theme/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/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/Theme/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Theme/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/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/Theme/Test/Mftf/Page/DesignConfigPage.xml b/app/code/Magento/Theme/Test/Mftf/Page/DesignConfigPage.xml
new file mode 100644
index 0000000000000..7a802aee73e3c
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Page/DesignConfigPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="DesignConfigPage" url="theme/design_config/" area="admin" module="Magento_Theme">
+        <section name="AdminDesignConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml b/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
new file mode 100644
index 0000000000000..ab7b436cb3ae3
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ThemesPageIndex" url="admin/system_design_theme/" area="admin" module="Magento_Theme">
+        <section name="AdminThemeSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Theme/Test/Mftf/README.md b/app/code/Magento/Theme/Test/Mftf/README.md
new file mode 100644
index 0000000000000..25b16385c3eca
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Theme Functional Tests
+
+The Functional Test Module for **Magento Theme** module.
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
new file mode 100644
index 0000000000000..0aa2f7f35218a
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDesignConfigSection">
+        <element name="scopeRow" type="button" selector="//*[contains(@class,'data-row')][{{arg1}}]//*[contains(@class,'action-menu-item')]" parameterized="true"/>
+        <element name="watermarkSectionHeader" type="text" selector="[data-index='watermark']"/>
+        <element name="watermarkSection" type="text" selector="[data-index='watermark'] .admin__fieldset-wrapper-content"/>
+        <element name="imageUploadInputByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//input" parameterized="true"/>
+        <element name="imageUploadPreviewByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader-preview')]//img" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
new file mode 100644
index 0000000000000..219ca7420361c
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminThemeSection">
+        <!--All rows in a specific Column e.g. {{Section.rowsInColumn('columnName')}}-->
+        <element name="allRowsInColumn" type="text" selector="//tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
+        <!--selector for Theme Title column since it needs to be handled separately-->
+        <element name="rowsInThemeTitleColumn" type="text" selector="//tbody/tr/td[contains(@class, 'parent_theme')]/preceding-sibling::td"/>
+        <element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
+        <!--Specific cell e.g. {{Section.gridCell('Name')}}-->
+        <element name="gridCell" type="text" selector="//table[@id='theme_grid_table']//td[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
+        <element name="columnHeader" type="text" selector="//thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
new file mode 100644
index 0000000000000..d9854b7a80b9b
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontFooterSection">
+    </section>
+</sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
new file mode 100644
index 0000000000000..a7bc36f1e629b
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontMessagesSection">
+        <element name="message" type="text"
+                 selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), '{{var1}}')]"
+                 parameterized="true"
+        />
+    </section>
+</sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
new file mode 100644
index 0000000000000..a667f40ad327f
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminWatermarkUploadTest">
+        <annotations>
+            <features value="Watermark"/>
+            <stories value="Watermark"/>
+            <title value="MAGETWO-95934: Can't upload Watermark Image"/>
+            <description value="Watermark images should be able to be uploaded in the admin"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-5796"/>
+            <group value="Watermark"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
+        <waitForPageLoad stepKey="waitForPageload1"/>
+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
+        <waitForPageLoad stepKey="waitForPageload2"/>
+        <scrollTo selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="scrollToWatermarkSection"/>
+        <click selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="openWatermarkSection"/>
+
+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Base')}}" stepKey="waitForInputVisible1"/>
+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Base')}}" userInput="adobe-base.jpg" stepKey="attachFile1"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Base')}}" stepKey="waitForPreviewImage"/>
+
+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Thumbnail')}}" stepKey="waitForInputVisible2"/>
+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Thumbnail')}}" userInput="adobe-thumb.jpg" stepKey="attachFile2"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Thumbnail')}}" stepKey="waitForPreviewImage2"/>
+
+        <waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Small')}}" stepKey="waitForInputVisible3"/>
+        <attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Small')}}" userInput="adobe-small.jpg" stepKey="attachFile3"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Small')}}" stepKey="waitForPreviewImage3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
new file mode 100644
index 0000000000000..67213934a6c41
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ThemeTest">
+        <annotations>
+            <features value="Theme"/>
+            <stories value="Themes"/>
+            <title value="Magento Rush theme should not be available in Themes grid"/>
+            <description value="Magento Rush theme should not be available in Themes grid"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-91409"/>
+            <group value="Theme"/>
+        </annotations>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <!--Login to Admin Area-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        <!--Navigate to Themes page-->
+        <amOnPage url="{{ThemesPageIndex.url}}" stepKey="navigateToThemesIndexPage" />
+        <waitForPageLoad stepKey="wait1"/>
+        <dontSee selector="{{AdminThemeSection.gridCell('Magento Rush')}}" stepKey="dontSeeRushThemeInTitleColumn"/>
+        <waitForPageLoad stepKey="waitForThemeGridLoad"/>
+        <seeNumberOfElements selector="{{AdminThemeSection.rowsInColumn('theme_path')}}" userInput="2" stepKey="see2RowsOnTheGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/FooterTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/FooterTest.php
index 8451e9c5aee6a..52175cc669bbd 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Html/FooterTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/FooterTest.php
@@ -30,4 +30,18 @@ public function testGetIdentities()
             $this->block->getIdentities()
         );
     }
+
+    /**
+     * Check Footer block has cache lifetime.
+     *
+     * @throws \ReflectionException
+     * @return void
+     */
+    public function testGetCacheLifetime()
+    {
+        $reflection = new \ReflectionClass($this->block);
+        $method = $reflection->getMethod('getCacheLifetime');
+        $method->setAccessible(true);
+        $this->assertEquals(3600, $method->invoke($this->block));
+    }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
index 49066e79cb798..023c741492752 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
@@ -109,6 +109,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return Topmenu
+     */
     protected function getTopmenu()
     {
         return new Topmenu($this->context, $this->nodeFactory, $this->treeFactory);
@@ -186,7 +189,6 @@ public function testGetCacheKeyInfo()
         $treeFactory = $this->createMock(\Magento\Framework\Data\TreeFactory::class);
 
         $topmenu =  new Topmenu($this->context, $nodeFactory, $treeFactory);
-        $this->urlBuilder->expects($this->once())->method('getUrl')->with('*/*/*')->willReturn('123');
         $this->urlBuilder->expects($this->once())->method('getBaseUrl')->willReturn('baseUrl');
         $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
@@ -196,7 +198,7 @@ public function testGetCacheKeyInfo()
         $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
 
         $this->assertEquals(
-            ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null, '123'],
+            ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null],
             $topmenu->getCacheKeyInfo()
         );
     }
diff --git a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
index abd4c91a7e1b7..a90df675ec258 100644
--- a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
@@ -6,8 +6,9 @@
 
 namespace Magento\Theme\Test\Unit\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Theme\Console\Command\ThemeUninstallCommand;
-use Magento\Theme\Model\Theme\themePackageInfo;
+use Magento\Theme\Model\Theme\ThemePackageInfo;
 use Magento\Theme\Model\Theme\ThemeUninstaller;
 use Magento\Theme\Model\Theme\ThemeDependencyChecker;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -56,7 +57,7 @@ class ThemeUninstallCommandTest extends \PHPUnit\Framework\TestCase
     /**
      * Theme Validator
      *
-     * @var ThemeValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Theme\Model\ThemeValidator|\PHPUnit_Framework_MockObject_MockObject
      */
     private $themeValidator;
 
@@ -107,7 +108,8 @@ protected function setUp()
             $this->themeValidator,
             $this->themePackageInfo,
             $this->themeUninstaller,
-            $this->themeDependencyChecker
+            $this->themeDependencyChecker,
+            new MaintenanceModeEnabler($this->maintenanceMode)
         );
         $this->tester = new CommandTester($this->command);
     }
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/SaveTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/SaveTest.php
index f90e24678d9e0..a193604a0d6da 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/SaveTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/SaveTest.php
@@ -62,15 +62,13 @@ public function setUp()
             '',
             false
         );
-        $this->request = $this->getMockForAbstractClass(
-            \Magento\Framework\App\RequestInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['getFiles', 'getParam', 'getParams']
-        );
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $this->request->expects($this->atLeastOnce())
+            ->method('isPost')
+            ->willReturn(true);
+
         $this->context = $objectManager->getObject(
             \Magento\Backend\App\Action\Context::class,
             [
@@ -138,7 +136,7 @@ public function testSave()
             ->method('save')
             ->with($this->designConfig);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the configuration.'));
         $this->dataPersistor->expects($this->once())
             ->method('clear')
@@ -194,7 +192,7 @@ public function testSaveWithLocalizedException()
             ->with($this->designConfig)
             ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Exception message')));
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('Exception message')->render());
 
         $this->dataPersistor->expects($this->once())
@@ -249,7 +247,7 @@ public function testSaveWithException()
             ->with($this->designConfig)
             ->willThrowException($exception);
         $this->messageManager->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, 'Something went wrong while saving this configuration: Exception message');
 
         $this->dataPersistor->expects($this->once())
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php
index a5acb67f93974..213d8dde8689f 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php
@@ -28,13 +28,18 @@ public function testIndexAction()
             ->method('getMenuModel')
             ->will($this->returnValue($menuModel));
 
+        $titleBlock = $this->createMock(\Magento\Theme\Block\Html\Title::class);
+        $titleBlock->expects($this->once())->method('setPageTitle');
+
         $layout = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
         $layout->expects($this->any())
             ->method('getBlock')
-            ->with($this->equalTo('menu'))
-            ->will($this->returnValue($menuBlock));
+            ->willReturnMap([
+                ['menu', $menuBlock],
+                ['page.title', $titleBlock]
+            ]);
 
-        $this->view->expects($this->once())
+        $this->view->expects($this->any())
             ->method('getLayout')
             ->will($this->returnValue($layout));
 
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
index d5919db5edcba..bbcaa87acb9c3 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
@@ -63,22 +63,22 @@ public function testExecuteWithoutTheme()
             ->expects($this->at(0))
             ->method('get')
             ->with(\Magento\Theme\Model\Uploader\Service::class)
-            ->WillReturn($this->serviceModel);
+            ->willReturn($this->serviceModel);
         $this->_objectManagerMock
             ->expects($this->at(1))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
-            ->WillReturn($this->themeFactory);
+            ->willReturn($this->themeFactory);
         $this->_objectManagerMock
             ->expects($this->at(2))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
-            ->WillReturn($this->customizationJs);
+            ->willReturn($this->customizationJs);
         $this->_objectManagerMock
             ->expects($this->at(3))
             ->method('get')
             ->with(\Magento\Framework\Json\Helper\Data::class)
-            ->WillReturn($this->jsonHelper);
+            ->willReturn($this->jsonHelper);
 
         $this->themeFactory->expects($this->once())
             ->method('create')
@@ -107,21 +107,21 @@ public function testExecuteWithException()
         $this->_objectManagerMock->expects($this->at(0))
             ->method('get')
             ->with(\Magento\Theme\Model\Uploader\Service::class)
-            ->WillReturn($this->serviceModel);
+            ->willReturn($this->serviceModel);
         $this->_objectManagerMock->expects($this->at(1))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
-            ->WillReturn($this->themeFactory);
+            ->willReturn($this->themeFactory);
         $this->_objectManagerMock
             ->expects($this->at(2))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
-            ->WillReturn($this->customizationJs);
+            ->willReturn($this->customizationJs);
         $this->_objectManagerMock
             ->expects($this->at(4))
             ->method('get')
             ->with(\Magento\Framework\Json\Helper\Data::class)
-            ->WillReturn($this->jsonHelper);
+            ->willReturn($this->jsonHelper);
 
         $this->themeFactory->expects($this->once())
             ->method('create')
@@ -172,19 +172,19 @@ public function testExecute()
         $this->_objectManagerMock->expects($this->at(0))
             ->method('get')
             ->with(\Magento\Theme\Model\Uploader\Service::class)
-            ->WillReturn($this->serviceModel);
+            ->willReturn($this->serviceModel);
         $this->_objectManagerMock->expects($this->at(1))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
-            ->WillReturn($this->themeFactory);
+            ->willReturn($this->themeFactory);
         $this->_objectManagerMock->expects($this->at(2))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
-            ->WillReturn($this->customizationJs);
+            ->willReturn($this->customizationJs);
         $this->_objectManagerMock->expects($this->at(4))
             ->method('get')
             ->with(\Magento\Framework\Json\Helper\Data::class)
-            ->WillReturn($this->jsonHelper);
+            ->willReturn($this->jsonHelper);
 
         $this->themeFactory->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
index 60457fc1436c0..748f7a1fcb9fb 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
 use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\Translate\InlineInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Theme\Controller\Result\MessagePlugin;
 
@@ -40,6 +41,9 @@ class MessagePluginTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
+    /** @var InlineInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $inlineTranslateMock;
+
     protected function setUp()
     {
         $this->cookieManagerMock = $this->getMockBuilder(CookieManagerInterface::class)
@@ -53,13 +57,15 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
             ->getMock();
+        $this->inlineTranslateMock = $this->getMockBuilder(InlineInterface::class)->getMockForAbstractClass();
 
         $this->model = new MessagePlugin(
             $this->cookieManagerMock,
             $this->cookieMetadataFactoryMock,
             $this->managerMock,
             $this->interpretationStrategyMock,
-            $this->serializerMock
+            $this->serializerMock,
+            $this->inlineTranslateMock
         );
     }
 
@@ -450,4 +456,93 @@ function ($data) {
 
         $this->assertEquals($resultMock, $this->model->afterRenderResult($resultMock, $resultMock));
     }
+
+    /**
+     * @return void
+     */
+    public function testAfterRenderResultWithAllowedInlineTranslate(): void
+    {
+        $messageType = 'message1type';
+        $messageText = '{{{message1text}}{{message1text}}{{message1text}}{{theme/luma}}}';
+        $expectedMessages = [
+            [
+                'type' => $messageType,
+                'text' => 'message1text',
+            ],
+        ];
+
+        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $resultMock */
+        $resultMock = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var PublicCookieMetadata|\PHPUnit_Framework_MockObject_MockObject $cookieMetadataMock */
+        $cookieMetadataMock = $this->getMockBuilder(PublicCookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cookieMetadataFactoryMock->expects($this->once())
+            ->method('createPublicCookieMetadata')
+            ->willReturn($cookieMetadataMock);
+
+        $this->cookieManagerMock->expects($this->once())
+            ->method('setPublicCookie')
+            ->with(
+                MessagePlugin::MESSAGES_COOKIES_NAME,
+                json_encode($expectedMessages),
+                $cookieMetadataMock
+            );
+        $this->cookieManagerMock->expects($this->once())
+            ->method('getCookie')
+            ->with(
+                MessagePlugin::MESSAGES_COOKIES_NAME
+            )
+            ->willReturn(json_encode([]));
+
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturnCallback(
+                function ($data) {
+                    return json_decode($data, true);
+                }
+            );
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->willReturnCallback(
+                function ($data) {
+                    return json_encode($data);
+                }
+            );
+
+        /** @var MessageInterface|\PHPUnit_Framework_MockObject_MockObject $messageMock */
+        $messageMock = $this->getMockBuilder(MessageInterface::class)
+            ->getMock();
+        $messageMock->expects($this->once())
+            ->method('getType')
+            ->willReturn($messageType);
+
+        $this->interpretationStrategyMock->expects($this->once())
+            ->method('interpret')
+            ->with($messageMock)
+            ->willReturn($messageText);
+
+        $this->inlineTranslateMock->expects($this->once())
+            ->method('isAllowed')
+            ->willReturn(true);
+
+        /** @var Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
+        $collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$messageMock]);
+
+        $this->managerMock->expects($this->once())
+            ->method('getMessages')
+            ->with(true, null)
+            ->willReturn($collectionMock);
+
+        $this->assertEquals($resultMock, $this->model->afterRenderResult($resultMock, $resultMock));
+    }
 }
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 1f3ab5642f471..db9283c54f2d2 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/Test/Unit/Model/Config/ValidatorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php
index 4dbc96d84d187..3b337312e3fb5 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Test\Unit\Model\Config;
 
 /**
@@ -39,7 +40,6 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a
      */
     public function testValidateHasRecursiveReference()
     {
@@ -70,7 +70,7 @@ public function testValidateHasRecursiveReference()
         $designElementMock->expects($this->once())->method('getValue')->willReturn($fieldConfig['field']);
 
         $templateMock = $this->getMockBuilder(\Magento\Email\Model\TemplateInterface::class)
-            ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign'])
+            ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign', 'setForcedArea'])
             ->getMock();
 
         $this->templateFactoryMock->expects($this->once())->method('create')->willReturn($templateMock);
@@ -79,6 +79,11 @@ public function testValidateHasRecursiveReference()
         );
 
         $this->model->validate($designConfigMock);
+
+        $this->expectExceptionMessage(
+            'The "email_header_template" template contains an incorrect configuration, with a reference to itself. '
+            . 'Remove or change the reference, then try again.'
+        );
     }
 
     public function testValidateNoRecursiveReference()
@@ -110,7 +115,7 @@ public function testValidateNoRecursiveReference()
         $designElementMock->expects($this->once())->method('getValue')->willReturn($fieldConfig['field']);
 
         $templateMock = $this->getMockBuilder(\Magento\Email\Model\TemplateInterface::class)
-            ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign'])
+            ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign', 'setForcedArea'])
             ->getMock();
 
         $this->templateFactoryMock->expects($this->once())->method('create')->willReturn($templateMock);
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php
index d959b95dcb0ca..1725fe158c16c 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ThemeTest.php
@@ -123,6 +123,9 @@ public function testGetValue($value, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function getValueDataProvider()
     {
         return [
@@ -131,6 +134,9 @@ public function getValueDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function afterSaveDataProvider()
     {
         return [
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php
new file mode 100644
index 0000000000000..6b26235d0efcc
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Theme\Test\Unit\Model\Design\Config;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Theme\Model\Design\Config\Validator;
+
+/**
+ * Unit tests for Magento\Theme\Test\Unit\Model\Design\Config\Validator.
+ */
+class ValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Mail\TemplateInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $templateFactory;
+
+    /**
+     * @var \Magento\Framework\Mail\TemplateInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $template;
+
+    /**
+     * @var \Magento\Theme\Api\Data\DesignConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $designConfig;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->templateFactory = $this->getMockBuilder(\Magento\Framework\Mail\TemplateInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+        $this->template = $this->getMockBuilder(\Magento\Framework\Mail\TemplateInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'emulateDesign',
+                    'setForcedArea',
+                    'loadDefault',
+                    'getTemplateText',
+                    'revertDesign',
+                ]
+            )
+            ->getMockForAbstractClass();
+        $this->templateFactory->expects($this->any())->method('create')->willReturn($this->template);
+        $this->designConfig = $this->getMockBuilder(\Magento\Theme\Api\Data\DesignConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getExtensionAttributes'])
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetDefaultTemplateTextDefaultScope(): void
+    {
+        $templateId = 'email_template';
+        $designData = [
+            'field_config' => ['field' => 'fieldValue'],
+            'value' => $templateId,
+        ];
+
+        $this->templateFactory->expects($this->once())->method('create');
+        $this->designConfig->expects($this->any())->method('getScope')->willReturn('default');
+        $this->template->expects($this->once())->method('emulateDesign');
+        $this->template->expects($this->once())->method('setForcedArea')->with($templateId);
+        $this->template->expects($this->once())->method('loadDefault')->with($templateId);
+        $this->template->expects($this->once())->method('getTemplateText');
+        $this->template->expects($this->once())->method('revertDesign');
+
+        $extensionAttributes = $this->getMockBuilder(\Magento\Theme\Api\Data\DesignConfigExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getDesignConfigData'])
+            ->getMockForAbstractClass();
+
+        $extensionAttributes->expects($this->any())->method('getDesignConfigData')->willReturn(
+            [
+                $this->getDesignConfigData($designData),
+            ]
+        );
+
+        $this->designConfig->expects($this->any())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+
+        /** @var Validator $validator */
+        $validator = $this->objectManager->getObject(
+            Validator::class,
+            [
+                'templateFactory' => $this->templateFactory,
+                'fields' => ['field' => 'fieldValue'],
+            ]
+        );
+        $validator->validate($this->designConfig);
+    }
+
+    /**
+     * Returns design config data object.
+     *
+     * @param array $data
+     * @return \Magento\Theme\Model\Data\Design\Config\Data
+     */
+    private function getDesignConfigData(array $data = []): \Magento\Theme\Model\Data\Design\Config\Data
+    {
+        return $this->objectManager->getObject(
+            \Magento\Theme\Model\Data\Design\Config\Data::class,
+            [
+                'data' => $data,
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php b/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php
index b8c72867e8cc2..7ed4f5f656822 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Test\Unit\Model;
 
 use Magento\Theme\Model\Data\Design\Config;
@@ -115,7 +116,7 @@ public function testSave()
     }
 
     /**
-     * @expectedExceptionMessage Can not save empty config
+     * @expectedExceptionMessage The config can't be saved because it's empty. Complete the config and try again.
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testSaveWithoutConfig()
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
index 5cb265d3d628b..c06e2626034a7 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
@@ -10,7 +10,6 @@
 class ThemeTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @true
      * @return void
      * @covers \Magento\Theme\Model\Theme\Source\Theme::__construct
      * @covers \Magento\Theme\Model\Theme\Source\Theme::getAllOptions
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
index 5d1c9f8cf7c3c..e302762c1c783 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/ValidationTest.php
@@ -31,6 +31,9 @@ public function testValidate(array $data, $result, array $messages)
         $this->assertEquals($messages, $validator->getErrorMessages());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderValidate()
     {
         return [
diff --git a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
index 4ff64e6f694e8..b191a64ac2c21 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
@@ -481,6 +481,9 @@ public function testToArray(array $themeData, array $expected)
         $this->assertEquals($expected, $this->_model->toArray());
     }
 
+    /**
+     * @return array
+     */
     public function toArrayDataProvider()
     {
         $parentTheme = $this->getMockBuilder(\Magento\Theme\Model\Theme::class)
@@ -555,6 +558,9 @@ public function testPopulateFromArray(array $value, array $expected, $expectedCa
         $this->assertEquals($expected, $this->_model->getData());
     }
 
+    /**
+     * @return array
+     */
     public function populateFromArrayDataProvider()
     {
         return [
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
index 62b644042b68d..ddd6ebc43ce83 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -152,8 +152,7 @@ public function testUploadFile()
         $this->_helperStorage->expects($this->any())->method('getSession')->will($this->returnValue($session));
 
         $expectedResult = [
-            'not_empty',
-            'cookie' => ['name' => null, 'value' => null, 'lifetime' => null, 'path' => null, 'domain' => null],
+            'not_empty'
         ];
 
         $this->assertEquals($expectedResult, $this->_storageModel->uploadFile($this->_storageRoot));
@@ -165,13 +164,16 @@ public function testUploadFile()
      */
     public function testUploadInvalidFile()
     {
-        $uplaoder = $this->_prepareUploader();
+        $uploader = $this->_prepareUploader();
 
-        $uplaoder->expects($this->once())->method('save')->will($this->returnValue(null));
+        $uploader->expects($this->once())->method('save')->will($this->returnValue(null));
 
         $this->_storageModel->uploadFile($this->_storageRoot);
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function _prepareUploader()
     {
         $uploader = $this->createMock(\Magento\MediaStorage\Model\File\Uploader::class);
@@ -538,6 +540,9 @@ public function testDeleteRootDirectory()
         $this->_storageModel->deleteDirectory($directoryPath);
     }
 
+    /**
+     * @return array
+     */
     public function booleanCasesDataProvider()
     {
         return [[true], [false]];
diff --git a/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php b/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php
index 0eaa509685616..f1f4664c8541d 100644
--- a/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php
@@ -105,7 +105,8 @@ public function testCleanThemeRelatedContentException()
 
         $this->themeConfig->expects($this->any())->method('isThemeAssignedToStore')->with($themeMock)->willReturn(true);
 
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, 'Theme isn\'t deletable.');
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('Theme isn\'t deletable.');
         $this->themeObserver->execute($observerMock);
     }
 
diff --git a/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php b/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
index 068738f17c967..2ac959d0a9881 100644
--- a/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
@@ -82,6 +82,9 @@ public function testPrepareDataSource($dataSourceItem, $scope, $scopeId)
         $this->assertEquals($expectedDataSource, $dataSource);
     }
 
+    /**
+     * @return array
+     */
     public function getPrepareDataSourceDataProvider()
     {
         return [
diff --git a/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/ViewActionTest.php b/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/ViewActionTest.php
new file mode 100644
index 0000000000000..03d1fe70f2f07
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/ViewActionTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Theme\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Theme\Ui\Component\Listing\Column\ViewAction;
+
+/**
+ * Class ViewActionTest contains unit tests for \Magento\Theme\Ui\Component\Listing\Column\ViewAction class
+ *
+ * @SuppressWarnings(PHPMD.LongVariable)
+ */
+class ViewActionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ViewAction
+     */
+    protected $model;
+
+    /**
+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlBuilder;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * SetUp method
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
+    }
+
+    /**
+     * @param array $data
+     * @param array $dataSourceItems
+     * @param array $expectedDataSourceItems
+     * @param string $expectedUrlPath
+     * @param array $expectedUrlParam
+     *
+     * @dataProvider getPrepareDataSourceDataProvider
+     * @return void
+     */
+    public function testPrepareDataSource(
+        $data,
+        $dataSourceItems,
+        $expectedDataSourceItems,
+        $expectedUrlPath,
+        $expectedUrlParam
+    ) {
+        $contextMock = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+            ->getMockForAbstractClass();
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextMock->expects($this->never())->method('getProcessor')->willReturn($processor);
+        $this->model = $this->objectManager->getObject(
+            ViewAction::class,
+            [
+                'urlBuilder' => $this->urlBuilder,
+                'data' => $data,
+                'context' => $contextMock,
+            ]
+        );
+
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with($expectedUrlPath, $expectedUrlParam)
+            ->willReturn('url');
+
+        $dataSource = [
+            'data' => [
+                'items' => $dataSourceItems
+            ]
+        ];
+        $dataSource = $this->model->prepareDataSource($dataSource);
+        $this->assertEquals($expectedDataSourceItems, $dataSource['data']['items']);
+    }
+
+    /**
+     * Data provider for testPrepareDataSource
+     * @return array
+     */
+    public function getPrepareDataSourceDataProvider()
+    {
+        return [
+            [
+                ['name' => 'itemName', 'config' => []],
+                [['itemName' => '', 'entity_id' => 1]],
+                [['itemName' => ['view' => ['href' => 'url', 'label' => __('View')]], 'entity_id' => 1]],
+                '#',
+                ['id' => 1]
+            ],
+            [
+                ['name' => 'itemName', 'config' => [
+                    'viewUrlPath' => 'url_path',
+                    'urlEntityParamName' => 'theme_id',
+                    'indexField' => 'theme_id']
+                ],
+                [['itemName' => '', 'theme_id' => 2]],
+                [['itemName' => ['view' => ['href' => 'url', 'label' => __('View')]], 'theme_id' => 2]],
+                'url_path',
+                ['theme_id' => 2]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php b/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php
new file mode 100644
index 0000000000000..774d5bab660af
--- /dev/null
+++ b/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Theme\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class ViewAction
+ */
+class ViewAction extends Column
+{
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UrlInterface $urlBuilder
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        UrlInterface $urlBuilder,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->urlBuilder = $urlBuilder;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare Theme Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource) : array
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as & $item) {
+                $indexField = $this->getData('config/indexField') ?: 'entity_id';
+                if (isset($item[$indexField])) {
+                    $viewUrlPath = $this->getData('config/viewUrlPath') ?: '#';
+                    $urlEntityParamName = $this->getData('config/urlEntityParamName') ?: 'id';
+                    $item[$this->getData('name')] = [
+                        'view' => [
+                            'href' => $this->urlBuilder->getUrl(
+                                $viewUrlPath,
+                                [
+                                    $urlEntityParamName => $item[$indexField]
+                                ]
+                            ),
+                            'label' => __('View')
+                        ]
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/Theme/Ui/Component/Theme/DataProvider/SearchResult.php b/app/code/Magento/Theme/Ui/Component/Theme/DataProvider/SearchResult.php
new file mode 100644
index 0000000000000..696b38a71761a
--- /dev/null
+++ b/app/code/Magento/Theme/Ui/Component/Theme/DataProvider/SearchResult.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Theme\Ui\Component\Theme\DataProvider;
+
+/**
+ * Theme search result
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_map = [
+        'fields' => [
+            'theme_id' => 'main_table.theme_id',
+            'theme_title' => 'main_table.theme_title',
+            'theme_path' => 'main_table.theme_path',
+            'parent_theme_title' => 'parent.theme_title',
+        ],
+    ];
+
+    /**
+     * Add area and type filters
+     * Join parent theme title
+     *
+     * @return $this
+     */
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+        $this
+            ->addFieldToFilter('main_table.area', \Magento\Framework\App\Area::AREA_FRONTEND)
+            ->addFieldToFilter('main_table.type', ['in' => [
+                \Magento\Framework\View\Design\ThemeInterface::TYPE_PHYSICAL,
+                \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL,
+            ]])
+        ;
+
+        $this->getSelect()->joinLeft(
+            ['parent' => $this->getMainTable()],
+            'main_table.parent_id = parent.theme_id',
+            ['parent_theme_title' => 'parent.theme_title']
+        );
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 89c543f7f3c15..0c2b092b8d7d0 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -5,27 +5,26 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-media-storage": "100.3.*",
-        "magento/module-require-js": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "magento/module-widget": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-require-js": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-translation": "100.3.*",
-        "magento/module-theme-sample-data": "Sample Data version:100.3.*",
-        "magento/module-deploy": "100.3.*",
-        "magento/module-directory": "100.3.*"
+        "magento/module-translation": "*",
+        "magento/module-theme-sample-data": "*",
+        "magento/module-deploy": "*",
+        "magento/module-directory": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
index 925b906af9523..b44691c0df963 100644
--- a/app/code/Magento/Theme/etc/config.xml
+++ b/app/code/Magento/Theme/etc/config.xml
@@ -45,7 +45,8 @@ Disallow: /*SID=
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright">
-                <copyright>Copyright &#169; 2013-2017 Magento, Inc. All rights reserved.</copyright>
+                <copyright>Copyright &#169; 2013-present Magento, Inc. All rights reserved.</copyright>
+                <report_bugs>1</report_bugs>
             </footer>
         </design>
         <theme>
diff --git a/app/code/Magento/Theme/etc/db_schema.xml b/app/code/Magento/Theme/etc/db_schema.xml
new file mode 100644
index 0000000000000..7f3a3fc607947
--- /dev/null
+++ b/app/code/Magento/Theme/etc/db_schema.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="theme" resource="default" engine="innodb" comment="Core theme">
+        <column xsi:type="int" name="theme_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Theme identifier"/>
+        <column xsi:type="int" name="parent_id" padding="11" unsigned="false" nullable="true" identity="false"
+                comment="Parent Id"/>
+        <column xsi:type="varchar" name="theme_path" nullable="true" length="255" comment="Theme Path"/>
+        <column xsi:type="varchar" name="theme_title" nullable="false" length="255" comment="Theme Title"/>
+        <column xsi:type="varchar" name="preview_image" nullable="true" length="255" comment="Preview Image"/>
+        <column xsi:type="boolean" name="is_featured" nullable="false" default="false" comment="Is Theme Featured"/>
+        <column xsi:type="varchar" name="area" nullable="false" length="255" comment="Theme Area"/>
+        <column xsi:type="smallint" name="type" padding="6" unsigned="false" nullable="false" identity="false"
+                comment="Theme type: 0:physical, 1:virtual, 2:staging"/>
+        <column xsi:type="text" name="code" nullable="true" comment="Full theme code, including package"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="theme_id"/>
+        </constraint>
+    </table>
+    <table name="theme_file" resource="default" engine="innodb" comment="Core theme files">
+        <column xsi:type="int" name="theme_files_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Theme files identifier"/>
+        <column xsi:type="int" name="theme_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Theme Id"/>
+        <column xsi:type="varchar" name="file_path" nullable="true" length="255" comment="Relative path to file"/>
+        <column xsi:type="varchar" name="file_type" nullable="false" length="32" comment="File Type"/>
+        <column xsi:type="longtext" name="content" nullable="false" comment="File Content"/>
+        <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="boolean" name="is_temporary" nullable="false" default="false" comment="Is Temporary File"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="theme_files_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="THEME_FILE_THEME_ID_THEME_THEME_ID" table="theme_file" column="theme_id"
+                    referenceTable="theme" referenceColumn="theme_id" onDelete="CASCADE"/>
+    </table>
+    <table name="design_change" resource="default" engine="innodb" comment="Design Changes">
+        <column xsi:type="int" name="design_change_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Design Change Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="varchar" name="design" nullable="true" length="255" comment="Design"/>
+        <column xsi:type="date" name="date_from" comment="First Date of Design Activity"/>
+        <column xsi:type="date" name="date_to" comment="Last Date of Design Activity"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="design_change_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="DESIGN_CHANGE_STORE_ID_STORE_STORE_ID" table="design_change"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <index referenceId="DESIGN_CHANGE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Theme/etc/db_schema_whitelist.json b/app/code/Magento/Theme/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..25b81c16bfcab
--- /dev/null
+++ b/app/code/Magento/Theme/etc/db_schema_whitelist.json
@@ -0,0 +1,49 @@
+{
+    "theme": {
+        "column": {
+            "theme_id": true,
+            "parent_id": true,
+            "theme_path": true,
+            "theme_title": true,
+            "preview_image": true,
+            "is_featured": true,
+            "area": true,
+            "type": true,
+            "code": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "theme_file": {
+        "column": {
+            "theme_files_id": true,
+            "theme_id": true,
+            "file_path": true,
+            "file_type": true,
+            "content": true,
+            "sort_order": true,
+            "is_temporary": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "THEME_FILE_THEME_ID_THEME_THEME_ID": true
+        }
+    },
+    "design_change": {
+        "column": {
+            "design_change_id": true,
+            "store_id": true,
+            "design": true,
+            "date_from": true,
+            "date_to": true
+        },
+        "index": {
+            "DESIGN_CHANGE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "DESIGN_CHANGE_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index c20184fec6bc4..148267feeaad0 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -69,7 +69,7 @@
     </type>
     <type name="Magento\Framework\App\Area">
         <arguments>
-            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+            <argument name="translator" xsi:type="object">Magento\Framework\TranslateInterface</argument>
             <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
         </arguments>
     </type>
@@ -108,6 +108,7 @@
         <arguments>
              <argument name="collections" xsi:type="array">
                  <item name="design_config_listing_data_source" xsi:type="string">Magento\Theme\Model\ResourceModel\Design\Config\Grid\Collection</item>
+                 <item name="design_theme_listing_data_source" xsi:type="string">Magento\Theme\Ui\Component\Theme\DataProvider\SearchResult</item>
              </argument>
          </arguments>
      </type>
@@ -213,6 +214,10 @@
                     <item name="path" xsi:type="string">design/footer/absolute_footer</item>
                     <item name="fieldset" xsi:type="string">other_settings/footer</item>
                 </item>
+                <item name="footer_report_bugs" xsi:type="array">
+                    <item name="path" xsi:type="string">design/footer/report_bugs</item>
+                    <item name="fieldset" xsi:type="string">other_settings/footer</item>
+                </item>
                 <item name="default_robots" xsi:type="array">
                     <item name="path" xsi:type="string">design/search_engine_robots/default_robots</item>
                     <item name="fieldset" xsi:type="string">other_settings/search_engine_robots</item>
@@ -273,4 +278,11 @@
             <argument name="themeList" xsi:type="object">Magento\Theme\Model\ResourceModel\Theme\Collection</argument>
         </arguments>
     </type>
+    <type name="Magento\Theme\Ui\Component\Theme\DataProvider\SearchResult">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">theme</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Theme\Model\ResourceModel\Theme</argument>
+            <argument name="identifierName" xsi:type="string">theme_id</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/module.xml b/app/code/Magento/Theme/etc/module.xml
index 8353ee2a46564..ace0df3b92ef8 100644
--- a/app/code/Magento/Theme/etc/module.xml
+++ b/app/code/Magento/Theme/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Theme" setup_version="2.0.2">
+    <module name="Magento_Theme" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Directory"/>
diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
index 16cc5596b3a93..c8c586f0bc684 100644
--- a/app/code/Magento/Theme/i18n/en_US.csv
+++ b/app/code/Magento/Theme/i18n/en_US.csv
@@ -107,7 +107,7 @@ Remove,Remove
 "For the best experience on our site, be sure to turn on Javascript in your browser.","For the best experience on our site, be sure to turn on Javascript in your browser."
 "Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
 "For the best experience on our site, be sure to turn on Local Storage in your browser.","For the best experience on our site, be sure to turn on Local Storage in your browser."
-"This is demo store. No orders will be fulfilled.","This is demo store. No orders will be fulfilled."
+"This is a demo store. No orders will be fulfilled.","This is a demo store. No orders will be fulfilled."
 "Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
 "%1 Item","%1 Item"
 "%1 Item(s)","%1 Item(s)"
@@ -142,7 +142,7 @@ Empty,Empty
 "1 column","1 column"
 Configuration,Configuration
 "Default welcome msg!","Default welcome msg!"
-"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
+"Copyright © 2013-present Magento, Inc. All rights reserved.","Copyright © 2013-present Magento, Inc. All rights reserved."
 "Design Config Grid","Design Config Grid"
 "Rebuild design config grid index","Rebuild design config grid index"
 "Admin empty","Admin empty"
@@ -185,3 +185,7 @@ Settings,Settings
 "2 columns with left bar","2 columns with left bar"
 "2 columns with right bar","2 columns with right bar"
 "3 columns","3 columns"
+ID,ID
+View,View
+Action,Action
+"Display Report Bugs Link","Display Report Bugs Link"
diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml
index 7bbdc526a6143..3b377899b9199 100644
--- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml
+++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_index.xml
@@ -6,11 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="formkey"/>
-    <update handle="adminhtml_system_design_theme_block"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Theme\Block\Adminhtml\System\Design\Theme" name="design_theme"/>
+            <uiComponent name="design_theme_listing"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
index ac734699e4d71..bc1f36222dd60 100644
--- a/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
@@ -54,14 +54,14 @@
                 <collapsible>true</collapsible>
                 <label translate="true">HTML Head</label>
             </settings>
-            <field name="head_shortcut_icon" formElement="fileUploader">
+            <field name="head_shortcut_icon" formElement="imageUploader">
                 <settings>
-                    <notice translate="true">Allowed file types: ico, png, gif, jpg, jpeg, apng. Not all browsers support all these formats!</notice>
+                    <notice translate="true">Not all browsers support all these formats!</notice>
                     <label translate="true">Favicon Icon</label>
-                    <componentType>fileUploader</componentType>
+                    <componentType>imageUploader</componentType>
                 </settings>
                 <formElements>
-                    <fileUploader>
+                    <imageUploader>
                         <settings>
                             <allowedExtensions>jpg jpeg gif png ico apng</allowedExtensions>
                             <maxFileSize>2097152</maxFileSize>
@@ -69,7 +69,7 @@
                                 <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                             </uploaderConfig>
                         </settings>
-                    </fileUploader>
+                    </imageUploader>
                 </formElements>
             </field>
             <field name="head_default_title" formElement="input">
@@ -151,14 +151,13 @@
                 <collapsible>true</collapsible>
                 <label translate="true">Header</label>
             </settings>
-            <field name="header_logo_src" formElement="fileUploader">
+            <field name="header_logo_src" formElement="imageUploader">
                 <settings>
-                    <notice translate="true">Allowed file types: png, gif, jpg, jpeg.</notice>
                     <label translate="true">Logo Image</label>
-                    <componentType>fileUploader</componentType>
+                    <componentType>imageUploader</componentType>
                 </settings>
                 <formElements>
-                    <fileUploader>
+                    <imageUploader>
                         <settings>
                             <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                             <maxFileSize>2097152</maxFileSize>
@@ -166,7 +165,7 @@
                                 <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
                             </uploaderConfig>
                         </settings>
-                    </fileUploader>
+                    </imageUploader>
                 </formElements>
             </field>
             <field name="header_logo_width" formElement="input">
@@ -234,6 +233,20 @@
                     <dataScope>footer_copyright</dataScope>
                 </settings>
             </field>
+            <field name="footer_report_bugs" formElement="select">
+                <settings>
+                    <dataType>text</dataType>
+                    <label translate="true">Display Report Bugs Link</label>
+                    <dataScope>footer_report_bugs</dataScope>
+                </settings>
+                <formElements>
+                    <select>
+                        <settings>
+                            <options class="Magento\Config\Model\Config\Source\Yesno"/>
+                        </settings>
+                    </select>
+                </formElements>
+            </field>
         </fieldset>
         <fieldset name="search_engine_robots" sortOrder="120">
             <settings>
diff --git a/app/code/Magento/Theme/view/adminhtml/ui_component/design_theme_listing.xml b/app/code/Magento/Theme/view/adminhtml/ui_component/design_theme_listing.xml
new file mode 100644
index 0000000000000..14aea72d87357
--- /dev/null
+++ b/app/code/Magento/Theme/view/adminhtml/ui_component/design_theme_listing.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">design_theme_listing.design_theme_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>design_theme_columns</spinner>
+        <deps>
+            <dep>design_theme_listing.design_theme_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="design_theme_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Theme::theme</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="design_theme_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>theme_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <filters name="listing_filters"/>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="design_theme_columns">
+        <settings>
+            <childDefaults>
+                <param name="fieldAction" xsi:type="array">
+                    <item name="provider" xsi:type="string">design_theme_listing.design_theme_listing.design_theme_columns.actions</item>
+                    <item name="target" xsi:type="string">applyAction</item>
+                    <item name="params" xsi:type="array">
+                        <item name="0" xsi:type="string">view</item>
+                        <item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
+                    </item>
+                </param>
+            </childDefaults>
+        </settings>
+        <column name="theme_id" sortOrder="10">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">ID</label>
+                <sorting>asc</sorting>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="theme_title" sortOrder="20">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Theme Title</label>
+            </settings>
+        </column>
+        <column name="parent_theme_title" sortOrder="30">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Parent Theme</label>
+            </settings>
+        </column>
+        <column name="theme_path" sortOrder="40">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Theme Path</label>
+                <fieldClass>
+                    <class name="theme_path">true</class>
+                </fieldClass>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Magento\Theme\Ui\Component\Listing\Column\ViewAction" sortOrder="50">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="viewUrlPath" xsi:type="string">adminhtml/system_design_theme/edit</item>
+                    <item name="urlEntityParamName" xsi:type="string">id</item>
+                </item>
+            </argument>
+            <settings>
+                <indexField>theme_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/app/code/Magento/Theme/view/adminhtml/web/favicon.ico b/app/code/Magento/Theme/view/adminhtml/web/favicon.ico
index 1cb7c7713718b..d467f2bcbaed4 100644
Binary files a/app/code/Magento/Theme/view/adminhtml/web/favicon.ico and b/app/code/Magento/Theme/view/adminhtml/web/favicon.ico differ
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index bd72a3d74fad1..52e9270952a95 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,11 +38,12 @@ 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',
-        'domReady': 'requirejs/domReady'
+        'domReady': 'requirejs/domReady',
+        'spectrum': 'jquery/spectrum/spectrum',
+        'tinycolor': 'jquery/spectrum/tinycolor'
     },
     'deps': [
         'jquery/jquery-migrate'
@@ -52,6 +52,9 @@ var config = {
         'mixins': {
             'jquery/jstree/jquery.jstree': {
                 'mage/backend/jstree-mixin': true
+            },
+            'jquery': {
+                'jquery/patches/jquery': true
             }
         },
         'text': {
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 716341f5a64a4..f19f20861dcfc 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -39,7 +39,11 @@
                             <argument name="label" translate="true" xsi:type="string">Skip to Content</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml"/>
+                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml">
+                        <arguments>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
+                        </arguments>
+                    </block>
                     <block class="Magento\Customer\Block\Account\Navigation" name="top.links">
                         <arguments>
                             <argument name="css_class" xsi:type="string">header links</argument>
@@ -82,6 +86,7 @@
                     <block class="Magento\Store\Block\Switcher" name="store.settings.language" template="Magento_Store::switch/languages.phtml">
                         <arguments>
                             <argument name="id_modifier" xsi:type="string">nav</argument>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Directory\Block\Currency" name="store.settings.currency" template="Magento_Directory::currency.phtml">
@@ -119,7 +124,7 @@
                     </arguments>
                 </block>
                 <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="Magento_Theme::html/copyright.phtml"/>
-                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" />
+                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" ifconfig="design/footer/report_bugs"/>
             </container>
         </referenceContainer>
         <referenceContainer name="before.body.end">
diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
index 38ab9c29402e9..38cfe25c16f8e 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
@@ -10,10 +10,10 @@
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <css src="mage/calendar.css"/>
         <script src="requirejs/require.js"/>
+        <script src="mage/polyfill.js"/>
     </head>
     <body>
         <referenceContainer name="after.body.start">
-            <block class="Magento\Framework\View\Element\Template" name="head.polyfill" as="polyfill" template="Magento_Theme::js/polyfill.phtml" before="-"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Theme::js/components.phtml" before="-"/>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js
index 51657fb11f2c8..ef46f4bfed825 100644
--- a/app/code/Magento/Theme/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Theme/view/frontend/requirejs-config.js
@@ -27,7 +27,8 @@ var config = {
             'menu':                   'mage/menu',
             'popupWindow':            'mage/popup-window',
             'validation':             'mage/validation/validation',
-            'welcome':                'Magento_Theme/js/view/welcome'
+            'welcome':                'Magento_Theme/js/view/welcome',
+            'breadcrumbs':            'Magento_Theme/js/view/breadcrumbs'
         }
     },
     paths: {
@@ -38,5 +39,15 @@ var config = {
         'mage/common',
         'mage/dataPost',
         'mage/bootstrap'
-    ]
+    ],
+    config: {
+        mixins: {
+            'Magento_Theme/js/view/breadcrumbs': {
+                'Magento_Theme/js/view/add-home-breadcrumb': true
+            },
+            'jquery/jquery-ui': {
+                'jquery/patches/jquery-ui': true
+            }
+        }
+    }
 };
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
index 5d8203244256e..f147b7085945f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
@@ -7,7 +7,7 @@
 <small class="bugs">
     <span><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?></span>
     <a href="http://www.magentocommerce.com/bug-tracking"
-       target="_blank">
+       target="_blank" title="<?= /* @escapeNotVerified */ __('Report All Bugs') ?>">
         <?= /* @escapeNotVerified */ __('Report All Bugs') ?>
     </a>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
index 318bcc8f2cc7c..c3ad4a89399a0 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
@@ -10,7 +10,7 @@
 
 <div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
     <div class="title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title" data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= /* @escapeNotVerified */ $block->getBlockCss() ?>", "selectorsToggleClass": "active"}}'>
-        <strong><?= /* @escapeNotVerified */ $block->getBlockTitle() ?></strong>
+        <strong><?= /* @escapeNotVerified */ __($block->getBlockTitle()) ?></strong>
     </div>
     <div class="content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content" id="<?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
         <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index cc3ea276e2230..4395cab651de1 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -15,11 +15,11 @@ $welcomeMessage = $block->getWelcome();
     case 'welcome': ?>
         <li class="greet welcome" data-bind="scope: 'customer'">
             <!-- ko if: customer().fullname  -->
-            <span data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().firstname)">
+            <span data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
             </span>
             <!-- /ko -->
             <!-- ko ifnot: customer().fullname  -->
-            <span data-bind='html:"<?= $block->escapeHtmlAttr($welcomeMessage) ?>"'></span>
+            <span data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
             <?= $block->getBlockHtml('header.additional') ?>
             <!-- /ko -->
         </li>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 8c3663337cbbe..79b891b7e55e6 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -12,18 +12,11 @@
 ?>
 <?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
 <span data-action="toggle-nav" class="action nav-toggle"><span><?= /* @escapeNotVerified */ __('Toggle Nav') ?></span></span>
-<?php if ($block->isHomePage()):?>
-    <strong class="logo">
-<?php else: ?>
-    <a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
-<?php endif ?>
-        <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
-             alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
-             <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
-             <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
-        />
-<?php if ($block->isHomePage()):?>
-    </strong>
-<?php else:?>
-    </a>
-<?php endif?>
+<a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
+    <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
+         title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
+         alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
+         <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
+         <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
+    />
+</a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index 3e74362851cfe..720ee44007954 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -54,7 +54,7 @@ require(['jquery'], function(jQuery){
 <?php if ($block->displayDemoNotice()): ?>
     <div class="message global demo">
         <div class="content">
-            <p><?= /* @escapeNotVerified */ __('This is demo store. No orders will be fulfilled.') ?></p>
+            <p><?= /* @escapeNotVerified */ __('This is a demo store. No orders will be fulfilled.') ?></p>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml b/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml
deleted file mode 100644
index 7e8854b914261..0000000000000
--- a/app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Polyfill for local storage and session storage for old browsers and with enabled private mode.
- *
- * Emulates behavior of the native local storage and session storage. Adds ability to use "getItem", "setItem",
- * "removeItem" methods.
- */
-?>
-
-<script>
-    try {
-        if (!window.localStorage || !window.sessionStorage) {
-            throw new Error();
-        }
-
-        localStorage.setItem('storage_test', 1);
-        localStorage.removeItem('storage_test');
-    } catch(e) {
-        (function () {
-            var Storage = function (type) {
-                var data;
-
-                function createCookie(name, value, days) {
-                    var date, expires;
-
-                    if (days) {
-                        date = new Date();
-                        date.setTime(date.getTime()+(days * 24 * 60 * 60 * 1000));
-                        expires = '; expires=' + date.toGMTString();
-                    } else {
-                        expires = '';
-                    }
-                    document.cookie = name + '=' + value+expires+'; path=/';
-                }
-
-                function readCookie(name) {
-                    var nameEQ = name + '=',
-                        ca = document.cookie.split(';'),
-                        i = 0,
-                        c;
-
-                    for (i=0; i < ca.length; i++) {
-                        c = ca[i];
-
-                        while (c.charAt(0) === ' ') {
-                            c = c.substring(1,c.length);
-                        }
-
-                        if (c.indexOf(nameEQ) === 0) {
-                            return c.substring(nameEQ.length, c.length);
-                        }
-                    }
-
-                    return null;
-                }
-
-                function setData(data) {
-                    data = encodeURIComponent(JSON.stringify(data));
-                    createCookie(type === 'session' ? getSessionName() : 'localStorage', data, 365);
-                }
-
-                function clearData() {
-                    createCookie(type === 'session' ? getSessionName() : 'localStorage', '', 365);
-                }
-
-                function getData() {
-                    var data = type === 'session' ? readCookie(getSessionName()) : readCookie('localStorage');
-
-                    return data ? JSON.parse(decodeURIComponent(data)) : {};
-                }
-
-                function getSessionName() {
-                    if (!window.name) {
-                        window.name = new Date().getTime();
-                    }
-
-                    return 'sessionStorage' + window.name;
-                }
-
-                data = getData();
-
-                return {
-                    length: 0,
-                    clear: function () {
-                        data = {};
-                        this.length = 0;
-                        clearData();
-                    },
-
-                    getItem: function (key) {
-                        return data[key] === undefined ? null : data[key];
-                    },
-
-                    key: function (i) {
-                        var ctr = 0,
-                            k;
-
-                        for (k in data) {
-                            if (ctr.toString() === i.toString()) {
-                                return k;
-                            } else {
-                                ctr++
-                            }
-                        }
-
-                        return null;
-                    },
-
-                    removeItem: function (key) {
-                        delete data[key];
-                        this.length--;
-                        setData(data);
-                    },
-
-                    setItem: function (key, value) {
-                        data[key] = value.toString();
-                        this.length++;
-                        setData(data);
-                    }
-                };
-            };
-
-            window.localStorage.__proto__ = window.localStorage = new Storage('local');
-            window.sessionStorage.__proto__ = window.sessionStorag = new Storage('session');
-        })();
-    }
-</script>
diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
index 67265de90da77..2a4b07ee6396f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
@@ -5,6 +5,7 @@
  */
 ?>
 <script>
+    var BASE_URL = '<?= $block->escapeUrl($block->getBaseUrl()) ?>';
     var require = {
         "baseUrl": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('/') ?>"
     };
diff --git a/app/code/Magento/Theme/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
index 4c4b38132c880..7d00235c0362c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/text.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/text.phtml
@@ -10,6 +10,6 @@ if (!empty($attr)) {
     foreach ($block->getAttributes() as $attribute => $value) {
         $attributes .= ' ' . $attribute . '="' . $value . '"';
     }
-};
+}
 echo
     '<' . $block->getTag() . $attributes . '>' . $block->getText() . '</' . $block->getTag() . '>';
diff --git a/app/code/Magento/Theme/view/frontend/web/favicon.ico b/app/code/Magento/Theme/view/frontend/web/favicon.ico
index 1cb7c7713718b..d467f2bcbaed4 100644
Binary files a/app/code/Magento/Theme/view/frontend/web/favicon.ico and b/app/code/Magento/Theme/view/frontend/web/favicon.ico differ
diff --git a/app/code/Magento/Theme/view/frontend/web/js/model/breadcrumb-list.js b/app/code/Magento/Theme/view/frontend/web/js/model/breadcrumb-list.js
new file mode 100644
index 0000000000000..3321dca071eaf
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/web/js/model/breadcrumb-list.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return [];
+});
diff --git a/app/code/Magento/Theme/view/frontend/web/js/row-builder.js b/app/code/Magento/Theme/view/frontend/web/js/row-builder.js
index 62537c8b1b899..7785ced2e4bd5 100644
--- a/app/code/Magento/Theme/view/frontend/web/js/row-builder.js
+++ b/app/code/Magento/Theme/view/frontend/web/js/row-builder.js
@@ -144,7 +144,7 @@ define([
 
             $(tmpl).appendTo(row);
 
-            $(this.options.rowContainer).append(row);
+            $(this.options.rowContainer).append(row).trigger('contentUpdated');
 
             row.addClass(this.options.additionalRowClass);
 
diff --git a/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.js b/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.js
new file mode 100644
index 0000000000000..7960b7a8ce26b
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks, no-undef */
+define([
+    'jquery',
+    'Magento_Theme/js/model/breadcrumb-list',
+    'mage/translate'
+], function ($, breadcrumbList) {
+    'use strict';
+
+    /**
+     * @return {Object}
+     */
+    var homeCrumb = function () {
+        return {
+            name: 'home',
+            label: $.mage.__('Home'),
+            title: $.mage.__('Go to Home Page'),
+            link: BASE_URL || ''
+        };
+    };
+
+    return function (breadcrumb) {
+
+        breadcrumbList.unshift(homeCrumb());
+
+        return breadcrumb;
+    };
+});
diff --git a/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.js b/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.js
new file mode 100644
index 0000000000000..e9c46354c0149
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.js
@@ -0,0 +1,66 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/template',
+    'Magento_Theme/js/model/breadcrumb-list',
+    'text!Magento_Theme/templates/breadcrumbs.html',
+    'jquery/ui'
+], function ($, mageTemplate, breadcrumbList, tpl) {
+    'use strict';
+
+    /**
+     * Breadcrumb Widget.
+     */
+    $.widget('mage.breadcrumbs', {
+
+        /** @inheritdoc */
+        _init: function () {
+            this._super();
+            this._render();
+        },
+
+        /**
+         * Render breadcrumb.
+         *
+         * @private
+         */
+        _render: function () {
+            var html,
+                crumbs = breadcrumbList,
+                template = mageTemplate(tpl);
+
+            this._decorate(crumbs);
+
+            html = template({
+                'breadcrumbs': crumbs
+            });
+
+            if (html.length) {
+                $(this.element).html(html);
+            }
+        },
+
+        /**
+         * Decorate list.
+         *
+         * @param {Array} list
+         * @private
+         */
+        _decorate: function (list) {
+
+            if (list.length) {
+                list[0].first = true;
+            }
+
+            if (list.length > 1) {
+                list[list.length - 1].last = true;
+            }
+        }
+    });
+
+    return $.mage.breadcrumbs;
+});
diff --git a/app/code/Magento/Theme/view/frontend/web/js/view/messages.js b/app/code/Magento/Theme/view/frontend/web/js/view/messages.js
index aafba523572a7..cefbf11d73933 100644
--- a/app/code/Magento/Theme/view/frontend/web/js/view/messages.js
+++ b/app/code/Magento/Theme/view/frontend/web/js/view/messages.js
@@ -27,7 +27,7 @@ define([
         initialize: function () {
             this._super();
 
-            this.cookieMessages = $.cookieStorage.get('mage-messages');
+            this.cookieMessages = _.unique($.cookieStorage.get('mage-messages'), 'text');
             this.messages = customerData.get('messages').extend({
                 disposableCustomerData: 'messages'
             });
diff --git a/app/code/Magento/Theme/view/frontend/web/templates/breadcrumbs.html b/app/code/Magento/Theme/view/frontend/web/templates/breadcrumbs.html
new file mode 100644
index 0000000000000..792eb2e636005
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/web/templates/breadcrumbs.html
@@ -0,0 +1,19 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ul class="items">
+<% _.each(breadcrumbs, function(crumb) { %>
+    <li class="item <%- crumb.name %>">
+        <% if (crumb.link) { %>
+        <a href="<%= crumb.link %>" title="<%- crumb.title %>"><%- crumb.label %></a>
+        <% } else if (crumb.last) { %>
+        <strong><%= crumb.label %></strong>
+        <% } else { %>
+        <%= crumb.label %>
+        <% } %>
+    </li>
+<% }); %>
+</ul>
diff --git a/app/code/Magento/Theme/view/install/web/favicon.ico b/app/code/Magento/Theme/view/install/web/favicon.ico
index 1cb7c7713718b..d467f2bcbaed4 100644
Binary files a/app/code/Magento/Theme/view/install/web/favicon.ico and b/app/code/Magento/Theme/view/install/web/favicon.ico differ
diff --git a/app/code/Magento/ThemeGraphQl/README.md b/app/code/Magento/ThemeGraphQl/README.md
new file mode 100644
index 0000000000000..2b3d54d9b5735
--- /dev/null
+++ b/app/code/Magento/ThemeGraphQl/README.md
@@ -0,0 +1,4 @@
+# ThemeGraphQl
+
+**ThemeGraphQl** provides type information for the GraphQl module
+to generate theme fields information endpoints.
diff --git a/app/code/Magento/ThemeGraphQl/composer.json b/app/code/Magento/ThemeGraphQl/composer.json
new file mode 100644
index 0000000000000..e3aac55aea37e
--- /dev/null
+++ b/app/code/Magento/ThemeGraphQl/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/module-theme-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-store-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\ThemeGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/ThemeGraphQl/etc/module.xml b/app/code/Magento/ThemeGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..0e10b776af9c0
--- /dev/null
+++ b/app/code/Magento/ThemeGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_ThemeGraphQl"/>
+</config>
diff --git a/app/code/Magento/ThemeGraphQl/etc/schema.graphqls b/app/code/Magento/ThemeGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..325fcc8bd9834
--- /dev/null
+++ b/app/code/Magento/ThemeGraphQl/etc/schema.graphqls
@@ -0,0 +1,19 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+type StoreConfig @doc(description: "The type contains information about a store config") {
+    head_shortcut_icon : String @doc(description: "Favicon Icon")
+    default_title : String @doc(description: "Default Page Title")
+    title_prefix : String @doc(description: "Page Title Prefix")
+    title_suffix : String @doc(description: "Page Title Suffix")
+    default_description : String @doc(description: "Default Meta Description")
+    default_keywords : String @doc(description: "Default Meta Keywords")
+    head_includes : String @doc(description: "Scripts and Style Sheets")
+    demonotice : Int @doc(description: "Display Demo Store Notice")
+    header_logo_src : String @doc(description: "Logo Image")
+    logo_width : Int @doc(description: "Logo Attribute Width")
+    logo_height : Int @doc(description: "Logo Attribute Height")
+    welcome : String @doc(description: "Welcome Text")
+    logo_alt : String @doc(description: "Logo Image Alt")
+    absolute_footer : String @doc(description: "Footer Miscellaneous HTML")
+    copyright : String @doc(description: "Copyright")
+}
diff --git a/app/code/Magento/ThemeGraphQl/registration.php b/app/code/Magento/ThemeGraphQl/registration.php
new file mode 100644
index 0000000000000..e320fbc9868ef
--- /dev/null
+++ b/app/code/Magento/ThemeGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_ThemeGraphQl', __DIR__);
diff --git a/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php b/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
new file mode 100644
index 0000000000000..d11a3fa6e8a0c
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tinymce3\Model\Config\Gallery;
+
+/**
+ * Class Config adds information about required configurations to display media gallery of tinymce3 editor
+ *
+ * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
+ */
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    private $backendUrl;
+
+    /**
+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
+     */
+    public function __construct(
+        \Magento\Backend\Model\UrlInterface $backendUrl
+    ) {
+        $this->backendUrl = $backendUrl;
+    }
+
+    /**
+     * Returns media gallery config
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $config->addData(
+            [
+                'add_images' => true,
+                'files_browser_window_url' => $this->backendUrl->getUrl('cms/wysiwyg_images/index'),
+            ]
+        );
+
+        return $config;
+    }
+}
diff --git a/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php b/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php
new file mode 100644
index 0000000000000..00f1a82698381
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tinymce3\Model\Config\Source\Wysiwyg;
+
+/**
+ * Class Editor provides configuration value for TinyMCE3 editor
+ * @deprecated use as configuration value tinymce4 path: mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter
+ */
+class Editor
+{
+    /**
+     * Configuration value for TinyMCE3 editor
+     * @var string
+     */
+    const WYSIWYG_EDITOR_CONFIG_VALUE = 'Magento_Tinymce3/tinymce3Adapter';
+}
diff --git a/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/EditorPlugin.php b/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/EditorPlugin.php
deleted file mode 100644
index 2d835c97cc932..0000000000000
--- a/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/EditorPlugin.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Tinymce3\Model\Config\Source\Wysiwyg;
-
-class EditorPlugin
-{
-    /**
-     * Change label of TinyMCE to v3
-     *
-     * @param \Magento\Cms\Model\Config\Source\Wysiwyg\Editor $subject
-     * @param $optionArray
-     * @return array
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterToOptionArray(\Magento\Cms\Model\Config\Source\Wysiwyg\Editor $subject, $optionArray)
-    {
-        $optionArray[] = ['value' => 'Magento_Tinymce3/tinymce3Adapter', 'label' => __('TinyMCE 3 (deprecated)')];
-
-        return $optionArray;
-    }
-}
diff --git a/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php b/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php
new file mode 100644
index 0000000000000..2d016a5101abe
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php
@@ -0,0 +1,58 @@
+<?php
+/**le
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+namespace Magento\Tinymce3\Model\Config\Variable;
+
+/**
+ * Class Config adds variable plugin information required for tinymce3 editor
+ * @deprecated use \Magento\Variable\Model\Variable\ConfigProvider instead
+ */
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var \Magento\Variable\Model\Variable\Config
+     */
+    private $defaultVariableConfig;
+
+    /**
+     * @param \Magento\Variable\Model\Variable\Config $defaultVariableConfig
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     */
+    public function __construct(
+        \Magento\Variable\Model\Variable\Config $defaultVariableConfig,
+        \Magento\Framework\View\Asset\Repository $assetRepo
+    ) {
+        $this->assetRepo = $assetRepo;
+        $this->defaultVariableConfig = $defaultVariableConfig;
+    }
+
+    /**
+     * Update variable plugin url
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $settings = $this->defaultVariableConfig->getWysiwygPluginSettings($config);
+        $pluginConfig = isset($settings['plugins']) ? $settings['plugins'] : [];
+        $pluginData = [];
+        if (!empty($pluginConfig)) {
+            $pluginData = array_shift($pluginConfig);
+            $editorPluginJs = 'Magento_Tinymce3::wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js';
+            $pluginData['src'] = $this->assetRepo->getUrl($editorPluginJs);
+            $settings['variable_placeholders'] = $pluginData['options']['placeholders'];
+        }
+        $settings['plugins'] = [$pluginData];
+        return $config->addData($settings);
+    }
+}
diff --git a/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php b/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php
new file mode 100644
index 0000000000000..de548df4bc9f3
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tinymce3\Model\Config\Widget;
+
+/**
+ * Class Config adds widget plugin information required for tinymce3 editor
+ * @deprecated use \Magento\Widget\Model\Widget\Config instead
+ */
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var \Magento\Widget\Model\Widget\Config
+     */
+    private $widgetConfig;
+
+    /**
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param \Magento\Widget\Model\Widget\Config $widgetConfig
+     */
+    public function __construct(
+        \Magento\Framework\View\Asset\Repository $assetRepo,
+        \Magento\Widget\Model\Widget\Config $widgetConfig
+    ) {
+        $this->assetRepo = $assetRepo;
+        $this->widgetConfig = $widgetConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $settings = [
+            'widget_plugin_src' => $this->getWysiwygJsPluginSrc(),
+            'widget_window_url' => $this->widgetConfig->getWidgetWindowUrl($config),
+            'widget_types' => $this->widgetConfig->getAvailableWidgets($config),
+            'widget_error_image_url' => $this->widgetConfig->getErrorImageUrl(),
+            'widget_placeholders' => $this->widgetConfig->getWidgetPlaceholderImageUrls()
+        ];
+        return $config->addData($settings);
+    }
+
+    /**
+     * Return path to tinymce3 widget plugin
+     *
+     * @return string
+     */
+    private function getWysiwygJsPluginSrc() : string
+    {
+        $editorPluginJs = 'Magento_Tinymce3::tiny_mce/plugins/magentowidget/editor_plugin.js';
+        $result = $this->assetRepo->getUrl($editorPluginJs);
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php b/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php
new file mode 100644
index 0000000000000..1ab3de708dd26
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Tinymce3\Model\Config\Widget;
+
+/**
+ * Class PlaceholderImages provide ability to override placeholder images for Widgets
+ * @deprecated
+ */
+class PlaceholderImagesPool
+{
+    /**
+     * @var array
+     */
+    private $widgetPlaceholders;
+
+    /**
+     * PlaceholderImages constructor.
+     * @param array $widgetPlaceholders
+     */
+    public function __construct(
+        array $widgetPlaceholders = []
+    ) {
+        $this->widgetPlaceholders = $widgetPlaceholders;
+    }
+
+    /**
+     * @return array
+     */
+    public function getWidgetPlaceholders() : array
+    {
+        return $this->widgetPlaceholders;
+    }
+}
diff --git a/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php b/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php
new file mode 100644
index 0000000000000..f3dc4c8591cbd
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tinymce3\Model\Config\Wysiwyg;
+
+/**
+ * Class Config adds information about required css files for tinymce3 editor
+ * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
+ */
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     */
+    public function __construct(
+        \Magento\Framework\View\Asset\Repository $assetRepo
+    ) {
+        $this->assetRepo = $assetRepo;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $config->addData([
+            'popup_css' => $this->assetRepo->getUrl(
+                'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css'
+            ),
+            'content_css' => $this->assetRepo->getUrl(
+                'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css'
+            )
+        ]);
+
+        return $config;
+    }
+}
diff --git a/app/code/Magento/Tinymce3/Model/Plugin/Variable/Config.php b/app/code/Magento/Tinymce3/Model/Plugin/Variable/Config.php
deleted file mode 100644
index 764c55d38dfe4..0000000000000
--- a/app/code/Magento/Tinymce3/Model/Plugin/Variable/Config.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**le
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Tinymce3\Model\Plugin\Variable;
-
-class Config
-{
-    /**
-     * @var \Magento\Framework\View\Asset\Repository
-     */
-    private $assetRepo;
-
-    /**
-     * @var \Magento\Ui\Block\Wysiwyg\ActiveEditor
-     */
-    private $activeEditor;
-
-    /**
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     */
-    public function __construct(
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor
-    ) {
-        $this->assetRepo = $assetRepo;
-        $this->activeEditor = $activeEditor;
-    }
-
-    /**
-     * @param \Magento\Variable\Model\Variable\Config $subject
-     * @param string $result
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterGetWysiwygJsPluginSrc(
-        \Magento\Variable\Model\Variable\Config $subject,
-        $result
-    ) {
-        if ($this->activeEditor->getWysiwygAdapterPath() === 'Magento_Tinymce3/tinymce3Adapter') {
-            $editorPluginJs = 'Magento_Tinymce3::wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js';
-            $result = $this->assetRepo->getUrl($editorPluginJs);
-        }
-        return $result;
-    }
-}
diff --git a/app/code/Magento/Tinymce3/Model/Plugin/Widget.php b/app/code/Magento/Tinymce3/Model/Plugin/Widget.php
new file mode 100644
index 0000000000000..1cf8a67751b76
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Model/Plugin/Widget.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+namespace Magento\Tinymce3\Model\Plugin;
+
+use Magento\Tinymce3\Model\Config\Source\Wysiwyg\Editor;
+
+/**
+ * Plugin to override widget placeholder images in case if tinymce3 adapter is used
+ */
+class Widget
+{
+    /**
+     * @var \Magento\Ui\Block\Wysiwyg\ActiveEditor
+     */
+    private $activeEditor;
+
+    /**
+     * @var array
+     */
+    private $placeholderImages;
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @param \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param \Magento\Tinymce3\Model\Config\Widget\PlaceholderImagesPool $placeholderImages
+     */
+    public function __construct(
+        \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor,
+        \Magento\Framework\View\Asset\Repository $assetRepo,
+        \Magento\Tinymce3\Model\Config\Widget\PlaceholderImagesPool $placeholderImages
+    ) {
+        $this->activeEditor = $activeEditor;
+        $this->placeholderImages = $placeholderImages;
+        $this->assetRepo = $assetRepo;
+    }
+
+    /**
+     * @param \Magento\Widget\Model\Widget $subject
+     * @param \Closure $proceed
+     * @param string $type
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundGetPlaceholderImageUrl(
+        \Magento\Widget\Model\Widget $subject,
+        \Closure $proceed,
+        string $type
+    ) : string {
+        if ($this->activeEditor->getWysiwygAdapterPath() !== Editor::WYSIWYG_EDITOR_CONFIG_VALUE) {
+            return $proceed($type);
+        }
+        $placeholders = $this->placeholderImages->getWidgetPlaceholders();
+        $defaultImage = $this->assetRepo->getUrl('Magento_Tinymce3::images/widget/placeholder.png');
+
+        if (isset($placeholders[$type])) {
+            return $this->assetRepo->getUrl($placeholders[$type]);
+        }
+        return $defaultImage;
+    }
+}
diff --git a/app/code/Magento/Tinymce3/Model/Plugin/Wysiwyg/Config.php b/app/code/Magento/Tinymce3/Model/Plugin/Wysiwyg/Config.php
deleted file mode 100644
index af9c045fa7d1b..0000000000000
--- a/app/code/Magento/Tinymce3/Model/Plugin/Wysiwyg/Config.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Tinymce3\Model\Plugin\Wysiwyg;
-
-class Config
-{
-    /**
-     * @var \Magento\Framework\View\Asset\Repository
-     */
-    private $assetRepo;
-
-    /**
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     */
-    public function __construct(\Magento\Framework\View\Asset\Repository $assetRepo)
-    {
-        $this->assetRepo = $assetRepo;
-    }
-
-    /**
-     * @param \Magento\Cms\Model\Wysiwyg\Config $subject
-     * @param \Magento\Framework\DataObject $config
-     * @return \Magento\Framework\DataObject
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterGetConfig(
-        \Magento\Cms\Model\Wysiwyg\Config $subject,
-        \Magento\Framework\DataObject $config
-    ) {
-        $config->addData([
-            'popup_css' => $this->assetRepo->getUrl(
-                'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css'
-            ),
-            'content_css' => $this->assetRepo->getUrl(
-                'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css'
-            )
-        ]);
-
-        return $config;
-    }
-}
diff --git a/app/code/Magento/Tinymce3/README.md b/app/code/Magento/Tinymce3/README.md
index 9fb0473fadedd..8e24c218171b6 100644
--- a/app/code/Magento/Tinymce3/README.md
+++ b/app/code/Magento/Tinymce3/README.md
@@ -1,3 +1 @@
-This moodule provides backwards compatibility for TinyMCE3 for clients
-that have modified the TinyMCE3 editor in Magento and don't want to 
-lose functionality.
\ No newline at end of file
+We have updated the TinyMCE module to the latest available version, 4.6.4. TinyMCE v4.6.4 provides backwards-compatibility for modified editor modules to prevent the loss of functionality. The TinyMCE3 module is now deprecated and will be removed in a future release.
\ No newline at end of file
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/LICENSE.txt b/app/code/Magento/Tinymce3/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/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/Tinymce3/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Tinymce3/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/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/Tinymce3/Test/Mftf/README.md b/app/code/Magento/Tinymce3/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e65a4afe26d88
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tinymce3 Functional Tests
+
+The Functional Test Module for **Magento Tinymce3** module.
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
new file mode 100644
index 0000000000000..76c0a9e1fe797
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="ProductWYSIWYGSection">
+        <element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
+    </section>
+    <section name="TinyMCESection">
+        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
+        <element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
+    </section>
+    <section name="NewsletterWYSIWYGSection">
+        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
new file mode 100644
index 0000000000000..02b8d3686fd68
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSwitchWYSIWYGOptionsTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-51829-Extensible list of WYSIWYG editors available in Magento"/>
+            <group value="Cms"/>
+            <title value="Admin should able to switch between versions of TinyMCE"/>
+            <description value="Admin should able to switch between versions of TinyMCE"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-82936"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+        </before>
+        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox1" />
+        <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue1"/>
+        <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown1" />
+        <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 4" stepKey="switchToVersion4" />
+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
+        <seeElement selector="{{TinyMCESection.TinyMCE4}}"  stepKey="seeTinyMCE4" />
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE4!');" stepKey="executeJSFillContent1"/>
+        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn1" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab1" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation1"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey1"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage1"/>
+        <!-- Go to storefront cms page, assert cms content -->
+        <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage1"/>
+        <waitForPageLoad stepKey="wait3" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello TinyMCE4!" stepKey="seeContent1"/>
+        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
+        <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
+        <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown2" />
+        <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
+        <seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE3!');" stepKey="executeJSFillContent2"/>
+        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2" />
+        <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab2" />
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation2"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{simpleCmsPage.identifier}}" stepKey="fillFieldUrlKey2"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible2"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu2"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage2"/>
+        <!-- Go to storefront cms page, assert cms content -->
+        <amOnPage url="{{simpleCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
+        <waitForPageLoad stepKey="wait6" />
+        <!--see widget on Storefront-->
+        <see userInput="Hello TinyMCE3!" stepKey="seeContent2"/>
+        <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tinymce3/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php b/app/code/Magento/Tinymce3/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php
deleted file mode 100644
index 00c7cc18d1655..0000000000000
--- a/app/code/Magento/Tinymce3/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Tinymce3\Ui\DataProvider\Category\Form\Modifier;
-
-use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Ui\DataProvider\Modifier\WysiwygModifierInterface;
-
-class WysiwygConfigModifier implements ModifierInterface
-{
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function modifyData(array $data)
-    {
-        return $data;
-    }
-
-    /**
-     * @param array $meta
-     * @return array
-     */
-    public function modifyMeta(array $meta)
-    {
-        $tinymceThreeSettings = [
-            'add_variables' => false,
-            'add_widgets' => false,
-            'add_directives' => true
-        ];
-
-        $meta['content']['children']['description']['arguments']['data']['config']['wysiwygConfigData']
-            = $tinymceThreeSettings;
-
-        return $meta;
-    }
-}
diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json
index 4ab3e94151764..52e980052a87f 100644
--- a/app/code/Magento/Tinymce3/composer.json
+++ b/app/code/Magento/Tinymce3/composer.json
@@ -2,16 +2,18 @@
     "name": "magento/module-tinymce-3",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-ui": "*",
+        "magento/module-variable": "*",
+        "magento/module-widget": "*"
+
     },
     "suggest": {
-        "magento/module-cms": "100.3.*",
-        "magento/module-variable": "100.3.*"
+        "magento/module-cms": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
index fdbca79621704..53ab66c7ef21f 100644
--- a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
+++ b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
@@ -7,28 +7,46 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Ui\Component\Wysiwyg\ConfigInterface" type="Magento\Cms\Model\Wysiwyg\Config"/>
-    <virtualType name="UiModifierPool" type="Magento\Ui\DataProvider\Modifier\Pool">
+    <type name="Magento\Widget\Model\Widget">
+        <plugin name="change_widget_placeholder" type="Magento\Tinymce3\Model\Plugin\Widget" />
+    </type>
+    <type name="Magento\Cms\Model\Wysiwyg\CompositeConfigProvider">
         <arguments>
-            <argument name="modifiers" xsi:type="array">
-                <item name="wysiwyg-tmce3" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Tinymce3\Ui\DataProvider\Category\Form\Modifier\WysiwygConfigModifier</item>
-                    <item name="sortOrder" xsi:type="number">10</item>
-                </item>
+            <argument name="wysiwygConfigPostProcessor" xsi:type="array">
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Wysiwyg\Config</item>
+            </argument>
+            <argument name="variablePluginConfigProvider" xsi:type="array">
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Variable\Config</item>
+            </argument>
+            <argument name="widgetPluginConfigProvider" xsi:type="array">
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Widget\Config</item>
+            </argument>
+            <argument name="galleryConfigProvider" xsi:type="array">
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Gallery\Config</item>
             </argument>
         </arguments>
-    </virtualType>
-    <type name="Magento\Catalog\Model\Category\DataProvider">
+    </type>
+    <type name="Magento\Tinymce3\Model\Config\Widget\PlaceholderImagesPool">
         <arguments>
-            <argument name="pool" xsi:type="object">UiModifierPool</argument>
+            <argument name="widgetPlaceholders" xsi:type="array">
+                <item name="Magento\Catalog\Block\Product\Widget\NewWidget" xsi:type="string">Magento_Tinymce3::images/catalog/product_widget_new.png</item>
+                <item name="Magento\Catalog\Block\Product\Widget\Link" xsi:type="string">Magento_Tinymce3::images/catalog/product_widget_link.png</item>
+                <item name="Magento\Catalog\Block\Category\Widget\Link" xsi:type="string">Magento_Tinymce3::images/catalog/category_widget_link.png</item>
+                <item name="Magento\Catalog\Block\Widget\RecentlyCompared" xsi:type="string">Magento_Tinymce3::images/catalog/product_widget_compared.png</item>
+                <item name="Magento\Catalog\Block\Widget\RecentlyViewed" xsi:type="string">Magento_Tinymce3::images/catalog/product_widget_viewed.png</item>
+                <item name="Magento\Cms\Block\Widget\Page\Link" xsi:type="string">Magento_Tinymce3::images/cms/widget_page_link.png</item>
+                <item name="Magento\Cms\Block\Widget\Block" xsi:type="string">Magento_Tinymce3::images/cms/widget_block.png</item>
+            </argument>
         </arguments>
     </type>
-    <type name="Magento\Cms\Model\Wysiwyg\Config">
-        <plugin name="add_tmce3_css" type="Magento\Tinymce3\Model\Plugin\Wysiwyg\Config" sortOrder="10" />
-    </type>
     <type name="Magento\Cms\Model\Config\Source\Wysiwyg\Editor">
-        <plugin name="change_tinymce_label" type="Magento\Tinymce3\Model\Config\Source\Wysiwyg\EditorPlugin" />
-    </type>
-    <type name="Magento\Variable\Model\Variable\Config">
-        <plugin name="change_variable_plugin" type="Magento\Tinymce3\Model\Plugin\Variable\Config" />
+        <arguments>
+            <argument name="adapterOptions" xsi:type="array">
+                <item name="tinymce3" xsi:type="array">
+                    <item name="value" xsi:type="const">Magento\Tinymce3\Model\Config\Source\Wysiwyg\Editor::WYSIWYG_EDITOR_CONFIG_VALUE</item>
+                    <item name="label" xsi:type="string" translatable="true">TinyMCE 3 (deprecated)</item>
+                </item>
+            </argument>
+        </arguments>
     </type>
 </config>
diff --git a/app/code/Magento/Tinymce3/etc/di.xml b/app/code/Magento/Tinymce3/etc/di.xml
new file mode 100644
index 0000000000000..e03d865ce4e01
--- /dev/null
+++ b/app/code/Magento/Tinymce3/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Ui\Block\Wysiwyg\ActiveEditor">
+        <arguments>
+            <argument name="availableAdapterPaths" xsi:type="array">
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string"/>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Tinymce3/etc/module.xml b/app/code/Magento/Tinymce3/etc/module.xml
index add50fbd609e1..5180aa2ed4cb4 100644
--- a/app/code/Magento/Tinymce3/etc/module.xml
+++ b/app/code/Magento/Tinymce3/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Tinymce3" setup_version="1.0.0"/>
+    <module name="Magento_Tinymce3" />
 </config>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/category_widget_link_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/category_widget_link.png
similarity index 100%
rename from app/code/Magento/Catalog/view/adminhtml/web/images/category_widget_link_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/category_widget_link.png
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_compared2_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_compared.png
similarity index 100%
rename from app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_compared2_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_compared.png
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_link_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_link.png
similarity index 100%
rename from app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_link_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_link.png
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_new_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_new.png
similarity index 100%
rename from app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_new_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_new.png
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_viewed_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_viewed.png
similarity index 100%
rename from app/code/Magento/Catalog/view/adminhtml/web/images/product_widget_viewed_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/catalog/product_widget_viewed.png
diff --git a/app/code/Magento/Cms/view/adminhtml/web/images/widget_block_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/cms/widget_block.png
similarity index 100%
rename from app/code/Magento/Cms/view/adminhtml/web/images/widget_block_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/cms/widget_block.png
diff --git a/app/code/Magento/Cms/view/adminhtml/web/images/widget_page_link_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/cms/widget_page_link.png
similarity index 100%
rename from app/code/Magento/Cms/view/adminhtml/web/images/widget_page_link_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/cms/widget_page_link.png
diff --git a/app/code/Magento/Widget/view/adminhtml/web/placeholder_tinymce3.png b/app/code/Magento/Tinymce3/view/adminhtml/web/images/widget/placeholder.png
similarity index 100%
rename from app/code/Magento/Widget/view/adminhtml/web/placeholder_tinymce3.png
rename to app/code/Magento/Tinymce3/view/adminhtml/web/images/widget/placeholder.png
diff --git a/app/code/Magento/Tinymce3/view/adminhtml/web/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/app/code/Magento/Tinymce3/view/adminhtml/web/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
index 560a60e98bc83..f332d4c88c615 100644
--- a/app/code/Magento/Tinymce3/view/adminhtml/web/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
+++ b/app/code/Magento/Tinymce3/view/adminhtml/web/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated use lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js instead
+ */
 /* global tinyMCE, tinymce, MagentovariablePlugin */
 /* eslint-disable strict */
 tinyMCE.addI18n({
diff --git a/app/code/Magento/Tinymce3/view/base/requirejs-config.js b/app/code/Magento/Tinymce3/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..f96cf7d4f720d
--- /dev/null
+++ b/app/code/Magento/Tinymce3/view/base/requirejs-config.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    shim: {
+        'Magento_Tinymce3/tiny_mce/tiny_mce_src': {
+            'exports': 'tinymce'
+        }
+    },
+    map: {
+        '*': {
+            'tinymceDeprecated': 'Magento_Tinymce3/tiny_mce/tiny_mce_src'
+        }
+    }
+};
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js
index 51fa311525862..784042988c0ef 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/ControlManager.js
@@ -45,7 +45,7 @@
 		},
 
 		/**
-		 * Returns a control by id or undefined it it wasn't found.
+		 * Returns a control by id or undefined it wasn't found.
 		 *
 		 * @method get
 		 * @param {String} id Control instance name.
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
index 0cbca75ec504b..f74282afd32a6 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
@@ -445,7 +445,7 @@
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;
@@ -1856,7 +1856,7 @@
 				}
 			};
 
-			// Applies formatting to the caret postion
+			// Applies formatting to the caret position
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;
 
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js
index 783dbea1cacb9..eb8b4b7ab5d78 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js
@@ -1106,7 +1106,7 @@
 
 		/**
 		 * Returns a unique id. This can be useful when generating elements on the fly.
-		 * This method will not check if the element allready exists.
+		 * This method will not check if the element already exists.
 		 *
 		 * @method uniqueId
 		 * @param {String} p Optional prefix to add infront of all ids defaults to "mce_".
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js
index edf1e13a4e3bc..60c5565d72a99 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Styles.js
@@ -79,7 +79,7 @@ tinymce.html.Styles = function(settings, schema) {
 			function compress(prefix, suffix) {
 				var top, right, bottom, left;
 
-				// Get values and check it it needs compressing
+				// Get values and check it needs compressing
 				top = styles[prefix + '-top' + suffix];
 				if (!top)
 					return;
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
index 2abfac6478a0a..f37607f73270b 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Writer.js
@@ -110,7 +110,7 @@ tinymce.html.Writer = function(settings) {
 		 *
 		 * @method text
 		 * @param {String} text String to write out.
-		 * @param {Boolean} raw Optional raw state if true the contents wont get encoded.
+		 * @param {Boolean} raw Optional raw state if true the contents won't get encoded.
 		 */
 		text: function(text, raw) {
 			if (text.length > 0)
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
index 31bcb419fb178..c147e4d8f87d5 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -20,14 +20,14 @@
  * 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
  * on the client computer. Data stored in the localStorage area has no expiration date, so we must
  * manage expiring the data ourselves.  localStorage is fully supported by IE8, and it is supposed
- * to be working in Firefox 3 and Safari 3.2, but in reality is is flaky in those browsers.  As
+ * to be working in Firefox 3 and Safari 3.2, but in reality it is flaky in those browsers.  As
  * HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
  * localStorage is stored in the following folder:
  * C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
  * 
  * 2. sessionStorage - A new feature of HTML 5, sessionStorage works similarly to localStorage,
  * except it is designed to expire after a certain amount of time.  Because the specification
- * around expiration date/time is very loosely-described, it is preferrable to use locaStorage and
+ * around expiration date/time is very loosely-described, it is preferable to use locaStorage and
  * manage the expiration ourselves.  sessionStorage has similar storage characteristics to
  * localStorage, although it seems to have better support by Firefox 3 at the moment.  (That will
  * certainly change as Firefox continues getting better at HTML 5 adoption.)
@@ -297,7 +297,7 @@
 		},
 
 		/**
-		 * This method will store the current contents in the the storage engine.
+		 * This method will store the current contents in the storage engine.
 		 *
 		 * @method storeDraft
 		 */
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
index edc1e776e5524..bd805e6370274 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/example/editor_plugin_src.js
@@ -49,7 +49,7 @@
 		},
 
 		/**
-		 * Creates control instances based in the incomming name. This method is normally not
+		 * Creates control instances based in the incoming name. This method is normally not
 		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
 		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
 		 * method can be used to create those.
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js
index cec4abf98727a..db89eccc4e7ef 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -207,7 +207,7 @@
 					sel.setRng(oldRng);
 					sel.setContent('');
 
-					// For some odd reason we need to detach the the mceInsertContent call from the paste event
+					// For some odd reason we need to detach the mceInsertContent call from the paste event
 					// It's like IE has a reference to the parent element that you paste in and the selection gets messed up
 					// when it tries to restore the selection
 					setTimeout(function() {
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
index b16d0e3ffdbb4..2d9d859caa6fa 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
@@ -1731,7 +1731,7 @@ tinymce.html.Styles = function(settings, schema) {
 			function compress(prefix, suffix) {
 				var top, right, bottom, left;
 
-				// Get values and check it it needs compressing
+				// Get values and check it needs compressing
 				top = styles[prefix + '-top' + suffix];
 				if (!top)
 					return;
@@ -14451,7 +14451,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;
@@ -15682,7 +15682,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}
 			};
 
-			// Applies formatting to the caret postion
+			// Applies formatting to the caret position
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;
 
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
index 1c7b76cf75c8b..aaa207da3e4a9 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
@@ -1483,7 +1483,7 @@ tinymce.html.Styles = function(settings, schema) {
 			function compress(prefix, suffix) {
 				var top, right, bottom, left;
 
-				// Get values and check it it needs compressing
+				// Get values and check it needs compressing
 				top = styles[prefix + '-top' + suffix];
 				if (!top)
 					return;
@@ -15301,7 +15301,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;
@@ -16532,7 +16532,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}
 			};
 			
-			// Applies formatting to the caret postion
+			// Applies formatting to the caret position
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;
 
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
index a1ce5c5d8c32f..8448152ed5d2f 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
@@ -1456,7 +1456,7 @@ tinymce.html.Styles = function(settings, schema) {
 			function compress(prefix, suffix) {
 				var top, right, bottom, left;
 
-				// Get values and check it it needs compressing
+				// Get values and check it needs compressing
 				top = styles[prefix + '-top' + suffix];
 				if (!top)
 					return;
@@ -15275,7 +15275,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					childCount = getChildCount(node);
 
 					// Remove empty nodes but only if there is multiple wrappers and they are not block
-					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
 					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;
@@ -16506,7 +16506,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}
 			};
 
-			// Applies formatting to the caret postion
+			// Applies formatting to the caret position
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;
 
diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
index a98f6a01e1d13..bb3300baf988a 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated use lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js instead
+ */
 /* global varienGlobalEvents, tinyMceEditors, MediabrowserUtility, closeEditorPopup, Base64 */
 /* eslint-disable strict */
 define([
@@ -34,7 +37,15 @@ define([
             this.config = config;
             this.schema = config.schema || html5Schema;
 
-            _.bindAll(this, 'beforeSetContent', 'saveContent', 'onChangeContent', 'openFileBrowser', 'updateTextArea');
+            _.bindAll(
+                this,
+                'beforeSetContent',
+                'saveContent',
+                'onChangeContent',
+                'openFileBrowser',
+                'updateTextArea',
+                'removeEvents'
+            );
 
             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
             varienGlobalEvents.attachEventHandler('tinymceBeforeSetContent', this.beforeSetContent);
@@ -69,6 +80,17 @@ define([
             tinyMCE3.init(this.getSettings(mode));
         },
 
+        /**
+         * Remove events from instance.
+         *
+         * @param {String} wysiwygId
+         */
+        removeEvents: function (wysiwygId) {
+            var editor = tinyMceEditors.get(wysiwygId);
+
+            varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
+        },
+
         /**
          * @param {*} mode
          * @return {Object}
@@ -132,6 +154,10 @@ define([
 
                     ed.onInit.add(self.onEditorInit.bind(self));
 
+                    ed.onInit.add(function (editor) {
+                        varienGlobalEvents.fireEvent('wysiwygEditorInitialized', editor);
+                    });
+
                     ed.onSubmit.add(function (edi, e) {
                         varienGlobalEvents.fireEvent('tinymceSubmit', e);
                     });
@@ -244,6 +270,13 @@ define([
             return tinyMCE3.get(id);
         },
 
+        /**
+         * @return {String|null}
+         */
+        getId: function () {
+            return this.id || (this.activeEditor() ? this.activeEditor().id : null) || tinyMceEditors.values()[0].id;
+        },
+
         /**
          * @return {Object}
          */
@@ -261,6 +294,35 @@ define([
             this.activeEditor().execCommand('mceInsertContent', typeof ui !== 'undefined' ? ui : false, content);
         },
 
+        /**
+         * Set the status of the toolbar to disabled or enabled (true for enabled, false for disabled)
+         * @param {Boolean} enabled
+         */
+        setToolbarStatus: function (enabled) {
+            _.each(this.activeEditor().controlManager.controls, function (property, index, controls) {
+                controls[property.id].setDisabled(!enabled);
+            });
+        },
+
+        /**
+         * Set the status of the editor and toolbar
+         *
+         * @param {Boolean} enabled
+         */
+        setEnabledStatus: function (enabled) {
+            if (this.activeEditor()) {
+                this.activeEditor().getBody().setAttribute('contenteditable', enabled);
+                this.activeEditor().readonly = !enabled;
+                this.setToolbarStatus(enabled);
+            }
+
+            if (enabled) {
+                this.getTextArea().removeProp('disabled');
+            } else {
+                this.getTextArea().prop('disabled', 'disabled');
+            }
+        },
+
         /**
          * Set caret location in WYSIWYG editor.
          *
@@ -279,7 +341,7 @@ define([
                 storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
                 frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]'),
                 wUrl = this.config['files_browser_window_url'] +
-                    'target_element_id/' + this.id + '/' +
+                    'target_element_id/' + this.getId() + '/' +
                     'store/' + storeId + '/';
 
             this.mediaBrowserOpener = o.win;
@@ -331,14 +393,14 @@ define([
          * @return {jQuery|*|HTMLElement}
          */
         getToggleButton: function () {
-            return $('toggle' + this.id);
+            return $('toggle' + this.getId());
         },
 
         /**
          * Get plugins button.
          */
         getPluginButtons: function () {
-            return $$('#buttons' + this.id + ' > button.plugin');
+            return jQuery('#buttons' + this.getId() + ' > button.plugin');
         },
 
         /**
@@ -350,11 +412,9 @@ define([
 
             this.setup(mode);
 
-            tinyMCE3.execCommand('mceAddControl', false, this.id);
+            tinyMCE3.execCommand('mceAddControl', false, this.getId());
 
-            this.getPluginButtons().each(function (e) {
-                e.hide();
-            });
+            this.getPluginButtons().hide();
 
             return this;
         },
@@ -365,11 +425,9 @@ define([
         turnOff: function () {
             this.closePopups();
 
-            tinyMCE3.execCommand('mceRemoveControl', false, this.id);
+            tinyMCE3.execCommand('mceRemoveControl', false, this.getId());
 
-            this.getPluginButtons().each(function (e) {
-                e.show();
-            });
+            this.getPluginButtons().show();
 
             return this;
         },
@@ -380,8 +438,8 @@ define([
         closePopups: function () {
             if (typeof closeEditorPopup == 'function') {
                 // close all popups to avoid problems with updating parent content area
-                closeEditorPopup('widget_window' + this.id);
-                closeEditorPopup('browser_window' + this.id);
+                closeEditorPopup('widget_window' + this.getId());
+                closeEditorPopup('browser_window' + this.getId());
             }
         },
 
@@ -389,7 +447,7 @@ define([
          * @return {Boolean}
          */
         toggle: function () {
-            if (!tinyMCE3.get(this.id)) {
+            if (!tinyMCE3.get(this.getId())) {
                 this.turnOn();
 
                 return true;
@@ -415,8 +473,8 @@ define([
          * On form validation.
          */
         onFormValidation: function () {
-            if (tinyMCE3.get(this.id)) {
-                $(this.id).value = tinyMCE3.get(this.id).getContent();
+            if (tinyMCE3.get(this.getId())) {
+                $(this.getId()).value = tinyMCE3.get(this.getId()).getContent();
             }
         },
 
@@ -444,25 +502,30 @@ define([
          * @param {String} directive
          */
         makeDirectiveUrl: function (directive) {
-            return this.config['directives_url'].replace('directive', 'directive/___directive/' + directive);
+            return this.config['directives_url']
+                .replace(/directive/, 'directive/___directive/' + directive)
+                .replace(/\/$/, '');
         },
 
         /**
+         * Convert {{directive}} style attributes syntax to absolute URLs
          * @param {Object} content
          * @return {*}
          */
         encodeDirectives: function (content) {
             // collect all HTML tags with attributes that contain directives
-            return content.gsub(/<([a-z0-9\-\_]+.+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".*?)>/i, function (match) {
-                var attributesString = match[2];
+            return content.gsub(/<([a-z0-9\-\_]+[^>]+?)([a-z0-9\-\_]+="[^"]*?\{\{.+?\}\}.*?".*?)>/i, function (match) {
+                var attributesString = match[2],
+                    decodedDirectiveString;
 
                 // process tag attributes string
                 attributesString = attributesString.gsub(/([a-z0-9\-\_]+)="(.*?)(\{\{.+?\}\})(.*?)"/i, function (m) {
-                    return m[1] + '="' + m[2] + this.makeDirectiveUrl(Base64.mageEncode(m[3])) + m[4] + '"';
+                    decodedDirectiveString = encodeURIComponent(Base64.mageEncode(m[3].replace(/&quot;/g, '"')));
+
+                    return m[1] + '="' + m[2] + this.makeDirectiveUrl(decodedDirectiveString) + m[4] + '"';
                 }.bind(this));
 
                 return '<' + match[1] + attributesString + '>';
-
             }.bind(this));
         },
 
@@ -473,16 +536,13 @@ define([
         encodeWidgets: function (content) {
             return content.gsub(/\{\{widget(.*?)\}\}/i, function (match) {
                 var attributes = this.parseAttributesString(match[1]),
-                    imageSrc, imageHtml;
+                    imageSrc,
+                    imageHtml;
 
                 if (attributes.type) {
                     attributes.type = attributes.type.replace(/\\\\/g, '\\');
                     imageSrc = this.config['widget_placeholders'][attributes.type];
 
-                    if (imageSrc !== undefined) {
-                        imageSrc = imageSrc.replace(new RegExp('\.png|\.gif'), '_tinymce3.png');
-                    }
-
                     imageHtml = '<img';
                     imageHtml += ' id="' + Base64.idEncode(match[0]) + '"';
                     imageHtml += ' src="' + imageSrc + '"';
@@ -496,16 +556,23 @@ define([
         },
 
         /**
+         * Convert absolute URLs to {{directive}} style attributes syntax
          * @param {Object} content
          * @return {*}
          */
         decodeDirectives: function (content) {
-            // escape special chars in directives url to use it in regular expression
-            var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
-                reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)'));
-
-            return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
-                return Base64.mageDecode(match[1]);
+            var directiveUrl = this.makeDirectiveUrl('%directive%').split('?')[0], // remove query string from directive
+                // escape special chars in directives url to use in regular expression
+                regexEscapedDirectiveUrl = directiveUrl.replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
+                regexDirectiveUrl = regexEscapedDirectiveUrl
+                    .replace(
+                        '%directive%',
+                        '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+\/?)(?:(?!").)*'
+                    ) + '/?(\\\\?[^"]*)?', // allow optional query string
+                reg = new RegExp(regexDirectiveUrl);
+
+            return content.gsub(reg, function (match) {
+                return Base64.mageDecode(decodeURIComponent(match[1]).replace(/\/$/, '')).replace(/"/g, '&quot;');
             });
         },
 
@@ -518,18 +585,12 @@ define([
                 var attributes = this.parseAttributesString(match[1]),
                     widgetCode;
 
-                if (attributes.src.indexOf('_tinymce3.png') === -1) {
-                    attributes.src = attributes.src.replace(new RegExp('\.png|\.gif'), '_tinymce3.png');
-                }
-
                 if (attributes.id) {
                     widgetCode = Base64.idDecode(attributes.id);
 
                     if (widgetCode.indexOf('{{widget') !== -1) {
                         return widgetCode;
                     }
-
-                    return match[0];
                 }
 
                 return match[0];
@@ -557,7 +618,7 @@ define([
          * Update text area.
          */
         updateTextArea: function () {
-            var editor = tinyMCE3.get(this.id),
+            var editor = tinyMCE3.get(this.getId()),
                 content;
 
             if (!editor) {
@@ -567,7 +628,14 @@ define([
             content = editor.getContent();
             content = this.decodeContent(content);
 
-            jQuery('#' + this.id).val(content).trigger('change');
+            this.getTextArea().val(content).trigger('change');
+        },
+
+        /**
+         * @return {Object} jQuery textarea element
+         */
+        getTextArea: function () {
+            return jQuery('#' + this.getId());
         },
 
         /**
@@ -618,15 +686,6 @@ define([
             o.content = this.decodeContent(o.content);
         },
 
-        /**
-         * Return the content stored in the WYSIWYG field
-         * @param {String} id
-         * @return {String}
-         */
-        getContent: function (id) {
-            return id ? this.get(id).getContent() : this.activeEditor().getContent();
-        },
-
         /**
          * @returns {Object}
          */
diff --git a/app/code/Magento/Translation/Block/Html/Head/Config.php b/app/code/Magento/Translation/Block/Html/Head/Config.php
index 20a67409212e1..422564abfbc7b 100644
--- a/app/code/Magento/Translation/Block/Html/Head/Config.php
+++ b/app/code/Magento/Translation/Block/Html/Head/Config.php
@@ -34,7 +34,6 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
 
     /**
      * @param \Magento\Framework\View\Element\Context $context
-     * @param RequireJsConfig $config
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Translation\Model\FileManager $fileManager
      * @param Inline $inline
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
index 4f4873feed2aa..86bb416524d8f 100644
--- a/app/code/Magento/Translation/Block/Js.php
+++ b/app/code/Magento/Translation/Block/Js.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\View\Element\Template;
 use Magento\Translation\Model\Js\Config;
+use Magento\Framework\Escaper;
 
 /**
  * @api
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
index b4a541f2579c0..387173f6de0ba 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/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index 06da0c7c0af05..7aad7c765bcd5 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -113,7 +113,8 @@ public function getData($themePath)
                     }
                 } catch (\Exception $e) {
                     throw new LocalizedException(
-                        sprintf(__('Error while translating phrase "%s" in file %s.'), $phrase, $filePath[0])
+                        __('Error while translating phrase "%s" in file %s.', $phrase, $filePath[0]),
+                        $e
                     );
                 }
             }
@@ -145,7 +146,7 @@ protected function getPhrases($content)
             }
             if (false === $result) {
                 throw new LocalizedException(
-                    sprintf(__('Error while generating js translation dictionary: "%s"'), error_get_last())
+                    __('Error while generating js translation dictionary: "%s"', error_get_last())
                 );
             }
         }
diff --git a/app/code/Magento/Translation/Model/Json/PreProcessor.php b/app/code/Magento/Translation/Model/Json/PreProcessor.php
index e503140adace8..5d46c3c8b0618 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/Setup/InstallSchema.php b/app/code/Magento/Translation/Setup/InstallSchema.php
deleted file mode 100644
index 5dd180ecd3cbf..0000000000000
--- a/app/code/Magento/Translation/Setup/InstallSchema.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Translation\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'translation'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('translation'))
-            ->addColumn(
-                'key_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                [
-                    'identity' => true,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'primary'  => true,
-                ],
-                'Key Id of Translation'
-            )->addColumn(
-                'string',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [
-                    'nullable' => false,
-                    'default' => 'Translate String',
-                ],
-                'Translation String'
-            )->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                [
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'default'  => '0',
-                ],
-                'Store Id'
-            )->addColumn(
-                'translate',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Translate'
-            )->addColumn(
-                'locale',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                20,
-                [
-                    'nullable' => false,
-                    'default'  => 'en_US',
-                ],
-                'Locale'
-            )->addColumn(
-                'crc_string',
-                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-                null,
-                [
-                    'nullable' => false,
-                    'default'  => crc32('Translate String')
-                ],
-                'Translation String CRC32 Hash'
-            )->addIndex(
-                $installer->getIdxName(
-                    'translation',
-                    ['store_id', 'locale', 'crc_string', 'string'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['store_id', 'locale', 'crc_string', 'string'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )->addForeignKey(
-                $installer->getFkName('translation', 'store_id', 'store', 'store_id'),
-                'store_id',
-                $installer->getTable('store'),
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )->setComment('Translations');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Translation/Test/Mftf/LICENSE.txt b/app/code/Magento/Translation/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Mftf/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/Translation/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Translation/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Mftf/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/Translation/Test/Mftf/README.md b/app/code/Magento/Translation/Test/Mftf/README.md
new file mode 100644
index 0000000000000..99e8bd0e13ab3
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Translation Functional Tests
+
+The Functional Test Module for **Magento Translation** module.
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/ConfigTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/ConfigTest.php
index cac7a67b02ae8..c43198c406638 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/ConfigTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/ConfigTest.php
@@ -57,7 +57,7 @@ public function testDictionaryEnabled()
         $this->assertTrue($this->model->dictionaryEnabled());
     }
 
-    public function testgetPatterns()
+    public function testGetPatterns()
     {
         $this->assertEquals($this->patterns, $this->model->getPatterns());
     }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
index 26ea51babc591..021709bdda1f6 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Test\Unit\Model\Js;
 
 use Magento\Framework\App\State;
@@ -148,4 +149,39 @@ public function testGetData()
 
         $this->assertEquals($expectedResult, $this->model->getData($themePath));
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testGetDataThrowingException()
+    {
+        $themePath = 'blank';
+        $areaCode = 'adminhtml';
+
+        $patterns = ['~\$\.mage\.__\(([\'"])(.+?)\1\)~'];
+
+        $this->fileReadMock->expects($this->once())
+            ->method('readAll')
+            ->willReturn('content1$.mage.__("hello1")content1');
+
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn($areaCode);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getJsFiles')
+            ->willReturn(['test']);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getStaticHtmlFiles')
+            ->willReturn(['test']);
+
+        $this->configMock->expects($this->any())
+            ->method('getPatterns')
+            ->willReturn($patterns);
+
+        $this->translateMock->expects($this->once())
+            ->method('render')
+            ->willThrowException(new \Exception('Test exception'));
+
+        $this->model->getData($themePath);
+    }
 }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php b/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
index 0a575474f5f85..d9340e03dc996 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/composer.json b/app/code/Magento/Translation/composer.json
index 2fc619e36bce8..ac2ddfc4a663c 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-developer": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-developer": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-deploy": "100.3.*"
+        "magento/module-deploy": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Translation/etc/adminhtml/system.xml b/app/code/Magento/Translation/etc/adminhtml/system.xml
index 8c3cdc5c39916..ab854f8a4db52 100644
--- a/app/code/Magento/Translation/etc/adminhtml/system.xml
+++ b/app/code/Magento/Translation/etc/adminhtml/system.xml
@@ -9,7 +9,7 @@
     <system>
         <section id="dev">
             <group id="js">
-                <field id="translate_strategy" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="translate_strategy" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Translation Strategy</label>
                     <source_model>Magento\Translation\Model\Js\Config\Source\Strategy</source_model>
                     <comment>Please put your store into maintenance mode and redeploy static files after changing strategy</comment>
diff --git a/app/code/Magento/Translation/etc/db_schema.xml b/app/code/Magento/Translation/etc/db_schema.xml
new file mode 100644
index 0000000000000..a0d08467acf06
--- /dev/null
+++ b/app/code/Magento/Translation/etc/db_schema.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="translation" resource="default" engine="innodb" comment="Translations">
+        <column xsi:type="int" name="key_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Key Id of Translation"/>
+        <column xsi:type="varchar" name="string" nullable="false" length="255" default="Translate String"
+                comment="Translation String"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="varchar" name="translate" nullable="true" length="255" comment="Translate"/>
+        <column xsi:type="varchar" name="locale" nullable="false" length="20" default="en_US" comment="Locale"/>
+        <column xsi:type="bigint" name="crc_string" padding="20" unsigned="false" nullable="false" identity="false"
+                default="1591228201" comment="Translation String CRC32 Hash"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="key_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TRANSLATION_STORE_ID_STORE_STORE_ID" table="translation" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="TRANSLATION_STORE_ID_LOCALE_CRC_STRING_STRING">
+            <column name="store_id"/>
+            <column name="locale"/>
+            <column name="crc_string"/>
+            <column name="string"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/Translation/etc/db_schema_whitelist.json b/app/code/Magento/Translation/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..975b1af9bcbbc
--- /dev/null
+++ b/app/code/Magento/Translation/etc/db_schema_whitelist.json
@@ -0,0 +1,17 @@
+{
+    "translation": {
+        "column": {
+            "key_id": true,
+            "string": true,
+            "store_id": true,
+            "translate": true,
+            "locale": true,
+            "crc_string": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "TRANSLATION_STORE_ID_STORE_STORE_ID": true,
+            "TRANSLATION_STORE_ID_LOCALE_CRC_STRING_STRING": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index c10619fbf74ae..6d3ca03953cf9 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -67,6 +67,7 @@
                 <item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
                 <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
                 <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
+                <item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Translation/etc/module.xml b/app/code/Magento/Translation/etc/module.xml
index f45ddeb28a8ec..23ebfe1b0751d 100644
--- a/app/code/Magento/Translation/etc/module.xml
+++ b/app/code/Magento/Translation/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Translation" setup_version="2.0.0">
+    <module name="Magento_Translation" >
     </module>
 </config>
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
index 780520c0a9687..c8366037e2294 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -9,50 +9,19 @@
 /** @var \Magento\Translation\Block\Js $block */
 ?>
 <?php if ($block->dictionaryEnabled()): ?>
-    <script>
-        require.config({
-            deps: [
-                'jquery',
-                'mage/translate',
-                'jquery/jquery-storageapi'
-            ],
-            callback: function ($) {
-                'use strict';
-
-                var dependencies = [],
-                    versionObj;
-
-                $.initNamespaceStorage('mage-translation-storage');
-                $.initNamespaceStorage('mage-translation-file-version');
-                versionObj = $.localStorage.get('mage-translation-file-version');
-
-                <?php $version = $block->getTranslationFileVersion(); ?>
-
-                if (versionObj.version !== '<?php $block->escapeJsQuote($version) ?>') {
-                    dependencies.push(
-                        'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
-                    );
 
+<?php
+  $version = $block->getTranslationFileVersion();
+  $fileName = Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
+?>
+    <script type="text/x-magento-init">
+        {
+            "*": {
+                "mage/translate-init": {
+                    "dictionaryFile": "text!<?= $block->escapeJs($fileName); ?>",
+                    "version": "<?= $block->escapeJs($version) ?>"
                 }
-
-                require.config({
-                    deps: dependencies,
-                    callback: function (string) {
-                        if (typeof string === 'string') {
-                            $.mage.translate.add(JSON.parse(string));
-                            $.localStorage.set('mage-translation-storage', string);
-                            $.localStorage.set(
-                                'mage-translation-file-version',
-                                {
-                                    version: '<?php $block->escapeJsQuote($version) ?>'
-                                }
-                            );
-                        } else {
-                            $.mage.translate.add($.localStorage.get('mage-translation-storage'));
-                        }
-                    }
-                });
             }
-        });
+        }
     </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
index 47ccaf5a33e57..b4b3ce0f8c554 100644
--- a/app/code/Magento/Translation/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js
@@ -7,7 +7,8 @@ var config = {
     map: {
         '*': {
             editTrigger: 'mage/edit-trigger',
-            addClass: 'Magento_Translation/add-class'
+            addClass: 'Magento_Translation/js/add-class',
+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
         }
     },
     deps: [
diff --git a/app/code/Magento/Translation/view/frontend/web/add-class.js b/app/code/Magento/Translation/view/frontend/web/js/add-class.js
similarity index 100%
rename from app/code/Magento/Translation/view/frontend/web/add-class.js
rename to app/code/Magento/Translation/view/frontend/web/js/add-class.js
diff --git a/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php b/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
index ac0af00f9682d..b6077b7b1625d 100644
--- a/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
+++ b/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
@@ -16,20 +16,34 @@
  */
 class ActiveEditor extends \Magento\Framework\View\Element\Template
 {
+    const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter';
+
     /**
      * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
     /**
+     * @var array
+     */
+    private $availableAdapterPaths;
+
+    /**
+     * ActiveEditor constructor.
      * @param Context $context
      * @param ScopeConfigInterface $scopeConfig
+     * @param array $availableAdapterPaths
      * @param array $data
      */
-    public function __construct(Context $context, ScopeConfigInterface $scopeConfig, array $data = [])
-    {
+    public function __construct(
+        Context $context,
+        ScopeConfigInterface $scopeConfig,
+        $availableAdapterPaths = [],
+        array $data = []
+    ) {
         parent::__construct($context, $data);
         $this->scopeConfig = $scopeConfig;
+        $this->availableAdapterPaths = $availableAdapterPaths;
     }
 
     /**
@@ -40,6 +54,9 @@ public function __construct(Context $context, ScopeConfigInterface $scopeConfig,
     public function getWysiwygAdapterPath()
     {
         $adapterPath = $this->scopeConfig->getValue(Model\Config::WYSIWYG_EDITOR_CONFIG_PATH);
+        if ($adapterPath !== self::DEFAULT_EDITOR_PATH && !isset($this->availableAdapterPaths[$adapterPath])) {
+            $adapterPath = self::DEFAULT_EDITOR_PATH;
+        }
         return $this->escapeHtml($adapterPath);
     }
 }
diff --git a/app/code/Magento/Ui/Component/Bookmark.php b/app/code/Magento/Ui/Component/Bookmark.php
index aa1d7a9fb5c0a..db824f11bd4b1 100644
--- a/app/code/Magento/Ui/Component/Bookmark.php
+++ b/app/code/Magento/Ui/Component/Bookmark.php
@@ -82,11 +82,11 @@ public function prepare()
             }
         }
 
-        $this->setData('config', array_replace_recursive($config, $this->getConfiguration($this)));
+        $this->setData('config', array_replace_recursive($config, $this->getConfiguration()));
 
         parent::prepare();
 
-        $jsConfig = $this->getConfiguration($this);
+        $jsConfig = $this->getConfiguration();
         $this->getContext()->addComponentDefinition($this->getComponentName(), $jsConfig);
     }
 }
diff --git a/app/code/Magento/Ui/Component/ExportButton.php b/app/code/Magento/Ui/Component/ExportButton.php
index 9d5f125839003..284362a119bad 100644
--- a/app/code/Magento/Ui/Component/ExportButton.php
+++ b/app/code/Magento/Ui/Component/ExportButton.php
@@ -54,11 +54,13 @@ public function getComponentName()
      */
     public function prepare()
     {
+        $context = $this->getContext();
         $config = $this->getData('config');
         if (isset($config['options'])) {
             $options = [];
             foreach ($config['options'] as $option) {
-                $option['url'] = $this->urlBuilder->getUrl($option['url']);
+                $additionalParams = $this->getAdditionalParams($config, $context);
+                $option['url'] = $this->urlBuilder->getUrl($option['url'], $additionalParams);
                 $options[] = $option;
             }
             $config['options'] = $options;
@@ -66,4 +68,25 @@ public function prepare()
         }
         parent::prepare();
     }
+
+    /**
+     * Get export button additional parameters
+     *
+     * @param array $config
+     * @param ContextInterface $context
+     * @return array
+     */
+    protected function getAdditionalParams($config, $context)
+    {
+        $additionalParams = [];
+        if (isset($config['additionalParams'])) {
+            foreach ($config['additionalParams'] as $paramName => $paramValue) {
+                if ('*' == $paramValue) {
+                    $paramValue = $context->getRequestParam($paramName);
+                }
+                $additionalParams[$paramName] = $paramValue;
+            }
+        }
+        return $additionalParams;
+    }
 }
diff --git a/app/code/Magento/Ui/Component/Filters.php b/app/code/Magento/Ui/Component/Filters.php
index 3085485521cd3..fe02c23af9c8a 100644
--- a/app/code/Magento/Ui/Component/Filters.php
+++ b/app/code/Magento/Ui/Component/Filters.php
@@ -82,7 +82,7 @@ public function update(UiComponentInterface $component)
                 return;
             }
 
-            if (isset($this->filterMap[$filterType])) {
+            if (isset($this->filterMap[$filterType]) && !isset($this->columnFilters[$component->getName()])) {
                 $filterComponent = $this->uiComponentFactory->create(
                     $component->getName(),
                     $this->filterMap[$filterType],
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Input.php b/app/code/Magento/Ui/Component/Filters/Type/Input.php
index cbcb33ffcca04..1fc132700c8a9 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Input.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Input.php
@@ -29,7 +29,7 @@ class Input extends AbstractFilter
      *
      * @return void
      */
-    public function prepare()
+    public function prepare(): void
     {
         $this->wrappedComponent = $this->uiComponentFactory->create(
             $this->getName(),
@@ -62,12 +62,12 @@ public function prepare()
      *
      * @return void
      */
-    protected function applyFilter()
+    protected function applyFilter(): void
     {
         if (isset($this->filterData[$this->getName()])) {
-            $value = $this->filterData[$this->getName()];
+            $value = str_replace(['%', '_'], ['\%', '\_'], $this->filterData[$this->getName()]);
 
-            if (!empty($value)) {
+            if ($value || $value === '0') {
                 $filter = $this->filterBuilder->setConditionType('like')
                     ->setField($this->getName())
                     ->setValue(sprintf('%%%s%%', $value))
diff --git a/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php b/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php
new file mode 100644
index 0000000000000..b1925b4641d0b
--- /dev/null
+++ b/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Component\Form\Element;
+
+use Magento\Ui\Model\ColorPicker\ColorModesProvider;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+
+/**
+ * Prepares Color Picker UI component with mode and format
+ *
+ * @api
+ */
+class ColorPicker extends AbstractElement
+{
+    const NAME = 'colorPicker';
+
+    const DEFAULT_MODE = 'full';
+
+    /**
+     * Provides color picker modes configuration
+     *
+     * @var ColorModesProvider
+     */
+    private $modesProvider;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param ColorModesProvider $modesProvider
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UiComponentInterface[] $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        ColorModesProvider $modesProvider,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->modesProvider = $modesProvider;
+        parent::__construct($context, $components, $data);
+    }
+
+    /**
+     * Get component name
+     *
+     * @return string
+     */
+    public function getComponentName(): string
+    {
+        return static::NAME;
+    }
+
+    /**
+     * Prepare component configuration
+     *
+     * @return void
+     */
+    public function prepare() : void
+    {
+        $modes = $this->modesProvider->getModes();
+        $colorPickerModeSetting = $this->getData('config/colorPickerMode');
+        $colorFormatSetting = $this->getData('config/colorFormat');
+        $colorPickerMode = $modes[$colorPickerModeSetting] ?? $modes[self::DEFAULT_MODE];
+        $colorPickerMode['preferredFormat'] = $colorFormatSetting;
+        $this->_data['config']['colorPickerConfig'] = $colorPickerMode;
+
+        parent::prepare();
+    }
+}
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
index c2460fd8385c1..d4b1937bd06ba 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media.php
@@ -31,14 +31,16 @@ public function prepare()
     {
         if ($this->getData('config/uploaderConfig/url')) {
             $url = $this->getContext()->getUrl($this->getData('config/uploaderConfig/url'), ['_secure' => true]);
+            $updateConfig = [
+                'uploaderConfig' => ['url' => $url]
+            ];
+            if (!isset($this->getConfiguration()['dataScope'])) {
+                $updateConfig['dataScope'] = $this->getName();
+            }
             $data = array_replace_recursive(
                 $this->getData(),
                 [
-                    'config' => [
-                        'uploaderConfig' => [
-                            'url' => $url
-                        ],
-                    ],
+                    'config' => $updateConfig,
                 ]
             );
             $this->setData($data);
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
new file mode 100644
index 0000000000000..aee81f65775bc
--- /dev/null
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Component\Form\Element\DataType\Media;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Ui\Component\Form\Element\DataType\Media;
+use Magento\Framework\File\Size;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
+
+/**
+ * Image Form UI Component
+ */
+class Image extends Media
+{
+    const NAME = 'image';
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Size
+     */
+    private $fileSize;
+
+    /**
+     * @param ContextInterface $context
+     * @param StoreManagerInterface $storeManager
+     * @param Size $fileSize
+     * @param UiComponentInterface[] $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        StoreManagerInterface $storeManager,
+        Size $fileSize,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->storeManager = $storeManager;
+        $this->fileSize = $fileSize;
+        parent::__construct($context, $components, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getComponentName()
+    {
+        return static::NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare()
+    {
+        // dynamically set max file size based on php ini config if not present in XML
+        $maxFileSize = min(array_filter([
+            $this->getConfiguration()['maxFileSize'] ?? 0,
+            $this->fileSize->getMaxFileSize()
+        ]));
+
+        $data = array_replace_recursive(
+            $this->getData(),
+            [
+                'config' => [
+                    'maxFileSize' => $maxFileSize,
+                    'mediaGallery' => [
+                        'openDialogUrl' => $this->getContext()->getUrl('cms/wysiwyg_images/index', ['_secure' => true]),
+                        'openDialogTitle' => $this->getConfiguration()['openDialogTitle'] ?? __('Insert Images...'),
+                        'initialOpenSubpath' => $this->getConfiguration()['initialMediaGalleryOpenSubpath'],
+                        'storeId' => $this->storeManager->getStore()->getId(),
+                    ],
+                ],
+            ]
+        );
+
+        $this->setData($data);
+        parent::prepare();
+    }
+}
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 0000000000000..0e0e25d02ffed
--- /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(): string
+    {
+        return static::NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare(): void
+    {
+        $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/Component/Form/Element/Wysiwyg.php b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
index c79dfb3f5cf8e..d39d2dc3cd930 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
@@ -13,6 +13,8 @@
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
 /**
+ * WYSIWYG form element
+ *
  * @api
  * @since 100.1.0
  */
@@ -50,8 +52,9 @@ public function __construct(
     ) {
         $wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
         $this->form = $formFactory->create();
+        $wysiwygId = $context->getNamespace() . '_' . $data['name'];
         $this->editor = $this->form->addField(
-            $context->getNamespace() . '_' . $data['name'],
+            $wysiwygId,
             \Magento\Framework\Data\Form\Element\Editor::class,
             [
                 'force_load' => true,
@@ -62,6 +65,7 @@ public function __construct(
             ]
         );
         $data['config']['content'] = $this->editor->getElementHtml();
+        $data['config']['wysiwygId'] = $wysiwygId;
 
         parent::__construct($context, $components, $data);
     }
diff --git a/app/code/Magento/Ui/Component/Form/Field.php b/app/code/Magento/Ui/Component/Form/Field.php
index 48ca012f56953..e7a627743b63a 100644
--- a/app/code/Magento/Ui/Component/Form/Field.php
+++ b/app/code/Magento/Ui/Component/Form/Field.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Component\Form;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -73,7 +74,7 @@ public function prepare()
         $formElement = $this->getData('config/formElement');
         if (null === $formElement) {
             throw new LocalizedException(__(
-                'The configuration parameter "formElement" is a required for "%1" field.',
+                'The "formElement" configuration parameter is required for the "%1" field.',
                 $this->getName()
             ));
         }
diff --git a/app/code/Magento/Ui/Component/Form/Field/DefaultValue.php b/app/code/Magento/Ui/Component/Form/Field/DefaultValue.php
new file mode 100644
index 0000000000000..99c124e88787f
--- /dev/null
+++ b/app/code/Magento/Ui/Component/Form/Field/DefaultValue.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Component\Form\Field;
+
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/** Field class has dynamic default value based on  System Configuration path  */
+class DefaultValue extends \Magento\Ui\Component\Form\Field
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var string
+     */
+    private $path;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface $storeManager
+     */
+    private $storeManager;
+
+    /**
+     * DefaultValue constructor.
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param ScopeConfigInterface $scopeConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param string $path
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        ScopeConfigInterface $scopeConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        string $path = '',
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->path = $path;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare()
+    {
+        parent::prepare();
+        $store = $this->storeManager->getStore();
+        $this->_data['config']['default'] = $this->scopeConfig->getValue(
+            $this->path,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
+    }
+}
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset.php b/app/code/Magento/Ui/Component/Form/Fieldset.php
index 745068ca0fa8a..2525d0a4923c1 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset.php
@@ -5,13 +5,11 @@
  */
 namespace Magento\Ui\Component\Form;
 
-use Magento\Ui\Component\Container;
 use Magento\Ui\Component\AbstractComponent;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
+ * Fieldset UI Component.
+ *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs.php b/app/code/Magento/Ui/Component/Layout/Tabs.php
index 6449e10bf8d91..0d176d7241653 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs.php
@@ -5,18 +5,17 @@
  */
 namespace Magento\Ui\Component\Layout;
 
-use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
 use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
-use Magento\Framework\View\Element\UiComponent\LayoutInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Element\ComponentVisibilityInterface;
 use Magento\Ui\Component\Layout\Tabs\TabInterface;
 
 /**
  * Class Tabs
  */
-class Tabs extends \Magento\Framework\View\Layout\Generic implements LayoutInterface
+class Tabs extends \Magento\Framework\View\Layout\Generic
 {
     /**
      * @var string
@@ -89,58 +88,15 @@ protected function addChildren(array &$topNode, UiComponentInterface $component,
                 $this->addWrappedBlock($childComponent, $childrenAreas);
                 continue;
             }
+            if ($childComponent instanceof ComponentVisibilityInterface && !$childComponent->isComponentVisible()) {
+                continue;
+            }
 
             $name = $childComponent->getName();
             $config = $childComponent->getData('config');
             $collectedComponents[$name] = true;
-            if (isset($config['is_collection']) && $config['is_collection'] === true) {
-                $label = $childComponent->getData('config/label');
-                $this->component->getContext()->addComponentDefinition(
-                    'collection',
-                    [
-                        'component' => 'Magento_Ui/js/form/components/collection',
-                        'extends' => $this->namespace
-                    ]
-                );
-
-                /**
-                 * @var UiComponentInterface $childComponent
-                 * @var array $structure
-                 */
-                list($childComponent, $structure) = $this->prepareChildComponents($childComponent, $name);
-
-                $childrenStructure = $structure[$name]['children'];
-
-                $structure[$name]['children'] = [
-                    $name . '_collection' => [
-                        'type' => 'collection',
-                        'config' => [
-                            'active' => 1,
-                            'removeLabel' => __('Remove %1', $label),
-                            'addLabel' => __('Add New %1', $label),
-                            'removeMessage' => $childComponent->getData('config/removeMessage'),
-                            'itemTemplate' => 'item_template',
-                        ],
-                        'children' => [
-                            'item_template' => ['type' => $this->namespace,
-                                'isTemplate' => true,
-                                'component' => 'Magento_Ui/js/form/components/collection/item',
-                                'childType' => 'group',
-                                'config' => [
-                                    'label' => __('New %1', $label),
-                                ],
-                                'children' => $childrenStructure
-                            ]
-                        ]
-                    ]
-                ];
-            } else {
-                /**
-                 * @var UiComponentInterface $childComponent
-                 * @var array $structure
-                 */
-                list($childComponent, $structure) = $this->prepareChildComponents($childComponent, $name);
-            }
+
+            [$childComponent, $structure] = $this->buildChildComponentStructure($config, $childComponent);
 
             $tabComponent = $this->createTabComponent($childComponent, $name);
 
@@ -168,6 +124,67 @@ protected function addChildren(array &$topNode, UiComponentInterface $component,
         $topNode = $this->structure;
     }
 
+    /**
+     * Build child components structure of the tab
+     *
+     * @param array $config
+     * @param UiComponentInterface $childComponent
+     * @return array
+     */
+    private function buildChildComponentStructure(array $config, $childComponent): array
+    {
+        $name = $childComponent->getName();
+        if (isset($config['is_collection']) && $config['is_collection'] === true) {
+            $label = $childComponent->getData('config/label');
+            $this->component->getContext()->addComponentDefinition(
+                'collection',
+                [
+                    'component' => 'Magento_Ui/js/form/components/collection',
+                    'extends' => $this->namespace
+                ]
+            );
+            /**
+             * @var UiComponentInterface $childComponent
+             * @var array $structure
+             */
+            [$childComponent, $structure] = $this->prepareChildComponents($childComponent, $name);
+
+            $childrenStructure = $structure[$name]['children'];
+
+            $structure[$name]['children'] = [
+                $name . '_collection' => [
+                    'type' => 'collection',
+                    'config' => [
+                        'active' => 1,
+                        'removeLabel' => __('Remove %1', $label),
+                        'addLabel' => __('Add New %1', $label),
+                        'removeMessage' => $childComponent->getData('config/removeMessage'),
+                        'itemTemplate' => 'item_template',
+                    ],
+                    'children' => [
+                        'item_template' => ['type' => $this->namespace,
+                            'isTemplate' => true,
+                            'component' => 'Magento_Ui/js/form/components/collection/item',
+                            'childType' => 'group',
+                            'config' => [
+                                'label' => __('New %1', $label),
+                            ],
+                            'children' => $childrenStructure
+                        ]
+                    ]
+                ]
+            ];
+        } else {
+            /**
+             * @var UiComponentInterface $childComponent
+             * @var array $structure
+             */
+            [$childComponent, $structure] = $this->prepareChildComponents($childComponent, $name);
+        }
+
+        return [$childComponent, $structure];
+    }
+
     /**
      * Add wrapped layout block
      *
@@ -350,15 +367,21 @@ protected function initAreas()
     protected function addNavigationBlock()
     {
         $pageLayout = $this->component->getContext()->getPageLayout();
+
+        $navName = 'tabs_nav';
+        if ($pageLayout->hasElement($navName)) {
+            $navName = $this->component->getName() . '_tabs_nav';
+        }
+
         /** @var \Magento\Ui\Component\Layout\Tabs\Nav $navBlock */
         if (isset($this->navContainerName)) {
             $navBlock = $pageLayout->addBlock(
                 \Magento\Ui\Component\Layout\Tabs\Nav::class,
-                'tabs_nav',
+                $navName,
                 $this->navContainerName
             );
         } else {
-            $navBlock = $pageLayout->addBlock(\Magento\Ui\Component\Layout\Tabs\Nav::class, 'tabs_nav', 'content');
+            $navBlock = $pageLayout->addBlock(\Magento\Ui\Component\Layout\Tabs\Nav::class, $navName, 'content');
         }
         $navBlock->setTemplate('Magento_Ui::layout/tabs/nav/default.phtml');
         $navBlock->setData('data_scope', $this->namespace);
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
index 1c9916a941458..ad876b66b6038 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
@@ -11,6 +11,8 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
+ * Date format column
+ *
  * @api
  * @since 100.0.2
  */
@@ -47,6 +49,27 @@ public function __construct(
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function prepare()
+    {
+        $config = $this->getData('config');
+        $config['filter'] = [
+            'filterType' => 'dateRange',
+            'templates' => [
+                'date' => [
+                    'options' => [
+                        'dateFormat' => $this->timezone->getDateFormatWithLongYear()
+                    ]
+                ]
+            ]
+        ];
+        $this->setData('config', $config);
+
+        parent::prepare();
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index 6b089233c210a..a8ed5d901d860 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Component\MassAction;
 
 use Magento\Framework\Api\FilterBuilder;
@@ -95,17 +96,15 @@ public function getCollection(AbstractDb $collection)
 
         if ('false' !== $excluded) {
             if (!$isExcludedIdsValid && !$isSelectedIdsValid) {
-                throw new LocalizedException(__('Please select item(s).'));
+                throw new LocalizedException(__('An item needs to be selected. Select and try again.'));
             }
         }
-        /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $collection */
-        $idsArray = $this->getFilterIds();
-        if (!empty($idsArray)) {
-            $collection->addFieldToFilter(
-                $collection->getIdFieldName(),
-                ['in' => $idsArray]
-            );
-        }
+
+        $collection->addFieldToFilter(
+            $collection->getIdFieldName(),
+            ['in' => $this->getFilterIds()]
+        );
+
         return $collection;
     }
 
@@ -162,7 +161,7 @@ protected function applySelection(AbstractDb $collection)
             } elseif (is_array($selected) && !empty($selected)) {
                 $collection->addFieldToFilter($collection->getIdFieldName(), ['in' => $selected]);
             } else {
-                throw new LocalizedException(__('Please select item(s).'));
+                throw new LocalizedException(__('An item needs to be selected. Select and try again.'));
             }
         } catch (\Exception $e) {
             throw new LocalizedException(__($e->getMessage()));
diff --git a/app/code/Magento/Ui/Config/Converter/HtmlContent.php b/app/code/Magento/Ui/Config/Converter/HtmlContent.php
index f77b4a5285d5a..db874a302bd50 100644
--- a/app/code/Magento/Ui/Config/Converter/HtmlContent.php
+++ b/app/code/Magento/Ui/Config/Converter/HtmlContent.php
@@ -23,7 +23,7 @@ public function convert(\DOMNode $node, array $data)
         if ($node->nodeType == XML_ELEMENT_NODE) {
             $xml = '<?xml version="1.0"?>' . "\n"
                 . '<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . "\n"
-                . $node->ownerDocument->saveXml($node) . "\n"
+                . $node->ownerDocument->saveXML($node) . "\n"
                 . '</layout>';
             $items['layout']['xsi:type'] = 'string';
             $items['layout']['name'] = 'layout';
diff --git a/app/code/Magento/Ui/Config/Reader.php b/app/code/Magento/Ui/Config/Reader.php
index 8ff779f63d6e1..f7a781d103c05 100644
--- a/app/code/Magento/Ui/Config/Reader.php
+++ b/app/code/Magento/Ui/Config/Reader.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Config;
 
 use Magento\Framework\Config\ConverterInterface as ConfigConverter;
@@ -125,7 +126,12 @@ private function readFiles($fileList)
                 );
                 $output = array_replace_recursive($output, $this->converter->convert($configMerger->getDom()));
             } catch (ValidationException $e) {
-                throw new LocalizedException(new Phrase("Invalid XML in file %1:\n%2", [$key, $e->getMessage()]));
+                throw new LocalizedException(
+                    new Phrase(
+                        'The XML in file "%1" is invalid:' . "\n%2\nVerify the XML and try again.",
+                        [$key, $e->getMessage()]
+                    )
+                );
             }
         }
 
diff --git a/app/code/Magento/Ui/Config/Reader/Definition.php b/app/code/Magento/Ui/Config/Reader/Definition.php
index d4a53c584308e..782a75187190b 100644
--- a/app/code/Magento/Ui/Config/Reader/Definition.php
+++ b/app/code/Magento/Ui/Config/Reader/Definition.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Config\Reader;
 
 use Magento\Framework\Config\Dom\ValidationException;
@@ -53,7 +54,10 @@ private function readFiles($fileList)
                 }
             } catch (ValidationException $e) {
                 throw new LocalizedException(
-                    new Phrase("Invalid XML in file %1:\n%2", [$key, $e->getMessage()])
+                    new Phrase(
+                        'The XML in file "%1" is invalid.' . "\n%2\nVerify the XML and try again.",
+                        [$key, $e->getMessage()]
+                    )
                 );
             }
         }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
index 60d374fbf26ca..b45880c1ce726 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Ui\Controller\Adminhtml\Bookmark;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Json\DecoderInterface;
@@ -20,7 +21,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends AbstractAction
+class Save extends AbstractAction implements HttpPostActionInterface
 {
     /**
      * Identifier for current bookmark
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
index 13aed8fe300e5..cb0fae3c18e59 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
@@ -9,6 +9,9 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Model\Export\ConvertToCsv;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Ui\Component\MassAction\Filter;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class Render
@@ -25,19 +28,35 @@ class GridToCsv extends Action
      */
     protected $fileFactory;
 
+    /**
+     * @var Filter
+     */
+    private $filter;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Context $context
      * @param ConvertToCsv $converter
      * @param FileFactory $fileFactory
+     * @param Filter|null $filter
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         ConvertToCsv $converter,
-        FileFactory $fileFactory
+        FileFactory $fileFactory,
+        Filter $filter = null,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context);
         $this->converter = $converter;
         $this->fileFactory = $fileFactory;
+        $this->filter = $filter ?: ObjectManager::getInstance()->get(Filter::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -50,4 +69,32 @@ public function execute()
     {
         return $this->fileFactory->create('export.csv', $this->converter->getCsvFile(), 'var');
     }
+
+    /**
+     * Checking if the user has access to requested component.
+     *
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        if ($this->_request->getParam('namespace')) {
+            try {
+                $component = $this->filter->getComponent();
+                $dataProviderConfig = $component->getContext()
+                    ->getDataProvider()
+                    ->getConfigData();
+                if (isset($dataProviderConfig['aclResource'])) {
+                    return $this->_authorization->isAllowed(
+                        $dataProviderConfig['aclResource']
+                    );
+                }
+            } catch (\Throwable $exception) {
+                $this->logger->critical($exception);
+
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
index f00825a3e0bb9..130e89bb246b9 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
@@ -9,6 +9,9 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Model\Export\ConvertToXml;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Ui\Component\MassAction\Filter;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class Render
@@ -25,19 +28,35 @@ class GridToXml extends Action
      */
     protected $fileFactory;
 
+    /**
+     * @var Filter
+     */
+    private $filter;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Context $context
      * @param ConvertToXml $converter
      * @param FileFactory $fileFactory
+     * @param Filter|null $filter
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         ConvertToXml $converter,
-        FileFactory $fileFactory
+        FileFactory $fileFactory,
+        Filter $filter = null,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context);
         $this->converter = $converter;
         $this->fileFactory = $fileFactory;
+        $this->filter = $filter ?: ObjectManager::getInstance()->get(Filter::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -50,4 +69,32 @@ public function execute()
     {
         return $this->fileFactory->create('export.xml', $this->converter->getXmlFile(), 'var');
     }
+
+    /**
+     * Checking if the user has access to requested component.
+     *
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        if ($this->_request->getParam('namespace')) {
+            try {
+                $component = $this->filter->getComponent();
+                $dataProviderConfig = $component->getContext()
+                    ->getDataProvider()
+                    ->getConfigData();
+                if (isset($dataProviderConfig['aclResource'])) {
+                    return $this->_authorization->isAllowed(
+                        $dataProviderConfig['aclResource']
+                    );
+                }
+            } catch (\Throwable $exception) {
+                $this->logger->critical($exception);
+
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index 18fd5eea2f5f2..b983e56b8aee2 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -10,7 +10,15 @@
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Model\UiComponentTypeResolver;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\Controller\Result\JsonFactory;
 
+/**
+ * Render a component.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Render extends AbstractAction
 {
     /**
@@ -18,39 +26,97 @@ class Render extends AbstractAction
      */
     private $contentTypeResolver;
 
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Context $context
      * @param UiComponentFactory $factory
      * @param UiComponentTypeResolver $contentTypeResolver
+     * @param JsonFactory|null $resultJsonFactory
+     * @param Escaper|null $escaper
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         UiComponentFactory $factory,
-        UiComponentTypeResolver $contentTypeResolver
+        UiComponentTypeResolver $contentTypeResolver,
+        JsonFactory $resultJsonFactory = null,
+        Escaper $escaper = null,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context, $factory);
         $this->contentTypeResolver = $contentTypeResolver;
+        $this->resultJsonFactory = $resultJsonFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Controller\Result\JsonFactory::class);
+        $this->escaper = $escaper ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Escaper::class);
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Psr\Log\LoggerInterface::class);
     }
 
     /**
-     * Action for AJAX request
-     *
-     * @return void
+     * @inheritdoc
      */
     public function execute()
     {
         if ($this->_request->getParam('namespace') === null) {
             $this->_redirect('admin/noroute');
+
             return;
         }
 
-        $component = $this->factory->create($this->getRequest()->getParam('namespace'));
-        if ($this->validateAclResource($component->getContext()->getDataProvider()->getConfigData())) {
-            $this->prepareComponent($component);
-            $this->getResponse()->appendBody((string) $component->render());
+        try {
+            $component = $this->factory->create($this->getRequest()->getParam('namespace'));
+            if ($this->validateAclResource($component->getContext()->getDataProvider()->getConfigData())) {
+                $this->prepareComponent($component);
+                $this->getResponse()->appendBody((string)$component->render());
 
-            $contentType = $this->contentTypeResolver->resolve($component->getContext());
-            $this->getResponse()->setHeader('Content-Type', $contentType, true);
+                $contentType = $this->contentTypeResolver->resolve($component->getContext());
+                $this->getResponse()->setHeader('Content-Type', $contentType, true);
+            }
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->logger->critical($e);
+            $result = [
+                'error' => $this->escaper->escapeHtml($e->getMessage()),
+                'errorcode' => $this->escaper->escapeHtml($e->getCode())
+            ];
+            /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+            $resultJson = $this->resultJsonFactory->create();
+            $resultJson->setStatusHeader(
+                \Zend\Http\Response::STATUS_CODE_400,
+                \Zend\Http\AbstractMessage::VERSION_11,
+                'Bad Request'
+            );
+
+            return $resultJson->setData($result);
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            $result = [
+                'error' => __('UI component could not be rendered because of system exception'),
+                'errorcode' => $this->escaper->escapeHtml($e->getCode())
+            ];
+            /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+            $resultJson = $this->resultJsonFactory->create();
+            $resultJson->setStatusHeader(
+                \Zend\Http\Response::STATUS_CODE_400,
+                \Zend\Http\AbstractMessage::VERSION_11,
+                'Bad Request'
+            );
+
+            return $resultJson->setData($result);
         }
     }
 
@@ -79,7 +145,10 @@ private function validateAclResource($dataProviderConfigData)
     {
         if (isset($dataProviderConfigData['aclResource'])) {
             if (!$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])) {
-                $this->_redirect('admin/denied');
+                if (!$this->_request->isAjax()) {
+                    $this->_redirect('admin/denied');
+                }
+
                 return false;
             }
         }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
index cc028a455456d..6ea14448c4aef 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
@@ -5,16 +5,42 @@
  */
 namespace Magento\Ui\Controller\Adminhtml\Index\Render;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Ui\Component\Control\ActionPool;
 use Magento\Ui\Component\Wrapper\UiComponent;
 use Magento\Ui\Controller\Adminhtml\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponent\ContextFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Handle
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Handle extends AbstractAction
+class Handle extends AbstractAction implements HttpGetActionInterface
 {
+    /**
+     * @var ContextFactory
+     */
+    private $contextFactory;
+
+    /**
+     * @param Context $context
+     * @param UiComponentFactory $factory
+     * @param ContextFactory|null $contextFactory
+     */
+    public function __construct(
+        Context $context,
+        UiComponentFactory $factory,
+        ContextFactory $contextFactory = null
+    ) {
+        parent::__construct($context, $factory);
+        $this->contextFactory = $contextFactory
+            ?: ObjectManager::getInstance()->get(ContextFactory::class);
+    }
+
     /**
      * Render UI component by namespace in handle context
      *
@@ -22,20 +48,50 @@ class Handle extends AbstractAction
      */
     public function execute()
     {
+        $response = '';
         $handle = $this->_request->getParam('handle');
         $namespace = $this->_request->getParam('namespace');
         $buttons = $this->_request->getParam('buttons', false);
-
         $this->_view->loadLayout(['default', $handle], true, true, false);
+        $layout = $this->_view->getLayout();
+        $context = $this->contextFactory->create(
+            [
+                'namespace' => $namespace,
+                'pageLayout' => $layout
+            ]
+        );
 
-        $uiComponent = $this->_view->getLayout()->getBlock($namespace);
-        $response = $uiComponent instanceof UiComponent ? $uiComponent->toHtml() : '';
+        $component = $this->factory->create($namespace, null, ['context' => $context]);
+        if ($this->validateAclResource($component->getContext()->getDataProvider()->getConfigData())) {
+            $uiComponent = $layout->getBlock($namespace);
+            $response = $uiComponent instanceof UiComponent ? $uiComponent->toHtml() : '';
+        }
 
         if ($buttons) {
-            $actionsToolbar = $this->_view->getLayout()->getBlock(ActionPool::ACTIONS_PAGE_TOOLBAR);
+            $actionsToolbar = $layout->getBlock(ActionPool::ACTIONS_PAGE_TOOLBAR);
             $response .= $actionsToolbar instanceof Template ? $actionsToolbar->toHtml() : '';
         }
 
         $this->_response->appendBody($response);
     }
+
+    /**
+     * Optionally validate ACL resource of components with a DataSource/DataProvider
+     *
+     * @param mixed $dataProviderConfigData
+     * @return bool
+     */
+    private function validateAclResource($dataProviderConfigData)
+    {
+        if (isset($dataProviderConfigData['aclResource'])
+            && !$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])
+        ) {
+            if (!$this->_request->isAjax()) {
+                $this->_redirect('admin/denied');
+            }
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
index cff6171395ec9..578ebe4d441d9 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
@@ -292,6 +292,6 @@ public function setConfigData($config)
      */
     public function getAllIds()
     {
-        return  $this->collection->getAllIds();
+        return  $this->getCollection()->getAllIds();
     }
 }
diff --git a/app/code/Magento/Ui/DataProvider/EavValidationRules.php b/app/code/Magento/Ui/DataProvider/EavValidationRules.php
index 12e345e1fa12c..6e2bb3866e947 100644
--- a/app/code/Magento/Ui/DataProvider/EavValidationRules.php
+++ b/app/code/Magento/Ui/DataProvider/EavValidationRules.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\DataProvider;
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -31,25 +32,51 @@ class EavValidationRules
      */
     public function build(AbstractAttribute $attribute, array $data)
     {
-        $validation = [];
+        $validations = [];
         if (isset($data['required']) && $data['required'] == 1) {
-            $validation = array_merge($validation, ['required-entry' => true]);
+            $validations = array_merge($validations, ['required-entry' => true]);
         }
         if ($attribute->getFrontendInput() === 'price') {
-            $validation = array_merge($validation, ['validate-zero-or-greater' => true]);
+            $validations = array_merge($validations, ['validate-zero-or-greater' => true]);
         }
         if ($attribute->getValidateRules()) {
-            $validation = array_merge($validation, $attribute->getValidateRules());
+            $validations = array_merge($validations, $this->clipLengthRules($attribute->getValidateRules()));
         }
+        return $this->aggregateRules($validations);
+    }
+
+    /**
+     * @param array $validations
+     * @return array
+     */
+    private function aggregateRules(array $validations): array
+    {
         $rules = [];
-        foreach ($validation as $type => $ruleName) {
-            $rule = [$type => $ruleName];
+        foreach ($validations as $type => $ruleValue) {
+            $rule = [$type => $ruleValue];
             if ($type === 'input_validation') {
-                $rule = isset($this->validationRules[$ruleName]) ? $this->validationRules[$ruleName] : [];
+                $rule = $this->validationRules[$ruleValue] ?? [];
+            }
+            if (count($rule) !== 0) {
+                $key = key($rule);
+                $rules[$key] = $rule[$key];
             }
-            $rules = array_merge($rules, $rule);
         }
+        return $rules;
+    }
 
+    /**
+     * @param array $rules
+     * @return array
+     */
+    private function clipLengthRules(array $rules): array
+    {
+        if (empty($rules['input_validation'])) {
+            unset(
+                $rules['min_text_length'],
+                $rules['max_text_length']
+            );
+        }
         return $rules;
     }
 }
diff --git a/app/code/Magento/Ui/DataProvider/Modifier/Pool.php b/app/code/Magento/Ui/DataProvider/Modifier/Pool.php
index e8ac4d9b362ec..882f97d57e9fb 100644
--- a/app/code/Magento/Ui/DataProvider/Modifier/Pool.php
+++ b/app/code/Magento/Ui/DataProvider/Modifier/Pool.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\DataProvider\Modifier;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -63,11 +64,13 @@ public function getModifiersInstances()
 
         foreach ($this->modifiers as $modifier) {
             if (empty($modifier['class'])) {
-                throw new LocalizedException(__('Parameter "class" must be present.'));
+                throw new LocalizedException(__('The parameter "class" is missing. Set the "class" and try again.'));
             }
 
             if (empty($modifier['sortOrder'])) {
-                throw new LocalizedException(__('Parameter "sortOrder" must be present.'));
+                throw new LocalizedException(
+                    __('The parameter "sortOrder" is missing. Set the "sortOrder" and try again.')
+                );
             }
 
             $this->modifiersInstances[$modifier['class']] = $this->factory->create($modifier['class']);
@@ -85,14 +88,7 @@ public function getModifiersInstances()
     protected function sort(array $data)
     {
         usort($data, function (array $a, array $b) {
-            $a['sortOrder'] = $this->getSortOrder($a);
-            $b['sortOrder'] = $this->getSortOrder($b);
-
-            if ($a['sortOrder'] == $b['sortOrder']) {
-                return 0;
-            }
-
-            return ($a['sortOrder'] < $b['sortOrder']) ? -1 : 1;
+            return $this->getSortOrder($a) <=> $this->getSortOrder($b);
         });
 
         return $data;
diff --git a/app/code/Magento/Ui/DataProvider/Modifier/Wysiwyg/DefaultWysiwygSettings.php b/app/code/Magento/Ui/DataProvider/Modifier/Wysiwyg/DefaultWysiwygSettings.php
deleted file mode 100644
index 87ee607f224b8..0000000000000
--- a/app/code/Magento/Ui/DataProvider/Modifier/Wysiwyg/DefaultWysiwygSettings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Ui\DataProvider\Modifier\Wysiwyg;
-
-use Magento\Ui\DataProvider\Modifier\WysiwygModifierInterface;
-
-/**
- * Class DefaultWysiwygSettings
- */
-class DefaultWysiwygSettings implements WysiwygModifierInterface
-{
-    const EDITOR_NAME = "tmce4";
-
-    /**
-     * @return string
-     */
-    public function getEditorName()
-    {
-        return self::EDITOR_NAME;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function modifyMeta(array $meta)
-    {
-        return $meta;
-    }
-}
diff --git a/app/code/Magento/Ui/DataProvider/Modifier/Wysiwyg/WysiwygModifierComposite.php b/app/code/Magento/Ui/DataProvider/Modifier/Wysiwyg/WysiwygModifierComposite.php
deleted file mode 100644
index bee43aa7e30df..0000000000000
--- a/app/code/Magento/Ui/DataProvider/Modifier/Wysiwyg/WysiwygModifierComposite.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Ui\DataProvider\Modifier\Wysiwyg;
-
-use Magento\Ui\DataProvider\Modifier\WysiwygModifierInterface;
-
-/**
- * Class WysiwygModifierComposite
- *
- * @api
- */
-class WysiwygModifierComposite implements WysiwygModifierInterface
-{
-    /**
-     * @var array
-     */
-    private $modifiers;
-
-    /**
-     * @var string
-     */
-    private $currentEditorName;
-
-    /**
-     * WysiwygModifierComposite constructor.
-     *
-     * @param array $modifiers
-     * @param string $currentEditorName
-     */
-    public function __construct(array $modifiers, $currentEditorName)
-    {
-        $this->modifiers = $modifiers;
-        $this->currentEditorName = $currentEditorName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEditorName()
-    {
-        return '';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function modifyMeta(array $meta)
-    {
-        /** @var WysiwygModifierInterface $modifier */
-        foreach ($this->modifiers as $modifier) {
-            // Apply only modifiers, editor of which is the same as current one
-            if ($modifier->getEditorName() === $this->currentEditorName) {
-                $meta = $modifier->modifyMeta($meta);
-            }
-        }
-
-        return $meta;
-    }
-}
diff --git a/app/code/Magento/Ui/Model/ColorPicker/ColorModesProvider.php b/app/code/Magento/Ui/Model/ColorPicker/ColorModesProvider.php
new file mode 100644
index 0000000000000..768cc39cdb45e
--- /dev/null
+++ b/app/code/Magento/Ui/Model/ColorPicker/ColorModesProvider.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\ColorPicker;
+
+/**
+ * Collect all modes by configuration
+ */
+class ColorModesProvider
+{
+    /**
+     * Stores color picker modes configuration
+     *
+     * @var array
+     */
+    private $colorModes;
+
+    /**
+     * Magento object manager
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param array $colorModesPool
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        array $colorModesPool,
+        \Magento\Framework\ObjectManagerInterface $objectManager
+    ) {
+        $this->colorModes = $colorModesPool;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Return all available modes and their configuration
+     *
+     * @return array
+     */
+    public function getModes(): array
+    {
+        $config = [];
+        foreach ($this->colorModes as $modeName => $className) {
+            $config[$modeName] = $this->createModeProvider($className)->getConfig();
+        }
+
+        return $config;
+    }
+
+    /**
+     * Create mode provider
+     *
+     * @param string $instance
+     * @return ModeInterface
+     */
+    private function createModeProvider(string $instance): ModeInterface
+    {
+        return $this->objectManager->create($instance);
+    }
+}
diff --git a/app/code/Magento/Ui/Model/ColorPicker/FullMode.php b/app/code/Magento/Ui/Model/ColorPicker/FullMode.php
new file mode 100644
index 0000000000000..8161e795a0398
--- /dev/null
+++ b/app/code/Magento/Ui/Model/ColorPicker/FullMode.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\ColorPicker;
+
+/**
+ * Returns config parameters for full mode
+ */
+class FullMode implements ModeInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     */
+    public function getConfig(): array
+    {
+        return [
+            'showInput' => true,
+            'showInitial' => false,
+            'showPalette' => true,
+            'showAlpha' => true,
+            'showSelectionPalette' => true
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/Model/ColorPicker/ModeInterface.php b/app/code/Magento/Ui/Model/ColorPicker/ModeInterface.php
new file mode 100644
index 0000000000000..5c0504c995b99
--- /dev/null
+++ b/app/code/Magento/Ui/Model/ColorPicker/ModeInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\ColorPicker;
+
+/**
+ * Mode interface for color modes
+ */
+interface ModeInterface
+{
+    /**
+     * Returns config parameters for spectrum library
+     *
+     * @return array
+     */
+    public function getConfig() : array ;
+}
diff --git a/app/code/Magento/Ui/Model/ColorPicker/NoAlphaMode.php b/app/code/Magento/Ui/Model/ColorPicker/NoAlphaMode.php
new file mode 100644
index 0000000000000..0b18e9ae3cf78
--- /dev/null
+++ b/app/code/Magento/Ui/Model/ColorPicker/NoAlphaMode.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\ColorPicker;
+
+/**
+ * Returns config parameters for noalpha mode
+ */
+class NoAlphaMode implements ModeInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        return [
+            'showInput' => true,
+            'showInitial' => false,
+            'showPalette' => true,
+            'showAlpha' => false,
+            'showSelectionPalette' => true
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/Model/ColorPicker/PaletteOnlyMode.php b/app/code/Magento/Ui/Model/ColorPicker/PaletteOnlyMode.php
new file mode 100644
index 0000000000000..d90324b5daf37
--- /dev/null
+++ b/app/code/Magento/Ui/Model/ColorPicker/PaletteOnlyMode.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\ColorPicker;
+
+/**
+ * Returns config parameters for palette only mode
+ */
+class PaletteOnlyMode implements ModeInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        return [
+            'showInput' => false,
+            'showInitial' => false,
+            'showPalette' => true,
+            'showPaletteOnly' => true,
+            'showAlpha' => false,
+            'showSelectionPalette' => false
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/Model/ColorPicker/SimpleMode.php b/app/code/Magento/Ui/Model/ColorPicker/SimpleMode.php
new file mode 100644
index 0000000000000..c5753839be359
--- /dev/null
+++ b/app/code/Magento/Ui/Model/ColorPicker/SimpleMode.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\ColorPicker;
+
+/**
+ * Returns config parameters for simple mode
+ */
+class SimpleMode implements ModeInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        return [
+            'showInput' => false,
+            'showInitial' => false,
+            'showPalette' => false,
+            'showAlpha' => false,
+            'showSelectionPalette' => true
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
index 9eba829982533..eb811bfae788f 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
@@ -6,9 +6,9 @@
 namespace Magento\Ui\Model\Export;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Ui\Component\MassAction\Filter;
 
 /**
@@ -17,7 +17,7 @@
 class ConvertToCsv
 {
     /**
-     * @var WriteInterface
+     * @var DirectoryList
      */
     protected $directory;
 
@@ -31,11 +31,17 @@ class ConvertToCsv
      */
     protected $pageSize = null;
 
+    /**
+     * @var Filter
+     */
+    protected $filter;
+
     /**
      * @param Filesystem $filesystem
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param int $pageSize
+     * @throws FileSystemException
      */
     public function __construct(
         Filesystem $filesystem,
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
index b707742063dbd..19eb651113fcf 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToXml.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
@@ -10,9 +10,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Convert\Excel;
 use Magento\Framework\Convert\ExcelFactory;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Ui\Component\MassAction\Filter;
 
 /**
@@ -21,7 +21,7 @@
 class ConvertToXml
 {
     /**
-     * @var WriteInterface
+     * @var DirectoryList
      */
     protected $directory;
 
@@ -50,12 +50,18 @@ class ConvertToXml
      */
     protected $fields;
 
+    /**
+     * @var Filter
+     */
+    protected $filter;
+
     /**
      * @param Filesystem $filesystem
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param ExcelFactory $excelFactory
      * @param SearchResultIteratorFactory $iteratorFactory
+     * @throws FileSystemException
      */
     public function __construct(
         Filesystem $filesystem,
@@ -88,6 +94,7 @@ protected function getOptions()
      * Returns DB fields list
      *
      * @return array
+     * @throws LocalizedException
      */
     protected function getFields()
     {
@@ -103,6 +110,7 @@ protected function getFields()
      *
      * @param DocumentInterface $document
      * @return array
+     * @throws LocalizedException
      */
     public function getRowData(DocumentInterface $document)
     {
diff --git a/app/code/Magento/Ui/Model/Export/MetadataProvider.php b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
index 499cd06e505f6..603e102fa30e0 100644
--- a/app/code/Magento/Ui/Model/Export/MetadataProvider.php
+++ b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
@@ -60,7 +60,7 @@ public function __construct(
         Filter $filter,
         TimezoneInterface $localeDate,
         ResolverInterface $localeResolver,
-        $dateFormat = 'M j, Y H:i:s A',
+        $dateFormat = 'M j, Y h:i:s A',
         array $data = []
     ) {
         $this->filter = $filter;
@@ -118,6 +118,13 @@ public function getHeaders(UiComponentInterface $component)
         foreach ($this->getColumns($component) as $column) {
             $row[] = $column->getData('config/label');
         }
+
+        array_walk($row, function (&$header) {
+            if (mb_strpos($header, 'ID') === 0) {
+                $header = '"' . $header . '"';
+            }
+        });
+
         return $row;
     }
 
diff --git a/app/code/Magento/Ui/Model/Manager.php b/app/code/Magento/Ui/Model/Manager.php
index 6dca4632fe7fc..e3c56418c8425 100644
--- a/app/code/Magento/Ui/Model/Manager.php
+++ b/app/code/Magento/Ui/Model/Manager.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Model;
 
 use ArrayObject;
@@ -165,7 +166,10 @@ public function prepareData($name)
     {
         if ($name === null || $this->hasData($name)) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase("Invalid UI Component element name: '%1'", [$name])
+                new \Magento\Framework\Phrase(
+                    'The "%1" UI component element name is invalid. Verify the name and try again.',
+                    [$name]
+                )
             );
         }
         $this->componentsPool = $this->arrayObjectFactory->create();
diff --git a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
index 1b03b7c402680..3e738baa404c8 100644
--- a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
+++ b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Model\ResourceModel;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -91,7 +92,9 @@ public function getById($bookmarkId)
         $bookmark = $this->bookmarkFactory->create();
         $this->bookmarkResourceModel->load($bookmark, $bookmarkId);
         if (!$bookmark->getId()) {
-            throw new NoSuchEntityException(__('Bookmark with id "%1" does not exist.', $bookmarkId));
+            throw new NoSuchEntityException(
+                __('The bookmark with "%1" ID doesn\'t exist. Verify your information and try again.', $bookmarkId)
+            );
         }
         return $bookmark;
     }
diff --git a/app/code/Magento/Ui/Model/UiComponentGenerator.php b/app/code/Magento/Ui/Model/UiComponentGenerator.php
index 5e8db243d3c42..f699cff7aa528 100644
--- a/app/code/Magento/Ui/Model/UiComponentGenerator.php
+++ b/app/code/Magento/Ui/Model/UiComponentGenerator.php
@@ -10,10 +10,10 @@
 use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
- * Dynamicly generate UI Component
+ * Dynamically generate UI Component
  *
- * Sometimes we need to generate components dynamicly (not from layout).
- * Tha basic example, is creating widget UI component, based on CMS page or CMS block
+ * Sometimes we need to generate components dynamically (not from layout).
+ * The basic example, is creating widget UI component, based on CMS page or CMS block
  * directive
  */
 class UiComponentGenerator
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 0000000000000..8cf7a9dd8b229
--- /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(): array;
+}
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 0000000000000..9a565a5bc7a8a
--- /dev/null
+++ b/app/code/Magento/Ui/Model/UrlInput/LinksConfigProvider.php
@@ -0,0 +1,63 @@
+<?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(): array
+    {
+        $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): ConfigInterface
+    {
+        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 0000000000000..268bce512ed19
--- /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(): array
+    {
+        return [
+            'label' => __('URL'),
+            'component' => 'Magento_Ui/js/form/element/abstract',
+            'template' => 'ui/form/element/input',
+            'sortOrder' => 20,
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/Setup/InstallSchema.php b/app/code/Magento/Ui/Setup/InstallSchema.php
deleted file mode 100644
index 6190c870ebd12..0000000000000
--- a/app/code/Magento/Ui/Setup/InstallSchema.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Ui\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * Installs DB schema for a module
-     *
-     * @param SchemaSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $connection = $setup->getConnection();
-        $setup->startSetup();
-        $table = $connection->newTable($setup->getTable('ui_bookmark'))
-            ->addColumn(
-                'bookmark_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Bookmark identifier'
-            )
-            ->addColumn(
-                'user_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'User Id'
-            )
-            ->addColumn(
-                'namespace',
-                Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Bookmark namespace'
-            )
-            ->addColumn(
-                'identifier',
-                Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Bookmark Identifier'
-            )
-            ->addColumn(
-                'current',
-                Table::TYPE_SMALLINT,
-                1,
-                ['nullable' => false],
-                'Mark current bookmark per user and identifier'
-            )
-            ->addColumn('title', Table::TYPE_TEXT, 255, ['nullable' => true], 'Bookmark title')
-            ->addColumn('config', Table::TYPE_TEXT, Table::MAX_TEXT_SIZE, ['nullable' => true], 'Bookmark config')
-            ->addColumn('created_at', Table::TYPE_DATETIME, null, ['nullable' => false], 'Bookmark created at')
-            ->addColumn('updated_at', Table::TYPE_DATETIME, null, ['nullable' => false], 'Bookmark updated at')
-            ->addIndex(
-                $setup->getIdxName(
-                    'ui_bookmark',
-                    ['user_id', 'namespace', 'identifier'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['user_id', 'namespace', 'identifier'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            )
-            ->addForeignKey(
-                $setup->getFkName('ui_bookmark', 'user_id', 'admin_user', 'user_id'),
-                'user_id',
-                $setup->getTable('admin_user'),
-                'user_id',
-                Table::ACTION_CASCADE
-            )
-            ->setComment('Bookmark');
-        $connection->createTable($table);
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index cda3106a14f49..e249a64861d43 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -80,7 +80,9 @@ public function getDocumentElement()
      */
     public function appendLayoutConfiguration()
     {
-        $layoutConfiguration = $this->wrapContent(json_encode($this->structure->generate($this->component)));
+        $layoutConfiguration = $this->wrapContent(
+            json_encode($this->structure->generate($this->component), JSON_HEX_TAG)
+        );
         $this->template->append($layoutConfiguration);
     }
 
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
new file mode 100644
index 0000000000000..1942c02ace51b
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Search grid with keyword search-->
+    <actionGroup name="searchAdminDataGridByKeyword">
+        <arguments>
+            <argument name="keyword"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+
+    <!--Reset data grid to default view-->
+    <actionGroup name="resetAdminDataGridToDefaultView">
+        <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
+        <click selector="{{AdminDataGridHeaderSection.bookmarkOption('Default View')}}" stepKey="selectDefaultGridView"/>
+        <see selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
+    </actionGroup>
+
+    <!--Clear all filters in grid-->
+    <actionGroup name="clearFiltersAdminDataGrid">
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
new file mode 100644
index 0000000000000..9148c22976c19
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="adminDataGridSelectPerPage">
+        <arguments>
+            <argument name="perPage" type="string"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageOption(perPage)}}" stepKey="selectCustomPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+
+    <actionGroup name="adminDataGridSelectCustomPerPage">
+        <arguments>
+            <argument name="perPage"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
+        <fillField selector="{{AdminDataGridPaginationSection.perPageInput}}" userInput="{{perPage}}" stepKey="fillCustomPerPage"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
new file mode 100644
index 0000000000000..85f02e42345a7
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminGridFilterSearchResultsByInput">
+        <arguments>
+            <argument name="selector"/>
+            <argument name="value" type="string"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector="{{AdminGridFilterControls.clearAll}}" 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/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
new file mode 100644
index 0000000000000..20c8927d49171
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFormSaveAndClose">
+        <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
+        <click selector="{{AdminProductFormActionSection.saveAndClose}}" stepKey="clickOnSaveAndClose"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+    </actionGroup>
+    <actionGroup name="AdminFormSaveAndDuplicate">
+        <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
+        <click selector="{{AdminProductFormActionSection.saveAndDuplicate}}" stepKey="clickOnSaveAndDuplicate"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveSuccess" userInput="You saved the product."/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertDuplicateSuccess" userInput="You duplicated the product."/>
+        </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/LICENSE.txt b/app/code/Magento/Ui/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/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/Ui/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Ui/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/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/Ui/Test/Mftf/README.md b/app/code/Magento/Ui/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9f61e8fc9a009
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Ui Functional Tests
+
+The Functional Test Module for **Magento Ui** module.
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
new file mode 100644
index 0000000000000..3e917a5944f95
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDataGridHeaderSection">
+        <!--Search by keyword element-->
+        <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"/>
+        <element name="filterFieldInput" type="input" selector=".admin__data-grid-filters input[name='{{name}}']" parameterized="true"/>
+        <element name="filterFieldSelect" type="select" selector=".admin__data-grid-filters select[name='{{name}}']" parameterized="true"/>
+        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
+        <!--Grid view bookmarks-->
+        <element name="bookmarkToggle" type="button" selector="div.admin__data-grid-action-bookmarks button[data-bind='toggleCollapsible']" timeout="30"/>
+        <element name="bookmarkOption" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <!--Visible columns management-->
+        <element name="columnsToggle" type="button" selector="div.admin__data-grid-action-columns button[data-bind='toggleCollapsible']" timeout="30"/>
+        <element name="columnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
new file mode 100644
index 0000000000000..0f54f51549e7a
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDataGridPaginationSection">
+        <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
+        <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{var1}}']" parameterized="true"/>
+        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
+        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>
+        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
+        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
+        <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
+        <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
new file mode 100644
index 0000000000000..edcc70a82396d
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDataGridTableSection">
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>
+        <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="rows" type="text" selector="table.data-grid tbody > tr.data-row"/>
+        <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
+        <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
new file mode 100644
index 0000000000000..978a09db82b16
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <!-- 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="(//*[contains(@class, 'admin__data-grid-header')][contains(@data-bind, 'afterRender: \$data.setToolbarNode')]//button[contains(@data-action, 'reset')])[1]" timeout="5"/>
+    </section>
+    <section name="AdminGridDefaultViewControls">
+        <element name="defaultView" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-bookmarks" timeout="5"/>
+        <element name="viewByName" type="button" selector="//a[@class='action-dropdown-menu-link'][contains(text(), '{{var1}}')]" parameterized="true" timeout="5"/>
+        <element name="saveViewAs" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-dropdown-menu-item-last a" timeout="5"/>
+        <element name="viewName" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] ._edit input"/>
+        <element name="save" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] ._edit button" timeout="30"/>
+    </section>
+    <section name="AdminGridColumnsControls">
+        <element name="columns" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-columns" timeout="5"/>
+
+        <element name="columnName" type="button" selector="//label[contains(text(), '{{var1}}')]" parameterized="true" timeout="5"/>
+
+        <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"/>
+        <element name="delete" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-menu-items li" timeout="5"/>
+    </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="//div[@data-role='grid-wrapper']//span[@class='data-grid-cell-content' and contains(text(), '{{var1}}')]/parent::*" parameterized="true"/>
+        <element name="columnsNames" type="text" selector="[data-role='grid-wrapper'] .data-grid-th > span"/>
+    </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>
+    <section name="AdminGridSelectRows">
+        <element name="multicheckDropdown" type="button" selector="div[data-role='grid-wrapper'] th.data-grid-multicheck-cell button.action-multicheck-toggle"/>
+        <element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/>
+        <element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
+        <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
+    </section>
+    <section name="AdminGridConfirmActionSection">
+        <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
+        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
new file mode 100644
index 0000000000000..75d445f1ee04e
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMessagesSection">
+        <element name="successMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector=".message.message-error.error"/>
+        <element name="warningMessage" type="text" selector=".message-warning"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
new file mode 100644
index 0000000000000..4bf84d9ee63da
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="ModalConfirmationSection">
+        <element name="modalContent" type="text" selector="aside.confirm div.modal-content"/>
+        <element name="CancelButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-dismiss')]"/>
+        <element name="OkButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-accept')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php
index e18155cd08c53..85226b780aac3 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php
@@ -83,8 +83,7 @@ protected function setUp()
         $this->items[$this->key] = $this->createPartialMock(\Magento\Ui\Component\Control\Item::class, ['setData']);
         $this->actionPool = new ActionPool(
             $this->contextMock,
-            $this->itemFactoryMock,
-            $this->toolbarBlockMock
+            $this->itemFactoryMock
         );
     }
 
diff --git a/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php b/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php
index 53e148fb8aaf2..76749e165e245 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/ExportButtonTest.php
@@ -62,14 +62,37 @@ public function testPrepare()
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
+        $this->context->expects($this->any())
+            ->method('getRequestParam')
+            ->with('test_asterisk')
+            ->willReturn('test_asterisk_value');
         $option = ['label' => 'test label', 'value' => 'test value', 'url' => 'test_url'];
-        $data = ['config' => ['options' => [$option]]];
+        $data = [
+            'config' => [
+                'options' => [
+                    $option
+                ],
+                'additionalParams' => [
+                    'test_key' => 'test_value',
+                    'test_asterisk' => '*'
+                ]
+            ],
+        ];
+        $expected = $data;
+        $expected['config']['options'][0]['url'] = [
+            'test_key' => 'test_value',
+            'test_asterisk' => 'test_asterisk_value',
+        ];
         $this->model->setData($data);
-
         $this->urlBuilderMock->expects($this->once())
             ->method('getUrl')
             ->with('test_url')
-            ->willReturnArgument(0);
-        $this->assertNull($this->model->prepare());
+            ->willReturnArgument(1);
+
+        self::assertNull($this->model->prepare());
+        self::assertEquals(
+            $expected,
+            $this->model->getData()
+        );
     }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
index f91401e43ea80..50d82b19d1045 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
@@ -66,7 +66,8 @@ public function testNotApplyFilterModifier()
 
     /**
      * @return void
-     * @assertException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Condition type "not_allowed" is not allowed
      */
     public function testApplyFilterModifierWithNotAllowedCondition()
     {
@@ -78,7 +79,7 @@ public function testApplyFilterModifierWithNotAllowedCondition()
                 ]
             ]);
         $this->dataProvider->expects($this->never())->method('addFilter');
-        $this->unit->applyFilterModifier($this->dataProvider, 'test');
+        $this->unit->applyFilterModifier($this->dataProvider, 'filter');
     }
 
     /**
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
index ed571f44dd6e9..32524e2331ba7 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Ui\Test\Unit\Component\Filters\Type;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface as UiContext;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Filters\Type\Input;
@@ -37,18 +36,18 @@ class InputTest extends \PHPUnit\Framework\TestCase
     protected $filterModifierMock;
 
     /**
-     * Set up
+     * @inheritdoc
      */
     protected function setUp()
     {
         $this->contextMock = $this->getMockForAbstractClass(
-            \Magento\Framework\View\Element\UiComponent\ContextInterface::class,
+            ContextInterface::class,
             [],
             '',
             false
         );
         $this->uiComponentFactory = $this->createPartialMock(
-            \Magento\Framework\View\Element\UiComponentFactory::class,
+            UiComponentFactory::class,
             ['create']
         );
         $this->filterBuilderMock = $this->createMock(\Magento\Framework\Api\FilterBuilder::class);
@@ -63,7 +62,7 @@ protected function setUp()
      *
      * @return void
      */
-    public function testGetComponentName()
+    public function testGetComponentName(): void
     {
         $this->contextMock->expects($this->never())->method('getProcessor');
         $date = new Input(
@@ -86,7 +85,7 @@ public function testGetComponentName()
      * @dataProvider getPrepareDataProvider
      * @return void
      */
-    public function testPrepare($name, $filterData, $expectedCondition)
+    public function testPrepare(string $name, array $filterData, ?array $expectedCondition): void
     {
         $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
             ->disableOriginalConstructor()
@@ -94,7 +93,7 @@ public function testPrepare($name, $filterData, $expectedCondition)
         $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
         /** @var UiComponentInterface $uiComponent */
         $uiComponent = $this->getMockForAbstractClass(
-            \Magento\Framework\View\Element\UiComponentInterface::class,
+            UiComponentInterface::class,
             [],
             '',
             false
@@ -111,8 +110,7 @@ public function testPrepare($name, $filterData, $expectedCondition)
             ->method('addComponentDefinition')
             ->with(Input::NAME, ['extends' => Input::NAME]);
         $this->contextMock->expects($this->any())
-            ->method('getRequestParam')
-            ->with(UiContext::FILTER_VAR)
+            ->method('getFiltersParams')
             ->willReturn($filterData);
         $dataProvider = $this->getMockForAbstractClass(
             \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class,
@@ -120,20 +118,41 @@ public function testPrepare($name, $filterData, $expectedCondition)
             '',
             false
         );
+
         $this->contextMock->expects($this->any())
             ->method('getDataProvider')
             ->willReturn($dataProvider);
-        if ($expectedCondition !== null) {
-            $dataProvider->expects($this->any())
-                ->method('addFilter')
-                ->with($expectedCondition, $name);
-        }
 
         $this->uiComponentFactory->expects($this->any())
             ->method('create')
             ->with($name, Input::COMPONENT, ['context' => $this->contextMock])
             ->willReturn($uiComponent);
 
+        if ($expectedCondition !== null) {
+            $this->filterBuilderMock->expects($this->once())
+                ->method('setConditionType')
+                ->with('like')
+                ->willReturnSelf();
+
+            $this->filterBuilderMock->expects($this->once())
+                ->method('setField')
+                ->with($name)
+                ->willReturnSelf();
+
+            $this->filterBuilderMock->expects($this->once())
+                ->method('setValue')
+                ->with($expectedCondition['like'])
+                ->willReturnSelf();
+
+            $filterMock = $this->getMockBuilder(\Magento\Framework\Api\Filter::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->filterBuilderMock->expects($this->once())
+                ->method('create')
+                ->willReturn($filterMock);
+        }
+
         $date = new Input(
             $this->contextMock,
             $this->uiComponentFactory,
@@ -149,7 +168,7 @@ public function testPrepare($name, $filterData, $expectedCondition)
     /**
      * @return array
      */
-    public function getPrepareDataProvider()
+    public function getPrepareDataProvider(): array
     {
         return [
             [
@@ -157,10 +176,25 @@ public function getPrepareDataProvider()
                 ['test_date' => ''],
                 null,
             ],
+            [
+                'test_date',
+                ['test_date' => null],
+                null,
+            ],
+            [
+                'test_date',
+                ['test_date' => '0'],
+                ['like' => '%0%'],
+            ],
             [
                 'test_date',
                 ['test_date' => 'some_value'],
-                ['like' => '%some_value%'],
+                ['like' => '%some\_value%'],
+            ],
+            [
+                'test_date',
+                ['test_date' => '%'],
+                ['like' => '%\%%'],
             ],
         ];
     }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php b/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php
new file mode 100644
index 0000000000000..402fd30bf4d5b
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Test\Unit\Component;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use \Magento\Ui\Component\Filters;
+
+/**
+ * Unit tests for \Magento\Ui\Component\Filters class
+ */
+class FiltersTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var Filters|\PHPUnit_Framework_MockObject_MockObject */
+    private $filters;
+
+    /** @var \Magento\Framework\View\Element\UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $uiComponentInterface;
+
+    /** @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $uiComponentFactory;
+
+    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $context;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->uiComponentInterface = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uiComponentFactory = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filters = $objectManager->getObject(
+            Filters::class,
+            [
+                'columnFilters' => ['select' => $this->uiComponentInterface],
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'context' => $this->context,
+            ]
+        );
+    }
+
+    public function testUpdate()
+    {
+        $componentName = 'component_name';
+        $componentConfig = [0, 1, 2];
+        $columnInterface = $this->getMockBuilder(\Magento\Ui\Component\Listing\Columns\ColumnInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData', 'getName', 'getConfiguration'])
+            ->getMockForAbstractClass();
+        $columnInterface->expects($this->atLeastOnce())->method('getData')->with('config/filter')->willReturn('text');
+        $columnInterface->expects($this->atLeastOnce())->method('getName')->willReturn($componentName);
+        $columnInterface->expects($this->once())->method('getConfiguration')->willReturn($componentConfig);
+        $filterComponent = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setData', 'prepare'])
+            ->getMockForAbstractClass();
+        $filterComponent->expects($this->once())->method('setData')->with('config', $componentConfig)
+            ->willReturnSelf();
+        $filterComponent->expects($this->once())->method('prepare')->willReturnSelf();
+        $this->uiComponentFactory->expects($this->once())->method('create')
+            ->with($componentName, 'filterInput', ['context' => $this->context])
+            ->willReturn($filterComponent);
+
+        $this->filters->update($columnInterface);
+        /** Verify that filter is already set and it wouldn't be set again */
+        $this->filters->update($columnInterface);
+    }
+}
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
index 54bf0c9e8b37e..d9afe8f16a1a7 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
@@ -46,6 +46,9 @@ protected function setUp()
      */
     abstract protected function getModelName();
 
+    /**
+     * @return mixed
+     */
     abstract public function testGetComponentName();
 
     /**
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/Media/ImageTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/Media/ImageTest.php
new file mode 100644
index 0000000000000..ebe4d10475cc9
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/Media/ImageTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Test\Unit\Component\Form\Element\DataType\Media;
+
+use Magento\Ui\Component\Form\Element\DataType\Media\Image;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Framework\File\Size;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ImageTest extends \Magento\Ui\Test\Unit\Component\Form\Element\DataType\MediaTest
+{
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $store;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var Size|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileSize;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Image
+     */
+    private $image;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
+
+        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+
+        $this->store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->store->expects($this->any())->method('getId')->willReturn(0);
+
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($this->store);
+
+        $this->fileSize = $this->getMockBuilder(Size::class)->getMock();
+
+        $this->objectManager = new ObjectManager($this);
+
+        $this->image = $this->objectManager->getObject(Image::class, [
+            'context' => $this->context,
+            'storeManager' => $this->storeManager,
+            'fileSize' => $this->fileSize
+        ]);
+
+        $this->image->setData([
+            'config' => [
+                'initialMediaGalleryOpenSubpath' => 'open/sesame',
+            ],
+        ]);
+    }
+
+    /**
+     * @dataProvider prepareDataProvider
+     */
+    public function testPrepare()
+    {
+        $this->assertExpectedPreparedConfiguration(...func_get_args());
+    }
+
+    /**
+     * Data provider for testPrepare
+     * @return array
+     */
+    public function prepareDataProvider(): array
+    {
+        return [
+            [['maxFileSize' => 10], 10, ['maxFileSize' => 10]],
+            [['maxFileSize' => null], 10, ['maxFileSize' => 10]],
+            [['maxFileSize' => 10], 5, ['maxFileSize' => 5]],
+            [['maxFileSize' => 10], 20, ['maxFileSize' => 10]],
+            [['maxFileSize' => 0], 10, ['maxFileSize' => 10]],
+        ];
+    }
+
+    /**
+     * @param array $initialConfig
+     * @param int $maxFileSizeSupported
+     * @param array $expectedPreparedConfig
+     */
+    private function assertExpectedPreparedConfiguration(
+        array $initialConfig,
+        int $maxFileSizeSupported,
+        array $expectedPreparedConfig
+    ) {
+        $this->image->setData(array_merge_recursive(['config' => $initialConfig], $this->image->getData()));
+
+        $this->fileSize->expects($this->any())->method('getMaxFileSize')->willReturn($maxFileSizeSupported);
+
+        $this->image->prepare();
+
+        $actualRelevantPreparedConfig = array_intersect_key($this->image->getConfiguration(), $initialConfig);
+
+        $this->assertEquals(
+            $expectedPreparedConfig,
+            $actualRelevantPreparedConfig
+        );
+    }
+}
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
index 7af173cf2a96f..9653ecd7ded44 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/MediaTest.php
@@ -21,6 +21,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var Media */
     protected $media;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
@@ -29,8 +32,13 @@ public function setUp()
             ->getMockForAbstractClass();
 
         $this->media = new Media($this->context);
+    }
+
+    public function testPrepareWithoutDataScope()
+    {
         $this->media->setData(
             [
+                'name' => 'test_name',
                 'config' => [
                     'uploaderConfig' => [
                         'url' => 'module/actionPath/path'
@@ -38,19 +46,54 @@ public function setUp()
                 ],
             ]
         );
+        $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
+        $expectedConfig = [
+            'uploaderConfig' => ['url' => $url],
+            'dataScope' => 'test_name'
+        ];
+
+        $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
+        $this->context->expects($this->once())
+            ->method('getUrl')
+            ->with('module/actionPath/path', ['_secure' => true])
+            ->willReturn($url);
+        $this->media->prepare();
+        $configuration = $this->media->getConfiguration();
+        $this->assertEquals($expectedConfig, $configuration);
     }
 
-    public function testPrepare()
+    public function testPrepareWithDataScope()
     {
+        $this->media->setData(
+            [
+                'name' => 'test_name',
+                'config' => [
+                    'dataScope' => 'other_data_scope',
+                    'uploaderConfig' => [
+                        'url' => 'module/actionPath/path'
+                    ],
+                ],
+            ]
+        );
+        $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
+        $expectedConfig = [
+            'uploaderConfig' => ['url' => $url],
+            'dataScope' => 'other_data_scope'
+        ];
+
         $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
-        $url = 'http://magento2.com/module/actionPath/path/key/34523456234523trdg';
         $this->context->expects($this->once())
             ->method('getUrl')
             ->with('module/actionPath/path', ['_secure' => true])
             ->willReturn($url);
         $this->media->prepare();
+        $configuration = $this->media->getConfiguration();
+        $this->assertEquals($expectedConfig, $configuration);
     }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
index 1d6c41b2c3ac1..b345989ba05ef 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
@@ -69,6 +69,9 @@ protected function setUp()
             ->method('getElementHtml');
     }
 
+    /**
+     * @return \Magento\Ui\Component\Form\Element\AbstractElement|object
+     */
     protected function getModel()
     {
         return $this->objectManager->getObject(Wysiwyg::class, [
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php
index 02db643c321d8..d794208f95778 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Test\Unit\Component\Form;
 
 use Magento\Ui\Component\Form\Field;
@@ -169,7 +170,7 @@ protected function getComponentsMock()
      * @return void
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The configuration parameter "formElement" is a required for "test-name" field.
+     * @expectedExceptionMessage The "formElement" configuration parameter is required for the "test-name" field.
      */
     public function testPrepareException()
     {
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php
new file mode 100644
index 0000000000000..d243507580807
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldsetTest.php
@@ -0,0 +1,58 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Ui\Test\Unit\Component\Form;
+
+use Magento\Ui\Component\Form\Fieldset;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+
+/**
+ * Class FieldTest
+ *
+ * Test for class \Magento\Ui\Component\Form\Fieldset
+ */
+class FieldsetTest extends \PHPUnit\Framework\TestCase
+{
+    const NAME = 'fieldset';
+
+    /**
+     * @var Fieldset
+     */
+    protected $fieldset;
+
+    /**
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->fieldset = new Fieldset(
+            $this->context,
+            [],
+            []
+        );
+    }
+
+    /**
+     * Run test for getComponentName() method
+     *
+     * @return void
+     *
+     */
+    public function testGetComponentName()
+    {
+        $this->assertEquals(self::NAME, $this->fieldset->getComponentName());
+    }
+}
diff --git a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
index 123b4cacf71a7..b2f494351597f 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
@@ -93,6 +93,9 @@ public function testPrepare($componentName, $componentData)
         $this->assertEquals(['actions' => [$action->getConfiguration()]], $massAction->getConfiguration());
     }
 
+    /**
+     * @return array
+     */
     public function getPrepareDataProvider()
     {
         return [
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php
index 8228026dff3d1..d146a18a710c6 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/ActionsTest.php
@@ -61,6 +61,9 @@ public function testConvert(array $expectedResult, $xpath)
         $this->assertEquals($expectedResult, $this->converter->convert($actions));
     }
 
+    /**
+     * @return array
+     */
     public function convertDataProvider()
     {
         return [
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php
index 058e3651bde5c..8f5ab55f7a914 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/OptionsTest.php
@@ -41,6 +41,9 @@ public function testConvert(array $expectedResult, $xpath)
         $this->assertEquals($expectedResult, $res);
     }
 
+    /**
+     * @return array
+     */
     public function convertDataProvider()
     {
         return [
diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
index 31d5b421013f6..d31537458f213 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
@@ -6,7 +6,11 @@
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index\Render;
 
 use Magento\Ui\Controller\Adminhtml\Index\Render\Handle;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class HandleTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -27,22 +31,42 @@ class HandleTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $componentFactoryMock;
+    protected $viewMock;
+
+    /**
+     * @var Handle
+     */
+    protected $controller;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $viewMock;
+    private $uiComponentContextMock;
 
     /**
-     * @var Handle
+     * @var \Magento\Framework\View\Element\UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $controller;
+    private $uiComponentMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiFactoryMock;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface|
+     *      \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataProviderMock;
 
     public function setUp()
     {
         $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-        $this->componentFactoryMock = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
 
         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $this->contextMock->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->requestMock);
@@ -52,8 +76,37 @@ public function setUp()
 
         $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
         $this->contextMock->expects($this->atLeastOnce())->method('getView')->willReturn($this->viewMock);
-
-        $this->controller = new Handle($this->contextMock, $this->componentFactoryMock);
+        $this->authorizationMock = $this->getMockBuilder(\Magento\Framework\AuthorizationInterface::class)
+            ->getMockForAbstractClass();
+        $this->authorizationMock->expects($this->any())
+            ->method('isAllowed')
+            ->willReturn(true);
+        $this->uiComponentContextMock = $this->getMockForAbstractClass(
+            ContextInterface::class
+        );
+        $this->uiComponentMock = $this->getMockForAbstractClass(
+            \Magento\Framework\View\Element\UiComponentInterface::class
+        );
+        $this->dataProviderMock = $this->getMockForAbstractClass(
+            \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class
+        );
+        $this->uiComponentContextMock->expects($this->once())
+            ->method('getDataProvider')
+            ->willReturn($this->dataProviderMock);
+        $this->uiFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uiComponentMock->expects($this->any())
+            ->method('getContext')
+            ->willReturn($this->uiComponentContextMock);
+        $this->uiFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->uiComponentMock);
+        $this->dataProviderMock->expects($this->once())
+            ->method('getConfigData')
+            ->willReturn([]);
+        $contextMock = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextFactory::class);
+        $this->controller = new Handle($this->contextMock, $this->uiFactoryMock, $contextMock);
     }
 
     public function testExecuteNoButtons()
@@ -83,7 +136,7 @@ public function testExecute()
             ->with(['default', $result], true, true, false);
 
         $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
-        $this->viewMock->expects($this->exactly(2))->method('getLayout')->willReturn($layoutMock);
+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
 
         $layoutMock->expects($this->exactly(2))->method('getBlock');
 
diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
index b1ef1dd9b5249..05b35fb017b4b 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
@@ -8,9 +8,11 @@
 use Magento\Ui\Controller\Adminhtml\Index\Render;
 use Magento\Ui\Model\UiComponentTypeResolver;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class RenderTest extends \PHPUnit\Framework\TestCase
 {
@@ -19,6 +21,11 @@ class RenderTest extends \PHPUnit\Framework\TestCase
      */
     private $render;
 
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -80,6 +87,16 @@ class RenderTest extends \PHPUnit\Framework\TestCase
      */
     private $uiComponentTypeResolverMock;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJsonFactoryMock;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
@@ -121,6 +138,14 @@ protected function setUp()
             ['render']
         );
 
+        $this->resultJsonFactoryMock = $this->getMockBuilder(
+            \Magento\Framework\Controller\Result\JsonFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->loggerMock = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
+
         $this->contextMock->expects($this->any())
             ->method('getRequest')
             ->willReturn($this->requestMock);
@@ -146,7 +171,71 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->render = new Render($this->contextMock, $this->uiFactoryMock, $this->uiComponentTypeResolverMock);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->render = $this->objectManagerHelper->getObject(
+            \Magento\Ui\Controller\Adminhtml\Index\Render::class,
+            [
+                'context' => $this->contextMock,
+                'factory' => $this->uiFactoryMock,
+                'contentTypeResolver' => $this->uiComponentTypeResolverMock,
+                'resultJsonFactory' => $this->resultJsonFactoryMock,
+                'logger' => $this->loggerMock,
+            ]
+        );
+    }
+
+    public function testExecuteAjaxRequestException()
+    {
+        $name = 'test-name';
+        $renderedData = '<html>data</html>';
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->with('namespace')
+            ->willReturn($name);
+        $this->requestMock->expects($this->any())
+            ->method('getParams')
+            ->willReturn([]);
+        $this->responseMock->expects($this->once())
+            ->method('appendBody')
+            ->willThrowException(new \Exception('exception'));
+
+        $jsonResultMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setData'])
+            ->getMock();
+
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($jsonResultMock);
+
+        $jsonResultMock->expects($this->once())
+            ->method('setData')
+            ->willReturnSelf();
+
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->dataProviderMock->expects($this->once())
+            ->method('getConfigData')
+            ->willReturn([]);
+
+        $this->uiComponentMock->expects($this->once())
+            ->method('render')
+            ->willReturn($renderedData);
+        $this->uiComponentMock->expects($this->once())
+            ->method('getChildComponents')
+            ->willReturn([]);
+        $this->uiComponentMock->expects($this->once())
+            ->method('getContext')
+            ->willReturn($this->uiComponentContextMock);
+        $this->uiFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->uiComponentMock);
+
+        $this->render->executeAjaxRequest();
     }
 
     public function testExecuteAjaxRequest()
@@ -208,6 +297,13 @@ public function testExecuteAjaxRequestWithoutPermissions(array $dataProviderConf
         $this->requestMock->expects($this->any())
             ->method('getParams')
             ->willReturn([]);
+        if ($isAllowed === false) {
+            $this->requestMock->expects($this->once())
+                ->method('isAjax')
+                ->willReturn(true);
+        }
+        $this->responseMock->expects($this->never())
+            ->method('setRedirect');
         $this->responseMock->expects($this->any())
             ->method('appendBody')
             ->with($renderedData);
diff --git a/app/code/Magento/Ui/Test/Unit/DataProvider/EavValidationRulesTest.php b/app/code/Magento/Ui/Test/Unit/DataProvider/EavValidationRulesTest.php
index debcde4765fc7..cdb62ce1db68d 100644
--- a/app/code/Magento/Ui/Test/Unit/DataProvider/EavValidationRulesTest.php
+++ b/app/code/Magento/Ui/Test/Unit/DataProvider/EavValidationRulesTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Test\Unit\DataProvider;
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -29,6 +30,9 @@ class EavValidationRulesTest extends \PHPUnit\Framework\TestCase
      */
     protected $attributeMock;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -42,11 +46,13 @@ protected function setUp()
     }
 
     /**
+     * @param string $attributeInputType
+     * @param mixed $validateRules
      * @param array $data
      * @param array $expected
      * @dataProvider buildDataProvider
      */
-    public function testBuild($attributeInputType, $validateRules, $data, $expected)
+    public function testBuild($attributeInputType, $validateRules, $data, $expected): void
     {
         $this->attributeMock->expects($this->once())->method('getFrontendInput')->willReturn($attributeInputType);
         $this->attributeMock->expects($this->any())->method('getValidateRules')->willReturn($validateRules);
@@ -70,11 +76,25 @@ public function buildDataProvider()
             ['', ['input_validation' => 'email'], [], ['validate-email' => true]],
             ['', ['input_validation' => 'date'], [], ['validate-date' => true]],
             ['', ['input_validation' => 'other'], [], []],
-            ['', ['max_text_length' => '254'], ['required' => 1], ['max_text_length' => 254, 'required-entry' => true]],
-            ['', ['max_text_length' => '254', 'min_text_length' => 1], [],
-                ['max_text_length' => 254, 'min_text_length' => 1]],
-            ['', ['max_text_length' => '254', 'input_validation' => 'date'], [],
-                ['max_text_length' => 254, 'validate-date' => true]],
+            ['', ['max_text_length' => '254'], ['required' => 1], ['required-entry' => true]],
+            [
+                '',
+                ['input_validation' => 'other', 'max_text_length' => '254'],
+                ['required' => 1],
+                ['max_text_length' => 254, 'required-entry' => true]
+            ],
+            [
+                '',
+                ['input_validation' => 'other', 'max_text_length' => '254', 'min_text_length' => 1],
+                [],
+                ['max_text_length' => 254, 'min_text_length' => 1]
+            ],
+            [
+                '',
+                ['max_text_length' => '254', 'input_validation' => 'date'],
+                [],
+                ['max_text_length' => 254, 'validate-date' => true]
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/DataProvider/Modifier/PoolTest.php b/app/code/Magento/Ui/Test/Unit/DataProvider/Modifier/PoolTest.php
index e411220596028..23e65d1f4c1cc 100644
--- a/app/code/Magento/Ui/Test/Unit/DataProvider/Modifier/PoolTest.php
+++ b/app/code/Magento/Ui/Test/Unit/DataProvider/Modifier/PoolTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Test\Unit\DataProvider\Modifier;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -100,7 +101,7 @@ public function testWithFewmodifiers()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Parameter "sortOrder" must be present.
+     * @expectedExceptionMessage The parameter "sortOrder" is missing. Set the "sortOrder" and try again.
      */
     public function testWithSortOrderException()
     {
@@ -119,7 +120,7 @@ public function testWithSortOrderException()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Parameter "class" must be present.
+     * @expectedExceptionMessage The parameter "class" is missing. Set the "class" and try again.
      */
     public function testWithClassException()
     {
diff --git a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
index dd6fd58d355e6..80cf7666eeedd 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
@@ -6,6 +6,8 @@
 namespace Magento\Ui\Test\Unit\Model\Export;
 
 use Magento\Framework\Api\Search\DocumentInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Listing\Columns;
 use Magento\Ui\Component\Listing\Columns\Column;
@@ -13,45 +15,95 @@
 use Magento\Ui\Model\Export\MetadataProvider;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class MetadataProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var MetadataProvider
      */
-    protected $model;
+    private $model;
 
     /**
      * @var Filter | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $filter;
+    private $filter;
+
+    /**
+     * @var TimezoneInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeDate;
+
+    /**
+     * @var ResolverInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeResolver;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->filter = $this->getMockBuilder(\Magento\Ui\Component\MassAction\Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->localeDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->localeResolver->expects($this->any())
+            ->method('getLocale')
+            ->willReturn(null);
+
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
             \Magento\Ui\Model\Export\MetadataProvider::class,
             [
                 'filter' => $this->filter,
+                'localeDate' => $this->localeDate,
+                'localeResolver' => $this->localeResolver,
+                'data' => ['component_name' => ['field']],
             ]
         );
     }
 
-    public function testGetHeaders()
+    /**
+     * @param array $columnLabels
+     * @param array $expected
+     * @return void
+     * @dataProvider getColumnsDataProvider
+     */
+    public function testGetHeaders(array $columnLabels, array $expected): void
     {
         $componentName = 'component_name';
         $columnName = 'column_name';
-        $columnLabel = 'column_label';
-
-        $component = $this->prepareColumns($componentName, $columnName, $columnLabel);
 
+        $component = $this->prepareColumns($componentName, $columnName, $columnLabels[0]);
         $result = $this->model->getHeaders($component);
         $this->assertTrue(is_array($result));
         $this->assertCount(1, $result);
-        $this->assertEquals($columnLabel, $result[0]);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function getColumnsDataProvider(): array
+    {
+        return [
+            [['ID'],['"ID"']],
+            [['Name'],['Name']],
+            [['Id'],['Id']],
+            [['id'],['id']],
+            [['IDTEST'],['"IDTEST"']],
+            [['ID TEST'],['"ID TEST"']],
+        ];
     }
 
     public function testGetFields()
@@ -328,4 +380,55 @@ public function getOptionsDataProvider()
             ],
         ];
     }
+
+    /**
+     * Test for convertDate function
+     *
+     * @param string $fieldValue
+     * @param string $expected
+     * @dataProvider convertDateProvider
+     * @covers       \Magento\Ui\Model\Export\MetadataProvider::convertDate()
+     */
+    public function testConvertDate($fieldValue, $expected)
+    {
+        $componentName = 'component_name';
+        /** @var DocumentInterface|\PHPUnit_Framework_MockObject_MockObject $document */
+        $document = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $document->expects($this->once())
+            ->method('getData')
+            ->with('field')
+            ->willReturn($fieldValue);
+
+        $this->localeDate->expects($this->once())
+            ->method('date')
+            ->willReturn(new \DateTime($fieldValue, new \DateTimeZone('UTC')));
+
+        $document->expects($this->once())
+            ->method('setData')
+            ->with('field', $expected);
+
+        $this->model->convertDate($document, $componentName);
+    }
+
+    /**
+     * Data provider for testConvertDate
+     *
+     * @return array
+     */
+    public function convertDateProvider()
+    {
+        return [
+            [
+                'fieldValue' => '@1534505233',
+                'expected' => 'Aug 17, 2018 11:27:13 AM',
+            ],
+            [
+                'fieldValue' => '@1534530000',
+                'expected' => 'Aug 17, 2018 06:20:00 PM',
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
index 96468b63314b4..e301741e9f048 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
@@ -152,9 +152,9 @@ public function testGetReader()
 
     public function testPrepareDataWithoutName()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            __("Invalid UI Component element name: ''")
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(
+            (string)__('The "" UI component element name is invalid. Verify the name and try again.')
         );
         $this->manager->prepareData(null);
     }
@@ -193,6 +193,9 @@ public function testPrepareGetData($componentName, $componentData, $isCached, $r
         );
     }
 
+    /**
+     * @return array
+     */
     public function getComponentData()
     {
         $cachedData = new \ArrayObject(
@@ -293,6 +296,9 @@ public function testCreateRawComponentData($componentName, $configData, $compone
         $this->assertEquals($componentData, $this->manager->createRawComponentData($componentName, $needEvaluate));
     }
 
+    /**
+     * @return array
+     */
     public function getComponentDataProvider()
     {
         return [
diff --git a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php
index 00a88437c8cb1..be3c1c60da5bc 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php
@@ -94,7 +94,8 @@ public function testSaveWithException()
             ->method('save')
             ->with($this->bookmarkMock)
             ->willThrowException(new \Exception($exceptionMessage));
-        $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class, __($exceptionMessage));
+        $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class);
+        $this->expectExceptionMessage($exceptionMessage);
         $this->bookmarkRepository->save($this->bookmarkMock);
     }
 
@@ -121,10 +122,12 @@ public function testGetByIdWithException()
             ->method('load')
             ->with($this->bookmarkMock, $notExistsBookmarkId)
             ->willReturn($this->bookmarkMock);
-        $this->expectException(
-            \Magento\Framework\Exception\NoSuchEntityException::class,
-            __('Bookmark with id "%1" does not exist.', $notExistsBookmarkId)
+        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+        $exceptionMessage = (string)__(
+            'The bookmark with "%1" ID doesn\'t exist. Verify your information and try again.',
+            $notExistsBookmarkId
         );
+        $this->expectExceptionMessage($exceptionMessage);
         $this->bookmarkRepository->getById($notExistsBookmarkId);
     }
 
@@ -143,7 +146,8 @@ public function testDeleteWithException()
             ->method('delete')
             ->with($this->bookmarkMock)
             ->willThrowException(new \Exception($exceptionMessage));
-        $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class, __($exceptionMessage));
+        $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class);
+        $this->expectExceptionMessage($exceptionMessage);
         $this->assertTrue($this->bookmarkRepository->delete($this->bookmarkMock));
     }
 
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index e9ace8bb159c0..296332e383509 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -5,18 +5,18 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-user": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-eav": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ui/etc/adminhtml/di.xml b/app/code/Magento/Ui/etc/adminhtml/di.xml
index 416d7a6916f88..e220581c42c24 100644
--- a/app/code/Magento/Ui/etc/adminhtml/di.xml
+++ b/app/code/Magento/Ui/etc/adminhtml/di.xml
@@ -44,4 +44,21 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Ui\Model\ColorPicker\ColorModesProvider">
+        <arguments>
+            <argument name="colorModesPool" xsi:type="array">
+                <item name="full" xsi:type="string">Magento\Ui\Model\ColorPicker\FullMode</item>
+                <item name="simple" xsi:type="string">Magento\Ui\Model\ColorPicker\SimpleMode</item>
+                <item name="noalpha" xsi:type="string">Magento\Ui\Model\ColorPicker\NoAlphaMode</item>
+                <item name="palette" xsi:type="string">Magento\Ui\Model\ColorPicker\PaletteOnlyMode</item>
+            </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/adminhtml/system.xml b/app/code/Magento/Ui/etc/adminhtml/system.xml
index 74e2e076b93c8..ab4272f8d2a34 100644
--- a/app/code/Magento/Ui/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ui/etc/adminhtml/system.xml
@@ -9,12 +9,12 @@
     <system>
         <section id="dev">
             <group id="js">
-                <field id="session_storage_logging" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="session_storage_logging" translate="label comment" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Log JS Errors to Session Storage</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>If enabled, can be used by functional tests for extended reporting</comment>
                 </field>
-                <field id="session_storage_key" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="session_storage_key" translate="label comment" type="text" sortOrder="110" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Log JS Errors to Session Storage Key</label>
                     <comment>Use this key to retrieve collected js errors</comment>
                 </field>
diff --git a/app/code/Magento/Ui/etc/db_schema.xml b/app/code/Magento/Ui/etc/db_schema.xml
new file mode 100644
index 0000000000000..e2a04b0cdc72d
--- /dev/null
+++ b/app/code/Magento/Ui/etc/db_schema.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="ui_bookmark" resource="default" engine="innodb" comment="Bookmark">
+        <column xsi:type="int" name="bookmark_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Bookmark identifier"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="User Id"/>
+        <column xsi:type="varchar" name="namespace" nullable="false" length="255" comment="Bookmark namespace"/>
+        <column xsi:type="varchar" name="identifier" nullable="false" length="255" comment="Bookmark Identifier"/>
+        <column xsi:type="smallint" name="current" padding="6" unsigned="false" nullable="false" identity="false"
+                comment="Mark current bookmark per user and identifier"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Bookmark title"/>
+        <column xsi:type="longtext" name="config" nullable="true" comment="Bookmark config"/>
+        <column xsi:type="datetime" name="created_at" on_update="false" nullable="false" comment="Bookmark created at"/>
+        <column xsi:type="datetime" name="updated_at" on_update="false" nullable="false" comment="Bookmark updated at"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="bookmark_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="UI_BOOKMARK_USER_ID_ADMIN_USER_USER_ID" table="ui_bookmark"
+                    column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
+        <index referenceId="UI_BOOKMARK_USER_ID_NAMESPACE_IDENTIFIER" indexType="btree">
+            <column name="user_id"/>
+            <column name="namespace"/>
+            <column name="identifier"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Ui/etc/db_schema_whitelist.json b/app/code/Magento/Ui/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..16d441f6d3ada
--- /dev/null
+++ b/app/code/Magento/Ui/etc/db_schema_whitelist.json
@@ -0,0 +1,22 @@
+{
+    "ui_bookmark": {
+        "column": {
+            "bookmark_id": true,
+            "user_id": true,
+            "namespace": true,
+            "identifier": true,
+            "current": true,
+            "title": true,
+            "config": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "UI_BOOKMARK_USER_ID_NAMESPACE_IDENTIFIER": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "UI_BOOKMARK_USER_ID_ADMIN_USER_USER_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
index 70e817d57da25..c029e18addf73 100644
--- a/app/code/Magento/Ui/etc/di.xml
+++ b/app/code/Magento/Ui/etc/di.xml
@@ -252,6 +252,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>
@@ -416,6 +417,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>
@@ -427,13 +429,6 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Catalog\Ui\DataProvider\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool">
-        <arguments>
-            <argument name="modifiers" xsi:type="array">
-                <item name="wysiwygDefaultSettings" xsi:type="object">Magento\Ui\DataProvider\Modifier\Wysiwyg\DefaultWysiwygSettings</item>
-            </argument>
-        </arguments>
-    </virtualType>
     <type name="Magento\Ui\Model\UiComponentTypeResolver">
         <arguments>
             <argument name="uiComponentTypeMap" xsi:type="array">
diff --git a/app/code/Magento/Ui/etc/module.xml b/app/code/Magento/Ui/etc/module.xml
index 20bd9de1567ee..967c33ae1648c 100644
--- a/app/code/Magento/Ui/etc/module.xml
+++ b/app/code/Magento/Ui/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Ui" setup_version="2.0.0">
+    <module name="Magento_Ui" >
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Magento_Directory"/>
diff --git a/app/code/Magento/Ui/etc/ui_components.xsd b/app/code/Magento/Ui/etc/ui_components.xsd
index 9a8ede09d59e0..eb8cc08f904fd 100644
--- a/app/code/Magento/Ui/etc/ui_components.xsd
+++ b/app/code/Magento/Ui/etc/ui_components.xsd
@@ -17,6 +17,7 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/button.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/checkbox.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/checkboxset.xsd"/>
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/colorPicker.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/column.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/columns.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/columnsControls.xsd"/>
@@ -28,6 +29,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"/>
@@ -36,6 +38,7 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/form.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/hidden.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/htmlContent.xsd"/>
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/imageUploader.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/input.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/insertForm.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/insertListing.xsd"/>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index 5deba03a03b3f..b839593a38f47 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -19,6 +19,7 @@
             <xs:element ref="button" maxOccurs="unbounded"/>
             <xs:element ref="checkbox" maxOccurs="unbounded"/>
             <xs:element ref="checkboxset" maxOccurs="unbounded"/>
+            <xs:element ref="colorPicker" maxOccurs="unbounded"/>
             <xs:element ref="component" maxOccurs="unbounded"/>
             <xs:element ref="container" maxOccurs="unbounded"/>
             <xs:element ref="dataSource" maxOccurs="unbounded"/>
@@ -34,6 +35,7 @@
             <xs:element ref="form" maxOccurs="unbounded"/>
             <xs:element ref="hidden" maxOccurs="unbounded"/>
             <xs:element ref="htmlContent" maxOccurs="unbounded"/>
+            <xs:element ref="imageUploader" maxOccurs="unbounded"/>
             <xs:element ref="input" maxOccurs="unbounded"/>
             <xs:element ref="insertForm" maxOccurs="unbounded"/>
             <xs:element ref="insertListing" maxOccurs="unbounded"/>
@@ -53,6 +55,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">
@@ -64,6 +67,7 @@
             <xs:element ref="button" maxOccurs="unbounded"/>
             <xs:element ref="checkbox" maxOccurs="unbounded"/>
             <xs:element ref="checkboxset" maxOccurs="unbounded"/>
+            <xs:element ref="colorPicker" maxOccurs="unbounded"/>
             <xs:element ref="column" maxOccurs="unbounded"/>
             <xs:element ref="columns" maxOccurs="unbounded"/>
             <xs:element ref="columnsControls" maxOccurs="unbounded"/>
@@ -156,6 +160,7 @@
             <xs:element ref="button" maxOccurs="unbounded"/>
             <xs:element ref="checkbox" maxOccurs="unbounded"/>
             <xs:element ref="checkboxset" maxOccurs="unbounded"/>
+            <xs:element ref="colorPicker" maxOccurs="unbounded"/>
             <xs:element ref="column" maxOccurs="unbounded"/>
             <xs:element ref="columns" maxOccurs="unbounded"/>
             <xs:element ref="columnsControls" maxOccurs="unbounded"/>
@@ -180,6 +185,7 @@
             <xs:element ref="form" maxOccurs="unbounded"/>
             <xs:element ref="hidden" maxOccurs="unbounded"/>
             <xs:element ref="htmlContent" maxOccurs="unbounded"/>
+            <xs:element ref="imageUploader" maxOccurs="unbounded"/>
             <xs:element ref="input" maxOccurs="unbounded"/>
             <xs:element ref="insertForm" maxOccurs="unbounded"/>
             <xs:element ref="insertListing" maxOccurs="unbounded"/>
@@ -203,6 +209,30 @@
         </xs:choice>
     </xs:group>
 
+    <xs:group name="formElementsConfig">
+        <xs:choice>
+            <xs:element name="hidden" type="formElementHidden" maxOccurs="unbounded"/>
+            <xs:element name="file" type="formElementFile" maxOccurs="unbounded"/>
+            <xs:element name="input" type="formElementInput" maxOccurs="unbounded"/>
+            <xs:element name="date" type="formElementDate" maxOccurs="unbounded"/>
+            <xs:element name="boolean" type="formElementBoolean" maxOccurs="unbounded"/>
+            <xs:element name="checkbox" type="formElementCheckbox" maxOccurs="unbounded"/>
+            <xs:element name="checkboxset" type="formElementCheckboxset" maxOccurs="unbounded"/>
+            <xs:element name="email" type="formElementEmail" maxOccurs="unbounded"/>
+            <xs:element name="colorPicker" type="formElementColorPicker" maxOccurs="unbounded"/>
+            <xs:element name="select" type="formElementSelect" maxOccurs="unbounded"/>
+            <xs:element name="multiselect" type="formElementMultiselect" maxOccurs="unbounded"/>
+            <xs:element name="text" type="formElementText" maxOccurs="unbounded"/>
+            <xs:element name="textarea" type="formElementTextarea" maxOccurs="unbounded"/>
+            <xs:element name="price" type="formElementPrice" maxOccurs="unbounded"/>
+            <xs:element name="radioset" type="formElementRadioset" maxOccurs="unbounded"/>
+            <xs:element name="wysiwyg" type="formElementWysiwyg" maxOccurs="unbounded"/>
+            <xs:element name="fileUploader" type="formElementFileUploader" maxOccurs="unbounded"/>
+            <xs:element name="imageUploader" type="formElementImageUploader" maxOccurs="unbounded"/>
+            <xs:element name="button" type="formElementButton" maxOccurs="unbounded"/>
+        </xs:choice>
+    </xs:group>
+
     <xs:complexType name="componentListingConfigured">
         <xs:complexContent>
             <xs:extension base="componentListing">
@@ -281,7 +311,7 @@
                         </xs:annotation>
                         <xs:complexType>
                             <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:group ref="formElements"/>
+                                <xs:group ref="formElementsConfig"/>
                             </xs:choice>
                         </xs:complexType>
                     </xs:element>
@@ -446,6 +476,14 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
+    <xs:element name="colorPicker" type="componentColorPicker">
+        <xs:annotation>
+            <xs:documentation>
+                The ColorPicker component uses the Spectrum and tinycolor .js libraries to make it easier to choose and
+                implement color values.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
     <xs:element name="column" type="componentColumn">
         <xs:annotation>
             <xs:documentation>
@@ -615,6 +653,14 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
+    <xs:element name="imageUploader" type="componentImageUploader">
+        <xs:annotation>
+            <xs:documentation>
+                Adds image gallery functionality alongside file uploader functionality.
+                See fileUploader component documentation for more information.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
     <xs:element name="input" type="componentInput">
         <xs:annotation>
             <xs:documentation>
@@ -770,4 +816,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 d22605398571d..e86e2654ff629 100644
--- a/app/code/Magento/Ui/etc/ui_definition.xsd
+++ b/app/code/Magento/Ui/etc/ui_definition.xsd
@@ -28,6 +28,7 @@
             <xs:element name="button" type="componentButton"/>
             <xs:element name="checkbox" type="componentCheckbox"/>
             <xs:element name="checkboxset" type="componentCheckboxset"/>
+            <xs:element name="colorPicker" type="componentColorPicker"/>
             <xs:element name="column" type="componentColumn"/>
             <xs:element name="columns" type="componentColumns"/>
             <xs:element name="columnsControls" type="componentColumnsControls"/>
@@ -53,6 +54,7 @@
             <xs:element name="hidden" type="componentHidden"/>
             <xs:element name="htmlContent" type="componentHtmlContent" />
             <xs:element name="image" type="componentFile"/>
+            <xs:element name="imageUploader" type="componentImageUploader"/>
             <xs:element name="input" type="componentInput"/>
             <xs:element name="insertForm" type="componentInsertForm"/>
             <xs:element name="insertListing" type="componentInsertListing"/>
@@ -74,6 +76,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/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
index 225d83387563b..d51ff98108376 100644
--- a/app/code/Magento/Ui/i18n/en_US.csv
+++ b/app/code/Magento/Ui/i18n/en_US.csv
@@ -58,6 +58,7 @@ Keyword,Keyword
 "Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please"
 "Letters only please","Letters only please"
 "No white space please","No white space please"
+"No marginal white space please","No marginal white space please"
 "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"
 "A positive or negative non-decimal number please","A positive or negative non-decimal number please"
 "The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid."
@@ -125,30 +126,18 @@ Ok,Ok
 "Label Actions Two","Label Actions Two"
 "Some Dynamic Actions","Some Dynamic Actions"
 "Log JS Errors to Session Storage","Log JS Errors to Session Storage"
+"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
 "Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
+"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
 settings/label,settings/label
 settings/confirm/title,settings/confirm/title
-"settings/confirm/message
-                        ","settings/confirm/message
-                        "
-"
-                            settings/callback/provider
-                        ","
-                            settings/callback/provider
-                        "
-"settings/callback/target
-                        ","settings/callback/target
-                        "
-"settings/newViewLabel
-                    ","settings/newViewLabel
-                    "
+"settings/confirm/message","settings/confirm/message"
+"settings/callback/provider","settings/callback/provider"
+"settings/callback/target","settings/callback/target"
+"settings/newViewLabel","settings/newViewLabel"
 settings/title,settings/title
 settings/description,settings/description
-"
-                        settings/addButtonLabel
-                    ","
-                        settings/addButtonLabel
-                    "
+"settings/addButtonLabel","settings/addButtonLabel"
 "
                         formElements/*[name(.)=../../@formElement]/settings/description
                     ","
@@ -192,7 +181,7 @@ CSV,CSV
 "Please enter a valid value from list","Please enter a valid value from list"
 "Please enter valid SKU key.","Please enter valid SKU key."
 "Please enter a valid number.","Please enter a valid number."
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
 "Please fix this field.","Please fix this field."
 "Please enter a valid date (ISO).","Please enter a valid date (ISO)."
 "Please enter only digits.","Please enter only digits."
@@ -201,3 +190,4 @@ CSV,CSV
 "Please enter at least {0} characters.","Please enter at least {0} characters."
 "Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long."
 "Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}."
+"was not uploaded","was not uploaded"
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/requirejs-config.js b/app/code/Magento/Ui/view/base/requirejs-config.js
index 2d20367875be7..cdbbd03c93ae1 100644
--- a/app/code/Magento/Ui/view/base/requirejs-config.js
+++ b/app/code/Magento/Ui/view/base/requirejs-config.js
@@ -5,18 +5,12 @@
 
 var config = {
     shim: {
-        'tinymceDeprecated': {
-            'exports': 'tinymce'
-        },
-        'tinymce4': {
-            'exports': 'tinymce'
+        'tiny_mce_4/tinymce.min': {
+            exports: 'tinyMCE'
         }
     },
     paths: {
-        'ui/template': 'Magento_Ui/templates',
-        'tinymceDeprecated': 'Magento_Tinymce3/tiny_mce/tiny_mce_src',
-        'tinymce4': 'tiny_mce_4/tinymce.min',
-        'wysiwygAdapter': 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
+        'ui/template': 'Magento_Ui/templates'
     },
     map: {
         '*': {
@@ -28,7 +22,9 @@ var config = {
             uiRegistry:     'Magento_Ui/js/lib/registry/registry',
             consoleLogger:  'Magento_Ui/js/lib/logger/console-logger',
             uiLayout:       'Magento_Ui/js/core/renderer/layout',
-            buttonAdapter:  'Magento_Ui/js/form/button-adapter'
+            buttonAdapter:  'Magento_Ui/js/form/button-adapter',
+            tinymce4:       'tiny_mce_4/tinymce.min',
+            wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
         }
     }
 };
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
index 1ff1722f944fb..757b1d3a4e425 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
@@ -17,7 +17,7 @@
     </button>
     <?php if ($block->hasSplit()): ?>
         <button <?= $block->getToggleAttributesHtml() ?>>
-            <span>Select</span>
+            <span><?= /* @escapeNotVerified */ __('Select'); ?></span>
         </button>
 
         <?php if (!$block->getDisabled()): ?>
@@ -40,12 +40,10 @@
         <?php endif; ?>
     <?php endif; ?>
 </div>
-
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
-</script>
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
index a4473adc099be..22607921296c7 100644
--- a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
+++ b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
@@ -13,8 +13,10 @@
 
 <script>
     require.config({
-        paths: {
-            wysiwygAdapter: '<?php /* @noEscape */ echo $block->getWysiwygAdapterPath(); ?>'
+        map: {
+            '*': {
+                wysiwygAdapter: '<?php /* @noEscape */ echo $block->getWysiwygAdapterPath(); ?>'
+            }
         }
     });
 </script>
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 06c9312468f89..ccd702c23ea65 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
@@ -16,15 +16,11 @@
                     <item name="url" type="url" xsi:type="converter">settings/url</item>
                     <item name="confirm" xsi:type="array">
                         <item name="title" type="string" translate="true" xsi:type="xpath">settings/confirm/title</item>
-                        <item name="message" type="string" translate="true" xsi:type="xpath">settings/confirm/message
-                        </item>
+                        <item name="message" type="string" translate="true" xsi:type="xpath">settings/confirm/message</item>
                     </item>
                     <item name="callback" xsi:type="array">
-                        <item name="provider" type="string" translate="true" xsi:type="xpath">
-                            settings/callback/provider
-                        </item>
-                        <item name="target" type="string" translate="true" xsi:type="xpath">settings/callback/target
-                        </item>
+                        <item name="provider" type="string" translate="true" xsi:type="xpath">settings/callback/provider</item>
+                        <item name="target" type="string" translate="true" xsi:type="xpath">settings/callback/target</item>
                     </item>
                 </item>
             </argument>
@@ -59,8 +55,7 @@
                 <item name="config" xsi:type="array">
                     <item name="childDefaults" type="item" xsi:type="converter">settings/childDefaults</item>
                     <item name="viewTmpl" type="string" xsi:type="xpath">settings/viewTmpl</item>
-                    <item name="newViewLabel" translate="true" type="string" xsi:type="xpath">settings/newViewLabel
-                    </item>
+                    <item name="newViewLabel" translate="true" type="string" xsi:type="xpath">settings/newViewLabel</item>
                 </item>
             </argument>
         </schema>
@@ -103,6 +98,16 @@
             </argument>
         </schema>
     </component>
+    <component name="colorPicker" include="abstractSettings">
+        <schema name="current">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="colorPickerMode" type="string" xsi:type="xpath">settings/colorPickerMode</item>
+                    <item name="colorFormat" type="string" xsi:type="xpath">settings/colorFormat</item>
+                </item>
+            </argument>
+        </schema>
+    </component>
     <component name="column" include="uiElementSettings">
         <schema name="current">
             <argument name="data" xsi:type="array">
@@ -255,9 +260,7 @@
                     <item name="columnsHeaderClasses" type="string" xsi:type="xpath">settings/columnsHeaderClasses</item>
                     <item name="recordTemplate" type="string" xsi:type="xpath">settings/recordTemplate</item>
                     <item name="collapsibleHeader" type="boolean" xsi:type="xpath">settings/collapsibleHeader</item>
-                    <item name="addButtonLabel" type="string" translate="true" xsi:type="xpath">
-                        settings/addButtonLabel
-                    </item>
+                    <item name="addButtonLabel" type="string" translate="true" xsi:type="xpath">settings/addButtonLabel</item>
                     <item name="addButton" type="boolean" xsi:type="xpath">settings/addButton</item>
                     <item name="deleteProperty" type="string" xsi:type="xpath">settings/deleteProperty</item>
                     <item name="identificationProperty" type="string" xsi:type="xpath">settings/identificationProperty</item>
@@ -287,6 +290,12 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="formElement" type="string" xsi:type="xpath">@formElement</item>
+                    <item name="colorPickerMode" type="string" xsi:type="xpath">
+                        formElements/*[name(.)=../../@formElement]/settings/colorPickerMode
+                    </item>
+                    <item name="colorFormat" type="string" xsi:type="xpath">
+                        formElements/*[name(.)=../../@formElement]/settings/colorFormat
+                    </item>
                     <item name="wysiwyg" type="boolean" xsi:type="xpath">
                         formElements/*[name(.)=../../@formElement]/settings/wysiwyg
                     </item>
@@ -359,6 +368,12 @@
                     <item name="allowedExtensions" type="string" xsi:type="xpath">
                         formElements/*[name(.)=../../@formElement]/settings/allowedExtensions
                     </item>
+                    <item name="openDialogTitle" type="string" xsi:type="xpath">
+                        formElements/*[name(.)=../../@formElement]/settings/openDialogTitle
+                    </item>
+                    <item name="initialMediaGalleryOpenSubpath" type="string" xsi:type="xpath">
+                        formElements/*[name(.)=../../@formElement]/settings/initialMediaGalleryOpenSubpath
+                    </item>
                     <item name="customEntry" type="string" xsi:type="xpath">
                         formElements/*[name(.)=../../@formElement]/settings/customEntry
                     </item>
@@ -404,6 +419,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">
@@ -419,6 +450,16 @@
             </argument>
         </schema>
     </component>
+    <component name="imageUploader" include="fileUploader">
+        <schema name="current">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="openDialogTitle" type="string" translate="true" xsi:type="xpath">settings/openDialogTitle</item>
+                    <item name="initialMediaGalleryOpenSubpath" type="string" xsi:type="xpath">settings/initialMediaGalleryOpenSubpath</item>
+                </item>
+            </argument>
+        </schema>
+    </component>
     <component name="filterRange" include="uiElementSettings">
         <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 0f708e4d138dd..75374a82f1da3 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
@@ -144,6 +144,25 @@
     <multiline class="Magento\Ui\Component\Form\Element\Multiline" component="Magento_Ui/js/form/components/group"/>
     <range class="Magento\Ui\Component\Form\Element\Range" component="Magento_Ui/js/grid/filters/range"/>
     <fileUploader class="Magento\Ui\Component\Form\Element\DataType\Media" component="Magento_Ui/js/form/element/file-uploader" template="ui/form/element/uploader/uploader"/>
+    <imageUploader class="Magento\Ui\Component\Form\Element\DataType\Media\Image" component="Magento_Ui/js/form/element/image-uploader" template="ui/form/element/uploader/image">
+        <settings>
+            <initialMediaGalleryOpenSubpath>wysiwyg</initialMediaGalleryOpenSubpath>
+        </settings>
+    </imageUploader>
+    <colorPicker class="Magento\Ui\Component\Form\Element\ColorPicker" component="Magento_Ui/js/form/element/color-picker" template="ui/form/field">
+        <settings>
+            <elementTmpl>ui/form/element/color-picker</elementTmpl>
+            <colorFormat>rgb</colorFormat>
+            <colorPickerMode>full</colorPickerMode>
+        </settings>
+    </colorPicker>
+    <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/boolean.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
index 7cc33cf4351df..21ca445a4177b 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentBoolean">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentBooleanSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementBoolean">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice maxOccurs="unbounded" minOccurs="0">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentBooleanSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
index f4b4dd403509f..3c9866e6845e7 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
@@ -23,6 +23,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementButton">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentButtonSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentButtonSettings">
         <xs:choice>
             <xs:group ref="uiElementSettings"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
index 13bc629606470..4dfb074498e5b 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentCheckbox">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentCheckboxSetting"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementCheckbox">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentCheckboxSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="description" type="translatableString">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
index b0dea52cb4bd9..8fa509fa594d6 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentCheckboxset">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentCheckboxsetSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementCheckboxset">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice maxOccurs="unbounded" minOccurs="0">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentCheckboxsetSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element ref="multiple"/>
             <xs:element name="options" type="optionsType"/>
         </xs:choice>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
new file mode 100644
index 0000000000000..dea1f7ce059e9
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/ui_component.xsd"/>
+
+    <xs:complexType name="componentColorPicker">
+        <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="componentColorPickerSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementColorPicker">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentColorPickerSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:group name="componentColorPickerSettings">
+        <xs:choice>
+            <xs:group ref="abstractSettings"/>
+            <xs:element name="colorFormat" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Defines the color format that is displayed in selection tool as well as in input field.
+                        Valid formats: hex, rgb, hsl, hsv, name, none
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="colorPickerMode" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Defines the mode that affects available color picker functionality
+                        Valid modes: simple, full, noalpha, palette
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:group>
+</xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
index b24ba626a9ea1..a2a8fbbe103c1 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentDate">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentDateSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementDate">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentDateSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="options" type="dateOptionsType">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
index cd1147b560034..648eaf9db5b18 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentEmail">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentEmailSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementEmail">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentEmailSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
index eac284ddc92d8..1536f752a0aaf 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentFile">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentFileSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementFile">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentFileSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
index 3181a7ab673cd..664a2d0e8d904 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
@@ -23,6 +23,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementFileUploader">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentFileUploaderSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentFileUploaderSettings">
         <xs:choice>
             <xs:group ref="abstractSettings"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
index 82282dd61673f..0e7a6f4ed5fe0 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentHidden">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="hiddenSetting"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementHidden">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="hiddenSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
new file mode 100644
index 0000000000000..f32d5c2c0fe8f
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
@@ -0,0 +1,58 @@
+<?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 fileUploader section -->
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/fileUploader.xsd"/>
+
+    <xs:complexType name="componentImageUploader">
+        <xs:sequence>
+            <xs:group ref="configurable" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="settings" maxOccurs="1" minOccurs="0">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="componentImageUploaderSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementImageUploader">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentImageUploaderSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:group name="componentImageUploaderSettings">
+        <xs:choice>
+            <xs:group ref="componentFileUploaderSettings"/>
+            <xs:element name="openDialogTitle" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Defines the title that appears when opening media browser dialog slideout.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="initialMediaGalleryOpenSubpath" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Defines the initial subpath relative to root that will be open when opening media gallery
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:group>
+</xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
index fc3ea2d92576a..047212f3973e4 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
@@ -15,6 +15,7 @@
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings" minOccurs="0"/>
                         <xs:group ref="inputSetting"/>
                     </xs:choice>
                 </xs:complexType>
@@ -23,6 +24,18 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementInput">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="inputSetting"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
 
     <xs:complexType name="componentRange">
         <xs:complexContent>
@@ -73,7 +86,6 @@
 
     <xs:group name="inputSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings" minOccurs="0"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
index 28d9d24868820..aefb0328c8800 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentMultiselect">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentMultiselectSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementMultiselect">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
index 5a3053e59be95..69b936c3e5f8a 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
@@ -12,7 +12,32 @@
     <xs:complexType name="componentPrice">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="componentPriceSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
         </xs:sequence>
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
+
+    <xs:complexType name="formElementPrice">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="componentPriceSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:group name="componentPriceSettings">
+        <xs:choice>
+        </xs:choice>
+    </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
index c53ad0333d6d7..f2db9a57c5a1c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentRadioset">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentRadiosetSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementRadioset">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentRadiosetSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element ref="multiple"/>
             <xs:element name="options" type="optionsType"/>
         </xs:choice>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
index 7e0d2dfbfeb18..76d37de771a4c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
@@ -15,6 +15,7 @@
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
                         <xs:group ref="componentSelectSettings"/>
                     </xs:choice>
                 </xs:complexType>
@@ -29,9 +30,21 @@
         </xs:complexContent>
     </xs:complexType>
 
+    <xs:complexType name="formElementSelect">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentSelectSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentSelectSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="options" type="optionsType">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
index e382af84111c7..813ad7870bfe9 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentText">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="dataTypeTextSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementText">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="dataTypeTextSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
index ad7fda6200a79..67ee63a3f889f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentTextarea">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentTextareaSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementTextarea">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentTextareaSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element ref="rows"/>
             <xs:element ref="cols"/>
         </xs:choice>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
index 9f9d1f519f45e..cbf69e6046943 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 0000000000000..98918d92944e9
--- /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/ui_component/etc/definition/wysiwyg.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
index 62c81234aba33..3e7bbb3a59f8c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentWysiwyg">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentWysiwygSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementWysiwyg">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentWysiwygSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="content" type="xs:string">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml
index dd4a2038a53c4..5bbf252c8a787 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-bind="scope: '{{getName()}}.areas'" class="entry-edit form-inline">
         <!-- ko template: getTemplate() --><!-- /ko -->
     </div>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml
index 6dc91cf6b3d5b..977ea8374dfa8 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-bind="scope: '{{getName()}}.areas'">
         <!-- ko template: getTemplate() --><!-- /ko -->
     </div>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml
index baab52111aebe..aedf18961a719 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.{{getName()}}" class="admin__form-loading-mask">
         <div class="spinner">
             <span/><span/><span/><span/><span/><span/><span/><span/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml
index 5e0d699ed3edc..9d7715db905ab 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.areas" class="admin__data-grid-loading-mask">
         <div class="spinner">
             <span/><span/><span/><span/><span/><span/><span/><span/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
index 88a8e42e2966b..661c7c0c23dfb 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
@@ -9,7 +9,7 @@
     class="admin__data-grid-outer-wrap"
     data-bind="scope: '{{getName()}}.{{getName()}}'"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.{{getName()}}.{{spinner}}" class="admin__data-grid-loading-mask">
         <div class="spinner">
             <span/><span/><span/><span/><span/><span/><span/><span/>
diff --git a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
index fe312738469e7..ac1de4631e908 100644
--- a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
+++ b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
@@ -224,7 +224,7 @@ define([
          */
         build: function (parent, node, name) {
             var defaults    = parent && parent.childDefaults || {},
-                children    = node.children,
+                children    = this.filterDisabledChildren(node.children),
                 type        = getNodeType(parent, node),
                 dataScope   = getDataScope(parent, node),
                 component,
@@ -294,6 +294,35 @@ define([
             return node;
         },
 
+        /**
+         * Filter out all disabled components.
+         *
+         * @param {Object} children
+         * @returns {*}
+         */
+        filterDisabledChildren: function (children) {
+            var cIds;
+
+            //cleanup children config.componentDisabled = true
+            if (children && typeof children === 'object') {
+                cIds = Object.keys(children);
+
+                if (cIds) {
+                    _.each(cIds, function (cId) {
+                        if (typeof children[cId] === 'object' &&
+                            children[cId].hasOwnProperty('config') &&
+                            typeof children[cId].config === 'object' &&
+                            children[cId].config.hasOwnProperty('componentDisabled') &&
+                            children[cId].config.componentDisabled === true) {
+                            delete children[cId];
+                        }
+                    });
+                }
+            }
+
+            return children;
+        },
+
         /**
          * Init component.
          *
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 c707c504e2384..dc6f8d930a144 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
@@ -109,9 +109,8 @@ define([
          * @param {String|Number} recordId
          */
         deleteRecord: function (index, recordId) {
-            this._super();
-
             this.updateInsertData(recordId);
+            this._super();
         },
 
         /**
@@ -124,7 +123,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 d4eea859b4d35..1d52fc78d7a85 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -224,6 +224,14 @@ define([
             return this;
         },
 
+        /** @inheritdoc */
+        destroy: function () {
+            if (this.dnd()) {
+                this.dnd().destroy();
+            }
+            this._super();
+        },
+
         /**
          * Calls 'initObservable' of parent
          *
@@ -322,9 +330,7 @@ define([
             }
 
             if (this.defaultPagesState[this.currentPage()]) {
-                this.pagesChanged[this.currentPage()] =
-                    !compareArrays(this.defaultPagesState[this.currentPage()], this.arrayFilter(this.getChildItems()));
-                this.changed(_.some(this.pagesChanged));
+                this.setChangedForCurrentPage();
             }
         },
 
@@ -434,13 +440,9 @@ define([
                     return initialize;
                 }));
 
-                this.pagesChanged[this.currentPage()] =
-                    !compareArrays(this.defaultPagesState[this.currentPage()], this.arrayFilter(this.getChildItems()));
-                this.changed(_.some(this.pagesChanged));
+                this.setChangedForCurrentPage();
             } else if (this.hasInitialPagesState[this.currentPage()]) {
-                this.pagesChanged[this.currentPage()] =
-                    !compareArrays(this.defaultPagesState[this.currentPage()], this.arrayFilter(this.getChildItems()));
-                this.changed(_.some(this.pagesChanged));
+                this.setChangedForCurrentPage();
             }
         },
 
@@ -533,7 +535,8 @@ define([
          * Init header elements
          */
         initHeader: function () {
-            var data;
+            var labels = [],
+                data;
 
             if (!this.labels().length) {
                 _.each(this.childTemplate.children, function (cell) {
@@ -546,9 +549,9 @@ define([
                         columnsHeaderClasses: cell.config.columnsHeaderClasses,
                         sortOrder: cell.config.sortOrder
                     });
-
-                    this.labels.push(data);
+                    labels.push(data);
                 }, this);
+                this.labels(_.sortBy(labels, 'sortOrder'));
             }
         },
 
@@ -712,6 +715,8 @@ define([
          * @param {Number} page - current page
          */
         changePage: function (page) {
+            this.clear();
+
             if (page === 1 && !this.recordData().length) {
                 return false;
             }
@@ -753,7 +758,6 @@ define([
          * Change page to next
          */
         nextPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() + 1);
         },
 
@@ -761,7 +765,6 @@ define([
          * Change page to previous
          */
         previousPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() - 1);
         },
 
@@ -839,7 +842,8 @@ define([
         deleteRecord: function (index, recordId) {
             var recordInstance,
                 lastRecord,
-                recordsData;
+                recordsData,
+                lastRecordIndex;
 
             if (this.deleteProperty) {
                 recordsData = this.recordData();
@@ -858,12 +862,13 @@ define([
                 this.update = true;
 
                 if (~~this.currentPage() === this.pages()) {
+                    lastRecordIndex = this.startIndex + this.getChildItems().length - 1;
                     lastRecord =
                         _.findWhere(this.elems(), {
-                            index: this.startIndex + this.getChildItems().length - 1
+                            index: lastRecordIndex
                         }) ||
                         _.findWhere(this.elems(), {
-                            index: (this.startIndex + this.getChildItems().length - 1).toString()
+                            index: lastRecordIndex.toString()
                         });
 
                     lastRecord.destroy();
@@ -901,7 +906,7 @@ define([
             prop = prop || this.identificationProperty;
 
             return _.reject(this.getChildItems(), function (recordData) {
-                return ~~recordData[prop] === ~~id;
+                return recordData[prop].toString() === id.toString();
             }, this);
         },
 
@@ -1124,6 +1129,18 @@ define([
             });
 
             this.isDifferedFromDefault(!_.isEqual(recordData, this.default));
+        },
+
+        /**
+         * Set the changed property if the current page is different
+         * than the default state
+         *
+         * @return void
+         */
+        setChangedForCurrentPage: function () {
+            this.pagesChanged[this.currentPage()] =
+                !compareArrays(this.defaultPagesState[this.currentPage()], this.arrayFilter(this.getChildItems()));
+            this.changed(_.some(this.pagesChanged));
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js
index 0be9af06f9579..660d3382cb97c 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js
@@ -8,16 +8,12 @@
  */
 define([
     'jquery',
-    'underscore'
-], function ($, _) {
+    'underscore',
+    'Magento_Ui/js/form/adapter/buttons'
+], function ($, _, buttons) {
     'use strict';
 
-    var buttons = {
-            'reset':            '#reset',
-            'save':             '#save',
-            'saveAndContinue':  '#save_and_continue'
-        },
-        selectorPrefix = '',
+    var selectorPrefix = '',
         eventPrefix;
 
     /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js
new file mode 100644
index 0000000000000..2b939e25da479
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define(function () {
+    'use strict';
+
+    return {
+        'reset': '#reset',
+        'save': '#save',
+        'saveAndContinue': '#save_and_continue'
+    };
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/area.js b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
index 5967b8c57b5d3..741e6d3065023 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/area.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
@@ -44,7 +44,7 @@ define([
 
         /**
          * Calls parent's initElement method.
-         * Assignes callbacks on various events of incoming element.
+         * Assigns callbacks on various events of incoming element.
          * @param  {Object} elem
          * @return {Object} - reference to instance
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
index 2c12486ceb519..c31963e98627d 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
@@ -91,7 +91,7 @@ define([
         },
 
         /**
-         * Returnes true if current set of items differ from initial one,
+         * Returns true if current set of items differ from initial one,
          * or if some child has been changed.
          *
          * @returns {Boolean}
@@ -153,6 +153,7 @@ define([
          * Creates function that removes element
          * from collection using '_removeChild' method.
          * @param  {Object} elem - Element that should be removed.
+         * @deprecated Not used anymore
          */
         removeAddress: function (elem) {
             var self = this;
@@ -169,7 +170,7 @@ define([
         },
 
         /**
-         * Removes elememt from both collection and data storage,
+         * Removes element from both collection and data storage,
          * activates first element if removed one was active,
          * triggers 'update' event.
          *
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
index c2a65371471c5..045c25ab7911f 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
@@ -19,7 +19,7 @@ define([
     };
 
     /**
-     * Parses incoming data and returnes result merged with default preview config
+     * Parses incoming data and returns result merged with default preview config
      *
      * @param  {Object|String} data
      * @return {Object}
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index 371a0773f9d7e..1ddc4dc247b24 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -22,7 +22,7 @@ define([
             opened: false,
             level: 0,
             visible: true,
-            initializeFieldsetDataByDefault: false,    /* Data in some fieldsets should be initialized before open */
+            initializeFieldsetDataByDefault: false, /* Data in some fieldsets should be initialized before open */
             disabled: false,
             listens: {
                 'opened': 'onVisibilityChange'
@@ -68,7 +68,7 @@ define([
 
         /**
          * Calls parent's initElement method.
-         * Assignes callbacks on various events of incoming element.
+         * Assigns callbacks on various events of incoming element.
          *
          * @param  {Object} elem
          * @return {Object} - reference to instance
@@ -77,9 +77,9 @@ define([
             elem.initContainer(this);
 
             elem.on({
-                'update':   this.onChildrenUpdate,
-                'loading':  this.onContentLoading,
-                'error':  this.onChildrenError
+                'update': this.onChildrenUpdate,
+                'loading': this.onContentLoading,
+                'error': this.onChildrenError
             });
 
             if (this.disabled) {
@@ -115,14 +115,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }
@@ -155,11 +155,42 @@ define([
          * @param {String} message - error message.
          */
         onChildrenError: function (message) {
-            var hasErrors = this.elems.some('error');
+            var hasErrors = false;
+
+            if (!message) {
+                hasErrors = this._isChildrenHasErrors(hasErrors, this);
+            }
 
             this.error(hasErrors || message);
         },
 
+        /**
+         * Returns errors of children if exist
+         *
+         * @param {Boolean} hasErrors
+         * @param {*} container
+         * @return {Boolean}
+         * @private
+         */
+        _isChildrenHasErrors: function (hasErrors, container) {
+            var self = this;
+
+            if (hasErrors === false && container.hasOwnProperty('elems')) {
+                hasErrors = container.elems.some('error');
+
+                if (hasErrors === false && container.hasOwnProperty('_elems')) {
+                    container._elems.forEach(function (child) {
+
+                        if (hasErrors === false) {
+                            hasErrors = self._isChildrenHasErrors(hasErrors, child);
+                        }
+                    });
+                }
+            }
+
+            return hasErrors;
+        },
+
         /**
          * Callback that sets loading property to true.
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/group.js b/app/code/Magento/Ui/view/base/web/js/form/components/group.js
index f6937cffe1f2f..8c5950f7e2fa1 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/group.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/group.js
@@ -58,14 +58,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/html.js b/app/code/Magento/Ui/view/base/web/js/form/components/html.js
index 82e51aff40287..c8bb849361af1 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/html.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/html.js
@@ -20,7 +20,10 @@ define([
             loading:        false,
             visible:        true,
             template:       'ui/content/content',
-            additionalClasses: {}
+            additionalClasses: {},
+            ignoreTmpls: {
+                content: true
+            }
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index 6bbcb4416d33a..3b98d2c93c7a9 100755
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -40,6 +40,7 @@ define([
             showFallbackReset: false,
             additionalClasses: {},
             isUseDefault: '',
+            serviceDisabled: false,
             valueUpdate: false, // ko binding valueUpdate
 
             switcherConfig: {
@@ -56,6 +57,9 @@ define([
                 '${ $.provider }:${ $.customScope ? $.customScope + "." : ""}data.validate': 'validate',
                 'isUseDefault': 'toggleUseDefault'
             },
+            ignoreTmpls: {
+                value: true
+            },
 
             links: {
                 value: '${ $.provider }:${ $.dataScope }'
@@ -97,7 +101,7 @@ define([
             this._super();
 
             this.observe('error disabled focused preview visible value warn notice isDifferedFromDefault')
-                .observe('isUseDefault')
+                .observe('isUseDefault serviceDisabled')
                 .observe({
                     'required': !!rules['required-entry']
                 });
@@ -118,8 +122,8 @@ define([
 
             this._super();
 
-            scope = this.dataScope;
-            name = scope.split('.').slice(1);
+            scope = this.dataScope.split('.');
+            name = scope.length > 1 ? scope.slice(1) : scope;
 
             valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate;
 
@@ -220,7 +224,7 @@ define([
         },
 
         /**
-         * Sets 'value' as 'hidden' propertie's value, triggers 'toggle' event,
+         * Sets 'value' as 'hidden' property's value, triggers 'toggle' event,
          * sets instance's hidden identifier in params storage based on
          * 'value'.
          *
@@ -407,7 +411,7 @@ define([
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form
-            if (!isValid) {
+            if (this.source && !isValid) {
                 this.source.set('params.invalid', true);
             }
 
@@ -449,6 +453,10 @@ define([
          */
         toggleUseDefault: function (state) {
             this.disabled(state);
+
+            if (this.source && this.hasService()) {
+                this.source.set('data.use_default.' + this.index, Number(state));
+            }
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js b/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js
index d0c8c13edff5b..254585a62491c 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/checkbox-set.js
@@ -124,7 +124,7 @@ define([
         },
 
         /**
-         * Returns option object assoctiated with provided value.
+         * Returns option object associated with provided value.
          *
          * @param {String} value
          * @returns {Object}
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/color-picker-palette.js b/app/code/Magento/Ui/view/base/web/js/form/element/color-picker-palette.js
new file mode 100644
index 0000000000000..ffa8700f3f9e9
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/color-picker-palette.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/**
+ * @api
+ */
+define([], function () {
+    'use strict';
+
+    return [
+        [
+            'rgb(0,0,0)', 'rgb(52,52,52)', 'rgb(83,83,83)', 'rgb(135,135,135)', 'rgb(193,193,193)',
+            'rgb(234,234,234)', 'rgb(240,240,240)', 'rgb(255,255,255)'
+        ],
+        [
+            'rgb(252,0,9)', 'rgb(253,135,10)', 'rgb(255,255,13)', 'rgb(35,255,9)', 'rgb(33,255,255)',
+            'rgb(0,0,254)', 'rgb(132,0,254)', 'rgb(251,0,255)'
+        ],
+        [
+            'rgb(240,192,194)', 'rgb(251,223,194)', 'rgb(255,241,193)', 'rgb(210,230,201)',
+            'rgb(199,217,220)', 'rgb(197,219,240)', 'rgb(208,200,227)', 'rgb(229,199,212)'
+        ],
+        [
+            'rgb(228,133,135)', 'rgb(246,193,139)', 'rgb(254,225,136)', 'rgb(168,208,152)',
+            'rgb(146,184,190)', 'rgb(143,184,227)', 'rgb(165,148,204)', 'rgb(202,147,175)'
+        ],
+        [
+            'rgb(214,78,83)', 'rgb(243,163,88)', 'rgb(254,211,83)', 'rgb(130,187,106)',
+            'rgb(99,149,159)', 'rgb(93,150,211)', 'rgb(123,100,182)', 'rgb(180,100,142)'
+        ],
+        [
+            'rgb(190,0,5)', 'rgb(222,126,44)', 'rgb(236,183,39)', 'rgb(89,155,61)', 'rgb(55,110,123)',
+            'rgb(49,112,185)', 'rgb(83,55,150)', 'rgb(147,55,101)'
+        ],
+        [
+            'rgb(133,0,3)', 'rgb(163,74,10)', 'rgb(177,127,7)', 'rgb(45,101,23)', 'rgb(18,62,74)',
+            'rgb(14,62,129)', 'rgb(40,15,97)', 'rgb(95,16,55)'
+        ],
+        [
+            'rgb(81,0,1)', 'rgb(100,48,7)', 'rgb(107,78,3)', 'rgb(31,63,16)',
+            'rgb(13,39,46)', 'rgb(10,40,79)', 'rgb(24,12,59)', 'rgb(59,10,36)'
+        ]
+    ];
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/color-picker.js b/app/code/Magento/Ui/view/base/web/js/form/element/color-picker.js
new file mode 100644
index 0000000000000..c08fbd98908e5
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/color-picker.js
@@ -0,0 +1,42 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'mage/translate',
+    'Magento_Ui/js/form/element/abstract',
+    'Magento_Ui/js/form/element/color-picker-palette'
+], function ($t, Abstract, palette) {
+    'use strict';
+
+    return Abstract.extend({
+
+        defaults: {
+            colorPickerConfig: {
+                chooseText: $t('Apply'),
+                cancelText: $t('Cancel'),
+                maxSelectionSize: 8,
+                clickoutFiresChange: true,
+                allowEmpty: true,
+                localStorageKey: 'magento.spectrum',
+                palette: palette
+            }
+        },
+
+        /**
+         * Invokes initialize method of parent class,
+         * contains initialization logic
+         */
+        initialize: function () {
+            this._super();
+
+            this.colorPickerConfig.value = this.value;
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/country.js b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
index 49083374767ec..c75301018e190 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/country.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
@@ -28,7 +28,7 @@ define([
          * @param {String} field
          */
         filter: function (value, field) {
-            var result;
+            var result, defaultCountry, defaultValue;
 
             if (!field) { //validate field, if we are on update
                 field = this.filterBy.field;
@@ -46,6 +46,17 @@ define([
 
             this.setOptions(result);
             this.reset();
+
+            if (!this.value()) {
+                defaultCountry = _.filter(result, function (item) {
+                    return item['is_default'] && _.contains(item['is_default'], value);
+                });
+
+                if (defaultCountry.length) {
+                    defaultValue = defaultCountry.shift();
+                    this.value(defaultValue.value);
+                }
+            }
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 4641ae96c9ece..357571350a268 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -6,6 +6,7 @@
 /**
  * @api
  */
+/* global Base64 */
 define([
     'jquery',
     'underscore',
@@ -13,13 +14,16 @@ define([
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/lib/validation/validator',
     'Magento_Ui/js/form/element/abstract',
+    'mage/backend/notification',
+    'mage/translate',
     'jquery/file-uploader'
-], function ($, _, utils, uiAlert, validator, Element) {
+], function ($, _, utils, uiAlert, validator, Element, notification, $t) {
     'use strict';
 
     return Element.extend({
         defaults: {
             value: [],
+            aggregatedErrors: [],
             maxFileSize: false,
             isMultipleFiles: false,
             placeholderType: 'document', // 'image', 'video'
@@ -119,7 +123,7 @@ define([
          * Adds provided file to the files list.
          *
          * @param {Object} file
-         * @returns {FileUploder} Chainable.
+         * @returns {FileUploader} Chainable.
          */
         addFile: function (file) {
             file = this.processFile(file);
@@ -165,6 +169,10 @@ define([
         processFile: function (file) {
             file.previewType = this.getFilePreviewType(file);
 
+            if (!file.id && file.name) {
+                file.id = Base64.mageEncode(file.name);
+            }
+
             this.observe.call(file, true, [
                 'previewWidth',
                 'previewHeight'
@@ -278,9 +286,15 @@ define([
          * @returns {FileUploader} Chainable.
          */
         notifyError: function (msg) {
-            uiAlert({
+            var data = {
                 content: msg
-            });
+            };
+
+            if (this.isMultipleFiles) {
+                data.modalClass = '_image-box';
+            }
+
+            uiAlert(data);
 
             return this;
         },
@@ -309,13 +323,19 @@ define([
         },
 
         /**
-         * Abstract handler which is invoked when files are choosed for upload.
-         * May be used for implementation of aditional validation rules,
+         * Handler which is invoked when files are choosed for upload.
+         * May be used for implementation of additional validation rules,
          * e.g. total files and a total size rules.
          *
-         * @abstract
+         * @param {Event} e - Event object.
+         * @param {Object} data - File data that will be uploaded.
          */
-        onFilesChoosed: function () {},
+        onFilesChoosed: function (e, data) {
+            // no option exists in fileuploader for restricting upload chains to single files; this enforces that policy
+            if (!this.isMultipleFiles) {
+                data.files.splice(1);
+            }
+        },
 
         /**
          * Handler which is invoked prior to the start of a file upload.
@@ -337,10 +357,28 @@ define([
                     data.submit();
                 });
             } else {
-                this.notifyError(allowed.message);
+                this.aggregateError(file.name, allowed.message);
+
+                // if all files in upload chain are invalid, stop callback is never called; this resolves promise
+                if (this.aggregatedErrors.length === data.originalFiles.length) {
+                    this.uploaderConfig.stop();
+                }
             }
         },
 
+        /**
+         * Add error message associated with filename for display when upload chain is complete
+         *
+         * @param {String} filename
+         * @param {String} message
+         */
+        aggregateError: function (filename, message) {
+            this.aggregatedErrors.push({
+                filename: filename,
+                message: message
+            });
+        },
+
         /**
          * Handler of the file upload complete event.
          *
@@ -348,11 +386,12 @@ define([
          * @param {Object} data
          */
         onFileUploaded: function (e, data) {
-            var file    = data.result,
+            var uploadedFilename = data.files[0].name,
+                file    = data.result,
                 error   = file.error;
 
             error ?
-                this.notifyError(error) :
+                this.aggregateError(uploadedFilename, error) :
                 this.addFile(file);
         },
 
@@ -367,7 +406,45 @@ define([
          * Load stop event handler.
          */
         onLoadingStop: function () {
+            var aggregatedErrorMessages = [];
+
             this.isLoading = false;
+
+            if (!this.aggregatedErrors.length) {
+                return;
+            }
+
+            if (!this.isMultipleFiles) { // only single file upload occurred; use first file's error message
+                aggregatedErrorMessages.push(this.aggregatedErrors[0].message);
+            } else { // construct message from all aggregatedErrors
+                _.each(this.aggregatedErrors, function (error) {
+                    notification().add({
+                        error: true,
+                        message: '%s' + error.message, // %s to be used as placeholder for html injection
+
+                        /**
+                         * Adds constructed error notification to aggregatedErrorMessages
+                         *
+                         * @param {String} constructedMessage
+                         */
+                        insertMethod: function (constructedMessage) {
+                            var errorMsgBodyHtml = '<strong>%s</strong> %s.<br>'
+                                .replace('%s', error.filename)
+                                .replace('%s', $t('was not uploaded'));
+
+                            // html is escaped in message body for notification widget; prepend unescaped html here
+                            constructedMessage = constructedMessage.replace('%s', errorMsgBodyHtml);
+
+                            aggregatedErrorMessages.push(constructedMessage);
+                        }
+                    });
+                });
+            }
+
+            this.notifyError(aggregatedErrorMessages.join(''));
+
+            // clear out aggregatedErrors array for this completed upload chain
+            this.aggregatedErrors = [];
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
new file mode 100644
index 0000000000000..0ae09f14fa946
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
@@ -0,0 +1,148 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global Base64 */
+define([
+    'jquery',
+    'underscore',
+    'mageUtils',
+    'Magento_Ui/js/modal/alert',
+    'Magento_Ui/js/lib/validation/validator',
+    'Magento_Ui/js/form/element/file-uploader',
+    'mage/adminhtml/browser',
+    'mage/adminhtml/tools'
+], function ($, _, utils, uiAlert, validator, Element, browser) {
+    'use strict';
+
+    return Element.extend({
+        /**
+         * {@inheritDoc}
+         */
+        initialize: function () {
+            this._super();
+
+            // Listen for file deletions from the media browser
+            $(window).on('fileDeleted.mediabrowser', this.onDeleteFile.bind(this));
+        },
+
+        /**
+         * Assign uid for media gallery
+         *
+         * @return {ImageUploader} Chainable.
+         */
+        initConfig: function () {
+            var mediaGalleryUid = utils.uniqueid();
+
+            this._super();
+
+            _.extend(this, {
+                mediaGalleryUid: mediaGalleryUid
+            });
+
+            return this;
+        },
+
+        /**
+         * Add file event callback triggered from media gallery
+         *
+         * @param {ImageUploader} imageUploader - UI Class
+         * @param {Event} e
+         */
+        addFileFromMediaGallery: function (imageUploader, e) {
+            var $buttonEl = $(e.target),
+                fileSize = $buttonEl.data('size'),
+                fileMimeType = $buttonEl.data('mime-type'),
+                filePathname = $buttonEl.val(),
+                fileBasename = filePathname.split('/').pop();
+
+            this.addFile({
+                type: fileMimeType,
+                name: fileBasename,
+                size: fileSize,
+                url: filePathname
+            });
+        },
+
+        /**
+         * Open the media browser dialog
+         *
+         * @param {ImageUploader} imageUploader - UI Class
+         * @param {Event} e
+         */
+        openMediaBrowserDialog: function (imageUploader, e) {
+            var $buttonEl = $(e.target),
+                openDialogUrl = this.mediaGallery.openDialogUrl +
+                'target_element_id/' + $buttonEl.attr('id') +
+                '/store/' + this.mediaGallery.storeId +
+                '/type/image/?isAjax=true';
+
+            if (this.mediaGallery.initialOpenSubpath) {
+                openDialogUrl += '&current_tree_path=' + Base64.mageEncode(this.mediaGallery.initialOpenSubpath);
+            }
+
+            browser.openDialog(openDialogUrl, null, null, this.mediaGallery.openDialogTitle);
+        },
+
+        /**
+         * @param {jQuery.event} e
+         * @param {Object} data
+         * @returns {Object} Chainables
+         */
+        onDeleteFile: function (e, data) {
+            var fileId = this.getFileId(),
+                deletedFileIds = data.ids;
+
+            if (fileId && $.inArray(fileId, deletedFileIds) > -1) {
+                this.clear();
+            }
+
+            return this;
+        },
+
+        /**
+         * {@inheritDoc}
+         */
+        clear: function () {
+            this.value([]);
+
+            return this;
+        },
+
+        /**
+         * Gets the ID of the file used if set
+         *
+         * @return {String|Null} ID
+         */
+        getFileId: function () {
+            return this.hasData() ? this.value()[0].id : null;
+        },
+
+        /**
+         * Trigger native browser file upload UI via clicking on 'Upload' button
+         *
+         * @param {ImageUploader} imageUploader - UI Class
+         * @param {Event} e
+         */
+        triggerImageUpload: function (imageUploader, e) {
+            $(e.target).closest('.file-uploader').find('input[type="file"]').click();
+        },
+
+        /**
+         * Get list of file extensions allowed in comma delimited format
+         *
+         * @return {String}
+         */
+        getAllowedFileExtensionsInCommaDelimitedFormat: function () {
+            var allowedExtensions = this.allowedExtensions.toUpperCase().split(' ');
+
+            // if jpg and jpeg in allowed extensions, remove jpeg from list
+            if (allowedExtensions.indexOf('JPG') !== -1 && allowedExtensions.indexOf('JPEG') !== -1) {
+                allowedExtensions.splice(allowedExtensions.indexOf('JPEG'), 1);
+            }
+
+            return allowedExtensions.join(', ');
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/region.js b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
index 1b2ce8889af10..f6eafcf49284d 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/region.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
@@ -35,6 +35,11 @@ define([
                 return;
             }
             option = options[value];
+
+            if (typeof option === 'undefined') {
+                return;
+            }
+
             defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
 
             if (this.skipValidation) {
@@ -44,6 +49,10 @@ define([
                 if (option && !option['is_region_required']) {
                     this.error(false);
                     this.validation = _.omit(this.validation, 'required-entry');
+                    registry.get(this.customName, function (input) {
+                        input.validation['required-entry'] = false;
+                        input.required(false);
+                    });
                 } else {
                     this.validation['required-entry'] = true;
                 }
@@ -52,6 +61,7 @@ define([
                     registry.get(this.customName, function (input) {
                         isRegionRequired = !!option['is_region_required'];
                         input.validation['required-entry'] = isRegionRequired;
+                        input.validation['validate-not-number-first'] = true;
                         input.required(isRegionRequired);
                     });
                 }
@@ -68,13 +78,12 @@ define([
          * @param {String} field
          */
         filter: function (value, field) {
-            var country = registry.get(this.parentName + '.' + 'country_id'),
-                option;
+            var superFn = this._super;
 
-            if (country) {
-                option = country.indexedOptions[value];
+            registry.get(this.parentName + '.' + 'country_id', function (country) {
+                var option = country.indexedOptions[value];
 
-                this._super(value, field);
+                superFn.call(this, value, field);
 
                 if (option && option['is_region_visible'] === false) {
                     // hide select and corresponding text input field if region must not be shown for selected country
@@ -84,7 +93,7 @@ define([
                         this.toggleInput(false);
                     }
                 }
-            }
+            }.bind(this));
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js b/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
index b20b2c31ee1fb..3ee7ddd1e738f 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/single-checkbox-use-config.js
@@ -36,6 +36,10 @@ define([
          */
         toggleElement: function () {
             this.disabled(this.isUseDefault() || this.isUseConfig());
+
+            if (this.source) {
+                this.source.set('data.use_default.' + this.index, Number(this.isUseDefault()));
+            }
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
index 867527ae1aaf5..dba0992c5ba52 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -165,6 +165,21 @@ define([
                 lotPlaceholders: $t('Selected')
             },
             separator: 'optgroup',
+            searchOptions: false,
+            loading: false,
+            searchUrl: false,
+            lastSearchKey: '',
+            lastSearchPage: 1,
+            filterPlaceholder: '',
+            emptyOptionsHtml: '',
+            cachedSearchResults: {},
+            pageLimit: 50,
+            deviation: 30,
+            validationLoading: false,
+            isRemoveSelectedIcon: false,
+            debounce: 300,
+            missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'),
+            isDisplayMissingValuePlaceholder: false,
             listens: {
                 listVisible: 'cleanHoveredElement',
                 filterInputValue: 'filterOptionsList',
@@ -308,7 +323,10 @@ define([
                 'options',
                 'itemsQuantity',
                 'filterInputValue',
-                'filterOptionsFocus'
+                'filterOptionsFocus',
+                'loading',
+                'validationLoading',
+                'isDisplayMissingValuePlaceholder'
             ]);
 
             this.filterInputValue.extend({
@@ -441,6 +459,10 @@ define([
                 return false;
             }
 
+            if (this.searchOptions) {
+                return _.debounce(this.loadOptions.bind(this, value), this.debounce)();
+            }
+
             this.cleanHoveredElement();
 
             if (!value) {
@@ -574,6 +596,20 @@ define([
             return this.multiple ? _.contains(this.value(), value) : this.value() === value;
         },
 
+        /**
+         * Check selected option
+         *
+         * @param {Object} option - option value
+         * @return {Boolean}
+         */
+        isSelectedValue: function (option) {
+            if (_.isUndefined(option)) {
+                return false;
+            }
+
+            return this.isSelected(option.value);
+        },
+
         /**
          * Check optgroup label
          *
@@ -600,6 +636,10 @@ define([
 
             elementData = ko.dataFor(this.hoveredElement);
 
+            if (_.isUndefined(elementData)) {
+                return false;
+            }
+
             return data.value === elementData.value;
         },
 
@@ -921,7 +961,7 @@ define([
          * Set caption
          */
         setCaption: function () {
-            var length;
+            var length, caption = '';
 
             if (!_.isArray(this.value()) && this.value()) {
                 length = 1;
@@ -931,6 +971,16 @@ define([
                 this.value([]);
                 length = 0;
             }
+            this.warn(caption);
+
+            //check if option was removed
+            if (this.isDisplayMissingValuePlaceholder && length && !this.getSelected().length) {
+                caption = this.missingValuePlaceholder.replace('%s', this.value());
+                this.placeholder(caption);
+                this.warn(caption);
+
+                return this.placeholder();
+            }
 
             if (length > 1) {
                 this.placeholder(length + ' ' + this.selectedPlaceholders.lotPlaceholders);
@@ -1083,6 +1133,156 @@ define([
                 targetSelector,
                 this.onDelegatedMouseMouve.bind(this)
             );
+        },
+
+        /**
+         * Returns options from cache or send request
+         *
+         * @param {String} searchKey
+         */
+        loadOptions: function (searchKey) {
+            var currentPage = searchKey === this.lastSearchKey ? this.lastSearchPage + 1 : 1,
+                cachedSearchResult;
+
+            this.renderPath = !!this.showPath;
+
+            if (this.isSearchKeyCached(searchKey)) {
+                cachedSearchResult = this.getCachedSearchResults(searchKey);
+                this.options(cachedSearchResult.options);
+                this.afterLoadOptions(searchKey, cachedSearchResult.lastPage, cachedSearchResult.total);
+
+                return;
+            }
+
+            if (searchKey !== this.lastSearchKey) {
+                this.options([]);
+            }
+            this.processRequest(searchKey, currentPage);
+        },
+
+        /**
+         * Load more options on scroll down
+         * @param {Object} data
+         * @param {Event} event
+         */
+        onScrollDown: function (data, event) {
+            var clientHight = event.target.scrollTop + event.target.clientHeight,
+                scrollHeight = event.target.scrollHeight;
+
+            if (!this.searchOptions) {
+                return;
+            }
+
+            if (clientHight > scrollHeight - this.deviation && !this.isSearchKeyCached(data.filterInputValue())) {
+                this.loadOptions(data.filterInputValue());
+            }
+        },
+
+        /**
+         * Returns cached search result by search key
+         *
+         * @param {String} searchKey
+         * @return {Object}
+         */
+        getCachedSearchResults: function (searchKey) {
+            if (this.cachedSearchResults.hasOwnProperty(searchKey)) {
+                return this.cachedSearchResults[searchKey];
+            }
+
+            return {
+                options: [],
+                lastPage: 1,
+                total: 0
+            };
+        },
+
+        /**
+         * Cache loaded data
+         *
+         * @param {String} searchKey
+         * @param {Array} optionsArray
+         * @param {Number} page
+         * @param {Number} total
+         */
+        setCachedSearchResults: function (searchKey, optionsArray, page, total) {
+            var cachedData = {};
+
+            cachedData.options = optionsArray;
+            cachedData.lastPage = page;
+            cachedData.total = total;
+            this.cachedSearchResults[searchKey] = cachedData;
+        },
+
+        /**
+         * Check if search key cached
+         *
+         * @param {String} searchKey
+         * @return {Boolean}
+         */
+        isSearchKeyCached: function (searchKey) {
+            var totalCached = this.cachedSearchResults.hasOwnProperty(searchKey) ?
+                this.deviation * this.cachedSearchResults[searchKey].lastPage :
+                0;
+
+            return totalCached > 0 && totalCached >= this.cachedSearchResults[searchKey].total;
+        },
+
+        /**
+         * Submit request to load data
+         *
+         * @param {String} searchKey
+         * @param {Number} page
+         */
+        processRequest: function (searchKey, page) {
+            var total = 0,
+                existingOptions = this.options();
+
+            this.loading(true);
+            $.ajax({
+                url: this.searchUrl,
+                type: 'post',
+                dataType: 'json',
+                context: this,
+                data: {
+                    searchKey: searchKey,
+                    page: page,
+                    limit: this.pageLimit
+                },
+
+                /** @param {Object} response */
+                success: function (response) {
+                    _.each(response.options, function (opt) {
+                        existingOptions.push(opt);
+                    });
+                    total = response.total;
+                    this.options(existingOptions);
+                },
+
+                /** set empty array if error occurs */
+                error: function () {
+                    this.options([]);
+                },
+
+                /** cache options and stop loading*/
+                complete: function () {
+                    this.setCachedSearchResults(searchKey, this.options(), page, total);
+                    this.afterLoadOptions(searchKey, page, total);
+                }
+            });
+        },
+
+        /**
+         * Stop loading and update data after options were updated
+         *
+         * @param {String} searchKey
+         * @param {Number} page
+         * @param {Number} total
+         */
+        afterLoadOptions: function (searchKey, page, total) {
+            this._setItemsQuantity(total);
+            this.lastSearchPage = page;
+            this.lastSearchKey = searchKey;
+            this.loading(false);
         }
     });
 });
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 0000000000000..2bfce304b9adc
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/url-input.js
@@ -0,0 +1,164 @@
+/**
+ * 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;
+                linkSettingsArray.disabled = config.disabled;
+                linkSettingsArray.visible = config.visible;
+                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 (!_.isEmpty(value) && _.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/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index 9e9427f5ce72c..3d02afcc40a9e 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -7,18 +7,20 @@
  * @api
  */
 define([
+    'wysiwygAdapter',
     'Magento_Ui/js/lib/view/utils/async',
     'underscore',
     'ko',
     './abstract',
+    'mage/adminhtml/events',
     'Magento_Variable/variables'
-], function ($, _, ko, Abstract) {
+], function (wysiwyg, $, _, ko, Abstract, varienGlobalEvents) {
     'use strict';
 
     return Abstract.extend({
         defaults: {
             elementSelector: 'textarea',
-            value: '',
+            suffixRegExpPattern: '${ $.wysiwygUniqueSuffix }',
             $wysiwygEditorButton: '',
             links: {
                 value: '${ $.provider }:${ $.dataScope }'
@@ -45,12 +47,48 @@ define([
                 component: this,
                 selector: 'button'
             }, function (element) {
-                this.$wysiwygEditorButton = $(element);
+                this.$wysiwygEditorButton = this.$wysiwygEditorButton ?
+                    this.$wysiwygEditorButton.add($(element)) : $(element);
             }.bind(this));
 
+            // disable editor completely after initialization is field is disabled
+            varienGlobalEvents.attachEventHandler('wysiwygEditorInitialized', function () {
+                if (this.disabled()) {
+                    this.setDisabled(true);
+                }
+            }.bind(this));
+
+            return this;
+        },
+
+        /** @inheritdoc */
+        initConfig: function (config) {
+            var pattern = config.suffixRegExpPattern || this.constructor.defaults.suffixRegExpPattern;
+
+            pattern = pattern.replace(/\$/g, '\\$&');
+            config.content = config.content.replace(new RegExp(pattern, 'g'), this.getUniqueSuffix(config));
+            this._super();
+
             return this;
         },
 
+        /**
+         * Build unique id based on name, underscore separated.
+         *
+         * @param {Object} config
+         */
+        getUniqueSuffix: function (config) {
+            return config.name.replace(/(\.|-)/g, '_');
+        },
+
+        /**
+         * @inheritdoc
+         */
+        destroy: function () {
+            this._super();
+            wysiwyg.removeEvents(this.wysiwygId);
+        },
+
         /**
          *
          * @returns {exports}
@@ -88,21 +126,25 @@ define([
         /**
          * Set disabled property to wysiwyg component
          *
-         * @param {Boolean} status
+         * @param {Boolean} disabled
          */
-        setDisabled: function (status) {
-            this.$wysiwygEditorButton.attr('disabled', status);
+        setDisabled: function (disabled) {
+            if (this.$wysiwygEditorButton && disabled) {
+                this.$wysiwygEditorButton.prop('disabled', 'disabled');
+            } else if (this.$wysiwygEditorButton) {
+                this.$wysiwygEditorButton.removeProp('disabled');
+            }
 
             /* eslint-disable no-undef */
-            if (wysiwygAdapter) {
-                _.each(wysiwygAdapter.activeEditor().controlManager.controls, function (property, index, controls) {
-                    controls[property.id].setDisabled(status);
-                });
-
-                wysiwygAdapter.activeEditor().getBody().setAttribute('contenteditable', !status);
+            if (typeof wysiwyg !== 'undefined' && wysiwyg.activeEditor()) {
+                if (wysiwyg && disabled) {
+                    wysiwyg.setEnabledStatus(false);
+                    wysiwyg.getPluginButtons().prop('disabled', 'disabled');
+                } else if (wysiwyg) {
+                    wysiwyg.setEnabledStatus(true);
+                    wysiwyg.getPluginButtons().removeProp('disabled');
+                }
             }
-
-            /* eslint-enable  no-undef*/
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/form/provider.js b/app/code/Magento/Ui/view/base/web/js/form/provider.js
index f43c03e046f44..49765f589bd9d 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/provider.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/provider.js
@@ -21,6 +21,9 @@ define([
                     save: '${ $.submit_url }',
                     beforeSave: '${ $.validate_url }'
                 }
+            },
+            ignoreTmpls: {
+                data: true
             }
         },
 
@@ -79,7 +82,7 @@ define([
         },
 
         /**
-         *  Set data to provder based on current data.
+         *  Set data to provider based on current data.
          *
          * @param {Object} oldData
          * @param {Object} newData
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
index a4c56958911a8..c75f7797cf0f3 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
@@ -11,8 +11,9 @@ define([
     'mageUtils',
     'uiRegistry',
     './column',
-    'Magento_Ui/js/modal/confirm'
-], function (_, utils, registry, Column, confirm) {
+    'Magento_Ui/js/modal/confirm',
+    'mage/dataPost'
+], function (_, utils, registry, Column, confirm, dataPost) {
     'use strict';
 
     return Column.extend({
@@ -78,8 +79,8 @@ define([
         },
 
         /**
-         * Adds new action. If action with a specfied identifier
-         * already exists, than the original will be overrided.
+         * Adds new action. If an action with the specified identifier
+         * already exists, then the original will be overridden.
          *
          * @param {String} index - Actions' identifier.
          * @param {Object} action - Actions' data.
@@ -108,7 +109,7 @@ define([
 
         /**
          * Processes actions, setting additional information to them and
-         * evaluating ther properties as a string templates.
+         * evaluating their properties as string templates.
          *
          * @private
          * @param {Object} row - Row object.
@@ -204,11 +205,11 @@ define([
         },
 
         /**
-         * Creates action callback based on its' data. If action doesn't spicify
+         * Creates action callback based on it's data. If the action doesn't specify
          * a callback function than the default one will be used.
          *
          * @private
-         * @param {Object} action - Actions' object.
+         * @param {Object} action - Action's object.
          * @returns {Function} Callback function.
          */
         _getCallback: function (action) {
@@ -234,7 +235,7 @@ define([
          * Creates action callback for multiple actions.
          *
          * @private
-         * @param {Object} action - Actions' object.
+         * @param {Object} action - Action's object.
          * @returns {Function} Callback function.
          */
         _getCallbacks: function (action) {
@@ -259,21 +260,28 @@ define([
 
         /**
          * Default action callback. Redirects to
-         * the specified in actions' data url.
+         * the specified in action's data url.
          *
-         * @param {String} actionIndex - Actions' identifier.
-         * @param {(Number|String)} recordId - Id of the record accociated
-         *      with a specfied action.
-         * @param {Object} action - Actions' data.
+         * @param {String} actionIndex - Action's identifier.
+         * @param {(Number|String)} recordId - Id of the record associated
+         *      with a specified action.
+         * @param {Object} action - Action's data.
          */
         defaultCallback: function (actionIndex, recordId, action) {
-            window.location.href = action.href;
+            if (action.post) {
+                dataPost().postData({
+                    action: action.href,
+                    data: {}
+                });
+            } else {
+                window.location.href = action.href;
+            }
         },
 
         /**
          * Shows actions' confirmation window.
          *
-         * @param {Object} action - Actions' data.
+         * @param {Object} action - Action's data.
          * @param {Function} callback - Callback that will be
          *      invoked if action is confirmed.
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
index 0a29728390592..ba0f4d25c25a4 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
@@ -229,6 +229,15 @@ define([
             return this;
         },
 
+        /**
+        * Selects or deselects all records on the current page.
+        *
+        * @returns {Multiselect} Chainable.
+        */
+        togglePage: function () {
+            return this.isPageSelected() ? this.deselectPage() : this.selectPage();
+        },
+
         /**
          * Clears the array of not selected records.
          *
@@ -259,7 +268,7 @@ define([
          * Returns identifier of a record.
          *
          * @param {*} id - Id of a record or its' index in a rows array.
-         * @param {Boolean} [isIndex=false] - Flag that specifies whith what
+         * @param {Boolean} [isIndex=false] - Flag that specifies with what
          *      kind of identifier we are dealing with.
          * @returns {*}
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js
new file mode 100644
index 0000000000000..d37e80213f650
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).on('click.splitDefault', '.action-default', function () {
+            $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
+        });
+    };
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/dnd.js b/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
index 5a71fca673ec9..660e3cb3bd2bb 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/dnd.js
@@ -406,7 +406,7 @@ define([
          *
          * @param {Number} x - X coordinate of a grabbed point.
          * @param {Number} y - Y coordinate of a grabbed point.
-         * @param {HTMLElement} elem - Grabbed elemenet.
+         * @param {HTMLElement} elem - Grabbed element.
          */
         grab: function (x, y, elem) {
             this.initDrag = true;
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
index 589aed4c9837b..a4785aea03743 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
@@ -164,7 +164,7 @@ define([
         },
 
         /**
-         * Adds listeners on a new recrod.
+         * Adds listeners on a new record.
          *
          * @param {Record} record
          * @returns {Editor} Chainable.
@@ -208,7 +208,7 @@ define([
         },
 
         /**
-         * Starts editing of a specfied record. If records'
+         * Starts editing of a specified record. If records'
          * instance doesn't exist, than it will be created.
          *
          * @param {(Number|String)} id - See 'getId' method.
@@ -401,7 +401,7 @@ define([
         },
 
         /**
-         * Disables editing of specfied fields.
+         * Disables editing of specified fields.
          *
          * @param {Array} fields - An array of fields indeces to be disabled.
          * @returns {Editor} Chainable.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index 18b3836113141..aa83083cac3c9 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -50,6 +50,9 @@ define([
                     }
                 }
             },
+            ignoreTmpls: {
+                data: true
+            },
             listens: {
                 elems: 'updateFields',
                 data: 'updateState'
@@ -138,7 +141,7 @@ define([
         },
 
         /**
-         * Creates fields for the specfied columns.
+         * Creates fields for the specified columns.
          *
          * @param {Array} columns - An array of column instances.
          * @returns {Record} Chainable.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js
index 22ba19657168d..98c3eb1c6f882 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js
@@ -10,8 +10,10 @@ define([
     'underscore',
     'mageUtils',
     'uiLayout',
-    'uiCollection'
-], function (_, utils, layout, Collection) {
+    'uiCollection',
+    'mage/translate',
+    'jquery'
+], function (_, utils, layout, Collection, $t, $) {
     'use strict';
 
     /**
@@ -48,6 +50,7 @@ define([
             stickyTmpl: 'ui/grid/sticky/filters',
             _processed: [],
             columnsProvider: 'ns = ${ $.ns }, componentType = columns',
+            bookmarksProvider: 'ns = ${ $.ns }, componentType = bookmark',
             applied: {
                 placeholder: true
             },
@@ -102,7 +105,9 @@ define([
                 applied: '${ $.provider }:params.filters'
             },
             imports: {
-                'onColumnsUpdate': '${ $.columnsProvider }:elems'
+                onColumnsUpdate: '${ $.columnsProvider }:elems',
+                onBackendError: '${ $.provider }:lastError',
+                bookmarksActiveIndex: '${ $.bookmarksProvider }:activeIndex'
             },
             modules: {
                 columns: '${ $.columnsProvider }',
@@ -252,7 +257,7 @@ define([
         /**
          * Creates filter component configuration associated with the provided column.
          *
-         * @param {Column} column - Column component whith a basic filter declaration.
+         * @param {Column} column - Column component with a basic filter declaration.
          * @returns {Object} Filters' configuration.
          */
         buildFilter: function (column) {
@@ -326,7 +331,7 @@ define([
         },
 
         /**
-         * Finds filters whith a not empty data
+         * Finds filters with a not empty data
          * and sets them to the 'active' filters array.
          *
          * @returns {Filters} Chainable.
@@ -371,6 +376,37 @@ define([
          */
         onColumnsUpdate: function (columns) {
             columns.forEach(this.addFilter, this);
+        },
+
+        /**
+         * Provider ajax error listener.
+         *
+         * @param {bool} isError - Selected index of the filter.
+         */
+        onBackendError: function (isError) {
+            var defaultMessage = 'Something went wrong with processing the default view and we have restored the ' +
+                    'filter to its original state.',
+                customMessage  = 'Something went wrong with processing current custom view and filters have been ' +
+                    'reset to its original state. Please edit filters then click apply.';
+
+            if (isError) {
+                this.clear();
+
+                $('body').notification('clear')
+                    .notification('add', {
+                        error: true,
+                        message: $.mage.__(this.bookmarksActiveIndex !== 'default' ? customMessage : defaultMessage),
+
+                        /**
+                         * @param {String} message
+                         */
+                        insertMethod: function (message) {
+                            var $wrapper = $('<div/>').html(message);
+
+                            $('.page-main-actions').after($wrapper);
+                        }
+                    });
+            }
         }
     });
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
index 438d6ccd58a55..ccfba8e98b6f4 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
@@ -27,7 +27,8 @@ define([
                 },
                 date: {
                     component: 'Magento_Ui/js/form/element/date',
-                    dateFormat: 'MM/dd/YYYY'
+                    dateFormat: 'MM/dd/YYYY',
+                    shiftedValue: 'filter'
                 },
                 text: {
                     component: 'Magento_Ui/js/form/element/abstract'
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
index 046ff12bfaa6f..3626f52806881 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
@@ -95,7 +95,7 @@ define([
         },
 
         /**
-         * Adds new action. If action with a specfied identifier
+         * Adds new action. If action with a specified identifier
          * already exists, than the original one will be overrided.
          *
          * @param {Object} action - Action object.
@@ -153,6 +153,11 @@ define([
             var itemsType = data.excludeMode ? 'excluded' : 'selected',
                 selections = {};
 
+            if (itemsType === 'excluded' && data.selected && data.selected.length) {
+                itemsType = 'selected';
+                data[itemsType] = _.difference(data.selected, data.excluded);
+            }
+
             selections[itemsType] = data[itemsType];
 
             if (!selections[itemsType].length) {
@@ -175,11 +180,14 @@ define([
          *      invoked if action is confirmed.
          */
         _confirm: function (action, callback) {
-            var confirmData = action.confirm;
+            var confirmData = action.confirm,
+                data = this.getSelections(),
+                total = data.total ? data.total : 0,
+                confirmMessage = confirmData.message + ' (' + total + ' record' + (total > 1 ? 's' : '') + ')';
 
             confirm({
                 title: confirmData.title,
-                content: confirmData.message,
+                content: confirmMessage,
                 actions: {
                     confirm: callback
                 }
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/provider.js b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
index 14a64216ef597..2ba8bd73af910 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/provider.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
@@ -21,6 +21,7 @@ define([
     return Element.extend({
         defaults: {
             firstLoad: true,
+            lastError: false,
             storageConfig: {
                 component: 'Magento_Ui/js/grid/data-storage',
                 provider: '${ $.storageConfig.name }',
@@ -30,6 +31,9 @@ define([
             listens: {
                 params: 'onParamsChange',
                 requestConfig: 'updateRequestConfig'
+            },
+            ignoreTmpls: {
+                data: true
             }
         },
 
@@ -120,7 +124,7 @@ define([
 
             request
                 .done(this.onReload)
-                .fail(this.onError);
+                .fail(this.onError.bind(this));
 
             return request;
         },
@@ -144,6 +148,10 @@ define([
                 return;
             }
 
+            this.set('lastError', true);
+
+            this.firstLoad = false;
+
             alert({
                 content: $t('Something went wrong.')
             });
@@ -157,6 +165,8 @@ define([
         onReload: function (data) {
             this.firstLoad = false;
 
+            this.set('lastError', false);
+
             this.setData(data)
                 .trigger('reloaded');
         },
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/resize.js b/app/code/Magento/Ui/view/base/web/js/grid/resize.js
index 50781c9afd8c3..792c997f060c6 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/resize.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/resize.js
@@ -624,7 +624,7 @@ define([
         },
 
         /**
-         * Generate index that will indentify context
+         * Generate index that will identify context
          *
          * @param {Object} ctx
          * @return {String}
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
index fa445a2577adb..19536e7ff8c18 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
@@ -102,7 +102,7 @@ define([
         /**
          * Applies search query.
          *
-         * @param {String} [value=inputValue] - If not specfied, then
+         * @param {String} [value=inputValue] - If not specified, then
          *      value of the input field will be used.
          * @returns {Search} Chainable.
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js b/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
index 8a17e3ed46f29..fd2d09c6a65f6 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/toolbar.js
@@ -557,7 +557,7 @@ define([
         },
 
         /**
-         * Handles changes of windows' top scroll postion.
+         * Handles changes of windows' top scroll position.
          */
         onWindowScrollTop: function () {
             this.updateTableOffset()
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
index adc3d524a0cb0..687cf09401188 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
@@ -27,7 +27,7 @@ define([
      * Creates constructor function which allows
      * initialization without usage of a 'new' operator.
      *
-     * @param {Object} protoProps - Prototypal propeties of a new constructor.
+     * @param {Object} protoProps - Prototypal properties of a new constructor.
      * @param {Function} constructor
      * @returns {Function} Created constructor.
      */
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
index 607d217837fcc..eb4f2b39128e2 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
@@ -15,7 +15,7 @@ define([
     'use strict';
 
     /**
-     * Removes non plain object items from the specfied array.
+     * Removes non plain object items from the specified array.
      *
      * @param {Array} container - Array whose value should be filtered.
      * @returns {Array}
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
index b228494b422c3..b05fed939b7a5 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
@@ -46,7 +46,7 @@ define([
     }
 
     /**
-     * Creates observable propery using 'track' method.
+     * Creates observable property using 'track' method.
      *
      * @param {Object} obj - Object to whom property belongs.
      * @param {String} key - Key of the property.
@@ -66,7 +66,7 @@ define([
 
     Element = _.extend({
         defaults: {
-            _requesetd: {},
+            _requested: {},
             containers: [],
             exports: {},
             imports: {},
@@ -249,7 +249,7 @@ define([
          * @returns {Function} Async module wrapper.
          */
         requestModule: function (name) {
-            var requested = this._requesetd;
+            var requested = this._requested;
 
             if (!requested[name]) {
                 requested[name] = registry.async(name);
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
index 34ceced2c6873..87b5b2f5fe8fe 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
@@ -51,7 +51,7 @@ define([
             },
 
             /**
-             * Retrieves specfied item.
+             * Retrieves specified item.
              *
              * @param {String} key - Key of the property to be retrieved.
              */
@@ -60,7 +60,7 @@ define([
             },
 
             /**
-             * Removes specfied item.
+             * Removes specified item.
              *
              * @param {String} key - Key of the property to be removed.
              */
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/key-codes.js b/app/code/Magento/Ui/view/base/web/js/lib/key-codes.js
index 2303aeceb9dc8..1f5a4210793ba 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/key-codes.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/key-codes.js
@@ -20,6 +20,9 @@ define([], function () {
         39: 'pageRightKey',
         17: 'ctrlKey',
         18: 'altKey',
-        16: 'shiftKey'
+        16: 'shiftKey',
+        66: 'bKey',
+        73: 'iKey',
+        85: 'uKey'
     };
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
index b29d10a143117..83d43d2691b3f 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
@@ -26,7 +26,7 @@ define(function (require) {
         mageInit:       require('./mage-init'),
         keyboard:       require('./keyboard'),
         optgroup:       require('./optgroup'),
-        aferRender:     require('./after-render'),
+        afterRender:     require('./after-render'),
         autoselect:     require('./autoselect'),
         datepicker:     require('./datepicker'),
         outerClick:     require('./outer_click'),
@@ -37,6 +37,7 @@ define(function (require) {
         bindHtml:       require('./bind-html'),
         tooltip:        require('./tooltip'),
         repeat:         require('knockoutjs/knockout-repeat'),
-        fastForEach:    require('knockoutjs/knockout-fast-foreach')
+        fastForEach:    require('knockoutjs/knockout-fast-foreach'),
+        colorPicker:    require('./color-picker')
     };
 });
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/color-picker.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/color-picker.js
new file mode 100644
index 0000000000000..c678b85276093
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/color-picker.js
@@ -0,0 +1,87 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'ko',
+    'jquery',
+    '../template/renderer',
+    'spectrum',
+    'tinycolor'
+], function (ko, $, renderer, spectrum, tinycolor) {
+    'use strict';
+
+    /**
+     * Change color picker status to be enabled or disabled
+     *
+     * @param {HTMLElement} element - Element to apply colorpicker enable/disable status to.
+     * @param {Object} viewModel - Object, which represents view model binded to el.
+     */
+    function changeColorPickerStateBasedOnViewModel(element, viewModel) {
+        $(element).spectrum(viewModel.disabled() ? 'disable' : 'enable');
+    }
+
+    ko.bindingHandlers.colorPicker = {
+        /**
+         * Binding init callback.
+         *
+         * @param {*} element
+         * @param {Function} valueAccessor
+         * @param {Function} allBindings
+         * @param {Object} viewModel
+         */
+        init: function (element, valueAccessor, allBindings, viewModel) {
+            var config = valueAccessor(),
+
+                /** change value */
+                changeValue = function (value) {
+                    if (value == null) {
+                        value = '';
+                    }
+                    config.value(value.toString());
+                };
+
+            config.change = changeValue;
+
+            config.hide = changeValue;
+
+            /** show value */
+            config.show = function () {
+                if (!viewModel.focused()) {
+                    viewModel.focused(true);
+                }
+
+                return true;
+            };
+
+            $(element).spectrum(config);
+
+            changeColorPickerStateBasedOnViewModel(element, viewModel);
+        },
+
+        /**
+         * Reads params passed to binding, parses component declarations.
+         * Fetches for those found and attaches them to the new context.
+         *
+         * @param {HTMLElement} element - Element to apply bindings to.
+         * @param {Function} valueAccessor - Function that returns value, passed to binding.
+         * @param {Object} allBindings - Object, which represents all bindings applied to element.
+         * @param {Object} viewModel - Object, which represents view model binded to element.
+         */
+        update: function (element, valueAccessor, allBindings, viewModel) {
+            var config = valueAccessor();
+
+            if (tinycolor(config.value()).isValid() || config.value() === '') {
+                $(element).spectrum('set', config.value());
+
+                if (config.value() !== '') {
+                    config.value($(element).spectrum('get').toString());
+                }
+            }
+
+            changeColorPickerStateBasedOnViewModel(element, viewModel);
+        }
+    };
+
+    renderer.addAttribute('colorPicker');
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
index cc9dc5e0a2202..98e86de23221d 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/outer_click.js
@@ -42,7 +42,7 @@ define([
     /**
      * Document click handler which in case if event target is not
      * a descendant of provided container element,
-     * invokes specfied in configuration callback.
+     * invokes specified in configuration callback.
      *
      * @param {HTMLElement} container
      * @param {Object} config
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
index a332b595bdf3c..6b3c437b90508 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
@@ -109,7 +109,7 @@ define([
     wrapper.extend(ko, {
 
         /**
-         * Extends kncokouts' 'applyBindings'
+         * Extends knockouts' 'applyBindings'
          * to track nodes associated with model.
          *
          * @param {Function} orig - Original 'applyBindings' method.
@@ -136,7 +136,7 @@ define([
         },
 
         /**
-         * Extends kncokouts' cleanNode
+         * Extends knockouts' cleanNode
          * to track nodes associated with model.
          *
          * @param {Function} orig - Original 'cleanNode' method.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
index 98ffd83b56466..916666d70d1bd 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/observable_source.js
@@ -29,7 +29,7 @@ define([
          * Else, writes into it.
          * @param  {String} key - key to write to or to read from
          * @param  {*} value
-         * @return {*} - if 1 arg provided, returnes _data[key] property
+         * @return {*} - if 1 arg provided, Returns _data[key] property
          */
         data: function (key, value) {
             if (arguments.length === 1) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js b/app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js
index 5c3c71e31823d..826e8ec8c33b4 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js
@@ -17,7 +17,7 @@ define([
     var privateData = new WeakMap();
 
     /**
-     * Extarcts private items storage associated
+     * Extracts private item storage associated
      * with a provided registry instance.
      *
      * @param {Object} container
@@ -39,7 +39,7 @@ define([
     }
 
     /**
-     * Wrapper function used for convinient access to the elements.
+     * Wrapper function used for convenient access to the elements.
      * See 'async' method for examples of usage and comparison
      * with a regular 'get' method.
      *
@@ -139,7 +139,7 @@ define([
      * which matches specified search criteria.
      *
      * @param {Object} data - Data object where to perform a lookup.
-     * @param {(String|Object|Function)} query - Seach criteria.
+     * @param {(String|Object|Function)} query - Search criteria.
      * @param {Boolean} findAll - Flag that defines whether to
      *      search for all applicable items or to stop on a first found entry.
      * @returns {Array|Object|*}
@@ -322,8 +322,8 @@ define([
 
         /**
          * Creates a wrapper function over the provided search query
-         * in order to provide somehow more convinient access to the
-         * registrie's items.
+         * in order to provide somehow more convenient access to the
+         * registry's items.
          *
          * @param {(String|Object|Function)} query - Search criteria.
          *      See 'get' method for the syntax examples.
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 c7fb51f813ba0..d765f842a0895 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
@@ -11,10 +11,11 @@ define([
     'underscore',
     './utils',
     'moment',
+    'tinycolor',
     'jquery/validate',
     'jquery/ui',
     'mage/translate'
-], function ($, _, utils, moment) {
+], function ($, _, utils, moment, tinycolor) {
     'use strict';
 
     /**
@@ -72,61 +73,73 @@ define([
         ],
         'max-words': [
             function (value, params) {
-                return utils.stripHtml(value).match(/\b\w+\b/g).length < params;
+                return utils.isEmpty(value) || utils.stripHtml(value).match(/\b\w+\b/g).length < params;
             },
             $.mage.__('Please enter {0} words or less.')
         ],
         'min-words': [
             function (value, params) {
-                return utils.stripHtml(value).match(/\b\w+\b/g).length >= params;
+                return utils.isEmpty(value) || utils.stripHtml(value).match(/\b\w+\b/g).length >= params;
             },
             $.mage.__('Please enter at least {0} words.')
         ],
         'range-words': [
             function (value, params) {
-                return utils.stripHtml(value).match(/\b\w+\b/g).length >= params[0] &&
-                    value.match(/bw+b/g).length < params[1];
+                var match = utils.stripHtml(value).match(/\b\w+\b/g) || [];
+
+                return utils.isEmpty(value) || match.length >= params[0] &&
+                    match.length <= params[1];
             },
             $.mage.__('Please enter between {0} and {1} words.')
         ],
         'letters-with-basic-punc': [
             function (value) {
-                return /^[a-z\-.,()\u0027\u0022\s]+$/i.test(value);
+                return utils.isEmpty(value) || /^[a-z\-.,()\u0027\u0022\s]+$/i.test(value);
             },
             $.mage.__('Letters or punctuation only please')
         ],
         'alphanumeric': [
             function (value) {
-                return /^\w+$/i.test(value);
+                return utils.isEmpty(value) || /^\w+$/i.test(value);
             },
             $.mage.__('Letters, numbers, spaces or underscores only please')
         ],
         'letters-only': [
             function (value) {
-                return /^[a-z]+$/i.test(value);
+                return utils.isEmpty(value) || /^[a-z]+$/i.test(value);
             },
             $.mage.__('Letters only please')
         ],
         'no-whitespace': [
             function (value) {
-                return /^\S+$/i.test(value);
+                return utils.isEmpty(value) || /^\S+$/i.test(value);
             },
             $.mage.__('No white space please')
         ],
+        'no-marginal-whitespace': [
+            function (value) {
+                return !/^\s+|\s+$/i.test(value);
+            },
+            $.mage.__('No marginal white space please')
+        ],
         'zip-range': [
             function (value) {
-                return /^90[2-5]-\d{2}-\d{4}$/.test(value);
+                return utils.isEmpty(value) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
             },
             $.mage.__('Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx')
         ],
         'integer': [
             function (value) {
-                return /^-?\d+$/.test(value);
+                return utils.isEmpty(value) || /^-?\d+$/.test(value);
             },
             $.mage.__('A positive or negative non-decimal number please')
         ],
         'vinUS': [
             function (value) {
+                if (utils.isEmpty(value)) {
+                    return true;
+                }
+
                 if (value.length !== 17) {
                     return false;
                 }
@@ -212,13 +225,13 @@ define([
         ],
         'time': [
             function (value) {
-                return /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
+                return utils.isEmpty(value) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
             },
             $.mage.__('Please enter a valid time, between 00:00 and 23:59')
         ],
         'time12h': [
             function (value) {
-                return /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
+                return utils.isEmpty(value) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\s[AP]M))$/i.test(value);
             },
             $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
         ],
@@ -226,37 +239,39 @@ define([
             function (value) {
                 value = value.replace(/\s+/g, '');
 
-                return value.length > 9 && value.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
+                return utils.isEmpty(value) || value.length > 9 &&
+                    value.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
             },
             $.mage.__('Please specify a valid phone number')
         ],
         'phoneUK': [
             function (value) {
-                return value.length > 9 && value.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
+                return utils.isEmpty(value) || value.length > 9 &&
+                    value.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
             },
             $.mage.__('Please specify a valid phone number')
         ],
         'mobileUK': [
             function (value) {
-                return value.length > 9 && value.match(/^((0|\+44)7\d{3}\s?\d{6})$/);
+                return utils.isEmpty(value) || value.length > 9 && value.match(/^((0|\+44)7\d{3}\s?\d{6})$/);
             },
             $.mage.__('Please specify a valid mobile number')
         ],
         'stripped-min-length': [
             function (value, param) {
-                return $(value).text().length >= param;
+                return _.isUndefined(value) || value.length === 0 || utils.stripHtml(value).length >= param;
             },
             $.mage.__('Please enter at least {0} characters')
         ],
         'email2': [
             function (value) {
-                return /^((([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\u0022)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\u0022)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^((([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\u0022)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\u0022)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);//eslint-disable-line max-len
             },
             $.validator.messages.email
         ],
         'url2': [
             function (value) {
-                return /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);//eslint-disable-line max-len
             },
             $.validator.messages.url
         ],
@@ -264,6 +279,10 @@ define([
             function (value, param) {
                 var validTypes;
 
+                if (utils.isEmpty(value)) {
+                    return true;
+                }
+
                 if (/[^0-9-]+/.test(value)) {
                     return false;
                 }
@@ -348,19 +367,19 @@ define([
         ],
         'ipv4': [
             function (value) {
-                return /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);//eslint-disable-line max-len
             },
             $.mage.__('Please enter a valid IP v4 address.')
         ],
         'ipv6': [
             function (value) {
-                return /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);//eslint-disable-line max-len
             },
             $.mage.__('Please enter a valid IP v6 address.')
         ],
         'pattern': [
             function (value, param) {
-                return param.test(value);
+                return utils.isEmpty(value) || new RegExp(param).test(value);
             },
             $.mage.__('Invalid format.')
         ],
@@ -633,7 +652,7 @@ define([
         'validate-number': [
             function (value) {
                 return utils.isEmptyNoTrim(value) ||
-                    !isNaN(utils.parseNumber(value)) && /^\s*-?\d*(\.\d*)?\s*$/.test(value);
+                    !isNaN(utils.parseNumber(value)) && /^\s*-?\d*(,\d*)*(\.\d*)?\s*$/.test(value);
             },
             $.mage.__('Please enter a valid number in this field.')
         ],
@@ -673,6 +692,24 @@ define([
             },
             $.mage.__('The value is not within the specified range.')
         ],
+        'validate-positive-percent-decimal': [
+            function (value) {
+                var numValue;
+
+                if (utils.isEmptyNoTrim(value) || !/^\s*-?\d*(\.\d*)?\s*$/.test(value)) {
+                    return false;
+                }
+
+                numValue = utils.parseNumber(value);
+
+                if (isNaN(numValue)) {
+                    return false;
+                }
+
+                return utils.isBetween(numValue, 0.01, 100);
+            },
+            $.mage.__('Please enter a valid percentage discount value greater than 0.')
+        ],
         'validate-digits': [
             function (value) {
                 return utils.isEmptyNoTrim(value) || !/[^\d]/.test(value);
@@ -744,7 +781,7 @@ define([
             function (value) {
                 return utils.isEmptyNoTrim(value) || /^[a-z]+[a-z0-9_]+$/.test(value);
             },
-            $.mage.__('Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')//eslint-disable-line max-len
+            $.mage.__('Please use only lowercase letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')//eslint-disable-line max-len
         ],
         'validate-alphanum': [
             function (value) {
@@ -752,6 +789,12 @@ define([
             },
             $.mage.__('Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.')//eslint-disable-line max-len
         ],
+        'validate-not-number-first': [
+            function (value) {
+                return utils.isEmptyNoTrim(value) || /^[^0-9-\.].*$/.test(value.trim());
+            },
+            $.mage.__('First character must be letter.')
+        ],
         'validate-date': [
             function (value, params, additionalParams) {
                 var test = moment(value, additionalParams.dateFormat);
@@ -836,7 +879,7 @@ define([
                     return validateCreditCard(value);
                 }
 
-                return false;
+                return true;
             },
             $.mage.__('Please enter a valid credit card number.')
         ],
@@ -877,10 +920,14 @@ define([
         ],
         'validate-per-page-value-list': [
             function (value) {
-                var isValid = !utils.isEmpty(value),
+                var isValid = utils.isEmpty(value),
                     values = value.split(','),
                     i;
 
+                if (isValid) {
+                    return true;
+                }
+
                 for (i = 0; i < values.length; i++) {
                     if (!/^[0-9]+$/.test(values[i])) {
                         isValid = false;
@@ -907,8 +954,10 @@ define([
         ],
         'validate-item-quantity': [
             function (value, params) {
-                // obtain values for validation
-                var qty = utils.parseNumber(value),
+                var validator = this,
+                    result = false,
+                    // obtain values for validation
+                    qty = utils.parseNumber(value),
                     isMinAllowedValid = typeof params.minAllowed === 'undefined' ||
                         qty >= utils.parseNumber(params.minAllowed),
                     isMaxAllowedValid = typeof params.maxAllowed === 'undefined' ||
@@ -916,9 +965,42 @@ define([
                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
                         qty % utils.parseNumber(params.qtyIncrements) === 0;
 
-                return isMaxAllowedValid && isMinAllowedValid && isQtyIncrementsValid && qty > 0;
-            },
-            ''
+                result = qty > 0;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('Please enter a quantity greater than 0.');//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMinAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The fewest you may purchase is %1.').replace('%1', params.minAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMaxAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isQtyIncrementsValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('You can buy this product only in quantities of %1 at a time.').replace('%1', params.qtyIncrements);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                return result;
+            }, function () {
+                return this.itemQtyErrorMessage;
+            }
         ],
         'equalTo': [
             function (value, param) {
@@ -961,6 +1043,22 @@ define([
                 return moment.utc(value, params.dateFormat).unix() <= maxValue;
             },
             $.mage.__('The date is not within the specified range.')
+        ],
+        'validate-color': [
+            function (value) {
+                if (value === '') {
+                    return true;
+                }
+
+                return tinycolor(value).isValid();
+            },
+            $.mage.__('Wrong color format. Please specify color in HEX, RGBa, HSVa, HSLa or use color name.')
+        ],
+        '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/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
index 31362644d415a..be8fd2ce9fcef 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
@@ -60,7 +60,7 @@ define([
     }
 
     /**
-     * Validates provied value by a specfied set of rules.
+     * Validates provied value by a specified set of rules.
      *
      * @param {(String|Object)} rules - One or many validation rules.
      * @param {*} value - Value to be checked.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
index f6afdf7846388..77de8a1ceb0ed 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/bindings.js
@@ -88,7 +88,7 @@ define([
     };
 
     /**
-     * Adds specfied bindings to each DOM elemenet in
+     * Adds specified bindings to each DOM element in
      * collection and evalutes them with provided context.
      *
      * @param {(Object|Function)} data - Either bindings object or a function
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
index 4590af4f2d635..03012918f4a0d 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
@@ -12,7 +12,8 @@ define([
 
     var counter = 1,
         watchers,
-        globalObserver;
+        globalObserver,
+        disabledNodes = [];
 
     watchers = {
         selectors: {},
@@ -238,11 +239,58 @@ define([
         };
     }
 
+    /**
+     * Verify if the DOM node is a child of a defined disabled node, if so we shouldn't observe provided mutation.
+     *
+     * @param {Object} mutation - a single mutation
+     * @returns {Boolean}
+     */
+    function shouldObserveMutation(mutation) {
+        var isDisabled;
+
+        if (disabledNodes.length > 0) {
+            // Iterate through the disabled nodes and determine if this mutation is occurring inside one of them
+            isDisabled = _.find(disabledNodes, function (node) {
+                return node === mutation.target || $.contains(node, mutation.target);
+            });
+
+            // If we find a matching node we should not observe the mutation
+            return !isDisabled;
+        }
+
+        return true;
+    }
+
+    /**
+     * Should we observe these mutations? Check the first and last mutation to determine if this is a disabled mutation,
+     * we check both the first and last in case one has been removed from the DOM during the process of the mutation.
+     *
+     * @param {Array} mutations - An array of mutation records.
+     * @returns {Boolean}
+     */
+    function shouldObserveMutations(mutations) {
+        var firstMutation,
+            lastMutation;
+
+        if (mutations.length > 0) {
+            firstMutation = mutations[0];
+            lastMutation = mutations[mutations.length - 1];
+
+            return shouldObserveMutation(firstMutation) && shouldObserveMutation(lastMutation);
+        }
+
+        return true;
+    }
+
     globalObserver = new MutationObserver(function (mutations) {
-        var changes = formChangesLists(mutations);
+        var changes;
+
+        if (shouldObserveMutations(mutations)) {
+            changes = formChangesLists(mutations);
 
-        changes.removed.forEach(processRemoved);
-        changes.added.forEach(processAdded);
+            changes.removed.forEach(processRemoved);
+            changes.added.forEach(processAdded);
+        }
     });
 
     globalObserver.observe(document.body, {
@@ -251,6 +299,16 @@ define([
     });
 
     return {
+        /**
+         * Disable a node from being observed by the mutations, you may want to disable specific aspects of the
+         * application which are heavy on DOM changes. The observer running on some actions could cause significant
+         * delays and degrade the performance of that specific part of the application exponentially.
+         *
+         * @param {HTMLElement} node - a HTML node within the document
+         */
+        disableNode: function (node) {
+            disabledNodes.push(node);
+        },
 
         /**
          * Adds listener for the appearance of nodes that matches provided
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 1cbbfb3ecee48..3ec0996543c7d 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/js/modal/confirm.js b/app/code/Magento/Ui/view/base/web/js/modal/confirm.js
index 9cb14f7b2ef11..eceab940d1141 100644
--- a/app/code/Magento/Ui/view/base/web/js/modal/confirm.js
+++ b/app/code/Magento/Ui/view/base/web/js/modal/confirm.js
@@ -9,10 +9,10 @@
 define([
     'jquery',
     'underscore',
+    'mage/translate',
     'jquery/ui',
-    'Magento_Ui/js/modal/modal',
-    'mage/translate'
-], function ($, _) {
+    'Magento_Ui/js/modal/modal'
+], function ($, _, $t) {
     'use strict';
 
     $.widget('mage.confirm', $.mage.modal, {
@@ -38,7 +38,7 @@ define([
                 cancel: function () {}
             },
             buttons: [{
-                text: $.mage.__('Cancel'),
+                text: $t('Cancel'),
                 class: 'action-secondary action-dismiss',
 
                 /**
@@ -48,7 +48,7 @@ define([
                     this.closeModal(event);
                 }
             }, {
-                text: $.mage.__('OK'),
+                text: $t('OK'),
                 class: 'action-primary action-accept',
 
                 /**
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
index af2b31f7eab43..c81274337f418 100644
--- a/app/code/Magento/Ui/view/base/web/js/modal/modal.js
+++ b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -104,11 +104,12 @@ define([
                 /**
                  * Escape key press handler,
                  * close modal window
+                 * @param {Object} event - event
                  */
-                escapeKey: function () {
+                escapeKey: function (event) {
                     if (this.options.isOpen && this.modal.find(document.activeElement).length ||
                         this.options.isOpen && this.modal[0] === document.activeElement) {
-                        this.closeModal();
+                        this.closeModal(event);
                     }
                 }
             }
@@ -336,11 +337,18 @@ define([
          * Set z-index and margin for modal and overlay.
          */
         _setActive: function () {
-            var zIndex = this.modal.zIndex();
+            var zIndex = this.modal.zIndex(),
+                baseIndex = zIndex + this._getVisibleCount();
 
+            if (this.modal.data('active')) {
+                return;
+            }
+
+            this.modal.data('active', true);
+
+            this.overlay.zIndex(++baseIndex);
             this.prevOverlayIndex = this.overlay.zIndex();
-            this.modal.zIndex(zIndex + this._getVisibleCount());
-            this.overlay.zIndex(zIndex + (this._getVisibleCount() - 1));
+            this.modal.zIndex(this.overlay.zIndex() + 1);
 
             if (this._getVisibleSlideCount()) {
                 this.modal.css('marginLeft', this.options.modalLeftMargin * this._getVisibleSlideCount());
@@ -352,9 +360,10 @@ define([
          */
         _unsetActive: function () {
             this.modal.removeAttr('style');
+            this.modal.data('active', false);
 
             if (this.overlay) {
-                this.overlay.zIndex(this.prevOverlayIndex);
+                this.overlay.zIndex(this.prevOverlayIndex - 1);
             }
         },
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/block-loader.html b/app/code/Magento/Ui/view/base/web/templates/block-loader.html
index 3d8b730a9e8c5..cb28b09e4da83 100644
--- a/app/code/Magento/Ui/view/base/web/templates/block-loader.html
+++ b/app/code/Magento/Ui/view/base/web/templates/block-loader.html
@@ -6,6 +6,6 @@
 -->
 <div data-role="loader" class="loading-mask" style="position: absolute;">
     <div class="loader">
-        <img src="<%= loaderImageHref %>" alt="Loading..." style="position: absolute;">
+        <img src="<%= loaderImageHref %>" alt="Loading..." title="Loading..." style="position: absolute;">
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
index 25917bcbdb59a..d0b12549bd66d 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/components/collection.html b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
index e153beab8748b..873b0ca744a88 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
@@ -30,7 +30,7 @@
                 <legend class="admin__legend">
                     <span text="$parent.label"/>
                 </legend><br />
-                
+
                 <each args="getRegion('body')" render=""/>
             </fieldset>
         </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/collection/preview.html b/app/code/Magento/Ui/view/base/web/templates/form/components/collection/preview.html
index 2c0ce802b4bc0..806ac767d7b59 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/collection/preview.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/collection/preview.html
@@ -11,7 +11,7 @@
             'company',
             'street',
             {
-                items: 'city region_id postcode',
+                items: 'city region_id region_id_input postcode',
                 separator: ', '
             },
             'country_id',
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
index 79478d2417110..ce06201adb8ba 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
@@ -16,14 +16,14 @@
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip">
         <div class="admin__field admin__field-option" outereach="options">
-            <input 
+            <input
                 ko-checked="$parent.value"
                 ko-disabled="$parent.disabled"
                 css="
                     'admin__control-radio': !$parent.multiple,
                     'admin__control-checkbox': $parent.multiple"
                 attr="
-                    id: ++ko.uid, 
+                    id: ++ko.uid,
                     value: value,
                     type: $parent.multiple ? 'checkbox' : 'radio'"/>
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/color-picker.html b/app/code/Magento/Ui/view/base/web/templates/form/element/color-picker.html
new file mode 100644
index 0000000000000..58b8ac2ee8ed3
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/color-picker.html
@@ -0,0 +1,14 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field-control"
+     visible="visible"
+     css="$data.additionalClasses">
+    <input type="hidden" class="colorpicker-spectrum" colorPicker="colorPickerConfig" disable="disabled" />
+    <input type="text" class="admin__control-text colorpicker-input"
+           ko-value="value" hasFocus="focused" disable="disabled"
+           attr="name: inputName, id: uid, placeholder: placeholder"/>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
index e3c3ab5b5df5c..195104b36721e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/service.html
@@ -10,8 +10,8 @@
            attr="
                 id: $data.uid + '_default',
                 name: 'use_default[' + $data.index + ']',
-                'data-form-part': $data.ns
            "
-           ko-checked="isUseDefault">
+           ko-checked="isUseDefault"
+           ko-disabled="$data.serviceDisabled">
     <label translate="'Use Default Value'" attr="for: $data.uid + '_default'" class="admin__field-label"></label>
 </div>
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 3d41fc41fe239..c57678a91a61e 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/uploader/image.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html
new file mode 100644
index 0000000000000..8ae85b567fc5a
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html
@@ -0,0 +1,53 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field" visible="visible" css="$data.additionalClasses">
+    <label class="admin__field-label" if="$data.label" attr="for: uid">
+        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
+    </label>
+
+    <div class="admin__field-control" css="'_with-tooltip': $data.tooltip">
+        <div class="file-uploader image-uploader" data-role="drop-zone" css="_loading: isLoading">
+            <div class="file-uploader-area">
+                <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled" />
+                <label class="file-uploader-button action-default" attr="for: uid, disabled: disabled" disable="disabled" translate="'Upload'" />
+                <label
+                    data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"
+                    class="file-uploader-button action-default"
+                    attr="id: mediaGalleryUid, disabled: disabled"
+                    data-force_static_path="1"
+                    translate="'Select from Gallery'"/>
+                <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+                <p class="image-upload-requirements">
+                    <span if="$data.maxFileSize">
+                        <span translate="'Maximum file size'" />: <text args="formatSize($data.maxFileSize)"/>.
+                    </span>
+                    <span if="$data.allowedExtensions">
+                        <span translate="'Allowed file types'" />: <text args="getAllowedFileExtensionsInCommaDelimitedFormat()"/>.
+                    </span>
+                </p>
+            </div>
+
+            <render args="tooltipTpl" if="$data.tooltip"/>
+
+            <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
+                <span html="notice"/>
+            </div>
+
+            <label class="admin__field-error" if="error" attr="for: uid" text="error"/>
+
+            <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
+
+            <div if="!hasData()" class="image image-placeholder" click="triggerImageUpload">
+                <div class="file-uploader-summary product-image-wrapper">
+                    <div class="file-uploader-spinner image-uploader-spinner" />
+                    <p class="image-placeholder-text" translate="'Browse to find or drag image here'"/>
+                </div>
+            </div>
+        </div>
+        <render args="$data.service.template" if="$data.hasService()"/>
+    </div>
+</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 0000000000000..4426e6024fb98
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html
@@ -0,0 +1,31 @@
+<!--
+/**
+ * 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">
+            <div class="type-selector-input-container">
+                <!--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>
+            </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 0000000000000..39267458bf681
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/setting.html
@@ -0,0 +1,17 @@
+<!--
+/**
+ * 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"
+           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 0000000000000..95a87a2789d50
--- /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/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
index 6143900d5dd7b..6a095b4da14ed 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -8,9 +8,11 @@
      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-label" visible="$data.labelVisible">
+        <label if="$data.label"  attr="for: uid">
+            <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
+        </label>
+    </div>
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
         <render args="elementTmpl" ifnot="hasAddons()"/>
@@ -35,7 +37,7 @@
         <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
             <span translate="notice"/>
         </div>
-        
+
         <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
 
         <render args="$data.service.template" if="$data.hasService()"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/insert.html b/app/code/Magento/Ui/view/base/web/templates/form/insert.html
index e19b2784e6bc6..e590b5e2adedf 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/insert.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/insert.html
@@ -6,9 +6,6 @@
 -->
 
 <div data-bind="bindHtml: content,
-        attr: {
-            class: element.cssclass ? element.cssclass : 'admin__scope-old'
-        },
         visible: visible,
         css: contentSelector"></div>
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
index 18dd49bd56ee3..e6e14d5aa335b 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
@@ -11,7 +11,7 @@
             data-bind="
                 checked: allSelected(),
                 attr: {id: ++ko.uid},
-                event: { change: toggleSelectAll },
+                event: { change: togglePage },
                 css: { '_indeterminate': indetermine },
                 enable: totalRecords">
         <label attr="for: ko.uid"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
index a11e56a68dab2..81c7acaf4aa33 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
@@ -13,7 +13,7 @@
                 </button>
             </with>
         </if>
-        
+
         <if args="$data.isEditor">
             <label class="admin__field-label admin__field-label-vertical" attr="for: uid" translate="'All in Column'"/>
             <render/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
index 4b3109e522f0b..c82456b2a357c 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
@@ -11,8 +11,8 @@
             <span class="data-grid-row-changed" css="_changed: $parent.hasChanges">
                 <span class="data-grid-row-changed-tooltip" translate="'Record contains unsaved changes.'"/>
             </span>
-        </td>        
-        
+        </td>
+
         <!-- ko ifnot: $parent.isActionsColumn($data) -->
             <td if="$col.isEditor" template="$parent.fieldTmpl"/>
             <td ifnot="$col.isEditor" css="$col.getFieldClass()" template="$col.getBody()"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
index 4038f65738041..bf3e2df8a82d0 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
@@ -42,8 +42,29 @@
             }
     ">
         <div class="admin__action-multiselect-text"
-             data-role="selected-option"
-             data-bind="text: setCaption()">
+         data-role="selected-option"
+         ifnot="validationLoading"
+         data-bind="
+         css: {warning: warn().length},
+         text: setCaption()
+    ">
+    </div>
+        <button if="isRemoveSelectedIcon && hasData() || !validationLoading"
+                class="action-close"
+                type="button"
+                data-action="remove-selected-item"
+                tabindex="-1"
+                click="clear"
+        >
+            <span class="action-close-text" translate="'Close'"></span>
+        </button>
+        <div data-role="spinner"
+             class="admin__data-grid-loading-mask"
+             visible="validationLoading"
+             if="validationLoading">
+            <div class="spinner">
+                <span repeat="8"/>
+            </div>
         </div>
     </div>
     <!-- /ko -->
@@ -80,9 +101,15 @@
         <!-- /ko -->
     </div>
     <!-- /ko -->
-    <div class="action-menu"
-         data-bind="css: { _active: listVisible }
-    ">
+    <div class="action-menu" css="{ _active: listVisible}">
+        <div data-role="spinner"
+           class="admin__data-grid-loading-mask"
+           visible="loading"
+           if="loading">
+        <div class="spinner">
+            <span repeat="8"/>
+        </div>
+    </div>
         <!-- ko if: filterOptions -->
         <div class="admin__action-multiselect-search-wrap">
             <input
@@ -93,7 +120,10 @@
                 event: {
                     keydown: filterOptionsKeydown
                 },
-                attr: {id: uid+2},
+                attr: {
+                    id: uid+2,
+                    placeholder: filterPlaceholder
+                },
                 valueUpdate: 'afterkeydown',
                 value: filterInputValue,
                 hasFocus: filterOptionsFocus
@@ -109,11 +139,16 @@
                  class="admin__action-multiselect-search-count">
             </div>
         </div>
+        <div ifnot="options().length"
+             class="admin__action-multiselect-empty-area">
+            <ul data-bind="html: emptyOptionsHtml"/>
+        </div>
         <!-- /ko -->
         <ul class="admin__action-multiselect-menu-inner _root"
             data-bind="
                 event: {
-                    mousemove: function(data, event){onMousemove($data, $index(), event)}
+                    mousemove: function(data, event){onMousemove($data, $index(), event)},
+                    scroll: function(data, event){onScrollDown(data, event)}
                 }
             ">
             <!-- ko foreach: { data: options, as: 'option'}  -->
@@ -123,7 +158,7 @@
                 <div class="action-menu-item"
                      data-bind="
                         css: {
-                            _selected: $parent.isSelected(option.value),
+                            _selected: $parent.isSelectedValue(option),
                             _hover: $parent.isHovered(option, $element),
                             _expended: $parent.getLevelVisibility($data),
                             _unclickable: $parent.isLabelDecoration($data),
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
index 2af1a430a6e00..eab2523b06e41 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
@@ -14,7 +14,7 @@
 
 <scope args="chips" render=""/>
 
-<div class="admin__data-grid-filters-wrap" data-part="filter-form" css="_show: hasVisible() && $collapsible.opened()">
+<div class="admin__data-grid-filters-wrap" data-part="filter-form" css="_show: hasVisible() && $collapsible.opened()" keyboard="{ 13: apply }">
     <fieldset class="admin__fieldset admin__data-grid-filters">
         <legend class="admin__filters-legend">
             <span translate="'Advanced filter'"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
index 0bd5ea06dbf86..8d79bfe6a1b4c 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
@@ -7,7 +7,7 @@
 <div style="display: none;" css="stickyClass" afterRender="setStickyNode">
     <span class="data-grid-cap-left" afterRender="setLeftCap"/>
     <span class="data-grid-cap-right" afterRender="setRightCap"/>
-    
+
     <div afterRender="setStickyToolbarNode">
         <div class="admin__data-grid-header">
             <div class="admin__data-grid-header-row">
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/group.html b/app/code/Magento/Ui/view/base/web/templates/group/group.html
index 13abdb15d965c..e30ac7a377542 100644
--- a/app/code/Magento/Ui/view/base/web/templates/group/group.html
+++ b/app/code/Magento/Ui/view/base/web/templates/group/group.html
@@ -19,7 +19,7 @@
                 <render args="elementTmpl" if="element.input_type == 'checkbox' || element.input_type == 'radio'"/>
             </if>
         </each>
-        
+
         <each args="getRegion('insideGroup')" render=""/>
 
         <each args="elems" if="validateWholeGroup">
diff --git a/app/code/Magento/Ui/view/frontend/web/js/model/messages.js b/app/code/Magento/Ui/view/frontend/web/js/model/messages.js
index b970b2236155f..fb9a20c054da2 100644
--- a/app/code/Magento/Ui/view/frontend/web/js/model/messages.js
+++ b/app/code/Magento/Ui/view/frontend/web/js/model/messages.js
@@ -55,7 +55,7 @@ define([
                 return messageObj.parameters.shift();
             });
             this.clear();
-            this.errorMessages.push(message);
+            type.push(message);
 
             return true;
         },
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index dad8a8b157fee..06f68db05398f 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -6,14 +6,15 @@
 
 namespace Magento\Ups\Model;
 
-use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Framework\HTTP\ClientFactory;
+use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 use Magento\Shipping\Model\Carrier\CarrierInterface;
 use Magento\Shipping\Model\Rate\Result;
 use Magento\Shipping\Model\Simplexml\Element;
 use Magento\Ups\Helper\Config;
-use Magento\Framework\Xml\Security;
 
 /**
  * UPS shipping implementation
@@ -124,9 +125,14 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * @inheritdoc
      */
     protected $_debugReplacePrivateDataKeys = [
-        'UserId', 'Password'
+        'UserId', 'Password', 'AccessLicenseNumber'
     ];
 
+    /**
+     * @var ClientFactory
+     */
+    private $httpClientFactory;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -145,6 +151,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param Config $configHelper
+     * @param ClientFactory $httpClientFactory
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -167,10 +174,9 @@ public function __construct(
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         Config $configHelper,
+        ClientFactory $httpClientFactory,
         array $data = []
     ) {
-        $this->_localeFormat = $localeFormat;
-        $this->configHelper = $configHelper;
         parent::__construct(
             $scopeConfig,
             $rateErrorFactory,
@@ -189,6 +195,9 @@ public function __construct(
             $stockRegistry,
             $data
         );
+        $this->httpClientFactory = $httpClientFactory;
+        $this->_localeFormat = $localeFormat;
+        $this->configHelper = $configHelper;
     }
 
     /**
@@ -476,7 +485,7 @@ protected function _getCgiQuotes()
 
                 $debugData['result'] = $responseBody;
                 $this->_setCachedQuotes($params, $responseBody);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $responseBody = '';
             }
@@ -621,7 +630,7 @@ protected function _getXmlQuotes()
             $serviceCode = null;
         } else {
             $params['10_action'] = 'Rate';
-            $serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : '';
+            $serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : null;
         }
         $serviceDescription = $serviceCode ? $this->getShipmentByCode($serviceCode) : '';
 
@@ -655,8 +664,8 @@ protected function _getXmlQuotes()
       <Shipper>
 XMLRequest;
 
-        if ($this->getConfigFlag('negotiated_active') && ($shipper = $this->getConfigData('shipper_number'))) {
-            $xmlParams .= "<ShipperNumber>{$shipper}</ShipperNumber>";
+        if ($this->getConfigFlag('negotiated_active') && ($shipperNumber = $this->getConfigData('shipper_number'))) {
+            $xmlParams .= "<ShipperNumber>{$shipperNumber}</ShipperNumber>";
         }
 
         if ($rowRequest->getIsReturn()) {
@@ -679,6 +688,7 @@ protected function _getXmlQuotes()
           <StateProvinceCode>{$shipperStateProvince}</StateProvinceCode>
       </Address>
     </Shipper>
+    
     <ShipTo>
       <Address>
           <PostalCode>{$params['19_destPostal']}</PostalCode>
@@ -694,8 +704,7 @@ protected function _getXmlQuotes()
         $xmlParams .= <<<XMLRequest
       </Address>
     </ShipTo>
-
-
+    
     <ShipFrom>
       <Address>
           <PostalCode>{$params['15_origPostal']}</PostalCode>
@@ -705,9 +714,13 @@ protected function _getXmlQuotes()
     </ShipFrom>
 
     <Package>
-      <PackagingType><Code>{$params['48_container']}</Code></PackagingType>
+      <PackagingType>
+        <Code>{$params['48_container']}</Code>
+      </PackagingType>
       <PackageWeight>
-         <UnitOfMeasurement><Code>{$rowRequest->getUnitMeasure()}</Code></UnitOfMeasurement>
+        <UnitOfMeasurement>
+          <Code>{$rowRequest->getUnitMeasure()}</Code>
+        </UnitOfMeasurement>
         <Weight>{$params['23_weight']}</Weight>
       </PackageWeight>
     </Package>
@@ -716,10 +729,13 @@ protected function _getXmlQuotes()
         if ($this->getConfigFlag('negotiated_active')) {
             $xmlParams .= "<RateInformation><NegotiatedRatesIndicator/></RateInformation>";
         }
+        if ($this->getConfigFlag('include_taxes')) {
+            $xmlParams .= "<TaxInformationIndicator/>";
+        }
 
         $xmlParams .= <<<XMLRequest
-  </Shipment>
-</RatingServiceSelectionRequest>
+      </Shipment>
+    </RatingServiceSelectionRequest>
 XMLRequest;
 
         $xmlRequest .= $xmlParams;
@@ -728,19 +744,12 @@ protected function _getXmlQuotes()
         if ($xmlResponse === null) {
             $debugData['request'] = $xmlParams;
             try {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_HEADER, 0);
-                curl_setopt($ch, CURLOPT_POST, 1);
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $xmlRequest);
-                curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (bool)$this->getConfigFlag('mode_xml'));
-                $xmlResponse = curl_exec($ch);
-
+                $client = $this->httpClientFactory->create();
+                $client->post($url, $xmlRequest);
+                $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
             }
@@ -791,6 +800,8 @@ private function mapCurrencyCode($code)
      * @param mixed $xmlResponse
      * @return Result
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.ElseExpression)
      */
     protected function _parseXmlResponse($xmlResponse)
     {
@@ -815,17 +826,52 @@ protected function _parseXmlResponse($xmlResponse)
                 foreach ($arr as $shipElement) {
                     $code = (string)$shipElement->Service->Code;
                     if (in_array($code, $allowedMethods)) {
+                        //The location of tax information is in a different place
+                        // depending on whether we are using negotiated rates or not
                         if ($negotiatedActive) {
-                            $cost = $shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->MonetaryValue;
+                            $includeTaxesArr = $xml->getXpath(
+                                "//RatingServiceSelectionResponse/RatedShipment/NegotiatedRates"
+                                . "/NetSummaryCharges/TotalChargesWithTaxes"
+                            );
+                            $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
+                            if ($includeTaxesActive) {
+                                $cost = $shipElement->NegotiatedRates
+                                    ->NetSummaryCharges
+                                    ->TotalChargesWithTaxes
+                                    ->MonetaryValue;
+
+                                $responseCurrencyCode = $this->mapCurrencyCode(
+                                    (string)$shipElement->NegotiatedRates
+                                        ->NetSummaryCharges
+                                        ->TotalChargesWithTaxes
+                                        ->CurrencyCode
+                                );
+                            } else {
+                                $cost = $shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->MonetaryValue;
+                                $responseCurrencyCode = $this->mapCurrencyCode(
+                                    (string)$shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->CurrencyCode
+                                );
+                            }
                         } else {
-                            $cost = $shipElement->TotalCharges->MonetaryValue;
+                            $includeTaxesArr = $xml->getXpath(
+                                "//RatingServiceSelectionResponse/RatedShipment/TotalChargesWithTaxes"
+                            );
+                            $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
+                            if ($includeTaxesActive) {
+                                $cost = $shipElement->TotalChargesWithTaxes->MonetaryValue;
+                                $responseCurrencyCode = $this->mapCurrencyCode(
+                                    (string)$shipElement->TotalChargesWithTaxes->CurrencyCode
+                                );
+                            } else {
+                                $cost = $shipElement->TotalCharges->MonetaryValue;
+                                $responseCurrencyCode = $this->mapCurrencyCode(
+                                    (string)$shipElement->TotalCharges->CurrencyCode
+                                );
+                            }
                         }
 
                         //convert price with Origin country currency code to base currency code
                         $successConversion = true;
-                        $responseCurrencyCode = $this->mapCurrencyCode(
-                            (string)$shipElement->TotalCharges->CurrencyCode
-                        );
                         if ($responseCurrencyCode) {
                             if (in_array($responseCurrencyCode, $allowedCurrencies)) {
                                 $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);
@@ -845,7 +891,7 @@ protected function _parseXmlResponse($xmlResponse)
 
                         if ($successConversion) {
                             $costArr[$code] = $cost;
-                            $priceArr[$code] = $this->getMethodPrice(floatval($cost), $code);
+                            $priceArr[$code] = $this->getMethodPrice((float)$cost, $code);
                         }
                     }
                 }
@@ -865,10 +911,13 @@ protected function _parseXmlResponse($xmlResponse)
             $error = $this->_rateErrorFactory->create();
             $error->setCarrier('ups');
             $error->setCarrierTitle($this->getConfigData('title'));
+            if ($this->getConfigData('specificerrmsg') !== '') {
+                $errorTitle = $this->getConfigData('specificerrmsg');
+            }
             if (!isset($errorTitle)) {
                 $errorTitle = __('Cannot retrieve shipping rates');
             }
-            $error->setErrorMessage($this->getConfigData('specificerrmsg'));
+            $error->setErrorMessage($errorTitle);
             $result->append($error);
         } else {
             foreach ($priceArr as $method => $price) {
@@ -921,7 +970,7 @@ protected function setXMLAccessRequest()
         $accessKey = $this->getConfigData('access_license_number');
 
         $this->_xmlAccessRequest = <<<XMLAuth
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <AccessRequest xml:lang="en-US">
   <AccessLicenseNumber>$accessKey</AccessLicenseNumber>
   <UserId>$userId</UserId>
@@ -971,36 +1020,27 @@ protected function _getXmlTracking($trackings)
         $url = $this->getConfigData('tracking_xml_url');
 
         foreach ($trackings as $tracking) {
-            $xmlRequest = $this->_xmlAccessRequest;
-
             /**
-             * RequestOption==>'activity' or '1' to request all activities
+             * RequestOption==>'1' to request all activities
              */
-            $xmlRequest .= <<<XMLAuth
+            $xmlRequest = <<<XMLAuth
 <?xml version="1.0" ?>
 <TrackRequest xml:lang="en-US">
     <Request>
         <RequestAction>Track</RequestAction>
-        <RequestOption>activity</RequestOption>
+        <RequestOption>1</RequestOption>
     </Request>
     <TrackingNumber>$tracking</TrackingNumber>
     <IncludeFreight>01</IncludeFreight>
 </TrackRequest>
 XMLAuth;
-            $debugData = ['request' => $xmlRequest];
-
+            $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest;
             try {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_HEADER, 0);
-                curl_setopt($ch, CURLOPT_POST, 1);
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $xmlRequest);
-                curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-                $xmlResponse = curl_exec($ch);
+                $client = $this->httpClientFactory->create();
+                $client->post($url, $this->_xmlAccessRequest . $xmlRequest);
+                $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
-                curl_close($ch);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
             }
@@ -1052,15 +1092,15 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
                 if ($activityTags) {
                     $index = 1;
                     foreach ($activityTags as $activityTag) {
-                        $addArr = [];
+                        $addressArr = [];
                         if (isset($activityTag->ActivityLocation->Address->City)) {
-                            $addArr[] = (string)$activityTag->ActivityLocation->Address->City;
+                            $addressArr[] = (string)$activityTag->ActivityLocation->Address->City;
                         }
                         if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
-                            $addArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
+                            $addressArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
                         }
                         if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
-                            $addArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
+                            $addressArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
                         }
                         $dateArr = [];
                         $date = (string)$activityTag->Date;
@@ -1084,8 +1124,8 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
                             //HH:MM:SS
                             $resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
                             $resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
-                            if ($addArr) {
-                                $resultArr['deliveryto'] = implode(', ', $addArr);
+                            if ($addressArr) {
+                                $resultArr['deliveryto'] = implode(', ', $addressArr);
                             }
                         } else {
                             $tempArr = [];
@@ -1094,8 +1134,8 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
                             //YYYY-MM-DD
                             $tempArr['deliverytime'] = implode(':', $timeArr);
                             //HH:MM:SS
-                            if ($addArr) {
-                                $tempArr['deliverylocation'] = implode(', ', $addArr);
+                            if ($addressArr) {
+                                $tempArr['deliverylocation'] = implode(', ', $addressArr);
                             }
                             $packageProgress[] = $tempArr;
                         }
@@ -1368,16 +1408,10 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
             }
         }
 
-        $shipmentPart->addChild(
-            'PaymentInformation'
-        )->addChild(
-            'Prepaid'
-        )->addChild(
-            'BillShipper'
-        )->addChild(
-            'AccountNumber',
-            $this->getConfigData('shipper_number')
-        );
+        $shipmentPart->addChild('PaymentInformation')
+            ->addChild('Prepaid')
+            ->addChild('BillShipper')
+            ->addChild('AccountNumber', $this->getConfigData('shipper_number'));
 
         if ($request->getPackagingType() != $this->configHelper->getCode('container', 'ULE')
             && $request->getShipperAddressCountryCode() == self::USA_COUNTRY_ID
@@ -1393,10 +1427,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
         $labelPart->addChild('LabelPrintMethod')->addChild('Code', 'GIF');
         $labelPart->addChild('LabelImageFormat')->addChild('Code', 'GIF');
 
-        $this->setXMLAccessRequest();
-        $xmlRequest = $this->_xmlAccessRequest . $xmlRequest->asXml();
-
-        return $xmlRequest;
+        return $xmlRequest->asXml();
     }
 
     /**
@@ -1413,28 +1444,22 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
         $request = $xmlRequest->addChild('Request');
         $request->addChild('RequestAction', 'ShipAccept');
         $xmlRequest->addChild('ShipmentDigest', $shipmentConfirmResponse->ShipmentDigest);
-        $debugData = ['request' => $xmlRequest->asXML()];
+        $debugData = ['request' => $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest->asXML()];
 
         try {
-            $ch = curl_init($this->getShipAcceptUrl());
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_HEADER, 0);
-            curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->_xmlAccessRequest . $xmlRequest->asXML());
-            curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (bool)$this->getConfigFlag('mode_xml'));
-            $xmlResponse = curl_exec($ch);
-
+            $client = $this->httpClientFactory->create();
+            $client->post($this->getShipAcceptUrl(), $this->_xmlAccessRequest . $xmlRequest->asXML());
+            $xmlResponse = $client->getBody();
             $debugData['result'] = $xmlResponse;
             $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $xmlResponse = '';
         }
 
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
         }
 
@@ -1475,39 +1500,33 @@ public function getShipAcceptUrl()
      *
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
-     * @throws \Exception
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
         $this->_prepareShipmentRequest($request);
         $result = new \Magento\Framework\DataObject();
-        $xmlRequest = $this->_formShipmentRequest($request);
+        $rawXmlRequest = $this->_formShipmentRequest($request);
+        $this->setXMLAccessRequest();
+        $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
 
         if ($xmlResponse === null) {
+            $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;
             $url = $this->getShipConfirmUrl();
-
-            $debugData = ['request' => $xmlRequest];
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, $url);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_HEADER, 0);
-            curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $xmlRequest);
-            curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (bool)$this->getConfigFlag('mode_xml'));
-            $xmlResponse = curl_exec($ch);
-            if ($xmlResponse === false) {
-                throw new \Exception(curl_error($ch));
-            } else {
+            $client = $this->httpClientFactory->create();
+            try {
+                $client->post($url, $xmlRequest);
+                $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
+            } catch (\Throwable $e) {
+                $debugData['result'] = ['code' => $e->getCode(), 'error' => $e->getMessage()];
             }
         }
 
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $result->setErrors($e->getMessage());
         }
diff --git a/app/code/Magento/Ups/Test/Mftf/LICENSE.txt b/app/code/Magento/Ups/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Mftf/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/Ups/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Ups/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Mftf/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/Ups/Test/Mftf/README.md b/app/code/Magento/Ups/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9f3fe133f3228
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Ups Functional Tests
+
+The Functional Test Module for **Magento Ups** module.
diff --git a/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentAcceptResponse.xml b/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentAcceptResponse.xml
new file mode 100644
index 0000000000000..c15986f6502a5
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentAcceptResponse.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ShipmentAcceptResponse>
+    <Response>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <ShipmentResults>
+        <ShipmentCharges>
+            <TransportationCharges>
+                <CurrencyCode>USD</CurrencyCode>
+                <MonetaryValue>193.22</MonetaryValue>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode>USD</CurrencyCode>
+                <MonetaryValue>0.00</MonetaryValue>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode>USD</CurrencyCode>
+                <MonetaryValue>193.22</MonetaryValue>
+            </TotalCharges>
+        </ShipmentCharges>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <MonetaryValue>191.29</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>LBS</Code>
+                <Description>Pounds</Description>
+            </UnitOfMeasurement>
+            <Weight>4.0</Weight>
+        </BillingWeight>
+        <ShipmentIdentificationNumber>1Z207W886698856557</ShipmentIdentificationNumber>
+        <PackageResults>
+            <TrackingNumber>1Z207W886698856557</TrackingNumber>
+            <ServiceOptionsCharges>
+                <CurrencyCode>USD</CurrencyCode>
+                <MonetaryValue>0.00</MonetaryValue>
+            </ServiceOptionsCharges>
+            <LabelImage>
+                <LabelImageFormat>
+                    <Code>GIF</Code>
+                </LabelImageFormat>
+                <GraphicImage>R0lGODdheAUgA</GraphicImage>
+                <HTMLImage>PCFET0NUWVBFI</HTMLImage>
+            </LabelImage>
+        </PackageResults>
+    </ShipmentResults>
+</ShipmentAcceptResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentConfirmResponse.xml b/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentConfirmResponse.xml
new file mode 100644
index 0000000000000..9bc57aa289d75
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Fixtures/ShipmentConfirmResponse.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ShipmentConfirmResponse>
+    <Response>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <ShipmentCharges>
+        <TransportationCharges>
+            <CurrencyCode>USD</CurrencyCode>
+            <MonetaryValue>193.22</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>USD</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>USD</CurrencyCode>
+            <MonetaryValue>193.22</MonetaryValue>
+        </TotalCharges>
+    </ShipmentCharges>
+    <NegotiatedRates>
+        <NetSummaryCharges>
+            <GrandTotal>
+                <CurrencyCode>USD</CurrencyCode>
+                <MonetaryValue>191.29</MonetaryValue>
+            </GrandTotal>
+        </NetSummaryCharges>
+    </NegotiatedRates>
+    <BillingWeight>
+        <UnitOfMeasurement>
+            <Code>LBS</Code>
+        </UnitOfMeasurement>
+        <Weight>4.0</Weight>
+    </BillingWeight>
+    <ShipmentIdentificationNumber>1Z207W886698856557</ShipmentIdentificationNumber>
+</ShipmentConfirmResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
new file mode 100644
index 0000000000000..28717cbe87a9c
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
@@ -0,0 +1,341 @@
+<?php
+/**
+ * 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;
+use Magento\Ups\Model\Carrier;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory as RateResultErrorFactory;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Xml\Security;
+use Magento\Shipping\Model\Simplexml\ElementFactory;
+use Magento\Shipping\Model\Rate\ResultFactory as RateResultFactory;
+use Magento\Quote\Model\Quote\Address\RateResult\MethodFactory;
+use Magento\Quote\Model\Quote\Address\RateResult\Method;
+use Magento\Shipping\Model\Rate\Result as RateResult;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Shipping\Model\Tracking\ResultFactory as TrackResultFactory;
+use Magento\Shipping\Model\Tracking\Result\ErrorFactory as TrackingResultErrorFactory;
+use Magento\Shipping\Model\Tracking\Result\StatusFactory;
+use Magento\Directory\Model\RegionFactory;
+use Magento\Directory\Model\Country;
+use Magento\Directory\Model\CountryFactory;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Helper\Data;
+use Magento\CatalogInventory\Model\StockRegistry;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\Ups\Helper\Config;
+use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Framework\HTTP\ClientFactory;
+use Magento\Framework\HTTP\ClientInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CarrierCollectRatesOptionsTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Quote\Model\Quote\Address\RateRequest;
+     */
+    private $rateRequest;
+
+    /**
+     * @var string;
+     */
+    private $allowed_methods;
+
+    /**
+     * @var int;
+     */
+    private $negotiatedactive;
+
+    /**
+     * @var int;
+     */
+    private $include_taxes;
+
+    /**
+     * @var ClientInterface|MockObject
+     */
+    private $httpClient;
+
+    /**
+     * set up test environment
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    protected function setUp()
+    {
+        
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        
+        $scopeMock = $this->getMockBuilder(ScopeConfigInterface::class)
+                    ->disableOriginalConstructor()
+                    ->getMock();
+
+        $scopeMock->expects($this->any())
+           ->method('getValue')
+           ->willReturnCallback([$this, 'scopeConfigGetValue']);
+        $scopeMock->expects($this->any())
+           ->method('isSetFlag')
+           ->willReturnCallback([$this, 'scopeConfigisSetFlag']);
+
+        $errorFactoryMock = $this->getMockBuilder(RateResultErrorFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $loggerInterfaceMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $securityMock = $this->getMockBuilder(Security::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $elementFactoryMock = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $rateResultMock = $this->getMockBuilder(RateResult::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getError'])
+            ->getMock();
+
+        $rateFactoryMock = $this->getMockBuilder(RateResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $rateFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($rateResultMock);
+
+        $httpClientFactory = $this->getMockBuilder(ClientFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->httpClient = $this->getMockForAbstractClass(ClientInterface::class);
+        $httpClientFactory->method('create')
+            ->willReturn($this->httpClient);
+
+        $priceInterfaceMock = $this->getMockBuilder(PriceCurrencyInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        
+        $rateMethodMock = $this->getMockBuilder(Method::class)
+            ->setConstructorArgs(['priceCurrency' => $priceInterfaceMock])
+            ->setMethods(null)
+            ->getMock();
+
+        $methodFactoryMock = $this->getMockBuilder(MethodFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $methodFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($rateMethodMock);
+
+        $resultFactoryMock = $this->getMockBuilder(TrackResultFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $trErrorFactoryMock = $this->getMockBuilder(TrackingResultErrorFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $statusFactoryMock = $this->getMockBuilder(StatusFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $regionFactoryMock = $this->getMockBuilder(RegionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $countryMock = $this->getMockBuilder(Country::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'getData'])
+            ->getMock();
+            
+        $countryMock->expects($this->any())
+            ->method('load')
+            ->willReturnSelf();
+            
+        $countryFactoryMock = $this->getMockBuilder(CountryFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+            
+        $countryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($countryMock);
+
+        $allowCurrencies = ['GBP'];
+        $baseCurrencies = ['GBP'];
+        $currencyRates = ['GBP' => ['GBP' => 1]];
+        $currencyFactoryMock = $this->getMockBuilder(CurrencyFactory::class)
+             ->disableOriginalConstructor()
+             ->setMethods(['create'])
+             ->getMock();
+        $currencyMock = $this->getMockBuilder(Currency::class)
+             ->disableOriginalConstructor()
+             ->setMethods(['getConfigAllowCurrencies', 'getConfigBaseCurrencies', 'getCurrencyRates'])
+             ->getMock();
+        $currencyFactoryMock->expects($this->once())
+             ->method('create')
+             ->willReturn($currencyMock);
+        $currencyMock->expects($this->any())
+             ->method('getConfigAllowCurrencies')
+             ->willReturn($allowCurrencies);
+        $currencyMock->expects($this->any())
+             ->method('getConfigBaseCurrencies')
+             ->willReturn($baseCurrencies);
+        $currencyMock->expects($this->any())
+             ->method('getCurrencyRates')
+             ->with($baseCurrencies, $allowCurrencies)
+             ->willReturn($currencyRates);
+
+        $dataMock = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stockRegistryMock = $this->getMockBuilder(StockRegistry::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+            
+        $formatInterfaceMock = $this->getMockBuilder(FormatInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $configHelperMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $this->getMockBuilder(Carrier::class)
+            ->setMethods(['_getCachedQuotes', 'canCollectRates', '_updateFreeMethodQuote', '_getBaseCurrencyRate'])
+            ->setConstructorArgs(
+                [
+                    'scopeConfig' => $scopeMock,
+                    'rateErrorFactory' => $errorFactoryMock,
+                    'logger' => $loggerInterfaceMock,
+                    'xmlSecurity' => $securityMock,
+                    'xmlElFactory' => $elementFactoryMock,
+                    'rateFactory' => $rateFactoryMock,
+                    'rateMethodFactory' => $methodFactoryMock,
+                    'trackFactory' => $resultFactoryMock,
+                    'trackErrorFactory' => $trErrorFactoryMock,
+                    'trackStatusFactory' => $statusFactoryMock,
+                    'regionFactory' => $regionFactoryMock,
+                    'countryFactory' => $countryFactoryMock,
+                    'currencyFactory' => $currencyFactoryMock,
+                    'directoryData' => $dataMock,
+                    'stockRegistry' => $stockRegistryMock,
+                    'localeFormat' => $formatInterfaceMock,
+                    'configHelper' => $configHelperMock,
+                    'httpClientFactory' => $httpClientFactory,
+                    'data' => [],
+                ]
+            )
+            ->getMock();
+        
+        $this->model->expects($this->any())
+             ->method('canCollectRates')
+             ->willReturn(true);
+             
+        $this->model->expects($this->any())
+             ->method('_getBaseCurrencyRate')
+             ->willReturn(1.00);
+
+        $this->rateRequest = $this->objectManager->getObject(RateRequest::class);
+    }
+
+    /**
+     * Callback function, emulates getValue function
+     * @param $path
+     * @return null|string
+     */
+    public function scopeConfigGetValue($path)
+    {
+        $pathMap = [
+            'carriers/ups/type' => 'UPS_XML',
+            'carriers/ups/shipper_number' => '12345',
+            'carriers/ups/allowed_methods' => $this->allowed_methods,
+        ];
+
+        return isset($pathMap[$path]) ? $pathMap[$path] : null;
+    }
+
+    /**
+     * Callback function, emulates isSetFlag function
+     * @param $path
+     * @return bool
+     */
+    public function scopeConfigisSetFlag($path)
+    {
+        $pathMap = [
+            'carriers/ups/negotiated_active' => $this->negotiatedactive,
+            'carriers/ups/include_taxes' => $this->include_taxes,
+        ];
+       
+        if (isset($pathMap[$path])) {
+            if ($pathMap[$path]) {
+                 return(true);
+            }
+        }
+        return(false);
+    }
+    
+    /**
+     * @param int $neg
+     * @param int $tax
+     * @param string $file
+     * @param string $method
+     * @param float $expectedprice
+     * @dataProvider collectRatesDataProvider
+     */
+    public function testCollectRates($neg, $tax, $file, $method, $expectedprice)
+    {
+        $this->negotiatedactive = $neg;
+        $this->include_taxes = $tax;
+        $this->allowed_methods = $method;
+
+        $response = file_get_contents(__DIR__ . $file);
+        $this->model->expects($this->any())
+             ->method('_getCachedQuotes')
+             ->willReturn($response);
+  
+        $rates = $this->model->collectRates($this->rateRequest)->getAllRates();
+        $this->assertEquals($expectedprice, $rates[0]->getData('cost'));
+        $this->assertEquals($method, $rates[0]->getData('method'));
+    }
+
+    /**
+     * Get list of rates variations
+     * @return array
+     */
+    public function collectRatesDataProvider()
+    {
+        return [
+            [0, 0, '/_files/ups_rates_response_option1.xml', '11', 6.45 ],
+            [0, 0, '/_files/ups_rates_response_option2.xml', '65', 29.59 ],
+            [0, 1, '/_files/ups_rates_response_option3.xml', '11', 7.74 ],
+            [0, 1, '/_files/ups_rates_response_option4.xml', '65', 29.59 ],
+            [1, 0, '/_files/ups_rates_response_option5.xml', '11', 9.35 ],
+            [1, 0, '/_files/ups_rates_response_option6.xml', '65', 41.61 ],
+            [1, 1, '/_files/ups_rates_response_option7.xml', '11', 11.22 ],
+            [1, 1, '/_files/ups_rates_response_option8.xml', '65', 41.61 ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
index 53a2dcfc60fcc..d98ce3f406e0c 100644
--- a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
@@ -5,10 +5,24 @@
  */
 namespace Magento\Ups\Test\Unit\Model;
 
+use Magento\Directory\Model\Country;
+use Magento\Directory\Model\CountryFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\HTTP\ClientFactory;
+use Magento\Framework\HTTP\ClientInterface;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory;
+use Magento\Shipping\Model\Rate\Result;
+use Magento\Shipping\Model\Rate\ResultFactory;
+use Magento\Shipping\Model\Simplexml\Element;
+use Magento\Shipping\Model\Simplexml\ElementFactory;
 use Magento\Ups\Model\Carrier;
-use Magento\Directory\Model\Country;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -22,125 +36,134 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     /**
      * Model under test
      *
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\Error|\PHPUnit_Framework_MockObject_MockObject
+     * @var Error|MockObject
      */
-    protected $error;
+    private $error;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
-    protected $helper;
+    private $helper;
 
     /**
      * Model under test
      *
-     * @var \Magento\Ups\Model\Carrier|\PHPUnit_Framework_MockObject_MockObject
+     * @var Carrier|MockObject
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ErrorFactory|MockObject
      */
-    protected $errorFactory;
+    private $errorFactory;
 
     /**
-     * @var \Magento\Ups\Model\Carrier|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
-    protected $carrier;
+    private $scope;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CountryFactory
      */
-    protected $scope;
+    private $countryFactory;
 
     /**
-     * @var \Magento\Directory\Model\CountryFactory
+     * @var Country|MockObject
      */
-    protected $countryFactory;
+    private $country;
 
     /**
-     * @var Country|MockObject
+     * @var AbstractModel
      */
-    protected $country;
+    private $abstractModel;
 
     /**
-     * @var \Magento\Framework\Model\AbstractModel
+     * @var Result
      */
-    protected $abstractModel;
+    private $rate;
 
     /**
-     * @var \Magento\Shipping\Model\Rate\Result
+     * @var ClientInterface|MockObject
      */
-    protected $rate;
+    private $httpClient;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
 
     protected function setUp()
     {
-        $this->helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->scope = $this->getMockBuilder(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->disableOriginalConstructor()->getMock();
-
-        $this->scope->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->will(
-            $this->returnCallback([$this, 'scopeConfiggetValue'])
-        );
+        $this->helper = new ObjectManager($this);
 
-        $this->error = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\RateResult\Error::class)
+        $this->scope = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+
+        $this->error = $this->getMockBuilder(Error::class)
             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
             ->getMock();
 
-        $this->errorFactory = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory::class)
+        $this->errorFactory = $this->getMockBuilder(ErrorFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->errorFactory->expects($this->any())->method('create')->willReturn($this->error);
+        $this->errorFactory->method('create')
+            ->willReturn($this->error);
 
-        $this->rate = $this->createPartialMock(\Magento\Shipping\Model\Rate\Result::class, ['getError']);
-        $rateFactory = $this->createPartialMock(\Magento\Shipping\Model\Rate\ResultFactory::class, ['create']);
+        $rateFactory = $this->getRateFactory();
 
-        $rateFactory->expects($this->any())->method('create')->willReturn($this->rate);
-
-        $this->country = $this->getMockBuilder(\Magento\Directory\Model\Country::class)
+        $this->country = $this->getMockBuilder(Country::class)
             ->disableOriginalConstructor()
             ->setMethods(['load', 'getData'])
             ->getMock();
 
-        $this->abstractModel = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
+        $this->abstractModel = $this->getMockBuilder(AbstractModel::class)
             ->disableOriginalConstructor()
             ->setMethods(['getData'])
             ->getMock();
 
-        $this->country->expects($this->any())->method('load')->willReturn($this->abstractModel);
+        $this->country->method('load')
+            ->willReturn($this->abstractModel);
 
-        $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
+        $this->countryFactory = $this->getMockBuilder(CountryFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->countryFactory->expects($this->any())->method('create')->willReturn($this->country);
+        $this->countryFactory->method('create')
+            ->willReturn($this->country);
+
+        $xmlFactory = $this->getXmlFactory();
+        $httpClientFactory = $this->getHttpClientFactory();
+
+        $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
 
         $this->model = $this->helper->getObject(
-            \Magento\Ups\Model\Carrier::class,
+            Carrier::class,
             [
                 'scopeConfig' => $this->scope,
                 'rateErrorFactory' => $this->errorFactory,
                 'countryFactory' => $this->countryFactory,
-                'rateFactory' => $rateFactory
+                'rateFactory' => $rateFactory,
+                'xmlElFactory' => $xmlFactory,
+                'logger' => $this->logger,
+                'httpClientFactory' => $httpClientFactory,
             ]
         );
     }
 
     /**
-     * Callback function, emulates getValue function
-     * @param $path
+     * Callback function, emulates getValue function.
+     *
+     * @param string $path
      * @return null|string
      */
-    public function scopeConfiggetValue($path)
+    public function scopeConfigGetValue(string $path)
     {
         $pathMap = [
             'carriers/ups/free_method' => 'free_method',
@@ -150,6 +173,10 @@ public function scopeConfiggetValue($path)
             'carriers/ups/specificerrmsg' => 'ups error message',
             'carriers/ups/min_package_weight' => 2,
             'carriers/ups/type' => 'UPS',
+            'carriers/ups/debug' => 1,
+            'carriers/ups/username' => 'user',
+            'carriers/ups/password' => 'pass',
+            'carriers/ups/access_license_number' => 'acn',
         ];
 
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
@@ -162,7 +189,6 @@ public function scopeConfiggetValue($path)
      * @param bool $freeShippingEnabled
      * @param int $requestSubtotal
      * @param int $expectedPrice
-     * @covers       \Magento\Shipping\Model\Carrier\AbstractCarrierOnline::getMethodPrice
      */
     public function testGetMethodPrice(
         $cost,
@@ -172,11 +198,11 @@ public function testGetMethodPrice(
         $expectedPrice
     ) {
         $path = 'carriers/' . $this->model->getCarrierCode() . '/';
-        $this->scope->expects($this->any())->method('isSetFlag')->with($path . 'free_shipping_enable')->will(
-            $this->returnValue($freeShippingEnabled)
-        );
+        $this->scope->method('isSetFlag')
+            ->with($path . 'free_shipping_enable')
+            ->willReturn($freeShippingEnabled);
 
-        $request = new \Magento\Quote\Model\Quote\Address\RateRequest();
+        $request = new RateRequest();
         $request->setBaseSubtotalInclTax($requestSubtotal);
         $this->model->setRawRequest($request);
         $price = $this->model->getMethodPrice($cost, $shippingMethod);
@@ -220,11 +246,13 @@ public function getMethodPriceProvider()
 
     public function testCollectRatesErrorMessage()
     {
-        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(false);
+        $this->scope->method('isSetFlag')
+            ->willReturn(false);
 
-        $this->error->expects($this->once())->method('setCarrier')->with('ups');
-        $this->error->expects($this->once())->method('setCarrierTitle');
-        $this->error->expects($this->once())->method('setErrorMessage');
+        $this->error->method('setCarrier')
+            ->with('ups');
+        $this->error->method('setCarrierTitle');
+        $this->error->method('setErrorMessage');
 
         $request = new RateRequest();
         $request->setPackageWeight(1);
@@ -234,7 +262,8 @@ public function testCollectRatesErrorMessage()
 
     public function testCollectRatesFail()
     {
-        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(true);
+        $this->scope->method('isSetFlag')
+            ->willReturn(true);
 
         $request = new RateRequest();
         $request->setPackageWeight(1);
@@ -260,7 +289,7 @@ public function testFilterDebugData($data, array $maskFields, $expected)
         $result = $refMethod->invoke($this->model, $data);
         $expectedXml = new \SimpleXMLElement($expected);
         $resultXml = new \SimpleXMLElement($result);
-        static::assertEquals($expectedXml->asXML(), $resultXml->asXML());
+        $this->assertEquals($expectedXml->asXML(), $resultXml->asXML());
     }
 
     /**
@@ -313,7 +342,6 @@ public function logDataProvider()
     }
 
     /**
-     * @covers \Magento\Ups\Model\Carrier::setRequest
      * @param string $countryCode
      * @param string $foundCountryCode
      * @dataProvider countryDataProvider
@@ -330,13 +358,12 @@ public function testSetRequest($countryCode, $foundCountryCode)
             'dest_country_id' => $countryCode,
         ]);
 
-        $this->country->expects(static::at(1))
+        $this->country->expects($this->at(1))
             ->method('load')
             ->with($countryCode)
             ->willReturnSelf();
 
-        $this->country->expects(static::any())
-            ->method('getData')
+        $this->country->method('getData')
             ->with('iso2_code')
             ->willReturn($foundCountryCode);
 
@@ -354,4 +381,118 @@ public function countryDataProvider()
             ['countryCode' => 'US', 'foundCountryCode' => 'US'],
         ];
     }
+
+    /**
+     * Checks a case when UPS processes request to create shipment.
+     *
+     * @return void
+     */
+    public function testRequestToShipment()
+    {
+        // the same tracking number is specified in the fixtures XML file.
+        $trackingNumber = '1Z207W886698856557';
+        $packages = $this->getPackages();
+        $request = new DataObject(['packages' => $packages]);
+        $shipmentResponse = simplexml_load_file(__DIR__ . '/../Fixtures/ShipmentConfirmResponse.xml');
+        $acceptResponse = simplexml_load_file(__DIR__ . '/../Fixtures/ShipmentAcceptResponse.xml');
+
+        $this->httpClient->method('getBody')
+            ->willReturnOnConsecutiveCalls($shipmentResponse->asXML(), $acceptResponse->asXML());
+
+        $this->logger->expects($this->atLeastOnce())
+            ->method('debug')
+            ->with($this->stringContains('<UserId>****</UserId>'));
+
+        $result = $this->model->requestToShipment($request);
+        $this->assertEmpty($result->getErrors());
+
+        $info = $result->getInfo()[0];
+        $this->assertEquals($trackingNumber, $info['tracking_number'], 'Tracking Number must match.');
+    }
+
+    /**
+     * Creates mock for XML factory.
+     *
+     * @return ElementFactory|MockObject
+     */
+    private function getXmlFactory(): MockObject
+    {
+        $xmlElFactory = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $xmlElFactory->method('create')
+            ->willReturnCallback(
+                function ($data) {
+                    $helper = new ObjectManager($this);
+
+                    return $helper->getObject(
+                        Element::class,
+                        ['data' => $data['data']]
+                    );
+                }
+            );
+
+        return $xmlElFactory;
+    }
+
+    /**
+     * @return array
+     */
+    private function getPackages(): array
+    {
+        $packages = [
+            'package' => [
+                'params' => [
+                    'width' => '3',
+                    'length' => '3',
+                    'height' => '3',
+                    'dimension_units' => 'INCH',
+                    'weight_units' => 'POUND',
+                    'weight' => '0.454000000001',
+                    'customs_value' => '10.00',
+                    'container' => 'Small Express Box',
+                ],
+                'items' => [
+                    'item1' => [
+                        'name' => 'item_name',
+                    ],
+                ],
+            ],
+        ];
+
+        return $packages;
+    }
+
+    /**
+     * Creates mocks for http client factory and client.
+     *
+     * @return ClientFactory|MockObject
+     */
+    private function getHttpClientFactory(): MockObject
+    {
+        $httpClientFactory = $this->getMockBuilder(ClientFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->httpClient = $this->getMockForAbstractClass(ClientInterface::class);
+        $httpClientFactory->method('create')
+            ->willReturn($this->httpClient);
+
+        return $httpClientFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getRateFactory(): MockObject
+    {
+        $this->rate = $this->createPartialMock(Result::class, ['getError']);
+        $rateFactory = $this->createPartialMock(ResultFactory::class, ['create']);
+
+        $rateFactory->method('create')
+            ->willReturn($this->rate);
+
+        return $rateFactory;
+    }
 }
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option1.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option1.xml
new file mode 100644
index 0000000000000..658bf756aacfb
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option1.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Service>
+            <Code>11</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option2.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option2.xml
new file mode 100644
index 0000000000000..88fe2de81a3de
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option2.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Service>
+            <Code>07</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>08</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option3.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option3.xml
new file mode 100644
index 0000000000000..1732594c57ea6
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option3.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>01</Code>
+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
+                but additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>11</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TaxCharges>
+            <Type>VAT</Type>
+            <MonetaryValue>1.29</MonetaryValue>
+        </TaxCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TotalCharges>
+        <TotalChargesWithTaxes>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>7.74</MonetaryValue>
+        </TotalChargesWithTaxes>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>01</Code>
+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
+                but additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TaxCharges>
+            <Type>VAT</Type>
+            <MonetaryValue>2.05</MonetaryValue>
+        </TaxCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TotalCharges>
+        <TotalChargesWithTaxes>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>12.30</MonetaryValue>
+        </TotalChargesWithTaxes>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>01</Code>
+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
+                but additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TaxCharges>
+            <Type>VAT</Type>
+            <MonetaryValue>3.00</MonetaryValue>
+        </TaxCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TotalCharges>
+        <TotalChargesWithTaxes>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>18.02</MonetaryValue>
+        </TotalChargesWithTaxes>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option4.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option4.xml
new file mode 100644
index 0000000000000..8de6b45982767
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option4.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>07</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>08</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option5.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option5.xml
new file mode 100644
index 0000000000000..7b8b3a906781f
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option5.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Service>
+            <Code>11</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>9.35</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>13.33</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>74.83</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option6.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option6.xml
new file mode 100644
index 0000000000000..97a19e5086d7a
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option6.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Service>
+            <Code>07</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>44.37</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>08</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>60.57</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>41.61</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>157.47</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option7.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option7.xml
new file mode 100644
index 0000000000000..e84e3aa7aefb0
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option7.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>01</Code>
+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
+                but additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>11</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>6.45</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <TaxCharges>
+                <Type>VAT</Type>
+                <MonetaryValue>1.87</MonetaryValue>
+            </TaxCharges>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>9.35</MonetaryValue>
+                </GrandTotal>
+                <TotalChargesWithTaxes>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>11.22</MonetaryValue>
+                </TotalChargesWithTaxes>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>01</Code>
+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
+                but additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>10.25</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>12:00 Noon</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <TaxCharges>
+                <Type>VAT</Type>
+                <MonetaryValue>2.66</MonetaryValue>
+            </TaxCharges>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>13.33</MonetaryValue>
+                </GrandTotal>
+                <TotalChargesWithTaxes>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>15.99</MonetaryValue>
+                </TotalChargesWithTaxes>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>01</Code>
+            <Description>Taxes are included in the shipping cost and apply to the transportation charges
+                but additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>15.02</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>9:00 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <TaxCharges>
+                <Type>VAT</Type>
+                <MonetaryValue>14.97</MonetaryValue>
+            </TaxCharges>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>74.83</MonetaryValue>
+                </GrandTotal>
+                <TotalChargesWithTaxes>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>89.80</MonetaryValue>
+                </TotalChargesWithTaxes>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option8.xml b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option8.xml
new file mode 100644
index 0000000000000..b5711f9f12bfa
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/_files/ups_rates_response_option8.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RatingServiceSelectionResponse>
+    <Response>
+        <TransactionReference>
+            <CustomerContext>Rating and Service</CustomerContext>
+            <XpciVersion>1.0</XpciVersion>
+        </TransactionReference>
+        <ResponseStatusCode>1</ResponseStatusCode>
+        <ResponseStatusDescription>Success</ResponseStatusDescription>
+    </Response>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>07</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>35.16</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>10:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>44.37</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>08</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>34.15</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery/>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>60.57</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>65</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>29.59</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime/>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>41.61</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+    <RatedShipment>
+        <Disclaimer>
+            <Code>03</Code>
+            <Description>Additional duties/taxes may apply and are not reflected in the total amount
+                due.
+            </Description>
+        </Disclaimer>
+        <Service>
+            <Code>54</Code>
+        </Service>
+        <RatedShipmentWarning>Your invoice may vary from the displayed reference
+            rates
+        </RatedShipmentWarning>
+        <BillingWeight>
+            <UnitOfMeasurement>
+                <Code>KGS</Code>
+            </UnitOfMeasurement>
+            <Weight>2.0</Weight>
+        </BillingWeight>
+        <TransportationCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TransportationCharges>
+        <ServiceOptionsCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>0.00</MonetaryValue>
+        </ServiceOptionsCharges>
+        <TotalCharges>
+            <CurrencyCode>GBP</CurrencyCode>
+            <MonetaryValue>45.18</MonetaryValue>
+        </TotalCharges>
+        <GuaranteedDaysToDelivery>1</GuaranteedDaysToDelivery>
+        <ScheduledDeliveryTime>8:30 A.M.</ScheduledDeliveryTime>
+        <RatedPackage>
+            <TransportationCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TransportationCharges>
+            <ServiceOptionsCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </ServiceOptionsCharges>
+            <TotalCharges>
+                <CurrencyCode/>
+                <MonetaryValue/>
+            </TotalCharges>
+            <Weight>2.0</Weight>
+            <BillingWeight>
+                <UnitOfMeasurement>
+                    <Code/>
+                </UnitOfMeasurement>
+                <Weight/>
+            </BillingWeight>
+        </RatedPackage>
+        <NegotiatedRates>
+            <NetSummaryCharges>
+                <GrandTotal>
+                    <CurrencyCode>GBP</CurrencyCode>
+                    <MonetaryValue>157.47</MonetaryValue>
+                </GrandTotal>
+            </NetSummaryCharges>
+        </NegotiatedRates>
+    </RatedShipment>
+</RatingServiceSelectionResponse>
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index 06b729c961c5a..902ee4311867e 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -5,21 +5,20 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "100.3.*"
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml
index 255039e6499cc..f427c5960123f 100644
--- a/app/code/Magento/Ups/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ups/etc/adminhtml/system.xml
@@ -106,7 +106,7 @@
                     <label>Live Account</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="unit_of_measure" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="unit_of_measure" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Weight Unit</label>
                     <source_model>Magento\Ups\Model\Config\Source\Unitofmeasure</source_model>
                 </field>
@@ -118,6 +118,11 @@
                     <label>Enable Negotiated Rates</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="include_taxes" translate="label" type="select" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Request Tax-Inclusive Rate</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>When applicable, taxes (sales tax, VAT etc.) are included in the rate</comment>
+                </field>
                 <field id="shipper_number" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Shipper Number</label>
                     <comment>Required for negotiated rates; 6-character UPS</comment>
diff --git a/app/code/Magento/Ups/etc/config.xml b/app/code/Magento/Ups/etc/config.xml
index 7dd47b6bf673b..e2ac1c6d6c443 100644
--- a/app/code/Magento/Ups/etc/config.xml
+++ b/app/code/Magento/Ups/etc/config.xml
@@ -25,7 +25,7 @@
                 <model>Magento\Ups\Model\Carrier</model>
                 <pickup>CC</pickup>
                 <title>United Parcel Service</title>
-                <tracking_xml_url>https://www.ups.com/ups.app/xml/Track</tracking_xml_url>
+                <tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
                 <unit_of_measure>LBS</unit_of_measure>
                 <username backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
@@ -35,6 +35,7 @@
                 <handling_type>F</handling_type>
                 <handling_action>O</handling_action>
                 <negotiated_active>0</negotiated_active>
+                <include_taxes>0</include_taxes>
                 <mode_xml>1</mode_xml>
                 <type>UPS</type>
                 <is_account_live>0</is_account_live>
diff --git a/app/code/Magento/Ups/etc/module.xml b/app/code/Magento/Ups/etc/module.xml
index b0500b9aa4f90..cc4599627ffb9 100644
--- a/app/code/Magento/Ups/etc/module.xml
+++ b/app/code/Magento/Ups/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Ups" setup_version="2.0.0">
+    <module name="Magento_Ups" >
     </module>
 </config>
diff --git a/app/code/Magento/Ups/i18n/en_US.csv b/app/code/Magento/Ups/i18n/en_US.csv
index 0412a993b00ef..baf8ecc855440 100644
--- a/app/code/Magento/Ups/i18n/en_US.csv
+++ b/app/code/Magento/Ups/i18n/en_US.csv
@@ -103,6 +103,8 @@ Title,Title
 "Weight Unit","Weight Unit"
 "User ID","User ID"
 "Enable Negotiated Rates","Enable Negotiated Rates"
+"Request Tax-Inclusive Rate","Request Tax-Inclusive Rate"
+"When applicable, taxes (sales tax, VAT etc.) are included in the rate","When applicable, taxes (sales tax, VAT etc.) are included in the rate"
 "Shipper Number","Shipper Number"
 "Required for negotiated rates; 6-character UPS","Required for negotiated rates; 6-character UPS"
 "Ship to Applicable Countries","Ship to Applicable Countries"
diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
index 388727f1e0d65..411bec20cde57 100644
--- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -81,7 +81,7 @@ require(["prototype"], function(){
             this.onlyUpsXmlElements = ['carriers_ups_gateway_xml_url','carriers_ups_tracking_xml_url',
                 'carriers_ups_username','carriers_ups_password','carriers_ups_access_license_number',
                 'carriers_ups_origin_shipment','carriers_ups_negotiated_active','carriers_ups_shipper_number',
-                'carriers_ups_mode_xml'];
+                'carriers_ups_mode_xml','carriers_ups_include_taxes'];
             this.onlyUpsElements = ['carriers_ups_gateway_url'];
 
             this.storedOriginShipment = '<?= /* @noEscape */ $storedOriginShipment ?>';
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
index 5c1d6708d244d..e34d4773c271b 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\UrlRewrite\Block\Catalog\Category;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
@@ -26,7 +27,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
     /**
      * @var string
      */
-    protected $_template = 'categories.phtml';
+    protected $_template = 'Magento_UrlRewrite::categories.phtml';
 
     /**
      * Adminhtml data
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
index fa06a47bb56ff..ca3756a356a85 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
@@ -55,7 +55,7 @@ protected function _prepareLayoutFeatures()
         }
 
         if ($this->_getProduct()->getId()) {
-            $this->_addProductLinkBlock($this->_getProduct());
+            $this->_addProductLinkBlock();
         }
 
         if ($this->_getCategory()->getId()) {
diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php
index baee8af893083..c8716f6c80f70 100644
--- a/app/code/Magento/UrlRewrite/Block/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Edit.php
@@ -65,7 +65,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('edit.phtml');
+        $this->setTemplate('Magento_UrlRewrite::edit.phtml');
 
         $this->_addBackButton();
         $this->_prepareLayoutFeatures();
@@ -173,7 +173,7 @@ protected function _addDeleteButton()
                             ['id' => $this->getUrlRewrite()->getId()]
                         )
                     )
-                    . ')',
+                    . ', {data: {}})',
                 'class' => 'scalable delete',
                 'level' => -1
             ]
@@ -243,7 +243,7 @@ private function _getSelectorBlock()
      * Since buttons are set as children, we remove them as children after generating them
      * not to duplicate them in future
      *
-     * @param null $area
+     * @param string|null $area
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
diff --git a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php b/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
deleted file mode 100644
index 9bdff38e7aaa2..0000000000000
--- a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\UrlRewrite\Block\Plugin\Store\Switcher;
-
-use Magento\Framework\Url\Helper\Data as UrlHelper;
-use Magento\Framework\UrlInterface;
-use Magento\UrlRewrite\Model\UrlFinderInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\App\ActionInterface;
-
-class SetRedirectUrl
-{
-    /**
-     * @var \Magento\Framework\Url\Helper\Data
-     */
-    private $urlHelper;
-
-    /**
-     * @var \Magento\Framework\UrlInterface
-     */
-    private $urlBuilder;
-
-    /**
-     * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     */
-    private $urlFinder;
-
-    /**
-     * @var \Magento\Framework\App\RequestInterface
-     */
-    private $request;
-
-    /**
-     * @param UrlHelper $urlHelper
-     * @param UrlInterface $urlBuilder
-     * @param UrlFinderInterface $urlFinder
-     * @param RequestInterface $request
-     */
-    public function __construct(
-        UrlHelper $urlHelper,
-        UrlInterface $urlBuilder,
-        UrlFinderInterface $urlFinder,
-        RequestInterface $request
-    ) {
-        $this->urlHelper = $urlHelper;
-        $this->urlBuilder = $urlBuilder;
-        $this->urlFinder = $urlFinder;
-        $this->request = $request;
-    }
-
-    /**
-     * Set redirect url for store view based on request path info
-     *
-     * @param \Magento\Store\Block\Switcher $switcher
-     * @param \Magento\Store\Model\Store $store
-     * @param array $data
-     * @return array
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeGetTargetStorePostData(
-        \Magento\Store\Block\Switcher $switcher,
-        \Magento\Store\Model\Store $store,
-        $data = []
-    ) {
-        $urlRewrite = $this->urlFinder->findOneByData([
-            UrlRewrite::TARGET_PATH => $this->trimSlashInPath($this->request->getPathInfo()),
-            UrlRewrite::STORE_ID => $store->getId(),
-        ]);
-        if ($urlRewrite) {
-            $data[ActionInterface::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl(
-                $this->trimSlashInPath($this->urlBuilder->getUrl($urlRewrite->getRequestPath(), ['_scope' => $store]))
-            );
-        }
-        return [$store, $data];
-    }
-
-    /**
-     * @param string $path
-     * @return string
-     */
-    private function trimSlashInPath($path)
-    {
-        return trim($path, '/');
-    }
-}
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 0a28ba215de5a..75266fd2f977c 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'selector.phtml';
+    protected $_template = 'Magento_UrlRewrite::selector.phtml';
 
     /**
      * Set block template and get available modes
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
index 480efa8235716..7240dfc36f1e1 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
-class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite as RewriteAction;
+
+class CmsPageGrid extends RewriteAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Ajax CMS pages grid action
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
index f8f7b145e2806..dc49776a1ac00 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
-class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface
 {
     /**
      * URL rewrite delete action
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
index b7ff92213003c..e2161f4ffd9bb 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
-class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface
 {
     /**#@+
      * Modes
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
index 066377ff7bd75..4f3a1e7849ec0 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
-class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface
 {
     /**
      * Show URL rewrites index page
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
index 27b2d5088a1c3..c508e85d87c3b 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php
@@ -4,13 +4,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
-class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
+class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface
 {
     /**
      * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator
@@ -96,8 +98,8 @@ protected function getTargetPath($model)
             $rewrite = $this->urlFinder->findOneByData($data);
             if (!$rewrite) {
                 $message = $model->getEntityType() === self::ENTITY_TYPE_PRODUCT
-                    ? __('The product you chose is not associated with the selected store or category.')
-                    : __('The category you chose is not associated with the selected store.');
+                    ? __("The selected product isn't associated with the selected store or category.")
+                    : __("The selected category isn't associated with the selected store.");
                 throw new LocalizedException($message);
             }
             $targetPath = $rewrite->getRequestPath();
@@ -174,7 +176,10 @@ public function execute()
                 $this->messageManager->addError($e->getMessage());
                 $session->setUrlRewriteData($data);
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while saving URL Rewrite.'));
+                $this->messageManager->addException(
+                    $e,
+                    __('An error occurred while saving the URL rewrite. Please try to save again.')
+                );
                 $session->setUrlRewriteData($data);
             }
         }
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 66ba3d9bbabe1..ce432f24365a6 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -5,10 +5,15 @@
  */
 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 +28,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     protected $actionFactory;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $url;
 
@@ -33,7 +38,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     protected $storeManager;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface
+     * @var HttpResponse
      */
     protected $response;
 
@@ -44,14 +49,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 +69,45 @@ 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')) {
-            $oldStoreId = $this->storeManager->getStore($fromStore)->getId();
-            $oldRewrite = $this->getRewrite($request->getPathInfo(), $oldStoreId);
-            if ($oldRewrite) {
-                $rewrite = $this->urlFinder->findOneByData(
-                    [
-                        UrlRewrite::ENTITY_TYPE => $oldRewrite->getEntityType(),
-                        UrlRewrite::ENTITY_ID => $oldRewrite->getEntityId(),
-                        UrlRewrite::STORE_ID => $this->storeManager->getStore()->getId(),
-                        UrlRewrite::IS_AUTOGENERATED => 1,
-                    ]
-                );
-                if ($rewrite && $rewrite->getRequestPath() !== $oldRewrite->getRequestPath()) {
-                    return $this->redirect($request, $rewrite->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 +121,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/Model/Exception/UrlAlreadyExistsException.php b/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
index c7e83819f2569..906ba1f625477 100644
--- a/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
+++ b/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
@@ -8,10 +8,12 @@
 use Magento\Framework\Phrase;
 
 /**
+ * Exception for already created url.
+ *
  * @api
  * @since 100.2.0
  */
-class UrlAlreadyExistsException extends \Magento\Framework\Exception\LocalizedException
+class UrlAlreadyExistsException extends \Magento\Framework\Exception\AlreadyExistsException
 {
     /**
      * @var array
@@ -34,6 +36,8 @@ public function __construct(Phrase $phrase = null, \Exception $cause = null, $co
     }
 
     /**
+     * Get URLs
+     *
      * @return array
      * @since 100.2.0
      */
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index 376b07a17fe6a..f4aa61b145f62 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -3,16 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\UrlRewrite\Model\Storage;
 
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
 use Psr\Log\LoggerInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteData;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
+/**
+ * Url rewrites DB storage.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DbStorage extends AbstractStorage
 {
     /**
@@ -26,7 +34,7 @@ class DbStorage extends AbstractStorage
     const ERROR_CODE_DUPLICATE_ENTRY = 1062;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $connection;
 
@@ -36,15 +44,15 @@ class DbStorage extends AbstractStorage
     protected $resource;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
     /**
-     * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory
+     * @param UrlRewriteFactory $urlRewriteFactory
      * @param DataObjectHelper $dataObjectHelper
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Psr\Log\LoggerInterface|null $logger
+     * @param ResourceConnection $resource
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
@@ -54,8 +62,8 @@ public function __construct(
     ) {
         $this->connection = $resource->getConnection();
         $this->resource = $resource;
-        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Psr\Log\LoggerInterface::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
 
         parent::__construct($urlRewriteFactory, $dataObjectHelper);
     }
@@ -64,7 +72,7 @@ public function __construct(
      * Prepare select statement for specific filter
      *
      * @param array $data
-     * @return \Magento\Framework\DB\Select
+     * @return Select
      */
     protected function prepareSelect(array $data)
     {
@@ -74,6 +82,7 @@ protected function prepareSelect(array $data)
         foreach ($data as $column => $value) {
             $select->where($this->connection->quoteIdentifier($column) . ' IN (?)', $value);
         }
+
         return $select;
     }
 
@@ -141,14 +150,61 @@ protected function doFindOneByData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * Delete old URLs from DB.
+     *
+     * @param UrlRewrite[] $urls
+     * @return void
      */
-    protected function doReplace(array $urls)
+    private function deleteOldUrls(array $urls): void
     {
-        foreach ($this->createFilterDataBasedOnUrls($urls) as $type => $urlData) {
-            $urlData[UrlRewrite::ENTITY_TYPE] = $type;
-            $this->deleteByData($urlData);
+        $oldUrlsSelect = $this->connection->select();
+        $oldUrlsSelect->from(
+            $this->resource->getTableName(self::TABLE_NAME)
+        );
+        /** @var UrlRewrite $url */
+        foreach ($urls as $url) {
+            $oldUrlsSelect->orWhere(
+                $this->connection->quoteIdentifier(
+                    UrlRewrite::ENTITY_TYPE
+                ) . ' = ?',
+                $url->getEntityType()
+            );
+            $oldUrlsSelect->where(
+                $this->connection->quoteIdentifier(
+                    UrlRewrite::ENTITY_ID
+                ) . ' = ?',
+                $url->getEntityId()
+            );
+            $oldUrlsSelect->where(
+                $this->connection->quoteIdentifier(
+                    UrlRewrite::STORE_ID
+                ) . ' = ?',
+                $url->getStoreId()
+            );
         }
+
+        // prevent query locking in a case when nothing to delete
+        $checkOldUrlsSelect = clone $oldUrlsSelect;
+        $checkOldUrlsSelect->reset(Select::COLUMNS);
+        $checkOldUrlsSelect->columns('count(*)');
+        $hasOldUrls = (bool)$this->connection->fetchOne($checkOldUrlsSelect);
+
+        if ($hasOldUrls) {
+            $this->connection->query(
+                $oldUrlsSelect->deleteFromSelect(
+                    $this->resource->getTableName(self::TABLE_NAME)
+                )
+            );
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function doReplace(array $urls)
+    {
+        $this->deleteOldUrls($urls);
+
         $data = [];
         foreach ($urls as $url) {
             $data[] = $url->toArray();
@@ -161,12 +217,12 @@ protected function doReplace(array $urls)
             foreach ($urls as $url) {
                 $urlFound = $this->doFindOneByData(
                     [
-                        UrlRewriteData::REQUEST_PATH => $url->getRequestPath(),
-                        UrlRewriteData::STORE_ID => $url->getStoreId()
+                        UrlRewrite::REQUEST_PATH => $url->getRequestPath(),
+                        UrlRewrite::STORE_ID => $url->getStoreId(),
                     ]
                 );
-                if (isset($urlFound[UrlRewriteData::URL_REWRITE_ID])) {
-                    $urlConflicted[$urlFound[UrlRewriteData::URL_REWRITE_ID]] = $url->toArray();
+                if (isset($urlFound[UrlRewrite::URL_REWRITE_ID])) {
+                    $urlConflicted[$urlFound[UrlRewrite::URL_REWRITE_ID]] = $url->toArray();
                 }
             }
             if ($urlConflicted) {
@@ -214,6 +270,7 @@ protected function insertMultiple($data)
      *
      * @param UrlRewrite[] $urls
      * @return array
+     * @deprecated Not used anymore.
      */
     protected function createFilterDataBasedOnUrls($urls)
     {
@@ -227,6 +284,7 @@ protected function createFilterDataBasedOnUrls($urls)
                 }
             }
         }
+
         return $data;
     }
 
diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
new file mode 100644
index 0000000000000..2ce00d53588b3
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewrite\Model\StoreSwitcher;
+
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreSwitcherInterface;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * Handle url rewrites for redirect url
+ */
+class RewriteUrl implements StoreSwitcherInterface
+{
+    /**
+     * @var UrlFinderInterface
+     */
+    private $urlFinder;
+
+    /**
+     * @var \Magento\Framework\HTTP\PhpEnvironment\RequestFactory
+     */
+    private $requestFactory;
+
+    /**
+     * @param UrlFinderInterface $urlFinder
+     * @param \Magento\Framework\HTTP\PhpEnvironment\RequestFactory $requestFactory
+     */
+    public function __construct(
+        UrlFinderInterface $urlFinder,
+        \Magento\Framework\HTTP\PhpEnvironment\RequestFactory $requestFactory
+    ) {
+        $this->urlFinder = $urlFinder;
+        $this->requestFactory = $requestFactory;
+    }
+
+    /**
+     * @param StoreInterface $fromStore
+     * @param StoreInterface $targetStore
+     * @param string $redirectUrl
+     * @return string
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
+    {
+        $targetUrl = $redirectUrl;
+        /** @var \Magento\Framework\HTTP\PhpEnvironment\Request $request */
+        $request = $this->requestFactory->create(['uri' => $targetUrl]);
+
+        $urlPath = ltrim($request->getPathInfo(), '/');
+
+        if ($targetStore->isUseStoreInUrl()) {
+            // Remove store code in redirect url for correct rewrite search
+            $storeCode = preg_quote($targetStore->getCode() . '/', '/');
+            $pattern = "@^($storeCode)@";
+            $urlPath = preg_replace($pattern, '', $urlPath);
+        }
+
+        $oldStoreId = $fromStore->getId();
+        $oldRewrite = $this->urlFinder->findOneByData([
+            UrlRewrite::REQUEST_PATH => $urlPath,
+            UrlRewrite::STORE_ID => $oldStoreId,
+        ]);
+        if ($oldRewrite) {
+            // look for url rewrite match on the target store
+            $currentRewrite = $this->urlFinder->findOneByData([
+                UrlRewrite::REQUEST_PATH => $urlPath,
+                UrlRewrite::STORE_ID => $targetStore->getId(),
+            ]);
+            if (null === $currentRewrite) {
+                /** @var \Magento\Framework\App\Response\Http $response */
+                $targetUrl = $targetStore->getBaseUrl();
+            }
+        }
+
+        return $targetUrl;
+    }
+}
diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
index 195c0fc10dc07..38025f21cdab1 100644
--- a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
+++ b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
@@ -79,7 +79,7 @@ public function getUrlRewriteId()
 
     /**
      * @param int $urlRewriteId
-     * @return int
+     * @return $this
      */
     public function setUrlRewriteId($urlRewriteId)
     {
diff --git a/app/code/Magento/UrlRewrite/Setup/InstallSchema.php b/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
deleted file mode 100644
index a7b9ee22d14cd..0000000000000
--- a/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\UrlRewrite\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'url_rewrite'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('url_rewrite'))
-            ->addColumn(
-                'url_rewrite_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Rewrite Id'
-            )
-            ->addColumn(
-                'entity_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                32,
-                ['nullable' => false],
-                'Entity type code'
-            )
-            ->addColumn(
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Entity ID'
-            )
-            ->addColumn(
-                'request_path',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Request Path'
-            )
-            ->addColumn(
-                'target_path',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Target Path'
-            )
-            ->addColumn(
-                'redirect_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Redirect Type'
-            )
-            ->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false],
-                'Store Id'
-            )
-            ->addColumn(
-                'description',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Description'
-            )
-            ->addColumn(
-                'is_autogenerated',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Is rewrite generated automatically flag'
-            )
-            ->addColumn(
-                'metadata',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Meta data for url rewrite'
-            )
-            ->addIndex(
-                $installer->getIdxName(
-                    'url_rewrite',
-                    ['request_path', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['request_path', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-            ->addIndex(
-                $installer->getIdxName('url_rewrite', ['target_path']),
-                ['target_path']
-            )
-            ->addIndex(
-                $installer->getIdxName('url_rewrite', ['store_id', 'entity_id']),
-                ['store_id', 'entity_id']
-            )
-            ->setComment('Url Rewrites');
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php
new file mode 100644
index 0000000000000..badd645b85f7d
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\UrlRewrite\Setup\Patch\Data;
+
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedDataToJson
+ * @package Magento\UrlRewrite\Setup\Patch
+ */
+class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * ConvertSerializedDataToJson constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        FieldDataConverterFactory $fieldDataConverterFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->convertSerializedDataToJson();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert native php serialized data to json.
+     */
+    private function convertSerializedDataToJson()
+    {
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('url_rewrite'),
+            'url_rewrite_id',
+            'metadata'
+        );
+    }
+}
diff --git a/app/code/Magento/UrlRewrite/Setup/UpgradeData.php b/app/code/Magento/UrlRewrite/Setup/UpgradeData.php
deleted file mode 100644
index 7b9bc2020e60c..0000000000000
--- a/app/code/Magento/UrlRewrite/Setup/UpgradeData.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\UrlRewrite\Setup;
-
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * Constructor
-     *
-     * @param FieldDataConverterFactory $fieldDataConverterFactory
-     */
-    public function __construct(
-        FieldDataConverterFactory $fieldDataConverterFactory
-    ) {
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->convertSerializedDataToJson($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Convert metadata from serialized to JSON format:
-     *
-     * @param ModuleDataSetupInterface $setup
-     *
-     * @return void
-     */
-    public function convertSerializedDataToJson($setup)
-    {
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('url_rewrite'),
-            'url_rewrite_id',
-            'metadata'
-        );
-    }
-}
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/LICENSE.txt b/app/code/Magento/UrlRewrite/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/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/UrlRewrite/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/UrlRewrite/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/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/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteIndexPage.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteIndexPage.xml
new file mode 100644
index 0000000000000..c7c450a00a0c3
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteIndexPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminUrlRewriteIndexPage" url="admin/url_rewrite/index/" area="admin" module="Magento_UrlRewrite">
+        <section name="AdminUrlRewriteIndexSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/README.md b/app/code/Magento/UrlRewrite/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1d7cfbb915afa
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Url Rewrite Functional Tests
+
+The Functional Test Module for **Magento Url Rewrite** module.
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
new file mode 100644
index 0000000000000..0880b50950e15
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminUrlRewriteIndexSection">
+        <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
+        <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
new file mode 100644
index 0000000000000..0d9df9176d2b5
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUrlRewritesForProductInAnchorCategoriesTest">
+        <annotations>
+            <features value="Url Rewrite"/>
+            <stories value="Url-rewrites for product in anchor categories"/>
+            <title value="Url-rewrites for product in anchor categories"/>
+            <description value="For a product with category that has parent anchor categories, the rewrites is created when the category/product is saved."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-69826"/>
+            <group value="urlRewrite"/>
+        </annotations>
+
+        <!-- Preconditions-->
+        <!-- Create 3 categories -->
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="simpleSubCategory1"/>
+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory2">
+                <requiredEntity createDataKey="simpleSubCategory1"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory3">
+                <requiredEntity createDataKey="simpleSubCategory2"/>
+            </createData>
+        <!-- Create Simple product 1 and assign it to Category 3 -->
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="simpleSubCategory3"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="simpleSubCategory1" stepKey="deletesimpleSubCategory1"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Steps -->
+        <!-- 1. Log in to Admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- 2. Open Marketing - SEO & Search - URL Rewrites -->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue1"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue3"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeValue4"/>
+
+        <!-- 3. Edit Category 1 for DEFAULT Store View: -->
+        <actionGroup ref="switchCategoryStoreView" stepKey="switchStoreView">
+            <argument name="Store" value="_defaultStore.name"/>
+            <argument name="CatName" value="$$simpleSubCategory1.name$$"/>
+        </actionGroup>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection2"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}"  stepKey="uncheckRedirect2"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="$simpleSubCategory1.custom_attributes[url_key]$-new" stepKey="changeURLKey"/>
+        <checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="checkUrlKeyRedirect"/>
+        <!-- 4. Save Category 1 -->
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaved"/>
+
+        <!-- 5. Open Marketing - SEO & Search - URL Rewrites -->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage2"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName2"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue1"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue3"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue4"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue5"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue6"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue($simpleSubCategory1.custom_attributes[url_key]$-new/$simpleSubCategory2.custom_attributes[url_key]$/$simpleSubCategory3.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeInListValue7"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Block/Plugin/Store/Switcher/SetRedirectUrlTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Block/Plugin/Store/Switcher/SetRedirectUrlTest.php
deleted file mode 100644
index 46bf90493004d..0000000000000
--- a/app/code/Magento/UrlRewrite/Test/Unit/Block/Plugin/Store/Switcher/SetRedirectUrlTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\UrlRewrite\Test\Unit\Block\Plugin\Store\Switcher;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
-class SetRedirectUrlTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\UrlRewrite\Block\Plugin\Store\Switcher\SetRedirectUrl */
-    protected $unit;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $urlFinder;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $urlHelper;
-
-    /** @var \Magento\Store\Block\Switcher|\PHPUnit_Framework_MockObject_MockObject */
-    protected $switcher;
-
-    /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
-    protected $store;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlBuilder;
-
-    protected function setUp()
-    {
-        $this->store = $this->createMock(\Magento\Store\Model\Store::class);
-        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->urlHelper = $this->createMock(\Magento\Framework\Url\Helper\Data::class);
-        $this->urlFinder = $this->createMock(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
-        $this->switcher = $this->createMock(\Magento\Store\Block\Switcher::class);
-
-        $this->unit = (new ObjectManager($this))->getObject(
-            \Magento\UrlRewrite\Block\Plugin\Store\Switcher\SetRedirectUrl::class,
-            [
-                'urlFinder' => $this->urlFinder,
-                'urlHelper' => $this->urlHelper,
-                'urlBuilder' => $this->urlBuilder,
-                'request' => $this->request,
-            ]
-        );
-    }
-
-    public function testNoUrlRewriteForSpecificStoreOnGetTargetStorePostData()
-    {
-        $this->request->expects($this->once())->method('getPathInfo')->willReturn('path');
-        $this->urlFinder->expects($this->once())->method('findOneByData')->willReturn(null);
-        $this->urlHelper->expects($this->never())->method('getEncodedUrl');
-        $this->assertEquals(
-            [$this->store, []],
-            $this->unit->beforeGetTargetStorePostData($this->switcher, $this->store, [])
-        );
-    }
-
-    public function testTrimPathInfoForGetTargetStorePostData()
-    {
-        $this->request->expects($this->once())->method('getPathInfo')->willReturn('path/with/trim/');
-        $this->store->expects($this->once())->method('getId')->willReturn(1);
-        $this->urlFinder->expects($this->once())->method('findOneByData')
-            ->with([
-                \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::TARGET_PATH => 'path/with/trim',
-                \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::STORE_ID => 1,
-             ])
-            ->willReturn(null);
-        $this->urlHelper->expects($this->never())->method('getEncodedUrl');
-        $this->assertEquals(
-            [$this->store, []],
-            $this->unit->beforeGetTargetStorePostData($this->switcher, $this->store, [])
-        );
-    }
-
-    public function testGetTargetStorePostData()
-    {
-        $urlRewrite = $this->createMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class);
-        $urlRewrite->expects($this->once())->method('getRequestPath')->willReturn('path');
-
-        $this->request->expects($this->once())->method('getPathInfo')->willReturn('path');
-        $this->urlFinder->expects($this->once())->method('findOneByData')->willReturn($urlRewrite);
-        $this->urlHelper->expects($this->once())->method('getEncodedUrl')->willReturn('encoded-path');
-        $this->urlBuilder->expects($this->once())->method('getUrl')->willReturn('path');
-        $this->assertEquals(
-            [$this->store, [\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => 'encoded-path']],
-            $this->unit->beforeGetTargetStorePostData($this->switcher, $this->store, [])
-        );
-    }
-}
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
index acf05242d6aa2..642ca0f9af6d1 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -6,9 +6,10 @@
 
 namespace Magento\UrlRewrite\Test\Unit\Controller;
 
+use Magento\Framework\App\Action\Forward;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -39,6 +40,9 @@ class RouterTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\UrlRewrite\Model\UrlFinderInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $urlFinder;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->actionFactory = $this->createMock(\Magento\Framework\App\ActionFactory::class);
@@ -67,6 +71,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testNoRewriteExist()
     {
         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue(null));
@@ -76,51 +83,81 @@ public function testNoRewriteExist()
         $this->assertNull($this->router->match($this->request));
     }
 
+    /**
+     * @return void
+     */
     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,
-                ],
+        $initialRequestPath = 'request-path';
+        $newRequestPath = 'new-request-path';
+        $oldStoreAlias = 'old-store';
+        $oldStoreId = 'old-store-id';
+        $currentStoreId = 'current-store-id';
+        $rewriteEntityType = 'entity-type';
+        $rewriteEntityId = 42;
+        $this->request
+            ->expects($this->any())
+            ->method('getParam')
+            ->with('___from_store')
+            ->willReturn($oldStoreAlias);
+        $this->request
+            ->expects($this->any())
+            ->method('getPathInfo')
+            ->willReturn($initialRequestPath);
+        $oldStore = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $oldStore->expects($this->any())
+            ->method('getId')
+            ->willReturn($oldStoreId);
+        $this->store
+            ->expects($this->any())
+            ->method('getId')
+            ->willReturn($currentStoreId);
+        $this->storeManager
+            ->expects($this->any())
+            ->method('getStore')
+            ->willReturnMap([[$oldStoreAlias, $oldStore], [null, $this->store]]);
+        $oldUrlRewrite = $this->getMockBuilder(UrlRewrite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $oldUrlRewrite->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn($rewriteEntityType);
+        $oldUrlRewrite->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn($rewriteEntityId);
+        $oldUrlRewrite->expects($this->any())
+            ->method('getRedirectType')
+            ->willReturn(0);
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $urlRewrite->expects($this->any())
+            ->method('getRequestPath')
+            ->willReturn($newRequestPath);
+        $this->urlFinder
+            ->expects($this->any())
+            ->method('findOneByData')
+            ->willReturnMap([
                 [
                     [
-                        UrlRewrite::ENTITY_TYPE => 'entity-type',
-                        UrlRewrite::ENTITY_ID => 'entity-id',
-                        UrlRewrite::STORE_ID => 'current-store-id',
-                        UrlRewrite::IS_AUTOGENERATED => 1,
+                        UrlRewrite::REQUEST_PATH => $initialRequestPath,
+                        UrlRewrite::STORE_ID     => $currentStoreId,
                     ],
-                    $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);
-
+                    $urlRewrite,
+                ]
+            ]);
+        $this->actionFactory
+            ->expects($this->once())
+            ->method('create')
+            ->with(Forward::class);
         $this->router->match($this->request);
     }
 
+    /**
+     * @return void
+     */
     public function testNoRewriteAfterStoreSwitcherWhenNoOldRewrite()
     {
         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
@@ -143,6 +180,9 @@ public function testNoRewriteAfterStoreSwitcherWhenNoOldRewrite()
         $this->assertNull($this->router->match($this->request));
     }
 
+    /**
+     * @return void
+     */
     public function testNoRewriteAfterStoreSwitcherWhenOldRewriteEqualsToNewOne()
     {
         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
@@ -183,6 +223,9 @@ public function testNoRewriteAfterStoreSwitcherWhenOldRewriteEqualsToNewOne()
         $this->assertNull($this->router->match($this->request));
     }
 
+    /**
+     * @return void
+     */
     public function testMatchWithRedirect()
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
@@ -202,6 +245,9 @@ public function testMatchWithRedirect()
         $this->router->match($this->request);
     }
 
+    /**
+     * @return void
+     */
     public function testMatchWithCustomInternalRedirect()
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
@@ -253,6 +299,9 @@ public function externalRedirectTargetPathDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testMatch()
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
index e41a06cb0c9f0..b99c5c48c3de0 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
@@ -55,6 +55,9 @@ public function testValidateSuffixException($suffix)
         $this->_helper->validateSuffix($suffix);
     }
 
+    /**
+     * @return array
+     */
     public function requestPathDataProvider()
     {
         return [
@@ -63,6 +66,9 @@ public function requestPathDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function requestPathExceptionDataProvider()
     {
         return [
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
index 261894dc8fe33..b96a8ef637404 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\UrlRewrite\Test\Unit\Model\Storage;
 
+use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\UrlRewrite\Model\Storage\DbStorage;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -49,10 +50,9 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->dataObjectHelper = $this->createMock(\Magento\Framework\Api\DataObjectHelper::class);
         $this->connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $this->select = $this->createPartialMock(
-            \Magento\Framework\DB\Select::class,
-            ['from', 'where', 'deleteFromSelect']
-        );
+        $this->select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
 
         $this->resource->expects($this->any())
@@ -436,6 +436,9 @@ public function testFindOneByDataWithRequestPathTwoResults()
         $this->assertEquals(['urlRewrite1'], $this->storage->findOneByData($data));
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testReplace()
     {
         $urlFirst = $this->createMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class);
@@ -444,59 +447,32 @@ public function testReplace()
         // delete
 
         $urlFirst->expects($this->any())
-            ->method('getByKey')
-            ->will($this->returnValueMap([
-                [UrlRewrite::ENTITY_TYPE, 'product'],
-                [UrlRewrite::ENTITY_ID, 'entity_1'],
-                [UrlRewrite::STORE_ID, 'store_id_1'],
-            ]));
-        $urlFirst->expects($this->any())->method('getEntityType')->willReturn('product');
+            ->method('getEntityType')
+            ->willReturn('product');
+        $urlFirst->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn('entity_1');
+        $urlFirst->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn('store_id_1');
+
+        $urlSecond->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn('category');
+        $urlSecond->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn('entity_2');
         $urlSecond->expects($this->any())
-            ->method('getByKey')
-            ->will($this->returnValueMap([
-                [UrlRewrite::ENTITY_TYPE, 'category'],
-                [UrlRewrite::ENTITY_ID, 'entity_2'],
-                [UrlRewrite::STORE_ID, 'store_id_2'],
-            ]));
-        $urlSecond->expects($this->any())->method('getEntityType')->willReturn('category');
+            ->method('getStoreId')
+            ->willReturn('store_id_2');
 
         $this->connectionMock->expects($this->any())
             ->method('quoteIdentifier')
             ->will($this->returnArgument(0));
 
-        $this->select->expects($this->at(1))
-            ->method('where')
-            ->with('entity_id IN (?)', ['entity_1']);
-
-        $this->select->expects($this->at(2))
-            ->method('where')
-            ->with('store_id IN (?)', ['store_id_1']);
-
-        $this->select->expects($this->at(3))
-            ->method('where')
-            ->with('entity_type IN (?)', 'product');
-
-        $this->select->expects($this->at(4))
-            ->method('deleteFromSelect')
-            ->with('table_name')
-            ->will($this->returnValue('sql delete query'));
-
-        $this->select->expects($this->at(6))
-            ->method('where')
-            ->with('entity_id IN (?)', ['entity_2']);
-
-        $this->select->expects($this->at(7))
-            ->method('where')
-            ->with('store_id IN (?)', ['store_id_2']);
-
-        $this->select->expects($this->at(8))
-            ->method('where')
-            ->with('entity_type IN (?)', 'category');
-
-        $this->select->expects($this->at(9))
-            ->method('deleteFromSelect')
-            ->with('table_name')
-            ->will($this->returnValue('sql delete query'));
+        $this->select->expects($this->any())
+            ->method($this->anything())
+            ->willReturnSelf();
 
         $this->resource->expects($this->any())
             ->method('getTableName')
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 1944531ce4468..b12d0820ae3b9 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-url-rewrite": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-cms-url-rewrite": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-cms": "*",
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
index 615e17dbb7af8..66ae94dac1af1 100644
--- a/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
+++ b/app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
@@ -7,8 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" translate="title" module="Magento_UrlRewrite"
-             sortOrder="20" parent="Magento_Backend::marketing_seo"
-             action="adminhtml/url_rewrite/index" resource="Magento_UrlRewrite::urlrewrite"/>
+        <add id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" translate="title" module="Magento_UrlRewrite" sortOrder="20" parent="Magento_Backend::marketing_seo" action="adminhtml/url_rewrite/index" resource="Magento_UrlRewrite::urlrewrite"/>
     </menu>
 </config>
diff --git a/app/code/Magento/UrlRewrite/etc/db_schema.xml b/app/code/Magento/UrlRewrite/etc/db_schema.xml
new file mode 100644
index 0000000000000..6e0014873202d
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/etc/db_schema.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="url_rewrite" resource="default" engine="innodb" comment="Url Rewrites">
+        <column xsi:type="int" name="url_rewrite_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Rewrite Id"/>
+        <column xsi:type="varchar" name="entity_type" nullable="false" length="32" comment="Entity type code"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Entity ID"/>
+        <column xsi:type="varchar" name="request_path" nullable="true" length="255" comment="Request Path"/>
+        <column xsi:type="varchar" name="target_path" nullable="true" length="255" comment="Target Path"/>
+        <column xsi:type="smallint" name="redirect_type" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Redirect Type"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Store Id"/>
+        <column xsi:type="varchar" name="description" nullable="true" length="255" comment="Description"/>
+        <column xsi:type="smallint" name="is_autogenerated" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Is rewrite generated automatically flag"/>
+        <column xsi:type="varchar" name="metadata" nullable="true" length="255" comment="Meta data for url rewrite"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="url_rewrite_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="URL_REWRITE_REQUEST_PATH_STORE_ID">
+            <column name="request_path"/>
+            <column name="store_id"/>
+        </constraint>
+        <index referenceId="URL_REWRITE_TARGET_PATH" indexType="btree">
+            <column name="target_path"/>
+        </index>
+        <index referenceId="URL_REWRITE_STORE_ID_ENTITY_ID" indexType="btree">
+            <column name="store_id"/>
+            <column name="entity_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/UrlRewrite/etc/db_schema_whitelist.json b/app/code/Magento/UrlRewrite/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..bdaed647587a6
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/etc/db_schema_whitelist.json
@@ -0,0 +1,24 @@
+{
+    "url_rewrite": {
+        "column": {
+            "url_rewrite_id": true,
+            "entity_type": true,
+            "entity_id": true,
+            "request_path": true,
+            "target_path": true,
+            "redirect_type": true,
+            "store_id": true,
+            "description": true,
+            "is_autogenerated": true,
+            "metadata": true
+        },
+        "index": {
+            "URL_REWRITE_TARGET_PATH": true,
+            "URL_REWRITE_STORE_ID_ENTITY_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "URL_REWRITE_REQUEST_PATH_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/etc/di.xml b/app/code/Magento/UrlRewrite/etc/di.xml
index dfeb5d026d508..26055efbd2ba8 100644
--- a/app/code/Magento/UrlRewrite/etc/di.xml
+++ b/app/code/Magento/UrlRewrite/etc/di.xml
@@ -9,4 +9,11 @@
     <preference for="Magento\UrlRewrite\Model\StorageInterface" type="Magento\UrlRewrite\Model\Storage\DbStorage"/>
     <preference for="Magento\UrlRewrite\Model\UrlFinderInterface" type="Magento\UrlRewrite\Model\Storage\DbStorage"/>
     <preference for="Magento\UrlRewrite\Model\UrlPersistInterface" type="Magento\UrlRewrite\Model\Storage\DbStorage"/>
+    <type name="Magento\Store\Model\StoreSwitcher">
+        <arguments>
+            <argument name="storeSwitchers" xsi:type="array">
+                <item name="rewriteUrl" xsi:type="object">Magento\UrlRewrite\Model\StoreSwitcher\RewriteUrl</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/UrlRewrite/etc/frontend/di.xml b/app/code/Magento/UrlRewrite/etc/frontend/di.xml
index d46bb1c5d14a2..bc5b6aa767fa8 100644
--- a/app/code/Magento/UrlRewrite/etc/frontend/di.xml
+++ b/app/code/Magento/UrlRewrite/etc/frontend/di.xml
@@ -17,7 +17,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Store\Block\Switcher">
-        <plugin name="setStoreSpecificRedirectUrl" type="Magento\UrlRewrite\Block\Plugin\Store\Switcher\SetRedirectUrl"/>
-    </type>
 </config>
diff --git a/app/code/Magento/UrlRewrite/etc/module.xml b/app/code/Magento/UrlRewrite/etc/module.xml
index b8845ad04fb5f..eb314b71bc377 100644
--- a/app/code/Magento/UrlRewrite/etc/module.xml
+++ b/app/code/Magento/UrlRewrite/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_UrlRewrite" setup_version="2.0.1">
+    <module name="Magento_UrlRewrite" >
     </module>
 </config>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
index 0aa8a98dd1df8..baff22b342b06 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
@@ -8,19 +8,27 @@
 
 /** @var \Magento\UrlRewrite\Block\Catalog\Category\Tree $block */
 ?>
-<fieldset class="admin__fieldset" data-ui-id="category-selector">
-    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Select Category')) ?></span></legend>
-    <div class="content content-category-tree">
-        <input type="hidden" name="categories" id="product_categories" value="" />
-        <?php if ($block->getRoot()): ?>
-        <div data-mage-init='<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
-            [
-                'categoryTree' => [
-                    'data' => $block->getTreeArray(),
-                    'url' => $block->escapeUrl($block->getLoadTreeUrl()),
-                ],
-            ]
-        ); ?>' class="jstree-default"></div>
-        <?php endif; ?>
-    </div>
-</fieldset>
+    <fieldset class="admin__fieldset" data-ui-id="category-selector">
+        <legend class="admin__legend"><span><?= $block->escapeHtml(__('Select Category')) ?></span></legend>
+        <div class="content content-category-tree">
+            <input type="hidden" name="categories" id="product_categories" value=""/>
+            <?php if ($block->getRoot()): ?>
+                <div class="jstree-default"></div>
+            <?php endif; ?>
+        </div>
+    </fieldset>
+<?php if ($block->getRoot()): ?>
+    <script type="text/x-magento-init">
+    {
+        ".jstree-default": {
+            "categoryTree": {
+                "data": <?php /* @noEscape */
+        echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getTreeArray()); ?>,
+                "url": "<?php /* @noEscape */
+        echo $block->escapeUrl($block->getLoadTreeUrl()); ?>"
+            }
+        }
+    }
+
+    </script>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
index 09ac4a5990f6b..3ff25a7c84521 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
@@ -10,14 +10,13 @@
 ?>
 <?= $block->getChildHtml() ?>
 <?php if ($block->getChildBlock('form')): ?>
-<script>
-require([
-    'jquery',
-    'mage/backend/form',
-    'mage/backend/validation'
-], function($){
-    $('#edit_form').form()
-        .validation({validationUrl: '<?= $block->escapeUrl($block->getValidationUrl()) ?>'});
-});
+<script type="text/x-magento-init">
+    {
+        "#edit_form": {
+            "Magento_UrlRewrite/js/url-rewrite-validation" : {
+                "url": "<?= $block->escapeUrl($block->getValidationUrl()) ?>"
+            }
+        }
+    }
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js b/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js
new file mode 100644
index 0000000000000..548f712bacadd
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/backend/form',
+    'mage/backend/validation'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).form().validation({
+            validationUrl: data.url
+        });
+    };
+});
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
new file mode 100644
index 0000000000000..1c25ffd1e9ff7
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewriteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface;
+
+/**
+ * UrlRewrite field resolver, used for GraphQL request processing.
+ */
+class EntityUrl implements ResolverInterface
+{
+    /**
+     * @var UrlFinderInterface
+     */
+    private $urlFinder;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var CustomUrlLocatorInterface
+     */
+    private $customUrlLocator;
+
+    /**
+     * @param UrlFinderInterface $urlFinder
+     * @param StoreManagerInterface $storeManager
+     * @param CustomUrlLocatorInterface $customUrlLocator
+     */
+    public function __construct(
+        UrlFinderInterface $urlFinder,
+        StoreManagerInterface $storeManager,
+        CustomUrlLocatorInterface $customUrlLocator
+    ) {
+        $this->urlFinder = $urlFinder;
+        $this->storeManager = $storeManager;
+        $this->customUrlLocator = $customUrlLocator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($args['url']) || empty(trim($args['url']))) {
+            throw new GraphQlInputException(__('"url" argument should be specified and not empty'));
+        }
+
+        $result = null;
+        $url = $args['url'];
+        if (substr($url, 0, 1) === '/' && $url !== '/') {
+            $url = ltrim($url, '/');
+        }
+        $customUrl = $this->customUrlLocator->locateUrl($url);
+        $url = $customUrl ?: $url;
+        $urlRewrite = $this->findCanonicalUrl($url);
+        if ($urlRewrite) {
+            $result = [
+                'id' => $urlRewrite->getEntityId(),
+                'canonical_url' => $urlRewrite->getTargetPath(),
+                'type' => $this->sanitizeType($urlRewrite->getEntityType())
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Find the canonical url passing through all redirects if any
+     *
+     * @param string $requestPath
+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
+     */
+    private function findCanonicalUrl(string $requestPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
+    {
+        $urlRewrite = $this->findUrlFromRequestPath($requestPath);
+        if ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath());
+            }
+        }
+        if (!$urlRewrite) {
+            $urlRewrite = $this->findUrlFromTargetPath($requestPath);
+        }
+
+        return $urlRewrite;
+    }
+
+    /**
+     * Find a url from a request url on the current store
+     *
+     * @param string $requestPath
+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
+     */
+    private function findUrlFromRequestPath(string $requestPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
+    {
+        return $this->urlFinder->findOneByData(
+            [
+                'request_path' => $requestPath,
+                'store_id' => $this->storeManager->getStore()->getId()
+            ]
+        );
+    }
+
+    /**
+     * Find a url from a target url on the current store
+     *
+     * @param string $targetPath
+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
+     */
+    private function findUrlFromTargetPath(string $targetPath) : ?\Magento\UrlRewrite\Service\V1\Data\UrlRewrite
+    {
+        return $this->urlFinder->findOneByData(
+            [
+                'target_path' => $targetPath,
+                'store_id' => $this->storeManager->getStore()->getId()
+            ]
+        );
+    }
+
+    /**
+     * Sanitize the type to fit schema specifications
+     *
+     * @param string $type
+     * @return string
+     */
+    private function sanitizeType(string $type) : string
+    {
+        return strtoupper(str_replace('-', '_', $type));
+    }
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
new file mode 100644
index 0000000000000..fb7bbd634d11f
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewriteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\Model\AbstractModel;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteDTO;
+
+/**
+ * Returns URL rewrites list for the specified product
+ */
+class UrlRewrite implements ResolverInterface
+{
+    /**
+     * @var UrlFinderInterface
+     */
+    private $urlFinder;
+
+    /**
+     * @param UrlFinderInterface $urlFinder
+     */
+    public function __construct(
+        UrlFinderInterface $urlFinder
+    ) {
+        $this->urlFinder = $urlFinder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): array {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var AbstractModel $entity */
+        $entity = $value['model'];
+        $entityId = $entity->getEntityId();
+
+        $urlRewriteCollection = $this->urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $entityId]);
+        $urlRewrites = [];
+
+        /** @var UrlRewriteDTO $urlRewrite */
+        foreach ($urlRewriteCollection as $urlRewrite) {
+            if ($urlRewrite->getRedirectType() !== 0) {
+                continue;
+            }
+
+            $urlRewrites[] = [
+                'url' => $urlRewrite->getRequestPath(),
+                'parameters' => $this->getUrlParameters($urlRewrite->getTargetPath())
+            ];
+        }
+
+        return $urlRewrites;
+    }
+
+    /**
+     * Parses target path and extracts parameters
+     *
+     * @param string $targetPath
+     * @return array
+     */
+    private function getUrlParameters(string $targetPath): array
+    {
+        $urlParameters = [];
+        $targetPathParts = explode('/', trim($targetPath, '/'));
+
+        for ($i = 3; ($i < sizeof($targetPathParts) - 1); $i += 2) {
+            $urlParameters[] = [
+                'name' => $targetPathParts[$i],
+                'value' => $targetPathParts[$i + 1]
+            ];
+        }
+
+        return $urlParameters;
+    }
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php
new file mode 100644
index 0000000000000..553c08e29137a
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite;
+
+/**
+ * Pool of custom URL locators.
+ */
+class CustomUrlLocator implements CustomUrlLocatorInterface
+{
+    /**
+     * @var CustomUrlLocatorInterface[]
+     */
+    private $urlLocators;
+
+    /**
+     * @param CustomUrlLocatorInterface[] $urlLocators
+     */
+    public function __construct(array $urlLocators = [])
+    {
+        $this->urlLocators = $urlLocators;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function locateUrl($urlKey): ?string
+    {
+        foreach ($this->urlLocators as $urlLocator) {
+            $url = $urlLocator->locateUrl($urlKey);
+            if ($url !== null) {
+                return $url;
+            }
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php
new file mode 100644
index 0000000000000..df0c0ee96c16c
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite;
+
+/**
+ * Interface for resolution of custom URLs.
+ *
+ * It can be used, for example, to resolve '\' URL path to a 'Home' page.
+ */
+interface CustomUrlLocatorInterface
+{
+    /**
+     * Resolve URL based on custom rules.
+     *
+     * @param string $urlKey
+     * @return string|null Return null if URL cannot be resolved
+     */
+    public function locateUrl($urlKey): ?string;
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/README.md b/app/code/Magento/UrlRewriteGraphQl/README.md
new file mode 100644
index 0000000000000..9fd3928d9ab8e
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/README.md
@@ -0,0 +1,5 @@
+# UrlRewriteGraphQl
+
+**UrlRewriteGraphQl** provides type information for the GraphQl module
+to generate url rewrites from entities that implement such rewrites,
+like categories, products or cms and other 3rd party modules.
diff --git a/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md b/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8825364e35cc6
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Url Rewrite Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Url Rewrite Graph Ql** module.
diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json
new file mode 100644
index 0000000000000..1c99276269aa7
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-url-rewrite-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-url-rewrite": "*",
+        "magento/module-store": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\UrlRewriteGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/di.xml b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..a9865db4e97e8
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface" type="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocator"/>
+</config>
diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/module.xml b/app/code/Magento/UrlRewriteGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..689a792def0dc
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_UrlRewriteGraphQl" />
+</config>
diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..dae695c69a33c
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
@@ -0,0 +1,25 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `canonical_url`, and `type` attributes") {
+    id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.")
+    canonical_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
+    type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.")
+}
+
+type Query {
+    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page")
+}
+
+enum UrlRewriteEntityTypeEnum {
+}
+
+type UrlRewrite @doc(description: "The object contains URL rewrite details") {
+    url: String @doc(description: "Request URL")
+    parameters: [HttpQueryParameter] @doc(description: "Request parameters")
+}
+
+type HttpQueryParameter @doc(description: "The object details of target path parameters") {
+    name: String @doc(description: "Parameter name")
+    value: String @doc(description: "Parameter value")
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/registration.php b/app/code/Magento/UrlRewriteGraphQl/registration.php
new file mode 100644
index 0000000000000..72b576c2a0be9
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_UrlRewriteGraphQl', __DIR__);
diff --git a/app/code/Magento/User/Block/Buttons.php b/app/code/Magento/User/Block/Buttons.php
index b411f1c0cf8cd..f580c5cd72b9b 100644
--- a/app/code/Magento/User/Block/Buttons.php
+++ b/app/code/Magento/User/Block/Buttons.php
@@ -6,6 +6,8 @@
 namespace Magento\User\Block;
 
 /**
+ * Buttons block
+ *
  * @api
  * @since 100.0.2
  */
@@ -33,6 +35,8 @@ public function __construct(
     }
 
     /**
+     * Prepare layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -53,7 +57,7 @@ protected function _prepareLayout()
             ['label' => __('Reset'), 'onclick' => 'window.location.reload()', 'class' => 'reset']
         );
 
-        if (intval($this->getRequest()->getParam('rid'))) {
+        if ((int)$this->getRequest()->getParam('rid')) {
             $this->getToolbar()->addChild(
                 'deleteButton',
                 \Magento\Backend\Block\Widget\Button::class,
@@ -85,6 +89,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get back button html
+     *
      * @return string
      */
     public function getBackButtonHtml()
@@ -93,6 +99,8 @@ public function getBackButtonHtml()
     }
 
     /**
+     * Get reset button html
+     *
      * @return string
      */
     public function getResetButtonHtml()
@@ -101,6 +109,8 @@ public function getResetButtonHtml()
     }
 
     /**
+     * Get save button html
+     *
      * @return string
      */
     public function getSaveButtonHtml()
@@ -109,17 +119,21 @@ public function getSaveButtonHtml()
     }
 
     /**
+     * Get delete button html
+     *
      * @return string|void
      */
     public function getDeleteButtonHtml()
     {
-        if (intval($this->getRequest()->getParam('rid')) == 0) {
+        if ((int)$this->getRequest()->getParam('rid') == 0) {
             return;
         }
         return $this->getChildHtml('deleteButton');
     }
 
     /**
+     * Get user
+     *
      * @return mixed
      */
     public function getUser()
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index 45d725c61bd52..5fe6a1b2a2e88 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
     /**
      * @var string
      */
-    protected $_template = 'role/edit.phtml';
+    protected $_template = 'Magento_User::role/edit.phtml';
 
     /**
      * Root ACL Resource
diff --git a/app/code/Magento/User/Block/Role/Tab/Users.php b/app/code/Magento/User/Block/Role/Tab/Users.php
index 27604c9aed29a..a95a68cbe14f3 100644
--- a/app/code/Magento/User/Block/Role/Tab/Users.php
+++ b/app/code/Magento/User/Block/Role/Tab/Users.php
@@ -45,7 +45,9 @@ protected function _construct()
         $roleId = $this->getRequest()->getParam('rid', false);
         /** @var \Magento\User\Model\ResourceModel\User\Collection $users */
         $users = $this->_userCollectionFactory->create()->load();
-        $this->setTemplate('role/users.phtml')->assign('users', $users->getItems())->assign('roleId', $roleId);
+        $this->setTemplate('Magento_User::role/users.phtml')
+             ->assign('users', $users->getItems())
+             ->assign('roleId', $roleId);
     }
 
     /**
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php
index aaa2681a50790..ea539b64a5cc3 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php
@@ -3,31 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Controller\Adminhtml;
 
 use Magento\Framework\Encryption\Helper\Security;
+use Magento\Backend\App\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\User\Model\UserFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * \Magento\User Auth controller
  */
-abstract class Auth extends \Magento\Backend\App\AbstractAction
+abstract class Auth extends AbstractAction
 {
     /**
      * User model factory
      *
-     * @var \Magento\User\Model\UserFactory
+     * @var UserFactory
      */
     protected $_userFactory;
 
     /**
      * Construct
      *
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\User\Model\UserFactory $userFactory
+     * @param Context $context
+     * @param UserFactory $userFactory
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\User\Model\UserFactory $userFactory
+        Context $context,
+        UserFactory $userFactory
     ) {
         parent::__construct($context);
         $this->_userFactory = $userFactory;
@@ -39,7 +44,7 @@ public function __construct(
      * @param int $userId
      * @param string $resetPasswordToken
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken)
     {
@@ -49,20 +54,20 @@ protected function _validateResetPasswordLinkToken($userId, $resetPasswordToken)
             $resetPasswordToken
         ) || empty($resetPasswordToken) || empty($userId) || $userId < 0
         ) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please correct the password reset token.'));
+            throw new LocalizedException(__('Please correct the password reset token.'));
         }
 
         /** @var $user \Magento\User\Model\User */
         $user = $this->_userFactory->create()->load($userId);
         if (!$user->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('Please specify the correct account and try again.')
             );
         }
 
         $userToken = $user->getRpToken();
         if (!Security::compareStrings($userToken, $resetPasswordToken) || $user->isResetPasswordLinkTokenExpired()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Your password reset link has expired.'));
+            throw new LocalizedException(__('Your password reset link has expired.'));
         }
     }
 
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
index cd4c3d6950685..565b312325ddc 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
@@ -6,9 +6,26 @@
  */
 namespace Magento\User\Controller\Adminhtml\Auth;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Security\Model\SecurityManager;
+use Magento\Backend\App\Action\Context;
+use Magento\User\Model\UserFactory;
+use Magento\User\Model\ResourceModel\User\CollectionFactory;
+use Magento\Framework\Validator\EmailAddress;
+use Magento\Security\Model\PasswordResetRequestEvent;
+use Magento\Framework\Exception\SecurityViolationException;
+use Magento\User\Controller\Adminhtml\Auth;
+use Magento\Backend\Helper\Data;
+use Magento\User\Model\Spi\NotificatorInterface;
 
-class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth
+/**
+ * Initiate forgot-password process.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Forgotpassword extends Auth implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var SecurityManager
@@ -16,17 +33,46 @@ class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth
     protected $securityManager;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\User\Model\UserFactory $userFactory
-     * @param \Magento\Security\Model\SecurityManager $securityManager
+     * @var NotificatorInterface
+     */
+    private $notificator;
+
+    /**
+     * User model factory
+     *
+     * @var CollectionFactory
+     */
+    private $userCollectionFactory;
+
+    /**
+     * @var Data
+     */
+    private $backendDataHelper;
+
+    /**
+     * @param Context $context
+     * @param UserFactory $userFactory
+     * @param SecurityManager $securityManager
+     * @param CollectionFactory $userCollectionFactory
+     * @param Data $backendDataHelper
+     * @param NotificatorInterface|null $notificator
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\User\Model\UserFactory $userFactory,
-        \Magento\Security\Model\SecurityManager $securityManager
+        Context $context,
+        UserFactory $userFactory,
+        SecurityManager $securityManager,
+        CollectionFactory $userCollectionFactory = null,
+        Data $backendDataHelper = null,
+        ?NotificatorInterface $notificator = null
     ) {
         parent::__construct($context, $userFactory);
         $this->securityManager = $securityManager;
+        $this->userCollectionFactory = $userCollectionFactory ?:
+                ObjectManager::getInstance()->get(CollectionFactory::class);
+        $this->backendDataHelper = $backendDataHelper ?:
+                ObjectManager::getInstance()->get(Data::class);
+        $this->notificator = $notificator
+            ?? ObjectManager::getInstance()->get(NotificatorInterface::class);
     }
 
     /**
@@ -44,18 +90,18 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!empty($email) && !empty($params)) {
             // Validate received data to be an email address
-            if (\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
+            if (\Zend_Validate::is($email, EmailAddress::class)) {
                 try {
                     $this->securityManager->performSecurityCheck(
-                        \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST,
+                        PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST,
                         $email
                     );
-                } catch (\Magento\Framework\Exception\SecurityViolationException $exception) {
+                } catch (SecurityViolationException $exception) {
                     $this->messageManager->addErrorMessage($exception->getMessage());
                     return $resultRedirect->setPath('admin');
                 }
-                $collection = $this->_objectManager->get(\Magento\User\Model\ResourceModel\User\Collection::class);
                 /** @var $collection \Magento\User\Model\ResourceModel\User\Collection */
+                $collection = $this->userCollectionFactory->create();
                 $collection->addFieldToFilter('email', $email);
                 $collection->load(false);
 
@@ -65,12 +111,10 @@ public function execute()
                             /** @var \Magento\User\Model\User $user */
                             $user = $this->_userFactory->create()->load($item->getId());
                             if ($user->getId()) {
-                                $newPassResetToken = $this->_objectManager->get(
-                                    \Magento\User\Helper\Data::class
-                                )->generateResetPasswordLinkToken();
+                                $newPassResetToken = $this->backendDataHelper->generateResetPasswordLinkToken();
                                 $user->changeResetPasswordLinkToken($newPassResetToken);
                                 $user->save();
-                                $user->sendPasswordResetConfirmationEmail();
+                                $this->notificator->sendForgotPassword($user);
                             }
                             break;
                         }
@@ -86,7 +130,7 @@ public function execute()
                 $this->messageManager->addSuccess(__('We\'ll email you a link to reset your password.'));
                 // @codingStandardsIgnoreEnd
                 $this->getResponse()->setRedirect(
-                    $this->_objectManager->get(\Magento\Backend\Helper\Data::class)->getHomePageUrl()
+                    $this->backendDataHelper->getHomePageUrl()
                 );
                 return;
             } else {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
index 2c6be98439919..c2e29534b1251 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
@@ -6,8 +6,32 @@
  */
 namespace Magento\User\Controller\Adminhtml\Auth;
 
-class ResetPasswordPost extends \Magento\User\Controller\Adminhtml\Auth
+use Magento\User\Controller\Adminhtml\Auth;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Backend\Helper\Data;
+use Magento\User\Model\UserFactory;
+
+class ResetPasswordPost extends Auth
 {
+    /**
+     * @var Data
+     */
+    private $backendDataHelper;
+
+    /**
+     * @param Context $context
+     * @param UserFactory $userFactory
+     * @param Data $backendDataHelper
+     */
+    public function __construct(
+        Context $context,
+        UserFactory $userFactory,
+        Data $backendDataHelper = null
+    ) {
+        parent::__construct($context, $userFactory);
+        $this->backendDataHelper = $backendDataHelper ?: ObjectManager::getInstance()->get(Data::class);
+    }
     /**
      * Reset forgotten password
      *
@@ -27,7 +51,7 @@ public function execute()
         } catch (\Exception $exception) {
             $this->messageManager->addError(__('Your password reset link has expired.'));
             $this->getResponse()->setRedirect(
-                $this->_objectManager->get(\Magento\Backend\Helper\Data::class)->getHomePageUrl()
+                $this->backendDataHelper->getHomePageUrl()
             );
             return;
         }
@@ -53,7 +77,7 @@ public function execute()
                 $user->save();
                 $this->messageManager->addSuccess(__('You updated your password.'));
                 $this->getResponse()->setRedirect(
-                    $this->_objectManager->get(\Magento\Backend\Helper\Data::class)->getHomePageUrl()
+                    $this->backendDataHelper->getHomePageUrl()
                 );
             }
         } catch (\Magento\Framework\Validator\Exception $exception) {
diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
index 7c0e31076cace..e3e1e3def3985 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php
@@ -6,10 +6,12 @@
  */
 namespace Magento\User\Controller\Adminhtml\Locks;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
 /**
  * Locks Index action
  */
-class Index extends \Magento\User\Controller\Adminhtml\Locks
+class Index extends \Magento\User\Controller\Adminhtml\Locks implements HttpGetActionInterface
 {
     /**
      * Render page with grid
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
index e5fb1590a8cc1..4e7d18774c2f9 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Controller\Adminhtml\User;
 
 use Magento\User\Block\User\Edit\Tab\Main as UserEdit;
@@ -29,7 +30,9 @@ public function execute()
             try {
                 $currentUserPassword = (string)$this->getRequest()->getPost(UserEdit::CURRENT_USER_PASSWORD_FIELD);
                 if (empty($currentUserPassword)) {
-                    throw new AuthenticationException(__('You have entered an invalid password for current user.'));
+                    throw new AuthenticationException(
+                        __('The password entered for the current user is invalid. Verify the password and try again.')
+                    );
                 }
                 $currentUser->performIdentityCheck($currentUserPassword);
                 /** @var \Magento\User\Model\User $model */
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Index.php
index 7f79dd4773731..bc4157c144a87 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Index.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\User\Controller\Adminhtml\User;
 
-class Index extends \Magento\User\Controller\Adminhtml\User
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\User\Controller\Adminhtml\User implements HttpGetActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
index e1853be17a128..8d468d45f1aee 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\User\Controller\Adminhtml\User\Role;
 
-class Index extends \Magento\User\Controller\Adminhtml\User\Role
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\User\Controller\Adminhtml\User\Role implements HttpGetActionInterface
 {
     /**
      * Show grid with roles existing in systems
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
index 4d97b62cd8b14..ad8c87b617d52 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\User\Controller\Adminhtml\User\Role;
 
-class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\User\Controller\Adminhtml\User\Role as RoleAction;
+
+class RoleGrid extends RoleAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Action for ajax request from grid
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
index c21e0ba7845a7..97ecb778b8cb1 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
@@ -4,18 +4,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Controller\Adminhtml\User\Role;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Security\Model\SecurityCookie;
 
 /**
+ * Save role controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role
+class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role implements HttpPostActionInterface
 {
     /**
      * Session keys for Info form data
@@ -57,9 +62,8 @@ private function getSecurityCookie()
     {
         if (!($this->securityCookie instanceof SecurityCookie)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
-        } else {
-            return $this->securityCookie;
         }
+        return $this->securityCookie;
     }
 
     /**
@@ -74,10 +78,8 @@ public function execute()
 
         $rid = $this->getRequest()->getParam('role_id', false);
         $resource = $this->getRequest()->getParam('resource', false);
-        $roleUsers = $this->getRequest()->getParam('in_role_user', null);
-        parse_str($roleUsers, $roleUsers);
-        $roleUsers = array_keys($roleUsers);
-
+        $oldRoleUsers = $this->parseRequestVariable('in_role_user_old');
+        $roleUsers = $this->parseRequestVariable('in_role_user');
         $isAll = $this->getRequest()->getParam('all');
         if ($isAll) {
             $resource = [$this->_objectManager->get(\Magento\Framework\Acl\RootResource::class)->getId()];
@@ -103,13 +105,9 @@ public function execute()
             $role->save();
 
             $this->_rulesFactory->create()->setRoleId($role->getId())->setResources($resource)->saveRel();
-
-            $this->processPreviousUsers($role);
-
-            foreach ($roleUsers as $nRuid) {
-                $this->_addUserToRole($nRuid, $role->getId());
-            }
-            $this->messageManager->addSuccess(__('You saved the role.'));
+            $this->processPreviousUsers($role, $oldRoleUsers);
+            $this->processCurrentUsers($role, $roleUsers);
+            $this->messageManager->addSuccessMessage(__('You saved the role.'));
         } catch (UserLockedException $e) {
             $this->_auth->logout();
             $this->getSecurityCookie()->setLogoutReasonCookie(
@@ -117,12 +115,14 @@ public function execute()
             );
             return $resultRedirect->setPath('*');
         } catch (\Magento\Framework\Exception\AuthenticationException $e) {
-            $this->messageManager->addError(__('You have entered an invalid password for current user.'));
+            $this->messageManager->addErrorMessage(
+                __('The password entered for the current user is invalid. Verify the password and try again.')
+            );
             return $this->saveDataToSessionAndRedirect($role, $this->getRequest()->getPostValue(), $resultRedirect);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('An error occurred while saving this role.'));
+            $this->messageManager->addErrorMessage(__('An error occurred while saving this role.'));
         }
 
         return $resultRedirect->setPath('*/*/');
@@ -147,16 +147,29 @@ protected function validateUser()
     }
 
     /**
+     * Parse request value from string
+     *
+     * @param string $paramName
+     * @return array
+     */
+    private function parseRequestVariable($paramName): array
+    {
+        $value = $this->getRequest()->getParam($paramName, null);
+        parse_str($value, $value);
+        $value = array_keys($value);
+        return $value;
+    }
+
+    /**
+     * Process previous users
+     *
      * @param \Magento\Authorization\Model\Role $role
+     * @param array $oldRoleUsers
      * @return $this
      * @throws \Exception
      */
-    protected function processPreviousUsers(\Magento\Authorization\Model\Role $role)
+    protected function processPreviousUsers(\Magento\Authorization\Model\Role $role, array $oldRoleUsers): self
     {
-        $oldRoleUsers = $this->getRequest()->getParam('in_role_user_old');
-        parse_str($oldRoleUsers, $oldRoleUsers);
-        $oldRoleUsers = array_keys($oldRoleUsers);
-
         foreach ($oldRoleUsers as $oUid) {
             $this->_deleteUserFromRole($oUid, $role->getId());
         }
@@ -164,12 +177,33 @@ protected function processPreviousUsers(\Magento\Authorization\Model\Role $role)
         return $this;
     }
 
+    /**
+     * Processes users to be assigned to roles
+     *
+     * @param \Magento\Authorization\Model\Role $role
+     * @param array $roleUsers
+     * @return $this
+     */
+    private function processCurrentUsers(\Magento\Authorization\Model\Role $role, array $roleUsers): self
+    {
+        foreach ($roleUsers as $nRuid) {
+            try {
+                $this->_addUserToRole($nRuid, $role->getId());
+            } catch (LocalizedException $e) {
+                $this->messageManager->addErrorMessage($e->getMessage());
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Assign user to role
      *
      * @param int $userId
      * @param int $roleId
      * @return bool
+     * @throws LocalizedException
      */
     protected function _addUserToRole($userId, $roleId)
     {
@@ -203,6 +237,8 @@ protected function _deleteUserFromRole($userId, $roleId)
     }
 
     /**
+     * Save data to session and redirect
+     *
      * @param \Magento\Authorization\Model\Role $role
      * @param array $data
      * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
index 2bfbadd3a0d5f..e171f0a8c2bc8 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php
@@ -6,7 +6,11 @@
  */
 namespace Magento\User\Controller\Adminhtml\User;
 
-class RoleGrid extends \Magento\User\Controller\Adminhtml\User
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\User\Controller\Adminhtml\User as UserAction;
+
+class RoleGrid extends UserAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @return void
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 3b37ce10c0151..521c09f7b7707 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -3,16 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Controller\Adminhtml\User;
 
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Security\Model\SecurityCookie;
+use Magento\User\Model\Spi\NotificationExceptionInterface;
 
 /**
+ * Save admin user.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\User\Controller\Adminhtml\User
+class Save extends \Magento\User\Controller\Adminhtml\User implements HttpPostActionInterface
 {
     /**
      * @var SecurityCookie
@@ -35,7 +40,7 @@ private function getSecurityCookie()
     }
 
     /**
-     * @return void
+     * @inheritDoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -43,10 +48,14 @@ public function execute()
     {
         $userId = (int)$this->getRequest()->getParam('user_id');
         $data = $this->getRequest()->getPostValue();
+        if (array_key_exists('form_key', $data)) {
+            unset($data['form_key']);
+        }
         if (!$data) {
             $this->_redirect('adminhtml/*/');
             return;
         }
+
         /** @var $model \Magento\User\Model\User */
         $model = $this->_userFactory->create()->load($userId);
         if ($userId && $model->isObjectNew()) {
@@ -79,24 +88,30 @@ public function execute()
             && !empty($data[$currentUserPasswordField]) && is_string($data[$currentUserPasswordField]);
         try {
             if (!($isCurrentUserPasswordValid)) {
-                throw new AuthenticationException(__('You have entered an invalid password for current user.'));
+                throw new AuthenticationException(
+                    __('The password entered for the current user is invalid. Verify the password and try again.')
+                );
             }
             $currentUser->performIdentityCheck($data[$currentUserPasswordField]);
             $model->save();
 
-            $model->sendNotificationEmailsIfRequired();
-
             $this->messageManager->addSuccess(__('You saved the user.'));
             $this->_getSession()->setUserData(false);
             $this->_redirect('adminhtml/*/');
+
+            $model->sendNotificationEmailsIfRequired();
         } catch (UserLockedException $e) {
             $this->_auth->logout();
             $this->getSecurityCookie()->setLogoutReasonCookie(
                 \Magento\Security\Model\AdminSessionsManager::LOGOUT_REASON_USER_LOCKED
             );
             $this->_redirect('adminhtml/*/');
+        } catch (NotificationExceptionInterface $exception) {
+            $this->messageManager->addErrorMessage($exception->getMessage());
         } catch (\Magento\Framework\Exception\AuthenticationException $e) {
-            $this->messageManager->addError(__('You have entered an invalid password for current user.'));
+            $this->messageManager->addError(
+                __('The password entered for the current user is invalid. Verify the password and try again.')
+            );
             $this->redirectToEdit($model, $data);
         } catch (\Magento\Framework\Validator\Exception $e) {
             $messages = $e->getMessages();
@@ -111,6 +126,8 @@ public function execute()
     }
 
     /**
+     * Redirect to Edit form.
+     *
      * @param \Magento\User\Model\User $model
      * @param array $data
      * @return void
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
index c1b7e6a1110f7..6d921dfdcdd65 100644
--- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
+++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
     }
 
     /**
-     * Get admin maxiumum security failures from config
+     * Get admin maximum security failures from config
      *
      * @return int
      */
diff --git a/app/code/Magento/User/Model/Notificator.php b/app/code/Magento/User/Model/Notificator.php
new file mode 100644
index 0000000000000..3a5522db4c533
--- /dev/null
+++ b/app/code/Magento/User/Model/Notificator.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\MailException;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\User\Api\Data\UserInterface;
+use Magento\User\Model\Spi\NotificatorInterface;
+use Magento\Backend\App\ConfigInterface;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Email\Model\BackendTemplate;
+
+/**
+ * @inheritDoc
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Notificator implements NotificatorInterface
+{
+    /**
+     * @var TransportBuilder
+     */
+    private $transportBuilder;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deployConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param TransportBuilder $transportBuilder
+     * @param ConfigInterface $config
+     * @param DeploymentConfig $deployConfig
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        TransportBuilder $transportBuilder,
+        ConfigInterface $config,
+        DeploymentConfig $deployConfig,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->transportBuilder = $transportBuilder;
+        $this->config = $config;
+        $this->deployConfig = $deployConfig;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Send a notification.
+     *
+     * @param string $templateConfigId
+     * @param array $templateVars
+     * @param string $toEmail
+     * @param string $toName
+     * @throws MailException
+     *
+     * @return void
+     */
+    private function sendNotification(
+        string $templateConfigId,
+        array $templateVars,
+        string $toEmail,
+        string $toName
+    ): void {
+        $transport = $this->transportBuilder
+            ->setTemplateIdentifier($this->config->getValue($templateConfigId))
+            ->setTemplateModel(BackendTemplate::class)
+            ->setTemplateOptions([
+                'area' => FrontNameResolver::AREA_CODE,
+                'store' => Store::DEFAULT_STORE_ID
+            ])
+            ->setTemplateVars($templateVars)
+            ->setFrom(
+                $this->config->getValue('admin/emails/forgot_email_identity')
+            )
+            ->addTo($toEmail, $toName)
+            ->getTransport();
+        $transport->sendMessage();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sendForgotPassword(UserInterface $user): void
+    {
+        try {
+            $this->sendNotification(
+                'admin/emails/forgot_email_template',
+                [
+                    'user' => $user,
+                    'store' => $this->storeManager->getStore(
+                        Store::DEFAULT_STORE_ID
+                    )
+                ],
+                $user->getEmail(),
+                $user->getFirstName().' '.$user->getLastName()
+            );
+        } catch (LocalizedException $exception) {
+            throw new NotificatorException(
+                __($exception->getMessage()),
+                $exception
+            );
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sendCreated(UserInterface $user): void
+    {
+        $toEmails = [];
+        $generalEmail = $this->config->getValue(
+            'trans_email/ident_general/email'
+        );
+        if ($generalEmail) {
+            $toEmails[] = $generalEmail;
+        }
+        if ($adminEmail = $this->deployConfig->get('user_admin_email')) {
+            $toEmails[] = $adminEmail;
+        }
+
+        try {
+            foreach ($toEmails as $toEmail) {
+                $this->sendNotification(
+                    'admin/emails/new_user_notification_template',
+                    [
+                        'user' => $user,
+                        'store' => $this->storeManager->getStore(
+                            Store::DEFAULT_STORE_ID
+                        )
+                    ],
+                    $toEmail,
+                    __('Administrator')->getText()
+                );
+            }
+        } catch (LocalizedException $exception) {
+            throw new NotificatorException(
+                __($exception->getMessage()),
+                $exception
+            );
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sendUpdated(UserInterface $user, array $changed): void
+    {
+        $email = $user->getEmail();
+        if ($user instanceof User) {
+            $email = $user->getOrigData('email');
+        }
+
+        try {
+            $this->sendNotification(
+                'admin/emails/user_notification_template',
+                [
+                    'user' => $user,
+                    'store' => $this->storeManager->getStore(
+                        Store::DEFAULT_STORE_ID
+                    ),
+                    'changes' => implode(', ', $changed)
+                ],
+                $email,
+                $user->getFirstName().' '.$user->getLastName()
+            );
+        } catch (LocalizedException $exception) {
+            throw new NotificatorException(
+                __($exception->getMessage()),
+                $exception
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/User/Model/NotificatorException.php b/app/code/Magento/User/Model/NotificatorException.php
new file mode 100644
index 0000000000000..5b581879814ab
--- /dev/null
+++ b/app/code/Magento/User/Model/NotificatorException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Model;
+
+use Magento\Framework\Exception\MailException;
+use Magento\User\Model\Spi\NotificationExceptionInterface;
+
+/**
+ * When notificator cannot send an email.
+ */
+class NotificatorException extends MailException implements NotificationExceptionInterface
+{
+
+}
diff --git a/app/code/Magento/User/Model/ResourceModel/User.php b/app/code/Magento/User/Model/ResourceModel/User.php
index 880dec93fc91b..b3e4936266a3f 100644
--- a/app/code/Magento/User/Model/ResourceModel/User.php
+++ b/app/code/Magento/User/Model/ResourceModel/User.php
@@ -222,7 +222,7 @@ protected function _createUserRole($parentId, ModelUser $user)
                     'role_type' => RoleUser::ROLE_TYPE,
                     'user_id' => $user->getId(),
                     'user_type' => UserContextInterface::USER_TYPE_ADMIN,
-                    'role_name' => $user->getFirstname(),
+                    'role_name' => $user->getFirstName(),
                 ]
             );
 
diff --git a/app/code/Magento/User/Model/Spi/NotificationExceptionInterface.php b/app/code/Magento/User/Model/Spi/NotificationExceptionInterface.php
new file mode 100644
index 0000000000000..47af7cbe6dd50
--- /dev/null
+++ b/app/code/Magento/User/Model/Spi/NotificationExceptionInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Model\Spi;
+
+/**
+ * When a notification cannot be sent.
+ */
+interface NotificationExceptionInterface extends \Throwable
+{
+
+}
diff --git a/app/code/Magento/User/Model/Spi/NotificatorInterface.php b/app/code/Magento/User/Model/Spi/NotificatorInterface.php
new file mode 100644
index 0000000000000..f5e8ee68e7eed
--- /dev/null
+++ b/app/code/Magento/User/Model/Spi/NotificatorInterface.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Model\Spi;
+
+use Magento\User\Api\Data\UserInterface;
+
+/**
+ * Use to send out notifications about user related events.
+ */
+interface NotificatorInterface
+{
+    /**
+     * Send notification when a user requests password reset.
+     *
+     * @param UserInterface $user User that requested password reset.
+     * @throws NotificationExceptionInterface
+     *
+     * @return void
+     */
+    public function sendForgotPassword(UserInterface $user): void;
+
+    /**
+     * Send a notification when a new user is created.
+     *
+     * @param UserInterface $user The new user.
+     * @throws NotificationExceptionInterface
+     *
+     * @return void
+     */
+    public function sendCreated(UserInterface $user): void;
+
+    /**
+     * Send a notification when a user is updated.
+     *
+     * @param UserInterface $user The user updated.
+     * @param string[] $changed List of changed properties.
+     * @throws NotificationExceptionInterface
+     *
+     * @return void
+     */
+    public function sendUpdated(UserInterface $user, array $changed): void;
+}
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index b1b655dddd0a3..2994ac351fc78 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -3,16 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Model;
 
-use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Store\Model\Store;
 use Magento\User\Api\Data\UserInterface;
+use Magento\User\Model\Spi\NotificationExceptionInterface;
+use Magento\User\Model\Spi\NotificatorInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Admin user model
@@ -36,17 +38,28 @@
 class User extends AbstractModel implements StorageInterface, UserInterface
 {
     /**
-     * Configuration paths for email templates and identities
+     * @deprecated
+     * @see \Magento\User\Model\Spi\NotificatorInterface
      */
     const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'admin/emails/forgot_email_template';
 
+    /**
+     * @deprecated
+     * @see \Magento\User\Model\Spi\NotificatorInterface
+     */
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'admin/emails/forgot_email_identity';
 
+    /**
+     * @deprecated
+     * @see \Magento\User\Model\Spi\NotificatorInterface
+     */
     const XML_PATH_USER_NOTIFICATION_TEMPLATE = 'admin/emails/user_notification_template';
 
     /** @deprecated */
     const XML_PATH_RESET_PASSWORD_TEMPLATE = 'admin/emails/reset_password_template';
 
+    const MESSAGE_ID_PASSWORD_EXPIRED = 'magento_user_password_expired';
+
     /**
      * Model event prefix
      *
@@ -102,12 +115,12 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     protected $_encryptor;
 
     /**
-     * @var \Magento\Framework\Mail\Template\TransportBuilder
+     * @deprecated
      */
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @deprecated
      */
     protected $_storeManager;
 
@@ -121,6 +134,16 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      */
     private $serializer;
 
+    /**
+     * @var NotificatorInterface
+     */
+    private $notificator;
+
+    /**
+     * @deprecated
+     */
+    private $deploymentConfig;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -136,6 +159,8 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param Json $serializer
+     * @param DeploymentConfig|null $deploymentConfig
+     * @param NotificatorInterface|null $notificator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -152,7 +177,9 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        Json $serializer = null
+        Json $serializer = null,
+        DeploymentConfig $deploymentConfig = null,
+        ?NotificatorInterface $notificator = null
     ) {
         $this->_encryptor = $encryptor;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
@@ -163,7 +190,12 @@ public function __construct(
         $this->_transportBuilder = $transportBuilder;
         $this->_storeManager = $storeManager;
         $this->validationRules = $validationRules;
-        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->serializer = $serializer
+            ?: ObjectManager::getInstance()->get(Json::class);
+        $this->deploymentConfig = $deploymentConfig
+            ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
+        $this->notificator = $notificator
+            ?: ObjectManager::getInstance()->get(NotificatorInterface::class);
     }
 
     /**
@@ -177,6 +209,8 @@ protected function _construct()
     }
 
     /**
+     * Removing dependencies and leaving only entity's properties.
+     *
      * @return string[]
      */
     public function __sleep()
@@ -193,12 +227,18 @@ public function __sleep()
                 '_encryptor',
                 '_transportBuilder',
                 '_storeManager',
-                '_validatorBeforeSave'
+                '_validatorBeforeSave',
+                'validationRules',
+                'serializer',
+                'deploymentConfig',
+                'notificator'
             ]
         );
     }
 
     /**
+     * Restoring required objects after serialization.
+     *
      * @return void
      */
     public function __wakeup()
@@ -215,6 +255,9 @@ public function __wakeup()
         $this->_encryptor = $objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
         $this->_transportBuilder = $objectManager->get(\Magento\Framework\Mail\Template\TransportBuilder::class);
         $this->_storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->validationRules = $objectManager->get(UserValidationRules::class);
+        $this->deploymentConfig = $objectManager->get(DeploymentConfig::class);
+        $this->notificator = $objectManager->get(NotificatorInterface::class);
     }
 
     /**
@@ -233,7 +276,7 @@ public function beforeSave()
         }
 
         if ($this->getIsActive() !== null) {
-            $data['is_active'] = intval($this->getIsActive());
+            $data['is_active'] = (int)$this->getIsActive();
         }
 
         $this->addData($data);
@@ -385,7 +428,7 @@ public function deleteFromRole()
     }
 
     /**
-     * Check if such combination role/user exists
+     * Check if such combination role/user exists.
      *
      * @return bool
      */
@@ -396,28 +439,24 @@ public function roleUserExists()
     }
 
     /**
-     * Send email with reset password confirmation link
+     * Send email with reset password confirmation link.
+     *
+     * @deprecated
+     * @see NotificatorInterface::sendForgotPassword()
      *
      * @return $this
      */
     public function sendPasswordResetConfirmationEmail()
     {
-        $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
-        $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
-            ->setTemplateModel(\Magento\Email\Model\BackendTemplate::class)
-            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
-            ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
-            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
-            ->addTo($this->getEmail(), $this->getName())
-            ->getTransport();
+        $this->notificator->sendForgotPassword($this);
 
-        $transport->sendMessage();
         return $this;
     }
 
     /**
      * Send email to when password is resetting
      *
+     * @throws NotificationExceptionInterface
      * @return $this
      * @deprecated 100.1.0
      */
@@ -428,20 +467,20 @@ public function sendPasswordResetNotificationEmail()
     }
 
     /**
-     * Check changes and send notification emails
+     * Check changes and send notification emails.
      *
+     * @throws NotificationExceptionInterface
      * @return $this
      * @since 100.1.0
      */
     public function sendNotificationEmailsIfRequired()
     {
-        $changes = $this->createChangesDescriptionString();
-
-        if ($changes) {
-            if ($this->getEmail() != $this->getOrigData('email') && $this->getOrigData('email')) {
-                $this->sendUserNotificationEmail($changes, $this->getOrigData('email'));
-            }
-            $this->sendUserNotificationEmail($changes);
+        if ($this->isObjectNew()) {
+            //Notification about a new user.
+            $this->notificator->sendCreated($this);
+        } elseif ($changes = $this->createChangesDescriptionString()) {
+            //User changed.
+            $this->notificator->sendUpdated($this, explode(', ', $changes));
         }
 
         return $this;
@@ -467,7 +506,7 @@ protected function createChangesDescriptionString()
             $changes[] = __('password');
         }
 
-        if ($this->getUsername() != $this->getOrigData('username') && $this->getOrigData('username')) {
+        if ($this->getUserName() != $this->getOrigData('username') && $this->getOrigData('username')) {
             $changes[] = __('username');
         }
 
@@ -475,35 +514,21 @@ protected function createChangesDescriptionString()
     }
 
     /**
-     * Send user notification email
+     * Send user notification email.
      *
      * @param string $changes
      * @param string $email
+     * @throws NotificationExceptionInterface
      * @return $this
      * @since 100.1.0
+     * @deprecated
+     * @see NotificatorInterface::sendUpdated()
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function sendUserNotificationEmail($changes, $email = null)
     {
-        if ($email === null) {
-            $email = $this->getEmail();
-        }
+        $this->notificator->sendUpdated($this, explode(', ', $changes));
 
-        $transport = $this->_transportBuilder
-            ->setTemplateIdentifier($this->_config->getValue(self::XML_PATH_USER_NOTIFICATION_TEMPLATE))
-            ->setTemplateModel(\Magento\Email\Model\BackendTemplate::class)
-            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
-            ->setTemplateVars(
-                [
-                    'user' => $this,
-                    'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID),
-                    'changes' => $changes
-                ]
-            )
-            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
-            ->addTo($email, $this->getName())
-            ->getTransport();
-
-        $transport->sendMessage();
         return $this;
     }
 
@@ -515,7 +540,7 @@ protected function sendUserNotificationEmail($changes, $email = null)
      */
     public function getName($separator = ' ')
     {
-        return $this->getFirstname() . $separator . $this->getLastname();
+        return $this->getFirstName() . $separator . $this->getLastName();
     }
 
     /**
@@ -547,7 +572,7 @@ public function authenticate($username, $password)
                 ['username' => $username, 'user' => $this]
             );
             $this->loadByUsername($username);
-            $sensitive = $config ? $username == $this->getUsername() : true;
+            $sensitive = $config ? $username == $this->getUserName() : true;
             if ($sensitive && $this->getId()) {
                 $result = $this->verifyIdentity($password);
             }
@@ -580,11 +605,14 @@ public function verifyIdentity($password)
         if ($this->_encryptor->validateHash($password, $this->getPassword())) {
             if ($this->getIsActive() != '1') {
                 throw new AuthenticationException(
-                    __('You did not sign in correctly or your account is temporarily disabled.')
+                    __(
+                        'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                    )
                 );
             }
             if (!$this->hasAssigned2Role($this->getId())) {
-                throw new AuthenticationException(__('You need more permissions to access this.'));
+                throw new AuthenticationException(__('More permissions are needed to access this.'));
             }
             $result = true;
         }
@@ -669,7 +697,9 @@ protected function _getEncodedPassword($password)
     public function changeResetPasswordLinkToken($newToken)
     {
         if (!is_string($newToken) || empty($newToken)) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please correct the password reset token.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('The password reset token is incorrect. Verify the token and try again.')
+            );
         }
         $this->setRpToken($newToken);
         $this->setRpTokenCreatedAt((new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT));
@@ -730,7 +760,7 @@ public function setHasAvailableResources($hasResources)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getFirstName()
     {
@@ -738,7 +768,7 @@ public function getFirstName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setFirstName($firstName)
     {
@@ -746,7 +776,7 @@ public function setFirstName($firstName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getLastName()
     {
@@ -754,7 +784,7 @@ public function getLastName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setLastName($lastName)
     {
@@ -762,7 +792,7 @@ public function setLastName($lastName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getEmail()
     {
@@ -770,7 +800,7 @@ public function getEmail()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setEmail($email)
     {
@@ -778,7 +808,7 @@ public function setEmail($email)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getUserName()
     {
@@ -786,7 +816,7 @@ public function getUserName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setUserName($userName)
     {
@@ -794,7 +824,7 @@ public function setUserName($userName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getPassword()
     {
@@ -802,7 +832,7 @@ public function getPassword()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setPassword($password)
     {
@@ -810,7 +840,7 @@ public function setPassword($password)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getCreated()
     {
@@ -818,7 +848,7 @@ public function getCreated()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setCreated($created)
     {
@@ -826,7 +856,7 @@ public function setCreated($created)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getModified()
     {
@@ -834,7 +864,7 @@ public function getModified()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setModified($modified)
     {
@@ -842,7 +872,7 @@ public function setModified($modified)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getIsActive()
     {
@@ -850,7 +880,7 @@ public function getIsActive()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setIsActive($isActive)
     {
@@ -858,7 +888,7 @@ public function setIsActive($isActive)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getInterfaceLocale()
     {
@@ -866,7 +896,7 @@ public function getInterfaceLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function setInterfaceLocale($interfaceLocale)
     {
@@ -903,13 +933,13 @@ public function performIdentityCheck($passwordString)
         $clonedUser->reload();
         if ($clonedUser->getLockExpires()) {
             throw new \Magento\Framework\Exception\State\UserLockedException(
-                __('Your account is temporarily disabled.')
+                __('Your account is temporarily disabled. Please try again later.')
             );
         }
 
         if (!$isCheckSuccessful) {
             throw new \Magento\Framework\Exception\AuthenticationException(
-                __('You have entered an invalid password for current user.')
+                __('The password entered for the current user is invalid. Verify the password and try again.')
             );
         }
 
diff --git a/app/code/Magento/User/Model/UserValidationRules.php b/app/code/Magento/User/Model/UserValidationRules.php
index b878d60356300..e40c785749e03 100644
--- a/app/code/Magento/User/Model/UserValidationRules.php
+++ b/app/code/Magento/User/Model/UserValidationRules.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Model;
 
 use Magento\Framework\Validator\EmailAddress;
@@ -32,13 +33,25 @@ class UserValidationRules
     public function addUserInfoRules(\Magento\Framework\Validator\DataObject $validator)
     {
         $userNameNotEmpty = new NotEmpty();
-        $userNameNotEmpty->setMessage(__('User Name is a required field.'), \Zend_Validate_NotEmpty::IS_EMPTY);
+        $userNameNotEmpty->setMessage(
+            __('"User Name" is required. Enter and try again.'),
+            \Zend_Validate_NotEmpty::IS_EMPTY
+        );
         $firstNameNotEmpty = new NotEmpty();
-        $firstNameNotEmpty->setMessage(__('First Name is a required field.'), \Zend_Validate_NotEmpty::IS_EMPTY);
+        $firstNameNotEmpty->setMessage(
+            __('"First Name" is required. Enter and try again.'),
+            \Zend_Validate_NotEmpty::IS_EMPTY
+        );
         $lastNameNotEmpty = new NotEmpty();
-        $lastNameNotEmpty->setMessage(__('Last Name is a required field.'), \Zend_Validate_NotEmpty::IS_EMPTY);
+        $lastNameNotEmpty->setMessage(
+            __('"Last Name" is required. Enter and try again.'),
+            \Zend_Validate_NotEmpty::IS_EMPTY
+        );
         $emailValidity = new EmailAddress();
-        $emailValidity->setMessage(__('Please enter a valid email.'), \Zend_Validate_EmailAddress::INVALID);
+        $emailValidity->setMessage(
+            __('Please enter a valid email.'),
+            \Zend_Validate_EmailAddress::INVALID
+        );
 
         /** @var $validator \Magento\Framework\Validator\DataObject */
         $validator->addRule(
diff --git a/app/code/Magento/User/Observer/Backend/AuthObserver.php b/app/code/Magento/User/Observer/Backend/AuthObserver.php
index bc5d6af615f13..06b15a477d84d 100644
--- a/app/code/Magento/User/Observer/Backend/AuthObserver.php
+++ b/app/code/Magento/User/Observer/Backend/AuthObserver.php
@@ -125,7 +125,10 @@ public function execute(EventObserver $observer)
             $lockExpires = new \DateTime($lockExpires);
             if ($lockExpires > new \DateTime()) {
                 throw new UserLockedException(
-                    __('You did not sign in correctly or your account is temporarily disabled.')
+                    __(
+                        'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                    )
                 );
             }
         }
@@ -149,7 +152,7 @@ public function execute(EventObserver $observer)
     /**
      * Update locking information for the user
      *
-     * @param \Magento\User\Model\User $user
+     * @param User $user
      * @return void
      */
     private function _updateLockingInformation($user)
@@ -195,10 +198,16 @@ private function _checkExpiredPassword($latestPassword)
                 $myAccountUrl = $this->url->getUrl('adminhtml/system_account/');
                 $message = __('It\'s time to <a href="%1">change your password</a>.', $myAccountUrl);
             }
+
+            $messages = $this->messageManager->getMessages();
+
+            // Remove existing messages with same ID to avoid duplication
+            $messages->deleteMessageByIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED);
+
             $this->messageManager->addNoticeMessage($message);
-            $message = $this->messageManager->getMessages()->getLastAddedMessage();
+            $message = $messages->getLastAddedMessage();
             if ($message) {
-                $message->setIdentifier('magento_user_password_expired')->setIsSticky(true);
+                $message->setIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED)->setIsSticky(true);
                 $this->authSession->setPciAdminUserIsPasswordExpired(true);
             }
         }
diff --git a/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php b/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php
index 7d96c1c3b0d62..bfa9b064b8fb0 100644
--- a/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php
+++ b/app/code/Magento/User/Observer/Backend/ForceAdminPasswordChangeObserver.php
@@ -108,6 +108,7 @@ public function execute(EventObserver $observer)
             'adminhtml_system_account_index',
             'adminhtml_system_account_save',
             'adminhtml_auth_logout',
+            'mui_index_render'
         ];
         /** @var \Magento\Framework\App\Action\Action $controller */
         $controller = $observer->getEvent()->getControllerAction();
diff --git a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
index 09605372df181..059879ab9613f 100644
--- a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
+++ b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\User\Model\User;
 
 /**
  * User backend observer model for passwords
@@ -74,7 +75,7 @@ public function execute(EventObserver $observer)
             $passwordHash = $user->getPassword();
             if ($passwordHash && !$user->getForceNewPassword()) {
                 $this->userResource->trackPassword($user, $passwordHash);
-                $this->messageManager->getMessages()->deleteMessageByIdentifier('magento_user_password_expired');
+                $this->messageManager->getMessages()->deleteMessageByIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED);
                 $this->authSession->unsPciAdminUserIsPasswordExpired();
             }
         }
diff --git a/app/code/Magento/User/Setup/InstallSchema.php b/app/code/Magento/User/Setup/InstallSchema.php
deleted file mode 100644
index 9e006a6f21bd2..0000000000000
--- a/app/code/Magento/User/Setup/InstallSchema.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\User\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'admin_user'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('admin_user')
-        )->addColumn(
-            'user_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'User ID'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true],
-            'User First Name'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            ['nullable' => true],
-            'User Last Name'
-        )->addColumn(
-            'email',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            128,
-            ['nullable' => true],
-            'User Email'
-        )->addColumn(
-            'username',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true],
-            'User Login'
-        )->addColumn(
-            'password',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'User Password'
-        )->addColumn(
-            'created',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'User Created Time'
-        )->addColumn(
-            'modified',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'User Modified Time'
-        )->addColumn(
-            'logdate',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'User Last Login Time'
-        )->addColumn(
-            'lognum',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'User Login Number'
-        )->addColumn(
-            'reload_acl_flag',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Reload ACL'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '1'],
-            'User Is Active'
-        )->addColumn(
-            'extra',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'User Extra Data'
-        )->addColumn(
-            'rp_token',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            256,
-            ['nullable' => true, 'default' => null],
-            'Reset Password Link Token'
-        )->addColumn(
-            'rp_token_created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Reset Password Link Token Creation Date'
-        )->addColumn(
-            'interface_locale',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            16,
-            ['nullable' => false, 'default' => 'en_US'],
-            'Backend interface locale'
-        )->addColumn(
-            'failures_num',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => true, 'default' => '0'],
-            'Failure Number'
-        )->addColumn(
-            'first_failure',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'First Failure'
-        )->addColumn(
-            'lock_expires',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Expiration Lock Dates'
-        )->addIndex(
-            $installer->getIdxName(
-                'admin_user',
-                ['username'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['username'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->setComment(
-            'Admin User Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'admin_passwords'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('admin_passwords')
-        )->addColumn(
-            'password_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Password Id'
-        )->addColumn(
-            'user_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'User Id'
-        )->addColumn(
-            'password_hash',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            100,
-            [],
-            'Password Hash'
-        )->addColumn(
-            'expires',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Deprecated'
-        )->addColumn(
-            'last_updated',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Last Updated'
-        )->addIndex(
-            $installer->getIdxName('admin_passwords', ['user_id']),
-            ['user_id']
-        )->addForeignKey(
-            $installer->getFkName('admin_passwords', 'user_id', 'admin_user', 'user_id'),
-            'user_id',
-            $installer->getTable('admin_user'),
-            'user_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Admin Passwords'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php b/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php
new file mode 100644
index 0000000000000..0359d9b049940
--- /dev/null
+++ b/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Setup\Patch\Data;
+
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpgradePasswordHashes
+ * @package Magento\User\Setup\Patch
+ */
+class UpgradePasswordHashes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->upgradeHash();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Upgrade password hashes.
+     */
+    private function upgradeHash()
+    {
+        $connection = $this->moduleDataSetup->getConnection();
+        $customerEntityTable = $this->moduleDataSetup->getTable('admin_user');
+
+        $select = $connection->select()->from(
+            $customerEntityTable,
+            ['user_id', 'password']
+        );
+
+        $customers = $connection->fetchAll($select);
+        foreach ($customers as $customer) {
+            list($hash, $salt) = explode(Encryptor::DELIMITER, $customer['password']);
+
+            $newHash = $customer['password'];
+            if (strlen($hash) === 32) {
+                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_MD5]);
+            } elseif (strlen($hash) === 64) {
+                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_SHA256]);
+            }
+
+            $bind = ['password' => $newHash];
+            $where = ['user_id = ?' => (int)$customer['user_id']];
+            $connection->update($customerEntityTable, $bind, $where);
+        }
+    }
+}
diff --git a/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php b/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php
new file mode 100644
index 0000000000000..78c250e441406
--- /dev/null
+++ b/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Setup\Patch\Data;
+
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpgradeSerializedFields
+ * @package Magento\User\Setup\Patch
+ */
+class UpgradeSerializedFields implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * UpgradeSerializedFields constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        FieldDataConverterFactory $fieldDataConverterFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->upgradeSerializedFields();
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpgradePasswordHashes::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert serialized data to json.
+     */
+    private function upgradeSerializedFields()
+    {
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $fieldDataConverter->convert(
+            $this->moduleDataSetup->getConnection(),
+            $this->moduleDataSetup->getTable('admin_user'),
+            'user_id',
+            'extra'
+        );
+    }
+}
diff --git a/app/code/Magento/User/Setup/UpgradeData.php b/app/code/Magento/User/Setup/UpgradeData.php
deleted file mode 100644
index 805eb152e77e6..0000000000000
--- a/app/code/Magento/User/Setup/UpgradeData.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\User\Setup;
-
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * UpgradeData constructor.
-     *
-     * @param FieldDataConverterFactory $fieldDataConverterFactory
-     */
-    public function __construct(
-        FieldDataConverterFactory $fieldDataConverterFactory
-    ) {
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->upgradeHash($setup);
-        }
-
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $this->upgradeSerializedFields($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeHash($setup)
-    {
-        $customerEntityTable = $setup->getTable('admin_user');
-
-        $select = $setup->getConnection()->select()->from(
-            $customerEntityTable,
-            ['user_id', 'password']
-        );
-
-        $customers = $setup->getConnection()->fetchAll($select);
-        foreach ($customers as $customer) {
-            list($hash, $salt) = explode(Encryptor::DELIMITER, $customer['password']);
-
-            $newHash = $customer['password'];
-            if (strlen($hash) === 32) {
-                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_MD5]);
-            } elseif (strlen($hash) === 64) {
-                $newHash = implode(Encryptor::DELIMITER, [$hash, $salt, Encryptor::HASH_VERSION_SHA256]);
-            }
-
-            $bind = ['password' => $newHash];
-            $where = ['user_id = ?' => (int)$customer['user_id']];
-            $setup->getConnection()->update($customerEntityTable, $bind, $where);
-        }
-    }
-
-    /**
-     * Convert serialized data in fields to json format
-     *
-     * @param ModuleDataSetupInterface $setup
-     *
-     * @return void
-     */
-    private function upgradeSerializedFields($setup)
-    {
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('admin_user'),
-            'user_id',
-            'extra'
-        );
-    }
-}
diff --git a/app/code/Magento/User/Setup/UpgradeSchema.php b/app/code/Magento/User/Setup/UpgradeSchema.php
deleted file mode 100644
index 24a17ce06ff87..0000000000000
--- a/app/code/Magento/User/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\User\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '2.0.3', '<')) {
-            $this->addFailuresToAdminUserTable($setup);
-            $this->createAdminPasswordsTable($setup);
-        }
-
-        $setup->endSetup();
-    }
-
-    /**
-     * Adds 'failures_num', 'first_failure', and 'lock_expires' columns to 'admin_user' table
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function addFailuresToAdminUserTable(SchemaSetupInterface $setup)
-    {
-        $tableAdmins = $setup->getTable('admin_user');
-
-        $setup->getConnection()->addColumn(
-            $tableAdmins,
-            'failures_num',
-            [
-                'type' => Table::TYPE_SMALLINT,
-                'nullable' => true,
-                'default' => 0,
-                'comment' => 'Failure Number'
-            ]
-        );
-        $setup->getConnection()->addColumn(
-            $tableAdmins,
-            'first_failure',
-            [
-                'type' => Table::TYPE_TIMESTAMP,
-                'comment' => 'First Failure'
-            ]
-        );
-        $setup->getConnection()->addColumn(
-            $tableAdmins,
-            'lock_expires',
-            [
-                'type' => Table::TYPE_TIMESTAMP,
-                'comment' => 'Expiration Lock Dates'
-            ]
-        );
-    }
-
-    /**
-     * Create table 'admin_passwords'
-     *
-     * @param SchemaSetupInterface $setup
-     * @return void
-     */
-    private function createAdminPasswordsTable(SchemaSetupInterface $setup)
-    {
-        if ($setup->tableExists($setup->getTable('admin_passwords'))) {
-            return;
-        }
-
-        $table = $setup->getConnection()
-            ->newTable($setup->getTable('admin_passwords'))
-            ->addColumn(
-                'password_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Password Id'
-            )
-            ->addColumn(
-                'user_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'User Id'
-            )
-            ->addColumn(
-                'password_hash',
-                Table::TYPE_TEXT,
-                100,
-                [],
-                'Password Hash'
-            )
-            ->addColumn(
-                'expires',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Deprecated'
-            )
-            ->addColumn(
-                'last_updated',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Last Updated'
-            )
-            ->addIndex(
-                $setup->getIdxName('admin_passwords', ['user_id']),
-                ['user_id']
-            )
-            ->addForeignKey(
-                $setup->getFkName('admin_passwords', 'user_id', 'admin_user', 'user_id'),
-                'user_id',
-                $setup->getTable('admin_user'),
-                'user_id',
-                Table::ACTION_CASCADE
-            )
-            ->setComment('Admin Passwords');
-
-        $setup->getConnection()->createTable($table);
-
-        $setup->getConnection()->modifyColumn(
-            $setup->getTable('admin_passwords'),
-            'expires',
-            [
-                'type' => Table::TYPE_INTEGER,
-                'unsigned' => true,
-                'nullable' => false,
-                'default' => '0',
-                'comment' => 'Deprecated',
-            ]
-        );
-    }
-}
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
new file mode 100644
index 0000000000000..9a0fa4a205799
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateUserActionGroup">
+        <arguments>
+            <argument name="role"/>
+            <argument name="User" defaultValue="admin2"/>
+        </arguments>
+        <amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{admin2.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{admin2.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{admin2.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{admin2.username}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{admin2.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{admin2.password}}" stepKey="confirmPassword" />
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
+        <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole" />
+        <fillField selector="{{AdminEditUserRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
+        <click selector="{{AdminEditUserRoleSection.searchButton}}" stepKey="clickSearch" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
+        <click selector="{{AdminEditUserRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
+        <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveUser" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+
+    <!--Create new user with role-->
+    <actionGroup name="AdminCreateUserWithRoleActionGroup">
+        <arguments>
+            <argument name="role"/>
+            <argument name="user" defaultValue="newAdmin"/>
+        </arguments>
+        <amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
+        <waitForPageLoad stepKey="waitForUsersPage" />
+        <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{user.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminCreateUserSection.lastNameTextField}}" userInput="{{user.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminCreateUserSection.emailTextField}}" userInput="{{user.username}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{user.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{user.password}}" stepKey="confirmPassword" />
+        <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
+        <click stepKey="clickUserRole" selector="{{AdminCreateUserSection.userRoleTab}}"/>
+        <click stepKey="chooseRole" selector="{{AdminStoreSection.createdRoleInUserPage(role.name)}}"/>
+        <click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
+        <waitForPageLoad stepKey="waitForSaveTheUser" />
+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
new file mode 100644
index 0000000000000..7f1ed3be1ca57
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCreatedUserActionGroup">
+        <arguments>
+            <argument name="user"/>
+        </arguments>
+        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.username)}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForConfirmationPopup"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
+        <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
new file mode 100644
index 0000000000000..70c0a772ec341
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCustomUserActionGroup">
+        <arguments>
+            <argument name="user"/>
+        </arguments>
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser" />
+        <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
+        <waitForPageLoad stepKey="waitForUserEditPageLoad"/>
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteUser"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForSave" />
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the user." stepKey="seeUserDeleteMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
new file mode 100644
index 0000000000000..d8a6a60299f8e
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="GoToUserRoles">
+        <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
+        <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
+        <click selector="//span[contains(text(), 'User Roles')]" stepKey="clickToSelectUserRoles"/>
+        <waitForPageLoad stepKey="waitForUserRolesPageToOpen"/>
+    </actionGroup>
+
+    <!--Create new role-->
+    <actionGroup name="AdminCreateRole">
+        <arguments>
+            <argument name="role" type="string" defaultValue=""/>
+            <argument name="resource" type="string" defaultValue="All"/>
+        </arguments>
+        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
+        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
+        <click selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
+        <click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You saved the role." stepKey="seeSuccessMessage" />
+    </actionGroup>
+
+
+    <!--Delete role-->
+    <actionGroup name="AdminDeleteRoleActionGroup">
+        <arguments>
+            <argument name="role" defaultValue=""/>
+        </arguments>
+        <click stepKey="clickOnRole" selector="{{AdminDeleteRoleSection.theRole}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
+        <waitForAjaxLoad stepKey="waitForDeleteConfirmationPopup" time="5"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
new file mode 100644
index 0000000000000..3e776df9fb97f
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <!--Go to all users-->
+    <actionGroup name="GoToAllUsers">
+        <click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
+        <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
+        <click selector="{{AdminCreateUserSection.allUsers}}" stepKey="clickToSelectUserRoles"/>
+        <waitForPageLoad stepKey="waitForUserRolesPageToOpen"/>
+    </actionGroup>
+
+    <!--Create new user with specified role-->
+    <actionGroup name="AdminCreateUserAction">
+        <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
+        <waitForPageLoad stepKey="waitForNewUserPageLoad" time="10"/>
+        <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{NewAdmin.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{NewAdmin.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminCreateUserSection.lastNameTextField}}" userInput="{{NewAdmin.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminCreateUserSection.emailTextField}}" userInput="{{NewAdmin.email}}" stepKey="enterEmail" />
+        <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{NewAdmin.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{NewAdmin.password}}" stepKey="confirmPassword" />
+        <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
+        <click selector="{{AdminCreateUserSection.userRoleTab}}" stepKey="clickUserRole" />
+        <waitForAjaxLoad stepKey="waitForRoles" time="5"/>
+        <fillField selector="{{AdminCreateRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
+        <click selector="{{AdminCreateRoleSection.searchButton}}" stepKey="clickSearch" />
+        <waitForPageLoad stepKey="waitForSearch" time="10"/>
+        <click selector="{{AdminCreateRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
+        <click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
+        <waitForPageLoad stepKey="waitForSaveUser" time="10"/>
+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+
+
+    <!--Delete User-->
+    <actionGroup name="AdminDeleteUserActionGroup">
+        <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
+        <waitForPageLoad stepKey="waitForUserPageToLoad"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
new file mode 100644
index 0000000000000..80c1cc3022964
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="admin" type="user">
+        <data key="email">admin@magento.com</data>
+        <data key="password">admin123</data>
+    </entity>
+    <entity name="admin2" type="user">
+        <data key="username" unique="suffix">admin</data>
+        <data key="firstName">John</data>
+        <data key="lastName">Smith</data>
+        <data key="password">admin123</data>
+    </entity>
+    <entity name="Admin3" type="user">
+        <data key="username" unique="suffix">admin3</data>
+        <data key="firstname">admin3</data>
+        <data key="lastname">admin3</data>
+        <data key="email" unique="prefix">admin3WebUser@example.com</data>
+        <data key="password">123123q</data>
+        <data key="password_confirmation">123123q</data>
+        <data key="interface_local">en_US</data>
+        <data key="is_active">true</data>
+        <data key="current_password">123123q</data>
+        <array key="roles">
+            <item>1</item>
+        </array>
+    </entity>
+</entities>
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
new file mode 100644
index 0000000000000..641b692adea5c
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="adminRole" type="role">
+        <data key="name" unique="suffix">adminRole</data>
+        <data key="scope">1</data>
+        <data key="access">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/User/Test/Mftf/LICENSE.txt b/app/code/Magento/User/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/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/User/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/User/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/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/User/Test/Mftf/Metadata/user-meta.xml b/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
new file mode 100644
index 0000000000000..1ee29be6b3d76
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateUser" dataType="user" type="create"
+               auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
+        <contentType>application/x-www-form-urlencoded</contentType>
+        <field key="username">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="password">string</field>
+        <field key="password_confirmation">string</field>
+        <field key="interface_locale">string</field>
+        <field key="is_active">boolean</field>
+        <field key="current_password">string</field>
+        <array key="roles">
+            <value>string</value>
+        </array>
+    </operation>
+</operations>
diff --git a/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml b/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml
new file mode 100644
index 0000000000000..9d0132453c798
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateUserRole" dataType="user_role" type="create"
+               auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
+        <contentType>application/x-www-form-urlencoded</contentType>
+        <field key="rolename">string</field>
+        <field key="current_password">string</field>
+        <array key="resource">
+            <value>string</value>
+        </array>
+    </operation>
+</operations>
diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
new file mode 100644
index 0000000000000..5b94553e398c5
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminEditRolePage" url="admin/user_role/editrole" module="Magento_User" area="admin">
+        <section name="AdminEditRoleInfoSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
new file mode 100644
index 0000000000000..ae965fa1c48e7
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminEditUserPage" url="admin/user/new" area="admin" module="Magento_User">
+        <section name="AdminEditUserSection"/>
+        <section name="AdminEditUserRoleSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
new file mode 100644
index 0000000000000..e3b0c55f99cc1
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminRolesPage" url="admin/user_role/" module="Magento_User" area="admin">
+        <section name="AdminRoleGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
new file mode 100644
index 0000000000000..ceb05ec7bd9c8
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminUsersPage" url="admin/user/" area="admin" module="Magento_User">
+        <section name="AdminUserGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/User/Test/Mftf/README.md b/app/code/Magento/User/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fbf07c88d5a9c
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# User Functional Tests
+
+The Functional Test Module for **Magento User** module.
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
new file mode 100644
index 0000000000000..e30a545649d12
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditRoleInfoSection">
+        <element name="roleName" type="input" selector="#role_name"/>
+        <element name="password" type="input" selector="#current_password"/>
+        <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
+        <element name="backButton" type="button" selector="button[title='Back']"/>
+        <element name="resetButton" type="button" selector="button[title='Reset']"/>
+        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
+        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
+        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
new file mode 100644
index 0000000000000..8f6f2352ff01b
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditUserRoleSection">
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
new file mode 100644
index 0000000000000..5b866b45e2fbe
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditUserSection">
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
+        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
+        <element name="emailTextField" type="input" selector="#user_email"/>
+        <element name="passwordTextField" type="input" selector="#user_password"/>
+        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
+        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+        <element name="saveButton" type="button" selector="#save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
new file mode 100644
index 0000000000000..6db6858500342
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminRoleGridSection">
+        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
+        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
new file mode 100644
index 0000000000000..f429c390efe6b
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminUserGridSection">
+        <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="usernameInFirstRow" type="text" selector=".col-username"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+        <element name="successMessage" type="text" selector=".message-success"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
index ff0873c369075..1cc0cd54c60eb 100644
--- a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
+++ b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
@@ -176,7 +176,7 @@ public function testClearUserRoles()
         $this->model->_clearUserRoles($this->userMock);
     }
 
-    public function testDeleteSucess()
+    public function testDeleteSuccess()
     {
         $uid = 123;
         $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->dbAdapterMock);
@@ -330,7 +330,7 @@ public function testDeleteFromRole()
         $roleId = 44;
         $methodUserMock->expects($this->once())->method('getUserId')->willReturn($uid);
         $this->resourceMock->expects($this->atLeastOnce())->method('getConnection')->willReturn($this->dbAdapterMock);
-        $methodUserMock->expects($this->atleastOnce())->method('getRoleId')->willReturn($roleId);
+        $methodUserMock->expects($this->atLeastOnce())->method('getRoleId')->willReturn($roleId);
         $this->dbAdapterMock->expects($this->once())->method('delete');
 
         $this->assertInstanceOf(
diff --git a/app/code/Magento/User/Test/Unit/Model/UserTest.php b/app/code/Magento/User/Test/Unit/Model/UserTest.php
index 3f02cedd32e65..670316c2500fc 100644
--- a/app/code/Magento/User/Test/Unit/Model/UserTest.php
+++ b/app/code/Magento/User/Test/Unit/Model/UserTest.php
@@ -6,7 +6,9 @@
 
 namespace Magento\User\Test\Unit\Model;
 
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\User\Helper\Data as UserHelper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\User\Model\User;
 
 /**
  * Test class for \Magento\User\Model\User testing
@@ -16,55 +18,11 @@
  */
 class UserTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\User\Model\User */
-    protected $model;
+    /** @var User */
+    private $model;
 
-    /** @var \Magento\User\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $userDataMock;
-
-    /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
-    protected $transportBuilderMock;
-
-    /** @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $contextMock;
-
-    /** @var \Magento\User\Model\ResourceModel\User|\PHPUnit_Framework_MockObject_MockObject */
-    protected $resourceMock;
-
-    /** @var \Magento\Framework\Data\Collection\AbstractDb|\PHPUnit_Framework_MockObject_MockObject */
-    protected $collectionMock;
-
-    /** @var \Magento\Framework\Mail\TransportInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $transportMock;
-
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManagerMock;
-
-    /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storetMock;
-
-    /** @var \Magento\Backend\App\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $configMock;
-
-    /** @var \Magento\Framework\Encryption\EncryptorInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $encryptorMock;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManagerMock;
-
-    /** @var \Magento\Framework\Validator\DataObjectFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $validatorObjectFactoryMock;
-
-    /** @var \Magento\User\Model\UserValidationRules|\PHPUnit_Framework_MockObject_MockObject */
-    protected $validationRulesMock;
-
-    /** @var \Magento\Authorization\Model\RoleFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $roleFactoryMock;
-
-    /**
-     * @var Json|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $serializer;
+    /** @var UserHelper|\PHPUnit_Framework_MockObject_MockObject */
+    private $userDataMock;
 
     /**
      * Set required values
@@ -72,311 +30,20 @@ class UserTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->userDataMock = $this->getMockBuilder(\Magento\User\Helper\Data::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->contextMock = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->resourceMock = $this->getMockBuilder(\Magento\User\Model\ResourceModel\User::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $coreRegistry = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['dispatch'])
-            ->getMockForAbstractClass();
-        $this->validatorObjectFactoryMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObjectFactory::class)
-            ->disableOriginalConstructor()->setMethods(['create'])
-            ->getMock();
-        $this->roleFactoryMock = $this->getMockBuilder(\Magento\Authorization\Model\RoleFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->transportMock = $this->getMockBuilder(\Magento\Framework\Mail\TransportInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->transportBuilderMock = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->storetMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
-        $this->configMock = $this->getMockBuilder(\Magento\Backend\App\ConfigInterface::class)
+        $this->userDataMock = $this->getMockBuilder(UserHelper::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
 
-        $this->validationRulesMock = $this->getMockBuilder(\Magento\User\Model\UserValidationRules::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
-        $this->encryptorMock = $this->getMockBuilder(\Magento\Framework\Encryption\EncryptorInterface::class)
-            ->setMethods(['validateHash'])
-            ->getMockForAbstractClass();
-
-        $this->serializer = $this->createPartialMock(Json::class, ['serialize', 'unserialize']);
-
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManagerHelper = new ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
-            \Magento\User\Model\User::class,
+            User::class,
             [
-                'eventManager' => $this->eventManagerMock,
                 'userData' => $this->userDataMock,
-                'registry' => $coreRegistry,
-                'resource' => $this->resourceMock,
-                'resourceCollection' => $this->collectionMock,
-                'validatorObjectFactory' => $this->validatorObjectFactoryMock,
-                'roleFactory' => $this->roleFactoryMock,
-                'transportBuilder' => $this->transportBuilderMock,
-                'storeManager' => $this->storeManagerMock,
-                'validationRules' => $this->validationRulesMock,
-                'config' => $this->configMock,
-                'encryptor' => $this->encryptorMock,
-                'serializer' => $this->serializer
             ]
         );
     }
 
-    /**
-     * @return void
-     */
-    public function testSendNotificationEmailsIfRequired()
-    {
-        $storeId = 0;
-        $email = 'test1@example.com';
-        $origEmail = 'test2@example.com';
-
-        $password = '1234567';
-        $origPassword = '123456789';
-
-        $username = 'admin1';
-        $origUsername = 'admin2';
-
-        $firstName = 'Foo';
-        $lastName = 'Bar';
-
-        $changes = __('email') . ', ' . __('password') . ', ' . __('username');
-
-        $this->model->setEmail($email);
-        $this->model->setOrigData('email', $origEmail);
-
-        $this->model->setPassword($password);
-        $this->model->setOrigData('password', $origPassword);
-
-        $this->model->setUsername($username);
-        $this->model->setOrigData('username', $origUsername);
-
-        $this->model->setFirstname($firstName);
-        $this->model->setLastname($lastName);
-
-        $this->configMock->expects($this->exactly(4))
-            ->method('getValue')
-            ->withConsecutive(
-                [\Magento\User\Model\User::XML_PATH_USER_NOTIFICATION_TEMPLATE],
-                [\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY],
-                [\Magento\User\Model\User::XML_PATH_USER_NOTIFICATION_TEMPLATE],
-                [\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY]
-            )->willReturnOnConsecutiveCalls(
-                'templateId',
-                'sender',
-                'templateId',
-                'sender'
-            );
-
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('setTemplateModel')
-            ->with($this->equalTo(\Magento\Email\Model\BackendTemplate::class))
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('setTemplateOptions')
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('setTemplateVars')
-            ->with(['user' => $this->model, 'store' => $this->storetMock, 'changes' => $changes])
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('addTo')
-            ->withConsecutive(
-                $this->equalTo($email),
-                $this->equalTo($firstName . ' ' . $lastName),
-                $this->equalTo($origEmail),
-                $this->equalTo($firstName . ' ' . $lastName)
-            )
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('setFrom')
-            ->with('sender')
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('setTemplateIdentifier')
-            ->with('templateId')
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->exactly(2))
-            ->method('getTransport')
-            ->willReturn($this->transportMock);
-        $this->transportMock->expects($this->exactly(2))->method('sendMessage');
-
-        $this->storeManagerMock->expects($this->exactly(2))
-            ->method('getStore')
-            ->with($storeId)
-            ->willReturn($this->storetMock);
-
-        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->sendNotificationEmailsIfRequired());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSendPasswordResetConfirmationEmail()
-    {
-        $storeId = 0;
-        $email = 'test@example.com';
-        $firstName = 'Foo';
-        $lastName = 'Bar';
-
-        $this->model->setEmail($email);
-        $this->model->setFirstname($firstName);
-        $this->model->setLastname($lastName);
-
-        $this->configMock->expects($this->at(0))
-            ->method('getValue')
-            ->with(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_TEMPLATE)
-            ->willReturn('templateId');
-        $this->configMock->expects($this->at(1))
-            ->method('getValue')
-            ->with(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY)
-            ->willReturn('sender');
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateModel')
-            ->with($this->equalTo(\Magento\Email\Model\BackendTemplate::class))
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateOptions')
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateVars')
-            ->with(['user' => $this->model, 'store' => $this->storetMock])
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('addTo')
-            ->with($this->equalTo($email), $this->equalTo($firstName . ' ' . $lastName))
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setFrom')
-            ->with('sender')
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->with('templateId')
-            ->willReturnSelf();
-        $this->transportBuilderMock->expects($this->once())
-            ->method('getTransport')
-            ->willReturn($this->transportMock);
-        $this->transportMock->expects($this->once())->method('sendMessage');
-
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
-            ->with($storeId)
-            ->willReturn($this->storetMock);
-
-        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->sendPasswordResetConfirmationEmail());
-    }
-
-    /**
-     * @return void
-     */
-    public function testVerifyIdentity()
-    {
-        $password = 'password';
-        $this->encryptorMock
-            ->expects($this->once())
-            ->method('validateHash')
-            ->with($password, $this->model->getPassword())
-            ->willReturn(true);
-        $this->model->setIsActive(true);
-        $this->resourceMock->expects($this->once())->method('hasAssigned2Role')->willReturn(true);
-        $this->assertTrue(
-            $this->model->verifyIdentity($password),
-            'Identity verification failed while should have passed.'
-        );
-    }
-
-    /**
-     * @return void
-     */
-    public function testVerifyIdentityFailure()
-    {
-        $password = 'password';
-        $this->encryptorMock
-            ->expects($this->once())
-            ->method('validateHash')
-            ->with($password, $this->model->getPassword())
-            ->willReturn(false);
-        $this->assertFalse(
-            $this->model->verifyIdentity($password),
-            'Identity verification passed while should have failed.'
-        );
-    }
-
-    /**
-     * @return void
-     */
-    public function testVerifyIdentityInactiveRecord()
-    {
-        $password = 'password';
-        $this->encryptorMock
-            ->expects($this->once())
-            ->method('validateHash')
-            ->with($password, $this->model->getPassword())
-            ->willReturn(true);
-        $this->model->setIsActive(false);
-        $this->expectException(
-            \Magento\Framework\Exception\AuthenticationException::class,
-            'You did not sign in correctly or your account is temporarily disabled.'
-        );
-        $this->model->verifyIdentity($password);
-    }
-
-    /**
-     * @return void
-     */
-    public function testVerifyIdentityNoAssignedRoles()
-    {
-        $password = 'password';
-        $this->encryptorMock
-            ->expects($this->once())
-            ->method('validateHash')
-            ->with($password, $this->model->getPassword())
-            ->willReturn(true);
-        $this->model->setIsActive(true);
-        $this->resourceMock->expects($this->once())->method('hasAssigned2Role')->willReturn(false);
-        $this->expectException(
-            \Magento\Framework\Exception\AuthenticationException::class,
-            'You need more permissions to access this.'
-        );
-        $this->model->verifyIdentity($password);
-    }
-
     /**
      * @return void
      */
@@ -402,225 +69,21 @@ public function testSleep()
         $this->assertEmpty($expectedResult);
     }
 
-    /**
-     * @return void
-     */
-    public function testBeforeSave()
-    {
-        $this->eventManagerMock->expects($this->any())->method('dispatch');
-        $this->model->setIsActive(1);
-        $actualData = $this->model->beforeSave()->getData();
-        $this->assertArrayHasKey('extra', $actualData);
-        $this->assertArrayHasKey('password', $actualData);
-        $this->assertArrayHasKey('is_active', $actualData);
-    }
-
-    /**
-     * @return void
-     */
-    public function testValidateOk()
-    {
-        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
-        $this->validationRulesMock->expects($this->once())
-            ->method('addUserInfoRules')
-            ->with($validatorMock);
-        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
-        $this->assertTrue($this->model->validate());
-    }
-
-    /**
-     * @return void
-     */
-    public function testValidateInvalid()
-    {
-        $messages = ['Invalid username'];
-        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
-        $this->validationRulesMock->expects($this->once())
-            ->method('addUserInfoRules')
-            ->with($validatorMock);
-        $validatorMock->expects($this->once())->method('isValid')->willReturn(false);
-        $validatorMock->expects($this->once())->method('getMessages')->willReturn($messages);
-        $this->assertEquals($messages, $this->model->validate());
-    }
-
-    /**
-     * @return void
-     */
-    public function testSaveExtra()
-    {
-        $data = [1, 2, 3];
-        $this->resourceMock->expects($this->once())
-            ->method('saveExtra')
-            ->with($this->model, json_encode($data));
-
-        $this->serializer->expects($this->once())
-            ->method('serialize')
-            ->with($data)
-            ->will($this->returnValue(json_encode($data)));
-
-        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->saveExtra($data));
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetRoles()
-    {
-        $this->resourceMock->expects($this->once())->method('getRoles')->with($this->model)->willReturn([]);
-        $this->assertInternalType('array', $this->model->getRoles());
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetRole()
-    {
-        $roles = ['role'];
-        $roleMock = $this->getMockBuilder(\Magento\Authorization\Model\Role::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->roleFactoryMock->expects($this->once())->method('create')->willReturn($roleMock);
-        $this->resourceMock->expects($this->once())->method('getRoles')->with($this->model)->willReturn($roles);
-        $roleMock->expects($this->once())->method('load')->with($roles[0]);
-        $this->assertInstanceOf(\Magento\Authorization\Model\Role::class, $this->model->getRole());
-    }
-
-    /**
-     * @return void
-     */
-    public function testDeleteFromRole()
-    {
-        $this->resourceMock->expects($this->once())->method('deleteFromRole')->with($this->model);
-        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->deleteFromRole());
-    }
-
-    /**
-     * @return void
-     */
-    public function testRoleUserExistsTrue()
-    {
-        $result = ['role'];
-        $this->resourceMock->expects($this->once())->method('roleUserExists')->with($this->model)->willReturn($result);
-        $this->assertTrue($this->model->roleUserExists());
-    }
-
-    /**
-     * @return void
-     */
-    public function testRoleUserExistsFalse()
-    {
-        $result = [];
-        $this->resourceMock->expects($this->once())->method('roleUserExists')->with($this->model)->willReturn($result);
-        $this->assertFalse($this->model->roleUserExists());
-    }
-
-    /**
-     * @return void
-     */
-    public function testGetAclRole()
-    {
-        $roles = ['role'];
-        $result = 1;
-        $roleMock = $this->getMockBuilder(\Magento\Authorization\Model\Role::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->roleFactoryMock->expects($this->once())->method('create')->willReturn($roleMock);
-        $this->resourceMock->expects($this->once())->method('getRoles')->with($this->model)->willReturn($roles);
-        $roleMock->expects($this->once())->method('load')->with($roles[0]);
-        $roleMock->expects($this->once())->method('getId')->willReturn($result);
-        $this->assertEquals($result, $this->model->getAclRole());
-    }
-
-    /**
-     * @dataProvider authenticateDataProvider
-     * @param string $usernameIn
-     * @param string $usernameOut
-     * @param bool $expectedResult
-     * @return void
-     */
-    public function testAuthenticate($usernameIn, $usernameOut, $expectedResult)
-    {
-        $password = 'password';
-        $config = 'config';
-
-        $data = ['id' => 1, 'is_active' => 1, 'username' => $usernameOut];
-
-        $this->configMock->expects($this->once())
-            ->method('isSetFlag')
-            ->with('admin/security/use_case_sensitive_login')
-            ->willReturn($config);
-        $this->eventManagerMock->expects($this->any())->method('dispatch');
-
-        $this->resourceMock->expects($this->any())->method('loadByUsername')->willReturn($data);
-        $this->model->setIdFieldName('id');
-
-        $this->encryptorMock->expects($this->any())->method('validateHash')->willReturn(true);
-        $this->resourceMock->expects($this->any())->method('hasAssigned2Role')->willReturn(true);
-        $this->assertEquals($expectedResult, $this->model->authenticate($usernameIn, $password));
-    }
-
-    /**
-     * @return array
-     */
-    public function authenticateDataProvider()
-    {
-        return [
-            'success' => [
-                'usernameIn' => 'username',
-                'usernameOut' => 'username',
-                'expectedResult' => true
-            ],
-            'failedUsername' => [
-                'usernameIn' => 'username1',
-                'usernameOut' => 'username2',
-                'expectedResult' => false
-            ]
-        ];
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @return void
-     */
-    public function testAuthenticateException()
-    {
-        $username = 'username';
-        $password = 'password';
-        $config = 'config';
-
-        $this->configMock->expects($this->once())
-            ->method('isSetFlag')
-            ->with('admin/security/use_case_sensitive_login')
-            ->willReturn($config);
-
-        $this->eventManagerMock->expects($this->any())->method('dispatch');
-        $this->resourceMock->expects($this->once())
-            ->method('loadByUsername')
-            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__()));
-        $this->model->authenticate($username, $password);
-    }
-
     /**
      * @return void
      */
     public function testChangeResetPasswordLinkToken()
     {
         $token = '1';
-        $this->assertInstanceOf(\Magento\User\Model\User::class, $this->model->changeResetPasswordLinkToken($token));
+        $this->assertInstanceOf(
+            User::class,
+            $this->model->changeResetPasswordLinkToken($token)
+        );
         $this->assertEquals($token, $this->model->getRpToken());
-        $this->assertInternalType('string', $this->model->getRpTokenCreatedAt());
+        $this->assertInternalType(
+            'string',
+            $this->model->getRpTokenCreatedAt()
+        );
     }
 
     /**
@@ -643,170 +106,4 @@ public function testIsResetPasswordLinkTokenExpiredIsExpiredToken()
         $this->userDataMock->expects($this->once())->method('getResetPasswordLinkExpirationPeriod')->willReturn(0);
         $this->assertTrue($this->model->isResetPasswordLinkTokenExpired());
     }
-
-    /**
-     * @return void
-     */
-    public function testIsResetPasswordLinkTokenExpiredIsNotExpiredToken()
-    {
-        $this->model->setRpToken('1');
-        $this->model->setRpTokenCreatedAt(
-            (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT)
-        );
-        $this->userDataMock->expects($this->once())->method('getResetPasswordLinkExpirationPeriod')->willReturn(1);
-        $this->assertFalse($this->model->isResetPasswordLinkTokenExpired());
-    }
-
-    public function testCheckPasswordChangeEqualToCurrent()
-    {
-        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
-        $this->validationRulesMock->expects($this->once())
-            ->method('addUserInfoRules')
-            ->with($validatorMock);
-        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
-
-        $newPassword = "NEWmYn3wpassw0rd";
-        $oldPassword = "OLDmYn3wpassw0rd";
-        $this->model->setPassword($newPassword)
-            ->setId(1)
-            ->setOrigData('password', $oldPassword);
-        $this->encryptorMock->expects($this->once())
-            ->method('isValidHash')
-            ->with($newPassword, $oldPassword)
-            ->willReturn(true);
-        $result = $this->model->validate();
-        $this->assertInternalType('array', $result);
-        $this->assertCount(1, $result);
-        $this->assertContains("Sorry, but this password has already been used.", (string)$result[0]);
-    }
-
-    public function testCheckPasswordChangeEqualToPrevious()
-    {
-        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
-        $this->validationRulesMock->expects($this->once())
-            ->method('addUserInfoRules')
-            ->with($validatorMock);
-        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
-
-        $newPassword = "NEWmYn3wpassw0rd";
-        $newPasswordHash = "new password hash";
-        $oldPassword = "OLDmYn3wpassw0rd";
-        $this->model->setPassword($newPassword)
-            ->setId(1)
-            ->setOrigData('password', $oldPassword);
-        $this->encryptorMock->expects($this->atLeastOnce())
-            ->method('isValidHash')
-            ->will($this->onConsecutiveCalls(false, true));
-
-        $this->resourceMock->expects($this->once())->method('getOldPasswords')->willReturn(['hash1', $newPasswordHash]);
-
-        $result = $this->model->validate();
-        $this->assertInternalType('array', $result);
-        $this->assertCount(1, $result);
-        $this->assertContains("Sorry, but this password has already been used.", (string)$result[0]);
-    }
-
-    public function testCheckPasswordChangeValid()
-    {
-        /** @var $validatorMock \Magento\Framework\Validator\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $validatorMock = $this->getMockBuilder(\Magento\Framework\Validator\DataObject::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->validatorObjectFactoryMock->expects($this->once())->method('create')->willReturn($validatorMock);
-        $this->validationRulesMock->expects($this->once())
-            ->method('addUserInfoRules')
-            ->with($validatorMock);
-        $validatorMock->expects($this->once())->method('isValid')->willReturn(true);
-
-        $newPassword = "NEWmYn3wpassw0rd";
-        $oldPassword = "OLDmYn3wpassw0rd";
-        $this->model->setPassword($newPassword)
-            ->setId(1)
-            ->setOrigData('password', $oldPassword);
-        $this->encryptorMock->expects($this->atLeastOnce())
-            ->method('isValidHash')
-            ->will($this->onConsecutiveCalls(false, false, false));
-
-        $this->resourceMock->expects($this->once())->method('getOldPasswords')->willReturn(['hash1', 'hash2']);
-
-        $result = $this->model->validate();
-        $this->assertTrue($result);
-    }
-
-    /**
-     * Test for performIdentityCheck method
-     *
-     * @param bool $verifyIdentityResult
-     * @param bool $lockExpires
-     * @dataProvider dataProviderPerformIdentityCheck
-     */
-    public function testPerformIdentityCheck($verifyIdentityResult, $lockExpires)
-    {
-        $password = 'qwerty1';
-        $userName = 'John Doe';
-
-        $this->encryptorMock
-            ->expects($this->once())
-            ->method('validateHash')
-            ->with($password, $this->model->getPassword())
-            ->willReturn($verifyIdentityResult);
-        $this->model->setIsActive(true);
-        $this->resourceMock->expects($this->any())->method('hasAssigned2Role')->willReturn(true);
-
-        $this->model->setUserName($userName);
-        $this->model->setLockExpires($lockExpires);
-
-        $this->eventManagerMock->expects($this->any())
-            ->method('dispatch')
-            ->with(
-                'admin_user_authenticate_after',
-                [
-                    'username' => $userName,
-                    'password' => $password,
-                    'user' => $this->model,
-                    'result' => $verifyIdentityResult
-                ]
-            )
-            ->willReturnSelf();
-
-        if ($lockExpires) {
-            $this->expectException(
-                \Magento\Framework\Exception\State\UserLockedException::class,
-                __('Your account is temporarily disabled.')
-            );
-        }
-
-        if (!$verifyIdentityResult) {
-            $this->expectException(
-                \Magento\Framework\Exception\AuthenticationException::class,
-                __('You have entered an invalid password for current user.')
-            );
-        }
-
-        $this->model->performIdentityCheck($password);
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderPerformIdentityCheck()
-    {
-        return [
-            ['verifyIdentityResult' => true, 'lockExpires' => false],
-            ['verifyIdentityResult' => false, 'lockExpires' => false],
-            ['verifyIdentityResult' => true, 'lockExpires' => true],
-            ['verifyIdentityResult' => false, 'lockExpires' => true]
-        ];
-    }
 }
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 5709986a0c2fb..7195582f09610 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -5,17 +5,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-email": "100.3.*",
-        "magento/module-integration": "100.3.*",
-        "magento/module-security": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-email": "*",
+        "magento/module-integration": "*",
+        "magento/module-security": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/User/etc/config.xml b/app/code/Magento/User/etc/config.xml
index f6a3924b5a27d..c1f51bcbecef4 100644
--- a/app/code/Magento/User/etc/config.xml
+++ b/app/code/Magento/User/etc/config.xml
@@ -10,6 +10,7 @@
         <admin>
             <emails>
                 <forgot_email_template>admin_emails_forgot_email_template</forgot_email_template>
+                <new_user_notification_template>admin_emails_new_user_notification_template</new_user_notification_template>
                 <forgot_email_identity>general</forgot_email_identity>
                 <user_notification_template>admin_emails_user_notification_template</user_notification_template>
             </emails>
diff --git a/app/code/Magento/User/etc/db_schema.xml b/app/code/Magento/User/etc/db_schema.xml
new file mode 100644
index 0000000000000..c3356a96b94a7
--- /dev/null
+++ b/app/code/Magento/User/etc/db_schema.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="admin_user" resource="default" engine="innodb" comment="Admin User Table">
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="User ID"/>
+        <column xsi:type="varchar" name="firstname" nullable="true" length="32" comment="User First Name"/>
+        <column xsi:type="varchar" name="lastname" nullable="true" length="32" comment="User Last Name"/>
+        <column xsi:type="varchar" name="email" nullable="true" length="128" comment="User Email"/>
+        <column xsi:type="varchar" name="username" nullable="true" length="40" comment="User Login"/>
+        <column xsi:type="varchar" name="password" nullable="false" length="255" comment="User Password"/>
+        <column xsi:type="timestamp" name="created" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="User Created Time"/>
+        <column xsi:type="timestamp" name="modified" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="User Modified Time"/>
+        <column xsi:type="timestamp" name="logdate" on_update="false" nullable="true" comment="User Last Login Time"/>
+        <column xsi:type="smallint" name="lognum" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="User Login Number"/>
+        <column xsi:type="smallint" name="reload_acl_flag" padding="6" unsigned="false" nullable="false"
+                identity="false" default="0" comment="Reload ACL"/>
+        <column xsi:type="smallint" name="is_active" padding="6" unsigned="false" nullable="false" identity="false"
+                default="1" comment="User Is Active"/>
+        <column xsi:type="text" name="extra" nullable="true" comment="User Extra Data"/>
+        <column xsi:type="text" name="rp_token" nullable="true" comment="Reset Password Link Token"/>
+        <column xsi:type="timestamp" name="rp_token_created_at" on_update="false" nullable="true"
+                comment="Reset Password Link Token Creation Date"/>
+        <column xsi:type="varchar" name="interface_locale" nullable="false" length="16" default="en_US"
+                comment="Backend interface locale"/>
+        <column xsi:type="smallint" name="failures_num" padding="6" unsigned="false" nullable="true" identity="false"
+                default="0" comment="Failure Number"/>
+        <column xsi:type="timestamp" name="first_failure" on_update="false" nullable="true" comment="First Failure"/>
+        <column xsi:type="timestamp" name="lock_expires" on_update="false" nullable="true"
+                comment="Expiration Lock Dates"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="user_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="ADMIN_USER_USERNAME">
+            <column name="username"/>
+        </constraint>
+    </table>
+    <table name="admin_passwords" resource="default" engine="innodb" comment="Admin Passwords">
+        <column xsi:type="int" name="password_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Password Id"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="User Id"/>
+        <column xsi:type="varchar" name="password_hash" nullable="true" length="100" comment="Password Hash"/>
+        <column xsi:type="int" name="expires" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Deprecated"/>
+        <column xsi:type="int" name="last_updated" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Last Updated"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="password_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="ADMIN_PASSWORDS_USER_ID_ADMIN_USER_USER_ID" table="admin_passwords"
+                    column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
+        <index referenceId="ADMIN_PASSWORDS_USER_ID" indexType="btree">
+            <column name="user_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/User/etc/db_schema_whitelist.json b/app/code/Magento/User/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..2af77c0d8455b
--- /dev/null
+++ b/app/code/Magento/User/etc/db_schema_whitelist.json
@@ -0,0 +1,45 @@
+{
+    "admin_user": {
+        "column": {
+            "user_id": true,
+            "firstname": true,
+            "lastname": true,
+            "email": true,
+            "username": true,
+            "password": true,
+            "created": true,
+            "modified": true,
+            "logdate": true,
+            "lognum": true,
+            "reload_acl_flag": true,
+            "is_active": true,
+            "extra": true,
+            "rp_token": true,
+            "rp_token_created_at": true,
+            "interface_locale": true,
+            "failures_num": true,
+            "first_failure": true,
+            "lock_expires": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "ADMIN_USER_USERNAME": true
+        }
+    },
+    "admin_passwords": {
+        "column": {
+            "password_id": true,
+            "user_id": true,
+            "password_hash": true,
+            "expires": true,
+            "last_updated": true
+        },
+        "index": {
+            "ADMIN_PASSWORDS_USER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "ADMIN_PASSWORDS_USER_ID_ADMIN_USER_USER_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/User/etc/di.xml b/app/code/Magento/User/etc/di.xml
index b92549b54dac4..8fc85bc19e59a 100644
--- a/app/code/Magento/User/etc/di.xml
+++ b/app/code/Magento/User/etc/di.xml
@@ -17,4 +17,5 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\User\Model\Spi\NotificatorInterface" type="Magento\User\Model\Notificator" />
 </config>
diff --git a/app/code/Magento/User/etc/email_templates.xml b/app/code/Magento/User/etc/email_templates.xml
index b998f304c249b..637c2b799f37a 100644
--- a/app/code/Magento/User/etc/email_templates.xml
+++ b/app/code/Magento/User/etc/email_templates.xml
@@ -8,4 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
     <template id="admin_emails_forgot_email_template" label="Forgot Admin Password" file="password_reset_confirmation.html" type="text" module="Magento_User" area="adminhtml"/>
     <template id="admin_emails_user_notification_template" label="User Notification" file="user_notification.html" type="text" module="Magento_User" area="adminhtml"/>
+    <template id="admin_emails_new_user_notification_template"
+              label="New User Notification"
+              file="new_user_notification.html"
+              type="text"
+              module="Magento_User"
+              area="adminhtml"/>
 </config>
diff --git a/app/code/Magento/User/etc/module.xml b/app/code/Magento/User/etc/module.xml
index d3d5f52eddc60..42be2fec021c3 100644
--- a/app/code/Magento/User/etc/module.xml
+++ b/app/code/Magento/User/etc/module.xml
@@ -6,9 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_User" setup_version="2.0.3">
+    <module name="Magento_User" >
         <sequence>
             <module name="Magento_Backend"/>
+            <module name="Magento_Config"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/User/view/adminhtml/email/new_user_notification.html b/app/code/Magento/User/view/adminhtml/email/new_user_notification.html
new file mode 100644
index 0000000000000..891faf5fb8c2b
--- /dev/null
+++ b/app/code/Magento/User/view/adminhtml/email/new_user_notification.html
@@ -0,0 +1,18 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
+<!--@vars {
+"var store.getFrontendName()|escape":"Store Name"
+} @-->
+
+{{trans "Hello,"}}
+
+{{trans "A new admin account was created for %first_name, %last_name using %email." first_name=$user.first_name last_name=$user.last_name email=$user.email}}
+{{trans "If you have not authorized this action, please contact us immediately at %store_email" store_email=$store_email |escape}}{{depend store_phone}} {{trans "or call us at %store_phone" store_phone=$store_phone |escape}}{{/depend}}.
+
+{{trans "Thanks,"}}
+{{var store.getFrontendName()}}
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 0a58d181276ae..6387bec03ea90 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/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index e231b78b1d802..e46257452b27f 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -364,6 +364,16 @@ public function getResult()
         return $this->_result;
     }
 
+    /**
+     * @inheritdoc
+     *
+     * Starting from 23.02.2018 USPS doesn't allow to create free shipping labels via their API.
+     */
+    public function isShippingLabelsAvailable()
+    {
+        return false;
+    }
+
     /**
      * Get quotes
      *
@@ -439,7 +449,7 @@ protected function _getXmlQuotes()
                 $package->addChild('FirstClassMailType', 'PARCEL');
             }
             $package->addChild('ZipOrigination', $r->getOrigPostal());
-            //only 5 chars avaialble
+            //only 5 chars available
             $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
             $package->addChild('Pounds', $r->getWeightPounds());
             $package->addChild('Ounces', $r->getWeightOunces());
@@ -1027,7 +1037,7 @@ protected function _getXmlTracking($trackings)
 
             $api = 'TrackV2';
             $request = $xml->asXML();
-            $debugData = ['request' => $request];
+            $debugData = ['request' => $this->filterDebugData($request)];
 
             try {
                 $url = $this->getConfigData('gateway_url');
@@ -1158,6 +1168,7 @@ public function getAllowedMethods()
 
     /**
      * Return USPS county name by country ISO 3166-1-alpha-2 code
+     *
      * Return false for unknown countries
      *
      * @param string $countryId
@@ -1423,6 +1434,8 @@ protected function _filterServiceName($name)
      *
      * @param \Magento\Framework\DataObject $request
      * @return string
+     * @deprecated This method should not be used anymore.
+     * @see \Magento\Usps\Model\Carrier::_doShipmentRequest method doc block.
      */
     protected function _formUsExpressShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1598,6 +1611,8 @@ protected function _convertPoundOunces($weightInPounds)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @deprecated Should not be used anymore.
+     * @see \Magento\Usps\Model\Carrier::_doShipmentRequest doc block.
      */
     protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1851,6 +1866,8 @@ protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @deprecated This method must not be used anymore. Starting from 23.02.2018 USPS elimates API usage for
+     * free shipping labels generating.
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1886,7 +1903,7 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
             }
         }
 
-        $debugData = ['request' => $requestXml];
+        $debugData = ['request' => $this->filterDebugData($requestXml)];
         $url = $this->getConfigData('gateway_secure_url');
         if (!$url) {
             $url = $this->_defaultGatewayUrl;
@@ -2039,7 +2056,8 @@ protected function _parseZip($zipString, $returnFull = false)
         if (preg_match('/[\\d\\w]{5}\\-[\\d\\w]{4}/', $zipString) != 0) {
             $zip = explode('-', $zipString);
         }
-        for ($i = 0; $i < count($zip); ++$i) {
+        $count = count($zip);
+        for ($i = 0; $i < $count; ++$i) {
             if (strlen($zip[$i]) == 5) {
                 $zip5 = $zip[$i];
             } elseif (strlen($zip[$i]) == 4) {
diff --git a/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php b/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php
new file mode 100644
index 0000000000000..913819a5c1ac4
--- /dev/null
+++ b/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Usps\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateAllowedMethods
+ * @package Magento\Usps\Setup\Patch
+ */
+class UpdateAllowedMethods implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * UpdateAllowedMethods constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $connection = $this->moduleDataSetup->getConnection();
+        $configDataTable = $this->moduleDataSetup->getTable('core_config_data');
+        $oldToNewMethodCodesMap = [
+            'First-Class' => '0_FCLE',
+            'First-Class Mail International Large Envelope' => 'INT_14',
+            'First-Class Mail International Letter' => 'INT_13',
+            'First-Class Mail International Letters' => 'INT_13',
+            'First-Class Mail International Package' => 'INT_15',
+            'First-Class Mail International Parcel' => 'INT_13',
+            'First-Class Package International Service' => 'INT_15',
+            'First-Class Mail' => '0_FCLE',
+            'First-Class Mail Flat' => '0_FCLE',
+            'First-Class Mail Large Envelope' => '0_FCLE',
+            'First-Class Mail International' => 'INT_14',
+            'First-Class Mail Letter' => '0_FCL',
+            'First-Class Mail Parcel' => '0_FCP',
+            'First-Class Mail Package' => '0_FCP',
+            'First-Class Package Service - Retail' => '0_FCP',
+            'Parcel Post' => '4',
+            'Retail Ground' => '4',
+            'Media Mail' => '6',
+            'Library Mail' => '7',
+            'Express Mail' => '3',
+            'Express Mail PO to PO' => '3',
+            'Express Mail Flat Rate Envelope' => '13',
+            'Express Mail Flat-Rate Envelope Sunday/Holiday Guarantee' => '25',
+            'Express Mail Sunday/Holiday Guarantee' => '23',
+            'Express Mail Flat Rate Envelope Hold For Pickup' => '27',
+            'Express Mail Hold For Pickup' => '2',
+            'Global Express Guaranteed (GXG)' => 'INT_4',
+            'Global Express Guaranteed Non-Document Rectangular' => 'INT_6',
+            'Global Express Guaranteed Non-Document Non-Rectangular' => 'INT_7',
+            'USPS GXG Envelopes' => 'INT_12',
+            'Express Mail International' => 'INT_1',
+            'Express Mail International Flat Rate Envelope' => 'INT_10',
+            'Priority Mail' => '1',
+            'Priority Mail Small Flat Rate Box' => '28',
+            'Priority Mail Medium Flat Rate Box' => '17',
+            'Priority Mail Large Flat Rate Box' => '22',
+            'Priority Mail Flat Rate Envelope' => '16',
+            'Priority Mail International' => 'INT_2',
+            'Priority Mail International Flat Rate Envelope' => 'INT_8',
+            'Priority Mail International Small Flat Rate Box' => 'INT_16',
+            'Priority Mail International Medium Flat Rate Box' => 'INT_9',
+            'Priority Mail International Large Flat Rate Box' => 'INT_11',
+        ];
+
+        $select = $connection->select()
+            ->from($configDataTable)
+            ->where(
+                'path IN (?)',
+                ['carriers/usps/free_method', 'carriers/usps/allowed_methods']
+            );
+        $oldConfigValues = $connection->fetchAll($select);
+
+        foreach ($oldConfigValues as $oldValue) {
+            if (stripos($oldValue['path'], 'free_method') !== false
+                && isset($oldToNewMethodCodesMap[$oldValue['value']])
+            ) {
+                $newValue = $oldToNewMethodCodesMap[$oldValue['value']];
+            } elseif (stripos($oldValue['path'], 'allowed_methods') !== false) {
+                $newValuesList = [];
+                foreach (explode(',', $oldValue['value']) as $shippingMethod) {
+                    if (isset($oldToNewMethodCodesMap[$shippingMethod])) {
+                        $newValuesList[] = $oldToNewMethodCodesMap[$shippingMethod];
+                    }
+                }
+                $newValue = implode(',', $newValuesList);
+            } else {
+                continue;
+            }
+
+            if ($newValue && $newValue != $oldValue['value']) {
+                $whereConfigId = $connection->quoteInto('config_id = ?', $oldValue['config_id']);
+                $connection->update($configDataTable, ['value' => $newValue], $whereConfigId);
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Usps/Setup/UpgradeData.php b/app/code/Magento/Usps/Setup/UpgradeData.php
deleted file mode 100644
index bc29d46836640..0000000000000
--- a/app/code/Magento/Usps/Setup/UpgradeData.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Usps\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->updateAllowedMethods($setup);
-        }
-    }
-
-    /**
-     * Replaces titles of allowed shipping methods to their codes.
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function updateAllowedMethods(ModuleDataSetupInterface $setup)
-    {
-        $installer = $setup;
-        $configDataTable = $installer->getTable('core_config_data');
-        $connection = $installer->getConnection();
-
-        $oldToNewMethodCodesMap = [
-            'First-Class' => '0_FCLE',
-            'First-Class Mail International Large Envelope' => 'INT_14',
-            'First-Class Mail International Letter' => 'INT_13',
-            'First-Class Mail International Letters' => 'INT_13',
-            'First-Class Mail International Package' => 'INT_15',
-            'First-Class Mail International Parcel' => 'INT_13',
-            'First-Class Package International Service' => 'INT_15',
-            'First-Class Mail' => '0_FCLE',
-            'First-Class Mail Flat' => '0_FCLE',
-            'First-Class Mail Large Envelope' => '0_FCLE',
-            'First-Class Mail International' => 'INT_14',
-            'First-Class Mail Letter' => '0_FCL',
-            'First-Class Mail Parcel' => '0_FCP',
-            'First-Class Mail Package' => '0_FCP',
-            'First-Class Package Service - Retail' => '0_FCP',
-            'Parcel Post' => '4',
-            'Retail Ground' => '4',
-            'Media Mail' => '6',
-            'Library Mail' => '7',
-            'Express Mail' => '3',
-            'Express Mail PO to PO' => '3',
-            'Express Mail Flat Rate Envelope' => '13',
-            'Express Mail Flat-Rate Envelope Sunday/Holiday Guarantee' => '25',
-            'Express Mail Sunday/Holiday Guarantee' => '23',
-            'Express Mail Flat Rate Envelope Hold For Pickup' => '27',
-            'Express Mail Hold For Pickup' => '2',
-            'Global Express Guaranteed (GXG)' => 'INT_4',
-            'Global Express Guaranteed Non-Document Rectangular' => 'INT_6',
-            'Global Express Guaranteed Non-Document Non-Rectangular' => 'INT_7',
-            'USPS GXG Envelopes' => 'INT_12',
-            'Express Mail International' => 'INT_1',
-            'Express Mail International Flat Rate Envelope' => 'INT_10',
-            'Priority Mail' => '1',
-            'Priority Mail Small Flat Rate Box' => '28',
-            'Priority Mail Medium Flat Rate Box' => '17',
-            'Priority Mail Large Flat Rate Box' => '22',
-            'Priority Mail Flat Rate Envelope' => '16',
-            'Priority Mail International' => 'INT_2',
-            'Priority Mail International Flat Rate Envelope' => 'INT_8',
-            'Priority Mail International Small Flat Rate Box' => 'INT_16',
-            'Priority Mail International Medium Flat Rate Box' => 'INT_9',
-            'Priority Mail International Large Flat Rate Box' => 'INT_11',
-        ];
-
-        $select = $connection->select()
-            ->from($configDataTable)
-            ->where(
-                'path IN (?)',
-                ['carriers/usps/free_method', 'carriers/usps/allowed_methods']
-            );
-        $oldConfigValues = $connection->fetchAll($select);
-
-        foreach ($oldConfigValues as $oldValue) {
-            if (stripos($oldValue['path'], 'free_method') !== false
-                && isset($oldToNewMethodCodesMap[$oldValue['value']])
-            ) {
-                $newValue = $oldToNewMethodCodesMap[$oldValue['value']];
-            } elseif (stripos($oldValue['path'], 'allowed_methods') !== false) {
-                $newValuesList = [];
-                foreach (explode(',', $oldValue['value']) as $shippingMethod) {
-                    if (isset($oldToNewMethodCodesMap[$shippingMethod])) {
-                        $newValuesList[] = $oldToNewMethodCodesMap[$shippingMethod];
-                    }
-                }
-                $newValue = implode(',', $newValuesList);
-            } else {
-                continue;
-            }
-
-            if ($newValue && $newValue != $oldValue['value']) {
-                $whereConfigId = $connection->quoteInto('config_id = ?', $oldValue['config_id']);
-                $connection->update($configDataTable, ['value' => $newValue], $whereConfigId);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Usps/Test/Mftf/LICENSE.txt b/app/code/Magento/Usps/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Usps/Test/Mftf/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/Usps/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Usps/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Usps/Test/Mftf/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/Usps/Test/Mftf/README.md b/app/code/Magento/Usps/Test/Mftf/README.md
new file mode 100644
index 0000000000000..368556a4ba50d
--- /dev/null
+++ b/app/code/Magento/Usps/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Usps Functional Tests
+
+The Functional Test Module for **Magento Usps** module.
diff --git a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
index 964581bcf78e5..57b0544182c8d 100644
--- a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
@@ -5,10 +5,26 @@
  */
 namespace Magento\Usps\Test\Unit\Model;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory;
+use Magento\Quote\Model\Quote\Address\RateResult\Method;
+use Magento\Quote\Model\Quote\Address\RateResult\MethodFactory;
+use Magento\Shipping\Helper\Carrier as CarrierHelper;
+use Magento\Shipping\Model\Rate\Result;
+use Magento\Shipping\Model\Rate\ResultFactory;
+use Magento\Shipping\Model\Shipment\ReturnShipment;
+use Magento\Shipping\Model\Simplexml\Element;
+use Magento\Shipping\Model\Simplexml\ElementFactory;
 use Magento\Usps\Helper\Data as DataHelper;
 use Magento\Usps\Model\Carrier;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -24,27 +40,27 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $httpResponse;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\Error|MockObject
+     * @var Error|MockObject
      */
     private $error;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory|MockObject
+     * @var ErrorFactory|MockObject
      */
     private $errorFactory;
 
     /**
-     * @var \Magento\Usps\Model\Carrier|MockObject
+     * @var Carrier|MockObject
      */
     private $carrier;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     private $scope;
 
@@ -59,129 +75,43 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $httpClient;
 
     /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @inheritdoc
      */
     protected function setUp()
     {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->scope = $this->getMockBuilder(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->disableOriginalConstructor()->getMock();
-
-        $this->scope->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->will(
-            $this->returnCallback([$this, 'scopeConfiggetValue'])
-        );
-
-        // xml element factory
-        $xmlElFactory = $this->getMockBuilder(
-            \Magento\Shipping\Model\Simplexml\ElementFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
-        $xmlElFactory->expects($this->any())->method('create')->will(
-            $this->returnCallback(
-                function ($data) {
-                    $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-                    return $helper->getObject(
-                        \Magento\Shipping\Model\Simplexml\Element::class,
-                        ['data' => $data['data']]
-                    );
-                }
-            )
-        );
-
-        // rate factory
-        $rateFactory = $this->getMockBuilder(
-            \Magento\Shipping\Model\Rate\ResultFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
-        $rateResult = $this->getMockBuilder(
-            \Magento\Shipping\Model\Rate\Result::class
-        )->disableOriginalConstructor()->setMethods(
-            null
-        )->getMock();
-        $rateFactory->expects($this->any())->method('create')->will($this->returnValue($rateResult));
-
-        // rate method factory
-        $rateMethodFactory = $this->getMockBuilder(
-            \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory::class
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
-        $rateMethod = $this->getMockBuilder(
-            \Magento\Quote\Model\Quote\Address\RateResult\Method::class
-        )->disableOriginalConstructor()->setMethods(
-            ['setPrice']
-        )->getMock();
-        $rateMethod->expects($this->any())->method('setPrice')->will($this->returnSelf());
-
-        $rateMethodFactory->expects($this->any())->method('create')->will($this->returnValue($rateMethod));
-
-        // http client
-        $this->httpResponse = $this->getMockBuilder(
-            \Zend_Http_Response::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getBody']
-        )->getMock();
+        $this->objectManager = new ObjectManager($this);
 
-        $this->httpClient = $this->getMockBuilder(ZendClient::class)
-            ->getMock();
-        $this->httpClient->method('request')
-            ->willReturn($this->httpResponse);
-
-        $httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
+        $this->scope = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $httpClientFactory->method('create')
-            ->willReturn($this->httpClient);
+
+        $this->scope->method('getValue')
+            ->willReturnCallback([$this, 'scopeConfiggetValue']);
+
+        $xmlElFactory = $this->getXmlFactory();
+        $rateFactory = $this->getRateFactory();
+        $rateMethodFactory = $this->getRateMethodFactory();
+        $httpClientFactory = $this->getHttpClientFactory();
 
         $data = ['id' => 'usps', 'store' => '1'];
 
-        $this->error = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\RateResult\Error::class)
+        $this->error = $this->getMockBuilder(Error::class)
             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
             ->getMock();
 
-        $this->errorFactory = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory::class)
+        $this->errorFactory = $this->getMockBuilder(ErrorFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
         $this->errorFactory->expects($this->any())->method('create')->willReturn($this->error);
 
-        $localeResolver = $this->getMockForAbstractClass(\Magento\Framework\Locale\ResolverInterface::class);
-        $localeResolver->method('getLocale')->willReturn('fr_FR');
-        $carrierHelper = $this->objectManager->getObject(
-            \Magento\Shipping\Helper\Carrier::class,
-            [
-                'localeResolver' => $localeResolver
-            ]
-        );
-
-        $productCollection = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $productCollection->method('addStoreFilter')
-            ->willReturnSelf();
-        $productCollection->method('addFieldToFilter')
-            ->willReturnSelf();
-        $productCollection->method('addAttributeToSelect')
-            ->willReturn([]);
-
-        $productCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $productCollectionFactory->method('create')
-            ->willReturn($productCollection);
+        $carrierHelper = $this->getCarrierHelper();
+        $productCollectionFactory = $this->getProductCollectionFactory();
 
         $arguments = [
             'scopeConfig' => $this->scope,
-            'xmlSecurity' => new \Magento\Framework\Xml\Security(),
+            'xmlSecurity' => new Security(),
             'xmlElFactory' => $xmlElFactory,
             'rateFactory' => $rateFactory,
             'rateMethodFactory' => $rateMethodFactory,
@@ -190,6 +120,7 @@ function ($data) {
             'rateErrorFactory' => $this->errorFactory,
             'carrierHelper' => $carrierHelper,
             'productCollectionFactory' => $productCollectionFactory,
+            'dataHelper' => $this->dataHelper,
         ];
 
         $this->dataHelper = $this->getMockBuilder(DataHelper::class)
@@ -197,9 +128,7 @@ function ($data) {
             ->setMethods(['displayGirthValue'])
             ->getMock();
 
-        $this->carrier = $this->objectManager->getObject(\Magento\Usps\Model\Carrier::class, $arguments);
-
-        $this->objectManager->setBackwardCompatibleProperty($this->carrier, 'dataHelper', $this->dataHelper);
+        $this->carrier = $this->objectManager->getObject(Carrier::class, $arguments);
     }
 
     /**
@@ -246,31 +175,26 @@ public function testCollectRatesWithUnavailableService()
     {
         $expectedCount = 5;
 
-        $this->scope->expects(static::once())
+        $this->scope->expects($this->once())
             ->method('isSetFlag')
             ->willReturn(true);
 
-        $this->httpResponse->expects(static::once())
+        $this->httpResponse->expects($this->once())
             ->method('getBody')
             ->willReturn(file_get_contents(__DIR__ . '/_files/response_rates.xml'));
 
         $data = require __DIR__ . '/_files/rates_request_data.php';
         $request = $this->objectManager->getObject(RateRequest::class, ['data' => $data[1]]);
         $rates = $this->carrier->collectRates($request)->getAllRates();
-        static::assertEquals($expectedCount, count($rates));
+        $this->assertEquals($expectedCount, count($rates));
     }
 
     public function testReturnOfShipment()
     {
-        $this->httpResponse->expects(
-            $this->any()
-        )->method(
-            'getBody'
-        )->will(
-            $this->returnValue(file_get_contents(__DIR__ . '/_files/success_usps_response_return_shipment.xml'))
-        );
+        $this->httpResponse->method('getBody')
+            ->willReturn(file_get_contents(__DIR__ . '/_files/success_usps_response_return_shipment.xml'));
         $request = $this->objectManager->getObject(
-            \Magento\Shipping\Model\Shipment\ReturnShipment::class,
+            ReturnShipment::class,
             require __DIR__ . '/_files/return_shipment_request_data.php'
         );
         $this->httpClient->expects(self::exactly(2))
@@ -290,7 +214,7 @@ public function testFormattingFloatValuesForIntlShipmentRequest()
                 file_get_contents(__DIR__ . '/_files/success_usps_response_return_shipment.xml')
             );
         $request = $this->objectManager->getObject(
-            \Magento\Shipping\Model\Shipment\ReturnShipment::class,
+            ReturnShipment::class,
             require __DIR__ . '/_files/return_shipment_request_data.php'
         );
 
@@ -316,16 +240,17 @@ public function testFormattingFloatValuesForIntlShipmentRequest()
      */
     public function scopeConfigGetValue($path)
     {
-        switch ($path) {
-            case 'carriers/usps/allowed_methods':
-                return '0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,' .
-                    '55,56,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,' .
-                    'INT_15,INT_16,INT_20,INT_26';
-            case 'carriers/usps/showmethod':
-                return 1;
-            default:
-                return null;
-        }
+        $pathMap = [
+            'carriers/usps/allowed_methods' => '0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,' .
+                '34,35,36,37,42,43,53,55,56,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,' .
+                'INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,INT_26',
+            'carriers/usps/showmethod' => 1,
+            'carriers/usps/debug' => 1,
+            'carriers/usps/userid' => 'test',
+            'carriers/usps/mode' => 0,
+        ];
+
+        return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
 
     /**
@@ -338,11 +263,15 @@ public function codeDataProvider()
 
     public function testCollectRatesErrorMessage()
     {
-        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(false);
+        $this->scope->method('isSetFlag')
+            ->willReturn(false);
 
-        $this->error->expects($this->once())->method('setCarrier')->with('usps');
-        $this->error->expects($this->once())->method('setCarrierTitle');
-        $this->error->expects($this->once())->method('setErrorMessage');
+        $this->error->method('setCarrier')
+            ->with('usps');
+        $this->error->expects($this->once())
+            ->method('setCarrierTitle');
+        $this->error->expects($this->once())
+            ->method('setErrorMessage');
 
         $request = new RateRequest();
         $this->assertSame($this->error, $this->carrier->collectRates($request));
@@ -350,14 +279,16 @@ public function testCollectRatesErrorMessage()
 
     public function testCollectRatesFail()
     {
-        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(true);
-        $this->scope->expects($this->atLeastOnce())->method('getValue')->willReturnMap(
-            [
-                ['carriers/usps/userid' => 123],
-                ['carriers/usps/container' => 11],
-
-            ]
-        );
+        $this->scope->method('isSetFlag')
+            ->willReturn(true);
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->willReturnMap(
+                [
+                    ['carriers/usps/userid' => 123],
+                    ['carriers/usps/container' => 11],
+                ]
+            );
         $request = new RateRequest();
         $request->setPackageWeight(1);
 
@@ -382,7 +313,7 @@ public function testFilterDebugData($data, array $maskFields, $expected)
         $result = $refMethod->invoke($this->carrier, $data);
         $expectedXml = new \SimpleXMLElement($expected);
         $resultXml = new \SimpleXMLElement($result);
-        static::assertEquals($expectedXml->asXML(), $resultXml->asXML());
+        $this->assertEquals($expectedXml->asXML(), $resultXml->asXML());
     }
 
     /**
@@ -418,12 +349,11 @@ public function logDataProvider()
      */
     public function testIsGirthAllowed($countyCode, $carrierMethodCode, $displayGirthValueResult, $result)
     {
-        $this->dataHelper->expects(static::any())
-            ->method('displayGirthValue')
+        $this->dataHelper->method('displayGirthValue')
             ->with($carrierMethodCode)
             ->willReturn($displayGirthValueResult);
 
-        self::assertEquals($result, $this->carrier->isGirthAllowed($countyCode, $carrierMethodCode));
+        $this->assertEquals($result, $this->carrier->isGirthAllowed($countyCode, $carrierMethodCode));
     }
 
     /**
@@ -437,4 +367,130 @@ public function isGirthAllowedDataProvider()
             ['US', 'usps_0', false, true],
         ];
     }
+
+    /**
+     * @return MockObject
+     */
+    private function getXmlFactory(): MockObject
+    {
+        $xmlElFactory = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $xmlElFactory->method('create')
+            ->willReturnCallback(
+                function ($data) {
+                    $helper = new ObjectManager($this);
+
+                    return $helper->getObject(
+                        Element::class,
+                        ['data' => $data['data']]
+                    );
+                }
+            );
+
+        return $xmlElFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getRateFactory(): MockObject
+    {
+        $rateFactory = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $rateResult = $this->getMockBuilder(Result::class)
+            ->disableOriginalConstructor()
+            ->setMethods(null)
+            ->getMock();
+        $rateFactory->method('create')
+            ->willReturn($rateResult);
+
+        return $rateFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getRateMethodFactory(): MockObject
+    {
+        $rateMethodFactory = $this->getMockBuilder(MethodFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $rateMethod = $this->getMockBuilder(Method::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setPrice'])
+            ->getMock();
+        $rateMethod->method('setPrice')
+            ->willReturnSelf();
+        $rateMethodFactory->method('create')
+            ->willReturn($rateMethod);
+
+        return $rateMethodFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getHttpClientFactory(): MockObject
+    {
+        $this->httpResponse = $this->getMockBuilder(\Zend_Http_Response::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBody'])
+            ->getMock();
+        $this->httpClient = $this->getMockBuilder(ZendClient::class)
+            ->getMock();
+        $this->httpClient->method('request')
+            ->willReturn($this->httpResponse);
+        $httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpClientFactory->method('create')
+            ->willReturn($this->httpClient);
+
+        return $httpClientFactory;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function getProductCollectionFactory(): MockObject
+    {
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productCollection->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->method('addFieldToFilter')
+            ->willReturnSelf();
+        $productCollection->method('addAttributeToSelect')
+            ->willReturn([]);
+        $productCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productCollectionFactory->method('create')
+            ->willReturn($productCollection);
+
+        return $productCollectionFactory;
+    }
+
+    /**
+     * @return CarrierHelper
+     */
+    private function getCarrierHelper(): CarrierHelper
+    {
+        $localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $localeResolver->method('getLocale')->willReturn('fr_FR');
+        $carrierHelper = $this->objectManager->getObject(
+            CarrierHelper::class,
+            [
+                'localeResolver' => $localeResolver,
+            ]
+        );
+
+        return $carrierHelper;
+    }
 }
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 91697a1d2f15a..f0ee0cd5cda93 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -5,20 +5,19 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
-        "magento/framework": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-config": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-shipping": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Usps/etc/module.xml b/app/code/Magento/Usps/etc/module.xml
index 8a1ec284c6333..0752b0dfe0efd 100644
--- a/app/code/Magento/Usps/etc/module.xml
+++ b/app/code/Magento/Usps/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Usps" setup_version="2.0.1">
+    <module name="Magento_Usps" >
     </module>
 </config>
diff --git a/app/code/Magento/Variable/Block/System/Variable/Edit.php b/app/code/Magento/Variable/Block/System/Variable/Edit.php
index be68814ea27e2..ea119b88fa795 100644
--- a/app/code/Magento/Variable/Block/System/Variable/Edit.php
+++ b/app/code/Magento/Variable/Block/System/Variable/Edit.php
@@ -90,11 +90,7 @@ protected function _preparelayout()
      */
     public function getFormHtml()
     {
-        $formHtml = parent::getFormHtml();
-        if (!$this->_storeManager->isSingleStoreMode() && $this->getVariable()->getId()) {
-            $formHtml = $formHtml;
-        }
-        return $formHtml;
+        return parent::getFormHtml();
     }
 
     /**
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
index f70cb31eb545f..71cb76a67d15d 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php
@@ -6,12 +6,14 @@
  */
 namespace Magento\Variable\Controller\Adminhtml\System\Variable;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
 /**
  * Display Variables list page
  * @api
  * @since 100.0.2
  */
-class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable
+class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable implements HttpGetActionInterface
 {
     /**
      * Index Action
diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php
index 621cc3aa5677b..c3272d76e41c0 100644
--- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php
+++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php
@@ -23,13 +23,13 @@ public function execute()
     {
         $customVariables = $this->_objectManager->create(\Magento\Variable\Model\Variable::class)
             ->getVariablesOptionArray(true);
-        $storeContactVariabls = $this->_objectManager->create(
+        $storeContactVariables = $this->_objectManager->create(
             \Magento\Variable\Model\Source\Variables::class
         )->toOptionArray(
             true
         );
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
-        return $resultJson->setData([$storeContactVariabls, $customVariables]);
+        return $resultJson->setData([$storeContactVariables, $customVariables]);
     }
 }
diff --git a/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php b/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
index 3b74849352274..64c541e8c70b9 100644
--- a/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
+++ b/app/code/Magento/Variable/Model/ResourceModel/Variable/Collection.php
@@ -62,7 +62,7 @@ public function addValuesToResult()
         $this->getSelect()->join(
             ['value_table' => $this->getTable('variable_value')],
             'value_table.variable_id = main_table.variable_id',
-            ['value_table.value']
+            ['value_table.plain_value', 'value_table.html_value']
         );
         $this->addFieldToFilter('value_table.store_id', ['eq' => $this->getStoreId()]);
         return $this;
diff --git a/app/code/Magento/Variable/Model/Source/Variables.php b/app/code/Magento/Variable/Model/Source/Variables.php
index 38c2f92d25545..e878a3172be4b 100644
--- a/app/code/Magento/Variable/Model/Source/Variables.php
+++ b/app/code/Magento/Variable/Model/Source/Variables.php
@@ -23,6 +23,16 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
      */
     private $configVariables = [];
 
+    /**
+     * @var array
+     */
+    private $configPaths = [];
+
+    /**
+     * @var \Magento\Config\Model\Config\Structure\SearchInterface
+     */
+    private $configStructure;
+
     /**
      * Constructor.
      *
@@ -33,25 +43,8 @@ public function __construct(
         \Magento\Config\Model\Config\Structure\SearchInterface $configStructure,
         array $configPaths = []
     ) {
-        foreach ($configPaths as $groupPath => $groupElements) {
-            $groupPathElements = explode('/', $groupPath);
-            $path = [];
-            $labels = [];
-            foreach ($groupPathElements as $groupPathElement) {
-                $path[] = $groupPathElement;
-                $labels[] = __(
-                    $configStructure->getElementByConfigPath(implode('/', $path))->getLabel()
-                );
-            }
-            $this->configVariables[$groupPath]['label'] = implode(' / ', $labels);
-            foreach (array_keys($groupElements) as $elementPath) {
-                $this->configVariables[$groupPath]['elements'][] = [
-                    'value' => $elementPath,
-                    'label' => __($configStructure->getElementByConfigPath($elementPath)->getLabel()),
-                ];
-            }
-        }
-        $this->configVariables;
+        $this->configStructure = $configStructure;
+        $this->configPaths = $configPaths;
     }
 
     /**
@@ -64,7 +57,7 @@ public function toOptionArray($withGroup = false)
     {
         $optionArray = [];
         if ($withGroup) {
-            foreach ($this->configVariables as $configVariableGroup) {
+            foreach ($this->getConfigVariables() as $configVariableGroup) {
                 $group = [
                     'label' => $configVariableGroup['label']
                 ];
@@ -79,7 +72,7 @@ public function toOptionArray($withGroup = false)
                 $optionArray[] = $group;
             }
         } else {
-            foreach ($this->configVariables as $configVariableGroup) {
+            foreach ($this->getConfigVariables() as $configVariableGroup) {
                 foreach ($configVariableGroup['elements'] as $element) {
                     $optionArray[] = [
                         'value' => '{{config path="' . $element['value'] . '"}}',
@@ -110,7 +103,7 @@ public function getData()
     private function getFlatConfigVars()
     {
         $result = [];
-        foreach ($this->configVariables as $configVariableGroup) {
+        foreach ($this->getConfigVariables() as $configVariableGroup) {
             foreach ($configVariableGroup['elements'] as $element) {
                 $element['group_label'] = $configVariableGroup['label'];
                 $result[] = $element;
@@ -118,4 +111,35 @@ private function getFlatConfigVars()
         }
         return $result;
     }
+
+    /**
+     * Merge config with user defined data
+     *
+     * @return array
+     */
+    private function getConfigVariables()
+    {
+        if (empty($this->configVariables)) {
+            foreach ($this->configPaths as $groupPath => $groupElements) {
+                $groupPathElements = explode('/', $groupPath);
+                $path = [];
+                $labels = [];
+                foreach ($groupPathElements as $groupPathElement) {
+                    $path[] = $groupPathElement;
+                    $labels[] = __(
+                        $this->configStructure->getElementByConfigPath(implode('/', $path))->getLabel()
+                    );
+                }
+                $this->configVariables[$groupPath]['label'] = implode(' / ', $labels);
+                foreach (array_keys($groupElements) as $elementPath) {
+                    $this->configVariables[$groupPath]['elements'][] = [
+                        'value' => $elementPath,
+                        'label' => __($this->configStructure->getElementByConfigPath($elementPath)->getLabel()),
+                    ];
+                }
+            }
+        }
+
+        return $this->configVariables;
+    }
 }
diff --git a/app/code/Magento/Variable/Model/Variable.php b/app/code/Magento/Variable/Model/Variable.php
index 01daf2229bf08..ac4f45da5779b 100644
--- a/app/code/Magento/Variable/Model/Variable.php
+++ b/app/code/Magento/Variable/Model/Variable.php
@@ -153,7 +153,7 @@ public function getVariablesOptionArray($withGroup = false)
         foreach ($collection->toOptionArray() as $variable) {
             $variables[] = [
                 'value' => '{{customVar code=' . $variable['value'] . '}}',
-                'label' => __('%1', $variable['label']),
+                'label' => __('%1', $this->_escaper->escapeHtml($variable['label'])),
             ];
         }
         if ($withGroup && $variables) {
diff --git a/app/code/Magento/Variable/Model/Variable/Config.php b/app/code/Magento/Variable/Model/Variable/Config.php
index 66151d2a270fd..0fe6d7cc8ae0d 100644
--- a/app/code/Magento/Variable/Model/Variable/Config.php
+++ b/app/code/Magento/Variable/Model/Variable/Config.php
@@ -77,8 +77,8 @@ public function getWysiwygPluginSettings($config)
         $onclickParts = [
             'search' => ['html_id'],
             'subject' => 'MagentovariablePlugin.loadChooser(\'' .
-            $this->getVariablesWysiwygActionUrl() .
-            '\', \'{{html_id}}\');',
+                $this->getVariablesWysiwygActionUrl() .
+                '\', \'{{html_id}}\');',
         ];
         $variableWysiwyg = [
             [
@@ -89,12 +89,12 @@ public function getWysiwygPluginSettings($config)
                     'url' => $this->getVariablesWysiwygActionUrl(),
                     'onclick' => $onclickParts,
                     'class' => 'add-variable plugin',
+                    'placeholders' => $this->getVariablesWysiwygData()
                 ],
             ],
         ];
-        $configPlugins = $config->getData('plugins');
+        $configPlugins = (array) $config->getData('plugins');
         $variableConfig['plugins'] = array_merge($configPlugins, $variableWysiwyg);
-        $variableConfig['variable_placeholders'] = $this->getVariablesWysiwygData();
         return $variableConfig;
     }
 
diff --git a/app/code/Magento/Variable/Model/Variable/ConfigProvider.php b/app/code/Magento/Variable/Model/Variable/ConfigProvider.php
new file mode 100644
index 0000000000000..f6fe9dd880381
--- /dev/null
+++ b/app/code/Magento/Variable/Model/Variable/ConfigProvider.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Variable\Model\Variable;
+
+/**
+ * Class ConfigProvider
+ * This class has been added to prevent BIC changes in the \Magento\Variable\Model\Variable\Config
+ */
+class ConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Variable\Model\Variable\Config
+     */
+    private $variableConfig;
+
+    /**
+     * ConfigProvider constructor.
+     * @param Config $variableConfig
+     */
+    public function __construct(Config $variableConfig)
+    {
+        $this->variableConfig = $variableConfig;
+    }
+
+   /**
+    * {@inheritdoc}
+    *
+    */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $settings = $this->variableConfig->getWysiwygPluginSettings($config);
+        return $config->addData($settings);
+    }
+}
diff --git a/app/code/Magento/Variable/Setup/InstallSchema.php b/app/code/Magento/Variable/Setup/InstallSchema.php
deleted file mode 100644
index 65b59a24fb51a..0000000000000
--- a/app/code/Magento/Variable/Setup/InstallSchema.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Variable\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $connection = $installer->getConnection();
-
-        $installer->startSetup();
-
-        /**
-         * Rename/Create table 'variable'
-         */
-        $variableTableName = $installer->getTable('variable');
-        $coreVariableTableName = $installer->getTable('core_variable');
-        if ($installer->tableExists('core_variable')) {
-            $connection->renameTable($coreVariableTableName, $variableTableName);
-        } else {
-            $table = $connection->newTable(
-                $variableTableName
-            )->addColumn(
-                'variable_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Variable Id'
-            )->addColumn(
-                'code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Variable Code'
-            )->addColumn(
-                'name',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Variable Name'
-            )->addIndex(
-                $installer->getIdxName(
-                    'variable',
-                    ['code'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['code'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )->setComment(
-                'Variables'
-            );
-            $connection->createTable($table);
-        }
-
-        /**
-         * Rename/Create table 'variable_value'
-         */
-        $variableValueTableName = $installer->getTable('variable_value');
-        $coreVariableValueTableName = $installer->getTable('core_variable_value');
-        if ($installer->tableExists('core_variable_value')) {
-            $connection->renameTable($coreVariableValueTableName, $variableValueTableName);
-            $oldForeignKeys = $connection->getForeignKeys($variableValueTableName);
-            foreach ($oldForeignKeys as $foreignKey) {
-                $connection->dropForeignKey($variableValueTableName, $foreignKey['FK_NAME']);
-            }
-        } else {
-            $table = $connection->newTable(
-                $variableValueTableName
-            )->addColumn(
-                'value_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Variable Value Id'
-            )->addColumn(
-                'variable_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Variable Id'
-            )->addColumn(
-                'store_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Store Id'
-            )->addColumn(
-                'plain_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Plain Text Value'
-            )->addColumn(
-                'html_value',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                [],
-                'Html Value'
-            )->addIndex(
-                $installer->getIdxName(
-                    'variable_value',
-                    ['variable_id', 'store_id'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['variable_id', 'store_id'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )->addIndex(
-                $installer->getIdxName('variable_value', ['store_id']),
-                ['store_id']
-            )->setComment(
-                'Variable Value'
-            );
-            $connection->createTable($table);
-        }
-        $connection->addForeignKey(
-            $installer->getFkName('variable_value', 'store_id', 'store', 'store_id'),
-            $variableValueTableName,
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-        $connection->addForeignKey(
-            $installer->getFkName('variable_value', 'variable_id', 'variable', 'variable_id'),
-            $variableValueTableName,
-            'variable_id',
-            $installer->getTable('variable'),
-            'variable_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CreateCustomVariableActionGroup.xml b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CreateCustomVariableActionGroup.xml
rename to app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
index 859fae5e4a559..610676b350455 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CreateCustomVariableActionGroup.xml
+++ b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
@@ -6,8 +6,8 @@
           */
         -->
 
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 <actionGroup name="CreateCustomVariableActionGroup">
     <amOnPage url="admin/admin/system_variable/new/" stepKey="goToNewCustomVarialePage" />
     <waitForPageLoad stepKey="waitForPageLoad" />
@@ -21,9 +21,11 @@
     <amOnPage url="admin/admin/system_variable/" stepKey="goToVarialeGrid" />
     <waitForPageLoad stepKey="waitForPageLoad1" />
     <click selector="{{CustomVariableSection.GridCustomVariableCode(customVariable.code)}}" stepKey="goToCustomVariableEditPage" />
+    <waitForPageLoad stepKey="waitForPageLoad2" />
+    <waitForElementVisible selector="{{CustomVariableSection.delete}}" stepKey="waitForDeleteBtn" />
     <click selector="{{CustomVariableSection.delete}}" stepKey="deleteCustomVariable" />
     <waitForText userInput="Are you sure you want to do this?" stepKey="waitForText" />
     <click selector="{{CustomVariableSection.confirmDelete}}" stepKey="confirmDelete" />
-    <waitForPageLoad stepKey="waitForPageLoad2" />
+    <waitForPageLoad stepKey="waitForPageLoad3" />
 </actionGroup>
-</config>
+</actionGroups>
diff --git a/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml b/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
new file mode 100644
index 0000000000000..7b7fd768f0ab1
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultVariable" type="cms_page">
+        <data key="city"> Austin </data>
+    </entity>
+    <entity name="customVariable" type="cms_page">
+        <data key="code" unique="suffix">variale-code</data>
+        <data key="name">Test Variable</data>
+        <data key="html"> Sample Variable </data>
+        <data key="plain">variable-plain-</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Variable/Test/Mftf/LICENSE.txt b/app/code/Magento/Variable/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/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/Variable/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Variable/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/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/Variable/Test/Mftf/README.md b/app/code/Magento/Variable/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f2cd2ce8f4623
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Variable Functional Tests
+
+The Functional Test Module for **Magento Variable** module.
diff --git a/app/code/Magento/Variable/Test/Unit/Model/ResourceModel/Variable/CollectionTest.php b/app/code/Magento/Variable/Test/Unit/Model/ResourceModel/Variable/CollectionTest.php
new file mode 100644
index 0000000000000..38cf2fefcef97
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Unit/Model/ResourceModel/Variable/CollectionTest.php
@@ -0,0 +1,94 @@
+<?php
+/***
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Variable\Test\Unit\Model\ResourceModel\Variable;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Variable\Model\ResourceModel\Variable\Collection;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for Variable collection class.
+ */
+class CollectionTest extends TestCase
+{
+    /**
+     * Test Collection::addValuesToResult() build correct query.
+     *
+     * @return void
+     */
+    public function testAddValuesToResult()
+    {
+        $mainTableName = 'testMainTable';
+        $tableName = 'variable_value';
+        $field = 'value_table.store_id';
+
+        $select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $select->expects($this->once())
+            ->method('from')
+            ->with($this->identicalTo(['main_table' => $mainTableName]))
+            ->willReturnSelf();
+        $select->expects($this->once())
+            ->method('join')
+            ->with(
+                $this->identicalTo(['value_table' => $tableName]),
+                $this->identicalTo('value_table.variable_id = main_table.variable_id'),
+                $this->identicalTo(['value_table.plain_value', 'value_table.html_value'])
+            )->willReturnSelf();
+
+        $connection = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['select', 'prepareSqlCondition', 'quoteIdentifier'])
+            ->getMockForAbstractClass();
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+        $connection->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with($this->identicalTo($field))
+            ->willReturn($field);
+        $connection->expects($this->once())
+            ->method('prepareSqlCondition')
+            ->with(
+                $this->identicalTo($field),
+                $this->identicalTo(['eq' => 0])
+            )->willReturn('testResultCondition');
+
+        $resource = $this->getMockBuilder(AbstractDb::class)
+            ->setMethods(['getTable', 'getMainTable', 'getConnection'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $resource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $resource->expects($this->once())
+            ->method('getMainTable')
+            ->willReturn('testMainTable');
+        $resource->expects($this->exactly(2))
+            ->method('getTable')
+            ->withConsecutive(
+                [$mainTableName],
+                [$tableName]
+            )->willReturnOnConsecutiveCalls(
+                $mainTableName,
+                $tableName
+            );
+
+        $objectManager = new ObjectManager($this);
+        $collection = $objectManager->getObject(
+            Collection::class,
+            [
+                'resource' => $resource,
+            ]
+        );
+        $this->assertInstanceOf(Collection::class, $collection->addValuesToResult());
+    }
+}
diff --git a/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php b/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php
index fad98267ef1fd..6bc51a094e8dc 100644
--- a/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php
+++ b/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php
@@ -49,7 +49,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
     /**
      * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $customVarsCollecitonFactoryMock;
+    private $customVarsCollectionFactoryMock;
 
     /**
      * @var Collection|\PHPUnit_Framework_MockObject_MockObject
@@ -79,7 +79,7 @@ protected function setUp()
             ->setMethods(['getData'])
             ->getMock();
 
-        $this->customVarsCollecitonFactoryMock = $this->getMockBuilder(CollectionFactory::class)
+        $this->customVarsCollectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -89,7 +89,7 @@ protected function setUp()
             ->setMethods(['getData'])
             ->getMock();
 
-        $this->customVarsCollecitonFactoryMock->expects($this->any())
+        $this->customVarsCollectionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->customVarsCollectionMock);
 
@@ -97,7 +97,7 @@ protected function setUp()
         $args = [
             'assetRepo' => $this->assetRepoMock,
             'url' => $this->urlMock,
-            'collectionFactory' => $this->customVarsCollecitonFactoryMock,
+            'collectionFactory' => $this->customVarsCollectionFactoryMock,
             'storesVariables' => $this->storeVariablesMock,
         ];
         $this->model = (new ObjectManager($this))->getObject(Config::class, $args);
diff --git a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
index e1b054571ad02..a4be2cd273407 100644
--- a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
+++ b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
@@ -6,22 +6,38 @@
 namespace Magento\Variable\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Variable\Model\ResourceModel\Variable\Collection;
 
 class VariableTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var  \Magento\Variable\Model\Variable */
+    /**
+     * @var  \Magento\Variable\Model\Variable
+     */
     private $model;
 
-    /** @var  \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
     private $escaperMock;
 
-    /** @var  \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var \Magento\Variable\Model\ResourceModel\Variable|\PHPUnit_Framework_MockObject_MockObject
+     */
     private $resourceMock;
 
-    /** @var  \Magento\Framework\Phrase */
+    /**
+     * @var \Magento\Variable\Model\ResourceModel\Variable\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceCollectionMock;
+
+    /**
+     * @var  \Magento\Framework\Phrase
+     */
     private $validationFailedPhrase;
 
-    /** @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    /**
+     * @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
     private $objectManager;
 
     protected function setUp()
@@ -33,11 +49,15 @@ protected function setUp()
         $this->resourceMock = $this->getMockBuilder(\Magento\Variable\Model\ResourceModel\Variable::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->resourceCollectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = $this->objectManager->getObject(
             \Magento\Variable\Model\Variable::class,
             [
                 'escaper' => $this->escaperMock,
-                'resource' => $this->resourceMock
+                'resource' => $this->resourceMock,
+                'resourceCollection' => $this->resourceCollectionMock,
             ]
         );
         $this->validationFailedPhrase = __('Validation has failed.');
@@ -101,60 +121,51 @@ public function testValidate($variableArray, $objectId, $expectedResult)
     public function testGetVariablesOptionArrayNoGroup()
     {
         $origOptions = [
-            ['value' => 'VAL', 'label' => 'LBL']
+            ['value' => 'VAL', 'label' => 'LBL'],
         ];
 
         $transformedOptions = [
-            ['value' => '{{customVar code=VAL}}', 'label' => __('%1', 'LBL')]
+            ['value' => '{{customVar code=VAL}}', 'label' => __('%1', 'LBL')],
         ];
 
-        $collectionMock = $this->getMockBuilder(\Magento\Variable\Model\ResourceModel\Variable\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $collectionMock->expects($this->any())
+        $this->resourceCollectionMock->expects($this->any())
             ->method('toOptionArray')
             ->willReturn($origOptions);
-        $mockVariable = $this->getMockBuilder(\Magento\Variable\Model\Variable::class)
-            ->setMethods(['getCollection'])
-            ->setConstructorArgs($this->objectManager->getConstructArguments(\Magento\Variable\Model\Variable::class))
-            ->getMock();
-        $mockVariable->expects($this->any())
-            ->method('getCollection')
-            ->willReturn($collectionMock);
-        $this->assertEquals($transformedOptions, $mockVariable->getVariablesOptionArray());
+        $this->escaperMock->expects($this->once())
+            ->method('escapeHtml')
+            ->with($origOptions[0]['label'])
+            ->willReturn($origOptions[0]['label']);
+        $this->assertEquals($transformedOptions, $this->model->getVariablesOptionArray());
     }
 
     public function testGetVariablesOptionArrayWithGroup()
     {
         $origOptions = [
-            ['value' => 'VAL', 'label' => 'LBL']
+            ['value' => 'VAL', 'label' => 'LBL'],
         ];
 
         $transformedOptions = [
             [
                 'label' => __('Custom Variables'),
                 'value' => [
-                    ['value' => '{{customVar code=VAL}}', 'label' => __('%1', 'LBL')]
-                ]
-            ]
+                    ['value' => '{{customVar code=VAL}}', 'label' => __('%1', 'LBL')],
+                ],
+            ],
         ];
 
-        $collectionMock = $this->getMockBuilder(\Magento\Variable\Model\ResourceModel\Variable\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $collectionMock->expects($this->any())
+        $this->resourceCollectionMock->expects($this->any())
             ->method('toOptionArray')
             ->willReturn($origOptions);
-        $mockVariable = $this->getMockBuilder(\Magento\Variable\Model\Variable::class)
-            ->setMethods(['getCollection'])
-            ->setConstructorArgs($this->objectManager->getConstructArguments(\Magento\Variable\Model\Variable::class))
-            ->getMock();
-        $mockVariable->expects($this->any())
-            ->method('getCollection')
-            ->willReturn($collectionMock);
-        $this->assertEquals($transformedOptions, $mockVariable->getVariablesOptionArray(true));
+        $this->escaperMock->expects($this->atLeastOnce())
+            ->method('escapeHtml')
+            ->with($origOptions[0]['label'])
+            ->willReturn($origOptions[0]['label']);
+        $this->assertEquals($transformedOptions, $this->model->getVariablesOptionArray(true));
     }
 
+    /**
+     * @return array
+     */
     public function validateDataProvider()
     {
         $variable = [
@@ -163,15 +174,18 @@ public function validateDataProvider()
         return [
             'Empty Variable' => [[], null, true],
             'IDs match' => [$variable, 'matching_id', true],
-            'IDs do not match' => [$variable, 'non_matching_id', __('Variable Code must be unique.')]
+            'IDs do not match' => [$variable, 'non_matching_id', __('Variable Code must be unique.')],
         ];
     }
 
+    /**
+     * @return array
+     */
     public function validateMissingInfoDataProvider()
     {
         return [
             'Missing code' => ['', 'some-name'],
-            'Missing name' => ['some-code', '']
+            'Missing name' => ['some-code', ''],
         ];
     }
 }
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index 5702c93e4fe5d..017fd312bbdf8 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -5,14 +5,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-config": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-store": "*",
+        "magento/module-config": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Variable/etc/db_schema.xml b/app/code/Magento/Variable/etc/db_schema.xml
new file mode 100644
index 0000000000000..239e3b49983c1
--- /dev/null
+++ b/app/code/Magento/Variable/etc/db_schema.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="variable" resource="default" engine="innodb" comment="Variables">
+        <column xsi:type="int" name="variable_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Variable Id"/>
+        <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Variable Code"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Variable Name"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="variable_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="VARIABLE_CODE">
+            <column name="code"/>
+        </constraint>
+    </table>
+    <table name="variable_value" resource="default" engine="innodb" comment="Variable Value">
+        <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Variable Value Id"/>
+        <column xsi:type="int" name="variable_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Variable Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="text" name="plain_value" nullable="true" comment="Plain Text Value"/>
+        <column xsi:type="text" name="html_value" nullable="true" comment="Html Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="VARIABLE_VALUE_VARIABLE_ID_STORE_ID">
+            <column name="variable_id"/>
+            <column name="store_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="VARIABLE_VALUE_STORE_ID_STORE_STORE_ID" table="variable_value"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="VARIABLE_VALUE_VARIABLE_ID_VARIABLE_VARIABLE_ID" table="variable_value"
+                    column="variable_id" referenceTable="variable" referenceColumn="variable_id" onDelete="CASCADE"/>
+        <index referenceId="VARIABLE_VALUE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Variable/etc/db_schema_whitelist.json b/app/code/Magento/Variable/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b122e33eceb19
--- /dev/null
+++ b/app/code/Magento/Variable/etc/db_schema_whitelist.json
@@ -0,0 +1,31 @@
+{
+    "variable": {
+        "column": {
+            "variable_id": true,
+            "code": true,
+            "name": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "VARIABLE_CODE": true
+        }
+    },
+    "variable_value": {
+        "column": {
+            "value_id": true,
+            "variable_id": true,
+            "store_id": true,
+            "plain_value": true,
+            "html_value": true
+        },
+        "index": {
+            "VARIABLE_VALUE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "VARIABLE_VALUE_VARIABLE_ID_STORE_ID": true,
+            "VARIABLE_VALUE_STORE_ID_STORE_STORE_ID": true,
+            "VARIABLE_VALUE_VARIABLE_ID_VARIABLE_VARIABLE_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Variable/etc/module.xml b/app/code/Magento/Variable/etc/module.xml
index d85388d46fcbd..50a5afde34992 100644
--- a/app/code/Magento/Variable/etc/module.xml
+++ b/app/code/Magento/Variable/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Variable" setup_version="2.0.0">
+    <module name="Magento_Variable" >
     </module>
 </config>
diff --git a/app/code/Magento/Vault/Model/CustomerTokenManagement.php b/app/code/Magento/Vault/Model/CustomerTokenManagement.php
index fb6f05e0382b7..ee8da4fc2984c 100644
--- a/app/code/Magento/Vault/Model/CustomerTokenManagement.php
+++ b/app/code/Magento/Vault/Model/CustomerTokenManagement.php
@@ -40,11 +40,9 @@ public function __construct(
      */
     public function getCustomerSessionTokens()
     {
-        $vaultPayments = [];
-
         $customerId = $this->session->getCustomerId();
-        if (!$customerId) {
-            return $vaultPayments;
+        if (!$customerId || $this->session->isLoggedIn() === false) {
+            return [];
         }
 
         return $this->tokenManagement->getVisibleAvailableTokens($customerId);
diff --git a/app/code/Magento/Vault/Model/PaymentTokenFactory.php b/app/code/Magento/Vault/Model/PaymentTokenFactory.php
index e0b5d742fe8a4..6249fa4944a2c 100644
--- a/app/code/Magento/Vault/Model/PaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/PaymentTokenFactory.php
@@ -22,6 +22,11 @@ class PaymentTokenFactory implements PaymentTokenFactoryInterface
      */
     private $tokenTypes = [];
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * PaymentTokenFactory constructor.
      * @param ObjectManagerInterface $objectManager
diff --git a/app/code/Magento/Vault/Model/PaymentTokenRepository.php b/app/code/Magento/Vault/Model/PaymentTokenRepository.php
index 8539d35158214..2ccd6181b9b81 100644
--- a/app/code/Magento/Vault/Model/PaymentTokenRepository.php
+++ b/app/code/Magento/Vault/Model/PaymentTokenRepository.php
@@ -58,13 +58,15 @@ class PaymentTokenRepository implements PaymentTokenRepositoryInterface
     private $collectionProcessor;
 
     /**
-     * @param \Magento\Vault\Model\ResourceModel\PaymentToken $resourceModel
+     * PaymentTokenRepository constructor.
+     *
+     * @param PaymentTokenResourceModel $resourceModel
      * @param PaymentTokenFactory $paymentTokenFactory
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param PaymentTokenSearchResultsInterfaceFactory $searchResultsFactory
      * @param CollectionFactory $collectionFactory
-     * @param CollectionProcessorInterface | null $collectionProcessor
+     * @param CollectionProcessorInterface|null $collectionProcessor
      */
     public function __construct(
         PaymentTokenResourceModel $resourceModel,
@@ -99,7 +101,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($searchCriteria);
         $searchResults->setItems($collection->getItems());
-
+        $searchResults->setTotalCount($collection->getSize());
         return $searchResults;
     }
 
@@ -140,7 +142,7 @@ public function delete(Data\PaymentTokenInterface $paymentToken)
     /**
      * Performs persist operations for a specified payment token.
      *
-     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $entity The payment token.
+     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $paymentToken The payment token.
      * @return \Magento\Vault\Api\Data\PaymentTokenInterface Saved payment token data.
      */
     public function save(Data\PaymentTokenInterface $paymentToken)
diff --git a/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php b/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php
index c144f6ba9ea51..6d465686d1453 100644
--- a/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php
+++ b/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php
@@ -20,7 +20,7 @@ class PaymentToken extends AbstractDb
      */
     protected function _construct()
     {
-        $this->_init(InstallSchema::PAYMENT_TOKEN_TABLE, InstallSchema::ID_FILED_NAME);
+        $this->_init('vault_payment_token', 'entity_id');
     }
 
     /**
@@ -36,7 +36,7 @@ public function getByOrderPaymentId($paymentId)
             ->select()
             ->from($this->getMainTable())
             ->joinInner(
-                $this->getTable(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE),
+                $this->getTable('vault_payment_token_order_payment_link'),
                 'payment_token_id = entity_id',
                 null
             )
@@ -104,7 +104,7 @@ public function addLinkToOrderPayment($paymentTokenId, $orderPaymentId)
         $connection = $this->getConnection();
 
         $select = $connection->select()
-            ->from($this->getTable(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE))
+            ->from($this->getTable('vault_payment_token_order_payment_link'))
             ->where('order_payment_id = ?', (int) $orderPaymentId)
             ->where('payment_token_id =?', (int) $paymentTokenId);
 
@@ -113,7 +113,7 @@ public function addLinkToOrderPayment($paymentTokenId, $orderPaymentId)
         }
 
         return 1 === $connection->insert(
-            $this->getTable(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE),
+            $this->getTable('vault_payment_token_order_payment_link'),
             ['order_payment_id' => (int) $orderPaymentId, 'payment_token_id' => (int) $paymentTokenId]
         );
     }
diff --git a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
index 0cb3182980f55..d79d4ff98f0c8 100644
--- a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Vault\Model\Ui\Adminhtml;
 
 use Magento\Framework\Api\FilterBuilder;
@@ -227,7 +228,7 @@ private function getPaymentTokenEntityId()
     {
         $paymentToken = $this->getPaymentTokenManagement()->getByPaymentId($this->getOrderPaymentEntityId());
         if ($paymentToken === null) {
-            throw new NoSuchEntityException(__('No available payment tokens for specified order payment.'));
+            throw new NoSuchEntityException(__('No payment tokens are available for the specified order payment.'));
         }
         return $paymentToken->getEntityId();
     }
diff --git a/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php b/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
index 28c31c449f669..0a918fc77f3b0 100644
--- a/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
+++ b/app/code/Magento/Vault/Model/Ui/VaultConfigProvider.php
@@ -12,7 +12,7 @@
 use Magento\Vault\Api\PaymentMethodListInterface;
 
 /**
- * Provides information about vault payemnt methods availability on storefront
+ * Provides information about vault payment methods availability on storefront
  *
  * @api
  * @since 100.1.0
diff --git a/app/code/Magento/Vault/Setup/InstallSchema.php b/app/code/Magento/Vault/Setup/InstallSchema.php
deleted file mode 100644
index 32e1d62754439..0000000000000
--- a/app/code/Magento/Vault/Setup/InstallSchema.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Vault\Setup;
-
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\InstallSchemaInterface;
-
-/**
- * Class InstallSchema
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    const ID_FILED_NAME = 'entity_id';
-
-    const PAYMENT_TOKEN_TABLE = 'vault_payment_token';
-
-    const ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE = 'vault_payment_token_order_payment_link';
-
-    /**
-     * @inheritdoc
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @throws \Zend_Db_Exception
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $table = $setup->startSetup()
-            ->getConnection()
-            ->newTable($setup->getTable(self::PAYMENT_TOKEN_TABLE))
-            ->addColumn(
-                InstallSchema::ID_FILED_NAME,
-                Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Entity Id'
-            )->addColumn(
-                'customer_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => true],
-                'Customer Id'
-            )->addColumn(
-                'public_hash',
-                Table::TYPE_TEXT,
-                128,
-                ['nullable' => false],
-                'Hash code for using on frontend'
-            )->addColumn(
-                'payment_method_code',
-                Table::TYPE_TEXT,
-                128,
-                ['nullable' => false],
-                'Payment method code'
-            )->addColumn(
-                'type',
-                Table::TYPE_TEXT,
-                128,
-                ['nullable' => false],
-                'Type'
-            )->addColumn(
-                'created_at',
-                Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
-                'Created At'
-            )->addColumn(
-                'expires_at',
-                Table::TYPE_TIMESTAMP,
-                null,
-                ['nullable' => true],
-                'Expires At'
-            )->addColumn(
-                'gateway_token',
-                Table::TYPE_TEXT,
-                255,
-                ['nullable' => false],
-                'Gateway Token'
-            )->addColumn(
-                'details',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                ['nullable' => true],
-                'Details'
-            )->addColumn(
-                'is_active',
-                Table::TYPE_BOOLEAN,
-                null,
-                ['nullable' => false, 'dafault' => true],
-                'Is active flag'
-            )->addColumn(
-                'is_visible',
-                Table::TYPE_BOOLEAN,
-                null,
-                ['nullable' => false, 'dafault' => true],
-                'Is visible flag'
-            )->addIndex(
-                $setup->getIdxName(
-                    'vault_payment_token_unique_index',
-                    ['payment_method_code', 'customer_id', 'gateway_token'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['payment_method_code', 'customer_id', 'gateway_token'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )->addIndex(
-                $setup->getIdxName(
-                    'vault_payment_token_hash_unique_index',
-                    ['public_hash'],
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-                ),
-                ['public_hash'],
-                ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-            )->addForeignKey(
-                $setup->getFkName(
-                    $setup->getTable(self::PAYMENT_TOKEN_TABLE),
-                    'customer_id',
-                    $setup->getTable('customer_entity'),
-                    'entity_id'
-                ),
-                'customer_id',
-                $setup->getTable('customer_entity'),
-                'entity_id',
-                Table::ACTION_CASCADE
-            )->setComment('Vault tokens of payment');
-
-        $setup->getConnection()->createTable($table);
-
-        $table = $setup->startSetup()
-            ->getConnection()
-            ->newTable($setup->getTable(self::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE))
-            ->addColumn(
-                'order_payment_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Order payment Id'
-            )->addColumn(
-                'payment_token_id',
-                Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Payment token Id'
-            )->addForeignKey(
-                $setup->getFkName(
-                    $setup->getTable(self::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE),
-                    'order_payment_id',
-                    $setup->getTable('sales_order_payment'),
-                    'entity_id'
-                ),
-                'order_payment_id',
-                $setup->getTable('sales_order_payment'),
-                'entity_id',
-                Table::ACTION_CASCADE
-            )->addForeignKey(
-                $setup->getFkName(
-                    $setup->getTable(self::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE),
-                    'payment_token_id',
-                    $setup->getTable(self::PAYMENT_TOKEN_TABLE),
-                    'entity_id'
-                ),
-                'payment_token_id',
-                $setup->getTable(self::PAYMENT_TOKEN_TABLE),
-                'entity_id',
-                Table::ACTION_CASCADE
-            )->setComment('Order payments to vault token');
-
-        $setup->getConnection()->createTable($table);
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php b/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php
new file mode 100644
index 0000000000000..dbea50fc9c5eb
--- /dev/null
+++ b/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Vault\Setup\Patch\Data;
+
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\CreditCardTokenFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SetCreditCardAsDefaultTokenType
+ * @package Magento\Vault\Setup\Patch
+ */
+class SetCreditCardAsDefaultTokenType implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * SetCreditCardAsDefaultTokenType constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        // data update for Vault module < 2.0.1
+        // update sets credit card as default token type
+        $this->moduleDataSetup->getConnection()->update(
+            $this->moduleDataSetup->getTable('vault_payment_token'),
+            [
+                PaymentTokenInterface::TYPE => CreditCardTokenFactory::TOKEN_TYPE_CREDIT_CARD
+            ],
+            PaymentTokenInterface::TYPE . ' = ""'
+        );
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Vault/Setup/UpgradeData.php b/app/code/Magento/Vault/Setup/UpgradeData.php
deleted file mode 100644
index c617d639ce58d..0000000000000
--- a/app/code/Magento/Vault/Setup/UpgradeData.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Vault\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Model\CreditCardTokenFactory;
-
-/**
- * Class UpgradeData
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        // data update for Vault module < 2.0.1
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            // update sets credit card as default token type
-            $setup->getConnection()->update($setup->getTable(InstallSchema::PAYMENT_TOKEN_TABLE), [
-                PaymentTokenInterface::TYPE => CreditCardTokenFactory::TOKEN_TYPE_CREDIT_CARD
-            ], PaymentTokenInterface::TYPE . ' = ""');
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Vault/Test/Mftf/LICENSE.txt b/app/code/Magento/Vault/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Mftf/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/Vault/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Vault/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Mftf/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/Vault/Test/Mftf/README.md b/app/code/Magento/Vault/Test/Mftf/README.md
new file mode 100644
index 0000000000000..aeb4c78619eee
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Vault Functional Tests
+
+The Functional Test Module for **Magento Vault** module.
diff --git a/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php b/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php
index 1d9f8a6483646..bf895211fe7e2 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php
@@ -43,28 +43,30 @@ protected function setUp()
         );
     }
 
-    public function testGetCustomerSessionTokensNonRegisteredCustomer()
+    /**
+     * @param int|null $customerId
+     * @param bool $isLoggedCustomer
+     * @return void
+     * @dataProvider getCustomerSessionTokensNegativeDataProvider
+     */
+    public function testGetCustomerSessionTokensNegative($customerId, bool $isLoggedCustomer)
     {
-        $this->customerSession->expects(self::once())
-            ->method('getCustomerId')
-            ->willReturn(null);
+        $this->customerSession->method('getCustomerId')->willReturn($customerId);
+        $this->customerSession->method('isLoggedIn')->willReturn($isLoggedCustomer);
+        $this->paymentTokenManagement->expects(static::never())->method('getVisibleAvailableTokens');
 
-        $this->paymentTokenManagement->expects(static::never())
-            ->method('getVisibleAvailableTokens');
-
-        $this->tokenManagement->getCustomerSessionTokens();
+        static::assertEquals([], $this->tokenManagement->getCustomerSessionTokens());
     }
 
-    public function testGetCustomerSessionTokensForNotExistsCustomer()
+    /**
+     * @return array
+     */
+    public function getCustomerSessionTokensNegativeDataProvider()
     {
-        $this->customerSession->expects(static::once())
-            ->method('getCustomerId')
-            ->willReturn(null);
-
-        $this->paymentTokenManagement->expects(static::never())
-            ->method('getVisibleAvailableTokens');
-
-        $this->tokenManagement->getCustomerSessionTokens();
+        return [
+            'not registered customer' => [null, false],
+            'not logged in customer' => [1, false],
+        ];
     }
 
     public function testGetCustomerSessionTokens()
@@ -77,6 +79,10 @@ public function testGetCustomerSessionTokens()
             ->method('getCustomerId')
             ->willReturn($customerId);
 
+        $this->customerSession->expects(static::once())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+
         $this->paymentTokenManagement->expects(static::once())
             ->method('getVisibleAvailableTokens')
             ->with($customerId)
diff --git a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
index efbe2e9745ef1..09c17d1e58d98 100644
--- a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
@@ -160,6 +160,9 @@ public function testPositiveCase($customerId, $createdAt, $token, $isActive, $me
         static::assertEquals($createdAt, $paymentToken->getCreatedAt());
     }
 
+    /**
+     * @return array
+     */
     public function positiveCaseDataProvider()
     {
         return [
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index 4474d8ce03d9d..f888a98692288 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -5,19 +5,19 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-payment": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Vault/etc/db_schema.xml b/app/code/Magento/Vault/etc/db_schema.xml
new file mode 100644
index 0000000000000..8a7c8dc4aa9fb
--- /dev/null
+++ b/app/code/Magento/Vault/etc/db_schema.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="vault_payment_token" resource="default" engine="innodb" comment="Vault tokens of payment">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Entity ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer Id"/>
+        <column xsi:type="varchar" name="public_hash" nullable="false" length="128"
+                comment="Hash code for using on frontend"/>
+        <column xsi:type="varchar" name="payment_method_code" nullable="false" length="128"
+                comment="Payment method code"/>
+        <column xsi:type="varchar" name="type" nullable="false" length="128" comment="Type"/>
+        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <column xsi:type="timestamp" name="expires_at" on_update="false" nullable="true" comment="Expires At"/>
+        <column xsi:type="varchar" name="gateway_token" nullable="false" length="255" comment="Gateway Token"/>
+        <column xsi:type="text" name="details" nullable="true" comment="Details"/>
+        <column xsi:type="boolean" name="is_active" nullable="false" default="true"/>
+        <column xsi:type="boolean" name="is_visible" nullable="false" default="true"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="VAULT_PAYMENT_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="vault_payment_token" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="VAULT_PAYMENT_TOKEN_PAYMENT_METHOD_CODE_CSTR_ID_GATEWAY_TOKEN">
+            <column name="payment_method_code"/>
+            <column name="customer_id"/>
+            <column name="gateway_token"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="VAULT_PAYMENT_TOKEN_PUBLIC_HASH">
+            <column name="public_hash"/>
+        </constraint>
+    </table>
+    <table name="vault_payment_token_order_payment_link" resource="default" engine="innodb"
+           comment="Order payments to vault token">
+        <column xsi:type="int" name="order_payment_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Order payment Id"/>
+        <column xsi:type="int" name="payment_token_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Payment token Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="order_payment_id"/>
+            <column name="payment_token_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="FK_CF37B9D854256534BE23C818F6291CA2"
+                    table="vault_payment_token_order_payment_link" column="order_payment_id"
+                    referenceTable="sales_order_payment" referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="FK_4ED894655446D385894580BECA993862"
+                    table="vault_payment_token_order_payment_link" column="payment_token_id"
+                    referenceTable="vault_payment_token" referenceColumn="entity_id" onDelete="CASCADE"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/Vault/etc/db_schema_whitelist.json b/app/code/Magento/Vault/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..e2275dc3532d7
--- /dev/null
+++ b/app/code/Magento/Vault/etc/db_schema_whitelist.json
@@ -0,0 +1,36 @@
+{
+    "vault_payment_token": {
+        "column": {
+            "entity_id": true,
+            "customer_id": true,
+            "public_hash": true,
+            "payment_method_code": true,
+            "type": true,
+            "created_at": true,
+            "expires_at": true,
+            "gateway_token": true,
+            "details": true,
+            "is_active": true,
+            "is_visible": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "VAULT_PAYMENT_TOKEN_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "VAULT_PAYMENT_TOKEN_PAYMENT_METHOD_CODE_CSTR_ID_GATEWAY_TOKEN": true,
+            "UNQ_54DCE14AEAEA03B587F9EF723EB10A10": true,
+            "VAULT_PAYMENT_TOKEN_PUBLIC_HASH": true,
+            "VAULT_PAYMENT_TOKEN_HASH_UNIQUE_INDEX_PUBLIC_HASH": true
+        }
+    },
+    "vault_payment_token_order_payment_link": {
+        "column": {
+            "order_payment_id": true,
+            "payment_token_id": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_CF37B9D854256534BE23C818F6291CA2": true,
+            "FK_4ED894655446D385894580BECA993862": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Vault/etc/module.xml b/app/code/Magento/Vault/etc/module.xml
index 1a7d1fe7d09fd..a6d44d333fc02 100644
--- a/app/code/Magento/Vault/etc/module.xml
+++ b/app/code/Magento/Vault/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Vault" setup_version="2.0.2">
+    <module name="Magento_Vault" >
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Store"/>
diff --git a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
index 0ef330cd3014e..b5593626fb15c 100644
--- a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
+++ b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
@@ -32,6 +32,11 @@
 
     <div class="payment-method-content">
         <each args="getRegion('messages')" render=""></each>
+        <div class="payment-method-billing-address">
+            <each args="data: $parent.getRegion(getBillingAddressFormName()), as: '$item'">
+                <render args="$item.getTemplate()"/>
+            </each>
+        </div>
         <div class="checkout-agreements-block">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
index 4314676c479f9..0db9b5f80d483 100644
--- a/app/code/Magento/Version/Controller/Index/Index.php
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -6,15 +6,15 @@
  */
 namespace Magento\Version\Controller\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\Exception\StateException;
 
 /**
  * Magento Version controller
  */
-class Index extends Action
+class Index extends Action implements HttpGetActionInterface
 {
     /**
      * @var ProductMetadataInterface
@@ -39,9 +39,12 @@ public function __construct(Context $context, ProductMetadataInterface $productM
      */
     public function execute()
     {
-        $versionParts = explode('.', $this->productMetadata->getVersion());
-        if (!isset($versionParts[0]) || !isset($versionParts[1])) {
-            return ; // Major and minor version are not set - return empty response
+        $version = $this->productMetadata->getVersion();
+        $versionParts = explode('.', $version);
+        if ((!isset($versionParts[0]) || !isset($versionParts[1]))
+            || $this->isGitBasedInstallation($version)
+        ) {
+            return;
         }
         $majorMinorVersion = $versionParts[0] . '.' . $versionParts[1];
         $this->getResponse()->setBody(
@@ -50,4 +53,16 @@ public function execute()
             $this->productMetadata->getEdition() . ')'
         );
     }
+
+    /**
+     * Check if provided version is generated by Git-based Magento instance.
+     *
+     * @param string $fullVersion
+     * @return bool
+     */
+    private function isGitBasedInstallation($fullVersion)
+    {
+        $versionParts = explode('-', $fullVersion);
+        return (isset($versionParts[0]) && $versionParts[0] == 'dev');
+    }
 }
diff --git a/app/code/Magento/Version/Test/Mftf/LICENSE.txt b/app/code/Magento/Version/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Version/Test/Mftf/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/Version/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Version/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Version/Test/Mftf/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/Version/Test/Mftf/README.md b/app/code/Magento/Version/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a5b08aaa6d9d3
--- /dev/null
+++ b/app/code/Magento/Version/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Version Functional Tests
+
+The Functional Test Module for **Magento Version** module.
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index 91df7db9d801c..81da36715ae82 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Version/etc/module.xml b/app/code/Magento/Version/etc/module.xml
index 8108aaa038aee..fe8ace51ea07d 100644
--- a/app/code/Magento/Version/etc/module.xml
+++ b/app/code/Magento/Version/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Version" setup_version="2.0.0">
+    <module name="Magento_Version" >
     </module>
 </config>
diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php
index 5e8c23aa15506..c5748cc6e848e 100644
--- a/app/code/Magento/Webapi/Controller/PathProcessor.php
+++ b/app/code/Magento/Webapi/Controller/PathProcessor.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Class PathProcessor
+ */
 class PathProcessor
 {
     /**  Store code alias to indicate that all stores should be affected by action */
@@ -50,7 +53,7 @@ private function stripPathBeforeStorecode($pathInfo)
     public function process($pathInfo)
     {
         $pathParts = $this->stripPathBeforeStorecode($pathInfo);
-        $storeCode = $pathParts[0];
+        $storeCode = current($pathParts);
         $stores = $this->storeManager->getStores(false, true);
         if (isset($stores[$storeCode])) {
             $this->storeManager->setCurrentStore($storeCode);
diff --git a/app/code/Magento/Webapi/Controller/Rest.php b/app/code/Magento/Webapi/Controller/Rest.php
index dc061aeea99e7..0ef88f9ebf31f 100644
--- a/app/code/Magento/Webapi/Controller/Rest.php
+++ b/app/code/Magento/Webapi/Controller/Rest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Webapi\Controller;
 
 use Magento\Framework\App\DeploymentConfig;
@@ -13,15 +14,13 @@
 use Magento\Framework\Webapi\Request;
 use Magento\Framework\Webapi\Rest\Request as RestRequest;
 use Magento\Framework\Webapi\Rest\Response as RestResponse;
-use Magento\Framework\Webapi\Rest\Response\FieldsFilter;
 use Magento\Framework\Webapi\ServiceInputProcessor;
-use Magento\Framework\Webapi\ServiceOutputProcessor;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Webapi\Controller\Rest\ParamsOverrider;
 use Magento\Webapi\Controller\Rest\Router;
 use Magento\Webapi\Controller\Rest\Router\Route;
-use Magento\Webapi\Model\Rest\Swagger\Generator;
+use Magento\Webapi\Controller\Rest\RequestProcessorPool;
 
 /**
  * Front controller for WebAPI REST area.
@@ -31,7 +30,11 @@
  */
 class Rest implements \Magento\Framework\App\FrontControllerInterface
 {
-    /** Path for accessing REST API schema */
+    /**
+     * Path for accessing REST API schema
+     *
+     * @deprecated 100.3.0
+     */
     const SCHEMA_PATH = '/schema';
 
     /**
@@ -93,11 +96,6 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
      */
     protected $areaList;
 
-    /**
-     * @var \Magento\Framework\Webapi\Rest\Response\FieldsFilter
-     */
-    protected $fieldsFilter;
-
     /**
      * @var \Magento\Framework\Session\Generic
      */
@@ -110,14 +108,9 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
     protected $paramsOverrider;
 
     /**
-     * @var \Magento\Framework\Webapi\ServiceOutputProcessor
-     */
-    protected $serviceOutputProcessor;
-
-    /**
-     * @var \Magento\Webapi\Model\Rest\Swagger\Generator
+     * @var RequestProcessorPool
      */
-    protected $swaggerGenerator;
+    protected $requestProcessorPool;
 
     /**
      * @var StoreManagerInterface
@@ -125,16 +118,6 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
      */
     private $storeManager;
 
-    /**
-     * @var DeploymentConfig
-     */
-    private $deploymentConfig;
-
-    /**
-     * @var Rest\InputParamsResolver
-     */
-    private $inputParamsResolver;
-
     /**
      * Initialize dependencies
      *
@@ -148,11 +131,9 @@ class Rest implements \Magento\Framework\App\FrontControllerInterface
      * @param ErrorProcessor $errorProcessor
      * @param PathProcessor $pathProcessor
      * @param \Magento\Framework\App\AreaList $areaList
-     * @param FieldsFilter $fieldsFilter
      * @param ParamsOverrider $paramsOverrider
-     * @param ServiceOutputProcessor $serviceOutputProcessor
-     * @param Generator $swaggerGenerator ,
      * @param StoreManagerInterface $storeManager
+     * @param RequestProcessorPool $requestProcessorPool
      *
      * TODO: Consider removal of warning suppression
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -168,11 +149,9 @@ public function __construct(
         ErrorProcessor $errorProcessor,
         PathProcessor $pathProcessor,
         \Magento\Framework\App\AreaList $areaList,
-        FieldsFilter $fieldsFilter,
         ParamsOverrider $paramsOverrider,
-        ServiceOutputProcessor $serviceOutputProcessor,
-        Generator $swaggerGenerator,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        RequestProcessorPool $requestProcessorPool
     ) {
         $this->_router = $router;
         $this->_request = $request;
@@ -184,37 +163,9 @@ public function __construct(
         $this->_errorProcessor = $errorProcessor;
         $this->_pathProcessor = $pathProcessor;
         $this->areaList = $areaList;
-        $this->fieldsFilter = $fieldsFilter;
         $this->paramsOverrider = $paramsOverrider;
-        $this->serviceOutputProcessor = $serviceOutputProcessor;
-        $this->swaggerGenerator = $swaggerGenerator;
         $this->storeManager = $storeManager;
-    }
-
-    /**
-     * Get deployment config
-     *
-     * @return DeploymentConfig
-     */
-    private function getDeploymentConfig()
-    {
-        if (!$this->deploymentConfig instanceof \Magento\Framework\App\DeploymentConfig) {
-            $this->deploymentConfig = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\App\DeploymentConfig::class);
-        }
-        return $this->deploymentConfig;
-    }
-
-    /**
-     * Set deployment config
-     *
-     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
-     * @return void
-     * @deprecated 100.1.0
-     */
-    public function setDeploymentConfig(\Magento\Framework\App\DeploymentConfig $deploymentConfig)
-    {
-        $this->deploymentConfig = $deploymentConfig;
+        $this->requestProcessorPool = $requestProcessorPool;
     }
 
     /**
@@ -233,15 +184,13 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
         $this->areaList->getArea($this->_appState->getAreaCode())
             ->load(\Magento\Framework\App\Area::PART_TRANSLATE);
         try {
-            if ($this->isSchemaRequest()) {
-                $this->processSchemaRequest();
-            } else {
-                $this->processApiRequest();
-            }
+            $processor = $this->requestProcessorPool->getProcessor($this->_request);
+            $processor->process($this->_request);
         } catch (\Exception $e) {
             $maskedException = $this->_errorProcessor->maskException($e);
             $this->_response->setException($maskedException);
         }
+
         return $this->_response;
     }
 
@@ -267,6 +216,7 @@ protected function getCurrentRoute()
         if (!$this->_route) {
             $this->_route = $this->_router->match($this->_request);
         }
+
         return $this->_route;
     }
 
@@ -284,65 +234,11 @@ protected function checkPermissions()
         if (!$this->authorization->isAllowed($route->getAclResources())) {
             $params = ['resources' => implode(', ', $route->getAclResources())];
             throw new AuthorizationException(
-                __('Consumer is not authorized to access %resources', $params)
+                __("The consumer isn't authorized to access %resources.", $params)
             );
         }
     }
 
-    /**
-     * Execute schema request
-     *
-     * @return void
-     */
-    protected function processSchemaRequest()
-    {
-        $requestedServices = $this->_request->getRequestedServices('all');
-        $requestedServices = $requestedServices == Request::ALL_SERVICES
-            ? $this->swaggerGenerator->getListOfServices()
-            : $requestedServices;
-        $responseBody = $this->swaggerGenerator->generate(
-            $requestedServices,
-            $this->_request->getScheme(),
-            $this->_request->getHttpHost(false),
-            $this->_request->getRequestUri()
-        );
-        $this->_response->setBody($responseBody)->setHeader('Content-Type', 'application/json');
-    }
-
-    /**
-     * Execute API request
-     *
-     * @return void
-     * @throws AuthorizationException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Webapi\Exception
-     */
-    protected function processApiRequest()
-    {
-        $inputParams = $this->getInputParamsResolver()->resolve();
-
-        $route = $this->getInputParamsResolver()->getRoute();
-        $serviceMethodName = $route->getServiceMethod();
-        $serviceClassName = $route->getServiceClass();
-
-        $service = $this->_objectManager->get($serviceClassName);
-        /** @var \Magento\Framework\Api\AbstractExtensibleObject $outputData */
-        $outputData = call_user_func_array([$service, $serviceMethodName], $inputParams);
-        $outputData = $this->serviceOutputProcessor->process(
-            $outputData,
-            $serviceClassName,
-            $serviceMethodName
-        );
-        if ($this->_request->getParam(FieldsFilter::FILTER_PARAMETER) && is_array($outputData)) {
-            $outputData = $this->fieldsFilter->filter($outputData);
-        }
-        $header = $this->getDeploymentConfig()->get(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT);
-        if ($header) {
-            $this->_response->setHeader('X-Frame-Options', $header);
-        }
-        $this->_response->prepareResponse($outputData);
-    }
-
     /**
      * Validate request
      *
@@ -364,20 +260,4 @@ protected function validateRequest()
             throw new \Magento\Framework\Webapi\Exception(__('Cannot perform GET operation with store code \'all\''));
         }
     }
-
-    /**
-     * The getter function to get InputParamsResolver object
-     *
-     * @return \Magento\Webapi\Controller\Rest\InputParamsResolver
-     *
-     * @deprecated 100.1.0
-     */
-    private function getInputParamsResolver()
-    {
-        if ($this->inputParamsResolver === null) {
-            $this->inputParamsResolver = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Webapi\Controller\Rest\InputParamsResolver::class);
-        }
-        return $this->inputParamsResolver;
-    }
 }
diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
index 1d8ccc127cea9..d1a3c0c0f0864 100644
--- a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
+++ b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
@@ -197,7 +197,7 @@ private function isPropertyDeclaredInDataObject(
             $index = array_search($serviceMethodParamName, array_column($methodParams, 'name'));
             if ($index !== false) {
                 $paramObjectType = $methodParams[$index][MethodsMap::METHOD_META_TYPE];
-                $setter = 'set' . ucfirst(SimpleDataObjectConverter::snakeCaseToCamelCase($objectProperty));
+                $setter = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($objectProperty);
                 if (array_key_exists(
                     $setter,
                     $this->getMethodsMap()->getMethodsMap($paramObjectType)
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
new file mode 100644
index 0000000000000..f4340c18e2134
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Webapi\Controller\Rest;
+
+/**
+ *  Request processor interface
+ */
+interface RequestProcessorInterface
+{
+    /**
+     * Executes the logic to process the request
+     *
+     * @param \Magento\Framework\Webapi\Rest\Request $request
+     * @return void
+     * @throws \Magento\Framework\Exception\AuthorizationException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Webapi\Exception
+     */
+    public function process(\Magento\Framework\Webapi\Rest\Request $request);
+
+    /**
+     * Method should return true for all the request current processor can process.
+     *
+     * Invoked in the loop for all registered request processors. The first one wins.
+     *
+     * @param \Magento\Framework\Webapi\Rest\Request $request
+     * @return bool
+     */
+    public function canProcess(\Magento\Framework\Webapi\Rest\Request $request);
+}
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php
new file mode 100644
index 0000000000000..3fc7dd6f5c865
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Webapi\Controller\Rest;
+
+/**
+ *  Request Processor Pool
+ */
+class RequestProcessorPool
+{
+
+    /**
+     * @var array
+     */
+    private $requestProcessors;
+
+    /**
+     * Initial dependencies
+     *
+     * @param RequestProcessorInterface[] $requestProcessors
+     */
+    public function __construct($requestProcessors = [])
+    {
+        $this->requestProcessors = $requestProcessors;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @throws \Magento\Framework\Webapi\Exception
+     * return RequestProcessorInterface
+     */
+    public function getProcessor(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        foreach ($this->requestProcessors as $processor) {
+            if ($processor->canProcess($request)) {
+                return $processor;
+            }
+        }
+
+        throw new \Magento\Framework\Webapi\Exception(
+            __('Specified request cannot be processed.'),
+            0,
+            \Magento\Framework\Webapi\Exception::HTTP_BAD_REQUEST
+        );
+    }
+}
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php b/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php
index 07e3e7791103c..048c0d86bc312 100644
--- a/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php
@@ -84,7 +84,7 @@ private function checkPermissions()
         if (!$this->authorization->isAllowed($route->getAclResources())) {
             $params = ['resources' => implode(', ', $route->getAclResources())];
             throw new AuthorizationException(
-                __('Consumer is not authorized to access %resources', $params)
+                __("The consumer isn't authorized to access %resources.", $params)
             );
         }
     }
diff --git a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
index 6e2fda94237d7..ca5dfe2e2b822 100644
--- a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
+++ b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
@@ -241,4 +241,14 @@ public function getParameters()
     {
         return $this->parameters;
     }
+
+    /**
+     * Get route path.
+     *
+     * @return string
+     */
+    public function getRoutePath()
+    {
+        return $this->route;
+    }
 }
diff --git a/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php b/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
new file mode 100644
index 0000000000000..0f1587c342fa7
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Webapi\Controller\Rest;
+
+use Magento\Webapi\Model\Rest\Swagger\Generator;
+use Magento\Framework\Webapi\Rest\Response as RestResponse;
+use Magento\Framework\Webapi\Request;
+
+/**
+ * REST request processor for synchronous "schema" requests
+ */
+class SchemaRequestProcessor implements RequestProcessorInterface
+{
+
+    const PROCESSOR_PATH = '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(false),
+            $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/Webapi/Controller/Rest/SynchronousRequestProcessor.php b/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
new file mode 100644
index 0000000000000..f5aa6bd88c399
--- /dev/null
+++ b/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Webapi\Controller\Rest;
+
+use Magento\Framework\Webapi\Rest\Response as RestResponse;
+use Magento\Framework\Webapi\ServiceOutputProcessor;
+use Magento\Framework\Webapi\Rest\Response\FieldsFilter;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+
+/**
+ * REST request processor for synchronous requests
+ */
+class SynchronousRequestProcessor implements RequestProcessorInterface
+{
+    const PROCESSOR_PATH = "/^\\/V\\d+/";
+
+    /**
+     * @var RestResponse
+     */
+    private $response;
+
+    /**
+     * @var InputParamsResolver
+     */
+    private $inputParamsResolver;
+
+    /**
+     * @var ServiceOutputProcessor
+     */
+    private $serviceOutputProcessor;
+
+    /**
+     * @var FieldsFilter
+     */
+    private $fieldsFilter;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Initial dependencies
+     *
+     * @param \Magento\Framework\Webapi\Rest\Response $response
+     * @param \Magento\Webapi\Controller\Rest\InputParamsResolver $inputParamsResolver
+     * @param \Magento\Framework\Webapi\ServiceOutputProcessor $serviceOutputProcessor
+     * @param \Magento\Framework\Webapi\Rest\Response\FieldsFilter $fieldsFilter
+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        RestResponse $response,
+        InputParamsResolver $inputParamsResolver,
+        ServiceOutputProcessor $serviceOutputProcessor,
+        FieldsFilter $fieldsFilter,
+        DeploymentConfig $deploymentConfig,
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->response = $response;
+        $this->inputParamsResolver = $inputParamsResolver;
+        $this->serviceOutputProcessor = $serviceOutputProcessor;
+        $this->fieldsFilter = $fieldsFilter;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     *  {@inheritdoc}
+     */
+    public function process(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        $inputParams = $this->inputParamsResolver->resolve();
+
+        $route = $this->inputParamsResolver->getRoute();
+        $serviceMethodName = $route->getServiceMethod();
+        $serviceClassName = $route->getServiceClass();
+        $service = $this->objectManager->get($serviceClassName);
+
+        /**
+         * @var \Magento\Framework\Api\AbstractExtensibleObject $outputData
+         */
+        $outputData = call_user_func_array([$service, $serviceMethodName], $inputParams);
+        $outputData = $this->serviceOutputProcessor->process(
+            $outputData,
+            $serviceClassName,
+            $serviceMethodName
+        );
+        if ($request->getParam(FieldsFilter::FILTER_PARAMETER) && is_array($outputData)) {
+            $outputData = $this->fieldsFilter->filter($outputData);
+        }
+        $header = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT);
+        if ($header) {
+            $this->response->setHeader('X-Frame-Options', $header);
+        }
+        $this->response->prepareResponse($outputData);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        if (preg_match(self::PROCESSOR_PATH, $request->getPathInfo()) === 1) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/Webapi/Controller/Soap.php b/app/code/Magento/Webapi/Controller/Soap.php
index 32e1cdb9c888d..215ae4752aa1d 100644
--- a/app/code/Magento/Webapi/Controller/Soap.php
+++ b/app/code/Magento/Webapi/Controller/Soap.php
@@ -51,6 +51,11 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
      */
     protected $_errorProcessor;
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    protected $_appState;
+
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
      */
diff --git a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
index 0e87805daf60a..486275ac69dc5 100644
--- a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
+++ b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Webapi\Controller\Soap\Request;
 
 use Magento\Framework\Api\ExtensibleDataInterface;
@@ -106,7 +107,7 @@ public function __construct(
      *
      * @param string $operation
      * @param array $arguments
-     * @return \stdClass|null
+     * @return array
      * @throws WebapiException
      * @throws \LogicException
      * @throws AuthorizationException
@@ -126,7 +127,7 @@ public function __call($operation, $arguments)
         if (!$this->authorization->isAllowed($serviceMethodInfo[ServiceMetadata::KEY_ACL_RESOURCES])) {
             throw new AuthorizationException(
                 __(
-                    'Consumer is not authorized to access %resources',
+                    "The consumer isn't authorized to access %resources.",
                     ['resources' => implode(', ', $serviceMethodInfo[ServiceMetadata::KEY_ACL_RESOURCES])]
                 )
             );
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
index eaf39549b2c2a..d89513b50c9c5 100644
--- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
+++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -7,10 +7,14 @@
 namespace Magento\Webapi\Model\Authorization;
 
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Integration\Model\Oauth\Token;
 use Magento\Integration\Model\Oauth\TokenFactory;
 use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Framework\Webapi\Request;
+use Magento\Framework\Stdlib\DateTime\DateTime as Date;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Integration\Helper\Oauth\Data as OauthHelper;
 
 /**
  * A user context determined by tokens in a HTTP request Authorization header.
@@ -47,21 +51,51 @@ class TokenUserContext implements UserContextInterface
      */
     protected $integrationService;
 
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var Date
+     */
+    private $date;
+
+    /**
+     * @var OauthHelper
+     */
+    private $oauthHelper;
+
     /**
      * Initialize dependencies.
      *
      * @param Request $request
      * @param TokenFactory $tokenFactory
      * @param IntegrationServiceInterface $integrationService
+     * @param DateTime|null $dateTime
+     * @param Date|null $date
+     * @param OauthHelper|null $oauthHelper
      */
     public function __construct(
         Request $request,
         TokenFactory $tokenFactory,
-        IntegrationServiceInterface $integrationService
+        IntegrationServiceInterface $integrationService,
+        DateTime $dateTime = null,
+        Date $date = null,
+        OauthHelper $oauthHelper = null
     ) {
         $this->request = $request;
         $this->tokenFactory = $tokenFactory;
         $this->integrationService = $integrationService;
+        $this->dateTime = $dateTime ?: ObjectManager::getInstance()->get(
+            DateTime::class
+        );
+        $this->date = $date ?: ObjectManager::getInstance()->get(
+            Date::class
+        );
+        $this->oauthHelper = $oauthHelper ?: ObjectManager::getInstance()->get(
+            OauthHelper::class
+        );
     }
 
     /**
@@ -82,6 +116,34 @@ public function getUserType()
         return $this->userType;
     }
 
+    /**
+     * Check if token is expired.
+     *
+     * @param Token $token
+     * @return bool
+     */
+    private function isTokenExpired(Token $token): bool
+    {
+        if ($token->getUserType() == UserContextInterface::USER_TYPE_ADMIN) {
+            $tokenTtl = $this->oauthHelper->getAdminTokenLifetime();
+        } elseif ($token->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
+            $tokenTtl = $this->oauthHelper->getCustomerTokenLifetime();
+        } else {
+            // other user-type tokens are considered always valid
+            return false;
+        }
+
+        if (empty($tokenTtl)) {
+            return false;
+        }
+
+        if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Finds the bearer token and looks up the value.
      *
@@ -114,8 +176,9 @@ protected function processRequest()
         $bearerToken = $headerPieces[1];
         $token = $this->tokenFactory->create()->loadByToken($bearerToken);
 
-        if (!$token->getId() || $token->getRevoked()) {
+        if (!$token->getId() || $token->getRevoked() || $this->isTokenExpired($token)) {
             $this->isRequestProcessed = true;
+
             return;
         }
 
diff --git a/app/code/Magento/Webapi/Model/Config.php b/app/code/Magento/Webapi/Model/Config.php
index cf268828c8091..b957279edd2c0 100644
--- a/app/code/Magento/Webapi/Model/Config.php
+++ b/app/code/Magento/Webapi/Model/Config.php
@@ -17,7 +17,7 @@
  * @api
  * @since 100.0.2
  */
-class Config
+class Config implements ConfigInterface
 {
     const CACHE_ID = 'webapi_config';
 
@@ -66,9 +66,7 @@ public function __construct(
     }
 
     /**
-     * Return services loaded from cache if enabled or from files merged previously
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getServices()
     {
diff --git a/app/code/Magento/Webapi/Model/ConfigInterface.php b/app/code/Magento/Webapi/Model/ConfigInterface.php
new file mode 100644
index 0000000000000..338c18795595f
--- /dev/null
+++ b/app/code/Magento/Webapi/Model/ConfigInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Webapi\Model;
+
+/**
+ * This class gives access to consolidated web API configuration from <Module_Name>/etc/webapi.xml files.
+ *
+ * @api
+ */
+interface ConfigInterface
+{
+    /**
+     * Return services loaded from cache if enabled or from files merged previously
+     *
+     * @return array
+     */
+    public function getServices();
+}
diff --git a/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php b/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php
index 4eb8b131e0718..78082fab8bd9c 100644
--- a/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php
+++ b/app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php
@@ -19,7 +19,7 @@ class GuestAuthorization
      * Check if resource for which access is needed has anonymous permissions defined in webapi config.
      *
      * @param \Magento\Framework\Authorization $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param string $resource
      * @param string $privilege
      * @return bool true If resource permission is anonymous,
diff --git a/app/code/Magento/Webapi/Model/Rest/Config.php b/app/code/Magento/Webapi/Model/Rest/Config.php
index 2e1148b8a6469..aa5dfdd7a7fd9 100644
--- a/app/code/Magento/Webapi/Model/Rest/Config.php
+++ b/app/code/Magento/Webapi/Model/Rest/Config.php
@@ -6,7 +6,7 @@
 namespace Magento\Webapi\Model\Rest;
 
 use Magento\Webapi\Controller\Rest\Router\Route;
-use Magento\Webapi\Model\Config as ModelConfig;
+use Magento\Webapi\Model\ConfigInterface as ModelConfigInterface;
 use Magento\Webapi\Model\Config\Converter;
 
 /**
@@ -21,6 +21,7 @@ class Config
     const HTTP_METHOD_DELETE = 'DELETE';
     const HTTP_METHOD_PUT = 'PUT';
     const HTTP_METHOD_POST = 'POST';
+    const HTTP_METHOD_PATCH = 'PATCH';
     /**#@-*/
 
     /**#@+
@@ -43,11 +44,13 @@ class Config
     protected $_routeFactory;
 
     /**
-     * @param ModelConfig $config
+     * @param ModelConfigInterface $config
      * @param \Magento\Framework\Controller\Router\Route\Factory $routeFactory
      */
-    public function __construct(ModelConfig $config, \Magento\Framework\Controller\Router\Route\Factory $routeFactory)
-    {
+    public function __construct(
+        ModelConfigInterface $config,
+        \Magento\Framework\Controller\Router\Route\Factory $routeFactory
+    ) {
         $this->_config = $config;
         $this->_routeFactory = $routeFactory;
     }
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index 6609040b040d0..855f455120d89 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -39,7 +39,7 @@ class Generator extends AbstractSchemaGenerator
     const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';
 
     /** Array signifier */
-    const ARRAY_SIGNIFIER = '[]';
+    const ARRAY_SIGNIFIER = '[0]';
 
     /**
      * Swagger factory instance.
@@ -749,7 +749,8 @@ private function handlePrimitive($name, $prefix)
     private function convertPathParams($uri)
     {
         $parts = explode('/', $uri);
-        for ($i=0; $i < count($parts); $i++) {
+        $count = count($parts);
+        for ($i=0; $i < $count; $i++) {
             if (strpos($parts[$i], ':') === 0) {
                 $parts[$i] = '{' . substr($parts[$i], 1) . '}';
             }
@@ -862,9 +863,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/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php
index ee9c194e7c55a..74b1b41ee1bf5 100644
--- a/app/code/Magento/Webapi/Model/Soap/Fault.php
+++ b/app/code/Magento/Webapi/Model/Soap/Fault.php
@@ -39,7 +39,9 @@ class Fault
     const NODE_DETAIL_WRAPPER = 'GenericFault';
     /**#@-*/
 
-    /**#@-*/
+    /**
+     * @var string
+     */
     protected $_soapFaultCode;
 
     /**
@@ -114,7 +116,7 @@ public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         State $appState
     ) {
-        $this->_soapCode = $exception->getOriginator();
+        $this->_soapFaultCode = $exception->getOriginator();
         $this->_parameters = $exception->getDetails();
         $this->_wrappedErrors = $exception->getErrors();
         $this->stackTrace = $exception->getStackTrace() ?: $exception->getTraceAsString();
@@ -194,7 +196,7 @@ public function getDetails()
      */
     public function getSoapCode()
     {
-        return $this->_soapCode;
+        return $this->_soapFaultCode;
     }
 
     /**
@@ -355,7 +357,7 @@ protected function _getWrappedErrorsXml($wrappedErrors)
 
         $errorsXml = '';
         foreach ($wrappedErrors as $error) {
-            $errorsXml .= $this->_generateErrorNodeXml($error);
+            $errorsXml .= $this->_generateErrorNodeXML($error);
         }
         if (!empty($errorsXml)) {
             $wrappedErrorsNode = self::NODE_DETAIL_WRAPPED_ERRORS;
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
index aa7a4041ae415..be2dec2860772 100644
--- a/app/code/Magento/Webapi/Model/Soap/Server.php
+++ b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -31,7 +31,7 @@ class Server
     const REQUEST_PARAM_LIST_WSDL = 'wsdl_list';
 
     /**
-     * @var \Magento\Framework\App\AreaLIst
+     * @var \Magento\Framework\App\AreaList
      */
     protected $_areaList;
 
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
index 401440684165c..3884a0ef026e1 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
@@ -229,7 +229,8 @@ public function addAnnotation(\DOMElement $element, $documentation, $default = n
         $this->_processElementType($elementType, $documentation, $appInfoNode);
 
         if (preg_match_all('/{([a-z]+):(.+)}/Ui', $documentation, $matches)) {
-            for ($i = 0; $i < count($matches[0]); $i++) {
+            $count = count($matches[0]);
+            for ($i = 0; $i < $count; $i++) {
                 $appinfoTag = $matches[0][$i];
                 $tagName = $matches[1][$i];
                 $tagValue = $matches[2][$i];
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
index fe6a2a353ff57..e14b4a05f41fd 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Webapi\Model\Soap\Wsdl;
 
 use Magento\Webapi\Model\AbstractSchemaGenerator;
@@ -375,7 +376,7 @@ protected function getAllowedServicesMetadata($requestedServices)
         if (!$allowedServicesMetadata) {
             throw new AuthorizationException(
                 __(
-                    'Consumer is not authorized to access %resources',
+                    "The consumer isn't authorized to access %resources.",
                     ['resources' => implode(', ', $requestedServices)]
                 )
             );
diff --git a/app/code/Magento/Webapi/Test/Mftf/LICENSE.txt b/app/code/Magento/Webapi/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Webapi/Test/Mftf/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/Webapi/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Webapi/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Webapi/Test/Mftf/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/Webapi/Test/Mftf/README.md b/app/code/Magento/Webapi/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c59b55fed533d
--- /dev/null
+++ b/app/code/Magento/Webapi/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Webapi Functional Tests
+
+The Functional Test Module for **Magento Webapi** module.
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
index 7f3fe558a98eb..c213c72b5185a 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
@@ -51,6 +51,9 @@ public function testAllStoreCode($storeCodeInPath, $storeCodeSet, $setCurrentSto
         $this->assertSame($this->endpointPath, $result);
     }
 
+    /**
+     * @return array
+     */
     public function processPathDataProvider()
     {
         return [
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/RequestValidatorTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/RequestValidatorTest.php
index 9d57db911fd51..a0dadd345dd72 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/RequestValidatorTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/RequestValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Webapi\Test\Unit\Controller\Rest;
 
 class RequestValidatorTest extends \PHPUnit\Framework\TestCase
@@ -131,7 +132,7 @@ public function testInSecureRequestOverSecureRoute()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthorizationException
-     * @expectedExceptionMessage Consumer is not authorized to access 5, 6
+     * @expectedExceptionMessage The consumer isn't authorized to access 5, 6.
      */
     public function testAuthorizationFailed()
     {
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
index 99274724cc565..582d387054ee6 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
@@ -62,16 +62,30 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     protected $swaggerGeneratorMock;
 
-    /** @var  \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var  \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
     private $storeManagerMock;
 
-    /** @var  \Magento\Store\Api\Data\StoreInterface | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var  \Magento\Store\Api\Data\StoreInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
     private $storeMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var  \Magento\Webapi\Controller\Rest\SchemaRequestProcessor | \PHPUnit_Framework_MockObject_MockObject
      */
-    private $deploymentConfigMock;
+    protected $schemaRequestProcessor;
+
+    /**
+     * @var  \Magento\Webapi\Controller\Rest\SynchronousRequestProcessor | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $synchronousRequestProcessor;
+
+    /**
+     * @var  \Magento\Webapi\Controller\Rest\RequestProcessorPool | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestProcessorPool;
 
     const SERVICE_METHOD = 'testMethod';
 
@@ -79,94 +93,87 @@ class RestTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $this->_requestMock = $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class)
-            ->setMethods(
-                [
-                    'isSecure',
-                    'getRequestData',
-                    'getParams',
-                    'getParam',
-                    'getRequestedServices',
-                    'getPathInfo',
-                    'getHttpHost',
-                    'getMethod',
-                ]
-            )->disableOriginalConstructor()->getMock();
+        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+        $this->_requestMock = $this->getRequestMock();
         $this->_requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com');
-        $this->_responseMock = $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class)
-            ->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])->disableOriginalConstructor()->getMock();
+        $this->_responseMock = $this->getResponseMock();
         $routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match'])
             ->disableOriginalConstructor()->getMock();
-        $this->_routeMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class)
-            ->setMethods(['isSecure', 'getServiceMethod', 'getServiceClass', 'getAclResources', 'getParameters'])
-            ->disableOriginalConstructor()->getMock();
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+
+        $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();
-        $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class)
             ->disableOriginalConstructor()
-            ->setMethods(['generate', 'getListOfServices'])
+            ->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();
 
-        /** Init SUT. */
         $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,
+                    '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,
-                    'swaggerGenerator' => $this->swaggerGeneratorMock,
-                    'storeManager' => $this->storeManagerMock
+                    'errorProcessor'        => $errorProcessorMock,
+                    'areaList'              => $areaListMock,
+                    'paramsOverrider'       => $paramsOverriderMock,
+                    'dataObjectProcessor'   => $dataObjectProcessorMock,
+                    'storeManager'          => $this->storeManagerMock,
+                    'requestProcessorPool'  => $this->requestProcessorPool,
                 ]
             );
 
-        $this->_restController->setDeploymentConfig($this->deploymentConfigMock);
-        // Set default expectations used by all tests
         $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();
     }
 
@@ -177,16 +184,17 @@ public function testDispatchSchemaRequest()
         ];
         $this->_requestMock->expects($this->any())
             ->method('getPathInfo')
-            ->willReturn(\Magento\Webapi\Controller\Rest::SCHEMA_PATH);
+            ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::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);
 
-        /** @var \Magento\Framework\App\ResponseInterface $response */
-        $response = $this->_restController->dispatch($this->_requestMock);
-        $this->assertEquals($schema, $response->getBody());
+        $this->assertEquals($schema, $this->_responseMock->getBody());
     }
 
     public function testDispatchAllSchemaRequest()
@@ -196,15 +204,17 @@ public function testDispatchAllSchemaRequest()
         ];
         $this->_requestMock->expects($this->any())
             ->method('getPathInfo')
-            ->willReturn(\Magento\Webapi\Controller\Rest::SCHEMA_PATH);
+            ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
         $this->_requestMock->expects($this->any())
             ->method('getParam')
             ->will(
-                $this->returnValueMap(
+                $this->returnValueMap([
                     [
-                        [\Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES, null, 'all']
-                    ]
-                )
+                        \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
+                        null,
+                        'all',
+                    ],
+                ])
             );
         $this->_requestMock->expects($this->any())
             ->method('getParams')
@@ -212,11 +222,95 @@ public function testDispatchAllSchemaRequest()
         $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->swaggerGeneratorMock->expects($this->once())->method('getListOfServices')
-            ->willReturn(['listOfServices']);
-        $this->_restController->dispatch($this->_requestMock);
+        $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->schemaRequestProcessor = $objectManager->getObject(
+            \Magento\Webapi\Controller\Rest\SchemaRequestProcessor::class,
+            [
+                'swaggerGenerator' => $this->swaggerGeneratorMock,
+                'response'         => $this->_responseMock,
+            ]
+        );
+
+        $this->synchronousRequestProcessor =
+            $this->getMockBuilder(\Magento\Webapi\Controller\Rest\SynchronousRequestProcessor::class)
+                ->setMethods(['process'])
+                ->disableOriginalConstructor()
+                ->getMock();
+
+        return $objectManager->getObject(
+            \Magento\Webapi\Controller\Rest\RequestProcessorPool::class,
+            [
+                'requestProcessors' => [
+                    'syncSchema' => $this->schemaRequestProcessor,
+                    'sync'       => $this->synchronousRequestProcessor,
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @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/Webapi/Test/Unit/ExceptionTest.php b/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php
index f4ba35194725d..c3761c4e24862 100644
--- a/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php
@@ -43,7 +43,8 @@ public function testConstruct()
      */
     public function testConstructInvalidHttpCode($httpCode)
     {
-        $this->expectException('InvalidArgumentException', "The specified HTTP code \"{$httpCode}\" is invalid.");
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage("The specified HTTP code \"{$httpCode}\" is invalid.");
         /** Create \Magento\Framework\Webapi\Exception object with invalid code. */
         /** Valid codes range is from 400 to 599. */
         new \Magento\Framework\Webapi\Exception(__('Message'), 0, $httpCode);
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
index 45ea678bdf859..fd9b0d9302a18 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
@@ -6,53 +6,78 @@
 
 namespace Magento\Webapi\Test\Unit\Model\Authorization;
 
+use Magento\Webapi\Model\Authorization\TokenUserContext;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Integration\Model\Oauth\TokenFactory;
+use Magento\Integration\Model\Oauth\Token;
+use Magento\Integration\Api\IntegrationServiceInterface;
+use Magento\Framework\Webapi\Request;
+use Magento\Integration\Helper\Oauth\Data as OauthHelper;
+use Magento\Framework\Stdlib\DateTime\DateTime as Date;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Integration\Model\Integration;
 
 /**
- * Tests \Magento\Webapi\Model\Authorization\TokenUserContext
+ * Tests for TokenUserContext.
  */
 class TokenUserContextTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     protected $objectManager;
 
     /**
-     * @var \Magento\Webapi\Model\Authorization\TokenUserContext
+     * @var TokenUserContext
      */
     protected $tokenUserContext;
 
     /**
-     * @var \Magento\Integration\Model\Oauth\TokenFactory
+     * @var TokenFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $tokenFactory;
 
     /**
-     * @var \Magento\Integration\Api\IntegrationServiceInterface
+     * @var IntegrationServiceInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $integrationService;
 
     /**
-     * @var \Magento\Framework\Webapi\Request
+     * @var Request|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $request;
 
+    /**
+     * @var OauthHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $oauthHelperMock;
+
+    /**
+     * @var Date|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateMock;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
     protected function setUp()
     {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = new ObjectManager($this);
 
-        $this->request = $this->getMockBuilder(\Magento\Framework\Webapi\Request::class)
+        $this->request = $this->getMockBuilder(Request::class)
             ->disableOriginalConstructor()
             ->setMethods(['getHeader'])
             ->getMock();
 
-        $this->tokenFactory = $this->getMockBuilder(\Magento\Integration\Model\Oauth\TokenFactory::class)
+        $this->tokenFactory = $this->getMockBuilder(TokenFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->integrationService = $this->getMockBuilder(\Magento\Integration\Api\IntegrationServiceInterface::class)
+        $this->integrationService = $this->getMockBuilder(IntegrationServiceInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -63,17 +88,45 @@ protected function setUp()
                     'findByConsumerId',
                     'findActiveIntegrationByConsumerId',
                     'delete',
-                    'getSelectedResources'
+                    'getSelectedResources',
                 ]
             )
             ->getMock();
 
+        $this->oauthHelperMock = $this->getMockBuilder(OauthHelper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAdminTokenLifetime', 'getCustomerTokenLifetime'])
+            ->getMock();
+
+        $this->dateMock = $this->getMockBuilder(Date::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['gmtTimestamp'])
+            ->getMock();
+
+        $this->dateTimeMock = $this->getMockBuilder(DateTime::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['strToTime'])
+            ->getMock();
+
+        $this->dateTimeMock->expects($this->any())
+            ->method('strToTime')
+            ->will(
+                $this->returnCallback(
+                    function ($str) {
+                        return strtotime($str);
+                    }
+                )
+            );
+
         $this->tokenUserContext = $this->objectManager->getObject(
-            \Magento\Webapi\Model\Authorization\TokenUserContext::class,
+            TokenUserContext::class,
             [
                 'request' => $this->request,
                 'tokenFactory' => $this->tokenFactory,
-                'integrationService' => $this->integrationService
+                'integrationService' => $this->integrationService,
+                'oauthHelper' => $this->oauthHelperMock,
+                'date' => $this->dateMock,
+                'dateTime' => $this->dateTimeMock,
             ]
         );
     }
@@ -117,7 +170,7 @@ public function testNoTokenInDatabase()
             ->with('Authorization')
             ->will($this->returnValue("Bearer {$bearerToken}"));
 
-        $token = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class)
+        $token = $this->getMockBuilder(Token::class)
             ->disableOriginalConstructor()
             ->setMethods(['loadByToken', 'getId', '__wakeup'])
             ->getMock();
@@ -145,7 +198,7 @@ public function testRevokedToken()
             ->with('Authorization')
             ->will($this->returnValue("Bearer {$bearerToken}"));
 
-        $token = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class)
+        $token = $this->getMockBuilder(Token::class)
             ->disableOriginalConstructor()
             ->setMethods(['loadByToken', 'getId', 'getRevoked', '__wakeup'])
             ->getMock();
@@ -179,10 +232,19 @@ public function testValidToken($userType, $userId, $expectedUserType, $expectedU
             ->with('Authorization')
             ->will($this->returnValue("Bearer {$bearerToken}"));
 
-        $token = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class)
+        $token = $this->getMockBuilder(Token::class)
             ->disableOriginalConstructor()
-            ->setMethods(['loadByToken', 'getId', 'getUserType', 'getCustomerId', 'getAdminId', '__wakeup'])
-            ->getMock();
+            ->setMethods(
+                [
+                    'loadByToken',
+                    'getId',
+                    'getUserType',
+                    'getCustomerId',
+                    'getAdminId',
+                    '__wakeup',
+                    'getCreatedAt',
+                ]
+            )->getMock();
         $this->tokenFactory->expects($this->once())
             ->method('create')
             ->will($this->returnValue($token));
@@ -193,17 +255,21 @@ public function testValidToken($userType, $userId, $expectedUserType, $expectedU
         $token->expects($this->once())
             ->method('getId')
             ->will($this->returnValue(1));
-        $token->expects($this->once())
+        $token->expects($this->any())
             ->method('getUserType')
             ->will($this->returnValue($userType));
 
-        $integration = $this->getMockBuilder(\Magento\Integration\Model\Integration::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getId', '__wakeup'])
-            ->getMock();
+        $token->expects($this->any())
+            ->method('getCreatedAt')
+            ->willReturn(date('Y-m-d H:i:s', time()));
 
         switch ($userType) {
             case UserContextInterface::USER_TYPE_INTEGRATION:
+                $integration = $this->getMockBuilder(Integration::class)
+                    ->disableOriginalConstructor()
+                    ->setMethods(['getId', '__wakeup'])
+                    ->getMock();
+
                 $integration->expects($this->once())
                     ->method('getId')
                     ->will($this->returnValue($userId));
@@ -231,6 +297,9 @@ public function testValidToken($userType, $userId, $expectedUserType, $expectedU
         $this->assertEquals($expectedUserId, $this->tokenUserContext->getUserId());
     }
 
+    /**
+     * @return array
+     */
     public function getValidTokenData()
     {
         return [
@@ -260,4 +329,208 @@ public function getValidTokenData()
             ]
         ];
     }
+
+    /**
+     * @param array $tokenData
+     * @param int $tokenTtl
+     * @param int $currentTime
+     * @param int|null $expectedUserType
+     * @param int|null $expectedUserId
+     * @return void
+     * @dataProvider getExpiredTestTokenData
+     */
+    public function testExpiredToken(
+        array $tokenData,
+        int $tokenTtl,
+        int $currentTime,
+        $expectedUserType,
+        $expectedUserId
+    ) {
+        $bearerToken = 'bearer1234';
+
+        $this->dateMock->expects($this->any())
+            ->method('gmtTimestamp')
+            ->willReturn($currentTime);
+
+        $this->request->expects($this->once())
+            ->method('getHeader')
+            ->with('Authorization')
+            ->will($this->returnValue("Bearer {$bearerToken}"));
+
+        $token = $this->getMockBuilder(Token::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'loadByToken',
+                    'getCreatedAt',
+                    'getId',
+                    'getUserType',
+                    'getCustomerId',
+                    'getAdminId',
+                    '__wakeup',
+                ]
+            )->getMock();
+
+        $token->expects($this->once())
+            ->method('loadByToken')
+            ->with($bearerToken)
+            ->will($this->returnSelf());
+
+        $token->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue(1));
+
+        $token->expects($this->any())
+            ->method('getUserType')
+            ->will($this->returnValue($tokenData['user_type']));
+
+        $token->expects($this->any())
+            ->method('getCreatedAt')
+            ->willReturn($tokenData['created_at']);
+
+        $this->tokenFactory->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($token));
+
+        $this->oauthHelperMock->expects($this->any())
+            ->method('getAdminTokenLifetime')
+            ->willReturn($tokenTtl);
+
+        $this->oauthHelperMock->expects($this->any())
+            ->method('getCustomerTokenLifetime')
+            ->willReturn($tokenTtl);
+
+        switch ($tokenData['user_type']) {
+            case UserContextInterface::USER_TYPE_INTEGRATION:
+                $integration = $this->getMockBuilder(Integration::class)
+                    ->disableOriginalConstructor()
+                    ->setMethods(['getId', '__wakeup'])
+                    ->getMock();
+                $integration->expects($this->any())
+                    ->method('getId')
+                    ->will($this->returnValue($tokenData['user_id']));
+
+                $this->integrationService->expects($this->any())
+                    ->method('findByConsumerId')
+                    ->will($this->returnValue($integration));
+                break;
+            case UserContextInterface::USER_TYPE_ADMIN:
+                $token->expects($this->any())
+                    ->method('getAdminId')
+                    ->will($this->returnValue($tokenData['user_id']));
+                break;
+            case UserContextInterface::USER_TYPE_CUSTOMER:
+                $token->expects($this->any())
+                    ->method('getCustomerId')
+                    ->will($this->returnValue($tokenData['user_id']));
+                break;
+        }
+
+        $this->assertEquals($expectedUserType, $this->tokenUserContext->getUserType());
+        $this->assertEquals($expectedUserId, $this->tokenUserContext->getUserId());
+
+        /* check again to make sure that the above method loadByToken in only called once */
+        $this->assertEquals($expectedUserType, $this->tokenUserContext->getUserType());
+        $this->assertEquals($expectedUserId, $this->tokenUserContext->getUserId());
+    }
+
+    /**
+     * Data provider for expired token test.
+     *
+     * @return array
+     */
+    public function getExpiredTestTokenData()
+    {
+        $time = time();
+        return [
+            'token_expired_admin' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_ADMIN,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => null,
+                'expectedUserId' => null,
+            ],
+            'token_vigent_admin' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_ADMIN,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => UserContextInterface::USER_TYPE_ADMIN,
+                'expectedUserId' => 1234,
+            ],
+            'token_expired_customer' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_CUSTOMER,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => null,
+                'expectedUserId' => null,
+            ],
+            'token_vigent_customer' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_CUSTOMER,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => UserContextInterface::USER_TYPE_CUSTOMER,
+                'expectedUserId' => 1234,
+            ],
+            'token_expired_integration' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_INTEGRATION,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => UserContextInterface::USER_TYPE_INTEGRATION,
+                'expectedUserId' => 1234,
+            ],
+            'token_vigent_integration' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_INTEGRATION,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => UserContextInterface::USER_TYPE_INTEGRATION,
+                'expectedUserId' => 1234,
+            ],
+            'token_expired_guest' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_GUEST,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => null,
+                'expectedUserId' => null,
+            ],
+            'token_vigent_guest' => [
+                'tokenData' => [
+                    'user_type' => UserContextInterface::USER_TYPE_GUEST,
+                    'user_id' => 1234,
+                    'created_at' => date('Y-m-d H:i:s', $time - 400),
+                ],
+                'tokenTtl' => 1,
+                'currentTime' => $time,
+                'expectedUserType' => null,
+                'expectedUserId' => null,
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Plugin/ManagerTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Plugin/ManagerTest.php
index aac44ddc8481c..1441269bcfede 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Plugin/ManagerTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Plugin/ManagerTest.php
@@ -113,10 +113,10 @@ public function testAfterProcessIntegrationConfigSuccess()
                 ]
             )
         );
-        $firstInegrationId = 1;
+        $firstIntegrationId = 1;
         $integrationsData1 = new \Magento\Framework\DataObject(
             [
-                'id' => $firstInegrationId,
+                'id' => $firstIntegrationId,
                 Integration::NAME => 'TestIntegration1',
                 Integration::EMAIL => 'test-integration1@magento.com',
                 Integration::ENDPOINT => 'http://endpoint.com',
@@ -168,9 +168,9 @@ public function testAfterProcessConfigBasedIntegrationsNoIntegrations()
      */
     public function testAfterProcessConfigBasedIntegrationsSuccess()
     {
-        $firstInegrationId = 1;
+        $firstIntegrationId = 1;
         $integrationsData1 = [
-            'id' => $firstInegrationId,
+            'id' => $firstIntegrationId,
             Integration::NAME => 'TestIntegration1',
             Integration::EMAIL => 'test-integration1@magento.com',
             Integration::ENDPOINT => 'http://endpoint.com',
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
index 395add7fb1f60..66b59babb7189 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php
@@ -295,6 +295,9 @@ public function testGetObjectSchema($typeName, $description, $result)
         $this->assertSame(json_encode($result), json_encode($actual));
     }
 
+    /**
+     * @return array
+     */
     public function getObjectSchemaDataProvider()
     {
         return [
@@ -354,6 +357,9 @@ public function testGenerateDefinition($typeData, $expected)
         $this->assertSame(json_encode($expected), json_encode($actual));
     }
 
+    /**
+     * @return array
+     */
     public function generateDefinitionDataProvider()
     {
         return [
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
index 1ac7943fa6484..8d4cd8561520c 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
@@ -125,7 +125,7 @@ public function testToXmlDeveloperModeOff()
     public function testToXmlDeveloperModeOn()
     {
         $this->_appStateMock->expects($this->any())->method('getMode')->will($this->returnValue('developer'));
-        $actualXml = $this->_soapFault->toXml(true);
+        $actualXml = $this->_soapFault->toXml();
         $this->assertContains('<m:Trace>', $actualXml, 'Exception trace is not found in XML.');
     }
 
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 4d6046c904e31..c6cbdd8b3283a 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -5,19 +5,18 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-authorization": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-integration": "100.3.*",
-        "magento/module-store": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-integration": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-user": "100.3.*",
-        "magento/module-customer": "100.3.*"
+        "magento/module-user": "*",
+        "magento/module-customer": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Webapi/etc/di.xml b/app/code/Magento/Webapi/etc/di.xml
index 9bb35a756a3cb..62ba22a658aaa 100644
--- a/app/code/Magento/Webapi/etc/di.xml
+++ b/app/code/Magento/Webapi/etc/di.xml
@@ -6,6 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Webapi\Model\ConfigInterface" type="Magento\Webapi\Model\Config" />
     <type name="Magento\Framework\App\AreaList">
         <arguments>
             <argument name="areas" xsi:type="array">
diff --git a/app/code/Magento/Webapi/etc/module.xml b/app/code/Magento/Webapi/etc/module.xml
index cda30887d0a22..093895b6e0a7a 100644
--- a/app/code/Magento/Webapi/etc/module.xml
+++ b/app/code/Magento/Webapi/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Webapi" setup_version="2.0.0">
+    <module name="Magento_Webapi" >
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Integration"/>
diff --git a/app/code/Magento/Webapi/etc/webapi_rest/di.xml b/app/code/Magento/Webapi/etc/webapi_rest/di.xml
index fa8252aca9095..f958d0d821a4b 100644
--- a/app/code/Magento/Webapi/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Webapi/etc/webapi_rest/di.xml
@@ -69,4 +69,15 @@
         </arguments>
     </type>
     <!-- End of configuration to check that permissions are checked on fields -->
+
+    <preference for="Magento\Webapi\Controller\Rest\RequestProcessorInterface" type="Magento\Webapi\Controller\Rest\RequestProcessorPool" />
+
+    <type name="Magento\Webapi\Controller\Rest\RequestProcessorPool">
+        <arguments>
+            <argument name="requestProcessors" xsi:type="array">
+                <item name="syncSchema" xsi:type="object" sortOrder="50">Magento\Webapi\Controller\Rest\SchemaRequestProcessor</item>
+                <item name="sync" xsi:type="object" sortOrder="100">Magento\Webapi\Controller\Rest\SynchronousRequestProcessor</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
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 0000000000000..39e7fa418a35c
--- /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 0000000000000..130e55b9ad404
--- /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/Asynchronous/InputParamsResolver.php b/app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php
new file mode 100644
index 0000000000000..93bddd09faef8
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Controller\Rest\Asynchronous;
+
+use Magento\Framework\Webapi\ServiceInputProcessor;
+use Magento\Framework\Webapi\Rest\Request as RestRequest;
+use Magento\Webapi\Controller\Rest\Router;
+use Magento\Webapi\Controller\Rest\ParamsOverrider;
+use Magento\Webapi\Controller\Rest\RequestValidator;
+use Magento\Webapi\Controller\Rest\InputParamsResolver as WebapiInputParamsResolver;
+
+/**
+ * This class is responsible for retrieving resolved input data
+ */
+class InputParamsResolver
+{
+    /**
+     * @var RestRequest
+     */
+    private $request;
+    /**
+     * @var ParamsOverrider
+     */
+    private $paramsOverrider;
+    /**
+     * @var ServiceInputProcessor
+     */
+    private $serviceInputProcessor;
+    /**
+     * @var Router
+     */
+    private $router;
+    /**
+     * @var RequestValidator
+     */
+    private $requestValidator;
+    /**
+     * @var \Magento\Webapi\Controller\Rest\InputParamsResolver
+     */
+    private $inputParamsResolver;
+    /**
+     * @var bool
+     */
+    private $isBulk;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Webapi\Rest\Request $request
+     * @param \Magento\Webapi\Controller\Rest\ParamsOverrider $paramsOverrider
+     * @param \Magento\Framework\Webapi\ServiceInputProcessor $inputProcessor
+     * @param \Magento\Webapi\Controller\Rest\Router $router
+     * @param \Magento\Webapi\Controller\Rest\RequestValidator $requestValidator
+     * @param \Magento\Webapi\Controller\Rest\InputParamsResolver $inputParamsResolver
+     * @param bool $isBulk
+     */
+    public function __construct(
+        RestRequest $request,
+        ParamsOverrider $paramsOverrider,
+        ServiceInputProcessor $inputProcessor,
+        Router $router,
+        RequestValidator $requestValidator,
+        WebapiInputParamsResolver $inputParamsResolver,
+        $isBulk = false
+    ) {
+        $this->request = $request;
+        $this->paramsOverrider = $paramsOverrider;
+        $this->serviceInputProcessor = $inputProcessor;
+        $this->router = $router;
+        $this->requestValidator = $requestValidator;
+        $this->inputParamsResolver = $inputParamsResolver;
+        $this->isBulk = $isBulk;
+    }
+
+    /**
+     * Process and resolve input parameters
+     *
+     * Return array with validated input params
+     * or throw \Exception if at least one request entity params is not valid
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\InputException if no value is provided for required parameters
+     * @throws \Magento\Framework\Webapi\Exception
+     * @throws \Magento\Framework\Exception\AuthorizationException
+     */
+    public function resolve()
+    {
+        if ($this->isBulk === false) {
+            return [$this->inputParamsResolver->resolve()];
+        }
+        $this->requestValidator->validate();
+        $webapiResolvedParams = [];
+        $inputData = $this->request->getRequestData();
+
+        $httpMethod = $this->request->getHttpMethod();
+        if ($httpMethod == \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE) {
+            $requestBodyParams = $this->request->getBodyParams();
+            $inputData = array_merge($requestBodyParams, $inputData);
+        }
+
+        foreach ($inputData as $key => $singleEntityParams) {
+            $webapiResolvedParams[$key] = $this->resolveBulkItemParams($singleEntityParams);
+        }
+
+        return $webapiResolvedParams;
+    }
+
+    /**
+     * Returns route.
+     *
+     * @return \Magento\Webapi\Controller\Rest\Router\Route
+     */
+    public function getRoute()
+    {
+        return $this->inputParamsResolver->getRoute();
+    }
+
+    /**
+     * Resolve parameters for service
+     *
+     * Convert the input array from key-value format to a list of parameters
+     * suitable for the specified class / method.
+     *
+     * Instead of \Magento\Webapi\Controller\Rest\InputParamsResolver
+     * we don't need to merge body params with url params and use only body params
+     *
+     * @param array $inputData data to send to method in key-value format
+     * @return array list of parameters that can be used to call the service method
+     * @throws \Magento\Framework\Exception\InputException if no value is provided for required parameters
+     * @throws \Magento\Framework\Webapi\Exception
+     */
+    private function resolveBulkItemParams($inputData)
+    {
+        $route = $this->getRoute();
+        $serviceMethodName = $route->getServiceMethod();
+        $serviceClassName = $route->getServiceClass();
+        $inputParams = $this->serviceInputProcessor->process($serviceClassName, $serviceMethodName, $inputData);
+
+        return $inputParams;
+    }
+}
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 0000000000000..81235e335b8fa
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousRequestProcessor.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\Controller\Rest;
+
+use Magento\Framework\Exception\BulkException;
+use Magento\Webapi\Controller\Rest\RequestProcessorInterface;
+use Magento\Framework\Webapi\Rest\Response as RestResponse;
+use Magento\WebapiAsync\Controller\Rest\Asynchronous\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;
+
+/**
+ * Responsible for dispatching single and bulk requests.
+ * Single requests dispatching represented by this class.
+ * Bulk requests dispatching represented by virtualType of this class.
+ */
+class AsynchronousRequestProcessor implements RequestProcessorInterface
+{
+    const PROCESSOR_PATH = "/^\\/async(\\/V.+)/";
+    const BULK_PROCESSOR_PATH = "/^\\/async\/bulk(\\/V.+)/";
+
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Response
+     */
+    private $response;
+    /**
+     * @var \Magento\WebapiAsync\Controller\Rest\Asynchronous\InputParamsResolver
+     */
+    private $inputParamsResolver;
+    /**
+     * @var MassSchedule
+     */
+    private $asyncBulkPublisher;
+    /**
+     * @var WebApiAsyncConfig
+     */
+    private $webapiAsyncConfig;
+    /**
+     * @var \Magento\Framework\Reflection\DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+    /**
+     * @var AsyncResponseInterfaceFactory
+     */
+    private $asyncResponseFactory;
+    /**
+     * @var string Regex pattern
+     */
+    private $processorPath;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param RestResponse $response
+     * @param InputParamsResolver $inputParamsResolver
+     * @param MassSchedule $asyncBulkPublisher
+     * @param WebApiAsyncConfig $webapiAsyncConfig
+     * @param DataObjectProcessor $dataObjectProcessor
+     * @param AsyncResponseInterfaceFactory $asyncResponse
+     * @param string $processorPath
+     */
+    public function __construct(
+        RestResponse $response,
+        InputParamsResolver $inputParamsResolver,
+        MassSchedule $asyncBulkPublisher,
+        WebApiAsyncConfig $webapiAsyncConfig,
+        DataObjectProcessor $dataObjectProcessor,
+        AsyncResponseInterfaceFactory $asyncResponse,
+        $processorPath = self::PROCESSOR_PATH
+    ) {
+        $this->response = $response;
+        $this->inputParamsResolver = $inputParamsResolver;
+        $this->asyncBulkPublisher = $asyncBulkPublisher;
+        $this->webapiAsyncConfig = $webapiAsyncConfig;
+        $this->dataObjectProcessor = $dataObjectProcessor;
+        $this->asyncResponseFactory = $asyncResponse;
+        $this->processorPath = $processorPath;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        $path = $request->getPathInfo();
+        $path = preg_replace($this->processorPath, "$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($this->processorPath, $request->getPathInfo()) === 1) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param \Magento\Framework\Webapi\Rest\Request $request
+     * @return bool
+     */
+    public function isBulk(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        if (preg_match(self::BULK_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 0000000000000..a3e54dd2fdfc6
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessor.php
@@ -0,0 +1,94 @@
+<?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';
+    const BULK_PROCESSOR_PATH = 'async/bulk/schema';
+
+    /**
+     * @var \Magento\Webapi\Model\Rest\Swagger\Generator
+     */
+    private $swaggerGenerator;
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Response
+     */
+    private $response;
+    /**
+     * @var string
+     */
+    private $processorPath;
+
+    /**
+     * Initial dependencies
+     *
+     * @param \Magento\Webapi\Model\Rest\Swagger\Generator $swaggerGenerator
+     * @param \Magento\Framework\Webapi\Rest\Response $response
+     * @param string $processorPath
+     */
+    public function __construct(
+        Generator $swaggerGenerator,
+        RestResponse $response,
+        $processorPath = self::PROCESSOR_PATH
+    ) {
+        $this->swaggerGenerator = $swaggerGenerator;
+        $this->response = $response;
+        $this->processorPath = $processorPath;
+    }
+
+    /**
+     * {@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(), '/'), $this->processorPath) === 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param \Magento\Framework\Webapi\Rest\Request $request
+     * @return bool
+     */
+    public function isBulk(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        if (strpos(ltrim($request->getPathInfo(), '/'), self::BULK_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 0000000000000..49525fd99da9c
--- /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 0000000000000..f39d641b18a19
--- /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/BulkServiceConfig.php b/app/code/Magento/WebapiAsync/Model/BulkServiceConfig.php
new file mode 100644
index 0000000000000..a0499087c35b9
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/BulkServiceConfig.php
@@ -0,0 +1,102 @@
+<?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\Webapi\Model\Config\Converter as WebapiConverter;
+use Magento\Webapi\Model\Config;
+
+/**
+ * @api
+ */
+class BulkServiceConfig implements \Magento\Webapi\Model\ConfigInterface
+{
+    const CACHE_ID = 'webapi_bulk_async_service_config';
+    const URL_PARAM_PREFIX_PLACEHOLDER = 'by';
+    /**
+     * @var WebapiCache
+     */
+    private $cache;
+    /**
+     * @var Config
+     */
+    private $webapiConfig;
+    /**
+     * @var array
+     */
+    private $services;
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param WebapiCache $cache
+     * @param Config $webapiConfig
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        WebapiCache $cache,
+        Config $webapiConfig,
+        SerializerInterface $serializer
+    ) {
+        $this->cache = $cache;
+        $this->webapiConfig = $webapiConfig;
+        $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->getBulkServicesConfig();
+                $this->cache->save($this->serializer->serialize($this->services), self::CACHE_ID);
+            }
+        }
+
+        return $this->services;
+    }
+
+    /**
+     * @return array
+     */
+    private function getBulkServicesConfig()
+    {
+        $bulkServices = [];
+        $webapiServices = $this->webapiConfig->getServices();
+        foreach ($webapiServices[WebapiConverter::KEY_ROUTES] as $routePath => $routeConfig) {
+            foreach ($routeConfig as $httpMethod => $httpMethodConfig) {
+                if ($httpMethod !== \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET) {
+                    $routePath = preg_replace_callback(
+                        '/\/:(\w+)/',
+                        function ($matches) {
+                            return '/' . self::URL_PARAM_PREFIX_PLACEHOLDER . ucfirst($matches[1]);
+                        },
+                        $routePath
+                    );
+                    $bulkServices[WebapiConverter::KEY_ROUTES][$routePath][$httpMethod] = $httpMethodConfig;
+                }
+            }
+        }
+        $bulkServices[WebapiConverter::KEY_SERVICES] = $webapiServices[WebapiConverter::KEY_SERVICES];
+
+        return $bulkServices;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
new file mode 100644
index 0000000000000..92343027adcf6
--- /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 0000000000000..4c085935090bd
--- /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_service_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();
+                $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 0000000000000..2c85796a3ab19
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig/Converter.php
@@ -0,0 +1,235 @@
+<?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';
+    const KEY_ROUTES = 'routes';
+    /**#@-*/
+
+    private $allowedRouteMethods = [
+        \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_GET,
+        \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_POST,
+        \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_PUT,
+        \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_DELETE,
+        \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_PATCH
+    ];
+
+    /**
+     * {@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);
+        }
+        $result[self::KEY_ROUTES] = $this->convertRouteCustomizations($source);
+
+        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);
+    }
+
+    /**
+     * Convert and merge "route" nodes, which represent route customizations
+     * @param \DOMDocument $source
+     * @return array
+     */
+    private function convertRouteCustomizations($source)
+    {
+        $customRoutes = [];
+        $routes = $source->getElementsByTagName('route');
+        /** @var \DOMElement  $route */
+        foreach ($routes as $route) {
+            $routeUrl = $this->getRouteUrl($route);
+            $routeMethod = $this->getRouteMethod($route);
+            $routeAlias = $this->getRouteAlias($route);
+            if ($routeUrl && $routeMethod && $routeAlias) {
+                if (!isset($customRoutes[$routeAlias])) {
+                    $customRoutes[$routeAlias] = [];
+                }
+                $customRoutes[$routeAlias][$routeMethod] = $routeUrl;
+            }
+        }
+        return $customRoutes;
+    }
+
+    /**
+     * @param \DOMElement $route
+     * @return null|string
+     */
+    private function getRouteUrl($route)
+    {
+        $url = $route->attributes->getNamedItem('url')->nodeValue;
+        return mb_strlen((string) $url) === 0 ? null : $url;
+    }
+
+    /**
+     * @param \DOMElement $route
+     * @return null|string
+     */
+    private function getRouteAlias($route)
+    {
+        $alias = $route->attributes->getNamedItem('alias')->nodeValue;
+        return mb_strlen((string) $alias) === 0 ? null : ltrim($alias, '/');
+    }
+
+    /**
+     * @param \DOMElement $route
+     * @return null|string
+     */
+    private function getRouteMethod($route)
+    {
+        $method = $route->attributes->getNamedItem('method')->nodeValue;
+        $method =  mb_strlen((string) $method) === 0 ? null : $method;
+        return ($this->validateRouteMethod($method)) ? $method : null;
+    }
+
+    /**
+     * @param string $method
+     * @return bool
+     */
+    private function validateRouteMethod($method)
+    {
+        return in_array($method, $this->allowedRouteMethods);
+    }
+}
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 0000000000000..b2d5c789286dc
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig/Reader.php
@@ -0,0 +1,57 @@
+<?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'],
+        '/services/route'   => ['url', '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 0000000000000..10fdc60a9d5af
--- /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/ControllerRest.php b/app/code/Magento/WebapiAsync/Plugin/ControllerRest.php
new file mode 100644
index 0000000000000..b3ba6af8bab60
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Plugin/ControllerRest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Plugin;
+
+use Magento\WebapiAsync\Model\ServiceConfig;
+use Magento\Webapi\Controller\PathProcessor;
+use Magento\Framework\App\RequestInterface;
+use Magento\WebapiAsync\Model\ServiceConfig\Converter;
+
+class ControllerRest
+{
+    /**
+     * @var ServiceConfig
+     */
+    private $serviceConfig;
+
+    /**
+     * @var PathProcessor
+     */
+    private $pathProcessor;
+
+    /**
+     * ControllerRest constructor.
+     *
+     * @param ServiceConfig $serviceConfig
+     * @param PathProcessor $pathProcessor
+     */
+    public function __construct(
+        ServiceConfig $serviceConfig,
+        PathProcessor $pathProcessor
+    ) {
+        $this->serviceConfig = $serviceConfig;
+        $this->pathProcessor = $pathProcessor;
+    }
+
+    /**
+     * Apply route customization.
+     * @param \Magento\Webapi\Controller\Rest $subject
+     * @param RequestInterface $request
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeDispatch(\Magento\Webapi\Controller\Rest $subject, RequestInterface $request)
+    {
+        $routeCustomizations = $this->serviceConfig->getServices()[Converter::KEY_ROUTES] ?? [];
+        if ($routeCustomizations) {
+            $originPath = $request->getPathInfo();
+            $requestMethod = $request->getMethod();
+            $routePath = ltrim($this->pathProcessor->process($originPath), '/');
+            if (array_key_exists($routePath, $routeCustomizations)) {
+                if (isset($routeCustomizations[$routePath][$requestMethod])) {
+                    $path = ltrim($routeCustomizations[$routePath][$requestMethod], '/');
+                    $request->setPathInfo(str_replace($routePath, $path, $originPath));
+                }
+            }
+        }
+        return [$request];
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
new file mode 100644
index 0000000000000..c4e5b572b80f9
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
@@ -0,0 +1,275 @@
+<?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 = [];
+        $services = $this->serviceConfig->getServices()[Converter::KEY_SERVICES] ?? [];
+        foreach ($services 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 0000000000000..ed57634e77caf
--- /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/Mftf/LICENSE.txt b/app/code/Magento/WebapiAsync/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Mftf/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/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/WebapiAsync/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Mftf/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/Test/Mftf/README.md b/app/code/Magento/WebapiAsync/Test/Mftf/README.md
new file mode 100644
index 0000000000000..58f8aa5e71308
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Webapi Async Functional Tests
+
+The Functional Test Module for **Magento Webapi Async** module.
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 0000000000000..e5453f7574540
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
@@ -0,0 +1,71 @@
+<?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);
+    }
+
+    /**
+     * @return array
+     */
+    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 0000000000000..29a9992bb7e28
--- /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 0000000000000..105bc824351db
--- /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 0000000000000..cff605452aade
--- /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 0000000000000..f5c15b8d371c2
--- /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 0000000000000..43c6da9f6702b
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.php
@@ -0,0 +1,30 @@
+<?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,
+                ],
+            ],
+        ],
+    ],
+    'routes' => [
+        'asyncProducts' => ['POST' => 'async/V1/products'],
+        'asyncBulkCmsBlocks' => ['POST' => 'async/bulk/V1/cmsBlock'],
+        'asyncCustomers' => ['POST' => 'async/V1/customers']
+    ]
+];
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 0000000000000..be119c7da707d
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.xml
@@ -0,0 +1,23 @@
+<?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" />
+
+    <route url="async/V1/products" method="POST" alias="asyncProducts"/>
+    <route url="async/bulk/V1/cmsBlock" method="POST" alias="asyncBulkCmsBlocks"/>
+    <route url="async/V1/customers" method="POST" alias="asyncCustomers"/>
+</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 0000000000000..6938ec27c99b7
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async.php
@@ -0,0 +1,30 @@
+<?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,
+                ],
+            ],
+        ],
+    ],
+    'routes' => [
+        'asyncProducts' => ['POST' => 'async/bulk/V1/products'],
+        'asyncBulkCmsPages' => ['POST' => 'async/bulk/V1/cmsPage'],
+        'asyncCustomers' => ['POST' => 'async/V1/customers']
+    ]
+];
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 0000000000000..bd9895c7eef1e
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_1.xml
@@ -0,0 +1,21 @@
+<?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>
+
+    <route url="async/V1/products" method="POST" alias="asyncProducts"/>
+    <route url="async/bulk/V1/cmsPage" method="POST" alias="asyncBulkCmsPages"/>
+    <route url="async/V1/customers" method="POST" alias="/asyncCustomers"/>
+</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 0000000000000..153e3344ca72b
--- /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" />
+    <route url="async/bulk/V1/products" method="POST" alias="asyncProducts"/>
+</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 0000000000000..9292a9dea3b4d
--- /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 0000000000000..815e4574abf55
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "magento/module-webapi-async",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-webapi": "*",
+        "magento/module-asynchronous-operations": "*"
+    },
+    "suggest": {
+        "magento/module-user": "*",
+        "magento/module-customer": "*"
+    },
+    "type": "magento2-module",
+    "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 0000000000000..83f1d6a78f227
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/di.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Webapi\Model\ServiceMetadata">
+        <plugin name="webapiServiceMetadataAsync" type="Magento\WebapiAsync\Plugin\ServiceMetadata" />
+    </type>
+    <virtualType name="Magento\WebapiAsync\Model\VirtualType\Rest\Config" type="Magento\Webapi\Model\Rest\Config">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\WebapiAsync\Model\BulkServiceConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\WebapiAsync\Controller\VirtualType\Rest\Router" type="Magento\Webapi\Controller\Rest\Router">
+        <arguments>
+            <argument name="apiConfig" xsi:type="object">Magento\WebapiAsync\Model\VirtualType\Rest\Config</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\WebapiAsync\Controller\VirtualType\Rest\RequestValidator" type="Magento\Webapi\Controller\Rest\RequestValidator">
+        <arguments>
+            <argument name="router" xsi:type="object">Magento\WebapiAsync\Controller\VirtualType\Rest\Router</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\WebapiAsync\Controller\VirtualType\InputParamsResolver" type="Magento\WebapiAsync\Controller\Rest\Asynchronous\InputParamsResolver">
+        <arguments>
+            <argument name="requestValidator" xsi:type="object">Magento\WebapiAsync\Controller\VirtualType\Rest\RequestValidator</argument>
+            <argument name="isBulk" xsi:type="boolean">true</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\WebapiAsync\Controller\Rest\VirtualType\AsynchronousBulkRequestProcessor" type="Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor">
+        <arguments>
+            <argument name="inputParamsResolver" xsi:type="object">Magento\WebapiAsync\Controller\VirtualType\InputParamsResolver</argument>
+            <argument name="processorPath" xsi:type="const">Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor::BULK_PROCESSOR_PATH</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\WebapiAsync\Controller\Rest\VirtualType\AsynchronousBulkSchemaRequestProcessor" type="Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor">
+        <arguments>
+            <argument name="processorPath" xsi:type="const">Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor::BULK_PROCESSOR_PATH</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Webapi\Controller\Rest">
+        <plugin name="webapiContorllerRestAsync" type="Magento\WebapiAsync\Plugin\ControllerRest" />
+    </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 0000000000000..abda4ff56aeac
--- /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 0000000000000..f8a1a18d754ef
--- /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 0000000000000..9e4ac909c2261
--- /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.xml b/app/code/Magento/WebapiAsync/etc/webapi_async.xml
new file mode 100644
index 0000000000000..109835acadce0
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/webapi_async.xml
@@ -0,0 +1,11 @@
+<?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">
+    <route url="async/V1/products" method="POST" alias="asyncProducts" />
+</services>
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 0000000000000..c41d9811f2d63
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/webapi_async.xsd
@@ -0,0 +1,43 @@
+<?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">
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="service" type="serviceType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="route" type="routeType" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+
+    <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="routeType">
+        <xs:attribute name="url" type="xs:string" use="required"/>
+        <xs:attribute name="method" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="GET"/>
+                    <xs:enumeration value="PUT"/>
+                    <xs:enumeration value="POST"/>
+                    <xs:enumeration value="DELETE"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="alias" type="xs:string" use="required"/>
+    </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 0000000000000..107754df10db6
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/webapi_rest/di.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework: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>
+                <item name="asyncBulkSchema" xsi:type="object" sortOrder="180">Magento\WebapiAsync\Controller\Rest\VirtualType\AsynchronousBulkSchemaRequestProcessor</item>
+                <item name="asyncBulk" xsi:type="object" sortOrder="200">Magento\WebapiAsync\Controller\Rest\VirtualType\AsynchronousBulkRequestProcessor</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 0000000000000..b09a533ab3019
--- /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/WebapiSecurity/Test/Mftf/LICENSE.txt b/app/code/Magento/WebapiSecurity/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/WebapiSecurity/Test/Mftf/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/WebapiSecurity/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/WebapiSecurity/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/WebapiSecurity/Test/Mftf/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/WebapiSecurity/Test/Mftf/README.md b/app/code/Magento/WebapiSecurity/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e3a1132fb9bb2
--- /dev/null
+++ b/app/code/Magento/WebapiSecurity/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Webapi Security Functional Tests
+
+The Functional Test Module for **Magento Webapi Security** module.
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 2366be72794c8..bdb1487cac023 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-webapi": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-webapi": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
index 425a2047cfd51..d6f40f5ac2023 100644
--- a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
+++ b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
@@ -5,10 +5,10 @@
   -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="webapi" translate="label" type="text" sortOrder="102" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="webapi" type="text" sortOrder="102" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="webapisecurity" translate="label" type="text" sortOrder="250" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Web API Security</label>
-                <field id="allow_insecure" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="allow_insecure" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Allow Anonymous Guest Access</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>This feature applies only to CMS, Catalog and Store APIs. Please consult your developers for details on potential security risks.</comment>
diff --git a/app/code/Magento/WebapiSecurity/etc/module.xml b/app/code/Magento/WebapiSecurity/etc/module.xml
index 5fed15fb373b8..64dc439ad3fdd 100644
--- a/app/code/Magento/WebapiSecurity/etc/module.xml
+++ b/app/code/Magento/WebapiSecurity/etc/module.xml
@@ -4,5 +4,5 @@
   ~ 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_WebapiSecurity" setup_version="2.0.0"/>
+    <module name="Magento_WebapiSecurity" />
 </config>
diff --git a/app/code/Magento/WebapiSecurity/i18n/en_US.csv b/app/code/Magento/WebapiSecurity/i18n/en_US.csv
index 94a4e8706bcd8..5e5e821e63e7f 100644
--- a/app/code/Magento/WebapiSecurity/i18n/en_US.csv
+++ b/app/code/Magento/WebapiSecurity/i18n/en_US.csv
@@ -1,2 +1,3 @@
 "Web API Security","Web API Security"
 "Allow Anonymous Guest Access","Allow Anonymous Guest Access"
+"This feature applies only to CMS, Catalog and Store APIs. Please consult your developers for details on potential security risks.","This feature applies only to CMS, Catalog and Store APIs. Please consult your developers for details on potential security risks."
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index ab6710fddcac2..94a6faf72aa96 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -32,7 +32,7 @@ class Tax extends \Magento\Backend\Block\Widget implements
     /**
      * @var string
      */
-    protected $_template = 'renderer/tax.phtml';
+    protected $_template = 'Magento_Weee::renderer/tax.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index dfa40a166ba99..35835e6c5f63f 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Weee\Model\Attribute\Backend\Weee;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -90,7 +91,8 @@ public function validate($object)
             $key1 = implode('-', [$tax['website_id'], $tax['country'], $state]);
             if (!empty($dup[$key1])) {
                 throw new LocalizedException(
-                    __('You must set unique country-state combinations within the same fixed product tax')
+                    __('Set unique country-state combinations within the same fixed product tax. '
+                        . 'Verify the combinations and try again.')
                 );
             }
             $dup[$key1] = 1;
@@ -183,4 +185,12 @@ public function getTable()
     {
         return $this->_attributeTax->getTable('weee_tax');
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getEntityIdField()
+    {
+        return $this->_attributeTax->getIdFieldName();
+    }
 }
diff --git a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
index fa71e81281763..2b8c74581d973 100644
--- a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
+++ b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
@@ -36,6 +36,7 @@ public function __construct(
     /**
      * Check if weee total amount should be included
      *
+     * Example:
      * array(
      *  $index => array(
      *      'amount'   => $amount,
@@ -43,6 +44,7 @@ public function __construct(
      *      'font_size'=> $font_size
      *  )
      * )
+     *
      * @return array
      */
     public function getTotalsForDisplay()
@@ -70,4 +72,17 @@ public function getTotalsForDisplay()
 
         return $totals;
     }
+    
+    /**
+     * Check if we can display Weee total information in PDF
+     *
+     * @return bool
+     */
+    public function canDisplay()
+    {
+        $items = $this->getSource()->getAllItems();
+        $store = $this->getSource()->getStore();
+        $amount = $this->_weeeData->getTotalAmounts($items, $store);
+        return $this->getDisplayZero() === 'true' || $amount != 0;
+    }
 }
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index ae370b41ec192..941faed0498f4 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -248,10 +248,20 @@ public function getProductWeeeAttributes(
         $round = true
     ) {
         $result = [];
-
-        $websiteId = $this->_storeManager->getWebsite($website)->getId();
+        $websiteId = null;
         /** @var \Magento\Store\Model\Store $store */
-        $store = $this->_storeManager->getWebsite($website)->getDefaultGroup()->getDefaultStore();
+        $store = null;
+        if (!$website) {
+            $store = $product->getStore();
+            if ($store) {
+                $websiteId = $store->getWebsiteId();
+            }
+        }
+        if (!$websiteId) {
+            $websiteObject = $this->_storeManager->getWebsite($website);
+            $websiteId = $websiteObject->getId();
+            $store = $websiteObject->getDefaultGroup()->getDefaultStore();
+        }
 
         $allWeee = $this->getWeeeTaxAttributeCodes($store);
         if (!$allWeee) {
@@ -326,7 +336,7 @@ public function getProductWeeeAttributes(
                         $amountExclTax = $amountInclTax - $taxAmount;
                     } else {
                         $appliedRates = $this->_calculationFactory->create()->getAppliedRates($rateRequest);
-                        if (count($appliedRates) > 1) {
+                        if (is_array($appliedRates) && count($appliedRates) > 1) {
                             $taxAmount = 0;
                             foreach ($appliedRates as $appliedRate) {
                                 $taxRate = $appliedRate['percent'];
diff --git a/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php b/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
index ded4f93e22d63..2096a5d544c7b 100644
--- a/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
+++ b/app/code/Magento/Weee/Observer/AssignBackendModelToAttributeObserver.php
@@ -32,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * Automaticaly assign backend model to weee attributes
+     * Automatically assign backend model to weee attributes
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  $this
diff --git a/app/code/Magento/Weee/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper/ProcessTaxAttribute.php b/app/code/Magento/Weee/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper/ProcessTaxAttribute.php
new file mode 100644
index 0000000000000..4aa941cd13796
--- /dev/null
+++ b/app/code/Magento/Weee/Plugin/Catalog/Controller/Adminhtml/Product/Initialization/Helper/ProcessTaxAttribute.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Handles product tax attributes data initialization.
+ */
+class ProcessTaxAttribute
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     */
+    public function __construct(RequestInterface $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Handles product tax attributes data initialization.
+     *
+     * @param Helper $subject
+     * @param Product $result
+     * @param Product $product
+     * @param array $productData
+     * @return Product
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterInitializeFromData(
+        Helper $subject,
+        Product $result,
+        Product $product,
+        array $productData
+    ): Product {
+        $attributes = $result->getAttributes();
+        if (!empty($attributes)) {
+            foreach ($attributes as $attribute) {
+                if ($attribute->getFrontendInput() == 'weee' && !isset($productData[$attribute->getAttributeCode()])) {
+                    $result->setData($attribute->getAttributeCode(), []);
+                }
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Weee/Setup/InstallData.php b/app/code/Magento/Weee/Setup/InstallData.php
deleted file mode 100644
index dd4218cceb99a..0000000000000
--- a/app/code/Magento/Weee/Setup/InstallData.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Weee\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Quote\Setup\QuoteSetup;
-use Magento\Quote\Setup\QuoteSetupFactory;
-use Magento\Sales\Setup\SalesSetup;
-use Magento\Sales\Setup\SalesSetupFactory;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * Sales setup factory
-     *
-     * @var SalesSetupFactory
-     */
-    private $salesSetupFactory;
-
-    /**
-     * Quote setup factory
-     *
-     * @var QuoteSetupFactory
-     */
-    private $quoteSetupFactory;
-
-    /**
-     * Init
-     *
-     * @param SalesSetupFactory $salesSetupFactory
-     * @param QuoteSetupFactory $quoteSetupFactory
-     */
-    public function __construct(
-        SalesSetupFactory $salesSetupFactory,
-        QuoteSetupFactory $quoteSetupFactory
-    ) {
-        $this->salesSetupFactory = $salesSetupFactory;
-        $this->quoteSetupFactory = $quoteSetupFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        /** @var QuoteSetup $quoteSetup */
-        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
-        $quoteSetup->addAttribute('quote_item', 'weee_tax_applied', ['type' => 'text']);
-        $quoteSetup->addAttribute('quote_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'weee_tax_disposition', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
-        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
-
-        /** @var SalesSetup $salesSetup */
-        $salesSetup = $this->salesSetupFactory->create(['setup' => $setup]);
-        $salesSetup->addAttribute('order_item', 'weee_tax_applied', ['type' => 'text']);
-        $salesSetup->addAttribute('order_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'weee_tax_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('order_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
-
-        $salesSetup->addAttribute('invoice_item', 'weee_tax_applied', ['type' => 'text']);
-        $salesSetup->addAttribute('invoice_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'weee_tax_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
-
-        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_applied', ['type' => 'text']);
-        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
-        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
-    }
-}
diff --git a/app/code/Magento/Weee/Setup/InstallSchema.php b/app/code/Magento/Weee/Setup/InstallSchema.php
deleted file mode 100644
index 864117690994b..0000000000000
--- a/app/code/Magento/Weee/Setup/InstallSchema.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Weee\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-        /**
-         * Create table 'weee_tax'
-         */
-        $table = $setup->getConnection()->newTable(
-            $setup->getTable('weee_tax')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Website Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'country',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            2,
-            ['nullable' => true],
-            'Country'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Value'
-        )->addColumn(
-            'state',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'State'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Attribute Id'
-        )->addIndex(
-            $setup->getIdxName('weee_tax', ['website_id']),
-            ['website_id']
-        )->addIndex(
-            $setup->getIdxName('weee_tax', ['entity_id']),
-            ['entity_id']
-        )->addIndex(
-            $setup->getIdxName('weee_tax', ['country']),
-            ['country']
-        )->addIndex(
-            $setup->getIdxName('weee_tax', ['attribute_id']),
-            ['attribute_id']
-        )->addForeignKey(
-            $setup->getFkName('weee_tax', 'country', 'directory_country', 'country_id'),
-            'country',
-            $setup->getTable('directory_country'),
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName('weee_tax', 'entity_id', 'catalog_product_entity', 'entity_id'),
-            'entity_id',
-            $setup->getTable('catalog_product_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName('weee_tax', 'website_id', 'store_website', 'website_id'),
-            'website_id',
-            $setup->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $setup->getFkName('weee_tax', 'attribute_id', 'eav_attribute', 'attribute_id'),
-            'attribute_id',
-            $setup->getTable('eav_attribute'),
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Weee Tax'
-        );
-        $setup->getConnection()->createTable($table);
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php b/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php
new file mode 100644
index 0000000000000..c89b6b590bc02
--- /dev/null
+++ b/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Weee\Setup\Patch\Data;
+
+use Magento\Quote\Setup\QuoteSetup;
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Magento\Sales\Setup\SalesSetup;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InitQuoteAndOrderAttributes
+ * @package Magento\Weee\Setup\Patch
+ */
+class InitQuoteAndOrderAttributes implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * InitQuoteAndOrderAttributes constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param QuoteSetupFactory $quoteSetupFactory
+     * @param SalesSetupFactory $salesSetupFactory
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        QuoteSetupFactory $quoteSetupFactory,
+        SalesSetupFactory $salesSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->quoteSetupFactory = $quoteSetupFactory;
+        $this->salesSetupFactory = $salesSetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var QuoteSetup $quoteSetup */
+        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $quoteSetup->addAttribute('quote_item', 'weee_tax_applied', ['type' => 'text']);
+        $quoteSetup->addAttribute('quote_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'weee_tax_disposition', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
+        $quoteSetup->addAttribute('quote_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
+
+        /** @var SalesSetup $salesSetup */
+        $salesSetup = $this->salesSetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $salesSetup->addAttribute('order_item', 'weee_tax_applied', ['type' => 'text']);
+        $salesSetup->addAttribute('order_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'weee_tax_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('order_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'weee_tax_applied', ['type' => 'text']);
+        $salesSetup->addAttribute('invoice_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'weee_tax_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('invoice_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_applied', ['type' => 'text']);
+        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_applied_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_applied_row_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'weee_tax_row_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_applied_amount', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_applied_row_amnt', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
+        $salesSetup->addAttribute('creditmemo_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
new file mode 100644
index 0000000000000..39deec3d81bac
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Navigate to create product page from product grid page-->
+    <actionGroup name="AdminProductAddFPTValueActionGroup">
+        <arguments>
+            <argument name="FPTAttributeCode"/>
+            <argument name="countryForFPT" defaultValue="US" type="string"/>
+            <argument name="stateForFPT" type="string"/>
+            <argument name="valueForFPT" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductAddFPTValueSection.addFPT(FPTAttributeCode)}}" stepKey="clickAddFPTButton1"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <selectOption selector="{{AdminProductAddFPTValueSection.selectCountryForFPT(FPTAttributeCode)}}" userInput="{{countryForFPT}}" stepKey="selectcountryForFPT"/>
+        <selectOption selector="{{AdminProductAddFPTValueSection.selectStateForFPT(FPTAttributeCode)}}" userInput="{{stateForFPT}}" stepKey="selectstateForFPT"/>
+        <fillField selector="{{AdminProductAddFPTValueSection.setTaxValueForFPT(FPTAttributeCode)}}" userInput="{{valueForFPT}}" stepKey="setTaxvalueForFPT"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
new file mode 100644
index 0000000000000..b8b45d84242c9
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="productFPTAttribute" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="is_unique">true</data>
+        <data key="frontend_input">weee</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
new file mode 100644
index 0000000000000..e44c1bb51e41b
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Fixed Product Taxes Enable-->
+    <entity name="WeeeConfigEnable" type="weee_config">
+        <requiredEntity type="enableFPT">EnableFPT</requiredEntity>
+    </entity>
+    <entity name="EnableFPT" type="enableFPT">
+        <data key="value">1</data>
+    </entity>
+    <!-- Fixed Product Taxes Disable-->
+    <entity name="WeeeConfigDisable" type="weee_config_default">
+        <requiredEntity type="disableFPT">DisableFPT</requiredEntity>
+    </entity>
+    <entity name="DisableFPT" type="disableFPT">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Weee/Test/Mftf/LICENSE.txt b/app/code/Magento/Weee/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/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/Weee/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Weee/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/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/Weee/Test/Mftf/Metadata/weee_config-meta.xml b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
new file mode 100644
index 0000000000000..56153067658d2
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="WeeeConfigEnable" dataType="weee_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="weee_config">
+            <object key="weee" dataType="weee_config">
+                <object key="fields" dataType="weee_config">
+                    <object key="enable" dataType="enableFPT">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="WeeeConfigDefault" dataType="weee_config_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="weee_config_default">
+            <object key="weee" dataType="weee_config_default">
+                 <object key="fields" dataType="weee_config_default">
+                    <object key="enable" dataType="weee_config_default">
+                      <object key="inherit" dataType="disableFPT">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
new file mode 100644
index 0000000000000..793b763f0fc15
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductEditPage" url="catalog/product/edit/id/{{product_id}}/" area="admin" module="Magento_Catalog">
+        <section name="AdminProductAddFPTValueSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Weee/Test/Mftf/README.md b/app/code/Magento/Weee/Test/Mftf/README.md
new file mode 100644
index 0000000000000..78739e99958a5
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Weee Functional Tests
+
+The Functional Test Module for **Magento Weee** module.
diff --git a/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
new file mode 100644
index 0000000000000..ebf9f41047124
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductAddFPTValueSection">
+        <element name="addFPT" type="button" selector="[data-index='{{FPTAttributeCode}}'] [data-action='add_new_row']" parameterized="true"/>
+        <element name="removeRowByIndex" type="button" selector="[data-index='{{FPTAttributeCode}}'] [data-action='remove_row']:nth-of-type({{rowIndex}})" parameterized="true"/>
+        <element name="selectCountryForFPT" type="select" selector="(//select[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[country]')])[last()]" parameterized="true"/>
+        <element name="selectStateForFPT" type="select" selector="(//select[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[state]')])[last()]" parameterized="true"/>
+        <element name="setTaxValueForFPT" type="text" selector="(//input[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[value]')])[last()]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..2f8ed312f15cf
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="amountFPT" type="text" selector=".totals td[data-th='FPT'] .price"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
new file mode 100644
index 0000000000000..2e3467fe2c7c5
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminRemoveProductWeeeAttributeOptionTest">
+        <annotations>
+            <features value="Weee attribute options can be removed in product page"/>
+            <title value="Weee attribute options can be removed in product page"/>
+            <description value="Weee attribute options can be removed in product page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-95033"/>
+            <group value="weee"/>
+        </annotations>
+        <before>
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProductInitial">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductInitial">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addWeeeAttributeValue">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="California"/>
+                <argument name="valueForFPT" value="10"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProductInitial"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
+            <waitForPageLoad stepKey="waitForProductListingPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Open created product edit page  -->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!--  Step 2: Remove weee attribute options  -->
+        <click selector="{{AdminProductAddFPTValueSection.removeRowByIndex('$$createProductFPTAttribute.attribute_code$$','1')}}" stepKey="removeAttributeOption"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <!--  Assert weee attribute options are empty -->
+        <dontSeeElement selector="{{AdminProductAddFPTValueSection.removeRowByIndex('$$createProductFPTAttribute.attribute_code$$','1')}}" stepKey="dontSeeOptions"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php b/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
index b49150fc6fac0..8b770ea763cdd 100644
--- a/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
@@ -122,6 +122,9 @@ public function testDisplayPriceWithWeeeDetails(
         $this->assertEquals($expectedValue, $this->renderer->displayPriceWithWeeeDetails());
     }
 
+    /**
+     * @return array
+     */
     public function displayPriceWithWeeeDetailsDataProvider()
     {
         $data = [
@@ -472,6 +475,9 @@ public function testGetBaseRowDisplayPriceInclTax(
         $this->assertEquals($expectedValue, $this->renderer->getBaseRowDisplayPriceInclTax());
     }
 
+    /**
+     * @return array
+     */
     public function getDisplayPriceDataProvider()
     {
         $data = [
@@ -739,6 +745,9 @@ public function testGetBaseFinalRowDisplayPriceInclTax(
         $this->assertEquals($expectedValue, $this->renderer->getBaseFinalRowDisplayPriceInclTax());
     }
 
+    /**
+     * @return array
+     */
     public function getFinalDisplayPriceDataProvider()
     {
         $data = [
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
index 28850fa2b84d8..7170969f5953e 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
@@ -80,7 +80,8 @@ public function testValidate($data, $expected)
             ->will($this->returnValue($taxes));
 
         // Exception caught
-        $this->expectException('Exception', $expected);
+        $this->expectException('Exception');
+        $this->expectExceptionMessage($expected);
         $modelMock->validate($productMock);
     }
 
@@ -97,7 +98,8 @@ public function dataProviderValidate()
                     ['state' => 12, 'country' => 'US', 'website_id' => '1'],
                     ['state' => null, 'country' => 'ES', 'website_id' => '1']
                 ],
-                'expected' => 'You must set unique country-state combinations within the same fixed product tax',
+                'expected' => 'Set unique country-state combinations within the same fixed product tax. '
+                    . 'Verify the combinations and try again.',
                 ]
         ];
     }
@@ -267,4 +269,31 @@ public function testGetTable()
 
         $model->getTable();
     }
+
+    /**
+     * Test method GetEntityIdField.
+     *
+     * @return void
+     */
+    public function testGetEntityIdField() : void
+    {
+        $attributeTaxMock = $this->getMockBuilder(\Magento\Weee\Model\ResourceModel\Attribute\Backend\Weee\Tax::class)
+            ->setMethods(['getIdFieldName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('getIdFieldName')
+            ->willReturn(null);
+
+        $model = $this->objectManager->getObject(
+            \Magento\Weee\Model\Attribute\Backend\Weee\Tax::class,
+            [
+                'attributeTax' => $attributeTaxMock,
+            ]
+        );
+
+        $model->getEntityIdField();
+    }
 }
diff --git a/app/code/Magento/Weee/Test/Unit/Model/TaxTest.php b/app/code/Magento/Weee/Test/Unit/Model/TaxTest.php
index 13827f4a0e9cc..ac90dfade07e2 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/TaxTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/TaxTest.php
@@ -157,13 +157,17 @@ protected function setUp()
     }
 
     /**
-     * test GetProductWeeeAttributes
      * @dataProvider getProductWeeeAttributesDataProvider
      * @param array $weeeTaxCalculationsByEntity
-     * @param array $expectedFptLabel
+     * @param mixed $websitePassed
+     * @param string $expectedFptLabel
+     * @return void
      */
-    public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expectedFptLabel)
-    {
+    public function testGetProductWeeeAttributes(
+        array $weeeTaxCalculationsByEntity,
+        $websitePassed,
+        string $expectedFptLabel
+    ): void {
         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
         $website = $this->createMock(\Magento\Store\Model\Website::class);
         $store = $this->createMock(\Magento\Store\Model\Store::class);
@@ -187,28 +191,38 @@ public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expe
             ->method('getAttributeCodesByFrontendType')
             ->willReturn(['0'=>'fpt']);
 
-        $store->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-
-        $product->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-
+        $this->storeManager->expects($this->any())
+            ->method('getWebsite')
+            ->willReturn($website);
         $website->expects($this->any())
             ->method('getId')
-            ->willReturn(1);
+            ->willReturn($websitePassed);
         $website->expects($this->any())
             ->method('getDefaultGroup')
             ->willReturn($group);
-
         $group->expects($this->any())
             ->method('getDefaultStore')
             ->willReturn($store);
+        $store->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
 
-        $this->storeManager->expects($this->any())
-            ->method('getWebsite')
-            ->willReturn($website);
+        if ($websitePassed) {
+            $product->expects($this->never())
+                ->method('getStore')
+                ->willReturn($store);
+        } else {
+            $product->expects($this->once())
+                ->method('getStore')
+                ->willReturn($store);
+            $store->expects($this->once())
+                ->method('getWebsiteId')
+                ->willReturn(1);
+        }
+
+        $product->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
 
         $this->weeeConfig->expects($this->any())
             ->method('isEnabled')
@@ -237,7 +251,7 @@ public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expe
                 0 => $weeeTaxCalculationsByEntity
             ]);
 
-        $result = $this->model->getProductWeeeAttributes($product, null, null, null, true);
+        $result = $this->model->getProductWeeeAttributes($product, null, null, $websitePassed, true);
         $this->assertTrue(is_array($result));
         $this->assertArrayHasKey(0, $result);
         $obj = $result[0];
@@ -251,17 +265,17 @@ public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expe
      * Test getWeeeAmountExclTax method
      *
      * @param string $productTypeId
-     * @param string $prodcuctPriceType
+     * @param string $productPriceType
      * @dataProvider getWeeeAmountExclTaxDataProvider
      */
-    public function testGetWeeeAmountExclTax($productTypeId, $prodcuctPriceType)
+    public function testGetWeeeAmountExclTax($productTypeId, $productPriceType)
     {
         $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTypeId', 'getPriceType'])
             ->getMock();
         $product->expects($this->any())->method('getTypeId')->willReturn($productTypeId);
-        $product->expects($this->any())->method('getPriceType')->willReturn($prodcuctPriceType);
+        $product->expects($this->any())->method('getPriceType')->willReturn($productPriceType);
         $weeeDataHelper = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAmountExclTax'])
@@ -312,7 +326,8 @@ public function getProductWeeeAttributesDataProvider()
                     'frontend_label' => 'fpt_label_frontend',
                     'attribute_code' => 'fpt_code',
                 ],
-                'expectedFptLabel' => 'fpt_label'
+                'websitePassed' => 1,
+                'expectedFptLabel' => 'fpt_label',
             ],
             'store_label_not_defined' => [
                 'weeeTaxCalculationsByEntity' => [
@@ -321,8 +336,19 @@ public function getProductWeeeAttributesDataProvider()
                     'frontend_label' => 'fpt_label_frontend',
                     'attribute_code' => 'fpt_code',
                 ],
-                'expectedFptLabel' => 'fpt_label_frontend'
-            ]
+                'websitePassed' => 1,
+                'expectedFptLabel' => 'fpt_label_frontend',
+            ],
+            'website_not_passed' => [
+                'weeeTaxCalculationsByEntity' => [
+                    'weee_value' => 1,
+                    'label_value' => '',
+                    'frontend_label' => 'fpt_label_frontend',
+                    'attribute_code' => 'fpt_code',
+                ],
+                'websitePassed' => null,
+                'expectedFptLabel' => 'fpt_label_frontend',
+            ],
         ];
     }
 
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
index 975580945bb3a..22d673e0c8b26 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
@@ -78,6 +78,9 @@ protected function setUp()
         $this->invoice->expects($this->atLeastOnce())->method('getOrder')->will($this->returnValue($this->order));
     }
 
+    /**
+     * @param $orderData
+     */
     private function setupOrder($orderData)
     {
         //Set up order mock
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AddPaymentWeeeItemTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AddPaymentWeeeItemTest.php
new file mode 100644
index 0000000000000..dd0547354cfa4
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Unit/Observer/AddPaymentWeeeItemTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Test\Unit\Observer;
+
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Payment\Model\Cart;
+use Magento\Payment\Model\Cart\SalesModel\SalesModelInterface;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Weee\Helper\Data;
+use Magento\Weee\Observer\AddPaymentWeeeItem;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class AddPaymentWeeeItemTest
+ */
+class AddPaymentWeeeItemTest extends TestCase
+{
+    /**
+     * Testable object
+     *
+     * @var AddPaymentWeeeItem
+     */
+    private $observer;
+
+    /**
+     * @var Data|MockObject
+     */
+    private $weeeHelperMock;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->weeeHelperMock = $this->createMock(Data::class);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+
+        $this->observer = new AddPaymentWeeeItem(
+            $this->weeeHelperMock,
+            $this->storeManagerMock
+        );
+    }
+
+    /**
+     * Test execute
+     *
+     * @dataProvider dataProvider
+     * @param bool $isEnabled
+     * @param bool $includeInSubtotal
+     * @return void
+     */
+    public function testExecute(bool $isEnabled, bool $includeInSubtotal): void
+    {
+        /** @var Observer|MockObject $observerMock */
+        $observerMock = $this->createMock(Observer::class);
+        $cartModelMock = $this->createMock(Cart::class);
+        $salesModelMock = $this->createMock(SalesModelInterface::class);
+        $itemMock = $this->createPartialMock(Item::class, ['getOriginalItem']);
+        $originalItemMock = $this->createPartialMock(Item::class, ['getParentItem']);
+        $parentItemMock = $this->createMock(Item::class);
+        $eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCart'])
+            ->getMock();
+
+        $asCustomItem = $this->prepareShouldBeAddedAsCustomItem($isEnabled, $includeInSubtotal);
+        $toBeCalled = 1;
+        if (!$asCustomItem) {
+            $toBeCalled = 0;
+        }
+
+        $eventMock->expects($this->exactly($toBeCalled))
+            ->method('getCart')
+            ->willReturn($cartModelMock);
+        $observerMock->expects($this->exactly($toBeCalled))
+            ->method('getEvent')
+            ->willReturn($eventMock);
+        $itemMock->expects($this->exactly($toBeCalled))
+            ->method('getOriginalItem')
+            ->willReturn($originalItemMock);
+        $originalItemMock->expects($this->exactly($toBeCalled))
+            ->method('getParentItem')
+            ->willReturn($parentItemMock);
+        $salesModelMock->expects($this->exactly($toBeCalled))
+            ->method('getAllItems')
+            ->willReturn([$itemMock]);
+        $cartModelMock->expects($this->exactly($toBeCalled))
+            ->method('getSalesModel')
+            ->willReturn($salesModelMock);
+
+        $this->observer->execute($observerMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProvider(): array
+    {
+        return [
+            [true, false],
+            [true, true],
+            [false, true],
+            [false, false],
+        ];
+    }
+
+    /**
+     * Prepare if FPT should be added to payment cart as custom item or not.
+     *
+     * @param bool $isEnabled
+     * @param bool $includeInSubtotal
+     * @return bool
+     */
+    private function prepareShouldBeAddedAsCustomItem(bool $isEnabled, bool $includeInSubtotal): bool
+    {
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(Store::DEFAULT_STORE_ID);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($storeMock);
+        $this->weeeHelperMock->expects($this->once())
+            ->method('isEnabled')
+            ->with(Store::DEFAULT_STORE_ID)
+            ->willReturn($isEnabled);
+
+        if ($isEnabled) {
+            $this->weeeHelperMock->expects($this->once())
+                ->method('includeInSubtotal')
+                ->with(Store::DEFAULT_STORE_ID)
+                ->willReturn($includeInSubtotal);
+        }
+
+        return $isEnabled && !$includeInSubtotal;
+    }
+}
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
index 19f55550bac65..6d363847bf9e6 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
@@ -130,6 +130,9 @@ public function testExecute(
         $this->session->execute($this->observerMock);
     }
 
+    /**
+     * @return array
+     */
     public function getExecuteDataProvider()
     {
         return [
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/SetWeeeRendererInFormObserverTest.php b/app/code/Magento/Weee/Test/Unit/Observer/SetWeeeRendererInFormObserverTest.php
new file mode 100644
index 0000000000000..188b42cb37906
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Unit/Observer/SetWeeeRendererInFormObserverTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Test\Unit\Observer;
+
+use Magento\Framework\Data\Form;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Weee\Model\Tax;
+use Magento\Weee\Observer\SetWeeeRendererInFormObserver;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class AddPaymentWeeeItemTest
+ */
+class SetWeeeRendererInFormObserverTest extends TestCase
+{
+    /**
+     * Testable object
+     *
+     * @var SetWeeeRendererInFormObserver
+     */
+    private $observer;
+
+    /**
+     * @var LayoutInterface|MockObject
+     */
+    private $layoutMock;
+
+    /**
+     * @var Tax|MockObject
+     */
+    private $taxModelMock;
+
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->layoutMock = $this->createMock(LayoutInterface::class);
+        $this->taxModelMock = $this->createMock(Tax::class);
+        $this->observer = new SetWeeeRendererInFormObserver(
+            $this->layoutMock,
+            $this->taxModelMock
+        );
+    }
+
+    /**
+     * Test assigning a custom renderer for product create/edit form weee attribute element
+     *
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $attributes = new \ArrayIterator(['element_code_1', 'element_code_2']);
+        /** @var Event|MockObject $eventMock */
+        $eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getForm'])
+            ->getMock();
+
+        /** @var Observer|MockObject $observerMock */
+        $observerMock = $this->createMock(Observer::class);
+        /** @var Form|MockObject $formMock */
+        $formMock = $this->createMock(Form::class);
+
+        $eventMock->expects($this->once())
+            ->method('getForm')
+            ->willReturn($formMock);
+        $observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($eventMock);
+        $this->taxModelMock->expects($this->once())
+            ->method('getWeeeAttributeCodes')
+            ->willReturn($attributes);
+        $formMock->expects($this->exactly($attributes->count()))
+            ->method('getElement')
+            ->willReturnSelf();
+
+        $this->observer->execute($observerMock);
+    }
+}
diff --git a/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php b/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
index fb2d058217089..a0d0b6486c7d9 100644
--- a/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
@@ -134,6 +134,9 @@ public function testIsExcludedWith($adjustmentCode, $expectedResult)
         $this->assertEquals($expectedResult, $this->adjustment->isExcludedWith($adjustmentCode));
     }
 
+    /**
+     * @return array
+     */
     public function isExcludedWithDataProvider()
     {
         return [
@@ -157,6 +160,9 @@ public function testGetSortOrder($isTaxable, $expectedResult)
         $this->assertEquals($expectedResult, $this->adjustment->getSortOrder());
     }
 
+    /**
+     * @return array
+     */
     public function getSortOrderProvider()
     {
         return [
diff --git a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
index 6be1713c99004..266737089cd21 100644
--- a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
@@ -41,6 +41,9 @@ class WeeeTest extends \PHPUnit\Framework\TestCase
     /** @var FormattedPriceInfoBuilder|\PHPUnit_Framework_MockObject_MockObject */
     private $formattedPriceInfoBuilder;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->weeeHelperMock = $this->getMockBuilder(\Magento\Weee\Helper\Data::class)
@@ -50,14 +53,16 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->weeeAdjustmentAttributeFactory = $this->getMockBuilder(WeeeAdjustmentAttributeInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
         $this->extensionAttributes = $this->getMockBuilder(PriceInfoExtensionInterface::class)
             ->setMethods(['setWeeeAttributes', 'setWeeeAdjustment'])
-            ->getMock();
+            ->getMockForAbstractClass();
 
         $this->priceInfoExtensionFactory = $this->getMockBuilder(PriceInfoExtensionInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
@@ -74,6 +79,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testCollect()
     {
         $productMock = $this->getMockBuilder(Product::class)
diff --git a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
index c96a7a0200334..d05b8c2168936 100644
--- a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
+++ b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
@@ -85,7 +85,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -93,7 +93,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
@@ -155,6 +155,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                         'dndConfig' => [
                             'enabled' => false,
                         ],
+                        'required' => (bool)$attributeConfig['arguments']['data']['config']['required'],
                     ],
                 ],
             ],
@@ -180,6 +181,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                                         'component' => 'Magento_Weee/js/fpt-group',
                                         'visible' => true,
                                         'label' => __('Country/State'),
+                                        'showLabel' => false,
                                     ],
                                 ],
                             ],
@@ -197,6 +199,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                                                 'validation' => [
                                                     'required-entry' => true,
                                                 ],
+                                                'showLabel' => false,
                                             ],
                                         ],
                                     ],
@@ -216,6 +219,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                                                 ],
                                                 'caption' => '*',
                                                 'visible' => true,
+                                                'showLabel' => false,
                                             ],
                                         ],
                                     ],
@@ -233,6 +237,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                                                 'validation' => [
                                                     'validate-fpt-group' => true
                                                 ],
+                                                'showLabel' => false,
                                             ],
                                         ],
                                     ],
@@ -252,6 +257,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                                         'validation' => [
                                             'required-entry' => true
                                         ],
+                                        'showLabel' => false,
                                     ],
                                 ],
                             ],
@@ -267,6 +273,7 @@ protected function modifyAttributeConfig($attributeCode, array $attributeConfig)
                                         'label' => __('Website'),
                                         'visible' => $this->websiteManager->isMultiWebsites(),
                                         'options' => $this->websiteManager->getWebsites($product, $eavAttribute),
+                                        'showLabel' => false,
                                     ],
                                 ],
                             ],
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index 3e6617c79f702..3f832ce51ee83 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -5,26 +5,25 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-directory": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-bundle": "100.3.*"
+        "magento/module-bundle": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Weee/etc/db_schema.xml b/app/code/Magento/Weee/etc/db_schema.xml
new file mode 100644
index 0000000000000..1b07168247011
--- /dev/null
+++ b/app/code/Magento/Weee/etc/db_schema.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="weee_tax" resource="default" engine="innodb" comment="Weee Tax">
+        <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
+                comment="Value Id"/>
+        <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Website Id"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Entity ID"/>
+        <column xsi:type="varchar" name="country" nullable="true" length="2" comment="Country"/>
+        <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+                comment="Value"/>
+        <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="false" identity="false" default="0"
+                comment="State"/>
+        <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Attribute Id"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="value_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_COUNTRY_DIRECTORY_COUNTRY_COUNTRY_ID" table="weee_tax"
+                    column="country" referenceTable="directory_country" referenceColumn="country_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_ENTITY_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID" table="weee_tax"
+                    column="entity_id" referenceTable="catalog_product_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID" table="weee_tax"
+                    column="website_id" referenceTable="store_website" referenceColumn="website_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="WEEE_TAX_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID" table="weee_tax"
+                    column="attribute_id" referenceTable="eav_attribute" referenceColumn="attribute_id"
+                    onDelete="CASCADE"/>
+        <index referenceId="WEEE_TAX_WEBSITE_ID" indexType="btree">
+            <column name="website_id"/>
+        </index>
+        <index referenceId="WEEE_TAX_ENTITY_ID" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <index referenceId="WEEE_TAX_COUNTRY" indexType="btree">
+            <column name="country"/>
+        </index>
+        <index referenceId="WEEE_TAX_ATTRIBUTE_ID" indexType="btree">
+            <column name="attribute_id"/>
+        </index>
+    </table>
+    <table name="quote_item" resource="checkout" comment="Sales Flat Quote Item">
+        <column xsi:type="text" name="weee_tax_applied" nullable="true" comment="Weee Tax Applied"/>
+        <column xsi:type="decimal" name="weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="weee_tax_applied_row_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Row Amount"/>
+        <column xsi:type="decimal" name="weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Row Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_row_amnt" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Row Amnt"/>
+        <column xsi:type="decimal" name="base_weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Row Disposition"/>
+    </table>
+    <table name="sales_order_item" resource="sales" comment="Sales Flat Order Item">
+        <column xsi:type="text" name="weee_tax_applied" nullable="true" comment="Weee Tax Applied"/>
+        <column xsi:type="decimal" name="weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="weee_tax_applied_row_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Row Amount"/>
+        <column xsi:type="decimal" name="weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Row Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_row_amnt" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Row Amnt"/>
+        <column xsi:type="decimal" name="base_weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Row Disposition"/>
+    </table>
+    <table name="sales_invoice_item" resource="sales" comment="Sales Flat Invoice Item">
+        <column xsi:type="text" name="weee_tax_applied" nullable="true" comment="Weee Tax Applied"/>
+        <column xsi:type="decimal" name="weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="weee_tax_applied_row_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Row Amount"/>
+        <column xsi:type="decimal" name="weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Row Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_row_amnt" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Row Amnt"/>
+        <column xsi:type="decimal" name="base_weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Row Disposition"/>
+    </table>
+    <table name="sales_creditmemo_item" resource="sales" comment="Sales Flat Creditmemo Item">
+        <column xsi:type="text" name="weee_tax_applied" nullable="true" comment="Weee Tax Applied"/>
+        <column xsi:type="decimal" name="weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="weee_tax_applied_row_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Applied Row Amount"/>
+        <column xsi:type="decimal" name="weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Weee Tax Row Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_amount" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Amount"/>
+        <column xsi:type="decimal" name="base_weee_tax_applied_row_amnt" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Applied Row Amnt"/>
+        <column xsi:type="decimal" name="base_weee_tax_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Disposition"/>
+        <column xsi:type="decimal" name="base_weee_tax_row_disposition" scale="4" precision="12" unsigned="false"
+                nullable="true" comment="Base Weee Tax Row Disposition"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/Weee/etc/db_schema_whitelist.json b/app/code/Magento/Weee/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..eb18574877cfe
--- /dev/null
+++ b/app/code/Magento/Weee/etc/db_schema_whitelist.json
@@ -0,0 +1,79 @@
+{
+    "weee_tax": {
+        "column": {
+            "value_id": true,
+            "website_id": true,
+            "entity_id": true,
+            "country": true,
+            "value": true,
+            "state": true,
+            "attribute_id": true
+        },
+        "index": {
+            "WEEE_TAX_WEBSITE_ID": true,
+            "WEEE_TAX_ENTITY_ID": true,
+            "WEEE_TAX_COUNTRY": true,
+            "WEEE_TAX_ATTRIBUTE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "WEEE_TAX_COUNTRY_DIRECTORY_COUNTRY_COUNTRY_ID": true,
+            "WEEE_TAX_ENTITY_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
+            "WEEE_TAX_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true,
+            "WEEE_TAX_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "WEEE_TAX_ENTITY_ID_SEQUENCE_PRODUCT_SEQUENCE_VALUE": true
+        }
+    },
+    "quote_item": {
+        "column": {
+            "weee_tax_applied": true,
+            "weee_tax_applied_amount": true,
+            "weee_tax_applied_row_amount": true,
+            "weee_tax_disposition": true,
+            "weee_tax_row_disposition": true,
+            "base_weee_tax_applied_amount": true,
+            "base_weee_tax_applied_row_amnt": true,
+            "base_weee_tax_disposition": true,
+            "base_weee_tax_row_disposition": true
+        }
+    },
+    "sales_order_item": {
+        "column": {
+            "weee_tax_applied": true,
+            "weee_tax_applied_amount": true,
+            "weee_tax_applied_row_amount": true,
+            "weee_tax_disposition": true,
+            "weee_tax_row_disposition": true,
+            "base_weee_tax_applied_amount": true,
+            "base_weee_tax_applied_row_amnt": true,
+            "base_weee_tax_disposition": true,
+            "base_weee_tax_row_disposition": true
+        }
+    },
+    "sales_invoice_item": {
+        "column": {
+            "weee_tax_applied": true,
+            "weee_tax_applied_amount": true,
+            "weee_tax_applied_row_amount": true,
+            "weee_tax_disposition": true,
+            "weee_tax_row_disposition": true,
+            "base_weee_tax_applied_amount": true,
+            "base_weee_tax_applied_row_amnt": true,
+            "base_weee_tax_disposition": true,
+            "base_weee_tax_row_disposition": true
+        }
+    },
+    "sales_creditmemo_item": {
+        "column": {
+            "weee_tax_applied": true,
+            "weee_tax_applied_amount": true,
+            "weee_tax_applied_row_amount": true,
+            "weee_tax_disposition": true,
+            "weee_tax_row_disposition": true,
+            "base_weee_tax_applied_amount": true,
+            "base_weee_tax_applied_row_amnt": true,
+            "base_weee_tax_disposition": true,
+            "base_weee_tax_row_disposition": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Weee/etc/di.xml b/app/code/Magento/Weee/etc/di.xml
index e52aebd3af8b5..8b433163cad22 100644
--- a/app/code/Magento/Weee/etc/di.xml
+++ b/app/code/Magento/Weee/etc/di.xml
@@ -78,4 +78,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">
+        <plugin name="weeeAttributeOptionsProcess" type="Magento\Weee\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper\ProcessTaxAttribute"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Weee/etc/module.xml b/app/code/Magento/Weee/etc/module.xml
index 01fa4fa5fd69e..8064f84577720 100644
--- a/app/code/Magento/Weee/etc/module.xml
+++ b/app/code/Magento/Weee/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Weee" setup_version="2.0.0">
+    <module name="Magento_Weee" >
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Tax"/>
diff --git a/app/code/Magento/Weee/view/adminhtml/web/js/fpt-group.js b/app/code/Magento/Weee/view/adminhtml/web/js/fpt-group.js
index b034ae376f596..dc13c93888efd 100644
--- a/app/code/Magento/Weee/view/adminhtml/web/js/fpt-group.js
+++ b/app/code/Magento/Weee/view/adminhtml/web/js/fpt-group.js
@@ -34,7 +34,10 @@ define([
                 }
 
                 return true;
-            }, $t('You must set unique country-state combinations within the same fixed product tax'));
+            }, $t(
+                'Set unique country-state combinations within the same fixed product tax. ' +
+                'Verify the combinations and try again.'
+            ));
 
             this._super();
         },
diff --git a/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
index 3de3d596d344e..f37f3564bda90 100644
--- a/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
@@ -35,11 +35,11 @@
                                                                 <item name="subtotal" xsi:type="array">
                                                                     <item name="children" xsi:type="array">
                                                                         <item name="weee_row_incl_tax" xsi:type="array">
-                                                                            <item name="component"  xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_incl_tax</item>
+                                                                            <item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_incl_tax</item>
                                                                         <item name="displayArea" xsi:type="string">row_incl_tax</item>
                                                                         </item>
                                                                         <item name="weee_row_excl_tax" xsi:type="array">
-                                                                            <item name="component"  xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_excl_tax</item>
+                                                                            <item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_excl_tax</item>
                                                                             <item name="displayArea" xsi:type="string">row_excl_tax</item>
                                                                         </item>
                                                                     </item>
diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js
index 49dfb6b9d469b..94c59da65216d 100644
--- a/app/code/Magento/Weee/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            'taxToggle': 'Magento_Weee/tax-toggle'
+            'taxToggle': 'Magento_Weee/js/tax-toggle',
+            'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle'
         }
     }
 };
diff --git a/app/code/Magento/Weee/view/frontend/web/tax-toggle.js b/app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
similarity index 100%
rename from app/code/Magento/Weee/view/frontend/web/tax-toggle.js
rename to app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
diff --git a/app/code/Magento/WeeeGraphQl/README.md b/app/code/Magento/WeeeGraphQl/README.md
new file mode 100644
index 0000000000000..b44771513d562
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/README.md
@@ -0,0 +1,4 @@
+# WeeeGraphQl
+
+**WeeeGraphQl** provides type information for the GraphQl module
+to generate wee tax fields for catalog and product information endpoints.
diff --git a/app/code/Magento/WeeeGraphQl/Test/Mftf/README.md b/app/code/Magento/WeeeGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..d39ee3cc685f4
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Weee Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Weee Graph Ql** module.
diff --git a/app/code/Magento/WeeeGraphQl/composer.json b/app/code/Magento/WeeeGraphQl/composer.json
new file mode 100644
index 0000000000000..eb7835cf0d889
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-weee-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
+    },
+    "suggest": {
+        "magento/module-weee": "*",
+        "magento/module-catalog-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\WeeeGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/WeeeGraphQl/etc/module.xml b/app/code/Magento/WeeeGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..90a5636071f35
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_WeeeGraphQl" />
+</config>
diff --git a/app/code/Magento/WeeeGraphQl/etc/schema.graphqls b/app/code/Magento/WeeeGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..731260ce9e1e0
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/etc/schema.graphqls
@@ -0,0 +1,7 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+enum PriceAdjustmentCodesEnum {
+    WEE
+    WEETAX
+}
diff --git a/app/code/Magento/WeeeGraphQl/registration.php b/app/code/Magento/WeeeGraphQl/registration.php
new file mode 100644
index 0000000000000..37247c9f0c02d
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_WeeeGraphQl', __DIR__);
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index e4854415d7534..33e6109b769db 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -15,7 +15,9 @@
 class Widget extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * @return void
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _construct()
     {
@@ -40,13 +42,16 @@ protected function _construct()
         $this->buttonList->update('reset', 'label', __('Cancel'));
         $this->buttonList->update('reset', 'onclick', 'wWidget.closeModal()');
 
-        $this->_formScripts[] = 'require(["mage/adminhtml/wysiwyg/widget"],'
-            . ' function(){wWidget = new WysiwygWidget.Widget('
-            . '"widget_options_form", "select_widget_type", "widget_options", "'
-            . $this->getUrl(
-                'adminhtml/*/loadOptions'
-            ) . '", "' . $this->getRequest()->getParam(
-                'widget_target_id'
-            ) . '");});';
+        $this->_formScripts[] = <<<EOJS
+require(['mage/adminhtml/wysiwyg/widget'], function() {
+    wWidget = new WysiwygWidget.Widget(
+        'widget_options_form',
+        'select_widget_type',
+        'widget_options',
+        '{$this->getUrl('adminhtml/*/loadOptions')}',
+        '{$this->escapeJs($this->getRequest()->getParam('widget_target_id'))}'
+    );
+});
+EOJS;
     }
 }
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
index d813e94437326..45b3056eac68d 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Widget\Block\Adminhtml\Widget;
 
+/**
+ * Chooser widget block.
+ */
 class Chooser extends \Magento\Backend\Block\Template
 {
     /**
@@ -180,7 +183,7 @@ protected function _toHtml()
             <label class="widget-option-label" id="' .
             $chooserId .
             'label">' .
-            ($this->getLabel() ? $this->getLabel() : __(
+            ($this->getLabel() ? $this->escapeHtml($this->getLabel()) : __(
                 'Not Selected'
             )) .
             '</label>
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index f2594a95c1605..73a6faec9b675 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -80,7 +80,7 @@ public function getTabTitle()
     }
 
     /**
-     * Returns status flag about this tab can be showen or not
+     * Returns status flag about this tab can be shown or not
      *
      * @return true
      */
@@ -229,7 +229,7 @@ public function getTypesOptionsArray()
     }
 
     /**
-     * Initialize form fileds values
+     * Initialize form fields values
      *
      * @return $this
      */
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 49345f29afd53..c48bf9e7e4c7a 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -27,7 +27,7 @@ class Layout extends Template implements RendererInterface
     /**
      * @var string
      */
-    protected $_template = 'instance/edit/layout.phtml';
+    protected $_template = 'Magento_Widget::instance/edit/layout.phtml';
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
index 1e57a4d24aaa0..9d4003feaef0b 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -49,7 +49,7 @@ public function getTabTitle()
     }
 
     /**
-     * Returns status flag about this tab can be showen or not
+     * Returns status flag about this tab can be shown or not
      *
      * @return true
      */
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index 979e7af04be85..c3ba1dd0367ca 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -78,7 +78,7 @@ public function getTabTitle()
     }
 
     /**
-     * Returns status flag about this tab can be showen or not
+     * Returns status flag about this tab can be shown or not
      *
      * @return true
      */
diff --git a/app/code/Magento/Widget/Block/BlockInterface.php b/app/code/Magento/Widget/Block/BlockInterface.php
index ddf810f433f3a..4f795d949b8cd 100644
--- a/app/code/Magento/Widget/Block/BlockInterface.php
+++ b/app/code/Magento/Widget/Block/BlockInterface.php
@@ -19,6 +19,7 @@ interface BlockInterface
 {
     /**
      * Add data to the widget.
+     *
      * Retains previous data in the widget.
      *
      * @param array $arr
@@ -35,7 +36,7 @@ public function addData(array $arr);
      *
      * @param string|array $key
      * @param mixed $value
-     * @return \Magento\Framework\DataObject
+     * @return $this
      */
     public function setData($key, $value = null);
 }
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
index d9ef20aa90e47..0b9431f717e0a 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget;
 
-class BuildWidget extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class BuildWidget extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
index 61e44fe00db61..e7454faf925a6 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget;
 
-class Index extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Index extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
index 40ade57f6a9e9..50f3addaf7c59 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget\Instance;
 
-class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance implements HttpGetActionInterface
 {
     /**
      * Widget Instances Grid
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
index 98275c3b906db..dc137365498b2 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget\Instance;
 
-class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
+class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance implements HttpPostActionInterface
 {
     /**
      * Save action
@@ -49,7 +51,5 @@ public function execute()
             $this->_redirect('adminhtml/*/edit', ['_current' => true]);
             return;
         }
-        $this->_redirect('adminhtml/*/');
-        return;
     }
 }
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
index 054019079ebaa..03d9d10311382 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
@@ -6,9 +6,11 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 
-class LoadOptions extends \Magento\Backend\App\Action
+class LoadOptions extends \Magento\Backend\App\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Widget/Model/Config/Converter.php b/app/code/Magento/Widget/Model/Config/Converter.php
index 010c46da56950..40718a5a5db9c 100644
--- a/app/code/Magento/Widget/Model/Config/Converter.php
+++ b/app/code/Magento/Widget/Model/Config/Converter.php
@@ -222,7 +222,7 @@ protected function _convertDepends($source)
     {
         $depends = [];
         foreach ($source->childNodes as $childNode) {
-            if ($childNode->nodeName == '#text') {
+            if ($childNode->nodeName === '#text') {
                 continue;
             }
             if ($childNode->nodeName !== 'parameter') {
@@ -231,12 +231,23 @@ protected function _convertDepends($source)
                 );
             }
             $parameterAttributes = $childNode->attributes;
-            $depends[$parameterAttributes->getNamedItem(
-                'name'
-            )->nodeValue] = [
-                'value' => $parameterAttributes->getNamedItem('value')->nodeValue,
-            ];
+            $dependencyName = $parameterAttributes->getNamedItem('name')->nodeValue;
+            $dependencyValue = $parameterAttributes->getNamedItem('value')->nodeValue;
+
+            if (!isset($depends[$dependencyName])) {
+                $depends[$dependencyName] = [
+                    'value' => $dependencyValue,
+                ];
+
+                continue;
+            } else if (!isset($depends[$dependencyName]['values'])) {
+                $depends[$dependencyName]['values'] = [$depends[$dependencyName]['value']];
+                unset($depends[$dependencyName]['value']);
+            }
+
+            $depends[$dependencyName]['values'][] = $dependencyValue;
         }
+
         return $depends;
     }
 
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
index d7e3bf94f548f..6c0aef9e67186 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Layout/Update.php
@@ -51,7 +51,9 @@ protected function _construct()
      * @param string $handle
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
      * @param \Magento\Framework\App\ScopeInterface $store
+     *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function fetchUpdatesByHandle(
         $handle,
@@ -69,14 +71,16 @@ public function fetchUpdatesByHandle(
                 $this->layoutUpdateCache[$cacheKey][$layout['handle']] .= $layout['xml'];
             }
         }
-        return isset($this->layoutUpdateCache[$cacheKey][$handle]) ? $this->layoutUpdateCache[$cacheKey][$handle] : '';
+        return $this->layoutUpdateCache[$cacheKey][$handle] ?? '';
     }
 
     /**
      * Get select to fetch updates by handle
      *
      * @param bool $loadAllUpdates
+     *
      * @return \Magento\Framework\DB\Select
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php
index f686806db376a..a598d3c7a66d7 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Collection.php
@@ -15,7 +15,7 @@
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
-     * Fields map for corellation names & real selected fields
+     * Fields map for correlation names & real selected fields
      *
      * @var array
      */
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 7cd8276ffef3d..7c3e8e467e038 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -136,7 +136,7 @@ public function widgetDirective($construction)
      */
     public function mediaDirective($construction)
     {
-        $params = $this->getParameters($construction[2]);
+        $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index 085e6ec3b2d77..5ba03d008ded0 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -84,6 +84,8 @@ public function __construct(
     }
 
     /**
+     * Get math random
+     *
      * @return \Magento\Framework\Math\Random
      *
      * @deprecated 100.1.0
@@ -315,7 +317,7 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
                 }
             }
             if (isset($value)) {
-                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeQuote($value));
+                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeHtmlAttr($value, false));
             }
         }
 
@@ -339,6 +341,8 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
     }
 
     /**
+     * Get widget page varname
+     *
      * @param array $params
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index 98f5cd9c04314..4f81ef33f47f7 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -8,7 +8,7 @@
 /**
  * Widgets Insertion Plugin Config for Editor HTML Element
  */
-class Config
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
     /**
      * @var \Magento\Framework\View\Asset\Repository
@@ -69,6 +69,18 @@ public function __construct(
         $this->registry = $registry;
     }
 
+    /**
+     * Return config settings for widgets insertion plugin based on editor element config
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $settings = $this->getPluginSettings($config);
+        return $config->addData($settings);
+    }
+
     /**
      * Return config settings for widgets insertion plugin based on editor element config
      *
@@ -77,21 +89,51 @@ public function __construct(
      */
     public function getPluginSettings($config)
     {
-        $url = $this->_assetRepo->getUrl(
-            'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js'
-        );
-
-        $errorImageUrl = $this->_assetRepo->getUrl('Magento_Widget::error.png');
-
-        $settings = [
-            'widget_plugin_src' => $url,
-            'widget_placeholders' => $this->_widgetFactory->create()->getPlaceholderImageUrls(),
-            'widget_window_url' => $this->getWidgetWindowUrl($config),
-            'widget_types' => $this->getAvailableWidgets($config),
-            'widget_error_image_url' => $errorImageUrl
+        $widgetWysiwyg = [
+            [
+                'name' => 'magentowidget',
+                'src' => $this->getWysiwygJsPluginSrc(),
+                'options' => [
+                    'window_url' => $this->getWidgetWindowUrl($config),
+                    'types' => $this->getAvailableWidgets($config),
+                    'error_image_url' => $this->getErrorImageUrl(),
+                    'placeholders' => $this->getWidgetPlaceholderImageUrls(),
+                ],
+            ]
         ];
 
-        return $settings;
+        $configPlugins = (array) $config->getData('plugins');
+
+        $widgetConfig['plugins'] = array_merge($configPlugins, $widgetWysiwyg);
+        return $widgetConfig;
+    }
+
+    /**
+     * Return list of available placeholders for widget
+     *
+     * @return array
+     */
+    public function getWidgetPlaceholderImageUrls()
+    {
+        return $this->_widgetFactory->create()->getPlaceholderImageUrls();
+    }
+
+    /**
+     * Return url to error image
+     * @return string
+     */
+    public function getErrorImageUrl()
+    {
+        return $this->_assetRepo->getUrl('Magento_Widget::error.png');
+    }
+
+    /**
+     * Return url to wysiwyg plugin
+     * @return string
+     */
+    public function getWysiwygJsPluginSrc()
+    {
+        return $this->_assetRepo->getUrl('mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js');
     }
 
     /**
@@ -150,7 +192,7 @@ public function decodeWidgetsFromQuery($queryParam)
      * @param \Magento\Framework\DataObject $config Editor element config
      * @return array
      */
-    private function getAvailableWidgets($config)
+    public function getAvailableWidgets($config)
     {
         if (!$config->hasData('widget_types')) {
             $result = [];
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index 07a995e3f7734..4ca126e659e09 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -15,13 +15,14 @@
  * @method string getTitle()
  * @method \Magento\Widget\Model\Widget\Instance setTitle(string $value)
  * @method \Magento\Widget\Model\Widget\Instance setStoreIds(string $value)
- * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string $value)
+ * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string|array $value)
  * @method int getSortOrder()
  * @method \Magento\Widget\Model\Widget\Instance setSortOrder(int $value)
  * @method \Magento\Widget\Model\Widget\Instance setThemeId(int $value)
  * @method int getThemeId()
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 100.0.2
  */
 class Instance extends \Magento\Framework\Model\AbstractModel
@@ -34,7 +35,12 @@ class Instance extends \Magento\Framework\Model\AbstractModel
 
     const PRODUCT_LAYOUT_HANDLE = 'catalog_product_view';
 
-    const SINGLE_PRODUCT_LAYOUT_HANLDE = 'catalog_product_view_id_{{ID}}';
+    /**
+     * @deprecated see self::SINGLE_PRODUCT_LAYOUT_HANDLE
+     */
+    const SINGLE_PRODUCT_LAYOUT_HANLDE = self::SINGLE_PRODUCT_LAYOUT_HANDLE;
+    
+    const SINGLE_PRODUCT_LAYOUT_HANDLE = 'catalog_product_view_id_{{ID}}';
 
     const PRODUCT_TYPE_LAYOUT_HANDLE = 'catalog_product_view_type_{{TYPE}}';
 
@@ -91,6 +97,16 @@ class Instance extends \Magento\Framework\Model\AbstractModel
      */
     protected $_relatedCacheTypes;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\Type
+     */
+    protected $_productType;
+
+    /**
+     * @var \Magento\Widget\Model\Config\Reader
+     */
+    protected $_reader;
+
     /**
      * @var \Magento\Framework\Escaper
      */
@@ -188,12 +204,12 @@ protected function _construct()
         $this->_specificEntitiesLayoutHandles = [
             'anchor_categories' => self::SINGLE_CATEGORY_LAYOUT_HANDLE,
             'notanchor_categories' => self::SINGLE_CATEGORY_LAYOUT_HANDLE,
-            'all_products' => self::SINGLE_PRODUCT_LAYOUT_HANLDE,
+            'all_products' => self::SINGLE_PRODUCT_LAYOUT_HANDLE,
         ];
         foreach (array_keys($this->_productType->getTypes()) as $typeId) {
             $layoutHandle = str_replace('{{TYPE}}', $typeId, self::PRODUCT_TYPE_LAYOUT_HANDLE);
             $this->_layoutHandles[$typeId . '_products'] = $layoutHandle;
-            $this->_specificEntitiesLayoutHandles[$typeId . '_products'] = self::SINGLE_PRODUCT_LAYOUT_HANLDE;
+            $this->_specificEntitiesLayoutHandles[$typeId . '_products'] = self::SINGLE_PRODUCT_LAYOUT_HANDLE;
         }
     }
 
@@ -324,6 +340,7 @@ public function setCode($code)
 
     /**
      * Setter
+     *
      * Prepare widget type
      *
      * @param string $type
@@ -337,6 +354,7 @@ public function setType($type)
 
     /**
      * Getter
+     *
      * Prepare widget type
      *
      * @return string
@@ -348,6 +366,7 @@ public function getType()
 
     /**
      * Getter.
+     *
      * If not set return default
      *
      * @return string
@@ -363,6 +382,7 @@ public function getArea()
 
     /**
      * Getter
+     *
      * Explode to array if string setted
      *
      * @return array
@@ -377,6 +397,7 @@ public function getStoreIds()
 
     /**
      * Getter
+     *
      * Unserialize if serialized string setted
      *
      * @return array
diff --git a/app/code/Magento/Widget/Setup/InstallData.php b/app/code/Magento/Widget/Setup/InstallData.php
deleted file mode 100644
index 76c2154215290..0000000000000
--- a/app/code/Magento/Widget/Setup/InstallData.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Widget\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup->createMigrationSetup();
-        $setup->startSetup();
-
-        $installer->appendClassAliasReplace(
-            'widget_instance',
-            'instance_type',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-            ['instance_id']
-        );
-
-        $installer->appendClassAliasReplace(
-            'layout_update',
-            'xml',
-            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-            ['layout_update_id']
-        );
-
-        $installer->doUpdateClassAliases();
-
-        $setup->endSetup();
-    }
-}
diff --git a/app/code/Magento/Widget/Setup/InstallSchema.php b/app/code/Magento/Widget/Setup/InstallSchema.php
deleted file mode 100644
index 4a3a1d8227c78..0000000000000
--- a/app/code/Magento/Widget/Setup/InstallSchema.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Widget\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'widget'
-         */
-        if (!$installer->getConnection()->isTableExists($installer->getTable('widget'))) {
-            $table = $installer->getConnection()->newTable(
-                $installer->getTable('widget')
-            )->addColumn(
-                'widget_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                'Widget Id'
-            )->addColumn(
-                'widget_code',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Widget code for template directive'
-            )->addColumn(
-                'widget_type',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                255,
-                [],
-                'Widget Type'
-            )->addColumn(
-                'parameters',
-                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                '64k',
-                ['nullable' => true],
-                'Parameters'
-            )->addIndex(
-                $installer->getIdxName('widget', 'widget_code'),
-                'widget_code'
-            )->setComment(
-                'Preconfigured Widgets'
-            );
-            $installer->getConnection()->createTable($table);
-        } else {
-            $installer->getConnection()->dropIndex($installer->getTable('widget'), 'IDX_CODE');
-
-            $tables = [
-                $installer->getTable(
-                    'widget'
-                ) => [
-                    'columns' => [
-                        'widget_id' => [
-                            'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                            'identity' => true,
-                            'unsigned' => true,
-                            'nullable' => false,
-                            'primary' => true,
-                            'comment' => 'Widget Id',
-                        ],
-                        'parameters' => [
-                            'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                            'length' => '64K',
-                            'comment' => 'Parameters',
-                        ],
-                    ],
-                    'comment' => 'Preconfigured Widgets',
-                ],
-            ];
-
-            $installer->getConnection()->modifyTables($tables);
-
-            $installer->getConnection()->changeColumn(
-                $installer->getTable('widget'),
-                'code',
-                'widget_code',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 255,
-                    'comment' => 'Widget code for template directive'
-                ]
-            );
-
-            $installer->getConnection()->changeColumn(
-                $installer->getTable('widget'),
-                'type',
-                'widget_type',
-                ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 'length' => 255, 'comment' => 'Widget Type']
-            );
-
-            $installer->getConnection()->addIndex(
-                $installer->getTable('widget'),
-                $installer->getIdxName('widget', ['widget_code']),
-                ['widget_code']
-            );
-        }
-
-        /**
-         * Create table 'widget_instance'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('widget_instance')
-        )->addColumn(
-            'instance_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Instance Id'
-        )->addColumn(
-            'instance_type',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Instance Type'
-        )->addColumn(
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Theme id'
-        )->addColumn(
-            'title',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Widget Title'
-        )->addColumn(
-            'store_ids',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false, 'default' => '0'],
-            'Store ids'
-        )->addColumn(
-            'widget_parameters',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Widget parameters'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Sort order'
-        )->addForeignKey(
-            $installer->getFkName('widget_instance', 'theme_id', 'theme', 'theme_id'),
-            'theme_id',
-            $installer->getTable('theme'),
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Instances of Widget for Package Theme'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'widget_instance_page'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('widget_instance_page')
-        )->addColumn(
-            'page_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Page Id'
-        )->addColumn(
-            'instance_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Instance Id'
-        )->addColumn(
-            'page_group',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            25,
-            [],
-            'Block Group Type'
-        )->addColumn(
-            'layout_handle',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Layout Handle'
-        )->addColumn(
-            'block_reference',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Container'
-        )->addColumn(
-            'page_for',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            25,
-            [],
-            'For instance entities'
-        )->addColumn(
-            'entities',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Catalog entities (comma separated)'
-        )->addColumn(
-            'page_template',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Path to widget template'
-        )->addIndex(
-            $installer->getIdxName('widget_instance_page', 'instance_id'),
-            'instance_id'
-        )->addForeignKey(
-            $installer->getFkName('widget_instance_page', 'instance_id', 'widget_instance', 'instance_id'),
-            'instance_id',
-            $installer->getTable('widget_instance'),
-            'instance_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Instance of Widget on Page'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'widget_instance_page_layout'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('widget_instance_page_layout')
-        )->addColumn(
-            'page_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Page Id'
-        )->addColumn(
-            'layout_update_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Layout Update Id'
-        )->addIndex(
-            $installer->getIdxName('widget_instance_page_layout', 'page_id'),
-            'page_id'
-        )->addIndex(
-            $installer->getIdxName(
-                'widget_instance_page_layout',
-                ['layout_update_id', 'page_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['layout_update_id', 'page_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('widget_instance_page_layout', 'page_id', 'widget_instance_page', 'page_id'),
-            'page_id',
-            $installer->getTable('widget_instance_page'),
-            'page_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName(
-                'widget_instance_page_layout',
-                'layout_update_id',
-                'layout_update',
-                'layout_update_id'
-            ),
-            'layout_update_id',
-            $installer->getTable('layout_update'),
-            'layout_update_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Layout updates'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'layout_update'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('layout_update')
-        )->addColumn(
-            'layout_update_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Layout Update Id'
-        )->addColumn(
-            'handle',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Handle'
-        )->addColumn(
-            'xml',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Xml'
-        )->addColumn(
-            'sort_order',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Sort Order'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => true, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Last Update Timestamp'
-        )->addIndex(
-            $installer->getIdxName('layout_update', ['handle']),
-            ['handle']
-        )->setComment(
-            'Layout Updates'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'layout_link'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('layout_link')
-        )->addColumn(
-            'layout_link_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Link Id'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Store Id'
-        )->addColumn(
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Theme id'
-        )->addColumn(
-            'layout_update_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Layout Update Id'
-        )->addColumn(
-            'is_temporary',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-            null,
-            ['nullable' => false, 'default' => '0'],
-            'Defines whether Layout Update is Temporary'
-        )->addIndex(
-            $installer->getIdxName('layout_link', ['layout_update_id']),
-            ['layout_update_id']
-        )->addForeignKey(
-            $installer->getFkName('layout_link', 'layout_update_id', 'layout_update', 'layout_update_id'),
-            'layout_update_id',
-            $installer->getTable('layout_update'),
-            'layout_update_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addIndex(
-            $installer->getIdxName(
-                'layout_link',
-                ['store_id', 'theme_id', 'layout_update_id', 'is_temporary'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['store_id', 'theme_id', 'layout_update_id', 'is_temporary']
-        )->addForeignKey(
-            $installer->getFkName('layout_link', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('layout_link', 'theme_id', 'theme', 'theme_id'),
-            'theme_id',
-            $installer->getTable('theme'),
-            'theme_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Layout Link'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php
new file mode 100644
index 0000000000000..b72e024c93480
--- /dev/null
+++ b/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Setup\Patch\Data;
+
+use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Widget\Setup\LayoutUpdateConverter;
+
+/**
+ * Class ConvertSerializedData
+ * @package Magento\Widget\Setup\Patch
+ */
+class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * @var AggregatedFieldDataConverter
+     */
+    private $aggregatedFieldDataConverter;
+
+    /**
+     * ConvertSerializedData constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        QueryModifierFactory $queryModifierFactory,
+        AggregatedFieldDataConverter $aggregatedFieldDataConverter
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->queryModifierFactory = $queryModifierFactory;
+        $this->aggregatedFieldDataConverter = $aggregatedFieldDataConverter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->convertSerializedData();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [UpgradeModelInstanceClassAliases::class];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Convert native serialized data to json.
+     */
+    private function convertSerializedData()
+    {
+        $layoutUpdateQueryModifier = $this->queryModifierFactory->create(
+            'like',
+            [
+                'values' => [
+                    'xml' => '%conditions_encoded%'
+                ]
+            ]
+        );
+        $this->aggregatedFieldDataConverter->convert(
+            [
+                new FieldToConvert(
+                    SerializedToJson::class,
+                    $this->moduleDataSetup->getTable('widget_instance'),
+                    'instance_id',
+                    'widget_parameters'
+                ),
+                new FieldToConvert(
+                    LayoutUpdateConverter::class,
+                    $this->moduleDataSetup->getTable('layout_update'),
+                    'layout_update_id',
+                    'xml',
+                    $layoutUpdateQueryModifier
+                ),
+            ],
+            $this->moduleDataSetup->getConnection()
+        );
+    }
+}
diff --git a/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php b/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php
new file mode 100644
index 0000000000000..d9890c98a8d2d
--- /dev/null
+++ b/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpgradeModelInstanceClassAliases
+ * @package Magento\Widget\Setup\Patch
+ */
+class UpgradeModelInstanceClassAliases implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * UpgradeModelInstanceClassAliases constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $installer = $this->moduleDataSetup->createMigrationSetup();
+        $this->moduleDataSetup->startSetup();
+
+        $installer->appendClassAliasReplace(
+            'widget_instance',
+            'instance_type',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+            ['instance_id']
+        );
+        $installer->appendClassAliasReplace(
+            'layout_update',
+            'xml',
+            \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+            \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
+            ['layout_update_id']
+        );
+        $installer->doUpdateClassAliases();
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Widget/Setup/UpgradeData.php b/app/code/Magento/Widget/Setup/UpgradeData.php
deleted file mode 100644
index de3928d1fb5b8..0000000000000
--- a/app/code/Magento/Widget/Setup/UpgradeData.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Widget\Setup;
-
-use Magento\Framework\DB\AggregatedFieldDataConverter;
-use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-
-/**
- * Upgrade data for widget module.
- */
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var \Magento\Framework\DB\Select\QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * @var AggregatedFieldDataConverter
-     */
-    private $aggregatedFieldConverter;
-
-    /**
-     * UpgradeData constructor
-     *
-     * @param AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @param \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
-     */
-    public function __construct(
-        AggregatedFieldDataConverter $aggregatedFieldConverter,
-        \Magento\Framework\DB\Select\QueryModifierFactory $queryModifierFactory
-    ) {
-        $this->aggregatedFieldConverter = $aggregatedFieldConverter;
-        $this->queryModifierFactory = $queryModifierFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->upgradeVersionTwoZeroOne($setup);
-        }
-    }
-
-    /**
-     * Upgrade data to version 2.0.1
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeVersionTwoZeroOne(ModuleDataSetupInterface $setup)
-    {
-        $layoutUpdateQueryModifier = $this->queryModifierFactory->create(
-            'like',
-            [
-                'values' => [
-                    'xml' => '%conditions_encoded%'
-                ]
-            ]
-        );
-        $this->aggregatedFieldConverter->convert(
-            [
-                new FieldToConvert(
-                    SerializedToJson::class,
-                    $setup->getTable('widget_instance'),
-                    'instance_id',
-                    'widget_parameters'
-                ),
-                new FieldToConvert(
-                    LayoutUpdateConverter::class,
-                    $setup->getTable('layout_update'),
-                    'layout_update_id',
-                    'xml',
-                    $layoutUpdateQueryModifier
-                ),
-            ],
-            $setup->getConnection()
-        );
-    }
-}
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
new file mode 100644
index 0000000000000..7955f4ec29e55
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateProductsListWidgetActionGroup">
+      <arguments>
+          <argument name="widget"/>
+      </arguments>
+      <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnAdminDashboard"/>
+      <click selector="{{AdminMenuSection.content}}" stepKey="clickContent"/>
+      <waitForLoadingMaskToDisappear stepKey="waitForWidgets" />
+      <click selector="{{AdminMenuSection.widgets}}" stepKey="clickWidgets"/>
+      <waitForPageLoad stepKey="waitForWidgetsLoad"/>
+      <click selector="{{AdminGridMainControls.add}}" stepKey="addNewWidget"/>
+      <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
+      <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
+      <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
+      <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
+      <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
+      <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
+      <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
+      <waitForAjaxLoad stepKey="waitForLoad"/>
+      <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
+      <waitForAjaxLoad stepKey="waitForPageLoad"/>
+      <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+      <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
+      <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
+      <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{widget.condition}}" stepKey="selectCondition"/>
+      <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
+      <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
+      <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
+      <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+      <click selector="{{AdminNewWidgetSection.selectAll}}" stepKey="clickSelectAll"/>
+      <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
+      <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
+      <waitForPageLoad stepKey="waitForSaveLoad"/>
+      <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+    <actionGroup name="AdminDeleteWidgetActionGroup">
+      <arguments>
+          <argument name="widget"/>
+      </arguments>
+      <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
+      <waitForPageLoad stepKey="waitWidgetsLoad"/>
+      <fillField selector="{{AdminWidgetsSection.widgetTitleSearch}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
+      <click selector="{{AdminWidgetsSection.searchButton}}" stepKey="clickContinue"/>
+      <click selector="{{AdminWidgetsSection.searchResult}}" stepKey="clickSearchResult"/>
+      <waitForPageLoad stepKey="waitForResultLoad"/>
+      <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDelete"/>
+      <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+      <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+      <waitForPageLoad stepKey="waitForDeleteLoad"/>
+      <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
new file mode 100644
index 0000000000000..26864c60b6494
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductsListWidget" type="widget">
+        <data key="type">Catalog Products List</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">TestWidget</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="condition">SKU</data>
+        <data key="display_on">All Pages</data>
+        <data key="container">Main Content Area</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Widget/Test/Mftf/LICENSE.txt b/app/code/Magento/Widget/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/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/Widget/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Widget/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/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/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
new file mode 100644
index 0000000000000..8eb0a5f65318e
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminNewWidgetPage" url="admin/admin/widget_instance/new/" area="admin" module="Magento_Widget">
+        <section name="AdminNewWidgetSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
new file mode 100644
index 0000000000000..421899ad21646
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminWidgetsPage" url="admin/widget_instance/" area="admin" module="Magento_Widget">
+        <section name="AdminWidgetsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Widget/Test/Mftf/README.md b/app/code/Magento/Widget/Test/Mftf/README.md
new file mode 100644
index 0000000000000..0504cf39ca7f6
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Widget Functional Tests
+
+The Functional Test Module for **Magento Widget** module.
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
new file mode 100644
index 0000000000000..38b4df335ea83
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminNewWidgetSection">
+        <element name="widgetType" type="select" selector="#code"/>
+        <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
+        <element name="continue" type="button" selector="#continue_button"/>
+        <element name="widgetTitle" type="input" selector="#title"/>
+        <element name="widgetStoreIds" type="select" selector="#store_ids"/>
+        <element name="addLayoutUpdate" type="button" selector=".action-default.scalable.action-add"/>
+        <element name="selectDisplayOn" type="select" selector="#widget_instance[0][page_group]"/>
+        <element name="selectContainer" type="select" selector="#all_pages_0>table>tbody>tr>td:nth-child(1)>div>div>select"/>
+        <element name="widgetOptions" type="select" selector="#widget_instace_tabs_properties_section"/>
+        <element name="addNewCondition" type="select" selector=".rule-param.rule-param-new-child"/>
+        <element name="selectCondition" type="input" selector="#conditions__1__new_child"/>
+        <element name="ruleParameter" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(4)>a"/>
+        <element name="setRuleParameter" type="input" selector="#conditions__1--1__value"/>
+        <element name="applyParameter" type="button" selector=".rule-param-apply"/>
+        <element name="openChooser" type="button" selector=".rule-chooser-trigger"/>
+        <element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
new file mode 100644
index 0000000000000..5a0515d35ad58
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminWidgetsSection">
+        <element name="widgetTitleSearch" type="input" selector="#widgetInstanceGrid_filter_title"/>
+        <element name="searchButton" type="button" selector=".action-default.scalable.action-secondary"/>
+        <element name="searchResult" type="text" selector="#widgetInstanceGrid_table>tbody>tr:nth-child(1)"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
new file mode 100644
index 0000000000000..23908626389f9
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontWidgetsSection">
+        <element name="widgetProductsGrid" type="block" selector=".block.widget.block-products-list.grid"/>
+        <element name="widgetProductName" type="text" selector=".product-item-name"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
new file mode 100644
index 0000000000000..2c4e2e70fec71
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+    <!-- This test exists to serve as a base for extension for other tests -->
+    <test name="NewProductsListWidgetTest">
+        <annotations>
+            <group value="WYSIWYGDisabled"/>
+            <features value="Widget"/>
+            <stories value="New products list widget"/>
+            <title value="Admin should be able to set products as new so that they show up in the Catalog New Products List Widget"/>
+            <description value="Admin should be able to set products as new so that they show up in the Catalog New Products List Widget"/>
+            <severity value="MAJOR"/>
+            <group value="Widget"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+        </after>
+
+        <!-- Create a CMS page containing the New Products widget -->
+
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCmsList"/>
+        <waitForPageLoad stepKey="waitForCmsList"/>
+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPageButton"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_newDefaultCmsPage.title}}" stepKey="fillPageTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="expandContentSection"/>
+        <waitForPageLoad stepKey="waitForContentSection"/>
+        <click selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton"/>
+        <waitForPageLoad stepKey="waitForSlideOut"/>
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog New Products List" stepKey="selectWidgetType"/>
+        <waitForPageLoad stepKey="waitForWidgetOptions"/>
+        <selectOption selector="{{WidgetSection.DisplayType}}" userInput="New products" stepKey="selectDisplayType"/>
+        <fillField selector="{{WidgetSection.NoOfProductToDisplay}}" userInput="100" stepKey="fillNoOfProductToDisplay"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="expandSeoSection"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_newDefaultCmsPage.identifier}}" stepKey="fillPageUrlKey"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveCmsPage"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
new file mode 100644
index 0000000000000..4407991ff5a93
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ProductsListWidgetTest">
+        <annotations>
+            <features value="Widget"/>
+            <stories value="Products list widget"/>
+            <title value="Admin should be able to set Products List Widget"/>
+            <description value="Admin should be able to set Products List Widget"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-97041"/>
+            <group value="Widget"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+        <!-- Create a CMS page containing the Products List widget -->
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCmsList"/>
+        <waitForPageLoad stepKey="waitForCmsList"/>
+        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPageButton"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_newDefaultCmsPage.title}}" stepKey="fillPageTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="expandContentSection"/>
+        <waitForPageLoad stepKey="waitForContentSection"/>
+        <click selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton"/>
+        <waitForPageLoad stepKey="waitForSlideOut"/>
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectWidgetType"/>
+        <waitForPageLoad stepKey="waitForWidgetOptions"/>
+        <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="Magento\CatalogWidget\Model\Rule\Condition\Product|category_ids" stepKey="selectCondition"/>
+        <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
+        <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
+        <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="clickCategoryToEditInitial"/>
+        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtn"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
+        <waitForPageLoad stepKey="waitForCmsList2"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <!-- Verify CMS page on storefront -->
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select(_newDefaultCmsPage.title)}}" stepKey="waitForCMSPageListItem" />
+        <click selector="{{CmsPagesPageActionsSection.select(_newDefaultCmsPage.title)}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit(_newDefaultCmsPage.title)}}" stepKey="waitForEditLink" />
+        <click selector="{{CmsPagesPageActionsSection.preview(_newDefaultCmsPage.title)}}" stepKey="clickEdit" />
+        <waitForPageLoad stepKey="waitForCMSPage"/>
+        <seeInTitle userInput="{{_newDefaultCmsPage.title}}" stepKey="seePageTitle"/>
+        <see userInput="{{_newDefaultCmsPage.title}}" stepKey="seeProduct"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php b/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
index 65e45b73d88eb..301869a50a713 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
     public function testGetGlobal()
     {
-        $expected = new \StdClass();
+        $expected = new \stdClass();
         $this->moduleReader
             ->expects($this->once())
             ->method('getConfigurationFiles')
@@ -52,7 +52,7 @@ public function testGetGlobal()
 
     public function testGetDesign()
     {
-        $expected = new \StdClass();
+        $expected = new \stdClass();
         $this->componentDirSearch->expects($this->once())
             ->method('collectFiles')
             ->with(ComponentRegistrar::THEME, 'etc/file')
@@ -63,7 +63,7 @@ public function testGetDesign()
 
     public function testGetDefault()
     {
-        $expected = new \StdClass();
+        $expected = new \stdClass();
         $this->factory->expects($this->once())->method('create')->with([])->willReturn($expected);
         $this->assertSame($expected, $this->object->get('file', 'unknown'));
     }
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
index a7fccf0bc14ca..db2f468da663c 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
@@ -270,4 +270,22 @@ public function testMediaDirective()
         $result = $this->filter->mediaDirective($construction);
         $this->assertEquals($baseUrl . $image, $result);
     }
+
+    public function testMediaDirectiveWithEncodedQuotes()
+    {
+        $image = 'wysiwyg/VB.png';
+        $construction = ['{{media url=&quot;' . $image . '&quot;}}', 'media', ' url=&quot;' . $image . '&quot;'];
+        $baseUrl = 'http://localhost/pub/media/';
+
+        $this->storeMock->expects($this->once())
+            ->method('getBaseUrl')
+            ->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
+            ->willReturn($baseUrl);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
+        $result = $this->filter->mediaDirective($construction);
+        $this->assertEquals($baseUrl . $image, $result);
+    }
 }
diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
index 0e1f722cd366a..5c546d7e2435c 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -32,6 +32,9 @@ class WidgetTest extends \PHPUnit\Framework\TestCase
      */
     private $conditionsHelper;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->dataStorageMock = $this->getMockBuilder(\Magento\Widget\Model\Config\Data::class)
@@ -55,6 +58,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Unit test for getWidget
+     */
     public function testGetWidgets()
     {
         $expected = ['val1', 'val2'];
@@ -65,6 +71,9 @@ public function testGetWidgets()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Unit test for getWidgetsWithFilter
+     */
     public function testGetWidgetsWithFilter()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
@@ -78,6 +87,9 @@ public function testGetWidgetsWithFilter()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Unit test for getWidgetsWithUnknownFilter
+     */
     public function testGetWidgetsWithUnknownFilter()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
@@ -90,6 +102,9 @@ public function testGetWidgetsWithUnknownFilter()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Unit test for getWidgetByClassType
+     */
     public function testGetWidgetByClassType()
     {
         $widgetOne = ['@' => ['type' => 'type1']];
@@ -101,6 +116,9 @@ public function testGetWidgetByClassType()
         $this->assertNull($this->widget->getWidgetByClassType('type2'));
     }
 
+    /**
+     * Unit test for getConfigAsObject
+     */
     public function testGetConfigAsObject()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';
@@ -135,6 +153,9 @@ public function testGetConfigAsObject()
         $this->assertSame($supportedContainersExpected, $resultObject->getSupportedContainers());
     }
 
+    /**
+     * Unit test for getConfigAsObjectWidgetNoFound
+     */
     public function testGetConfigAsObjectWidgetNoFound()
     {
         $this->dataStorageMock->expects($this->once())
@@ -146,6 +167,9 @@ public function testGetConfigAsObjectWidgetNoFound()
         $this->assertSame([], $resultObject->getData());
     }
 
+    /**
+     * Unit test for getWidgetDeclaration
+     */
     public function testGetWidgetDeclaration()
     {
         $mathRandomMock = $this->createPartialMock(\Magento\Framework\Math\Random::class, ['getRandomString']);
@@ -168,20 +192,23 @@ public function testGetWidgetDeclaration()
             'show_pager' => '1',
             'products_per_page' => '5',
             'products_count' => '10',
-            'template' => 'product/widget/content/grid.phtml',
+            'template' => 'Magento_CatalogWidget::product/widget/content/grid.phtml',
             'conditions' => $conditions
         ];
 
         $this->conditionsHelper->expects($this->once())->method('encode')->with($conditions)
             ->willReturn('encoded-conditions-string');
         $this->escaperMock->expects($this->atLeastOnce())
-            ->method('escapeQuote')
+            ->method('escapeHtmlAttr')
             ->willReturnMap([
                 ['my "widget"', false, 'my &quot;widget&quot;'],
                 ['1', false, '1'],
                 ['5', false, '5'],
                 ['10', false, '10'],
-                ['product/widget/content/grid.phtml', false, 'product/widget/content/grid.phtml'],
+                ['Magento_CatalogWidget::product/widget/content/grid.phtml',
+                 false,
+                 'Magento_CatalogWidget::product/widget/content/grid.phtml'
+                ],
                 ['encoded-conditions-string', false, 'encoded-conditions-string'],
             ]);
 
@@ -200,6 +227,9 @@ public function testGetWidgetDeclaration()
         $this->assertContains('type_name=""}}', $result);
     }
 
+    /**
+     * Unit test for getWidgetDeclarationWithZeroValueParam
+     */
     public function testGetWidgetDeclarationWithZeroValueParam()
     {
         $mathRandomMock = $this->createPartialMock(\Magento\Framework\Math\Random::class, ['getRandomString']);
@@ -226,7 +256,7 @@ public function testGetWidgetDeclarationWithZeroValueParam()
             'show_pager' => '1',
             'products_per_page' => '5',
             'products_count' => '0',
-            'template' => 'product/widget/content/grid.phtml',
+            'template' => 'Magento_CatalogWidget::product/widget/content/grid.phtml',
             'conditions' => $conditions
         ];
 
diff --git a/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml b/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml
index 02e65707d322f..6deddeca59ef9 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml
+++ b/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml
@@ -41,7 +41,7 @@
             </parameter>
             <parameter name="id_path" xsi:type="block" visible="true" required="true" sort_order="10">
                 <label translate="true">Product</label>
-                <block class="Magento\Backend\Block\Catalog\Product\Widget\Chooser">
+                <block class="Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser">
                     <data>
                         <item name="button" xsi:type="array">
                             <item name="open" xsi:type="string" translate="true">Select Product...</item>
diff --git a/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php b/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php
index 098fb14c9cec9..697e56cbcbb38 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php
@@ -48,7 +48,7 @@
                 'type' => 'label',
                 '@' => ['type' => 'complex'],
                 'helper_block' => [
-                    'type' => \Magento\Backend\Block\Catalog\Product\Widget\Chooser::class,
+                    'type' => \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser::class,
                     'data' => ['button' => ['open' => 'Select Product...']],
                 ],
                 'visible' => '1',
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 0b4007d4a250a..f0b0121ac60cd 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -5,20 +5,19 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-variable": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-cms": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-variable": "*"
     },
     "suggest": {
-        "magento/module-widget-sample-data": "Sample Data version:100.3.*"
+        "magento/module-widget-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Widget/etc/db_schema.xml b/app/code/Magento/Widget/etc/db_schema.xml
new file mode 100644
index 0000000000000..a82e6aae20296
--- /dev/null
+++ b/app/code/Magento/Widget/etc/db_schema.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="widget" resource="default" engine="innodb" comment="Preconfigured Widgets">
+        <column xsi:type="int" name="widget_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Widget Id"/>
+        <column xsi:type="varchar" name="widget_code" nullable="true" length="255"
+                comment="Widget code for template directive"/>
+        <column xsi:type="varchar" name="widget_type" nullable="true" length="255" comment="Widget Type"/>
+        <column xsi:type="text" name="parameters" nullable="true" comment="Parameters"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="widget_id"/>
+        </constraint>
+        <index referenceId="WIDGET_WIDGET_CODE" indexType="btree">
+            <column name="widget_code"/>
+        </index>
+    </table>
+    <table name="widget_instance" resource="default" engine="innodb" comment="Instances of Widget for Package Theme">
+        <column xsi:type="int" name="instance_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Instance Id"/>
+        <column xsi:type="varchar" name="instance_type" nullable="true" length="255" comment="Instance Type"/>
+        <column xsi:type="int" name="theme_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Theme id"/>
+        <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Widget Title"/>
+        <column xsi:type="varchar" name="store_ids" nullable="false" length="255" default="0" comment="Store ids"/>
+        <column xsi:type="text" name="widget_parameters" nullable="true" comment="Widget parameters"/>
+        <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sort order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="instance_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_THEME_ID_THEME_THEME_ID" table="widget_instance"
+                    column="theme_id" referenceTable="theme" referenceColumn="theme_id" onDelete="CASCADE"/>
+    </table>
+    <table name="widget_instance_page" resource="default" engine="innodb" comment="Instance of Widget on Page">
+        <column xsi:type="int" name="page_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Page Id"/>
+        <column xsi:type="int" name="instance_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Instance Id"/>
+        <column xsi:type="varchar" name="page_group" nullable="true" length="25" comment="Block Group Type"/>
+        <column xsi:type="varchar" name="layout_handle" nullable="true" length="255" comment="Layout Handle"/>
+        <column xsi:type="varchar" name="block_reference" nullable="true" length="255" comment="Container"/>
+        <column xsi:type="varchar" name="page_for" nullable="true" length="25" comment="For instance entities"/>
+        <column xsi:type="text" name="entities" nullable="true" comment="Catalog entities (comma separated)"/>
+        <column xsi:type="varchar" name="page_template" nullable="true" length="255" comment="Path to widget template"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_PAGE_INSTANCE_ID_WIDGET_INSTANCE_INSTANCE_ID"
+                    table="widget_instance_page" column="instance_id" referenceTable="widget_instance"
+                    referenceColumn="instance_id" onDelete="CASCADE"/>
+        <index referenceId="WIDGET_INSTANCE_PAGE_INSTANCE_ID" indexType="btree">
+            <column name="instance_id"/>
+        </index>
+    </table>
+    <table name="widget_instance_page_layout" resource="default" engine="innodb" comment="Layout updates">
+        <column xsi:type="int" name="page_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+                comment="Page Id"/>
+        <column xsi:type="int" name="layout_update_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Layout Update Id"/>
+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID_WIDGET_INSTANCE_PAGE_PAGE_ID"
+                    table="widget_instance_page_layout" column="page_id" referenceTable="widget_instance_page"
+                    referenceColumn="page_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="WIDGET_INSTANCE_PAGE_LYT_LYT_UPDATE_ID_LYT_UPDATE_LYT_UPDATE_ID"
+                    table="widget_instance_page_layout" column="layout_update_id" referenceTable="layout_update"
+                    referenceColumn="layout_update_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="WIDGET_INSTANCE_PAGE_LAYOUT_LAYOUT_UPDATE_ID_PAGE_ID">
+            <column name="layout_update_id"/>
+            <column name="page_id"/>
+        </constraint>
+        <index referenceId="WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID" indexType="btree">
+            <column name="page_id"/>
+        </index>
+    </table>
+    <table name="layout_update" resource="default" engine="innodb" comment="Layout Updates">
+        <column xsi:type="int" name="layout_update_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Layout Update Id"/>
+        <column xsi:type="varchar" name="handle" nullable="true" length="255" comment="Handle"/>
+        <column xsi:type="text" name="xml" nullable="true" comment="Xml"/>
+        <column xsi:type="smallint" name="sort_order" padding="6" unsigned="false" nullable="false" identity="false"
+                default="0" comment="Sort Order"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="true" default="0"
+                comment="Last Update Timestamp"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="layout_update_id"/>
+        </constraint>
+        <index referenceId="LAYOUT_UPDATE_HANDLE" indexType="btree">
+            <column name="handle"/>
+        </index>
+    </table>
+    <table name="layout_link" resource="default" engine="innodb" comment="Layout Link">
+        <column xsi:type="int" name="layout_link_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Link Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Store Id"/>
+        <column xsi:type="int" name="theme_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Theme id"/>
+        <column xsi:type="int" name="layout_update_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Layout Update Id"/>
+        <column xsi:type="boolean" name="is_temporary" nullable="false" default="false"
+                comment="Defines whether Layout Update is Temporary"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="layout_link_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="LAYOUT_LINK_LAYOUT_UPDATE_ID_LAYOUT_UPDATE_LAYOUT_UPDATE_ID"
+                    table="layout_link" column="layout_update_id" referenceTable="layout_update"
+                    referenceColumn="layout_update_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="LAYOUT_LINK_STORE_ID_STORE_STORE_ID" table="layout_link" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="LAYOUT_LINK_THEME_ID_THEME_THEME_ID" table="layout_link" column="theme_id"
+                    referenceTable="theme" referenceColumn="theme_id" onDelete="CASCADE"/>
+        <index referenceId="LAYOUT_LINK_LAYOUT_UPDATE_ID" indexType="btree">
+            <column name="layout_update_id"/>
+        </index>
+        <index referenceId="LAYOUT_LINK_STORE_ID_THEME_ID_LAYOUT_UPDATE_ID_IS_TEMPORARY" indexType="btree">
+            <column name="store_id"/>
+            <column name="theme_id"/>
+            <column name="layout_update_id"/>
+            <column name="is_temporary"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/Widget/etc/db_schema_whitelist.json b/app/code/Magento/Widget/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..a42646a355045
--- /dev/null
+++ b/app/code/Magento/Widget/etc/db_schema_whitelist.json
@@ -0,0 +1,98 @@
+{
+    "widget": {
+        "column": {
+            "widget_id": true,
+            "widget_code": true,
+            "widget_type": true,
+            "parameters": true
+        },
+        "index": {
+            "WIDGET_WIDGET_CODE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "widget_instance": {
+        "column": {
+            "instance_id": true,
+            "instance_type": true,
+            "theme_id": true,
+            "title": true,
+            "store_ids": true,
+            "widget_parameters": true,
+            "sort_order": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "WIDGET_INSTANCE_THEME_ID_THEME_THEME_ID": true
+        }
+    },
+    "widget_instance_page": {
+        "column": {
+            "page_id": true,
+            "instance_id": true,
+            "page_group": true,
+            "layout_handle": true,
+            "block_reference": true,
+            "page_for": true,
+            "entities": true,
+            "page_template": true
+        },
+        "index": {
+            "WIDGET_INSTANCE_PAGE_INSTANCE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "WIDGET_INSTANCE_PAGE_INSTANCE_ID_WIDGET_INSTANCE_INSTANCE_ID": true
+        }
+    },
+    "widget_instance_page_layout": {
+        "column": {
+            "page_id": true,
+            "layout_update_id": true
+        },
+        "index": {
+            "WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID": true
+        },
+        "constraint": {
+            "WIDGET_INSTANCE_PAGE_LAYOUT_PAGE_ID_WIDGET_INSTANCE_PAGE_PAGE_ID": true,
+            "WIDGET_INSTANCE_PAGE_LYT_LYT_UPDATE_ID_LYT_UPDATE_LYT_UPDATE_ID": true,
+            "WIDGET_INSTANCE_PAGE_LAYOUT_LAYOUT_UPDATE_ID_PAGE_ID": true
+        }
+    },
+    "layout_update": {
+        "column": {
+            "layout_update_id": true,
+            "handle": true,
+            "xml": true,
+            "sort_order": true,
+            "updated_at": true
+        },
+        "index": {
+            "LAYOUT_UPDATE_HANDLE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "layout_link": {
+        "column": {
+            "layout_link_id": true,
+            "store_id": true,
+            "theme_id": true,
+            "layout_update_id": true,
+            "is_temporary": true
+        },
+        "index": {
+            "LAYOUT_LINK_LAYOUT_UPDATE_ID": true,
+            "LAYOUT_LINK_STORE_ID_THEME_ID_LAYOUT_UPDATE_ID_IS_TEMPORARY": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "LAYOUT_LINK_LAYOUT_UPDATE_ID_LAYOUT_UPDATE_LAYOUT_UPDATE_ID": true,
+            "LAYOUT_LINK_STORE_ID_STORE_STORE_ID": true,
+            "LAYOUT_LINK_THEME_ID_THEME_THEME_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Widget/etc/module.xml b/app/code/Magento/Widget/etc/module.xml
index 69467a38d47f5..4a163a641a290 100644
--- a/app/code/Magento/Widget/etc/module.xml
+++ b/app/code/Magento/Widget/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Widget" setup_version="2.0.1">
+    <module name="Magento_Widget" >
         <sequence>
             <module name="Magento_Cms"/>
         </sequence>
diff --git a/app/code/Magento/Widget/etc/widget.xsd b/app/code/Magento/Widget/etc/widget.xsd
index caaeec8ac4b84..70c9ec8e3514f 100644
--- a/app/code/Magento/Widget/etc/widget.xsd
+++ b/app/code/Magento/Widget/etc/widget.xsd
@@ -212,8 +212,8 @@
         <xs:annotation>
             <xs:documentation>List of parameters this parameter depends on.</xs:documentation>
         </xs:annotation>
-        <xs:all>
+        <xs:sequence maxOccurs="unbounded">
             <xs:element name="parameter" type="dependsParameterType" />
-        </xs:all>
+        </xs:sequence>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Widget/etc/widget_file.xsd b/app/code/Magento/Widget/etc/widget_file.xsd
index 6ebf7a201212e..afdd506f3ba24 100644
--- a/app/code/Magento/Widget/etc/widget_file.xsd
+++ b/app/code/Magento/Widget/etc/widget_file.xsd
@@ -212,8 +212,8 @@
         <xs:annotation>
             <xs:documentation>List of parameters this parameter depends on.</xs:documentation>
         </xs:annotation>
-        <xs:all>
+        <xs:sequence maxOccurs="unbounded">
             <xs:element name="parameter" type="dependsParameterType" />
-        </xs:all>
+        </xs:sequence>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index a0a0fc040a262..3441cf6b5d52a 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -304,11 +304,6 @@ var WidgetInstance = {
     },
     displayPageGroup : function(container, additional) {
         container = $(container);
-        if (!container) {
-//            if (activePageGroupId = this.activePageGroups.get(container.up('div.page_group_container').id)) {
-//                this.hideBlockContainer(activePageGroupId);
-//            }
-        }
         if (!additional) {
             additional = {};
         }
diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
index 0a4f09227f888..bb8138fb87a3e 100644
--- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
@@ -6,6 +6,11 @@
 
 namespace Magento\Wishlist\Block;
 
+use Magento\Catalog\Helper\Image;
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Wishlist Product Items abstract Block
  */
@@ -30,21 +35,37 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
      */
     protected $httpContext;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $viewConfig;
+
+    /**
+     * @var UrlBuilder
+     */
+    private $imageUrlBuilder;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param array $data
+     * @param ConfigInterface|null $config
+     * @param UrlBuilder|null $urlBuilder
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
         \Magento\Framework\App\Http\Context $httpContext,
-        array $data = []
+        array $data = [],
+        ConfigInterface $config = null,
+        UrlBuilder $urlBuilder = null
     ) {
         $this->httpContext = $httpContext;
         parent::__construct(
             $context,
             $data
         );
+        $this->viewConfig = $config ?? ObjectManager::getInstance()->get(ConfigInterface::class);
+        $this->imageUrlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
     }
 
     /**
@@ -210,9 +231,21 @@ public function hasDescription($item)
      * Retrieve formated Date
      *
      * @param string $date
+     * @deprecated
      * @return string
      */
     public function getFormatedDate($date)
+    {
+        return $this->getFormattedDate($date);
+    }
+
+    /**
+     * Retrieve formatted Date
+     *
+     * @param string $date
+     * @return string
+     */
+    public function getFormattedDate($date)
     {
         return $this->formatDate($date, \IntlDateFormatter::MEDIUM);
     }
@@ -288,7 +321,15 @@ public function getProductUrl($item, $additional = [])
      */
     public function getImageUrl($product)
     {
-        return $this->_imageHelper->init($product, 'wishlist_small_image')->getUrl();
+        $viewImageConfig = $this->viewConfig->getViewConfig()->getMediaAttributes(
+            'Magento_Catalog',
+            Image::MEDIA_TYPE_CONFIG_NODE,
+            'wishlist_small_image'
+        );
+        return $this->imageUrlBuilder->getUrl(
+            $product->getData($viewImageConfig['type']),
+            'wishlist_small_image'
+        );
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
index b043a8d4b684c..fe0683a52fe97 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
+
 /**
  * Wishlist block customer item cart column
  *
@@ -35,4 +37,28 @@ public function getProductItem()
     {
         return $this->getItem()->getProduct();
     }
+
+    /**
+     * Get min and max qty for wishlist form.
+     *
+     * @return array
+     */
+    public function getMinMaxQty()
+    {
+        $stockItem = $this->stockRegistry->getStockItem(
+            $this->getItem()->getProduct()->getId(),
+            $this->getItem()->getProduct()->getStore()->getWebsiteId()
+        );
+
+        $params = [];
+
+        $params['minAllowed'] = (float)$stockItem->getMinSaleQty();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
+        } else {
+            $params['maxAllowed'] = (float)StockDataFilter::MAX_QTY_VALUE;
+        }
+
+        return $params;
+    }
 }
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
index 02a897d44b3c6..5595d189b15eb 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
@@ -3,18 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Wishlist block customer item cart column
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 /**
+ * Wishlist block customer item cart column
+ *
  * @api
  * @since 100.0.2
  */
 class Image extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
+    /** @var ItemResolverInterface */
+    private $itemResolver;
+
+    /**
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\App\Http\Context $httpContext
+     * @param array $data
+     * @param ConfigInterface|null $config
+     * @param UrlBuilder|null $urlBuilder
+     * @param ItemResolverInterface|null $itemResolver
+     */
+    public function __construct(
+        \Magento\Catalog\Block\Product\Context $context,
+        \Magento\Framework\App\Http\Context $httpContext,
+        array $data = [],
+        ConfigInterface $config = null,
+        UrlBuilder $urlBuilder = null,
+        ItemResolverInterface $itemResolver = null
+    ) {
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
+        parent::__construct(
+            $context,
+            $httpContext,
+            $data,
+            $config,
+            $urlBuilder
+        );
+    }
+
+    /**
+     * Identify the product from which thumbnail should be taken.
+     *
+     * @return \Magento\Catalog\Model\Product
+     */
+    public function getProductForThumbnail(\Magento\Wishlist\Model\Item $item) : \Magento\Catalog\Model\Product
+    {
+        return $this->itemResolver->getFinalProduct($item);
+    }
 }
diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
index 8a5db15dfb5db..907dfd90e752e 100644
--- a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
+++ b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
@@ -21,10 +21,10 @@ class EmailLink extends Link
     /**
      * @var string
      */
-    protected $_template = 'rss/email.phtml';
+    protected $_template = 'Magento_Wishlist::rss/email.phtml';
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index de068d68c2207..3e716c863862b 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -72,7 +72,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
index bc84f6a43df3c..d4e6587fd6519 100644
--- a/app/code/Magento/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -20,7 +20,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
     /**
      * @var string
      */
-    protected $_template = 'email/items.phtml';
+    protected $_template = 'Magento_Wishlist::email/items.phtml';
 
     /**
      * Retrieve Product View URL
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 1aa96dd6f75fd..5cb60905aea48 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -114,8 +114,9 @@ public function execute()
             if (is_string($result)) {
                 throw new \Magento\Framework\Exception\LocalizedException(__($result));
             }
-            $wishlist->save();
-
+            if ($wishlist->isObjectNew()) {
+                $wishlist->save();
+            }
             $this->_eventManager->dispatch(
                 'wishlist_add_product',
                 ['wishlist' => $wishlist, 'product' => $product, 'item' => $result]
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
index 7e6f4d3ed7939..93a05ffc0ec93 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Configure.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
@@ -66,7 +67,7 @@ public function execute()
             $item->loadWithOptions($id);
             if (!$item->getId()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('We can\'t load the Wish List item right now.')
+                    __("The Wish List item can't load at this time. Please try again later.")
                 );
             }
             $wishlist = $this->wishlistProvider->getWishlist($item->getWishlistId());
diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
index e43a03e72d87c..b87afa8e5d0c4 100644
--- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
+++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
@@ -6,12 +6,16 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Serialize\Serializer\Json;
 
-class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
+/**
+ * Class DownloadCustomOption. Represents request-flow logic for option's file download
+ */
+class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
@@ -26,6 +30,8 @@ class DownloadCustomOption extends \Magento\Wishlist\Controller\AbstractIndex
     private $json;
 
     /**
+     * Constructor method
+     *
      * @param Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileResponseFactory
      * @param Json|null $json
@@ -92,7 +98,8 @@ public function execute()
                 $this->_fileResponseFactory->create(
                     $info['title'],
                     ['value' => $info['quote_path'], 'type' => 'filename'],
-                    DirectoryList::ROOT
+                    DirectoryList::ROOT,
+                    $info['type']
                 );
             }
         } catch (\Exception $e) {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
index 994da75073e96..49396004427f2 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Checkout\Helper\Cart as CartHelper;
@@ -104,7 +105,7 @@ public function execute()
             $item = $this->cart->getQuote()->getItemById($itemId);
             if (!$item) {
                 throw new LocalizedException(
-                    __('The requested cart item doesn\'t exist.')
+                    __("The cart item doesn't exist.")
                 );
             }
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php
index ec45201e390f1..84c59b5be3d1e 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Remove.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Remove.php
@@ -10,6 +10,8 @@
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
+use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\Product\AttributeValueProvider;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -26,18 +28,27 @@ class Remove extends \Magento\Wishlist\Controller\AbstractIndex
      */
     protected $formKeyValidator;
 
+    /**
+     * @var AttributeValueProvider
+     */
+    private $attributeValueProvider;
+
     /**
      * @param Action\Context $context
      * @param WishlistProviderInterface $wishlistProvider
      * @param Validator $formKeyValidator
+     * @param AttributeValueProvider|null $attributeValueProvider
      */
     public function __construct(
         Action\Context $context,
         WishlistProviderInterface $wishlistProvider,
-        Validator $formKeyValidator
+        Validator $formKeyValidator,
+        AttributeValueProvider $attributeValueProvider = null
     ) {
         $this->wishlistProvider = $wishlistProvider;
         $this->formKeyValidator = $formKeyValidator;
+        $this->attributeValueProvider = $attributeValueProvider
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeValueProvider::class);
         parent::__construct($context);
     }
 
@@ -56,7 +67,8 @@ public function execute()
         }
 
         $id = (int)$this->getRequest()->getParam('item');
-        $item = $this->_objectManager->create(\Magento\Wishlist\Model\Item::class)->load($id);
+        /** @var Item $item */
+        $item = $this->_objectManager->create(Item::class)->load($id);
         if (!$item->getId()) {
             throw new NotFoundException(__('Page not found.'));
         }
@@ -67,6 +79,14 @@ public function execute()
         try {
             $item->delete();
             $wishlist->save();
+            $productName = $this->attributeValueProvider
+                ->getRawAttributeValue($item->getProductId(), 'name');
+            $this->messageManager->addComplexSuccessMessage(
+                'removeWishlistItemSuccessMessage',
+                [
+                    'product_name' => $productName,
+                ]
+            );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError(
                 __('We can\'t delete the item from Wish List right now because of an error: %1.', $e->getMessage())
@@ -76,13 +96,8 @@ public function execute()
         }
 
         $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
-        $request = $this->getRequest();
-        $refererUrl = (string)$request->getServer('HTTP_REFERER');
-        $url = (string)$request->getParam(\Magento\Framework\App\Response\RedirectInterface::PARAM_NAME_REFERER_URL);
-        if ($url) {
-            $refererUrl = $url;
-        }
-        if ($request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED) && $refererUrl) {
+        $refererUrl = $this->_redirect->getRefererUrl();
+        if ($refererUrl) {
             $redirectUrl = $refererUrl;
         } else {
             $redirectUrl = $this->_redirect->getRedirectUrl($this->_url->getUrl('*/*'));
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
old mode 100644
new mode 100755
index a79e4aa95ffc5..056d58b4c70be
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -111,6 +111,9 @@ public function execute()
                 }
                 try {
                     $item->setDescription($description)->setQty($qty)->save();
+                    $this->messageManager->addSuccessMessage(
+                        __('%1 has been updated in your Wish List.', $item->getProduct()->getName())
+                    );
                     $updatedItems++;
                 } catch (\Exception $e) {
                     $this->messageManager->addError(
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index 14d651f43afdc..ae54289d4b1c9 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Wishlist section
@@ -38,22 +39,32 @@ class Wishlist implements SectionSourceInterface
      */
     protected $block;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Wishlist\Helper\Data $wishlistHelper
      * @param \Magento\Wishlist\Block\Customer\Sidebar $block
      * @param \Magento\Catalog\Helper\ImageFactory $imageHelperFactory
      * @param \Magento\Framework\App\ViewInterface $view
+     * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface|null $itemResolver
      */
     public function __construct(
         \Magento\Wishlist\Helper\Data $wishlistHelper,
         \Magento\Wishlist\Block\Customer\Sidebar $block,
         \Magento\Catalog\Helper\ImageFactory $imageHelperFactory,
-        \Magento\Framework\App\ViewInterface $view
+        \Magento\Framework\App\ViewInterface $view,
+        \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface $itemResolver = null
     ) {
         $this->wishlistHelper = $wishlistHelper;
         $this->imageHelperFactory = $imageHelperFactory;
         $this->block = $block;
         $this->view = $view;
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface::class
+        );
     }
 
     /**
@@ -122,7 +133,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
     {
         $product = $wishlistItem->getProduct();
         return [
-            'image' => $this->getImageData($product),
+            'image' => $this->getImageData($this->itemResolver->getFinalProduct($wishlistItem)),
             'product_sku' => $product->getSku(),
             'product_id' => $product->getId(),
             'product_url' => $this->wishlistHelper->getProductUrl($wishlistItem),
@@ -135,8 +146,8 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
             ),
             'product_is_saleable_and_visible' => $product->isSaleable() && $product->isVisibleInSiteVisibility(),
             'product_has_required_options' => $product->getTypeInstance()->hasRequiredOptions($product),
-            'add_to_cart_params' => $this->wishlistHelper->getAddToCartParams($wishlistItem, true),
-            'delete_item_params' => $this->wishlistHelper->getRemoveParams($wishlistItem, true),
+            'add_to_cart_params' => $this->wishlistHelper->getAddToCartParams($wishlistItem),
+            'delete_item_params' => $this->wishlistHelper->getRemoveParams($wishlistItem),
         ];
     }
 
@@ -144,7 +155,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      * Retrieve product image data
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Catalog\Block\Product\Image
+     * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function getImageData($product)
@@ -153,9 +164,7 @@ protected function getImageData($product)
         $helper = $this->imageHelperFactory->create()
             ->init($product, 'wishlist_sidebar_block');
 
-        $template = $helper->getFrame()
-            ? 'Magento_Catalog/product/image'
-            : 'Magento_Catalog/product/image_with_borders';
+        $template = 'Magento_Catalog/product/image_with_borders';
 
         try {
             $imagesize = $helper->getResizedImageInfo();
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 6c34adffcd851..3b9f431566da0 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -195,6 +195,7 @@ public function getWishlist()
 
     /**
      * Retrieve wishlist item count (include config settings)
+     *
      * Used in top link menu only
      *
      * @return int
@@ -284,9 +285,12 @@ public function getRemoveParams($item, $addReferer = false)
     {
         $url = $this->_getUrl('wishlist/index/remove');
         $params = ['item' => $item->getWishlistItemId()];
+        $params[ActionInterface::PARAM_NAME_URL_ENCODED] = '';
+
         if ($addReferer) {
             $params = $this->addRefererToParams($params);
         }
+
         return $this->_postDataHelper->getPostData($url, $params);
     }
 
@@ -395,9 +399,12 @@ public function getAddToCartUrl($item)
     public function getAddToCartParams($item, $addReferer = false)
     {
         $params = $this->_getCartUrlParameters($item);
+        $params[ActionInterface::PARAM_NAME_URL_ENCODED] = '';
+
         if ($addReferer) {
             $params = $this->addRefererToParams($params);
         }
+
         return $this->_postDataHelper->getPostData(
             $this->_getUrlStore($item)->getUrl('wishlist/index/cart'),
             $params
@@ -444,6 +451,8 @@ public function getSharedAddAllToCartUrl()
     }
 
     /**
+     * Get cart URL parameters
+     *
      * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item
      * @return array
      */
@@ -503,7 +512,7 @@ public function isAllowInCart()
     /**
      * Retrieve customer name
      *
-     * @return string|void
+     * @return string|null
      */
     public function getCustomerName()
     {
@@ -570,7 +579,7 @@ public function calculate()
             ) {
                 $count = $collection->getItemsQty();
             } else {
-                $count = $collection->getSize();
+                $count = $collection->count();
             }
             $this->_customerSession->setWishlistDisplayType(
                 $this->scopeConfig->getValue(
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index 14ca52e92ad84..b4f761f03dd97 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -7,6 +7,8 @@
 namespace Magento\Wishlist\Helper;
 
 /**
+ * Wishlist rss helper
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
@@ -104,7 +106,7 @@ public function getCustomer()
         if ($this->_customer === null) {
             $params = $this->urlDecoder->decode($this->_getRequest()->getParam('data'));
             $data   = explode(',', $params);
-            $customerId    = abs(intval($data[0]));
+            $customerId    = abs((int)$data[0]);
             if ($customerId && ($customerId == $this->_customerSession->getCustomerId())) {
                 $this->_customer = $this->_customerRepository->getById($customerId);
             } else {
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index b0e7c78cae5f4..41e83c7179e10 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -473,7 +473,7 @@ public function getProductUrl()
     public function getBuyRequest()
     {
         $option = $this->getOptionByCode('info_buyRequest');
-        $initialData = $option ? $this->serializer->unserialize($option->getValue()) : null;
+        $initialData = $option ? $this->serializer->unserialize($option->getValue()) : [];
 
         if ($initialData instanceof \Magento\Framework\DataObject) {
             $initialData = $initialData->getData();
diff --git a/app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php b/app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php
new file mode 100644
index 0000000000000..e17cd30184504
--- /dev/null
+++ b/app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+
+/**
+ * Provides existing attribute value for a product entity.
+ */
+class AttributeValueProvider
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @param ProductCollectionFactory $productCollectionFactory
+     */
+    public function __construct(
+        ProductCollectionFactory $productCollectionFactory
+    ) {
+        $this->productCollectionFactory = $productCollectionFactory;
+    }
+
+    /**
+     * Provides existing raw attribute value by the attribute code of the product entity.
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @param int|null $storeId
+     * @return null|string
+     */
+    public function getRawAttributeValue(int $productId, string $attributeCode, int $storeId = null):? string
+    {
+        $collection = $this->productCollectionFactory->create();
+        $collection->addIdFilter($productId)
+            ->addStoreFilter($storeId)
+            ->addAttributeToSelect($attributeCode);
+
+        if ($collection->isEnabledFlat()) {
+            $data = $collection->getConnection()->fetchRow($collection->getSelect());
+            $attributeValue = $data[$attributeCode] ?? null;
+        } else {
+            $attributeValue = $collection->getFirstItem()->getData($attributeCode);
+        }
+
+        return $attributeValue;
+    }
+}
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index 225026f31a994..5c131d27fb8d4 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -307,6 +307,7 @@ protected function _assignProducts()
 
         $checkInStock = $this->_productInStock && !$this->stockConfiguration->isShowOutOfStock();
 
+        /** @var \Magento\Wishlist\Model\Item $item */
         foreach ($this as $item) {
             $product = $productCollection->getItemById($item->getProductId());
             if ($product) {
@@ -320,7 +321,7 @@ protected function _assignProducts()
                     $item->setPrice($product->getPrice());
                 }
             } else {
-                $item->isDeleted(true);
+                $this->removeItemByKey($item->getId());
             }
         }
 
@@ -418,6 +419,7 @@ public function setVisibilityFilter($flag = true)
 
     /**
      * Set Salable Filter.
+     *
      * This filter apply Salable Product Types Filter to product collection.
      *
      * @param bool $flag
@@ -431,6 +433,7 @@ public function setSalableFilter($flag = true)
 
     /**
      * Set In Stock Filter.
+     *
      * This filter remove items with no salable product.
      *
      * @param bool $flag
@@ -478,7 +481,7 @@ public function addDaysFilter($constraints)
 
         if (isset($constraints['to'])) {
             $firstDay = new \DateTime();
-            $firstDay->modify('-' . $gmtOffset . ' second')->modify('-' . (intval($constraints['to']) + 1) . ' day');
+            $firstDay->modify('-' . $gmtOffset . ' second')->modify('-' . ((int)($constraints['to']) + 1) . ' day');
             $filter['from'] = $firstDay;
         }
 
@@ -567,6 +570,8 @@ public function getItemsQty()
     }
 
     /**
+     * After load data
+     *
      * @return $this
      */
     protected function _afterLoadData()
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index 75df3027ad9a9..9ccbf80f99a0c 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -7,9 +7,11 @@
 namespace Magento\Wishlist\Model\Rss;
 
 use Magento\Framework\App\Rss\DataProviderInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Wishlist RSS model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Wishlist implements DataProviderInterface
@@ -70,6 +72,8 @@ class Wishlist implements DataProviderInterface
     protected $customerFactory;
 
     /**
+     * Wishlist constructor.
+     *
      * @param \Magento\Wishlist\Helper\Rss $wishlistHelper
      * @param \Magento\Wishlist\Block\Customer\Wishlist $wishlistBlock
      * @param \Magento\Catalog\Helper\Output $outputHelper
@@ -114,9 +118,9 @@ public function __construct(
      */
     public function isAllowed()
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             'rss/wishlist/active',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -124,6 +128,7 @@ public function isAllowed()
      * Get RSS feed items
      *
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getRssData()
     {
@@ -191,6 +196,8 @@ public function getRssData()
     }
 
     /**
+     * GetCacheKey
+     *
      * @return string
      */
     public function getCacheKey()
@@ -199,6 +206,8 @@ public function getCacheKey()
     }
 
     /**
+     * Get Cache Lifetime
+     *
      * @return int
      */
     public function getCacheLifetime()
@@ -264,7 +273,7 @@ public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function getFeeds()
     {
@@ -272,7 +281,7 @@ public function getFeeds()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAuthRequired()
     {
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 9eb4e1f5ebcd2..9797ab58b0766 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -215,7 +217,7 @@ public function loadByCustomerId($customerId, $create = false)
     public function getName()
     {
         $name = $this->_getData('name');
-        if (!strlen($name)) {
+        if ($name === null || !strlen($name)) {
             return $this->_wishlistData->getDefaultWishlistName();
         }
         return $name;
@@ -378,6 +380,7 @@ public function addItem(Item $item)
 
     /**
      * Adds new product to wishlist.
+     *
      * Returns new item or string on error.
      *
      * @param int|\Magento\Catalog\Model\Product $product
@@ -579,7 +582,7 @@ public function setStore($store)
      */
     public function getItemsCount()
     {
-        return $this->getItemCollection()->getSize();
+        return $this->getItemCollection()->count();
     }
 
     /**
@@ -637,6 +640,7 @@ public function updateItem($itemId, $buyRequest, $params = null)
         $item = null;
         if ($itemId instanceof Item) {
             $item = $itemId;
+            $itemId = $item->getId();
         } else {
             $item = $this->getItem((int)$itemId);
         }
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
index c0461a942060c..1ab24d87efbf7 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/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php b/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
index 7f37486c7936c..df8bb3191bf9f 100644
--- a/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
+++ b/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
@@ -32,7 +32,7 @@ public function __construct(Data $helper)
     /**
      * Add tax data to result
      *
-     * @param \Magento\Checkout\CustomerData\Cart $subject
+     * @param \Magento\Catalog\Ui\DataProvider\Product\Listing\DataProvider $subject
      * @param array $result
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
index 027860fe01ab8..e1fafe35e43ff 100644
--- a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
+++ b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
@@ -7,15 +7,51 @@
 
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
-use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Framework\Pricing\Price\AbstractPrice;
 
-class ConfigurableProduct extends FinalPrice implements ConfiguredPriceInterface
+/**
+ * Pricing configuration of wishlist product.
+ */
+class ConfigurableProduct extends AbstractPrice
 {
+    /**
+     * Price type final.
+     */
+    const PRICE_CODE = 'final_price';
+
     /**
      * @var ItemInterface
      */
     private $item;
 
+    /**
+     * Get Configured Price Amount object by price type.
+     *
+     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     */
+    public function getConfiguredAmount(): \Magento\Framework\Pricing\Amount\AmountInterface
+    {
+        /** @var \Magento\Wishlist\Model\Item\Option $customOption */
+        $customOption = $this->getProduct()->getCustomOption('simple_product');
+        $product = $customOption ? $customOption->getProduct() : $this->getProduct();
+
+        return $product->getPriceInfo()->getPrice(ConfiguredPriceInterface::CONFIGURED_PRICE_CODE)->getAmount();
+    }
+
+    /**
+     * Get Configured Regular Price Amount object by price type.
+     *
+     * @return \Magento\Framework\Pricing\Amount\AmountInterface
+     */
+    public function getConfiguredRegularAmount(): \Magento\Framework\Pricing\Amount\AmountInterface
+    {
+        /** @var \Magento\Wishlist\Model\Item\Option $customOption */
+        $customOption = $this->getProduct()->getCustomOption('simple_product');
+        $product = $customOption ? $customOption->getProduct() : $this->getProduct();
+
+        return $product->getPriceInfo()->getPrice(ConfiguredPriceInterface::CONFIGURED_REGULAR_PRICE_CODE)->getAmount();
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/Wishlist/Setup/InstallSchema.php b/app/code/Magento/Wishlist/Setup/InstallSchema.php
deleted file mode 100644
index 5175ad9a8fa03..0000000000000
--- a/app/code/Magento/Wishlist/Setup/InstallSchema.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Wishlist\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'wishlist'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('wishlist')
-        )->addColumn(
-            'wishlist_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Wishlist ID'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Customer ID'
-        )->addColumn(
-            'shared',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Sharing flag (0 or 1)'
-        )->addColumn(
-            'sharing_code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            32,
-            [],
-            'Sharing encrypted code'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Last updated date'
-        )->addIndex(
-            $installer->getIdxName('wishlist', 'shared'),
-            'shared'
-        )->addIndex(
-            $installer->getIdxName(
-                'wishlist',
-                'customer_id',
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            'customer_id',
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addForeignKey(
-            $installer->getFkName('wishlist', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Wishlist main Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'wishlist_item'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('wishlist_item')
-        )->addColumn(
-            'wishlist_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Wishlist item ID'
-        )->addColumn(
-            'wishlist_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Wishlist ID'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Product ID'
-        )->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Store ID'
-        )->addColumn(
-            'added_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            [],
-            'Add date and time'
-        )->addColumn(
-            'description',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Short description of wish list item'
-        )->addColumn(
-            'qty',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false],
-            'Qty'
-        )->addIndex(
-            $installer->getIdxName('wishlist_item', 'wishlist_id'),
-            'wishlist_id'
-        )->addForeignKey(
-            $installer->getFkName('wishlist_item', 'wishlist_id', 'wishlist', 'wishlist_id'),
-            'wishlist_id',
-            $installer->getTable('wishlist'),
-            'wishlist_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addIndex(
-            $installer->getIdxName('wishlist_item', 'product_id'),
-            'product_id'
-        )->addForeignKey(
-            $installer->getFkName('wishlist_item', 'product_id', 'catalog_product_entity', 'entity_id'),
-            'product_id',
-            $installer->getTable('catalog_product_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addIndex(
-            $installer->getIdxName('wishlist_item', 'store_id'),
-            'store_id'
-        )->addForeignKey(
-            $installer->getFkName('wishlist_item', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Wishlist items'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'wishlist_item_option'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('wishlist_item_option')
-        )->addColumn(
-            'option_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Option Id'
-        )->addColumn(
-            'wishlist_item_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Wishlist Item Id'
-        )->addColumn(
-            'product_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Product Id'
-        )->addColumn(
-            'code',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Code'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            ['nullable' => true],
-            'Value'
-        )->addForeignKey(
-            $installer->getFkName('wishlist_item_option', 'wishlist_item_id', 'wishlist_item', 'wishlist_item_id'),
-            'wishlist_item_id',
-            $installer->getTable('wishlist_item'),
-            'wishlist_item_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Wishlist Item Option Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
new file mode 100644
index 0000000000000..76f27756d8270
--- /dev/null
+++ b/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Wishlist\Setup\Patch\Data;
+
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ConvertSerializedData
+ * @package Magento\Wishlist\Setup\Patch
+ */
+class ConvertSerializedData implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
+    /**
+     * @var QueryModifierFactory
+     */
+    private $queryModifierFactory;
+
+    /**
+     * @var QueryGenerator
+     */
+    private $queryGenerator;
+
+    /**
+     * ConvertSerializedData constructor.
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param FieldDataConverterFactory $fieldDataConverterFactory
+     * @param QueryModifierFactory $queryModifierFactory
+     * @param QueryGenerator $queryGenerator
+     */
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        FieldDataConverterFactory $fieldDataConverterFactory,
+        QueryModifierFactory $queryModifierFactory,
+        QueryGenerator $queryGenerator
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
+        $this->queryModifierFactory = $queryModifierFactory;
+        $this->queryGenerator = $queryGenerator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->convertSerializedData();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+    
+    private function convertSerializedData()
+    {
+        $connection = $this->moduleDataSetup->getConnection();
+        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+        $queryModifier = $this->queryModifierFactory->create(
+            'in',
+            [
+                'values' => [
+                    'code' => [
+                        'parameters',
+                        'info_buyRequest',
+                        'bundle_option_ids',
+                        'bundle_selection_ids',
+                        'attributes',
+                        'bundle_selection_attributes',
+                    ]
+                ]
+            ]
+        );
+        $fieldDataConverter->convert(
+            $connection,
+            $this->moduleDataSetup->getTable('wishlist_item_option'),
+            'option_id',
+            'value',
+            $queryModifier
+        );
+        $select = $connection
+            ->select()
+            ->from(
+                $this->moduleDataSetup->getTable('catalog_product_option'),
+                ['option_id']
+            )
+            ->where('type = ?', 'file');
+        $iterator = $this->queryGenerator->generate('option_id', $select);
+        foreach ($iterator as $selectByRange) {
+            $codes = $connection->fetchCol($selectByRange);
+            $codes = array_map(
+                function ($id) {
+                    return 'option_' . $id;
+                },
+                $codes
+            );
+            $queryModifier = $this->queryModifierFactory->create(
+                'in',
+                [
+                    'values' => [
+                        'code' => $codes
+                    ]
+                ]
+            );
+            $fieldDataConverter->convert(
+                $connection,
+                $this->moduleDataSetup->getTable('wishlist_item_option'),
+                'option_id',
+                'value',
+                $queryModifier
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php b/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php
new file mode 100644
index 0000000000000..5c65fce10ccd2
--- /dev/null
+++ b/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Setup\Patch\Schema;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Class AddProductIdConstraint
+ */
+class AddProductIdConstraint implements SchemaPatchInterface
+{
+    /**
+     * @var SchemaSetupInterface
+     */
+    private $schemaSetup;
+
+    /**
+     * @param SchemaSetupInterface $schemaSetup
+     */
+    public function __construct(
+        SchemaSetupInterface $schemaSetup
+    ) {
+        $this->schemaSetup = $schemaSetup;
+    }
+
+    /**
+     * Run code inside patch.
+     *
+     * @return void
+     */
+    public function apply()
+    {
+        $this->schemaSetup->startSetup();
+
+        $this->schemaSetup->getConnection()->addForeignKey(
+            $this->schemaSetup->getConnection()->getForeignKeyName(
+                $this->schemaSetup->getTable('wishlist_item_option'),
+                'product_id',
+                $this->schemaSetup->getTable('catalog_product_entity'),
+                'entity_id'
+            ),
+            $this->schemaSetup->getTable('wishlist_item_option'),
+            'product_id',
+            $this->schemaSetup->getTable('catalog_product_entity'),
+            'entity_id',
+            AdapterInterface::FK_ACTION_CASCADE,
+            true
+        );
+
+        $this->schemaSetup->endSetup();
+    }
+
+    /**
+     * Get array of patches that have to be executed prior to this.
+     *
+     * @return string[]
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * Get aliases (previous names) for the patch.
+     *
+     * @return string[]
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Wishlist/Setup/UpgradeData.php b/app/code/Magento/Wishlist/Setup/UpgradeData.php
deleted file mode 100644
index 10ce3469afe4f..0000000000000
--- a/app/code/Magento/Wishlist/Setup/UpgradeData.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wishlist\Setup;
-
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Framework\DB\Select\InQueryModifier;
-use Magento\Framework\DB\Query\Generator;
-
-class UpgradeData implements UpgradeDataInterface
-{
-    /**
-     * @var FieldDataConverterFactory
-     */
-    private $fieldDataConverterFactory;
-
-    /**
-     * @var QueryModifierFactory
-     */
-    private $queryModifierFactory;
-
-    /**
-     * @var Generator
-     */
-    private $queryGenerator;
-
-    /**
-     * Constructor
-     *
-     * @param FieldDataConverterFactory $fieldDataConverterFactory
-     * @param QueryModifierFactory $queryModifierFactory
-     * @param Generator $queryGenerator
-     */
-    public function __construct(
-        FieldDataConverterFactory $fieldDataConverterFactory,
-        QueryModifierFactory $queryModifierFactory,
-        Generator $queryGenerator
-    ) {
-        $this->fieldDataConverterFactory = $fieldDataConverterFactory;
-        $this->queryModifierFactory = $queryModifierFactory;
-        $this->queryGenerator = $queryGenerator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $this->upgradeToVersionTwoZeroOne($setup);
-        }
-    }
-
-    /**
-     * Upgrade to version 2.0.1, convert data for `value` field in `wishlist_item_option table`
-     * from php-serialized to JSON format
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @return void
-     */
-    private function upgradeToVersionTwoZeroOne(ModuleDataSetupInterface $setup)
-    {
-        $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
-        $queryModifier = $this->queryModifierFactory->create(
-            'in',
-            [
-                'values' => [
-                    'code' => [
-                        'parameters',
-                        'info_buyRequest',
-                        'bundle_option_ids',
-                        'bundle_selection_ids',
-                        'attributes',
-                        'bundle_selection_attributes',
-                    ]
-                ]
-            ]
-        );
-        $fieldDataConverter->convert(
-            $setup->getConnection(),
-            $setup->getTable('wishlist_item_option'),
-            'option_id',
-            'value',
-            $queryModifier
-        );
-        $select = $setup->getConnection()
-            ->select()
-            ->from(
-                $setup->getTable('catalog_product_option'),
-                ['option_id']
-            )
-            ->where('type = ?', 'file');
-        $iterator = $this->queryGenerator->generate('option_id', $select);
-        foreach ($iterator as $selectByRange) {
-            $codes = $setup->getConnection()->fetchCol($selectByRange);
-            $codes = array_map(
-                function ($id) {
-                    return 'option_' . $id;
-                },
-                $codes
-            );
-            $queryModifier = $this->queryModifierFactory->create(
-                'in',
-                [
-                    'values' => [
-                        'code' => $codes
-                    ]
-                ]
-            );
-            $fieldDataConverter->convert(
-                $setup->getConnection(),
-                $setup->getTable('wishlist_item_option'),
-                'option_id',
-                'value',
-                $queryModifier
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
new file mode 100644
index 0000000000000..7bb42e12d1451
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add Product to wishlist from the category page and check message -->
+    <actionGroup name="StorefrontCustomerAddCategoryProductToWishlistActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productVar.name)}}" stepKey="addCategoryProductToWishlistMoveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToWishlistByName(productVar.name)}}" stepKey="addCategoryProductToWishlistClickAddProductToWishlist"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addCategoryProductToWishlistWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addCategoryProductToWishlistSeeProductNameAddedToWishlist"/>
+        <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
+    </actionGroup>
+
+    <!-- Add Product to wishlist from the product page and check message -->
+    <actionGroup name="StorefrontCustomerAddProductToWishlistActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="WaitForWishList"/>
+        <click selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="addProductToWishlistClickAddToWishlist" />
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
+        <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
+    </actionGroup>
+
+    <!-- Check product in wishlist -->
+    <actionGroup name="StorefrontCustomerCheckProductInWishlist">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistProductName"/>
+        <see userInput="${{productVar.price}}.00" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistProductPrice"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(productVar.name)}}" stepKey="wishlistMoveMouseOverProduct" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistProductImage" />
+    </actionGroup>
+
+    <!-- Check product in wishlist sidebar -->
+    <actionGroup name="StorefrontCustomerCheckProductInWishlistSidebar">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistSidebarProductName"/>
+        <see userInput="${{productVar.price}}.00" selector="{{StorefrontCustomerWishlistSidebarSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductPrice"/>
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistSidebarAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </actionGroup>
+
+    <!--Remove a product from the wishlist using the sidebar -->
+    <actionGroup name="StorefrontCustomerRemoveProductFromWishlistUsingSidebar">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <click selector="{{StorefrontCustomerWishlistSidebarSection.ProductRemoveByName(product.name)}}" stepKey="RemoveProductFromWishlistUsingSidebarClickRemoveItemFromWishlist"/>
+        <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="RemoveProductFromWishlistUsingSidebarWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="{{product.name}} has been removed from your Wish List." stepKey="RemoveProductFromWishlistUsingSidebarSeeProductNameRemovedFromWishlist"/>
+    </actionGroup>
+
+    <!--Add a product to the cart from the wishlist using the sidebar -->
+    <actionGroup name="StorefrontCustomerAddProductToCartFromWishlistUsingSidebar">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <click selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(product.name)}}" stepKey="AddProductToCartFromWishlistUsingSidebarClickAddToCartFromWishlist"/>
+        <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="AddProductToCartFromWishlistUsingSidebarWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="AddProductToCartFromWishlistUsingSidebarSeeProductNameAddedToCartFromWishlist"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontCustomerEditProductInWishlist">
+        <arguments>
+            <argument name="product"/>
+            <argument name="description" type="string"/>
+            <argument name="quantity" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(product.name)}}" stepKey="mouseOverOnProduct"/>
+        <fillField selector="{{StorefrontCustomerWishlistProductSection.ProductDescription(product.name)}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <fillField selector="{{StorefrontCustomerWishlistProductSection.ProductQuantity(product.name)}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="mouseOver"/>
+        <click selector="{{StorefrontCustomerWishlistProductSection.ProductUpdateWishList}}" stepKey="submitUpdateWishlist"/>
+        <see selector="{{StorefrontCustomerWishlistProductSection.ProductSuccessUpdateMessage}}" userInput="{{product.name}} has been updated in your Wish List." stepKey="successMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml b/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
new file mode 100644
index 0000000000000..811871bf685ae
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Wishlist" type="wishlist">
+        <data key="id">null</data>
+        <var key="product" entityType="product" entityKey="id"/>
+        <var key="customer_email" entityType="customer" entityKey="email"/>
+        <var key="customer_password" entityType="customer" entityKey="password"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/LICENSE.txt b/app/code/Magento/Wishlist/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/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/Wishlist/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Wishlist/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/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/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml b/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
new file mode 100644
index 0000000000000..423367c9a3b9d
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateWishlist" dataType="wishlist" type="create"
+               auth="customerFormKey" url="/wishlist/index/add/" method="POST" successRegex="" returnRegex="~\/wishlist_id\/(\d*?)\/~" >
+        <contentType>application/x-www-form-urlencoded</contentType>
+        <field key="product">integer</field>
+        <field key="customer_email">string</field>
+        <field key="customer_password">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
new file mode 100644
index 0000000000000..986d1e59ad066
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerWishlistPage" url="/wishlist/" area="storefront" module="Magento_Wishlist">
+        <section name="StorefrontCustomerWishlistSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/README.md b/app/code/Magento/Wishlist/Test/Mftf/README.md
new file mode 100644
index 0000000000000..b0df8b018736c
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Wishlist Functional Tests
+
+The Functional Test Module for **Magento Wishlist** module.
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 0000000000000..07f8b91661d2e
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="ProductAddToWishlistByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'towishlist')]" parameterized="true"/>
+        <element name="ProductAddToWishlistByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'towishlist')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
new file mode 100644
index 0000000000000..7a767e42e82bf
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistProductSection">
+        <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
+        <element name="ProductImageByImageName" type="text" selector="//main//li//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
+        <element name="ProductDescription" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//textarea[@class='product-item-comment']" parameterized="true"/>
+        <element name="ProductQuantity" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//input[@class='input-text qty']" parameterized="true"/>
+        <element name="ProductUpdateWishList" type="button" selector=".column.main .actions-toolbar .action.update" timeout="30"/>
+        <element name="ProductAddAllToCart" type="button" selector=".column.main .actions-toolbar .action.tocart" timeout="30"/>
+        <element name="ProductSuccessUpdateMessage" type="text" selector="//div[1]/div[2]/div/div/div"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
new file mode 100644
index 0000000000000..c208bfc41dcdc
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistSection">
+        <element name="pageTitle" type="text" selector="h1.page-title"/>
+        <element name="successMsg" type="text" selector="div.message-success.success.message"/>
+        <element name="productItemNameText" type="text" selector=".products-grid .product-item-name a"/>
+        <element name="removeWishlistButton" type="button" selector=".products-grid .btn-remove.action.delete>span" timeout="30"/>
+        <element name="emptyWishlistText" type="text" selector=".message.info.empty>span"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
new file mode 100644
index 0000000000000..ba226837c5fe7
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistSidebarSection">
+        <element name="ProductTitleByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
+        <element name="ProductImageByImageName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
+        <element name="ProductRemoveByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//a[contains(@class, 'action delete')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..e77c489074069
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="productAddToWishlist" type="button" selector="a.action.towishlist"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
new file mode 100644
index 0000000000000..42d4203999a44
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ConfigurableProductChildImageShouldBeShownOnWishListTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="MAGETWO-8709"/>
+            <group value="wishlist"/>
+            <title value="When user add Configurable child product to WIshlist then child product image should be shown in Wishlist"/>
+            <description value="When user add Configurable child product to WIshlist then child product image should be shown in Wishlist"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93097"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set checkout/cart/configurable_product_image 0" stepKey="setProductImageSettingUnderCofigurationSalesCheckout"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfPresent"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchProductGrid">
+            <argument name="keyword" value="_defaultProduct.name"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(_defaultProduct.name)}}" stepKey="selectProductToAddImage"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+        <actionGroup ref="addProductImage" stepKey="addImageForParentProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad1"/>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(colorProductAttribute1.name)}}" stepKey="selectProductToAddImage1"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
+        <actionGroup ref="addProductImage" stepKey="addImageForChildProduct">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+         <!--Sign in as customer -->
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <fillField userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="waitForButton"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <see userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeFirstName"/>
+        <see userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeLastName"/>
+        <see userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeEmail"/>
+        <waitForPageLoad stepKey="waitForLogin"/>
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="waitForAddToCartVisible"/>
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstProductToWishlist"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByImageName(TestImageNew.filename)}}" stepKey="AssertWishlistProductImage" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByImageName(TestImageNew.filename)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..7eb42d1fbfed9
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <!-- Step 5: Add products to wishlist -->
+        <comment userInput="Start of adding products to wishlist" stepKey="startOfAddingProductsToWishlist" after="endOfComparingProducts" />
+        <!-- Add Simple Product 1 to wishlist -->
+        <comment userInput="Add Simple Product 1 to wishlist" stepKey="commentAddSimpleProduct1ToWishlist" after="startOfAddingProductsToWishlist" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" after="commentAddSimpleProduct1ToWishlist" stepKey="wishlistGotoCategory1"/>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" after="wishlistGotoCategory1" stepKey="wishlistAddSimpleProduct1ToWishlist">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" after="wishlistAddSimpleProduct1ToWishlist" stepKey="wishlistCheckSimpleProduct1InWishlist">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" after="wishlistCheckSimpleProduct1InWishlist" stepKey="wishlistCheckSimpleProduct1InWishlistSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to wishlist -->
+        <comment userInput="Add Simple Product 2 to wishlist" stepKey="commentAddSimpleProduct2ToWishlist" after="wishlistCheckSimpleProduct1InWishlistSidebar" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" after="commentAddSimpleProduct2ToWishlist" stepKey="wishlistGotoCategory2"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" after="wishlistGotoCategory2" stepKey="wishlistClickSimpleProduct2"/>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" after="wishlistClickSimpleProduct2" stepKey="wishlistAddSimpleProduct2ToWishlist">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" after="wishlistAddSimpleProduct2ToWishlist" stepKey="wishlistCheckSimpleProduct2InWishlist">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" after="wishlistCheckSimpleProduct2InWishlist" stepKey="wishlistCheckSimpleProduct2InWishlistSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <comment userInput="End of adding products to wishlist" after="wishlistCheckSimpleProduct2InWishlistSidebar" stepKey="endOfAddingProductsToWishlist" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
new file mode 100644
index 0000000000000..b91f796e6a18f
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAddMultipleStoreProductsToWishlistTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="Adding to wishlist"/>
+            <title value="Customer should be able to add products to wishlist from different stores"/>
+            <description value="All products added to wishlist should be visible on any store. Even if product visibility was set to 'Not Visible Individually' for this store"/>
+            <group value="wishlist"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-95678"/>
+        </annotations>
+        <before>
+            <createData entity="customStoreGroup" stepKey="storeGroup"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="secondProduct">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <!-- Create new store view and assign it to non default store -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <actionGroup ref="CreateCustomStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="storeGroupName" value="$$storeGroup.group[name]$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="secondProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStoreGroup">
+                <argument name="storeGroupName" value="$$storeGroup.group[name]$$"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Change products visibility on store-view level -->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct1">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickSwitchStoreMenuForProduct1"/>
+        <click selector="{{AdminProductFormChangeStoreSection.storeSelector(customStore.name)}}" stepKey="clickOnStoreNameItemForProduct1"/>
+        <waitForElementVisible selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="waitAcceptStoreSwitchingForProduct1n"/>
+        <click selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="acceptStoreSwitchingForProduct1"/>
+        <click selector="{{AdminProductFormSection.visibilityUseDefault}}" stepKey="uncheckVisibilityUseDefaultValueForProduct1"/>
+        <selectOption userInput="Not Visible Individually" selector="{{AdminProductFormSection.visibility}}" stepKey="makeProductNotVisibleOnSecondaryStoreView"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedProductForProduct1"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
+            <argument name="product" value="$$secondProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$secondProduct$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickSwitchStoreMenuForProduct2"/>
+        <click selector="{{AdminProductFormChangeStoreSection.storeSelector('Default Store View')}}" stepKey="clickOnStoreNameItemForProduct2"/>
+        <waitForElementVisible selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="waitAcceptStoreSwitchingForProduct2"/>
+        <click selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="acceptStoreSwitchingForProduct2"/>
+        <click selector="{{AdminProductFormSection.visibilityUseDefault}}" stepKey="uncheckVisibilityUseDefaultValueForProduct2"/>
+        <selectOption userInput="Not Visible Individually" selector="{{AdminProductFormSection.visibility}}" stepKey="makeProductNotVisibleOnDefaultStoreView"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedProductForProduct2"/>
+        <!-- Sign in as customer -->
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <fillField userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="waitForButton"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <see userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeFirstName"/>
+        <see userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeLastName"/>
+        <see userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeEmail"/>
+        <!-- Add product visible on default store to wishlist -->
+        <amOnPage url="$$product.name$$.html" stepKey="navigateToProductPageOnDefaultStore"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertFirstProductNameTitle"/>
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstProductToWishlist"/>
+        <!-- Switch to second store and add second product (visible on second store) to wishlist -->
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
+        <click selector="{{StorefrontFooterSection.storeLink($$storeGroup.group[name]$$)}}" stepKey="SelectSecondStoreToSwitchOn"/>
+        <!-- Verify that both products are visible in wishlist on both stores -->
+        <amOnPage url="$$secondProduct.name$$.html" stepKey="navigateToProductPageOnSecondStore"/>
+        <see userInput="$$secondProduct.name$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertSecondProductNameTitle"/>
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addSecondProductToWishlist"/>
+        <see userInput="$$secondProduct.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct2InWishlistOnSecondStore"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnSecondStore"/>
+        <click selector="{{StorefrontFooterSection.storeLink('Main Website Store')}}" stepKey="SelectDefaultStoreToSwitchOn"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}" stepKey="seeProduct1InWishlistOnDefaultStore"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
new file mode 100644
index 0000000000000..16a18dd27b123
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAddProductsToCartFromWishlistUsingSidebarTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="Add to wishlist"/>
+            <title value="Add products from the wishlist to the cart using the sidebar."/>
+            <description value="Products added to the cart from wishlist and a customer remains on the same page."/>
+            <group value="wishlist"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
+            <createData entity="SimpleSubCategory" stepKey="categorySecond"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="categoryFirst"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="categorySecond"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/>
+            <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Sign in as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+        <!-- Add product from first category to the wishlist -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryFirst.name$$)}}" stepKey="navigateToCategoryFirstPage"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSimpleProduct1ToWishlist">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Add product to the cart from the Wishlist using the sidebar from the second category page-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categorySecond.name$$)}}" stepKey="navigateToCategorySecondPage"/>
+        <actionGroup ref="StorefrontSwitchCategoryViewToListMode" stepKey="switchCategoryViewToListMode"/>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProduct1InWishlistSidebar">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddProductToCartFromWishlistUsingSidebar" stepKey="addProduct1ToCartFromWishlistUsingSidebar">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Check that a customer on the same page as before-->
+        <!--hardcoded URL because this method does not support replacement-->
+        <seeCurrentUrlMatches regex="~\/$$categorySecond.name$$\.html\?(\S+)?\w+=list(&amp;\S+)?$~i" stepKey="seeCurrentCategoryUrlMatches"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
new file mode 100644
index 0000000000000..0001bd9d6db75
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontDeletePersistedWishlistTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="Delete a persist wishlist for a customer"/>
+            <title value="Customer should be able to delete a persistent wishlist"/>
+            <description value="Customer should be able to delete a persistent wishlist"/>
+            <severity value="AVERAGE"/>
+            <group value="wishlist"/>
+            <testCaseId value="MC-4110"/>
+            <skip>
+                <issueId value="MQE-1145"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData stepKey="category" entity="SimpleSubCategory"/>
+            <createData stepKey="product" entity="SimpleProduct" >
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData stepKey="customer" entity="Simple_US_Customer"/>
+            <createData stepKey="wishlist" entity="Wishlist">
+                <requiredEntity createDataKey="customer"/>
+                <requiredEntity createDataKey="product"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="category"/>
+            <deleteData stepKey="deleteProduct" createDataKey="product"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+        <waitForElementVisible stepKey="waitForButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <waitForPageLoad stepKey="15"/>
+        <amOnPage stepKey="amOnWishlist" url="{{StorefrontCustomerWishlistPage.url}}"/>
+        <see stepKey="seeWishlist" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
+        <moveMouseOver stepKey="mouseOver" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
+        <waitForElementVisible stepKey="waitForRemoveButton" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
+        <click stepKey="clickRemove" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
+        <see stepKey="seeEmptyWishlist" userInput="You have no items in your wish list" selector="{{StorefrontCustomerWishlistSection.emptyWishlistText}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
new file mode 100644
index 0000000000000..e3382dc41d27e
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontRemoveProductsFromWishlistUsingSidebarTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="Remove from wishlist"/>
+            <title value="Remove products from the wishlist using the sidebar."/>
+            <description value="Products removed from wishlist and a customer remains on the same page."/>
+            <group value="wishlist"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
+            <createData entity="SimpleSubCategory" stepKey="categorySecond"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="categoryFirst"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="categorySecond"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/>
+            <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Sign in as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+        <!-- Add product from first category to the wishlist -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryFirst.name$$)}}" stepKey="navigateToCategoryFirstPage"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSimpleProduct1ToWishlist">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Remove product from the Wishlist using the sidebar from the second category page-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categorySecond.name$$)}}" stepKey="navigateToCategorySecondPage"/>
+        <actionGroup ref="StorefrontSwitchCategoryViewToListMode" stepKey="switchCategoryViewToListMode"/>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProduct1InWishlistSidebar">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerRemoveProductFromWishlistUsingSidebar" stepKey="removeProduct1FromWishlistUsingSidebar">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Check that a customer on the same page as before-->
+        <!--hardcoded URL because this method does not support replacement-->
+        <seeCurrentUrlMatches regex="~\/$$categorySecond.name$$\.html\?(\S+)?\w+=list(&amp;\S+)?$~i" stepKey="seeCurrentCategoryUrlMatches"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
new file mode 100644
index 0000000000000..9f11de49adcd4
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontUpdateWishlistTest">
+        <annotations>
+            <title value="Displaying of message after Wish List update"/>
+            <stories value="MAGETWO-91666: Wishlist update does not return a success message"/>
+            <description value="Displaying of message after Wish List update"/>
+            <features value="Wishlist"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94296"/>
+            <group value="Wishlist"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="category" value="$$category$$"/>
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="checkProductInWishlist">
+            <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCustomerEditProductInWishlist" stepKey="updateProductInWishlist">
+            <argument name="product" value="$$product$$"/>
+            <argument name="description" value="some text"/>
+            <argument name="quantity" value="2"/>
+        </actionGroup>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Wishlist/Test/Unit/Block/Customer/SidebarTest.php b/app/code/Magento/Wishlist/Test/Unit/Block/Customer/SidebarTest.php
index f53f299c4a40a..92c36470d7f7f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Block/Customer/SidebarTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Block/Customer/SidebarTest.php
@@ -46,9 +46,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->block = new Sidebar(
-            $this->productContext,
-            $this->httpContext
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->block = $objectManager->getObject(
+            Sidebar::class,
+            [
+                'context' => $this->productContext,
+                'httpContext' => $this->httpContext
+            ]
         );
     }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php
index 4b3ff8b8dd23e..36c51547c5a42 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php
@@ -114,6 +114,9 @@ public function testGetConfiguredOptions($options, $callNum, $expected)
         $this->assertEquals($expected, $this->block->getConfiguredOptions());
     }
 
+    /**
+     * @return array
+     */
     public function getConfiguredOptionsDataProvider()
     {
         return [
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
index d7195086850e4..2df44a912a09c 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
@@ -136,6 +136,9 @@ protected function prepareContext()
             ->willReturn($this->resultFactoryMock);
     }
 
+    /**
+     * @return \Magento\Wishlist\Controller\Index\Allcart
+     */
     public function getController()
     {
         $this->prepareContext();
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/DownloadCustomOptionTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/DownloadCustomOptionTest.php
deleted file mode 100644
index 6fefe18cf8975..0000000000000
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/DownloadCustomOptionTest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wishlist\Test\Unit\Controller\Index;
-
-class DownloadCustomOptionTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Wishlist\Controller\Index\DownloadCustomOption
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contextMock;
-
-    /**
-     * @var \Magento\Framework\App\Response\Http\FileFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $fileResponseFactoryMock;
-
-    /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $requestMock;
-
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectManagerMock;
-
-    /**
-     * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultFactoryMock;
-
-    /**
-     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $jsonMock;
-
-    protected function setUp()
-    {
-        $this->fileResponseFactoryMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->jsonMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create', 'get', 'configure'])
-            ->getMock();
-
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->contextMock->expects($this->any())
-            ->method('getObjectManager')
-            ->willReturn($this->objectManagerMock);
-        $this->contextMock->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($this->requestMock);
-        $this->contextMock->expects($this->any())
-            ->method('getResultFactory')
-            ->willReturn($this->resultFactoryMock);
-
-        $this->model = new \Magento\Wishlist\Controller\Index\DownloadCustomOption(
-            $this->contextMock,
-            $this->fileResponseFactoryMock,
-            $this->jsonMock
-        );
-    }
-
-    public function testExecute()
-    {
-        $data = [
-            'number' => 42,
-            'string' => 'string_value',
-            'boolean' => true,
-            'collection' => [1, 2, 3],
-            'secret_key' => 999
-        ];
-        $serialized_data = json_encode($data);
-
-        $optionMock = $this->getMockBuilder(\Magento\Wishlist\Model\Item\Option::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getProductId', 'load', 'getId', 'getValue'])
-            ->getMock();
-        $optionMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $optionMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
-        $optionMock->expects($this->any())
-            ->method('getProductId')
-            ->willReturn('some_value');
-        $optionMock->expects($this->any())
-            ->method('getValue')
-            ->willReturn($serialized_data);
-
-        $productOptionMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getProductId', 'load', 'getId', 'getType'])
-            ->getMock();
-        $productOptionMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $productOptionMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
-        $productOptionMock->expects($this->any())
-            ->method('getProductId')
-            ->willReturn('some_value');
-        $productOptionMock->expects($this->any())
-            ->method('getType')
-            ->willReturn('file');
-
-        $this->objectManagerMock->expects($this->any())
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Wishlist\Model\Item\Option::class, [], $optionMock],
-                    [\Magento\Catalog\Model\Product\Option::class, [], $productOptionMock]
-                ]
-            );
-
-        $this->requestMock->expects($this->any())
-            ->method('getParam')
-            ->willReturn(1);
-
-        $this->jsonMock->expects($this->once())
-            ->method('unserialize')
-            ->willReturnCallback(function ($value) {
-                return json_decode($value, true);
-            });
-
-        $this->assertEquals(null, $this->model->execute());
-    }
-}
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
index 704d4088130f3..52af38dee0ed3 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
 use Magento\Checkout\Helper\Cart as CartHelper;
@@ -197,7 +198,7 @@ public function testExecuteNoCartItem()
 
         $this->messageManager->expects($this->once())
             ->method('addErrorMessage')
-            ->with(__('The requested cart item doesn\'t exist.'))
+            ->with(__("The cart item doesn't exist."))
             ->willReturnSelf();
 
         $this->resultRedirect->expects($this->once())
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php
index 136d0f7f36c3e..7c6ba740aa18d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php
@@ -123,6 +123,9 @@ protected function prepareContext()
             ->willReturn($this->resultFactoryMock);
     }
 
+    /**
+     * @return \Magento\Wishlist\Controller\Index\Index
+     */
     public function getController()
     {
         $this->prepareContext();
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
index 37c95d43bec95..399b48073b339 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
@@ -74,6 +74,9 @@ protected function tearDown()
         );
     }
 
+    /**
+     * @return \Magento\Wishlist\Controller\Index\Plugin
+     */
     protected function getPlugin()
     {
         return new \Magento\Wishlist\Controller\Index\Plugin(
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
index 2a36d3beb8558..bb4ae44fcc31d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
@@ -139,6 +139,9 @@ protected function prepareContext()
             ->willReturn($this->resultFactoryMock);
     }
 
+    /**
+     * @return \Magento\Wishlist\Controller\Index\Remove
+     */
     public function getController()
     {
         $this->prepareContext();
@@ -312,13 +315,11 @@ public function testExecuteCanNotSaveWishlist()
             ->with(\Magento\Wishlist\Model\Item::class)
             ->willReturn($item);
 
-        $this->request
-            ->expects($this->once())
-            ->method('getServer')
-            ->with('HTTP_REFERER')
+        $this->redirect
+            ->method('getRefererUrl')
+            ->with()
             ->willReturn($referer);
         $this->request
-            ->expects($this->exactly(3))
             ->method('getParam')
             ->willReturnMap(
                 [
@@ -398,12 +399,6 @@ public function testExecuteCanNotSaveWishlistAndWithRedirect()
             ->willReturn($item);
 
         $this->request
-            ->expects($this->once())
-            ->method('getServer')
-            ->with('HTTP_REFERER')
-            ->willReturn($referer);
-        $this->request
-            ->expects($this->exactly(3))
             ->method('getParam')
             ->willReturnMap(
                 [
diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
index be31cb8f8d0c5..4954712e5ff3b 100644
--- a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type\AbstractType;
-use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 use Magento\Framework\App\ViewInterface;
 use Magento\Framework\Pricing\Render;
 use Magento\Wishlist\Block\Customer\Sidebar;
@@ -24,19 +24,22 @@
 class WishlistTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Wishlist */
-    protected $model;
+    private $model;
 
     /** @var Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistHelperMock;
+    private $wishlistHelperMock;
 
     /** @var Sidebar|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sidebarMock;
+    private $sidebarMock;
 
     /** @var Image|\PHPUnit_Framework_MockObject_MockObject */
-    protected $catalogImageHelperMock;
+    private $catalogImageHelperMock;
 
     /** @var ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $viewMock;
+    private $viewMock;
+
+    /** @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    private $itemResolver;
 
     protected function setUp()
     {
@@ -60,11 +63,16 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->catalogImageHelperMock);
 
+        $this->itemResolver = $this->createMock(
+            ItemResolverInterface::class
+        );
+
         $this->model = new Wishlist(
             $this->wishlistHelperMock,
             $this->sidebarMock,
             $imageHelperFactory,
-            $this->viewMock
+            $this->viewMock,
+            $this->itemResolver
         );
     }
 
@@ -93,7 +101,7 @@ public function testGetSectionData()
             'items' => [
                 [
                     'image' => [
-                        'template' => 'Magento_Catalog/product/image',
+                        'template' => 'Magento_Catalog/product/image_with_borders',
                         'src' => $imageUrl,
                         'alt' => $imageLabel,
                         'width' => $imageWidth,
@@ -162,6 +170,10 @@ public function testGetSectionData()
             ->method('getProduct')
             ->willReturn($productMock);
 
+        $this->itemResolver->expects($this->once())
+            ->method('getFinalProduct')
+            ->willReturn($productMock);
+
         $this->catalogImageHelperMock->expects($this->once())
             ->method('init')
             ->with($productMock, 'wishlist_sidebar_block', [])
@@ -237,11 +249,11 @@ public function testGetSectionData()
 
         $this->wishlistHelperMock->expects($this->once())
             ->method('getAddToCartParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemAddParams);
         $this->wishlistHelperMock->expects($this->once())
             ->method('getRemoveParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemRemoveParams);
 
         $this->assertEquals($result, $this->model->getSectionData());
@@ -278,7 +290,7 @@ public function testGetSectionDataWithTwoItems()
             'items' => [
                 [
                     'image' => [
-                        'template' => 'Magento_Catalog/product/image',
+                        'template' => 'Magento_Catalog/product/image_with_borders',
                         'src' => $imageUrl,
                         'alt' => $imageLabel,
                         'width' => $imageWidth,
@@ -296,7 +308,7 @@ public function testGetSectionDataWithTwoItems()
                 ],
                 [
                     'image' => [
-                        'template' => 'Magento_Catalog/product/image',
+                        'template' => 'Magento_Catalog/product/image_with_borders',
                         'src' => $imageUrl,
                         'alt' => $imageLabel,
                         'width' => $imageWidth,
@@ -359,6 +371,10 @@ public function testGetSectionDataWithTwoItems()
             ->method('getProduct')
             ->willReturn($productMock);
 
+        $this->itemResolver->expects($this->exactly(2))
+            ->method('getFinalProduct')
+            ->willReturn($productMock);
+
         $this->catalogImageHelperMock->expects($this->exactly(2))
             ->method('init')
             ->with($productMock, 'wishlist_sidebar_block', [])
@@ -435,11 +451,11 @@ public function testGetSectionDataWithTwoItems()
 
         $this->wishlistHelperMock->expects($this->exactly(2))
             ->method('getAddToCartParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemAddParams);
         $this->wishlistHelperMock->expects($this->exactly(2))
             ->method('getRemoveParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemRemoveParams);
 
         $this->assertEquals($result, $this->model->getSectionData());
diff --git a/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php b/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php
index cc456197a7a14..8fd514796d949 100644
--- a/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php
@@ -87,7 +87,7 @@ public function testCollect()
         $this->button->collect($productMock, $productRendererMock);
     }
 
-    public function testCollectEmptyExtnsionAttributes()
+    public function testCollectEmptyExtensionAttributes()
     {
         $productRendererMock = $this->getMockBuilder(ProductRenderInterface::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php b/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
index a6bad262948af..1769306172aab 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
@@ -248,6 +248,7 @@ public function testGetAddToCartParams()
         $expected = [
             'item' => $wishlistItemId,
             'qty' => $wishlistItemQty,
+            ActionInterface::PARAM_NAME_URL_ENCODED => '',
         ];
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
@@ -333,7 +334,7 @@ public function testGetRemoveParams()
 
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
-            ->with($url, ['item' => $wishlistItemId])
+            ->with($url, ['item' => $wishlistItemId, ActionInterface::PARAM_NAME_URL_ENCODED => ''])
             ->willReturn($url);
 
         $this->assertEquals($url, $this->model->getRemoveParams($this->wishlistItem));
@@ -402,13 +403,13 @@ public function testGetSharedAddToCartUrl()
             ->with('wishlist/shared/cart')
             ->willReturn($url);
 
-        $exptected = [
+        $expected = [
             'item' => $wishlistItemId,
             'qty' => $wishlistItemQty,
         ];
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
-            ->with($url, $exptected)
+            ->with($url, $expected)
             ->willReturn($url);
 
         $this->assertEquals($url, $this->model->getSharedAddToCartUrl($this->wishlistItem));
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
index 95e65a1740b72..9876b3f6bb75e 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
@@ -172,6 +172,9 @@ public function testRemoveOptionByCode($code, $option)
         $this->assertTrue($actualOption->isDeleted());
     }
 
+    /**
+     * @return array
+     */
     public function getOptionsDataProvider()
     {
         $optionMock = $this->getMockBuilder(\Magento\Wishlist\Model\Item\Option::class)
@@ -299,7 +302,8 @@ public function testSetAndSaveItemOptions()
 
     public function testGetProductWithException()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, __('Cannot specify product.'));
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('Cannot specify product.');
         $this->model->getProduct();
     }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
index 145d282554634..6cac17aa8c3da 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
@@ -60,6 +60,9 @@ public function testProcess($qtyResult, $expectedResult)
         $this->assertEquals($expectedResult, $this->processor->process($qty));
     }
 
+    /**
+     * @return array
+     */
     public function processDataProvider()
     {
         return [
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
index 98d36dea28a2a..85f6c504457d3 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
@@ -278,7 +278,7 @@ protected function processWishlistItemDescription($wishlistModelMock, $staticArg
 
     public function testIsAllowed()
     {
-        $this->scopeConfig->expects($this->once())->method('getValue')
+        $this->scopeConfig->expects($this->once())->method('isSetFlag')
             ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertTrue($this->model->isAllowed());
diff --git a/app/code/Magento/Wishlist/Test/Unit/Plugin/Ui/DataProvider/WishlistSettingsTest.php b/app/code/Magento/Wishlist/Test/Unit/Plugin/Ui/DataProvider/WishlistSettingsTest.php
new file mode 100644
index 0000000000000..aa3b956e12153
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Unit/Plugin/Ui/DataProvider/WishlistSettingsTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Unit\Plugin\Ui\DataProvider;
+
+use Magento\Catalog\Ui\DataProvider\Product\Listing\DataProvider;
+use Magento\Wishlist\Helper\Data;
+use Magento\Wishlist\Plugin\Ui\DataProvider\WishlistSettings;
+
+/**
+ * Covers \Magento\Wishlist\Plugin\Ui\DataProvider\WishlistSettings
+ */
+class WishlistSettingsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var WishlistSettings
+     */
+    private $wishlistSettings;
+
+    /**
+     * @var Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->helperMock = $this->createMock(Data::class);
+        $this->wishlistSettings = new WishlistSettings($this->helperMock);
+    }
+
+    /**
+     * Test afterGetData method
+     *
+     * @return void
+     */
+    public function testAfterGetData()
+    {
+        /** @var DataProvider|\PHPUnit_Framework_MockObject_MockObject $subjectMock */
+        $subjectMock = $this->createMock(DataProvider::class);
+        $result = [];
+        $isAllow = true;
+        $this->helperMock->expects($this->once())->method('isAllow')->willReturn(true);
+
+        $expected = ['allowWishlist' => $isAllow];
+        $actual = $this->wishlistSettings->afterGetData($subjectMock, $result);
+        self::assertEquals($expected, $actual);
+    }
+}
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index b6a887ec18b63..ce43f6faae200 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -5,28 +5,27 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/module-backend": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-rss": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-rss": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-configurable-product": "100.3.*",
-        "magento/module-downloadable": "100.3.*",
-        "magento/module-bundle": "100.3.*",
-        "magento/module-cookie": "100.3.*",
-        "magento/module-grouped-product": "100.3.*",
-        "magento/module-wishlist-sample-data": "Sample Data version:100.3.*"
+        "magento/module-configurable-product": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-bundle": "*",
+        "magento/module-cookie": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-wishlist-sample-data": "*"
     },
     "type": "magento2-module",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/system.xml b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
index 86c24bab11ffb..1e26a1195a7fe 100644
--- a/app/code/Magento/Wishlist/etc/adminhtml/system.xml
+++ b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
@@ -22,12 +22,12 @@
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
-                <field id="number_limit" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="number_limit" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Max Emails Allowed to be Sent</label>
                     <comment>10 by default. Max - 10000</comment>
                     <validate>validate-digits validate-digits-range digits-range-1-10000</validate>
                 </field>
-                <field id="text_limit" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="text_limit" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Email Text Length Limit</label>
                     <comment>255 by default</comment>
                     <validate>validate-digits validate-digits-range digits-range-1-10000</validate>
@@ -39,6 +39,10 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="show_in_sidebar" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Show in Sidebar</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="wishlist_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>My Wish List Link</label>
diff --git a/app/code/Magento/Wishlist/etc/config.xml b/app/code/Magento/Wishlist/etc/config.xml
index 1fec2d1baf9d4..6588c41a0a7dd 100644
--- a/app/code/Magento/Wishlist/etc/config.xml
+++ b/app/code/Magento/Wishlist/etc/config.xml
@@ -10,6 +10,7 @@
         <wishlist>
             <general>
                 <active>1</active>
+                <show_in_sidebar>1</show_in_sidebar>
             </general>
             <email>
                 <email_identity>general</email_identity>
diff --git a/app/code/Magento/Wishlist/etc/db_schema.xml b/app/code/Magento/Wishlist/etc/db_schema.xml
new file mode 100644
index 0000000000000..8a02f411ad0db
--- /dev/null
+++ b/app/code/Magento/Wishlist/etc/db_schema.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="wishlist" resource="default" engine="innodb" comment="Wishlist main Table">
+        <column xsi:type="int" name="wishlist_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Wishlist ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Customer ID"/>
+        <column xsi:type="smallint" name="shared" padding="5" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Sharing flag (0 or 1)"/>
+        <column xsi:type="varchar" name="sharing_code" nullable="true" length="32" comment="Sharing encrypted code"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Last updated date"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="wishlist_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="WISHLIST_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="wishlist"
+                    column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="WISHLIST_CUSTOMER_ID">
+            <column name="customer_id"/>
+        </constraint>
+        <index referenceId="WISHLIST_SHARED" indexType="btree">
+            <column name="shared"/>
+        </index>
+    </table>
+    <table name="wishlist_item" resource="default" engine="innodb" comment="Wishlist items">
+        <column xsi:type="int" name="wishlist_item_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Wishlist item ID"/>
+        <column xsi:type="int" name="wishlist_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Wishlist ID"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Product ID"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store ID"/>
+        <column xsi:type="timestamp" name="added_at" on_update="false" nullable="true" comment="Add date and time"/>
+        <column xsi:type="text" name="description" nullable="true" comment="Short description of wish list item"/>
+        <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false"
+                comment="Qty"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="wishlist_item_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="WISHLIST_ITEM_WISHLIST_ID_WISHLIST_WISHLIST_ID" table="wishlist_item"
+                    column="wishlist_id" referenceTable="wishlist" referenceColumn="wishlist_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="WISHLIST_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
+                    table="wishlist_item" column="product_id" referenceTable="catalog_product_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="WISHLIST_ITEM_STORE_ID_STORE_STORE_ID" table="wishlist_item"
+                    column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <index referenceId="WISHLIST_ITEM_WISHLIST_ID" indexType="btree">
+            <column name="wishlist_id"/>
+        </index>
+        <index referenceId="WISHLIST_ITEM_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="WISHLIST_ITEM_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+    </table>
+    <table name="wishlist_item_option" resource="default" engine="innodb" comment="Wishlist Item Option Table">
+        <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Option Id"/>
+        <column xsi:type="int" name="wishlist_item_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Wishlist Item Id"/>
+        <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Id"/>
+        <column xsi:type="varchar" name="code" nullable="false" length="255" comment="Code"/>
+        <column xsi:type="text" name="value" nullable="true" comment="Value"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="option_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="FK_A014B30B04B72DD0EAB3EECD779728D6" table="wishlist_item_option"
+                    column="wishlist_item_id" referenceTable="wishlist_item" referenceColumn="wishlist_item_id"
+                    onDelete="CASCADE"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/Wishlist/etc/db_schema_whitelist.json b/app/code/Magento/Wishlist/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..36a294f26e145
--- /dev/null
+++ b/app/code/Magento/Wishlist/etc/db_schema_whitelist.json
@@ -0,0 +1,55 @@
+{
+    "wishlist": {
+        "column": {
+            "wishlist_id": true,
+            "customer_id": true,
+            "shared": true,
+            "sharing_code": true,
+            "updated_at": true
+        },
+        "index": {
+            "WISHLIST_SHARED": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "WISHLIST_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "WISHLIST_CUSTOMER_ID": true
+        }
+    },
+    "wishlist_item": {
+        "column": {
+            "wishlist_item_id": true,
+            "wishlist_id": true,
+            "product_id": true,
+            "store_id": true,
+            "added_at": true,
+            "description": true,
+            "qty": true
+        },
+        "index": {
+            "WISHLIST_ITEM_WISHLIST_ID": true,
+            "WISHLIST_ITEM_PRODUCT_ID": true,
+            "WISHLIST_ITEM_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "WISHLIST_ITEM_WISHLIST_ID_WISHLIST_WISHLIST_ID": true,
+            "WISHLIST_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
+            "WISHLIST_ITEM_STORE_ID_STORE_STORE_ID": true
+        }
+    },
+    "wishlist_item_option": {
+        "column": {
+            "option_id": true,
+            "wishlist_item_id": true,
+            "product_id": true,
+            "code": true,
+            "value": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_A014B30B04B72DD0EAB3EECD779728D6": true,
+            "WISHLIST_ITEM_OPTION_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Wishlist/etc/frontend/di.xml b/app/code/Magento/Wishlist/etc/frontend/di.xml
index 00642b132bfdf..f28e85fff0a15 100644
--- a/app/code/Magento/Wishlist/etc/frontend/di.xml
+++ b/app/code/Magento/Wishlist/etc/frontend/di.xml
@@ -44,6 +44,12 @@
                         <item name="template" xsi:type="string">Magento_Wishlist::messages/addProductSuccessMessage.phtml</item>
                     </item>
                 </item>
+                <item name="removeWishlistItemSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Wishlist::messages/removeWishlistItemSuccessMessage.phtml</item>
+                    </item>
+                </item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Wishlist/etc/module.xml b/app/code/Magento/Wishlist/etc/module.xml
index e7626f504e1f1..c5ece20d7956b 100644
--- a/app/code/Magento/Wishlist/etc/module.xml
+++ b/app/code/Magento/Wishlist/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Wishlist" setup_version="2.0.1">
+    <module name="Magento_Wishlist" >
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
index 75d5a2e840102..a9acce448c80c 100644
--- a/app/code/Magento/Wishlist/i18n/en_US.csv
+++ b/app/code/Magento/Wishlist/i18n/en_US.csv
@@ -99,7 +99,9 @@ Back,Back
 "Email Template","Email Template"
 "Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "General Options","General Options"
 Enabled,Enabled
 "My Wish List Link","My Wish List Link"
@@ -116,4 +118,5 @@ Action,Action
 Configure,Configure
 Delete,Delete
 "Product Details and Comment","Product Details and Comment"
-"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
\ No newline at end of file
+"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
+"Show in Sidebar","Show in Sidebar"
diff --git a/app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml
index e80ef742079a4..5755b80f1def0 100644
--- a/app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml
+++ b/app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml
@@ -16,6 +16,20 @@
                     </item>
                 </item>
             </argument>
+            <argument name="configurable" xsi:type="array">
+                <item name="prices" xsi:type="array">
+                    <item name="wishlist_configured_price" xsi:type="array">
+                        <item name="render_template" xsi:type="string">Magento_Wishlist::product/price/configurable/configured_price.phtml</item>
+                    </item>
+                </item>
+            </argument>
+            <argument name="bundle" xsi:type="array">
+                <item name="prices" xsi:type="array">
+                    <item name="wishlist_configured_price" xsi:type="array">
+                        <item name="render_template" xsi:type="string">Magento_Wishlist::product/price/bundle/configured_price.phtml</item>
+                    </item>
+                </item>
+            </argument>
         </arguments>
     </referenceBlock>
 </layout>
diff --git a/app/code/Magento/Wishlist/view/base/templates/product/price/bundle/configured_price.phtml b/app/code/Magento/Wishlist/view/base/templates/product/price/bundle/configured_price.phtml
new file mode 100644
index 0000000000000..260dd5a24396a
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/base/templates/product/price/bundle/configured_price.phtml
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php
+/** @var \Magento\Catalog\Pricing\Render\ConfiguredPriceBox $block */
+$schema = ($block->getZone() == 'item_view');
+$idSuffix = $block->getIdSuffix() ?: '';
+?>
+<?php if ($block->hasSpecialPrice()) : ?>
+    <p class="price-as-configured">
+        <span class="special-price">
+            <?= /* @noEscape */ $block->renderAmount(
+                $block->getConfiguredPrice()->getAmount(),
+                [
+                    'display_label'     => $block->escapeHtml(__('Special Price')),
+                    'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                    'price_type'        => 'finalPrice',
+                    'include_container' => true,
+                    'schema' => $schema,
+                ]
+            ); ?>
+        </span>
+        <span class="old-price">
+            <?= /* @noEscape */ $block->renderAmount(
+                $block->getConfiguredRegularPrice()->getAmount(),
+                [
+                    'display_label'     => $block->escapeHtml(__('Regular Price')),
+                    'price_id'          => $block->escapeHtml($block->getPriceId('old-price-' . $idSuffix)),
+                    'price_type'        => 'oldPrice',
+                    'include_container' => true,
+                    'skip_adjustments'  => true,
+                ]
+            ); ?>
+        </span>
+    </p>
+<?php else : ?>
+    <?php
+    $priceLabel = ($block->getPriceLabel() !== null)
+        ? $block->getPriceLabel()
+        : '';
+    ?>
+    <p class="price-as-configured">
+        <?= /* @noEscape */ $block->renderAmount(
+            $block->getConfiguredPrice()->getAmount(),
+            [
+                'display_label'     => $block->escapeHtml($priceLabel),
+                'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                'price_type'        => 'finalPrice',
+                'include_container' => true,
+                'schema' => $schema,
+            ]
+        ); ?>
+    </p>
+<?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/base/templates/product/price/configurable/configured_price.phtml b/app/code/Magento/Wishlist/view/base/templates/product/price/configurable/configured_price.phtml
new file mode 100644
index 0000000000000..f9517a106a79a
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/base/templates/product/price/configurable/configured_price.phtml
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php
+/** @var \Magento\Wishlist\Pricing\Render\ConfiguredPriceBox $block */
+$schema = ($block->getZone() == 'item_view');
+$idSuffix = $block->getIdSuffix() ?: '';
+/** @var \Magento\Wishlist\Pricing\ConfiguredPrice\ConfigurableProduct $configuredPrice */
+$configuredPrice = $block->getPrice();
+$configuredRegularAmountValue = $configuredPrice->getConfiguredRegularAmount()->getValue();
+?>
+<?php if ($block->hasSpecialPrice()
+    && $configuredRegularAmountValue
+    && $configuredPrice->getConfiguredAmount()->getValue() !== $configuredRegularAmountValue) : ?>
+    <p class="price-as-configured">
+        <span class="special-price">
+            <?= /* @noEscape */ $block->renderAmount(
+                $configuredPrice->getConfiguredAmount(),
+                [
+                    'display_label'     => $block->escapeHtml(__('Special Price')),
+                    'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                    'price_type'        => 'finalPrice',
+                    'include_container' => true,
+                    'schema' => $schema,
+                ]
+            ); ?>
+        </span>
+        <span class="old-price">
+            <?= /* @noEscape */ $block->renderAmount(
+                $configuredPrice->getConfiguredRegularAmount(),
+                [
+                    'display_label'     => $block->escapeHtml(__('Regular Price')),
+                    'price_id'          => $block->escapeHtml($block->getPriceId('old-price-' . $idSuffix)),
+                    'price_type'        => 'oldPrice',
+                    'include_container' => true,
+                    'skip_adjustments'  => true,
+                ]
+            ); ?>
+        </span>
+    </p>
+<?php else : ?>
+    <?php
+    $priceLabel = ($block->getPriceLabel() !== null)
+        ? $block->getPriceLabel()
+        : '';
+    ?>
+    <p class="price-as-configured">
+        <?= /* @noEscape */ $block->renderAmount(
+            $configuredPrice->getAmount(),
+            [
+                'display_label'     => $block->escapeHtml($priceLabel),
+                'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                'price_type'        => 'finalPrice',
+                'include_container' => true,
+                'schema' => $schema,
+            ]
+        ); ?>
+    </p>
+<?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
index f655c7034fe6a..c4f0d01707b20 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -18,7 +18,7 @@
             </block>
         </referenceBlock>
         <referenceContainer name="sidebar.additional">
-            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml"/>
+            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
index 7bb186ef2ce03..3ba1c66e991ca 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
@@ -7,8 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="root">
-            <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
-        </referenceContainer>
+        <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
     </body>
 </page>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 9ea0d1a823235..848c6a76393f8 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -11,6 +11,7 @@
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
 $product = $item->getProduct();
+$allowedQty = $block->getMinMaxQty();
 ?>
 <?php foreach ($block->getChildNames() as $childName): ?>
     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
@@ -21,7 +22,7 @@ $product = $item->getProduct();
         <div class="field qty">
             <label class="label" for="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
-                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
+                <input type="number" data-role="qty" id="qty[<?= /* @noEscape */ $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true, 'validate-item-quantity':{'minAllowed':<?= /* @noEscape */ $allowedQty['minAllowed'] ?>,'maxAllowed':<?= /* @noEscape */ $allowedQty['maxAllowed'] ?>}}"
                name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>">
             </div>
         </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
index 1008f5f377df5..2eb4664991e99 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
@@ -13,5 +13,5 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <a class="product-item-photo" tabindex="-1" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
-    <?= $block->getImage($product, 'wishlist_thumbnail')->toHtml() ?>
+    <?= $block->getImage($block->getProductForThumbnail($item), 'wishlist_thumbnail')->toHtml() ?>
 </a>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
index c2172afab94de..ef02768c46a83 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -19,7 +19,7 @@ $columns = $block->getColumns();
             <li data-row="product-item" class="product-item" id="item_<?= $block->escapeHtmlAttr($item->getId()) ?>">
                 <div class="product-item-info" data-container="product-grid">
                     <?php foreach ($columns as $column): ?>
-                        <?php $column->setItem($item); echo $column->toHtml($item);?>
+                        <?= $column->setItem($item)->toHtml();?>
                     <?php endforeach; ?>
                 </div>
             </li>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
new file mode 100644
index 0000000000000..1196b8fec4a21
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+
+<?= $block->escapeHtml(__('%1 has been removed from your Wish List.', $block->getData('product_name'))); ?>
+
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 00fb87b411fe0..84b607adb6362 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -31,7 +31,7 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
                             <div class="product-item-details">
                                 <strong class="product-item-name">
                                     <a data-bind="attr: { href: product_url }" class="product-item-link">
-                                        <span data-bind="text: product_name"></span>
+                                        <span data-bind="html: product_name"></span>
                                     </a>
                                 </strong>
                                 <div data-bind="html: product_price"></div>
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 7ce934317263b..cab130f7c2104 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -63,12 +63,6 @@ define([
                 isFileUploaded = false,
                 self = this;
 
-            if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
-                this._updateAddToWishlistButton({});
-                event.stopPropagation();
-
-                return;
-            }
             $(event.handleObj.selector).each(function (index, element) {
                 if ($(element).is('input[type=text]') ||
                     $(element).is('input[type=email]') ||
@@ -89,9 +83,7 @@ define([
                 }
             });
 
-            if (isFileUploaded) {
-                this.bindFormSubmit();
-            }
+            this.bindFormSubmit(isFileUploaded);
             this._updateAddToWishlistButton(dataToAdd);
             event.stopPropagation();
         },
@@ -195,34 +187,45 @@ define([
 
         /**
          * Bind form submit.
+         *
+         * @param {Boolean} isFileUploaded
          */
-        bindFormSubmit: function () {
+        bindFormSubmit: function (isFileUploaded) {
             var self = this;
 
             $('[data-action="add-to-wishlist"]').on('click', function (event) {
                 var element, params, form, action;
 
-                event.stopPropagation();
-                event.preventDefault();
+                if (!$($(self.options.qtyInfo).closest('form')).valid()) {
+                    event.stopPropagation();
+                    event.preventDefault();
 
-                element = $('input[type=file]' + self.options.customOptionsInfo);
-                params = $(event.currentTarget).data('post');
-                form = $(element).closest('form');
-                action = params.action;
-
-                if (params.data.id) {
-                    $('<input>', {
-                        type: 'hidden',
-                        name: 'id',
-                        value: params.data.id
-                    }).appendTo(form);
+                    return;
                 }
 
-                if (params.data.uenc) {
-                    action += 'uenc/' + params.data.uenc;
-                }
+                if (isFileUploaded) {
 
-                $(form).attr('action', action).submit();
+                    element = $('input[type=file]' + self.options.customOptionsInfo);
+                    params = $(event.currentTarget).data('post');
+                    form = $(element).closest('form');
+                    action = params.action;
+
+                    if (params.data.id) {
+                        $('<input>', {
+                            type: 'hidden',
+                            name: 'id',
+                            value: params.data.id
+                        }).appendTo(form);
+                    }
+
+                    if (params.data.uenc) {
+                        action += 'uenc/' + params.data.uenc;
+                    }
+
+                    $(form).attr('action', action).submit();
+                    event.stopPropagation();
+                    event.preventDefault();
+                }
             });
         }
     });
diff --git a/app/code/Magento/WishlistAnalytics/LICENSE.txt b/app/code/Magento/WishlistAnalytics/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/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/WishlistAnalytics/LICENSE_AFL.txt b/app/code/Magento/WishlistAnalytics/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/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/WishlistAnalytics/README.md b/app/code/Magento/WishlistAnalytics/README.md
new file mode 100644
index 0000000000000..999fc835626da
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/README.md
@@ -0,0 +1,3 @@
+# Magento_WishlistAnalytics module
+
+The Magento_WishlistAnalytics module configures data definitions for a data collection related to the Wishlist module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE.txt b/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/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/WishlistAnalytics/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/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/WishlistAnalytics/Test/Mftf/README.md b/app/code/Magento/WishlistAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ec5f69c59bac7
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Wishlist Analytics Functional Tests
+
+The Functional Test Module for **Magento Wishlist Analytics** module.
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
new file mode 100644
index 0000000000000..fc69afe2907ab
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-wishlist-analytics",
+    "description": "N/A",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-wishlist": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\WishlistAnalytics\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/WishlistAnalytics/etc/analytics.xml b/app/code/Magento/WishlistAnalytics/etc/analytics.xml
new file mode 100644
index 0000000000000..0b2531fe0df67
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/etc/analytics.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
+    <file name="wishlists">
+        <providers>
+            <reportProvider name="wishlists" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>wishlists</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+    <file name="wishlist_items">
+        <providers>
+            <reportProvider name="wishlist_items" class="Magento\Analytics\ReportXml\ReportProvider">
+                <parameters>
+                    <name>wishlist_items</name>
+                </parameters>
+            </reportProvider>
+        </providers>
+    </file>
+</config>
diff --git a/app/code/Magento/WishlistAnalytics/etc/module.xml b/app/code/Magento/WishlistAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..4acd600b66a7b
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/etc/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_WishlistAnalytics" >
+        <sequence>
+            <module name="Magento_Wishlist"/>
+            <module name="Magento_Analytics"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/WishlistAnalytics/etc/reports.xml b/app/code/Magento/WishlistAnalytics/etc/reports.xml
new file mode 100644
index 0000000000000..0125fa93f815a
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/etc/reports.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
+    <report name="wishlists" connection="default">
+        <source name="wishlist">
+            <attribute name="wishlist_id"/>
+            <attribute name="customer_id"/>
+        </source>
+    </report>
+    <report name="wishlist_items" connection="default">
+        <source name="wishlist_item">
+            <attribute name="wishlist_item_id"/>
+            <attribute name="added_at"/>
+            <attribute name="qty"/>
+            <attribute name="store_id"/>
+            <attribute name="wishlist_id"/>
+            <attribute name="product_id"/>
+        </source>
+    </report>
+</config>
diff --git a/app/code/Magento/WishlistAnalytics/registration.php b/app/code/Magento/WishlistAnalytics/registration.php
new file mode 100644
index 0000000000000..eacf1e0d78bcb
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_WishlistAnalytics',
+    __DIR__
+);
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
new file mode 100644
index 0000000000000..65c8498fc89ad
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver;
+
+use Magento\CatalogGraphQl\Model\ProductDataProvider;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Wishlist\Model\Item;
+
+/**
+ * Fetches the Product data according to the GraphQL schema
+ */
+class ProductResolver implements ResolverInterface
+{
+    /**
+     * @var ProductDataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @param ProductDataProvider $productDataProvider
+     */
+    public function __construct(ProductDataProvider $productDataProvider)
+    {
+        $this->productDataProvider = $productDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('Missing key "model" in Wishlist Item value data'));
+        }
+        /** @var Item $wishlistItem */
+        $wishlistItem = $value['model'];
+
+        return $this->productDataProvider->getProductDataById((int)$wishlistItem->getProductId());
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
new file mode 100644
index 0000000000000..dfbbf6543f66f
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistItemCollectionFactory;
+use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\Wishlist;
+
+/**
+ * Fetches the Wishlist Items data according to the GraphQL schema
+ */
+class WishlistItemsResolver implements ResolverInterface
+{
+    /**
+     * @var WishlistItemCollectionFactory
+     */
+    private $wishlistItemCollectionFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param WishlistItemCollectionFactory $wishlistItemCollectionFactory
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        WishlistItemCollectionFactory $wishlistItemCollectionFactory,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->wishlistItemCollectionFactory = $wishlistItemCollectionFactory;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('Missing key "model" in Wishlist value data'));
+        }
+        /** @var Wishlist $wishlist */
+        $wishlist = $value['model'];
+
+        $wishlistItems = $this->getWishListItems($wishlist);
+
+        $data = [];
+        foreach ($wishlistItems as $wishlistItem) {
+            $data[] = [
+                'id' => $wishlistItem->getId(),
+                'qty' => $wishlistItem->getData('qty'),
+                'description' => $wishlistItem->getDescription(),
+                'added_at' => $wishlistItem->getAddedAt(),
+                'model' => $wishlistItem,
+            ];
+        }
+        return $data;
+    }
+
+    /**
+     * Get wishlist items
+     *
+     * @param Wishlist $wishlist
+     * @return Item[]
+     */
+    private function getWishListItems(Wishlist $wishlist): array
+    {
+        /** @var WishlistItemCollection $wishlistItemCollection */
+        $wishlistItemCollection = $this->wishlistItemCollectionFactory->create();
+        $wishlistItemCollection
+            ->addWishlistFilter($wishlist)
+            ->addStoreFilter(array_map(function (StoreInterface $store) {
+                return $store->getId();
+            }, $this->storeManager->getStores()))
+            ->setVisibilityFilter();
+        return $wishlistItemCollection->getItems();
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
new file mode 100644
index 0000000000000..e3a788af2ea7e
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\WishlistFactory;
+
+/**
+ * Fetches the Wishlist data according to the GraphQL schema
+ */
+class WishlistResolver implements ResolverInterface
+{
+    /**
+     * @var WishlistResourceModel
+     */
+    private $wishlistResource;
+
+    /**
+     * @var WishlistFactory
+     */
+    private $wishlistFactory;
+
+    /**
+     * @param WishlistResourceModel $wishlistResource
+     * @param WishlistFactory $wishlistFactory
+     */
+    public function __construct(WishlistResourceModel $wishlistResource, WishlistFactory $wishlistFactory)
+    {
+        $this->wishlistResource = $wishlistResource;
+        $this->wishlistFactory = $wishlistFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $customerId = $context->getUserId();
+
+        /** @var Wishlist $wishlist */
+        $wishlist = $this->wishlistFactory->create();
+        $this->wishlistResource->load($wishlist, $customerId, 'customer_id');
+
+        if (null === $wishlist->getId()) {
+            return [];
+        }
+
+        return [
+            'sharing_code' => $wishlist->getSharingCode(),
+            'updated_at' => $wishlist->getUpdatedAt(),
+            'items_count' => $wishlist->getItemsCount(),
+            'name' => $wishlist->getName(),
+            'model' => $wishlist,
+        ];
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/README.md b/app/code/Magento/WishlistGraphQl/README.md
new file mode 100644
index 0000000000000..9121593e6a759
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/README.md
@@ -0,0 +1,4 @@
+# WishlistGraphQl
+
+**WishlistGraphQl** provides type information for the GraphQl module
+to generate wishlist fields.
diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
new file mode 100644
index 0000000000000..630ee97acc2eb
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/module-wishlist-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-store": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\WishlistGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/etc/module.xml b/app/code/Magento/WishlistGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..337623cc85a92
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_WishlistGraphQl" />
+</config>
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..f5b5034fb734f
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -0,0 +1,22 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    wishlist: WishlistOutput @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistResolver") @doc(description: "The wishlist query returns the contents of a customer's wish list")
+}
+
+type WishlistOutput {
+    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @doc(description: "An array of items in the customer's wish list"),
+    items_count: Int @doc(description: "The number of items in the wish list"),
+    name: String @doc(description: "When multiple wish lists are enabled, the name the customer assigns to the wishlist"),
+    sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list"),
+    updated_at: String @doc(description: "The time of the last modification to the wish list")
+}
+
+type WishlistItem {
+    id: Int @doc(description: "The wish list item ID")
+    qty: Float @doc(description: "The quantity of this wish list item"),
+    description: String @doc(description: "The customer's comment about this item"),
+    added_at: String @doc(description: "The time when the customer added the item to the wish list"),
+    product: ProductInterface @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\ProductResolver")
+}
\ No newline at end of file
diff --git a/app/code/Magento/WishlistGraphQl/registration.php b/app/code/Magento/WishlistGraphQl/registration.php
new file mode 100644
index 0000000000000..c5d468421f96e
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/registration.php
@@ -0,0 +1,10 @@
+<?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_WishlistGraphQl', __DIR__);
diff --git a/app/design/adminhtml/Magento/backend/Magento_Analytics/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Analytics/web/css/source/_module.less
index db29bfcaf6355..6d21462d753ca 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Analytics/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Analytics/web/css/source/_module.less
@@ -83,91 +83,42 @@
 //  Modal on dashboard
 //  ---------------------------------------------
 
-.advanced-reports-decline-subscription-modal,
 .advanced-reports-subscription-modal {
     .modal-inner-wrap {
-        max-width: 80rem;
-    }
-}
+        margin-top: 13rem;
+        max-width: 75rem;
 
-.advanced-reports-subscription-modal {
-    .admin__fieldset {
-        padding: 0;
-    }
-}
+        .modal-content,
+        .modal-header {
+            padding-left: 4rem;
+            padding-right: 4rem;
 
-.advanced-reports-decline-subscription-modal {
-    .advanced-reports-subscription-text {
-        margin-bottom: 0;
+            .action-close {
+                display: none;
+            }
+        }
     }
 
-    .modal-content {
-        padding-bottom: 0;
+    .admin__fieldset {
+        padding: 0;
     }
 }
 
 .advanced-reports-subscription-text {
     line-height: @line-height__xl;
-
-    .list {
-        .lib-list-reset-styles(@_margin: @indent__m 0, @_padding: 0);
-
-        li {
-            padding-left: @indent__l;
-            position: relative;
-
-            &:before {
-                content: '\2022';
-                left: 1rem;
-                position: absolute;
-            }
-
-            + li {
-                margin-top: @indent__m;
-            }
-        }
-    }
+    padding-bottom: 8rem;
 }
 
-.advanced-reports-subscription-actions {
-    font-size: 0;
-    text-align: justify;
-
-    &:after {
-        content: '';
-        display: inline-block;
-        height: 0;
-        overflow: hidden;
-        visibility: hidden;
-        width: 100%;
-    }
-
-    .action-basic,
-    .action-additional {
-        &:extend(.abs-action-l all);
-    }
-
-    .advanced-reports-subscription-postpone,
-    .advanced-reports-subscription-disable,
-    .advanced-reports-subscription-enable {
-        display: inline-block;
-        vertical-align: top;
-    }
+.advanced-reports-subscription-close {
+    display: block;
+    float: right;
 }
 
-.advanced-reports-subscription-enable {
-    .admin__field {
-        max-width: 22rem;
-    }
-
-    .admin__field-label {
-        font-size: @font-size__s;
-        line-height: @line-height__l;
-    }
-
-    .action-basic {
-        &:extend(.abs-action-primary all);
-        margin-bottom: @indent__s;
+.advanced-reports-subscription-modal {
+    h1:first-of-type {
+        background: url("Magento_Analytics::images/analytics-icon.svg") no-repeat;
+        background-size: 55px 49.08px;
+        padding: 1.5rem 0 2rem 7rem;
     }
 }
 
@@ -176,17 +127,44 @@
 //  _____________________________________________
 
 .config-additional-comment {
-  border-color: @color-gray80;
-  border-style: solid;
-  border-width: 1px 0;
-  margin: @indent__l 0;
-  padding: @indent__m;
+    border-color: @color-gray80;
+    border-style: solid;
+    border-width: 1px 0;
+    margin: @indent__l 0;
+    padding: @indent__m;
 }
 
 .config-additional-comment-title {
-  margin-bottom: @indent__xs;
+    margin-bottom: @indent__xs;
 }
 
 .config-additional-comment-content {
-  line-height: @line-height__l;
+    line-height: @line-height__l;
+}
+
+.config-vertical-title {
+    clear: both;
+    color: rgb(48, 48, 48);
+    font-size: 1.7rem;
+    font-weight: 600;
+    letter-spacing: .025em;
+    padding: 1.9rem 2.8rem 1.9rem 0;
+    position: relative;
+}
+
+.config-vertical-comment {
+    line-height: 1.5;
+    margin-bottom: .5em;
+    margin-top: 1rem;
+}
+
+/**
+ * @codingStandardsIgnoreStart
+ */
+#row_analytics_general_vertical {
+    >td.config-vertical-label {
+        >label.admin__field-label {
+            padding-right: 0;
+        }
+    }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Analytics/web/images/analytics-icon.svg b/app/design/adminhtml/Magento/backend/Magento_Analytics/web/images/analytics-icon.svg
new file mode 100644
index 0000000000000..fde91d775d444
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Analytics/web/images/analytics-icon.svg
@@ -0,0 +1,84 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="120px"
+	 height="105px" viewBox="0 0 120 105" enable-background="new 0 0 120 105" xml:space="preserve">
+<g id="Layer_1" display="none">
+	<rect x="2.904" y="27.946" display="inline" fill="#F06524" width="113.745" height="12.408"/>
+	<path display="inline" fill="#636667" d="M95.811,85.511c-0.753-2.551-1.775-5.013-3.059-7.344
+		c-0.207-0.387-0.134-0.884,0.191-1.208c2.857-2.869,2.857-7.489,0.013-10.346l-3.649-3.686c-2.873-2.86-7.493-2.86-10.348-0.016
+		c-0.334,0.336-0.828,0.409-1.228,0.193c-2.321-1.271-4.785-2.295-7.337-3.047c-0.419-0.126-0.714-0.525-0.712-0.979
+		c0.004-1.947-0.766-3.812-2.139-5.187c-1.37-1.377-3.233-2.148-5.176-2.148h-5.184c-4.039,0-7.312,3.274-7.312,7.314
+		c0.001,0.464-0.294,0.863-0.728,0.993c-2.537,0.747-5.002,1.771-7.335,3.051c-0.391,0.213-0.882,0.143-1.199-0.178
+		c-1.377-1.381-3.236-2.15-5.176-2.15c-1.938,0-3.799,0.77-5.168,2.143l-3.688,3.744c-2.833,2.845-2.833,7.465,0.011,10.321
+		c0.336,0.336,0.41,0.835,0.191,1.24c-1.269,2.312-2.294,4.772-3.045,7.324c-0.487,1.657,0.46,3.396,2.117,3.885
+		c1.658,0.487,3.396-0.46,3.884-2.117c0.624-2.12,1.475-4.164,2.538-6.101c1.544-2.863,1.027-6.375-1.262-8.653
+		c-0.405-0.407-0.405-1.082,0.009-1.497l3.686-3.742c0.181-0.182,0.449-0.291,0.727-0.291c0.279,0,0.545,0.109,0.743,0.307
+		c2.271,2.289,5.794,2.805,8.634,1.253c1.944-1.065,3.993-1.918,6.115-2.541c3.105-0.933,5.213-3.781,5.2-7.005
+		C56.126,58.473,56.6,58,57.184,58h5.184c0.281,0,0.55,0.112,0.75,0.31c0.199,0.2,0.309,0.471,0.309,0.752
+		c-0.012,3.217,2.098,6.065,5.185,6.992c2.138,0.631,4.187,1.482,6.129,2.545c2.854,1.546,6.369,1.026,8.646-1.269
+		c0.403-0.401,1.075-0.401,1.492,0.015l3.639,3.675c0.42,0.424,0.42,1.098,0.007,1.515c-2.283,2.265-2.802,5.783-1.261,8.628
+		c1.071,1.952,1.922,3.997,2.545,6.116c0.489,1.657,2.228,2.604,3.886,2.116C95.351,88.907,96.297,87.169,95.811,85.511z"/>
+	<path display="inline" fill="#636667" d="M118.29,1.486C117.337,0.536,116.046,0,114.7,0H4.843
+		C2.035,0.014-0.224,2.283-0.224,5.076v89.103c-0.006,1.334,0.524,2.629,1.475,3.584c0.951,0.955,2.244,1.492,3.592,1.492h109.851
+		c1.35,0.005,2.645-0.529,3.6-1.484c0.955-0.954,1.49-2.254,1.482-3.605V5.076C119.776,3.73,119.243,2.439,118.29,1.486z
+		 M113.521,6.255v18.564H6.032V6.255H113.521z M41.2,93c1.493-8.922,9.23-15.729,18.576-15.729c9.348,0,17.083,6.808,18.576,15.729
+		H41.2z M84.673,93c-1.542-12.39-12.089-21.984-24.896-21.984C46.97,71.016,36.422,80.61,34.879,93H6.032V31.074h107.49V93H84.673z"
+		/>
+	<path display="inline" fill="#636667" d="M21.661,19.955c-1.204,1.203-2.836,1.879-4.539,1.879c-3.545,0-6.419-2.873-6.419-6.418
+		s2.874-6.418,6.419-6.418s6.418,2.873,6.418,6.418C23.541,17.118,22.865,18.751,21.661,19.955z"/>
+	<circle display="inline" fill="#636667" cx="31.611" cy="15.416" r="6.418"/>
+	<path display="inline" fill="#636667" d="M52.518,15.416c-0.009,3.545-2.873,6.408-6.418,6.418c-3.545,0-6.419-2.873-6.419-6.418
+		s2.874-6.418,6.419-6.418C49.645,8.998,52.518,11.871,52.518,15.416z"/>
+</g>
+<g id="Layer_2" display="none">
+	<g display="inline">
+		<path fill="#F06725" d="M99.814,64.673V46.052h13.125v18.621H99.814z M120,64.673v43.361H92.758V64.673H120z"/>
+		<rect y="50.855" fill="#F06725" width="9.017" height="57.181"/>
+		<path fill="#F06725" d="M53.04,108.034V55.046h16.718v52.988H53.04z M58.535,55.046V44.188h5.724v10.858H58.535z"/>
+		<rect x="18.373" y="30.743" fill="#646767" width="3.105" height="4.451"/>
+		<rect x="29.501" y="30.743" fill="#646767" width="3.105" height="4.451"/>
+		<rect x="40.586" y="30.743" fill="#646767" width="3.104" height="4.451"/>
+		<rect x="18.373" y="43.411" fill="#646767" width="3.105" height="4.503"/>
+		<rect x="29.501" y="43.411" fill="#646767" width="3.105" height="4.503"/>
+		<rect x="40.609" y="43.411" fill="#646767" width="3.104" height="4.503"/>
+		<rect x="18.373" y="56.082" fill="#646767" width="3.105" height="4.5"/>
+		<rect x="29.501" y="56.082" fill="#646767" width="3.105" height="4.5"/>
+		<rect x="40.609" y="56.082" fill="#646767" width="3.104" height="4.5"/>
+		<rect x="18.373" y="68.752" fill="#646767" width="3.105" height="4.501"/>
+		<rect x="29.501" y="68.752" fill="#646767" width="3.105" height="4.501"/>
+		<rect x="40.609" y="68.752" fill="#646767" width="3.104" height="4.501"/>
+		<rect x="18.373" y="81.422" fill="#646767" width="3.105" height="4.491"/>
+		<rect x="29.501" y="81.422" fill="#646767" width="3.105" height="4.491"/>
+		<rect x="40.586" y="81.422" fill="#646767" width="3.104" height="4.491"/>
+		<rect x="18.373" y="94.091" fill="#646767" width="3.105" height="4.504"/>
+		<rect x="29.501" y="94.091" fill="#646767" width="3.105" height="4.504"/>
+		<rect x="40.609" y="94.091" fill="#646767" width="3.104" height="4.504"/>
+		<path fill="#646767" d="M94.309,106.481V55.761h-4.378V33.247h-7.132V16.168h-3.105v17.079h-7.112v22.514h-4.378v50.721h-13.61
+			V19.75h-8.655V9.006h-8.859V0H24.977v9.006h-8.859V19.75H7.483v86.731H0v3.104h7.483h47.109h13.61h26.105H120v-3.104H94.309z
+			 M75.687,36.353h11.139V55.74H75.687V36.353z M28.082,3.105h5.892v5.9h-5.892V3.105z M19.221,12.11h5.756h12.102h5.754v7.64
+			H19.221V12.11z M10.588,106.481V22.854h5.53h29.82h5.548v83.627H10.588z M71.309,106.481V58.868h19.896v47.613H71.309z"/>
+	</g>
+</g>
+<g id="Layer_3">
+	<path fill="#636768" d="M2.66,104.889h112.106c1.47,0,2.66-1.194,2.66-2.662c0-1.473-1.19-2.663-2.66-2.663H2.66
+		c-1.471,0-2.661,1.19-2.661,2.663C0,103.694,1.189,104.889,2.66,104.889z"/>
+	<rect x="2.66" y="52.421" fill="#F06725" width="12.314" height="39.343"/>
+	<rect x="102.453" y="31.996" fill="#F06725" width="12.313" height="59.768"/>
+	<rect x="35.928" y="31.25" fill="#F06725" width="12.315" height="60.514"/>
+	<rect x="69.187" y="50.168" fill="#F06725" width="12.323" height="41.596"/>
+	<circle fill="#F06725" cx="42.038" cy="11.39" r="3.76"/>
+	<circle fill="#F06725" cx="108.608" cy="12.135" r="3.76"/>
+	<path fill="#656668" d="M108.61,0.744c-6.28,0-11.387,5.11-11.387,11.389c0,0.877,0.107,1.729,0.293,2.55l-16.983,9.726
+		c-1.392-1.221-3.194-1.988-5.187-1.988c-1.931,0-3.681,0.728-5.054,1.882L53.252,13.614c0.145-0.722,0.222-1.464,0.222-2.227
+		C53.474,5.109,48.364,0,42.085,0c-6.281,0-11.39,5.109-11.39,11.391c0,1.168,0.178,2.296,0.508,3.36l-18.246,11.1
+		c-1.208-0.748-2.617-1.202-4.138-1.202c-4.363,0-7.913,3.549-7.913,7.911c0,4.361,3.549,7.911,7.913,7.911
+		c2.113,0,4.101-0.823,5.593-2.317c1.492-1.493,2.315-3.48,2.315-5.593c0-0.881-0.177-1.712-0.444-2.504l17.646-10.733
+		c2.07,2.129,4.959,3.457,8.156,3.457c3.601,0,6.81-1.684,8.9-4.301l16.61,10.419c-0.086,0.463-0.146,0.938-0.146,1.422
+		c-0.003,4.353,3.534,7.899,7.889,7.908h0.004c4.361,0,7.913-3.55,7.913-7.917c-0.003-0.43-0.063-0.841-0.128-1.251l16.774-9.605
+		c2.085,2.485,5.217,4.069,8.71,4.069c6.28,0,11.388-5.11,11.388-11.39C119.998,5.855,114.889,0.744,108.61,0.744z M10.648,34.389
+		c-0.488,0.49-1.139,0.758-1.83,0.758c-1.427,0-2.587-1.161-2.587-2.587c0-1.427,1.16-2.588,2.587-2.588
+		c1.426,0,2.587,1.161,2.587,2.588C11.405,33.25,11.137,33.901,10.648,34.389z M42.085,17.456c-3.345,0-6.065-2.721-6.065-6.065
+		c0-3.345,2.723-6.068,6.065-6.068c3.343,0,6.066,2.723,6.066,6.068C48.151,14.733,45.43,17.456,42.085,17.456z M75.347,32.903
+		c-1.418-0.001-2.571-1.16-2.571-2.58c0-1.419,1.157-2.576,2.578-2.578c1.421,0,2.578,1.155,2.578,2.569
+		C77.928,31.742,76.771,32.902,75.347,32.903z M108.61,18.2c-3.345,0-6.066-2.723-6.066-6.065c0-3.344,2.722-6.066,6.066-6.066
+		c3.344,0,6.066,2.723,6.066,6.066C114.677,15.478,111.954,18.2,108.61,18.2z"/>
+</g>
+</svg>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
index da16bde107673..337d63369b160 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <meta name="robots" content="NOINDEX,NOFOLLOW"/>
         <css src="jquery/jstree/themes/default/style.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
index 6937855492263..c4bed53dcbe80 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
@@ -14,7 +14,7 @@
     display: inline-block;
     vertical-align: top;
     width: 100%;
-    background-color: #fff;
+    background-color: @color-white;
     border: 1px solid #ada89e;
     border-radius: 2px;
 
@@ -54,7 +54,6 @@
 .search-global-field .mage-suggest {
     position: static;
     display: block;
-    vertical-align: baseline;
     width: auto;
     background-color: transparent;
     border: none;
@@ -72,7 +71,7 @@
     top: 100%;
     margin: 1px -1px 0 -1px;
     border: 1px solid #cac2b5;
-    background: #fff;
+    background: @color-white;
     box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
     z-index: 990;
 
@@ -121,7 +120,7 @@
         }
 
         .mage-suggest-selected > a {
-            color: #000;
+            color: @color-black;
             background: #F1FFEB;
         }
     }
@@ -177,7 +176,7 @@
         }
 
         &:before {
-            display: inline-block;
+            display: block;
             float: right;
             margin-left: 4px;
             font-size: 13px;
@@ -229,7 +228,7 @@
 
         > input.ui-autocomplete-loading,
         > input.mage-suggest-state-loading {
-            background: #fff url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
+            background: @color-white url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
         }
     }
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less
index f6e922fccb8c7..5ae2a458ad40d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less
@@ -19,3 +19,4 @@
 @import 'module/pages/_dashboard.less';
 @import 'module/pages/_login.less';
 @import 'module/pages/_cache-management.less';
+@import 'module/pages/_access-denied.less';
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
index 2958708e51deb..0244775fad0b6 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
@@ -25,7 +25,7 @@
     border-top: @footer__border-width solid @footer__border-color;
     color: @footer__color;
     margin-top: auto;
-    padding: 2.6rem 2rem 6rem 3rem;
+    padding: 2.6rem 3rem 6rem;
 
     a {
         .lib-link(
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index 8825f4ea3f5a2..d0b17b3439d66 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -15,9 +15,9 @@
 
 @menu__background-color: @color-very-dark-grayish-orange;
 
-@menu-logo__padding-bottom: 2.2rem;
+@menu-logo__padding-bottom: 1.7rem;
 @menu-logo__outer-size: @menu-logo__padding-top + @menu-logo-img__height + @menu-logo__padding-bottom;
-@menu-logo__padding-top: 1.2rem;
+@menu-logo__padding-top: 1.7rem; 
 @menu-logo-img__height: 4.1rem;
 @menu-logo-img__width: 3.5rem;
 
@@ -187,12 +187,12 @@
         display: block;
     }
 
-    // External link marker
+    //  External link marker
     [target='_blank'] {
         &:after {
             &:extend(.abs-icon all);
             content: @icon-external-link__content;
-            font-size: 0.5rem;
+            font-size: .5rem;
             margin-left: @indent__xs;
             vertical-align: super;
         }
@@ -263,7 +263,6 @@
             visibility: hidden;
             z-index: @submenu__z-index - 1;
 
-            .ie10 &,
             .ie11 & {
                 height: 100%;
             }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less
index c9c97930297cb..40ebb6f3c4569 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less
@@ -97,9 +97,11 @@
         display: inline-block;
         font-size: @notifications__font-size;
         font-weight: @font-weight__bold;
+        height: 18px;
         left: 50%;
         margin-left: .3em;
         margin-top: -1.1em;
+        min-width: 18px;
         padding: .3em .5em;
         position: absolute;
         top: 50%;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
index 5e65faec60d4e..ddc3cb455402b 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
@@ -153,7 +153,7 @@
     background-color: transparent;
     border: 1px solid transparent;
     font-size: @search-global-input__font-size;
-    height: @search-global-input__height;
+    height: @search-global-input__height + .2;
     padding: @search-global-input__padding-top @search-global-input__padding-side @search-global-input__padding-bottom;
     position: absolute;
     right: 0;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
index 07050c1e5111d..08434727ccc9c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
@@ -44,7 +44,6 @@
 
 .page-actions {
     @_page-action__indent: 1.3rem;
-    float: right;
 
     .page-main-actions & {
         &._fixed {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 6420738c6fb9b..e8e2746717e6a 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -127,6 +127,21 @@
                 }
             }
         }
+
+        td.admin__collapsible-block-wrapper {
+            .admin__collapsible-title {
+                &:before {
+                    content: @icon-expand-open__content;
+                }
+            }
+            &._show {
+                .admin__collapsible-title {
+                    &:before {
+                        content: @icon-expand-close__content;
+                    } 
+                }
+            }
+        }
     }
 
     &.fieldset-wrapper {
@@ -147,6 +162,11 @@
     &.collapsible-block-wrapper-last {
         border-bottom: 0;
     }
+    .admin__dynamic-rows.admin__control-collapsible {   
+        .admin__collapsible-block-wrapper {
+            border-bottom: none;
+        }
+    }
 }
 
 .admin__collapsible-content {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
index 2ae0f3d2430bb..ad407160034ac 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
@@ -7,13 +7,13 @@
 //  Main elements -> Actions bar -> Store Switcher
 //  _____________________________________________
 
-//  ToDo UI: Consist old styles, should be changed with new design
+//  ToDo UI:  Consist old styles, should be changed with new design
 
 .store-switcher {
-    color: @text__color; // ToDo UI: Delete with admin scope
+    color: @text__color;
     float: left;
     font-size: round(@font-size__base - .1rem, 1);
-    margin-top: .7rem;
+    margin-top: .59rem;
 
     .admin__action-dropdown {
         background-color: @page-main-actions__background-color;
@@ -42,6 +42,14 @@
         max-height: 250px;
         overflow-y: auto;
         padding-top: .25em;
+        &::-webkit-scrollbar {
+            -webkit-appearance: none;
+            width: 7px;
+        }
+        &::-webkit-scrollbar-thumb {
+            background-color: rgba(0, 0, 0, .5);
+            border-radius: 4px;
+        }
 
         li {
             border: 0;
@@ -231,7 +239,6 @@
 
     .store-switcher-label {
         display: inline-block;
-        margin-top: @indent__s;
     }
 }
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_access-denied.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_access-denied.less
new file mode 100644
index 0000000000000..8597dac7147de
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_access-denied.less
@@ -0,0 +1,34 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+// Access Error Page
+// ---------------------------------------------
+
+.access-denied-hr {
+  height: 0.2rem;
+  border: 0;
+  box-shadow: 0 10px 10px -10px #b4b3b3 inset;
+}
+
+.access-denied-page {
+  margin: 3.5rem 0 10rem 0;
+
+  h2 {
+    margin-bottom: 3rem;
+  }
+
+  ul {
+    li {
+      font-size: @font-size__s;
+      margin: 2rem 0 2rem 3rem;
+
+      span {
+        font-size: @font-size__base;
+        margin-left: 1rem;
+      }
+    }
+  }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
index 97ed1d8cdb1ec..e7f4c41de9750 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
@@ -49,10 +49,6 @@
         position: relative;
         width: 100%;
         z-index: 1;
-
-        .ie9 & {
-            margin-top: 10%;
-        }
     }
 
     :-ms-input-placeholder {
@@ -84,7 +80,7 @@
     }
 
     .messages {
-        margin-top: 0.5rem;
+        margin-top: .5rem;
 
         + form .admin__legend {
             display: none;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png
index d9395c938cbff..0cca183e08da2 100644
Binary files a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png and b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png differ
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
index eefbc11201d9c..2074106e719db 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
@@ -53,7 +53,7 @@
     }
 
     .attribute-change-checkbox {
-        background: #fff;
+        background: @color-white;
         display: block;
         margin-top: 5px;
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
index 865ece970465d..73e1bcf4a7d58 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
@@ -16,7 +16,7 @@
     );
 
     .action.toggle {
-        background: #fff;
+        background: @color-white;
         border-radius: 0 1px 1px 0;
         border: 1px solid #ada89e;
         height: 33px;
@@ -58,7 +58,7 @@
         .action.toggle {
             padding: 0 3px;
             border: 1px solid #b7b2a7;
-            background: #fff;
+            background: @color-white;
             border-radius: 0 1px 1px 0;
             border-left: none;
             height: 50px;
@@ -121,7 +121,7 @@
             width: auto;
 
             .addafter {
-                background: #fff;
+                background: @color-white;
                 border-width: 1px 0 1px 1px;
                 direction: ltr;
                 height: 33px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less
index 0c33b8d3b8a02..659b1fa811db1 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less
+++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less
@@ -10,18 +10,39 @@
 @currency-addon-symbol__border-color: @field-control__border-color;
 @currency-addon-symbol__color: @color-gray52;
 @currency-addon-symbol__height: @field-control__height;
-@currency-addon-symbol__width: 1.6rem;
+@currency-addon-symbol__width: 2.6rem;
+
 
 //
 //  Common
 //  _____________________________________________
 
 .currency-addon {
+    border: 1px solid rgb(173,173,173);
     position: relative;
+    display: -webkit-inline-flex;
+    display: -ms-inline-flexbox;
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    display: inline-flex;
+    flex-flow: row nowrap;
+    width: 100%;
 
     .admin__control-text {
-        border-width: 1px 1px 1px 0;
-        padding-left: @currency-addon-symbol__width + .2;
+        -ms-flex-order: 1;
+        -webkit-appearance: none;
+        -webkit-flex-grow: 1;
+        -webkit-flex-shrink: 1;
+        -webkit-order: 1;
+        appearance: none;
+        background-color: transparent;
+        border-color: transparent;
+        box-shadow: none;
+        flex-grow: 1;
+        flex-shrink: 1;
+        order: 1;
+        vertical-align: top;
 
         &:focus {
             + .currency-symbol {
@@ -30,18 +51,29 @@
         }
     }
 
+    label.error {
+        left: 0;
+        position: absolute;
+        top: 33px;
+    }
+
     .currency-symbol {
+        -webkit-flex-basis: auto;
+        -webkit-flex-grow: 0;
+        -webkit-flex-shrink: 0;
         border: solid @currency-addon-symbol__border-color;
-        border-width: 0 0 0 1px;
+        border-width: 0;
         box-sizing: border-box;
         color: @currency-addon-symbol__color;
+        flex-basis: auto;
+        flex-grow: 0;
+        flex-shrink: 0;
         height: @currency-addon-symbol__height;
-        left: 0;
+        order: 0;
         padding: 7px 0 0 @indent__xs;
-        position: absolute;
-        top: 0;
+        position: static;
         transition: @smooth__border-color;
-        width: @currency-addon-symbol__width;
+        z-index: 1;
     }
 
     ._error & {
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 cf3bc385f844a..35dae432a6c4f 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 {
+            display: block;
+            float: right;
+        }
+    }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
index a80cc9a5163f8..c8f2530df22e0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less
@@ -3,14 +3,77 @@
 //  * See COPYING.txt for license details.
 //  */
 
-//  General rule hides group legend and shows first field label instead
-//  in app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
-//  This must be reset for Customer Address page
-.address-item-edit-content {
+.customer_form_areas_address_address_customer_address_update_modal_update_customer_address_form_loader {
     .admin__field {
-        legend {
-            &.admin__field-label {
-                opacity: 1;
+        .admin__field {
+            .admin__field-label {
+                background: none;
+            }
+        }
+    }
+}
+
+.customer-address-form {
+
+    *,
+    *:after,
+    *:before {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+    }
+
+    address {
+        font-style: normal;
+    }
+
+    .customer-default-address-wrapper {
+        align-items: flex-start;
+        display: flex;
+        float: left;
+        position: relative;
+        width: 50%;
+
+        .action-additional {
+            margin: 2px 0 0 2px;
+        }
+    }
+
+    .edit-default-billing-address-button,
+    .edit-default-shipping-address-button {
+        position: absolute;
+    }
+
+    .edit-default-billing-address-button {
+        left: 210px;
+    }
+
+    .edit-default-shipping-address-button {
+        left: 230px;
+    }
+
+    .customer_form_areas_address_address_customer_address_listing {
+        clear: both;
+    }
+
+    .add-new-address-button {
+        clear: both;
+        float: right;
+        margin-bottom: 30px;
+        position: relative;
+    }
+
+    .address-information {
+        float: left;
+        margin-bottom: 20px;
+
+        address {
+            float: left;
+
+            .address_caption {
+                font-size: 18px;
+                font-weight: bold;
+                margin-bottom: 16px;
             }
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
index 0eba6b0d361f8..3a7b6d30c914d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
@@ -299,7 +299,7 @@
 .invitee_information .data-table tbody tr th,
 .inviter_information .data-table tbody tr td,
 .inviter_information .data-table tbody tr th {
-    background-color: #fff;
+    background-color: @color-white;
     border: 0;
     color: #666;
     padding: 9px 10px 10px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_GiftRegistry/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_GiftRegistry/web/css/source/_module-old.less
index 6b0d73299d903..3e1a1b9cf9be9 100644
--- a/app/design/adminhtml/Magento/backend/Magento_GiftRegistry/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_GiftRegistry/web/css/source/_module-old.less
@@ -7,7 +7,3 @@
 //  Stores -> Gift Registry
 //  ---------------------------------------------
 
-.eq-ie9 [class^=' adminhtml-giftregistry-'] .custom-options .data-table {
-    table-layout: auto;
-    word-wrap: normal;
-}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less
index 6afe96c7f9ef8..92a08eb7909c4 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less
@@ -15,22 +15,12 @@
         .lib-vendor-prefix-display(flex);
         .lib-vendor-prefix-flex-direction(row);
         .lib-vendor-prefix-flex-wrap(wrap);
-
-        .ie9 & {
-            word-spacing: -.45rem;
-        }
     }
 
     .partner {
         margin-bottom: @indent__xl;
         padding: 0 @indent__m;
         width: 100% / 3;
-
-        .ie9 & {
-            display: inline-block;
-            vertical-align: top;
-            word-spacing: normal;
-        }
     }
 }
 
@@ -61,7 +51,7 @@
 }
 
 .partners-footer {
-    .magento-connect-logo {
+    .magento-marketplace-logo {
         float: right;
         margin-bottom: 1px;
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less
new file mode 100644
index 0000000000000..6f1e4224fa7a5
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less
@@ -0,0 +1,119 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Magento_ReleaseNotification Modal on dashboard
+//  ---------------------------------------------
+
+.release-notification-modal {
+    -webkit-transition: visibility 0s .5s, opacity .5s ease;
+    transition: visibility 0s .5s, opacity .5s ease;
+
+    &._show {
+        -webkit-transition: opacity .5s ease;
+        opacity: 1;
+        transition: opacity .5s ease;
+        visibility: visible;
+    }
+
+    .modal-inner-wrap {
+        .modal-content,
+        .modal-header {
+            padding-left: 4rem;
+            padding-right: 4rem;
+
+            .action-close {
+                display: none;
+            }
+        }
+
+        -webkit-transform: translateX(0);
+        -webkit-transition: -webkit-transform 0s;
+        height: 50rem;
+        transition: transform 0s;
+        transform: translateX(0);
+        margin-top: 13rem;
+        max-width: 75rem;
+    }
+
+    .admin__fieldset {
+        padding: 0;
+    }
+}
+
+.release-notification-title-with-image {
+    background-repeat: no-repeat;
+    background-size: 55px 49.08px;
+    padding: 1.5rem 0 2rem 7rem;
+}
+
+.release-notification-text {
+    line-height: @line-height__l;
+
+    ul {
+        margin: 2rem 0 2rem 0;
+
+        li {
+            font-size: @font-size__xs;
+            margin: 1.5rem 0 1.5rem 2rem;
+
+            span {
+                font-size: @font-size__base;
+                vertical-align: middle;
+                position: relative;
+                left: 1rem;
+            }
+        }
+    }
+}
+
+.release-notification-button-next,
+.release-notification-button-back {
+    bottom: 4rem;
+    display: block;
+    float: right;
+    position: absolute;
+}
+
+.release-notification-button-next {
+    .lib-button-as-link();
+    font-weight: 400;
+    right: 4rem;
+}
+
+.release-notification-button-back {
+    .lib-button-as-link();
+    font-weight: 400;
+    left: 4rem;
+}
+
+.highlight-item {
+    h3 {
+        margin: 0;
+
+        span {
+            font-size: @font-size__s;
+            font-style: @font-style__emphasis;
+            font-weight: @font-weight__light;
+        }
+    }
+
+    background-size: 65px 58px;
+    background-repeat: no-repeat;
+    padding: 0 0 2rem 8.5rem;
+    margin-left: 1rem;
+}
+
+.highlight-item-no-image {
+    padding: 0 0 2rem 0;
+
+    h3 {
+        margin: 0;
+    }
+}
+
+.hide-release-notification {
+    display: none;
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 984556816b035..1e76679f594c1 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -55,7 +55,6 @@
     }
 
     .order-billing-address,
-    .order-billing-method,
     .order-history,
     .order-information,
     .order-payment-method,
@@ -65,7 +64,6 @@
     }
 
     .order-shipping-address,
-    .order-shipping-method,
     .order-totals,
     .order-view-account-information .order-account-information {
         float: right;
@@ -300,38 +298,4 @@
     }
 }
 
-//  ToDo UI: review the collapsible block
-//.order-subtotal {
-//    .summary-collapse {
-//        cursor: pointer;
-//        display: inline-block;
-//        &:before {
-//            @iconsize: 16px;
-//
-//            -webkit-font-smoothing: antialiased;
-//            background: #f2ebde;
-//            border-radius: 2px;
-//            border: 1px solid #ada89e;
-//            color: #816063;
-//            content: '+';
-//            display: inline-block;
-//            font-size: @iconsize;
-//            font-style: normal;
-//            font-weight: normal;
-//            height: @iconsize;
-//            line-height: @iconsize;
-//            margin-right: 7px;
-//            overflow: hidden;
-//            speak: none;
-//            text-indent: 0;
-//            vertical-align: top;
-//            width: @iconsize;
-//        }
-//        &:hover:before {
-//            background: #cac3b4;
-//        }
-//    }
-//    &.show-details .summary-collapse:before {
-//        content: '\e03a';
-//    }
-//}
+//  ToDo: MAGETWO-32299 UI: review the collapsible block
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
index 1e40fe1fa3403..029594625ed1c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
@@ -9,6 +9,7 @@
 
 .admin__payment-method-wrapper {
     margin: 0;
+    width: calc(50% - @indent__l);
     .admin__field {
         margin-left: 0;
         &:first-child {
@@ -34,6 +35,7 @@
     margin: 0;
 }
 
+.order-billing-method-summary,
 .order-shipping-method-summary {
     padding-top: @field-option__padding-top;
 }
@@ -43,6 +45,7 @@
     position: relative;
 }
 
+.order-billing-method-summary,
 .order-shipping-method-summary,
 .order-shipping-method-info {
     .action-default {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
index a71731320c5ce..3e1f4e75031d2 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
@@ -1,5 +1,5 @@
 // /**
-//  * Copyright © 2015 Magento. All rights reserved.
+//  * Copyright © Magento, Inc. All rights reserved.
 //  * See COPYING.txt for license details.
 //  */
 
@@ -366,7 +366,7 @@
     //  Generic data grid
     .admin__data-grid-outer-wrap {
         border-top: 1px solid @staging-preview-table-dark__border-color;
-        max-height: 400px; // ToDO: remove after JS adjustment implemented
+        max-height: 400px; // ToDO remove after JS adjustment implemented
         overflow-y: auto;
         padding: 15px @indent__s 0 0;
     }
@@ -730,15 +730,9 @@
                 top: @indent__l;
                 width: 1px;
 
-                .ie9 &,
-                .ie10 &,
                 .ie11 & {
                     height: 1000px;
                 }
-
-                .ie9 & {
-                    border-right: 1px dashed @staging-preview-table-lighten__border-color;
-                }
             }
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
index 17910d7c8e5b4..3756fe678a3c9 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
@@ -78,7 +78,7 @@
 
         &.ui-state-active {
             z-index: 2;
-            background: #FFF;
+            background: @color-white;
             padding: 1px (@spacing-m - 1px);
             border: 2px solid #eb5202;
             margin: -1px;
@@ -180,14 +180,14 @@
     .lib-clearfix();
 
     [data-part=left] {
-        display: inline-block;
+        display: block;
         width: 45%;
         float: left;
         text-align: left;
     }
 
     [data-part=right] {
-        display: inline-block;
+        display: block;
         width: 45%;
         text-align: right;
         float: right;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index 9480161248d15..d55608ade4a05 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -59,18 +59,6 @@
         margin-top: -(@data-grid-spinner__size / 2);
         position: absolute;
         top: 50%;
-
-        .ie9 & {
-            background: url('@{baseDir}images/loader-2.gif') 50% 50% no-repeat;
-            bottom: 0;
-            height: 149px;
-            left: 0;
-            margin: auto;
-            position: absolute;
-            right: 0;
-            top: 0;
-            width: 218px;
-        }
     }
 }
 
@@ -236,7 +224,7 @@ body._in-resize {
 
     th,
     td {
-        font-size: @data-grid__font-size; // ToDo UI: Rewrite old styles. Should be deleted afterwards
+        font-size: @data-grid__font-size; // Rewrite old styles. Should be deleted afterwards
         line-height: @line-height__base;
         transition: @smooth__background-color;
         vertical-align: top;
@@ -304,7 +292,7 @@ body._in-resize {
         .action-menu {
             left: auto;
             min-width: 10rem;
-            right: auto;
+            right: 0;
             text-align: left;
             top: auto;
             z-index: 1;
@@ -999,10 +987,6 @@ body._in-resize {
                 transform: rotate(45deg);
                 width: 1.6rem;
                 z-index: 3;
-
-                .ie9 & {
-                    display: none;
-                }
             }
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-bookmarks.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-bookmarks.less
index dfaf340f90b6c..f9c93dce57002 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-bookmarks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-bookmarks.less
@@ -132,10 +132,6 @@
             font-size: @action-dropdown-menu__font-size;
             min-width: 15rem;
             width: ~'calc(100% - 4rem)';
-
-            .ie9 & {
-                width: 15rem;
-            }
         }
 
         .action-dropdown-menu-item-actions {
diff --git a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
index 909935e1f8ea8..1cd867efdd13b 100644
--- a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
@@ -68,7 +68,7 @@
 
             a {
                 color: @color-gray85;
-                display: inline-block;
+                display: block;
                 float: left;
                 text-decoration: none;
             }
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index a7497d174c421..d03a4c1950c5f 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-theme",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
index c535047e37682..0049022204619 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
@@ -93,7 +93,7 @@
     }
 }
 
-//  ToDo UI: Only right tooltip arrow is styled, if we will neeed more need to add another ones
+//  ToDo UI: Only right tooltip arrow is styled, if we will need more need to add another ones
 
 .tooltip {
     &.top {
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less
index d337514224b87..2c60af8dfa178 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less
@@ -73,12 +73,6 @@
         cursor: default;
         opacity: @disabled__opacity;
         pointer-events: none;
-
-        .ie9 & {
-            background-color: @btn__base__disabled__background-color;
-            opacity: 1;
-            text-shadow: none;
-        }
     }
 }
 
@@ -99,8 +93,8 @@
     background-color: transparent;
     border: none;
     color: @link__color;
-    font-family: @btn__base__font-size;
-    font-size: 1.5rem; // ToDo UI: Check font-size and standardize
+    font-family: @font-family__base;
+    font-size: @base__font-size;
 
     &:hover,
     &:active,
@@ -135,22 +129,6 @@
         );
         color: @btn-prime__color;
     }
-
-    //  Disabled state for IE9
-    &[disabled],
-    &.disabled {
-        .ie9 & {
-            background-color: @btn-prime__disabled__background-color;
-        }
-
-        &:hover,
-        &:active {
-            .ie9 & {
-                background-color: @btn-prime__disabled__background-color;
-                filter: none;
-            }
-        }
-    }
 }
 
 .btn-secondary {
@@ -167,21 +145,6 @@
         background-color: @btn-secondary__active__background-color;
         color: @btn-secondary__color;
     }
-
-    //  Disabled state for IE9
-    &[disabled],
-    &.disabled {
-        .ie9 & {
-            background-color: @btn-secondary__disabled__background-color;
-        }
-
-        &:active {
-            .ie9 & {
-                background-color: @btn-secondary__disabled__background-color;
-                filter: none;
-            }
-        }
-    }
 }
 
 //
@@ -239,26 +202,6 @@
                 left: 1px;
             }
         }
-
-        //  Disabled state for IE9
-        &[disabled],
-        &.disabled {
-            &:after {
-                .ie9 & {
-                    border-color: transparent transparent transparent @btn__base__disabled__background-color;
-                }
-            }
-
-            &:focus,
-            &:hover,
-            &:active {
-                &:after {
-                    .ie9 & {
-                        border-left-color: @btn__base__disabled__background-color;
-                    }
-                }
-            }
-        }
     }
 
     .btn-prime {
@@ -285,25 +228,6 @@
                 left: 1px;
             }
         }
-
-        //  Disabled state for IE9
-        &[disabled],
-        &.disabled {
-            &:after {
-                .ie9 & {
-                    border-color: transparent transparent transparent @btn-prime__disabled__background-color;
-                }
-            }
-
-            &:hover,
-            &:active {
-                &:after {
-                    .ie9 & {
-                        border-left-color: @btn-prime__disabled__background-color;
-                    }
-                }
-            }
-        }
     }
 }
 
@@ -342,25 +266,6 @@
                 right: 1px;
             }
         }
-
-        //  Disabled state for IE9
-        &[disabled],
-        &.disabled {
-            &:after {
-                .ie9 & {
-                    border-color: transparent @btn__base__disabled__background-color transparent transparent;
-                }
-            }
-
-            &:hover,
-            &:active {
-                &:after {
-                    .ie9 & {
-                        border-right-color: @btn__base__disabled__background-color;
-                    }
-                }
-            }
-        }
     }
 
     .btn-prime {
@@ -387,25 +292,6 @@
                 right: 1px;
             }
         }
-
-        //  Disabled state for IE9
-        &[disabled],
-        &.disabled {
-            &:after {
-                .ie9 & {
-                    border-color: transparent @btn-prime__disabled__background-color transparent transparent;
-                }
-            }
-
-            &:hover,
-            &:active {
-                &:after {
-                    .ie9 & {
-                        border-right-color: @btn-prime__disabled__background-color;
-                    }
-                }
-            }
-        }
     }
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less
index 44b6a1568ef9b..82a6f7b2f19bd 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less
@@ -87,7 +87,7 @@
 .form-el-checkbox {
     &:checked {
         + .form-label {
-            &::before {
+            &:before {
                 content: @checkbox-icon__content;
                 font-family: @icons__font-family;
             }
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less
index 7e5d34e48892a..76973802a3d2e 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less
@@ -47,10 +47,6 @@
         top: 0;
         width: @select-check__size;
         z-index: -2;
-
-        .ie9 & {
-            display: none;
-        }
     }
 
     &:before {
@@ -66,10 +62,6 @@
         top: 50%;
         width: 0;
         z-index: -1;
-
-        .ie9 & {
-            display: none;
-        }
     }
 
     .form-el-select {
@@ -82,11 +74,6 @@
         padding: @form-el__padding-top ~'calc(@{select-check__size} + 10%)' @form-el__padding-bottom @form-el__padding-side;
         width: 110%;
 
-        .ie9 & {
-            padding-right: @form-el__padding-side;
-            width: 100%;
-        }
-
         &::-ms-expand {
             display: none;
         }
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less
index 2e8f06c091265..283054e015fc5 100644
--- a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less
@@ -22,8 +22,8 @@
     vertical-align: middle;
     width: @component-indicator__size;
 
-    &::before,
-    &::after {
+    &:before,
+    &:after {
         background: @color-white;
         display: block;
         opacity: 0;
@@ -32,7 +32,7 @@
         visibility: hidden;
     }
 
-    &::before {
+    &:before {
         border: 1px solid @color-gray68;
         border-radius: 1px;
         box-shadow: 0 0 2px rgba(0,0,0,.4);
@@ -43,7 +43,7 @@
         padding: 4px 5px;
     }
 
-    &::after {
+    &:after {
         border-color: darken(@color-gray68, 8);
         border-style: solid;
         border-width: 1px 0 0 1px;
@@ -56,8 +56,8 @@
     }
 
     &:hover {
-        &::before,
-        &::after {
+        &:before,
+        &:after {
             opacity: 1;
             transition: opacity .2s linear;
             visibility: visible;
@@ -115,7 +115,7 @@
 
     &._tooltip {
         background: transparent;
-        margin: 0px 0px 8px 5px;
+        margin: 0 0 8px 5px;
 
         a {
             width: 21px;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 4377687fd3d39..886bbcc29a3b9 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -23,8 +23,15 @@
 }
 
 .abs-action-pattern {
+    &[disabled],
+    &.disabled {
+        cursor: default;
+        opacity: @disabled__opacity;
+        pointer-events: none;
+    }
+
     border: @button__border-size @button__border-style;
-    border-radius: 0; // ToDo UI: Delete with admin scope
+    border-radius: 0; // ToDo UI Delete with admin scope
     display: inline-block;
     font-family: @button__font-family;
     font-size: @button__font-size;
@@ -33,13 +40,6 @@
     padding: @button__padding-top @button__padding-horizontal @button__padding-bottom;
     text-align: center;
     vertical-align: baseline;
-
-    &[disabled],
-    &.disabled {
-        cursor: default;
-        opacity: @disabled__opacity;
-        pointer-events: none;
-    }
 }
 
 .abs-action-l {
@@ -142,16 +142,6 @@
                 box-shadow: @button__hover__box-shadow;
             }
         }
-
-        &[disabled],
-        &.disabled {
-            .ie9 &,
-            .ie10 & {
-                background-color: @button-triangle__base__disabled__background-color;
-                opacity: 1;
-                text-shadow: none;
-            }
-        }
     }
 }
 
@@ -182,17 +172,6 @@
                 border-left-color: @button__hover__background-color;
             }
         }
-
-        //  Disabled state for IE9, IE10
-        &.disabled,
-        &[disabled] {
-            &:after {
-                .ie9 &,
-                .ie10 & {
-                    border-color: transparent transparent transparent @button-triangle__base__disabled__background-color;
-                }
-            }
-        }
     }
 
     .action-primary {
@@ -238,17 +217,6 @@
                 border-right-color: @button__hover__background-color;
             }
         }
-
-        //  Disabled state for IE9, IE10
-        &.disabled,
-        &[disabled] {
-            &:after {
-                .ie9 &,
-                .ie10 & {
-                    border-color: transparent @button-triangle__base__disabled__background-color transparent transparent;
-                }
-            }
-        }
     }
 
     .action-primary {
@@ -433,7 +401,7 @@ button {
     left: 0;
     list-style: none;
     margin: 2px 0 0; // Action box-shadow + 1px indent
-    min-width: 0; // ToDo UI: Should be deleted with old styles
+    min-width: 0; // ToDo UI Should be deleted with old styles
     padding: 0;
     position: absolute;
     right: 0;
@@ -444,7 +412,7 @@ button {
     }
 
     > li {
-        border: none; // ToDo UI: Should be deleted with old styles
+        border: none; // ToDo UI Should be deleted with old styles
         display: block;
         padding: 0;
         transition: background-color .1s linear;
@@ -495,11 +463,6 @@ button {
         position: absolute;
         right: auto;
         top: auto;
-
-        .ie9 & {
-            margin-left: 99%;
-            margin-top: -3.5rem;
-        }
     }
 
     a {
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 ac80ba9ef90d9..f2e453cceffd5 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_components.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_components.less
@@ -20,4 +20,7 @@
 @import 'components/_media-gallery.less';
 @import 'components/_resizable-block.less';
 @import 'components/_file-uploader.less';
+@import 'components/_image-uploader.less';
 @import 'components/_slider.less';
+@import 'components/_url_input.less';
+@import 'components/_color-picker.less';
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_reset.less b/app/design/adminhtml/Magento/backend/web/css/source/_reset.less
index 3a2847c82b8ce..51de756bff16c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_reset.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_reset.less
@@ -12,6 +12,7 @@ html {
     -ms-text-size-adjust: 100%;
     -webkit-text-size-adjust: 100%;
     box-sizing: border-box;
+    text-size-adjust: 100%;
 }
 
 * {
@@ -87,8 +88,6 @@ template {
 //  ---------------------------------------------
 
 a {
-    background-color: transparent; // Remove the gray background color from active links in IE 10.
-
     //  Improve readability when focused and also mouse hovered in all browsers.
     &:active,
     &:hover {
@@ -107,7 +106,7 @@ abbr {
     }
 }
 
-//  Address style set to 'bolder' in Firefox 4+, Safari, and Chrome.
+//  Address style set to 'bolder' in Firefox 4 and later, Safari, and Chrome.
 b,
 strong {
     font-weight: bold;
@@ -206,9 +205,9 @@ input,
 optgroup,
 select,
 textarea {
-    color: inherit; // Correct color not being inherited. Known issue: affects color of disabled elements.
+    color: inherit; // Correct color not being inherited. Known issue affects color of disabled elements.
     font: inherit; // Correct font properties not being inherited.
-    margin: 0; // Address margins set differently in Firefox 4+, Safari, and Chrome.
+    margin: 0; // Address margins set differently in Firefox 4 and later, Safari, and Chrome.
 }
 
 //  Address 'overflow' set to 'hidden' in IE 8/9/10/11.
@@ -234,6 +233,7 @@ html input[type='button'],
 input[type='reset'],
 input[type='submit'] {
     -webkit-appearance: button;
+    appearance: button;
     cursor: pointer;
 }
 
@@ -243,7 +243,7 @@ html input[disabled] {
     cursor: default;
 }
 
-//  Remove inner padding and border in Firefox 4+.
+//  Remove inner padding and border in Firefox 4 and later.
 button,
 input {
     &::-moz-focus-inner {
@@ -252,7 +252,7 @@ input {
     }
 }
 
-//  Address Firefox 4+ setting 'line-height' on 'input' using '!important' in the UA stylesheet.
+//  Address Firefox 4 and later setting 'line-height' on 'input' using '!important' in the UA stylesheet.
 input {
     line-height: normal;
 }
@@ -275,6 +275,7 @@ input[type='number'] {
 //  Address 'appearance' set to 'searchfield' in Safari and Chrome.
 input[type='search'] {
     -webkit-appearance: textfield;
+    appearance: textfield;
 }
 
 //  Remove inner padding and search cancel button in Safari and Chrome on OS X.
@@ -283,6 +284,7 @@ input[type='search'] {
     &::-webkit-search-cancel-button,
     &::-webkit-search-decoration {
         -webkit-appearance: none;
+        appearance: none;
     }
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_structure.less b/app/design/adminhtml/Magento/backend/web/css/source/_structure.less
index 098d43e25757e..a74642152ec33 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_structure.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_structure.less
@@ -36,6 +36,7 @@ body {
 //  ToDo UI: should be moved to messages
 .notices-wrapper {
     margin: 0 3rem;
+    min-height: 5rem;
     .messages {
         margin-bottom: 0;
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
index a2e6a4485cc02..cd089232412dc 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
@@ -168,6 +168,9 @@
     width: auto;
     z-index: 1;
 
+    /**
+     * @codingStandardsIgnoreStart
+     */
     &:hover {
         &:extend(.abs-form-control-pattern:hover);
     }
@@ -231,7 +234,6 @@
         border: 0;
         display: inline;
         margin: 0;
-        width: 6rem;
 
         body._keyfocus &:focus {
             box-shadow: none;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 213dd3d0f8e25..7b99d4f136d21 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -197,6 +197,14 @@
     margin-top: 1rem;
 }
 
+.admin__action-multiselect-empty-area {
+    color: @color-gray65-almost;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    text-align: center;
+    vertical-align: middle;
+}
+
 //  Multiselect inner menu
 .admin__action-multiselect-menu-inner {
     margin-bottom: 0;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-switcher.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-switcher.less
index fbef3f4b5f3a6..cf7a8dd56cb3b 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-switcher.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-switcher.less
@@ -130,7 +130,6 @@
         display: block;
         height: @actions-switcher__height;
         transition: background @actions-switcher-speed ease-in 0s;
-        vertical-align: middle;
         width: @actions-switcher__width;
         z-index: 0;
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_color-picker.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_color-picker.less
new file mode 100644
index 0000000000000..8acbfcd316df7
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_color-picker.less
@@ -0,0 +1,508 @@
+
+/***
+Spectrum Colorpicker v1.8.0
+https://github.com/bgrins/spectrum
+Author: Brian Grinstead
+License: MIT
+***/
+
+.colorpicker-spectrum {
+  display: none;
+}
+
+.colorpicker-input {
+  vertical-align: middle;
+  width: 50% !important;
+}
+
+.sp-container {
+  position:absolute;
+  margin-top: 2px;
+  top:0;
+  left:0;
+  display:inline-block;
+  *display: inline;
+  *zoom: 1;
+  /* https://github.com/bgrins/spectrum/issues/40 */
+  z-index: 9999994;
+  overflow: hidden;
+}
+.sp-container.sp-flat {
+  position: relative;
+}
+
+/* Fix for * { box-sizing: border-box; } */
+.sp-container,
+.sp-container * {
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+/* http://ansciath.tumblr.com/post/7347495869/css-aspect-ratio */
+.sp-top {
+  position:relative;
+  width: 100%;
+  display:inline-block;
+}
+.sp-top-inner {
+  position:absolute;
+  top:0;
+  left:0;
+  bottom:0;
+  right:0;
+}
+.sp-color {
+  position: absolute;
+  top:0;
+  left:0;
+  bottom:0;
+  right:20%;
+}
+.sp-hue {
+  position: absolute;
+  top:0;
+  right:0;
+  bottom:0;
+  left:84%;
+  height: 100%;
+}
+
+.sp-clear-enabled .sp-hue {
+  top:33px;
+  height: 77.5%;
+}
+
+.sp-fill {
+  padding-top: 80%;
+}
+.sp-sat, .sp-val {
+  position: absolute;
+  top:0;
+  left:0;
+  right:0;
+  bottom:0;
+}
+
+.sp-alpha-enabled .sp-top {
+  margin-bottom: 18px;
+}
+.sp-alpha-enabled .sp-alpha {
+  display: block;
+}
+.sp-alpha-handle {
+  position:absolute;
+  top:-4px;
+  bottom: -4px;
+  width: 6px;
+  left: 50%;
+  cursor: pointer;
+  border: 1px solid black;
+  background: white;
+  opacity: .8;
+}
+.sp-alpha {
+  display: none;
+  position: absolute;
+  bottom: -20px;
+  right: 0;
+  left: 0;
+  height: 14px;
+}
+.sp-alpha-inner {
+  border: solid 1px #333;
+}
+
+.sp-clear {
+  display: none;
+}
+
+.sp-clear.sp-clear-display {
+  background-position: center;
+}
+
+.sp-clear-enabled .sp-clear {
+  display: block;
+  position:absolute;
+  top:0px;
+  right:0;
+  bottom:0;
+  left:84%;
+  height: 28px;
+}
+
+/* Don't allow text selection */
+.sp-container, .sp-replacer, .sp-preview, .sp-dragger, .sp-slider, .sp-alpha, .sp-clear, .sp-alpha-handle, .sp-container.sp-dragging .sp-input, .sp-container button  {
+  -webkit-user-select:none;
+  -moz-user-select: -moz-none;
+  -o-user-select:none;
+  user-select: none;
+}
+
+.sp-container.sp-input-disabled .sp-input-container {
+  display: none;
+}
+.sp-container.sp-buttons-disabled .sp-button-container {
+  display: none;
+}
+.sp-container.sp-palette-buttons-disabled .sp-palette-button-container {
+  display: none;
+}
+.sp-palette-only .sp-picker-container {
+  display: none;
+}
+.sp-palette-disabled .sp-palette-container {
+  display: none;
+}
+
+.sp-initial-disabled .sp-initial {
+  display: none;
+}
+
+
+/* Gradients for hue, saturation and value instead of images.  Not pretty... but it works */
+.sp-sat {
+  background-image: -webkit-gradient(linear,  0 0, 100% 0, from(#FFF), to(rgba(204, 154, 129, 0)));
+  background-image: -webkit-linear-gradient(left, #FFF, rgba(204, 154, 129, 0));
+  background-image: -moz-linear-gradient(left, #fff, rgba(204, 154, 129, 0));
+  background-image: -o-linear-gradient(left, #fff, rgba(204, 154, 129, 0));
+  background-image: -ms-linear-gradient(left, #fff, rgba(204, 154, 129, 0));
+  background-image: linear-gradient(to right, #fff, rgba(204, 154, 129, 0));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType = 1, startColorstr=#FFFFFFFF, endColorstr=#00CC9A81)";
+  filter : progid:DXImageTransform.Microsoft.gradient(GradientType = 1, startColorstr='#FFFFFFFF', endColorstr='#00CC9A81');
+}
+.sp-val {
+  background-image: -webkit-gradient(linear, 0 100%, 0 0, from(#000000), to(rgba(204, 154, 129, 0)));
+  background-image: -webkit-linear-gradient(bottom, #000000, rgba(204, 154, 129, 0));
+  background-image: -moz-linear-gradient(bottom, #000, rgba(204, 154, 129, 0));
+  background-image: -o-linear-gradient(bottom, #000, rgba(204, 154, 129, 0));
+  background-image: -ms-linear-gradient(bottom, #000, rgba(204, 154, 129, 0));
+  background-image: linear-gradient(to top, #000, rgba(204, 154, 129, 0));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#00CC9A81, endColorstr=#FF000000)";
+  filter : progid:DXImageTransform.Microsoft.gradient(startColorstr='#00CC9A81', endColorstr='#FF000000');
+}
+
+.sp-hue {
+  background: -moz-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+  background: -ms-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+  background: -o-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+  background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), color-stop(0.17, #ffff00), color-stop(0.33, #00ff00), color-stop(0.5, #00ffff), color-stop(0.67, #0000ff), color-stop(0.83, #ff00ff), to(#ff0000));
+  background: -webkit-linear-gradient(top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+  background: linear-gradient(to bottom, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+}
+
+/* IE filters do not support multiple color stops.
+   Generate 6 divs, line them up, and do two color gradients for each.
+   Yes, really.
+ */
+.sp-1 {
+  height:17%;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0000', endColorstr='#ffff00');
+}
+.sp-2 {
+  height:16%;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff00', endColorstr='#00ff00');
+}
+.sp-3 {
+  height:17%;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ff00', endColorstr='#00ffff');
+}
+.sp-4 {
+  height:17%;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ffff', endColorstr='#0000ff');
+}
+.sp-5 {
+  height:16%;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0000ff', endColorstr='#ff00ff');
+}
+.sp-6 {
+  height:17%;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff00ff', endColorstr='#ff0000');
+}
+
+.sp-hidden {
+  display: none !important;
+}
+
+/* Clearfix hack */
+.sp-cf:before, .sp-cf:after { content: ""; display: table; }
+.sp-cf:after { clear: both; }
+.sp-cf { *zoom: 1; }
+
+/* Mobile devices, make hue slider bigger so it is easier to slide */
+@media (max-device-width: 480px) {
+  .sp-color { right: 40%; }
+  .sp-hue { left: 63%; }
+  .sp-fill { padding-top: 60%; }
+}
+.sp-dragger {
+  border-radius: 5px;
+  height: 5px;
+  width: 5px;
+  border: 1px solid #fff;
+  background: #000;
+  cursor: pointer;
+  position:absolute;
+  top:0;
+  left: 0;
+}
+.sp-slider {
+  position: absolute;
+  top:0;
+  cursor:pointer;
+  height: 3px;
+  left: -1px;
+  right: -1px;
+  border: 1px solid #000;
+  background: white;
+  opacity: .8;
+}
+
+/*
+Theme authors:
+Here are the basic themeable display options (colors, fonts, global widths).
+See http://bgrins.github.io/spectrum/themes/ for instructions.
+*/
+
+.sp-container {
+  border-radius: 0;
+  background-color: #ffffff;
+  border: solid 1px #1979c3;
+  padding: 0;
+}
+.sp-container, .sp-container button, .sp-container input, .sp-color, .sp-hue, .sp-clear {
+  font: normal 12px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.sp-top {
+  margin-bottom: 3px;
+}
+.sp-color, .sp-hue, .sp-clear {
+  border: solid 1px #666;
+}
+
+/* Input */
+.sp-input-container {
+  float:right;
+  width: 100px;
+  margin-bottom: 4px;
+}
+.sp-initial-disabled  .sp-input-container {
+  width: 100%;
+}
+.sp-input {
+  font-size: 12px !important;
+  border: 1px solid @button__border-color;
+  padding: 4px 5px;
+  margin: 5px 0px 0px 0px;
+  width: 100%;
+  background:transparent;
+  border-radius: 3px;
+  color: #222;
+}
+.sp-input:focus  {
+  border: 1px solid #1979c3;
+}
+.sp-input.sp-validation-error {
+  border: 1px solid red;
+  background: #fdd;
+}
+.sp-picker-container , .sp-palette-container {
+  float:left;
+  position: relative;
+  padding: 10px;
+  padding-bottom: 300px;
+  margin-bottom: -290px;
+}
+.sp-picker-container {
+  width: 172px;
+  border-left: solid 1px #fff;
+}
+
+/* Palettes */
+.sp-palette-container {
+  border-right: solid 1px #ccc;
+}
+
+.sp-palette-only .sp-palette-container {
+  border: 0;
+}
+
+.sp-palette .sp-thumb-el {
+  display: block;
+  position:relative;
+  float:left;
+  width: 24px;
+  height: 15px;
+  margin: 3px;
+  cursor: pointer;
+  border:solid 2px transparent;
+}
+.sp-palette .sp-thumb-el:hover, .sp-palette .sp-thumb-el.sp-thumb-active {
+  border-color: @button__hover__border-color;
+}
+.sp-thumb-el {
+  position:relative;
+}
+
+/* Initial */
+.sp-initial {
+  float: left;
+  border: solid 1px #333;
+}
+.sp-initial span {
+  width: 30px;
+  height: 25px;
+  border:none;
+  display:block;
+  float:left;
+  margin:0;
+}
+
+.sp-initial .sp-clear-display {
+  background-position: center;
+}
+
+/* Buttons */
+.sp-palette-button-container,
+.sp-button-container {
+  float: right;
+  margin-top: 4px;
+}
+
+/* Replacer (the little preview div that shows up instead of the <input>) */
+.sp-replacer {
+  margin:0;
+  overflow:hidden;
+  cursor:pointer;
+  padding: 3px;
+  display:inline-block;
+  *zoom: 1;
+  *display: inline;
+  border: solid 1px @button__border-color;
+  background: #eaeaea;
+  color: #333;
+  vertical-align: middle;
+  box-sizing: border-box;
+}
+.sp-replacer:hover, .sp-replacer.sp-active {
+  border-color: #1979c3;
+  color: #111;
+}
+.sp-replacer.sp-disabled {
+  cursor:default;
+  border-color: silver;
+  color: silver;
+}
+.sp-dd {
+  height: 16px;
+  line-height: 16px;
+  float:left;
+  font-size:10px;
+  display: none;
+}
+.sp-preview {
+  position:relative;
+  width: 25px;
+  height: 25px;
+  border: solid 1px @button__border-color;
+  float:left;
+  z-index: 0;
+}
+
+.sp-palette {
+  *width: 220px;
+  max-width: 220px;
+}
+.sp-palette .sp-thumb-el {
+  width:16px;
+  height: 16px;
+  margin:2px 1px;
+  border: solid 1px #d0d0d0;
+}
+
+.sp-container {
+  padding-bottom:0;
+  box-shadow: 1px 1px 5px rgba(0,0,0,0.5);
+  margin-top: 4px;
+}
+
+
+/* Buttons: http://hellohappy.org/css3-buttons/ */
+.sp-container button {
+  background-color: @button__background-color;
+  border: 1px solid @button__border-color;
+  color: #333;
+  font-size: @button__font-size;
+  line-height: @button__line-height;
+  padding: 5px 4px;
+  text-align: center;
+  vertical-align: middle;
+}
+.sp-container button:hover {
+  background-color: @button__hover__background-color;
+  border: 1px solid @button__border-color;
+  cursor: pointer;
+}
+.sp-container button:active {
+  border: 1px solid #aaa;
+}
+.sp-cancel {
+  font-size: @button__font-size;
+  color: #1979c3 !important;
+  margin:0;
+  padding:2px;
+  margin-right: 15px;
+  vertical-align: middle;
+  text-decoration:none;
+
+}
+.sp-cancel:hover {
+  text-decoration: underline;
+}
+
+
+.sp-palette span:hover, .sp-palette span.sp-thumb-active {
+  border-color: #000;
+}
+
+.sp-preview, .sp-alpha, .sp-thumb-el {
+  position:relative;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);
+}
+.sp-preview-inner, .sp-alpha-inner, .sp-thumb-inner {
+  display:block;
+  position:absolute;
+  top:0;left:0;bottom:0;right:0;
+}
+
+.sp-palette .sp-thumb-inner {
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+}
+
+.sp-palette .sp-thumb-light.sp-thumb-active .sp-thumb-inner {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIVJREFUeNpiYBhsgJFMffxAXABlN5JruT4Q3wfi/0DsT64h8UD8HmpIPCWG/KemIfOJCUB+Aoacx6EGBZyHBqI+WsDCwuQ9mhxeg2A210Ntfo8klk9sOMijaURm7yc1UP2RNCMbKE9ODK1HM6iegYLkfx8pligC9lCD7KmRof0ZhjQACDAAceovrtpVBRkAAAAASUVORK5CYII=);
+}
+
+.sp-palette .sp-thumb-dark.sp-thumb-active .sp-thumb-inner {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAMdJREFUOE+tkgsNwzAMRMugEAahEAahEAZhEAqlEAZhEAohEAYh81X2dIm8fKpEspLGvudPOsUYpxE2BIJCroJmEW9qJ+MKaBFhEMNabSy9oIcIPwrB+afvAUFoK4H0tMaQ3XtlrggDhOVVMuT4E5MMG0FBbCEYzjYT7OxLEvIHQLY2zWwQ3D+9luyOQTfKDiFD3iUIfPk8VqrKjgAiSfGFPecrg6HN6m/iBcwiDAo7WiBeawa+Kwh7tZoSCGLMqwlSAzVDhoK+6vH4G0P5wdkAAAAASUVORK5CYII=);
+}
+
+.sp-clear-display {
+  background-repeat:no-repeat;
+  background-position: center;
+  background-color: #fff;
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNSIgaGVpZ2h0PSIyNSIgc3R5bGU9ImJhY2tncm91bmQ6I2ZmZiIgdmlld0JveD0iMCAwIDI1IDI1Ij4KICA8cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiNGMDAiIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiIGQ9Ik0wLjUsMC41IEwyNS41LDI0LjUiLz4KPC9zdmc+Cg==);
+}
+
+.sp-palette-row-selection {
+  padding-top: 10px;
+}
+
+.sp-palette-row-selection:before {
+  content: "Favorite Colors";
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
index 96b8ce8df1219..88962a1019a19 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
@@ -26,6 +26,7 @@
             border: none;
             opacity: 1;
             position: static;
+            transform: none;
         }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
index 959b37de5a5a1..9a88d5e3593b9 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
@@ -66,6 +66,7 @@
         opacity: 0;
         overflow: hidden;
         position: absolute;
+        visibility: hidden;
         width: 0;
 
         &:focus {
@@ -73,6 +74,14 @@
                 box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
             }
         }
+
+        &:disabled {
+            + .file-uploader-button {
+                cursor: default;
+                opacity: .5;
+                pointer-events: none;
+            }
+        }
     }
 }
 
@@ -241,7 +250,7 @@
     }
 }
 
-// Placeholder for multiple uploader
+//  Placeholder for multiple uploader
 .file-uploader-placeholder {
     &.placeholder-document {
         .lib-icon-font(
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
new file mode 100644
index 0000000000000..f187697281252
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
@@ -0,0 +1,45 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Components -> Image Uploader
+//  _____________________________________________
+
+.image-uploader {
+    .image-upload-requirements {
+        margin-top: 8px;
+        font-size: .9em;
+    }
+
+    .image-placeholder {
+        margin-left: 0;
+        margin-right: 0;
+    }
+
+    .image-uploader-spinner {
+        width: 50%;
+        height: 50%;
+        background-size: auto;
+        margin: 0;
+        transform: translate(50%, 50%);
+        position: absolute;
+    }
+
+    .image-uploader-preview {
+        width: auto;
+    }
+
+    .image-uploader-preview-link,
+    .image-uploader-preview-link .preview-image {
+        height: inherit;
+    }
+}
+
+.image-uploader._loading {
+    .image-placeholder-text,
+    .product-image-wrapper:before {
+        display: none;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_media-gallery.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_media-gallery.less
index 85ccc235a3bdd..9a5f35e4ede90 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_media-gallery.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_media-gallery.less
@@ -159,7 +159,7 @@
         }
 
         .file-row {
-            background: @color-white url("@{baseDir}mui/images/ajax-loader-big.gif") no-repeat 50% 50%; // TODO UI: remove after new uploader implemented
+            background: @color-white url("@{baseDir}mui/images/ajax-loader-big.gif") no-repeat 50% 50%;
             bottom: 0;
             height: 100%;
             left: 0;
@@ -324,6 +324,7 @@
     -ms-flex: 1;
     -webkit-box-flex: 1;
     -webkit-flex: 1;
+    box-flex: 1;
     flex: 1;
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 63d97dc52e453..95d7f8f65fdc1 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -80,7 +80,7 @@
     &.confirm,
     &.prompt {
         .modal-inner-wrap {
-            .message {
+            .message:not(.message-error) {
                 background: @modal-popup-colorless__background;
             }
         }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
index 7bd10ad491f0c..d1d1ff9891634 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
@@ -283,6 +283,7 @@
                 border: none;
                 opacity: 1;
                 position: static;
+                transform: none;
             }
         }
 
@@ -462,25 +463,3 @@
         }
     }
 }
-
-.ie9 {
-    .catalog-product-attribute-edit {
-        &.attribute-popup {
-            min-width: 0;
-
-            .menu-wrapper {
-                display: none;
-            }
-
-            .page-actions {
-                button {
-                    float: none;
-                }
-
-                .primary {
-                    float: right;
-                }
-            }
-        }
-    }
-}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less
index 29bbeb10f820d..a38cb17a95754 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less
@@ -31,6 +31,11 @@
         padding-left: 0 !important;
     }
 
+    .x-tree li {
+        margin-bottom: 0 !important;
+        line-height: normal !important;
+    }
+
     .legend {
         font-weight: @font-weight__semibold;
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less
index c9e56a29f275f..f6f61c1efae91 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_spinner.less
@@ -33,14 +33,6 @@
         position: absolute;
         width: 1em;
     }
-
-    .ie9 & {
-        background: url('@{baseDir}images/ajax-loader.gif') no-repeat center;
-
-        > span {
-            display: none;
-        }
-    }
 }
 
 //  ToDo UI: remove old loaders style while loaders redesign
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 0000000000000..b6bc8b8fd9494
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_url_input.less
@@ -0,0 +1,50 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Components -> Url Input
+//  _____________________________________________
+.url-input-container {
+
+    .type-selector-input-container {
+        align-items: stretch;
+        display: flex;
+        flex-flow: row wrap;
+        justify-content: space-around;
+    }
+
+    .url-input-select {
+        flex-grow: 0;
+    }
+
+    .url-input-element-linked-element {
+        flex-grow: 1;
+        margin-left: 1.5em;
+    }
+
+    .url-input-setting {
+        clear: both;
+        display: block;
+        &:before {
+            clear: both;
+            content: "";
+        }
+    }
+
+    .admin__action-multiselect-text {
+        &.warning {
+            color: #F00;
+        }
+    }
+
+    .action-close, .action-close:active {
+        margin-right: 3.2rem;
+        padding: 0.8rem 1.5rem 0.6rem;
+
+        &:before {
+            font-size: 1.5rem;
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
index 5f1cee13b5b88..f971246ab469d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -75,9 +75,9 @@
 
     max-width: 100%;
     min-width: 8.5rem;
-    padding-bottom: @field-control__padding-bottom - .1rem;
+    padding-bottom: @field-control__padding-bottom;
     padding-right: 4.4rem; // Distance between select switch and inner text
-    padding-top: @field-control__padding-top - .1rem;
+    padding-top: @field-control__padding-top;
     transition: @smooth__border-color;
 
     &:hover {
@@ -100,26 +100,8 @@
     &::-ms-expand {
         display: none;
     }
-
-    .ie9 & {
-        background-image: none;
-        padding-right: @field-control__padding-horizontal;
-    }
 }
 
-//  ToDo UI: add month and date styles
-//  .admin__control-select-month {
-//      width: 140px;
-//  }
-
-//  .admin__control-select-year {
-//      width: 103px;
-//  }
-
-//  .admin__control-cvn {
-//      width: 3em;
-//  }
-
 option:empty {
     display: none;
 }
@@ -152,21 +134,24 @@ option:empty {
     &:before {
         &:extend(.abs-form-control-pattern);
 
-        content:'';
-        left: 0;
-        position: absolute;
-        top: 0;
-        width: 100%;
-        z-index: 0;
-
         .admin__control-file:active + &,
         .admin__control-file:focus + & {
+            /**
+             * @codingStandardsIgnoreStart
+             */
             &:extend(.abs-form-control-pattern:focus);
         }
 
         .admin__control-file[disabled] + & {
             &:extend(.abs-form-control-pattern[disabled]);
         }
+
+        content: '';
+        left: 0;
+        position: absolute;
+        top: 0;
+        width: 100%;
+        z-index: 0;
     }
 }
 
@@ -336,35 +321,3 @@ option:empty {
 .admin__addon-prefix {
     .lib-vendor-prefix-order(0);
 }
-
-.ie9 {
-    .admin__control-addon {
-        &:after {
-            clear: both;
-            content: '';
-            display: block;
-            height: 0;
-            overflow: hidden;
-        }
-    }
-
-    .admin__addon {
-        min-width: 0;
-        overflow: hidden;
-        text-align: right;
-        white-space: nowrap;
-        width: auto;
-
-        [class*='admin__control-'] {
-            display: inline;
-        }
-
-        &-prefix {
-            float: left;
-        }
-
-        &-suffix {
-            float: right;
-        }
-    }
-}
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 e29efd13b1688..02925881253ea 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
@@ -59,7 +59,11 @@
 }
 
 .abs-field-no-label {
+    /**
+     *@codingStandardsIgnoreStart
+     */
     #mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
+    //@codingStandardsIgnoreEnd
     margin-left: @_length;
 }
 
@@ -143,6 +147,14 @@
                 }
             }
         }
+
+        &.field-currently_used_for {
+            > .admin__field-control {
+                .admin__field {
+                    margin-top: 8px;
+                }
+            } 
+        }
     }
 }
 
@@ -166,6 +178,13 @@
     .admin__control-text,
     .admin__control-textarea {
         width: 100%;
+        &.disabled {
+            background-color: #e9e9e9;
+            border-color: #adadad;
+            color: #303030;
+            cursor: not-allowed;
+            opacity: .5;
+        }
     }
 }
 
@@ -183,10 +202,13 @@
 
 .admin__field-label {
     color: @field-label__color;
-    cursor: pointer;
     margin: 0;
     text-align: right;
 
+    label {
+        cursor: pointer;
+    }
+
     + br {
         display: none;
     }
@@ -225,7 +247,7 @@
 
     .required > &, // ToDo UI: change classes 'required' to '_required'.
     ._required > & {
-        > span {
+        span {
             &:after {
                 color: @validation__color;
                 content: '*';
@@ -274,12 +296,18 @@
     .admin__fieldset > & {
         margin-bottom: 3rem;
         position: relative;
+        
+        &.field-import_file {
+            .input-file {
+                margin-top: 6px;
+            }
+        }
     }
 
     //  Hide group legend and show first field label instead
     legend {
         &.admin__field-label {
-            opacity: 0;
+            opacity: 1;
         }
     }
 
@@ -506,7 +534,6 @@
 
             & > .admin__field-label {
                 #mix-grid .column(@field-label-grid__column, @field-grid__columns);
-                background: @color-white;
                 cursor: pointer;
                 left: 0;
                 position: absolute;
@@ -658,9 +685,11 @@
                 margin: 0;
                 opacity: 1;
                 position: static;
-                text-align: left;
             }
         }
+        & > .admin__field-label { 
+            text-align: left;
+        }
 
         &:nth-child(n + 2) {
             &:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
index 0bfa454adbf0d..df031bebeb24a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
@@ -408,6 +408,9 @@ label.mage-error {
             width: 16px;
             z-index: 1;
 
+            /**
+             * @codingStandardsIgnoreStart
+             */
             &:before {
                 &:extend(.admin__control-checkbox + label:before);
                 left: 0;
@@ -434,6 +437,7 @@ label.mage-error {
                 &:before {
                     &:extend(.admin__control-checkbox:checked + label:before);
                 }
+                //  @codingStandardsIgnoreEnd
             }
 
             &._indeterminate {
@@ -470,6 +474,7 @@ label.mage-error {
 
         .action-select-multiselect {
             -webkit-appearance: menulist-button;
+            appearance: menulist-button;
             height: 38px;
             left: -1rem;
             min-width: 0;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_spinner.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_spinner.less
index 09baf498cbcf4..60b84b1f467fe 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_spinner.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_spinner.less
@@ -26,4 +26,4 @@
 @spinner-rotate-step: 45;
 
 //  One step in degree
-@spinner-delay: .9;
+@spinner-delay: .9s;
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index b66fed0c0a09a..26381367c72f5 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -279,7 +279,6 @@
     .nested .choice .label,
     .nested .choice .control {
         float: none;
-        width: auto;
         position: static;
         left: auto;
         text-align: left;
@@ -487,8 +486,8 @@
     }
 
     .notification-entry-dialog .action-close:hover {
-        color: #000;
-        border-bottom-color: #000;
+        color: @color-black;
+        border-bottom-color: @color-black;
         filter: none;
     }
 
@@ -525,7 +524,7 @@
         right: 0;
         top: 100%;
         border: 1px solid #cac2b5;
-        background: #fff;
+        background: @color-white;
         box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
         z-index: 990;
     }
@@ -784,9 +783,9 @@
         box-sizing: border-box;
         border: 1px solid #adadad;
         border-radius: 1px;
-        padding: 4px;
+        padding: .6rem 1rem .6rem;
         color: #303030;
-        background-color: #fff;
+        background-color: @color-white;
         font-weight: 500;
         font-size: 14px;
         height: 33px;
@@ -860,7 +859,7 @@
     input[type="radio"],
     input[type="checkbox"] {
         .lib-css(appearance, none, 1);
-        background: #fff;
+        background: @color-white;
         border-radius: 2px;
         border: 1px solid #adadad;
         cursor: pointer;
@@ -945,7 +944,7 @@
     }
 
     select[disabled] option[selected] {
-        color: #fff;
+        color: @color-white;
         background: #aaa;
     }
 
@@ -1157,7 +1156,7 @@
 
     .fieldset-wrapper,
     .fieldset {
-        background: #fff;
+        background: @color-white;
         border: 0;
         margin: 0;
         padding: 5px 0 38px;
@@ -1189,7 +1188,7 @@
     }
 
     //
-    //  Collapsable fieldset-wrapper
+    //  collapsible fieldset-wrapper
     //  --------------------------------------
 
     // Fieldset styles in another fieldset
@@ -1215,6 +1214,7 @@
         -webkit-user-select: none; // use in 41 Chrome
         -moz-user-select: none; // use in 36 Firefox
         -ms-user-select: none; // use in 11 IE
+        user-select: none;
         min-height: 39px;
     }
 
@@ -1574,7 +1574,7 @@
 
     .multiselect-alt .item {
         position: relative;
-        border-top: 1px solid #fff;
+        border-top: 1px solid @color-white;
         cursor: pointer;
     }
 
@@ -1651,7 +1651,7 @@
 
             ~ .addafter strong {
                 display: inline-block;
-                background: #fff;
+                background: @color-white;
                 line-height: 24px;
                 margin: 0 3px 0 0;
                 padding-left: 4px;
@@ -2041,7 +2041,7 @@
         &:before {
             position: absolute;
             content: "";
-            background-color: #fff;
+            background-color: @color-white;
             right: 0;
             top: 0;
             bottom: 0;
@@ -2298,7 +2298,7 @@
     //  --------------------------------------
 
     .preview-window {
-        background: #fff;
+        background: @color-white;
     }
 
     .preview-window .toolbar {
@@ -2458,7 +2458,7 @@
     }
 
     .attribute-popup .page-actions.fixed .page-actions-inner {
-        background: #fff;
+        background: @color-white;
         padding: 0;
         min-width: 100%;
         max-width: 100%;
@@ -2544,6 +2544,8 @@
     .order-summary:after,
     .order-methods:before,
     .order-methods:after,
+    .payment-methods:before,
+    .payment-methods:after,
     .grid-actions:before,
     .grid-actions:after,
     .fieldset-wrapper-title:before,
@@ -2559,6 +2561,7 @@
     .order-addresses:after,
     .order-summary:after,
     .order-methods:after,
+    .payment-methods:after,
     .grid-actions:after,
     .fieldset-wrapper-title:after {
         clear: both;
@@ -2757,7 +2760,7 @@
             border: 1px solid #c9c2b8;
             border-width: 0 0 1px;
             padding: 6px 10px 7px;
-            background: #fff;
+            background: @color-white;
             .style2();
 
             span {
@@ -2769,7 +2772,7 @@
         td {
             border: none;
             padding: 6px 10px 7px;
-            background: #fff;
+            background: @color-white;
         }
 
         tr:last-child td {
@@ -2858,7 +2861,7 @@
 
     .table-fieldset-alt tbody tr:nth-child(odd) td,
     .table-fieldset-alt tbody tr:nth-child(odd):hover td {
-        background: #fff;
+        background: @color-white;
     }
 
     //
@@ -2898,6 +2901,7 @@
         .style28();
     }
 
+    #order-billing-method-summary a,
     #order-shipping-method-summary a {
         .style3();
     }
@@ -2918,7 +2922,7 @@
     }
 
     .order-details-existing-customer {
-        background: #fff;
+        background: @color-white;
         padding-left: 0;
         position: relative;
         width: 77.9%;
@@ -2936,7 +2940,8 @@
         margin: 0 0 0 20px;
     }
 
-    #order-data .order-methods ul {
+    #order-data .order-methods ul,
+    #order-data .payment-methods ul {
         list-style: none;
         margin: 0;
         padding: 0;
@@ -3035,7 +3040,7 @@
     }
 
     .gift-options-tooltip {
-        background: #fff;
+        background: @color-white;
         border-radius: 5px;
         padding: 10px;
         box-shadow: 0 0 3px rgba(0, 0, 0, .3);
@@ -3194,7 +3199,7 @@
             left: 0;
             margin: 0 8px;
             padding: 10px;
-            background: #fff;
+            background: @color-white;
         }
     }
 
@@ -3386,7 +3391,7 @@
 
     .rma-popup,
     .cms-popup {
-        background: #fff;
+        background: @color-white;
         box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
         cursor: default;
         position: fixed;
@@ -3410,7 +3415,7 @@
     }
 
     .rma-popup .content {
-        background: #fff;
+        background: @color-white;
         border-bottom: 1px solid #ccc;
         max-height: 400px;
         overflow: auto;
@@ -3467,7 +3472,7 @@
     .grid .rma-popup .form-list tr,
     .grid tr.even .rma-popup .form-list tr,
     .grid tr.on-mouse .rma-popup .form-list tr {
-        background: #fff !important;
+        background: @color-white !important;
     }
 
     //
@@ -3798,7 +3803,7 @@
     }
 
     .rule-param .label {
-        color: #000;
+        color: @color-black;
         float: none;
         text-align: left;
         padding: 0;
@@ -3885,7 +3890,7 @@
     .defaultSkin {
         table.mceLayout {
             td {
-                background: #fff;
+                background: @color-white;
             }
         }
 
@@ -3905,117 +3910,6 @@
     }
 }
 
-//
-//  IE9 styles
-//  ---------------------------------------------
-
-.ie9 {
-    .admin__scope-old {
-        select {
-            &:not([multiple]) {
-                padding-right: 4px;
-                min-width: 0;
-            }
-        }
-
-        //  Table Filters
-        .filter select {
-            &:not([multiple]) {
-                padding-right: 0;
-            }
-        }
-
-        .adminhtml-widget-instance-edit {
-            .grid-chooser .control {
-                margin-top: -18px;
-            }
-        }
-        .page-layout-admin-1column .page-columns,
-        .catalog-product-edit,
-        .catalog-product-new,
-        .catalog-category-edit {
-            table.data {
-                table-layout: fixed;
-                word-wrap: break-word;
-
-                th {
-                    word-wrap: normal;
-                    overflow: hidden;
-                    vertical-align: top;
-
-                    > span {
-                        white-space: normal;
-                    }
-                }
-
-                th:not(.col-select):not(.col-id):not(.col-severity),
-                td:not(.col-select):not(.col-id):not(.col-severity) {
-                    width: auto;
-                }
-            }
-        }
-
-        #setGrid_table,
-        #attributeGrid_table,
-        .custom-options .data-table,
-        .ui-dialog .data,
-        .page-layout-admin-1column .page-columns .data,
-        .catalog-category-edit .data {
-            word-wrap: break-word;
-            table-layout: fixed;
-        }
-
-        .fieldset-wrapper {
-            table.data {
-                table-layout: inherit;
-                word-wrap: normal;
-            }
-        }
-
-        .sales-order-create-index table.data,
-        .sales-order-create-index .fieldset-wrapper table.data {
-            table-layout: fixed;
-            word-wrap: break-word;
-
-            th {
-                word-wrap: normal;
-                overflow: hidden;
-                vertical-align: top;
-
-                > span {
-                    white-space: normal;
-                }
-            }
-        }
-
-        .entry-edit .product-options .grouped-items-table {
-            table-layout: fixed;
-            word-wrap: break-word;
-
-            th {
-                word-wrap: normal;
-                overflow: hidden;
-                vertical-align: top;
-
-                > span {
-                    white-space: normal;
-                }
-            }
-        }
-
-        .catalog-category-edit,
-        .adminhtml-cache-index,
-        .adminhtml-process-list,
-        .indexer-indexer-list,
-        .adminhtml-notification-index {
-            table.data {
-                table-layout: inherit;
-                word-wrap: normal;
-            }
-        }
-    }
-}
-
 //
 //  Pages styles
 //  ---------------------------------------------
@@ -5229,7 +5123,7 @@
 @media print {
     * {
         background: transparent !important;
-        color: #000 !important;
+        color: @color-black !important;
         box-shadow: none !important;
         text-shadow: none !important;
         filter: none !important;
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index a2511e27e9f67..8e3b89dcf7e4e 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -599,7 +599,7 @@ define('js/theme', [
 ], function ($, keyboardHandler) {
     'use strict';
 
-    /* @TODO refactor collapsable as widget and avoid logic binding with such a general selectors */
+    /* @TODO refactor collapsible as widget and avoid logic binding with such a general selectors */
     $('.collapse').collapsable();
 
     $.each($('.entry-edit'), function (i, entry) {
diff --git a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
index c0aa5510c6e07..70ae82045b3d1 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
@@ -204,16 +204,6 @@
     }
 }
 
-.eq-ie9 {
-    .hor-scroll {
-        display: inline-block;
-        min-height: 0;
-        overflow-y: hidden;
-        overflow-x: auto;
-        width: 100%;
-    }
-}
-
 td.col-period,
 td.col-date,
 td.col-date_to,
@@ -360,7 +350,7 @@ td.col-type {
             position: relative;
             border-bottom-right-radius: 0;
             box-shadow: none;
-            background: #fff;
+            background: @color-white;
 
             &:after {
                 position: absolute;
@@ -369,7 +359,7 @@ td.col-type {
                 right: 0;
                 height: 2px;
                 margin-top: -1px;
-                background: #fff;
+                background: @color-white;
                 content: '';
                 z-index: 2;
             }
@@ -455,7 +445,6 @@ td.col-type {
 
     .import {
         display: block;
-        vertical-align: top;
     }
 
     .action-reset {
diff --git a/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
index 80ac77e42fc04..c961d49c5b589 100644
--- a/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
-
     .block-banners,
     .block-banners-inline {
         &:extend(.abs-margin-for-blocks-and-widgets);
@@ -22,7 +21,7 @@
         }
 
         .banner-item-content {
-            .lib-css(margin-bottom, @indent__base);
+            margin-bottom: @indent__base;
 
             img {
                 display: block;
diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
index b70bab6f320d8..8c1ec09afec1e 100644
--- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
@@ -9,9 +9,9 @@
 
 @braintree-input-border__color: @color-gray76;
 
-@braintree-error__color: @color-red10;
-@braintree-focus__color: @color-blue2;
-@braintree-success__color: @color-dark-green1;
+@braintree-error__color: @message-error__color;
+@braintree-focus__color: @theme__color__primary-alt;
+@braintree-success__color: @message-success__color;
 
 @braintree-paypal-icon__height: 16px;
 @braintree-paypal-icon__width: 16px;
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index 51b02a76d0d49..08a9b61977922 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -497,6 +497,26 @@
         }
     }
 
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
+
 }
 
 //
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
index 8b727b0d9c28d..951ca89a07988 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
@@ -63,7 +63,6 @@
             }
 
             &-actions {
-                display: none;
 
                 .actions-secondary {
                     > button.action {
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
index a0bd5e695a621..8e7f36389c417 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -4,14 +4,17 @@
 //  */
 
 //
-//  Common
-//  _____________________________________________
+//  Variables
+//  ---------------------------------------------
 
 @toolbar-mode-icon-font-size: 24px;
 @toolbar-element-background: @panel__background-color;
 
-& when (@media-common = true) {
+//
+//  Common
+//  _____________________________________________
 
+& when (@media-common = true) {
     .page-products {
         .columns {
             position: relative;
@@ -62,6 +65,11 @@
         .products.wrapper ~ .toolbar & {
             display: none;
         }
+
+        .sorter-action {
+            position: relative;
+            top: -2px;
+        }
     }
 
     .sorter-options {
@@ -72,12 +80,12 @@
     .sorter-action {
         vertical-align: top;
         .lib-icon-font(
-        @icon-arrow-up,
-        @_icon-font-size: 28px,
-        @_icon-font-line-height: 32px,
-        @_icon-font-color: @header-icons-color,
-        @_icon-font-color-hover: @header-icons-color-hover,
-        @_icon-font-text-hide: true
+            @icon-arrow-up,
+            @_icon-font-size: 28px,
+            @_icon-font-line-height: 32px,
+            @_icon-font-color: @header-icons-color,
+            @_icon-font-color-hover: @header-icons-color-hover,
+            @_icon-font-text-hide: true
         );
     }
 
@@ -99,7 +107,7 @@
     }
 
     .limiter-label {
-        font-weight: 400;
+        font-weight: @font-weight__regular;
     }
 
     .limiter {
@@ -176,11 +184,11 @@
         }
 
         .lib-icon-font(
-        @icon-grid,
-        @_icon-font-size: @toolbar-mode-icon-font-size,
-        @_icon-font-text-hide: true,
-        @_icon-font-color: @text__color__muted,
-        @_icon-font-color-hover: @text__color__muted
+            @icon-grid,
+            @_icon-font-size: @toolbar-mode-icon-font-size,
+            @_icon-font-text-hide: true,
+            @_icon-font-color: @text__color__muted,
+            @_icon-font-color-hover: @text__color__muted
         );
     }
 
@@ -188,11 +196,10 @@
         .lib-icon-font-symbol(@icon-list);
     }
 
-    .limiter {
-        float: right;
-
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }
diff --git a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
index 52f1beafa32e1..daed96db717c7 100644
--- a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
@@ -36,9 +36,9 @@
             @_icon-font-content: @icon-search,
             @_icon-font-size: 35px,
             @_icon-font-line-height: 33px,
-            @_icon-font-color: @minicart-icons-color,
-            @_icon-font-color-hover: @minicart-icons-color-hover,
-            @_icon-font-color-active: @minicart-icons-color-hover,
+            @_icon-font-color: @header-icons-color,
+            @_icon-font-color-hover: @header-icons-color-hover,
+            @_icon-font-color-active: @header-icons-color-hover,
             @_icon-font-text-hide: true
             );
             display: inline-block;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
index 871c9e63490da..d3d15019f0e87 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
@@ -80,6 +80,10 @@
             margin-bottom: 0;
             overflow: inherit;
         }
+
+        .discount.coupon {
+            display: none;
+        }
     }
 
     //  Products table
@@ -301,7 +305,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th) ':';
                         display: block;
                         font-weight: @font-weight__bold;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
index 5364c48acb516..673131563417d 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -106,6 +106,11 @@
         .lib-dropdown(
         @_toggle-selector: ~'.action.showcart',
         @_options-selector: ~'.block-minicart',
+        @_dropdown-list-width: 320px,
+        @_dropdown-list-position-right: 0,
+        @_dropdown-list-pointer-position: right,
+        @_dropdown-list-pointer-position-left-right: 26px,
+        @_dropdown-list-z-index: 101,   
         @_dropdown-toggle-icon-content: @icon-cart,
         @_dropdown-toggle-active-icon-content: @icon-cart,
         @_dropdown-list-item-padding: false,
@@ -121,23 +126,10 @@
 
         .block-minicart {
             .lib-css(padding, 25px @minicart__padding-horizontal);
-            right: 0;
-            width: 320px;
-            z-index: 101;
 
             .block-title {
                 display: none;
             }
-
-            &:after {
-                left: auto;
-                right: 25px;
-            }
-
-            &:before {
-                left: auto;
-                right: 26px;
-            }
         }
 
         .product {
@@ -156,10 +148,10 @@
         .action {
             &.close {
                 .lib-button-icon(
-                @icon-remove,
-                @_icon-font-size: 32px,
-                @_icon-font-line-height: 32px,
-                @_icon-font-text-hide: true
+                    @icon-remove,
+                    @_icon-font-size: 32px,
+                    @_icon-font-line-height: 32px,
+                    @_icon-font-text-hide: true
                 );
                 .lib-button-reset();
                 height: 40px;
@@ -247,7 +239,6 @@
         .product-item-pricing {
             .label {
                 display: inline-block;
-                width: 4.5rem;
             }
         }
 
@@ -263,12 +254,12 @@
 
             .toggle {
                 .lib-icon-font(
-                @_icon-font-content: @icon-down,
-                @_icon-font-size: 28px,
-                @_icon-font-line-height: 16px,
-                @_icon-font-text-hide: false,
-                @_icon-font-position: after,
-                @_icon-font-display: block
+                    @_icon-font-content: @icon-down,
+                    @_icon-font-size: 28px,
+                    @_icon-font-line-height: 16px,
+                    @_icon-font-text-hide: false,
+                    @_icon-font-position: after,
+                    @_icon-font-display: block
                 );
                 cursor: pointer;
                 position: relative;
@@ -283,8 +274,8 @@
             &.active {
                 > .toggle {
                     .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-up,
-                    @_icon-font-position: after
+                        @_icon-font-content: @icon-up,
+                        @_icon-font-position: after
                     );
                 }
             }
@@ -313,6 +304,7 @@
 
             .weee[data-label] {
                 .lib-font-size(11);
+                
                 .label {
                     &:extend(.abs-no-display all);
                 }
@@ -326,12 +318,12 @@
         .product.options {
             .tooltip.toggle {
                 .lib-icon-font(
-                @icon-down,
-                @_icon-font-size: 28px,
-                @_icon-font-line-height: 28px,
-                @_icon-font-text-hide: true,
-                @_icon-font-margin: -3px 0 0 7px,
-                @_icon-font-position: after
+                    @icon-down,
+                    @_icon-font-size: 28px,
+                    @_icon-font-line-height: 28px,
+                    @_icon-font-text-hide: true,
+                    @_icon-font-margin: -3px 0 0 7px,
+                    @_icon-font-position: after
                 );
 
                 .details {
@@ -366,19 +358,19 @@
             &.edit,
             &.delete {
                 .lib-icon-font(
-                @icon-settings,
-                @_icon-font-size: 28px,
-                @_icon-font-line-height: 28px,
-                @_icon-font-text-hide: true,
-                @_icon-font-color: @color-gray19,
-                @_icon-font-color-hover: @color-gray19,
-                @_icon-font-color-active: @color-gray19
+                    @icon-settings,
+                    @_icon-font-size: 28px,
+                    @_icon-font-line-height: 28px,
+                    @_icon-font-text-hide: true,
+                    @_icon-font-color: @color-gray19,
+                    @_icon-font-color-hover: @color-gray19,
+                    @_icon-font-color-active: @color-gray19
                 );
             }
 
             &.delete {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-trash
+                    @_icon-font-content: @icon-trash
                 );
             }
         }
@@ -408,6 +400,7 @@
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .minicart-wrapper {
         margin-left: 13px;
+        
         .block-minicart {
             right: -15px;
             width: 390px;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
index e1e23a9ffbb15..3fdd20e34e09a 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
@@ -25,6 +25,7 @@
             padding: @block-auth__dropdown__padding;
         }
     }
+
     .authentication-wrapper {
         float: right;
         margin-top: -1.5*@indent__xl;
@@ -94,7 +95,7 @@
                 padding-top: @indent__xl;
                 position: relative;
 
-                &::before {
+                &:before {
                     .lib-css(height, @block-auth__or-label__size);
                     .lib-css(line-height, @block-auth__or-label__size - 2px);
                     .lib-css(margin, -(@block-auth__or-label__size/2 + 1px) 0 0 -(@block-auth__or-label__size / 2));
@@ -212,7 +213,7 @@
                 margin: 0;
                 padding: @indent__s 0 0 @indent__xl;
 
-                &::before {
+                &:before {
                     left: 0;
                     top: 50%;
                 }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
index 86df8d870552b..85c65bd0ff2d7 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
@@ -35,7 +35,11 @@
             .action {
                 &.showcart {
                     &:before {
-                        .lib-css(color, @primary__color);
+                        .lib-css(color, @button__color);
+                    }
+                    
+                    &:hover:before {
+                        .lib-css(color, @button__hover__color);
                     }
                 }
             }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index 5da1faeb8216e..43c2ad50c7a6f 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -49,6 +49,10 @@
             }
         }
 
+        .discount.coupon {
+            display: none;
+        }
+
         .grand.incl {
             & + .grand.excl {
                 .mark,
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 4e1156949de3a..3ce46a73a11c4 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -198,6 +198,7 @@
         .payment-option-title {
             .lib-css(padding-left, @checkout-payment-option-content__padding__xl);
         }
+
         .payment-option-content {
             .payment-option-inner {
                 + .actions-toolbar {
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
index c58cfcd734e7d..5f8134193c67f 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -162,6 +162,11 @@
             .lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
         }
 
+        .step-title {
+            .lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
+            .lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
+        }
+
         .payment-method-title {
             .lib-css(padding, @checkout-payment-method-title-mobile__padding)
         }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
index 301517c6d0cd6..4792cb7b17924 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
@@ -16,7 +16,7 @@
 @checkout-progress-bar-item__color: @primary__color;
 @checkout-progress-bar-item__margin: @indent__s;
 @checkout-progress-bar-item__width: 185px;
-@checkout-progress-bar-item__active__background-color: @color-orange-red1;
+@checkout-progress-bar-item__active__background-color: @active__color;
 @checkout-progress-bar-item__complete__color: @link__color;
 
 @checkout-progress-bar-item-element__height: @checkout-progress-bar-item-element__width;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
index e7f0259fc9ce3..af6127fd2ca9f 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
@@ -22,7 +22,7 @@
 @checkout-shipping-item__width: 100%/3;
 @checkout-shipping-item-tablet__width: 100%/2;
 @checkout-shipping-item-mobile__width: 100%;
-@checkout-shipping-item__active__border-color: @color-orange-red1;
+@checkout-shipping-item__active__border-color: @active__color;
 
 @checkout-shipping-item-icon__selected__height: 27px;
 @checkout-shipping-item-icon__selected__width: 29px;
@@ -98,11 +98,6 @@
                     text-align: center;
                     top: 0;
                 }
-
-                .action-select-shipping-item {
-                    &:extend(.abs-no-display-s all);
-                    visibility: hidden;
-                }
             }
         }
 
@@ -188,6 +183,7 @@
                     }
                 }
             }
+
             .row-error {
                 td {
                     border-top: none;
@@ -285,6 +281,7 @@
             .lib-css(max-width, @checkout-shipping-address__max-width);
         }
     }
+
     .table-checkout-shipping-method {
         width: auto;
     }
@@ -324,6 +321,7 @@
             }
         }
     }
+
     .table-checkout-shipping-method {
         min-width: 500px;
     }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
index cf84f34279086..bf264a98f33b8 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 @checkout-tooltip__hover__z-index: @tooltip__z-index;
-@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m;
 
 @checkout-tooltip-icon-arrow__font-size: 10px;
 @checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width);
@@ -138,9 +137,12 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break >= @screen__m) {
     .field-tooltip {
         .field-tooltip-content {
+            .lib-css(right, @checkout-tooltip-content-mobile__right);
+            .lib-css(top, @checkout-tooltip-content-mobile__top);
+            left: auto;
             &:extend(.abs-checkout-tooltip-content-position-top-mobile all);
         }
     }
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 3ffaeb82cdc2a..9df59ca5dac92 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -11,7 +11,7 @@
 @account-nav-color: false;
 
 @account-nav-current-border: 3px solid transparent;
-@account-nav-current-border-color: @color-orange-red1;
+@account-nav-current-border-color: @active__color;
 @account-nav-current-color: false;
 @account-nav-current-font-weight: @font-weight__semibold;
 
@@ -65,7 +65,7 @@
     }
 
     .form-address-edit {
-        #region_id {
+        .region_id {
             display: none;
         }
 
@@ -368,7 +368,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: @indent__base;
         }
 
         .toolbar {
diff --git a/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less
index d05bcec38cbed..03a474012cb0c 100644
--- a/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less
@@ -15,6 +15,7 @@
         .actions-toolbar:not(:last-child) {
             margin-bottom: @indent__xl;
         }
+
         .fieldset {
             .nested {
                 .field:not(.choice) {
diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
index 6baa2432ff035..2761a2f74f990 100644
--- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -35,12 +35,19 @@
             .items {
                 text-align: left;
                 .item {
+                    > span {
+                        display: block;
+                        padding: 5px 5px 5px 23px;
+                    }
                     &:last-child {
                         &:hover {
                             .lib-css(background, @dropdown-list-item__hover);
                         }
                     }
                 }
+                li {
+                    padding: 0;
+                }
             }
 
             .table-comparison &,
@@ -178,7 +185,7 @@
         }
 
         .form-wishlist-search {
-            .lib-css(margin-bottom, @indent__l*2);
+            margin-bottom: @indent__l * 2;
             max-width: 500px;
 
             .fieldset {
@@ -209,8 +216,9 @@
 
     .block-wishlist-info-items {
         .block-title {
-            .lib-css(margin-bottom, @indent__base);
             .lib-font-size(22);
+            margin-bottom: @indent__base;
+            
             > strong {
                 font-weight: @font-weight__light;
             }
@@ -381,16 +389,16 @@
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .wishlist {
         &.window.popup {
+            .field {
+                .lib-form-field-type-revert(@_type: block);
+            }
+
             bottom: auto;
             .lib-css(top, @desktop-popup-position-top);
             .lib-css(left, @desktop-popup-position-left);
             .lib-css(margin-left, @desktop-popup-margin-left);
             .lib-css(width, @desktop-popup-width);
             right: auto;
-
-            .field {
-                .lib-form-field-type-revert(@_type: block);
-            }
         }
     }
 
diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
index 634c33e233335..46f9661d8281d 100644
--- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
@@ -9,6 +9,75 @@
 
 & when (@media-common = true) {
     .multicheckout {
+        &.results,
+        &.success {
+            h3 {
+                font-size: 1.6rem;
+                margin-bottom: @indent__base;
+                margin-top: @indent__l;
+                a {
+                    color: @text__color;
+                    &:hover {
+                        text-decoration: none;
+                    }
+                }
+            }
+
+            ul.orders-list {
+                list-style: none;
+                padding-left: 0;
+            }
+
+            .orders-list {
+                margin-top: @indent__m;
+                padding-left: @indent__base - 4px;
+
+                .shipping-list {
+                    .shipping-item {
+                        margin-left: 84px;
+                    }
+
+                    .shipping-label {
+                        font-weight: @font-weight__bold;
+                        margin-right: @indent__s;
+                    }
+
+                    .shipping-address {
+                        font-weight: @font-weight__regular;
+                    }
+
+                    .error-block {
+                        color: @error__color;
+
+                        .error-label {
+                            font-weight: @font-weight__bold;
+                            margin-right: @indent__s;
+                        }
+
+                        .error-description {
+                            font-weight: @font-weight__regular;
+                        }
+                    }
+                }
+            }
+
+            .orders-succeed {
+                .orders-list {
+                    margin-top: 0;
+
+                    .shipping-list {
+                        .order-id {
+                            float: left;
+                        }
+
+                        .shipping-item {
+                            margin-left: 100px;
+                        }
+                    }
+                }
+            }
+        }
+
         .title {
             margin-bottom: @indent__l;
 
@@ -44,14 +113,6 @@
                     }
                 }
             }
-
-            .cart-price {
-                &:extend(.abs-checkout-cart-price all);
-            }
-
-            .product-item-name {
-                &:extend(.abs-checkout-product-name all);
-            }
         }
 
         &:not(.address) {
@@ -159,6 +220,13 @@
                     margin-bottom: @indent__xl;
                 }
             }
+
+            .error-description {
+                color: @error__color;
+                font-weight: @font-weight__regular;
+                margin-bottom: @indent__s;
+                margin-top: -@indent__s;
+            }
         }
 
         .box-title {
diff --git a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
index 7d5b79bc5a091..69ec01d71e104 100644
--- a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
@@ -15,9 +15,9 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
-
     .rating-summary {
         .lib-rating-summary();
+        
         .rating-result {
             margin-left: -5px;
         }
@@ -165,10 +165,10 @@
 
         .review-details {
             .customer-review-rating {
-                .lib-css(margin-bottom, @indent__base);
+                margin-bottom: @indent__base;
 
                 .item {
-                    .lib-css(margin-bottom, @indent__s);
+                    margin-bottom: @indent__s;
 
                     &:last-child {
                         margin-bottom: 0;
@@ -178,12 +178,12 @@
 
             .review-title {
                 .lib-heading(h3);
-                .lib-css(font-weight, @font-weight__semibold);
-                .lib-css(margin-bottom, @indent__base);
+                font-weight: @font-weight__semibold;
+                margin-bottom: @indent__base;
             }
 
             .review-content {
-                .lib-css(margin-bottom, @indent__base);
+                margin-bottom: @indent__base;
             }
         }
 
@@ -271,7 +271,7 @@
 
         &-field-rating {
             .control {
-                margin-bottom: 1.2*@indent__xl;
+                margin-bottom: 1.2 * @indent__xl;
                 margin-top: @indent__s;
             }
         }
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
index 84adec39c8892..215d7d8b322b4 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
@@ -203,7 +203,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
index 1ea1e2c483d0b..3847393a2f046 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
@@ -262,7 +262,7 @@
         }
 
         .toolbar {
-            &:extend(.abs-add-clearfix-desktop all);
+            &:extend(.abs-add-clearfix-mobile all);
 
             .pages {
                 float: right;
diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index 907180eb37444..28aa3f187e95c 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -4,289 +4,339 @@
 //  */
 
 //
-//  Common
+//  Variables
 //  _____________________________________________
 
- & when (@media-common = true) {
-    .swatch-attribute-label {
-        font-weight: bold;
-        position: relative;
-    }
+@swatch-attribute-option__selected__color: #646464;
 
-    .swatch-attribute-label.required {
-        padding-right: 10px;
-    }
+@swatch-option__background: @color-gray94;
+@swatch-option__border: @border-width__base solid #dadada;
 
-    .swatch-attribute-label[data-required="1"]:after {
-        content: '*';
-        color: red;
-        position: absolute;
-        right: -11px;
-        top: -2px;
-        font-weight: bold;
-        font-size: 1em;
-    }
+@swatch-option__hover__border: @border-width__base solid @color-white;
+@swatch-option__hover__color: @color-gray20;
+@swatch-option__hover__outline: 1px solid @color-gray60;
 
-    .swatch-attribute-selected-option {
-        color: #646464;
-        padding-left: 17px;
-    }
-
-    .swatch-attribute-options {
-        margin-top: 10px;
-    }
-
-    .swatch-option {
-        padding: 1px 2px;
-        min-width: 30px;
-        max-width: 90px;
-        height: 20px;
-        float: left;
-        margin: 0 10px 5px 0;
-        text-align: center;
-        cursor: pointer;
-        position: relative;
-        border: 1px solid rgb(218, 218, 218);
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
+@swatch-option__selected__border: @swatch-option__hover__border;
+@swatch-option__selected__color: @swatch-option__hover__color;
+@swatch-option__selected__outline: 2px solid @active__color;
 
-    .swatch-option.text {
-        background: #F0F0F0;
-        color: #686868;
-        font-size: 12px;
-        font-weight: 700;
-        line-height: 20px;
-        padding: 4px 8px;
-        min-width: 22px;
-        margin-right: 7px;
-    }
+@swatch-option__disabled__background: @color-red10;
 
-    .swatch-option.selected {
-        outline: 2px solid #ff5501;
-        border: 1px solid #fff;
-        color: #333;
-    }
+//  Text attributes
+@swatch-option-text__background: @swatch-option__background;
+@swatch-option-text__color: #686868;
 
-    .swatch-option.text.selected {
-        background-color: #FFF !important;
-    }
+@swatch-option-text__selected__background-color: @color-white;
 
-    .clearfix:after {
-        content: '';
-        visibility: hidden;
-        display: block;
-        height: 0;
-        clear: both;
-    }
+//  Size and Manufacturer attributes
+@attr-swatch-option__background: @swatch-option__background;
+@attr-swatch-option__color: #949494;
 
-    .swatch-attribute.size .swatch-option,
-    .swatch-attribute.manufacturer .swatch-option {
-        background: rgb(240, 240, 240);
-        color: rgb(148, 148, 148);
-    }
+@attr-swatch-option__selected__background: @color-white;
+@attr-swatch-option__selected__border: @border-width__base solid @color-white;
+@attr-swatch-option__selected__color: @color-black;
 
-    .swatch-attribute.size .swatch-option.selected,
-    .swatch-attribute.manufacturer .swatch-option.selected {
-        color: black;
-        background: #fff;
-        border: 1px solid #fff;
-    }
+//  Image and Color swatch
+@img-color-swatch-option__hover__border: @swatch-option__hover__border;
+@img-color-swatch-option__hover__outline: 2px solid darken(@active__color, 12%);
 
-    .swatch-option:not(.disabled):hover {
-        outline: 1px solid #999;
-        border: 1px solid #fff;
-        color: #333;
-    }
+//  Tooltip
+@swatch-option-tooltip__background: @color-white;
+@swatch-option-tooltip__border: @swatch-option__border;
+@swatch-option-tooltip__color: #949494;
 
-    .swatch-option.image:not(.disabled):hover,
-    .swatch-option.color:not(.disabled):hover {
-        outline: 2px solid #ee0000;
-        border: 1px solid #fff;
-    }
+@swatch-option-tooltip-title__color: #282828;
 
-    .swatch-option.disabled {
-        cursor: default;
-    }
+@swatch-option-tooltip-layered__background: @swatch-option-tooltip__background;
+@swatch-option-tooltip-layered__border: @swatch-option__border;
+@swatch-option-tooltip-layered__color: @swatch-option-tooltip__color;
 
-    .swatch-option.disabled:after {
-        content: '';
-        position: absolute;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0)));
-        background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1);
-    }
+@swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color;
 
-    .swatch-option-tooltip {
-        max-width: 140px;
-        max-height: 100%;
-        min-height: 20px;
-        min-width: 20px;
-        position: absolute;
-        padding: 5px;
-        background: #fff;
-        color: rgb(148, 148, 148);
-        border: 1px solid #adadad;
-        display: none;
-        z-index: 999;
-        text-align: center;
-    }
+//  Layered Features
+@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @focus__color;
 
-    .swatch-option-tooltip .corner,
-    .swatch-option-tooltip-layered .corner {
-        left: 40%;
-        position: absolute;
-        bottom: 0;
-        height: 8px;
-    }
+//
+//  Common
+//  _____________________________________________
 
-    .swatch-option-tooltip .corner:after,
-    .swatch-option-tooltip-layered .corner:after {
-        content: '';
-        position: relative;
-        top: 1px;
-        left: -15px;
-        width: 0;
-        height: 0;
-        border-style: solid;
-        border-width: 7px 7.5px 0 7.5px;
-        border-color: #fff transparent transparent transparent;
-        font-size: 1px;
+& when (@media-common = true) {
+
+    .swatch {
+        &-attribute {
+            &-label {
+                font-weight: @font-weight__bold;
+                position: relative;
+
+                &.required {
+                    padding-right: @indent__s;
+                }
+
+                &[data-required='1']:after {
+                    .lib-css(color, @form-field-label-asterisk__color);
+                    content: '*';
+                    font-size: @font-size__base;
+                    font-weight: @font-weight__bold;
+                    position: absolute;
+                    right: -11px;
+                    top: -2px;
+                }
+            }
+
+            &-selected-option {
+                .lib-css(color, @swatch-attribute-option__selected__color);
+                padding-left: 17px;
+            }
+
+            &-options {
+                margin-top: @indent__s;
+
+                .swatch-option-tooltip-layered .title {
+                    .lib-css(color, @swatch-option-tooltip-layered-title__color);
+                    width: 100%;
+                    height: 20px;
+                    position: absolute;
+                    bottom: -5px;
+                    left: 0;
+                    text-align: center;
+                    margin-bottom: @indent__s;
+                }
+            }
+
+            &.size,
+            &.manufacturer {
+                .swatch-option {
+                    .lib-css(background, @attr-swatch-option__background);
+                    .lib-css(color, @attr-swatch-option__color);
+
+                    &.selected {
+                        .lib-css(blackground, @attr-swatch-option__selected__background);
+                        .lib-css(border, @attr-swatch-option__selected__border);
+                        .lib-css(color, @attr-swatch-option__selected__color);  
+                    }
+                }
+            }
+        }
+
+        &-option {
+            .lib-css(border, @swatch-option__border);
+            cursor: pointer;
+            float: left;
+            height: 20px;
+            margin: 0 @indent__s @indent__xs 0;
+            max-width: 100%;
+            min-width: 30px;
+            overflow: hidden;
+            padding: 1px 2px;
+            position: relative;
+            text-align: center;
+            text-overflow: ellipsis;
+
+            &.text {
+                .lib-css(background, @swatch-option-text__background);
+                .lib-css(color, @swatch-option-text__color);
+                font-size: @font-size__s;
+                font-weight: @font-weight__bold;
+                line-height: 20px;
+                padding: 4px 8px;
+                min-width: 22px;
+                margin-right: 7px;
+
+                &.selected {
+                    .lib-css(background-color, @swatch-option-text__selected__background-color) !important;
+                }
+            }
+
+            &.selected {
+                .lib-css(outline, @swatch-option__selected__outline);
+                .lib-css(border, @swatch-option__selected__border);
+                .lib-css(color, @swatch-option__selected__color);
+            }
+
+            &:not(.disabled):hover {
+                .lib-css(border, @swatch-option__hover__border);
+                .lib-css(color, @swatch-option__hover__color);
+                .lib-css(outline, @swatch-option__hover__outline);
+            }
+
+            &.image,
+            &.color {
+                &:not(.disabled):hover {
+                    .lib-css(border, @img-color-swatch-option__hover__border);
+                    .lib-css(outline, @img-color-swatch-option__hover__outline);
+                }
+            }
+
+            &.disabled {
+                cursor: default;
+
+                &:after {
+                    //  ToDo: improve .lib-background-gradient() to support diagonal gradient
+                    background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0)));
+                    background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    bottom: 0;
+                    content: '';
+                    filter: 'progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff, endColorstr=#00ffffff, GradientType=1)';
+                    left: 0;
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+            &-disabled {
+                border: 0;
+                cursor: default;
+                outline: none !important;
+
+                &:after {
+                    .lib-rotate(-30deg);
+                    content: '';
+                    height: 2px;
+                    left: -4px;
+                    position: absolute;
+                    top: 10px;
+                    width: 42px;
+                    z-index: 995;
+                    .lib-css(background, @swatch-option__disabled__background);
+                }
+            }
+
+            &-loading {
+                .lib-css(content, @loading__background-image);
+            }
+
+            &-tooltip {
+                .lib-css(border, @swatch-option-tooltip__border);
+                .lib-css(color, @swatch-option-tooltip__color);
+                display: none;
+                max-height: 100%;
+                min-height: 20px;
+                min-width: 20px;
+                padding: @indent__xs;
+                position: absolute;
+                text-align: center;
+                z-index: 999;
+                .lib-css(background, @swatch-option-tooltip__background);
+
+                &,
+                &-layered {
+                    .corner {
+                        bottom: 0;
+                        height: 8px;
+                        left: 40%;
+                        position: absolute;
+
+                        &:before,
+                        &:after {
+                            border-style: solid;
+                            content: '';
+                            font-size: 1px;
+                            height: 0;
+                            position: relative;
+                            width: 0;
+                        }
+
+                        &:before {
+                            border-color: @color-gray68 transparent transparent transparent;
+                            border-width: 8px 8.5px 0 8.5px;
+                            left: 0;
+                            top: 2px;
+                        }
+
+                        &:after {
+                            border-color: @color-white transparent transparent transparent;
+                            border-width: 7px 7.5px 0 7.5px;
+                            left: -15px;
+                            top: 1px;
+                        }
+                    }
+
+                    .image {
+                        display: block;
+                        height: 130px;
+                        margin: 0 auto;
+                        width: 130px;
+                    }
+                }
+
+                &-layered {
+                    .lib-css(border, @swatch-option-tooltip-layered__border);
+                    .lib-css(color, @swatch-option-tooltip-layered__color);
+                    .lib-css(background, @swatch-option-tooltip-layered__background);
+                    display: none;
+                    left: -47px;
+                    position: absolute;
+                    width: 140px;
+                    z-index: 999;
+                }
+
+                .title {
+                    .lib-css(color, @swatch-option-tooltip-title__color);
+                    display: block;
+                    max-height: 200px;
+                    min-height: 20px;
+                    overflow: hidden;
+                    text-align: center;
+                }
+            }
+
+            &-link-layered {
+                margin: 0 !important;
+                padding: 0 !important;
+                position: relative;
+
+                &:focus > div {
+                    .lib-css(box-shadow, @swatch-option-link-layered__focus__box-shadow);
+                }
+
+                &:hover > .swatch-option-tooltip-layered {
+                    display: block;
+                }
+            }
+        }
+
+        &-opt {
+            margin: @indent__base 0;
+
+            &-listing {
+                margin-bottom: @indent__s;
+            }
+        }
+
+        &-more {
+            display: inline-block;
+            margin: 2px 0;
+            position: static;
+            text-decoration: none !important;
+            z-index: 1;
+        }
+
+        &-visual-tooltip-layered {
+            height: 160px;
+            top: -170px;
+        }
+
+        &-textual-tooltip-layered {
+            height: 30px;
+            top: -40px;
+        }
+
+        &-input {
+            left: -1000px;
+            position: absolute;
+            visibility: hidden;
+        }
     }
 
-    .swatch-option-tooltip .corner:before,
-    .swatch-option-tooltip-layered .corner:before {
+    .clearfix:after {
+        clear: both;
         content: '';
-        position: relative;
-        top: 2px;
-        left: 0;
-        width: 0;
-        height: 0;
-        border-style: solid;
-        border-width: 8px 8.5px 0 8.5px;
-        border-color: #adadad transparent transparent transparent;
-        font-size: 1px;
-    }
-
-    .swatch-option-tooltip .image,
-    .swatch-option-tooltip-layered .image {
-        display: block;
-        height: 130px;
-        width: 130px;
-        margin: 0 auto;
-    }
-
-    .swatch-option-tooltip .title {
-        max-width: 140px;
-        min-height: 20px;
-        max-height: 200px;
-        color: rgb(40, 40, 40);
-        text-align: center;
-        display: block;
-        overflow: hidden;
-    }
-
-    .swatch-opt {
-        margin: 20px 0;
-    }
-
-    .swatch-more {
-        display: inline-block;
-        margin: 2px 0;
-        text-decoration: none !important;
-        position: static;
-        z-index: 1;
-    }
-
-    // Layered Features
-    .swatch-option-link-layered {
-        position: relative;
-        margin: 0 !important;
-        padding: 0 !important;
-    }
-
-    .swatch-option-link-layered:focus>div {
-        box-shadow: 0 0 3px 1px #68a8e0;
-    }
-
-    .swatch-option-tooltip-layered {
-        width: 140px;
-        position: absolute;
-        background: #fff;
-        color: rgb(148, 148, 148);
-        border: 1px solid #adadad;
-        display: none;
-        z-index: 999;
-        left: -47px;
-    }
-
-    .swatch-visual-tooltip-layered {
-        height: 160px;
-        top: -170px;
-    }
-
-    .swatch-textual-tooltip-layered {
-        height: 30px;
-        top: -40px;
-    }
-
-    .swatch-option-link-layered:hover>.swatch-option-tooltip-layered {
         display: block;
-    }
-
-    .swatch-attribute-options .swatch-option-tooltip-layered .title {
-        width: 100%;
-        height: 20px;
-        position: absolute;
-        bottom: -5px;
-        left: 0;
-        color: rgb(40, 40, 40);
-        text-align: center;
-        margin-bottom: 10px;
-    }
-
-    .swatch-option-disabled:after {
-        content: '';
-        position: absolute;
-        width: 42px;
-        height: 2px;
-        background: red;
-        transform: rotate(-30deg);
-        -o-transform: rotate(-30deg);
-        -moz-transform: rotate(-30deg);
-        -ms-transform: rotate(-30deg);
-        -webkit-transform: rotate(-30deg);
-        z-index: 995;
-        left: -4px;
-        top: 10px;
-    }
-
-    .swatch-option-disabled {
-        outline: none !important;
-        cursor: default;
-        border: 0;
-    }
-
-    // Bugfix for Add To Cart button
-    .swatch-opt-listing {
-        margin-bottom: 10px;
-    }
-
-    .swatch-option-loading {
-        content: url(../Magento_Swatches/images/loader-2.gif);
-    }
-
-    .swatch-input {
-        left: -1000px;
-        position: absolute;
+        height: 0;
         visibility: hidden;
     }
 }
diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif b/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif
deleted file mode 100644
index 362e2455f4be8..0000000000000
Binary files a/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif and /dev/null differ
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
index ed7af5872483b..b314bcf5b3473 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
@@ -52,6 +52,16 @@
         .lib-css(background-color, @page__background-color);
     }
 
+    .page-wrapper {
+        .lib-vendor-prefix-display(flex);
+        .lib-vendor-prefix-flex-direction(column);
+        min-height: 100vh; // Stretch content area for sticky footer
+    }
+
+    .page-main {
+        .lib-vendor-prefix-flex-grow(1);
+    }
+
     //
     //  Header
     //  ---------------------------------------------
@@ -279,28 +289,13 @@
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-
-    html,
-    body {
-        height: 100%; // Stretch screen area for sticky footer
-    }
-
     .page-wrapper {
-        .lib-vendor-prefix-display(flex);
-        .lib-vendor-prefix-flex-direction(column);
-        min-height: 100%; // Stretch content area for sticky footer
-
         > .breadcrumbs,
         > .top-container,
         > .widget {
             box-sizing: border-box;
             width: 100%;
         }
-
-        .ie10 &,
-        .ie11 & {
-            height: 100%;
-        }
     }
 
     .navigation ul {
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 5b58622e2e286..b9f0b5e66ab5e 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-theme",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
index c0c40250158c0..572632b6683e3 100644
--- a/app/design/frontend/Magento/blank/etc/view.xml
+++ b/app/design/frontend/Magento/blank/etc/view.xml
@@ -12,9 +12,9 @@
                 <width>140</width>
                 <height>140</height>
             </image>
-            <image id="cart_cross_sell_products" type="thumbnail">
-                <width>152</width>
-                <height>188</height>
+            <image id="cart_cross_sell_products" type="small_image">
+                <width>240</width>
+                <height>300</height>
             </image>
             <image id="cart_page_product_thumbnail" type="small_image">
                 <width>110</width>
@@ -73,22 +73,23 @@
                 <height>140</height>
             </image>
             <image id="product_page_image_large" type="image"/>
-            <image id="product_page_image_large_no_frame" type="image">
-                <frame>false</frame>
-            </image>
             <image id="product_page_image_medium" type="image">
                 <width>700</width>
                 <height>700</height>
             </image>
-            <image id="product_page_image_medium_no_frame" type="image">
-                <width>700</width>
-                <height>700</height>
-                <frame>false</frame>
-            </image>
             <image id="product_page_image_small" type="thumbnail">
                 <width>90</width>
                 <height>90</height>
             </image>
+            <image id="product_swatch_image_large" type="image"/>
+            <image id="product_swatch_image_medium" type="image">
+                <width>240</width>
+                <height>300</height>
+            </image>
+            <image id="product_swatch_image_small" type="thumbnail">
+                <width>88</width>
+                <height>110</height>
+            </image>
             <image id="product_page_main_image" type="image">
                 <width>700</width>
                 <height>700</height>
@@ -260,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/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv
index b9a1d343b7f2d..a491a567a3777 100644
--- a/app/design/frontend/Magento/blank/i18n/en_US.csv
+++ b/app/design/frontend/Magento/blank/i18n/en_US.csv
@@ -1,5 +1,4 @@
 Summary,Summary
-"Account Dashboard","Account Dashboard"
 "Account Information","Account Information"
 "Address Book","Address Book"
 Menu,Menu
diff --git a/app/design/frontend/Magento/blank/web/css/print.less b/app/design/frontend/Magento/blank/web/css/print.less
index 474bc27b0751b..ebfc6ce4300b7 100644
--- a/app/design/frontend/Magento/blank/web/css/print.less
+++ b/app/design/frontend/Magento/blank/web/css/print.less
@@ -132,4 +132,8 @@
     .footer.content {
         padding: 0;
     }
+
+    .hidden-print {
+        display: none !important;
+    }
 }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_email-base.less b/app/design/frontend/Magento/blank/web/css/source/_email-base.less
index 1d7336b8b3222..29f6fd0dcbcfc 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_email-base.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_email-base.less
@@ -238,7 +238,7 @@ body {
         a:visited {
             //  Undo general link hover state
             border: 1px solid @button-primary__hover__background;
-            color: @button-primary__color !important;
+            color: @button-primary__hover__color !important;
             text-decoration: none !important;
         }
     }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
index d4bede1279602..74dfd48d87a87 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -162,7 +162,7 @@
 & when (@media-common = true) {
     .abs-login-block-title {
         strong {
-            font-weight: 500;
+            font-weight: @font-weight__heavier;
         }
 
         .lib-font-size(18);
@@ -178,11 +178,11 @@
 
 & when (@media-common = true) {
     .abs-block-title {
+        margin-bottom: 15px;
+        
         > strong {
             .lib-heading(h3);
         }
-
-        margin-bottom: 15px;
     }
 }
 
@@ -194,6 +194,7 @@
     .abs-account-blocks {
         .block-title {
             &:extend(.abs-block-title all);
+            
             > .action {
                 margin-left: 15px;
             }
@@ -208,7 +209,7 @@
             }
 
             > .action {
-                font-weight: 400;
+                font-weight: @font-weight__regular;
                 margin-left: @indent__s;
             }
         }
@@ -232,10 +233,10 @@
 & when (@media-common = true) {
     .abs-dropdown-simple {
         .lib-dropdown(
-        @_dropdown-list-item-padding: 5px 5px 5px 23px,
-        @_dropdown-list-min-width: 200px,
-        @_icon-font-margin: 0 0 0 5px,
-        @_icon-font-vertical-align: middle
+            @_dropdown-list-item-padding: 5px 5px 5px 23px,
+            @_dropdown-list-min-width: 200px,
+            @_icon-font-margin: 0 0 0 5px,
+            @_icon-font-vertical-align: middle
         );
     }
 }
@@ -252,7 +253,7 @@
 }
 
 //
-//  Marging for blocks & widgets
+//  Margin for blocks & widgets
 //  ---------------------------------------------
 
 & when (@media-common = true) {
@@ -268,13 +269,13 @@
 & when (@media-common = true) {
     .abs-remove-button-for-blocks {
         .lib-icon-font(
-        @icon-remove,
-        @_icon-font-size: 26px,
-        @_icon-font-line-height: 15px,
-        @_icon-font-text-hide: true,
-        @_icon-font-color: @color-gray19,
-        @_icon-font-color-hover: @color-gray19,
-        @_icon-font-color-active: @color-gray19
+            @icon-remove,
+            @_icon-font-size: 26px,
+            @_icon-font-line-height: 15px,
+            @_icon-font-text-hide: true,
+            @_icon-font-color: @color-gray19,
+            @_icon-font-color-hover: @color-gray19,
+            @_icon-font-color-active: @color-gray19
         );
     }
 }
@@ -289,14 +290,14 @@
 
         > a {
             .lib-link(
-            @_link-color: @product-name-link__color,
-            @_link-text-decoration: @product-name-link__text-decoration,
-            @_link-color-visited: @product-name-link__color__visited,
-            @_link-text-decoration-visited: @product-name-link__text-decoration__visited,
-            @_link-color-hover: @product-name-link__color__hover,
-            @_link-text-decoration-hover: @product-name-link__text-decoration__hover,
-            @_link-color-active: @product-name-link__color__active,
-            @_link-text-decoration-active: @product-name-link__text-decoration__active
+                @_link-color: @product-name-link__color,
+                @_link-text-decoration: @product-name-link__text-decoration,
+                @_link-color-visited: @product-name-link__color__visited,
+                @_link-text-decoration-visited: @product-name-link__text-decoration__visited,
+                @_link-color-hover: @product-name-link__color__hover,
+                @_link-text-decoration-hover: @product-name-link__text-decoration__hover,
+                @_link-color-active: @product-name-link__color__active,
+                @_link-text-decoration-active: @product-name-link__text-decoration__active
             );
         }
     }
@@ -613,11 +614,11 @@
 & when (@media-common = true) {
     .abs-navigation-icon {
         .lib-icon-font(
-        @_icon-font-content: @icon-down,
-        @_icon-font-size: 34px,
-        @_icon-font-line-height: 1.2,
-        @_icon-font-position: after,
-        @_icon-font-display: block
+            @_icon-font-content: @icon-down,
+            @_icon-font-size: 34px,
+            @_icon-font-line-height: 1.2,
+            @_icon-font-position: after,
+            @_icon-font-display: block
         );
 
         &:after {
@@ -635,8 +636,8 @@
 & when (@media-common = true) {
     .abs-split-button {
         .lib-dropdown-split(
-        @_options-selector : ~'.items',
-        @_dropdown-split-button-border-radius-fix: true
+            @_options-selector : ~'.items',
+            @_dropdown-split-button-border-radius-fix: true
         );
         vertical-align: middle;
     }
@@ -654,13 +655,13 @@
 
     .abs-actions-addto-gridlist {
         .lib-icon-font(
-        @_icon-font-content: '',
-        @_icon-font-size: 29px,
-        @_icon-font-color: @addto-color,
-        @_icon-font-color-hover: @addto-hover-color,
-        @_icon-font-text-hide: true,
-        @_icon-font-vertical-align: middle,
-        @_icon-font-line-height: 24px
+            @_icon-font-content: '',
+            @_icon-font-size: 29px,
+            @_icon-font-color: @addto-color,
+            @_icon-font-color-hover: @addto-hover-color,
+            @_icon-font-text-hide: true,
+            @_icon-font-vertical-align: middle,
+            @_icon-font-line-height: 24px
         );
     }
 }
@@ -762,11 +763,11 @@
         padding-right: 12px;
         position: relative;
         .lib-icon-font(
-        @icon-down,
-        @_icon-font-size: 26px,
-        @_icon-font-line-height: 10px,
-        @_icon-font-margin: 3px 0 0 0,
-        @_icon-font-position: after
+            @icon-down,
+            @_icon-font-size: 26px,
+            @_icon-font-line-height: 10px,
+            @_icon-font-margin: 3px 0 0 0,
+            @_icon-font-position: after
         );
 
         &:after {
@@ -777,16 +778,16 @@
 
         &-expanded {
             .lib-icon-font-symbol(
-            @_icon-font-content: @icon-up,
-            @_icon-font-position: after
+                @_icon-font-content: @icon-up,
+                @_icon-font-position: after
             );
         }
     }
 
     .abs-tax-total-expanded {
         .lib-icon-font-symbol(
-        @_icon-font-content: @icon-up,
-        @_icon-font-position: after
+            @_icon-font-content: @icon-up,
+            @_icon-font-position: after
         );
     }
 }
@@ -803,20 +804,6 @@
     }
 }
 
-//
-//  Checkout order review price
-//  ---------------------------------------------
-
-.abs-checkout-cart-price {
-}
-
-//
-//  Checkout order product name
-//  ---------------------------------------------
-
-.abs-checkout-product-name {
-}
-
 //
 //  Checkout order review
 //  ---------------------------------------------
@@ -846,7 +833,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th) ':';
                         display: block;
                         font-weight: @font-weight__bold;
@@ -881,10 +868,10 @@
 & when (@media-common = true) {
     .abs-icon-add {
         .lib-icon-font(
-        @_icon-font-content: @icon-expand,
-        @_icon-font-size: 10px,
-        @_icon-font-line-height: 10px,
-        @_icon-font-vertical-align: middle
+            @_icon-font-content: @icon-expand,
+            @_icon-font-size: 10px,
+            @_icon-font-line-height: 10px,
+            @_icon-font-vertical-align: middle
         );
     }
 }
@@ -892,12 +879,12 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .abs-icon-add-mobile {
         .lib-icon-font(
-        @_icon-font-content: @icon-expand,
-        @_icon-font-size: 10px,
-        @_icon-font-line-height: 10px,
-        @_icon-font-vertical-align: middle,
-        @_icon-font-margin: 0 5px 0 0,
-        @_icon-font-display: block
+            @_icon-font-content: @icon-expand,
+            @_icon-font-size: 10px,
+            @_icon-font-line-height: 10px,
+            @_icon-font-vertical-align: middle,
+            @_icon-font-margin: 0 5px 0 0,
+            @_icon-font-display: block
         );
     }
 }
@@ -938,11 +925,11 @@
         position: relative;
 
         .lib-icon-font(
-        @_icon-font-content: @icon-down,
-        @_icon-font-size: 28px,
-        @_icon-font-text-hide: false,
-        @_icon-font-position: after,
-        @_icon-font-display: block
+            @_icon-font-content: @icon-down,
+            @_icon-font-size: 28px,
+            @_icon-font-text-hide: false,
+            @_icon-font-position: after,
+            @_icon-font-display: block
         );
 
         &:after {
@@ -1082,12 +1069,12 @@
                 font-weight: @font-weight__bold;
                 .lib-link-as-button();
                 .lib-button(
-                @_button-padding: 7px 15px 7px 0,
-                @_button-icon-use: true,
-                @_button-font-content: @icon-prev,
-                @_button-icon-font-size: 32px,
-                @_button-icon-font-line-height: 16px,
-                @_button-icon-font-position: before
+                    @_button-padding: 7px 15px 7px 0,
+                    @_button-icon-use: true,
+                    @_button-font-content: @icon-prev,
+                    @_button-icon-font-size: 32px,
+                    @_button-icon-font-line-height: 16px,
+                    @_button-icon-font-position: before
                 );
 
                 &:active {
@@ -1097,9 +1084,9 @@
 
             &.update {
                 .lib-button-icon(
-                @icon-update,
-                @_icon-font-size: 32px,
-                @_icon-font-line-height: 16px
+                    @icon-update,
+                    @_icon-font-size: 32px,
+                    @_icon-font-line-height: 16px
                 );
                 padding-left: @indent__xs;
             }
@@ -1174,7 +1161,7 @@
 
 & when (@media-common = true) {
     .abs-field-date-input {
-        .lib-css(margin-right, @indent__s);
+        margin-right: @indent__s;
         width: calc(~'100% -' @icon-calendar__font-size + @indent__s);
     }
 }
@@ -1189,7 +1176,7 @@
         position: relative;
 
         input {
-            .lib-css(margin-right, @indent__s);
+            margin-right: @indent__s;
             width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs);
         }
     }
@@ -1207,12 +1194,12 @@
     &:before,
     &:after {
         .lib-arrow(
-        @_position: top,
-        @_size: @checkout-tooltip-icon-arrow__font-size,
-        @_color: @checkout-tooltip-content__background-color
+            @_position: top,
+            @_size: @checkout-tooltip-icon-arrow__font-size,
+            @_color: @checkout-tooltip-content__background-color
         );
         .lib-css(margin-top, @checkout-tooltip-icon-arrow__left);
-        .lib-css(right, @indent__s);
+        right: @indent__s;
         left: auto;
         top: 0;
     }
@@ -1233,7 +1220,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .abs-checkout-tooltip-content-position-top-mobile {
         @abs-checkout-tooltip-content-position-top();
     }
@@ -1248,11 +1235,11 @@
         .lib-css(border-bottom, @checkout-step-title__border);
         .lib-css(padding-bottom, @checkout-step-title__padding);
         .lib-typography(
-        @_font-size: @checkout-step-title__font-size,
-        @_font-weight: @checkout-step-title__font-weight,
-        @_font-family: false,
-        @_font-style: false,
-        @_line-height: false
+            @_font-size: @checkout-step-title__font-size,
+            @_font-weight: @checkout-step-title__font-weight,
+            @_font-family: false,
+            @_font-style: false,
+            @_line-height: false
         );
     }
 }
@@ -1313,11 +1300,11 @@
 
                 .amount .price {
                     .lib-icon-font(
-                    @icon-down,
-                    @_icon-font-size: 30px,
-                    @_icon-font-text-hide: true,
-                    @_icon-font-position: after,
-                    @_icon-font-display: block
+                        @icon-down,
+                        @_icon-font-size: 30px,
+                        @_icon-font-text-hide: true,
+                        @_icon-font-position: after,
+                        @_icon-font-display: block
                     );
                     padding-right: @indent__m;
                     position: relative;
@@ -1337,16 +1324,16 @@
 
                     .amount .price {
                         .lib-icon-font-symbol(
-                        @_icon-font-content: @icon-up,
-                        @_icon-font-position: after
+                            @_icon-font-content: @icon-up,
+                            @_icon-font-position: after
                         );
                     }
                 }
             }
 
             &-details {
-                display: none;
                 .lib-css(border-bottom, @border-width__base solid @border-color__base);
+                display: none;
 
                 &.shown {
                     display: table-row;
@@ -1371,10 +1358,10 @@
             cursor: pointer;
             font-weight: @font-weight__semibold;
             .lib-icon-font(
-            @_icon-font-content: @icon-down,
-            @_icon-font-size: 30px,
-            @_icon-font-position: after,
-            @_icon-font-display: block
+                @_icon-font-content: @icon-down,
+                @_icon-font-size: 30px,
+                @_icon-font-position: after,
+                @_icon-font-display: block
             );
             margin-bottom: 0;
             overflow: hidden;
@@ -1402,8 +1389,8 @@
         &.active {
             > .title {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-prev,
-                @_icon-font-position: after
+                    @_icon-font-content: @icon-up,
+                    @_icon-font-position: after
                 );
             }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_layout.less b/app/design/frontend/Magento/blank/web/css/source/_layout.less
index 8d01ddc0a9bd3..24743c665b460 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_layout.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_layout.less
@@ -94,14 +94,6 @@
 
     .page-main {
         width: 100%;
-
-        .lib-vendor-prefix-flex-grow(1);
-        .lib-vendor-prefix-flex-shrink(0);
-        .lib-vendor-prefix-flex-basis(auto);
-
-        .ie9 & {
-            width: auto;
-        }
     }
 
     .columns {
diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index d2a770815861b..4499886ef0f10 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -93,7 +93,7 @@
         .switcher {
             border-top: 1px solid @color-gray82;
             font-size: 1.6rem;
-            font-weight: 700;
+            font-weight: @font-weight__bold;
             margin: 0;
             padding: .8rem 3.5rem .8rem 2rem;
 
@@ -147,7 +147,7 @@
 
                 &.greet.welcome {
                     border-top: 1px solid @color-gray82;
-                    font-weight: 700;
+                    font-weight: @font-weight__bold;
                     padding: .8rem @indent__base;
                 }
 
@@ -161,7 +161,7 @@
                 .lib-css(color, @navigation-level0-item__color);
                 .lib-css(text-decoration, @navigation-level0-item__text-decoration);
                 display: block;
-                font-weight: 700;
+                font-weight: @font-weight__bold;
                 padding: .8rem @indent__base;
             }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
index d5d6e5a3d105c..f0a3518c92a8b 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_sections.less
@@ -20,9 +20,7 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .product.data.items {
-        .lib-data-tabs(
-            @_tab-content-border-top-status: true
-        );
+        .lib-data-tabs();
     }
 }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_variables.less b/app/design/frontend/Magento/blank/web/css/source/_variables.less
index 5d946dd8a826e..256bc796dba94 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_variables.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_variables.less
@@ -15,6 +15,16 @@
 @font-family-name__base: 'Open Sans';
 @font-family__base: @font-family-name__base, @font-family__sans-serif;
 
+//
+//  Sections variables
+//  _____________________________________________
+
+//
+//  Tabs
+//  ---------------------------------------------
+@tab-content__border-top-status: true;
+
+
 //
 //  Sidebar
 //  ---------------------------------------------
diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
index d324bbeac598f..5cdb1444094e9 100644
--- a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
@@ -16,7 +16,6 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;
@@ -64,6 +63,8 @@
     }
 
     .modal-popup {
+        pointer-events: none;
+
         .modal-title {
             .lib-css(border-bottom, @modal-title__border);
             .lib-css(font-weight, @font-weight__light);
@@ -149,7 +150,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-inner-wrap[class] {
@@ -180,7 +181,7 @@
 //  Desktop
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-footer {
diff --git a/app/design/frontend/Magento/blank/web/images/logo.svg b/app/design/frontend/Magento/blank/web/images/logo.svg
index 013d6e7c5a107..0f29d4e3eef21 100644
--- a/app/design/frontend/Magento/blank/web/images/logo.svg
+++ b/app/design/frontend/Magento/blank/web/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 92225804ecc04..501a1d2918d6a 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -336,6 +336,11 @@
                 .lib-css(margin-top, @indent__xs);
             }
         }
+        .field {
+            .note.mage-error {
+                color: @error__color;
+            }
+        }
     }
 
     .product-options-bottom .price-box,
@@ -566,6 +571,16 @@
             }
         }
     }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
 }
 
 //
@@ -732,6 +747,16 @@
             }
         }
     }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
 }
 
 //
@@ -779,7 +804,7 @@
         clear: both;
         max-width: 100%;
         overflow-x: auto;
-        position: relative; // Needed for Safari(iOS) to properly render "overflow-x" rule.
+        position: relative; // Needed for Safari(iOS) to properly render 'overflow-x' rule.
 
         .table-comparison > tbody > tr {
             > th,
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 01b8c7be93aec..6bf766b7400a7 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -68,7 +68,6 @@
             }
 
             &-actions {
-                display: none;
 
                 .actions-secondary {
                     > button.action {
@@ -167,11 +166,11 @@
     .column.main {
         .product {
             &-items {
-                margin-left: -@indent__base;
+                margin-left: 0;
             }
 
             &-item {
-                padding-left: @indent__base;
+                padding-left: 0;
             }
         }
     }
@@ -277,8 +276,8 @@
                 }
                 .sidebar & {
                     .product-item-photo {
-                        top: 9px;
                         left: 9px;
+                        top: 9px;
                     }
                 }
             }
@@ -310,8 +309,8 @@
         .actions-primary + .actions-secondary {
             display: table-cell;
             padding-left: 10px;
-            width: 50%;
             vertical-align: middle;
+            width: 50%;
 
             > .action {
                 margin-right: 10px;
@@ -443,7 +442,7 @@
 
             .product-item {
                 margin-left: calc(~'(100% - 4 * 24.439%) / 3');
-                padding: 0;
+                padding: 5px;
                 width: 24.439%;
 
                 &:nth-child(4n + 1) {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
index 5c51938b23422..6bddc46003cbf 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -38,13 +38,15 @@
             .lib-css(box-shadow, @button__shadow);
             border-radius: 3px;
         }
-
+        .sorter-action {
+            position: relative;
+            top: -2px;
+        }
         &-amount {
             left: 0;
             line-height: @toolbar-mode-icon-font-size + 2;
             margin: 0;
             padding: 7px 0;
-            position: absolute;
             text-align: left;
             top: 0;
             vertical-align: middle;
@@ -234,10 +236,10 @@
         }
     }
 
-    .limiter {
-        float: right;
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
index 23acf9ee8b08d..f785dd74d900e 100644
--- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -37,9 +37,9 @@
             @_icon-font-size: 22px,
             @_icon-font-line-height: 28px,
             @_icon-font-margin: 0 @indent__s 0 0,
-            @_icon-font-color: @minicart-icons-color,
-            @_icon-font-color-hover: @minicart-icons-color-hover,
-            @_icon-font-color-active: @minicart-icons-color-hover,
+            @_icon-font-color: @header-icons-color,
+            @_icon-font-color-hover: @header-icons-color-hover,
+            @_icon-font-color-active: @header-icons-color-hover,
             @_icon-font-text-hide: true
             );
             display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 903af532a4f77..5aaf0cd02fab9 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -97,6 +97,7 @@
                 .field {
                     .radio {
                         float: left;
+                        margin-top: 4px;
                     }
 
                     .radio {
@@ -145,12 +146,6 @@
         }
 
         &:extend(.abs-adjustment-incl-excl-tax all);
-
-        .action {
-            &.multicheckout {
-                color: @color-blue2;
-            }
-        }
     }
 
     //  Totals block
@@ -162,6 +157,10 @@
                 text-align: left;
             }
         }
+
+        .discount.coupon {
+            display: none;
+        }
     }
 
     //  Products table
@@ -456,7 +455,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th);
                         display: block;
                         font-weight: @font-weight__semibold;
@@ -622,12 +621,9 @@
                     width: 1%;
                 }
 
-                &-item-details {
-                    padding-bottom: 35px;
-                }
-
                 &-item-details {
                     display: table-cell;
+                    padding-bottom: 35px;
                     vertical-align: top;
                     white-space: normal;
                     width: 99%;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index 1765ef65f95b3..b9b223f44021a 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -107,40 +107,32 @@
 
     .minicart-wrapper {
         .lib-dropdown(
-        @_toggle-selector: ~'.action.showcart',
-        @_options-selector: ~'.block-minicart',
-        @_dropdown-toggle-icon-content: @icon-cart,
-        @_dropdown-toggle-active-icon-content: @icon-cart,
-        @_dropdown-list-item-padding: false,
-        @_dropdown-list-item-hover: false,
-        @_icon-font-position: before,
-        @_icon-font-size: 22px,
-        @_icon-font-line-height: 28px,
-        @_icon-font-color: @minicart-icons-color,
-        @_icon-font-color-hover: @minicart-icons-color-hover,
-        @_icon-font-color-active: @minicart-icons-color
+            @_toggle-selector: ~'.action.showcart',
+            @_options-selector: ~'.block-minicart',
+            @_dropdown-list-width: 320px,
+            @_dropdown-list-position-right: -10px,
+            @_dropdown-list-pointer-position: right,
+            @_dropdown-list-pointer-position-left-right: 12px,
+            @_dropdown-list-z-index: 101,              
+            @_dropdown-toggle-icon-content: @icon-cart,
+            @_dropdown-toggle-active-icon-content: @icon-cart,
+            @_dropdown-list-item-padding: false,
+            @_dropdown-list-item-hover: false,
+            @_icon-font-position: before,
+            @_icon-font-size: 22px,
+            @_icon-font-line-height: 28px,
+            @_icon-font-color: @minicart-icons-color,
+            @_icon-font-color-hover: @minicart-icons-color-hover,
+            @_icon-font-color-active: @minicart-icons-color
         );
         float: right;
 
         .block-minicart {
             .lib-css(padding, 25px @minicart__padding-horizontal);
-            right: 0;
-            width: 320px;
-            z-index: 101;
-
+            
             .block-title {
                 display: none;
             }
-
-            &:after {
-                left: auto;
-                right: 25px;
-            }
-
-            &:before {
-                left: auto;
-                right: 26px;
-            }
         }
 
         .product {
@@ -161,17 +153,17 @@
 
         .action {
             &.close {
-                height: 40px;
+                height: 30px;
                 position: absolute;
                 right: 0;
                 top: 0;
-                width: 40px;
+                width: 25px;
                 .lib-button-reset();
                 .lib-button-icon(
                     @icon-remove,
                     @_icon-font-color: @minicart-icons-color,
-                    @_icon-font-size: 16px,
-                    @_icon-font-line-height: 16px,
+                    @_icon-font-size: 14px,
+                    @_icon-font-line-height: 14px,
                     @_icon-font-text-hide: true
                 );
             }
@@ -234,6 +226,7 @@
 
     .minicart-items {
         .lib-list-reset-styles();
+        
         .product-item {
             padding: @indent__base 0;
 
@@ -257,7 +250,6 @@
         .product-item-pricing {
             .label {
                 display: inline-block;
-                width: 4.5rem;
             }
         }
 
@@ -306,13 +298,14 @@
 
             .toggle {
                 &:extend(.abs-toggling-title all);
+                border: 0;
+                padding: 0 @indent__xl @indent__xs 0;
+                
                 &:after {
                     .lib-css(color, @color-gray56);
                     margin: 0 0 0 @indent__xs;
                     position: static;
                 }
-                border: 0;
-                padding: 0 @indent__xl @indent__xs 0;
             }
 
             .active {
@@ -332,14 +325,15 @@
                 .toggle {
                     &.tooltip {
                         .lib-icon-font(
-                        @icon-down,
-                        @_icon-font-size: 12px,
-                        @_icon-font-line-height: 12px,
-                        @_icon-font-text-hide: true,
-                        @_icon-font-margin: -3px 0 0 7px,
-                        @_icon-font-position: after
+                            @icon-down,
+                            @_icon-font-size: 12px,
+                            @_icon-font-line-height: 12px,
+                            @_icon-font-text-hide: true,
+                            @_icon-font-margin: -3px 0 0 7px,
+                            @_icon-font-position: after
                         );
                     }
+                    
                     > span {
                         &:extend(.abs-visually-hidden-reset all);
                     }
@@ -377,19 +371,19 @@
             &.edit,
             &.delete {
                 .lib-icon-font(
-                @icon-edit,
-                @_icon-font-size: 18px,
-                @_icon-font-line-height: 20px,
-                @_icon-font-text-hide: true,
-                @_icon-font-color: @minicart-icons-color,
-                @_icon-font-color-hover: @primary__color,
-                @_icon-font-color-active: @minicart-icons-color
+                    @icon-edit,
+                    @_icon-font-size: 18px,
+                    @_icon-font-line-height: 20px,
+                    @_icon-font-text-hide: true,
+                    @_icon-font-color: @minicart-icons-color,
+                    @_icon-font-color-hover: @primary__color,
+                    @_icon-font-color-active: @minicart-icons-color
                 );
             }
 
             &.delete {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-trash
+                    @_icon-font-content: @icon-trash
                 );
             }
         }
@@ -421,7 +415,6 @@
         margin-left: 13px;
 
         .block-minicart {
-            right: -15px;
             width: 390px;
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index ec2e95b7d820e..9bad9518f5724 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -49,6 +49,10 @@
             }
         }
 
+        .discount.coupon {
+            display: none;
+        }
+
         .grand.incl {
             & + .grand.excl {
                 .mark,
@@ -133,6 +137,10 @@
         }
 
         .product-item {
+            .product-item-details {
+                &:extend(.abs-add-clearfix all);
+            }
+
             .product-item-inner {
                 display: table;
                 margin: 0 0 @indent__s;
@@ -162,6 +170,10 @@
                     }
                 }
             }
+
+            .message {
+                margin-top: 10px;
+            }
         }
 
         .actions-toolbar {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 087f9c9fe6554..dd9db0e715308 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -46,6 +46,11 @@
                     .lib-css(border-top, @checkout-payment-method-title__border);
                 }
             }
+            form {
+                &.form-purchase-order {
+                    margin-bottom: 15px;
+                }
+            }
         }
 
         .payment-method-content {
@@ -58,6 +63,10 @@
                     }
                 }
             }
+            
+            #po_number {
+                margin-bottom: 20px;
+            }
         }
 
         .payment-method-title {
@@ -162,6 +171,11 @@
             .lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
         }
 
+        .step-title {
+            .lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
+            .lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
+        }
+
         .payment-method-title {
             .lib-css(padding, @checkout-payment-method-title-mobile__padding)
         }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
index e2378eeeef0c1..ad1ac36237ca4 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
@@ -18,7 +18,7 @@
 @checkout-progress-bar-item__transition: background .3s;
 @checkout-progress-bar-item__width: 185px;
 
-@checkout-progress-bar-item__active__background-color: @color-orange-red1;
+@checkout-progress-bar-item__active__background-color: @active__color;
 @checkout-progress-bar-item__active__color: @primary__color;
 @checkout-progress-bar-item__active__font-weight: @font-weight__semibold;
 @checkout-progress-bar-item__complete__color: @link__color;
@@ -32,7 +32,7 @@
 @checkout-progress-bar-item-element-inner__color: @primary__color;
 @checkout-progress-bar-item-element-inner__height: @checkout-progress-bar-item-element-inner__width;
 @checkout-progress-bar-item-element-inner__width: @checkout-progress-bar-item-element__width - ( @checkout-progress-bar-item-element-outer-radius__width*2 );
-@checkout-progress-bar-item-element-inner__active__border-color: @color-orange-red1;
+@checkout-progress-bar-item-element-inner__active__border-color: @active__color;
 @checkout-progress-bar-item-element-inner__active__content: @icon-checkmark;
 
 @checkout-progress-bar-item-element-outer-radius__width: 6px;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
index 512751df1cb35..d0edf245dc5b8 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
@@ -22,7 +22,7 @@
 @checkout-shipping-item__width: 100%/3;
 @checkout-shipping-item-tablet__width: 100%/2;
 @checkout-shipping-item-mobile__width: 100%;
-@checkout-shipping-item__active__border-color: @color-orange-red1;
+@checkout-shipping-item__active__border-color: @active__color;
 
 @checkout-shipping-item-icon__selected__height: 27px;
 @checkout-shipping-item-icon__selected__width: 29px;
@@ -296,6 +296,7 @@
             }
         }
     }
+
     .opc-wrapper {
         .form-login,
         .form-shipping-address {
@@ -307,6 +308,7 @@
             padding-bottom: @indent__base;
         }
     }
+
     .table-checkout-shipping-method {
         width: auto;
     }
@@ -346,6 +348,7 @@
             }
         }
     }
+
     .table-checkout-shipping-method {
         min-width: 500px;
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
index c193be0884449..5ef5dcac1131d 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
@@ -10,7 +10,7 @@
         <referenceContainer name="sidebar.main">
             <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
                 <arguments>
-                    <argument name="block_title" translate="true" xsi:type="string">Account Dashboard</argument>
+                    <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
                     <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
                 </arguments>
                 <block class="Magento\Customer\Block\Account\Navigation" name="customer_account_navigation" before="-">
@@ -19,7 +19,7 @@
                     </arguments>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                             <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
index 1f8c162ef923a..4b08bf28ece9f 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/default.xml
@@ -15,11 +15,6 @@
                 </arguments>
             </block>
         </referenceBlock>
-        <block class="Magento\Theme\Block\Html\Header" name="header" as="header">
-            <arguments>
-                <argument name="show_part" xsi:type="string">welcome</argument>
-            </arguments>
-        </block>
         <move element="header" destination="header.links" before="-"/>
         <move element="register-link" destination="header.links"/>
         <move element="top.links" destination="customer"/>
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
old mode 100644
new mode 100755
index 832082aa6557a..5418d836fc262
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -70,7 +70,7 @@
     }
 
     .form-address-edit {
-        #region_id {
+        .region_id {
             display: none;
         }
 
@@ -93,6 +93,21 @@
                 }
             }
         }
+        .fieldset.create.account {
+            .lib-form-hasrequired(bottom);
+            &:after {
+                margin-top: 35px;
+            }
+        }
+    }
+
+    .form.password.forget {
+        .fieldset {
+            .lib-form-hasrequired(bottom);
+            &:after {
+                margin-top: 35px;
+            }
+        }
     }
 
     //  Full name fieldset
@@ -209,7 +224,7 @@
                 .column.main & {
                 }
             }
-
+            display: block;
             margin-bottom: @indent__s;
         }
 
@@ -536,7 +551,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: @indent__base;
         }
 
         .column.main {
diff --git a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
index 994f9e6bffed8..0fc8e36a82076 100644
--- a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
+++ b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
@@ -17,8 +17,16 @@
                         <table>
                             <tr>
                                 <td>
-                                    <p><a href="#">{{trans "About Us"}}</a></p>
-                                    <p><a href="#">{{trans "Customer Service"}}</a></p>
+                                    {{depend url_about_us}}
+                                    <p>
+                                        {{trans '<a href=%url_about_us>About Us</a>' url_about_us=$url_about_us |raw}}
+                                    </p>
+                                    {{/depend}}
+                                    {{depend url_customer_service}}
+                                    <p>
+                                        {{trans '<a href=url_customer_service>Customer Service</a>' url_customer_service=$url_customer_service |raw}}
+                                    </p>
+                                    {{/depend}}
                                 </td>
                                 <td>
                                     {{depend store_phone}}
diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index 388ec32b4fc5a..41e6da39e1ef1 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -12,7 +12,7 @@
 @gift-item-block__border-color: @color-gray-light5;
 @gift-item-block__border-width: @border-width__base;
 
-@gift-item-block-title__color: @color-blue1;
+@gift-item-block-title__color: @link__color;
 @gift-item-block-title-icon__content: @icon-down;
 @gift-item-block-title-icon__active__content: @icon-up;
 @gift-item-block-title-icon__color: @color-gray52;
@@ -60,8 +60,8 @@
     }
 
     .gift-summary {
-        position: relative;
         margin-top: @indent__s;
+        position: relative;
 
         .actions-toolbar {
             > .secondary {
diff --git a/app/design/frontend/Magento/luma/Magento_InstantPurchase/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_InstantPurchase/web/css/source/_module.less
index 9877f6bbcea23..9ab5148a87264 100644
--- a/app/design/frontend/Magento/luma/Magento_InstantPurchase/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_InstantPurchase/web/css/source/_module.less
@@ -1,16 +1,21 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
 & when (@media-common = true) {
-  .box-tocart {
-    .action.instant-purchase {
-      &:extend(.abs-button-l all);
-      &:extend(.abs-button-responsive all);
+    .box-tocart {
+        .action.instant-purchase {
+            &:extend(.abs-button-l all);
+            &:extend(.abs-button-responsive all);
 
-      &:not(:last-child) {
-        margin-bottom: 15px;
-      }
+            &:not(:last-child) {
+                margin-bottom: 15px;
+            }
 
-      vertical-align: top;
+            vertical-align: top;
+        }
     }
-  }
 }
 
 //
@@ -18,11 +23,11 @@
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-  .box-tocart {
-    .action.instant-purchase {
-      margin-bottom: 0;
-      margin-right: 1%;
-      width: 49%;
+    .box-tocart {
+        .action.instant-purchase {
+            margin-bottom: 0;
+            margin-right: 1%;
+            width: 49%;
+        }
     }
-  }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
index 48461892fa631..76baec87e0054 100644
--- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
@@ -32,7 +32,7 @@
 
                 &[data-count]:after {
                     .lib-css(color, @color-white);
-                    background: @color-orange-red1;
+                    background: @theme__color__secondary;
                     border-radius: 2px;
                     content: attr(data-count);
                     display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
index da284eab8f49e..0b01c54a64378 100644
--- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -40,6 +40,18 @@
             .items {
                 padding: 6px 0;
                 text-align: left;
+                
+                .item {
+                    > span {
+                        display: block;
+                        padding: 5px 5px 5px 23px;
+                    }
+
+                }
+                
+                li {
+                    padding: 0;
+                }
             }
 
             > .action {
@@ -105,6 +117,7 @@
                     &.split,
                     &.toggle {
                         .lib-css(color, @link__color);
+                        
                         &:before {
                             display: none;
                         }
@@ -125,6 +138,7 @@
 
         &.overlay {
             .lib-window-overlay();
+            
             &.active {
                 display: block;
             }
@@ -244,7 +258,7 @@
         }
 
         .form-wishlist-search {
-            .lib-css(margin-bottom, @indent__l*2);
+            margin-bottom: @indent__l * 2;
             max-width: 500px;
 
             .fieldset {
@@ -271,7 +285,7 @@
 
     .block-wishlist-info-items {
         .block-title {
-            .lib-css(margin-bottom, @indent__base);
+            margin-bottom: @indent__base;
             .lib-font-size(22px);
 
             > strong {
@@ -342,6 +356,7 @@
             //  Select wish list
             &-select {
                 margin: 0 -@layout__width-xs-indent 20px;
+                
                 .wishlist-name {
                     .lib-font-size(16);
                     &:extend(.abs-toggling-title-mobile all);
diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
new file mode 100644
index 0000000000000..ed6b53727da52
--- /dev/null
+++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
@@ -0,0 +1,499 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Common
+//  _____________________________________________
+
+& when (@media-common = true) {
+
+    .multicheckout {
+        &.results,
+        &.success {
+            h3 {
+                font-size: 1.6rem;
+                margin-bottom: @indent__base;
+                margin-top: @indent__l;
+                a {
+                    color: @text__color;
+                    &:hover {
+                        text-decoration: none;
+                    }
+                }
+            }
+
+            ul.orders-list {
+                list-style: none;
+                padding-left: 0;
+            }
+
+            .orders-list {
+                margin-top: @indent__m;
+                padding-left: @indent__base - 4px;
+
+                .shipping-list {
+                    .shipping-item {
+                        margin-left: 84px;
+                    }
+
+                    .shipping-label {
+                        font-weight: @font-weight__bold;
+                        margin-right: @indent__s;
+                    }
+
+                    .shipping-address {
+                        font-weight: @font-weight__regular;
+                    }
+
+                    .error-block {
+                        color: @error__color;
+
+                        .error-label {
+                            font-weight: @font-weight__bold;
+                            margin-right: @indent__s;
+                        }
+
+                        .error-description {
+                            font-weight: @font-weight__regular;
+                        }
+                    }
+                }
+            }
+
+            .orders-succeed {
+                .orders-list {
+                    margin-top: 0;
+
+                    .shipping-list {
+                        .order-id {
+                            float: left;
+                        }
+                        .shipping-item {
+                            margin-left: 100px;
+                        }
+                    }
+                }
+            }
+        }
+
+        .title {
+            margin-bottom: @indent__l;
+
+            strong {
+                font-weight: @font-weight__regular;
+            }
+        }
+
+        .table-wrapper {
+            margin-bottom: 0;
+
+            .action.delete {
+                display: inline-block;
+            }
+
+            .col {
+                .qty {
+                    display: inline-block;
+
+                    .input-text {
+                        &:extend(.abs-input-qty all);
+                    }
+                }
+
+                .label {
+                    &:extend(.abs-visually-hidden all);
+                }
+
+                &.item {
+                    .action.edit {
+                        font-weight: @font-weight__regular;
+                        margin-left: @indent__s;
+                    }
+                }
+            }
+
+            .cart-price {
+                &:extend(.abs-checkout-cart-price all);
+            }
+
+            .product-item-name {
+                &:extend(.abs-checkout-product-name all);
+            }
+        }
+
+        &:not(.address) {
+            .table-wrapper {
+                .product-item-name {
+                    margin: 0;
+                }
+            }
+        }
+
+        > .actions-toolbar {
+            margin-top: @indent__xl;
+        }
+
+        .actions-toolbar {
+            > .secondary {
+                display: block;
+
+                .action {
+                    margin-bottom: @indent__m;
+
+                    &.back {
+                        display: block;
+                        margin-left: 0;
+                    }
+                }
+            }
+
+            > .primary {
+                margin-right: @indent__s;
+            }
+        }
+
+        .action.primary {
+            &:extend(.abs-button-l all);
+        }
+
+        .item-options {
+            margin: @indent__s 0 0;
+
+            &:extend(.abs-product-options-list all);
+            &:extend(.abs-add-clearfix all);
+        }
+
+        &:extend(.abs-account-blocks all);
+
+        .block {
+            &:extend(.abs-add-clearfix all);
+
+            .methods-shipping {
+                .item-content {
+                    .fieldset {
+                        > .legend {
+                            &:extend(.abs-visually-hidden all);
+                        }
+
+                        > .legend + br {
+                            &:extend(.abs-no-display all);
+                        }
+
+                        > .field {
+                            &:before {
+                                display: none;
+                            }
+
+                            .control {
+                                display: inline-block;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        .block-title,
+        .block-content .title {
+            &:extend(.abs-account-title all);
+            border-bottom: @border-width__base solid @border-color__base;
+            padding-bottom: @indent__s;
+
+            strong {
+                font-weight: @font-weight__regular;
+
+                span {
+                    .lib-css(color, @primary__color__light);
+                }
+            }
+        }
+
+        .block-content {
+            &:extend(.abs-add-clearfix all);
+            .title {
+                border-bottom: none;
+                padding-bottom: 0;
+            }
+        }
+
+        &.order-review {
+            .block-title > strong {
+                .lib-font-size(24);
+            }
+
+            .block-shipping {
+                .block-content:not(:last-child) {
+                    margin-bottom: @indent__xl;
+                }
+            }
+
+            .error-description {
+                color: @error__color;
+                font-weight: @font-weight__regular;
+                margin-bottom: @indent__s;
+                margin-top: -@indent__s;
+            }
+        }
+
+        .box-title {
+            span {
+                margin-right: @indent__s;
+            }
+
+            > .action {
+                margin: 0;
+            }
+        }
+
+        .box-shipping-method {
+            .price {
+                font-weight: @font-weight__bold;
+            }
+        }
+
+        .box-billing-method {
+            .fieldset {
+                margin: 0;
+
+                .legend.box-title {
+                    margin: 0 0 @indent__xs;
+                }
+            }
+        }
+
+        .hidden {
+            &:extend(.abs-no-display all);
+        }
+
+        .checkout-review .grand.totals {
+            .lib-font-size(@font-size__xl);
+            margin-bottom: @indent__xl;
+
+            .mark {
+                font-weight: @font-weight__regular;
+            }
+        }
+    }
+
+    [class^='multishipping-'] {
+        .nav-sections,
+        .nav-toggle {
+            &:extend(.abs-no-display all);
+        }
+
+        .logo {
+            margin-left: 0;
+        }
+    }
+
+    .multishipping-checkout-success {
+        .nav-sections {
+            display: block;
+        }
+    }
+}
+
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+    .multicheckout {
+        .data.table {
+            .address {
+                &:before {
+                    margin-bottom: @indent__xs;
+                }
+            }
+        }
+
+        .product-item-name,
+        .price-including-tax,
+        .price-excluding-tax {
+            display: inline-block;
+        }
+
+        .block-content .box {
+            &:not(:last-child) {
+                margin-bottom: @indent__xl;
+            }
+
+            &:last-child {
+                margin-bottom: 0;
+            }
+        }
+
+        &.order-review {
+            .box-items {
+                .data.table {
+                    thead {
+                        display: block;
+
+                        tr {
+                            display: block;
+                        }
+
+                        .col.item {
+                            display: block;
+                            padding: 0;
+                        }
+                    }
+                }
+            }
+
+            .data.table {
+                &:extend(.abs-checkout-order-review all);
+            }
+        }
+
+        .actions-toolbar {
+            .action {
+                margin-bottom: @indent__m;
+            }
+
+            > .primary {
+                margin-bottom: @indent__m;
+                margin-right: 0;
+            }
+        }
+    }
+}
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
+    .multicheckout {
+        .actions-toolbar {
+            .column:not(.sidebar-main) & {
+                &:extend(.abs-reset-left-margin-desktop-s all);
+            }
+
+            .secondary {
+                float: none;
+                margin-top: 11px;
+                text-align: right;
+
+                .action {
+                    margin-left: @indent__s;
+
+                    &.back {
+                        display: block;
+                        float: left;
+                    }
+                }
+            }
+        }
+
+        .item-options {
+            margin: @indent__base 0 0;
+        }
+
+        .block-content .box {
+            margin-bottom: 0;
+        }
+
+        .block-shipping {
+            .box {
+                &:extend(.abs-add-box-sizing-desktop-s all);
+                float: left;
+                width: 25%;
+            }
+
+            .box-shipping-method {
+                padding-left: @indent__m;
+                padding-right: @indent__m;
+                width: 50%;
+
+                .fieldset {
+                    .legend {
+                        &:extend(.abs-reset-left-margin-desktop-s all);
+                    }
+
+                    .field {
+                        &:before {
+                            display: none;
+                        }
+                    }
+                }
+            }
+        }
+
+        .block-billing {
+            &:extend(.abs-add-clearfix-desktop-s all);
+            .box-billing-address {
+                &:extend(.abs-add-box-sizing-desktop-s all);
+                float: left;
+                width: 25%;
+            }
+
+            .box-billing-method {
+                &:extend(.abs-add-box-sizing-desktop-s all);
+                float: left;
+                padding-left: @indent__m;
+                width: 50%;
+            }
+        }
+
+        &.form.address {
+            .table-wrapper {
+                .applicable {
+                    margin: 7px 0 0;
+                }
+            }
+        }
+
+        &.order-review {
+            .box-items {
+                clear: left;
+                float: none;
+                padding-top: @indent__xl;
+                width: auto;
+            }
+
+            .col.item {
+                width: 75%;
+            }
+        }
+
+        //  Payment methods
+        .methods-payment {
+            .item-content > .fieldset {
+                width: auto;
+
+                .field {
+                    &.cvv {
+                        display: inline-block;
+                        width: auto;
+                    }
+                }
+            }
+
+            .fieldset > .field:not(.choice) {
+                > .label {
+                    float: none;
+                    margin-bottom: 8px;
+                    text-align: left;
+                    width: auto;
+                }
+
+                &:not(.cvv) {
+                    .control {
+                        width: 100%;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .multishipping-checkout-success {
+        .nav-toggle {
+            display: block;
+        }
+
+        .logo {
+            margin-left: @indent__xl;
+        }
+    }
+}
diff --git a/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
index 94d7c7e4e5bff..9ccd6c190ec0e 100644
--- a/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less
@@ -67,6 +67,7 @@
             border-bottom-left-radius: 0;
             border-top-left-radius: 0;
             margin-left: -1px;
+            white-space: nowrap;
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
index da78406f92212..2c66420f65fbd 100644
--- a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
@@ -14,7 +14,6 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
-
     .data.switch .counter {
         .lib-css(color, @text__color__muted);
 
@@ -118,13 +117,13 @@
 
             strong {
                 display: block;
-                font-weight: 600;
+                font-weight: @font-weight__semibold;
             }
         }
 
         .fieldset &-field-ratings {
             > .label {
-                font-weight: 600;
+                font-weight: @font-weight__semibold;
                 margin-bottom: @indent__s;
                 padding: 0;
             }
@@ -140,11 +139,11 @@
 
         &-field-rating {
             .label {
-                font-weight: 600;
+                font-weight: @font-weight__semibold;
             }
 
             .control {
-                margin-bottom: 1.2*@indent__xl;
+                margin-bottom: 1.2 * @indent__xl;
                 margin-top: @indent__s;
             }
         }
@@ -181,7 +180,7 @@
             display: inline;
 
             .review-details-value {
-                font-weight: 400;
+                font-weight: @font-weight__regular;
             }
         }
 
@@ -341,7 +340,7 @@
     .block-reviews-dashboard {
         .items {
             .item {
-                .lib-css(margin-bottom, @indent__base);
+                margin-bottom: @indent__base;
 
                 &:last-child {
                     margin-bottom: 0;
@@ -353,14 +352,14 @@
             display: inline-block;
 
             &:not(:last-child) {
-                .lib-css(margin-bottom, @indent__xs);
+                margin-bottom: @indent__xs;
             }
         }
 
         .rating-summary {
             .label {
-                .lib-css(font-weight, @font-weight__semibold);
-                .lib-css(margin-right, @indent__s);
+                font-weight: @font-weight__semibold;
+                margin-right: @indent__s;
             }
         }
     }
@@ -368,7 +367,7 @@
     .table-reviews,
     .block-reviews-dashboard {
         .product-name {
-            .lib-css(font-weight, @font-weight__regular);
+            font-weight: @font-weight__regular;
         }
     }
 
@@ -416,6 +415,7 @@
         .product-details {
             &:extend(.abs-add-clearfix all);
             &:extend(.abs-margin-for-blocks-and-widgets all);
+            
             .rating-average-label {
                 &:extend(.abs-visually-hidden all);
             }
@@ -436,9 +436,10 @@
             }
 
             .customer-review-rating {
-                .lib-css(margin-bottom, @indent__base);
+                margin-bottom: @indent__base;
+                
                 .item {
-                    .lib-css(margin-bottom, @indent__s);
+                    margin-bottom: @indent__s;
 
                     &:last-child {
                         margin-bottom: 0;
@@ -450,13 +451,13 @@
 
             .review-title {
                 .lib-heading(h3);
-                .lib-css(font-weight, @font-weight__semibold);
-                .lib-css(margin-bottom, @indent__base);
+                font-weight: @font-weight__semibold;
+                margin-bottom: @indent__base;
             }
 
             .review-content {
                 margin: 0;
-                .lib-css(margin-bottom, @indent__base);
+                margin-bottom: @indent__base;
             }
 
             .review-date {
@@ -473,13 +474,13 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
     .customer-review {
         .product-name {
-            .lib-css(margin-bottom, @indent__xs);
+            margin-bottom: @indent__xs;
         }
 
         .product-reviews-summary {
             .rating-summary {
                 display: block;
-                .lib-css(margin-bottom, @indent__xs);
+                margin-bottom: @indent__xs;
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
index 7c96827c5f6b2..e8adcc2f0e4f3 100644
--- a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
@@ -40,6 +40,14 @@
         &:extend(.abs-status all);
     }
 
+    .table-wrapper.table-returns {
+        .returns-details {
+            &.hidden {
+                display: none;
+            }
+        }
+    }
+
     .block-returns-comments {
         .returns-comments {
             dt,
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
index 9a3f433618c36..3f19d1020bab9 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
@@ -207,7 +207,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index 692f91ef463b1..1e4a92fa0701f 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -482,7 +482,7 @@
 
         .options-label + .item-options-container,
         .item-options-container + .item-options-container {
-            &:before {
+            &[data-th]:before {
                 content: attr(data-th) ':';
                 display: block;
                 font-weight: @font-weight__bold;
@@ -612,10 +612,6 @@
         padding: 25px;
 
         .col {
-            &.name {
-                padding-left: 0;
-            }
-
             &.price {
                 text-align: center;
             }
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index a845a8dce2818..cadf575b95fc7 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -67,12 +67,14 @@
         .lib-css(background-color, @page__background-color);
     }
 
-    //  ToDo UI: move it directly to .page-wrapper (now it doesn't appear in mediaquery cuz of size of css)
     .page-wrapper {
-        .ie9 & {
-            .lib-css(background-color, @page__background-color);
-            min-height: 0;
-        }
+        .lib-vendor-prefix-display(flex);
+        .lib-vendor-prefix-flex-direction(column);
+        min-height: 100vh; // Stretch content area for sticky footer
+    }
+
+    .page-main {
+        .lib-vendor-prefix-flex-grow(1);
     }
 
     //
@@ -262,6 +264,7 @@
     .copyright {
         .lib-css(background-color, @copyright__background-color);
         .lib-css(color, @color-white);
+        box-sizing: border-box;
         display: block;
         padding: @indent__s;
         text-align: center;
@@ -313,7 +316,6 @@
     //
     //  Widgets
     //  ---------------------------------------------
-
     .sidebar {
         .widget.block:not(:last-child),
         .widget:not(:last-child) {
@@ -333,6 +335,10 @@
         .widget.block {
             .lib-css(margin, @indent__base 0);
         }
+
+        .links .widget.block {
+            margin: 0;
+        }
     }
 
     .no-display:extend(.abs-no-display all) {
@@ -423,6 +429,17 @@
     }
 }
 
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .cms-page-view .page-main {
+        padding-top: 41px;
+        position: relative;
+    }
+}
+
 //
 //  Desktop
 //  _____________________________________________
@@ -433,12 +450,6 @@
         height: 100%; // Stretch screen area for sticky footer
     }
 
-    body {
-        .ie9 & {
-            .lib-css(background-color, @copyright__background-color);
-        }
-    }
-
     .navigation ul {
         padding: 0 8px;
     }
@@ -527,6 +538,7 @@
 
         .header.links {
             min-width: 175px;
+            z-index: 1000;
         }
 
         &.active {
@@ -605,10 +617,7 @@
     }
 
     .page-wrapper {
-        .lib-vendor-prefix-display(flex);
-        .lib-vendor-prefix-flex-direction(column);
         margin: 0;
-        min-height: 100%; // Stretch content area for sticky footer
         position: relative;
         transition: margin .3s ease-out 0s;
 
@@ -618,11 +627,6 @@
             box-sizing: border-box;
             width: 100%;
         }
-
-        .ie10 &,
-        .ie11 & {
-            height: 100%;
-        }
     }
 
     .page-footer {
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 6455921a71ad7..584eefb9bc643 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -277,6 +277,9 @@
             @_icon-font-color-hover: @primary__color,
             @_icon-font-color-active: @minicart-icons-color
             );
+            &:before {
+                overflow: visible;
+            }
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 33f4c4e8a91b7..6b632b06c66dc 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.3.*",
-        "magento/theme-frontend-blank": "100.3.*"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/theme-frontend-blank": "*"
     },
     "type": "magento2-theme",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index f688c232b93c9..55d43272caad9 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -12,9 +12,9 @@
                 <width>140</width>
                 <height>140</height>
             </image>
-            <image id="cart_cross_sell_products" type="thumbnail">
-                <width>200</width>
-                <height>248</height>
+            <image id="cart_cross_sell_products" type="small_image">
+                <width>240</width>
+                <height>300</height>
             </image>
             <image id="cart_page_product_thumbnail" type="small_image">
                 <width>165</width>
@@ -77,22 +77,23 @@
                 <height>140</height>
             </image>
             <image id="product_page_image_large" type="image"/>
-            <image id="product_page_image_large_no_frame" type="image">
-                <frame>false</frame>
-            </image>
             <image id="product_page_image_medium" type="image">
-                <width>700</width>
-                <height>560</height>
-            </image>
-            <image id="product_page_image_medium_no_frame" type="image">
                 <width>700</width>
                 <height>700</height>
-                <frame>false</frame>
             </image>
             <image id="product_page_image_small" type="thumbnail">
                 <width>88</width>
                 <height>110</height>
             </image>
+            <image id="product_swatch_image_large" type="image"/>
+            <image id="product_swatch_image_medium" type="image">
+                <width>240</width>
+                <height>300</height>
+            </image>
+            <image id="product_swatch_image_small" type="thumbnail">
+                <width>88</width>
+                <height>110</height>
+            </image>
             <image id="product_page_main_image" type="image">
                 <width>700</width>
                 <height>560</height>
@@ -231,6 +232,7 @@
             <var name="height"></var> <!-- Height of magnifier block -->
             <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
             <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
+            <var name="mode">outside</var> <!-- Zoom type (outside/inside) -->
         </var>
 
         <var name="breakpoints">
@@ -270,7 +272,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/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
index 66f5d51218d73..7bf9e0afaf015 100644
--- a/app/design/frontend/Magento/luma/i18n/en_US.csv
+++ b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -52,6 +52,5 @@ Footer,Footer
 "Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business."
 "Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id"
 "Update to your %store_name shipment","Update to your %store_name shipment"
-"Account Dashboard","Account Dashboard"
 "Address Book","Address Book"
 "Account Information","Account Information"
diff --git a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less
index 096b93675a92c..d81d0a8388a78 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less
@@ -22,10 +22,6 @@
                 &:last-child {
                     margin-bottom: 0;
                 }
-
-                &.primary {
-                    //  &:extend(.abs-button-l all);
-                }
             }
 
             &:last-child {
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index 602ed44d5a44d..a88ecbf5057bb 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -7,6 +7,8 @@
 //  List default styles reset
 //  ---------------------------------------------
 
+@_column-number: 1;
+
 & when (@media-common = true) {
     .abs-reset-list {
         .lib-list-reset-styles();
@@ -275,7 +277,7 @@
 }
 
 //
-//  Marging for blocks & widgets
+//  Margin for blocks & widgets
 //  ---------------------------------------------
 
 & when (@media-common = true) {
@@ -705,7 +707,7 @@
 //  ---------------------------------------------
 
 @abs-form-field-revert-column-1: {
-    .lib-form-field-column-number(@_column-number: 1);
+    .lib-form-field-column-number(@_column-number);
 };
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
@@ -760,7 +762,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th) ':';
                         display: block;
                         font-weight: @font-weight__bold;
@@ -1504,6 +1506,10 @@
             position: relative;
             z-index: 1;
         }
+        .limiter {
+            display: inline-block;
+            float: right;
+        }
 
         .toolbar-amount {
             .lib-css(line-height, @pager__line-height);
@@ -1681,7 +1687,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .abs-checkout-tooltip-content-position-top-mobile {
         @abs-checkout-tooltip-content-position-top();
     }
@@ -1857,7 +1863,7 @@
 
             > .title {
                 strong {
-                    color: @color-blue1;
+                    color: @link__color;
                     font-weight: @font-weight__regular;
                 }
             }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
index 1c9ffb1606b26..0c7150c18550b 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -91,22 +91,13 @@
     .select-styling() {
         .lib-css(appearance, none, 1);
         appearance: none;
-        background: @select__background url('../images/select-bg.svg') no-repeat 100% 45%;
         background-size: 30px 60px;
-        border: 1px solid @border-color__base;
-        height: 32px;
-        padding-right: 25px;
         text-indent: .01em;
         text-overflow: '';
 
         &::-ms-expand {
             display: none;
         }
-
-        .lt-ie10 & {
-            background-image: none;
-            padding-right: 4px;
-        }
     }
 
     select {
diff --git a/app/design/frontend/Magento/luma/web/css/source/_theme.less b/app/design/frontend/Magento/luma/web/css/source/_theme.less
index b94ffc08b77ec..114fb7b817267 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_theme.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_theme.less
@@ -28,7 +28,7 @@
 @h3__margin-top: @indent__base;
 
 //  Links
-@link__color: @color-blue2;
+@link__color: @theme__color__primary-alt;
 
 //  Focus
 @focus__color: @color-blue3;
@@ -60,14 +60,9 @@
 
 @navigation__background: @color-gray94;
 @navigation-level0-item__active__color: @primary__color;
-@navigation-level0-item__active__border-color: @active__color;
-@navigation-desktop-level0-item__active__border-color: @active__color;
 
-@submenu-desktop-item__active__border-color: @active__color;
-@submenu-item__active__border-color: @active__color;
 @submenu-item__active__color: @navigation-level0-item__active__color;
 
-
 //  Desktop navigation
 @navigation-desktop-level0-item__line-height: 47px;
 @submenu-desktop__font-weight: @font-weight__regular;
@@ -166,6 +161,13 @@
 //  Forms
 //  ---------------------------------------------
 
+
+//  Select
+@select__background: @form-element-input__background url('../images/select-bg.svg') no-repeat 100% 45%;
+@select__border: 1px solid @border-color__base;
+@select__height: 32px;
+@select__padding: 4px 25px @indent__xs @indent__s;
+
 //  Form fieldset
 @form-fieldset-legend__font-size: 18px;
 @form-fieldset-legend__font-weight: @font-weight__light;
@@ -218,7 +220,6 @@
 
 @rating-icon__font-size: 16px;
 @rating-icon__letter-spacing: 2px;
-@rating-icon__active__color: @active__color;
 
 //
 //  Dropdowns
@@ -245,7 +246,7 @@
 @breadcrumbs-icon__font-margin: 0 @indent__s;
 
 @breadcrumbs-current__color: @color-gray-middle5;
-@breadcrumbs-link__color: @color-blue2;
+@breadcrumbs-link__color: @link__color;
 @breadcrumbs-link__visited__color: @breadcrumbs-link__color;
 @breadcrumbs-link__hover__color: @breadcrumbs-link__color;
 @breadcrumbs-link__active__color: @breadcrumbs-link__color;
diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index b3165a41964e5..3814341efd05a 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -16,7 +16,6 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;
@@ -64,6 +63,8 @@
     }
 
     .modal-popup {
+        pointer-events: none;
+
         .modal-title {
             .lib-css(border-bottom, @modal-title__border);
             .lib-css(font-weight, @font-weight__light);
@@ -81,7 +82,8 @@
 
     .modal-slide {
         .action-close {
-            padding: @modal-slide-action-close__padding;
+            margin: 15px;
+            padding: 0;
         }
 
         .page-main-actions {
@@ -148,7 +150,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-inner-wrap[class] {
@@ -179,7 +181,7 @@
 //  Desktop
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-footer {
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/layout/default.xml b/app/design/frontend/Magento/rush/Magento_Theme/layout/default.xml
deleted file mode 100644
index 28e9d7e12f499..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/layout/default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-    </body>
-</page>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/rush/Magento_Theme/layout/default_head_blocks.xml
deleted file mode 100644
index 60fc5aa8f56ab..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/layout/default_head_blocks.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-      <!--Include rush theme assets-->
-      <link src="js/foo.js"/>
-
-      <!--Remove require-js assets-->
-      <remove src="mage/calendar.css"/>
-      <remove src="requirejs/require.js"/>
-      <remove src="mage/requirejs/mixins.js"/>
-      <remove src="requirejs-config.js"/>
-    </head>
-</page>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/layouts.xml b/app/design/frontend/Magento/rush/Magento_Theme/layouts.xml
deleted file mode 100644
index 2ac2d369ade06..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/layouts.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page_layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:framework:View/PageLayout/etc/layouts.xsd">
-
-    <layout id="app_shell">
-        <label translate="true">App Shell</label>
-    </layout>
-
-</page_layouts>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/page_layout/app_shell.xml b/app/design/frontend/Magento/rush/Magento_Theme/page_layout/app_shell.xml
deleted file mode 100644
index a0fdf9bc9738e..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/page_layout/app_shell.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
-    <update handle="empty"/>
-</layout>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/templates/root.phtml b/app/design/frontend/Magento/rush/Magento_Theme/templates/root.phtml
deleted file mode 100644
index 5a2fb56828cc4..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/templates/root.phtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Try not to put things in this file.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<!doctype html>
-<html>
-  <head>
-    <?= /* @escapeNotVerified */ $headContent ?>
-    <?= /* @escapeNotVerified */ $headAdditional ?>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
diff --git a/app/design/frontend/Magento/rush/composer.json b/app/design/frontend/Magento/rush/composer.json
deleted file mode 100644
index 15d3c30662f68..0000000000000
--- a/app/design/frontend/Magento/rush/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "magento/theme-frontend-rush",
-  "description": "N/A",
-  "require": {
-    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-    "magento/framework": "100.3.*"
-  },
-  "type": "magento2-theme",
-  "version": "100.3.0-dev",
-  "license": ["OSL-3.0", "AFL-3.0"],
-  "autoload": {
-    "files": ["registration.php"]
-  }
-}
diff --git a/app/design/frontend/Magento/rush/etc/view.xml b/app/design/frontend/Magento/rush/etc/view.xml
deleted file mode 100644
index 1f8b416e1af79..0000000000000
--- a/app/design/frontend/Magento/rush/etc/view.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
-    <media>
-        <images module="Magento_Catalog">
-            <image id="bundled_product_customization_page" type="thumbnail">
-                <width>140</width>
-                <height>140</height>
-
-            </image>
-            <image id="cart_cross_sell_products" type="thumbnail">
-                <width>152</width>
-                <height>188</height>
-            </image>
-            <image id="cart_page_product_thumbnail" type="small_image">
-                <width>110</width>
-                <height>160</height>
-            </image>
-            <image id="category_page_grid" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="category_page_list" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="customer_account_my_tags_tag_view" type="small_image">
-                <width>100</width>
-                <height>100</height>
-            </image>
-            <image id="customer_account_product_review_page" type="image">
-                <width>285</width>
-                <height>285</height>
-            </image>
-            <image id="customer_shared_wishlist" type="small_image">
-                <width>113</width>
-                <height>113</height>
-            </image>
-            <image id="gift_messages_checkout_small_image" type="small_image">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="gift_messages_checkout_thumbnail" type="thumbnail">
-                <width>100</width>
-                <height>100</height>
-            </image>
-            <image id="mini_cart_product_thumbnail" type="thumbnail">
-                <width>78</width>
-                <height>78</height>
-            </image>
-            <image id="new_products_content_widget_grid" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="new_products_content_widget_list" type="small_image">
-                <width>270</width>
-                <height>270</height>
-            </image>
-            <image id="new_products_images_only_widget" type="small_image">
-                <width>78</width>
-                <height>78</height>
-            </image>
-            <image id="product_base_image" type="image">
-                <width>265</width>
-                <height>265</height>
-            </image>
-            <image id="product_comparison_list" type="small_image">
-                <width>140</width>
-                <height>140</height>
-            </image>
-            <image id="product_page_image_large" type="image"/>
-            <image id="product_page_image_large_no_frame" type="image">
-                <frame>false</frame>
-            </image>
-            <image id="product_page_image_medium" type="image">
-                <width>700</width>
-                <height>700</height>
-            </image>
-            <image id="product_page_image_medium_no_frame" type="image">
-                <width>700</width>
-                <height>700</height>
-                <frame>false</frame>
-            </image>
-            <image id="product_page_image_small" type="thumbnail">
-                <width>90</width>
-                <height>90</height>
-            </image>
-            <image id="product_page_main_image" type="image">
-                <width>700</width>
-                <height>700</height>
-            </image>
-            <image id="product_page_main_image_default" type="image">
-                <width>700</width>
-                <height>700</height>
-            </image>
-            <image id="product_page_more_views" type="thumbnail">
-                <width>90</width>
-                <height>90</height>
-            </image>
-            <image id="product_stock_alert_email_product_image" type="small_image">
-                <width>76</width>
-                <height>76</height>
-            </image>
-            <image id="product_small_image" type="small_image">
-                <width>135</width>
-                <height>135</height>
-            </image>
-            <image id="product_thumbnail_image" type="thumbnail">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="recently_compared_products_grid_content_widget" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="recently_compared_products_images_names_widget" type="thumbnail">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="recently_compared_products_images_only_widget" type="thumbnail">
-                <width>76</width>
-                <height>76</height>
-            </image>
-            <image id="recently_compared_products_list_content_widget" type="small_image">
-                <width>270</width>
-                <height>207</height>
-            </image>
-            <image id="recently_viewed_products_grid_content_widget" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="recently_viewed_products_images_names_widget" type="small_image">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="recently_viewed_products_images_only_widget" type="small_image">
-                <width>76</width>
-                <height>76</height>
-            </image>
-            <image id="recently_viewed_products_list_content_widget" type="small_image">
-                <width>270</width>
-                <height>270</height>
-            </image>
-            <image id="related_products_list" type="small_image">
-                <width>140</width>
-                <height>140</height>
-            </image>
-            <image id="review_page_product_image" type="small_image">
-                <width>285</width>
-                <height>285</height>
-            </image>
-            <image id="rss_thumbnail" type="thumbnail">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="sendfriend_small_image" type="small_image">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="shared_wishlist_email" type="small_image">
-                <width>135</width>
-                <height>135</height>
-            </image>
-            <image id="side_column_widget_product_thumbnail" type="thumbnail">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="upsell_products_list" type="small_image">
-                <width>140</width>
-                <height>140</height>
-            </image>
-            <image id="wishlist_sidebar_block" type="thumbnail">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="wishlist_small_image" type="small_image">
-                <width>113</width>
-                <height>113</height>
-            </image>
-            <image id="wishlist_thumbnail" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-        </images>
-    </media>
-    <vars module="Magento_Catalog">
-
-        <!-- Gallery and magnifier theme settings. Start -->
-        <var name="gallery">
-            <var name="nav">thumbs</var> <!-- Gallery navigation style (false/thumbs/dots) -->
-            <var name="loop">true</var> <!-- Gallery navigation loop (true/false) -->
-            <var name="keyboard">true</var> <!-- Turn on/off keyboard arrows navigation (true/false) -->
-            <var name="arrows">true</var> <!-- Turn on/off arrows on the sides preview (true/false) -->
-            <var name="caption">false</var> <!-- Display alt text as image title (true/false) -->
-            <var name="allowfullscreen">true</var> <!-- Turn on/off fullscreen (true/false) -->
-            <var name="navdir">horizontal</var> <!-- Sliding direction of thumbnails (horizontal/vertical) -->
-            <var name="navarrows">true</var> <!-- Turn on/off on the thumbs navigation sides arrows(true/false) -->
-            <var name="navtype">slides</var> <!-- Sliding type of thumbnails (slides/thumbs) -->
-            <var name="transition">
-                <var name="effect">slide</var> <!-- Sets transition effect for slides changing (slide/crossfade/dissolve) -->
-                <var name="duration">500</var> <!-- Sets transition duration in ms -->
-            </var>
-            <var name="fullscreen">
-                <var name="nav">thumbs</var> <!-- Fullscreen navigation style (false/thumbs/dots) -->
-                <var name="loop">true</var> <!-- Fullscreen navigation loop (true/false/null) -->
-                <var name="arrows">false</var> <!-- Turn on/off arrows on the sides preview in fullscreen (true/false/null) -->
-                <var name="caption">false</var> <!-- Display alt text as image title in fullscreen(true/false) -->
-                <var name="navdir">horizontal</var> <!--Sliding direction of thumbnails in fullscreen(horizontal/vertical)  -->
-                <var name="navtype">slides</var> <!-- Sliding type of thumbnails (slides/thumbs) -->
-                <var name="transition">
-                    <var name="effect">dissolve</var> <!-- Sets transition effect for slides changing (slide/crossfade/dissolve) -->
-                    <var name="duration">500</var> <!-- Sets transition duration in ms -->
-                </var>
-            </var>
-        </var>
-
-        <var name="magnifier">
-            <var name="fullscreenzoom">20</var>  <!-- Zoom for fullscreen (integer)-->
-            <var name="top"></var> <!-- Top position of magnifier -->
-            <var name="left"></var> <!-- Left position of magnifier -->
-            <var name="width"></var> <!-- Width of magnifier block -->
-            <var name="height"></var> <!-- Height of magnifier block -->
-            <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
-            <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
-        </var>
-
-        <var name="breakpoints">
-            <var name="mobile">
-                <var name="conditions">
-                    <var name="max-width">767px</var>
-                </var>
-                <var name="options">
-                    <var name="options">
-                        <var name="nav">dots</var>
-                    </var>
-                </var>
-            </var>
-        </var>
-        <!-- end. Gallery and magnifier theme settings -->
-
-        <var name="product_small_image_sidebar_size">100</var>  <!-- Override for small product image -->
-        <var name="product_base_image_size">275</var>           <!-- Override for base product image -->
-        <var name="product_base_image_icon_size">48</var>       <!-- Base product image icon size -->
-
-        <var name="product_list_image_size">166</var>           <!-- New Product image size used in product list -->
-        <var name="product_zoom_image_size">370</var>           <!-- New Product image size used for zooming -->
-
-        <var name="product_image_white_borders">0</var>
-    </vars>
-    <vars module="Magento_Bundle">
-        <var name="product_summary_image_size">58</var>         <!-- New Product image size used for summary block-->
-    </vars>
-    <vars module="Js_Bundle">
-        <var name="bundle_size">1MB</var>
-    </vars>
-    <exclude>
-        <item type="file">Lib::jquery/jquery.min.js</item>
-        <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.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>
-        <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
-        <item type="file">Lib::requirejs/require.js</item>
-        <item type="file">Lib::requirejs/text.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
-        <item type="file">Lib::legacy-build.min.js</item>
-        <item type="file">Lib::mage/captcha.js</item>
-        <item type="file">Lib::mage/dropdown_old.js</item>
-        <item type="file">Lib::mage/list.js</item>
-        <item type="file">Lib::mage/loader_old.js</item>
-        <item type="file">Lib::mage/webapi.js</item>
-        <item type="file">Lib::mage/zoom.js</item>
-        <item type="file">Lib::mage/translate-inline-vde.js</item>
-        <item type="file">Lib::mage/requirejs/mixins.js</item>
-        <item type="file">Lib::mage/requirejs/static.js</item>
-        <item type="file">Magento_Customer::js/zxcvbn.js</item>
-        <item type="file">Magento_Catalog::js/zoom.js</item>
-        <item type="file">Magento_Ui::js/lib/step-wizard.js</item>
-        <item type="file">Magento_Ui::js/form/element/ui-select.js</item>
-        <item type="file">Magento_Ui::js/form/element/file-uploader.js</item>
-        <item type="file">Magento_Ui::js/form/components/insert.js</item>
-        <item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
-        <item type="directory">Magento_Ui::js/timeline</item>
-        <item type="directory">Magento_Ui::js/grid</item>
-        <item type="directory">Magento_Ui::js/dynamic-rows</item>
-        <item type="directory">Magento_Ui::templates/timeline</item>
-        <item type="directory">Magento_Ui::templates/grid</item>
-        <item type="directory">Magento_Ui::templates/dynamic-rows</item>
-        <item type="directory">Magento_Swagger::swagger-ui</item>
-        <item type="directory">Lib::modernizr</item>
-        <item type="directory">Lib::tiny_mce</item>
-        <item type="directory">Lib::varien</item>
-        <item type="directory">Lib::jquery/editableMultiselect</item>
-        <item type="directory">Lib::jquery/jstree</item>
-        <item type="directory">Lib::jquery/fileUploader</item>
-        <item type="directory">Lib::css</item>
-        <item type="directory">Lib::lib</item>
-        <item type="directory">Lib::extjs</item>
-        <item type="directory">Lib::prototype</item>
-        <item type="directory">Lib::scriptaculous</item>
-        <item type="directory">Lib::less</item>
-        <item type="directory">Lib::mage/adminhtml</item>
-        <item type="directory">Lib::mage/backend</item>
-    </exclude>
-</view>
diff --git a/app/design/frontend/Magento/rush/media/preview.jpg b/app/design/frontend/Magento/rush/media/preview.jpg
deleted file mode 100644
index 61be74876a1e9..0000000000000
Binary files a/app/design/frontend/Magento/rush/media/preview.jpg and /dev/null differ
diff --git a/app/design/frontend/Magento/rush/registration.php b/app/design/frontend/Magento/rush/registration.php
deleted file mode 100644
index d7b767d71e06d..0000000000000
--- a/app/design/frontend/Magento/rush/registration.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use \Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(
-    ComponentRegistrar::THEME,
-    'frontend/Magento/rush',
-    __DIR__
-);
diff --git a/app/design/frontend/Magento/rush/theme.xml b/app/design/frontend/Magento/rush/theme.xml
deleted file mode 100644
index cdd11220bc989..0000000000000
--- a/app/design/frontend/Magento/rush/theme.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
-    <title>Magento Rush</title>
-    <media>
-        <preview_image>media/preview.jpg</preview_image>
-    </media>
-</theme>
diff --git a/app/design/frontend/Magento/rush/web/images/logo.svg b/app/design/frontend/Magento/rush/web/images/logo.svg
deleted file mode 100644
index 556d839b8b84f..0000000000000
--- a/app/design/frontend/Magento/rush/web/images/logo.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="127" height="128" viewBox="0 0 127 128">
-  <metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01        ">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""/>
-   </rdf:RDF>
-</x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
-<?xpacket end="w"?></metadata>
-<image id="Layer_0" data-name="Layer 0" width="127" height="128" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAH8AAACACAYAAAAiebbfAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH4QkVCCMVpnxlaQAAFz5JREFUeNrtnXlQFGfex7893XMzzGQQGJgZuR0uQQ7FiBAUJURFjRoTzeprTNyt6K67W6sxqd1N9q1ssknVJia7lGY3iUv2DSpGzaKoKY94kojAIoIcCgF1uA855oSZed4/kIkoRlSGBpxP1beKPqb79/y+3c/T/XTTD0UIwXgm53KpqMfcI7BZLFyr1cK1Wqxcq9XCs1qsHGKz0RSHY6UZ2kbTTA/N0L00zfRyGKaXx+eZFoSFG9iO35FQ48X8I2VlAoNeL9V1dckbtTcCG27c0DRcvxHYdONGYEd7e7JBp4fJaIDRaITRYIBJr4fVagVN0xCIxRCKRBAKhRAIRRC5iCGTy094qtVVXhPVVV5qdaVCpa5ycXVtF4nFnc+EhprYLu9wMKbN33vhgmd1efm00oKC5PKiosSaK1ei2ltaHLY/ubs7/CZNKgqJijoTHht7IiAk5MKyadOa2M7DwzKmzP+mspJ7taTkyfyzZxeXXriQfLWsLELf3Q0AGMlyUBQFABBLJAgKDb0UPm3aiakJCf8Jmjz5+1SNppftPA0ZQsio16dHDke9uGHDR35BQc0MwxCapgnF4RAArIvicAhN04RhGOIXFNT84oYNH3165HAU2zkbikbtmb8v/4LnqZzDa789cGDttaqrgWazGVarFcRmYzu0e0JxOKBpGnw+Hz6BQVWzFy7ckbRg3o6lU0dp08D20XenMs+c9lv60kufK1QqPV8gIDRNs352P4xomiZ8gYAoVCr90pde+jzzzGk/tnN7p1gPoF+ffXMkYt7y5/colEqjQCgkFEWxbuBwiKIoIhAKiUKpNM5b/vyez745EsF2rkeN+ZlnzvilLFn6tZdarRcIhayb5UgJhELipVbrU5Ys/TrzzBnWawJWd/7Kltfe9gkMbOYLxrfpd4ovEBKfwMDmV7a89vZjZ/6fP/t0SczMmfkyuZx1I9iUTC4nMTNn5v/5s0+XjHvzvzp/3nvxqtX/Vvr6drCd+NEkpa9vx+JVq//91fnz3uPS/L9mfpkam5CQP97b9YeVQCgksQkJ+X/N/DJ1XJn/yz+99Zp/cHAd2wkeC/IPDq775Z/eem3Mm5955ozfs2vWZMjd3VlP6liS3N2dPLtmTYaj7wgctuHt2dnTZsyde5rL47GezLEoLo9HZsyde3p7dva0MWX+1qzdyZFxcSVsJ3A8KDIurmRr1u7kMWH+exk7FmsmT65lO2njSZrJk2vfy9ixeFSb/9a2bSsnBgS0sZ2s8aiJAQFtb23btnJUmv/7jz9aq1AqjWwnaTxLoVQaf//xR2tHlfnv7vh8sZdKpWc7OY+DvFQq/bs7Ph+WJuCRN5C+f2+iys+vg+2kPE5S+fl1pO/fm8iq+RnHj4X4aTSN4+Xx61gRRVHET6NpzDh+LIQV8/fl57sHR0T8MFZfthjrommaBEdE/LAvP999xM2PnzP3NI/PZz0Jj7N4fD6JnzP39Iia//LvNr0rEruwXninQERiF/Ly7za9OyLmf7AzM0Uql4+b16zGuiiKIlK5nHywMzPFoeZ/lZfn6R8cXOc0fnSJoijiHxxc91VenqfDzE9euDCHZhjWC+vU3aIZhiQvXJjjEPPfTE9fJRSLWS+kU/eWUCwmb6anrxpW87/Ky/MMDA27wXbhnLq/AkPDbgy1+udgCOTs2rWpurxMNZR1nbBLdXmZKmfXrk1DWvl+R8ff9u1NnODpacEoOKqdGpomeHpa/rbv/t2/P7nwUGmpKHnRohy2C+PUgyt50aKcQ6Wlooeu9ovOf5+ae/TofDgZc+QePTq/6Pz3qT+1zj3NP3jpkuTkwZy1JqOR7XI4eQhMRiNOHsxZe/DSJcm91rmn+SX5+XPzTp50nvVjmAsnT80vKcife6/lg5p/+PJlUe6xYy/ourrYjt/JI9Dd1Ynco8deOHz5smiw5YOaX5yXl3L+22+fYzt4J4/O+W+/fa44Ly9lsGWDml+Ym5vmyA8bORk52ltaUJibmzbowjsv/9P374sPDA119uaNIwWGht5I378v/r63epUlJfFVZc7evPFEVVmZqrKkJP7O+QPMP1BcLC0vujiT7WCdDD/lRRdnHigult4+b4D5ZUVFiRUXL6Y92GadjAUqLl5MKysqSrx9HueOFRK1tbVsx+nEAWhra1Fx8eLg5u8vKHD/oaIylu0gnTiOHyoqY/cXFLj3T9vNr6msjKm7VpvEdoBOHEfdtdqkmsrKmP7p28y/ElV/7Rrb8TlxIPXXrqGm8kpU/7TdfG1tTYjzIc74xmQ0QltbE9I/zQH6Pl3epNUGsh2cE8fTpNUG7r1wwRO4ZX5VWdm0Rq32SbYDc+J4murqnqwuL5sG3DL/elV1ZGvT6PwwtJPhpaWxEdeqqyOBW+Y3N9T7OR/fPh7ourrQXFfvB9wyv7O93f3RNulkLNHvN+dweZlA39UlZzsgJyOHvqtLfri8TMBprq/303V1xT/6Jp2MFXRdXfHN9fV+nOb6en9ne383fD4fPB5vwDwOh2MfXGkso+vqQnN9vT/T1tTkY9DpWAuEYRhMmjQJarV6QLJpmgaHwwEhBL29vTAYDGhtbcW1a9fQ2dkJABCLxQgKCoJSqQSH8+MzKovFAq1Wi4qKCvT29g12JRQKERYWBoVCAZqm0dvbixs3bqC6uhoGgwFcLhcqlQp+fn7w8PCAm5sbbDYbWlpa0NzcjOrqaoSFheHKlStobW2FRqOBQqGw75eiKFgsFtTV1aGqqgp6vR5ubm6IioqCUCgcUGaTyYTq6mpcv34dFotlxHOu1+nQ1tTkw+g6u+Vms3nEA+iHy+Vi5syZmDdvHubPnw+GYQAAtbW1aG9vB4/Hg0QiAcMwqKysRFZWFrKzs9HU1ASpVIo5c+Zg2bJliIuLs2/z+PHjyM7ORk1Njd18iUSClJQUrFq1Cv7+/igtLcWOHTvQ0tKCnp4exMbG4pVXXsEzzzwDmUyGmpoadHZ2QigUoq2tDfn5+UhLS8M777yD3NxcpKamYtmyZQgPDwfDMLBarbh48SK+/PJLtLa2Qq/XQ6lU4uc//zliY2Ph5+cHADAYDMjJyUFWVhYaGhpYMb/HbIaus1uOlzdtftfF1ZX1V41cXFxIVVUV6Wf16v8hbm4TSGBgIPnFL35B8vPzCSGENDY2kt/+9rcDfhsfH2//XUtLCwkICLjnfjZs2EBOnTpFli1bZp8XHh5O9u3bRwghpLOzk2RkZJDIyEgiEAhIUFAQWbduHTl16hQxGo1k1apVRCQSEQBkyZIlpLS0lBBCSHl5OVmyZMld+5NKpWTLli2EEEJ6enrI6dOn7b9nLdeuruTlTZvfZcwmo4iNo+9OrFYrenp6QAgBRVHQ63Xo7OxAW1srqqqqIBKJ4O/vD09PTyQmJiIrKwv19fUA+qrRfgghMJlMoCiq7//R7sBsNkOn08FqtdrnhYaGIjk5GQCg1Wrxz3/+E8XFxQCAq1evorq6Gnl5edi/f/+AbZpMJvuZazab7bXMnRhvPTMhhECv1w9ootjAYrHAbDKKOCajSWzpHf2DQNbX16PpVi+kTCaDl5fXsG2bz+fDxcUFQN81iEwmG3D9YbPZUFFRgZMnT+LmzZuDHlRjCUtvL0xGk5gxGY2isWC+zWaD7daAirf/PRzU1dWhpKQEU6ZMga+vL15//XX09PSgsLAQRqMRZrMZPT092LBhA6xW64BaYyzSZ75RxOkxGUWPvjnHo1Ao4ObmBgBoaGjA1atXh23b5eXlOHz4MMxmM7hcLmbMmIGsrCzs2rULK1asgKenJwQCAXp7e+9pPIfDgUAgAI/Hg1gshlgshkgkglgsvuuWcTTQYzKKGLaDuBcMw4DH44HP5yMuLg6LFi2CQqHAzZs3UV5eDt0w3p42NDRg27Zt0Ol02LhxIyZMmACZTIbZs2dj+vTp2Lx5M/bs2YNt27ahpaVl0Grfx8cHmzdvxs9+9rMBfQFcLhdqtZrtdA6eY55AYGA7iMHYsmUL1qxZAzc3N3h7e0OhUKC8vBwff/wxsrKyhn1/DQ0NSE9Px5EjR7Bo0SIsX74cGo0GUqkUEokEv/71rxEcHIw33ngDNTU1d/2+o6MDubm5KCgosN+uEkIgEomQkJCAsLAwtlM6AJ5AYGD4QqGB4XIx2tr9/kSGhoZi+fLloGkaNTU1KCwsREdHx7Dvz2azobu7G5cuXUJtbS12796NmTNn4tVXX8WUKVMgk8mwYMECnD59GpmZmei6o1e0s7MT33//PbKzs8HlcgH0mS+TySCRSLBy5Uq2U2qH4XLBFwoNHKFQqGduBTuaOH/+PLKzs/H+++/j7NmzAICnnnoKCxYssJ9ZD4vNZhtQdVMUZa+qbTYbOjo67B1K69evx4ULF2CxWCAWi5GQkACpVDroNvsvDnU6HXQ6HfR6Pbq7u8FmJ9pgMFwuhEKhnsMXCA2PmkxHYDQa0d3djfb2dhQXF6O5uRlisRgzZsxAZGTkgHV7e3vR3NwMoO/Cy9XV9Z598FKpFCaTCd3d3QCAJ554AmvXrsVvfvObu9bV6XS4dOkSDhw4YO9L8PHxgUAgGHI5RuOzAIZhwBcIDRyBQGAYjWc+8GPirly5Aq1WC6CvQ2batGkD1jMYDLhy5QqAvgusmJiYe3akBAcHw2AwoKGhwb5+eHg4Fi5cCF9f37vWt9lsA87choaGRzqTR0MfAcPlQiAQGDgiV5f20XArYrPZwDCM3XCapu23VQUFBaioqAAAKJVKJCUlYeLEifbfNjU1ISMjAzqdDhKJBK+++ipSU1MhEvXdxYpEIsTGxuIPf/gDJk2ahHPnzqG6uhpAnxk2mw3Tp0/HX/7yFyQlJdkfxHh6euLpp5/G8uXLIRaLcfPmTezduxctt/59vf/hE4B7NkUWi8W+jKIoCAQC9PT0sJprHo8HkatLO73wxRcVxXl5Kzra21kJhM/nIy0tDevWrcOcOXNA0zQAwM3NDQqFAlqtFlqtFhRFwcPDA15eXggICIBarUZLSwuuX7+Onp4eaLVadHZ2gs/nIzo6GjExMUhISEBKSgpeeOEFpKamQiaTIScnBwcPHrRfNEokEsTExEAikaC8vByzZs1CWloa5s+fjxUrVmDp0qUICQnB+fPn8cknn+Drr78GRVFYuXIlXnrpJURHR9t7BeVyOaxWK1paWqDX6xEYGIhNmzZh0aJF8PLyAk3TkMlkcHV1hcViQUNDAysdRu5eXkh8JvUfjIe3ssZlkAuYkYIQgo6ODlRVVeGPf/yj/cy3Wq1obGy095efOHECzc3NCA0NhZubG7q6uqDX6+3baWlpwfbt25GXl4fw8HB4eHhALpfDZrOhubkZra2tKCoqQmFhob29B/ra9SNHjuDMmTOorKxEYmIifHx8IJFIYDAYUFxcjMbGRpSUlKCgoAB6vR4uLi5oa2vDsWPHcOrUKfvzCLPZjI6ODnvMZrMZ1dXVaG1txZ49e+z77OzsRHd3N2tNgItUCg9vZQ0OlZaK4mbPPodR8BGB4ZZIJCLih/xeMJfLJRKJZFx+Wj5u9uxzh0pLRZx5YWEGiasrO3W+gzEYDANqhweht7eX1bPTkUhcXdvnhYUZOADg+sQTzg/wPEb0+80BAA9vr2tiieTRtuhkTCCWSODh7XUNuGX+xICASxM8PdmOy8kIMMHTExMDAi4Bt8wPCAkpUChVF9gOzInjUShVFwJCQgqAW+Yvn/6k1lOlqmI7MCeOx1Olqlo+/UktcNv/5yt9fct5fD7bsTlxIDw+H0pf3/L+abv5fppJRUofH7bjc+JAlD4+8NNMKuqf/tH8SZOKlD6+Z9gO0InjUPr4nvGbNIj5y+Li6v2CNYVsB+jEcfgFawqXxcXV908PeO4ZHBl5zvu2p2VOxg/eEyciODLy3O3zBpgfEh11ShMZ+Q3bgToZfjSRkd+EREedun3eAPOfjYpuD50S5Wz3xyGhU6LOPBsVPeAZzl2vu2giJuf6aTRsx+pkGPHXaKCJmJx75/y7zZ8SmRs5ffoXbAfsZPiImD79C82UyPubnxIYZI2Jjz8kkzu/1DIekMnliImfcSglMOiuV4YGfctxSlzcN3GzZv2H7cCdPDpxs2b9JzJu+qAX8YOavyAiojs+JWWn6NZ/rjoZm4hcXBCfkrIzLSKie7Dl9/xH8clTp56Ymph4lO0COHl4piYmHp08deqJe67wU2Ot/u8n21/g8wWsv3Pm1IOLzxeQ//1k+wsPPZZu9Iz4Q3GzZ52AkzFH3OxZJ6JnxB/6yZXuN8z21qzdyTI3N9aPZKeGLpmbG9matTv5kYZQ79fK9ev/Ph5fYR6PoiiKrFy//u9D8XVI5u/+7juVb1BQM9sFc+r+8g0Kat793XeqYTOfEII3tm5dKxAKWS+cU/eWQCgkb2zdunaong7ZfEIIEp9OPUnTNOuFdOpu0TRNEp9OPfkgfj6Q+btyz/mo/f3bnO3/6BJFUUTt79+2K/ecj8PMJ4TgvYyMNIlUynqBnfpREqmUvJeRkfagXj6w+YQQrP7Vxg8FLH9C1Kk+CUQisvpXGz98GB8fynxCCOKeSsrj8nisF/5xFpfHI3FPJeU9rIcPbf7u3FxVYGjoDY7zApAVcWiaBIaG3tidmzuk27phNZ8Qgn/k5MRODAhwXgCOsCiKIhMDAtr+kZMT+yj+PZL5hBB8sDMzxUut1rOdkMdJXmq1/oOdmSmP6t0jm08IwVvbt6308PLqYTspj4M8vLx63tq+beVw+DYs5hNCsPn999e7KxTOA8CBclcoeja///764fJs2MwnhOD1Dz94Renj08V2ksajlD4+Xa9/+MErw+nXsJpPCMGftm9bGRASXMd2ssaTAkKC6/40TFW9Q80nhOC9LzLSQqOirrKdtPGg0Kioq+998eC9d6yZTwjBR3v2JE1NTMxjuFzWEzgWxXC5ZGpiYt5He/YkOcojh5lPCEHG8eMh855/fo9MLmc9mWNJMrmczHv++T0Zx4+HONIfh5pPCMGRigruute2vK32929jO6ljQWp//7Z1r215+0hFBdfR3jjc/H69s+PzxZOnTi1zvg08uPh8AZk8dWrZOzs+XzxSnoyY+YQQ7Dx71id12XP7PLy9jXB2CfeJooiHt7cxddlz+3aePeszkn6MqPn9ejM9fVVYTEzF4/5egEQqJWExMRVvpqevYsMHVswnhOBIZSW9euPGD73Uaj2Pz2fdiJEUj88nXmq1fvXGjR8eqayk2fKANfP7lXHieEjSM/OOu3l4WMb7QcDj84mbh4cl6Zl5xzNOOPZKfkyY36/tB7KnJS9anCN3dydcHm/cfOqcoijC5fGI3N2dJC9anLP9QPY0tnM96szv17+OHQ1fuPLFTDcPDwvD5RIOh8O6gQ8jDodDGC6XuHl4WBaufDHzX8eOhrOd2ztFEUIwGtl17qzfqZxDa749eHDtjR9+UPXeGmF7tMYL/DhEG5fHg9rfXzs7LW1H0oL5GStmJtSwHdugsH30DUXpX++PX75u3ScqX98OiqJGXZPQH5PK17dj+bp1n6R/vT+e7ZyN6TN/MA4UF0srL12aWZibO+9yQUFydXm5xmhgbzRYoUiEgJCQyrDY2BMx8fGHNRER5xZGRnaynaehMqbMv52cy5dFN1tavH+oKJ9WVvjfWRXFxfHXqqtDOh04SphULodPYGBpcGTE+dDo6JP+wSEXnnB3r18QFjYqxyO+H2PW/DvZ/99Cd0NXt7S7s9O9qb7Or1GrDWzS1gU2a7WrOtrbYdQbYDIZYTLeksHQV/VRFAQiEQRCYZ8EQgjFIsjkcnioVP/nqVJWKVSqKk9vZY1EKm0Rubq2L4mOHhdjEo0b8wfjm8pKrlGnk5lNRpGl18K1WCxcq8XCtVgsPIull0+sNpqiOVaG4ZoZhumhGaaXYZhehsv08gVCg9DFpSNVoxldI0wPI/8PtTbDaDsZI6YAAAAASUVORK5CYII="/>
-</svg>
diff --git a/app/design/frontend/Magento/rush/web/js/foo.js b/app/design/frontend/Magento/rush/web/js/foo.js
deleted file mode 100644
index c4ea9770085d2..0000000000000
--- a/app/design/frontend/Magento/rush/web/js/foo.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log('logging from rush/web');
diff --git a/app/etc/NonComposerComponentRegistration.php b/app/etc/NonComposerComponentRegistration.php
new file mode 100755
index 0000000000000..c7c1f675463c6
--- /dev/null
+++ b/app/etc/NonComposerComponentRegistration.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+//Register components (via a list of glob patterns)
+namespace Magento\NonComposerComponentRegistration;
+
+use RuntimeException;
+
+/**
+ * Include files from a list of glob patterns
+ *
+ * @throws RuntimeException
+ * @return void
+ */
+function main()
+{
+    $globPatterns = require __DIR__ . '/registration_globlist.php';
+    $baseDir = dirname(dirname(__DIR__)) . '/';
+
+    foreach ($globPatterns as $globPattern) {
+        // Sorting is disabled intentionally for performance improvement
+        $files = glob($baseDir . $globPattern, GLOB_NOSORT);
+        if ($files === false) {
+            throw new RuntimeException("glob(): error with '$baseDir$globPattern'");
+        }
+        array_map(function ($file) { require_once $file; }, $files);
+    }
+}
+
+main();
diff --git a/app/etc/db_schema.xml b/app/etc/db_schema.xml
new file mode 100644
index 0000000000000..d7af9091b238d
--- /dev/null
+++ b/app/etc/db_schema.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="patch_list" resource="default" comment="List of data/schema patches">
+        <column xsi:type="int" name="patch_id" identity="true" comment="Patch Auto Increment" />
+        <column xsi:type="varchar" name="patch_name" length="1024" nullable="false" comment="Patch Class Name" />
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="patch_id" />
+        </constraint>
+    </table>
+</schema>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 41dc0e5a48aba..ceccee04a8bc4 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -28,6 +28,7 @@
     <preference for="Magento\Framework\App\CacheInterface" type="Magento\Framework\App\Cache\Proxy" />
     <preference for="Magento\Framework\App\Cache\StateInterface" type="Magento\Framework\App\Cache\State" />
     <preference for="Magento\Framework\App\Cache\TypeListInterface" type="Magento\Framework\App\Cache\TypeList" />
+    <preference for="Magento\Framework\App\ObjectManager\ConfigWriterInterface" type="Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem" />
     <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
     <preference for="Magento\Framework\View\DesignInterface" type="Magento\Theme\Model\View\Design\Proxy" />
     <preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" />
@@ -37,12 +38,15 @@
     <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\TranslatedLists" />
     <preference for="Magento\Framework\Locale\AvailableLocalesInterface" type="Magento\Framework\Locale\Deployed\Codes" />
     <preference for="Magento\Framework\Locale\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
+    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Backend\Database" />
     <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
     <preference for="Magento\Framework\Api\Search\SearchResultInterface" type="Magento\Framework\Api\Search\SearchResult" />
     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>
     <preference for="Magento\Framework\Api\Search\DocumentInterface" type="Magento\Framework\Api\Search\Document" />
     <preference for="Magento\Framework\Api\Search\AggregationInterface" type="Magento\Framework\Search\Response\Aggregation" />
     <preference for="Magento\Framework\App\RequestSafetyInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="\Magento\Framework\Setup\SchemaSetupInterface" type="\Magento\Setup\Module\Setup" />
+    <preference for="\Magento\Framework\Setup\ModuleDataSetupInterface" type="\Magento\Setup\Module\DataSetup" />
     <type name="Magento\Store\Model\Store">
         <arguments>
             <argument name="currencyInstalled" xsi:type="string">system/currency/installed</argument>
@@ -85,6 +89,7 @@
     <preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
     <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
     <preference for="Magento\Framework\Image\Adapter\ConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
+    <preference for="Magento\Framework\Image\Adapter\UploadConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
     <preference for="Magento\Framework\View\Design\Theme\Image\PathInterface" type="Magento\Theme\Model\Theme\Image\Path" />
     <preference for="Magento\Framework\Session\Config\ConfigInterface" type="Magento\Framework\Session\Config" />
     <preference for="Magento\Framework\Session\SidResolverInterface" type="Magento\Framework\Session\SidResolver\Proxy" />
@@ -142,6 +147,7 @@
     <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
     <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
     <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
+    <preference for="Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverterInterface" type="Magento\Framework\Stdlib\DateTime\Timezone\LocalizedDateToUtcConverter" />
     <preference for="Magento\Framework\Communication\ConfigInterface" type="Magento\Framework\Communication\Config" />
     <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\ModuleResource" />
     <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
@@ -172,8 +178,37 @@
     <preference for="Magento\Framework\App\View\Deployment\Version\StorageInterface" type="Magento\Framework\App\View\Deployment\Version\Storage\File"/>
     <preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
     <preference for="Magento\Framework\View\Element\Message\InterpretationStrategyInterface" type="Magento\Framework\View\Element\Message\InterpretationMediator" />
+    <preference for="Magento\Framework\App\FeedInterface" type="Magento\Framework\App\Feed" />
+    <preference for="Magento\Framework\App\FeedFactoryInterface" type="Magento\Framework\App\FeedFactory" />
     <preference for="Magento\Framework\Indexer\Config\DependencyInfoProviderInterface" type="Magento\Framework\Indexer\Config\DependencyInfoProvider" />
     <preference for="Magento\Framework\Webapi\CustomAttribute\ServiceTypeListInterface" type="Magento\Eav\Model\TypeLocator\ComplexType"/>
+    <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaReader" />
+    <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaWriter" />
+    <preference for="Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface" type="Magento\Framework\Setup\Declaration\Schema\SchemaConfig" />
+    <preference for="Magento\Framework\Setup\Declaration\Schema\DataSavior\DumpAccessorInterface" type="Magento\Framework\Setup\Declaration\Schema\FileSystem\Csv" />
+    <preference for="Magento\Framework\MessageQueue\PublisherInterface" type="Magento\Framework\MessageQueue\PublisherPool" />
+    <preference for="Magento\Framework\MessageQueue\BulkPublisherInterface" type="Magento\Framework\MessageQueue\Bulk\PublisherPool" />
+    <preference for="Magento\Framework\MessageQueue\MessageIdGeneratorInterface" type="Magento\Framework\MessageQueue\MessageIdGenerator" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\ConfigInterface" type="Magento\Framework\MessageQueue\Consumer\Config" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\HandlerInterface" type="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface" type="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface" type="Magento\Framework\MessageQueue\Consumer\Config\CompositeValidator" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface" type="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader" />
+    <preference for="Magento\Framework\Amqp\Topology\BindingInstallerInterface" type="Magento\Framework\Amqp\Topology\BindingInstaller" />
+    <preference for="Magento\Framework\MessageQueue\Topology\ConfigInterface" type="Magento\Framework\MessageQueue\Topology\Config" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ReaderInterface" type="Magento\Framework\MessageQueue\Topology\Config\CompositeReader" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface" type="Magento\Framework\MessageQueue\Topology\Config\CompositeValidator" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface" type="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface" type="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\ConfigInterface" type="Magento\Framework\MessageQueue\Publisher\Config" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface" type="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface" type="Magento\Framework\MessageQueue\Publisher\Config\CompositeValidator" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface" type="Magento\Framework\MessageQueue\Publisher\Config\PublisherConnection" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface" type="Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem" />
+    <preference for="Magento\Framework\MessageQueue\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\ExchangeFactory" />
+    <preference for="Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\Bulk\ExchangeFactory" />
+    <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
+    <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
@@ -190,9 +225,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>
@@ -201,6 +241,10 @@
                     <item name="reader" xsi:type="object">Magento\Framework\Communication\Config\Reader\EnvReader</item>
                     <item name="sortOrder" xsi:type="string">20</item>
                 </item>
+                <item name="remoteServiceReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\Communication</item>
+                    <item name="sortOrder" xsi:type="string">5</item>
+                </item>
             </argument>
         </arguments>
     </type>
@@ -210,9 +254,15 @@
             <argument name="handlers"  xsi:type="array">
                 <item name="system" xsi:type="object">Magento\Framework\Logger\Handler\System</item>
                 <item name="debug" xsi:type="object">Magento\Framework\Logger\Handler\Debug</item>
+                <item name="syslog" xsi:type="object">Magento\Framework\Logger\Handler\Syslog</item>
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Logger\Handler\Syslog">
+        <arguments>
+            <argument name="ident" xsi:type="string">Magento</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Model\Context">
         <arguments>
             <argument name="actionValidator" xsi:type="object">Magento\Framework\Model\ActionValidator\RemoveAction\Proxy</argument>
@@ -234,6 +284,11 @@
             <argument name="pathInfoProcessor" xsi:type="object">Magento\Backend\App\Request\PathInfoProcessor\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Response\Http">
+        <arguments>
+            <argument name="sessionConfig" xsi:type="object">Magento\Framework\Session\Config\ConfigInterface\Proxy</argument>
+        </arguments>
+    </type>
     <preference for="Magento\Framework\Session\SaveHandlerInterface" type="Magento\Framework\Session\SaveHandler" />
     <type name="Magento\Framework\Session\SaveHandlerFactory">
         <arguments>
@@ -243,6 +298,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\FeedFactory">
+        <arguments>
+            <argument name="formats" xsi:type="array">
+                <item name="rss" xsi:type="string">Magento\Framework\App\Feed</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Session\SaveHandler\Redis">
         <arguments>
             <argument name="config" xsi:type="object">Cm\RedisSession\Handler\ConfigInterface</argument>
@@ -352,6 +414,11 @@
             <argument name="cacheId" xsi:type="string">interception</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Interception\Config\CacheManager">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Interception\PluginList\PluginList">
         <arguments>
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
@@ -691,6 +758,7 @@
                 <item name="searchResults" xsi:type="string">\Magento\Framework\Api\Code\Generator\SearchResults</item>
                 <item name="extensionInterface" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceGenerator</item>
                 <item name="extension" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator</item>
+                <item name="remote" xsi:type="string">\Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator</item>
             </argument>
         </arguments>
     </type>
@@ -1347,4 +1415,338 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory">
+        <arguments>
+            <argument name="typeFactories" xsi:type="array">
+                <item name="table" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table</item>
+                <item name="decimal" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real</item>
+                <item name="float" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real</item>
+                <item name="double" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real</item>
+                <item name="smallint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="tinyint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="bigint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="int" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="date" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Date</item>
+                <item name="timestamp" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp</item>
+                <item name="datetime" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp</item>
+                <item name="longtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongText</item>
+                <item name="mediumtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumText</item>
+                <item name="text" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Text</item>
+                <item name="varchar" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary</item>
+                <item name="varbinary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary</item>
+                <item name="blob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Blob</item>
+                <item name="mediumblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumBlob</item>
+                <item name="longblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongBlob</item>
+                <item name="boolean" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Boolean</item>
+                <item name="unique" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Unique</item>
+                <item name="primary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Primary</item>
+                <item name="foreign" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Foreign</item>
+                <item name="index" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Index</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator">
+        <arguments>
+            <argument name="definitionProcessors" xsi:type="array">
+                <item name="boolean" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean</item>
+                <item name="int" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="smallint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="tinyint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="bigint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="decimal" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
+                <item name="float" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
+                <item name="double" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
+                <item name="text" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="blob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="mediumblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="longblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="mediumtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="longtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="datetime" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp</item>
+                <item name="date" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date</item>
+                <item name="timestamp" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp</item>
+                <item name="char" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="varchar" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="binary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="varbinary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="index" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index</item>
+                <item name="unique" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
+                <item name="primary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
+                <item name="constraint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
+                <item name="reference" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn">
+        <arguments>
+            <argument name="triggers" xsi:type="array">
+                <item name="migrateDataFromSameTable" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFrom</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xml" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator" type="Magento\Framework\Config\SchemaLocator">
+        <arguments>
+            <argument name="realPath" xsi:type="string">urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader" type="Magento\Framework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="fileResolver" xsi:type="object">Magento\Framework\Config\FileResolverByModule</argument>
+            <argument name="converter" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Config\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">db_schema.xml</argument>
+            <argument name="idAttributes" xsi:type="array">
+                <item name="/schema/table" xsi:type="string">name</item>
+                <item name="/schema/table/column" xsi:type="string">name</item>
+                <item name="/schema/table/constraint" xsi:type="string">referenceId</item>
+                <item name="/schema/table/index" xsi:type="string">referenceId</item>
+                <item name="/schema/table/index/column" xsi:type="string">name</item>
+                <item name="/schema/table/constraint/column" xsi:type="string">name</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\Setup\Declaration\Schema\OperationsExecutor">
+        <arguments>
+            <argument name="operations" xsi:type="array">
+                <item name="recreate_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\ReCreateTable</item>
+                <item name="create_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable</item>
+                <item name="drop_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\DropTable</item>
+                <item name="drop_reference" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\DropReference</item>
+                <item name="modify_column" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\ModifyColumn</item>
+                <item name="add_column" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn</item>
+                <item name="drop_element" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\DropElement</item>
+                <item name="add_complex_element" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement</item>
+                <item name="modify_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\ModifyTable</item>
+            </argument>
+            <argument name="dataSaviorsCollection" xsi:type="array">
+                <item name="table_savior" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\DataSavior\TableSavior</item>
+                <item name="column_savior" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\DataSavior\ColumnSavior</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Sharding">
+        <arguments>
+            <argument name="resources" xsi:type="array">
+                <item name="default" xsi:type="string">default</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationComposite">
+        <arguments>
+            <argument name="rules" xsi:type="array">
+                <item name="check_references" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex</item>
+                <item name="real_types" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\RealTypes</item>
+                <item name="check_primary_key" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\PrimaryKeyCanBeCreated</item>
+                <item name="inconsistence_references" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\IncosistentReferenceDefinition</item>
+                <item name="auto_increment_validation" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\AutoIncrementColumnValidation</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\SchemaListener">
+        <arguments>
+            <argument name="definitionMappers" xsi:type="array">
+                <item name="integer" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\IntegerDefinition</item>
+                <item name="tinyint" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\IntegerDefinition</item>
+                <item name="smallint" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\IntegerDefinition</item>
+                <item name="mediumint" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\IntegerDefinition</item>
+                <item name="bigint" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\IntegerDefinition</item>
+                <item name="decimal" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\RealDefinition</item>
+                <item name="float" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\RealDefinition</item>
+                <item name="numeric" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\RealDefinition</item>
+                <item name="text" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="mediumtext" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="longtext" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="blob" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="mediumblob" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="longblog" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="varbinary" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="varchar" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition</item>
+                <item name="timestamp" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TimestampDefinition</item>
+                <item name="datetime" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\TimestampDefinition</item>
+                <item name="date" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\DateDefinition</item>
+                <item name="boolean" xsi:type="object">Magento\Framework\Setup\SchemaListenerDefinition\BooleanDefinition</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="\Magento\Framework\Setup\Patch\SchemaPatchReader" type="\Magento\Framework\Setup\Patch\PatchReader">
+        <arguments>
+            <argument name="type" xsi:type="string">schema</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="\Magento\Framework\Setup\Patch\DataPatchReader" type="\Magento\Framework\Setup\Patch\PatchReader">
+        <arguments>
+            <argument name="type" xsi:type="string">data</argument>
+        </arguments>
+    </virtualType>
+    <type name="\Magento\Framework\Setup\Patch\PatchApplier">
+        <arguments>
+            <argument name="dataPatchReader" xsi:type="object">\Magento\Framework\Setup\Patch\DataPatchReader</argument>
+            <argument name="schemaPatchReader" xsi:type="object">\Magento\Framework\Setup\Patch\SchemaPatchReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Patch\UpToDateData">
+        <arguments>
+            <argument name="dataPatchReader" xsi:type="object">\Magento\Framework\Setup\Patch\DataPatchReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Patch\UpToDateSchema">
+        <arguments>
+            <argument name="schemaReader" xsi:type="object">\Magento\Framework\Setup\Patch\SchemaPatchReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xmlReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\Framework\MessageQueue\Config\Reader\Xml</item>
+                    <item name="sortOrder" xsi:type="string">10</item>
+                </item>
+                <item name="envReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\Framework\MessageQueue\Config\Reader\Env</item>
+                    <item name="sortOrder" xsi:type="string">20</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter">
+        <arguments>
+            <argument name="converters" xsi:type="array">
+                <item name="topicConfig" xsi:type="array">
+                    <item name="converter" xsi:type="object">Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig</item>
+                    <item name="sortOrder" xsi:type="string">20</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\MessageQueue\Consumer\Config\CompositeReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xmlReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Consumer\Config\Xml\Reader</item>
+                <item name="envReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Consumer\Config\Env\Reader</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="requiredFields" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Consumer\Config\Validator\RequiredFields</item>
+                <item name="fieldTypes" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Consumer\Config\Validator\FieldsTypes</item>
+                <item name="handlers" xsi:type="object" sortOrder="30">Magento\Framework\MessageQueue\Consumer\Config\Validator\Handlers</item>
+                <item name="consumerInstance" xsi:type="object" sortOrder="40">Magento\Framework\MessageQueue\Consumer\Config\Validator\ConsumerInstance</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="connectionFormat" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Publisher\Config\Validator\Format</item>
+                <item name="enabledConnection" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Publisher\Config\Validator\EnabledConnection</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="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>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="format" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Topology\Config\Validator\Format</item>
+                <item name="fieldsTypes" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Topology\Config\Validator\FieldsTypes</item>
+                <item name="dependantFields" xsi:type="object" sortOrder="30">Magento\Framework\MessageQueue\Topology\Config\Validator\DependentFields</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="remoteServiceReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Topology\Config\RemoteService\Reader</item>
+                <item name="xmlReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Topology\Config\Xml\Reader</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Amqp\Topology\BindingInstaller">
+        <arguments>
+            <argument name="installers" xsi:type="array">
+                <item name="queue" xsi:type="object">Magento\Framework\Amqp\Topology\BindingInstallerType\Queue</item>
+                <item name="exchange" xsi:type="object">Magento\Framework\Amqp\Topology\BindingInstallerType\Exchange</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Config\Reader\Env\Converter\Publisher">
+        <arguments>
+            <argument name="connectionToExchangeMap" xsi:type="array">
+                <item name="amqp" xsi:type="string">magento</item>
+                <item name="db" xsi:type="string">magento-db</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\Env\Reader">
+        <arguments>
+            <argument name="publisherNameToConnectionMap" xsi:type="array">
+                <item name="amqp-magento" xsi:type="string">amqp</item>
+                <item name="db-magento-db" xsi:type="string">db</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable">
+        <arguments>
+            <argument name="triggers" xsi:type="array">
+                <item name="migrateDataFromAnotherTable" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFromAnotherTable</item>
+            </argument>
+        </arguments>
+    </type>
+    <!-- \Magento\Framework\MessageQueue\Bulk\PublisherPool is @api -->
+    <virtualType name="Magento\Framework\MessageQueue\Bulk\PublisherPool" type="Magento\Framework\MessageQueue\PublisherPool" />
+    <type name="Magento\Framework\Session\Config">
+        <arguments>
+            <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
+        </arguments>
+    </type>
+    <virtualType name="CsrfRequestValidator" type="Magento\Framework\App\Request\CsrfValidator" />
+    <virtualType name="RequestValidator" type="Magento\Framework\App\Request\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="csrf_validator" xsi:type="object">CsrfRequestValidator</item>
+                <item name="http_method_validator" xsi:type="object">
+                    Magento\Framework\App\Request\HttpMethodValidator
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <preference for="Magento\Framework\App\Request\ValidatorInterface" type="RequestValidator" />
+    <type name="Magento\Framework\App\Request\HttpMethodMap">
+        <arguments>
+            <argument name="map" xsi:type="array">
+                <item name="OPTIONS" xsi:type="string">\Magento\Framework\App\Action\HttpOptionsActionInterface</item>
+                <item name="GET" xsi:type="string">\Magento\Framework\App\Action\HttpGetActionInterface</item>
+                <item name="HEAD" xsi:type="string">\Magento\Framework\App\Action\HttpHeadActionInterface</item>
+                <item name="POST" xsi:type="string">\Magento\Framework\App\Action\HttpPostActionInterface</item>
+                <item name="PUT" xsi:type="string">\Magento\Framework\App\Action\HttpPutActionInterface</item>
+                <item name="PATCH" xsi:type="string">\Magento\Framework\App\Action\HttpPatchActionInterface</item>
+                <item name="DELETE" xsi:type="string">\Magento\Framework\App\Action\HttpDeleteActionInterface</item>
+                <item name="CONNECT" xsi:type="string">\Magento\Framework\App\Action\HttpConnectActionInterface</item>
+                <item name="PROPFIND" xsi:type="string">\Magento\Framework\App\Action\HttpPropfindActionInterface</item>
+                <item name="TRACE" xsi:type="string">\Magento\Framework\App\Action\HttpTraceActionInterface</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/etc/registration_globlist.php b/app/etc/registration_globlist.php
index bd4a26d332239..23caae00cb303 100644
--- a/app/etc/registration_globlist.php
+++ b/app/etc/registration_globlist.php
@@ -15,4 +15,5 @@
     'app/i18n/*/*/registration.php',
     'lib/internal/*/*/registration.php',
     'lib/internal/*/*/*/registration.php',
+    'setup/src/*/*/registration.php'
 ];
diff --git a/app/functions.php b/app/functions.php
index 0b5fa4de4100e..4b00d01819f70 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -6,17 +6,22 @@
 
 /**
  * Create value-object \Magento\Framework\Phrase
- *
+ * @deprecated The global function __() is now loaded via Magento Framework, the below require is only
+ *             for backwards compatibility reasons and this file will be removed in a future version
+ * @see        Magento\Framework\Phrase\__.php
+ * @SuppressWarnings(PHPMD.ShortMethodName)
  * @return \Magento\Framework\Phrase
  */
-function __()
-{
-    $argc = func_get_args();
+if (!function_exists('__')) {
+    function __()
+    {
+        $argc = func_get_args();
 
-    $text = array_shift($argc);
-    if (!empty($argc) && is_array($argc[0])) {
-        $argc = $argc[0];
-    }
+        $text = array_shift($argc);
+        if (!empty($argc) && is_array($argc[0])) {
+            $argc = $argc[0];
+        }
 
-    return new \Magento\Framework\Phrase($text, $argc);
+        return new \Magento\Framework\Phrase($text, $argc);
+    }
 }
diff --git a/app/i18n/Magento/de_DE/composer.json b/app/i18n/Magento/de_DE/composer.json
index f0dad84b2554a..5a488a3e32c2b 100644
--- a/app/i18n/Magento/de_DE/composer.json
+++ b/app/i18n/Magento/de_DE/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-de_de",
     "description": "German (Germany) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/i18n/Magento/en_US/composer.json b/app/i18n/Magento/en_US/composer.json
index 914cde9e6d6d2..1108c70de28a6 100644
--- a/app/i18n/Magento/en_US/composer.json
+++ b/app/i18n/Magento/en_US/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-en_us",
     "description": "English (United States) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/i18n/Magento/es_ES/composer.json b/app/i18n/Magento/es_ES/composer.json
index bce8309720d69..5bc3cb5730adf 100644
--- a/app/i18n/Magento/es_ES/composer.json
+++ b/app/i18n/Magento/es_ES/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-es_es",
     "description": "Spanish (Spain) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/i18n/Magento/fr_FR/composer.json b/app/i18n/Magento/fr_FR/composer.json
index 1ff33f2850df3..50c541308673b 100644
--- a/app/i18n/Magento/fr_FR/composer.json
+++ b/app/i18n/Magento/fr_FR/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-fr_fr",
     "description": "French (France) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/i18n/Magento/nl_NL/composer.json b/app/i18n/Magento/nl_NL/composer.json
index bf659dde42536..a182e179d4103 100644
--- a/app/i18n/Magento/nl_NL/composer.json
+++ b/app/i18n/Magento/nl_NL/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-nl_nl",
     "description": "Dutch (Netherlands) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/i18n/Magento/pt_BR/composer.json b/app/i18n/Magento/pt_BR/composer.json
index 4b49fcd64f749..46734cc09b363 100644
--- a/app/i18n/Magento/pt_BR/composer.json
+++ b/app/i18n/Magento/pt_BR/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-pt_br",
     "description": "Portuguese (Brazil) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/i18n/Magento/zh_Hans_CN/composer.json b/app/i18n/Magento/zh_Hans_CN/composer.json
index 08dcd3a726582..ce214ce649f56 100644
--- a/app/i18n/Magento/zh_Hans_CN/composer.json
+++ b/app/i18n/Magento/zh_Hans_CN/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-zh_hans_cn",
     "description": "Chinese (China) language",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -10,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "100.3.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
diff --git a/app/registration.php b/app/registration.php
deleted file mode 100755
index fdfe4aa45b49d..0000000000000
--- a/app/registration.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-//Register components (via a list of glob patterns)
-namespace Magento\NonComposerComponentRegistration;
-
-use RuntimeException;
-
-/**
- * Include files from a list of glob patterns
- *
- * @throws RuntimeException
- * @return void
- */
-function main()
-{
-    $globPatterns = require __DIR__ . '/etc/registration_globlist.php';
-    $baseDir = dirname(__DIR__) . '/';
-
-    foreach ($globPatterns as $globPattern) {
-        // Sorting is disabled intentionally for performance improvement
-        $files = glob($baseDir . $globPattern, GLOB_NOSORT);
-        if ($files === false) {
-            throw new RuntimeException("glob(): error with '$baseDir$globPattern'");
-        }
-        array_map(function ($file) { require_once $file; }, $files);
-    }
-}
-
-main();
diff --git a/composer.json b/composer.json
index 7cc2f0b69a5c7..62b3c95135669 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,7 @@
 {
     "name": "magento/magento2ce",
-    "description": "Magento 2 (Community Edition)",
+    "description": "Magento 2 (Open Source)",
     "type": "project",
-    "version": "2.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -12,7 +11,8 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
+        "ext-bcmath": "*",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -21,7 +21,6 @@
         "ext-iconv": "*",
         "ext-intl": "*",
         "ext-mbstring": "*",
-        "ext-mcrypt": "*",
         "ext-openssl": "*",
         "ext-pdo_mysql": "*",
         "ext-simplexml": "*",
@@ -30,194 +29,244 @@
         "ext-xsl": "*",
         "ext-zip": "*",
         "lib-libxml": "*",
-        "braintree/braintree_php": "3.22.0",
-        "colinmollenhour/cache-backend-file": "1.4",
-        "colinmollenhour/cache-backend-redis": "1.10.2",
-        "colinmollenhour/credis": "1.6",
-        "colinmollenhour/php-redis-session-abstract": "~1.2.2",
-        "composer/composer": "1.4.1",
-        "magento/composer": "~1.2.0",
+        "braintree/braintree_php": "3.35.0",
+        "colinmollenhour/cache-backend-file": "~1.4.1",
+        "colinmollenhour/cache-backend-redis": "1.10.6",
+        "colinmollenhour/credis": "1.10.0",
+        "colinmollenhour/php-redis-session-abstract": "~1.4.0",
+        "composer/composer": "^1.6",
+        "elasticsearch/elasticsearch": "~2.0|~5.1",
+        "magento/composer": "~1.4.0",
         "magento/magento-composer-installer": ">=0.1.11",
-        "magento/zendframework1": "~1.13.0",
+        "magento/zendframework1": "~1.14.1",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
-        "pelago/emogrifier": "1.2.0",
+        "paragonie/sodium_compat": "^1.6",
+        "pelago/emogrifier": "^2.0.0",
+        "php-amqplib/php-amqplib": "~2.7.0",
+        "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
-        "ramsey/uuid": "3.6.1",
-        "sjparkinson/static-review": "~4.1",
-        "symfony/console": "~2.3, !=2.7.0",
-        "symfony/event-dispatcher": "~2.1",
-        "symfony/process": "~2.1",
-        "tedivm/jshrink": "~1.1.0",
-        "tubalmartin/cssmin": "4.1.0",
+        "ramsey/uuid": "~3.8.0",
+        "symfony/console": "~4.1.0",
+        "symfony/event-dispatcher": "~4.1.0",
+        "symfony/process": "~4.1.0",
+        "tedivm/jshrink": "~1.3.0",
+        "tubalmartin/cssmin": "4.1.1",
+        "webonyx/graphql-php": "^0.12.6",
         "zendframework/zend-captcha": "^2.7.1",
-        "zendframework/zend-code": "^3.1.0",
+        "zendframework/zend-code": "~3.3.0",
         "zendframework/zend-config": "^2.6.0",
         "zendframework/zend-console": "^2.6.0",
         "zendframework/zend-crypt": "^2.6.0",
         "zendframework/zend-db": "^2.8.2",
         "zendframework/zend-di": "^2.6.1",
         "zendframework/zend-eventmanager": "^2.6.3",
+        "zendframework/zend-feed": "^2.9.0",
         "zendframework/zend-form": "^2.10.0",
         "zendframework/zend-http": "^2.6.0",
         "zendframework/zend-i18n": "^2.7.3",
         "zendframework/zend-json": "^2.6.1",
         "zendframework/zend-log": "^2.9.1",
-        "zendframework/zend-mail": "^2.8.0",
+        "zendframework/zend-mail": "^2.9.0",
         "zendframework/zend-modulemanager": "^2.7",
-        "zendframework/zend-mvc": "~2.6.3",
+        "zendframework/zend-mvc": "~2.7.0",
         "zendframework/zend-serializer": "^2.7.2",
         "zendframework/zend-server": "^2.6.1",
         "zendframework/zend-servicemanager": "^2.7.8",
         "zendframework/zend-session": "^2.7.3",
-        "zendframework/zend-soap": "^2.6.0",
+        "zendframework/zend-soap": "^2.7.0",
         "zendframework/zend-stdlib": "^2.7.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",
-        "webonyx/graphql-php": "^0.11.1"
+        "zendframework/zend-view": "~2.10.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.1.1",
+        "friendsofphp/php-cs-fixer": "~2.13.0",
         "lusitanian/oauth": "~0.8.10",
-        "pdepend/pdepend": "2.5.0",
+        "magento/magento2-functional-testing-framework": "~2.3.12",
+        "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
-        "phpunit/phpunit": "~6.2.0",
-        "sebastian/phpcpd": "2.0.4",
-        "squizlabs/php_codesniffer": "3.0.1"
+        "phpunit/phpunit": "~6.5.0",
+        "sebastian/phpcpd": "~3.0.0",
+        "squizlabs/php_codesniffer": "3.3.1",
+        "allure-framework/allure-phpunit": "~1.2.0"
+    },
+    "suggest": {
+        "ext-pcntl": "Need for run processes in parallel mode"
     },
     "replace": {
-        "magento/module-marketplace": "100.3.0-dev",
-        "magento/module-admin-notification": "100.3.0-dev",
-        "magento/module-advanced-pricing-import-export": "100.3.0-dev",
-        "magento/module-authorization": "100.3.0-dev",
-        "magento/module-authorizenet": "100.3.0-dev",
-        "magento/module-backend": "100.3.0-dev",
-        "magento/module-backup": "100.3.0-dev",
-        "magento/module-braintree": "100.3.0-dev",
-        "magento/module-bundle": "100.3.0-dev",
-        "magento/module-bundle-import-export": "100.3.0-dev",
-        "magento/module-cache-invalidate": "100.3.0-dev",
-        "magento/module-captcha": "100.3.0-dev",
-        "magento/module-catalog": "101.2.0-dev",
-        "magento/module-catalog-import-export": "100.3.0-dev",
-        "magento/module-catalog-inventory": "100.3.0-dev",
-        "magento/module-catalog-rule": "100.3.0-dev",
-        "magento/module-catalog-rule-configurable": "100.3.0-dev",
-        "magento/module-catalog-search": "100.3.0-dev",
-        "magento/module-catalog-url-rewrite": "100.3.0-dev",
-        "magento/module-catalog-widget": "100.3.0-dev",
-        "magento/module-checkout": "100.3.0-dev",
-        "magento/module-checkout-agreements": "100.3.0-dev",
-        "magento/module-cms": "101.2.0-dev",
-        "magento/module-cms-url-rewrite": "100.3.0-dev",
-        "magento/module-config": "100.3.0-dev",
-        "magento/module-configurable-import-export": "100.3.0-dev",
-        "magento/module-configurable-product": "100.3.0-dev",
-        "magento/module-configurable-product-sales": "100.3.0-dev",
-        "magento/module-contact": "100.3.0-dev",
-        "magento/module-cookie": "100.3.0-dev",
-        "magento/module-cron": "100.3.0-dev",
-        "magento/module-currency-symbol": "100.3.0-dev",
-        "magento/module-customer": "100.3.0-dev",
-        "magento/module-customer-import-export": "100.3.0-dev",
-        "magento/module-deploy": "100.3.0-dev",
-        "magento/module-developer": "100.3.0-dev",
-        "magento/module-dhl": "100.3.0-dev",
-        "magento/module-directory": "100.3.0-dev",
-        "magento/module-downloadable": "100.3.0-dev",
-        "magento/module-downloadable-import-export": "100.3.0-dev",
-        "magento/module-eav": "100.3.0-dev",
-        "magento/module-email": "100.3.0-dev",
-        "magento/module-encryption-key": "100.3.0-dev",
-        "magento/module-fedex": "100.3.0-dev",
-        "magento/module-gift-message": "100.3.0-dev",
-        "magento/module-google-adwords": "100.3.0-dev",
-        "magento/module-google-analytics": "100.3.0-dev",
-        "magento/module-google-optimizer": "100.3.0-dev",
-        "magento/module-graph-ql": "100.0.0-dev",
-        "magento/module-graph-ql-catalog": "100.0.0-dev",
-        "magento/module-graph-ql-configurable-product": "100.0.0-dev",
-        "magento/module-graph-ql-customer": "100.0.0-dev",
-        "magento/module-graph-ql-eav": "100.0.0-dev",
-        "magento/module-grouped-import-export": "100.3.0-dev",
-        "magento/module-grouped-product": "100.3.0-dev",
-        "magento/module-import-export": "100.3.0-dev",
-        "magento/module-indexer": "100.3.0-dev",
-        "magento/module-instant-purchase": "100.3.0-dev",
-        "magento/module-integration": "100.3.0-dev",
-        "magento/module-layered-navigation": "100.3.0-dev",
-        "magento/module-media-storage": "100.3.0-dev",
-        "magento/module-msrp": "100.3.0-dev",
-        "magento/module-multishipping": "100.3.0-dev",
-        "magento/module-new-relic-reporting": "100.3.0-dev",
-        "magento/module-newsletter": "100.3.0-dev",
-        "magento/module-offline-payments": "100.3.0-dev",
-        "magento/module-offline-shipping": "100.3.0-dev",
-        "magento/module-page-cache": "100.3.0-dev",
-        "magento/module-payment": "100.3.0-dev",
-        "magento/module-paypal": "100.3.0-dev",
-        "magento/module-persistent": "100.3.0-dev",
-        "magento/module-product-alert": "100.3.0-dev",
-        "magento/module-product-video": "100.3.0-dev",
-        "magento/module-quote": "100.3.0-dev",
-        "magento/module-reports": "100.3.0-dev",
-        "magento/module-require-js": "100.3.0-dev",
-        "magento/module-review": "100.3.0-dev",
-        "magento/module-robots": "100.3.0-dev",
-        "magento/module-rss": "100.3.0-dev",
-        "magento/module-rule": "100.3.0-dev",
-        "magento/module-sales": "100.3.0-dev",
-        "magento/module-sales-inventory": "100.3.0-dev",
-        "magento/module-sales-rule": "100.3.0-dev",
-        "magento/module-sales-sequence": "100.3.0-dev",
-        "magento/module-sample-data": "100.3.0-dev",
-        "magento/module-search": "100.3.0-dev",
-        "magento/module-security": "100.3.0-dev",
-        "magento/module-send-friend": "100.3.0-dev",
-        "magento/module-shipping": "100.3.0-dev",
-        "magento/module-sitemap": "100.3.0-dev",
-        "magento/module-store": "100.3.0-dev",
-        "magento/module-swagger": "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",
-        "magento/module-tax-import-export": "100.3.0-dev",
-        "magento/module-theme": "100.3.0-dev",
-        "magento/module-translation": "100.3.0-dev",
-        "magento/module-ui": "100.3.0-dev",
-        "magento/module-ups": "100.3.0-dev",
-        "magento/module-url-rewrite": "100.3.0-dev",
-        "magento/module-user": "100.3.0-dev",
-        "magento/module-usps": "100.3.0-dev",
-        "magento/module-variable": "100.3.0-dev",
-        "magento/module-vault": "100.3.0-dev",
-        "magento/module-version": "100.3.0-dev",
-        "magento/module-webapi": "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",
-        "magento/module-wishlist": "100.3.0-dev",
-        "magento/theme-adminhtml-backend": "100.3.0-dev",
-        "magento/theme-frontend-blank": "100.3.0-dev",
-        "magento/theme-frontend-luma": "100.3.0-dev",
-        "magento/theme-frontend-rush": "100.3.0-dev",
-        "magento/language-de_de": "100.3.0-dev",
-        "magento/language-en_us": "100.3.0-dev",
-        "magento/language-es_es": "100.3.0-dev",
-        "magento/language-fr_fr": "100.3.0-dev",
-        "magento/language-nl_nl": "100.3.0-dev",
-        "magento/language-pt_br": "100.3.0-dev",
-        "magento/language-zh_hans_cn": "100.3.0-dev",
-        "magento/framework": "100.3.0-dev",
+        "magento/module-marketplace": "*",
+        "magento/module-admin-notification": "*",
+        "magento/module-advanced-pricing-import-export": "*",
+        "magento/module-amqp": "*",
+        "magento/module-analytics": "*",
+        "magento/module-asynchronous-operations": "*",
+        "magento/module-authorization": "*",
+        "magento/module-authorizenet": "*",
+        "magento/module-advanced-search": "*",
+        "magento/module-backend": "*",
+        "magento/module-backup": "*",
+        "magento/module-braintree": "*",
+        "magento/module-bundle": "*",
+        "magento/module-bundle-graph-ql": "*",
+        "magento/module-bundle-import-export": "*",
+        "magento/module-cache-invalidate": "*",
+        "magento/module-captcha": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-analytics": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-inventory-graph-ql": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-catalog-rule-configurable": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-catalog-widget": "*",
+        "magento/module-checkout": "*",
+        "magento/module-checkout-agreements": "*",
+        "magento/module-cms": "*",
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-import-export": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-configurable-product-sales": "*",
+        "magento/module-contact": "*",
+        "magento/module-cookie": "*",
+        "magento/module-cron": "*",
+        "magento/module-currency-symbol": "*",
+        "magento/module-customer": "*",
+        "magento/module-customer-analytics": "*",
+        "magento/module-customer-import-export": "*",
+        "magento/module-deploy": "*",
+        "magento/module-developer": "*",
+        "magento/module-dhl": "*",
+        "magento/module-directory": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-downloadable-graph-ql": "*",
+        "magento/module-downloadable-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-elasticsearch": "*",
+        "magento/module-email": "*",
+        "magento/module-encryption-key": "*",
+        "magento/module-fedex": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-google-adwords": "*",
+        "magento/module-google-analytics": "*",
+        "magento/module-google-optimizer": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-catalog-url-rewrite-graph-ql": "*",
+        "magento/module-configurable-product-graph-ql": "*",
+        "magento/module-customer-graph-ql": "*",
+        "magento/module-eav-graph-ql": "*",
+        "magento/module-swatches-graph-ql": "*",
+        "magento/module-tax-graph-ql": "*",
+        "magento/module-url-rewrite-graph-ql": "*",
+        "magento/module-cms-url-rewrite-graph-ql": "*",
+        "magento/module-weee-graph-ql": "*",
+        "magento/module-cms-graph-ql": "*",
+        "magento/module-grouped-import-export": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-grouped-catalog-inventory": "*",
+        "magento/module-grouped-product-graph-ql": "*",
+        "magento/module-import-export": "*",
+        "magento/module-indexer": "*",
+        "magento/module-instant-purchase": "*",
+        "magento/module-integration": "*",
+        "magento/module-layered-navigation": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-message-queue": "*",
+        "magento/module-msrp": "*",
+        "magento/module-multishipping": "*",
+        "magento/module-mysql-mq": "*",
+        "magento/module-new-relic-reporting": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-offline-payments": "*",
+        "magento/module-offline-shipping": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-payment": "*",
+        "magento/module-paypal": "*",
+        "magento/module-persistent": "*",
+        "magento/module-product-alert": "*",
+        "magento/module-product-video": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-analytics": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/module-release-notification": "*",
+        "magento/module-reports": "*",
+        "magento/module-require-js": "*",
+        "magento/module-review": "*",
+        "magento/module-review-analytics": "*",
+        "magento/module-robots": "*",
+        "magento/module-rss": "*",
+        "magento/module-rule": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-analytics": "*",
+        "magento/module-sales-graph-ql": "*",
+        "magento/module-sales-inventory": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-sample-data": "*",
+        "magento/module-search": "*",
+        "magento/module-security": "*",
+        "magento/module-send-friend": "*",
+        "magento/module-send-friend-graph-ql": "*",
+        "magento/module-shipping": "*",
+        "magento/module-signifyd": "*",
+        "magento/module-sitemap": "*",
+        "magento/module-store": "*",
+        "magento/module-store-graph-ql": "*",
+        "magento/module-swagger": "*",
+        "magento/module-swagger-webapi": "*",
+        "magento/module-swagger-webapi-async": "*",
+        "magento/module-swatches": "*",
+        "magento/module-swatches-layered-navigation": "*",
+        "magento/module-tax": "*",
+        "magento/module-tax-import-export": "*",
+        "magento/module-theme": "*",
+        "magento/module-theme-graph-ql": "*",
+        "magento/module-translation": "*",
+        "magento/module-ui": "*",
+        "magento/module-ups": "*",
+        "magento/module-url-rewrite": "*",
+        "magento/module-user": "*",
+        "magento/module-usps": "*",
+        "magento/module-variable": "*",
+        "magento/module-vault": "*",
+        "magento/module-version": "*",
+        "magento/module-webapi": "*",
+        "magento/module-webapi-async": "*",
+        "magento/module-webapi-security": "*",
+        "magento/module-weee": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-wishlist-graph-ql": "*",
+        "magento/module-wishlist-analytics": "*",
+        "magento/theme-adminhtml-backend": "*",
+        "magento/theme-frontend-blank": "*",
+        "magento/theme-frontend-luma": "*",
+        "magento/language-de_de": "*",
+        "magento/language-en_us": "*",
+        "magento/language-es_es": "*",
+        "magento/language-fr_fr": "*",
+        "magento/language-nl_nl": "*",
+        "magento/language-pt_br": "*",
+        "magento/language-zh_hans_cn": "*",
+        "magento/framework": "*",
+        "magento/framework-amqp": "*",
+        "magento/framework-bulk": "*",
+        "magento/framework-message-queue": "*",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",
         "components/jqueryui": "1.10.4",
         "twbs/bootstrap": "3.1.0",
         "tinymce/tinymce": "3.4.7",
-        "magento/module-tinymce-3": "100.3.0-dev"
+        "magento/module-tinymce-3": "*"
+    },
+    "conflict": {
+        "gene/bluefoot": "*"
     },
     "extra": {
         "component_paths": {
@@ -241,15 +290,17 @@
         "psr-4": {
             "Magento\\Framework\\": "lib/internal/Magento/Framework/",
             "Magento\\Setup\\": "setup/src/Magento/Setup/",
-            "Magento\\": "app/code/Magento/"
+            "Magento\\": "app/code/Magento/",
+            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
         },
         "psr-0": {
             "": [
-                "app/code/"
+                "app/code/",
+                "generated/code/"
             ]
         },
         "files": [
-            "app/registration.php"
+            "app/etc/NonComposerComponentRegistration.php"
         ],
         "exclude-from-classmap": [
             "**/dev/**",
diff --git a/composer.lock b/composer.lock
index fb2a030454ef4..d24dfd2b612fc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,23 +1,23 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b742366a441550e91997d35bd6aa8d12",
+    "content-hash": "e2fcf8723503311ee9fea99dece55225",
     "packages": [
         {
             "name": "braintree/braintree_php",
-            "version": "3.22.0",
+            "version": "3.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/braintree/braintree_php.git",
-                "reference": "402617b803779bed5ae899209afa75ef9950becc"
+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/402617b803779bed5ae899209afa75ef9950becc",
-                "reference": "402617b803779bed5ae899209afa75ef9950becc",
+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/6c4388199ce379432804a5c18b88585157ef2ed7",
+                "reference": "6c4388199ce379432804a5c18b88585157ef2ed7",
                 "shasum": ""
             },
             "require": {
@@ -47,29 +47,26 @@
             "authors": [
                 {
                     "name": "Braintree",
-                    "homepage": "http://www.braintreepayments.com"
+                    "homepage": "https://www.braintreepayments.com"
                 }
             ],
             "description": "Braintree PHP Client Library",
-            "time": "2017-02-16T19:59:04+00:00"
+            "time": "2018-07-26T14:37:38+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-file",
-            "version": "1.4",
+            "version": "v1.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
-                "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0"
+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/51251b80a817790eb624fbe2afc882c14f3c4fb0",
-                "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/184171cc79933a828c3f9b1a1054724cea22a216",
+                "reference": "184171cc79933a828c3f9b1a1054724cea22a216",
                 "shasum": ""
             },
-            "require": {
-                "magento-hackathon/magento-composer-installer": "*"
-            },
             "type": "magento-module",
             "autoload": {
                 "classmap": [
@@ -87,20 +84,20 @@
             ],
             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2016-05-02T16:24:47+00:00"
+            "time": "2018-04-05T15:28:43+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
-            "version": "1.10.2",
+            "version": "1.10.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-                "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd"
+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/18b33e4b69cf15747ab98b4f2c98ab445da05abd",
-                "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
+                "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
                 "shasum": ""
             },
             "require": {
@@ -123,31 +120,32 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-03-25T04:54:24+00:00"
+            "time": "2018-09-24T16:02:07+00:00"
         },
         {
             "name": "colinmollenhour/credis",
-            "version": "1.6",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "409edfd0ea81f5cb74afbdb86df54890c207b5e4"
+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/409edfd0ea81f5cb74afbdb86df54890c207b5e4",
-                "reference": "409edfd0ea81f5cb74afbdb86df54890c207b5e4",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.4.0"
             },
             "type": "library",
             "autoload": {
                 "classmap": [
                     "Client.php",
                     "Cluster.php",
-                    "Sentinel.php"
+                    "Sentinel.php",
+                    "Module.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -162,25 +160,25 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2015-11-28T01:20:04+00:00"
+            "time": "2018-05-07T14:45:04+00:00"
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.2.2",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "46968f06eeed7d16e8476d8a1397e224047ac6ff"
+                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/46968f06eeed7d16e8476d8a1397e224047ac6ff",
-                "reference": "46968f06eeed7d16e8476d8a1397e224047ac6ff",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
+                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
                 "shasum": ""
             },
             "require": {
-                "colinmollenhour/credis": "1.6",
-                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0"
+                "colinmollenhour/credis": "~1.6",
+                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
             },
             "type": "library",
             "autoload": {
@@ -199,20 +197,20 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2017-04-19T14:21:43+00:00"
+            "time": "2018-03-29T15:54:15+00:00"
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.1.0",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288"
+                "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
             },
             "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/8afa52cd417f4ec417b4bfe86b68106538a87660",
+                "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
                 "shasum": ""
             },
             "require": {
@@ -221,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"
             },
@@ -255,39 +253,42 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2017-11-29T09:37:33+00:00"
+            "time": "2018-10-18T06:09:13+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "1.4.1",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd"
+                "reference": "d8aef3af866b28786ce9b8647e52c42496436669"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd",
-                "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd",
+                "url": "https://api.github.com/repos/composer/composer/zipball/d8aef3af866b28786ce9b8647e52c42496436669",
+                "reference": "d8aef3af866b28786ce9b8647e52c42496436669",
                 "shasum": ""
             },
             "require": {
                 "composer/ca-bundle": "^1.0",
                 "composer/semver": "^1.0",
-                "composer/spdx-licenses": "^1.0",
+                "composer/spdx-licenses": "^1.2",
+                "composer/xdebug-handler": "^1.1",
                 "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
                 "php": "^5.3.2 || ^7.0",
                 "psr/log": "^1.0",
-                "seld/cli-prompt": "^1.0",
                 "seld/jsonlint": "^1.4",
                 "seld/phar-utils": "^1.0",
-                "symfony/console": "^2.7 || ^3.0",
-                "symfony/filesystem": "^2.7 || ^3.0",
-                "symfony/finder": "^2.7 || ^3.0",
-                "symfony/process": "^2.7 || ^3.0"
+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
+                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+                "symfony/process": "^2.7 || ^3.0 || ^4.0"
+            },
+            "conflict": {
+                "symfony/console": "2.8.38"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
                 "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
             },
             "suggest": {
@@ -301,7 +302,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.8-dev"
                 }
             },
             "autoload": {
@@ -332,7 +333,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2017-03-10T08:29:45+00:00"
+            "time": "2018-12-03T09:31:16+00:00"
         },
         {
             "name": "composer/semver",
@@ -398,23 +399,23 @@
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.1.6",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c"
+                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/2603a0d7ddc00a015deb576fa5297ca43dee6b1c",
-                "reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
+                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
                 "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
             },
             "type": "library",
@@ -455,7 +456,51 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2017-04-03T19:08:52+00:00"
+            "time": "2018-11-01T09:45:54+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "dc523135366eb68f22268d069ea7749486458562"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562",
+                "reference": "dc523135366eb68f22268d069ea7749486458562",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0",
+                "psr/log": "^1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "time": "2018-11-29T10:59:02+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -489,39 +534,95 @@
             "time": "2017-02-14T19:40:03+00:00"
         },
         {
-            "name": "justinrainbow/json-schema",
-            "version": "5.2.6",
+            "name": "elasticsearch/elasticsearch",
+            "version": "v5.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd"
+                "url": "https://github.com/elastic/elasticsearch-php.git",
+                "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/d283e11b6e14c6f4664cf080415c4341293e5bbd",
-                "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/4b29a4121e790bbfe690d5ee77da348b62d48eb8",
+                "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "guzzlehttp/ringphp": "~1.0",
+                "php": "^5.6|^7.0",
+                "psr/log": "~1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.1",
-                "json-schema/json-schema-test-suite": "1.2.0",
-                "phpunit/phpunit": "^4.8.22"
+                "cpliakas/git-wrapper": "~1.0",
+                "doctrine/inflector": "^1.1",
+                "mockery/mockery": "0.9.4",
+                "phpunit/phpunit": "^4.7|^5.4",
+                "sami/sami": "~3.2",
+                "symfony/finder": "^2.8",
+                "symfony/yaml": "^2.8"
             },
-            "bin": [
-                "bin/validate-json"
+            "suggest": {
+                "ext-curl": "*",
+                "monolog/monolog": "Allows for client-level logging and tracing"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Elasticsearch\\": "src/Elasticsearch/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Zachary Tong"
+                }
             ],
+            "description": "PHP Client for Elasticsearch",
+            "keywords": [
+                "client",
+                "elasticsearch",
+                "search"
+            ],
+            "time": "2017-11-08T17:04:47+00:00"
+        },
+        {
+            "name": "guzzlehttp/ringphp",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/RingPHP.git",
+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b",
+                "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/streams": "~3.0",
+                "php": ">=5.4.0",
+                "react/promise": "~2.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "ext-curl": "Guzzle will use specific adapters if cURL is present"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0.x-dev"
+                    "dev-master": "1.1-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "JsonSchema\\": "src/JsonSchema/"
+                    "GuzzleHttp\\Ring\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -530,55 +631,98 @@
             ],
             "authors": [
                 {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
+            "time": "2018-07-31T13:22:33+00:00"
+        },
+        {
+            "name": "guzzlehttp/streams",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/streams.git",
+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Stream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
                 {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
                 }
             ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
+            "description": "Provides a simple abstraction over streams of data",
+            "homepage": "http://guzzlephp.org/",
             "keywords": [
-                "json",
-                "schema"
+                "Guzzle",
+                "stream"
             ],
-            "time": "2017-10-21T13:15:38+00:00"
+            "time": "2014-10-12T19:18:40+00:00"
         },
         {
-            "name": "league/climate",
-            "version": "2.6.1",
+            "name": "justinrainbow/json-schema",
+            "version": "5.2.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/thephpleague/climate.git",
-                "reference": "28851c909017424f61cc6a62089316313c645d1c"
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "8560d4314577199ba51bf2032f02cd1315587c23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/climate/zipball/28851c909017424f61cc6a62089316313c645d1c",
-                "reference": "28851c909017424f61cc6a62089316313c645d1c",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23",
+                "reference": "8560d4314577199ba51bf2032f02cd1315587c23",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "mockery/mockery": "dev-master",
-                "phpunit/phpunit": "4.1.*"
+                "friendsofphp/php-cs-fixer": "^2.1",
+                "json-schema/json-schema-test-suite": "1.2.0",
+                "phpunit/phpunit": "^4.8.35"
             },
+            "bin": [
+                "bin/validate-json"
+            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "League\\CLImate\\": "src/"
+                    "JsonSchema\\": "src/JsonSchema/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -587,43 +731,51 @@
             ],
             "authors": [
                 {
-                    "name": "Joe Tannenbaum",
-                    "email": "hey@joe.codes",
-                    "homepage": "http://joe.codes/",
-                    "role": "Developer"
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "seroscho@googlemail.com"
                 }
             ],
-            "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
             "keywords": [
-                "cli",
-                "colors",
-                "command",
-                "php",
-                "terminal"
+                "json",
+                "schema"
             ],
-            "time": "2015-01-18T14:31:58+00:00"
+            "time": "2018-02-14T22:26:30+00:00"
         },
         {
             "name": "magento/composer",
-            "version": "1.2.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/composer.git",
-                "reference": "130753af2b755f1967e253deb661225942bb302c"
+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/130753af2b755f1967e253deb661225942bb302c",
-                "reference": "130753af2b755f1967e253deb661225942bb302c",
+                "url": "https://api.github.com/repos/magento/composer/zipball/6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
                 "shasum": ""
             },
             "require": {
-                "composer/composer": "1.4.1",
-                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0",
-                "symfony/console": "~2.3, !=2.7.0"
+                "composer/composer": "^1.6",
+                "php": "~7.1.3|~7.2.0",
+                "symfony/console": "~4.0.0 || ~4.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.1.0"
+                "phpunit/phpunit": "~7.0.0"
             },
             "type": "library",
             "autoload": {
@@ -637,20 +789,20 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2017-04-24T09:57:02+00:00"
+            "time": "2018-06-29T18:46:51+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
-            "version": "0.1.12",
+            "version": "0.1.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento-composer-installer.git",
-                "reference": "10c600e88ad34fec71bb6b435ea8415ce92d51de"
+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/10c600e88ad34fec71bb6b435ea8415ce92d51de",
-                "reference": "10c600e88ad34fec71bb6b435ea8415ce92d51de",
+                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
                 "shasum": ""
             },
             "require": {
@@ -716,20 +868,20 @@
                 "composer-installer",
                 "magento"
             ],
-            "time": "2016-10-06T16:05:07+00:00"
+            "time": "2017-12-29T16:45:24+00:00"
         },
         {
             "name": "magento/zendframework1",
-            "version": "1.13.1",
+            "version": "1.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/zf1.git",
-                "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf"
+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/zf1/zipball/e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf",
-                "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf",
+                "url": "https://api.github.com/repos/magento/zf1/zipball/4df018254c70b5b998b00a8cb1a30760f831ff0d",
+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d",
                 "shasum": ""
             },
             "require": {
@@ -763,20 +915,20 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2017-06-21T14:56:23+00:00"
+            "time": "2018-08-09T15:03:40+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
                 "shasum": ""
             },
             "require": {
@@ -841,7 +993,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2018-11-05T09:00:11+00:00"
         },
         {
             "name": "oyejorge/less.php",
@@ -907,33 +1059,29 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.11",
+            "version": "v9.99.99",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.0"
+                "php": "^7"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
             },
             "suggest": {
                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
             },
             "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/random.php"
-                ]
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
@@ -948,41 +1096,129 @@
             "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
             "keywords": [
                 "csprng",
+                "polyfill",
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-09-27T21:40:39+00:00"
+            "time": "2018-07-02T15:55:56+00:00"
+        },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "5e280b50cdaf8da4cc4810e0847a9618be29703d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/5e280b50cdaf8da4cc4810e0847a9618be29703d",
+                "reference": "5e280b50cdaf8da4cc4810e0847a9618be29703d",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": ">=1",
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^3|^4|^5"
+            },
+            "suggest": {
+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "time": "2018-11-29T22:33:39+00:00"
         },
         {
             "name": "pelago/emogrifier",
-            "version": "V1.2.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/jjriv/emogrifier.git",
-                "reference": "a1db453bb504597d821efcc04b21c79a6021e00c"
+                "url": "https://github.com/MyIntervals/emogrifier.git",
+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jjriv/emogrifier/zipball/a1db453bb504597d821efcc04b21c79a6021e00c",
-                "reference": "a1db453bb504597d821efcc04b21c79a6021e00c",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0,<=7.1.99"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
+                "symfony/css-selector": "^3.4.0 || ^4.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.8.27",
-                "squizlabs/php_codesniffer": "2.6.0"
+                "friendsofphp/php-cs-fixer": "^2.2.0",
+                "phpmd/phpmd": "^2.6.0",
+                "phpunit/phpunit": "^4.8.0",
+                "squizlabs/php_codesniffer": "^3.3.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "2.1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Pelago\\": "Classes/"
+                    "Pelago\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1002,72 +1238,201 @@
                 },
                 {
                     "name": "Oliver Klee",
-                    "email": "typo3-coding@oliverklee.de"
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Zoli Szabó",
+                    "email": "zoli.szabo+github@gmail.com"
                 },
                 {
-                    "name": "Roman Ožana",
-                    "email": "ozana@omdesign.cz"
+                    "name": "Jake Hotson",
+                    "email": "jake@qzdesign.co.uk"
                 }
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
-            "homepage": "http://www.pelagodesign.com/sidecar/emogrifier/",
-            "time": "2017-03-02T12:51:48+00:00"
+            "homepage": "https://www.myintervals.com/emogrifier.php",
+            "keywords": [
+                "css",
+                "email",
+                "pre-processing"
+            ],
+            "time": "2018-12-10T10:36:30+00:00"
         },
         {
-            "name": "phpseclib/phpseclib",
-            "version": "2.0.9",
+            "name": "php-amqplib/php-amqplib",
+            "version": "v2.7.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558"
+                "url": "https://github.com/php-amqplib/php-amqplib.git",
+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c9a3fe35e20eb6eeaca716d6a23cde03f52d1558",
-                "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
+                "reference": "a8ba54bd35b973fc6861e4c2e105f71e9e95f43f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "ext-bcmath": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.3.0"
+            },
+            "replace": {
+                "videlalvaro/php-amqplib": "self.version"
             },
             "require-dev": {
-                "phing/phing": "~2.7",
-                "phpunit/phpunit": "~4.0",
-                "sami/sami": "~2.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpdocumentor/phpdocumentor": "^2.9",
+                "phpunit/phpunit": "^4.8",
+                "scrutinizer/ocular": "^1.1",
+                "squizlabs/php_codesniffer": "^2.5"
             },
             "suggest": {
-                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-sockets": "Use AMQPSocketConnection"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
             "autoload": {
-                "files": [
-                    "phpseclib/bootstrap.php"
-                ],
                 "psr-4": {
-                    "phpseclib\\": "phpseclib/"
+                    "PhpAmqpLib\\": "PhpAmqpLib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "LGPL-2.1-or-later"
             ],
             "authors": [
                 {
-                    "name": "Jim Wigginton",
-                    "email": "terrafrost@php.net",
-                    "role": "Lead Developer"
+                    "name": "Alvaro Videla",
+                    "role": "Original Maintainer"
                 },
                 {
-                    "name": "Patrick Monnerat",
-                    "email": "pm@datasphere.ch",
-                    "role": "Developer"
+                    "name": "John Kelly",
+                    "email": "johnmkelly86@gmail.com",
+                    "role": "Maintainer"
                 },
                 {
-                    "name": "Andreas Fischer",
+                    "name": "Raúl Araya",
+                    "email": "nubeiro@gmail.com",
+                    "role": "Maintainer"
+                }
+            ],
+            "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": "2018-04-30T03:54:54+00:00"
+        },
+        {
+            "name": "phpseclib/mcrypt_compat",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpseclib/mcrypt_compat.git",
+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
+            },
+            "suggest": {
+                "ext-openssl": "Will enable faster cryptographic operations"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/mcrypt.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net",
+                    "homepage": "http://phpseclib.sourceforge.net"
+                }
+            ],
+            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
+            "keywords": [
+                "cryptograpy",
+                "encryption",
+                "mcrypt"
+            ],
+            "time": "2018-08-22T03:11:43+00:00"
+        },
+        {
+            "name": "phpseclib/phpseclib",
+            "version": "2.0.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpseclib/phpseclib.git",
+                "reference": "8814dc7841db159daed0b32c2b08fb7e03c6afe7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8814dc7841db159daed0b32c2b08fb7e03c6afe7",
+                "reference": "8814dc7841db159daed0b32c2b08fb7e03c6afe7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phing/phing": "~2.7",
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
+                "sami/sami": "~2.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "suggest": {
+                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
+                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
+                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "phpseclib/bootstrap.php"
+                ],
+                "psr-4": {
+                    "phpseclib\\": "phpseclib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Patrick Monnerat",
+                    "email": "pm@datasphere.ch",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Andreas Fischer",
                     "email": "bantu@phpbb.com",
                     "role": "Developer"
                 },
@@ -1103,7 +1468,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2017-11-29T06:38:08+00:00"
+            "time": "2018-11-04T05:45:48+00:00"
         },
         {
             "name": "psr/container",
@@ -1154,18 +1519,68 @@
             ],
             "time": "2017-02-14T16:28:37+00:00"
         },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
             "require": {
@@ -1199,44 +1614,44 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2018-11-20T15:27:04+00:00"
         },
         {
             "name": "ramsey/uuid",
-            "version": "3.6.1",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
-                "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": "^1.0|^2.0",
-                "php": "^5.4 || ^7.0"
+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+                "php": "^5.4 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-                "apigen/apigen": "^4.1",
-                "codeception/aspect-mock": "^1.0 | ^2.0",
+                "codeception/aspect-mock": "^1.0 | ~2.0.0",
                 "doctrine/annotations": "~1.2.0",
-                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
                 "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
-                "mockery/mockery": "^0.9.4",
+                "mockery/mockery": "^0.9.9",
                 "moontoast/math": "^1.1",
                 "php-mock/php-mock-phpunit": "^0.3|^1.1",
-                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
-                "satooshi/php-coveralls": "^0.6.1",
+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
                 "squizlabs/php_codesniffer": "^2.3"
             },
             "suggest": {
+                "ext-ctype": "Provides support for PHP Ctype functions",
                 "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
                 "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
                 "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -1281,35 +1696,36 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2017-03-26T20:37:53+00:00"
+            "time": "2018-07-19T23:38:55+00:00"
         },
         {
-            "name": "seld/cli-prompt",
-            "version": "1.0.3",
+            "name": "react/promise",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Seldaek/cli-prompt.git",
-                "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd"
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "f4edc2581617431aea50430749db55cc3fc031b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
-                "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3",
+                "reference": "f4edc2581617431aea50430749db55cc3fc031b3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3"
+                "php": ">=5.4.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Seld\\CliPrompt\\": "src/"
-                }
+                    "React\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1317,39 +1733,36 @@
             ],
             "authors": [
                 {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com"
                 }
             ],
-            "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type",
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
             "keywords": [
-                "cli",
-                "console",
-                "hidden",
-                "input",
-                "prompt"
+                "promise",
+                "promises"
             ],
-            "time": "2017-03-18T11:32:45+00:00"
+            "time": "2018-06-13T15:59:06+00:00"
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.6.2",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19"
+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19",
-                "reference": "7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "bin": [
                 "bin/jsonlint"
@@ -1378,7 +1791,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2017-11-30T15:34:22+00:00"
+            "time": "2018-01-24T12:46:19+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -1424,93 +1837,46 @@
             ],
             "time": "2015-10-13T18:44:15+00:00"
         },
-        {
-            "name": "sjparkinson/static-review",
-            "version": "4.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sjparkinson/static-review.git",
-                "reference": "493c3410cf146a12fca84209bad126c494e125f0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sjparkinson/static-review/zipball/493c3410cf146a12fca84209bad126c494e125f0",
-                "reference": "493c3410cf146a12fca84209bad126c494e125f0",
-                "shasum": ""
-            },
-            "require": {
-                "league/climate": "~2.0",
-                "php": ">=5.4.0",
-                "symfony/console": "~2.0",
-                "symfony/process": "~2.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "~0.9",
-                "phpunit/phpunit": "~4.0",
-                "sensiolabs/security-checker": "~2.0",
-                "squizlabs/php_codesniffer": "~1.0"
-            },
-            "suggest": {
-                "sensiolabs/security-checker": "Required for ComposerSecurityReview.",
-                "squizlabs/php_codesniffer": "Required for PhpCodeSnifferReview."
-            },
-            "bin": [
-                "bin/static-review.php"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "StaticReview\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Samuel Parkinson",
-                    "email": "sam.james.parkinson@gmail.com",
-                    "homepage": "http://samp.im"
-                }
-            ],
-            "description": "An extendable framework for version control hooks.",
-            "abandoned": "phpro/grumphp",
-            "time": "2014-09-22T08:40:36+00:00"
-        },
         {
             "name": "symfony/console",
-            "version": "v2.8.32",
+            "version": "v4.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "46270f1ca44f08ebc134ce120fd2c2baf5fd63de"
+                "reference": "c74f4d1988dfcd8760273e53551694da32b056d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/46270f1ca44f08ebc134ce120fd2c2baf5fd63de",
-                "reference": "46270f1ca44f08ebc134ce120fd2c2baf5fd63de",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c74f4d1988dfcd8760273e53551694da32b056d0",
+                "reference": "c74f4d1988dfcd8760273e53551694da32b056d0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
-                "symfony/debug": "^2.7.2|~3.0.0",
+                "php": "^7.1.3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
+            },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
-                "symfony/process": "~2.1|~3.0.0"
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
-                "psr/log": "For using the console logger",
+                "psr/log-implementation": "For using the console logger",
                 "symfony/event-dispatcher": "",
+                "symfony/lock": "",
                 "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1537,42 +1903,34 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-29T09:33:18+00:00"
+            "time": "2018-11-26T14:00:40+00:00"
         },
         {
-            "name": "symfony/debug",
-            "version": "v3.0.9",
+            "name": "symfony/css-selector",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
-                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd",
+                "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/class-loader": "~2.8|~3.0",
-                "symfony/http-kernel": "~2.8|~3.0"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
+                    "Symfony\\Component\\CssSelector\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -1583,6 +1941,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
@@ -1592,33 +1954,36 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Debug Component",
+            "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2016-07-30T07:22:48+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.32",
+            "version": "v4.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b59aacf238fadda50d612c9de73b74751872a903"
+                "reference": "c4a3b5d70c05e5e7de4f22a3e840cdb173ccd7bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b59aacf238fadda50d612c9de73b74751872a903",
-                "reference": "b59aacf238fadda50d612c9de73b74751872a903",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c4a3b5d70c05e5e7de4f22a3e840cdb173ccd7bf",
+                "reference": "c4a3b5d70c05e5e7de4f22a3e840cdb173ccd7bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": "^7.1.3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "^2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.6|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0"
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/stopwatch": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -1627,7 +1992,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1654,29 +2019,30 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:25:56+00:00"
+            "time": "2018-12-01T08:51:37+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.2",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "25b135bea251829e3db6a77d773643408b575ed4"
+                "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/25b135bea251829e3db6a77d773643408b575ed4",
-                "reference": "25b135bea251829e3db6a77d773643408b575ed4",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2f4c8b999b3b7cadb2a69390b01af70886753710",
+                "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1703,29 +2069,29 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-12-14T19:40:10+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.2",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a"
+                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a",
-                "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
+                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1752,20 +2118,78 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T16:10:10+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.6.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
                 "shasum": ""
             },
             "require": {
@@ -1777,7 +2201,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -1811,29 +2235,29 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-10-11T12:05:26+00:00"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v2.8.32",
+            "version": "v4.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d25449e031f600807949aab7cadbf267712f4eee"
+                "reference": "471f6e24172366a97365baaae588ddaafbba9b20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d25449e031f600807949aab7cadbf267712f4eee",
-                "reference": "d25449e031f600807949aab7cadbf267712f4eee",
+                "url": "https://api.github.com/repos/symfony/process/zipball/471f6e24172366a97365baaae588ddaafbba9b20",
+                "reference": "471f6e24172366a97365baaae588ddaafbba9b20",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1860,29 +2284,29 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:25:56+00:00"
+            "time": "2018-11-20T16:14:00+00:00"
         },
         {
             "name": "tedivm/jshrink",
-            "version": "v1.1.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tedious/JShrink.git",
-                "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9"
+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tedious/JShrink/zipball/688527a2e854d7935f24f24c7d5eb1b604742bf9",
-                "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9",
+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/21254058dc3ce6aba6bef458cff4bfa25cf8b198",
+                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^5.6|^7.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "0.4.0",
-                "phpunit/phpunit": "4.0.*",
-                "satooshi/php-coveralls": "dev-master"
+                "friendsofphp/php-cs-fixer": "^2.8",
+                "php-coveralls/php-coveralls": "^1.1.0",
+                "phpunit/phpunit": "^6"
             },
             "type": "library",
             "autoload": {
@@ -1906,46 +2330,92 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2015-07-04T07:35:09+00:00"
+            "time": "2018-09-16T00:02:51+00:00"
         },
         {
-            "name": "tubalmartin/cssmin",
-            "version": "v4.1.0",
+            "name": "true/punycode",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
-                "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e"
+                "url": "https://github.com/true/php-punycode.git",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/1c7ae93cf6b392d4dae5c4ae18979918413af16e",
-                "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e",
+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
                 "shasum": ""
             },
             "require": {
-                "ext-pcre": "*",
-                "php": ">=5.3.2"
+                "php": ">=5.3.0",
+                "symfony/polyfill-mbstring": "^1.3"
             },
             "require-dev": {
-                "cogpowered/finediff": "0.3.*",
-                "phpunit/phpunit": "4.8.*"
+                "phpunit/phpunit": "~4.7",
+                "squizlabs/php_codesniffer": "~2.0"
             },
-            "bin": [
-                "cssmin"
-            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "tubalmartin\\CssMin\\": "src"
+                    "TrueBV\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Túbal Martín",
+                    "name": "Renan Gonçalves",
+                    "email": "renan.saddam@gmail.com"
+                }
+            ],
+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
+            "homepage": "https://github.com/true/php-punycode",
+            "keywords": [
+                "idna",
+                "punycode"
+            ],
+            "time": "2016-11-16T10:37:54+00:00"
+        },
+        {
+            "name": "tubalmartin/cssmin",
+            "version": "v4.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "cogpowered/finediff": "0.3.*",
+                "phpunit/phpunit": "4.8.*"
+            },
+            "bin": [
+                "cssmin"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "tubalmartin\\CssMin\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Túbal Martín",
                     "homepage": "http://tubalmartin.me/"
                 }
             ],
@@ -1959,29 +2429,30 @@
                 "minify",
                 "yui"
             ],
-            "time": "2017-05-16T13:45:26+00:00"
+            "time": "2018-01-15T15:26:51+00:00"
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.11.5",
+            "version": "v0.12.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425"
+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/b97cad0f4a50131c85d9224e8e36ebbcf1c6b425",
-                "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
+                "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": ">=5.5,<8.0-DEV"
+                "php": ">=5.6"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0",
+                "react/promise": "2.*"
             },
             "suggest": {
                 "psr/http-message": "To use standard GraphQL server",
@@ -1989,16 +2460,13 @@
             },
             "type": "library",
             "autoload": {
-                "files": [
-                    "src/deprecated.php"
-                ],
                 "psr-4": {
                     "GraphQL\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "MIT"
             ],
             "description": "A PHP port of GraphQL reference implementation",
             "homepage": "https://github.com/webonyx/graphql-php",
@@ -2006,33 +2474,33 @@
                 "api",
                 "graphql"
             ],
-            "time": "2017-12-12T09:03:21+00:00"
+            "time": "2018-09-02T14:59:54+00:00"
         },
         {
             "name": "zendframework/zend-captcha",
-            "version": "2.7.1",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-captcha.git",
-                "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014"
+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/2d56293a5ae3e45e7c8ee7030aa8b305768d8014",
-                "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014",
+                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
-                "zendframework/zend-math": "^2.6 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "zendframework/zend-math": "^2.7 || ^3.0",
+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
                 "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-session": "^2.6",
+                "zendframework/zend-session": "^2.8",
                 "zendframework/zend-text": "^2.6",
-                "zendframework/zend-validator": "^2.6",
+                "zendframework/zend-validator": "^2.10.1",
                 "zendframework/zendservice-recaptcha": "^3.0"
             },
             "suggest": {
@@ -2045,8 +2513,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -2058,36 +2526,37 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-captcha",
+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
             "keywords": [
+                "ZendFramework",
                 "captcha",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-02-23T08:09:44+00:00"
+            "time": "2018-04-24T17:24:10+00:00"
         },
         {
             "name": "zendframework/zend-code",
-            "version": "3.1.0",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-code.git",
-                "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27"
+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27",
-                "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27",
+                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb",
+                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6",
+                "php": "^7.1",
                 "zendframework/zend-eventmanager": "^2.6 || ^3.0"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^4.8.21",
-                "squizlabs/php_codesniffer": "^2.5",
+                "phpunit/phpunit": "^6.2.3",
+                "zendframework/zend-coding-standard": "^1.0.0",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "suggest": {
@@ -2097,8 +2566,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev",
-                    "dev-develop": "3.2-dev"
+                    "dev-master": "3.3.x-dev",
+                    "dev-develop": "3.4.x-dev"
                 }
             },
             "autoload": {
@@ -2116,7 +2585,7 @@
                 "code",
                 "zf2"
             ],
-            "time": "2016-10-24T13:23:32+00:00"
+            "time": "2018-08-13T20:36:59+00:00"
         },
         {
             "name": "zendframework/zend-config",
@@ -2176,28 +2645,28 @@
         },
         {
             "name": "zendframework/zend-console",
-            "version": "2.6.0",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-console.git",
-                "reference": "cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360"
+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360",
-                "reference": "cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360",
+                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18",
+                "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "^4.0",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-json": "^2.6",
-                "zendframework/zend-validator": "^2.5"
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-filter": "^2.7.2",
+                "zendframework/zend-json": "^2.6 || ^3.0",
+                "zendframework/zend-validator": "^2.10.1"
             },
             "suggest": {
                 "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
@@ -2206,8 +2675,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -2219,12 +2688,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-console",
+            "description": "Build console applications using getopt syntax or routing, complete with prompts",
             "keywords": [
+                "ZendFramework",
                 "console",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-02-09T17:15:12+00:00"
+            "time": "2018-01-25T19:08:04+00:00"
         },
         {
             "name": "zendframework/zend-crypt",
@@ -2278,16 +2748,16 @@
         },
         {
             "name": "zendframework/zend-db",
-            "version": "2.9.2",
+            "version": "2.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-db.git",
-                "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666"
+                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666",
-                "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666",
+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
+                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
                 "shasum": ""
             },
             "require": {
@@ -2332,7 +2802,7 @@
                 "db",
                 "zf"
             ],
-            "time": "2017-12-11T14:57:52+00:00"
+            "time": "2018-04-09T13:21:36+00:00"
         },
         {
             "name": "zendframework/zend-di",
@@ -2381,32 +2851,96 @@
             ],
             "time": "2016-04-25T20:58:11+00:00"
         },
+        {
+            "name": "zendframework/zend-diactoros",
+            "version": "1.8.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-diactoros.git",
+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php-http/psr7-integration-tests": "dev-master",
+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
+                "zendframework/zend-coding-standard": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev",
+                    "dev-develop": "1.9.x-dev",
+                    "dev-release-2.0": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php"
+                ],
+                "psr-4": {
+                    "Zend\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://github.com/zendframework/zend-diactoros",
+            "keywords": [
+                "http",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2018-09-05T19:29:37+00:00"
+        },
         {
             "name": "zendframework/zend-escaper",
-            "version": "2.5.2",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-escaper.git",
-                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
-                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -2418,12 +2952,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-escaper",
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
             "keywords": [
+                "ZendFramework",
                 "escaper",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-06-30T19:48:38+00:00"
+            "time": "2018-04-25T15:48:53+00:00"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -2472,33 +3007,99 @@
             ],
             "time": "2017-12-12T17:48:56+00:00"
         },
+        {
+            "name": "zendframework/zend-feed",
+            "version": "2.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-feed.git",
+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-escaper": "^2.5.2",
+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-message": "^1.0.1",
+                "zendframework/zend-cache": "^2.7.2",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-db": "^2.8.2",
+                "zendframework/zend-http": "^2.7",
+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+                "zendframework/zend-validator": "^2.10.1"
+            },
+            "suggest": {
+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
+                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
+                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
+                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Feed\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides functionality for consuming RSS and Atom feeds",
+            "keywords": [
+                "ZendFramework",
+                "feed",
+                "zf"
+            ],
+            "time": "2018-08-01T13:53:20+00:00"
+        },
         {
             "name": "zendframework/zend-filter",
-            "version": "2.7.2",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-filter.git",
-                "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175"
+                "reference": "875da9790e5cb16b9a12f41453d5f7c441452daf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/b8d0ff872f126631bf63a932e33aa2d22d467175",
-                "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175",
+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/875da9790e5cb16b9a12f41453d5f7c441452daf",
+                "reference": "875da9790e5cb16b9a12f41453d5f7c441452daf",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+            },
+            "conflict": {
+                "zendframework/zend-validator": "<2.10.1"
             },
             "require-dev": {
-                "pear/archive_tar": "^1.4",
-                "phpunit/phpunit": "^6.0.10 || ^5.7.17",
+                "pear/archive_tar": "^1.4.3",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-factory": "^1.0",
                 "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-crypt": "^2.6 || ^3.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-uri": "^2.5"
+                "zendframework/zend-crypt": "^3.2.1",
+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+                "zendframework/zend-uri": "^2.6"
             },
             "suggest": {
+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
                 "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
                 "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
                 "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
@@ -2507,8 +3108,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Filter",
@@ -2525,30 +3126,30 @@
                 "BSD-3-Clause"
             ],
             "description": "provides a set of commonly needed data filters",
-            "homepage": "https://github.com/zendframework/zend-filter",
             "keywords": [
+                "ZendFramework",
                 "filter",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-05-17T20:56:17+00:00"
+            "time": "2018-12-12T23:14:25+00:00"
         },
         {
             "name": "zendframework/zend-form",
-            "version": "2.11.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-form.git",
-                "reference": "b68a9f07d93381613b68817091d0505ca94d3363"
+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/b68a9f07d93381613b68817091d0505ca94d3363",
-                "reference": "b68a9f07d93381613b68817091d0505ca94d3363",
+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/c713a12ccbd43148b71c9339e171ca11e3f8a1da",
+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
                 "zendframework/zend-inputfilter": "^2.8",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
@@ -2582,8 +3183,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
+                    "dev-master": "2.13.x-dev",
+                    "dev-develop": "2.14.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Form",
@@ -2608,20 +3209,20 @@
                 "form",
                 "zf"
             ],
-            "time": "2017-12-06T21:09:08+00:00"
+            "time": "2018-12-11T22:51:29+00:00"
         },
         {
             "name": "zendframework/zend-http",
-            "version": "2.7.0",
+            "version": "2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-http.git",
-                "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa"
+                "reference": "2c8aed3d25522618573194e7cc51351f8cd4a45b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa",
-                "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa",
+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/2c8aed3d25522618573194e7cc51351f8cd4a45b",
+                "reference": "2c8aed3d25522618573194e7cc51351f8cd4a45b",
                 "shasum": ""
             },
             "require": {
@@ -2632,15 +3233,18 @@
                 "zendframework/zend-validator": "^2.10.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4.1 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^3.1 || ^2.6"
             },
+            "suggest": {
+                "paragonie/certainty": "For automated management of cacert.pem"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -2652,8 +3256,7 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-            "homepage": "https://github.com/zendframework/zend-http",
+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
             "keywords": [
                 "ZendFramework",
                 "http",
@@ -2661,7 +3264,7 @@
                 "zend",
                 "zf"
             ],
-            "time": "2017-10-13T12:06:24+00:00"
+            "time": "2018-08-13T18:47:03+00:00"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -2723,24 +3326,24 @@
         },
         {
             "name": "zendframework/zend-i18n",
-            "version": "2.7.4",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-i18n.git",
-                "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31"
+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/d3431e29cc00c2a1c6704e601d4371dbf24f6a31",
-                "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^5.6",
+                "php": "^5.6 || ^7.0",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
                 "zendframework/zend-cache": "^2.6.1",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
@@ -2764,8 +3367,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\I18n",
@@ -2781,46 +3384,44 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-i18n",
+            "description": "Provide translations for your application, and filter and validate internationalized values",
             "keywords": [
+                "ZendFramework",
                 "i18n",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-05-17T17:00:12+00:00"
+            "time": "2018-05-16T16:39:13+00:00"
         },
         {
             "name": "zendframework/zend-inputfilter",
-            "version": "2.8.0",
+            "version": "2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-inputfilter.git",
-                "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488"
+                "reference": "799ad48ed1666d3c62126fec73dd20453b3a9e4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/e7edd625f2fcdd72a719a7023114c5f4b4f38488",
-                "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488",
+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/799ad48ed1666d3c62126fec73dd20453b3a9e4d",
+                "reference": "799ad48ed1666d3c62126fec73dd20453b3a9e4d",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
                 "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0",
                 "zendframework/zend-validator": "^2.10.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-            },
-            "suggest": {
-                "zendframework/zend-servicemanager": "To support plugin manager support"
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\InputFilter",
@@ -2842,7 +3443,7 @@
                 "inputfilter",
                 "zf"
             ],
-            "time": "2017-12-04T21:24:25+00:00"
+            "time": "2018-12-13T22:51:54+00:00"
         },
         {
             "name": "zendframework/zend-json",
@@ -2901,30 +3502,30 @@
         },
         {
             "name": "zendframework/zend-loader",
-            "version": "2.5.1",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-loader.git",
-                "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c"
+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c",
-                "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c",
+                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c",
+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -2936,25 +3537,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-loader",
+            "description": "Autoloading and plugin loading strategies",
             "keywords": [
+                "ZendFramework",
                 "loader",
-                "zf2"
+                "zf"
             ],
-            "time": "2015-06-03T14:05:47+00:00"
+            "time": "2018-04-30T15:20:54+00:00"
         },
         {
             "name": "zendframework/zend-log",
-            "version": "2.9.2",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-log.git",
-                "reference": "bf7489578d092d6ff7508117d1d920a4764fbd6a"
+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/bf7489578d092d6ff7508117d1d920a4764fbd6a",
-                "reference": "bf7489578d092d6ff7508117d1d920a4764fbd6a",
+                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/9cec3b092acb39963659c2f32441cccc56b3f430",
+                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430",
                 "shasum": ""
             },
             "require": {
@@ -2974,7 +3576,7 @@
                 "zendframework/zend-escaper": "^2.5",
                 "zendframework/zend-filter": "^2.5",
                 "zendframework/zend-mail": "^2.6.1",
-                "zendframework/zend-validator": "^2.6"
+                "zendframework/zend-validator": "^2.10.1"
             },
             "suggest": {
                 "ext-mongo": "mongo extension to use Mongo writer",
@@ -2988,8 +3590,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9-dev",
-                    "dev-develop": "2.10-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Log",
@@ -3012,47 +3614,47 @@
                 "logging",
                 "zf2"
             ],
-            "time": "2017-05-17T16:03:26+00:00"
+            "time": "2018-04-09T21:59:51+00:00"
         },
         {
             "name": "zendframework/zend-mail",
-            "version": "2.8.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mail.git",
-                "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad"
+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/248230940ab1453b2a532a8fde76c5a6470d7aad",
-                "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad",
+                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": "^7.0 || ^5.6",
+                "php": "^5.6 || ^7.0",
+                "true/punycode": "^2.1",
                 "zendframework/zend-loader": "^2.5",
                 "zendframework/zend-mime": "^2.5",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-validator": "^2.6"
+                "zendframework/zend-validator": "^2.10.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
-                "zendframework/zend-crypt": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "zendframework/zend-crypt": "^2.6 || ^3.0",
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
             },
             "suggest": {
-                "ext-intl": "Handle IDN in AddressList hostnames",
                 "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages"
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Mail",
@@ -3068,26 +3670,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
-            "homepage": "https://github.com/zendframework/zend-mail",
+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
             "keywords": [
+                "ZendFramework",
                 "mail",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-06-08T20:03:58+00:00"
+            "time": "2018-06-07T13:37:07+00:00"
         },
         {
             "name": "zendframework/zend-math",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-math.git",
-                "reference": "f4358090d5d23973121f1ed0b376184b66d9edec"
+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f4358090d5d23973121f1ed0b376184b66d9edec",
-                "reference": "f4358090d5d23973121f1ed0b376184b66d9edec",
+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
                 "shasum": ""
             },
             "require": {
@@ -3124,20 +3726,20 @@
                 "math",
                 "zf2"
             ],
-            "time": "2016-04-07T16:29:53+00:00"
+            "time": "2018-12-04T15:34:17+00:00"
         },
         {
             "name": "zendframework/zend-mime",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mime.git",
-                "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f"
+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f",
-                "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f",
+                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
                 "shasum": ""
             },
             "require": {
@@ -3175,7 +3777,7 @@
                 "mime",
                 "zf"
             ],
-            "time": "2017-11-28T15:02:22+00:00"
+            "time": "2018-05-14T19:02:50+00:00"
         },
         {
             "name": "zendframework/zend-modulemanager",
@@ -3239,52 +3841,57 @@
         },
         {
             "name": "zendframework/zend-mvc",
-            "version": "2.6.3",
+            "version": "2.7.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mvc.git",
-                "reference": "a0f21c0261adab4a27bd10964995625b7d4c7f64"
+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a0f21c0261adab4a27bd10964995625b7d4c7f64",
-                "reference": "a0f21c0261adab4a27bd10964995625b7d4c7f64",
+                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
                 "shasum": ""
             },
             "require": {
+                "container-interop/container-interop": "^1.1",
                 "php": "^5.5 || ^7.0",
-                "zendframework/zend-eventmanager": "~2.5",
-                "zendframework/zend-form": "~2.6",
-                "zendframework/zend-hydrator": "~1.0",
-                "zendframework/zend-servicemanager": "~2.5",
-                "zendframework/zend-stdlib": "^2.7.5"
+                "zendframework/zend-console": "^2.7",
+                "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
+                "zendframework/zend-form": "^2.11",
+                "zendframework/zend-hydrator": "^1.1 || ^2.4",
+                "zendframework/zend-psr7bridge": "^0.2",
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
+            },
+            "replace": {
+                "zendframework/zend-router": "^2.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-authentication": "~2.5",
-                "zendframework/zend-cache": "~2.5",
-                "zendframework/zend-console": "~2.5",
-                "zendframework/zend-di": "~2.5",
-                "zendframework/zend-filter": "~2.5",
-                "zendframework/zend-http": "~2.5",
-                "zendframework/zend-i18n": "~2.5",
-                "zendframework/zend-inputfilter": "~2.5",
-                "zendframework/zend-json": "~2.5",
-                "zendframework/zend-log": "~2.5",
-                "zendframework/zend-modulemanager": "~2.6",
-                "zendframework/zend-serializer": "~2.5",
-                "zendframework/zend-session": "~2.5",
-                "zendframework/zend-text": "~2.5",
-                "zendframework/zend-uri": "~2.5",
-                "zendframework/zend-validator": "~2.5",
-                "zendframework/zend-version": "~2.5",
-                "zendframework/zend-view": "~2.5"
+                "friendsofphp/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.8.36",
+                "sebastian/comparator": "^1.2.4",
+                "sebastian/version": "^1.0.4",
+                "zendframework/zend-authentication": "^2.6",
+                "zendframework/zend-cache": "^2.8",
+                "zendframework/zend-di": "^2.6",
+                "zendframework/zend-filter": "^2.8",
+                "zendframework/zend-http": "^2.8",
+                "zendframework/zend-i18n": "^2.8",
+                "zendframework/zend-inputfilter": "^2.8",
+                "zendframework/zend-json": "^2.6.1",
+                "zendframework/zend-log": "^2.9.3",
+                "zendframework/zend-modulemanager": "^2.8",
+                "zendframework/zend-serializer": "^2.8",
+                "zendframework/zend-session": "^2.8.1",
+                "zendframework/zend-text": "^2.7",
+                "zendframework/zend-uri": "^2.6",
+                "zendframework/zend-validator": "^2.10",
+                "zendframework/zend-view": "^2.9"
             },
             "suggest": {
                 "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
                 "zendframework/zend-config": "Zend\\Config component",
-                "zendframework/zend-console": "Zend\\Console component",
                 "zendframework/zend-di": "Zend\\Di component",
                 "zendframework/zend-filter": "Zend\\Filter component",
                 "zendframework/zend-http": "Zend\\Http component",
@@ -3294,21 +3901,24 @@
                 "zendframework/zend-log": "Zend\\Log component",
                 "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
                 "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
                 "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
                 "zendframework/zend-text": "Zend\\Text component",
                 "zendframework/zend-uri": "Zend\\Uri component",
                 "zendframework/zend-validator": "Zend\\Validator component",
-                "zendframework/zend-version": "Zend\\Version component",
                 "zendframework/zend-view": "Zend\\View component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "3.0-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
                 "psr-4": {
                     "Zend\\Mvc\\": "src/"
                 }
@@ -3322,43 +3932,91 @@
                 "mvc",
                 "zf2"
             ],
-            "time": "2016-02-23T15:24:59+00:00"
+            "time": "2018-05-03T13:13:41+00:00"
         },
         {
-            "name": "zendframework/zend-serializer",
-            "version": "2.8.1",
+            "name": "zendframework/zend-psr7bridge",
+            "version": "0.2.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-serializer.git",
-                "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580"
+                "url": "https://github.com/zendframework/zend-psr7bridge.git",
+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/7ac42b9a47e9cb23895173a3096bc3b3fb7ac580",
-                "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580",
+                "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605",
+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-json": "^2.5 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": ">=5.5",
+                "psr/http-message": "^1.0",
+                "zendframework/zend-diactoros": "^1.1",
+                "zendframework/zend-http": "^2.5"
             },
             "require-dev": {
-                "doctrine/instantiator": "1.0.*",
-                "phpunit/phpunit": "^5.5",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-math": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-            },
-            "suggest": {
-                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+                "phpunit/phpunit": "^4.7",
+                "squizlabs/php_codesniffer": "^2.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Psr7Bridge\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR-7 <-> Zend\\Http bridge",
+            "homepage": "https://github.com/zendframework/zend-psr7bridge",
+            "keywords": [
+                "http",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2016-05-10T21:44:39+00:00"
+        },
+        {
+            "name": "zendframework/zend-serializer",
+            "version": "2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-serializer.git",
+                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
+                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-json": "^2.5 || ^3.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-math": "^2.6 || ^3.0",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
+                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Serializer",
@@ -3375,25 +4033,25 @@
                 "BSD-3-Clause"
             ],
             "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
-            "homepage": "https://github.com/zendframework/zend-serializer",
             "keywords": [
+                "ZendFramework",
                 "serializer",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-11-20T22:21:04+00:00"
+            "time": "2018-05-14T18:45:18+00:00"
         },
         {
             "name": "zendframework/zend-server",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-server.git",
-                "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914"
+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914",
-                "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914",
+                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
                 "shasum": ""
             },
             "require": {
@@ -3402,14 +4060,14 @@
                 "zendframework/zend-stdlib": "^2.5 || ^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "squizlabs/php_codesniffer": "^2.3.1"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -3421,25 +4079,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-server",
+            "description": "Create Reflection-based RPC servers",
             "keywords": [
+                "ZendFramework",
                 "server",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-06-20T22:27:55+00:00"
+            "time": "2018-04-30T22:21:28+00:00"
         },
         {
             "name": "zendframework/zend-servicemanager",
-            "version": "2.7.10",
+            "version": "2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4"
+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4",
-                "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
                 "shasum": ""
             },
             "require": {
@@ -3478,20 +4137,20 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2017-12-05T16:27:36+00:00"
+            "time": "2018-06-22T14:49:54+00:00"
         },
         {
             "name": "zendframework/zend-session",
-            "version": "2.8.3",
+            "version": "2.8.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-session.git",
-                "reference": "c14be63df39b0caee784e53cd57c43eb48efefea"
+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/c14be63df39b0caee784e53cd57c43eb48efefea",
-                "reference": "c14be63df39b0caee784e53cd57c43eb48efefea",
+                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b",
+                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b",
                 "shasum": ""
             },
             "require": {
@@ -3499,14 +4158,11 @@
                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
-            "conflict": {
-                "phpunit/phpunit": ">=6.5.0"
-            },
             "require-dev": {
                 "container-interop/container-interop": "^1.1",
                 "mongodb/mongodb": "^1.0.1",
                 "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-                "phpunit/phpunit": "^5.7.5 || ^6.0.13",
+                "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
                 "zendframework/zend-cache": "^2.6.1",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-db": "^2.7",
@@ -3548,31 +4204,32 @@
                 "session",
                 "zf"
             ],
-            "time": "2017-12-01T17:35:04+00:00"
+            "time": "2018-02-22T16:33:54+00:00"
         },
         {
             "name": "zendframework/zend-soap",
-            "version": "2.6.0",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-soap.git",
-                "reference": "2d6012e7231cce550219eccfc80836a028d20bf1"
+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/2d6012e7231cce550219eccfc80836a028d20bf1",
-                "reference": "2d6012e7231cce550219eccfc80836a028d20bf1",
+                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284",
+                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
+                "ext-soap": "*",
+                "php": "^5.6 || ^7.0",
                 "zendframework/zend-server": "^2.6.1",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0",
                 "zendframework/zend-uri": "^2.5.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "squizlabs/php_codesniffer": "^2.3.1",
+                "phpunit/phpunit": "^5.7.21 || ^6.3",
+                "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
                 "zendframework/zend-http": "^2.5.4"
             },
@@ -3582,8 +4239,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -3600,7 +4257,7 @@
                 "soap",
                 "zf2"
             ],
-            "time": "2016-04-21T16:06:27+00:00"
+            "time": "2018-01-29T17:51:26+00:00"
         },
         {
             "name": "zendframework/zend-stdlib",
@@ -3663,33 +4320,33 @@
         },
         {
             "name": "zendframework/zend-text",
-            "version": "2.6.0",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-text.git",
-                "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92"
+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/07ad9388e4d4f12620ad37b52a5b0e4ee7845f92",
-                "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92",
+                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
+                "php": "^5.6 || ^7.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -3701,41 +4358,42 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-text",
+            "description": "Create FIGlets and text-based tables",
             "keywords": [
+                "ZendFramework",
                 "text",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-02-08T19:03:52+00:00"
+            "time": "2018-04-30T14:55:10+00:00"
         },
         {
             "name": "zendframework/zend-uri",
-            "version": "2.5.2",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-uri.git",
-                "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed"
+                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed",
-                "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed",
+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/3b6463645c6766f78ce537c70cb4fdabee1e725f",
+                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
+                "php": "^5.6 || ^7.0",
                 "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-validator": "^2.5"
+                "zendframework/zend-validator": "^2.10"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -3747,26 +4405,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-            "homepage": "https://github.com/zendframework/zend-uri",
+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
             "keywords": [
+                "ZendFramework",
                 "uri",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-02-17T22:38:51+00:00"
+            "time": "2018-04-30T13:40:08+00:00"
         },
         {
             "name": "zendframework/zend-validator",
-            "version": "2.10.1",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-validator.git",
-                "reference": "010084ddbd33299bf51ea6f0e07f8f4e8bd832a8"
+                "reference": "f0789b4c4c099afdd2ecc58cc209a26c64bd4f17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/010084ddbd33299bf51ea6f0e07f8f4e8bd832a8",
-                "reference": "010084ddbd33299bf51ea6f0e07f8f4e8bd832a8",
+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/f0789b4c4c099afdd2ecc58cc209a26c64bd4f17",
+                "reference": "f0789b4c4c099afdd2ecc58cc209a26c64bd4f17",
                 "shasum": ""
             },
             "require": {
@@ -3776,6 +4434,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "psr/http-message": "^1.0",
                 "zendframework/zend-cache": "^2.6.1",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
@@ -3789,6 +4448,7 @@
                 "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
                 "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
                 "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
                 "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
@@ -3801,8 +4461,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10-dev",
-                    "dev-develop": "2.11-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Validator",
@@ -3824,25 +4484,26 @@
                 "validator",
                 "zf2"
             ],
-            "time": "2017-08-22T14:19:23+00:00"
+            "time": "2018-12-13T21:23:15+00:00"
         },
         {
             "name": "zendframework/zend-view",
-            "version": "2.9.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-view.git",
-                "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3"
+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3b6342c381c4437a03fc81d0064c0bb8924914d3",
-                "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3",
+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/c1a3f2043fb75b5983ab9adfc369ae396601be7e",
+                "reference": "c1a3f2043fb75b5983ab9adfc369ae396601be7e",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-json": "^2.6.1",
                 "zendframework/zend-loader": "^2.5",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
@@ -3858,17 +4519,16 @@
                 "zendframework/zend-filter": "^2.6.1",
                 "zendframework/zend-http": "^2.5.4",
                 "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-json": "^2.6.1",
                 "zendframework/zend-log": "^2.7",
                 "zendframework/zend-modulemanager": "^2.7.1",
-                "zendframework/zend-mvc": "^2.7 || ^3.0",
+                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
                 "zendframework/zend-navigation": "^2.5",
                 "zendframework/zend-paginator": "^2.5",
                 "zendframework/zend-permissions-acl": "^2.6",
                 "zendframework/zend-router": "^3.0.1",
                 "zendframework/zend-serializer": "^2.6.1",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-session": "^2.8.1",
                 "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
@@ -3878,8 +4538,8 @@
                 "zendframework/zend-filter": "Zend\\Filter component",
                 "zendframework/zend-http": "Zend\\Http component",
                 "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-json": "Zend\\Json component",
                 "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
                 "zendframework/zend-navigation": "Zend\\Navigation component",
                 "zendframework/zend-paginator": "Zend\\Paginator component",
                 "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
@@ -3892,8 +4552,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9-dev",
-                    "dev-develop": "3.0-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 }
             },
             "autoload": {
@@ -3911,214 +4571,2127 @@
                 "view",
                 "zf2"
             ],
-            "time": "2017-03-21T15:05:56+00:00"
+            "time": "2018-12-06T21:20:01+00:00"
         }
     ],
     "packages-dev": [
         {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "name": "allure-framework/allure-codeception",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-codeception.git",
+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
+                "shasum": ""
+            },
+            "require": {
+                "allure-framework/allure-php-api": "~1.1.0",
+                "codeception/codeception": "~2.1",
+                "php": ">=5.4.0",
+                "symfony/filesystem": ">=2.6",
+                "symfony/finder": ">=2.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A Codeception adapter for Allure report.",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "attachments",
+                "cases",
+                "codeception",
+                "report",
+                "steps",
+                "testing"
+            ],
+            "time": "2018-12-18T19:47:23+00:00"
+        },
+        {
+            "name": "allure-framework/allure-php-api",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-php-adapter-api.git",
+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-php-adapter-api/zipball/a462a0da121681577033e13c123b6cc4e89cdc64",
+                "reference": "a462a0da121681577033e13c123b6cc4e89cdc64",
+                "shasum": ""
+            },
+            "require": {
+                "jms/serializer": ">=0.16.0",
+                "moontoast/math": ">=1.1.0",
+                "php": ">=5.4.0",
+                "phpunit/phpunit": ">=4.0.0",
+                "ramsey/uuid": ">=3.0.0",
+                "symfony/http-foundation": ">=2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": [
+                        "src/",
+                        "test/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP API for Allure adapter",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "api",
+                "php",
+                "report"
+            ],
+            "time": "2016-12-07T12:15:46+00:00"
+        },
+        {
+            "name": "allure-framework/allure-phpunit",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-phpunit.git",
+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/45504aeba41304cf155a898fa9ac1aae79f4a089",
+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089",
+                "shasum": ""
+            },
+            "require": {
+                "allure-framework/allure-php-api": "~1.1.0",
+                "mikey179/vfsstream": "1.*",
+                "php": ">=7.0.0",
+                "phpunit/phpunit": ">=6.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A PHPUnit adapter for Allure report.",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "attachments",
+                "cases",
+                "phpunit",
+                "report",
+                "steps",
+                "testing"
+            ],
+            "time": "2017-11-03T13:08:21+00:00"
+        },
+        {
+            "name": "behat/gherkin",
+            "version": "v4.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5|~5",
+                "symfony/phpunit-bridge": "~2.7|~3",
+                "symfony/yaml": "~2.3|~3"
+            },
+            "suggest": {
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Cucumber",
+                "DSL",
+                "gherkin",
+                "parser"
+            ],
+            "time": "2016-10-30T11:50:56+00:00"
+        },
+        {
+            "name": "codeception/codeception",
+            "version": "2.3.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Codeception.git",
+                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
+                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "~4.4.0",
+                "codeception/stub": "^1.0",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "facebook/webdriver": ">=1.1.3 <2.0",
+                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
+                "guzzlehttp/psr7": "~1.0",
+                "php": ">=5.4.0 <8.0",
+                "phpunit/php-code-coverage": ">=2.2.4 <6.0",
+                "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
+                "sebastian/comparator": ">1.1 <3.0",
+                "sebastian/diff": ">=1.4 <3.0",
+                "symfony/browser-kit": ">=2.7 <5.0",
+                "symfony/console": ">=2.7 <5.0",
+                "symfony/css-selector": ">=2.7 <5.0",
+                "symfony/dom-crawler": ">=2.7 <5.0",
+                "symfony/event-dispatcher": ">=2.7 <5.0",
+                "symfony/finder": ">=2.7 <5.0",
+                "symfony/yaml": ">=2.7 <5.0"
+            },
+            "require-dev": {
+                "codeception/specify": "~0.3",
+                "facebook/graph-sdk": "~5.3",
+                "flow/jsonpath": "~0.2",
+                "monolog/monolog": "~1.8",
+                "pda/pheanstalk": "~3.0",
+                "php-amqplib/php-amqplib": "~2.4",
+                "predis/predis": "^1.0",
+                "squizlabs/php_codesniffer": "~2.0",
+                "symfony/process": ">=2.7 <5.0",
+                "vlucas/phpdotenv": "^2.4.0"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
+                "codeception/specify": "BDD-style code blocks",
+                "codeception/verify": "BDD-style assertions",
+                "flow/jsonpath": "For using JSONPath in REST module",
+                "league/factory-muffin": "For DataFactory module",
+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
+                "stecman/symfony-console-completion": "For BASH autocompletion",
+                "symfony/phpunit-bridge": "For phpunit-bridge support"
+            },
+            "bin": [
+                "codecept"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src\\Codeception",
+                    "Codeception\\Extension\\": "ext"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                }
+            ],
+            "description": "BDD-style testing framework",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "acceptance testing",
+                "functional testing",
+                "unit testing"
+            ],
+            "time": "2018-02-26T23:29:41+00:00"
+        },
+        {
+            "name": "codeception/stub",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Stub.git",
+                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
+                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
+                "shasum": ""
+            },
+            "require": {
+                "phpunit/phpunit-mock-objects": ">2.3 <7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.8 <8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+            "time": "2018-05-17T09:31:08+00:00"
+        },
+        {
+            "name": "consolidation/annotated-command",
+            "version": "2.10.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/annotated-command.git",
+                "reference": "288593672a8ca9ead2c73a8bfbfa4737862bfd6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/288593672a8ca9ead2c73a8bfbfa4737862bfd6a",
+                "reference": "288593672a8ca9ead2c73a8bfbfa4737862bfd6a",
+                "shasum": ""
+            },
+            "require": {
+                "consolidation/output-formatters": "^3.4",
+                "php": ">=5.4.0",
+                "psr/log": "^1",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/event-dispatcher": "^2.5|^3|^4",
+                "symfony/finder": "^2.5|^3|^4"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
+                "phpunit/phpunit": "^6",
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    },
+                    "phpunit4": {
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\AnnotatedCommand\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Initialize Symfony Console commands from annotated command class methods.",
+            "time": "2018-12-14T01:52:35+00:00"
+        },
+        {
+            "name": "consolidation/config",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/config.git",
+                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c",
+                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "grasmash/expander": "^1",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^5",
+                "satooshi/php-coveralls": "^1.0",
+                "squizlabs/php_codesniffer": "2.*",
+                "symfony/console": "^2.5|^3|^4",
+                "symfony/yaml": "^2.8.11|^3|^4"
+            },
+            "suggest": {
+                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\Config\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Provide configuration services for a commandline tool.",
+            "time": "2018-10-24T17:55:35+00:00"
+        },
+        {
+            "name": "consolidation/log",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/log.git",
+                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0",
+                "psr/log": "~1.0",
+                "symfony/console": "^2.8|^3|^4"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "4.*",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
+            "time": "2018-05-25T18:14:39+00:00"
+        },
+        {
+            "name": "consolidation/output-formatters",
+            "version": "3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/output-formatters.git",
+                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
+                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "php": ">=5.4.0",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/finder": "^2.5|^3|^4"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^2",
+                "phpunit/phpunit": "^5.7.27",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "^2.7",
+                "symfony/console": "3.2.3",
+                "symfony/var-dumper": "^2.8|^3|^4",
+                "victorjonsson/markdowndocs": "^1.3"
+            },
+            "suggest": {
+                "symfony/var-dumper": "For using the var_dump formatter"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\OutputFormatters\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Format text by applying transformations provided by plug-in formatters.",
+            "time": "2018-10-19T22:35:38+00:00"
+        },
+        {
+            "name": "consolidation/robo",
+            "version": "1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/Robo.git",
+                "reference": "01789e1c4f3b0d7e5b4ee0aca1843a9438ff4983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/01789e1c4f3b0d7e5b4ee0aca1843a9438ff4983",
+                "reference": "01789e1c4f3b0d7e5b4ee0aca1843a9438ff4983",
+                "shasum": ""
+            },
+            "require": {
+                "consolidation/annotated-command": "^2.10.1",
+                "consolidation/config": "^1.0.10",
+                "consolidation/log": "~1",
+                "consolidation/output-formatters": "^3.1.13",
+                "consolidation/self-update": "^1",
+                "grasmash/yaml-expander": "^1.3",
+                "league/container": "^2.2",
+                "php": ">=5.5.0",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/event-dispatcher": "^2.5|^3|^4",
+                "symfony/filesystem": "^2.5|^3|^4",
+                "symfony/finder": "^2.5|^3|^4",
+                "symfony/process": "^2.5|^3|^4"
+            },
+            "replace": {
+                "codegyre/robo": "< 1.0"
+            },
+            "require-dev": {
+                "codeception/aspect-mock": "^1|^2.1.1",
+                "codeception/base": "^2.3.7",
+                "codeception/verify": "^0.3.2",
+                "g1a/composer-test-scenarios": "^3",
+                "goaop/framework": "~2.1.2",
+                "goaop/parser-reflection": "^1.1.0",
+                "natxet/cssmin": "3.0.4",
+                "nikic/php-parser": "^3.1.5",
+                "patchwork/jsqueeze": "~2",
+                "pear/archive_tar": "^1.4.2",
+                "php-coveralls/php-coveralls": "^1",
+                "phpunit/php-code-coverage": "~2|~4",
+                "squizlabs/php_codesniffer": "^2.8"
+            },
+            "suggest": {
+                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
+                "natxet/CssMin": "For minifying CSS files in taskMinify",
+                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
+                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
+            },
+            "bin": [
+                "robo"
+            ],
+            "type": "library",
+            "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "remove": [
+                            "goaop/framework"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.5.9"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    }
+                },
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Robo\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Davert",
+                    "email": "davert.php@resend.cc"
+                }
+            ],
+            "description": "Modern task runner",
+            "time": "2018-12-14T02:54:30+00:00"
+        },
+        {
+            "name": "consolidation/self-update",
+            "version": "1.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/self-update.git",
+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/filesystem": "^2.5|^3|^4"
+            },
+            "bin": [
+                "scripts/release"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SelfUpdate\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                },
+                {
+                    "name": "Alexander Menk",
+                    "email": "menk@mestrona.net"
+                }
+            ],
+            "description": "Provides a self:update command for Symfony Console applications.",
+            "time": "2018-10-28T01:52:03+00:00"
+        },
+        {
+            "name": "dflydev/dot-access-data",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Dflydev\\DotAccessData": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Carlos Frutos",
+                    "email": "carlos@kiwing.it",
+                    "homepage": "https://github.com/cfrutos"
+                }
+            ],
+            "description": "Given a deep data structure, access data by dot notation.",
+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
+            "keywords": [
+                "access",
+                "data",
+                "dot",
+                "notation"
+            ],
+            "time": "2017-01-20T21:14:22+00:00"
+        },
+        {
+            "name": "doctrine/annotations",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
+                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2017-12-06T07:11:42+00:00"
+        },
+        {
+            "name": "doctrine/collections",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/collections.git",
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "~0.1@dev",
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Collections\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Collections Abstraction library",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "array",
+                "collections",
+                "iterator"
+            ],
+            "time": "2017-07-22T10:37:32+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2014-09-09T13:34:57+00:00"
+        },
+        {
+            "name": "epfremme/swagger-php",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/epfremmer/swagger-php.git",
+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/epfremmer/swagger-php/zipball/eee28a442b7e6220391ec953d3c9b936354f23bc",
+                "reference": "eee28a442b7e6220391ec953d3c9b936354f23bc",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.2",
+                "doctrine/collections": "^1.3",
+                "jms/serializer": "^1.1",
+                "php": ">=5.5",
+                "phpoption/phpoption": "^1.1",
+                "symfony/yaml": "^2.7|^3.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "~4.8|~5.0",
+                "satooshi/php-coveralls": "^1.0"
+            },
+            "type": "package",
+            "autoload": {
+                "psr-4": {
+                    "Epfremme\\Swagger\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Pfremmer",
+                    "email": "epfremme@nerdery.com"
+                }
+            ],
+            "description": "Library for parsing swagger documentation into PHP entities for use in testing and code generation",
+            "time": "2016-09-26T17:24:17+00:00"
+        },
+        {
+            "name": "facebook/webdriver",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-zip": "*",
+                "php": "^5.6 || ~7.0",
+                "symfony/process": "^2.8 || ^3.1 || ^4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "jakub-onderka/php-parallel-lint": "^0.9.2",
+                "php-coveralls/php-coveralls": "^2.0",
+                "php-mock/php-mock-phpunit": "^1.1",
+                "phpunit/phpunit": "^5.7",
+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
+                "squizlabs/php_codesniffer": "^2.6",
+                "symfony/var-dumper": "^3.3 || ^4.0"
+            },
+            "suggest": {
+                "ext-SimpleXML": "For Firefox profile creation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-community": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A PHP client for Selenium WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2018-05-16T17:37:13+00:00"
+        },
+        {
+            "name": "flow/jsonpath",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FlowCommunications/JSONPath.git",
+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FlowCommunications/JSONPath/zipball/f0222818d5c938e4ab668ab2e2c079bd51a27112",
+                "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "peekmo/jsonpath": "dev-master",
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Flow\\JSONPath": "src/",
+                    "Flow\\JSONPath\\Test": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Stephen Frank",
+                    "email": "stephen@flowsa.com"
+                }
+            ],
+            "description": "JSONPath implementation for parsing, searching and flattening arrays",
+            "time": "2018-03-04T16:39:47+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v2.13.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
+                "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161",
+                "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161",
+                "shasum": ""
+            },
+            "require": {
+                "composer/semver": "^1.4",
+                "composer/xdebug-handler": "^1.2",
+                "doctrine/annotations": "^1.2",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": "^5.6 || >=7.0 <7.3",
+                "php-cs-fixer/diff": "^1.3",
+                "symfony/console": "^3.4.17 || ^4.1.6",
+                "symfony/event-dispatcher": "^3.0 || ^4.0",
+                "symfony/filesystem": "^3.0 || ^4.0",
+                "symfony/finder": "^3.0 || ^4.0",
+                "symfony/options-resolver": "^3.0 || ^4.0",
+                "symfony/polyfill-php70": "^1.0",
+                "symfony/polyfill-php72": "^1.4",
+                "symfony/process": "^3.0 || ^4.0",
+                "symfony/stopwatch": "^3.0 || ^4.0"
+            },
+            "conflict": {
+                "hhvm": "*"
+            },
+            "require-dev": {
+                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
+                "justinrainbow/json-schema": "^5.0",
+                "keradus/cli-executor": "^1.1",
+                "mikey179/vfsstream": "^1.6",
+                "php-coveralls/php-coveralls": "^2.1",
+                "php-cs-fixer/accessible-object": "^1.0",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
+                "phpunitgoodpractices/traits": "^1.5.1",
+                "symfony/phpunit-bridge": "^4.0"
+            },
+            "suggest": {
+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
+                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "classmap": [
+                    "tests/Test/AbstractFixerTestCase.php",
+                    "tests/Test/AbstractIntegrationCaseFactory.php",
+                    "tests/Test/AbstractIntegrationTestCase.php",
+                    "tests/Test/Assert/AssertTokensTrait.php",
+                    "tests/Test/IntegrationCase.php",
+                    "tests/Test/IntegrationCaseFactory.php",
+                    "tests/Test/IntegrationCaseFactoryInterface.php",
+                    "tests/Test/InternalIntegrationCaseFactory.php",
+                    "tests/TestCase.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "time": "2018-10-21T00:32:10+00:00"
+        },
+        {
+            "name": "fzaninotto/faker",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fzaninotto/Faker.git",
+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "ext-intl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
+                "squizlabs/php_codesniffer": "^1.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "time": "2018-07-12T10:23:15+00:00"
+        },
+        {
+            "name": "grasmash/expander",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/grasmash/expander.git",
+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "greg-1-anderson/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^4|^5.5.4",
+                "satooshi/php-coveralls": "^1.0.2|dev-master",
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Grasmash\\Expander\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Grasmick"
+                }
+            ],
+            "description": "Expands internal property references in PHP arrays file.",
+            "time": "2017-12-21T22:14:55+00:00"
+        },
+        {
+            "name": "grasmash/yaml-expander",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/grasmash/yaml-expander.git",
+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "php": ">=5.4",
+                "symfony/yaml": "^2.8.11|^3|^4"
+            },
+            "require-dev": {
+                "greg-1-anderson/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^4.8|^5.5.4",
+                "satooshi/php-coveralls": "^1.0.2|dev-master",
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Grasmash\\YamlExpander\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Grasmick"
+                }
+            ],
+            "description": "Expands internal property references in a yaml file.",
+            "time": "2017-12-16T16:06:03+00:00"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.0"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.3-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2018-04-22T15:46:56+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2018-12-04T20:46:45+00:00"
+        },
+        {
+            "name": "jms/metadata",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/metadata.git",
+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.0",
+                "symfony/cache": "~3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Metadata\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                },
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Class/method/property metadata management in PHP",
+            "keywords": [
+                "annotations",
+                "metadata",
+                "xml",
+                "yaml"
+            ],
+            "time": "2018-10-26T12:40:10+00:00"
+        },
+        {
+            "name": "jms/parser-lib",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/parser-lib.git",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": ">=0.9,<2.0-dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "description": "A library for easily creating recursive-descent parsers.",
+            "time": "2012-11-18T18:08:43+00:00"
+        },
+        {
+            "name": "jms/serializer",
+            "version": "1.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/serializer.git",
+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
+                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.0",
+                "doctrine/instantiator": "^1.0.3",
+                "jms/metadata": "^1.3",
+                "jms/parser-lib": "1.*",
+                "php": "^5.5|^7.0",
+                "phpcollection/phpcollection": "~0.1",
+                "phpoption/phpoption": "^1.1"
+            },
+            "conflict": {
+                "twig/twig": "<1.12"
+            },
+            "require-dev": {
+                "doctrine/orm": "~2.1",
+                "doctrine/phpcr-odm": "^1.3|^2.0",
+                "ext-pdo_sqlite": "*",
+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
+                "phpunit/phpunit": "^4.8|^5.0",
+                "propel/propel1": "~1.7",
+                "psr/container": "^1.0",
+                "symfony/dependency-injection": "^2.7|^3.3|^4.0",
+                "symfony/expression-language": "^2.6|^3.0",
+                "symfony/filesystem": "^2.1",
+                "symfony/form": "~2.1|^3.0",
+                "symfony/translation": "^2.1|^3.0",
+                "symfony/validator": "^2.2|^3.0",
+                "symfony/yaml": "^2.1|^3.0",
+                "twig/twig": "~1.12|~2.0"
+            },
+            "suggest": {
+                "doctrine/cache": "Required if you like to use cache functionality.",
+                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.13-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\Serializer": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                },
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
+            "homepage": "http://jmsyst.com/libs/serializer",
+            "keywords": [
+                "deserialization",
+                "jaxb",
+                "json",
+                "serialization",
+                "xml"
+            ],
+            "time": "2018-07-25T13:58:54+00:00"
+        },
+        {
+            "name": "league/container",
+            "version": "2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/container.git",
+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.2",
+                "php": "^5.4.0 || ^7.0"
+            },
+            "provide": {
+                "container-interop/container-interop-implementation": "^1.2",
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "orno/di": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Container\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Bennett",
+                    "email": "philipobenito@gmail.com",
+                    "homepage": "http://www.philipobenito.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A fast and intuitive dependency injection container.",
+            "homepage": "https://github.com/thephpleague/container",
+            "keywords": [
+                "container",
+                "dependency",
+                "di",
+                "injection",
+                "league",
+                "provider",
+                "service"
+            ],
+            "time": "2017-05-10T09:20:27+00:00"
+        },
+        {
+            "name": "lusitanian/oauth",
+            "version": "v0.8.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "predis/predis": "0.8.*@dev",
+                "squizlabs/php_codesniffer": "2.*",
+                "symfony/http-foundation": "~2.1"
+            },
+            "suggest": {
+                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
+                "predis/predis": "Allows using the Redis storage backend.",
+                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "OAuth": "src",
+                    "OAuth\\Unit": "tests"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "David Desberg",
+                    "email": "david@daviddesberg.com"
+                },
+                {
+                    "name": "Elliot Chance",
+                    "email": "elliotchance@gmail.com"
+                },
+                {
+                    "name": "Pieter Hordijk",
+                    "email": "info@pieterhordijk.com"
+                }
+            ],
+            "description": "PHP 5.3+ oAuth 1/2 Library",
+            "keywords": [
+                "Authentication",
+                "authorization",
+                "oauth",
+                "security"
+            ],
+            "time": "2018-02-14T22:37:14+00:00"
+        },
+        {
+            "name": "magento/magento2-functional-testing-framework",
+            "version": "2.3.12",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "url": "https://github.com/magento/magento2-functional-testing-framework.git",
+                "reference": "599004be3e14ebbe6fac77de2edbab934d70f19c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/599004be3e14ebbe6fac77de2edbab934d70f19c",
+                "reference": "599004be3e14ebbe6fac77de2edbab934d70f19c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "allure-framework/allure-codeception": "~1.3.0",
+                "codeception/codeception": "~2.3.4",
+                "consolidation/robo": "^1.0.0",
+                "epfremme/swagger-php": "^2.0",
+                "flow/jsonpath": ">0.2",
+                "fzaninotto/faker": "^1.6",
+                "monolog/monolog": "^1.0",
+                "mustache/mustache": "~2.5",
+                "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
+                "symfony/process": "^2.8 || ^3.1 || ^4.0",
+                "vlucas/phpdotenv": "^2.4"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "brainmaestro/composer-git-hooks": "^2.3",
+                "codacy/coverage": "^1.4",
+                "codeception/aspect-mock": "^3.0",
+                "doctrine/cache": "<1.7.0",
+                "goaop/framework": "2.2.0",
+                "php-coveralls/php-coveralls": "^1.0",
+                "phpmd/phpmd": "^2.6.0",
+                "rregeer/phpunit-coverage-check": "^0.1.4",
+                "sebastian/phpcpd": "~3.0 || ~4.0",
+                "squizlabs/php_codesniffer": "~3.2",
+                "symfony/stopwatch": "~3.4.6"
             },
+            "bin": [
+                "bin/mftf"
+            ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                "hooks": {
+                    "pre-push": "bin/all-checks"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Magento/FunctionalTestingFramework/_bootstrap.php"
+                ],
                 "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                    "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
+                    "MFTF\\": "dev/tests/functional/MFTF"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
+                "AGPL-3.0"
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "description": "Magento2 Functional Testing Framework",
             "keywords": [
-                "constructor",
-                "instantiate"
+                "automation",
+                "functional",
+                "magento",
+                "testing"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2018-12-19T17:04:11+00:00"
         },
         {
-            "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.1.3",
+            "name": "mikey179/vfsStream",
+            "version": "v1.6.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39"
+                "url": "https://github.com/mikey179/vfsStream.git",
+                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d30ca69f8bed931b5c630407f0a98306e33c2c39",
-                "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39",
+                "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
+                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": "^5.3.6 || >=7.0 <7.2",
-                "sebastian/diff": "^1.1",
-                "symfony/console": "^2.3 || ^3.0",
-                "symfony/event-dispatcher": "^2.1 || ^3.0",
-                "symfony/filesystem": "^2.4 || ^3.0",
-                "symfony/finder": "^2.2 || ^3.0",
-                "symfony/polyfill-php54": "^1.0",
-                "symfony/polyfill-php55": "^1.3",
-                "symfony/polyfill-php70": "^1.0",
-                "symfony/polyfill-xml": "^1.3",
-                "symfony/process": "^2.3 || ^3.0",
-                "symfony/stopwatch": "^2.5 || ^3.0"
-            },
-            "conflict": {
-                "hhvm": "<3.9"
+                "php": ">=5.3.0"
             },
             "require-dev": {
-                "gecko-packages/gecko-php-unit": "^2.0",
-                "justinrainbow/json-schema": "^5.0",
-                "phpunit/phpunit": "^4.5 || ^5.0",
-                "satooshi/php-coveralls": "^1.0",
-                "symfony/phpunit-bridge": "^3.2"
+                "phpunit/phpunit": "~4.5"
             },
-            "suggest": {
-                "ext-mbstring": "For handling non-UTF8 characters in cache singature.",
-                "ext-xml": "For better performance.",
-                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
             },
-            "bin": [
-                "php-cs-fixer"
-            ],
-            "type": "application",
             "autoload": {
-                "psr-4": {
-                    "PhpCsFixer\\": "src/"
+                "psr-0": {
+                    "org\\bovigo\\vfs\\": "src/main/php"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Dariusz Rumiński",
-                    "email": "dariusz.ruminski@gmail.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Frank Kleine",
+                    "homepage": "http://frankkleine.de/",
+                    "role": "Developer"
                 }
             ],
-            "description": "A tool to automatically fix PHP code style",
-            "time": "2017-03-31T12:59:38+00:00"
+            "description": "Virtual file system to mock the real file system in unit tests.",
+            "homepage": "http://vfs.bovigo.org/",
+            "time": "2017-08-01T08:02:14+00:00"
         },
         {
-            "name": "ircmaxell/password-compat",
-            "version": "v1.0.4",
+            "name": "moontoast/math",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+                "url": "https://github.com/ramsey/moontoast-math.git",
+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
+                "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79",
                 "shasum": ""
             },
+            "require": {
+                "ext-bcmath": "*",
+                "php": ">=5.3.3"
+            },
             "require-dev": {
-                "phpunit/phpunit": "4.*"
+                "jakub-onderka/php-parallel-lint": "^0.9.0",
+                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
+                "satooshi/php-coveralls": "^0.6.1",
+                "squizlabs/php_codesniffer": "^2.3"
             },
             "type": "library",
             "autoload": {
-                "files": [
-                    "lib/password.php"
-                ]
+                "psr-4": {
+                    "Moontoast\\Math\\": "src/Moontoast/Math/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "Apache-2.0"
             ],
             "authors": [
                 {
-                    "name": "Anthony Ferrara",
-                    "email": "ircmaxell@php.net",
-                    "homepage": "http://blog.ircmaxell.com"
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
                 }
             ],
-            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
-            "homepage": "https://github.com/ircmaxell/password_compat",
+            "description": "A mathematics library, providing functionality for large numbers",
+            "homepage": "https://github.com/ramsey/moontoast-math",
             "keywords": [
-                "hashing",
-                "password"
+                "bcmath",
+                "math"
             ],
-            "time": "2014-11-20T16:49:30+00:00"
+            "time": "2017-02-16T16:54:46+00:00"
         },
         {
-            "name": "lusitanian/oauth",
-            "version": "v0.8.10",
+            "name": "mustache/mustache",
+            "version": "v2.12.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-                "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed"
+                "url": "https://github.com/bobthecow/mustache.php.git",
+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed",
-                "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.2.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "3.7.*",
-                "predis/predis": "0.8.*@dev",
-                "squizlabs/php_codesniffer": "2.*",
-                "symfony/http-foundation": "~2.1"
-            },
-            "suggest": {
-                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
-                "predis/predis": "Allows using the Redis storage backend.",
-                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
+                "friendsofphp/php-cs-fixer": "~1.11",
+                "phpunit/phpunit": "~3.7|~4.0|~5.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.1-dev"
-                }
-            },
             "autoload": {
                 "psr-0": {
-                    "OAuth": "src",
-                    "OAuth\\Unit": "tests"
+                    "Mustache": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4127,48 +6700,43 @@
             ],
             "authors": [
                 {
-                    "name": "David Desberg",
-                    "email": "david@daviddesberg.com"
-                },
-                {
-                    "name": "Elliot Chance",
-                    "email": "elliotchance@gmail.com"
-                },
-                {
-                    "name": "Pieter Hordijk",
-                    "email": "info@pieterhordijk.com"
+                    "name": "Justin Hileman",
+                    "email": "justin@justinhileman.info",
+                    "homepage": "http://justinhileman.com"
                 }
             ],
-            "description": "PHP 5.3+ oAuth 1/2 Library",
+            "description": "A Mustache implementation in PHP.",
+            "homepage": "https://github.com/bobthecow/mustache.php",
             "keywords": [
-                "Authentication",
-                "authorization",
-                "oauth",
-                "security"
+                "mustache",
+                "templating"
             ],
-            "time": "2016-07-12T22:15:40+00:00"
+            "time": "2017-07-11T12:54:05+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.7.0",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
             },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "autoload": {
@@ -4191,30 +6759,30 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-10-19T19:58:43+00:00"
+            "time": "2018-06-11T23:09:50+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.5.0",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "0c50874333149c0dad5a2877801aed148f2767ff"
+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/0c50874333149c0dad5a2877801aed148f2767ff",
-                "reference": "0c50874333149c0dad5a2877801aed148f2767ff",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
+                "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3",
-                "symfony/dependency-injection": "^2.3.0|^3",
-                "symfony/filesystem": "^2.3.0|^3"
+                "symfony/config": "^2.3.0|^3|^4",
+                "symfony/dependency-injection": "^2.3.0|^3|^4",
+                "symfony/filesystem": "^2.3.0|^3|^4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.4.0,<4.8",
+                "phpunit/phpunit": "^4.8|^5.7",
                 "squizlabs/php_codesniffer": "^2.0.0"
             },
             "bin": [
@@ -4231,7 +6799,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2017-01-19T14:23:36+00:00"
+            "time": "2017-12-13T13:21:38+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -4335,6 +6903,105 @@
             "description": "Library for handling version information and constraints",
             "time": "2017-03-05T17:38:23+00:00"
         },
+        {
+            "name": "php-cs-fixer/diff",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/diff.git",
+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "symfony/process": "^3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "SpacePossum"
+                }
+            ],
+            "description": "sebastian/diff v2 backport support for PHP5.6",
+            "homepage": "https://github.com/PHP-CS-Fixer",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2018-02-15T16:58:55+00:00"
+        },
+        {
+            "name": "phpcollection/phpcollection",
+            "version": "0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-collection.git",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": "1.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpCollection": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "General-Purpose Collection Library for PHP",
+            "keywords": [
+                "collection",
+                "list",
+                "map",
+                "sequence",
+                "set"
+            ],
+            "time": "2015-05-17T12:39:23+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "1.0.1",
@@ -4391,16 +7058,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.2.0",
+            "version": "4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "66465776cfc249844bde6d117abff1d22e06c2da"
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da",
-                "reference": "66465776cfc249844bde6d117abff1d22e06c2da",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
                 "shasum": ""
             },
             "require": {
@@ -4438,7 +7105,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-27T17:38:31+00:00"
+            "time": "2017-11-30T07:14:17+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -4553,35 +7220,85 @@
             ],
             "time": "2017-01-20T14:41:10+00:00"
         },
+        {
+            "name": "phpoption/phpoption",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-option.git",
+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpOption\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Option Type for PHP",
+            "keywords": [
+                "language",
+                "option",
+                "php",
+                "type"
+            ],
+            "time": "2015-07-25T16:39:46+00:00"
+        },
         {
             "name": "phpspec/prophecy",
-            "version": "1.7.3",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
-                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
                 "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7.x-dev"
+                    "dev-master": "1.8.x-dev"
                 }
             },
             "autoload": {
@@ -4614,20 +7331,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-11-24T13:59:53+00:00"
+            "time": "2018-08-05T17:53:17+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "5.3.0",
+            "version": "5.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
-                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
                 "shasum": ""
             },
             "require": {
@@ -4677,7 +7394,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-12-06T09:29:45+00:00"
+            "time": "2018-04-06T15:36:58+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4867,16 +7584,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.2.4",
+            "version": "6.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9"
+                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ff3a76a58ac293657808aefd58c8aaf05945f4d9",
-                "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
+                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
                 "shasum": ""
             },
             "require": {
@@ -4885,24 +7602,24 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.3",
+                "myclabs/deep-copy": "^1.6.1",
                 "phar-io/manifest": "^1.0.1",
                 "phar-io/version": "^1.0",
                 "php": "^7.0",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.2",
-                "phpunit/php-file-iterator": "^1.4",
-                "phpunit/php-text-template": "^1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^4.0",
-                "sebastian/comparator": "^2.0",
-                "sebastian/diff": "^1.4.3",
-                "sebastian/environment": "^3.0.2",
+                "phpunit/php-code-coverage": "^5.3",
+                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^1.0.9",
+                "phpunit/phpunit-mock-objects": "^5.0.9",
+                "sebastian/comparator": "^2.1",
+                "sebastian/diff": "^2.0",
+                "sebastian/environment": "^3.1",
                 "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^1.1 || ^2.0",
-                "sebastian/object-enumerator": "^3.0.2",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/resource-operations": "^1.0",
-                "sebastian/version": "^2.0"
+                "sebastian/version": "^2.0.1"
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "3.0.2",
@@ -4921,7 +7638,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.2.x-dev"
+                    "dev-master": "6.5.x-dev"
                 }
             },
             "autoload": {
@@ -4947,33 +7664,33 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03T13:59:28+00:00"
+            "time": "2018-09-08T15:10:43+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "4.0.4",
+            "version": "5.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0"
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.5",
                 "php": "^7.0",
                 "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.0"
+                "sebastian/exporter": "^3.1"
             },
             "conflict": {
                 "phpunit/phpunit": "<6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^6.5.11"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -4981,7 +7698,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
@@ -4996,7 +7713,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -5006,7 +7723,47 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03T14:08:16+00:00"
+            "time": "2018-08-09T05:50:03+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.0",
+                "satooshi/php-coveralls": ">=1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2016-02-11T07:05:27+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -5055,30 +7812,30 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.0.0",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "20f84f468cb67efee293246e6a09619b891f55f0"
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0",
-                "reference": "20f84f468cb67efee293246e6a09619b891f55f0",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "sebastian/diff": "^1.2",
-                "sebastian/exporter": "^3.0"
+                "sebastian/diff": "^2.0 || ^3.0",
+                "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.1.x-dev"
                 }
             },
             "autoload": {
@@ -5109,38 +7866,38 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-03T06:26:08+00:00"
+            "time": "2018-02-01T13:46:46+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.4.3",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^6.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -5167,7 +7924,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-05-22T07:24:03+00:00"
+            "time": "2017-08-03T08:09:46+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -5470,25 +8227,24 @@
         },
         {
             "name": "sebastian/phpcpd",
-            "version": "2.0.4",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpcpd.git",
-                "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db"
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db",
-                "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-timer": ">=1.0.6",
-                "sebastian/finder-facade": "~1.1",
-                "sebastian/version": "~1.0|~2.0",
-                "symfony/console": "~2.7|^3.0",
-                "theseer/fdomdocument": "~1.4"
+                "php": "^5.6|^7.0",
+                "phpunit/php-timer": "^1.0.6",
+                "sebastian/finder-facade": "^1.1",
+                "sebastian/version": "^1.0|^2.0",
+                "symfony/console": "^2.7|^3.0|^4.0"
             },
             "bin": [
                 "phpcpd"
@@ -5496,7 +8252,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -5517,7 +8273,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2016-04-17T19:32:49+00:00"
+            "time": "2017-11-16T08:49:28+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -5659,16 +8415,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.0.1",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219"
+                "reference": "628a481780561150481a9ec74709092b9759b3ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219",
-                "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
+                "reference": "628a481780561150481a9ec74709092b9759b3ec",
                 "shasum": ""
             },
             "require": {
@@ -5678,7 +8434,7 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "bin": [
                 "bin/phpcs",
@@ -5706,34 +8462,92 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-06-14T01:23:49+00:00"
+            "time": "2018-07-26T23:47:18+00:00"
+        },
+        {
+            "name": "symfony/browser-kit",
+            "version": "v4.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "db7e59fec9c82d45e745eb500e6ede2d96f4a6e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/db7e59fec9c82d45e745eb500e6ede2d96f4a6e9",
+                "reference": "db7e59fec9c82d45e745eb500e6ede2d96f4a6e9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/dom-crawler": "~3.4|~4.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\BrowserKit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony BrowserKit Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-11-26T11:49:31+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.2",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "e57211b88aa889fefac1cb36866db04100b0f21c"
+                "reference": "005d9a083d03f588677d15391a716b1ac9b887c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/e57211b88aa889fefac1cb36866db04100b0f21c",
-                "reference": "e57211b88aa889fefac1cb36866db04100b0f21c",
+                "url": "https://api.github.com/repos/symfony/config/zipball/005d9a083d03f588677d15391a716b1ac9b887c0",
+                "reference": "005d9a083d03f588677d15391a716b1ac9b887c0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0|~4.0"
+                "php": "^7.1.3",
+                "symfony/filesystem": "~3.4|~4.0",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3",
-                "symfony/finder": "<3.3"
+                "symfony/finder": "<3.4"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/finder": "~3.3|~4.0",
-                "symfony/yaml": "~3.0|~4.0"
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
+                "symfony/finder": "~3.4|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
@@ -5741,7 +8555,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -5768,38 +8582,108 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-12-14T19:40:10+00:00"
+            "time": "2018-11-30T22:21:14+00:00"
+        },
+        {
+            "name": "symfony/contracts",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/contracts.git",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "psr/cache": "^1.0",
+                "psr/container": "^1.0"
+            },
+            "suggest": {
+                "psr/cache": "When using the Cache contracts",
+                "psr/container": "When using the Service contracts",
+                "symfony/cache-contracts-implementation": "",
+                "symfony/service-contracts-implementation": "",
+                "symfony/translation-contracts-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\": ""
+                },
+                "exclude-from-classmap": [
+                    "**/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A set of abstractions extracted out of the Symfony components",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2018-12-05T08:06:11+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.4.2",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333"
+                "reference": "e4adc57a48d3fa7f394edfffa9e954086d7740e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5f81907ea43bfa971ac2c7fbac593ebe7cd7d333",
-                "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e4adc57a48d3fa7f394edfffa9e954086d7740e5",
+                "reference": "e4adc57a48d3fa7f394edfffa9e954086d7740e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/container": "^1.0"
+                "php": "^7.1.3",
+                "psr/container": "^1.0",
+                "symfony/contracts": "^1.0"
             },
             "conflict": {
-                "symfony/config": "<3.3.7",
-                "symfony/finder": "<3.3",
+                "symfony/config": "<4.2",
+                "symfony/finder": "<3.4",
                 "symfony/proxy-manager-bridge": "<3.4",
                 "symfony/yaml": "<3.4"
             },
             "provide": {
-                "psr/container-implementation": "1.0"
+                "psr/container-implementation": "1.0",
+                "symfony/service-contracts-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/config": "~4.2",
+                "symfony/expression-language": "~3.4|~4.0",
                 "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
@@ -5812,7 +8696,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -5839,40 +8723,45 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-12-14T19:40:10+00:00"
+            "time": "2018-12-02T15:59:36+00:00"
         },
         {
-            "name": "symfony/polyfill-php54",
-            "version": "v1.6.0",
+            "name": "symfony/dom-crawler",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php54.git",
-                "reference": "d7810a14b2c6c1aff415e1bb755f611b3d5327bc"
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "7438a32108fdd555295f443605d6de2cce473159"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/d7810a14b2c6c1aff415e1bb755f611b3d5327bc",
-                "reference": "d7810a14b2c6c1aff415e1bb755f611b3d5327bc",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159",
+                "reference": "7438a32108fdd555295f443605d6de2cce473159",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/css-selector": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php54\\": ""
+                    "Symfony\\Component\\DomCrawler\\": ""
                 },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5881,54 +8770,101 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
+            "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
+            "time": "2018-11-26T10:55:26+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v4.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851",
+                "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.1"
+            },
+            "require-dev": {
+                "predis/predis": "~1.0",
+                "symfony/expression-language": "~3.4|~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
             ],
-            "time": "2017-10-11T12:05:26+00:00"
+            "description": "Symfony HttpFoundation Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-11-26T10:55:26+00:00"
         },
         {
-            "name": "symfony/polyfill-php55",
-            "version": "v1.6.0",
+            "name": "symfony/options-resolver",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php55.git",
-                "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd"
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "a9c38e8a3da2c03b3e71fdffa6efb0bda51390ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b64e7f0c37ecf144ecc16668936eef94e628fbfd",
-                "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a9c38e8a3da2c03b3e71fdffa6efb0bda51390ba",
+                "reference": "a9c38e8a3da2c03b3e71fdffa6efb0bda51390ba",
                 "shasum": ""
             },
             "require": {
-                "ircmaxell/password-compat": "~1.0",
-                "php": ">=5.3.3"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php55\\": ""
+                    "Symfony\\Component\\OptionsResolver\\": ""
                 },
-                "files": [
-                    "bootstrap.php"
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5937,46 +8873,45 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
+            "description": "Symfony OptionsResolver Component",
             "homepage": "https://symfony.com",
             "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
+                "config",
+                "configuration",
+                "options"
             ],
-            "time": "2017-10-11T12:05:26+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.6.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff"
+                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
-                "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
+                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": "~1.0|~2.0",
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
                 "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -6012,20 +8947,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-10-11T12:05:26+00:00"
+            "time": "2018-09-21T06:26:08+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.6.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254"
+                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/6de4f4884b97abbbed9f0a84a95ff2ff77254254",
-                "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
                 "shasum": ""
             },
             "require": {
@@ -6034,7 +8969,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -6067,72 +9002,84 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-10-11T12:05:26+00:00"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
-            "name": "symfony/polyfill-xml",
-            "version": "v1.6.0",
+            "name": "symfony/stopwatch",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-xml.git",
-                "reference": "d7bcb5c3bb1832c532379df50825c08f43a64134"
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "ec076716412274e51f8a7ea675d9515e5c311123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/d7bcb5c3bb1832c532379df50825c08f43a64134",
-                "reference": "d7bcb5c3bb1832c532379df50825c08f43a64134",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/ec076716412274e51f8a7ea675d9515e5c311123",
+                "reference": "ec076716412274e51f8a7ea675d9515e5c311123",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-php72": "~1.4"
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0"
             },
-            "type": "metapackage",
+            "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for xml's utf8_encode and utf8_decode functions",
+            "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2017-10-11T12:05:26+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
-            "name": "symfony/stopwatch",
-            "version": "v3.4.2",
+            "name": "symfony/yaml",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1"
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "291e13d808bec481eab83f301f7bff3e699ef603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/52510fe1aefdc1c5d2076ac6030421d387e689d1",
-                "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603",
+                "reference": "291e13d808bec481eab83f301f7bff3e699ef603",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
+            "require-dev": {
+                "symfony/console": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
             },
             "type": "library",
             "extra": {
@@ -6142,7 +9089,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
+                    "Symfony\\Component\\Yaml\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6162,9 +9109,9 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Stopwatch Component",
+            "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-07T14:28:09+00:00"
+            "time": "2018-11-11T19:48:54+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -6246,18 +9193,68 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "time": "2017-04-07T12:08:54+00:00"
         },
+        {
+            "name": "vlucas/phpdotenv",
+            "version": "v2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/phpdotenv.git",
+                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "http://www.vancelucas.com"
+                }
+            ],
+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "keywords": [
+                "dotenv",
+                "env",
+                "environment"
+            ],
+            "time": "2018-07-29T20:33:41+00:00"
+        },
         {
             "name": "webmozart/assert",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
                 "shasum": ""
             },
             "require": {
@@ -6294,7 +9291,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23T20:04:58+00:00"
+            "time": "2018-01-29T19:49:41+00:00"
         }
     ],
     "aliases": [],
@@ -6305,7 +9302,8 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
+        "ext-bcmath": "*",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -6314,7 +9312,6 @@
         "ext-iconv": "*",
         "ext-intl": "*",
         "ext-mbstring": "*",
-        "ext-mcrypt": "*",
         "ext-openssl": "*",
         "ext-pdo_mysql": "*",
         "ext-simplexml": "*",
diff --git a/dev/tests/acceptance/.env.example b/dev/tests/acceptance/.env.example
deleted file mode 100644
index 7aec49b47bbc7..0000000000000
--- a/dev/tests/acceptance/.env.example
+++ /dev/null
@@ -1,55 +0,0 @@
-#Copyright © Magento, Inc. All rights reserved.
-#See COPYING.txt for license details.
-
-#*** Start of example .env ***#
-#
-# MAGENTO_BASE_URL=http://127.0.0.1:32772/
-#
-# MAGENTO_BACKEND_NAME=admin
-# MAGENTO_ADMIN_USERNAME=admin
-# MAGENTO_ADMIN_PASSWORD=123123q
-#
-# SELENIUM_HOST=127.0.0.1
-# SELENIUM_PORT=4444
-# SELENIUM_PROTOCOL=http
-# SELENIUM_PATH=/wd/hub
-#
-# MAGENTO_RESTAPI_SERVER_HOST=127.0.0.1
-# MAGENTO_RESTAPI_SERVER_PORT=32769
-#
-# TESTS_BP=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional
-# FW_BP=/Users/First_Last/GitHub/magento2-functional-testing-framework
-# TESTS_MODULE_PATH=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional/Magento/FunctionalTest
-# MODULE_WHITELIST=Magento_NewModule
-#
-#*** End of example .env ***#
-
-
-#*** Start of .env ***#
-
-#*** Set the base URL for your Magento instance ***#
-MAGENTO_BASE_URL=
-
-#*** Set the Admin Username and Password for your Magento instance ***#
-MAGENTO_BACKEND_NAME=
-MAGENTO_ADMIN_USERNAME=
-MAGENTO_ADMIN_PASSWORD=
-
-#*** Selenium Server Protocol, Host, Port, and Path, with local defaults. Uncomment and change if not running Selenium locally.
-#SELENIUM_HOST=127.0.0.1
-#SELENIUM_PORT=4444
-#SELENIUM_PROTOCOL=http
-#SELENIUM_PATH=/wd/hub
-
-#*** Uncomment and set host & port if your dev environment needs different value other than MAGENTO_BASE_URL for Rest API Requests ***#
-#MAGENTO_RESTAPI_SERVER_HOST=
-#MAGENTO_RESTAPI_SERVER_PORT=
-
-#*** Uncomment these properties to set up a dev environment with symlinked projects ***#
-#TESTS_BP=
-#FW_BP=
-#TESTS_MODULE_PATH=
-#MODULE_WHITELIST=
-#MFTF_DEBUG=true
-
-#*** End of .env ***#
\ No newline at end of file
diff --git a/dev/tests/acceptance/.gitignore b/dev/tests/acceptance/.gitignore
index de6a96d05e7e2..87ce9d4ff35d1 100755
--- a/dev/tests/acceptance/.gitignore
+++ b/dev/tests/acceptance/.gitignore
@@ -1,7 +1,11 @@
 .idea
 .env
+.htaccess
 codeception.yml
 tests/_output/*
 tests/functional.suite.yml
 tests/functional/Magento/FunctionalTest/_generated
 vendor/*
+mftf.log
+/.credentials.example
+/utils/
\ No newline at end of file
diff --git a/dev/tests/acceptance/.htaccess.sample b/dev/tests/acceptance/.htaccess.sample
new file mode 100644
index 0000000000000..e6bb9dd7ddab9
--- /dev/null
+++ b/dev/tests/acceptance/.htaccess.sample
@@ -0,0 +1,11 @@
+##############################################
+## Allow access to command.php
+    <FilesMatch "command.php">
+        <IfVersion < 2.4>
+            order allow,deny
+            allow from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all granted
+        </IfVersion>
+    </FilesMatch>
diff --git a/dev/tests/acceptance/README.md b/dev/tests/acceptance/README.md
deleted file mode 100755
index 6350b9cabcdfa..0000000000000
--- a/dev/tests/acceptance/README.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Magento Functional Testing Framework
-
-----
-
-## System Requirements
-[Magento Functional Testing Framework system requirements](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html#prepare-environment)
-
-## Installation
-To install the Magento Functional Testing Framework, see [Getting Started](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html)
-
-## Contributing
-Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
-
-To learn about how to make a contribution, click [here][1].
-
-To open an issue, click [here][2].
-
-To suggest documentation improvements, click [here][3].
-
-[1]: <http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/contribution-guidelines.html>
-[2]: <https://github.com/magento/magento2-functional-testing-framework/issues>
-[3]: <http://devdocs.magento.com>
-
-### Labels applied by the MFTF team
-
-Refer to the tables with descriptions of each label below. These labels are applied by the MFTF development team to community contributed issues and pull requests, to communicate status, impact, or which team is working on it.
-
-### Pull Request Status
-
-Label| Description
----|---
-**accept**| The pull request has been accepted and will be merged into mainline code. 
-**reject**| The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution.
-**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the pull request.
-
-### Issue Resolution Status
-
-Label| Description
----|---
-**acknowledged**| The Magento Team has validated the issue and an internal ticket has been created.
-**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request.
-**cannot reproduce**| The Magento Team has not confirmed that this issue contains the minimum required information to reproduce. 
-**non-issue**| The Magento Team has not recognised any issue according to provided information.
-
-### Domains Impacted
-
-Label| Description
----|---
-**PROD**| Affects the Product team (mostly feature requests or business logic change).
-**DOC**| Affects Documentation domain.
-**TECH**| Affects Architect Group (mostly to make decisions around technology changes).
-
-### Type
-
-Label| Description
----|---
-**bugfix**| The issue or pull request relates to bug fixing.
-**enhancement**| The issue or pull request that raises the MFTF to a higher degree (for example new features, optimization, refactoring, etc).
-
-## License
-
-Each Magento source file included in this distribution is licensed under APL 3.0
-
-Please see LICENSE_APL3.txt for the full text of the APL 3.0 license or contact license@magentocommerce.com for a copy.
diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
index d8780dc669dd5..e6e9e591bbd8b 100644
--- a/dev/tests/acceptance/RoboFile.php
+++ b/dev/tests/acceptance/RoboFile.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+use Symfony\Component\Yaml\Yaml;
+
 /** This is project's console commands configuration for Robo task runner.
  *
  * @codingStandardsIgnoreStart
@@ -13,18 +15,6 @@ class RoboFile extends \Robo\Tasks
 {
     use Robo\Task\Base\loadShortcuts;
 
-    /**
-     * Duplicate the Example configuration files used to customize the Project for customization.
-     *
-     * @return void
-     */
-    function cloneFiles()
-    {
-        $this->_exec('cp -vn .env.example .env');
-        $this->_exec('cp -vf codeception.dist.yml codeception.yml');
-        $this->_exec('cp -vf tests'. DIRECTORY_SEPARATOR .'functional.suite.dist.yml tests'. DIRECTORY_SEPARATOR .'functional.suite.yml');
-    }
-
     /**
      * Duplicate the Example configuration files for the Project.
      * Build the Codeception project.
@@ -33,21 +23,40 @@ function cloneFiles()
      */
     function buildProject()
     {
-        $this->cloneFiles();
-        $this->_exec('vendor'. DIRECTORY_SEPARATOR .'bin'. DIRECTORY_SEPARATOR .'codecept build');
+        passthru($this->getBaseCmd("build:project"));
     }
 
     /**
-     * Generate all Tests in PHP.
+     * Generate all Tests in PHP OR Generate set of tests via passing array of tests
      *
+     * @param array $tests
      * @param array $opts
-     * @return void
+     * @return \Robo\Result
      */
-    function generateTests($opts = ['config' => null])
+    function generateTests(array $tests, $opts = [
+        'config' => null,
+        'force' => false,
+        'nodes' => null,
+        'lines' => null,
+        'tests' => null
+    ])
     {
-        require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
-        \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllCestFiles($opts['config']);
-        $this->say("Generate Tests Command Run");
+        $baseCmd = $this->getBaseCmd("generate:tests");
+
+        $mftfArgNames = ['config', 'nodes', 'lines', 'tests'];
+        // append arguments to the end of the command
+        foreach ($opts as $argName => $argValue) {
+            if (in_array($argName, $mftfArgNames) && $argValue !== null) {
+                $baseCmd .= " --$argName $argValue";
+            }
+        }
+
+        // use a separate conditional for the force flag (casting bool to string in php is hard)
+        if ($opts['force']) {
+            $baseCmd .= ' --force';
+        }
+
+        return $this->taskExec($baseCmd)->args($tests)->run();
     }
 
     /**
@@ -55,62 +64,28 @@ function generateTests($opts = ['config' => null])
      *
      * @param array $args
      * @throws Exception
-     * @return void
+     * @return \Robo\Result
      */
     function generateSuite(array $args)
     {
         if (empty($args)) {
             throw new Exception("Please provide suite name(s) after generate:suite command");
         }
-
-        require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
-        $sg = \Magento\FunctionalTestingFramework\Suite\SuiteGenerator::getInstance();
-
-        foreach ($args as $arg) {
-            $sg->generateSuite($arg);
-        }
-    }
-
-    /**
-     * Run all Functional tests.
-     *
-     * @return void
-     */
-    function functional()
-    {
-        $this->_exec('.' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'codecept run functional --skip-group skip');
+        $baseCmd = $this->getBaseCmd("generate:suite");
+        return $this->taskExec($baseCmd)->args($args)->run();
     }
 
     /**
-     * Run all Tests with the specified @group tag, excluding @group 'skip'.
+     * Run all Tests with the specified @group tag'.
      *
-     * @param string $args
-     * @return void
-     */
-    function group($args = '')
-    {
-        $this->taskExec('.' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'codecept run functional --verbose --steps --skip-group skip --group')->args($args)->run();
-    }
-
-    /**
-     * Run all Functional tests located under the Directory Path provided.
-     *
-     * @param string $args
-     * @return void
-     */
-    function folder($args = '')
-    {
-        $this->taskExec('.' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'codecept run functional')->args($args)->run();
-    }
-
-    /**
-     * Run all Tests marked with the @group tag 'example'.
-     *
-     * @return void
+     * @param array $args
+     * @return \Robo\Result
      */
-    function example()
+    function group(array $args)
     {
-        $this->_exec('.' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'codecept run --group example --skip-group skip');
+        $args = array_merge($args, ['-k']);
+        $baseCmd = $this->getBaseCmd("run:group");
+        return $this->taskExec($baseCmd)->args($args)->run();
     }
 
     /**
@@ -136,58 +111,65 @@ function allure2Generate()
     /**
      * Open the HTML Allure report - Allure v1.4.X
      *
-     * @return void
+     * @return \Robo\Result
      */
     function allure1Open()
     {
-        $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
+        return $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
     }
 
     /**
      * Open the HTML Allure report - Allure v2.3.X
      *
-     * @return void
+     * @return \Robo\Result
      */
     function allure2Open()
     {
-        $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
+        return $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
     }
 
     /**
      * Generate and open the HTML Allure report - Allure v1.4.X
      *
-     * @return void
+     * @return \Robo\Result
      */
     function allure1Report()
     {
         $result1 = $this->allure1Generate();
 
         if ($result1->wasSuccessful()) {
-            $this->allure1Open();
+            return $this->allure1Open();
+        } else {
+            return $result1;
         }
     }
 
     /**
      * Generate and open the HTML Allure report - Allure v2.3.X
      *
-     * @return void
+     * @return \Robo\Result
      */
     function allure2Report()
     {
         $result1 = $this->allure2Generate();
 
         if ($result1->wasSuccessful()) {
-            $this->allure2Open();
+            return $this->allure2Open();
+        } else {
+            return $result1;
         }
     }
 
     /**
-     * Run the Pre-Install system check script.
+     * Private function for returning the formatted command for the passthru to mftf bin execution.
      *
-     * @return void
+     * @param string $command
+     * @return string
      */
-    function preInstall()
+    private function getBaseCmd($command)
     {
-        $this->_exec('php pre-install.php');
+        $this->writeln("\033[01;31m Use of robo will be deprecated with next major release, please use <root>/vendor/bin/mftf $command \033[0m");
+        chdir(__DIR__);
+        return realpath('../../../vendor/bin/mftf') . " $command";
     }
-}
+}
\ No newline at end of file
diff --git a/dev/tests/acceptance/codeception.dist.yml b/dev/tests/acceptance/codeception.dist.yml
deleted file mode 100644
index 207671b27a153..0000000000000
--- a/dev/tests/acceptance/codeception.dist.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
-actor: Tester
-paths:
-    tests: tests
-    log: tests/_output
-    data: tests/_data
-    support: vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework
-    envs: vendor/magento/magento2-functional-testing-framework/etc/_envs
-settings:
-    bootstrap: _bootstrap.php
-    colors: true
-    memory_limit: 1024M
-extensions:
-    enabled:
-        - Codeception\Extension\RunFailed
-        - Yandex\Allure\Adapter\AllureAdapter
-    config:
-        Yandex\Allure\Adapter\AllureAdapter:
-            deletePreviousResults: true
-            outputDirectory: allure-results
-            ignoredAnnotations:
-                - env
-                - zephyrId
-                - useCaseId
-params:
-    - .env
-modules:
-    config:
-        Db:
-            dsn: "%DB_DSN%"
-            user: "%DB_USERNAME%"
-            password: "%DB_PASSWORD%"
-            dump: tests/_data/dump.sql
\ No newline at end of file
diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
index a380c325a5e28..83cad123f8568 100755
--- a/dev/tests/acceptance/composer.json
+++ b/dev/tests/acceptance/composer.json
@@ -1,5 +1,4 @@
 {
-    "name": "magento/magento2ce-functional-tests",
     "description": "Magento 2 (Open Source) Functional Tests",
     "type": "project",
     "version": "1.0.0-dev",
@@ -10,26 +9,17 @@
     "config": {
         "sort-packages": true
     },
-    "repositories": [
-        {
-            "type": "git",
-            "url": "git@github.com:magento/magento2-functional-testing-framework.git"
-        }
-    ],
     "require": {
-        "allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d",
-        "codeception/codeception": "~2.3.4",
+        "php": "~7.1.3||~7.2.0",
+        "codeception/codeception": "~2.3.4 || ~2.4.0",
         "consolidation/robo": "^1.0.0",
-        "symfony/process": ">=2.7 <3.4",
-        "henrikbjorn/lurker": "^1.2",
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "vlucas/phpdotenv": "~2.4"
+        "vlucas/phpdotenv": "^2.4"
     },
     "autoload": {
         "psr-4": {
             "Magento\\": "tests/functional/Magento"
-        }
+        },
+        "files": ["tests/_bootstrap.php"]
     },
     "prefer-stable": true
 }
diff --git a/dev/tests/acceptance/composer.lock b/dev/tests/acceptance/composer.lock
new file mode 100644
index 0000000000000..8542402a98f50
--- /dev/null
+++ b/dev/tests/acceptance/composer.lock
@@ -0,0 +1,3262 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "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": "46ca2d50566f5069daef753664080c5a",
+    "packages": [
+        {
+            "name": "behat/gherkin",
+            "version": "v4.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5|~5",
+                "symfony/phpunit-bridge": "~2.7|~3",
+                "symfony/yaml": "~2.3|~3"
+            },
+            "suggest": {
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Cucumber",
+                "DSL",
+                "gherkin",
+                "parser"
+            ],
+            "time": "2016-10-30T11:50:56+00:00"
+        },
+        {
+            "name": "codeception/codeception",
+            "version": "2.3.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Codeception.git",
+                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
+                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "~4.4.0",
+                "codeception/stub": "^1.0",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "facebook/webdriver": ">=1.1.3 <2.0",
+                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
+                "guzzlehttp/psr7": "~1.0",
+                "php": ">=5.4.0 <8.0",
+                "phpunit/php-code-coverage": ">=2.2.4 <6.0",
+                "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
+                "sebastian/comparator": ">1.1 <3.0",
+                "sebastian/diff": ">=1.4 <3.0",
+                "symfony/browser-kit": ">=2.7 <5.0",
+                "symfony/console": ">=2.7 <5.0",
+                "symfony/css-selector": ">=2.7 <5.0",
+                "symfony/dom-crawler": ">=2.7 <5.0",
+                "symfony/event-dispatcher": ">=2.7 <5.0",
+                "symfony/finder": ">=2.7 <5.0",
+                "symfony/yaml": ">=2.7 <5.0"
+            },
+            "require-dev": {
+                "codeception/specify": "~0.3",
+                "facebook/graph-sdk": "~5.3",
+                "flow/jsonpath": "~0.2",
+                "monolog/monolog": "~1.8",
+                "pda/pheanstalk": "~3.0",
+                "php-amqplib/php-amqplib": "~2.4",
+                "predis/predis": "^1.0",
+                "squizlabs/php_codesniffer": "~2.0",
+                "symfony/process": ">=2.7 <5.0",
+                "vlucas/phpdotenv": "^2.4.0"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
+                "codeception/specify": "BDD-style code blocks",
+                "codeception/verify": "BDD-style assertions",
+                "flow/jsonpath": "For using JSONPath in REST module",
+                "league/factory-muffin": "For DataFactory module",
+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
+                "stecman/symfony-console-completion": "For BASH autocompletion",
+                "symfony/phpunit-bridge": "For phpunit-bridge support"
+            },
+            "bin": [
+                "codecept"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src\\Codeception",
+                    "Codeception\\Extension\\": "ext"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                }
+            ],
+            "description": "BDD-style testing framework",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "acceptance testing",
+                "functional testing",
+                "unit testing"
+            ],
+            "time": "2018-02-26T23:29:41+00:00"
+        },
+        {
+            "name": "codeception/stub",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Stub.git",
+                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
+                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
+                "shasum": ""
+            },
+            "require": {
+                "phpunit/phpunit-mock-objects": ">2.3 <7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.8 <8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+            "time": "2018-05-17T09:31:08+00:00"
+        },
+        {
+            "name": "consolidation/annotated-command",
+            "version": "2.8.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/annotated-command.git",
+                "reference": "651541a0b68318a2a202bda558a676e5ad92223c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c",
+                "reference": "651541a0b68318a2a202bda558a676e5ad92223c",
+                "shasum": ""
+            },
+            "require": {
+                "consolidation/output-formatters": "^3.1.12",
+                "php": ">=5.4.0",
+                "psr/log": "^1",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/event-dispatcher": "^2.5|^3|^4",
+                "symfony/finder": "^2.5|^3|^4"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^2",
+                "phpunit/phpunit": "^6",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\AnnotatedCommand\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Initialize Symfony Console commands from annotated command class methods.",
+            "time": "2018-05-25T18:04:25+00:00"
+        },
+        {
+            "name": "consolidation/config",
+            "version": "1.0.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/config.git",
+                "reference": "ede41d946078e97e7a9513aadc3352f1c26817af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af",
+                "reference": "ede41d946078e97e7a9513aadc3352f1c26817af",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "grasmash/expander": "^1",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^4",
+                "satooshi/php-coveralls": "^1.0",
+                "squizlabs/php_codesniffer": "2.*",
+                "symfony/console": "^2.5|^3|^4",
+                "symfony/yaml": "^2.8.11|^3|^4"
+            },
+            "suggest": {
+                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\Config\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Provide configuration services for a commandline tool.",
+            "time": "2018-05-27T01:17:02+00:00"
+        },
+        {
+            "name": "consolidation/log",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/log.git",
+                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0",
+                "psr/log": "~1.0",
+                "symfony/console": "^2.8|^3|^4"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "4.*",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
+            "time": "2018-05-25T18:14:39+00:00"
+        },
+        {
+            "name": "consolidation/output-formatters",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/output-formatters.git",
+                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
+                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/finder": "^2.5|^3|^4"
+            },
+            "require-dev": {
+                "g1a/composer-test-scenarios": "^2",
+                "phpunit/phpunit": "^5.7.27",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "^2.7",
+                "symfony/console": "3.2.3",
+                "symfony/var-dumper": "^2.8|^3|^4",
+                "victorjonsson/markdowndocs": "^1.3"
+            },
+            "suggest": {
+                "symfony/var-dumper": "For using the var_dump formatter"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\OutputFormatters\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Format text by applying transformations provided by plug-in formatters.",
+            "time": "2018-05-25T18:02:34+00:00"
+        },
+        {
+            "name": "consolidation/robo",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/Robo.git",
+                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
+                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
+                "shasum": ""
+            },
+            "require": {
+                "consolidation/annotated-command": "^2.8.2",
+                "consolidation/config": "^1.0.10",
+                "consolidation/log": "~1",
+                "consolidation/output-formatters": "^3.1.13",
+                "grasmash/yaml-expander": "^1.3",
+                "league/container": "^2.2",
+                "php": ">=5.5.0",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/event-dispatcher": "^2.5|^3|^4",
+                "symfony/filesystem": "^2.5|^3|^4",
+                "symfony/finder": "^2.5|^3|^4",
+                "symfony/process": "^2.5|^3|^4"
+            },
+            "replace": {
+                "codegyre/robo": "< 1.0"
+            },
+            "require-dev": {
+                "codeception/aspect-mock": "^1|^2.1.1",
+                "codeception/base": "^2.3.7",
+                "codeception/verify": "^0.3.2",
+                "g1a/composer-test-scenarios": "^2",
+                "goaop/framework": "~2.1.2",
+                "goaop/parser-reflection": "^1.1.0",
+                "natxet/cssmin": "3.0.4",
+                "nikic/php-parser": "^3.1.5",
+                "patchwork/jsqueeze": "~2",
+                "pear/archive_tar": "^1.4.2",
+                "phpunit/php-code-coverage": "~2|~4",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "^2.8"
+            },
+            "suggest": {
+                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
+                "natxet/CssMin": "For minifying CSS files in taskMinify",
+                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
+                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
+            },
+            "bin": [
+                "robo"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev",
+                    "dev-state": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Robo\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Davert",
+                    "email": "davert.php@resend.cc"
+                }
+            ],
+            "description": "Modern task runner",
+            "time": "2018-05-27T01:42:53+00:00"
+        },
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "homepage": "https://github.com/container-interop/container-interop",
+            "time": "2017-02-14T19:40:03+00:00"
+        },
+        {
+            "name": "dflydev/dot-access-data",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
+                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Dflydev\\DotAccessData": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Carlos Frutos",
+                    "email": "carlos@kiwing.it",
+                    "homepage": "https://github.com/cfrutos"
+                }
+            ],
+            "description": "Given a deep data structure, access data by dot notation.",
+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
+            "keywords": [
+                "access",
+                "data",
+                "dot",
+                "notation"
+            ],
+            "time": "2017-01-20T21:14:22+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
+            "name": "facebook/webdriver",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
+                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-zip": "*",
+                "php": "^5.6 || ~7.0",
+                "symfony/process": "^2.8 || ^3.1 || ^4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "jakub-onderka/php-parallel-lint": "^0.9.2",
+                "php-coveralls/php-coveralls": "^2.0",
+                "php-mock/php-mock-phpunit": "^1.1",
+                "phpunit/phpunit": "^5.7",
+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
+                "squizlabs/php_codesniffer": "^2.6",
+                "symfony/var-dumper": "^3.3 || ^4.0"
+            },
+            "suggest": {
+                "ext-SimpleXML": "For Firefox profile creation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-community": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A PHP client for Selenium WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2018-05-16T17:37:13+00:00"
+        },
+        {
+            "name": "grasmash/expander",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/grasmash/expander.git",
+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
+                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "greg-1-anderson/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^4|^5.5.4",
+                "satooshi/php-coveralls": "^1.0.2|dev-master",
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Grasmash\\Expander\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Grasmick"
+                }
+            ],
+            "description": "Expands internal property references in PHP arrays file.",
+            "time": "2017-12-21T22:14:55+00:00"
+        },
+        {
+            "name": "grasmash/yaml-expander",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/grasmash/yaml-expander.git",
+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
+                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^1.1.0",
+                "php": ">=5.4",
+                "symfony/yaml": "^2.8.11|^3|^4"
+            },
+            "require-dev": {
+                "greg-1-anderson/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^4.8|^5.5.4",
+                "satooshi/php-coveralls": "^1.0.2|dev-master",
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Grasmash\\YamlExpander\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Grasmick"
+                }
+            ],
+            "description": "Expands internal property references in a yaml file.",
+            "time": "2017-12-16T16:06:03+00:00"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.0"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.3-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2018-04-22T15:46:56+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2017-03-20T17:10:46+00:00"
+        },
+        {
+            "name": "league/container",
+            "version": "2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/container.git",
+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.2",
+                "php": "^5.4.0 || ^7.0"
+            },
+            "provide": {
+                "container-interop/container-interop-implementation": "^1.2",
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "orno/di": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Container\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Bennett",
+                    "email": "philipobenito@gmail.com",
+                    "homepage": "http://www.philipobenito.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A fast and intuitive dependency injection container.",
+            "homepage": "https://github.com/thephpleague/container",
+            "keywords": [
+                "container",
+                "dependency",
+                "di",
+                "injection",
+                "league",
+                "provider",
+                "service"
+            ],
+            "time": "2017-05-10T09:20:27+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2018-06-11T23:09:50+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^1.0.1",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "time": "2017-03-05T18:14:27+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "time": "2017-03-05T17:38:23+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "~1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2017-11-30T07:14:17+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2017-07-14T14:27:02+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.7.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2018-04-18T13:57:24+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "5.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0",
+                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^2.0.1",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^3.0",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2018-04-06T15:36:58+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2017-11-27T13:52:08+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-11-27T05:48:46+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "6.5.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/093ca5508174cd8ab8efe44fd1dde447adfdec8f",
+                "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "^1.6.1",
+                "phar-io/manifest": "^1.0.1",
+                "phar-io/version": "^1.0",
+                "php": "^7.0",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^5.3",
+                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^1.0.9",
+                "phpunit/phpunit-mock-objects": "^5.0.5",
+                "sebastian/comparator": "^2.1",
+                "sebastian/diff": "^2.0",
+                "sebastian/environment": "^3.1",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0.1"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2",
+                "phpunit/dbunit": "<3.0"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "^1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2018-07-03T06:40:40+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
+                "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.5",
+                "php": "^7.0",
+                "phpunit/php-text-template": "^1.2.1",
+                "sebastian/exporter": "^3.1"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.5"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2018-07-13T03:27:23+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14T16:28:37+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2016-10-10T12:19:37+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "2.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/diff": "^2.0 || ^3.0",
+                "sebastian/exporter": "^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2018-02-01T13:46:46+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-08-03T08:09:46+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2017-07-01T08:51:00+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2017-04-03T13:19:02+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2017-04-27T15:39:26+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-08-03T12:35:26+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "time": "2017-03-29T09:07:27+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2017-03-03T06:23:57+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "symfony/browser-kit",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "ff9ac5d5808a530b2e7f6abcf3a2412d4f9bcd62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ff9ac5d5808a530b2e7f6abcf3a2412d4f9bcd62",
+                "reference": "ff9ac5d5808a530b2e7f6abcf3a2412d4f9bcd62",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/dom-crawler": "~3.4|~4.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\BrowserKit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony BrowserKit Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-06-04T17:31:56+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
+                "reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0"
+            },
+            "suggest": {
+                "psr/log-implementation": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-07-16T14:05:40+00:00"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
+                "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-05-30T07:26:09+00:00"
+        },
+        {
+            "name": "symfony/dom-crawler",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "eb501fa8aab8c8e2db790d8d0f945697769f6c41"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/eb501fa8aab8c8e2db790d8d0f945697769f6c41",
+                "reference": "eb501fa8aab8c8e2db790d8d0f945697769f6c41",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/css-selector": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DomCrawler\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DomCrawler Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-07-05T11:54:23+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
+                "reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/stopwatch": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-07-10T11:02:47+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
+                "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-05-30T07:26:09+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
+                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-06-19T21:38:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-04-30T19:57:29+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-04-26T10:06:28+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
+                "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-05-31T10:17:53+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/80e4bfa9685fc4a09acc4a857ec16974a9cd944e",
+                "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
+            "require-dev": {
+                "symfony/console": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-05-30T07:26:09+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "time": "2017-04-07T12:08:54+00:00"
+        },
+        {
+            "name": "vlucas/phpdotenv",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/phpdotenv.git",
+                "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
+                "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "http://www.vancelucas.com"
+                }
+            ],
+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "keywords": [
+                "dotenv",
+                "env",
+                "environment"
+            ],
+            "time": "2018-07-01T10:25:50+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2018-01-29T19:49:41+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": true,
+    "prefer-lowest": false,
+    "platform": {
+        "php": "~7.1.3||~7.2.0"
+    },
+    "platform-dev": []
+}
diff --git a/dev/tests/acceptance/pre-install.php b/dev/tests/acceptance/pre-install.php
deleted file mode 100644
index 4021dc1094948..0000000000000
--- a/dev/tests/acceptance/pre-install.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * @codingStandardsIgnoreStart
- * @SuppressWarnings(PHPMD)
- */
-class CliColors {
-    private $foreground_colors = array();
-    private $background_colors = array();
-
-    public function __construct() {
-        // Set up shell colors
-        $this->foreground_colors['black'] = '0;30';
-        $this->foreground_colors['dark_gray'] = '1;30';
-        $this->foreground_colors['blue'] = '0;34';
-        $this->foreground_colors['light_blue'] = '1;34';
-        $this->foreground_colors['green'] = '0;32';
-        $this->foreground_colors['light_green'] = '1;32';
-        $this->foreground_colors['cyan'] = '0;36';
-        $this->foreground_colors['light_cyan'] = '1;36';
-        $this->foreground_colors['red'] = '0;31';
-        $this->foreground_colors['light_red'] = '1;31';
-        $this->foreground_colors['purple'] = '0;35';
-        $this->foreground_colors['light_purple'] = '1;35';
-        $this->foreground_colors['brown'] = '0;33';
-        $this->foreground_colors['yellow'] = '1;33';
-        $this->foreground_colors['light_gray'] = '0;37';
-        $this->foreground_colors['white'] = '1;37';
-
-        $this->background_colors['black'] = '40';
-        $this->background_colors['red'] = '41';
-        $this->background_colors['green'] = '42';
-        $this->background_colors['yellow'] = '43';
-        $this->background_colors['blue'] = '44';
-        $this->background_colors['magenta'] = '45';
-        $this->background_colors['cyan'] = '46';
-        $this->background_colors['light_gray'] = '47';
-    }
-
-    /**
-     * Returns colored string
-     *
-     * @param $string
-     * @param null $foreground_color
-     * @param null $background_color
-     * @return string
-     */
-    public function getColoredString($string, $foreground_color = null, $background_color = null) {
-        $colored_string = "";
-
-        // Check if given foreground color found
-        if (isset($this->foreground_colors[$foreground_color])) {
-            $colored_string .= "\033[" . $this->foreground_colors[$foreground_color] . "m";
-        }
-        // Check if given background color found
-        if (isset($this->background_colors[$background_color])) {
-            $colored_string .= "\033[" . $this->background_colors[$background_color] . "m";
-        }
-
-        // Add string and end coloring
-        $colored_string .=  $string . "\033[0m";
-
-        return $colored_string;
-    }
-
-    /**
-     * Returns all foreground color names
-     *
-     * @return array
-     */
-    public function getForegroundColors() {
-        return array_keys($this->foreground_colors);
-    }
-
-    /**
-     * Returns all background color names
-     *
-     * @return array
-     */
-    public function getBackgroundColors() {
-        return array_keys($this->background_colors);
-    }
-}
-
-/**
- * @SuppressWarnings(PHPMD)
- */
-class PreInstallCheck {
-    private $installedViaBrew             = false;
-    private $filePath                     = '';
-    private $seleniumJarVersion           = '';
-
-    private $phpWebsite                   = 'http://php.net/manual/en/install.php';
-    private $composerWebsite              = 'https://getcomposer.org/download/';
-    private $javaWebsite                  = 'https://www.java.com/en/download/';
-    private $allureCliWebsite             = 'https://docs.qameta.io/allure/latest/#_installing_a_commandline';
-    private $seleniumWebsite              = 'http://www.seleniumhq.org/download/';
-    private $chromeDriverWebsite          = 'https://sites.google.com/a/chromium.org/chromedriver/downloads';
-    private $geckoDriverWebsite           = 'https://github.com/mozilla/geckodriver';
-    private $phantomJsWebsite             = 'http://phantomjs.org/';
-
-    private $phpSupportedVersion          = '7.1.0';
-    private $composerSupportedVersion     = '1.3.0';
-    private $javaSupportedVersion         = '1.8.0';
-    private $allureCliSupportedVersion    = '2.3.0';
-    private $seleniumSupportedVersion     = '3.6.0';
-    private $chromeDriverSupportedVersion = '2.33.0';
-    private $geckoDriverSupportedVersion  = '0.19.0';
-    private $phantomJsSupportedVersion    = '2.1.0';
-
-    private $getPhpVersion;
-    private $getComposerVersion;
-    private $getJavaVersion;
-    private $getAllureCliVersion;
-    private $getSeleniumVersion;
-    private $getChromeDriverVersion;
-    private $getGeckoDriverVersion;
-    private $getPhantomJsVersion;
-
-    private $phpVersion;
-    private $composerVersion;
-    private $javaVersion;
-    private $allureCliVersion;
-    private $seleniumVersion;
-    private $chromeDriverVersion;
-    private $geckoDriverVersion;
-    private $phantomJsVersion;
-
-    private $phpStatus;
-    private $composerStatus;
-    private $javaStatus;
-    private $allureCliStatus;
-    private $seleniumStatus;
-    private $chromeDriverStatus;
-    private $geckoDriverStatus;
-    private $phantomJsStatus;
-
-    function __construct() {
-        $this->didYouInstallViaBrew();
-
-        $this->getPhpVersion = shell_exec('php --version');
-        $this->getComposerVersion           = shell_exec('composer --version');
-        $this->getJavaVersion               = shell_exec("java -version 2>&1");
-        $this->getAllureCliVersion          = shell_exec('allure --version');
-        $this->getSeleniumVersion           = $this->getSeleniumVersion();
-        $this->getChromeDriverVersion       = $this->getChromeDriverVersion();
-        $this->getGeckoDriverVersion        = shell_exec('geckodriver --version');
-        $this->getPhantomJsVersion          = $this->getPhantomJsVersion();
-
-        $this->phpVersion                   = $this->parseVersion($this->getPhpVersion);
-        $this->composerVersion              = $this->parseVersion($this->getComposerVersion);
-        $this->javaVersion                  = $this->parseJavaVersion($this->getJavaVersion);
-        $this->allureCliVersion             = $this->parseVersion($this->getAllureCliVersion);
-        $this->seleniumVersion              = $this->parseVersion($this->getSeleniumVersion);
-        $this->chromeDriverVersion          = $this->parseVersion($this->getChromeDriverVersion);
-        $this->geckoDriverVersion           = $this->parseVersion($this->getGeckoDriverVersion);
-        $this->phantomJsVersion             = $this->parseVersion($this->getPhantomJsVersion);
-
-        // String of null Versions - For Testing
-//        $this->phpVersion            = null;
-//        $this->composerVersion       = null;
-//        $this->javaVersion           = null;
-//        $this->allureCliVersion      = null;
-//        $this->seleniumVersion       = null;
-//        $this->chromeDriverVersion   = null;
-//        $this->geckoDriverVersion    = null;
-//        $this->phantomJsVersion      = null;
-
-        // String of invalid Versions - For Testing
-//        $this->phpVersion            = '7.0.0';
-//        $this->composerVersion       = '1.0.0';
-//        $this->javaVersion           = '1.0.0';
-//        $this->allureCliVersion      = '2.0.0';
-//        $this->seleniumVersion       = '3.0.0';
-//        $this->chromeDriverVersion   = '2.0.0';
-//        $this->geckoDriverVersion    = '0.0.0';
-//        $this->phantomJsVersion      = '2.0.0';
-
-        $this->phpStatus          = $this->verifyVersion('PHP', $this->phpVersion, $this->phpSupportedVersion, $this->phpWebsite);
-        $this->composerStatus     = $this->verifyVersion('Composer', $this->composerVersion, $this->composerSupportedVersion, $this->composerWebsite);
-        $this->javaStatus         = $this->verifyVersion('Java', $this->javaVersion, $this->javaSupportedVersion, $this->javaWebsite);
-        $this->allureCliStatus    = $this->verifyVersion('Allure CLI', $this->allureCliVersion, $this->allureCliSupportedVersion, $this->allureCliWebsite);
-        $this->seleniumStatus     = $this->verifyVersion('Selenium Standalone Server', $this->seleniumVersion, $this->seleniumSupportedVersion, $this->seleniumWebsite);
-        $this->chromeDriverStatus = $this->verifyVersion('ChromeDriver', $this->chromeDriverVersion, $this->chromeDriverSupportedVersion, $this->chromeDriverWebsite);
-        $this->geckoDriverStatus  = $this->verifyVersion('GeckoDriver', $this->geckoDriverVersion, $this->geckoDriverSupportedVersion, $this->geckoDriverWebsite);
-        $this->phantomJsStatus    = $this->verifyVersion('PhantomJS', $this->phantomJsVersion, $this->phantomJsSupportedVersion, $this->phantomJsWebsite);
-
-        ECHO "\n";
-        $mask = "|%-13.13s |%18.18s |%18.18s |%-23.23s |\n";
-        printf("---------------------------------------------------------------------------------\n");
-        printf($mask, ' Software', 'Supported Version', 'Installed Version', ' Status');
-        printf("---------------------------------------------------------------------------------\n");
-        printf($mask, ' PHP',          $this->phpSupportedVersion          . '+',          $this->phpVersion, ' ' . $this->phpStatus);
-        printf($mask, ' Composer',     $this->composerSupportedVersion     . '+',     $this->composerVersion, ' ' . $this->composerStatus);
-        printf($mask, ' Java',         $this->javaSupportedVersion         . '+',         $this->javaVersion, ' ' . $this->javaStatus);
-        printf($mask, ' Allure CLI',   $this->allureCliSupportedVersion    . '+',    $this->allureCliVersion, ' ' . $this->allureCliStatus);
-        printf($mask, ' Selenium',     $this->seleniumSupportedVersion     . '+',     $this->seleniumVersion, ' ' . $this->seleniumStatus);
-        printf($mask, ' ChromeDriver', $this->chromeDriverSupportedVersion . '+', $this->chromeDriverVersion, ' ' . $this->chromeDriverStatus);
-        printf($mask, ' GeckoDriver',  $this->geckoDriverSupportedVersion  . '+',  $this->geckoDriverVersion, ' ' . $this->geckoDriverStatus);
-        printf($mask, ' PhantomJS',    $this->phantomJsSupportedVersion    . '+',    $this->phantomJsVersion, ' ' . $this->phantomJsStatus);
-        printf("---------------------------------------------------------------------------------\n");
-    }
-
-    /**
-     * Ask if they installed the Browser Drivers via Brew.
-     * Brew installs things globally making them easier for us to access.
-     */
-    public function didYouInstallViaBrew()
-    {
-        ECHO "Did you install Selenium Server, ChromeDriver, GeckoDriver and PhantomJS using Brew? (y/n) ";
-        $handle1 = fopen ("php://stdin","r");
-        $line1 = fgets($handle1);
-        if (trim($line1) != 'y') {
-            ECHO "Where did you save the files? (ex /Users/first_last/Automation/) ";
-            $handle2 = fopen ("php://stdin","r");
-            $this->filePath = fgets($handle2);
-            fclose($handle2);
-
-            ECHO "Which selenium-server-standalone-X.X.X.jar file did you download? (ex 3.6.0) ";
-            $handle3 = fopen ("php://stdin","r");
-            $this->seleniumJarVersion = fgets($handle3);
-            fclose($handle3);
-            fclose($handle1);
-            ECHO "\n";
-        } else {
-            $this->installedViaBrew = true;
-            fclose($handle1);
-            ECHO "\n";
-        }
-    }
-
-    /**
-     * Parse the string that is returned for the Version number only.
-     *
-     * @param $stdout
-     * @return null
-     */
-    public function parseVersion($stdout)
-    {
-        preg_match("/\d+(?:\.\d+)+/", $stdout, $matches);
-
-        if (!is_null($matches) && isset($matches[0])) {
-            return $matches[0];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Parse the string that is returned for the Version number only.
-     * The message Java returns differs from the others hence the separate function.
-     *
-     * @param $stdout
-     * @return null
-     */
-    public function parseJavaVersion($stdout)
-    {
-        preg_match('/\"(.+?)\"/', $stdout, $output_array);
-
-        if (!is_null($output_array)) {
-            return $output_array[1];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get the Selenium Server version based on how it was installed.
-     *
-     * @return string
-     */
-    public function getSeleniumVersion()
-    {
-        $this->installedViaBrew;
-        $this->filePath;
-        $this->seleniumJarVersion;
-
-        if ($this->installedViaBrew) {
-            return shell_exec('selenium-server --version');
-        } else {
-            $command = sprintf('java -jar %s/selenium-server-standalone-%s.jar --version', $this->filePath, $this->seleniumJarVersion);
-            $command = str_replace(array("\r", "\n"), '', $command) . "\n";
-            return shell_exec($command);
-        }
-    }
-
-    /**
-     * Get the ChromeDriver version based on how it was installed.
-     *
-     * @return string
-     */
-    public function getChromeDriverVersion()
-    {
-        $this->installedViaBrew;
-        $this->filePath;
-
-        if ($this->installedViaBrew) {
-            return shell_exec('chromedriver --version');
-        } else {
-            $command = sprintf('%s/chromedriver --version', $this->filePath);
-            $command = str_replace(array("\r", "\n"), '', $command) . "\n";
-            return shell_exec($command);
-        }
-    }
-
-    /**
-     * Get the PhantomJS version based on how it was installed.
-     *
-     * @return string
-     */
-    public function getPhantomJsVersion()
-    {
-        $this->installedViaBrew;
-        $this->filePath;
-
-        if ($this->installedViaBrew) {
-            return shell_exec('phantomjs --version');
-        } else {
-            $command = sprintf('%s/phantomjs --version', $this->filePath);
-            $command = str_replace(array("\r", "\n"), '', $command) . "\n";
-            return shell_exec($command);
-        }
-    }
-
-    /**
-     * Print a "Valid Version Detected" message in color.
-     *
-     * @param $softwareName
-     */
-    public function printValidVersion($softwareName)
-    {
-        $colors = new CliColors();
-        $string = sprintf("%s detected. Version is supported!", $softwareName);
-        ECHO $colors->getColoredString($string, "black", "green") . "\n";
-    }
-
-    /**
-     * Print a "Upgraded Version Needed" message in color.
-     *
-     * @param $softwareName
-     * @param $supportedVersion
-     * @param $website
-     */
-    public function printUpgradeVersion($softwareName, $supportedVersion, $website)
-    {
-        $colors = new CliColors();
-        $string = sprintf("Unsupported version of %s detected. Please upgrade to v%s+: %s", $softwareName, $supportedVersion, $website);
-        ECHO $colors->getColoredString($string, "black", "yellow") . "\n";
-    }
-
-    /**
-     * Print a "Not Installed. Install Required." message in color.
-     *
-     * @param $softwareName
-     * @param $supportedVersion
-     * @param $website
-     */
-    public function printNoInstalledVersion($softwareName, $supportedVersion, $website)
-    {
-        $colors = new CliColors();
-        $string = sprintf("%s not detected. Please install v%s+: %s", $softwareName, $supportedVersion, $website);
-        ECHO $colors->getColoredString($string, "black", "red") . "\n";
-    }
-
-    /**
-     * Verify that the versions.
-     * Print the correct status message.
-     *
-     * @param $softwareName
-     * @param $installedVersion
-     * @param $supportedVersion
-     * @param $website
-     * @return string
-     */
-    public function verifyVersion($softwareName, $installedVersion, $supportedVersion, $website)
-    {
-        if (is_null($installedVersion)) {
-            $this->printNoInstalledVersion($softwareName, $supportedVersion, $website);
-            return 'Installation Required!';
-        } else if ($installedVersion >= $supportedVersion) {
-            $this->printValidVersion($softwareName);
-            return 'Correct Version!';
-        } else {
-            $this->printUpgradeVersion($softwareName, $supportedVersion, $website);
-            return 'Upgrade Required!';
-        }
-    }
-}
-
-$preCheck = new PreInstallCheck();
-// @codingStandardsIgnoreEnd
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/_bootstrap.php b/dev/tests/acceptance/tests/_bootstrap.php
index 4313999476197..2fa2da03d8f8b 100644
--- a/dev/tests/acceptance/tests/_bootstrap.php
+++ b/dev/tests/acceptance/tests/_bootstrap.php
@@ -4,27 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-define('PROJECT_ROOT', dirname(__DIR__));
-require_once PROJECT_ROOT . '/vendor/autoload.php';
-$RELATIVE_FW_PATH = '/vendor/magento/magento2-functional-testing-framework';
-
-//Load constants from .env file
-if (file_exists(PROJECT_ROOT . '/.env')) {
-    $env = new \Dotenv\Loader(PROJECT_ROOT . '/.env');
-    $env->load();
-
-    if (array_key_exists('TESTS_MODULE_PATH', $_ENV) xor array_key_exists('TESTS_BP', $_ENV)) {
-        throw new Exception('You must define both parameters TESTS_BP and TESTS_MODULE_PATH or neither parameter');
-    }
-
-    foreach ($_ENV as $key => $var) {
-        defined($key) || define($key, $var);
-    }
-}
-defined('FW_BP') || define('FW_BP', PROJECT_ROOT . $RELATIVE_FW_PATH);
-
-// add the debug flag here
-$debug_mode = $_ENV['MFTF_DEBUG'] ?? false;
-if (!(bool)$debug_mode && extension_loaded('xdebug')) {
-    xdebug_disable();
-}
+//TODO remove this file once MFTF is fully decoupled from Magento
+// Need to load in the root level autload file
+require_once realpath(dirname(__DIR__) . "/../../../vendor/autoload.php");
diff --git a/dev/tests/acceptance/tests/_data/LargerThan2MB.jpg b/dev/tests/acceptance/tests/_data/LargerThan2MB.jpg
new file mode 100644
index 0000000000000..eb049be8baf1a
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/LargerThan2MB.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/adobe-base.jpg b/dev/tests/acceptance/tests/_data/adobe-base.jpg
new file mode 100644
index 0000000000000..0b8fdef3cf50e
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/adobe-base.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/adobe-small.jpg b/dev/tests/acceptance/tests/_data/adobe-small.jpg
new file mode 100644
index 0000000000000..6b9f44a16d91f
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/adobe-small.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/adobe-thumb.jpg b/dev/tests/acceptance/tests/_data/adobe-thumb.jpg
new file mode 100644
index 0000000000000..31710b8e17ec6
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/adobe-thumb.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/bmp.bmp b/dev/tests/acceptance/tests/_data/bmp.bmp
new file mode 100755
index 0000000000000..285137a9e53a6
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/bmp.bmp differ
diff --git a/app/design/frontend/Magento/rush/web/css/_styles-l.less b/dev/tests/acceptance/tests/_data/empty.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from app/design/frontend/Magento/rush/web/css/_styles-l.less
rename to dev/tests/acceptance/tests/_data/empty.jpg
diff --git a/dev/tests/acceptance/tests/_data/gif.gif b/dev/tests/acceptance/tests/_data/gif.gif
new file mode 100755
index 0000000000000..0b082504ab982
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/gif.gif differ
diff --git a/dev/tests/acceptance/tests/_data/ico.ico b/dev/tests/acceptance/tests/_data/ico.ico
new file mode 100755
index 0000000000000..9ed7740904012
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/ico.ico differ
diff --git a/dev/tests/acceptance/tests/_data/jpg.jpg b/dev/tests/acceptance/tests/_data/jpg.jpg
new file mode 100755
index 0000000000000..609bbb4827ab0
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/jpg.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/large.jpg b/dev/tests/acceptance/tests/_data/large.jpg
new file mode 100755
index 0000000000000..bb0bf4079e5eb
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/large.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/lorem_ipsum.docx b/dev/tests/acceptance/tests/_data/lorem_ipsum.docx
new file mode 100644
index 0000000000000..488f64e86b6ff
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/lorem_ipsum.docx differ
diff --git a/dev/tests/acceptance/tests/_data/lorem_ipsum.txt b/dev/tests/acceptance/tests/_data/lorem_ipsum.txt
new file mode 100644
index 0000000000000..64cb8d023361a
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/lorem_ipsum.txt
@@ -0,0 +1,9 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc venenatis cursus eros, eu congue risus eleifend ut. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean aliquet mi diam, at consequat ex imperdiet eu. Nullam vulputate sollicitudin libero, tristique ullamcorper ante pretium eget. Nunc vehicula, risus ut hendrerit ornare, tortor est mattis urna, vitae egestas arcu tellus quis est. Sed mollis est sem. Aenean rhoncus ultricies sapien, id tempus elit lobortis ac. Pellentesque condimentum gravida purus a pretium. Nulla sed sapien mattis, auctor lacus quis, volutpat metus. Nunc mattis diam elit, viverra tincidunt nisl faucibus eu. Duis ac nisl tellus. Aenean eros lectus, malesuada in ex non, pharetra aliquam odio. Aenean ultricies pharetra mauris, ac rutrum quam posuere at. Phasellus et tempor turpis, ut sodales turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+
+Sed fringilla orci at elit gravida, posuere varius elit eleifend. Nam libero dui, rutrum ac massa et, dictum egestas massa. Fusce rutrum, neque vitae vestibulum mattis, magna orci dictum turpis, ut laoreet eros urna lacinia ipsum. Donec eget ultrices eros. Duis sollicitudin ante est. Maecenas semper pellentesque scelerisque. Vestibulum eu venenatis tellus. Etiam nec massa sem. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam blandit molestie justo, non euismod dolor aliquet ac. Duis consectetur enim in arcu suscipit, in tempus nisi commodo.
+
+Donec sed venenatis nunc. Proin velit leo, porta eget erat elementum, dapibus posuere odio. Nam varius lectus eu cursus tristique. Ut tempus libero vehicula, iaculis augue sit amet, vestibulum justo. Vivamus porta diam vitae malesuada vestibulum. Donec mi dolor, semper at rutrum eget, vehicula non orci. Nunc dolor urna, laoreet et egestas vitae, sodales quis ipsum. Vivamus aliquet viverra enim cursus tincidunt. Pellentesque vel laoreet mi. Aenean ut rhoncus orci. Donec a purus venenatis, tempor dolor in, facilisis ex. Sed nec metus convallis, viverra nisl nec, luctus arcu. Integer blandit arcu a est posuere pharetra.
+
+Aliquam ultricies lectus ac mauris luctus, a viverra neque rhoncus. Vestibulum id velit eu nisl efficitur lobortis. Sed id metus at ipsum imperdiet porta. Quisque in quam in turpis fermentum condimentum. Phasellus sagittis risus eu tempus scelerisque. Vivamus dapibus sem odio, vitae fermentum sem viverra et. Quisque sit amet cursus neque, vel hendrerit risus. Integer ut diam porta, volutpat risus in, iaculis diam. Suspendisse vulputate non quam et finibus.
+
+Donec blandit, sem ut posuere dignissim, dolor lorem egestas magna, vel faucibus dui metus eget orci. Nullam ipsum lacus, imperdiet at nisl sed, condimentum dignissim lectus. Nunc orci libero, tincidunt a molestie vel, dapibus at mi. Quisque scelerisque sem quis massa suscipit, sit amet suscipit arcu volutpat. In tincidunt lacus in porttitor mattis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Morbi rutrum gravida orci quis porta.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/_data/m-logo.gif b/dev/tests/acceptance/tests/_data/m-logo.gif
new file mode 100644
index 0000000000000..c0811ee78da9d
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/m-logo.gif differ
diff --git a/dev/tests/acceptance/tests/_data/magento-again.jpg b/dev/tests/acceptance/tests/_data/magento-again.jpg
new file mode 100644
index 0000000000000..c377daf8fb0b3
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento-again.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/magento-logo.png b/dev/tests/acceptance/tests/_data/magento-logo.png
new file mode 100644
index 0000000000000..cf143212303aa
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento-logo.png differ
diff --git a/dev/tests/acceptance/tests/_data/magento.png b/dev/tests/acceptance/tests/_data/magento.png
deleted file mode 100644
index f30cf4ed6134f..0000000000000
Binary files a/dev/tests/acceptance/tests/_data/magento.png and /dev/null differ
diff --git a/dev/tests/acceptance/tests/_data/magento2.jpg b/dev/tests/acceptance/tests/_data/magento2.jpg
new file mode 100644
index 0000000000000..d0b76b45d46be
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento2.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/magento3.jpg b/dev/tests/acceptance/tests/_data/magento3.jpg
new file mode 100644
index 0000000000000..79ed12ec0aea4
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento3.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/magentoStage.jpg b/dev/tests/acceptance/tests/_data/magentoStage.jpg
new file mode 100644
index 0000000000000..87c0f792c7982
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magentoStage.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/medium.jpg b/dev/tests/acceptance/tests/_data/medium.jpg
new file mode 100755
index 0000000000000..90fe0aa0fb798
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/medium.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/png.png b/dev/tests/acceptance/tests/_data/png.png
new file mode 100755
index 0000000000000..c83255dcf558d
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/png.png differ
diff --git a/dev/tests/acceptance/tests/_data/small.jpg b/dev/tests/acceptance/tests/_data/small.jpg
new file mode 100755
index 0000000000000..0f69f526b5f11
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/small.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/svg.svg b/dev/tests/acceptance/tests/_data/svg.svg
new file mode 100755
index 0000000000000..a0f85579e39a5
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/svg.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="298.367px" height="298.365px" viewBox="0 0 298.367 298.365" enable-background="new 0 0 298.367 298.365"
+	 xml:space="preserve">
+<g>
+	<path fill="#13110C" d="M131.233,193.113H75.177c-24.224,0-43.931-19.708-43.931-43.932s19.707-43.93,43.931-43.93h56.056v-30
+		H75.177c-40.831,0-73.931,33.1-73.931,73.93c0,40.832,33.1,73.932,73.931,73.932h56.056V193.113z"/>
+	<path fill="#13110C" d="M224.222,75.252h-57.088v30h57.088c24.224,0,43.931,19.706,43.931,43.93s-19.707,43.932-43.931,43.932
+		h-57.088v30h57.088c40.831,0,73.931-33.1,73.931-73.932C298.152,108.351,265.053,75.252,224.222,75.252z"/>
+</g>
+<g>
+	<path fill="#13110C" d="M192.391,164.182h-86.414c-8.284,0-15-6.716-15-15s6.716-15,15-15h86.414c8.284,0,15,6.716,15,15
+		S200.675,164.182,192.391,164.182z"/>
+</g>
+<script type="text/javascript">
+    alert('This app is probably vulnerable to XSS attacks!');
+  </script>
+</svg>
diff --git a/dev/tests/acceptance/tests/_data/test-IMAGE_123,456.789.jpg b/dev/tests/acceptance/tests/_data/test-IMAGE_123,456.789.jpg
new file mode 100644
index 0000000000000..c377daf8fb0b3
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/test-IMAGE_123,456.789.jpg differ
diff --git a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
new file mode 100644
index 0000000000000..65c2bb7004503
--- /dev/null
+++ b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+    <suite name="WYSIWYGDisabledSuite">
+        <before>
+            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled disabled" />
+        </before>
+        <include>
+            <group name="WYSIWYGDisabled"/>
+        </include>
+        <exclude>
+            <group name="skip"/>
+        </exclude>
+        <after>
+            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled enabled" />
+        </after>
+    </suite>
+</suites>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/_suite/sampleSuite.xml b/dev/tests/acceptance/tests/_suite/sampleSuite.xml
deleted file mode 100644
index 4172b526683d7..0000000000000
--- a/dev/tests/acceptance/tests/_suite/sampleSuite.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
-    <suite name="mySuite">
-        <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <required-entity createDataKey="createCategory"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData stepKey="deleteMyProduct" createDataKey="createProduct"/>
-            <deleteData stepKey="deleteMyCategory" createDataKey="createCategory"/>
-        </after>
-        <include>
-            <group name="example"/>
-            <cest test="PersistMultipleEntitiesTest"  name="PersistMultipleEntitiesCest"/>
-            <module name="SampleTests" file="SampleCest.xml"/>
-        </include>
-        <exclude>
-            <group name="testGroup"/>
-        </exclude>
-    </suite>
-</suites>
diff --git a/dev/tests/acceptance/tests/_suite/suite.xml.sample b/dev/tests/acceptance/tests/_suite/suite.xml.sample
new file mode 100644
index 0000000000000..4c6a78afd40d0
--- /dev/null
+++ b/dev/tests/acceptance/tests/_suite/suite.xml.sample
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+    <suite name="sample">
+        <before>
+            <createData entity="defaultCategory" stepKey="createCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+        <include>
+            <module name="Catalog" />
+            <group name="login" />
+        </include>
+        <exclude>
+            <test name="AddImageToWYSIWYGCatalogEditor"/>
+            <module name="Catalog" file="AdminCreateCategoryTest.xml" />
+        </exclude>
+    </suite>
+</suites>
diff --git a/dev/tests/acceptance/tests/functional.suite.dist.yml b/dev/tests/acceptance/tests/functional.suite.dist.yml
deleted file mode 100644
index 432151bdf565c..0000000000000
--- a/dev/tests/acceptance/tests/functional.suite.dist.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
-
-# Codeception Test Suite Configuration
-#
-# Suite for acceptance tests.
-# Perform tests in browser using the WebDriver or PhpBrowser.
-# If you need both WebDriver and PHPBrowser tests - create a separate suite.
-
-class_name: AcceptanceTester
-namespace: Magento\FunctionalTestingFramework
-modules:
-    enabled:
-        - \Magento\FunctionalTestingFramework\Module\MagentoWebDriver
-        - \Magento\FunctionalTestingFramework\Helper\Acceptance
-        - \Magento\FunctionalTestingFramework\Helper\MagentoFakerData
-        - \Magento\FunctionalTestingFramework\Module\MagentoRestDriver:
-            url: "%MAGENTO_BASE_URL%/rest/default/V1/"
-            username: "%MAGENTO_ADMIN_USERNAME%"
-            password: "%MAGENTO_ADMIN_PASSWORD%"
-            depends: PhpBrowser
-            part: Json
-        - \Magento\FunctionalTestingFramework\Module\MagentoSequence
-        - Asserts
-    config:
-        \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
-            url: "%MAGENTO_BASE_URL%"
-            backend_name: "%MAGENTO_BACKEND_NAME%"
-            browser: 'chrome'
-            window_size: maximize
-            username: "%MAGENTO_ADMIN_USERNAME%"
-            password: "%MAGENTO_ADMIN_PASSWORD%"
-            pageload_timeout: 30
-            host: %SELENIUM_HOST%
-            port: %SELENIUM_PORT%
-            protocol: %SELENIUM_PROTOCOL%
-            path: %SELENIUM_PATH%
-            capabilities:
-              chromeOptions:
-                args: ["--start-maximized", "--disable-extensions", "--enable-automation"]
-
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md
deleted file mode 100644
index c9275af071fa4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_AdminNotification** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json
deleted file mode 100644
index 31ce654f6c780..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-admin-notification",
-    "description": "Magento 2 Functional Test Module Admin Notification",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\AdminNotification\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md
deleted file mode 100644
index 2f01efe59522b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_AdvancedPricingImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json
deleted file mode 100644
index 7cba5e091bc0a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-advanced-pricing-import-export",
-    "description": "Magento 2 Functional Test Module Advanced Pricing Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\AdvancedPricingImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md
deleted file mode 100644
index 56c1d77deeed0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_Analytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json
deleted file mode 100644
index 9245dc6e40766..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-analytics",
-    "description": "Magento 2 Acceptance Test Module Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Analytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Analytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md
deleted file mode 100644
index c21edf02d3bc2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Authorization** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json
deleted file mode 100644
index e69220b9ca44d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-authorization",
-    "description": "Magento 2 Functional Test Module Authorization",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Authorization\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md
deleted file mode 100644
index c3a550699f661..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Authorizenet** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json
deleted file mode 100644
index 9b67e3ea37154..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-authorizenet",
-    "description": "Magento 2 Functional Test Module Authorizenet",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Authorizenet\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
deleted file mode 100644
index fbce6aa6388dd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminLoginCest">
-        <annotations>
-            <features value="Admin Login"/>
-            <stories value="Login on the Admin Login page"/>
-        </annotations>
-        <test name="LoginAsAdmin">
-            <annotations>
-                <title value="You should be able to log into the Magento Admin backend."/>
-                <description value="You should be able to log into the Magento Admin backend."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-71572"/>
-                <group value="example"/>
-                <group value="login"/>
-            </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
-            <seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackenedData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackenedData.xml
deleted file mode 100644
index 43bd1ad96f173..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackenedData.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="backendDataOne" type="backend">
-        <data key="backendConfigName">data</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.xml
deleted file mode 100644
index 6dd9f1334f7a9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminLoginPage" url="admin/admin" module="Magento_Backend">
-        <section name="AdminLoginFormSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md
deleted file mode 100644
index 0a7d14223c0b2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Backend** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
deleted file mode 100644
index 762aa002492cf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminLoginFormSection">
-        <element name="username" type="input" selector="#username"/>
-        <element name="password" type="input" selector="#login"/>
-        <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
deleted file mode 100644
index 591731f53e0a8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../../../../magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminMessagesSection">
-        <element name="test" type="input" selector=".test"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json
deleted file mode 100644
index ffebc321c4dee..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-backend",
-    "description": "Magento 2 Functional Test Module Backend",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backup": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-developer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-security": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-translation": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Backend\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md
deleted file mode 100644
index dc2a3ab06f9d3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Backup** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json
deleted file mode 100644
index d4f0c49d2b1a8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-backup",
-    "description": "Magento 2 Functional Test Module Backup",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cron": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Backup\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml
deleted file mode 100644
index 0beed525e6659..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="SampleBraintreeConfig" type="braintree_config_state">
-        <required-entity type="title">SampleTitle</required-entity>
-        <required-entity type="payment_action">SamplePaymentAction</required-entity>
-        <required-entity type="environment">SampleEnvironment</required-entity>
-        <required-entity type="merchant_id">SampleMerchantId</required-entity>
-        <required-entity type="public_key">SamplePublicKey</required-entity>
-        <required-entity type="private_key">SamplePrivateKey</required-entity>
-    </entity>
-    <entity name="SampleTitle" type="title">
-        <data key="value">Sample Braintree Config</data>
-    </entity>
-    <entity name="SamplePaymentAction" type="payment_action">
-        <data key="value">authorize</data>
-    </entity>
-    <entity name="SampleEnvironment" type="environment">
-        <data key="value">sandbox</data>
-    </entity>
-    <entity name="SampleMerchantId" type="merchant_id">
-        <data key="value">someMerchantId</data>
-    </entity>
-    <entity name="SamplePublicKey" type="public_key">
-        <data key="value">somePublicKey</data>
-    </entity>
-    <entity name="SamplePrivateKey" type="private_key">
-        <data key="value">somePrivateKey</data>
-    </entity>
-
-    <!-- default configuration used to restore Magento config -->
-    <entity name="DefaultBraintreeConfig" type="braintree_config_state">
-        <required-entity type="title">DefaultTitle</required-entity>
-        <required-entity type="payment_action">DefaultPaymentAction</required-entity>
-        <required-entity type="environment">DefaultEnvironment</required-entity>
-        <required-entity type="merchant_id">DefaultMerchantId</required-entity>
-        <required-entity type="public_key">DefaultPublicKey</required-entity>
-        <required-entity type="private_key">DefaultPrivateKey</required-entity>
-    </entity>
-    <entity name="DefaultTitle" type="title">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultPaymentAction" type="payment_action">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultEnvironment" type="environment">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultMerchantId" type="merchant_id">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultPublicKey" type="public_key">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultPrivateKey" type="private_key">
-        <data key="value"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml
deleted file mode 100644
index d450c0ddf011e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
-        <object key="groups" dataType="braintree_config_state">
-            <object key="braintree_section" dataType="braintree_config_state">
-                <object key="groups" dataType="braintree_config_state">
-                    <object key="braintree" dataType="braintree_config_state">
-                        <object key="groups" dataType="braintree_config_state">
-                            <object key="braintree_required" dataType="braintree_config_state">
-                                <object key="fields" dataType="braintree_config_state">
-                                    <object key="title" dataType="title">
-                                        <field key="value">string</field>
-                                    </object>
-                                    <object key="environment" dataType="environment">
-                                        <field key="value">string</field>
-                                    </object>
-                                    <object key="payment_action" dataType="payment_action">
-                                        <field key="value">string</field>
-                                    </object>
-                                    <object key="merchant_id" dataType="merchant_id">
-                                        <field key="value">string</field>
-                                    </object>
-                                    <object key="public_key" dataType="public_key">
-                                        <field key="value">string</field>
-                                    </object>
-                                    <object key="private_key" dataType="private_key">
-                                        <field key="value">string</field>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md
deleted file mode 100644
index b0b637c9d9621..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Braintree** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json
deleted file mode 100644
index e66481c501f06..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-braintree",
-    "description": "Magento 2 Functional Test Module Braintree",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-instant-purchase": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-paypal": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-vault": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Braintree\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md
deleted file mode 100644
index 9579aec287f4c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Bundle** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
deleted file mode 100644
index cab7dce6a95e5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-bundle",
-    "description": "Magento 2 Functional Test Module Bundle",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Bundle\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md
deleted file mode 100644
index dc155d12f30db..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_BundleImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json
deleted file mode 100644
index 9fd81822a1803..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-bundle-import-export",
-    "description": "Magento 2 Functional Test Module Bundle Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-bundle": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\BundleImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md
deleted file mode 100644
index 47571bdb7f212..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CacheInvalidate** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json
deleted file mode 100644
index e8c58ac7a2d0a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cache-invalidate",
-    "description": "Magento 2 Functional Test Module Cache Invalidate",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CacheInvalidate\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md
deleted file mode 100644
index f0d35613be75d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Captcha** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json
deleted file mode 100644
index 5c3f0acfc8fcb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-captcha",
-    "description": "Magento 2 Functional Test Module Captcha",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Captcha\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/ConfigWYSIWYGActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/ConfigWYSIWYGActionGroup.xml
deleted file mode 100644
index 84f36ccaba2be..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/ConfigWYSIWYGActionGroup.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <actionGroup name="EnabledWYSIWYG">
-        <amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
-        <waitForPageLoad stepKey="wait1"/>
-        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
-        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
-        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="selectOption1"/>
-        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
-        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-    </actionGroup>
-    <actionGroup name="DisabledWYSIWYG">
-        <amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
-        <waitForPageLoad stepKey="wait3"/>
-        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" />
-        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
-        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Disabled Completely" stepKey="selectOption2"/>
-        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
-        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-    </actionGroup>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/LoginActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/LoginActionGroup.xml
deleted file mode 100644
index f4170335d4086..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/LoginActionGroup.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <actionGroup name="LoginActionGroup">
-        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-        <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
-        <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
-        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-    </actionGroup>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml
deleted file mode 100644
index 1d12792785104..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateCategoryCest">
-        <annotations>
-            <features value="Category Creation"/>
-            <stories value="Create a Category via the Admin"/>
-        </annotations>
-        <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-        <test name="CreateCategoryViaAdmin">
-            <annotations>
-                <title value="You should be able to create a Category in the admin back-end."/>
-                <description value="You should be able to create a Category in the admin back-end."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-72102"/>
-                <group value="category"/>
-            </annotations>
-            <loginAsAdmin stepKey="loginAsAdmin"/>
-            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
-            <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
-            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
-            <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
-            <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="enterURLKey"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
-            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
-
-            <!-- Literal URL below, need to refactor line + StorefrontCategoryPage when support for variable URL is implemented-->
-            <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
-            <seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertTitle"/>
-            <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="assertInfo1"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml
deleted file mode 100644
index 9152549cb73a8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateSimpleProductCest.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateSimpleProductCest">
-        <annotations>
-            <features value="Product Creation"/>
-            <stories value="Create a Simple Product via Admin"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-        </before>
-        <test name="CreateSimpleProductViaAdmin">
-            <annotations>
-                <title value="You should be able to create a Simple Product in the admin back-end."/>
-                <description value="You should be able to create a Simple Product in the admin back-end."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-23414"/>
-                <group value="product"/>
-            </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-            <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-            <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
-            <!--<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createPreReqCategory.name$$]" stepKey="searchAndSelectCategory"/>-->
-            <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-            <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
-            <seeInField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
-            <seeInField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
-            <seeInField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
-            <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
-            <seeInField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
-
-            <!-- Go to storefront category page, assert product visibility -->
-            <amOnPage url="{{StorefrontCategoryPage.url($$createPreReqCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
-            <see userInput="{{_defaultProduct.price}}" stepKey="assertProductPricePresent"/>
-
-            <!-- Go to storefront product page, assert product visibility -->
-            <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
-            <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
-            <see userInput="{{_defaultProduct.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
-            <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
-        </test>
-        <after>
-            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyDefaultWYSIWYGToolbarOnProducCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyDefaultWYSIWYGToolbarOnProducCest.xml
deleted file mode 100644
index f4e7a84c84ba7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyDefaultWYSIWYGToolbarOnProducCest.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="VerifyDefaultWYSIWYGToolbarOnProducCest">
-        <annotations>
-            <features value="Default WYSIWYG toolbar configuration in Magento"/>
-            <stories value="Default toolbar configuration in Magento-MAGETWO-70412"/>
-            <group value="WYSIWYG"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <env value="phantomjs"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="Verifydefaultcontrolsonproductdescription">
-            <annotations>
-                <title value="You should be able to see default toolbar display on Description content area"/>
-                <description value="You should be able to see default toolbar display on Description content area"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-80505"/>
-            </annotations>
-            <amOnPage url="{{AdminProductEditPage(simple)}}" stepKey="navigateToProduct"/>
-            <waitForPageLoad stepKey="wait"/>
-            <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitforTinyMCE4Visible1"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4Description" />
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Style}}" stepKey="assertInfo2"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Bold}}" stepKey="assertInfo3"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Italic}}" stepKey="assertInfo4"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Underline}}" stepKey="assertInfo5"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.AlignLeft}}" stepKey="assertInfo6"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.AlignCenter}}" stepKey="assertInfo7"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.AlignRight}}" stepKey="assertInfo8"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Numlist}}" stepKey="assertInfo9"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.Bullet}}" stepKey="assertInfo10"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertLink}}" stepKey="assertInfo11"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="assertInf12"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertTable}}" stepKey="assertInfo13"/>
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.SpecialCharacter}}" stepKey="assertInfo14"/>
-        </test>
-        <test name="Verifydefaultcontrolsonproductshortdescription">
-            <annotations>
-                <title value="You should be able to see default toolbar display on Short Description content area"/>
-                <description value="You should be able to see default toolbar display on Short Description content area"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-80505"/>
-            </annotations>
-            <amOnPage url="{{AdminProductEditPage(simple)}}" stepKey="navigateToProduct"/>
-            <waitForPageLoad stepKey="wait"/>
-            <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitforTinyMCE4Visible2"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4ShortDescription" />
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Style}}" stepKey="assertInfo16"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Bold}}" stepKey="assertInfo17"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Italic}}" stepKey="assertInfo18"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Underline}}" stepKey="assertInfo19"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.AlignLeft}}" stepKey="assertInfo20"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.AlignCenter}}" stepKey="assertInfo21"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.AlignRight}}" stepKey="assertInfo22"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Numlist}}" stepKey="assertInfo23"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Bullet}}" stepKey="assertInfo324"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertLink}}" stepKey="assertInfo25"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="assertInfo26"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertTable}}" stepKey="assertInfo27"/>
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.SpecialCharacter}}" stepKey="assertInfo27"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disabledWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogCest.xml
deleted file mode 100644
index c7b152beefef6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogCest.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogCest">
-        <annotations>
-            <features value="TinyMCEv4"/>
-            <stories value="Apply new WYSIWYG on Categories Page-MAGETWO-72137"/>
-            <group value="WYSIWYG"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <env value="phantomjs"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="DefaultTinyMCEv4onCatalogPage">
-            <annotations>
-                <title value="Admin see TinyMCEv4.6 is native WYSIWYG on Catalog Page"/>
-                <description value="Admin see TinyMCEv4.6 is native WYSIWYG on Catalog Page"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-82551"/>
-            </annotations>
-            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToNewCatalog"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <waitForLoadingMaskToDisappear stepKey="wait2" />
-            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
-            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
-            <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
-            <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
-            <seeElement selector="{{CatalogWYSIWYGSection.ShowHideBtn}}" stepKey="seeShowHideBtn" />
-            <seeElement selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="TinyMCE4" />
-            <seeElement selector="{{CatalogWYSIWYGSection.Style}}" stepKey="assertInfo2"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.Bold}}" stepKey="assertInfo3"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.Italic}}" stepKey="assertInfo4"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.Underline}}" stepKey="assertInfo5"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.AlignLeft}}" stepKey="assertInfo6"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.AlignCenter}}" stepKey="assertInfo7"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.AlignRight}}" stepKey="assertInfo8"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.Numlist}}" stepKey="assertInfo9"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.Bullet}}" stepKey="assertInfo10"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.InsertLink}}" stepKey="assertInfo11"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.InsertImage}}" stepKey="assertInf12"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.InsertTable}}" stepKey="assertInfo13"/>
-            <seeElement selector="{{CatalogWYSIWYGSection.SpecialCharacter}}" stepKey="assertInfo14"/>
-            <executeJS function="tinyMCE.get('category_form_description').setContent('Hello World!');" stepKey="executeJSFillContent"/>
-            <click selector="{{CatalogWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="waitForInsertImage" />
-            <seeElement selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="insertImage"/>
-            <dontSee selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="insertWidget" />
-            <dontSee selector="{{CmsWYSIWYGSection.InsertVariableBtn}}" stepKey="insertVariable" />
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
-            <!-- Go to storefront product page, assert product content -->
-            <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <see userInput="Hello World!" selector="{{StorefrontCategoryMainSection.CatalogDescription}}" stepKey="assertCatalogDescription"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disabledWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnProductCest.xml
deleted file mode 100644
index 8da1c6b9eabf4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnProductCest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="VerifyTinyMCEv4IsNativeWYSIWYGOnProductCest">
-        <annotations>
-            <features value="TinyMCEv4"/>
-            <stories value="TinyMCE v4.6 as a native WYSIWYG editor extension-MAGETWO-72114"/>
-            <group value="WYSIWYG"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <env value="phantomjs"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="DefaultTinyMCEv4onProductPage">
-            <annotations>
-                <title value="Admin see TinyMCEv4.6 is native WYSIWYG on Product Page"/>
-                <description value="Admin should be able to switch between 2 version of Tinymce in the admin back-end."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-81819"/>
-            </annotations>
-            <amOnPage url="{{AdminProductEditPage.url}}" stepKey="navigateToNewProduct"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
-            <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
-            <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="TinyMCE4Description" />
-            <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForShortDescription" />
-            <seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.TinyMCE4}}"  stepKey="TinyMCE4ShortDescription" />
-            <executeJS function="tinyMCE.get('product_form_description').setContent('Hello World!');" stepKey="executeJSFillContent1"/>
-            <executeJS function="tinyMCE.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
-            <click selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn1" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="waitForInsertImage1" />
-            <see selector="{{CmsWYSIWYGSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage1"/>
-            <dontSee selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="insertWidget1" />
-            <dontSee selector="{{CmsWYSIWYGSection.InsertVariableBtn}}" stepKey="insertVariable1" />
-            <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn2" />
-            <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" stepKey="waitForInsertImage2" />
-            <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage2"/>
-            <dontSee selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="insertWidget2" />
-            <dontSee selector="{{CmsWYSIWYGSection.InsertVariableBtn}}" stepKey="insertVariable2" />
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-            <!-- Go to storefront product page, assert product content -->
-            <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <see userInput="Hello World!" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
-            <see userInput="Hello World! Short Content" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disabledWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
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
deleted file mode 100644
index 67413dc4756f3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="_defaultCategory" type="category">
-        <data key="name" unique="suffix">simpleCategory</data>
-        <data key="name_lwr" unique="suffix">simplecategory</data>
-        <data key="is_active">true</data>
-    </entity>
-    <entity name="SimpleSubCategory" type="category">
-        <data key="name" unique="suffix">SimpleSubCategory</data>
-        <data key="name_lwr" unique="suffix">simplesubcategory</data>
-        <data key="is_active">true</data>
-        <data key="include_in_menu">true</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
deleted file mode 100644
index 5319df4773a0b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="CustomAttributeCategoryUrlKey" type="custom_attribute">
-        <data key="attribute_code">url_key</data>
-        <data key="value" unique="suffix">category</data>
-    </entity>
-    <entity name="CustomAttributeProductUrlKey" type="custom_attribute">
-        <data key="attribute_code">url_key</data>
-        <data key="value" unique="suffix">product</data>
-    </entity>
-    <entity name="CustomAttributeCategoryIds" type="custom_attribute_array">
-        <data key="attribute_code">category_ids</data>
-        <var key="value" entityType="category" entityKey="id"/>
-    </entity>
-    <entity name="CustomAttributeProductAttribute" type="custom_attribute">
-        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-        <var key="value" entityKey="value" entityType="ProductAttributeOption"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/FrontendLabelData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/FrontendLabelData.xml
deleted file mode 100644
index 5cd129297e0fb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/FrontendLabelData.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="ProductAttributeFrontendLabel" type="FrontendLabel">
-        <data key="store_id">0</data>
-        <data key="label" unique="suffix">attribute</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
deleted file mode 100644
index 118b93a0219fa..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="productAttributeWithTwoOptions" type="ProductAttribute">
-        <data key="attribute_code" unique="suffix">attribute</data>
-        <data key="frontend_input">select</data>
-        <data key="scope">global</data>
-        <data key="is_required">false</data>
-        <data key="is_unique">false</data>
-        <data key="is_searchable">true</data>
-        <data key="is_visible">true</data>
-        <data key="is_visible_in_advanced_search">true</data>
-        <data key="is_visible_on_front">true</data>
-        <data key="is_filterable">true</data>
-        <data key="is_filterable_in_search">true</data>
-        <data key="used_in_product_listing">true</data>
-        <data key="is_used_for_promo_rules">true</data>
-        <data key="is_comparable">true</data>
-        <data key="is_used_in_grid">true</data>
-        <data key="is_visible_in_grid">true</data>
-        <data key="is_filterable_in_grid">true</data>
-        <data key="used_for_sort_by">true</data>
-        <required-entity type="FrontendLabel">ProductAttributeFrontendLabel</required-entity>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeOptionData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeOptionData.xml
deleted file mode 100644
index 3f75639c21ab7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeOptionData.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="productAttributeOption1" type="ProductAttributeOption">
-        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-        <data key="label" unique="suffix">option1</data>
-        <data key="is_default">false</data>
-        <data key="sort_order">0</data>
-        <required-entity type="StoreLabel">Option1Store0</required-entity>
-        <required-entity type="StoreLabel">Option1Store1</required-entity>
-    </entity>
-    <entity name="productAttributeOption2" type="ProductAttributeOption">
-        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-        <data key="label" unique="suffix">option2</data>
-        <data key="is_default">true</data>
-        <data key="sort_order">1</data>
-        <required-entity type="StoreLabel">Option2Store0</required-entity>
-        <required-entity type="StoreLabel">Option2Store1</required-entity>
-    </entity>
-    <entity name="ProductAttributeOptionGetter" type="ProductAttributeOption">
-        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeSetData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeSetData.xml
deleted file mode 100644
index fca2c8ec569d6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeSetData.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="AddToDefaultSet" type="ProductAttributeSet">
-        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
-        <data key="attributeSetId">4</data>
-        <data key="attributeGroupId">7</data>
-        <data key="sortOrder">0</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductConfigurableAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductConfigurableAttributeData.xml
deleted file mode 100644
index ba472fc91b809..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductConfigurableAttributeData.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="colorProductAttribute" type="product_attribute">
-        <data key="default_label" unique="suffix">Color</data>
-        <data key="attribute_quantity">1</data>
-    </entity>
-    <entity name="colorProductAttribute1" type="product_attribute">
-        <data key="name" unique="suffix">White</data>
-        <data key="price">1.00</data>
-    </entity>
-    <entity name="colorProductAttribute2" type="product_attribute">
-        <data key="name" unique="suffix">Red</data>
-        <data key="price">2.00</data>
-    </entity>
-    <entity name="colorProductAttribute3" type="product_attribute">
-        <data key="name" unique="suffix">Blue</data>
-        <data key="price">3.00</data>
-    </entity>
-</config>
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
deleted file mode 100644
index 903915b76abaf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="_defaultProduct" type="product">
-        <data key="sku" unique="suffix">testSku</data>
-        <data key="type_id">simple</data>
-        <data key="attribute_set_id">4</data>
-        <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductName</data>
-        <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
-        <data key="status">1</data>
-        <data key="quantity">100</data>
-        <required-entity type="product_extension_attribute">EavStockItem</required-entity>
-        <required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
-    </entity>
-    <entity name="SimpleProduct" type="product">
-        <data key="sku" unique="suffix">SimpleProduct</data>
-        <data key="type_id">simple</data>
-        <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
-        <data key="price">123.00</data>
-        <data key="visibility">4</data>
-        <data key="status">1</data>
-        <required-entity type="product_extension_attribute">EavStockItem</required-entity>
-        <required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
-    </entity>
-    <entity name="NewSimpleProduct" type="product">
-        <data key="price">321.00</data>
-    </entity>
-    <entity name="SimpleOne" type="product2">
-        <data key="sku" unique="suffix">SimpleOne</data>
-        <data key="type_id">simple</data>
-        <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
-        <data key="price">1.23</data>
-        <data key="visibility">4</data>
-        <data key="status">1</data>
-        <required-entity type="product_extension_attribute">EavStockItem</required-entity>
-        <required-entity type="custom_attribute">CustomAttributeProductAttribute</required-entity>
-    </entity>
-    <entity name="ImageUpload" type="uploadImage">
-        <data key="title" unique="suffix">Image1</data>
-        <data key="price">1.00</data>
-        <data key="file_type">Upload File</data>
-        <data key="shareable">Yes</data>
-        <data key="file">logo.png</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml
deleted file mode 100644
index 199c945cd8761..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="EavStockItem" type="product_extension_attribute">
-        <required-entity type="stock_item">Qty_1000</required-entity>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml
deleted file mode 100644
index 6caf6ec9fd321..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="Qty_1000" type="stock_item">
-        <data key="qty">1000</data>
-        <data key="is_in_stock">true</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StoreLabelData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StoreLabelData.xml
deleted file mode 100644
index c362f81eb2eff..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StoreLabelData.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="Option1Store0" type="StoreLabel">
-        <data key="store_id">0</data>
-        <data key="label">option1</data>
-    </entity>
-    <entity name="Option1Store1" type="StoreLabel">
-        <data key="store_id">1</data>
-        <data key="label">option1</data>
-    </entity>
-    <entity name="Option2Store0" type="StoreLabel">
-        <data key="store_id">0</data>
-        <data key="label">option2</data>
-    </entity>
-    <entity name="Option2Store1" type="StoreLabel">
-        <data key="store_id">1</data>
-        <data key="label">option2</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/empty_extension_attribute-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/empty_extension_attribute-meta.xml
deleted file mode 100644
index 76c3e39bd6f31..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/empty_extension_attribute-meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="create">
-    </operation>
-    <operation name="UpdateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="update">
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/frontend_label-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/frontend_label-meta.xml
deleted file mode 100644
index 90e717019c0ec..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/frontend_label-meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateFrontendLabel" dataType="FrontendLabel" type="create">
-        <field key="store_id">integer</field>
-        <field key="label">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
deleted file mode 100644
index 2a478c3ee51bc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateProduct" dataType="product" type="create" auth="adminOauth" url="/V1/products" method="POST">
-        <contentType>application/json</contentType>
-        <object dataType="product" key="product">
-            <field key="sku">string</field>
-            <field key="name">string</field>
-            <field key="attribute_set_id">integer</field>
-            <field key="price">integer</field>
-            <field key="status">integer</field>
-            <field key="visibility">integer</field>
-            <field key="type_id">string</field>
-            <field key="created_at">string</field>
-            <field key="updated_at">string</field>
-            <field key="weight">integer</field>
-            <field key="extension_attributes">product_extension_attribute</field>
-            <array key="product_links">
-                <value>product_link</value>
-            </array>
-            <array key="custom_attributes">
-                <value>custom_attribute_array</value>
-            </array>
-            <array key="options">
-                <value>product_option</value>
-            </array>
-        </object>
-    </operation>
-    <operation name="UpdateProduct" dataType="product" type="update" auth="adminOauth" url="/V1/products/{sku}" method="PUT">
-        <contentType>application/json</contentType>
-        <object dataType="product" key="product">
-            <field key="id">integer</field>
-            <field key="sku">string</field>
-            <field key="name">string</field>
-            <field key="attribute_set_id">integer</field>
-            <field key="price">integer</field>
-            <field key="status">integer</field>
-            <field key="visibility">integer</field>
-            <field key="type_id">string</field>
-            <field key="created_at">string</field>
-            <field key="updated_at">string</field>
-            <field key="weight">integer</field>
-            <field key="extension_attributes">product_extension_attribute</field>
-            <array key="product_links">
-                <value>product_link</value>
-            </array>
-            <array key="custom_attributes">
-                <value>custom_attribute_array</value>
-            </array>
-            <array key="options">
-                <value>product_option</value>
-            </array>
-        </object>
-        <field key="saveOptions">boolean</field>
-    </operation>
-    <operation name="deleteProduct" dataType="product" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
-        <contentType>application/json</contentType>
-    </operation>
-    <operation name="CreateProduct2" dataType="product2" type="create" auth="adminOauth" url="/V1/products" method="POST">
-        <contentType>application/json</contentType>
-        <object dataType="product2" key="product">
-            <field key="sku">string</field>
-            <field key="name">string</field>
-            <field key="attribute_set_id">integer</field>
-            <field key="price">integer</field>
-            <field key="status">integer</field>
-            <field key="visibility">integer</field>
-            <field key="type_id">string</field>
-            <field key="created_at">string</field>
-            <field key="updated_at">string</field>
-            <field key="weight">integer</field>
-            <field key="extension_attributes">product_extension_attribute</field>
-            <array key="product_links">
-                <value>product_link</value>
-            </array>
-            <array key="custom_attributes">
-                <value>custom_attribute</value>
-            </array>
-            <array key="options">
-                <value>product_option</value>
-            </array>
-        </object>
-    </operation>
-    <operation name="UpdateProduct2" dataType="product2" type="update" auth="adminOauth" url="/V1/products/{sku}" method="PUT">
-        <contentType>application/json</contentType>
-        <object dataType="product2" key="product">
-            <field key="id">integer</field>
-            <field key="sku">string</field>
-            <field key="name">string</field>
-            <field key="attribute_set_id">integer</field>
-            <field key="price">integer</field>
-            <field key="status">integer</field>
-            <field key="visibility">integer</field>
-            <field key="type_id">string</field>
-            <field key="created_at">string</field>
-            <field key="updated_at">string</field>
-            <field key="weight">integer</field>
-            <field key="extension_attributes">product_extension_attribute</field>
-            <array key="product_links">
-                <value>product_link</value>
-            </array>
-            <array key="custom_attributes">
-                <value>custom_attribute</value>
-            </array>
-            <array key="options">
-                <value>product_option</value>
-            </array>
-        </object>
-        <field key="saveOptions">boolean</field>
-    </operation>
-    <operation name="deleteProduct2" dataType="product2" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
-        <contentType>application/json</contentType>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_extension_attribute-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_extension_attribute-meta.xml
deleted file mode 100644
index d8d20b5e1ed05..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_extension_attribute-meta.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateProductExtensionAttribute" dataType="product_extension_attribute" type="create">
-        <field key="stock_item">stock_item</field>
-    </operation>
-    <operation name="UpdateProductExtensionAttribute" dataType="product_extension_attribute" type="update">
-        <field key="stock_item">stock_item</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link-meta.xml
deleted file mode 100644
index 7a07ffc3d689f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link-meta.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateProductLink" dataType="product_link" type="create">
-        <field key="sku">string</field>
-        <field key="link_type">string</field>
-        <field key="linked_product_sku">string</field>
-        <field key="linked_product_type">string</field>
-        <field key="position">integer</field>
-        <array key="extension_attributes">
-            <value>product_link_extension_attribute</value>
-        </array>
-    </operation>
-    <operation name="UpdateProductLink" dataType="product_link" type="update">
-        <field key="sku">string</field>
-        <field key="link_type">string</field>
-        <field key="linked_product_sku">string</field>
-        <field key="linked_product_type">string</field>
-        <field key="position">integer</field>
-        <array key="extension_attributes">
-            <value>product_link_extension_attribute</value>
-        </array>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link_extension_attribute-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link_extension_attribute-meta.xml
deleted file mode 100644
index b0b1c840afdaf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link_extension_attribute-meta.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateProductLinkExtensionAttribute" dataType="product_link_extension_attribute" type="create">
-        <contentType>application/json</contentType>
-        <field key="qty">integer</field>
-    </operation>
-    <operation name="UpdateProductLinkExtensionAttribute" dataType="product_link_extension_attribute" type="update">
-        <contentType>application/json</contentType>
-        <field key="qty">integer</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml
deleted file mode 100644
index ebf9a82a13475..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateProductOptionValue" dataType="product_option_value" type="create">
-        <field key="title">string</field>
-        <field key="sort_order">integer</field>
-        <field key="price">integer</field>
-        <field key="price_type">string</field>
-        <field key="sku">string</field>
-        <field key="option_type_id">integer</field>
-    </operation>
-    <operation name="UpdateProductOptionValue" dataType="product_option_value" type="update">
-        <field key="title">string</field>
-        <field key="sort_order">integer</field>
-        <field key="price">integer</field>
-        <field key="price_type">string</field>
-        <field key="sku">string</field>
-        <field key="option_type_id">integer</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/stock_item-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/stock_item-meta.xml
deleted file mode 100644
index 97556fb932b45..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/stock_item-meta.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateStockItem" dataType="stock_item" type="create">
-        <field key="qty">integer</field>
-        <field key="is_in_stock">boolean</field>
-    </operation>
-    <operation name="UpdateStockItem" dataType="stock_item" type="update">
-        <field key="qty">integer</field>
-        <field key="is_in_stock">boolean</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/store_label-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/store_label-meta.xml
deleted file mode 100644
index ae5210ed3a61a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/store_label-meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateStoreLabel" dataType="StoreLabel" type="create">
-        <field key="store_id">integer</field>
-        <field key="label">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/validation_rule-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/validation_rule-meta.xml
deleted file mode 100644
index d79c7b637fb6e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/validation_rule-meta.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateValidationRule" dataType="validation_rule" type="create">
-        <field key="key">string</field>
-        <field key="value">string</field>
-    </operation>
-    <operation name="UpdateValidationRule" dataType="validation_rule" type="update">
-        <field key="key">string</field>
-        <field key="value">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml
deleted file mode 100644
index a643492c71570..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminCategoryPage" url="admin/catalog/category/" module="Catalog">
-        <section name="AdminCategorySidebarActionSection"/>
-        <section name="AdminCategorySidebarTreeSection"/>
-        <section name="AdminCategoryBasicFieldSection"/>
-        <section name="AdminCategorySEOSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
deleted file mode 100644
index 2eb093627acc2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminProductEditPage" url="admin/catalog/product/new/set/4/type/simple/" module="Magento_Catalog">
-        <section name="AdminProductFormSection"/>
-        <section name="AdminProductFormActionSection"/>
-        <section name="AdminMessagesSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.xml
deleted file mode 100644
index 7ebb7e05f31ab..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminProductIndexPage" url="admin/catalog/product/index" module="Magento_Catalog">
-        <section name="AdminProductGridActionSection" />
-        <section name="AdminProductGridSection" />
-        <section name="AdminMessagesSection" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml
deleted file mode 100644
index 2844907769243..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminProductPage" url="admin/catalog/product/view" module="Magento_Catalog">
-        <section name="StorefrontProductInfoMainSection" />
-        <section name="StorefrontProductInfoDetailsSection" />
-        <section name="StorefrontProductImageSection" />
-        <section name="StorefrontMessagesSection" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/ConfigurationStoresPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/ConfigurationStoresPage.xml
deleted file mode 100644
index 7e3178614b17c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/ConfigurationStoresPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="ConfigurationStoresPage" url="admin/admin/system_config/edit/section/cms/" module="Catalog">
-        <section name="WYSIWYGOptionsSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
deleted file mode 100644
index 4e24f817ca2bd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontCategoryPage" url="/{{var1}}.html" module="Category" parameterized="true">
-        <section name="StorefrontCategoryMainSection"/>
-        <section name="WYSIWYGToolbarSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md
deleted file mode 100644
index 41bb2b0d6042a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Catalog** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
deleted file mode 100644
index aa17bf79d8916..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCategoryBasicFieldSection">
-        <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
-        <element name="EnableCategory" type="checkbox" selector="input[name='is_active']"/>
-        <element name="CategoryNameInput" type="input" selector="input[name='name']"/>
-        <element name="ContentTab" type="input" selector="input[name='name']"/>
-    </section>
-    <section name="CatalogWYSIWYGSection">
-        <element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>
-        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by"/>
-        <element name="Style" type="button" selector=".mce-txt" />
-        <element name="Bold" type="button" selector=".mce-i-bold" />
-        <element name="Italic" type="button" selector=".mce-i-italic" />
-        <element name="Underline" type="button" selector=".mce-i-underline" />
-        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
-        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
-        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
-        <element name="Bullet" type="button" selector=".mce-i-bullist" />
-        <element name="Numlist" type="button" selector=".mce-i-numlist" />
-        <element name="InsertLink" type="button" selector=".mce-i-link" />
-        <element name="InsertImage" type="button" selector=".mce-i-image" />
-        <element name="InsertTable" type="button" selector=".mce-i-table" />
-        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
deleted file mode 100644
index f6223b6b5f29a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCategoryMainActionsSection">
-        <element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
deleted file mode 100644
index e496968dd2b6b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCategoryMessagesSection">
-        <element name="SuccessMessage" type="text" selector=".message-success"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
deleted file mode 100644
index 83aef318c28d6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCategorySEOSection">
-        <element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
-        <element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
-        <element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
-        <element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
-        <element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
deleted file mode 100644
index f8ca01d7a007f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCategorySidebarActionSection">
-        <element name="AddRootCategoryButton" type="button" selector="#add_root_category_button" timeout="30"/>
-        <element name="AddSubcategoryButton" type="button" selector="#add_subcategory_button" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
deleted file mode 100644
index 450c13a70a0e1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCategorySidebarTreeSection">
-        <element name="Collapse All" type="button" selector=".tree-actions a:first-child"/>
-        <element name="Expand All" type="button" selector=".tree-actions a:last-child"/>
-    </section>
-</config>
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
deleted file mode 100644
index 696e6cacc3e24..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductFormActionSection">
-        <element name="saveButton" type="button" selector="#save-button" timeout="30"/>
-    </section>
-</config>
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
deleted file mode 100644
index f9eada13ef08a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductFormSection">
-        <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="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
-        <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
-        <element name="contentTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[text()='Content']"/>
-    </section>
-    <section name="ProductWYSIWYGSection">
-        <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
-        <element name="v4" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']" />
-        <element name="v3" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 3.6(Deprecated)']" />
-        <element name="TinymceDescription3" type ="button" selector="//span[text()='Description']" />
-        <element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
-        <element name="SaveConfig" type ="button" selector="#save" />
-        <element name="v4" type="button" selector="#category_form_description_v4"/>
-        <element name="WYSIWYGBtn" type="button" selector=".//button[@class='action-default scalable action-wysiwyg']"/>
-    </section>
-    <section name="ProductDescriptionWYSIWYGToolbarSection">
-        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_description']//div[@class='mce-branding-powered-by']" />
-        <element name="showHideBtn" type="button" selector="#toggleproduct_form_description"/>
-        <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_description > .scalable.action-add-image.plugin" />
-        <element name="Style" type="button" selector="//div[@id='editorproduct_form_description']//span[text()='Paragraph']" />
-        <element name="Bold" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-bold']" />
-        <element name="Italic" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-italic']" />
-        <element name="Underline" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-underline']" />
-        <element name="AlignLeft" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-alignleft']" />
-        <element name="AlignCenter" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-aligncenter']" />
-        <element name="AlignRight" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-alignright']" />
-        <element name="Numlist" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-bullist']" />
-        <element name="Bullet" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-numlist']" />
-        <element name="InsertLink" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-link']" />
-        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-image']" />
-        <element name="InsertTable" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-table']" />
-        <element name="SpecialCharacter" type="button" selector="//div[@id='editorproduct_form_description']//i[@class='mce-ico mce-i-charmap']" />
-    </section>
-    <section name="ProductShortDescriptionWYSIWYGToolbarSection">
-        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_short_description']//div[@class='mce-branding-powered-by']" />
-        <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_short_description > .scalable.action-add-image.plugin" />
-        <element name="showHideBtn" type="button" selector="#toggleproduct_form_short_description"/>
-        <element name="Style" type="button" selector="//div[@id='editorproduct_form_short_description']//span[text()='Paragraph']" />
-        <element name="Bold" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-bold']" />
-        <element name="Italic" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-italic']" />
-        <element name="Underline" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-underline']" />
-        <element name="AlignLeft" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-alignleft']" />
-        <element name="AlignCenter" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-aligncenter']" />
-        <element name="AlignRight" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-alignright']" />
-        <element name="Numlist" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-bullist']" />
-        <element name="Bullet" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-numlist']" />
-        <element name="InsertLink" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-link']" />
-        <element name="InsertImageIcon" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-image']" />
-        <element name="InsertTable" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-table']" />
-        <element name="SpecialCharacter" type="button" selector="//div[@id='editorproduct_form_short_description']//i[@class='mce-ico mce-i-charmap']"/>
-    </section>
-    <section name="AdminProductFormConfigurationsSection">
-        <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
-        <element name="currentVariationsRows" type="button" selector=".data-row"/>
-        <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
-        <element name="currentVariationsSkuCells" type="textarea" selector=".admin__control-fields[data-index='sku_container']"/>
-        <element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/>
-        <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
-        <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
-    </section>
-    <section name="AdminCreateProductConfigurationsPanel">
-        <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
-        <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
-        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
-        <element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
-        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-        <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
-
-        <element name="selectAll" type="button" selector=".action-select-all"/>
-        <element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>
-        <element name="attributeName" type="input" selector="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
-        <element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
-
-        <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
-        <element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/>
-        <element name="attribute1" type="input" selector="#apply-single-price-input-0"/>
-        <element name="attribute2" type="input" selector="#apply-single-price-input-1"/>
-        <element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
-
-        <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
-        <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
-    </section>
-    <section name="AdminNewAttributePanel">
-        <element name="saveAttribute" type="button" selector="#save" timeout="30"/>
-        <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
-        <element name="defaultLabel" type="input" selector="#attribute_label"/>
-    </section>
-    <section name="AdminChooseAffectedAttributeSetPopup">
-        <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
deleted file mode 100644
index 866bcb4223e9f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductGridActionSection">
-        <element name="addProductToggle" type="button" selector=".action-toggle.primary.add" timeout="30"/>
-        <element name="addSimpleProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-simple']" timeout="30"/>
-        <element name="addConfigurableProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-configurable']" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
deleted file mode 100644
index db8b641c9d2f4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductGridSection">
-        <element name="productGridElement1" type="input" selector="#addselector" />
-        <element name="productGridElement2" type="text" selector="#addselector" />
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
deleted file mode 100644
index b99e365352cd6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductMessagesSection">
-        <element name="successMessage" type="text" selector=".message-success"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
deleted file mode 100644
index ffc2bcc0a5634..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductSEOSection">
-        <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
-        <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
deleted file mode 100644
index 9de3527fdfbfb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontCategoryMainSection">
-        <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
-        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
-        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
-        <element name="SuccessMsg" type="button" selector="div.message-success"/>
-        <element name="productCount" type="text" selector="#toolbar-amount"/>
-        <element name="CatalogDescription" type="text" selector="//div[@class='category-description']//p"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
deleted file mode 100644
index a7036388814df..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontMessagesSection">
-        <element name="test" type="input" selector=".test"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
deleted file mode 100644
index db9e1cd4b23ed..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontMiniCartSection">
-        <element name="quantity" type="button" selector="span.counter-number"/>
-        <element name="show" type="button" selector="a.showcart"/>
-        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
deleted file mode 100644
index 742dbac0e0886..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontProductInfoDetailsSection">
-        <element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
deleted file mode 100644
index c083884bc6c5e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontProductInfoMainSection">
-        <element name="productName" type="text" selector=".base"/>
-        <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
-        <element name="productPrice" type="text" selector=".price"/>
-        <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
-        <element name="productDescription" type="text" selector="//div[@id='product.info.description']//p[1]"/>
-        <element name="productShortDescription" type="text" selector="//div[@class='product attribute overview']//p"/>
-        <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
-        <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/WYSIWYGSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/WYSIWYGSection.xml
deleted file mode 100644
index 3e0b0b9d78375..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/WYSIWYGSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="MagentoEntityDescriptionSection">
-        <element name="ShowHideBtn" type="button" selector="#toggleproduct_form_description"/>
-        <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_description > .scalable.action-add-image.plugin"/>
-        <element name="UploadImage" type="file" selector=".fileupload" />
-        <element name="image" type="text" selector="//small[text()='{{var1}}']"/>
-        <element name="InsertFile" type="text" selector="#insert_files"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
deleted file mode 100644
index a1dc628f04c29..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog",
-    "description": "Magento 2 Functional Test Module Catalog",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-indexer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-product-alert": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Catalog\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md
deleted file mode 100644
index ee39f1deb58d3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CatalogAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json
deleted file mode 100644
index b742218731f84..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-analytics",
-    "description": "Magento 2 Acceptance Test Module Catalog Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md
deleted file mode 100644
index 9a514f1c83fd7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CatalogImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json
deleted file mode 100644
index 3f1d805ca2757..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-import-export",
-    "description": "Magento 2 Functional Test Module Catalog Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md
deleted file mode 100644
index 512a5f319fed4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogInventory** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json
deleted file mode 100644
index 4060f8906efd7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-inventory",
-    "description": "Magento 2 Functional Test Module Catalog Inventory",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogInventory\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md
deleted file mode 100644
index 5c67ac5b0ba9c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogRule** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json
deleted file mode 100644
index 3d0fb94a4df09..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-rule",
-    "description": "Magento 2 Functional Test Module Catalog Rule",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogRule\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md
deleted file mode 100644
index ed2796d211d25..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogRuleConfigurable** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json
deleted file mode 100644
index 0bee96876c84d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-rule-configurable",
-    "description": "Magento 2 Functional Test Module Catalog Rule Configurable",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogRuleConfigurable\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md
deleted file mode 100644
index 092e7bc142598..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogSearch** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
deleted file mode 100644
index 0115d362d3b7f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-search",
-    "description": "Magento 2 Functional Test Module Catalog Search",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogSearch\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md
deleted file mode 100644
index 7329f664baa03..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CatalogUrlRewrite** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json
deleted file mode 100644
index a51be94ebafb7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-url-rewrite",
-    "description": "Magento 2 Functional Test Module Catalog Url Rewrite",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogUrlRewrite\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md
deleted file mode 100644
index 43aa796462c76..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogWidget** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json
deleted file mode 100644
index 8ff933bd50a9a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-widget",
-    "description": "Magento 2 Functional Test Module Catalog Widget",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogWidget\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml
deleted file mode 100644
index 4531bfb84dcc9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="StorefrontCustomerCheckoutCest">
-        <annotations>
-            <features value="Checkout"/>
-            <stories value="Checkout via the Admin"/>
-        </annotations>
-        <before>
-            <createData entity="SimpleSubCategory" stepKey="simplecategory"/>
-            <createData entity="SimpleProduct" stepKey="simpleproduct1">
-                <required-entity createDataKey="simplecategory"/>
-            </createData>
-            <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
-        </before>
-        <after>
-            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
-            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="simpleuscustomer" stepKey="deleteCustomer"/>
-        </after>
-        <test name="CustomerCheckoutTest">
-            <annotations>
-                <title value="Customer Checkout"/>
-                <description value="Should be able to place an order as a customer."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="#"/>
-                <group value="checkout"/>
-            </annotations>
-
-            <amOnPage stepKey="s1"  url="customer/account/login/"/>
-            <fillField  stepKey="s3" userInput="$$simpleuscustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-            <fillField  stepKey="s5" userInput="$$simpleuscustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-            <click stepKey="s7" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <waitForPageLoad stepKey="s9"/>
-
-            <amOnPage stepKey="s11" url="/$$simplecategory.name$$.html" />
-            <moveMouseOver stepKey="s15" selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" />
-            <click stepKey="s17" selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" />
-            <waitForElementVisible stepKey="s21" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" />
-            <see stepKey="s23" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart."/>
-            <see stepKey="s25" selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" />
-            <click stepKey="s27" selector="{{StorefrontMiniCartSection.show}}" />
-            <click stepKey="s31" selector="{{StorefrontMiniCartSection.goToCheckout}}" />
-            <waitForPageLoad stepKey="s33"/>
-            <waitForLoadingMaskToDisappear stepKey="s34"/>
-            <click stepKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-            <waitForElement stepKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-            <click stepKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
-            <waitForPageLoad stepKey="s39"/>
-            <waitForElement stepKey="s41" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
-            <see stepKey="s47" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-            <click stepKey="s49" selector="{{CheckoutPaymentSection.placeOrder}}" />
-            <waitForPageLoad stepKey="s51"/>
-            <grabTextFrom stepKey="s53" selector="{{CheckoutSuccessMainSection.orderNumber22}}" returnVariable="orderNumber" />
-            <see stepKey="s55" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
-
-            <amOnPage stepKey="s59" url="{{AdminLoginPage.url}}" />
-            <fillField stepKey="s61" selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" />
-            <fillField stepKey="s63" selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" />
-            <click stepKey="s65" selector="{{AdminLoginFormSection.signIn}}" />
-
-            <amOnPage stepKey="s67" url="{{OrdersPage.url}}"/>
-            <waitForPageLoad stepKey="s75"/>
-            <fillField stepKey="s77" selector="{{OrdersGridSection.search}}" variable="orderNumber" />
-            <waitForPageLoad stepKey="s78"/>
-
-            <click stepKey="s81" selector="{{OrdersGridSection.submitSearch22}}" />
-            <waitForPageLoad stepKey="s831"/>
-            <click stepKey="s84" selector="{{OrdersGridSection.firstRow}}" />
-            <see stepKey="s85" selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
-            <see stepKey="s87" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
-            <see stepKey="s89" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
-            <see stepKey="s91" selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-            <see stepKey="s93" selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-            <see stepKey="s95" selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml
deleted file mode 100644
index 69c614cd36268..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="StorefrontGuestCheckoutCest">
-        <annotations>
-            <features value="Checkout"/>
-            <stories value="Checkout via Guest Checkout"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <required-entity createDataKey="createCategory"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-        </after>
-        <test name="GuestCheckoutTest">
-            <annotations>
-                <title value="Guest Checkout"/>
-                <description value="Should be able to place an order as a Guest."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-72094"/>
-                <group value="checkout"/>
-            </annotations>
-            <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-            <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-            <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
-            <see selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
-            <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
-            <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <fillField selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
-            <fillField selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
-            <fillField selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
-            <fillField selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
-            <fillField selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
-            <selectOption selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
-            <fillField selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
-            <fillField selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-            <click selector="{{GuestCheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-            <waitForElement selector="{{GuestCheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-            <click selector="{{GuestCheckoutShippingSection.next}}" stepKey="clickNext"/>
-            <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-            <conditionalClick selector="{{GuestCheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{GuestCheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="exposeMiniCart"/>
-            <see selector="{{GuestCheckoutPaymentSection.cartItems}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductInCart"/>
-            <see selector="{{GuestCheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAddress"/>
-            <click selector="{{GuestCheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-            <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" returnVariable="orderNumber" stepKey="grabOrderNumber"/>
-            <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order # is:" stepKey="seeOrderNumber"/>
-            <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeEmailYou"/>
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-            <amOnPage url="{{OrdersPage.url}}" stepKey="onOrdersPage"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-            <fillField selector="{{OrdersGridSection.search}}" variable="orderNumber" stepKey="fillOrderNum"/>
-            <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
-            <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-            <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
-            <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
-            <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
-            <see selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
-            <see selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
-            <see selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="{{_defaultProduct.name}}" stepKey="seeAdminOrderProduct"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/CouponData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/CouponData.xml
deleted file mode 100644
index d33ac172d44e2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/CouponData.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="_defaultCoupon" type="coupon">
-        <data key="rule_id">4</data>
-        <data key="code">FREESHIPPING123</data>
-        <data key="times_used">0</data>
-        <data key="is_primary">false</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml
deleted file mode 100644
index 58a2204de7e83..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateCoupon" dataType="coupon" type="create" auth="adminOauth" url="/rest/V1/coupons" method="POST">
-        <contentType>application/json</contentType>
-        <object key="coupon" dataType="coupon">
-            <field key="rule_id" required="true">integer</field>
-            <field key="times_used" required="true">integer</field>
-            <field key="is_primary" required="true">boolean</field>
-            <field key="code">string</field>
-            <field key="usage_limit">integer</field>
-            <field key="usage_per_customer">integer</field>
-            <field key="expiration_date">string</field>
-            <field key="created_at">string</field>
-            <field key="type">integer</field>
-            <field key="extension_attributes">empty_extension_attribute</field>
-        </object>
-    </operation>
-
-    <operation name="DeleteCoupon" dataType="coupon" type="delete" auth="adminOauth" url="/rest/V1/coupons/{coupon_id}" method="DELETE">
-        <contentType>application/json</contentType>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
deleted file mode 100644
index 5a2640a52bdaf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CheckoutPage" url="/checkout" module="Checkout">
-        <section name="CheckoutShippingSection"/>
-        <section name="CheckoutShippingMethodsSection"/>
-        <section name="CheckoutOrderSummarySection"/>
-        <section name="CheckoutSuccessMainSection"/>
-        <section name="CheckoutPaymentSection"/>
-        <section name="CheckoutGuestShippingInfoSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
deleted file mode 100644
index 23b6e0a01e7e1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CheckoutSuccessPage" url="/checkout/onepage/success/" module="Checkout">
-        <section name="CheckoutSuccessMainSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutPage.xml
deleted file mode 100644
index a1ff9ad939ae8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutPage.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="GuestCheckoutPage" url="/checkout" module="Checkout">
-        <section name="GuestCheckoutShippingSection"/>
-        <section name="GuestCheckoutPaymentSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md
deleted file mode 100644
index fc63b2f394813..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Checkout** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
deleted file mode 100644
index 5b45d1a24b3aa..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutOrderSummarySection">
-        <element name="miniCartTab" type="button" selector=".title[role='tab']"/>
-        <element name="productItemName" type="text" selector=".product-item-name"/>
-        <element name="productItemQty" type="text" selector=".value"/>
-        <element name="productItemPrice" type="text" selector=".price"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
deleted file mode 100644
index 29f97e8defaff..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutPaymentSection">
-        <element name="cartItems" type="text" selector=".minicart-items"/>
-        <element name="billingAddress" type="text" selector="div.billing-address-details"/>
-        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
deleted file mode 100644
index bbe8b0b1fee5f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutShippingGuestInfoSection">
-        <element name="email" type="input" selector="#customer-email"/>
-        <element name="firstName" type="input" selector="input[name=firstname]"/>
-        <element name="lastName" type="input" selector="input[name=lastname]"/>
-        <element name="street" type="input" selector="input[name='street[0]']"/>
-        <element name="city" type="input" selector="input[name=city]"/>
-        <element name="region" type="select" selector="select[name=region_id]"/>
-        <element name="postcode" type="input" selector="input[name=postcode]"/>
-        <element name="telephone" type="input" selector="input[name=telephone]"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
deleted file mode 100644
index 52653d15c41c5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutShippingMethodsSection">
-        <element name="next" type="button" selector="button.button.action.continue.primary"/>
-        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
deleted file mode 100644
index 3e507dbb898a8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutShippingSection">
-        <element name="selectedShippingAddress" type="text" selector=".shipping-address-item.selected-item"/>
-        <element name="newAddressButton" type="button" selector="#checkout-step-shipping button"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
deleted file mode 100644
index 9204bf51344ce..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutSuccessMainSection">
-        <element name="success" type="text" selector="div.checkout-success"/>
-        <element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
-        <element name="orderNumber22" type="text" selector=".order-number>strong"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
deleted file mode 100644
index e4df0069e4ce5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="GuestCheckoutPaymentSection">
-        <element name="cartItemsArea" type="textarea" selector=".items-in-cart"/>
-        <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active"/>
-        <element name="cartItems" type="text" selector=".minicart-items"/>
-        <element name="billingAddress" type="text" selector="div.billing-address-details"/>
-        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
deleted file mode 100644
index b2cca4d8f37ba..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="GuestCheckoutShippingSection">
-        <element name="email" type="input" selector="#customer-email"/>
-        <element name="firstName" type="input" selector="input[name=firstname]"/>
-        <element name="lastName" type="input" selector="input[name=lastname]"/>
-        <element name="street" type="input" selector="input[name='street[0]']"/>
-        <element name="city" type="input" selector="input[name=city]"/>
-        <element name="region" type="select" selector="select[name=region_id]"/>
-        <element name="postcode" type="input" selector="input[name=postcode]"/>
-        <element name="telephone" type="input" selector="input[name=telephone]"/>
-        <element name="next" type="button" selector="button.button.action.continue.primary"/>
-        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
deleted file mode 100644
index f84ed60ac922e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-checkout",
-    "description": "Magento 2 Functional Test Module Checkout",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Checkout\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md
deleted file mode 100644
index 35423659f629f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CheckoutAgreements** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json
deleted file mode 100644
index 54f8e269d39a2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-checkout-agreements",
-    "description": "Magento 2 Functional Test Module Checkout Agreements",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CheckoutAgreements\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddImageToWYSIWYGCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddImageToWYSIWYGCest.xml
deleted file mode 100644
index 78129afff3a4e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddImageToWYSIWYGCest.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddImageToWYSIWYGCest">
-        <annotations>
-            <features value="Add Image to WYSIWYG"/>
-            <stories value="Add Media to WYSIWYG"/>
-            <group value="addImage"/>
-            <env value="chrome"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddImageToWYSIWYGEditor">
-            <annotations>
-                <title value="You should be able to add image to WYSIWYG Editor"/>
-                <description value="You should be able to add image to WYSIWYG Editor."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83697"/>
-            </annotations>
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="goToNewCMSPage" />
-            <waitForPageLoad stepKey="wait"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
-            <click selector="{{CmsWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
-            <waitForPageLoad stepKey="waitForPageLoad" />
-            <click selector="{{CmsWYSIWYGSection.Browse}}" stepKey="clickBrowse" />
-            <waitForPageLoad stepKey="waitForPageLoad1" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading1" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
-            <see selector="{{CmsWYSIWYGSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn" />
-            <see selector="{{CmsWYSIWYGSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn" />
-            <see selector="{{CmsWYSIWYGSection.InsertFile}}" userInput="Add Selected" stepKey="seeAddSelectedBtn" />
-            <click selector="{{CmsWYSIWYGSection.CreateFolder}}" stepKey="createFolder"/>
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.FolderName}}" stepKey="waitForPopUp" />
-            <fillField selector="{{CmsWYSIWYGSection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName" />
-            <click selector="{{CmsWYSIWYGSection.AcceptFolderName}}" stepKey="acceptFolderName" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
-            <conditionalClick selector="{{CmsWYSIWYGSection.StorageRootArrow}}" dependentSelector="{{CmsWYSIWYGSection.checkIfArrowExpand}}" stepKey="clickArrowIfCloses" visible="true"/>
-            <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder" />
-            <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
-            <attachFile selector="{{CmsWYSIWYGSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage1"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
-            <waitForElementVisible  selector="{{CmsWYSIWYGSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage1" />
-            <seeElement selector="{{CmsWYSIWYGSection.imageSelected(ImageUpload.file)}}" stepKey="seeImageSelected" />
-            <see selector="{{CmsWYSIWYGSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn"/>
-            <click selector="{{CmsWYSIWYGSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected" />
-            <waitForText userInput="OK" stepKey="waitForConfirm" />
-            <click selector="{{CmsWYSIWYGSection.confirmDelete}}" stepKey="confirmDelete" />
-            <waitForElementNotVisible selector="{{CmsWYSIWYGSection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted" />
-            <dontSeeElement selector="{{CmsWYSIWYGSection.image(ImageUpload.file)}}" stepKey="dontSeeImage" />
-            <attachFile selector="{{CmsWYSIWYGSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage2"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage2" />
-            <click selector="{{CmsWYSIWYGSection.InsertFile}}" stepKey="clickInsertBtn" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.OkBtn}}" stepKey="waitForOkBtn" />
-            <fillField selector="{{CmsWYSIWYGSection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
-            <fillField selector="{{CmsWYSIWYGSection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight" />
-            <click selector="{{CmsWYSIWYGSection.OkBtn}}" stepKey="clickOkBtn" />
-            <waitForPageLoad stepKey="wait3"/>
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad  stepKey="wait4"/>
-            <seeElement selector="{{StorefrontCMSPageSection.mediaDescription}}" stepKey="assertMediaDescription"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddVariableToWYSIWYGCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddVariableToWYSIWYGCest.xml
deleted file mode 100644
index 16f278a48fbad..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddVariableToWYSIWYGCest.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddVariableToWYSIWYGCest">
-        <annotations>
-            <features value="Add Variable to WYSIWYG"/>
-            <stories value="Add Variable to WYSIWYG MAGETWO-42158"/>
-            <group value="addVariable"/>
-            <env value="chrome"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="InsertDefaultMagentoVariableIntoWYSIWYGOnPages">
-            <annotations>
-                <title value="Insert default Magento variable into content of WYSIWYG on Pages"/>
-                <description value="Insert default Magento variable into content of WYSIWYG on Pages"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83504"/>
-            </annotations>
-            <!--Create Custom Variable-->
-            <actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />
-            <!--Setup Store information-->
-            <waitForPageLoad stepKey="wait" />
-            <amOnPage url="/admin/admin/system_config/" stepKey="goToConfigStoreInformation" />
-            <waitForPageLoad stepKey="waitForPageLoad1" />
-            <conditionalClick selector="{{StoreConfigSection.StoreInformation}}" dependentSelector="{{StoreConfigSection.CheckIfTabExpand}}" stepKey="checkIfTabOpen" visible="true"/>
-            <fillField selector="{{StoreConfigSection.City}}" userInput="{{_defaultVariable.city}}" stepKey="fillCity" />
-            <click selector="{{StoreConfigSection.Save}}" stepKey="saveConfig"/>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon1" />
-            <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
-            <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
-            <!--see Insert Variable button disabled-->
-            <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--see 4 colums-->
-            <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
-            <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
-            <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />
-            <see selector="{{VariableSection.ColName('Code')}}" userInput="Code" stepKey="codeCol" />
-            <!--select default variable-->
-            <click selector="{{VariableSection.Radio('city')}}" stepKey="selectDefaultVariable"/>
-            <see selector="{{VariableSection.InsertVariableBtnEnabled}}" userInput="Insert Variable" stepKey="seeInsertVarialeEnabled" />
-            <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save1" />
-            <click selector="{{CmsWYSIWYGSection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon2" />
-            <waitForPageLoad stepKey="waitForPageLoad4"/>
-            <!--see custom variable-->
-            <see userInput="{{customVariable.code}}"  stepKey="seeCustomVariable"/>
-            <seeElement selector="{{VariableSection.SearchTxtbox}}"  stepKey="searchBox"/>
-            <!--press Enter-->
-            <pressKey selector="{{VariableSection.SearchTxtbox}}" parameterArray="['Test Variable',\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
-            <waitForPageLoad stepKey="waitForPageLoad5" />
-            <!--see result-->
-            <see selector="{{VariableSection.searchResult(customVariable.code)}}" userInput="{{customVariable.code}}" stepKey="seeResult" />
-            <!--Insert custom variable-->
-            <click selector="{{VariableSection.VariableRadio(customVariable.code)}}" stepKey="selectCustomVariable1"/>
-            <waitForPageLoad stepKey="waitForPageLoad6"/>
-            <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
-            <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
-            <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShow/HideBtn"/>
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
-            <seeElement selector="{{CmsWYSIWYGSection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <!--see Default Variable on Storefront-->
-            <see userInput="{{_defaultVariable.city}}" stepKey="seeDefaultVariable" />
-            <!--see Custom Variable on Storefront-->
-            <see userInput="{{customVariable.html}}" stepKey="seeCustomVariable2" />
-            <!--Delete Custom Variable-->
-            <actionGroup ref="DeleteCustomVariableActionGroup" stepKey="deleteCustomVariable" />
-            <!--Refresh Storefront-->
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad7" />
-            <!--see custom variable blank-->
-            <dontSee userInput="{{customVariable.html}}" stepKey="dontSeeCustomVariableName" />
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml
deleted file mode 100644
index 4690f279a5425..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="CMSPageLink"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddWidgetToWYSIWYGWithTypeOfCMSPageLink">
-            <annotations>
-                <title value="Create CMS Page With Widget Type:CMS page link"/>
-                <description value="Create CMS Page With Widget Type:CMS page link"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83781"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="wait2"/>
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Page Link Block Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
-            <!--<waitForLoadingMaskToDisappear stepKey="wait3"/>-->
-            <waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
-            <click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
-            <waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait5" />
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <!--see widget on Storefront-->
-            <see userInput="Home page" stepKey="seeHomepageWidget" />
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
-
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeCest.xml
deleted file mode 100644
index 3f9531570237c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeCest.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="CMSStaticBlock"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultBlock" stepKey="createPreBlock" />
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-
-        <test name="AddWidgetToWYSIWYGWithTypeOfCMSStaticBlock">
-            <annotations>
-                <title value="Create CMS Page With Widget Type:CMS Static Block"/>
-                <description value="Create CMS Page With Widget Type:CMS Static Blocl"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83787"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="waitForPageLoad" />
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static" stepKey="selectCMSStaticBlock" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <!--see Insert Widget button enabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
-            <waitForLoadingMaskToDisappear stepKey="wait3"/>
-            <waitForElementVisible selector="{{WidgetSection.BlockPage($$createPreBlock.identifier$$)}}" stepKey="waitForSlideoutOpens" />
-            <click selector="{{WidgetSection.BlockPage($$createPreBlock.identifier$$)}}" stepKey="selectPreCreateBlock" />
-            <waitForElementNotVisible selector="{{WidgetSection.SelectBlockTitle}}" stepKey="waitForSlideoutCloses" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForLoadingMaskToDisappear stepKey="waitingForLoading" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait5" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <see userInput="$$createPreBlock.content$$" stepKey="seeBlockLink"/>
-        </test>
-
-
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeCest.xml
deleted file mode 100644
index 4e2959b35657a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeCest.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="categoryLink"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddWidgetToWYSIWYGWithTypeOfCatalogCategoryLink">
-            <annotations>
-                <title value="Insert default Magento widget into content of WYSIWYG on CMS Pages"/>
-                <description value="Insert default Magento widget into content of WYSIWYG on CMS Pages"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83611"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="wait2"/>
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Category Link" stepKey="selectCatalogCategoryLink" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Category Link Block Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectCategoryBtn" />
-            <waitForLoadingMaskToDisappear stepKey="wait3"/>
-            <click userInput="$$createPreReqCategory.name$$" stepKey="selectPreCreateCategory" />
-            <waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses2" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait5" />
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <!--see widget on Storefront-->
-            <see userInput="$$createPreReqCategory.name$$" stepKey="seeCategoryLink"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeCest.xml
deleted file mode 100644
index 89f539dfbadfe..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeCest.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="productLink"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
-                <required-entity createDataKey="createPreReqCategory"/>
-            </createData>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddWidgetToWYSIWYGWithTypeOfCatalogProductLink">
-            <annotations>
-                <title value="Create CMS Page With Widget Type: Catalog product link"/>
-                <description value="Create CMS Page With Widget Type: Catalog product link"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83788"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="wait2"/>
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <waitForPageLoad stepKey="wait3"/>
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Product Link" stepKey="selectCatalogProductLink" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Product Link Block Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
-            <waitForLoadingMaskToDisappear stepKey="wait4"/>
-            <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
-            <waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
-            <click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />
-            <waitForElementNotVisible selector="{{WidgetSection.SelectProductTitle}}" stepKey="waitForSlideOutCloses" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForLoadingMaskToDisappear stepKey="waitLoadingMask1" />
-            <waitForPageLoad stepKey="wait6" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait7" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductLink"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml
deleted file mode 100644
index 9f7dd998b9885..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="productList"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-            <createData entity="_defaultProduct" stepKey="createPreReqProduct1">
-                <required-entity createDataKey="createPreReqCategory"/>
-            </createData>
-            <createData entity="_defaultProduct" stepKey="createPreReqProduct2">
-                <required-entity createDataKey="createPreReqCategory"/>
-            </createData>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddWidgetToWYSIWYGWithTypeOfCatalogProductList">
-            <annotations>
-                <title value="Create CMS Page With Widget Type: Catalog product list"/>
-                <description value="Create CMS Page With Widget Type: Catalog product list"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="waitForPageLoad1" />
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <fillField selector="{{WidgetSection.NoOfProductToDisplay}}" userInput="5" stepKey="fillNoOfProduct" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Products Grid Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn" />
-            <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
-            <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Category" stepKey="selectCategoryCondition" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
-            <click selector="{{WidgetSection.RuleParam}}" stepKey="click ..." />
-            <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
-            <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
-            <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForPageLoad stepKey="wait6" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait5" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <see userInput="$$createPreReqProduct1.name$$" stepKey="seeProductLink1"/>
-            <see userInput="$$createPreReqProduct2.name$$" stepKey="seeProductLink2"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml
deleted file mode 100644
index 581fa58d2e6ba..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="recentlyCompared"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
-                <required-entity createDataKey="createPreReqCategory"/>
-            </createData>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddWidgetToWYSIWYGWithTypeOfRecentlyComparedProducts">
-            <annotations>
-                <title value="Create CMS Page With Widget Type: Recently Compared Products"/>
-                <description value="Create CMS Page With Widget Type: Recently Compared Products"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83792"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="waitForPageLoad" />
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <waitForPageLoad stepKey="wait2"/>
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Compared Products" stepKey="selectRecentlyComparedProducts" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <!--see Insert Widget button enabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <fillField selector="{{WidgetSection.PageSize}}" userInput="5" stepKey="fillNoOfProductDisplay" />
-            <selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
-            <selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Compared Products Grid Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="amOnProductPage" />
-            <waitForPageLoad stepKey="waitForPage" />
-            <click selector="{{WidgetSection.CompareBtn}}" stepKey="clickCompareBtn" />
-            <amOnPage url="$$createPreReqCategory.name$$.html" stepKey="amOnCatalogPage" />
-            <waitForPageLoad stepKey="waitForPage" />
-            <waitForPageLoad stepKey="waitForPage1" />
-            <waitForElementVisible selector="{{WidgetSection.ClearCompare}}" stepKey="waitForClearBtn" />
-            <click selector="{{WidgetSection.ClearCompare}}" stepKey="clickClearCompareBtn" />
-            <waitForElementVisible selector="{{WidgetSection.AcceptClear}}" stepKey=""/>
-            <click selector="{{WidgetSection.AcceptClear}}" stepKey="acceptClearCompare" />
-            <waitForPageLoad stepKey="waitForPage2" />
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait5" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <waitForPageLoad stepKey="wait6" />
-            <waitForText userInput="$$createPreReqProduct.name$$" stepKey="waiForProductVisible" />
-            <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductName" />
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeCest.xml
deleted file mode 100644
index 6156516b98033..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeCest.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeCest">
-        <annotations>
-            <features value="Add Widget to WYSIWYG"/>
-            <stories value="Widgets in WYSIWYG"/>
-            <group value="recentlyViewed"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
-            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
-                <required-entity createDataKey="createPreReqCategory"/>
-            </createData>
-            <actionGroup ref="LoginActionGroup" stepKey="login"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="AddWidgetToWYSIWYGWithTypeOfRecentlyViewedProducts">
-            <annotations>
-                <title value="Create CMS Page With Widget Type: Recently Viewed Products"/>
-                <description value="Create CMS Page With Widget Type: Recently Viewed Products"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-83789"/>
-            </annotations>
-            <!--Main test-->
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
-            <waitForPageLoad stepKey="waitForPageLoad" />
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <!--see Insert Widget button disabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <!--see Cancel button enabed-->
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <!--Select "Widget Type"-->
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Viewed Products" stepKey="selectRecentlyViewedProducts" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <!--see Insert Widget button enabled-->
-            <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
-            <fillField selector="{{WidgetSection.PageSize}}" userInput="5" stepKey="fillNoOfProductDisplay" />
-            <selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
-            <selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Viewed Products Grid Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="amOnProductPage" />
-            <waitForPageLoad stepKey="waitForPage" />
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait5" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello CMS Page!" stepKey="seeContent"/>
-            <waitForPageLoad stepKey="wait6" />
-            <waitForText userInput="$$createPreReqProduct.name$$" stepKey="waitForProductVisible" />
-            <see userInput="$$createPreReqProduct.name$$" stepKey="seeProductName" />
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
deleted file mode 100644
index 0a321690dd5d0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminCreateCmsPageCest.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateCmsPageCest">
-        <annotations>
-            <features value="CMS Page Creation"/>
-            <stories value="Create a CMS Page via the Admin"/>
-        </annotations>
-        <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-        <test name="CreateNewPage">
-            <annotations>
-                <title value="Create a CMS Page"/>
-                <description value="You should be able to create a CMS Page via the Admin."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-25580"/>
-                <group value="cms"/>
-            </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <click selector="{{CmsPagesPageActionsSection.addNewPage}}" stepKey="clickAddNewPage"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
-            <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_defaultCmsPage.content_heading}}" stepKey="fillFieldContentHeading"/>
-            <!-- As of 2017/11/15, this test is failing here (Jenkins only, works locally). See MQE-282. -->
-            <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{_defaultCmsPage.content}}" stepKey="fillFieldContent"/>
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <see userInput="{{_defaultCmsPage.content_heading}}" stepKey="seeContentHeading"/>
-            <see userInput="{{_defaultCmsPage.content}}" stepKey="seeContent"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminSwitchWYSIWYGOptionsCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminSwitchWYSIWYGOptionsCest.xml
deleted file mode 100644
index 78b21b7ccf2c6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/AdminSwitchWYSIWYGOptionsCest.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminSwitchWYSIWYGOptionsCest">
-        <annotations>
-            <features value="TinyMCEv4"/>
-            <stories value="Admin are able to switch between TinyMCE versions MAGETWO-51829"/>
-            <group value="switcher"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-        </before>
-        <test name="AdminSwitchWYSIWYGOptionsCest">
-            <annotations>
-                <title value="Admin are able to switch between versions of TinyMCE."/>
-                <description value="Admin are able to switch between versions of TinyMCE."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-82936"/>
-            </annotations>
-            <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
-            <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-            <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox1" />
-            <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue1"/>
-            <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown1" />
-            <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 4" stepKey="switchToVersion4" />
-            <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
-            <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
-            <waitForPageLoad stepKey="wait1"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
-            <seeElement selector="{{CmsWYSIWYGSection.TinyMCE4}}"  stepKey="seeTinyMCE4" />
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE4!');" stepKey="executeJSFillContent1"/>
-            <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn1" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab1" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation1"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey1"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage1"/>
-            <!-- Go to storefront cms page, assert cms content -->
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage1"/>
-            <waitForPageLoad stepKey="wait3" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello TinyMCE4!" stepKey="seeContent1"/>
-            <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage2"/>
-            <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="expandWYSIWYGOptions2" />
-            <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
-            <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
-            <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown2" />
-            <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
-            <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
-            <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
-            <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
-            <waitForPageLoad stepKey="wait2"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
-            <seeElement selector="{{CmsWYSIWYGSection.TinyMCE3}}" stepKey="seeTinyMCE3" />
-            <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE3!');" stepKey="executeJSFillContent2"/>
-            <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2" />
-            <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab2" />
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation2"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{simpleCmsPage.identifier}}" stepKey="fillFieldUrlKey2"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage2"/>
-            <!-- Go to storefront cms page, assert cms content -->
-            <amOnPage url="{{simpleCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
-            <waitForPageLoad stepKey="wait4" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello TinyMCE3!" stepKey="seeContent2"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disabledWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockCest.xml
deleted file mode 100644
index ebfa1c91d2ff8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockCest.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="VerifyTinyMCEv4IsNativeWYSIWYGOnBlockCest">
-        <annotations>
-            <features value="TinyMCEv4"/>
-            <stories value="Apply new WYSIWYG on Block Page-MAGETWO-42046"/>
-            <group value="blockWYSIWYG"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <env value="phantomjs"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="DefaultTinyMCEv4onBlockPage">
-            <annotations>
-                <title value="Admin see TinyMCEv4.6 is native WYSIWYG on Block"/>
-                <description value="Admin see TinyMCEv4.6 is native WYSIWYG on Block"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-84184 "/>
-            </annotations>
-            <amOnPage url="{{BlocksPage.url}}" stepKey="amOnNewBlockPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle"/>
-            <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/>
-            <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
-            <waitForElementVisible selector="{{BlockWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE" />
-            <seeElement selector="{{BlockWYSIWYGSection.TinyMCE4}}" stepKey="seeTinyMCE4" />
-            <seeElement selector="{{BlockWYSIWYGSection.Style}}" stepKey="assertInfo2"/>
-            <seeElement selector="{{BlockWYSIWYGSection.Bold}}" stepKey="assertInfo3"/>
-            <seeElement selector="{{BlockWYSIWYGSection.Italic}}" stepKey="assertInfo4"/>
-            <seeElement selector="{{BlockWYSIWYGSection.Underline}}" stepKey="assertInfo5"/>
-            <seeElement selector="{{BlockWYSIWYGSection.AlignLeft}}" stepKey="assertInfo6"/>
-            <seeElement selector="{{BlockWYSIWYGSection.AlignCenter}}" stepKey="assertInfo7"/>
-            <seeElement selector="{{BlockWYSIWYGSection.AlignRight}}" stepKey="assertInfo8"/>
-            <seeElement selector="{{BlockWYSIWYGSection.Numlist}}" stepKey="assertInfo9"/>
-            <seeElement selector="{{BlockWYSIWYGSection.Bullet}}" stepKey="assertInfo10"/>
-            <seeElement selector="{{BlockWYSIWYGSection.InsertLink}}" stepKey="assertInfo11"/>
-            <seeElement selector="{{BlockWYSIWYGSection.InsertImageIcon}}" stepKey="assertInf12"/>
-            <seeElement selector="{{BlockWYSIWYGSection.InsertTable}}" stepKey="assertInfo13"/>
-            <seeElement selector="{{BlockWYSIWYGSection.SpecialCharacter}}" stepKey="assertInfo14"/>
-            <seeElement selector="{{BlockWYSIWYGSection.InsertWidgetIcon}}" stepKey="assertInfo15"/>
-            <!--<seeElement selector="{{BlockWYSIWYGSection.InsertVariableIcon}}" stepKey="assertInfo16"/>-->
-            <executeJS function="tinyMCE.get('cms_block_form_content').setContent('Hello Block Page!');" stepKey="executeJSFillContent"/>
-            <click selector="{{BlockWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn1" />
-            <waitForElementVisible selector="{{BlockWYSIWYGSection.InsertWidgetBtn}}" stepKey="waitForInsertWidget" />
-            <see selector="{{BlockWYSIWYGSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="assertInf17"/>
-            <see selector="{{BlockWYSIWYGSection.InsertWidgetBtn}}" userInput="Insert Widget..." stepKey="assertInfo18"/>
-            <see selector="{{BlockWYSIWYGSection.InsertVariableBtn}}" userInput="Insert Variable..." stepKey="assertInfo19"/>
-            <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
-            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <waitForElementVisible selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="waitForCMSPageGrid" />
-            <click selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="clickSelect" />
-            <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit('$$createCMSPage.identifier$$')}}" stepKey="waitForEditLink" />
-            <click selector="{{CmsPagesPageActionsSection.edit('$$createCMSPage.identifier$$')}}" stepKey="clickEdit" />
-            <waitForPageLoad stepKey="waitForPageLoad3" />
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="waitforShowHideBtn" />
-            <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2"/>
-            <waitForElementVisible selector="{{WidgetSection.InsertWidget}}"  stepKey="waitForInsertInsertWidgetBtn" />
-            <seeElement selector="{{WidgetSection.InsertWidget}}"  stepKey="widgetBtn" />
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
-            <waitForPageLoad stepKey="wait2"/>
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static" stepKey="selectCMSStaticBlock" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
-            <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
-            <waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.title)}}" stepKey="waitForBlockTitle" />
-            <click selector="{{WidgetSection.BlockPage(_defaultBlock.title)}}" stepKey="selectPreCreateBlock" />
-            <wait time="3" stepKey="wait1" />
-            <click selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="clickInsertWidgetBtn" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
-            <waitForPageLoad stepKey="waitForPageLoad4" />
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="wait2" />
-            <!--see widget on Storefront-->
-            <see userInput="Hello Block Page!" stepKey="seeContent"/>
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disabledWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageCest.xml
deleted file mode 100644
index f9711ac9fbbb0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Cest/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageCest.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageCest">
-        <annotations>
-            <features value="TinyMCEv4"/>
-            <stories value="Apply new WYSIWYG on CMS Page-MAGETWO-42046"/>
-            <group value="cmsWYSIWYG"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <env value="phantomjs"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-        </before>
-        <test name="DefaultTinyMCEv4onCMSPage">
-            <annotations>
-                <title value="Admin see TinyMCEv4.6 is native WYSIWYG on CMS Page"/>
-                <description value="Admin see TinyMCEv4.6 is native WYSIWYG on CMS Page"/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-84182 "/>
-            </annotations>
-            <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <click selector="{{CmsPagesPageActionsSection.addNewPage}}" stepKey="clickAddNewPage"/>
-            <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
-            <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_defaultCmsPage.content_heading}}" stepKey="fillFieldContentHeading"/>
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE" />
-            <seeElement selector="{{CmsWYSIWYGSection.TinyMCE4}}" stepKey="seeTinyMCE4" />
-            <seeElement selector="{{CmsWYSIWYGSection.Style}}" stepKey="assertInfo2"/>
-            <seeElement selector="{{CmsWYSIWYGSection.Bold}}" stepKey="assertInfo3"/>
-            <seeElement selector="{{CmsWYSIWYGSection.Italic}}" stepKey="assertInfo4"/>
-            <seeElement selector="{{CmsWYSIWYGSection.Underline}}" stepKey="assertInfo5"/>
-            <seeElement selector="{{CmsWYSIWYGSection.AlignLeft}}" stepKey="assertInfo6"/>
-            <seeElement selector="{{CmsWYSIWYGSection.AlignCenter}}" stepKey="assertInfo7"/>
-            <seeElement selector="{{CmsWYSIWYGSection.AlignRight}}" stepKey="assertInfo8"/>
-            <seeElement selector="{{CmsWYSIWYGSection.Numlist}}" stepKey="assertInfo9"/>
-            <seeElement selector="{{CmsWYSIWYGSection.Bullet}}" stepKey="assertInfo10"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertLink}}" stepKey="assertInfo11"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertImageIcon}}" stepKey="assertInf12"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertTable}}" stepKey="assertInfo13"/>
-            <seeElement selector="{{CmsWYSIWYGSection.SpecialCharacter}}" stepKey="assertInfo14"/>
-            <seeElement selector="{{CmsWYSIWYGSection.InsertWidgetIcon}}" stepKey="assertInfo15"/>
-            <!--<seeElement selector="{{CmsWYSIWYGSection.InsertVariableIcon}}" stepKey="assertInfo16"/>-->
-            <executeJS function="tinyMCE.get('cms_page_form_content').setContent('Hello World!');" stepKey="executeJSFillContent"/>
-            <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
-            <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="waitForInsertWidget" />
-            <see selector="{{CmsWYSIWYGSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="assertInf17"/>
-            <see selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" userInput="Insert Widget..." stepKey="assertInfo18"/>
-            <see selector="{{CmsWYSIWYGSection.InsertVariableBtn}}" userInput="Insert Variable..." stepKey="assertInfo19"/>
-            <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
-            <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
-            <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-            <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <see userInput="{{_defaultCmsPage.content_heading}}" stepKey="seeContentHeading"/>
-            <see userInput="Hello World!" stepKey="seeContent" />
-        </test>
-        <after>
-            <actionGroup ref="DisabledWYSIWYG" stepKey="disabledWYSIWYG"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/BlockPageData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/BlockPageData.xml
deleted file mode 100644
index 10f014859540a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/BlockPageData.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="_defaultBlock" type="block">
-        <data key="title">Default Block</data>
-        <data key="identifier" unique="suffix" >block</data>
-        <data key="content">Here is a block test. Yeah!</data>
-        <data key="active">true</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
deleted file mode 100644
index 5e716c4db10c8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="_defaultCmsPage" type="cms_page">
-        <data key="title">Test CMS Page</data>
-        <data key="content_heading">Test Content Heading</data>
-        <data key="content">Sample page content. Yada yada yada.</data>
-        <data key="identifier" unique="suffix">test-page-</data>
-        <data key="active">true</data>
-    </entity>
-    <entity name="simpleCmsPage" type="cms_page">
-        <data key="title">Test CMS Page</data>
-        <data key="content_heading">Test Content Heading</data>
-        <data key="content">Sample page content. Yada yada yada.</data>
-        <data key="identifier" unique="suffix">test-page-</data>
-    </entity>
-    <entity name="ImageUpload" type="uploadImage">
-        <data key="title" unique="suffix">Image1</data>
-        <data key="price">1.00</data>
-        <data key="file_type">Upload File</data>
-        <data key="shareable">Yes</data>
-        <data key="file">magento.jpg</data>
-        <data key="content">Image content. Yeah.</data>
-        <data key="height">1000</data>
-    </entity>
-    <entity name="ImageFolder" type="uploadImage">
-        <data key="name" unique="suffix">Test</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/VariableData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/VariableData.xml
deleted file mode 100644
index 35fcfb79e7789..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/VariableData.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="_defaultVariable" type="cms_page">
-        <data key="city"> Austin </data>
-    </entity>
-    <entity name="customVariable" type="cms_page">
-        <data key="code" unique="suffix">variale-code</data>
-        <data key="name">Test Variable</data>
-        <data key="html"> Sample Variable </data>
-        <data key="plain">variable-plain-</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/block-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/block-meta.xml
deleted file mode 100644
index 0b8a174b60da3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/block-meta.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateBlock" dataType="block" type="create" auth="adminOauth" url="/V1/cmsBlock" method="POST">
-        <contentType>application/json</contentType>
-        <object key="block" dataType="block">
-            <field key="title">string</field>
-            <field key="identifier">string</field>
-            <field key="content">string</field>
-            <field key="active">true</field>
-        </object>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/cms-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/cms-meta.xml
deleted file mode 100644
index 0224ec994fd41..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/cms-meta.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateCMSPage" dataType="cms_page" type="create" auth="adminOauth" url="/V1/cmsPage" method="POST">
-        <contentType>application/json</contentType>
-        <object key="page" dataType="cms_page">
-            <field key="identifier">string</field>
-            <field key="title">string</field>
-            <field key="content_heading">string</field>
-            <field key="active">true</field>
-            <field key="content">string</field>
-        </object>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/BlockPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/BlockPage.xml
deleted file mode 100644
index 51a1eab72033e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/BlockPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="BlocksPage" url="admin/cms/block/new/" module="Magento_Block">
-        <section name="BlockPageActionsSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewPagePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewPagePage.xml
deleted file mode 100644
index fd75faa59f5ae..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewPagePage.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CmsNewPagePage" url="admin/cms/page/new" module="Magento_Cms">
-        <section name="CmsNewPagePageActionsSection"/>
-        <section name="CmsNewPagePageBasicFieldsSection"/>
-        <section name="CmsNewPagePageContentSection"/>
-        <section name="CmsNewPagePageSeoSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsPagesPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsPagesPage.xml
deleted file mode 100644
index a3e9406b99095..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsPagesPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CmsPagesPage" url="admin/cms/page" module="Magento_Cms">
-        <section name="CmsPagesPageActionsSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md
deleted file mode 100644
index d1214efec9128..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Cms** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageActionsSection.xml
deleted file mode 100644
index b3a3e5800f257..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageActionsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="BlockNewPagePageActionsSection">
-        <element name="saveBlock" type="button" selector="#save" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageBasicFieldsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageBasicFieldsSection.xml
deleted file mode 100644
index f6e580dd2390c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageBasicFieldsSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="BlockNewPageBasicFieldsSection">
-        <element name="blockTitle" type="input" selector="input[name=title]"/>
-        <element name="identifier" type="input" selector="input[name=identifier]"/>
-        <element name="storeView" type="multiselect" selector="select[name=store_id]"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageContentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageContentSection.xml
deleted file mode 100644
index 87ba1c5d55571..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockNewPageContentSection.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="BlockWYSIWYGSection">
-        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
-        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
-        <element name="ShowHideBtn" type="button" selector="#togglecms_block_form_content"/>
-        <element name="InsertWidgetBtn" type="button" selector=".scalable.action-add-widget.plugin"/>
-        <element name="InsertWidgetIcon" type="button" selector="#icon"/>
-        <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
-        <element name="InsertVariableIcon" type="button" selector="#icon"/>
-        <element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
-        <element name="InsertImageIcon" type="button" selector=".mce-i-image"/>
-        <element name="Browse" type="button" selector=".mce-i-browse"/>
-        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
-        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
-        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
-        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
-        <element name="UploadImage" type="file" selector=".fileupload" />
-        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
-        <element name="InsertFile" type="text" selector="#insert_files"/>
-        <element name="CreateFolder" type="button" selector="#new_folder" />
-        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
-        <element name="CancelBtn" type="button" selector="#cancel" />
-        <element name="Style" type="button" selector=".mce-txt" />
-        <element name="Bold" type="button" selector=".mce-i-bold" />
-        <element name="Italic" type="button" selector=".mce-i-italic" />
-        <element name="Underline" type="button" selector=".mce-i-underline" />
-        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
-        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
-        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
-        <element name="Bullet" type="button" selector=".mce-i-bullist" />
-        <element name="Numlist" type="button" selector=".mce-i-numlist" />
-        <element name="InsertLink" type="button" selector=".mce-i-link" />
-        <element name="InsertImage" type="button" selector=".mce-i-image" />
-        <element name="InsertTable" type="button" selector=".mce-i-table" />
-        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
-        <element name="FolderName" type="button" selector="input[data-role='promptField']" />
-        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
-        <element name="StorageRoot" type="button" selector="#root > .jstree-icon" />
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
deleted file mode 100644
index 821387919a3fa..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="BlockPageActionsSection">
-        <element name="addNewBlock" type="button" selector="#add" timeout="30"/>
-    </section>
-</config>
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
deleted file mode 100644
index 521489186e4ca..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CmsNewPagePageActionsSection">
-        <element name="savePage" type="button" selector="#save" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
deleted file mode 100644
index 6cd0bfc98c881..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CmsNewPagePageBasicFieldsSection">
-        <element name="pageTitle" type="input" selector="input[name=title]"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
deleted file mode 100644
index 1d189754b2fdf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CmsNewPagePageContentSection">
-        <element name="header" type="button" selector="div[data-index=content]"/>
-        <element name="contentHeading" type="input" selector="input[name=content_heading]"/>
-        <element name="content" type="input" selector="#cms_page_form_content"/>
-    </section>
-    <section name="CmsWYSIWYGSection">
-        <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
-        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
-        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
-        <element name="ShowHideBtn" type="button" selector="#togglecms_page_form_content"/>
-        <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
-        <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
-        <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
-        <element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
-        <element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
-        <element name="InsertImageIcon" type="button" selector=".mce-i-image"/>
-        <element name="Browse" type="button" selector=".mce-i-browse"/>
-        <element name="BrowseUploadImage" type="file" selector=".fileupload" />
-        <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-        <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
-        <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
-        <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
-        <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
-        <element name="UploadImage" type="file" selector=".fileupload" />
-        <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
-        <element name="InsertFile" type="text" selector="#insert_files"/>
-        <element name="CreateFolder" type="button" selector="#new_folder" />
-        <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
-        <element name="CancelBtn" type="button" selector="#cancel" />
-        <element name="Style" type="button" selector=".mce-txt" />
-        <element name="Bold" type="button" selector=".mce-i-bold" />
-        <element name="Italic" type="button" selector=".mce-i-italic" />
-        <element name="Underline" type="button" selector=".mce-i-underline" />
-        <element name="AlignLeft" type="button" selector=".mce-i-alignleft" />
-        <element name="AlignCenter" type="button" selector=".mce-i-aligncenter" />
-        <element name="AlignRight" type="button" selector=".mce-i-alignright" />
-        <element name="Bullet" type="button" selector=".mce-i-bullist" />
-        <element name="Numlist" type="button" selector=".mce-i-numlist" />
-        <element name="InsertLink" type="button" selector=".mce-i-link" />
-        <element name="InsertImage" type="button" selector=".mce-i-image" />
-        <element name="InsertTable" type="button" selector=".mce-i-table" />
-        <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
-        <element name="FolderName" type="button" selector="input[data-role='promptField']" />
-        <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
-        <element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
-        <element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
-        <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
-    </section>
-    <section name="VariableSection">
-        <element name="InsertWidget" type="button" selector="#insert_variable"/>
-        <element name="InsertVariableBtnEnabled" type="button" selector="//button[@id='insert_variable' and not(contains(@class,'disabled'))]"/>
-        <element name="InsertVariableBtnDisabled" type="button" selector="//button[@id='insert_variable' and contains(@class,'disabled')]"/>
-        <element name="CancelBtnEnabled" type="button" selector="//button[@class='action-scalable cancel' and not(contains(@class,'disabled'))]"/>
-        <element name="Close" type="button" selector="#close"/>
-        <element name="SearchTxtbox" type="input" selector="input[placeholder='Search by keyword']"/>
-        <element name="ColName" type="text" selector="//table[@class='data-grid data-grid-draggable']/thead/tr/th/span[text()='{{var1}}']" parameterized="true"/>
-        <element name="Radio" type="input" selector="//input[@type='radio' and contains(@value, '{{var1}}')]" parameterized="true"/>
-        <element name="VariableRadio" type="input" selector="//div[text()='{{var1}}']/parent::td//preceding-sibling::td/input[@type='radio']" parameterized="true"/>
-        <element name="VariableInAscSort" type="input" selector="#variable"/>
-        <element name="VariableInDescSort" type="input" selector="#variable"/>
-        <element name="Type" type="input" selector="#value"/>
-        <element name="Code" type="input" selector="#code"/>
-        <element name="searchResult" type="text" selector="//table/tbody/tr//td/div[text()='{{var1}}']" parameterized="true" />
-        <element name="VariableTitle" type="text" selector="//h1[contains(text(), 'Insert Variable')]"/>
-    </section>
-    <section name="WidgetSection">
-        <element name="InsertWidgetTitle" type="text" selector="//h1[contains(text(),'Insert Widget')]"/>
-        <element name="SelectCategoryTitle" type="text" selector="//h1[contains(text(),'Select Category')]"/>
-        <element name="SelectProductTitle" type="text" selector="//h1[contains(text(),'Select Product')]"/>
-        <element name="SelectPageTitle" type="text" selector="//h1[contains(text(),'Select Page')]"/>
-        <element name="SelectBlockTitle" type="text" selector="//h1[contains(text(),'Select Block')]"/>
-        <element name="InsertWidget" type="button" selector="#insert_button"/>
-        <element name="InsertWidgetBtnDisabled" type="button" selector="//button[@id='insert_button' and contains(@class,'disabled')]"/>
-        <element name="InsertWidgetBtnEnabled" type="button" selector="//button[@id='insert_button' and not(contains(@class,'disabled'))]"/>
-        <element name="CancelBtnEnabled" type="button" selector="//button[@id='reset' and not(contains(@class,'disabled'))]"/>
-        <element name="Close" type="button" selector="#close"/>
-        <element name="WidgetType" type="button" selector="#select_widget_type"/>
-        <element name="WidgetTemplate" type="button" selector="select[name='parameters[template]']"/>
-        <element name="BtnChooser" type="button" selector=".btn-chooser"/>
-        <element name="CMSPage" type="text" selector="//td[contains(text(),'Home page')]"/>
-        <element name="BlockPage" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
-        <element name="PreCreateCategory" type="text" selector=" //span[contains(text(),'{{var1}}')]" parameterized="true"/>
-        <element name="PreCreateProduct" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
-        <element name="NoOfProductToDisplay" type="input" selector="input[data-ui-id='wysiwyg-widget-options-fieldset-element-text-parameters-products-count']"/>
-        <element name="AddParam" type="button" selector=".rule-param-add"/>
-        <element name="ConditionsDropdown" type="select" selector="#conditions__1__new_child"/>
-        <element name="RuleParam" type="button" selector="//a[text()='...']"/>
-        <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
-        <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
-        <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
-        <element name="ButtonToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
-        <!--Widget on Storefront-->
-        <element name="CategoryWidget" type="text" selector="//a[@href='http://magento2.vagrant42/{{var1}}.html?___store=default']" parameterized="true"/>
-        <element name="CMSPageWidget" type="text" selector="//a[@href='http://magento2.vagrant42/home']"/>
-        <!--Compare on Storefront-->
-        <element name="ProductName" type="text" selector=".product.name.product-item-name" />
-        <element name="CompareBtn" type="button" selector=".action.tocompare"/>
-        <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
-        <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
-
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
deleted file mode 100644
index 56dbe2fad0058..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CmsNewPagePageSeoSection">
-        <element name="header" type="button" selector="div[data-index=search_engine_optimisation]" timeout="30"/>
-        <element name="urlKey" type="input" selector="input[name=identifier]"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
deleted file mode 100644
index eb2686ecb1cfd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CmsPagesPageActionsSection">
-        <element name="addNewPage" type="button" selector="#add" timeout="30"/>
-        <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
-        <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
deleted file mode 100644
index d0c838d99a1ac..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontCMSPageSection">
-        <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json
deleted file mode 100644
index 5f55a2cabb350..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cms",
-    "description": "Magento 2 Functional Test Module Cms",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Cms\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md
deleted file mode 100644
index cc52700eba988..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CmsUrlRewrite** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json
deleted file mode 100644
index 764444c8e7235..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cms-url-rewrite",
-    "description": "Magento 2 Functional Test Module Cms Url Rewrite",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CmsUrlRewrite\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md
deleted file mode 100644
index eb0b57b2886f2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Config** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/ContentManagementSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/ContentManagementSection.xml
deleted file mode 100644
index 26268d763389d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/ContentManagementSection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="ContentManagementSection">
-        <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
-        <element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
-        <element name="EnableSystemValue" type="button" selector="#cms_wysiwyg_enabled_inherit"/>
-        <element name="EnableWYSIWYG" type="button" selector="#cms_wysiwyg_enabled"/>
-        <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit"/>
-        <element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
-        <element name="Save" type="button" selector="#save"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml
deleted file mode 100644
index 0c3d342006580..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StoreConfigSection">
-        <element name="CheckIfTabExpand" type="button" selector="#general_store_information-head:not(.open)"/>
-        <element name="StoreInformation" type="button" selector="#general_store_information-head"/>
-        <element name="City" type="input" selector="#general_store_information_city"/>
-        <element name="Save" type="button" selector="#save"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json
deleted file mode 100644
index c6aa7ca8ab453..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-config",
-    "description": "Magento 2 Functional Test Module Config",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cron": "100.0.0-dev",
-        "magento/magento2-functional-test-module-deploy": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Config\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md
deleted file mode 100644
index 1cf979955a3cd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ConfigurableImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json
deleted file mode 100644
index 1b2fb5e35ae35..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-configurable-import-export",
-    "description": "Magento 2 Functional Test Module Configurable Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ConfigurableImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
deleted file mode 100644
index f861167972882..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Cest/AdminCreateConfigurableProductCest.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateConfigurableProductCest">
-        <annotations>
-            <features value="Product Creation"/>
-            <stories value="Create a Configurable Product via the Admin"/>
-        </annotations>
-        <before>
-            <loginAsAdmin stepKey="loginAsAdmin"/>
-        </before>
-        <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-        <test name="CreateConfigurableProductViaAdmin">
-            <annotations>
-                <title value="Create a Configurable Product via the Admin."/>
-                <description value="You should be able to create a Configurable Product via the Admin."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-26041"/>
-                <group value="configurable"/>
-                <group value="product"/>
-                <group value="skip"/>
-            </annotations>
-            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryGridPage"/>
-            <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-
-            <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
-            <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="enterCategoryName"/>
-            <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSeoSection"/>
-            <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterUrlKey"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickOnSaveCategory"/>
-            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
-
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-            <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
-            <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
-            <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
-            <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-            <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-            <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-            <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
-            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{_defaultCategory.name}}]" stepKey="searchAndSelectCategory"/>
-            <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-            <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-
-            <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
-            <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
-            <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
-            <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
-
-            <switchToIFrame stepKey="switchOutOfIFrame"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
-            <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
-            <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
-            <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
-            <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
-            <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
-
-            <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-            <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
-            <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-            <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-
-            <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-            <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitle"/>
-
-            <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeName3InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeSku1InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeSku2InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeSku3InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" stepKey="seeUniquePrice1InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" stepKey="seeUniquePrice2InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/>
-            <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
-
-            <amOnPage url="/" stepKey="amOnStorefront"/>
-            <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
-
-            <click userInput="{{_defaultCategory.name}}" stepKey="clickOnCategoryName"/>
-            <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
-
-            <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
-            <see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
-            <click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
-            <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
-
-            <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
-            <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
-            <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
-            <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
-
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
-            <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
deleted file mode 100644
index ce15d793ac5a3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="BaseConfigurableProduct" type="product">
-        <data key="sku" unique="suffix">configurable</data>
-        <data key="type_id">configurable</data>
-        <data key="attribute_set_id">4</data>
-        <data key="visibility">4</data>
-        <data key="name" unique="suffix">configurable</data>
-        <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">configurableurlkey</data>
-        <data key="status">1</data>
-        <data key="quantity">100</data>
-        <required-entity type="product_extension_attribute">EavStockItem</required-entity>
-        <required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
-    </entity>
-    <entity name="ConfigurableProductAddChild" type="ConfigurableProductAddChild">
-        <var key="sku" entityKey="sku" entityType="product" />
-        <var key="childSku" entityKey="sku" entityType="product2"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductOptionData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductOptionData.xml
deleted file mode 100644
index 58697b765812f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductOptionData.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="ConfigurableProductTwoOptions" type="ConfigurableProductOption">
-        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
-        <data key="label">option</data>
-        <required-entity type="ValueIndex">ValueIndex1</required-entity>
-        <required-entity type="ValueIndex">ValueIndex2</required-entity>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ValueIndexData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ValueIndexData.xml
deleted file mode 100644
index 58a28b0fe0fc7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ValueIndexData.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="ValueIndex1" type="ValueIndex">
-        <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
-    </entity>
-    <entity name="ValueIndex2" type="ValueIndex">
-        <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_add_child-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_add_child-meta.xml
deleted file mode 100644
index a438c92753a59..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_add_child-meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="ConfigurableProductAddChild" dataType="ConfigurableProductAddChild" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/child" method="POST">
-        <contentType>application/json</contentType>
-        <field key="childSku">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_options-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_options-meta.xml
deleted file mode 100644
index 4792eafaf061b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_options-meta.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateConfigurableProductOption" dataType="ConfigurableProductOption" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/options" method="POST">
-        <contentType>application/json</contentType>
-        <object dataType="ConfigurableProductOption" key="option">
-            <field key="attribute_id">integer</field>
-            <field key="label">string</field>
-            <array key="values">
-                <value>ValueIndex</value>
-            </array>
-        </object>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/extension_attribute_configurable_product_options-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/extension_attribute_configurable_product_options-meta.xml
deleted file mode 100644
index 757e1d66f4725..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/extension_attribute_configurable_product_options-meta.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateExtensionAttributeConfigProductOption" dataType="ExtensionAttributeConfigProductOption" type="create">
-        <contentType>application/json</contentType>
-        <array key="configurable_product_options">
-            <object dataType="ExtensionAttributeConfigProductOption" key="configurable_product_options">
-                <array key="0">
-                    <value>ConfigProductOption</value>
-                </array>
-            </object>
-        </array>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/valueIndex-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/valueIndex-meta.xml
deleted file mode 100644
index a0e9c0b790d0f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/valueIndex-meta.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="ValueIndex" dataType="ValueIndex" type="create">
-        <field key="value_index">integer</field>
-    </operation>
-</config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md
deleted file mode 100644
index 3db572028f728..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ConfigurableProduct** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
deleted file mode 100644
index 580578d805f40..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-configurable-product",
-    "description": "Magento 2 Functional Test Module Configurable Product",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ConfigurableProduct\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/README.md
new file mode 100644
index 0000000000000..bacebfd269160
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_ConfigurableProductCatalogSearch** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..f5cd41bda74d7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <!-- Search configurable product -->
+        <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="searchAssertFilterCategoryConfigProduct" after="commentSearchConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="searchGrabConfigProductImageSrc" after="searchAssertFilterCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabConfigProductImageSrc" stepKey="searchAssertConfigProductImageNotDefault" after="searchGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="searchClickConfigProductView" after="searchAssertConfigProductImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="searchAssertConfigProductPage" after="searchClickConfigProductView">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
+   </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..3e386a034eecc
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <!-- Search configurable product -->
+        <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="searchAssertFilterCategoryConfigProduct" after="commentSearchConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="searchGrabConfigProductImageSrc" after="searchAssertFilterCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabConfigProductImageSrc" stepKey="searchAssertConfigProductImageNotDefault" after="searchGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="searchClickConfigProductView" after="searchAssertConfigProductImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="searchAssertConfigProductPage" after="searchClickConfigProductView">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md
deleted file mode 100644
index ebd5a01b14fa9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ConfigurableProductSales** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json
deleted file mode 100644
index eb1f9891fa068..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-configurable-product-sales",
-    "description": "Magento 2 Functional Test Module Configurable Product Sales",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ConfigurableProductSales\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
new file mode 100644
index 0000000000000..48b5bd2308310
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!-- Check configurable product in wishlist -->
+    <actionGroup name="StorefrontCustomerCheckConfigurableProductInWishlist">
+        <arguments>
+            <argument name="productVar"/>
+            <argument name="optionProductVar" />
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistProductName"/>
+        <see userInput="${{optionProductVar.price}}.00" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistProductPrice"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(productVar.name)}}" stepKey="wishlistMoveMouseOverProduct" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistProductImage" />
+    </actionGroup>
+
+    <!-- Check configurable product in wishlist sidebar -->
+    <actionGroup name="StorefrontCustomerCheckConfigurableProductInWishlistSidebar">
+        <arguments>
+            <argument name="productVar"/>
+            <argument name="optionProductVar" />
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistSidebarProductName"/>
+        <see userInput="${{optionProductVar.price}}.00" selector="{{StorefrontCustomerWishlistSidebarSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductPrice"/>
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistSidebarAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md
new file mode 100644
index 0000000000000..96b277513a414
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_ConfigurableProduct** and **Magento_Wishlist** Modules.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..d3b009eecf877
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <!-- Step 5: Add products to wishlist -->
+        <!-- Add Configurable Product to wishlist -->
+        <comment userInput="Add Configurable Product to wishlist" stepKey="commentAddConfigurableProductToWishlist" before="endOfAddingProductsToWishlist" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" after="commentAddConfigurableProductToWishlist" stepKey="wishlistGotoCategory3"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" after="wishlistGotoCategory3" stepKey="wishlistClickConfigurableProduct"/>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" after="wishlistClickConfigurableProduct" stepKey="wishlistAddConfigurableProductToWishlist">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckConfigurableProductInWishlist" after="wishlistAddConfigurableProductToWishlist" stepKey="wishlistCheckConfigurableProductInWishlist">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionProductVar" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckConfigurableProductInWishlistSidebar" after="wishlistCheckConfigurableProductInWishlist" stepKey="wishlistCheckConfigurableProductInWishlistSidebar">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionProductVar" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md
deleted file mode 100644
index 1baafbefac03a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Contact** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json
deleted file mode 100644
index 55311d1c6fcd0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-contact",
-    "description": "Magento 2 Functional Test Module Contact",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Contact\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md
deleted file mode 100644
index ed80d8f232ca7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Cookie** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json
deleted file mode 100644
index 2fd3ec251ae38..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cookie",
-    "description": "Magento 2 Functional Test Module Cookie",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Cookie\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md
deleted file mode 100644
index a3394b9a18177..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Cron** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json
deleted file mode 100644
index 7982a6dd9c4e8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cron",
-    "description": "Magento 2 Functional Test Module Cron",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Cron\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md
deleted file mode 100644
index e5e9c0458b1b6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CurrencySymbol** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json
deleted file mode 100644
index abd3fe78abde0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-currency-symbol",
-    "description": "Magento 2 Functional Test Module Currency Symbol",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CurrencySymbol\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml
deleted file mode 100644
index b0a4cb06c0842..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/AdminCreateCustomerCest.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateCustomerCest">
-        <annotations>
-            <features value="Customer Creation"/>
-            <stories value="Create a Customer via the Admin"/>
-        </annotations>
-        <test name="CreateCustomerViaAdminCest">
-            <annotations>
-                <title value="You should be able to create a customer in the Admin back-end."/>
-                <description value="You should be able to create a customer in the Admin back-end."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-72095"/>
-                <group value="customer"/>
-                <group value="create"/>
-            </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
-            <fillField userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-            <click selector="{{AdminCustomerMainActionsSection.addNewCustomer}}" stepKey="clickCreateCustomer"/>
-            <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminNewCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-            <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminNewCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-            <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminNewCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-            <click selector="{{AdminNewCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-            <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner1"/>
-            <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-            <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
-            <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
-            <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
-            <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner2"/>
-            <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
-            <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
-            <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml
deleted file mode 100644
index 80ab4ea6d9c13..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontCreateCustomerCest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="StorefrontCreateCustomerCest">
-        <annotations>
-            <features value="Customer Creation"/>
-            <stories value="Create a Customer via the Storefront"/>
-        </annotations>
-        <test name="CreateCustomerViaStorefront">
-            <annotations>
-                <title value="You should be able to create a customer via the storefront"/>
-                <description value="You should be able to create a customer via the storefront."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-23546"/>
-                <group value="customer"/>
-                <group value="create"/>
-            </annotations>
-            <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
-            <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
-            <fillField  stepKey="fillFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
-            <fillField  stepKey="fillLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
-            <fillField  stepKey="fillEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
-            <fillField  stepKey="fillPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
-            <fillField  stepKey="fillConfirmPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
-            <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-            <see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
-            <see stepKey="seeFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see stepKey="seeLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see stepKey="seeEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-        </test>
-    </cest>
-</config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
deleted file mode 100644
index 2045fd3a97a22..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Cest/StorefrontPersistedCustomerLoginCest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="StorefrontPersistedCustomerLoginCest">
-        <annotations>
-            <features value="Persisted customer can login from storefront."/>
-            <stories value="Persisted customer can login from storefront."/>
-        </annotations>
-        <before>
-            <createData stepKey="customer" entity="Simple_US_Customer"/>
-        </before>
-        <after>
-            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
-        </after>
-        <test name="StorefrontPersistedCustomerLoginTest">
-            <annotations>
-                <title value="Persisted customer can login from storefront."/>
-                <description value="Persisted customer can login from storefront."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="MAGETWO-72103"/>
-                <group value="customer"/>
-            </annotations>
-            <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-            <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-            <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-            <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
deleted file mode 100644
index c38dc9f1ad79a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="CustomerAddressSimple" type="address">
-        <data key="id">0</data>
-        <data key="customer_id">12</data>
-        <required-entity type="region">CustomerRegionOne</required-entity>
-        <data key="region_id">0</data>
-        <data key="country_id">USA</data>
-        <array key="street">
-            <item>7700 W Parmer Ln</item>
-            <item>Bld D</item>
-        </array>
-        <data key="company">Magento</data>
-        <data key="telephone">1234568910</data>
-        <data key="fax">1234568910</data>
-        <data key="postcode">78729</data>
-        <data key="city">Austin</data>
-        <data key="state">Texas</data>
-        <data key="firstname">John</data>
-        <data key="lastname">Doe</data>
-        <data key="middlename">string</data>
-        <data key="prefix">Mr</data>
-        <data key="suffix">Sr</data>
-        <data key="vat_id">vatData</data>
-        <data key="default_shipping">true</data>
-        <data key="default_billing">true</data>
-    </entity>
-    <entity name="US_Address_TX" type="address">
-        <data key="firstname">John</data>
-        <data key="lastname">Doe</data>
-        <data key="company">Magento</data>
-        <array key="street">
-            <item>7700 West Parmer Lane</item>
-        </array>
-        <data key="city">Austin</data>
-        <data key="country_id">US</data>
-        <data key="postcode">78729</data>
-        <data key="telephone">512-345-6789</data>
-        <data key="default_billing">Yes</data>
-        <data key="default_shipping">Yes</data>
-        <required-entity type="region">RegionTX</required-entity>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
deleted file mode 100644
index f4bed283bb796..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="CustomerEntityOne" type="customer">
-        <data key="group_id">0</data>
-        <data key="default_billing">defaultBillingValue</data>
-        <data key="default_shipping">defaultShippingValue</data>
-        <data key="confirmation">confirmationData</data>
-        <data key="created_at">12:00</data>
-        <data key="updated_at">12:00</data>
-        <data key="created_in">createdInData</data>
-        <data key="dob">01-01-1970</data>
-        <data key="email" unique="prefix">test@email.com</data>
-        <data key="firstname">John</data>
-        <data key="lastname">Doe</data>
-        <data key="middlename">S</data>
-        <data key="password">pwdTest123!</data>
-        <data key="prefix">Mr</data>
-        <data key="suffix">Sr</data>
-        <data key="gender">0</data>
-        <data key="store_id">0</data>
-        <data key="taxvat">taxValue</data>
-        <data key="website_id">0</data>
-        <required-entity type="address">CustomerAddressSimple</required-entity>
-        <data key="disable_auto_group_change">0</data>
-        <!--required-entity type="extension_attribute">ExtensionAttributeSimple</required-entity-->
-    </entity>
-    <entity name="Simple_US_Customer" type="customer">
-        <data key="group_id">0</data>
-        <data key="default_billing">true</data>
-        <data key="default_shipping">true</data>
-        <data key="email" unique="prefix">John.Doe@example.com</data>
-        <data key="firstname">John</data>
-        <data key="lastname">Doe</data>
-        <data key="password">pwdTest123!</data>
-        <data key="store_id">0</data>
-        <data key="website_id">0</data>
-        <required-entity type="address">US_Address_TX</required-entity>
-    </entity>
-    <entity name="Simple_US_Customer_For_Update" type="customer">
-        <var key="id" entityKey="id" entityType="customer"/>
-        <data key="firstname">Jane</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/ExtensionAttributeSimple.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/ExtensionAttributeSimple.xml
deleted file mode 100644
index 39f7dd4fc2ba1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/ExtensionAttributeSimple.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="ExtensionAttributeSimple" type="extension_attribute">
-        <data key="is_subscribed">true</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/RegionData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/RegionData.xml
deleted file mode 100644
index 9ba5cb7b2c95d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/RegionData.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="CustomerRegionOne" type="region">
-        <data key="region_code">100</data>
-        <data key="region_id">12</data>
-    </entity>
-    <entity name="RegionTX" type="region">
-        <data key="region">Texas</data>
-        <data key="region_code">TX</data>
-        <data key="region_id">1</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_extension_attribute-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_extension_attribute-meta.xml
deleted file mode 100644
index 49f6ae1f2642e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_extension_attribute-meta.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
-        <field key="is_subscribed">boolean</field>
-        <field key="extension_attribute">customer_nested_extension_attribute</field>
-    </operation>
-    <operation name="UpdateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="update">
-        <field key="is_subscribed">boolean</field>
-        <field key="extension_attribute">customer_nested_extension_attribute</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_nested_extension_attribute-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_nested_extension_attribute-meta.xml
deleted file mode 100644
index d7c24c59f7119..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_nested_extension_attribute-meta.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateNestedExtensionAttribute" dataType="customer_nested_extension_attribute" type="create">
-        <field key="id">integer</field>
-        <field key="customer_id">integer</field>
-        <field key="value">string</field>
-    </operation>
-    <operation name="UpdateNestedExtensionAttribute" dataType="customer_nested_extension_attribute" type="update">
-        <field key="id">integer</field>
-        <field key="customer_id">integer</field>
-        <field key="value">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/region-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/region-meta.xml
deleted file mode 100644
index c126ef3709d86..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/region-meta.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateRegion" dataType="region" type="create">
-        <field key="region_code">string</field>
-        <field key="region">string</field>
-        <field key="region_id">string</field>
-        <field key="extension_attributes">extension_attributes</field>
-    </operation>
-    <operation name="UpdateRegion" dataType="region" type="update">
-        <field key="region_code">string</field>
-        <field key="region">string</field>
-        <field key="region_id">string</field>
-        <field key="extension_attributes">empty_extension_attribute</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml
deleted file mode 100644
index 8497767309607..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminCustomerPage" url="/admin/customer/index/" module="Customer">
-        <section name="AdminCustomerMainActionsSection"/>
-        <section name="AdminCustomerMessagesSection"/>
-        <section name="AdminCustomerGridSection"/>
-        <section name="AdminCustomerFiltersSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml
deleted file mode 100644
index 5535e229f1386..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminNewCustomerPage" url="/admin/customer/index/new" module="Customer">
-        <section name="AdminNewCustomerAccountInformationSection"/>
-        <section name="AdminNewCustomerMainActionsSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerCreatePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerCreatePage.xml
deleted file mode 100644
index 3949babe77274..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerCreatePage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontCustomerCreatePage" url="/customer/account/create/" module="Magento_Customer">
-        <section name="StorefrontCustomerCreateFormSection" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerDashboardPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerDashboardPage.xml
deleted file mode 100644
index 34b25b514448e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerDashboardPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontCustomerDashboardPage" url="/customer/account/" module="Magento_Customer">
-        <section name="StorefrontCustomerDashboardAccountInformationSection" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerSignInPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerSignInPage.xml
deleted file mode 100644
index 1500e59b4f0ae..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerSignInPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontCustomerSignInPage" url="/customer/account/login/" module="Magento_Customer">
-        <section name="StorefrontCustomerSignInFormSection" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.xml
deleted file mode 100644
index 42a4336cc6483..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontProductPage" url="/" module="Magento_Customer">
-        <section name="StorefrontPanelHeader" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md
deleted file mode 100644
index cb51dcef8c48e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Customer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
deleted file mode 100644
index e1c4639eccc06..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCustomerFiltersSection">
-        <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
-        <element name="nameInput" type="input" selector="input[name=name]"/>
-        <element name="emailInput" type="input" selector="input[name=email]"/>
-        <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
deleted file mode 100644
index efc54c77c5f86..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCustomerGridSection">
-        <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
deleted file mode 100644
index e673dfd75771b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCustomerMainActionsSection">
-        <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
deleted file mode 100644
index 972a8cd6feac0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCustomerMessagesSection">
-        <element name="successMessage" type="text" selector=".message-success"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml
deleted file mode 100644
index 7ba2dd5937d56..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminNewCustomerAccountInformationSection">
-        <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
-        <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
-        <element name="email" type="input" selector="input[name='customer[email]']"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml
deleted file mode 100644
index c8ca91e9eec61..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminNewCustomerMainActionsSection">
-        <element name="saveButton" type="button" selector="#save" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
deleted file mode 100644
index e578d9c064c87..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontCustomerCreateFormSection">
-        <element name="firstnameField" type="input" selector="#firstname"/>
-        <element name="lastnameField" type="input" selector="#lastname"/>
-        <element name="emailField" type="input" selector="#email_address"/>
-        <element name="passwordField" type="input" selector="#password"/>
-        <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
-        <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
deleted file mode 100644
index 6d5eb53adc9d8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontCustomerDashboardAccountInformationSection">
-        <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
deleted file mode 100644
index 41b14ac84c0a9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontCustomerSignInFormSection">
-        <element name="emailField" type="input" selector="#email"/>
-        <element name="passwordField" type="input" selector="#pass"/>
-        <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
deleted file mode 100644
index e7072579cc79b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontPanelHeaderSection">
-        <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json
deleted file mode 100644
index 619e4f895373b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-customer",
-    "description": "Magento 2 Functional Test Module Customer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-newsletter": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-review": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Customer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md
deleted file mode 100644
index ad6ab29c57026..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CustomerAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json
deleted file mode 100644
index 84a73e12eb4ff..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-customer-analytics",
-    "description": "Magento 2 Acceptance Test Module Customer Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CustomerAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CustomerAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md
deleted file mode 100644
index ebeb51bf1e4f2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CustomerImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json
deleted file mode 100644
index dfa5a2761e5a4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-customer-import-export",
-    "description": "Magento 2 Functional Test Module Customer Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CustomerImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md
deleted file mode 100644
index 20704cfd90ce6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Deploy** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json
deleted file mode 100644
index 8f5f42b11e85a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-deploy",
-    "description": "Magento 2 Functional Test Module Deploy",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Deploy\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md
deleted file mode 100644
index 4aff70291bbf6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Developer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json
deleted file mode 100644
index ed52481f544f0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-developer",
-    "description": "Magento 2 Functional Test Module Developer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Developer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md
deleted file mode 100644
index bda156c74e0ca..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Dhl** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json
deleted file mode 100644
index a7c5fd0f6cf5f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-dhl",
-    "description": "Magento 2 Functional Test Module Dhl",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Dhl\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md
deleted file mode 100644
index b028b5b4c9ca5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Directory** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json
deleted file mode 100644
index 9efba5d2592bd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-directory",
-    "description": "Magento 2 Functional Test Module Directory",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Directory\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md
deleted file mode 100644
index cf2e356526c00..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Downloadable** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
deleted file mode 100644
index 242492bc7e013..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-downloadable",
-    "description": "Magento 2 Functional Test Module Downloadable",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Downloadable\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md
deleted file mode 100644
index 7edcc4ffcb395..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_DownloadableImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json
deleted file mode 100644
index 1d45efe751cc3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-downloadable-import-export",
-    "description": "Magento 2 Functional Test Module Downloadable Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\DownloadableImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md
deleted file mode 100644
index 23724b09bd2cf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Eav** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json
deleted file mode 100644
index 457543c13e020..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-eav",
-    "description": "Magento 2 Functional Test Module Eav",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Eav\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md
deleted file mode 100644
index 413b1bcbbb525..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Email** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json
deleted file mode 100644
index 0f8d5b27a3ed5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-email",
-    "description": "Magento 2 Functional Test Module Email",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Email\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md
deleted file mode 100644
index 61aa9a448b743..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_EncryptionKey** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json
deleted file mode 100644
index 4e8debbc89755..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-encryption-key",
-    "description": "Magento 2 Functional Test Module Encryption Key",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\EncryptionKey\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md
deleted file mode 100644
index 93d1828ef4ccd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Fedex** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json
deleted file mode 100644
index ecc4a6e388683..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-fedex",
-    "description": "Magento 2 Functional Test Module Fedex",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Fedex\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md
deleted file mode 100644
index 49fd114a43a24..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GiftMessage** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json
deleted file mode 100644
index 15bc979a7e7b8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-gift-message",
-    "description": "Magento 2 Functional Test Module Gift Message",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GiftMessage\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md
deleted file mode 100644
index 6e3595cd366c6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GoogleAdwords** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json
deleted file mode 100644
index b91c49343d103..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-google-adwords",
-    "description": "Magento 2 Functional Test Module Google Adwords",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GoogleAdwords\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md
deleted file mode 100644
index 0fa9dbd614ae7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GoogleAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json
deleted file mode 100644
index d020e266ca9c5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-google-analytics",
-    "description": "Magento 2 Functional Test Module Google Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-cookie": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GoogleAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md
deleted file mode 100644
index 9bdf02b6170ed..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GoogleOptimizer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json
deleted file mode 100644
index 8dc7207d42b77..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-google-optimizer",
-    "description": "Magento 2 Functional Test Module Google Optimizer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-google-analytics": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GoogleOptimizer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md
deleted file mode 100644
index 1f48eef7f97a7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GraphQl** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json
deleted file mode 100644
index 296a254a4d213..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-graph-ql",
-    "description": "Magento 2 Functional Test Module Graph Ql",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-webapi": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GraphQl\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md
deleted file mode 100644
index 36fb828bbdff7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_GroupedImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json
deleted file mode 100644
index 05f0d72d0e740..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-grouped-import-export",
-    "description": "Magento 2 Functional Test Module Grouped Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-grouped-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GroupedImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md
deleted file mode 100644
index edf1e0dc3d2f5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GroupedProduct** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
deleted file mode 100644
index 036d0130867c8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-grouped-product",
-    "description": "Magento 2 Functional Test Module Grouped Product",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GroupedProduct\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md
deleted file mode 100644
index b762f5fb7351c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json
deleted file mode 100644
index ccd2b010ff738..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-import-export",
-    "description": "Magento 2 Functional Test Module Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md
deleted file mode 100644
index 21212a0fed31e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Indexer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json
deleted file mode 100644
index 7f118d8d4e0aa..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-indexer",
-    "description": "Magento 2 Functional Test Module Indexer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Indexer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md
deleted file mode 100644
index 9975174d27ee7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_InstantPurchase** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json
deleted file mode 100644
index 2004570a0cad6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-instant-purchase",
-    "description": "Magento 2 Functional Test Module Instant Purchase",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-vault": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\InstantPurchase\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md
deleted file mode 100644
index 2f024c81e5141..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Integration** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json
deleted file mode 100644
index 8ff747736c94a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-integration",
-    "description": "Magento 2 Functional Test Module Integration",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-security": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Integration\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md
deleted file mode 100644
index 6c864b9f5eedd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_LayeredNavigation** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json
deleted file mode 100644
index 4579bbc1cbbd8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-layered-navigation",
-    "description": "Magento 2 Functional Test Module Layered Navigation",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\LayeredNavigation\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md
deleted file mode 100644
index 5c744ec36f1be..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Marketplace** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json
deleted file mode 100644
index b1249f0ef9cc0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-marketplace",
-    "description": "Magento 2 Functional Test Module Marketplace",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Marketplace\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md
deleted file mode 100644
index ee885969bb127..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_MediaStorage** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json
deleted file mode 100644
index 6326c8e7af73e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-media-storage",
-    "description": "Magento 2 Functional Test Module Media Storage",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\MediaStorage\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md
deleted file mode 100644
index 1a97c33f497a5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_Msrp** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json
deleted file mode 100644
index fe8ddd6d3b55b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-msrp",
-    "description": "Magento 2 Functional Test Module Msrp",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-grouped-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Msrp\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md
deleted file mode 100644
index b6e1b54d6ac6e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Multishipping** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json
deleted file mode 100644
index 177fc24b9d0d7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-multishipping",
-    "description": "Magento 2 Functional Test Module Multishipping",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Multishipping\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md
deleted file mode 100644
index c6d4c6906be90..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_NewRelicReporting** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json
deleted file mode 100644
index 2a2cda0f85f46..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-new-relic-reporting",
-    "description": "Magento 2 Functional Test Module New Relic Reporting",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\NewRelicReporting\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md
deleted file mode 100644
index 95a365b8b8f79..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Newsletter** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json
deleted file mode 100644
index eb952a34a0483..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-newsletter",
-    "description": "Magento 2 Functional Test Module Newsletter",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Newsletter\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md
deleted file mode 100644
index ba6e5c9680dbd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_OfflinePayments** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json
deleted file mode 100644
index 30c236974bc50..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-offline-payments",
-    "description": "Magento 2 Functional Test Module Offline Payments",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\OfflinePayments\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md
deleted file mode 100644
index 42a12e4398e4f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_OfflineShipping** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json
deleted file mode 100644
index 4decb42f0c1e3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-offline-shipping",
-    "description": "Magento 2 Functional Test Module Offline Shipping",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\OfflineShipping\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md
deleted file mode 100644
index 8db3000b9408a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_PageCache** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json
deleted file mode 100644
index 496108b6f68d9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-page-cache",
-    "description": "Magento 2 Functional Test Module Page Cache",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\PageCache\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md
deleted file mode 100644
index 7a8fcc6210c9e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Payment** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json
deleted file mode 100644
index 354652c143641..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-payment",
-    "description": "Magento 2 Functional Test Module Payment",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Payment\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml
deleted file mode 100644
index 6d2fed324c7c8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="SamplePaypalConfig" type="paypal_config_state">
-        <required-entity type="business_account">SampleBusinessAccount</required-entity>
-        <required-entity type="api_username">SampleApiUsername</required-entity>
-        <required-entity type="api_password">SampleApiPassword</required-entity>
-        <required-entity type="api_signature">SampleApiSignature</required-entity>
-        <required-entity type="api_authentication">SampleApiAuthentication</required-entity>
-        <required-entity type="sandbox_flag">SampleSandboxFlag</required-entity>
-        <required-entity type="use_proxy">SampleUseProxy</required-entity>
-    </entity>
-    <entity name="SampleBusinessAccount" type="business_account">
-        <data key="value">myBusinessAccount@magento.com</data>
-    </entity>
-    <entity name="SampleApiUsername" type="api_username">
-        <data key="value">myApiUsername.magento.com</data>
-    </entity>
-    <entity name="SampleApiPassword" type="api_password">
-        <data key="value">somePassword</data>
-    </entity>
-    <entity name="SampleApiSignature" type="api_signature">
-        <data key="value">someApiSignature</data>
-    </entity>
-    <entity name="SampleApiAuthentication" type="api_authentication">
-        <data key="value">0</data>
-    </entity>
-    <entity name="SampleSandboxFlag" type="sandbox_flag">
-        <data key="value">0</data>
-    </entity>
-    <entity name="SampleUseProxy" type="use_proxy">
-        <data key="value">0</data>
-    </entity>
-
-    <!-- default configuration used to restore Magento config -->
-    <entity name="DefaultPayPalConfig" type="paypal_config_state">
-        <required-entity type="business_account">DefaultBusinessAccount</required-entity>
-        <required-entity type="api_username">DefaultApiUsername</required-entity>
-        <required-entity type="api_password">DefaultApiPassword</required-entity>
-        <required-entity type="api_signature">DefaultApiSignature</required-entity>
-    </entity>
-    <entity name="DefaultBusinessAccount" type="business_account">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultApiUsername" type="api_username">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultApiPassword" type="api_password">
-        <data key="value"/>
-    </entity>
-    <entity name="DefaultApiSignature" type="api_signature">
-        <data key="value"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md
deleted file mode 100644
index 820d3acc2e101..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Paypal** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json
deleted file mode 100644
index b6df1314b0efc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-paypal",
-    "description": "Magento 2 Functional Test Module Paypal",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-instant-purchase": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-vault": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Paypal\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md
deleted file mode 100644
index 690db182dcb4f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Persistent** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json
deleted file mode 100644
index bd7db62c88616..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-persistent",
-    "description": "Magento 2 Functional Test Module Persistent",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cron": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Persistent\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md
deleted file mode 100644
index 1a78d82877b01..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ProductAlert** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json
deleted file mode 100644
index 7ef8a4a3da737..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-product-alert",
-    "description": "Magento 2 Functional Test Module Product Alert",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ProductAlert\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE.txt
deleted file mode 100644
index 36b2459f6aa63..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Open Software License ("OSL") v. 3.0
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
-   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
-         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
-         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
-         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
-         4. to perform the Original Work publicly; and
-
-         5. to display the Original Work publicly.
-
-   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
-   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
-   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
-   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
-   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
-   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
-   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
-   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
-  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
-  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
-  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
-  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
-  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
-  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md
deleted file mode 100644
index 0a19d3a9d1e60..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ProductVideo** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
deleted file mode 100644
index daa23cb4d48c9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-product-video",
-    "description": "Magento 2 Functional Test Module Product Video",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ProductVideo\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md
deleted file mode 100644
index 17b0bf4c60516..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Quote** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json
deleted file mode 100644
index 9468fdf072ebf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-quote",
-    "description": "Magento 2 Functional Test Module Quote",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Quote\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md
deleted file mode 100644
index 7460ca6a7dffb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_QuoteAnalytics** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json
deleted file mode 100644
index 4bd28d1b3c903..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-quote-analytics",
-    "description": "Magento 2 Acceptance Test Module Quote Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\QuoteAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/QuoteAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md
deleted file mode 100644
index d2bcbe81339ad..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Reports** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json
deleted file mode 100644
index 0ed1758889509..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-reports",
-    "description": "Magento 2 Functional Test Module Reports",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-review": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Reports\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md
deleted file mode 100644
index 64e6b0ef6e139..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_RequireJs** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json
deleted file mode 100644
index 91ad289e04288..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-require-js",
-    "description": "Magento 2 Functional Test Module Require Js",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\RequireJs\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md
deleted file mode 100644
index 71b1cdc87d9d6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Review** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json
deleted file mode 100644
index 6b68bb0edc757..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-review",
-    "description": "Magento 2 Functional Test Module Review",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-newsletter": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Review\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md
deleted file mode 100644
index 3f50f5341cfd4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_ReviewAnalytics** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json
deleted file mode 100644
index 546a20fe50c0f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-review-analytics",
-    "description": "Magento 2 Acceptance Test Module Review Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-review": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ReviewAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ReviewAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md
deleted file mode 100644
index 87ea94e0f1d23..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Robots** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json
deleted file mode 100644
index 27945d5e16138..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-robots",
-    "description": "Magento 2 Functional Test Module Robots",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Robots\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md
deleted file mode 100644
index 5002c878c2e54..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Rss** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json
deleted file mode 100644
index e8d57dd2456cc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-rss",
-    "description": "Magento 2 Functional Test Module Rss",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Rss\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md
deleted file mode 100644
index a797fd63dc668..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Rule** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json
deleted file mode 100644
index 1d19dad8e30a8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-rule",
-    "description": "Magento 2 Functional Test Module Rule",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Rule\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml
deleted file mode 100644
index e0279c22d9693..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateInvoiceCest">
-        <annotations>
-            <features value="Invoice Creation"/>
-            <stories value="Create an Invoice via the Admin"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <required-entity createDataKey="createCategory"/>
-            </createData>
-        </before>
-
-        <test name="CreateInvoiceTest">
-            <annotations>
-                <title value="Create Invoice"/>
-                <description value="Should be able to create an invoice via the admin."/>
-                <severity value="NORMAL"/>
-                <testCaseId value="MAGETWO-72096"/>
-                <group value="sales"/>
-            </annotations>
-
-            <!-- todo: Create an order via the api instead of driving the browser  -->
-            <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-            <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-            <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
-            <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
-            <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
-            <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
-            <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-            <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-            <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-            <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
-            <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-            <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-            <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" returnVariable="orderNumber" stepKey="grabOrderNumber"/>
-            <!-- end todo -->
-
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="goToAdmin"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-
-            <amOnPage url="{{OrdersPage.url}}" stepKey="onOrdersPage"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-            <fillField selector="{{OrdersGridSection.search}}" variable="orderNumber" stepKey="searchOrderNum"/>
-            <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
-
-            <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-            <click selector="{{OrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-            <click selector="{{InvoiceNewSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-            <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-            <click selector="{{OrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
-            <see selector="{{OrderDetailsInvoicesSection.content}}" variable="orderNumber" stepKey="seeInvoice1"/>
-            <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
-            <click selector="{{OrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
-            <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
-            <amOnPage url="{{InvoicesPage.url}}" stepKey="goToInvoices"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
-            <click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilters"/>
-            <fillField selector="{{InvoicesFiltersSection.orderNum}}" variable="orderNumber" stepKey="searchOrderNum2"/>
-            <click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
-            <see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml
deleted file mode 100644
index b96d8fe088fae..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="salesRecordOne" type="sales">
-        <data key="salesId">data</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceDetailsPage.xml
deleted file mode 100644
index c18d0babc4761..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceDetailsPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="InvoiceDetailsPage" url="/admin/sales/invoice/view/invoice_id/" module="Sales">
-        <section name="InvoiceDetailsInformationSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceNewPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceNewPage.xml
deleted file mode 100644
index c22b278bdaf20..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceNewPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="InvoiceNewPage" url="/admin/sales/order_invoice/new/order_id/" module="Sales">
-        <section name="InvoiceNewSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoicesPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoicesPage.xml
deleted file mode 100644
index a774ced243606..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoicesPage.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="InvoicesPage" url="/admin/sales/invoice/" module="Sales">
-        <section name="InvoicesGridSection"/>
-        <section name="InvoicesFiltersSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrderDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrderDetailsPage.xml
deleted file mode 100644
index 6f8f9a3d2fdf2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrderDetailsPage.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="OrderDetailsPage" url="/admin/sales/order/view/order_id/" module="Sales">
-        <section name="OrderDetailsMainActionsSection"/>
-        <section name="OrderDetailsInformationSection"/>
-        <section name="OrderDetailsMessagesSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrdersPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrdersPage.xml
deleted file mode 100644
index d57f13f82407c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrdersPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="OrdersPage" url="/admin/sales/order/" module="Sales">
-        <section name="OrdersGridSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md
deleted file mode 100644
index dbaf12404d157..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Sales** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
deleted file mode 100644
index 0549247e8aa9d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="InvoiceDetailsInformationSection">
-        <element name="orderStatus" type="text" selector="#order_status"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
deleted file mode 100644
index 282c9e675e2b4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="InvoiceNewSection">
-        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
deleted file mode 100644
index 9598199dcb7b4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="InvoicesFiltersSection">
-        <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
deleted file mode 100644
index 024b3db714142..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="InvoicesGridSection">
-        <element name="spinner" type="button" selector=".spinner"/>
-        <element name="filter" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
-        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
deleted file mode 100644
index a8f8b3dc1e0e0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="OrderDetailsInformationSection">
-        <element name="orderStatus" type="text" selector="#order_status"/>
-        <element name="accountInformation" type="text" selector=".order-account-information-table"/>
-        <element name="billingAddress" type="text" selector=".order-billing-address"/>
-        <element name="shippingAddress" type="text" selector=".order-shipping-address"/>
-        <element name="itemsOrdered" type="text" selector=".edit-order-table"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
deleted file mode 100644
index 34d42ed419ba6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="OrderDetailsInvoicesSection">
-        <element name="spinner" type="button" selector=".spinner"/>
-        <element name="content" type="text" selector="#sales_order_view_tabs_order_invoices_content"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
deleted file mode 100644
index 9632c5e5ddb1f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="OrderDetailsMainActionsSection">
-        <element name="back" type="button" selector="#back"/>
-        <element name="cancel" type="button" selector="#order-view-cancel-button"/>
-        <element name="sendEmail" type="button" selector="#send_notification"/>
-        <element name="hold" type="button" selector="#order-view-hold-button"/>
-        <element name="invoice" type="button" selector="#order_invoice"/>
-        <element name="ship" type="button" selector="#order_ship"/>
-        <element name="reorder" type="button" selector="#order_reorder"/>
-        <element name="edit" type="button" selector="#order_edit"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
deleted file mode 100644
index dc32b61bde935..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="OrderDetailsMessagesSection">
-        <element name="successMessage" type="text" selector="div.message-success"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
deleted file mode 100644
index a3c48ecfc61bb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="OrderDetailsOrderViewSection">
-        <element name="information" type="button" selector="#sales_order_view_tabs_order_info"/>
-        <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
deleted file mode 100644
index c0b3c84fb430f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="OrdersGridSection">
-        <element name="spinner" type="button" selector=".spinner"/>
-        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
-        <element name="search" type="input" selector="#fulltext"/>
-        <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
-        <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
-        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
-        <element name="createNewOrder" type="button" selector="button[title='Create New Order'"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
deleted file mode 100644
index f9b37ac3d18c3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales",
-    "description": "Magento 2 Functional Test Module Sales",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Sales\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md
deleted file mode 100644
index 856eb7057f031..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_SalesAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json
deleted file mode 100644
index 0b37233aa5927..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-analytics",
-    "description": "Magento 2 Acceptance Test Module Sales Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SalesAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md
deleted file mode 100644
index beeef87b6e7fd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SalesInventory** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json
deleted file mode 100644
index 75f35cd1d29fd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-inventory",
-    "description": "Magento 2 Functional Test Module Sales Inventory",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesInventory\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
deleted file mode 100644
index 9417c61dd1537..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateSalesRule" dataType="SalesRule" type="create" auth="adminOauth" url="/V1/salesRules" method="POST">
-        <contentType>application/json</contentType>
-        <object key="rule" dataType="SalesRule">
-            <field key="name" required="true">string</field>
-            <field key="description">string</field>
-            <field key="is_active">boolean</field>
-            <field key="from_date">string</field>
-            <field key="to_date">string</field>
-            <field key="uses_per_customer">integer</field>
-            <field key="sort_order">integer</field>
-            <field key="simple_action">string</field>
-            <field key="discount_amount">integer</field>
-            <field key="discount_qty">integer</field>
-            <field key="discount_step">integer</field>
-            <field key="times_used">integer</field>
-            <field key="uses_per_coupon">integer</field>
-            <field key="apply_to_shipping">boolean</field>
-            <field key="is_rss">boolean</field>
-            <field key="use_auto_generation">boolean</field>
-            <field key="coupon_type">string</field>
-            <field key="simple_free_shipping">string</field>
-            <field key="stop_rules_processing">boolean</field>
-            <field key="is_advanced">boolean</field>
-            <array key="store_labels">
-                <!-- specify object name as array value -->
-                <value>SalesRuleStoreLabel</value>
-                <!-- alternatively, define object embedded in array directly -->
-                <!--object dataType="SalesRuleStoreLabel" key="store_labels">
-                    <field key="store_id">integer</field>
-                    <field key="store_label">string</field>
-                </object-->
-            </array>
-            <array key="product_ids">
-                <value>integer</value>
-            </array>
-            <array key="customer_group_ids">
-                <value>integer</value>
-            </array>
-            <array key="website_ids">
-                <value>integer</value>
-            </array>
-            <object dataType="RuleCondition" key="condition">
-                <field key="condition_type">string</field>
-                <array key="conditions">
-                    <value>integer</value>
-                </array>
-                <field key="aggregator_type">string</field>
-                <field key="operator">string</field>
-                <field key="attribute_name">string</field>
-                <field key="value">string</field>
-                <field key="extension_attributes">empty_extension_attribute</field>
-            </object>
-            <object dataType="ActionCondition" key="action_condition">
-                <field key="condition_type">string</field>
-                <field key="aggregator_type">string</field>
-                <field key="operator">string</field>
-                <field key="attribute_name">string</field>
-                <field key="value">string</field>
-                <field key="extension_attributes">empty_extension_attribute</field>
-            </object>
-            <object dataType="ExtensionAttribute" key="extension_attributes">
-                <field key="reward_points_delta">integer</field>
-            </object>
-        </object>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_store_label-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_store_label-meta.xml
deleted file mode 100644
index 584bbb43cf77f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_store_label-meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateSalesRuleStoreLabel" dataType="SalesRuleStoreLabel" type="create">
-        <field key="store_id">integer</field>
-        <field key="store_label">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md
deleted file mode 100644
index 2180f41bb7e31..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SalesRule** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
deleted file mode 100644
index 0bb3ad9cf6330..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-rule",
-    "description": "Magento 2 Functional Test Module Sales Rule",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesRule\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md
deleted file mode 100644
index 8b3e36c3fda04..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SalesSequence** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json
deleted file mode 100644
index 218a5e4ce1ff9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-sequence",
-    "description": "Magento 2 Functional Test Module Sales Sequence",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesSequence\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md
deleted file mode 100644
index 1dcde417aed6f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SampleData** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json
deleted file mode 100644
index 6e6229ae322ba..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sample-data",
-    "description": "Magento 2 Functional Test Module Sample Data",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SampleData\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/ActionGroup/TemplateActionGroupFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/ActionGroup/TemplateActionGroupFile.xml
deleted file mode 100644
index 7a235e041ecef..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/ActionGroup/TemplateActionGroupFile.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <actionGroup name="">
-        <!-- ADD TEST STEPS HERE -->
-    </actionGroup>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Cest/TemplateCestFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Cest/TemplateCestFile.xml
deleted file mode 100644
index ada70e25cfaf5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Cest/TemplateCestFile.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="">
-        <annotations>
-            <features value=""/>
-            <stories value=""/>
-        </annotations>
-        <before>
-
-        </before>
-        <after>
-
-        </after>
-        <test name="">
-            <annotations>
-                <title value=""/>
-                <description value=""/>
-                <severity value=""/>
-                <testCaseId value=""/>
-                <group value=""/>
-            </annotations>
-            <!-- ADD TEST STEPS HERE -->
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Data/TemplateDataFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Data/TemplateDataFile.xml
deleted file mode 100644
index 74fce7e807110..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Data/TemplateDataFile.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="" type="">
-        <data key=""></data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Metadata/TemplateMetaFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Metadata/TemplateMetaFile.xml
deleted file mode 100644
index 89c9c1b3208b6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Metadata/TemplateMetaFile.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="" dataType="" type="" auth="adminOauth" url="" method="">
-        <contentType>application/json</contentType>
-        <param key=""></param>
-        <object dataType="" key="">
-            <field key=""></field>
-            <array key="">
-                <value></value>
-            </array>
-        </object>
-        <field key=""></field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Page/TemplatePageFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Page/TemplatePageFile.xml
deleted file mode 100644
index 755e15113e4f4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Page/TemplatePageFile.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="" url="" module="">
-        <section name=""/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/README.md
deleted file mode 100644
index 986c2af6164e9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SampleTemplates** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Section/TemplateSectionFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Section/TemplateSectionFile.xml
deleted file mode 100644
index a85e72c274d59..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Section/TemplateSectionFile.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="">
-        <element name="" type="" selector=""/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json
deleted file mode 100644
index da0d8598f8d7d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sample-templates",
-    "description": "Magento 2 Functional Test Module Sample Templates",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SampleTemplates\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
deleted file mode 100644
index b047b19d4a044..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/ActionGroup/SampleActionGroup.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <actionGroup name="SampleActionGroup">
-        <arguments>
-            <argument name="person" defaultValue="SamplePerson"/>
-        </arguments>
-        <fillField selector="#foo" userInput="{{person.foo}}" stepKey="fillField1"/>
-        <fillField selector="#bar" userInput="{{person.bar}}" stepKey="fillField2"/>
-    </actionGroup>
-    <actionGroup name="ValidateSlideOutPanelField">
-        <arguments>
-            <argument name="property" defaultValue=""/>
-        </arguments>
-        <see userInput="{{property.name}}" selector="{{ColumnSection.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
-    </actionGroup>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml
deleted file mode 100644
index eddae0242f5d4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AdvancedSampleCest.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdvancedSampleCest">
-        <annotations>
-            <features value=""/>
-            <stories value=""/>
-            <group value="skip"/>
-        </annotations>
-        <before>
-            <createData entity="SamplePerson" stepKey="beforeData"/>
-        </before>
-        <after>
-
-        </after>
-        <test name="OneTest">
-            <annotations>
-                <title value=""/>
-                <description value=""/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="#"/>
-            </annotations>
-
-            <!-- Create an entity that depends on another entity -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <required-entity createDataKey="createCategory"/>
-            </createData>
-
-            <!-- Parameterized url -->
-            <amOnPage url="{{SamplePage.url('foo', SamplePerson.bar)}}" stepKey="amOnPage"/>
-
-            <!-- Parameterized selector -->
-            <grabTextFrom selector="{{SampleSection.twoParamElement(SamplePerson.foo, 'bar')}}" returnVariable="myReturnVar" stepKey="grabTextFrom"/>
-
-            <!-- Element with a timeout -->
-            <click selector="{{SampleSection.timeoutElement}}" stepKey="click"/>
-
-            <!-- ActionGroup -->
-            <actionGroup ref="SampleActionGroup" stepKey="actionGroup">
-                <argument name="person" value="OverrideDefaultPerson"/>
-            </actionGroup>
-
-            <actionGroup ref="ValidateSlideOutPanelField" stepKey="seeAppearanceMinHeightProperty">
-                <argument name="property" value="AppearanceMinHeightProperty"/>
-            </actionGroup>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml
deleted file mode 100644
index 17366a6518c90..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/AssertsCest.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<!-- Test XML Example -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AssertCest">
-        <annotations>
-            <features value="Test Asserts"/>
-            <group value="skip"/>
-        </annotations>
-        <before>
-            <createData entity="Simple_US_Customer" stepKey="createData1"/>
-        </before>
-        <after>
-            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
-        </after>
-        <test name="AssertTest">
-            <createData entity="Simple_US_Customer" stepKey="createData2"/>
-            <amOnUrl url="https://www.yahoo.com" stepKey="amOnPage"/>
-            <waitForElementVisible stepKey="wait1" selector="#uh-logo" time="10"/>
-            <grabTextFrom returnVariable="text" selector="#uh-logo" stepKey="grabTextFrom1"/>
-
-            <!-- asserts without variable replacement -->
-            <comment stepKey="c1" userInput="asserts without variable replacement"/>
-            <assertArrayHasKey stepKey="assertArrayHasKey" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
-            <assertArrayNotHasKey stepKey="assertArrayNotHasKey" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
-            <assertArraySubset stepKey="assertArraySubset" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
-            <assertContains stepKey="assertContains" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
-            <assertCount stepKey="assertCount" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
-            <assertEmpty stepKey="assertEmpty" actual="[]" message="pass"/>
-            <assertEquals stepKey="assertEquals1" expected="text" expectedType="variable" actual="Yahoo" actualType="string" message="pass"/>
-            <assertEquals stepKey="assertEquals2" expected="Yahoo" expectedType="string" actual="text" actualType="variable" message="pass"/>
-            <assertFalse stepKey="assertFalse1" actual="0" actualType="bool" message="pass"/>
-            <assertFileNotExists stepKey="assertFileNotExists1" actual="/out.txt" actualType="string" message="pass"/>
-            <assertFileNotExists stepKey="assertFileNotExists2" actual="text" actualType="variable" message="pass"/>
-            <assertGreaterOrEquals stepKey="assertGreaterOrEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-            <assertGreaterThan stepKey="assertGreaterThan" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-            <assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqual" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-            <assertInternalType stepKey="assertInternalType1" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
-            <assertInternalType stepKey="assertInternalType2" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
-            <assertInternalType stepKey="assertInternalType3" expected="string" expectedType="string" actual="text" actualType="variable" message="pass"/>
-            <assertLessOrEquals stepKey="assertLessOrEquals" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-            <assertLessThan stepKey="assertLessThan" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-            <assertLessThanOrEqual stepKey="assertLessThanOrEqual" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-            <assertNotContains stepKey="assertNotContains1" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
-            <assertNotContains stepKey="assertNotContains2" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
-            <assertNotEmpty stepKey="assertNotEmpty1" actual="[1, 2]" message="pass"/>
-            <assertNotEmpty stepKey="assertNotEmpty2" actual="text" actualType="variable" message="pass"/>
-            <assertNotEquals stepKey="assertNotEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
-            <assertNotNull stepKey="assertNotNull1" actual="abc" actualType="string" message="pass"/>
-            <assertNotNull stepKey="assertNotNull2" actual="text" actualType="variable" message="pass"/>
-            <assertNotRegExp stepKey="assertNotRegExp" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
-            <assertNotSame stepKey="assertNotSame" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
-            <assertRegExp stepKey="assertRegExp" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
-            <assertSame stepKey="assertSame" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
-            <assertStringStartsNotWith stepKey="assertStringStartsNotWith" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
-            <assertStringStartsWith stepKey="assertStringStartsWith" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
-            <assertTrue stepKey="assertTrue" actual="1" actualType="bool" message="pass"/>
-
-            <!-- string type that use created data -->
-            <comment stepKey="c2" userInput="string type that use created data"/>
-            <assertStringStartsWith stepKey="assert1" expected="D" expectedType="string" actual="$$createData1.lastname$$, $$createData1.firstname$$" actualType="string" message="fail"/>
-            <assertStringStartsNotWith stepKey="assert2" expected="W" expectedType="string" actual="$createData2.firstname$ $createData2.lastname$" actualType="string" message="pass"/>
-            <assertEquals stepKey="assert5" expected="$$createData1.lastname$$" expectedType="string" actual="$$createData1.lastname$$" actualType="string" message="pass"/>
-
-            <!-- array type that use created data -->
-            <comment stepKey="c3" userInput="array type that use created data"/>
-            <assertArraySubset stepKey="assert9" expected="[$$createData1.lastname$$, $$createData1.firstname$$]" expectedType="array" actual="[$$createData1.lastname$$, $$createData1.firstname$$, 1]" actualType="array" message="pass"/>
-            <assertArraySubset stepKey="assert10" expected="[$createData2.firstname$, $createData2.lastname$]" expectedType="array" actual="[$createData2.firstname$, $createData2.lastname$, 1]" actualType="array" message="pass"/>
-            <assertArrayHasKey stepKey="assert3" expected="lastname" expectedType="string" actual="['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]" actualType="array" message="pass"/>
-            <assertArrayHasKey stepKey="assert4" expected="lastname" expectedType="string" actual="['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]" actualType="array" message="pass"/>
-
-            <!-- comment this section before running this test -->
-            <comment stepKey="c4" userInput="comment this section before running this test"/>
-            <assertInstanceOf stepKey="assertInstanceOf" expected="User::class" actual="text" actualType="variable" message="pass"/>
-            <assertNotInstanceOf stepKey="assertNotInstanceOf" expected="User::class" actual="21" actualType="int" message="pass"/>
-            <assertFileExists stepKey="assertFileExists2" actual="text" actualType="variable" message="pass"/>
-            <assertFileExists stepKey="assert6" actual="AssertCest.php" actualType="string" message="pass"/>
-            <assertIsEmpty stepKey="assertIsEmpty" actual="text" actualType="variable" message="pass"/>
-            <assertNull stepKey="assertNull" actual="text" actualType="variable" message="pass"/>
-            <expectException stepKey="expectException" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
-            <fail stepKey="fail" message="fail"/>
-            <fail stepKey="assert7" message="$createData2.firstname$ $createData2.lastname$"/>
-            <fail stepKey="assert8" message="$$createData1.firstname$$ $$createData1.lastname$$"/>
-            <!-- comment end -->
-            <comment stepKey="c5" userInput="comment end"/>
-
-            <deleteData createDataKey="createData2" stepKey="deleteData2"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
deleted file mode 100644
index 7daef0fc1ed41..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="CreateConfigurableProductByApiCest">
-        <annotations>
-            <features value="Create a Configurable Product By API"/>
-            <stories value="Create a Configurable Product By API"/>
-            <group value="skip"/>
-        </annotations>
-        <before>
-            <createData stepKey="categoryHandle" entity="SimpleSubCategory" />
-            <createData stepKey="baseConfigProductHandle" entity="BaseConfigurableProduct" >
-                <required-entity createDataKey="categoryHandle"/>
-            </createData>
-            <createData stepKey="productAttributeHandle" entity="productAttributeWithTwoOptions"/>
-
-            <createData stepKey="productAttributeOption1Handle" entity="productAttributeOption1">
-                <required-entity createDataKey="productAttributeHandle"/>
-            </createData>
-            <createData stepKey="productAttributeOption2Handle" entity="productAttributeOption2">
-                <required-entity createDataKey="productAttributeHandle"/>
-            </createData>
-
-            <createData stepKey="addToAttributeSetHandle" entity="AddToDefaultSet">
-                <required-entity createDataKey="productAttributeHandle"/>
-            </createData>
-
-            <getData stepKey="getAttributeOption1Handle" entity="ProductAttributeOptionGetter" index="1">
-                <required-entity createDataKey="productAttributeHandle"/>
-            </getData>
-            <getData stepKey="getAttributeOption2Handle" entity="ProductAttributeOptionGetter" index="2">
-                <required-entity createDataKey="productAttributeHandle"/>
-            </getData>
-
-            <createData stepKey="childProductHandle1" entity="SimpleOne">
-                <required-entity createDataKey="productAttributeHandle"/>
-                <required-entity createDataKey="getAttributeOption1Handle"/>
-            </createData>
-            <createData stepKey="childProductHandle2" entity="SimpleOne">
-                <required-entity createDataKey="productAttributeHandle"/>
-                <required-entity createDataKey="getAttributeOption2Handle"/>
-            </createData>
-
-            <createData stepKey="configProductOptionHandle" entity="ConfigurableProductTwoOptions">
-                <required-entity createDataKey="baseConfigProductHandle"/>
-                <required-entity createDataKey="productAttributeHandle"/>
-                <required-entity createDataKey="getAttributeOption1Handle"/>
-                <required-entity createDataKey="getAttributeOption2Handle"/>
-            </createData>
-
-            <createData stepKey="configProductHandle1" entity="ConfigurableProductAddChild">
-                <required-entity createDataKey="childProductHandle1"/>
-                <required-entity createDataKey="baseConfigProductHandle"/>
-            </createData>
-            <createData stepKey="configProductHandle2" entity="ConfigurableProductAddChild">
-                <required-entity createDataKey="childProductHandle2"/>
-                <required-entity createDataKey="baseConfigProductHandle"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData stepKey="d2" createDataKey="childProductHandle1"/>
-            <deleteData stepKey="d3" createDataKey="childProductHandle2"/>
-            <deleteData stepKey="d7" createDataKey="baseConfigProductHandle"/>
-            <deleteData stepKey="d8" createDataKey="categoryHandle"/>
-            <deleteData stepKey="d6" createDataKey="productAttributeHandle"/>
-        </after>
-        <test name="CreateConfigurableProductByApiTest">
-        </test>
-    </cest>
-</config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
deleted file mode 100644
index 68d7f75a964d2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="CreateSalesRuleByApiCest">
-        <annotations>
-            <features value="Create a Sales Rule By API"/>
-            <stories value="Create a Sales Rule By API"/>
-            <group value="skip"/>
-        </annotations>
-        <before>
-            <createData stepKey="saleRule" entity="SimpleSalesRule" />
-        </before>
-        <test name="CreateSalesRuleByApiTest">
-            <!--see stepKey="test" userInput="$$saleRule.store_labels[0][store_id]$$" selector="test"/-->
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
deleted file mode 100644
index e9c971f7e10fb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<!-- Test XML Example -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="MinimumFieldsCest">
-        <annotations>
-            <features value="Minimum Test"/>
-            <stories value="Minimum Test"/>
-        </annotations>
-        <after>
-            <seeInCurrentUrl url="/admin/admin/" stepKey="seeInCurrentUrl"/>
-        </after>
-        <test name="MinimumFieldsTest">
-            <annotations>
-                <title value="Minimum Test"/>
-                <description value="Minimum Test"/>
-                <group value="example"/>
-            </annotations>
-            <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-            <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-            <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-            <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml
deleted file mode 100644
index 2985d7a51051b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="PersistMultipleEntitiesCest">
-        <before>
-            <createData entity="simplesubcategory" stepKey="simplecategory"/>
-            <createData entity="simpleproduct" stepKey="simpleproduct1">
-                <required-entity createDataKey="simplecategory"/>
-            </createData>
-            <createData entity="simpleproduct" stepKey="simpleproduct2">
-                <required-entity createDataKey="categoryLink"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData createDataKey="simpleproduct1" stepKey="deleteProduct1"/>
-            <deleteData createDataKey="simpleproduct2" stepKey="deleteProduct2"/>
-            <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
-        </after>
-        <test name="PersistMultipleEntitiesTest">
-            <annotations>
-                <group value="skip"/>
-            </annotations>
-            <amOnPage stepKey="s11" url="/$$simplecategory.name$$.html" />
-            <waitForPageLoad stepKey="s33"/>
-            <see stepKey="s35" selector="{{StorefrontCategoryMainSection.productCount}}" userInput="2"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml
deleted file mode 100644
index 022e9a5d064ae..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SampleCest.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<!-- Test XML Example -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="SampleCest">
-        <annotations>
-            <features value="Test Generator"/>
-            <stories value="Verify each Codeception command is generated correctly."/>
-            <stories value="Verify each Custom command is generated correctly."/>
-            <group value="skip"/>
-        </annotations>
-        <before>
-            <amOnUrl url="http://127.0.0.1:32772/admin/" stepKey="amOnPage"/>
-            <createData entity="CustomerEntity1" stepKey="createData1"/>
-            <createData entity="AssertThis" stepKey="createData2"/>
-        </before>
-        <after>
-            <amOnUrl url="http://127.0.0.1:32772/admin/admin/auth/logout" stepKey="amOnPage"/>
-            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
-            <deleteData createDataKey="createData2" stepKey="deleteData2"/>
-        </after>
-        <test name="AllCodeceptionMethodsTest">
-            <annotations>
-                <title value="Create all Codeception methods"/>
-                <description value="Exercises the Generator to make sure it creates every Codeception method correctly."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="#"/>
-            </annotations>
-            <acceptPopup stepKey="acceptPopup"/>
-            <amOnPage url="/admin" stepKey="amOnPage"/>
-            <amOnSubdomain url="admin" stepKey="amOnSubdomain"/>
-            <amOnUrl url="http://www.google.com/" stepKey="amOnUrl"/>
-            <appendField userInput="More Words" selector=".stuff" stepKey="appendField"/>
-            <attachFile userInput="filename.php" selector="#stuff" stepKey="attachFile"/>
-            <cancelPopup stepKey="cancelPopup"/>
-            <checkOption selector="#checkbox" stepKey="checkOption"/>
-            <clearField selector="#field" stepKey="clearField"/>
-            <click selector="#button" userInput="Context" stepKey="click1"/>
-            <click selectorArray="['link' => 'Login']" stepKey="click2"/>
-            <click selectorArray="['link' => 'Login']" userInput="stuff" stepKey="click3"/>
-            <clickWithLeftButton selector="#clickHere" stepKey="clickWithLeftButton1" x="23" y="324"/>
-            <clickWithLeftButton selectorArray="['css' => '.checkout']" stepKey="clickWithLeftButton2" x="23" y="324"/>
-            <clickWithLeftButton stepKey="clickWithLeftButton3" x="23" y="324"/>
-            <clickWithRightButton selector="#clickHere" stepKey="clickWithRightButton1" x="23" y="324"/>
-            <clickWithRightButton selectorArray="['css' => '.checkout']" stepKey="clickWithRightButton2" x="23" y="324"/>
-            <clickWithRightButton stepKey="clickWithRightButton3" x="23" y="324"/>
-            <closeTab stepKey="closeTab"/>
-            <comment userInput="This is a Comment." stepKey="comment"/>
-            <createData entity="CustomerEntity1" stepKey="createData1"/>
-            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
-            <dontSee userInput="Text" stepKey="dontSee1"/>
-            <dontSee userInput="Text" selector=".title" stepKey="dontSee2"/>
-            <dontSee userInput="Text" selectorArray="['css' => 'body h1']" stepKey="dontSee3"/>
-            <dontSeeCheckboxIsChecked selector="#checkbox" stepKey="dontSeeCheckboxIsChecked"/>
-            <dontSeeCookie userInput="cookieName" stepKey="dontSeeCookie1"/>
-            <dontSeeCookie userInput="cookieName" parameterArray="['domainName' => 'stuff']" stepKey="dontSeeCookie2"/>
-            <dontSeeCurrentUrlEquals url="/stuff" stepKey="dontSeeCurrentUrlEquals"/>
-            <dontSeeCurrentUrlMatches url="~$/users/(\d+)~" stepKey="dontSeeCurrentUrlMatches"/>
-            <dontSeeElement selector=".error" stepKey="dontSeeElement1"/>
-            <dontSeeElement selector="input" parameterArray="['name' => 'login']" stepKey="dontSeeElement2"/>
-            <dontSeeElementInDOM selector="#stuff" stepKey="dontSeeElementInDOM1"/>
-            <dontSeeElementInDOM selector="#stuff" parameterArray="['name' => 'login']" stepKey="dontSeeElementInDOM2"/>
-            <dontSeeInCurrentUrl url="/users/" stepKey="dontSeeInCurrentUrl"/>
-            <dontSeeInField selector=".field" userInput="stuff" stepKey="dontSeeInField1"/>
-            <dontSeeInField selectorArray="['name' => 'search']" userInput="Comment Here" stepKey="dontSeeInField2"/>
-            <dontSeeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'non-existent value', 'input2' => 'other non-existent value']" stepKey="dontSeeInFormFields"/>
-            <dontSeeInPageSource userInput="Stuff in Page Source" stepKey="dontSeeInPageSource"/>
-            <!--<dontSeeInSource html="<h1></h1>" stepKey="dontSeeInSource"/>-->
-            <dontSeeInTitle userInput="Title" stepKey="dontSeeInTitle"/>
-            <dontSeeLink userInput="Logout" stepKey="dontSeeLink1"/>
-            <dontSeeLink userInput="Checkout" url="/store/cart.php" stepKey="dontSeeLink2"/>
-            <dontSeeOptionIsSelected selector="#form .stuff" userInput="Option Name" stepKey="dontSeeOptionIsSelected"/>
-            <doubleClick selector="#click .here" stepKey="doubleClick"/>
-            <dragAndDrop selector1="#number1" selector2="#number2" stepKey="dragAndDrop"/>
-            <executeInSelenium function="function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {$webdriver->get('http://google.com');}" stepKey="executeInSelenium"/>
-            <executeJS function="return $('#myField').val()" stepKey="executeJS"/>
-            <fillField selector="#field" userInput="stuff" stepKey="fillField1"/>
-            <fillField selectorArray="['name' => 'email']" userInput="stuff" stepKey="fillField2"/>
-            <grabAttributeFrom returnVariable="title" selector="#target" userInput="title" stepKey="grabAttributeFrom"/>
-            <grabCookie returnVariable="cookie" userInput="cookie" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookie"/>
-            <grabFromCurrentUrl returnVariable="uri" url="~$/user/(\d+)/~" stepKey="grabFromCurrentUrl"/>
-            <grabMultiple returnVariable="multiple" selector="a" userInput="href" stepKey="grabMultiple"/>
-            <grabPageSource returnVariable="pageSource" stepKey="grabPageSource1"/>
-            <grabTextFrom returnVariable="text" selector="h1" stepKey="grabTextFrom1"/>
-            <grabValueFrom returnVariable="value1" selector=".form" stepKey="grabValueFrom1"/>
-            <grabValueFrom returnVariable="value2" selectorArray="['name' => 'username']" stepKey="grabValueFrom2"/>
-            <loadSessionSnapshot userInput="stuff" stepKey="loadSessionSnapshot1"/>
-            <loadSessionSnapshot returnVariable="snapshot" userInput="stuff" stepKey="loadSessionSnapshot2"/>
-            <makeScreenshot userInput="ScreenshotName" stepKey="makeScreenshot"/>
-            <maximizeWindow stepKey="maximizeWindow"/>
-            <moveBack stepKey="moveBack"/>
-            <moveForward stepKey="moveForward"/>
-            <moveMouseOver selector="#stuff" stepKey="moveMouseOver1"/>
-            <moveMouseOver selectorArray="['css' => '.checkout']" stepKey="moveMouseOver2"/>
-            <moveMouseOver x="5" y="5" stepKey="moveMouseOver3"/>
-            <moveMouseOver selector="#stuff" x="5" y="5" stepKey="moveMouseOver4"/>
-            <moveMouseOver selectorArray="['css' => '.checkout']" x="5" y="5" stepKey="moveMouseOver5"/>
-            <openNewTab stepKey="openNewTab"/>
-            <pauseExecution stepKey="pauseExecution"/>
-            <performOn selector=".rememberMe" function="function (WebDriver $I) { $I->see('Remember me next time'); $I->seeElement('#LoginForm_rememberMe'); $I->dontSee('Login'); }" stepKey="performOn1"/>
-            <performOn selector=".rememberMe" function="ActionSequence::build()->see('Warning')->see('Are you sure you want to delete this?')->click('Yes')" stepKey="performOn2"/>
-            <pressKey selector="#page" userInput="a" stepKey="pressKey1"/>
-            <pressKey selector="#page" parameterArray="[['ctrl','a'],'new']" stepKey="pressKey2"/>
-            <pressKey selector="#page" parameterArray="[['shift','111'],'1','x']" stepKey="pressKey3"/>
-            <pressKey selector="#page" parameterArray="[['ctrl', 'a'], \Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="pressKey4"/>
-            <!--pressKey selector="descendant-or-self::*[@id='page']" userInput="u" stepKey="pressKey5"/-->
-            <reloadPage stepKey="reloadPage"/>
-            <resetCookie userInput="cookie" stepKey="resetCookie1"/>
-            <resetCookie userInput="cookie" parameterArray="['domainName' => 'www.google.com']" stepKey="resetCookie2"/>
-            <resizeWindow width="800" height="600" stepKey="resizeWindow"/>
-            <saveSessionSnapshot userInput="stuff" stepKey="saveSessionSnapshot"/>
-            <scrollTo selector="#place" x="20" y="50" stepKey="scrollTo1"/>
-            <scrollTo selectorArray="['css' => '.checkout']" x="20" y="50" stepKey="scrollTo2"/>
-            <see userInput="Stuff" stepKey="see1"/>
-            <see userInput="More Stuff" selector=".stuff" stepKey="see2"/>
-            <see userInput="More More Stuff" selectorArray="['css' => 'body h1']" stepKey="see3"/>
-            <seeCheckboxIsChecked selector="#checkbox" stepKey="seeCheckboxIsChecked"/>
-            <seeCookie userInput="PHPSESSID" stepKey="seeCookie1"/>
-            <seeCookie userInput="PHPSESSID" parameterArray="['domainName' => 'www.google.com']" stepKey="seeCookie2"/>
-            <seeCurrentUrlEquals url="/" stepKey="seeCurrentUrlEquals"/>
-            <seeCurrentUrlMatches url="~$/users/(\d+)~" stepKey="seeCurrentUrlMatches"/>
-            <seeElement selector=".error" stepKey="seeElement1"/>
-            <seeElement selectorArray="['css' => 'form input']" stepKey="seeElement2"/>
-            <seeElement selector=".error" parameterArray="['name' => 'login']" stepKey="seeElement3"/>
-            <seeElement selectorArray="['css' => 'form input']" parameterArray="['name' => 'login']" stepKey="seeElement4"/>
-            <seeElementInDOM selector="//form/input[type=hidden]" stepKey="seeElementInDOM1"/>
-            <seeElementInDOM selector="//form/input[type=hidden]" parameterArray="['name' => 'form']" stepKey="seeElementInDOM2"/>
-            <seeInCurrentUrl url="home" stepKey="seeInCurrentUrl1"/>
-            <seeInCurrentUrl url="/home/" stepKey="seeInCurrentUrl2"/>
-            <seeInField userInput="Stuff" selector="#field" stepKey="seeInField1"/>
-            <seeInField userInput="Stuff" selectorArray="['name' => 'search']" stepKey="seeInField2"/>
-            <seeInFormFields selector="form[name=myform]" parameterArray="['input1' => 'value','input2' => 'other value']" stepKey="seeInFormFields1"/>
-            <seeInFormFields selector=".form-class" parameterArray="[['multiselect' => ['value1','value2'],'checkbox[]]' => ['a checked value','another checked value',]]" stepKey="seeInFormFields2"/>
-            <!--<seeInPageSource html="<h1></h1>" stepKey="seeInPageSource"/>-->
-            <seeInPopup userInput="Yes in Popup" stepKey="seeInPopup"/>
-            <!--<seeInSource html="<h1></h1>" stepKey="seeInSource"/>-->
-            <seeInTitle userInput="In Title" stepKey="seeInTitle"/>
-            <seeLink userInput="Logout" stepKey="seeLink1"/>
-            <seeLink userInput="Logout" url="/logout" stepKey="seeLink2"/>
-            <seeNumberOfElements selector="tr" userInput="10" stepKey="seeNumberOfElements1"/>
-            <seeNumberOfElements selector="tr" userInput="[0, 10]" stepKey="seeNumberOfElements2"/>
-            <seeOptionIsSelected selector=".option" userInput="Visa" stepKey="seeOptionIsSelected"/>
-            <selectOption selector=".dropDown" userInput="Option Name" stepKey="selectOption1"/>
-            <selectOption selector="//form/select[@name=account]" parameterArray="['Windows','Linux']" stepKey="selectOption2"/>
-            <selectOption selector="Which OS do you use?" parameterArray="['text' => 'Windows']" stepKey="selectOption3"/>
-            <setCookie userInput="PHPSESSID" value="stuff" stepKey="setCookie1"/>
-            <setCookie userInput="PHPSESSID" value="stuff" parameterArray="['domainName' => 'www.google.com']" stepKey="setCookie2"/>
-            <submitForm selector="#my-form" parameterArray="['field' => ['value','another value',]]" button="#submit" stepKey="submitForm2"/>
-            <switchToIFrame stepKey="switchToIFrame1"/>
-            <switchToIFrame userInput="another_frame" stepKey="switchToIFrame2"/>
-            <switchToNextTab stepKey="switchToNextTab1"/>
-            <switchToNextTab userInput="2" stepKey="switchToNextTab2"/>
-            <switchToPreviousTab stepKey="switchToPreviewTab1"/>
-            <switchToPreviousTab userInput="1" stepKey="switchToPreviewTab2"/>
-            <switchToWindow stepKey="switchToWindow1"/>
-            <switchToWindow userInput="another_window" stepKey="switchToWindow2"/>
-            <typeInPopup userInput="Stuff for popup" stepKey="typeInPopup"/>
-            <uncheckOption selector="#option" stepKey="uncheckOption"/>
-            <unselectOption selector="#dropDown" userInput="Option" stepKey="unselectOption"/>
-            <wait time="15" stepKey="wait"/>
-            <waitForElement selector="#button" time="10" stepKey="waitForElement"/>
-            <waitForElementChange selector="#menu" function="function(\WebDriverElement $el) {return $el->isDisplayed();}" time="100" stepKey="waitForElementChange"/>
-            <waitForElementNotVisible selector="#a_thing .className" time="30" stepKey="waitForElementNotVisible"/>
-            <waitForElementVisible selector="#a_thing .className" time="15" stepKey="waitForElementVisible"/>
-            <waitForJS function="return $.active == 0;" time="30" stepKey="waitForJS"/>
-            <waitForText userInput="foo" time="30" stepKey="waitForText1"/>
-            <waitForText userInput="foo" selector=".title" time="30" stepKey="waitForText2"/>
-        </test>
-        <test name="AllCustomMethodsTest">
-            <annotations>
-                <title value="Create all Custom methods"/>
-                <description value="Exercises the Generator to make sure it creates every Custom method correctly."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="#"/>
-            </annotations>
-            <assertElementContainsAttribute selector="#username" attribute="class" expectedValue="admin__control-text" stepKey="assertElementContainsAttribute1"/>
-            <assertElementContainsAttribute selector="#username" attribute="type" expectedValue="text" stepKey="assertElementContainsAttribute2"/>
-            <assertElementContainsAttribute selector="#username" attribute="name" expectedValue="login[username]" stepKey="assertElementContainsAttribute3"/>
-            <assertElementContainsAttribute selector="#username" attribute="autofocus" expectedValue="" stepKey="assertElementContainsAttribute4"/>
-            <assertElementContainsAttribute selector="#username" attribute="data-validate" expectedValue="{required:true}" stepKey="assertElementContainsAttribute5"/>
-            <assertElementContainsAttribute selector="#username" attribute="placeholder" expectedValue="user name" stepKey="assertElementContainsAttribute6"/>
-            <assertElementContainsAttribute selector="#username" attribute="autocomplete" expectedValue="off" stepKey="assertElementContainsAttribute7"/>
-            <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="style" expectedValue="display: none;" stepKey="assertElementContainsAttribute8"/>
-            <assertElementContainsAttribute selector=".admin__menu-overlay" attribute="border" expectedValue="0" stepKey="assertElementContainsAttribute9"/>
-            <loginAsAdmin stepKey="loginAsAdmin1"/>
-            <loginAsAdmin username="admin" password="123123q" stepKey="loginAsAdmin2"/>
-            <closeAdminNotification stepKey="closeAdminNotification1"/>
-            <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" stepKey="searchAndMultiSelect1"/>
-            <searchAndMultiSelectOption selector="#stuff" parameterArray="['Item 1', 'Item 2']" requiredAction="true" stepKey="searchAndMultiSelect2"/>
-            <waitForPageLoad stepKey="waitForPageLoad1"/>
-            <waitForPageLoad time="15" stepKey="waitForPageLoad2"/>
-            <waitForAjaxLoad stepKey="waitForAjax1"/>
-            <waitForAjaxLoad time="15" stepKey="waitForAjax2"/>
-            <dontSeeJsError stepKey="dontSeeJsError"/>
-            <formatMoney userInput="$300,000" stepKey="formatMoney1"/>
-            <formatMoney userInput="$300,000" locale="en_US.UTF-8" stepKey="formatMoney2"/>
-            <mSetLocale userInput="300" locale="en_US.UTF-8" stepKey="mSetLocale1"/>
-            <mResetLocale stepKey="mResetLocale1"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
-            <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-            <parseFloat userInput="300,000.2325" stepKey="parseFloat1"/>
-        </test>
-        <test name="AllVariableMethodsTest">
-            <annotations>
-                <title value="Create all Methods that support Variables."/>
-                <description value="Exercises the Generator to make sure it creates every Method that supports a Variable."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="#"/>
-            </annotations>
-            <grabFromCurrentUrl returnVariable="randomStuff" stepKey="grabFromCurrentUrl1"/>
-            <amOnPage variable="randomStuff" stepKey="amOnPage1"/>
-            <amOnSubdomain variable="randomStuff" stepKey="amOnSubdomain1"/>
-            <amOnUrl variable="randomStuff" stepKey="amOnUrl1"/>
-            <appendField variable="randomStuff" selector="#randomField" stepKey="appendField1"/>
-            <attachFile variable="randomStuff" selector="#filePathField" stepKey="attachFile1"/>
-            <click variable="randomStuff" stepKey="click1"/>
-            <dontSee variable="randomStuff" stepKey="dontSee1"/>
-            <dontSeeCookie variable="randomStuff" stepKey="dontSeeCookie1"/>
-            <dontSeeCurrentUrlEquals variable="randomStuff" stepKey="dontSeeCurrentUrlEquals1"/>
-            <dontSeeCurrentUrlMatches variable="randomStuff" stepKey="dontSeeCurrentUrlMatches1"/>
-            <dontSeeInCurrentUrl variable="randomStuff" stepKey="dontSeeInCurrentUrl1"/>
-            <dontSeeInField selector="#stuff" variable="randomStuff" stepKey="dontSeeInField1"/>
-            <dontSeeInPageSource variable="randomStuff" stepKey="dontSeeInPageSource1"/>
-            <dontSeeInTitle variable="randomStuff" stepKey="dontSeeInTitle1"/>
-            <dontSeeLink variable="randomStuff" stepKey="dontSeeLink1"/>
-            <dontSeeOptionIsSelected selector="#dropdown" variable="randomStuff" stepKey="dontSeeOptionIsSelected1"/>
-            <fillField variable="randomStuff" selector="#field" stepKey="fillField1"/>
-            <grabAttributeFrom selector="#stuff" returnVariable="moreRandomStuff" variable="randomStuff" stepKey="grabAttributeFrom1"/>
-            <grabCookie returnVariable="cookies" variable="randomStuff" stepKey="grabValueFrom1"/>
-            <grabFromCurrentUrl returnVariable="url" variable="randomStuff" stepKey="grabFromCurrentUrl"/>
-            <grabMultiple returnVariable="multipleThings" selector="a" variable="randomStuff" stepKey="grabMultiple1"/>
-            <loadSessionSnapshot variable="randomStuff" stepKey="loadSessionSnapshot"/>
-            <pressKey selector="a" variable="randomStuff" stepKey="pressKey1"/>
-            <saveSessionSnapshot variable="randomStuff" stepKey="saveSessionSnapshot1"/>
-            <see variable="randomStuff" stepKey="see1"/>
-            <seeCookie variable="randomStuff" stepKey="seeCookie1"/>
-            <seeCurrentUrlEquals variable="randomStuff" stepKey="seeCurrentUrlEquals1"/>
-            <seeCurrentUrlMatches variable="randomStuff" stepKey="seeCurrentUrlMatches1"/>
-            <seeInCurrentUrl variable="randomStuff" stepKey="seeInCurrentUrl1"/>
-            <seeInField selector="a" variable="randomStuff" stepKey="seeInField1"/>
-            <seeInPopup variable="randomStuff" stepKey="seeInPopup"/>
-            <seeInTitle variable="randomStuff" stepKey="seeInTitle1"/>
-            <seeLink variable="randomStuff" stepKey="seeLink1"/>
-            <seeNumberOfElements selector="#stuff" variable="randomStuff" stepKey="seeNumberOfElements1"/>
-            <seeOptionIsSelected selector="#stuff" variable="randomStuff" stepKey="seeOptionIsSelected1"/>
-            <selectOption selector="#stuff" variable="randomStuff" stepKey="selectOption1"/>
-            <switchToIFrame variable="randomStuff" stepKey="switchToIFrame1"/>
-            <switchToNextTab variable="randomStuff" stepKey="switchToNextTab1"/>
-            <switchToPreviousTab variable="randomStuff" stepKey="switchToPreviousTab1"/>
-            <switchToNextTab variable="randomStuff" stepKey="switchToNextTab1"/>
-            <switchToWindow variable="randomStuff" stepKey="switchToWindow1"/>
-            <typeInPopup variable="randomStuff" stepKey="typeInPopup"/>
-            <unselectOption selector="#option" variable="randomStuff" stepKey="unselectOption1"/>
-            <waitForText variable="randomStuff" time="5" stepKey="waitForText1"/>
-        </test>
-        <test name="AllReplacementTest">
-            <annotations>
-                <title value="Exercise reference replacement."/>
-                <description value="Exercises {{foo}}, $foo$, and $$foo$$ replacement."/>
-                <severity value="CRITICAL"/>
-                <testCaseId value="#"/>
-            </annotations>
-
-            <createData entity="CustomerEntity1" stepKey="testScopeData"/>
-            <createData entity="AssertThis" stepKey="testScopeData2"/>
-
-            <!-- parameterized url that uses literal params -->
-            <amOnPage url="{{SamplePage.url('success','success2')}}" stepKey="a0"/>
-
-            <!-- url referencing data that was created in this <test> -->
-            <amOnPage url="$testScopeData.firstname$.html" stepKey="a1"/>
-
-            <!-- url referencing data that was created in a <before> -->
-            <amOnPage url="$$createData1.firstname$$.html" stepKey="a2"/>
-
-            <!-- parameterized url that uses created data params -->
-            <amOnPage url="{{SamplePage.url($testScopeData.firstname$,$testScopeData.lastname$)}}" stepKey="a3"/>
-            <amOnPage url="{{SamplePage.url($$createData1.firstname$$,$$createData1.lastname$$)}}" stepKey="a4"/>
-
-            <!-- parameterized selector that uses literal params -->
-            <click selector="{{SampleSection.oneParamElement('success')}}" stepKey="c1"/>
-            <click selector="{{SampleSection.twoParamElement('success','success2')}}" stepKey="c2"/>
-
-            <!-- parameterized selector with literal, static data, and created data  -->
-            <click selector="{{SampleSection.threeParamElement('John', SamplePerson.lastname, $testScopeData.lastname$)}}" stepKey="c3"/>
-
-            <!-- selector that uses created data -->
-            <click selector="#$testScopeData.firstname$ .$testScopeData.lastname$" stepKey="c4"/>
-            <click selector="#$$createData1.firstname$$ .$$createData1.lastname$$" stepKey="c5"/>
-
-            <!-- userInput that uses created data -->
-            <fillField selector="#sample" userInput="Hello $testScopeData.firstname$ $testScopeData.lastname$" stepKey="f1"/>
-            <fillField selector="#sample" userInput="Hello $$createData1.firstname$$ $$createData1.lastname$$" stepKey="f2"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
deleted file mode 100644
index 9022ae32a337c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/SetPaymentConfigurationCest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="SetPaymentConfigurationCest">
-        <annotations>
-            <group value="skip"/>
-        </annotations>
-        <test name="SetPaypalConfigurationTest">
-            <createData entity="SamplePaypalConfig" stepKey="createSamplePaypalConfig"/>
-            <createData entity="DefaultPayPalConfig" stepKey="restoreDefaultPaypalConfig"/>
-        </test>
-        <test name="SetBraintreeConfigurationTest">
-            <createData entity="SampleBraintreeConfig" stepKey="createSampleBraintreeConfig"/>
-            <createData entity="DefaultBraintreeConfig" stepKey="restoreDefaultBraintreeConfig"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
deleted file mode 100644
index 9fa215e582e3a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="UpdateSimpleProductByApiCest">
-        <annotations>
-            <features value="Update simple product by api test."/>
-            <stories value="Update simple product by api test."/>
-            <group value="skip"/>
-        </annotations>
-        <before>
-            <createData stepKey="categoryHandle" entity="SimpleSubCategory"/>
-            <createData stepKey="productHandle" entity="SimpleProduct" >
-                <required-entity createDataKey="categoryHandle"/>
-            </createData>
-            <updateData stepKey="updateProduct" entity="NewSimpleProduct" createDataKey="productHandle"/>
-        </before>
-        <after>
-            <deleteData stepKey="delete" createDataKey="updateProduct"/>
-        </after>
-        <test name="UpdateSimpleProductByApiTest">
-        </test>
-    </cest>
-</config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Data/SampleData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Data/SampleData.xml
deleted file mode 100644
index 222d81d1df1a1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Data/SampleData.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="SamplePerson" type="samplePerson">
-        <data key="foo">foo</data>
-        <data key="bar">bar</data>
-        <data key="lastName">Doe</data>
-        <data key="email" unique="prefix">.email@gmail.com</data>
-    </entity>
-    <entity name="OverrideDefaultPerson" type="samplePerson">
-        <data key="foo">fizz</data>
-        <data key="bar">buzz</data>
-    </entity>
-    <entity name="AppearanceMinHeightProperty" type="min_height_property">
-        <data key="name">Minimum Height</data>
-        <data key="section">appearance</data>
-        <data key="fieldName">min_height</data>
-    </entity>
-    <entity name="AssertThis" type="samplePerson">
-        <data key="firstname">Well</data>
-        <data key="lastname">Done</data>
-        <data key="email" unique="prefix">.email@gmail.com</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Page/SamplePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Page/SamplePage.xml
deleted file mode 100644
index d82d1079b7533..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Page/SamplePage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="SamplePage" url="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
-        <section name="SampleSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/README.md
deleted file mode 100644
index f3340b205f1a3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SampleTests** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Section/SampleSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Section/SampleSection.xml
deleted file mode 100644
index a3862d1520c0b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Section/SampleSection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="SampleSection">
-        <element name="oneParamElement" type="button" selector="#element .{{var1}}" parameterized="true"/>
-        <element name="twoParamElement" type="button" selector="#{{var1}} .{{var2}}" parameterized="true"/>
-        <element name="threeParamElement" type="button" selector="#{{var1}}-{{var2}} .{{var3}}" parameterized="true"/>
-        <element name="timeoutElement" type="button" selector="#foo" timeout="30"/>
-    </section>
-    <section name="ColumnSection">
-        <element name="panelFieldLabel" type="text" selector='//div[@data-index="{{arg1}}"]/descendant::div[@data-index="{{arg2}}"]/label | //div[@data-index="{{arg3}}"]/descendant::*[@class="admin__field-label"]/span[text()="{{arg4}}"]' parameterized="true" />
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json
deleted file mode 100644
index 70a9e9806b7b6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sample-tests",
-    "description": "Magento 2 Functional Test Module Sample Tests",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SampleTests\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md
deleted file mode 100644
index bb6c6d52df27d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Search** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
deleted file mode 100644
index c49c01d906ec3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-search",
-    "description": "Magento 2 Functional Test Module Search",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Search\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md
deleted file mode 100644
index 26f535867d4bc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Security** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json
deleted file mode 100644
index 49278c3877af1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-security",
-    "description": "Magento 2 Functional Test Module Security",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Security\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md
deleted file mode 100644
index 8759f1b780d3b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SendFriend** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json
deleted file mode 100644
index 34c4fe3b466f2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-send-friend",
-    "description": "Magento 2 Functional Test Module Send Friend",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SendFriend\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md
deleted file mode 100644
index 2e2ca0df9eaa6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Shipping** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json
deleted file mode 100644
index 007c4a85ee919..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-shipping",
-    "description": "Magento 2 Functional Test Module Shipping",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-contact": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Shipping\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md
deleted file mode 100644
index 9770ead78032c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Sitemap** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json
deleted file mode 100644
index 35cfb059ee516..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sitemap",
-    "description": "Magento 2 Functional Test Module Sitemap",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-robots": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Sitemap\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
deleted file mode 100644
index 8cfcd7d29ec14..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Cest/AdminCreateStoreGroupCest.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<!-- Test XML Example -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="AdminCreateStoreGroupCest">
-        <annotations>
-            <features value="Create a store group in admin"/>
-            <stories value="Create a store group in admin"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <group value="store"/>
-        </annotations>
-        <before>
-            <createData stepKey="b1" entity="customStoreGroup"/>
-            <createData stepKey="b2" entity="customStoreGroup"/>
-        </before>
-        <test name="AdminCreateStoreGroupTest">
-            <annotations>
-                <title value="Create a store group in admin"/>
-                <description value="Create a store group in admin"/>
-            </annotations>
-            <amOnPage stepKey="s1" url="{{AdminLoginPage.url}}"/>
-            <fillField stepKey="s3" selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
-            <fillField stepKey="s5" selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-            <click stepKey="s7" selector="{{AdminLoginFormSection.signIn}}"/>
-            <amOnPage stepKey="s9" url="{{AdminSystemStorePage.url}}"/>
-
-            <click stepKey="s11" selector="{{AdminStoresGridSection.resetButton}}"/>
-            <waitForPageLoad stepKey="s15" time="10"/>
-
-            <fillField stepKey="s17" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b1.group[name]$$"/>
-            <click stepKey="s19" selector="{{AdminStoresGridSection.searchButton}}"/>
-            <waitForPageLoad stepKey="s21" time="10"/>
-            <see stepKey="s23" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b1.group[name]$$"/>
-
-            <click stepKey="s31" selector="{{AdminStoresGridSection.resetButton}}"/>
-            <waitForPageLoad stepKey="s35" time="10"/>
-            <fillField stepKey="s37" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$b2.group[name]$$"/>
-            <click stepKey="s39" selector="{{AdminStoresGridSection.searchButton}}"/>
-            <waitForPageLoad stepKey="s41" time="10"/>
-            <see stepKey="s43" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$b2.group[name]$$"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
deleted file mode 100644
index 9625fa3152796..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="customStore" type="store">
-        <!--data key="group_id">customStoreGroup.id</data-->
-        <data key="name" unique="suffix">store</data>
-        <data key="code" unique="suffix">store</data>
-        <data key="is_active">1</data>
-        <data key="store_id">null</data>
-        <data key="store_action">add</data>
-        <data key="store_type">group</data>
-        <required-entity type="storeGroup">customStoreGroup</required-entity>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml
deleted file mode 100644
index 81ee940acf78a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="customStoreGroup" type="group">
-        <data key="group_id">null</data>
-        <data key="name" unique="suffix">store</data>
-        <data key="code" unique="suffix">store</data>
-        <data key="root_category_id">2</data>
-        <data key="website_id">1</data>
-        <data key="store_action">add</data>
-        <data key="store_type">group</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store-meta.xml
deleted file mode 100644
index e31443927a13d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store-meta.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateStore" dataType="store" type="create"
-               auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
-        <object dataType="store" key="store">
-            <field key="group_id">string</field>
-            <field key="name">string</field>
-            <field key="code">string</field>
-            <field key="is_active">boolean</field>
-            <field key="store_id">integer</field>
-        </object>
-        <field key="store_action">string</field>
-        <field key="store_type">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStorePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStorePage.xml
deleted file mode 100644
index 8aef6123f5a51..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStorePage.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminSystemStorePage" url="/admin/admin/system_store/" module="Store">
-        <section name="AdminStoresMainActionsSection"/>
-        <section name="AdminStoresGridSection"/>
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md
deleted file mode 100644
index 409824ff7bfc3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Store** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
deleted file mode 100644
index 1bc347d0c5aa7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminNewStoreGroupSection">
-        <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
-        <element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
-        <element name="storeRootCategoryDropdown" type="button" selector="#group_root_category_id"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreSection.xml
deleted file mode 100644
index 50e009c88f4bd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminNewStoreSection">
-        <element name="storeNameTextField" type="input" selector="#store_name"/>
-        <element name="storeCodeTextField" type="input" selector="#store_code"/>
-        <element name="statusDropdown" type="button" selector="#store_is_active"/>
-        <element name="storeGrpDropdown" type="button" selector="#store_group_id"/>
-        <element name="sortOrderTextField" type="input" selector="#store_sort_order"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
deleted file mode 100644
index ef9c27faa1954..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminStoresGridSection">
-        <element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
-        <element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
-        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
-        <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
-        <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml
deleted file mode 100644
index 5f8d1800aabc6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminStoresMainActionsSection">
-        <element name="createStoreViewButton" type="button" selector="#add_store"/>
-        <element name="createStoreButton" type="button" selector="#add_group"/>
-        <element name="createWebsiteButton" type="button" selector="#add"/>
-        <element name="saveButton" type="button" selector="#save"/>
-        <element name="backButton" type="button" selector="#back"/>
-    </section>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json
deleted file mode 100644
index e456d4113c430..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-store",
-    "description": "Magento 2 Functional Test Module Store",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Store\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md
deleted file mode 100644
index b9ad9db966882..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Swagger** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json
deleted file mode 100644
index 9d6c6ac8a8e22..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-swagger",
-    "description": "Magento 2 Functional Test Module Swagger",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Swagger\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md
deleted file mode 100644
index c117f0005c6b1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Swatches** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json
deleted file mode 100644
index 60588d548aacc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-swatches",
-    "description": "Magento 2 Functional Test Module Swatches",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Swatches\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md
deleted file mode 100644
index 5f25de111faa6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SwatchesLayeredNavigation** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json
deleted file mode 100644
index 64d374145ce97..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-swatches-layered-navigation",
-    "description": "Magento 2 Functional Test Module Swatches Layered Navigation",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SwatchesLayeredNavigation\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md
deleted file mode 100644
index 0b2f50e217b0b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Tax** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json
deleted file mode 100644
index c81eac8e64e83..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-tax",
-    "description": "Magento 2 Functional Test Module Tax",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Tax\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md
deleted file mode 100644
index dbbed298fe61c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_TaxImportExport** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json
deleted file mode 100644
index 92c8043066c3a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-tax-import-export",
-    "description": "Magento 2 Functional Test Module Tax Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\TaxImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md
deleted file mode 100644
index d52ba3a230431..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Theme** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
deleted file mode 100644
index 5e0e44f3b1f68..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-theme",
-    "description": "Magento 2 Functional Test Module Theme",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Theme\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md
deleted file mode 100644
index 4f3da0b95f39d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Translation** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json
deleted file mode 100644
index 3c41daeb23705..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-translation",
-    "description": "Magento 2 Functional Test Module Translation",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-developer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Translation\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md
deleted file mode 100644
index 0e654f6aa5e8f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Ui** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json
deleted file mode 100644
index c8b9594133978..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-ui",
-    "description": "Magento 2 Functional Test Module Ui",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Ui\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md
deleted file mode 100644
index 3a7f99729cad3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Ups** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json
deleted file mode 100644
index d972a81232963..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-ups",
-    "description": "Magento 2 Functional Test Module Ups",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Ups\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md
deleted file mode 100644
index 645ff970002a1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_UrlRewrite** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json
deleted file mode 100644
index b0b8e5ff73a72..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-url-rewrite",
-    "description": "Magento 2 Functional Test Module Url Rewrite",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\UrlRewrite\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserData.xml
deleted file mode 100644
index a8461be7f49db..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserData.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="admin" type="user">
-        <data key="email">admin@magento.com</data>
-        <data key="password">admin123</data>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md
deleted file mode 100644
index 77e18cd31e81b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_User** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json
deleted file mode 100644
index 5263f08825394..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-user",
-    "description": "Magento 2 Functional Test Module User",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-security": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\User\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md
deleted file mode 100644
index 0f87c957487ef..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Usps** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json
deleted file mode 100644
index a4f4b182caecc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-usps",
-    "description": "Magento 2 Functional Test Module Usps",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Usps\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md
deleted file mode 100644
index 9c847f4db2bdb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Variable** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json
deleted file mode 100644
index 4b38be8f11dfd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-variable",
-    "description": "Magento 2 Functional Test Module Variable",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Variable\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md
deleted file mode 100644
index 9edda871be550..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Vault** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json
deleted file mode 100644
index c5a28256b7aa5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-vault",
-    "description": "Magento 2 Functional Test Module Vault",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Vault\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md
deleted file mode 100644
index ba933541be888..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Version** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json
deleted file mode 100644
index 3e222e5641ab6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-version",
-    "description": "Magento 2 Functional Test Module Version",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Version\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md
deleted file mode 100644
index bb843ce718556..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Webapi** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json
deleted file mode 100644
index 00916f722e3d6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-webapi",
-    "description": "Magento 2 Functional Test Module Webapi",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Webapi\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md
deleted file mode 100644
index 25f93d6962924..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_WebapiSecurity** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json
deleted file mode 100644
index f66e3e65d26d7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-webapi-security",
-    "description": "Magento 2 Functional Test Module Webapi Security",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-webapi": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\WebapiSecurity\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md
deleted file mode 100644
index 4f199873079e5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Weee** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json
deleted file mode 100644
index 9bc06706ee75e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-weee",
-    "description": "Magento 2 Functional Test Module Weee",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Weee\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md
deleted file mode 100644
index 2a8996c2f3322..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Widget** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json
deleted file mode 100644
index 40445beb03c09..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-widget",
-    "description": "Magento 2 Functional Test Module Widget",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Widget\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
deleted file mode 100644
index 9b21337f94dd9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Cest/StorefrontDeletePersistedWishlistCest.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <cest name="StorefrontDeletePersistedWishlistCest">
-        <annotations>
-            <features value="Delete a persist wishlist for a customer"/>
-            <stories value="Delete a persist wishlist for a customer"/>
-            <env value="chrome"/>
-            <env value="firefox"/>
-            <group value="wishlist"/>
-        </annotations>
-        <before>
-            <createData stepKey="category" entity="SimpleSubCategory"/>
-            <createData stepKey="product" entity="SimpleProduct" >
-                <required-entity createDataKey="category"/>
-            </createData>
-            <createData stepKey="customer" entity="Simple_US_Customer"/>
-            <createData stepKey="wishlist" entity="Wishlist">
-                <required-entity createDataKey="customer"/>
-                <required-entity createDataKey="product"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData stepKey="deleteProduct" createDataKey="product"/>
-            <deleteData stepKey="deleteCategory" createDataKey="category"/>
-            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-        </after>
-        <test name="StorefrontDeletePersistedWishlistTest">
-            <annotations>
-                <title value="Delete a persist wishlist for a customer"/>
-                <description value="Delete a persist wishlist for a customer"/>
-            </annotations>
-            <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-            <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-            <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-            <waitForElementVisible stepKey="waitForButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-            <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-            <waitForPageLoad stepKey="15"/>
-            <amOnPage stepKey="amOnWishlist" url="{{StorefrontCustomerWishlistPage.url}}"/>
-            <see stepKey="seeWishlist" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-            <moveMouseOver stepKey="mouseOver" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-            <waitForElementVisible stepKey="waitForRemoveButton" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
-            <click stepKey="clickRemove" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
-            <see stepKey="seeEmptyWishlist" userInput="You have no items in your wish list" selector="{{StorefrontCustomerWishlistSection.emptyWishlistText}}"/>
-        </test>
-    </cest>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Data/WishlistData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Data/WishlistData.xml
deleted file mode 100644
index b45c2e21d4832..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Data/WishlistData.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="Wishlist" type="wishlist">
-        <data key="id">null</data>
-        <var key="product" entityType="product" entityKey="id"/>
-        <var key="customer_email" entityType="customer" entityKey="email"/>
-        <var key="customer_password" entityType="customer" entityKey="password"/>
-    </entity>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Metadata/wishlist-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Metadata/wishlist-meta.xml
deleted file mode 100644
index ab1aa22f9b80e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Metadata/wishlist-meta.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateWishlist" dataType="wishlist" type="create"
-               auth="customerFormKey" url="/wishlist/index/add/" method="POST" successRegex="" returnRegex="~\/wishlist_id\/(\d*?)\/~" >
-        <contentType>application/x-www-form-urlencoded</contentType>
-        <field key="product">integer</field>
-        <field key="customer_email">string</field>
-        <field key="customer_password">string</field>
-    </operation>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Page/StorefrontCustomerWishlistPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Page/StorefrontCustomerWishlistPage.xml
deleted file mode 100644
index 0ffe0f6c9efad..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Page/StorefrontCustomerWishlistPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontCustomerWishlistPage" url="/wishlist/" module="Magento_Wishlist">
-        <section name="StorefrontCustomerWishlistSection" />
-    </page>
-</config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md
deleted file mode 100644
index d5b0902bd9cb0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Wishlist** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
deleted file mode 100644
index 0379cc24e895b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StorefrontCustomerWishlistSection">
-        <element name="productItemNameText" type="text" selector=".products-grid .product-item-name a"/>
-        <element name="removeWishlistButton" type="button" selector=".products-grid .btn-remove.action.delete>span" timeout="30"/>
-        <element name="emptyWishlistText" type="text" selector=".message.info.empty>span"/>
-    </section>
-</config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
deleted file mode 100644
index 70e8df41e7313..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-wishlist",
-    "description": "Magento 2 Functional Test Module Wishlist",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rss": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Wishlist\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md
deleted file mode 100644
index a9826ff12fbd1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_WishlistAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json
deleted file mode 100644
index b49a321f44884..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-wishlist-analytics",
-    "description": "Magento 2 Acceptance Test Module WishlistAnalytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\WishlistAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/WishlistAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/_bootstrap.php b/dev/tests/acceptance/tests/functional/_bootstrap.php
deleted file mode 100644
index b142e36191e4c..0000000000000
--- a/dev/tests/acceptance/tests/functional/_bootstrap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// Here you can initialize variables that will be available to your tests
-require_once dirname(__DIR__) . '/_bootstrap.php';
-
-$RELATIVE_TESTS_MODULE_PATH = '/Magento/FunctionalTest';
-
-defined('TESTS_BP') || define('TESTS_BP', __DIR__);
-defined('TESTS_MODULE_PATH') || define('TESTS_MODULE_PATH', TESTS_BP . $RELATIVE_TESTS_MODULE_PATH);
diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php
index cbedef4731f93..b8c353b5bdf4f 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php
@@ -42,7 +42,7 @@ public function __construct(
         CookieMetadataFactory $cookieMetadataFactory
     ) {
         $this->cookieManager = $cookieManager;
-        $this->cookieMetadataFacory = $cookieMetadataFactory;
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->_response = $context->getResponse();
         $this->request = $context->getRequest();
     }
@@ -52,7 +52,7 @@ public function __construct(
      */
     protected function getCookieMetadataFactory()
     {
-        return $this->cookieMetadataFacory;
+        return $this->cookieMetadataFactory;
     }
 
     /**
diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModule1/etc/module.xml
index f0226e0745afa..a649cb9c357ff 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule1/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule1/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModule1" setup_version="1.0"/>
+    <module name="Magento_TestModule1" />
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule2/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModule2/etc/module.xml
index b2d84c04a8caf..93312a82384cc 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule2/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule2/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModule2" setup_version="1.0"/>
+    <module name="Magento_TestModule2" />
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule3/Service/V1/Error.php b/dev/tests/api-functional/_files/Magento/TestModule3/Service/V1/Error.php
index 6e681fbdd4687..3713396e5dd26 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule3/Service/V1/Error.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule3/Service/V1/Error.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\TestModule3\Service\V1;
 
 use Magento\Framework\Exception\AuthorizationException;
@@ -63,7 +64,7 @@ public function serviceException()
      */
     public function authorizationException()
     {
-        throw new AuthorizationException(__('Consumer is not authorized to access %1', 'resourceN'));
+        throw new AuthorizationException(__("The consumer isn't authorized to access %1.", 'resourceN'));
     }
 
     /**
diff --git a/dev/tests/api-functional/_files/Magento/TestModule3/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModule3/etc/module.xml
index 8863cb69e1fcc..f7940be3e768c 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule3/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule3/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModule3" setup_version="1.0"/>
+    <module name="Magento_TestModule3" />
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModule4/etc/module.xml
index 11732fbd97aed..3a5670ccd54b0 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule4/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule4/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModule4" setup_version="1.0"/>
+    <module name="Magento_TestModule4" />
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule5/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModule5/etc/module.xml
index 1f735f68b1bf6..31c70e18a7935 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule5/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule5/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModule5" setup_version="1.0"/>
+    <module name="Magento_TestModule5" />
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/Setup/InstallSchema.php b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/Setup/InstallSchema.php
deleted file mode 100644
index c866507f5e66a..0000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/Setup/InstallSchema.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestModuleDefaultHydrator\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('testmodule_default_hydrator_extension_attribute_entity')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'customer_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => false, 'unsigned' => true, 'nullable' => false, 'primary' => false],
-            'Customer Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Value'
-        )->addForeignKey(
-            $installer->getFkName('customer_extension_attribute_entity', 'customer_id', 'customer_entity', 'entity_id'),
-            'customer_id',
-            $installer->getTable('customer_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
new file mode 100644
index 0000000000000..3c71e2fde48fa
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="testmodule_default_hydrator_extension_attribute_entity" resource="default" engine="innodb">
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="varchar" name="value" nullable="true" length="255"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CSTR_EXTENSION_ATTR_ENTT_CSTR_ID_CSTR_ENTT_ENTT_ID"
+                    table="testmodule_default_hydrator_extension_attribute_entity" column="customer_id"
+                    referenceTable="customer_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
+    </table>
+</schema>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema_whitelist.json b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..dc64920f2fd84
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema_whitelist.json
@@ -0,0 +1,13 @@
+{
+  "testmodule_default_hydrator_extension_attribute_entity": {
+    "column": {
+      "entity_id": true,
+      "customer_id": true,
+      "value": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "CSTR_EXTENSION_ATTR_ENTT_CSTR_ID_CSTR_ENTT_ENTT_ID": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml
index 3d10999829bf3..ca4ded8ff3190 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_TestModuleDefaultHydrator" setup_version="2.0.0">
+    <module name="Magento_TestModuleDefaultHydrator">
     </module>
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
new file mode 100644
index 0000000000000..1731a974aaed3
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleGraphQlQuery\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+class Item implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $id = 0;
+        foreach ($args as $key => $argValue) {
+            if ($key === "id") {
+                $id = (int)$argValue;
+            }
+        }
+        $itemData = [
+            'item_id' => $id,
+            'name' => "itemName"
+        ];
+        return $itemData;
+    }
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/di.xml
new file mode 100644
index 0000000000000..c6f90a13001a3
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/di.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\TestModuleGraphQlQuery\Model\Entity\ItemInterface" type="Magento\TestModuleGraphQlQuery\Model\Entity\Item"/>
+</config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/module.xml
new file mode 100644
index 0000000000000..c4ad9ac7f3876
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleGraphQlQuery" />
+</config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
new file mode 100644
index 0000000000000..7eb175a88e322
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
@@ -0,0 +1,20 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    testItem(id: Int!) : Item @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\Item")
+}
+
+type Mutation {
+    testItem(id: Int!) : MutationItem @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\Item")
+}
+
+type Item {
+    item_id: Int
+    name: String
+}
+
+type MutationItem {
+    item_id: Int
+    name: String
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/registration.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/registration.php
new file mode 100644
index 0000000000000..1769fb02016fb
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleGraphQlQuery') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleGraphQlQuery', __DIR__);
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php
new file mode 100644
index 0000000000000..34dc92fcbbaa4
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/Model/Resolver/IntegerList.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleGraphQlQueryExtension\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Class IntegerList
+ */
+class IntegerList implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['item_id'])) {
+            return null;
+        }
+
+        $itemId = $value['item_id'];
+
+        $resultData = [$itemId + 1, $itemId + 2, $itemId + 3];
+        return $resultData;
+    }
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/etc/module.xml
new file mode 100644
index 0000000000000..e6a8affe747eb
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleGraphQlQueryExtension" />
+</config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/etc/schema.graphqls b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/etc/schema.graphqls
new file mode 100644
index 0000000000000..b970ad8376349
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/etc/schema.graphqls
@@ -0,0 +1,10 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Item {
+    integer_list: [Int] @resolver(class: "Magento\\TestModuleGraphQlQueryExtension\\Model\\Resolver\\IntegerList")
+}
+
+type MutationItem {
+    integer_list: [Int] @resolver(class: "Magento\\TestModuleGraphQlQueryExtension\\Model\\Resolver\\IntegerList")
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/registration.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/registration.php
new file mode 100644
index 0000000000000..276615b896340
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQueryExtension/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleGraphQlQueryExtension') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleGraphQlQueryExtension', __DIR__);
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
index 25b8baaa73f78..8c3ed345146c3 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
+++ b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
@@ -5,12 +5,11 @@
     "sort-packages": true
   },
   "require": {
-    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-    "magento/framework": "0.42.0-beta8",
-    "magento/module-integration": "0.42.0-beta8"
+    "php": "~7.1.3||~7.2.0",
+    "magento/framework": "*",
+    "magento/module-integration": "*"
   },
   "type": "magento2-module",
-  "version": "1.0",
   "extra": {
     "map": [
       [
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml
index eaf0f69a596fa..cd78d204dc9ae 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleIntegrationFromConfig" setup_version="0.0.1" active="true">
+    <module name="Magento_TestModuleIntegrationFromConfig" active="true">
     </module>
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
index ee6b92cca8403..e6670c85a14a9 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
+++ b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
@@ -5,12 +5,11 @@
     "sort-packages": true
   },
   "require": {
-    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-    "magento/framework": "0.42.0-beta8",
-    "magento/module-sales": "0.42.0-beta8"
+    "php": "~7.1.3||~7.2.0",
+    "magento/framework": "*",
+    "magento/module-sales": "*"
   },
   "type": "magento2-module",
-  "version": "1.0",
   "extra": {
     "map": [
       [
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/module.xml
index e5ab9c1860103..afb3a091f5fb6 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleJoinDirectives" setup_version="1.0"/>
+    <module name="Magento_TestModuleJoinDirectives" />
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/module.xml
index 4ebbe995e020e..1e3752b1e93ff 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleMSC" setup_version="1.0"/>
+    <module name="Magento_TestModuleMSC" />
 </config>
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 cff7bd4b221f7..88ac682f6b282 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
@@ -100,6 +100,7 @@ protected function _getFixtures($scope, \PHPUnit\Framework\TestCase $test)
      * Execute single fixture script
      *
      * @param string|array $fixture
+     * @throws \Throwable
      */
     protected function _applyOneFixture($fixture)
     {
@@ -110,9 +111,13 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            echo 'Exception occurred when running the '
-            . (is_array($fixture) || is_scalar($fixture) ? json_encode($fixture) : 'callback')
-            . ' fixture: ', PHP_EOL, $e;
+            throw new \Exception(
+                sprintf(
+                    "Exception occurred when running the %s fixture: \n%s",
+                    (\is_array($fixture) || is_scalar($fixture) ? json_encode($fixture) : 'callback'),
+                    $e->getMessage()
+                )
+            );
         }
         $this->_appliedFixtures[] = $fixture;
     }
@@ -139,7 +144,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/Magento/TestFramework/TestCase/GraphQl/Client.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
index 7cea3c2f6ee30..5458b5cfbb731 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
@@ -9,6 +9,7 @@
 use Magento\TestFramework\TestCase\HttpClient\CurlClient;
 use Magento\TestFramework\Helper\JsonSerializer;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Curl client for GraphQL
@@ -28,8 +29,6 @@ class Client
     private $json;
 
     /**
-     * CurlClient constructor.
-     *
      * @param CurlClient|null $curlClient
      * @param JsonSerializer|null $json
      */
@@ -66,25 +65,55 @@ public function postQuery(string $query, array $variables = [], string $operatio
         $responseBody = $this->curlClient->post($url, $postData, $headers);
         $responseBodyArray = $this->json->jsonDecode($responseBody);
 
+        if (!is_array($responseBodyArray)) {
+            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        }
+
+        $this->processErrors($responseBodyArray);
+
+        if (!isset($responseBodyArray['data'])) {
+            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        } else {
+            return $responseBodyArray['data'];
+        }
+    }
+
+    /**
+     * Process errors
+     *
+     * @param array $responseBodyArray
+     * @throws \Exception
+     */
+    private function processErrors($responseBodyArray)
+    {
         if (isset($responseBodyArray['errors'])) {
             $errorMessage = '';
             if (is_array($responseBodyArray['errors'])) {
                 foreach ($responseBodyArray['errors'] as $error) {
                     if (isset($error['message'])) {
                         $errorMessage .= $error['message'] . PHP_EOL;
+                        if (isset($error['debugMessage'])) {
+                            $errorMessage .= $error['debugMessage'] . PHP_EOL;
+                        }
+                    }
+                    if (isset($error['trace'])) {
+                        $traceString = $error['trace'];
+                        TestCase::assertNotEmpty($traceString, "trace is empty");
                     }
                 }
-                throw new \Exception('GraphQL response contains errors: ' . $errorMessage);
+
+                throw new ResponseContainsErrorsException(
+                    'GraphQL response contains errors: ' . $errorMessage,
+                    $responseBodyArray
+                );
             }
-            throw new \Exception('GraphQL responded with an unknown error: ' . $responseBody);
-        } elseif (!isset($responseBodyArray['data'])) {
-            throw new \Exception('Unknown GraphQL response body: ' . $responseBody);
+            throw new \Exception('GraphQL responded with an unknown error: ' . json_encode($responseBodyArray));
         }
-
-        return $responseBodyArray['data'];
     }
 
     /**
+     * Get endpoint url
+     *
      * @return string resource URL
      * @throws \Exception
      */
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResponseContainsErrorsException.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResponseContainsErrorsException.php
new file mode 100644
index 0000000000000..568de57543d84
--- /dev/null
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResponseContainsErrorsException.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\TestCase\GraphQl;
+
+/**
+ * Response contains errors exception
+ */
+class ResponseContainsErrorsException extends \Exception
+{
+    /**
+     * @var array
+     */
+    private $responseData;
+
+    /**
+     * @param string $message
+     * @param array $responseData
+     * @param \Exception|null $cause
+     * @param int $code
+     */
+    public function __construct(string $message, array $responseData, \Exception $cause = null, int $code = 0)
+    {
+        parent::__construct($message, $code, $cause);
+        $this->responseData = $responseData;
+    }
+
+    /**
+     * Get response data
+     *
+     * @return array
+     */
+    public function getResponseData(): array
+    {
+        return $this->responseData;
+    }
+}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index 3a402f3b5e91d..790581c476da1 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -9,6 +9,8 @@
 
 /**
  * Test case for Web API functional tests for Graphql.
+ *
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
 abstract class GraphQlAbstract extends WebapiAbstract
 {
@@ -20,9 +22,9 @@ abstract class GraphQlAbstract extends WebapiAbstract
     private $graphQlClient;
 
     /**
-     * @var string
+     * @var \Magento\Framework\App\Cache
      */
-    private $token = '';
+    private $appCache;
 
     /**
      * Perform GraphQL call to the system under test.
@@ -31,48 +33,60 @@ abstract class GraphQlAbstract extends WebapiAbstract
      * @param string $query
      * @param array $variables
      * @param string $operationName
+     * @param array $headers
      * @return array|int|string|float|bool GraphQL call results
+     * @throws \Exception
      */
     public function graphQlQuery(
         string $query,
         array $variables = [],
-        string $operationName = ''
+        string $operationName = '',
+        array $headers = []
     ) {
         return $this->getGraphQlClient()->postQuery(
             $query,
             $variables,
             $operationName,
-            $this->composeHeaders()
+            $this->composeHeaders($headers)
         );
     }
 
     /**
-     * @param string $token
-     * @return void
+     * Compose headers
+     *
+     * @param array $headers
+     * @return string[]
      */
-    public function setToken(string $token)
+    private function composeHeaders(array $headers): array
     {
-        $this->token = $token;
+        $headersArray = [];
+        foreach ($headers as $key => $value) {
+            $headersArray[] = sprintf('%s: %s', $key, $value);
+        }
+        return $headersArray;
     }
 
     /**
-     * @return string
+     * Clear cache so integration test can alter cached GraphQL schema
+     *
+     * @return bool
      */
-    public function getToken()
+    protected function cleanCache()
     {
-        return $this->token;
+        return $this->getAppCache()->clean(\Magento\Framework\App\Config::CACHE_TAG);
     }
 
     /**
-     * @return string[]
+     * Return app cache setup.
+     *
+     * @return \Magento\Framework\App\Cache
      */
-    private function composeHeaders()
+    private function getAppCache()
     {
-        $headers = [];
-        if (!empty($this->token)) {
-            $headers = [sprintf('Authorization: Bearer %s', $this->token)];
+        if (null === $this->appCache) {
+            $this->appCache = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Cache::class);
         }
-        return $headers;
+        return $this->appCache;
     }
 
     /**
@@ -83,9 +97,37 @@ private function composeHeaders()
     private function getGraphQlClient()
     {
         if ($this->graphQlClient === null) {
-            return Bootstrap::getObjectManager()->get(\Magento\TestFramework\TestCase\GraphQl\Client::class);
-        } else {
-            $this->graphQlClient;
+            $this->graphQlClient = Bootstrap::getObjectManager()->get(
+                \Magento\TestFramework\TestCase\GraphQl\Client::class
+            );
+        }
+        return $this->graphQlClient;
+    }
+
+    /**
+     * Compare actual response fields with expected
+     *
+     * @param array $actualResponse
+     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
+     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
+     */
+    protected function assertResponseFields($actualResponse, $assertionMap)
+    {
+        foreach ($assertionMap as $key => $assertionData) {
+            $expectedValue = isset($assertionData['expected_value'])
+                ? $assertionData['expected_value']
+                : $assertionData;
+            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
+            self::assertNotNull(
+                $expectedValue,
+                "Value of '{$responseField}' field must not be NULL"
+            );
+            self::assertEquals(
+                $expectedValue,
+                $actualResponse[$responseField],
+                "Value of '{$responseField}' field in response does not match expected value: "
+                . var_export($expectedValue, true)
+            );
         }
     }
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
index aee77ae6d589f..e2e32c119af21 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -63,7 +63,7 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
     }
 
     /**
-     * Get proper SOAP client instance that is initialized with with WSDL corresponding to requested service interface.
+     * Get proper SOAP client instance that is initialized with WSDL corresponding to requested service interface.
      *
      * @param string $serviceInfo PHP service interface name, should include version if present
      * @param string|null $storeCode
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php b/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
index 03364acbb8663..992653a3a65d6 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
@@ -26,8 +26,12 @@ public function run()
     /**
      * {@inheritdoc}
      */
-    public function install()
+    public function install($cleanup)
     {
+        if ($cleanup) {
+            $this->cleanup();
+        }
+
         $installOptions = $this->getInstallConfig();
 
         /* Install application */
diff --git a/dev/tests/api-functional/framework/bootstrap.php b/dev/tests/api-functional/framework/bootstrap.php
index 7a7b061858ac7..01580bc268d05 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)) {
@@ -58,10 +66,8 @@
     );
 
     if (defined('TESTS_MAGENTO_INSTALLATION') && TESTS_MAGENTO_INSTALLATION === 'enabled') {
-        if (defined('TESTS_CLEANUP') && TESTS_CLEANUP === 'enabled') {
-            $application->cleanup();
-        }
-        $application->install();
+        $cleanup = (defined('TESTS_CLEANUP') && TESTS_CLEANUP === 'enabled');
+        $application->install($cleanup);
     }
 
     $bootstrap = new \Magento\TestFramework\Bootstrap(
diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
index 4a57c338ca3a2..aa1899d88f48e 100644
--- a/dev/tests/api-functional/phpunit_graphql.xml.dist
+++ b/dev/tests/api-functional/phpunit_graphql.xml.dist
@@ -52,5 +52,58 @@
     <!-- Test listeners -->
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output folder -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="magentoApiDataFixture">
+                        <string>magentoApiDataFixture</string>
+                    </element>
+                    <element key="Override">
+                        <string>Override</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/api-functional/phpunit_rest.xml.dist b/dev/tests/api-functional/phpunit_rest.xml.dist
index ae73039670a09..c5173e5dd432e 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>
 
@@ -57,5 +58,58 @@
     <!-- Test listeners -->
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output folder -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="magentoApiDataFixture">
+                        <string>magentoApiDataFixture</string>
+                    </element>
+                    <element key="Override">
+                        <string>Override</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/api-functional/phpunit_soap.xml.dist b/dev/tests/api-functional/phpunit_soap.xml.dist
index ab3571359bc5e..935f5113b67a7 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>
 
@@ -56,5 +57,58 @@
     <!-- Test listeners -->
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output folder -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="magentoApiDataFixture">
+                        <string>magentoApiDataFixture</string>
+                    </element>
+                    <element key="Override">
+                        <string>Override</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
new file mode 100644
index 0000000000000..6fd7551676660
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Api;
+
+use Magento\Analytics\Model\FileInfoManager;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+/**
+ * Class LinkProviderTest.
+ *
+ * Checks that api for providing link to encrypted archive works.
+ */
+class LinkProviderTest extends WebapiAbstract
+{
+    const SERVICE_VERSION = 'V1';
+    const SERVICE_NAME = 'analyticsLinkProviderV1';
+    const RESOURCE_PATH = '/V1/analytics/link';
+
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Analytics/_files/create_link.php
+     */
+    public function testGetAll()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        /**
+         * @var $fileInfoManager FileInfoManager
+         */
+        $fileInfoManager = $objectManager->create(FileInfoManager::class);
+
+        $storeManager = $objectManager->create(StoreManagerInterface::class);
+
+        $fileInfo = $fileInfoManager->load();
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => static::RESOURCE_PATH,
+                'httpMethod' => Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => static::SERVICE_NAME,
+                'serviceVersion' => static::SERVICE_VERSION,
+                'operation' => static::SERVICE_NAME . 'Get',
+            ],
+        ];
+        if (!$this->isTestBaseUrlSecure()) {
+            try {
+                $this->_webApiCall($serviceInfo);
+            } catch (\Exception $e) {
+                $this->assertContains(
+                    'Operation allowed only in HTTPS',
+                    $e->getMessage()
+                );
+                return;
+            }
+            $this->fail("Exception 'Operation allowed only in HTTPS' should be thrown");
+        } else {
+            $response = $this->_webApiCall($serviceInfo);
+            $this->assertEquals(2, count($response));
+            $this->assertEquals(
+                base64_encode($fileInfo->getInitializationVector()),
+                $response['initialization_vector']
+            );
+            $this->assertEquals(
+                $storeManager->getStore()->getBaseUrl(
+                    UrlInterface::URL_TYPE_MEDIA
+                ) . $fileInfo->getPath(),
+                $response['url']
+            );
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    private function isTestBaseUrlSecure()
+    {
+        return strpos('https://', TESTS_BASE_URL) !== false;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php
new file mode 100644
index 0000000000000..8eab6c9fd8676
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api;
+
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\Framework\Bulk\OperationInterface;
+
+class OperationRepositoryInterfaceTest extends WebapiAbstract
+{
+    const RESOURCE_PATH = '/V1/bulk';
+    const SERVICE_NAME = 'asynchronousOperationsOperationRepositoryV1';
+
+    /**
+     * @magentoApiDataFixture Magento/AsynchronousOperations/_files/operation_searchable.php
+     */
+    public function testGetListByBulkStartTime()
+    {
+        $searchCriteria = [
+            'searchCriteria' => [
+                'filter_groups' => [
+                    [
+                        'filters' => [
+                            [
+                                'field' => 'start_time',
+                                'value' => '2010-10-10 00:00:00',
+                                'condition_type' => 'lteq',
+                            ],
+                        ],
+                    ],
+                ],
+                'current_page' => 1,
+            ],
+        ];
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+                'httpMethod' => Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'operation' => self::SERVICE_NAME . 'GetList',
+            ],
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+
+        $this->assertArrayHasKey('search_criteria', $response);
+        $this->assertArrayHasKey('total_count', $response);
+        $this->assertArrayHasKey('items', $response);
+
+        $this->assertEquals($searchCriteria['searchCriteria'], $response['search_criteria']);
+        $this->assertEquals(3, $response['total_count']);
+        $this->assertEquals(3, count($response['items']));
+
+        foreach ($response['items'] as $item) {
+            $this->assertEquals('bulk-uuid-searchable-6', $item['bulk_uuid']);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/AsynchronousOperations/_files/operation_searchable.php
+     */
+    public function testGetList()
+    {
+        $searchCriteria = [
+            'searchCriteria' => [
+                'filter_groups' => [
+                    [
+                        'filters' => [
+                            [
+                                'field' => 'bulk_uuid',
+                                'value' => 'bulk-uuid-searchable-6',
+                                'condition_type' => 'eq',
+                            ],
+                        ],
+                    ],
+                    [
+                        'filters' => [
+                            [
+                                'field' => 'status',
+                                'value' => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                                'condition_type' => 'eq',
+                            ],
+                        ],
+                    ],
+                ],
+                'current_page' => 1,
+            ],
+        ];
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+                'httpMethod' => Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'operation' => self::SERVICE_NAME . 'GetList',
+            ],
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+
+        $this->assertArrayHasKey('search_criteria', $response);
+        $this->assertArrayHasKey('total_count', $response);
+        $this->assertArrayHasKey('items', $response);
+
+        $this->assertEquals($searchCriteria['searchCriteria'], $response['search_criteria']);
+        $this->assertEquals(1, $response['total_count']);
+        $this->assertEquals(1, count($response['items']));
+
+        foreach ($response['items'] as $item) {
+            $this->assertEquals('bulk-uuid-searchable-6', $item['bulk_uuid']);
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php
index 582508184b5d6..5fb2020de3e81 100644
--- a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php
@@ -31,8 +31,8 @@ public function testGet()
                     'position' => 0,
                     'can_change_quantity' => 1,
                     'is_default' => false,
-                    'price' => null,
-                    'price_type' => null,
+                    'price' => 2.75,
+                    'price_type' => 0,
                 ],
             ],
         ];
@@ -72,8 +72,8 @@ public function testGetList()
                         'position' => 0,
                         'can_change_quantity' => 1,
                         'is_default' => false,
-                        'price' => null,
-                        'price_type' => null,
+                        'price' => 2.75,
+                        'price_type' => 0,
                     ],
                 ],
             ],
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php
index c645712dafca1..8ad55207b5f8b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 use Magento\TestFramework\Helper\Bootstrap;
@@ -82,7 +83,6 @@ public function testCreateThrowsExceptionIfGivenAttributeSetAlreadyHasId()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Can not create attribute set based on not existing attribute set
      */
     public function testCreateThrowsExceptionIfGivenSkeletonIdIsInvalid()
     {
@@ -95,11 +95,14 @@ public function testCreateThrowsExceptionIfGivenSkeletonIdIsInvalid()
             'skeletonId' => 0,
         ];
         $this->_webApiCall($this->createServiceInfo, $arguments);
+
+        $this->expectExceptionMessage(
+            "The attribute set couldn't be created because it's based on a non-existing attribute set."
+        );
     }
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Can not create attribute set based on non product attribute set.
      */
     public function testCreateThrowsExceptionIfGivenSkeletonIdHasWrongEntityType()
     {
@@ -112,11 +115,14 @@ public function testCreateThrowsExceptionIfGivenSkeletonIdHasWrongEntityType()
             'skeletonId' => 7,
         ];
         $this->_webApiCall($this->createServiceInfo, $arguments);
+
+        $this->expectExceptionMessage(
+            "The attribute set couldn't be created because it's based on a non-product attribute set."
+        );
     }
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Can not create attribute set based on not existing attribute set
      */
     public function testCreateThrowsExceptionIfGivenSkeletonAttributeSetDoesNotExist()
     {
@@ -129,11 +135,15 @@ public function testCreateThrowsExceptionIfGivenSkeletonAttributeSetDoesNotExist
             'skeletonId' => 9999,
         ];
         $this->_webApiCall($this->createServiceInfo, $arguments);
+
+        $this->expectExceptionMessage(
+            "The attribute set couldn't be created because it's based on a non-existing attribute set."
+        );
     }
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Attribute set name is empty.
+     * @expectedExceptionMessage The attribute set name is empty. Enter the name and try again.
      */
     public function testCreateThrowsExceptionIfAttributeSetNameIsEmpty()
     {
@@ -156,7 +166,7 @@ public function testCreateThrowsExceptionIfAttributeSetWithGivenNameAlreadyExist
         $entityTypeCode = 'catalog_product';
         $entityType = $this->getEntityTypeByCode($entityTypeCode);
         $attributeSetName = 'Default';
-        $expectedMessage = 'An attribute set named "Default" already exists.';
+        $expectedMessage = 'A "Default" attribute set name already exists. Create a new name and try again.';
 
         $arguments = [
             'attributeSet' => [
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
index 13e927be66d66..810e533f1f2f8 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
@@ -57,7 +57,7 @@ public function testAssignAttributeWrongAttributeSet()
         $payload = $this->getAttributeData();
         $payload['attributeSetId'] = -1;
 
-        $expectedMessage = 'AttributeSet with id "%1" does not exist.';
+        $expectedMessage = 'The AttributeSet with a "%1" ID doesn\'t exist. Verify the attributeSet and try again.';
 
         try {
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
@@ -80,7 +80,7 @@ public function testAssignAttributeWrongAttributeGroup()
     {
         $payload = $this->getAttributeData();
         $payload['attributeGroupId'] = -1;
-        $expectedMessage = 'Group with id "%1" does not exist.';
+        $expectedMessage = 'The group with the "%1" ID doesn\'t exist. Verify the ID and try again.';
 
         try {
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
@@ -103,7 +103,8 @@ public function testAssignAttributeWrongAttribute()
     {
         $payload = $this->getAttributeData();
         $payload['attributeCode'] = 'badCode';
-        $expectedMessage = 'Attribute with attributeCode "%1" does not exist.';
+        $expectedMessage =
+            'The attribute with a "%1" attributeCode doesn\'t exist. Verify the attribute and try again.';
 
         try {
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php
index ca9ad9897bf8c..9a6520a3ab458 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Api\Data\ImageContentInterface;
@@ -384,7 +385,7 @@ public function testCreateThrowsExceptionIfProvidedImageHasWrongMimeType()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testCreateThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -433,7 +434,7 @@ public function testCreateThrowsExceptionIfProvidedImageNameContainsForbiddenCha
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -457,7 +458,7 @@ public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      * @expectedException \Exception
-     * @expectedExceptionMessage There is no image with provided ID.
+     * @expectedExceptionMessage No image with the provided ID was found. Verify the ID and try again.
      */
     public function testUpdateThrowsExceptionIfThereIsNoImageWithGivenId()
     {
@@ -481,7 +482,7 @@ public function testUpdateThrowsExceptionIfThereIsNoImageWithGivenId()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testDeleteThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -497,7 +498,7 @@ public function testDeleteThrowsExceptionIfTargetProductDoesNotExist()
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      * @expectedException \Exception
-     * @expectedExceptionMessage There is no image with provided ID.
+     * @expectedExceptionMessage No image with the provided ID was found. Verify the ID and try again.
      */
     public function testDeleteThrowsExceptionIfThereIsNoImageWithGivenId()
     {
@@ -609,9 +610,13 @@ public function testGetListForAbsentSku()
             'sku' => $productSku,
         ];
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            $this->expectException('SoapFault', 'Requested product doesn\'t exist');
+            $this->expectException('SoapFault');
+            $this->expectExceptionMessage(
+                "The product that was requested doesn't exist. Verify the product and try again."
+            );
         } else {
-            $this->expectException('Exception', '', 404);
+            $this->expectException('Exception');
+            $this->expectExceptionCode(404);
         }
         $this->_webApiCall($serviceInfo, $requestData);
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
index 6c1e351ccd1ee..1d37ea9a2fc6d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
@@ -74,7 +74,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertTrue($response);
+        $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(
@@ -111,6 +111,9 @@ public function addDataProvider()
             'option_with_value_node_that_starts_with_a_number' => [
                 array_merge($optionPayload, [AttributeOptionInterface::VALUE => '123_some_text'])
             ],
+            'option_with_value_node_that_is_a_number' => [
+                array_merge($optionPayload, [AttributeOptionInterface::VALUE => '123'])
+            ],
 
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
index e48c5ad018db4..386bd9fc9aeeb 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
@@ -22,6 +23,7 @@ class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\Web
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
+     * @return void
      */
     public function testGet()
     {
@@ -34,6 +36,9 @@ public function testGet()
         $this->assertEquals($attributeCode, $attribute['attribute_code']);
     }
 
+    /**
+     * @return void
+     */
     public function testGetList()
     {
         $searchCriteria = [
@@ -82,6 +87,7 @@ public function testGetList()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @return void
      */
     public function testCreate()
     {
@@ -100,7 +106,8 @@ public function testCreate()
             "is_filterable_in_search" => true,
         ];
 
-        $this->assertEquals('front_lbl', $attribute['default_frontend_label']);
+        $this->assertEquals('default_label', $attribute['default_frontend_label']);
+        $this->assertEquals('front_lbl_store1', $attribute['frontend_labels'][0]['label']);
         foreach ($expectedData as $key => $value) {
             $this->assertEquals($value, $attribute[$key]);
         }
@@ -115,6 +122,7 @@ public function testCreate()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
+     * @return void
      */
     public function testCreateWithExceptionIfAttributeAlreadyExists()
     {
@@ -131,6 +139,7 @@ public function testCreateWithExceptionIfAttributeAlreadyExists()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @return void
      */
     public function testUpdate()
     {
@@ -145,9 +154,12 @@ public function testUpdate()
                 'attribute_code' => $attributeCode,
                 'entity_type_id' => 4,
                 'is_used_in_grid' => true,
+                //Update existing
                 'default_frontend_label' => 'default_label_new',
                 'frontend_labels' => [
-                    ['store_id' => 1, 'label' => 'front_lbl_new'],
+                    //Update existing
+                    ['store_id' => 0, 'label' => 'front_lbl_store0_new'],
+                    ['store_id' => 1, 'label' => 'front_lbl_store1_new'],
                 ],
                 "options" => [
                     //Update existing
@@ -189,6 +201,7 @@ public function testUpdate()
         $this->assertEquals(true, $result['is_used_in_grid']);
         $this->assertEquals($attributeCode, $result['attribute_code']);
         $this->assertEquals('default_label_new', $result['default_frontend_label']);
+        $this->assertEquals('front_lbl_store1_new', $result['frontend_labels'][0]['label']);
         //New option set as default
         $this->assertEquals($result['options'][3]['value'], $result['default_value']);
         $this->assertEquals("Default Blue Updated", $result['options'][1]['label']);
@@ -196,6 +209,72 @@ public function testUpdate()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @return void
+     */
+    public function testUpdateWithNoDefaultLabelAndAdminStorelabel()
+    {
+        $attributeCode = uniqid('label_attr_code');
+        $attribute = $this->createAttribute($attributeCode);
+
+        $attributeData = [
+            'attribute' => [
+                'attribute_id' => $attribute['attribute_id'],
+                'attribute_code' => $attributeCode,
+                'entity_type_id' => 4,
+                'is_used_in_grid' => true,
+                'frontend_labels' => [
+                    //Update existing
+                    ['store_id' => 0, 'label' => 'front_lbl_store0_new'],
+                    ['store_id' => 1, 'label' => 'front_lbl_store1_new'],
+                ],
+                'is_required' => false,
+                'frontend_input' => 'select',
+            ],
+        ];
+        $result = $this->updateAttribute($attributeCode, $attributeData);
+
+        $this->assertEquals($attribute['attribute_id'], $result['attribute_id']);
+        $this->assertEquals(true, $result['is_used_in_grid']);
+        $this->assertEquals($attributeCode, $result['attribute_code']);
+        $this->assertEquals('front_lbl_store0_new', $result['default_frontend_label']);
+        $this->assertEquals('front_lbl_store1_new', $result['frontend_labels'][0]['label']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @return void
+     */
+    public function testUpdateWithNoDefaultLabelAndNoAdminStoreLabel()
+    {
+        $attributeCode = uniqid('label_attr_code');
+        $attribute = $this->createAttribute($attributeCode);
+
+        $attributeData = [
+            'attribute' => [
+                'attribute_id' => $attribute['attribute_id'],
+                'attribute_code' => $attributeCode,
+                'entity_type_id' => 4,
+                'is_used_in_grid' => true,
+                'frontend_labels' => [
+                    //Update existing
+                    ['store_id' => 1, 'label' => 'front_lbl_store1_new'],
+                ],
+                'is_required' => false,
+                'frontend_input' => 'select',
+            ],
+        ];
+        $result = $this->updateAttribute($attributeCode, $attributeData);
+
+        $this->assertEquals($attribute['attribute_id'], $result['attribute_id']);
+        $this->assertEquals(true, $result['is_used_in_grid']);
+        $this->assertEquals($attributeCode, $result['attribute_code']);
+        $this->assertEquals('default_label', $result['default_frontend_label']);
+        $this->assertEquals('front_lbl_store1_new', $result['frontend_labels'][0]['label']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @return void
      */
     public function testUpdateWithNewOption()
     {
@@ -233,6 +312,7 @@ public function testUpdateWithNewOption()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
+     * @return void
      */
     public function testDeleteById()
     {
@@ -240,10 +320,14 @@ public function testDeleteById()
         $this->assertTrue($this->deleteAttribute($attributeCode));
     }
 
+    /**
+     * @return void
+     */
     public function testDeleteNoSuchEntityException()
     {
         $attributeCode = 'some_test_code';
-        $expectedMessage = 'Attribute with attributeCode "%1" does not exist.';
+        $expectedMessage =
+            'The attribute with a "%1" attributeCode doesn\'t exist. Verify the attribute and try again.';
 
         $serviceInfo = [
             'rest' => [
@@ -284,11 +368,10 @@ protected function createAttribute($attributeCode)
             'attribute' => [
                 'attribute_code' => $attributeCode,
                 'entity_type_id' => '4',
+                "default_frontend_label" => 'default_label',
                 'frontend_labels' => [
-                    [
-                        'store_id' => 0,
-                        'label' => 'front_lbl'
-                    ],
+                    ['store_id' => 0, 'label' => 'front_lbl_store0'],
+                    ['store_id' => 1, 'label' => 'front_lbl_store1'],
                 ],
                 'is_required' => true,
                 "default_value" => "",
@@ -421,6 +504,9 @@ protected function updateAttribute($attributeCode, $attributeData)
         return $this->_webApiCall($serviceInfo, $attributeData);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         foreach ($this->createdAttributes as $attributeCode) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php
index 2dc8d19777898..19b0757439077 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php
@@ -43,9 +43,11 @@ public function testCustomAttributeWrongType()
         ];
 
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            $this->expectException('Exception', 'Attribute "meta_title" has invalid value.');
+            $this->expectException('Exception');
+            $this->expectExceptionMessage('Attribute "meta_title" has invalid value.');
         } else {
-            $this->expectException('Exception', 'Attribute \"meta_title\" has invalid value.');
+            $this->expectException('Exception');
+            $this->expectExceptionMessage('Attribute \"meta_title\" has invalid value.');
         }
 
         $this->_webApiCall($serviceInfo, $this->getRequestData());
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
index 92f45e2689fe4..c335b66505b0e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
@@ -180,7 +180,7 @@ public function optionDataProvider()
             $fixtureOptions[$item['type']] = [
                 'optionData' => $item,
             ];
-        };
+        }
 
         return $fixtureOptions;
     }
@@ -208,13 +208,16 @@ public function testAddNegative($optionData)
         ];
 
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            if (isset($optionDataPost['title']) && empty($optionDataPost['title'])) {
-                $this->expectException('SoapFault', 'Missed values for option required fields');
+            if ($optionDataPost['title'] === null || $optionDataPost['title'] === '') {
+                $this->expectException('SoapFault');
+                $this->expectExceptionMessage('Missed values for option required fields');
             } else {
-                $this->expectException('SoapFault', 'Invalid option');
+                $this->expectException('SoapFault');
+                $this->expectExceptionMessage('Invalid option');
             }
         } else {
-            $this->expectException('Exception', '', 400);
+            $this->expectException('Exception');
+            $this->expectExceptionCode(400);
         }
         $this->_webApiCall($serviceInfo, ['option' => $optionDataPost]);
     }
@@ -227,7 +230,7 @@ public function optionNegativeDataProvider()
             $fixtureOptions[$key] = [
                 'optionData' => $item,
             ];
-        };
+        }
 
         return $fixtureOptions;
     }
@@ -386,8 +389,9 @@ public function validOptionDataProvider()
      * @dataProvider optionNegativeUpdateDataProvider
      * @param array $optionData
      * @param string $message
+     * @param int $exceptionCode
      */
-    public function testUpdateNegative($optionData, $message)
+    public function testUpdateNegative($optionData, $message, $exceptionCode)
     {
         $this->_markTestAsRestOnly();
         $productSku = 'simple';
@@ -404,7 +408,9 @@ public function testUpdateNegative($optionData, $message)
             ],
         ];
 
-        $this->expectException('Exception', $message, 400);
+        $this->expectException('Exception');
+        $this->expectExceptionMessage($message);
+        $this->expectExceptionCode($exceptionCode);
         $this->_webApiCall($serviceInfo, ['option' => $optionData]);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php
index 9b16e0c0a06d3..fb3ff3b134081 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php
@@ -7,6 +7,8 @@
 
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
@@ -23,7 +25,6 @@ class ProductRenderListInterfaceTest extends WebapiAbstract
      * @magentoApiDataFixture Magento/Catalog/_files/product_special_price.php
      * @dataProvider productRenderInfoProvider
      * @param array $expectedRenderInfo
-     * @param string $ids
      * @return void
      */
     public function testGetList(array $expectedRenderInfo)
@@ -31,6 +32,12 @@ public function testGetList(array $expectedRenderInfo)
         $expectedIds = [21, 31];
         /** @var FilterBuilder $filterBuilder */
         $filterBuilder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
+        /** @var SortOrderBuilder $sortOrderBuilder */
+        $sortOrderBuilder = Bootstrap::getObjectManager()->create(SortOrderBuilder::class);
+        $sortOrder = $sortOrderBuilder
+            ->setField('entity_id')
+            ->setDirection(SortOrder::SORT_ASC)
+            ->create();
 
         /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
         $searchCriteriaBuilder = Bootstrap::getObjectManager()
@@ -42,7 +49,8 @@ public function testGetList(array $expectedRenderInfo)
             ->setConditionType('in')
             ->create();
 
-        $searchCriteriaBuilder->addFilters([$filter1]);
+        $searchCriteriaBuilder->addFilters([$filter1])
+            ->addSortOrder($sortOrder);
 
         $searchData['search_criteria'] = $searchCriteriaBuilder->create()->__toArray();
         $searchData['store_id'] = 1;
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
index 8791a47cef396..3e935e1d7ae9b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -3,18 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Store\Model\Store;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Downloadable\Model\Link;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\Website;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
 /**
@@ -100,7 +106,7 @@ public function testGetNoSuchEntityException()
             ],
         ];
 
-        $expectedMessage = 'Requested product doesn\'t exist';
+        $expectedMessage = "The product that was requested doesn't exist. Verify the product and try again.";
 
         try {
             $this->_webApiCall($serviceInfo, ['sku' => $invalidSku]);
@@ -135,6 +141,24 @@ public function productCreationProvider()
         ];
     }
 
+    /**
+     * Load website by website code
+     *
+     * @param $websiteCode
+     * @return Website
+     */
+    private function loadWebsiteByCode($websiteCode)
+    {
+        $websiteRepository = Bootstrap::getObjectManager()->get(WebsiteRepository::class);
+        try {
+            $website = $websiteRepository->get($websiteCode);
+        } catch (NoSuchEntityException $e) {
+            $this->fail("Couldn`t load website: {$websiteCode}");
+        }
+
+        return $website;
+    }
+
     /**
      * Test removing association between product and website 1
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_two_websites.php
@@ -143,12 +167,7 @@ public function testUpdateWithDeleteWebsites()
     {
         $productBuilder[ProductInterface::SKU] = 'unique-simple-azaza';
         /** @var Website $website */
-        $website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Website::class);
-        $website->load('second_website', 'code');
-
-        if (!$website->getId()) {
-            $this->fail("Couldn`t load website");
-        }
+        $website = $this->loadWebsiteByCode('second_website');
 
         $websitesData = [
             'website_ids' => [
@@ -170,13 +189,6 @@ public function testUpdateWithDeleteWebsites()
     public function testDeleteAllWebsiteAssociations()
     {
         $productBuilder[ProductInterface::SKU] = 'unique-simple-azaza';
-        /** @var Website $website */
-        $website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Website::class);
-        $website->load('second_website', 'code');
-
-        if (!$website->getId()) {
-            $this->fail("Couldn`t load website");
-        }
 
         $websitesData = [
             'website_ids' => []
@@ -197,14 +209,9 @@ public function testCreateWithMultipleWebsites()
         $productBuilder = $this->getSimpleProductData();
         $productBuilder[ProductInterface::SKU] = 'test-test-sku';
         $productBuilder[ProductInterface::TYPE_ID] = 'simple';
-
         /** @var Website $website */
-        $website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Website::class);
-        $website->load('test_website', 'code');
+        $website = $this->loadWebsiteByCode('test_website');
 
-        if (!$website->getId()) {
-            $this->fail("Couldn`t load website");
-        }
         $websitesData = [
             'website_ids' => [
                 1,
@@ -217,6 +224,84 @@ public function testCreateWithMultipleWebsites()
             $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]["website_ids"],
             $websitesData["website_ids"]
         );
+        $this->deleteProduct($productBuilder[ProductInterface::SKU]);
+    }
+
+    /**
+     * Add product associated with website that is not associated with default store
+     *
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     */
+    public function testCreateWithNonDefaultStoreWebsite()
+    {
+        $productBuilder = $this->getSimpleProductData();
+        $productBuilder[ProductInterface::SKU] = 'test-sku-second-site-123';
+        $productBuilder[ProductInterface::TYPE_ID] = 'simple';
+        /** @var Website $website */
+        $website = $this->loadWebsiteByCode('test');
+
+        $websitesData = [
+            'website_ids' => [
+                $website->getId(),
+            ]
+        ];
+        $productBuilder[ProductInterface::EXTENSION_ATTRIBUTES_KEY] = $websitesData;
+        $response = $this->saveProduct($productBuilder);
+        $this->assertEquals(
+            $websitesData["website_ids"],
+            $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]["website_ids"]
+        );
+        $this->deleteProduct($productBuilder[ProductInterface::SKU]);
+    }
+
+    /**
+     * Update product to be associated with website that is not associated with default store
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_two_websites.php
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     */
+    public function testUpdateWithNonDefaultStoreWebsite()
+    {
+        $productBuilder[ProductInterface::SKU] = 'unique-simple-azaza';
+        /** @var Website $website */
+        $website = $this->loadWebsiteByCode('test');
+
+        $this->assertNotContains(Store::SCOPE_DEFAULT, $website->getStoreCodes());
+
+        $websitesData = [
+            'website_ids' => [
+                $website->getId(),
+            ]
+        ];
+        $productBuilder[ProductInterface::EXTENSION_ATTRIBUTES_KEY] = $websitesData;
+        $response = $this->updateProduct($productBuilder);
+        $this->assertEquals(
+            $websitesData["website_ids"],
+            $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]["website_ids"]
+        );
+    }
+
+    /**
+     * Update product without specifying websites
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_two_websites.php
+     */
+    public function testUpdateWithoutWebsiteIds()
+    {
+        $productBuilder[ProductInterface::SKU] = 'unique-simple-azaza';
+        $originalProduct = $this->getProduct($productBuilder[ProductInterface::SKU]);
+        $newName = 'Updated Product';
+
+        $productBuilder[ProductInterface::NAME] = $newName;
+        $response = $this->updateProduct($productBuilder);
+        $this->assertEquals(
+            $newName,
+            $response[ProductInterface::NAME]
+        );
+        $this->assertEquals(
+            $originalProduct[ProductInterface::EXTENSION_ATTRIBUTES_KEY]["website_ids"],
+            $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]["website_ids"]
+        );
     }
 
     /**
@@ -291,7 +376,7 @@ public function testCreateInvalidPriceFormat()
     {
         $this->_markTestAsRestOnly("In case of SOAP type casting is handled by PHP SoapServer, no need to test it");
         $expectedMessage = 'Error occurred during "price" processing. '
-            . 'Invalid type for value: "invalid_format". Expected Type: "float".';
+            . 'The "invalid_format" value\'s type is invalid. The "float" type was expected. Verify and try again.';
 
         try {
             $this->saveProduct(['name' => 'simple', 'price' => 'invalid_format', 'sku' => 'simple']);
@@ -313,7 +398,10 @@ public function testDeleteAllStoreCode($fixtureProduct)
     {
         $sku = $fixtureProduct[ProductInterface::SKU];
         $this->saveProduct($fixtureProduct);
-        $this->expectException('Exception', 'Requested product doesn\'t exist');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage(
+            "The product that was requested doesn't exist. Verify the product and try again."
+        );
 
         // Delete all with 'all' store code
         $this->deleteProduct($sku);
@@ -611,6 +699,31 @@ public function testUpdate()
         $this->assertEquals($productData[ProductInterface::SKU], $response[ProductInterface::SKU]);
     }
 
+    /**
+     * Update product with extension attributes.
+     *
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     */
+    public function testUpdateWithExtensionAttributes(): void
+    {
+        $sku = 'downloadable-product';
+        $linksKey = 'downloadable_product_links';
+        $productData = [
+            ProductInterface::NAME => 'Downloadable (updated)',
+            ProductInterface::SKU => $sku,
+        ];
+        $response = $this->updateProduct($productData);
+
+        self::assertArrayHasKey(ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY, $response);
+        self::assertArrayHasKey($linksKey, $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+        self::assertCount(1, $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY][$linksKey]);
+
+        $linkData = $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY][$linksKey][0];
+
+        self::assertArrayHasKey(Link::KEY_LINK_URL, $linkData);
+        self::assertEquals('http://example.com/downloadable.txt', $linkData[Link::KEY_LINK_URL]);
+    }
+
     /**
      * @param array $product
      * @return array|bool|float|int|string
@@ -702,6 +815,7 @@ public function testGetList()
         $this->assertTrue(count($response['items']) > 0);
 
         $this->assertNotNull($response['items'][0]['sku']);
+        $this->assertNotNull($response['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']);
         $this->assertEquals('simple', $response['items'][0]['sku']);
 
         $index = null;
@@ -717,14 +831,52 @@ public function testGetList()
         $this->assertEquals($expectedResult, $response['items'][0]['custom_attributes'][$index]['value']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetListWithAdditionalParams()
+    {
+        $this->_markTestAsRestOnly();
+        $searchCriteria = [
+            'searchCriteria' => [
+                'current_page' => 1,
+                'page_size' => 2,
+            ],
+        ];
+        $additionalParams = urlencode('items[id,custom_attributes[description]]');
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria) . '&fields=' .
+                    $additionalParams,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ]
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+
+        $this->assertArrayHasKey('items', $response);
+        $this->assertTrue(count($response['items']) > 0);
+
+        $indexDescription = null;
+        foreach ($response['items'][0]['custom_attributes'] as $key => $customAttribute) {
+            if ($customAttribute['attribute_code'] == 'description') {
+                $indexDescription = $key;
+            }
+        }
+
+        $this->assertNotNull($response['items'][0]['custom_attributes'][$indexDescription]['attribute_code']);
+        $this->assertNotNull($response['items'][0]['custom_attributes'][$indexDescription]['value']);
+        $this->assertTrue(count($response['items'][0]['custom_attributes']) == 1);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
      * @return void
      */
     public function testGetListWithFilteringByWebsite()
     {
-        $website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Website::class);
-        $website->load('test', 'code');
+        $website = $this->loadWebsiteByCode('test');
         $searchCriteria = [
             'searchCriteria' => [
                 'filter_groups' => [
@@ -761,6 +913,7 @@ public function testGetListWithFilteringByWebsite()
         $this->assertTrue(count($response['items']) == 1);
         $this->assertTrue(isset($response['items'][0]['sku']));
         $this->assertEquals('simple-2', $response['items'][0]['sku']);
+        $this->assertNotNull($response['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']);
     }
 
     /**
@@ -907,6 +1060,9 @@ public function testGetListWithMultipleFilterGroupsAndSortingAndPagination()
         $this->assertEquals(3, $searchResult['total_count']);
         $this->assertEquals(1, count($searchResult['items']));
         $this->assertEquals('search_product_4', $searchResult['items'][0][ProductInterface::SKU]);
+        $this->assertNotNull(
+            $searchResult['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']
+        );
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
index 63e5282c22104..6b8388e2f4345 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
@@ -42,7 +42,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertTrue($response);
+        $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
index 9562d6618d8db..d5c035733942e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
@@ -49,7 +49,7 @@ public function testGetList($customerGroupId, $count, $value, $qty)
     public function getListDataProvider()
     {
         return [
-            [0, 2, 5, 3],
+            [0, 3, 5, 3],
             [1, 0, null, null],
             ['all', 2, 8, 2],
         ];
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
index 144f3a9926fe3..8a00de1be094f 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
@@ -10,7 +10,7 @@
         'type' => 'field',
         'sort_order' => 1,
         'is_require' => 1,
-        'price' => 10,
+        'price' => -10,
         'price_type' => 'fixed',
         'sku' => 'sku1',
         'max_characters' => 10,
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php
index 5d2737b3aa532..f8890ca2eaac0 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php
@@ -6,7 +6,7 @@
 
 return [
     'empty_required_field' => [
-        'title' => '',
+        'title' => null,
         'type' => 'field',
         'sort_order' => 1,
         'is_require' => 1,
@@ -15,17 +15,6 @@
         'sku' => 'sku1',
         'max_characters' => 10,
     ],
-    'negative_price' => [
-        'title' => 'area option',
-        'type' => 'area',
-        'sort_order' => 2,
-        'is_require' => 0,
-        'price' => -20,
-        'price_type' => 'percent',
-        'sku' => 'sku2',
-        'max_characters' => 20,
-
-    ],
     'negative_value_of_image_size' => [
         'title' => 'file option',
         'type' => 'file',
@@ -54,7 +43,7 @@
                 'price' => 10.0,
                 'price_type' => 'fixed',
                 'sku' => 'radio option 1 sku',
-                'title' => '',
+                'title' => null,
                 'sort_order' => 1,
             ],
         ],
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php
index 1e713424f8047..b10957dcb7ed2 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php
@@ -5,18 +5,31 @@
  */
 
 return [
-    'missed_product_sku' =>
+    'missing_product_sku' => [
         [
-            [
-                'title' => 'title',
-                'type' => 'field',
-                'sort_order' => 1,
-                'is_require' => 1,
-                'price' => 10.0,
-                'price_type' => 'fixed',
-                'sku' => 'sku1',
-                'max_characters' => 10,
-            ],
-            'ProductSku should be specified',
-        ]
+            'title'          => 'title',
+            'type'           => 'field',
+            'sort_order'     => 1,
+            'is_require'     => 1,
+            'price'          => 10.0,
+            'price_type'     => 'fixed',
+            'max_characters' => 10,
+        ],
+        'The ProductSku is empty. Set the ProductSku and try again.',
+        400,
+    ],
+    'invalid_product_sku' => [
+        [
+            'title'          => 'title',
+            'type'           => 'field',
+            'sort_order'     => 1,
+            'is_require'     => 1,
+            'price'          => 10.0,
+            'price_type'     => 'fixed',
+            'product_sku'    => 'sku1',
+            'max_characters' => 10,
+        ],
+        'The product that was requested doesn\'t exist. Verify the product and try again.',
+        404,
+    ],
 ];
diff --git a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php
index 9478eca88a3fa..5422362afd73c 100644
--- a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php
@@ -23,8 +23,9 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
     const KEY_PRODUCT_ID = StockStatusInterface::PRODUCT_ID;
     const KEY_CUSTOM_ATTRIBUTES = 'custom_attributes';
     const KEY_ATTRIBUTE_CODE = \Magento\Eav\Api\Data\AttributeInterface::ATTRIBUTE_CODE;
-    const CODE_QUANTITY_AND_STOCK_STATUS = 'quantity_and_stock_status';
+    const KEY_IS_IN_STOCK = 'is_in_stock';
 
+    const CODE_QUANTITY_AND_STOCK_STATUS = 'quantity_and_stock_status';
     const PRODUCT_SKU = 'sku-test-catalog-inventory';
 
     /**
@@ -159,6 +160,36 @@ public function testSimpleProductCreationWithoutSpecifyingCatalogInventory()
         $this->assertTrue($response);
     }
 
+    /**
+     * Tests updating product stock item data when previously product was created without specified stock_item
+     */
+    public function testUpdatingQuantity()
+    {
+        // create a simple product with catalog inventory
+        $qty = null;
+        $productData = $this->getSimpleProductData($qty);
+        $response = $this->saveProduct($productData);
+        $stockItemData = $response[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM];
+
+        $this->assertEquals($qty, $stockItemData[self::KEY_QTY]);
+        $this->assertEquals(false, $stockItemData[self::KEY_IS_IN_STOCK]);
+
+        // update a created product with catalog inventory
+        $qty = 1;
+        $inStock = true;
+        $response[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM][self::KEY_QTY] = $qty;
+        $response[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM][self::KEY_IS_IN_STOCK] = $inStock;
+        $responseUpdated = $this->updateProduct($response);
+        $stockItemDataUpdated = $responseUpdated[self::KEY_EXTENSION_ATTRIBUTES][self::KEY_STOCK_ITEM];
+
+        $this->assertEquals($qty, $stockItemDataUpdated[self::KEY_QTY]);
+        $this->assertEquals($inStock, $stockItemDataUpdated[self::KEY_IS_IN_STOCK]);
+
+        // delete the product; expect that all goes well
+        $response = $this->deleteProduct($productData[ProductInterface::SKU]);
+        $this->assertTrue($response);
+    }
+
     // --- my helpers -----------------------------------------------------------------------------
 
     /**
@@ -195,7 +226,7 @@ protected function getSimpleProductData($qty = 1000)
                 [self::KEY_ATTRIBUTE_CODE => 'description', 'value' => 'My Product Description'],
                 [
                     self::KEY_ATTRIBUTE_CODE => self::CODE_QUANTITY_AND_STOCK_STATUS,
-                    'value' => ['is_in_stock' => true, 'qty' => $qty]
+                    'value' => [self::KEY_IS_IN_STOCK => true, 'qty' => $qty]
                 ],
             ];
         }
@@ -214,7 +245,7 @@ protected function getStockItemData($qty = 1000)
         return [
             self::KEY_STOCK_ITEM => [
                 self::KEY_QTY => $qty,
-                'is_in_stock' => true,
+                self::KEY_IS_IN_STOCK => true,
                 'is_qty_decimal' => false,
                 'show_default_notification_message' => false,
                 'use_config_min_qty' => true,
diff --git a/dev/tests/api-functional/testsuite/Magento/CheckoutAgreements/Api/CheckoutAgreementsListTest.php b/dev/tests/api-functional/testsuite/Magento/CheckoutAgreements/Api/CheckoutAgreementsListTest.php
new file mode 100644
index 0000000000000..e2afc9ddb0e84
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/CheckoutAgreements/Api/CheckoutAgreementsListTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Api;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+class CheckoutAgreementsListTest extends WebapiAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
+     */
+    public function testGetList()
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+        $searchCriteriaBuilder->setCurrentPage(1);
+        $requestData = ['searchCriteria' => $searchCriteriaBuilder->create()->__toArray()];
+
+        // Checkout agreements are disabled by default
+        $agreements = $this->_webApiCall($this->getServiceInfo($requestData), $requestData);
+        $this->assertEquals(2, count($agreements));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php
+     * @magentoApiDataFixture Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php
+     */
+    public function testGetActiveAgreement()
+    {
+        /** @var FilterBuilder $filterBuilder */
+        $filterBuilder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
+        $filter = $filterBuilder->setField('is_active')->setValue(1)->create();
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+        $searchCriteriaBuilder->setCurrentPage(1);
+        $searchCriteriaBuilder->addFilters([$filter]);
+        $requestData = ['searchCriteria' => $searchCriteriaBuilder->create()->__toArray()];
+
+        $agreements = $this->_webApiCall($this->getServiceInfo($requestData), $requestData);
+
+        $this->assertEquals(1, count($agreements));
+        $this->assertEquals(1, $agreements[0]['is_active']);
+        $this->assertEquals('Checkout Agreement (active)', $agreements[0]['name']);
+    }
+
+    /**
+     * @param array $requestData
+     * @return array
+     */
+    private function getServiceInfo(array $requestData) : array
+    {
+        return [
+            'soap' => [
+                'service' => 'checkoutAgreementsCheckoutAgreementsListV1',
+                'serviceVersion' => 'V1',
+                'operation' => 'checkoutAgreementsCheckoutAgreementsListV1getList',
+            ],
+            'rest' => [
+                'resourcePath' => '/V1/carts/licence/list' . '?' . http_build_query($requestData),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php
index 0ab81de07818a..c9cad5d597e65 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Api;
 
 use Magento\TestFramework\TestCase\WebapiAbstract;
@@ -105,7 +106,7 @@ public function testAddProductWithIncorrectOptions()
     /**
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cart %1 does not contain item %2
+     * @expectedExceptionMessage The %1 Cart doesn't contain the %2 item.
      */
     public function testUpdateIncorrectItem()
     {
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 aac8be194d791..43d5a5b63b8a0 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';
@@ -85,7 +88,7 @@ public function testGetList()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testGetUndefinedProduct()
     {
@@ -98,7 +101,7 @@ public function testGetUndefinedProduct()
      */
     public function testGetUndefinedOption()
     {
-        $expectedMessage = 'Requested option doesn\'t exist: %1';
+        $expectedMessage = 'The "%1" entity that was requested doesn\'t exist. Verify the entity and try again.';
         $productSku = 'configurable';
         $attributeId = -42;
         try {
@@ -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/ConfigurableProduct/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
index 40ebe0873ec3d..dc32bb2fc129a 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
@@ -286,7 +286,7 @@ public function testUpdateConfigurableProductLinksWithNonExistingProduct()
             $productId1, $nonExistingId
         ];
 
-        $expectedMessage = 'Unable to save product';
+        $expectedMessage = 'The product was unable to be saved. Please try again.';
         try {
             $this->saveProduct($response);
             $this->fail("Expected exception");
@@ -362,7 +362,7 @@ public function testUpdateConfigurableProductLinksWithWithoutVariationAttributes
             $productId1, $productId2
         ];
 
-        $expectedMessage = 'Unable to save product';
+        $expectedMessage = 'The product was unable to be saved. Please try again.';
         try {
             $this->saveProduct($response);
             $this->fail("Expected exception");
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
index e47d88183622b..b2276d79f5ecf 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Api;
 
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
@@ -212,6 +213,34 @@ public function testCreateCustomerWithErrors()
         }
     }
 
+    public function testCreateCustomerWithoutOptionalFields()
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'CreateAccount',
+            ],
+        ];
+
+        $customerDataArray = $this->dataObjectProcessor->buildOutputDataArray(
+            $this->customerHelper->createSampleCustomerDataObject(),
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        unset($customerDataArray['store_id']);
+        unset($customerDataArray['website_id']);
+        $requestData = ['customer' => $customerDataArray, 'password' => CustomerHelper::PASSWORD];
+        try {
+            $customerData = $this->_webApiCall($serviceInfo, $requestData, null, 'all');
+            $this->assertNotNull($customerData['id']);
+        } catch (\Exception $e) {
+            $this->fail('Customer should be created without optional fields.');
+        }
+    }
+
     /**
      * Test customer activation when it is required
      *
@@ -322,7 +351,7 @@ public function testValidateResetPasswordLinkTokenInvalidToken()
             ],
         ];
 
-        $expectedMessage = 'Reset password token mismatch.';
+        $expectedMessage = 'The password token is mismatched. Reset and try again.';
 
         try {
             if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
@@ -366,13 +395,13 @@ public function testInitiatePasswordMissingRequiredFields()
                 'message' => 'One or more input exceptions have occurred.',
                 'errors' => [
                     [
-                        'message' => '%fieldName is a required field.',
+                        'message' => '"%fieldName" is required. Enter and try again.',
                         'parameters' => [
                             'fieldName' => 'email',
                         ],
                     ],
                     [
-                        'message' => '%fieldName is a required field.',
+                        'message' => '"%fieldName" is required. Enter and try again.',
                         'parameters' => [
                             'fieldName' => 'template',
                         ]
@@ -575,8 +604,14 @@ public function testValidateCustomerData()
         $validationResponse = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertFalse($validationResponse['valid']);
 
-        $this->assertEquals('The value of attribute "firstname" must be set', $validationResponse['messages'][0]);
-        $this->assertEquals('The value of attribute "lastname" must be set', $validationResponse['messages'][1]);
+        $this->assertEquals(
+            'The "First Name" attribute value is empty. Set the attribute and try again.',
+            $validationResponse['messages'][0]
+        );
+        $this->assertEquals(
+            'The "Last Name" attribute value is empty. Set the attribute and try again.',
+            $validationResponse['messages'][1]
+        );
     }
 
     public function testIsReadonly()
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
index 53e0edc3d35b7..7a57d82be127f 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
@@ -114,10 +114,8 @@ public function testDeleteAddress()
         $response = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertTrue($response, 'Expected response should be true.');
 
-        $this->expectException(
-            \Magento\Framework\Exception\NoSuchEntityException::class,
-            'No such entity with addressId = 1'
-        );
+        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+        $this->expectExceptionMessage('No such entity with addressId = 1');
         $this->addressRepository->getById($fixtureAddressId);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
index 4ee936f83f537..3b1d431342988 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
 use Magento\Customer\Model\Data\AttributeMetadata;
 use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Class CustomerMetadataTest
@@ -19,6 +20,19 @@ class CustomerMetadataTest extends WebapiAbstract
     const SERVICE_VERSION = "V1";
     const RESOURCE_PATH = "/V1/attributeMetadata/customer";
 
+    /**
+     * @var CustomerMetadataInterface
+     */
+    private $customerMetadata;
+
+    /**
+     * Execute per test initialization.
+     */
+    public function setUp()
+    {
+        $this->customerMetadata = Bootstrap::getObjectManager()->create(CustomerMetadataInterface::class);
+    }
+
     /**
      * Test retrieval of attribute metadata for the customer entity type.
      *
@@ -63,7 +77,7 @@ public function getAttributeMetadataDataProvider()
                 Customer::FIRSTNAME,
                 [
                     AttributeMetadata::FRONTEND_INPUT   => 'text',
-                    AttributeMetadata::INPUT_FILTER     => '',
+                    AttributeMetadata::INPUT_FILTER     => 'trim',
                     AttributeMetadata::STORE_LABEL      => 'First Name',
                     AttributeMetadata::MULTILINE_COUNT  => 0,
                     AttributeMetadata::VALIDATION_RULES => [
@@ -200,8 +214,7 @@ public function testGetCustomAttributesMetadata()
 
         $attributeMetadata = $this->_webApiCall($serviceInfo);
 
-        // There are no default custom attributes.
-        $this->assertCount(0, $attributeMetadata);
+        $this->assertCount(count($this->customerMetadata->getCustomAttributesMetadata()), $attributeMetadata);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
index 5ddd077c7f40e..8f84f485fc2ae 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Api;
 
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
@@ -146,7 +147,7 @@ public function tearDown()
      * Validate update by invalid customer.
      *
      * @expectedException \Exception
-     * @expectedExceptionMessage Consumer is not authorized to access %resources
+     * @expectedExceptionMessage The consumer isn't authorized to access %resources.
      */
     public function testInvalidCustomerUpdate()
     {
@@ -216,10 +217,8 @@ public function testDeleteCustomer()
         $this->assertTrue($response);
 
         //Verify if the customer is deleted
-        $this->expectException(
-            \Magento\Framework\Exception\NoSuchEntityException::class,
-            sprintf("No such entity with customerId = %s", $customerData[Customer::ID])
-        );
+        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+        $this->expectExceptionMessage(sprintf("No such entity with customerId = %s", $customerData[Customer::ID]));
         $this->_getCustomerData($customerData[Customer::ID]);
     }
 
@@ -432,7 +431,7 @@ public function testCreateCustomerWithoutAddressRequiresException()
                 $expectedException = new InputException();
                 $expectedException->addError(
                     __(
-                        '%fieldName is a required field.',
+                        '"%fieldName" is required. Enter and try again.',
                         ['fieldName' => Address::FIRSTNAME]
                     )
                 );
@@ -447,7 +446,7 @@ public function testCreateCustomerWithoutAddressRequiresException()
                 $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
                 $exceptionData = $this->processRestExceptionResult($e);
                 $expectedExceptionData = [
-                    'message' => '%fieldName is a required field.',
+                    'message' => '"%fieldName" is required. Enter and try again.',
                     'parameters' => ['fieldName' => Address::FIRSTNAME],
                 ];
                 $this->assertEquals($expectedExceptionData, $exceptionData);
@@ -554,7 +553,7 @@ public function testSearchCustomersUsingGETEmptyFilter()
             $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
             $exceptionData = $this->processRestExceptionResult($e);
             $expectedExceptionData = [
-                'message' => '%fieldName is a required field.',
+                'message' => '"%fieldName" is required. Enter and try again.',
                 'parameters' => [
                     'fieldName' => 'searchCriteria'
                 ],
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php
index 7dfa5f7086857..999a2daa26065 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php
@@ -279,7 +279,7 @@ public function testCreateGroupNoCodeExpectExceptionRest()
         } catch (\Exception $e) {
             // @codingStandardsIgnoreStart
             $this->assertContains(
-                '{"message":"%fieldName is a required field.","parameters":{"fieldName":"code"}',
+                '\"%fieldName\" is required. Enter and try again.","parameters":{"fieldName":"code"}',
                 $e->getMessage(),
                 "Exception does not contain expected message."
             );
@@ -606,7 +606,7 @@ public function testCreateGroupNoCodeExpectExceptionSoap()
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
             $this->assertContains(
-                '%fieldName is a required field.',
+                '"%fieldName" is required. Enter and try again.',
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
             );
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/LinkRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/LinkRepositoryTest.php
index 2cc528af3e84e..c881969a3b679 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/LinkRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/LinkRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Api;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -240,7 +241,7 @@ public function testCreateSavesProvidedUrls()
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Invalid link type.
+     * @expectedExceptionMessage The link type is invalid. Verify and try again.
      */
     public function testCreateThrowsExceptionIfLinkTypeIsNotSpecified()
     {
@@ -542,7 +543,7 @@ public function getInvalidNumberOfDownloads()
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Provided product must be type 'downloadable'.
+     * @expectedExceptionMessage The product needs to be the downloadable type. Verify the product and try again.
      */
     public function testCreateThrowsExceptionIfTargetProductTypeIsNotDownloadable()
     {
@@ -567,7 +568,7 @@ public function testCreateThrowsExceptionIfTargetProductTypeIsNotDownloadable()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testCreateThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -662,7 +663,7 @@ public function testUpdateSavesDataInGlobalScopeAndDoesNotAffectValuesStoredInSt
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -687,7 +688,7 @@ public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @expectedException \Exception
-     * @expectedExceptionMessage There is no downloadable link with provided ID.
+     * @expectedExceptionMessage No downloadable link with the provided ID was found. Verify the ID and try again.
      */
     public function testUpdateThrowsExceptionIfThereIsNoDownloadableLinkWithGivenId()
     {
@@ -815,7 +816,7 @@ public function testDelete()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage There is no downloadable link with provided ID.
+     * @expectedExceptionMessage No downloadable link with the provided ID was found. Verify the ID and try again.
      */
     public function testDeleteThrowsExceptionIfThereIsNoDownloadableLinkWithGivenId()
     {
@@ -849,7 +850,7 @@ public function testGetListForAbsentProduct($urlTail, $method)
 
         $requestData = ['sku' => $sku];
 
-        $expectedMessage = 'Requested product doesn\'t exist';
+        $expectedMessage = "The product that was requested doesn't exist. Verify the product and try again.";
         try {
             $this->_webApiCall($serviceInfo, $requestData);
         } catch (\SoapFault $e) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php
index c3f9473d8f094..b537947d5e4db 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Api;
 
 use Magento\Catalog\Model\Product;
@@ -205,7 +206,7 @@ public function testCreateSavesProvidedUrls()
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Invalid sample type.
+     * @expectedExceptionMessage The sample type is invalid. Verify the sample type and try again.
      */
     public function testCreateThrowsExceptionIfSampleTypeIsInvalid()
     {
@@ -325,7 +326,7 @@ public function getInvalidSortOrder()
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Provided product must be type 'downloadable'.
+     * @expectedExceptionMessage The product needs to be the downloadable type. Verify the product and try again.
      */
     public function testCreateThrowsExceptionIfTargetProductTypeIsNotDownloadable()
     {
@@ -345,7 +346,7 @@ public function testCreateThrowsExceptionIfTargetProductTypeIsNotDownloadable()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testCreateThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -422,7 +423,7 @@ public function testUpdateSavesDataInGlobalScopeAndDoesNotAffectValuesStoredInSt
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Requested product doesn't exist
+     * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
     public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     {
@@ -443,7 +444,7 @@ public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_files.php
      * @expectedException \Exception
-     * @expectedExceptionMessage There is no downloadable sample with provided ID.
+     * @expectedExceptionMessage No downloadable sample with the provided ID was found. Verify the ID and try again.
      */
     public function testUpdateThrowsExceptionIfThereIsNoDownloadableSampleWithGivenId()
     {
@@ -506,7 +507,7 @@ public function testDelete()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage There is no downloadable sample with provided ID.
+     * @expectedExceptionMessage No downloadable sample with the provided ID was found. Verify the ID and try again.
      */
     public function testDeleteThrowsExceptionIfThereIsNoDownloadableSampleWithGivenId()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetManagementTest.php
index 91576b7b049a2..17fc436b2e401 100644
--- a/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetManagementTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Api;
 
 use Magento\TestFramework\Helper\Bootstrap;
@@ -145,7 +146,7 @@ public function testCreateThrowsExceptionIfGivenEntityTypeDoesNotExist()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Attribute set name is empty.
+     * @expectedExceptionMessage The attribute set name is empty. Enter the name and try again.
      */
     public function testCreateThrowsExceptionIfAttributeSetNameIsEmpty()
     {
@@ -169,7 +170,7 @@ public function testCreateThrowsExceptionIfAttributeSetWithGivenNameAlreadyExist
         $entityTypeCode = 'catalog_product';
         $entityType = $this->getEntityTypeByCode($entityTypeCode);
         $attributeSetName = 'Default';
-        $expectedMessage = 'An attribute set named "Default" already exists.';
+        $expectedMessage = 'A "Default" attribute set name already exists. Create a new name and try again.';
 
         $arguments = [
             'entityTypeCode' => $entityTypeCode,
diff --git a/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetRepositoryTest.php
index 611234ce9a54e..4e2d98279a4c4 100644
--- a/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Api;
 
 use Magento\Framework\Api\FilterBuilder;
@@ -140,7 +141,7 @@ public function testDeleteById()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Default attribute set can not be deleted
+     * @expectedExceptionMessage The default attribute set can't be deleted.
      */
     public function testDeleteByIdDefaultAttributeSet()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php b/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
index 74e987647493b..94070dd9190fc 100644
--- a/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
@@ -100,10 +100,8 @@ public function testDelete()
 
         /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
         $customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
-        $this->expectException(
-            NoSuchEntityException::class,
-            "No such entity with customerId = {$fixtureCustomerId}"
-        );
+        $this->expectException(NoSuchEntityException::class);
+        $this->expectExceptionMessage("No such entity with customerId = {$fixtureCustomerId}");
         $customerRepository->getById($fixtureCustomerId);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
index 8c30ef875c288..b7db294eedfbe 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/GuestItemRepositoryTest.php
@@ -117,7 +117,6 @@ public function testSave()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
-//        $quote->load('test_order_item_with_message', 'reserved_order_id');
         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
         /** @var  \Magento\GiftMessage\Model\Message $message */
         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
index 4b821b118f999..d4df57fbff89e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
@@ -144,7 +144,6 @@ public function testSave()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
-//        $quote->load('test_order_item_with_message', 'reserved_order_id');
         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
         /** @var  \Magento\GiftMessage\Model\Message $message */
         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
@@ -193,7 +192,6 @@ public function testSaveForMyCart()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
-//        $quote->load('test_order_item_with_message', 'reserved_order_id');
         $messageId = $quote->getItemByProduct($product)->getGiftMessageId();
         /** @var  \Magento\GiftMessage\Model\Message $message */
         $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($messageId);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
new file mode 100644
index 0000000000000..0621370972763
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
@@ -0,0 +1,432 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Bundle;
+
+use Magento\Bundle\Model\Product\OptionList;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class BundleProductViewTest extends GraphQlAbstract
+{
+    const KEY_PRICE_TYPE_FIXED = 'FIXED';
+    const KEY_PRICE_TYPE_DYNAMIC = 'DYNAMIC';
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
+     */
+    public function testAllFieldsBundleProducts()
+    {
+        $productSku = 'bundle-product';
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "{$productSku}"}})
+   {
+       items{
+           sku
+           type_id
+           id
+           name
+           attribute_set_id
+           ... on PhysicalProductInterface {
+             weight
+           }
+           ... on BundleProduct {
+           dynamic_sku
+            dynamic_price
+            dynamic_weight
+            price_view
+            ship_bundle_items
+            items {
+              option_id
+              title
+              required
+              type
+              position
+              sku              
+              options {
+                id
+                qty
+                position
+                is_default
+                price
+                price_type
+                can_change_quantity
+                label
+                product {
+                  id
+                  name
+                  sku
+                  type_id
+                   }
+                }
+            }
+           }
+       }
+   }   
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        $bundleProduct = $productRepository->get($productSku, false, null, true);
+        $bundleProduct->setId(
+            $bundleProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        if ((bool)$bundleProduct->getShipmentType()) {
+            $this->assertEquals('SEPARATELY', $response['products']['items'][0]['ship_bundle_items']);
+        } else {
+            $this->assertEquals('TOGETHER', $response['products']['items'][0]['ship_bundle_items']);
+        }
+        if ((bool)$bundleProduct->getPriceView()) {
+            $this->assertEquals('AS_LOW_AS', $response['products']['items'][0]['price_view']);
+        } else {
+            $this->assertEquals('PRICE_RANGE', $response['products']['items'][0]['price_view']);
+        }
+        $this->assertBundleBaseFields($bundleProduct, $response['products']['items'][0]);
+
+        $this->assertBundleProductOptions($bundleProduct, $response['products']['items'][0]);
+        $this->assertNotEmpty(
+            $response['products']['items'][0]['items'],
+            "Precondition failed: 'items' must not be empty"
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_with_not_visible_children.php
+     */
+    public function testBundleProdutWithNotVisibleChildren()
+    {
+        $productSku = 'bundle-product-1';
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "{$productSku}"}})
+   {
+       items{
+           sku
+           type_id
+           id
+           name
+           attribute_set_id
+           ... on PhysicalProductInterface {
+             weight
+           }
+           ... on BundleProduct {
+           dynamic_sku
+            dynamic_price
+            dynamic_weight
+            price_view
+            ship_bundle_items
+            items {
+              option_id
+              title
+              required
+              type
+              position
+              sku              
+              options {
+                id
+                qty
+                position
+                is_default
+                price
+                price_type
+                can_change_quantity
+                label
+                product {
+                  id
+                  name
+                  sku
+                  type_id
+                   }
+                }
+            }
+           }
+       }
+   }   
+}
+QUERY;
+
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
+        $config->saveConfig(
+            \Magento\CatalogInventory\Model\Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+            0,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
+        ObjectManager::getInstance()->get(\Magento\Framework\App\Cache::class)
+            ->clean(\Magento\Framework\App\Config::CACHE_TAG);
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty(
+            $response['products']['items'],
+            "Precondition failed: 'items' must not be empty"
+        );
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        $bundleProduct = $productRepository->get($productSku, false, null, true);
+        $bundleProduct->setId(
+            $bundleProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        if ((bool)$bundleProduct->getShipmentType()) {
+            $this->assertEquals('SEPARATELY', $response['products']['items'][0]['ship_bundle_items']);
+        } else {
+            $this->assertEquals('TOGETHER', $response['products']['items'][0]['ship_bundle_items']);
+        }
+        if ((bool)$bundleProduct->getPriceView()) {
+            $this->assertEquals('AS_LOW_AS', $response['products']['items'][0]['price_view']);
+        } else {
+            $this->assertEquals('PRICE_RANGE', $response['products']['items'][0]['price_view']);
+        }
+        $this->assertBundleBaseFields($bundleProduct, $response['products']['items'][0]);
+
+        $this->assertBundleProductOptions($bundleProduct, $response['products']['items'][0]);
+        $this->assertNotEmpty(
+            $response['products']['items'][0]['items'],
+            "Precondition failed: 'items' must not be empty"
+        );
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertBundleBaseFields($product, $actualResponse)
+    {
+        $assertionMap = [
+            ['response_field' => 'sku', 'expected_value' => $product->getSku()],
+            ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
+            ['response_field' => 'id', 'expected_value' => $product->getId()],
+            ['response_field' => 'name', 'expected_value' => $product->getName()],
+            ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
+             ['response_field' => 'weight', 'expected_value' => $product->getWeight()],
+            ['response_field' => 'dynamic_price', 'expected_value' => !(bool)$product->getPriceType()],
+            ['response_field' => 'dynamic_weight', 'expected_value' => !(bool)$product->getWeightType()],
+            ['response_field' => 'dynamic_sku', 'expected_value' => !(bool)$product->getSkuType()]
+        ];
+
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param  array $actualResponse
+     */
+    private function assertBundleProductOptions($product, $actualResponse)
+    {
+        $this->assertNotEmpty(
+            $actualResponse['items'],
+            "Precondition failed: 'bundle product items' must not be empty"
+        );
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        /** @var OptionList $optionList */
+        $optionList = ObjectManager::getInstance()->get(\Magento\Bundle\Model\Product\OptionList::class);
+        $options = $optionList->getItems($product);
+        $option = $options[0];
+        /** @var \Magento\Bundle\Api\Data\LinkInterface $bundleProductLinks */
+        $bundleProductLinks = $option->getProductLinks();
+        $bundleProductLink = $bundleProductLinks[0];
+        $childProductSku = $bundleProductLink->getSku();
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $childProduct = $productRepository->get($childProductSku);
+        /** @var MetadataPool $metadataPool */
+        $childProduct->setId(
+            $childProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        $this->assertEquals(1, count($options));
+        $this->assertResponseFields(
+            $actualResponse['items'][0],
+            [
+                'option_id' => $option->getOptionId(),
+                'title' => $option->getTitle(),
+                'required' =>(bool)$option->getRequired(),
+                'type' => $option->getType(),
+                'position' => $option->getPosition(),
+                'sku' => $option->getSku()
+            ]
+        );
+        $this->assertResponseFields(
+            $actualResponse['items'][0]['options'][0],
+            [
+                'id' => $bundleProductLink->getId(),
+                'qty' => (int)$bundleProductLink->getQty(),
+                'position' => $bundleProductLink->getPosition(),
+                'is_default' => (bool)$bundleProductLink->getIsDefault(),
+                 'price_type' => self::KEY_PRICE_TYPE_FIXED,
+                'can_change_quantity' => $bundleProductLink->getCanChangeQuantity(),
+                'label' => $childProduct->getName()
+            ]
+        );
+        $this->assertResponseFields(
+            $actualResponse['items'][0]['options'][0]['product'],
+            [
+                'id' => $childProduct->getId(),
+                'name' => $childProduct->getName(),
+                'type_id' => $childProduct->getTypeId(),
+                'sku' => $bundleProductLink->getSku()
+            ]
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options_1.php
+     */
+    public function testAndMaxMinPriceBundleProduct()
+    {
+        $productSku = 'bundle-product';
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "{$productSku}"}})
+   {
+       items{
+           id
+           type_id
+           ... on PhysicalProductInterface {
+             weight
+           }
+           price {
+             minimalPrice {
+               amount {
+                 value
+                 currency
+               }
+               adjustments {
+                 amount {
+                   value
+                   currency
+                 }
+                 code
+                 description
+               }
+             }
+             maximalPrice {
+               amount {
+                 value
+                 currency
+               }
+               adjustments {
+                 amount {
+                   value
+                   currency
+                 }
+                 code
+                 description
+               }
+             }
+             regularPrice {
+               amount {
+                 value
+                 currency
+               }
+               adjustments {
+                 amount {
+                   value
+                   currency
+                 }
+                 code
+                 description
+               }
+             }
+           }
+           ... on BundleProduct {
+           dynamic_sku
+            dynamic_price
+            dynamic_weight
+            price_view
+            ship_bundle_items
+            items {
+                options {
+                    label
+                    product {
+                        id
+                        name
+                        sku
+                    }
+                }
+            }
+           }
+       }
+   }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $bundleProduct = $productRepository->get($productSku, false, null, true);
+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+        $priceInfo = $bundleProduct->getPriceInfo();
+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+        $minimalPrice = $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue();
+        $maximalPrice = $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue();
+        $this->assertEquals(
+            $minimalPrice,
+            $response['products']['items'][0]['price']['minimalPrice']['amount']['value']
+        );
+        $this->assertEquals(
+            $maximalPrice,
+            $response['products']['items'][0]['price']['maximalPrice']['amount']['value']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testNonExistentFieldQtyExceptionOnBundleProduct()
+    {
+        $productSku = 'bundle-product';
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "{$productSku}"}})
+   {
+       items{
+           id
+           type_id
+           qty
+           ... on PhysicalProductInterface {
+             weight
+           }
+
+           ... on BundleProduct {
+           dynamic_sku
+            dynamic_price
+            dynamic_weight
+            price_view
+            ship_bundle_items
+             bundle_product_links {
+               id
+               name
+               sku
+             }
+           }
+       }
+   }
+}
+QUERY;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: Cannot'. ' ' .
+            'query field "qty" on type "ProductInterface".');
+        $this->graphQlQuery($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
new file mode 100644
index 0000000000000..eddd456a7b866
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsCountTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as productStatus;
+
+/**
+ * Class CategoryProductsCountTest
+ *
+ * Test for Magento\CatalogGraphQl\Model\Resolver\Category\ProductsCount resolver
+ */
+class CategoryProductsCountTest extends GraphQlAbstract
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testCategoryWithSaleableProduct()
+    {
+        $categoryId = 2;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(1, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithInvisibleProduct()
+    {
+        $categoryId = 333;
+        $sku = 'simple333';
+
+        $product = $this->productRepository->get($sku);
+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
+        $this->productRepository->save($product);
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     */
+    public function testCategoryWithOutOfStockProductManageStockEnabled()
+    {
+        $categoryId = 2;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithOutOfStockProductManageStockDisabled()
+    {
+        $categoryId = 333;
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(1, $response['category']['product_count']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testCategoryWithDisabledProduct()
+    {
+        $categoryId = 333;
+        $sku = 'simple333';
+
+        $product = $this->productRepository->get($sku);
+        $product->setStatus(ProductStatus::STATUS_DISABLED);
+        $this->productRepository->save($product);
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      product_count
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, $response['category']['product_count']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
new file mode 100644
index 0000000000000..6b57f84e4b9c4
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test of getting child products info of configurable product on category request
+ */
+class CategoryProductsVariantsTest extends GraphQlAbstract
+{
+    /**
+     *
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testGetSimpleProductsFromCategory()
+    {
+
+        $query
+            = <<<QUERY
+{
+  category(id: 2) {
+    id
+    name
+    products {
+      items {
+        sku
+        ... on ConfigurableProduct {
+          variants {
+            product {
+              sku
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple_10', false, null, true);
+
+        $this->assertArrayHasKey('variants', $response['category']['products']['items'][0]);
+        $this->assertCount(2, $response['category']['products']['items'][0]['variants']);
+        $this->assertSimpleProductFields($product, $response['category']['products']['items'][0]['variants'][0]);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertSimpleProductFields($product, $actualResponse)
+    {
+        $assertionMap = [
+            [
+                'response_field' => 'product', 'expected_value' => [
+                    "sku" => $product->getSku()
+                ]
+            ],
+        ];
+
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
new file mode 100644
index 0000000000000..54e98367ab8ca
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -0,0 +1,418 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+
+class CategoryTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCategoriesTree()
+    {
+        $rootCategoryId = 2;
+        $query = <<<QUERY
+{
+  category(id: {$rootCategoryId}) {
+      id
+      level
+      description
+      path
+      path_in_store
+      product_count
+      url_key
+      url_path
+      children {
+        id
+        description
+        available_sort_by
+        default_sort_by
+        image
+        level
+        children {
+          id
+          filter_price_range
+          description
+          image
+          meta_keywords
+          level
+          is_anchor
+          children {
+            level
+            id
+          }
+        }
+      }
+    }
+}
+QUERY;
+
+        // get customer ID token
+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(
+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
+        );
+        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $responseDataObject = new DataObject($response);
+        //Some sort of smoke testing
+        self::assertEquals(
+            'Ololo',
+            $responseDataObject->getData('category/children/7/children/1/description')
+        );
+        self::assertEquals(
+            'default-category',
+            $responseDataObject->getData('category/url_key')
+        );
+        self::assertEquals(
+            [],
+            $responseDataObject->getData('category/children/0/available_sort_by')
+        );
+        self::assertEquals(
+            'name',
+            $responseDataObject->getData('category/children/0/default_sort_by')
+        );
+        self::assertCount(
+            8,
+            $responseDataObject->getData('category/children')
+        );
+        self::assertCount(
+            2,
+            $responseDataObject->getData('category/children/7/children')
+        );
+        self::assertEquals(
+            5,
+            $responseDataObject->getData('category/children/7/children/1/children/0/id')
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCategoryProducts()
+    {
+        $categoryId = 2;
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+    products {
+      total_count
+      page_info {
+        current_page
+        page_size
+      }
+      items {
+        attribute_set_id
+        country_of_manufacture
+        created_at
+        description {
+            html
+        }
+        gift_message_available
+        id
+        categories {
+          name
+          url_path
+          available_sort_by
+          level
+        }
+        image { url, label }
+        meta_description
+        meta_keyword
+        meta_title
+        media_gallery_entries {
+          disabled
+          file
+          id
+          label
+          media_type
+          position
+          types
+          content {
+            base64_encoded_data
+            type
+            name
+          }
+          video_content {
+            media_type
+            video_description
+            video_metadata
+            video_provider
+            video_title
+            video_url
+          }
+        }
+        name
+        new_from_date
+        new_to_date
+        options_container
+        price {
+          minimalPrice {
+            amount {
+              value
+              currency
+            }
+            adjustments {
+              amount {
+                value
+                currency
+              }
+              code
+              description
+            }
+          }
+          maximalPrice {
+            amount {
+              value
+              currency
+            }
+            adjustments {
+              amount {
+                value
+                currency
+              }
+              code
+              description
+            }
+          }
+          regularPrice {
+            amount {
+              value
+              currency
+            }
+            adjustments {
+              amount {
+                value
+                currency
+              }
+              code
+              description
+            }
+          }
+        }
+        product_links {
+          link_type
+          linked_product_sku
+          linked_product_type
+          position
+          sku
+        }
+        short_description {
+            html
+        }
+        sku
+        small_image { url, label }
+        thumbnail { url, label }
+        special_from_date
+        special_price
+        special_to_date
+        swatch_image
+        tier_price
+        tier_prices {
+          customer_group_id
+          percentage_value
+          qty
+          value
+          website_id
+        }
+        type_id
+        updated_at
+        url_key
+        url_path
+        websites {
+          id
+          name
+          code
+          sort_order
+          default_group_id
+          is_default
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('products', $response['category']);
+        $this->assertArrayHasKey('total_count', $response['category']['products']);
+        $this->assertGreaterThanOrEqual(1, $response['category']['products']['total_count']);
+        $this->assertEquals(1, $response['category']['products']['page_info']['current_page']);
+        $this->assertEquals(20, $response['category']['products']['page_info']['page_size']);
+
+        $this->assertArrayHasKey('sku', $response['category']['products']['items'][0]);
+        $firstProductSku = $response['category']['products']['items'][0]['sku'];
+
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $firstProduct = $productRepository->get($firstProductSku, false, null, true);
+        $this->assertBaseFields($firstProduct, $response['category']['products']['items'][0]);
+        $this->assertAttributes($response['category']['products']['items'][0]);
+        $this->assertWebsites($firstProduct, $response['category']['products']['items'][0]['websites']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testAnchorCategory()
+    {
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->create(CategoryCollection::class);
+        $categoryCollection->addFieldToFilter('name', 'Category 1');
+        /** @var CategoryInterface $category */
+        $category = $categoryCollection->getFirstItem();
+        $categoryId = $category->getId();
+
+        $this->assertNotEmpty($categoryId, "Preconditions failed: category is not available.");
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+    name
+    products(sort: {sku: ASC}) {
+      total_count
+      items {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $expectedResponse = [
+            'category' => [
+                'name' => 'Category 1',
+                'products' => [
+                    'total_count' => 3,
+                    'items' => [
+                        ['sku' => '12345'],
+                        ['sku' => 'simple'],
+                        ['sku' => 'simple-4']
+                    ]
+                ]
+            ]
+        ];
+        $this->assertEquals($expectedResponse, $response);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertBaseFields($product, $actualResponse)
+    {
+
+        $assertionMap = [
+            ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
+            ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
+            ['response_field' => 'name', 'expected_value' => $product->getName()],
+            ['response_field' => 'price', 'expected_value' =>
+                [
+                    'minimalPrice' => [
+                        'amount' => [
+                            'value' => $product->getPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'regularPrice' => [
+                        'amount' => [
+                            'value' => $product->getPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'maximalPrice' => [
+                        'amount' => [
+                            'value' => $product->getPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                ]
+            ],
+            ['response_field' => 'sku', 'expected_value' => $product->getSku()],
+            ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
+            ['response_field' => 'updated_at', 'expected_value' => $product->getUpdatedAt()],
+        ];
+
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertWebsites($product, $actualResponse)
+    {
+        $assertionMap = [
+            [
+                'id' => current($product->getExtensionAttributes()->getWebsiteIds()),
+                'name' => 'Main Website',
+                'code' => 'base',
+                'sort_order' => 0,
+                'default_group_id' => '1',
+                'is_default' => true,
+            ]
+        ];
+
+        $this->assertEquals($actualResponse, $assertionMap);
+    }
+
+    /**
+     * @param array $actualResponse
+     */
+    private function assertAttributes($actualResponse)
+    {
+        $eavAttributes = [
+            'url_key',
+            'description',
+            'meta_description',
+            'meta_keyword',
+            'meta_title',
+            'short_description',
+            'country_of_manufacture',
+            'gift_message_available',
+            'new_from_date',
+            'new_to_date',
+            'options_container',
+            'special_price',
+            'special_from_date',
+            'special_to_date',
+        ];
+
+        foreach ($eavAttributes as $eavAttribute) {
+            $this->assertArrayHasKey($eavAttribute, $actualResponse);
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryWithDescriptionDirectivesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryWithDescriptionDirectivesTest.php
new file mode 100644
index 0000000000000..c115f7124c9fc
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryWithDescriptionDirectivesTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for checking that category description directives are rendered correctly
+ */
+class CategoryWithDescriptionDirectivesTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testHtmlDirectivesRendered()
+    {
+        $categoryId = 333;
+        $mediaFilePath = '/path/to/mediafile';
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $storeBaseUrl = $storeManager->getStore()->getBaseUrl();
+
+        /* Remove index.php from base URL */
+        $storeBaseUrlParts = explode('/index.php', $storeBaseUrl);
+        $storeBaseUrl = $storeBaseUrlParts[0];
+
+        /** @var CategoryRepositoryInterface $categoryRepository */
+        $categoryRepository = ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
+        /** @var CategoryInterface $category */
+        $category = $categoryRepository->get($categoryId);
+        $category->setDescription('Test: {{media url="' . $mediaFilePath . '"}}');
+        $categoryRepository->save($category);
+
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+    description
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertNotContains('media url', $response['category']['description']);
+        self::assertContains($storeBaseUrl, $response['category']['description']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ExceptionFormatterDefaultModeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ExceptionFormatterDefaultModeTest.php
new file mode 100644
index 0000000000000..5cb840e5fa5db
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ExceptionFormatterDefaultModeTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ExceptionFormatterDefaultModeTest extends GraphQlAbstract
+{
+    public function testDuplicateEntityTypeException()
+    {
+        $query
+            = <<<QUERY
+  {
+  customAttributeMetadata(attributes:[
+    {
+      entity_type:"catalog_category"
+      entity_type:"catalog_product"
+    }
+  ])
+    {
+      items{        
+      attribute_code
+      attribute_type
+      entity_type
+    }      
+    }  
+  }
+QUERY;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: There' . ' ' .
+            'can be only one input field named "entity_type"');
+        $this->graphQlQuery($query);
+    }
+
+    public function testEmptyAttributeInputException()
+    {
+        $query
+            = <<<QUERY
+  {
+  customAttributeMetadata(attributes:[
+    {
+      
+    }
+  ])
+    {
+      items{        
+      attribute_code
+      attribute_type
+      entity_type
+    }      
+    }  
+  }
+QUERY;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: Missing attribute_code/entity_type for the ' .
+            'input Empty AttributeInput.');
+
+        $this->graphQlQuery($query);
+    }
+    public function testAttributeWithNoEntityTypeInputException()
+    {
+        $query
+            = <<<QUERY
+  {
+  customAttributeMetadata(attributes:[
+    {
+      attribute_code:"sku"
+    }
+  ])
+    {
+      items{        
+      attribute_code
+      attribute_type
+      entity_type
+    }      
+    }  
+  }
+QUERY;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: Missing entity_type for the input' .
+            ' attribute_code: sku.');
+
+        $this->graphQlQuery($query);
+    }
+
+    public function testAttributeWithNoAttributeCodeInputException()
+    {
+        $query
+            = <<<QUERY
+  {
+  customAttributeMetadata(attributes:[
+    {
+      entity_type:"catalog_category"
+    }
+  ])
+    {
+      items{        
+      attribute_code
+      attribute_type
+      entity_type
+    }      
+    }  
+  }
+QUERY;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: Missing attribute_code for the input ' .
+            'entity_type: catalog_category.');
+
+        $this->graphQlQuery($query);
+    }
+
+    public function testInvalidEntityTypeException()
+    {
+        $query
+            = <<<QUERY
+  {
+  customAttributeMetadata(attributes:[
+    {
+      attribute_code:"sku"
+      entity_type:"invalid"
+    }
+  ])
+    {
+      items{        
+      attribute_code
+      attribute_type
+      entity_type
+    }      
+    }  
+  }
+QUERY;
+        $this->expectException(\Exception::class);
+
+        $this->expectExceptionMessage('Invalid entity_type specified: invalid');
+
+        $this->graphQlQuery($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
new file mode 100644
index 0000000000000..8da2702917af0
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class MediaGalleryTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testProductSmallImageUrlWithExistingImage()
+    {
+        $productSku = 'simple';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+        small_image {
+            url
+        }
+    }
+  }    
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('url', $response['products']['items'][0]['small_image']);
+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['small_image']['url']);
+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['small_image']['url']));
+    }
+
+    /**
+     * @param string $url
+     * @return bool
+     */
+    private function checkImageExists(string $url): bool
+    {
+        $connection = curl_init($url);
+        curl_setopt($connection, CURLOPT_HEADER, true);
+        curl_setopt($connection, CURLOPT_NOBODY, true);
+        curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
+        curl_exec($connection);
+        $responseStatus = curl_getinfo($connection, CURLINFO_HTTP_CODE);
+
+        return $responseStatus === 200 ? true : false;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
index b6b14a71a2354..063da7c11bf7f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
@@ -3,11 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\GraphQl\Catalog;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class ProductAttributeTypeTest extends GraphQlAbstract
@@ -71,7 +70,7 @@ public function testAttributeTypeResolver()
             'customer',
             \Magento\Catalog\Api\Data\ProductInterface::class
         ];
-        $attributeTypes = ['String', 'Int', 'Double','Boolean', 'Double'];
+        $attributeTypes = ['String', 'Int', 'Float','Boolean', 'Float'];
         $this->assertAttributeType($attributeTypes, $expectedAttributeCodes, $entityType, $response);
     }
 
@@ -110,6 +109,10 @@ public function testComplexAttributeTypeResolver()
     {
      attribute_code:"region"
      entity_type:"customer_address"
+    },
+    {
+      attribute_code:"media_gallery",
+      entity_type:"catalog_product"
     }
   ]
   )
@@ -130,7 +133,8 @@ public function testComplexAttributeTypeResolver()
             'store_id',
             'quantity_and_stock_status',
             'default_billing',
-            'region'
+            'region',
+            'media_gallery'
         ];
         $entityTypes = [
             'catalog_category',
@@ -138,15 +142,17 @@ public function testComplexAttributeTypeResolver()
             'customer',
             'catalog_product',
             'customer',
-            'customer_address'
+            'customer_address',
+            'catalog_product'
         ];
         $attributeTypes = [
-            'EavDataAttributeOptionInterface',
-            'EavDataAttributeOptionInterface',
+            'String[]',
+            'String[]',
             'Int',
             'CatalogInventoryDataStockItemInterface[]',
             'CustomerDataAddressInterface',
-            'CustomerDataRegionInterface'
+            'CustomerDataRegionInterface',
+            'ProductMediaGallery'
         ];
         $this->assertAttributeType($attributeTypes, $expectedAttributeCodes, $entityTypes, $response);
     }
@@ -166,10 +172,6 @@ public function testUnDefinedAttributeType()
 {
   customAttributeMetadata(attributes:
   [
-    {
-      attribute_code:"media_gallery",
-      entity_type:"catalog_product"
-    },
     {
       attribute_code:"undefine_attribute",
       entity_type:"catalog_category"
@@ -191,8 +193,8 @@ public function testUnDefinedAttributeType()
  }
 QUERY;
         $response = $this->graphQlQuery($query);
-        $expectedAttributeCodes = ['media_gallery', 'undefine_attribute', 'special_price'];
-        $entityTypes = ['catalog_product', 'catalog_category', 'customer'];
+        $expectedAttributeCodes = ['undefine_attribute', 'special_price'];
+        $entityTypes = ['catalog_category', 'customer'];
         $attributeTypes = ['AnyType'];
         $attributeMetaData = array_map(null, $response['customAttributeMetadata']['items'], $entityTypes);
         foreach ($attributeMetaData as $itemsIndex => $itemArray) {
@@ -229,29 +231,4 @@ private function assertAttributeType($attributeTypes, $expectedAttributeCodes, $
             );
         }
     }
-
-    /**
-     * @param array $actualResponse
-     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
-     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
-     */
-    private function assertResponseFields(array $actualResponse, array $assertionMap)
-    {
-        foreach ($assertionMap as $key => $assertionData) {
-            $expectedValue = isset($assertionData['expected_value'])
-                ? $assertionData['expected_value']
-                : $assertionData;
-            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
-            $this->assertNotNull(
-                $expectedValue,
-                "Value of '{$responseField}' field must not be NULL"
-            );
-            $this->assertEquals(
-                $expectedValue,
-                $actualResponse[$responseField],
-                "Value of '{$responseField}' field in response does not match expected value: "
-                . var_export($expectedValue, true)
-            );
-        }
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php
new file mode 100644
index 0000000000000..b55c6c1d91460
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductImageTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testProductWithBaseImage()
+    {
+        $productSku = 'simple';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+        image {
+            url
+            label
+        }
+    }
+  }    
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['image']['url']);
+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['image']['url']));
+        self::assertEquals('Image Alt Text', $response['products']['items'][0]['image']['label']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductWithoutBaseImage()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/239');
+        $productSku = 'simple';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+        image {
+            url
+            label
+        }
+    }
+  }    
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        self::assertEquals('Simple Product', $response['products']['items'][0]['image']['label']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testProductWithSmallImage()
+    {
+        $productSku = 'simple';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+        small_image {
+            url
+            label
+        }
+    }
+  }    
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['small_image']['url']);
+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['small_image']['url']));
+        self::assertEquals('Image Alt Text', $response['products']['items'][0]['small_image']['label']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testProductWithThumbnail()
+    {
+        $productSku = 'simple';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+        thumbnail {
+            url
+            label
+        }
+    }
+  }    
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertContains('magento_image.jpg', $response['products']['items'][0]['thumbnail']['url']);
+        self::assertTrue($this->checkImageExists($response['products']['items'][0]['thumbnail']['url']));
+        self::assertEquals('Image Alt Text', $response['products']['items'][0]['thumbnail']['label']);
+    }
+
+    /**
+     * @param string $url
+     * @return bool
+     */
+    private function checkImageExists(string $url): bool
+    {
+        $connection = curl_init($url);
+        curl_setopt($connection, CURLOPT_HEADER, true);
+        curl_setopt($connection, CURLOPT_NOBODY, true);
+        curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
+        curl_exec($connection);
+        $responseStatus = curl_getinfo($connection, CURLINFO_HTTP_CODE);
+
+        return $responseStatus === 200 ? true : false;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
new file mode 100644
index 0000000000000..2ef081ebcfa90
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductInMultipleStoresTest extends GraphQlAbstract
+{
+
+    /**
+     *
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testProductFromSpecificAndDefaultStore()
+    {
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+            attribute_set_id
+            created_at
+            id
+            name
+            price {
+                minimalPrice {
+                    amount {
+                        value
+                        currency
+                    }
+                }
+            }
+            sku
+            type_id
+            updated_at
+            ... on PhysicalProductInterface {
+                weight
+            }
+        }
+    }
+}
+QUERY;
+
+        /** @var \Magento\Store\Model\Store $store */
+        $store =  ObjectManager::getInstance()->get(\Magento\Store\Model\Store::class);
+        $storeCodeFromFixture = 'fixture_second_store';
+        $storeId = $store->load($storeCodeFromFixture)->getStoreId();
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
+        $product->load($product->getIdBySku($productSku));
+
+        //use case for custom store
+        $productNameInFixtureStore = 'Product\'s Name in Fixture Store';
+        $product->setName($productNameInFixtureStore)->setStoreId($storeId)->save();
+        $headerMap = ['Store' => $storeCodeFromFixture];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertEquals(
+            $productNameInFixtureStore,
+            $response['products']['items'][0]['name'],
+            'Product name in fixture store is invalid.'
+        );
+
+        //use case for default storeCode
+        $nameInDefaultStore = 'Simple Product';
+        $headerMapDefault = ['Store' => 'default'];
+        $response = $this->graphQlQuery($query, [], '', $headerMapDefault);
+        $this->assertEquals(
+            $nameInDefaultStore,
+            $response['products']['items'][0]['name'],
+            'Product name in default store is invalid.'
+        );
+
+        //use case for empty storeCode
+        $headerMapEmpty = ['Store' => ''];
+        $response = $this->graphQlQuery($query, [], '', $headerMapEmpty);
+        $this->assertEquals(
+            $nameInDefaultStore,
+            $response['products']['items'][0]['name'],
+            'Product in the default store should be returned'
+        );
+
+        // use case for invalid storeCode
+        $nonExistingStoreCode = "non_existent_store";
+        $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Store code non_existent_store does not exist');
+        $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index 74bed83cb1d7e..99de6088b19a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -3,15 +3,177 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryLinkManagement;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
 
+/**
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ProductSearchTest extends GraphQlAbstract
 {
+    /**
+     * Verify that layered navigation filters are returned for product query
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testFilterLn()
+    {
+        $query = <<<QUERY
+{
+    products (
+        filter: {
+            sku: {
+                like:"simple%"
+            }
+        }
+        pageSize: 4
+        currentPage: 1
+        sort: {
+            name: DESC
+        }
+    )
+    {
+        items {
+            sku
+        }
+        filters {
+            name
+            filter_items_count
+            request_var
+            filter_items {
+                label
+                value_string
+                items_count
+                ... on SwatchLayerFilterItemInterface {
+                    swatch_data {
+                        type
+                        value
+                    }
+                }
+            }
+        }
+    }
+}
+QUERY;
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(
+            'filters',
+            $response['products'],
+            'Filters are missing in product query result.'
+        );
+        $this->assertFilters(
+            $response,
+            $this->getExpectedFiltersDataSet(),
+            'Returned filters data set does not match the expected value'
+        );
+    }
+
+    /**
+     * Get array with expected data for layered navigation filters
+     *
+     * @return array
+     */
+    private function getExpectedFiltersDataSet()
+    {
+        /** @var \Magento\Eav\Model\Config $eavConfig */
+        $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+        $attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+        /** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $options */
+        $options = $attribute->getOptions();
+        // Fetching option ID is required for continuous debug as of autoincrement IDs.
+        return [
+            [
+                'name' => 'Category',
+                'filter_items_count' => 1,
+                'request_var' => 'cat',
+                'filter_items' => [
+                    [
+                        'label' => 'Category 1',
+                        'value_string' => '333',
+                        'items_count' => 3,
+                    ],
+                ],
+            ],
+            [
+                'name' => 'Test Configurable',
+                'filter_items_count' => 1,
+                'request_var' => 'test_configurable',
+                'filter_items' => [
+                    [
+                        'label' => 'Option 1',
+                        'value_string' => $options[1]->getValue(),
+                        'items_count' => 1,
+                    ],
+                ],
+            ],
+            [
+                'name' => 'Price',
+                'filter_items_count' => 2,
+                'request_var' => 'price',
+                'filter_items' => [
+                    [
+                        'label' => '<span class="price">$0.00</span> - <span class="price">$9.99</span>',
+                        'value_string' => '-10',
+                        'items_count' => 1,
+                    ],
+                    [
+                        'label' => '<span class="price">$10.00</span> and above',
+                        'value_string' => '10-',
+                        'items_count' => 1,
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Assert filters data.
+     *
+     * @param array $response
+     * @param array $expectedFilters
+     * @param string $message
+     */
+    private function assertFilters($response, $expectedFilters, $message = '')
+    {
+        $this->assertArrayHasKey('filters', $response['products'], 'Product has filters');
+        $this->assertTrue(is_array(($response['products']['filters'])), 'Product filters is array');
+        $this->assertTrue(count($response['products']['filters']) > 0, 'Product filters is not empty');
+        foreach ($expectedFilters as $expectedFilter) {
+            $found = false;
+            foreach ($response['products']['filters'] as $responseFilter) {
+                if ($responseFilter['name'] == $expectedFilter['name']
+                    && $responseFilter['request_var'] == $expectedFilter['request_var']) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
+                $this->fail($message);
+            }
+        }
+    }
+
     /**
      * Verify that items between the price range of 5 and 50 are returned after sorting name in DESC
      *
@@ -30,7 +192,7 @@ public function testFilterProductsWithinSpecificPriceRangeSortedByNameDesc()
             or:
             {
               sku:{like:"simple%"}
-              name:{like:"Simple%"}              
+              name:{like:"Simple%"}
              }
         }
          pageSize:4
@@ -38,26 +200,33 @@ public function testFilterProductsWithinSpecificPriceRangeSortedByNameDesc()
          sort:
          {
           name:DESC
-         } 
-    ) 
+         }
+    )
     {
       items
        {
          sku
-         price
+         price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+         }
          name
-         weight
-         status
+         ... on PhysicalProductInterface {
+            weight
+         }
          type_id
-         visibility
          attribute_set_id
-       }    
+       }
         total_count
         page_info
         {
           page_size
           current_page
-        }        
+        }
     }
 }
 QUERY;
@@ -67,13 +236,11 @@ public function testFilterProductsWithinSpecificPriceRangeSortedByNameDesc()
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
         $product1 = $productRepository->get('simple1');
         $product2 = $productRepository->get('simple2');
-        $product3 = $productRepository->get('simple3');
-        $filteredProducts = [$product3, $product2, $product1];
+        $filteredProducts = [$product2, $product1];
 
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('products', $response);
         $this->assertArrayHasKey('total_count', $response['products']);
-        $this->assertEquals(3, $response['products']['total_count']);
         $this->assertProductItems($filteredProducts, $response);
         $this->assertEquals(4, $response['products']['page_info']['page_size']);
     }
@@ -102,28 +269,34 @@ public function testFilterVisibleProductsWithMatchingSkuOrNameWithSpecialPrice()
            sku:{like:"%simple%"}
            name:{like:"%configurable%"}
           }
-           visibility:{in:["2", "3","4"]}
-           weight:{eq:"1"} 
+           weight:{eq:"1"}
         }
         pageSize:6
         currentPage:1
         sort:
        {
         price:DESC
-       } 
-    )    
+       }
+    )
     {
         items
          {
            sku
-           price
+           price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+           }
            name
-           weight
-           status
+           ... on PhysicalProductInterface {
+            weight
+           }
            type_id
-           visibility
            attribute_set_id
-         }    
+         }
         total_count
         page_info
         {
@@ -133,9 +306,7 @@ public function testFilterVisibleProductsWithMatchingSkuOrNameWithSpecialPrice()
     }
 }
 QUERY;
-        /**
-         * @var ProductRepositoryInterface $productRepository
-         */
+        /** @var ProductRepositoryInterface $productRepository */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
         $product1 = $productRepository->get('simple1');
         $product2 = $productRepository->get('simple2');
@@ -151,9 +322,9 @@ public function testFilterVisibleProductsWithMatchingSkuOrNameWithSpecialPrice()
      * pageSize = total_count and current page = 2
      * expected - error is thrown
      * Actual - empty array
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      *
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
 
     public function testSearchWithFilterWithPageSizeEqualTotalCount()
@@ -172,28 +343,34 @@ public function testSearchWithFilterWithPageSizeEqualTotalCount()
            sku:{like:"%simple%"}
            name:{like:"%configurable%"}
           }
-           visibility:{in:["2", "3","4"]}
-           weight:{eq:"1"} 
+           weight:{eq:"1"}
         }
         pageSize:2
         currentPage:2
         sort:
        {
         price:DESC
-       } 
-    )    
+       }
+    )
     {
         items
          {
            sku
-           price
+           price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+           }
            name
-           weight
-           status
+           ... on PhysicalProductInterface {
+            weight
+           }
            type_id
-           visibility
            attribute_set_id
-         }    
+         }
         total_count
         page_info
         {
@@ -204,79 +381,11 @@ public function testSearchWithFilterWithPageSizeEqualTotalCount()
 }
 QUERY;
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors: The value' . ' ' .
-            'specified in the currentPage attribute is greater than the number of pages available (1).');
+        $this->expectExceptionMessage('GraphQL response contains errors: currentPage value 2 specified is greater ' .
+            'than the 1 page(s) available');
         $this->graphQlQuery($query);
     }
 
-    /**
-     * The query returns a total_count of 2 records; setting the pageSize = 1 and currentPage2
-     * Expected result is to get the second product on the list on the second page
-     *
-     * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
-     */
-    public function testSearchWithFilterPageSizeLessThanCurrentPage()
-    {
-        $this->markTestSkipped('This is test is skipped due to MAGETWO-85680');
-        $query
-            = <<<QUERY
-{
-    products(
-     search : "simple"
-        filter:
-        {
-          special_price:{neq:"null"}
-          price:{lt:"60"}
-          or:
-          {
-           sku:{like:"%simple%"}
-           name:{like:"%configurable%"}
-          }
-           visibility:{in:["2", "3","4"]}
-           weight:{eq:"1"} 
-        }
-        pageSize:1
-        currentPage:2
-        sort:
-       {
-        price:DESC
-       } 
-    )    
-    {
-        items
-         {
-           sku
-           price
-           name
-           weight
-           status
-           type_id
-           visibility
-           attribute_set_id
-         }    
-        total_count
-        page_info
-        {
-          page_size
-          current_page
-        }
-    }
-}
-QUERY;
-        /**
-         * @var ProductRepositoryInterface $productRepository
-         */
-        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-        // when pagSize =1 and currentPage = 2, it should have simple2 on first page and simple1 on 2nd page
-        // since sorting is done on price in the DESC order
-        $product = $productRepository->get('simple1');
-        $filteredProducts = [$product];
-
-        $response = $this->graphQlQuery($query);
-        $this->assertEquals(2, $response['products']['total_count']);
-        $this->assertProductItems($filteredProducts, $response);
-    }
-
     /**
      * Requesting for items that match a specific SKU or NAME within a certain price range sorted by Price in ASC order
      *
@@ -295,34 +404,50 @@ public function testQueryProductsInCurrentPageSortedByPriceASC()
             or:
             {
               sku:{like:"simple%"}
-              name:{like:"simple%"}              
-             }    
+              name:{like:"simple%"}
+             }
         }
          pageSize:4
          currentPage:1
          sort:
          {
           price:ASC
-         } 
-    ) 
+         }
+    )
     {
         items
          {
            sku
-           price
+           price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+           }
            name
-           weight
-           status
+           ... on PhysicalProductInterface {
+            weight
+           }
            type_id
-           visibility
            attribute_set_id
-         }    
+         }
         total_count
         page_info
         {
           page_size
           current_page
         }
+        sort_fields 
+        {
+          default
+          options 
+          {
+            value
+            label
+          }
+        }
     }
 }
 QUERY;
@@ -332,26 +457,30 @@ public function testQueryProductsInCurrentPageSortedByPriceASC()
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
         $childProduct1 = $productRepository->get('simple1');
         $childProduct2 = $productRepository->get('simple2');
-        $childProduct3 = $productRepository->get('simple_31');
-        $childProduct4 = $productRepository->get('simple_32');
-        $filteredChildProducts = [$childProduct1, $childProduct2, $childProduct3, $childProduct4];
+        $filteredChildProducts = [$childProduct1, $childProduct2];
 
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('products', $response);
         $this->assertArrayHasKey('total_count', $response['products']);
-        $this->assertEquals(6, $response['products']['total_count']);
+        $this->assertEquals(2, $response['products']['total_count']);
         $this->assertProductItems($filteredChildProducts, $response);
         $this->assertEquals(4, $response['products']['page_info']['page_size']);
         $this->assertEquals(1, $response['products']['page_info']['current_page']);
+        $this->assertArrayHasKey('sort_fields', $response['products']);
+        $this->assertArrayHasKey('options', $response['products']['sort_fields']);
+        $this->assertArrayHasKey('default', $response['products']['sort_fields']);
+        $this->assertEquals('position', $response['products']['sort_fields']['default']);
+        $this->assertArrayHasKey('value', $response['products']['sort_fields']['options'][0]);
+        $this->assertArrayHasKey('label', $response['products']['sort_fields']['options'][0]);
+        $this->assertEquals('position', $response['products']['sort_fields']['options'][0]['value']);
     }
 
     /**
-     * Verify the items in the second page is correct after sorting their name in ASC order
+     * Verify the items is correct after sorting their name in ASC order
      *
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testFilterProductsInNextPageSortedByNameASC()
+    public function testQueryProductsSortedByNameASC()
     {
         $query
             = <<<QUERY
@@ -359,39 +488,27 @@ public function testFilterProductsInNextPageSortedByNameASC()
     products(
         filter:
         {
-            price:{gt: "5", lt: "50"}
-            or:
-            {
-                sku:{eq:"simple1"}
-                name:{like:"configurable%"}
-            }
+            sku:{in:["simple2", "simple1"]}
         }
-         pageSize:4
+         pageSize:1
          currentPage:2
          sort:
          {
-          name:ASC
-         } 
-    ) 
+             name:ASC
+         }
+    )
     {
       items
       {
         sku
-        price
         name
-        status
-        type_id
-           weight
-           visibility
-           attribute_set_id
-         }    
-        total_count
-        page_info
-        {
+      }
+      total_count
+      page_info
+      {
           page_size
           current_page
-        }
-        
+      }
     }
 }
 QUERY;
@@ -399,23 +516,157 @@ public function testFilterProductsInNextPageSortedByNameASC()
          * @var ProductRepositoryInterface $productRepository
          */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple1');
-        $filteredProducts = [$product];
+        $product = $productRepository->get('simple2');
 
         $response = $this->graphQlQuery($query);
-        $this->assertEquals(5, $response['products']['total_count']);
-        $this->assertProductItems($filteredProducts, $response);
-        $this->assertEquals(4, $response['products']['page_info']['page_size']);
-        $this->assertEquals(2, $response['products']['page_info']['current_page']);
+        $this->assertEquals(2, $response['products']['total_count']);
+        $this->assertEquals(['page_size' => 1, 'current_page' => 2], $response['products']['page_info']);
+        $this->assertEquals(
+            [['sku' => $product->getSku(), 'name' => $product->getName()]],
+            $response['products']['items']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
+     */
+    public function testFilteringForProductInMultipleCategories()
+    {
+        $productSku = 'simple333';
+        $query
+            = <<<QUERY
+{
+   products(filter:{sku:{eq:"{$productSku}"}})
+ {
+   items{
+     id
+     sku
+     name
+     attribute_set_id
+     categories {
+        id
+     }
+   }
+ }
+}
+
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        /** @var ProductInterface $product */
+        $product = $productRepository->get('simple333');
+        $categoryIds  = $product->getCategoryIds();
+        foreach ($categoryIds as $index => $value) {
+            $categoryIds[$index] = [ 'id' => (int)$value];
+        }
+        $this->assertNotEmpty($response['products']['items'][0]['categories'], "Categories must not be empty");
+        $this->assertNotNull($response['products']['items'][0]['categories'], "categories must not be null");
+        $this->assertEquals($categoryIds, $response['products']['items'][0]['categories']);
+        /** @var MetadataPool $metaData */
+        $metaData = ObjectManager::getInstance()->get(MetadataPool::class);
+        $linkField = $metaData->getMetadata(ProductInterface::class)->getLinkField();
+        $assertionMap = [
+
+            ['response_field' => 'id', 'expected_value' => $product->getData($linkField)],
+            ['response_field' => 'sku', 'expected_value' => $product->getSku()],
+            ['response_field' => 'name', 'expected_value' => $product->getName()],
+            ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()]
+        ];
+        $this->assertResponseFields($response['products']['items'][0], $assertionMap);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
+     * @return void
+     */
+    public function testFilterProductsByCategoryIds()
+    {
+        $queryCategoryId = 333;
+        $query
+            = <<<QUERY
+{
+  products(
+        filter:
+        {
+            category_id:{eq:"{$queryCategoryId}"}
+        }
+    pageSize:2
+            
+     )
+    {
+      items
+      {
+       sku
+       name
+       type_id
+       categories{
+          name
+          id
+          path
+          children_count
+          product_count
+        }
+      }
+       total_count
+        
+    }
+}
+
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var CategoryLinkManagement $productLinks */
+        $productLinks = ObjectManager::getInstance()->get(CategoryLinkManagement::class);
+        /** @var CategoryRepositoryInterface $categoryRepository */
+        $categoryRepository = ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
+
+        $links = $productLinks->getAssignedProducts($queryCategoryId);
+        foreach ($response['products']['items'] as $itemIndex => $itemData) {
+            $this->assertNotEmpty($itemData);
+            $this->assertEquals($response['products']['items'][$itemIndex]['sku'], $links[$itemIndex]->getSku());
+            /** @var ProductRepositoryInterface $productRepository */
+            $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+            /** @var ProductInterface $product */
+            $product = $productRepository->get($links[$itemIndex]->getSku());
+            $this->assertEquals($response['products']['items'][$itemIndex]['name'], $product->getName());
+            $this->assertEquals($response['products']['items'][$itemIndex]['type_id'], $product->getTypeId());
+            $categoryIds  = $product->getCategoryIds();
+            foreach ($categoryIds as $index => $value) {
+                $categoryIds[$index] = (int)$value;
+            }
+            $categoryInResponse = array_map(
+                null,
+                $categoryIds,
+                $response['products']['items'][$itemIndex]['categories']
+            );
+            foreach ($categoryInResponse as $key => $categoryData) {
+                $this->assertNotEmpty($categoryData);
+                /** @var CategoryInterface | Category $category */
+                $category = $categoryRepository->get($categoryInResponse[$key][0]);
+                $this->assertResponseFields(
+                    $categoryInResponse[$key][1],
+                    [
+                        'name' => $category->getName(),
+                        'id' => $category->getId(),
+                        'path' => $category->getPath(),
+                        'children_count' => $category->getChildrenCount(),
+                        'product_count' => $category->getProductCount(),
+                    ]
+                );
+            }
+        }
     }
 
     /**
-     * Sorting by visibility and price in the DESC order from the filtered items with default pageSize
+     * Sorting by price in the DESC order from the filtered items with default pageSize
      *
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testQuerySortByVisibilityAndPriceDESCWithDefaultPageSize()
+    public function testQuerySortByPriceDESCWithDefaultPageSize()
     {
         $query
             = <<<QUERY
@@ -428,57 +679,254 @@ public function testQuerySortByVisibilityAndPriceDESCWithDefaultPageSize()
             {
               sku:{like:"%simple%"}
               name:{like:"%Configurable%"}
-              visibility:{in:["2", "3","4"]}
             }
         }
          sort:
          {
-          visibility:DESC
+
           price:DESC
          }
-     ) 
+     )
     {
       items
       {
         sku
-        price
+        price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+        }
         name
-        weight
-        status
+        ... on PhysicalProductInterface {
+            weight
+        }
         type_id
-        visibility
-        attribute_set_id       
-      }           
+        attribute_set_id
+      }
         total_count
         page_info
         {
           page_size
           current_page
-        }        
+        }
     }
 }
 QUERY;
-        /**
-         * @var ProductRepositoryInterface $productRepository
-         */
+        /** @var ProductRepositoryInterface $productRepository */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-
         $visibleProduct1 = $productRepository->get('simple1');
         $visibleProduct2 = $productRepository->get('simple2');
-        $visibleProduct3 = $productRepository->get('simple_42');
-        $visibleProduct4 = $productRepository->get('simple_41');
-        $visibleProduct5 = $productRepository->get('simple_32');
-        $visibleProduct6 = $productRepository->get('simple_31');
-        $filteredProducts = [$visibleProduct3, $visibleProduct4,
-                             $visibleProduct5, $visibleProduct6, $visibleProduct2, $visibleProduct1];
-
+        $filteredProducts = [$visibleProduct2, $visibleProduct1];
         $response = $this->graphQlQuery($query);
-        $this->assertEquals(6, $response['products']['total_count']);
+        $this->assertEquals(2, $response['products']['total_count']);
         $this->assertProductItems($filteredProducts, $response);
         $this->assertEquals(20, $response['products']['page_info']['page_size']);
         $this->assertEquals(1, $response['products']['page_info']['current_page']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
+     */
+    public function testProductQueryUsingFromAndToFilterInput()
+    {
+        $query
+            = <<<QUERY
+{
+    products(
+        filter: { 
+            price:{
+                from:"5" to:"20"
+            } 
+        }
+        sort: {
+            sku: DESC
+        }
+    ) {
+        total_count
+        items {
+            attribute_set_id
+            sku
+            name
+            price {
+                minimalPrice {
+                    amount {
+                        value
+                        currency
+                    }
+                }
+                maximalPrice {
+                    amount {
+                        value
+                        currency
+                    }
+                }
+            }     
+            type_id
+            ...on PhysicalProductInterface {
+                weight
+            }
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(2, $response['products']['total_count']);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product1 = $productRepository->get('simple1');
+        $product2 = $productRepository->get('simple2');
+        $filteredProducts = [$product2, $product1];
+
+        $this->assertProductItemsWithMaximalAndMinimalPriceCheck($filteredProducts, $response);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
+     */
+    public function testProductBasicFullTextSearchQuery()
+    {
+        $textToSearch = 'Simple';
+        $query
+            =<<<QUERY
+{
+    products(
+      search: "{$textToSearch}"
+    )
+    {
+        total_count
+        items {
+          name
+          sku
+          price {
+            minimalPrice {
+              amount {
+                value
+                currency
+              }
+            }
+          }
+        }
+        page_info {
+          page_size
+          current_page
+        }
+      }
+}
+QUERY;
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+
+        $prod1 = $productRepository->get('simple1');
+
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, $response['products']['total_count']);
+
+        $filteredProducts = [$prod1];
+        $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
+        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
+            $this->assertNotEmpty($itemArray);
+            $this->assertResponseFields(
+                $productItemsInResponse[$itemIndex][0],
+                [
+                    'sku' => $filteredProducts[$itemIndex]->getSku(),
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                    'price' => [
+                        'minimalPrice' => [
+                            'amount' => [
+                                'value' => $filteredProducts[$itemIndex]->getSpecialPrice(),
+                                'currency' => 'USD'
+                            ]
+                        ]
+                    ]
+                ]
+            );
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
+     */
+    public function testProductsThatMatchWithPricesFromList()
+    {
+        $query
+            =<<<QUERY
+            {
+    products(
+        filter:
+        {
+            price:{in:["10","20"]}
+
+        }
+         pageSize:4
+         currentPage:1
+         sort:
+         {
+          name:DESC
+         }
+    )
+    {
+      items
+       {
+         attribute_set_id
+         sku
+         price {
+            regularPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+         }
+         name
+         ... on PhysicalProductInterface {
+            weight
+         }
+         type_id
+       }
+        total_count
+        page_info
+        {
+          page_size
+          current_page
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(2, $response['products']['total_count']);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+
+        $prod1 = $productRepository->get('simple2');
+        $prod2 = $productRepository->get('simple1');
+        $filteredProducts = [$prod1, $prod2];
+        $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
+        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
+            $this->assertNotEmpty($itemArray);
+            $this->assertResponseFields(
+                $productItemsInResponse[$itemIndex][0],
+                ['attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
+                    'sku' => $filteredProducts[$itemIndex]->getSku(),
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                    'price' => [
+                        'regularPrice' => [
+                            'amount' => [
+                                'value' => $filteredProducts[$itemIndex]->getPrice(),
+                                'currency' => 'USD'
+                            ]
+                        ]
+                    ],
+                    'type_id' =>$filteredProducts[$itemIndex]->getTypeId(),
+                    'weight' => $filteredProducts[$itemIndex]->getWeight()
+                ]
+            );
+        }
+    }
+
     /**
      * No items are returned if the conditions are not met
      *
@@ -495,32 +943,39 @@ public function testQueryFilterNoMatchingItems()
     {
         special_price:{lt:"15"}
         price:{lt:"50"}
-        visibility:{eq:"2"}
+        weight:{gt:"4"}
         or:
         {
             sku:{like:"simple%"}
             name:{like:"%simple%"}
-        }           
+        }
     }
     pageSize:2
     currentPage:1
     sort:
    {
     sku:ASC
-   } 
-)    
+   }
+)
 {
     items
      {
        sku
-       price
+       price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+       }
        name
-       weight
-       status
+       ... on PhysicalProductInterface {
+        weight
+       }
        type_id
-       visibility
        attribute_set_id
-     }    
+     }
     total_count
     page_info
     {
@@ -562,12 +1017,19 @@ public function testQueryPageOutOfBoundException()
       items
       {
         sku
-        price
+        price {
+            minimalPrice {
+                amount {
+                    value
+                    currency
+                }
+            }
+        }
         name
-        status
         type_id
+        ... on PhysicalProductInterface {
            weight
-           visibility
+         }
            attribute_set_id
          }
         total_count
@@ -576,63 +1038,159 @@ public function testQueryPageOutOfBoundException()
           page_size
           current_page
         }
+    }
+}
+QUERY;
 
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: currentPage value 2 specified is greater ' .
+            'than the 1 page(s) available.');
+        $this->graphQlQuery($query);
     }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testQueryWithNoSearchOrFilterArgumentException()
+    {
+        $query
+            = <<<QUERY
+{
+  products(pageSize:1)
+  {
+       items{
+           id
+           attribute_set_id
+           created_at
+           name
+           sku
+           type_id
+           updated_at
+           ... on PhysicalProductInterface {
+               weight
+           }
+       }
+   }
 }
 QUERY;
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors: The value' . ' ' .
-            'specified in the currentPage attribute is greater than the number of pages available (1).');
+        $this->expectExceptionMessage('GraphQL response contains errors: \'search\' or \'filter\' input argument is ' .
+            'required.');
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @magentoApiDataFixture Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php
+     */
+    public function testFilterProductsThatAreOutOfStockWithConfigSettings()
+    {
+        $query
+            =<<<QUERY
+{
+  products(
+        filter:
+        {
+            sku:{like:"simple%"}
+        }
+    pageSize:20
+            
+     )
+    {
+      items
+      {
+       sku
+       name
+      }
+       total_count
+        
+    }
+}
+QUERY;
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
+        $config->saveConfig(
+            \Magento\CatalogInventory\Model\Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+            0,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
+        ObjectManager::getInstance()->get(\Magento\Framework\App\Cache::class)
+            ->clean(\Magento\Framework\App\Config::CACHE_TAG);
+        $response = $this->graphQlQuery($query);
+        $responseObject = new DataObject($response);
+        self::assertEquals(
+            'simple_visible_in_stock',
+            $responseObject->getData('products/items/0/sku')
+        );
+        self::assertEquals(
+            'Simple Product Visible and InStock',
+            $responseObject->getData('products/items/0/name')
+        );
+        $this->assertEquals(1, $response['products']['total_count']);
+    }
+
     /**
      * Asserts the different fields of items returned after search query is executed
-     * @param $filteredProducts
-     * @param $actualResponse
+     *
+     * @param Product[] $filteredProducts
+     * @param array $actualResponse
      */
-    private function assertProductItems($filteredProducts, $actualResponse)
+    private function assertProductItems(array $filteredProducts, array $actualResponse)
     {
         $productItemsInResponse = array_map(null, $actualResponse['products']['items'], $filteredProducts);
 
-        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
-            $this->assertNotEmpty($itemArray);
+        for ($itemIndex = 0; $itemIndex < count($filteredProducts); $itemIndex++) {
+            $this->assertNotEmpty($productItemsInResponse[$itemIndex]);
             $this->assertResponseFields(
                 $productItemsInResponse[$itemIndex][0],
                 ['attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
-                 'sku' => $filteredProducts[$itemIndex]->getSku(),
-                 'name' => $filteredProducts[$itemIndex]->getName(),
-                 'price' => $filteredProducts[$itemIndex]->getPrice(),
-                 'status' =>$filteredProducts[$itemIndex]->getStatus(),
-                 'type_id' =>$filteredProducts[$itemIndex]->getTypeId(),
-                 'visibility' =>$filteredProducts[$itemIndex]->getVisibility(),
-                 'weight' => $filteredProducts[$itemIndex]->getWeight()
+                    'sku' => $filteredProducts[$itemIndex]->getSku(),
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                    'price' => [
+                        'minimalPrice' => [
+                            'amount' => [
+                                'value' => $filteredProducts[$itemIndex]->getFinalPrice(),
+                                'currency' => 'USD'
+                            ]
+                        ]
+                    ],
+                    'type_id' =>$filteredProducts[$itemIndex]->getTypeId(),
+                    'weight' => $filteredProducts[$itemIndex]->getWeight()
                 ]
             );
         }
     }
-    /**
-     * @param array $actualResponse
-     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
-     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
-     */
-    private function assertResponseFields(array $actualResponse, array $assertionMap)
-    {
-        foreach ($assertionMap as $key => $assertionData) {
-            $expectedValue = isset($assertionData['expected_value'])
-                ? $assertionData['expected_value']
-                : $assertionData;
-            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
-            $this->assertNotNull(
-                $expectedValue,
-                "Value of '{$responseField}' field must not be NULL"
-            );
-            $this->assertEquals(
-                $expectedValue,
-                $actualResponse[$responseField],
-                "Value of '{$responseField}' field in response does not match expected value: "
-                . var_export($expectedValue, true)
+
+    private function assertProductItemsWithMaximalAndMinimalPriceCheck(array $filteredProducts, array $actualResponse)
+    {
+        $productItemsInResponse = array_map(null, $actualResponse['products']['items'], $filteredProducts);
+
+        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
+            $this->assertNotEmpty($itemArray);
+            $this->assertResponseFields(
+                $productItemsInResponse[$itemIndex][0],
+                ['attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
+                    'sku' => $filteredProducts[$itemIndex]->getSku(),
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                    'price' => [
+                        'minimalPrice' => [
+                            'amount' => [
+                                'value' => $filteredProducts[$itemIndex]->getSpecialPrice(),
+                                'currency' => 'USD'
+                            ]
+                        ],
+                        'maximalPrice' => [
+                            'amount' => [
+                                'value' => $filteredProducts[$itemIndex]->getSpecialPrice(),
+                                'currency' => 'USD'
+                            ]
+                        ]
+                    ],
+                    'type_id' =>$filteredProducts[$itemIndex]->getTypeId(),
+                    'weight' => $filteredProducts[$itemIndex]->getWeight()
+                ]
             );
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductTextAttributesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductTextAttributesTest.php
new file mode 100644
index 0000000000000..999e1cc7fca3d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductTextAttributesTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductTextAttributesTest extends GraphQlAbstract
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->productRepository = Bootstrap::getObjectManager()::getInstance()->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductTextAttributes()
+    {
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+            sku
+            description {
+                html
+            }
+            short_description {
+                html
+            }
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertEquals(
+            $productSku,
+            $response['products']['items'][0]['sku']
+        );
+        $this->assertEquals(
+            'Short description',
+            $response['products']['items'][0]['short_description']['html']
+        );
+        $this->assertEquals(
+            'Description with <b>html tag</b>',
+            $response['products']['items'][0]['description']['html']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     */
+    public function testProductWithoutFilledTextAttributes()
+    {
+        $productSku = 'virtual-product';
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+            sku
+            description {
+                html
+            }
+            short_description {
+                html
+            }
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertEquals(
+            $productSku,
+            $response['products']['items'][0]['sku']
+        );
+        $this->assertEquals(
+            '',
+            $response['products']['items'][0]['short_description']['html']
+        );
+        $this->assertEquals(
+            '',
+            $response['products']['items'][0]['description']['html']
+        );
+    }
+
+    /**
+     * Test for checking that product fields with directives allowed are rendered correctly
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Cms/_files/block.php
+     */
+    public function testHtmlDirectivesRendering()
+    {
+        $productSku = 'simple';
+        $cmsBlockId = 'fixture_block';
+        $assertionCmsBlockText = 'Fixture Block Title';
+
+        $product = $this->productRepository->get($productSku, false, null, true);
+        $product->setDescription('Test: {{block id="' . $cmsBlockId . '"}}');
+        $product->setShortDescription('Test: {{block id="' . $cmsBlockId . '"}}');
+        $this->productRepository->save($product);
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}}) {
+        items {
+            description {
+                html
+            }
+            short_description {
+                html
+            }
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertContains($assertionCmsBlockText, $response['products']['items'][0]['description']['html']);
+        self::assertNotContains('{{block id', $response['products']['items'][0]['description']['html']);
+        self::assertContains($assertionCmsBlockText, $response['products']['items'][0]['short_description']['html']);
+        self::assertNotContains('{{block id', $response['products']['items'][0]['short_description']['html']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index 306ba757ea566..a7c83aba89f0a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\GraphQl\Catalog;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -30,44 +34,25 @@ protected function setUp()
      */
     public function testQueryAllFieldsSimpleProduct()
     {
-        $prductSku = 'simple';
+        $productSku = 'simple';
 
         $query = <<<QUERY
 {
-    products(filter: {sku: {eq: "{$prductSku}"}})
+    products(filter: {sku: {eq: "{$productSku}"}})
     {
         items {
             attribute_set_id
-            category_ids
-            category_links
-            {
-                category_id
-                position
-            }
             country_of_manufacture
             created_at
-            custom_design
-            custom_design_from
-            custom_design_to
-            custom_layout
-            custom_layout_update
-            description
-            gallery
             gift_message_available
-            has_options
             id
-            image
-            image_label
-            links_exist
-            links_purchased_separately
-            links_title
-            media_gallery
-            {
-                images
-                {
-                    file
-                }
+            categories {
+               name
+               url_path
+               available_sort_by
+               level
             }
+            image { url, label }
             meta_description
             meta_keyword
             meta_title
@@ -96,67 +81,134 @@ public function testQueryAllFieldsSimpleProduct()
                     video_url
                 }
             }
-            minimal_price
-            msrp
-            msrp_display_actual_price_type
             name
-            news_from_date
-            news_to_date
-            old_id
+            new_from_date
+            new_to_date
             options_container
-            options
-            {
-                file_extension
-                image_size_x
-                image_size_y
-                is_require
-                max_characters
-                option_id
-                price
-                price_type
-                product_sku
-                sku
-                sort_order
+            ... on CustomizableProductInterface {
+              options {
                 title
-                type
-                values
-                {
-                    title
-                    sort_order
+                required
+                sort_order
+                option_id
+                ... on CustomizableFieldOption {
+                  product_sku
+                  field_option: value {
+                    sku
+                    price
+                    price_type
+                    max_characters
+                  }
+                }
+                ... on CustomizableAreaOption {
+                  product_sku
+                  area_option: value {
+                    sku
+                    price
+                    price_type
+                    max_characters
+                  }
+                }
+                ... on CustomizableDateOption {
+                  product_sku
+                  date_option: value {
+                    sku
                     price
                     price_type
+                  }
+                }
+                ... on CustomizableDropDownOption {
+                  drop_down_option: value {
+                    option_type_id
                     sku
+                    price
+                    price_type
+                    title
+                    sort_order
+                  }
+                }
+                ... on CustomizableRadioOption {
+                  radio_option: value {
                     option_type_id
+                    sku
+                    price
+                    price_type
+                    title
+                    sort_order
+                  }
+                }
+                ...on CustomizableFileOption {
+                    product_sku
+                    file_option: value {
+                      sku
+                      price
+                      price_type
+                      file_extension
+                      image_size_x
+                      image_size_y
+                    }
+                  }
+              }
+            }
+            price {
+              minimalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              maximalPrice {
+                amount {
+                  value
+                  currency
                 }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              regularPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
             }
-            page_layout
-            price
-            price_type
-            price_view
             product_links
             {
                 link_type
                 linked_product_sku
                 linked_product_type
                 position
-                qty
                 sku
             }
-            required_options
-            samples_title
-            shipment_type
-            short_description
             sku
-            small_image
-            small_image_label
+            small_image{ url, label }
+            thumbnail { url, label }
             special_from_date
             special_price
             special_to_date
-            status
-            swatch_image
-            tax_class_id
-            thumbnail
-            thumbnail_label
+            swatch_image            
             tier_price
             tier_prices
             {
@@ -170,10 +222,11 @@ public function testQueryAllFieldsSimpleProduct()
             updated_at
             url_key
             url_path
-            visibility
-            website_ids
-            weight
-            weight_type
+            canonical_url
+            websites { id name code sort_order default_group_id is_default }
+            ... on PhysicalProductInterface {
+                weight
+            }
         }
     }
 }
@@ -186,24 +239,40 @@ public function testQueryAllFieldsSimpleProduct()
         );
         $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
 
-        $this->setToken($customerToken);
-        $response = $this->graphQlQuery($query);
-
-        /**
-         * @var ProductRepositoryInterface $productRepository
-         */
-
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $responseObject = new DataObject($response);
+        /** @var ProductRepositoryInterface $productRepository */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get($prductSku, false, null, true);
+        $product = $productRepository->get($productSku, false, null, true);
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        $product->setId(
+            $product->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
         $this->assertArrayHasKey('products', $response);
         $this->assertArrayHasKey('items', $response['products']);
         $this->assertEquals(1, count($response['products']['items']));
         $this->assertArrayHasKey(0, $response['products']['items']);
         $this->assertBaseFields($product, $response['products']['items'][0]);
         $this->assertEavAttributes($product, $response['products']['items'][0]);
-        $this->assertCategoryIds($product, $response['products']['items'][0]);
         $this->assertOptions($product, $response['products']['items'][0]);
         $this->assertTierPrices($product, $response['products']['items'][0]);
+        $this->assertArrayHasKey('websites', $response['products']['items'][0]);
+        $this->assertWebsites($product, $response['products']['items'][0]['websites']);
+        self::assertEquals(
+            'Movable Position 2',
+            $responseObject->getData('products/items/0/categories/1/name')
+        );
+        self::assertEquals(
+            'Filter category',
+            $responseObject->getData('products/items/0/categories/2/name')
+        );
+        $storeManager = ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
+        self::assertEquals(
+            $storeManager->getStore()->getBaseUrl() . 'simple-product.html',
+            $responseObject->getData('products/items/0/canonical_url')
+        );
     }
 
     /**
@@ -212,45 +281,23 @@ public function testQueryAllFieldsSimpleProduct()
      */
     public function testQueryMediaGalleryEntryFieldsSimpleProduct()
     {
-
-        $prductSku = 'simple';
+        $productSku = 'simple';
 
         $query = <<<QUERY
 {
-    products(filter: {sku: {eq: "{$prductSku}"}})
+    products(filter: {sku: {eq: "{$productSku}"}})
     {
         items{
             attribute_set_id
-            category_ids
-            category_links
+            categories
             {
-                category_id
-                position
+                id
             }
             country_of_manufacture
             created_at
-            custom_design
-            custom_design_from
-            custom_design_to
-            custom_layout
-            custom_layout_update
-            description
-            gallery
             gift_message_available
-            has_options
             id
-            image
-            image_label
-            links_exist
-            links_purchased_separately
-            links_title
-            media_gallery
-            {
-                images
-                {
-                    file
-                }
-            }
+            image {url, label}
             meta_description
             meta_keyword
             meta_title
@@ -279,67 +326,132 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
                     video_url
                 }
             }
-            minimal_price
-            msrp
-            msrp_display_actual_price_type
             name
-            news_from_date
-            news_to_date
-            old_id
+            new_from_date
+            new_to_date
             options_container
-            options
-            {
-                file_extension
-                image_size_x
-                image_size_y
-                is_require
-                max_characters
-                option_id
-                price
-                price_type
-                product_sku
-                sku
-                sort_order
+            ... on CustomizableProductInterface {
+              field_options: options {
                 title
-                type
-                values
-                {
-                    title
-                    sort_order
+                required
+                sort_order
+                option_id
+                ... on CustomizableFieldOption {
+                  product_sku
+                  field_option: value {
+                    sku
+                    price
+                    price_type
+                    max_characters
+                  }
+                }
+                ... on CustomizableAreaOption {
+                  product_sku
+                  area_option: value {
+                    sku
+                    price
+                    price_type
+                    max_characters
+                  }
+                }
+                ... on CustomizableDateOption {
+                  product_sku
+                  date_option: value {
+                    sku
                     price
                     price_type
+                  }
+                }
+                ... on CustomizableDropDownOption {
+                  drop_down_option: value {
+                    option_type_id
                     sku
+                    price
+                    price_type
+                    title
+                  }
+                }
+                ... on CustomizableRadioOption {
+                  radio_option: value {
                     option_type_id
+                    sku
+                    price
+                    price_type
+                    title
+                  }
+                }
+                ...on CustomizableFileOption {
+                    product_sku
+                    file_option: value {
+                      sku
+                      price
+                      price_type
+                      file_extension
+                      image_size_x
+                      image_size_y
+                    }
+                  }
+              }
+            }
+            price {
+              minimalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              maximalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              regularPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
                 }
+              }
             }
-            page_layout
-            price
-            price_type
-            price_view
             product_links
             {
                 link_type
                 linked_product_sku
                 linked_product_type
                 position
-                qty
                 sku
             }
-            required_options
-            samples_title
-            shipment_type
-            short_description
             sku
-            small_image
-            small_image_label
+            small_image { url, label }
             special_from_date
             special_price
             special_to_date
-            status
             swatch_image
-            tax_class_id
-            thumbnail
-            thumbnail_label
+            thumbnail { url, label }
             tier_price
             tier_prices
             {
@@ -353,10 +465,10 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
             updated_at
             url_key
             url_path
-            visibility
-            website_ids
-            weight
-            weight_type
+            websites { id name code sort_order default_group_id is_default }
+            ... on PhysicalProductInterface {
+                weight
+            }
         }
     }
 }
@@ -368,12 +480,174 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
          * @var ProductRepositoryInterface $productRepository
          */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get($prductSku, false, null, true);
+        $product = $productRepository->get($productSku, false, null, true);
         $this->assertArrayHasKey('products', $response);
         $this->assertArrayHasKey('items', $response['products']);
         $this->assertEquals(1, count($response['products']['items']));
         $this->assertArrayHasKey(0, $response['products']['items']);
         $this->assertMediaGalleryEntries($product, $response['products']['items'][0]);
+        $this->assertArrayHasKey('websites', $response['products']['items'][0]);
+        $this->assertWebsites($product, $response['products']['items'][0]['websites']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute.php
+     */
+    public function testQueryCustomAttributeField()
+    {
+        if (!$this->cleanCache()) {
+            $this->fail('Cache could not be cleaned properly.');
+        }
+        $prductSku = 'simple';
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$prductSku}"}})
+    {
+        items
+        {
+            attribute_code_custom
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertCustomAttribute($response['products']['items'][0]);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products_related.php
+     */
+    public function testProductLinks()
+    {
+        $productSku = 'simple_with_cross';
+
+        $query = <<<QUERY
+       {
+           products(filter: {sku: {eq: "{$productSku}"}})
+           {
+               items {
+                   attribute_set_id
+                   type_id
+                   product_links
+                   {
+                       link_type
+                       linked_product_sku
+                       linked_product_type
+                       position
+                       sku
+                   }
+               }
+           }
+       }
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $this->assertNotNull($response['products']['items'][0]['product_links'], "product_links must not be null");
+        $this->assertProductLinks($product, $response['products']['items'][0]['product_links'][0]);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products_list.php
+     */
+    public function testProductPrices()
+    {
+        $firstProductSku = 'simple-249';
+        $secondProductSku = 'simple-156';
+        $query = <<<QUERY
+       {
+           products(filter: {min_price: {gt: "100.0"}, max_price: {gt: "150.0", lt: "250.0"}})
+           {
+               items {
+                   attribute_set_id
+                   created_at
+                   id
+                   name
+                   price {
+                      minimalPrice {
+                        amount {
+                          value
+                          currency
+                        }
+                        adjustments {
+                          amount {
+                            value
+                            currency
+                          }
+                          code
+                          description
+                        }
+                      }
+                      maximalPrice {
+                        amount {
+                          value
+                          currency
+                        }
+                        adjustments {
+                          amount {
+                            value
+                            currency
+                          }
+                          code
+                          description
+                        }
+                      }
+                      regularPrice {
+                        amount {
+                          value
+                          currency
+                        }
+                        adjustments {
+                          amount {
+                            value
+                            currency
+                          }
+                          code
+                          description
+                        }
+                      }
+                    }
+                   sku
+                   type_id
+                   updated_at
+                   ... on PhysicalProductInterface {
+                        weight
+                   }
+               }
+           }
+       }
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $firstProduct = $productRepository->get($firstProductSku, false, null, true);
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        $firstProduct->setId(
+            $firstProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        $secondProduct = $productRepository->get($secondProductSku, false, null, true);
+        $secondProduct->setId(
+            $secondProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        self::assertNotNull($response['products']['items'][0]['price'], "price must be not null");
+        self::assertCount(2, $response['products']['items']);
+        $this->assertBaseFields($firstProduct, $response['products']['items'][0]);
+        $this->assertBaseFields($secondProduct, $response['products']['items'][1]);
     }
 
     /**
@@ -419,13 +693,10 @@ private function assertMediaGalleryEntries($product, $actualResponse)
      * @param ProductInterface $product
      * @param array $actualResponse
      */
-    private function assertCategoryIds($product, $actualResponse)
+    private function assertCustomAttribute($actualResponse)
     {
-        $categoryIdsAttribute = $product->getCustomAttribute('category_ids');
-        $this->assertNotEmpty($categoryIdsAttribute, "Precondition failed: 'category_ids' must not be empty");
-        $categoryIdsAttributeValue = $categoryIdsAttribute ? $categoryIdsAttribute->getValue() : [];
-//        $expectedValue = implode(',', $categoryIdsAttributeValue);
-        $this->assertEquals($categoryIdsAttributeValue, $actualResponse['category_ids']);
+        $customAttribute = null;
+        $this->assertEquals($customAttribute, $actualResponse['attribute_code_custom']);
     }
 
     /**
@@ -438,9 +709,7 @@ private function assertTierPrices($product, $actualResponse)
         $this->assertNotEmpty($actualResponse['tier_prices'], "Precondition failed: 'tier_prices' must not be empty");
         foreach ($actualResponse['tier_prices'] as $tierPriceIndex => $tierPriceArray) {
             foreach ($tierPriceArray as $key => $value) {
-                /**
-                 * @var \Magento\Catalog\Model\Product\TierPrice $tierPrice
-                 */
+                /** @var \Magento\Catalog\Model\Product\TierPrice $tierPrice */
                 $tierPrice = $tierPrices[$tierPriceIndex];
                 $this->assertEquals($value, $tierPrice->getData($key));
             }
@@ -450,6 +719,7 @@ private function assertTierPrices($product, $actualResponse)
     /**
      * @param ProductInterface $product
      * @param $actualResponse
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function assertOptions($product, $actualResponse)
     {
@@ -459,61 +729,86 @@ private function assertOptions($product, $actualResponse)
             $option = null;
             /** @var \Magento\Catalog\Model\Product\Option $optionSelect */
             foreach ($productOptions as $optionSelect) {
-                if ($optionSelect->getOptionId() == $optionsArray['option_id']) {
+                $match = false;
+                if ($optionSelect->getTitle() == $optionsArray['title']) {
                     $option = $optionSelect;
-                    break;
+                    if (!empty($option->getValues())) {
+                        $values = $option->getValues();
+                        /** @var \Magento\Catalog\Model\Product\Option\Value $value */
+                        $value = current($values);
+                        $findValueKeyName = $option->getType() === 'radio' ? 'radio_option' : 'drop_down_option';
+                        if ($value->getTitle() === $optionsArray[$findValueKeyName][0]['title']) {
+                            $match = true;
+                        }
+                    } else {
+                        $match = true;
+                    }
+                    if ($match) {
+                        break;
+                    }
                 }
             }
             $assertionMap = [
-                ['response_field' => 'product_sku', 'expected_value' => $option->getProductSku()],
                 ['response_field' => 'sort_order', 'expected_value' => $option->getSortOrder()],
                 ['response_field' => 'title', 'expected_value' => $option->getTitle()],
-                ['response_field' => 'type', 'expected_value' => $option->getType()],
-                ['response_field' => 'option_id', 'expected_value' => $option->getOptionId()],
-                ['response_field' => 'is_require', 'expected_value' => $option->getIsRequire()],
-                ['response_field' => 'sort_order', 'expected_value' => $option->getSortOrder()]
+                ['response_field' => 'required', 'expected_value' => $option->getIsRequire()],
+                ['response_field' => 'option_id', 'expected_value' => $option->getOptionId()]
             ];
 
             if (!empty($option->getValues())) {
-                $value = current($optionsArray['values']);
+                $valueKeyName = $option->getType() === 'radio' ? 'radio_option' : 'drop_down_option';
+                $value = current($optionsArray[$valueKeyName]);
                 /** @var \Magento\Catalog\Model\Product\Option\Value $productValue */
                 $productValue = current($option->getValues());
                 $assertionMapValues = [
                     ['response_field' => 'title', 'expected_value' => $productValue->getTitle()],
                     ['response_field' => 'sort_order', 'expected_value' => $productValue->getSortOrder()],
                     ['response_field' => 'price', 'expected_value' => $productValue->getPrice()],
-                    ['response_field' => 'price_type', 'expected_value' => $productValue->getPriceType()],
+                    ['response_field' => 'price_type', 'expected_value' => strtoupper($productValue->getPriceType())],
                     ['response_field' => 'sku', 'expected_value' => $productValue->getSku()],
                     ['response_field' => 'option_type_id', 'expected_value' => $productValue->getOptionTypeId()]
                 ];
                 $this->assertResponseFields($value, $assertionMapValues);
             } else {
+                $assertionMap = array_merge(
+                    $assertionMap,
+                    [
+                        ['response_field' => 'product_sku', 'expected_value' => $option->getProductSku()],
+                    ]
+                );
+
                 if ($option->getType() === 'file') {
-                    $assertionMap = array_merge(
-                        $assertionMap,
-                        [
-                            ['response_field' => 'file_extension', 'expected_value' => $option->getFileExtension()],
-                            ['response_field' => 'image_size_x', 'expected_value' => $option->getImageSizeX()],
-                            ['response_field' => 'image_size_y', 'expected_value' => $option->getImageSizeY()]
-                        ]
-                    );
+                    $valueKeyName = 'file_option';
+                    $valueAssertionMap = [
+                        ['response_field' => 'file_extension', 'expected_value' => $option->getFileExtension()],
+                        ['response_field' => 'image_size_x', 'expected_value' => $option->getImageSizeX()],
+                        ['response_field' => 'image_size_y', 'expected_value' => $option->getImageSizeY()]
+                    ];
                 } elseif ($option->getType() === 'area') {
-                    $assertionMap = array_merge(
-                        $assertionMap,
-                        [
-                            ['response_field' => 'max_characters', 'expected_value' => $option->getMaxCharacters()],
-                        ]
-                    );
+                    $valueKeyName = 'area_option';
+                    $valueAssertionMap = [
+                        ['response_field' => 'max_characters', 'expected_value' => $option->getMaxCharacters()],
+                    ];
+                } elseif ($option->getType() === 'field') {
+                    $valueKeyName = 'field_option';
+                    $valueAssertionMap = [
+                        ['response_field' => 'max_characters', 'expected_value' => $option->getMaxCharacters()]
+                    ];
+                } else {
+                    $valueKeyName = 'date_option';
+                    $valueAssertionMap = [];
                 }
 
-                $assertionMap = array_merge(
-                    $assertionMap,
+                $valueAssertionMap = array_merge(
+                    $valueAssertionMap,
                     [
                         ['response_field' => 'price', 'expected_value' => $option->getPrice()],
-                        ['response_field' => 'price_type', 'expected_value' => $option->getPriceType()],
+                        ['response_field' => 'price_type', 'expected_value' => strtoupper($option->getPriceType())],
                         ['response_field' => 'sku', 'expected_value' => $option->getSku()]
                     ]
                 );
+
+                $this->assertResponseFields($optionsArray[$valueKeyName], $valueAssertionMap);
             }
             $this->assertResponseFields($optionsArray, $assertionMap);
         }
@@ -525,26 +820,85 @@ private function assertOptions($product, $actualResponse)
      */
     private function assertBaseFields($product, $actualResponse)
     {
-        /**
-         * ['product_object_field_name', 'expected_value']
-         */
+
         $assertionMap = [
             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
             ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
             ['response_field' => 'id', 'expected_value' => $product->getId()],
             ['response_field' => 'name', 'expected_value' => $product->getName()],
-            ['response_field' => 'price', 'expected_value' => $product->getPrice()],
+            ['response_field' => 'price', 'expected_value' =>
+                [
+                    'minimalPrice' => [
+                        'amount' => [
+                            'value' => $product->getSpecialPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'regularPrice' => [
+                        'amount' => [
+                            'value' => $product->getPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'maximalPrice' => [
+                        'amount' => [
+                            'value' => $product->getSpecialPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                ]
+            ],
             ['response_field' => 'sku', 'expected_value' => $product->getSku()],
-            ['response_field' => 'status', 'expected_value' => $product->getStatus()],
             ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
             ['response_field' => 'updated_at', 'expected_value' => $product->getUpdatedAt()],
-            ['response_field' => 'visibility', 'expected_value' => $product->getVisibility()],
             ['response_field' => 'weight', 'expected_value' => $product->getWeight()],
         ];
 
         $this->assertResponseFields($actualResponse, $assertionMap);
     }
 
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertWebsites($product, $actualResponse)
+    {
+        $assertionMap = [
+            [
+                'id' => current($product->getExtensionAttributes()->getWebsiteIds()),
+                'name' => 'Main Website',
+                'code' => 'base',
+                'sort_order' => 0,
+                'default_group_id' => '1',
+                'is_default' => true,
+            ]
+        ];
+
+        $this->assertEquals($actualResponse, $assertionMap);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertProductLinks($product, $actualResponse)
+    {
+        /** @var ProductLinkInterface $productLinks */
+        $productLinks = $product->getProductLinks();
+        $productLink = $productLinks[0];
+        $assertionMap = [
+            ['response_field' => 'link_type', 'expected_value' => $productLink->getLinkType()],
+            ['response_field' => 'linked_product_sku', 'expected_value' => $productLink->getLinkedProductSku()],
+            ['response_field' => 'linked_product_type', 'expected_value' => $productLink->getLinkedProductType()],
+            ['response_field' => 'position', 'expected_value' => $productLink->getPosition()],
+            ['response_field' => 'sku', 'expected_value' => $productLink->getSku()],
+        ];
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+
     /**
      * @param ProductInterface $product
      * @param array $actualResponse
@@ -553,23 +907,13 @@ private function assertEavAttributes($product, $actualResponse)
     {
         $eavAttributes = [
             'url_key',
-            'description',
-            'has_options',
             'meta_description',
             'meta_keyword',
             'meta_title',
-            'short_description',
-            'tax_class_id',
             'country_of_manufacture',
-            'msrp',
             'gift_message_available',
-            'has_options',
-            'minimal_price',
-            'msrp_display_actual_price_type',
             'news_from_date',
-            'old_id',
             'options_container',
-            'required_options',
             'special_price',
             'special_from_date',
             'special_to_date',
@@ -577,8 +921,9 @@ private function assertEavAttributes($product, $actualResponse)
         $assertionMap = [];
         foreach ($eavAttributes as $attributeCode) {
             $expectedAttribute = $product->getCustomAttribute($attributeCode);
+
             $assertionMap[] = [
-                'response_field' => $attributeCode,
+                'response_field' => $this->eavAttributesToGraphQlSchemaFieldTranslator($attributeCode),
                 'expected_value' => $expectedAttribute ? $expectedAttribute->getValue() : null
             ];
         }
@@ -587,27 +932,19 @@ private function assertEavAttributes($product, $actualResponse)
     }
 
     /**
-     * @param array $actualResponse
-     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
-     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
+     * @param string $eavAttributeCode
+     * @return string
      */
-    private function assertResponseFields($actualResponse, $assertionMap)
+    private function eavAttributesToGraphQlSchemaFieldTranslator(string $eavAttributeCode)
     {
-        foreach ($assertionMap as $key => $assertionData) {
-            $expectedValue = isset($assertionData['expected_value'])
-                ? $assertionData['expected_value']
-                : $assertionData;
-            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
-            $this->assertNotNull(
-                $expectedValue,
-                "Value of '{$responseField}' field must not be NULL"
-            );
-            $this->assertEquals(
-                $expectedValue,
-                $actualResponse[$responseField],
-                "Value of '{$responseField}' field in response does not match expected value: "
-                . var_export($expectedValue, true)
-            );
+        switch ($eavAttributeCode) {
+            case 'news_from_date':
+                $eavAttributeCode = 'new_from_date';
+                break;
+            case 'news_to_date':
+                $eavAttributeCode = 'new_to_date';
+                break;
         }
+        return $eavAttributeCode;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
new file mode 100644
index 0000000000000..43796d780646c
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteDTO;
+
+/**
+ * Test of getting URL rewrites data from products
+ */
+class UrlRewritesTest extends GraphQlAbstract
+{
+    /**
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testProductWithNoCategoriesAssigned()
+    {
+        $productSku = 'virtual-product';
+        $query
+            = <<<QUERY
+{
+    products (filter: {sku: {eq: "{$productSku}"}}) {
+        items {
+            name,
+            sku,
+            description {
+                html
+            }
+            url_rewrites {
+              url,
+              parameters {
+                name,
+                value
+              }
+            }
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('virtual-product', false, null, true);
+
+        $urlFinder = ObjectManager::getInstance()->get(UrlFinderInterface::class);
+
+        $rewritesCollection = $urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $product->getId()]);
+
+        /* There should be only one rewrite */
+        /** @var UrlRewriteDTO $urlRewrite */
+        $urlRewrite = current($rewritesCollection);
+
+        $this->assertArrayHasKey('url_rewrites', $response['products']['items'][0]);
+        $this->assertCount(1, $response['products']['items'][0]['url_rewrites']);
+
+        $this->assertResponseFields(
+            $response['products']['items'][0]['url_rewrites'][0],
+            [
+                "url" => $urlRewrite->getRequestPath(),
+                "parameters" => $this->getUrlParameters($urlRewrite->getTargetPath())
+            ]
+        );
+    }
+
+    /**
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testProductWithOneCategoryAssigned()
+    {
+        $productSku = 'simple';
+        $query
+            = <<<QUERY
+{
+    products (filter: {sku: {eq: "{$productSku}"}}) {
+        items {
+            name,
+            sku,
+            description {
+                html
+            }
+            url_rewrites {
+              url,
+              parameters {
+                name,
+                value
+              }
+            }
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple', false, null, true);
+
+        $urlFinder = ObjectManager::getInstance()->get(UrlFinderInterface::class);
+
+        $rewritesCollection = $urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $product->getId()]);
+        $rewritesCount = count($rewritesCollection);
+
+        $this->assertArrayHasKey('url_rewrites', $response['products']['items'][0]);
+        $this->assertCount($rewritesCount, $response['products']['items'][0]['url_rewrites']);
+
+        for ($i = 0; $i < $rewritesCount; $i++) {
+            $urlRewrite = $rewritesCollection[$i];
+            $this->assertResponseFields(
+                $response['products']['items'][0]['url_rewrites'][$i],
+                [
+                    "url" => $urlRewrite->getRequestPath(),
+                    "parameters" => $this->getUrlParameters($urlRewrite->getTargetPath())
+                ]
+            );
+        }
+    }
+
+    /**
+     * Parses target path and extracts parameters
+     *
+     * @param string $targetPath
+     * @return array
+     */
+    private function getUrlParameters(string $targetPath): array
+    {
+        $urlParameters = [];
+        $targetPathParts = explode('/', trim($targetPath, '/'));
+
+        for ($i = 3; ($i < sizeof($targetPathParts) - 1); $i += 2) {
+            $urlParameters[] = [
+                'name' => $targetPathParts[$i],
+                'value' => $targetPathParts[$i + 1]
+            ];
+        }
+
+        return $urlParameters;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
new file mode 100644
index 0000000000000..58b6d4f0e4ea2
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class VirtualProductViewTest extends GraphQlAbstract
+{
+    /**
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testQueryAllFieldsVirtualProduct()
+    {
+        $productSku = 'virtual-product';
+
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "$productSku"}})
+   {
+       items{
+           id
+           attribute_set_id    
+           created_at
+           name
+           sku
+           type_id
+           updated_at
+           ... on PhysicalProductInterface {
+             weight
+           }  
+           ... on VirtualProduct {
+            attribute_set_id
+            name
+            id
+            sku
+          
+           }
+       }
+   }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        $product->setId(
+            $product->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertBaseFields($product, $response['products']['items'][0]);
+        $this->assertArrayNotHasKey(
+            'weight',
+            $response['products']['items'][0],
+            "response does contain the key weight"
+        );
+    }
+
+    /**
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCannotQueryWeightOnVirtualProductException()
+    {
+        $productSku = 'virtual-product';
+
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "$productSku"}})
+   {
+       items{
+           id
+           attribute_set_id    
+           created_at
+           name
+           sku
+           type_id
+           updated_at
+           ... on PhysicalProductInterface {
+             weight
+           }  
+           ... on VirtualProduct {
+            attribute_set_id
+            name
+            weight
+            id
+            sku          
+           }
+       }
+   }   
+}
+QUERY;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'GraphQL response contains errors: Cannot query field "weight" on type "VirtualProduct"'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertBaseFields($product, $actualResponse)
+    {
+        $assertionMap = [
+            ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
+            ['response_field' => 'id', 'expected_value' => $product->getId()],
+            ['response_field' => 'name', 'expected_value' => $product->getName()],
+            ['response_field' => 'sku', 'expected_value' => $product->getSku()],
+            ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()]
+        ];
+
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
new file mode 100644
index 0000000000000..3969c758f12db
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductOnlyXLeftInStockTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogInventory;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductOnlyXLeftInStockTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     */
+    public function testQueryProductOnlyXLeftInStockDisabled()
+    {
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+        {
+            products(filter: {sku: {eq: "{$productSku}"}})
+            {
+                items {
+                    only_x_left_in_stock
+                }
+            }
+        }
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertArrayHasKey('only_x_left_in_stock', $response['products']['items'][0]);
+        $this->assertNull($response['products']['items'][0]['only_x_left_in_stock']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     * @magentoConfigFixture default_store cataloginventory/options/stock_threshold_qty 120
+     */
+    public function testQueryProductOnlyXLeftInStockEnabled()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+        {
+            products(filter: {sku: {eq: "{$productSku}"}})
+            {
+                items {
+                    only_x_left_in_stock            
+                }
+            }
+        }
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertArrayHasKey('only_x_left_in_stock', $response['products']['items'][0]);
+        $this->assertEquals(100, $response['products']['items'][0]['only_x_left_in_stock']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php
new file mode 100644
index 0000000000000..c5571a4a338c2
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/ProductStockStatusTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogInventory;
+
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductStockStatusTest extends GraphQlAbstract
+{
+    /**
+     * @var StockRegistryInterface
+     */
+    private $stockRegistry;
+
+    protected function setUp()
+    {
+        $this->stockRegistry = Bootstrap::getObjectManager()->create(StockRegistryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     */
+    public function testQueryProductStockStatusInStock()
+    {
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+        {
+            products(filter: {sku: {eq: "{$productSku}"}})
+            {
+                items {
+                    stock_status            
+                }
+            }
+        }
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertArrayHasKey('stock_status', $response['products']['items'][0]);
+        $this->assertEquals('IN_STOCK', $response['products']['items'][0]['stock_status']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     * @magentoConfigFixture default_store cataloginventory/options/show_out_of_stock 1
+     */
+    public function testQueryProductStockStatusOutOfStock()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+        {
+            products(filter: {sku: {eq: "{$productSku}"}})
+            {
+                items {
+                    stock_status            
+                }
+            }
+        }
+QUERY;
+
+        $stockItem = $this->stockRegistry->getStockItemBySku($productSku);
+        $stockItem->setQty(0);
+        $this->stockRegistry->updateStockItemBySku($productSku, $stockItem);
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertArrayHasKey('stock_status', $response['products']['items'][0]);
+        $this->assertEquals('OUT_OF_STOCK', $response['products']['items'][0]['stock_status']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
new file mode 100644
index 0000000000000..57f526b1cb2f7
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Cms;
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Widget\Model\Template\FilterEmulate;
+
+class CmsBlockTest extends GraphQlAbstract
+{
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
+    /**
+     * @var FilterEmulate
+     */
+    private $filterEmulate;
+
+    protected function setUp()
+    {
+        $this->blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
+        $this->filterEmulate = Bootstrap::getObjectManager()->get(FilterEmulate::class);
+    }
+
+    /**
+     * Verify the fields of CMS Block selected by identifiers
+     *
+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
+     */
+    public function testGetCmsBlock()
+    {
+        $cmsBlock = $this->blockRepository->getById('enabled_block');
+        $cmsBlockData = $cmsBlock->getData();
+        $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
+
+        $query =
+            <<<QUERY
+{
+  cmsBlocks(identifiers: "enabled_block") {
+    items {
+      identifier
+      title
+      content
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cmsBlocks', $response);
+        self::assertArrayHasKey('items', $response['cmsBlocks']);
+
+        self::assertEquals($cmsBlockData['identifier'], $response['cmsBlocks']['items'][0]['identifier']);
+        self::assertEquals($cmsBlockData['title'], $response['cmsBlocks']['items'][0]['title']);
+        self::assertEquals($renderedContent, $response['cmsBlocks']['items'][0]['content']);
+    }
+
+    /**
+     * Verify the message when CMS Block is disabled
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The CMS block with the "disabled_block" ID doesn't exist
+     *
+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
+     */
+    public function testGetDisabledCmsBlock()
+    {
+        $query =
+            <<<QUERY
+{
+  cmsBlocks(identifiers: "disabled_block") {
+    items {
+      identifier
+      title
+      content
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the message when identifiers were not specified
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage "identifiers" of CMS blocks should be specified
+     */
+    public function testGetCmsBlocksWithoutIdentifiers()
+    {
+        $query =
+            <<<QUERY
+{
+  cmsBlocks(identifiers: []) {
+    items {
+      identifier
+      title
+      content
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the message when CMS Block with such identifiers does not exist
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The CMS block with the "nonexistent_id" ID doesn't exist.
+     */
+    public function testGetCmsBlockByNonExistentIdentifier()
+    {
+        $query =
+            <<<QUERY
+{
+  cmsBlocks(identifiers: "nonexistent_id") {
+    items {
+      identifier
+      title
+      content
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the fields of CMS Block selected by identifiers
+     *
+     * @magentoApiDataFixture Magento/Cms/_files/blocks.php
+     */
+    public function testGetEnabledAndDisabledCmsBlockInOneRequest()
+    {
+        $query =
+            <<<QUERY
+{
+  cmsBlocks(identifiers: ["enabled_block", "disabled_block"]) {
+    items {
+      identifier
+    }
+  }
+}
+QUERY;
+
+        try {
+            $this->graphQlQuery($query);
+            self::fail('Response should contains errors.');
+        } catch (ResponseContainsErrorsException $e) {
+            $responseData = $e->getResponseData();
+        }
+
+        self::assertNotEmpty($responseData);
+        self::assertEquals('enabled_block', $responseData['data']['cmsBlocks']['items'][0]['identifier']);
+        self::assertEquals(
+            'The CMS block with the "disabled_block" ID doesn\'t exist.',
+            $responseData['errors'][0]['message']
+        );
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php
new file mode 100644
index 0000000000000..86145fafa62f1
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Cms;
+
+use Magento\Cms\Model\GetPageByIdentifier;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class CmsPageTest extends GraphQlAbstract
+{
+    /**
+     * Verify the fields of CMS Page selected by page_id
+     *
+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
+     */
+    public function testGetCmsPageById()
+    {
+        $cmsPage = ObjectManager::getInstance()->get(GetPageByIdentifier::class)->execute('page100', 0);
+        $pageId = $cmsPage->getPageId();
+        $cmsPageData = $cmsPage->getData();
+        $query =
+            <<<QUERY
+{
+  cmsPage(id: $pageId) {
+    url_key
+    title
+    content
+    content_heading
+    page_layout
+    meta_title
+    meta_description
+    meta_keywords
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals($cmsPageData['identifier'], $response['cmsPage']['url_key']);
+        $this->assertEquals($cmsPageData['title'], $response['cmsPage']['title']);
+        $this->assertEquals($cmsPageData['content'], $response['cmsPage']['content']);
+        $this->assertEquals($cmsPageData['content_heading'], $response['cmsPage']['content_heading']);
+        $this->assertEquals($cmsPageData['page_layout'], $response['cmsPage']['page_layout']);
+        $this->assertEquals($cmsPageData['meta_title'], $response['cmsPage']['meta_title']);
+        $this->assertEquals($cmsPageData['meta_description'], $response['cmsPage']['meta_description']);
+        $this->assertEquals($cmsPageData['meta_keywords'], $response['cmsPage']['meta_keywords']);
+    }
+
+    /**
+     * Verify the message when page_id is not specified.
+     */
+    public function testGetCmsPageWithoutId()
+    {
+        $query =
+            <<<QUERY
+{
+  cmsPage {
+    url_key
+    title
+    content
+    content_heading
+    page_layout
+    meta_title
+    meta_description
+    meta_keywords
+  }
+}
+QUERY;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Page id should be specified');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the message when page_id does not exist.
+     */
+    public function testGetCmsPageByNonExistentId()
+    {
+        $query =
+            <<<QUERY
+{
+  cmsPage(id: 0) {
+    url_key
+    title
+    content
+    content_heading
+    page_layout
+    meta_title
+    meta_description
+    meta_keywords
+  }
+}
+QUERY;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The CMS page with the "0" ID doesn\'t exist.');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the message when CMS Page selected by page_id is disabled
+     *
+     * @magentoApiDataFixture Magento/Cms/_files/noroute.php
+     */
+    public function testGetDisabledCmsPageById()
+    {
+        $cmsPageId = ObjectManager::getInstance()->get(GetPageByIdentifier::class)->execute('no-route', 0)->getPageId();
+        $query =
+            <<<QUERY
+{
+  cmsPage(id: $cmsPageId) {
+    url_key
+    title
+    content
+    content_heading
+    page_layout
+    meta_title
+    meta_description
+    meta_keywords
+  }
+}
+QUERY;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('No such entity.');
+        $this->graphQlQuery($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
index 540f8bc7090fd..735ae7fff646b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
@@ -3,18 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\GraphQl\ConfigurableProduct;
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class ConfigurableProductViewTest extends GraphQlAbstract
 {
+    /**
+     * @var array
+     */
+    private $configurableOptions = [];
+
     /**
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testQueryConfigurableProductLinks()
     {
@@ -23,64 +33,169 @@ public function testQueryConfigurableProductLinks()
         $query
             = <<<QUERY
 {
-    products(filter: {sku: {eq: "{$productSku}"}})
-    {
-        items{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+      id
+      attribute_set_id
+      created_at
+      name
+      sku
+      type_id
+      updated_at
+      ... on PhysicalProductInterface {
+        weight
+      }
+      price {
+        minimalPrice {
+          amount {
+            value
+            currency
+          }
+          adjustments {
+            amount {
+              value
+              currency
+            }
+            code
+            description
+          }
+        }
+        maximalPrice {
+          amount {
+            value
+            currency
+          }
+          adjustments {
+            amount {
+              value
+              currency
+            }
+            code
+            description
+          }
+        }
+        regularPrice {
+          amount {
+            value
+            currency
+          }
+          adjustments {
+            amount {
+              value
+              currency
+            }
+            code
+            description
+          }
+        }
+      }
+      ... on ConfigurableProduct {
+        configurable_options {
+          id
+          attribute_id
+          label
+          position
+          use_default
+          attribute_code
+          values {
+            value_index
+            label
+            store_label
+            default_label
+            use_default_value
+          }
+          product_id
+        }
+        variants {
+          product {
             id
-            attribute_set_id
-            created_at
             name
             sku
-            status
-            type_id
+            attribute_set_id
+            ... on PhysicalProductInterface {
+              weight
+            }
+            created_at
             updated_at
-            visibility
-            weight
-            category_ids                
-            ... on ConfigurableProduct {
-                configurable_product_links {
-                    id
-                    category_ids
-                    name
-                    sku
-                    attribute_set_id
-                    visibility
-                    weight
-                    created_at
-                    updated_at
-                    category_links {
-                    position
-                    category_id
-                    }
-                    media_gallery_entries{
-                    disabled
-                    file
-                    id
-                    label
-                    media_type
-                    position
-                    types
-                    content
-                    {
-                        base64_encoded_data
-                        type
-                        name
-                    }
-                    video_content
-                    {
-                        media_type
-                        video_description
-                        video_metadata
-                        video_provider
-                        video_title
-                        video_url
-                    }            
+            price {
+              minimalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              maximalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
                   }
+                  code
+                  description
                 }
+              }
+              regularPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+            }
+            categories {
+              id
             }
+            media_gallery_entries {
+              disabled
+              file
+              id
+              label
+              media_type
+              position
+              types
+              content {
+                base64_encoded_data
+                type
+                name
+              }
+              video_content {
+                media_type
+                video_description
+                video_metadata
+                video_provider
+                video_title
+                video_url
+              }
+            }
+          }
+          attributes {
+            label
+            code
+            value_index
+          }
         }
+      }
     }
-    
+  }
 }
 QUERY;
 
@@ -89,6 +204,7 @@ public function testQueryConfigurableProductLinks()
         /**
          * @var ProductRepositoryInterface $productRepository
          */
+
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
         $product = $productRepository->get($productSku, false, null, true);
 
@@ -97,7 +213,8 @@ public function testQueryConfigurableProductLinks()
         $this->assertEquals(1, count($response['products']['items']));
         $this->assertArrayHasKey(0, $response['products']['items']);
         $this->assertBaseFields($product, $response['products']['items'][0]);
-        $this->assertConfigurableProductLinks($response['products']['items'][0]);
+        $this->assertConfigurableProductOptions($response['products']['items'][0]);
+        $this->assertConfigurableVariants($response['products']['items'][0]);
     }
 
     /**
@@ -106,20 +223,59 @@ public function testQueryConfigurableProductLinks()
      */
     private function assertBaseFields($product, $actualResponse)
     {
-        /**
-         * ['product_object_field_name', 'expected_value']
-         */
+        /** @var \Magento\Framework\Pricing\PriceInfo\Factory $priceInfoFactory */
+        $priceInfoFactory = ObjectManager::getInstance()->get(\Magento\Framework\Pricing\PriceInfo\Factory::class);
+        $priceInfo = $priceInfoFactory->create($product);
+        /** @var \Magento\Catalog\Pricing\Price\FinalPriceInterface $finalPrice */
+        $finalPrice = $priceInfo->getPrice(FinalPrice::PRICE_CODE);
+        $minimalPriceAmount =  $finalPrice->getMinimalPrice();
+        $maximalPriceAmount =  $finalPrice->getMaximalPrice();
+        $regularPriceAmount =  $priceInfo->getPrice(RegularPrice::PRICE_CODE)->getAmount();
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        // ['product_object_field_name', 'expected_value']
         $assertionMap = [
             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
             ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
-            ['response_field' => 'id', 'expected_value' => $product->getId()],
+            [
+                'response_field' => 'id',
+                'expected_value' => $product->getData(
+                    $metadataPool->getMetadata(
+                        ProductInterface::class
+                    )->getLinkField()
+                )
+            ],
             ['response_field' => 'name', 'expected_value' => $product->getName()],
             ['response_field' => 'sku', 'expected_value' => $product->getSku()],
-            ['response_field' => 'status', 'expected_value' => $product->getStatus()],
             ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
             ['response_field' => 'updated_at', 'expected_value' => $product->getUpdatedAt()],
-            ['response_field' => 'visibility', 'expected_value' => $product->getVisibility()],
             ['response_field' => 'weight', 'expected_value' => $product->getWeight()],
+            [
+                'response_field' => 'price',
+                'expected_value' => [
+                    'minimalPrice' => [
+                        'amount' => [
+                            'value' => $minimalPriceAmount->getValue(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'regularPrice' => [
+                        'amount' => [
+                            'value' => $maximalPriceAmount->getValue(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'maximalPrice' => [
+                        'amount' => [
+                            'value' => $regularPriceAmount->getValue(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                ]
+            ],
         ];
 
         $this->assertResponseFields($actualResponse, $assertionMap);
@@ -130,51 +286,40 @@ private function assertBaseFields($product, $actualResponse)
      *
      * @param $actualResponse
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function assertConfigurableProductLinks($actualResponse)
+    private function assertConfigurableVariants($actualResponse)
     {
         $this->assertNotEmpty(
-            $actualResponse['configurable_product_links'],
-            "Precondition failed: 'configurable_product_links' must not be empty"
+            $actualResponse['variants'],
+            "Precondition failed: 'variants' must not be empty"
         );
-        foreach ($actualResponse[
-            'configurable_product_links'
-                 ] as $configurableProductLinkIndex => $configurableProductLinkArray) {
-            $this->assertNotEmpty($configurableProductLinkArray);
-            $this->assertTrue(
-                isset($configurableProductLinkArray['id']),
-                'configurable_product_links elements don\'t contain id key'
-            );
-            $indexValue = $configurableProductLinkArray['id'];
-            unset($configurableProductLinkArray['id']);
+        foreach ($actualResponse['variants'] as $variantKey => $variantArray) {
+            $this->assertNotEmpty($variantArray);
+            $this->assertNotEmpty($variantArray['product']);
             $this->assertTrue(
-                isset($configurableProductLinkArray['category_ids']),
-                'configurable_product_links doesn\'t contain category_ids key'
+                isset($variantArray['product']['id']),
+                'variant product elements don\'t contain id key'
             );
+            $indexValue = $variantArray['product']['sku'];
+            unset($variantArray['product']['id']);
             $this->assertTrue(
-                isset($configurableProductLinkArray['category_links']),
-                'configurable_product_links doesn\'t contain category_links key'
+                isset($variantArray['product']['categories']),
+                'variant product doesn\'t contain categories key'
             );
             $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
             /** @var \Magento\Catalog\Model\Product $childProduct */
-            $childProduct = $productRepository->getById($indexValue);
+            $childProduct = $productRepository->get($indexValue);
 
             /** @var  \Magento\Catalog\Api\Data\ProductLinkInterface[] */
             $links = $childProduct->getExtensionAttributes()->getCategoryLinks();
-            $this->assertCount(1, $links, "Precondition failed, incorrect number of category_links.");
-            $position =$links[0]->getPosition();
-            $categoryId = $links[0]->getCategoryId();
+            $this->assertCount(1, $links, "Precondition failed, incorrect number of categories.");
+            $id =$links[0]->getCategoryId();
 
             $actualValue
-                = $actualResponse['configurable_product_links'][$configurableProductLinkIndex]['category_links'][0];
-            $this->assertEquals($actualValue, ['position' => $position, 'category_id' =>$categoryId]);
-            unset($configurableProductLinkArray['category_links']);
-
-            $categoryIdsAttribute = $childProduct->getCustomAttribute('category_ids');
-            $this->assertNotEmpty($categoryIdsAttribute, "Precondition failed: 'category_ids' must not be empty");
-            $categoryIdsAttributeValue = $categoryIdsAttribute ? $categoryIdsAttribute->getValue() : [];
-            $this->assertEquals($categoryIdsAttributeValue, $actualResponse['category_ids']);
-            unset($configurableProductLinkArray['category_ids']);
+                = $actualResponse['variants'][$variantKey]['product']['categories'][0];
+            $this->assertEquals($actualValue, ['id' => $id]);
+            unset($variantArray['product']['categories']);
 
             $mediaGalleryEntries = $childProduct->getMediaGalleryEntries();
             $this->assertCount(
@@ -184,20 +329,22 @@ private function assertConfigurableProductLinks($actualResponse)
             );
             $this->assertTrue(
                 is_array(
-                    $actualResponse['configurable_product_links']
-                    [$configurableProductLinkIndex]
+                    $actualResponse['variants']
+                    [$variantKey]
+                    ['product']
                     ['media_gallery_entries']
                 )
             );
             $this->assertCount(
                 1,
-                $actualResponse['configurable_product_links'][$configurableProductLinkIndex]['media_gallery_entries'],
+                $actualResponse['variants'][$variantKey]['product']['media_gallery_entries'],
                 "there must be 1 record in the media gallery"
             );
             $mediaGalleryEntry = $mediaGalleryEntries[0];
             $this->assertResponseFields(
-                $actualResponse['configurable_product_links']
-                [$configurableProductLinkIndex]
+                $actualResponse['variants']
+                [$variantKey]
+                ['product']
                 ['media_gallery_entries'][0],
                 [
                     'disabled' => (bool)$mediaGalleryEntry->isDisabled(),
@@ -210,8 +357,9 @@ private function assertConfigurableProductLinks($actualResponse)
             );
             $videoContent = $mediaGalleryEntry->getExtensionAttributes()->getVideoContent();
             $this->assertResponseFields(
-                $actualResponse['configurable_product_links']
-                [$configurableProductLinkIndex]
+                $actualResponse['variants']
+                [$variantKey]
+                ['product']
                 ['media_gallery_entries']
                 [0]
                 ['video_content'],
@@ -224,36 +372,145 @@ private function assertConfigurableProductLinks($actualResponse)
                     'video_url' => $videoContent->getVideoUrl()
                 ]
             );
-            unset($configurableProductLinkArray['media_gallery_entries']);
+            unset($variantArray['product']['media_gallery_entries']);
 
-            foreach ($configurableProductLinkArray as $key => $value) {
-                $this->assertEquals($value, $childProduct->getData($key));
+            foreach ($variantArray['product'] as $key => $value) {
+                if ($key !== 'price') {
+                    $this->assertEquals($value, $childProduct->getData($key));
+                }
+            }
+            //assert prices
+            $this->assertEquals(
+                [
+                    'minimalPrice' => [
+                        'amount' => [
+                            'value' => $childProduct->getFinalPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'regularPrice' => [
+                        'amount' => [
+                            'value' => $childProduct->getFinalPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                    'maximalPrice' => [
+                        'amount' => [
+                            'value' => $childProduct->getFinalPrice(),
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => []
+                    ],
+                ],
+                $variantArray['product']['price']
+            );
+            $configurableOptions = $this->getConfigurableOptions();
+            foreach ($variantArray['attributes'] as $attribute) {
+                $hasAssertion = false;
+                foreach ($configurableOptions as $option) {
+                    foreach ($option['options'] as $value) {
+                        if ((int)$value['value_index'] === (int)$attribute['value_index']) {
+                            $this->assertEquals((int)$attribute['value_index'], (int)$value['value_index']);
+                            $this->assertEquals($attribute['label'], $value['label']);
+                            $hasAssertion = true;
+                        }
+                    }
+                    $this->assertEquals($attribute['code'], $option['attribute_code']);
+                }
+                if (!$hasAssertion) {
+                    $this->fail('variant did not contain correct attributes');
+                }
             }
         }
     }
 
-    /**
-     * @param array $actualResponse
-     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
-     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
-     */
-    private function assertResponseFields(array $actualResponse, array $assertionMap)
+    private function assertConfigurableProductOptions($actualResponse)
     {
-        foreach ($assertionMap as $key => $assertionData) {
-            $expectedValue = isset($assertionData['expected_value'])
-                ? $assertionData['expected_value']
-                : $assertionData;
-            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
-            $this->assertNotNull(
-                $expectedValue,
-                "Value of '{$responseField}' field must not be NULL"
+        $this->assertNotEmpty(
+            $actualResponse['configurable_options'],
+            "Precondition failed: 'configurable_options' must not be empty"
+        );
+        $configurableAttributeOptions = $this->getConfigurableOptions();
+        $configurableAttributeOption = array_shift($configurableAttributeOptions);
+
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['id'],
+            $configurableAttributeOption['id']
+        );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['use_default'],
+            (bool)$configurableAttributeOption['use_default']
+        );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['attribute_id'],
+            $configurableAttributeOption['attribute_id']
+        );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['label'],
+            $configurableAttributeOption['label']
+        );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['position'],
+            $configurableAttributeOption['position']
+        );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['product_id'],
+            $configurableAttributeOption['product_id']
+        );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['attribute_code'],
+            $configurableAttributeOption['attribute_code']
+        );
+        foreach ($actualResponse['configurable_options'][0]['values'] as $key => $value) {
+            $this->assertEquals(
+                $value['label'],
+                $configurableAttributeOption['options'][$key]['label']
+            );
+            $this->assertEquals(
+                $value['store_label'],
+                $configurableAttributeOption['options'][$key]['store_label']
+            );
+            $this->assertEquals(
+                $value['default_label'],
+                $configurableAttributeOption['options'][$key]['default_label']
+            );
+            $this->assertEquals(
+                $value['use_default_value'],
+                $configurableAttributeOption['options'][$key]['use_default_value']
             );
             $this->assertEquals(
-                $expectedValue,
-                $actualResponse[$responseField],
-                "Value of '{$responseField}' field in response does not match expected value: "
-                . var_export($expectedValue, true)
+                (int)$value['value_index'],
+                (int)$configurableAttributeOption['options'][$key]['value_index']
             );
         }
     }
+
+    private function getConfigurableOptions()
+    {
+        if (!empty($this->configurableOptions)) {
+            return $this->configurableOptions;
+        }
+        $productSku = 'configurable';
+        /** @var ProductRepositoryInterface $productRepo */
+        $productRepo = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepo->get($productSku);
+        $configurableAttributeOptions = $product->getExtensionAttributes()->getConfigurableProductOptions();
+        $configurableAttributeOptionsData = [];
+        foreach ($configurableAttributeOptions as $option) {
+            $configurableAttributeOptionsData[$option->getId()] = $option->getData();
+            $configurableAttributeOptionsData[$option->getId()]['id'] = $option->getId();
+            $configurableAttributeOptionsData[$option->getId()]['attribute_code']
+                = $option->getProductAttribute()->getAttributeCode();
+            unset($configurableAttributeOptionsData[$option->getId()]['values']);
+            foreach ($option->getValues() as $value) {
+                $configurableAttributeOptionsData[$option->getId()]['values'][$value->getId()] = $value->getData();
+                $configurableAttributeOptionsData[$option->getId()]['values'][$value->getId()]['label']
+                    = $value->getLabel();
+            }
+        }
+
+        return $this->configurableOptions = $configurableAttributeOptionsData;
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
new file mode 100644
index 0000000000000..f4e96e49a58e6
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ChangeCustomerPasswordTest extends GraphQlAbstract
+{
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
+    protected function setUp()
+    {
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->accountManagement = Bootstrap::getObjectManager()->get(AccountManagementInterface::class);
+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testChangePassword()
+    {
+        $customerEmail = 'customer@example.com';
+        $oldCustomerPassword = 'password';
+        $newCustomerPassword = 'anotherPassword1';
+
+        $query = $this->getChangePassQuery($oldCustomerPassword, $newCustomerPassword);
+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword);
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertEquals($customerEmail, $response['changeCustomerPassword']['email']);
+
+        try {
+            // registry contains the old password hash so needs to be reset
+            $this->customerRegistry->removeByEmail($customerEmail);
+            $this->accountManagement->authenticate($customerEmail, $newCustomerPassword);
+        } catch (LocalizedException $e) {
+            $this->fail('Password was not changed: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testChangePasswordIfUserIsNotAuthorizedTest()
+    {
+        $query = $this->getChangePassQuery('currentpassword', 'newpassword');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testChangeWeakPassword()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/190');
+        $customerEmail = 'customer@example.com';
+        $oldCustomerPassword = 'password';
+        $newCustomerPassword = 'weakpass';
+
+        $query = $this->getChangePassQuery($oldCustomerPassword, $newCustomerPassword);
+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessageRegExp('/Minimum of different classes of characters in password is.*/');
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The password doesn't match this account. Verify the password and try again.
+     */
+    public function testChangePasswordIfPasswordIsInvalid()
+    {
+        $customerEmail = 'customer@example.com';
+        $oldCustomerPassword = 'password';
+        $newCustomerPassword = 'anotherPassword1';
+        $incorrectPassword = 'password-incorrect';
+
+        $query = $this->getChangePassQuery($incorrectPassword, $newCustomerPassword);
+
+        $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword);
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    private function getChangePassQuery($currentPassword, $newPassword)
+    {
+        $query = <<<QUERY
+mutation {
+  changeCustomerPassword(
+    currentPassword: "$currentPassword",
+    newPassword: "$newPassword"
+  ) {
+    id
+    email
+    firstname
+    lastname
+  }
+}
+QUERY;
+
+        return $query;
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
new file mode 100644
index 0000000000000..602d969924fbd
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+class CreateCustomerAddressTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreateCustomerAddress()
+    {
+        $customerId = 1;
+        $newAddress = [
+            'region' => [
+                'region' => 'Arizona',
+                'region_id' => 4,
+                'region_code' => 'AZ'
+            ],
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => 'Adam',
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => true,
+            'default_billing' => false
+        ];
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  createCustomerAddress(input: {
+    region: {
+        region: "{$newAddress['region']['region']}"
+        region_id: {$newAddress['region']['region_id']}
+        region_code: "{$newAddress['region']['region_code']}"
+    }
+    country_id: {$newAddress['country_id']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
+    company: "{$newAddress['company']}"
+    telephone: "{$newAddress['telephone']}"
+    fax: "{$newAddress['fax']}"
+    postcode: "{$newAddress['postcode']}"
+    city: "{$newAddress['city']}"
+    firstname: "{$newAddress['firstname']}"
+    lastname: "{$newAddress['lastname']}"
+    middlename: "{$newAddress['middlename']}"
+    prefix: "{$newAddress['prefix']}"
+    suffix: "{$newAddress['suffix']}"
+    vat_id: "{$newAddress['vat_id']}"
+    default_shipping: true
+    default_billing: false
+  }) {
+    id
+    customer_id
+    region {
+      region
+      region_id
+      region_code
+    }
+    country_id
+    street
+    company
+    telephone
+    fax
+    postcode
+    city
+    firstname
+    lastname
+    middlename
+    prefix
+    suffix
+    vat_id
+    default_shipping
+    default_billing
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertArrayHasKey('createCustomerAddress', $response);
+        $this->assertArrayHasKey('customer_id', $response['createCustomerAddress']);
+        $this->assertEquals($customerId, $response['createCustomerAddress']['customer_id']);
+        $this->assertArrayHasKey('id', $response['createCustomerAddress']);
+
+        $address = $this->addressRepository->getById($response['createCustomerAddress']['id']);
+        $this->assertEquals($address->getId(), $response['createCustomerAddress']['id']);
+        $this->assertCustomerAddressesFields($address, $response['createCustomerAddress']);
+        $this->assertCustomerAddressesFields($address, $newAddress);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testCreateCustomerAddressIfUserIsNotAuthorized()
+    {
+        $mutation
+            = <<<MUTATION
+mutation{
+  createCustomerAddress(input: {
+    prefix: "Mr."
+    firstname: "John"
+    middlename: "A"
+    lastname: "Smith"
+    telephone: "123456789"
+    street: ["Line 1", "Line 2"]
+    city: "Test City"
+    region: {
+        region_id: 1
+    }
+    country_id: US
+    postcode: "9999"
+    default_shipping: true
+    default_billing: false
+  }) {
+    id
+  }
+}
+MUTATION;
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with valid credentials create new address
+     * with missing required Firstname attribute
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameters are missing: firstname
+     */
+    public function testCreateCustomerAddressWithMissingAttribute()
+    {
+        $mutation
+            = <<<MUTATION
+mutation {
+  createCustomerAddress(input: {
+    region: {
+        region_id: 1
+    }
+    country_id: US
+    street: ["Line 1 Street","Line 2"]
+    company: "Company name"
+    telephone: "123456789"
+    fax: "123123123"
+    postcode: "7777"
+    city: "City Name"
+    firstname: ""
+    lastname: "Phillis"
+  }) {
+    id
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * Verify the fields for Customer address
+     *
+     * @param AddressInterface $address
+     * @param array $actualResponse
+     */
+    private function assertCustomerAddressesFields(AddressInterface $address, array $actualResponse): void
+    {
+        /** @var  $addresses */
+        $assertionMap = [
+            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
+            ['response_field' => 'street', 'expected_value' => $address->getStreet()],
+            ['response_field' => 'company', 'expected_value' => $address->getCompany()],
+            ['response_field' => 'telephone', 'expected_value' => $address->getTelephone()],
+            ['response_field' => 'fax', 'expected_value' => $address->getFax()],
+            ['response_field' => 'postcode', 'expected_value' => $address->getPostcode()],
+            ['response_field' => 'city', 'expected_value' => $address->getCity()],
+            ['response_field' => 'firstname', 'expected_value' => $address->getFirstname()],
+            ['response_field' => 'lastname', 'expected_value' => $address->getLastname()],
+            ['response_field' => 'middlename', 'expected_value' => $address->getMiddlename()],
+            ['response_field' => 'prefix', 'expected_value' => $address->getPrefix()],
+            ['response_field' => 'suffix', 'expected_value' => $address->getSuffix()],
+            ['response_field' => 'vat_id', 'expected_value' => $address->getVatId()],
+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$address->isDefaultShipping()],
+            ['response_field' => 'default_billing', 'expected_value' => (bool)$address->isDefaultBilling()],
+        ];
+        $this->assertResponseFields($actualResponse, $assertionMap);
+        $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
+        $assertionRegionMap = [
+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+        ];
+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php
deleted file mode 100644
index 07bafa164f8ce..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\GraphQl\Customer;
-
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\TestFramework\ObjectManager;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-use \Magento\Integration\Api\CustomerTokenServiceInterface;
-
-class CustomerAuthenticationTest extends GraphQlAbstract
-{
-    /**
-     * Verify customers with valid credentials with a customer bearer token
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-
-    public function testRegisteredCustomerWithValidCredentials()
-    {
-        $query
-            = <<<QUERY
-{
-  customer 
-  {
-    created_at
-    group_id
-    prefix
-    firstname
-    middlename
-    lastname
-    suffix
-    email
-    default_billing
-    default_shipping
-    id
-      addresses{
-      id
-      customer_id
-      region_id
-      country_id
-      telephone
-      postcode
-      city      
-      firstname
-      lastname
-    }
-   }
-}
-QUERY;
-
-        $userName = 'customer@example.com';
-        $password = 'password';
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()
-                               ->get(\Magento\Integration\Api\CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $this->setToken($customerToken);
-
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get('customer@example.com');
-
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('customer', $response);
-        $this->assertArrayHasKey('addresses', $response['customer']);
-        $this->assertTrue(
-            is_array([$response['customer']['addresses']]),
-            " Addresses field must be of an array type."
-        );
-        $this->assertCustomerFields($customer, $response['customer']);
-        $this->assertCustomerAddressesFields($customer, $response);
-    }
-
-    /**
-     * Verify customer with valid credentials but without the bearer token
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-
-    public function testCustomerWithValidCredentialsWithoutToken()
-    {
-         $query
-           = <<<QUERY
-{
-  customer 
-  {
-    created_at
-    group_id
-    prefix
-    firstname
-    middlename
-    lastname
-    suffix
-    email
-    default_billing
-    default_shipping
-    id   
-   }
-}
-QUERY;
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors: Current customer' . ' ' .
-           'does not have access to the resource "customer"');
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * Veriy the all the whitelisted fields for a Customer Object
-     * @param CustomerInterface $customer
-     * @param  $actualResponse
-     */
-
-    public function assertCustomerFields($customer, $actualResponse)
-    {
-        /**
-         * ['customer_object_field_name', 'expected_value']
-         */
-        $assertionMap = [
-            ['response_field' => 'id', 'expected_value' => $customer->getId()],
-            ['response_field' => 'created_at', 'expected_value' => $customer->getCreatedAt()],
-            ['response_field' => 'group_id', 'expected_value' => $customer->getGroupId()],
-            ['response_field' => 'prefix', 'expected_value' => $customer->getPrefix()],
-            ['response_field' => 'firstname', 'expected_value' => $customer->getFirstname()],
-            ['response_field' => 'middlename', 'expected_value' => $customer->getMiddlename()],
-            ['response_field' => 'lastname', 'expected_value' => $customer->getLastname()],
-            ['response_field' => 'suffix', 'expected_value' => $customer->getSuffix()],
-            ['response_field' => 'email', 'expected_value' => $customer->getEmail()],
-            ['response_field' => 'default_shipping', 'expected_value' => (bool)$customer->getDefaultShipping()],
-            ['response_field' => 'default_billing', 'expected_value' => (bool)$customer->getDefaultBilling()],
-            ['response_field' => 'id', 'expected_value' => $customer->getId()]
-        ];
-
-        $this->assertResponseFields($actualResponse, $assertionMap);
-    }
-
-    /**
-     * Verify the fields for CustomerAddress object
-     * @param CustomerInterface $customer
-     * @param array $actualResponse
-     */
-
-    public function assertCustomerAddressesFields($customer, $actualResponse)
-    {
-        /** @var AddressInterface $addresses */
-        $addresses = $customer->getAddresses();
-        foreach ($addresses as $addressKey => $addressValue) {
-            $this->assertNotEmpty($addressValue);
-            $assertionMap = [
-                ['response_field' => 'id', 'expected_value' => $addresses[$addressKey]->getId()],
-                ['response_field' => 'customer_id', 'expected_value' => $addresses[$addressKey]->getCustomerId()],
-                ['response_field' => 'region_id', 'expected_value' => $addresses[$addressKey]->getRegionId()],
-                ['response_field' => 'country_id', 'expected_value' => $addresses[$addressKey]->getCountryId()],
-                ['response_field' => 'telephone', 'expected_value' => $addresses[$addressKey]->getTelephone()],
-                ['response_field' => 'postcode', 'expected_value' => $addresses[$addressKey]->getPostcode()],
-                ['response_field' => 'city', 'expected_value' => $addresses[$addressKey]->getCity()],
-                ['response_field' => 'firstname', 'expected_value' => $addresses[$addressKey]->getFirstname()],
-                ['response_field' => 'lastname', 'expected_value' => $addresses[$addressKey]->getLastname()]
-            ];
-            $this->assertResponseFields($actualResponse['customer']['addresses'][$addressKey], $assertionMap);
-        }
-    }
-
-    /**
-     * @param array $actualResponse
-     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
-     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
-     */
-    private function assertResponseFields($actualResponse, $assertionMap)
-    {
-        foreach ($assertionMap as $key => $assertionData) {
-            $expectedValue = isset($assertionData['expected_value'])
-                ? $assertionData['expected_value']
-                : $assertionData;
-            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
-            $this->assertNotNull(
-                $expectedValue,
-                "Value of '{$responseField}' field must not be NULL"
-            );
-            $this->assertEquals(
-                $expectedValue,
-                $actualResponse[$responseField],
-                "Value of '{$responseField}' field in response does not match expected value: "
-                . var_export($expectedValue, true)
-            );
-        }
-    }
-}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
new file mode 100644
index 0000000000000..ba0232020298f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+class DeleteCustomerAddressTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     */
+    public function testDeleteCustomerAddress()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 2;
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertArrayHasKey('deleteCustomerAddress', $response);
+        $this->assertEquals(true, $response['deleteCustomerAddress']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testDeleteCustomerAddressIfUserIsNotAuthorized()
+    {
+        $addressId = 1;
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Customer Address 2 is set as default shipping address and can not be deleted
+     */
+    public function testDeleteDefaultShippingCustomerAddress()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 2;
+
+        $address = $this->addressRepository->getById($addressId);
+        $address->setIsDefaultShipping(true);
+        $this->addressRepository->save($address);
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Customer Address 2 is set as default billing address and can not be deleted
+     */
+    public function testDeleteDefaultBillingCustomerAddress()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 2;
+
+        $address = $this->addressRepository->getById($addressId);
+        $address->setIsDefaultBilling(true);
+        $this->addressRepository->save($address);
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: {$addressId})
+}
+MUTATION;
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Address id 9999 does not exist.
+     */
+    public function testDeleteNonExistCustomerAddress()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $mutation
+            = <<<MUTATION
+mutation {
+  deleteCustomerAddress(id: 9999)
+}
+MUTATION;
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
new file mode 100644
index 0000000000000..ae28e23a28bf1
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use PHPUnit\Framework\TestResult;
+
+/**
+ * Class GenerateCustomerTokenTest
+ * @package Magento\GraphQl\Customer
+ */
+class GenerateCustomerTokenTest extends GraphQlAbstract
+{
+    /**
+     * Verify customer token with valid credentials
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGenerateCustomerValidToken()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        $mutation
+            = <<<MUTATION
+mutation {
+	generateCustomerToken(
+        email: "{$userName}"
+        password: "{$password}"
+    ) {
+        token
+    }
+}
+MUTATION;
+
+        $response = $this->graphQlQuery($mutation);
+        $this->assertArrayHasKey('generateCustomerToken', $response);
+        $this->assertInternalType('array', $response['generateCustomerToken']);
+    }
+
+    /**
+     * Verify customer with invalid credentials
+     */
+    public function testGenerateCustomerTokenWithInvalidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'bad-password';
+
+        $mutation
+            = <<<MUTATION
+mutation {
+	generateCustomerToken(
+        email: "{$userName}"
+        password: "{$password}"
+    ) {
+        token
+    }
+}
+MUTATION;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: The account sign-in' . ' ' .
+            'was incorrect or your account is disabled temporarily. Please wait and try again later.');
+        $this->graphQlQuery($mutation);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
new file mode 100644
index 0000000000000..53eb80335ff21
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+class GetAddressesTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     */
+    public function testGetCustomerWithAddresses()
+    {
+        $query
+            = <<<QUERY
+{
+  customer {
+    id
+    addresses {
+      id
+      customer_id
+      region_id
+      country_id
+      telephone
+      postcode
+      city      
+      firstname
+      lastname
+    }
+   }
+}
+QUERY;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()
+                               ->get(\Magento\Integration\Api\CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get('customer@example.com');
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayHasKey('customer', $response);
+        $this->assertArrayHasKey('addresses', $response['customer']);
+        $this->assertTrue(
+            is_array([$response['customer']['addresses']]),
+            " Addresses field must be of an array type."
+        );
+        self::assertEquals($customer->getId(), $response['customer']['id']);
+        $this->assertCustomerAddressesFields($customer, $response);
+    }
+
+    /**
+     * Verify the fields for CustomerAddress object
+     *
+     * @param CustomerInterface $customer
+     * @param array $actualResponse
+     */
+    public function assertCustomerAddressesFields($customer, $actualResponse)
+    {
+        /** @var AddressInterface $addresses */
+        $addresses = $customer->getAddresses();
+        foreach ($addresses as $addressKey => $addressValue) {
+            $this->assertNotEmpty($addressValue);
+            $assertionMap = [
+                ['response_field' => 'id', 'expected_value' => $addresses[$addressKey]->getId()],
+                ['response_field' => 'customer_id', 'expected_value' => $addresses[$addressKey]->getCustomerId()],
+                ['response_field' => 'region_id', 'expected_value' => $addresses[$addressKey]->getRegionId()],
+                ['response_field' => 'country_id', 'expected_value' => $addresses[$addressKey]->getCountryId()],
+                ['response_field' => 'telephone', 'expected_value' => $addresses[$addressKey]->getTelephone()],
+                ['response_field' => 'postcode', 'expected_value' => $addresses[$addressKey]->getPostcode()],
+                ['response_field' => 'city', 'expected_value' => $addresses[$addressKey]->getCity()],
+                ['response_field' => 'firstname', 'expected_value' => $addresses[$addressKey]->getFirstname()],
+                ['response_field' => 'lastname', 'expected_value' => $addresses[$addressKey]->getLastname()]
+            ];
+            $this->assertResponseFields($actualResponse['customer']['addresses'][$addressKey], $assertionMap);
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
new file mode 100644
index 0000000000000..928a263e8531b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Model\CustomerAuthUpdate;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class GetCustomerTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
+    /**
+     * @var CustomerAuthUpdate
+     */
+    private $customerAuthUpdate;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGetCustomer()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+
+        $this->assertEquals('John', $response['customer']['firstname']);
+        $this->assertEquals('Smith', $response['customer']['lastname']);
+        $this->assertEquals($currentEmail, $response['customer']['email']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testGetCustomerIfUserIsNotAuthorized()
+    {
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The account is locked.
+     */
+    public function testGetCustomerIfAccountIsLocked()
+    {
+        $this->lockCustomer(1);
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * @param int $customerId
+     * @return void
+     */
+    private function lockCustomer(int $customerId): void
+    {
+        $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
+        $this->customerAuthUpdate->saveAuth($customerId);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
new file mode 100644
index 0000000000000..9bdbf3059eeaf
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for revoke customer token mutation
+ */
+class RevokeCustomerTokenTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testRevokeCustomerTokenValidCredentials()
+    {
+        $query = <<<QUERY
+            mutation {
+                revokeCustomerToken {
+                    result
+                }
+            }
+QUERY;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertTrue($response['revokeCustomerToken']['result']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testRevokeCustomerTokenForGuestCustomer()
+    {
+        $query = <<<QUERY
+            mutation {
+                revokeCustomerToken {
+                    result
+                }
+            }
+QUERY;
+        $this->graphQlQuery($query, [], '');
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
new file mode 100644
index 0000000000000..191ea1ae6b877
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class SubscriptionStatusTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->subscriberFactory = Bootstrap::getObjectManager()->get(SubscriberFactory::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGetSubscriptionStatusTest()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+query {
+    customer {
+        is_subscribed
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->assertFalse($response['customer']['is_subscribed']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testGetSubscriptionStatusIfUserIsNotAuthorizedTest()
+    {
+        $query = <<<QUERY
+query {
+    customer {
+        is_subscribed
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testChangeSubscriptionStatusTest()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->assertTrue($response['updateCustomer']['customer']['is_subscribed']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testChangeSubscriptionStatuIfUserIsNotAuthorizedTest()
+    {
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $this->subscriberFactory->create()->loadByCustomerId(1)->delete();
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
new file mode 100644
index 0000000000000..519fe2b1405a0
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+class UpdateCustomerAddressTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testUpdateCustomerAddress()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $customerId = 1;
+        $addressId = 1;
+
+        $updateAddress = [
+            'region' => [
+                'region' => 'Alaska',
+                'region_id' => 2,
+                'region_code' => 'AK'
+            ],
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company Name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => 'Adam',
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => true,
+            'default_billing' => true
+        ];
+        $defaultShippingText = $updateAddress['default_shipping'] ? "true": "false";
+        $defaultBillingText = $updateAddress['default_billing'] ? "true": "false";
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  updateCustomerAddress(id: {$addressId}, input: {
+    region: {
+        region: "{$updateAddress['region']['region']}"
+        region_id: {$updateAddress['region']['region_id']}
+        region_code: "{$updateAddress['region']['region_code']}"
+    }
+    country_id: {$updateAddress['country_id']}
+    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
+    company: "{$updateAddress['company']}"
+    telephone: "{$updateAddress['telephone']}"
+    fax: "{$updateAddress['fax']}"
+    postcode: "{$updateAddress['postcode']}"
+    city: "{$updateAddress['city']}"
+    firstname: "{$updateAddress['firstname']}"
+    lastname: "{$updateAddress['lastname']}"
+    middlename: "{$updateAddress['middlename']}"
+    prefix: "{$updateAddress['prefix']}"
+    suffix: "{$updateAddress['suffix']}"
+    vat_id: "{$updateAddress['vat_id']}"
+    default_shipping: {$defaultShippingText}
+    default_billing: {$defaultBillingText}
+  }) {
+    id
+    customer_id
+    region {
+      region
+      region_id
+      region_code
+    }
+    country_id
+    street
+    company
+    telephone
+    fax
+    postcode
+    city
+    firstname
+    lastname
+    middlename
+    prefix
+    suffix
+    vat_id
+    default_shipping
+    default_billing
+  }
+}
+MUTATION;
+
+        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertArrayHasKey('updateCustomerAddress', $response);
+        $this->assertArrayHasKey('customer_id', $response['updateCustomerAddress']);
+        $this->assertEquals($customerId, $response['updateCustomerAddress']['customer_id']);
+        $this->assertArrayHasKey('id', $response['updateCustomerAddress']);
+
+        $address = $this->addressRepository->getById($addressId);
+        $this->assertEquals($address->getId(), $response['updateCustomerAddress']['id']);
+        $this->assertCustomerAddressesFields($address, $response['updateCustomerAddress']);
+        $this->assertCustomerAddressesFields($address, $updateAddress);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testUpdateCustomerAddressIfUserIsNotAuthorized()
+    {
+        $addressId = 1;
+        $mutation
+            = <<<MUTATION
+mutation {
+  updateCustomerAddress(id:{$addressId}, input: {
+    city: "New City"
+    postcode: "5555"
+  }) {
+    id
+  }
+}
+MUTATION;
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with credentials update address
+     * with missing required Firstname attribute
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameters are missing: firstname
+     */
+    public function testUpdateCustomerAddressWithMissingAttribute()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 1;
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  updateCustomerAddress(id: {$addressId}, input: {
+    firstname: ""
+    lastname: "Phillis"
+  }) {
+    id
+  }
+}
+MUTATION;
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * Verify the fields for Customer address
+     *
+     * @param AddressInterface $address
+     * @param array $actualResponse
+     */
+    private function assertCustomerAddressesFields(AddressInterface $address, $actualResponse): void
+    {
+        /** @var  $addresses */
+        $assertionMap = [
+            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
+            ['response_field' => 'street', 'expected_value' => $address->getStreet()],
+            ['response_field' => 'company', 'expected_value' => $address->getCompany()],
+            ['response_field' => 'telephone', 'expected_value' => $address->getTelephone()],
+            ['response_field' => 'fax', 'expected_value' => $address->getFax()],
+            ['response_field' => 'postcode', 'expected_value' => $address->getPostcode()],
+            ['response_field' => 'city', 'expected_value' => $address->getCity()],
+            ['response_field' => 'firstname', 'expected_value' => $address->getFirstname()],
+            ['response_field' => 'lastname', 'expected_value' => $address->getLastname()],
+            ['response_field' => 'middlename', 'expected_value' => $address->getMiddlename()],
+            ['response_field' => 'prefix', 'expected_value' => $address->getPrefix()],
+            ['response_field' => 'suffix', 'expected_value' => $address->getSuffix()],
+            ['response_field' => 'vat_id', 'expected_value' => $address->getVatId()],
+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$address->isDefaultShipping()],
+            ['response_field' => 'default_billing', 'expected_value' => (bool)$address->isDefaultBilling()],
+        ];
+        $this->assertResponseFields($actualResponse, $assertionMap);
+        $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
+        // https://github.com/magento/graphql-ce/issues/270
+//        $assertionRegionMap = [
+//            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+//            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+//            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+//        ];
+//        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
new file mode 100644
index 0000000000000..c11c1385f7412
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Model\CustomerAuthUpdate;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class UpdateCustomerTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
+    /**
+     * @var CustomerAuthUpdate
+     */
+    private $customerAuthUpdate;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomer()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $newEmail = 'customer_updated@example.com';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+            password: "{$currentPassword}"
+        }
+    ) {
+        customer {
+            firstname
+            lastname
+            email
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+
+        $this->assertEquals($newFirstname, $response['updateCustomer']['customer']['firstname']);
+        $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']);
+        $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage "input" value should be specified
+     */
+    public function testUpdateCustomerIfInputDataIsEmpty()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testUpdateCustomerIfUserIsNotAuthorized()
+    {
+        $newFirstname = 'Richard';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The account is locked.
+     */
+    public function testUpdateCustomerIfAccountIsLocked()
+    {
+        $this->lockCustomer(1);
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $newFirstname = 'Richard';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Provide the current "password" to change "email".
+     */
+    public function testUpdateEmailIfPasswordIsMissed()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $newEmail = 'customer_updated@example.com';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            email: "{$newEmail}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The password doesn't match this account. Verify the password and try again.
+     */
+    public function testUpdateEmailIfPasswordIsInvalid()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $invalidPassword = 'invalid_password';
+        $newEmail = 'customer_updated@example.com';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            email: "{$newEmail}"
+            password: "{$invalidPassword}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage A customer with the same email address already exists in an associated website.
+     */
+    public function testUpdateEmailIfEmailAlreadyExists()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $existedEmail = 'customer_two@example.com';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            email: "{$existedEmail}"
+            password: "{$currentPassword}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * @param int $customerId
+     * @return void
+     */
+    private function lockCustomer(int $customerId): void
+    {
+        $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
+        $this->customerAuthUpdate->saveAuth($customerId);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
new file mode 100644
index 0000000000000..a7902db259bc3
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\DownloadableProduct;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Downloadable\Api\Data\SampleInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class DownloadableProductViewTest extends GraphQlAbstract
+{
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @magentoApiDataFixture Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
+     */
+    public function testQueryAllFieldsDownloadableProductsWithDownloadableFileAndSample()
+    {
+        $productSku = 'downloadable-product';
+        $query = <<<QUERY
+{
+  products(filter:{sku: {eq:"{$productSku}"}})
+  {
+       items{
+           id
+           attribute_set_id    
+           created_at
+           name
+           sku
+           type_id        
+           updated_at
+        price{
+        regularPrice{
+          amount{
+            value
+            currency
+          }
+          adjustments{
+            code
+            description
+          }
+        }
+      }          
+           ... on DownloadableProduct {
+            links_title
+            links_purchased_separately
+            
+            downloadable_product_links{
+              id
+              sample_url
+              sample_type
+              
+              is_shareable
+              number_of_downloads
+              sort_order
+              title
+              link_type
+              
+              price              
+            }
+            downloadable_product_samples{
+              title
+              sort_order
+              sort_order
+              sample_type
+              sample_file
+            }
+           }
+       }
+   }
+}
+QUERY;
+
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
+        $config->saveConfig(
+            \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
+            0,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
+        $response = $this->graphQlQuery($query);
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $downloadableProduct = $productRepository->get($productSku, false, null, true);
+        $this->assertNull($downloadableProduct->getWeight());
+        $IsLinksPurchasedSeparately = $downloadableProduct->getLinksPurchasedSeparately();
+        $linksTitle = $downloadableProduct->getLinksTitle();
+        $this->assertEquals(
+            $IsLinksPurchasedSeparately,
+            $response['products']['items'][0]['links_purchased_separately']
+        );
+        $this->assertEquals($linksTitle, $response['products']['items'][0]['links_title']);
+        $this->assertDownloadableProductLinks($downloadableProduct, $response['products']['items'][0]);
+        $this->assertDownloadableProductSamples($downloadableProduct, $response['products']['items'][0]);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDownloadableProductQueryWithNoSample()
+    {
+        $productSku = 'downloadable-product';
+        $query = <<<QUERY
+{
+  products(filter:{sku: {eq:"{$productSku}"}})
+  {
+       items{
+           id
+           attribute_set_id
+           created_at
+           name
+           sku
+           type_id
+           updated_at
+           ...on PhysicalProductInterface{
+          weight
+          }
+        price{
+        regularPrice{
+          amount{
+            value
+            currency
+          }
+          adjustments{
+            code
+            description
+          }
+        }
+      }
+           ... on DownloadableProduct {
+            links_title
+            links_purchased_separately
+
+            downloadable_product_links{
+              id
+              sample_url
+              sample_type
+              is_shareable
+              number_of_downloads
+              sort_order
+              title
+              link_type
+              price
+            }
+            downloadable_product_samples{
+              title
+              sort_order
+              sort_order
+              sample_type
+              sample_file
+            }
+           }
+       }
+   }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $downloadableProduct = $productRepository->get($productSku, false, null, true);
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
+        $config->saveConfig(
+            \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
+            0,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            1
+        );
+        $IsLinksPurchasedSeparately = $downloadableProduct->getLinksPurchasedSeparately();
+        $linksTitle = $downloadableProduct->getLinksTitle();
+        $this->assertEquals(
+            $IsLinksPurchasedSeparately,
+            $response['products']['items'][0]['links_purchased_separately']
+        );
+        $this->assertEquals($linksTitle, $response['products']['items'][0]['links_title']);
+        $this->assertEmpty($response['products']['items'][0]['downloadable_product_samples']);
+        $this->assertNotEmpty(
+            $response['products']['items'][0]['downloadable_product_links'],
+            "Precondition failed: 'downloadable_product_links' must not be empty"
+        );
+        /** @var LinkInterface $downloadableProductLinks */
+        $downloadableProductLinks = $downloadableProduct->getExtensionAttributes()->getDownloadableProductLinks();
+        $downloadableProductLink = $downloadableProductLinks[0];
+        $this->assertResponseFields(
+            $response['products']['items'][0]['downloadable_product_links'][0],
+            [
+                'id' => $downloadableProductLink->getId(),
+                'is_shareable' => false,
+                'number_of_downloads' => $downloadableProductLink->getNumberOfDownloads(),
+                'sort_order' => $downloadableProductLink->getSortOrder(),
+                'title' => $downloadableProductLink->getTitle(),
+                'link_type' => strtoupper($downloadableProductLink->getLinkType()),
+                'price' => $downloadableProductLink->getPrice()
+            ]
+        );
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param  array $actualResponse
+     */
+    private function assertDownloadableProductLinks($product, $actualResponse)
+    {
+        $this->assertNotEmpty(
+            $actualResponse['downloadable_product_links'],
+            "Precondition failed: 'downloadable_product_links' must not be empty"
+        );
+        /** @var LinkInterface $downloadableProductLinks */
+        $downloadableProductLinks = $product->getExtensionAttributes()->getDownloadableProductLinks();
+        $downloadableProductLink = $downloadableProductLinks[1];
+
+        $this->assertResponseFields(
+            $actualResponse['downloadable_product_links'][1],
+            [
+                'id' => $downloadableProductLink->getId(),
+                'sample_url' => $downloadableProductLink->getSampleUrl(),
+                'sample_type' => strtoupper($downloadableProductLink->getSampleType()),
+                'is_shareable' => false,
+                'number_of_downloads' => $downloadableProductLink->getNumberOfDownloads(),
+                'sort_order' => $downloadableProductLink->getSortOrder(),
+                'title' => $downloadableProductLink->getTitle(),
+                'link_type' => strtoupper($downloadableProductLink->getLinkType()),
+                'price' => $downloadableProductLink->getPrice()
+            ]
+        );
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param $actualResponse
+     */
+    private function assertDownloadableProductSamples($product, $actualResponse)
+    {
+        $this->assertNotEmpty(
+            $actualResponse['downloadable_product_samples'],
+            "Precondition failed: 'downloadable_product_samples' must not be empty"
+        );
+        /** @var SampleInterface $downloadableProductSamples */
+        $downloadableProductSamples = $product->getExtensionAttributes()->getDownloadableProductSamples();
+        $downloadableProductSample = $downloadableProductSamples[0];
+        $this->assertResponseFields(
+            $actualResponse['downloadable_product_samples'][0],
+            [
+                'title' => $downloadableProductSample->getTitle(),
+                'sort_order' =>$downloadableProductSample->getSortOrder(),
+                'sample_type' => strtoupper($downloadableProductSample->getSampleType()),
+                'sample_file' => $downloadableProductSample->getSampleFile()
+            ]
+        );
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
new file mode 100644
index 0000000000000..352947714360a
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
@@ -0,0 +1,465 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Framework;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Tests query complexity limiter and depth limiter.
+ * Actual for production mode only
+ */
+class QueryComplexityLimiterTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testQueryComplexityIsLimited()
+    {
+        $query
+            = <<<QUERY
+{
+  category(id: 2) {
+    products {
+      items {
+        name
+        categories {
+          id
+          position
+          level
+          url_key
+          url_path
+          product_count
+          breadcrumbs {
+            category_id
+            category_name
+            category_url_key
+          }
+          products {
+            items {
+              media_gallery_entries {
+                file
+              }
+              name
+              special_from_date
+              special_to_date
+              new_to_date
+              new_from_date
+              tier_price
+              manufacturer
+              thumbnail {
+                url
+                label
+              }
+              sku
+              image {
+                url
+                label
+              }
+              canonical_url
+              updated_at
+              created_at
+              categories {
+                id
+                position
+                level
+                url_key
+                url_path
+                product_count
+                breadcrumbs {
+                  category_id
+                  category_name
+                  category_url_key
+                }
+                products {
+                  items {
+                    name
+                    special_from_date
+                    special_to_date
+                    new_to_date
+                    thumbnail {
+                      url
+                      label
+                    }
+                    new_from_date
+                    tier_price
+                    manufacturer
+                    sku
+                    image {
+                      url
+                      label
+                    }
+                    canonical_url
+                    updated_at
+                    created_at
+                    media_gallery_entries {
+                      position
+                      id
+                      types
+                    }
+                    categories {
+                      id
+                      position
+                      level
+                      url_key
+                      url_path
+                      product_count
+                      breadcrumbs {
+                        category_id
+                        category_name
+                        category_url_key
+                      }
+                      products {
+                        items {
+                          name
+                          special_from_date
+                          special_to_date
+                          new_to_date
+                          new_from_date
+                          tier_price
+                          manufacturer
+                          thumbnail {
+                            url
+                            label
+                          }
+                          sku
+                          image {
+                            url
+                            label
+                          }
+                          canonical_url
+                          updated_at
+                          created_at
+                          categories {
+                            id
+                            position
+                            level
+                            url_key
+                            url_path
+                            product_count
+                            breadcrumbs {
+                              category_id
+                              category_name
+                              category_url_key
+                            }
+                            products {
+                              items {
+                                name
+                                special_from_date
+                                special_to_date
+                                new_to_date
+                                new_from_date
+                                tier_price
+                                manufacturer
+                                sku
+                                image {
+                                  url
+                                  label
+                                }
+                                canonical_url
+                                updated_at
+                                created_at
+                                categories {
+                                  id
+                                  position
+                                  level
+                                  url_key
+                                  url_path
+                                  product_count
+                                  breadcrumbs {
+                                    category_id
+                                    category_name
+                                    category_url_key
+                                  }
+                                  products {
+                                    items {
+                                      name
+                                      special_from_date
+                                      special_to_date
+                                      price {
+                                        minimalPrice {
+                                          amount {
+                                            value
+                                            currency
+                                          }
+                                        }
+                                        maximalPrice {
+                                          amount {
+                                            value
+                                            currency
+                                          }
+                                        }
+                                        regularPrice {
+                                          amount {
+                                            value
+                                            currency
+                                          }
+                                        }
+                                      }
+                                      tier_price
+                                      special_price
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      tier_prices {
+                                        customer_group_id
+                                        qty
+                                        percentage_value
+                                        website_id
+                                      }
+                                      new_to_date
+                                      new_from_date
+                                      tier_price
+                                      manufacturer
+                                      sku
+                                      image {
+                                        url
+                                        label
+                                      }
+                                      thumbnail {
+                                        url
+                                        label
+                                      }
+                                      canonical_url
+                                      updated_at
+                                      created_at
+                                      categories {
+                                        id
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        position
+                                        level
+                                        url_key
+                                        url_path
+                                        product_count
+                                        default_sort_by
+                                        breadcrumbs {
+                                          category_id
+                                          category_name
+                                          category_url_key
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessageRegExp('/Max query complexity should be 300 but got 302/');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testQueryDepthIsLimited()
+    {
+        $query
+            = <<<QUERY
+{
+  category(id: 2) {
+    products {
+      items {
+        name
+        categories {
+          products {
+            items {
+              media_gallery_entries {
+                file
+              }
+              categories {
+                products {
+                  items {
+                    categories {
+                      products {
+                        items {
+                          categories {
+                            products {
+                              items {
+                                categories {
+                                  products {
+                                    items {
+                                      categories {
+                                        products {
+                                          items {
+                                            categories {
+                                              products {
+                                                items {
+                                                  name
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessageRegExp('/Max query depth should be 20 but got 23/');
+        $this->graphQlQuery($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
new file mode 100644
index 0000000000000..cbd91f6fbdb37
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\GroupedProduct;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class GroupedProductViewTest extends GraphQlAbstract
+{
+
+    /**
+     * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped.php
+     */
+    public function testAllFieldsGroupedProduct()
+    {
+        $productSku = 'grouped-product';
+        $query
+            = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {    
+      id
+      attribute_set_id
+      created_at
+      name
+      sku
+      type_id     
+      ... on GroupedProduct {
+        items{
+          qty
+          position
+          product{
+            sku
+            name
+            type_id
+            url_key            
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $groupedProduct = $productRepository->get($productSku, false, null, true);
+
+        $this->assertGroupedProductItems($groupedProduct, $response['products']['items'][0]);
+    }
+
+    private function assertGroupedProductItems($product, $actualResponse)
+    {
+        $this->assertNotEmpty(
+            $actualResponse['items'],
+            "Precondition failed: 'grouped product items' must not be empty"
+        );
+        $this->assertEquals(2, count($actualResponse['items']));
+        $groupedProductLinks = $product->getProductLinks();
+        foreach ($actualResponse['items'] as $itemIndex => $bundleItems) {
+            $this->assertNotEmpty($bundleItems);
+            $associatedProductSku = $groupedProductLinks[$itemIndex]->getLinkedProductSku();
+
+            $productsRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+            /** @var \Magento\Catalog\Model\Product $associatedProduct */
+            $associatedProduct = $productsRepository->get($associatedProductSku);
+
+            $this->assertEquals(
+                $groupedProductLinks[$itemIndex]->getExtensionAttributes()->getQty(),
+                $actualResponse['items'][$itemIndex]['qty']
+            );
+            $this->assertEquals(
+                $groupedProductLinks[$itemIndex]->getPosition(),
+                $actualResponse['items'][$itemIndex]['position']
+            );
+            $this->assertResponseFields(
+                $actualResponse['items'][$itemIndex]['product'],
+                [
+                  'sku' => $associatedProductSku,
+                  'type_id' => $groupedProductLinks[$itemIndex]->getLinkedProductType(),
+                  'url_key'=> $associatedProduct->getUrlKey(),
+                  'name' => $associatedProduct->getName()
+
+                ]
+            );
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
new file mode 100644
index 0000000000000..85b4c62c41945
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class IntrospectionQueryTest extends GraphQlAbstract
+{
+    /**
+     * Tests that Introspection is disabled when not in developer mode
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectionQueryWithFieldArgs()
+    {
+        $query
+            = <<<QUERY
+query IntrospectionQuery {
+  __schema {
+    queryType { name }
+    types{
+      ...FullType
+    }
+    }
+  }
+fragment FullType on __Type{
+  name
+  kind
+  fields(includeDeprecated:true){
+    name
+    args{
+      ...InputValue
+    }
+         }
+    }
+    
+fragment TypeRef on __Type {
+  kind
+  name
+  ofType{
+    kind
+    name
+  }
+}
+fragment InputValue on __InputValue {
+  name
+  description
+  type { ...TypeRef }
+  defaultValue
+}
+QUERY;
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'GraphQL response contains errors: GraphQL introspection is not allowed, but ' .
+            'the query contained __schema or __type'
+        );
+        $this->graphQlQuery($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
new file mode 100644
index 0000000000000..1f8ad06a9f8ed
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for adding/removing shopping cart coupon codes
+ */
+class CouponTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponToGuestCartWithItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey("applyCouponToCart", $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponTwice()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey("applyCouponToCart", $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+        self::expectExceptionMessage('A coupon is already applied to the cart. Please remove it to apply another');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponToCartWithNoItems()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/191');
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessageRegExp('/Cart doesn\'t contain products/');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGuestCustomerAttemptToChangeCustomerCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCoupon()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Apply coupon to the quote */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query);
+
+        /* Remove coupon from quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertSame('', $response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testRemoveCouponFromCustomerCartByGuest()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function prepareRemoveCouponRequestQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {
+  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CreateEmptyCartTest.php
new file mode 100644
index 0000000000000..6e819b523ec82
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CreateEmptyCartTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Api\GuestCartRepositoryInterface;
+
+/**
+ * Test for empty cart creation mutation
+ */
+class CreateEmptyCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteIdMask
+     */
+    private $quoteIdMask;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var GuestCartRepositoryInterface
+     */
+    private $guestCartRepository;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->quoteIdMask = $this->objectManager->create(QuoteIdMask::class);
+        $this->guestCartRepository = $this->objectManager->create(GuestCartRepositoryInterface::class);
+    }
+
+    public function testCreateEmptyCartForGuest()
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('createEmptyCart', $response);
+
+        $maskedCartId = $response['createEmptyCart'];
+        /** @var CartInterface $guestCart */
+        $guestCart = $this->guestCartRepository->get($maskedCartId);
+
+        self::assertNotNull($guestCart->getId());
+        self::assertNull($guestCart->getCustomer()->getId());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testCreateEmptyCartForRegisteredCustomer()
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+
+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(
+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
+        );
+        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('createEmptyCart', $response);
+
+        $maskedCartId = $response['createEmptyCart'];
+        /* guestCartRepository is used for registered customer to get the cart hash */
+        $guestCart = $this->guestCartRepository->get($maskedCartId);
+
+        self::assertNotNull($guestCart->getId());
+        self::assertEquals(1, $guestCart->getCustomer()->getId());
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
new file mode 100644
index 0000000000000..a023d37895c23
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
@@ -0,0 +1,469 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Test for set shipping addresses on cart mutation
+ */
+class SetShippingAddressOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetNewGuestShippingAddressOnCart()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['addresses']);
+        $this->assertNewShippingAddressFields($shippingAddressResponse);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetSavedShippingAddressOnCartByGuest()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage('The current customer isn\'t authorized.');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetMultipleShippingAddressesOnCartByGuest()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        },
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage('You cannot specify multiple shipping addresses.');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetSavedAndNewShippingAddressOnCartAtTheSameTime()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1,
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage(
+            'The shipping address cannot contain "customer_address_id" and "address" at the same time.'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetShippingAddressOnCartWithNoAddresses()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {}
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage(
+            'The shipping address must contain either "customer_address_id" or "address".'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testSetNewRegisteredCustomerShippingAddressOnCart()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        $headerMap = $this->getHeaderMap();
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['addresses']);
+        $this->assertNewShippingAddressFields($shippingAddressResponse);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     */
+    public function testSetSavedRegisteredCustomerShippingAddressOnCart()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        $headerMap = $this->getHeaderMap();
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['addresses']);
+        $this->assertSavedShippingAddressFields($shippingAddressResponse);
+    }
+
+    /**
+     * Verify the all the whitelisted fields for a New Address Object
+     *
+     * @param array $shippingAddressResponse
+     */
+    private function assertNewShippingAddressFields(array $shippingAddressResponse): void
+    {
+        $assertionMap = [
+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
+            ['response_field' => 'company', 'expected_value' => 'test company'],
+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
+            ['response_field' => 'city', 'expected_value' => 'test city'],
+            ['response_field' => 'postcode', 'expected_value' => '887766'],
+            ['response_field' => 'telephone', 'expected_value' => '88776655']
+        ];
+
+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
+    }
+
+    /**
+     * Verify the all the whitelisted fields for a Address Object
+     *
+     * @param array $shippingAddressResponse
+     */
+    private function assertSavedShippingAddressFields(array $shippingAddressResponse): void
+    {
+        $assertionMap = [
+            ['response_field' => 'firstname', 'expected_value' => 'John'],
+            ['response_field' => 'lastname', 'expected_value' => 'Smith'],
+            ['response_field' => 'company', 'expected_value' => 'CompanyName'],
+            ['response_field' => 'street', 'expected_value' => [0 => 'Green str, 67']],
+            ['response_field' => 'city', 'expected_value' => 'CityM'],
+            ['response_field' => 'postcode', 'expected_value' => '75477'],
+            ['response_field' => 'telephone', 'expected_value' => '3468676']
+        ];
+
+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
+    }
+
+    /**
+     * @param string $username
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com'): array
+    {
+        $password = 'password';
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()
+            ->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingMethodOnCartTest.php
new file mode 100644
index 0000000000000..7e77284c6b220
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingMethodOnCartTest.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting shipping methods on cart
+ */
+class SetShippingMethodOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testSetShippingMethodOnCart()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertEquals($maskedQuoteId, $response['setShippingMethodsOnCart']['cart']['cart_id']);
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['addresses'];
+        self::assertCount(2, $addressesInformation);
+        self::assertEquals(
+            $addressesInformation[0]['selected_shipping_method']['code'],
+            $shippingCarrierCode . '_' . $shippingMethodCode
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testSetShippingMethodWithWrongCartId()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $shippingAddressId = '1';
+        $maskedQuoteId = 'invalid';
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage("Could not find a cart with ID \"$maskedQuoteId\"");
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testSetNonExistingShippingMethod()
+    {
+        $shippingCarrierCode = 'non';
+        $shippingMethodCode = 'existing';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage("Carrier with such method not found: $shippingCarrierCode, $shippingMethodCode");
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testSetShippingMethodWithNonExistingAddress()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $shippingAddressId = '-20';
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage('The shipping address is missing. Set the address and try again.');
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testSetShippingMethodByGuestToCustomerCart()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Generates query for setting the specified shipping method on cart
+     *
+     * @param string $maskedQuoteId
+     * @param string $shippingMethodCode
+     * @param string $shippingCarrierCode
+     * @param string $shippingAddressId
+     * @return string
+     */
+    private function prepareMutationQuery(
+        string $maskedQuoteId,
+        string $shippingMethodCode,
+        string $shippingCarrierCode,
+        string $shippingAddressId
+    ) : string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [
+        {
+          shipping_method_code: "$shippingMethodCode"
+          shipping_carrier_code: "$shippingCarrierCode"
+          cart_address_id: $shippingAddressId
+        }
+      ]}) {
+    
+    cart {
+      cart_id,
+      addresses {
+        selected_shipping_method {
+          code
+          label
+        }
+      }
+    }
+  }
+}
+
+QUERY;
+    }
+
+    /**
+     * Sends a GraphQL request with using a bearer token
+     *
+     * @param string $query
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function sendRequestWithToken(string $query): array
+    {
+
+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+
+        return $this->graphQlQuery($query, [], '', $headerMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
new file mode 100644
index 0000000000000..589b0bc7746f8
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Sales;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class OrdersTest
+ */
+class OrdersTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Sales/_files/orders_with_customer.php
+     */
+    public function testOrdersQuery()
+    {
+        $query =
+            <<<QUERY
+query {
+  customerOrders {
+    items {
+      id
+      increment_id
+      created_at
+      grand_total
+      status
+    }
+  }
+}
+QUERY;
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+
+        $expectedData = [
+            [
+                'increment_id' => '100000002',
+                'status' => 'processing',
+                'grand_total' => 120.00
+            ],
+            [
+                'increment_id' => '100000003',
+                'status' => 'processing',
+                'grand_total' => 130.00
+            ],
+            [
+                'increment_id' => '100000004',
+                'status' => 'closed',
+                'grand_total' => 140.00
+            ],
+            [
+                'increment_id' => '100000005',
+                'status' => 'complete',
+                'grand_total' => 150.00
+            ],
+            [
+                'increment_id' => '100000006',
+                'status' => 'complete',
+                'grand_total' => 160.00
+            ]
+        ];
+
+        $actualData = $response['customerOrders']['items'];
+
+        foreach ($expectedData as $key => $data) {
+            $this->assertEquals($data['increment_id'], $actualData[$key]['increment_id']);
+            $this->assertEquals($data['grand_total'], $actualData[$key]['grand_total']);
+            $this->assertEquals($data['status'], $actualData[$key]['status']);
+        }
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
new file mode 100644
index 0000000000000..a536022e31631
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Store;
+
+use Magento\Store\Api\Data\StoreConfigInterface;
+use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test the GraphQL endpoint's StoreConfigs query
+ */
+class StoreConfigResolverTest extends GraphQlAbstract
+{
+
+    /** @var  ObjectManager */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     */
+    public function testGetStoreConfig()
+    {
+        /** @var  StoreConfigManagerInterface $storeConfigsManager */
+        $storeConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        /** @var StoreResolverInterface $storeResolver */
+        $storeResolver = $this->objectManager->get(StoreResolverInterface::class);
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        $storeId = $storeResolver->getCurrentStoreId();
+        $store = $storeRepository->getById($storeId);
+        /** @var StoreConfigInterface $storeConfig */
+        $storeConfig = current($storeConfigsManager->getStoreConfigs([$store->getCode()]));
+        $query
+            = <<<QUERY
+{
+  storeConfig{
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('storeConfig', $response);
+        $this->assertEquals($storeConfig->getId(), $response['storeConfig']['id']);
+        $this->assertEquals($storeConfig->getCode(), $response['storeConfig']['code']);
+        $this->assertEquals($storeConfig->getLocale(), $response['storeConfig']['locale']);
+        $this->assertEquals($storeConfig->getBaseCurrencyCode(), $response['storeConfig']['base_currency_code']);
+        $this->assertEquals(
+            $storeConfig->getDefaultDisplayCurrencyCode(),
+            $response['storeConfig']['default_display_currency_code']
+        );
+        $this->assertEquals($storeConfig->getTimezone(), $response['storeConfig']['timezone']);
+        $this->assertEquals($storeConfig->getWeightUnit(), $response['storeConfig']['weight_unit']);
+        $this->assertEquals($storeConfig->getBaseUrl(), $response['storeConfig']['base_url']);
+        $this->assertEquals($storeConfig->getBaseLinkUrl(), $response['storeConfig']['base_link_url']);
+        $this->assertEquals($storeConfig->getBaseStaticUrl(), $response['storeConfig']['base_static_url']);
+        $this->assertEquals($storeConfig->getBaseMediaUrl(), $response['storeConfig']['base_media_url']);
+        $this->assertEquals($storeConfig->getSecureBaseUrl(), $response['storeConfig']['secure_base_url']);
+        $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $response['storeConfig']['secure_base_link_url']);
+        $this->assertEquals(
+            $storeConfig->getSecureBaseStaticUrl(),
+            $response['storeConfig']['secure_base_static_url']
+        );
+        $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSearchTest.php
new file mode 100644
index 0000000000000..f0397c51c4660
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSearchTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Swatches;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test layered navigation filter.
+ *
+ * @package Magento\GraphQl\Swatches
+ */
+class ProductSearchTest extends GraphQlAbstract
+{
+    /**
+     * Verify that layered navigation filters are returned for product query
+     *
+     * @magentoApiDataFixture Magento/Swatches/_files/products_with_layered_navigation_swatch.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testFilterLn()
+    {
+        $query = <<<QUERY
+{
+    products (
+        filter:{
+            sku:{
+                like:"%simple%"
+            }
+        }
+        pageSize: 4
+        currentPage: 1
+        sort: {
+            name: DESC
+        }
+    )
+    {
+        items {
+            sku
+        }
+        filters {
+            name
+            filter_items_count
+            request_var
+            filter_items {
+                label
+                value_string
+                items_count
+                ... on SwatchLayerFilterItemInterface {
+                    swatch_data {
+                        type
+                        value
+                    }
+                }
+            }
+        }
+    }
+}
+QUERY;
+        /**
+         * @var ProductRepositoryInterface $productRepository
+         */
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(
+            'filters',
+            $response['products'],
+            'Filters are missing in product query result.'
+        );
+        $this->assertFilters(
+            $response,
+            $this->getExpectedFiltersDataSet(),
+            'Returned filters data set does not match the expected value'
+        );
+    }
+
+    /**
+     * Get array with expected data for layered navigation filters
+     *
+     * @return array
+     */
+    private function getExpectedFiltersDataSet()
+    {
+        /** @var \Magento\Eav\Model\Config $eavConfig */
+        $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+        $attribute = $eavConfig->getAttribute('catalog_product', 'color_swatch');
+        /** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $options */
+        $options = $attribute->getOptions();
+        // Fetching option ID is required for continuous debug as of autoincrement IDs.
+        return [
+            [
+                'name' => 'Category',
+                'filter_items_count' => 1,
+                'request_var' => 'cat',
+                'filter_items' => [
+                    [
+                        'label' => 'Category 1',
+                        'value_string' => '333',
+                        'items_count' => 3,
+                    ],
+                ],
+            ],
+            [
+                'name' => 'Test Swatch',
+                'filter_items_count' => 1,
+                'request_var' => 'color_swatch',
+                'filter_items' => [
+                    [
+                        'label' => 'option 1',
+                        'value_string' => $options[1]->getValue(),
+                        'items_count' => 2,
+                        'swatch_data' => [
+                            'type' => '1',
+                            'value' => '#555555',
+                        ],
+                    ],
+                ],
+             ],
+            [
+                'name' => 'Price',
+                'filter_items_count' => 3,
+                'request_var' => 'price',
+                'filter_items' => [
+                    [
+                        'label' => '<span class="price">$0.00</span> - <span class="price">$9.99</span>',
+                        'value_string' => '-10',
+                        'items_count' => 1,
+                    ],
+                    [
+                        'label' => '<span class="price">$10.00</span> - <span class="price">$19.99</span>',
+                        'value_string' => '10-20',
+                        'items_count' => 1,
+                    ],
+                    [
+                        'label' => '<span class="price">$20.00</span> and above',
+                        'value_string' => '20-',
+                        'items_count' => 1,
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Assert filters data.
+     *
+     * @param array $response
+     * @param array $expectedFilters
+     * @param string $message
+     */
+    private function assertFilters($response, $expectedFilters, $message = '')
+    {
+        $this->assertArrayHasKey('filters', $response['products'], 'Product has filters');
+        $this->assertTrue(is_array(($response['products']['filters'])), 'Product filters is array');
+        $this->assertTrue(count($response['products']['filters']) > 0, 'Product filters is not empty');
+        foreach ($expectedFilters as $expectedFilter) {
+            $found = false;
+            foreach ($response['products']['filters'] as $responseFilter) {
+                if ($responseFilter['name'] == $expectedFilter['name']
+                    && $responseFilter['request_var'] == $expectedFilter['request_var']) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
+                $this->fail($message);
+            }
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
new file mode 100644
index 0000000000000..dfbe943ecdcd9
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
@@ -0,0 +1,328 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Tax;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Tax\Model\Config;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class ProductViewTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /** @var \Magento\Tax\Model\Calculation\Rate[] */
+    private $fixtureTaxRates;
+
+    /** @var \Magento\Tax\Model\Calculation\Rule[] */
+    private $fixtureTaxRules;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = $this->objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+
+        //default state tax calculation AL
+        $config->saveConfig(
+            Config::CONFIG_XML_PATH_DEFAULT_REGION,
+            1,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            1
+        );
+
+        $config->saveConfig(
+            Config::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
+            3,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            1
+        );
+        $this->getFixtureTaxRates();
+        $this->getFixtureTaxRules();
+
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = $this->objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->reinit();
+    }
+
+    public function tearDown()
+    {
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = $this->objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+
+        //default state tax calculation AL
+        $config->saveConfig(
+            Config::CONFIG_XML_PATH_DEFAULT_REGION,
+            null,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            1
+        );
+
+        $config->saveConfig(
+            Config::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
+            1,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            1
+        );
+        $taxRules = $this->getFixtureTaxRules();
+        if (count($taxRules)) {
+            $taxRates = $this->getFixtureTaxRates();
+            foreach ($taxRules as $taxRule) {
+                $taxRule->delete();
+            }
+            foreach ($taxRates as $taxRate) {
+                $taxRate->delete();
+            }
+        }
+
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = $this->objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->reinit();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_primary_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     * @magentoApiDataFixture Magento/Tax/_files/tax_rule_region_1_al.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testQueryAllFieldsSimpleProduct()
+    {
+        $productSku = 'simple';
+
+        $product = $this->productRepository->get($productSku, null, null, true);
+        // set product to taxable goods
+        $product->setData('tax_class_id', 2)->save();
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+            attribute_set_id
+            created_at
+            id
+            name
+            price {
+              minimalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              maximalPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+              regularPrice {
+                amount {
+                  value
+                  currency
+                }
+                adjustments {
+                  amount {
+                    value
+                    currency
+                  }
+                  code
+                  description
+                }
+              }
+            }
+            sku
+            type_id
+            updated_at
+            ... on PhysicalProductInterface {
+                weight
+            }
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get($productSku, false, null, true);
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
+        $product->setId(
+            $product->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
+        );
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertBaseFields($product, $response['products']['items'][0]);
+    }
+
+    /**
+     * Get tax rates created in Magento\Tax\_files\tax_rule_region_1_al.php
+     *
+     * @return \Magento\Tax\Model\Calculation\Rate[]
+     */
+    private function getFixtureTaxRates()
+    {
+        if ($this->fixtureTaxRates === null) {
+            $this->fixtureTaxRates = [];
+            if ($this->getFixtureTaxRules()) {
+                $taxRateIds = (array)$this->getFixtureTaxRules()[0]->getRates();
+                foreach ($taxRateIds as $taxRateId) {
+                    /** @var \Magento\Tax\Model\Calculation\Rate $taxRate */
+                    $taxRate = Bootstrap::getObjectManager()->create(\Magento\Tax\Model\Calculation\Rate::class);
+                    $this->fixtureTaxRates[] = $taxRate->load($taxRateId);
+                }
+            }
+        }
+        return $this->fixtureTaxRates;
+    }
+
+    /**
+     * Get tax rule created in Magento\Tax\_files\tax_rule_region_1_al.php
+     *
+     * @return \Magento\Tax\Model\Calculation\Rule[]
+     */
+    private function getFixtureTaxRules()
+    {
+        if ($this->fixtureTaxRules === null) {
+            $this->fixtureTaxRules = [];
+            $taxRuleCodes = ['AL Test Rule'];
+            foreach ($taxRuleCodes as $taxRuleCode) {
+                /** @var \Magento\Tax\Model\Calculation\Rule $taxRule */
+                $taxRule = Bootstrap::getObjectManager()->create(\Magento\Tax\Model\Calculation\Rule::class);
+                $taxRule->load($taxRuleCode, 'code');
+                if ($taxRule->getId()) {
+                    $this->fixtureTaxRules[] = $taxRule;
+                }
+            }
+        }
+        return $this->fixtureTaxRules;
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertBaseFields($product, $actualResponse)
+    {
+        // ['product_object_field_name', 'expected_value']
+        $assertionMap = [
+            ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
+            ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
+            ['response_field' => 'id', 'expected_value' => $product->getId()],
+            ['response_field' => 'name', 'expected_value' => $product->getName()],
+            ['response_field' => 'price', 'expected_value' =>
+                [
+                    'minimalPrice' => [
+                        'amount' => [
+                            'value' => 4.106501,
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => [
+                            0 =>
+                                [
+                                    'amount' =>
+                                        [
+                                            'value' => 0.286501,
+                                            'currency' => 'USD',
+                                        ],
+                                        'code' => 'TAX',
+                                        'description' => 'INCLUDED',
+                                ],
+                        ]
+                    ],
+                    'regularPrice' => [
+                        'amount' => [
+                            'value' => 10.750001,
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => [
+                            0 =>
+                                [
+                                    'amount' =>
+                                        [
+                                            'value' => 0.750001,
+                                            'currency' => 'USD',
+                                        ],
+                                        'code' => 'TAX',
+                                        'description' => 'INCLUDED',
+                                ],
+                        ]
+                    ],
+                    'maximalPrice' => [
+                        'amount' => [
+                            'value' => 4.106501,
+                            'currency' => 'USD'
+                        ],
+                        'adjustments' => [
+                            0 =>
+                                [
+                                    'amount' =>
+                                        [
+                                            'value' => 0.286501,
+                                            'currency' => 'USD',
+                                        ],
+                                        'code' => 'TAX',
+                                        'description' => 'INCLUDED',
+                                ],
+                        ]
+                    ],
+                ]
+            ],
+            ['response_field' => 'sku', 'expected_value' => $product->getSku()],
+            ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
+            ['response_field' => 'updated_at', 'expected_value' => $product->getUpdatedAt()],
+            ['response_field' => 'weight', 'expected_value' => $product->getWeight()],
+        ];
+
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
new file mode 100644
index 0000000000000..b6e1a61f0357c
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\TestModule;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Make sure that it is possible to use GraphQL mutations in Magento
+ */
+class GraphQlMutationTest extends GraphQlAbstract
+{
+    public function testMutation()
+    {
+        $id = 3;
+
+        $query = <<<MUTATION
+mutation {
+  testItem(id: {$id}) {
+    item_id,
+    name,
+    integer_list
+  }
+}
+MUTATION;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('testItem', $response);
+        $testItem = $response['testItem'];
+        $this->assertArrayHasKey('integer_list', $testItem);
+        $this->assertEquals([4, 5, 6], $testItem['integer_list']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
new file mode 100644
index 0000000000000..d59e255daa109
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\TestModule;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Class GraphQlQueryTest
+ */
+class GraphQlQueryTest extends GraphQlAbstract
+{
+    public function testQueryTestModuleReturnsResults()
+    {
+        $id = 1;
+
+        $query = <<<QUERY
+{
+    testItem(id: {$id})
+    {
+        item_id
+        name
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('testItem', $response);
+        $testItem = $response['testItem'];
+        $this->assertArrayHasKey('item_id', $testItem);
+        $this->assertArrayHasKey('name', $testItem);
+        $this->assertEquals(1, $testItem['item_id']);
+        $this->assertEquals('itemName', $testItem['name']);
+    }
+
+    public function testQueryTestModuleExtensionAttribute()
+    {
+        $id = 2;
+
+        $query = <<<QUERY
+{
+    testItem(id: {$id})
+    {
+        item_id
+        name
+        integer_list
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('testItem', $response);
+        $testItem = $response['testItem'];
+        $this->assertArrayHasKey('integer_list', $testItem);
+        $this->assertEquals([3, 4, 5], $testItem['integer_list']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
new file mode 100644
index 0000000000000..c70b1631e85cd
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
@@ -0,0 +1,358 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\UrlRewrite;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\Cms\Helper\Page as PageHelper;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Test the GraphQL endpoint's URLResolver query to verify canonical URL's are correctly returned.
+ */
+class UrlResolverTest extends GraphQlAbstract
+{
+
+    /** @var  ObjectManager */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Tests if target_path(canonical_url) is resolved for Product entity
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testProductUrlResolver()
+    {
+        $productSku = 'p002';
+        $urlPath = 'p002.html';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId = $product->getStoreId();
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath,
+                'store_id' => $storeId
+            ]
+        );
+        $targetPath = $actualUrls->getTargetPath();
+        $expectedType = $actualUrls->getEntityType();
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$urlPath}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+    }
+
+    /**
+     * Tests the use case where canonical_url is provided as resolver input in the Query
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testProductUrlWithCanonicalUrlInput()
+    {
+        $productSku = 'p002';
+        $urlPath = 'p002.html';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId = $product->getStoreId();
+        $product->getUrlKey();
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath,
+                'store_id' => $storeId
+            ]
+        );
+        $targetPath = $actualUrls->getTargetPath();
+        $expectedType = $actualUrls->getEntityType();
+        $canonicalPath = $actualUrls->getTargetPath();
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$canonicalPath}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+    }
+
+    /**
+     * Test for category entity
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testCategoryUrlResolver()
+    {
+        $productSku = 'p002';
+        $urlPath2 = 'cat-1.html';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId = $product->getStoreId();
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath2,
+                'store_id' => $storeId
+            ]
+        );
+        $categoryId = $actualUrls->getEntityId();
+        $targetPath = $actualUrls->getTargetPath();
+        $expectedType = $actualUrls->getEntityType();
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$urlPath2}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($categoryId, $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
+     */
+    public function testCMSPageUrlResolver()
+    {
+        /** @var \Magento\Cms\Model\Page $page */
+        $page = $this->objectManager->get(\Magento\Cms\Model\Page::class);
+        $page->load('page100');
+        $cmsPageId = $page->getId();
+        $requestPath = $page->getIdentifier();
+
+        /** @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $urlPathGenerator */
+        $urlPathGenerator = $this->objectManager->get(\Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator::class);
+
+        /** @param \Magento\Cms\Api\Data\PageInterface $page */
+        $targetPath = $urlPathGenerator->getCanonicalUrlPath($page);
+        $expectedEntityType = CmsPageUrlRewriteGenerator::ENTITY_TYPE;
+
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$requestPath}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
+    }
+
+    /**
+     * Tests the use case where the url_key of the existing product is changed
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testProductUrlRewriteResolver()
+    {
+        $productSku = 'p002';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId = $product->getStoreId();
+        $product->setUrlKey('p002-new')->save();
+        $urlPath = $product->getUrlKey() . '.html';
+        $this->assertEquals($urlPath, 'p002-new.html');
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath,
+                'store_id' => $storeId
+            ]
+        );
+        $targetPath = $actualUrls->getTargetPath();
+        $expectedType = $actualUrls->getEntityType();
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$urlPath}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+    }
+
+    /**
+     * Tests if null is returned when an invalid request_path is provided as input to urlResolver
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testInvalidUrlResolverInput()
+    {
+        $productSku = 'p002';
+        $urlPath = 'p002';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId = $product->getStoreId();
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath,
+                'store_id' => $storeId
+            ]
+        );
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$urlPath}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertNull($response['urlResolver']);
+    }
+
+    /**
+     * Test for category entity with leading slash
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testCategoryUrlWithLeadingSlash()
+    {
+        $productSku = 'p002';
+        $urlPath = 'cat-1.html';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId = $product->getStoreId();
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath,
+                'store_id' => $storeId
+            ]
+        );
+        $categoryId = $actualUrls->getEntityId();
+        $targetPath = $actualUrls->getTargetPath();
+        $expectedType = $actualUrls->getEntityType();
+
+        $query = <<<QUERY
+{
+  urlResolver(url:"/{$urlPath}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($categoryId, $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+    }
+
+    /**
+     * Test resolution of '/' path to home page
+     */
+    public function testResolveSlash()
+    {
+        /** @var \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface */
+        $scopeConfigInterface = $this->objectManager->get(ScopeConfigInterface::class);
+        $homePageIdentifier = $scopeConfigInterface->getValue(
+            PageHelper::XML_PATH_HOME_PAGE,
+            ScopeInterface::SCOPE_STORE
+        );
+        /** @var \Magento\Cms\Model\Page $page */
+        $page = $this->objectManager->get(\Magento\Cms\Model\Page::class);
+        $page->load($homePageIdentifier);
+        $homePageId = $page->getId();
+        /** @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $urlPathGenerator */
+        $urlPathGenerator = $this->objectManager->get(\Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator::class);
+        /** @param \Magento\Cms\Api\Data\PageInterface $page */
+        $targetPath = $urlPathGenerator->getCanonicalUrlPath($page);
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"/")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($homePageId, $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
new file mode 100644
index 0000000000000..d570fc09b7714
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Wishlist;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
+use Magento\Wishlist\Model\WishlistFactory;
+
+class WishlistTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var WishlistFactory
+     */
+    private $wishlistFactory;
+
+    /**
+     * @var WishlistResourceModel
+     */
+    private $wishlistResource;
+
+    protected function setUp()
+    {
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->wishlistFactory = Bootstrap::getObjectManager()->get(WishlistFactory::class);
+        $this->wishlistResource = Bootstrap::getObjectManager()->get(WishlistResourceModel::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testGetCustomerWishlist(): void
+    {
+        /** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+        $wishlist = $this->wishlistFactory->create();
+        $this->wishlistResource->load($wishlist, 1, 'customer_id');
+
+        /** @var Item $wishlistItem */
+        $wishlistItem = $wishlist->getItemCollection()->getFirstItem();
+        $wishlistItemProduct = $wishlistItem->getProduct();
+        $query =
+            <<<QUERY
+{
+  wishlist {
+    items_count
+    name
+    sharing_code
+    updated_at
+    items {
+      id
+      qty
+      description
+      added_at
+      product {
+        sku
+        name
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+
+        $this->assertEquals($wishlist->getItemsCount(), $response['wishlist']['items_count']);
+        $this->assertEquals($wishlist->getName(), $response['wishlist']['name']);
+        $this->assertEquals($wishlist->getSharingCode(), $response['wishlist']['sharing_code']);
+        $this->assertEquals($wishlist->getUpdatedAt(), $response['wishlist']['updated_at']);
+
+        $this->assertEquals($wishlistItem->getId(), $response['wishlist']['items'][0]['id']);
+        $this->assertEquals($wishlistItem->getData('qty'), $response['wishlist']['items'][0]['qty']);
+        $this->assertEquals($wishlistItem->getDescription(), $response['wishlist']['items'][0]['description']);
+        $this->assertEquals($wishlistItem->getAddedAt(), $response['wishlist']['items'][0]['added_at']);
+
+        $this->assertEquals($wishlistItemProduct->getSku(), $response['wishlist']['items'][0]['product']['sku']);
+        $this->assertEquals($wishlistItemProduct->getName(), $response['wishlist']['items'][0]['product']['name']);
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/_files/query_introspection.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/_files/query_introspection.php
new file mode 100644
index 0000000000000..444f558f3ce60
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/_files/query_introspection.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+
+    [
+        'name' => 'customAttributeMetadata',
+        'args' =>
+            [
+                [
+                    'name' => 'attributes',
+                    'description' => '',
+                    'type' =>
+                        [
+                            'kind' => 'NON_NULL',
+                            'name' => null,
+                            'ofType' =>
+                                [
+                                    'kind' => 'LIST',
+                                    'name' => null,
+                                ]
+                        ],
+                        'defaultValue' => null,
+                ]
+            ]
+    ],
+     [
+         'name' => 'testItem',
+         'args' =>
+         [
+             [
+                 'name' => 'id',
+                 'description' => '',
+                 'type' =>
+                     [
+                         'kind' => 'NON_NULL',
+                         'name' => null,
+                         'ofType' =>
+                             [
+                                 'kind' => 'SCALAR',
+                                 'name' => 'Int',
+                             ]
+
+                     ],
+                     'defaultValue' => null,
+
+             ]
+         ]
+
+     ],
+     [
+         'name' => 'urlResolver',
+         'args' =>
+         [
+             [
+                 'name' => 'url',
+                 'description' => '',
+                 'type' =>
+                     [
+                         'kind' => 'NON_NULL',
+                         'name' => null,
+                         'ofType' =>
+                             [
+                                 'kind' => 'SCALAR',
+                                 'name' => 'String',
+                             ]
+                     ],
+                     'defaultValue' => null,
+             ]
+         ]
+
+     ]
+];
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php
new file mode 100644
index 0000000000000..602493481449f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/CartItemRepositoryTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\GroupedProduct\Api;
+
+use Magento\Catalog\Model\CustomOptions\CustomOptionProcessor;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+class CartItemRepositoryTest extends WebapiAbstract
+{
+    const SERVICE_VERSION = 'V1';
+    const SERVICE_NAME = 'quoteCartItemRepositoryV1';
+    const RESOURCE_PATH = '/V1/carts/';
+
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
+     */
+    public function testAddGroupedProductToCartThatHasAnOutOfStockItemInTheGroup()
+    {
+        $this->_markTestAsRestOnly();
+
+        /** @var  \Magento\Catalog\Model\Product $product */
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load('100000003');
+        $productSku = $product->getSku();
+        /** @var Quote  $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $quote->load('test_order_1', 'reserved_order_id');
+        $cartId = $quote->getId();
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH .  $cartId . '/items',
+                'httpMethod' => Request::HTTP_METHOD_POST,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save',
+            ],
+        ];
+
+        $requestData = [
+            'cartItem' => [
+                'sku' => $productSku,
+                'qty' => 1,
+                'quote_id' => $cartId,
+            ],
+        ];
+        $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertTrue($quote->hasProductId('100000001'));
+        $this->assertFalse($quote->hasProductId('100000002'));
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
index 3fb7b3417b679..4b09361fe023b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
@@ -302,13 +302,13 @@ private function assertInputExceptionMessages($exception)
             'message' => 'One or more input exceptions have occurred.',
             'errors' => [
                 [
-                    'message' => '%fieldName is a required field.',
+                    'message' => '"%fieldName" is required. Enter and try again.',
                     'parameters' => [
                         'fieldName' => 'username',
                     ],
                 ],
                 [
-                    'message' => '%fieldName is a required field.',
+                    'message' => '"%fieldName" is required. Enter and try again.',
                     'parameters' => [
                         'fieldName' => 'password',
                     ]
@@ -332,7 +332,8 @@ private function assertInvalidCredentialsException($exception)
         );
         $exceptionData = $this->processRestExceptionResult($exception);
         $expectedExceptionData = [
-            'message' => 'You did not sign in correctly or your account is temporarily disabled.'
+            'message' => 'The account sign-in was incorrect or your account is disabled temporarily. '
+                . 'Please wait and try again later.'
         ];
         $this->assertEquals($expectedExceptionData, $exceptionData, "Exception message is invalid.");
     }
@@ -351,7 +352,7 @@ private function assertUnauthorizedAccessException($exception)
         );
         $exceptionData = $this->processRestExceptionResult($exception);
         $expectedExceptionData = [
-            'message' => 'Consumer is not authorized to access %resources',
+            'message' => "The consumer isn't authorized to access %resources.",
             'parameters' => [
                 'resources' => 'Magento_Backend::store'
             ]
diff --git a/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
index 1e0a0cb49acc8..05e97a307fec1 100644
--- a/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
@@ -168,13 +168,13 @@ private function assertInputExceptionMessages($e)
             'message' => 'One or more input exceptions have occurred.',
             'errors' => [
                 [
-                    'message' => '%fieldName is a required field.',
+                    'message' => '"%fieldName" is required. Enter and try again.',
                     'parameters' => [
                         'fieldName' => 'username',
                     ],
                 ],
                 [
-                    'message' => '%fieldName is a required field.',
+                    'message' => '"%fieldName" is required. Enter and try again.',
                     'parameters' => [
                         'fieldName' => 'password',
                     ]
@@ -286,7 +286,8 @@ private function assertInvalidCredentialsException($e)
         $this->assertEquals(HTTPExceptionCodes::HTTP_UNAUTHORIZED, $e->getCode(), "Response HTTP code is invalid.");
         $exceptionData = $this->processRestExceptionResult($e);
         $expectedExceptionData = [
-            'message' => 'You did not sign in correctly or your account is temporarily disabled.'
+            'message' => 'The account sign-in was incorrect or your account is disabled temporarily. '
+                . 'Please wait and try again later.'
         ];
         $this->assertEquals($expectedExceptionData, $exceptionData, "Exception message is invalid.");
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
index 66102699bb8fd..80a4acbc563d6 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
@@ -237,7 +237,7 @@ public function testAssignCustomerThrowsExceptionIfThereIsNoCartWithGivenId()
     /**
      * @magentoApiDataFixture Magento/Sales/_files/quote_with_customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cannot assign customer to the given cart. The cart is not anonymous.
+     * @expectedExceptionMessage The customer can't be assigned to the cart because the cart isn't anonymous.
      */
     public function testAssignCustomerThrowsExceptionIfTargetCartIsNotAnonymous()
     {
@@ -272,7 +272,7 @@ public function testAssignCustomerThrowsExceptionIfTargetCartIsNotAnonymous()
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_non_default_website_id.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cannot assign customer to the given cart. The cart belongs to different store.
+     * @expectedExceptionMessage The customer can't be assigned to the cart. The cart belongs to a different store.
      */
     public function testAssignCustomerThrowsExceptionIfCartIsAssignedToDifferentStore()
     {
@@ -309,7 +309,6 @@ public function testAssignCustomerThrowsExceptionIfCartIsAssignedToDifferentStor
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cannot assign customer to the given cart. Customer already has active cart.
      */
     public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart()
     {
@@ -344,6 +343,10 @@ public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart(
             'storeId' => 1,
         ];
         $this->_webApiCall($serviceInfo, $requestData);
+
+        $this->expectExceptionMessage(
+            "The customer can't be assigned to the cart because the customer already has an active cart."
+        );
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
index 609ae1cfe094c..a001cae645434 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
@@ -162,22 +162,22 @@ protected function getQuoteItemTotalsData(\Magento\Quote\Model\Quote $quote)
         $item = array_shift($items);
         return [
             ItemTotals::KEY_ITEM_ID => $item->getItemId(),
-            ItemTotals::KEY_PRICE => intval($item->getPrice()),
-            ItemTotals::KEY_BASE_PRICE => intval($item->getBasePrice()),
+            ItemTotals::KEY_PRICE => (int)$item->getPrice(),
+            ItemTotals::KEY_BASE_PRICE => (int)$item->getBasePrice(),
             ItemTotals::KEY_QTY => $item->getQty(),
-            ItemTotals::KEY_ROW_TOTAL => intval($item->getRowTotal()),
-            ItemTotals::KEY_BASE_ROW_TOTAL => intval($item->getBaseRowTotal()),
-            ItemTotals::KEY_ROW_TOTAL_WITH_DISCOUNT => intval($item->getRowTotalWithDiscount()),
-            ItemTotals::KEY_TAX_AMOUNT => intval($item->getTaxAmount()),
-            ItemTotals::KEY_BASE_TAX_AMOUNT => intval($item->getBaseTaxAmount()),
-            ItemTotals::KEY_TAX_PERCENT => intval($item->getTaxPercent()),
-            ItemTotals::KEY_DISCOUNT_AMOUNT => intval($item->getDiscountAmount()),
-            ItemTotals::KEY_BASE_DISCOUNT_AMOUNT => intval($item->getBaseDiscountAmount()),
-            ItemTotals::KEY_DISCOUNT_PERCENT => intval($item->getDiscountPercent()),
-            ItemTotals::KEY_PRICE_INCL_TAX => intval($item->getPriceInclTax()),
-            ItemTotals::KEY_BASE_PRICE_INCL_TAX => intval($item->getBasePriceInclTax()),
-            ItemTotals::KEY_ROW_TOTAL_INCL_TAX => intval($item->getRowTotalInclTax()),
-            ItemTotals::KEY_BASE_ROW_TOTAL_INCL_TAX => intval($item->getBaseRowTotalInclTax()),
+            ItemTotals::KEY_ROW_TOTAL => (int)$item->getRowTotal(),
+            ItemTotals::KEY_BASE_ROW_TOTAL => (int)$item->getBaseRowTotal(),
+            ItemTotals::KEY_ROW_TOTAL_WITH_DISCOUNT => (int)$item->getRowTotalWithDiscount(),
+            ItemTotals::KEY_TAX_AMOUNT => (int)$item->getTaxAmount(),
+            ItemTotals::KEY_BASE_TAX_AMOUNT => (int)$item->getBaseTaxAmount(),
+            ItemTotals::KEY_TAX_PERCENT => (int)$item->getTaxPercent(),
+            ItemTotals::KEY_DISCOUNT_AMOUNT => (int)$item->getDiscountAmount(),
+            ItemTotals::KEY_BASE_DISCOUNT_AMOUNT => (int)$item->getBaseDiscountAmount(),
+            ItemTotals::KEY_DISCOUNT_PERCENT => (int)$item->getDiscountPercent(),
+            ItemTotals::KEY_PRICE_INCL_TAX => (int)$item->getPriceInclTax(),
+            ItemTotals::KEY_BASE_PRICE_INCL_TAX => (int)$item->getBasePriceInclTax(),
+            ItemTotals::KEY_ROW_TOTAL_INCL_TAX => (int)$item->getRowTotalInclTax(),
+            ItemTotals::KEY_BASE_ROW_TOTAL_INCL_TAX => (int)$item->getBaseRowTotalInclTax(),
             ItemTotals::KEY_WEEE_TAX_APPLIED_AMOUNT => $item->getWeeeTaxAppliedAmount(),
             ItemTotals::KEY_WEEE_TAX_APPLIED => $item->getWeeeTaxApplied(),
             ItemTotals::KEY_NAME => $item->getName(),
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
index f50276fd6ce60..1aee493d8e0cb 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
@@ -80,7 +80,7 @@ public function testDelete()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Coupon code is not valid
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testSetCouponThrowsExceptionIfCouponDoesNotExist()
     {
@@ -215,7 +215,7 @@ public function testDeleteMyCoupon()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Coupon code is not valid
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testSetMyCouponThrowsExceptionIfCouponDoesNotExist()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartManagementTest.php
index e579fb3f62036..bbd1e59f83f90 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartManagementTest.php
@@ -182,7 +182,7 @@ public function testAssignCustomerThrowsExceptionIfThereIsNoCartWithGivenId()
     /**
      * @magentoApiDataFixture Magento/Sales/_files/quote_with_customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cannot assign customer to the given cart. The cart is not anonymous.
+     * @expectedExceptionMessage The customer can't be assigned to the cart because the cart isn't anonymous.
      */
     public function testAssignCustomerThrowsExceptionIfTargetCartIsNotAnonymous()
     {
@@ -234,7 +234,6 @@ public function testAssignCustomerThrowsExceptionIfTargetCartIsNotAnonymous()
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cannot assign customer to the given cart. Customer already has active cart.
      */
     public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart()
     {
@@ -286,6 +285,10 @@ public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart(
             'storeId' => 1,
         ];
         $this->_webApiCall($serviceInfo, $requestData);
+
+        $this->expectExceptionMessage(
+            "The customer can't be assigned to the cart because the customer already has an active cart."
+        );
     }
 
     /**
@@ -330,7 +333,7 @@ public function testPlaceOrder()
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Cannot assign customer to the given cart. You don't have permission for this operation.
+     * @expectedExceptionMessage You don't have the correct permissions to assign the customer to the cart.
      */
     public function testAssignCustomerByGuestUser()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCouponManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCouponManagementTest.php
index 8dddf99868e4a..9815cf888ff95 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCouponManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCouponManagementTest.php
@@ -105,7 +105,7 @@ public function testDelete()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Coupon code is not valid
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testSetCouponThrowsExceptionIfCouponDoesNotExist()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestPaymentMethodManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestPaymentMethodManagementTest.php
index d0d0f865164c3..e8fa3a6dabce3 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestPaymentMethodManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestPaymentMethodManagementTest.php
@@ -156,7 +156,7 @@ public function testSetPaymentWithSimpleProduct()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Shipping address is not set
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetPaymentWithSimpleProductWithoutAddress()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/PaymentMethodManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/PaymentMethodManagementTest.php
index 6fa83f58587ad..64d5290d5c511 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/PaymentMethodManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/PaymentMethodManagementTest.php
@@ -122,7 +122,7 @@ public function testSetPaymentWithSimpleProduct()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Shipping address is not set
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetPaymentWithSimpleProductWithoutAddress()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
index aef162d92b1c1..45bae261bb617 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
@@ -38,7 +38,6 @@ public function testInvoke()
         $orderCollection = $this->objectManager->get(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
         $order = $orderCollection->getFirstItem();
 
-//        $order = $this->objectManager->create('Magento\Sales\Model\Order')->loadByIncrementId('100000001');
         /** @var \Magento\Sales\Model\Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
         $items = [
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php
index b61bfdabe25cd..a907faac98b72 100755
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php
@@ -140,7 +140,7 @@ protected function prepareOrder()
                 [
                     'shipping' => [
                         'address' => $address,
-                        'method' => 'Flat Rate - Fixed'
+                        'method' => 'flatrate_flatrate'
                     ],
                     'items' => [$orderItem->getData()],
                     'stock_id' => null,
@@ -232,6 +232,9 @@ public function testOrderCreate()
         $this->assertEquals($order['grand_total'], $model->getGrandTotal());
         $this->assertNotNull($model->getShippingAddress());
         $this->assertTrue((bool)$model->getShippingAddress()->getId());
-        $this->assertEquals('Flat Rate - Fixed', $model->getShippingMethod());
+        $this->assertEquals('Flat Rate - Fixed', $model->getShippingDescription());
+        $shippingMethod = $model->getShippingMethod(true);
+        $this->assertEquals('flatrate', $shippingMethod['carrier_code']);
+        $this->assertEquals('flatrate', $shippingMethod['method']);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
index 7adde3c11ac61..09c49bed1de83 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
@@ -3,8 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Service\V1;
 
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class OrderGetTest extends WebapiAbstract
@@ -18,19 +25,24 @@ class OrderGetTest extends WebapiAbstract
     const ORDER_INCREMENT_ID = '100000001';
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
-    protected $objectManager;
+    private $objectManager;
 
-    protected function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
     }
 
     /**
+     * Checks order attributes.
+     *
      * @magentoApiDataFixture Magento/Sales/_files/order.php
      */
-    public function testOrderGet()
+    public function testOrderGet(): void
     {
         $expectedOrderData = [
             'base_subtotal' => '100.0000',
@@ -67,36 +79,21 @@ public function testOrderGet()
             'region' => 'CA'
         ];
 
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
-
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '/' . $order->getId(),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_READ_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_READ_NAME . 'get',
-            ],
-        ];
-        $result = $this->_webApiCall($serviceInfo, ['id' => $order->getId()]);
+        $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
 
         foreach ($expectedOrderData as $field => $value) {
-            $this->assertArrayHasKey($field, $result);
-            $this->assertEquals($value, $result[$field]);
+            self::assertArrayHasKey($field, $result);
+            self::assertEquals($value, $result[$field]);
         }
 
-        $this->assertArrayHasKey('payment', $result);
+        self::assertArrayHasKey('payment', $result);
         foreach ($expectedPayments as $field => $value) {
-            $this->assertEquals($value, $result['payment'][$field]);
+            self::assertEquals($value, $result['payment'][$field]);
         }
 
-        $this->assertArrayHasKey('billing_address', $result);
+        self::assertArrayHasKey('billing_address', $result);
         foreach ($expectedBillingAddressNotEmpty as $field) {
-            $this->assertArrayHasKey($field, $result['billing_address']);
+            self::assertArrayHasKey($field, $result['billing_address']);
         }
 
         self::assertArrayHasKey('extension_attributes', $result);
@@ -112,7 +109,110 @@ public function testOrderGet()
 
         //check that nullable fields were marked as optional and were not sent
         foreach ($result as $value) {
-            $this->assertNotNull($value);
+            self::assertNotNull($value);
+        }
+    }
+
+    /**
+     * Checks order extension attributes.
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/order_with_tax.php
+     */
+    public function testOrderGetExtensionAttributes(): void
+    {
+        $expectedTax = [
+            'code' => 'US-NY-*-Rate 1',
+            'type' => 'shipping'
+        ];
+
+        $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
+
+        $appliedTaxes = $result['extension_attributes']['applied_taxes'];
+        self::assertEquals($expectedTax['code'], $appliedTaxes[0]['code']);
+        $appliedTaxes = $result['extension_attributes']['item_applied_taxes'];
+        self::assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
+        self::assertNotEmpty($appliedTaxes[0]['applied_taxes']);
+        self::assertEquals(true, $result['extension_attributes']['converting_from_quote']);
+    }
+
+    /**
+     * Checks if the order contains product option attributes.
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/order_with_bundle.php
+     */
+    public function testGetOrderWithProductOption(): void
+    {
+        $expected = [
+            'extension_attributes' => [
+                'bundle_options' => [
+                    [
+                        'option_id' => 1,
+                        'option_selections' => [1],
+                        'option_qty' => 1
+                    ]
+                ]
+            ]
+        ];
+        $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
+
+        $bundleProduct = $this->getBundleProduct($result['items']);
+        self::assertNotEmpty($bundleProduct, '"Bundle Product" should not be empty.');
+        self::assertNotEmpty($bundleProduct['product_option'], '"Product Option" should not be empty.');
+        self::assertEquals($expected, $bundleProduct['product_option']);
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId): OrderInterface
+    {
+        /** @var Order $order */
+        $order = $this->objectManager->create(Order::class);
+        $order->loadByIncrementId($incrementId);
+
+        return $order;
+    }
+
+    /**
+     * Makes service call.
+     *
+     * @param string $incrementId
+     * @return array
+     */
+    private function makeServiceCall(string $incrementId): array
+    {
+        $order = $this->getOrder($incrementId);
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $order->getId(),
+                'httpMethod' => Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'get',
+            ],
+        ];
+        return $this->_webApiCall($serviceInfo, ['id' => $order->getId()]);
+    }
+
+    /**
+     * Gets a bundle product from the result.
+     *
+     * @param array $items
+     * @return array
+     */
+    private function getBundleProduct(array $items): array
+    {
+        foreach ($items as $item) {
+            if ($item['product_type'] == 'bundle') {
+                return $item;
+            }
         }
+
+        return [];
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php
index 49e05832f2ef3..f6194db6d8ebb 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderInvoiceCreateTest.php
@@ -90,4 +90,96 @@ public function testInvoiceCreate()
             'Failed asserting that Order status was changed'
         );
     }
+
+    /**
+     * Tests that MAGETWO-95346 was fixed for bundled products
+     *
+     * @expectedException \Exception
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessageRegExp /Invoice Document Validation Error\(s\):(?:\n|\\n)The invoice can't be created without products. Add products and try again./
+     * @codingStandardsIgnoreEnd
+     * @magentoApiDataFixture Magento/Sales/_files/order_with_bundle.php
+     */
+    public function testOrderWithBundleInvoicedWithInvalidQuantitiesReturnsError()
+    {
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/order/' . $existingOrder->getId() . '/invoice',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'execute',
+            ],
+        ];
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'notify' => true,
+            'appendComment' => true,
+            'items' => [
+                [
+                    'order_item_id' => -1,
+                    'qty' => 1
+                ]
+            ],
+            'comment' => [
+                'comment' => 'Test offline',
+                'isVisibleOnFront' => 1,
+            ],
+        ];
+
+        $this->_webApiCall($serviceInfo, $requestData);
+    }
+
+    /**
+     * Tests that MAGETWO-95346 was fixed for configurable products
+     *
+     * @expectedException \Exception
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessageRegExp /Invoice Document Validation Error\(s\):(?:\n|\\n)The invoice can't be created without products. Add products and try again./
+     * @codingStandardsIgnoreEnd
+     * @magentoApiDataFixture Magento/Sales/_files/order_configurable_product.php
+     */
+    public function testOrderWithConfigurableProductInvoicedWithInvalidQuantitiesReturnsError()
+    {
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/order/' . $existingOrder->getId() . '/invoice',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'execute',
+            ],
+        ];
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'notify' => true,
+            'appendComment' => true,
+            'items' => [
+                [
+                    'order_item_id' => -1,
+                    'qty' => 1
+                ]
+            ],
+            'comment' => [
+                'comment' => 'Test offline',
+                'isVisibleOnFront' => 1,
+            ],
+        ];
+
+        $this->_webApiCall($serviceInfo, $requestData);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
index 3ab93f9aecb99..592bdf3d584a9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
@@ -77,4 +77,34 @@ protected function assertOrderItem(\Magento\Sales\Model\Order\Item $orderItem, a
         $this->assertEquals($orderItem->getBasePrice(), $response['base_price']);
         $this->assertEquals($orderItem->getRowTotal(), $response['row_total']);
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/order_with_discount.php
+     */
+    public function testGetOrderWithDiscount()
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
+        $orderItem = current($order->getItems());
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $orderItem->getId(),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'get',
+            ],
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, ['id' => $orderItem->getId()]);
+
+        $this->assertTrue(is_array($response));
+        $this->assertEquals(8.00, $response['row_total']);
+        $this->assertEquals(8.00, $response['base_row_total']);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
index 0500f31858291..5050b6be7e56c 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
@@ -33,6 +33,71 @@ protected function setUp()
      * @magentoApiDataFixture Magento/Sales/_files/order_list.php
      */
     public function testOrderList()
+    {
+        $searchData = $this->getSearchData();
+
+        $requestData = ['searchCriteria' => $searchData];
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'getList',
+            ],
+        ];
+
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertArrayHasKey('items', $result);
+        $this->assertCount(2, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
+        $this->assertEquals('100000002', $result['items'][0]['increment_id']);
+        $this->assertEquals('100000001', $result['items'][1]['increment_id']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/order_list_with_tax.php
+     */
+    public function testOrderListExtensionAttributes()
+    {
+        $searchData = $this->getSearchData();
+
+        $requestData = ['searchCriteria' => $searchData];
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'getList',
+            ],
+        ];
+
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+
+        $expectedTax = [
+            'code' => 'US-NY-*-Rate 1',
+            'type' => 'shipping'
+        ];
+        $appliedTaxes = $result['items'][0]['extension_attributes']['applied_taxes'];
+        $this->assertEquals($expectedTax['code'], $appliedTaxes[0]['code']);
+        $appliedTaxes = $result['items'][0]['extension_attributes']['item_applied_taxes'];
+        $this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
+        $this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
+        $this->assertEquals(true, $result['items'][0]['extension_attributes']['converting_from_quote']);
+    }
+
+    /**
+     * Get search data for request.
+     *
+     * @return array
+     */
+    private function getSearchData() : array
     {
         /** @var \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder */
         $sortOrderBuilder = $this->objectManager->get(
@@ -70,25 +135,6 @@ public function testOrderList()
         $searchCriteriaBuilder->addSortOrder($sortOrder);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
-        $requestData = ['searchCriteria' => $searchData];
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_READ_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_READ_NAME . 'getList',
-            ],
-        ];
-
-        $result = $this->_webApiCall($serviceInfo, $requestData);
-        $this->assertArrayHasKey('items', $result);
-        $this->assertCount(2, $result['items']);
-        $this->assertArrayHasKey('search_criteria', $result);
-        $this->assertEquals($searchData, $result['search_criteria']);
-        $this->assertEquals('100000002', $result['items'][0]['increment_id']);
-        $this->assertEquals('100000001', $result['items'][1]['increment_id']);
+        return $searchData;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php
index 47499d56e776f..e2a156cc6fbfc 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php
@@ -33,26 +33,60 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
+     * @magentoApiDataFixture Magento/Sales/_files/order_configurable_product.php
      */
-    public function testShipOrder()
+    public function testConfigurableShipOrder()
     {
+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1335');
+        $productsQuantity = 1;
+
         /** @var \Magento\Sales\Model\Order $existingOrder */
         $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
             ->loadByIncrementId('100000001');
 
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => '/V1/order/' . $existingOrder->getId() . '/ship',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_READ_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_READ_NAME . 'execute',
-            ],
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
         ];
 
+        $shipmentId = (int)$this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
+        $this->assertNotEmpty($shipmentId);
+
+        try {
+            $shipment = $this->shipmentRepository->get($shipmentId);
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            $this->fail('Failed asserting that Shipment was created');
+        }
+
+        $orderedQty = 0;
+        /** @var \Magento\Sales\Model\Order\Item $item */
+        foreach ($existingOrder->getItems() as $item) {
+            if ($item->isDummy(true)) {
+                continue;
+            }
+            $orderedQty += $item->getQtyOrdered();
+        }
+
+        $this->assertEquals(
+            (int)$shipment->getTotalQty(),
+            (int)$orderedQty,
+            'Failed asserting that quantity of ordered and shipped items is equal'
+        );
+        $this->assertEquals(
+            $productsQuantity,
+            count($shipment->getItems()),
+            'Failed asserting that quantity of products and sales shipment items is equal'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
+     */
+    public function testShipOrder()
+    {
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
         $requestData = [
             'orderId' => $existingOrder->getId(),
             'items' => [],
@@ -77,7 +111,7 @@ public function testShipOrder()
             ];
         }
 
-        $result = $this->_webApiCall($serviceInfo, $requestData);
+        $result = $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
 
         $this->assertNotEmpty($result);
 
@@ -97,4 +131,118 @@ public function testShipOrder()
             'Failed asserting that Order status was changed'
         );
     }
+
+    /**
+     * Tests that not providing a tracking number produces the correct error. See MAGETWO-95429
+     * @expectedException \Exception
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessageRegExp /Shipment Document Validation Error\(s\):(?:\n|\\n)Please enter a tracking number./
+     * @codingStandardsIgnoreEnd
+     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
+     */
+    public function testShipOrderWithoutTrackingNumberReturnsError()
+    {
+        $this->_markTestAsRestOnly('SOAP requires an tracking number to be provided so this case is not possible.');
+
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'comment' => [
+                'comment' => 'Test Comment',
+                'is_visible_on_front' => 1,
+            ],
+            'tracks' => [
+                [
+                    'title' => 'Simple shipment track',
+                    'carrier_code' => 'UPS'
+                ]
+            ]
+        ];
+
+        $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/order_with_bundle_shipped_separately.php
+     */
+    public function testPartialShipOrderWithBundleShippedSeparately()
+    {
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'items' => [],
+            'comment' => [
+                'comment' => 'Test Comment',
+                'is_visible_on_front' => 1,
+            ],
+            'tracks' => [
+                [
+                    'track_number' => 'TEST_TRACK_0001',
+                    'title' => 'Simple shipment track',
+                    'carrier_code' => 'UPS'
+                ]
+            ]
+        ];
+
+        $shippedItemId = null;
+        foreach ($existingOrder->getAllItems() as $item) {
+            if ($item->getProductType() == 'simple') {
+                $requestData['items'][] = [
+                    'order_item_id' => $item->getItemId(),
+                    'qty' => $item->getQtyOrdered(),
+                ];
+                $shippedItemId = $item->getItemId();
+                break;
+            }
+        }
+
+        $shipmentId = $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
+        $this->assertNotEmpty($shipmentId);
+
+        try {
+            $shipment = $this->shipmentRepository->get($shipmentId);
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            $this->fail('Failed asserting that Shipment was created');
+        }
+
+        $this->assertEquals(1, $shipment->getTotalQty());
+
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        foreach ($existingOrder->getAllItems() as $item) {
+            if ($item->getItemId() == $shippedItemId) {
+                $this->assertEquals(1, $item->getQtyShipped());
+                continue;
+            }
+            $this->assertEquals(0, $item->getQtyShipped());
+        }
+    }
+
+    /**
+     * @param \Magento\Sales\Model\Order $order
+     * @return array
+     */
+    private function getServiceInfo(\Magento\Sales\Model\Order $order)
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/order/' . $order->getId() . '/ship',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'execute',
+            ],
+        ];
+        return $serviceInfo;
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
index 8c8130d2b3949..d8b3c5cac52aa 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
@@ -43,13 +43,13 @@ public function testInvoke()
                 'qty' => $orderItem->getQtyOrdered(),
                 'additional_data' => null,
                 'description' => null,
-                'entity_id' => null,
+                'entity_id' => 1,
                 'name' => null,
                 'parent_id' => null,
                 'price' => null,
                 'product_id' => null,
                 'row_total' => null,
-                'sku' => null,
+                'sku' => 'simple',
                 'weight' => null,
             ],
         ];
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php
index aaa7a5a6d4436..2b7e76aee0751 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sales\Service\V1;
 
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
@@ -57,7 +59,18 @@ public function testShipmentGet()
         unset($data['tracks']);
         foreach ($data as $key => $value) {
             if (!empty($value)) {
-                $this->assertEquals($shipment->getData($key), $value, $key);
+                if ($key === ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) {
+                    foreach ($value as $extensionAttributeKey => $extensionAttributeValue) {
+                        $methodName = 'get' .
+                            SimpleDataObjectConverter::snakeCaseToUpperCamelCase($extensionAttributeKey);
+                        $this->assertEquals(
+                            $shipment->getExtensionAttributes()->$methodName(),
+                            $extensionAttributeValue
+                        );
+                    }
+                } else {
+                    $this->assertEquals($shipment->getData($key), $value, $key);
+                }
             }
         }
         $shipmentItem = $this->objectManager->get(\Magento\Sales\Model\Order\Shipment\Item::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php
index 1a957e51b1efa..b496f08cc3e36 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentLabelGetTest.php
@@ -50,6 +50,6 @@ public function testShipmentGet()
             ],
         ];
         $result = $this->_webApiCall($serviceInfo, ['id' => $shipment->getId()]);
-        $this->assertEquals($result, 'test_shipping_label');
+        $this->assertEquals($result, base64_encode('test_shipping_label'));
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
index ad776da3ae439..1f5c7415ace3d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
@@ -91,5 +91,7 @@ public function testShipmentList()
         $this->assertEquals($searchData, $result['search_criteria']);
         $this->assertEquals('100000002', $result['items'][0]['increment_id']);
         $this->assertEquals('100000003', $result['items'][1]['increment_id']);
+        $this->assertEquals(base64_encode('shipping_label_100000002'), $result['items'][0]['shipping_label']);
+        $this->assertEquals(base64_encode('shipping_label_100000003'), $result['items'][1]['shipping_label']);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php b/dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php
new file mode 100644
index 0000000000000..f6167a06c6436
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Api;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+class SearchTest extends WebapiAbstract
+{
+    const SERVICE_VERSION = 'V1';
+    const SERVICE_NAME = 'searchV1';
+    const RESOURCE_PATH = '/V1/search/';
+
+    /**
+     * @var ProductInterface
+     */
+    private $product;
+
+    protected function setUp()
+    {
+        $productSku = 'simple';
+
+        $objectManager = Bootstrap::getObjectManager();
+        $productRepository = $objectManager->create(ProductRepositoryInterface::class);
+        $this->product = $productRepository->get($productSku);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testExistingProductSearch()
+    {
+        $productName = $this->product->getName();
+
+        $searchCriteria = $this->buildSearchCriteria($productName);
+        $serviceInfo = $this->buildServiceInfo($searchCriteria);
+
+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+
+        self::assertArrayHasKey('search_criteria', $response);
+        self::assertArrayHasKey('items', $response);
+        self::assertGreaterThan(0, count($response['items']));
+        self::assertGreaterThan(0, $response['items'][0]['id']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testNonExistentProductSearch()
+    {
+        $searchCriteria = $this->buildSearchCriteria('nonExistentProduct');
+        $serviceInfo = $this->buildServiceInfo($searchCriteria);
+
+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+
+        self::assertArrayHasKey('search_criteria', $response);
+        self::assertArrayHasKey('items', $response);
+        self::assertEquals(0, count($response['items']));
+    }
+
+    /**
+     * @param string $productName
+     * @return array
+     */
+    private function buildSearchCriteria(string $productName): array
+    {
+        return [
+            'searchCriteria' => [
+                'request_name' => 'quick_search_container',
+                'filter_groups' => [
+                    [
+                        'filters' => [
+                            [
+                                'field' => 'search_term',
+                                'value' => $productName,
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @param array $searchCriteria
+     * @return array
+     */
+    private function buildServiceInfo(array $searchCriteria): array
+    {
+        return [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+                'httpMethod' => Request::HTTP_METHOD_GET
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Search'
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRateRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRateRepositoryTest.php
index ffd6a3fe39043..3b379fc7e0eb0 100644
--- a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRateRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRateRepositoryTest.php
@@ -171,7 +171,7 @@ public function testCreateTaxRateWithoutValue()
             );
         } catch (\Exception $e) {
             $errorObj = $this->processRestExceptionResult($e);
-            $this->assertEquals('%fieldName is a required field.', $errorObj['message']);
+            $this->assertEquals('"%fieldName" is required. Enter and try again.', $errorObj['message']);
             $this->assertEquals(['fieldName' => 'percentage_rate'], $errorObj['parameters']);
         }
     }
@@ -491,7 +491,7 @@ public function testCannotDeleteTaxRate()
             $this->_webApiCall($serviceInfo, ['rateId' => $taxRateId]);
             $this->fail('Expected exception was not raised');
         } catch (\Exception $e) {
-            $expectedMessage = 'The tax rate cannot be removed. It exists in a tax rule.';
+            $expectedMessage = "The tax rate can't be removed because it exists in a tax rule.";
 
             $this->assertContains(
                 $expectedMessage,
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/DeserializationTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/DeserializationTest.php
index 98ba33f940f2c..1e870204f00c1 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/DeserializationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/DeserializationTest.php
@@ -38,7 +38,8 @@ public function testPostRequestWithEmptyBody()
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
             ],
         ];
-        $expectedMessage = '{"message":"%fieldName is a required field.","parameters":{"fieldName":"item"}}';
+        $expectedMessage =
+            '{"message":"\"%fieldName\" is required. Enter and try again.","parameters":{"fieldName":"item"}}';
         try {
             $this->_webApiCall($serviceInfo, RestClient::EMPTY_REQUEST_BODY);
         } catch (\Exception $e) {
@@ -64,7 +65,8 @@ public function testPutRequestWithEmptyBody()
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
             ],
         ];
-        $expectedMessage = '{"message":"%fieldName is a required field.","parameters":{"fieldName":"entityItem"}}';
+        $expectedMessage =
+            '{"message":"\"%fieldName\" is required. Enter and try again.","parameters":{"fieldName":"entityItem"}}';
         try {
             $this->_webApiCall($serviceInfo, RestClient::EMPTY_REQUEST_BODY);
         } catch (\Exception $e) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
index 98d1c059caa1f..99e1152747ba0 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/Webapi/Routing/BaseService.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/BaseService.php
index 853c92499aeed..8d59598d7ccc7 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/BaseService.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/BaseService.php
@@ -25,7 +25,7 @@ protected function assertUnauthorizedException($serviceInfo, $requestData = null
             $this->_assertSoapException(
                 $serviceInfo,
                 $requestData,
-                'Consumer is not authorized to access %resources'
+                "The consumer isn't authorized to access %resources."
             );
         } elseif (TESTS_WEB_API_ADAPTER == self::ADAPTER_REST) {
             $this->_assertRestUnauthorizedException($serviceInfo, $requestData);
@@ -44,7 +44,7 @@ protected function _assertRestUnauthorizedException($serviceInfo, $requestData =
             $this->_webApiCall($serviceInfo, $requestData);
         } catch (\Exception $e) {
             $this->assertContains(
-                '{"message":"Consumer is not authorized to access %resources"',
+                '{"message":"The consumer isn\'t authorized to access %resources.',
                 $e->getMessage(),
                 sprintf(
                     'REST routing did not fail as expected for the method "%s" of service "%s"',
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php
index c4e052e11310e..1476e6b31912b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php
@@ -73,7 +73,8 @@ public function testExceptionSoapInternalError()
                 'operation' => 'testModule3ErrorV1ServiceException',
             ],
         ];
-        $this->expectException('SoapFault', 'Generic service exception');
+        $this->expectException('SoapFault');
+        $this->expectExceptionMessage('Generic service exception');
         $this->_webApiCall($serviceInfo);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RestErrorHandlingTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RestErrorHandlingTest.php
index 29bb630ff6cd3..62400b1f30ce5 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RestErrorHandlingTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RestErrorHandlingTest.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Webapi\Routing;
 
 use Magento\TestFramework\Helper\Bootstrap;
@@ -72,7 +73,7 @@ public function testUnauthorized()
             $serviceInfo,
             [],
             WebapiException::HTTP_UNAUTHORIZED,
-            'Consumer is not authorized to access %1',
+            "The consumer isn't authorized to access %1.",
             ['resourceN']
         );
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/SoapErrorHandlingTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/SoapErrorHandlingTest.php
index ffcb2e52acb72..61ba247645b31 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/SoapErrorHandlingTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/SoapErrorHandlingTest.php
@@ -110,7 +110,7 @@ public function testUnauthorized()
         } catch (\SoapFault $e) {
             $this->checkSoapFault(
                 $e,
-                'Consumer is not authorized to access %resources',
+                "The consumer isn't authorized to access %resources.",
                 'env:Sender'
             );
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index 840649cec8db8..86f27908a96d5 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -71,7 +71,7 @@ public function testNoAuthorizedServices()
         curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
         $responseContent = curl_exec($connection);
         $this->assertEquals(curl_getinfo($connection, CURLINFO_HTTP_CODE), 401);
-        $this->assertContains("Consumer is not authorized to access %resources", $responseContent);
+        $this->assertContains("The consumer isn't authorized to access %resources.", $responseContent);
     }
 
     public function testInvalidWsdlUrlNoServices()
diff --git a/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncBulkScheduleTest.php b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncBulkScheduleTest.php
new file mode 100644
index 0000000000000..ea492098ed1f5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncBulkScheduleTest.php
@@ -0,0 +1,458 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NotFoundException;
+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 multiple products creation service,
+ * scheduling bulk to rabbitmq
+ * running consumers and check async.operation.add consumer
+ * check if product was created by async bulk requests
+ *
+ * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AsyncBulkScheduleTest extends WebapiAbstract
+{
+    const SERVICE_NAME = 'catalogProductRepositoryV1';
+    const SERVICE_VERSION = 'V1';
+    const REST_RESOURCE_PATH = '/V1/products';
+    const ASYNC_BULK_RESOURCE_PATH = '/async/bulk/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 productsArrayCreationProvider
+     */
+    public function testAsyncScheduleBulkMultipleEntities($products)
+    {
+        $this->_markTestAsRestOnly();
+        $this->skus = [];
+        foreach ($products as $product) {
+            $this->skus[] = $product['product'][ProductInterface::SKU];
+        }
+        $this->clearProducts();
+
+        $response = $this->saveProductAsync($products);
+        $this->assertArrayHasKey(self::BULK_UUID_KEY, $response);
+        $this->assertNotNull($response[self::BULK_UUID_KEY]);
+
+        $this->assertCount(2, $response['request_items']);
+        foreach ($products as $key => $product) {
+            $this->assertEquals('accepted', $response['request_items'][$key]['status']);
+        }
+        $this->assertFalse($response['errors']);
+
+        //assert one products is created
+        try {
+            $this->publisherConsumerController->waitForAsynchronousResult(
+                [$this, 'assertProductCreation'],
+                [$products]
+            );
+        } catch (PreconditionFailedException $e) {
+            $this->fail("Not all products were created");
+        }
+    }
+
+    /**
+     * @dataProvider productSingleCreationProvider
+     */
+    public function testAsyncScheduleBulkSingleEntity($products)
+    {
+        $this->_markTestAsRestOnly();
+        $this->skus = [];
+        $this->skus[] = $products[0]['product'][ProductInterface::SKU];
+        $this->clearProducts();
+
+        $response = $this->saveProductAsync($products);
+        $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'],
+                [$products]
+            );
+        } catch (PreconditionFailedException $e) {
+            $this->fail("Not all products were created");
+        }
+    }
+
+    /**
+     * @dataProvider wrongProductCreationProvider
+     */
+    public function testAsyncScheduleBulkWrongEntity($products)
+    {
+        $this->_markTestAsRestOnly();
+        $this->skus = [];
+        foreach ($products as $product) {
+            $this->skus[] = $product['product'][ProductInterface::SKU];
+        }
+        $this->clearProducts();
+
+        $response = null;
+        try {
+            $response = $this->saveProductAsync($products);
+        } catch (\Exception $e) {
+            $this->assertEquals(500, $e->getCode());
+        }
+        $this->assertNull($response);
+        $this->assertEquals(0, $this->checkProductsCreation());
+    }
+
+    /**
+     * @param string $sku
+     * @param string|null $storeCode
+     * @dataProvider productGetDataProvider
+     * @expectedException \Exception
+     * @expectedExceptionMessage Specified request cannot be processed.
+     */
+    public function testGETRequestToAsyncBulk($sku, $storeCode = null)
+    {
+        $this->_markTestAsRestOnly();
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::ASYNC_BULK_RESOURCE_PATH . '/' . $sku,
+                'httpMethod'   => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+        ];
+
+        $response = null;
+        try {
+            $response = $this->_webApiCall($serviceInfo, [ProductInterface::SKU => $sku], null, $storeCode);
+        } catch (NotFoundException $e) {
+            $this->assertEquals(400, $e->getCode());
+        }
+        $this->assertNull($response);
+    }
+
+    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]));
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function productsArrayCreationProvider()
+    {
+        $productBuilder = function ($data) {
+            return array_replace_recursive(
+                $this->getSimpleProductData(),
+                $data
+            );
+        };
+
+        return
+            [
+                [
+                    [
+                        [
+                            'product' =>
+                                $productBuilder([
+                                    ProductInterface::TYPE_ID => 'simple',
+                                    ProductInterface::SKU     => 'psku-test-1-multiple',
+                                ]),
+                        ],
+                        [
+                            'product' => $productBuilder([
+                                ProductInterface::TYPE_ID => 'virtual',
+                                ProductInterface::SKU     => 'psku-test-2-multiple',
+                            ]),
+                        ],
+                    ],
+                ],
+            ];
+    }
+
+    /**
+     * @return array
+     */
+    public function productSingleCreationProvider()
+    {
+        $productBuilder = function ($data) {
+            return array_replace_recursive(
+                $this->getSimpleProductData(),
+                $data
+            );
+        };
+
+        return
+            [
+                [
+                    [
+                        [
+                            'product' =>
+                                $productBuilder([
+                                    ProductInterface::TYPE_ID => 'simple',
+                                    ProductInterface::SKU     => 'psku-test-1-single',
+                                ]),
+                        ],
+                    ],
+                ],
+            ];
+    }
+
+    /**
+     * @return array
+     */
+    public function wrongProductCreationProvider()
+    {
+        $productBuilder = function ($data) {
+            return array_replace_recursive(
+                $this->getSimpleProductData(),
+                $data
+            );
+        };
+
+        $wrongProductBuilder = function ($data) {
+            return array_replace_recursive(
+                $this->getWrongProductStructureData(),
+                $data
+            );
+        };
+
+        return
+            [
+                [
+                    [
+                        [
+                            'product' =>
+                                $productBuilder([
+                                    ProductInterface::TYPE_ID => 'simple',
+                                    ProductInterface::SKU     => 'psku-test-1-wrong',
+                                ]),
+                        ],
+                        [
+                            'product' => $productBuilder([
+                                ProductInterface::TYPE_ID => 'virtual',
+                                ProductInterface::SKU     => 'psku-test-2-wrong',
+                            ]),
+                        ],
+                        [
+                            'product' =>
+                                $wrongProductBuilder([
+                                    'wrong_attribute'     => 'simple',
+                                    ProductInterface::SKU => 'psku-test-3-wrong',
+                                ]),
+                        ],
+                    ],
+                ],
+            ];
+    }
+
+    /**
+     * @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'],
+            ],
+        ];
+    }
+
+    /**
+     * Get Wrong Simple Product Data without required attributes
+     *
+     * @param array $productData
+     * @return array
+     */
+    private function getWrongProductStructureData($productData = [])
+    {
+        return [
+            ProductInterface::SKU => isset($productData[ProductInterface::SKU])
+                ? $productData[ProductInterface::SKU] : uniqid('sku-', true),
+        ];
+    }
+
+    /**
+     * @param $requestData
+     * @param string|null $storeCode
+     * @return mixed
+     */
+    private function saveProductAsync($requestData, $storeCode = null)
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::ASYNC_BULK_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);
+    }
+
+    /**
+     * @return int
+     */
+    public function checkProductsCreation()
+    {
+        $collection = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $this->skus])
+            ->load();
+        $size = $collection->getSize();
+
+        return $size;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleCustomRouteTest.php b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleCustomRouteTest.php
new file mode 100644
index 0000000000000..4a56c4e0e6f77
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleCustomRouteTest.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\NotFoundException;
+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 using custom route, scheduling bulk to rabbitmq
+ * running consumers and check async.operation.add consumer
+ * check if product was created by async requests
+ *
+ * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AsyncScheduleCustomRouteTest extends WebapiAbstract
+{
+    const ASYNC_RESOURCE_CUSTOM_PATH = '/asyncProducts';
+    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 testAsyncScheduleBulkByCustomRoute($product)
+    {
+        $this->_markTestAsRestOnly();
+        $this->skus[] = $product['product'][ProductInterface::SKU];
+        $this->clearProducts();
+
+        $response = $this->saveProductByCustomRoute($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]));
+        }
+    }
+
+    /**
+     * @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',
+                    ]),
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * 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 saveProductByCustomRoute($requestData, $storeCode = null)
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::ASYNC_RESOURCE_CUSTOM_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/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleTest.php b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleTest.php
new file mode 100644
index 0000000000000..b7dc1919382ef
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleTest.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\NotFoundException;
+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.operation.add consumer
+ * check if product was created by async requests
+ *
+ * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AsyncScheduleTest 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
+     * @dataProvider productGetDataProvider
+     * @expectedException \Exception
+     * @expectedExceptionMessage Specified request cannot be processed.
+     */
+    public function testGETRequestToAsync($sku, $storeCode = null)
+    {
+        $this->_markTestAsRestOnly();
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::ASYNC_RESOURCE_PATH . '/' . $sku,
+                'httpMethod'   => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+        ];
+
+        $response = null;
+        try {
+            $response = $this->_webApiCall($serviceInfo, [ProductInterface::SKU => $sku], null, $storeCode);
+        } catch (NotFoundException $e) {
+            $this->assertEquals(400, $e->getCode());
+        }
+        $this->assertNull($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/error_handler.php b/dev/tests/error_handler.php
new file mode 100644
index 0000000000000..1d06629729165
--- /dev/null
+++ b/dev/tests/error_handler.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Set custom error handler.
+ */
+function setCustomErrorHandler()
+{
+    set_error_handler(
+        function ($errNo, $errStr, $errFile, $errLine) {
+            if (error_reporting()) {
+                $errorNames = [
+                    E_ERROR => 'Error',
+                    E_WARNING => 'Warning',
+                    E_PARSE => 'Parse',
+                    E_NOTICE => 'Notice',
+                    E_CORE_ERROR => 'Core Error',
+                    E_CORE_WARNING => 'Core Warning',
+                    E_COMPILE_ERROR => 'Compile Error',
+                    E_COMPILE_WARNING => 'Compile Warning',
+                    E_USER_ERROR => 'User Error',
+                    E_USER_WARNING => 'User Warning',
+                    E_USER_NOTICE => 'User Notice',
+                    E_STRICT => 'Strict',
+                    E_RECOVERABLE_ERROR => 'Recoverable Error',
+                    E_DEPRECATED => 'Deprecated',
+                    E_USER_DEPRECATED => 'User Deprecated',
+                ];
+
+                $errName = isset($errorNames[$errNo]) ? $errorNames[$errNo] : "";
+
+                throw new \PHPUnit\Framework\Exception(
+                    sprintf("%s: %s in %s:%s.", $errName, $errStr, $errFile, $errLine),
+                    $errNo
+                );
+            }
+        }
+    );
+}
diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore
index d47f62b56bb9a..92e3004580b0c 100644
--- a/dev/tests/functional/.gitignore
+++ b/dev/tests/functional/.gitignore
@@ -6,3 +6,4 @@
 /vendor
 phpunit.xml
 credentials.xml
+.htaccess
diff --git a/dev/tests/functional/bootstrap.php b/dev/tests/functional/bootstrap.php
index 3c0fd4cc388cc..04156ca88ea70 100644
--- a/dev/tests/functional/bootstrap.php
+++ b/dev/tests/functional/bootstrap.php
@@ -6,23 +6,25 @@
 
 defined('MTF_BOOT_FILE') || define('MTF_BOOT_FILE', __FILE__);
 defined('MTF_BP') || define('MTF_BP', str_replace('\\', '/', (__DIR__)));
+defined('BP') || define('BP', str_replace('\\', '/', dirname(dirname(dirname((__DIR__))))));
 defined('MTF_TESTS_PATH') || define('MTF_TESTS_PATH', MTF_BP . '/tests/app/');
 defined('MTF_STATES_PATH') || define('MTF_STATES_PATH', MTF_BP . '/lib/Magento/Mtf/App/State/');
 
-require_once __DIR__ . '/../../../app/bootstrap.php';
 restore_error_handler();
-$vendorAutoload = __DIR__ . '/vendor/autoload.php';
-
-if (isset($composerAutoloader)) {
-    /** var $mtfComposerAutoload \Composer\Autoload\ClassLoader */
-    $mtfComposerAutoload = include $vendorAutoload;
-    $composerAutoloader->addClassMap($mtfComposerAutoload->getClassMap());
-} else {
-    $composerAutoloader = include $vendorAutoload;
-}
-
+include __DIR__ . '/vendor/autoload.php';
 setCustomErrorHandler();
 
+/* Custom umask value may be provided in optional mage_umask file in root */
+$umaskFile = BP . '/magento_umask';
+$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
+umask($mask);
+
+date_default_timezone_set('UTC');
+
+/*  For data consistency between displaying (printing) and serialization a float number */
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);
+
 /**
  * Set custom error handler
  */
@@ -51,7 +53,7 @@ function ($errNo, $errStr, $errFile, $errLine) {
 
                 $errName = isset($errorNames[$errNo]) ? $errorNames[$errNo] : "";
 
-                throw new \PHPUnit_Framework_Exception(
+                throw new \PHPUnit\Framework\Exception(
                     sprintf("%s: %s in %s:%s.", $errName, $errStr, $errFile, $errLine),
                     $errNo
                 );
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 89984a598f967..e49824d17df80 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -3,11 +3,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|~7.0.6|~7.1.0",
-        "magento/mtf": "1.0.0-rc57",
+        "php": "~7.1.3||~7.2.0",
+        "magento/mtf": "1.0.0-rc61",
         "allure-framework/allure-phpunit": "~1.2.0",
-        "phpunit/phpunit": "~4.8.0|~5.5.0",
-        "phpunit/phpunit-selenium": ">=1.2"
+        "doctrine/annotations": "1.4.*",
+        "phpunit/phpunit": "~6.5.0",
+        "phpunit/phpunit-selenium": "~4.1.0"
     },
     "suggest": {
         "netwing/selenium-server-standalone": "dev-master",
diff --git a/dev/tests/functional/credentials.xml.dist b/dev/tests/functional/credentials.xml.dist
index 57e24cd59aa08..01e3a35be9a2d 100644
--- a/dev/tests/functional/credentials.xml.dist
+++ b/dev/tests/functional/credentials.xml.dist
@@ -80,4 +80,5 @@
     <field path="payment/paypal_alternative_payment_methods/express_checkout_us/express_checkout_required/express_checkout_required_express_checkout/api_password" value="" />
     <field path="payment/paypal_alternative_payment_methods/express_checkout_us/express_checkout_required/express_checkout_required_express_checkout/api_signature" value="" />
 
+    <field path="fraud_protection/signifyd/api_key" value="" />
 </replace>
diff --git a/dev/tests/functional/etc/config.xml.dist b/dev/tests/functional/etc/config.xml.dist
index 2ab190c7e93ca..a995fc1b3c355 100644
--- a/dev/tests/functional/etc/config.xml.dist
+++ b/dev/tests/functional/etc/config.xml.dist
@@ -27,6 +27,11 @@
         <baseUrl>http://magento2ce.com/</baseUrl>
         <backendName>backend</backendName>
     </install>
+    <server>
+     	 <item name="selenium">
+     	    <item name="resolution" width="1366" height="768" />
+     	 </item>
+     </server>
     <handler>
         <webapi priority="0">
             <token>integration_token</token>
diff --git a/dev/tests/functional/etc/events.xml b/dev/tests/functional/etc/events.xml
index 5f6a771237a81..677a4c76ba88a 100644
--- a/dev/tests/functional/etc/events.xml
+++ b/dev/tests/functional/etc/events.xml
@@ -48,4 +48,32 @@
             <tag name="webapi_failed" />
         </observer>
     </preset>
+    <preset name="detailed" extends="base">
+        <observer class="Magento\Mtf\System\Observer\ClientError">
+            <tag name="page_changed" />
+            <tag name="exception" />
+        </observer>
+        <observer class="Magento\Mtf\System\Observer\Log">
+            <tag name="execution" />
+            <tag name="persist_before" />
+            <tag name="persist_after" />
+            <tag name="exception" />
+            <tag name="click_before" />
+            <tag name="set_value" />
+            <tag name="is_visible" />
+            <tag name="find" />
+            <tag name="reopen" />
+            <tag name="switch_to_frame" />
+            <tag name="get_value" />
+        </observer>
+        <observer class="Magento\Mtf\System\Observer\SourceCode">
+            <tag name="exception" />
+            <tag name="page_changed" />
+        </observer>
+        <observer class="Magento\Mtf\System\Observer\Screenshot">
+            <tag name="click_before" />
+            <tag name="page_changed" />
+            <tag name="exception" />
+        </observer>
+    </preset>
 </config>
diff --git a/dev/tests/functional/etc/repository_replacer_payments.xml b/dev/tests/functional/etc/repository_replacer_payments.xml
index 2b20e7220f537..a0ecca61eb372 100644
--- a/dev/tests/functional/etc/repository_replacer_payments.xml
+++ b/dev/tests/functional/etc/repository_replacer_payments.xml
@@ -21,4 +21,11 @@
             <field name="password" xsi:type="string">AUTHORIZENET_PASSWORD</field>
         </dataset>
     </repository>
+
+    <repository class="Magento\Signifyd\Test\Repository\SignifydAccount">
+        <dataset name="sandbox_default">
+            <field name="email" xsi:type="string">SIGNIFYD_EMAIL</field>
+            <field name="password" xsi:type="string">SIGNIFYD_PASSWORD</field>
+        </dataset>
+    </repository>
 </config>
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
index 9744408a7862f..a0e350cb3da43 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
@@ -65,6 +65,7 @@ public function setValue($value)
     {
         $date = $this->parseDate($value);
         $date[1] = ltrim($date[1], '0');
+        $this->click();
         $this->find($this->datePickerButton, Locator::SELECTOR_XPATH)->click();
         $datapicker = $this->find($this->datePickerBlock, Locator::SELECTOR_XPATH);
         $datapicker->find($this->datePickerYear, Locator::SELECTOR_XPATH, 'select')->setValue($date[2]);
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SimplifiedselectElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SimplifiedselectElement.php
index c9f37e9c18945..3aa7010377fb4 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SimplifiedselectElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SimplifiedselectElement.php
@@ -21,7 +21,7 @@ class SimplifiedselectElement extends SelectElement
     protected $optionGroupValue = ".//*[@data-title='%s' or contains(normalize-space(.), %s)]";
 
     /**
-     * Select value in ropdown which has option groups.
+     * Select value in dropdown which has option groups.
      *
      * @param string $value
      * @return void
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SwitcherElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SwitcherElement.php
index 6dce3d12a1fbe..36a203bb057e1 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SwitcherElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SwitcherElement.php
@@ -22,7 +22,7 @@ class SwitcherElement extends SimpleElement
     protected $parentContainer = 'parent::div[@data-role="switcher"]';
 
     /**
-     * XPath selector for label text on swticher element.
+     * XPath selector for label text on switcher element.
      *
      * @var string
      */
diff --git a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
index eb04450d5261d..61e5b7649303f 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
@@ -53,7 +53,7 @@ protected function verifyData(array $fixtureData, array $formData, $isStrict = f
             }
             $formValue = isset($formData[$key]) ? $formData[$key] : null;
             if (is_numeric($formValue)) {
-                $formValue = floatval($formValue);
+                $formValue = (float)$formValue;
             }
 
             if (null === $formValue) {
@@ -118,6 +118,7 @@ protected function sortData(array $data)
 
     /**
      * Sort multidimensional array by paths.
+     *
      * Pattern path: key/subKey::sortKey.
      * Example:
      * $data = [
@@ -150,7 +151,6 @@ protected function sortData(array $data)
      *
      * @param array $data
      * @param string $path
-     * @param string $path
      * @return array
      * @throws \Exception
      *
diff --git a/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/AdminAnalyzer.php b/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/AdminAnalyzer.php
index 3d34dec8d5d01..6ba3ca6da5287 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/AdminAnalyzer.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/AdminAnalyzer.php
@@ -74,7 +74,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        \PHPUnit_Util_Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
+        \PHPUnit\Util\Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
         $this->output = $this->objectManager->create(
             \Magento\Mtf\Console\Output::class,
             ['output' => $output]
diff --git a/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/HtaccessAnalyzer.php b/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/HtaccessAnalyzer.php
index 3965b44070b73..5095c725b87f1 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/HtaccessAnalyzer.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/HtaccessAnalyzer.php
@@ -73,7 +73,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        \PHPUnit_Util_Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
+        \PHPUnit\Util\Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
         $output = $this->objectManager->create(
             \Magento\Mtf\Console\Output::class,
             ['output' => $output]
diff --git a/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/StorefrontAnalyzer.php b/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/StorefrontAnalyzer.php
index 355b0ce34e3c1..990482d77bd20 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/StorefrontAnalyzer.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Troubleshooting/StorefrontAnalyzer.php
@@ -77,7 +77,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        \PHPUnit_Util_Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
+        \PHPUnit\Util\Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
         $output = $this->objectManager->create(
             \Magento\Mtf\Console\Output::class,
             ['output' => $output]
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Config.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Config.php
new file mode 100644
index 0000000000000..e7ce89a2c4ce9
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Config.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Mtf\Util\Command\Cli;
+
+use Magento\Mtf\Util\Command\Cli;
+
+/**
+ * Handle set configuration for test execution.
+ */
+class Config extends Cli
+{
+    /**
+     * Parameter for reindex command.
+     */
+    const PARAM_CONFIG_SET = 'config:set';
+
+    /**
+     * Set configuration.
+     *
+     * @param string $path
+     * @param string $value
+     * @param string|null $scope
+     * @param string|null $scopeCode
+     * @return void
+     */
+    public function setConfig($path, $value, $scope = null, $scopeCode = null)
+    {
+        $configurationString = '';
+
+        if ($scope !== null) {
+            $configurationString.= sprintf('--scope=%s ', $scope);
+        }
+
+        if ($scopeCode !== null) {
+            $configurationString.= sprintf('--scope-code=%s ', $scopeCode);
+        }
+        $configurationString.= sprintf('%s %s', $path, $value);
+
+        parent::execute(Config::PARAM_CONFIG_SET . ' ' . $configurationString);
+    }
+}
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php
index dc671f9b90d71..c7bbb2eae426f 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php
@@ -18,6 +18,6 @@ class Queue extends \Magento\Mtf\Util\Command\Cli
      */
     public function run($consumer)
     {
-        parent::execute('queue:consumers:start ' . $consumer . ' > /dev/null &');
+        parent::execute('queue:consumers:start ' . $consumer . ' --max-messages=100');
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php
index aabe948cd5d15..e67f4cf1a1aa2 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php
@@ -23,13 +23,6 @@ class Setup extends Cli
      */
     const PARAM_SETUP_DI_COMPILE = 'setup:di:compile';
 
-    /**
-     * Options for uninstall Magento command.
-     *
-     * @var array
-     */
-    private $options = ['-n'];
-
     /**
      * Uninstall Magento.
      *
@@ -37,7 +30,7 @@ class Setup extends Cli
      */
     public function uninstall()
     {
-        parent::execute(Setup::PARAM_SETUP_UNINSTALL, $this->options);
+        parent::execute(Setup::PARAM_SETUP_UNINSTALL);
     }
 
     /**
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
index 5bb1efee62959..192cab5751986 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
@@ -6,9 +6,6 @@
 
 namespace Magento\Mtf\Util\Generate;
 
-use Magento\Framework\App;
-use Magento\Framework\ObjectManagerInterface;
-
 /**
  * Factory classes generator.
  *
@@ -16,24 +13,10 @@
  */
 class Factory extends AbstractGenerate
 {
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    protected $objectManager;
-
-    /**
-     * @constructor
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(ObjectManagerInterface $objectManager)
-    {
-        $this->objectManager = $objectManager;
-    }
-
     /**
      * Generate Handlers.
      *
-     * @return \Magento\Framework\App\ResponseInterface
+     * @return bool
      */
     public function launch()
     {
@@ -43,7 +26,7 @@ public function launch()
         $this->objectManager->create(\Magento\Mtf\Util\Generate\Factory\Page::class)->launch();
         $this->objectManager->create(\Magento\Mtf\Util\Generate\Factory\Repository::class)->launch();
 
-        return $this->objectManager->get(\Magento\Framework\App\ResponseInterface::class);
+        return true;
     }
 
     /**
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
index b099e8a6c10e0..e48366f9a3645 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
@@ -209,7 +209,7 @@ protected function _processItem(& $items, & $rewrites, $filename, $location, $pa
         if ($reflectionClass->isAbstract()) {
             return;
         }
-        $annotations = \PHPUnit_Util_Test::parseTestMethodAnnotations($className);
+        $annotations = \PHPUnit\Util\Test::parseTestMethodAnnotations($className);
 
         list(, $targetClassName) = explode($location . '/', $filename);
         $targetClassName = str_replace('.php', '', $targetClassName);
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
index 533ea85a47b88..242527f2c4d13 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -182,14 +182,14 @@ protected function compositeCollectFields(array $fixture)
      * Retrieve connection to resource specified by $resourceName.
      *
      * @param string $resourceName
-     * @return \Exception|false|\Magento\Framework\DB\Adapter\AdapterInterface|\Zend_Exception
+     * @return \Exception|false|\Magento\Framework\DB\Adapter\AdapterInterface
      */
     protected function getConnection($resourceName)
     {
         try {
             $connection = $this->resource->getConnection($resourceName);
             return $connection;
-        } catch (\Zend_Exception $e) {
+        } catch (\Exception $e) {
             echo $e->getMessage() . PHP_EOL;
             return $e;
         }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php
index aa85299deea44..6d1d5b6f4b349 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/SchemaXml.php
@@ -145,7 +145,7 @@ protected function generateFixtureXml(array $config)
         foreach ($fields as $fieldName => $fieldValue) {
             $field = $this->dom->createElement('field');
             $field->setAttribute('name', $fieldName);
-            $field->setAttribute('is_required', intval($fieldValue['is_required']));
+            $field->setAttribute('is_required', (int)$fieldValue['is_required']);
             $fixture->appendChild($field);
         }
 
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php b/dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php
index a4b438a1d2de0..110d9d5fbd6c3 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php
@@ -10,37 +10,6 @@
  */
 class SequenceSorter implements SequenceSorterInterface
 {
-    /**
-     * Magento ObjectManager.
-     *
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    protected $magentoObjectManager;
-
-    /**
-     * @constructor
-     */
-    public function __construct()
-    {
-        $this->initObjectManager();
-    }
-
-    /**
-     * Initialize Magento ObjectManager.
-     *
-     * @return void
-     */
-    protected function initObjectManager()
-    {
-        if (!$this->magentoObjectManager) {
-            $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(
-                BP,
-                $_SERVER
-            );
-            $this->magentoObjectManager = $objectManagerFactory->create($_SERVER);
-        }
-    }
-
     /**
      * Get Magento module sequence load.
      *
@@ -48,7 +17,8 @@ protected function initObjectManager()
      */
     protected function getModuleSequence()
     {
-        return $this->magentoObjectManager->create(\Magento\Framework\Module\ModuleList\Loader::class)->load();
+        $ds = DIRECTORY_SEPARATOR;
+        return json_decode(file_get_contents(MTF_BP . $ds . 'generated' . $ds . 'moduleSequence.json'), true);
     }
 
     /**
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
index 83f86b264737c..0a8db19afe971 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
@@ -64,7 +64,7 @@ public function __construct(CurlTransport $transport, Customer $customer)
     protected function authorize(Customer $customer)
     {
         $url = $_ENV['app_frontend_url'] . 'customer/account/login/';
-        $this->transport->write($url);
+        $this->transport->write($url, [], CurlInterface::GET);
         $this->read();
         $url = $_ENV['app_frontend_url'] . 'customer/account/loginPost/';
         $data = [
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php
index 577d5e2a4fd8f..565d0f432bdaf 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php
@@ -37,7 +37,7 @@ public function processAssert(
         $this->exportData = $export->getLatest();
         foreach ($products as $product) {
             $regexps = $this->prepareRegexpsForCheck($exportedFields, $product);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $this->isProductDataExists($regexps),
                 'A product with name ' . $product->getName() . ' was not found in exported file.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php
index 6fd3389aaeb01..6119dd0cbc891 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php
@@ -59,7 +59,7 @@ public function processAssert(
 
         $resultArrays = $this->getPreparePrices();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $resultArrays['pageData'],
             $resultArrays['csvData'],
             'Tier prices from page and csv are not match.'
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/Adminhtml/Dashboard/AdvancedReporting/ReportsSectionBlock.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/Adminhtml/Dashboard/AdvancedReporting/ReportsSectionBlock.php
new file mode 100644
index 0000000000000..1c7edaaac86f0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/Adminhtml/Dashboard/AdvancedReporting/ReportsSectionBlock.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Block\Adminhtml\Dashboard\AdvancedReporting;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Advanced Reporting section on dashboard.
+ */
+class ReportsSectionBlock extends Block
+{
+    /**
+     * Advanced Reporting button on dashboard.
+     *
+     * @var string
+     */
+    protected $advancedReportingButton = '[data-index="analytics-service-link"]';
+
+    /**
+     * Click Advanced Reporting link.
+     *
+     * @return void
+     */
+    public function click()
+    {
+        $this->_rootElement->find($this->advancedReportingButton)->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php
new file mode 100644
index 0000000000000..07b62a9518ae4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Block\System\Config;
+
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Analytics form in admin configurations.
+ *
+ */
+class AnalyticsForm extends Form
+{
+    /**
+     * @var string
+     */
+    private $analyticsStatus = '#analytics_general_enabled';
+
+    /**
+     * @var string
+     */
+    private $analyticsStatusLabel = '#row_analytics_general_enabled > td.value > p > span';
+
+    /**
+     * @var string
+     */
+    private $submitButton = '#save';
+
+    /**
+     * @var string
+     */
+    private $analyticsVertical = '#analytics_general_vertical';
+
+    /**
+     * @var string
+     */
+    private $analyticsVerticalScope = '#row_analytics_general_vertical span[data-config-scope="[WEBSITE]"]';
+
+    /**
+     * @var string
+     */
+    private $sendDataTimeHh = '#row_analytics_general_collection_time > td.value > select:nth-child(2)';
+
+    /**
+     * @var string
+     */
+    private $sendDataTimeMm = '#row_analytics_general_collection_time > td.value > select:nth-child(3)';
+
+    /**
+     * @var string
+     */
+    private $sendDataTimeSs = '#row_analytics_general_collection_time > td.value > select:nth-child(4)';
+
+    /**
+     * @var string
+     */
+    private $timeZone =
+        '#row_analytics_general_collection_time > td.value > p > span';
+
+    /**
+     * @return array|string
+     */
+    public function isAnalyticsEnabled()
+    {
+        return $this->_rootElement->find($this->analyticsStatus, Locator::SELECTOR_CSS)->getValue();
+    }
+
+    /**
+     * @param string $state
+     * @return array|string
+     */
+    public function analyticsToggle($state = 'Enable')
+    {
+        return $this->_rootElement->find($this->analyticsStatus, Locator::SELECTOR_CSS, 'select')->setValue($state);
+    }
+
+    /**
+     * @return array|string
+     */
+    public function saveConfig()
+    {
+        return $this->browser->find($this->submitButton)->click();
+    }
+
+    /**
+     * @return array|string
+     */
+    public function getAnalyticsStatus()
+    {
+        return $this->_rootElement->find($this->analyticsStatusLabel, Locator::SELECTOR_CSS)->getText();
+    }
+
+    /**
+     * @param string $vertical
+     * @return array|string
+     */
+    public function setAnalyticsVertical($vertical)
+    {
+        return $this->_rootElement->find($this->analyticsVertical, Locator::SELECTOR_CSS, 'select')
+            ->setValue($vertical);
+    }
+
+    /**
+     * @param string $hh
+     * @param string $mm
+     * @return $this
+     */
+    public function setTimeOfDayToSendData($hh, $mm)
+    {
+        $this->_rootElement->find($this->sendDataTimeHh, Locator::SELECTOR_CSS, 'select')
+            ->setValue($hh);
+        $this->_rootElement->find($this->sendDataTimeMm, Locator::SELECTOR_CSS, 'select')
+            ->setValue($mm);
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTimeOfDayToSendDate()
+    {
+        $hh = $this->_rootElement->find($this->sendDataTimeHh, Locator::SELECTOR_CSS, 'select')
+            ->getValue();
+        $mm = $this->_rootElement->find($this->sendDataTimeMm, Locator::SELECTOR_CSS, 'select')
+            ->getValue();
+        $ss = $this->_rootElement->find($this->sendDataTimeSs, Locator::SELECTOR_CSS, 'select')
+            ->getValue();
+        return sprintf('%s, %s, %s', $hh, $mm, $ss);
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getTimeZone()
+    {
+        return $this->_rootElement->find($this->timeZone, Locator::SELECTOR_CSS)
+            ->getText();
+    }
+
+    /**
+     * @return array|string
+     */
+    public function getAnalyticsVertical()
+    {
+        return $this->_rootElement->find($this->analyticsVertical, Locator::SELECTOR_CSS)->getValue();
+    }
+
+    /**
+     * @return array|string
+     */
+    public function getAnalyticsVerticalScope()
+    {
+        return $this->_rootElement->find($this->analyticsVerticalScope, Locator::SELECTOR_CSS)->isVisible();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertAdvancedReportingPage.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertAdvancedReportingPage.php
new file mode 100644
index 0000000000000..01617cd1dcc80
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertAdvancedReportingPage.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Constraint;
+
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert Advanced Reporting Sign Up page is opened by admin dashboard link.
+ */
+class AssertAdvancedReportingPage extends AbstractConstraint
+{
+    /**
+     * Browser instance.
+     *
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * Assert Advanced Reporting Sign Up page is opened by link.
+     *
+     * @param BrowserInterface $browser
+     * @param string $advancedReportingLink
+     * @return void
+     */
+    public function processAssert(BrowserInterface $browser, $advancedReportingLink)
+    {
+        $this->browser = $browser;
+        $this->browser->selectWindow();
+        \PHPUnit\Framework\Assert::assertTrue(
+            $this->browser->waitUntil(
+                function () use ($advancedReportingLink) {
+                    return ($this->browser->getUrl() === $advancedReportingLink) ? true : null;
+                }
+            ),
+            'Advanced Reporting Sign Up page was not opened by link.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Advanced Reporting Sign Up page is opened by link';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertBIEssentialsLink.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertBIEssentialsLink.php
new file mode 100644
index 0000000000000..dbeea7083d4f6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertBIEssentialsLink.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Test\Constraint;
+
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+
+/**
+ * Assert BI Essentials Sign Up page is opened by admin menu link
+ */
+class AssertBIEssentialsLink extends AbstractConstraint
+{
+    /**
+     * Count of try for choose menu item.
+     */
+    const MAX_TRY_COUNT = 2;
+
+    /**
+     * Browser instance.
+     *
+     * @var BrowserInterface
+     */
+    protected $browser;
+
+    /**
+     * Assert BI Essentials Sign Up page is opened by link
+     *
+     * @param BrowserInterface $browser
+     * @param string $businessIntelligenceLink
+     * @param Dashboard $dashboard
+     * @param string $menuItem
+     * @param bool $waitMenuItemNotVisible
+     * @return void
+     */
+    public function processAssert(
+        BrowserInterface $browser,
+        $businessIntelligenceLink,
+        Dashboard $dashboard,
+        $menuItem,
+        $waitMenuItemNotVisible = false
+    ) {
+        /**
+         * In the parallel run case new windows that adding to selenium grid windows handler
+         * are in competition with another windows in another browsers in the same selenium grid.
+         * During this case need to have some algorithm for retrying some operations that changed
+         * current window for browser, because it's some times happens.
+         */
+        $this->browser = $browser;
+        $count = 0;
+        $isVisible = false;
+        do {
+            try {
+                $this->browser->selectWindow();
+                $isVisible = $this->browser->waitUntil(function () use ($businessIntelligenceLink) {
+                    return ($this->browser->getUrl() === $businessIntelligenceLink) ?: null;
+                });
+                break;
+            } catch (\Throwable $e) {
+                $dashboard->open();
+                $dashboard->getMenuBlock()->navigate($menuItem, $waitMenuItemNotVisible);
+                $count++;
+            }
+        } while ($count < self::MAX_TRY_COUNT);
+
+        \PHPUnit\Framework\Assert::assertTrue(
+            $isVisible,
+            "BI Essentials Sign Up page was not opened by link.\n
+                Actual link is '{$this->browser->getUrl()}'\n
+                Expected link is '$businessIntelligenceLink'"
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'BI Essentials Sign Up page is opened by link';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php
new file mode 100644
index 0000000000000..e793091a819eb
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Constraint;
+
+use Magento\Analytics\Test\Page\Adminhtml\ConfigAnalytics;
+use Magento\Analytics\Test\TestStep\OpenAnalyticsConfigStep;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert Advanced Reporting service is disabled
+ */
+class AssertConfigAnalyticsDisabled extends AbstractConstraint
+{
+    /**
+     * Assert Advanced Reporting service is disabled.
+     *
+     * @param ConfigAnalytics $configAnalytics
+     * @param OpenAnalyticsConfigStep $openAnalyticsConfigStep
+     * @return void
+     */
+    public function processAssert(ConfigAnalytics $configAnalytics, OpenAnalyticsConfigStep $openAnalyticsConfigStep)
+    {
+        $openAnalyticsConfigStep->run();
+
+        \PHPUnit\Framework\Assert::assertFalse(
+            (bool)$configAnalytics->getAnalyticsForm()->isAnalyticsEnabled(),
+            'Magento Advanced Reporting service is not disabled.'
+        );
+        \PHPUnit\Framework\Assert::assertEquals(
+            $configAnalytics->getAnalyticsForm()->getAnalyticsStatus(),
+            'Subscription status: Disabled',
+            'Magento Advanced Reporting service subscription status is not disabled.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Magento Advanced Reporting service is disabled and has Disabled status.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php
new file mode 100644
index 0000000000000..b26b01477940f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\Constraint;
+
+use Magento\Analytics\Test\Page\Adminhtml\ConfigAnalytics;
+use Magento\Analytics\Test\TestStep\OpenAnalyticsConfigStep;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert Advanced Reporting Service is enabled.
+ */
+class AssertConfigAnalyticsEnabled extends AbstractConstraint
+{
+    /**
+     * Assert Advanced Reporting service is enabled.
+     *
+     * @param ConfigAnalytics $configAnalytics
+     * @param OpenAnalyticsConfigStep $openAnalyticsConfigStep
+     * @return void
+     */
+    public function processAssert(ConfigAnalytics $configAnalytics, OpenAnalyticsConfigStep $openAnalyticsConfigStep)
+    {
+        $openAnalyticsConfigStep->run();
+
+        \PHPUnit\Framework\Assert::assertTrue(
+            (bool)$configAnalytics->getAnalyticsForm()->isAnalyticsEnabled(),
+            'Magento Advanced Reporting service is not enabled.'
+        );
+
+        \PHPUnit\Framework\Assert::assertEquals(
+            $configAnalytics->getAnalyticsForm()->getAnalyticsStatus(),
+            'Subscription status: Pending',
+            'Magento Advanced Reporting service subscription status is not pending.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Magento Advanced Reporting service is enabled and has Pending status';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/ConfigAnalytics.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/ConfigAnalytics.xml
new file mode 100644
index 0000000000000..d4a96e588261f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/ConfigAnalytics.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="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="ConfigAnalytics" area="Adminhtml" mca="admin/system_config/edit/section/analytics" module="Magento_Analytics">
+        <block name="AnalyticsForm" class="Magento\Analytics\Test\Block\System\Config\AnalyticsForm" locator="[id='page:main-container']" strategy="css selector" />
+        <block name="Messages" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/Dashboard.xml
new file mode 100644
index 0000000000000..8c8e75c03d24d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/Dashboard.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="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="Dashboard" area="Adminhtml" mca="admin/dashboard" module="Magento_Backend">
+        <block name="reportsSectionBlock" class="Magento\Analytics\Test\Block\Adminhtml\Dashboard\AdvancedReporting\ReportsSectionBlock" locator="[data-index='dashboard-advanced-reports']" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/DefaultTimeZone.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/DefaultTimeZone.xml
new file mode 100644
index 0000000000000..80d142f8abd60
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/DefaultTimeZone.xml
@@ -0,0 +1,35 @@
+<?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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Config\Test\Repository\ConfigData">
+        <dataset name="change_default_timezone">
+            <field name="general/locale/timezone" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Timezone</item>
+                <item name="value" xsi:type="string">Europe/Kiev</item>
+            </field>
+            <field name="analytics/general/collection_time" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Time of day to send data</item>
+                <item name="value" xsi:type="string">01,00,00</item>
+            </field>
+        </dataset>
+        <dataset name="change_default_timezone_rollback">
+            <field name="general/locale/timezone" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Timezone</item>
+                <item name="value" xsi:type="string">UTC</item>
+            </field>
+            <field name="analytics/general/collection_time" xsi:type="array">
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Time of day to send data</item>
+                <item name="value" xsi:type="string">02,00,00</item>
+            </field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/Integration.xml
new file mode 100644
index 0000000000000..0b4f80512f197
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/Integration.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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Integration\Test\Repository\Integration">
+        <dataset name="default_with_all_resources">
+            <field name="resources" xsi:type="array">
+                <item name="100" xsi:type="string">Analytics</item>
+            </field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/Role.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/Role.xml
new file mode 100644
index 0000000000000..77cc8b5fac038
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/Role.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\User\Test\Repository\Role">
+        <dataset name="role_without_subscription_permissions">
+            <field name="rolename" xsi:type="string">RoleName%isolation%</field>
+            <field name="resource_access" xsi:type="string">Custom</field>
+            <field name="current_password" xsi:type="string">%current_password%</field>
+            <field name="roles_resources" xsi:type="array">
+                <item name="Dashboard" xsi:type="string">Magento_Backend::dashboard</item>
+                <item name="Stores" xsi:type="string">Magento_Backend::stores</item>
+                <item name="Configuration" xsi:type="string">Magento_Config::config</item>
+                <item name="General Section" xsi:type="string">Magento_Config::config_general</item>
+                <item name="System" xsi:type="string">Magento_Backend::system</item>
+                <item name="Other Settings" xsi:type="string">Magento_Backend::system_other_settings</item>
+                <item name="Notifications" xsi:type="string">Magento_AdminNotification::adminnotification</item>
+                <item name="Show list" xsi:type="string">Magento_AdminNotification::show_list</item>
+            </field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/User.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/User.xml
new file mode 100644
index 0000000000000..13bbb4d1306c5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Repository/User.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\User\Test\Repository\User">
+        <dataset name="custom_admin_with_role_without_subscription_permissions">
+            <field name="username" xsi:type="string">AdminUser%isolation%</field>
+            <field name="firstname" xsi:type="string">FirstName%isolation%</field>
+            <field name="lastname" xsi:type="string">LastName%isolation%</field>
+            <field name="email" xsi:type="string">email%isolation%@example.com</field>
+            <field name="password" xsi:type="string">123123q</field>
+            <field name="password_confirmation" xsi:type="string">123123q</field>
+            <field name="role_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">role::role_without_subscription_permissions</item>
+            </field>
+            <field name="current_password" xsi:type="string">%current_password%</field>
+            <field name="is_active" xsi:type="string">Active</field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.php
new file mode 100644
index 0000000000000..970ce59ceb5bf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\TestCase;
+
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+
+/**
+ * Steps:
+ * 1. Log in to backend.
+ * 2. Click on Advanced Reporting link.
+ * 3. Perform asserts.
+ *
+ * @ZephyrId MAGETWO-63715
+ */
+class AdvancedReportingButtonTest extends Injectable
+{
+    /* tags */
+    const MVP = 'no';
+    /* end tags */
+
+    /**
+     * Run menu navigation test.
+     *
+     * @param Dashboard $dashboard
+     * @return void
+     */
+    public function test(Dashboard $dashboard)
+    {
+        $dashboard->open();
+        $dashboard->getReportsSectionBlock()->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
new file mode 100644
index 0000000000000..a975d19ef8879
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Analytics\Test\TestCase\AdvancedReportingButtonTest" summary="Navigate through Advanced Reporting button on dashboard to Sign Up page" ticketId="MAGETWO-63715">
+        <variation name="AdvancedReportingButtonTest">
+            <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
+            <constraint name="Magento\Analytics\Test\Constraint\AssertAdvancedReportingPage" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/InstallTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/InstallTest.xml
new file mode 100644
index 0000000000000..fe2346b2a83f8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/InstallTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Install\Test\TestCase\InstallTest" summary="[Web Setup][Auto] Install CE Magento via Web Interface">
+        <variation name="InstallTestVariation" summary="Magento analytics opt-in by default" ticketId="MAGETWO-86059">
+            <data name="tag" xsi:type="string">severity:S1</data>
+            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" next="Magento\Analytics\Test\Constraint\AssertConfigAnalyticsEnabled"/>
+            <constraint name="Magento\Analytics\Test\Constraint\AssertConfigAnalyticsEnabled" prev="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
new file mode 100644
index 0000000000000..cdb73c5d36f25
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
+        <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
+            <data name="issue" xsi:type="string">MAGETWO-97261: Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins</data>
+            <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
+            <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
+            <data name="businessIntelligenceLink" xsi:type="string">https://dashboard.rjmetrics.com/v2/magento/signup</data>
+            <constraint name="Magento\Analytics\Test\Constraint\AssertBIEssentialsLink" />
+        </variation>
+        <variation name="NavigateMenuTestAdvancedReporting" summary="Navigate through Advanced Reporting admin menu to BI Reports page" ticketId="MAGETWO-65748">
+            <data name="menuItem" xsi:type="string">Reports > Advanced Reporting</data>
+            <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
+            <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
+            <constraint name="Magento\Analytics\Test\Constraint\AssertAdvancedReportingPage" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestStep/OpenAnalyticsConfigStep.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestStep/OpenAnalyticsConfigStep.php
new file mode 100644
index 0000000000000..1f0a8ff4804a3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestStep/OpenAnalyticsConfigStep.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Steps:
+ * 1. Log in to backend.
+ * 2. Navigate to Stores->Configuration->General->Analytics->General menu.
+ */
+class OpenAnalyticsConfigStep implements TestStepInterface
+{
+    /**
+     * Dashboard page.
+     *
+     * @var Dashboard
+     */
+    private $dashboard;
+
+    /**
+     * System Config page.
+     *
+     * @var SystemConfigEdit
+     */
+    private $systemConfigPage;
+
+    /**
+     * @param Dashboard $dashboard
+     * @param SystemConfigEdit $systemConfigPage
+     */
+    public function __construct(Dashboard $dashboard, SystemConfigEdit $systemConfigPage)
+    {
+        $this->dashboard = $dashboard;
+        $this->systemConfigPage = $systemConfigPage;
+    }
+
+    /**
+     * Navigate to Stores->Configuration->General->Analytics->General menu.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->dashboard->open();
+        $this->dashboard->getMenuBlock()->navigate('Stores > Configuration');
+        $this->systemConfigPage->getForm()->getGroup('analytics', 'general');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/etc/di.xml
new file mode 100644
index 0000000000000..ac51a3e2b6dd8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * 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\Analytics\Test\Constraint\AssertConfigAnalyticsDisabled">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Analytics\Test\Constraint\AssertConfigAnalyticsEnabled">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Constraint/AssertCreditCardNumberOnOnePageCheckout.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Constraint/AssertCreditCardNumberOnOnePageCheckout.php
index d4abb6efd2edb..cd1dfce621806 100644
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Constraint/AssertCreditCardNumberOnOnePageCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Constraint/AssertCreditCardNumberOnOnePageCheckout.php
@@ -24,7 +24,7 @@ class AssertCreditCardNumberOnOnePageCheckout extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage, CreditCard $creditCard)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $creditCard->getCcNumber(),
             $checkoutOnepage->getAuthorizenetBlock()->getCCNumber(),
             'Credit card data did persist with the values from fixture'
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutDeclinedTest.xml
index 1c589afcc1e20..00c1a1557e05b 100644
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutDeclinedTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutDeclinedTest.xml
@@ -17,7 +17,7 @@
             <data name="payment/method" xsi:type="string">authorizenet_directpost</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="configData" xsi:type="string">authorizenet, authorizenet_wrong_credentials</data>
-            <data name="expectedErrorMessage" xsi:type="string">An error occurred on the server. Please try to place the order again.</data>
+            <data name="expectedErrorMessage" xsi:type="string">A server error stopped your order from being placed. Please try to place your order again.</data>
             <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
index ae3857d8e4f6d..87a3ed048dbb9 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
@@ -99,6 +99,18 @@ public function searchAndOpenWebsite(Website $website)
         $this->_rootElement->find(sprintf($this->storeName, $websiteName), Locator::SELECTOR_XPATH)->click();
     }
 
+    /**
+     * Search and open appropriate Website by name.
+     *
+     * @param string $websiteName
+     * @return void
+     */
+    public function searchAndOpenWebsiteByName($websiteName)
+    {
+        $this->search(['website_title' => $websiteName]);
+        $this->_rootElement->find(sprintf($this->storeName, $websiteName), Locator::SELECTOR_XPATH)->click();
+    }
+
     /**
      * Search and open appropriate Store View.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertAdminLoginPageIsAvailable.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertAdminLoginPageIsAvailable.php
index 4fbd1b9e3077b..52a498e13e515 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertAdminLoginPageIsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertAdminLoginPageIsAvailable.php
@@ -23,7 +23,7 @@ class AssertAdminLoginPageIsAvailable extends AbstractConstraint
     public function processAssert(AdminAuthLogin $adminAuthLogin)
     {
         $adminAuthLogin->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $adminAuthLogin->getLoginBlock()->isVisible(),
             'Admin session does not expire properly.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBackendPageIsAvailable.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBackendPageIsAvailable.php
index 5fa7780ba79ec..40048e8cc646c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBackendPageIsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBackendPageIsAvailable.php
@@ -25,12 +25,12 @@ class AssertBackendPageIsAvailable extends AbstractConstraint
      */
     public function processAssert(Dashboard $dashboard, $pageTitle)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $pageTitle,
             $dashboard->getTitleBlock()->getTitle(),
             'Invalid page title is displayed.'
         );
-        \PHPUnit_Framework_Assert::assertNotContains(
+        \PHPUnit\Framework\Assert::assertNotContains(
             self::ERROR_TEXT,
             $dashboard->getErrorBlock()->getContent(),
             "404 Error is displayed on '$pageTitle' page."
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
index 58a4521590ec0..4e792cd3aedf8 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
@@ -34,7 +34,7 @@ public function processAssert(OrderInjectable $order, Dashboard $dashboard)
         $bestsellersGrid = $dashboard->getStoreStatsBlock()->getTab('bestsellers')->getBestsellersGrid();
         $products = $order->getEntityId()['products'];
         foreach ($products as $product) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $bestsellersGrid->isProductVisible($product),
                 'Bestseller ' . $product->getName() . ' is not present in report grid after refresh data.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertDeveloperSectionVisibility.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertDeveloperSectionVisibility.php
index 1e73bb4867e2e..4cff4b2a90c17 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertDeveloperSectionVisibility.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertDeveloperSectionVisibility.php
@@ -22,12 +22,12 @@ class AssertDeveloperSectionVisibility extends AbstractConstraint
     public function processAssert(SystemConfigEdit $configEdit)
     {
         if ($_ENV['mage_mode'] === 'production') {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 in_array('Developer', $configEdit->getTabs()->getSubTabsNames('Advanced')),
                 'Developer section should be hidden in production mode.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 in_array('Developer', $configEdit->getTabs()->getSubTabsNames('Advanced')),
                 'Developer section should be not hidden in developer or default mode.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
index ebdf71e6a289b..842043a585024 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
@@ -30,18 +30,18 @@ public function processAssert(Dashboard $dashboard, GlobalSearch $search, Custom
         $customer = $search->getDataFieldConfig('query')['source']->getEntity();
         $customerName = $customer->getFirstname() . " " . $customer->getLastname();
         $isVisibleInResult = $dashboard->getAdminPanelHeader()->isSearchResultVisible($customerName);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisibleInResult,
             'Customer name ' . $customerName . ' is absent in search results'
         );
 
         $dashboard->getAdminPanelHeader()->navigateToGrid("Customers");
         $isCustomerGridVisible = $customerIndex->getCustomerGridBlock()->isVisible();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isCustomerGridVisible,
             'Customer grid is not visible'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             (string) $customer->getId(),
             $customerIndex->getCustomerGridBlock()->getAllIds(),
             'Customer grid does not have ' . $customerName . ' in search results'
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
index 42639f1b62e56..c7cd0f19131ce 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
@@ -29,7 +29,7 @@ class AssertGlobalSearchNoRecordsFound extends AbstractConstraint
     public function processAssert(Dashboard $dashboard)
     {
         $isVisibleInResult = $dashboard->getAdminPanelHeader()->isSearchResultVisible(self::EXPECTED_RESULT);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisibleInResult,
             'Expected text ' . self::EXPECTED_RESULT . ' is absent in search results'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
index b3a1f382da419..63bf2c9c3a019 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
@@ -30,7 +30,7 @@ public function processAssert(Dashboard $dashboard, GlobalSearch $search, OrderI
         $order = $search->getDataFieldConfig('query')['source']->getEntity();
         $orderId = "Order #" . $order->getId();
         $isVisibleInResult = $dashboard->getAdminPanelHeader()->isSearchResultVisible($orderId);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisibleInResult,
             'Order Id ' . $order->getId() . ' is absent in search results'
         );
@@ -38,11 +38,11 @@ public function processAssert(Dashboard $dashboard, GlobalSearch $search, OrderI
         $dashboard->getAdminPanelHeader()->navigateToGrid("Orders");
         $isOrderGridVisible = $orderIndex->getSalesOrderGrid()->isVisible();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isOrderGridVisible,
             'Order grid is not visible'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             (string) $order->getId(),
             $orderIndex->getSalesOrderGrid()->getAllIds(),
             'Order grid does not have ' . $order->getId()  . ' in search results'
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchPreview.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchPreview.php
index 8c9668f35dde2..4f1445cf4e180 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchPreview.php
@@ -42,7 +42,7 @@ private function adminSearchAssert($dashboard, $search, $type)
     {
         $adminSearchPreview = '"' . $search->getQuery() . '" in '. $type;
         $isVisibleInResult = $dashboard->getAdminPanelHeader()->isAdminSearchPreviewVisible($adminSearchPreview, $type);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisibleInResult,
             'Search Preview for ' . $type . ' is not in search results'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
index 66cdb038f0847..29df5cf456517 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
@@ -33,7 +33,7 @@ public function processAssert(Dashboard $dashboard, GlobalSearch $search)
         $productName = $product->getName();
         $isVisibleInResult = $dashboard->getAdminPanelHeader()->isSearchResultVisible($productName);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisibleInResult,
             'Product name ' . $productName . ' is absent in search results'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
index a91597e3b9881..7d75db5f0368c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
@@ -22,7 +22,7 @@ class AssertHttpUsedOnFrontend extends AbstractConstraint
      *
      * @var string
      */
-    private $unsecuredProtocol = \Magento\Framework\HTTP\PhpEnvironment\Request::SCHEME_HTTP;
+    const SCHEME_HTTP  = 'http';
 
     /**
      * Browser interface.
@@ -53,11 +53,11 @@ public function processAssert(BrowserInterface $browser, Customer $customer)
 
         // Log in to Customer Account on Storefront to assert that http is used indeed.
         $this->objectManager->create(LogInCustomerOnStorefront::class, ['customer' => $this->customer])->run();
-        $this->assertUsedProtocol($this->unsecuredProtocol);
+        $this->assertUsedProtocol(self::SCHEME_HTTP);
 
         // Log out from Customer Account on Storefront to assert that JS is deployed validly as a part of statics.
         $this->objectManager->create(LogOutCustomerOnStorefront::class)->run();
-        $this->assertUsedProtocol($this->unsecuredProtocol);
+        $this->assertUsedProtocol(self::SCHEME_HTTP);
     }
 
     /**
@@ -72,7 +72,7 @@ protected function assertUsedProtocol($expectedProtocol)
             $expectedProtocol .= '://';
         }
 
-        \PHPUnit_Framework_Assert::assertStringStartsWith(
+        \PHPUnit\Framework\Assert::assertStringStartsWith(
             $expectedProtocol,
             $this->browser->getUrl(),
             "$expectedProtocol is not used."
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsAvailable.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsAvailable.php
index cf0de914b7bed..5dd43604408cf 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsAvailable.php
@@ -62,12 +62,12 @@ private function verifyConfiguration(SystemConfigEdit $systemConfigEdit, ConfigD
                 $group = $systemConfigEdit->getForm()->getGroup($tabName, $groupName);
                 $group->setValue($tabName, $groupName, $fieldName, 'Yes');
                 $group->setValue($tabName, $groupName, $fieldName, 'No');
-                \PHPUnit_Framework_Assert::assertTrue(
+                \PHPUnit\Framework\Assert::assertTrue(
                     true,
                     $fieldName . " configuration is enabled with options Yes & No."
                 );
             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-                \PHPUnit_Framework_Assert::assertFalse(
+                \PHPUnit\Framework\Assert::assertFalse(
                     true,
                     $fieldName . " configuration is not enabled with options Yes & No."
                 );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsNotAvailable.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsNotAvailable.php
index 007d7998d0466..ef6a5821733cd 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsNotAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsNotAvailable.php
@@ -62,7 +62,7 @@ private function verifyConfiguration(
             $fieldName = $parts[2];
             $isVisible = $systemConfigEdit->getForm()->getGroup($tabName, $groupName)
                 ->isFieldVisible($tabName, $groupName, $fieldName);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 !$isVisible,
                 $fieldName . " configuration is not visible."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
index 4b04eb9690a98..cc64e4a4c7299 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
@@ -16,18 +16,10 @@
 class AssertHttpsUsedOnBackend extends AbstractConstraint
 {
     /**
-     * Secured protocol format.
-     *
-     * @var string
-     */
-    private $securedProtocol = \Magento\Framework\HTTP\PhpEnvironment\Request::SCHEME_HTTPS;
-
-    /**
-     * Unsecured protocol format.
-     *
-     * @var string
+     * Protocols
      */
-    private $unsecuredProtocol = \Magento\Framework\HTTP\PhpEnvironment\Request::SCHEME_HTTP;
+    const SCHEME_HTTP  = 'http';
+    const SCHEME_HTTPS = 'https';
 
     /**
      * Browser interface.
@@ -50,7 +42,7 @@ public function processAssert(BrowserInterface $browser, Dashboard $adminDashboa
 
         // Open specified Admin page using Navigation Menu to assert that JS is deployed validly as a part of statics.
         $adminDashboardPage->open()->getMenuBlock()->navigate($navMenuPath);
-        $this->assertUsedProtocol($this->securedProtocol);
+        $this->assertUsedProtocol(self::SCHEME_HTTPS);
         $this->assertDirectHttpUnavailable();
     }
 
@@ -66,7 +58,7 @@ protected function assertUsedProtocol($expectedProtocol)
             $expectedProtocol .= '://';
         }
 
-        \PHPUnit_Framework_Assert::assertStringStartsWith(
+        \PHPUnit\Framework\Assert::assertStringStartsWith(
             $expectedProtocol,
             $this->browser->getUrl(),
             "$expectedProtocol is not used."
@@ -80,10 +72,10 @@ protected function assertUsedProtocol($expectedProtocol)
      */
     protected function assertDirectHttpUnavailable()
     {
-        $fakeUrl = str_replace($this->securedProtocol, $this->unsecuredProtocol, $this->browser->getUrl());
+        $fakeUrl = str_replace(self::SCHEME_HTTPS, self::SCHEME_HTTP, $this->browser->getUrl());
         $this->browser->open($fakeUrl);
-        \PHPUnit_Framework_Assert::assertStringStartsWith(
-            $this->securedProtocol,
+        \PHPUnit\Framework\Assert::assertStringStartsWith(
+            self::SCHEME_HTTPS,
             $this->browser->getUrl(),
             'Merchant is not redirected to https if tries to access the Admin panel page directly via http.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertInterfaceLocaleAvailableOptions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertInterfaceLocaleAvailableOptions.php
index 99fe4503a699d..4ccab6c64567b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertInterfaceLocaleAvailableOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertInterfaceLocaleAvailableOptions.php
@@ -28,12 +28,12 @@ public function processAssert(
         $dropdownLocales = []
     ) {
         if ($_ENV['mage_mode'] === 'production') {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $locales->getList(Locales::TYPE_DEPLOYED),
                 $dropdownLocales
             );
         } else {
-            \PHPUnit_Framework_Assert::assertEmpty(
+            \PHPUnit\Framework\Assert::assertEmpty(
                 array_diff($dropdownLocales, $locales->getList(Locales::TYPE_ALL))
             );
         }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertLocaleCodeVisibility.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertLocaleCodeVisibility.php
index 983ada662b261..65bf9c3328a1a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertLocaleCodeVisibility.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertLocaleCodeVisibility.php
@@ -22,12 +22,12 @@ class AssertLocaleCodeVisibility extends AbstractConstraint
     public function processAssert(SystemConfigEdit $configEdit)
     {
         if ($_ENV['mage_mode'] === 'production') {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $configEdit->getForm()->getGroup('general', 'locale')->isFieldDisabled('general', 'locale', 'code'),
                 'Locale field should be disabled in production mode.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $configEdit->getForm()->getGroup('general', 'locale')->isFieldDisabled('general', 'locale', 'code'),
                 'Locale field should be not disabled in developer or default mode.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertMenuItemNotVisible.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertMenuItemNotVisible.php
index 349b31db3f9e0..9dff907999ca4 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertMenuItemNotVisible.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertMenuItemNotVisible.php
@@ -25,7 +25,7 @@ public function processAssert(Dashboard $dashboard, $menuItem)
     {
         $dashboard->open();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $dashboard->getMenuBlock()->isMenuItemVisible($menuItem),
             'Menu item ' . $menuItem . '  is supposed to be not visible.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php
index 7fedd9d313237..fabf406f9a742 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php
@@ -59,7 +59,7 @@ public function processAssert(
 
         $cmsIndex->getStoreSwitcherBlock()->selectStoreView($store->getName());
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getSearchBlock()->isPlaceholderContains($welcomeText),
             "Locale not applied."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
index 3738f51ef6c6a..01d8401b22fe1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Backend\Test\Handler\Ui;
 
+use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Mtf\Factory\Factory;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Handler\Ui;
@@ -29,10 +30,15 @@ public function persist(FixtureInterface $fixture = null)
             $fixture = Factory::getFixtureFactory()->getMagentoBackendAdminSuperAdmin();
         }
 
+        /** @var AdminAuthLogin $loginPage */
         $loginPage = Factory::getPageFactory()->getAdminAuthLogin();
         $loginForm = $loginPage->getLoginBlock();
-
         $adminHeaderPanel = $loginPage->getHeaderBlock();
+        if (!$loginForm->isVisible() && !$adminHeaderPanel->isVisible()) {
+            //We are currently not in the admin area.
+            $loginPage->open();
+        }
+
         if (!$adminHeaderPanel || !$adminHeaderPanel->isVisible()) {
             $loginPage->open();
             if ($adminHeaderPanel->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
index 09cd48e5d068b..91163465aa963 100644
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
@@ -23,7 +23,7 @@ class AssertBackupInGrid extends AbstractConstraint
      */
     public function processAssert(BackupIndex $backupIndex)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $backupIndex->open()->getBackupGrid()->isBackupRowVisible(),
             'Backup is not present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml
new file mode 100644
index 0000000000000..c8b19aa2bd32b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Config\Test\Repository\ConfigData">
+        <dataset name="enable_backups_functionality">
+            <field name="system/backup/functionality_enabled" xsi:type="array">
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="enable_backups_functionality_rollback">
+            <field name="web/url/use_store" xsi:type="array">
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml
deleted file mode 100644
index 0c024f0e3f5aa..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-        <variation name="NavigateMenuTest7">
-            <data name="menuItem" xsi:type="string">System > Backups</data>
-            <data name="pageTitle" xsi:type="string">Backups</data>
-            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-        </variation>
-    </testCase>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/Assert3dSecureInfoIsPresent.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/Assert3dSecureInfoIsPresent.php
index 90b5c0fa7e48f..b3a2a8bc55e1f 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/Assert3dSecureInfoIsPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/Assert3dSecureInfoIsPresent.php
@@ -27,12 +27,12 @@ public function processAssert(SalesOrderView $salesOrderView, array $paymentInfo
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $actualPaymentInformation = $infoTab->getPaymentInfoBlock()->getData();
         foreach ($paymentInformation as $key => $value) {
-            \PHPUnit_Framework_Assert::assertArrayHasKey(
+            \PHPUnit\Framework\Assert::assertArrayHasKey(
                 $key,
                 $actualPaymentInformation,
                 '3D Secure information is not present.'
             );
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $paymentInformation[$key],
                 $value,
                 '3D Secure information is not equal to information from data set.'
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertCreditCardJsValidationMessagesArePresent.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertCreditCardJsValidationMessagesArePresent.php
index 28494901dcc60..28bb60ff3f186 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertCreditCardJsValidationMessagesArePresent.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertCreditCardJsValidationMessagesArePresent.php
@@ -26,7 +26,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, array $expectedE
         $errorMessages = $checkoutOnepage->getBraintreeBlock()->getVisibleMessages($expectedErrorMessages);
 
         foreach (array_keys($errorMessages) as $field) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $expectedErrorMessages[$field],
                 $errorMessages[$field],
                 "Wrong js validation error message is displayed for field: $field."
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php
index 7eb53d728b079..b238302e8f47f 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php
@@ -17,7 +17,7 @@ class AssertDeviceDataIsPresentInBraintreeRequest extends AbstractConstraint
     /**
      * Log file name.
      */
-    const FILE_NAME = 'debug.log';
+    const FILE_NAME = 'payment.log';
 
     /**
      * Device data pattern for regular expression.
@@ -33,7 +33,7 @@ class AssertDeviceDataIsPresentInBraintreeRequest extends AbstractConstraint
     public function processAssert(Log $log)
     {
         $file = $log->getFileContent(self::FILE_NAME);
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             self::DEVICE_DATA_PATTERN,
             $file,
             'The device data is not present in Braintree request.'
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php
index a3b28e611ef17..9ec9acc9e9cb7 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php
@@ -47,7 +47,7 @@ public function processAssert(
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
 
         $transactionId = $this->getTransactionId();
-        \PHPUnit_Framework_Assert::assertNotEmpty($transactionId);
+        \PHPUnit\Framework\Assert::assertNotEmpty($transactionId);
 
         $this->settlementReportIndex->open();
 
@@ -56,7 +56,7 @@ public function processAssert(
 
         $ids = $grid->getTransactionIds();
 
-        \PHPUnit_Framework_Assert::assertTrue(in_array($transactionId, $ids));
+        \PHPUnit\Framework\Assert::assertTrue(in_array($transactionId, $ids));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
index 8ffcab68cdc62..70582077ed29d 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
@@ -27,8 +27,8 @@
             <data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
             <data name="configData" xsi:type="string">braintree</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Invoice, Reorder, Edit</data>
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -55,37 +55,14 @@
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
             <data name="configData" xsi:type="string">braintree, braintree_sale</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Hold, Ship, Reorder</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <data name="status" xsi:type="string">Complete</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Reorder</data>
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
         </variation>
-        <variation name="CreateOrderBackendTestBraintreeVariation3" summary="Checkout with Braintree Credit Card from Admin (Basic Fraud Protection)" ticketId="MAGETWO-46470">
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
-            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
-            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
-            <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
-            <data name="saveAddress" xsi:type="string">No</data>
-            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-            <data name="prices" xsi:type="array">
-                <item name="grandTotal" xsi:type="string">145.98</item>
-            </data>
-            <data name="payment/method" xsi:type="string">braintree</data>
-            <data name="paymentForm" xsi:type="string">braintree</data>
-            <data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
-            <data name="configData" xsi:type="string">braintree</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
index bea169dc64ad3..7f15a6ba03f15 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
@@ -26,7 +26,7 @@
             <data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
             <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
             <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml
index e4c0dce0c5b10..18aedfa97f9eb 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml
@@ -7,7 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <qty />
         <checkbox>
             <selector>div[contains(@class,"field choice") and label[contains(.,"%product_name%")]]//input</selector>
             <strategy>xpath</strategy>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
index 489d73b2f341a..5042eb2a2c3aa 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
@@ -39,13 +39,13 @@ protected function assertPrice(FixtureInterface $bundle, CatalogCategoryView $ca
                 : $priceBlock->getPrice();
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $priceData['price_from'],
             $priceLow,
             'Bundle price From on category page is not correct.'
         );
         if ($bundle->getPriceView() == 'Price Range') {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $priceData['price_to'],
                 $priceBlock->getPriceTo(),
                 'Bundle price To on category page is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
index 1b13f47ba8a43..eb0f2bed954a4 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
@@ -43,7 +43,7 @@ public function processAssert(
         }
 
         $error = $this->verifyData($productOptions, $formOptions);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php
index d73053f4e4b61..b769d9b75722c 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsSummaryOnProductPage.php
@@ -67,7 +67,7 @@ public function processAssert(
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedResult,
             $actualResult,
             'Bundle Summary Section does not contain correct bundle options data.'
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionTitleOnStorefront.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionTitleOnStorefront.php
index c05106776d9ff..2b9db50362de6 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionTitleOnStorefront.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionTitleOnStorefront.php
@@ -43,7 +43,7 @@ public function processAssert(
             $cmsIndex->getLinksBlock()->waitWelcomeMessage();
             $browser->open($_ENV['app_frontend_url'] . $originalProduct->getUrlKey() . '.html');
             $catalogProductView->getBundleViewBlock()->clickCustomize();
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $catalogProductView->getBundleViewBlock()->getBundleBlock()->isOptionVisible(
                     $optionTitles[$store->getStoreId()]
                 ),
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionsDeleted.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionsDeleted.php
index f47a1d90b67d6..0fb3786c24de7 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionsDeleted.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleOptionsDeleted.php
@@ -41,12 +41,12 @@ public function processAssert(
 
         $productDataLength = count($productData);
         $formDataLength = count($productData);
-        \PHPUnit_Framework_Assert::assertEquals($productDataLength, $formDataLength);
+        \PHPUnit\Framework\Assert::assertEquals($productDataLength, $formDataLength);
 
         foreach ($productData as $index => $option) {
             $productAssociatedDataLength = count($option['assigned_products']);
             $formAssociatedDataLength = count($formData[$index]['assigned_products']);
-            \PHPUnit_Framework_Assert::assertEquals($productAssociatedDataLength, $formAssociatedDataLength);
+            \PHPUnit\Framework\Assert::assertEquals($productAssociatedDataLength, $formAssociatedDataLength);
 
             foreach ($option['assigned_products'] as $productIndex => $associatedProduct) {
                 $associatedProduct['data']['getProductName'] =
@@ -56,13 +56,13 @@ public function processAssert(
                     $associatedProduct,
                     $formData[$index]['assigned_products'][$productIndex]
                 );
-                \PHPUnit_Framework_Assert::assertCount(0, $errorAssociatedProducts);
+                \PHPUnit\Framework\Assert::assertCount(0, $errorAssociatedProducts);
             }
 
             unset($option['assigned_products']);
             unset($formData[$index]['assigned_products']);
             $errorFields = array_diff($option, $formData[$index]);
-            \PHPUnit_Framework_Assert::assertCount(0, $errorFields);
+            \PHPUnit\Framework\Assert::assertCount(0, $errorFields);
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php
index d58bfa9144f59..39e01c09bc43c 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php
@@ -45,7 +45,7 @@ public function processAssert(
     protected function assertPrice(BundleProduct $product, CatalogProductView $productView)
     {
         $checkoutData = $product->getCheckoutData();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $checkoutData['cartItem']['configuredPrice'],
             $productView->getBundleViewBlock()->getBundleSummaryBlock()->getConfiguredPriceBlock()->getPrice(),
             'Bundle price calculated is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
index 1d790628ea6d6..6826bb5fc8277 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
@@ -101,7 +101,7 @@ protected function assertPrice(
 
         foreach ($optionPrice as $index => $item) {
             $item['price'] -= $item['price'] * $specialPrice;
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($item['price'], 2),
                 $cartItem->getPriceBundleOptions($index + 1),
                 'Bundle item ' . ($index + 1) . ' options on frontend don\'t equal to fixture.'
@@ -110,7 +110,7 @@ protected function assertPrice(
         $sumOptionsPrice = $product->getDataFieldConfig('price')['source']->getPriceData()['cart_price'];
 
         $subTotal = number_format($cartItem->getPrice(), 2);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $sumOptionsPrice,
             $subTotal,
             'Bundle unit price on frontend doesn\'t equal to fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
index 889f6b5f3bb2b..b89fda9c97bb8 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
@@ -55,14 +55,14 @@ protected function assertPrice(BundleProduct $product, CatalogProductView $catal
             $priceLow = ($priceView == 'Price Range') ? $priceBlock->getPriceFrom() : $priceBlock->getPrice();
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $priceData['price_from'],
             $priceLow,
             'Bundle price From on product view page is not correct.'
         );
 
         if ($priceView == 'Price Range') {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $priceData['price_to'],
                 $priceBlock->getPriceTo(),
                 'Bundle price To on product view page is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
index e6a7ec013470c..b97a954a981b2 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
@@ -8,6 +8,7 @@
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Constraint\AbstractAssertForm;
@@ -17,6 +18,8 @@
  */
 class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Check bundle product options correctly displayed on cart configuration page.
      *
@@ -28,6 +31,8 @@ class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CatalogProductView $catalogProductView)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
         foreach ($cart->getItems() as $key => $item) {
@@ -70,7 +75,7 @@ private function checkOptions(BundleProduct $product, array $formOptions, array
         }
 
         $error = $this->verifyData($productOptions, $formOptions);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
index 6950a0299897a..3d0889baaca52 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
@@ -516,5 +516,90 @@
                 <item name="dataset" xsi:type="string">bundle_multiselect_two_options</item>
             </field>
         </dataset>
+
+        <dataset name="fixed_with_one_simple_product_and_custom_option">
+            <field name="name" xsi:type="string">Bundle fixed product %isolation%</field>
+            <field name="url_key" xsi:type="string">bundle-fixed-product-%isolation%</field>
+            <field name="sku" xsi:type="string">sku_bundle_fixed_product_%isolation%</field>
+            <field name="sku_type" xsi:type="string">No</field>
+            <field name="price_type" xsi:type="string">No</field>
+            <field name="shipment_type" xsi:type="string">Together</field>
+            <field name="weight" xsi:type="string">1</field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">110</item>
+                <item name="dataset" xsi:type="string">default_fixed</item>
+            </field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="category_ids" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_subcategory</item>
+            </field>
+            <field name="bundle_selections" xsi:type="array">
+                <item name="dataset" xsi:type="string">simple_product_options_with_percent_price</item>
+            </field>
+            <field name="custom_options" xsi:type="array">
+                <item name="dataset" xsi:type="string">checkbox_with_one_100_percent_price</item>
+            </field>
+        </dataset>
+
+        <dataset name="fixed_with_one_simple_product_and_custom_option">
+            <field name="name" xsi:type="string">Bundle fixed product %isolation%</field>
+            <field name="url_key" xsi:type="string">bundle-fixed-product-%isolation%</field>
+            <field name="sku" xsi:type="string">sku_bundle_fixed_product_%isolation%</field>
+            <field name="sku_type" xsi:type="string">No</field>
+            <field name="price_type" xsi:type="string">No</field>
+            <field name="shipment_type" xsi:type="string">Together</field>
+            <field name="weight" xsi:type="string">1</field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">110</item>
+                <item name="dataset" xsi:type="string">default_fixed</item>
+            </field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="category_ids" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_subcategory</item>
+            </field>
+            <field name="bundle_selections" xsi:type="array">
+                <item name="dataset" xsi:type="string">simple_product_options_with_percent_price</item>
+            </field>
+            <field name="custom_options" xsi:type="array">
+                <item name="dataset" xsi:type="string">checkbox_with_one_100_percent_price</item>
+            </field>
+        </dataset>
+
+        <dataset name="with_special_price_and_custom_options">
+            <field name="name" xsi:type="string">Bundle dynamic product %isolation%</field>
+            <field name="url_key" xsi:type="string">bundle-dynamic-product-%isolation%</field>
+            <field name="sku" xsi:type="string">sku_bundle_dynamic_product_%isolation%</field>
+            <field name="sku_type" xsi:type="string">Yes</field>
+            <field name="price_type" xsi:type="string">Yes</field>
+            <field name="shipment_type" xsi:type="string">Together</field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="price" xsi:type="array">
+                <item name="dataset" xsi:type="string">bundle_dynamic_with_category</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="bundle_selections" xsi:type="array">
+                <item name="dataset" xsi:type="string">dynamic_with_two_required_options_assigned_products_with_special_price</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
index 279a29d0a47b2..c00eeb63188e6 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
@@ -1105,5 +1105,32 @@
                 </item>
             </field>
         </dataset>
+        <dataset name="simple_product_options_with_percent_price">
+            <field name="bundle_options" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="title" xsi:type="string">Drop-down Option</item>
+                    <item name="type" xsi:type="string">Drop-down</item>
+                    <item name="frontend_type" xsi:type="string">Drop-down</item>
+                    <item name="required" xsi:type="string">Yes</item>
+                    <item name="assigned_products" xsi:type="array">
+                        <item name="0" xsi:type="array">
+                            <item name="search_data" xsi:type="array">
+                                <item name="name" xsi:type="string">%product_name%</item>
+                            </item>
+                            <item name="data" xsi:type="array">
+                                <item name="selection_qty" xsi:type="string">1</item>
+                                <item name="selection_price_value" xsi:type="string">20.00</item>
+                                <item name="selection_price_type" xsi:type="string">Percent</item>
+                            </item>
+                        </item>
+                    </item>
+                </item>
+            </field>
+            <field name="products" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="0" xsi:type="string">catalogProductSimple::product_with_category</item>
+                </item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CancelPartiallyInvoicedOrderTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CancelPartiallyInvoicedOrderTest.php
index 71d9b11d12eb1..00c53c5e837d2 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CancelPartiallyInvoicedOrderTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CancelPartiallyInvoicedOrderTest.php
@@ -20,7 +20,7 @@
  * 3. Open the created order.
  * 4. Create partial invoice
  * 4. Do cancel Order.
- * 5. Perform all assetions.
+ * 5. Perform all assertions.
  *
  * @group Order_Management
  * @ZephyrId MAGETWO-67787
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnBackend.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnBackend.php
index 1d481fda1ab45..f035df7dcc357 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnBackend.php
@@ -22,12 +22,12 @@ class AssertCaptchaFieldOnBackend extends AbstractConstraint
      */
     public function processAssert(AdminAuthLoginWithCaptcha $adminAuthLogin)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $adminAuthLogin->getLoginBlockWithCaptcha()->isVisibleCaptcha(),
             'Captcha image is not present on backend login page.'
         );
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $adminAuthLogin->getLoginBlockWithCaptcha()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not present on backend login page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
index 6be21d2e71f9f..4883d7819c288 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -22,12 +22,12 @@ class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint
      */
     public function processAssertRegisterForm(ContactIndex $contactIndex)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $contactIndex->getContactUs()->isVisibleCaptcha(),
             'Captcha image is not displayed on the Contact Us page.'
         );
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $contactIndex->getContactUs()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not displayed on the Contact Us page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php
index 0d71784579c29..c5237b8ecc4e7 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php
@@ -22,12 +22,12 @@ class AssertCaptchaFieldOnRegisterForm extends AbstractConstraint
      */
     public function processAssertRegisterForm(CustomerAccountCreate $createAccountPage)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $createAccountPage->getRegisterForm()->isVisibleCaptcha(),
             'Captcha image is not displayed on the storefront account register page.'
         );
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $createAccountPage->getRegisterForm()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not displayed on the storefront account register page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnStorefront.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnStorefront.php
index 65581cc937035..0074ca284dd3f 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnStorefront.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnStorefront.php
@@ -22,12 +22,12 @@ class AssertCaptchaFieldOnStorefront extends AbstractConstraint
      */
     public function processAssert(CustomerAccountLogin $loginPage)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $loginPage->getLoginBlockWithCaptcha()->isVisibleCaptcha(),
             'Captcha image is not present on storefront login page.'
         );
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $loginPage->getLoginBlockWithCaptcha()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not present on storefront login page.'
         );
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 19033094c1fb7..6dd6c6c863da5 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/Attributes/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Attributes/Search.php
index d17b06456c831..7b5bcf8060e2d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Attributes/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Attributes/Search.php
@@ -37,7 +37,7 @@ class Search extends SuggestElement
     protected $actionToggle = '.action-toggle';
 
     /**
-     * Saerch result dropdown.
+     * Search result dropdown.
      *
      * @var string
      */
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 ce27efe8d508a..2ac4fb81ae604 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/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml
index f318287720c38..87618777d7907 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/NewCategoryIds.xml
@@ -11,7 +11,7 @@
             <selector>[name="name"]</selector>
         </name>
         <parent_category>
-            <selector>div[data-index="parent"]>div</selector>
+            <selector>div[data-index="parent"]>div[class="admin__field-control"]</selector>
             <class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\CategoryIds</class>
         </parent_category>
     </fields>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php
index 67ef167e3fcdd..29efb2b4fa037 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php
@@ -60,6 +60,10 @@ class Grid extends DataGrid
             'selector' => '[name="attribute_set_id"]',
             'input' => 'select',
         ],
+        'store_id' => [
+            'selector' => '[name="store_id"]',
+            'input' => 'select',
+        ],
     ];
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index 9331c2c987549..fa2b66d3e9698 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -28,7 +28,7 @@ class ProductForm extends FormSections
      *
      * @var string
      */
-    protected $attribute = './/*[contains(@class,"label")]/span[text()="%s"]';
+    protected $attribute = './/*[contains(@class,"label")]//span[text()="%s"]';
 
     /**
      * Product new from date field on the product form
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index f3b48b8cc74d8..7bd58a4c4b503 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -36,11 +36,17 @@ class Price extends \Magento\Catalog\Test\Block\AbstractPriceBlock
             'selector' => '.price-to .price',
         ],
         'price_excluding_tax' => [
-            'selector' => '.price-excluding-tax .price'
+            'selector' => '.price-excluding-tax .price',
         ],
         'price_including_tax' => [
-            'selector' => '.price-including-tax .price'
-        ]
+            'selector' => '.price-including-tax .price',
+        ],
+        'old_price_from' => [
+            'selector' => '.price-from .old-price .price-wrapper',
+        ],
+        'old_price_to' => [
+            'selector' => '.price-to .old-price .price-wrapper',
+        ],
     ];
 
     /**
@@ -144,6 +150,28 @@ public function getPriceIncludingTax($currency = '$')
         return $this->getTypePrice('price_including_tax', $currency);
     }
 
+    /**
+     * Get min old price.
+     *
+     * @param string $currency
+     * @return string|null
+     */
+    public function getOldPriceFrom($currency = '$')
+    {
+        return $this->getTypePrice('old_price_from', $currency);
+    }
+
+    /**
+     * Get max old price.
+     *
+     * @param string $currency
+     * @return string|null
+     */
+    public function getOldPriceTo($currency = '$')
+    {
+        return $this->getTypePrice('old_price_to', $currency);
+    }
+
     /**
      * This method returns if the regular price is visible.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 92f3a2102e85e..990906b7e302a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -89,7 +89,7 @@ class View extends AbstractConfigureBlock
      *
      * @var string
      */
-    protected $productDescription = '.product.attribute.description';
+    protected $productDescription = '.product.attribute.description .value';
 
     /**
      * Product short-description element.
@@ -243,10 +243,23 @@ public function getThresholdMessage()
     /**
      * Get block price.
      *
+     * @param FixtureInterface|null $product
+     *
      * @return Price
      */
-    public function getPriceBlock()
+    public function getPriceBlock(FixtureInterface $product = null)
     {
+        $typeId = '';
+
+        if ($product) {
+            $dataConfig = $product->getDataConfig();
+            $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null;
+        }
+
+        if ($this->hasRender($typeId)) {
+            return $this->callRender($typeId, 'getPriceBlock');
+        }
+
         return $this->blockFactory->create(
             \Magento\Catalog\Test\Block\Product\Price::class,
             ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)]
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 5e9e5526eb685..dcc8cce970098 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -58,7 +58,7 @@ class CustomOptions extends Form
      *
      * @var string
      */
-    protected $maxCharacters = './/div[@class="control"]/p[@class="note"]/strong';
+    protected $maxCharacters = './/div[@class="control"]/p[contains(@class, "note")]';
 
     /**
      * Selector for label of option value element
@@ -72,7 +72,7 @@ class CustomOptions extends Form
      *
      * @var string
      */
-    protected $noteByNumber = './/*[@class="note"][%d]/strong';
+    protected $noteByNumber = './/*[contains(@class, "note")][%d]/strong';
 
     /**
      * Selector for select element of option
@@ -220,13 +220,19 @@ public function isJsMessageVisible($customOptionTitle)
     protected function getFieldData(SimpleElement $option)
     {
         $price = $this->getOptionPriceNotice($option);
-        $maxCharacters = $option->find($this->maxCharacters, Locator::SELECTOR_XPATH);
+        $maxCharactersElement = $option->find($this->maxCharacters, Locator::SELECTOR_XPATH);
+
+        $maxCharacters = null;
+        if ($maxCharactersElement->isVisible()) {
+            preg_match('/\s([0-9]+)\s/', $maxCharactersElement->getText(), $match);
+            $maxCharacters = isset($match[1]) ? $match[1] : $maxCharactersElement->getText();
+        }
 
         return [
             'options' => [
                 [
-                    'price' => floatval($price),
-                    'max_characters' => $maxCharacters->isVisible() ? $maxCharacters->getText() : null,
+                    'price' => (float)$price,
+                    'max_characters' => $maxCharacters,
                 ],
             ]
         ];
@@ -256,7 +262,7 @@ protected function getFileData(SimpleElement $option)
         return [
             'options' => [
                 [
-                    'price' => floatval($price),
+                    'price' => (float)$price,
                     'file_extension' => $this->getOptionNotice($option, 1),
                     'image_size_x' => preg_replace('/[^0-9]/', '', $this->getOptionNotice($option, 2)),
                     'image_size_y' => preg_replace('/[^0-9]/', '', $this->getOptionNotice($option, 3)),
@@ -338,7 +344,7 @@ protected function getDateData(SimpleElement $option)
         return [
             'options' => [
                 [
-                    'price' => floatval($price),
+                    'price' => (float)$price,
                 ],
             ]
         ];
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
index f5d65559386b1..e2e5b5d2b1879 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
@@ -23,7 +23,7 @@ class AssertAbsenceDeleteAttributeButton extends AbstractConstraint
      */
     public function processAssert(CatalogProductAttributeNew $attributeNew)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $attributeNew->getPageActions()->checkDeleteButton(),
             "Button 'Delete Attribute' is present on Attribute page"
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddBeforeForPrice.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddBeforeForPrice.php
index e0672b3b7ead4..1523fa5d6d179 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddBeforeForPrice.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddBeforeForPrice.php
@@ -48,7 +48,7 @@ public function processAssert(
             );
 
             foreach ($valuesFromForm as $value) {
-                \PHPUnit_Framework_Assert::assertEquals($priceTypeSymbol, $value['add_before']);
+                \PHPUnit\Framework\Assert::assertEquals($priceTypeSymbol, $value['add_before']);
             }
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
index 09a70584b067d..65f1db34c77b8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
@@ -44,15 +44,15 @@ public function processAssert(
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
-        \PHPUnit_Framework_Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
+        \PHPUnit\Framework\Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisibleAddToCardButton(),
             "Button 'Add to Card' is present on Category page."
         );
 
         $catalogCategoryView->getListProductBlock()->getProductItem($product)->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogProductView->getViewBlock()->isVisibleAddToCardButton(),
             "Button 'Add to Card' is present on Product page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
index 6dfff0ed17283..0eff505d59591 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
@@ -44,15 +44,15 @@ public function processAssert(
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
-        \PHPUnit_Framework_Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
+        \PHPUnit\Framework\Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisibleAddToCardButton(),
             "Button 'Add to Card' is absent on Category page."
         );
 
         $catalogCategoryView->getListProductBlock()->getProductItem($product)->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->isVisibleAddToCardButton(),
             "Button 'Add to Card' is absent on Product page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index b30701728b680..74e8334cf1c19 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -106,7 +106,7 @@ public function processAssert(
             $catalogProductEdit->getProductForm()->openSection(self::ATTRIBUTES);
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductEdit->getProductForm()->checkAttributeLabel($catalogProductAttribute),
             "Product Attribute is absent on Product form."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php
index 8a4d34e688360..e8e3d5b29d06c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php
@@ -31,7 +31,7 @@ public function processAssert(array $entities, CatalogProductEdit $productPage)
                 ->openSection('advanced-pricing')
                 ->getSection('advanced-pricing');
 
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $advancedPricing->getTierPriceForm()->hasGroupPriceOptions(),
                 'Customer group price options is present in grid.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
index 674fd7a7aa7a1..bea474e7ae2fa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
@@ -37,7 +37,7 @@ public function processAssert(
             $attribute->getData(),
             $catalogProductAttributeNew->getAttributeForm()->getData($attribute)
         );
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
index f0f569563f2f0..b050fcf583801 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
@@ -44,7 +44,7 @@ public function processAssert(
         $productOptions = explode("\n", $productAttributeOptions);
         $diff = array_diff($options, $productOptions);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($diff),
             "Products attribute options are absent on product form: " . implode(', ', $diff)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetForm.php
index 87ae650d7dc18..7f031567d980c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetForm.php
@@ -40,16 +40,16 @@ public function processAssert(
         ];
         $productSet->open();
         $productSet->getGrid()->searchAndOpen($filterAttribute);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $filterAttribute['set_name'],
             $productSetEdit->getAttributeSetEditBlock()->getAttributeSetName(),
-            'Attribute Set not found'
+            'The attribute set wasn\'t found.'
             . "\nExpected: " . $filterAttribute['set_name']
             . "\nActual: " . $productSetEdit->getAttributeSetEditBlock()->getAttributeSetName()
         );
         if ($productAttribute !== null) {
             $attributeLabel = $productAttribute->getFrontendLabel();
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $productSetEdit->getAttributeSetEditBlock()->checkProductAttribute($attributeLabel),
                 "Product Attribute is absent on Attribute Set Groups"
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetGroupOnProductForm.php
index bd6bac1f6c319..a50ef1993f009 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetGroupOnProductForm.php
@@ -60,13 +60,13 @@ public function processAssert(
         );
         $productBlockForm->fill($productSimple);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productEdit->getProductForm()->isCustomSectionVisible($attributeSet->getGroup()),
             "Product Group is absent on Product form sections."
         );
 
         $productEdit->getProductForm()->openCustomSection($attributeSet->getGroup());
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productEdit->getProductForm()->checkAttributeLabel($productAttributeOriginal),
             "Product Attribute is absent on Product form."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetInGrid.php
index d7d2ad5f047c8..c05c7396deee0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetInGrid.php
@@ -30,7 +30,7 @@ public function processAssert(CatalogProductSetIndex $productSetPage, CatalogAtt
         ];
 
         $productSetPage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productSetPage->getGrid()->isRowVisible($filterAttributeSet),
             'Attribute Set \'' . $filterAttributeSet['set_name'] . '\' is absent in Attribute Set grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetNotInGrid.php
index 945014371631d..0c89e52cb0509 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetNotInGrid.php
@@ -34,9 +34,10 @@ public function processAssert(CatalogProductSetIndex $productSetPage, CatalogAtt
         ];
 
         $productSetPage->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $productSetPage->getGrid()->isRowVisible($filterAttributeSet),
-            'An attribute set named "' . $filterAttributeSet['set_name'] . '" is present in Attribute Set grid.'
+            'A "' . $filterAttributeSet['set_name'] .
+            '" attribute set name already exists. Create a new name and try again.'
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetOnProductForm.php
index 64187b048f3d8..659539e8093bf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetOnProductForm.php
@@ -63,10 +63,10 @@ public function processAssert(
 
         $formData = $productEdit->getProductForm()->getData($productSimple);
         $formAttributeSet = $formData['attribute_set_id'];
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $attributeSet->getAttributeSetName(),
             $formAttributeSet,
-            'Attribute Set not found on Product form.'
+            'The attribute set wasn\'t found on product form.'
             . "\nExpected: " . $attributeSet->getAttributeSetName()
             . "\nActual: " . $formAttributeSet
         );
@@ -74,7 +74,7 @@ public function processAssert(
         if ($attributeSetOriginal === null) {
             $productEdit->getProductForm()->openSection('product-details');
 
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $productEdit->getProductForm()->checkAttributeLabel($productAttribute),
                 "Product Attribute is absent on Product form."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessDeleteMessage.php
index a2a32ff59bcc3..c3d2ae3cd1bb2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessDeleteMessage.php
@@ -29,7 +29,7 @@ class AssertAttributeSetSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CatalogProductSetIndex $productSetIndex)
     {
         $actualMessage = $productSetIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessSaveMessage.php
index fc2325d969ebf..f0ccd9a1a777c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSetSuccessSaveMessage.php
@@ -29,7 +29,7 @@ class AssertAttributeSetSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CatalogProductSetIndex $productSetIndex)
     {
         $actualMessage = $productSetIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php
index 4eba276384753..16cdde21bbdc5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php
@@ -28,7 +28,7 @@ public function processAssert(
         $catalogProductIndex->open()->getProductGrid()->searchAndOpen($filter);
         $catalogProductEdit->getFormPageActions()->save();
 
-        \PHPUnit_Framework_Assert::assertNotEmpty(
+        \PHPUnit\Framework\Assert::assertNotEmpty(
             $catalogProductEdit->getMessagesBlock()->getSuccessMessage(),
             'Can\'t save existing product.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
index 49c24d893eb71..3b8993f7ceb64 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
@@ -25,7 +25,7 @@ class AssertCategoryAbsenceOnBackend extends AbstractConstraint
     public function processAssert(CatalogCategoryIndex $catalogCategoryIndex, Category $category)
     {
         $catalogCategoryIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogCategoryIndex->getTreeCategories()->isCategoryVisible($category),
             'Category is displayed in backend catalog category tree.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
index a582946f4e487..8429966b04b3e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
@@ -40,7 +40,7 @@ public function processAssert(
         Category $category
     ) {
         $browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
             $categoryView->getTitleBlock()->getTitle(),
             'Wrong page is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php
index 7e3ac2ca423a3..6ddb40886757f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryBreadcrumbs.php
@@ -46,12 +46,12 @@ public function processAssert(
         $this->openCategory($category);
 
         $breadcrumbs = $this->getBreadcrumbs($category);
-        \PHPUnit_Framework_Assert::assertNotEmpty(
+        \PHPUnit\Framework\Assert::assertNotEmpty(
             $breadcrumbs,
             'No breadcrumbs on category \'' . $category->getName() . '\' page.'
         );
         $pageBreadcrumbs = $catalogCategoryView->getBreadcrumbs()->getText();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $breadcrumbs,
             $pageBreadcrumbs,
             'Wrong breadcrumbs of category page.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryCannotBeDeleted.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryCannotBeDeleted.php
index a0f6681113c1b..911115867c79e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryCannotBeDeleted.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryCannotBeDeleted.php
@@ -22,7 +22,7 @@ class AssertCategoryCannotBeDeleted extends AbstractConstraint
      */
     public function processAssert(CatalogCategoryEdit $catalogCategoryEdit)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $catalogCategoryEdit->getFormPageActions()->checkDeleteButton(),
             false,
             'Delete button is available for the category.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
index 06277f5cb9255..4a83b6ae7cd83 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
@@ -38,7 +38,7 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $categoryUrlKey . '.html');
         foreach ($products as $productFixture) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $categoryView->getListProductBlock()->getProductItem($productFixture)->isVisible(),
                 "Products '{$productFixture->getName()}' not found in category '{$category->getName()}'."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
index dc1eed8b8b987..d15a156fec897 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
@@ -53,7 +53,7 @@ public function processAssert(
         $fixtureData = $this->prepareFixtureData($category->getData());
         $formData = $catalogCategoryEdit->getEditForm()->getData($category);
         $error = $this->verifyData($this->sortData($fixtureData), $this->sortData($formData));
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryInNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryInNavigationMenu.php
index 4f0154ba0dd15..d4dbadf8942c6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryInNavigationMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryInNavigationMenu.php
@@ -31,12 +31,12 @@ public function processAssert(
     ) {
         $cmsIndex->open();
         if (($category->getIncludeInMenu() == 'Yes') && ($category->getIsActive() == 'Yes')) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $catalogCategoryView->getTopmenu()->isCategoryVisible($category->getName()),
                 'Expected that ' . $category->getName() . ' is visible in navigation menu, but it is not.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $catalogCategoryView->getTopmenu()->isCategoryVisible($category->getName()),
                 'Expected that ' . $category->getName() . ' is not visible in navigation menu, but it is.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIncludeInNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIncludeInNavigationMenu.php
index 44200a286f8fb..6f9b4cd0ce0ff 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIncludeInNavigationMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIncludeInNavigationMenu.php
@@ -30,7 +30,7 @@ public function processAssert(
         CmsIndex $cmsIndex
     ) {
         $cmsIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogCategoryView->getTopmenu()->isCategoryVisible($category->getName()),
             'Expected that ' . $category->getName() . ' is visible in navigation menu.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
index f4a4332c9286f..d45acd00124aa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
@@ -33,11 +33,11 @@ public function processAssert(
         BrowserInterface $browser
     ) {
         $browser->open($this->getCategoryUrl($category));
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $categoryView->getTopmenu()->isCategoryVisible($category->getName()),
             'Category can be accessed from the navigation bar in the frontend.'
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
             $categoryView->getTitleBlock()->getTitle(),
             'Wrong page is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryMovedMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryMovedMessage.php
index c3c5eb62fcde4..02245b1649803 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryMovedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryMovedMessage.php
@@ -28,7 +28,7 @@ class AssertCategoryMovedMessage extends AbstractConstraint
     public function processAssert(CatalogCategoryEdit $catalogCategoryEdit)
     {
         $actualMessage = $catalogCategoryEdit->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php
index f5be8d3ae2bac..46005fe7e09d9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php
@@ -39,7 +39,7 @@ public function processAssert(
         $cmsIndex->open();
 
         foreach (array_reverse($categoriesNames) as $category) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $cmsIndex->getTopmenu()->isCategoryVisible($category),
                 'Category ' . $category . ' is not visible in top menu.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNotInNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNotInNavigationMenu.php
index fd05c289560f1..9a0ab06946a39 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNotInNavigationMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNotInNavigationMenu.php
@@ -30,7 +30,7 @@ public function processAssert(
         CmsIndex $cmsIndex
     ) {
         $cmsIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogCategoryView->getTopmenu()->isCategoryVisible($category->getName()),
             'Expected that ' . $category->getName() . ' is not visible in navigation menu.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomStore.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomStore.php
index 1410911cb0240..38dd7600c6eac 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomStore.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomStore.php
@@ -82,7 +82,7 @@ private function verifyUnavailabilityCategoryOnMainStore(Category $category)
     {
         $this->browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
             $this->categoryViewPage->getTitleBlock()->getTitle(),
             'Category ' . $category->getName() . ' is available on Main Store, but should not.'
@@ -99,7 +99,7 @@ private function verifyAvailabilityCategoryOnMainStore(Category $category)
     {
         $this->browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $category->getName(),
             $this->categoryViewPage->getTitleBlock()->getTitle(),
             'Category ' . $category->getName() . ' is not available on Main Store, but should.'
@@ -119,7 +119,7 @@ private function verifyCategoryOnCustomStore(Category $category)
 
         $this->browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
 
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $category->getName(),
                 $this->categoryViewPage->getTitleBlock()->getTitle(),
                 'Category ' . $category->getName() . ' is not available on custom store.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomWebsite.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomWebsite.php
index b355ac591e699..512cb7044ed8f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomWebsite.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryOnCustomWebsite.php
@@ -59,7 +59,7 @@ public function processAssert(
 
         $websiteCode = $storeGroup->getDataFieldConfig('website_id')['source']->getWebsite()->getData('code');
         $browser->open($_ENV['app_frontend_url'] . 'websites/' . $websiteCode . '/' . $category->getName() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $category->getName(),
             $categoryView->getTitleBlock()->getTitle(),
             'Wrong category name is displayed on custom website store.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index 9408f48203272..400349800cc60 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -71,7 +71,7 @@ public function processAssert(
         $diff = array_merge($diff, $this->verifyContent($categoryData));
         $diff = array_merge($diff, $this->verifyDisplaySettings($categoryData));
         $diff = array_merge($diff, $this->verifySearchEngineOptimization($categoryData));
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $diff,
             "Category settings on Storefront page are different.\n" . implode(' ', $diff)
         );
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 0000000000000..26e6805d01419
--- /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/AssertCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
index 4d485e4b158ca..43748396792cf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
@@ -31,7 +31,7 @@ public function processAssert(
     ) {
         $browser->open($_ENV['app_frontend_url'] . $initialCategory->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $browser->getUrl(),
             $_ENV['app_frontend_url'] . strtolower($category->getUrlKey()) . '.html',
             'URL rewrite category redirect false.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
index 9c0a1a5777bc7..e0550618c86ff 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
@@ -29,7 +29,7 @@ class AssertCategorySaveMessage extends AbstractConstraint
     public function processAssert(CatalogCategoryEdit $catalogCategoryEdit)
     {
         $actualMessage = $catalogCategoryEdit->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
index 4926566eaa2a7..cbdad5865245a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
@@ -29,7 +29,7 @@ class AssertCategorySuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CatalogCategoryEdit $categoryEdit)
     {
         $actualMessage = $categoryEdit->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryWithCustomStoreOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryWithCustomStoreOnFrontend.php
index 11d38cdcef4db..b1000cc3ae6c5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryWithCustomStoreOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryWithCustomStoreOnFrontend.php
@@ -37,7 +37,7 @@ public function processAssert(
         $cmsIndex->open();
         $cmsIndex->getLinksBlock()->waitWelcomeMessage();
         $browser->open($_ENV['app_frontend_url'] . $initialCategory->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $initialCategory->getName(),
             $categoryView->getTitleBlock()->getTitle(),
             'Wrong category name is displayed for default store.'
@@ -47,7 +47,7 @@ public function processAssert(
         $cmsIndex->getStoreSwitcherBlock()->selectStoreView($store);
         $cmsIndex->getLinksBlock()->waitWelcomeMessage();
         $browser->open($_ENV['app_frontend_url'] . $initialCategory->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $category->getName(),
             $categoryView->getTitleBlock()->getTitle(),
             'Wrong category name is displayed for ' . $store
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 0000000000000..44190924c06ec
--- /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/AssertDateInvalidErrorMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertDateInvalidErrorMessage.php
index 9ee0175484af8..6c0de5ce81e87 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertDateInvalidErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertDateInvalidErrorMessage.php
@@ -28,7 +28,7 @@ class AssertDateInvalidErrorMessage extends AbstractConstraint
     public function processAssert(CatalogProductEdit $productPage)
     {
         $actualMessages = $productPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::INVALID_DATE_ERROR_MESSAGE,
             $actualMessages,
             'Wrong error message is displayed.'
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 0000000000000..5e744ce1ef852
--- /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/Constraint/AssertImagesAreVisibleOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php
index f6baa47e44b25..0f19c0e43a99d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php
@@ -54,7 +54,7 @@ public function processAssert(
         $this->productView = $catalogProductView->getViewBlock();
 
         $errors = $this->verify();
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             "\nFound the following errors:\n" . implode(" \n", $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php
index eed6f1be307a2..7f322507ab795 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php
@@ -30,7 +30,7 @@ public function processAssert(CatalogProductIndex $productGrid, $productsCount)
     {
         $expectedMessage = sprintf(self::SUCCESS_MESSAGE, $productsCount);
         $actualMessage = $productGrid->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPaginationCorrectOnStoreFront.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPaginationCorrectOnStoreFront.php
index c9112eff7fc38..9670041b501d0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPaginationCorrectOnStoreFront.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPaginationCorrectOnStoreFront.php
@@ -36,18 +36,18 @@ public function processAssert(
         $productsCount
     ) {
         $browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             true,
             $catalogCategoryView->getBottomToolbar()->isVisible(),
             'Pagination is not visible'
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $catalogCategoryView->getBottomToolbar()->getLimitedValueByIndex(0),
             $catalogCategoryView->getListProductBlock()->getProductsCount(),
             'Count of products on 1 page does not equivalent with declared in pagination (default value)'
         );
         $catalogCategoryView->getBottomToolbar()->nextPage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $this->calculateExpectedProductsCountOnPage(
                 $catalogCategoryView->getBottomToolbar()->getLimitedValueByIndex(0),
                 2,
@@ -58,13 +58,13 @@ public function processAssert(
         );
         $catalogCategoryView->getBottomToolbar()->firstPage();
         $catalogCategoryView->getBottomToolbar()->setLimiterValueByIndex(1);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $catalogCategoryView->getBottomToolbar()->getLimitedValueByIndex(1),
             $catalogCategoryView->getListProductBlock()->getProductsCount(),
             'Count of products on 1 page does not equivalent with declared in pagination(custom value)'
         );
         $catalogCategoryView->getBottomToolbar()->nextPage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $this->calculateExpectedProductsCountOnPage(
                 $catalogCategoryView->getBottomToolbar()->getLimitedValueByIndex(1),
                 2,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentCrossSells.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentCrossSells.php
index 31763d5dd4a8e..cb2230ee3c4ff 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentCrossSells.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentCrossSells.php
@@ -53,7 +53,7 @@ public function processAssert(
         $catalogProductView->getMessagesBlock()->waitSuccessMessage();
         $checkoutCart->open();
         foreach ($promotedProducts as $promotedProduct) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $checkoutCart->getCrosssellBlock()->getProductItem($promotedProduct)->isVisible(),
                 'Product \'' . $promotedProduct->getName() . '\' exists in cross-sell section.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentRelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentRelatedProducts.php
index ae84cec89a83f..31f2de3012c67 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentRelatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentRelatedProducts.php
@@ -40,7 +40,7 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         foreach ($promotedProducts as $promotedProduct) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $catalogProductView->getRelatedProductBlock()->getProductItem($promotedProduct)->isVisible(),
                 'Product \'' . $promotedProduct->getName() . '\' exists in related products.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentUpSells.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentUpSells.php
index e828bfc847e7a..6ccddf7a75fda 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentUpSells.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAbsentUpSells.php
@@ -40,7 +40,7 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         foreach ($promotedProducts as $promotedProduct) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $catalogProductView->getUpsellBlock()->getProductItem($promotedProduct)->isVisible(),
                 'Product \'' . $promotedProduct->getName() . '\' exists in up-sells products.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
index 5b4414f33abc8..9bd51890b62db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
@@ -36,7 +36,7 @@ public function processAssert(
         ];
 
         $attributeIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $attributeIndex->getGrid()->isRowVisible($filter),
             'Attribute \'' . $attribute->getFrontendLabel() . '\' is present in Attribute grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
index 0f4401061107c..251b56347b34e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
@@ -35,7 +35,7 @@ public function processAssert(
         $filter = [
             'label' => $productAttribute->getFrontendLabel(),
         ];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $newProductPage->getProductForm()->getAttributesSearchGrid()->isRowVisible($filter),
             'Attribute \'' . $productAttribute->getFrontendLabel() . '\' is found in Attributes grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
index a08b95272459f..c4d2ad57028c5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
@@ -39,7 +39,7 @@ public function processAssert(
             ->getAttributes()[0]
             ->getAttributeCode();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $productSetEdit->getAttributeSetEditBlock()->checkProductAttribute($attributeCode),
             "Attribute " . $attributeCode . " is present in Attribute set's Groups section."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
index c62cfe8be5f11..909bb0e2a65e6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
@@ -39,7 +39,7 @@ public function processAssert(
             ->getAttributes()[0]
             ->getAttributeCode();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $productSetEdit->getAttributeSetEditBlock()->checkUnassignedProductAttribute($attributeCode),
             "Attribute " . $attributeCode . " is present in Unassigned Attribute set's section."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
index d092d74fa097e..45035b94212d1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
@@ -34,7 +34,7 @@ public function processAssert(
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(
                 $attribute->getFrontendLabel(),
                 $catalogProductView->getAdditionalInformationBlock()->getAttributeLabels()
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
index f12b25cd0f327..9a162500a5b36 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
@@ -33,7 +33,7 @@ public function processAssert(CatalogProductAttribute $attribute, AdvancedSearch
         $label = $attribute->hasData('manage_frontend_label')
             ? $attribute->getManageFrontendLabel()
             : $attribute->getFrontendLabel();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array($label, $formLabels),
             'Attribute is absent on advanced search form.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
index f4312b55773f4..212a154c32ad7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
@@ -26,7 +26,7 @@ public function processAssert(CatalogProductAttribute $attribute, CatalogProduct
     {
         $attributeIndexPage->open();
         $code = $attribute->getAttributeCode();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $attributeIndexPage->getGrid()->isRowVisible(['attribute_code' => $code]),
             'Attribute with attribute code "' . $code . '" is absent in attribute grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
index 7d72487436619..766df5407f5cc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
@@ -41,7 +41,7 @@ public function processAssert(
             ? $attribute->getManageFrontendLabel()
             : $attribute->getFrontendLabel();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array($label, $catalogProductCompare->getCompareProductsBlock()->getComparableAttributes()),
             'Attribute is absent on product compare page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
index 7b6aee2e4bd75..72dacff239d86 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
@@ -53,7 +53,7 @@ public function processAssert(
             ? $attribute->getManageFrontendLabel()
             : $attribute->getFrontendLabel();
         $filters = $catalogCategoryView->getLayeredNavigationBlock()->getFilters();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(strtoupper($label), $filters),
             'Attribute is absent in layered navigation on category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
index c12b8b843b855..38b5b15a64b52 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
@@ -36,7 +36,7 @@ public function processAssert(
         $label = $attribute->hasData('manage_frontend_label')
             ? $attribute->getManageFrontendLabel()
             : $attribute->getFrontendLabel();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(strtoupper($label), $catalogCategoryView->getLayeredNavigationBlock()->getFilters()),
             'Attribute is absent in layered navigation on search page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
index 051dbdc6eb0e0..fdf638f4d473a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
@@ -28,7 +28,7 @@ public function processAssert(
     ) {
         $filter = ['frontend_label' => $attribute->getFrontendLabel(), 'is_global' => $attribute->getIsGlobal()];
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductAttributeIndex->open()->getGrid()->isRowVisible($filter),
             'Attribute is not global.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
index f1999498b96df..b3bc4d2619a43 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
@@ -23,7 +23,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
 
     /**
      * Check whether html tags are using in attribute value.
-     * Checked tag structure <b><i>atttribute_default_value</p></i></b>
+     * Checked tag structure <b><i>attribute_default_value</p></i></b>
      *
      * @param InjectableFixture $product
      * @param CatalogProductAttribute $attribute
@@ -40,7 +40,7 @@ public function processAssert(
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getAdditionalInformationBlock()->hasHtmlTagInAttributeValue($attribute),
             'Attribute is not visible with HTML tags on frontend.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
index 5f6b0a20478d7..098dbe9071c7b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
@@ -51,7 +51,7 @@ public function processAssert(
             ? $validationErrors[$attribute->getFrontendLabel()]
             : '';
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::REQUIRE_MESSAGE,
             $actualMessage,
             'JS error notice on product edit page is not equal to expected.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
index 1e417263abed8..390bfebbaed81 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
@@ -25,7 +25,7 @@ class AssertProductAttributeIsUnique extends AbstractConstraint
     /**
      * Expected message.
      */
-    const UNIQUE_MESSAGE = 'The value of attribute "%s" must be unique';
+    const UNIQUE_MESSAGE = 'The value of the "%s" attribute isn\'t unique. Set a unique value and try again.';
 
     /**
      * Fixture factory.
@@ -61,7 +61,7 @@ public function processAssert(
         $actualErrorMessage = $catalogProductEdit->getMessagesBlock()->getErrorMessage();
         $attributeLabel = $attribute->getFrontendLabel();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::UNIQUE_MESSAGE, $attributeLabel),
             $actualErrorMessage,
             'JS error notice on product edit page is not equal to expected.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
index 120368b651ed0..77b783aa56b57 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
@@ -37,7 +37,7 @@ public function processAssert(
             ? $attribute->getManageFrontendLabel()
             : $attribute->getFrontendLabel();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array($label, $catalogsearchResult->getListProductBlock()->getSortByValues()),
             'Attribute is absent in sort dropdown on search results page on frontend.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
index 42f4a3ac1557f..d7d1704f861c4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
@@ -28,7 +28,7 @@ class AssertProductAttributeSaveMessage extends AbstractConstraint
     public function processAssert(CatalogProductAttributeIndex $attributeIndex)
     {
         $actualMessage = $attributeIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
index 918883a65cc34..03679c1d077a7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
@@ -26,7 +26,7 @@ class AssertProductAttributeSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CatalogProductAttributeIndex $attributeIndex)
     {
         $actualMessage = $attributeIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAutoincrementedSkuNoticeMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAutoincrementedSkuNoticeMessage.php
index 29a250884200f..f443489cc5e90 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAutoincrementedSkuNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAutoincrementedSkuNoticeMessage.php
@@ -26,7 +26,7 @@ public function processAssert(CatalogProductEdit $productPage, FixtureInterface
     {
         $actualMessage = $productPage->getMessagesBlock()->getNoticeMessage();
         $reg = '/(SKU for product ' . $product->getName() . ' has been changed to ' . $product->getSku() . '-)(\d+.$)/';
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             preg_match($reg, $actualMessage) == 1,
             'Incorrect notice that existing sku automatically changed when saving product with same sku.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
index a07a1412b60de..be9958a24c336 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
@@ -38,7 +38,7 @@ public function processAssert(
         foreach ($products as &$product) {
             $product = $product->getName();
         }
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $products,
             $cmsIndex->getCompareProductsBlock()->getProducts(),
             'Compare product block contains NOT valid information about compared products.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
index bc9ebbc77ed4f..0079e40ef6807 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
@@ -26,14 +26,14 @@ public function processAssert(array $products, CmsIndex $cmsIndex)
         $productQty = count($products);
         $qtyOnPage = $cmsIndex->getCompareLinkBlock()->getQtyInCompareList();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $productQty,
             $qtyOnPage,
             'Qty is not correct in "Compare Products" link.'
         );
 
         $compareProductUrl = '/catalog/product_compare/';
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($cmsIndex->getLinksBlock()->getLinkUrl('Compare Products'), $compareProductUrl) !== false,
             'Compare product link isn\'t lead to Compare Product Page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
index 9fe165f6ad86e..8942909176f95 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
@@ -26,7 +26,7 @@ class AssertProductCompareItemsLinkIsAbsent extends AbstractConstraint
      */
     public function processAssert(CmsIndex $cmsIndex)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsIndex->getLinksBlock()->isLinkVisible("Compare Products"),
             'The link "Compare Products..." is visible at the top of page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
index d7dd6fbdaafd4..6ec9900a4cac9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
@@ -16,6 +16,13 @@
  */
 class AssertProductComparePage extends AbstractConstraint
 {
+    /**
+     * Price displaying format.
+     *
+     * @var int
+     */
+    private $priceFormat = 2;
+
     /**
      * Product attribute on compare product page
      *
@@ -30,8 +37,8 @@ class AssertProductComparePage extends AbstractConstraint
     ];
 
     /**
-     * Assert that "Compare Product" page contains product(s) that was added
-     * - Product name
+     * Assert that "Compare Product" Storefront page contains added Products with expected Attribute values:
+     * - Name
      * - Price
      * - SKU
      * - Description (if exists, else text "No")
@@ -56,19 +63,23 @@ public function processAssert(
                 $value = $attribute;
                 $attribute = is_numeric($attributeKey) ? $attribute : $attributeKey;
 
-                $attributeValue = $attribute != 'price'
+                $expectedAttributeValue = $attribute != 'price'
                     ? ($product->hasData($attribute)
                         ? $product->getData($attribute)
                         : 'N/A')
                     : ($product->getDataFieldConfig('price')['source']->getPriceData() !== null
                         ? $product->getDataFieldConfig('price')['source']->getPriceData()['compare_price']
-                        : number_format($product->getPrice(), 2));
+                        : number_format($product->getPrice(), $this->priceFormat));
 
                 $attribute = is_numeric($attributeKey) ? 'info' : 'attribute';
-                \PHPUnit_Framework_Assert::assertEquals(
-                    $attributeValue,
-                    $comparePage->getCompareProductsBlock()->{'getProduct' . ucfirst($attribute)}($key + 1, $value),
-                    'Product "' . $product->getName() . '" is\'n equals with data from fixture.'
+                $attribute = ucfirst($attribute);
+                $actualAttributeValue =
+                    $comparePage->getCompareProductsBlock()->{'getProduct' . $attribute}($key + 1, $value);
+
+                \PHPUnit\Framework\Assert::assertEquals(
+                    $expectedAttributeValue,
+                    $actualAttributeValue,
+                    'Product "' . $product->getName() . '" has "' . $attribute . '" value different from fixture one.'
                 );
             }
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
index c2a0d4329c10a..cfbeeb9674480 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
@@ -27,7 +27,7 @@ public function processAssert(CatalogProductCompare $comparePage)
     {
         $comparePage->open();
         $actualMessage = $comparePage->getCompareProductsBlock()->getEmptyMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
index 1558340685015..6aad328eb60d3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
@@ -32,7 +32,7 @@ public function processAssert(CatalogProductView $catalogProductView, FixtureInt
     {
         $successMessage = sprintf(self::SUCCESS_MESSAGE, $product->getName());
         $actualMessage = $catalogProductView->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $successMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
index aaf64932d08d5..704743730242b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
@@ -25,7 +25,7 @@ class AssertProductCompareSuccessRemoveAllProductsMessage extends AbstractConstr
     public function processAssert(CatalogProductView $catalogProductView)
     {
         $actualMessage = $catalogProductView->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
index 0d3d9e83d92fa..0c39a1e616587 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
@@ -29,7 +29,7 @@ public function processAssert(CatalogProductCompare $catalogProductCompare, Fixt
     {
         $successMessage = sprintf(self::SUCCESS_MESSAGE, $product->getName());
         $actualMessage = $catalogProductCompare->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals($successMessage, $actualMessage, 'Wrong success message is displayed.');
+        \PHPUnit\Framework\Assert::assertEquals($successMessage, $actualMessage, 'Wrong success message is displayed.');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCrossSells.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCrossSells.php
index 4bc3f939d3fd7..1bacce69a1708 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCrossSells.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCrossSells.php
@@ -56,7 +56,7 @@ public function processAssert(
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty($errors, implode(" ", $errors));
+        \PHPUnit\Framework\Assert::assertEmpty($errors, implode(" ", $errors));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php
index d5fe7aac36a37..34531d7ee1021 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsErrors.php
@@ -27,7 +27,7 @@ public function processAssert(
     ) {
         foreach ($products as $product) {
             foreach ($product->getData('custom_options') as $option) {
-                \PHPUnit_Framework_Assert::assertTrue(
+                \PHPUnit\Framework\Assert::assertTrue(
                     $catalogProductView->getCustomOptionsBlock()->isJsMessageVisible($option['title']),
                     'Required Custom Option ' . $option['title'] . " doesn't contain JS validation error."
                 );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
index b66a86daee8d5..4537aa194060c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
@@ -95,7 +95,7 @@ public function processAssert(
         $fixtureCustomOptions = $this->prepareOptions($product, $actualPrice);
         $formCustomOptions = $catalogProductView->getViewBlock()->getOptions($product)['custom_options'];
         $error = $this->verifyData($fixtureCustomOptions, $formCustomOptions);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
index 5d93496151195..d5cf5d918817d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
@@ -62,7 +62,7 @@ public function processAssert(
         $fixtureData = $this->prepareFixtureData($product->getData());
 
         $errors = $this->verifyData($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
@@ -116,7 +116,7 @@ function (&$item, $key, $formattingOptions) {
     protected function prepareUrlKey($urlKey)
     {
         preg_match("~\d+$~", $urlKey, $matches);
-        $key = intval($matches[0]) + 1;
+        $key = (int)$matches[0] + 1;
         return str_replace($matches[0], $key, $urlKey);
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
index 87d656dc2e097..4c0a43665fb97 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
@@ -28,7 +28,7 @@ class AssertProductDuplicateMessage extends AbstractConstraint
     public function processAssert(CatalogProductEdit $productPage)
     {
         $actualMessages = $productPage->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::DUPLICATE_MESSAGE,
             $actualMessages,
             'Wrong duplicated message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
index ff8e2154e0a43..d63f0b4e61600 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
@@ -40,7 +40,7 @@ public function processAssert(FixtureInterface $product, CatalogProductIndex $pr
             ->search($filter);
 
         $filter['price_to'] = '$' . $filter['price_to'];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productGrid->getProductGrid()->isRowVisible($filter, false),
             'Product duplicate is absent in Products grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
index 1841979578435..4f8c55a3b0264 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
@@ -69,7 +69,7 @@ public function processAssert(
         $fixtureData = $this->prepareFixtureData($productData, $this->sortFields);
         $formData = $this->prepareFormData($productPage->getProductForm()->getData($product), $this->sortFields);
         $error = $this->verifyData($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertTrue(empty($error), $error);
+        \PHPUnit\Framework\Assert::assertTrue(empty($error), $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductFormattingTierPrice.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductFormattingTierPrice.php
index 51c21a1700063..cd183fbf40049 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductFormattingTierPrice.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductFormattingTierPrice.php
@@ -25,7 +25,7 @@ public function processAssert(CatalogProductEdit $productPage)
         $productPage->getProductForm()->openSection('advanced-pricing');
         $productPage->getAdvancedPrice()->getFieldsData([]);
         $productPage->getAdvancedPrice()->getTierPriceForm()->waitTierPriceFormLocks();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $productPage->getAdvancedPrice()->getTierPriceForm()->isVisible(),
             'Advanced price form still visible'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGridIsRendered.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGridIsRendered.php
new file mode 100644
index 0000000000000..6d83c0e45639a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGridIsRendered.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+/**
+ * Assert that product grid is rendered correctly.
+ */
+class AssertProductGridIsRendered extends \Magento\Mtf\Constraint\AbstractConstraint
+{
+    /**
+     * Assert that product grid is rendered correctly.
+     *
+     * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+     * @return void
+     */
+    public function processAssert(
+        \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+    ) {
+        $productId = $catalogProductIndex->open()->getProductGrid()->getFirstItemId();
+        \PHPUnit\Framework\Assert::assertNotNull(
+            $productId,
+            'Product grid is not rendered correctly.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Product grid is rendered correctly.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php
index bc905b2bb96a5..1343505a1cbd8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductHasImageInGrid.php
@@ -26,7 +26,7 @@ public function processAssert(
         $productGrid->open();
         $productGrid->getProductGrid()->search($filter);
         $src = $productGrid->getProductGrid()->getBaseImageAttribute('src');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($src, '/placeholder/') === false,
             'Product image is not present in product grid when it should be'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
index 47e1cfd938258..6f75741e8c753 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
@@ -62,7 +62,7 @@ public function processAssert(
 
         // Check price
         $this->countPrices($product, $checkoutCart);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $this->fixtureActualPrice,
             $this->formPrice,
             'Product price in shopping cart is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
index 0a3c3ad51758d..95cfb8374d676 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
@@ -46,7 +46,7 @@ public function processAssert(
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isProductVisible,
             'Product is absent on category page.'
         );
@@ -66,14 +66,14 @@ protected function assertPrice(FixtureInterface $product, CatalogCategoryView $c
     {
         $priceBlock = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($product->getPrice(), 2, '.', ''),
             $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice(),
             'Product regular price on category page is not correct.'
         );
 
         if ($product->hasData('special_price')) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($product->getSpecialPrice(), 2, '.', ''),
                 $priceBlock->getSpecialPrice(),
                 'Product special price on category page is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategoryOnCustomWebsite.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategoryOnCustomWebsite.php
index a08982bd0a112..696a286cb235a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategoryOnCustomWebsite.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategoryOnCustomWebsite.php
@@ -45,7 +45,7 @@ public function processAssert(
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isProductVisible,
             'Product is absent on the category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCustomStoreView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCustomStoreView.php
index c96728a453652..5c5306e286c92 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCustomStoreView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCustomStoreView.php
@@ -76,7 +76,7 @@ protected function verifyProductOnMainStore(FixtureInterface $initialProduct)
     {
         $this->browser->open($_ENV['app_frontend_url'] . $initialProduct->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $initialProduct->getName(),
             $this->productViewPage->getViewBlock()->getProductName(),
             'Product ' . $initialProduct->getName() . ' is incorrect.'
@@ -97,7 +97,7 @@ protected function verifyProductOnCustomStore(FixtureInterface $updatedProduct,
 
         $this->browser->open($_ENV['app_frontend_url'] . $updatedProduct->getUrlKey() . '.html');
 
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $updatedProduct->getName(),
                 $this->productViewPage->getViewBlock()->getProductName(),
                 'Product ' . $updatedProduct->getName() . ' is not available on ' . $store->getName() . ' store.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
index 0bd4db23d7a6d..a55c781cfb828 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
@@ -34,7 +34,7 @@ public function processAssert(FixtureInterface $product, CatalogProductIndex $pr
         $this->product = $product;
         $productIndex->open();
         $productIndex->getProductGrid()->resetFilter();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productIndex->getProductGrid()->isRowVisible($this->prepareFilter()),
             'Product \'' . $this->product->getName() . '\' is absent in Products grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
index 63a6bc9e81343..8bc552a0b00cb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
@@ -36,7 +36,7 @@ public function processAssert(
     ) {
         // TODO fix initialization url for frontend page
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::STOCK_AVAILABILITY,
             $catalogProductView->getViewBlock()->stockAvailability(),
             'Control "' . self::STOCK_AVAILABILITY . '" is not visible.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php
index ec8d09f0e4fac..cb05b289105ff 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php
@@ -47,14 +47,14 @@ public function processAssert(
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->waitLoader();
         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($maxQty * 2);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $catalogProductView->getMessagesBlock()->getErrorMessage(),
             sprintf($this->errorMessage, $maxQty),
             'The maximum purchase warning message is not appears.'
         );
 
         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($maxQty);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getMessagesBlock()->waitSuccessMessage(),
             'Limiting max qty is not working correctly.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php
index 42bdbd9f02395..b950fb216b1c5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php
@@ -47,14 +47,14 @@ public function processAssert(
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->waitLoader();
         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart(1);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $catalogProductView->getMessagesBlock()->getErrorMessage(),
             sprintf($this->errorMessage, $minQty),
             'The minimum purchase warning message is not appears.'
         );
 
         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($minQty);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getMessagesBlock()->waitSuccessMessage(),
             'Limiting min qty is not working correctly.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryThreshold.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryThreshold.php
index 2f155bef05a5a..260fcbbbc43d7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryThreshold.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryThreshold.php
@@ -44,13 +44,13 @@ public function processAssert(
             $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
             $isThresholdMessageDisplayed = $catalogProductView->getViewBlock()
                 ->isThresholdMessageDisplayed($browser, $product);
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $isThresholdMessageDisplayed,
                 $thresholdItem['is_message_displayed'],
                 'Product inventory threshold message display is not correct.'
             );
             if ($thresholdItem['is_message_displayed']) {
-                \PHPUnit_Framework_Assert::assertEquals(
+                \PHPUnit\Framework\Assert::assertEquals(
                     sprintf(self::SUCCESS_MESSAGE, $thresholdItem['expected']),
                     $catalogProductView->getViewBlock()->getThresholdMessage(),
                     'Product inventory success message is not displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
index 8019a3ccc76f5..4a4e3ae368a4a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
@@ -98,7 +98,7 @@ public function processAssert(
         foreach ($products as $product) {
             $errors = array_merge($errors, $this->isNotDisplayingOnFrontendAssert($product));
         }
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             "In the process of checking product availability on the frontend, found the following errors:\n"
             . implode("\n", $errors)
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
index 50a4415148f5e..bebddf6078965 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
@@ -39,12 +39,12 @@ public function processAssert(
         $compareBlock = $customerAccountIndex->getCompareProductsBlock();
 
         if (($countProducts > 1) && ($product !== null)) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $compareBlock->isProductVisibleInCompareBlock($product->getName()),
                 'The product displays on Compare Products block on my account page.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 self::SUCCESS_MESSAGE,
                 $compareBlock->getEmptyMessage(),
                 'The product displays on Compare Products block on my account page.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
index 81c109cf9fff5..0f81bc2660484 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
@@ -36,12 +36,12 @@ public function processAssert(CatalogProductCompare $comparePage, FixtureInterfa
         $compareBlock = $comparePage->getCompareProductsBlock();
 
         if ($countProducts > 1) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $compareBlock->isProductVisibleInCompareBlock($product->getName()),
                 'The product displays on Compare Products page.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 self::SUCCESS_MESSAGE,
                 $compareBlock->getEmptyMessage(),
                 'The product displays on Compare Products page.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNameOnDifferentStoreViews.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNameOnDifferentStoreViews.php
index 0567213a4c484..61861df34d2e8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNameOnDifferentStoreViews.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNameOnDifferentStoreViews.php
@@ -40,7 +40,7 @@ public function processAssert(
         foreach ($stores as $store) {
             $cmsIndex->getStoreSwitcherBlock()->selectStoreView($store->getName());
             $cmsIndex->getLinksBlock()->waitWelcomeMessage();
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $productNames[$store->getStoreId()],
                 $catalogProductView->getViewBlock()->getProductName(),
                 sprintf('Wrong product name is displayed for %s store view.', $store->getName())
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNoImageInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNoImageInGrid.php
index fde34c58e3384..9dd2e5d51aa34 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNoImageInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNoImageInGrid.php
@@ -29,7 +29,7 @@ public function processAssert(
         $productGrid->open();
         $productGrid->getProductGrid()->search($filter);
         $src = $productGrid->getProductGrid()->getBaseImageAttribute('src');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($src, '/placeholder/') !== false,
             'Product image is displayed in product grid when it should not'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
index 89161b846e7f6..62472b6770a0a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
@@ -29,7 +29,7 @@ public function processAssert($product, CatalogProductIndex $productGrid)
         foreach ($products as $product) {
             $filter = ['sku' => $product->getSku(), 'name' => $product->getName()];
             $productGrid->open();
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $productGrid->getProductGrid()->isRowVisible($filter),
                 "Product with sku \"{$filter['sku']}\" and name \"{$filter['name']}\" is attend in Products grid."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
index fb19e801530e6..76132b93978d1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
@@ -32,7 +32,7 @@ public function processAssert(
     ) {
         $cmsIndex->open();
         $cmsIndex->getSearchBlock()->search($product->getSku());
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogSearchResult->getListProductBlock()->getProductItem($product)->isVisible(),
             'Product was found by SKU.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
index a0c80e852d4b8..3fb002dd1ff9f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
@@ -46,7 +46,7 @@ public function processAssert(
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $isProductVisible,
             'Product exists on category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOnCustomWebsite.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOnCustomWebsite.php
index 69ec20239b654..7e1fb8b4747f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOnCustomWebsite.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOnCustomWebsite.php
@@ -67,7 +67,7 @@ protected function verifyProductOnMainWebsite(FixtureInterface $product)
     {
         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
             $this->productViewPage->getTitleBlock()->getTitle(),
             'Product ' . $product->getName() . ' is available on Main Website, but should not.'
@@ -88,7 +88,7 @@ protected function verifyProductOnCustomWebsite(FixtureInterface $product)
                 $_ENV['app_frontend_url'] . 'websites/' . $website->getCode() . '/' . $product->getUrlKey() . '.html'
             );
 
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $product->getName(),
                 $this->productViewPage->getViewBlock()->getProductName(),
                 'Product ' . $product->getName() . ' is not available on ' . $website->getName() . ' website.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
index 20d476cbebe95..b87cb80c5e95a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
@@ -35,7 +35,7 @@ public function processAssert(
         FixtureInterface $product
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::STOCK_AVAILABILITY,
             $catalogProductView->getViewBlock()->stockAvailability(),
             'Control \'' . self::STOCK_AVAILABILITY . '\' is not visible.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
index 049ecaf053eea..245156cbeebc8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
@@ -62,7 +62,7 @@ public function processAssert(
         $this->productView = $catalogProductView->getViewBlock();
 
         $errors = $this->verify();
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             "\nFound the following errors:\n" . implode(" \n", $errors)
         );
@@ -145,7 +145,7 @@ protected function verifySpecialPrice()
         }
         $expectedSpecialPrice = $this->product->getSpecialPrice();
         $expectedSpecialPrice = number_format($expectedSpecialPrice, 2);
-        $priceBlock = $this->productView->getPriceBlock();
+        $priceBlock = $this->productView->getPriceBlock($this->product);
         if (!$priceBlock->isVisible()) {
             return "Price block for '{$this->product->getName()}' product' is not visible.";
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPriceOnDifferentStoreViews.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPriceOnDifferentStoreViews.php
index 6c76d4617e317..5f7182af0ac32 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPriceOnDifferentStoreViews.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPriceOnDifferentStoreViews.php
@@ -38,7 +38,7 @@ public function processAssert(
         foreach ($stores as $store) {
             $cmsIndex->getStoreSwitcherBlock()->selectStoreView($store->getName());
             $cmsIndex->getLinksBlock()->waitWelcomeMessage();
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 '9.99',
                 $catalogProductView->getViewBlock()->getPriceBlock()->getPrice(),
                 sprintf('Wrong product price is displayed for %s store view.', $store->getName())
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductRelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductRelatedProducts.php
index 298a167d6cb79..592044d30590f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductRelatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductRelatedProducts.php
@@ -44,7 +44,7 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         foreach ($promotedProducts as $promotedProduct) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $catalogProductView->getRelatedProductBlock()->getProductItem($promotedProduct)->isVisible(),
                 'Product \'' . $promotedProduct->getName()
                 . '\' is absent in related products \'' . $product->getName() . '\'.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
index 0ee74bf07bd1f..d2b66d5b12524 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
@@ -28,7 +28,7 @@ class AssertProductSaveMessage extends AbstractConstraint
     public function processAssert(CatalogProductEdit $productPage)
     {
         $actualMessages = $productPage->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::SUCCESS_MESSAGE,
             $actualMessages,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
index 85f8448c2c7d4..4c841969e2343 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
@@ -68,7 +68,7 @@ public function processAssert(
             list($this->errorMessage, $this->successfulMessage) = [$this->successfulMessage, $this->errorMessage];
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisible,
             $this->errorMessage
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
index 62cf965177314..4985d5181275e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
@@ -26,7 +26,7 @@ public function processAssert(FixtureInterface $product, CatalogProductIndex $pr
     {
         $filter = ['sku' => $product->getName()];
         $productGrid->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productGrid->getProductGrid()->isRowVisible($filter),
             'SKU is not automatically generated for a product.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
index 0d8ebd5ac337a..18617f4795c24 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
@@ -64,9 +64,9 @@ public function setErrorMessage($errorMessage)
     public function assertPrice(FixtureInterface $product, View $productViewBlock)
     {
         $fields = $product->getData();
-        $specialPrice = $productViewBlock->getPriceBlock()->getSpecialPrice();
+        $specialPrice = $productViewBlock->getPriceBlock($product)->getSpecialPrice();
         if (isset($fields['special_price'])) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($fields['special_price'], 2),
                 $specialPrice,
                 $this->errorMessage
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
index b4c8b1d451cd5..02792b5d85728 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
@@ -32,7 +32,7 @@ public function processAssert($product, CatalogProductIndex $productPage)
         $products = is_array($product) ? $product : [$product];
         $deleteMessage = sprintf(self::SUCCESS_DELETE_MESSAGE, count($products));
         $actualMessage = $productPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $deleteMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php
index ccd3f589c7e9e..eda2705914b92 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php
@@ -64,7 +64,7 @@ public function processAssert(
 
         // Check price
         $this->countPrices($product, $checkoutCart);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $this->fixtureActualPrice,
             $this->formPrice,
             'Product price in shopping cart is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
index e962127774e8f..233f8bea873d1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -92,7 +92,7 @@ public function assertPrice(FixtureInterface $product, View $productViewBlock)
             }
         }
 
-        \PHPUnit_Framework_Assert::assertTrue($noError, $this->errorMessage);
+        \PHPUnit\Framework\Assert::assertTrue($noError, $this->errorMessage);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTypeOrderOnCreate.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTypeOrderOnCreate.php
index bac64fbf29c6a..5b858f1de46f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTypeOrderOnCreate.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTypeOrderOnCreate.php
@@ -25,7 +25,7 @@ public function processAssert(CatalogProductIndex $catalogProductIndex, array $m
     {
         $catalogProductIndex->open();
         ksort($menu);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             implode("\n", $menu),
             $catalogProductIndex->getGridPageActionBlock()->getTypeList(),
             'Order and filling of types on product page not equals to incoming data.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductUpSells.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductUpSells.php
index c403f2c6eef28..f4ac8c12883db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductUpSells.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductUpSells.php
@@ -44,7 +44,7 @@ public function processAssert(
 
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         foreach ($promotedProducts as $promotedProduct) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $catalogProductView->getUpsellBlock()->getProductItem($promotedProduct)->isVisible(),
                 'Product \'' . $promotedProduct->getName()
                 . '\' is absent in up-sells products of a product \'' . $product->getName() . '\'.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
index 6da6d7a73f54c..3f03eea70c383 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
@@ -48,19 +48,19 @@ protected function assertOnProductView(CatalogProductSimple $product, CatalogPro
         $name = $viewBlock->getProductName();
         $sku = $viewBlock->getProductSku();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $product->getName(),
             $name,
             'Product name on product view page is not correct.'
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $product->getSku(),
             $sku,
             'Product sku on product view page is not correct.'
         );
 
         if (isset($price['price_regular_price'])) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($product->getPrice(), 2),
                 $price['price_regular_price'],
                 'Product regular price on product view page is not correct.'
@@ -73,7 +73,7 @@ protected function assertOnProductView(CatalogProductSimple $product, CatalogPro
         }
 
         if ($priceComparing && isset($price['price_special_price'])) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($priceComparing, 2),
                 $price['price_special_price'],
                 'Product special price on product view page is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductViewBreadcrumbsCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductViewBreadcrumbsCategory.php
new file mode 100644
index 0000000000000..c44279e42edc0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductViewBreadcrumbsCategory.php
@@ -0,0 +1,76 @@
+<?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\CatalogProductSimple;
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that correct category is displayed in breadcrumbs.
+ */
+class AssertProductViewBreadcrumbsCategory extends AbstractConstraint
+{
+    /**
+     * @param CatalogCategoryView $catalogCategoryView
+     * @param CatalogProductView $catalogProductView
+     * @param CmsIndex $cmsIndex
+     * @param BrowserInterface $browser
+     * @param CatalogProductSimple $product
+     * @return void
+     */
+    public function processAssert(
+        CatalogCategoryView $catalogCategoryView,
+        CatalogProductView $catalogProductView,
+        CmsIndex $cmsIndex,
+        BrowserInterface $browser,
+        CatalogProductSimple $product
+    ) {
+        $categories = is_object($product->getDataFieldConfig('category_ids')['source'])
+            ? $product->getDataFieldConfig('category_ids')['source']->getCategories()
+            : [];
+
+        if (!empty($categories)) {
+            /** @var Category $category */
+            foreach ($categories as $category) {
+                $cmsIndex->open();
+                $cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
+
+                $productItem = $catalogCategoryView->getListProductBlock()->getProductItem($product);
+                \PHPUnit\Framework\Assert::assertTrue(
+                    $productItem->isVisible(),
+                    'Product is not present in category.'
+                );
+
+                $productItem->open();
+                // Ensure page is cached
+                $browser->refresh();
+
+                $breadcrumbs = $catalogProductView->getBreadcrumbs()->getCrumbs();
+
+                \PHPUnit\Framework\Assert::assertContains(
+                    $category->getName(),
+                    $breadcrumbs,
+                    'Product view page has incorrect breadcrumbs.'
+                );
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Product has correct category in product view breadcrumbs.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
index deb389c27cae4..4a99a9aea5698 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
@@ -63,7 +63,7 @@ public function processAssert(
             $this->successfulMessage = 'Asserts that the product could not be found in this category.';
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isProductVisible,
             $this->errorMessage
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php
index 5ce28f995d15b..6c9f2da9587c9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsQtyAndStockStatusInAdminPanel.php
@@ -43,7 +43,7 @@ public function processAssert(
             $actualQtyAndStockStatus['stock_status'] =
                 strtolower($productData['quantity_and_stock_status']['is_in_stock']);
 
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $actualQtyAndStockStatus,
                 $expectedQtyAndStockStatus,
                 'Expected and actual products qty and status are not equal.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertResetFilterMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertResetFilterMessage.php
new file mode 100644
index 0000000000000..5a8f85c9bbc15
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertResetFilterMessage.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+/**
+ * Assert that filters have been reset successfully.
+ */
+class AssertResetFilterMessage extends \Magento\Mtf\Constraint\AbstractConstraint
+{
+    /**
+     * Assert message that filters have been reset.
+     *
+     * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+     * @return void
+     */
+    public function processAssert(
+        \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+    ) {
+        \PHPUnit\Framework\Assert::assertContains(
+            'restored the filter to its original state',
+            $catalogProductIndex->getMessagesBlock()->getErrorMessage(),
+            "Can't find proper message"
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Filters have been reset successfully.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertSubCategoryNotInNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertSubCategoryNotInNavigationMenu.php
index b4876c395dee1..7281550ec0c2a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertSubCategoryNotInNavigationMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertSubCategoryNotInNavigationMenu.php
@@ -30,7 +30,7 @@ public function processAssert(
         CmsIndex $cmsIndex
     ) {
         $cmsIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogCategoryView->getTopmenu()->isCategoryVisible($subcategory->getName()),
             'Expected that ' . $subcategory->getName() . ' is not visible in navigation menu.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpdatedProductStatusInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpdatedProductStatusInGrid.php
index a6169f523d3e8..6a6ed7ca6f48f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpdatedProductStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpdatedProductStatusInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(
             ? 'Enabled'
             : 'Disabled';
         $filter = ['status' => $productStatus];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductIndex->getProductGrid()->isRowVisible($filter),
             'Product \'' . $product->getName() . '\' is absent in Products grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
index 4cabca5586da1..ce6ee18373056 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
@@ -28,7 +28,7 @@ class AssertUsedSuperAttributeImpossibleDeleteMessages extends AbstractConstrain
      */
     public function processAssert(CatalogProductAttributeNew $newPage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_DELETE_MESSAGE,
             $newPage->getMessagesBlock()->getErrorMessage(),
             'Wrong impossible to delete message is not displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/WebsiteIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/WebsiteIds.php
index 2bd71dbf4f8a6..57fe2bb59154f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/WebsiteIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/WebsiteIds.php
@@ -37,7 +37,7 @@ class WebsiteIds extends DataSource
     private $fixtureFactory;
 
     /**
-     * Rought fixture field data.
+     * Rough fixture field data.
      *
      * @var array
      */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
index d78095f05fe45..3d644a2a32274 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -91,15 +91,18 @@ public function persist(FixtureInterface $fixture = null)
         $data['frontend_label'] = [0 => $data['frontend_label']];
 
         if (isset($data['options'])) {
+            $optionsData = [];
             foreach ($data['options'] as $key => $values) {
+                $optionRowData = [];
                 $index = 'option_' . $key;
                 if ($values['is_default'] == 'Yes') {
-                    $data['default'][] = $index;
+                    $optionRowData['default'][] = $index;
                 }
-                $data['option']['value'][$index] = [$values['admin'], $values['view']];
-                $data['option']['order'][$index] = $key;
+                $optionRowData['option']['value'][$index] = [$values['admin'], $values['view']];
+                $optionRowData['option']['order'][$index] = $key;
+                $optionsData[] = $optionRowData;
             }
-            unset($data['options']);
+            $data['options'] = $optionsData;
         }
 
         $data = $this->changeStructureOfTheData($data);
@@ -134,11 +137,39 @@ public function persist(FixtureInterface $fixture = null)
     }
 
     /**
+     * Additional data handling.
+     *
      * @param array $data
      * @return array
      */
-    protected function changeStructureOfTheData(array $data)
+    protected function changeStructureOfTheData(array $data): array
     {
+        if (!isset($data['options'])) {
+            return $data;
+        }
+
+        $serializedOptions = $this->getSerializeOptions($data['options']);
+        if ($serializedOptions) {
+            $data['serialized_options'] = $serializedOptions;
+            unset($data['options']);
+        }
+
         return $data;
     }
+
+    /**
+     * Provides serialized product attribute options.
+     *
+     * @param array $data
+     * @return string
+     */
+    protected function getSerializeOptions(array $data): string
+    {
+        $options = [];
+        foreach ($data as $optionRowData) {
+            $options[] = http_build_query($optionRowData);
+        }
+
+        return json_encode($options);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
index 001e815ce2d2b..2a23903a697b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -345,7 +345,7 @@ protected function preparePrice()
     }
 
     /**
-     * Preparation wheather product 'Is Virtual'.
+     * Preparation whether product 'Is Virtual'.
      *
      * @return void
      */
@@ -411,7 +411,7 @@ protected function prepareQuantityAndStockStatus()
             : ['is_in_stock' => 'In Stock'];
 
         if (!isset($quantityAndStockStatus['is_in_stock'])) {
-            $qty = isset($quantityAndStockStatus['qty']) ? intval($quantityAndStockStatus['qty']) : null;
+            $qty = isset($quantityAndStockStatus['qty']) ? (int)$quantityAndStockStatus['qty'] : null;
             $quantityAndStockStatus['is_in_stock'] = 0 === $qty ? 'Out of Stock' : 'In Stock';
         }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml
index 7530ddc9a6032..bd9e6c0665a9b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml
@@ -17,5 +17,6 @@
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
         <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector" />
         <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".column.main .widget" strategy="css selector" />
+        <block name="breadcrumbs" class="Magento\Theme\Test\Block\Html\Breadcrumbs" locator=".breadcrumbs" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml
index 561521f57a40c..fed2c9a41242c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml
@@ -335,5 +335,32 @@
             <field name="is_required" xsi:type="string">No</field>
             <field name="is_used_for_promo_rules" xsi:type="string">Yes</field>
         </dataset>
+
+        <dataset name="sizes_S_M_L_Filterable">
+            <field name="frontend_label" xsi:type="string">size_%isolation%</field>
+            <field name="attribute_code" xsi:type="string">size_%isolation%</field>
+            <field name="frontend_input" xsi:type="string">Dropdown</field>
+            <field name="is_required" xsi:type="string">No</field>
+            <field name="is_searchable" xsi:type="string">Yes</field>
+            <field name="is_filterable" xsi:type="string">Filterable (with results)</field>
+            <field name="is_filterable_in_search" xsi:type="string">Yes</field>
+            <field name="options" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="is_default" xsi:type="string">No</item>
+                    <item name="admin" xsi:type="string">SIZE_S</item>
+                    <item name="view" xsi:type="string">SIZE_S</item>
+                </item>
+                <item name="1" xsi:type="array">
+                    <item name="is_default" xsi:type="string">No</item>
+                    <item name="admin" xsi:type="string">SIZE_M</item>
+                    <item name="view" xsi:type="string">SIZE_M</item>
+                </item>
+                <item name="2" xsi:type="array">
+                    <item name="is_default" xsi:type="string">No</item>
+                    <item name="admin" xsi:type="string">SIZE_L</item>
+                    <item name="view" xsi:type="string">SIZE_L</item>
+                </item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute/Options.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute/Options.xml
index fb880a9e620f2..86e0ef2cb7dcd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute/Options.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute/Options.xml
@@ -22,5 +22,12 @@
                 <item name="admin" xsi:type="string">white</item>
             </field>
         </dataset>
+
+        <dataset name="option_with_single_quotation">
+            <field name="0" xsi:type="array">
+                <item name="is_default" xsi:type="string">Yes</item>
+                <item name="admin" xsi:type="string">test option with single\&apos;</item>
+            </field>
+        </dataset>
     </repository>
 </config>
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 9270ec19c2a23..e90ca6bf7868a 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
@@ -41,7 +41,7 @@
             <field name="attribute_set_id" xsi:type="array">
                 <item name="dataset" xsi:type="string">default</item>
             </field>
-            <field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=-~` %isolation%</field>
+            <field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=~` %isolation%</field>
             <field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
             <field name="is_virtual" xsi:type="string">No</field>
             <field name="product_has_weight" xsi:type="string">This item has weight</field>
@@ -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>
@@ -2156,5 +2156,59 @@
             </field>
             <field name="url_key" xsi:type="string">simple-product-%isolation%</field>
         </dataset>
+
+        <dataset name="product_to_match">
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="name" xsi:type="string">Matching Product</field>
+            <field name="sku" xsi:type="string">sku_matching_product</field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">1</field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="qty" xsi:type="string">25</item>
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">60</item>
+            </field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="visibility" xsi:type="string">Catalog, Search</field>
+            <field name="url_key" xsi:type="string">matching-product</field>
+        </dataset>
+
+        <dataset name="product_to_display">
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="name" xsi:type="string">Displayed Product</field>
+            <field name="sku" xsi:type="string">sku_displayed_product</field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">2</field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="qty" xsi:type="string">35</item>
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">70</item>
+            </field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="visibility" xsi:type="string">Catalog, Search</field>
+            <field name="url_key" xsi:type="string">displayed-product</field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml
index 67da24bb11fe5..d2d9ce5313f45 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml
@@ -248,5 +248,23 @@
                 <item name="dataset" xsi:type="string">virtual_order_default</item>
             </field>
         </dataset>
+
+        <dataset name="product_with_special_price">
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="name" xsi:type="string">Virtual Product %isolation%</field>
+            <field name="sku" xsi:type="string">sku_virtual_product_%isolation%</field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">10</item>
+            </field>
+            <field name="product_has_weight" xsi:type="string">This item has no weight</field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="qty" xsi:type="string">99</item>
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="url_key" xsi:type="string">virtual-product-%isolation%</field>
+            <field name="special_price" xsi:type="string">9</field>
+        </dataset>
     </repository>
 </config>
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 c98a3dd46f7d1..c53f029175e08 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,38 @@
                 </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>
+
+        <dataset name="checkbox_with_one_100_percent_price">
+            <field name="0" xsi:type="array">
+                <item name="title" xsi:type="string">custom option checkbox %isolation%</item>
+                <item name="is_require" xsi:type="string">No</item>
+                <item name="type" xsi:type="string">Select/Checkbox</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">100 Percent</item>
+                        <item name="price" xsi:type="string">100</item>
+                        <item name="price_type" xsi:type="string">Percent</item>
+                        <item name="sku" xsi:type="string">sku_checkbox_row_1</item>
+                        <item name="sort_order" xsi:type="string">0</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 b10a47b63508c..c6a66beac7c79 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
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\CreateCategoryEntityTest" summary="Create Category from Category Page" ticketId="MAGETWO-23411">
         <variation name="CreateCategoryEntityTestVariation1_RootCategory_RequiredFields">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Create root category with required fields only</data>
             <data name="addCategory" xsi:type="string">addRootCategory</data>
             <data name="category/data/is_active" xsi:type="string">Yes</data>
@@ -175,5 +176,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/AbstractCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
index 25a0ffa7c072a..a463a3edacc10 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
@@ -163,6 +163,6 @@ protected function addProducts(array $products, AbstractConstraint $assert = nul
     protected function productCompareAssert(AbstractConstraint $assert, InjectableFixture $product)
     {
         $assert->configure(['catalogProductView' => $this->catalogProductView, 'product' => $product]);
-        \PHPUnit_Framework_Assert::assertThat($this->getName(), $assert);
+        \PHPUnit\Framework\Assert::assertThat($this->getName(), $assert);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
index c700dbc362cbb..c40387aba4603 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php
@@ -76,7 +76,7 @@ public function tearDown()
     {
         $this->cmsIndex->open();
         $this->cmsIndex->getLinksBlock()->openLink("Compare Products");
-        for ($i = 1; $i <= count($this->products); $i++) {
+        for ($i = 1, $count = count($this->products); $i <= $count; $i++) {
             $this->catalogProductCompare->getCompareProductsBlock()->removeProduct();
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
index 2ff67cdeb4d2a..1827292303174 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
@@ -21,14 +21,14 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductComparePage" />
         </variation>
         <variation name="AddCompareProductsTestVariation3">
-            <data name="products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
+            <data name="products" xsi:type="string">configurableProduct::configurable_as_low_as</data>
             <data name="isCustomerLoggedIn" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLink" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductComparePage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareBlockOnCmsPage" />
         </variation>
         <variation name="AddCompareProductsTestVariation4">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::configurable_with_qty_1,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
+            <data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::configurable_as_low_as,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
             <data name="isCustomerLoggedIn" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLink" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductComparePage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php
index b88f4c602e898..1730d8386476b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.php
@@ -118,7 +118,7 @@ protected function addToCart(InjectableFixture $product)
     protected function assertAbsentCrossSellSection()
     {
         $this->checkoutCart->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $this->checkoutCart->getCrosssellBlock()->isVisible(),
             "Cross-sell block is present."
         );
@@ -145,7 +145,7 @@ protected function assertCrossSellSection(array $promotedProductNames)
 
         sort($productNames);
         sort($pageProductNames);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $productNames,
             $pageProductNames,
             'Wrong products are displayed in cross-sell section.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
index 3ae531ac46c10..7a677dbea983c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
@@ -79,6 +79,8 @@ public function testCreate(
         $flushCache = false,
         $configData = null
     ) {
+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1620');
+
         $this->configData = $configData;
         $this->flushCache = $flushCache;
 
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 60af58cae5a10..8732157e5c657 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,39 @@
             <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>
+        <variation name="CreateSimpleProductEntityTestVariation12" ticketId="MAGETWO-90368">
+            <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">10</data>
+            <data name="product/data/short_description" xsi:type="string">Simple Product short_description %isolation%</data>
+            <data name="product/data/description" xsi:type="string">Simple Product description %isolation%</data>
+            <data name="product/data/weight" xsi:type="string">1</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">10</data>
+            <data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
+            <data name="product/data/category_ids/new_category" xsi:type="string">yes</data>
+            <data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory,default_subcategory</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductViewBreadcrumbsCategory" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
index 0954727ce132d..69d09bdd47f13 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
@@ -90,6 +90,8 @@ public function __prepare(
      */
     public function test($productType)
     {
+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/666');
+
         // Precondition
         $product = $this->createProduct($productType);
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml
new file mode 100644
index 0000000000000..687ed7038f40b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Ui\Test\TestCase\GridFilteringDeletedEntityTest" summary="Grid filtering by deleted entity" ticketId="MAGETWO-88982">
+        <variation name="GridFilteringDeletedEntityTestVariation1">
+            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="steps" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="0" xsi:type="string">Magento\Store\Test\TestStep\DeleteWebsitesEntityStep</item>
+                </item>
+            </data>
+            <data name="fixtureName" xsi:type="string">catalogProductSimple</data>
+            <data name="fixtureDataSet" xsi:type="string">product_with_additional_website</data>
+            <data name="filters" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="name" xsi:type="string">:name</item>
+                </item>
+            </data>
+            <data name="pageClass" xsi:type="string">Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex</data>
+            <data name="gridRetriever" xsi:type="string">getProductGrid</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGridIsRendered"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertResetFilterMessage"/>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php
index 8b9a41274accf..d711ce75417e9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.php
@@ -185,7 +185,7 @@ protected function selectRelatedProducts($product)
      */
     protected function assertAbsentRelatedSellSection()
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $this->catalogProductView->getRelatedProductBlock()->isVisible(),
             "Related section is present."
         );
@@ -214,7 +214,7 @@ protected function assertRelatedSection($product)
 
         asort($fixtureData);
         asort($pageData);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $pageData,
             $fixtureData,
             'Wrong products are displayed in related section.'
@@ -232,7 +232,7 @@ protected function assertCheckoutCart(array $checkoutProducts)
         $this->checkoutCart->open();
 
         foreach ($checkoutProducts as $product) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $this->checkoutCart->getCartBlock()->getCartItem($product)->isVisible(),
                 "Product {$product->getName()} absent in cart."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
index 8ddb0727f9a00..91519ca724efa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
@@ -75,7 +75,7 @@ public function test(
      */
     protected function assertAbsentUpSellSection()
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $this->catalogProductView->getUpsellBlock()->isVisible(),
             "Up-sell section is present."
         );
@@ -101,7 +101,7 @@ protected function assertUpSellSection(array $promotedProductNames)
 
         sort($productNames);
         sort($pageProductNames);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $productNames,
             $pageProductNames,
             'Wrong products are displayed in up-sell section.'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
index 5e871bf6d97a5..707a62a446054 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Section\Downloadable;
 
 /**
  * Test Creation for ProductTypeSwitchingOnCreation
@@ -75,18 +76,49 @@ public function __inject(
      *
      * @param string $createProduct
      * @param string $product
+     * @param string $actionName
      * @return array
      */
-    public function test($createProduct, $product)
+    public function test(string $createProduct, string $product, string $actionName = null): array
     {
         // Steps
         list($fixture, $dataset) = explode('::', $product);
         $product = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
         $this->catalogProductIndex->open();
         $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct);
+        if ($actionName) {
+            $this->performAction($actionName);
+        }
         $this->catalogProductNew->getProductForm()->fill($product);
         $this->catalogProductNew->getFormPageActions()->save($product);
 
         return ['product' => $product];
     }
+
+    /**
+     * Perform action.
+     *
+     * @param string $actionName
+     * @return void
+     */
+    private function performAction(string $actionName): void
+    {
+        if (method_exists(__CLASS__, $actionName)) {
+            $this->$actionName();
+        }
+    }
+
+    /**
+     * Clear downloadable product data.
+     *
+     * @return void
+     */
+    private function clearDownloadableData(): void
+    {
+        $this->catalogProductNew->getProductForm()->openSection('downloadable_information');
+        /** @var Downloadable $downloadableInfoTab */
+        $downloadableInfoTab = $this->catalogProductNew->getProductForm()->getSection('downloadable_information');
+        $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+        $downloadableInfoTab->setIsDownloadable('No');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
index f45fbc96a738d..8fbb64f4579b1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
@@ -33,6 +33,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnCreationTestVariation4">
+            <data name="issue" xsi:type="string">MSI-1624</data>
             <data name="createProduct" xsi:type="string">configurable</data>
             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -76,7 +77,8 @@
         <variation name="ProductTypeSwitchingOnCreationTestVariation9">
             <data name="createProduct" xsi:type="string">downloadable</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
+            <data name="issue" xsi:type="string">MSI-1624</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ReSavingProductAfterInitialSaveTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ReSavingProductAfterInitialSaveTest.php
index 5ca7f06effc24..ba9714672cfbb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ReSavingProductAfterInitialSaveTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ReSavingProductAfterInitialSaveTest.php
@@ -19,7 +19,7 @@
  *
  * 1. Login to backend.
  * 2. Create a product with invalid from and To dates
- * 3. Save the product which generates an error messsage
+ * 3. Save the product which generates an error message
  * 4. Modify the  dates to valid values
  * 5. Save the product again
  * 6. Product is saved successfully
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
index ae5b887e37843..aae9ec6039f56 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
@@ -208,5 +208,16 @@
             <data name="productAttribute/data/is_comparable" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsUnique" />
         </variation>
+        <variation name="CreateProductAttributeEntityTestVariation10" summary="Create custom dropdown attribute with single quotation in option">
+            <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
+            <data name="productAttribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
+            <data name="productAttribute/data/frontend_input" xsi:type="string">Dropdown</data>
+            <data name="productAttribute/data/options/dataset" xsi:type="string">option_with_single_quotation</data>
+            <data name="productAttribute/data/is_required" xsi:type="string">Yes</data>
+            <data name="productAttribute/data/attribute_code" xsi:type="string">attr_dropdown_%isolation%</data>
+            <data name="productAttribute/data/is_global" xsi:type="string">Global</data>
+            <data name="productAttribute/data/is_unique" xsi:type="string">No</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProduct.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProduct.php
index 9ca8e535662bc..f51f5e2680415 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProduct.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProduct.php
@@ -31,7 +31,7 @@ public function processAssert(
         $exportData = $export->getLatest();
 
         foreach ($products as $product) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $this->isProductDataInFile(
                     $exportedFields,
                     $product,
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProductDate.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProductDate.php
index 1a05cf15cb09f..65adf5923d772 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProductDate.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProductDate.php
@@ -24,7 +24,7 @@ public function processAssert(ExportInterface $export, \DateTime $dateTime)
     {
         $exportData = $export->getLatest();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             (bool) strpos($exportData->getContent(), $dateTime->format('n/j/y, g')),
             'Date fields in exported file are shown in not global configuration time zone.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php
index 989a102a6cc68..c5efedf6a08d0 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php
@@ -91,7 +91,7 @@ public function processAssert(
             if ($product->getDataConfig()['type_id'] === $this->productType) {
                 $resultProductsData = $this->getDisplayedProductData($product);
                 $resultCsvData = $this->getResultCsv($product->getSku());
-                \PHPUnit_Framework_Assert::assertEquals(
+                \PHPUnit\Framework\Assert::assertEquals(
                     $resultProductsData,
                     $resultCsvData,
                     'Products from page and csv are not match.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertProductsOnStorefront.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertProductsOnStorefront.php
index 11e8807307d82..d1887d6accba0 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertProductsOnStorefront.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertProductsOnStorefront.php
@@ -30,7 +30,7 @@ public function processAssert(
     ) {
         foreach ($entities as $entity) {
             $browser->open($_ENV['app_frontend_url'] . $entity->getUrlKey() . '.html');
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $catalogProductView->getViewBlock()->getProductName(),
                 $entity->getName(),
                 "Can't find product in store front"
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
index 51a78f4d4ad91..38a0ae1d99091 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
@@ -48,7 +48,7 @@ public function processAssert(
             $categoryName = $product->getCategoryIds()[0];
             $cmsIndexPage->getTopmenu()->selectCategoryByName($categoryName);
             $priceBlock = $catalogCategoryViewPage->getListProductBlock()->getProductItem($product)->getPriceBlock();
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $priceBlock->isVisible(),
                 'Price block is not displayed for product ' . $product->getName()
             );
@@ -56,9 +56,13 @@ public function processAssert(
             if ($productPrice[$key]['regular'] !== 'No') {
                 $actualPrice['regular'] = (float)$priceBlock->getOldPrice();
                 $actualPrice['discount_amount'] = $actualPrice['regular'] - $actualPrice['special'];
+                $actualPrice['price_from'] = (float)$priceBlock->getPriceFrom();
+                $actualPrice['price_to'] = (float)$priceBlock->getPriceTo();
+                $actualPrice['old_price_from'] = (float)$priceBlock->getOldPriceFrom();
+                $actualPrice['old_price_to'] = (float)$priceBlock->getOldPriceTo();
             }
-            $diff = $this->verifyData($actualPrice, $productPrice[$key]);
-            \PHPUnit_Framework_Assert::assertTrue(
+            $diff = $this->verifyData($productPrice[$key], $actualPrice);
+            \PHPUnit\Framework\Assert::assertTrue(
                 empty($diff),
                 implode(' ', $diff)
             );
@@ -68,15 +72,15 @@ public function processAssert(
     /**
      * Check if arrays have equal values.
      *
-     * @param array $formData
      * @param array $fixtureData
+     * @param array $formData
      * @return array
      */
-    protected function verifyData(array $formData, array $fixtureData)
+    protected function verifyData(array $fixtureData, array $formData)
     {
         $errorMessage = [];
-        foreach ($formData as $key => $value) {
-            if ($value != $fixtureData[$key]) {
+        foreach ($fixtureData as $key => $value) {
+            if (isset($formData[$key]) && (float)$value !== (float)$formData[$key]) {
                 $errorMessage[] = "Value " . $key . " is not equal."
                     . "\nExpected: " . $fixtureData[$key]
                     . "\nActual: " . $value . "\n";
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
index ce0f7a73006af..271305902d59b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
@@ -11,6 +11,8 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep;
+use Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep;
 
 /**
  * Assert that Catalog Price Rule is applied on Product page.
@@ -38,11 +40,11 @@ public function processAssert(
     ) {
         if ($customer !== null) {
             $this->objectManager->create(
-                \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
+                LoginCustomerOnFrontendStep::class,
                 ['customer' => $customer]
             )->run();
         } else {
-            $this->objectManager->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run();
+            $this->objectManager->create(LogoutCustomerOnFrontendStep::class)->run();
         }
 
         $cmsIndexPage->open();
@@ -52,14 +54,18 @@ public function processAssert(
             $catalogCategoryViewPage->getListProductBlock()->getProductItem($product)->open();
 
             $catalogProductViewPage->getViewBlock()->waitLoader();
-            $productPriceBlock = $catalogProductViewPage->getViewBlock()->getPriceBlock();
+            $productPriceBlock = $catalogProductViewPage->getViewBlock()->getPriceBlock($product);
             $actualPrice['special'] = $productPriceBlock->getSpecialPrice();
             if ($productPrice[$key]['regular'] !== 'No') {
                 $actualPrice['regular'] = $productPriceBlock->getOldPrice();
                 $actualPrice['discount_amount'] = $actualPrice['regular'] - $actualPrice['special'];
+                $actualPrice['price_from'] = $productPriceBlock->getPriceFrom();
+                $actualPrice['price_to'] = $productPriceBlock->getPriceTo();
+                $actualPrice['old_price_from'] = $productPriceBlock->getOldPriceFrom();
+                $actualPrice['old_price_to'] = $productPriceBlock->getOldPriceTo();
             }
-            $diff = $this->verifyData($actualPrice, $productPrice[$key]);
-            \PHPUnit_Framework_Assert::assertTrue(
+            $diff = $this->verifyData($productPrice[$key], $actualPrice);
+            \PHPUnit\Framework\Assert::assertTrue(
                 empty($diff),
                 implode(' ', $diff)
             );
@@ -69,18 +75,18 @@ public function processAssert(
     /**
      * Check if arrays have equal values.
      *
-     * @param array $formData
      * @param array $fixtureData
+     * @param array $formData
      * @return array
      */
-    protected function verifyData(array $formData, array $fixtureData)
+    protected function verifyData(array $fixtureData, array $formData)
     {
         $errorMessage = [];
-        foreach ($formData as $key => $value) {
-            if ($value != $fixtureData[$key]) {
-                $errorMessage[] = "Data not equal."
+        foreach ($fixtureData as $key => $value) {
+            if (isset($formData[$key]) && (float)$value !== (float)$formData[$key]) {
+                $errorMessage[] = "Value " . $key . " is not equal."
                     . "\nExpected: " . $fixtureData[$key]
-                    . "\nActual: " . $value;
+                    . "\nActual: " . $value . "\n";
             }
         }
         return $errorMessage;
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
index 4ecbb382e66fe..3e7fdcbb0f9fd 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
@@ -50,7 +50,7 @@ public function processAssert(
         $checkoutCartPage->open();
         foreach ($products as $key => $product) {
             $actualPrice = $checkoutCartPage->getCartBlock()->getCartItem($product)->getSubtotalPrice();
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $productPrice[$key]['sub_total'],
                 $actualPrice,
                 'Wrong product price is displayed.'
@@ -64,7 +64,7 @@ public function processAssert(
         $actualPrices['grand_total'] = $checkoutCartPage->getTotalsBlock()->getGrandTotal();
         $expectedPrices['sub_total'] = $cartPrice['sub_total'];
         $expectedPrices['grand_total'] = $cartPrice['grand_total'];
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedPrices,
             $actualPrices,
             'Wrong total cart prices are displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
index e90b0a731e88a..17739f5524e13 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
@@ -42,13 +42,13 @@ public function processAssert(
         $fixtureData = $catalogPriceRule->getData();
         //convert discount_amount to float to compare
         if (isset($formData['discount_amount'])) {
-            $formData['discount_amount'] = floatval($formData['discount_amount']);
+            $formData['discount_amount'] = (float)$formData['discount_amount'];
         }
         if (isset($fixtureData['discount_amount'])) {
-            $fixtureData['discount_amount'] = floatval($fixtureData['discount_amount']);
+            $fixtureData['discount_amount'] = (float)$fixtureData['discount_amount'];
         }
         $diff = $this->verifyData($formData, $fixtureData);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($diff),
             implode(' ', $diff)
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
index a6cabf1f9678e..8ac13d407e433 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
@@ -57,7 +57,7 @@ public function processAssert(
 
         $pageCatalogRuleIndex->open();
         $errorMessage = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $pageCatalogRuleIndex->getCatalogRuleGrid()->isRowVisible($filter),
             'Catalog Price Rule with following data: \'' . $errorMessage . '\' '
             . 'is absent in Catalog Price Rule grid.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedCatalogPage.php
index b40d78f0dde08..2b87372f986eb 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedCatalogPage.php
@@ -33,7 +33,7 @@ public function processAssert(
             $categoryName = $product->getCategoryIds()[0];
             $cmsIndexPage->getTopmenu()->selectCategoryByName($categoryName);
             $priceBlock = $catalogCategoryViewPage->getListProductBlock()->getProductItem($product)->getPriceBlock();
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $priceBlock->isSpecialPriceVisible(),
                 "Catalog price rule is applied!\n"
             );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedProductPage.php
index f87f28df124e0..d1d792d1c432b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedProductPage.php
@@ -37,7 +37,7 @@ public function processAssert(
             $cmsIndexPage->getTopmenu()->selectCategoryByName($categoryName);
             $catalogCategoryViewPage->getListProductBlock()->getProductItem($product)->open();
             $productPriceBlock = $catalogProductViewPage->getViewBlock()->getPriceBlock();
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $productPriceBlock->isSpecialPriceVisible(),
                 "Catalog price rule is applied!\n"
             );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedShoppingCart.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedShoppingCart.php
index ddb824eb2fb2c..61fc3f9f527da 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotAppliedShoppingCart.php
@@ -34,7 +34,7 @@ public function processAssert(
         $checkoutCartPage->open();
         foreach ($products as $key => $product) {
             $actualPrice = $checkoutCartPage->getCartBlock()->getCartItem($product)->getSubtotalPrice();
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $productPrice[$key]['regular'],
                 $actualPrice,
                 'Wrong product price is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
index 6362eaedd921f..4969eb59ad65f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(
             'name' => $catalogPriceRule->getName(),
         ];
         $pageCatalogRuleIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $pageCatalogRuleIndex->getCatalogRuleGrid()->isRowVisible($filter),
             'Catalog Price Rule \'' . $filter['rule_id'] . '\', '
             . 'with name \'' . $filter['name'] . '\', '
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
index 61412349b1a32..28af4ca04622d 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
@@ -29,7 +29,7 @@ public function processAssert(
         CatalogRuleIndex $pageCatalogRuleIndex
     ) {
         $actualMessage = $pageCatalogRuleIndex->getMessagesBlock()->getNoticeMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOTICE_MESSAGE_RULES . self::NOTICE_MESSAGE_APPLY,
             $actualMessage,
             'Wrong notice message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleOnOnepageCheckout.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleOnOnepageCheckout.php
index 01f5485db6a4c..6fc791d9b0155 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleOnOnepageCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleOnOnepageCheckout.php
@@ -63,7 +63,7 @@ public function processAssert(
         $actualPrices['sub_total'] = $checkoutOnepage->getReviewBlock()->getSubtotal();
         $expectedPrices['grand_total'] = $cartPrice['grand_total'];
         $expectedPrices['sub_total'] = $cartPrice['sub_total'];
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedPrices,
             $actualPrices,
             'Wrong total cart prices are displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
index 7dd086179315c..0b857e9c839b1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertCatalogPriceRuleSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CatalogRuleIndex $pageCatalogRuleIndex)
     {
         $actualMessage = $pageCatalogRuleIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
index fbbd0401d8743..7540f04c4a74a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCatalogPriceRuleSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CatalogRuleIndex $pageCatalogRuleIndex)
     {
         $actualMessages = $pageCatalogRuleIndex->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::SUCCESS_MESSAGE,
             $actualMessages,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
index a14ea2f32cbde..6a904276ed67b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
@@ -36,7 +36,7 @@ public function processAssert(
 
         /** @var Conditions $conditionsSection */
         $conditionsSection = $catalogRuleNew->getEditForm()->getSection('conditions');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $conditionsSection->isAttributeInConditions($attribute),
             'Product attribute can\'t be used on promo rules conditions.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml
index 1823dd1e1bbe2..ba4ff8d42d951 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml
@@ -9,6 +9,6 @@
     <page name="CatalogRuleNew" area="Adminhtml" mca="catalog_rule/promo_catalog/new" module="Magento_CatalogRule">
         <block name="formPageActions" class="Magento\CatalogRule\Test\Block\Adminhtml\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
         <block name="editForm" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\PromoForm" locator="[id='page:main-container']" strategy="css selector"/>
-        <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal][style='z-index: 900;']" strategy="css selector"/>
+        <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal][style='z-index: 902;']" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml
index e8959da642eac..612f4e11f46b6 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml
@@ -72,6 +72,21 @@
             <field name="discount_amount" xsi:type="string">10</field>
         </dataset>
 
+        <dataset name="active_catalog_price_rule_with_category_conditions">
+            <field name="name" xsi:type="string">rule_name%isolation%</field>
+            <field name="description" xsi:type="string">Rule Description</field>
+            <field name="is_active" xsi:type="string">Active</field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="string">Main Website</item>
+            </field>
+            <field name="customer_group_ids" xsi:type="array">
+                <item name="1" xsi:type="string">General</item>
+            </field>
+            <field name="rule" xsi:type="string">[Category|is|2]</field>
+            <field name="simple_action" xsi:type="string">Adjust final price to this percentage</field>
+            <field name="discount_amount" xsi:type="string">50</field>
+        </dataset>
+
         <dataset name="catalog_price_rule_priority_0">
             <field name="name" xsi:type="string">catalog_price_rule_priority_0</field>
             <field name="description" xsi:type="string">-50% of price, Priority = 0</field>
@@ -135,5 +150,19 @@
             <field name="simple_action" xsi:type="string">Apply as percentage of original</field>
             <field name="discount_amount" xsi:type="string">50</field>
         </dataset>
+
+        <dataset name="apply_as_10_percentage">
+            <field name="name" xsi:type="string">CatalogPriceRule %isolation%</field>
+            <field name="description" xsi:type="string">Catalog Price Rule Description</field>
+            <field name="is_active" xsi:type="string">Active</field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="string">Main Website</item>
+            </field>
+            <field name="customer_group_ids" xsi:type="array">
+                <item name="0" xsi:type="string">NOT LOGGED IN</item>
+            </field>
+            <field name="simple_action" xsi:type="string">Apply as percentage of original</field>
+            <field name="discount_amount" xsi:type="string">10</field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
index 1fad2f282fa5d..719e9bb95694e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
@@ -106,6 +106,8 @@
             <data name="productPrice/0/special" xsi:type="string">5</data>
             <data name="productPrice/0/sub_total" xsi:type="string">5</data>
             <data name="productPrice/0/regular" xsi:type="string">10</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedCatalogPage" />
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedProductPage" />
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedShoppingCart" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
index aa2c42b994402..6609fe7af2b41 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRuleConfigurable/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
@@ -48,14 +48,14 @@ public function processAssert(
             $categoryName = $product->getCategoryIds()[0];
             $cmsIndexPage->getTopmenu()->selectCategoryByName($categoryName);
             $priceBlock = $catalogCategoryViewPage->getListProductBlock()->getProductItem($product)->getPriceBlock();
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $priceBlock->isVisible(),
                 'Price block is not displayed for product ' . $product->getName()
             );
             // Product price with applied rule displayed as usual price for Configurable products (MAGETWO-64882)
             $actualPrice['special'] = (float)$priceBlock->getPrice();
             $diff = $this->verifyData($actualPrice, $productPrice[$key]);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 empty($diff),
                 implode(' ', $diff)
             );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchAttributeIsAbsent.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchAttributeIsAbsent.php
index 6892e28aa7d08..f176f8e015d10 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchAttributeIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchAttributeIsAbsent.php
@@ -32,7 +32,7 @@ public function processAssert(CatalogProductAttribute $attribute, AdvancedSearch
         $label = $attribute->hasData('manage_frontend_label')
             ? $attribute->getManageFrontendLabel()
             : $attribute->getFrontendLabel();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             in_array($label, $formLabels),
             'Created custom product attribute is present in advanced search form on frontend but must be absent.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchEmptyTerm.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchEmptyTerm.php
index bb46f914aead6..608e157a1fb2d 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchEmptyTerm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchEmptyTerm.php
@@ -17,7 +17,7 @@ class AssertAdvancedSearchEmptyTerm extends AbstractConstraint
     /**
      * Specify search term error message.
      */
-    const ERROR_MESSAGE = 'Please specify at least one search term.';
+    const ERROR_MESSAGE = 'Enter a search term and try again.';
 
     /**
      * Assert that error message is displayed after searching without entering any search terms.
@@ -28,7 +28,7 @@ class AssertAdvancedSearchEmptyTerm extends AbstractConstraint
     public function processAssert(AdvancedSearch $advancedSearch)
     {
         $actualMessage = $advancedSearch->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchNoResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchNoResult.php
index 07c07a65f3002..8d5275ae33eb0 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchNoResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchNoResult.php
@@ -27,7 +27,7 @@ class AssertAdvancedSearchNoResult extends AbstractConstraint
      */
     public function processAssert(AdvancedResult $resultPage)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $resultPage->getSearchResultBlock()->isVisibleMessages(self::ERROR_MESSAGE),
             "The error message '" . self::ERROR_MESSAGE . "' is not visible."
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductByAttribute.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductByAttribute.php
index 04957d21a74f7..b5174189c9bed 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductByAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductByAttribute.php
@@ -57,7 +57,7 @@ public function processAssert(
             $isVisible = $catalogSearchResult->getListProductBlock()->getProductItem($product)->isVisible();
         } while (!$isVisible && $catalogSearchResult->getBottomToolbar()->nextPage());
 
-        \PHPUnit_Framework_Assert::assertTrue($isVisible, 'Product attribute is not searchable on Frontend.');
+        \PHPUnit\Framework\Assert::assertTrue($isVisible, 'Product attribute is not searchable on Frontend.');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductResult.php
index 81dec247d4801..e1496042870a9 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductResult.php
@@ -34,7 +34,7 @@ public function processAssert(
     ) {
         $expectedResult = $this->prepareExpectedResult($isVisibleInAdvancedSearch, $allProducts);
         $foundedProducts = $this->advancedSearchProducts($resultPage, $allProducts);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedResult,
             $foundedProducts,
             'Expected and founded products not the same.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
index 3123243c784a3..7f4a627abdc8f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
@@ -79,7 +79,7 @@ public function processAssert(
             }
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($errors),
             "The following errors occurred:\n" . implode("\n", $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAttributeSearchableByLabel.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAttributeSearchableByLabel.php
index 1c6ccf272383c..c1de20531c8d2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAttributeSearchableByLabel.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAttributeSearchableByLabel.php
@@ -41,7 +41,7 @@ public function processAssert(
             $isVisible = $catalogSearchResult->getListProductBlock()->getProductItem($product)->isVisible();
         } while (!$isVisible && $catalogSearchResult->getBottomToolbar()->nextPage());
 
-        \PHPUnit_Framework_Assert::assertTrue($isVisible, 'Product attribute is not searchable on Frontend.');
+        \PHPUnit\Framework\Assert::assertTrue($isVisible, 'Product attribute is not searchable on Frontend.');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResult.php
index 6030cf657d72b..8b12484521195 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResult.php
@@ -22,7 +22,7 @@ class AssertCatalogSearchNoResult extends AbstractConstraint
      */
     public function processAssert(CatalogsearchResult $catalogsearchResult)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogsearchResult->getListProductBlock()->isVisible(),
             'Search result has been found.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResultMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResultMessage.php
index 32627b020123c..9ad45021bcdd1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResultMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchNoResultMessage.php
@@ -27,7 +27,7 @@ class AssertCatalogSearchNoResultMessage extends AbstractConstraint
      */
     public function processAssert(CatalogsearchResult $catalogSearchResult)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogSearchResult->getSearchResultBlock()->isVisibleMessages(self::NOTICE_MESSAGE),
             'Wrong message is displayed or no message at all.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchQueryLength.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchQueryLength.php
index d6fcaef79ff17..533f16d7c343c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchQueryLength.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchQueryLength.php
@@ -22,7 +22,7 @@ class AssertCatalogSearchQueryLength extends AbstractConstraint
      */
     public function processAssert(CatalogsearchResult $catalogSearchResult)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             mb_strlen($catalogSearchResult->getSearchResultsTitleBlock()->getSearchQuery()),
             128,
             'Search query length is not truncated to 128 symbols.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
index a35ff1176cdfe..cc236e0e539ba 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
@@ -34,7 +34,7 @@ public function processAssert(CatalogSearchQuery $catalogSearch, AdvancedResult
             $isProductVisible = $resultPage->getListProductBlock()->getProductItem($product)->isVisible();
         } while (!$isProductVisible && $resultPage->getBottomToolbar()->nextPage());
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isProductVisible,
             "A product with name '" . $product->getName() . "' was not found."
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php
index 3ac4983382f89..eefe0708f0163 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php
@@ -46,7 +46,7 @@ public function processAssert(CatalogSearchQuery $catalogSearch, AdvancedResult
                 $idxInArray = array_search($productOnPage, $productsOrder, true);
                 if (false !== $idxInArray) {
                     if (0 !== $idxInArray) {
-                        \PHPUnit_Framework_Assert::assertEmpty(
+                        \PHPUnit\Framework\Assert::assertEmpty(
                             $productsOrder,
                             'Products are in incorrect order on the search result page'
                         );
@@ -56,7 +56,7 @@ public function processAssert(CatalogSearchQuery $catalogSearch, AdvancedResult
             }
         } while (count($productsOrder) && $resultPage->getBottomToolbar()->nextPage());
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $productsOrder,
             'Products are in incorrect order on the search result page'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertConfigurableWithDisabledOptionCatalogSearchNoResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertConfigurableWithDisabledOptionCatalogSearchNoResult.php
new file mode 100644
index 0000000000000..d7f7cc40c34fa
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertConfigurableWithDisabledOptionCatalogSearchNoResult.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
+use Magento\CatalogSearch\Test\Page\AdvancedResult;
+use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+
+/**
+ * Assert search has no results after disabling configurable children.
+ */
+class AssertConfigurableWithDisabledOptionCatalogSearchNoResult extends AbstractConstraint
+{
+    /**
+     * Assert search has no results and product list in absent after disabling configurable children.
+     *
+     * @param CatalogSearchQuery $catalogSearch
+     * @param CatalogsearchResult $catalogsearchResult
+     * @param FixtureFactory $fixtureFactory
+     * @param CmsIndex $cmsIndex
+     * @param CatalogProductIndex $productGrid
+     * @param CatalogProductEdit $editProductPage
+     * @param string|null $queryLength
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function processAssert(
+        CatalogSearchQuery $catalogSearch,
+        AdvancedResult $resultPage,
+        FixtureFactory $fixtureFactory,
+        CmsIndex $cmsIndex,
+        CatalogProductIndex $productGrid,
+        CatalogProductEdit $editProductPage,
+        $queryLength = null
+    ) {
+        /** @var ConfigurableProduct $product */
+        $product = $catalogSearch->getDataFieldConfig('query_text')['source']->getFirstProduct();
+
+        $matrix = isset($product->getConfigurableAttributesData()['matrix']) ?
+            $product->getConfigurableAttributesData()['matrix'] :
+            [];
+
+        foreach ($matrix as $option) {
+            $product = $fixtureFactory->createByCode('catalogProductSimple', ['data' => ['status' => 'No']]);
+            $filter = ['sku' => $option['sku']];
+            $productGrid->open();
+            $productGrid->getProductGrid()->searchAndOpen($filter);
+            $editProductPage->getProductForm()->fill($product);
+            $editProductPage->getFormPageActions()->save();
+        }
+
+        $cmsIndex->open();
+        $cmsIndex->getSearchBlock()->search($catalogSearch->getQueryText(), $queryLength);
+
+        do {
+            $isProductVisible = $resultPage->getListProductBlock()->getProductItem($product)->isVisible();
+        } while (!$isProductVisible && $resultPage->getBottomToolbar()->nextPage());
+
+        \PHPUnit\Framework\Assert::assertFalse(
+            $isProductVisible,
+            "A product with name '" . $product->getName() . "' was found."
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Search result has not been found.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertConfigurableWithDisabledOtpionCatalogSearchNoResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertConfigurableWithDisabledOtpionCatalogSearchNoResult.php
deleted file mode 100644
index 6bb947941909e..0000000000000
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertConfigurableWithDisabledOtpionCatalogSearchNoResult.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CatalogSearch\Test\Constraint;
-
-use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
-use Magento\CatalogSearch\Test\Page\AdvancedResult;
-use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
-use Magento\Cms\Test\Page\CmsIndex;
-use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Magento\Mtf\Constraint\AbstractConstraint;
-use Magento\Mtf\Fixture\FixtureFactory;
-
-/**
- * Assert search has no results after disabling configurable children.
- */
-class AssertConfigurableWithDisabledOtpionCatalogSearchNoResult extends AbstractConstraint
-{
-    /**
-     * Assert search has no results and product list in absent after disabling configurable children.
-     *
-     * @param CatalogSearchQuery $catalogSearch
-     * @param CatalogsearchResult $catalogsearchResult
-     * @param FixtureFactory $fixtureFactory
-     * @param CmsIndex $cmsIndex
-     * @param CatalogProductIndex $productGrid
-     * @param CatalogProductEdit $editProductPage
-     * @param string|null $queryLength
-     * @return void
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     */
-    public function processAssert(
-        CatalogSearchQuery $catalogSearch,
-        AdvancedResult $resultPage,
-        FixtureFactory $fixtureFactory,
-        CmsIndex $cmsIndex,
-        CatalogProductIndex $productGrid,
-        CatalogProductEdit $editProductPage,
-        $queryLength = null
-    ) {
-        /** @var ConfigurableProduct $product */
-        $product = $catalogSearch->getDataFieldConfig('query_text')['source']->getFirstProduct();
-
-        $matrix = isset($product->getConfigurableAttributesData()['matrix']) ?
-            $product->getConfigurableAttributesData()['matrix'] :
-            [];
-
-        foreach ($matrix as $option) {
-            $product = $fixtureFactory->createByCode('catalogProductSimple', ['data' => ['status' => 'No']]);
-            $filter = ['sku' => $option['sku']];
-            $productGrid->open();
-            $productGrid->getProductGrid()->searchAndOpen($filter);
-            $editProductPage->getProductForm()->fill($product);
-            $editProductPage->getFormPageActions()->save();
-        }
-
-        $cmsIndex->open();
-        $cmsIndex->getSearchBlock()->search($catalogSearch->getQueryText(), $queryLength);
-
-        do {
-            $isProductVisible = $resultPage->getListProductBlock()->getProductItem($product)->isVisible();
-        } while (!$isProductVisible && $resultPage->getBottomToolbar()->nextPage());
-
-        \PHPUnit_Framework_Assert::assertFalse(
-            $isProductVisible,
-            "A product with name '" . $product->getName() . "' was found."
-        );
-    }
-
-    /**
-     * Returns a string representation of the object.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Search result has not been found.';
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductAddedToCartFromSearchResults.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductAddedToCartFromSearchResults.php
index 75b435e9b2681..a5cbf201ccdf5 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductAddedToCartFromSearchResults.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductAddedToCartFromSearchResults.php
@@ -42,7 +42,7 @@ public function processAssert(
 
         $productName = $product->getName();
 
-        \PHPUnit_Framework_Assert::assertTrue($isProductVisible, "A product with name $productName was not found.");
+        \PHPUnit\Framework\Assert::assertTrue($isProductVisible, "A product with name $productName was not found.");
         $resultPage->getListProductBlock()->getProductItem($product)->clickAddToCart();
         $catalogProductView->getViewBlock()->waitLoader();
         if (isset($product->getCheckoutData()['options'])) {
@@ -52,7 +52,7 @@ public function processAssert(
             $message = $resultPage->getMessagesBlock()->getSuccessMessage();
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_MESSAGE, $productName),
             $message
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
index be0e0030698e4..4eaf9f9c86536 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
@@ -36,10 +36,10 @@ public function processAssert(
         } while (!$isProductVisible && $resultPage->getBottomToolbar()->nextPage());
 
         $productName = $product->getName();
-        \PHPUnit_Framework_Assert::assertTrue($isProductVisible, "A product with name $productName was not found.");
+        \PHPUnit\Framework\Assert::assertTrue($isProductVisible, "A product with name $productName was not found.");
 
         $resultPage->getListProductBlock()->getProductItem($product)->open();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $productName,
             $catalogProductViewPage->getViewBlock()->getProductName(),
             'Wrong product page has been opened.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchAttributeTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchAttributeTest.php
index 8a6eedf1c64f2..b2a49a5543015 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchAttributeTest.php
@@ -28,12 +28,12 @@ public function processAssert(
         $advancedSearch->open();
         $availableAttributes = $advancedSearch->getForm()->getFormLabels();
         if (isset($attributeForSearch['isVisible'])) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 (false !== array_search($attributeForSearch['name'], $availableAttributes)),
                 'Attribute ' . $attributeForSearch['name'] . 'was not found in Advanced Search Page.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 (false == array_search($attributeForSearch['name'], $availableAttributes)),
                 'Attribute ' . $attributeForSearch['name'] . ' was found in Advanced Search Page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
index 6fa19b9474ae6..71646664d1e97 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
@@ -44,7 +44,7 @@ public function processAssert(
         $formData = $editPage->getForm()->getData($searchTerm);
         $fixtureData = $searchTerm->getData();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $formData,
             $fixtureData,
             'This form "Search Term" does not match the fixture data.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
index 5d2ccfdf7548e..428f9cc1a0705 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
@@ -44,7 +44,7 @@ public function processAssert(CatalogSearchIndex $indexPage, CatalogSearchQuery
         $filters = array_filter($filters);
         $grid->search($filters);
         unset($filters['store_id']);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $grid->isRowVisible($filters, false),
             'Row terms according to the filters is not found.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
index ead64318ac430..646a0b1472a5c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
@@ -38,7 +38,7 @@ public function processAssert(CatalogSearchIndex $indexPage, CatalogSearchQuery
 
         $grid->search($filters);
         unset($filters['store_id']);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $grid->isRowVisible($filters, false),
             'Search term "' . $queryText . '" was found in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
index a1e5b02e070e6..60fedfb160285 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
@@ -29,7 +29,7 @@ public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, Cat
     {
         $queryText = $searchTerm->getQueryText();
         $cmsIndex->open()->getSearchBlock()->search($queryText);
-        \PHPUnit_Framework_Assert::assertNotEquals(
+        \PHPUnit\Framework\Assert::assertNotEquals(
             $browser->getUrl(),
             $searchTerm->getRedirect(),
             'Url in the browser corresponds to Url in fixture (redirect has been performed).'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
index aa6295c44d3eb..e3c5a408a3873 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
@@ -53,7 +53,7 @@ public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $searchTerm
             $errors[] = '- url window (' . $windowUrl . ') does not match the url redirect(' . $redirectUrl . ')';
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             'When checking on the frontend "Search terms" arose following errors:' . PHP_EOL . implode(PHP_EOL, $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
index 15e7dac8205d9..c7d7c8bb6ddd4 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
@@ -33,7 +33,7 @@ class AssertSearchTermSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CatalogSearchIndex $indexPage)
     {
         $actualMessage = $indexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
index b2b2f284a7528..e4d7ad20af6d1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
@@ -30,7 +30,7 @@ public function processAssert(array $searchTerms, CatalogSearchIndex $indexPage)
     {
         $actualMessage = $indexPage->getMessagesBlock()->getSuccessMessage();
         $expectedMessage = sprintf(self::SUCCESS_MESSAGE, count($searchTerms));
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
index 4c657018c6932..239fda4dceebe 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
@@ -29,7 +29,7 @@ class AssertSearchTermSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CatalogSearchIndex $indexPage)
     {
         $actualMessage = $indexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
index a9beabd797f96..5a0d5411670b7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
@@ -45,7 +45,7 @@ public function processAssert(
             $isVisible = $searchBlock->isSuggestSearchVisible($queryText);
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isVisible,
             'Block "Suggest Search" when searching was not found'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
index 400289eccda15..e2193b799c3be 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
@@ -70,7 +70,7 @@ private function createProducts(FixtureFactory $fixtureFactory, $productsData)
 
                 $products[] = $product;
             } elseif ($this->data === null) {
-                $this->data = strval($productData);
+                $this->data = (string)$productData;
             }
         }
 
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml
index 386ac28f6c472..4744fa7756c4e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml
@@ -117,7 +117,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchNoResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation15" summary="Do Advanced Search without entering data" ticketId="MAGETWO-14859">
-            <data name="issue" xsi:type="string">MAGETWO-18537: "Please specify at least one search term." error message is missed in Advanced Search</data>
+            <data name="issue" xsi:type="string">MAGETWO-18537: "Enter a search term and try again." error message is missed in Advanced Search</data>
             <data name="productSearch/data/name" xsi:type="string" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchEmptyTerm" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
index d99ee5e234e4d..9a6a66091d427 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
@@ -102,7 +102,7 @@
         <variation name="SearchEntityResultsTestVariation18" summary="Search Configurable Product with Enabled and Disabled Children." ticketId="MAGETWO-69181">
             <data name="catalogSearch/data/query_text/value" xsi:type="string">configurableProduct::one_simple_product_not_visible_individually::name</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResult" />
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertConfigurableWithDisabledOtpionCatalogSearchNoResult" />
+            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertConfigurableWithDisabledOptionCatalogSearchNoResult" />
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertCategoryUrlDuplicateErrorMessage.php b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertCategoryUrlDuplicateErrorMessage.php
index a3153521a6024..30cb3cc9baf57 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertCategoryUrlDuplicateErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertCategoryUrlDuplicateErrorMessage.php
@@ -32,7 +32,7 @@ public function processAssert(
         Category $category
     ) {
         $actualMessage = $productPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::ERROR_MESSAGE_TITLE,
             $actualMessage,
             'Wrong error message is displayed.'
@@ -40,7 +40,7 @@ public function processAssert(
             . "\nActual:\n" . $actualMessage
         );
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $category->getUrlKey(),
             $actualMessage,
             'Category url is not present on error message.'
diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertProductUrlDuplicateErrorMessage.php b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertProductUrlDuplicateErrorMessage.php
index 2e48630471541..0741a226ceaa4 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertProductUrlDuplicateErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/Constraint/AssertProductUrlDuplicateErrorMessage.php
@@ -35,7 +35,7 @@ public function processAssert(
         Category $category
     ) {
         $actualMessage = $productPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::ERROR_MESSAGE_TITLE,
             $actualMessage,
             'Wrong error message is displayed.'
@@ -43,7 +43,7 @@ public function processAssert(
             . "\nActual:\n" . $actualMessage
         );
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $product->getUrlKey(),
             $actualMessage,
             'Product url is not present on error message.'
@@ -51,7 +51,7 @@ public function processAssert(
             . "\nActual:\n" . $actualMessage
         );
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $category->getUrlKey() . '/' . $product->getUrlKey(),
             $actualMessage,
             'Category url is not present on error message.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index b0e996355642a..bbe6fe293ab50 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -106,6 +106,13 @@ class Cart extends Block
      */
     protected $cartItemClass = \Magento\Checkout\Test\Block\Cart\CartItem::class;
 
+    /**
+     * Locator for page with ajax loading state.
+     *
+     * @var string
+     */
+    private $ajaxLoading = 'body.ajax-loading';
+
     /**
      * Wait for PayPal page is loaded.
      *
@@ -273,4 +280,14 @@ public function waitForCheckoutButton()
     {
         $this->waitForElementVisible($this->inContextPaypalCheckoutButton);
     }
+
+    /**
+     * Wait loading.
+     *
+     * @return void
+     */
+    public function waitForLoader()
+    {
+        $this->waitForElementNotVisible($this->ajaxLoading);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
index 10299486a08ce..3d293700db8c9 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -72,6 +72,13 @@ class Shipping extends Form
      */
     protected $commonShippingPriceSelector = '.totals.shipping .price';
 
+    /**
+     * Estimate shipping and tax form locator.
+     *
+     * @var string
+     */
+    private $estimateShippingForm = '#shipping-zip-form';
+
     /**
      * Open estimate shipping and tax form.
      *
@@ -250,4 +257,51 @@ public function waitForCommonShippingPriceBlock()
     {
         $this->waitForElementVisible($this->commonShippingPriceSelector, Locator::SELECTOR_CSS);
     }
+
+    /**
+     * Wait until estimation form to appear.
+     *
+     * @return void
+     */
+    public function waitForEstimateShippingAndTaxForm()
+    {
+        $browser = $this->browser;
+        $selector = $this->estimateShippingForm;
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isPresent() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for shipping method form.
+     *
+     * @return void
+     */
+    public function waitForShippingMethodForm()
+    {
+        $browser = $this->browser;
+        $selector = $this->shippingMethodForm;
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isPresent() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for summary block to be loaded.
+     *
+     * @return void
+     */
+    public function waitForSummaryBlock()
+    {
+        $this->waitForEstimateShippingAndTaxForm();
+        $this->waitForShippingMethodForm();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
index fda29a2fe78fc..f632cdc3d7464 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -264,4 +264,15 @@ public function waitForShippingPriceBlock()
     {
         $this->waitForElementVisible($this->shippingPriceBlockSelector, Locator::SELECTOR_CSS);
     }
+
+    /**
+     * Wait for "Grand Total" row to appear.
+     *
+     * @return void
+     */
+    public function waitForGrandTotal()
+    {
+        $this->waitForUpdatedTotals();
+        $this->waitForElementVisible($this->grandTotal);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php
index 0952ebf46d711..c1bab0ae68897 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Registration.php
@@ -19,7 +19,7 @@ class Registration extends Block
      *
      * @var string
      */
-    protected $createAccountButton = '[data-bind*="createAccount"] input';
+    protected $createAccountButton = 'input[data-bind*="Create an Account"]';
 
     /**
      * Click 'Create an Account' button and wait until button will be not visible.
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
index 3a66629116de9..f5024d3eb7b26 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
@@ -91,7 +91,7 @@ public function selectShippingMethod(array $method)
      * @param array $method
      * @return bool
      */
-    public function isShippingMethodAvaiable(array $method)
+    public function isShippingMethodAvailable(array $method)
     {
         $this->waitForShippingRates();
         $selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnCategoryPage.php
index 37e0427771b18..11b1a9ed19df0 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnCategoryPage.php
@@ -41,9 +41,9 @@ public function processAssert(
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
-        \PHPUnit_Framework_Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
+        \PHPUnit\Framework\Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisibleAddToCardButton(),
             'Button "Add to Cart" is present on category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnProductPage.php
index f326dd68d6cbc..455b91aa25456 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonAbsentOnProductPage.php
@@ -30,7 +30,7 @@ public function processAssert(
         CatalogProductView $catalogProductView
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogProductView->getViewBlock()->isVisibleAddToCardButton(),
             'Button "Add to Cart" is present on product page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnCategoryPage.php
index df099bb5df67c..161083ba21b00 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnCategoryPage.php
@@ -40,9 +40,9 @@ public function processAssert(
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {
             $isProductVisible = $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisible();
         }
-        \PHPUnit_Framework_Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
+        \PHPUnit\Framework\Assert::assertTrue($isProductVisible, 'Product is absent on category page.');
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogCategoryView->getListProductBlock()->getProductItem($product)->isVisibleAddToCardButton(),
             'Button "Add to Cart" is absent on category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnProductPage.php
index 6997aab411b57..007349cf086f3 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddToCartButtonPresentOnProductPage.php
@@ -30,7 +30,7 @@ public function processAssert(
         CatalogProductView $catalogProductView
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->isVisibleAddToCardButton(),
             'Button "Add to Cart" is absent on product page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
index 3f9201ac4656e..b12339b3fc66d 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
@@ -30,7 +30,7 @@ class AssertAddedProductToCartSuccessMessage extends AbstractConstraint
      */
     public function processAssert(CheckoutCart $checkoutCart, FixtureInterface $product)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_MESSAGE, $product->getName()),
             $checkoutCart->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php
index f16403107bff9..bfc664b963f68 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php
@@ -22,7 +22,7 @@ class AssertBillingAddressAbsentInPayment extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutOnepage->getPaymentBlock()
                 ->getSelectedPaymentMethodBlock()
                 ->getBillingBlock()
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressSameAsShippingCheckbox.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressSameAsShippingCheckbox.php
index 3e889c058ee84..c40e8f533d034 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressSameAsShippingCheckbox.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressSameAsShippingCheckbox.php
@@ -29,7 +29,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $billingCheckbox
             ->getBillingBlock()
             ->getSameAsShippingCheckboxValue();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $billingCheckboxState,
             $actualResult,
             '"Same as Shipping" checkbox has wrong value'
@@ -37,7 +37,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $billingCheckbox
     }
 
     /**
-     * Returns a string representation of successfull assertion.
+     * Returns a string representation of successful assertion.
      *
      * @return string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCancelSuccessMessageInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCancelSuccessMessageInShoppingCart.php
index ea51f2b9e5f3e..1333a07b3e1fc 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCancelSuccessMessageInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCancelSuccessMessageInShoppingCart.php
@@ -28,7 +28,7 @@ class AssertCancelSuccessMessageInShoppingCart extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart)
     {
         $actualMessage = $checkoutCart->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Success message is not present or has wrong text.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartBundleOptionTitle.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartBundleOptionTitle.php
index 39670d8fc487b..960b5fa492918 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartBundleOptionTitle.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartBundleOptionTitle.php
@@ -26,7 +26,7 @@ class AssertCartBundleOptionTitle extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart, $optionTitle)
     {
         $checkoutCart->open();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $checkoutCart->getCartItemBlock()->getOptionsName(),
             $optionTitle
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
index 8b40f740fbd54..cf05079b0a079 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Checkout\Test\Constraint;
 
-use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -30,22 +30,26 @@ class AssertCartIsEmpty extends AbstractConstraint
      * @param BrowserInterface $browser
      * @return void
      */
-    public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $browser)
-    {
+    public function processAssert(
+        CheckoutCart $checkoutCart,
+        BrowserInterface $browser
+    ): void {
         $checkoutCart->open();
         $cartEmptyBlock = $checkoutCart->getCartEmptyBlock();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::TEXT_EMPTY_CART,
             $cartEmptyBlock->getText(),
             'Wrong text on empty cart page.'
         );
 
         $cartEmptyBlock->clickLinkToMainPage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        $this->assertUrlEqual(
             $_ENV['app_frontend_url'],
             $browser->getUrl(),
-            'Wrong link to main page on empty cart page.'
+            true,
+            'Wrong link to main page on empty cart page: expected - ' . $_ENV['app_frontend_url']
+            . ', actual - ' . $browser->getUrl()
         );
     }
 
@@ -58,4 +62,31 @@ public function toString()
     {
         return 'Shopping Cart is empty.';
     }
+
+    /**
+     * Asserts that two urls are equal
+     *
+     * @param string $expectedUrl
+     * @param string $actualUrl
+     * @param bool $ignoreScheme
+     * @param string $message
+     * @return void
+     */
+    private function assertUrlEqual(
+        string $expectedUrl,
+        string $actualUrl,
+        bool $ignoreScheme = false,
+        string $message = ''
+    ): void {
+        $urlArray1 = parse_url($expectedUrl);
+        $urlArray2 = parse_url($actualUrl);
+        if ($ignoreScheme) {
+            unset($urlArray1['scheme']);
+            unset($urlArray2['scheme']);
+        }
+        \PHPUnit\Framework\Assert::assertTrue(
+            $urlArray1 === $urlArray2,
+            $message
+        );
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
index 9f680eb5fc0ea..b0ed9d358f93a 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -21,6 +22,8 @@
  */
 class AssertCartItemsOptions extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Error message for verify options
      *
@@ -44,6 +47,8 @@ class AssertCartItemsOptions extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         /** @var Items $sourceProducts */
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
@@ -68,7 +73,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
         }
 
         $error = $this->verifyContainsData($productsData, $cartData, true);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartPerCustomer.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartPerCustomer.php
index 2442bd8fe1f5f..b5324870872ca 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartPerCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartPerCustomer.php
@@ -52,8 +52,11 @@ public function processAssert(
                     \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
                     ['customer' => $customer]
                 )->run();
-                \PHPUnit_Framework_Assert::assertEquals(
-                    sprintf(self::WELCOME_MESSAGE, $customer->getFirstname()),
+                \PHPUnit\Framework\Assert::assertEquals(
+                    sprintf(
+                        self::WELCOME_MESSAGE,
+                        $customer->getFirstname() . ' ' . $customer->getLastname()
+                    ),
                     $cmsIndex->getLinksBlock()->getWelcomeText(),
                     'Customer welcome message is wrong.'
                 );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php
index 9918df30f30aa..2631845c4976c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php
@@ -23,7 +23,7 @@ class AssertCheckoutErrorMessage extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage, $expectedErrorMessage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedErrorMessage,
             $checkoutOnepage->getMessagesBlock()->getErrorMessage(),
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php
index 14ed62de7e2df..7f717964059eb 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCustomerIsRedirectedToCheckoutFromCart.php
@@ -64,7 +64,7 @@ public function processAssert(
         $miniShoppingCart->openMiniCart();
         $miniShoppingCart->clickProceedToCheckoutButton();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             !$checkoutOnepage->getMessagesBlock()->isVisible()
             && $checkoutOnepage->getShippingMethodBlock()->isVisible(),
             'Checkout first step is not available.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertDiscountInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertDiscountInShoppingCart.php
index d93b8acee880b..4ded49525b99c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertDiscountInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertDiscountInShoppingCart.php
@@ -28,7 +28,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
         $checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($cart->getDiscount(), 2),
             $checkoutCart->getTotalsBlock()->getDiscount(),
             'Discount amount in the shopping cart not equals to discount amount from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailErrorValidationMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailErrorValidationMessage.php
index f645977b04748..b5d2b9a98c013 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailErrorValidationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailErrorValidationMessage.php
@@ -28,7 +28,7 @@ class AssertEmailErrorValidationMessage extends AbstractConstraint
     public function processAssert(
         CheckoutOnepage $checkoutOnepage
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::EMAIL_VALIDATION_MESSAGE,
             $checkoutOnepage->getShippingBlock()->getEmailError(),
             'Email validation message is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailToolTips.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailToolTips.php
index 73d5e1c1c088c..583a3456c5119 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailToolTips.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEmailToolTips.php
@@ -33,13 +33,13 @@ class AssertEmailToolTips extends AbstractConstraint
     public function processAssert(
         CheckoutOnepage $checkoutOnepage
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::EMAIL_TOOLTIP,
             $checkoutOnepage->getShippingBlock()->getEmailTooltip(),
             'Email tooltip is not correct.'
         );
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::EMAIL_INSTRUCTIONS,
             $checkoutOnepage->getShippingBlock()->getEmailInstructions(),
             'Email instructions are not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
index 8806f25c3fddd..432bbd4f2146e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Checkout\Test\Constraint;
 
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -16,6 +17,8 @@
  */
 class AssertGrandTotalInShoppingCart extends AbstractConstraint
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that grand total is equal to expected
      *
@@ -28,12 +31,13 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
     {
         if ($requireReload) {
             $checkoutCart->open();
+            $this->waitForCartPageLoaded($checkoutCart);
             $checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
         }
 
         $fixtureGrandTotal = number_format($cart->getGrandTotal(), 2);
         $pageGrandTotal = $checkoutCart->getTotalsBlock()->getGrandTotal();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $fixtureGrandTotal,
             $pageGrandTotal,
             'Grand total price in the shopping cart not equals to grand total price from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalOrderReview.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalOrderReview.php
index 35032515a223f..1cd12809bdc8a 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalOrderReview.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalOrderReview.php
@@ -33,7 +33,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $grandTotal)
         $checkoutOnepage->getReviewBlock()->waitForElementNotVisible($this->waitElement);
         $checkoutReviewGrandTotal = $checkoutOnepage->getReviewBlock()->getGrandTotal();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($grandTotal, 2),
             $checkoutReviewGrandTotal,
             "Grand Total price: $checkoutReviewGrandTotal not equals with price from data set: $grandTotal"
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertItemsCounterInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertItemsCounterInMiniShoppingCart.php
index cfe83221af310..2b9815c6f90d3 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertItemsCounterInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertItemsCounterInMiniShoppingCart.php
@@ -26,7 +26,7 @@ public function processAssert(CmsIndex $cmsIndex, $totalItemsCountInShoppingCart
         $sidebar = $cmsIndex->getCartSidebarBlock();
         $sidebar->openMiniCart();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $sidebar->getItemsQty(),
             $totalItemsCountInShoppingCart,
             'Wrong quantity of Cart items in mini shopping cart'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartNotPresentInSummaryBlock.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartNotPresentInSummaryBlock.php
index 57f4672d7f37c..f12dfceccdeaa 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartNotPresentInSummaryBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartNotPresentInSummaryBlock.php
@@ -21,7 +21,7 @@ public function processAssert(CheckoutOnepage $checkoutPage)
     {
         $reviewBlock = $checkoutPage->getReviewBlock();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $reviewBlock->getGoToCartLink()->isVisible(),
             'Go to Cart link present in summary block'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartPresentInSummaryBlock.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartPresentInSummaryBlock.php
index b798574e3d3d6..82f097f60dda3 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartPresentInSummaryBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertLinkGoToCartPresentInSummaryBlock.php
@@ -21,7 +21,7 @@ public function processAssert(CheckoutOnepage $checkoutPage)
     {
         $reviewBlock = $checkoutPage->getReviewBlock();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $reviewBlock->getGoToCartLink()->isVisible(),
             'Go to Cart link not present in summary block'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartEmpty.php
index fab678fb7ffea..bb1f68c2d1278 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartEmpty.php
@@ -27,13 +27,14 @@ class AssertMinicartEmpty extends AbstractConstraint
     public function processAssert(
         CmsIndex $cmsIndex
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        $cmsIndex->open();
+        \PHPUnit\Framework\Assert::assertEquals(
             self::TEXT_EMPTY_MINICART,
             $cmsIndex->getCartSidebarBlock()->getEmptyMessage(),
             'Empty minicart message not found'
         );
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsIndex->getCartSidebarBlock()->isItemsQtyVisible(),
             'Minicart is not empty'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartItemsQty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartItemsQty.php
index f7317b04fc0ad..012c1d4eeba07 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartItemsQty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMinicartItemsQty.php
@@ -26,7 +26,7 @@ public function processAssert(
         $expectedItemsQty
     ) {
         $cmsIndex->open();
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             (int)$expectedItemsQty,
             $cmsIndex->getCartSidebarBlock()->getItemsQty(),
             'The quantity of items in shopping cart is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMyCartLinkRedirect.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMyCartLinkRedirect.php
index 5d40b56421b07..b1db3c849f5ca 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMyCartLinkRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertMyCartLinkRedirect.php
@@ -29,7 +29,7 @@ public function processAssert(CmsIndex $cmsIndex)
     {
         $cmsIndex->open();
         $cmsIndex->getCartSidebarBlock()->openMiniCart();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::CART_PAGE_TITLE,
             $cmsIndex->getTitleBlock()->getTitle(),
             'Wrong page is displayed instead of the shopping cart page.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
index 0be1ce090b014..e5d4b300c2802 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
@@ -28,7 +28,7 @@ class AssertOrderSuccessPlacedMessage extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepageSuccess $checkoutOnepageSuccess)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $checkoutOnepageSuccess->getTitleBlock()->getTitle(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersNotPresentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersNotPresentInShoppingCart.php
index 53a11e65ac637..12ef4c6860270 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersNotPresentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersNotPresentInShoppingCart.php
@@ -23,11 +23,11 @@ class AssertPagersNotPresentInShoppingCart extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart)
     {
         $checkoutCart->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutCart->getTopPagerBlock()->getPagesBlock()->isVisible(),
             'The top pager of Items Grid is visible.'
         );
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutCart->getBottomPagerBlock()->getPagesBlock()->isVisible(),
             'The bottom pager of Items Grid is visible.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersPresentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersPresentInShoppingCart.php
index 77f0db05414f9..6593263013f89 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersPresentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersPresentInShoppingCart.php
@@ -22,11 +22,11 @@ class AssertPagersPresentInShoppingCart extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart)
     {
         $checkoutCart->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $checkoutCart->getTopPagerBlock()->getPagesBlock()->isVisible(),
             'The top pager of Items Grid is not visible.'
         );
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $checkoutCart->getBottomPagerBlock()->getPagesBlock()->isVisible(),
             'The bottom pager of Items Grid is not visible.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersSummaryText.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersSummaryText.php
index ff11ef105a39f..fa5b3af52bc76 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersSummaryText.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersSummaryText.php
@@ -32,12 +32,12 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, ConfigData
         $pagerSize = $configSection['checkout/cart/number_items_to_display_pager']['value'];
         $totalItems = count($cart->getItems());
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::PAGER_SUMMARY_TEXT, $pagerSize, $totalItems),
             $checkoutCart->getTopPagerBlock()->getAmountToolbar()->getText(),
             'Top Pager summary text isn\'t satisfy test data'
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::PAGER_SUMMARY_TEXT, $pagerSize, $totalItems),
             $checkoutCart->getBottomPagerBlock()->getAmountToolbar()->getText(),
             'Bottom Pager summary text isn\'t satisfy test data'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodIsAbsentOnPaymentPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodIsAbsentOnPaymentPage.php
index c4199c27d678c..e625190a6cb13 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodIsAbsentOnPaymentPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodIsAbsentOnPaymentPage.php
@@ -23,7 +23,7 @@ class AssertPaymentMethodIsAbsentOnPaymentPage extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage, array $payment)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutOnepage->getPaymentBlock()->isVisiblePaymentMethod($payment),
             'Payment method' . $payment['method']. ' is present on Checkout Payment Page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodPersistence.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodPersistence.php
index 99397e44e9657..51f9ec7ba51d4 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodPersistence.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPaymentMethodPersistence.php
@@ -23,7 +23,7 @@ class AssertPaymentMethodPersistence extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage, array $payment)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutOnepage->getPaymentBlock()->isVisiblePaymentMethod($payment),
             'Payment method' . $payment['method']. ' is present on Checkout Payment Page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
index 799fced1210dd..88d4a3e8d35ba 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -19,6 +20,8 @@
  */
 class AssertPriceInShoppingCart extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that price in the shopping cart equals to expected price from data set
      *
@@ -29,6 +32,8 @@ class AssertPriceInShoppingCart extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         /** @var Items $sourceProducts */
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
@@ -53,7 +58,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
         }
 
         $error = $this->verifyData($productsData, $cartData, true);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProceedToCheckoutButton.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProceedToCheckoutButton.php
index e3d056b3b5a83..b2a1a94dac448 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProceedToCheckoutButton.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProceedToCheckoutButton.php
@@ -31,7 +31,7 @@ class AssertProceedToCheckoutButton extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart)
     {
         $checkoutCart->open();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::BUTTON_TITLE,
             $checkoutCart->getProceedToCheckoutBlock()->getTitle()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
index 1e30c9c037527..9afc9d3f0d714 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
@@ -27,7 +27,7 @@ public function processAssert(CmsIndex $cmsIndex, FixtureInterface $deletedProdu
     {
         $cmsIndex->open();
         $cmsIndex->getCartSidebarBlock()->openMiniCart();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsIndex->getCartSidebarBlock()->getCartItem($deletedProduct)->isVisible(),
             'Product ' . $deletedProduct->getName() . ' is presents in Mini Shopping Cart.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php
index dd11166a99ab0..530e945b7bc87 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductDataInMiniShoppingCart.php
@@ -56,7 +56,7 @@ public function processAssert(CmsIndex $cmsIndex, Cart $cart)
         }
 
         $error = $this->verifyData($productsData, $miniCartData, true);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
index c1bd5f8f2c1c1..224f5ea91acd1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
@@ -25,7 +25,7 @@ class AssertProductIsNotEditable extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart, array $products)
     {
         foreach ($products as $product) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $checkoutCart->getCartBlock()->getCartItem($product)->isEditButtonVisible(),
                 'Added product is editable.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
index f923b53e0f6c4..80499a3e20627 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
@@ -27,7 +27,7 @@ public function processAssert(CmsIndex $cmsIndex, array $products)
         $cmsIndex->open();
         foreach ($products as $product) {
             $cmsIndex->getCartSidebarBlock()->openMiniCart();
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $cmsIndex->getCartSidebarBlock()->getCartItem($product)->isVisible(),
                 'Product ' . $product->getName() . ' is absent in Mini Shopping Cart.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
index ca1dbbf450222..241c334f710ab 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
@@ -26,7 +26,7 @@ public function processAssert(CheckoutCart $checkoutCart, array $products)
     {
         $checkoutCart->open();
         foreach ($products as $product) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $checkoutCart->getCartBlock()->getCartItem($product)->isVisible(),
                 'Product ' . $product->getName() . ' is absent in shopping cart.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
index f128905e74a0a..b80b4c85227c0 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -19,6 +20,8 @@
  */
 class AssertProductQtyInShoppingCart extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that quantity in the shopping cart is equals to expected quantity from data set
      *
@@ -29,6 +32,8 @@ class AssertProductQtyInShoppingCart extends AbstractAssertForm
     public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
     {
         $checkoutCart->open();
+        $this->waitForCartPageLoaded($checkoutCart);
+
         /** @var Items $sourceProducts */
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
         $products = $sourceProducts->getProducts();
@@ -53,7 +58,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart)
         }
 
         $error = $this->verifyData($productsData, $cartData, true);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
index 8f734c64dbbeb..49e5e089b5803 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
@@ -25,7 +25,7 @@ public function processAssert(CheckoutCart $checkoutCart, array $products)
     {
         $checkoutCart->open();
         foreach ($products as $product) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $checkoutCart->getCartBlock()->getCartItem($product)->isVisible(),
                 'Product ' . $product->getName() . ' is present in shopping cart.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
index c446333560b14..e2625d8c962e7 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
@@ -28,7 +28,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage)
         /** @var \Magento\Mtf\Client\ElementInterface $field */
         foreach ($requiredFields as $field) {
             $errorContainer = $field->find("div .field-error");
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $errorContainer->isVisible(),
                 'Js validation error messages must be absent for required fields after checkout start.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingInShoppingCart.php
index fa9b7d488b3ac..3d36228586544 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingInShoppingCart.php
@@ -35,7 +35,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
 
         $fixtureShippingAmount = number_format((float)$cart->getShippingAmount(), 2);
         $pageShippingAmount = $checkoutCart->getTotalsBlock()->getShippingPrice();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $fixtureShippingAmount,
             $pageShippingAmount,
             'Shipping amount in the shopping cart not equals to shipping amount from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php
index 3dfb3bc195dd0..5fad47c960069 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php
@@ -32,7 +32,7 @@ public function processAssert(CheckoutCart $checkoutCart, array $shippingExists,
             $checkoutCart->open();
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $checkoutCart->getShippingBlock()->isShippingCarrierMethodVisible(
                 $shippingExists['shipping_service'],
                 $shippingExists['shipping_method']
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingTotalOrderReview.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingTotalOrderReview.php
index 9fccf0a8afc86..99221b91156b9 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingTotalOrderReview.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingTotalOrderReview.php
@@ -25,7 +25,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $shippingTotal)
     {
         $reviewShippingTotal = $checkoutOnepage->getReviewBlock()->getShippingExclTax();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $reviewShippingTotal,
             number_format($shippingTotal, 2),
             'Shipping price: \'' . $reviewShippingTotal
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubTotalOrderReview.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubTotalOrderReview.php
index be3fc1ebf38e2..270ba0d77090d 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubTotalOrderReview.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubTotalOrderReview.php
@@ -25,7 +25,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $subTotal)
     {
         $reviewSubTotal = $checkoutOnepage->getReviewBlock()->getSubtotal();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $reviewSubTotal,
             number_format($subTotal, 2),
             'Subtotal price: \'' . $reviewSubTotal
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInMiniShoppingCart.php
index be68cc17eec14..e69c17397d345 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInMiniShoppingCart.php
@@ -27,7 +27,7 @@ public function processAssert(CmsIndex $cmsIndex, Cart $cart)
         $cmsIndex->open();
         $fixtureSubtotal = number_format($cart->getSubtotal(), 2);
         $miniCartSubtotal = $cmsIndex->getCartSidebarBlock()->getSubtotal();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $fixtureSubtotal,
             $miniCartSubtotal,
             'Subtotal price in mini shopping cart is not equal to subtotal price from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
index cd6e29410d571..5e743e735d42f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Fixture\Cart\Items;
 use Magento\Checkout\Test\Page\CheckoutCart;
@@ -19,6 +20,8 @@
  */
 class AssertSubtotalInShoppingCart extends AbstractAssertForm
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that subtotal total in the shopping cart is equals to expected total from data set
      *
@@ -31,6 +34,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
     {
         if ($requireReload) {
             $checkoutCart->open();
+            $this->waitForCartPageLoaded($checkoutCart);
         }
 
         /** @var Items $sourceProducts */
@@ -57,7 +61,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
         }
 
         $error = $this->verifyData($productsData, $cartData, true);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxInShoppingCart.php
index b571f499ef437..c0648f8a75922 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxInShoppingCart.php
@@ -35,7 +35,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe
 
         $fixtureTaxAmount = number_format((float)$cart->getTaxAmount(), 2);
         $pageTaxAmount = $checkoutCart->getTotalsBlock()->getTax();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $fixtureTaxAmount,
             $pageTaxAmount,
             'Tax amount in the shopping cart not equals to tax amount from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxTotalOrderReview.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxTotalOrderReview.php
index 4d88a0db9b1f9..954cd02b7a448 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxTotalOrderReview.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTaxTotalOrderReview.php
@@ -25,7 +25,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $taxTotal)
     {
         $reviewTaxTotal = $checkoutOnepage->getReviewBlock()->getTax();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $reviewTaxTotal,
             number_format($taxTotal, 2),
             "Tax price '$reviewTaxTotal' not equals with price from data set '$taxTotal'."
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTopDestinationsInSelect.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTopDestinationsInSelect.php
index 7240185a71848..516a534ac7ef3 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTopDestinationsInSelect.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertTopDestinationsInSelect.php
@@ -24,7 +24,7 @@ class AssertTopDestinationsInSelect extends AbstractConstraint
     public function processAssert(CheckoutCart $checkoutCart, array $topDestinations)
     {
         $checkoutCart->open();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $topDestinations,
             $checkoutCart->getShippingBlock()->getTopCountries(),
             'Top countries are different from the ones selected as Top Destinations.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInCheckoutSummaryBlock.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInCheckoutSummaryBlock.php
index 5ceda33949db2..0df2866141297 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInCheckoutSummaryBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInCheckoutSummaryBlock.php
@@ -41,7 +41,7 @@ public function processAssert(
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $checkoutSummaryMaxVisibleCartItemsCount,
             $presentItems,
             'Wrong quantity of visible Cart items in checkout summary block.'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInMiniShoppingCart.php
index 317a26b7545b6..04a34a829c662 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInMiniShoppingCart.php
@@ -40,7 +40,7 @@ public function processAssert(CmsIndex $cmsIndex, Cart $cart, $minicartMaxVisibl
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $minicartMaxVisibleCartItemsCount,
             $presentItems,
             'Wrong quantity of visible Cart items in mini shopping cart'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageInMiniShoppingCart.php
index 4afdfb4ecb808..8f7c2efb11122 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageInMiniShoppingCart.php
@@ -44,7 +44,7 @@ public function processAssert(CmsIndex $cmsIndex, $minicartMaxVisibleCartItemsCo
             $counterMessage = sprintf(self::ITEMS_COUNTER_MASSAGE, $totalItemsCountInShoppingCart);
         }
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $counterMessage,
             $sidebar->getVisibleItemsCounter(),
             'Wrong counter text of visible Cart items in mini shopping cart'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock.php
index 09c4e4e15158d..b3756b48b2646 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock.php
@@ -55,7 +55,7 @@ public function processAssert(
 
         $count = $reviewBlock->getVisibleItemsCounter();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $counterMessage,
             $count,
             'Wrong counter text of visible Cart items in mini shopping cart'
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php
new file mode 100644
index 0000000000000..fa349554fa139
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/Utils/CartPageLoadTrait.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Constraint\Utils;
+
+use Magento\Checkout\Test\Page\CheckoutCart;
+
+/**
+ * Check if cart page is fully loaded.
+ */
+trait CartPageLoadTrait
+{
+    /**
+     * @param CheckoutCart $checkoutCart
+     * @return void
+     */
+    public function waitForCartPageLoaded(CheckoutCart $checkoutCart) : void
+    {
+        $checkoutCart->getCartBlock()->waitForLoader();
+        if (!$checkoutCart->getCartBlock()->cartIsEmpty()) {
+            $checkoutCart->getShippingBlock()->waitForSummaryBlock();
+            $checkoutCart->getTotalsBlock()->waitForGrandTotal();
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
index 4052e1f732975..361c5031f3317 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
@@ -19,10 +19,9 @@
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo, disable_guest_checkout, disable_customer_redirect_after_logging</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
         </variation>
         <variation name="OnePageCheckoutUsingRegisterLink" summary="Customer is redirected to checkout on login if guest is disabled, flow with registration new Customer" ticketId="MAGETWO-49917">
-            <data name="issue" xsi:type="string">MAGETWO-59816: Redirect works improperly in a browser incognito mode</data>
             <data name="tag" xsi:type="string">severity:S1</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="customer/dataset" xsi:type="string">register_customer</data>
@@ -35,7 +34,7 @@
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo, disable_guest_checkout, disable_customer_redirect_after_logging, enable_https_frontend_only</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
         </variation>
         <variation name="OnePageCheckoutTestVariation1" summary="Checkout as UK guest with virtual product and downloadable product using coupon for not logged in customers">
             <data name="tag" xsi:type="string">severity:S0</data>
@@ -51,14 +50,13 @@
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="OnePageCheckoutTestVariation2" summary="US customer during checkout using coupon for all customer groups">
-            <data name="tag" xsi:type="string">stable:no, severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
             <data name="customer/dataset" xsi:type="string">default</data>
@@ -70,17 +68,17 @@
                 <item name="grandTotal" xsi:type="string">285.00</item>
             </data>
             <data name="payment/method" xsi:type="string">banktransfer</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Ship, Invoice, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">banktransfer</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with simple product" ticketId="MAGETWO-42603, MAGETWO-43282, MAGETWO-43318">
-            <data name="tag" xsi:type="string">severity:S1, stable:no</data>
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::product_with_qty_25</data>
             <data name="expectedQty/0" xsi:type="string">0</data>
             <data name="expectedStockStatus/0" xsi:type="string">out of stock</data>
@@ -93,17 +91,16 @@
                 <item name="grandTotal" xsi:type="string">375.00</item>
             </data>
             <data name="payment/method" xsi:type="string">banktransfer</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Ship, Invoice, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">banktransfer_specificcountry_gb, can_subtract_and_can_back_in_stock</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductsOutOfStock" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductsQtyAndStockStatusInAdminPanel" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-            <data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 is not stable</data>
         </variation>
         <variation name="OnePageCheckoutTestVariation4" summary="One Page Checkout Products with Special Prices" ticketId="MAGETWO-12429">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
@@ -123,7 +120,7 @@
             <data name="billingCheckboxState" xsi:type="string">Yes</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>
         </variation>
@@ -149,7 +146,7 @@
             <data name="refresh" xsi:type="boolean">true</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo, freeshipping_minimum_order_amount_100</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
@@ -168,7 +165,6 @@
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">zero_subtotal_checkout</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
@@ -185,9 +181,9 @@
                 <item name="grandTotal" xsi:type="string">375</item>
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <data name="status" xsi:type="string">Pending</data>
+            <data name="status" xsi:type="string">Processing</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Cancel, Hold, Invoice, Edit</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
@@ -198,6 +194,7 @@
             <data name="tag" xsi:type="string">severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="customerPassword" xsi:type="string">12312Qa.</data>
             <data name="checkoutMethod" xsi:type="string">register</data>
             <data name="shippingAddress/dataset" xsi:type="string">UK_address_2</data>
             <data name="billingAddress/dataset" xsi:type="string">UK_address_without_email</data>
@@ -207,11 +204,11 @@
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="OnePageCheckoutTestVariation9" summary="One Page Checkout Products with different shipping/billing address and Tier Prices" ticketId="MAGETWO-42604">
-            <data name="tag" xsi:type="string">stable:no, severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_order_qty_3</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="checkoutMethod" xsi:type="string">login</data>
@@ -224,7 +221,7 @@
             </data>
             <data name="payment/method" xsi:type="string">banktransfer</data>
             <data name="configData" xsi:type="string">banktransfer_specificcountry_gb</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerDefaultAddressFrontendAddressBook" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
index 9e20bbdaac1d9..0edd8f4183f30 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="OnePageCheckout within Offline Payment Methods" ticketId="MAGETWO-27485">
-        <variation name="OnePageCheckoutUsingSingInLink" summary="Login during checkout using 'Sign In' link" ticketId="MAGETWO-42547">
+        <variation name="OnePageCheckoutUsingSignInLink" summary="Login during checkout using 'Sign In' link" ticketId="MAGETWO-42547">
             <data name="tag" xsi:type="string">severity:S1</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="customer/dataset" xsi:type="string">customer_UK_US_addresses</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
index bdd54ce3559f9..7365195d0cd44 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPerCustomerTest.php
@@ -95,7 +95,7 @@ public function test(
 
         $customers = [];
         $cartFixtures = [];
-        for ($i = 0; $i < count($checkoutData); $i++) {
+        for ($i = 0, $count = count($checkoutData); $i < $count; $i++) {
             $customers[$i] = $this->fixtureFactory->createByCode('customer', ['dataset' => $customerDataset]);
             $customers[$i]->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
index 5935a68c43c21..af267cfa30ec1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
@@ -115,6 +115,7 @@ public function test(
         } else {
             $miniShoppingCart->getCartItem($newProduct)->clickEditItem();
             $this->catalogProductView->getViewBlock()->addToCart($newProduct);
+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         }
         // Prepare data for asserts:
         $cart['data']['items'] = ['products' => [$newProduct]];
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
index 3177f0fbccc21..8b2460718097c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\UpdateProductFromMiniShoppingCartEntityTest" summary="Update Product from Mini Shopping Cart" ticketId="MAGETWO-29812">
         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation1" summary="Update Product Qty on Mini Shopping Cart" ticketId=" MAGETWO-35536">
+            <data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1624</data>
             <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
             <data name="originalProduct/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="checkoutData/dataset" xsi:type="string">simple_order_qty_2</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
index 37a4d5c26189f..42d6c4502ef49 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -123,6 +123,7 @@ public function run()
             }
         }
         $cart['data']['items'] = ['products' => $this->products];
+        sleep(10);
         return ['cart' => $this->fixtureFactory->createByCode('cart', $cart)];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/CreateCustomerAccountStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/CreateCustomerAccountStep.php
index 816659284a93d..13e4cfb195f9d 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/CreateCustomerAccountStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/CreateCustomerAccountStep.php
@@ -7,7 +7,9 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
+use Magento\Customer\Test\Page\CustomerAccountCreate;
 use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Create customer account on checkout one page success after place order.
@@ -15,7 +17,7 @@
 class CreateCustomerAccountStep implements TestStepInterface
 {
     /**
-     * Checkout one page success.
+     * "Success One Page Checkout" Storefront page.
      *
      * @var CheckoutOnepageSuccess
      */
@@ -28,15 +30,47 @@ class CreateCustomerAccountStep implements TestStepInterface
      */
     private $checkoutMethod;
 
+    /**
+     * Fixture factory.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * "Create New Customer Account" Storefront page.
+     *
+     * @var CustomerAccountCreate
+     */
+    private $customerAccountCreate;
+
+    /**
+     * Customer specifies this password while registration.
+     *
+     * @var string
+     */
+    private $customerPassword;
+
     /**
      * @constructor
      * @param CheckoutOnepageSuccess $checkoutOnepageSuccess
      * @param string $checkoutMethod
+     * @param FixtureFactory $fixtureFactory
+     * @param CustomerAccountCreate $customerAccountCreate
+     * @param null|string $customerPassword
      */
-    public function __construct(CheckoutOnepageSuccess $checkoutOnepageSuccess, $checkoutMethod)
-    {
+    public function __construct(
+        CheckoutOnepageSuccess $checkoutOnepageSuccess,
+        $checkoutMethod,
+        FixtureFactory $fixtureFactory,
+        CustomerAccountCreate $customerAccountCreate,
+        $customerPassword = null
+    ) {
         $this->checkoutOnepageSuccess = $checkoutOnepageSuccess;
         $this->checkoutMethod = $checkoutMethod;
+        $this->fixtureFactory = $fixtureFactory;
+        $this->customerAccountCreate = $customerAccountCreate;
+        $this->customerPassword = $customerPassword;
     }
 
     /**
@@ -48,6 +82,17 @@ public function run()
     {
         if ($this->checkoutMethod === 'register') {
             $this->checkoutOnepageSuccess->getRegistrationBlock()->createAccount();
+
+            $customerFixture = $this->fixtureFactory->createByCode(
+                'customer',
+                [
+                    'data' => [
+                        'password' => $this->customerPassword,
+                        'password_confirmation' => $this->customerPassword,
+                    ],
+                ]
+            );
+            $this->customerAccountCreate->getRegisterForm()->registerCustomer($customerFixture);
         }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/EstimateShippingAndTaxStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/EstimateShippingAndTaxStep.php
index 21da4c66fa2f3..0780b7d13a285 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/EstimateShippingAndTaxStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/EstimateShippingAndTaxStep.php
@@ -107,6 +107,7 @@ public function run()
     {
         $this->checkoutCart->open();
         $this->checkoutCart->getCartBlock()->waitCartContainerLoading();
+        sleep(20);
         /** @var \Magento\Checkout\Test\Fixture\Cart $cart */
         if ($this->cart !== null) {
             $cart = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
index 13b8b9a1405fa..964f8f366f223 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
@@ -7,9 +7,11 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Constraint\AssertGrandTotalOrderReview;
+use Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage;
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
 use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 
@@ -32,6 +34,13 @@ class PlaceOrderStep implements TestStepInterface
      */
     private $assertGrandTotalOrderReview;
 
+    /**
+     * Assert that order success message is correct.
+     *
+     * @var AssertOrderSuccessPlacedMessage
+     */
+    private $assertOrderSuccessPlacedMessage;
+
     /**
      * One page checkout success page.
      *
@@ -75,6 +84,7 @@ class PlaceOrderStep implements TestStepInterface
      * @param array $products
      * @param array $prices
      * @param OrderInjectable|null $order
+     * @param AssertOrderSuccessPlacedMessage $assertOrderSuccessPlacedMessage
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
@@ -83,7 +93,8 @@ public function __construct(
         FixtureFactory $fixtureFactory,
         array $products = [],
         array $prices = [],
-        OrderInjectable $order = null
+        OrderInjectable $order = null,
+        AssertOrderSuccessPlacedMessage $assertOrderSuccessPlacedMessage = null
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->assertGrandTotalOrderReview = $assertGrandTotalOrderReview;
@@ -92,6 +103,8 @@ public function __construct(
         $this->products = $products;
         $this->prices = $prices;
         $this->order = $order;
+        $this->assertOrderSuccessPlacedMessage = $assertOrderSuccessPlacedMessage
+            ?: ObjectManager::getInstance()->create(AssertOrderSuccessPlacedMessage::class);
     }
 
     /**
@@ -106,6 +119,7 @@ public function run()
         }
         $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock()->clickPlaceOrder();
         $orderId = $this->checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
+        $this->assertOrderSuccessPlacedMessage->processAssert($this->checkoutOnepageSuccess);
         $data = [
             'id' => $orderId,
             'entity_id' => ['products' => $this->products]
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/RemoveProductsFromTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/RemoveProductsFromTheCartStep.php
index b4ea9ba26b0c2..6e1042eed5d83 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/RemoveProductsFromTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/RemoveProductsFromTheCartStep.php
@@ -30,7 +30,7 @@ class RemoveProductsFromTheCartStep implements TestStepInterface
     private $cartPage;
 
     /**
-     * Quantity of items that should be removed from shoping cart.
+     * Quantity of items that should be removed from shopping cart.
      *
      * @var int|null
      */
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
index 9df49d2440568..f79cf8d7eb7fa 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
@@ -59,6 +59,13 @@ class SelectCheckoutMethodStep implements TestStepInterface
      */
     private $customerAccountCreatePage;
 
+    /**
+     * Proceed to checkout from minicart step
+     *
+     * @var proceedToCheckoutFromMiniShoppingCartStep
+     */
+    private $proceedToCheckoutFromMiniShoppingCartStep;
+
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
@@ -66,6 +73,7 @@ class SelectCheckoutMethodStep implements TestStepInterface
      * @param Customer $customer
      * @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend
      * @param ClickProceedToCheckoutStep $clickProceedToCheckoutStep
+     * @param ProceedToCheckoutFromMiniShoppingCartStep $proceedToCheckoutFromMiniShoppingCartStep
      * @param string $checkoutMethod
      */
     public function __construct(
@@ -74,6 +82,7 @@ public function __construct(
         Customer $customer,
         LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend,
         ClickProceedToCheckoutStep $clickProceedToCheckoutStep,
+        ProceedToCheckoutFromMiniShoppingCartStep $proceedToCheckoutFromMiniShoppingCartStep,
         $checkoutMethod
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
@@ -82,6 +91,7 @@ public function __construct(
         $this->logoutCustomerOnFrontend = $logoutCustomerOnFrontend;
         $this->clickProceedToCheckoutStep = $clickProceedToCheckoutStep;
         $this->checkoutMethod = $checkoutMethod;
+        $this->proceedToCheckoutFromMiniShoppingCartStep = $proceedToCheckoutFromMiniShoppingCartStep;
     }
 
     /**
@@ -91,8 +101,10 @@ public function __construct(
      */
     public function run()
     {
+        sleep(20);
         $this->processLogin();
         $this->processRegister();
+        sleep(20);
     }
 
     /**
@@ -127,6 +139,7 @@ private function processRegister()
         if ($this->checkoutMethod === 'register_before_checkout') {
             $this->checkoutOnepage->getAuthenticationPopupBlock()->createAccount();
             $this->customerAccountCreatePage->getRegisterForm()->registerCustomer($this->customer);
+            $this->proceedToCheckoutFromMiniShoppingCartStep->run();
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
index 0c8fbd5f03f9e..f0b0194039a34 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
@@ -38,7 +38,8 @@
         <step name="fillBillingInformation" module="Magento_Checkout" next="refreshPage" />
         <step name="refreshPage" module="Magento_Checkout" next="placeOrder" />
         <step name="placeOrder" module="Magento_Checkout" next="createCustomerAccount" />
-        <step name="createCustomerAccount" module="Magento_Checkout" />
+        <step name="createCustomerAccount" module="Magento_Checkout" next="createShipment" />
+        <step name="createShipment" module="Magento_Sales"/>
     </scenario>
     <scenario name="OnePageCheckoutJsValidationTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
index 85d080a36a5bd..7fa9fb7bf2e32 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
@@ -26,7 +26,7 @@ class AssertTermAbsentInGrid extends AbstractConstraint
     public function processAssert(CheckoutAgreementIndex $agreementIndex, CheckoutAgreement $agreement)
     {
         $agreementIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $agreementIndex->getAgreementGridBlock()->isRowVisible(['name' => $agreement->getName()]),
             'Checkout Agreement \'' . $agreement->getName() . '\' is present in agreement grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
index 7ff1a2a104f1b..9d4c245767dcd 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
@@ -59,7 +59,7 @@ public function processAssert(
         )->run();
         $objectManager->create(\Magento\Checkout\Test\TestStep\SelectPaymentMethodStep::class, $paymentData)->run();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutOnepage->getAgreementReview()->checkAgreement($agreement),
             'Checkout Agreement \'' . $agreement->getName() . '\' is present in the Place order step.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
index 1045e11a087e6..27ecba1f97e46 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
@@ -26,7 +26,7 @@ class AssertTermInGrid extends AbstractConstraint
     public function processAssert(CheckoutAgreementIndex $agreementIndex, CheckoutAgreement $agreement)
     {
         $agreementIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $agreementIndex->getAgreementGridBlock()->isRowVisible(['name' => $agreement->getName()]),
             'Checkout Agreement \'' . $agreement->getName() . '\' is absent in agreement grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
index 68169c2c2acdc..cbf57310a6e32 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
@@ -75,7 +75,7 @@ public function processAssert(
         $objectManager->create(\Magento\Checkout\Test\TestStep\SelectPaymentMethodStep::class, $paymentData)->run();
 
         $paymentBlock->getSelectedPaymentMethodBlock()->clickPlaceOrder();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOTIFICATION_MESSAGE,
             $checkoutOnepage->getAgreementReview()->getNotificationMassage(),
             'Notification required message of Terms and Conditions is absent.'
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermRequireMessageOnMultishippingCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermRequireMessageOnMultishippingCheckout.php
index 63b6eb9a41e6d..fba4690f23f82 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermRequireMessageOnMultishippingCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermRequireMessageOnMultishippingCheckout.php
@@ -69,7 +69,7 @@ public function processAssert(
             ['agreementValue' => 'No']
         )->run();
         $stepFactory->create(\Magento\Multishipping\Test\TestStep\PlaceOrderStep::class)->run();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOTIFICATION_MESSAGE,
             $page->getAgreementReview()->getNotificationMassage(),
             'Notification required message of Terms and Conditions is absent.'
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
index d5ebf891f9c6c..aae1217b65344 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
@@ -28,7 +28,7 @@ class AssertTermSuccessDeleteMessage extends AbstractConstraint
      */
     public function processAssert(CheckoutAgreementIndex $agreementIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $agreementIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
index b309fbd604db0..afa9ac8340fb6 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
@@ -28,7 +28,7 @@ class AssertTermSuccessSaveMessage extends AbstractConstraint
      */
     public function processAssert(CheckoutAgreementIndex $agreementIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_SAVE_MESSAGE,
             $agreementIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Block/Edit/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Block/Edit/FormPageActions.php
new file mode 100644
index 0000000000000..ce9d2fd665235
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Block/Edit/FormPageActions.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Block\Adminhtml\Block\Edit;
+
+use Magento\Backend\Test\Block\FormPageActions as ParentFormPageActions;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Product Form page actions.
+ */
+class FormPageActions extends ParentFormPageActions
+{
+    /**
+     * "Save and Continue Edit" button.
+     *
+     * @var string
+     */
+    protected $saveAndContinueButton = '#save-button';
+
+    /**
+     * CSS selector toggle "Save button".
+     *
+     * @var string
+     */
+    private $toggleButton = '[data-ui-id="save-button-dropdown"]';
+
+    /**
+     * "Save" button.
+     *
+     * @var string
+     */
+    protected $saveButton = '#save_and_close';
+
+    /**
+     * Click on "Save" button.
+     *
+     * @return void
+     */
+    public function save()
+    {
+        $this->_rootElement->find($this->toggleButton, Locator::SELECTOR_CSS)->click();
+        parent::save();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/FormPageActions.php
new file mode 100644
index 0000000000000..c0abe83a0737c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/FormPageActions.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Block\Adminhtml\Page\Edit;
+
+use Magento\Backend\Test\Block\FormPageActions as ParentFormPageActions;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Product Form page actions.
+ */
+class FormPageActions extends ParentFormPageActions
+{
+    /**
+     * "Save and Continue Edit" button.
+     *
+     * @var string
+     */
+    protected $saveAndContinueButton = '#save-button';
+
+    /**
+     * CSS selector toggle "Save button".
+     *
+     * @var string
+     */
+    private $toggleButton = '[data-ui-id="save-button-dropdown"]';
+
+    /**
+     * "Save" button.
+     *
+     * @var string
+     */
+    protected $saveButton = '#save_and_close';
+
+    /**
+     * Click on "Save" button.
+     *
+     * @return void
+     */
+    public function save()
+    {
+        $this->_rootElement->find($this->toggleButton, Locator::SELECTOR_CSS)->click();
+        parent::save();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php
index 0b7c31a092280..c08ea7aa9e29b 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.php
@@ -87,7 +87,7 @@ public function openTab($tabName)
         if ($tabHeader->isVisible() && strpos($tabHeader->getAttribute('class'), '_show') === false) {
             $tabHeader->hover();
             $tabHeader->click();
-        };
+        }
         return $this;
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml
index 2ed1bdc790806..28de286b1411a 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml
@@ -68,7 +68,7 @@
     </custom_design>
     <seo>
         <class>\Magento\Backend\Test\Block\Widget\Tab</class>
-        <selector>//div[div/strong/span[text()="Search Engine Optimisation"]]</selector>
+        <selector>//div[div/strong/span[text()="Search Engine Optimization"]]</selector>
         <strategy>xpath</strategy>
         <fields>
             <identifier />
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertAuthorizationLinkIsVisibleOnStoreFront.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertAuthorizationLinkIsVisibleOnStoreFront.php
index bbfd1f8285bfa..5f06bfd370160 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertAuthorizationLinkIsVisibleOnStoreFront.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertAuthorizationLinkIsVisibleOnStoreFront.php
@@ -23,7 +23,7 @@ class AssertAuthorizationLinkIsVisibleOnStoreFront extends AbstractConstraint
     public function processAssert(CmsIndex $cmsIndex)
     {
         $cmsIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getLinksBlock()->isAuthorizationVisible(),
             "Authorization link is not visible on the Store Front."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
index ef26c5fba934e..07edc9c6dcb88 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertCmsBlockDeleteMessage extends AbstractConstraint
     public function processAssert(CmsBlockIndex $cmsBlockIndex)
     {
         $actualMessage = $cmsBlockIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
index 1aed72d712052..5f071e92feec5 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
@@ -53,7 +53,7 @@ public function processAssert(CmsBlock $cmsBlock, CmsBlockIndex $cmsBlockIndex)
             $pieces = explode('/', $filter['store_id']);
             $filter['store_id'] = end($pieces);
         }
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsBlockIndex->getCmsBlockGrid()->isRowVisible($filter, false, false),
             'CMS Block with '
             . 'title \'' . $filter['title'] . '\', '
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
index ab117e85cbcb9..f4422af332a08 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
@@ -50,7 +50,7 @@ public function processAssert(CmsBlock $cmsBlock, CmsBlockIndex $cmsBlockIndex)
             $filter['update_time_from'] = date("M j, Y", strtotime($cmsBlock->getUpdateTime()));
         }
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsBlockIndex->getCmsBlockGrid()->isRowVisible($filter, true, false),
             'CMS Block with '
             . 'title \'' . $filter['title'] . '\', '
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
index 56cee9e3623f9..11f6677f4a867 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
@@ -54,7 +54,7 @@ public function processAssert(
         $cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
         $categoryViewContent = $catalogCategoryView->getViewBlock()->getContent();
 
-        \PHPUnit_Framework_Assert::assertNotEquals(
+        \PHPUnit\Framework\Assert::assertNotEquals(
             $cmsBlock->getContent(),
             $categoryViewContent,
             'Wrong block content on category is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
index 81eb0b6c408f7..d63791cf6b04b 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
@@ -49,7 +49,7 @@ public function processAssert(
         $cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
         $categoryViewContent = $catalogCategoryView->getViewBlock()->getContent();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $cmsBlock->getContent(),
             $categoryViewContent,
             'Wrong block content on category is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
index 53a3d9abddc0a..b1c44d28bdf64 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCmsBlockSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CmsBlockIndex $cmsBlockIndex)
     {
         $actualMessage = $cmsBlockIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_SAVE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
index a254ca71540ef..8752f40341a48 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertCmsPageDeleteMessage extends AbstractConstraint
     public function processAssert(CmsPageIndex $cmsIndex)
     {
         $actualMessage = $cmsIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
index d1b9d0d4bca39..8ba2199d8cd6e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
@@ -38,7 +38,7 @@ public function processAssert(
         $filter = ['title' => $cms->getTitle()];
         $cmsIndex->getCmsPageGridBlock()->searchAndPreview($filter);
         $browser->selectWindow();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
             $frontCmsIndex->getTitleBlock()->getTitle(),
             'Wrong page is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
index 2c3e4bbecfe4f..6f5df3904ef13 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
@@ -31,7 +31,7 @@ public function processAssert(CmsPageIndex $cmsIndex, CmsPage $cmsPage)
     {
         $actualMessage = $cmsIndex->getMessagesBlock()->getErrorMessage();
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::ERROR_MESSAGE_TITLE,
             $actualMessage,
             'Wrong error message is displayed.'
@@ -39,7 +39,7 @@ public function processAssert(CmsPageIndex $cmsIndex, CmsPage $cmsPage)
             . "\nActual:\n" . $actualMessage
         );
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $cmsPage->getIdentifier(),
             $actualMessage,
             'CMS page url is not present on error message.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
index e2d4a5563234a..ab7f544bf4352 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
@@ -52,7 +52,7 @@ public function processAssert(
         $storeId = explode('/', $cms->getStoreId());
         $cmsFixtureData['store_id'] = array_pop($storeId);
         $errors = $this->verifyData($cmsFixtureData, $cmsFormData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php
index 397d578c6b5be..bf47e08309ce8 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageFormSingleStoreMode.php
@@ -35,6 +35,6 @@ public function processAssert(
         $cmsFormData = $cmsPageNew->getPageForm()->getData($cms);
         $cmsFixtureData = $cms->getData();
         $errors = $this->verifyData($cmsFixtureData, $cmsFormData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
index 00ca9d112b501..d78e563b0373d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
@@ -30,7 +30,7 @@ public function processAssert(CmsPageIndex $cmsIndex, CmsPage $cms, $expectedSta
             'is_active' => $expectedStatus
         ];
         $cmsIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getCmsPageGridBlock()->isRowVisible($filter, true, false),
             'Cms page \'' . $cms->getTitle() . '\' is not present in pages grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
index d5928c5c5ad11..ca0d6f43e99d6 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(CmsPageIndex $cmsIndex, CmsPage $cmsPage)
         $filter = [
             'title' => $cmsPage->getTitle(),
         ];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsIndex->getCmsPageGridBlock()->isRowVisible($filter),
             'Cms page \'' . $cmsPage->getTitle() . '\' is present in pages grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php
index ca3fabfca4a76..93a32a12360ad 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php
@@ -33,7 +33,7 @@ public function processAssert(
     ) {
         $browser->open($_ENV['app_frontend_url'] . $cms->getIdentifier());
         $fixtureContent = $cms->getContent();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $displayContent != null ? $displayContent : $fixtureContent['content'],
             $frontCmsPage->getCmsPageBlock()->getPageContent(),
             'Wrong content is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
index 7ea81866d6834..b9b3649b48fec 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
@@ -47,21 +47,21 @@ public function processAssert(
         $browser->selectWindow();
 
         $fixtureContent = $cms->getContent();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $displayContent != null ? $displayContent : $fixtureContent['content'],
             $frontCmsPage->getCmsPageBlock()->getPageContent(),
             'Wrong content is displayed.'
         );
         if (isset($fixtureContent['widget'])) {
             foreach ($fixtureContent['widget']['dataset'] as $widget) {
-                \PHPUnit_Framework_Assert::assertTrue(
+                \PHPUnit\Framework\Assert::assertTrue(
                     $frontCmsPage->getCmsPageBlock()->isWidgetVisible($widget['widget_type'], $widget['anchor_text']),
                     'Widget \'' . $widget['widget_type'] . '\' is not displayed.'
                 );
             }
         }
         if ($cms->getContentHeading()) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $cms->getContentHeading(),
                 $frontCmsIndex->getTitleBlock()->getTitle(),
                 'Wrong title is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
index b4e0bd644558f..0770db6da6fa9 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCmsPageSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CmsPageIndex $cmsIndex)
     {
         $actualMessage = $cmsIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_SAVE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagesOnFrontendMultipleStoreViews.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagesOnFrontendMultipleStoreViews.php
index ec0fc08b8c218..9128db56a23a0 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagesOnFrontendMultipleStoreViews.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagesOnFrontendMultipleStoreViews.php
@@ -37,7 +37,7 @@ public function processAssert(
             $browser->open($_ENV['app_frontend_url'] . $cmsPage->getIdentifier());
             $storeName = $cmsPage->getDataFieldConfig('store_id')['source']->getStore()->getData()['name'];
             $cmsIndex->getStoreSwitcherBlock()->selectStoreView($storeName);
-            \PHPUnit_Framework_Assert::assertContains(
+            \PHPUnit\Framework\Assert::assertContains(
                 $displayContent != null ? $displayContent : $cmsPage->getContent()['content'],
                 $frontCmsPage->getCmsPageBlock()->getPageContent(),
                 'Wrong content page ' . $cmsPage->getTitle() . ' is displayed on store ' . $storeName . '.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
index 8175ee2f107e1..bb19fdd0c6c53 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
@@ -41,7 +41,7 @@ public function processAssert(
             ? $urlRewrite->getRequestPath()
             : $cmsPage->getTitle();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $_ENV['app_frontend_url'] . $url,
             $browser->getUrl(),
             'URL rewrite CMS Page redirect false.'
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockEdit.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockEdit.xml
index 372b61e54252f..768a7e5228b89 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockEdit.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockEdit.xml
@@ -8,6 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CmsBlockEdit" area="Adminhtml" mca="cms/block/edit" module="Magento_Cms">
         <block name="blockForm" class="Magento\Cms\Test\Block\Adminhtml\Block\Edit\BlockForm" locator="[id='page:main-container']" strategy="css selector" />
-        <block name="pageMainActions" class="Magento\Backend\Test\Block\FormPageActions" locator=".page-main-actions" strategy="css selector" />
+        <block name="pageMainActions" class="Magento\Cms\Test\Block\Adminhtml\Block\Edit\FormPageActions" locator=".page-main-actions" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockNew.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockNew.xml
index eff9b275bf65b..e19928d66a428 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockNew.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsBlockNew.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CmsBlockNew" area="Adminhtml" mca="cms/block/new" module="Magento_Cms">
-        <block name="formPageActions" class="Magento\Backend\Test\Block\FormPageActions" locator=".page-main-actions" strategy="css selector" />
+        <block name="formPageActions" class="Magento\Cms\Test\Block\Adminhtml\Block\Edit\FormPageActions" locator=".page-main-actions" strategy="css selector" />
         <block name="cmsForm" class="Magento\Cms\Test\Block\Adminhtml\Block\Edit\CmsForm" locator="[id='page:main-container']" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
         <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal]" strategy="css selector"/>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageNew.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageNew.xml
index d088d48a4f3d0..1f82af342704b 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageNew.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/Adminhtml/CmsPageNew.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CmsPageNew" area="Adminhtml" mca="cms/page/new" module="Magento_Cms">
         <block name="pageForm" class="Magento\Cms\Test\Block\Adminhtml\Page\Edit\PageForm" locator="[id='page:main-container']" strategy="css selector" />
-        <block name="pageMainActions" class="Magento\Backend\Test\Block\FormPageActions" locator=".page-main-actions" strategy="css selector" />
+        <block name="pageMainActions" class="Magento\Cms\Test\Block\Adminhtml\Page\Edit\FormPageActions" locator=".page-main-actions" strategy="css selector" />
         <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal]" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml
index 22d29eae1656b..1a7adcd531c55 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml
@@ -7,6 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CmsPage" mca="cms/page" module="Magento_Cms">
-        <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator=".page-main" strategy="css selector" />
+        <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator="#maincontent" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/Constraint/AssertAdminAccountSharing.php b/dev/tests/functional/tests/app/Magento/Config/Test/Constraint/AssertAdminAccountSharing.php
index 21fecac4cf93c..3159d480ee93c 100644
--- a/dev/tests/functional/tests/app/Magento/Config/Test/Constraint/AssertAdminAccountSharing.php
+++ b/dev/tests/functional/tests/app/Magento/Config/Test/Constraint/AssertAdminAccountSharing.php
@@ -20,7 +20,7 @@ class AssertAdminAccountSharing extends AbstractConstraint
      */
     public function processAssert(AdminAccountSharing $adminAccountSharing)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $adminAccountSharing->getAdminForm()->adminAccountSharingAvailability(),
             'Admin Account Sharing Option is not available'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php b/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php
index 36b544dc8b2d8..3191d975826f0 100644
--- a/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php
@@ -13,7 +13,7 @@
  * Steps:
  * 1. Log in to Admin.
  * 2. Go to Stores>Configuration>Advanced>admin>Security.
- * 3. * 7. Verify admin Acoount Sharing option availability.
+ * 3. * 7. Verify admin Account Sharing option availability.
  *
  * @group Config_(PS)
  * @ZephyrId MAGETWO-47822
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
index a66753c2adf23..f7bd155fd2d51 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
@@ -7,7 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <qty />
         <attribute>
             <selector>//div[@class="product-options"]//label[.="%s"]//following-sibling::*//select</selector>
             <strategy>xpath</strategy>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php
new file mode 100644
index 0000000000000..640ee75f0148b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Block\Product;
+
+use Magento\Mtf\Client\Element\SimpleElement;
+
+/**
+ * This class is used to access the price related information of a configurable product from the storefront.
+ */
+class Price extends \Magento\Catalog\Test\Block\Product\Price
+{
+    /**
+     * A CSS selector for a Price label.
+     *
+     * @var string
+     */
+    private $priceLabel = '.normal-price .price-label';
+
+    /**
+     * Mapping for different types of Price.
+     *
+     * @var array
+     */
+    protected $mapTypePrices = [
+        'special_price' => [
+            'selector' => '.normal-price .price',
+        ],
+    ];
+
+    /**
+     * This method returns the price label represented by the block.
+     *
+     * @return SimpleElement
+     */
+    public function getPriceLabel()
+    {
+        return $this->_rootElement->find($this->priceLabel);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
index a1f64822a6ea6..af136eb5068a8 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\ConfigurableProduct\Test\Block\Product;
 
 use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions;
-use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
+use Magento\Mtf\Client\Locator;
+use Magento\ConfigurableProduct\Test\Block\Product\Price;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Fixture\InjectableFixture;
 
@@ -17,6 +17,23 @@
  */
 class View extends \Magento\Catalog\Test\Block\Product\View
 {
+    /**
+     * Gets a configurable product price block.
+     *
+     * @param FixtureInterface|null $product
+     *
+     * @return Price
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getPriceBlock(FixtureInterface $product = null)
+    {
+        return $this->blockFactory->create(
+            Price::class,
+            ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)]
+        );
+    }
+
     /**
      * Get configurable options block
      *
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
index 126fe5ff73183..797979b56511e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
@@ -61,7 +61,7 @@ public function processAssert(
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty($errors, implode(' ', $errors));
+        \PHPUnit\Framework\Assert::assertEmpty($errors, implode(' ', $errors));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsGeneratedSku.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsGeneratedSku.php
index 965c3d8d7276b..4c47851e7dcb7 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsGeneratedSku.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsGeneratedSku.php
@@ -30,7 +30,7 @@ public function processAssert(CatalogProductIndex $productGrid, ConfigurableProd
             $filter = ['name' => $variation['name']];
             $productGrid->getProductGrid()->search($filter);
             $itemId = $productGrid->getProductGrid()->getFirstItemId();
-            \PHPUnit_Framework_Assert::assertContains(
+            \PHPUnit\Framework\Assert::assertContains(
                 $product->getSku(),
                 $productGrid->getProductGrid()->getColumnValue($itemId, 'SKU'),
                 'Product sku is not generated from parent sku.'
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
index ba36128daa36d..ce7a85ee603a4 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
@@ -52,7 +52,7 @@ public function processAssert(CatalogProductIndex $productGrid, ConfigurableProd
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty($errors, implode(' ', $errors));
+        \PHPUnit\Framework\Assert::assertEmpty($errors, implode(' ', $errors));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
index bfb25ede7bbd7..85079e0a210b6 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
@@ -37,7 +37,7 @@ public function processAssert(
 
         foreach ($deletedProductAttributes as $attribute) {
             $attributeLabel = $attribute->getFrontendLabel();
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 isset($pageOptions[$attributeLabel]),
                 "Configurable attribute '$attributeLabel' found on product page on frontend."
             );
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
index 9dc2a3eccae43..81f9427bdf26c 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
@@ -34,7 +34,7 @@ public function processAssert(
         ConfigurableProduct $product
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogProductView->getConfigurableAttributesBlock()->isVisible(),
             "Configurable attributes are present on product page on frontend."
         );
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductAttributeOptionNotInLayeredNavigation.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductAttributeOptionNotInLayeredNavigation.php
new file mode 100644
index 0000000000000..23935bb5d0c86
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductAttributeOptionNotInLayeredNavigation.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+
+/**
+ * Check whether OOS product attribute options for configurable product are not displayed
+ * on frontend in Layered navigation.
+ */
+class AssertConfigurableProductAttributeOptionNotInLayeredNavigation extends AbstractConstraint
+{
+    /**
+     * Check whether the OOS attribute options are not displayed on the frontend in Layered navigation.
+     *
+     * @param CatalogCategoryView $catalogCategoryView
+     * @param InjectableFixture $product
+     * @param CmsIndex $cmsIndex
+     * @param FixtureFactory $fixtureFactory
+     * @param string $outOfStockOption
+     * @return void
+     */
+    public function processAssert(
+        CatalogCategoryView $catalogCategoryView,
+        InjectableFixture $product,
+        CmsIndex $cmsIndex,
+        FixtureFactory $fixtureFactory,
+        $outOfStockOption
+    ) {
+        $fixtureFactory->createByCode(
+            'catalogProductSimple',
+            [
+                'dataset' => 'product_with_category_with_anchor',
+                'data' => [
+                    'category_ids' => [
+                        'dataset' => null,
+                        'category' => $product->getDataFieldConfig('category_ids')['source']->getCategories()[0],
+                    ],
+                ],
+            ]
+        )->persist();
+
+        $cmsIndex->open()->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
+
+        $attributesData = $product->hasData('configurable_attributes_data')
+            ? $product->getConfigurableAttributesData()['attributes_data']
+            : [];
+
+        $attributeData = !empty($attributesData) ? array_shift($attributesData) : [];
+        $frontendAttributeLabel = !empty($attributeData) && isset($attributeData['frontend_label'])
+            ? $attributeData['frontend_label']
+            : '';
+
+        $filters = $catalogCategoryView->getLayeredNavigationBlock()->getFilterContents($frontendAttributeLabel);
+
+        \PHPUnit\Framework\Assert::assertFalse(
+            in_array(strtoupper($outOfStockOption), $filters),
+            'Out of Stock attribute option is present in layered navigation on category page.'
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Out of Stock attribute option is absent in layered navigation on category page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
index cb9e068b5727b..c50f0e338c20f 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
@@ -44,7 +44,7 @@ public function processAssert(
         $fixtureData = $this->prepareFixtureData($productData, $this->sortFields);
         $formData = $this->prepareFormData($productPage->getProductForm()->getData($product), $this->sortFields);
         $error = $this->verifyData($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertTrue(empty($error), $error);
+        \PHPUnit\Framework\Assert::assertTrue(empty($error), $error);
     }
 
     /**
@@ -70,7 +70,7 @@ protected function prepareFixtureData(array $data, array $sortFields = [])
     protected function prepareUrlKey($urlKey)
     {
         preg_match("~\d+$~", $urlKey, $matches);
-        $key = intval($matches[0]) + 1;
+        $key = (int)$matches[0] + 1;
         return str_replace($matches[0], $key, $urlKey);
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
index d5cae4bdd4601..15acb782eef49 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
@@ -41,7 +41,7 @@ public function processAssert(
 
         $checkoutData = $product->getCheckoutData();
         $price = $checkoutCart->getCartBlock()->getCartItem($product)->getPrice();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $checkoutData['cartItem']['price'],
             $price,
             'Product price in shopping cart is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCategory.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCategory.php
index 7bd776db9b350..95232bad69966 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCategory.php
@@ -28,14 +28,14 @@ protected function assertPrice(FixtureInterface $product, CatalogCategoryView $c
         $priceBlock = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock();
         $priceData = $product->getDataFieldConfig('price')['source']->getPriceData();
         $price = isset($priceData['category_price']) ? $priceData['category_price'] : $product->getPrice();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($price, 2, '.', ''),
             $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice(),
             'Product regular price on category page is not correct.'
         );
 
         if ($product->hasData('special_price')) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($product->getSpecialPrice(), 2, '.', ''),
                 $priceBlock->getSpecialPrice(),
                 'Product special price on category page is not correct.'
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 cf1b2321a554c..8bd06f88ad1f7 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/Constraint/AssertConfigurableProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php
index 580aff912104b..77949a83508a4 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php
@@ -14,6 +14,13 @@
  */
 class AssertConfigurableProductPage extends AssertProductPage
 {
+    /**
+     * Price format.
+     *
+     * @var int
+     */
+    private $priceFormat = 2;
+
     /**
      * Verify displayed product data on product page(front-end) equals passed from fixture:
      * 1. Product Name
@@ -28,6 +35,7 @@ class AssertConfigurableProductPage extends AssertProductPage
     protected function verify()
     {
         $errors = parent::verify();
+        $errors[] = $this->verifyPriceLabel();
         $errors[] = $this->verifyAttributes();
 
         return array_filter($errors);
@@ -47,7 +55,7 @@ protected function verifyPrice()
         $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice();
         $fixturePrice = $this->getLowestConfigurablePrice();
 
-        if ($fixturePrice != $formPrice) {
+        if ($fixturePrice != number_format($formPrice, $this->priceFormat)) {
             return "Displayed product price on product page(front-end) not equals passed from fixture. "
             . "Actual: {$formPrice}, expected: {$fixturePrice}.";
         }
@@ -144,4 +152,29 @@ protected function getLowestConfigurablePrice()
         }
         return $price;
     }
+
+    /**
+     * Verifies displayed product price label on a product page (front-end) equals passed from the fixture.
+     *
+     * @return string|null
+     */
+    protected function verifyPriceLabel()
+    {
+        /** @var \Magento\ConfigurableProduct\Test\Block\Product\Price $priceBlock */
+        $priceBlock = $this->productView->getPriceBlock($this->product);
+
+        if (!$priceBlock->getPriceLabel()->isVisible()) {
+            return "Product price label should be displayed.";
+        } else {
+            $expectedPriceLabel = 'As low as';
+            $actualPriceLabel = $priceBlock->getPriceLabel()->getText();
+
+            if ($expectedPriceLabel !== $actualPriceLabel) {
+                return "Displayed product price label on product page (front-end) not equals passed from fixture. "
+                    . "Actual: {$actualPriceLabel}, expected: {$expectedPriceLabel}.";
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
index a95b097fede73..bb20f9cc4c3ba 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
@@ -58,7 +58,7 @@ public function processAssert(
      */
     public function assertPrice(CatalogProductView $view, $price, $currency = '')
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $price,
             $view->getViewBlock()->getPriceBlock()->getPrice($currency),
             'Wrong price is displayed on Product page.'
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertOutOfStockOptionIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertOutOfStockOptionIsAbsentOnProductPage.php
index 1679d06218e0c..36c2c42a2db1b 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertOutOfStockOptionIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertOutOfStockOptionIsAbsentOnProductPage.php
@@ -38,7 +38,7 @@ public function processAssert(
             $productOptions = $catalogProductView->getConfigurableAttributesBlock()->getSelectOptionsData($option);
         }
         $option = $this->isOptionAbsent($outOfStockOption, $productOptions);
-        \PHPUnit_Framework_Assert::assertTrue($option, 'Out of stock option is present on product page.');
+        \PHPUnit\Framework\Assert::assertTrue($option, 'Out of stock option is present on product page.');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
index e3b2480c9383f..c5b3c23403534 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
@@ -47,7 +47,7 @@ public function processAssert(
         $variationsTab = $newProductPage->getProductForm()->getSection(self::TAB_VARIATIONS);
         $variationsTab->createConfigurations();
         $attributesGrid = $variationsTab->getAttributeBlock()->getAttributesGrid();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $attributesGrid->isRowVisible(['frontend_label' => $productAttribute->getFrontendLabel()]),
             "Product attribute found in Attribute Search form."
         );
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
index 4148ebf074538..1387e9aed20c0 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
@@ -41,7 +41,7 @@ public function processAssert(
         $variationsSection = $productBlockForm->getSection('variations');
         $variationsSection->createConfigurations();
         $attributesGrid = $variationsSection->getAttributeBlock()->getAttributesGrid();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $attributesGrid->isRowVisible(['frontend_label' => $attribute->getFrontendLabel()]),
             "Product attribute is absent on the product page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductTierPriceOnProductPage.php
index 3845cdfd2d89f..01ff832cd7db3 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -10,7 +10,7 @@
 use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions;
 
 /**
- * Open created configurble product on frontend and choose variation with tier price
+ * Open created configurable product on frontend and choose variation with tier price
  */
 class AssertProductTierPriceOnProductPage extends AssertProductPage
 {
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
index 25fa0e6ec07d2..f3e0a6fa55eb1 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
@@ -176,6 +176,37 @@
             </field>
         </dataset>
 
+        <dataset name="configurable_as_low_as">
+            <field name="name" xsi:type="string">Test configurable product %isolation%</field>
+            <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
+            <field name="price" xsi:type="array">
+                <item name="dataset" xsi:type="string">price_as-40.00</item>
+            </field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">30</field>
+            <field name="status" xsi:type="string">Yes</field>
+            <field name="visibility" xsi:type="string">Catalog, Search</field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="url_key" xsi:type="string">configurable-product-%isolation%</field>
+            <field name="configurable_attributes_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="string">Main Website</item>
+            </field>
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="checkout_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">configurable_options_with_qty_1</item>
+            </field>
+        </dataset>
+
         <dataset name="product_with_special_price">
             <field name="name" xsi:type="string">Test configurable product %isolation%</field>
             <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
@@ -1115,5 +1146,75 @@
                 </item>
             </field>
         </dataset>
+
+        <dataset name="product_with_3_sizes">
+            <field name="name" xsi:type="string">Configurable product with sizes %isolation%</field>
+            <field name="sku" xsi:type="string">sku_configurable_product_with_sizes_%isolation%</field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">2</field>
+            <field name="status" xsi:type="string">Yes</field>
+            <field name="visibility" xsi:type="string">Catalog, Search</field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="url_key" xsi:type="string">configurable-product-with-size-%isolation%</field>
+            <field name="configurable_attributes_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">size_3_items</item>
+            </field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="category_ids" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_anchor_subcategory</item>
+            </field>
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">170</item>
+            </field>
+        </dataset>
+
+        <dataset name="with_only_two_options">
+            <field name="name" xsi:type="string">Configurable product with two options %isolation%</field>
+            <field name="sku" xsi:type="string">sku_test_configurable_product_with_two_options_%isolation%</field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">40</item>
+                <item name="dataset" xsi:type="string">price_40</item>
+            </field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">30</field>
+            <field name="status" xsi:type="string">Yes</field>
+            <field name="visibility" xsi:type="string">Catalog, Search</field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="url_key" xsi:type="string">configurable-product-with-two-options-%isolation%</field>
+            <field name="configurable_attributes_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">two_options</item>
+            </field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="checkout_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">configurable_default_with_two_options</item>
+            </field>
+            <field name="category_ids" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_subcategory</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml
index 003c129c9f969..136696ff81047 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml
@@ -466,5 +466,26 @@
                 <item name="subtotal" xsi:type="string">15</item>
             </field>
         </dataset>
+
+        <dataset name="configurable_default_with_two_options">
+            <field name="options" xsi:type="array">
+                <item name="configurable_options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">attribute_key_0</item>
+                        <item name="value" xsi:type="string">option_key_0</item>
+                    </item>
+                    <item name="1" xsi:type="array">
+                        <item name="title" xsi:type="string">attribute_key_0</item>
+                        <item name="value" xsi:type="string">option_key_1</item>
+                    </item>
+                </item>
+            </field>
+            <field name="qty" xsi:type="string">3</field>
+            <field name="cartItem" xsi:type="array">
+                <item name="price" xsi:type="string">40</item>
+                <item name="qty" xsi:type="string">3</item>
+                <item name="subtotal" xsi:type="string">120</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
index f1c40933f3b32..a9a6e26f54b54 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
@@ -1166,5 +1166,43 @@
                 </item>
             </field>
         </dataset>
+
+        <dataset name="size_3_items">
+            <field name="attributes_data" xsi:type="array">
+                <item name="attribute_key_0" xsi:type="array">
+                    <item name="options" xsi:type="array">
+                        <item name="option_key_0" xsi:type="array">
+                            <item name="pricing_value" xsi:type="string">40.00</item>
+                            <item name="include" xsi:type="string">Yes</item>
+                        </item>
+                        <item name="option_key_1" xsi:type="array">
+                            <item name="pricing_value" xsi:type="string">42.00</item>
+                            <item name="include" xsi:type="string">Yes</item>
+                        </item>
+                        <item name="option_key_2" xsi:type="array">
+                            <item name="pricing_value" xsi:type="string">44.00</item>
+                            <item name="include" xsi:type="string">Yes</item>
+                        </item>
+                    </item>
+                </item>
+            </field>
+            <field name="attributes" xsi:type="array">
+                <item name="attribute_key_0" xsi:type="string">catalogProductAttribute::sizes_S_M_L_Filterable</item>
+            </field>
+            <field name="matrix" xsi:type="array">
+                <item name="attribute_key_0:option_key_0" xsi:type="array">
+                    <item name="qty" xsi:type="string">100</item>
+                    <item name="weight" xsi:type="string">1</item>
+                </item>
+                <item name="attribute_key_0:option_key_1" xsi:type="array">
+                    <item name="qty" xsi:type="string">100</item>
+                    <item name="weight" xsi:type="string">1</item>
+                </item>
+                <item name="attribute_key_0:option_key_2" xsi:type="array">
+                    <item name="qty" xsi:type="string">100</item>
+                    <item name="weight" xsi:type="string">1</item>
+                </item>
+            </field>
+        </dataset>
     </repository>
 </config>
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 8bf30474d252d..e1b6fcf47e562 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/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.php
new file mode 100644
index 0000000000000..1d41b0589b100
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Choose an attribute for configurable options or create it and set attribute properties to
+ * 2. is_filterable = Filterable (with results)
+ * 3. is_filterable_in_search = Yes
+ *
+ * Steps:
+ * 1. Log in to Admin.
+ * 2. Open Catalog -> Products.
+ * 3. Create a configurable product with an attribute from preconditions.
+ * 4. Search and open child of configurable product from preconditions.
+ * 4. Fill in data according to dataset.
+ * 5. Save product.
+ * 6. Perform all assertions.
+ *
+ * @group Configurable_Product
+ * @ZephyrId MAGETWO-89751
+ */
+class VerifyConfigurableProductLayeredNavigationTest extends Scenario
+{
+    /**
+     * Verify configurable product options in layered navigation.
+     *
+     * @return array
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml
new file mode 100644
index 0000000000000..082b93ba62e03
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/VerifyConfigurableProductLayeredNavigationTest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\ConfigurableProduct\Test\TestCase\VerifyConfigurableProductLayeredNavigationTest" summary="Verify OOS option configurable product in Layered Navigation on storefront">
+        <variation name="VerifyConfigurableProductLayeredNavigationTestVariation1" summary="Verify the out of stock configurable attribute option doesn't show in Layered navigation" ticketId="MAGETWO-89745">
+            <data name="product" xsi:type="string">configurableProduct::product_with_3_sizes</data>
+            <data name="productUpdate/childProductUpdate" xsi:type="array">
+                <item name="data" xsi:type="array">
+                    <item name="quantity_and_stock_status" xsi:type="array">
+                        <item name="is_in_stock" xsi:type="string">Out of Stock</item>
+                    </item>
+                </item>
+            </data>
+            <data name="productUpdate/optionNumber" xsi:type="string">1</data>
+            <data name="outOfStockOption" xsi:type="string">SIZE_S</data>
+            <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductAttributeOptionNotInLayeredNavigation" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/testcase.xml
index 7df8c421fedd1..becac5e5d7ee9 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/testcase.xml
@@ -17,4 +17,8 @@
         <step name="createProduct" module="Magento_Catalog" next="updateChildProduct" />
         <step name="updateChildProduct" module="Magento_ConfigurableProduct" />
     </scenario>
+    <scenario name="VerifyConfigurableProductLayeredNavigationTest" firstStep="createProduct">
+        <step name="createProduct" module="Magento_Catalog" next="updateChildProduct" />
+        <step name="updateChildProduct" module="Magento_ConfigurableProduct" />
+    </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php
index ae75a16494dbe..ef1dc8fabc3e9 100644
--- a/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php
@@ -32,7 +32,7 @@ class AssertContactUsSuccessMessage extends AbstractConstraint
      */
     public function processAssert(ContactIndex $contactIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE_PART_1 . self::SUCCESS_MESSAGE_PART_2,
             $contactIndex->getMessagesBlock()->getMessage(),
             'Wrong message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
index 548afaf5cdac8..d9f1941e2ac4e 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
@@ -41,7 +41,7 @@ public function processAssert(
         preg_match('`(.*?)\d`', $price, $matches);
 
         $symbolOnPage = isset($matches[1]) ? $matches[1] : null;
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $currencySymbol->getCustomCurrencySymbol(),
             $symbolOnPage,
             'Wrong Currency Symbol is displayed on Category page.'
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php
index 5f42c93e51bf2..bcf982275e357 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php
@@ -42,7 +42,7 @@ public function processAssert(
         preg_match('`(.*?)\d`', $price, $matches);
 
         $symbolOnPage = isset($matches[1]) ? $matches[1] : null;
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $currencySymbol->getCustomCurrencySymbol(),
             $symbolOnPage,
             'Wrong Currency Symbol is displayed on Product page.'
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageCustomWebsite.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageCustomWebsite.php
index efeb7b640e518..8b85b00e42769 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageCustomWebsite.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageCustomWebsite.php
@@ -37,7 +37,7 @@ public function processAssert(
         $priceBlock = $catalogProductView->getViewBlock()->getPriceBlock();
         $symbolOnPage = $priceBlock->getCurrencySymbol();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $currencySymbol['customWebsite'],
             $symbolOnPage,
             'Wrong Currency Symbol is displayed on Product page on Custom website.'
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageMainWebsite.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageMainWebsite.php
index 0b75707c79932..268862e349c46 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageMainWebsite.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPageMainWebsite.php
@@ -35,7 +35,7 @@ public function processAssert(
         $priceBlock = $catalogProductView->getViewBlock()->getPriceBlock();
         $symbolOnPage = $priceBlock->getCurrencySymbol();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $currencySymbol['mainWebsite'],
             $symbolOnPage,
             'Wrong Currency Symbol is displayed on Product page on the Main Website.'
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
index b2a2ba242220c..07eb1d430cdaf 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
@@ -26,7 +26,7 @@ class AssertCurrencySymbolSuccessSaveMessage extends AbstractConstraint
     public function processAssert(SystemCurrencySymbolIndex $currencySymbolIndex)
     {
         $actualMessage = $currencySymbolIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_SAVE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
index e25a5c1f719d0..1ef9267e73785 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AuthenticationPopup.php
@@ -69,6 +69,7 @@ public function createAccount()
      */
     public function loginCustomer(Customer $customer)
     {
+        sleep(10);
         $this->fill($customer);
         $this->_rootElement->find($this->login)->click();
         $this->waitForElementNotVisible($this->loadingMask);
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
index 83d86669aa8e5..f456635882ed9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
@@ -65,6 +65,7 @@ class CustomerForm extends FormTabs
      * @param FixtureInterface $customer
      * @param FixtureInterface|FixtureInterface[]|null $address
      * @return $this
+     * @throws \Exception
      */
     public function fillCustomer(FixtureInterface $customer, $address = null)
     {
@@ -76,12 +77,29 @@ public function fillCustomer(FixtureInterface $customer, $address = null)
         }
         if (null !== $address) {
             $this->openTab('addresses');
-            $this->getTab('addresses')->fillAddresses($address);
+            $this->fillCustomerAddress($address);
         }
 
         return $this;
     }
 
+    /**
+     * Fill customer address by provided in parameter data
+     *
+     * @param FixtureInterface|FixtureInterface[] $address
+     * @return $this
+     * @throws \Exception
+     */
+    public function fillCustomerAddress($address)
+    {
+        $addressesTab = $this->getTab('addresses');
+        $this->openTab('addresses');
+        $addressesTab->waitForAddressesGrid();
+        $addressesTab->fillAddresses($address);
+
+        return $this;
+    }
+
     /**
      * Update Customer forms on tabs by customer, addresses data.
      *
@@ -98,13 +116,16 @@ public function updateCustomer(FixtureInterface $customer, $address = null, Addr
         if ($isHasData) {
             parent::fill($customer);
         }
+        $addressesTab = $this->getTab('addresses');
         if ($addressToDelete !== null) {
             $this->openTab('addresses');
-            $this->getTab('addresses')->deleteCustomerAddress($addressToDelete);
+            $addressesTab->waitForAddressesGrid();
+            $addressesTab->deleteCustomerAddress($addressToDelete);
         }
         if ($address !== null) {
             $this->openTab('addresses');
-            $this->getTab('addresses')->updateAddresses($address);
+            $addressesTab->waitForAddressesGrid();
+            $addressesTab->updateAddresses($address);
         }
 
         return $this;
@@ -124,6 +145,9 @@ public function getDataCustomer(FixtureInterface $customer, $address = null)
         $data = ['customer' => $customer->hasData() ? parent::getData($customer) : parent::getData()];
         if (null !== $address) {
             $this->openTab('addresses');
+            $this->waitForElementNotVisible($this->tabReadiness);
+            $this->waitForm();
+            $this->getTab('addresses')->waitForAddressesGrid();
             $data['addresses'] = $this->getTab('addresses')->getDataAddresses($address);
         }
 
@@ -148,8 +172,10 @@ protected function waitForm()
      */
     public function openTab($tabName)
     {
+        $this->waitForElementNotVisible($this->tabReadiness);
         parent::openTab($tabName);
         $this->waitForElementNotVisible($this->tabReadiness);
+        $this->waitForm();
 
         return $this;
     }
@@ -161,13 +187,10 @@ public function openTab($tabName)
      */
     public function getJsErrors()
     {
-        $tabs = ['account_information', 'addresses'];
         $jsErrors = [];
-        foreach ($tabs as $tabName) {
-            $tab = $this->getTab($tabName);
-            $this->openTab($tabName);
-            $jsErrors = array_merge($jsErrors, $tab->getJsErrors());
-        }
+        $tab = $this->getTab('account_information');
+        $this->openTab('account_information');
+        $jsErrors = array_merge($jsErrors, $tab->getJsErrors());
         return $jsErrors;
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
index 86df3ea912104..99a79a8a4a85c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -29,7 +29,7 @@ class Addresses extends Tab
      *
      * @var string
      */
-    protected $addNewAddress = '.address-list-actions .add';
+    protected $addNewAddress = '.add-new-address-button';
 
     /**
      * Selector for address block.
@@ -48,25 +48,32 @@ class Addresses extends Tab
     protected $deleteAddress = '.action-delete';
 
     /**
-     * Accept button selector.
+     * Open customer address.
      *
      * @var string
      */
-    private $confirmModal = '.confirm._show[data-role=modal]';
+    protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
 
     /**
-     * Open customer address.
+     * Magento loader.
      *
      * @var string
      */
-    protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
+    protected $loader = '//ancestor::body/div[@data-role="loader"]';
 
     /**
-     * Magento loader.
+     * Customer address modal window.
      *
      * @var string
      */
-    protected $loader = '//ancestor::body/div[@data-role="loader"]';
+    private $customerAddressModalForm = '.customer_form_areas_address_address_customer_address_update_modal';
+
+    /**
+     * Customer addresses list grid.
+     *
+     * @var string
+     */
+    private $customerAddressesGrid = '.customer_form_areas_address_address_customer_address_listing';
 
     /**
      * Object Manager.
@@ -107,9 +114,11 @@ public function __construct(
     public function fillAddresses($address)
     {
         $addresses = is_array($address) ? $address : [$address];
+        $customerAddressForm = $this->getCustomerAddressModalForm();
         foreach ($addresses as $address) {
             $this->addNewAddress();
-            $this->setFieldsData($address->getData(), $this->_rootElement);
+            $customerAddressForm->fillAddressData($address);
+            $customerAddressForm->saveAddress();
         }
 
         return $this;
@@ -136,8 +145,9 @@ public function updateAddresses($address)
 
             if (!$this->isVisibleCustomerAddress($addressNumber)) {
                 $this->addNewAddress();
+            } else {
+                $this->openCustomerAddress($addressNumber);
             }
-            $this->openCustomerAddress($addressNumber);
 
             $defaultAddress = ['default_billing' => 'No', 'default_shipping' => 'No'];
             $addressData = $address->getData();
@@ -146,9 +156,10 @@ public function updateAddresses($address)
                     $defaultAddress[$key] = $value;
                 }
             }
-            $this->_fill($this->dataMapping($defaultAddress));
-
-            $this->setFieldsData(array_diff($addressData, $defaultAddress), $this->_rootElement);
+            $customerAddressForm = $this->getCustomerAddressModalForm();
+            $customerAddressForm->setFieldsData($this->dataMapping($defaultAddress));
+            $customerAddressForm->setFieldsData(array_diff($addressData, $defaultAddress));
+            $customerAddressForm->saveAddress();
         }
 
         return $this;
@@ -168,6 +179,10 @@ public function getDataAddresses($address = null)
 
         foreach ($addresses as $addressNumber => $address) {
             $hasData = (null !== $address) && $address->hasData();
+            $customerAddressesGrid = $this->getCustomerAddressesGrid();
+            if ($hasData) {
+                $customerAddressesGrid->search($address->getData());
+            }
             $isVisibleCustomerAddress = $this->isVisibleCustomerAddress($addressNumber);
 
             if ($hasData && !$isVisibleCustomerAddress) {
@@ -177,14 +192,36 @@ public function getDataAddresses($address = null)
             if (!$hasData && !$isVisibleCustomerAddress) {
                 $data[$addressNumber] = [];
             } else {
-                $this->openCustomerAddress($addressNumber);
-                $data[$addressNumber] = $this->getData($address, $this->_rootElement);
+                $customerAddressesGrid->openFirstRow();
+                $data[$addressNumber] = $this->getCustomerAddressModalForm()
+                    ->getData($address, $this->browser->find($this->customerAddressModalForm));
+                $this->getCustomerAddressModalForm()->clickCancelButton();
             }
         }
 
         return $data;
     }
 
+    /**
+     * Get data from Customer addresses.
+     *
+     * @param FixtureInterface|FixtureInterface[]|null $address
+     * @return array|null
+     * @throws \Exception
+     */
+    public function getAddressFromFirstRow($address = null)
+    {
+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
+        $customerAddressesGrid->resetFilter();
+        $customerAddressesGrid->openFirstRow();
+        if ($this->getCustomerAddressModalForm()->isVisible()) {
+            $address = $this->getCustomerAddressModalForm()
+                ->getData($address, $this->browser->find($this->customerAddressModalForm));
+        }
+
+        return $address;
+    }
+
     /**
      * Get data to fields on tab.
      *
@@ -206,6 +243,7 @@ public function getFieldsData($fields = null, SimpleElement $element = null)
     protected function addNewAddress()
     {
         $this->_rootElement->find($this->addNewAddress)->click();
+        $this->waitForElementVisible($this->customerAddressModalForm);
     }
 
     /**
@@ -216,31 +254,24 @@ protected function addNewAddress()
      */
     protected function openCustomerAddress($addressNumber)
     {
-        $addressTab = $this->_rootElement->find(
-            sprintf($this->customerAddress, $addressNumber),
-            Locator::SELECTOR_XPATH
-        );
-
-        if (!$addressTab->isVisible()) {
+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
+        if (!$customerAddressesGrid->getFirstRow()->isVisible()) {
             throw new \Exception("Can't open customer address #{$addressNumber}");
         }
-        $addressTab->click();
+        $customerAddressesGrid->openFirstRow();
     }
 
     /**
      * Check is visible customer address.
      *
-     * @param int $addressNumber
      * @return bool
      */
-    protected function isVisibleCustomerAddress($addressNumber)
+    protected function isVisibleCustomerAddress()
     {
-        $addressTab = $this->_rootElement->find(
-            sprintf($this->customerAddress, $addressNumber),
-            Locator::SELECTOR_XPATH
-        );
+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
+        $customerAddressesGrid->isFirstRowVisible();
 
-        return $addressTab->isVisible();
+        return $customerAddressesGrid->isFirstRowVisible();
     }
 
     /**
@@ -279,24 +310,43 @@ public function getCountriesList($addressNumber)
      */
     public function deleteCustomerAddress(Address $addressToDelete)
     {
-        $addressRenderer = $this->objectManager->create(
-            \Magento\Customer\Test\Block\Address\Renderer::class,
-            ['address' => $addressToDelete, 'type' => 'html']
-        );
-        $addressToDelete = $addressRenderer->render();
+        $customerAddressesGrid = $this->getCustomerAddressesGrid();
+        $customerAddressesGrid->deleteCustomerAddress($addressToDelete->getData());
 
-        $dataList = explode("\n", $addressToDelete);
-        $dataList = implode("') and contains(.,'", $dataList);
+        return $this;
+    }
 
-        $this->_rootElement
-            ->find(sprintf($this->addressSelector, $dataList), Locator::SELECTOR_XPATH)
-            ->find($this->deleteAddress)->click();
+    /**
+     * Get new/update customer address modal form.
+     *
+     * @return \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressForm
+     */
+    public function getCustomerAddressModalForm()
+    {
+        return $this->blockFactory->create(
+            \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressForm::class,
+            ['element' => $this->browser->find($this->customerAddressModalForm)]
+        );
+    }
 
-        $element = $this->browser->find($this->confirmModal);
-        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
-        $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
-        $modal->acceptAlert();
+    /**
+     * Get customer addresses grid.
+     *
+     * @return \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressesGrid
+     */
+    public function getCustomerAddressesGrid()
+    {
+        return $this->blockFactory->create(
+            \Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses\AddressesGrid::class,
+            ['element' => $this->browser->find($this->customerAddressesGrid)]
+        );
+    }
 
-        return $this;
+    /**
+     * Wait for addresses grid rendering
+     */
+    public function waitForAddressesGrid()
+    {
+        $this->waitForElementVisible($this->customerAddressesGrid);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
deleted file mode 100644
index 8e16226adcc3f..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<mapping strict="0">
-    <fields>
-        <prefix>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[prefix]"]</selector>
-            <strategy>css selector</strategy>
-        </prefix>
-        <firstname>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[firstname]"]</selector>
-            <strategy>css selector</strategy>
-        </firstname>
-        <middlename>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[middlename]"]</selector>
-            <strategy>css selector</strategy>
-        </middlename>
-        <lastname>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[lastname]"]</selector>
-            <strategy>css selector</strategy>
-        </lastname>
-        <suffix>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[suffix]"]</selector>
-            <strategy>css selector</strategy>
-        </suffix>
-        <company>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[company]"]</selector>
-            <strategy>css selector</strategy>
-        </company>
-        <street>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[street][0]"]</selector>
-            <strategy>css selector</strategy>
-        </street>
-        <city>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[city]"]</selector>
-            <strategy>css selector</strategy>
-        </city>
-        <country_id>
-            <input>select</input>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[country_id]"]</selector>
-            <strategy>css selector</strategy>
-        </country_id>
-        <region_id>
-            <input>select</input>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[region_id]"]</selector>
-            <strategy>css selector</strategy>
-        </region_id>
-        <region>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[region]"]</selector>
-            <strategy>css selector</strategy>
-        </region>
-        <postcode>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[postcode]"]</selector>
-            <strategy>css selector</strategy>
-        </postcode>
-        <telephone>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[telephone]"]</selector>
-            <strategy>css selector</strategy>
-        </telephone>
-        <fax>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[fax]"]</selector>
-            <strategy>css selector</strategy>
-        </fax>
-        <vat_id>
-            <selector>.address-item-edit:not([style="display: none;"]) [name$="[vat_id]"]</selector>
-            <strategy>css selector</strategy>
-        </vat_id>
-        <default_billing>
-            <selector>.ui-state-active [name$="[default_billing]"]</selector>
-            <input>checkbox</input>
-        </default_billing>
-        <default_shipping>
-            <selector>.ui-state-active [name$="[default_shipping]"]</selector>
-            <input>checkbox</input>
-        </default_shipping>
-    </fields>
-</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php
new file mode 100644
index 0000000000000..029836d21433c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+
+/**
+ * Create/Edit customer address.
+ */
+class AddressForm extends Form
+{
+    /**
+     * Save address button
+     *
+     * @var string
+     */
+    protected $saveAddressButton = '#save';
+
+    /**
+     * cancel button
+     *
+     * @var string
+     */
+    protected $cancelButton = '#cancel';
+
+    /**
+     * Loader mask
+     *
+     * @var string
+     */
+    private $loader = '.popup-loading';
+
+    /**
+     * Field with Mage error.
+     *
+     * @var string
+     */
+    private $mageErrorField = '//fieldset/*[contains(@class,"field ")][.//*[contains(@class,"error")]]';
+
+    /**
+     * Fields label with mage error.
+     *
+     * @var string
+     */
+    private $mageErrorLabel = './/*[contains(@class,"label")]';
+
+    /**
+     * Mage error text.
+     *
+     * @var string
+     */
+    private $mageErrorText = './/label[contains(@class,"error")]';
+
+    /**
+     * Fill address form by provided data
+     *
+     * @param \Magento\Mtf\Fixture\FixtureInterface $address
+     * @return void
+     * @throws \Exception
+     */
+    public function fillAddressData(\Magento\Mtf\Fixture\FixtureInterface $address)
+    {
+        $this->waitForElementNotVisible($this->loader);
+        $this->setFieldsData($address->getData(), $this->_rootElement);
+    }
+
+    /**
+     * Fill data into fields in the container.
+     *
+     * @param array $fields
+     * @param \Magento\Mtf\Client\Element\SimpleElement|null $contextElement
+     * @return void
+     * @throws \Exception
+     */
+    public function setFieldsData(array $fields, \Magento\Mtf\Client\Element\SimpleElement $contextElement = null): void
+    {
+        $data = $this->dataMapping($fields);
+        $this->_fill($data, $contextElement);
+    }
+
+    /**
+     * Save customer address
+     *
+     * @return void
+     */
+    public function saveAddress(): void
+    {
+        $this->_rootElement->find($this->saveAddressButton)->click();
+        $this->waitForElementNotVisible($this->loader);
+    }
+
+    /**
+     * Close create/update address modal
+     *
+     * @return void
+     */
+    public function clickCancelButton(): void
+    {
+        $this->_rootElement->find($this->cancelButton)->click();
+    }
+
+    /**
+     * Get array of label => js error text.
+     *
+     * @return array
+     */
+    public function getJsErrors(): array
+    {
+        $data = [];
+        $elements = $this->_rootElement->getElements($this->mageErrorField, Locator::SELECTOR_XPATH);
+        foreach ($elements as $element) {
+            $error = $element->find($this->mageErrorText, Locator::SELECTOR_XPATH);
+            if ($error->isVisible()) {
+                $label = $element->find($this->mageErrorLabel, Locator::SELECTOR_XPATH)->getText();
+                $data[$label] = $error->getText();
+            }
+        }
+        return $data;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml
new file mode 100644
index 0000000000000..c56c6479dcb38
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressForm.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <prefix>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="prefix"]</selector>
+            <strategy>css selector</strategy>
+        </prefix>
+        <firstname>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="firstname"]</selector>
+            <strategy>css selector</strategy>
+        </firstname>
+        <middlename>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="middlename"]</selector>
+            <strategy>css selector</strategy>
+        </middlename>
+        <lastname>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="lastname"]</selector>
+            <strategy>css selector</strategy>
+        </lastname>
+        <suffix>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="suffix"]</selector>
+            <strategy>css selector</strategy>
+        </suffix>
+        <company>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="company"]</selector>
+            <strategy>css selector</strategy>
+        </company>
+        <street>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="street[0]"]</selector>
+            <strategy>css selector</strategy>
+        </street>
+        <city>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="city"]</selector>
+            <strategy>css selector</strategy>
+        </city>
+        <country_id>
+            <input>select</input>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="country_id"]</selector>
+            <strategy>css selector</strategy>
+        </country_id>
+        <region_id>
+            <input>select</input>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="region_id"]</selector>
+            <strategy>css selector</strategy>
+        </region_id>
+        <region>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="region"]</selector>
+            <strategy>css selector</strategy>
+        </region>
+        <postcode>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="postcode"]</selector>
+            <strategy>css selector</strategy>
+        </postcode>
+        <telephone>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="telephone"]</selector>
+            <strategy>css selector</strategy>
+        </telephone>
+        <fax>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="fax"]</selector>
+            <strategy>css selector</strategy>
+        </fax>
+        <vat_id>
+            <selector>.admin__fieldset:not([style="display: none;"]) [name="vat_id"]</selector>
+            <strategy>css selector</strategy>
+        </vat_id>
+        <default_billing>
+            <selector>.admin__fieldset:not([style="display: none;"]) input[name='default_billing']</selector>
+            <input>switcher</input>
+        </default_billing>
+        <default_shipping>
+            <selector>.admin__fieldset:not([style="display: none;"]) input[name='default_shipping']</selector>
+            <input>switcher</input>
+        </default_shipping>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php
new file mode 100644
index 0000000000000..ef1fb09c8f839
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses/AddressesGrid.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses;
+
+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+
+/**
+ * Class AddressesGrid
+ * Backend customer addresses grid
+ *
+ */
+class AddressesGrid extends DataGrid
+{
+    /**
+     * Locator value for link in action column
+     *
+     * @var string
+     */
+    protected $editLink = '//tr[@class="data-row"][1]//a[@data-action="item-edit"]';
+
+    /**
+     * First row selector
+     *
+     * @var string
+     */
+    protected $firstRowSelector = '//tr[@class="data-row"][1]';
+
+    /**
+     * Customer address grid loader.
+     *
+     * @var string
+     */
+    protected $loader = '.customer_form_areas_address_address_customer_address_listing [data-role="spinner"]';
+
+    /**
+     * Filters array mapping
+     *
+     * @var array
+     */
+    protected $filters = [
+        'firstname' => [
+            'selector' => '.admin__data-grid-filters input[name*=firstname]',
+        ],
+        'lastname' => [
+            'selector' => '.admin__data-grid-filters input[name*=lastname]',
+        ],
+        'street' => [
+            'selector' => '.admin__data-grid-filters input[name*=street]',
+        ],
+        'city' => [
+            'selector' => '.admin__data-grid-filters input[name*=city]',
+        ],
+        'region_id' => [
+            'selector' => '.admin__data-grid-filters input[name*=region]',
+        ],
+        'postcode' => [
+            'selector' => '.admin__data-grid-filters input[name*=postcode]',
+        ],
+        'telephone' => [
+            'selector' => '.admin__data-grid-filters input[name*=telephone]',
+        ],
+        'country_id' => [
+            'selector' => '.admin__data-grid-filters select[name*=country]',
+            'input' => 'select',
+        ],
+
+    ];
+
+    /**
+     * Select action toggle.
+     *
+     * @var string
+     */
+    private $selectAction = '.action-select';
+
+    /**
+     * Delete action toggle.
+     *
+     * @var string
+     */
+    private $deleteAddress = '[data-action="item-delete"]';
+
+    /**
+     * Locator value for "Edit" link inside action column.
+     *
+     * @var string
+     */
+    private $editAddress = '[data-action="item-edit"]';
+
+    /**
+     * Customer address modal window.
+     *
+     * @var string
+     */
+    private $customerAddressModalForm = '.customer_form_areas_address_address_customer_address_update_modal';
+
+    /**
+     * Search customer address by filter.
+     *
+     * @param array $filter
+     * @return void
+     */
+    public function search(array $filter): void
+    {
+        parent::search(array_intersect_key($filter, $this->filters));
+    }
+
+    /**
+     * Delete customer address by filter
+     *
+     * @param array $filter
+     * @return void
+     * @throws \Exception
+     */
+    public function deleteCustomerAddress(array $filter): void
+    {
+        $this->search($filter);
+        $rowItem = $this->getRow([$filter['firstname']]);
+        if ($rowItem->isVisible()) {
+            $this->deleteRowItemAddress($rowItem);
+        } else {
+            throw new \Exception("Searched item was not found by filter\n" . print_r($filter, true));
+        }
+    }
+
+    /**
+     * @param \Magento\Mtf\Client\Element\SimpleElement $rowItem
+     * @return void
+     */
+    public function deleteRowItemAddress(\Magento\Mtf\Client\Element\SimpleElement $rowItem): void
+    {
+        $rowItem->find($this->selectAction)->click();
+        $rowItem->find($this->deleteAddress)->click();
+        $modalElement = $this->browser->find($this->confirmModal);
+        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
+        $modal = $this->blockFactory->create(
+            \Magento\Ui\Test\Block\Adminhtml\Modal::class,
+            ['element' => $modalElement]
+        );
+        $modal->acceptAlert();
+        $this->waitLoader();
+    }
+
+    /**
+     * Open first row from the addresses grid
+     *
+     * @return void
+     */
+    public function openFirstRow(): void
+    {
+        $firstRow = $this->getFirstRow();
+        if ($firstRow->isVisible()) {
+            $firstRow->find($this->selectAction)->click();
+            $firstRow->find($this->editAddress)->click();
+            $this->waitForElementVisible($this->customerAddressModalForm);
+            $this->waitLoader();
+        }
+    }
+
+    /**
+     * Get first row from the grid
+     *
+     * @return \Magento\Mtf\Client\Element\SimpleElement
+     */
+    public function getFirstRow(): \Magento\Mtf\Client\Element\SimpleElement
+    {
+        return $this->_rootElement->find($this->firstRowSelector, \Magento\Mtf\Client\Locator::SELECTOR_XPATH);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
index dcdf041761559..7722645b3fde3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
@@ -6,14 +6,22 @@
 
 namespace Magento\Customer\Test\Block\Adminhtml\Group;
 
-use Magento\Backend\Test\Block\Widget\Grid;
+use \Magento\Ui\Test\Block\Adminhtml\DataGrid;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class CustomerGroupGrid
  * Adminhtml customer group grid
  */
-class CustomerGroupGrid extends Grid
+class CustomerGroupGrid extends DataGrid
 {
+    /**
+     * Select action toggle.
+     *
+     * @var string
+     */
+    protected $selectAction = '.action-select';
+
     /**
      * Initialize block elements
      *
@@ -21,14 +29,25 @@ class CustomerGroupGrid extends Grid
      */
     protected $filters = [
         'code' => [
-            'selector' => '#customerGroupGrid_filter_type',
+            'selector' => '.admin__data-grid-filters input[name*=customer_group_code]',
+        ],
+        'tax_class_id' => [
+            'selector' => '.admin__data-grid-filters select[name*=tax_class_id]',
+            'input' => 'select'
         ],
     ];
 
     /**
-     * Locator value for grid to click
+     * Click on "Edit" link.
      *
-     * @var string
+     * @param SimpleElement $rowItem
+     * @return void
      */
-    protected $editLink = 'td[data-column="time"]';
+    protected function clickEditLink(SimpleElement $rowItem)
+    {
+        if ($rowItem->find($this->selectAction)->isVisible()) {
+            $rowItem->find($this->selectAction)->click();
+        }
+        $rowItem->find($this->editLink)->click();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
index 763c6cd159ca0..abfee067a73de 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
@@ -32,7 +32,7 @@ public function processAssert(CustomerAccountIndex $customerAccountIndex, Addres
         )->render();
         $isAddressExists = $customerAccountIndex->getAdditionalAddressBlock()
             ->isAdditionalAddressExists($addressRenderer);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isAddressExists,
             'Customers address is absent in customer address book.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressDeletedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressDeletedFrontend.php
index fc920521eca4c..54e724fea7300 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressDeletedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressDeletedFrontend.php
@@ -30,7 +30,7 @@ public function processAssert(CustomerAccountIndex $customerAccountIndex)
         $customerAccountIndex->open();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Address Book');
         $actualText = $customerAccountIndex->getAdditionalAddressBlock()->getBlockText();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             self::EXPECTED_MESSAGE == $actualText,
             'Expected text is absent in Additional Address block.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
index 407bc22e19044..b4edec660c531 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
@@ -43,7 +43,7 @@ public function processAssert(
             ['address' => $deletedAddress]
         );
         $addressToSearch = $addressRenderer->render();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             in_array($addressToSearch, $actualAddresses),
             'Deleted address is present on backend during order creation'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
index f11f955cb9797..a9dc473fe453e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
@@ -54,7 +54,7 @@ public function processAssert(
             $isAddressDeleted = true;
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isAddressDeleted,
             'Customer address was not deleted.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
index 1cc0a94f8812b..8d14811554149 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
@@ -18,7 +18,7 @@ class AssertChangePasswordFailMessage extends AbstractConstraint
     /**
      * Fail message
      */
-    const FAIL_MESSAGE = 'The password doesn\'t match this account.';
+    const FAIL_MESSAGE = "The password doesn't match this account. Verify the password and try again.";
 
     /**
      * Assert that fail message is present
@@ -28,7 +28,7 @@ class AssertChangePasswordFailMessage extends AbstractConstraint
      */
     public function processAssert(CustomerAccountEdit $customerAccountEdit)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::FAIL_MESSAGE,
             $customerAccountEdit->getMessages()->getErrorMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangingWebsiteChangeCountries.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangingWebsiteChangeCountries.php
index dbdcad25a3f89..0ad21548e17c3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangingWebsiteChangeCountries.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangingWebsiteChangeCountries.php
@@ -37,7 +37,7 @@ public function processAssert(
         $countriesList = $tab->getCountriesList(1);
         sort($countriesList);
         sort($expectedList);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $countriesList,
             $expectedList,
             'Wrong country list is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php
new file mode 100644
index 0000000000000..46bb8ce72abb1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressBackendRequiredFields.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Constraint;
+
+use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert required fields on customer address form.
+ */
+class AssertCustomerAddressBackendRequiredFields extends AbstractConstraint
+{
+    /**
+     * Expected message.
+     */
+    const REQUIRE_MESSAGE = 'This is a required field.';
+
+    /**
+     * Assert required fields on customer address form.
+     * @param CustomerIndexNew $customerNewPage
+     * @param array $expectedRequiredFields
+     * @return void
+     * @throws \Exception
+     */
+    public function processAssert(CustomerIndexNew $customerNewPage, array $expectedRequiredFields): void
+    {
+        $actualRequiredFields = $customerNewPage->getCustomerForm()->getTab('addresses')
+            ->getCustomerAddressModalForm()->getJsErrors();
+        foreach ($expectedRequiredFields as $field) {
+            \PHPUnit\Framework\Assert::assertTrue(
+                isset($actualRequiredFields[$field]),
+                "Field '$field' is not highlighted with an JS error."
+            );
+            \PHPUnit\Framework\Assert::assertEquals(
+                self::REQUIRE_MESSAGE,
+                $actualRequiredFields[$field],
+                "Field '$field' is not highlighted as required."
+            );
+        }
+    }
+
+    /**
+     * Return string representation of object.
+     *
+     * @return string
+     */
+    public function toString(): string
+    {
+        return 'All required fields on customer form are highlighted.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
index 9ed1b3a4cf4ca..02189cbd60183 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
@@ -29,7 +29,7 @@ class AssertCustomerAddressSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CustomerAccountIndex $customerAccountIndex)
     {
         $successMessage = $customerAccountIndex->getMessages()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendBackButton.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendBackButton.php
index d1ffc7393c36d..6aaa90f2eceed 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendBackButton.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendBackButton.php
@@ -25,7 +25,7 @@ class AssertCustomerBackendBackButton extends AbstractConstraint
     public function processAssert(CustomerIndexEdit $customerEditPage, CustomerIndex $customerGridPage)
     {
         $customerEditPage->getPageActionsBlock()->back();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerGridPage->getCustomerGridBlock()->isVisible(),
             'Clicking on "Back" button does not redirect to customers grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendDuplicateErrorMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendDuplicateErrorMessage.php
index d4658cd2206c4..a6f6e8f935cb1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendDuplicateErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendDuplicateErrorMessage.php
@@ -17,7 +17,7 @@ class AssertCustomerBackendDuplicateErrorMessage extends AbstractConstraint
     /**
      * Error save message text.
      */
-    const ERROR_SAVE_MESSAGE = 'A customer with the same email already exists in an associated website.';
+    const ERROR_SAVE_MESSAGE = 'A customer with the same email address already exists in an associated website.';
 
     /**
      * Asserts that error message is displayed while creating customer with the same email.
@@ -28,7 +28,7 @@ class AssertCustomerBackendDuplicateErrorMessage extends AbstractConstraint
     public function processAssert(CustomerIndex $customerIndexPage)
     {
         $actualMessage = $customerIndexPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_SAVE_MESSAGE,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendFormTitle.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendFormTitle.php
index 9d73f8f1b2960..c0d1a0aa2fe16 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendFormTitle.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendFormTitle.php
@@ -28,7 +28,7 @@ class AssertCustomerBackendFormTitle extends AbstractConstraint
      */
     public function processAssert(CustomerAccountIndex $pageCustomerIndex, Customer $customer)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $customer->getFirstname() . ' ' . $customer->getLastname(),
             $pageCustomerIndex->getTitleBlock()->getTitle(),
             'Wrong page title is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendRequiredFields.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendRequiredFields.php
index a6f749a14b3f1..31fafc8edcbd2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendRequiredFields.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendRequiredFields.php
@@ -30,11 +30,11 @@ public function processAssert(CustomerIndexNew $customerNewPage, array $expected
     {
         $actualRequiredFields = $customerNewPage->getCustomerForm()->getJsErrors();
         foreach ($expectedRequiredFields as $field) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 isset($actualRequiredFields[$field]),
                 "Field '$field' is not highlighted with an JS error."
             );
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 self::REQUIRE_MESSAGE,
                 $actualRequiredFields[$field],
                 "Field '$field' is not highlighted as required."
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php
index 36c5b41a86623..275e82a06421d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddressFrontendAddressBook.php
@@ -44,7 +44,7 @@ public function processAssert(
                 $validated && ($billingAddressRendered == $this->createAddressRenderer($billingAddress)->render());
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $validated,
             'Customer default address on address book tab is not matching the fixture.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
index 07e4717fda4a6..3768bab85a33a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint
      */
     public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)
     {
-        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');
+        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account');
         sleep(6);
         $defaultBillingAddress = explode(
             "\n",
@@ -39,7 +39,7 @@ public function processAssert(CustomerAccountIndex $customerAccountIndex, Addres
         $shippingDataDiff = $this->verifyForm($pattern, $defaultShippingAddress);
         $dataDiff = array_merge($billingDataDiff, $shippingDataDiff);
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $dataDiff,
             'Billing or shipping form was filled incorrectly.'
             . "\nLog:\n" . implode(";\n", $dataDiff)
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDoesNotHaveDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDoesNotHaveDefaultAddresses.php
index 8794c681d969e..cd75a8c68c89a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDoesNotHaveDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDoesNotHaveDefaultAddresses.php
@@ -48,7 +48,7 @@ public function processAssert(CustomerAccountIndex $customerAccountIndex)
             ]
         ];
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedAddressesTextValues,
             $actualAddressesTextValues,
             'Customer has default shipping/billing address but should not.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
index 943a80868a18e..316cf09d77162 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
@@ -23,7 +23,7 @@ class AssertCustomerFailRegisterMessage extends AbstractConstraint
     public function processAssert(CustomerAccountCreate $registerPage)
     {
         $errorMessage = $registerPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertNotEmpty(
+        \PHPUnit\Framework\Assert::assertNotEmpty(
             $errorMessage,
             'No error message is displayed.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForgotPasswordSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForgotPasswordSuccessMessage.php
index 73fc3489fc96d..38ea62e719fd6 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForgotPasswordSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForgotPasswordSuccessMessage.php
@@ -29,7 +29,7 @@ public function processAssert(
         CustomerAccountLogin $customerLogin,
         Customer $customer
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_MESSAGE, $customer->getEmail()),
             $customerLogin->getMessages()->getSuccessMessage(),
             'Wrong forgot password message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
index 0edf85ea4bfc7..d7f2dc433eba8 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
@@ -91,7 +91,7 @@ public function processAssert(
 
         $dataForm = $pageCustomerIndexEdit->getCustomerForm()->getDataCustomer($customer, $address);
         $dataDiff = $this->verify($data, $dataForm);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($dataDiff),
             'Customer data on edit page(backend) not equals to passed from fixture.'
             . "\nFailed values: " . implode(', ', $dataDiff)
@@ -148,13 +148,13 @@ private function assertCustomerGroupName(Customer $customer, array $formData)
         $customerGroupName = $customer->getGroupId();
 
         if ($customerGroupName) {
-            \PHPUnit_Framework_Assert::assertNotEmpty(
+            \PHPUnit\Framework\Assert::assertNotEmpty(
                 $formData['customer']['group_id'],
                 'Customer Group value is empty.'
             );
 
             if (!empty($formData['customer']['group_id'])) {
-                \PHPUnit_Framework_Assert::assertContains(
+                \PHPUnit\Framework\Assert::assertContains(
                     $customerGroupName,
                     $formData['customer']['group_id'],
                     'Customer Group name is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
index d00c60cf9b65c..3f80e3b7bf1ea 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
@@ -25,7 +25,7 @@ class AssertCustomerGroupAlreadyExists extends AbstractConstraint
     public function processAssert(CustomerGroupNew $customerGroupNew)
     {
         $actualMessage = $customerGroupNew->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
index a318f8e27707b..10e31f333be43 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
@@ -33,7 +33,7 @@ public function processAssert(
     ) {
         $customerIndexEdit->open(['id' => $customer->getId()]);
         $customerFormData = $customerIndexNew->getCustomerForm()->getData($customer);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerFormData['group_id'] == $defaultCustomerGroup->getCustomerGroupCode(),
             "Customer group not set to default after group was deleted."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupFieldsDisabled.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupFieldsDisabled.php
index 4bcebf9772be4..b29f703ceb731 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupFieldsDisabled.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupFieldsDisabled.php
@@ -27,7 +27,7 @@ public function processAssert(
         array $disabledFields
     ) {
         foreach ($disabledFields as $field) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $customerGroupEdit->getPageMainForm()->isFieldDisabled($field),
                 "Field $field is not disabled."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
index b0c42134800d8..f5a7f3a262a60 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
@@ -55,7 +55,7 @@ public function processAssert(
         $customerGroupIndex->getCustomerGroupGrid()->searchAndOpen($filter);
         $formData = $customerGroupNew->getPageMainForm()->getData();
         $dataDiff = $this->verifyForm($formData, $data);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($dataDiff),
             'Customer Group form was filled incorrectly.'
             . "\nLog:\n" . implode(";\n", $dataDiff)
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
index 19cc467b8f4d2..ff7bf2bab6742 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
@@ -32,7 +32,7 @@ public function processAssert(
     ) {
         $customerGroupIndex->open();
         $filter = ['code' => $customerGroup->getCustomerGroupCode()];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerGroupIndex->getCustomerGroupGrid()->isRowVisible($filter),
             'Group with type \'' . $customerGroup->getCustomerGroupCode() . '\'is absent in customer groups grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
index c6ecba9b7cfbf..03542995dcbd4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
@@ -28,7 +28,7 @@ public function processAssert(
     ) {
         $customerGroupIndex->open();
         $filter = ['code' => $customerGroup->getCustomerGroupCode()];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $customerGroupIndex->getCustomerGroupGrid()->isRowVisible($filter),
             'Group with name \'' . $customerGroup->getCustomerGroupCode() . '\' in customer groups grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCartPriceRuleForm.php
index 010d537651ff8..625b140fc165e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCartPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCartPriceRuleForm.php
@@ -32,7 +32,7 @@ public function processAssert(
 
         /** @var RuleInformation $ruleInformationTab */
         $ruleInformationTab = $promoQuoteNew->getSalesRuleForm()->getSection('rule_information');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $ruleInformationTab->isVisibleCustomerGroup($customerGroup),
             "Customer group {$customerGroup->getCustomerGroupCode()} is still in cart price rule page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCatalogPriceRuleForm.php
index 08a7e3039a1ca..ae2083bd8888f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCatalogPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCatalogPriceRuleForm.php
@@ -32,7 +32,7 @@ public function processAssert(
 
         /** @var RuleInformation $ruleInformationSection */
         $ruleInformationSection = $catalogRuleNew->getEditForm()->getSection('rule_information');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $ruleInformationSection->isVisibleCustomerGroup($customerGroup),
             "Customer group {$customerGroup->getCustomerGroupCode()} is still in catalog price rule page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnProductForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnProductForm.php
index f04f6d6c2a7c0..da8a48f8805a0 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnProductForm.php
@@ -36,7 +36,7 @@ public function processAssert(
 
         /** @var AdvancedPricing $advancedPricingTab */
         $advancedPricingTab = $catalogProductNew->getProductForm()->getSection('advanced-pricing');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $advancedPricingTab->getTierPriceForm()->isVisibleCustomerGroup($customerGroup),
             "Customer group {$customerGroup->getCustomerGroupCode()} is still in tier price form on product page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCartPriceRuleForm.php
index 493b85b2347f1..831160fa2d57d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCartPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCartPriceRuleForm.php
@@ -36,7 +36,7 @@ public function processAssert(
 
         /** @var RuleInformation $ruleInformationTab */
         $ruleInformationTab = $promoQuoteNew->getSalesRuleForm()->getSection('rule_information');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $ruleInformationTab->isVisibleCustomerGroup($customerGroup),
             "Customer group {$customerGroup->getCustomerGroupCode()} not in cart price rule page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCatalogPriceRuleForm.php
index accda8f9a1b9c..2e4f6cdd7455a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCatalogPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCatalogPriceRuleForm.php
@@ -36,7 +36,7 @@ public function processAssert(
 
         /** @var RuleInformation $ruleInformationSection */
         $ruleInformationSection = $catalogRuleNew->getEditForm()->getSection('rule_information');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $ruleInformationSection->isVisibleCustomerGroup($customerGroup),
             "Customer group {$customerGroup->getCustomerGroupCode()} not in catalog price rule page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
index c69c37477cc03..4025a73ed432b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
@@ -51,7 +51,7 @@ public function processAssert(
         $customerFixtureData = $customer->getData();
         $diff = array_diff($customerFixtureData, $customerFormData);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($diff),
             "Customer group {$customerGroup->getCustomerGroupCode()} not in account information page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnProductForm.php
index 6241bc9e40e04..2fe5a7dee8492 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnProductForm.php
@@ -36,7 +36,7 @@ public function processAssert(
 
         /** @var AdvancedPricing $advancedPricingTab */
         $advancedPricingTab = $catalogProductNew->getProductForm()->getSection('advanced-pricing');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $advancedPricingTab->getTierPriceForm()->isVisibleCustomerGroup($customerGroup),
             "Customer group {$customerGroup->getCustomerGroupCode()} not in tier price form on product page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
index 7dd66de818538..cc01cfbffbdd9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertCustomerGroupSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CustomerGroupIndex $customerGroupIndex)
     {
         $actualMessage = $customerGroupIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
index 3db4bddd08a7d..681da9f220ebe 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCustomerGroupSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CustomerGroupIndex $customerGroupIndex)
     {
         $actualMessage = $customerGroupIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
index c58b58a095000..470aecc4a15e0 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
@@ -62,7 +62,7 @@ public function processAssert(
 
         $errorMessage .= 'is absent in Customer grid.';
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $pageCustomerIndex->getCustomerGridBlock()->isRowVisible($filter, false),
             $errorMessage
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
index b0c1fa97793a5..2cbb7f2ba1a72 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
@@ -29,7 +29,7 @@ class AssertCustomerInfoSuccessSavedMessage extends AbstractConstraint
     public function processAssert(CustomerAccountIndex $customerAccountIndex)
     {
         $successMessage = $customerAccountIndex->getMessages()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
index 1a8d20a883b6e..7ea3747cc7927 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
@@ -29,7 +29,7 @@ public function processAssert(CustomerIndexNew $pageCustomerIndexNew)
         $expectMessage = self::ERROR_EMAIL_MESSAGE;
         $actualMessage = $pageCustomerIndexNew->getMessagesBlock()->getErrorMessage();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php
index 9285fc9e0d4fa..132f5d44e41c4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php
@@ -32,7 +32,7 @@ public function processAssert(
         Customer $customer
     ) {
         $customerIndexEdit->open(['id' => $customer->getId()]);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::CUSTOMER_LOCKED_ACCOUNT,
             $customerIndexEdit->getCustomerForm()->getPersonalInformation('Account Lock'),
             'Incorrect customer account status.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogin.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogin.php
index 770890192c95d..e138ce9159fe1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogin.php
@@ -29,7 +29,7 @@ public function processAssert(CmsIndex $cmsIndex, Customer $customer)
             ['customer' => $customer]
         )->run();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsIndex->getLinksBlock()->isAuthorizationVisible(),
             "Authorisation link is visible after Login attempt."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLoginErrorMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLoginErrorMessage.php
index 9cc30b25d37e7..83784563f4fa2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLoginErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLoginErrorMessage.php
@@ -17,7 +17,8 @@ class AssertCustomerLoginErrorMessage extends AbstractConstraint
     /**
      * Customer login error message.
      */
-    const ERROR_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
+    const ERROR_MESSAGE =
+        'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.';
 
     /**
      * Assert that customer login error message is displayed.
@@ -28,7 +29,7 @@ class AssertCustomerLoginErrorMessage extends AbstractConstraint
     public function processAssert(
         CustomerAccountLogin $customerLogin
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $customerLogin->getMessages()->getErrorMessage(),
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogout.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogout.php
index 5bdf198177c20..9e6b3dfad4966 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogout.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerLogout.php
@@ -41,7 +41,7 @@ public function processAssert(CustomerAccountIndex $customerAccountIndex, CmsInd
         $cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible(self::LOGOUT_PAGE_TITLE);
         $cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible(self::HOME_PAGE_TITLE);
         $cmsIndex->getCmsPageBlock()->waitPageInit();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getLinksBlock()->isLinkVisible('Sign In'),
             "Customer wasn't logged out."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
index 30a353a98cc14..bf60ee2db98dc 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
@@ -29,7 +29,7 @@ class AssertCustomerMassDeleteSuccessMessage extends AbstractConstraint
      */
     public function processAssert($customersQtyToDelete, CustomerIndex $customerIndexPage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_DELETE_MESSAGE, $customersQtyToDelete),
             $customerIndexPage->getMessagesBlock()->getSuccessMessage(),
             'Wrong delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNameFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNameFrontend.php
index f8fd647a7e4c2..ef455d1fc48f6 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNameFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNameFrontend.php
@@ -35,7 +35,7 @@ public function processAssert(
         $infoBlock = $customerAccountIndex->getInfoBlock()->getContactInfoContent();
         $infoBlock = explode(PHP_EOL, $infoBlock);
         $nameInDashboard = $infoBlock[0];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $nameInDashboard == $customerName,
             'Customer name in Contact info block is not matching the fixture.'
         );
@@ -43,7 +43,7 @@ public function processAssert(
         $customerAccountIndex->getInfoBlock()->openEditContactInfo();
         $nameInEdit = $customerAccountEdit->getAccountInfoForm()->getFirstName()
             . " " . $customerAccountEdit->getAccountInfoForm()->getLastName();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $nameInEdit == $customerName,
             'Customer name on Account info tab is not matching the fixture.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
index a176ac0c57894..3b9e8d8b5bbbb 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
@@ -28,7 +28,7 @@ public function processAssert(
         CustomerIndex $customerIndexPage
     ) {
         $customerIndexPage->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $customerIndexPage->getCustomerGridBlock()->isRowVisible(['email' => $customer->getEmail()]),
             'Customer with email ' . $customer->getEmail() . 'is present in Customer grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnAuthorizationPopup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnAuthorizationPopup.php
index e7bb34e44562a..f08a83fd03de5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnAuthorizationPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnAuthorizationPopup.php
@@ -29,7 +29,7 @@ public function processAssert(
         $cartPage->open();
         $cartPage->getProceedToCheckoutBlock()->proceedToCheckout();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $checkoutPage->getAuthenticationPopupBlock()->isPasswordAutocompleteOff(),
             'Password field autocomplete is not off.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnSignIn.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnSignIn.php
index 656f8ff640571..b989e72f5b02d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnSignIn.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordAutocompleteOnSignIn.php
@@ -23,7 +23,7 @@ class AssertCustomerPasswordAutocompleteOnSignIn extends AbstractConstraint
     public function processAssert(CustomerAccountLogin $loginPage)
     {
         $loginPage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $loginPage->getLoginBlock()->isPasswordAutocompleteOff(),
             'Password field autocomplete is not off.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
index 1827b89b07597..9e7a46a383696 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
@@ -52,7 +52,7 @@ public function processAssert(
             ['customer' => $customer]
         )->run();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerAccountIndex->getAccountMenuBlock()->isVisible(),
             'Customer Account Dashboard is not visible.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
index e5201d18b3fd4..61e42e3dd60c5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
@@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint
     /**
      * Dashboard Message on account index page.
      */
-    const DASHBOARD_MESSAGE = 'My Dashboard';
+    const DASHBOARD_MESSAGE = 'My Account';
 
     /**
      * Constraint severeness
@@ -34,7 +34,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint
      */
     public function processAssert(CustomerAccountIndex $accountIndexPage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::DASHBOARD_MESSAGE,
             $accountIndexPage->getTitleBlock()->getTitle(),
             'Wrong dashboard title is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
index c9ccace314aa9..886c71e016d63 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertCustomerSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(CustomerIndex $customerIndexPage)
     {
         $actualMessage = $customerIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
index b313c102c78e4..f418a176ac82e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
@@ -25,7 +25,7 @@ class AssertCustomerSuccessRegisterMessage extends AbstractConstraint
     public function processAssert(CustomerAccountCreate $registerPage)
     {
         $actualMessage = $registerPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
index f50029cc01930..a1241b738f06d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
@@ -26,7 +26,7 @@ class AssertCustomerSuccessSaveMessage extends AbstractConstraint
     public function processAssert(CustomerIndex $pageCustomerIndex)
     {
         $actualMessage = $pageCustomerIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
index 9877ea3d53e03..8c8e1de7b98ed 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
@@ -35,7 +35,7 @@ class AssertMassActionSuccessUpdateMessage extends AbstractConstraint
     public function processAssert(array $customers, CustomerIndex $pageCustomerIndex)
     {
         $actualMessage = $pageCustomerIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(sprintf(self::UPDATE_MESSAGE, count($customers)), $actualMessage);
+        \PHPUnit\Framework\Assert::assertEquals(sprintf(self::UPDATE_MESSAGE, count($customers)), $actualMessage);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForSystemCustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForSystemCustomerGroup.php
index 667fa15dcbc15..e8eb62ab05c95 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForSystemCustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForSystemCustomerGroup.php
@@ -23,7 +23,7 @@ class AssertNoDeleteForSystemCustomerGroup extends AbstractConstraint
      */
     public function processAssert(CustomerGroupEdit $customerGroupEdit)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $customerGroupEdit->getPageMainActions()->checkDeleteButton(),
             "Delete button is visible."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
index 0c3dba11f7882..11b44fd6fce52 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
@@ -35,7 +35,7 @@ public function processAssert(Customer $customer, CustomerAccountEdit $customerA
     {
         $validationMessages = $customerAccountEdit->getAccountInfoForm()->getValidationMessages($customer);
         if (isset($validationMessages['password_confirmation'])) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 self::CONFIRMATION_MESSAGE,
                 $validationMessages['password_confirmation'],
                 'Wrong password confirmation validation text message.'
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/WebsiteId.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/WebsiteId.php
index 72d7fdc63bc72..3e5ab87e0ed39 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/WebsiteId.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/WebsiteId.php
@@ -38,7 +38,7 @@ class WebsiteId extends DataSource
     private $fixtureFactory;
 
     /**
-     * Rought fixture field data.
+     * Rough fixture field data.
      *
      * @var array
      */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php
index 0c1b4b7600605..e7a66139df02e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php
@@ -9,6 +9,7 @@
 use Magento\Backend\Test\Handler\Extractor;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
@@ -59,11 +60,22 @@ public function persist(FixtureInterface $fixture = null)
      */
     public function getCustomerGroupId(array $data)
     {
-        $url = 'customer/group/index/sort/time/dir/desc';
-        $regExp = '/.*id\/(\d+)\/.*' . $data['code'] . '/siu';
-        $extractor = new Extractor($url, $regExp);
-        $match = $extractor->getData();
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'customer_group_listing',
+            'filters' => [
+                'placeholder' => true,
+                'customer_group_code' => $data['code']
+            ],
+            'isAjax' => true
+        ];
+        $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
+
+        $curl->write($url, $data, CurlInterface::POST);
+        $response = $curl->read();
+        $curl->close();
 
+        preg_match('/customer_group_listing_data_source.+items.+"customer_group_id":"(\d+)"/', $response, $match);
         return empty($match[1]) ? null : $match[1];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml
index 42ae87766c81f..7f5de5a2f6ddf 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml
@@ -9,6 +9,6 @@
   <page name="CustomerGroupIndex" area="Adminhtml" mca="customer/group/index" module="Magento_Customer">
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
-    <block name="customerGroupGrid" class="Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid" locator="#customerGroupGrid" strategy="css selector"/>
+    <block name="customerGroupGrid" class="Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid" locator="//div[contains(@data-bind, 'customer_group_listing')]" strategy="xpath"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/AbstractApplyVatIdTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/AbstractApplyVatIdTest.php
index 2eb82c04d1f81..2d2392f3328fe 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/AbstractApplyVatIdTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/AbstractApplyVatIdTest.php
@@ -76,7 +76,7 @@ public function __prepare(FixtureFactory $fixtureFactory)
     }
 
     /**
-     * Prepare VAT ID confguration.
+     * Prepare VAT ID configuration.
      *
      * @param ConfigData $vatConfig
      * @param string $customerGroup
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
index 1c697d9f1e5da..ccc6da81038f8 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -6,9 +6,6 @@
 
 namespace Magento\Customer\Test\TestCase;
 
-use Magento\Config\Test\Fixture\ConfigData;
-use Magento\Customer\Test\Constraint\AssertChangingWebsiteChangeCountries;
-use Magento\Framework\App\ObjectManager;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\TestCase\Injectable;
@@ -115,15 +112,15 @@ public function __inject(
      * Create customer on backend.
      *
      * @param Customer $customer
-     * @param string $customerAction
-     * @param Address $address
+     * @param null $customerAction
+     * @param Address|null $address
      * @param array $steps
      * @param array $beforeActionCallback
-     * @return void
+     * @throws \Exception
      */
     public function test(
         Customer $customer,
-        $customerAction,
+        $customerAction = null,
         Address $address = null,
         array $steps = [],
         array $beforeActionCallback = []
@@ -138,7 +135,12 @@ public function test(
 
         $this->pageCustomerIndex->open();
         $this->pageCustomerIndex->getPageActionsBlock()->addNew();
-        $this->pageCustomerIndexNew->getCustomerForm()->fillCustomer($customer, $address);
+        $this->pageCustomerIndexNew->getCustomerForm()->fillCustomer($customer);
+        if (null !== $address) {
+            $this->pageCustomerIndexNew->getPageActionsBlock()->saveAndContinue();
+            $this->pageCustomerIndexNew->getMessagesBlock()->waitSuccessMessage();
+            $this->pageCustomerIndexNew->getCustomerForm()->fillCustomerAddress($address);
+        }
         $this->address = $address;
         $this->customer = $customer;
 
@@ -147,8 +149,9 @@ public function test(
                 call_user_func([$this, $methodName]);
             }
         }
-
-        $this->pageCustomerIndexNew->getPageActionsBlock()->$customerAction();
+        if (null !== $customerAction) {
+            $this->pageCustomerIndexNew->getPageActionsBlock()->$customerAction();
+        }
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
index a3715daf8ab75..5bb96dc13c739 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
@@ -115,14 +115,14 @@
             </data>
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendRequiredFields" />
         </variation>
-        <variation name="CreateCustomerBackendEntityTestVariation9" summary="Verify required fields on Addresses tab.">
-            <data name="customerAction" xsi:type="string">save</data>
+        <variation name="CreateCustomerBackendEntityTestVariation9" summary="Verify required fields on the Add address modal.">
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
             <data name="customer/data/firstname" xsi:type="string">John%isolation%</data>
             <data name="customer/data/lastname" xsi:type="string">Doe%isolation%</data>
             <data name="customer/data/email" xsi:type="string">JohnDoe%isolation%@example.com</data>
             <data name="address/data/company" xsi:type="string">Magento</data>
+            <data name="address/data/country_id" xsi:type="string"></data>
             <data name="expectedRequiredFields" xsi:type="array">
                 <item name="2" xsi:type="string">Street Address</item>
                 <item name="3" xsi:type="string">City</item>
@@ -130,7 +130,7 @@
                 <item name="5" xsi:type="string">Zip/Postal Code</item>
                 <item name="6" xsi:type="string">Phone Number</item>
             </data>
-            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendRequiredFields" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerAddressBackendRequiredFields" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation10" summary="Create customer with 2 websites and with different allowed countries.">
             <data name="tag" xsi:type="string">to_maintain:yes</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
index bf3cc61e7fc09..753eb28a38ce3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
@@ -149,7 +149,7 @@ public function test(
         $this->customerAccountEdit->getAccountInfoForm()->fill($customer);
         $this->customerAccountEdit->getAccountInfoForm()->submit();
 
-        \PHPUnit_Framework_Assert::assertThat($this->getName(), $assertCustomerInfoSuccessSavedMessage);
+        \PHPUnit\Framework\Assert::assertThat($this->getName(), $assertCustomerInfoSuccessSavedMessage);
 
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
         $this->customerAccountIndex->getDashboardAddress()->editBillingAddress();
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
index dc5d6076731c6..7e4dee7072679 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
@@ -75,6 +75,8 @@ public function run()
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
         $this->customerAccountLogin->getLoginBlock()->login($this->customer);
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
+        $this->cmsIndex->getLinksBlock()->openLink('My Account');
+        $this->cmsIndex->getCmsPageBlock()->waitPageInit();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
index 02a439deb856b..22cd5bd13e94c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -49,7 +49,7 @@ public function run()
     {
         $this->customerAccount->open();
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
-        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Dashboard') {
+        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {
             $this->cmsIndex->getLinksBlock()->openLink('Sign Out');
             $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
             $this->cmsIndex->getCmsPageBlock()->waitPageInit();
diff --git a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertExportCustomerAddresses.php b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertExportCustomerAddresses.php
index fa9eb6b6f6a78..ea868bb5eac70 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertExportCustomerAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertExportCustomerAddresses.php
@@ -32,7 +32,7 @@ public function processAssert(
         $exportData = $export->getLatest();
 
         foreach ($customer->getDataFieldConfig('address')['source']->getAddresses() as $address) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $this->isAddressDataInFile(
                     $exportedFields,
                     $customer,
diff --git a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
index 5d379aae8b701..f73609b3ba2cf 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php
@@ -91,7 +91,7 @@ public function processAssert(
 
         $resultArrays = $this->getPrepareAddresses();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $resultArrays['pageData'],
             $resultArrays['csvData'],
             'Addresses from page and csv are not match.'
@@ -116,8 +116,7 @@ private function getPrepareAddresses()
         foreach ($customers as $customer) {
             $this->customerIndexEdit->open(['id' => $customer->getId()]);
             $customerForm->openTab('addresses');
-            $addresses = $customerForm->getTab('addresses')->getDataAddresses($addressTemplate);
-            $address = array_shift($addresses);
+            $address = $customerForm->getTab('addresses')->getAddressFromFirstRow($addressTemplate);
             if (!empty($address)) {
                 $resultAddressesArray[] = $address;
             }
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnCatalogPage.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnCatalogPage.php
index 61634f71096f5..a2f3c96463174 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnCatalogPage.php
@@ -42,7 +42,7 @@ public function processAssert(
         $priceBlock = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock();
         $actualPrice = $priceBlock->getPrice('');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $basePrice,
             $actualPrice,
             'Wrong price is displayed on Category page.'
@@ -52,7 +52,7 @@ public function processAssert(
         $cmsIndex->getTopmenu()->selectCategoryByName($categoryName);
         $actualPrice = $priceBlock->getPrice('');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $convertedPrice,
             $actualPrice,
             'Wrong price is displayed on Category page.'
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
index 7a8ea29daf834..64fb44f37dbd5 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php
@@ -43,7 +43,7 @@ public function processAssert(
      */
     public function assertPrice(CatalogProductView $view, $price, $currency = '')
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $price,
             $view->getViewBlock()->getPriceBlock()->getPrice($currency),
             'Wrong price is displayed on Product page.'
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateSuccessSaveMessage.php
index 7d700a74c3b51..80d0098e2d188 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCurrencyRateSuccessSaveMessage extends AbstractConstraint
     public function processAssert(SystemCurrencyIndex $currencyIndexPage)
     {
         $actualMessage = $currencyIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertShippingPriceWithCustomCurrency.php b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertShippingPriceWithCustomCurrency.php
index 252b672fb62bb..a76e773e28c02 100644
--- a/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertShippingPriceWithCustomCurrency.php
+++ b/dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertShippingPriceWithCustomCurrency.php
@@ -47,7 +47,7 @@ public function processAssert(
             ['products' => [$product]]
         )->run();
         $testStepFactory->create(\Magento\Checkout\Test\TestStep\ProceedToCheckoutStep::class)->run();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $shippingAmount,
             $checkoutOnepage->getShippingMethodBlock()->getShippingMethodAmount($shipping),
             'Shipping amount is not correct in the checkout page.'
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php
index ebc19eec9ad53..d78a2d94e7635 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php
@@ -104,4 +104,21 @@ public function setFieldsData(array $fields, SimpleElement $element = null)
 
         return $this;
     }
+
+    /**
+     * Set "Is this downloadable Product?" value.
+     *
+     * @param string $downloadable
+     * @param SimpleElement|null $element
+     * @return void
+     */
+    public function setIsDownloadable(string $downloadable = 'Yes', SimpleElement $element = null): void
+    {
+        $context = $element ?: $this->_rootElement;
+        $isDownloadable = $context->find($this->isDownloadableProduct);
+        $value = 'Yes' == $downloadable ? '1' : '0';
+        if ($isDownloadable->isVisible() && $isDownloadable->getAttribute('value') != $value) {
+            $isDownloadable->click();
+        }
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml
index 7a7a6d2124cb7..2f721f05f5ee8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml
@@ -7,7 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <qty />
         <link>
             <selector>//*[@id="downloadable-links-list"]/*[contains(.,"%link_name%")]//input</selector>
             <strategy>xpath</strategy>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
index 3d3920f28a733..648361b0a31c8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -18,7 +18,7 @@
 class Links extends Block
 {
     /**
-     * Selector title for for links
+     * Selector title for links
      *
      * @var string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
index d29f25f4e43d3..5771218e53f97 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -59,7 +59,7 @@ public function processAssert(
         $prices = $this->preparePrices($prices);
         //Order review prices verification
         $message = 'Prices on order review should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
 
         $checkoutOnepage->getPaymentBlock()->placeOrder();
         $checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
@@ -70,6 +70,6 @@ public function processAssert(
 
         //Frontend order prices verification
         $message = 'Prices on order view page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
index d8022e387486b..d4cad16fa82b1 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -71,6 +71,6 @@ public function processAssert(
         $actualPrices = $this->getTotals($actualPrices);
         //Prices verification
         $message = 'Prices from dataset should be equal to prices on frontend';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
index e5d97e1511e71..2033189214e12 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
@@ -32,11 +32,7 @@ protected function sortDownloadableArray(array $fields)
         usort(
             $fields,
             function ($row1, $row2) {
-                if ($row1['sort_order'] == $row2['sort_order']) {
-                    return 0;
-                }
-
-                return ($row1['sort_order'] < $row2['sort_order']) ? -1 : 1;
+                return $row1['sort_order'] <=> $row2['sort_order'];
             }
         );
 
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
index 60c611ed9c070..a537fff86c823 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
@@ -62,7 +62,7 @@ public function processAssert(
         $pageOptions = $catalogProductView->getViewBlock()->getOptions($product);
         $pageDownloadableLinks = $this->preparePageData($pageOptions['downloadable_options']['downloadable_links']);
         $error = $this->verifyData($fixtureDownloadableLinks, $pageDownloadableLinks);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
index f2ae9f009be66..34587b5a44c1a 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
@@ -58,7 +58,7 @@ public function processAssert(
             ? $this->preparePageData($pageOptions['downloadable_options']['downloadable_sample'])
             : [];
         $error = $this->verifyData($fixtureSampleLinks, $pageSampleLinks);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php
index 434c78e55c69b..d14d6754b12ec 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php
@@ -148,7 +148,7 @@ protected function prepareLinkData(array $link)
             'title' => $link['title'],
             'sort_order' => isset($link['sort_order']) ? $link['sort_order'] : 0,
             'is_shareable' => $link['is_shareable'],
-            'price' => floatval($link['price']),
+            'price' => (float)$link['price'],
             'number_of_downloads' => isset($link['number_of_downloads']) ? $link['number_of_downloads'] : 0,
             'link_type' => $link['type'],
             'link_url' => isset($link['link_url']) ? $link['link_url'] : null,
diff --git a/dev/tests/functional/tests/app/Magento/Email/Test/Constraint/AssertEmailTemplateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Email/Test/Constraint/AssertEmailTemplateSuccessSaveMessage.php
index 748da41e9815a..aafadb72b1ae2 100644
--- a/dev/tests/functional/tests/app/Magento/Email/Test/Constraint/AssertEmailTemplateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Email/Test/Constraint/AssertEmailTemplateSuccessSaveMessage.php
@@ -21,7 +21,7 @@ class AssertEmailTemplateSuccessSaveMessage extends AbstractConstraint
     public function processAssert(EmailTemplateIndex $emailTemplateIndex)
     {
         $actualMessage = $emailTemplateIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
index 3d001cd80f707..9d37f7430c032 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
@@ -74,7 +74,7 @@ public function processAssert(
         }
 
         $errors = $this->verifyData($expectedData, $actualData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
index a310cb2b2ee49..5f383904a96f7 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
@@ -50,7 +50,7 @@ public function processAssert(
         $orderHistory->open();
         $orderHistory->getOrderHistoryBlock()->openOrderById($orderId);
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedData,
             $customerOrderView->getGiftMessageForOrderBlock()->getGiftMessage(),
             'Wrong gift message is displayed on order.'
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
index 6347a518ed784..484db6e3ca7c7 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
@@ -66,7 +66,7 @@ public function processAssert(
                 $expectedData = [];
             }
 
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $expectedData,
                 $customerOrderView->getGiftMessageForItemBlock()->getGiftMessage($product->getName()),
                 'Wrong gift message is displayed on "' . $product->getName() . '" item.'
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php
index 34f4be91bd083..336a959694488 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php
@@ -76,6 +76,6 @@ public function processAssert(
         $actualPrices = $this->getTotals($actualPrices);
         //Prices verification
         $message = 'Prices from dataset should be equal to prices on frontend.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, $actualPrices, $message);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
index 87658d9a88b12..691bb86ca0f1f 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
@@ -40,7 +40,7 @@ public function processAssert(
         $fieldsFixture['associated'] = $this->prepareGroupedOptions($fieldsFixture['associated']);
 
         $errors = $this->verifyData($fieldsFixture, $fieldsForm);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
index 340d1ffbe297e..8688dc71aa8c2 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
@@ -49,7 +49,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex, array $product
         }
         $data = $this->prepareData($products, $orderCreateIndex->getCreateBlock()->getItemsBlock());
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $data['fixtureData'],
             $data['pageData'],
             'Grouped product data on order create page not equals to passed from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
index 8df7c62dca43f..1a2d5304e6ce2 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
@@ -52,7 +52,7 @@ public function processAssert(
         $pageQtyData = $this->sortDataByPath($pageQtyData, '::name');
 
         $error = $this->verifyData($fixtureQtyData, $pageQtyData);
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php
index fca15644dee43..25e4d4b39174e 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportNoDataErrorMessage.php
@@ -28,7 +28,7 @@ public function processAssert(AdminExportIndex $adminExportIndex)
     {
         $actualMessage = $adminExportIndex->getMessagesBlock()->getErrorMessage();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckData.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckData.php
index 358d9aefee251..810883f58eafd 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckData.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckData.php
@@ -36,7 +36,7 @@ public function processAssert(AdminImportIndex $adminImportIndex, ImportData $im
             : count($file->getEntities());
 
         $message = $adminImportIndex->getMessagesBlock()->getNoticeMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::RESULT_MESSAGE, $rowsCount, $entitiesCount),
             $message,
             'Wrong validation result message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php
index 1ffdcb3956be3..555976e6cac33 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php
@@ -28,9 +28,9 @@ public function processAssert(AdminImportIndex $adminImportIndex)
     {
         $actualMessage = $adminImportIndex->getMessagesBlock()->getErrorMessage();
 
-        \PHPUnit_Framework_Assert::assertNotFalse($actualMessage, 'Error message is absent.');
+        \PHPUnit\Framework\Assert::assertNotFalse($actualMessage, 'Error message is absent.');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             static::ERROR_MESSAGE,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php
index 1394270c82814..af8493df3ff9d 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php
@@ -24,8 +24,8 @@ public function processAssert(array $patterns, AdminImportIndex $adminImportInde
     {
         $messages = $adminImportIndex->getMessagesBlock()->getErrorsList();
 
-        \PHPUnit_Framework_Assert::assertNotFalse($messages, 'Errors messages block is absent.');
-        \PHPUnit_Framework_Assert::assertNotEmpty($messages, 'Errors messages is absent.');
+        \PHPUnit\Framework\Assert::assertNotFalse($messages, 'Errors messages block is absent.');
+        \PHPUnit\Framework\Assert::assertNotEmpty($messages, 'Errors messages is absent.');
 
         $errors = [];
         foreach ($messages as $message) {
@@ -34,7 +34,7 @@ public function processAssert(array $patterns, AdminImportIndex $adminImportInde
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             'This assertions contains next errors:' . PHP_EOL . implode(PHP_EOL, $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php
index 2ecd646855f76..a5408426514f2 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportSuccessMessage.php
@@ -28,7 +28,7 @@ class AssertImportSuccessMessage extends AbstractConstraint
     public function processAssert(AdminImportIndex $adminImportIndex)
     {
         $validationMessage = $adminImportIndex->getMessagesBlock()->getImportResultMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertStringEndsWith(
             self::SUCCESS_MESSAGE,
             $validationMessage,
             'Wrong validation result is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
index 1854b32faf04f..5281b211d76a6 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
@@ -37,7 +37,7 @@ public function processAssert(
             'attribute_code' => $attribute->getAttributeCode(),
         ];
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $exportIndex->getFilterExport()->isRowVisible($filter),
             'Attribute \'' . $attribute->getFrontendLabel() . '\' is present in Filter export grid'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
index 17cfdc31720cc..89f51931f8dc8 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
@@ -316,7 +316,7 @@ private function prepareCsv($csvContent)
                     $explodedArray = $compiledData['explodedArray'];
                 } else {
                     $explodedArray[$i] = str_replace('"', '', $explodedArray[$i]);
-                };
+                }
             }
             $data = array_diff($explodedArray, ['%to_delete%']);
             $this->csv[] = $data;
diff --git a/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertIndexerStatus.php b/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertIndexerStatus.php
index 147511a63dc11..f28ed21361658 100644
--- a/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertIndexerStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertIndexerStatus.php
@@ -38,7 +38,7 @@ public function processAssert(IndexManagement $indexManagement, array $indexers,
         $indexManagement->open();
         foreach ($indexers as $indexer) {
             $indexerStatus = $indexManagement->getMainBlock()->getIndexerStatus($indexer);
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $expectedStatus,
                 $indexerStatus,
                 'Wrong ' . $indexer . ' status is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertUpdateByScheduleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertUpdateByScheduleSuccessSaveMessage.php
index 4476ac686802b..7e7587e553d5a 100644
--- a/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertUpdateByScheduleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Indexer/Test/Constraint/AssertUpdateByScheduleSuccessSaveMessage.php
@@ -29,7 +29,7 @@ class AssertUpdateByScheduleSuccessSaveMessage extends AbstractConstraint
     public function processAssert(IndexManagement $indexManagement, array $indexers)
     {
         $actualMessage = $indexManagement->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_SAVE_MESSAGE, count($indexers)),
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAdminUriAutogenerated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAdminUriAutogenerated.php
index 4ebdd127b9d9e..f59ff908cc175 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAdminUriAutogenerated.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAdminUriAutogenerated.php
@@ -27,7 +27,7 @@ class AssertAdminUriAutogenerated extends AbstractConstraint
      */
     public function processAssert(Install $installPage)
     {
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             self::ADMIN_URI_PATTERN,
             $installPage->getWebConfigBlock()->getAdminUriCheck(),
             'Unexpected Backend Frontname pattern.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
index fab5a1f3558af..600e97a545cca 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
@@ -34,13 +34,13 @@ class AssertAgreementTextPresent extends AbstractConstraint
     public function processAssert(Install $installPage)
     {
         try {
-            \PHPUnit_Framework_Assert::assertContains(
+            \PHPUnit\Framework\Assert::assertContains(
                 self::LICENSE_AGREEMENT_TEXT,
                 $installPage->getLicenseBlock()->getLicense(),
                 'License agreement text is absent.'
             );
         } catch (\Exception $e) {
-            \PHPUnit_Framework_Assert::assertContains(
+            \PHPUnit\Framework\Assert::assertContains(
                 self::DEFAULT_LICENSE_AGREEMENT_TEXT,
                 $installPage->getLicenseBlock()->getLicense(),
                 'License agreement text is absent.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
index b512dc3b5e006..9e6eb0159e743 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
@@ -23,7 +23,7 @@ class AssertCurrencySelected extends AbstractConstraint
      */
     public function processAssert($currencySymbol, Dashboard $dashboardPage)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($dashboardPage->getMainBlock()->getRevenuePrice(), $currencySymbol) !== false,
             'Selected currency symbol not displays on dashboard.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertDevdocsLink.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertDevdocsLink.php
index 27cd62cfa1936..3e5dfe62d527c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertDevdocsLink.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertDevdocsLink.php
@@ -27,7 +27,7 @@ class AssertDevdocsLink extends AbstractConstraint
      */
     public function processAssert(DevdocsInstall $devdocsInstallPage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::DEVDOCS_TITLE_TEXT,
             $devdocsInstallPage->getDevdocsBlock()->getDevdocsTitle(),
             'Developer Documentation link is wrong.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertGenerationFilePathCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertGenerationFilePathCheck.php
index 3e637416137c6..6afe876525f13 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertGenerationFilePathCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertGenerationFilePathCheck.php
@@ -38,14 +38,14 @@ public function processAssert(PathChecker $pathChecker)
         ];
 
         foreach ($existsPaths as $path) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $pathChecker->pathExists($path),
                 'Path "' . $path . '" does not exist.'
             );
         }
 
         foreach ($nonExistsPaths as $path) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $pathChecker->pathExists($path),
                 'Path "' . $path . '" exists.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
index 4d4fcd14c915d..cec2921b2c080 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
@@ -24,7 +24,7 @@ class AssertKeyCreated extends AbstractConstraint
      */
     public function processAssert(Install $installPage, InstallConfig $installConfig)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $installConfig->getKeyValue(),
             $installPage->getInstallBlock()->getAdminInfo()['encryption_key'],
             'Selected encryption key on install page not equals to data from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
index 50ed5d2664511..236b9805ea1c6 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
@@ -24,7 +24,7 @@ class AssertLanguageSelected extends AbstractConstraint
     public function processAssert($languageTemplate, CmsIndex $indexPage)
     {
         $indexPage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $indexPage->getFooterBlock()->isLinkVisible($languageTemplate),
             'Selected language not displays on frontend.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index 13236d8aa0e6e..ca6180fc97dd1 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -29,7 +29,7 @@ public function processAssert(Category $category, CmsIndex $homePage, BrowserInt
         $homePage->open();
         $homePage->getTopmenu()->selectCategoryByName($category->getName());
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($browser->getUrl(), 'index.php') === false,
             'Apache redirect for category does not work.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index dc819bd18f7b6..f5d029620a32b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -34,13 +34,13 @@ public function processAssert(
         CustomerAccountLogin $customerAccountLogin
     ) {
         $dashboard->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($browser->getUrl(), 'https://') !== false,
             'Secure Url is not displayed on backend.'
         );
 
         $customerAccountLogin->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($browser->getUrl(), 'https://') !== false,
             'Secure Url is not displayed on frontend.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
index ad498dd02e67f..3f0c240834aad 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -79,14 +79,14 @@ public function processAssert(Install $installPage, InstallConfig $installConfig
     private function checkInstallData(array $allData, array $adminData, array $dbData)
     {
         foreach ($this->adminFieldsList as $field) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $allData[$field['fixture']],
                 $adminData[$field['pageData']],
                 'Wrong admin information is displayed.'
             );
         }
         foreach ($this->dbFieldsList as $field) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $allData[$field['fixture']],
                 $dbData[$field['pageData']],
                 'Wrong database information is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
index 4fc2490362a0e..2c3e74ef873b3 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -37,17 +37,17 @@ class AssertSuccessfulReadinessCheck extends AbstractConstraint
      */
     public function processAssert(Install $installPage)
     {
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::PHP_VERSION_MESSAGE,
             $installPage->getReadinessBlock()->getPhpVersionCheck(),
             'PHP version is incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             self::PHP_EXTENSIONS_REGEXP,
             $installPage->getReadinessBlock()->getPhpExtensionsCheck(),
             'PHP extensions missed.'
         );
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             self::FILE_PERMISSION_REGEXP,
             $installPage->getReadinessBlock()->getFilePermissionCheck(),
             'File permissions does not meet requirements.'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
index 2b407e3d39200..86906d4c09406 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
@@ -17,7 +17,7 @@
         <variation name="InstallTestVariation2" firstConstraint="Magento\Install\Test\Constraint\AssertSuccessInstall" summary="Install with custom encryption key and changed currency and locale">
             <data name="user/dataset" xsi:type="string">default</data>
             <data name="install/keyOwn" xsi:type="string">I want to use my own encryption key</data>
-            <data name="install/keyValue" xsi:type="string">123123qa</data>
+            <data name="install/keyValue" xsi:type="string">I_want_to_use_my_own__encryption</data>
             <data name="install/storeLanguage" xsi:type="string">German (Germany)</data>
             <data name="install/storeCurrency" xsi:type="string">Euro (EUR)</data>
             <data name="currencySymbol" xsi:type="string">€</data>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertEmailValidationErrorGenerated.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertEmailValidationErrorGenerated.php
index f9f3bd5800495..93c24b89131f9 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertEmailValidationErrorGenerated.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertEmailValidationErrorGenerated.php
@@ -34,7 +34,7 @@ public function processAssert(
                 break;
             }
         }
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $emailJsError,
             'Failed to validate email address (' . $integration->getEmail() . ') when saving integration.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIncorrectUserPassword.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIncorrectUserPassword.php
index d6308752e0df5..b0b2f6dbae8ab 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIncorrectUserPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIncorrectUserPassword.php
@@ -15,7 +15,7 @@
  */
 class AssertIncorrectUserPassword extends AbstractConstraint
 {
-    const ERROR_MESSAGE = "You have entered an invalid password for current user.";
+    const ERROR_MESSAGE = "The password entered for the current user is invalid. Verify the password and try again.";
 
     /**
      * Assert that an error message is displayed on the Integration page in case current user password is incorrect.
@@ -27,7 +27,7 @@ public function processAssert(
         IntegrationIndex $integrationIndexPage
     ) {
         $actualMessage = $integrationIndexPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
index 3d9b826bb162b..85111c12aa0b9 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
@@ -70,7 +70,7 @@ public function processAssert(
         unset($formData['current_password']);
         unset($data['current_password']);
         $dataDiff = $this->verifyForm($formData, $data);
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $dataDiff,
             'Integration form was filled incorrectly.'
             . "\nLog:\n" . implode(";\n", $dataDiff)
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
index 985cc56b8177c..64fa30ca6a06f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
@@ -36,7 +36,7 @@ public function processAssert(
         ];
 
         $integrationIndexPage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $integrationIndexPage->getIntegrationGrid()->isRowVisible($filter),
             'Integration \'' . $filter['name'] . '\' is absent in Integration grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNameDuplicationErrorMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNameDuplicationErrorMessage.php
index e07572d3aee40..4b9f6c017fe48 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNameDuplicationErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNameDuplicationErrorMessage.php
@@ -15,7 +15,7 @@
  */
 class AssertIntegrationNameDuplicationErrorMessage extends AbstractConstraint
 {
-    const ERROR_DUPLICATE_INTEGRATION_NAME = "Integration with name '%s' exists.";
+    const ERROR_DUPLICATE_INTEGRATION_NAME = 'The integration with name "%s" exists.';
 
     /**
      * Assert error message is displayed in message block.
@@ -30,7 +30,7 @@ public function processAssert(
     ) {
         $expectedMessage = sprintf(self::ERROR_DUPLICATE_INTEGRATION_NAME, $integration->getName());
         $actualMessage = $integrationIndexPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
index e1916b01e6669..1d9240ac82aa6 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
@@ -28,7 +28,7 @@ public function processAssert(IntegrationIndex $integrationIndexPage, Integratio
         $filter = ['name' => $integration->getName()];
 
         $integrationIndexPage->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $integrationIndexPage->getIntegrationGrid()->isRowVisible($filter),
             'Integration \'' . $filter['name'] . '\' is present in Integration grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
index 1e2f2aac8d5d3..32c75c224f588 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
@@ -31,7 +31,7 @@ public function processAssert(IntegrationIndex $integrationIndex, Integration $i
             : [$integration->getResources()];
         $formResources = $integrationIndex->getIntegrationGrid()->getResourcesPopup()->getStructure($resourceDepth);
         $result = $this->verifyResources($formResources, $fixtureResources);
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $result,
             "Integration resources is not correct.\nLog:\n" . $result
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
index c728ed9cde8a9..c984eaae41a3a 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
@@ -31,7 +31,7 @@ public function processAssert(
     ) {
         $expectedMessage = sprintf(self::SUCCESS_ACTIVATION_MESSAGE, $integration->getName());
         $actualMessage = $integrationIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
index 1c7a1b6f3b1d8..04e0d2a090abe 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
@@ -29,7 +29,7 @@ public function processAssert(IntegrationIndex $integrationIndexPage, Integratio
     {
         $expectedMessage = sprintf(self::SUCCESS_DELETE_MESSAGE, $integration->getName());
         $actualMessage = $integrationIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
index b7387974c07e0..b2db5b905b0ee 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
@@ -32,7 +32,7 @@ public function processAssert(
         IntegrationIndex $integrationIndexPage,
         Integration $integration
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_REAUTHORIZE_MESSAGE, $integration->getName()),
             $integrationIndexPage->getMessagesBlock()->getSuccessMessage(),
             "Wrong success message is displayed."
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
index d1fdc99e64c30..75dc1adbf293f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
@@ -36,7 +36,7 @@ public function processAssert(
             : $integration->getName();
         $expectedMessage = sprintf(self::SUCCESS_SAVE_MESSAGE, $name);
         $actualMessage = $integrationIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessageNotPresent.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessageNotPresent.php
index a9636517c8ee9..b307091cfb606 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessageNotPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessageNotPresent.php
@@ -33,7 +33,7 @@ public function processAssert(
         } else {
             $noSuccessMessage = true;
         }
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $noSuccessMessage,
             'Integration is not saved.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
index 9834b03e1867f..b9adb6bfa2f3e 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
@@ -61,7 +61,7 @@ public function processAssert(
         $actualData = $integrationNew->getIntegrationForm()->getData();
         $errors = $this->checkTokens($actualData, $integration->getData());
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             "Integration tokens was changed incorrectly.\nLog:\n" . implode(";\n", $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
index 8adc425443262..22fddd2b17289 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
@@ -56,7 +56,7 @@ public function processAssert(IntegrationIndex $integrationIndex)
                 $errors[] = 'Field with key: ' . $key . '" is empty in integration tokens.';
             }
         }
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             "Integration tokens is not correct.\nLog:\n" . implode(";\n", $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertNoAlertPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertNoAlertPopup.php
index a1f1b75ce565b..cb59be6634df4 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertNoAlertPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertNoAlertPopup.php
@@ -27,7 +27,7 @@ public function processAssert(
         if ($isAlertPresent) {
             $integrationNew->getFormPageActions()->acceptAlert();
         }
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $isAlertPresent,
             'Saving an integration should not cause alert.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml
index abfc9e09cb439..7d4811c4cb558 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml
@@ -40,6 +40,7 @@
                 <item name="9" xsi:type="string">Stores</item>
                 <item name="10" xsi:type="string">System</item>
                 <item name="11" xsi:type="string">Global Search</item>
+                <item name="12" xsi:type="string">Catalog</item>
             </field>
         </dataset>
     </repository>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml
index cae8dec6edcf1..11a8ed006af30 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.xml
@@ -14,7 +14,6 @@
             <constraint name="Magento\Integration\Test\Constraint\AssertIntegrationResourcesPopup" />
             <constraint name="Magento\Integration\Test\Constraint\AssertIntegrationTokensPopup" />
             <constraint name="Magento\Integration\Test\Constraint\AssertIntegrationSuccessActivationMessage" />
-            <data name="issue" xsi:type="string">MAGETWO-66745: Magento\Integration\Test\TestCase\ActivateIntegrationEntityTest with ActivateIntegrationEntityTestVariation1 fails randomly</data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
index 03779bd0ec674..a8c81ea14ba46 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
@@ -51,7 +51,7 @@ class ReAuthorizeTokensIntegrationEntityTest extends Injectable
      *
      * @param FixtureFactory $fixtureFactory
      * @param IntegrationIndex $integrationIndex
-     * @retun void
+     * @return void
      */
     public function __inject(IntegrationIndex $integrationIndex, FixtureFactory $fixtureFactory)
     {
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
index 6d3dc3c263f77..3c36fe82b1307 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
@@ -102,13 +102,8 @@ public function getFilters()
      */
     public function applyFilter($filter, $linkPattern)
     {
-        $expandFilterButton = sprintf($this->optionTitle, $filter);
         $links = sprintf($this->filterLink, $filter);
-
-        $this->waitForElementVisible($this->loadedNarrowByList);
-        if (!$this->_rootElement->find($links, Locator::SELECTOR_XPATH)->isVisible()) {
-            $this->_rootElement->find($expandFilterButton, Locator::SELECTOR_XPATH)->click();
-        }
+        $this->openFilterContainer($filter, $links);
 
         $links = $this->_rootElement->getElements($links, Locator::SELECTOR_XPATH);
         foreach ($links as $link) {
@@ -134,4 +129,47 @@ public function isCategoryVisible(Category $category, $qty)
             Locator::SELECTOR_XPATH
         )->isVisible();
     }
+
+    /**
+     * Get Layered Navigation filter options.
+     *
+     * @param string $attributeLabel
+     * @return array
+     */
+    public function getFilterContents($attributeLabel)
+    {
+        $data = [];
+
+        if (trim($attributeLabel) === '') {
+            return $data;
+        }
+
+        $link = sprintf($this->filterLink, $attributeLabel);
+        $this->openFilterContainer($attributeLabel, $link);
+
+        $optionContents = $this->_rootElement->getElements($link, Locator::SELECTOR_XPATH);
+
+        foreach ($optionContents as $optionContent) {
+            $data[] = trim(strtoupper($optionContent->getText()));
+        }
+
+        return $data;
+    }
+
+    /**
+     * Open filter container.
+     *
+     * @param string $filter
+     * @param string $link
+     * @return void
+     */
+    private function openFilterContainer($filter, $link)
+    {
+        $expandFilterButton = sprintf($this->optionTitle, $filter);
+
+        $this->waitForElementVisible($this->loadedNarrowByList);
+        if (!$this->_rootElement->find($link, Locator::SELECTOR_XPATH)->isVisible()) {
+            $this->_rootElement->find($expandFilterButton, Locator::SELECTOR_XPATH)->click();
+        }
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php
index ac3d613811eb4..e610b131cec60 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php
@@ -39,7 +39,7 @@ public function processAssert(
         $this->browser = $browser;
         $this->openCategory($category->getDataFieldConfig('parent_id')['source']->getParentCategory());
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogCategoryView->getLayeredNavigationBlock()->isCategoryVisible($category, 1),
             'Category ' . $category->getName() . ' is absent in Layered Navigation.'
         );
@@ -47,7 +47,7 @@ public function processAssert(
         $productsOnCategoryPage = $catalogCategoryView->getListProductBlock()->getProductNames();
         $productsInCategory = $category->getDataFieldConfig('category_products')['source']->getProducts();
         foreach ($productsInCategory as $product) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 in_array($product->getName(), $productsOnCategoryPage),
                 'Product ' . $product->getName() . ' is absent on category page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategorySortingOnFilteredProductList.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategorySortingOnFilteredProductList.php
index ddda01b8fdf94..3cf996fbc6cbd 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategorySortingOnFilteredProductList.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategorySortingOnFilteredProductList.php
@@ -62,7 +62,7 @@ function ($productKey) {
             }
         }
         $catalogCategoryView->getTopToolbar()->applySorting($sortBy);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             array_map(
                 function ($index) {
                     return $this->products[$index]->getName();
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertFilterProductList.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertFilterProductList.php
index ea80e5ac22480..9fa1fa01bacca 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertFilterProductList.php
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertFilterProductList.php
@@ -53,7 +53,7 @@ public function processAssert(
                 sort($productNames);
                 $pageProductNames = $catalogCategoryView->getListProductBlock()->getProductNames();
                 sort($pageProductNames);
-                \PHPUnit_Framework_Assert::assertEquals($productNames, $pageProductNames);
+                \PHPUnit\Framework\Assert::assertEquals($productNames, $pageProductNames);
             }
             $catalogCategoryView->getLayeredNavigationBlock()->clearAll();
         }
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php
new file mode 100644
index 0000000000000..6a82795f782d0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assertion that category name and products qty are correct in category layered navigation.
+ */
+class AssertProductsCount extends AbstractConstraint
+{
+    /**
+     * Browser instance.
+     *
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * Catalog category view page.
+     *
+     * @var CatalogCategoryView $catalogCategoryView
+     */
+    private $catalogCategoryView;
+
+    /**
+     * Assert that category name and products cont in layered navigation are correct.
+     *
+     * @param CatalogCategoryView $catalogCategoryView
+     * @param Category $category
+     * @param BrowserInterface $browser
+     * @param string $productsCount
+     * @return void
+     */
+    public function processAssert(
+        CatalogCategoryView $catalogCategoryView,
+        Category $category,
+        BrowserInterface $browser,
+        string $productsCount
+    ) {
+        $this->browser = $browser;
+        $this->catalogCategoryView = $catalogCategoryView;
+        while ($category) {
+            $parentCategory = $category->getDataFieldConfig('parent_id')['source']->getParentCategory();
+            if ($parentCategory && $parentCategory->getData('is_anchor') == 'No') {
+                $this->openCategory($parentCategory);
+                \PHPUnit\Framework\Assert::assertTrue(
+                    $this->catalogCategoryView->getLayeredNavigationBlock()->isCategoryVisible(
+                        $category,
+                        $productsCount
+                    ),
+                    'Category ' . $category->getName() . ' is absent in Layered Navigation or products count is wrong'
+                );
+            }
+            $category = $parentCategory;
+        }
+    }
+
+    /**
+     * Open category.
+     *
+     * @param Category $category
+     * @return void
+     */
+    private function openCategory(Category $category)
+    {
+        $categoryUrlKey = [];
+
+        while ($category) {
+            $categoryUrlKey[] = $category->hasData('url_key')
+                ? strtolower($category->getUrlKey())
+                : trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $category->getName())), '-');
+
+            $category = $category->getDataFieldConfig('parent_id')['source']->getParentCategory();
+            if ($category !== null && 1 == $category->getParentId()) {
+                $category = null;
+            }
+        }
+        $categoryUrlKey = $_ENV['app_frontend_url'] . implode('/', array_reverse($categoryUrlKey)) . '.html';
+
+        $this->browser->open($categoryUrlKey);
+    }
+
+    /**
+     * Assert success message that category is present in layered navigation and product is visible in product grid.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Category is present in layered navigation and product is visible in product grid.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml
new file mode 100644
index 0000000000000..7799faf309ccf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml
@@ -0,0 +1,54 @@
+<?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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Catalog\Test\Repository\Category">
+        <dataset name="default_non_anchored_subcategory">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_category</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">No</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+
+        <dataset name="default_second_level_anchored_subcategory">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_non_anchored_subcategory</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+
+        <dataset name="default_third_level_non_anchored_subcategory">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_second_level_anchored_subcategory</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">No</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+
+        <dataset name="default_fourth_level_anchored_subcategory">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_third_level_non_anchored_subcategory</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php
new file mode 100644
index 0000000000000..e55cc0d9e0610
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Test\TestCase;
+
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Mtf\Fixture\FixtureFactory;
+
+/**
+ * Preconditions:
+ * 1. Create four categories assigned in ascending order:
+ *  - Category 1:
+ *      Category name: "Test1"
+ *      Parent Category: Default Category.
+ *      Display settings -> Is Anchor: No
+ *  - Category 2:
+ *      Category name: "Test2"
+ *      Parent Category: Test1
+ *      Display settings -> Is Anchor: Yes
+ *  - Category 3:
+ *      Category name: "Test3"
+ *      Parent Category: Test2
+ *      Display settings -> Is Anchor: No
+ *  - Category 4:
+ *      Category name: "Test4"
+ *      Parent Category: Test3
+ *      Display settings -> Is Anchor: Yes
+ * 2. Create configurable product with two configurable options and assign it to category "Test4"
+ *
+ * Steps:
+ * 1. Disable configurable options via massaction or from edit product page
+ * 2. Open created non anchored categories on frontend.
+ *    On the left side in the Layered Navigation there is one category inside each of achored with zero products inside.
+ * 3. Open created anchored categories on frontend. There are no products inside.
+ *
+ * @group Layered_Navigation
+ * @ZephyrId MAGETWO-90123
+ */
+class ProductsCountInLayeredNavigationTest extends Injectable
+{
+    /**
+     * Product page with a grid
+     *
+     * @var CatalogProductIndex
+     */
+    protected $catalogProductIndex;
+
+    /**
+     * Page to update a product
+     *
+     * @var CatalogProductEdit
+     */
+    protected $editProductPage;
+
+    /**
+     * Fixture factory
+     *
+     * @var FixtureFactory
+     */
+    protected $fixtureFactory;
+
+    /**
+     * Injection data
+     *
+     * @param CatalogProductIndex $catalogProductIndex
+     * @param CatalogProductEdit $editProductPage
+     * @param FixtureFactory $fixtureFactory
+     * @return void
+     */
+    public function __inject(
+        CatalogProductIndex $catalogProductIndex,
+        CatalogProductEdit $editProductPage,
+        FixtureFactory $fixtureFactory
+    ) {
+        $this->catalogProductIndex = $catalogProductIndex;
+        $this->editProductPage = $editProductPage;
+        $this->fixtureFactory = $fixtureFactory;
+    }
+
+    /**
+     * Test category name and products count displaying in layered navigation after configurable options disabling.
+     *
+     * @param Category $category
+     * @param bool $disableFromProductsGreed
+     * @return array
+     */
+    public function test(
+        Category $category,
+        bool $disableFromProductsGreed = true
+    ) {
+        // Preconditions
+        $category->persist();
+        // Steps
+        $products = $category->getDataFieldConfig('category_products')['source']->getProducts();
+        $configurableOptions = [];
+        /** @var \Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct\ $product */
+        foreach ($products as $product) {
+            $configurableOptions = array_merge(
+                $configurableOptions,
+                $product->getConfigurableAttributesData()['matrix']
+            );
+        }
+        // Disable configurable options
+        if ($disableFromProductsGreed) {
+            $this->catalogProductIndex->open();
+            $this->catalogProductIndex->getProductGrid()->massaction(
+                array_map(
+                    function ($assignedProduct) {
+                        return ['sku' => $assignedProduct['sku']];
+                    },
+                    $configurableOptions
+                ),
+                ['Change status' => 'Disable']
+            );
+        } else {
+            $productToDisable = $this->fixtureFactory->createByCode(
+                'catalogProductSimple',
+                ['data' => ['status' => 'No']]
+            );
+            foreach ($configurableOptions as $configurableOption) {
+                $filter = ['sku' => $configurableOption['sku']];
+                $this->catalogProductIndex->open();
+                $this->catalogProductIndex->getProductGrid()->searchAndOpen($filter);
+                $this->editProductPage->getProductForm()->fill($productToDisable);
+                $this->editProductPage->getFormPageActions()->save();
+            }
+        }
+
+        return [
+            'products' => $configurableOptions,
+        ];
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml
new file mode 100644
index 0000000000000..0cf932d15cc88
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\LayeredNavigation\Test\TestCase\ProductsCountInLayeredNavigationTest" summary="Check configurable products count in child categories of non-anchor category" ticketId="MAGETWO-90123">
+        <variation name="ProductsCountInLayeredNavigationTestVariation1" summary="Check configurable products count with disabled by massaction products">
+            <data name="runReindex" xsi:type="boolean">true</data>
+            <data name="flushCache" xsi:type="boolean">true</data>
+            <data name="category/dataset" xsi:type="string">default_fourth_level_anchored_subcategory</data>
+            <data name="category/data/category_products/dataset" xsi:type="string">configurableProduct::product_with_size</data>
+            <data name="productsCount" xsi:type="string">0</data>
+            <data name="disableFromProductsGreed" xsi:type="boolean">true</data>
+            <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertProductsCount" />
+        </variation>
+        <variation name="ProductsCountInLayeredNavigationTestVariation2" summary="Check configurable products count with disabled from edit page products">
+            <data name="runReindex" xsi:type="boolean">true</data>
+            <data name="flushCache" xsi:type="boolean">true</data>
+            <data name="category/dataset" xsi:type="string">default_fourth_level_anchored_subcategory</data>
+            <data name="category/data/category_products/dataset" xsi:type="string">configurableProduct::product_with_size</data>
+            <data name="productsCount" xsi:type="string">0</data>
+            <data name="disableFromProductsGreed" xsi:type="boolean">false</data>
+            <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertProductsCount" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnCategoryPage.php
index 734c06b003d3e..5d59fd4c452ae 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnCategoryPage.php
@@ -37,14 +37,14 @@ public function processAssert(
         $productBlock = $catalogCategoryView->getMsrpListProductBlock()->getProductItem($product);
         $productBlock->openMapBlock();
         $mapBlock = $productBlock->getMapBlock();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $product->getMsrp(),
             $mapBlock->getOldPrice(),
             'Displayed on Category page MAP is incorrect.'
         );
         $priceData = $product->getDataFieldConfig('price')['source']->getPriceData();
         $price = isset($priceData['category_price']) ? $priceData['category_price'] : $product->getPrice();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $price,
             $mapBlock->getActualPrice(),
             'Displayed on Category page price is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnProductView.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnProductView.php
index c3699ea7bc2f5..3b35cbe7eca5d 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnProductView.php
@@ -41,14 +41,14 @@ public function processAssert(
         $viewBlock = $catalogProductView->getMsrpViewBlock();
         $viewBlock->openMapBlock();
         $mapBlock = $viewBlock->getMapBlock();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $product->getMsrp(),
             $mapBlock->getOldPrice(),
             'Displayed on Product view page MAP is incorrect.'
         );
         $priceData = $product->getDataFieldConfig('price')['source']->getPriceData();
         $price = isset($priceData['category_price']) ? $priceData['category_price'] : $product->getPrice();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $price,
             $mapBlock->getActualPrice(),
             'Displayed on Product view page price is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpInShoppingCart.php
index d491309100d3e..4615ef47eb393 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpInShoppingCart.php
@@ -54,7 +54,7 @@ public function processAssert(
         $priceData = $product->getDataFieldConfig('price')['source']->getPriceData();
         $productPrice = isset($priceData['category_price']) ? $priceData['category_price'] : $product->getPrice();
         $unitPrice = $checkoutCart->getCartBlock()->getCartItem($product)->getPrice();
-        \PHPUnit_Framework_Assert::assertEquals($productPrice, $unitPrice, 'Incorrect unit price is displayed in Cart');
+        \PHPUnit\Framework\Assert::assertEquals($productPrice, $unitPrice, 'Incorrect unit price is displayed in Cart');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnCategoryPage.php
index 7ef9e44bacad8..f77a6dbe4cad2 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnCategoryPage.php
@@ -35,18 +35,18 @@ public function processAssert(
         $cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
 
         $productBlock = $catalogCategoryView->getMsrpListProductBlock()->getProductItem($product);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productBlock->isVisible(),
             'Product is invisible on Category page.'
         );
 
         $priceBlock = $productBlock->getPriceBlock();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $product->getMsrp(),
             $priceBlock->getOldPrice(),
             'Displayed on Category page MSRP is incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $priceBlock->isRegularPriceVisible(),
             'Regular price on Category page is visible and not expected.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnProductView.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnProductView.php
index fb0d9803dbae3..2b8683c7c0e22 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMsrpOnProductView.php
@@ -40,12 +40,12 @@ public function processAssert(
 
         $viewBlock = $catalogProductView->getMsrpViewBlock();
         $priceBlock = $viewBlock->getPriceBlock();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $product->getMsrp(),
             $priceBlock->getOldPrice(),
             'Displayed on Product view page MSRP is incorrect'
         );
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $priceBlock->isRegularPriceVisible(),
             'Regular price on Product view page is visible and not expected.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertProductEditPageAdvancedPricingFields.php b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertProductEditPageAdvancedPricingFields.php
index a9860ab7b7715..d1b56bcf5c0f8 100644
--- a/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertProductEditPageAdvancedPricingFields.php
+++ b/dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertProductEditPageAdvancedPricingFields.php
@@ -33,7 +33,7 @@ public function processAssert(CatalogProductEdit $catalogProductEdit, FixtureInt
         $catalogProductEdit->getProductForm()->openSection('advanced-pricing');
         $advancedPricing = $catalogProductEdit->getProductForm()->getSection('advanced-pricing');
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $advancedPricing->checkField($this->manufacturerFieldTitle),
             '"Manufacturer\'s Suggested Retail Price" field is not correct.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php
index 4a5853cae0026..5cd2c966f37f7 100644
--- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php
@@ -21,7 +21,7 @@ class AssertMultishippingOrderSuccessPlacedMessage extends AbstractConstraint
     /**
      * Expected success message
      */
-    const SUCCESS_MESSAGE = 'We received your order!';
+    const SUCCESS_MESSAGE = 'Thank you for your purchase!';
 
     /**
      * Assert that success message is correct.
@@ -31,7 +31,7 @@ class AssertMultishippingOrderSuccessPlacedMessage extends AbstractConstraint
      */
     public function processAssert(MultishippingCheckoutSuccess $multishippingCheckoutSuccess)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $multishippingCheckoutSuccess->getTitleBlock()->getTitle(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
index 67c1826f40a24..2c41ce3d8b4e2 100644
--- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillShippingInformationStep.php
@@ -58,7 +58,7 @@ public function __construct(
     public function run()
     {
         $shippingMethods = [];
-        for ($i = 0; $i < count($this->customer->getAddress()); $i++) {
+        for ($i = 0, $count = count($this->customer->getAddress()); $i < $count; $i++) {
             $shippingMethods[] = $this->shippingMethod;
         }
         $this->shippingInformation->getShippingBlock()->selectShippingMethod($shippingMethods);
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
index 106f0c2da3792..254d0209c7d9f 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
@@ -35,7 +35,7 @@ public function processAssert(
         ];
 
         $subscriberIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $subscriberIndex->getSubscriberGrid()->isRowVisible($filter),
             'Customer with email \'' . $customer->getEmail() . '\' is absent in Newsletter Subscribers grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
index 30e69a90f3ac7..6f606171b9eed 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
@@ -30,7 +30,7 @@ public function processAssert(TemplateIndex $templateIndex, TemplateEdit $templa
         $templateIndex->open()->getNewsletterTemplateGrid()->searchAndOpen(['code' => $template->getCode()]);
         $errors = $this->verifyData($template->getData(), $templateEdit->getEditForm()->getData($template));
 
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
index 531aa6f0e2343..f5156f0417df1 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
@@ -34,7 +34,7 @@ public function processAssert(
     ) {
         $templateIndex->open();
         $filter = ['code' => $template->getCode()];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $templateIndex->getNewsletterTemplateGrid()->isRowVisible($filter),
             'Newsletter \'' . $template->getCode() . '\'is absent in newsletter template grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
index 426d1d9e97d1d..c990e79ad0824 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
@@ -33,7 +33,7 @@ public function processAssert(
         $browser->selectWindow();
         $content = $templatePreview->getContent()->getPageContent();
         $browser->closeWindow();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $newsletter->getText(),
             $content,
             'Template content not correct information.'
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
index 753414d0ff52a..1283ca4af9a9e 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
@@ -33,7 +33,7 @@ class AssertNewsletterQueue extends AbstractAssertForm
     public function processAssert(TemplateQueue $templateQueue, Template $newsletter)
     {
         $dataDiff = $this->verifyData($newsletter->getData(), $templateQueue->getEditForm()->getData($newsletter));
-        \PHPUnit_Framework_Assert::assertEmpty($dataDiff, $dataDiff);
+        \PHPUnit\Framework\Assert::assertEmpty($dataDiff, $dataDiff);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueForm.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueForm.php
index 89df51175b069..9041b4d866bfc 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueForm.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueForm.php
@@ -33,7 +33,7 @@ public function processAssert(
         $indexQueue->getQueueTemplateGrid()->searchAndOpen(['newsletter_subject' => $queue->getNewsletterSubject()]);
 
         $dataDiff = $this->verifyData($queue->getData(), $templateQueue->getEditForm()->getData($queue));
-        \PHPUnit_Framework_Assert::assertEmpty($dataDiff, $dataDiff);
+        \PHPUnit\Framework\Assert::assertEmpty($dataDiff, $dataDiff);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueInGrid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueInGrid.php
index e29c585f0f011..c191ec4df44d2 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueInGrid.php
@@ -36,7 +36,7 @@ public function processAssert(
         $indexQueue->open();
         $indexQueue->getQueueTemplateGrid()->search(['newsletter_subject' => $queue->getNewsletterSubject()]);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $indexQueue->getQueueTemplateGrid()->isRowVisible($filter, false, false),
             'Newsletter Queue \'' . $queue->getNewsletterSubject() . '\' is absent in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueSaveMessage.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueSaveMessage.php
index 4e240d6edd0c1..8803f464996cb 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueSaveMessage.php
@@ -29,7 +29,7 @@ public function processAssert(
         TemplateQueueIndex $indexQueue
     ) {
         $actualMessages = $indexQueue->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::SUCCESS_MESSAGE,
             $actualMessages,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
index 863d19af5ec16..cc025604be837 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
@@ -30,7 +30,7 @@ class AssertNewsletterSuccessCreateMessage extends AbstractConstraint
     public function processAssert(TemplateIndex $templateIndex)
     {
         $actualMessage = $templateIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheFlushSuccessMessage.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheFlushSuccessMessage.php
index 393f3a4cbaec1..9ff35698a3e9a 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheFlushSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheFlushSuccessMessage.php
@@ -23,7 +23,7 @@ class AssertCacheFlushSuccessMessage extends AbstractConstraint
      */
     public function processAssert(AdminCache $adminCache, $successMessage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $successMessage,
             $adminCache->getMessagesBlock()->getSuccessMessage(),
             'Action is not successful.'
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidateNotice.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidateNotice.php
index 7fb18cd86690a..da82d3c9eb576 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidateNotice.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidateNotice.php
@@ -35,12 +35,12 @@ public function processAssert(AdminCache $adminCache, array $caches)
         $adminCache->getSystemMessageDialog()->closePopup();
         foreach ($caches as $cacheType => $cacheStatus) {
             if ($cacheStatus === 'Invalidated') {
-                \PHPUnit_Framework_Assert::assertContains(
+                \PHPUnit\Framework\Assert::assertContains(
                     $this->cacheTypes[$cacheType],
                     $adminCache->getSystemMessageBlock()->getContent()
                 );
             } else {
-                \PHPUnit_Framework_Assert::assertNotContains(
+                \PHPUnit\Framework\Assert::assertNotContains(
                     $this->cacheTypes[$cacheType],
                     $adminCache->getSystemMessageBlock()->getContent()
                 );
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidatePopUp.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidatePopUp.php
index 86eda10b2e162..ad1fcb4d62ec0 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidatePopUp.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheInvalidatePopUp.php
@@ -34,12 +34,12 @@ public function processAssert(AdminCache $adminCache, array $caches)
     {
         foreach ($caches as $cacheType => $cacheStatus) {
             if ($cacheStatus === 'Invalidated') {
-                \PHPUnit_Framework_Assert::assertContains(
+                \PHPUnit\Framework\Assert::assertContains(
                     $this->cacheTypes[$cacheType],
                     $adminCache->getSystemMessageDialog()->getPopupText()
                 );
             } else {
-                \PHPUnit_Framework_Assert::assertNotContains(
+                \PHPUnit\Framework\Assert::assertNotContains(
                     $this->cacheTypes[$cacheType],
                     $adminCache->getSystemMessageDialog()->getPopupText()
                 );
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheIsRefreshableAndInvalidated.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheIsRefreshableAndInvalidated.php
index 660b77c35f848..6498802c6cc30 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheIsRefreshableAndInvalidated.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheIsRefreshableAndInvalidated.php
@@ -39,7 +39,7 @@ public function processAssert(AdminCache $adminCache, $cacheTags)
         $adminCache->open();
         $adminCache->getGridBlock()->massaction($items, 'Refresh');
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_MESSAGE, count($items)),
             $adminCache->getMessagesBlock()->getSuccessMessage(),
             'Cache is Invalid and refreshable.'
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheStatus.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheStatus.php
index d130b7712ee8c..76bd5f6ad3dc9 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheStatus.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheStatus.php
@@ -35,7 +35,7 @@ public function processAssert(AdminCache $adminCache, array $caches)
     {
         $adminCache->open();
         foreach ($caches as $cacheType => $cacheStatus) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $adminCache->getGridBlock()->isCacheStatusCorrect($this->cacheTypes[$cacheType], $cacheStatus),
                 $this->cacheTypes[$cacheType] . " cache status in grid does not equal to " . $cacheStatus
             );
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertFlushStaticFilesCacheButtonVisibility.php b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertFlushStaticFilesCacheButtonVisibility.php
index d578d06e112f8..8eeecc83633c0 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertFlushStaticFilesCacheButtonVisibility.php
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertFlushStaticFilesCacheButtonVisibility.php
@@ -25,12 +25,12 @@ class AssertFlushStaticFilesCacheButtonVisibility extends AbstractConstraint
     public function processAssert(AdminCache $adminCache)
     {
         if ($_ENV['mage_mode'] === 'production') {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $adminCache->getAdditionalBlock()->isFlushCacheButtonVisible(self::FLUSH_STATIC_FILES_CACHE),
                 self::FLUSH_STATIC_FILES_CACHE . ' button should not be visible in production mode.'
             );
         } else {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $adminCache->getAdditionalBlock()->isFlushCacheButtonVisible(self::FLUSH_STATIC_FILES_CACHE),
                 self::FLUSH_STATIC_FILES_CACHE . ' button should be visible in developer or default mode.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/PageCache/Test/Repository/ConfigData.xml
index 7a466f40f3f83..c631928273344 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/Repository/ConfigData.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php
index 45f3d0aaca4d5..455b0bf6129fa 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertCardRequiredFields.php
@@ -39,7 +39,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex, CreditCard $cr
             ->getJsErrors();
         $creditCardEmpty = $creditCard->get('visa_empty');
         foreach (array_keys($creditCardEmpty) as $field) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 isset($actualRequiredFields[$field]),
                 "Field '$field' is not highlighted with an JS error."
             );
@@ -47,7 +47,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex, CreditCard $cr
             if (in_array($field, ['cc_number', 'cc_cid'])) {
                 $expected = self::VALID_NUMBER_MESSAGE;
             }
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $expected,
                 $actualRequiredFields[$field],
                 "Field '$field' is not highlighted as required."
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php
index 96a7749e908f6..6c2ce58cdcd05 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php
@@ -25,7 +25,7 @@ class AssertFieldsAreActive extends AbstractConstraint
     public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
     {
         foreach ($fieldIds as $fieldId) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $configEditSectionPayment->getPaymentsConfigBlock()->isFieldDisabled($fieldId),
                 'Field is disabled.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php
index 2116fd92d4fa2..a5f277c5f0437 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php
@@ -25,7 +25,7 @@ class AssertFieldsAreDisabled extends AbstractConstraint
     public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
     {
         foreach ($fieldIds as $fieldId) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $configEditSectionPayment->getPaymentsConfigBlock()->isFieldDisabled($fieldId),
                 'Field is active.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php
index f34efad507bc8..d65c0095382f4 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php
@@ -25,7 +25,7 @@ class AssertFieldsAreEnabled extends AbstractConstraint
     public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
     {
         foreach ($fieldIds as $fieldId) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $configEditSectionPayment->getPaymentsConfigBlock()->isFieldEnabled($fieldId),
                 'Field is active.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php
index 1725c27ea9e50..a69e5e36450c3 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php
@@ -25,7 +25,7 @@ class AssertFieldsArePresent extends AbstractConstraint
     public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds)
     {
         foreach ($fieldIds as $fieldId) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $configEditSectionPayment->getPaymentsConfigBlock()->isFieldPresent($fieldId),
                 'Field is active.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/AssertExpressCancelledMessage.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/AssertExpressCancelledMessage.php
index f3fe41a68edcb..102a87b84980e 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/AssertExpressCancelledMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/AssertExpressCancelledMessage.php
@@ -27,7 +27,7 @@ class AssertExpressCancelledMessage extends AbstractConstraint
      */
     public function processAssert(CheckoutCart $checkoutCart)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $checkoutCart->getMessagesBlock()->getSuccessMessage(),
             'Success message about Express Checkout cancellation is not present or wrong.'
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/Sandbox/AssertTotalPaypalReview.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/Sandbox/AssertTotalPaypalReview.php
index 6d65d6d887b49..5cbba6b9ab368 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/Sandbox/AssertTotalPaypalReview.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Constraint/Sandbox/AssertTotalPaypalReview.php
@@ -25,7 +25,7 @@ public function processAssert(ExpressReview $expressReview, $total)
     {
         $reviewTotal = $expressReview->getExpressMainReviewBlock()->getReviewBlock()->getTotal();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $reviewTotal,
             number_format($total, 2),
             'Total price: \'' . $reviewTotal
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml
index f3922aa474735..f212f48237ecb 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml
@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Paypal\Test\TestCase\CreateOnlineCreditMemoPayflowLinkTest" summary="Create online credit memo for order placed with with PayPal Payflow Link">
+    <testCase name="Magento\Paypal\Test\TestCase\CreateOnlineCreditMemoPayflowLinkTest" summary="Create online credit memo for order placed with PayPal Payflow Link">
         <variation name="CreateOnlineCreditMemoPayflowLinkVariation1" summary="Create Refund for Order Paid with PayPal Payflow Link" ticketId="MAGETWO-13061">
             <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutDeclinedTest.xml
index 7a4a1863c4ae6..d4f75f483d725 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutDeclinedTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutDeclinedTest.xml
@@ -18,7 +18,7 @@
             <data name="payment/method" xsi:type="string">payflowpro</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="configData" xsi:type="string">payflowpro, payflowpro_avs_street_does_not_match</data>
-            <data name="expectedErrorMessage" xsi:type="string">An error occurred on the server. Please try to place the order again.</data>
+            <data name="expectedErrorMessage" xsi:type="string">A server error stopped your order from being placed. Please try to place your order again.</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
         </variation>
         <variation name="OnePageCheckoutDeclinedTestWithAVSZIP" summary="Place order via Payflow Pro with AVS ZIP verification fail" ticketId="MAGETWO-37483">
@@ -30,7 +30,7 @@
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">payflowpro</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
-            <data name="expectedErrorMessage" xsi:type="string">An error occurred on the server. Please try to place the order again.</data>
+            <data name="expectedErrorMessage" xsi:type="string">A server error stopped your order from being placed. Please try to place your order again.</data>
             <data name="configData" xsi:type="string">payflowpro, payflowpro_use_avs_zip</data>
             <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
@@ -46,7 +46,7 @@
             <data name="payment/method" xsi:type="string">payflowpro</data>
             <data name="creditCard/dataset" xsi:type="string">visa_cvv_mismatch</data>
             <data name="configData" xsi:type="string">payflowpro, payflowpro_avs_security_code_does_not_match</data>
-            <data name="expectedErrorMessage" xsi:type="string">An error occurred on the server. Please try to place the order again.</data>
+            <data name="expectedErrorMessage" xsi:type="string">A server error stopped your order from being placed. Please try to place your order again.</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php b/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php
index 1550f6e86ee4c..c40db5c164e62 100644
--- a/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Persistent/Test/Constraint/AssertCustomerIsRedirectedToCheckout.php
@@ -23,7 +23,7 @@ class AssertCustomerIsRedirectedToCheckout extends AbstractConstraint
     public function processAssert(CheckoutOnepage $checkoutOnepage)
     {
         $checkoutOnepage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             !$checkoutOnepage->getMessagesBlock()->isVisible()
             && $checkoutOnepage->getShippingMethodBlock()->isVisible(),
             'Checkout first step is not available.'
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertGetVideoInfoDataIsCorrect.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertGetVideoInfoDataIsCorrect.php
index a0727f3c7f973..894cb1b8a3502 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertGetVideoInfoDataIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertGetVideoInfoDataIsCorrect.php
@@ -38,7 +38,7 @@ public function processAssert(
         $imagesTab = $editProductPage->getProductForm()->getSection('images-and-videos');
         $result = $imagesTab->clickFirstVideo()->getVideoDialog()->validate($video);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $result,
             'Video data received from external service is not correct.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php
index 46d6b5d2324e0..6c9771613fe33 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php
@@ -31,7 +31,7 @@ public function processAssert(
         $cmsIndex->open();
         $cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
         $src = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getBaseImageSource();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($src, '/placeholder/') !== false,
             'Product image is displayed on category view when it should not.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoProductView.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoProductView.php
index 91079931b31a4..5fd0aa00221a0 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoProductView.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoProductView.php
@@ -29,7 +29,7 @@ public function processAssert(
         InjectableFixture $product
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogProductView->getViewBlock()->isVideoVisible(),
             'Product video is displayed on product view when it should not.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoCategoryView.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoCategoryView.php
index f8f25d9e3a6b8..0b3aa227486de 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoCategoryView.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoCategoryView.php
@@ -32,7 +32,7 @@ public function processAssert(
         $cmsIndex->open();
         $cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
         $src = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getBaseImageSource();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             strpos($src, '/placeholder/') !== false,
             'Video preview image is not displayed on category view when it should.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoConfigurableProductView.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoConfigurableProductView.php
index fff7dddca485a..813d56f152344 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoConfigurableProductView.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoConfigurableProductView.php
@@ -36,22 +36,22 @@ public function processAssert(
         //open product page
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         // assert video and video data of configurable product is presented on page
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->isVideoVisible(),
             'Product video is not displayed on product view when it should.'
         );
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->checkVideoDataPresence($youtubeDataCode),
             'Configurable product video data is not displayed on product view when it should.'
         );
        // select configurable product variation
         $catalogProductView->getConfigurableAttributesBlock()->selectConfigurableOption($product, $variation);
         // assert video and video data of simple product option is presented on page
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->isVideoVisible(),
             'Configurable product variation video is not displayed on product view when it should.'
         );
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->checkVideoDataPresence($vimeoDataCode),
             'Configurable product variation video data is not displayed on product view when it should.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoProductView.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoProductView.php
index 96128e321bd88..8b4488a63e0e8 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoProductView.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoProductView.php
@@ -29,7 +29,7 @@ public function processAssert(
         InjectableFixture $product
     ) {
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getViewBlock()->isVideoVisible(),
             'Product video is not displayed on product view when it should.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/ReleaseNotification/Mtf/App/State/NotificationHandler.php b/dev/tests/functional/tests/app/Magento/ReleaseNotification/Mtf/App/State/NotificationHandler.php
new file mode 100644
index 0000000000000..fef4bfdf605fd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ReleaseNotification/Mtf/App/State/NotificationHandler.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ReleaseNotification\Mtf\App\State;
+
+use Magento\Mtf\App\State\AbstractState;
+use Magento\Mtf\Config\DataInterface;
+use Magento\Mtf\App\State\StateHandlerInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+
+/**
+ * Class NotificationHandler
+ */
+class NotificationHandler implements StateHandlerInterface
+{
+    /**
+     * @var DataInterface
+     */
+    private $configuration;
+
+    /**
+     * NotificationHandler constructor.
+     *
+     * @param DataInterface $configuration
+     */
+    public function __construct(DataInterface $configuration)
+    {
+        $this->configuration = $configuration;
+    }
+
+    /**
+     * Mark admin user as notified about release notes.
+     *
+     * @param AbstractState $state
+     * @return bool
+     * @throws \Exception
+     * @SuppressWarnings("unused")
+     */
+    public function execute(AbstractState $state)
+    {
+        $url = $_ENV['app_backend_url'] . 'admin/releaseNotification/notification/markUserNotified/?isAjax=true';
+        $curl = new BackendDecorator(new CurlTransport(), $this->configuration);
+        $curl->write($url, []);
+        $response = json_decode($curl->read(), true);
+        $curl->close();
+        if (isset($response['success'])) {
+            return $response['success'];
+        }
+        return false;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ReleaseNotification/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/ReleaseNotification/Test/etc/di.xml
new file mode 100644
index 0000000000000..5ac2e24283050
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ReleaseNotification/Test/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/ObjectManager/etc/config.xsd">
+    <type name="Magento\Mtf\App\State\AbstractState">
+        <arguments>
+            <argument name="arguments" xsi:type="array">
+                <item name="disable-notification" xsi:type="string">Magento\ReleaseNotification\Mtf\App\State\NotificationHandler</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Product/Sold/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Product/Sold/Grid.php
index f74fe80f69eb3..3f53c7d2126b5 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Product/Sold/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Product/Sold/Grid.php
@@ -34,6 +34,13 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      */
     protected $product = './/*[contains(.,"%s")]/*[contains(@class,"col-qty")]';
 
+    /**
+     * Product sku from grid locator
+     *
+     * @var string
+     */
+    private $productSku = './/*[contains(.,"%s")]/*[contains(@class,"col-sku")]';
+
     /**
      * Filter locator
      *
@@ -102,4 +109,23 @@ public function getOrdersResults(OrderInjectable $order)
         }
         return $views;
     }
+
+    /**
+     * Get product sku from Ordered Products Report grid.
+     *
+     * @param OrderInjectable $order
+     * @return array
+     */
+    public function getOrdersResultsforConfigurableProducts(OrderInjectable $order)
+    {
+        $products = $order->getEntityId()['products'];
+        $skus = [];
+
+        foreach ($products as $key => $productSku) {
+            $skus[$key] = $this->_rootElement
+                ->find(sprintf($this->productSku, $productSku->getName()), Locator::SELECTOR_XPATH)->getText();
+        }
+
+        return $skus;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
index f848284113b61..d4e3ececb4ec2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
@@ -45,7 +45,7 @@ public function processAssert(AbandonedCarts $abandonedCarts, $products, Custome
         $abandonedCarts->getGridBlock()->search($filter);
         $filter['created_at'] = date('M j, Y');
         $filter['updated_at'] = date('M j, Y');
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $abandonedCarts->getGridBlock()->isRowVisible($filter, false, false),
             'Expected customer info is absent in Abandoned Carts report grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
index 0c81a2b2b5f38..cdfac1066b0b6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
@@ -36,7 +36,7 @@ public function processAssert(Bestsellers $bestsellers, OrderInjectable $order,
             'orders' => $product->getCheckoutData()['qty'],
         ];
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $bestsellers->getGridBlock()->isRowVisible($filter, false),
             'Bestseller does not present in report grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
index 932ddad46483e..6bcdff4b9626a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
@@ -37,7 +37,7 @@ public function processAssert(SalesCouponReportView $salesCouponReportView, Orde
             'subtotal' => $currency . number_format($data['price']['subtotal'], 2),
             'discount' => $discount,
         ];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $salesCouponReportView->getGridBlock()->isRowVisible($filter, false),
             "Coupon with code - '$couponCode' is not visible."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
index 4b01906e2d657..7227bc298c485 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
@@ -31,7 +31,7 @@ public function processAssert(
     ) {
         $filter = $this->prepareFilter($customer, $columns, $report);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerOrdersReport->getGridBlock()->isRowVisible($filter, false),
             'Order does not present in count grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
index fabe17f49dc55..a3adf8302c394 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
@@ -31,7 +31,7 @@ public function processAssert(
     ) {
         $filter = $this->prepareFilter($customer, $columns, $report);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerTotalsReport->getGridBlock()->isRowVisible($filter, false),
             'Order does not present in report grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
index 6b1e7eacec777..9d4e5360ccb94 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
@@ -40,7 +40,7 @@ public function processAssert(OrderInjectable $order, DownloadsReport $downloads
                 ];
                 $downloadsReport->getGridBlock()->search($filter);
                 $filter[] = $downloads;
-                \PHPUnit_Framework_Assert::assertTrue(
+                \PHPUnit\Framework\Assert::assertTrue(
                     $downloadsReport->getGridBlock()->isRowVisible($filter, false),
                     "Downloads report link {$link['title']} is not present in reports grid."
                 );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
index 5428b893d9e10..17b7426ceb741 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
@@ -32,7 +32,7 @@ public function processAssert(OrderInjectable $order, array $invoiceReport, arra
         $this->searchInInvoiceReportGrid($invoiceReport);
         $invoiceResult = $this->salesInvoiceReport->getGridBlock()->getLastResult();
         $prepareInitialResult = $this->prepareExpectedResult($initialInvoiceResult);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $invoiceResult,
             "Invoice report interval result not contains actual data."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
index ca3cf75603d1b..207bba94028ac 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
@@ -28,7 +28,7 @@ public function processAssert(OrderInjectable $order, array $invoiceReport, arra
         $this->searchInInvoiceReportGrid($invoiceReport);
         $invoiceResult = $this->salesInvoiceReport->getGridBlock()->getTotalResult();
         $prepareInitialResult = $this->prepareExpectedResult($initialInvoiceTotalResult);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $invoiceResult,
             "Grand total Invoice result is not correct."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLifetimeStatisticsUpdatedMessage.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLifetimeStatisticsUpdatedMessage.php
index 60f8f98ee4554..575043242cc88 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLifetimeStatisticsUpdatedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLifetimeStatisticsUpdatedMessage.php
@@ -28,7 +28,7 @@ class AssertLifetimeStatisticsUpdatedMessage extends AbstractConstraint
     public function processAssert(Statistics $reportStatistics)
     {
         $successMessage = $reportStatistics->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::LIFETIME_STATISTICS_UPDATED_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
index 8175a76bb5fdc..6854956f69b0c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
@@ -26,7 +26,7 @@ class AssertLowStockProductInGrid extends AbstractConstraint
     public function processAssert(CatalogProductSimple $product, ProductLowStock $productLowStock)
     {
         $productLowStock->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productLowStock->getLowStockGrid()->isRowVisible(['name' => $product->getName()]),
             'Product with Low Stock is absent in Low Stock grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
index 263fe3c97a4db..29983bbb24433 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
@@ -25,7 +25,7 @@ class AssertNewAccountsReportTotalResult extends AbstractConstraint
     public function processAssert(CustomerAccounts $customerAccounts, $total)
     {
         $totalForm = $customerAccounts->getGridBlock()->getTotalResults();
-        \PHPUnit_Framework_Assert::assertEquals($total, $totalForm);
+        \PHPUnit\Framework\Assert::assertEquals($total, $totalForm);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductReportForConfigurableProduct.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductReportForConfigurableProduct.php
new file mode 100644
index 0000000000000..fa10fbc955891
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductReportForConfigurableProduct.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Constraint;
+
+use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
+use Magento\Reports\Test\Page\Adminhtml\OrderedProductsReport;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert product name, sku and qty in Ordered Products report.
+ */
+class AssertOrderedProductReportForConfigurableProduct extends AbstractConstraint
+{
+    /**
+     * Assert product name, sku and qty in Ordered Products report.
+     *
+     * @param OrderedProductsReport $orderedProducts
+     * @param OrderInjectable $order
+     * @return void
+     */
+    public function processAssert(OrderedProductsReport $orderedProducts, OrderInjectable $order)
+    {
+        $products = $order->getEntityId()['products'];
+        $simpleChildSku = $orderedProducts->getGridBlock()->getOrdersResultsforConfigurableProducts($order);
+        $filters = [];
+        foreach ($products as $product) {
+            /** @var ConfigurableProduct $product */
+            if ($product->hasData('configurable_attributes_data')) {
+                $matrix = isset($product->getConfigurableAttributesData()['matrix']) ?
+                    $product->getConfigurableAttributesData()['matrix'] : [];
+                foreach ($matrix as $variation) {
+                    $filters[] = $variation['sku'];
+                }
+            }
+        }
+
+        \PHPUnit\Framework\Assert::assertContains(
+            $simpleChildSku[0],
+            $filters,
+            'Ordered simple product sku is not present in the Reports grid'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Child  product sku is present on the Ordered Products report grid';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
index 85369b730de79..bfb771060f54f 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
@@ -37,7 +37,7 @@ public function processAssert(OrderedProductsReport $orderedProducts, OrderInjec
             $product = $products[$key];
             $productQty[$key] = $product->getCheckoutData()['qty'];
         }
-        \PHPUnit_Framework_Assert::assertEquals($totalQuantity, $productQty);
+        \PHPUnit\Framework\Assert::assertEquals($totalQuantity, $productQty);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
index 445aac584be5d..54b5b76502ce2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
@@ -27,7 +27,7 @@ class AssertProductInCartResult extends AbstractConstraint
     public function processAssert(ShopCartProductReport $shopCartProductReport, CatalogProductSimple $product, $carts)
     {
         $shopCartProductReport->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $shopCartProductReport->getGridBlock()->isProductVisible($product, $carts),
             'Product is absent in Products in Carts report grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
index 914f1d6039e3c..039118e6b9f89 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
@@ -47,7 +47,7 @@ public function processAssert(
         $customerReportReview->getGridBlock()->openReview($customer);
         $reviewIndex->getReviewGrid()->search($filter);
         unset($filter['visible_in']);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $reviewIndex->getReviewGrid()->isRowVisible($filter, false),
             'Customer review is absent in Review grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
index e057af25af678..fff57fa4d258a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
@@ -47,7 +47,7 @@ public function processAssert(
         $customerReportReview->getGridBlock()->openReview($customer);
         $reviewIndex->getReviewGrid()->search($filter);
         unset($filter['visible_in']);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $reviewIndex->getReviewGrid()->isRowVisible($filter, false),
             'Customer review is present in Review grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
index 67975e240c2c4..11e15df66b3b1 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
@@ -40,7 +40,7 @@ public function processAssert(
         unset($assertProductReviewInGrid->filter['visible_in']);
         $filter = $assertProductReviewInGrid->prepareFilter($product, $review->getData(), '');
         $reviewIndex->getReviewGrid()->resetFilter();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $reviewIndex->getReviewGrid()->isRowVisible($filter, false),
             'Review for ' . $product->getName() . ' product is not visible in reports grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
index bafb17c7f2fae..0b6bb7c5b0ad4 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(ProductReportReview $productReportReview, Review $
     {
         $productReportReview->open();
         $name = $review->getDataFieldConfig('entity_id')['source']->getEntity()->getName();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productReportReview->getGridBlock()->isRowVisible(['title' => $name], false),
             'Review for ' . $name . ' product is not visible in reports grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
index 1f4fa26de55de..de48407fdcebc 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
@@ -31,7 +31,7 @@ public function processAssert(
     ) {
         $customerName = $customer->getFirstname() . ' ' . $customer->getLastname();
         $customerReportReview->open();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $reviewsCount,
             $customerReportReview->getGridBlock()->getQtyReview($customerName),
             'Wrong qty review in Customer Reviews Report grid.'
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
index 9c84cb5e4e74a..7ae1fcb2b6e34 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
@@ -27,7 +27,7 @@ public function processAssert(ProductReportView $productReportView, $total, arra
     {
         $total = explode(', ', $total);
         $totalForm = $productReportView->getGridBlock()->getViewsResults($productsList);
-        \PHPUnit_Framework_Assert::assertEquals($totalForm, $total);
+        \PHPUnit\Framework\Assert::assertEquals($totalForm, $total);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRecentStatisticsUpdatedMessage.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRecentStatisticsUpdatedMessage.php
index a6ce5f3b7ddf2..d8f6bbaef0e59 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRecentStatisticsUpdatedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRecentStatisticsUpdatedMessage.php
@@ -28,7 +28,7 @@ class AssertRecentStatisticsUpdatedMessage extends AbstractConstraint
     public function processAssert(Statistics $reportStatistics)
     {
         $successMessage = $reportStatistics->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::RECENT_STATISTICS_UPDATED_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
index c7cfa1d6aadc1..2def81b453b54 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
@@ -39,7 +39,7 @@ public function processAssert(
         $this->searchInSalesReportGrid($refundsReport);
         $salesResult = $refundsReportPage->getGridBlock()->getLastResult();
         $prepareInitialResult = $this->prepareExpectedResult($initialRefundsResult);
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $salesResult,
             "Refund total Sales result is not correct."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
index 4650905fc4147..f68666366a663 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
@@ -40,7 +40,7 @@ public function processAssert(
         $date = $this->getLastUpdatedDate();
         $currentDateTime = $currentDate->format('M j, Y, g');
         $displayedDateTime = date('M j, Y, g', strtotime($date));
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $currentDateTime,
             $displayedDateTime,
             "Message in Sales Reports Page is displayed in an incorrect timezone."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportsUpdatedTimezone.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportsUpdatedTimezone.php
index 00d29a47281ad..4cbf3ceacefda 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportsUpdatedTimezone.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportsUpdatedTimezone.php
@@ -27,7 +27,7 @@ public function processAssert(Statistics $reportStatistics)
         $currentDate  = new \DateTime();
         $currentDate->setTimezone(new \DateTimeZone($_ENV['magento_timezone']));
         foreach ($dates as $date) {
-            \PHPUnit_Framework_Assert::assertContains(
+            \PHPUnit\Framework\Assert::assertContains(
                 $currentDate->format('M j, Y, g'),
                 date('M j, Y, g', strtotime($date['updated_at'])),
                 "Reports 'Updated' column values are displayed in an incorrect timezone."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
index c28023f8411cd..1236a86e160b6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
@@ -35,7 +35,7 @@ public function processAssert(
         $this->searchInSalesReportGrid($salesReport);
         $salesResult = $this->prepareSalesResult($salesReportPage->getGridBlock()->getLastResult());
         $prepareInitialResult = $this->prepareSalesResult($this->prepareExpectedResult($initialSalesResult));
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $salesResult,
             "Grand total Sales result is not correct."
@@ -52,7 +52,7 @@ protected function prepareSalesResult($salesResult)
     {
         $data = [];
         foreach ($salesResult as $key => $result) {
-            $data[$key] = floatval($result);
+            $data[$key] = (float)$result;
         }
 
         return $data;
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
index 137788441b6d6..423ca6dafbdde 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
@@ -35,7 +35,7 @@ public function processAssert(
         $this->searchInSalesReportGrid($salesReport);
         $salesResult = $this->prepareSalesResult($salesReportPage->getGridBlock()->getTotalResult());
         $prepareInitialResult = $this->prepareSalesResult($this->prepareExpectedResult($initialSalesTotalResult));
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $salesResult,
             "Grand total Sales result is not correct."
@@ -52,7 +52,7 @@ protected function prepareSalesResult($salesResult)
     {
         $data = [];
         foreach ($salesResult as $key => $result) {
-            $data[$key] = floatval($result);
+            $data[$key] = (float)$result;
         }
 
         return $data;
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
index 2031dc38d89c8..ed8950579486b 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
@@ -43,7 +43,7 @@ public function processAssert(
 
         $dataDiff = $this->verifyData($filter, $catalogSearchEdit->getForm()->getData());
 
-        \PHPUnit_Framework_Assert::assertEmpty($dataDiff, $dataDiff);
+        \PHPUnit\Framework\Assert::assertEmpty($dataDiff, $dataDiff);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
index eb33b40a82e58..6421f79aaad4a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(SearchIndex $searchIndex, $productName, $countProd
             'num_results' => $countProducts,
             'popularity' => $countSearch,
         ];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $searchIndex->getSearchGrid()->isRowVisible($filter),
             'Search terms report is absent in Search Terms grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportIntervalResult.php
index fe72467d82ff5..94692f922e8aa 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportIntervalResult.php
@@ -28,7 +28,7 @@ public function processAssert(OrderInjectable $order, array $shippingReport, arr
         $shipmentResult = $this->salesShippingReport->getGridBlock()->getLastResult();
         $prepareInitialResults = $this->prepareExpectedResult($initialShippingResult, $shipmentResult);
         list($prepareInitialResult, $shipmentResult) = $prepareInitialResults;
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $shipmentResult,
             "Shipment report interval result not contains actual data."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportTotalResult.php
index 1cf0fcf530348..16e92554e3984 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertShippingReportTotalResult.php
@@ -28,7 +28,7 @@ public function processAssert(OrderInjectable $order, array $shippingReport, arr
         $shipmentResult = $this->salesShippingReport->getGridBlock()->getTotalResult();
         $prepareInitialResults = $this->prepareExpectedResult($initialShippingTotalResult, $shipmentResult);
         list($prepareInitialResult, $shipmentResult) = $prepareInitialResults;
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prepareInitialResult,
             $shipmentResult,
             "Grand total Shipment result is not correct."
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
index 17e6c545dbd4a..3f22780b8a01c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
@@ -39,7 +39,7 @@ public function processAssert(
             'tax_amount' => $taxAmount,
         ];
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $salesTaxReport->getGridBlock()->isRowVisible($filter, false),
             "Tax Report is not visible in grid on tax report page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
index 76267dac55eb1..095c83a7e5fb0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
@@ -43,7 +43,7 @@ public function processAssert(
             'tax_amount' => $taxAmount,
         ];
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $salesTaxReport->getGridBlock()->isRowVisible($filter, false),
             "Tax Report is visible in grid on tax report page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index 72a3b2b5f68d1..610387d9a39eb 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -34,7 +34,7 @@ class AbandonedCartsReportEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'no';
-    const STABLE = 'no';
+    const STABLE = 'yes';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
index 570cbb5ba8f16..b43eb335d36c5 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
@@ -28,7 +28,6 @@ class OrderedProductsReportEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'no';
-    const STABLE = 'no';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.xml
index a6b325e19d29c..2667f3cf77a02 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.xml
@@ -28,5 +28,13 @@
             <data name="customersReport/report_period" xsi:type="string">Day</data>
             <constraint name="Magento\Reports\Test\Constraint\AssertOrderedProductResult" />
         </variation>
+        <variation name="OrderedProductsReportEntityTestVariation4" summary="Ordered Product Report for Configurable Product" ticketId="MAGETWO-89752">
+            <data name="order/dataset" xsi:type="string">configurable_product</data>
+            <data name="customersReport/report_from" xsi:type="string">m/d/Y -1 day</data>
+            <data name="customersReport/report_to" xsi:type="string">m/d/Y</data>
+            <data name="customersReport/report_period" xsi:type="string">Day</data>
+            <constraint name="Magento\Reports\Test\Constraint\AssertOrderedProductResult" />
+            <constraint name="Magento\Reports\Test\Constraint\AssertOrderedProductReportForConfigurableProduct" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
index 30e790f978c42..1a4cb787bf1c7 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntityTest.php
@@ -102,10 +102,12 @@ public function test(
         $productUrl = $_ENV['app_frontend_url'] . $product->getUrlKey() . '.html';
         $browser->open($productUrl);
         $this->catalogProductView->getViewBlock()->addToCart($product);
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         if ($isGuest) {
             $this->objectManager->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run();
             $browser->open($productUrl);
             $this->catalogProductView->getViewBlock()->addToCart($product);
+            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
index d4d219245b7eb..83a8b44a8b322 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(RatingIndex $ratingIndex, Rating $productRating)
         $filter = ['rating_code' => $productRating->getRatingCode()];
 
         $ratingIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $ratingIndex->getRatingGrid()->isRowVisible($filter),
             "Product Rating " . $productRating->getRatingCode() . " is absent on product Rating grid."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
index 6b8738281bc93..e89b1ea9a9851 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
@@ -43,7 +43,7 @@ public function processAssert(
         }
         $rating = $productRating ? $productRating : $review->getDataFieldConfig('ratings')['source']->getRatings()[0];
         $reviewForm = $catalogProductView->getReviewFormBlock();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $reviewForm->isVisibleRating($rating),
             'Product rating "' . $rating->getRatingCode() . '" is not displayed.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
index 93ea7d8abcccd..b4e720ad622d4 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(RatingIndex $ratingIndex, Rating $productRating)
         $filter = ['rating_code' => $productRating->getRatingCode()];
 
         $ratingIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $ratingIndex->getRatingGrid()->isRowVisible($filter),
             "Product Rating " . $productRating->getRatingCode() . " exists on product Rating grid."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
index df18d81c69be1..4a2d11e1bb9f7 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
@@ -36,7 +36,7 @@ public function processAssert(
         $catalogProductView->getReviewSummary()->getAddReviewLink()->click();
 
         $reviewForm = $catalogProductView->getReviewFormBlock();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $reviewForm->isVisibleRating($productRating),
             'Product rating "' . $productRating->getRatingCode() . '" is displayed.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
index 1058c2f141dfd..d992791759eaf 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
@@ -44,7 +44,7 @@ public function processAssert(
         $ratingForm = $reviewEdit->getReviewForm()->getData();
         $ratingForm = $this->sortDataByPath($ratingForm['ratings'], '::title');
         $error = $this->verifyData($ratingReview, $ratingForm);
-        \PHPUnit_Framework_Assert::assertTrue(empty($error), $error);
+        \PHPUnit\Framework\Assert::assertTrue(empty($error), $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
index 949f4b346eddd..f803f8c4b8b5b 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertProductRatingSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(RatingIndex $ratingIndex)
     {
         $actualMessage = $ratingIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
index 0da2ac94168e0..edd11c3fed0a7 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertProductRatingSuccessSaveMessage extends AbstractConstraint
     public function processAssert(RatingIndex $ratingIndex)
     {
         $actualMessage = $ratingIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
index de6991bd08b5c..7297196efc9e7 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
@@ -28,7 +28,7 @@ class AssertProductReviewBackendSuccessSaveMessage extends AbstractConstraint
      */
     public function processAssert(ReviewIndex $reviewIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $reviewIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
index aa45406b3212b..615fe93aecc64 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
@@ -54,7 +54,7 @@ public function processAssert(ReviewIndex $reviewIndex, Review $review, ReviewEd
 
         $error = $this->verifyData($fixtureData, $formData);
 
-        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+        \PHPUnit\Framework\Assert::assertEmpty($error, $error);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
index 9bc9bb4e8b98e..9cbd72ce47658 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
@@ -53,7 +53,7 @@ public function processAssert(
         $reviewIndex->open();
         $reviewIndex->getReviewGrid()->search($filter);
         unset($filter['visible_in']);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $reviewIndex->getReviewGrid()->isRowVisible($filter, false),
             'Review is absent in Review grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
index ce7d675c2f3f4..0b46e23b3e8bc 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
@@ -48,7 +48,7 @@ public function processAssert(
         $reviewsGrid = $customerIndexEdit->getCustomerForm()->getTab('product_reviews')->getReviewsGrid();
         $reviewsGrid->search($filter);
         unset($filter['visible_in']);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $reviewsGrid->isRowVisible($filter, false),
             'Review is absent in Review grid on customer page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
index 9a32353a02a87..d16bbdf4811a5 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
@@ -36,12 +36,12 @@ public function processAssert(CatalogProductView $catalogProductView)
     {
         $catalogProductView->getViewBlock()->selectTab('Reviews');
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $catalogProductView->getCustomerReviewBlock()->isVisibleReviewItem(),
             'No reviews below the form required.'
         );
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NO_REVIEW_LINK_TEXT,
             trim($catalogProductView->getReviewSummary()->getAddReviewLink()->getText()),
             sprintf('"%s" link is not available', self::NO_REVIEW_LINK_TEXT)
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
index 5cf7238875a73..3680d9daca3f6 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
@@ -36,7 +36,7 @@ public function processAssert(Review $review, ReviewIndex $reviewIndex)
     {
         $reviews = is_array($review) ? $review : [$review];
         $deleteMessage = sprintf(self::SUCCESS_DELETE_MESSAGE, count($reviews));
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $deleteMessage,
             $reviewIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
index 6603008b76d14..bf08bf6cf6cb2 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
@@ -32,7 +32,7 @@ public function processAssert(Review $review, ReviewIndex $reviewIndex)
     {
         $reviews = is_array($review) ? $review : [$review];
         $successMessage = sprintf(self::SUCCESS_MESSAGE, count($reviews));
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $successMessage,
             $reviewIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
index ae5f2d0f4915b..59d21f1d2f472 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
@@ -56,7 +56,7 @@ public function processAssert(
 
         $reviewIndex->getReviewGrid()->search($filter);
         unset($filter['visible_in']);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $reviewIndex->getReviewGrid()->isRowVisible($filter, false),
             'Review available in grid'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
index 149e566a34dfd..71db324783568 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
@@ -37,7 +37,7 @@ public function processAssert(
 
         $reviewBlock = $catalogProductView->getCustomerReviewBlock();
         $catalogProductView->getViewBlock()->selectTab('Reviews');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $reviewBlock->isVisibleReviewItem(),
             'Error, product review is displayed.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
index 320d3a894835f..fe9822ddd45ae 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
@@ -42,7 +42,7 @@ public function processAssert(
         $reviewBlock = $catalogProductView->getCustomerReviewBlock();
         $catalogProductView->getViewBlock()->selectTab('Reviews');
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             sprintf("You're reviewing:\n%s", $product->getName()),
             $catalogProductView->getReviewFormBlock()->getLegend()->getText()
         );
@@ -54,7 +54,7 @@ public function processAssert(
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             'The Review contains the following errors:' . PHP_EOL . implode(PHP_EOL, $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
index 9b9646cfb184a..f35596cddcb24 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
@@ -28,7 +28,7 @@ class AssertReviewCreationSuccessMessage extends AbstractConstraint
     public function processAssert(CatalogProductView $catalogProductView)
     {
         $actualMessage = $catalogProductView->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
index 20685a58064dc..8a3e85ab34c24 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
@@ -36,18 +36,18 @@ public function processAssert(Browser $browser, CatalogProductView $catalogProdu
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
 
         // Verify add review link
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogProductView->getReviewSummary()->getAddReviewLink()->isVisible(),
             'Add review link is not visible on product page.'
         );
 
         // Verify view review link
         $viewReviewLink = $catalogProductView->getReviewSummary()->getViewReviewLink();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $viewReviewLink->isVisible(),
             'View review link is not visible on product page.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             '1',
             $viewReviewLink->getText(),
             'There is more than 1 approved review.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
index f48397dc9213b..97f8c86639dde 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertReviewSuccessSaveMessage extends AbstractConstraint
     public function processAssert(ReviewIndex $reviewIndex)
     {
         $actualMessage = $reviewIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
index 075505a404147..b7612ff3351f6 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
@@ -70,7 +70,7 @@ protected function flushCacheStorageWithAssert()
         $this->cachePage->open();
         $this->cachePage->getActionsBlock()->flushCacheStorage();
         $this->cachePage->getModalBlock()->acceptAlert();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->cachePage->getActionsBlock()->isStorageCacheFlushed(),
             'Cache is not flushed.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
index 573f28f09b78c..7a6903ef47aac 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
@@ -137,6 +137,16 @@ class Actions extends Block
      */
     protected $confirmModal = '.confirm._show[data-role=modal]';
 
+    /**
+     * Is shipment can be created.
+     *
+     * @return bool
+     */
+    public function canShip()
+    {
+        return $this->_rootElement->find($this->ship)->isVisible();
+    }
+
     /**
      * Ship order.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index 5b9ae99a2e868..14bc04cfed70c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -105,7 +105,7 @@ class Create extends Block
      *
      * @var string
      */
-    protected $orderMethodsSelector = '#order-methods';
+    protected $orderMethodsSelector = '#shipping-methods';
 
     /**
      * Page header.
@@ -323,7 +323,6 @@ public function fillShippingAddress(FixtureInterface $shippingAddress)
      */
     public function selectShippingMethod(array $shippingMethod)
     {
-        $this->_rootElement->find($this->orderMethodsSelector)->click();
         $this->getShippingMethodBlock()->selectShippingMethod($shippingMethod);
         $this->getTemplateBlock()->waitLoader();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
index dee1336c14e4c..e5c414c4807d6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -22,6 +22,13 @@ class Method extends Block
      */
     private $paymentMethod = '#p_method_%s';
 
+    /**
+     * Get available payment methods link.
+     *
+     * @var string
+     */
+    private $billingMethodsLink = '#order-billing_method_summary a';
+
     /**
      * Purchase order number selector.
      *
@@ -59,6 +66,13 @@ class Method extends Block
      */
     public function selectPaymentMethod(array $payment, CreditCard $creditCard = null)
     {
+        $this->waitForElementNotVisible($this->loader);
+        $billingMethodsLink = $this->_rootElement->find($this->billingMethodsLink);
+        if ($billingMethodsLink->isPresent()) {
+            $billingMethodsLink->click();
+            $this->waitForElementNotVisible($this->loader);
+        }
+
         $paymentMethod = $payment['method'];
         $paymentInput = $this->_rootElement->find(sprintf($this->paymentMethod, $paymentMethod));
         if ($paymentInput->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
index 1dbe1dd94685a..0f748aa0a8c54 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
@@ -36,7 +36,7 @@ abstract class Sidebar extends Block
     protected $addToOrderProductName = './/tr/td[.="%s"]';
 
     /**
-     * Add productz to order.
+     * Add products to order.
      *
      * @param array $products
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
index daa58a3447c02..61c48d62630f4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
@@ -73,6 +73,7 @@ function () use ($element, $selector) {
                 return $addProductsButton->isVisible() ? true : null;
             }
         );
+        $this->getTemplateBlock()->waitLoader();
         $this->_rootElement->find($this->addProducts, Locator::SELECTOR_XPATH)->click();
         $this->getTemplateBlock()->waitLoader();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
index 2ee6269c39d47..b5acaf01f5483 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -44,13 +44,12 @@ class Method extends Block
     public function selectShippingMethod(array $shippingMethod)
     {
         $this->waitFormLoading();
-        $this->_rootElement->waitUntil(
-            function () {
-                return $this->_rootElement->find($this->shippingMethodsLink)->isVisible() ? true : null;
-            }
-        );
+        $shippingMethodsLink = $this->_rootElement->find($this->shippingMethodsLink);
+        if ($shippingMethodsLink->isPresent()) {
+            $shippingMethodsLink->click();
+            $this->waitFormLoading();
+        }
 
-        $this->_rootElement->find($this->shippingMethodsLink)->click();
         $selector = sprintf(
             $this->shippingMethod,
             $shippingMethod['shipping_service'],
@@ -67,7 +66,6 @@ function () {
      */
     private function waitFormLoading()
     {
-        $this->_rootElement->click();
         $this->browser->waitUntil(
             function () {
                 return $this->browser->find($this->waitElement)->isVisible() ? null : true;
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form/Items.php
index 74d522e9545a8..431116903d372 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form/Items.php
@@ -51,6 +51,9 @@ public function getItemProductBlock($productSku)
      */
     public function clickUpdateQty()
     {
-        $this->_rootElement->find($this->updateQty)->click();
+        $button = $this->_rootElement->find($this->updateQty);
+        if (!$button->isDisabled()) {
+            $button->click();
+        }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
index 3f89e5fff0d71..9e1c08a906fa3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php
@@ -39,7 +39,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
 
-        \PHPUnit_Framework_Assert::assertContains(self::$message, $latestComment['comment']);
+        \PHPUnit\Framework\Assert::assertContains(self::$message, $latestComment['comment']);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php
index 1b15b20e4ffec..4433cbd6dc339 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php
@@ -29,7 +29,7 @@ class AssertAcceptPaymentSuccessMessagePresent extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::$successAcceptMessage,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
index 574ac9d249ed0..055b850141b0e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php
@@ -43,7 +43,7 @@ public function processAssert(
         $orderComments = $infoTab->getCommentsHistoryBlock()->getComments();
         $commentsMessages = array_column($orderComments, 'comment');
 
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             sprintf(self::AUTHORIZED_AMOUNT_PATTERN, $prices['grandTotal']),
             implode('. ', $commentsMessages),
             'Incorrect authorized amount value for the order #' . $orderId
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php
index 05acfd07ead98..f4b893a7c700a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCancelInCommentsHistory.php
@@ -41,7 +41,7 @@ public function processAssert(
         $comments = $infoTab->getCommentsHistoryBlock()->getComments();
         $commentsMessages = array_column($comments, 'comment');
 
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             sprintf($this->canceledAmountPattern, $prices['grandTotal']),
             implode('. ', $commentsMessages),
             'Incorrect canceled amount value for the order #' . $orderId
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
index 451f656d5e1b6..1e38108c3c3e6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
@@ -52,7 +52,7 @@ public function processAssert(
         $comments = array_values($comments);
 
         foreach ($capturedPrices as $key => $capturedPrice) {
-            \PHPUnit_Framework_Assert::assertRegExp(
+            \PHPUnit\Framework\Assert::assertRegExp(
                 sprintf(self::CAPTURED_AMOUNT_PATTERN, preg_quote(number_format($capturedPrice, 2, '.', ''))),
                 $comments[$key]['comment'],
                 'Incorrect captured amount value for the order #' . $orderId
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionIsEmptyOnBackendOrderPage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionIsEmptyOnBackendOrderPage.php
index b00ad1cee42b9..cbe3aab2a7ecf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionIsEmptyOnBackendOrderPage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionIsEmptyOnBackendOrderPage.php
@@ -24,7 +24,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex)
     {
         $orderCreateIndex->open();
         $backendOrderSidebarBlock = $orderCreateIndex->getBackendOrderSidebarBlock()->noItemsInCartCheck();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $backendOrderSidebarBlock,
             "Customer's Shopping Cart section on Order Create backend page is not empty."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionWithProductsOnBackendOrderPage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionWithProductsOnBackendOrderPage.php
index dc7790fbe0f31..400ba83d66309 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionWithProductsOnBackendOrderPage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCartSectionWithProductsOnBackendOrderPage.php
@@ -28,7 +28,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex, array $product
             $expectedItemNames[] = $product->getName();
         }
         $itemsNames = $orderCreateIndex->getBackendOrderSidebarBlock()->getCartItemsNames();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sort($expectedItemNames),
             sort($itemsNames),
             "Customer's Shopping Cart section on Order Create backend page doesn't contain correct products."
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
index 5a91a40dabae0..e3b12274604ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
@@ -28,7 +28,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
     {
         $orderIndex->open();
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $salesOrderView->getPageActions()->isActionButtonVisible('Credit Memo'),
             'Credit memo button is absent on order view page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
index ed5c060a3df48..f0019051213b1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
@@ -43,7 +43,7 @@ public function processAssert(
             $creditMemoIndex->getCreditMemoGrid()->searchAndOpen($filter);
             $itemsData = $this->preparePageItems($salesCreditMemoView->getItemsBlock()->getData());
             $error = $this->verifyData($productsData, $itemsData);
-            \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+            \PHPUnit\Framework\Assert::assertEmpty($error, $error);
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
index 04c4f4ea89815..254388a595e5e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php
@@ -40,7 +40,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
 
-        \PHPUnit_Framework_Assert::assertContains(self::$message, $latestComment['comment']);
+        \PHPUnit\Framework\Assert::assertContains(self::$message, $latestComment['comment']);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php
index 08923d715c71d..bf8949ed0c867 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php
@@ -29,7 +29,7 @@ class AssertDenyPaymentSuccessMessagePresent extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::$successDenyMessage,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
index 9b0067d8f2e34..bc2f11be623cd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
@@ -43,7 +43,7 @@ public function processAssert(InvoiceIndex $invoiceIndex, OrderInjectable $order
             $invoiceIndex->getInvoicesGrid()->search($filter);
             $filter['grand_total_from'] = number_format($amount[$key]['grand_invoice_total'], 2);
             $filter['grand_total_to'] = number_format($amount[$key]['grand_invoice_total'], 2);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $invoiceIndex->getInvoicesGrid()->isRowVisible($filter, false, false),
                 'Invoice is absent in invoices grid on invoice index page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
index eda14b36798c3..392b1d1ad1331 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
@@ -47,7 +47,7 @@ public function processAssert(
             $grid->search($filter);
             $filter['amount_from'] = number_format($amount[$key]['grand_invoice_total'], 2);
             unset($filter['amount_to']);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $grid->isRowVisible($filter, false, false),
                 'Invoice is absent on invoices tab.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
index 2b92133ff4dc7..db039fdbd8f99 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
@@ -46,7 +46,7 @@ public function processAssert(
             $invoiceIndex->getInvoicesGrid()->searchAndOpen($filter);
             $itemsData = $this->preparePageItems($salesInvoiceView->getItemsBlock()->getData());
             $error = $this->verifyData($productsData, $itemsData);
-            \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+            \PHPUnit\Framework\Assert::assertEmpty($error, $error);
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceNotInInvoicesGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceNotInInvoicesGrid.php
index 17a3206777a61..56beda6db2202 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceNotInInvoicesGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceNotInInvoicesGrid.php
@@ -42,7 +42,7 @@ public function processAssert(InvoiceIndex $invoiceIndex, OrderInjectable $order
             $invoiceIndex->getInvoicesGrid()->search($filter);
             $filter['grand_total_from'] = number_format($amount[$key]['grand_invoice_total'], 2);
             $filter['grand_total_to'] = number_format($amount[$key]['grand_invoice_total'], 2);
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $invoiceIndex->getInvoicesGrid()->isRowVisible($filter, false, false),
                 'Invoice is present in invoices grid on invoice index page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php
index 451a4d1bb905c..0253d1c12d8db 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php
@@ -35,7 +35,7 @@ public function processAssert(
             'order_id' => $orderId,
             'status' => $invoiceStatus,
         ];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $grid->isRowVisible($filter),
             'Invoice status is incorrect.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
index b61561f50b60f..12dbcbc0a27ae 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
@@ -27,7 +27,7 @@ class AssertInvoiceSuccessCreateMessage extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_CREATE_MESSAGE,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
index 3f034bbca1b24..afbe2dda07dcd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
@@ -27,7 +27,7 @@ class AssertInvoiceWithShipmentSuccessMessage extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
index caed93731109d..c5f35cd42392f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
@@ -38,7 +38,7 @@ public function processAssert(
         $orderHistory->getOrderHistoryBlock()->openOrderById($order->getId());
         $customerOrderView->getOrderViewBlock()->openLinkByName('Invoices');
         foreach ($ids['invoiceIds'] as $key => $invoiceId) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($order->getPrice()['invoice'][$key]['grand_invoice_total'], 2),
                 $invoiceView->getInvoiceBlock()->getItemBlock($invoiceId)->getGrandTotal()
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedOrderOnDashboard.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedOrderOnDashboard.php
index 8e0ee651d23f6..744e05c1b587f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedOrderOnDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedOrderOnDashboard.php
@@ -35,7 +35,7 @@ public function processAssert(
         )->run()['dashboardOrder']['quantity'];
         $invoicedOrdersQty = $orderQty - $dashboardOrder['quantity'];
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $invoicedOrdersQty,
             $expectedOrdersQuantityOnDashboard,
             'Order quantity om admin dashboard is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionContainsProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionContainsProducts.php
index 86a90a7327196..c6b33de864c0d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionContainsProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionContainsProducts.php
@@ -27,7 +27,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex, array $product
             $expectedItemNames[] = $product->getName();
         }
         $itemsNames = $orderCreateIndex->getCreateBlock()->getItemsBlock()->getItemsNames();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sort($expectedItemNames),
             sort($itemsNames),
             "Items Ordered section on Create Order page on backend doesn't contain correct products."
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionOnBackendOrderIsEmpty.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionOnBackendOrderIsEmpty.php
index 79f398e9ac346..4fb61f74304ee 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionOnBackendOrderIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertItemsOrderedSectionOnBackendOrderIsEmpty.php
@@ -27,7 +27,7 @@ class AssertItemsOrderedSectionOnBackendOrderIsEmpty extends AbstractConstraint
      */
     public function processAssert(OrderCreateIndex $orderCreateIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $orderCreateIndex->getCreateBlock()->getItemsBlock()->getEmptyTextMessage(),
             self::TEXT_MESSAGE,
             'Items Ordered section on Create Order page on backend is not empty.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
index 21239242b3c89..c9bdbac4aa7ec 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
@@ -28,9 +28,9 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
     {
         $orderIndex->open();
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $salesOrderView->getPageActions()->isActionButtonVisible('Credit Memo'),
-            'Credit memo button is present on order view page.'
+            'Credit memo button should not be present on order view page.'
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
index 0c663d54bd6bc..f8b15bfc6ca41 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
@@ -28,7 +28,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
     {
         $orderIndex->open();
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $salesOrderView->getPageActions()->isActionButtonVisible('Invoice'),
             'Invoice button is present on order view page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOnlineInvoiceCannotBeCreated.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOnlineInvoiceCannotBeCreated.php
index 5b9f56c1450f5..fa43a807caef1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOnlineInvoiceCannotBeCreated.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOnlineInvoiceCannotBeCreated.php
@@ -40,7 +40,7 @@ public function processAssert(
         $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
         $salesOrderView->getPageActions()->invoice();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::OFFLINE_INVOICE_MESSAGE,
             $orderInvoiceNew->getTotalsBlock()->getCaptureOfflineMessage(),
             'Message incorrect or is not present.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php
index ba1636970164b..bd33a39443ed2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderAddresses.php
@@ -44,7 +44,7 @@ public function processAssert(
         $orderBillingAddress = $salesOrderView->getAddressesBlock()->getCustomerBillingAddress();
         $orderShippingAddress = $salesOrderView->getAddressesBlock()->getCustomerShippingAddress();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $selectedBillingAddress == $orderBillingAddress && $selectedShippingAddress == $orderShippingAddress,
             'Billing and shipping addresses from the address book and from the order page are not the same.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php
index 072aef2f6c637..548f2e9b15a71 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php
@@ -28,7 +28,7 @@ public function processAssert(
         $orderBillingAddress = $salesOrderView->getAddressesBlock()->getCustomerBillingAddress();
         $orderShippingAddress = $salesOrderView->getAddressesBlock()->getCustomerShippingAddress();
 
-        \PHPUnit_Framework_Assert::assertNotEquals(
+        \PHPUnit\Framework\Assert::assertNotEquals(
             $orderBillingAddress,
             $orderShippingAddress,
             "Billing and shipping addresses on order page are the same but shouldn't."
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
index 5ada4a3cb9a30..5059959ea8ac1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
@@ -34,7 +34,7 @@ public function processAssert(SalesOrderView $salesOrderView, $orderButtonsAvail
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $absentButtons,
             "Next buttons was not found on page: \n" . implode(";\n", $absentButtons)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
index 42fe4863da9fb..b3a4c571a89ba 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
@@ -40,7 +40,7 @@ public function processAssert(
                 $matches[] = $button;
             }
         }
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $matches,
             'Buttons are present on order page.'
             . "\nLog:\n" . implode(";\n", $matches)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderByDateInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderByDateInOrdersGrid.php
index 1dc11278edca7..1d66fc4e7e5ca 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderByDateInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderByDateInOrdersGrid.php
@@ -31,7 +31,7 @@ public function processAssert(OrderInjectable $order, OrderIndex $orderIndex)
         ];
         $orderIndex->open();
         $orderIndex->getSalesOrderGrid()->search($filter);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $orderIndex->getSalesOrderGrid()->isFirstRowVisible(),
             'Order with following id ' . $order->getId() . ' is absent in Orders grid with applied date.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
deleted file mode 100644
index f8c3d8da399cd..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Test\Constraint;
-
-use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Magento\Mtf\Constraint\AbstractConstraint;
-
-/**
- * Class AssertOrderCancelMassActionFailMessage
- * Assert cancel fail message is displayed on order index page
- */
-class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
-{
-    /**
-     * Text value to be checked
-     */
-    const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
-
-    /**
-     * Assert cancel fail message is displayed on order index page
-     *
-     * @param OrderIndex $orderIndex
-     * @return void
-     */
-    public function processAssert(OrderIndex $orderIndex)
-    {
-        \PHPUnit_Framework_Assert::assertEquals(
-            self::FAIL_CANCEL_MESSAGE,
-            $orderIndex->getMessagesBlock()->getErrorMessage()
-        );
-    }
-
-    /**
-     * Returns a string representation of the object
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Cancel fail message is displayed on order index page.';
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php
new file mode 100644
index 0000000000000..ed7596bf72f76
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertOrderCancelAndSuccessMassActionFailMessage
+ * Assert cancel fail message is displayed on order index page
+ */
+class AssertOrderCancelMassActionPartialFailMessage extends AbstractConstraint
+{
+    /**
+     * Text value to be checked
+     */
+    const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
+
+    /**
+     * Assert cancel fail message is displayed on order index page
+     *
+     * @param OrderIndex $orderIndex
+     * @return void
+     */
+    public function processAssert(OrderIndex $orderIndex)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            self::FAIL_CANCEL_MESSAGE,
+            $orderIndex->getMessagesBlock()->getErrorMessage()
+        );
+    }
+
+    /**
+     * Returns a string representation of the object
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Cancel fail message is displayed on order index page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
index 195ca78a53bb0..853aea8d370bd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
@@ -29,7 +29,7 @@ class AssertOrderCancelMassActionSuccessMessage extends AbstractConstraint
      */
     public function processAssert(OrderIndex $orderIndex, $ordersCount)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_CANCEL_MESSAGE, $ordersCount),
             $orderIndex->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
index fe1c1c3993d88..f48e40fa6fd57 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
@@ -27,7 +27,7 @@ class AssertOrderCancelSuccessMessage extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_CANCEL_MESSAGE,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCommentsHistoryNotifyStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCommentsHistoryNotifyStatus.php
index 225051d9f3cc0..95f1254d9be81 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCommentsHistoryNotifyStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCommentsHistoryNotifyStatus.php
@@ -37,7 +37,7 @@ public function processAssert(
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $latestComment['is_customer_notified'],
             (bool)$sendMail ? 'Customer Notified' : 'Customer Not Notified'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
index 4bdd286db72b1..5f2712bab87fc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
@@ -33,7 +33,7 @@ public function processAssert(
         $salesOrder->open();
         $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($prices['grandTotal'], 2, '.', ','),
             $salesOrderView->getOrderTotalsBlock()->getGrandTotal(),
             'Grand Total price does not equal to price from data set.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGraphImageIsVisible.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGraphImageIsVisible.php
index e41619fdf62ef..2d69d052ed567 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGraphImageIsVisible.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGraphImageIsVisible.php
@@ -33,7 +33,7 @@ public function processAssert(
             ['argumentsList' => $argumentsList]
         )->run();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $dashboard->getMainBlock()->isGraphImageVisible(),
             'Graph image is not visible on admin dashboard.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
index 855e12507f16a..0bd55817c4f92 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
@@ -46,7 +46,7 @@ public function assert(OrderInjectable $order, OrderIndex $orderIndex, $status,
             'status' => $status
         ];
         $errorMessage = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $orderIndex->getSalesOrderGrid()->isRowVisible(array_filter($filter)),
             'Order with following data \'' . $errorMessage . '\' is absent in Orders grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
index 07a42b165d609..7df33e2af23f0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
@@ -56,7 +56,7 @@ public function processAssert(
         )->run();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Orders');
         $errorMessage = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $orderHistory->getOrderHistoryBlock()->isOrderVisible($filter),
             'Order with following data \'' . $errorMessage . '\' is absent in Orders block on frontend.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerDisplayedOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerDisplayedOnFrontend.php
index 230e4604a771f..90541ff822143 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerDisplayedOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerDisplayedOnFrontend.php
@@ -49,11 +49,11 @@ public function processAssert(
         )->run();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Orders');
         $orderHistory->getOrderHistoryBlock()->openOrderById($orderId);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerOrderView->getOrderViewBlock()->isTopPagerDisplayed(),
             'Order items top pager is expected to be displayed for order '. $orderId
         );
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerOrderView->getOrderViewBlock()->isBottomPagerDisplayed(),
             'Order items bottom pager is expected to be displayed for order '. $orderId
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerHiddenOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerHiddenOnFrontend.php
index 11af4214ed471..2b0056e0acf49 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerHiddenOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderItemsPagerHiddenOnFrontend.php
@@ -49,11 +49,11 @@ public function processAssert(
         )->run();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Orders');
         $orderHistory->getOrderHistoryBlock()->openOrderById($orderId);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $customerOrderView->getOrderViewBlock()->isTopPagerDisplayed(),
             'Order items top pager is expected to be hidden for order '. $orderId
         );
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $customerOrderView->getOrderViewBlock()->isBottomPagerDisplayed(),
             'Order items bottom pager is expected to be hidden for order '. $orderId
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
index 51d4ba030151f..77b2a35ad7b9b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
@@ -33,7 +33,7 @@ class AssertOrderMassOnHoldSuccessMessage extends AbstractConstraint
      */
     public function processAssert(OrderIndex $orderIndex, $ordersCount)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_ON_HOLD_MESSAGE, $ordersCount),
             $orderIndex->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
index 6691db8aa6dbc..8dec0fa1e9648 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
@@ -29,7 +29,7 @@ public function processAssert(OrderInjectable $order, OrderIndex $orderIndex)
         $filter = ['id' => $data['id']];
         $orderIndex->open();
         $errorMessage = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $orderIndex->getSalesOrderGrid()->isRowVisible($filter),
             'Order with following data \'' . $errorMessage . '\' is present in Orders grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
index 561ec5d2c9984..6b87906a17255 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
@@ -43,7 +43,7 @@ public function processAssert(
             ['customer' => $customer]
         )->run();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Orders');
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $orderHistory->getOrderHistoryBlock()->isVisible()
             && $orderHistory->getOrderHistoryBlock()->isOrderVisible($filter),
             'Order with following data \'' . implode(', ', $filter) . '\' is present in Orders block on frontend.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
index 8382471a7e4bf..7cb063246bfb1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
@@ -28,7 +28,7 @@ class AssertOrderOnHoldFailMessage extends AbstractConstraint
      */
     public function processAssert(OrderIndex $orderIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::FAIL_ON_HOLD_MESSAGE,
             $orderIndex->getMessagesBlock()->getErrorMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
index c62a3ff22f712..17f10dc984aac 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
@@ -42,7 +42,7 @@ public function processAssert(OrderIndex $orderIndex, $ordersCount = null)
             ? sprintf(self::MULTIPLE_SUCCESS_ON_HOLD_MESSAGE, $ordersCount)
             : self::SINGLE_SUCCESS_ON_HOLD_MESSAGE;
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $successOnHoldMessage,
             $orderIndex->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderPaymentInformation.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderPaymentInformation.php
index bfc08585cac1b..db9426d9769b0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderPaymentInformation.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderPaymentInformation.php
@@ -37,7 +37,7 @@ public function processAssert(
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $actualPaymentInformation = $infoTab->getPaymentInfoBlock()->getData();
 
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             array_diff($paymentInfo, $actualPaymentInformation),
             'Payment Information missmatch with expected values.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
index afed45b8772be..f8aed71388f11 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
@@ -28,7 +28,7 @@ class AssertOrderReleaseFailMessage extends AbstractConstraint
      */
     public function processAssert(OrderIndex $orderIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::FAIL_RELEASE_MESSAGE,
             $orderIndex->getMessagesBlock()->getErrorMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
index e5cf722cdcd75..b0226779f273d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
@@ -29,7 +29,7 @@ class AssertOrderReleaseSuccessMessage extends AbstractConstraint
      */
     public function processAssert(OrderIndex $orderIndex, $ordersCount)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_RELEASE_MESSAGE, $ordersCount),
             $orderIndex->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
index 0c5dc5b58d549..13ef0afda8424 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
@@ -26,7 +26,7 @@ class AssertOrderStatusDuplicateStatus extends AbstractConstraint
     public function processAssert(OrderStatusNew $orderStatusNewPage)
     {
         $actualMessage = $orderStatusNewPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::DUPLICATE_MESSAGE,
             $actualMessage,
             'Wrong duplicate message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
index 01064e2b352a0..c4ce44b197d97 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
@@ -44,7 +44,7 @@ public function processAssert(
             $filter = ['label' => $defaultState, 'state' => $state];
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $orderStatusIndexPage->getOrderStatusGrid()->isRowVisible($filter, true, false),
             'Order status \'' . $orderStatusLabel . '\' is absent in Order Status grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCanceled.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCanceled.php
index e51692b260535..1f19a304d7748 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCanceled.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCanceled.php
@@ -35,7 +35,7 @@ public function processAssert(
 
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $infoTab->getOrderStatus(),
             'Canceled'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index 46f6ebba51fe1..c3e8558df7fcc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -38,7 +38,7 @@ public function processAssert(
 
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $infoTab->getOrderStatus(),
             $orderStatus
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
index dd0722bbcf848..c89504147bcc5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
@@ -30,7 +30,7 @@ class AssertOrderStatusNotAssigned extends AbstractConstraint
     public function processAssert(OrderStatus $orderStatus, OrderStatusIndex $orderStatusIndex)
     {
         $statusLabel = $orderStatus->getLabel();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $orderStatusIndex->open()->getOrderStatusGrid()->isRowVisible(
                 ['label' => $statusLabel, 'state' => $orderStatus->getState()]
             ),
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
index 3ceebd8b8a799..6d6c6999ba170 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
@@ -28,7 +28,7 @@ class AssertOrderStatusSuccessAssignMessage extends AbstractConstraint
      */
     public function processAssert(OrderStatusIndex $orderStatusIndexPage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $orderStatusIndexPage->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
index e4162b0f11343..6b7dc33875a14 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
@@ -30,7 +30,7 @@ class AssertOrderStatusSuccessCreateMessage extends AbstractConstraint
     public function processAssert(OrderStatusIndex $orderStatusIndexPage)
     {
         $actualMessage = $orderStatusIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
index f614c95b51e6c..6d15b772ea6c3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
@@ -28,7 +28,7 @@ class AssertOrderStatusSuccessUnassignMessage extends AbstractConstraint
      */
     public function processAssert(OrderStatusIndex $orderStatusIndexPage)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $orderStatusIndexPage->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
index abea680544a83..791e782df2807 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
@@ -31,7 +31,7 @@ class AssertOrderSuccessCreateMessage extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $salesOrderView->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php
index 91e3ec9acdd92..b2f86afc1ce5e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessVoidedMessage.php
@@ -32,7 +32,7 @@ class AssertOrderSuccessVoidedMessage extends AbstractConstraint
     public function processAssert(OrderStatusIndex $orderStatusIndexPage)
     {
         $actualMessage = $orderStatusIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderTotalPaid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderTotalPaid.php
index c4bfd385162b1..d04cf8698ab96 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderTotalPaid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderTotalPaid.php
@@ -32,7 +32,7 @@ public function processAssert(
         $salesOrder->open();
         $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($prices['totalPaid'], 2, '.', ','),
             $salesOrderView->getOrderTotalsBlock()->getTotalPaid(),
             'Total Paid price does not equal to price from data set.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInCustomerShoppingCartOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInCustomerShoppingCartOnBackendGrid.php
index a749ee25e3261..3d760d6c1cab1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInCustomerShoppingCartOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInCustomerShoppingCartOnBackendGrid.php
@@ -34,7 +34,7 @@ public function processAssert(
         $customerIndexEdit->open(['id' => $customer->getId()]);
         $customerIndexEdit->getPageActionsBlock()->manageShoppingCart();
         foreach ($productsInCart as $product) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $product->getName(),
                 $checkoutIndex->getItemsBlock()->getItemName($product),
                 'Product ' . $product->getName() . " is not present in grid on customer's shopping cart on backend."
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
index 256b89cfa3dc5..af91955d4e39b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
@@ -47,7 +47,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex, array $product
         $this->productsIsConfigured = $productsIsConfigured;
         $data = $this->prepareData($products, $orderCreateIndex->getCreateBlock()->getItemsBlock());
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $data['fixtureData'],
             $data['pageData'],
             'Product data on order create page not equals to passed from fixture.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
index 28259c8f6d93b..24027cacd9e4a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductsQtyAfterOrderCancel.php
@@ -52,7 +52,7 @@ public function processAssert(
         AssertProductForm $assertProductForm,
         AssertConfigurableProductForm $assertConfigurableProductForm
     ) {
-        for ($i = 0; $i < count($order->getEntityId()['products']); $i++) {
+        for ($i = 0, $count = count($order->getEntityId()['products']); $i < $count; $i++) {
             $product = $order->getEntityId()['products'][$i];
             $productData = $product->getData();
             if ($product instanceof BundleProduct) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
index 4b56297f5eba6..e0e4cc874f72e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
@@ -52,7 +52,7 @@ public function processAssert(
 
         $refundedPrices = $order->getPrice()['refund'];
         foreach ($refundedPrices as $key => $refundedPrice) {
-            \PHPUnit_Framework_Assert::assertRegExp(
+            \PHPUnit\Framework\Assert::assertRegExp(
                 sprintf(self::REFUNDED_AMOUNT_PATTERN, $refundedPrice['grand_creditmemo_total']),
                 $comments[$key]['comment'],
                 'Incorrect refunded amount value for the order #' . $orderId
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
index 6352fd99eebf6..b87b15523ab90 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
@@ -44,7 +44,7 @@ public function processAssert(
                 'amount_from' => $amount[$key]['grand_creditmemo_total'],
                 'amount_to' => $amount[$key]['grand_creditmemo_total']
             ];
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $grid->isRowVisible($filter, true, false),
                 'Credit memo is absent on credit memos tab.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
index 615c25ee50594..b0bb452581427 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
@@ -38,7 +38,7 @@ public function processAssert(CreditMemoIndex $creditMemoIndex, OrderInjectable
             $creditMemoIndex->getCreditMemoGrid()->search($filter);
             $filter['grand_total_from'] = number_format($amount[$key]['grand_creditmemo_total'], 2);
             $filter['grand_total_to'] = number_format($amount[$key]['grand_creditmemo_total'], 2);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $creditMemoIndex->getCreditMemoGrid()->isRowVisible($filter, false, false),
                 "Credit memo '#$creditMemoId' is absent in credit memos grid on credit memo index page."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php
index 24ab9227ae6b8..6808776e6f714 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php
@@ -38,7 +38,7 @@ public function processAssert(CreditMemoIndex $creditMemoIndex, OrderInjectable
             $creditMemoIndex->getCreditMemoGrid()->search($filter);
             $filter['grand_total_from'] = number_format($amount[$key]['grand_creditmemo_total'], 2);
             $filter['grand_total_to'] = number_format($amount[$key]['grand_creditmemo_total'], 2);
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $creditMemoIndex->getCreditMemoGrid()->isRowVisible($filter, false, false),
                 "Credit memo '#$creditMemoId' is present in credit memos grid on credit memo index page."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
index 9a7c34d7e6d66..0d78c4b72e168 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundOrderStatusInCommentsHistory.php
@@ -35,7 +35,7 @@ public function processAssert(
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $infoTab->getOrderStatus(),
             $latestComment['status']
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
index 3d606a859406c..13567cf5904ce 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
@@ -27,7 +27,7 @@ class AssertRefundSuccessCreateMessage extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_CREATE_MESSAGE,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
index 82c1f27c694dd..c0682ce954050 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
@@ -37,7 +37,7 @@ public function processAssert(
         $orderHistory->getOrderHistoryBlock()->openOrderById($order->getId());
         $customerOrderView->getOrderViewBlock()->openLinkByName('Refunds');
         foreach ($ids['creditMemoIds'] as $key => $creditMemoId) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 number_format($order->getPrice()['refund'][$key]['grand_creditmemo_total'], 2),
                 $creditMemoView->getCreditMemoBlock()->getItemBlock($creditMemoId)->getGrandTotal()
             );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderButtonIsNotVisibleOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderButtonIsNotVisibleOnFrontend.php
index f040e7e9e292c..ab09b4e6c8a4e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderButtonIsNotVisibleOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderButtonIsNotVisibleOnFrontend.php
@@ -56,7 +56,7 @@ public function processAssert(
         )->run();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Orders');
         $errorMessage = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $orderHistory->getOrderHistoryBlock()->isReorderButtonPresentByOrderId($filter['id']),
             '"Reorder" button for order with following data \'' . $errorMessage
             . '\' is present in Orders block on frontend.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
index 8c602049cddff..1a47e51765143 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
@@ -36,7 +36,7 @@ public function processAssert(
 
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $previousOrderStatus,
             $infoTab->getOrderStatus(),
             'Order status is incorrect on order page in backend.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
index dbc4a4a9f45c2..e17d2b3ceb833 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
@@ -29,7 +29,7 @@ public function processAssert(SalesGuestPrint $salesGuestPrint, Address $billing
             ['address' => $billingAddress, 'type' => 'html']
         );
         $expectedBillingAddress = $addressRenderer->render();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedBillingAddress,
             $salesGuestPrint->getInfoBlock()->getBillingAddress(),
             "Billing address was printed incorrectly."
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
index f252a8397ea97..e54f9a68c1e3d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
@@ -23,7 +23,7 @@ class AssertSalesPrintOrderGrandTotal extends AbstractConstraint
      */
     public function processAssert(SalesGuestPrint $salesGuestPrint, array $prices)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format(array_sum($prices), 2),
             $salesGuestPrint->getViewBlock()->getItemBlock()->getGrandTotal(),
             "Grand total was printed incorrectly."
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
index 6b8c817904b5e..f93959514a074 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
@@ -23,7 +23,7 @@ class AssertSalesPrintOrderPaymentMethod extends AbstractConstraint
      */
     public function processAssert(SalesGuestPrint $salesGuestPrint, $paymentMethod)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $salesGuestPrint->getInfoBlock()->isPaymentMethodVisible($paymentMethod),
             "Payment method was printed incorrect on sales guest print page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
index f758225257b72..7ec6ed27d6f35 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
@@ -36,7 +36,7 @@ public function processAssert(SalesGuestPrint $salesGuestPrint, array $products)
             }
         }
 
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php
index 46fd23da0dcd9..2168b69fa2f2f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertTransactionStatus.php
@@ -38,7 +38,7 @@ public function processAssert(
         foreach ($transactions as $transaction) {
             foreach ($actualTransactions as $actualTransaction) {
                 if ($actualTransaction['transactionType'] === $transaction['transactionType']) {
-                    \PHPUnit_Framework_Assert::assertEquals(
+                    \PHPUnit\Framework\Assert::assertEquals(
                         $transaction['statusIsClosed'],
                         $actualTransaction['statusIsClosed'],
                         'The ' . $transaction['transactionType'] . ' transaction status is not closed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
index b0915650cc1a1..6cf79cc333ca5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
@@ -32,7 +32,7 @@ public function processAssert(OrderIndex $orderIndex, SalesOrderView $salesOrder
     {
         $orderIndex->open();
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $salesOrderView->getPageActions()->isActionButtonVisible('Unhold'),
             'Button "Unhold" is absent on order page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
index bb627876bfd66..8fb7dbc07508e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertVoidInCommentsHistory.php
@@ -42,7 +42,7 @@ public function processAssert(
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::VOIDED_AMOUNT . $prices['grandTotal'],
             $latestComment['comment'],
             'Incorrect voided amount value for the order #' . $orderId
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
index 508ea13b419ca..972dc0f510b36 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php
@@ -171,7 +171,7 @@ protected function setCoupon(OrderInjectable $order)
         $this->webapiTransport->close();
         if ($response !== true) {
             $this->eventManager->dispatchEvent(['webapi_failed'], [$response]);
-            throw new \Exception('Could not apply coupon code!');
+            throw new \Exception("The coupon code couldn't be applied. Verify the coupon code and try again.");
         }
     }
 
@@ -200,7 +200,7 @@ protected function setBillingAddress(OrderInjectable $order)
         $this->webapiTransport->close();
         if (!is_numeric($response)) {
             $this->eventManager->dispatchEvent(['webapi_failed'], [$response]);
-            throw new \Exception("Could not set billing addresss to quote!");
+            throw new \Exception("Could not set billing address to quote!");
         }
     }
 
@@ -243,7 +243,7 @@ protected function setShippingInformation(OrderInjectable $order)
         $this->webapiTransport->close();
         if (!isset($response['payment_methods'], $response['totals'])) {
             $this->eventManager->dispatchEvent(['webapi_failed'], [$response]);
-            throw new \Exception('Could not set shipping method to quote!');
+            throw new \Exception("The shipping method can't be set to quote.");
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable.xml
index aff22086394d2..e6c61c189d195 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable.xml
@@ -326,5 +326,29 @@
             <field name="base_currency_code" xsi:type="string">0</field>
             <field name="order_currency_code" xsi:type="string">USD</field>
         </dataset>
+
+        <dataset name="configurable_product">
+            <field name="entity_id" xsi:type="array">
+                <item name="products" xsi:type="string">configurableProduct::with_only_two_options</item>
+            </field>
+            <field name="customer_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="billing_address_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">US_address</item>
+            </field>
+            <field name="store_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_store_view</item>
+            </field>
+            <field name="payment_auth_expiration" xsi:type="array">
+                <item name="method" xsi:type="string">checkmo</item>
+            </field>
+            <field name="shipping_method" xsi:type="string">flatrate_flatrate</field>
+            <field name="payment_authorization_amount" xsi:type="array">
+                <item name="method" xsi:type="string">free</item>
+            </field>
+            <field name="base_currency_code" xsi:type="string">0</field>
+            <field name="order_currency_code" xsi:type="string">USD</field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php
index fa14fcdc34b96..20fe0c8f55ccb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php
@@ -23,7 +23,7 @@
  * 2. Sales > Orders.
  * 3. Open the created order.
  * 4. Do cancel Order.
- * 5. Perform all assetions.
+ * 5. Perform all assertions.
  *
  * @group Order_Management
  * @ZephyrId MAGETWO-28191
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
index 4d997d528c041..e45609bb90c83 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
@@ -48,6 +48,7 @@
         <variation name="CancelCreatedOrderTestVariationWithPurchaseOrderPaymentMethod" summary="Cancel order with purchase order payment method and check status on storefront">
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
+            <data name="order/data/payment_auth_expiration/po_number" xsi:type="string">po_number</data>
             <data name="status" xsi:type="string">Canceled</data>
             <data name="configData" xsi:type="string">purchaseorder</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelSuccessMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
index 9a781be52f085..309f035a1c24b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml
@@ -104,6 +104,7 @@
             </data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
+            <data name="order/data/payment_auth_expiration/po_number" xsi:type="string">po_number</data>
             <data name="order/data/price/dataset" xsi:type="string">full_refund_with_zero_shipping_refund</data>
             <data name="configData" xsi:type="string">purchaseorder</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php
index 0a15196d65ae2..6f8c8cf1e53bb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php
@@ -30,7 +30,7 @@ class CreateCustomOrderStatusEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Order staus page.
+     * Order status page.
      *
      * @var OrderStatusIndex
      */
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
index 5896c2b8eb614..3d967fdea299b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml
@@ -88,6 +88,7 @@
             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
             <data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
             <data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
+            <data name="order/data/payment_auth_expiration/po_number" xsi:type="string">po_number</data>
             <data name="order/data/invoice" xsi:type="array">
                 <item name="0" xsi:type="array">
                     <item name="items_data" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml
index f5646ac543213..3e7b8fad1f04d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\CreateOrderBackendPartOneTest" summary="Create Order from Admin within Offline Payment Methods" ticketId="MAGETWO-28696">
         <variation name="CreateOrderBackendTestVariation1" ticketId="MAGETWO-17063">
+            <data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1624</data>
             <data name="description" xsi:type="string">Create order with simple product for registered US customer using Fixed shipping method and Cash on Delivery payment method</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::with_one_custom_option</data>
             <data name="customer/dataset" xsi:type="string">default</data>
@@ -19,10 +20,10 @@
                 <item name="grandTotal" xsi:type="string">425.00</item>
             </data>
             <data name="payment/method" xsi:type="string">cashondelivery</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Hold, Invoice, Ship, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Invoice, Edit</data>
             <data name="configData" xsi:type="string">cashondelivery</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -42,7 +43,6 @@
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -59,10 +59,10 @@
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="payment/method" xsi:type="string">banktransfer</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Reorder, Invoice, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Reorder, Invoice, Edit</data>
             <data name="configData" xsi:type="string">banktransfer</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -84,7 +84,6 @@
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">freeshipping_specificcountry_gb, banktransfer</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -103,10 +102,10 @@
             </data>
             <data name="payment/method" xsi:type="string">purchaseorder</data>
             <data name="payment/po_number" xsi:type="string">123456</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Reorder, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Invoice, Reorder, Edit</data>
             <data name="configData" xsi:type="string">purchaseorder</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -127,7 +126,7 @@
                 <item name="grandTotal" xsi:type="string">21.91</item>
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="CreateOrderBackendTestVariation7" summary="Create Order for New Customer in Admin with Offline Payment Method" ticketId="MAGETWO-12520">
@@ -145,7 +144,7 @@
                 <item name="grandTotal" xsi:type="string">21.91</item>
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
index 439b8a4492a1a..c4e03b94d2ada 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
@@ -19,7 +19,7 @@
             </data>
             <data name="payment/method" xsi:type="string">cashondelivery</data>
             <data name="configData" xsi:type="string">cashondelivery</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductsOutOfStock" />
         </variation>
@@ -35,7 +35,7 @@
             </data>
             <data name="payment/method" xsi:type="string">cashondelivery</data>
             <data name="configData" xsi:type="string">cashondelivery</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertReorderButtonIsNotVisibleOnFrontend" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
index d4b9856c5e319..99e25b062846b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
@@ -23,7 +23,7 @@
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
             <data name="resultStatuses" xsi:type="string">Complete,Closed</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation3">
@@ -32,7 +32,7 @@
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
             <data name="resultStatuses" xsi:type="string">Processing,Closed</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation4">
@@ -55,7 +55,7 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation6">
-            <data name="description" xsi:type="string">Release order in statuse On Hold</data>
+            <data name="description" xsi:type="string">Release order in status On Hold</data>
             <data name="steps" xsi:type="string">on hold</data>
             <data name="action" xsi:type="string">Unhold</data>
             <data name="ordersCount" xsi:type="string">1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
index 2b0bd7178cdad..91b4f711700b5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
@@ -144,6 +144,7 @@ public function test(Customer $customer, $product)
         )->run();
         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
         $this->catalogProductView->getViewBlock()->addToCart($product);
+        $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
 
         //Steps
         $this->customerIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateShipmentStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateShipmentStep.php
index 79abd438a1f2e..dcee66b44646e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateShipmentStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateShipmentStep.php
@@ -99,13 +99,21 @@ public function run()
     {
         $this->orderIndex->open();
         $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]);
-        $this->salesOrderView->getPageActions()->ship();
-        if (!empty($this->data)) {
-            $this->orderShipmentNew->getFormBlock()->fillData($this->data, $this->order->getEntityId()['products']);
+        $shipmentIds = [];
+        /**
+         * As this step is used in general scenarios and not all test cases has shippable items(ex: virtual product)
+         * we need to check, if it possible to create shipment for given order.
+         */
+        if ($this->salesOrderView->getPageActions()->canShip()) {
+            $this->salesOrderView->getPageActions()->ship();
+            if (!empty($this->data)) {
+                $this->orderShipmentNew->getFormBlock()->fillData($this->data, $this->order->getEntityId()['products']);
+            }
+            $this->orderShipmentNew->getFormBlock()->submit();
+            $shipmentIds = $this->getShipmentIds();
         }
-        $this->orderShipmentNew->getFormBlock()->submit();
 
-        return ['shipmentIds' => $this->getShipmentIds()];
+        return ['shipmentIds' => $shipmentIds];
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
index c7c4a2276e4b7..1420255b9c86d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
@@ -36,7 +36,8 @@
         <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="selectPaymentMethodForOrder" />
         <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
-        <step name="submitOrder" module="Magento_Sales" />
+        <step name="submitOrder" module="Magento_Sales" next="createShipment"/>
+        <step name="createShipment" module="Magento_Sales"/>
     </scenario>
     <scenario name="CreateOrderBackendPartOneTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
@@ -54,7 +55,8 @@
         <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="selectPaymentMethodForOrder" />
         <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
-        <step name="submitOrder" module="Magento_Sales" />
+        <step name="submitOrder" module="Magento_Sales" next="createShipment" />
+        <step name="createShipment" module="Magento_Sales"/>
     </scenario>
     <scenario name="VoidAuthorizationTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
@@ -145,7 +147,8 @@
     <scenario name="CreateCreditMemoEntityTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createOrder" />
         <step name="createOrder" module="Magento_Sales" next="createInvoice" />
-        <step name="createInvoice" module="Magento_Sales" next="createCreditMemo" />
+        <step name="createInvoice" module="Magento_Sales" next="createShipment" />
+        <step name="createShipment" module="Magento_Sales" next="createCreditMemo" />
         <step name="createCreditMemo" module="Magento_Sales" />
     </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
index a4995f81cd826..8d0f404441368 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
@@ -25,7 +25,7 @@ protected function assert()
         $actualPrices['discount'] = $this->checkoutCart->getTotalsBlock()->getDiscount();
         $expectedPrices = $this->cartPrice;
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedPrices,
             $actualPrices,
             'Wrong total cart prices are displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
index 31714491c49b5..c051d6e9fd7fd 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
@@ -25,7 +25,7 @@ protected function assert()
             $shippingPrice = $this->checkoutCart->getTotalsBlock()->getShippingPrice();
             $grandTotal = number_format(($grandTotal - $shippingPrice), 2);
         }
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $subTotal,
             $grandTotal,
             'Shopping cart subtotal: \'' . $subTotal . '\' not equals with grand total: \'' . $grandTotal . '\''
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
index 50f36a13549d7..ffdeadc015f8d 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
@@ -65,7 +65,7 @@ public function processAssert(
             $fixtureData = array_merge($fixtureData, $salesRuleAdditional->getData());
         }
         $dataDiff = $this->verify($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($dataDiff),
             'Sales rule data on edit page(backend) not equals to passed from fixture.'
             . "\nFailed values:\n " . implode(";\n ", $dataDiff)
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
index f31cb5ac013eb..b018d07913235 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
@@ -22,7 +22,7 @@ protected function assert()
     {
         $shippingPrice = $this->checkoutCart->getTotalsBlock()->getShippingPrice();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $shippingPrice,
             self::FREE_SHIPPING_PRICE,
             'Current shipping price: \'' . $shippingPrice
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
index 5851b6fb1e450..d0c1db7993a42 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
@@ -24,7 +24,7 @@ class AssertCartPriceRuleIsNotPresentedInGrid extends AbstractConstraint
      */
     public function processAssert(PromoQuoteIndex $promoQuoteIndex, SalesRule $salesRule)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $promoQuoteIndex->getPromoQuoteGrid()->isRowVisible(['name' => $salesRule->getName()]),
             'Sales rule \'' . $salesRule->getName() . '\' is present in cart price rules grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
index 472218205cb4f..68c3910afccd1 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
@@ -10,7 +10,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Assert sales rule delte message.
+ * Assert sales rule delete message.
  */
 class AssertCartPriceRuleSuccessDeleteMessage extends AbstractConstraint
 {
@@ -29,7 +29,7 @@ class AssertCartPriceRuleSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(PromoQuoteIndex $promoQuoteIndex)
     {
         $actualMessage = $promoQuoteIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
index 454b894b44df0..c90bc3bffb904 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCartPriceRuleSuccessSaveMessage extends AbstractConstraint
     public function processAssert(PromoQuoteIndex $promoQuoteIndex)
     {
         $actualMessage = $promoQuoteIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php
index 35fdd7194d55c..320df06822eee 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php
@@ -23,7 +23,7 @@ class AssertSalesRuleOnPrintOrder extends AbstractConstraint
      */
     public function processAssert(SalesGuestPrint $salesGuestPrint, array $prices)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             abs($prices['discount']),
             $salesGuestPrint->getViewSalesRule()->getItemBlock()->getSalesRuleDiscount(),
             "Sales rule amount not equals."
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 10b9d3e80d0c2..521d7d68ac4a6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -96,8 +96,8 @@
             <field name="stop_rules_processing" xsi:type="string">Yes</field>
         </dataset>
         <dataset name="active_sales_rule_with_complex_conditions">
-            <field name="name" xsi:type="string">Cart Price Rule with with complex conditions %isolation%</field>
-            <field name="description" xsi:type="string">Cart Price Rule with with complex conditions</field>
+            <field name="name" xsi:type="string">Cart Price Rule with complex conditions %isolation%</field>
+            <field name="description" xsi:type="string">Cart Price Rule with complex conditions</field>
             <field name="is_active" xsi:type="string">Yes</field>
             <field name="website_ids" xsi:type="array">
                 <item name="0" xsi:type="string">Main Website</item>
@@ -129,8 +129,8 @@
             <field name="stop_rules_processing" xsi:type="string">Yes</field>
             <field name="simple_free_shipping" xsi:type="string">For matching items only</field>
             <field name="store_labels" xsi:type="array">
-                <item name="0" xsi:type="string">Cart Price Rule with with complex conditions</item>
-                <item name="1" xsi:type="string">Cart Price Rule with with complex conditions</item>
+                <item name="0" xsi:type="string">Cart Price Rule with complex conditions</item>
+                <item name="1" xsi:type="string">Cart Price Rule with complex conditions</item>
             </field>
         </dataset>
 
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupDeleteMessage.php
index 911a1580364cf..01d6542017bbe 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertSynonymGroupDeleteMessage extends AbstractConstraint
     public function processAssert(SynonymGroupIndex $synonymGroupIndex)
     {
         $actualMessage = $synonymGroupIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupInGrid.php
index 04cca7609f45f..7f20e00ac360b 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupInGrid.php
@@ -40,12 +40,12 @@ public function processAssert(
         $this->prepareFilter($synonymGroup, $synonymFilter);
         $synonymGroupIndex->getSynonymGroupGrid()->search($this->filter);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $synonymGroupIndex->getSynonymGroupGrid()->isRowVisible($this->filter, false, false),
             'Synonym Group is absent in Synonym grid'
         );
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             count($synonymGroupIndex->getSynonymGroupGrid()->getAllIds()),
             1,
             'There is more than one synonyms founded'
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupSuccessSaveMessage.php
index 243405292ed41..77f999fe9bba6 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertSynonymGroupSuccessSaveMessage extends AbstractConstraint
     public function processAssert(SynonymGroupIndex $synonymGroupIndex)
     {
         $actualMessage = $synonymGroupIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_SAVE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupsSearch.php b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupsSearch.php
index fc89d6d070d0f..04ef3616d21ac 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupsSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymGroupsSearch.php
@@ -28,7 +28,7 @@ public function processAssert(array $synonymGroups, array $searchQueries, Synony
         foreach ($searchQueries as $query) {
             $synonymGroupIndex->getSynonymGroupGrid()->fullTextSearch($query['query']);
             foreach ($query['results'] as $key => $result) {
-                \PHPUnit_Framework_Assert::assertEquals(
+                \PHPUnit\Framework\Assert::assertEquals(
                     $result,
                     $synonymGroupIndex->getSynonymGroupGrid()->isRowVisible(
                         ['synonyms' => $synonymGroups[$key]->getData()['synonyms']],
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymMergeErrorMessage.php b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymMergeErrorMessage.php
index 647f14d494338..873a2aee2bd80 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymMergeErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymMergeErrorMessage.php
@@ -25,7 +25,7 @@ class AssertSynonymMergeErrorMessage extends AbstractConstraint
     public function processAssert(SynonymGroupNew $synonymGroupNew)
     {
         $actualMessage = $synonymGroupNew->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::ERROR_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymRestrictedAccess.php
index a61c1fc06ba3e..5b105302375a4 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymRestrictedAccess.php
@@ -18,7 +18,7 @@ class AssertSynonymRestrictedAccess extends AbstractConstraint
     /**
      * Access denied text.
      */
-    const ACCESS_DENIED_TEXT = 'Access denied';
+    const ACCESS_DENIED_TEXT = 'Sorry, you need permissions to view this content.';
 
     /**
      * Assert that access to synonym group index page is restricted.
@@ -31,7 +31,7 @@ public function processAssert(Dashboard $dashboard, SynonymGroupIndex $synonymGr
     {
         $synonymGroupIndex->open();
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::ACCESS_DENIED_TEXT,
             $dashboard->getErrorBlock()->getContent(),
             'Synonym group index page is available.'
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml b/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml
index fc30822ab8bed..2cebaf93ff2a9 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml
@@ -13,7 +13,7 @@
              collection="Magento\Search\Model\ResourceModel\Block\Grid\Collection"
              handler_interface="Magento\Search\Test\Handler\SynonymGroup\SynonymGroupInterface"
              repository_class="Magento\Search\Test\Repository\SynonymGroup" class="Magento\Search\Test\Fixture\SynonymGroup">
-        <field name="group_id" is_required="1 "/>
+        <field name="group_id" is_required="1"/>
         <field name="synonyms" is_required="0" />
         <field name="scope_id" is_required="0" source="Magento\Search\Test\Fixture\SynonymGroup\ScopeId" />
         <field name="mergeOnConflict" is_required="0" />
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerEmailChanged.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerEmailChanged.php
index df7ba8cac9945..239c1040721d5 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerEmailChanged.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerEmailChanged.php
@@ -46,7 +46,7 @@ public function processAssert(
             ['customer' => $customer]
         )->run();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $customerAccountIndex->getAccountMenuBlock()->isVisible(),
             'Customer Account Dashboard is not visible.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerIsLocked.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerIsLocked.php
index 4badb10085b17..a634e0ebba26c 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerIsLocked.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerIsLocked.php
@@ -15,7 +15,7 @@
 class AssertCustomerIsLocked extends AbstractConstraint
 {
     const CUSTOMER_LOCKED_MESSAGE =
-        'You did not sign in correctly or your account is temporarily disabled.';
+        'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.';
 
     /**
      * Assert that customer locked message is present on customer login page.
@@ -26,7 +26,7 @@ class AssertCustomerIsLocked extends AbstractConstraint
     public function processAssert(
         CustomerAccountLogin $customerLogin
     ) {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::CUSTOMER_LOCKED_MESSAGE,
             $customerLogin->getMessages()->getErrorMessage(),
             'Wrong message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerPasswordRequiredClasses.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerPasswordRequiredClasses.php
index 2618734b85fdb..a6ddcc4e10aba 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerPasswordRequiredClasses.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerPasswordRequiredClasses.php
@@ -31,7 +31,7 @@ public function processAssert(CustomerAccountCreate $registerPage, ConfigData $c
         $characterClassesNumber = $config
             ->getData('section')['customer/password/required_character_classes_number']['value'];
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::EXPECTED_MAX_CHARACTERS, $characterClassesNumber) . self::EXPECTED_MESSAGE,
             $errorMessage,
             'Wrong expected message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerResetPasswordFailed.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerResetPasswordFailed.php
index 3089f4b830568..e0bbe26696930 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerResetPasswordFailed.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerResetPasswordFailed.php
@@ -15,7 +15,8 @@
 class AssertCustomerResetPasswordFailed extends AbstractConstraint
 {
     const TOO_MANY_RESET_REQUESTS_MESSAGE =
-        'Too many password reset requests. Please wait and try again or contact hello@example.com.';
+        'We received too many requests for password resets. '
+        . 'Please wait and try again later or contact hello@example.com.';
 
     /**
      * Assert that customer forgot password message is present on customer account forgot password page.
@@ -25,7 +26,7 @@ class AssertCustomerResetPasswordFailed extends AbstractConstraint
      */
     public function processAssert(CustomerAccountForgotPassword $customerForgotPassword)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::TOO_MANY_RESET_REQUESTS_MESSAGE,
             $customerForgotPassword->getMessagesBlock()->getErrorMessage(),
             'Wrong customer reset password failed message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertDefaultAccountInformation.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertDefaultAccountInformation.php
index f747f383dfe0b..7b2e0d4361558 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertDefaultAccountInformation.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertDefaultAccountInformation.php
@@ -25,22 +25,22 @@ public function processAssert(
     ) {
         $infoForm = $customerAccountEdit->getAccountInfoForm();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $infoForm->isEmailVisible(),
             'Email text field should not be visible.'
         );
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $infoForm->isCurrentPasswordVisible(),
             'Current Password text field should not be visible.'
         );
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $infoForm->isPasswordVisible(),
             'New Password text field should not be visible.'
         );
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $infoForm->isConfirmPasswordVisible(),
             'Password Confirmation text field should not be visible.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordIsNotSecureEnoughMessage.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordIsNotSecureEnoughMessage.php
index 4a64a278482bf..15d8992d953b8 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordIsNotSecureEnoughMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordIsNotSecureEnoughMessage.php
@@ -26,7 +26,7 @@ public function processAssert(CustomerAccountCreate $registerPage)
         $expectedErrorMessage = 'Minimum of different classes of characters in password is 3.' .
             ' Classes of characters: Lower Case, Upper Case, Digits, Special Characters.';
         $errorMessage = $registerPage->getRegisterForm()->getPasswordError();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedErrorMessage,
             $errorMessage,
             'The messages are not equal.'
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordLengthErrorMessage.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordLengthErrorMessage.php
index 0aa8cfb4789ab..f2b1fc72ce195 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordLengthErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertPasswordLengthErrorMessage.php
@@ -26,7 +26,7 @@ class AssertPasswordLengthErrorMessage extends AbstractConstraint
     public function processAssert(CustomerAccountCreate $registerPage)
     {
         $errorMessage = $registerPage->getRegisterForm()->getPasswordError();
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::PASSWORD_LENGTH_ERROR_MESSAGE,
             $errorMessage,
             'Incorrect password error message.'
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserIsLocked.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserIsLocked.php
index c302c9bdf35ec..92376f42e5d98 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserIsLocked.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserIsLocked.php
@@ -14,7 +14,8 @@
  */
 class AssertUserIsLocked extends AbstractConstraint
 {
-    const USER_ACCOUNT_DISABLED_MESSAGE = 'account is temporarily disabled';
+    const USER_ACCOUNT_DISABLED_MESSAGE = 'The account sign-in was incorrect or your account is disabled temporarily. '
+    . 'Please wait and try again later.';
 
     /**
      * Verify that user account has been locked.
@@ -26,7 +27,7 @@ public function processAssert(
         AdminAuthLogin $adminAuth
     ) {
         $ignoreCase = true;
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::USER_ACCOUNT_DISABLED_MESSAGE,
             $adminAuth->getMessagesBlock()->getErrorMessage(),
             'Message "' . self::USER_ACCOUNT_DISABLED_MESSAGE . '" is not visible.',
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserPasswordResetFailed.php b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserPasswordResetFailed.php
index 2de3bb54f1838..c3307935686e9 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserPasswordResetFailed.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertUserPasswordResetFailed.php
@@ -15,7 +15,8 @@
 class AssertUserPasswordResetFailed extends AbstractConstraint
 {
     const TOO_MANY_RESET_REQUESTS_MESSAGE =
-        'Too many password reset requests. Please wait and try again or contact hello@example.com.';
+        'We received too many requests for password resets. '
+        . 'Please wait and try again later or contact hello@example.com.';
 
     /**
      * Assert that user reset password failed message is present on user login page.
@@ -25,7 +26,7 @@ class AssertUserPasswordResetFailed extends AbstractConstraint
      */
     public function processAssert(AdminAuthLogin $adminAuth)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::TOO_MANY_RESET_REQUESTS_MESSAGE,
             $adminAuth->getMessagesBlock()->getErrorMessage(),
             'Wrong user reset password failed message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php
index 2562f57eb8041..778b04047952d 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewIntegrationTest.php
@@ -24,7 +24,8 @@
  * 3. Start to create new Integration.
  * 4. Fill in all data according to data set (password is incorrect).
  * 5. Perform action 4 specified number of times.
- * 6. "You have entered an invalid password for current user." appears after each attempt.
+ * 6. "The password entered for the current user is invalid. Verify the password and try again." appears after each
+ *    attempt.
  * 7. Perform all assertions.
  *
  * @ZephyrId MAGETWO-49038
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php
index f3dbf81ba5a14..5a62b0d599ca4 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewRoleTest.php
@@ -24,7 +24,8 @@
  * 3. Start to create new User Role.
  * 4. Fill in all data according to data set (password is incorrect).
  * 5. Perform action 4 specified number of times.
- * 6. "You have entered an invalid password for current user." appears after each attempt.
+ * 6. "The password entered for the current user is invalid. Verify the password and try again." appears after each
+ *    attempt.
  * 7. Perform all assertions.
  *
  * @ZephyrId MAGETWO-49036
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php
index 81b57dd5db88d..908f07456e0d8 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php
@@ -23,7 +23,8 @@
  * 3. Click on Add New User.
  * 4. Fill in all data according to data set (password is incorrect).
  * 5. Perform action 4 specified number of times.
- * 6. "You have entered an invalid password for current user." appears after each attempt.
+ * 6. "The password entered for the current user is invalid. Verify the password and try again." appears after each
+ *    attempt.
  * 7. Perform all assertions.
  *
  * @ZephyrId MAGETWO-49034
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenEditingIntegrationTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenEditingIntegrationTest.php
index 5f803d634fa2a..6927fa900cbdf 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenEditingIntegrationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenEditingIntegrationTest.php
@@ -25,7 +25,8 @@
  * 3. Start to edit existing Integration.
  * 4. Fill in all data according to data set (password is incorrect).
  * 5. Perform action 4 specified number of times.
- * 6. "You have entered an invalid password for current user." appears after each attempt.
+ * 6. "The password entered for the current user is invalid. Verify the password and try again." appears after each
+ *    attempt.
  * 7. Perform all assertions.
  *
  * @ZephyrId MAGETWO-49039
@@ -84,7 +85,7 @@ public function __inject(
     /**
      * Run Lock user when creating new integration test.
      *
-     * @param Integration $initintegration
+     * @param Integration $initIntegration
      * @param Integration $integration
      * @param int $attempts
      * @param User $customAdmin
@@ -92,7 +93,7 @@ public function __inject(
      * @return void
      */
     public function test(
-        Integration $initintegration,
+        Integration $initIntegration,
         Integration $integration,
         $attempts,
         User $customAdmin,
@@ -106,7 +107,7 @@ public function test(
             ['configData' => $this->configData]
         )->run();
         $customAdmin->persist();
-        $initintegration->persist();
+        $initIntegration->persist();
 
         // login to backend with new user
         $this->adminAuthLogin->open();
@@ -114,7 +115,7 @@ public function test(
         $this->adminAuthLogin->getLoginBlock()->submit();
 
         // Steps
-        $filter = ['name' => $initintegration->getName()];
+        $filter = ['name' => $initIntegration->getName()];
         $this->integrationIndexPage->open();
         $this->integrationIndexPage->getIntegrationGrid()->searchAndOpen($filter);
         for ($i = 0; $i < $attempts; $i++) {
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php
index 6f690302cba2a..d86346ae9a08b 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockCustomerOnEditPageTest.php
@@ -26,7 +26,8 @@
  * 3. Click "Change Password" link near "Contact Information".
  * 4. Fill form according to data set and save (current password is incorrect).
  * 5. Perform action for specified number of times.
- * 6. "The password doesn't match this account." appears after each change password attempt.
+ * 6. "The password doesn't match this account. Verify the password and try again." appears after each
+ *    change password attempt.
  * 7. Perform all assertions.
  *
  * @ZephyrId MAGETWO-50559
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
index 453a7b5940e1d..3aa6fc8f2a84f 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
@@ -192,6 +192,14 @@ public function getDependencyCheck()
         return $this->_rootElement->find($this->dependencyCheck, Locator::SELECTOR_CSS)->getText();
     }
 
+    /**
+     * @return bool
+     */
+    public function isPhpVersionCheckVisible() : bool
+    {
+        return $this->_rootElement->find($this->phpVersionCheck)->isVisible();
+    }
+
     /**
      * Get PHP Version check result.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
index ea6355d574549..5cb71d85a51ce 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
@@ -10,6 +10,7 @@
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid;
 
 /**
  * Select version block.
@@ -37,6 +38,29 @@ class SelectVersion extends Form
      */
     private $showAllVersions = '#showUnstable';
 
+    /**
+     * CSS selector for Other Components Grid Block.
+     *
+     * @var string
+     */
+    private $otherComponentsGrid = '.admin__data-grid-outer-wrap';
+
+    /**
+     * @var string
+     */
+    private $empty = '[ng-show="componentsProcessed && total == 0"]';
+
+    /**
+     * @var string
+     */
+    private $waitEmpty =
+        '//div[contains(@ng-show, "componentsProcessed && total") and not(contains(@class,"ng-hide"))]';
+
+    /**
+     * @var OtherComponentsGrid
+     */
+    private $otherComponentGrid;
+
     /**
      * Click on 'Next' button.
      *
@@ -76,13 +100,59 @@ private function chooseShowAllVersions()
     }
 
     /**
-     * Choose 'yes' for upgrade option called 'Other components'
+     * Choose 'yes' for upgrade option called 'Other components'.
      *
+     * @param array $packages
      * @return void
      */
-    public function chooseUpgradeOtherComponents()
+    public function chooseUpgradeOtherComponents(array $packages) :void
     {
-        $this->_rootElement->find("[for=yesUpdateComponents]", Locator::SELECTOR_CSS)->click();
-        $this->waitForElementVisible("[ng-show='componentsProcessed']");
+        $this->_rootElement->find("[for=yesUpdateComponents]")->click();
+        $this->waitForElementNotVisible("[ng-show=\"!componentsProcessed\"");
+
+        if (!$this->isComponentsEmpty()) {
+            $otherComponentGrid = $this->getOtherComponentsGrid();
+            $otherComponentGrid->setItemsPerPage(200);
+            $otherComponentGrid->setVersions($packages);
+        }
+    }
+
+    /**
+     * Check that grid is empty.
+     *
+     * @return bool
+     */
+    public function isComponentsEmpty()
+    {
+        $this->waitForElementVisible($this->waitEmpty, Locator::SELECTOR_XPATH);
+
+        return $this->_rootElement->find($this->empty)->isVisible();
+    }
+
+    /**
+     * Returns selected packages.
+     *
+     * @return array
+     */
+    public function getSelectedPackages()
+    {
+        return $this->getOtherComponentsGrid()->getSelectedPackages();
+    }
+
+    /**
+     * Get grid block for other components.
+     *
+     * @return OtherComponentsGrid
+     */
+    private function getOtherComponentsGrid() : OtherComponentsGrid
+    {
+        if (!isset($this->otherComponentGrid)) {
+            $this->otherComponentGrid = $this->blockFactory->create(
+                OtherComponentsGrid::class,
+                ['element' => $this->_rootElement->find($this->otherComponentsGrid)]
+            );
+        }
+
+        return $this->otherComponentGrid;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php
new file mode 100644
index 0000000000000..8ca2c0654e28c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Block\SelectVersion;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid\Item;
+
+/**
+ * Perform OtherComponentsGrid block.
+ */
+class OtherComponentsGrid extends Block
+{
+    /**
+     * @var string
+     */
+    private $itemComponent = '//tr[contains(@ng-repeat,"component") and ./td[contains(.,"%s")]]';
+
+    /**
+     * @var string
+     */
+    private $perPage = '#perPage';
+
+    /**
+     * @var array
+     */
+    private $selectedPackages = [];
+
+    /**
+     * Set version of the packages.
+     *
+     * @param array $packages
+     * @return void
+     */
+    public function setVersions(array $packages) : void
+    {
+        foreach ($packages as $package) {
+            $selector = sprintf($this->itemComponent, $package['name']);
+            $elements = $this->_rootElement->getElements($selector, Locator::SELECTOR_XPATH);
+            foreach ($elements as $element) {
+                $row = $this->getComponentRow($element);
+                $row->setVersion($package['version']);
+                $this->selectedPackages[$row->getPackageName()] = $package['version'];
+            }
+        }
+    }
+
+    /**
+     * Returns selected packages.
+     *
+     * @return array
+     */
+    public function getSelectedPackages() : array
+    {
+        return $this->selectedPackages;
+    }
+
+    /**
+     * Set pager size.
+     *
+     * @param int $count
+     * @return void
+     */
+    public function setItemsPerPage(int $count) : void
+    {
+        $this->_rootElement->find($this->perPage, Locator::SELECTOR_CSS, 'select')->setValue($count);
+    }
+
+    /**
+     * Get component block.
+     *
+     * @param ElementInterface $element
+     * @return Item
+     */
+    private function getComponentRow(ElementInterface $element) : Item
+    {
+        return $this->blockFactory->create(
+            Item::class,
+            ['element' => $element]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php
new file mode 100644
index 0000000000000..8c24323f37618
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Block for each component.
+ */
+class Item extends Block
+{
+    /**
+     * CSS selector for version element.
+     *
+     * @var string
+     */
+    private $version = '[ng-change*="setComponentVersion"]';
+
+    /**
+     * CSS selector for package name element.
+     *
+     * @var string
+     */
+    private $packageName = 'td:nth-child(2)';
+
+    /**
+     * Set version for particular component.
+     *
+     * @param string $version
+     */
+    public function setVersion(string $version)
+    {
+        $this->_rootElement->find($this->version, Locator::SELECTOR_CSS, 'select')->setValue($version);
+    }
+
+    /**
+     * Returns package name of element.
+     *
+     * @return array|string
+     */
+    public function getPackageName()
+    {
+        return $this->_rootElement->find($this->packageName)->getText();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertApplicationVersion.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertApplicationVersion.php
index daa0919e7021d..dd47c30c4a991 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertApplicationVersion.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertApplicationVersion.php
@@ -24,7 +24,7 @@ class AssertApplicationVersion extends AbstractConstraint
      */
     public function processAssert(Dashboard $dashboard, $version)
     {
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $version,
             $dashboard->getApplicationVersion()->getVersion(),
             'Application version is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessMessage.php
index a7d26546c8f57..4a2ff92412b66 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessMessage.php
@@ -24,12 +24,12 @@ class AssertSuccessMessage extends AbstractConstraint
     public function processAssert(SetupWizard $setupWizard, $package)
     {
         $message = "You upgraded";
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $message,
             $setupWizard->getSuccessMessage()->getUpdaterStatus(),
             'Success message is incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $package,
             $setupWizard->getSuccessMessage()->getUpdaterStatus(),
             'Updated package is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
index 5425af367ca3b..676703924e59a 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -52,32 +52,34 @@ class AssertSuccessfulReadinessCheck extends AbstractConstraint
      */
     public function processAssert(SetupWizard $setupWizard)
     {
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::UPDATER_APPLICATION_MESSAGE,
             $setupWizard->getReadiness()->getUpdaterApplicationCheck(),
             'Updater application check is incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::CRON_SCRIPT_MESSAGE,
             $setupWizard->getReadiness()->getCronScriptCheck(),
             'Cron scripts are incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             self::DEPENDENCY_CHECK_MESSAGE,
             $setupWizard->getReadiness()->getDependencyCheck(),
             'Dependency check is incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
-            self::PHP_VERSION_MESSAGE,
-            $setupWizard->getReadiness()->getPhpVersionCheck(),
-            'PHP version is incorrect.'
-        );
-        \PHPUnit_Framework_Assert::assertContains(
+        if ($setupWizard->getReadiness()->isPhpVersionCheckVisible()) {
+            \PHPUnit\Framework\Assert::assertContains(
+                self::PHP_VERSION_MESSAGE,
+                $setupWizard->getReadiness()->getPhpVersionCheck(),
+                'PHP version is incorrect.'
+            );
+        }
+        \PHPUnit\Framework\Assert::assertContains(
             self::PHP_SETTING_REGEXP,
             $setupWizard->getReadiness()->getSettingsCheck(),
             'PHP settings check failed.'
         );
-        \PHPUnit_Framework_Assert::assertRegExp(
+        \PHPUnit\Framework\Assert::assertRegExp(
             self::PHP_EXTENSIONS_REGEXP,
             $setupWizard->getReadiness()->getPhpExtensionsCheck(),
             'PHP extensions missed.'
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
index 639bcb2c13e0f..caafa814a871a 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
@@ -18,17 +18,24 @@ class AssertVersionAndEditionCheck extends AbstractConstraint
      * Assert that package and version is correct
      *
      * @param SetupWizard $setupWizard
-     * @param string $package
-     * @param string $version
+     * @param array $upgrade
      * @return void
      */
-    public function processAssert(SetupWizard $setupWizard, $package, $version)
+    public function processAssert(SetupWizard $setupWizard, array $upgrade) :void
     {
-        $message = "We're ready to upgrade $package to $version";
-        \PHPUnit_Framework_Assert::assertContains(
+        $message = "We're ready to upgrade {$upgrade['package']} to {$upgrade['version']}.";
+        if ($upgrade['otherComponents'] === 'Yes' && isset($upgrade['selectedPackages'])) {
+            foreach ($upgrade['selectedPackages'] as $name => $version) {
+                $message .= "\nWe're ready to upgrade {$name} to {$version}.";
+            }
+        }
+        $actualMessage = $setupWizard->getSystemUpgrade()->getUpgradeMessage();
+        \PHPUnit\Framework\Assert::assertContains(
             $message,
-            $setupWizard->getSystemUpgrade()->getUpgradeMessage(),
-            'Updater application check is incorrect.'
+            $actualMessage,
+            "Updater application check is incorrect: \n"
+            . "Expected: '$message' \n"
+            . "Actual: '$actualMessage'"
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertExtensionAndVersionCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertExtensionAndVersionCheck.php
index 40ed7483d74a3..1b8550845e0cd 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertExtensionAndVersionCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertExtensionAndVersionCheck.php
@@ -52,7 +52,7 @@ public function processAssert(SetupWizard $setupWizard, Extension $extension, $t
                 $message = '';
         }
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $message,
             $setupWizard->getUpdaterExtension()->getMessage(),
             'Extension name and version check is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertFindExtensionOnGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertFindExtensionOnGrid.php
index 305c59d2a7ca9..68c0cd1960180 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertFindExtensionOnGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertFindExtensionOnGrid.php
@@ -24,7 +24,7 @@ class AssertFindExtensionOnGrid extends AbstractConstraint
      */
     public function processAssert(AbstractGrid $grid, Extension $extension)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $grid->findExtensionOnGrid($extension),
             'Extension is not found on the grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSelectSeveralExtensions.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSelectSeveralExtensions.php
index 20f30023563bc..945e345d2851f 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSelectSeveralExtensions.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSelectSeveralExtensions.php
@@ -25,7 +25,7 @@ class AssertSelectSeveralExtensions extends AbstractConstraint
     public function processAssert(AbstractGrid $grid, array $extensions)
     {
         $extensions = $grid->selectSeveralExtensions($extensions);
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $extensions,
             'Next extensions are not found on the grid: ' . $this->getExtensionsNames($extensions)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSuccessMessage.php
index 8d9f418631415..0e1d1be3855dc 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertSuccessMessage.php
@@ -50,12 +50,12 @@ public function processAssert(SetupWizard $setupWizard, Extension $extension, $t
                 $message = '';
         }
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $message,
             $setupWizard->getSuccessMessage()->getUpdaterStatus(),
             'Success message is incorrect.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $extension->getExtensionName(),
             $setupWizard->getSuccessMessage()->getUpdaterStatus(),
             'Extension name is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php
index 0a4dd9d0772d5..21ed8a24345f4 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php
@@ -23,7 +23,7 @@ class AssertVersionOnGrid extends AbstractConstraint
     /*#@-*/
 
     /**
-     * Assert that that version of extension is correct.
+     * Assert that version of extension is correct.
      *
      * @param Grid $grid
      * @param Extension $extension
@@ -45,7 +45,7 @@ public function processAssert(Grid $grid, Extension $extension, $type)
                 $version = '';
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $grid->getVersion($extension) === $version,
             'Version of extension is not correct.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertModuleInGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertModuleInGrid.php
index 3761f077981bc..236888fbe9583 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertModuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertModuleInGrid.php
@@ -24,7 +24,7 @@ class AssertModuleInGrid extends AbstractConstraint
      */
     public function processAssert(SetupWizard $setupWizard, $moduleName)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $setupWizard->getModuleGrid()->findModuleByName($moduleName)->isVisible(),
             'Module was not found in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertSuccessMessage.php
index 24d0ea0048d01..07d8564f47ef3 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Module/AssertSuccessMessage.php
@@ -24,7 +24,7 @@ class AssertSuccessMessage
      */
     public function processAssert(SetupWizard $setupWizard)
     {
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             static::SUCCESS_MESSAGE,
             $setupWizard->getSuccessMessage()->getDisableModuleStatus(),
             'Success message is incorrect.'
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
index 04ac3eee83245..c9b3ce35e84ed 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
@@ -109,7 +109,7 @@ public function test(
         $this->setupWizard->getSetupHome()->clickSystemUpgrade();
         $this->setupWizard->getSelectVersion()->fill($upgradeFixture);
         if ($upgrade['otherComponents'] === 'Yes') {
-            $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents();
+            $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents($upgrade['otherComponentsList']);
         }
         $this->setupWizard->getSelectVersion()->clickNext();
 
@@ -123,7 +123,9 @@ public function test(
         $this->setupWizard->getCreateBackup()->clickNext();
 
         // Check info and press 'Upgrade' button
-        $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade['package'], $version);
+        $upgrade['version'] = $version;
+        $upgrade['selectedPackages'] = $this->setupWizard->getSelectVersion()->getSelectedPackages();
+        $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade);
         $this->setupWizard->getSystemUpgrade()->clickSystemUpgrade();
 
         $assertSuccessMessage->processAssert($this->setupWizard, $upgrade['package']);
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
index b092fe1812201..95193dbf6c097 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
@@ -18,6 +18,13 @@
             <data name="upgrade/optionsMedia" xsi:type="string">No</data>
             <data name="upgrade/optionsDb" xsi:type="string">No</data>
             <data name="upgrade/otherComponents" xsi:type="string">{otherComponents}</data>
+            <!-- If otherComponents value is Yes specify otherComponentsList items-->
+            <data name="upgrade/otherComponentsList" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="name" xsi:type="string">{package_0_name}</item>
+                    <item name="version" xsi:type="string">{package_0_version}</item>
+                </item>
+            </data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php
index a449f79ef68f3..9b5c8991cb675 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php
@@ -25,16 +25,16 @@ class AssertCityBasedShippingRateChanged extends AbstractConstraint
     public function processAssert(CheckoutOnepage $checkoutOnepage, $shippingMethod, $isShippingAvailable)
     {
         if ($isShippingAvailable) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $checkoutOnepage->getShippingMethodBlock()->isLoaderAppeared(),
                 'Shipping rate has not been changed.'
             );
         }
-        $shippingAvaialability = $isShippingAvailable ? 'avaiable' : 'unavailable';
-        \PHPUnit_Framework_Assert::assertEquals(
+        $shippingAvailability = $isShippingAvailable ? 'available' : 'unavailable';
+        \PHPUnit\Framework\Assert::assertEquals(
             $isShippingAvailable,
-            $checkoutOnepage->getShippingMethodBlock()->isShippingMethodAvaiable($shippingMethod),
-            "Shipping rates for {$shippingMethod['shipping_service']} should be $shippingAvaialability."
+            $checkoutOnepage->getShippingMethodBlock()->isShippingMethodAvailable($shippingMethod),
+            "Shipping rates for {$shippingMethod['shipping_service']} should be $shippingAvailability."
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
index 6f8be0087803b..bf0e564e7f3af 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
@@ -32,7 +32,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
     {
         $orderIndex->open();
         $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $salesOrderView->getPageActions()->isActionButtonVisible('Ship'),
             'Ship button is present on order view page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
index 6eb2db1d06994..5deb8f356f949 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
@@ -40,7 +40,7 @@ public function processAssert(
         $orderHistory->getOrderHistoryBlock()->openOrderById($order->getId());
         $customerOrderView->getOrderViewBlock()->openLinkByName('Order Shipments');
         foreach ($ids['shipmentIds'] as $key => $shipmentIds) {
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $totalQty[$key],
                 $shipmentView->getShipmentBlock()->getItemShipmentBlock($shipmentIds)->getTotalQty()
             );
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
index becaec936f9b1..3216afb1f489e 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
@@ -39,7 +39,7 @@ public function processAssert(ShipmentIndex $shipmentIndex, OrderInjectable $ord
                 'total_qty_to' => $totalQty[$key],
             ];
             $shipmentIndex->getShipmentsGrid()->search($filter + $filterQty);
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $shipmentIndex->getShipmentsGrid()->isRowVisible($filter, false),
                 'Shipment is absent in shipment grid on shipment index page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
index ff2398fdd25e2..9d7c66b88ef63 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
@@ -43,7 +43,7 @@ public function processAssert(
                 'qty_from' => number_format($totalQty[$key], 4, '.', ''),
                 'qty_to' => number_format($totalQty[$key], 4, '.', ''),
             ];
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $salesOrderView
                     ->getOrderForm()
                     ->getTab('shipments')
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
index d619097ebe401..e4d22d2623672 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
@@ -84,7 +84,7 @@ protected function assert(
             $this->shipmentPage->getShipmentsGrid()->searchAndOpen($filter);
             $itemsData = $this->preparePageItems($salesShipmentView->getItemsBlock()->getData());
             $error = $this->verifyData($productsData, $itemsData);
-            \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+            \PHPUnit\Framework\Assert::assertEmpty($error, $error);
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentNotInShipmentsGrid.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentNotInShipmentsGrid.php
index 6f9d7d9a3ceb5..ec8ba30114b9e 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentNotInShipmentsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentNotInShipmentsGrid.php
@@ -38,7 +38,7 @@ public function processAssert(ShipmentIndex $shipmentIndex, OrderInjectable $ord
                 'total_qty_to' => $totalQty[$key],
             ];
             $shipmentIndex->getShipmentsGrid()->search($filter + $filterQty);
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $shipmentIndex->getShipmentsGrid()->isRowVisible($filter, false),
                 'Shipment is present in shipment grid on shipment index page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
index 3a7bc4962fd6a..89c52299b6efd 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
@@ -27,7 +27,7 @@ class AssertShipmentSuccessCreateMessage extends AbstractConstraint
      */
     public function processAssert(SalesOrderView $salesOrderView)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $salesOrderView->getMessagesBlock()->getSuccessMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
index 0fd18c3753ba6..c8b613325606d 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
@@ -29,7 +29,7 @@ class AssertShippingMethodOnPrintOrder extends AbstractConstraint
     public function processAssert(SalesGuestPrint $salesGuestPrint, $shipping)
     {
         $expected = sprintf(self::SHIPPING_TEMPLATE, $shipping['shipping_service'], $shipping['shipping_method']);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $salesGuestPrint->getInfoShipping()->isShippingMethodVisible($expected),
             "Shipping method was printed incorrectly."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php
index a35288dd2a1f6..0fd6342fec725 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertTrackingDetailsIsPresent.php
@@ -63,7 +63,7 @@ public function processAssert(
 
         $body = $browser->find($this->mainContainer)->getText();
         foreach ($resultTrackingData as $value) {
-            \PHPUnit_Framework_Assert::assertContains(
+            \PHPUnit\Framework\Assert::assertContains(
                 $value,
                 $body,
                 'The "' . $value . '" is not present in Shipping Tracking popup.'
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php
index 681b2746a4c34..abc560075d576 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestStep/FillShippingAddressesStep.php
@@ -13,7 +13,7 @@
 use Magento\Shipping\Test\Constraint\AssertCityBasedShippingRateChanged;
 
 /**
- * Fill shipping addresses and assert rates relouding.
+ * Fill shipping addresses and assert rates reloading.
  */
 class FillShippingAddressesStep implements TestStepInterface
 {
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/Adminhtml/Order/Grid.php
new file mode 100644
index 0000000000000..54f580f48dcf4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/Adminhtml/Order/Grid.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Block\Adminhtml\Order;
+
+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+
+/**
+ * Admin Data Grid for managing "Sales Order" entities.
+ */
+class Grid extends DataGrid
+{
+    /**
+     * Filters array mapping.
+     *
+     * @var array
+     */
+    protected $filters = [
+        'id' => [
+            'selector' => '[name="increment_id"]',
+        ],
+        'status' => [
+            'selector' => '[name="status"]',
+            'input' => 'select',
+        ],
+        'signifyd_guarantee_status' => [
+            'selector' => '[name="signifyd_guarantee_status"]',
+            'input' => 'select'
+        ]
+    ];
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/Adminhtml/Order/View/FraudProtection.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/Adminhtml/Order/View/FraudProtection.php
new file mode 100644
index 0000000000000..e2b4e6f748977
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/Adminhtml/Order/View/FraudProtection.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Block\Adminhtml\Order\View;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Information about fraud protection on order page.
+ */
+class FraudProtection extends Block
+{
+    /**
+     * Case Guarantee Disposition.
+     *
+     * @var string
+     */
+    private $caseGuaranteeDisposition = 'td.col-guarantee-disposition';
+
+    /**
+     * Get Case Guarantee Disposition status.
+     *
+     * @return string
+     */
+    public function getCaseGuaranteeDisposition()
+    {
+        return $this->_rootElement->find($this->caseGuaranteeDisposition)->getText();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseInfo.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseInfo.php
new file mode 100644
index 0000000000000..1529755fdc3c9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseInfo.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Block\SignifydConsole;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Case information block.
+ */
+class CaseInfo extends Block
+{
+    /**
+     * Css selector of "Flag Case As Good" button.
+     *
+     * @var string
+     */
+    private $flagCaseAsGoodButton = '[class*="flag-case-good"]';
+
+    /**
+     * Css selector of "Flag Case As Bad" button.
+     *
+     * @var string
+     */
+    private $flagCaseAsBadButton = '[class*="flag-case-bad"]';
+
+    /**
+     * Css selector of guarantee status.
+     *
+     * @var string
+     */
+    private $guaranteeDisposition = '[class*="guarantee-status"]';
+
+    /**
+     * Css selector of CVV response description.
+     *
+     * @var string
+     */
+    private $cvvResponseDescription = '[ng-bind="caseOrderSummary.cvvResponseDescription"]';
+
+    /**
+     * Css selector of CVV response code.
+     *
+     * @var string
+     */
+    private $cvvResponseCode = '[ng-bind="caseOrderSummary.cvvResponseCode"]';
+
+    /**
+     * Css selector of AVS response description.
+     *
+     * @var string
+     */
+    private $avsResponseDescription = '[ng-bind="caseOrderSummary.avsResponseDescription"]';
+
+    /**
+     * Css selector of AVS response code.
+     *
+     * @var string
+     */
+    private $avsResponseCode = '[ng-bind="caseOrderSummary.avsResponseCode"]';
+
+    /**
+     * Css selector of displayed case order id.
+     *
+     * @var string
+     */
+    private $orderId = '[ng-bind="currentCase.caseIdDisplay"]';
+
+    /**
+     * Css selector of displayed order amount.
+     *
+     * @var string
+     */
+    private $orderAmount = '[ng-bind*="currentCase.orderTotalAmount"]';
+
+    /**
+     * Locator value for order amount currency.
+     *
+     * @var string
+     */
+    private $orderAmountCurrency = '[ng-bind*="currentCase.currency"]';
+
+    /**
+     * Css selector of displayed card holder name.
+     *
+     * @var string
+     */
+    private $cardHolder = '[data-dropdown="peopleLinks0_card_holders"]';
+
+    /**
+     * Css selector of displayed billing address.
+     *
+     * @var string
+     */
+    private $billingAddress = '[data-dropdown="streetLinks0"]';
+
+    /**
+     * Locator value for "No analysis available" block in "Device" container.
+     *
+     * @var string
+     */
+    private $noDeviceAnalysisAvailable = '[ng-hide^="caseAnalysis.deviceAnalysis.details.length"]';
+
+    /**
+     * Locator value for "Shipping Price" block.
+     *
+     * @var string
+     */
+    private $shippingPrice = '[ng-if="shipment.shippingPrice"]';
+
+    /**
+     * Check if device data are present.
+     *
+     * @return bool
+     */
+    public function isAvailableDeviceData()
+    {
+        return !$this->_rootElement->find($this->noDeviceAnalysisAvailable)->isVisible();
+    }
+
+    /**
+     * Returns shipping price.
+     *
+     * @return string
+     */
+    public function getShippingPrice()
+    {
+        return $this->_rootElement->find($this->shippingPrice)->getText();
+    }
+
+    /**
+     * Flags case as good or bad.
+     *
+     * @param string $flagType
+     * @return void
+     */
+    public function flagCase($flagType)
+    {
+        $flagSelector = ($flagType === 'Good')
+            ? $this->flagCaseAsGoodButton
+            : $this->flagCaseAsBadButton;
+
+        $this->_rootElement->find($flagSelector)->click();
+    }
+
+    /**
+     * Flags case as bad.
+     *
+     * @return void
+     */
+    public function flagCaseAsBad()
+    {
+        $this->_rootElement->find($this->flagCaseAsBadButton)->click();
+    }
+
+    /**
+     * Gets guarantee disposition.
+     *
+     * @return string
+     */
+    public function getGuaranteeDisposition()
+    {
+        return $this->_rootElement->find($this->guaranteeDisposition)->getText();
+    }
+
+    /**
+     * Gets CVV response.
+     *
+     * @return string
+     */
+    public function getCvvResponse()
+    {
+        return sprintf(
+            '%s (%s)',
+            $this->_rootElement->find($this->cvvResponseDescription)->getText(),
+            $this->_rootElement->find($this->cvvResponseCode)->getText()
+        );
+    }
+
+    /**
+     * Gets AVS response.
+     *
+     * @return string
+     */
+    public function getAvsResponse()
+    {
+        return sprintf(
+            '%s (%s)',
+            $this->_rootElement->find($this->avsResponseDescription)->getText(),
+            $this->_rootElement->find($this->avsResponseCode)->getText()
+        );
+    }
+
+    /**
+     * Gets displayed order id.
+     *
+     * @return string
+     */
+    public function getOrderId()
+    {
+        return $this->_rootElement->find($this->orderId)->getText();
+    }
+
+    /**
+     * Gets displayed order amount.
+     *
+     * @return string
+     */
+    public function getOrderAmount()
+    {
+        return $this->_rootElement->find($this->orderAmount)->getText();
+    }
+
+    /**
+     * Returns displayed order amount currency.
+     *
+     * @return string
+     */
+    public function getOrderAmountCurrency()
+    {
+        return $this->_rootElement->find($this->orderAmountCurrency)->getText();
+    }
+
+    /**
+     * Gets displayed card holder name.
+     *
+     * @return string
+     */
+    public function getCardHolder()
+    {
+        return $this->_rootElement->find($this->cardHolder)->getText();
+    }
+
+    /**
+     * Gets displayed billing address.
+     *
+     * @return string
+     */
+    public function getBillingAddress()
+    {
+        return $this->_rootElement->find($this->billingAddress)->getText();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseSearch.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseSearch.php
new file mode 100644
index 0000000000000..16621f9a0cd48
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/CaseSearch.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Block\SignifydConsole;
+
+use Magento\Mtf\Block\Form;
+
+/**
+ * Side block with case search and cases list.
+ */
+class CaseSearch extends Form
+{
+    /**
+     * Css selector of search input.
+     *
+     * @var string
+     */
+    private $searchBar = '[id=queueSearchBar]';
+
+    /**
+     * Css selector of search submit button.
+     *
+     * @var string
+     */
+    private $submitButton = '[type=submit]';
+
+    /**
+     * Css selector of searched element in cases list.
+     *
+     * @var string
+     */
+    private $selectCaseLink = 'ul[case-list=cases] li[case-list-case=case] a';
+
+    /**
+     * Locator for resolving applied filters list.
+     *
+     * @var string
+     */
+    private $appliedFilters = '.app-taglist > ul > li > a';
+
+    /**
+     * Locator for loading spinner.
+     *
+     * @var string
+     */
+    private $spinner = '.cases-loading-spinner';
+
+    /**
+     * Fill search input with customer name and submit.
+     *
+     * @param string $customerName
+     * @return void
+     */
+    public function searchCaseByCustomerName($customerName)
+    {
+        $this->resetFilters();
+        $this->_rootElement->find($this->searchBar)->setValue($customerName);
+        $this->_rootElement->find($this->submitButton)->click();
+        $this->waitLoadingSpinner();
+    }
+
+    /**
+     * Reset applied filters.
+     *
+     * @return void
+     */
+    private function resetFilters(): void
+    {
+        $filters = $this->_rootElement->getElements($this->appliedFilters);
+        if (!empty($filters)) {
+            foreach ($filters as $filter) {
+                $filter->click();
+                $this->waitLoadingSpinner();
+            }
+        }
+    }
+
+    /**
+     * Wait until loading spinner disappeared.
+     *
+     * @return void
+     */
+    private function waitLoadingSpinner(): void
+    {
+        $this->waitForElementNotVisible($this->spinner);
+    }
+
+    /**
+     * Checks if any case is visible.
+     *
+     * @return bool
+     */
+    public function isAnyCaseVisible(): bool
+    {
+        return $this->_rootElement->find($this->selectCaseLink)->isVisible();
+    }
+
+    /**
+     * Select searched case.
+     *
+     * @return void
+     */
+    public function selectCase()
+    {
+        $this->_rootElement->find($this->selectCaseLink)->click();
+    }
+
+    /**
+     * Waiting of case page loading.
+     *
+     * @return void
+     */
+    public function waitForLoading()
+    {
+        $this->waitForElementVisible($this->searchBar);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/SignifydLogin.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/SignifydLogin.php
new file mode 100644
index 0000000000000..7705a67360e55
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/SignifydLogin.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Block\SignifydConsole;
+
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Fixture\FixtureInterface;
+
+/**
+ * Signifyd login block.
+ */
+class SignifydLogin extends Form
+{
+    /**
+     * Css selector of Signifyd login button.
+     *
+     * @var string
+     */
+    private $loginButton = '[type=submit]';
+
+    /**
+     * Locator for admin form notification window.
+     *
+     * @var string
+     */
+    private $notificationCloseButton = '.wm-close-button';
+
+    /**
+     * @inheritdoc
+     */
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    {
+        $this->closeNotification();
+
+        return parent::fill($fixture, $element);
+    }
+
+    /**
+     * Login to Signifyd.
+     *
+     * @return void
+     */
+    public function login()
+    {
+        $this->closeNotification();
+        $this->_rootElement->find($this->loginButton)->click();
+    }
+
+    /**
+     * Close notification popup.
+     *
+     * @return void
+     */
+    private function closeNotification(): void
+    {
+        $notification = $this->browser->find($this->notificationCloseButton);
+        if ($notification->isVisible()) {
+            $notification->click();
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/Webhooks.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/Webhooks.php
new file mode 100644
index 0000000000000..424d5681c07c6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Block/SignifydConsole/Webhooks.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Block\SignifydConsole;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Signifyd webhook addition block.
+ */
+class Webhooks extends Block
+{
+    /**
+     * Map of webhook event select option values on names of events in webhook grid.
+     *
+     * @var array
+     */
+    private $webhookEventOptionsMap = [
+        'CASE_CREATION' => 'Case Creation',
+        'CASE_REVIEW' => 'Case Review',
+        'GUARANTEE_COMPLETION' => 'Guarantee Completion'
+    ];
+
+    /**
+     * XPath selector of webhook element added into grid.
+     *
+     * @var string
+     */
+    private $webhookAddedElement = '//table[@id="webhooks"]//tr[./td/span/text()="%s" and ./td/span/text()="%s"]';
+
+    /**
+     * Css selector of webhook url input.
+     *
+     * @var string
+     */
+    private $webhookUrl = '[id="webhookUrl"]';
+
+    /**
+     * XPath selector of test team select option.
+     *
+     * @var string
+     */
+    private $webhookTeamOption = './/select[@id="webhookTeams"]//option[text()="%s"]';
+
+    /**
+     * Css selector of webhook event select option.
+     *
+     * @var string
+     */
+    private $webhookEventOption = 'select[id="webhookEvent"] option[value="%s"]';
+
+    /**
+     * Css selector of webhook addition button.
+     *
+     * @var string
+     */
+    private $webhookAddButton = '[id="addWebhook"] [type=submit]';
+
+    /**
+     * Css selector of delete button in element of webhook grid.
+     *
+     * @var string
+     */
+    private $webhookDeleteButton = '[class*="webhook-delete"]';
+
+    /**
+     * Css selector of confirming button for deleting webhook.
+     *
+     * @var string
+     */
+    private $webhookDeleteConfirmButton = '[class="appriseOuter"] button[value="ok"]';
+
+    /**
+     * Creates new set of webhooks, if it not exists.
+     *
+     * @param string $team
+     * @return void
+     */
+    public function create($team)
+    {
+        $handlerUrl = $this->getHandlerUrl();
+
+        foreach ($this->webhookEventOptionsMap as $webhookEventCode => $webhookEventName) {
+            if ($this->getWebhook($team, $webhookEventName)) {
+                continue;
+            }
+
+            $this->addWebhook($handlerUrl, $webhookEventCode, $team);
+        }
+    }
+
+    /**
+     * Deletes set of webhooks.
+     *
+     * @param string $team
+     * @return void
+     */
+    public function cleanup($team)
+    {
+        foreach ($this->webhookEventOptionsMap as $webhookEventName) {
+            if ($webhook = $this->getWebhook($team, $webhookEventName)) {
+                $this->deleteWebhook($webhook);
+            }
+        }
+    }
+
+    /**
+     * Gets webhook if exists.
+     *
+     * @param string $team
+     * @param string $webhookEventName
+     * @return ElementInterface|null
+     */
+    private function getWebhook($team, $webhookEventName)
+    {
+        $webhook = $this->_rootElement->find(
+            sprintf($this->webhookAddedElement, $team, $webhookEventName),
+            Locator::SELECTOR_XPATH
+        );
+
+        return $webhook->isPresent() ? $webhook : null;
+    }
+
+    /**
+     * Delete webhook element with confirmation popup.
+     *
+     * @param ElementInterface $webhook
+     * @return void
+     */
+    private function deleteWebhook(ElementInterface $webhook)
+    {
+        $webhook->find($this->webhookDeleteButton)->click();
+        $this->_rootElement->find($this->webhookDeleteConfirmButton)->click();
+    }
+
+    /**
+     * Sets webhook data and add it.
+     *
+     * @param string $handlerUrl
+     * @param string $webhookEventCode
+     * @param string $team
+     * @return void
+     */
+    private function addWebhook(
+        $handlerUrl,
+        $webhookEventCode,
+        $team
+    ) {
+        $this->setEvent($webhookEventCode);
+        $this->setTeam($team);
+        $this->setUrl($handlerUrl);
+        $this->submit();
+    }
+
+    /**
+     * Sets appropriate webhook event select option by code.
+     *
+     * @param string $webhookEventCode
+     * @return void
+     */
+    private function setEvent($webhookEventCode)
+    {
+        $this->_rootElement->find(
+            sprintf($this->webhookEventOption, $webhookEventCode)
+        )->click();
+    }
+
+    /**
+     * Sets test team select option.
+     *
+     * @param string $team
+     * @return void
+     */
+    private function setTeam($team)
+    {
+        $this->_rootElement->find(
+            sprintf($this->webhookTeamOption, $team),
+            Locator::SELECTOR_XPATH
+        )->click();
+    }
+
+    /**
+     * Sets webhook handler url input value.
+     *
+     * @param string $handlerUrl
+     * @return void
+     */
+    private function setUrl($handlerUrl)
+    {
+        $this->_rootElement->find($this->webhookUrl)->setValue($handlerUrl);
+    }
+
+    /**
+     * Add webhook element.
+     *
+     * @return void
+     */
+    private function submit()
+    {
+        $this->_rootElement->find($this->webhookAddButton)->click();
+    }
+
+    /**
+     * Gets webhook handler url.
+     *
+     * @return string
+     */
+    private function getHandlerUrl()
+    {
+        return $_ENV['app_frontend_url'] . 'signifyd/webhooks/handler';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertAwaitingSignifydGuaranteeInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertAwaitingSignifydGuaranteeInCommentsHistory.php
new file mode 100644
index 0000000000000..f85e77a5c421b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertAwaitingSignifydGuaranteeInCommentsHistory.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Assert that comment about awaiting the Signifyd guarantee disposition
+ * exists in Comments History section on order page in Admin.
+ */
+class AssertAwaitingSignifydGuaranteeInCommentsHistory extends AbstractConstraint
+{
+    /**
+     * Expected history comment.
+     */
+    private $historyComment = 'Awaiting the Signifyd guarantee disposition.';
+
+    /**
+     * Expected history status.
+     */
+    private $historyCommentStatus = 'On Hold';
+
+    /**
+     * @param SalesOrderView $salesOrderView
+     * @param OrderIndex $salesOrder
+     * @param string $orderId
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $salesOrderView,
+        OrderIndex $salesOrder,
+        $orderId
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+
+        /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
+        $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
+        $orderComments = $infoTab->getCommentsHistoryBlock()->getComments();
+
+        $key = array_search(
+            $this->historyComment,
+            array_column($orderComments, 'comment')
+        );
+
+        \PHPUnit\Framework\Assert::assertNotFalse(
+            $key,
+            'There is no message about awaiting the Signifyd guarantee disposition' .
+            ' in Comments History section for the order #' . $orderId
+        );
+
+        \PHPUnit\Framework\Assert::assertEquals(
+            $this->historyCommentStatus,
+            $orderComments[$key]['status'],
+            'Message about awaiting the Signifyd guarantee disposition' .
+            ' doesn\'t have status "'. $this->historyCommentStatus.'"' .
+            ' in Comments History section for the order #' . $orderId
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return "Message about awaiting the Signifyd guarantee disposition is available in Comments History section.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertCaseInfoOnAdmin.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertCaseInfoOnAdmin.php
new file mode 100644
index 0000000000000..298b957131395
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertCaseInfoOnAdmin.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Signifyd\Test\Fixture\SignifydData;
+
+/**
+ * Assert that Order Case Entity is correct on order page in Admin.
+ */
+class AssertCaseInfoOnAdmin extends AbstractConstraint
+{
+    /**
+     * Customized order view page.
+     *
+     * @var SalesOrderView
+     */
+    private $orderView;
+
+    /**
+     * Signifyd data fixture.
+     *
+     * @var SignifydData
+     */
+    private $signifydData;
+
+    /**
+     * Order id.
+     *
+     * @var string
+     */
+    private $orderId;
+
+    /**
+     * Assert that Signifyd Case information is correct in Admin.
+     *
+     * @param SalesOrderView $orderView
+     * @param OrderIndex $salesOrder
+     * @param SignifydData $signifydData
+     * @param string $orderId
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $orderView,
+        OrderIndex $salesOrder,
+        SignifydData $signifydData,
+        $orderId
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+
+        $this->orderView = $orderView;
+        $this->signifydData = $signifydData;
+        $this->orderId = $orderId;
+
+        $this->checkCaseGuaranteeDisposition();
+    }
+
+    /**
+     * Checks case guarantee disposition is correct.
+     *
+     * @return void
+     */
+    private function checkCaseGuaranteeDisposition()
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $this->signifydData->getGuaranteeDisposition(),
+            $this->orderView->getFraudProtectionBlock()->getCaseGuaranteeDisposition(),
+            'Case Guarantee Disposition status is wrong for order #' . $this->orderId
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Signifyd Case information is correct in Admin.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertCaseInfoOnSignifydConsole.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertCaseInfoOnSignifydConsole.php
new file mode 100644
index 0000000000000..a8a1f735d004c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertCaseInfoOnSignifydConsole.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Signifyd\Test\Fixture\SignifydAddress;
+use Magento\Signifyd\Test\Fixture\SignifydData;
+use Magento\Signifyd\Test\Page\SignifydConsole\SignifydCases;
+
+/**
+ * Assert that order information is correct on Signifyd case info page.
+ */
+class AssertCaseInfoOnSignifydConsole extends AbstractConstraint
+{
+    /**
+     * Signifyd cases page.
+     *
+     * @var SignifydCases
+     */
+    private $signifydCases;
+
+    /**
+     * @param SignifydCases $signifydCases
+     * @param SignifydAddress $billingAddress
+     * @param SignifydData $signifydData
+     * @param array $prices
+     * @param string $orderId
+     * @param string $customerFullName
+     * @return void
+     */
+    public function processAssert(
+        SignifydCases $signifydCases,
+        SignifydAddress $billingAddress,
+        SignifydData $signifydData,
+        array $prices,
+        $orderId,
+        $customerFullName
+    ) {
+        $this->signifydCases = $signifydCases;
+
+        $this->checkDeviceData();
+        $this->checkShippingPrice($signifydData->getShippingPrice());
+        $this->checkGuaranteeDisposition($signifydData->getGuaranteeDisposition());
+        $cvvResponse = $signifydData->getCvvResponse();
+        if (isset($cvvResponse)) {
+            $this->checkCvvResponse($cvvResponse);
+        }
+        $this->checkAvsResponse($signifydData->getAvsResponse());
+        $this->checkOrderId($orderId);
+        $this->checkOrderAmount($prices['grandTotal']);
+        $this->checkOrderAmountCurrency($prices['grandTotalCurrency']);
+        $this->checkCardHolder($customerFullName);
+        $this->checkBillingAddress($billingAddress);
+    }
+
+    /**
+     * Checks device data are present.
+     *
+     * @return void
+     */
+    private function checkDeviceData()
+    {
+        \PHPUnit\Framework\Assert::assertTrue(
+            $this->signifydCases->getCaseInfoBlock()->isAvailableDeviceData(),
+            'Device data are not available on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks shipping price is correct.
+     *
+     * @param string $shippingPrice
+     * @return void
+     */
+    private function checkShippingPrice($shippingPrice)
+    {
+        \PHPUnit\Framework\Assert::assertContains(
+            $shippingPrice,
+            $this->signifydCases->getCaseInfoBlock()->getShippingPrice(),
+            'Shipping price is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks guarantee disposition is correct.
+     *
+     * @param string $guaranteeDisposition
+     * @return void
+     */
+    private function checkGuaranteeDisposition($guaranteeDisposition)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $guaranteeDisposition,
+            $this->signifydCases->getCaseInfoBlock()->getGuaranteeDisposition(),
+            'Guarantee disposition is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks CVV response is correct.
+     *
+     * @param string $cvvResponse
+     * @return void
+     */
+    private function checkCvvResponse($cvvResponse)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $cvvResponse,
+            $this->signifydCases->getCaseInfoBlock()->getCvvResponse(),
+            'CVV response is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks AVS response is correct.
+     *
+     * @param string $avsResponse
+     * @return void
+     */
+    private function checkAvsResponse($avsResponse)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $avsResponse,
+            $this->signifydCases->getCaseInfoBlock()->getAvsResponse(),
+            'AVS response is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks order id is correct.
+     *
+     * @param string $orderId
+     * @return void
+     */
+    private function checkOrderId($orderId)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $orderId,
+            $this->signifydCases->getCaseInfoBlock()->getOrderId(),
+            'Order id is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks order amount is correct.
+     *
+     * @param string $amount
+     * @return void
+     */
+    private function checkOrderAmount($amount)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            number_format($amount, 2),
+            $this->signifydCases->getCaseInfoBlock()->getOrderAmount(),
+            'Order amount is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks order amount currency is correct.
+     *
+     * @param string $currency
+     * @return void
+     */
+    private function checkOrderAmountCurrency($currency)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $currency,
+            $this->signifydCases->getCaseInfoBlock()->getOrderAmountCurrency(),
+            'Order amount currency is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks card holder is correct.
+     *
+     * @param string $customerFullName
+     * @return void
+     */
+    private function checkCardHolder($customerFullName)
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            $customerFullName,
+            $this->signifydCases->getCaseInfoBlock()->getCardHolder(),
+            'Card holder name is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * Checks billing address is correct.
+     *
+     * @param SignifydAddress $billingAddress
+     * @return void
+     */
+    private function checkBillingAddress(SignifydAddress $billingAddress)
+    {
+        \PHPUnit\Framework\Assert::assertContains(
+            $billingAddress->getStreet(),
+            $this->signifydCases->getCaseInfoBlock()->getBillingAddress(),
+            'Billing address is incorrect on case page in Signifyd console.'
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Case information is correct on case page in Signifyd console.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydCaseInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydCaseInCommentsHistory.php
new file mode 100644
index 0000000000000..ea919f9410d4d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydCaseInCommentsHistory.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that comment about created Signifyd Case
+ * exists in Comments History section on order page in Admin.
+ */
+class AssertSignifydCaseInCommentsHistory extends AbstractConstraint
+{
+    /**
+     * Pattern of message about created Signifyd Case in order.
+     */
+    const CASE_CREATED_PATTERN = '/Signifyd Case (\d)+ has been created for order\./';
+
+    /**
+     * @param SalesOrderView $salesOrderView
+     * @param OrderIndex $salesOrder
+     * @param string $orderId
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $salesOrderView,
+        OrderIndex $salesOrder,
+        $orderId
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+
+        /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
+        $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
+        $orderComments = $infoTab->getCommentsHistoryBlock()->getComments();
+        $commentsMessages = array_column($orderComments, 'comment');
+
+        \PHPUnit\Framework\Assert::assertRegExp(
+            self::CASE_CREATED_PATTERN,
+            implode('. ', $commentsMessages),
+            'Signifyd case is not created for the order #' . $orderId
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return "Message about Signifyd Case is available in Comments History section.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydCaseInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydCaseInOrdersGrid.php
new file mode 100644
index 0000000000000..bdf3598d4f46a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydCaseInOrdersGrid.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Constraint;
+
+use Magento\Signifyd\Test\Fixture\SignifydData;
+use Magento\Signifyd\Test\Page\Adminhtml\OrdersGrid;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that Signifyd Guarantee Status is present in Orders grid.
+ */
+class AssertSignifydCaseInOrdersGrid extends AbstractConstraint
+{
+    /**
+     * @param string $orderId
+     * @param OrdersGrid $ordersGrid
+     * @param SignifydData $signifydData
+     * @return void
+     */
+    public function processAssert(
+        $orderId,
+        OrdersGrid $ordersGrid,
+        SignifydData $signifydData
+    ) {
+        $filter = [
+            'id' => $orderId,
+            'signifyd_guarantee_status' => $signifydData->getGuaranteeDisposition()
+        ];
+
+        $errorMessage = implode(', ', $filter);
+
+        $ordersGrid->open();
+
+        \PHPUnit\Framework\Assert::assertTrue(
+            $ordersGrid->getSignifydOrdersGrid()->isRowVisible(array_filter($filter)),
+            'Order with following data \'' . $errorMessage . '\' is absent in orders grid.'
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return 'Signifyd guarantee status is displayed in sales orders grid.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydGuaranteeCancelInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydGuaranteeCancelInCommentsHistory.php
new file mode 100644
index 0000000000000..618d77885736c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Constraint/AssertSignifydGuaranteeCancelInCommentsHistory.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+
+/**
+ * Assert that comment about created Signifyd Case guarantee
+ * has been cancelled exists in Comments History section on order page in Admin.
+ */
+class AssertSignifydGuaranteeCancelInCommentsHistory extends AbstractConstraint
+{
+    /**
+     * Signifyd case guarantee cancel message in order view.
+     */
+    private $guaranteeCancelMessage = 'Case Update: Case guarantee has been cancelled.';
+
+    /**
+     * @param SalesOrderView $salesOrderView
+     * @param OrderIndex $salesOrder
+     * @param string $orderId
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $salesOrderView,
+        OrderIndex $salesOrder,
+        $orderId
+    ) {
+        $salesOrder->open();
+        $salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
+
+        /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
+        $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
+        $orderComments = $infoTab->getCommentsHistoryBlock()->getComments();
+        $commentsMessages = array_column($orderComments, 'comment');
+
+        \PHPUnit\Framework\Assert::assertContains(
+            $this->guaranteeCancelMessage,
+            implode('. ', $commentsMessages),
+            'There is no message regarding Signifyd guarantee cancel in Comments History section for the order #'
+            . $orderId
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toString()
+    {
+        return "Message about Signifyd guarantee cancel is available in Comments History section.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAccount.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAccount.xml
new file mode 100644
index 0000000000000..8b1455811d003
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAccount.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="signifyd_account"
+             module="Magento_Signifyd"
+             type="virtual"
+             repository_class="Magento\Signifyd\Test\Repository\SignifydAccount"
+             class="Magento\Signifyd\Test\Fixture\SignifydAccount">
+        <field name="email" />
+        <field name="password" />
+    </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress.xml
new file mode 100644
index 0000000000000..02b5cc8211d89
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="signifydAddress"
+             module="Magento_Signifyd"
+             class="Magento\Signifyd\Test\Fixture\SignifydAddress"
+             extends="\Magento\Customer\Test\Fixture\Address">
+        <field name="firstname" source="Magento\Signifyd\Test\Fixture\SignifydAddress\Firstname"  is_required="1" />
+    </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress/Firstname.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress/Firstname.php
new file mode 100644
index 0000000000000..9e4930484eef0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress/Firstname.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\Fixture\SignifydAddress;
+
+use Magento\Mtf\Fixture\DataSource;
+
+/**
+ * Source handler for `firstname` field in shipping address fixture.
+ */
+class Firstname extends DataSource
+{
+    /**
+     * @param string $data
+     */
+    public function __construct($data = '')
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Add isolation for `firstname` field.
+     *
+     * @param null $key
+     * @return string
+     */
+    public function getData($key = null)
+    {
+        $this->data = str_replace('%signifyd_isolation%', $this->generateIsolation(), $this->data);
+
+        return parent::getData($key);
+    }
+
+    /**
+     * Generates character isolation.
+     *
+     * @param int $length
+     * @return string
+     */
+    private function generateIsolation($length = 10)
+    {
+        return substr(str_shuffle(str_repeat("abcdefghijklmnopqrstuvwxyz", $length)), 0, $length);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydData.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydData.xml
new file mode 100644
index 0000000000000..23ee2cddf434a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="signifyd_data"
+             module="Magento_Signifyd"
+             type="virtual"
+             repository_class="Magento\Signifyd\Test\Repository\SignifydData"
+             class="Magento\Signifyd\Test\Fixture\SignifydData">
+        <field name="team" />
+        <field name="caseFlag" />
+        <field name="guaranteeDisposition" />
+        <field name="cvvResponse" />
+        <field name="avsResponse" />
+        <field name="shippingPrice" />
+    </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/OrdersGrid.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/OrdersGrid.xml
new file mode 100644
index 0000000000000..749d91c3ed395
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/OrdersGrid.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="ordersGrid" area="Adminhtml" mca="sales/order" module="Magento_Signifyd">
+        <block name="signifydOrdersGrid" class="Magento\Signifyd\Test\Block\Adminhtml\Order\Grid" locator="//div[contains(@data-bind, 'sales_order_grid')]" strategy="xpath" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/SalesOrderView.xml
new file mode 100644
index 0000000000000..36d77723dfcee
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/SalesOrderView.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SalesOrderView" area="Adminhtml" mca="sales/order/view">
+        <block name="fraudProtectionBlock" class="Magento\Signifyd\Test\Block\Adminhtml\Order\View\FraudProtection" locator=".admin__page-section.order-case-info" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydCases.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydCases.xml
new file mode 100644
index 0000000000000..cfe889bb8de44
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydCases.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SignifydCases" area="SignifydConsole" mca="https://app.signifyd.com/cases" module="Magento_Signifyd">
+        <block name="caseSearchBlock" class="Magento\Signifyd\Test\Block\SignifydConsole\CaseSearch" locator="[class$=app-sidebar]" strategy="css selector" />
+        <block name="caseInfoBlock" class="Magento\Signifyd\Test\Block\SignifydConsole\CaseInfo" locator="[class*=app-wrapper]" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydLogin.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydLogin.xml
new file mode 100644
index 0000000000000..5fe5da6d28013
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydLogin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SignifydLogin" area="SignifydConsole" mca="https://app.signifyd.com/login" module="Magento_Signifyd">
+        <block name="loginBlock" class="Magento\Signifyd\Test\Block\SignifydConsole\SignifydLogin" locator="[id=loginForm]" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydNotifications.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydNotifications.xml
new file mode 100644
index 0000000000000..dd12f14c28800
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydNotifications.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="SignifydNotifications" area="SignifydConsole" mca="https://app.signifyd.com/settings/notifications" module="Magento_Signifyd">
+        <block name="webhooksBlock" class="Magento\Signifyd\Test\Block\SignifydConsole\Webhooks" locator="[id=body]" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Address.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Address.xml
new file mode 100644
index 0000000000000..a534cbc6107fe
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Address.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Customer\Test\Repository\Address">
+        <dataset name="signifyd_us_shipping_address">
+            <field name="firstname" xsi:type="string">John%signifyd_isolation%</field>
+            <field name="lastname" xsi:type="string">Doe</field>
+            <field name="company" xsi:type="string">Magento</field>
+            <field name="city" xsi:type="string">Culver City</field>
+            <field name="street" xsi:type="string">6161 West Centinela Avenue</field>
+            <field name="telephone" xsi:type="string">555-55-555-55</field>
+            <field name="country_id" xsi:type="string">United States</field>
+            <field name="region_id" xsi:type="string">California</field>
+            <field name="postcode" xsi:type="string">90230</field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/ConfigData.xml
new file mode 100644
index 0000000000000..2af46f077b304
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/ConfigData.xml
@@ -0,0 +1,45 @@
+<?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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Config\Test\Repository\ConfigData">
+        <dataset name="signifyd">
+            <field name="fraud_protection/signifyd/active" xsi:type="array">
+                <item name="scope" xsi:type="string">fraud_protection</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+            <field name="fraud_protection/signifyd/config/api_key" xsi:type="array">
+                <item name="scope" xsi:type="string">fraud_protection</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">SIGNIFYD_CONFIG_API_KEY</item>
+            </field>
+            <field name="fraud_protection/signifyd/api_url" xsi:type="array">
+                <item name="scope" xsi:type="string">fraud_protection</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">https://api.signifyd.com/v2/</item>
+            </field>
+            <field name="fraud_protection/signifyd/debug" xsi:type="array">
+                <item name="scope" xsi:type="string">fraud_protection</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="signifyd_rollback">
+            <field name="fraud_protection/signifyd/active" xsi:type="array">
+                <item name="scope" xsi:type="string">fraud_protection</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Customer.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Customer.xml
new file mode 100644
index 0000000000000..b45e3d01b8ec8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Customer.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Customer\Test\Repository\Customer">
+        <dataset name="signifyd_approve_us_customer">
+            <field name="firstname" xsi:type="string">John</field>
+            <field name="lastname" xsi:type="string">Doe</field>
+            <field name="email" xsi:type="string">testapprove@magento.com</field>
+            <field name="password" xsi:type="string">123123^q</field>
+            <field name="password_confirmation" xsi:type="string">123123^q</field>
+        </dataset>
+        <dataset name="signifyd_decline_us_customer">
+            <field name="firstname" xsi:type="string">John</field>
+            <field name="lastname" xsi:type="string">Doe</field>
+            <field name="email" xsi:type="string">testdecline@magento.com</field>
+            <field name="password" xsi:type="string">123123^q</field>
+            <field name="password_confirmation" xsi:type="string">123123^q</field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydAccount.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydAccount.xml
new file mode 100644
index 0000000000000..4d3dd5229eae3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydAccount.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Signifyd\Test\Repository\SignifydAccount">
+        <dataset name="sandbox_default">
+            <field name="email" xsi:type="string">SIGNIFYD_EMAIL</field>
+            <field name="password" xsi:type="string">SIGNIFYD_PASSWORD</field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml
new file mode 100644
index 0000000000000..02037534b0149
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml
@@ -0,0 +1,33 @@
+<?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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Signifyd\Test\Repository\SignifydData">
+        <dataset name="signifyd_guarantee_approve">
+            <field name="team" xsi:type="string">autotest</field>
+            <field name="caseFlag" xsi:type="string">Good</field>
+            <field name="guaranteeDisposition" xsi:type="string">Approved</field>
+            <field name="cvvResponse" xsi:type="string">CVV2 Match (M)</field>
+            <field name="avsResponse" xsi:type="string">Full match (Y)</field>
+            <field name="shippingPrice" xsi:type="string">USD 5.00</field>
+        </dataset>
+        <dataset name="signifyd_guarantee_decline">
+            <field name="team" xsi:type="string">autotest</field>
+            <field name="caseFlag" xsi:type="string">Bad</field>
+            <field name="guaranteeDisposition" xsi:type="string">Declined</field>
+            <field name="cvvResponse" xsi:type="string">CVV2 Match (M)</field>
+            <field name="avsResponse" xsi:type="string">Full match (Y)</field>
+            <field name="shippingPrice" xsi:type="string">USD 5.00</field>
+        </dataset>
+        <dataset name="signifyd_guarantee_fraudulent">
+            <field name="team" xsi:type="string">autotest</field>
+            <field name="caseFlag" xsi:type="string">Bad</field>
+            <field name="guaranteeDisposition" xsi:type="string">Declined</field>
+            <field name="shippingPrice" xsi:type="string">GBP 10.00</field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.php
new file mode 100644
index 0000000000000..1dd742c9f7096
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Configure Signifyd fraud protection tool
+ * 4. Create products.
+ * 5. Create and setup customer.
+ *
+ * Steps:
+ * 1. Log in to Signifyd account.
+ * 2. Remove all existing webhooks by test team.
+ * 3. Add new webhook set.
+ * 4. Log in Storefront.
+ * 5. Add products to the Shopping Cart.
+ * 6. Click the 'Proceed to Checkout' button.
+ * 7. Fill shipping information.
+ * 8. Select shipping method.
+ * 9. Select Hosted Pro method.
+ * 10. Click 'Continue' button.
+ * 11. Specify credit card data in Paypal iframe.
+ * 12. Click 'Pay Now' button.
+ * 13. Log in to Signifyd account and search for created case.
+ * 14. Open created case.
+ * 15. Click "Flag case as bad" button.
+ * 16. Perform case info assertions.
+ * 17. Log in to Admin.
+ * 18. Proceed to order grid.
+ * 19. Perform Signifyd guarantee status assertions.
+ * 20. Proceed to order view.
+ * 21. Perform order status and case info assertions.
+ * 22. Click Accept Payment button.
+ * 23. Perform remaining assertions.
+ *
+ * @group Signifyd
+ * @ZephyrId MAGETWO-65333
+ */
+class AcceptPaymentWithSignifydGuaranteeDeclinedTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = '3rd_party_test_single_flow';
+    const SEVERITY = 'S2';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.xml
new file mode 100644
index 0000000000000..6391081e5e161
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Signifyd\Test\TestCase\AcceptPaymentWithSignifydGuaranteeDeclinedTest"
+              summary="One Page Checkout with Signifyd, PayPal Payments Pro Hosted Solution with Fraud filters triggered.">
+        <variation name="AcceptPaymentWithSignifydGuaranteeDeclinedWithHostedProVariation1" summary="Accept order placed within PayPal Payments Pro Hosted Solution with Fraud filters triggered and Signifyd Guarantee Declined" ticketId="MAGETWO-65333">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
+            <data name="customer/dataset" xsi:type="string">signifyd_decline_us_customer</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">hosted_pro</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">210.00</item>
+                <item name="grandTotalCurrency" xsi:type="string">GBP</item>
+            </data>
+            <data name="creditCardClass" xsi:type="string">credit_card_hostedpro</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_hosted_pro</data>
+            <data name="isVaultPresent" xsi:type="boolean">false</data>
+            <data name="configData" xsi:type="string">merchant_country_gb, hosted_pro, config_base_currency_gb, signifyd</data>
+            <data name="placeOrderStatus" xsi:type="string">Suspected Fraud</data>
+            <data name="signifydAddress/dataset" xsi:type="string">signifyd_us_shipping_address</data>
+            <data name="signifydAccount/dataset" xsi:type="string">sandbox_default</data>
+            <data name="signifydData/dataset" xsi:type="string">signifyd_guarantee_fraudulent</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test_single_flow, severity:S2</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertAcceptPaymentMessageInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.php
new file mode 100644
index 0000000000000..5ca76ff70479f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Configure Signifyd fraud protection tool
+ * 4. Create products.
+ * 5. Create and setup customer.
+ *
+ * Steps:
+ * 1. Log in to Signifyd account.
+ * 2. Remove all existing webhooks by test team.
+ * 3. Add new webhook set.
+ * 4. Log in Storefront.
+ * 5. Add products to the Shopping Cart.
+ * 6. Click the 'Proceed to Checkout' button.
+ * 7. Fill shipping information.
+ * 8. Select shipping method.
+ * 9. Select payment method.
+ * 10. Specify credit card data.
+ * 11. Click 'Place order' button.
+ * 12. Search for created case.
+ * 13. Open created case.
+ * 14. Click "Flag case as good" or "Flag case as bad" button.
+ * 15. Perform case info assertions.
+ * 16. Log in to Admin.
+ * 17. Proceed to order grid.
+ * 18. Perform Signifyd guarantee status assertions.
+ * 19. Proceed to order view.
+ * 20. Perform order status and case info assertions.
+ * 21. Click Cancel button.
+ * 22. Perform remaining assertions.
+ *
+ * @group Signifyd
+ * @ZephyrId MAGETWO-62120, MAGETWO-63221, MAGETWO-64305, MAGETWO-65253
+ */
+class CreateSignifydGuaranteeAndCancelOrderTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = '3rd_party_test_single_flow';
+    const SEVERITY = 'S1';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml
new file mode 100644
index 0000000000000..082627fe5821d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Signifyd\Test\TestCase\CreateSignifydGuaranteeAndCancelOrderTest"
+              summary="One Page Checkout with Signifyd and cancel order.">
+        <variation name="CreateSignifydGuaranteeAndCancelOrderWithBraintreeVariation1"
+                   summary="Cancel order placed within Braintree credit card with Signifyd approved guarantee."
+                   ticketId="MAGETWO-62120,MAGETWO-63221">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="customer/dataset" xsi:type="string">signifyd_approve_us_customer</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="paymentForm" xsi:type="string">braintree</data>
+            <data name="prices/grandTotal" xsi:type="string">15.00</data>
+            <data name="prices/grandTotalCurrency" xsi:type="string">USD</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_default</data>
+            <data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
+            <data name="configData" xsi:type="string">braintree,signifyd</data>
+            <data name="placeOrderStatus" xsi:type="string">Processing</data>
+            <data name="signifydAddress/dataset" xsi:type="string">signifyd_us_shipping_address</data>
+            <data name="signifydAccount/dataset" xsi:type="string">sandbox_default</data>
+            <data name="signifydData/dataset" xsi:type="string">signifyd_guarantee_approve</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test_single_flow, severity:S1</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCanceled" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertCancelInCommentsHistory" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInCommentsHistory" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertAwaitingSignifydGuaranteeInCommentsHistory" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydGuaranteeCancelInCommentsHistory" />
+        </variation>
+        <variation name="CreateSignifydGuaranteeAndCancelOrderWithBraintreeVariation2"
+                   summary="Cancel order placed within Braintree credit card with Signifyd declined guarantee."
+                   ticketId="MAGETWO-64305, MAGETWO-65253">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="customer/dataset" xsi:type="string">signifyd_decline_us_customer</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">braintree</data>
+            <data name="paymentForm" xsi:type="string">braintree</data>
+            <data name="prices/grandTotal" xsi:type="string">15.00</data>
+            <data name="prices/grandTotalCurrency" xsi:type="string">USD</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_default</data>
+            <data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
+            <data name="configData" xsi:type="string">braintree,signifyd</data>
+            <data name="placeOrderStatus" xsi:type="string">On Hold</data>
+            <data name="signifydAddress/dataset" xsi:type="string">signifyd_us_shipping_address</data>
+            <data name="signifydAccount/dataset" xsi:type="string">sandbox_default</data>
+            <data name="signifydData/dataset" xsi:type="string">signifyd_guarantee_decline</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test_single_flow, severity:S1</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCanceled" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertCancelInCommentsHistory" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInCommentsHistory" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertAwaitingSignifydGuaranteeInCommentsHistory" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.php
new file mode 100644
index 0000000000000..698861da26018
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * * Preconditions:
+ * 1. Configure shipping method.
+ * 2. Configure payment method.
+ * 3. Configure Signifyd fraud protection tool
+ * 4. Create products.
+ * 5. Create and setup customer.
+ *
+ * Steps:
+ * 1. Log in to Signifyd account.
+ * 2. Remove all existing webhooks by test team.
+ * 3. Add new webhook set.
+ * 4. Log in Storefront.
+ * 5. Add products to the Shopping Cart.
+ * 6. Click the 'Proceed to Checkout' button.
+ * 7. Fill shipping information.
+ * 8. Select shipping method.
+ * 9. Select Hosted Pro method.
+ * 10. Click 'Continue' button.
+ * 11. Specify credit card data in Paypal iframe.
+ * 12. Click 'Pay Now' button.
+ * 13. Log in to Signifyd account and search for created case.
+ * 14. Open created case.
+ * 15. Click "Flag case as bad" button.
+ * 16. Perform case info assertions.
+ * 17. Log in to Admin.
+ * 18. Proceed to order grid.
+ * 19. Perform Signifyd guarantee status assertions.
+ * 20. Proceed to order view.
+ * 21. Perform order status and case info assertions.
+ * 22. Click Deny Payment button.
+ * 23. Perform remaining assertions.
+ *
+ * @group Signifyd
+ * @ZephyrId MAGETWO-65332
+ */
+class DenyPaymentWithSignifydGuaranteeDeclinedTest extends Scenario
+{
+    /* tags */
+    const MVP = 'yes';
+    const TEST_TYPE = '3rd_party_test_single_flow';
+    const SEVERITY = 'S2';
+    /* end tags */
+
+    /**
+     * Runs one page checkout test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.xml
new file mode 100644
index 0000000000000..5496619fe1bf9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Signifyd\Test\TestCase\DenyPaymentWithSignifydGuaranteeDeclinedTest"
+              summary="One Page Checkout with Signifyd, PayPal Payments Pro Hosted Solution with Fraud filters triggered.">
+        <variation name="DenyPaymentWithSignifydGuaranteeDeclinedWithHostedProVariation1" summary="Deny order placed within PayPal Payments Pro Hosted Solution with Fraud filters triggered and Signifyd Guarantee Declined" ticketId="MAGETWO-65332">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>
+            <data name="customer/dataset" xsi:type="string">signifyd_decline_us_customer</data>
+            <data name="checkoutMethod" xsi:type="string">login</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="payment/method" xsi:type="string">hosted_pro</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">210.00</item>
+                <item name="grandTotalCurrency" xsi:type="string">GBP</item>
+            </data>
+            <data name="creditCardClass" xsi:type="string">credit_card_hostedpro</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_hosted_pro</data>
+            <data name="isVaultPresent" xsi:type="boolean">false</data>
+            <data name="configData" xsi:type="string">merchant_country_gb, hosted_pro, config_base_currency_gb, signifyd</data>
+            <data name="placeOrderStatus" xsi:type="string">Suspected Fraud</data>
+            <data name="status" xsi:type="string">Canceled</data>
+            <data name="signifydAddress/dataset" xsi:type="string">signifyd_us_shipping_address</data>
+            <data name="signifydAccount/dataset" xsi:type="string">sandbox_default</data>
+            <data name="signifydData/dataset" xsi:type="string">signifyd_guarantee_fraudulent</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test_single_flow, severity:S2</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertDenyPaymentMessageInCommentsHistory" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Signifyd\Test\Constraint\AssertSignifydGuaranteeCancelInCommentsHistory" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/OpenOrderGridStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/OpenOrderGridStep.php
new file mode 100644
index 0000000000000..409dffc8340b7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/OpenOrderGridStep.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect as AssertOrderStatus;
+use Magento\Signifyd\Test\Constraint\AssertSignifydCaseInOrdersGrid as AssertOrdersGrid;
+use Magento\Signifyd\Test\Constraint\AssertCaseInfoOnAdmin;
+use Magento\Signifyd\Test\Fixture\SignifydData;
+use Magento\Signifyd\Test\Page\Adminhtml\OrdersGrid;
+
+/**
+ * Open order grid step.
+ */
+class OpenOrderGridStep implements TestStepInterface
+{
+    /**
+     * Magento order status assertion.
+     *
+     * @var AssertOrderStatus
+     */
+    private $assertOrderStatus;
+
+    /**
+     * Case information on Magento Admin assertion.
+     *
+     * @var AssertCaseInfoOnAdmin
+     */
+    private $assertCaseInfo;
+
+    /**
+     * Case information on Magento order grid assertion.
+     *
+     * @var AssertOrdersGrid
+     */
+    private $assertOrdersGrid;
+
+    /**
+     * Magento order status.
+     *
+     * @var string
+     */
+    private $placeOrderStatus;
+
+    /**
+     * Magento order id.
+     *
+     * @var int
+     */
+    private $orderId;
+
+    /**
+     * Order View Page.
+     *
+     * @var SalesOrderView
+     */
+    private $salesOrderView;
+
+    /**
+     * Orders grid page.
+     *
+     * @var OrdersGrid
+     */
+    private $ordersGrid;
+
+    /**
+     * Signifyd data fixture.
+     *
+     * @var array
+     */
+    private $signifydData;
+
+    /**
+     * Orders Page.
+     *
+     * @var OrderIndex
+     */
+    private $orderIndex;
+
+    /**
+     * @param string $placeOrderStatus
+     * @param int $orderId
+     * @param OrderIndex $orderIndex
+     * @param SalesOrderView $salesOrderView
+     * @param OrdersGrid $ordersGrid
+     * @param AssertOrderStatus $assertOrderStatus
+     * @param AssertCaseInfoOnAdmin $assertCaseInfo
+     * @param AssertOrdersGrid $assertOrdersGrid
+     * @param SignifydData $signifydData
+     */
+    public function __construct(
+        $placeOrderStatus,
+        $orderId,
+        OrderIndex $orderIndex,
+        SalesOrderView $salesOrderView,
+        OrdersGrid $ordersGrid,
+        AssertOrderStatus $assertOrderStatus,
+        AssertCaseInfoOnAdmin $assertCaseInfo,
+        AssertOrdersGrid $assertOrdersGrid,
+        SignifydData $signifydData
+    ) {
+        $this->placeOrderStatus = $placeOrderStatus;
+        $this->orderId = $orderId;
+        $this->orderIndex = $orderIndex;
+        $this->salesOrderView = $salesOrderView;
+        $this->ordersGrid = $ordersGrid;
+        $this->assertOrderStatus = $assertOrderStatus;
+        $this->assertCaseInfo = $assertCaseInfo;
+        $this->assertOrdersGrid = $assertOrdersGrid;
+        $this->signifydData = $signifydData;
+    }
+
+    /**
+     * Open order.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->checkOrdersGrid();
+        $this->checkCaseInfo();
+        $this->checkOrderStatus();
+    }
+
+    /**
+     * Run assert to check Signifyd Case Disposition status in orders grid.
+     *
+     * @return void
+     */
+    private function checkOrdersGrid()
+    {
+        $this->assertOrdersGrid->processAssert(
+            $this->orderId,
+            $this->ordersGrid,
+            $this->signifydData
+        );
+    }
+
+    /**
+     * Run assert to check order status is valid.
+     *
+     * @return void
+     */
+    private function checkOrderStatus()
+    {
+        $this->assertOrderStatus->processAssert(
+            $this->placeOrderStatus,
+            $this->orderId,
+            $this->orderIndex,
+            $this->salesOrderView
+        );
+    }
+
+    /**
+     * Run assert to check Signifyd Case information is correct in Admin.
+     *
+     * @return void
+     */
+    private function checkCaseInfo()
+    {
+        $this->assertCaseInfo->processAssert(
+            $this->salesOrderView,
+            $this->orderIndex,
+            $this->signifydData,
+            $this->orderId
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCancelOrderStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCancelOrderStep.php
new file mode 100644
index 0000000000000..54f4dd75223e0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCancelOrderStep.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Sales\Test\TestStep\CancelOrderStep;
+use Magento\Sales\Test\TestStep\DenyPaymentStep;
+use Magento\Sales\Test\TestStep\UnholdOrderStep;
+
+/**
+ * Rollback step for Signifyd scenarios.
+ */
+class SignifydCancelOrderStep implements TestStepInterface
+{
+    /**
+     * Order index page.
+     *
+     * @var OrderIndex
+     */
+    private $orderIndex;
+
+    /**
+     * Order fixture.
+     *
+     * @var OrderInjectable
+     */
+    private $order;
+
+    /**
+     * Order View page.
+     *
+     * @var SalesOrderView
+     */
+    private $salesOrderView;
+
+    /**
+     * Test step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $testStepFactory;
+
+    /**
+     * @param OrderIndex $orderIndex
+     * @param OrderInjectable $order
+     * @param SalesOrderView $salesOrderView
+     * @param TestStepFactory $testStepFactory
+     */
+    public function __construct(
+        OrderIndex $orderIndex,
+        OrderInjectable $order,
+        SalesOrderView $salesOrderView,
+        TestStepFactory $testStepFactory
+    ) {
+        $this->orderIndex = $orderIndex;
+        $this->order = $order;
+        $this->salesOrderView = $salesOrderView;
+        $this->testStepFactory = $testStepFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->orderIndex->open();
+        $this->orderIndex->getSalesOrderGrid()
+            ->searchAndOpen(['id' => $this->order->getId()]);
+
+        switch ($this->salesOrderView->getOrderInfoBlock()->getOrderStatus()) {
+            case 'Suspected Fraud':
+                $this->getStepInstance(DenyPaymentStep::class)->run();
+                break;
+            case 'On Hold':
+                $this->getStepInstance(UnholdOrderStep::class)->run();
+                $this->getStepInstance(CancelOrderStep::class)->run();
+                break;
+            case 'Canceled':
+                break;
+            default:
+                $this->getStepInstance(CancelOrderStep::class)->run();
+        }
+    }
+
+    /**
+     * Creates test step instance with preset params.
+     *
+     * @param string $class
+     * @return TestStepInterface
+     */
+    private function getStepInstance($class)
+    {
+        return $this->testStepFactory->create(
+            $class,
+            ['order' => $this->order]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCreateCustomerStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCreateCustomerStep.php
new file mode 100644
index 0000000000000..5fec5988d2c9f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCreateCustomerStep.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Customer\Test\TestStep\CreateCustomerStep;
+use Magento\Customer\Test\TestStep\DeleteCustomerStep;
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Customized create customer step with remove cleanup.
+ */
+class SignifydCreateCustomerStep implements TestStepInterface
+{
+    /**
+     * Customer fixture.
+     *
+     * @var Customer
+     */
+    private $customer;
+
+    /**
+     * Test step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $testStepFactory;
+
+    /**
+     * @param Customer $customer
+     * @param TestStepFactory $testStepFactory
+     */
+    public function __construct(
+        Customer $customer,
+        TestStepFactory $testStepFactory
+    ) {
+        $this->customer = $customer;
+        $this->testStepFactory = $testStepFactory;
+    }
+
+    /**
+     * Run step flow.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->getStepInstance(CreateCustomerStep::class)->run();
+    }
+
+    /**
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->getStepInstance(CreateCustomerStep::class)->cleanup();
+        $this->getStepInstance(DeleteCustomerStep::class)->run();
+    }
+
+    /**
+     * Creates test step instance with preset params.
+     *
+     * @param string $class
+     * @return TestStepInterface
+     */
+    private function getStepInstance($class)
+    {
+        return $this->testStepFactory->create(
+            $class,
+            ['customer' => $this->customer]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydFillShippingAddressStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydFillShippingAddressStep.php
new file mode 100644
index 0000000000000..0b1dda1d0a46a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydFillShippingAddressStep.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Checkout\Test\TestStep\FillShippingAddressStep;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\ObjectManager;
+use Magento\Signifyd\Test\Fixture\SignifydAddress;
+
+/**
+ * Class SignifydFillShippingAddressStep only overrides type of $shippingAddress.
+ *
+ * We cannot configure Checkout_FillShippingAddressStep this via di.xml,
+ * because 'source' handler Firstname, specified in SignifydAddress
+ * fixture did not apply when the step was called from testcase.xml scenario.
+ *
+ * Note. When fixture was called directly in the class constructor,
+ * source handlers applied correctly.
+ */
+class SignifydFillShippingAddressStep extends FillShippingAddressStep
+{
+    /**
+     * @var SignifydAddress|null
+     */
+    private $signifydAddress;
+
+    /**
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param Customer $customer
+     * @param ObjectManager $objectManager
+     * @param FixtureFactory $fixtureFactory
+     * @param SignifydAddress|null $signifydAddress
+     * @param null $shippingAddressCustomer
+     */
+    public function __construct(
+        CheckoutOnepage $checkoutOnepage,
+        Customer $customer,
+        ObjectManager $objectManager,
+        FixtureFactory $fixtureFactory,
+        SignifydAddress $signifydAddress = null,
+        $shippingAddressCustomer = null
+    ) {
+        parent::__construct(
+            $checkoutOnepage,
+            $customer,
+            $objectManager,
+            $fixtureFactory,
+            $signifydAddress,
+            $shippingAddressCustomer
+        );
+        $this->signifydAddress = $signifydAddress;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        parent::run();
+
+        return [
+            'signifydAddress' => $this->signifydAddress,
+        ];
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydLoginStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydLoginStep.php
new file mode 100644
index 0000000000000..3dd1b94d6b505
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydLoginStep.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Signifyd\Test\Fixture\SignifydAccount;
+use Magento\Signifyd\Test\Page\SignifydConsole\SignifydCases;
+use Magento\Signifyd\Test\Page\SignifydConsole\SignifydLogin;
+
+/**
+ * Login into Signifyd console step.
+ */
+class SignifydLoginStep implements TestStepInterface
+{
+    /**
+     * Signifyd account fixture.
+     *
+     * @var SignifydAccount
+     */
+    private $signifydAccount;
+
+    /**
+     * Signifyd login page.
+     *
+     * @var SignifydLogin
+     */
+    private $signifydLogin;
+
+    /**
+     * Signifyd cases page.
+     *
+     * @var SignifydCases
+     */
+    private $signifydCases;
+
+    /**
+     * @param SignifydAccount $signifydAccount
+     * @param SignifydLogin $signifydLogin
+     * @param SignifydCases $signifydCases
+     */
+    public function __construct(
+        SignifydAccount $signifydAccount,
+        SignifydLogin $signifydLogin,
+        SignifydCases $signifydCases
+    ) {
+        $this->signifydAccount = $signifydAccount;
+        $this->signifydLogin = $signifydLogin;
+        $this->signifydCases = $signifydCases;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->signifydLogin->open();
+
+        if ($this->signifydLogin->getLoginBlock()->isVisible()) {
+            $this->signifydLogin->getLoginBlock()->fill($this->signifydAccount);
+            $this->signifydLogin->getLoginBlock()->login();
+        }
+
+        $this->signifydCases->getCaseSearchBlock()->waitForLoading();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php
new file mode 100644
index 0000000000000..c00c81fa237e0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Signifyd\Test\Constraint\AssertCaseInfoOnSignifydConsole;
+use Magento\Signifyd\Test\Fixture\SignifydAddress;
+use Magento\Signifyd\Test\Fixture\SignifydData;
+use Magento\Signifyd\Test\Page\SignifydConsole\SignifydCases;
+use Magento\Signifyd\Test\Page\SignifydConsole\SignifydNotifications;
+
+/**
+ * Observe case information in Signifyd console step.
+ */
+class SignifydObserveCaseStep implements TestStepInterface
+{
+    /**
+     * Case information on Signifyd console assertion.
+     *
+     * @var AssertCaseInfoOnSignifydConsole
+     */
+    private $assertCaseInfo;
+
+    /**
+     * Billing address fixture.
+     *
+     * @var SignifydAddress
+     */
+    private $signifydAddress;
+
+    /**
+     * Signifyd cases page.
+     *
+     * @var SignifydCases
+     */
+    private $signifydCases;
+
+    /**
+     * Signifyd notifications page.
+     *
+     * @var SignifydNotifications
+     */
+    private $signifydNotifications;
+
+    /**
+     * Signifyd data fixture.
+     *
+     * @var array
+     */
+    private $signifydData;
+
+    /**
+     * Prices list.
+     *
+     * @var array
+     */
+    private $prices;
+
+    /**
+     * Order fixture.
+     *
+     * @var string
+     */
+    private $order;
+
+    /**
+     * Test step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $testStepFactory;
+
+    /**
+     * @var int
+     */
+    private $searchAttempts = 10;
+
+    /**
+     * @param AssertCaseInfoOnSignifydConsole $assertCaseInfoOnSignifydConsole
+     * @param SignifydAddress $signifydAddress
+     * @param SignifydCases $signifydCases
+     * @param SignifydNotifications $signifydNotifications
+     * @param SignifydData $signifydData
+     * @param OrderInjectable $order
+     * @param TestStepFactory $testStepFactory
+     * @param array $prices
+     */
+    public function __construct(
+        AssertCaseInfoOnSignifydConsole $assertCaseInfoOnSignifydConsole,
+        SignifydAddress $signifydAddress,
+        SignifydCases $signifydCases,
+        SignifydNotifications $signifydNotifications,
+        SignifydData $signifydData,
+        OrderInjectable $order,
+        TestStepFactory $testStepFactory,
+        array $prices
+    ) {
+        $this->assertCaseInfo = $assertCaseInfoOnSignifydConsole;
+        $this->signifydAddress = $signifydAddress;
+        $this->signifydCases = $signifydCases;
+        $this->signifydNotifications = $signifydNotifications;
+        $this->signifydData = $signifydData;
+        $this->order = $order;
+        $this->testStepFactory = $testStepFactory;
+        $this->prices = $prices;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->signifydCases->open();
+        // Search case few times because it can appear with delay.
+        for ($attempts = $this->searchAttempts; $attempts > 0; $attempts--) {
+            $this->signifydCases->getCaseSearchBlock()
+                ->searchCaseByCustomerName($this->signifydAddress->getFirstname());
+            if ($this->signifydCases->getCaseSearchBlock()->isAnyCaseVisible()) {
+                break;
+            }
+            sleep(3);
+        }
+
+        $this->signifydCases->getCaseSearchBlock()->selectCase();
+        $this->signifydCases->getCaseInfoBlock()->flagCase($this->signifydData->getCaseFlag());
+
+        $this->assertCaseInfo->processAssert(
+            $this->signifydCases,
+            $this->signifydAddress,
+            $this->signifydData,
+            $this->prices,
+            $this->order->getId(),
+            $this->getCustomerFullName($this->signifydAddress)
+        );
+    }
+
+    /**
+     * Cancel order if test fails, or in the end of variation.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->testStepFactory->create(
+            SignifydCancelOrderStep::class,
+            ['order' => $this->order]
+        )->run();
+    }
+
+    /**
+     * Gets customer full name.
+     *
+     * @param SignifydAddress $billingAddress
+     * @return string
+     */
+    private function getCustomerFullName(SignifydAddress $billingAddress)
+    {
+        return sprintf('%s %s', $billingAddress->getFirstname(), $billingAddress->getLastname());
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydSetWebhookHandlersStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydSetWebhookHandlersStep.php
new file mode 100644
index 0000000000000..2b630b8c1dac8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydSetWebhookHandlersStep.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Signifyd\Test\Fixture\SignifydData;
+use Magento\Signifyd\Test\Page\SignifydConsole\SignifydNotifications;
+
+/**
+ * Set webhook handlers in Signifyd console step.
+ */
+class SignifydSetWebhookHandlersStep implements TestStepInterface
+{
+    /**
+     * Signifyd Notifications page.
+     *
+     * @var SignifydNotifications
+     */
+    private $signifydNotifications;
+
+    /**
+     * Signifyd data fixture.
+     *
+     * @var array
+     */
+    private $signifydData;
+
+    /**
+     * @param SignifydNotifications $signifydNotifications
+     * @param SignifydData $signifydData
+     */
+    public function __construct(
+        SignifydNotifications $signifydNotifications,
+        SignifydData $signifydData
+    ) {
+        $this->signifydNotifications = $signifydNotifications;
+        $this->signifydData = $signifydData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->signifydNotifications->open();
+        $this->signifydNotifications->getWebhooksBlock()
+            ->create($this->signifydData->getTeam());
+    }
+
+    /**
+     * Removes webhooks if test fails, or in the end of variation execution.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->signifydNotifications->open();
+        $this->signifydNotifications->getWebhooksBlock()
+            ->cleanup($this->signifydData->getTeam());
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/UnholdAndCancelOrderStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/UnholdAndCancelOrderStep.php
new file mode 100644
index 0000000000000..0c90b1b76937b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/UnholdAndCancelOrderStep.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Sales\Test\TestStep\CancelOrderStep;
+use Magento\Sales\Test\TestStep\UnholdOrderStep;
+
+/**
+ * Unhold and cancel order.
+ */
+class UnholdAndCancelOrderStep implements TestStepInterface
+{
+    /**
+     * Magento order status.
+     *
+     * @var string
+     */
+    private $placeOrderStatus;
+
+    /**
+     * Order fixture.
+     *
+     * @var OrderInjectable
+     */
+    private $order;
+
+    /**
+     * Test step factory.
+     *
+     * @var TestStepFactory
+     */
+    private $testStepFactory;
+
+    /**
+     * @param string $placeOrderStatus
+     * @param OrderInjectable $order
+     * @param TestStepFactory $testStepFactory
+     */
+    public function __construct(
+        $placeOrderStatus,
+        OrderInjectable $order,
+        TestStepFactory $testStepFactory
+    ) {
+        $this->placeOrderStatus = $placeOrderStatus;
+        $this->order = $order;
+        $this->testStepFactory = $testStepFactory;
+    }
+
+    /**
+     * Cancel order step.
+     *
+     * If order was held - unhold and then cancel the order.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        if ($this->placeOrderStatus === 'On Hold') {
+            $this->getStepInstance(UnholdOrderStep::class)->run();
+        }
+
+        $this->getStepInstance(CancelOrderStep::class)->run();
+    }
+
+    /**
+     * Creates test step instance with preset params.
+     *
+     * @param string $class
+     * @return TestStepInterface
+     */
+    private function getStepInstance($class)
+    {
+        return $this->testStepFactory->create(
+            $class,
+            ['order' => $this->order]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/di.xml
new file mode 100644
index 0000000000000..2ba4b6c97d33f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/di.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * 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\Signifyd\Test\Constraint\AssertCaseInfoOnAdmin">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Signifyd\Test\Constraint\AssertCaseInfoOnSignifydConsole">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInCommentsHistory">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Signifyd\Test\Constraint\AssertSignifydCaseInOrdersGrid">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Signifyd\Test\Constraint\AssertSignifydGuaranteeCancelInCommentsHistory">
+        <arguments>
+            <argument name="severity" xsi:type="string">S2</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/testcase.xml
new file mode 100644
index 0000000000000..cfbd2e6ace2b4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/testcase.xml
@@ -0,0 +1,58 @@
+<?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="../../../../../../vendor/magento/mtf/Magento/Mtf/TestCase/etc/testcase.xsd">
+    <scenario name="CreateSignifydGuaranteeAndCancelOrderTest" firstStep="signifydLogin">
+        <step name="signifydLogin" module="Magento_Signifyd" next="signifydSetWebhookHandlers" />
+        <step name="signifydSetWebhookHandlers" module="Magento_Signifyd" next="setupConfiguration" />
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckoutFromMiniShoppingCart" />
+        <step name="proceedToCheckoutFromMiniShoppingCart" module="Magento_Checkout" next="signifydCreateCustomer" />
+        <step name="signifydCreateCustomer" module="Magento_Signifyd" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="signifydFillShippingAddress" />
+        <step name="signifydFillShippingAddress" module="Magento_Signifyd" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
+        <step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder" />
+        <step name="placeOrder" module="Magento_Checkout" next="signifydObserveCase" />
+        <step name="signifydObserveCase" module="Magento_Signifyd" next="openOrderGrid" />
+        <step name="openOrderGrid" module="Magento_Signifyd" next="unholdAndCancelOrder" />
+        <step name="unholdAndCancelOrder" module="Magento_Signifyd" />
+    </scenario>
+    <scenario name="AcceptPaymentWithSignifydGuaranteeDeclinedTest" firstStep="signifydLogin">
+        <step name="signifydLogin" module="Magento_Signifyd" next="signifydSetWebhookHandlers" />
+        <step name="signifydSetWebhookHandlers" module="Magento_Signifyd" next="setupConfiguration" />
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckoutFromMiniShoppingCart" />
+        <step name="proceedToCheckoutFromMiniShoppingCart" module="Magento_Checkout" next="signifydCreateCustomer" />
+        <step name="signifydCreateCustomer" module="Magento_Signifyd" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="signifydFillShippingAddress" />
+        <step name="signifydFillShippingAddress" module="Magento_Signifyd" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="placeOrderWithHostedPro" />
+        <step name="placeOrderWithHostedPro" module="Magento_Paypal" next="signifydObserveCase" />
+        <step name="signifydObserveCase" module="Magento_Signifyd" next="openOrderGrid" />
+        <step name="openOrderGrid" module="Magento_Signifyd" next="acceptPayment" />
+        <step name="acceptPayment" module="Magento_Sales" />
+    </scenario>
+    <scenario name="DenyPaymentWithSignifydGuaranteeDeclinedTest" firstStep="signifydLogin">
+        <step name="signifydLogin" module="Magento_Signifyd" next="signifydSetWebhookHandlers" />
+        <step name="signifydSetWebhookHandlers" module="Magento_Signifyd" next="setupConfiguration" />
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckoutFromMiniShoppingCart" />
+        <step name="proceedToCheckoutFromMiniShoppingCart" module="Magento_Checkout" next="signifydCreateCustomer" />
+        <step name="signifydCreateCustomer" module="Magento_Signifyd" next="selectCheckoutMethod" />
+        <step name="selectCheckoutMethod" module="Magento_Checkout" next="signifydFillShippingAddress" />
+        <step name="signifydFillShippingAddress" module="Magento_Signifyd" next="fillShippingMethod" />
+        <step name="fillShippingMethod" module="Magento_Checkout" next="placeOrderWithHostedPro" />
+        <step name="placeOrderWithHostedPro" module="Magento_Paypal" next="signifydObserveCase" />
+        <step name="signifydObserveCase" module="Magento_Signifyd" next="openOrderGrid" />
+        <step name="openOrderGrid" module="Magento_Signifyd" next="denyPayment" />
+        <step name="denyPayment" module="Magento_Sales" />
+    </scenario>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
index 0ed565f50ee81..99dab9ae79c6b 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
@@ -52,7 +52,7 @@ public function processAssert(
             $_ENV['app_frontend_url'] . $cmsPage->getIdentifier(),
         ];
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->checkContent($content, $urls),
             'Content of file sitemap.xml does not include one or more of next urls:'
             . implode("\n", $urls)
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
index 50da663141e17..334d359530761 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
@@ -27,7 +27,7 @@ class AssertSitemapFailFolderSaveMessage extends AbstractConstraint
     public function processAssert(SitemapIndex $sitemapPage, Sitemap $sitemap)
     {
         $actualMessage = $sitemapPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::FAIL_FOLDER_MESSAGE, $sitemap->getSitemapPath()),
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
index d5061eed03f0e..f73a2d6d7b25f 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
@@ -27,7 +27,7 @@ class AssertSitemapFailPathSaveMessage extends AbstractConstraint
     public function processAssert(SitemapIndex $sitemapPage, Sitemap $sitemap)
     {
         $actualMessage = $sitemapPage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::FAIL_PATH_MESSAGE, $sitemap->getSitemapFilename()),
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
index db89b1e662183..d8a4cb0dc641f 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
@@ -29,7 +29,7 @@ public function processAssert(Sitemap $sitemap, SitemapIndex $sitemapIndex)
             'sitemap_filename' => $sitemap->getSitemapFilename(),
             'sitemap_path' => $sitemap->getSitemapPath(),
         ];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $sitemapIndex->getSitemapGrid()->isRowVisible($filter),
             'Sitemap with filename \'' . $sitemap->getSitemapFilename() . '\' and path \''
             . $sitemap->getSitemapPath() . '\' is absent in Sitemap grid. \''
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
index 9acca062c8ba7..480b0163106d6 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
@@ -30,7 +30,7 @@ public function processAssert(Sitemap $sitemap, SitemapIndex $sitemapPageGrid)
             'sitemap_path' => $sitemap->getSitemapPath(),
             'sitemap_id' => $sitemap->getSitemapId(),
         ];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $sitemapPageGrid->getSitemapGrid()->isRowVisible($filter),
             'Sitemap with filename \'' . $sitemap->getSitemapFilename() . '\' and id \''
             . $sitemap->getSitemapId() . '\' and path \''
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSubmissionToRobotsTxt.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSubmissionToRobotsTxt.php
index 20f8f346747c0..f5de4808a540f 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSubmissionToRobotsTxt.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSubmissionToRobotsTxt.php
@@ -35,14 +35,14 @@ class AssertSitemapSubmissionToRobotsTxt extends AbstractConstraint
     public function processAssert(BrowserInterface $browser)
     {
         $browser->open($_ENV['app_frontend_url'] . $this->filename);
-        \PHPUnit_Framework_Assert::assertNotEquals(
+        \PHPUnit\Framework\Assert::assertNotEquals(
             self::HTTP_NOT_FOUND,
             $browser->getTitle(),
             'File ' . $this->filename . ' is not readable or not exists.'
         );
 
         $expectedRobotsContent = 'Sitemap: ' .  $_ENV['app_frontend_url'] . 'sitemap.xml';
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             strpos($browser->getHtmlSource(), $expectedRobotsContent) !== false,
             'File ' . $this->filename . ' contains incorrect data.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
index 7c5f6a502ff12..6585d5498a960 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertSitemapSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(SitemapIndex $sitemapPage)
     {
         $actualMessage = $sitemapPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
index 436ce0523f675..51de86ed35edf 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
@@ -33,7 +33,7 @@ public function processAssert(
         Sitemap $sitemap
     ) {
         $actualMessage = $sitemapPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename()),
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
index ac7cc5334f461..4c33aacbc97bc 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
@@ -29,7 +29,7 @@ class AssertSitemapSuccessSaveAndGenerateMessages extends AbstractConstraint
     public function processAssert(SitemapIndex $sitemapIndex, Sitemap $sitemap)
     {
         $actualMessages = $sitemapIndex->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(self::SUCCESS_SAVE_MESSAGE, $actualMessages) &&
             in_array(sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename()), $actualMessages),
             'Wrong success messages is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
index a76728cffce13..2e8d1d69b0ca7 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertSitemapSuccessSaveMessage extends AbstractConstraint
     public function processAssert(SitemapIndex $sitemapPage)
     {
         $actualMessage = $sitemapPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
index 301cfdf7664e0..da844aab136ac 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
@@ -27,7 +27,7 @@ public function processAssert(Store $store, SystemConfig $systemConfig)
     {
         $systemConfig->open();
         $isStoreVisible = $systemConfig->getPageActions()->isStoreVisible($store);
-        \PHPUnit_Framework_Assert::assertTrue($isStoreVisible, "Store view is not visible in dropdown on config page");
+        \PHPUnit\Framework\Assert::assertTrue($isStoreVisible, "Store view is not visible in dropdown on config page");
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreCodeInUrl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreCodeInUrl.php
index 8874ff9e7356d..b008227e94c2d 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreCodeInUrl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreCodeInUrl.php
@@ -27,7 +27,7 @@ public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, $st
     {
         $cmsIndex->open();
         $cmsIndex->getLogoBlock()->clickOnLogo();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $_ENV['app_frontend_url'] . $storeCode . '/',
             $browser->getUrl(),
             sprintf('Store code \'%s\' is not present in the url: %s', $storeCode, $browser->getUrl())
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreDisabledErrorSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreDisabledErrorSaveMessage.php
index f6f26a84adcec..acd0f83f2681b 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreDisabledErrorSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreDisabledErrorSaveMessage.php
@@ -27,7 +27,7 @@ class AssertStoreDisabledErrorSaveMessage extends AbstractConstraint
      */
     public function processAssert(EditStore $editStore)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $editStore->getMessagesBlock()->getErrorMessage(),
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
index ffe02e18f614f..528712e86018c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
@@ -34,7 +34,7 @@ public function processAssert(
         $formData = $storeNew->getStoreForm()->getData();
         $fixtureData = $store->getData();
         $errors = $this->verifyData($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
index 0df64751a2b38..8fb0fe0b02352 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
@@ -36,7 +36,7 @@ public function processAssert(Store $store, CmsIndex $cmsIndex)
             ? true // if only one store view is assigned to store group
             : $cmsIndex->getStoreSwitcherBlock()->isStoreViewVisible($store);
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isStoreViewVisible,
             "Store view is not visible in dropdown on CmsIndex page"
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
index 012900bc94fc7..c1e7801b19604 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
@@ -45,7 +45,7 @@ public function processAssert(
         $storeIndex->open()->getStoreGrid()->searchAndOpenStoreGroup($storeGroup);
         $formData = $editGroup->getEditFormGroup()->getData();
         $errors = $this->verifyData($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
index d92fde0015f9b..2ef63536a5f41 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(StoreIndex $storeIndex, StoreGroup $storeGroup)
     {
         $storeGroupName = $storeGroup->getName();
         $storeIndex->open()->getStoreGrid()->search(['group_title' => $storeGroupName]);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $storeIndex->getStoreGrid()->isStoreExists($storeGroupName),
             'Store group \'' . $storeGroupName . '\' is not present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNoDeleteButton.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNoDeleteButton.php
index b7814edf80984..76207206d201e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNoDeleteButton.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNoDeleteButton.php
@@ -22,7 +22,7 @@ class AssertStoreGroupNoDeleteButton extends AbstractConstraint
      */
     public function processAssert(NewGroupIndex $newGroupIndex)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $newGroupIndex->getFormPageActions()->checkDeleteButton(),
             '\'Delete\' button on StoreGroup view edit page is present when it should not.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
index e0eb8ec1d5569..b929f118e05f4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(StoreIndex $storeIndex, StoreGroup $storeGroup)
     {
         $storeGroupName = $storeGroup->getName();
         $storeIndex->open()->getStoreGrid()->search(['group_title' => $storeGroupName]);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $storeIndex->getStoreGrid()->isStoreExists($storeGroupName),
             'Store group \'' . $storeGroupName . '\' is present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
index e208231edfa3c..ddd0a4f063475 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
@@ -29,7 +29,7 @@ public function processAssert(StoreIndex $storeIndex, StoreNew $storeNew, StoreG
     {
         $storeGroupName = $storeGroup->getName();
         $storeIndex->open()->getGridPageActions()->addStoreView();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $storeNew->getStoreForm()->isStoreVisible($storeGroupName),
             'Store Group \'' . $storeGroupName . '\' is not present on StoreView Form in Store dropdown.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
index be680045524dd..82f24259b8f30 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
@@ -34,7 +34,7 @@ class AssertStoreGroupSuccessDeleteAndBackupMessages extends AbstractConstraint
     public function processAssert(StoreIndex $storeIndex)
     {
         $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(self::SUCCESS_BACKUP_MESSAGE, $actualMessages) &&
             in_array(self::SUCCESS_DELETE_MESSAGE, $actualMessages),
             'Wrong success messages are displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
index 673a3e7a4c250..65da69de2b705 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
@@ -28,7 +28,7 @@ class AssertStoreGroupSuccessDeleteMessage extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $storeIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
index 398f83ca30443..905cabc4f32e0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
@@ -28,7 +28,7 @@ class AssertStoreGroupSuccessSaveMessage extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $storeIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
index 1b60d327f4e2c..ce24a43ebcf54 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(StoreIndex $storeIndex, Store $store)
     {
         $storeName = $store->getName();
         $storeIndex->open()->getStoreGrid()->search(['store_title' => $storeName]);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $storeIndex->getStoreGrid()->isStoreExists($storeName),
             'Store \'' . $storeName . '\' is not present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNoDeleteButton.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNoDeleteButton.php
index 4ba69ee2b3f97..4f2c7c6106ab5 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNoDeleteButton.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNoDeleteButton.php
@@ -22,7 +22,7 @@ class AssertStoreNoDeleteButton extends AbstractConstraint
      */
     public function processAssert(StoreNew $storePage)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $storePage->getFormPageActions()->checkDeleteButton(),
             '\'Delete\' button on Store view edit page is present when it should not.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
index ded16bf16c47a..466f6f68a865c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(StoreIndex $storeIndex, Store $store)
     {
         $storeName = $store->getName();
         $storeIndex->open()->getStoreGrid()->search(['store_title' => $storeName]);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $storeIndex->getStoreGrid()->isStoreExists($storeName),
             'Store \'' . $storeName . '\' is present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
index 7758006d2dcc9..793044e75d7ca 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
@@ -36,7 +36,7 @@ public function processAssert(Store $store, CmsIndex $cmsIndex)
             ? false // if only one store view is assigned to store group
             : $cmsIndex->getStoreSwitcherBlock()->isStoreViewVisible($store);
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $isStoreViewVisible,
             "Store view is visible in dropdown on CmsIndex page"
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
index c020d8ced56ca..903a555cae867 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
@@ -34,7 +34,7 @@ class AssertStoreSuccessDeleteAndBackupMessages extends AbstractConstraint
     public function processAssert(StoreIndex $storeIndex)
     {
         $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(self::SUCCESS_BACKUP_MESSAGE, $actualMessages) &&
             in_array(self::SUCCESS_DELETE_MESSAGE, $actualMessages),
             'Wrong success messages are displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
index 645a67dcc138c..29381e2504c8b 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
@@ -28,7 +28,7 @@ class AssertStoreSuccessDeleteMessage extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $storeIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
index 303ac8b72c50e..4376f0bb56cfd 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
@@ -28,7 +28,7 @@ class AssertStoreSuccessSaveMessage extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $storeIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
index 154cda6c999bc..2fd3cb265c1e1 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
@@ -41,7 +41,7 @@ public function processAssert(
         $storeIndex->open()->getStoreGrid()->searchAndOpenWebsite($website);
         $formData = $editWebsite->getEditFormWebsite()->getData();
         $errors = $this->verifyData($fixtureData, $formData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
index d4031c75ed21d..f68971b3699f2 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(StoreIndex $storeIndex, Website $website)
     {
         $websiteName = $website->getName();
         $storeIndex->open()->getStoreGrid()->search(['website_title' => $websiteName]);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $storeIndex->getStoreGrid()->isWebsiteExists($website),
             'Website \'' . $websiteName . '\' is not present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
index 7d739f6351aae..0e0398c126faf 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(StoreIndex $storeIndex, Website $website)
     {
         $websiteName = $website->getName();
         $storeIndex->open()->getStoreGrid()->search(['website_title' => $websiteName]);
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $storeIndex->getStoreGrid()->isWebsiteExists($website),
             'Website \'' . $websiteName . '\' is present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
index 4b467afff3b70..97ead5114461e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
@@ -33,7 +33,7 @@ public function processAssert(StoreIndex $storeIndex, NewGroupIndex $newGroupInd
     {
         $websiteName = $website->getName();
         $storeIndex->open()->getGridPageActions()->createStoreGroup();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $newGroupIndex->getEditFormGroup()->isWebsiteVisible($websiteName),
             'Website \'' . $websiteName . '\' is not present on Store Group Form in Website dropdown.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
index e89fd4facc1eb..de6230ae8448c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
@@ -34,7 +34,7 @@ class AssertWebsiteSuccessDeleteAndBackupMessages extends AbstractConstraint
     public function processAssert(StoreIndex $storeIndex)
     {
         $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessages();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array(self::SUCCESS_BACKUP_MESSAGE, $actualMessages) &&
             in_array(self::SUCCESS_DELETE_MESSAGE, $actualMessages),
             'Wrong success messages are displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
index a7d218ebe67fb..8ca5b8b1c4181 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
@@ -28,7 +28,7 @@ class AssertWebsiteSuccessDeleteMessage extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $storeIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
index ceb50cf87c8b5..7e7fe6285ef4b 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
@@ -28,7 +28,7 @@ class AssertWebsiteSuccessSaveMessage extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $storeIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
index 10ebd2b6d5f66..0c1017410961f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
@@ -65,7 +65,7 @@ protected function getStoreGroupIdByGroupName($storeName)
             throw new \Exception('Cannot find store group id');
         }
 
-        return intval($matches[1]);
+        return (int)$matches[1];
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
index ab0b1f2096808..0b738c5e159cd 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
@@ -119,7 +119,7 @@ protected function getWebSiteIdByWebsiteName($websiteName)
             throw new \Exception('Cannot find website id.');
         }
 
-        return intval($matches[1]);
+        return (int)$matches[1];
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
index e867ebe399784..c1fe9ca45972d 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
@@ -12,6 +12,7 @@
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 
 /**
  * Test Creation for DeleteStoreEntity
@@ -100,7 +101,15 @@ public function test(Store $store, $createBackup)
     {
         // Preconditions:
         $store->persist();
-        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()
+            ->getBackupGrid()
+            ->massaction([], 'Delete', true, 'Select All');
 
         // Steps:
         $this->storeIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
index cd37576443cdb..c332b83a22deb 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
@@ -12,6 +12,7 @@
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 
 /**
  * Delete StoreGroup (Store Management)
@@ -101,7 +102,15 @@ public function test(StoreGroup $storeGroup, $createBackup)
     {
         //Preconditions
         $storeGroup->persist();
-        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()
+            ->getBackupGrid()
+            ->massaction([], 'Delete', true, 'Select All');
 
         //Steps
         $this->storeIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
index 02fcf3b19fbde..66ae1d8179af5 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Store\Test\TestCase\DeleteStoreGroupEntityTest" summary="Delete Store Group" ticketId="MAGETWO-27596">
         <variation name="DeleteStoreGroupEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S3, stable:no</data>
+            <data name="tag" xsi:type="string">severity:S3</data>
             <data name="storeGroup/dataset" xsi:type="string">custom</data>
             <data name="createBackup" xsi:type="string">Yes</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteAndBackupMessages" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
index 2431cb3e065d2..22259a30b1538 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
@@ -12,6 +12,7 @@
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\Website;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 
 /**
  * Delete Website (Store Management)
@@ -102,7 +103,15 @@ public function test(Website $website, $createBackup)
     {
         //Preconditions
         $website->persist();
-        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()
+            ->getBackupGrid()
+            ->massaction([], 'Delete', true, 'Select All');
 
         //Steps
         $this->storeIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
new file mode 100644
index 0000000000000..03486f337d74f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
+use Magento\Backend\Test\Page\Adminhtml\DeleteWebsite;
+use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
+use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
+use Magento\Store\Test\Fixture\Store;
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestStep\TestStepFactory;
+
+/**
+ * Test Step for DeleteWebsitesEntity.
+ */
+class DeleteWebsitesEntityStep implements TestStepInterface
+{
+    /* tags */
+    const MVP = 'yes';
+    const SEVERITY = 'S2';
+    /* end tags */
+
+    /**
+     * @var BackupIndex
+     */
+    private $backupIndex;
+
+    /**
+     * @var StoreIndex
+     */
+    private $storeIndex;
+
+    /**
+     * @var EditWebsite
+     */
+    private $editWebsite;
+
+    /**
+     * @var DeleteWebsite
+     */
+    private $deleteWebsite;
+
+    /**
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * @var FixtureInterface
+     */
+    private $item;
+
+    /**
+     * @var string
+     */
+    private $createBackup;
+
+    /**
+     * @var TestStepFactory
+     */
+    private $stepFactory;
+
+    /**
+     * Prepare pages for test.
+     *
+     * @param BackupIndex $backupIndex
+     * @param StoreIndex $storeIndex
+     * @param EditWebsite $editWebsite
+     * @param DeleteWebsite $deleteWebsite
+     * @param FixtureFactory $fixtureFactory
+     * @param FixtureInterface $item
+     * @param TestStepFactory $testStepFactory
+     * @param string $createBackup
+     */
+    public function __construct(
+        BackupIndex $backupIndex,
+        StoreIndex $storeIndex,
+        EditWebsite $editWebsite,
+        DeleteWebsite $deleteWebsite,
+        FixtureFactory $fixtureFactory,
+        FixtureInterface $item,
+        TestStepFactory $testStepFactory,
+        $createBackup = 'No'
+    ) {
+        $this->storeIndex = $storeIndex;
+        $this->editWebsite = $editWebsite;
+        $this->backupIndex = $backupIndex;
+        $this->deleteWebsite = $deleteWebsite;
+        $this->item = $item;
+        $this->createBackup = $createBackup;
+        $this->fixtureFactory = $fixtureFactory;
+        $this->stepFactory = $testStepFactory;
+    }
+
+    /**
+     * Delete specific Store View.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->stepFactory->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        $this->storeIndex->open();
+        $websiteNames = $this->item->getWebsiteIds();
+        if (is_array($websiteNames) && count($websiteNames) > 0) {
+            $websiteName = end($websiteNames);
+            $this->storeIndex->getStoreGrid()->searchAndOpenWebsiteByName($websiteName);
+            $this->editWebsite->getFormPageActions()->delete();
+            $this->deleteWebsite->getDeleteWebsiteForm()->fillForm(['create_backup' => $this->createBackup]);
+            $this->deleteWebsite->getFormPageActions()->delete();
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertApiInfoTitleOnPage.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertApiInfoTitleOnPage.php
index 7fb2bb65dac5a..0d30baf417735 100644
--- a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertApiInfoTitleOnPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertApiInfoTitleOnPage.php
@@ -19,7 +19,7 @@ class AssertApiInfoTitleOnPage extends AbstractConstraint
      *
      * @var string
      */
-    protected $titleSelector = '.info_title';
+    protected $titleSelector = '.title';
 
     /**
      * Assert API info title on swagger page
@@ -29,7 +29,7 @@ class AssertApiInfoTitleOnPage extends AbstractConstraint
      */
     public function processAssert(SwaggerUiPage $swaggerPage)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $swaggerPage->isElementVisible($this->titleSelector),
             'REST API info title on swagger page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertEndpointContentDisplay.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertEndpointContentDisplay.php
index ff05075585d72..c8c495fe619f8 100644
--- a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertEndpointContentDisplay.php
+++ b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertEndpointContentDisplay.php
@@ -28,10 +28,10 @@ public function processAssert(SwaggerUiPage $swaggerPage, $serviceName, array $e
             /**
              * Selector for operation content
              */
-            $operationContentSelector = 'div[id$="%s%s_content"]';
+            $operationContentSelector = '#operations-%s-%s%s  .opblock-body';
 
-            $operationContentSelector = sprintf($operationContentSelector, $serviceName, $endpoint);
-            \PHPUnit_Framework_Assert::assertTrue(
+            $operationContentSelector = sprintf($operationContentSelector, $serviceName, $serviceName, $endpoint);
+            \PHPUnit\Framework\Assert::assertTrue(
                 $swaggerPage->isElementVisible($operationContentSelector),
                 'REST API endpoint operation content on swagger page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertServiceContentDisplay.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertServiceContentDisplay.php
index 3220753d48b33..36e76dd48b6fa 100644
--- a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertServiceContentDisplay.php
+++ b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertServiceContentDisplay.php
@@ -28,9 +28,9 @@ public function processAssert(SwaggerUiPage $swaggerPage, $serviceName, array $e
             /**
              * Selector for operation
              */
-            $operationSelector = 'li[id$="%s%s"]';
-            $operationSelector = sprintf($operationSelector, $serviceName, $endpoint);
-            \PHPUnit_Framework_Assert::assertTrue(
+            $operationSelector = '#operations-%s-%s%s';
+            $operationSelector = sprintf($operationSelector, $serviceName, $serviceName, $endpoint);
+            \PHPUnit\Framework\Assert::assertTrue(
                 $swaggerPage->isElementVisible($operationSelector),
                 'REST API service endpoints on swagger page.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertSwaggerSectionLoadOnPage.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertSwaggerSectionLoadOnPage.php
index 3b6a8db75c0ff..af7425bbd847a 100644
--- a/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertSwaggerSectionLoadOnPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swagger/Test/Constraint/AssertSwaggerSectionLoadOnPage.php
@@ -29,7 +29,7 @@ class AssertSwaggerSectionLoadOnPage extends AbstractConstraint
      */
     public function processAssert(SwaggerUiPage $swaggerPage)
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $swaggerPage->isElementVisible($this->swaggerSectionSelector),
             'Class swagger-section on swagger page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/Page/SwaggerUiPage.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/Page/SwaggerUiPage.php
index 1118b41a370d8..3ea362d41848c 100644
--- a/dev/tests/functional/tests/app/Magento/Swagger/Test/Page/SwaggerUiPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swagger/Test/Page/SwaggerUiPage.php
@@ -38,7 +38,7 @@ class SwaggerUiPage
      *
      * @var string
      */
-    protected $titleSelector = '.info_title';
+    protected $titleSelector = '.title';
 
     /**
      * Constructor
@@ -97,14 +97,14 @@ public function expandServiceContent($serviceName)
         /**
          * Selector for service
          */
-        $serviceSelector = 'a#endpointListTogger_%s';
+        $serviceSelector = '#operations-tag-%s';
         /**
          * Selector for endpoint
          */
-        $endpointSelector = 'ul#%s_endpoint_list';
+        $endpointSelector = '//H4[@id=\'operations-tag-%s\']/following-sibling::DIV';
         $serviceSelector = sprintf($serviceSelector, $serviceName);
         $endpointSelector = sprintf($endpointSelector, $serviceName);
-        if (!$this->isElementVisible($endpointSelector)) {
+        if (!$this->isElementVisible($endpointSelector, Locator::SELECTOR_XPATH)) {
             $this->browser->find($serviceSelector, Locator::SELECTOR_CSS)->click();
         }
     }
@@ -120,16 +120,12 @@ public function closeServiceContent($serviceName)
         /**
          * Selector for service
          */
-        $serviceSelector = 'a#endpointListTogger_%s';
+        $serviceSelector = '#operations-tag-%s';
         /**
          * Selector for endpoint
          */
-        $endpointSelector = 'ul#%s_endpoint_list';
         $serviceSelector = sprintf($serviceSelector, $serviceName);
-        $endpointSelector = sprintf($endpointSelector, $serviceName);
-        if ($this->isElementVisible($endpointSelector)) {
-            $this->browser->find($serviceSelector, Locator::SELECTOR_CSS)->click();
-        }
+        $this->browser->find($serviceSelector, Locator::SELECTOR_CSS)->click();
     }
 
     /**
@@ -145,16 +141,12 @@ public function expandEndpointContent($serviceName, $endpoint)
         /**
          * Selector for endpoint href
          */
-        $endpointRefSelector = 'a[href$="%s%s"]';
+        $endpointRefSelector = '#operations-%s-%s%s > div';
         /**
          * Selector for operation
          */
-        $operationSelector = 'div[id$="%s%s_content"]';
-        $endpointRefSelector = sprintf($endpointRefSelector, $serviceName, $endpoint);
-        $operationSelector = sprintf($operationSelector, $serviceName, $endpoint);
-        if (!$this->isElementVisible($operationSelector)) {
-            $this->browser->find($endpointRefSelector, Locator::SELECTOR_CSS)->click();
-        }
+        $endpointRefSelector = sprintf($endpointRefSelector, $serviceName, $serviceName, $endpoint);
+        $this->browser->find($endpointRefSelector, Locator::SELECTOR_CSS)->click();
     }
 
     /**
@@ -167,19 +159,17 @@ public function expandEndpointContent($serviceName, $endpoint)
     public function closeEndpointContent($serviceName, $endpoint)
     {
         $this->expandServiceContent($serviceName);
+
         /**
          * Selector for endpoint href
          */
-        $endpointRefSelector = 'a[href$="%s%s"]';
+        $endpointRefSelector = '#operations-%s-%s%s > div';
+
         /**
          * Selector for operation
          */
-        $operationSelector = 'div[id$="%s%s_content"]';
-        $endpointRefSelector = sprintf($endpointRefSelector, $serviceName, $endpoint);
-        $operationSelector = sprintf($operationSelector, $serviceName, $endpoint);
-        if ($this->isElementVisible($operationSelector)) {
-            $this->browser->find($endpointRefSelector, Locator::SELECTOR_CSS)->click();
-        }
+        $endpointRefSelector = sprintf($endpointRefSelector, $serviceName, $serviceName, $endpoint);
+        $this->browser->find($endpointRefSelector, Locator::SELECTOR_CSS)->click();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
index 52e35dd4f271a..11d290a05cca7 100755
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
@@ -42,7 +42,7 @@ public function fillData(\Magento\ConfigurableProduct\Test\Fixture\ConfigurableP
         $confAttrSource = $confAttrData['source'];
         $attributes = $confAttrSource->getAttributes();
 
-        foreach ($options as $option) {
+        foreach (array_reverse($options) as $option) {
             if (!isset($attributes[$option['title']])
                 || stripos($attributes[$option['title']]->getFrontendInput(), "swatch") === false
             ) {
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertProductPriceWithSelectedSwatchOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertProductPriceWithSelectedSwatchOnCategoryPage.php
index a6ac31a5e4c86..20cd944ffdb99 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertProductPriceWithSelectedSwatchOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertProductPriceWithSelectedSwatchOnCategoryPage.php
@@ -25,7 +25,7 @@ public function processAssert(
     ) {
         $priceBlock = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock();
         $configuredPrice = $product->getCheckoutData()['cartItem']['subtotal'];
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             number_format($configuredPrice, 2, '.', ''),
             $priceBlock->getPrice(),
             'Product configured price on category page is not correct.'
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSelectedSwatchOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSelectedSwatchOptionsOnProductPage.php
index bd4992520de70..7d495c54c270e 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSelectedSwatchOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSelectedSwatchOptionsOnProductPage.php
@@ -28,7 +28,7 @@ public function processAssert(
 
         $this->productView->getSelectedSwatchOptions($this->product);
         $errors = $this->verify();
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             $errors,
             "\nFound the following errors:\n" . implode(" \n", $errors)
         );
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchOptionsOnProductPage.php
index a92472a1f4d1d..f0dfa38228090 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchOptionsOnProductPage.php
@@ -35,7 +35,7 @@ public function processAssert(
         $expectedData = $product->getConfigurableAttributesData()['attributes_data'];
 
         foreach ($expectedData as $expectedAttributeData) {
-            \PHPUnit_Framework_Assert::assertArrayHasKey(
+            \PHPUnit\Framework\Assert::assertArrayHasKey(
                 $expectedAttributeData['attribute_code'],
                 $actualData,
                 'Attribute with code ' . $expectedAttributeData['attribute_code'] . ' is absent on Product page'
@@ -54,7 +54,7 @@ public function processAssert(
      */
     private function verifyAttribute(array $expectedAttributeData, array $actualAttributeData)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedAttributeData['attribute_code'],
             $actualAttributeData['attribute_code'],
             sprintf(
@@ -63,7 +63,7 @@ private function verifyAttribute(array $expectedAttributeData, array $actualAttr
                 $expectedAttributeData['attribute_code']
             )
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedAttributeData['attribute_id'],
             $actualAttributeData['attribute_id'],
             sprintf(
@@ -72,7 +72,7 @@ private function verifyAttribute(array $expectedAttributeData, array $actualAttr
                 $expectedAttributeData['attribute_id']
             )
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedAttributeData['label'],
             $actualAttributeData['label'],
             sprintf(
@@ -92,7 +92,7 @@ private function verifyAttribute(array $expectedAttributeData, array $actualAttr
     private function verifyAttributeOptions(array $expectedAttributeData, array $actualAttributeData)
     {
         if (isset($expectedAttributeData['options'])) {
-            \PHPUnit_Framework_Assert::assertArrayHasKey(
+            \PHPUnit\Framework\Assert::assertArrayHasKey(
                 'options',
                 $actualAttributeData,
                 'Swatch attribute options are missed on Product page'
@@ -100,7 +100,7 @@ private function verifyAttributeOptions(array $expectedAttributeData, array $act
 
             $expectedOptionsCount = count($expectedAttributeData['options']);
             $actualOptionsCount = count($actualAttributeData['options']);
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $expectedOptionsCount,
                 $actualOptionsCount,
                 sprintf(
@@ -110,7 +110,7 @@ private function verifyAttributeOptions(array $expectedAttributeData, array $act
                 )
             );
         } else {
-            \PHPUnit_Framework_Assert::assertArrayNotHasKey(
+            \PHPUnit\Framework\Assert::assertArrayNotHasKey(
                 'options',
                 $actualAttributeData,
                 'Product page must be without swatch attribute options'
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreNotVisibleOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreNotVisibleOnCategoryPage.php
index 2517eb83284c9..55b42293cd22d 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreNotVisibleOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreNotVisibleOnCategoryPage.php
@@ -31,7 +31,7 @@ public function processAssert(
         $isSwatchesBlockVisible = $catalogCategoryView->getListSwatchesProductBlock()
             ->getProductItem($product)->isSwatchesBlockVisible();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $isSwatchesBlockVisible,
             'Swatches are still present on category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreVisibleOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreVisibleOnCategoryPage.php
index fe7d982b89ea5..ddfa2cbffae2b 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreVisibleOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchesAreVisibleOnCategoryPage.php
@@ -31,7 +31,7 @@ public function processAssert(
         $isSwatchesBlockVisible = $catalogCategoryView->getListSwatchesProductBlock()
             ->getProductItem($product)->isSwatchesBlockVisible();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isSwatchesBlockVisible,
             'Swatches are absent on category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
index 083fa246c96ef..f4adb9dec1250 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
@@ -29,21 +29,32 @@ public function __construct(DataInterface $configuration, EventManagerInterface
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function changeStructureOfTheData(array $data): array
+    {
+        return parent::changeStructureOfTheData($data);
+    }
+
     /**
      * Re-map options from default options structure to swatches structure,
      * as swatches was initially created with name convention differ from other attributes.
      *
-     * @param array $data
-     * @return array
+     * @inheritdoc
      */
-    protected function changeStructureOfTheData(array $data)
+    protected function getSerializeOptions(array $data): string
     {
-        $data = parent::changeStructureOfTheData($data);
-        $data['optiontext'] = $data['option'];
-        $data['swatchtext'] = [
-            'value' => $data['option']['value']
-        ];
-        unset($data['option']);
-        return $data;
+        $options = [];
+        foreach ($data as $optionRowData) {
+            $optionRowData['optiontext'] = $optionRowData['option'];
+            $optionRowData['swatchtext'] = [
+                'value' => $optionRowData['option']['value']
+            ];
+            unset($optionRowData['option']);
+            $options[] = http_build_query($optionRowData);
+        }
+
+        return json_encode($options);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index 248ce0e575ee7..eb304f9b0eefb 100755
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -100,28 +100,28 @@ public function processAssert(
         $actualPrices = $this->getOrderTotals($actualPrices);
         $prices = $this->preparePrices($prices);
         $message = 'Prices on order view page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
         $salesOrderView->getPageActions()->invoice();
         //Check prices on invoice creation page
         $actualPrices = [];
         $actualPrices = $this->getInvoiceNewPrices($actualPrices, $product);
         $actualPrices = $this->getInvoiceNewTotals($actualPrices);
         $message = 'Prices on invoice new page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
         $orderInvoiceNew->getTotalsBlock()->submit();
         //Check prices after invoice on order page
         $actualPrices = [];
         $actualPrices = $this->getOrderPrices($actualPrices, $product);
         $actualPrices = $this->getOrderTotals($actualPrices);
         $message = 'Prices on invoice page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
         $salesOrderView->getPageActions()->orderCreditMemo();
         //Check prices on credit memo creation page
         $actualPrices = [];
         $actualPrices = $this->getCreditMemoNewPrices($actualPrices, $product);
         $actualPrices = $this->getCreditMemoNewTotals($actualPrices);
         $message = 'Prices on credit memo new page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             array_diff_key($prices, ['shipping_excl_tax' => null, 'shipping_incl_tax' => null]),
             array_filter($actualPrices),
             $message
@@ -132,7 +132,7 @@ public function processAssert(
         $actualPrices = $this->getOrderPrices($actualPrices, $product);
         $actualPrices = $this->getOrderTotals($actualPrices);
         $message = 'Prices on credit memo page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, array_filter($actualPrices), $message);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index c61bc4578abd3..affc3132c6ccd 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -94,7 +94,7 @@ public function processAssert(
         $prices = $this->preparePrices($prices);
         //Order review prices verification
         $message = 'Prices on order review should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             array_diff_key($prices, ['cart_item_price_excl_tax' => null, 'cart_item_price_incl_tax' => null]),
             array_diff_key($actualPrices, ['cart_item_price_excl_tax' => null, 'cart_item_price_incl_tax' => null]),
             $message
@@ -109,7 +109,7 @@ public function processAssert(
 
         //Frontend order prices verification
         $message = 'Prices on order view page should be equal to defined in dataset.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, $actualPrices, $message);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index a14a2e186f7e6..9ff0a9e6a6487 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -129,7 +129,7 @@ public function processAssert(
         $actualPrices = $this->getTotals($actualPrices);
         //Prices verification
         $message = 'Prices from dataset should be equal to prices on frontend.';
-        \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+        \PHPUnit\Framework\Assert::assertEquals($prices, $actualPrices, $message);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
index 013a468487d74..e0ec4ae528589 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
@@ -40,7 +40,7 @@ public function processAssert(
         $taxRateIndexPage->getTaxRateGrid()->searchAndOpen($filter);
         $formData = $taxRateNewPage->getTaxRateForm()->getData($taxRate);
         $dataDiff = $this->verifyForm($formData, $data);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($dataDiff),
             'Tax Rate form was filled incorrectly.'
             . "\nLog:\n" . implode(";\n", $dataDiff)
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
index dd40138bfdd37..ca5615b042e87 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
@@ -40,7 +40,7 @@ public function processAssert(
             : $data['zip_from'] . '-' . $data['zip_to'];
 
         $taxRateIndexPage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $taxRateIndexPage->getTaxRateGrid()->isRowVisible($filter),
             'Tax Rate \'' . $filter['code'] . '\' is absent in Tax Rate grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
index d188c60c49fbb..2e533887f7b4b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
@@ -30,7 +30,7 @@ public function processAssert(TaxRuleIndex $taxRuleIndex, TaxRuleNew $taxRuleNew
         $taxRuleIndex->open();
         $taxRuleIndex->getGridPageActions()->addNew();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $taxRuleNew->getTaxRuleForm()->isTaxRateAvailable($taxRateCode),
             "$taxRateCode is not present in Tax Rates multiselect on tax rule creation page."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
index 7a0c118451585..0cb1112288c3f 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(
         ];
 
         $taxRateIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $taxRateIndex->getTaxRateGrid()->isRowVisible($filter),
             'Tax Rate \'' . $filter['code'] . '\' is present in Tax Rate grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
index 29f11fe437ec4..2788e86b9f98f 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
@@ -28,7 +28,7 @@ public function processAssert(
     ) {
         $taxRuleNew->open();
         $taxRatesList = $taxRuleNew->getTaxRuleForm()->getAllTaxRates();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             in_array($taxRate->getCode(), $taxRatesList),
             'Tax Rate \'' . $taxRate->getCode() . '\' is present in Tax Rule form.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
index 480ec889a4a95..3fcadf9beda88 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertTaxRateSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(TaxRateIndex $taxRateIndex)
     {
         $actualMessage = $taxRateIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
index a65ac87373149..c8fd88a785584 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertTaxRateSuccessSaveMessage extends AbstractConstraint
     public function processAssert(TaxRateIndex $taxRateIndexPage)
     {
         $actualMessage = $taxRateIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
index 68612747a1778..c305bedf000de 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
@@ -44,7 +44,7 @@ public function processAssert(
         $taxRuleNew->getTaxRuleForm()->openAdditionalSettings();
         $formData = $taxRuleNew->getTaxRuleForm()->getData($taxRule);
         $dataDiff = $this->verifyForm($formData, $data);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             empty($dataDiff),
             'Tax Rule form was filled not right.'
             . "\nLog:\n" . implode(";\n", $dataDiff)
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
index dbde484925b28..33982614a71a9 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
@@ -37,7 +37,7 @@ public function processAssert(
         ];
 
         $taxRuleIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $taxRuleIndex->getTaxRuleGrid()->isRowVisible($filter),
             'Tax Rule \'' . $filter['code'] . '\' is absent in Tax Rule grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
index e54f7cd03793a..39695623d2cfb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
@@ -42,7 +42,7 @@ protected function assert()
                 . "\nActual: " . $actualGrandTotal;
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(empty($errorMessages), implode(";\n", $errorMessages));
+        \PHPUnit\Framework\Assert::assertTrue(empty($errorMessages), implode(";\n", $errorMessages));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
index 94d98ae3673ec..e3a7c5d8fb8d7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
@@ -34,7 +34,7 @@ protected function assert()
                 . "\nActual: " . $actualGrandTotal;
         }
 
-        \PHPUnit_Framework_Assert::assertTrue(empty($errorMessages), implode(";\n", $errorMessages));
+        \PHPUnit\Framework\Assert::assertTrue(empty($errorMessages), implode(";\n", $errorMessages));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
index fa1259c39ecc1..122a4f5ce9c20 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
@@ -31,7 +31,7 @@ public function processAssert(
         ];
 
         $taxRuleIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $taxRuleIndex->getTaxRuleGrid()->isRowVisible($filter),
             'Tax Rule \'' . $filter['code'] . '\' is present in Tax Rule grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
index a71c24730accb..29d1b6bdd5e7a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertTaxRuleSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(TaxRuleIndex $taxRuleIndex)
     {
         $actualMessage = $taxRuleIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
index 59ff270c7d22d..7572bd0ed997c 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
@@ -29,7 +29,7 @@ class AssertTaxRuleSuccessSaveMessage extends AbstractConstraint
     public function processAssert(TaxRuleIndex $taxRuleIndex)
     {
         $actualMessage = $taxRuleIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
index b36ae0c234162..b6e38da55dc96 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
@@ -21,7 +21,7 @@ class AssertTaxWithCrossBorderApplied extends AbstractAssertTaxWithCrossBorderAp
     public function assert($actualPrices)
     {
         //Prices verification
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             array_diff($actualPrices[0], $actualPrices[1]),
             'Prices for customers should be equal. Cross border is not applied.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
index 467ec13b21f1c..749f948a81d63 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
@@ -21,7 +21,7 @@ class AssertTaxWithCrossBorderNotApplied extends AbstractAssertTaxWithCrossBorde
     public function assert($actualPrices)
     {
         //Prices verification
-        \PHPUnit_Framework_Assert::assertNotEmpty(
+        \PHPUnit\Framework\Assert::assertNotEmpty(
             array_diff($actualPrices[0], $actualPrices[1]),
             'Prices for customers should be different.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
index aa74de5afe5f5..8b4f233f35501 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
@@ -28,6 +28,7 @@ class CreateTaxRateEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
+    const MFTF_MIGRATED = 'yes';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
index 62e91f39fcce0..b4b76fd62cc34 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Tax\Test\TestCase\CreateTaxRateEntityTest" summary="Create Tax Rate" ticketId="MAGETWO-23286">
         <variation name="CreateTaxRateEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
             <data name="taxRate/data/zip_from" xsi:type="string">-</data>
@@ -21,6 +22,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
         </variation>
         <variation name="CreateTaxRateEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
             <data name="taxRate/data/zip_from" xsi:type="string">90001</data>
@@ -35,6 +37,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
         </variation>
         <variation name="CreateTaxRateEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
             <data name="taxRate/data/zip_from" xsi:type="string">-</data>
@@ -48,6 +51,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
         </variation>
         <variation name="CreateTaxRateEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
             <data name="taxRate/data/zip_from" xsi:type="string">1</data>
@@ -60,6 +64,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateInTaxRule" />
         </variation>
         <variation name="CreateTaxRateEntityTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
             <data name="taxRate/data/zip_from" xsi:type="string">-</data>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
index fe4ea7a0fb07a..cf4e54adac0c9 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Tax\Test\TestCase\CreateTaxRuleEntityTest" summary="Create Tax Rule " ticketId="MAGETWO-20913">
         <variation name="CreateTaxRuleEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-Rate_1</data>
             <data name="taxRule/data/tax_customer_class/dataset/class_0" xsi:type="string">-</data>
@@ -19,6 +20,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
         </variation>
         <variation name="CreateTaxRuleEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="tag" xsi:type="string">stable:no</data>
             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-Rate_1</data>
@@ -34,6 +36,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
         </variation>
         <variation name="CreateTaxRuleEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Creating tax rule with new tax classes and tax rate</data>
             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">default</data>
@@ -48,6 +51,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
         </variation>
         <variation name="CreateTaxRuleEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">withZipRange</data>
             <data name="taxRule/data/tax_rate/dataset/rate_1" xsi:type="string">US-CA-Rate_1</data>
@@ -61,6 +65,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
         </variation>
         <variation name="CreateTaxRuleEntityTestVariation5" summary="Create Tax Rule with New and Existing Tax Rate, Customer Tax Class, Product Tax Class" ticketId="MAGETWO-12438">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">US-CA-*-Rate 1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml
index 5d80acd8a003a..40270d84199cb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Tax\Test\TestCase\DeleteTaxRateEntityTest" summary="Delete Tax Rate" ticketId="MAGETWO-23295">
         <variation name="DeleteTaxRateEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRate/dataset" xsi:type="string">default</data>
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateSuccessDeleteMessage" />
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateNotInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
index 1e66ad61b6c80..10f41e68b6598 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
@@ -33,6 +33,7 @@ class UpdateTaxRateEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
+    const MFTF_MIGRATED = 'yes';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
index f8d9a00958b98..1fef659a3deb0 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Tax\Test\TestCase\UpdateTaxRateEntityTest" summary="Edit Tax Rate" ticketId="MAGETWO-23299">
         <variation name="UpdateTaxRateEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialTaxRate/dataset" xsi:type="string">default</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
@@ -20,6 +21,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
         </variation>
         <variation name="UpdateTaxRateEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialTaxRate/dataset" xsi:type="string">default</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
@@ -33,6 +35,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
         </variation>
         <variation name="UpdateTaxRateEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialTaxRate/dataset" xsi:type="string">default</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
@@ -44,6 +47,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
         </variation>
         <variation name="UpdateTaxRateEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialTaxRate/dataset" xsi:type="string">withZipRange</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
@@ -56,6 +60,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
         </variation>
         <variation name="UpdateTaxRateEntityTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialTaxRate/dataset" xsi:type="string">withZipRange</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
@@ -67,6 +72,7 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRateForm" />
         </variation>
         <variation name="UpdateTaxRateEntityTestVariation6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialTaxRate/dataset" xsi:type="string">withZipRange</data>
             <data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Breadcrumbs.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Breadcrumbs.php
index 70b64b48a72a5..f0baba280ef56 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Breadcrumbs.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Breadcrumbs.php
@@ -13,6 +13,13 @@
  */
 class Breadcrumbs extends Block
 {
+    /**
+     * Locator for crumb item.
+     *
+     * @var string
+     */
+    private $crumbSelector = '.items > li';
+
     /**
      * Get breadcrumbs content of current page.
      *
@@ -22,4 +29,21 @@ public function getText()
     {
         return $this->_rootElement->getText();
     }
+
+    /**
+     * Returns list of breadcrumb items.
+     *
+     * @return array
+     */
+    public function getCrumbs()
+    {
+        $crumbs = $this->_rootElement->getElements($this->crumbSelector);
+        $result = [];
+
+        foreach ($crumbs as $crumb) {
+            $result[] = $crumb->getText();
+        }
+
+        return $result;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
index 0bcf20b38801e..30842af0b020d 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
@@ -120,7 +120,7 @@ public function selectStoreGroup(Store $store)
     }
 
     /**
-     * Check if correspondent "Store" is present in "Store" swither or not.
+     * Check if correspondent "Store" is present in "Store" switcher or not.
      *
      * @param Store $store
      * @return bool
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
index 15145c36afe0d..235b0d096533f 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -332,7 +332,7 @@ public function selectMassAction($massActionSelection)
     }
 
     /**
-     * Peform action using the dropdown above the grid.
+     * Perform action using the dropdown above the grid.
      *
      * @param array|string $action [array -> key = value from first select; value => value from subselect]
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/FormSections.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/FormSections.php
index c98b5a874a762..170fef137ec9f 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/FormSections.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/FormSections.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Ui\Test\Block\Adminhtml;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
@@ -53,13 +52,13 @@ protected function openContainer($sectionName)
      *
      * @param string $sectionName
      * @return $this
-     * @throws LocalizedException if section is not visible
+     * @throws \Exception if section is not visible
      */
     public function openSection($sectionName)
     {
         $container = $this->getContainerElement($sectionName);
         if (!$container->isVisible()) {
-            throw new LocalizedException(__('Container is not found "' . $sectionName . '""'));
+            throw new \Exception('Container is not found "' . $sectionName . '""');
         }
         $section = $container->find($this->collapsedSection);
         if ($section->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
index a9c8e87f1dc97..5c27776c09620 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
@@ -150,7 +150,7 @@ public function setAlertText($text)
     }
 
     /**
-     * Wait until modal window will disapper.
+     * Wait until modal window will disappear.
      *
      * @return void
      */
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFiltering.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFiltering.php
index 413fa93e832cd..9bd6a76114e89 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFiltering.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFiltering.php
@@ -22,7 +22,7 @@ public function processAssert(array $filterResults)
     {
         foreach ($filterResults as $itemId => $filters) {
             foreach ($filters as $filterName => $ids) {
-                \PHPUnit_Framework_Assert::assertCount(
+                \PHPUnit\Framework\Assert::assertCount(
                     1,
                     $ids,
                     sprintf(
@@ -33,7 +33,7 @@ public function processAssert(array $filterResults)
                     )
                 );
                 $actualItemId = $ids[0];
-                \PHPUnit_Framework_Assert::assertEquals(
+                \PHPUnit\Framework\Assert::assertEquals(
                     $itemId,
                     $actualItemId,
                     sprintf(
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFullTextSearch.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFullTextSearch.php
index 90e3616a027dc..ff886be2eebd7 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFullTextSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridFullTextSearch.php
@@ -21,7 +21,7 @@ class AssertGridFullTextSearch extends AbstractConstraint
     public function processAssert(array $results)
     {
         foreach ($results as $itemId => $ids) {
-            \PHPUnit_Framework_Assert::assertCount(
+            \PHPUnit\Framework\Assert::assertCount(
                 1,
                 $ids,
                 sprintf(
@@ -31,7 +31,7 @@ public function processAssert(array $results)
                 )
             );
             $actualItemId = $ids[0];
-            \PHPUnit_Framework_Assert::assertEquals(
+            \PHPUnit\Framework\Assert::assertEquals(
                 $itemId,
                 $actualItemId,
                 sprintf(
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridSorting.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridSorting.php
index 06953926fa512..71c0c0317cb0e 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridSorting.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Constraint/AssertGridSorting.php
@@ -22,7 +22,7 @@ class AssertGridSorting extends AbstractConstraint
     public function processAssert(array $sortingResults)
     {
         foreach ($sortingResults as $columnName => $sortingResult) {
-            \PHPUnit_Framework_Assert::assertNotEquals(
+            \PHPUnit\Framework\Assert::assertNotEquals(
                 $sortingResult['firstIdAfterFirstSoring'],
                 $sortingResult['firstIdAfterSecondSoring'],
                 sprintf('Sorting for "%s" column have not changed the first item of grid!', $columnName)
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringDeletedEntityTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringDeletedEntityTest.php
new file mode 100644
index 0000000000000..f1fa688339472
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFilteringDeletedEntityTest.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Ui\Test\TestCase;
+
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Page\PageFactory;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+
+/**
+ * Precondition:
+ * 1. Create items
+ *
+ * Steps:
+ * 1. Log in to Admin.
+ * 2. Go to grid page.
+ * 3. Apply filter by Store View.
+ * 4. Delete Website.
+ * 5. Go to grid page.
+ * 6. Perform Asserts.
+ *
+ * @group Ui
+ * @ZephyrId MAGETWO-89042
+ */
+class GridFilteringDeletedEntityTest extends Injectable
+{
+    /* tags */
+    const SEVERITY = 'S2';
+    const MVP = 'no';
+    /* end tags */
+
+    /**
+     * Order index page.
+     *
+     * @var PageFactory
+     */
+    protected $pageFactory;
+
+    /**
+     * Fixture factory.
+     *
+     * @var FixtureFactory
+     */
+    protected $fixtureFactory;
+
+    /**
+     * Injection data.
+     *
+     * @param PageFactory $pageFactory
+     * @param FixtureFactory $fixtureFactory
+     * @return void
+     */
+    public function __inject(PageFactory $pageFactory, FixtureFactory $fixtureFactory)
+    {
+        $this->pageFactory = $pageFactory;
+        $this->fixtureFactory = $fixtureFactory;
+    }
+
+    /**
+     * @param string $pageClass
+     * @param string $gridRetriever
+     * @param string[] $filters
+     * @param string $fixtureName
+     * @param string[] $steps
+     * @param array $fixtureDataSet
+     * @return void
+     */
+    public function test(
+        $pageClass,
+        $gridRetriever,
+        array $filters,
+        $fixtureName,
+        array $steps = [],
+        $fixtureDataSet = null
+    ) {
+        $item = $this->createItems($fixtureName, $fixtureDataSet);
+        $page = $this->pageFactory->create($pageClass);
+
+        $page->open();
+        /** @var DataGrid $gridBlock */
+        $gridBlock = $page->$gridRetriever();
+        $gridBlock->resetFilter();
+
+        foreach ($filters as $itemFilters) {
+            $filterArray = [];
+            foreach ($itemFilters as $itemFiltersName => $itemFilterValue) {
+                if (substr($itemFilterValue, 0, 1) === ':') {
+                    $value = $item->getData(substr($itemFilterValue, 1));
+                } else {
+                    $value = $itemFilterValue;
+                }
+                $filterArray[$itemFiltersName] = $value;
+            }
+
+            $storesArray = $item->getDataFieldConfig('website_ids')['source']->getStores();
+            $store = end($storesArray);
+            $filterArray['store_id']  = $store->getName();
+            $gridBlock->search($filterArray);
+        }
+
+        if (!empty($steps)) {
+            foreach ($steps as $step) {
+                $this->processSteps($item, $step);
+            }
+        }
+    }
+
+    /**
+     * @param string $fixtureName
+     * @param string $fixtureDataSet
+     * @return FixtureInterface
+     */
+    private function createItems($fixtureName, $fixtureDataSet)
+    {
+        $item = $this->fixtureFactory->createByCode($fixtureName, ['dataset' => $fixtureDataSet]);
+        $item->persist();
+        return $item;
+    }
+
+    /**
+     * @param FixtureInterface $item
+     * @param array $steps
+     * @return void
+     */
+    private function processSteps(FixtureInterface $item, $steps)
+    {
+        foreach ($steps as $step) {
+            $processStep = $this->objectManager->create($step, ['item' => $item]);
+            $processStep->run();
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
index 57a170b924fe7..a54907aa49ec7 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridFullTextSearchTest.php
@@ -19,7 +19,7 @@
  * Steps:
  * 1. Navigate to backend.
  * 2. Go to grid page
- * 3. Perfrom full text search
+ * 3. Perform full text search
  * 5. Perform Asserts
  *
  * @group Ui
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
index 114709becde6f..988229d308250 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
@@ -39,7 +39,7 @@ protected function prepareData(FixtureInterface $fixture)
      *
      * @param array $data
      * @param SimpleElement $context
-     * @retun void
+     * @return void
      */
     protected function fillFields(array $data, SimpleElement $context)
     {
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php
index b44a9ec8d7dca..5b4109c9728bc 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertCategoryUrlWithCustomStoreView.php
@@ -43,7 +43,7 @@ public function processAssert(
         );
         $actualUrl = strtolower($parentCategory->getUrlKey() . '/' . $categoryUpdates->getUrlKey());
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $actualUrl,
             $browser->getUrl(),
             "Category URL is not correct."
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
index f734f224c659b..7625dd5b2c2c8 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
@@ -36,7 +36,7 @@ public function processAssert(
         UrlRewrite $productRedirect
     ) {
         $browser->open($_ENV['app_frontend_url'] . $productRedirect->getRequestPath());
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::NOT_FOUND_MESSAGE,
             $catalogProductView->getTitleBlock()->getTitle(),
             'Wrong page is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
index 972e5203959ba..d305ec61208e0 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
@@ -114,7 +114,7 @@ private function getCategoryId(Category $category, Category $childCategory = nul
     private function rowVisibleAssertion(array $filter)
     {
         $filterRow = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false),
             'URL Rewrite with request path "' . $filterRow . '" is absent in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
index d2ba3e45c5c81..2d06dcc3835e9 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(UrlRewriteIndex $urlRewriteIndex, Category $catego
     {
         $urlRewriteIndex->open();
         $filter = ['request_path' => $category->getUrlKey()];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter),
             "URL Rewrite with request path '{$category->getUrlKey()}' is present in grid."
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
index d236c676995cb..0236be0cb643e 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
@@ -35,7 +35,7 @@ public function processAssert(
             ? $urlRewrite->getRequestPath()
             : $category->getUrlKey() . '.html';
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $browser->getUrl(),
             $_ENV['app_frontend_url'] . $url,
             'URL rewrite category redirect false.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
index a86e49631bdff..98a2c484770d5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
@@ -31,7 +31,7 @@ public function processAssert(UrlRewrite $urlRewrite, BrowserInterface $browser,
         $entity = $urlRewrite->getDataFieldConfig('target_path')['source']->getEntity();
         $title = $entity->hasData('name') ? $entity->getName() : $entity->getContentHeading();
         $pageTitle = $cmsIndex->getTitleBlock()->getTitle();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $pageTitle,
             $title,
             'URL rewrite product redirect false.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
index 2e39110bd6ac9..b8b26b802434a 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
@@ -38,7 +38,7 @@ public function processAssert(
         $browser->open($_ENV['app_frontend_url'] . $urlRequestPath);
         $entity = $urlRewrite->getDataFieldConfig('target_path')['source']->getEntity();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $categoryView->getListProductBlock()->getProductItem($entity)->isVisible(),
             "Created entity '{$entity->getName()}' isn't found."
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
index 9c527b5dcf1e9..07557469b0297 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
@@ -29,7 +29,7 @@ class AssertUrlRewriteDeletedMessage extends AbstractConstraint
     public function processAssert(UrlRewriteIndex $index)
     {
         $actualMessage = $index->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
index 9b5e19bf60c72..0d467529b5a17 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(UrlRewriteIndex $urlRewriteIndex, UrlRewrite $urlR
     {
         $urlRewriteIndex->open();
         $filter = ['request_path' => $urlRewrite->getRequestPath()];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter),
             'URL Rewrite with request path \'' . $urlRewrite->getRequestPath() . '\' is absent in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
index 6427088942831..cbaaf021b81ae 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(UrlRewriteIndex $urlRewriteIndex, UrlRewrite $prod
     {
         $urlRewriteIndex->open();
         $filter = ['request_path' => $productRedirect->getRequestPath()];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter),
             'URL Rewrite with request path \'' . $productRedirect->getRequestPath() . '\' is present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
index 6cce730128b91..82cdc917dd71d 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
@@ -93,7 +93,7 @@ public function processAssert(
                 ],
             ];
             foreach ($filters as $filter) {
-                \PHPUnit_Framework_Assert::assertTrue(
+                \PHPUnit\Framework\Assert::assertTrue(
                     $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false),
                     'URL Rewrite with request path \'' . $filter['request_path'] . '\' is absent in grid.'
                 );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductNotInGrid.php
index 014ea8aae6e9c..910b568ccb4cf 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductNotInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(UrlRewriteIndex $urlRewriteIndex, FixtureInterface
         $urlRewriteIndex->open();
         $requestPath = $product->getUrlKey() . '.html';
         $filter = ['request_path' => $requestPath];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter),
             'URL Rewrite with request path \'' . $requestPath . '\' is present in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
index 95d6b331f07ef..53dcf90b772fd 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
@@ -37,7 +37,7 @@ public function processAssert(
         if ($product === null) {
             $product = $urlRewrite->getDataFieldConfig('target_path')['source']->getEntity();
         }
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $catalogProductView->getTitleBlock()->getTitle(),
             $product->getName(),
             'URL rewrite product redirect false.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteRedirectInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteRedirectInGrid.php
index f39a11c8f8216..efed2a08ac488 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteRedirectInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteRedirectInGrid.php
@@ -58,7 +58,7 @@ public function processAssert(
     private function rowVisibleAssertion(array $filter)
     {
         $filterRow = implode(', ', $filter);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false),
             'Category redirect with request path "' . $filterRow . '" is absent in grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
index 94eae31b71c45..e62fec914b8de 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
@@ -26,7 +26,7 @@ class AssertUrlRewriteSaveMessage extends AbstractConstraint
     public function processAssert(UrlRewriteIndex $index)
     {
         $actualMessage = $index->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
index 803bd30d3513d..88b69a3d310ee 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
@@ -36,7 +36,7 @@ public function processAssert(UrlRewrite $urlRewrite, BrowserInterface $browser,
         $browser->open($_ENV['app_frontend_url'] . $urlRequestPath);
         $browserUrl = $browser->getUrl();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $browserUrl,
             $urlTargetPath,
             'URL rewrite redirect false.'
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
index bfb156fb4619a..fb84bf02ed9b6 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
@@ -37,7 +37,7 @@ public function processAssert(
             'request_path' => $url,
             'target_path' => $targetPath,
         ];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false),
             "URL Rewrite with request path '$url' is absent in grid."
         );
@@ -45,7 +45,7 @@ public function processAssert(
         $categoryInitial = $initialProduct->getDataFieldConfig('category_ids')['source']->getCategories()[0];
         $targetPath = "catalog/product/view/id/{$initialProduct->getId()}/category/{$categoryInitial->getId()}";
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible(['target_path' => $targetPath], true, false),
             "URL Rewrite with target path '$targetPath' is present in grid."
         );
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
index cc2763c0e3cb9..7f0c29da03784 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
@@ -44,7 +44,7 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data
             $id = $this->entity->hasData('id') ? $this->entity->getId() : $this->entity->getPageId();
             $this->data = preg_replace('`(%.*?%)`', $id, $data['entity']);
         } else {
-            $this->data = strval($data['entity']);
+            $this->data = (string)$data['entity'];
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
index 8147818135edc..a2767f76cfecb 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.php
@@ -85,6 +85,7 @@ public function test(Store $storeView, Category $childCategory, Category $parent
         $this->catalogCategoryEdit->getFormPageActions()->selectStoreView($storeView->getName());
         $this->catalogCategoryEdit->getEditForm()->fill($categoryUpdates);
         $this->catalogCategoryEdit->getFormPageActions()->save();
+        $this->catalogCategoryEdit->getFormPageActions()->selectStoreView('All Store Views');
         $this->catalogCategoryIndex->getTreeCategories()->assignCategory(
             $parentCategory->getName(),
             $childCategory->getName()
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
index cfd54cfb461dd..b1a64c7c7e713 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
@@ -28,7 +28,7 @@ class AssertAccessTokensErrorRevokeMessage extends AbstractConstraint
      */
     public function processAssert(UserEdit $userEdit)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $userEdit->getMessagesBlock()->getErrorMessage()
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
index 7a889c0bb0779..f557cfb8099cf 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
@@ -25,7 +25,7 @@ class AssertImpossibleDeleteYourOwnAccount extends AbstractConstraint
     public function processAssert(UserEdit $userEdit)
     {
         $errorMessage = $userEdit->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $errorMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
index 672f9660aca8a..58a845cf755c7 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
@@ -25,7 +25,7 @@ class AssertImpossibleDeleteYourOwnRole extends AbstractConstraint
     public function processAssert(UserRoleEditRole $rolePage)
     {
         $errorMessage = $rolePage->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $errorMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertIncorrectUserPassword.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertIncorrectUserPassword.php
index 3463525a52995..69561b314a007 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertIncorrectUserPassword.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertIncorrectUserPassword.php
@@ -14,7 +14,7 @@
  */
 class AssertIncorrectUserPassword extends AbstractConstraint
 {
-    const ERROR_MESSAGE = 'You have entered an invalid password for current user.';
+    const ERROR_MESSAGE = 'The password entered for the current user is invalid. Verify the password and try again.';
 
     /**
      * Asserts that invalid password message equals to expected message.
@@ -25,7 +25,7 @@ class AssertIncorrectUserPassword extends AbstractConstraint
     public function processAssert(Dashboard $dashboard)
     {
         $errorMessage = $dashboard->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $errorMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
index c54955b54ab8b..770ca095eee7f 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
@@ -30,7 +30,7 @@ public function processAssert(
     ) {
         $filter = ['rolename' => $role->hasData('rolename') ? $role->getRoleName() : $roleInit->getRoleName()];
         $rolePage->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $rolePage->getRoleGrid()->isRowVisible($filter),
             'Role with name \'' . $filter['rolename'] . '\' is absent in Roles grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
index 973abd63463bb..9642bd05aa383 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
@@ -28,7 +28,7 @@ public function processAssert(
     ) {
         $filter = ['rolename' => $role->getRoleName()];
         $rolePage->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $rolePage->getRoleGrid()->isRowVisible($filter),
             'Role with name \'' . $role->getRoleName() . '\' is present in Roles grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
index 1fea1e42c63cc..48333ab540680 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertRoleSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(UserRoleIndex $rolePage)
     {
         $successMessage = $rolePage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
index 18249e72ba203..4625f4ce86d1e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertRoleSuccessSaveMessage extends AbstractConstraint
     public function processAssert(UserRoleIndex $rolePage)
     {
         $successMessage = $rolePage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
index 19a8c02d5b63f..cad6e2aa28d2b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
@@ -25,7 +25,7 @@ class AssertUserDuplicateMessage extends AbstractConstraint
     public function processAssert(UserEdit $userEdit)
     {
         $failedMessage = $userEdit->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::ERROR_MESSAGE,
             $failedMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginByPermissionMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginByPermissionMessage.php
index 749075f699dde..7b7f981b2635b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginByPermissionMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginByPermissionMessage.php
@@ -15,7 +15,7 @@
  */
 class AssertUserFailedLoginByPermissionMessage extends AbstractConstraint
 {
-    const FAILED_LOGIN_MESSAGE = 'You need more permissions to access this.';
+    const FAILED_LOGIN_MESSAGE = 'More permissions are needed to access this.';
 
     /**
      * Verify incorrect credentials message while login to admin.
@@ -30,7 +30,7 @@ public function processAssert(AdminAuthLogin $adminAuth, User $customAdmin)
         $adminAuth->getLoginBlock()->fill($customAdmin);
         $adminAuth->getLoginBlock()->submit();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::FAILED_LOGIN_MESSAGE,
             $adminAuth->getMessagesBlock()->getErrorMessage(),
             'Message "' . self::FAILED_LOGIN_MESSAGE . '" is not visible.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php
index 8de16b494b4dc..3aa4e6c21651c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php
@@ -15,7 +15,8 @@
  */
 class AssertUserFailedLoginMessage extends AbstractConstraint
 {
-    const FAILED_LOGIN_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
+    const FAILED_LOGIN_MESSAGE =
+        'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.';
 
     /**
      * Verify incorrect credentials message while login to admin
@@ -32,7 +33,7 @@ public function processAssert(
         $adminAuth->getLoginBlock()->fill($customAdmin);
         $adminAuth->getLoginBlock()->submit();
 
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::FAILED_LOGIN_MESSAGE,
             $adminAuth->getMessagesBlock()->getErrorMessage(),
             'Message "' . self::FAILED_LOGIN_MESSAGE . '" is not visible.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
index aa70058aaf667..26aa33d89c1d4 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
@@ -27,7 +27,7 @@ public function processAssert(UserIndex $userIndex, User $user)
         $filter = ['username' => $user->getUsername()];
 
         $userIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $userIndex->getUserGrid()->isRowVisible($filter),
             'User with name \'' . $user->getUsername() . '\' is absent in User grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailHostnameMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailHostnameMessage.php
index 50bc4cede3e16..9e590f588c064 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailHostnameMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailHostnameMessage.php
@@ -34,7 +34,7 @@ public function processAssert(UserEdit $userEdit, User $user)
         $hostname = substr($email, strpos($email, '@')+1);
         $expectedMessage = sprintf(self::ERROR_MESSAGE, $hostname, $email);
         $actualMessage = $userEdit->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
index 348eca18051b8..2f68d3ceab01d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
@@ -32,7 +32,7 @@ public function processAssert(UserEdit $userEdit, User $user)
     {
         $expectedMessage = sprintf(self::ERROR_MESSAGE, $user->getEmail());
         $actualMessage = $userEdit->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $expectedMessage,
             $actualMessage,
             'Wrong error message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
index 18aadc7b5536f..9033c2f165054 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
@@ -28,7 +28,7 @@ public function processAssert(
     ) {
         $filter = ['username' => $user->getUsername()];
         $userIndex->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $userIndex->getUserGrid()->isRowVisible($filter),
             'User with name \'' . $user->getUsername() . '\' is present in Users grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php
index 5014900ac89c1..adff2de77370b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPasswordChangedSuccessfully.php
@@ -28,7 +28,7 @@ class AssertUserPasswordChangedSuccessfully extends AbstractConstraint
     public function processAssert(UserIndex $userIndex)
     {
         $errorMessage = $userIndex->getMessagesBlock()->getErrorMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::FAIL_MESSAGE,
             $errorMessage,
             'Password update failed with error: "' . self::FAIL_MESSAGE . '"'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPermissionsOnlyConfigurationIndexPage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPermissionsOnlyConfigurationIndexPage.php
index ed8636ec8cfeb..a974d8bf40b6d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPermissionsOnlyConfigurationIndexPage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserPermissionsOnlyConfigurationIndexPage.php
@@ -37,7 +37,7 @@ public function processAssert(
         $adminAuth->getLoginBlock()->fill($customAdmin);
         $adminAuth->getLoginBlock()->submit();
         $configIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $configIndex->getAdminForm()->isEmpty(),
             "Form isn't empty."
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
index 558c1f224a1ee..f7c56ae1b9653 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
@@ -16,7 +16,7 @@
  */
 class AssertUserRoleRestrictedAccess extends AbstractConstraint
 {
-    const DENIED_ACCESS = 'Access denied';
+    const DENIED_ACCESS = 'Sorry, you need permissions to view this content.';
 
     /**
      * Asserts that user has only related permissions.
@@ -41,11 +41,11 @@ public function processAssert(
         )->run();
 
         $menuItems = $dashboard->getMenuBlock()->getTopMenuItems();
-        \PHPUnit_Framework_Assert::assertEquals($menuItems, $restrictedAccess, 'Wrong display menu.');
+        \PHPUnit\Framework\Assert::assertEquals($menuItems, $restrictedAccess, 'Wrong display menu.');
 
         $browser->open($_ENV['app_backend_url'] . $denyUrl);
         $deniedMessage = $dashboard->getAccessDeniedBlock()->getTextFromAccessDeniedBlock();
-        \PHPUnit_Framework_Assert::assertEquals(self::DENIED_ACCESS, $deniedMessage, 'Possible access to denied page.');
+        \PHPUnit\Framework\Assert::assertEquals(self::DENIED_ACCESS, $deniedMessage, 'Possible access to denied page.');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
index a53440976dfb6..5dfd2bb9842fb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
@@ -29,7 +29,7 @@ class AssertUserSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(UserIndex $userIndex)
     {
         $successMessage = $userIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
index cc8a8b44f9dfb..8b36c437772e9 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
@@ -28,7 +28,7 @@ public function processAssert(
     ) {
         $dashboard->getAdminPanelHeader()->logOut();
         $isLoginBlockVisible = $adminAuth->getLoginBlock()->isVisible();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $isLoginBlockVisible,
             'Admin user was not logged out.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index 2d91dc84f5d4b..c0c04628f744d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -28,7 +28,7 @@ public function processAssert(User $user, Dashboard $dashboard)
             \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
             ['user' => $user]
         )->run();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $dashboard->getAdminPanelHeader()->isLoggedIn(),
             'Admin user was not logged in.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
index 15b2cecbb3996..ccb8f73d20de2 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertUserSuccessSaveMessage extends AbstractConstraint
     public function processAssert(UserIndex $userIndex)
     {
         $successMessage = $userIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $successMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php
index 9aaac5b17a4ca..65662e5405126 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.php
@@ -21,7 +21,8 @@
  * Steps:
  * 1. Open Magento admin user login page.
  * 2. Enter incorrect password specified number of times.
- * 3. "You did not sign in correctly or your account is temporarily disabled." appears after each login attempt.
+ * 3. "The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
+ *    appears after each login attempt.
  * 4. Perform all assertions.
  *
  * @group AuthN_&_AuthZ
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
index 1f1530b08b28a..224ccbce10f96 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
@@ -17,7 +17,6 @@
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
         </variation>
         <variation name="UpdateAdminUserRoleEntityTestVariation2">
-            <data name="issue" xsi:type="string">MAGETWO-65658: [FT] User with restricted access can't log in to Admin in UpdateAdminUserEntityTest</data>
             <data name="user/dataset" xsi:type="string">default</data>
             <data name="role/data/resource_access" xsi:type="string">Custom</data>
             <data name="role/data/roles_resources" xsi:type="string">Sales</data>
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 8faab8e751f16..4f7e6deed7a85 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/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableForm.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableForm.php
index b6bd235bcfd74..8f37a8e2175a2 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableForm.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableForm.php
@@ -67,13 +67,13 @@ public function processAssert(
 
         $formData = $systemVariableNew->getSystemVariableForm()->getData();
         $errors = $this->verifyData($dataOrigin, $formData);
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
 
         if ($storeOrigin !== null) {
             $systemVariableNew->getFormPageActions()->selectStoreView($storeOrigin->getName());
             $formData = $systemVariableNew->getSystemVariableForm()->getData();
             $errors = $this->verifyData($data, $formData);
-            \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+            \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInGrid.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInGrid.php
index b5413132d4f83..8ae0233e9e9ce 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInGrid.php
@@ -37,7 +37,7 @@ public function processAssert(
         ];
 
         $systemVariableIndexNew->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $systemVariableIndexNew->getSystemVariableGrid()->isRowVisible($filter),
             'Custom Variable with code \'' . $filter['code'] . '\' is absent in Custom Variable grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInPage.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInPage.php
index af5ceaab25972..0bdd9a32ee77f 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInPage.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableInPage.php
@@ -105,7 +105,7 @@ protected function getHtmlValue(SystemVariable $customVariable, SystemVariable $
      */
     protected function checkVariable($htmlValue, $pageContent)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $htmlValue,
             $pageContent,
             'Wrong content is displayed on frontend page'
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
index 6a38cf1295abc..63d57516ffa2c 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
@@ -31,7 +31,7 @@ public function processAssert(
         $cmsPageForm = $cmsPageNew->getPageForm();
         $variables = $cmsPageForm->getSystemVariables();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             in_array($customVariableName, $variables),
             'Custom System Variable "' . $customVariableName . '" is present in Cms Page Form.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInGrid.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInGrid.php
index efb16861d19b6..3f345d584f772 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableNotInGrid.php
@@ -32,7 +32,7 @@ public function processAssert(
         ];
 
         $systemVariableIndexNew->open();
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $systemVariableIndexNew->getSystemVariableGrid()->isRowVisible($filter),
             'Custom System Variable with code \'' . $filter['code'] . '\' is present in System Variable grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableRestrictedAccess.php
index 0866030868699..4f08ddaf4429d 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableRestrictedAccess.php
@@ -29,7 +29,7 @@ public function processAssert(
         $systemVariable->persist();
         $cmsPageNew->open();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsPageNew->getPageForm()->isVariablesBlockVisible(),
             'Access to system variables block is supposed to be restricted.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
index 38ba795940f21..75846692e2ca3 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
@@ -25,7 +25,7 @@ class AssertCustomVariableSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(SystemVariableIndex $systemVariableIndexPage)
     {
         $actualMessage = $systemVariableIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_DELETE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
index 47b955e540cbf..feac7197b4ee4 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
@@ -25,7 +25,7 @@ class AssertCustomVariableSuccessSaveMessage extends AbstractConstraint
     public function processAssert(SystemVariableIndex $systemVariableIndexPage)
     {
         $actualMessage = $systemVariableIndexPage->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_SAVE_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertCreditCardNotPresentOnCheckout.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertCreditCardNotPresentOnCheckout.php
index a839ce903a176..7aa4c89d53025 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertCreditCardNotPresentOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertCreditCardNotPresentOnCheckout.php
@@ -24,7 +24,7 @@ public function processAssert(
         CheckoutOnepage $checkoutOnepage,
         $deletedCreditCard
     ) {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutOnepage->getVaultPaymentBlock()->isSavedCreditCardPresent($deletedCreditCard),
             'Credit card is present on checkout.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php
index 94df63d4fad88..9d5725dd69c00 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertSaveCreditCardOptionNotPresent.php
@@ -22,7 +22,7 @@ class AssertSaveCreditCardOptionNotPresent extends AbstractConstraint
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage, $payment)
     {
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $checkoutOnepage->getVaultPaymentBlock()->isVaultVisible($payment),
             'Save for later use checkbox is present.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php
index dc272a6f140aa..042541cfb2983 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Constraint/AssertStoredPaymentDeletedMessage.php
@@ -25,7 +25,7 @@ class AssertStoredPaymentDeletedMessage extends AbstractConstraint
      */
     public function processAssert(StoredPaymentMethods $storedPaymentMethods)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $storedPaymentMethods->getMessagesBlock()->getSuccessMessage(),
             'Message of success deletion of stored payment method is not present or wrong.'
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php
index c676336362395..324f1921088a0 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Constraint/AssertFptApplied.php
@@ -83,7 +83,7 @@ public function processAssert(
         $this->clearShoppingCart();
         $actualPrices = $this->getPrices($product);
         //Prices verification
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $prices,
             $actualPrices,
             'Prices on front should be equal to defined in dataset'
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
index 7f7741d2f1c13..25acb75ee134f 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
@@ -97,7 +97,7 @@
         </variation>
         <variation name="CreateTaxWithFptTestVariation5" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
             <data name="tag" xsi:type="string">to_maintain:yes</data>
-            <data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax</data>
+            <data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax</data>
             <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl</data>
             <data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
             <data name="prices/category_price" xsi:type="string">70.00</data>
@@ -117,7 +117,7 @@
             <constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
         </variation>
         <variation name="CreateTaxWithFptTestVariation6" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
-            <data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax</data>
+            <data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax</data>
             <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax</data>
             <data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
             <data name="prices/category_price" xsi:type="string">86.60</data>
@@ -173,7 +173,7 @@
             <constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
         </variation>
         <variation name="CreateTaxWithFptTestVariation9" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
-            <data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax</data>
+            <data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with special price and catalog price Including Tax</data>
             <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl</data>
             <data name="productData" xsi:type="string">with_special_price_and_fpt</data>
             <data name="prices/category_price" xsi:type="string">92.38</data>
@@ -193,7 +193,7 @@
             <constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
         </variation>
         <variation name="CreateTaxWithFptTestVariation10" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
-            <data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax</data>
+            <data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with special price and catalog price Including Tax</data>
             <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_incl</data>
             <data name="productData" xsi:type="string">with_special_price_and_fpt</data>
             <data name="prices/category_price" xsi:type="string">101.62</data>
@@ -210,7 +210,7 @@
         </variation>
         <variation name="CreateTaxWithFptTestVariation11" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
             <data name="issue" xsi:type="string">MAGETWO-44968: FPT Final price includes tax on custom option, when display is set to excluding tax</data>
-            <data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax</data>
+            <data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with custom option and catalog price Including Tax</data>
             <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl</data>
             <data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
             <data name="prices/category_price" xsi:type="string">64.67</data>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertProductInCatalogNewProductsList.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertProductInCatalogNewProductsList.php
index 7377dd4c7ab8d..693c9072f894a 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertProductInCatalogNewProductsList.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertProductInCatalogNewProductsList.php
@@ -53,7 +53,7 @@ public function processAssert(
 
         $cmsIndex->open();
 
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit\Framework\Assert::assertContains(
             $product->getName(),
             $this->catalogCategoryView->getViewBlock()->getProductsFromCatalogNewProductsListBlock(),
             'Product is absent on Catalog New Products List block on Category page.'
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php
index 00b19b7a98504..3e56f12298e4c 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php
@@ -30,7 +30,7 @@ public function processAssert(array $widgets, WidgetInstanceIndex $widgetInstanc
         }
         $widgetInstanceIndex->open();
         $actualValues = $widgetInstanceIndex->getWidgetGrid()->getThemeIdValues();
-        \PHPUnit_Framework_Assert::assertEmpty(
+        \PHPUnit\Framework\Assert::assertEmpty(
             array_diff($expectedValues, $actualValues),
             'Widget grid theme filter doesn\'t contain all possible values from created widgets.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
index 7e6d7bc540f0e..ff3007d009b84 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
@@ -37,7 +37,7 @@ public function processAssert(
         }
         $cmsIndex->open();
         $widgetText = $widget->getParameters()['anchor_text'];
-        \PHPUnit_Framework_Assert::assertFalse(
+        \PHPUnit\Framework\Assert::assertFalse(
             $cmsIndex->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget is present on Home page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
index a547c04d60dbf..52efd2f850e32 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
@@ -44,21 +44,21 @@ public function processAssert(
         $cmsIndex->open();
         $widgetText = $widget->getParameters()['anchor_text'];
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget with type catalog category link is absent on Home page.'
         );
 
         $cmsIndex->getWidgetView()->clickToWidget($widget, $widgetText);
         $title = $categoryView->getTitleBlock()->getTitle();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $widget->getParameters()['entities'][0]->getName(),
             $title,
             'Wrong category title.'
         );
 
         $cmsIndex->getFooterBlock()->openAdvancedSearch();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget with type catalog category link is absent on Advanced Search page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogNewProductsList.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogNewProductsList.php
index 3a3eb7cf51b26..3f67b7f98a340 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogNewProductsList.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogNewProductsList.php
@@ -59,11 +59,11 @@ public function processAssert(
         $cmsIndex->open();
         $categoryName = $widget->getWidgetInstance()[0]['entities']->getName();
         $cmsIndex->getTopmenu()->selectCategoryByName($categoryName);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogCategoryView->getWidgetView()->isWidgetVisible($widget, 'New Products'),
             'Widget is absent on Category page.'
         );
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $products,
             $this->catalogCategoryView->getViewBlock()->getProductsFromCatalogNewProductsListBlock(),
             'There are wrong products or products are absent on Catalog New Products List block on Category page.'
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
index 411c15732f2ee..0aa6d39497a43 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
@@ -12,13 +12,13 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Check that created widget displayed on frontent on Home page and on Advanced Search and
+ * Check that created widget displayed on frontend on Home page and on Advanced Search and
  * after click on widget link on frontend system redirects you to cms page.
  */
 class AssertWidgetCmsPageLink extends AbstractConstraint
 {
     /**
-     * Assert that created widget displayed on frontent on Home page and on Advanced Search and
+     * Assert that created widget displayed on frontend on Home page and on Advanced Search and
      * after click on widget link on frontend system redirects you to cms page.
      *
      * @param CmsIndex $cmsIndex
@@ -36,7 +36,7 @@ public function processAssert(
 
         $cmsIndex->open();
         $widgetText = $widget->getParameters()['anchor_text'];
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget with type CmsPageLink is absent on Home page.'
         );
@@ -46,14 +46,14 @@ public function processAssert(
             $widget->getParameters()['entities'][0]->getContentHeading();
         $cmsIndex->getWidgetView()->clickToWidget($widget, $widgetText);
         $pageTitle = $cmsIndex->getCmsPageBlock()->getPageTitle();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $title,
             $pageTitle,
             'Wrong page title on Cms page.'
         );
 
         $cmsIndex->getFooterBlock()->openAdvancedSearch();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $cmsIndex->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget with type CmsPageLink is absent on Advanced Search page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
index ea71bed02b879..edde87f6b3ada 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
@@ -33,7 +33,7 @@ public function processAssert(Widget $widget, WidgetInstanceIndex $widgetInstanc
     {
         $filter = ['title' => $widget->getTitle(), 'theme_id' => $widget->getThemeId()];
         $widgetInstanceIndex->open();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $widgetInstanceIndex->getWidgetGrid()->isRowVisible($filter),
             'Widget with title \'' . $widget->getTitle() . '\' is absent in Widget grid.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
index 3c483208bf74d..8aac883984409 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
@@ -47,7 +47,7 @@ public function processAssert(
             $widgetText = $widget->getParameters()['anchor_text'];
         }
         $cmsIndex->getTopmenu()->selectCategoryByName($categoryName);
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $catalogCategoryView->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget is absent on Category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
index db911e7bf4de7..d60043e4c9efd 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
@@ -39,7 +39,7 @@ public function processAssert(
         $browser->open($_ENV['app_frontend_url'] . $urlKey . '.html');
         $widgetText = $widget->getParameters()['link_text'];
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $productView->getWidgetView()->isWidgetVisible($widget, $widgetText),
             'Widget is absent on Product page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
index 3f09eb64d9bfc..a31bc6b4a9b47 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
@@ -39,7 +39,7 @@ public function processAssert(
         $cmsIndex->getTopmenu()->selectCategoryByName($widget->getWidgetInstance()[0]['entities']->getName());
         $cmsIndex->getWidgetView()->clickToWidget($widget, $widget->getParameters()['anchor_text']);
         $title = $productView->getTitleBlock()->getTitle();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $widget->getParameters()['entities'][0]->getName(),
             $title,
             'Wrong product title.'
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php
index 667972ff5e8d2..5a67fe43a691b 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyComparedProducts.php
@@ -89,7 +89,7 @@ public function processAssert(
         $this->addProducts($products);
         $this->removeCompareProducts();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->catalogProductCompare->getWidgetView()->isWidgetVisible($widget, 'Recently Compared'),
             'Widget is absent on Product Compare page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
index 90d166f483b66..e6c25fdc52ed5 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
@@ -16,7 +16,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Check that that widget with type Recently Viewed Products is present on category page
+ * Check that widget with type Recently Viewed Products is present on category page
  */
 class AssertWidgetRecentlyViewedProducts extends AbstractConstraint
 {
@@ -108,7 +108,7 @@ protected function checkRecentlyViewedBlockOnCategory(
         $this->cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
 
         $products = $this->catalogCategoryView->getViewBlock()->getProductsFromRecentlyViewedBlock();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             in_array($productSimple->getName(), $products),
             'Product' . $productSimple->getName() . ' is absent on Recently Viewed block on Category page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
index 29e6730677fcc..d8858e8c78cc2 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
@@ -32,7 +32,7 @@ class AssertWidgetSuccessDeleteMessage extends AbstractConstraint
     public function processAssert(WidgetInstanceIndex $widgetInstanceIndex)
     {
         $actualMessage = $widgetInstanceIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::DELETE_MESSAGE,
             $actualMessage,
             'Wrong widget success delete message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
index 88f79da97bf32..8b9a245ad79f2 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
@@ -32,7 +32,7 @@ class AssertWidgetSuccessSaveMessage extends AbstractConstraint
     public function processAssert(WidgetInstanceIndex $widgetInstanceIndex)
     {
         $actualMessage = $widgetInstanceIndex->getMessagesBlock()->getSuccessMessage();
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $actualMessage,
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
index 7077def5a4a25..1a024eefe162d 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php
@@ -244,14 +244,22 @@ protected function preparePagesGroup(array $widgetInstancePageGroup)
      */
     protected function getThemeId($title)
     {
-        $filter = base64_encode('theme_title=' . $title);
-        $url = $_ENV['app_backend_url'] . 'admin/system_design_theme/grid/filter/' . $filter;
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'design_theme_listing',
+            'filters' => [
+                'placeholder' => true,
+                'theme_title' => $title
+            ],
+            'isAjax' => true
+        ];
         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
-        $curl->write($url, [], CurlInterface::GET);
+
+        $curl->write($url, $data, CurlInterface::POST);
         $response = $curl->read();
         $curl->close();
 
-        preg_match('/<tr data-role="row" title="[^"]+system_design_theme\/edit\/id\/([\d]+)\/"/', $response, $match);
+        preg_match('/design_theme_listing_data_source.+items.+"theme_id":"(\d+)"/', $response, $match);
         return empty($match[1]) ? null : $match[1];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index a872233271cce..5548443b50c40 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -85,6 +85,20 @@ class Product extends Form
      */
     protected $priceInGrid = '.products-grid .price';
 
+    /**
+     * Locator value for item Regular Price.
+     *
+     * @var string
+     */
+    private $regularPrice = '.old-price [data-price-type="oldPrice"] .price';
+
+    /**
+     * Locator value for item Regular Price Label.
+     *
+     * @var string
+     */
+    private $regularPriceLabel = '.old-price .price-label';
+
     /**
      * Fill item with details.
      *
@@ -170,17 +184,51 @@ public function hoverProductBlock()
     }
 
     /**
-     * Returns product price
+     * Returns product price.
+     *
+     * @param string $currency
+     * @return string
+     */
+    public function getPrice(string $currency = '$'): string
+    {
+        return $this->getPriceBySelector($this->price, $currency);
+    }
+
+    /**
+     * Returns product regular price.
+     *
+     * @param string $currency
+     * @return string
+     */
+    public function getRegularPrice(string $currency = '$'): string
+    {
+        return $this->getPriceBySelector($this->regularPrice, $currency);
+    }
+
+    /**
+     * Returns product price by selector.
      *
+     * @param string $selector
      * @param string $currency
      * @return string
      */
-    public function getPrice($currency = '$')
+    private function getPriceBySelector(string $selector, string $currency = '$'): string
     {
-        $price = $this->_rootElement->find($this->price)->getText();
+        $price = $this->_rootElement->find($selector)->getText();
+
         return str_replace($currency, '', $price);
     }
 
+    /**
+     * Returns product regular price label.
+     *
+     * @return string
+     */
+    public function getPriceLabel(): string
+    {
+        return (string)$this->_rootElement->find($this->regularPriceLabel)->getText();
+    }
+
     /**
      * Get Wish List data for the Product.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
index ba9fe67b5eb4c..803bee65fcdf4 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
@@ -16,6 +16,11 @@
  */
 abstract class AbstractAssertWishlistProductDetails extends AbstractAssertForm
 {
+    /**
+     * @inheritdoc
+     */
+    protected $skippedFields = ['sku'];
+
     /**
      * Assert product details.
      *
@@ -38,6 +43,6 @@ protected function assertProductDetails(
             $this->sortDataByPath($expectedOptions, '::title'),
             $this->sortDataByPath($actualOptions, '::title')
         );
-        \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
index afa176cc24b1d..37859c0663517 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
@@ -34,7 +34,7 @@ class AssertAddProductToWishlistSuccessMessage extends AbstractConstraint
      */
     public function processAssert(WishlistIndex $wishlistIndex, InjectableFixture $product)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_MESSAGE, $product->getName()),
             $wishlistIndex->getMessagesBlock()->getSuccessMessage(),
             "Expected success message doesn't match actual."
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertCustomerWishlistOnBackendIsEmpty.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertCustomerWishlistOnBackendIsEmpty.php
index 1ae368480e0a5..f83719b0be6b4 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertCustomerWishlistOnBackendIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertCustomerWishlistOnBackendIsEmpty.php
@@ -24,7 +24,7 @@ public function processAssert(OrderCreateIndex $orderCreateIndex)
     {
         $orderCreateIndex->open();
         $orderCreateIndex->getSidebarWishlistBlock()->isSectionEmpty();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $orderCreateIndex->getSidebarWishlistBlock()->isSectionEmpty(),
             "Assert that customer's Wish List section on Order Create backend page is not empty."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
index 76a1a40140f50..bb2a65710502a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
@@ -30,7 +30,7 @@ class AssertMoveProductToWishlistSuccessMessage extends AbstractConstraint
      */
     public function processAssert(WishlistIndex $wishlistIndex, InjectableFixture $product)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             sprintf(self::SUCCESS_MESSAGE, $product->getName()),
             $wishlistIndex->getMessagesBlock()->getSuccessMessage(),
             "Expected success move to wish list message doesn't match actual."
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
index b30d54af53198..3dc486222bce6 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
@@ -30,7 +30,7 @@ public function processAssert(CustomerIndexEdit $customerIndexEdit, FixtureInter
 
         /** @var Grid $wishlistGrid */
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $wishlistGrid->isRowVisible($filter),
             'Product ' . $product->getName() . ' is absent in grid with configure option.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
index 815c212e072e8..4a573e73188a9 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
@@ -40,7 +40,7 @@ public function processAssert(
         /** @var \Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid $wishlistGrid */
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $wishlistGrid->isRowVisible(['product_name' => $product->getName()]),
             $product->getName() . " is not visible in customer wishlist on backend."
         );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
index a8ff08ce48c1a..ae994f84c47f7 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
@@ -32,10 +32,11 @@ public function processAssert(
         WishlistIndex $wishlistIndex,
         InjectableFixture $product
     ) {
+        $cmsIndex->open();
         $cmsIndex->getLinksBlock()->openLink('My Account');
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
 
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)->isVisible(),
             $product->getName() . ' is not visible on Wish List page.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductPriceIsNotZero.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductPriceIsNotZero.php
index 57cafc2e3fd1b..21f0e865a4340 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductPriceIsNotZero.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductPriceIsNotZero.php
@@ -28,7 +28,7 @@ public function processAssert(
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
         $wishlistItem = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product);
 
-        \PHPUnit_Framework_Assert::assertNotEquals(
+        \PHPUnit\Framework\Assert::assertNotEquals(
             '0.00',
             $wishlistItem->getPrice(),
             $product->getName() . ' has zero price on Wish List page.'
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
new file mode 100644
index 0000000000000..68e30e13558ca
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Constraint;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Customer\Test\Page\CustomerAccountIndex;
+use Magento\Wishlist\Test\Page\WishlistIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
+use Magento\Bundle\Test\Fixture\BundleProduct;
+
+/**
+ * Asserts that correct product regular price is displayed in default wishlist.
+ */
+class AssertProductRegularPriceOnStorefront extends AbstractConstraint
+{
+    /**
+     * @var string
+     */
+    private $regularPriceLabel = 'Regular Price';
+
+    /**
+     * Asserts that correct product regular price is displayed in default wishlist.
+     *
+     * @param CmsIndex             $cmsIndex
+     * @param CustomerAccountIndex $customerAccountIndex
+     * @param WishlistIndex        $wishlistIndex
+     * @param InjectableFixture    $product
+     * @return void
+     */
+    public function processAssert(
+        CmsIndex $cmsIndex,
+        CustomerAccountIndex $customerAccountIndex,
+        WishlistIndex $wishlistIndex,
+        InjectableFixture $product
+    ) {
+        $cmsIndex->open();
+        $cmsIndex->getLinksBlock()->openLink('My Account');
+        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
+
+        $productRegularPrice = 0;
+        if ($product instanceof GroupedProduct) {
+            $associatedProducts = $product->getAssociated();
+
+            /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $associatedProduct */
+            foreach ($associatedProducts['products'] as $key => $associatedProduct) {
+                $qty = $associatedProducts['assigned_products'][$key]['qty'];
+                $price = $associatedProduct->getPrice();
+                $productRegularPrice += $qty * $price;
+            }
+        } elseif ($product instanceof BundleProduct) {
+            $bundleSelection = (array)$product->getBundleSelections();
+            foreach ($bundleSelection['products'] as $bundleOption) {
+                $regularBundleProductPrice = 0;
+                /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $bundleProduct */
+                foreach ($bundleOption as $bundleProduct) {
+                    $checkoutData = $bundleProduct->getCheckoutData();
+                    $bundleProductPrice = $checkoutData['qty'] * $checkoutData['cartItem']['price'];
+                    if (0 === $regularBundleProductPrice) {
+                        $regularBundleProductPrice = $bundleProductPrice;
+                    } else {
+                        $regularBundleProductPrice = max([$bundleProductPrice, $regularBundleProductPrice]);
+                    }
+                }
+                $productRegularPrice += $regularBundleProductPrice;
+            }
+        } else {
+            $productRegularPrice = (float)$product->getPrice();
+        }
+
+        $productItem = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product);
+        $wishListProductRegularPrice = (float)$productItem->getRegularPrice();
+
+        \PHPUnit\Framework\Assert::assertEquals(
+            $this->regularPriceLabel,
+            $productItem->getPriceLabel(),
+            'Wrong product regular price is displayed.'
+        );
+
+        \PHPUnit\Framework\Assert::assertNotEmpty(
+            $wishListProductRegularPrice,
+            'Regular Price for "' . $product->getName() . '" is not correct.'
+        );
+
+        \PHPUnit\Framework\Assert::assertEquals(
+            $productRegularPrice,
+            $wishListProductRegularPrice,
+            'Wrong product regular price is displayed.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString(): string
+    {
+        return 'Product is displayed with correct regular price.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
index a558293f65462..861648b491bce 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
@@ -40,7 +40,7 @@ public function processAssert(
         $itemBlock = $wishlistIndex->getWishlistBlock()->getProductItemsBlock();
 
         foreach ($products as $itemProduct) {
-            \PHPUnit_Framework_Assert::assertFalse(
+            \PHPUnit\Framework\Assert::assertFalse(
                 $itemBlock->getItemProduct($itemProduct)->isVisible(),
                 'Product \'' . $itemProduct->getName() . '\' is present in Wish List on Frontend.'
             );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsPresentInCustomerBackendWishlist.php
index ec0f8ceeda8e2..28515240270e2 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsPresentInCustomerBackendWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsPresentInCustomerBackendWishlist.php
@@ -33,7 +33,7 @@ public function processAssert(
         $customerIndexEdit->getCustomerForm()->openTab('wishlist');
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTab('wishlist')->getSearchGridBlock();
         foreach ($products as $product) {
-            \PHPUnit_Framework_Assert::assertTrue(
+            \PHPUnit\Framework\Assert::assertTrue(
                 $wishlistGrid->isRowVisible(['product_name' => $product->getName()]),
                 $product->getName() . " is not visible in customer wishlist on backend."
             );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
index 9ef0f03c3c6d6..3901048e7d190 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
@@ -27,7 +27,7 @@ public function processAssert(CmsIndex $cmsIndex, WishlistIndex $wishlistIndex)
     {
         $cmsIndex->getCmsPageBlock()->waitPageInit();
         $cmsIndex->getLinksBlock()->openLink("My Wish List");
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $wishlistIndex->getWishlistBlock()->isEmptyBlockVisible(),
             'Wish List is not empty.'
         );
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
index 94b8dd000f60c..d73a479494cae 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
@@ -32,7 +32,7 @@ class AssertWishlistShareMessage extends AbstractConstraint
      */
     public function processAssert(WishlistIndex $wishlistIndex)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             self::SUCCESS_MESSAGE,
             $wishlistIndex->getMessagesBlock()->getSuccessMessage(),
             'Wrong success message is displayed.'
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
index 6931fdbf5c146..06b1a6078d5c7 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
@@ -59,5 +59,61 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductPriceIsNotZero" />
         </variation>
+        <variation name="AddProductToWishlistEntityTestVariation9" ticketId="MAGETWO-90131">
+            <data name="product" xsi:type="array">
+                <item name="0" xsi:type="string">catalogProductSimple::withSpecialPrice</item>
+            </data>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductRegularPriceOnStorefront"/>
+        </variation>
+        <variation name="AddProductToWishlistEntityTestVariation10" ticketId="MAGETWO-90131">
+            <data name="product" xsi:type="array">
+                <item name="0" xsi:type="string">catalogProductVirtual::product_with_special_price</item>
+            </data>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductRegularPriceOnStorefront"/>
+        </variation>
+        <variation name="AddProductToWishlistEntityTestVariation11" ticketId="MAGETWO-90131">
+            <data name="product" xsi:type="array">
+                <item name="0" xsi:type="string">
+                    downloadableProduct::with_two_separately_links_special_price_and_category
+                </item>
+            </data>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductRegularPriceOnStorefront"/>
+        </variation>
+        <variation name="AddProductToWishlistEntityTestVariation12" ticketId="MAGETWO-90131">
+            <data name="product" xsi:type="array">
+                <item name="0" xsi:type="string">groupedProduct::grouped_product_with_special_price</item>
+            </data>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductRegularPriceOnStorefront"/>
+        </variation>
+        <variation name="AddProductToWishlistEntityTestVariation13" ticketId="MAGETWO-90131">
+            <data name="product" xsi:type="array">
+                <item name="0" xsi:type="string">configurableProduct::product_with_special_price</item>
+            </data>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductRegularPriceOnStorefront"/>
+        </variation>
+        <variation name="AddProductToWishlistEntityTestVariation14" ticketId="MAGETWO-90131">
+            <data name="product" xsi:type="array">
+                <item name="0" xsi:type="string">bundleProduct::with_special_price_and_custom_options</item>
+            </data>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
+            <constraint name="Magento\Wishlist\Test\Constraint\AssertProductRegularPriceOnStorefront"/>
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
index fd80d385e4853..95e6a854ed266 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
@@ -37,7 +37,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation5">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="product/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -45,7 +44,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation6">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="product/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
index 6cdeb72adbff9..5a68ac1a63e8c 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
@@ -13,7 +13,7 @@
  * Class InjectableTests
  *
  */
-class InjectableTests extends \PHPUnit_Framework_TestSuite
+class InjectableTests extends \PHPUnit\Framework\TestSuite
 {
     /**
      * @var ObjectManager
@@ -21,35 +21,25 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
     protected $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_TestSuite
+     * @var \PHPUnit\Framework\TestSuite
      */
     protected $suite;
 
     /**
-     * @var \PHPUnit_Framework_TestResult
+     * @var \PHPUnit\Framework\TestResult
      */
     protected $result;
 
     /**
      * Run collected tests
      *
-     * @param \PHPUnit_Framework_TestResult $result
-     * @param bool $filter
-     * @param array $groups
-     * @param array $excludeGroups
-     * @param bool $processIsolation
-     *
-     * @return \PHPUnit_Framework_TestResult|void
+     * @param \PHPUnit\Framework\TestResult $result
+     * @return \PHPUnit\Framework\TestResult|void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function run(
-        \PHPUnit_Framework_TestResult $result = null,
-        $filter = false,
-        array $groups = [],
-        array $excludeGroups = [],
-        $processIsolation = false
-    ) {
+    public function run(\PHPUnit\Framework\TestResult $result = null)
+    {
         if ($result === null) {
             $this->result = $this->createResult();
         }
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
index 7eea71a955c4f..17578fcfe85b1 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic_green.xml
@@ -11,6 +11,7 @@
         <deny>
             <tag group="stable" value="no" />
             <tag group="to_maintain" value="yes" />
+            <tag group="mftf_migrated" value="yes" />
         </deny>
     </rule>
     <rule scope="testsuite">
@@ -23,6 +24,7 @@
         <deny>
             <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow" />
             <tag group="stable" value="no" />
+            <tag group="mftf_migrated" value="yes" />
             <tag group="to_maintain" value="yes" />
         </deny>
     </rule>
diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index 00c548e6b5cef..0b74dc6727a13 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -16,6 +16,3 @@
 
 $objectManager = \Magento\Mtf\ObjectManagerFactory::getObjectManager();
 \Magento\Mtf\ObjectManagerFactory::configure($objectManager);
-
-$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
diff --git a/dev/tests/functional/utils/command.php b/dev/tests/functional/utils/command.php
index cf19790aa8fed..8eaf82475a4e4 100644
--- a/dev/tests/functional/utils/command.php
+++ b/dev/tests/functional/utils/command.php
@@ -4,29 +4,20 @@
  * See COPYING.txt for license details.
  */
 
+require_once __DIR__ . '/../../../../app/bootstrap.php';
+
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\NullOutput;
+
 if (isset($_GET['command'])) {
-    $php = PHP_BINARY ?: (PHP_BINDIR ? PHP_BINDIR . '/php' : 'php');
     $command = urldecode($_GET['command']);
-    exec(escapeCommand($php . ' -f ../../../../bin/magento ' . $command));
+    $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
+    $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
+    $cli = $magentoObjectManager->create(\Magento\Framework\Console\Cli::class);
+    $input = new StringInput($command);
+    $input->setInteractive(false);
+    $output = new NullOutput();
+    $cli->doRun($input, $output);
 } else {
     throw new \InvalidArgumentException("Command GET parameter is not set.");
 }
-
-/**
- * Returns escaped command.
- *
- * @param string $command
- * @return string
- */
-function escapeCommand($command)
-{
-    $escapeExceptions = [
-        '> /dev/null &' => '--dev-null-amp--'
-    ];
-
-    $command = escapeshellcmd(
-        str_replace(array_keys($escapeExceptions), array_values($escapeExceptions), $command)
-    );
-
-    return str_replace(array_values($escapeExceptions), array_keys($escapeExceptions), $command);
-}
diff --git a/dev/tests/functional/utils/generate.php b/dev/tests/functional/utils/generate.php
index e9a81a1eea224..61bcc3523f551 100644
--- a/dev/tests/functional/utils/generate.php
+++ b/dev/tests/functional/utils/generate.php
@@ -3,19 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
 
 require_once dirname(__FILE__) . '/' . 'bootstrap.php';
 
-// Generate fixtures
-$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
-// Remove previously generated static classes
-$fs = $magentoObjectManager->create(Filesystem::class);
-$fs->getDirectoryWrite(DirectoryList::ROOT)->delete('dev/tests/functional/generated/');
+deleteDirectory(MTF_BP . '/generated');
+
+// Generate moduleSequence.json file
+generateModuleSequence();
 // Generate factories for old end-to-end tests
-$magentoObjectManager->create(\Magento\Mtf\Util\Generate\Factory::class)->launch();
+$objectManager->create(\Magento\Mtf\Util\Generate\Factory::class)->launch();
 
 $generatorPool = $objectManager->get('Magento\Mtf\Util\Generate\Pool');
 foreach ($generatorPool->getGenerators() as $generator) {
@@ -28,3 +24,28 @@
 }
 
 \Magento\Mtf\Util\Generate\GenerateResult::displayResults();
+
+
+function deleteDirectory($dir)
+{
+    if (!file_exists($dir)) {
+        return true;
+    }
+    if (!is_dir($dir)) {
+        return unlink($dir);
+    }
+    foreach (scandir($dir) as $item) {
+        if ($item == '.' || $item == '..') {
+            continue;
+        }
+        if (!deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) {
+            return false;
+        }
+    }
+    return rmdir($dir);
+}
+
+function generateModuleSequence()
+{
+    require_once "generate/moduleSequence.php";
+}
diff --git a/dev/tests/functional/utils/generate/fixture.php b/dev/tests/functional/utils/generate/fixture.php
index 9f454fb9dc5f1..68cdae4552261 100644
--- a/dev/tests/functional/utils/generate/fixture.php
+++ b/dev/tests/functional/utils/generate/fixture.php
@@ -5,6 +5,4 @@
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
-$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
 $objectManager->create(\Magento\Mtf\Util\Generate\Fixture::class)->launch();
diff --git a/dev/tests/functional/utils/generate/moduleSequence.php b/dev/tests/functional/utils/generate/moduleSequence.php
new file mode 100644
index 0000000000000..22688d1b75820
--- /dev/null
+++ b/dev/tests/functional/utils/generate/moduleSequence.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/../../../../../app/bootstrap.php';
+
+$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
+$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
+$magentoComponentSequence = $magentoObjectManager->create(\Magento\Framework\Module\ModuleList\Loader::class)->load();
+if (!file_exists(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'generated')) {
+    mkdir(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'generated');
+}
+file_put_contents(
+    dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'generated' . DIRECTORY_SEPARATOR . 'moduleSequence.json',
+    json_encode($magentoComponentSequence, JSON_PRETTY_PRINT)
+);
diff --git a/dev/tests/functional/utils/generate/repository.php b/dev/tests/functional/utils/generate/repository.php
index b2dc75c076f43..6633e776c9410 100644
--- a/dev/tests/functional/utils/generate/repository.php
+++ b/dev/tests/functional/utils/generate/repository.php
@@ -5,5 +5,4 @@
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
-$magentoObjectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
 $objectManager->create(\Magento\Mtf\Util\Generate\Repository::class)->launch();
diff --git a/dev/tests/functional/utils/generateFixtureXml.php b/dev/tests/functional/utils/generateFixtureXml.php
deleted file mode 100644
index 73fc266f34052..0000000000000
--- a/dev/tests/functional/utils/generateFixtureXml.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bootstrap.php';
-
-$magentoObjectManager->create(
-    \Magento\Mtf\Util\Generate\Fixture\SchemaXml::class,
-    ['objectManager' => $magentoObjectManager]
-)->launch();
diff --git a/dev/tests/functional/utils/log.php b/dev/tests/functional/utils/log.php
index b6c19458b10b9..68a68d4bad648 100644
--- a/dev/tests/functional/utils/log.php
+++ b/dev/tests/functional/utils/log.php
@@ -4,11 +4,16 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 if (!isset($_GET['name'])) {
-    throw new \InvalidArgumentException('The name of log file is required for getting logs.');
+    throw new \InvalidArgumentException(
+        'The name of log file is required for getting logs.'
+    );
 }
-
 $name = urldecode($_GET['name']);
-$file = file_get_contents('../../../../var/log/' . $name);
+if (preg_match('/\.\.(\\\|\/)/', $name)) {
+    throw new \InvalidArgumentException('Invalid log file name');
+}
 
-echo serialize($file);
+echo serialize(file_get_contents('../../../../var/log' .'/' .$name));
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/AsyncTestData.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/AsyncTestData.php
new file mode 100644
index 0000000000000..fc2fff50dff08
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/AsyncTestData.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class AsyncTestData
+{
+    /**
+     * @var $msgValue
+     */
+    protected $msgValue;
+
+    /**
+     * @var $path
+     */
+    protected $path;
+
+    /**
+     * set path to tmp directory.
+     *
+     * @param string $path
+     * @return void
+     */
+    public function setTextFilePath($path)
+    {
+        $this->path = $path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTextFilePath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * @param string $strValue
+     * @return void
+     */
+    public function setValue($strValue)
+    {
+        $this->msgValue = $strValue;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->msgValue;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/CustomHandler.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/CustomHandler.php
new file mode 100644
index 0000000000000..5cfb980a35fd3
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/CustomHandler.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class CustomHandler
+{
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function process($simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'custom-string-' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData[] $simpleDataItems
+     */
+    public function processArray($simpleDataItems)
+    {
+        foreach ($simpleDataItems as $objItem) {
+            file_put_contents(
+                $objItem->getTextFilePath(),
+                'custom-array-' . $objItem->getValue() . PHP_EOL,
+                FILE_APPEND
+            );
+        }
+    }
+
+    /**
+     * @param mixed $simpleDataItems
+     */
+    public function processMixed($simpleDataItems)
+    {
+        /** @var AsyncTestData[] $simpleDataItems */
+        $simpleDataItems = is_array($simpleDataItems) ? $simpleDataItems : [$simpleDataItems];
+        foreach ($simpleDataItems as $simpleDataItem) {
+            if (!($simpleDataItem instanceof AsyncTestData)) {
+                file_put_contents(
+                    $simpleDataItem->getTextFilePath(),
+                    'Invalid data item given. Was expected instance of ' . AsyncTestData::class . PHP_EOL,
+                    FILE_APPEND
+                );
+                continue;
+            }
+            file_put_contents(
+                $simpleDataItem->getTextFilePath(),
+                'custom-mixed-' . $simpleDataItem->getValue() . PHP_EOL,
+                FILE_APPEND
+            );
+        }
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/RequestHandler.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/RequestHandler.php
new file mode 100644
index 0000000000000..1090c3261fc3e
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/RequestHandler.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class RequestHandler
+{
+    /**
+     * @param \Magento\TestModuleAsyncAmqp\Model\AsyncTestData $simpleDataItem
+     */
+    public function process($simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'InvokedFromRequestHandler-' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/WildCardHandler.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/WildCardHandler.php
new file mode 100644
index 0000000000000..e5c1f25b52187
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/WildCardHandler.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class WildCardHandler
+{
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodOne(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodOne - wildcard.queue.one - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodTwo(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodTwo - wildcard.queue.two - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodThree(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodThree - wildcard.queue.three - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodFour(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodFour - wildcard.queue.four - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/communication.xml
new file mode 100644
index 0000000000000..c50bc3e35bea4
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/communication.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="multi.topic.queue.topic.c.deprecated" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqC" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.d.deprecated" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqD" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.c" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqC" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.d" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqD" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.y" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqC" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.z" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqD" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="mtmh.topic.1" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="mtmh.handler.1" type="Magento\TestModuleAsyncAmqp\Model\CustomHandler" method="process"/>
+    </topic>
+    <topic name="mtmh.topic.2" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData[]">
+        <handler name="mtmh.handler.2" type="Magento\TestModuleAsyncAmqp\Model\CustomHandler" method="processArray"/>
+    </topic>
+
+    <topic name="segment1.segment2.segment3.wildcard" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData"/>
+    <topic name="segment2.segment3.wildcard" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData"/>
+    <topic name="not.matching.wildcard.topic" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/module.xml
new file mode 100644
index 0000000000000..629a61d715cbc
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleAsyncAmqp" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue.xml
new file mode 100644
index 0000000000000..17895f1c796ce
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="multi.topic.queue.topic.c.deprecated" type="amqp" exchange="magento">
+        <queue consumer="queue.for.multiple.topics.test.c.deprecated" name="queue.for.multiple.topics.test.c.deprecated"/>
+        <queue consumer="mixed.sync.and.async.queue.consumer.deprecated" name="mixed.sync.and.async.queue.deprecated"/>
+    </broker>
+    <broker topic="multi.topic.queue.topic.d.deprecated" type="amqp" exchange="magento">
+        <queue consumer="queue.for.multiple.topics.test.d.deprecated" name="queue.for.multiple.topics.test.d.deprecated"/>
+    </broker>
+</config>
+
+
+
+
+
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..5416452ca664f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml
@@ -0,0 +1,21 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="queue.for.multiple.topics.test.c" queue="queue.for.multiple.topics.test.c"/>
+    <consumer name="queue.for.multiple.topics.test.d" queue="queue.for.multiple.topics.test.d"/>
+    <consumer name="queue.for.multiple.topics.test.y" queue="queue.for.multiple.topics.test.y"/>
+    <consumer name="queue.for.multiple.topics.test.z" queue="queue.for.multiple.topics.test.z"/>
+    <consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue"/>
+    <consumer name="mtmh.queue.1.consumer" queue="mtmh.queue.1" handler="Magento\TestModuleAsyncAmqp\Model\CustomHandler::processMixed"/>
+    <consumer name="mtmh.queue.2.consumer" queue="mtmh.queue.2"/>
+
+    <consumer name="wildcard.queue.one.consumer" queue="wildcard.queue.one" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodOne"/>
+    <consumer name="wildcard.queue.two.consumer" queue="wildcard.queue.two" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodTwo"/>
+    <consumer name="wildcard.queue.three.consumer" queue="wildcard.queue.three" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodThree"/>
+    <consumer name="wildcard.queue.four.consumer" queue="wildcard.queue.four" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodFour"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..c6ea325a4f9e3
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml
@@ -0,0 +1,19 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="multi.topic.queue.topic.c"/>
+    <publisher topic="multi.topic.queue.topic.d"/>
+    <publisher topic="multi.topic.queue.topic.y"/>
+    <publisher topic="multi.topic.queue.topic.z"/>
+    <publisher topic="mtmh.topic.1"/>
+    <publisher topic="mtmh.topic.2"/>
+
+    <publisher topic="segment1.segment2.segment3.wildcard"/>
+    <publisher topic="segment2.segment3.wildcard"/>
+    <publisher topic="not.matching.wildcard.topic"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_topology.xml
new file mode 100644
index 0000000000000..a4aa46e7fad76
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_topology.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento" connection="amqp" type="topic">
+        <binding id="async.binding1" topic="multi.topic.queue.topic.c" destinationType="queue" destination="queue.for.multiple.topics.test.c"/>
+        <binding id="async.binding2" topic="multi.topic.queue.topic.c" destinationType="queue" destination="mixed.sync.and.async.queue"/>
+        <binding id="async.binding3" topic="multi.topic.queue.topic.d" destinationType="queue" destination="queue.for.multiple.topics.test.d"/>
+        <binding id="async.binding4" topic="mtmh.topic.1" destinationType="queue" destination="mtmh.queue.1"/>
+        <binding id="async.binding5" topic="mtmh.topic.1" destinationType="queue" destination="mtmh.queue.2"/>
+        <binding id="async.binding6" topic="mtmh.topic.2" destinationType="queue" destination="mtmh.queue.1"/>
+        <binding id="async.binding7" topic="mtmh.topic.2" destinationType="queue" destination="mtmh.queue.2"/>
+        <binding id="async.binding8" topic="multi.topic.queue.topic.y" destinationType="queue" destination="queue.for.multiple.topics.test.y"/>
+        <binding id="async.binding9" topic="multi.topic.queue.topic.z" destinationType="queue" destination="queue.for.multiple.topics.test.z"/>
+
+        <binding id="wildCardBinding1" topic="#.wildcard" destinationType="queue" destination="wildcard.queue.one"/>
+        <binding id="wildCardBinding2" topic="*.*.segment3.wildcard" destinationType="queue" destination="wildcard.queue.two"/>
+        <binding id="wildCardBinding3" topic="*.segment3.wildcard" destinationType="queue" destination="wildcard.queue.three"/>
+        <binding id="wildCardBinding4" topic="#.segment3.*" destinationType="queue" destination="wildcard.queue.four"/>
+    </exchange>
+</config>
+
+
+
+
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/registration.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/registration.php
new file mode 100644
index 0000000000000..7f547277c5f4c
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleAsyncAmqp') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleAsyncAmqp', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleDirectoryZipCodes/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleDirectoryZipCodes/etc/module.xml
index d3f1e3bc817f0..42fe40496fb2f 100644
--- a/dev/tests/integration/_files/Magento/TestModuleDirectoryZipCodes/etc/module.xml
+++ b/dev/tests/integration/_files/Magento/TestModuleDirectoryZipCodes/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleDirectoryZipCodes" setup_version="0.0.1" active="true">
+    <module name="Magento_TestModuleDirectoryZipCodes" active="true">
         <sequence>
             <module name="Magento_Directory"/>
         </sequence>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeAddressInterface.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeAddressInterface.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeAddressInterface.php
rename to dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeAddressInterface.php
index ed085b13bc720..d792adae9b786 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeAddressInterface.php
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeAddressInterface.php
@@ -4,8 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Wonderland\Api\Data;
+namespace Magento\TestModuleExtensionAttributes\Api\Data;
 
 use Magento\Framework\Api\ExtensibleDataInterface;
 
@@ -55,14 +56,14 @@ public function getCustomerId();
     /**
      * Get region
      *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionInterface|null
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface|null
      */
     public function getRegion();
 
     /**
      * Get region
      *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionInterface[]|null
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface[]|null
      */
     public function getRegions();
 
@@ -174,17 +175,17 @@ public function isDefaultBilling();
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
-     * @return \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface|null
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface|null
      */
     public function getExtensionAttributes();
 
     /**
      * Set an extension attributes object.
      *
-     * @param \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface $extensionAttributes
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface $extensionAttributes
      * @return $this
      */
     public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface $extensionAttributes
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface $extensionAttributes
     );
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Api/Data/FakeAttributeMetadataInterface.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeAttributeMetadataInterface.php
similarity index 94%
rename from dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Api/Data/FakeAttributeMetadataInterface.php
rename to dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeAttributeMetadataInterface.php
index 9f183be7e5d36..6cd7d2e212adf 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Api/Data/FakeAttributeMetadataInterface.php
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeAttributeMetadataInterface.php
@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Wonderland\Api\Data;
+namespace Magento\TestModuleExtensionAttributes\Api\Data;
 
 /**
  * Customer attribute metadata interface.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Api/Data/FakeCustomerInterface.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeCustomerInterface.php
similarity index 83%
rename from dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Api/Data/FakeCustomerInterface.php
rename to dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeCustomerInterface.php
index 1cb6336866474..63c32869941e2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Api/Data/FakeCustomerInterface.php
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeCustomerInterface.php
@@ -3,7 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Wonderland\Api\Data;
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Api\Data;
 
 /**
  * Customer interface.
@@ -98,17 +100,17 @@ public function setPrefix($prefix);
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
-     * @return \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface|null
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface|null
      */
     public function getExtensionAttributes();
 
     /**
      * Set an extension attributes object.
      *
-     * @param \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
      * @return $this
      */
     public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
     );
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeExtensibleOneInterface.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeExtensibleOneInterface.php
similarity index 80%
rename from dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeExtensibleOneInterface.php
rename to dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeExtensibleOneInterface.php
index 086c28b1e52af..c1178d2867e8f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeExtensibleOneInterface.php
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeExtensibleOneInterface.php
@@ -4,8 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Wonderland\Api\Data;
+namespace Magento\TestModuleExtensionAttributes\Api\Data;
 
 use Magento\Framework\Api\ExtensibleDataInterface;
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeExtensibleTwoInterface.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeExtensibleTwoInterface.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeExtensibleTwoInterface.php
rename to dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeExtensibleTwoInterface.php
index 79adec87b9f1d..c740e3ec07bed 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeExtensibleTwoInterface.php
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeExtensibleTwoInterface.php
@@ -4,8 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Wonderland\Api\Data;
+namespace Magento\TestModuleExtensionAttributes\Api\Data;
 
 use Magento\Framework\Api\ExtensibleDataInterface;
 
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeRegionInterface.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeRegionInterface.php
new file mode 100644
index 0000000000000..57a08f1fbd216
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Api/Data/FakeRegionInterface.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Customer address region interface.
+ */
+interface FakeRegionInterface extends ExtensibleDataInterface
+{
+    /**#@+
+     * Constants for keys of data array
+     */
+    const REGION_CODE = 'region_code';
+    const REGION = 'region';
+    const REGION_ID = 'region_id';
+    /**#@-*/
+
+    /**
+     * Get region code
+     *
+     * @return string
+     */
+    public function getRegionCode();
+
+    /**
+     * Get region
+     *
+     * @return string
+     */
+    public function getRegion();
+
+    /**
+     * Get region id
+     *
+     * @return int
+     */
+    public function getRegionId();
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface $extensionAttributes
+    );
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeAddress.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeAddress.php
new file mode 100644
index 0000000000000..a2a177bc5b9d0
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeAddress.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model\Data;
+
+use Magento\Framework\Api\AbstractExtensibleObject;
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressInterface;
+
+class FakeAddress extends AbstractExtensibleObject implements FakeAddressInterface
+{
+    /**
+     * Get ID
+     *
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->_get(self::ID);
+    }
+
+    /**
+     * Get customer ID
+     *
+     * @return int|null
+     */
+    public function getCustomerId()
+    {
+        return $this->_get(self::CUSTOMER_ID);
+    }
+
+    /**
+     * Get region
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion|null
+     */
+    public function getRegion()
+    {
+        return $this->_get(self::REGION);
+    }
+
+    /**
+     * Get region
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion[]|null
+     */
+    public function getRegions()
+    {
+        return $this->_get(self::REGIONS);
+    }
+
+    /**
+     * Two-letter country code in ISO_3166-2 format
+     *
+     * @return string|null
+     */
+    public function getCountryId()
+    {
+        return $this->_get(self::COUNTRY_ID);
+    }
+
+    /**
+     * Get street
+     *
+     * @return string[]|null
+     */
+    public function getStreet()
+    {
+        return $this->_get(self::STREET);
+    }
+
+    /**
+     * Get company
+     *
+     * @return string|null
+     */
+    public function getCompany()
+    {
+        return $this->_get(self::COMPANY);
+    }
+
+    /**
+     * Get telephone number
+     *
+     * @return string|null
+     */
+    public function getTelephone()
+    {
+        return $this->_get(self::TELEPHONE);
+    }
+
+    /**
+     * Get fax number
+     *
+     * @return string|null
+     */
+    public function getFax()
+    {
+        return $this->_get(self::FAX);
+    }
+
+    /**
+     * Get postcode
+     *
+     * @return string|null
+     */
+    public function getPostcode()
+    {
+        return $this->_get(self::POSTCODE);
+    }
+
+    /**
+     * Get city name
+     *
+     * @return string|null
+     */
+    public function getCity()
+    {
+        return $this->_get(self::CITY);
+    }
+
+    /**
+     * Get first name
+     *
+     * @return string|null
+     */
+    public function getFirstname()
+    {
+        return $this->_get(self::FIRSTNAME);
+    }
+
+    /**
+     * Get last name
+     *
+     * @return string|null
+     */
+    public function getLastname()
+    {
+        return $this->_get(self::LASTNAME);
+    }
+
+    /**
+     * Get middle name
+     *
+     * @return string|null
+     */
+    public function getMiddlename()
+    {
+        return $this->_get(self::MIDDLENAME);
+    }
+
+    /**
+     * Get prefix
+     *
+     * @return string|null
+     */
+    public function getPrefix()
+    {
+        return $this->_get(self::PREFIX);
+    }
+
+    /**
+     * Get suffix
+     *
+     * @return string|null
+     */
+    public function getSuffix()
+    {
+        return $this->_get(self::SUFFIX);
+    }
+
+    /**
+     * Get Vat id
+     *
+     * @return string|null
+     */
+    public function getVatId()
+    {
+        return $this->_get(self::VAT_ID);
+    }
+
+    /**
+     * Get if this address is default shipping address.
+     *
+     * @return bool|null
+     */
+    public function isDefaultShipping()
+    {
+        return $this->_get(self::DEFAULT_SHIPPING);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * Get if this address is default billing address
+     *
+     * @return bool|null
+     */
+    public function isDefaultBilling()
+    {
+        return $this->_get(self::DEFAULT_BILLING);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeAttributeMetadata.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeAttributeMetadata.php
new file mode 100644
index 0000000000000..ea50342a01d7f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeAttributeMetadata.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model\Data;
+
+/**
+ * Customer attribute metadata class.
+ */
+class FakeAttributeMetadata extends \Magento\Framework\Api\AbstractSimpleObject implements
+    \Magento\TestModuleExtensionAttributes\Api\Data\FakeAttributeMetadataInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttributeCode()
+    {
+        return $this->_get(self::ATTRIBUTE_CODE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStoreLabel()
+    {
+        return $this->_get(self::STORE_LABEL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFrontendLabel()
+    {
+        return $this->_get(self::FRONTEND_LABEL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNote()
+    {
+        return $this->_get(self::NOTE);
+    }
+
+    /**
+     * Set attribute code
+     *
+     * @param string $attributeCode
+     * @return $this
+     */
+    public function setAttributeCode($attributeCode)
+    {
+        return $this->setData(self::ATTRIBUTE_CODE, $attributeCode);
+    }
+
+    /**
+     * Set label of the store.
+     *
+     * @param string $storeLabel
+     * @return $this
+     */
+    public function setStoreLabel($storeLabel)
+    {
+        return $this->setData(self::STORE_LABEL, $storeLabel);
+    }
+
+    /**
+     * Set label which supposed to be displayed on frontend.
+     *
+     * @param string $frontendLabel
+     * @return $this
+     */
+    public function setFrontendLabel($frontendLabel)
+    {
+        return $this->setData(self::FRONTEND_LABEL, $frontendLabel);
+    }
+
+    /**
+     * Set the note attribute for the element.
+     *
+     * @param string $note
+     * @return $this
+     */
+    public function setNote($note)
+    {
+        return $this->setData(self::NOTE, $note);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeCustomer.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeCustomer.php
new file mode 100644
index 0000000000000..c2396374ba073
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeCustomer.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model\Data;
+
+/**
+ * Class Customer
+ *
+ */
+class FakeCustomer extends \Magento\Framework\Api\AbstractExtensibleObject implements
+    \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerInterface
+{
+    /**
+     * Get email address
+     *
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->_get(self::EMAIL);
+    }
+
+    /**
+     * Get first name
+     *
+     * @return string
+     */
+    public function getFirstname()
+    {
+        return $this->_get(self::FIRSTNAME);
+    }
+
+    /**
+     * Get customer id
+     *
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->_get(self::ID);
+    }
+
+    /**
+     * Get last name
+     *
+     * @return string
+     */
+    public function getLastname()
+    {
+        return $this->_get(self::LASTNAME);
+    }
+
+    /**
+     * Set customer id
+     *
+     * @param int $id
+     * @return $this
+     */
+    public function setId($id)
+    {
+        return $this->setData(self::ID, $id);
+    }
+
+    /**
+     * Set email address
+     *
+     * @param string $email
+     * @return $this
+     */
+    public function setEmail($email)
+    {
+        return $this->setData(self::EMAIL, $email);
+    }
+
+    /**
+     * Set first name
+     *
+     * @param string $firstname
+     * @return $this
+     */
+    public function setFirstname($firstname)
+    {
+        return $this->setData(self::FIRSTNAME, $firstname);
+    }
+
+    /**
+     * Set last name
+     *
+     * @param string $lastname
+     * @return string
+     */
+    public function setLastname($lastname)
+    {
+        return $this->setData(self::LASTNAME, $lastname);
+    }
+
+    /**
+     * Get prefix
+     *
+     * @return string|null
+     */
+    public function getPrefix()
+    {
+        return $this->_get(self::PREFIX);
+    }
+
+    /**
+     * Set prefix
+     *
+     * @param string $prefix
+     * @return $this
+     */
+    public function setPrefix($prefix)
+    {
+        return $this->setData(self::PREFIX, $prefix);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeExtensibleOne.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeExtensibleOne.php
new file mode 100644
index 0000000000000..1bbd48020bcfc
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeExtensibleOne.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model\Data;
+
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeExtensibleOneInterface;
+
+class FakeExtensibleOne implements FakeExtensibleOneInterface
+{
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeExtensibleTwo.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeExtensibleTwo.php
new file mode 100644
index 0000000000000..3064b884616ed
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeExtensibleTwo.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model\Data;
+
+use Magento\Framework\Api\AbstractExtensibleObject;
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeExtensibleTwoInterface;
+
+class FakeExtensibleTwo extends AbstractExtensibleObject implements FakeExtensibleTwoInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeRegion.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeRegion.php
new file mode 100644
index 0000000000000..ff3dbecbb8a7c
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/Data/FakeRegion.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model\Data;
+
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface;
+use Magento\Framework\Api\AbstractExtensibleObject;
+
+class FakeRegion extends AbstractExtensibleObject implements FakeRegionInterface
+{
+    /**
+     * Get region
+     *
+     * @return string
+     */
+    public function getRegion()
+    {
+        return $this->_get(self::REGION);
+    }
+
+    /**
+     * Get region code
+     *
+     * @return string
+     */
+    public function getRegionCode()
+    {
+        return $this->_get(self::REGION_CODE);
+    }
+
+    /**
+     * Get region id
+     *
+     * @return int
+     */
+    public function getRegionId()
+    {
+        return $this->_get(self::REGION_ID);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     * Set region code
+     *
+     * @param string $regionCode
+     * @return $this
+     */
+    public function setRegionCode($regionCode)
+    {
+        return $this->setData(self::REGION_CODE, $regionCode);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeAddress.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeAddress.php
new file mode 100644
index 0000000000000..36c2aabd72037
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeAddress.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model;
+
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressInterface;
+
+class FakeAddress extends AbstractExtensibleModel implements FakeAddressInterface
+{
+    /**
+     * Get ID
+     *
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->getData(self::ID);
+    }
+
+    /**
+     * Get customer ID
+     *
+     * @return int|null
+     */
+    public function getCustomerId()
+    {
+        return $this->getData(self::CUSTOMER_ID);
+    }
+
+    /**
+     * Get region
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface|null
+     */
+    public function getRegion()
+    {
+        return $this->getData(self::REGION);
+    }
+
+    /**
+     * Get region
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface[]|null
+     */
+    public function getRegions()
+    {
+        return $this->getData(self::REGIONS);
+    }
+
+    /**
+     * Two-letter country code in ISO_3166-2 format
+     *
+     * @return string|null
+     */
+    public function getCountryId()
+    {
+        return $this->getData(self::COUNTRY_ID);
+    }
+
+    /**
+     * Get street
+     *
+     * @return string[]|null
+     */
+    public function getStreet()
+    {
+        return $this->getData(self::STREET);
+    }
+
+    /**
+     * Get company
+     *
+     * @return string|null
+     */
+    public function getCompany()
+    {
+        return $this->getData(self::COMPANY);
+    }
+
+    /**
+     * Get telephone number
+     *
+     * @return string|null
+     */
+    public function getTelephone()
+    {
+        return $this->getData(self::TELEPHONE);
+    }
+
+    /**
+     * Get fax number
+     *
+     * @return string|null
+     */
+    public function getFax()
+    {
+        return $this->getData(self::FAX);
+    }
+
+    /**
+     * Get postcode
+     *
+     * @return string|null
+     */
+    public function getPostcode()
+    {
+        return $this->getData(self::POSTCODE);
+    }
+
+    /**
+     * Get city name
+     *
+     * @return string|null
+     */
+    public function getCity()
+    {
+        return $this->getData(self::CITY);
+    }
+
+    /**
+     * Get first name
+     *
+     * @return string|null
+     */
+    public function getFirstname()
+    {
+        return $this->getData(self::FIRSTNAME);
+    }
+
+    /**
+     * Get last name
+     *
+     * @return string|null
+     */
+    public function getLastname()
+    {
+        return $this->getData(self::LASTNAME);
+    }
+
+    /**
+     * Get middle name
+     *
+     * @return string|null
+     */
+    public function getMiddlename()
+    {
+        return $this->getData(self::MIDDLENAME);
+    }
+
+    /**
+     * Get prefix
+     *
+     * @return string|null
+     */
+    public function getPrefix()
+    {
+        return $this->getData(self::PREFIX);
+    }
+
+    /**
+     * Get suffix
+     *
+     * @return string|null
+     */
+    public function getSuffix()
+    {
+        return $this->getData(self::SUFFIX);
+    }
+
+    /**
+     * Get Vat id
+     *
+     * @return string|null
+     */
+    public function getVatId()
+    {
+        return $this->getData(self::VAT_ID);
+    }
+
+    /**
+     * Get if this address is default shipping address.
+     *
+     * @return bool|null
+     */
+    public function isDefaultShipping()
+    {
+        return $this->getData(self::DEFAULT_SHIPPING);
+    }
+
+    /**
+     * Get if this address is default billing address
+     *
+     * @return bool|null
+     */
+    public function isDefaultBilling()
+    {
+        return $this->getData(self::DEFAULT_BILLING);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeAttributeMetadata.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeAttributeMetadata.php
new file mode 100644
index 0000000000000..ae791de4e0943
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeAttributeMetadata.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Api\Model;
+
+/**
+ * Customer attribute metadata class.
+ */
+class FakeAttributeMetadata extends \Magento\Framework\Api\AbstractSimpleObject implements
+    \Magento\TestModuleExtensionAttributes\Api\Data\FakeAttributeMetadataInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttributeCode()
+    {
+        return $this->_get(self::ATTRIBUTE_CODE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStoreLabel()
+    {
+        return $this->_get(self::STORE_LABEL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFrontendLabel()
+    {
+        return $this->_get(self::FRONTEND_LABEL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNote()
+    {
+        return $this->_get(self::NOTE);
+    }
+
+    /**
+     * Set attribute code
+     *
+     * @param string $attributeCode
+     * @return $this
+     */
+    public function setAttributeCode($attributeCode)
+    {
+        return $this->setData(self::ATTRIBUTE_CODE, $attributeCode);
+    }
+
+    /**
+     * Set label of the store.
+     *
+     * @param string $storeLabel
+     * @return $this
+     */
+    public function setStoreLabel($storeLabel)
+    {
+        return $this->setData(self::STORE_LABEL, $storeLabel);
+    }
+
+    /**
+     * Set label which supposed to be displayed on frontend.
+     *
+     * @param string $frontendLabel
+     * @return $this
+     */
+    public function setFrontendLabel($frontendLabel)
+    {
+        return $this->setData(self::FRONTEND_LABEL, $frontendLabel);
+    }
+
+    /**
+     * Set the note attribute for the element.
+     *
+     * @param string $note
+     * @return $this
+     */
+    public function setNote($note)
+    {
+        return $this->setData(self::NOTE, $note);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeCustomer.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeCustomer.php
new file mode 100644
index 0000000000000..64ff041179b71
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeCustomer.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Api\Model;
+
+/**
+ * Class Customer
+ *
+ */
+class FakeCustomer extends \Magento\Framework\Api\AbstractExtensibleObject implements
+    \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerInterface
+{
+    /**
+     * Get customer id
+     *
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->_get(self::ID);
+    }
+
+    /**
+     * Get email address
+     *
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->_get(self::EMAIL);
+    }
+
+    /**
+     * Get first name
+     *
+     * @return string
+     */
+    public function getFirstname()
+    {
+        return $this->_get(self::FIRSTNAME);
+    }
+
+    /**
+     * Get last name
+     *
+     * @return string
+     */
+    public function getLastname()
+    {
+        return $this->_get(self::LASTNAME);
+    }
+
+    /**
+     * Get prefix
+     *
+     * @return string|null
+     */
+    public function getPrefix()
+    {
+        return $this->_get(self::PREFIX);
+    }
+
+    /**
+     * Set customer id
+     *
+     * @param int $id
+     * @return $this
+     */
+    public function setId($id)
+    {
+        return $this->setData(self::ID, $id);
+    }
+
+    /**
+     * Set email address
+     *
+     * @param string $email
+     * @return $this
+     */
+    public function setEmail($email)
+    {
+        return $this->setData(self::EMAIL, $email);
+    }
+
+    /**
+     * Set first name
+     *
+     * @param string $firstname
+     * @return $this
+     */
+    public function setFirstname($firstname)
+    {
+        return $this->setData(self::FIRSTNAME, $firstname);
+    }
+
+    /**
+     * Set last name
+     *
+     * @param string $lastname
+     * @return string
+     */
+    public function setLastname($lastname)
+    {
+        return $this->setData(self::LASTNAME, $lastname);
+    }
+
+    /**
+     * Set prefix
+     *
+     * @param string $prefix
+     * @return $this
+     */
+    public function setPrefix($prefix)
+    {
+        return $this->setData(self::PREFIX, $prefix);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeRegion.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeRegion.php
new file mode 100644
index 0000000000000..aee30887fc341
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/Model/FakeRegion.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleExtensionAttributes\Model;
+
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface;
+
+class FakeRegion extends AbstractExtensibleModel implements FakeRegionInterface
+{
+    /**
+     * Get region
+     *
+     * @return string
+     */
+    public function getRegion()
+    {
+        return $this->getData(self::REGION);
+    }
+
+    /**
+     * Get region code
+     *
+     * @return string
+     */
+    public function getRegionCode()
+    {
+        return $this->getData(self::REGION_CODE);
+    }
+
+    /**
+     * Get region id
+     *
+     * @return int
+     */
+    public function getRegionId()
+    {
+        return $this->getData(self::REGION_ID);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/etc/extension_attributes.xml b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/etc/extension_attributes.xml
new file mode 100644
index 0000000000000..afe722cfac11e
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/etc/extension_attributes.xml
@@ -0,0 +1,97 @@
+<?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:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\Catalog\Api\Data\ProductInterface">
+        <attribute code="test_stock_item" type="Magento\CatalogInventory\Api\Data\StockItemInterface">
+            <resources>
+                <resource ref="Magento_CatalogInventory::cataloginventory"/>
+            </resources>
+            <join reference_table="cataloginventory_stock_item"
+                  join_on_field="entity_id"
+                  reference_field="product_id"
+                    >
+                <field>qty</field>
+                <field>item_id</field>
+            </join>
+        </attribute>
+        <attribute code="test_stock_item_qty" type="string">
+            <resources>
+                <resource ref="Magento_CatalogInventory::cataloginventory"/>
+            </resources>
+            <join reference_table="cataloginventory_stock_item"
+                  join_on_field="entity_id"
+                  reference_field="product_id"
+                    >
+                <field>qty</field>
+            </join>
+        </attribute>
+    </extension_attributes>
+
+    <extension_attributes for="Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerInterface">
+        <attribute code="test_group_code" type="string">
+            <join reference_table="customer_group"
+                  join_on_field="group_id"
+                  reference_field="customer_group_id"
+                    >
+                <field>customer_group_code</field>
+            </join>
+        </attribute>
+    </extension_attributes>
+
+    <extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
+        <attribute code="test_group_code" type="string">
+            <join reference_table="customer_group"
+                  join_on_field="group_id"
+                  reference_field="customer_group_id"
+                    >
+                <field>customer_group_code</field>
+            </join>
+        </attribute>
+        <attribute code="test_group" type="Magento\Customer\Api\Data\GroupInterface">
+            <join reference_table="customer_group"
+                  join_on_field="group_id"
+                  reference_field="customer_group_id"
+                    >
+                <field>tax_class_id</field>
+                <field column="customer_group_code">code</field>
+            </join>
+        </attribute>
+    </extension_attributes>
+
+    <extension_attributes for="Magento\Customer\Api\Data\GroupInterface">
+        <attribute code="test_dummy_attribute" type="string">
+            <join reference_table="eav_attribute"
+                  reference_field="attribute_id"
+                  join_on_field="customer_group_id"
+                    >
+                <field>attribute_code</field>
+            </join>
+        </attribute>
+        <attribute code="test_complex_dummy_attribute" type="Magento\Catalog\Api\Data\ProductAttributeInterface">
+            <join reference_table="admin_user"
+                  reference_field="user_id"
+                  join_on_field="customer_group_id"
+                    >
+                <field column="username">attribute_code</field>
+                <field column="firstname">frontend_label</field>
+            </join>
+        </attribute>
+    </extension_attributes>
+
+    <extension_attributes for="Magento\Sales\Api\Data\InvoiceInterface">
+        <attribute code="test_dummy_attribute" type="string">
+            <join reference_table="eav_attribute"
+                  reference_field="attribute_id"
+                  join_on_field="entity_id"
+                    >
+                <field>attribute_code</field>
+            </join>
+        </attribute>
+    </extension_attributes>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/etc/module.xml
new file mode 100644
index 0000000000000..8f885b1d9a2a8
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleExtensionAttributes" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/registration.php b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/registration.php
new file mode 100644
index 0000000000000..2077708c02415
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleExtensionAttributes/registration.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleExtensionAttributes') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleExtensionAttributes', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleFakePaymentMethod/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleFakePaymentMethod/etc/module.xml
index de02321ca39ea..a6d0d87ec4e8f 100644
--- a/dev/tests/integration/_files/Magento/TestModuleFakePaymentMethod/etc/module.xml
+++ b/dev/tests/integration/_files/Magento/TestModuleFakePaymentMethod/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleFakePaymentMethod" setup_version="0.0.1">
+    <module name="Magento_TestModuleFakePaymentMethod">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json
new file mode 100644
index 0000000000000..7aa873f6cc71b
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json
@@ -0,0 +1,18 @@
+{
+    "name": "magento/module-test-module-message-queue-config-override",
+    "description": "test module for message queue configuration",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-integration": "*"
+    },
+    "type": "magento2-module",
+    "extra": {
+        "map": [
+            [
+                "*",
+                "Magento/TestModuleMessageQueueConfigOverride"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/module.xml
new file mode 100644
index 0000000000000..7e355e7519070
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleMessageQueueConfigOverride"  />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/queue_topology.xml
new file mode 100644
index 0000000000000..bc746fbbec44d
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/queue_topology.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento-topic-based-exchange1" connection="amqp">
+        <arguments>
+            <argument name="alternate-exchange" xsi:type="string">magento-log-exchange</argument>
+        </arguments>
+    </exchange>
+
+    <exchange name="magento-topic-based-exchange2" type="topic" connection="amqp">
+        <arguments>
+            <argument name="alternate-exchange" xsi:type="string">magento-log-exchange</argument>
+        </arguments>
+        <binding id="topicBasedRouting2">
+            <arguments>
+                <argument name="argument2" xsi:type="boolean">true</argument>
+                <argument name="argument3" xsi:type="number">150</argument>
+            </arguments>
+        </binding>
+    </exchange>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/registration.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/registration.php
new file mode 100644
index 0000000000000..04fdd678514b1
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/registration.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleMessageQueueConfigOverride') === null) {
+    ComponentRegistrar::register(
+        ComponentRegistrar::MODULE,
+        'Magento_TestModuleMessageQueueConfigOverride',
+        __DIR__
+    );
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/AsyncHandler.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/AsyncHandler.php
new file mode 100644
index 0000000000000..945dc9e801c6f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/AsyncHandler.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing asynchronous queue handlers.
+ *
+ * @SuppressWarnings(PHPMD)
+ */
+class AsyncHandler
+{
+    /**
+     * @param string
+     * @return void
+     */
+    public function methodWithStringParam($param)
+    {
+        return;
+    }
+
+    /**
+     * @param bool
+     * @return void
+     */
+    public function methodWithBoolParam($param)
+    {
+        return;
+    }
+
+    /**
+     * @param mixed
+     * @return void
+     */
+    public function methodWithMixedParam($param)
+    {
+        return;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerOne.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerOne.php
new file mode 100644
index 0000000000000..db85053299e99
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerOne.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing queue handlers.
+ */
+class HandlerOne
+{
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodOne()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodTwo()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodThree()
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerTwo.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerTwo.php
new file mode 100644
index 0000000000000..ef62089ad8c3f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerTwo.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing queue handlers.
+ */
+class HandlerTwo
+{
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodOne()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodTwo()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodThree()
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/SyncHandler.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/SyncHandler.php
new file mode 100644
index 0000000000000..801729072cadb
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/SyncHandler.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing synchronous queue handlers.
+ */
+class SyncHandler
+{
+    /**
+     * @param string
+     * @return string
+     */
+    public function methodWithStringParam($param)
+    {
+        return 'Processed: ' . $param;
+    }
+
+    /**
+     * @param bool
+     * @return bool
+     */
+    public function methodWithBoolParam($param)
+    {
+        return !$param;
+    }
+
+    /**
+     * @param mixed
+     * @return mixed
+     */
+    public function methodWithMixedParam($param)
+    {
+        return $param;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json
new file mode 100644
index 0000000000000..edc7f3d189424
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json
@@ -0,0 +1,18 @@
+{
+    "name": "magento/module-test-module-message-queue-configuration",
+    "description": "test module for message queue configuration",
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-integration": "*"
+    },
+    "type": "magento2-module",
+    "extra": {
+        "map": [
+            [
+                "*",
+                "Magento/TestModuleMessageQueueConfiguration"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/communication.xml
new file mode 100644
index 0000000000000..2c2c9f8be09bf
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/communication.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="deprecated.config.async.bool.topic" request="bool">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\AsyncHandler" method="methodWithBoolParam"/>
+        <handler name="handler2" type="Magento\TestModuleMessageQueueConfiguration\AsyncHandler" method="methodWithMixedParam"/>
+    </topic>
+    <topic name="deprecated.config.async.string.topic" request="string"/>
+    <topic name="deprecated.config.sync.string.topic" request="string" response="string">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\SyncHandler" method="methodWithStringParam"/>
+    </topic>
+    <topic name="deprecated.config.sync.bool.topic" schema="Magento\TestModuleMessageQueueConfiguration\SyncHandler::methodWithBoolParam">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\SyncHandler" method="methodWithBoolParam"/>
+    </topic>
+    <topic name="overlapping.topic.declaration" request="string">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\AsyncHandler" method="methodWithStringParam"/>
+    </topic>
+    <topic name="anotherTopic1" request="string"/>
+    <topic name="anotherTopic2" request="string"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/module.xml
new file mode 100644
index 0000000000000..b49cdec747d42
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleMessageQueueConfiguration" >
+    </module>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml
new file mode 100644
index 0000000000000..7bd099710a13f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="deprecated.config.async.string.topic">
+        <queue consumer="deprecatedConfigAsyncStringConsumer" name="deprecated.config.queue.1" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" maxMessages="200"/>
+        <queue consumer="deprecatedConfigAsyncMixedConsumer" name="deprecated.config.queue.3" handler="Magento\TestModuleMessageQueueConfiguration\AsyncHandler::methodWithMixedParam"/>
+    </broker>
+    <broker topic="deprecated.config.async.bool.topic" type="db" exchange="deprecatedExchange">
+        <queue consumer="deprecatedConfigAsyncBoolConsumer" name="deprecated.config.queue.2" />
+    </broker>
+    <broker topic="deprecated.config.sync.bool.topic" type="amqp" exchange="customExchange">
+        <queue consumer="deprecatedConfigSyncBoolConsumer" name="deprecated.config.queue.4"/>
+    </broker>
+    <broker topic="overlapping.topic.declaration" type="amqp" exchange="overlappingDeprecatedExchange">
+        <queue consumer="overlappingConsumerDeclaration" name="consumer.config.queue" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" maxMessages="222" handler="Magento\TestModuleMessageQueueConfiguration\AsyncHandler::methodWithMixedParam"/>
+    </broker>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..47be546a1d730
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_consumer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="consumer1" queue="queue1" handler="Magento\TestModuleMessageQueueConfiguration\HandlerOne::handlerMethodOne" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" connection="amqp" maxMessages="100"/>
+    <consumer name="consumer2" queue="queue2" handler="Magento\TestModuleMessageQueueConfiguration\HandlerOne::handlerMethodTwo" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" connection="db"/>
+    <consumer name="consumer3" queue="queue3" handler="Magento\TestModuleMessageQueueConfiguration\HandlerTwo::handlerMethodOne" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer"/>
+    <consumer name="consumer4" queue="queue4" handler="Magento\TestModuleMessageQueueConfiguration\HandlerOne::handlerMethodOne"/>
+    <consumer name="consumer5" queue="queue5"/>
+    <consumer name="overlappingConsumerDeclaration" queue="consumer.config.queue" connection="amqp"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..9d86e065e05c2
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_publisher.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="topic.message.queue.config.01">
+        <connection name="amqp" exchange="magento2" />
+        <connection name="db" exchange="magento2" disabled="true" />
+    </publisher>
+    <publisher topic="topic.message.queue.config.02">
+        <connection name="amqp" exchange="magento2" disabled="true"/>
+        <connection name="db" exchange="magento2" disabled="true" />
+    </publisher>
+    <publisher topic="topic.message.queue.config.03" disabled="true" />
+    <publisher topic="topic.message.queue.config.04">
+        <connection name="amqp" />
+    </publisher>
+    <publisher topic="overlapping.topic.declaration"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml
new file mode 100644
index 0000000000000..9b72e7d2e5def
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento-topic-based-exchange1" type="topic" connection="amqp">
+        <binding id="topicBasedRouting1" topic="anotherTopic1" destinationType="queue" destination="topic-queue1">
+            <arguments>
+                <argument name="argument1" xsi:type="string">value</argument>
+            </arguments>
+        </binding>
+    </exchange>
+
+    <exchange name="magento-topic-based-exchange2" connection="amqp">
+        <binding id="topicBasedRouting2" topic="anotherTopic2" destination="topic-queue2" destinationType="queue">
+            <arguments>
+                <argument name="argument1" xsi:type="string">value</argument>
+            </arguments>
+        </binding>
+        <arguments>
+            <argument name="arrayValue" xsi:type="array">
+                <item name="element01" xsi:type="string">10</item>
+                <item name="element02" xsi:type="string">20</item>
+            </argument>
+        </arguments>
+    </exchange>
+
+    <exchange name="magento-topic-based-exchange3" type="topic" connection="amqp" autoDelete="true" durable="false" internal="true" />
+
+    <exchange name="magento-topic-based-exchange4" type="topic" connection="amqp">
+        <binding id="wildcard1" destination="topic-queue1" destinationType="queue" topic="#">
+            <arguments>
+                <argument name="test" xsi:type="string">one</argument>
+            </arguments>
+        </binding>
+        <binding id="wildcard2" destination="topic-queue2" destinationType="queue" topic="*.*.*" />
+    </exchange>
+
+    <exchange name="overlappingDeprecatedExchange" type="topic" connection="amqp">
+        <binding id="binding1" topic="overlapping.topic.declaration" destinationType="queue" destination="topology.config.queue" />
+        <binding id="binding2" topic="deprecated.config.async.string.topic" destinationType="queue" destination="topology.config.queue" />
+    </exchange>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/registration.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/registration.php
new file mode 100644
index 0000000000000..eaffb9c79bbe3
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleMessageQueueConfiguration') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleMessageQueueConfiguration', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
index 6af2d2f46f50b..416439119b1c2 100644
--- a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
+++ b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
@@ -5,12 +5,11 @@
     "sort-packages": true
   },
   "require": {
-    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-    "magento/framework": "100.1.*",
-    "magento/module-integration": "100.1.*"
+    "php": "~7.1.3||~7.2.0",
+    "magento/framework": "*",
+    "magento/module-integration": "*"
   },
   "type": "magento2-module",
-  "version": "1.0",
   "extra": {
     "map": [
       [
diff --git a/dev/tests/integration/_files/Magento/TestModuleSample/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleSample/etc/module.xml
index 3b7f0dbbc6f45..488c79374cedb 100644
--- a/dev/tests/integration/_files/Magento/TestModuleSample/etc/module.xml
+++ b/dev/tests/integration/_files/Magento/TestModuleSample/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestModuleSample" setup_version="0.0.1" active="true">
+    <module name="Magento_TestModuleSample" active="true">
     </module>
 </config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Api/ServiceInterface.php b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Api/ServiceInterface.php
new file mode 100644
index 0000000000000..71438473a7b5f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Api/ServiceInterface.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleSynchronousAmqp\Api;
+
+interface ServiceInterface
+{
+    /**
+     * @param string $simpleDataItem
+     * @return string
+     */
+    public function execute($simpleDataItem);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Model/RpcRequestHandler.php b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Model/RpcRequestHandler.php
new file mode 100644
index 0000000000000..4c4279a096853
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Model/RpcRequestHandler.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleSynchronousAmqp\Model;
+
+class RpcRequestHandler
+{
+    /**
+     * @param string $simpleDataItem
+     * @return string
+     */
+    public function process($simpleDataItem)
+    {
+        return $simpleDataItem . ' processed by RPC handler';
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/communication.xml
new file mode 100644
index 0000000000000..87e1dde456ae4
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/communication.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="synchronous.rpc.test.deprecated" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="synchronous.rpc.test" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="magento.testModuleSynchronousAmqp.api.serviceInterface.execute" schema="Magento\TestModuleSynchronousAmqp\Api\ServiceInterface::execute">
+        <handler name="processRemoteRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="sync.topic.for.mixed.sync.and.async.queue" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.a" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.b" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/di.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/di.xml
new file mode 100644
index 0000000000000..83b9a2d985f87
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/di.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\TestModuleSynchronousAmqp\Api\ServiceInterface" type="Magento\TestModuleSynchronousAmqp\Api\ServiceInterfaceRemote" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/module.xml
new file mode 100644
index 0000000000000..d84a61380c600
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleSynchronousAmqp"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue.xml
new file mode 100644
index 0000000000000..ec196a6e3b7ff
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="synchronous.rpc.test.deprecated" type="amqp" exchange="magento">
+        <queue consumer="synchronousRpcTestConsumer.deprecated" name="synchronous.rpc.test.deprecated" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    </broker>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..6f9cc0fa758b0
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml
@@ -0,0 +1,14 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="synchronousRpcTestConsumer" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="RemoteServiceTestConsumer" queue="queue.magento.testModuleSynchronousAmqp.api.serviceInterface.execute" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="queue.for.multiple.topics.test.a" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="queue.for.multiple.topics.test.b" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..0d1e3b6850a99
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml
@@ -0,0 +1,14 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="synchronous.rpc.test"/>
+    <publisher topic="magento.testModuleSynchronousAmqp.api.serviceInterface.execute"/>
+    <publisher topic="sync.topic.for.mixed.sync.and.async.queue"/>
+    <publisher topic="multi.topic.queue.topic.a"/>
+    <publisher topic="multi.topic.queue.topic.b"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_topology.xml
new file mode 100644
index 0000000000000..d16636b25225f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_topology.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento" connection="amqp" type="topic">
+        <binding id="sync.binding1" topic="synchronous.rpc.test" destinationType="queue" destination="synchronous.rpc.test"/>
+        <binding id="sync.binding2" topic="magento.testModuleSynchronousAmqp.api.serviceInterface.execute" destinationType="queue" destination="queue.magento.testModuleSynchronousAmqp.api.serviceInterface.execute"/>
+        <binding id="sync.binding3" topic="sync.topic.for.mixed.sync.and.async.queue" destinationType="queue" destination="mixed.sync.and.async.queue"/>
+        <binding id="sync.binding4" topic="multi.topic.queue.topic.a" destinationType="queue" destination="synchronous.rpc.test"/>
+        <binding id="sync.binding5" topic="multi.topic.queue.topic.b" destinationType="queue" destination="synchronous.rpc.test"/>
+    </exchange>
+</config>
+
+
+
+
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/registration.php b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/registration.php
new file mode 100644
index 0000000000000..6260921e0fb44
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleSynchronousAmqp') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleSynchronousAmqp', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php
new file mode 100644
index 0000000000000..aceac618f48b9
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleWysiwygConfig\Model;
+
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * Configuration override for WYSIWYG height
+     * @var string
+     */
+    const CONFIG_HEIGHT = 'something_else';
+
+    /**
+     * Configuration override for WYSIWYG content css
+     * @var string
+     */
+    const CONFIG_CONTENT_CSS = 'something_else.css';
+
+    /** @var \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider */
+    private $cmsConfigProvider;
+
+    /**
+     * @param \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider $cmsConfigProvider
+     */
+    public function __construct(\Magento\Cms\Model\Wysiwyg\DefaultConfigProvider $cmsConfigProvider)
+    {
+        $this->cmsConfigProvider = $cmsConfigProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConfig(\Magento\Framework\DataObject $config): \Magento\Framework\DataObject
+    {
+        //get default config
+        $config = $this->cmsConfigProvider->getConfig($config);
+
+        $config = $this->removeSpecialCharacterFromToolbar($config);
+
+        $config = $this->modifyHeightAndContentCss($config);
+        return $config;
+    }
+
+    /**
+     * Modify height and content_css in the config
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    private function modifyHeightAndContentCss(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        return $config->addData(
+            [
+                'height' => self::CONFIG_HEIGHT,
+                'content_css' => self::CONFIG_CONTENT_CSS
+            ]
+        );
+    }
+
+    /**
+     * Remove the special character from the toolbar configuration
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    private function removeSpecialCharacterFromToolbar(
+        \Magento\Framework\DataObject $config
+    ) : \Magento\Framework\DataObject {
+        $tinymce4 = $config->getData('tinymce4');
+        if (isset($tinymce4['toolbar']) && isset($tinymce4['plugins'])) {
+            $toolbar = $tinymce4['toolbar'];
+            $plugins = $tinymce4['plugins'];
+            $tinymce4['toolbar'] = str_replace('charmap', '', $toolbar);
+            $tinymce4['plugins'] = str_replace('charmap', '', $plugins);
+            $config->setData('tinymce4', $tinymce4);
+        }
+        return $config;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/adminhtml/di.xml b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..dd2e003f1a544
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/adminhtml/di.xml
@@ -0,0 +1,36 @@
+<?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\Cms\Model\Wysiwyg\CompositeConfigProvider">
+        <arguments>
+            <argument name="wysiwygConfigPostProcessor" xsi:type="array">
+                <item name="testAdapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
+                <item name="Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
+            </argument>
+            <argument name="variablePluginConfigProvider" xsi:type="array">
+                <item name="testAdapter" xsi:type="string">Magento\Variable\Model\Variable\ConfigProvider</item>
+            </argument>
+            <argument name="widgetPluginConfigProvider" xsi:type="array">
+                <item name="testAdapter" xsi:type="string">Magento\Widget\Model\Widget\Config</item>
+            </argument>
+            <argument name="galleryConfigProvider" xsi:type="array">
+                <item name="testAdapter" xsi:type="string">Magento\Cms\Model\Wysiwyg\Gallery\DefaultConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Cms\Model\Config\Source\Wysiwyg\Editor">
+        <arguments>
+            <argument name="adapterOptions" xsi:type="array">
+                <item name="testAdapter" xsi:type="array">
+                    <item name="value" xsi:type="string">Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter</item>
+                    <item name="label" xsi:type="string" translatable="true">Test Adapter</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/di.xml b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/di.xml
new file mode 100644
index 0000000000000..3be3d9dc3ec58
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Ui\Block\Wysiwyg\ActiveEditor">
+        <arguments>
+            <argument name="availableAdapterPaths" xsi:type="array">
+                <item name="Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter" xsi:type="string"/>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/module.xml
new file mode 100644
index 0000000000000..1d5fd912894ef
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/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_TestModuleWysiwygConfig" active="true">
+        <sequence>
+            <module name="Magento_Cms"/>
+        </sequence>
+    </module>
+</config>
\ No newline at end of file
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/registration.php b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/registration.php
new file mode 100644
index 0000000000000..04a6a7cbc05ba
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleWysiwygConfig') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleWysiwygConfig', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/view/adminhtml/web/wysiwyg/tinymce4TestAdapter.js b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/view/adminhtml/web/wysiwyg/tinymce4TestAdapter.js
new file mode 100644
index 0000000000000..005e6437c2d78
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/view/adminhtml/web/wysiwyg/tinymce4TestAdapter.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global popups, tinyMceEditors, MediabrowserUtility, Base64 */
+/* eslint-disable strict */
+define([
+    'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
+], function (tinyMCE4) {
+    'use strict';
+
+    return tinyMCE4;
+});
diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
new file mode 100755
index 0000000000000..303fbfb217d2b
--- /dev/null
+++ b/dev/tests/integration/bin/magento
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+if (PHP_SAPI !== 'cli') {
+    echo 'bin/magento must be run as a CLI application';
+    exit(1);
+}
+
+if (isset($_SERVER['INTEGRATION_TEST_PARAMS'])) {
+    parse_str($_SERVER['INTEGRATION_TEST_PARAMS'], $params);
+    foreach ($params as $paramName => $paramValue) {
+        $_SERVER[$paramName] = $paramValue;
+    }
+} else {
+    echo 'Test parameters are required';
+    exit(1);
+}
+
+try {
+    require $_SERVER['MAGE_DIRS']['base']['path'] . '/app/bootstrap.php';
+} catch (\Exception $e) {
+    echo 'Autoload error: ' . $e->getMessage();
+    exit(1);
+}
+try {
+    $handler = new \Magento\Framework\App\ErrorHandler();
+    set_error_handler([$handler, 'handler']);
+    $application = new Magento\Framework\Console\Cli('Magento CLI');
+    $application->run();
+} catch (\Exception $e) {
+    while ($e) {
+        echo $e->getMessage();
+        echo $e->getTraceAsString();
+        echo "\n\n";
+        $e = $e->getPrevious();
+    }
+    exit(Cli::RETURN_FAILURE);
+}
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index 0e6f90d75f311..b871fe1905910 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -16,11 +16,15 @@
     \Magento\Framework\App\Response\Http::class => \Magento\TestFramework\Response::class,
     \Magento\Framework\Interception\PluginListInterface::class =>
         \Magento\TestFramework\Interception\PluginList::class,
+    \Magento\Framework\Interception\ObjectManager\ConfigInterface::class =>
+        \Magento\TestFramework\ObjectManager\Config::class,
     \Magento\Framework\Interception\ObjectManager\Config\Developer::class =>
         \Magento\TestFramework\ObjectManager\Config::class,
     \Magento\Framework\View\LayoutInterface::class => \Magento\TestFramework\View\Layout::class,
     \Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class =>
         \Magento\TestFramework\Db\ConnectionAdapter::class,
     \Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
-    \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class
+    \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
+    \Magento\Framework\App\ResourceConnection\ConfigInterface::class =>
+        \Magento\Framework\App\ResourceConnection\Config::class,
 ];
diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index 512930ab95fc8..4766048c62375 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -16,4 +16,8 @@ return [
     'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
     'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
     'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+    'amqp-host' => 'localhost',
+    'amqp-port' => '5672',
+    'amqp-user' => 'guest',
+    'amqp-password' => 'guest',
 ];
diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
index 5abe94833178e..8c41b0a0f2626 100644
--- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
@@ -16,4 +16,8 @@ return [
     'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
     'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
     'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+    'amqp-host' => 'localhost',
+    'amqp-port' => '5672',
+    'amqp-user' => 'guest',
+    'amqp-password' => 'guest',
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppArea.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppArea.php
index 3ef7cd608c779..879e771d3239d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppArea.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppArea.php
@@ -15,17 +15,18 @@ class AppArea
     private $_application;
 
     /**
-     * List of allowed areas
+     * List of allowed areas.
      *
      * @var array
      */
     private $_allowedAreas = [
         \Magento\Framework\App\Area::AREA_GLOBAL,
-        \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+        \Magento\Framework\App\Area::AREA_ADMINHTML,
         \Magento\Framework\App\Area::AREA_FRONTEND,
-        'webapi_rest',
-        'webapi_soap',
-        'cron',
+        \Magento\Framework\App\Area::AREA_WEBAPI_REST,
+        \Magento\Framework\App\Area::AREA_WEBAPI_SOAP,
+        \Magento\Framework\App\Area::AREA_CRONTAB,
+        \Magento\Framework\App\Area::AREA_GRAPHQL
     ];
 
     /**
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
index 6ab28f1456a89..dc525a46428c4 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use PHPUnit\Framework\Exception;
+
 class DataFixture
 {
     /**
@@ -171,8 +173,13 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), $e->getMessage()),
+            throw new Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
                 500,
                 $e
             );
@@ -203,7 +210,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/Annotation/DataFixtureBeforeTransaction.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
index 423bd22f0a8a9..db7f57362d807 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use PHPUnit\Framework\Exception;
+
 class DataFixtureBeforeTransaction
 {
     /**
@@ -138,8 +140,15 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), (string)$e)
+            throw new Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
+                500,
+                $e
             );
         }
     }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php
new file mode 100644
index 0000000000000..9f8518239cce5
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Annotation;
+
+use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher;
+use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcherConfiguration;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\App\Config;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Implementation of the @magentoIndexerDimensionMode DocBlock annotation
+ */
+class IndexerDimensionMode
+{
+    /** @var TypeListInterface */
+    private $cacheTypeList;
+
+    /** @var ScopeConfigInterface */
+    private $configReader;
+
+    /** @var ModeSwitcher */
+    private $modeSwitcher;
+
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var \Magento\TestFramework\Db\Mysql */
+    private $db;
+
+    /** @var bool */
+    private $isDimensionMode = false;
+
+    /**
+     * Restore db
+     */
+    private function restoreDb()
+    {
+        $this->db = Bootstrap::getInstance()->getBootstrap()->getApplication()->getDbInstance();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->db->restoreFromDbDump();
+        $this->cacheTypeList = $this->objectManager->get(TypeListInterface::class);
+        $this->cacheTypeList->cleanType('config');
+        $this->objectManager->get(Config::class)->clean();
+    }
+
+    /**
+     * @param string $mode
+     * @param TestCase $test
+     * @throws \Exception
+     */
+    private function setDimensionMode(string $mode, TestCase $test)
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->modeSwitcher = $this->objectManager->get(ModeSwitcher::class);
+        $this->configReader = $this->objectManager->get(ScopeConfigInterface::class);
+        $this->cacheTypeList = $this->objectManager->get(TypeListInterface::class);
+
+        $this->configReader->clean();
+        $previousMode = $this->configReader->getValue(ModeSwitcherConfiguration::XML_PATH_PRICE_DIMENSIONS_MODE) ?:
+            DimensionModeConfiguration::DIMENSION_NONE;
+
+        if ($previousMode !== $mode) {
+            //Create new tables and move data
+            $this->modeSwitcher->switchMode($mode, $previousMode);
+            $this->objectManager->get(Config::class)->clean();
+        } else {
+            $this->fail('Dimensions mode for indexer has not been changed', $test);
+        }
+    }
+
+    /**
+     * Handler for 'startTest' event
+     *
+     * @param TestCase $test
+     * @return void
+     * @throws \Exception
+     */
+    public function startTest(TestCase $test)
+    {
+        $source = $test->getAnnotations();
+
+        if (isset($source['method']['magentoIndexerDimensionMode'])) {
+            $annotations = $source['method']['magentoIndexerDimensionMode'];
+        } elseif (isset($source['class']['magentoIndexerDimensionMode'])) {
+            $annotations = $source['class']['magentoIndexerDimensionMode'];
+        } else {
+            return;
+        }
+
+        $dbIsolation = $source['method']['magentoDbIsolation']
+            ?? $source['class']['magentoDbIsolation']
+            ?? ['disabled'];
+
+        if ($dbIsolation[0] != 'disabled') {
+            $this->fail("Invalid @magentoDbIsolation declaration: $dbIsolation[0]", $test);
+        }
+
+        list($indexerType, $indexerMode) = explode(' ', $annotations[0]);
+
+        if ($indexerType == Processor::INDEXER_ID) {
+            $this->isDimensionMode = true;
+            $this->setDimensionMode($indexerMode, $test);
+        }
+    }
+
+    /**
+     * Handler for 'endTest' event
+     *
+     * @return void
+     */
+    public function endTest()
+    {
+        if ($this->isDimensionMode) {
+            $this->restoreDb();
+            $this->isDimensionMode = false;
+        }
+    }
+
+    /**
+     * Fails the test with specified error message
+     *
+     * @param string $message
+     * @param TestCase $test
+     * @throws \Exception
+     */
+    private function fail($message, TestCase $test)
+    {
+        $test->fail("{$message} in the test '{$test->toString()}'");
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index a5eacc54f6921..1bfc928f2916a 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -13,7 +13,7 @@
 use Magento\Framework\Filesystem\Glob;
 
 /**
- * Encapsulates application installation, initialization and uninstall
+ * Encapsulates application installation, initialization and uninstall.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -21,110 +21,110 @@
 class Application
 {
     /**
-     * Default application area
+     * Default application area.
      */
     const DEFAULT_APP_AREA = 'global';
 
     /**
-     * DB vendor adapter instance
+     * DB vendor adapter instance.
      *
      * @var \Magento\TestFramework\Db\AbstractDb
      */
     protected $_db;
 
     /**
-     * Shell command executor
+     * Shell command executor.
      *
      * @var \Magento\Framework\Shell
      */
     protected $_shell;
 
     /**
-     * Configuration file that contains installation parameters
+     * Configuration file that contains installation parameters.
      *
      * @var string
      */
     private $installConfigFile;
 
     /**
-     * The loaded installation parameters
+     * The loaded installation parameters.
      *
      * @var array
      */
     protected $installConfig;
 
     /**
-     * Application *.xml configuration files
+     * Application *.xml configuration files.
      *
      * @var array
      */
     protected $_globalConfigDir;
 
     /**
-     * Installation destination directory
+     * Installation destination directory.
      *
      * @var string
      */
     protected $installDir;
 
     /**
-     * Installation destination directory with configuration files
+     * Installation destination directory with configuration files.
      *
      * @var string
      */
     protected $_configDir;
 
     /**
-     * Application initialization parameters
+     * Application initialization parameters.
      *
      * @var array
      */
     protected $_initParams = [];
 
     /**
-     * Mode to run application
+     * Mode to run application.
      *
      * @var string
      */
     protected $_appMode;
 
     /**
-     * Application area
+     * Application area.
      *
      * @var null
      */
     protected $_appArea = null;
 
     /**
-     * Primary DI Config
+     * Primary DI Config.
      *
      * @var array
      */
     protected $_primaryConfigData = [];
 
     /**
-     * Object manager factory
+     * Object manager factory.
      *
      * @var \Magento\TestFramework\ObjectManagerFactory
      */
     protected $_factory;
 
     /**
-     * Directory List
+     * Directory list.
      *
      * @var \Magento\Framework\App\Filesystem\DirectoryList
      */
     protected $dirList;
 
     /**
-     * Config file for integration tests
+     * Config file for integration tests.
      *
      * @var string
      */
     private $globalConfigFile;
 
     /**
-     * Defines whether load test extension attributes or not
+     * Defines whether load test extension attributes or not.
      *
      * @var bool
      */
@@ -136,7 +136,17 @@ class Application
     protected $dumpDb = true;
 
     /**
-     * Constructor
+     * @var bool
+     */
+    protected $canLoadArea = true;
+
+    /**
+     * @var bool
+     */
+    protected $canInstallSequence = true;
+
+    /**
+     * Constructor.
      *
      * @param \Magento\Framework\Shell $shell
      * @param string $installDir
@@ -186,7 +196,7 @@ public function __construct(
     }
 
     /**
-     * Retrieve the database adapter instance
+     * Retrieve the database adapter instance.
      *
      * @return \Magento\TestFramework\Db\AbstractDb
      */
@@ -234,7 +244,7 @@ public function getDbInstance()
     }
 
     /**
-     * Gets installation parameters
+     * Gets installation parameters.
      *
      * @return array
      */
@@ -247,7 +257,7 @@ protected function getInstallConfig()
     }
 
     /**
-     * Gets deployment configuration path
+     * Gets deployment configuration path.
      *
      * @return string
      */
@@ -257,7 +267,7 @@ private function getLocalConfig()
     }
 
     /**
-     * Get path to temporary directory
+     * Get path to temporary directory.
      *
      * @return string
      */
@@ -267,7 +277,7 @@ public function getTempDir()
     }
 
     /**
-     * Retrieve application initialization parameters
+     * Retrieve application initialization parameters.
      *
      * @return array
      */
@@ -277,7 +287,7 @@ public function getInitParams()
     }
 
     /**
-     * Weather the application is installed or not
+     * Weather the application is installed or not.
      *
      * @return bool
      */
@@ -287,32 +297,13 @@ public function isInstalled()
     }
 
     /**
-     * Initialize application
+     * Create logger instance and rewrite already exist one in ObjectManager.
      *
-     * @param array $overriddenParams
-     * @return void
+     * @return \Psr\Log\LoggerInterface
      */
-    public function initialize($overriddenParams = [])
+    private function initLogger()
     {
-        $overriddenParams[\Magento\Framework\App\State::PARAM_MODE] = $this->_appMode;
-        $overriddenParams = $this->_customizeParams($overriddenParams);
-        $directories = isset($overriddenParams[\Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS])
-            ? $overriddenParams[\Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS]
-            : [];
-        $directoryList = new DirectoryList(BP, $directories);
-        /** @var \Magento\TestFramework\ObjectManager $objectManager */
         $objectManager = Helper\Bootstrap::getObjectManager();
-        if (!$objectManager) {
-            $objectManager = $this->_factory->create($overriddenParams);
-            $objectManager->addSharedInstance($directoryList, \Magento\Framework\App\Filesystem\DirectoryList::class);
-            $objectManager->addSharedInstance($directoryList, \Magento\Framework\Filesystem\DirectoryList::class);
-        } else {
-            $objectManager = $this->_factory->restore($objectManager, $directoryList, $overriddenParams);
-        }
-        /** @var \Magento\TestFramework\App\Filesystem $filesystem */
-        $filesystem = $objectManager->get(\Magento\TestFramework\App\Filesystem::class);
-        $objectManager->removeSharedInstance(\Magento\Framework\Filesystem::class);
-        $objectManager->addSharedInstance($filesystem, \Magento\Framework\Filesystem::class);
         /** @var \Psr\Log\LoggerInterface $logger */
         $logger = $objectManager->create(
             \Magento\TestFramework\ErrorLog\Logger::class,
@@ -336,11 +327,44 @@ public function initialize($overriddenParams = [])
                 ]
             ]
         );
+
         $objectManager->removeSharedInstance(\Magento\Framework\Logger\Monolog::class);
         $objectManager->addSharedInstance($logger, \Magento\Framework\Logger\Monolog::class);
+        return $logger;
+    }
+
+    /**
+     * Initialize application
+     *
+     * @param array $overriddenParams
+     * @return void
+     */
+    public function initialize($overriddenParams = [])
+    {
+        $overriddenParams[\Magento\Framework\App\State::PARAM_MODE] = $this->_appMode;
+        $overriddenParams = $this->_customizeParams($overriddenParams);
+        $directories = isset($overriddenParams[\Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS])
+            ? $overriddenParams[\Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS]
+            : [];
+        $directoryList = new DirectoryList(BP, $directories);
+        /** @var \Magento\TestFramework\ObjectManager $objectManager */
+        $objectManager = Helper\Bootstrap::getObjectManager();
+        if (!$objectManager) {
+            $objectManager = $this->_factory->create($overriddenParams);
+            $objectManager->addSharedInstance($directoryList, \Magento\Framework\App\Filesystem\DirectoryList::class);
+            $objectManager->addSharedInstance($directoryList, \Magento\Framework\Filesystem\DirectoryList::class);
+        } else {
+            $objectManager = $this->_factory->restore($objectManager, $directoryList, $overriddenParams);
+        }
+        /** @var \Magento\TestFramework\App\Filesystem $filesystem */
+        $filesystem = $objectManager->get(\Magento\TestFramework\App\Filesystem::class);
+        $objectManager->removeSharedInstance(\Magento\Framework\Filesystem::class);
+        $objectManager->addSharedInstance($filesystem, \Magento\Framework\Filesystem::class);
+        Helper\Bootstrap::setObjectManager($objectManager);
+        $this->initLogger();
         $sequenceBuilder = $objectManager->get(\Magento\TestFramework\Db\Sequence\Builder::class);
         $objectManager->addSharedInstance($sequenceBuilder, \Magento\SalesSequence\Model\Builder::class);
-        Helper\Bootstrap::setObjectManager($objectManager);
+
         $objectManagerConfiguration = [
             'preferences' => [
                 \Magento\Framework\App\State::class => \Magento\TestFramework\App\State::class,
@@ -378,16 +402,24 @@ public function initialize($overriddenParams = [])
                 ]
             ]
         );
-        $this->loadArea(\Magento\TestFramework\Application::DEFAULT_APP_AREA);
+
+        if ($this->canLoadArea) {
+            $this->loadArea(\Magento\TestFramework\Application::DEFAULT_APP_AREA);
+        }
+
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->configure(
             $objectManager->get(\Magento\Framework\ObjectManager\DynamicConfigInterface::class)->getConfiguration()
         );
         \Magento\Framework\Phrase::setRenderer(
             $objectManager->get(\Magento\Framework\Phrase\Renderer\Placeholder::class)
         );
-        /** @var \Magento\TestFramework\Db\Sequence $sequence */
-        $sequence = $objectManager->get(\Magento\TestFramework\Db\Sequence::class);
-        $sequence->generateSequences();
+
+        if ($this->canInstallSequence) {
+            /** @var \Magento\TestFramework\Db\Sequence $sequence */
+            $sequence = $objectManager->get(\Magento\TestFramework\Db\Sequence::class);
+            $sequence->generateSequences();
+        }
+
         $objectManager->create(\Magento\TestFramework\Config::class, ['configPath' => $this->globalConfigFile])
             ->rewriteAdditionalConfig();
     }
@@ -419,16 +451,26 @@ public function run()
     }
 
     /**
-     * Cleanup both the database and the file system
+     * Create install dir for integration framework
      *
      * @return void
      */
-    public function cleanup()
+    public function createInstallDir()
     {
         $this->_ensureDirExists($this->installDir);
         $this->_ensureDirExists($this->_configDir);
 
         $this->copyAppConfigFiles();
+    }
+
+    /**
+     * Cleanup both the database and the file system
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->createInstallDir();
         /**
          * @see \Magento\Setup\Mvc\Bootstrap\InitParamListener::BOOTSTRAP_PARAM
          */
@@ -441,10 +483,11 @@ public function cleanup()
     /**
      * Install an application
      *
+     * @param bool $cleanup
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function install()
+    public function install($cleanup)
     {
         $dirs = \Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS;
         $this->_ensureDirExists($this->installDir);
@@ -455,12 +498,14 @@ public function install()
         $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]);
 
         $this->copyAppConfigFiles();
+        $this->copyGlobalConfigFile();
 
         $installParams = $this->getInstallCliParams();
 
         // performance optimization: restore DB from last good dump to make installation on top of it (much faster)
+        // do not restore from the database if the cleanup option is set to ensure we have a clean DB to test on
         $db = $this->getDbInstance();
-        if ($db->isDbDumpExists()) {
+        if ($db->isDbDumpExists() && !$cleanup) {
             $db->restoreFromDbDump();
         }
 
@@ -502,7 +547,7 @@ public function install()
     private function copyAppConfigFiles()
     {
         $globalConfigFiles = Glob::glob(
-            $this->_globalConfigDir . '/{di.xml,*/di.xml,vendor_path.php}',
+            $this->_globalConfigDir . '/{di.xml,*/di.xml,db_schema.xml,vendor_path.php}',
             Glob::GLOB_BRACE
         );
         foreach ($globalConfigFiles as $file) {
@@ -513,6 +558,17 @@ private function copyAppConfigFiles()
             }
         }
     }
+    
+    /**
+     * Copies global configuration file from the tests folder (see TESTS_GLOBAL_CONFIG_FILE)
+     *
+     * @return void
+     */
+    private function copyGlobalConfigFile()
+    {
+        $targetFile = $this->_configDir . '/config.local.php';
+        copy($this->globalConfigFile, $targetFile);
+    }
 
     /**
      * Gets a list of CLI params for installation
@@ -582,7 +638,7 @@ protected function _ensureDirExists($dir)
     {
         if (!file_exists($dir)) {
             $old = umask(0);
-            mkdir($dir);
+            mkdir($dir, 0777, true);
             umask($old);
         } elseif (!is_dir($dir)) {
             throw new \Magento\Framework\Exception\LocalizedException(__("'%1' is not a directory.", $dir));
@@ -604,6 +660,7 @@ public function getArea()
      *
      * @param string $areaCode
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function loadArea($areaCode)
     {
@@ -620,7 +677,14 @@ public function loadArea($areaCode)
             )
         );
         $app = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\AreaList::class);
-        if ($areaCode == \Magento\TestFramework\Application::DEFAULT_APP_AREA) {
+        $areasForPartialLoading = [
+            \Magento\Framework\App\Area::AREA_GLOBAL,
+            \Magento\Framework\App\Area::AREA_WEBAPI_REST,
+            \Magento\Framework\App\Area::AREA_WEBAPI_SOAP,
+            \Magento\Framework\App\Area::AREA_CRONTAB,
+            \Magento\Framework\App\Area::AREA_GRAPHQL
+        ];
+        if (in_array($areaCode, $areasForPartialLoading, true)) {
             $app->getArea($areaCode)->load(\Magento\Framework\App\Area::PART_CONFIG);
         } else {
             \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($areaCode);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
index d0b6d0427bbd3..9a6b808ef7d61 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Bootstrap;
 
+use Magento\TestFramework\Application;
+
 /**
  * Bootstrap of the custom DocBlock annotations
  *
@@ -27,8 +29,9 @@ public function __construct($fixturesBaseDir)
 
     /**
      * Activate custom DocBlock annotations along with more-or-less permanent workarounds
+     * @param Application $application
      */
-    public function registerAnnotations(\Magento\TestFramework\Application $application)
+    public function registerAnnotations(Application $application)
     {
         $eventManager = new \Magento\TestFramework\EventManager($this->_getSubscribers($application));
         \Magento\TestFramework\Event\PhpUnit::setDefaultEventManager($eventManager);
@@ -42,10 +45,10 @@ public function registerAnnotations(\Magento\TestFramework\Application $applicat
      * To allow config fixtures to deal with fixture stores, data fixtures should be processed first.
      * ConfigFixture applied twice because data fixtures could clean config and clean custom settings
      *
-     * @param \Magento\TestFramework\Application $application
+     * @param Application $application
      * @return array
      */
-    protected function _getSubscribers(\Magento\TestFramework\Application $application)
+    protected function _getSubscribers(Application $application)
     {
         return [
             new \Magento\TestFramework\Workaround\Segfault(),
@@ -54,6 +57,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
             new \Magento\TestFramework\Isolation\WorkingDirectory(),
             new \Magento\TestFramework\Isolation\DeploymentConfig(),
             new \Magento\TestFramework\Annotation\AppIsolation($application),
+            new \Magento\TestFramework\Annotation\IndexerDimensionMode($application),
             new \Magento\TestFramework\Isolation\AppConfig(),
             new \Magento\TestFramework\Annotation\ConfigFixture(),
             new \Magento\TestFramework\Annotation\DataFixtureBeforeTransaction($this->_fixturesBaseDir),
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/AbstractDb.php b/dev/tests/integration/framework/Magento/TestFramework/Db/AbstractDb.php
index 949d17ffb5f66..a15bdec6157a3 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/AbstractDb.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/AbstractDb.php
@@ -84,7 +84,7 @@ abstract public function cleanup();
     abstract protected function getSetupDbDumpFilename();
 
     /**
-     * Is dump esxists
+     * Is dump exists
      *
      * @return bool
      */
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
index bb2ea585ec9fd..6407db7495854 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
@@ -4,13 +4,14 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * See \Magento\TestFramework\Db\Adapter\TransactionInterface
  */
 namespace Magento\TestFramework\Db\Adapter;
 
-class Mysql extends \Magento\Framework\DB\Adapter\Pdo\Mysql implements
-    \Magento\TestFramework\Db\Adapter\TransactionInterface
+class Mysql extends \Magento\Framework\DB\Adapter\Pdo\Mysql implements \Magento\TestFramework\Db\Adapter\TransactionInterface
 {
     /**
      * @var int
@@ -49,14 +50,4 @@ public function rollbackTransparentTransaction()
         $this->_levelAdjustment -= 1;
         return $this->rollback();
     }
-
-    /**
-     * Adjust transaction level with "transparent" counter
-     *
-     * @return int
-     */
-    public function getTransactionLevel()
-    {
-        return parent::getTransactionLevel() - $this->_levelAdjustment;
-    }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
index 69f7f2b2ed8db..6900f89a55f9d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
@@ -87,7 +87,7 @@ protected function getSetupDbDumpFilename()
     }
 
     /**
-     * Is dump esxists
+     * Is dump exists
      *
      * @return bool
      */
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
new file mode 100644
index 0000000000000..992b980d6a80d
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Helper;
+
+/**
+ * Helper class to access RabbitMQ server configuration
+ */
+class Amqp
+{
+    /**
+     * @var Curl
+     */
+    private $curl;
+
+    /**
+     * RabbitMQ API host
+     *
+     * @var string
+     */
+    private $host = 'http://localhost:15672/api/';
+
+    /**
+     * Initialize dependencies.
+     */
+    public function __construct()
+    {
+        $this->curl = new Curl();
+        $this->curl->setCredentials('guest', 'guest');
+        $this->curl->addHeader('content-type', 'application/json');
+    }
+
+    /**
+     * Get declared exchanges.
+     *
+     * @return array
+     */
+    public function getExchanges()
+    {
+        $this->curl->get($this->host . 'exchanges');
+        $data = $this->curl->getBody();
+        $data = json_decode($data, true);
+        $output = [];
+        foreach ($data as $value) {
+            $output[$value['name']] = $value;
+        }
+        return $output;
+    }
+
+    /**
+     * Get declared exchange bindings.
+     *
+     * @return array
+     */
+    public function getExchangeBindings($name)
+    {
+        $this->curl->get($this->host . 'exchanges/%2f/' . $name . '/bindings/source');
+        $data = $this->curl->getBody();
+        return json_decode($data, true);
+    }
+
+    /**
+     * 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 0000000000000..62b753cf5d344
--- /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 0000000000000..474e7215bef2b
--- /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 0000000000000..270e4e8c013de
--- /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 0000000000000..14847ae506622
--- /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/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
index 543bac2c6b5b5..b2e0b57bae729 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\TestFramework\TestCase;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
- * A parent class for backend controllers - contains directives for admin user creation and authentication
+ * A parent class for backend controllers - contains directives for admin user creation and authentication.
+ *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @SuppressWarnings(PHPMD.numberOfChildren)
  */
 abstract class AbstractBackendController extends \Magento\TestFramework\TestCase\AbstractController
 {
@@ -36,6 +38,16 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
      */
     protected $uri = null;
 
+    /**
+     * @var string|null
+     */
+    protected $httpMethod;
+
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -62,6 +74,9 @@ protected function _getAdminCredentials()
         ];
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         $this->_auth->getAuthStorage()->destroy(['send_expire_cookie' => false]);
@@ -86,21 +101,33 @@ public function assertSessionMessages(
         parent::assertSessionMessages($constraint, $messageType, $messageManagerClass);
     }
 
+    /**
+     * Test ACL configuration for action working.
+     */
     public function testAclHasAccess()
     {
         if ($this->uri === null) {
             $this->markTestIncomplete('AclHasAccess test is not complete');
         }
+        if ($this->httpMethod) {
+            $this->getRequest()->setMethod($this->httpMethod);
+        }
         $this->dispatch($this->uri);
         $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());
         $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode());
     }
 
+    /**
+     * Test ACL actually denying access.
+     */
     public function testAclNoAccess()
     {
         if ($this->resource === null) {
             $this->markTestIncomplete('Acl test is not complete');
         }
+        if ($this->httpMethod) {
+            $this->getRequest()->setMethod($this->httpMethod);
+        }
         $this->_objectManager->get(\Magento\Framework\Acl\Builder::class)
             ->getAcl()
             ->deny(null, $this->resource);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php
index 913c710370816..92ac7ddd468ab 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php
@@ -47,7 +47,7 @@ public function setUp()
                 \Magento\Framework\App\Arguments\FileResolver\Primary::class
             )->disableOriginalConstructor()->getMock();
 
-            /* Enable Validation regardles of MAGE_MODE */
+            /* Enable Validation regardless of MAGE_MODE */
             $validateStateMock = $this->getMockBuilder(
                 \Magento\Framework\Config\ValidationStateInterface::class
             )->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
index 9920f90193f69..feb9eca0793a2 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
@@ -9,9 +9,13 @@
  */
 namespace Magento\TestFramework\TestCase;
 
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Theme\Controller\Result\MessagePlugin;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http as HttpResponse;
 
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -68,6 +72,9 @@ protected function setUp()
         $this->_objectManager->removeSharedInstance(\Magento\Framework\App\RequestInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         $this->_request = null;
@@ -96,14 +103,23 @@ protected function assertPostConditions()
      */
     public function dispatch($uri)
     {
-        $this->getRequest()->setRequestUri($uri);
+        /** @var HttpRequest $request */
+        $request = $this->getRequest();
+        $request->setRequestUri($uri);
+        if ($request->isPost()
+            && !array_key_exists('form_key', $request->getPost())
+        ) {
+            /** @var FormKey $formKey */
+            $formKey = $this->_objectManager->get(FormKey::class);
+            $request->setPostValue('form_key', $formKey->getFormKey());
+        }
         $this->_getBootstrap()->runApp();
     }
 
     /**
      * Request getter
      *
-     * @return \Magento\Framework\App\RequestInterface
+     * @return \Magento\Framework\App\RequestInterface|HttpRequest
      */
     public function getRequest()
     {
@@ -116,7 +132,7 @@ public function getRequest()
     /**
      * Response getter
      *
-     * @return \Magento\Framework\App\ResponseInterface
+     * @return \Magento\Framework\App\ResponseInterface|HttpResponse
      */
     public function getResponse()
     {
@@ -201,13 +217,21 @@ public function assertSessionMessages(
         $messageManagerClass = \Magento\Framework\Message\Manager::class
     ) {
         $this->_assertSessionErrors = false;
-
+        /** @var MessageInterface[]|string[] $messageObjects */
         $messages = $this->getMessages($messageType, $messageManagerClass);
+        /** @var string[] $messages */
+        $messagesFiltered = array_map(
+            function ($message) {
+                /** @var MessageInterface|string $message */
+                return ($message instanceof MessageInterface) ? $message->toString() : $message;
+            },
+            $messages
+        );
 
         $this->assertThat(
-            $messages,
+            $messagesFiltered,
             $constraint,
-            'Session messages do not meet expectations ' . var_export($messages, true)
+            'Session messages do not meet expectations ' . var_export($messagesFiltered, true)
         );
     }
 
diff --git a/dev/tests/integration/framework/bootstrap.php b/dev/tests/integration/framework/bootstrap.php
index 13008938147b5..1cae393dc01c3 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';
 
@@ -74,7 +78,7 @@
         $application->cleanup();
     }
     if (!$application->isInstalled()) {
-        $application->install();
+        $application->install($settings->getAsBoolean('TESTS_CLEANUP'));
     }
     $application->initialize([]);
 
diff --git a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
index b52ca37987cb7..1a93397caaa4a 100644
--- a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
@@ -21,4 +21,32 @@
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="@magentoDbIsolation">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php
index a4c8816b13ee1..c89df3417ed71 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Test\Annotation;
 
+use Magento\Framework\App\Area;
+
 class AppAreaTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -13,12 +16,12 @@ class AppAreaTest extends \PHPUnit\Framework\TestCase
     protected $_object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\TestFramework\Application|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_applicationMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\TestCase|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_testCaseMock;
 
@@ -69,6 +72,22 @@ public function testGetTestAppAreaWithInvalidArea()
         $this->_object->startTest($this->_testCaseMock);
     }
 
+    /**
+     * Check startTest() with different allowed area codes.
+     *
+     * @dataProvider startTestWithDifferentAreaCodes
+     * @param string $areaCode
+     */
+    public function testStartTestWithDifferentAreaCodes(string $areaCode)
+    {
+        $annotations = ['method' => ['magentoAppArea' => [$areaCode]]];
+        $this->_testCaseMock->expects($this->once())->method('getAnnotations')->will($this->returnValue($annotations));
+        $this->_applicationMock->expects($this->any())->method('getArea')->willReturn(null);
+        $this->_applicationMock->expects($this->once())->method('reinitialize');
+        $this->_applicationMock->expects($this->once())->method('loadArea')->with($areaCode);
+        $this->_object->startTest($this->_testCaseMock);
+    }
+
     public function testStartTestPreventDoubleAreaLoadingAfterReinitialization()
     {
         $annotations = ['method' => ['magentoAppArea' => ['global']]];
@@ -89,4 +108,36 @@ public function testStartTestPreventDoubleAreaLoading()
         $this->_applicationMock->expects($this->never())->method('loadArea');
         $this->_object->startTest($this->_testCaseMock);
     }
+
+    /**
+     *  Provide test data for testStartTestWithDifferentAreaCodes().
+     *
+     * @return array
+     */
+    public function startTestWithDifferentAreaCodes()
+    {
+        return [
+            [
+                'area_code' => Area::AREA_GLOBAL,
+            ],
+            [
+                'area_code' => Area::AREA_ADMINHTML,
+            ],
+            [
+                'area_code' => Area::AREA_FRONTEND,
+            ],
+            [
+                'area_code' => Area::AREA_WEBAPI_REST,
+            ],
+            [
+                'area_code' => Area::AREA_WEBAPI_SOAP,
+            ],
+            [
+                'area_code' => Area::AREA_CRONTAB,
+            ],
+            [
+                'area_code' => Area::AREA_GRAPHQL,
+            ],
+        ];
+    }
 }
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php
index f8f49613c41b4..e0bba5bcf222c 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php
@@ -3,39 +3,71 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Test;
 
+use Magento\Framework\App\Area;
+use Magento\Framework\App\AreaList;
 use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\ObjectManager\ConfigLoader;
 use Magento\Framework\App\State;
+use Magento\Framework\Autoload\ClassLoaderWrapper;
+use Magento\Framework\Config\Scope;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Shell;
+use Magento\TestFramework\Application;
 
+/**
+ * Provide tests for \Magento\TestFramework\Application.
+ */
 class ApplicationTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @covers \Magento\TestFramework\Application::getTempDir
-     * @covers \Magento\TestFramework\Application::getDbInstance()
-     * @covers \Magento\TestFramework\Application::getInitParams()
+     * Test subject.
+     *
+     * @var Application
      */
-    public function testConstructor()
+    private $subject;
+
+    /**
+     * @var string
+     */
+    private $tempDir;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
     {
-        $shell = $this->createMock(\Magento\Framework\Shell::class);
-        $autoloadWrapper = $this->getMockBuilder(\Magento\Framework\Autoload\ClassLoaderWrapper::class)
+        /** @var Shell|\PHPUnit_Framework_MockObject_MockObject $shell */
+        $shell = $this->createMock(Shell::class);
+        /** @var ClassLoaderWrapper|\PHPUnit_Framework_MockObject_MockObject $autoloadWrapper */
+        $autoloadWrapper = $this->getMockBuilder(ClassLoaderWrapper::class)
             ->disableOriginalConstructor()->getMock();
-        $tempDir = '/temp/dir';
+        $this->tempDir = '/temp/dir';
         $appMode = \Magento\Framework\App\State::MODE_DEVELOPER;
 
-        $object = new \Magento\TestFramework\Application(
+        $this->subject = new Application(
             $shell,
-            $tempDir,
+            $this->tempDir,
             'config.php',
             'global-config.php',
             '',
             $appMode,
             $autoloadWrapper
         );
+    }
 
-        $this->assertEquals($tempDir, $object->getTempDir(), 'Temp directory is not set in Application');
+    /**
+     * @covers \Magento\TestFramework\Application::getTempDir
+     * @covers \Magento\TestFramework\Application::getDbInstance()
+     * @covers \Magento\TestFramework\Application::getInitParams()
+     */
+    public function testConstructor()
+    {
+        $this->assertEquals($this->tempDir, $this->subject->getTempDir(), 'Temp directory is not set in Application');
 
-        $initParams = $object->getInitParams();
+        $initParams = $this->subject->getInitParams();
         $this->assertInternalType('array', $initParams, 'Wrong initialization parameters type');
         $this->assertArrayHasKey(
             Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS,
@@ -49,4 +81,89 @@ public function testConstructor()
             'Wrong application mode configured'
         );
     }
+
+    /**
+     * Test \Magento\TestFramework\Application will correctly load specified areas.
+     *
+     * @dataProvider partialLoadAreaDataProvider
+     * @param string $areaCode
+     * @return void
+     */
+    public function testPartialLoadArea(string $areaCode)
+    {
+        $configScope = $this->getMockBuilder(Scope::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configScope->expects($this->once())
+            ->method('setCurrentScope')
+            ->with($this->identicalTo($areaCode));
+
+        $configLoader = $this->getMockBuilder(ConfigLoader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configLoader->expects($this->once())
+            ->method('load')
+            ->with($this->identicalTo($areaCode))
+            ->willReturn([]);
+
+        $area = $this->getMockBuilder(Area::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $area->expects($this->once())
+            ->method('load')
+            ->with($this->identicalTo(Area::PART_CONFIG));
+
+        $areaList = $this->getMockBuilder(AreaList::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $areaList->expects($this->once())
+            ->method('getArea')
+            ->with($this->identicalTo($areaCode))
+            ->willReturn($area);
+
+        /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
+        $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager->expects($this->once())
+            ->method('configure')
+            ->with($this->identicalTo([]));
+        $objectManager->expects($this->exactly(3))
+            ->method('get')
+            ->willReturnOnConsecutiveCalls(
+                $configScope,
+                $configLoader,
+                $areaList
+            );
+
+        \Magento\TestFramework\Helper\Bootstrap::setObjectManager($objectManager);
+
+        $this->subject->loadArea($areaCode);
+    }
+
+    /**
+     * Provide test data for testPartialLoadArea().
+     *
+     * @return array
+     */
+    public function partialLoadAreaDataProvider()
+    {
+        return [
+            [
+                'area_code' => Area::AREA_GLOBAL,
+            ],
+            [
+                'area_code' => Area::AREA_WEBAPI_REST,
+            ],
+            [
+                'area_code' => Area::AREA_WEBAPI_SOAP,
+            ],
+            [
+                'area_code' => Area::AREA_CRONTAB,
+            ],
+            [
+                'area_code' => Area::AREA_GRAPHQL,
+            ],
+        ];
+    }
 }
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 b6207f309ead9..0000000000000
--- 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/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php
index aefe51f6ab37c..9964ec7f8c508 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php
@@ -199,7 +199,8 @@ public function getAsConfigFileDataProvider()
      */
     public function testGetAsConfigFileException($settingName, $expectedExceptionMsg)
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $expectedExceptionMsg);
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage((string)$expectedExceptionMsg);
         $this->_object->getAsConfigFile($settingName);
     }
 
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Db/Adapter/TransactionInterfaceTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Db/Adapter/TransactionInterfaceTest.php
index 1ddfbfafed132..ff06dd044a7d5 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Db/Adapter/TransactionInterfaceTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Db/Adapter/TransactionInterfaceTest.php
@@ -26,7 +26,7 @@ public function testBeginTransparentTransaction($class)
         $connectionMock->expects($this->once())->method('beginTransaction')->will($this->returnValue($uniqid));
         $this->assertSame(0, $connectionMock->getTransactionLevel());
         $this->assertEquals($uniqid, $connectionMock->beginTransparentTransaction());
-        $this->assertSame(-1, $connectionMock->getTransactionLevel());
+        $this->assertSame(0, $connectionMock->getTransactionLevel());
     }
 
     /**
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php
index 5bb273b4e2781..feb1c0bf61c16 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php
@@ -30,7 +30,7 @@ protected function setUp()
     {
         $this->_eventManager = $this->getMockBuilder(\Magento\TestFramework\EventManager::class)
             ->setMethods(['fireEvent'])
-            ->setConstructorArgs([[]])
+            ->disableOriginalConstructor()
             ->getMock();
 
         $this->_adapter =
@@ -69,9 +69,9 @@ protected function _imitateTransactionStartRequest($eventName)
     /**
      * Setup expectations for "transaction start" use case
      *
-     * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
+     * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher
      */
-    protected function _expectTransactionStart(\PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
+    protected function _expectTransactionStart(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher)
     {
         $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('startTransaction');
         $this->_adapter->expects($this->once())->method('beginTransaction');
@@ -103,9 +103,9 @@ protected function _imitateTransactionRollbackRequest($eventName)
     /**
      * Setup expectations for "transaction rollback" use case
      *
-     * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
+     * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher
      */
-    protected function _expectTransactionRollback(\PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
+    protected function _expectTransactionRollback(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher)
     {
         $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('rollbackTransaction');
         $this->_adapter->expects($this->once())->method('rollback');
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
index 7ed1ada02efb2..b54a504a1bebc 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>
@@ -76,5 +77,52 @@
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
         <listener class="Magento\TestFramework\ErrorLog\Listener"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/integration/testsuite/Magento/AdminNotification/_files/notifications.php b/dev/tests/integration/testsuite/Magento/AdminNotification/_files/notifications.php
index 4bb05645ed105..6615c24320b21 100644
--- a/dev/tests/integration/testsuite/Magento/AdminNotification/_files/notifications.php
+++ b/dev/tests/integration/testsuite/Magento/AdminNotification/_files/notifications.php
@@ -4,34 +4,34 @@
  * See COPYING.txt for license details.
  */
 $om = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(
     \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
 )->setTitle(
     'Unread Critical 1'
 )->save();
 
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(\Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR)
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(\Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR)
     ->setTitle('Unread Major 1')
     ->save();
 
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(
     \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
 )->setTitle(
     'Unread Critical 2'
 )->save();
 
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(
     \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
 )->setTitle(
     'Unread Critical 3'
 )->save();
 
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(
     \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
 )->setTitle(
     'Read Critical 1'
@@ -39,13 +39,13 @@
     1
 )->save();
 
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(\Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR)
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(\Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR)
     ->setTitle('Unread Major 2')
     ->save();
 
-$mesasge = $om->create(\Magento\AdminNotification\Model\Inbox::class);
-$mesasge->setSeverity(
+$message = $om->create(\Magento\AdminNotification\Model\Inbox::class);
+$message->setSeverity(
     \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
 )->setTitle(
     'Removed Critical 1'
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
index 1aea568395c99..481cc629c6777 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class AdvancedPricingTest extends \PHPUnit\Framework\TestCase
+class AdvancedPricingTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * @var \Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing
@@ -24,6 +24,19 @@ class AdvancedPricingTest extends \PHPUnit\Framework\TestCase
      */
     protected $fileSystem;
 
+    public static function setUpBeforeClass()
+    {
+        $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
         parent::setUp();
@@ -37,7 +50,7 @@ protected function setUp()
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
@@ -49,6 +62,7 @@ public function testExport()
         $index = 0;
         $ids = [];
         $origPricingData = [];
+        $skus = ['simple'];
         while (isset($skus[$index])) {
             $ids[$index] = $productRepository->get($skus[$index])->getId();
             $origPricingData[$index] = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
@@ -94,7 +108,7 @@ private function assertDiscountTypes($exportContent)
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/price/scope 1
      * @magentoDataFixture Magento/AdvancedPricingImportExport/_files/product_with_second_website.php
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 492a957542338..ef5877612a3b9 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
@@ -15,8 +15,8 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setCategoryIds([])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setIsObjectNew(true)
     ->save();
 
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedSearch/Block/SuggestionsTest.php b/dev/tests/integration/testsuite/Magento/AdvancedSearch/Block/SuggestionsTest.php
new file mode 100644
index 0000000000000..85537bcd515b5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AdvancedSearch/Block/SuggestionsTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Block;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Search\Model\QueryResult;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * @magentoAppArea frontend
+ */
+class SuggestionsTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\AdvancedSearch\Block\Suggestions */
+    protected $block;
+
+    protected function setUp()
+    {
+        $suggestedQueries = $this->createMock(SuggestedQueriesInterface::CLASS);
+        $suggestedQueries->expects($this->any())->method('getItems')->willReturn([
+            new QueryResult('test item', 1),
+            new QueryResult("<script>alert('Test');</script>", 1)
+        ]);
+
+        $this->block = Bootstrap::getObjectManager()->create(\Magento\AdvancedSearch\Block\Suggestions::class, [
+            'searchDataProvider' => $suggestedQueries,
+            'title' => 'title',
+        ]);
+    }
+
+    public function testRenderEscaping()
+    {
+        $html = $this->block->toHtml();
+
+        $this->assertContains('test+item', $html);
+        $this->assertContains('test item', $html);
+
+        $this->assertNotContains('<script>', $html);
+        $this->assertContains('%3Cscript%3Ealert%28%27Test%27%29%3B%3C%2Fscript%3E', $html);
+        $this->assertContains("&lt;script&gt;alert(&#039;Test&#039;);&lt;/script&gt;", $html);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/dev/tests/integration/testsuite/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
new file mode 100644
index 0000000000000..63ebbcbc2c961
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Data\Form\Element\TimeFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for CollectionTimeLabel block.
+ */
+class CollectionTimeLabelTest extends TestCase
+{
+    /**
+     * Test render will add comment considering config locale(default en_US).
+     *
+     * @magentoAppIsolation enabled
+     */
+    public function testRenderWithDefaultLocale()
+    {
+        $result = $this->render();
+        $this->assertRegExp('/<span>Pacific Standard Time/', $result);
+    }
+
+    /**
+     * Test render will add comment considering config locale(non-default de_DE).
+     *
+     * @magentoConfigFixture default_store general/locale/code de_DE
+     * @magentoAppIsolation enabled
+     */
+    public function testRenderWithNonDefaultLocale()
+    {
+        $result = $this->render();
+        $this->assertRegExp('/<span>Nordamerikanische Westküsten-Normalzeit/', $result);
+    }
+
+    /**
+     * Render 'time' element.
+     *
+     * @return string
+     */
+    private function render()
+    {
+        $collectionTimeLabel = Bootstrap::getObjectManager()->get(CollectionTimeLabelFactory::class)->create();
+        $form = Bootstrap::getObjectManager()->get(FormFactory::class)->create();
+        $element = Bootstrap::getObjectManager()->get(TimeFactory::class)->create();
+        $element->setForm($form);
+
+        return $collectionTimeLabel->render($element);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/Model/Connector/Http/ReSignUpResponseResolverTest.php b/dev/tests/integration/testsuite/Magento/Analytics/Model/Connector/Http/ReSignUpResponseResolverTest.php
new file mode 100644
index 0000000000000..91f2455c61d87
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/Model/Connector/Http/ReSignUpResponseResolverTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector\Http;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+use Magento\Framework\FlagManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Checks that cron job was set if error handler was set and appropriate http error code was returned.
+ */
+class ReSignUpResponseResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResponseResolver
+     */
+    private $otpResponseResolver;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $updateResponseResolver;
+
+    /**
+     * @var ConverterInterface
+     */
+    private $converter;
+
+    /**
+     * @var ResponseResolver
+     */
+    private $notifyDataChangedResponseResolver;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->otpResponseResolver = $objectManager->get(
+            'OtpResponseResolver'
+        );
+        $this->updateResponseResolver = $objectManager->get(
+            'UpdateResponseResolver'
+        );
+        $this->notifyDataChangedResponseResolver = $objectManager->get(
+            'NotifyDataChangedResponseResolver'
+        );
+        $this->converter = $objectManager->get(ConverterInterface::class);
+        $this->flagManager = $objectManager->get(FlagManager::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
+     * @magentoDbIsolation enabled
+     */
+    public function testReSignUpOnOtp()
+    {
+        $body = $this->converter->toBody(['test' => '42']);
+        $retryResponse = new \Zend_Http_Response(401, [$this->converter->getContentTypeHeader()], $body);
+        $this->otpResponseResolver->getResult($retryResponse);
+        $this->assertCronWasSet();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
+     * @magentoDbIsolation enabled
+     */
+    public function testReSignOnOtpWasNotCalled()
+    {
+        $body = $this->converter->toBody(['test' => '42']);
+        $successResponse = new \Zend_Http_Response(201, [$this->converter->getContentTypeHeader()], $body);
+        $this->otpResponseResolver->getResult($successResponse);
+        $this->assertCronWasNotSet();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
+     * @magentoDbIsolation enabled
+     */
+    public function testReSignUpOnUpdateWasCalled()
+    {
+        $body = $this->converter->toBody(['test' => '42']);
+        $retryResponse = new \Zend_Http_Response(401, [$this->converter->getContentTypeHeader()], $body);
+        $this->updateResponseResolver->getResult($retryResponse);
+        $this->assertCronWasSet();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
+     * @magentoDbIsolation enabled
+     */
+    public function testReSignUpOnUpdateWasNotCalled()
+    {
+        $body = $this->converter->toBody(['test' => '42']);
+        $successResponse = new \Zend_Http_Response(201, [$this->converter->getContentTypeHeader()], $body);
+        $this->updateResponseResolver->getResult($successResponse);
+        $this->assertCronWasNotSet();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
+     * @magentoDbIsolation enabled
+     */
+    public function testReSignUpOnNotifyDataChangedWasNotCalledWhenSubscriptionUpdateIsRunning()
+    {
+        $this->flagManager
+            ->saveFlag(
+                SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE,
+                'https://previous.example.com/'
+            );
+        $body = $this->converter->toBody(['test' => '42']);
+        $retryResponse = new \Zend_Http_Response(401, [$this->converter->getContentTypeHeader()], $body);
+        $this->notifyDataChangedResponseResolver->getResult($retryResponse);
+        $this->assertCronWasNotSet();
+    }
+
+    /**
+     * @return string|null
+     */
+    private function getSubscribeSchedule()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /**
+         * @var $scopeConfig ScopeConfigInterface
+         */
+        $scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+
+        return $scopeConfig->getValue(
+            SubscriptionHandler::CRON_STRING_PATH,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
+    }
+
+    /**
+     * @return int|null
+     */
+    private function getAttemptFlag()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /**
+         * @var $flagManager FlagManager
+         */
+        $flagManager = $objectManager->get(FlagManager::class);
+
+        return $flagManager->getFlagData(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
+    }
+
+    /**
+     * @return void
+     */
+    private function assertCronWasSet()
+    {
+        $this->assertEquals('0 * * * *', $this->getSubscribeSchedule());
+        $this->assertGreaterThan(1, $this->getAttemptFlag());
+    }
+
+    /**
+     * @return void
+     */
+    private function assertCronWasNotSet()
+    {
+        $this->assertNull($this->getSubscribeSchedule());
+        $this->assertNull($this->getAttemptFlag());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/Model/Plugin/BaseUrlConfigPluginTest.php b/dev/tests/integration/testsuite/Magento/Analytics/Model/Plugin/BaseUrlConfigPluginTest.php
new file mode 100644
index 0000000000000..b8933cb5ed3d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/Model/Plugin/BaseUrlConfigPluginTest.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Plugin;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Config\Model\PreparedValueFactory;
+use Magento\Config\Model\ResourceModel\Config\Data as ConfigData;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class BaseUrlConfigPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PreparedValueFactory
+     */
+    private $preparedValueFactory;
+
+    /**
+     * @var ConfigData
+     */
+    private $configValueResourceModel;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->preparedValueFactory = $this->objectManager->get(PreparedValueFactory::class);
+        $this->configValueResourceModel = $this->objectManager->get(ConfigData::class);
+        $this->scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $this->flagManager = $this->objectManager->get(FlagManager::class);
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     */
+    public function testAfterSaveNotSecureUrl()
+    {
+        $this->saveConfigValue(
+            Store::XML_PATH_UNSECURE_BASE_URL,
+            'http://store.com/',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        $this->assertCronWasNotSet();
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     */
+    public function testAfterSaveSecureUrlNotInDefaultScope()
+    {
+        $this->saveConfigValue(
+            Store::XML_PATH_SECURE_BASE_URL,
+            'https://store.com/',
+            ScopeInterface::SCOPE_STORES
+        );
+        $this->assertCronWasNotSet();
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAdminConfigFixture web/secure/base_url https://previous.example.com/
+     */
+    public function testAfterSaveSecureUrlInDefaultScopeOnDoesNotRegisteredInstance()
+    {
+        $this->saveConfigValue(
+            Store::XML_PATH_SECURE_BASE_URL,
+            'https://store.com/',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        $this->assertCronWasNotSet();
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAdminConfigFixture web/secure/base_url https://previous.example.com/
+     * @magentoAdminConfigFixture analytics/general/token MBI_token
+     */
+    public function testAfterSaveSecureUrlInDefaultScopeOnRegisteredInstance()
+    {
+        $this->saveConfigValue(
+            Store::XML_PATH_SECURE_BASE_URL,
+            'https://store.com/',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        $this->assertCronWasSet();
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAdminConfigFixture web/secure/base_url https://previous.example.com/
+     * @magentoAdminConfigFixture analytics/general/token MBI_token
+     */
+    public function testAfterSaveMultipleBaseUrlChanges()
+    {
+        $this->saveConfigValue(
+            Store::XML_PATH_SECURE_BASE_URL,
+            'https://store.com/',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+
+        $this->saveConfigValue(
+            Store::XML_PATH_SECURE_BASE_URL,
+            'https://store10.com/',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        $this->assertCronWasSet();
+    }
+
+    /**
+     * @param string $path The configuration path in format section/group/field_name
+     * @param string $value The configuration value
+     * @param string $scope The configuration scope (default, website, or store)
+     * @return void
+     */
+    private function saveConfigValue(string $path, string $value, string $scope)
+    {
+        $value = $this->preparedValueFactory->create(
+            $path,
+            $value,
+            $scope
+        );
+        $this->configValueResourceModel->save($value);
+    }
+
+    /**
+     * @return void
+     */
+    private function assertCronWasNotSet()
+    {
+        $this->assertNull($this->getSubscriptionUpdateSchedule());
+        $this->assertNull($this->getPreviousUpdateUrl());
+        $this->assertNull($this->getUpdateReverseCounter());
+    }
+
+    /**
+     * @return void
+     */
+    private function assertCronWasSet()
+    {
+        $this->assertSame(
+            '0 * * * *',
+            $this->getSubscriptionUpdateSchedule(),
+            'Subscription update schedule has not been set'
+        );
+        $this->assertSame(
+            'https://previous.example.com/',
+            $this->getPreviousUpdateUrl(),
+            'The previous URL stored for update is not correct'
+        );
+        $this->assertSame(48, $this->getUpdateReverseCounter());
+    }
+
+    /**
+     * @return mixed
+     */
+    private function getSubscriptionUpdateSchedule()
+    {
+        return $this->scopeConfig->getValue(
+            SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+    }
+
+    /**
+     * @return mixed
+     */
+    private function getPreviousUpdateUrl()
+    {
+        return $this->flagManager->getFlagData(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE);
+    }
+
+    /**
+     * @return mixed
+     */
+    private function getUpdateReverseCounter()
+    {
+        return $this->flagManager
+            ->getFlagData(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/Model/ReportUrlProviderTest.php b/dev/tests/integration/testsuite/Magento/Analytics/Model/ReportUrlProviderTest.php
new file mode 100644
index 0000000000000..0e2f8c4cc96a2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/Model/ReportUrlProviderTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Model;
+
+use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
+use Magento\Framework\FlagManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ReportUrlProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ReportUrlProvider
+     */
+    private $reportUrlProvider;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->reportUrlProvider = $objectManager->get(ReportUrlProvider::class);
+        $this->flagManager = $objectManager->get(FlagManager::class);
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     */
+    public function testGetUrlWhenSubscriptionUpdateIsRunning()
+    {
+        $this->flagManager
+            ->saveFlag(
+                SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE,
+                'https://previous.example.com/'
+            );
+        $this->expectException(SubscriptionUpdateException::class);
+        $this->reportUrlProvider->getUrl();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/_files/create_link.php b/dev/tests/integration/testsuite/Magento/Analytics/_files/create_link.php
new file mode 100644
index 0000000000000..928bb6fb36a06
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/_files/create_link.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/**
+ * @var $fileInfoManager \Magento\Analytics\Model\FileInfoManager
+ */
+$fileInfoManager = $objectManager->create(\Magento\Analytics\Model\FileInfoManager::class);
+
+/**
+ * @var $fileInfo \Magento\Analytics\Model\FileInfo
+ */
+$fileInfo = $objectManager->create(
+    \Magento\Analytics\Model\FileInfo::class,
+    ['path' => 'analytics/jsldjsfdkldf/data.tgz', 'initializationVector' => 'binaryDataisdodssds8iui']
+);
+
+$fileInfoManager->save($fileInfo);
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token.php b/dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
new file mode 100644
index 0000000000000..0106bf6f1bdac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/**
+ * @var $configWriter \Magento\Framework\App\Config\Storage\WriterInterface
+ */
+$configWriter = $objectManager->get(\Magento\Framework\App\Config\Storage\WriterInterface::class);
+
+$configWriter->delete(SubscriptionHandler::CRON_STRING_PATH);
+$configWriter->save('analytics/subscription/enabled', 1);
+
+/**
+ * @var $analyticsToken \Magento\Analytics\Model\AnalyticsToken
+ */
+$analyticsToken = $objectManager->get(\Magento\Analytics\Model\AnalyticsToken::class);
+$analyticsToken->storeToken('42');
+
+/**
+ * @var $flagManager \Magento\Framework\FlagManager
+ */
+$flagManager = $objectManager->get(\Magento\Framework\FlagManager::class);
+
+$flagManager->deleteFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token_rollback.php b/dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token_rollback.php
new file mode 100644
index 0000000000000..3fd3e21e282e0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/_files/enabled_subscription_with_invalid_token_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/**
+ * @var $configWriter \Magento\Framework\App\Config\Storage\WriterInterface
+ */
+$configWriter = $objectManager->get(\Magento\Framework\App\Config\Storage\WriterInterface::class);
+
+$configWriter->delete(SubscriptionHandler::CRON_STRING_PATH);
+$configWriter->save('analytics/subscription/enabled', 0);
+
+/**
+ * @var $analyticsToken \Magento\Analytics\Model\AnalyticsToken
+ */
+$analyticsToken = $objectManager->get(\Magento\Analytics\Model\AnalyticsToken::class);
+$analyticsToken->storeToken(null);
+
+/**
+ * @var $flagManager \Magento\Framework\FlagManager
+ */
+$flagManager = $objectManager->get(\Magento\Framework\FlagManager::class);
+
+$flagManager->deleteFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
new file mode 100644
index 0000000000000..5ecc274c5bbb8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\MessageQueue\BulkPublisherInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit\Framework\MockObject_MockObject
+     */
+    private $publisherMock;
+
+    /**
+     * @var BulkManagement
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->publisherMock = $this->createMock(BulkPublisherInterface::class);
+
+        $this->model = $this->objectManager->create(
+            BulkManagement::class,
+            [
+                'publisher' => $this->publisherMock
+            ]
+        );
+    }
+
+    public function testScheduleBulk()
+    {
+        // general bulk information
+        $bulkUuid = '5a12c1bd-a8b5-41d4-8c00-3f5bcaa6d3c7';
+        $bulkDescription = 'Bulk General Information';
+        $topicName = 'example.topic.name';
+        $userId = 1;
+
+        // generate bulk operations that must be saved
+        $operationCount = 100;
+        $operations = [];
+        $operationFactory = $this->objectManager->get(OperationInterfaceFactory::class);
+        for ($index = 0; $index < $operationCount; $index++) {
+            /** @var OperationInterface $operation */
+            $operation = $operationFactory->create();
+            $operation->setBulkUuid($bulkUuid);
+            $operation->setTopicName($topicName);
+            $operation->setSerializedData(json_encode(['entity_id' => $index]));
+            $operations[] = $operation;
+        }
+
+        $this->publisherMock->expects($this->once())
+            ->method('publish')
+            ->with($topicName, $operations);
+
+        // schedule bulk
+        $this->assertTrue($this->model->scheduleBulk($bulkUuid, $operations, $bulkDescription, $userId));
+        $storedData = $this->getStoredOperationData();
+        // No operations should be saved to database during bulk creation
+        $this->assertCount(0, $storedData);
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testRetryBulk()
+    {
+        $bulkUuid = 'bulk-uuid-5';
+        $topicName = 'topic-4';
+        $errorCodes = [1111, 2222];
+        $operations = $this->objectManager->get(CollectionFactory::class)
+            ->create()
+            ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
+            ->getItems();
+        foreach ($operations as $operation) {
+            $operation->setId(null);
+        }
+        $this->publisherMock->expects($this->once())
+            ->method('publish')
+            ->with($topicName, array_values($operations));
+        $this->assertEquals(2, $this->model->retryBulk($bulkUuid, $errorCodes));
+
+        $operations = $this->objectManager->get(CollectionFactory::class)
+            ->create()
+            ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
+            ->getItems();
+        // Failed operations should be removed from database during bulk retry
+        $this->assertCount(0, $operations);
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testDeleteBulk()
+    {
+        $this->model->deleteBulk('bulk-uuid-1');
+
+        /** @var EntityManager $entityManager */
+        $entityManager = $this->objectManager->get(EntityManager::class);
+        $bulkSummaryFactory = $this->objectManager->get(BulkSummaryInterfaceFactory::class);
+        /** @var BulkSummaryInterface $bulkSummary */
+        $bulkSummary = $entityManager->load($bulkSummaryFactory->create(), 'bulk-uuid-1');
+        $this->assertNull($bulkSummary->getBulkId());
+    }
+
+    /**
+     * Retrieve stored operation data
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getStoredOperationData()
+    {
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = $this->objectManager->get(MetadataPool::class);
+        $operationMetadata = $metadataPool->getMetadata(OperationInterface::class);
+        /** @var ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->get(ResourceConnection::class);
+        $connection = $resourceConnection->getConnectionByName($operationMetadata->getEntityConnectionName());
+
+        return $connection->fetchAll($connection->select()->from($operationMetadata->getEntityTable()));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkNotificationManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkNotificationManagementTest.php
new file mode 100644
index 0000000000000..f8a349e04c237
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkNotificationManagementTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+
+class BulkNotificationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var BulkNotificationManagement
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->model = $this->objectManager->create(
+            BulkNotificationManagement::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testAcknowledgeBulks()
+    {
+        $this->model->acknowledgeBulks(['bulk-uuid-5']);
+
+        $acknowledgedBulks = $this->model->getAcknowledgedBulksByUser(1);
+        $this->assertCount(1, $acknowledgedBulks);
+        /** @var BulkSummaryInterface $acknowledgedBulk */
+        $acknowledgedBulk = array_pop($acknowledgedBulks);
+        $this->assertEquals('bulk-uuid-5', $acknowledgedBulk->getBulkId());
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/acknowledged_bulk.php
+     */
+    public function testIgnoreBulks()
+    {
+        // 'bulk-uuid-5' and 'bulk-uuid-4' are marked as acknowledged in fixture
+        $this->model->ignoreBulks(['bulk-uuid-5']);
+
+        $acknowledgedBulks = $this->model->getAcknowledgedBulksByUser(1);
+        $this->assertCount(1, $acknowledgedBulks);
+        /** @var BulkSummaryInterface $acknowledgedBulk */
+        $acknowledgedBulk = array_pop($acknowledgedBulks);
+        $this->assertEquals('bulk-uuid-4', $acknowledgedBulk->getBulkId());
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/acknowledged_bulk.php
+     */
+    public function testGetAcknowledgedBulks()
+    {
+        // 'bulk-uuid-5' and 'bulk-uuid-4' are marked as acknowledged in fixture
+        $acknowledgedBulks = $this->model->getAcknowledgedBulksByUser(1);
+        $this->assertCount(2, $acknowledgedBulks);
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/acknowledged_bulk.php
+     */
+    public function testGetIgnoredBulks()
+    {
+        // 'bulk-uuid-5' and 'bulk-uuid-4' are marked as acknowledged in fixture. Fixture creates 5 bulks in total.
+        $ignoredBulks = $this->model->getIgnoredBulksByUser(1);
+        $this->assertCount(3, $ignoredBulks);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkStatusTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkStatusTest.php
new file mode 100644
index 0000000000000..a7857bd7a2fdb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkStatusTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+class BulkStatusTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkStatus
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\AsynchronousOperations\Model\BulkStatus::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetBulkStatus()
+    {
+        $this->assertEquals(BulkSummaryInterface::NOT_STARTED, $this->model->getBulkStatus('bulk-uuid-1'));
+        $this->assertEquals(BulkSummaryInterface::IN_PROGRESS, $this->model->getBulkStatus('bulk-uuid-2'));
+        $this->assertEquals(BulkSummaryInterface::FINISHED_SUCCESSFULLY, $this->model->getBulkStatus('bulk-uuid-4'));
+        $this->assertEquals(BulkSummaryInterface::FINISHED_WITH_FAILURE, $this->model->getBulkStatus('bulk-uuid-5'));
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetBulksByUser()
+    {
+        /** @var \Magento\AsynchronousOperations\Model\BulkSummary[] $bulks */
+        $bulksUuidArray = ['bulk-uuid-1', 'bulk-uuid-2', 'bulk-uuid-3', 'bulk-uuid-4', 'bulk-uuid-5'];
+        $bulks =  $this->model->getBulksByUser(1);
+        $this->assertEquals(5, count($bulks));
+        foreach ($bulks as $bulk) {
+            $this->assertTrue(in_array($bulk->getBulkId(), $bulksUuidArray));
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetFailedOperationsByBulkId()
+    {
+        /** @var  \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operations */
+        $operations =  $this->model->getFailedOperationsByBulkId('bulk-uuid-1');
+        $this->assertEquals([], $operations);
+        $operations =  $this->model->getFailedOperationsByBulkId('bulk-uuid-5', 3);
+        foreach ($operations as $operation) {
+            $this->assertEquals(1111, $operation->getErrorCode());
+        }
+        $operations =  $this->model->getFailedOperationsByBulkId('bulk-uuid-5', 2);
+        foreach ($operations as $operation) {
+            $this->assertEquals(2222, $operation->getErrorCode());
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
new file mode 100644
index 0000000000000..305c3550269da
--- /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/AsynchronousOperations/Model/OperationManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
new file mode 100644
index 0000000000000..a9933966e5b70
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\Framework\EntityManager\EntityManager;
+
+class OperationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\OperationManagement
+     */
+    private $model;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkStatus
+     */
+    private $bulkStatusManagement;
+
+    /**
+     * @var OperationInterfaceFactory
+     */
+    private $operationFactory;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    protected function setUp()
+    {
+        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\AsynchronousOperations\Model\OperationManagement::class
+        );
+        $this->bulkStatusManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\AsynchronousOperations\Model\BulkStatus::class
+        );
+
+        $this->operationFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            OperationInterfaceFactory::class
+        );
+        $this->entityManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            EntityManager::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetBulkStatus()
+    {
+        $operations =  $this->bulkStatusManagement->getFailedOperationsByBulkId('bulk-uuid-5', 3);
+        if (empty($operations)) {
+            $this->fail('Operation doesn\'t exist');
+        }
+        /** @var OperationInterface $operation */
+        $operation = array_shift($operations);
+        $operationId = $operation->getId();
+
+        $this->assertTrue($this->model->changeOperationStatus($operationId, OperationInterface::STATUS_TYPE_OPEN));
+
+        /** @var OperationInterface $updatedOperation */
+        $updatedOperation = $this->operationFactory->create();
+        $this->entityManager->load($updatedOperation, $operationId);
+        $this->assertEquals(OperationInterface::STATUS_TYPE_OPEN, $updatedOperation->getStatus());
+        $this->assertEquals(null, $updatedOperation->getResultMessage());
+        $this->assertEquals(null, $updatedOperation->getSerializedData());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResultTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResultTest.php
new file mode 100644
index 0000000000000..64077eeb18bf6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResultTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SearchResultTest
+ */
+class SearchResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetItems()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
+        $requestData = [
+            'uuid' => 'bulk-uuid-5',
+        ];
+
+        $request->setParams($requestData);
+
+        /** @var \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult $searchResult */
+        $searchResult = $objectManager->create(
+            \Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed\SearchResult::class
+        );
+        $this->assertEquals(1, $searchResult->getTotalCount());
+        $expected = $searchResult->getItems();
+        $expectedItem = array_shift($expected);
+        $this->assertEquals('Test', $expectedItem->getMetaInformation());
+        $this->assertEquals('5', $expectedItem->getEntityId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResultTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResultTest.php
new file mode 100644
index 0000000000000..6e0afaf1287b9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResultTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SearchResultTest
+ */
+class SearchResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetTotalCount()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $requestData = [
+            'uuid' => 'bulk-uuid-5',
+        ];
+        $request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
+        $request->setParams($requestData);
+
+        /**
+         * @var \Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult $searchResult
+         */
+        $searchResult = $objectManager->create(
+            \Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult::class
+        );
+        $this->assertEquals(1, $searchResult->getTotalCount());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php
new file mode 100644
index 0000000000000..852308e83c270
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SearchResultTest
+ */
+class SearchResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetAllIds()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $user = $objectManager->create(\Magento\User\Model\User::class);
+        $user->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
+        $session = $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
+        $session->setUser($user);
+
+        /** @var \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult $searchResult */
+        $searchResult = $objectManager->create(
+            \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult::class
+        );
+        $this->assertEquals(5, $searchResult->getTotalCount());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk.php
new file mode 100644
index 0000000000000..2b5c286a28313
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require __DIR__ . '/bulk.php';
+
+$acknowledgedBulkTable = $resource->getTableName('magento_acknowledged_bulk');
+$acknowledgedBulkQuery = "INSERT INTO {$acknowledgedBulkTable} (`bulk_uuid`) VALUES ('bulk-uuid-4'), ('bulk-uuid-5');";
+$connection->query($acknowledgedBulkQuery);
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk_rollback.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk_rollback.php
new file mode 100644
index 0000000000000..24fa9cfd4f418
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// when bulks are removed, acknowledged bulk table will be cleared too.
+require __DIR__ . '/bulk_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
new file mode 100644
index 0000000000000..9e215667903d3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * @var $resource Magento\Framework\App\ResourceConnection
+ */
+$resource = Bootstrap::getObjectManager()->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$bulkTable = $resource->getTableName('magento_bulk');
+$operationTable = $resource->getTableName('magento_operation');
+
+$bulks = [
+    'not_started' => [
+        'uuid' => 'bulk-uuid-1',
+        'user_id' => 1,
+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
+        'description' => 'Bulk Description',
+        'operation_count' => 1,
+    ],
+    'in_progress_success' => [
+        'uuid' => 'bulk-uuid-2',
+        'user_id' => 1,
+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
+        'description' => 'Bulk Description',
+        'operation_count' => 3,
+    ],
+    'in_progress_failed' => [
+        'uuid' => 'bulk-uuid-3',
+        'user_id' => 1,
+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
+        'description' => 'Bulk Description',
+        'operation_count' => 2,
+    ],
+    'finish_success' => [
+        'uuid' => 'bulk-uuid-4',
+        'user_id' => 1,
+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
+        'description' => 'Bulk Description',
+        'operation_count' => 1,
+    ],
+    'finish_failed' => [
+        'uuid' => 'bulk-uuid-5',
+        'user_id' => 1,
+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN,
+        'description' => 'Bulk Description',
+        'operation_count' => 2,
+    ],
+];
+// Only processed operations are saved into database (i.e. operations that are not in 'open' state)
+$operations = [
+    [
+        'bulk_uuid' => 'bulk-uuid-2',
+        'topic_name' => 'topic-3',
+        'serialized_data' => json_encode(['entity_id' => 2]),
+        'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+        'error_code' => null,
+        'result_message' => null,
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-3',
+        'topic_name' => 'topic-3',
+        'serialized_data' => json_encode(['entity_id' => 3]),
+        'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+        'error_code' => 1111,
+        'result_message' => 'Something went wrong during your request',
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-4',
+        'topic_name' => 'topic-4',
+        'serialized_data' => json_encode(['entity_id' => 4]),
+        'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+        'error_code' => null,
+        'result_message' => null,
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-5',
+        'topic_name' => 'topic-4',
+        'serialized_data' => json_encode(['entity_id' => 5, 'meta_information' => 'Test']),
+        'status' => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+        'error_code' => 1111,
+        'result_message' => 'Something went wrong during your request',
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-5',
+        'topic_name' => 'topic-4',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+        'error_code' => 2222,
+        'result_message' => 'Entity with ID=4 does not exist',
+    ],
+];
+
+$bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `user_type`, `description`, `operation_count`)"
+    . " VALUES (:uuid, :user_id, :user_type, :description, :operation_count);";
+foreach ($bulks as $bulk) {
+    $connection->query($bulkQuery, $bulk);
+}
+
+$operationQuery = "INSERT INTO {$operationTable}"
+    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`)"
+    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message);";
+foreach ($operations as $operation) {
+    $connection->query($operationQuery, $operation);
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk_rollback.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk_rollback.php
new file mode 100644
index 0000000000000..e5e765ab45b50
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk_rollback.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @var $resource Magento\Framework\App\ResourceConnection
+ */
+$resource = Bootstrap::getObjectManager()->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$bulkTable = $resource->getTableName('magento_bulk');
+
+$connection->query("DELETE FROM {$bulkTable};");
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
new file mode 100644
index 0000000000000..e74f995f8b57b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * @var $resource Magento\Framework\App\ResourceConnection
+ */
+$resource = Bootstrap::getObjectManager()->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$bulkTable = $resource->getTableName('magento_bulk');
+$operationTable = $resource->getTableName('magento_operation');
+
+$bulks = [
+    'started_searchable' => [
+        'uuid' => 'bulk-uuid-searchable-6',
+        'user_id' => 1,
+        'description' => 'Bulk Description',
+        'operation_count' => 3,
+        'start_time' => '2009-10-10 00:00:00',
+    ],
+];
+// Only processed operations are saved into database (i.e. operations that are not in 'open' state)
+$operations = [
+    [
+        'bulk_uuid' => 'bulk-uuid-searchable-6',
+        'topic_name' => 'topic-5',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+        'error_code' => null,
+        'result_message' => null,
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-searchable-6',
+        'topic_name' => 'topic-5',
+        'serialized_data' => json_encode(['entity_id' => 5, 'meta_information' => 'Test']),
+        'status' => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+        'error_code' => 1111,
+        'result_message' => 'Something went wrong during your request',
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-searchable-6',
+        'topic_name' => 'topic-5',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+        'error_code' => 2222,
+        'result_message' => 'Entity with ID=4 does not exist',
+    ],
+
+];
+
+$bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `description`, `operation_count`, `start_time`)"
+    . " VALUES (:uuid, :user_id, :description, :operation_count, :start_time);";
+foreach ($bulks as $bulk) {
+    $connection->query($bulkQuery, $bulk);
+}
+
+$operationQuery = "INSERT INTO {$operationTable}"
+    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`)"
+    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message);";
+foreach ($operations as $operation) {
+    $connection->query($operationQuery, $operation);
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable_rollback.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable_rollback.php
new file mode 100644
index 0000000000000..268f159c125f2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable_rollback.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+// when bulks are removed, acknowledged bulk table will be cleared too.
+require __DIR__ . '/bulk_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php b/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php
index 71105cd844c29..ba4c4efd78f1b 100644
--- a/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php
+++ b/dev/tests/integration/testsuite/Magento/Authorizenet/Model/DirectpostTest.php
@@ -19,6 +19,8 @@
 
 /**
  * Class contains tests for Direct Post integration
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DirectpostTest extends \PHPUnit\Framework\TestCase
 {
@@ -141,7 +143,7 @@ public function fdsFilterActionDataProvider()
             [
                 'filter_action' => 'report',
                 'order_id' => '100000004',
-                'expected_order_state' => Order::STATE_PROCESSING
+                'expected_order_state' => Order::STATE_COMPLETE
             ],
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php b/dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php
new file mode 100644
index 0000000000000..21ffddf851ac4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php
@@ -0,0 +1,433 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backend\App\Request;
+
+use Magento\Backend\App\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\Auth;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\Response;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Bootstrap as TestBootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Zend\Stdlib\Parameters;
+use Magento\Backend\Model\UrlInterface as BackendUrl;
+use Magento\Framework\App\Response\HttpFactory as HttpResponseFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BackendValidatorTest extends TestCase
+{
+    private const AWARE_VALIDATION_PARAM = 'test_param';
+
+    private const AWARE_LOCATION_VALUE = 'test1';
+
+    private const CSRF_AWARE_MESSAGE = 'csrf_aware';
+
+    /**
+     * @var ActionInterface
+     */
+    private $mockUnawareAction;
+
+    /**
+     * @var AbstractAction
+     */
+    private $mockAwareAction;
+
+    /**
+     * @var BackendValidator
+     */
+    private $validator;
+
+    /**
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var BackendUrl
+     */
+    private $url;
+
+    /**
+     * @var Auth
+     */
+    private $auth;
+
+    /**
+     * @var CsrfAwareActionInterface
+     */
+    private $mockCsrfAwareAction;
+
+    /**
+     * @var HttpResponseFactory
+     */
+    private $httpResponseFactory;
+
+    /**
+     * @return ActionInterface
+     */
+    private function createUnawareAction(): ActionInterface
+    {
+        return new class implements ActionInterface {
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+        };
+    }
+
+    /**
+     * @return AbstractAction
+     */
+    private function createAwareAction(): AbstractAction
+    {
+        $l = self::AWARE_LOCATION_VALUE;
+        $p = self::AWARE_VALIDATION_PARAM;
+
+        return new class($l, $p) extends AbstractAction{
+
+            /**
+             * @var string
+             */
+            private $locationValue;
+
+            /**
+             * @var string
+             */
+            private $param;
+
+            /**
+             * @param string $locationValue
+             * @param string $param
+             */
+            public function __construct(
+                string $locationValue,
+                string $param
+            ) {
+                parent::__construct(
+                    Bootstrap::getObjectManager()->get(Context::class)
+                );
+                $this->locationValue= $locationValue;
+                $this->param = $param;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function _processUrlKeys()
+            {
+                if ($this->_request->getParam($this->param)) {
+                    return true;
+                } else {
+                    /** @var Response $response */
+                    $response = $this->_response;
+                    $response->setHeader('Location', $this->locationValue);
+
+                    return false;
+                }
+            }
+        };
+    }
+
+    /**
+     * @return CsrfAwareActionInterface
+     */
+    private function createCsrfAwareAction(): CsrfAwareActionInterface
+    {
+        $r = Bootstrap::getObjectManager()
+            ->get(ResponseInterface::class);
+        $m = self::CSRF_AWARE_MESSAGE;
+
+        return new class ($r, $m) implements CsrfAwareActionInterface {
+
+            /**
+             * @var ResponseInterface
+             */
+            private $response;
+
+            /**
+             * @var string
+             */
+            private $message;
+
+            /**
+             * @param ResponseInterface $response
+             * @param string $message
+             */
+            public function __construct(
+                ResponseInterface $response,
+                string $message
+            ) {
+                $this->response = $response;
+                $this->message = $message;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                return $this->response;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function createCsrfValidationException(
+                RequestInterface $request
+            ): ?InvalidRequestException {
+                return new InvalidRequestException(
+                    $this->response,
+                    [new Phrase($this->message)]
+                );
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function validateForCsrf(RequestInterface $request): ?bool
+            {
+                return false;
+            }
+
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(RequestInterface::class);
+        $this->validator = $objectManager->get(BackendValidator::class);
+        $this->mockUnawareAction = $this->createUnawareAction();
+        $this->mockAwareAction = $this->createAwareAction();
+        $this->formKey = $objectManager->get(FormKey::class);
+        $this->url = $objectManager->get(BackendUrl::class);
+        $this->auth = $objectManager->get(Auth::class);
+        $this->mockCsrfAwareAction = $this->createCsrfAwareAction();
+        $this->httpResponseFactory = $objectManager->get(
+            HttpResponseFactory::class
+        );
+    }
+
+    /**
+     * @magentoConfigFixture admin/security/use_form_key 1
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithValidKey()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => $this->url->getSecretKey(),
+        ]);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     *
+     * @magentoConfigFixture admin/security/use_form_key 1
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithInvalidKey()
+    {
+        $invalidKey = $this->url->getSecretKey() .'Invalid';
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => $invalidKey,
+        ]);
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     *
+     * @magentoConfigFixture admin/security/use_form_key 0
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithInvalidFormKey()
+    {
+        $this->request->setPost(
+            new Parameters(['form_key' => $this->formKey->getFormKey() .'1'])
+        );
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @magentoConfigFixture admin/security/use_form_key 0
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateInvalidWithAwareAction()
+    {
+        $this->request->setParams([self::AWARE_VALIDATION_PARAM => '']);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockAwareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        $this->assertNotNull($caught);
+        /** @var Response $response */
+        $response = $caught->getReplaceResult();
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(
+            self::AWARE_LOCATION_VALUE,
+            $response->getHeader('Location')->getFieldValue()
+        );
+        $this->assertNull($caught->getMessages());
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateValidWithAwareAction()
+    {
+        $this->request->setParams(
+            [self::AWARE_VALIDATION_PARAM => '1']
+        );
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockAwareAction
+        );
+    }
+
+    /**
+     * @magentoConfigFixture admin/security/use_form_key 1
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithCsrfAwareAction()
+    {
+        //Setting up request that would be valid for default validation.
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => $this->url->getSecretKey(),
+        ]);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockCsrfAwareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        //Checking that custom validation was called and invalidated
+        //valid request.
+        $this->assertNotNull($caught);
+        $this->assertCount(1, $caught->getMessages());
+        $this->assertEquals(
+            self::CSRF_AWARE_MESSAGE,
+            $caught->getMessages()[0]->getText()
+        );
+    }
+
+    public function testInvalidAjaxRequest()
+    {
+        //Setting up AJAX request with invalid secret key.
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => 'invalid',
+            'isAjax' => '1'
+        ]);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockUnawareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        $this->assertNotNull($caught);
+        $this->assertInstanceOf(
+            ResultInterface::class,
+            $caught->getReplaceResult()
+        );
+        /** @var ResultInterface $result */
+        $result = $caught->getReplaceResult();
+        /** @var HttpResponse $response */
+        $response = $this->httpResponseFactory->create();
+        $result->renderResult($response);
+        $this->assertEmpty($response->getBody());
+        $this->assertEquals(401, $response->getHttpResponseCode());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Orders/GridTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Orders/GridTest.php
new file mode 100644
index 0000000000000..6c91afb80fd4a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Orders/GridTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Block\Dashboard\Orders;
+
+use Magento\Backend\Block\Template\Context;
+
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Grid
+     */
+    private $block;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $block = $this->createMock(\Magento\Backend\Block\Dashboard\Orders\Grid::class);
+        $layout = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
+        $layout->expects($this->atLeastOnce())->method('getChildName')->willReturn('test');
+        $layout->expects($this->atLeastOnce())->method('getBlock')->willReturn($block);
+        $context = $objectManager->create(Context::class, ['layout' => $layout]);
+
+        $this->block = $objectManager->create(Grid::class, ['context' => $context]);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testGetPreparedCollection()
+    {
+        $collection = $this->block->getPreparedCollection();
+        foreach ($collection->getItems() as $item) {
+            if ($item->getIncrementId() == '100000001') {
+                $this->assertEquals('firstname lastname', $item->getCustomer());
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php
index 7233807d079bc..ef159e6230984 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php
@@ -200,7 +200,12 @@ public function testIncorrectLogin($params)
         $this->getRequest()->setPostValue($params);
         $this->dispatch('backend/admin/auth/login');
         $this->assertSessionMessages(
-            $this->equalTo(['You did not sign in correctly or your account is temporarily disabled.']),
+            $this->equalTo(
+                [
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                ]
+            ),
             MessageInterface::TYPE_ERROR
         );
         $backendUrlModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index 0525c68b04d14..6836161fd6ec2 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Controller\Adminhtml;
 
 /**
@@ -72,7 +73,7 @@ public function testMassActionsInvalidTypes($action)
         $this->getRequest()->setParams(['types' => ['invalid_type_1', 'invalid_type_2', 'config']]);
         $this->dispatch('backend/admin/cache/' . $action);
         $this->assertSessionMessages(
-            $this->contains("Specified cache type(s) don't exist: invalid_type_1, invalid_type_2"),
+            $this->contains("These cache type(s) don&#039;t exist: invalid_type_1, invalid_type_2"),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
index 219fde6e37075..d5a48b960811e 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
@@ -45,6 +47,7 @@ public function testLoggedIndexAction()
     public function testGlobalSearchAction()
     {
         $this->getRequest()->setParam('isAjax', 'true');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue('query', 'dummy');
         $this->dispatch('backend/admin/index/globalSearch');
 
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
index 1185ae9727e98..0d48fc8b0f59c 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -20,6 +22,7 @@ public function testSaveActionCmsPage()
         $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Cms\Model\Page::class);
         $page->load('page_design_blank', 'identifier');
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'description' => 'Some URL rewrite description',
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
index 6b7d2fc262d8c..98d7be309da7f 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\Backend\Model;
 
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test class for \Magento\Backend\Model\UrlInterface.
  *
@@ -13,27 +20,121 @@
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Backend\Model\UrlInterface
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var UrlInterface
      */
-    protected $_model;
+    private $_model;
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        parent::setUp();
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Backend\Model\UrlInterface::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->request = $this->objectManager->get(RequestInterface::class);
+        $this->_model = $this->objectManager->create(UrlInterface::class);
     }
 
     /**
-     * App isolation is enabled to protect next tests from polluted registry by getUrl()
+     * App isolation is enabled to protect next tests from polluted registry by getUrl().
      *
+     * @param string $routePath
+     * @param array $requestParams
+     * @param string $expectedResult
+     * @param array|null $routeParams
+     * @return void
+     *
+     * @dataProvider getUrlDataProvider
      * @magentoAppIsolation enabled
      */
-    public function testGetUrl()
+    public function testGetUrl(
+        string $routePath,
+        array $requestParams,
+        string $expectedResult,
+        $routeParams = null
+    ): void {
+        $this->request->setParams($requestParams);
+        $url = $this->_model->getUrl($routePath, $routeParams);
+
+        $this->assertContains($expectedResult, $url);
+    }
+
+    /**
+     * Data provider for getUrl method.
+     *
+     * @return array
+     */
+    public function getUrlDataProvider(): array
     {
-        $url = $this->_model->getUrl('adminhtml/auth/login');
-        $this->assertContains('admin/auth/login/key/', $url);
+        /** @var $escaper Escaper */
+        $escaper = Bootstrap::getObjectManager()->get(Escaper::class);
+
+        return [
+            [
+                'routePath' => 'adminhtml/auth/login',
+                'requestParams' => [],
+                'expectedResult'=> 'admin/auth/login/key/',
+            ],
+            [
+                'routePath' => 'adminhtml/auth/login',
+                'requestParams' => [],
+                'expectedResult'=> '/param1/a1==/',
+                'routeParams' => [
+                    '_escape_params' => false,
+                    'param1' => 'a1==',
+                ],
+            ],
+            [
+                'routePath' => 'adminhtml/auth/login',
+                'requestParams' => [],
+                'expectedResult'=> '/param1/a1==/',
+                'routeParams' => [
+                    '_escape_params' => false,
+                    'param1' => 'a1==',
+                ],
+            ],
+            [
+                'routePath' => 'adminhtml/auth/login',
+                'requestParams' => ['param2' => 'a2=='],
+                'expectedResult'=> '/param2/a2==/',
+                'routeParams' => [
+                    '_current' => true,
+                    '_escape_params' => false,
+                ],
+            ],
+            [
+                'routePath' => 'adminhtml/auth/login',
+                'requestParams' => [],
+                'expectedResult' => '/param3/' . $escaper->encodeUrlParam('a3==') . '/',
+                'routeParams' => [
+                    '_escape_params' => true,
+                    'param3' => 'a3==',
+                ],
+            ],
+            [
+                'routePath' => 'adminhtml/auth/login',
+                'requestParams' => ['param4' => 'a4=='],
+                'expectedResult' => '/param4/' . $escaper->encodeUrlParam('a4==') . '/',
+                'routeParams' => [
+                    '_current' => true,
+                    '_escape_params' => true,
+                ],
+            ],
+            [
+                'routePath' => 'route/controller/action/id/100',
+                'requestParams' => [],
+                'expectedResult' => 'id/100',
+            ],
+        ];
     }
 
     /**
@@ -41,41 +142,30 @@ public function testGetUrl()
      * @param string $controller
      * @param string $action
      * @param string $expectedHash
+     * @return void
+     *
      * @dataProvider getSecretKeyDataProvider
      * @magentoAppIsolation enabled
      */
-    public function testGetSecretKey($routeName, $controller, $action, $expectedHash)
+    public function testGetSecretKey(string $routeName, string $controller, string $action, string $expectedHash): void
     {
-        /** @var $request \Magento\Framework\App\RequestInterface */
-        $request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\App\RequestInterface::class);
-        $request->setControllerName(
-            'default_controller'
-        )->setActionName(
-            'default_action'
-        )->setRouteName(
-            'default_router'
-        );
-
-        $this->_model->setRequest($request);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Session\SessionManagerInterface::class
-        )->setData(
-            '_form_key',
-            'salt'
-        );
+        $this->request->setControllerName('default_controller')
+            ->setActionName('default_action')
+            ->setRouteName('default_router');
+
+        $this->_model->setRequest($this->request);
+        $this->objectManager->get(SessionManagerInterface::class)->setData('_form_key', 'salt');
+
         $this->assertEquals($expectedHash, $this->_model->getSecretKey($routeName, $controller, $action));
     }
 
     /**
      * @return array
      */
-    public function getSecretKeyDataProvider()
+    public function getSecretKeyDataProvider(): array
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $encryptor \Magento\Framework\Encryption\EncryptorInterface */
-        $encryptor = $objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
+        /** @var $encryptor EncryptorInterface */
+        $encryptor = Bootstrap::getObjectManager()->get(EncryptorInterface::class);
 
         return [
             [
@@ -89,67 +179,62 @@ public function getSecretKeyDataProvider()
                 '',
                 'controller',
                 '',
-                $encryptor->getHash('default_router' . 'controller' . 'default_action' . 'salt')
+                $encryptor->getHash('default_router' . 'controller' . 'default_action' . 'salt'),
             ],
             [
                 '',
                 'controller',
                 'action',
-                $encryptor->getHash('default_router' . 'controller' . 'action' . 'salt')
+                $encryptor->getHash('default_router' . 'controller' . 'action' . 'salt'),
             ],
             [
                 'adminhtml',
                 '',
                 '',
-                $encryptor->getHash('adminhtml' . 'default_controller' . 'default_action' . 'salt')
+                $encryptor->getHash('adminhtml' . 'default_controller' . 'default_action' . 'salt'),
             ],
             [
                 'adminhtml',
                 '',
                 'action',
-                $encryptor->getHash('adminhtml' . 'default_controller' . 'action' . 'salt')
+                $encryptor->getHash('adminhtml' . 'default_controller' . 'action' . 'salt'),
             ],
             [
                 'adminhtml',
                 'controller',
                 '',
-                $encryptor->getHash('adminhtml' . 'controller' . 'default_action' . 'salt')
+                $encryptor->getHash('adminhtml' . 'controller' . 'default_action' . 'salt'),
             ],
             [
                 'adminhtml',
                 'controller',
                 'action',
-                $encryptor->getHash('adminhtml' . 'controller' . 'action' . 'salt')
-            ]
+                $encryptor->getHash('adminhtml' . 'controller' . 'action' . 'salt'),
+            ],
         ];
     }
 
     /**
      * @magentoAppIsolation enabled
+     * @return void
      */
-    public function testGetSecretKeyForwarded()
+    public function testGetSecretKeyForwarded(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $encryptor \Magento\Framework\Encryption\EncryptorInterface */
-        $encryptor = $objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
-
-        /** @var $request \Magento\Framework\App\Request\Http */
-        $request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\App\RequestInterface::class);
-        $request->setControllerName('controller')->setActionName('action');
-        $request->initForward()->setControllerName(uniqid())->setActionName(uniqid());
-        $this->_model->setRequest($request);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Session\SessionManagerInterface::class
-        )->setData(
-            '_form_key',
-            'salt'
-        );
+        /** @var $encryptor EncryptorInterface */
+        $encryptor = $this->objectManager->get(EncryptorInterface::class);
+
+        $this->request->setControllerName('controller')->setActionName('action');
+        $this->request->initForward()->setControllerName(uniqid())->setActionName(uniqid());
+        $this->_model->setRequest($this->request);
+        $this->objectManager->get(SessionManagerInterface::class)->setData('_form_key', 'salt');
+
         $this->assertEquals($encryptor->getHash('controller' . 'action' . 'salt'), $this->_model->getSecretKey());
     }
 
-    public function testUseSecretKey()
+    /**
+     * @return void
+     */
+    public function testUseSecretKey(): void
     {
         $this->_model->setNoSecret(true);
         $this->assertFalse($this->_model->useSecretKey());
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php
new file mode 100644
index 0000000000000..d6ea08a2f7ca3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Adminhtml\Invoice;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class CreateTest extends AbstractBackendController
+{
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactory->method('create')
+            ->willReturn($this->adapter);
+
+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
+        parent::tearDown();
+    }
+
+    /**
+     * Checks a case when non default Merchant Account ID should be send to Braintree
+     * during creation second partial invoice.
+     *
+     * @return void
+     * @magentoConfigFixture default_store payment/braintree/merchant_account_id Magneto
+     * @magentoConfigFixture current_store payment/braintree/merchant_account_id USA_Merchant
+     * @magentoDataFixture Magento/Braintree/Fixtures/partial_invoice.php
+     */
+    public function testCreatePartialInvoiceWithNonDefaultMerchantAccount(): void
+    {
+        $order = $this->getOrder('100000002');
+
+        $this->adapter->method('sale')
+            ->with(self::callback(function ($request) {
+                self::assertEquals('USA_Merchant', $request['merchantAccountId']);
+                return true;
+            }))
+            ->willReturn($this->getTransactionStub());
+
+        $uri = 'backend/sales/order_invoice/save/order_id/' . $order->getEntityId();
+        $this->prepareRequest($uri);
+        $this->dispatch($uri);
+
+        self::assertSessionMessages(
+            self::equalTo(['The invoice has been created.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Creates stub for Braintree capture Transaction.
+     *
+     * @return Successful
+     */
+    private function getTransactionStub(): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = 'submitted_for_settlement';
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId): OrderInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', $incrementId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Prepares POST request for invoice creation.
+     *
+     * @param string $uri
+     * @return void
+     */
+    private function prepareRequest(string $uri): void
+    {
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $request = $this->getRequest();
+        $request->setMethod('POST');
+        $request->setParam('form_key', $formKey->getFormKey());
+        $request->setRequestUri($uri);
+        $request->setPostValue(
+            [
+                'invoice' => [
+                    'capture_case' => 'online'
+                ]
+            ]
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
index 04bac807637db..bb7b04f53dd6d 100644
--- a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php
@@ -70,8 +70,8 @@ public function testExecuteAccept()
         );
 
         $order = $this->orderRepository->get($orderId);
-        static::assertEquals(Order::STATE_PROCESSING, $order->getState());
-        static::assertEquals(Order::STATE_PROCESSING, $order->getStatus());
+        static::assertEquals(Order::STATE_COMPLETE, $order->getState());
+        static::assertEquals(Order::STATE_COMPLETE, $order->getStatus());
     }
 
     /**
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 0000000000000..cc5ddc7dc97bf
--- /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/Controller/Paypal/PlaceOrderTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
new file mode 100644
index 0000000000000..4f2b0fd67840d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Paypal;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * PlaceOrderTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PlaceOrderTest extends AbstractController
+{
+    /**
+     * @var Session|MockObject
+     */
+    private $session;
+
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->session = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuote', 'setLastOrderStatus', 'unsLastBillingAgreementReferenceId'])
+            ->getMock();
+
+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactory->method('create')
+            ->willReturn($this->adapter);
+
+        $this->_objectManager->addSharedInstance($this->session, Session::class);
+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(Session::class);
+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
+        parent::tearDown();
+    }
+
+    /**
+     * Tests a negative scenario for a place order flow when exception throws after placing an order.
+     *
+     * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
+     */
+    public function testExecuteWithFailedOrder()
+    {
+        $reservedOrderId = 'test01';
+        $quote = $this->getQuote($reservedOrderId);
+
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+
+        $this->adapter->method('sale')
+            ->willReturn($this->getTransactionStub('authorized'));
+        $this->adapter->method('void')
+            ->willReturn($this->getTransactionStub('voided'));
+
+        // emulates an error after placing the order
+        $this->session->method('setLastOrderStatus')
+            ->willThrowException(new \Exception('Test Exception'));
+
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('braintree/paypal/placeOrder');
+
+        self::assertRedirect(self::stringContains('checkout/cart'));
+        self::assertSessionMessages(
+            self::equalTo(['The order #' . $reservedOrderId . ' cannot be processed.']),
+            MessageInterface::TYPE_ERROR
+        );
+
+        $order = $this->getOrder($reservedOrderId);
+        self::assertEquals('canceled', $order->getState());
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId): OrderInterface
+    {
+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('increment_id', $incrementId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Creates stub for Braintree Transaction.
+     *
+     * @param string $status
+     * @return Successful
+     */
+    private function getTransactionStub(string $status): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = $status;
+        $transaction->paypal = [
+            'paymentId' => 'pay-001',
+            'payerEmail' => 'test@test.com'
+        ];
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php
new file mode 100644
index 0000000000000..ceb90710ed5e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/../../Sales/_files/address_data.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)
+    ->setAddressType('shipping');
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple');
+
+require __DIR__ . '/payment.php';
+
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000002')
+    ->setSubtotal($product->getPrice() * 2)
+    ->setBaseSubtotal($product->getPrice() * 2)
+    ->setCustomerEmail('admin@example.com')
+    ->setCustomerIsGuest(true)
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId(
+        $objectManager->get(StoreManagerInterface::class)->getStore()
+            ->getId()
+    )
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php
new file mode 100644
index 0000000000000..a2da0b639e98d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '100000002')
+    ->create();
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$items = $orderRepository->getList($searchCriteria)
+    ->getItems();
+
+foreach ($items as $item) {
+    $orderRepository->delete($item);
+}
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php
new file mode 100644
index 0000000000000..22b954515f3b5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\TransactionRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Service\InvoiceService;
+use Magento\TestFramework\ObjectManager;
+
+/** @var Order $order */
+
+require __DIR__ . '/order.php';
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var InvoiceService $invoiceService */
+$invoiceService = $objectManager->get(InvoiceService::class);
+$invoice = $invoiceService->prepareInvoice($order);
+$invoice->setIncrementId('100000002');
+$invoice->register();
+
+$items = $invoice->getAllItems();
+$item = array_pop($items);
+$item->setQty(1);
+$invoice->setTotalQty(1);
+
+$items = $order->getAllItems();
+/** @var \Magento\Sales\Api\Data\OrderItemInterface $item */
+$item = array_pop($items);
+$item->setQtyInvoiced(1);
+$invoice->collectTotals();
+
+/** @var InvoiceRepositoryInterface $invoiceRepository */
+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
+$invoice = $invoiceRepository->save($invoice);
+
+/** @var TransactionRepositoryInterface $transactionRepository */
+$transactionRepository = $objectManager->get(TransactionRepositoryInterface::class);
+$transaction = $transactionRepository->create();
+$transaction->setTxnType('capture');
+$transaction->setPaymentId($order->getPayment()->getEntityId());
+$transaction->setOrderId($order->getEntityId());
+$transactionRepository->save($transaction);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php
new file mode 100644
index 0000000000000..1ed4438f87db2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '%10000000%', 'like')
+    ->create();
+
+/** @var InvoiceRepositoryInterface $invoiceRepository */
+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
+$items = $invoiceRepository->getList($searchCriteria)
+    ->getItems();
+
+foreach ($items as $item) {
+    $invoiceRepository->delete($item);
+}
+
+require __DIR__ . '/order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php
new file mode 100644
index 0000000000000..a4285b963bffa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Sales\Model\Order\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+require __DIR__ . '/../../Vault/_files/token.php';
+
+$token->setPaymentMethodCode(ConfigProvider::CODE);
+/** @var OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory */
+$paymentExtensionFactory = $objectManager->get(OrderPaymentExtensionInterfaceFactory::class);
+$extensionAttributes = $paymentExtensionFactory->create();
+$extensionAttributes->setVaultPaymentToken($token);
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::CODE);
+$payment->setExtensionAttributes($extensionAttributes);
+$payment->setAuthorizationTransaction(true);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
new file mode 100644
index 0000000000000..e4c64d0e33d8b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Quote\Api\CartRepositoryInterface;
+
+require __DIR__ . '/../_files/paypal_vault_token.php';
+require __DIR__ . '/../../Sales/_files/quote_with_customer.php';
+
+$quote->getShippingAddress()
+    ->setShippingMethod('flatrate_flatrate')
+    ->setCollectShippingRates(true);
+$quote->getPayment()
+    ->setMethod(ConfigProvider::PAYPAL_VAULT_CODE)
+    ->setAdditionalInformation(
+        [
+            'customer_id' => $quote->getCustomerId(),
+            'public_hash' => $paymentToken->getPublicHash()
+        ]
+    );
+
+$quote->collectTotals();
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
new file mode 100644
index 0000000000000..5d0fa8cca85d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+require __DIR__ . '/../../Sales/_files/quote_with_customer_rollback.php';
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 0000000000000..da87ad5311d92
--- /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 0000000000000..0c0391769b093
--- /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/Bundle/Block/Catalog/Product/View/Type/BundleTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
new file mode 100644
index 0000000000000..ce324ed774dc4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Block\Catalog\Product\View\Type;
+
+/**
+ * Test for Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
+ *
+ * @magentoDataFixture Magento/Bundle/_files/product.php
+ * @magentoDbIsolation disabled
+ * @magentoAppArea frontend
+ */
+class BundleTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
+     */
+    private $block;
+
+    /**
+     * @var \Magento\Catalog\Api\Data\ProductInterface
+     */
+    private $product;
+
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $this->product = $this->productRepository->get('bundle-product', false, null, true);
+        $this->product->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)->save();
+        $this->objectManager->get(\Magento\Framework\Registry::class)->unregister('product');
+        $this->objectManager->get(\Magento\Framework\Registry::class)->register('product', $this->product);
+
+        $this->block = $this->objectManager->get(
+            \Magento\Framework\View\LayoutInterface::class
+        )->createBlock(
+            \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle::class
+        );
+    }
+
+    /**
+     * Test for method \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle::getJsonConfig
+     *
+     * @return void
+     */
+    public function testGetJsonConfig()
+    {
+        $option = $this->productRepository->get('simple');
+        $option->setSpecialPrice(5)
+            ->save();
+        $config = json_decode($this->block->getJsonConfig(), true);
+        $options = current($config['options']);
+        $selection = current($options['selections']);
+        $this->assertEquals(10, $selection['prices']['oldPrice']['amount']);
+        $this->assertEquals(5, $selection['prices']['basePrice']['amount']);
+        $this->assertEquals(5, $selection['prices']['finalPrice']['amount']);
+    }
+
+    /**
+     * Tear Down
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->get(\Magento\Framework\Registry::class)->unregister('product');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php
index 1f2f08f345099..65a9b1234ef7c 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Controller/ProductTest.php
@@ -13,6 +13,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
      * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @magentoDbIsolation disabled
      */
     public function testViewAction()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Category/ProductIndexerTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Category/ProductIndexerTest.php
index c877ae1f388f8..67dce1aac307c 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Category/ProductIndexerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Category/ProductIndexerTest.php
@@ -8,10 +8,7 @@
 use Magento\Catalog\Model\Category;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
- * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
  * @magentoAppIsolation enabled
- * @magentoDbIsolation enabled
  */
 class ProductIndexerTest extends \PHPUnit\Framework\TestCase
 {
@@ -57,6 +54,9 @@ protected function setUp()
 
     /**
      * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
+     * @magentoDbIsolation disabled
      */
     public function testReindex()
     {
@@ -88,6 +88,9 @@ public function testReindex()
 
     /**
      * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
+     * @magentoDbIsolation disabled
      */
     public function testCategoryMove()
     {
@@ -130,8 +133,10 @@ public function testCategoryMove()
     /**
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
      * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
      * @depends testReindex
+     * @magentoDbIsolation disabled
      */
     public function testCategoryDelete()
     {
@@ -161,7 +166,9 @@ public function testCategoryDelete()
     /**
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
      * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
+     * @magentoDbIsolation disabled
      */
     public function testCategoryCreate()
     {
@@ -208,18 +215,28 @@ public function testCategoryCreate()
     }
 
     /**
+     * Finds 4 categories
+     *
      * @return Category[]
      */
     private function getCategories()
     {
-        /** @var Category $category */
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
+        $collectionFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class
         );
 
-        $result = $category->getCollection()->addAttributeToSelect('name')->getItems();
-        $result = array_slice($result, 2);
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+        $collection = $collectionFactory->create();
+
+        $collection
+            ->addAttributeToSelect('name')
+            ->addAttributeToFilter('name', ['in' => [
+                'Category 1',
+                'Category 2',
+                'Category 3',
+                'Category 4',
+            ]]);
 
-        return array_slice($result, 0, 4);
+        return array_values($collection->getItems());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
new file mode 100644
index 0000000000000..d9f1095000c0a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model;
+
+use Magento\Bundle\Api\Data\LinkInterface;
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Api\Data\LinkInterfaceFactory;
+use Magento\Bundle\Api\Data\OptionInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test option repository class
+ */
+class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var OptionRepository
+     */
+    private $optionRepository;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->optionRepository = $this->objectManager->get(OptionRepository::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoDataFixture Magento/Bundle/_files/empty_bundle_product.php
+     */
+    public function testBundleProductIsSaleableAfterNewOptionSave()
+    {
+        $bundleProduct = $this->productRepository->get('bundle-product');
+
+        /** @var OptionInterface $newOption */
+        $newOption = $this->objectManager->create(OptionInterfaceFactory::class)->create();
+        /** @var LinkInterface $productLink */
+        $productLink = $this->objectManager->create(LinkInterfaceFactory::class)->create();
+
+        $newOption->setTitle('new-option');
+        $newOption->setRequired(true);
+        $newOption->setType('select');
+        $newOption->setSku($bundleProduct->getSku());
+
+        $productLink->setSku('simple');
+        $productLink->setQty(1);
+        $productLink->setIsDefault(true);
+        $productLink->setCanChangeQuantity(0);
+
+        $newOption->setProductLinks([$productLink]);
+
+        $optionId = $this->optionRepository->save($bundleProduct, $newOption);
+        $bundleProduct = $this->productRepository->get($bundleProduct->getSku(), false, null, true);
+
+        $this->assertNotNull($optionId, 'Bundle option was not saved correctly');
+        $this->assertTrue($bundleProduct->isSaleable(), 'Bundle product should show as in stock once option is added');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
index ca219405c9c64..e30916810b1e0 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
@@ -8,6 +8,7 @@
 
 /**
  * Abstract class for testing bundle prices
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class BundlePriceAbstract extends \PHPUnit\Framework\TestCase
 {
@@ -34,6 +35,13 @@ protected function setUp()
         $this->productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         $this->productCollectionFactory =
             $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class);
+
+        $scopeConfig = $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
+        $scopeConfig->setValue(
+            \Magento\CatalogInventory\Model\Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+            true,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php
index 08dc1a0132b56..1775f09eb58c7 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Bundle\Model\Product;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
  * @magentoAppArea frontend
  */
 class DynamicBundlePriceCalculatorTest extends BundlePriceAbstract
@@ -17,6 +16,8 @@ class DynamicBundlePriceCalculatorTest extends BundlePriceAbstract
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
     {
@@ -27,26 +28,24 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
 
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addFieldToFilter('sku', 'bundle_product')
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
-
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
 
-        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
 
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
         $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
@@ -56,6 +55,8 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/price/scope 1
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
     {
@@ -71,12 +72,20 @@ public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
new file mode 100644
index 0000000000000..2123968d64892
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
@@ -0,0 +1,350 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * @magentoDbIsolation disabled
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @group indexer_dimension
+ * @magentoAppArea frontend
+ */
+class DynamicBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
+{
+    /**
+     * @param array $strategyModifiers
+     * @param array $expectedResults
+     * @dataProvider getTestCases
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDbIsolation disabled
+     */
+    public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
+    {
+        $this->prepareFixture($strategyModifiers, 'bundle_product');
+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+        $priceInfo = $bundleProduct->getPriceInfo();
+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+        $this->assertEquals(
+            $expectedResults['minimalPrice'],
+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+            'Failed to check minimal price on product'
+        );
+        $this->assertEquals(
+            $expectedResults['maximalPrice'],
+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+            'Failed to check maximal price on product'
+        );
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
+    }
+
+    /**
+     * @param array $strategyModifiers
+     * @param array $expectedResults
+     * @dataProvider getTestCases
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture current_store catalog/price/scope 1
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDbIsolation disabled
+     */
+    public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
+    {
+        $this->prepareFixture($strategyModifiers, 'bundle_product');
+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+        $priceInfo = $bundleProduct->getPriceInfo();
+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+        $this->assertEquals(
+            $expectedResults['minimalPrice'],
+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+            'Failed to check minimal price on product'
+        );
+        $this->assertEquals(
+            $expectedResults['maximalPrice'],
+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+            'Failed to check maximal price on product'
+        );
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
+    }
+
+    /**
+     * Test cases for current test
+     * @return array
+     */
+    public function getTestCases()
+    {
+        return [
+            '#1 Testing price for dynamic bundle product with one simple' => [
+                'strategy' => $this->getBundleConfiguration1(),
+                'expectedResults' => [
+                    // just price from simple1
+                    'minimalPrice' => 10,
+                    // just price from simple1
+                    'maximalPrice' => 10
+                ]
+            ],
+
+            '#2 Testing price for dynamic bundle product with three simples and different qty' => [
+                'strategy' => $this->getBundleConfiguration2(),
+                'expectedResults' => [
+                    // min price from simples 3*10 or 30
+                    'minimalPrice' => 30,
+                    // (3 * 10) + (2 * 20) + 30
+                    'maximalPrice' => 100
+                ]
+            ],
+
+            '#3 Testing price for dynamic bundle product with four simples and different price' => [
+                'strategy' => $this->getBundleConfiguration3(),
+                'expectedResults' => [
+                    //  10
+                    'minimalPrice' => 10,
+                    // 10 + 20 + 30
+                    'maximalPrice' => 60
+                ]
+            ],
+
+            '#4 Testing price for dynamic bundle with two non required options' => [
+                'strategy' => $this->getBundleConfiguration4(),
+                'expectedResults' => [
+                    // 1 * 10
+                    'minimalPrice' => 10,
+                    // 3 * 20 + 1 * 10 + 3 * 20
+                    'maximalPrice' => 130
+                ]
+            ],
+
+            '#5 Testing price for dynamic bundle with two required options' => [
+                'strategy' => $this->getBundleConfiguration5(),
+                'expectedResults' => [
+                    // 1 * 10 + 1 * 10
+                    'minimalPrice' => 20,
+                    // 3 * 20 + 1 * 10 + 3 * 20
+                    'maximalPrice' => 130
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * Dynamic bundle product with one simple
+     *
+     * @return array
+     */
+    private function getBundleConfiguration1()
+    {
+        $optionsData = [
+            [
+                'title' => 'op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                    ],
+                ]
+            ],
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Dynamic bundle product with three simples and different qty
+     *
+     * @return array
+     */
+    private function getBundleConfiguration2()
+    {
+        $optionsData = [
+            [
+                'title' => 'op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 3,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 2,
+                    ],
+                    [
+                        'sku' => 'simple3',
+                        'qty' => 1,
+                    ],
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Dynamic bundle product with three simples and different price
+     *
+     * @return array
+     */
+    private function getBundleConfiguration3()
+    {
+        $optionsData = [
+            [
+                'title' => 'op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 1,
+                    ],
+                    [
+                        'sku' => 'simple3',
+                        'qty' => 1,
+                    ]
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Dynamic bundle with two non required options and special price
+     * @return array
+     */
+    private function getBundleConfiguration4()
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => false,
+                'type' => 'radio',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 3,
+                    ],
+                ]
+            ],
+            [
+                'title' => 'Op2',
+                'required' => false,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 3,
+                    ],
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Dynamic bundle with two required options
+     * @return array
+     */
+    private function getBundleConfiguration5()
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => true,
+                'type' => 'radio',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 3,
+                    ],
+                ]
+            ],
+            [
+                'title' => 'Op2',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'qty' => 3,
+                    ],
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
index 0e21bcf8369f7..8a76047cbe39b 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Bundle\Model\Product;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
  * @magentoAppArea frontend
  */
 class DynamicBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
@@ -17,6 +16,8 @@ class DynamicBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
     {
@@ -27,17 +28,11 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
 
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addFieldToFilter('sku', 'bundle_product')
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
@@ -62,9 +57,14 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
             );
         }
 
-        $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
 
-        $this->assertEquals($expectedResults['indexerMaximumPrice'], $priceInfoFromIndexer->getMaxPrice());
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
@@ -82,8 +82,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * 10
                     'maximalPrice' => 5,
-                    'indexerMinimalPrice' => 10,
-                    'indexerMaximumPrice' => 10
                 ]
             ],
 
@@ -94,8 +92,6 @@ public function getTestCases()
                     'minimalPrice' => 10,
                     // 0.5 * 2 * 10
                     'maximalPrice' => 10,
-                    'indexerMinimalPrice' => 20,
-                    'indexerMaximumPrice' => 20
                 ]
 
             ],
@@ -110,8 +106,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * (1 * 10 + 3 * 30)
                     'maximalPrice' => 50,
-                    'indexerMinimalPrice' => 10,
-                    'indexerMaximumPrice' => 100
                 ]
             ],
 
@@ -125,8 +119,6 @@ public function getTestCases()
                     'minimalPrice' => 4.95,
                     // 0.5 * ( 1 * 9.9 +  2.5 * 4)
                     'maximalPrice' => 9.95,
-                    'indexerMinimalPrice' => 9.9,
-                    'indexerMaximumPrice' => 19.9
                 ]
             ],
 
@@ -141,8 +133,6 @@ public function getTestCases()
                     'regularMinimalPrice' => '10',
                     // 3 * 20 + (30 * 1 + 13 * 3)
                     'regularMaximalPrice' => '129',
-                    'indexerMinimalPrice' => 7.5,
-                    'indexerMaximumPrice' => 79
                 ]
             ],
 
@@ -153,8 +143,6 @@ public function getTestCases()
                     'minimalPrice' => 4.95,
                     // 0.5 * max(4 * 2.5, 1 * 9.9)
                     'maximalPrice' => 5,
-                    'indexerMinimalPrice' => 9.9,
-                    'indexerMaximumPrice' => 10
                 ]
             ],
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php
index 3d1aa54d518ff..589a385c3df82 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php
@@ -9,7 +9,6 @@
 use \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
  * @magentoAppArea frontend
  */
 class DynamicBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
@@ -28,6 +27,8 @@ protected function setUp()
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
     {
@@ -38,26 +39,25 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
 
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addFieldToFilter('sku', 'bundle_product')
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
 
-        $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
 
-        $this->assertEquals($expectedResults['indexerMaximumPrice'], $priceInfoFromIndexer->getMaxPrice());
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
@@ -78,8 +78,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * 10
                     'maximalPrice' => 5,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 10
                 ]
             ],
 
@@ -93,8 +91,6 @@ public function getTestCases()
                     'minimalPrice' => 10,
                     // 0.5 * 2 * 10
                     'maximalPrice' => 10,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 20
                 ]
             ],
 
@@ -108,8 +104,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * (1 * 10 + 3 * 20)
                     'maximalPrice' => 35,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 70
                 ]
             ],
 
@@ -123,8 +117,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * (1 * 10 + 3 * 20)
                     'maximalPrice' => 35,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 70
                 ]
             ],
 
@@ -138,8 +130,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * 3 * 20
                     'maximalPrice' => 30,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 60
 
                 ]
             ],
@@ -154,8 +144,6 @@ public function getTestCases()
                     'minimalPrice' => 10,
                     // 0.5 * (3 * 20 + 1 * 10 + 3 * 20)
                     'maximalPrice' => 65,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 130
                 ]
             ],
 
@@ -169,8 +157,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * (3 * 20 + 1 * 10 + 3 * 20)
                     'maximalPrice' => 65,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 130
                 ]
             ],
 
@@ -184,8 +170,6 @@ public function getTestCases()
                     'minimalPrice' => 5,
                     // 0.5 * (3 * 20 + 1 * 10 + 3 * 20)
                     'maximalPrice' => 65,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 130
                 ]
             ],
 
@@ -199,8 +183,6 @@ public function getTestCases()
                     'minimalPrice' => 1.25,
                     // 0.5 * 3 * 20
                     'maximalPrice' => 30,
-                    'indexerMinimalPrice' => 0,
-                    'indexerMaximumPrice' => 60
                 ]
             ],
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php
index 64e88ffb1a266..34dbb90e14246 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php
@@ -9,7 +9,6 @@
 use \Magento\Bundle\Api\Data\LinkInterface;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
  * @magentoAppArea frontend
  */
 class FixedBundlePriceCalculatorTest extends BundlePriceAbstract
@@ -19,6 +18,8 @@ class FixedBundlePriceCalculatorTest extends BundlePriceAbstract
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
     {
@@ -29,23 +30,25 @@ public function testPriceForFixedBundle(array $strategyModifiers, array $expecte
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
 
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addIdFilter([42])
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
-        $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addIdFilter([42])
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
@@ -54,6 +57,8 @@ public function testPriceForFixedBundle(array $strategyModifiers, array $expecte
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/price/scope 1
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
     {
@@ -64,23 +69,25 @@ public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers,
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
 
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addFieldToFilter('sku', 'bundle_product')
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
-        $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
@@ -98,7 +105,6 @@ public function getTestCases()
                     'minimalPrice' => 120,
                     // 110 + 10 (sum of simple price)
                     'maximalPrice' => 120,
-                    'indexerMinimalPrice' => 120
                 ]
             ],
 
@@ -109,7 +115,6 @@ public function getTestCases()
                     'minimalPrice' => 120,
                     //  110 + (3 * 10) + (2 * 10) + 10
                     'maximalPrice' => 170,
-                    'indexerMinimalPrice' => 120
                 ]
             ],
 
@@ -120,7 +125,6 @@ public function getTestCases()
                     'minimalPrice' => 120,
                     // 110 + 60
                     'maximalPrice' => 170,
-                    'indexerMinimalPrice' => 120
                 ]
             ],
 
@@ -131,7 +135,6 @@ public function getTestCases()
                     'minimalPrice' => 120,
                     // 110 + 30
                     'maximalPrice' => 140,
-                    'indexerMinimalPrice' => 120
                 ]
             ],
 
@@ -149,7 +152,6 @@ public function getTestCases()
 
                     // 110 + 1 * 20 + 100
                     'maximalPrice' => 230,
-                    'indexerMinimalPrice' => 130
                 ]
             ],
 
@@ -167,7 +169,6 @@ public function getTestCases()
 
                     // 110 + 110 * 0.2 + 110 * 1
                     'maximalPrice' => 242,
-                    'indexerMinimalPrice' => 132
                 ]
             ],
 
@@ -185,7 +186,6 @@ public function getTestCases()
 
                     // 110 + 1 * 20 + 110 * 1
                     'maximalPrice' => 240,
-                    'indexerMinimalPrice' => 130
                 ]
             ],
 
@@ -203,7 +203,6 @@ public function getTestCases()
 
                     // 110 + 110 * 0.2 + 100
                     'maximalPrice' => 232,
-                    'indexerMinimalPrice' => 132
                 ]
             ],
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
new file mode 100644
index 0000000000000..b97bd9f822666
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
@@ -0,0 +1,417 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Product;
+
+use \Magento\Bundle\Api\Data\LinkInterface;
+
+/**
+ * @magentoDbIsolation disabled
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @group indexer_dimension
+ * @magentoAppArea frontend
+ */
+class FixedBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
+{
+    /**
+     * @param array $strategyModifiers
+     * @param array $expectedResults
+     * @dataProvider getTestCases
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDbIsolation disabled
+     */
+    public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
+    {
+        $this->prepareFixture($strategyModifiers, 'bundle_product');
+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+        $priceInfo = $bundleProduct->getPriceInfo();
+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+        $this->assertEquals(
+            $expectedResults['minimalPrice'],
+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+            'Failed to check minimal price on product'
+        );
+        $this->assertEquals(
+            $expectedResults['maximalPrice'],
+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+            'Failed to check maximal price on product'
+        );
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addIdFilter([42])
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
+    }
+
+    /**
+     * @param array $strategyModifiers
+     * @param array $expectedResults
+     * @dataProvider getTestCases
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture current_store catalog/price/scope 1
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDbIsolation disabled
+     */
+    public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
+    {
+        $this->prepareFixture($strategyModifiers, 'bundle_product');
+        $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
+
+        /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
+        $priceInfo = $bundleProduct->getPriceInfo();
+        $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
+
+        $this->assertEquals(
+            $expectedResults['minimalPrice'],
+            $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
+            'Failed to check minimal price on product'
+        );
+        $this->assertEquals(
+            $expectedResults['maximalPrice'],
+            $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
+            'Failed to check maximal price on product'
+        );
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
+    }
+
+    /**
+     * Test cases for current test
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getTestCases()
+    {
+        return [
+            '#1 Testing price for fixed bundle product with one simple' => [
+                'strategy' => $this->getProductWithOneSimple(),
+                'expectedResults' => [
+                    //  110 + 10 (price from simple1)
+                    'minimalPrice' => 120,
+                    // 110 + 10 (sum of simple price)
+                    'maximalPrice' => 120,
+                ]
+            ],
+
+            '#2 Testing price for fixed bundle product with three simples and different qty' => [
+                'strategy' => $this->getProductWithDifferentQty(),
+                'expectedResults' => [
+                    // 110 + 10 (min price from simples)
+                    'minimalPrice' => 120,
+                    //  110 + (3 * 10) + (2 * 10) + 10
+                    'maximalPrice' => 170,
+                ]
+            ],
+
+            '#3 Testing price for fixed bundle product with three simples and different price' => [
+                'strategy' => $this->getProductWithDifferentPrice(),
+                'expectedResults' => [
+                    //  110 + 10
+                    'minimalPrice' => 120,
+                    // 110 + 60
+                    'maximalPrice' => 170,
+                ]
+            ],
+
+            '#4 Testing price for fixed bundle product with three simples' => [
+                'strategy' => $this->getProductWithSamePrice(),
+                'expectedResults' => [
+                    //  110 + 10
+                    'minimalPrice' => 120,
+                    // 110 + 30
+                    'maximalPrice' => 140,
+                ]
+            ],
+
+            '
+                #5 Testing price for fixed bundle product 
+                with fixed sub items, fixed options and without any discounts
+            ' => [
+                'strategy' => $this->getBundleConfiguration3(
+                    LinkInterface::PRICE_TYPE_FIXED,
+                    self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+                ),
+                'expectedResults' => [
+                    // 110 + 1 * 20 + 100
+                    'minimalPrice' => 230,
+
+                    // 110 + 1 * 20 + 100
+                    'maximalPrice' => 230,
+                ]
+            ],
+
+            '
+                #6 Testing price for fixed bundle product 
+                with percent sub items, percent options and without any discounts
+            ' => [
+                'strategy' => $this->getBundleConfiguration3(
+                    LinkInterface::PRICE_TYPE_PERCENT,
+                    self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+                ),
+                'expectedResults' => [
+                    // 110 + 110 * 0.2 + 110 * 1
+                    'minimalPrice' => 242,
+
+                    // 110 + 110 * 0.2 + 110 * 1
+                    'maximalPrice' => 242,
+                ]
+            ],
+
+            '
+                #7 Testing price for fixed bundle product 
+                with fixed sub items, percent options and without any discounts
+            ' => [
+                'strategy' => $this->getBundleConfiguration3(
+                    LinkInterface::PRICE_TYPE_FIXED,
+                    self::CUSTOM_OPTION_PRICE_TYPE_PERCENT
+                ),
+                'expectedResults' => [
+                    // 110 + 1 * 20 + 110 * 1
+                    'minimalPrice' => 240,
+
+                    // 110 + 1 * 20 + 110 * 1
+                    'maximalPrice' => 240,
+                ]
+            ],
+
+            '
+                #8 Testing price for fixed bundle product 
+                with percent sub items, fixed options and without any discounts
+            ' => [
+                'strategy' => $this->getBundleConfiguration3(
+                    LinkInterface::PRICE_TYPE_PERCENT,
+                    self::CUSTOM_OPTION_PRICE_TYPE_FIXED
+                ),
+                'expectedResults' => [
+                    // 110 + 110 * 0.2 + 100
+                    'minimalPrice' => 232,
+
+                    // 110 + 110 * 0.2 + 100
+                    'maximalPrice' => 232,
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * Fixed bundle product with one simple
+     * @return array
+     */
+    private function getProductWithOneSimple()
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'price' => 10,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                ]
+            ],
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Fixed bundle product with three simples and different qty
+     * @return array
+     */
+    private function getProductWithDifferentQty()
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'price' => 10,
+                        'qty' => 3,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'price' => 10,
+                        'qty' => 2,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                    [
+                        'sku' => 'simple3',
+                        'price' => 10,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Fixed bundle product with three simples and different price
+     * @return array
+     */
+    private function getProductWithSamePrice()
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'price' => 10,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'price' => 10,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                    [
+                        'sku' => 'simple3',
+                        'price' => 10,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ]
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Fixed bundle product with three simples
+     * @return array
+     */
+    private function getProductWithDifferentPrice()
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'price' => 10,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                    [
+                        'sku' => 'simple2',
+                        'price' => 20,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ],
+                    [
+                        'sku' => 'simple3',
+                        'price' => 30,
+                        'qty' => 1,
+                        'price_type' => LinkInterface::PRICE_TYPE_FIXED,
+                    ]
+                ]
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+        ];
+    }
+
+    /**
+     * Fixed bundle product with required option, custom option and without any discounts
+     * @param string $selectionsPriceType
+     * @param string $customOptionsPriceType
+     * @return array
+     */
+    private function getBundleConfiguration3($selectionsPriceType, $customOptionsPriceType)
+    {
+        $optionsData = [
+            [
+                'title' => 'Op1',
+                'required' => true,
+                'type' => 'checkbox',
+                'links' => [
+                    [
+                        'sku' => 'simple1',
+                        'qty' => 1,
+                        'price' => 20,
+                        'price_type' => $selectionsPriceType
+                    ],
+                ]
+            ],
+        ];
+
+        $customOptionsData = [
+            [
+                'price_type' => $customOptionsPriceType,
+                'title' => 'Test Field',
+                'type' => 'field',
+                'is_require' => 1,
+                'price' => 100,
+                'sku' => '1-text',
+            ]
+        ];
+
+        return [
+            [
+                'modifierName' => 'addSimpleProduct',
+                'data' => [$optionsData]
+            ],
+            [
+                'modifierName' => 'addCustomOption',
+                'data' => [$customOptionsData]
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php
index 5f2827fc6ec15..b3c46c75bcfb7 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php
@@ -9,7 +9,6 @@
 use \Magento\Bundle\Api\Data\LinkInterface;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
  * @magentoAppArea frontend
  */
 class FixedBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
@@ -19,6 +18,8 @@ class FixedBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
     {
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
index 7f1932203959c..d02f84e1641ac 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php
@@ -9,7 +9,6 @@
 use \Magento\Bundle\Api\Data\LinkInterface;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
  * @magentoAppArea frontend
  */
 class FixedBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
@@ -19,9 +18,14 @@ class FixedBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
     {
+        if (empty($strategyModifiers)) {
+            $this->markTestSkipped('Unskip after fixing https://github.com/magento-engcom/msi/issues/1398');
+        }
         $this->prepareFixture($strategyModifiers, 'bundle_product');
         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
 
@@ -29,23 +33,25 @@ public function testPriceForFixedBundle(array $strategyModifiers, array $expecte
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
 
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addFieldToFilter('sku', 'bundle_product')
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
-        $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
@@ -67,7 +73,6 @@ public function getTestCases()
 
                     // 110 * 0.5
                     'maximalPrice' => 55,
-                    'indexerMinimalPrice' => null
                 ]
             ],
 
@@ -85,7 +90,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 20) + 100
                     'maximalPrice' => 165,
-                    'indexerMinimalPrice' => 130
                 ]
             ],
 
@@ -103,7 +107,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 110 * 0.2 + 110 * 1)
                     'maximalPrice' => 121,
-                    'indexerMinimalPrice' => 132
                 ]
             ],
 
@@ -121,7 +124,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 20 + 110 * 1)
                     'maximalPrice' => 120,
-                    'indexerMinimalPrice' => 130
                 ]
             ],
 
@@ -139,7 +141,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 110 * 0.2) + 100
                     'maximalPrice' => 166,
-                    'indexerMinimalPrice' => 132
                 ]
             ],
 
@@ -157,7 +158,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 20) + 100
                     'maximalPrice' => 175,
-                    'indexerMinimalPrice' => 150
                 ]
             ],
 
@@ -175,7 +175,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 110 * 0.2 + 1 * 110)
                     'maximalPrice' => 132,
-                    'indexerMinimalPrice' => 154
                 ]
             ],
 
@@ -193,7 +192,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 20 + 1 * 110)
                     'maximalPrice' => 130,
-                    'indexerMinimalPrice' => 150
                 ]
             ],
 
@@ -211,7 +209,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 0.2 * 110) + 100
                     'maximalPrice' => 177,
-                    'indexerMinimalPrice' => 154
                 ]
             ],
 
@@ -229,7 +226,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 10 + 1 * 40) + 100
                     'maximalPrice' => 190,
-                    'indexerMinimalPrice' => 140
                 ]
             ],
 
@@ -247,7 +243,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4 + 110 * 1)
                     'maximalPrice' => 148.5,
-                    'indexerMinimalPrice' => 143
                 ]
             ],
 
@@ -265,7 +260,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 10 + 1 * 40 + 1 * 110)
                     'maximalPrice' => 145,
-                    'indexerMinimalPrice' => 140
                 ]
             ],
 
@@ -283,7 +277,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4) + 100
                     'maximalPrice' => 193.5,
-                    'indexerMinimalPrice' => 143
                 ]
             ],
 
@@ -301,7 +294,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 40 + 3 * 15) + 100
                     'maximalPrice' => 197.5,
-                    'indexerMinimalPrice' => 150
                 ]
             ],
 
@@ -319,7 +311,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15 + 110 * 1)
                     'maximalPrice' => 156.75,
-                    'indexerMinimalPrice' => 154
                 ]
             ],
 
@@ -337,7 +328,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 40 + 3 * 15 + 1 * 110)
                     'maximalPrice' => 152.5,
-                    'indexerMinimalPrice' => 150
                 ]
             ],
 
@@ -355,7 +345,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15) + 100
                     'maximalPrice' => 201.75,
-                    'indexerMinimalPrice' => 154
                 ]
             ],
 
@@ -373,7 +362,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15) + 100
                     'maximalPrice' => 177.5,
-                    'indexerMinimalPrice' => 150
                 ]
             ],
 
@@ -391,7 +379,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110)
                     'maximalPrice' => 134.75,
-                    'indexerMinimalPrice' => 154
                 ]
             ],
 
@@ -409,7 +396,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15 + 110 * 1)
                     'maximalPrice' => 132.5,
-                    'indexerMinimalPrice' => 150
                 ]
             ],
 
@@ -427,7 +413,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15) + 100
                     'maximalPrice' => 179.75,
-                    'indexerMinimalPrice' => 154
                 ]
             ],
 
@@ -445,7 +430,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10) + 100
                     'maximalPrice' => 202.5,
-                    'indexerMinimalPrice' => 170
                 ]
             ],
 
@@ -463,7 +447,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1 + 110 * 1)
                     'maximalPrice' => 162.25,
-                    'indexerMinimalPrice' => 176
                 ]
             ],
 
@@ -481,7 +464,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10 + 1 * 110)
                     'maximalPrice' => 157.5,
-                    'indexerMinimalPrice' => 170,
                 ]
             ],
 
@@ -499,7 +481,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1) + 100
                     'maximalPrice' => 207.25,
-                    'indexerMinimalPrice' => 176
                 ]
             ],
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
index 95ee123a21726..7437952462171 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php
@@ -12,7 +12,6 @@
 /**
  * Class FixedBundleWithTierPRiceCalculatorTest
  * @package Magento\Bundle\Model\Product
- * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
  * @magentoAppArea frontend
  */
 class FixedBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
@@ -31,32 +30,41 @@ protected function setUp()
      * @param array $expectedResults
      * @dataProvider getTestCases
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
     {
         $this->prepareFixture($strategyModifiers, 'bundle_product');
         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
 
+        if (empty($bundleProduct->getOptions())) {
+            $this->markTestSkipped('Unskip after fixing https://github.com/magento-engcom/msi/issues/1398');
+        }
+
         /** @var \Magento\Framework\Pricing\PriceInfo\Base $priceInfo */
         $priceInfo = $bundleProduct->getPriceInfo();
         $priceCode = \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE;
-        $priceInfoFromIndexer = $this->productCollectionFactory->create()
-            ->addFieldToFilter('sku', 'bundle_product')
-            ->addPriceData()
-            ->load()
-            ->getFirstItem();
+
         $this->assertEquals(
             $expectedResults['minimalPrice'],
             $priceInfo->getPrice($priceCode)->getMinimalPrice()->getValue(),
             'Failed to check minimal price on product'
         );
-
         $this->assertEquals(
             $expectedResults['maximalPrice'],
             $priceInfo->getPrice($priceCode)->getMaximalPrice()->getValue(),
             'Failed to check maximal price on product'
         );
-        $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+
+        $priceInfoFromIndexer = $this->productCollectionFactory->create()
+            ->addFieldToFilter('sku', 'bundle_product')
+            ->addPriceData()
+            ->load()
+            ->getFirstItem();
+
+        $this->assertEquals($expectedResults['minimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
+        $this->assertEquals($expectedResults['maximalPrice'], $priceInfoFromIndexer->getMaxPrice());
     }
 
     /**
@@ -78,7 +86,6 @@ public function getTestCases()
 
                     // 110 * 0.5
                     'maximalPrice' => 55,
-                    'indexerMinimalPrice' => null
                 ]
             ],
 
@@ -96,7 +103,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 20) + 100
                     'maximalPrice' => 165,
-                    'indexerMinimalPrice' => 65
                 ]
             ],
 
@@ -114,7 +120,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 110 * 0.2 + 110 * 1)
                     'maximalPrice' => 121,
-                    'indexerMinimalPrice' => 66
                 ]
             ],
 
@@ -132,7 +137,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 20 + 110 * 1)
                     'maximalPrice' => 120,
-                    'indexerMinimalPrice' => 65
                 ]
             ],
 
@@ -150,7 +154,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 110 * 0.2) + 100
                     'maximalPrice' => 166,
-                    'indexerMinimalPrice' => 66
                 ]
             ],
 
@@ -168,7 +171,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 20) + 100
                     'maximalPrice' => 175,
-                    'indexerMinimalPrice' => 75,
                 ]
             ],
 
@@ -186,7 +188,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 110 * 0.2 + 1 * 110)
                     'maximalPrice' => 132,
-                    'indexerMinimalPrice' => 77
                 ]
             ],
 
@@ -204,7 +205,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 20 + 1 * 110)
                     'maximalPrice' => 130,
-                    'indexerMinimalPrice' => 75
 
                 ]
             ],
@@ -223,7 +223,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 2 * 0.2 * 110) + 100
                     'maximalPrice' => 177,
-                    'indexerMinimalPrice' => 77
                 ]
             ],
 
@@ -241,7 +240,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 10 + 1 * 40) + 100
                     'maximalPrice' => 190,
-                    'indexerMinimalPrice' => 70
                 ]
             ],
 
@@ -259,7 +257,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4 + 110 * 1)
                     'maximalPrice' => 148.5,
-                    'indexerMinimalPrice' => 71.5
                 ]
             ],
 
@@ -277,7 +274,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 10 + 1 * 40 + 1 * 110)
                     'maximalPrice' => 145,
-                    'indexerMinimalPrice' => 70
                 ]
             ],
 
@@ -295,7 +291,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.1 + 1 * 110 * 0.4) + 100
                     'maximalPrice' => 193.5,
-                    'indexerMinimalPrice' => 71.5
                 ]
             ],
 
@@ -313,7 +308,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 40 + 3 * 15) + 100
                     'maximalPrice' => 197.5,
-                    'indexerMinimalPrice' => 75
                 ]
             ],
 
@@ -331,7 +325,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15 + 110 * 1)
                     'maximalPrice' => 156.75,
-                    'indexerMinimalPrice' => 77
                 ]
             ],
 
@@ -349,7 +342,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 40 + 3 * 15 + 1 * 110)
                     'maximalPrice' => 152.5,
-                    'indexerMinimalPrice' => 75
                 ]
             ],
 
@@ -367,7 +359,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 1 * 110 * 0.4 + 3 * 110 * 0.15) + 100
                     'maximalPrice' => 201.75,
-                    'indexerMinimalPrice' => 77
                 ]
             ],
 
@@ -385,7 +376,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15) + 100
                     'maximalPrice' => 177.5,
-                    'indexerMinimalPrice' => 75
                 ]
             ],
 
@@ -403,7 +393,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110)
                     'maximalPrice' => 134.75,
-                    'indexerMinimalPrice' => 77
                 ]
             ],
 
@@ -421,7 +410,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15 + 110 * 1)
                     'maximalPrice' => 132.5,
-                    'indexerMinimalPrice' => 75
                 ]
             ],
 
@@ -439,7 +427,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15) + 100
                     'maximalPrice' => 179.75,
-                    'indexerMinimalPrice' => 77
                 ]
             ],
 
@@ -457,7 +444,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10) + 100
                     'maximalPrice' => 202.5,
-                    'indexerMinimalPrice' => 85
                 ]
             ],
 
@@ -475,7 +461,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1 + 110 * 1)
                     'maximalPrice' => 162.25,
-                    'indexerMinimalPrice' => 88
                 ]
             ],
 
@@ -493,7 +478,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 15 + 1 * 20 + 3 * 10 + 1 * 110)
                     'maximalPrice' => 157.5,
-                    'indexerMinimalPrice' => 85
                 ]
             ],
 
@@ -511,7 +495,6 @@ public function getTestCases()
 
                     // 0.5 * (110 + 3 * 110 * 0.15 + 1 * 110 * 0.2 + 3 * 110 * 0.1) + 100
                     'maximalPrice' => 207.25,
-                    'indexerMinimalPrice' => 88
                 ]
             ],
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php
index 55f8821d7087b..47f50dc6d991e 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/OptionListTest.php
@@ -21,6 +21,9 @@ class OptionListTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * Set up
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -28,6 +31,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @magentoDbIsolation disabled
      */
     public function testGetItems()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
new file mode 100644
index 0000000000000..bc25c3fa29381
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Product;
+
+/**
+ * @magentoDbIsolation disabled
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @group indexer_dimension
+ * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
+ */
+class PriceWithDimensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Bundle\Model\Product\Price
+     */
+    protected $_model;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Bundle\Model\Product\Price::class
+        );
+    }
+
+    /**
+     * Get tier price
+     */
+    public function testGetTierPrice()
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('bundle-product');
+        // fixture
+
+        // Note that this is really not the "tier price" but the "tier discount percentage"
+        // so it is expected to be increasing instead of decreasing
+        $this->assertEquals(8.0, $this->_model->getTierPrice(2, $product));
+        $this->assertEquals(20.0, $this->_model->getTierPrice(3, $product));
+        $this->assertEquals(20.0, $this->_model->getTierPrice(4, $product));
+        $this->assertEquals(30.0, $this->_model->getTierPrice(5, $product));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php
new file mode 100644
index 0000000000000..381675d01ae1d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Product;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/**
+ * Test class for \Magento\Bundle\Model\Product\SaveHandler
+ * The tested class used indirectly
+ *
+ * @magentoDataFixture Magento/Bundle/_files/product.php
+ * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ */
+class SaveHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Store\Model\Store
+     */
+    private $store;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+        /** @var ProductRepositoryInterface $productRepository */
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testOptionTitlesOnDifferentStores(): void
+    {
+        /**
+         * @var \Magento\Bundle\Model\Product\OptionList $optionList
+         */
+        $optionList = $this->objectManager->create(\Magento\Bundle\Model\Product\OptionList::class);
+
+        $secondStoreId = $this->store->load('fixture_second_store')->getId();
+        $thirdStoreId = $this->store->load('fixture_third_store')->getId();
+
+        $product = $this->productRepository->get('bundle-product', true, $secondStoreId, true);
+        $options = $optionList->getItems($product);
+        $title = $options[0]->getTitle();
+        $newTitle = $title . ' ' . $this->store->load('fixture_second_store')->getCode();
+        $options[0]->setTitle($newTitle);
+        $extension = $product->getExtensionAttributes();
+        $extension->setBundleProductOptions($options);
+        $product->setExtensionAttributes($extension);
+        $product->save();
+
+        $product = $this->productRepository->get('bundle-product', true, $thirdStoreId, true);
+        $options = $optionList->getItems($product);
+        $newTitle = $title . ' ' . $this->store->load('fixture_third_store')->getCode();
+        $options[0]->setTitle($newTitle);
+        $extension = $product->getExtensionAttributes();
+        $extension->setBundleProductOptions($options);
+        $product->setExtensionAttributes($extension);
+        $product->save();
+
+        $product = $this->productRepository->get('bundle-product', false, $secondStoreId, true);
+        $options = $optionList->getItems($product);
+        $this->assertEquals(1, count($options));
+        $this->assertEquals(
+            $title . ' ' . $this->store->load('fixture_second_store')->getCode(),
+            $options[0]->getTitle()
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php
index f9e8e75287237..51250580eb6ae 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php
@@ -51,6 +51,7 @@ protected function setUp()
      * @magentoDataFixture Magento/Bundle/_files/product.php
      * @covers \Magento\Indexer\Model\Indexer::reindexAll
      * @covers \Magento\Bundle\Model\Product\Type::getSearchableData
+     * @magentoDbIsolation disabled
      */
     public function testPrepareProductIndexForBundleProduct()
     {
@@ -66,6 +67,7 @@ public function testPrepareProductIndexForBundleProduct()
     /**
      * @magentoDataFixture Magento/Bundle/_files/product_with_multiple_options.php
      * @covers \Magento\Bundle\Model\Product\Type::getOptionsCollection
+     * @magentoDbIsolation disabled
      */
     public function testGetOptionsCollection()
     {
@@ -81,6 +83,7 @@ public function testGetOptionsCollection()
     /**
      * @magentoDataFixture Magento/Bundle/_files/product.php
      * @covers \Magento\Bundle\Model\Product\Type::getParentIdsByChild()
+     * @magentoDbIsolation disabled
      */
     public function testGetParentIdsByChild()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
index 901e3db31b555..4303577e6c435 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
@@ -17,12 +17,16 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Entity;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -35,6 +39,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -43,6 +50,13 @@ protected function setUp()
         $this->model->setTypeId(Type::TYPE_BUNDLE);
     }
 
+    /**
+     * Tests Retrieve ans set type instance of the product
+     *
+     * @see \Magento\Catalog\Model\Product::getTypeInstance
+     * @see \Magento\Catalog\Model\Product::setTypeInstance
+     * @return void
+     */
     public function testGetSetTypeInstance()
     {
         // model getter
@@ -82,6 +96,12 @@ public function testCRUD()
         $crud->testCrud();
     }
 
+    /**
+     * Tests Get product price model
+     *
+     * @see \Magento\Catalog\Model\Product::getPriceModel
+     * @return void
+     */
     public function testGetPriceModel()
     {
         $this->model->setTypeId(Type::TYPE_BUNDLE);
@@ -90,6 +110,12 @@ public function testGetPriceModel()
         $this->assertSame($type, $this->model->getPriceModel());
     }
 
+    /**
+     * Tests Check is product composite
+     *
+     * @see \Magento\Catalog\Model\Product::isComposite
+     * @return void
+     */
     public function testIsComposite()
     {
         $this->assertTrue($this->model->isComposite());
@@ -100,6 +126,7 @@ public function testIsComposite()
      *
      * @magentoDataFixture Magento/Bundle/_files/product_with_multiple_options.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoDbIsolation disabled
      */
     public function testMultipleStores()
     {
@@ -123,4 +150,122 @@ public function testMultipleStores()
 
         self::assertEquals($store->getId(), $updatedBundle->getStoreId());
     }
+
+    /**
+     * @param float $selectionQty
+     * @param float $qty
+     * @param int $isInStock
+     * @param bool $manageStock
+     * @param int $backorders
+     * @param bool $isSalable
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @dataProvider stockConfigDataProvider
+     * @covers \Magento\Catalog\Model\Product::isSalable
+     */
+    public function testIsSalable(
+        float $selectionQty,
+        float $qty,
+        int $isInStock,
+        bool $manageStock,
+        int $backorders,
+        bool $isSalable
+    ) {
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+
+        $child = $productRepository->get('simple');
+        $childStockItem = $child->getExtensionAttributes()->getStockItem();
+        $childStockItem->setQty($qty);
+        $childStockItem->setIsInStock($isInStock);
+        $childStockItem->setUseConfigManageStock(false);
+        $childStockItem->setManageStock($manageStock);
+        $childStockItem->setUseConfigBackorders(false);
+        $childStockItem->setBackorders($backorders);
+        $productRepository->save($child);
+
+        /** @var \Magento\Catalog\Model\Product $bundle */
+        $bundle = $productRepository->get('bundle-product');
+        foreach ($bundle->getExtensionAttributes()->getBundleProductOptions() as $productOption) {
+            foreach ($productOption->getProductLinks() as $productLink) {
+                $productLink->setCanChangeQuantity(0);
+                $productLink->setQty($selectionQty);
+            }
+        }
+        $productRepository->save($bundle);
+
+        $this->assertEquals($isSalable, $bundle->isSalable());
+    }
+
+    /**
+     * @return array
+     */
+    public function stockConfigDataProvider(): array
+    {
+        $qtyVars = [0, 10];
+        $isInStockVars = [
+            Stock::STOCK_OUT_OF_STOCK,
+            Stock::STOCK_IN_STOCK,
+        ];
+        $manageStockVars = [false, true];
+        $backordersVars = [
+            Stock::BACKORDERS_NO,
+            Stock::BACKORDERS_YES_NONOTIFY,
+            Stock::BACKORDERS_YES_NOTIFY,
+        ];
+        $selectionQtyVars = [5, 10, 15];
+
+        $variations = [];
+        foreach ($qtyVars as $qty) {
+            foreach ($isInStockVars as $isInStock) {
+                foreach ($manageStockVars as $manageStock) {
+                    foreach ($backordersVars as $backorders) {
+                        foreach ($selectionQtyVars as $selectionQty) {
+                            $variationName = "selectionQty: {$selectionQty}"
+                                . " qty: {$qty}"
+                                . " isInStock: {$isInStock}"
+                                . " manageStock: {$manageStock}"
+                                . " backorders: {$backorders}";
+                            $isSalable = $this->checkIsSalable(
+                                $selectionQty,
+                                $qty,
+                                $isInStock,
+                                $manageStock,
+                                $backorders
+                            );
+
+                            $variations[$variationName] = [
+                                $selectionQty,
+                                $qty,
+                                $isInStock,
+                                $manageStock,
+                                $backorders,
+                                $isSalable
+                            ];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $variations;
+    }
+
+    /**
+     * @param float $selectionQty
+     * @param float $qty
+     * @param int $isInStock
+     * @param bool $manageStock
+     * @param int $backorders
+     * @return bool
+     * @see \Magento\Bundle\Model\ResourceModel\Selection\Collection::addQuantityFilter
+     */
+    private function checkIsSalable(
+        float $selectionQty,
+        float $qty,
+        int $isInStock,
+        bool $manageStock,
+        int $backorders
+    ): bool {
+        return !$manageStock || ($isInStock && ($backorders || $selectionQty <= $qty));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_not_visible_children.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_not_visible_children.php
new file mode 100644
index 0000000000000..57990f449e24c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_not_visible_children.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/*
+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
+ * bundled items should not contain products with required custom options.
+ * However, if to create such a bundle product, it will be always out of stock.
+ */
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually.php';
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$sampleProduct = $productRepository->get('simple_not_visible_1');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('bundle')
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setWeight(2)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product-1')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(0)
+    ->setSkuType(1)
+    ->setWeightType(0)
+    ->setPriceType(0)
+    ->setShipmentType(0)
+    ->setPrice(10.0)
+    ->setBundleOptionsData(
+        [
+            [
+                'title' => 'Bundle Product Items',
+                'default_title' => 'Bundle Product Items',
+                'type' => 'select', 'required' => 1,
+                'delete' => '',
+            ],
+        ]
+    )
+    ->setBundleSelectionsData(
+        [
+            [
+                [
+                    'product_id' => $sampleProduct->getId(),
+                    'selection_price_value' => 2.75,
+                    'selection_qty' => 2,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+
+                ],
+            ],
+        ]
+    );
+
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
+
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        /** @var \Magento\Bundle\Api\Data\LinkInterface$link */
+                        $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        $link->setPrice($linkData['selection_price_value']);
+                        if (isset($linkData['selection_can_change_qty'])) {
+                            $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
+                        }
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+//$product->save();
+$productRepository->save($product, true);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_not_visible_children_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_not_visible_children_rollback.php
new file mode 100644
index 0000000000000..29688fc965721
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_not_visible_children_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/*
+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
+ * bundled items should not contain products with required custom options.
+ * However, if to create such a bundle product, it will be always out of stock.
+ */
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('bundle-product-1', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product.php
new file mode 100644
index 0000000000000..cc20b293e69d1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('bundle')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(0)
+    ->setPriceType(0)
+    ->setShipmentType(1)
+    ->setWeightType(0)
+    ->setDescription('description')
+    ->setPrice(99);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product_rollback.php
new file mode 100644
index 0000000000000..a124661a45bac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('bundle-product', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
index a70075934c55f..662b69c89bc6d 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
@@ -28,8 +28,14 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    ->setCategoryIds([])
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]);
 
 $productRepository->save($product);
 
@@ -53,8 +59,14 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    ->setCategoryIds([])
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 50,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]);
 
 $productRepository->save($product);
 
@@ -73,8 +85,14 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    ->setCategoryIds([])
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 140,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]);
 
 $productRepository->save($product);
 
@@ -98,8 +116,14 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 20, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    ->setCategoryIds([])
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 20,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]);
 
 $productRepository->save($product);
 
@@ -123,7 +147,13 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 15, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    ->setCategoryIds([])
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 15,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]);
 
 $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php
new file mode 100644
index 0000000000000..66e95b54c6cc4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$sampleProduct = $productRepository->get('simple');
+$secondSampleProduct = $productRepository->get('custom-design-simple-product');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('bundle')
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(1)
+    ->setPriceType(1)
+    ->setShipmentType(1)
+    ->setPrice(10.0)
+    ->setBundleOptionsData(
+        [
+            [
+                'title' => 'Bundle Product Items',
+                'default_title' => 'Bundle Product Items',
+                'type' => 'select',
+                'required' => 1,
+                'delete' => '',
+            ],
+            [
+                'title' => 'Bundle Product Items Option 2',
+                'default_title' => 'Bundle Product Items Option 2',
+                'type' => 'select',
+                'required' => 1,
+                'delete' => '',
+            ],
+        ]
+    )
+    ->setBundleSelectionsData(
+        [
+            [
+                [
+                    'product_id' => $sampleProduct->getId(),
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                ],
+            ],
+            [
+                [
+                    'product_id' => $secondSampleProduct->getId(),
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                ],
+            ]
+        ]
+    );
+
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
+
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        /** @var \Magento\Bundle\Api\Data\LinkInterface$link */
+                        $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        if (isset($linkData['selection_can_change_qty'])) {
+                            $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
+                        }
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+$product->save();
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
+
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->load(3);
+
+/** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+$typeInstance = $product->getTypeInstance();
+$typeInstance->setStoreFilter($product->getStoreId(), $product);
+$optionCollection = $typeInstance->getOptionsCollection($product);
+
+$bundleOptions = [];
+$bundleOptionsQty = [];
+$optionsData = [];
+foreach ($optionCollection as $option) {
+    /** @var $option \Magento\Bundle\Model\Option */
+    $selectionsCollection = $typeInstance->getSelectionsCollection([$option->getId()], $product);
+    if ($option->isMultiSelection()) {
+        $optionsData[$option->getId()] = array_column($selectionsCollection->toArray(), 'product_id');
+        $bundleOptions[$option->getId()] = array_column($selectionsCollection->toArray(), 'selection_id');
+    } else {
+        $bundleOptions[$option->getId()] = $selectionsCollection->getFirstItem()->getSelectionId();
+        $optionsData[$option->getId()] = $selectionsCollection->getFirstItem()->getProductId();
+    }
+    $bundleOptionsQty[$option->getId()] = 1;
+}
+
+$requestInfo = [
+    'product' => $product->getId(),
+    'bundle_option' => $bundleOptions,
+    'bundle_option_qty' => $bundleOptionsQty,
+    'qty' => 1,
+];
+
+$orderItems = [];
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId());
+$orderItem->setQtyOrdered(1);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType($product->getTypeId());
+$orderItem->setProductOptions(['info_buyRequest' => $requestInfo]);
+
+$orderItems[] = $orderItem;
+
+foreach ($optionsData as $optionId => $productId) {
+    /** @var $selectedProduct \Magento\Catalog\Model\Product */
+    $selectedProduct = $objectManager->create(\Magento\Catalog\Model\Product::class);
+    $selectedProduct->load($productId);
+
+    /** @var \Magento\Sales\Model\Order\Item $orderItem */
+    $orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+    $orderItem->setProductId($productId);
+    $orderItem->setQtyOrdered(1);
+    $orderItem->setBasePrice($selectedProduct->getPrice());
+    $orderItem->setPrice($selectedProduct->getPrice());
+    $orderItem->setRowTotal($selectedProduct->getPrice());
+    $orderItem->setProductType($selectedProduct->getTypeId());
+    $orderItem->setProductOptions(['info_buyRequest' => $requestInfo]);
+    $orderItems[] = $orderItem;
+}
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001');
+$order->setState(\Magento\Sales\Model\Order::STATE_NEW);
+$order->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_NEW));
+$order->setCustomerIsGuest(true);
+$order->setCustomerEmail('customer@null.com');
+$order->setCustomerFirstname('firstname');
+$order->setCustomerLastname('lastname');
+$order->setBillingAddress($billingAddress);
+$order->setShippingAddress($shippingAddress);
+$order->setAddresses([$billingAddress, $shippingAddress]);
+$order->setPayment($payment);
+
+foreach ($orderItems as $item) {
+    $order->addItem($item);
+}
+
+$order->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId());
+$order->setSubtotal(100);
+$order->setBaseSubtotal(100);
+$order->setBaseGrandTotal(100);
+$order->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately_rollback.php
new file mode 100644
index 0000000000000..9a04b3d7ae8ce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/product_rollback.php';
+require __DIR__ . '/../../../Magento/Sales/_files/default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
index 147b4b6776596..864d2dfafe53b 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
@@ -22,6 +22,7 @@
 $product->setTypeId('bundle')
     ->setId(3)
     ->setAttributeSetId(4)
+    ->setWeight(2)
     ->setWebsiteIds([1])
     ->setName('Bundle Product')
     ->setSku('bundle-product')
@@ -29,8 +30,10 @@
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setPriceView(1)
+    ->setSkuType(1)
+    ->setWeightType(1)
     ->setPriceType(1)
-    ->setShipmentType(1)
+    ->setShipmentType(0)
     ->setPrice(10.0)
     ->setBundleOptionsData(
         [
@@ -47,9 +50,11 @@
             [
                 [
                     'product_id' => $sampleProduct->getId(),
+                    'selection_price_value' => 2.75,
                     'selection_qty' => 1,
                     'selection_can_change_qty' => 1,
                     'delete' => '',
+
                 ],
             ],
         ]
@@ -75,6 +80,7 @@
                         $linkProduct = $productRepository->getById($linkData['product_id']);
                         $link->setSku($linkProduct->getSku());
                         $link->setQty($linkData['selection_qty']);
+                        $link->setPrice($linkData['selection_price_value']);
                         if (isset($linkData['selection_can_change_qty'])) {
                             $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
                         }
@@ -90,4 +96,5 @@
     $extension->setBundleProductOptions($options);
     $product->setExtensionAttributes($extension);
 }
-$product->save();
+
+$productRepository->save($product, true);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1.php
new file mode 100644
index 0000000000000..0e3527ce9572f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*
+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
+ * bundled items should not contain products with required custom options.
+ * However, if to create such a bundle product, it will be always out of stock.
+ */
+require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$sampleProduct = $productRepository->get('simple');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('bundle')
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setWeight(2)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(1)
+    ->setSkuType(1)
+    ->setWeightType(1)
+    ->setPriceType(1)
+    ->setShipmentType(0)
+    ->setPrice(10.0)
+    ->setBundleOptionsData(
+        [
+            [
+                'title' => 'Bundle Product Items',
+                'default_title' => 'Bundle Product Items',
+                'type' => 'select', 'required' => 1,
+                'delete' => '',
+            ],
+        ]
+    )
+    ->setBundleSelectionsData(
+        [
+            [
+                [
+                    'product_id' => $sampleProduct->getId(),
+                    'selection_price_value' => 2.75,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+
+                ],
+            ],
+        ]
+    );
+
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
+
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        /** @var \Magento\Bundle\Api\Data\LinkInterface$link */
+                        $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        $link->setPrice($linkData['selection_price_value']);
+                        if (isset($linkData['selection_can_change_qty'])) {
+                            $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
+                        }
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+//$product->save();
+$productRepository->save($product, true);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1_rollback.php
new file mode 100644
index 0000000000000..b439f4efa4750
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_1_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*
+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
+ * bundled items should not contain products with required custom options.
+ * However, if to create such a bundle product, it will be always out of stock.
+ */
+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('bundle-product', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options.php
index efe15f5977a58..a8fdaa26380a2 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options.php
@@ -47,6 +47,7 @@
                 'default_title' => 'Option 1',
                 'type' => 'select',
                 'required' => 1,
+                'position' => 1,
                 'delete' => '',
             ],
             // Required "Radio Buttons" option
@@ -55,6 +56,7 @@
                 'default_title' => 'Option 2',
                 'type' => 'radio',
                 'required' => 1,
+                'position' => 2,
                 'delete' => '',
             ],
             // Required "Checkbox" option
@@ -63,6 +65,7 @@
                 'default_title' => 'Option 3',
                 'type' => 'checkbox',
                 'required' => 1,
+                'position' => 3,
                 'delete' => '',
             ],
             // Required "Multiple Select" option
@@ -71,6 +74,7 @@
                 'default_title' => 'Option 4',
                 'type' => 'multi',
                 'required' => 1,
+                'position' => 4,
                 'delete' => '',
             ],
             // Non-required "Multiple Select" option
@@ -79,6 +83,7 @@
                 'default_title' => 'Option 5',
                 'type' => 'multi',
                 'required' => 0,
+                'position' => 5,
                 'delete' => '',
             ]
         ]
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_1.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_1.php
new file mode 100644
index 0000000000000..45a1f56157ad6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_1.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$productIds = range(10, 12, 1);
+foreach ($productIds as $productId) {
+    /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+    $stockItem = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+    $stockItem->load($productId, 'product_id');
+
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($productId);
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty(1000);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+}
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(1)
+    ->setSkuType(1)
+    ->setWeightType(1)
+    ->setPriceType(1)
+    ->setPrice(10.0)
+    ->setShipmentType(0)
+    ->setBundleOptionsData(
+        [
+            // Required "Drop-down" option
+            [
+                'title' => 'Option 1',
+                'default_title' => 'Option 1',
+                'type' => 'select',
+                'required' => 1,
+                'delete' => '',
+            ],
+
+        ]
+    )->setBundleSelectionsData(
+        [
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'selection_price_value' => 2.75,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 1
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'selection_price_value' => 6.75,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 1
+                ]
+            ]
+
+            ]
+    );
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
+
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        $link->setPrice($linkData['selection_price_value']);
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+$product->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_1_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_1_rollback.php
new file mode 100644
index 0000000000000..c13f84e414a4f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_1_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->load(3);
+if ($product->getId()) {
+    $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_rollback.php
index c13f84e414a4f..3748666b25136 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_rollback.php
@@ -12,11 +12,11 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->load(3);
-if ($product->getId()) {
-    $product->delete();
+try {
+    $product = $productRepository->get('bundle-product');
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
new file mode 100644
index 0000000000000..7e4c5593f18bb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/*
+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
+ * bundled items should not contain products with required custom options.
+ * However, if to create such a bundle product, it will be always out of stock.
+ */
+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('bundle-product');
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/quote_with_bundle_and_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/quote_with_bundle_and_options.php
new file mode 100644
index 0000000000000..03949115ea62c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/quote_with_bundle_and_options.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . 'product_with_multiple_options.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->load(3);
+
+/** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+$typeInstance = $product->getTypeInstance();
+$typeInstance->setStoreFilter($product->getStoreId(), $product);
+$optionCollection = $typeInstance->getOptionsCollection($product);
+
+$bundleOptions = [];
+$bundleOptionsQty = [];
+foreach ($optionCollection as $option) {
+    /** @var $option \Magento\Bundle\Model\Option */
+    $selectionsCollection = $typeInstance->getSelectionsCollection([$option->getId()], $product);
+    if ($option->isMultiSelection()) {
+        $bundleOptions[$option->getId()] = array_column($selectionsCollection->toArray(), 'selection_id');
+    } else {
+        $bundleOptions[$option->getId()] = $selectionsCollection->getFirstItem()->getSelectionId();
+    }
+    $bundleOptionsQty[$option->getId()] = 1;
+}
+
+$requestInfo = new \Magento\Framework\DataObject(
+    [
+        'product' => $product->getId(),
+        'bundle_option' => $bundleOptions,
+        'bundle_option_qty' => $bundleOptionsQty,
+        'qty' => 1,
+    ]
+);
+
+/** @var $cart \Magento\Checkout\Model\Cart */
+$cart = Bootstrap::getObjectManager()->create(\Magento\Checkout\Model\Cart::class);
+$cart->addProduct($product, $requestInfo);
+$cart->getQuote()->setReservedOrderId('test_cart_with_bundle_and_options');
+$cart->save();
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$objectManager->removeSharedInstance(\Magento\Checkout\Model\Session::class);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/quote_with_bundle_and_options_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/quote_with_bundle_and_options_rollback.php
new file mode 100644
index 0000000000000..d32d6fab33319
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/quote_with_bundle_and_options_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_cart_with_bundle_and_options', 'reserved_order_id');
+$quote->delete();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
+$quoteIdMask->delete($quote->getId());
+
+require __DIR__ . 'product_with_multiple_options_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php
index 6f81421c902f6..c26f5860f2375 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php
@@ -20,6 +20,9 @@ class RowCustomizerTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -30,8 +33,11 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
      */
-    public function testPrepareData()
+    public function testPrepareData(): void
     {
         $parsedAdditionalAttributes = 'text_attribute=!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'
             . ',text_attribute2=,';
@@ -56,4 +62,56 @@ public function testPrepareData()
         $this->assertEquals([], $this->model->addData([], $ids['simple']));
         $this->assertEquals($parsedAdditionalAttributes, $result['additional_attributes']);
     }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testPrepareDataWithDifferentStoreValues(): void
+    {
+        $storeCode = 'default';
+        $expectedNames = [
+            'name' => 'Bundle Product Items',
+            'name_' . $storeCode => 'Bundle Product Items_' . $storeCode,
+        ];
+        $parsedAdditionalAttributes = 'text_attribute=!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'
+            . ',text_attribute2=,';
+        $allAdditionalAttributes = $parsedAdditionalAttributes . ',weight_type=0,price_type=1';
+        $collection = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+        $store->load($storeCode, 'code');
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('bundle-product', 1, $store->getId());
+
+        $extension = $product->getExtensionAttributes();
+        $options = $extension->getBundleProductOptions();
+
+        foreach ($options as $productOption) {
+            $productOption->setTitle($productOption->getTitle() . '_' . $store->getCode());
+        }
+        $extension->setBundleProductOptions($options);
+        $product->setExtensionAttributes($extension);
+        $productRepository->save($product);
+        $this->model->prepareData($collection, [$product->getId()]);
+        $result = $this->model->addData(['additional_attributes' => $allAdditionalAttributes], $product->getId());
+        $bundleValues = array_map(
+            function ($input) {
+                $data = explode('=', $input);
+
+                return [$data[0] => $data[1]];
+            },
+            explode(',', $result['bundle_values'])
+        );
+        $actualNames = [
+            'name' => array_column($bundleValues, 'name')[0],
+            'name' . '_' . $store->getCode() => array_column($bundleValues, 'name' . '_' . $store->getCode())[0],
+        ];
+
+        self::assertSame($expectedNames, $actualNames);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
index 19923daf81c88..e65d518af3419 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
-use Magento\Framework\App\Bootstrap;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\ImportExport\Model\Import;
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class BundleTest extends \PHPUnit\Framework\TestCase
+class BundleTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * Bundle product test Name
@@ -41,9 +41,22 @@ class BundleTest extends \PHPUnit\Framework\TestCase
      */
     protected $optionSkuList = ['Simple 1', 'Simple 2', 'Simple 3'];
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->model = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class);
     }
 
@@ -104,7 +117,88 @@ public function testBundleImport()
                 $optionSku = 'Simple ' . ($optionKey + 1 + $linkKey);
                 $this->assertEquals($optionIdList[$optionSku], $productLink->getData('entity_id'));
                 $this->assertEquals($optionSku, $productLink->getData('sku'));
+
+                switch ($optionKey + 1 + $linkKey) {
+                    case 1:
+                        $this->assertEquals(1, (int) $productLink->getCanChangeQuantity());
+                        break;
+                    case 2:
+                        $this->assertEquals(0, (int) $productLink->getCanChangeQuantity());
+                        break;
+                    case 3:
+                        $this->assertEquals(1, (int) $productLink->getCanChangeQuantity());
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testBundleImportWithMultipleStoreViews(): void
+    {
+        // import data from CSV file
+        $pathToFile = __DIR__ . '/../../_files/import_bundle_multiple_store_views.csv';
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => $pathToFile,
+                'directory' => $directory,
+            ]
+        );
+        $errors = $this->model->setSource($source)
+            ->setParameters(
+                [
+                    'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                    'entity' => 'catalog_product',
+                ]
+            )->validateData();
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->model->importData();
+        $resource = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $productId = $resource->getIdBySku(self::TEST_PRODUCT_NAME);
+        $this->assertTrue(is_numeric($productId));
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        $product->load($productId);
+        $this->assertFalse($product->isObjectNew());
+        $this->assertEquals(self::TEST_PRODUCT_NAME, $product->getName());
+        $this->assertEquals(self::TEST_PRODUCT_TYPE, $product->getTypeId());
+        $this->assertEquals(1, $product->getShipmentType());
+        $optionIdList = $resource->getProductsIdsBySkus($this->optionSkuList);
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $i = 0;
+        foreach ($product->getStoreIds() as $storeId) {
+            $bundleOptionCollection = $productRepository->get(self::TEST_PRODUCT_NAME, false, $storeId)
+                ->getExtensionAttributes()->getBundleProductOptions();
+            $this->assertCount(2, $bundleOptionCollection);
+            $i++;
+            foreach ($bundleOptionCollection as $optionKey => $option) {
+                $this->assertEquals('checkbox', $option->getData('type'));
+                $this->assertEquals('Option ' . $i . ' ' . ($optionKey + 1), $option->getData('title'));
+                $this->assertEquals(self::TEST_PRODUCT_NAME, $option->getData('sku'));
+                $this->assertEquals($optionKey + 1, count($option->getData('product_links')));
+                foreach ($option->getData('product_links') as $linkKey => $productLink) {
+                    $optionSku = 'Simple ' . ($optionKey + 1 + $linkKey);
+                    $this->assertEquals($optionIdList[$optionSku], $productLink->getData('entity_id'));
+                    $this->assertEquals($optionSku, $productLink->getData('sku'));
+                }
             }
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
index 43e3d04c62e61..fdb3f39327a06 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
@@ -2,4 +2,4 @@ sku,store_view_code,attribute_set_code,product_type,product_websites,name,produc
 Simple 1,,Default,simple,base,Simple 1,1,100,,1000,0,1,,,,,
 Simple 2,,Default,simple,base,Simple 2,1,200,,1000,0,1,,,,,
 Simple 3,,Default,simple,base,Simple 3,1,300,,1000,0,1,,,,,
-Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
+Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=1|name=Option 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=0|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle_multiple_store_views.csv b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle_multiple_store_views.csv
new file mode 100644
index 0000000000000..8bedb4ff68167
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle_multiple_store_views.csv
@@ -0,0 +1,5 @@
+sku,store_view_code,attribute_set_code,product_type,product_websites,name,product_online,price,additional_attributes,qty,out_of_stock_qty,website_id,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values
+Simple 1,,Default,simple,base,Simple 1,1,100,,1000,0,1,,,,,
+Simple 2,,Default,simple,base,Simple 2,1,200,,1000,0,1,,,,,
+Simple 3,,Default,simple,base,Simple 3,1,300,,1000,0,1,,,,,
+Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,name_default=Option 1 1,name_fixture_second_store=Option 2 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,name_default=Option 1 2,name_fixture_second_store=Option 2 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php
index 32fab1f456b3e..d15f2deebf990 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php
@@ -7,6 +7,11 @@
 
 use Magento\Framework\Message\MessageInterface;
 
+/**
+ * Test captcha observer behavior.
+ *
+ * @magentoAppArea adminhtml
+ */
 class CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest.php
new file mode 100644
index 0000000000000..8355d81fdf5d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Captcha\Observer;
+
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test captcha observer behavior
+ *
+ * @magentoAppArea frontend
+ */
+class CaseCheckOnFrontendUnsuccessfulMessageWhenCaptchaFailedTest extends AbstractController
+{
+    /**
+     * Test incorrect captcha on customer login page
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/forms user_login
+     * @magentoConfigFixture default_store customer/captcha/mode always
+     */
+    public function testLoginCheckUnsuccessfulMessageWhenCaptchaFailed()
+    {
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'login' => [
+                'username' => 'dummy@dummy.com',
+                'password' => 'dummy_password1',
+            ],
+            'captcha' => ['user_login' => 'wrong_captcha'],
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->prepareRequestData($post);
+
+        $this->dispatch('customer/account/loginPost');
+
+        $this->assertRedirect($this->stringContains('customer/account/login'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Incorrect CAPTCHA']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Test incorrect captcha on customer forgot password page
+     *
+     * @codingStandardsIgnoreStart
+     * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/forms user_forgotpassword
+     * @magentoConfigFixture default_store customer/captcha/mode always
+     */
+    public function testForgotPasswordCheckUnsuccessfulMessageWhenCaptchaFailed()
+    {
+        $post = ['email' => 'dummy@dummy.com'];
+        $this->prepareRequestData($post);
+
+        $this->dispatch('customer/account/forgotPasswordPost');
+
+        $this->assertRedirect($this->stringContains('customer/account/forgotpassword'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Incorrect CAPTCHA']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Test incorrect captcha on customer create account page
+     *
+     * @codingStandardsIgnoreStart
+     * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/forms user_create
+     * @magentoConfigFixture default_store customer/captcha/mode always
+     */
+    public function testCreateAccountCheckUnsuccessfulMessageWhenCaptchaFailed()
+    {
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'firstname' => 'Firstname',
+            'lastname' => 'Lastname',
+            'email' => 'dummy@dummy.com',
+            'password' => 'TestPassword123',
+            'password_confirmation' => 'TestPassword123',
+            'captcha' => ['user_create' => 'wrong_captcha'],
+            'form_key' => $formKey->getFormKey(),
+        ];
+        $this->prepareRequestData($post);
+
+        $this->dispatch('customer/account/createPost');
+
+        $this->assertRedirect($this->stringContains('customer/account/create'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Incorrect CAPTCHA']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * @param array $postData
+     * @return void
+     */
+    private function prepareRequestData($postData)
+    {
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($postData);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForBackendObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForBackendObserverTest.php
new file mode 100644
index 0000000000000..c0a720229a00d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForBackendObserverTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Captcha\Observer;
+
+use Magento\Captcha\Model\ResourceModel\Log as CaptchaLog;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\User\Model\User;
+use Magento\User\Model\UserFactory;
+
+/**
+ * Class ResetAttemptForBackendObserverTest
+ *
+ * Test for checking that the admin login attempts are removed after a successful login
+ */
+class ResetAttemptForBackendObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Captcha/_files/failed_logins_backend.php
+     */
+    public function testLoginAttemptsRemovedAfterSuccessfulLogin()
+    {
+        $login = 'mageadmin';
+        $userFactory = $this->objectManager->get(UserFactory::class);
+        $captchaLogFactory = $this->objectManager->get(LogFactory::class);
+        $eventManager = $this->objectManager->get(ManagerInterface::class);
+
+        /** @var User $user */
+        $user = $userFactory->create();
+        $user->setUserName($login);
+
+        $eventManager->dispatch(
+            'backend_auth_user_login_success',
+            ['user' => $user]
+        );
+
+        /**
+         * @var CaptchaLog $captchaLog
+         */
+        $captchaLog = $captchaLogFactory->create();
+
+        self::assertEquals(0, $captchaLog->countAttemptsByUserLogin($login));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendAccountEditObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendAccountEditObserverTest.php
new file mode 100644
index 0000000000000..c09211b020b30
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendAccountEditObserverTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Captcha\Observer;
+
+use Magento\Captcha\Model\ResourceModel\Log as CaptchaLog;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Class ResetAttemptForFrontendAccountEditObserverTest
+ *
+ * Test for checking that the customer login attempts are removed after account details edit
+ */
+class ResetAttemptForFrontendAccountEditObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php
+     */
+    public function testAccountEditRemovesFailedAttempts()
+    {
+        $customerEmail = 'mageuser@dummy.com';
+        $captchaLogFactory = $this->objectManager->get(LogFactory::class);
+        $eventManager = $this->objectManager->get(ManagerInterface::class);
+
+        $eventManager->dispatch(
+            'customer_account_edited',
+            ['email' => $customerEmail]
+        );
+
+        /**
+         * @var CaptchaLog $captchaLog
+         */
+        $captchaLog = $captchaLogFactory->create();
+
+        self::assertEquals(0, $captchaLog->countAttemptsByUserLogin($customerEmail));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
new file mode 100644
index 0000000000000..f8dd80595f936
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Captcha\Observer;
+
+use Magento\Captcha\Model\ResourceModel\Log as CaptchaLog;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Class ResetAttemptForFrontendObserverTest
+ *
+ * Test for checking that the customer login attempts are removed after a successful login
+ */
+class ResetAttemptForFrontendObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php
+     */
+    public function testSuccesfulLoginRemovesFailedAttempts()
+    {
+        $customerEmail = 'mageuser@dummy.com';
+        $customerFactory = $this->objectManager->get(CustomerFactory::class);
+        $captchaLogFactory = $this->objectManager->get(LogFactory::class);
+        $eventManager = $this->objectManager->get(ManagerInterface::class);
+
+        /** @var Customer $customer */
+        $customer = $customerFactory->create();
+        $customer->setEmail($customerEmail);
+
+        $eventManager->dispatch(
+            'customer_customer_authenticated',
+            ['model' => $customer, 'password' => 'some_password']
+        );
+
+        /**
+         * @var CaptchaLog $captchaLog
+         */
+        $captchaLog = $captchaLogFactory->create();
+
+        self::assertEquals(0, $captchaLog->countAttemptsByUserLogin($customerEmail));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend.php
new file mode 100644
index 0000000000000..7130cdfca57d7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Captcha\Model\ResourceModel\Log;
+
+$objectManager = Bootstrap::getObjectManager();
+$logFactory = $objectManager->get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->logAttempt('mageadmin');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend_rollback.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend_rollback.php
new file mode 100644
index 0000000000000..12a16027e1e5c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_backend_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Captcha\Model\ResourceModel\Log;
+
+$objectManager = Bootstrap::getObjectManager();
+$logFactory = $objectManager->get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->deleteUserAttempts('mageadmin');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend.php
new file mode 100644
index 0000000000000..4e0db30fa82c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Captcha\Model\ResourceModel\Log;
+
+$objectManager = Bootstrap::getObjectManager();
+$logFactory = $objectManager->get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->logAttempt('mageuser@dummy.com');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend_rollback.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend_rollback.php
new file mode 100644
index 0000000000000..a01edb6d0a219
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/failed_logins_frontend_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Captcha\Model\ResourceModel\Log;
+
+$objectManager = Bootstrap::getObjectManager();
+$logFactory = $objectManager->get(LogFactory::class);
+
+/** @var Log $captchaLog */
+$captchaLog = $logFactory->create();
+$captchaLog->deleteUserAttempts('mageuser@dummy.com');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/JsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/JsTest.php
index 79989c24ea96d..f2043b3c5fff1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/JsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/JsTest.php
@@ -29,23 +29,18 @@ public function testGetAllRatesByProductClassJson()
         /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
         $block = $objectManager->create(\Magento\Catalog\Block\Adminhtml\Product\Edit\Js::class);
         $jsonResult = $block->getAllRatesByProductClassJson();
-        $decodedResult = json_decode($jsonResult);
-        $this->assertNotEmpty($decodedResult, 'Resulting JSON is invalid.');
-        $taxClassesArray = (array)$decodedResult;
+        $this->assertJson($jsonResult, 'Resulting JSON is invalid.');
+        $decodedResult = json_decode($jsonResult, true);
+        $this->assertNotNull($decodedResult, 'Cannot decode resulting JSON.');
         $noneTaxClass = 0;
         $defaultProductTaxClass = 2;
         $expectedProductTaxClasses = array_unique(
             array_merge($fixtureTaxRule->getProductTaxClasses(), [$defaultProductTaxClass, $noneTaxClass])
         );
-        $this->assertCount(
-            count($expectedProductTaxClasses),
-            $taxClassesArray,
-            'Invalid quantity of rates for tax classes.'
-        );
         foreach ($expectedProductTaxClasses as $taxClassId) {
             $this->assertArrayHasKey(
                 "value_{$taxClassId}",
-                $taxClassesArray,
+                $decodedResult,
                 "Rates for tax class with ID '{$taxClassId}' is missing."
             );
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index bdc135f2b4897..800d41f3c786f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -3,25 +3,140 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoAppArea adminhtml
  */
 class ContentTest extends \PHPUnit\Framework\TestCase
 {
-    public function testGetUploader()
+    /**
+     * Test subject.
+     *
+     * @var Content
+     */
+    private $block;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @var DataPersistorInterface
+     */
+    private $dataPersistor;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
     {
-        /** @var $layout \Magento\Framework\View\Layout */
+        $gallery = Bootstrap::getObjectManager()->get(Gallery::class);
         $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\LayoutInterface::class
         );
-        /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
-        $block = $layout->createBlock(
-            \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content::class,
+        $this->block = $layout->createBlock(
+            Content::class,
             'block'
         );
+        $this->block->setElement($gallery);
+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
+        $this->dataPersistor = Bootstrap::getObjectManager()->get(DataPersistorInterface::class);
+    }
+
+    public function testGetUploader()
+    {
+        $this->assertInstanceOf(\Magento\Backend\Block\Media\Uploader::class, $this->block->getUploader());
+    }
 
-        $this->assertInstanceOf(\Magento\Backend\Block\Media\Uploader::class, $block->getUploader());
+    /**
+     * Test get images json using registry or data persistor.
+     *
+     * @dataProvider getImagesAndImageTypesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoAppIsolation enabled
+     * @param bool $isProductNew
+     * @return void
+     */
+    public function testGetImagesJson(bool $isProductNew)
+    {
+        $this->prepareProduct($isProductNew);
+        $imagesJson = $this->block->getImagesJson();
+        $images = json_decode($imagesJson);
+        $image = array_shift($images);
+        $this->assertRegExp('/\/m\/a\/magento_image/', $image->file);
+        $this->assertSame('image', $image->media_type);
+        $this->assertSame('Image Alt Text', $image->label);
+        $this->assertSame('Image Alt Text', $image->label_default);
+        $this->assertRegExp('/\/pub\/media\/catalog\/product\/m\/a\/magento_image/', $image->url);
+    }
+
+    /**
+     * Test get image types json using registry or data persistor.
+     *
+     * @dataProvider getImagesAndImageTypesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoAppIsolation enabled
+     * @param bool $isProductNew
+     * @return void
+     */
+    public function testGetImageTypes(bool $isProductNew)
+    {
+        $this->prepareProduct($isProductNew);
+        $imageTypes = $this->block->getImageTypes();
+        foreach ($imageTypes as $type => $image) {
+            $this->assertSame($type, $image['code']);
+            $type !== 'swatch_image'
+                ? $this->assertRegExp('/\/m\/a\/magento_image/', $image['value'])
+                : $this->assertNull($image['value']);
+            $this->assertSame('[STORE VIEW]', $image['scope']->getText());
+            $this->assertSame(sprintf('product[%s]', $type), $image['name']);
+        }
+    }
+
+    /**
+     * Provide test data for testGetImagesJson() and tesGetImageTypes().
+     *
+     * @return array
+     */
+    public function getImagesAndImageTypesDataProvider()
+    {
+        return [
+            [
+                'isProductNew' => true,
+            ],
+            [
+                'isProductNew' => false,
+            ],
+        ];
+    }
+
+    /**
+     * Prepare product, and set it to registry and data persistor.
+     *
+     * @param bool $isProductNew
+     * @return void
+     */
+    private function prepareProduct(bool $isProductNew)
+    {
+        $product = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class)->get('simple');
+        if ($isProductNew) {
+            $newProduct = Bootstrap::getObjectManager()->create(Product::class);
+            $this->registry->register('current_product', $newProduct);
+            $productData['product'] = $product->getData();
+            $dataPersistor = Bootstrap::getObjectManager()->get(DataPersistorInterface::class);
+            $dataPersistor->set('catalog_product', $productData);
+        } else {
+            $this->registry->register('current_product', $product);
+        }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
index 17c0f451f9083..6c735e52f8c1a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
@@ -10,6 +10,7 @@
  *
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
  * @magentoAppArea frontend
+ * @magentoDbIsolation disabled
  */
 class ListTest extends \PHPUnit\Framework\TestCase
 {
@@ -55,6 +56,10 @@ public function testToolbarCoverage()
         $parent = $this->_getLayout()->createBlock(\Magento\Catalog\Block\Product\ListProduct::class, 'parent');
 
         /* Prepare toolbar block */
+        $this->_getLayout()
+            ->createBlock(\Magento\Catalog\Block\Product\ProductList\Toolbar::class, 'product_list_toolbar');
+        $parent->setToolbarBlockName('product_list_toolbar');
+
         $toolbar = $parent->getToolbarBlock();
         $this->assertInstanceOf(\Magento\Catalog\Block\Product\ProductList\Toolbar::class, $toolbar, 'Default Toolbar');
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
index 12ce790f17eb6..6d5e2c9767ede 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
@@ -9,6 +9,7 @@
  * Test class for \Magento\Catalog\Block\Product\New.
  *
  * @magentoDataFixture Magento/Catalog/_files/products_new.php
+ * @magentoDbIsolation disabled
  */
 class NewTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
index 329e880c7a52e..9f0f04508e468 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
@@ -9,6 +9,7 @@
  * Test class for \Magento\Catalog\Block\Product\List\Related.
  *
  * @magentoDataFixture Magento/Catalog/_files/products_related.php
+ * @magentoDbIsolation disabled
  */
 class RelatedTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php
index 8099f59b5527a..57ccb48b8df69 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php
@@ -9,6 +9,7 @@
  * Test class for \Magento\Catalog\Block\Product\List\Upsell.
  *
  * @magentoDataFixture Magento/Catalog/_files/products_upsell.php
+ * @magentoDbIsolation disabled
  */
 class UpsellTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ViewTest.php
index f2534ea7156ed..01398213b854a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ViewTest.php
@@ -41,15 +41,10 @@ public function testSetLayout()
 
         /** @var $layout \Magento\Framework\View\Layout */
         $layout = $objectManager->get(\Magento\Framework\View\LayoutInterface::class);
-        /** @var $pageConfig \Magento\Framework\View\Page\Config */
-        $pageConfig = $objectManager->get(\Magento\Framework\View\Page\Config::class);
 
-        $layout->createBlock(\Magento\Catalog\Block\Product\View::class);
+        $productView = $layout->createBlock(\Magento\Catalog\Block\Product\View::class);
 
-        $this->assertNotEmpty($pageConfig->getTitle()->get());
-        $this->assertEquals($this->_product->getMetaTitle(), $pageConfig->getTitle()->get());
-        $this->assertEquals($this->_product->getMetaKeyword(), $pageConfig->getKeywords());
-        $this->assertEquals($this->_product->getMetaDescription(), $pageConfig->getDescription());
+        $this->assertInstanceOf(\Magento\Framework\View\LayoutInterface::class, $productView->getLayout());
     }
 
     public function testGetProduct()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php
index 038eee6f5e941..4b6a2a40aa129 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Console/Command/ProductAttributesCleanUpTest.php
@@ -50,6 +50,7 @@ public function setUp()
      * @magentoDataFixture Magento/Store/_files/website.php
      * @magentoDataFixture Magento/Store/_files/fixture_store_with_catalogsearch_index.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testExecute()
     {
@@ -106,8 +107,6 @@ private function prepareAdditionalStore()
             ->setGroupId($storeGroup->getId())
             ->save();
 
-        /* Refresh stores memory cache */
-        $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
         return $store;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
index fd7e23e507c5f..1001d58ee8a67 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -5,11 +5,36 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Product;
+
 /**
  * @magentoAppArea adminhtml
  */
 class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product
+     */
+    protected $productResource;
+
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        /** @var Product $productResource */
+        $this->productResource = Bootstrap::getObjectManager()->get(
+            Product::class
+        );
+    }
+
     /**
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDbIsolation enabled
@@ -27,6 +52,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
         $store->load('fixturestore', 'code');
         $storeId = $store->getId();
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->getRequest()->setParam('store', $storeId);
         $this->getRequest()->setParam('id', 2);
@@ -75,6 +101,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
      */
     public function testSaveActionFromProductCreationPage($postData)
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
 
         $this->dispatch('backend/catalog/category/save');
@@ -123,6 +150,9 @@ public static function categoryCreatedFromProductCreationPageDataProvider()
         return [[$postData], [$postData + ['return_session_messages_only' => 1]]];
     }
 
+    /**
+     * Test SuggestCategories finds any categories.
+     */
     public function testSuggestCategoriesActionDefaultCategoryFound()
     {
         $this->getRequest()->setParam('label_part', 'Default');
@@ -133,6 +163,9 @@ public function testSuggestCategoriesActionDefaultCategoryFound()
         );
     }
 
+    /**
+     * Test SuggestCategories properly processes search by label.
+     */
     public function testSuggestCategoriesActionNoSuggestions()
     {
         $this->getRequest()->setParam('label_part', strrev('Default'));
@@ -322,8 +355,12 @@ public function saveActionDataProvider()
         ];
     }
 
+    /**
+     * Test validation.
+     */
     public function testSaveActionCategoryWithDangerRequest()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'general' => [
@@ -339,7 +376,7 @@ public function testSaveActionCategoryWithDangerRequest()
         );
         $this->dispatch('backend/catalog/category/save');
         $this->assertSessionMessages(
-            $this->equalTo(['The value of attribute "name" must be set']),
+            $this->equalTo(['The "Name" attribute value is empty. Set the attribute and try again.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
@@ -374,7 +411,8 @@ public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId,
         }
         $this->getRequest()
             ->setPostValue('id', $grandChildId)
-            ->setPostValue('pid', $parentId);
+            ->setPostValue('pid', $parentId)
+            ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/category/move');
         $jsonResponse = json_decode($this->getResponse()->getBody());
         $this->assertNotNull($jsonResponse);
@@ -388,9 +426,133 @@ public function moveActionDataProvider()
     {
         return [
             [400, 401, 'first_url_key', 402, 'second_url_key', false],
-            [400, 401, 'duplicated_url_key', 402, 'duplicated_url_key', true],
+            [400, 401, 'duplicated_url_key', 402, 'duplicated_url_key', false],
             [0, 401, 'first_url_key', 402, 'second_url_key', true],
             [400, 401, 'first_url_key', 0, 'second_url_key', true],
         ];
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_in_different_stores.php
+     * @magentoDbIsolation disabled
+     * @dataProvider saveActionWithDifferentWebsitesDataProvider
+     *
+     * @param array $postData
+     */
+    public function testSaveCategoryWithProductPosition(array $postData)
+    {
+        /** @var $store \Magento\Store\Model\Store */
+        $store = Bootstrap::getObjectManager()->create(Store::class);
+        $store->load('fixturestore', 'code');
+        $storeId = $store->getId();
+        $oldCategoryProductsCount = $this->getCategoryProductsCount();
+        $this->getRequest()->setParam('store', $storeId);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setParam('id', 96377);
+        $this->getRequest()->setPostValue($postData);
+        $this->dispatch('backend/catalog/category/save');
+        $newCategoryProductsCount = $this->getCategoryProductsCount();
+        $this->assertEquals(
+            $oldCategoryProductsCount,
+            $newCategoryProductsCount,
+            'After changing product position number of records from catalog_category_product has changed'
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
+    public function saveActionWithDifferentWebsitesDataProvider()
+    {
+        return [
+            'default_values' => [
+                [
+                    'store_id' => '1',
+                    'entity_id' => '96377',
+                    'attribute_set_id' => '4',
+                    'parent_id' => '2',
+                    'created_at' => '2018-11-29 08:28:37',
+                    'updated_at' => '2018-11-29 08:57:43',
+                    'path' => '1/2/96377',
+                    'level' => '2',
+                    'children_count' => '0',
+                    'row_id' => '96377',
+                    'name' => 'Category 1',
+                    'display_mode' => 'PRODUCTS',
+                    'url_key' => 'category-1',
+                    'url_path' => 'category-1',
+                    'automatic_sorting' => '0',
+                    'is_active' => '1',
+                    'is_anchor' => '1',
+                    'include_in_menu' => '1',
+                    'custom_use_parent_settings' => '0',
+                    'custom_apply_to_products' => '0',
+                    'path_ids' => [
+                        0 => '1',
+                        1 => '2',
+                        2 => '96377'
+                    ],
+                    'use_config' => [
+                        'available_sort_by' => 'true',
+                        'default_sort_by' => 'true',
+                        'filter_price_range' => 'true'
+                    ],
+                    'id' => '',
+                    'parent' => '0',
+                    'use_default' => [
+                        'name' => '1',
+                        'url_key' => '1',
+                        'meta_title' => '1',
+                        'is_active' => '1',
+                        'include_in_menu' => '1',
+                        'custom_use_parent_settings' => '1',
+                        'custom_apply_to_products' => '1',
+                        'description' => '1',
+                        'landing_page' => '1',
+                        'display_mode' => '1',
+                        'custom_design' => '1',
+                        'page_layout' => '1',
+                        'meta_keywords' => '1',
+                        'meta_description' => '1',
+                        'custom_layout_update' => '1',
+                        'image' => '1'
+                    ],
+                    'filter_price_range' => false,
+                    'meta_title' => false,
+                    'url_key_create_redirect' => 'category-1',
+                    'description' => false,
+                    'landing_page' => false,
+                    'default_sort_by' => 'position',
+                    'available_sort_by' => false,
+                    'custom_design' => false,
+                    'page_layout' => false,
+                    'meta_keywords' => false,
+                    'meta_description' => false,
+                    'custom_layout_update' => false,
+                    'position_cache_key' => '5c069248346ac',
+                    'is_smart_category' => '0',
+                    'smart_category_rules' => false,
+                    'sort_order' => '0',
+                    'vm_category_products' => '{"1":1,"3":0}'
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Get items count from catalog_category_product
+     *
+     * @return int
+     */
+    private function getCategoryProductsCount(): int
+    {
+        $oldCategoryProducts = $this->productResource->getConnection()->select()->from(
+            $this->productResource->getTable('catalog_category_product'),
+            'product_id'
+        );
+        return count(
+            $this->productResource->getConnection()->fetchAll($oldCategoryProducts)
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index 3e9e39425fb84..a2967878402d0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -14,6 +16,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::execute
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveActionRedirectsSuccessfully()
     {
@@ -22,6 +25,7 @@ public function testSaveActionRedirectsSuccessfully()
         /** @var $session \Magento\Backend\Model\Session */
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
         $session->setProductIds([1]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
 
@@ -51,6 +55,7 @@ public function testSaveActionRedirectsSuccessfully()
      * @dataProvider saveActionVisibilityAttrDataProvider
      * @param array $attributes
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveActionChangeVisibility($attributes)
     {
@@ -67,6 +72,7 @@ public function testSaveActionChangeVisibility($attributes)
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
         $session->setProductIds([$product->getId()]);
         $this->getRequest()->setParam('attributes', $attributes);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
         /** @var \Magento\Catalog\Model\Category $category */
@@ -87,12 +93,15 @@ public function testSaveActionChangeVisibility($attributes)
     }
 
     /**
+     * @param array $attributes Request parameter.
+     *
      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate::execute
      *
      * @dataProvider validateActionDataProvider
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoDbIsolation disabled
      */
     public function testValidateActionWithMassUpdate($attributes)
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index 6e93f61c1eb3a..fe08ec01a9715 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -5,9 +5,14 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -16,10 +21,14 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
      */
     public function testWrongFrontendInput()
     {
-        $postData = $this->_getAttributeData() + [
+        $postData = array_merge(
+            $this->_getAttributeData(),
+            [
                 'attribute_id' => 100500,
                 'frontend_input' => 'some_input',
-            ];
+            ]
+        );
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -45,6 +54,7 @@ public function testWithPopup()
             'popup' => 'true',
             'new_attribute_set_name' => 'new_attribute_set',
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -66,6 +76,7 @@ public function testWithExceptionWhenSaveAttribute()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => 0, 'frontend_input' => 'boolean'];
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         $this->assertContains(
@@ -84,6 +95,7 @@ public function testWrongAttributeId()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => 100500];
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         $this->assertContains(
@@ -108,6 +120,7 @@ public function testAttributeWithoutId()
                 'set' => 4,
                 'frontend_input' => 'boolean',
             ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -130,6 +143,7 @@ public function testWrongAttributeCode()
     {
         $postData = $this->_getAttributeData() + ['attribute_code' => '_()&&&?'];
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         $this->assertContains(
@@ -142,7 +156,7 @@ public function testWrongAttributeCode()
         /** @var \Magento\Framework\Message\Error $message */
         $message = $messages->getItemsByType('error')[0];
         $this->assertEquals(
-            'Attribute code "_()&&&?" is invalid. Please use only letters (a-z),'
+            'Attribute code "_()&&&?" is invalid. Please use only letters (a-z or A-Z),'
             . ' numbers (0-9) or underscore(_) in this field, first character should be a letter.',
             $message->getText()
         );
@@ -154,6 +168,7 @@ public function testWrongAttributeCode()
     public function testAttributeWithoutEntityTypeId()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '2', 'new_attribute_set_name' => ' '];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -169,6 +184,7 @@ public function testAttributeWithoutEntityTypeId()
     public function testSaveActionApplyToDataSystemAttribute()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '2'];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
@@ -182,6 +198,7 @@ public function testSaveActionApplyToDataSystemAttribute()
     public function testSaveActionApplyToDataUserDefinedAttribute()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '1'];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
@@ -197,6 +214,7 @@ public function testSaveActionApplyToData()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '3'];
         unset($postData['apply_to']);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
@@ -216,11 +234,118 @@ public function testSaveActionCleanAttributeLabelCache()
         $this->assertEquals('predefined string translation', $this->_translate('string to translate'));
         $string->saveTranslate('string to translate', 'new string translation');
         $postData = $this->_getAttributeData() + ['attribute_id' => 1];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals('new string translation', $this->_translate('string to translate'));
     }
 
+    /**
+     * Get attribute data preset.
+     *
+     * @return array
+     */
+    private function getLargeOptionsSetAttributeData()
+    {
+        return [
+            'frontend_label' => [
+                0 => 'testdrop1',
+                1 => '',
+                2 => '',
+            ],
+            'frontend_input' => 'select',
+            'is_required' => '0',
+            'update_product_preview_image' => '0',
+            'use_product_image_for_swatch' => '0',
+            'visual_swatch_validation' => '',
+            'visual_swatch_validation_unique' => '',
+            'text_swatch_validation' => '',
+            'text_swatch_validation_unique' => '',
+            'attribute_code' => 'test_many_options',
+            'is_global' => '0',
+            'default_value_text' => '',
+            'default_value_yesno' => '0',
+            'default_value_date' => '',
+            'default_value_textarea' => '',
+            'is_unique' => '0',
+            'is_used_in_grid' => '1',
+            'is_visible_in_grid' => '1',
+            'is_filterable_in_grid' => '1',
+            'is_searchable' => '0',
+            'is_comparable' => '0',
+            'is_filterable' => '0',
+            'is_filterable_in_search' => '0',
+            'is_used_for_promo_rules' => '0',
+            'is_html_allowed_on_front' => '1',
+            'is_visible_on_front' => '0',
+            'used_in_product_listing' => '0',
+            'used_for_sort_by' => '0',
+            'swatch_input_type' => 'dropdown',
+        ];
+    }
+
+    /**
+     * Test attribute saving with large amount of options exceeding maximum allowed by max_input_vars limit.
+     * @return void
+     */
+    public function testLargeOptionsDataSet()
+    {
+        $maxInputVars = ini_get('max_input_vars');
+        // Each option is at least 4 variables array (order, admin value, first store view value, delete flag).
+        // Set options count to exceed max_input_vars by 100 options (400 variables).
+        $optionsCount = floor($maxInputVars / 4) + 100;
+        $attributeData = $this->getLargeOptionsSetAttributeData();
+        $optionsData = [];
+        $expectedOptionsLabels = [];
+        for ($i = 0; $i < $optionsCount; $i++) {
+            $expectedOptionLabelOnStoreView = 'value_' . $i . '_store_1';
+            $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
+            $optionId = 'option_' . $i;
+            $optionRowData = [];
+            $optionRowData['option']['order'][$optionId] = $i + 1;
+            $optionRowData['option']['value'][$optionId][0] = 'value_' . $i . '_admin';
+            $optionRowData['option']['value'][$optionId][1] = $expectedOptionLabelOnStoreView;
+            $optionRowData['option']['delete'][$optionId] = '';
+            $optionsData[] = http_build_query($optionRowData);
+        }
+        $attributeData['serialized_options'] = json_encode($optionsData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($attributeData);
+        $this->dispatch('backend/catalog/product_attribute/save');
+        $entityTypeId = $this->_objectManager->create(
+            \Magento\Eav\Model\Entity::class
+        )->setType(
+            \Magento\Catalog\Model\Product::ENTITY
+        )->getTypeId();
+
+        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        $attribute = $this->_objectManager->create(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        )->setEntityTypeId(
+            $entityTypeId
+        );
+        try {
+            $attribute->loadByCode($entityTypeId, 'test_many_options');
+            $options = $attribute->getOptions();
+            // assert that all options are saved without truncation
+            $this->assertEquals(
+                $optionsCount + 1,
+                count($options),
+                'Expected options count does not match (regarding first empty option for non-required attribute)'
+            );
+
+            foreach ($expectedOptionsLabels as $optionOrderNum => $label) {
+                $this->assertEquals(
+                    $label,
+                    $options[$optionOrderNum]->getLabel(),
+                    "Label for option #{$optionOrderNum} does not match expected."
+                );
+            }
+        } catch (LocalizedException $e) {
+            $this->fail('Test failed with exception on attribute model load: ' . $e);
+        }
+    }
+
     /**
      * Return translation for a string literal belonging to backend area
      *
@@ -256,6 +381,7 @@ protected function _getAttributeData()
             'default_value_textarea' => '0',
             'is_required' => '1',
             'frontend_class' => '',
+            'frontend_input' => 'select',
             'is_searchable' => '0',
             'is_visible_in_advanced_search' => '0',
             'is_comparable' => '0',
@@ -267,7 +393,7 @@ protected function _getAttributeData()
             'used_in_product_listing' => '1',
             'used_for_sort_by' => '0',
             'apply_to' => ['simple'],
-            'frontend_label' => [\Magento\Store\Model\Store::DEFAULT_STORE_ID => 'string to translate']
+            'frontend_label' => [\Magento\Store\Model\Store::DEFAULT_STORE_ID => 'string to translate'],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/GetSelectedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/GetSelectedTest.php
new file mode 100644
index 0000000000000..ec3074cafc0f6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/GetSelectedTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class GetSelectedTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testExecute() : void
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+        $product = $productRepository->get('simple');
+        $this->getRequest()
+            ->setPostValue('productId', $product->getId());
+        $this->dispatch('backend/catalog/product/getSelected');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains(
+            '{"value":"1","label":"Simple Product","is_active":1,"path":"simple"}',
+            $responseBody
+        );
+    }
+
+    public function testExecuteNonExistingSearchKey() : void
+    {
+        $this->getRequest()
+            ->setPostValue('productId', '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+        $this->dispatch('backend/catalog/product/getSelected');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('[]', $responseBody);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php
new file mode 100644
index 0000000000000..8a33543e93439
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class SearchTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testExecute() : void
+    {
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains(
+            '"options":{"1":{"value":"1","label":"Simple Product","is_active":1,"path":"simple","optgroup":false}',
+            $responseBody
+        );
+    }
+
+    public function testExecuteNonExistingSearchKey() : void
+    {
+        $this->getRequest()
+            ->setPostValue('searchKey', '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('{"options":[],"total":0}', $responseBody);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testExecuteNotVisibleIndividuallyProducts() : void
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+        $product = $productRepository->get('simple-3');
+        $this->assertEquals('simple-3', $product->getSku());
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple-3')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('{"options":[],"total":0}', $responseBody);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
index 7c5d4ea48a238..7e034b8b3cb7e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -15,7 +16,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     public function testDeleteById()
     {
         $attributeSet = $this->getAttributeSetByName('empty_attribute_set');
-        $this->getRequest()->setParam('id', $attributeSet->getId());
+        $this->getRequest()->setParam('id', $attributeSet->getId())->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_set/delete/');
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
index 5b711b2ea7418..8ccd426424a29 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
@@ -9,6 +9,7 @@
 use Magento\Eav\Api\Data\AttributeSetInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -20,6 +21,7 @@ public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated()
         $attributeSet = $this->getAttributeSetByName('attribute_set_test');
         $this->assertNotEmpty($attributeSet, 'Attribute set with name "attribute_set_test" is missed');
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue('data', json_encode([
             'attribute_set_name' => 'attribute_set_test',
             'groups' => [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
index e1b5b9e0a2c8c..acec996d0c406 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
@@ -5,23 +5,35 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Message\Manager;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Message\MessageInterface;
+
 /**
  * @magentoAppArea adminhtml
  */
 class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * Test calling save with invalid product's ID.
+     */
     public function testSaveActionWithDangerRequest()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(['product' => ['entity_id' => 15]]);
         $this->dispatch('backend/catalog/product/save');
         $this->assertSessionMessages(
-            $this->equalTo(['Unable to save product']),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+            $this->equalTo(['The product was unable to be saved. Please try again.']),
+            MessageInterface::TYPE_ERROR
         );
         $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
     }
 
     /**
+     * Test saving existing product and specifying that we want redirect to new product form.
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testSaveActionAndNew()
@@ -29,15 +41,19 @@ public function testSaveActionAndNew()
         $this->getRequest()->setPostValue(['back' => 'new']);
         $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
         $product = $repository->get('simple');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/new/'));
         $this->assertSessionMessages(
             $this->contains('You saved the product.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+            MessageInterface::TYPE_SUCCESS
         );
     }
 
     /**
+     * Test saving existing product and specifying that
+     * we want redirect to new product form with saved product's data applied.
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testSaveActionAndDuplicate()
@@ -45,6 +61,7 @@ public function testSaveActionAndDuplicate()
         $this->getRequest()->setPostValue(['back' => 'duplicate']);
         $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
         $product = $repository->get('simple');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/'));
         $this->assertRedirect(
@@ -56,14 +73,17 @@ public function testSaveActionAndDuplicate()
         );
         $this->assertSessionMessages(
             $this->contains('You saved the product.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+            MessageInterface::TYPE_SUCCESS
         );
         $this->assertSessionMessages(
             $this->contains('You duplicated the product.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+            MessageInterface::TYPE_SUCCESS
         );
     }
 
+    /**
+     * Testing Add Product button showing.
+     */
     public function testIndexAction()
     {
         $this->dispatch('backend/catalog/product');
@@ -104,6 +124,8 @@ public function testIndexAction()
     }
 
     /**
+     * Testing existing product edit page.
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testEditAction()
@@ -140,4 +162,197 @@ public function testEditAction()
             '"Save & Duplicate" button isn\'t present on Edit Product page'
         );
     }
+
+    /**
+     * Test create product with already existing url key.
+     *
+     * @dataProvider saveActionWithAlreadyExistingUrlKeyDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_image.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
+     * @param array $postData
+     * @return void
+     */
+    public function testSaveActionWithAlreadyExistingUrlKey(array $postData)
+    {
+        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/catalog/product/save');
+        /** @var Manager $messageManager */
+        $messageManager = $this->_objectManager->get(Manager::class);
+        $messages = $messageManager->getMessages();
+        $errors = $messages->getItemsByType('error');
+        $this->assertNotEmpty($errors);
+        $message = array_shift($errors);
+        $this->assertSame('URL key for specified store already exists.', $message->getText());
+        $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
+        /** @var DataPersistorInterface $dataPersistor */
+        $dataPersistor = $this->_objectManager->get(DataPersistorInterface::class);
+        $productData = $dataPersistor->get('catalog_product')['product'];
+        $image = array_shift($productData['media_gallery']['images']);
+        $this->assertStringEndsNotWith('.tmp', $image['file']);
+        $this->assertStringEndsNotWith('.tmp', $productData['image']);
+        $this->assertStringEndsNotWith('.tmp', $productData['small_image']);
+        $this->assertStringEndsNotWith('.tmp', $productData['thumbnail']);
+        $this->assertStringEndsNotWith('.tmp', $productData['swatch_image']);
+    }
+
+    /**
+     * Provide test data for testSaveActionWithAlreadyExistingUrlKey().
+     *
+     * @return array
+     */
+    public function saveActionWithAlreadyExistingUrlKeyDataProvider()
+    {
+        return [
+            [
+                'post_data' => [
+                    'product' =>
+                        [
+                            'attribute_set_id' => '4',
+                            'status' => '1',
+                            'name' => 's2',
+                            'url_key' => 'simple-product',
+                            'quantity_and_stock_status' =>
+                                [
+                                    'qty' => '10',
+                                    'is_in_stock' => '1',
+                                ],
+                            'website_ids' =>
+                                [
+                                    1 => '1',
+                                ],
+                            'sku' => 's2',
+                            'price' => '3',
+                            'tax_class_id' => '2',
+                            'product_has_weight' => '0',
+                            'visibility' => '4',
+                            'media_gallery' =>
+                                [
+                                    'images' =>
+                                        [
+                                            'h17hftqohrd' =>
+                                                [
+                                                    'position' => '1',
+                                                    'media_type' => 'image',
+                                                    'video_provider' => '',
+                                                    'file' => '/m/a//magento_image.jpg.tmp',
+                                                    'value_id' => '',
+                                                    'label' => '',
+                                                    'disabled' => '0',
+                                                    'removed' => '',
+                                                    'role' => '',
+                                                ],
+                                        ],
+                                ],
+                            'image' => '/m/a//magento_image.jpg.tmp',
+                            'small_image' => '/m/a//magento_image.jpg.tmp',
+                            'thumbnail' => '/m/a//magento_image.jpg.tmp',
+                            'swatch_image' => '/m/a//magento_image.jpg.tmp',
+                        ],
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Test product save with selected tier price
+     *
+     * @dataProvider saveActionTierPriceDataProvider
+     * @param array $postData
+     * @param array $tierPrice
+     * @magentoDataFixture Magento/Catalog/_files/product_has_tier_price_show_as_low_as.php
+     * @magentoConfigFixture current_store catalog/price/scope 1
+     */
+    public function testSaveActionTierPrice(array $postData, array $tierPrice)
+    {
+        $postData['product'] = $this->getProductData($tierPrice);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($postData);
+        $this->dispatch('backend/catalog/product/save/id/' . $postData['id']);
+        $this->assertSessionMessages(
+            $this->contains('You saved the product.'),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Provide test data for testSaveActionWithAlreadyExistingUrlKey().
+     *
+     * @return array
+     */
+    public function saveActionTierPriceDataProvider()
+    {
+        return [
+            [
+                'post_data' => [
+                    'id' => '1',
+                    'type' => 'simple',
+                    'store' => '0',
+                    'set' => '4',
+                    'back' => 'edit',
+                    'product' => [],
+                    'is_downloadable' => '0',
+                    'affect_configurable_product_attributes' => '1',
+                    'new_variation_attribute_set_id' => '4',
+                    'use_default' => [
+                        'gift_message_available' => '0',
+                        'gift_wrapping_available' => '0'
+                    ],
+                    'configurable_matrix_serialized' => '[]',
+                    'associated_product_ids_serialized' => '[]'
+                ],
+                'tier_price_for_request' => [
+                    [
+                        'price_id' => '1',
+                        'website_id' => '0',
+                        'cust_group' => '32000',
+                        'price' => '111.00',
+                        'price_qty' => '100',
+                        'website_price' => '111.0000',
+                        'initialize' => 'true',
+                        'record_id' => '1',
+                        'value_type' => 'fixed'
+                    ],
+                    [
+                        'price_id' => '2',
+                        'website_id' => '1',
+                        'cust_group' => '32000',
+                        'price' => '222.00',
+                        'price_qty' => '200',
+                        'website_price' => '111.0000',
+                        'initialize' => 'true',
+                        'record_id' => '2',
+                        'value_type' => 'fixed'
+                    ],
+                    [
+                        'price_id' => '3',
+                        'website_id' => '1',
+                        'cust_group' => '32000',
+                        'price' => '333.00',
+                        'price_qty' => '300',
+                        'website_price' => '111.0000',
+                        'initialize' => 'true',
+                        'record_id' => '3',
+                        'value_type' => 'fixed'
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Return product data for test without entity_id for further save
+     *
+     * @param array $tierPrice
+     * @return array
+     */
+    private function getProductData(array $tierPrice)
+    {
+        $productRepositoryInterface = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepositoryInterface->get('tier_prices')->getData();
+        $product['tier_price'] = $tierPrice;
+        unset($product['entity_id']);
+        return $product;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
index 7fd2f62a0649a..87b8d4a117e2d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
@@ -55,6 +55,7 @@ public function getViewActionDataProvider()
     /**
      * @dataProvider getViewActionDataProvider
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
+     * @magentoDbIsolation disabled
      */
     public function testViewAction($categoryId, array $expectedHandles, array $expectedContent)
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
index e871ee8579a76..1cb2caace4fa1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
@@ -7,10 +7,13 @@
 namespace Magento\Catalog\Controller\Product;
 
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
  *
+ * @magentoDbIsolation disabled
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
@@ -20,6 +23,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     protected $productRepository;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -30,6 +36,11 @@ protected function setUp()
         $this->productRepository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
     }
 
+    /**
+     * Test adding product to compare list.
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testAddAction()
     {
         $this->_requireVisitorWithNoProducts();
@@ -37,6 +48,7 @@ public function testAddAction()
         /** @var \Magento\Framework\Data\Form\FormKey $formKey */
         $formKey = $objectManager->get(\Magento\Framework\Data\Form\FormKey::class);
         $product = $this->productRepository->get('simple_product_1');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch(
             sprintf(
                 'catalog/product_compare/add/product/%s/form_key/%s?nocookie=1',
@@ -46,7 +58,12 @@ public function testAddAction()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['You added product Simple Product 1 Name to the comparison list.']),
+            $this->equalTo(
+                [
+                    'You added product Simple Product 1 Name to the '.
+                    '<a href="http://localhost/index.php/catalog/product_compare/">comparison list</a>.'
+                ]
+            ),
             MessageInterface::TYPE_SUCCESS
         );
 
@@ -55,21 +72,32 @@ public function testAddAction()
         $this->_assertCompareListEquals([$product->getEntityId()]);
     }
 
+    /**
+     * Test comparing a product.
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testIndexActionAddProducts()
     {
         $this->_requireVisitorWithNoProducts();
         $product = $this->productRepository->get('simple_product_2');
         $this->dispatch('catalog/product_compare/index/items/' . $product->getEntityId());
 
-        $this->assertRedirect($this->equalTo('http://localhost/index.php/catalog/product_compare/index/'));
+        $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/catalog/product_compare/index/'));
 
         $this->_assertCompareListEquals([$product->getEntityId()]);
     }
 
+    /**
+     * Test removing a product from compare list.
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testRemoveAction()
     {
         $this->_requireVisitorWithTwoProducts();
         $product = $this->productRepository->get('simple_product_2');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
 
         $this->assertSessionMessages(
@@ -82,10 +110,16 @@ public function testRemoveAction()
         $this->_assertCompareListEquals([$restProduct->getEntityId()]);
     }
 
+    /**
+     * Test removing a product from compare list of a registered customer.
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testRemoveActionWithSession()
     {
         $this->_requireCustomerWithTwoProducts();
         $product = $this->productRepository->get('simple_product_1');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
         $secondProduct = $this->productRepository->get('simple_product_2');
 
@@ -99,6 +133,9 @@ public function testRemoveActionWithSession()
         $this->_assertCompareListEquals([$secondProduct->getEntityId()]);
     }
 
+    /**
+     * Test getting a list of compared product.
+     */
     public function testIndexActionDisplay()
     {
         $this->_requireVisitorWithTwoProducts();
@@ -125,10 +162,14 @@ public function testIndexActionDisplay()
         $this->assertContains('$987.65', $responseBody);
     }
 
+    /**
+     * Test clearing a list of compared products.
+     */
     public function testClearAction()
     {
         $this->_requireVisitorWithTwoProducts();
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/clear');
 
         $this->assertSessionMessages(
@@ -142,12 +183,15 @@ public function testClearAction()
     }
 
     /**
+     * Test escaping a session message.
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
      */
     public function testRemoveActionProductNameXss()
     {
         $this->_prepareCompareListWithProductNameXss();
         $product = $this->productRepository->get('product-with-xss');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId() . '?nocookie=1');
 
         $this->assertSessionMessages(
@@ -158,6 +202,12 @@ public function testRemoveActionProductNameXss()
         );
     }
 
+    /**
+     * Preparing compare list.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     protected function _prepareCompareListWithProductNameXss()
     {
         /** @var $visitor \Magento\Customer\Model\Visitor */
@@ -180,6 +230,11 @@ protected function _prepareCompareListWithProductNameXss()
         );
     }
 
+    /**
+     * Preparing compare list.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     protected function _requireVisitorWithNoProducts()
     {
         /** @var $visitor \Magento\Customer\Model\Visitor */
@@ -199,6 +254,12 @@ protected function _requireVisitorWithNoProducts()
         $this->_assertCompareListEquals([]);
     }
 
+    /**
+     * Preparing compare list.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     protected function _requireVisitorWithTwoProducts()
     {
         /** @var $visitor \Magento\Customer\Model\Visitor */
@@ -231,6 +292,12 @@ protected function _requireVisitorWithTwoProducts()
         $this->_assertCompareListEquals([$firstProductEntityId, $secondProductEntityId]);
     }
 
+    /**
+     * Preparing a compare list.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     protected function _requireCustomerWithTwoProducts()
     {
         $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
index 93e5314055da7..92a782deee65a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
@@ -7,6 +7,7 @@
 
 /**
  * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
+ * @magentoDbIsolation disabled
  */
 class ViewTest extends \Magento\TestFramework\TestCase\AbstractController
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Cron/DeleteOutdatedPriceValuesTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Cron/DeleteOutdatedPriceValuesTest.php
index 1bb97771bc0c8..6486c0089c206 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Cron/DeleteOutdatedPriceValuesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Cron/DeleteOutdatedPriceValuesTest.php
@@ -49,11 +49,13 @@ public function setUp()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
      * @magentoConfigFixture current_store catalog/price/scope 1
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testExecute()
     {
+        $defaultStorePrice = 10.00;
+        $secondStorePrice = 9.99;
         $secondStoreId = $this->store->load('fixture_second_store')->getId();
         /** @var \Magento\Catalog\Model\Product\Action $productAction */
         $productAction = $this->objectManager->create(
@@ -85,7 +87,7 @@ public function testExecute()
             'add'
         );
         $product->setStoreId($secondStoreId);
-        $product->setPrice(9.99);
+        $product->setPrice($secondStorePrice);
 
         $productResource->save($product);
         $attribute = $this->objectManager->get(\Magento\Eav\Model\Config::class)
@@ -94,13 +96,25 @@ public function testExecute()
                 'price'
             );
         $this->assertEquals(
-            '9.99',
+            $secondStorePrice,
             $productResource->getAttributeRawValue($productId, $attribute->getId(), $secondStoreId)
         );
         /** @var MutableScopeConfigInterface $config */
         $config = $this->objectManager->get(
             MutableScopeConfigInterface::class
         );
+
+        $config->setValue(
+            \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
+            null,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        $this->cron->execute();
+        $this->assertEquals(
+            $secondStorePrice,
+            $productResource->getAttributeRawValue($productId, $attribute->getId(), $secondStoreId)
+        );
+
         $config->setValue(
             \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
             \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL,
@@ -109,7 +123,7 @@ public function testExecute()
         /** @var \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig */
         $this->cron->execute();
         $this->assertEquals(
-            '10.0000',
+            $defaultStorePrice,
             $productResource->getAttributeRawValue($productId, $attribute->getId(), $secondStoreId)
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php
index bcb29fa002f01..5a4dadedb1c9e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php
@@ -64,6 +64,24 @@ public function testCategoryAttribute()
         );
     }
 
+    /**
+     * @dataProvider isDirectiveDataProvider
+     */
+    public function testIsDirective($html, $expectedResult)
+    {
+        $this->assertEquals($expectedResult, $this->_helper->isDirectivesExists($html));
+    }
+
+    public function isDirectiveDataProvider()
+    {
+        return [
+            ['{{', false],
+            ['Test string', false],
+            ['{store url="customer/account/login"}', false],
+            ['{{store url="customer/account/login"}}', true],
+        ];
+    }
+
     /**
      * Helper method for testProcess()
      *
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/CompareTest.php
index 37648cb7e1efa..f99344904f68e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/CompareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/CompareTest.php
@@ -25,6 +25,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDbIsolation disabled
      */
     public function testGetListUrl()
     {
@@ -97,6 +98,7 @@ public function testGetItemCollection()
      * getItemCount()
      * hasItems()
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDbIsolation disabled
      */
     public function testCalculate()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php
index 7d7625f485cfb..623182651b45f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php
@@ -60,6 +60,7 @@ public function testGetFinalPrice()
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Product::class
         );
+        $product->setPrice(49.95);
         $product->setFinalPrice(49.95);
         $this->assertEquals(49.95, $this->helper->getFinalPrice($product));
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/Link/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/Link/SaveHandlerTest.php
new file mode 100644
index 0000000000000..5b24c4e22191a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/Link/SaveHandlerTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Category\Link;
+
+use Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Save handler test
+ *
+ * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class SaveHandlerTest extends TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var string
+     */
+    private $productLinkField;
+
+    /**
+     * @var CategoryLinkInterfaceFactory
+     */
+    private $categoryLinkFactory;
+
+    /**
+     * @var SaveHandler
+     */
+    private $saveHandler;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
+        $metadataPool = $objectManager->create(MetadataPool::class);
+        $this->productLinkField = $metadataPool->getMetadata(ProductInterface::class)
+            ->getLinkField();
+        $this->categoryLinkFactory = $objectManager->create(CategoryLinkInterfaceFactory::class);
+        $this->saveHandler = $objectManager->create(SaveHandler::class);
+    }
+
+    /**
+     * Execute test
+     *
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $product = $this->productRepository->get('simple2');
+        $product->setCategoryIds([3, 4, 6]);
+        $this->productRepository->save($product);
+        $categoryPositions = [
+            3 => [
+                'category_id' => 3,
+                'position' => 0,
+            ],
+            4 => [
+                'category_id' => 4,
+                'position' => 0,
+            ],
+            6 => [
+                'category_id' => 6,
+                'position' => 0,
+            ],
+        ];
+
+        $categoryLinks = $product->getExtensionAttributes()->getCategoryLinks();
+        $this->assertEmpty($categoryLinks);
+
+        $categoryLinks = [];
+        $categoryPositions[4]['position'] = 1;
+        $categoryPositions[6]['position'] = 1;
+        foreach ($categoryPositions as $categoryPosition) {
+            $categoryLink = $this->categoryLinkFactory->create()
+                ->setCategoryId($categoryPosition['category_id'])
+                ->setPosition($categoryPosition['position']);
+            $categoryLinks[] = $categoryLink;
+        }
+        $categoryLinks = $this->updateCategoryLinks($product, $categoryLinks);
+        $this->assertPositions($categoryPositions, $categoryLinks);
+
+        $categoryPositions[4]['position'] = 2;
+        $categoryLink = $this->categoryLinkFactory->create()
+            ->setCategoryId(4)
+            ->setPosition($categoryPositions[4]['position']);
+        $categoryLinks = $this->updateCategoryLinks($product, [$categoryLink]);
+        $this->assertPositions($categoryPositions, $categoryLinks);
+    }
+
+    /**
+     * Update category links
+     *
+     * @param ProductInterface $product
+     * @param \Magento\Catalog\Api\Data\CategoryLinkInterface[] $categoryLinks
+     * @return \Magento\Catalog\Api\Data\CategoryLinkInterface[]
+     */
+    private function updateCategoryLinks(ProductInterface $product, array $categoryLinks): array
+    {
+        $product->getExtensionAttributes()->setCategoryLinks($categoryLinks);
+        $arguments = [$this->productLinkField => $product->getData($this->productLinkField)];
+        $this->saveHandler->execute($product, $arguments);
+        $product = $this->productRepository->get($product->getSku(), false, null, true);
+        $categoryLinks = $product->getExtensionAttributes()
+            ->getCategoryLinks();
+
+        return $categoryLinks;
+    }
+
+    /**
+     * Assert positions
+     *
+     * @param array $categoryPositions
+     * @param array $categoryLinks
+     * @return void
+     */
+    private function assertPositions(array $categoryPositions, array $categoryLinks): void
+    {
+        foreach ($categoryLinks as $categoryLink) {
+            $categoryPosition = $categoryPositions[$categoryLink->getCategoryId()];
+            $this->assertEquals($categoryPosition['category_id'], $categoryLink->getCategoryId());
+            $this->assertEquals($categoryPosition['position'], $categoryLink->getPosition());
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 582e3e8abd21d..1d7936d740b8d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -320,6 +320,44 @@ public function testDeleteChildren()
         $this->assertEquals($this->_model->getId(), null);
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testCreateSubcategoryWithMultipleStores()
+    {
+        $parentCategoryId = 3;
+        $storeManager = $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE);
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $storeId = $storeRepository->get('fixture_second_store')->getId();
+        /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
+        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+        $parentCategory = $repository->get($parentCategoryId, $storeId);
+        $parentAllStoresPath = $parentCategory->getUrlPath();
+        $parentSecondStoreKey = 'parent-category-url-key-second-store';
+        $parentCategory->setUrlKey($parentSecondStoreKey);
+        $repository->save($parentCategory);
+        /** @var \Magento\Catalog\Model\Category $childCategory */
+        $childCategory = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
+        $childCategory->setName('Test Category 100')
+            ->setParentId($parentCategoryId)
+            ->setLevel(2)
+            ->setAvailableSortBy(['position', 'name'])
+            ->setDefaultSortBy('name')
+            ->setIsActive(true)
+            ->setPosition(1)
+            ->isObjectNew(true);
+        $repository->save($childCategory);
+        $childCategorySecondStore = $repository->get($childCategory->getId(), $storeId);
+
+        $this->assertEquals($parentAllStoresPath . '/test-category-100', $childCategory->getUrlPath());
+        $this->assertEquals($parentSecondStoreKey . '/test-category-100', $childCategorySecondStore->getUrlPath());
+    }
+
     protected function getCategoryByName($categoryName)
     {
         /* @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php
index 5e9244367bb13..8eeba1230f8b1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php
@@ -128,6 +128,14 @@ public function testGetChildren()
         $this->assertEquals(array_diff([4, 13], explode(',', $this->_model->getChildren())), []);
     }
 
+    public function testGetChildrenSorted()
+    {
+        $this->_model->load(2);
+        $unsorted = explode(',', $this->_model->getChildren());
+        sort($unsorted);
+        $this->assertEquals(array_diff($unsorted, explode(',', $this->_model->getChildren(true, true, true))), []);
+    }
+
     public function testGetPathInStore()
     {
         $this->_model->load(5);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
index 33f26302394f4..38960ab66399a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
@@ -32,8 +32,12 @@ public function testApplyCustomDesign($theme)
         $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\DesignInterface::class
         );
+        $translate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\TranslateInterface::class
+        );
         $this->assertEquals('package', $design->getDesignTheme()->getPackageCode());
         $this->assertEquals('theme', $design->getDesignTheme()->getThemeCode());
+        $this->assertEquals('themepackage/theme', $translate->getTheme());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
new file mode 100644
index 0000000000000..04baef55863f2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Tests for the \Magento\Catalog\Model\ImageUploader class
+ */
+class ImageUploaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Catalog\Model\ImageUploader
+     */
+    private $imageUploader;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\Filesystem $filesystem */
+        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        /** @var $uploader \Magento\MediaStorage\Model\File\Uploader */
+        $this->imageUploader = $this->objectManager->create(
+            \Magento\Catalog\Model\ImageUploader::class,
+            [
+                'baseTmpPath' => $this->mediaDirectory->getRelativePath('tmp'),
+                'basePath' => __DIR__,
+                'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
+                'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveFileToTmpDir(): void
+    {
+        $fileName = 'magento_small_image.jpg';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $fixtureDir = realpath(__DIR__ . '/../_files');
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        copy($fixtureDir . DIRECTORY_SEPARATOR . $fileName, $filePath);
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->imageUploader->saveFileToTmpDir('image');
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $this->assertTrue(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     * @return void
+     */
+    public function testSaveFileToTmpDirWithWrongExtension(): void
+    {
+        $fileName = 'text.txt';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'text/plain',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->imageUploader->saveFileToTmpDir('image');
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $this->assertFalse(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     * @return void
+     */
+    public function testSaveFileToTmpDirWithWrongFile(): void
+    {
+        $fileName = 'file.gif';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/gif',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->imageUploader->saveFileToTmpDir('image');
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $this->assertFalse(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        parent::tearDownAfterClass();
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\Filesystem::class
+        );
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
+        $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $mediaDirectory->delete('tmp');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
index cb5b77421368c..dab47c818ece9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
@@ -10,7 +10,7 @@
 /**
  * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
  * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_products.php
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
@@ -27,6 +27,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $productResource;
 
+    /**
+     * @var \Magento\Catalog\Api\CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     protected function setUp()
     {
         /** @var \Magento\Framework\Indexer\IndexerInterface indexer */
@@ -39,6 +44,10 @@ protected function setUp()
         $this->productResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Catalog\Model\ResourceModel\Product::class
         );
+
+        $this->categoryRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Api\CategoryRepositoryInterface::class
+        );
     }
 
     /**
@@ -200,6 +209,25 @@ public function testCategoryCreate()
         }
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     * @depends testReindexAll
+     */
+    public function testCatalogCategoryProductIndexInvalidateAfterDelete()
+    {
+        $indexerShouldBeValid = (bool)$this->indexer->isInvalid();
+
+        $categories = $this->getCategories(1);
+        $this->categoryRepository->delete(array_pop($categories));
+
+        $state = $this->indexer->getState();
+        $state->loadByIndexer($this->indexer->getId());
+        $status = $state->getStatus();
+
+        $this->assertFalse($indexerShouldBeValid);
+        $this->assertEquals(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID, $status);
+    }
+
     /**
      * @param int $count
      * @return Category[]
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php
index 8b4e0bce35d64..cb2f436ae90a0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\Catalog\Model\Indexer;
 
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
+ * @magentoAppIsolation enabled
  * @magentoDbIsolation enabled
  */
-class FlatTest extends \PHPUnit\Framework\TestCase
+class FlatTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * @var int
@@ -56,6 +59,16 @@ class FlatTest extends \PHPUnit\Framework\TestCase
     public static function setUpBeforeClass()
     {
         self::loadAttributeCodes();
+
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
     }
 
     public function testEntityItemsBefore()
@@ -71,6 +84,8 @@ public function testEntityItemsBefore()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     *
+     * @magentoDbIsolation disabled
      */
     public function testReindexAll()
     {
@@ -105,6 +120,8 @@ public function testFlatItemsBefore()
      * Populate EAV category data`
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
+     *
+     * @magentoDbIsolation disabled
      */
     public function testCreateCategory()
     {
@@ -115,6 +132,8 @@ public function testCreateCategory()
 
         $this->assertEquals(self::$defaultCategoryId, $result[self::$categoryOne]->getParentId());
         $this->assertEquals(self::$categoryOne, $result[self::$categoryTwo]->getParentId());
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
@@ -123,6 +142,8 @@ public function testCreateCategory()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     *
+     * @magentoDbIsolation disabled
      */
     public function testFlatAfterCreate()
     {
@@ -150,18 +171,24 @@ public function testFlatAfterCreate()
 
         $this->assertEquals(self::$categoryOne, $categoryTwo->getParentId());
         $this->checkCategoryData($categoryTwo);
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
      * Move category and populate EAV category data
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
+     *
+     * @magentoDbIsolation disabled
      */
     public function testMoveCategory()
     {
         $this->moveSubCategoriesInDefaultCategory();
         $categoryTwo = $this->getLoadedCategory(self::$categoryTwo);
         $this->assertEquals($categoryTwo->getData('parent_id'), self::$defaultCategoryId);
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
@@ -170,6 +197,8 @@ public function testMoveCategory()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     *
+     * @magentoDbIsolation disabled
      */
     public function testFlatAfterMove()
     {
@@ -188,6 +217,8 @@ public function testFlatAfterMove()
 
         $categoryTwo = $this->getLoadedCategory(self::$categoryTwo);
         $this->checkCategoryData($categoryTwo);
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
@@ -357,7 +388,17 @@ private function deleteSubCategoriesInDefaultCategory()
     {
         $this->executeWithFlatEnabledInAdminArea(function () {
             $this->createSubCategoriesInDefaultCategory();
+            $this->removeSubCategoriesInDefaultCategory();
+        });
+    }
 
+    /**
+     * Invoke business logic:
+     * - delete created categories
+     */
+    private function removeSubCategoriesInDefaultCategory()
+    {
+        $this->executeWithFlatEnabledInAdminArea(function () {
             $category = $this->instantiateCategoryModel();
             $category->load(self::$categoryTwo);
             $category->delete();
@@ -427,4 +468,12 @@ private function getActiveConfigInstance()
             \Magento\Framework\App\Config\MutableScopeConfigInterface::class
         );
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php
index 070141063b331..d0a4f2ead4d6b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -5,16 +5,31 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
 
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Full reindex Test
  */
-class FullTest extends \PHPUnit\Framework\TestCase
+class FullTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
      */
     protected $_processor;
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
         $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -23,6 +38,7 @@ protected function setUp()
     }
 
     /**
+     * @magentoAppArea adminhtml
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
@@ -36,6 +52,11 @@ public function testReindexAll()
 
         $this->assertTrue($attr->isIndexable());
 
+        $priceIndexerProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Catalog\Model\Indexer\Product\Price\Processor::class
+        );
+        $priceIndexerProcessor->reindexAll();
+
         $this->_processor->reindexAll();
 
         $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -61,4 +82,12 @@ public function testReindexAll()
             $this->assertEquals(1, $product->getWeight());
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php
new file mode 100644
index 0000000000000..049e7c8d20119
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
+
+use Magento\TestFramework\Indexer\TestCase as IndexerTestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Catalog\Model\ResourceModel\Product\Flat;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Custom Flat Attribute Test
+ */
+class CustomFlatAttributeTest extends IndexerTestCase
+{
+    /**
+     * @var Processor
+     */
+    private $processor;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->processor = $this->objectManager->get(Processor::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Tests that custom product attribute will appear in flat table and can be updated in it.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    public function testProductUpdateCustomAttribute(): void
+    {
+        $product = $this->productRepository->get('simple_with_custom_flat_attribute');
+        $product->setCustomAttribute('flat_attribute', 'changed flat attribute');
+        $this->productRepository->save($product);
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
+        /** @var \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria */
+        $searchCriteria = $searchCriteriaBuilder->addFilter('sku', 'simple_with_custom_flat_attribute')
+            ->create();
+
+        $items = $this->productRepository->getList($searchCriteria)
+            ->getItems();
+        $product = reset($items);
+        $resourceModel = $product->getResourceCollection()
+            ->getEntity();
+
+        self::assertInstanceOf(
+            Flat::class,
+            $resourceModel,
+            'Product should be received from flat resource'
+        );
+
+        self::assertEquals(
+            'changed flat attribute',
+            $product->getFlatAttribute(),
+            'Product flat attribute should be able to change.'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/FullTest.php
index bfdc9b85a30bc..eb9e5664e0d9d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/FullTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/FullTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index ff3458ec3f22a..a32b476fe75ff 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -3,86 +3,110 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
 
+use Magento\TestFramework\Indexer\TestCase as IndexerTestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+
 /**
  * Class RowTest
  */
-class RowTest extends \Magento\TestFramework\Indexer\TestCase
+class RowTest extends IndexerTestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Product
+     * @var Processor
      */
-    protected $_product;
+    private $processor;
 
     /**
-     * @var \Magento\Catalog\Model\Category
+     * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $_category;
+    private $objectManager;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
+     * @var ProductRepositoryInterface
      */
-    protected $_state;
+    private $productRepository;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     * @var CategoryRepositoryInterface
      */
-    protected $_processor;
+    private $categoryRepository;
 
-    protected function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
-        $this->_product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $this->_category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
-        $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Indexer\Product\Flat\Processor::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->processor = $this->objectManager->get(Processor::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * Tests product update
+     *
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/row_fixture.php
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      * @magentoAppArea frontend
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
-    public function testProductUpdate()
+    public function testProductUpdate(): void
     {
-        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Model\CategoryFactory::class);
-        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Block\Product\ListProduct::class);
+        /** @var ListProduct $listProduct */
+        $listProduct = $this->objectManager->create(ListProduct::class);
 
-        $this->_processor->getIndexer()->setScheduled(false);
-        $this->assertFalse(
-            $this->_processor->getIndexer()->isScheduled(),
+        $this->processor->getIndexer()
+            ->setScheduled(false);
+        $isScheduled = $this->processor->getIndexer()
+            ->isScheduled();
+        self::assertFalse(
+            $isScheduled,
             'Indexer is in scheduled mode when turned to update on save mode'
         );
-        $this->_processor->reindexAll();
 
-        $this->_product->load(1);
-        $this->_product->setName('Updated Product');
-        $this->_product->save();
+        $this->processor->reindexAll();
 
-        $category = $categoryFactory->create()->load(9);
+        $product = $this->productRepository->get('simple');
+        $product->setName('Updated Product');
+        $this->productRepository->save($product);
+
+        /** @var \Magento\Catalog\Api\Data\CategoryInterface $category */
+        $category = $this->categoryRepository->get(9);
+        /** @var \Magento\Catalog\Model\Layer $layer */
         $layer = $listProduct->getLayer();
         $layer->setCurrentCategory($category);
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
         $productCollection = $layer->getProductCollection();
-        $this->assertTrue(
+        self::assertTrue(
             $productCollection->isEnabledFlat(),
             'Product collection is not using flat resource when flat is on'
         );
 
-        $this->assertEquals(2, $productCollection->count(), 'Product collection items count must be exactly 2');
+        self::assertEquals(
+            2,
+            $productCollection->count(),
+            'Product collection items count must be exactly 2'
+        );
 
         foreach ($productCollection as $product) {
             /** @var $product \Magento\Catalog\Model\Product */
-            if ($product->getId() == 1) {
-                $this->assertEquals(
+            if ($product->getSku() === 'simple') {
+                self::assertEquals(
                     'Updated Product',
                     $product->getName(),
                     'Product name from flat does not match with updated name'
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
index 35d593bea3454..baf0a0c1a9c4b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php
index c6a5c50577ae8..bbaf453938705 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php
@@ -85,7 +85,7 @@ public function testDeleteAttribute()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceTest.php
index fbd99017bb63c..d8e49d1e34366 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceTest.php
@@ -3,13 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Model\Indexer\Product\Price;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\ScopedProductTierPriceManagementInterface;
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\Customer\Model\Group;
+
 class SimpleWithOptionsTierPriceTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     private $productRepository;
 
@@ -19,55 +26,52 @@ class SimpleWithOptionsTierPriceTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     * @var CollectionFactory
      */
     private $productCollectionFactory;
 
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $this->productCollectionFactory = $this->objectManager->create(
-            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->productCollectionFactory = $this->objectManager->create(CollectionFactory::class);
     }
 
     /**
-     * @magentoDbIsolation enabled
-     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
      */
     public function testTierPrice()
     {
-        $tierPriceValue = 20.00;
-
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->productRepository->get('simple');
-
-        /** @var \Magento\Catalog\Api\ScopedProductTierPriceManagementInterface $tierPriceManagement */
-        $tierPriceManagement = $this->objectManager->create(
-            \Magento\Catalog\Api\ScopedProductTierPriceManagementInterface::class
-        );
+        $tierPriceValue = 9.00;
 
-        /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
-        $tierPrice = $this->objectManager->create(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class)
+        $tierPrice = $this->objectManager->create(ProductTierPriceInterfaceFactory::class)
             ->create();
-
-        $tierPrice->setCustomerGroupId(\Magento\Customer\Model\Group::CUST_GROUP_ALL);
+        $tierPrice->setCustomerGroupId(Group::CUST_GROUP_ALL);
         $tierPrice->setQty(1.00);
         $tierPrice->setValue($tierPriceValue);
+        $tierPriceManagement = $this->objectManager->create(ScopedProductTierPriceManagementInterface::class);
+        $tierPriceManagement->add('simple333', $tierPrice);
 
-        $tierPriceManagement->add($product->getSku(), $tierPrice);
-
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
         $productCollection = $this->productCollectionFactory->create();
-        $productCollection->addIdFilter([$product->getId()]);
+        $productCollection->addIdFilter(333);
         $productCollection->addPriceData();
         $productCollection->load();
-        $indexPriceInfo = $productCollection->getFirstItem();
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $productCollection->getFirstItem();
+        $tierPrice = $product->getPriceInfo()
+            ->getPrice(TierPrice::PRICE_CODE)
+            ->getValue();
+
+        $this->assertEquals($tierPriceValue, $tierPrice);
+
+        $tierPrice = $product->getTierPrice(1);
+        $this->assertEquals($tierPriceValue, $tierPrice);
 
-        $tierPriceModel = $indexPriceInfo->getPriceInfo()
-            ->getPrice(\Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE);
+        $tierPrices = $product->getData('tier_price');
+        $this->assertEquals($tierPriceValue, $tierPrices[0]['price']);
 
-        $this->assertEquals($tierPriceValue, $tierPriceModel->getValue());
+        $minPrice = $product->getData('min_price');
+        $this->assertEquals($tierPriceValue, $minPrice);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
new file mode 100644
index 0000000000000..80af901788dd8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Price;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\ScopedProductTierPriceManagementInterface;
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\Customer\Model\Group as CustomerGroup;
+
+/**
+ * @group indexer_dimension
+ */
+class SimpleWithOptionsTierPriceWithDimensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * set up
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->productCollectionFactory = $this->objectManager->create(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testTierPrice()
+    {
+        $tierPriceValue = 9.00;
+
+        $tierPrice = $this->objectManager->create(ProductTierPriceInterfaceFactory::class)
+            ->create();
+        $tierPrice->setCustomerGroupId(CustomerGroup::CUST_GROUP_ALL);
+        $tierPrice->setQty(1.00);
+        $tierPrice->setValue($tierPriceValue);
+        $tierPriceManagement = $this->objectManager->create(ScopedProductTierPriceManagementInterface::class);
+        $tierPriceManagement->add('simple333', $tierPrice);
+
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addIdFilter(333);
+        $productCollection->addPriceData();
+        $productCollection->load();
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $productCollection->getFirstItem();
+        $tierPrice = $product->getPriceInfo()
+            ->getPrice(TierPrice::PRICE_CODE)
+            ->getValue();
+
+        $this->assertEquals($tierPriceValue, $tierPrice);
+
+        $tierPrice = $product->getTierPrice(1);
+        $this->assertEquals($tierPriceValue, $tierPrice);
+
+        $tierPrices = $product->getData('tier_price');
+        $this->assertEquals($tierPriceValue, $tierPrices[0]['price']);
+
+        $minPrice = $product->getData('min_price');
+        $this->assertEquals($tierPriceValue, $minPrice);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
index d978d65ab1c64..5721982ab8dc3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
@@ -10,7 +10,7 @@
  *
  * @magentoDataFixture Magento/Catalog/_files/categories.php
  * @magentoAppIsolation enabled
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryTest extends \PHPUnit\Framework\TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
index 697f956c9e531..e1b20a63fa4f7 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
@@ -8,6 +8,8 @@
 /**
  * Test class for \Magento\Catalog\Model\Layer\Filter\Attribute.
  *
+ * @magentoDbIsolation disabled
+ *
  * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
  */
 class AttributeTest extends \PHPUnit\Framework\TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/CategoryTest.php
index aacb5f31f8d11..0090ff38c2a48 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/CategoryTest.php
@@ -95,6 +95,11 @@ public function testGetName()
         $this->assertEquals('Category', $this->_model->getName());
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
+     */
     public function testGetItems()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
index f1a04c4d197f5..a6d1aa5be3e37 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -9,9 +9,7 @@
 /**
  * Test class for \Magento\Catalog\Model\Layer\Filter\DataProvider\Price.
  *
- * @magentoDataFixture Magento/Catalog/_files/categories.php
  * @magentoAppIsolation enabled
- * @magentoDbIsolation enabled
  */
 class PriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -34,6 +32,9 @@ protected function setUp()
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoConfigFixture current_store catalog/layered_navigation/price_range_calculation auto
      */
     public function testGetPriceRangeAuto()
@@ -42,6 +43,9 @@ public function testGetPriceRangeAuto()
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoConfigFixture current_store catalog/layered_navigation/price_range_calculation manual
      * @magentoConfigFixture current_store catalog/layered_navigation/price_range_step 1.5
      */
@@ -51,6 +55,11 @@ public function testGetPriceRangeManual()
         $this->assertEquals(1.5, $this->_model->getPriceRange());
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
+     */
     public function testGetMaxPriceInt()
     {
         $this->assertEquals(45.00, $this->_model->getMaxPrice());
@@ -70,6 +79,8 @@ public function getRangeItemCountsDataProvider()
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoDbIsolation disabled
      * @dataProvider getRangeItemCountsDataProvider
      */
     public function testGetRangeItemCounts($inputRange, $expectedItemCounts)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php
index c517e9fddc98b..1964b465a9141 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php
@@ -10,15 +10,14 @@
 
 /**
  * Test class for \Magento\Catalog\Model\Layer\Filter\Price.
- *
- * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
  */
 class AlgorithmAdvancedTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @covers \Magento\Framework\Search\Dynamic\Algorithm::calculateSeparators
      */
     public function testWithoutLimits()
@@ -88,9 +87,10 @@ protected function _prepareFilter($layer, $priceResource, $request = null)
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @covers \Magento\Framework\Search\Dynamic\Algorithm::calculateSeparators
      */
     public function testWithLimits()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
index 8656f17d03463..e3a948d6c63de 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
@@ -11,6 +11,7 @@
  * Test class for \Magento\Catalog\Model\Layer\Filter\Price.
  *
  * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/Price/_files/products_base.php
+ * @magentoDbIsolation disabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AlgorithmBaseTest extends \PHPUnit\Framework\TestCase
@@ -35,9 +36,9 @@ class AlgorithmBaseTest extends \PHPUnit\Framework\TestCase
     protected $priceResource;
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider pricesSegmentationDataProvider
      * @covers       \Magento\Framework\Search\Dynamic\Algorithm::calculateSeparators
      */
@@ -111,7 +112,7 @@ public function testPricesSegmentation($categoryId, array $entityIds, array $int
         $items = $model->calculateSeparators($interval);
         $this->assertEquals(array_keys($intervalItems), array_keys($items));
 
-        for ($i = 0; $i < count($intervalItems); ++$i) {
+        for ($i = 0, $count = count($intervalItems); $i < $count; ++$i) {
             $this->assertInternalType('array', $items[$i]);
             $this->assertEquals($intervalItems[$i]['from'], $items[$i]['from']);
             $this->assertEquals($intervalItems[$i]['to'], $items[$i]['to']);
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 0920eff3c0251..10731a48ee173 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_advanced_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced_rollback.php
index 63d5efc346951..8b6b2ff94d4bd 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced_rollback.php
@@ -12,6 +12,11 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Api\ProductRepositoryInterface::class
+);
+
 /** @var $product \Magento\Catalog\Model\Product */
 $lastProductId = 0;
 foreach ($prices as $price) {
@@ -20,10 +25,11 @@
         \Magento\Catalog\Model\Product::class
     );
     $productId = $lastProductId + 1;
-    $product->load($productId);
-
-    if ($product->getId()) {
-        $product->delete();
+    try {
+        $product = $productRepository->get('simple-' . $productId, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
     }
 
     $lastProductId++;
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 1ad6efd3d0dce..aa5fee237dbfe 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/Layer/Filter/Price/_files/products_base_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php
index 13795b27e220b..67bdb3d5c5e59 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php
@@ -54,15 +54,22 @@
         $category->delete();
     }
 
+    /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+    $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        \Magento\Catalog\Api\ProductRepositoryInterface::class
+    );
+
     foreach ($testCase[0] as $price) {
         /** @var \Magento\Catalog\Model\Product $product */
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Product::class
         );
         $productId = $lastProductId + 1;
-        $product->load($productId);
-        if ($product->getId()) {
-            $product->delete();
+        try {
+            $product = $productRepository->get('simple-' . $productId, false, null, true);
+            $productRepository->delete($product);
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            //Product already removed
         }
         ++$lastProductId;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ActionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ActionTest.php
index 90825ab573d09..19f5e78b2537a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ActionTest.php
@@ -42,7 +42,7 @@ protected function setUp()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testUpdateWebsites()
@@ -84,6 +84,74 @@ public function testUpdateWebsites()
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea adminhtml
+     * @param string $status
+     * @param string $productsCount
+     * @dataProvider updateAttributesDataProvider
+     * @magentoDbIsolation disabled
+     */
+    public function testUpdateAttributes($status, $productsCount)
+    {
+        /** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
+        $indexerRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Indexer\IndexerRegistry::class);
+        $indexerRegistry->get(Fulltext::INDEXER_ID)->setScheduled(false);
+
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $productRepository->get('configurable');
+        $productAttributesOptions = $product->getExtensionAttributes()->getConfigurableProductLinks();
+        $attrData = ['status' => $status];
+        $configurableOptionsId = [];
+        if (isset($productAttributesOptions)) {
+            foreach ($productAttributesOptions as $configurableOption) {
+                $configurableOptionsId[] = $configurableOption;
+            }
+        }
+        $this->action->updateAttributes($configurableOptionsId, $attrData, $product->getStoreId());
+
+        $categoryFactory = $this->objectManager->create(\Magento\Catalog\Model\CategoryFactory::class);
+        /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
+        $listProduct = $this->objectManager->create(\Magento\Catalog\Block\Product\ListProduct::class);
+        $category = $categoryFactory->create()->load(2);
+        $layer = $listProduct->getLayer();
+        $layer->setCurrentCategory($category);
+        $productCollection = $layer->getProductCollection();
+        $productCollection->joinField(
+            'qty',
+            'cataloginventory_stock_status',
+            'qty',
+            'product_id=entity_id',
+            '{{table}}.stock_id=1',
+            'left'
+        );
+
+        $this->assertEquals($productsCount, $productCollection->count());
+    }
+
+    /**
+     * DataProvider for testUpdateAttributes
+     *
+     * @return array
+     */
+    public function updateAttributesDataProvider()
+    {
+        return [
+            [
+                'status' => 2,
+                'expected_count' => 0
+            ],
+            [
+                'status' => 1,
+                'expected_count' => 1
+            ],
+        ];
+    }
+
     public static function tearDownAfterClass()
     {
         /** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
index abcfd795e137d..297414202f584 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
@@ -12,7 +12,6 @@
 /**
  * Test class for \Magento\Catalog\Model\Product\Attribute\Backend\Price.
  *
- * @magentoDbIsolation enabled
  * @magentoAppArea adminhtml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -60,6 +59,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     */
     public function testSetScopeDefault()
     {
         /* validate result of setAttribute */
@@ -75,7 +77,7 @@ public function testSetScopeDefault()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoConfigFixture current_store catalog/price/scope 1
      */
     public function testSetScope()
@@ -88,7 +90,7 @@ public function testSetScope()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoConfigFixture current_store catalog/price/scope 1
      * @magentoConfigFixture current_store currency/options/base GBP
@@ -110,7 +112,7 @@ public function testAfterSave()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
      * @magentoConfigFixture current_store catalog/price/scope 1
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
      */
     public function testAfterSaveWithDifferentStores()
@@ -148,7 +150,7 @@ public function testAfterSaveWithDifferentStores()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
      * @magentoConfigFixture current_store catalog/price/scope 1
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
      */
     public function testAfterSaveWithSameCurrency()
@@ -184,7 +186,7 @@ public function testAfterSaveWithSameCurrency()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
@@ -236,7 +238,7 @@ public function testAfterSaveWithUseDefault()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
index 1a0439fccacbf..973d290d61466 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -11,6 +13,7 @@
  * Test class for \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice.
  *
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TierpriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -24,6 +27,11 @@ class TierpriceTest extends \PHPUnit\Framework\TestCase
      */
     protected $productRepository;
 
+    /**
+     * @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory
+     */
+    private $tierPriceFactory;
+
     /**
      * @var \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice
      */
@@ -40,6 +48,9 @@ protected function setUp()
         $this->metadataPool = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Framework\EntityManager\MetadataPool::class
         );
+        $this->tierPriceFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
+
         $this->_model->setAttribute(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
                 \Magento\Eav\Model\Config::class
@@ -57,27 +68,49 @@ public function testValidate()
             [
                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
                 ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
+                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5.6, 'price' => 4],
             ]
         );
         $this->assertTrue($this->_model->validate($product));
     }
 
     /**
+     * Test that duplicated tier price values issues exception during validation.
+     *
+     * @dataProvider validateDuplicateDataProvider
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
-    public function testValidateDuplicate()
+    public function testValidateDuplicate(array $tierPricesData)
     {
         $product = new \Magento\Framework\DataObject();
-        $product->setTierPrice(
-            [
-                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-            ]
-        );
+        $product->setTierPrice($tierPricesData);
 
         $this->_model->validate($product);
     }
 
+    /**
+     * testValidateDuplicate data provider.
+     *
+     * @return array
+     */
+    public function validateDuplicateDataProvider(): array
+    {
+        return [
+            [
+                [
+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
+                ],
+            ],
+            [
+                [
+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
+                    ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
+                ],
+            ],
+        ];
+    }
+
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      */
@@ -86,9 +119,9 @@ public function testValidateDuplicateWebsite()
         $product = new \Magento\Framework\DataObject();
         $product->setTierPrice(
             [
-                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
-                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
-                ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
+                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2.2, 'price' => 8],
+                ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 5],
+                ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 5],
             ]
         );
 
@@ -116,12 +149,17 @@ public function testPreparePriceData()
             ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 2, 'price' => 8],
             ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
             ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5, 'price' => 5],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.3, 'price' => 4],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => 5.4, 'price' => 3],
+            ['website_id' => 1, 'cust_group' => 1, 'price_qty' => '5.40', 'price' => 2],
         ];
 
         $newData = $this->_model->preparePriceData($data, \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE, 1);
-        $this->assertEquals(2, count($newData));
+        $this->assertEquals(4, count($newData));
         $this->assertArrayHasKey('1-2', $newData);
         $this->assertArrayHasKey('1-5', $newData);
+        $this->assertArrayHasKey('1-5.3', $newData);
+        $this->assertArrayHasKey('1-5.4', $newData);
     }
 
     public function testAfterLoad()
@@ -137,87 +175,163 @@ public function testAfterLoad()
         $this->_model->afterLoad($product);
         $price = $product->getTierPrice();
         $this->assertNotEmpty($price);
-        $this->assertEquals(4, count($price));
+        $this->assertEquals(5, count($price));
     }
 
     /**
-     * @magentoAppArea adminhtml
-     * @param array $tierPrice
-     * @param bool $isChanged
-     * @param int $tierPriceCtr
-     * @dataProvider afterSaveDataProvider
+     * @dataProvider saveExistingProductDataProvider
+     * @param array $tierPricesData
+     * @param int $tierPriceCount
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
-    public function testAfterSave($tierPrice, $isChanged, $tierPriceCtr)
+    public function testSaveExistingProduct(array $tierPricesData, int $tierPriceCount): void
     {
         /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $product->load($this->productRepository->get('simple')->getId());
-        $product->unlockAttributes();
-        // Added tier price
-        $product->setTierPrice($tierPrice);
-
-        $this->_model->afterSave($product);
-        $this->assertEquals($isChanged, $product->getData('tier_price_changed'));
-
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $fixtureProduct = $this->productRepository->get('simple');
-        $product->setId($fixtureProduct->getId());
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-        $product->setData($linkField, $fixtureProduct->getData($linkField));
-        $this->_model->afterLoad($product);
-        $this->assertEquals($tierPriceCtr, count($product->getTierPrice()));
+        $product = $this->productRepository->get('simple', true);
+        $tierPrices = [];
+        foreach ($tierPricesData as $tierPrice) {
+            $tierPrices[] = $this->tierPriceFactory->create([
+                'data' => $tierPrice
+            ]);
+        }
+        $product->setTierPrices($tierPrices);
+        $product = $this->productRepository->save($product);
+        $this->assertEquals($tierPriceCount, count($product->getTierPrice()));
         $this->assertEquals(0, $product->getData('tier_price_changed'));
     }
 
-    public function afterSaveDataProvider()
+    /**
+     * @return array
+     */
+    public function saveExistingProductDataProvider(): array
     {
         return [
             'same' => [
                 [
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8],
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 50],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3.2, 'value' => 6],
+                    [
+                        'website_id' => 0,
+                        'customer_group_id' => 0,
+                        'qty' => 10,
+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                    ],
                 ],
-                0,
-                4,
+                5,
             ],
             'update one' => [
                 [
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8],
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 10],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.2', 'value' => 6],
+                    [
+                        'website_id' => 0,
+                        'customer_group_id' => 0,
+                        'qty' => 10,
+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 10])
+                    ],
                 ],
-                1,
-                4,
+                5,
             ],
             'delete one' => [
                 [
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8, 'delete' => true],
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 50],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.2', 'value' => 6],
+                    [
+                        'website_id' => 0,
+                        'customer_group_id' => 0,
+                        'qty' => 10,
+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                    ],
                 ],
-                1,
-                3,
+                4,
             ],
             'add one' => [
                 [
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 2, 'price' => 8],
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 5, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 32000, 'price_qty' => 20, 'percentage_value' => 90],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 5],
-                    ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 10, 'percentage_value' => 50],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3.2, 'value' => 6],
+                    [
+                        'website_id' => 0,
+                        'customer_group_id' => 32000,
+                        'qty' => 20,
+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 90])
+                    ],
+                    [
+                        'website_id' => 0,
+                        'customer_group_id' => 0,
+                        'qty' => 10,
+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                    ],
                 ],
-                1,
-                5,
+                6,
+            ],
+            'delete all' => [[], 0,],
+        ];
+    }
+
+    /**
+     * @dataProvider saveNewProductDataProvider
+     * @param array $tierPricesData
+     * @param int $tierPriceCount
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    public function testSaveNewProduct(array $tierPricesData, int $tierPriceCount): void
+    {
+        /** @var $product \Magento\Catalog\Model\Product */
+        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Model\Product::class);
+        $product->isObjectNew(true);
+        $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+            ->setAttributeSetId(4)
+            ->setName('Simple Product New')
+            ->setSku('simple product new')
+            ->setPrice(10);
+        $tierPrices = [];
+        foreach ($tierPricesData as $tierPrice) {
+            $tierPrices[] = $this->tierPriceFactory->create([
+                'data' => $tierPrice,
+            ]);
+        }
+        $product->setTierPrices($tierPrices);
+        $product = $this->productRepository->save($product);
+        $this->assertEquals($tierPriceCount, count($product->getTierPrice()));
+        $this->assertEquals(0, $product->getData('tier_price_changed'));
+    }
+
+    /**
+     * @return array
+     */
+    public function saveNewProductDataProvider(): array
+    {
+        return [
+            [
+                [
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 2, 'value' => 8],
+                    ['website_id' => 0, 'customer_group_id' => 32000, 'qty' => 5, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => 3, 'value' => 5],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.2', 'value' => 4],
+                    ['website_id' => 0, 'customer_group_id' => 0, 'qty' => '3.3', 'value' => 3],
+                    [
+                        'website_id' => 0,
+                        'customer_group_id' => 0,
+                        'qty' => 10,
+                        'extension_attributes' => new \Magento\Framework\DataObject(['percentage_value' => 50])
+                    ],
+                ],
+                6,
             ],
-            'delete all' => [[], 1, 0,],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/CreateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/CreateHandlerTest.php
index 0ce6f057ece46..7421402455b28 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/CreateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/CreateHandlerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Gallery;
 
 use Magento\Framework\Exception\FileSystemException;
@@ -84,7 +85,7 @@ public function testExecuteWithIllegalFilename($imageFileName)
         try {
             $this->createHandler->execute($product);
         } catch (FileSystemException $exception) {
-            $this->assertContains('doesn\'t exist or not a file', $exception->getLogMessage());
+            $this->assertContains(" file doesn't exist.", $exception->getLogMessage());
             $this->assertNotContains('../', $exception->getLogMessage());
             throw $exception;
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
new file mode 100644
index 0000000000000..559dd6d1b747d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Gallery;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Test for \Magento\Catalog\Model\Product\Gallery\UpdateHandler.
+ *
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDataFixture Magento/Catalog/_files/product_image.php
+ */
+class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var UpdateHandler
+     */
+    private $updateHandler;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var string
+     */
+    private $fileName;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->fileName = 'image.txt';
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->updateHandler = $this->objectManager->create(UpdateHandler::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->mediaDirectory->writeFile($this->fileName, 'Test');
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithIllegalFilename(): void
+    {
+        $filePath = str_repeat('/..', 2) . DIRECTORY_SEPARATOR . $this->fileName;
+
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $product->load(1);
+        $product->setData(
+            'media_gallery',
+            [
+                'images' => [
+                    'image' => [
+                        'value_id' => '100',
+                        'file' => $filePath,
+                        'label' => 'New image',
+                        'removed' => 1,
+                    ],
+                ],
+            ]
+        );
+
+        $this->updateHandler->execute($product);
+        $this->assertFileExists($this->mediaDirectory->getAbsolutePath($this->fileName));
+    }
+
+    /**
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath($this->fileName));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php
index eb32fb98ce8fe..37fee97161b2d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php
@@ -21,8 +21,8 @@ public function testSetBaseFilePlaceholder()
         $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Product\Image::class
         );
-        /** @var \Magento\Catalog\Model\View\Asset\Placeholder $defualtPlaceholder */
-        $defualtPlaceholder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        /** @var \Magento\Catalog\Model\View\Asset\Placeholder $defaultPlaceholder */
+        $defaultPlaceholder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(
                 \Magento\Catalog\Model\View\Asset\Placeholder::class,
                 ['type' => 'image']
@@ -30,7 +30,7 @@ public function testSetBaseFilePlaceholder()
 
         $model->setDestinationSubdir('image');
         $model->setBaseFile('');
-        $this->assertEquals($defualtPlaceholder->getSourceFile(), $model->getBaseFile());
+        $this->assertEquals($defaultPlaceholder->getSourceFile(), $model->getBaseFile());
         return $model;
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
index 4a8ff84ecfaa5..37ef60208861d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
+use Magento\Framework\Math\Random;
+
 /**
  * @magentoDataFixture Magento/Catalog/_files/validate_image.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -47,11 +50,18 @@ protected function setUp()
         $fileSize = $this->objectManager->create(\Magento\Framework\File\Size::class);
         $this->maxFileSize = $fileSize->getMaxFileSize();
         $this->maxFileSizeInMb = $fileSize->getMaxFileSizeInMb();
+        $random = $this->getMockBuilder(Random::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $random->expects($this->any())
+            ->method('getRandomString')
+            ->willReturn('RandomString');
 
         $this->model = $this->objectManager->create(
-            \Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::class,
+            ValidatorFile::class,
             [
-                'httpFactory' => $this->httpFactoryMock
+                'httpFactory' => $this->httpFactoryMock,
+                'random' => $random,
             ]
         );
     }
@@ -77,9 +87,11 @@ public function testRunValidationException()
      */
     public function testLargeSizeFile()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('The file you uploaded is larger than %s Megabytes allowed by server', $this->maxFileSizeInMb)
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $exceptionMessage = 'The file was too big and couldn\'t be uploaded. Use a file smaller than %s MBs and try ' .
+            'to upload again.';
+        $this->expectExceptionMessage(
+            sprintf($exceptionMessage, $this->maxFileSizeInMb)
         );
         $this->prepareEnv();
         $_SERVER['CONTENT_LENGTH'] = $this->maxFileSize + 1;
@@ -124,7 +136,6 @@ public function testOptionRequiredException()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please specify product's required option(s).
      * @return void
      */
     public function testException()
@@ -141,6 +152,10 @@ public function testException()
             $this->objectManager->create(\Magento\Framework\DataObject::class),
             $this->getProductOption()
         );
+
+        $this->expectExceptionMessage(
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again."
+        );
     }
 
     /**
@@ -148,8 +163,8 @@ public function testException()
      */
     public function testInvalidateFile()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(
             "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n"
             . "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n"
             . "The maximum allowed image size for 'MediaOption' is 2000x2000 px.\n"
@@ -163,6 +178,13 @@ public function testInvalidateFile()
             \Zend_File_Transfer_Adapter_Http::class,
             ['isValid', 'getErrors', 'getFileInfo', 'isUploaded']
         );
+        $httpAdapterMock->expects($this->once())
+            ->method('getFileInfo')
+            ->willReturn([
+                'options_1_file' => [
+                    'name' => 'test.jpg'
+                ]
+            ]);
         $httpAdapterMock->expects($this->once())
             ->method('isValid')
             ->willReturn(false);
@@ -213,10 +235,8 @@ public function testEmptyFile()
     {
         $this->prepareEnvForEmptyFile();
 
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            'The file is empty. Please choose another one'
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('The file is empty. Select another file and try again.');
 
         $httpAdapterMock = $this->createPartialMock(\Zend_File_Transfer_Adapter_Http::class, ['isValid']);
         $httpAdapterMock->expects($this->once())->method('isValid')->will($this->returnValue(true));
@@ -339,8 +359,8 @@ protected function expectedValidate()
         return [
             'type' => 'image/jpeg',
             'title' => 'test.jpg',
-            'quote_path' => 'custom_options/quote/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
-            'order_path' => 'custom_options/order/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
+            'quote_path' => 'custom_options/quote/t/e/RandomString',
+            'order_path' => 'custom_options/order/t/e/RandomString',
             'size' => '3046',
             'width' => 136,
             'height' => 131,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php
index 001b261f9cfd5..d4214a32f31dc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
 /**
@@ -29,6 +30,9 @@ class ValidatorInfoTest extends \PHPUnit\Framework\TestCase
      */
     protected $validateFactoryMock;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -53,8 +57,8 @@ protected function setUp()
      */
     public function testExceptionWithErrors()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(
             "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n"
             . "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n"
             . "The maximum allowed image size for 'MediaOption' is 2000x2000 px.\n"
@@ -87,9 +91,9 @@ public function testExceptionWithErrors()
      */
     public function testExceptionWithoutErrors()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            "Please specify product's required option(s)."
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again."
         );
 
         $validateMock = $this->createPartialMock(\Zend_Validate::class, ['isValid', 'getErrors']);
@@ -110,11 +114,11 @@ public function testExceptionWithoutErrors()
      */
     public function testValidate()
     {
-        $validateMock = $this->createPartialMock(\Zend_Validate::class, ['isValid']);
-        $validateMock->expects($this->once())->method('isValid')->will($this->returnValue(true));
+        //use actual zend class to test changed functionality
+        $validate = $this->objectManager->create(\Zend_Validate::class);
         $this->validateFactoryMock->expects($this->once())
             ->method('create')
-            ->will($this->returnValue($validateMock));
+            ->will($this->returnValue($validate));
         $this->assertTrue(
             $this->model->validate(
                 $this->getOptionValue(),
@@ -175,7 +179,7 @@ protected function getOptionValue()
         $filePath = $tmpDirectory->getAbsolutePath($file);
 
         return [
-            'title'      => 'test.jpg',
+            'title' => 'test.jpg',
             'quote_path' => $file,
             'order_path' => $file,
             'secret_key' => substr(md5(file_get_contents($filePath)), 0, 20),
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 0000000000000..c9d5ed732df2e
--- /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/Product/Type/AbstractTypeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
index 936574642d093..c668e82c0bfa0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Product\Type;
 
 /**
@@ -199,7 +200,7 @@ public function testPrepareForCartOptionsException()
         // fixture
 
         $this->assertContains(
-            'Please specify product\'s required option(s).',
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again.",
             $this->_model->prepareForCart(new \Magento\Framework\DataObject(), $product)
         );
     }
@@ -207,7 +208,7 @@ public function testPrepareForCartOptionsException()
     public function testGetSpecifyOptionMessage()
     {
         $this->assertEquals(
-            'Please specify product\'s required option(s).',
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again.",
             $this->_model->getSpecifyOptionMessage()
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
new file mode 100644
index 0000000000000..280e83a863325
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Type;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DataObject;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoDbIsolation disabled
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @group indexer_dimension
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ */
+class PriceWithDimensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\Product\Type\Price
+     */
+    protected $_model;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->_model = Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\Product\Type\Price::class
+        );
+    }
+
+    /**
+     * Get price from indexer
+     */
+    public function testGetPriceFromIndexer()
+    {
+        /** @var PriceTableResolver $tableResolver */
+        $tableResolver = Bootstrap::getObjectManager()->create(PriceTableResolver::class);
+
+        /** @var ResourceConnection $resourceConnection */
+        $resourceConnection = Bootstrap::getObjectManager()->create(ResourceConnection::class);
+
+        /** @var DimensionFactory $dimensionFactory */
+        $dimensionFactory = Bootstrap::getObjectManager()->create(DimensionFactory::class);
+        $dimension = [
+            $dimensionFactory->create(CustomerGroupDimensionProvider::DIMENSION_NAME, (string)0),
+            $dimensionFactory->create(WebsiteDimensionProvider::DIMENSION_NAME, (string)1)
+        ];
+        $connection = $resourceConnection->getConnection();
+        $priceTable = $connection->getTableName(
+            $tableResolver->resolve('catalog_product_index_price', $dimension)
+        );
+
+        $select = $connection->select()->from($priceTable)->where('entity_id = 1');
+
+        $return = $connection->fetchAll($select);
+
+        $this->assertEquals('10', $return[0]['price']);
+        $this->assertEquals('10', $return[0]['final_price']);
+        $this->assertEquals('19', $return[0]['min_price']);
+        $this->assertEquals('19', $return[0]['max_price']);
+    }
+
+    /**
+     * Get price
+     */
+    public function testGetPrice()
+    {
+        $this->assertEquals('test', $this->_model->getPrice(new DataObject(['price' => 'test'])));
+    }
+
+    /**
+     * Get final price
+     */
+    public function testGetFinalPrice()
+    {
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
+        );
+        $product = $repository->get('simple');
+        // fixture
+
+        // regular & tier prices
+        $this->assertEquals(10.0, $this->_model->getFinalPrice(1, $product));
+        $this->assertEquals(8.0, $this->_model->getFinalPrice(2, $product));
+        $this->assertEquals(5.0, $this->_model->getFinalPrice(5, $product));
+
+        // with options
+        $buyRequest = $this->prepareBuyRequest($product);
+        $product->getTypeInstance()->prepareForCart($buyRequest, $product);
+
+        //product price + options price(10+1+2+3+3)
+        $this->assertEquals(19.0, $this->_model->getFinalPrice(1, $product));
+
+        //product tier price + options price(5+1+2+3+3)
+        $this->assertEquals(14.0, $this->_model->getFinalPrice(5, $product));
+    }
+
+    /**
+     * Get formated price
+     */
+    public function testGetFormatedPrice()
+    {
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
+        );
+        $product = $repository->get('simple');
+        // fixture
+        $this->assertEquals('<span class="price">$10.00</span>', $this->_model->getFormatedPrice($product));
+    }
+
+    /**
+     * Calculate price
+     */
+    public function testCalculatePrice()
+    {
+        $this->assertEquals(10, $this->_model->calculatePrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01'));
+        $this->assertEquals(8, $this->_model->calculatePrice(10, 8, '1970-12-12 23:59:59', '2034-01-01 01:01:01'));
+    }
+
+    /**
+     * Calculate special price
+     */
+    public function testCalculateSpecialPrice()
+    {
+        $this->assertEquals(
+            10,
+            $this->_model->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01')
+        );
+        $this->assertEquals(
+            8,
+            $this->_model->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '2034-01-01 01:01:01')
+        );
+    }
+
+    /**
+     * Is tier price fixed
+     */
+    public function testIsTierPriceFixed()
+    {
+        $this->assertTrue($this->_model->isTierPriceFixed());
+    }
+
+    /**
+     * Build buy request based on product custom options
+     *
+     * @param Product $product
+     * @return DataObject
+     */
+    private function prepareBuyRequest(Product $product)
+    {
+        $options = [];
+        /** @var $option \Magento\Catalog\Model\Product\Option */
+        foreach ($product->getOptions() as $option) {
+            switch ($option->getGroupByType()) {
+                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_DATE:
+                    $value = ['year' => 2013, 'month' => 8, 'day' => 9, 'hour' => 13, 'minute' => 35];
+                    break;
+                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT:
+                    $value = key($option->getValues());
+                    break;
+                default:
+                    $value = 'test';
+                    break;
+            }
+            $options[$option->getId()] = $value;
+        }
+
+        return new DataObject(['qty' => 1, 'options' => $options]);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/TypeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/TypeTest.php
index 7fe5fbc6303ad..dadee3d9b6fac 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/TypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/TypeTest.php
@@ -20,7 +20,7 @@ protected function setUp()
     }
 
     /**
-     * @param sring|null $typeId
+     * @param string|null $typeId
      * @param string $expectedClass
      * @dataProvider factoryDataProvider
      */
@@ -52,7 +52,7 @@ public function factoryDataProvider()
     }
 
     /**
-     * @param sring|null $typeId
+     * @param string|null $typeId
      * @dataProvider factoryReturnsSingletonDataProvider
      */
     public function testFactoryReturnsSingleton($typeId)
@@ -82,7 +82,7 @@ public function factoryReturnsSingletonDataProvider()
     }
 
     /**
-     * @param sring|null $typeId
+     * @param string|null $typeId
      * @param string $expectedClass
      * @dataProvider priceFactoryDataProvider
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
index 8370e514dc2f2..a1923e63972ee 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
@@ -69,7 +69,7 @@ public function testGetCategoryId()
     {
         $this->assertFalse($this->_model->getCategoryId());
         $category = new \Magento\Framework\DataObject(['id' => 5]);
-
+        $this->_model->setCategoryIds([5]);
         $this->objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
         try {
             $this->assertEquals(5, $this->_model->getCategoryId());
@@ -83,6 +83,7 @@ public function testGetCategoryId()
     public function testGetCategory()
     {
         $this->assertEmpty($this->_model->getCategory());
+        $this->_model->setCategoryIds([3]);
 
         $this->objectManager->get(\Magento\Framework\Registry::class)
             ->register('current_category', new \Magento\Framework\DataObject(['id' => 3]));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
index 74f640a021284..1ed0057ca2486 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
@@ -25,11 +26,19 @@ class ProductGettersTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     protected function setUp()
     {
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Product::class
         );
+        $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            ProductRepositoryInterface::class
+        );
     }
 
     public function testGetResourceCollection()
@@ -198,6 +207,24 @@ public function testGetAttributeText()
         $this->assertEquals('Enabled', $this->_model->getAttributeText('status'));
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+     */
+    public function testGetAttributeTextArray()
+    {
+        $product = $this->productRepository->get('simple_ms_2');
+        $product->getAttributeText('multiselect_attribute');
+        $expected = [
+            'Option 2',
+            'Option 3',
+            'Option 4 "!@#$%^&*'
+        ];
+        self::assertEquals(
+            $expected,
+            $product->getAttributeText('multiselect_attribute')
+        );
+    }
+
     public function testGetCustomDesignDate()
     {
         $this->assertEquals(['from' => null, 'to' => null], $this->_model->getCustomDesignDate());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
index 290b408419784..7b7a0591d1d97 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
@@ -3,6 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Catalog\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 
 /**
  * Tests product model:
@@ -11,8 +17,6 @@
  * @see \Magento\Catalog\Model\ProductTest
  * @see \Magento\Catalog\Model\ProductExternalTest
  */
-namespace Magento\Catalog\Model;
-
 class ProductPriceTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -20,13 +24,23 @@ class ProductPriceTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        $this->_model = Bootstrap::getObjectManager()->create(Product::class);
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
     }
 
+    /**
+     * @return void
+     */
     public function testGetPrice()
     {
         $this->assertEmpty($this->_model->getPrice());
@@ -34,6 +48,9 @@ public function testGetPrice()
         $this->assertEquals(10.0, $this->_model->getPrice());
     }
 
+    /**
+     * @return void
+     */
     public function testGetPriceModel()
     {
         $default = $this->_model->getPriceModel();
@@ -65,10 +82,55 @@ public function testGetFormatedPrice()
         $this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());
     }
 
+    /**
+     * @return void
+     */
     public function testSetGetFinalPrice()
     {
         $this->assertEquals(0, $this->_model->getFinalPrice());
+        $this->_model->setPrice(10);
         $this->_model->setFinalPrice(10);
         $this->assertEquals(10, $this->_model->getFinalPrice());
     }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
+     * @return void
+     */
+    public function testGetMinPrice(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($product->getId());
+        $collection->addPriceData();
+        $collection->load();
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $collection->getFirstItem();
+        $this->assertEquals(323, $product->getData('min_price'));
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
+     */
+    public function testGetMinPriceForComposite(): void
+    {
+        $confProduct = $this->productRepository->get('configurable');
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($confProduct->getId());
+        $collection->addPriceData();
+        $collection->load();
+        $product = $collection->getFirstItem();
+        $this->assertEquals(10, $product->getData('min_price'));
+
+        $childProduct = $this->productRepository->get('simple_10');
+        $stockRegistry = Bootstrap::getObjectManager()->get(StockRegistryInterface::class);
+        $stockItem = $stockRegistry->getStockItem($childProduct->getId());
+        $stockItem->setIsInStock(false);
+        $stockRegistry->updateStockItemBySku($childProduct->getSku(), $stockItem);
+        $collection->clear()->load();
+        $product = $collection->getFirstItem();
+        $this->assertEquals(20, $product->getData('min_price'));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
new file mode 100644
index 0000000000000..348d6e19b44e3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+
+/**
+ * Tests product model:
+ * - pricing behaviour is tested
+ * @group indexer_dimension
+ * @magentoDbIsolation disabled
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @see \Magento\Catalog\Model\ProductTest
+ * @see \Magento\Catalog\Model\ProductExternalTest
+ */
+class ProductPriceWithDimensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\Product
+     */
+    protected $_model;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->_model = Bootstrap::getObjectManager()->create(Product::class);
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Get price
+     */
+    public function testGetPrice()
+    {
+        $this->assertEmpty($this->_model->getPrice());
+        $this->_model->setPrice(10.0);
+        $this->assertEquals(10.0, $this->_model->getPrice());
+    }
+
+    /**
+     * Get price model
+     */
+    public function testGetPriceModel()
+    {
+        $default = $this->_model->getPriceModel();
+        $this->assertInstanceOf(\Magento\Catalog\Model\Product\Type\Price::class, $default);
+        $this->assertSame($default, $this->_model->getPriceModel());
+    }
+
+    /**
+     * See detailed tests at \Magento\Catalog\Model\Product\Type*_PriceTest
+     */
+    public function testGetTierPrice()
+    {
+        $this->assertEquals([], $this->_model->getTierPrice());
+    }
+
+    /**
+     * See detailed tests at \Magento\Catalog\Model\Product\Type*_PriceTest
+     */
+    public function testGetTierPriceCount()
+    {
+        $this->assertEquals(0, $this->_model->getTierPriceCount());
+    }
+
+    /**
+     * See detailed tests at \Magento\Catalog\Model\Product\Type*_PriceTest
+     */
+    public function testGetFormatedPrice()
+    {
+        $this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());
+    }
+
+    /**
+     * Set get final price
+     */
+    public function testSetGetFinalPrice()
+    {
+        $this->assertEquals(0, $this->_model->getFinalPrice());
+        $this->_model->setPrice(10);
+        $this->_model->setFinalPrice(10);
+        $this->assertEquals(10, $this->_model->getFinalPrice());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
+     * @return void
+     */
+    public function testGetMinPrice(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($product->getId());
+        $collection->addPriceData();
+        $collection->load();
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $collection->getFirstItem();
+        $this->assertEquals(323, $product->getData('min_price'));
+    }
+
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
+     */
+    public function testGetMinPriceForComposite()
+    {
+        $confProduct = $this->productRepository->get('configurable');
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($confProduct->getId());
+        $collection->addPriceData();
+        $collection->load();
+        $product = $collection->getFirstItem();
+        $this->assertEquals(10, $product->getData('min_price'));
+
+        $childProduct = $this->productRepository->get('simple_10');
+        $stockRegistry = Bootstrap::getObjectManager()->get(StockRegistryInterface::class);
+        $stockItem = $stockRegistry->getStockItem($childProduct->getId());
+        $stockItem->setIsInStock(false);
+        $stockRegistry->updateStockItemBySku($childProduct->getSku(), $stockItem);
+        $collection->clear()->load();
+        $product = $collection->getFirstItem();
+        $this->assertEquals(20, $product->getData('min_price'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
new file mode 100644
index 0000000000000..d4016b2bfa8d4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Provide tests for ProductRepository model.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
+class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * Sets up common objects
+     */
+    protected function setUp()
+    {
+        $this->productRepository = \Magento\Framework\App\ObjectManager::getInstance()->create(
+            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        );
+
+        $this->searchCriteriaBuilder = \Magento\Framework\App\ObjectManager::getInstance()->create(
+            \Magento\Framework\Api\SearchCriteriaBuilder::class
+        );
+    }
+
+    /**
+     * Checks filtering by store_id
+     *
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     */
+    public function testFilterByStoreId()
+    {
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter('store_id', '1', 'eq')
+            ->create();
+        $list = $this->productRepository->getList($searchCriteria);
+        $count = $list->getTotalCount();
+
+        $this->assertGreaterThanOrEqual(1, $count);
+    }
+
+    /**
+     * Check a case when product should be retrieved with different SKU variations.
+     *
+     * @param string $sku
+     * @return void
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @dataProvider skuDataProvider
+     */
+    public function testGetProduct(string $sku) : void
+    {
+        $expectedSku = 'simple';
+        $product = $this->productRepository->get($sku);
+
+        self::assertNotEmpty($product);
+        self::assertEquals($expectedSku, $product->getSku());
+    }
+
+    /**
+     * Get list of SKU variations for the same product.
+     *
+     * @return array
+     */
+    public function skuDataProvider(): array
+    {
+        return [
+            ['sku' => 'simple'],
+            ['sku' => 'Simple'],
+            ['sku' => 'simple '],
+        ];
+    }
+
+    /**
+     * Test save product with gallery image
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_image.php
+     *
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    public function testSaveProductWithGalleryImage(): void
+    {
+        /** @var $mediaConfig \Magento\Catalog\Model\Product\Media\Config */
+        $mediaConfig = Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Model\Product\Media\Config::class);
+
+        /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+        $mediaDirectory = Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+
+        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+        $product->load(1);
+
+        $path = $mediaConfig->getBaseMediaPath() . '/magento_image.jpg';
+        $absolutePath = $mediaDirectory->getAbsolutePath() . $path;
+        $product->addImageToMediaGallery($absolutePath, [
+            'image',
+            'small_image',
+        ], false, false);
+
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository->save($product);
+
+        $gallery = $product->getData('media_gallery');
+        $this->assertArrayHasKey('images', $gallery);
+        $images = array_values($gallery['images']);
+
+        $this->assertNotEmpty($gallery);
+        $this->assertTrue(isset($images[0]['file']));
+        $this->assertStringStartsWith('/m/a/magento_image', $images[0]['file']);
+        $this->assertArrayHasKey('media_type', $images[0]);
+        $this->assertEquals('image', $images[0]['media_type']);
+        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('image'));
+        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('small_image'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index 99a1e9309f6e9..c34120404a950 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -17,6 +20,8 @@
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyMethods)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
@@ -30,6 +35,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
@@ -40,6 +48,10 @@ protected function setUp()
         );
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @return void
+     */
     public static function tearDownAfterClass()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -61,6 +73,9 @@ public static function tearDownAfterClass()
         }
     }
 
+    /**
+     * @return void
+     */
     public function testCanAffectOptions()
     {
         $this->assertFalse($this->_model->canAffectOptions());
@@ -100,6 +115,9 @@ public function testCRUD()
         $crud->testCrud();
     }
 
+    /**
+     * @return void
+     */
     public function testCleanCache()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -120,6 +138,9 @@ public function testCleanCache()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testAddImageToMediaGallery()
     {
         // Model accepts only files in tmp media path, we need to copy fixture file there
@@ -327,6 +348,9 @@ public function testIsVirtual()
         $this->assertTrue($model->getIsVirtual());
     }
 
+    /**
+     * @return void
+     */
     public function testToArray()
     {
         $this->assertEquals([], $this->_model->toArray());
@@ -334,6 +358,9 @@ public function testToArray()
         $this->assertEquals(['sku' => 'sku', 'name' => 'name'], $this->_model->toArray());
     }
 
+    /**
+     * @return void
+     */
     public function testFromArray()
     {
         $this->_model->fromArray(['sku' => 'sku', 'name' => 'name', 'stock_item' => ['key' => 'value']]);
@@ -405,6 +432,9 @@ public function testIsProductsHasSku()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testProcessBuyRequest()
     {
         $request = new \Magento\Framework\DataObject();
@@ -413,6 +443,9 @@ public function testProcessBuyRequest()
         $this->assertArrayHasKey('errors', $result->getData());
     }
 
+    /**
+     * @return void
+     */
     public function testValidate()
     {
         $this->_model->setTypeId(
@@ -481,8 +514,10 @@ public function testValidateUniqueInputAttributeValue()
 
         $validationResult = $this->_model->validate();
         $this->assertCount(1, $validationResult);
+
         $this->assertContains(
-            'The value of attribute "' . $attribute->getDefaultFrontendLabel() . '" must be unique',
+            'The value of the "' . $attribute->getDefaultFrontendLabel() .
+            '" attribute isn\'t unique. Set a unique value and try again.',
             $validationResult
         );
     }
@@ -529,6 +564,8 @@ public function testValidateUniqueInputAttributeOnTheSameProduct()
     }
 
     /**
+     * Tests Customizable Options price values including negative value.
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_options.php
      * @magentoAppIsolation enabled
      */
@@ -538,15 +575,61 @@ public function testGetOptions()
         $options = $this->_model->getOptions();
         $this->assertNotEmpty($options);
         $expectedValue = [
-            '3-1-select' => 3000.00,
+            '3-1-select' => -3000.00,
             '3-2-select' => 5000.00,
             '4-1-radio' => 600.234,
             '4-2-radio' => 40000.00
         ];
         foreach ($options as $option) {
+            if (!$option->getValues()) {
+                continue;
+            }
             foreach ($option->getValues() as $value) {
-                $this->assertEquals($expectedValue[$value->getSku()], floatval($value->getPrice()));
+                $this->assertEquals($expectedValue[$value->getSku()], (float)$value->getPrice());
             }
         }
     }
+
+    /**
+     * Check stock status changing if backorders functionality enabled.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider productWithBackordersDataProvider
+     * @param int $qty
+     * @param int $stockStatus
+     * @param bool $expectedStockStatus
+     *
+     * @return void
+     */
+    public function testSaveWithBackordersEnabled(int $qty, int $stockStatus, bool $expectedStockStatus): void
+    {
+        $product = $this->productRepository->get('simple-out-of-stock', true, null, true);
+        $stockItem = $product->getExtensionAttributes()->getStockItem();
+        $this->assertEquals(false, $stockItem->getIsInStock());
+        $stockData = [
+            'backorders' => 1,
+            'qty' => $qty,
+            'is_in_stock' => $stockStatus,
+        ];
+        $product->setStockData($stockData);
+        $product->save();
+        $stockItem = $product->getExtensionAttributes()->getStockItem();
+
+        $this->assertEquals($expectedStockStatus, $stockItem->getIsInStock());
+    }
+
+    /**
+     * DataProvider for the testSaveWithBackordersEnabled()
+     * @return array
+     */
+    public function productWithBackordersDataProvider(): array
+    {
+        return [
+            [0, 0, false],
+            [0, 1, true],
+            [-1, 0, false],
+            [-1, 1, true],
+            [1, 1, true],
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizerTest.php
index 2899066574f8b..4857bb0dcc86b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizerTest.php
@@ -52,6 +52,7 @@ public function setUp()
 
     /**
      * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_flag.php
+     * @magentoDbIsolation disabled
      */
     public function testScheduleSynchronization()
     {
@@ -63,6 +64,7 @@ public function testScheduleSynchronization()
 
     /**
      * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
+     * @magentoDbIsolation disabled
      */
     public function testSynchronizeSuccess()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php
new file mode 100644
index 0000000000000..3b1c23e2ae10c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Category;
+
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
+     */
+    private $collection;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Category\Collection::class
+        );
+    }
+
+    protected function setDown()
+    {
+        /* Refresh stores memory cache after store deletion */
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        )->reinitStores();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+     */
+    public function testJoinUrlRewriteOnDefault()
+    {
+        $categories = $this->collection->joinUrlRewrite()->addPathFilter('1/2/3');
+        $this->assertCount(1, $categories);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $categories->getFirstItem();
+        $this->assertStringEndsWith('category.html', $category->getUrl());
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+     */
+    public function testJoinUrlRewriteNotOnDefaultStore()
+    {
+        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Store\Model\Store::class);
+        $storeId = $store->load('second_category_store', 'code')->getId();
+        $categories = $this->collection->setStoreId($storeId)->joinUrlRewrite()->addPathFilter('1/2/3');
+        $this->assertCount(1, $categories);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $categories->getFirstItem();
+        $this->assertStringEndsWith('category-3-on-2.html', $category->getUrl());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
index da47201fe6e38..904af7f334080 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
@@ -44,11 +44,13 @@ protected function setUp()
     /**
      * @magentoDataFixture Magento/Catalog/_files/products.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testAddPriceDataOnSchedule()
     {
         $this->processor->getIndexer()->setScheduled(true);
         $this->assertTrue($this->processor->getIndexer()->isScheduled());
+
         $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
@@ -80,7 +82,6 @@ public function testAddPriceDataOnSchedule()
         $product = reset($items);
         $this->assertCount(2, $items);
         $this->assertEquals(15, $product->getPrice());
-        $this->processor->getIndexer()->reindexList([1]);
 
         $this->processor->getIndexer()->setScheduled(false);
     }
@@ -88,6 +89,7 @@ public function testAddPriceDataOnSchedule()
     /**
      * @magentoDataFixture Magento/Catalog/_files/products.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testAddPriceDataOnSave()
     {
@@ -124,4 +126,76 @@ public function testGetProductsWithTierPrice()
         $this->assertEquals(50, $tierPrices[2]->getExtensionAttributes()->getPercentageValue());
         $this->assertEquals(5, $tierPrices[2]->getValue());
     }
+
+    /**
+     * Test addAttributeToSort() with attribute 'is_saleable' works properly on frontend.
+     *
+     * @dataProvider addAttributeToSortDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products_with_non_saleable_product.php
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
+     * @magentoAppIsolation enabled
+     * @magentoAppArea frontend
+     */
+    public function testAddAttributeToSort(string $productSku, string $order)
+    {
+        /** @var Collection $productCollection */
+        $this->collection->addAttributeToSort('is_saleable', $order);
+        self::assertEquals(2, $this->collection->count());
+        self::assertSame($productSku, $this->collection->getFirstItem()->getSku());
+    }
+
+    /**
+     * Provide test data for testAddAttributeToSort().
+     *
+     * @return array
+     */
+    public function addAttributeToSortDataProvider()
+    {
+        return [
+            [
+                'product_sku' => 'simple_saleable',
+                'order' => Collection::SORT_ORDER_DESC,
+            ],
+            [
+                'product_sku' => 'simple_not_saleable',
+                'order' => Collection::SORT_ORDER_ASC,
+            ]
+        ];
+    }
+
+    /**
+     * Checks a case if table for join specified as an array.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testJoinTable()
+    {
+        $this->collection->joinTable(
+            ['alias' => 'url_rewrite'],
+            'entity_id = entity_id',
+            ['request_path'],
+            '{{table}}.entity_type = \'product\'',
+            'left'
+        );
+        $sql = (string) $this->collection->getSelect();
+        $productTable = $this->collection->getTable('catalog_product_entity');
+        $urlRewriteTable = $this->collection->getTable('url_rewrite');
+
+        $expected = 'SELECT `e`.*, `alias`.`request_path` FROM `' . $productTable . '` AS `e`'
+            . ' LEFT JOIN `' . $urlRewriteTable . '` AS `alias` ON (alias.entity_id =e.entity_id)'
+            . ' AND (alias.entity_type = \'product\')';
+
+        self::assertContains($expected, str_replace(PHP_EOL, '', $sql));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
+     * @magentoDbIsolation enabled
+     */
+    public function testAddAttributeToFilterAffectsGetSize(): void
+    {
+        $this->assertEquals(10, $this->collection->getSize());
+        $this->collection->addAttributeToFilter('sku', 'Product1');
+        $this->assertEquals(1, $this->collection->getSize());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
index 14ae850062839..5cf6d00fe77ea 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\_files\MultiselectSourceMock;
 
 /**
  * Class SourceTest
@@ -53,6 +54,7 @@ protected function setUp()
      * Test reindex for configurable product with both disabled and enabled variations.
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testReindexEntitiesForConfigurableProduct()
     {
@@ -96,10 +98,26 @@ public function testReindexEntitiesForConfigurableProduct()
 
         $result = $connection->fetchAll($select);
         $this->assertCount(0, $result);
+
+        /** @var \Magento\Catalog\Model\Product $product1 **/
+        $product1 = $productRepository->getById(10);
+        $product1->setStatus(Status::STATUS_ENABLED)->setWebsiteIds([]);
+        $productRepository->save($product1);
+
+        /** @var \Magento\Catalog\Model\Product $product2 **/
+        $product2 = $productRepository->getById(20);
+        $product2->setStatus(Status::STATUS_ENABLED);
+        $productRepository->save($product2);
+
+        $statusSelect = clone $select;
+        $statusSelect->reset(\Magento\Framework\DB\Select::COLUMNS)
+            ->columns(new \Magento\Framework\DB\Sql\Expression('COUNT(*)'));
+        $this->assertEquals(1, $connection->fetchOne($statusSelect));
     }
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+     * @magentoDbIsolation disabled
      */
     public function testReindexMultiselectAttribute()
     {
@@ -140,4 +158,50 @@ public function testReindexMultiselectAttribute()
         $result = $connection->fetchAll($select);
         $this->assertCount(3, $result);
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
+     * @magentoDbIsolation disabled
+     */
+    public function testReindexMultiselectAttributeWithSourceModel()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
+        $attr = $objectManager->get(\Magento\Eav\Model\Config::class)
+           ->getAttribute('catalog_product', 'multiselect_attr_with_source');
+
+        /** @var $sourceModel MultiselectSourceMock */
+        $sourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            MultiselectSourceMock::class
+        );
+        $options = $sourceModel->getAllOptions();
+        $product1Id = $options[0]['value'] * 10;
+        $product2Id = $options[1]['value'] * 10;
+
+        /** @var \Magento\Catalog\Model\Product $product1 **/
+        $product1 = $productRepository->getById($product1Id);
+        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
+        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
+        $productRepository->save($product1);
+
+        /** @var \Magento\Catalog\Model\Product $product2 **/
+        $product2 = $productRepository->getById($product2Id);
+        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
+        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
+        $productRepository->save($product2);
+
+        $this->_eavIndexerProcessor->reindexAll();
+        $connection = $this->productResource->getConnection();
+        $select = $connection->select()
+            ->from($this->productResource->getTable('catalog_product_index_eav'))
+            ->where('entity_id in (?)', [$product1Id, $product2Id])
+            ->where('attribute_id = ?', $attr->getId());
+
+        $result = $connection->fetchAll($select);
+        $this->assertCount(3, $result);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
new file mode 100644
index 0000000000000..7954e2c36227f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\ResourceModel;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class ProductTest extends TestCase
+{
+    /**
+     * @var Product
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->model = $this->objectManager->get(Product::class);
+    }
+
+    /**
+     * Checks a possibility to retrieve product raw attribute value.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetAttributeRawValue()
+    {
+        $sku = 'simple';
+        $attribute = 'name';
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku);
+
+        $actual = $this->model->getAttributeRawValue($product->getId(), $attribute, null);
+        self::assertEquals($product->getName(), $actual);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
new file mode 100644
index 0000000000000..5ccace9086316
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/** @var \Magento\Catalog\Model\CategoryFactory $factory */
+$factory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\CategoryFactory::class
+);
+/** @var \Magento\Catalog\Model\CategoryRepository $repository */
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\CategoryRepository::class
+);
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Store\Model\StoreManagerInterface::class
+);
+/** @var \Magento\Store\Model\Store $store */
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if (!$store->load('second_category_store', 'code')->getId()) {
+    $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        \Magento\Store\Model\StoreManagerInterface::class
+    )->getWebsite()->getId();
+    $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        \Magento\Store\Model\StoreManagerInterface::class
+    )->getWebsite()->getDefaultGroupId();
+
+    $store->setCode(
+        'second_category_store'
+    )->setWebsiteId(
+        $websiteId
+    )->setGroupId(
+        $groupId
+    )->setName(
+        'Fixture Store'
+    )->setSortOrder(
+        10
+    )->setIsActive(
+        1
+    );
+    $store->save();
+}
+
+/** @var \Magento\Catalog\Model\Category $newCategory */
+$newCategory = $factory->create();
+$newCategory
+    ->setName('Category')
+    ->setParentId(2)
+    ->setLevel(2)
+    ->setPath('1/2/3')
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1);
+$repository->save($newCategory);
+$currentStoreId = $storeManager->getStore()->getId();
+$storeManager->setCurrentStore($storeManager->getStore($store->getId()));
+$newCategory->setUrlKey('category-3-on-2');
+$repository->save($newCategory);
+$storeManager->setCurrentStore($storeManager->getStore($currentStoreId));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
new file mode 100644
index 0000000000000..d8b24855ed1f6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/** @var Magento\Framework\ObjectManagerInterface $objcetManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->create(ProductFactory::class);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+// Create 10 products (with change this variable, don't forget to change the same in rollback)
+$productsAmount = 10;
+
+for ($i = 1; $i <= $productsAmount; $i++) {
+    $productArray = [
+        'data' => [
+            'name' => "Product{$i}",
+            'sku' => "Product{$i}",
+            'price' => 100,
+            'attribute_set_id' => 4,
+            'website_ids' => [1]
+        ]
+    ];
+    
+    $productRepository->save($productFactory->create($productArray));
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php
new file mode 100644
index 0000000000000..afe9483f63e19
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+
+/**
+ * Delete 10 products
+ */
+$productsAmount = 10;
+
+try {
+    for ($i = 1; $i <= $productsAmount; $i++) {
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get("Product{$i}", false, null, true);
+        $productRepository->delete($product);
+    }
+} catch (NoSuchEntityException $e) {
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/product_simple_rollback.php
new file mode 100644
index 0000000000000..556a0b57ca188
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/product_simple_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple products', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
index 9c55370156235..96a537f123d92 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
@@ -126,7 +126,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(AttributeStatus::STATUS_ENABLED)
     ->setWebsiteIds([$website->getId()])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 
 $product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_rollback.php
index 7505e3430d537..053450960bf89 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
@@ -45,8 +45,14 @@
 $storeGroupId = $store->getStoreGroupId();
 $websiteId = $store->getWebsiteId();
 
-$product = $productRepository->getById($productId);
-$productRepository->delete($product);
+try {
+    $product = $productRepository->getById($productId);
+    if ($product->getId()) {
+        $productRepository->delete($product);
+    }
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
 
 /**
  * Remove stores by code
@@ -76,12 +82,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/Pricing/Render/FinalPriceBoxTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
index c6d6c3cf42214..8e5b38a4f8802 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
@@ -68,6 +68,9 @@ class FinalPriceBoxTest extends \PHPUnit\Framework\TestCase
      */
     private $templateEnginePool;
 
+    /**
+     * Set up
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -125,7 +128,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_has_tier_price_show_as_low_as.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPrice()
@@ -136,7 +139,7 @@ public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPri
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_different_store_prices.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
index fd0f6e98840c9..22bb76ca9222d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Product;
 use Magento\TestFramework\Helper\CacheCleaner;
 
 /**
@@ -29,6 +30,8 @@ protected function setUp()
         $store = $objectManager->create(\Magento\Store\Model\Store::class);
         $store->load('admin');
         $registry->register('current_store', $store);
+        $product = $objectManager->create(Product::class);
+        $registry->register('current_product', $product);
         $this->object = $objectManager->create(Categories::class);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/MultiselectSourceMock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/MultiselectSourceMock.php
new file mode 100644
index 0000000000000..b9325622d8900
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/MultiselectSourceMock.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\_files;
+
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+
+/**
+ * Creates mock source for multiselect attributes
+ */
+class MultiselectSourceMock extends AbstractSource
+{
+
+    public function getAllOptions()
+    {
+        return [
+            ['value' => 1, 'label' => 'Option 1'],
+            ['value' => 2, 'label' => 'Option 2'],
+            ['value' => 3, 'label' => 'Option 3'],
+            ['value' => 4, 'label' => 'Option 4 "!@#$%^&*'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php
index 95f277c7124bd..8712bbb1f86cf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_product.php
@@ -7,5 +7,12 @@
 require __DIR__ . '/../../Eav/_files/empty_attribute_set.php';
 require __DIR__ . '/../../Catalog/_files/product_simple.php';
 
-$product->setAttributeSetId($attributeSet->getId());
-$product->save();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple', true, null, true);
+    $product->setAttributeSetId($attributeSet->getId());
+    $productRepository->save($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php
new file mode 100644
index 0000000000000..48c6fe4da60ce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$categoryFirst = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryFirst->setName('Category 1')
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+// products from this fixture were moved to indexer_catalog_products.php
+$categorySecond = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categorySecond->setName('"Category 6"')
+    ->setPath($categoryFirst->getPath())
+    ->setLevel(3)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index f6021487ec62d..a903274793c34 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -178,6 +178,7 @@
     ->setParentId(3)
     ->setPath('1/2/3/13')
     ->setLevel(3)
+    ->setDescription('Ololo')
     ->setAvailableSortBy('name')
     ->setDefaultSortBy('name')
     ->setIsActive(true)
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 8f35758df637c..46d5bfea6459c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
@@ -15,7 +15,7 @@
 )->setParentId(
     2
 )->setPath(
-    '1/2'
+    '1/2/444'
 )->setLevel(
     '2'
 )->setDefaultSortBy(
@@ -48,10 +48,10 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
+)->setCategoryIds(
     []
 )->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/category_duplicates_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates_rollback.php
new file mode 100644
index 0000000000000..ceaad3a00329f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates_rollback.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$categoryCollection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$categoryCollection
+    ->addAttributeToFilter('level', 2)
+    ->load()
+    ->delete();
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple3', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
index f55afc8c6a211..bb7e241d972e5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
@@ -32,8 +32,8 @@
             'is_filterable_in_search'       => 0,
             'is_used_for_promo_rules'       => 0,
             'is_html_allowed_on_front'      => 1,
-            'is_visible_on_front'           => 0,
-            'used_in_product_listing'       => 0,
+            'is_visible_on_front'           => 1,
+            'used_in_product_listing'       => 1,
             'used_for_sort_by'              => 0,
             'frontend_label'                => ['Drop-Down Attribute'],
             'backend_type'                  => 'varchar',
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
new file mode 100644
index 0000000000000..3e81373deea9d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/* @var \Magento\Framework\Indexer\IndexerInterface $model */
+$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Framework\Indexer\IndexerRegistry::class
+)->get('catalog_category_product');
+$model->setScheduled(true);
+
+$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Framework\Indexer\IndexerRegistry::class
+)->get('catalog_product_category');
+$model->setScheduled(true);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/enable_catalog_product_reindex_schedule_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/enable_catalog_product_reindex_schedule_rollback.php
new file mode 100644
index 0000000000000..429f89abb6ae7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/enable_catalog_product_reindex_schedule_rollback.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$indexerProcessor = Bootstrap::getObjectManager()->get(Processor::class);
+$indexerProcessor->getIndexer()->setScheduled(false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php
index 9f2045db66108..7d05f30337cc2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php
@@ -186,7 +186,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('5.99')
     ->save();
@@ -211,7 +211,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('15.99')
     ->save();
@@ -231,7 +231,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('25.99')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
index fa6e826eec70e..dcdbed7562fdb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
@@ -25,7 +25,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('5.99')
     ->save();
@@ -50,7 +50,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('15.99')
     ->save();
@@ -70,7 +70,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('25.99')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php
new file mode 100644
index 0000000000000..13b9870f24f66
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Catalog\Model\Category $category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(
+    300
+)->setCreatedAt(
+    '2014-06-23 09:50:07'
+)->setName(
+    'Category 300'
+)->setParentId(
+    2
+)->setPath(
+    '1/2/3'
+)->setLevel(
+    2
+)->setAvailableSortBy(
+    'name'
+)->setDefaultSortBy(
+    'name'
+)->setIsActive(
+    true
+)->setPosition(
+    1
+)->setAvailableSortBy(
+    ['position']
+)->save();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(64)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product OOS')
+    ->setSku('simple_oos')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setPrice(10)
+    ->setWeight(1)
+    ->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)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setCategoryIds([300])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0])
+    ->setSpecialPrice('5.99')
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(65)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product Not Visible')
+    ->setSku('simple2_not_visible')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_ON_GESTURE)
+    ->setPrice(20)
+    ->setWeight(1)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([300])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('15.99')
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(66)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product Visible and InStock')
+    ->setSku('simple_visible_in_stock')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setPrice(30)
+    ->setWeight(1)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([300])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('25.99')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock_rollback.php
new file mode 100644
index 0000000000000..1e7e459bc9c71
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock_rollback.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple_oos', 'simple2_not_visible', 'simple_visible_in_stock'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+        //Product already removed
+    }
+}
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->load(300);
+if ($category->getId()) {
+    $category->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_non_saleable_product.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_non_saleable_product.php
new file mode 100644
index 0000000000000..30b2aad2317c4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_non_saleable_product.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product')
+    ->setSku('simple_saleable')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setPrice(10)
+    ->setWeight(1)
+    ->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)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product2')
+    ->setSku('simple_not_saleable')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_ON_GESTURE)
+    ->setPrice(20)
+    ->setWeight(1)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 0])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_non_saleable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_non_saleable_product_rollback.php
new file mode 100644
index 0000000000000..220509698dc33
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_non_saleable_product_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple_saleable', 'simple_not_saleable'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+        //Product already removed
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
index 6ab607b5de88f..7dacdc42463a9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
@@ -12,45 +12,48 @@
 $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
 );
-$attribute->setData(
-    [
-        'attribute_code' => 'multiselect_attribute',
-        'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-        'is_global' => 1,
-        'is_user_defined' => 1,
-        'frontend_input' => 'multiselect',
-        'is_unique' => 0,
-        'is_required' => 0,
-        'is_searchable' => 0,
-        'is_visible_in_advanced_search' => 0,
-        'is_comparable' => 0,
-        'is_filterable' => 1,
-        'is_filterable_in_search' => 0,
-        'is_used_for_promo_rules' => 0,
-        'is_html_allowed_on_front' => 1,
-        'is_visible_on_front' => 0,
-        'used_in_product_listing' => 0,
-        'used_for_sort_by' => 0,
-        'frontend_label' => ['Multiselect Attribute'],
-        'backend_type' => 'varchar',
-        'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
-        'option' => [
-            'value' => [
-                'option_1' => ['Option 1'],
-                'option_2' => ['Option 2'],
-                'option_3' => ['Option 3'],
-                'option_4' => ['Option 4 "!@#$%^&*']
+$entityType = $installer->getEntityTypeId('catalog_product');
+if (!$attribute->loadByCode($entityType, 'multiselect_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'multiselect_attribute',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'multiselect',
+            'is_unique' => 0,
+            'is_required' => 0,
+            'is_searchable' => 0,
+            'is_visible_in_advanced_search' => 0,
+            'is_comparable' => 0,
+            'is_filterable' => 1,
+            'is_filterable_in_search' => 0,
+            'is_used_for_promo_rules' => 0,
+            'is_html_allowed_on_front' => 1,
+            'is_visible_on_front' => 0,
+            'used_in_product_listing' => 0,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Multiselect Attribute'],
+            'backend_type' => 'varchar',
+            'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+            'option' => [
+                'value' => [
+                    'option_1' => ['Option 1'],
+                    'option_2' => ['Option 2'],
+                    'option_3' => ['Option 3'],
+                    'option_4' => ['Option 4 "!@#$%^&*']
+                ],
+                'order' => [
+                    'option_1' => 1,
+                    'option_2' => 2,
+                    'option_3' => 3,
+                    'option_4' => 4,
+                ],
             ],
-            'order' => [
-                'option_1' => 1,
-                'option_2' => 2,
-                'option_3' => 3,
-                'option_4' => 4,
-            ],
-        ],
-    ]
-);
-$attribute->save();
+        ]
+    );
+    $attribute->save();
 
-/* Assign attribute to attribute set */
-$installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
new file mode 100644
index 0000000000000..6dcba90bf44fa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* Create attribute */
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Setup\CategorySetup::class
+);
+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+$entityType = $installer->getEntityTypeId('catalog_product');
+if (!$attribute->loadByCode($entityType, 'multiselect_attr_with_source')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'multiselect_attr_with_source',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'multiselect',
+            'is_unique' => 0,
+            'is_required' => 0,
+            'is_searchable' => 0,
+            'is_visible_in_advanced_search' => 0,
+            'is_comparable' => 0,
+            'is_filterable' => 1,
+            'is_filterable_in_search' => 0,
+            'is_used_for_promo_rules' => 0,
+            'is_html_allowed_on_front' => 1,
+            'is_visible_on_front' => 0,
+            'used_in_product_listing' => 0,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Multiselect Attribute with Source Model'],
+            'backend_type' => 'varchar',
+            'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+            'source_model' => \Magento\Catalog\_files\MultiselectSourceMock::class
+        ]
+    );
+    $attribute->save();
+
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php
new file mode 100644
index 0000000000000..9859e1ab4c78e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* Delete attribute  with multiselect_attribute code */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
+);
+$attribute->load('multiselect_attr_with_source', 'attribute_code');
+$attribute->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_multiple_categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_multiple_categories.php
new file mode 100644
index 0000000000000..c01d5dbbdd04c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_multiple_categories.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(
+    333
+)->setCreatedAt(
+    '2014-06-23 09:50:07'
+)->setName(
+    'Category 1'
+)->setParentId(
+    2
+)->setPath(
+    '1/2/3'
+)->setLevel(
+    2
+)->setAvailableSortBy(
+    'name'
+)->setDefaultSortBy(
+    'name'
+)->setIsActive(
+    true
+)->setPosition(
+    1
+)->setAvailableSortBy(
+    ['position']
+)->save();
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(4)
+    ->setName('Category 2')
+    ->setParentId(2)
+    ->setPath('1/2/4')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setIsAnchor(true)
+    ->setPosition(1)
+    ->save();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(
+    \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+    333
+)->setAttributeSetId(
+    4
+)->setStoreId(
+    1
+)->setWebsiteIds(
+    [1]
+)->setName(
+    'Simple Product Three'
+)->setSku(
+    'simple333'
+)->setPrice(
+    10
+)->setWeight(
+    18
+)->setStockData(
+    ['use_config_manage_stock' => 0]
+)->setCategoryIds(
+    [333, 4]
+)->setVisibility(
+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->save();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(
+    \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+)->setId(
+    334
+)->setAttributeSetId(
+    4
+)->setStoreId(
+    1
+)->setWebsiteIds(
+    [1]
+)->setName(
+    'Simple Product four'
+)->setSku(
+    'simple444'
+)->setPrice(
+    10
+)->setWeight(
+    18
+)->setStockData(
+    ['use_config_manage_stock' => 0]
+)->setCategoryIds(
+    [333, 4]
+)->setVisibility(
+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_multiple_categories_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_multiple_categories_rollback.php
new file mode 100644
index 0000000000000..52fc2311625b7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_multiple_categories_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->load(333);
+if ($product->getId()) {
+    $product->delete();
+}
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->load(334);
+if ($product->getId()) {
+    $product->delete();
+}
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->load(333);
+if ($category->getId()) {
+    $category->delete();
+}
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->load(4);
+if ($category->getId()) {
+    $category->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute.php
new file mode 100644
index 0000000000000..3d2dfcdff53e0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/**
+ * Create multiselect attribute
+ */
+require __DIR__ . '/multiselect_attribute.php';
+
+/** Create product with options out of stock and multiselect attribute */
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Setup\CategorySetup::class
+);
+
+/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$options->setAttributeFilter($attribute->getId());
+$optionIds = $options->getAllIds();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($optionIds[1] * 20)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('Out of Stock With Multiselect')
+    ->setSku('simple_ms_out_of_stock')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setMultiselectAttribute([$optionIds[1], $optionIds[2], $optionIds[3]])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 0,'is_in_stock' => 0])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute_rollback.php
new file mode 100644
index 0000000000000..d1926f4769f77
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/multiselect_attribute_rollback.php';
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Indexer\IndexerRegistry;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_ms_out_of_stock', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
+    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
+    ->reindexAll();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
index 1c8a4e64cdfdb..514c6563622c9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
@@ -5,6 +5,7 @@
  */
 
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
 
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
 
@@ -19,10 +20,15 @@
 $tierPriceFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
 /** @var  $tpExtensionAttributes */
 $tpExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
+/** @var  $productExtensionAttributes */
+$productExtensionAttributesFactory = $objectManager->get(ProductExtensionInterfaceFactory::class);
 
 $adminWebsite = $objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class)->get('admin');
 $tierPriceExtensionAttributes1 = $tpExtensionAttributesFactory->create()
     ->setWebsiteId($adminWebsite->getId());
+$productExtensionAttributesWebsiteIds = $productExtensionAttributesFactory->create(
+    ['website_ids' => $adminWebsite->getId()]
+);
 
 $tierPrices[] = $tierPriceFactory->create(
     [
@@ -54,6 +60,16 @@
     ]
 )->setExtensionAttributes($tierPriceExtensionAttributes1);
 
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+            'qty' => 3.2,
+            'value' => 6,
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
 $tierPriceExtensionAttributes2 = $tpExtensionAttributesFactory->create()
     ->setWebsiteId($adminWebsite->getId())
     ->setPercentageValue(50);
@@ -82,6 +98,7 @@
     ->setTaxClassId(0)
     ->setTierPrices($tierPrices)
     ->setDescription('Description with <b>html tag</b>')
+    ->setExtensionAttributes($productExtensionAttributesWebsiteIds)
     ->setMetaTitle('meta title')
     ->setMetaKeyword('meta keyword')
     ->setMetaDescription('meta description')
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
index 7829797c54e6c..7f4a5130aea90 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
@@ -19,7 +19,11 @@
     1
 )->setAttributeSetId(
     4
-)->setStoreId(
+)->setCustomAttribute(
+    'tax_class_id',
+    1
+)->setCustomAttribute(
+    'tax_class_id',
     1
 )->setWebsiteIds(
     [1]
@@ -42,8 +46,7 @@
 )->save();
 
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->setStoreId(1)
-    ->load(1)
+$product->load(1)
     ->setStoreId($store->getId())
     ->setName('StoreTitle')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock.php
new file mode 100644
index 0000000000000..6630c0d69e34f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->get(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple-out-of-stock')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->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'   => 1,
+            'qty'                       => 0,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 0,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock_rollback.php
new file mode 100644
index 0000000000000..c4df4454aa07c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple-out-of-stock', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields.php
index c1db1b80c690e..946ee40f02c3f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields.php
@@ -13,26 +13,61 @@
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(10)
+    ->setName('Movable Position 2')
+    ->setParentId(2)
+    ->setPath('1/2/10')
+    ->setLevel(2)
+    ->setAvailableSortBy(['name', 'price'])
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(6)
+    ->save();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(1151)
+    ->setName('Filter category')
+    ->setParentId(10)
+    ->setPath('1/2/10/1151')
+    ->setLevel(3)
+    ->setAvailableSortBy(['name', 'price'])
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(0)
+    ->save();
+
 $product = $productRepository->get('simple', true);
 $eavAttributeValues = [
-    'category_ids' => [2],
-    'cost' => 123.234,
+    'category_ids' => [10],
+    'cost' => 2.234,
     'country_of_manufacture' => 'US',
     'msrp' => 10.48,
     'gift_message_available' => 0,
-    'minimal_price' => 450,
     'msrp_display_actual_price_type' => 0,
     'news_from_date' => '2017-08-10',
     'news_to_date' => '2017-08-11',
     'old_id' => 35235,
     'options_container' => 'Options Container',
     'required_options' => 1,
-    'special_price' => 343.82,
-    'special_from_date' => '2017-01-02',
-    'special_to_date' => '2017-01-03'
+    'special_price' => 3.82,
+    'special_from_date' => date('Y-m-d', strtotime('-1 day')),
+    'special_to_date' => date('Y-m-d', strtotime('+1 day')),
+    'manufacturer' => 'Magento Inc.',
 ];
 
 foreach ($eavAttributeValues as $attributeCode => $attributeValue) {
     $product->setCustomAttribute($attributeCode, $attributeValue);
 }
+
 $productRepository->save($product);
+
+/** @var Magento\Catalog\Api\CategoryLinkManagementInterface $linkManagement */
+$categoryLinkManagement = $objectManager->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2, 10, 1151]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields_rollback.php
index 19074da5f8bac..a3cc1c5f1a846 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_all_fields_rollback.php
@@ -6,3 +6,22 @@
 
 
 include __DIR__ . '/product_simple_rollback.php';
+
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Remove categories
+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+foreach ($collection->addAttributeToFilter('level', ['in' => [2, 3, 4]]) as $category) {
+    /** @var \Magento\Catalog\Model\Category $category */
+    $category->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php
new file mode 100644
index 0000000000000..8d880458e72a5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/product_simple_with_full_option_set.php';
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
+$entityModel = $objectManager->create(\Magento\Eav\Model\Entity::class);
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+$entityTypeId = $entityModel->setType(\Magento\Catalog\Model\Product::ENTITY)->getTypeId();
+$groupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
+
+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+$attribute = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+$attribute->setAttributeCode(
+    'attribute_code_custom'
+)->setEntityTypeId(
+    $entityTypeId
+)->setIsVisible(true)->setFrontendInput(
+    'text'
+)->setFrontendLabel(
+    'custom_attributes_frontend_label'
+)->setAttributeGroupId(
+    $groupId
+)->setIsFilterable(
+    1
+)->setIsUserDefined(
+    1
+)->setBackendType(
+    $attribute->getBackendTypeByInput($attribute->getFrontendInput())
+)->save();
+
+$product = $productRepository->get('simple', true);
+
+$product->setCustomAttribute($attribute->getAttributeCode(), 'customAttributeValue');
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
new file mode 100644
index 0000000000000..2b1b271a8bb3c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Eav\Model\Entity;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+
+
+/** @var $installer CategorySetup */
+$installer = $objectManager->create(CategorySetup::class);
+$entityModel = $objectManager->create(Entity::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$entityTypeId = $entityModel->setType(Product::ENTITY)
+    ->getTypeId();
+$groupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
+
+/** @var ProductAttributeInterface $attribute */
+$attribute = $objectManager->create(ProductAttributeInterface::class);
+
+$attribute->setAttributeCode('flat_attribute')
+    ->setEntityTypeId($entityTypeId)
+    ->setIsVisible(true)
+    ->setFrontendInput('text')
+    ->setIsFilterable(1)
+    ->setIsUserDefined(1)
+    ->setUsedInProductListing(1)
+    ->setBackendType('varchar')
+    ->setIsUsedInGrid(1)
+    ->setIsVisibleInGrid(1)
+    ->setIsFilterableInGrid(1)
+    ->setFrontendLabel('nobody cares')
+    ->setAttributeGroupId($groupId)
+    ->setAttributeSetId(4);
+
+$attributeRepository->save($attribute);
+
+/** @var Processor $processor */
+$processor = $objectManager->create(Processor::class);
+$scheduled = $processor->getIndexer()
+    ->isScheduled();
+$processor->reindexAll();
+
+$product = $productFactory->create()
+    ->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setName('Simple With Attribute That Used In Flat')
+    ->setSku('simple_with_custom_flat_attribute')
+    ->setPrice(100)
+    ->setVisibility(1)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_in_stock'               => 1,
+        ]
+    )
+    ->setStatus(1);
+$product->setCustomAttribute('flat_attribute', 'flat attribute value');
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php
new file mode 100644
index 0000000000000..c1892d504ecc3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+/** @var Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+    $product = $productRepository->get('simple_with_custom_flat_attribute');
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+try {
+    /** @var \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute */
+    $attribute = $attributeRepository->get('flat_attribute');
+    $attributeRepository->delete($attribute);
+} catch (NoSuchEntityException $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_rollback.php
new file mode 100644
index 0000000000000..d0133dfc0a337
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_rollback.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/product_simple_rollback.php';
+
+
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
+$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+$model->load('attribute_code_custom', 'attribute_code')->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
index c3abd2dfcdae7..61b549f7729d1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
@@ -51,7 +51,7 @@
             [
                 'option_type_id' => null,
                 'title' => 'Option 1',
-                'price' => '3,000.00',
+                'price' => '-3,000.00',
                 'price_type' => 'fixed',
                 'sku' => '3-1-select',
             ],
@@ -86,7 +86,18 @@
                 'sku' => '4-2-radio',
             ],
         ]
-    ]
+    ],
+    [
+        'previous_group' => 'text',
+        'title'     => 'Test Field',
+        'type'      => 'field',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'price'     => 1,
+        'price_type' => 'fixed',
+        'sku'       => '1-text',
+        'max_characters' => 100,
+    ],
 ];
 
 $options = [];
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_decimal_qty.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_decimal_qty.php
new file mode 100644
index 0000000000000..37ce93cc9c420
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_decimal_qty.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->get(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$tierPrices = [];
+/** @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory */
+$tierPriceFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
+/** @var  $tpExtensionAttributes */
+$tpExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
+
+$adminWebsite = $objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class)->get('admin');
+$tierPriceExtensionAttributes1 = $tpExtensionAttributesFactory->create()
+    ->setWebsiteId($adminWebsite->getId());
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+            'qty' => 2,
+            'value' => 8,
+        ],
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+            'qty' => 5,
+            'value' => 5,
+        ],
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+            'qty' => 3,
+            'value' => 5,
+        ],
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPriceExtensionAttributes2 = $tpExtensionAttributesFactory->create()
+    ->setWebsiteId($adminWebsite->getId())
+    ->setPercentageValue(50);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+            'qty' => 10,
+        ],
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes2);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple_with_decimal_qty')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setTierPrices($tierPrices)
+    ->setDescription('Description with <b>html tag</b>')
+    ->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' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 1,
+            'is_in_stock' => 1,
+        ]
+    )->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+
+$oldOptions = [
+    [
+        'previous_group' => 'text',
+        'title' => 'Test Field',
+        'type' => 'field',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'price' => 1,
+        'price_type' => 'fixed',
+        'sku' => '1-text',
+        'max_characters' => 100,
+    ],
+    [
+        'previous_group' => 'date',
+        'title' => 'Test Date and Time',
+        'type' => 'date_time',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'price' => 2,
+        'price_type' => 'fixed',
+        'sku' => '2-date',
+    ],
+    [
+        'previous_group' => 'select',
+        'title' => 'Test Select',
+        'type' => 'drop_down',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'values' => [
+            [
+                'option_type_id' => null,
+                'title' => 'Option 1',
+                'price' => 3,
+                'price_type' => 'fixed',
+                'sku' => '3-1-select',
+            ],
+            [
+                'option_type_id' => null,
+                'title' => 'Option 2',
+                'price' => 3,
+                'price_type' => 'fixed',
+                'sku' => '3-2-select',
+            ],
+        ],
+    ],
+    [
+        'previous_group' => 'select',
+        'title' => 'Test Radio',
+        'type' => 'radio',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'values' => [
+            [
+                'option_type_id' => null,
+                'title' => 'Option 1',
+                'price' => 3,
+                'price_type' => 'fixed',
+                'sku' => '4-1-radio',
+            ],
+            [
+                'option_type_id' => null,
+                'title' => 'Option 2',
+                'price' => 3,
+                'price_type' => 'fixed',
+                'sku' => '4-2-radio',
+            ],
+        ],
+    ],
+];
+
+$options = [];
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+
+foreach ($oldOptions as $option) {
+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option */
+    $option = $customOptionFactory->create(['data' => $option]);
+    $option->setProductSku($product->getSku());
+
+    $options[] = $option;
+}
+
+$product->setOptions($options);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_decimal_qty_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_decimal_qty_rollback.php
new file mode 100644
index 0000000000000..55bd53a2d5794
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_decimal_qty_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_with_decimal_qty', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php
new file mode 100644
index 0000000000000..252f99c97b787
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple')
+    ->setPrice(10)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+
+/** @var $mediaConfig \Magento\Catalog\Model\Product\Media\Config */
+$mediaConfig = $objectManager->get(\Magento\Catalog\Model\Product\Media\Config::class);
+
+/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
+    ->getDirectoryWrite(DirectoryList::MEDIA);
+
+$targetDirPath = $mediaConfig->getBaseMediaPath();
+$targetTmpDirPath = $mediaConfig->getBaseTmpMediaPath();
+
+$mediaDirectory->create($targetDirPath);
+$mediaDirectory->create($targetTmpDirPath);
+
+$dist = $mediaDirectory->getAbsolutePath($mediaConfig->getBaseMediaPath() .  DIRECTORY_SEPARATOR . 'magento_image.jpg');
+copy(__DIR__ . '/magento_image.jpg', $dist);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_url_key_rollback.php
new file mode 100644
index 0000000000000..778fa7b15df3e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_url_key_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple1', false, null, true);
+    $productRepository->delete($product);
+    $product = $productRepository->get('simple2', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key.php
new file mode 100644
index 0000000000000..5012bc947211b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple1')
+    ->setPrice(10)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setCategoryIds([2])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setUrlKey('cuvee-merlot-cabernet-igp-pays-d-oc-frankrijk')
+    ->save();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 2')
+    ->setSku('simple2')
+    ->setPrice(10)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setCategoryIds([2])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setUrlKey('normal-url')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key_rollback.php
new file mode 100644
index 0000000000000..778fa7b15df3e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_wrong_url_key_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple1', false, null, true);
+    $productRepository->delete($product);
+    $product = $productRepository->get('simple2', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss_rollback.php
new file mode 100644
index 0000000000000..f9475f4c35007
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+    $product = $productRepository->get('product-with-xss', true);
+    if ($product->getId()) {
+        $productRepository->delete($product);
+    }
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
index 9dabda785306a..38e8c404dc002 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 cd7aa7ce741f2..24f857bfa0dbe 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_virtual_in_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php
index eb664c7083739..719debe211980 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php
@@ -10,11 +10,13 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->load(21);
-if ($product->getId()) {
-    $product->delete();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('virtual-product', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php
new file mode 100644
index 0000000000000..cff2e83ed002e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
+    ->setId(31)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product Out')
+    ->setSku('virtual-product-out')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['is_in_stock' => 0])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php
new file mode 100644
index 0000000000000..8055ca4a25569
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_out_of_stock_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('virtual-product-out', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
index 479661f26bc59..7fdeca846885a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
@@ -19,6 +19,7 @@
     $productRepository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
     //Product already removed
+} catch (\Magento\Framework\Exception\StateException $exception) {
 }
 
 $registry->unregister('isSecureArea');
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 fa47cdefccc95..a6fdcf9233911 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 6c609a12f1228..a9bc557fd9b72 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);
 
@@ -46,7 +47,7 @@
         'type' => 'field',
         'is_require' => true,
         'sort_order' => 1,
-        'price' => 10.0,
+        'price' => -10.0,
         'price_type' => 'fixed',
         'sku' => 'sku1',
         'max_characters' => 10,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php
index 141920afbdc26..987ee96ce6b08 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Catalog\Api\Data\ProductInterface;
-
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var \Magento\Framework\Registry $registry */
@@ -15,16 +13,18 @@
 $registry->register("isSecureArea", true);
 
 /** @var Magento\Store\Model\Website $website */
-$website = $objectManager->create(\Magento\Store\Model\Website::class);
-$website->load('second_website');
-$website->delete();
+$website = $objectManager->get(Magento\Store\Model\Website::class);
+$website->load('second_website', 'code');
+if ($website->getId()) {
+    $website->delete();
+}
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 try {
     $firstProduct = $productRepository->get('unique-simple-azaza');
-    $firstProduct->delete();
+    $productRepository->delete($firstProduct);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
     //Product already removed
 }
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 93811a9a300ed..fb0f77038db0e 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 c6283f7c36a8f..f8999f3cb3da0 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_in_different_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php
new file mode 100644
index 0000000000000..6102738bd6be4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+require __DIR__ . '/../../Store/_files/core_fixturestore.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Magento\Store\Model\Website $website */
+$website = $objectManager->get(Magento\Store\Model\Website::class);
+
+$website->setData(
+    [
+        'code' => 'second_website',
+        'name' => 'Test Website',
+    ]
+);
+
+$website->save();
+
+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
+
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(IndexerRegistry::class);
+$indexer =  $indexerRegistry->get('catalogsearch_fulltext');
+
+$indexer->reindexAll();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(96377)
+    ->setName('Category 1')
+    ->setParentId(2)
+    ->setPath('1/2/96377')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple_1')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([96377]);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([$website->getId()])
+    ->setName('Simple Product 2')
+    ->setSku('simple_2')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([96377]);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1, $website->getId()])
+    ->setName('Simple Product 3')
+    ->setSku('simple_3')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([96377]);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php
new file mode 100644
index 0000000000000..9b957b75eb2a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../Store/_files/core_fixturestore_rollback.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Remove category
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->load(96377);
+if ($category->getId()) {
+    $category->delete();
+}
+
+$productSkuList = ['simple_1', 'simple_2', 'simple_3'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+/** @var Magento\Store\Model\Website $website */
+$website = $objectManager->get(Magento\Store\Model\Website::class);
+$website->load('second_website', 'code');
+if ($website->getId()) {
+    $website->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php
new file mode 100644
index 0000000000000..93c4fa854c7f3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Wrong Simple Product')
+    ->setSku('wrong-simple')
+    ->setPrice(300)
+    ->setWeight(10)
+    ->setSpecialPrice(90)
+    ->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' => 1, 'qty' => 22, 'is_in_stock' => 1])
+    ->setQty(22)
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('First Simple Product')
+    ->setSku('simple-249')
+    ->setPrice(249.9)
+    ->setSpecialPrice(153)
+    ->setWeight(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' => 1, 'qty' => 22, 'is_in_stock' => 1])
+    ->setQty(22)
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setWeight(10)
+    ->setName('Second Simple Product')
+    ->setSku('simple-156')
+    ->setPrice(156)
+    ->setSpecialPrice(156)
+    ->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' => 1, 'qty' => 22, 'is_in_stock' => 1])
+    ->setQty(22)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list_rollback.php
new file mode 100644
index 0000000000000..b9c857c612132
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list_rollback.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/**
+ * @var Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('wrong-simple', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+try {
+    $customDesignProduct = $productRepository->get('simple-156', false, null, true);
+    $productRepository->delete($customDesignProduct);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+try {
+    $customDesignProduct = $productRepository->get('simple-249', false, null, true);
+    $productRepository->delete($customDesignProduct);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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 15e274541bac4..7d6e2e6f97800 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 62221ea5d70e6..fc0d3b2aff12c 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 174150d37f3bb..12867cdfc235b 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_related_multiple_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple_rollback.php
index f458e1bd9a560..f755735861dc2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple_rollback.php
@@ -10,27 +10,18 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $relatedProduct \Magento\Catalog\Model\Product */
-$relatedProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Catalog\Model\Product::class
-);
-$relatedProduct->load(1);
-if ($relatedProduct->getId()) {
-    $relatedProduct->delete();
-}
-
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->load(2);
-if ($product->getId()) {
-    $product->delete();
-}
-
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->load(3);
-if ($product->getId()) {
-    $product->delete();
+$productSkuList = ['simple', 'simple_with_cross_two', 'simple_with_cross'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
 }
 
 $registry->unregister('isSecureArea');
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 6d09725e40ecc..af25ead3929b3 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 a104a57350e9d..8df969a31019c 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_upsell_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell_rollback.php
index b30ebb8380ba5..a9c25dec58547 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell_rollback.php
@@ -9,20 +9,18 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $upSellProduct \Magento\Catalog\Model\Product */
-$upSellProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Catalog\Model\Product::class
-);
-$upSellProduct->load(1);
-if ($upSellProduct->getId()) {
-    $upSellProduct->delete();
-}
-
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->load(2);
-if ($product->getId()) {
-    $product->delete();
+$productSkuList = ['simple', 'simple_with_upsell'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php
new file mode 100644
index 0000000000000..1dca8c383cc7a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/**
+ * Create multiselect attribute
+ */
+require __DIR__ . '/dropdown_attribute.php';
+
+/** Create products with attribute option of dropdown type */
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Setup\CategorySetup::class
+);
+
+/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$options->setAttributeFilter($attribute->getId());
+$optionIds = $options->getAllIds();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($optionIds[0] * 10)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('With Option 1')
+    ->setSku('simple_op_1')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setDropdownAttribute($optionIds[0])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($optionIds[1] * 10)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('With Option 2')
+    ->setSku('simple_op_2')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setDropdownAttribute($optionIds[1])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($optionIds[2] * 10)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('With Option 3')
+    ->setSku('simple_op_3')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setDropdownAttribute($optionIds[2])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php
new file mode 100644
index 0000000000000..07570894b87b2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_dropdown_attribute_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/**
+ * Remove all products as strategy of isolation process
+ */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create('Magento\Catalog\Model\Product')
+    ->getCollection();
+
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
new file mode 100644
index 0000000000000..48c47c9988d59
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+
+$eavConfig->clear();
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+if (!$attribute->getId()) {
+
+    /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+    $attribute = Bootstrap::getObjectManager()->create(
+        \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+    );
+
+    /** @var AttributeRepositoryInterface $attributeRepository */
+    $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
+
+    $attribute->setData(
+        [
+            'attribute_code' => 'test_configurable',
+            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'select',
+            'is_unique' => 0,
+            'is_required' => 0,
+            'is_searchable' => 1,
+            'is_visible_in_advanced_search' => 0,
+            'is_comparable' => 1,
+            'is_filterable' => 1,
+            'is_filterable_in_search' => 1,
+            'is_used_for_promo_rules' => 0,
+            'is_html_allowed_on_front' => 1,
+            'is_visible_on_front' => 1,
+            'used_in_product_listing' => 1,
+            'used_for_sort_by' => 1,
+            'frontend_label' => ['Test Configurable'],
+            'backend_type' => 'int',
+            'option' => [
+                'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
+                'order' => ['option_0' => 1, 'option_1' => 2],
+            ],
+            'default' => ['option_0']
+        ]
+    );
+
+    $attributeRepository->save($attribute);
+
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+}
+
+$eavConfig->clear();
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(10)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product1')
+    ->setSku('simple1')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setPrice(10)
+    ->setWeight(1)
+    ->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)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('5.99')
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(11)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product2')
+    ->setSku('simple2')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_ON_GESTURE)
+    ->setPrice(20)
+    ->setWeight(1)
+    ->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)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('15.99')
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(12)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product3')
+    ->setSku('simple3')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setPrice(30)
+    ->setWeight(1)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('25.99')
+    ->save();
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(
+    333
+)->setCreatedAt(
+    '2014-06-23 09:50:07'
+)->setName(
+    'Category 1'
+)->setParentId(
+    2
+)->setPath(
+    '1/2/333'
+)->setLevel(
+    2
+)->setAvailableSortBy(
+    ['position', 'name']
+)->setDefaultSortBy(
+    'name'
+)->setIsActive(
+    true
+)->setPosition(
+    1
+)->setPostedProducts(
+    [10 => 10, 11 => 11, 12 => 12]
+)->save();
+
+/** @var \Magento\Indexer\Model\Indexer\Collection $indexerCollection */
+$indexerCollection = Bootstrap::getObjectManager()->get(\Magento\Indexer\Model\Indexer\Collection::class);
+$indexerCollection->load();
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+foreach ($indexerCollection->getItems() as $indexer) {
+    $indexer->reindexAll();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php
new file mode 100644
index 0000000000000..dd89f8974a647
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple1', 'simple2', 'simple3'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+        //Product already removed
+    }
+}
+
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->load(333);
+if ($category->getId()) {
+    $category->delete();
+}
+
+$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+    && $attribute->getId()
+) {
+    $attribute->delete();
+}
+$eavConfig->clear();
+
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_rollback.php
index 7a72f168f924f..eb8201f04e6cc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_rollback.php
@@ -3,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 require __DIR__ . '/multiselect_attribute_rollback.php';
+
+use Magento\Framework\Indexer\IndexerRegistry;
+
 /**
  * Remove all products as strategy of isolation process
  */
@@ -22,3 +26,7 @@
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
+
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
+    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
+    ->reindexAll();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
new file mode 100644
index 0000000000000..a1e81fd3b40ad
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\_files\MultiselectSourceMock;
+
+/**
+ * Create multiselect attribute
+ */
+require __DIR__ . '/multiselect_attribute_with_source_model.php';
+require __DIR__ . '/../../Checkout/_files/ValidatorFileMock.php';
+
+/** Create product with options and multiselect attribute */
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Setup\CategorySetup::class
+);
+
+/** @var $sourceModel MultiselectSourceMock */
+$sourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    MultiselectSourceMock::class
+);
+$options = $sourceModel->getAllOptions();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($options[0]['value'] * 10)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('With Multiselect Source Model 1')
+    ->setSku('simple_mssm_1')
+    ->setPrice(10)
+    ->setDescription('Hello " &amp;" Bring the water bottle when you can!')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setMultiselectAttrWithSource([$options[0]['value']])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($options[1]['value'] * 10)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('With Multiselect Source Model 2')
+    ->setSku('simple_mssm_2')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setMultiselectAttrWithSource([$options[1]['value'], $options[2]['value'], $options[3]['value']])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
new file mode 100644
index 0000000000000..a8121a7913e54
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/multiselect_attribute_with_source_model_rollback.php';
+
+use Magento\Framework\Indexer\IndexerRegistry;
+
+/**
+ * Remove all products as strategy of isolation process
+ */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create('Magento\Catalog\Model\Product')
+    ->getCollection();
+
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
+    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
+    ->reindexAll();
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 77b0cd7d94bad..64f9cdba7e763 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/Catalog/_files/row_fixture_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/row_fixture_rollback.php
index eb01eccd0b851..23a5c80439008 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/row_fixture_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/row_fixture_rollback.php
@@ -10,18 +10,19 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->loadByAttribute('sku', 'simple');
-if ($product->getId()) {
-    $product->delete();
-}
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->loadByAttribute('sku', '12345');
-if ($product->getId()) {
-    $product->delete();
+$productSkuList = ['simple', '12345'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
 }
 
 /** @var $category \Magento\Catalog\Model\Category */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually.php
new file mode 100644
index 0000000000000..dfb8ce4d4741f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(67)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product Not visible 1')
+    ->setSku('simple_not_visible_1')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setMetaTitle('meta title product Not visible')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([300])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 30, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('5.99')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php
new file mode 100644
index 0000000000000..bbdcfd7acf081
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_not_visible_1', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products_rollback.php
index 92c782f4122b9..ea44ccc29e0f8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products_rollback.php
@@ -15,11 +15,15 @@
 
 $productSkuList = ['simple_product_1', 'simple_product_2'];
 foreach ($productSkuList as $sku) {
-    /** @var $product \Magento\Catalog\Model\Product */
-    $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-    $product->loadByAttribute('sku', $sku);
-    if ($product->getId()) {
-        $product->delete();
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
     }
 }
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
index efbc8c36409af..b562879b319d6 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Store\Model\Store;
 
 /**
  * Abstract class for testing product export and import scenarios
@@ -50,7 +51,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()
@@ -70,7 +72,7 @@ protected function tearDown()
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      *
      * @param array $fixtures
@@ -110,10 +112,13 @@ protected function executeExportTest($skus, $skippedAttributes)
         $index = 0;
         $ids = [];
         $origProducts = [];
+        /** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+        $stockRegistryStorage = $this->objectManager->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         while (isset($skus[$index])) {
             $ids[$index] = $this->productResource->getIdBySku($skus[$index]);
-            $origProducts[$index] = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-                ->load($ids[$index]);
+            $origProducts[$index] = $productRepository->get($skus[$index], false, Store::DEFAULT_STORE_ID);
             $index++;
         }
 
@@ -122,9 +127,8 @@ protected function executeExportTest($skus, $skippedAttributes)
 
         while ($index > 0) {
             $index--;
-            $newProduct = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-                ->load($ids[$index]);
-
+            $stockRegistryStorage->removeStockItem($ids[$index]);
+            $newProduct = $productRepository->get($skus[$index], false, Store::DEFAULT_STORE_ID, true);
             // @todo uncomment or remove after MAGETWO-49806 resolved
             //$this->assertEquals(count($origProductData[$index]), count($newProductData));
 
@@ -155,7 +159,7 @@ private function assertEqualsOtherThanSkippedAttributes($expected, $actual, $ski
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      *
      * @param array $fixtures
@@ -236,7 +240,7 @@ protected function assertEqualsSpecificAttributes($expectedProduct, $actualProdu
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      *
      * @param array $fixtures
@@ -255,7 +259,7 @@ public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      *
      * @param array $fixtures
@@ -286,7 +290,6 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
             'row_id',
             'entity_id',
             'tier_price',
-            'is_salable',
             'media_gallery'
         ];
         $skippedAttributes = array_merge($replacedAttributes, $skippedAttributes);
@@ -294,10 +297,11 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
         $index = 0;
         $ids = [];
         $origProducts = [];
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         while (isset($skus[$index])) {
             $ids[$index] = $this->productResource->getIdBySku($skus[$index]);
-            $origProducts[$index] = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
-                ->load($ids[$index]);
+            $origProducts[$index] = $productRepository->get($skus[$index], false, Store::DEFAULT_STORE_ID);
             $index++;
         }
 
@@ -317,10 +321,7 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
 
         while ($index > 0) {
             $index--;
-
-            $id = $this->productResource->getIdBySku($skus[$index]);
-            $newProduct = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load($id);
-
+            $newProduct = $productRepository->get($skus[$index], false, Store::DEFAULT_STORE_ID, true);
             // check original product is deleted
             $origProduct = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load($ids[$index]);
             $this->assertNull($origProduct->getId());
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
index 6cdca3e6e46af..c212d4c0d971a 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
@@ -9,6 +9,8 @@
  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
  * @magentoAppIsolation enabled
  * @magentoDbIsolation enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
@@ -68,7 +70,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data.php
-     * @magentoDbIsolationEnabled
+     * @magentoDbIsolation enabled
      */
     public function testExport()
     {
@@ -93,7 +95,7 @@ public function testExport()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data_special_chars.php
-     * @magentoDbIsolationEnabled
+     * @magentoDbIsolation enabled
      */
     public function testExportSpecialChars()
     {
@@ -109,7 +111,7 @@ public function testExportSpecialChars()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
-     * @magentoDbIsolationEnabled
+     * @magentoDbIsolation enabled
      */
     public function testExportWithProductLinks()
     {
@@ -289,4 +291,122 @@ public function testCategoryIdsFilter()
         $this->assertNotContains('Simple Product Two', $exportData);
         $this->assertNotContains('Simple Product Not Visible On Storefront', $exportData);
     }
+
+    /**
+     * Test 'hide from product page' export for non-default store.
+     *
+     * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_images.php
+     */
+    public function testExportWithMedia()
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple', 1);
+        $mediaGallery = $product->getData('media_gallery');
+        $image = array_shift($mediaGallery['images']);
+        $this->model->setWriter(
+            $this->objectManager->create(
+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
+            )
+        );
+        $exportData = $this->model->export();
+        /** @var $varDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+        $varDirectory = $this->objectManager->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR);
+        $varDirectory->writeFile('test_product_with_image.csv', $exportData);
+        /** @var \Magento\Framework\File\Csv $csv */
+        $csv = $this->objectManager->get(\Magento\Framework\File\Csv::class);
+        $data = $csv->getData($varDirectory->getAbsolutePath('test_product_with_image.csv'));
+        foreach ($data[0] as $columnNumber => $columnName) {
+            if ($columnName === 'hide_from_product_page') {
+                self::assertSame($image['file'], $data[2][$columnNumber]);
+            }
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data.php
+     * @return void
+     */
+    public function testExportWithCustomOptions(): void
+    {
+        $storeCode = 'default';
+        $expectedData = [];
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+        $store->load('default', 'code');
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get('simple', 1, $store->getStoreId());
+        $newCustomOptions = [];
+        foreach ($product->getOptions() as $customOption) {
+            $defaultOptionTitle = $customOption->getTitle();
+            $secondStoreOptionTitle = $customOption->getTitle() . '_' . $storeCode;
+            $expectedData['admin_store'][$defaultOptionTitle] = [];
+            $expectedData[$storeCode][$secondStoreOptionTitle] = [];
+            $customOption->setTitle($secondStoreOptionTitle);
+            if ($customOption->getValues()) {
+                $newOptionValues = [];
+                foreach ($customOption->getValues() as $customOptionValue) {
+                    $valueTitle = $customOptionValue->getTitle();
+                    $expectedData['admin_store'][$defaultOptionTitle][] = $valueTitle;
+                    $expectedData[$storeCode][$secondStoreOptionTitle][] = $valueTitle . '_' . $storeCode;
+                    $newOptionValues[] = $customOptionValue->setTitle($valueTitle . '_' . $storeCode);
+                }
+                $customOption->setValues($newOptionValues);
+            }
+            $newCustomOptions[] = $customOption;
+        }
+        $product->setOptions($newCustomOptions);
+        $productRepository->save($product);
+        $this->model->setWriter(
+            $this->objectManager->create(\Magento\ImportExport\Model\Export\Adapter\Csv::class)
+        );
+        $exportData = $this->model->export();
+        /** @var $varDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+        $varDirectory = $this->objectManager->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR);
+        $varDirectory->writeFile('test_product_with_custom_options_and_second_store.csv', $exportData);
+        /** @var \Magento\Framework\File\Csv $csv */
+        $csv = $this->objectManager->get(\Magento\Framework\File\Csv::class);
+        $data = $csv->getData($varDirectory->getAbsolutePath('test_product_with_custom_options_and_second_store.csv'));
+        $customOptionData = [];
+        foreach ($data[0] as $columnNumber => $columnName) {
+            if ($columnName === 'custom_options') {
+                $customOptionData['admin_store'] = $this->parseExportedCustomOption($data[1][$columnNumber]);
+                $customOptionData[$storeCode] = $this->parseExportedCustomOption($data[2][$columnNumber]);
+            }
+        }
+
+        self::assertSame($expectedData, $customOptionData);
+    }
+
+    /**
+     * @param string $exportedCustomOption
+     * @return array
+     */
+    private function parseExportedCustomOption(string $exportedCustomOption): array
+    {
+        $customOptions = explode('|', $exportedCustomOption);
+        $optionItems = [];
+        foreach ($customOptions as $customOption) {
+            $parsedOptions = array_values(
+                array_map(
+                    function ($input) {
+                        $data = explode('=', $input);
+                        return [$data[0] => $data[1]];
+                    },
+                    explode(',', $customOption)
+                )
+            );
+            $optionName = array_column($parsedOptions, 'name')[0];
+            if (!empty(array_column($parsedOptions, 'option_title'))) {
+                $optionItems[$optionName][] = array_column($parsedOptions, 'option_title')[0];
+            } else {
+                $optionItems[$optionName] = [];
+            }
+        }
+
+        return $optionItems;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php
index 8860c12f0f983..bc10fd00911fb 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Type;
 
+/**
+ * Tests \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType.
+ */
 class AbstractTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -12,20 +15,31 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
     /**
      * On product import abstract class methods level it doesn't matter what product type is using.
      * That is why current tests are using simple product entity type by default
      */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $params = [$objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class), 'simple'];
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $params = [$this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class), 'simple'];
         $this->_model = $this->getMockForAbstractClass(
             \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::class,
             [
-                $objectManager->get(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class),
-                $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class),
-                $objectManager->get(\Magento\Framework\App\ResourceConnection::class),
+                $this->objectManager->get(
+                    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class
+                ),
+                $this->objectManager->get(
+                    \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class
+                ),
+                $this->objectManager->get(
+                    \Magento\Framework\App\ResourceConnection::class
+                ),
                 $params
             ]
         );
@@ -33,9 +47,17 @@ protected function setUp()
 
     /**
      * @dataProvider prepareAttributesWithDefaultValueForSaveDataProvider
+     *
+     * @param array $rowData
+     * @param bool  $withDefaultValue
+     * @param array $expectedAttributes
+     * @return void
      */
-    public function testPrepareAttributesWithDefaultValueForSave($rowData, $withDefaultValue, $expectedAttributes)
-    {
+    public function testPrepareAttributesWithDefaultValueForSave(
+        array $rowData,
+        bool $withDefaultValue,
+        array $expectedAttributes
+    ): void {
         $actualAttributes = $this->_model->prepareAttributesWithDefaultValueForSave($rowData, $withDefaultValue);
         foreach ($expectedAttributes as $key => $value) {
             $this->assertArrayHasKey($key, $actualAttributes);
@@ -43,7 +65,11 @@ public function testPrepareAttributesWithDefaultValueForSave($rowData, $withDefa
         }
     }
 
-    public function prepareAttributesWithDefaultValueForSaveDataProvider()
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function prepareAttributesWithDefaultValueForSaveDataProvider(): array
     {
         return [
             'Updating existing product with attributes that do not have default values' => [
@@ -125,14 +151,54 @@ public function prepareAttributesWithDefaultValueForSaveDataProvider()
                     'options_container' => 'container2',
                     'msrp_display_actual_price_type' => 2
                 ],
-            ]
+            ],
+            'Adding new product with empty attribute value for attribute_type = select' => [
+                [
+                    'sku' => 'simple_product_5',
+                    'store_view_code' => '',
+                    '_attribute_set' => 'Default',
+                    'product_type' => 'simple',
+                    'categories' => '_root_category',
+                    'website_code' => '',
+                    'name' => 'Simple Product 5',
+                    'price' => 150,
+                    'status' => 1,
+                    'tax_class_id' => ' ',
+                    'weight' => 1,
+                    'description' => 'a',
+                    'short_description' => 'a',
+                    'visibility' => 'not visible individually',
+                    'addition_attribute' => '',
+                ],
+                true,
+                [
+                    'name' => 'Simple Product 5',
+                    'price' => 150,
+                    'status' => 1,
+                    'tax_class_id' => ' ',
+                    'weight' => 1,
+                    'description' => 'a',
+                    'short_description' => 'a',
+                    'visibility' => 1,
+                    'options_container' => 'container2',
+                    'msrp_display_actual_price_type' => 0,
+                ],
+            ],
         ];
     }
 
     /**
-     * @dataProvider clearEmptyDataDataProvider
+     * Test cleaning imported attribute data from empty values (note '0' is not empty).
+     *
+     * @magentoDbIsolation  enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture  Magento/CatalogImportExport/Model/Import/_files/custom_attributes.php
+     * @dataProvider        clearEmptyDataDataProvider
+     * @param array $rowData
+     * @param array $expectedAttributes
+     * @return void
      */
-    public function testClearEmptyData($rowData, $expectedAttributes)
+    public function testClearEmptyData(array $rowData, array $expectedAttributes): void
     {
         $actualAttributes = $this->_model->clearEmptyData($rowData);
         foreach ($expectedAttributes as $key => $value) {
@@ -141,8 +207,14 @@ public function testClearEmptyData($rowData, $expectedAttributes)
         }
     }
 
-    public function clearEmptyDataDataProvider()
+    /**
+     * Data provider for testClearEmptyData.
+     *
+     * @return array
+     */
+    public function clearEmptyDataDataProvider(): array
     {
+        // We use sku attribute to test static attributes.
         return [
             [
                 [
@@ -152,6 +224,7 @@ public function clearEmptyDataDataProvider()
                     'product_type' => 'simple',
                     'name' => 'Simple 01',
                     'price' => 10,
+                    'test_attribute' => '1',
                 ],
                 [
                     'sku' => 'simple1',
@@ -159,26 +232,49 @@ public function clearEmptyDataDataProvider()
                     '_attribute_set' => 'Default',
                     'product_type' => 'simple',
                     'name' => 'Simple 01',
-                    'price' => 10
+                    'price' => 10,
+                    'test_attribute' => '1',
                 ],
             ],
             [
                 [
-                    'sku' => '',
-                    'store_view_code' => 'German',
+                    'sku' => '0',
+                    'store_view_code' => '',
                     '_attribute_set' => 'Default',
-                    'product_type' => '',
-                    'name' => 'Simple 01 German',
-                    'price' => '',
+                    'product_type' => 'simple',
+                    'name' => 'Simple 01',
+                    'price' => 10,
+                    'test_attribute' => '0',
                 ],
                 [
-                    'sku' => '',
-                    'store_view_code' => 'German',
+                    'sku' => '0',
+                    'store_view_code' => '',
                     '_attribute_set' => 'Default',
-                    'product_type' => '',
-                    'name' => 'Simple 01 German'
-                ]
-            ]
+                    'product_type' => 'simple',
+                    'name' => 'Simple 01',
+                    'price' => 10,
+                    'test_attribute' => '0',
+                ],
+            ],
+            [
+                [
+                    'sku' => null,
+                    'store_view_code' => '',
+                    '_attribute_set' => 'Default',
+                    'product_type' => 'simple',
+                    'name' => 'Simple 01',
+                    'price' => 10,
+                    'test_attribute' => null,
+                ],
+                [
+                    'sku' => null,
+                    'store_view_code' => '',
+                    '_attribute_set' => 'Default',
+                    'product_type' => 'simple',
+                    'name' => 'Simple 01',
+                    'price' => 10,
+                ],
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 946c11bec2e8c..e5d97ac0e6844 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -20,18 +20,20 @@
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Registry;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Registry;
 use Magento\ImportExport\Model\Import;
 use Magento\Store\Model\Store;
-use Magento\UrlRewrite\Model\UrlRewrite;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class ProductTest
  * @magentoAppIsolation enabled
  * @magentoDbIsolation enabled
  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
+ * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class ProductTest extends \Magento\TestFramework\Indexer\TestCase
 {
@@ -60,11 +62,20 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $logger;
+
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\CatalogImportExport\Model\Import\Product::class
+            \Magento\CatalogImportExport\Model\Import\Product::class,
+            ['logger' => $this->logger]
         );
         parent::setUp();
     }
@@ -75,11 +86,11 @@ protected function setUp()
      * @var array
      */
     protected $_assertOptions = [
-        'is_require' => '_custom_option_is_required',
-        'price' => '_custom_option_price',
-        'sku' => '_custom_option_sku',
-        'sort_order' => '_custom_option_sort_order',
-        'max_characters' => '_custom_option_max_characters',
+        'is_require' => 'required',
+        'price' => 'price',
+        'sku' => 'sku',
+        'sort_order' => 'order',
+        'max_characters' => 'max_characters',
     ];
 
     /**
@@ -87,7 +98,23 @@ protected function setUp()
      *
      * @var array
      */
-    protected $_assertOptionValues = ['title', 'price', 'sku'];
+    protected $_assertOptionValues = [
+        'title' => 'option_title',
+        'price' => 'price',
+        'sku' => 'sku',
+    ];
+
+    /**
+     * List of specific custom option types
+     *
+     * @var array
+     */
+    private $specificTypes = [
+        'drop_down',
+        'radio',
+        'checkbox',
+        'multiple',
+    ];
 
     /**
      * Test if visibility properly saved after import
@@ -244,15 +271,18 @@ public function testStockState()
     }
 
     /**
-     * Tests adding of custom options with existing and new product
+     * Tests adding of custom options with existing and new product.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @dataProvider getBehaviorDataProvider
      * @param string $importFile
      * @param string $sku
+     * @param int $expectedOptionsQty
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testSaveCustomOptions($importFile, $sku)
+    public function testSaveCustomOptions(string $importFile, string $sku, int $expectedOptionsQty): void
     {
         $pathToFile = __DIR__ . '/_files/' . $importFile;
         $importModel = $this->createImportModel($pathToFile);
@@ -285,6 +315,7 @@ public function testSaveCustomOptions($importFile, $sku)
         // assert of options data
         $this->assertCount(count($expectedData['data']), $actualData['data']);
         $this->assertCount(count($expectedData['values']), $actualData['values']);
+        $this->assertCount($expectedOptionsQty, $actualData['options']);
         foreach ($expectedData['options'] as $expectedId => $expectedOption) {
             $elementExist = false;
             // find value in actual options and values
@@ -309,20 +340,99 @@ public function testSaveCustomOptions($importFile, $sku)
         $this->assertEquals($customOptionValues, $this->getCustomOptionValues($sku));
     }
 
+    /**
+     * Tests adding of custom options with multiple store views
+     *
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoAppIsolation enabled
+     */
+    public function testSaveCustomOptionsWithMultipleStoreViews()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        $storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $storeCodes = [
+            'admin',
+            'default',
+            'fixture_second_store',
+        ];
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        $importFile = 'product_with_custom_options_and_multiple_store_views.csv';
+        $sku = 'simple';
+        $pathToFile = __DIR__ . '/_files/' . $importFile;
+        $importModel = $this->createImportModel($pathToFile);
+        $errors = $importModel->validateData();
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $importModel->importData();
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        );
+        foreach ($storeCodes as $storeCode) {
+            $storeManager->setCurrentStore($storeCode);
+            $product = $productRepository->get($sku);
+            $options = $product->getOptionInstance()->getProductOptions($product);
+            $expectedData = $this->getExpectedOptionsData($pathToFile, $storeCode);
+            $expectedData = $this->mergeWithExistingData($expectedData, $options);
+            $actualData = $this->getActualOptionsData($options);
+            // assert of equal type+titles
+            $expectedOptions = $expectedData['options'];
+            // we need to save key values
+            $actualOptions = $actualData['options'];
+            sort($expectedOptions);
+            sort($actualOptions);
+            $this->assertEquals($expectedOptions, $actualOptions);
+
+            // assert of options data
+            $this->assertCount(count($expectedData['data']), $actualData['data']);
+            $this->assertCount(count($expectedData['values']), $actualData['values']);
+            foreach ($expectedData['options'] as $expectedId => $expectedOption) {
+                $elementExist = false;
+                // find value in actual options and values
+                foreach ($actualData['options'] as $actualId => $actualOption) {
+                    if ($actualOption == $expectedOption) {
+                        $elementExist = true;
+                        $this->assertEquals($expectedData['data'][$expectedId], $actualData['data'][$actualId]);
+                        if (array_key_exists($expectedId, $expectedData['values'])) {
+                            $this->assertEquals($expectedData['values'][$expectedId], $actualData['values'][$actualId]);
+                        }
+                        unset($actualData['options'][$actualId]);
+                        // remove value in case of duplicating key values
+                        break;
+                    }
+                }
+                $this->assertTrue($elementExist, 'Element must exist.');
+            }
+
+            // Make sure that after importing existing options again, option IDs and option value IDs are not changed
+            $customOptionValues = $this->getCustomOptionValues($sku);
+            $this->createImportModel($pathToFile)->importData();
+            $this->assertEquals($customOptionValues, $this->getCustomOptionValues($sku));
+        }
+    }
+
     /**
      * @return array
      */
-    public function getBehaviorDataProvider()
+    public function getBehaviorDataProvider(): array
     {
         return [
             'Append behavior with existing product' => [
-                '$importFile' => 'product_with_custom_options.csv',
-                '$sku' => 'simple',
+                'importFile' => 'product_with_custom_options.csv',
+                'sku' => 'simple',
+                'expectedOptionsQty' => 6,
+            ],
+            'Append behavior with existing product and without options in import file' => [
+                'importFile' => 'product_without_custom_options.csv',
+                'sku' => 'simple',
+                'expectedOptionsQty' => 0,
             ],
             'Append behavior with new product' => [
-                '$importFile' => 'product_with_custom_options_new.csv',
-                '$sku' => 'simple_new',
-            ]
+                'importFile' => 'product_with_custom_options_new.csv',
+                'sku' => 'simple_new',
+                'expectedOptionsQty' => 5,
+            ],
         ];
     }
 
@@ -450,9 +560,12 @@ public function testSaveDatetimeAttribute()
      * Returns expected product data: current id, options, options data and option values
      *
      * @param string $pathToFile
+     * @param string $storeCode
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function getExpectedOptionsData($pathToFile)
+    protected function getExpectedOptionsData(string $pathToFile, string $storeCode = ''): array
     {
         $productData = $this->csvToArray(file_get_contents($pathToFile));
         $expectedOptionId = 0;
@@ -461,28 +574,53 @@ protected function getExpectedOptionsData($pathToFile)
         $expectedData = [];
         // array of option data
         $expectedValues = [];
-        // array of option values data
-        foreach ($productData['data'] as $data) {
-            if (!empty($data['_custom_option_type']) && !empty($data['_custom_option_title'])) {
-                $lastOptionKey = $data['_custom_option_type'] . '|' . $data['_custom_option_title'];
-                $expectedOptionId++;
-                $expectedOptions[$expectedOptionId] = $lastOptionKey;
-                $expectedData[$expectedOptionId] = [];
-                foreach ($this->_assertOptions as $assertKey => $assertFieldName) {
-                    if (array_key_exists($assertFieldName, $data)) {
-                        $expectedData[$expectedOptionId][$assertKey] = $data[$assertFieldName];
+        $storeRowId = null;
+        foreach ($productData['data'] as $rowId => $rowData) {
+            $storeCode = ($storeCode == 'admin') ? '' : $storeCode;
+            if ($rowData['store_view_code'] == $storeCode) {
+                $storeRowId = $rowId;
+                break;
+            }
+        }
+        if (!empty($productData['data'][$storeRowId]['custom_options'])) {
+            foreach (explode('|', $productData['data'][$storeRowId]['custom_options']) as $optionData) {
+                $option = array_values(
+                    array_map(
+                        function ($input) {
+                            $data = explode('=', $input);
+                            return [$data[0] => $data[1]];
+                        },
+                        explode(',', $optionData)
+                    )
+                );
+                $option = array_merge(...$option);
+
+                if (!empty($option['type']) && !empty($option['name'])) {
+                    $lastOptionKey = $option['type'] . '|' . $option['name'];
+                    if (!isset($expectedOptions[$expectedOptionId])
+                        || $expectedOptions[$expectedOptionId] != $lastOptionKey) {
+                        $expectedOptionId++;
+                        $expectedOptions[$expectedOptionId] = $lastOptionKey;
+                        $expectedData[$expectedOptionId] = [];
+                        foreach ($this->_assertOptions as $assertKey => $assertFieldName) {
+                            if (array_key_exists($assertFieldName, $option)
+                                && !(($assertFieldName == 'price' || $assertFieldName == 'sku')
+                                    && in_array($option['type'], $this->specificTypes))
+                            ) {
+                                $expectedData[$expectedOptionId][$assertKey] = $option[$assertFieldName];
+                            }
+                        }
                     }
                 }
-            }
-            if (!empty($data['_custom_option_row_title']) && empty($data['_custom_option_store'])) {
-                $optionData = [];
-                foreach ($this->_assertOptionValues as $assertKey) {
-                    $valueKey = \Magento\CatalogImportExport\Model\Import\Product\Option::COLUMN_PREFIX .
-                        'row_' .
-                        $assertKey;
-                    $optionData[$assertKey] = $data[$valueKey];
+                $optionValue = [];
+                if (!empty($option['name']) && !empty($option['option_title'])) {
+                    foreach ($this->_assertOptionValues as $assertKey => $assertFieldName) {
+                        if (isset($option[$assertFieldName])) {
+                            $optionValue[$assertKey] = $option[$assertFieldName];
+                        }
+                    }
+                    $expectedValues[$expectedOptionId][] = $optionValue;
                 }
-                $expectedValues[$expectedOptionId][] = $optionData;
             }
         }
 
@@ -490,7 +628,7 @@ protected function getExpectedOptionsData($pathToFile)
             'id' => $expectedOptionId,
             'options' => $expectedOptions,
             'data' => $expectedData,
-            'values' => $expectedValues
+            'values' => $expectedValues,
         ];
     }
 
@@ -511,13 +649,28 @@ protected function mergeWithExistingData(
         $expectedValues = $expected['values'];
         foreach ($options as $option) {
             $optionKey = $option->getType() . '|' . $option->getTitle();
+            $optionValues = $this->getOptionValues($option);
             if (!in_array($optionKey, $expectedOptions)) {
                 $expectedOptionId++;
                 $expectedOptions[$expectedOptionId] = $optionKey;
                 $expectedData[$expectedOptionId] = $this->getOptionData($option);
-                if ($optionValues = $this->getOptionValues($option)) {
+                if ($optionValues) {
                     $expectedValues[$expectedOptionId] = $optionValues;
                 }
+            } else {
+                $existingOptionId = array_search($optionKey, $expectedOptions);
+                $expectedData[$existingOptionId] = array_merge(
+                    $this->getOptionData($option),
+                    $expectedData[$existingOptionId]
+                );
+                if ($optionValues) {
+                    foreach ($optionValues as $optionKey => $optionValue) {
+                        $expectedValues[$existingOptionId][$optionKey] = array_merge(
+                            $optionValue,
+                            $expectedValues[$existingOptionId][$optionKey]
+                        );
+                    }
+                }
             }
         }
 
@@ -593,7 +746,7 @@ protected function getOptionValues(\Magento\Catalog\Model\Product\Option $option
             /** @var $value \Magento\Catalog\Model\Product\Option\Value */
             foreach ($values as $value) {
                 $optionData = [];
-                foreach ($this->_assertOptionValues as $assertKey) {
+                foreach (array_keys($this->_assertOptionValues) as $assertKey) {
                     if ($value->hasData($assertKey)) {
                         $optionData[$assertKey] = $value->getData($assertKey);
                     }
@@ -609,7 +762,6 @@ protected function getOptionValues(\Magento\Catalog\Model\Product\Option $option
     /**
      * Test that product import with images works properly
      *
-     * @magentoDataIsolation enabled
      * @magentoDataFixture mediaImportImageFixture
      * @magentoAppIsolation enabled
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -657,6 +809,20 @@ public function testSaveMediaImage()
         $this->assertEquals('Additional Image Label Two', $additionalImageTwoItem->getLabel());
     }
 
+    /**
+     * Test that errors occurred during importing images are logged.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoDataFixture mediaImportImageFixtureError
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testSaveMediaImageError()
+    {
+        $this->logger->expects(self::once())->method('critical');
+        $this->importDataForMediaTest('import_media.csv', 1);
+    }
+
     /**
      * Copy fixture images into media import directory
      */
@@ -715,6 +881,29 @@ public static function mediaImportImageFixtureRollback()
         $mediaDirectory->delete('catalog');
     }
 
+    /**
+     * Copy incorrect fixture image into media import directory.
+     */
+    public static function mediaImportImageFixtureError()
+    {
+        /** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
+        $mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\Filesystem::class
+        )->getDirectoryWrite(
+            DirectoryList::MEDIA
+        );
+        $dirPath = $mediaDirectory->getAbsolutePath('import');
+        $items = [
+            [
+                'source' => __DIR__ . '/_files/magento_additional_image_error.jpg',
+                'dest' => $dirPath . '/magento_additional_image_two.jpg',
+            ],
+        ];
+        foreach ($items as $item) {
+            copy($item['source'], $item['dest']);
+        }
+    }
+
     /**
      * Export CSV string to array
      *
@@ -767,6 +956,7 @@ public function testInvalidSkuLink()
         $errors = $this->_model->setParameters(
             [
                 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                Import::FIELD_NAME_VALIDATION_STRATEGY => null,
                 'entity' => 'catalog_product'
             ]
         )->setSource(
@@ -832,7 +1022,7 @@ public function testValidateInvalidMultiselectValues()
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testProductsWithMultipleStores()
@@ -1024,7 +1214,7 @@ public function testProductCategories($fixture, $separator)
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoDataFixture Magento/Catalog/_files/category.php
@@ -1099,14 +1289,12 @@ public function categoryTestDataProvider()
 
     /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Catalog/_files/category_duplicates.php
+     * @magentoDataFixture Magento/CatalogImportExport/_files/update_category_duplicates.php
      */
     public function testProductDuplicateCategories()
     {
-        $this->markTestSkipped('Due to MAGETWO-48956');
-
         $csvFixture = 'products_duplicate_category.csv';
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/' . $csvFixture;
@@ -1131,19 +1319,6 @@ public function testProductDuplicateCategories()
 
         $this->assertTrue($errors->getErrorsCount() === 0);
 
-        /** @var \Magento\Catalog\Model\Category $category */
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
-
-        $category->load(444);
-
-        $this->assertTrue($category !== null);
-
-        $category->setName(
-            'Category 2-updated'
-        )->save();
-
         $this->_model->importData();
 
         $errorProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -1241,6 +1416,7 @@ public function validateUrlKeysDataProvider()
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
      */
     public function testValidateUrlKeysMultipleStores()
     {
@@ -1336,6 +1512,7 @@ public function testProductWithLinks()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testExistingProductWithUrlKeys()
@@ -1373,8 +1550,49 @@ public function testExistingProductWithUrlKeys()
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_wrong_url_key.php
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     */
+    public function testAddUpdateProductWithInvalidUrlKeys() : void
+    {
+        $products = [
+            'simple1' => 'cuvee-merlot-cabernet-igp-pays-d-oc-frankrijk',
+            'simple2' => 'normal-url',
+            'simple3' => 'some-wrong-url'
+        ];
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import_with_invalid_url_keys.csv',
+                'directory' => $directory
+            ]
+        );
+
+        $errors = $this->_model->setParameters(
+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE, 'entity' => 'catalog_product']
+        )->setSource(
+            $source
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->_model->importData();
+
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        );
+        foreach ($products as $productSku => $productUrlKey) {
+            $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
+        }
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testImportWithoutUrlKeys()
@@ -1409,6 +1627,45 @@ public function testImportWithoutUrlKeys()
         }
     }
 
+    /**
+     * Make sure the absence of a url_key column in the csv file won't erase the url key of the existing products.
+     * To reach the goal we need to not send the name column, as the url key is generated from it.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     */
+    public function testImportWithoutUrlKeysAndName()
+    {
+        $products = [
+            'simple1' => 'url-key',
+            'simple2' => 'url-key2',
+        ];
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import_without_url_keys_and_name.csv',
+                'directory' => $directory
+            ]
+        );
+
+        $errors = $this->_model->setParameters(
+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
+        )
+            ->setSource($source)
+            ->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->_model->importData();
+
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        foreach ($products as $productSku => $productUrlKey) {
+            $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
+        }
+    }
+
     /**
      * @magentoAppIsolation enabled
      */
@@ -1452,7 +1709,7 @@ public function testProductWithUseConfigSettings()
     /**
      * @magentoDataFixture Magento/Store/_files/website.php
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testProductWithMultipleStoresInDifferentBunches()
@@ -1501,10 +1758,36 @@ function (ProductInterface $item) {
             },
             $productCollection->getItems()
         );
+        sort($products);
+        $result = array_values($actualProductSkus);
+        sort($result);
         $this->assertEquals(
             $products,
-            array_values($actualProductSkus)
+            $result
         );
+
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        $productSkuList = ['simple1', 'simple2', 'simple3'];
+        foreach ($productSkuList as $sku) {
+            try {
+                $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+                    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+                $product = $productRepository->get($sku, true);
+                if ($product->getId()) {
+                    $productRepository->delete($product);
+                }
+            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+                //Product already removed
+            }
+        }
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
     }
 
     /**
@@ -1563,11 +1846,13 @@ public function testProductWithWrappedAdditionalAttributes()
     }
 
     /**
-     * Import and check data from file
+     * Import and check data from file.
      *
      * @param string $fileName
+     * @param int $expectedErrors
+     * @return void
      */
-    private function importDataForMediaTest($fileName)
+    private function importDataForMediaTest(string $fileName, int $expectedErrors = 0)
     {
         $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -1605,7 +1890,7 @@ private function importDataForMediaTest($fileName)
         $this->assertTrue($errors->getErrorsCount() == 0);
 
         $this->_model->importData();
-        $this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == 0);
+        $this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == $expectedErrors);
     }
 
     /**
@@ -1921,4 +2206,101 @@ public function testImportWithDifferentSkuCase()
             );
         }
     }
+
+    /**
+     * Test that product import with images for non-default store works properly.
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoAppIsolation enabled
+     */
+    public function testImportImageForNonDefaultStore()
+    {
+        $this->importDataForMediaTest('import_media_two_stores.csv');
+        $product = $this->getProductBySku('simple_with_images');
+        $mediaGallery = $product->getData('media_gallery');
+        foreach ($mediaGallery['images'] as $image) {
+            $image['file'] === '/m/a/magento_image.jpg'
+                ? self::assertSame('1', $image['disabled'])
+                : self::assertSame('0', $image['disabled']);
+        }
+    }
+
+    /**
+     * Test import product into multistore system when media is disabled.
+     *
+     * @magentoDataFixture Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testProductsWithMultipleStoresWhenMediaIsDisabled(): void
+    {
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/product_with_custom_store_media_disabled.csv',
+                'directory' => $directory,
+            ]
+        );
+        $errors = $this->_model->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product',
+            ]
+        )->setSource(
+            $source
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() === 0);
+        $this->assertTrue($this->_model->importData());
+    }
+
+    /**
+     * Test that imported product stock status with backorders functionality enabled can be set to 'out of stock'.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testImportWithBackordersEnabled(): void
+    {
+        $this->importFile('products_to_import_with_backorders_enabled_and_0_qty.csv');
+        $product = $this->getProductBySku('simple_new');
+        $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
+    }
+
+    /**
+     * Import file by providing import filename in parameters.
+     *
+     * @param string $fileName
+     * @return void
+     */
+    private function importFile(string $fileName): void
+    {
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/' . $fileName,
+                'directory' => $directory,
+            ]
+        );
+        $errors = $this->_model->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product',
+                \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE => 1,
+            ]
+        )
+        ->setSource($source)
+        ->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+
+        $this->_model->importData();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
new file mode 100644
index 0000000000000..f61aa7578d4a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Import;
+
+use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Tests for the \Magento\CatalogImportExport\Model\Import\Uploader class.
+ */
+class UploaderTest extends \Magento\TestFramework\Indexer\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $directory;
+
+    /**
+     * @var \Magento\CatalogImportExport\Model\Import\Uploader
+     */
+    private $uploader;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->uploader = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Uploader::class);
+
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+
+        $appParams = \Magento\TestFramework\Helper\Bootstrap::getInstance()
+            ->getBootstrap()
+            ->getApplication()
+            ->getInitParams()[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+        $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $tmpDir = $this->directory->getRelativePath($mediaPath . '/import');
+        if (!$this->directory->create($tmpDir)) {
+            throw new \RuntimeException('Failed to create temporary directory');
+        }
+        if (!$this->uploader->setTmpDir($tmpDir)) {
+            throw new \RuntimeException(
+                'Failed to set temporary directory for files.'
+            );
+        }
+
+        parent::setUp();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testMoveWithValidFile(): void
+    {
+        $fileName = 'magento_additional_image_one.jpg';
+        $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
+        copy(__DIR__ . '/_files/' . $fileName, $filePath);
+        $this->uploader->move($fileName);
+        $this->assertTrue($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @return void
+     * @expectedException \Exception
+     * @expectedExceptionMessage Disallowed file type
+     */
+    public function testMoveWithInvalidFile(): void
+    {
+        $fileName = 'media_import_image.php';
+        $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
+        copy(__DIR__ . '/_files/' . $fileName, $filePath);
+        $this->uploader->move($fileName);
+        $this->assertFalse($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes.php
new file mode 100644
index 0000000000000..82c22594f30aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Eav\Model\Entity\Type $entityType */
+$entityType = $objectManager->create(\Magento\Eav\Model\Entity\Type::class);
+$entityType->loadByCode('catalog_product');
+$entityTypeId = $entityType->getId();
+
+/** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+$attributeSet->load('default', 'attribute_set_name');
+$attributeSetId = $attributeSet->getId();
+
+$attributeGroupId = $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId());
+
+$attributeData = [
+    [
+        'attribute_code' => 'test_attribute',
+        'entity_type_id' => $entityTypeId,
+        'backend_type' => 'varchar',
+        'is_required' => 1,
+        'is_user_defined' => 1,
+        'is_unique' => 0,
+        'attribute_set_id' => $attributeSetId,
+        'attribute_group_id' => $attributeGroupId,
+    ],
+];
+
+foreach ($attributeData as $data) {
+    /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
+    $attribute = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
+    $attribute->setData($data);
+    $attribute->setIsStatic(true);
+    $attribute->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php
new file mode 100644
index 0000000000000..7c2cf95d07b38
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$attributeCodes = [
+    'test_attribute',
+];
+
+foreach ($attributeCodes as $attributeCode) {
+    /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
+    $attribute = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
+    $attribute->loadByCode('catalog_product', $attributeCode);
+    if ($attribute->getId()) {
+        $attribute->delete();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
new file mode 100644
index 0000000000000..e1a359fbdaa8f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setName('MV')
+    ->setParentId(2)
+    ->setLevel(2)
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+$website = $objectManager->create(\Magento\Store\Model\Website::class);
+$website->setData(['code' => 'mascota', 'name' => 'mascota', 'default_group_id' => '1', 'is_default' => '0']);
+$website->save();
+
+$groupId = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+    ->getWebsite()
+    ->getDefaultGroupId();
+
+$store = $objectManager->create(\Magento\Store\Model\Store::class)
+    ->setCode('mascota')
+    ->setWebsiteId($website->getId())
+    ->setGroupId($groupId)
+    ->setName('mascota')
+    ->setIsActive(1)
+    ->save();
+
+$entityTypeCode = 'catalog_product';
+$entityType     = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode($entityTypeCode);
+$defaultSetId   = $entityType->getDefaultAttributeSetId();
+
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+$data = [
+    'attribute_set_name'    => 'vinos',
+    'entity_type_id'        => $entityType->getId(),
+    'sort_order'            => 200,
+];
+$attributeSet->setData($data);
+
+$objectManager->create(\Magento\Eav\Model\AttributeSetManagement::class)
+    ->create($entityTypeCode, $attributeSet, $defaultSetId);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled_rollback.php
new file mode 100644
index 0000000000000..ead5c2d39a13e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled_rollback.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->loadByAttribute('name', 'MV');
+if ($category->getId()) {
+    $category->delete();
+}
+
+/** @var $store \Magento\Store\Model\Store */
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$store->load('mascota', 'code');
+if ($store->getId()) {
+    $store->delete();
+}
+
+/** @var $website \Magento\Store\Model\Website */
+$website = $objectManager->create(\Magento\Store\Model\Website::class);
+$website->load('mascota', 'code');
+if ($website->getId()) {
+    $website->delete();
+}
+
+/** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+$attributeSet->load('vinos', 'attribute_set_name');
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_two_stores.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_two_stores.csv
new file mode 100644
index 0000000000000..e276a527b0003
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_two_stores.csv
@@ -0,0 +1,3 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
+simple_with_images,,Default,simple,Default Category,base,Simple Product,Description with <b>html tag</b>,Short description,1,1,0,"Catalog, Search",10,,,,simple-product,meta title,meta keyword,meta description,magento_image.jpg,,magento_image.jpg,,magento_image.jpg,,,,"11/1/17, 1:41 AM","11/1/17, 1:41 AM",,,Block after Info Column,,,,,,,,,,,,,,100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,,,,,,,magento_image.jpg,Image Alt Text,,"name=Test Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-1-select,file_extension=,image_size_x=,image_size_y=,option_title=Option 1|name=Test Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-2-select,file_extension=,image_size_x=,image_size_y=,option_title=Option 2|name=Test Field,type=field,required=1,price=1.0000,price_type=fixed,sku=1-text,max_characters=100,file_extension=,image_size_x=,image_size_y=|name=Test Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-1-radio,file_extension=,image_size_x=,image_size_y=,option_title=Option 1|name=Test Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-2-radio,file_extension=,image_size_x=,image_size_y=,option_title=Option 2|name=Test Date and Time,type=date_time,required=1,price=2.0000,price_type=fixed,sku=2-date,file_extension=,image_size_x=,image_size_y=",,,,,,,,,
+simple_with_images,default,Default,simple,,,,,,,,,,,,,,,,,,,Image Alt Text,,Image Alt Text,,Image Alt Text,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,magento_image.jpg,,,,,,,,,,
\ No newline at end of file
diff --git a/app/design/frontend/Magento/rush/web/css/_styles-m.less b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/magento_additional_image_error.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from app/design/frontend/Magento/rush/web/css/_styles-m.less
rename to dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/magento_additional_image_error.jpg
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv
index 2fb3e879a8aed..ac701022a0815 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv
@@ -1,2 +1,2 @@
 sku,website_code,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,visibility,product_websites,categories,price,special_price,special_price_from_date,special_price_to_date,tax_class_name,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,additional_images,additional_image_labels,configurable_variation_labels,configurable_variations,bundle_price_type,bundle_sku_type,bundle_weight_type,bundle_values,downloadble_samples,downloadble_links,associated_skus,related_skus,crosssell_skus,upsell_skus,custom_options,additional_attributes,manage_stock,is_in_stock,qty,out_of_stock_qty,is_qty_decimal,allow_backorders,min_cart_qty,max_cart_qty,notify_on_stock_below,qty_increments,enable_qty_increments,is_decimal_divided,new_from_date,new_to_date,gift_message_available,created_at,updated_at,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_price,msrp_display_actual_price_type,map_enabled
-simple,base,,Default,simple,New Product,,,9,1,"Catalog, Search",base,,10,,,,Taxable Goods,new-product,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Field Title,type=field,required=1;sku=1-text,price=0,price_type=fixed,max_characters=10|name=Test Date and Time Title,type=date_time,required=1,price=2,option_title=custom option 1,sku=2-date|name=Test Select,type=drop_down,required=1,price=3,option_title=Option 1,sku=3-1-select|name=Test Select,type=drop_down,required=1,price=3,option_title=Option 2,sku=3-2-select|name=Test Radio,type=radio,required=1,price=3,option_title=Option 1,sku=4-1-radio|name=Test Radio,type=radio,required=1,price=3,option_title=Option 2,sku=4-2-radio",,1,1,999,0,0,0,1,10000,1,1,0,0,,,,,,,,,,,Block after Info Column,,,
+simple,base,,Default,simple,New Product,,,9,1,"Catalog, Search",base,,10,,,,Taxable Goods,new-product,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Field Title,type=field,required=1,sku=1-text,price=0,price_type=fixed,max_characters=10|name=Test Date and Time Title,type=date_time,required=1,price=2,sku=2-date|name=Test Select,type=drop_down,required=1,price=3,option_title=Option 1,sku=3-1-select|name=Test Select,type=drop_down,required=1,price=3,option_title=Option 2,sku=3-2-select|name=Test Radio,type=radio,required=1,price=3,option_title=Option 1,sku=4-1-radio|name=Test Radio,type=radio,required=1,price=3,option_title=Option 2,sku=4-2-radio",,1,1,999,0,0,0,1,10000,1,1,0,0,,,,,,,,,,,Block after Info Column,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_and_multiple_store_views.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_and_multiple_store_views.csv
new file mode 100644
index 0000000000000..69d460cde472e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_and_multiple_store_views.csv
@@ -0,0 +1,4 @@
+sku,website_code,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,visibility,product_websites,categories,price,special_price,special_price_from_date,special_price_to_date,tax_class_name,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,additional_images,additional_image_labels,configurable_variation_labels,configurable_variations,bundle_price_type,bundle_sku_type,bundle_weight_type,bundle_values,downloadble_samples,downloadble_links,associated_skus,related_skus,crosssell_skus,upsell_skus,custom_options,additional_attributes,manage_stock,is_in_stock,qty,out_of_stock_qty,is_qty_decimal,allow_backorders,min_cart_qty,max_cart_qty,notify_on_stock_below,qty_increments,enable_qty_increments,is_decimal_divided,new_from_date,new_to_date,gift_message_available,created_at,updated_at,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_price,msrp_display_actual_price_type,map_enabled
+simple,base,,Default,simple,New Product,,,9,1,"Catalog, Search",base,,10,,,,Taxable Goods,new-product,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Select,type=drop_down,required=1,price=3,option_title=Select Option 1,sku=3-1-select|name=Test Select,type=drop_down,required=1,price=3,option_title=Select Option 2,sku=3-2-select|name=Test Field Title,type=field,required=1,sku=1-text,price=0,price_type=fixed,max_characters=10|name=Test Date and Time Title,type=date_time,required=1,price=2,sku=2-date|name=Test Checkbox,type=checkbox,required=1,price=3,option_title=Checkbox Option 1,sku=4-1-select|name=Test Checkbox,type=checkbox,required=1,price=3,option_title=Checkbox Option 2,sku=4-2-select|name=Test Radio,type=radio,required=1,price=3,option_title=Radio Option 1,sku=5-1-radio|name=Test Radio,type=radio,required=1,price=3,option_title=Radio Option 2,sku=5-2-radio",,1,1,999,0,0,0,1,10000,1,1,0,0,,,,,,,,,,,Block after Info Column,,,
+simple,,default,Default,simple,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Select_default,type=drop_down,option_title=Select Option 1_default|name=Test Select_default,type=drop_down,option_title=Select Option 2_default|name=Test Field Title_default,type=field|name=Test Date and Time Title_default,type=date_time|name=Test Checkbox_default,type=checkbox,option_title=Checkbox Option 1_default|name=Test Checkbox_default,type=checkbox,option_title=Checkbox Option 2_default|name=Test Radio_default,type=radio,option_title=Radio Option 1_default|name=Test Radio_default,type=radio,option_title=Radio Option 2_default",,,,,,,,,,,,,,,,,,,,,,,,,,,
+simple,,fixture_second_store,Default,simple,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Select_fixture_second_store,type=drop_down,option_title=Select Option 1_fixture_second_store|name=Test Select_fixture_second_store,type=drop_down,option_title=Select Option 2_fixture_second_store|name=Test Field Title_fixture_second_store,type=field|name=Test Date and Time Title_fixture_second_store,type=date_time|name=Test Checkbox_second_store,type=checkbox,option_title=Checkbox Option 1_second_store|name=Test Checkbox_second_store,type=checkbox,option_title=Checkbox Option 2_second_store|name=Test Radio_fixture_second_store,type=radio,option_title=Radio Option 1_fixture_second_store|name=Test Radio_fixture_second_store,type=radio,option_title=Radio Option 2_fixture_second_store",,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv
index 7fe8832cd5804..f276a96cd1d38 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options_new.csv
@@ -1,2 +1,2 @@
 sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
-simple_new,,Default,simple,,base,"New Product",,,,1,"Taxable Goods","Catalog, Search",10.0000,,,,new-product,"New Product","New Product","New Product ",,,,,,,"2015-10-20 07:05:38","2015-10-20 07:05:38",,,"Block after Info Column",,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,0,1,1.0000,0,0,0,1,,,,,,,"name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-1-radio,option_title=Option 1|name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-2-radio,option_title=Option 2|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-1-select,option_title=Option 1|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-2-select,option_title=Option2|name=Test Date and Time Title,type=date_time,required=1,price=2.0000,price_type=fixed,sku=2-date|name=Test Field Title,type=field,required=1,price=0.0000,price_type=fixed,sku=1-text,max_characters=10",,,,,,
+simple_new,,Default,simple,,base,"New Product",,,,1,"Taxable Goods","Catalog, Search",10.0000,,,,new-product,"New Product","New Product","New Product ",,,,,,,"2015-10-20 07:05:38","2015-10-20 07:05:38",,,"Block after Info Column",,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,0,1,1.0000,0,0,0,1,,,,,,,"name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-1-radio,option_title=Option 1|name=New Radio,type=radio,required=1,price=3.0000,price_type=fixed,sku=4-2-radio,option_title=Option 2|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-1-select,option_title=Option 1|name=New Select,type=drop_down,required=1,price=3.0000,price_type=fixed,sku=3-2-select,option_title=Option2|name=Test Date and Time Title,type=date_time,required=1,price=2.0000,price_type=fixed,sku=2-date|name=Test Field Title,type=field,required=1,price=0.0000,price_type=fixed,sku=1-text,max_characters=10|name=New Select With Zero Price,type=drop_down,required=1,price=0,price_type=fixed,sku=3-1-select,option_title=Option 1",,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_store_media_disabled.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_store_media_disabled.csv
new file mode 100644
index 0000000000000..87e186d4372cd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_store_media_disabled.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus
+54011,mascota,vinos,simple,MV,mascota,Gran Mascota Malbec,"<p>Elaborado con uvas de vi&ntilde;edos seleccionados que se ubican a 1.050 metros sobre el nivel del mar, en el Valle de Uco, Mendoza. Posee una crianza de 18 meses en barricas nuevas de roble franc&eacute;s y, luego, 6 meses de a&ntilde;ejamiento en botella.</p>","<p>Selecci&oacute;n de uvas de nuestros vi&ntilde;edos, ubicados a 1.050 metros sobre el nivel del mar, en el Valle de Uco, Mendoza. Criado 18 meses en barricas nuevas de roble franc&eacute;s y a&ntilde;ejado durante 6 meses en botella.</p>",1,1,0,"Catalog, Search",529, , , ,GranMascotaMalbec-html,Gran Mascota Malbec,Gran Mascota Malbec,,,,,,,,,,,, , ,Block after Info Column, , , ,Use config, , , , , , , ,Argentina,"acidez_total=5.95 g/l,altitud=1050,altitud_rangos=900-1100,azucar_residual=5%,barrica=roble frances,bodega=Mascota Vineyards,color2=Tinto,composicion_blend=Malbec,composicion_del_suelo= arcillosos asentados sobre canto rodado,cosecha=2000,ean= 7790762052494,enologo=Rodolfo Opi Sadler,gift_wrapping_available=No,graduacion_alcoholica=15%,linea=Gran Mascota,manufacturer=Grupo Peñaflor,maridaje=Es el vino ideal para acompañar carnes rojas grilladas y un típico asado argentino,notas_de_cata=Presenta aromas a frutos rojos maduros como ciruelas y cerezas con notas de menta. Jugoso en boca; con taninos aterciopelados. Herbáceo en el paladar medio con carácter mineral. Final largo y persistente.,origen_del_suelo=Aluvional Alto,pais=Argentina,ph=15%,potencial_de_guarda=2 años,premios=,presentacion_ml=750,provincia=Mendoza,puntuacion_decanter=silver,puntuacion_james_suckiling=92 pts,puntuacion_parker=90 pts,puntuacion_tim_atkin=93 pts,puntuacion_wine_spectator=,rangos_puntajes=90-92|93-94,rango_decanter=silver, region=Cuyo,temperatura_de_servicio=16-18°C,tiempo_en_barrica=18 meses,unidad_de_venta=caja,valle=San Carlos,varietal=Malbec,vi_edo=Valle de Uco",100,0,1,0,0,1,0,1,100,1,1,0,1,1,1,1,6,1,0,0,mascota,0,1, , , , , , ,, , , , , , , , ,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_without_custom_options.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_without_custom_options.csv
new file mode 100644
index 0000000000000..17bffb427a0e9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_without_custom_options.csv
@@ -0,0 +1,2 @@
+sku,website_code,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,visibility,product_websites,categories,price,special_price,special_price_from_date,special_price_to_date,tax_class_name,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,additional_images,additional_image_labels,configurable_variation_labels,configurable_variations,bundle_price_type,bundle_sku_type,bundle_weight_type,bundle_values,downloadble_samples,downloadble_links,associated_skus,related_skus,crosssell_skus,upsell_skus,custom_options,additional_attributes,manage_stock,is_in_stock,qty,out_of_stock_qty,is_qty_decimal,allow_backorders,min_cart_qty,max_cart_qty,notify_on_stock_below,qty_increments,enable_qty_increments,is_decimal_divided,new_from_date,new_to_date,gift_message_available,created_at,updated_at,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_price,msrp_display_actual_price_type,map_enabled
+simple,base,,Default,simple,New Product,,,9,1,"Catalog, Search",base,,10,,,,Taxable Goods,new-product,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,999,0,0,0,1,10000,1,1,0,0,,,,,,,,,,,Block after Info Column,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_enabled_and_0_qty.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_enabled_and_0_qty.csv
new file mode 100644
index 0000000000000..e2107766c37bd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_enabled_and_0_qty.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,,,,,,,10/20/2015 7:05,10/20/2015 7:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",0,0,1,0,1,0,1,1,10000,1,0,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_invalid_url_keys.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_invalid_url_keys.csv
new file mode 100644
index 0000000000000..25bb95ab9e0fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_invalid_url_keys.csv
@@ -0,0 +1,4 @@
+sku,product_type,store_view_code,name,price,attribute_set_code,url_key
+simple1,simple,,"simple 1",25,Default,cuvée merlot-cabernet igp pays d'oc frankrijk
+simple2,simple,,"simple 2",34,Default,normal-url
+simple3,simple,,"simple 3",58,Default,some!wrong'url
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_two_stores.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_two_stores.csv
index f343cd20ecc78..eda9f3a01bf55 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_two_stores.csv
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_two_stores.csv
@@ -1,4 +1,4 @@
 product_websites,store_view_code,attribute_set_code,product_type,categories,sku,price,name,url_key
-base,,Default,simple,Default Category/category-defaultstore,product,123,product,product
+base,,Default,simple,Default Category/category-admin,product,123,product,product
 ,default,Default,simple,,product,,product-default,product-default
 ,fixturestore,Default,simple,,product,,product-fixture,product-fixture
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys_and_name.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys_and_name.csv
new file mode 100644
index 0000000000000..8ea6ab92a0295
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys_and_name.csv
@@ -0,0 +1,3 @@
+sku,price
+simple1,25
+simple2,34
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
index a118ae99d8a1f..11cc73e2cf944 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
@@ -10,6 +10,14 @@
  */
 class ProductTest extends AbstractProductExportImportTestCase
 {
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->markTestSkipped('MAGETWO-97378');
+    }
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -97,10 +105,16 @@ public function exportImportDataProvider()
             'simple-product-image' => [
                 [
                     'Magento/CatalogImportExport/Model/Import/_files/media_import_image.php',
-                    'Magento/Catalog/_files/product_with_image.php'
+                    'Magento/Catalog/_files/product_with_image.php',
                 ],
                 [
                     'simple',
+                ],
+                [
+                    "image",
+                    "small_image",
+                    "thumbnail",
+                    "media_gallery"
                 ]
             ],
             'simple-product-crosssell' => [
@@ -134,4 +148,32 @@ public function importReplaceDataProvider()
     {
         return $this->exportImportDataProvider();
     }
+
+    /**
+     * Fixing https://github.com/magento-engcom/import-export-improvements/issues/50 means that during import images
+     * can now get renamed for this we need to skip the attribute checking and instead check that the images contain
+     * the right beginning part of the name. When an image is named "magento_image.jpeg" but there is already an image
+     * with that name it will now become "magento_image_1.jpeg"
+     *
+     * @param \Magento\Catalog\Model\Product $expectedProduct
+     * @param \Magento\Catalog\Model\Product $actualProduct
+     */
+    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
+    {
+        if (!empty($actualProduct->getImage())
+            && !empty($expectedProduct->getImage())
+        ) {
+            $this->assertContains('magento_image', $actualProduct->getImage());
+        }
+        if (!empty($actualProduct->getSmallImage())
+            && !empty($expectedProduct->getSmallImage())
+        ) {
+            $this->assertContains('magento_image', $actualProduct->getSmallImage());
+        }
+        if (!empty($actualProduct->getThumbnail())
+            && !empty($expectedProduct->getThumbnail())
+        ) {
+            $this->assertContains('magento_image', $actualProduct->getThumbnail());
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
index 5157874172579..477494626b9fb 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
@@ -70,7 +70,7 @@
 )->setPrice(
     10
 )->addData(
-    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/']
+    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª']
 )->setTierPrice(
     [0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]]
 )->setVisibility(
@@ -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_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
index 2ad3cd3c96ccb..168073bc6ab74 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
@@ -8,3 +8,7 @@
 require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
 /** Delete text attribute */
 require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
+
+require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
+
+require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
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 8c7e0ab151410..591dccf229f89 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
@@ -25,12 +25,12 @@
     ->setName('New Product')
     ->setSku('simple &quot;1&quot;')
     ->setPrice(10)
-    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'])
+    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª'])
     ->setTierPrice([0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]])
     ->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_data_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
index 2ad3cd3c96ccb..168073bc6ab74 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
@@ -8,3 +8,7 @@
 require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
 /** Delete text attribute */
 require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
+
+require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
+
+require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_images.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_images.php
new file mode 100644
index 0000000000000..da456767257e1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_images.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require dirname(__DIR__, 2) . '/Catalog/_files/product_image.php';
+require dirname(__DIR__, 2) . '/Catalog/_files/product_simple.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$product = $productRepository->get('simple');
+$product->setStoreId(0)
+    ->setImage('/m/a/magento_image.jpg')
+    ->setSmallImage('/m/a/magento_image.jpg')
+    ->setThumbnail('/m/a/magento_image.jpg')
+    ->setData(
+        'media_gallery',
+        [
+            'images' => [
+                [
+                    'file' => '/m/a/magento_image.jpg',
+                    'position' => 1,
+                    'label' => 'Image Alt Text',
+                    'disabled' => 0,
+                    'media_type' => 'image',
+                ],
+            ],
+        ]
+    )->save();
+$image = array_shift($product->getData('media_gallery')['images']);
+$product = $productRepository->get('simple', false, 1, true);
+$product->setData(
+    'media_gallery',
+    [
+        'images' => [
+            [
+                'value_id' => $image['value_id'],
+                'file' => $image['file'],
+                'disabled' => 1,
+                'media_type' => 'image',
+            ],
+        ],
+    ]
+);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_images_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_images_rollback.php
new file mode 100644
index 0000000000000..d7a52465ead4a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_images_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require dirname(__DIR__, 2) . '/Catalog/_files/product_image_rollback.php';
+require dirname(__DIR__, 2) . '/Catalog/_files/product_simple_rollback.php';
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 d9482c40338a3..5a6b1720f5a35 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
@@ -7,7 +7,7 @@
 require dirname(dirname(__DIR__)) . '/Catalog/_files/category.php';
 /** Create fixture store */
 require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
-/** Create product with mulselect attribute */
+/** Create product with multiselect attribute */
 require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute.php';
 
 $productModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -34,10 +34,10 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
+)->setCategoryIds(
     []
 )->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/update_category_duplicates.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates.php
new file mode 100644
index 0000000000000..53d30e834a07d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require dirname(dirname(__DIR__)) . '/Catalog/_files/category_duplicates.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Model\Category $category */
+$categoryModel = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryModel->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+
+$categoryModel->load(444)
+    ->setName('Category 2-updated')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates_rollback.php
new file mode 100644
index 0000000000000..ca0f379a03dc5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/update_category_duplicates_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require dirname(dirname(__DIR__)) . '/Catalog/_files/category_duplicates_rollback.php';
+
+//Delete products created in CSV import
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$csvProductSkus = ['simple1', 'simple2', 'simple3'];
+foreach ($csvProductSkus as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Api/StockItemSaveTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Api/StockItemSaveTest.php
index 355999e6a904d..72973c33b4620 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Api/StockItemSaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Api/StockItemSaveTest.php
@@ -13,6 +13,7 @@ class StockItemSaveTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSave()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Plugin/ProductSearchTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Plugin/ProductSearchTest.php
new file mode 100644
index 0000000000000..b947895021d29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Plugin/ProductSearchTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\Plugin;
+
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ProductSearchTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var array
+     */
+    private $stockItemData = [
+        StockItemInterface::QTY => 555,
+        StockItemInterface::MANAGE_STOCK => true,
+        StockItemInterface::IS_IN_STOCK => false,
+    ];
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
+     */
+    public function testExecute() : void
+    {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+        $product->setQuantityAndStockStatus($this->stockItemData);
+        $product->save();
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains(
+            '"options":{"1":{"value":"1","label":"Simple Product","is_active":1,"path":"simple","optgroup":false}',
+            $responseBody
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 0
+     */
+    public function testExecuteNotShowOutOfStock() : void
+    {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+        $product->setQuantityAndStockStatus($this->stockItemData);
+        $product->save();
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertNotContains(
+            '"options":{"1":{"value":"1","label":"Simple Product","is_active":1,"path":"simple","optgroup":false}',
+            $responseBody
+        );
+    }
+}
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 6d59a08912c39..6105aba9201e2 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
@@ -5,12 +5,20 @@
  */
 namespace Magento\CatalogInventory\Model\Quote\Item;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Model\Stock\StockItemRepository;
+use Magento\CatalogInventory\Model\StockState;
+use Magento\CatalogInventory\Observer\QuantityValidatorObserver;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option;
 use Magento\Framework\Event\Observer;
-use Magento\CatalogInventory\Model\StockState;
-use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator;
-use Magento\CatalogInventory\Observer\QuantityValidatorObserver;
 use Magento\Framework\Event;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\DataObject;
@@ -58,6 +66,9 @@ class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
      */
     private $observer;
 
+    /**
+     * Set up
+     */
     protected function setUp()
     {
         /** @var \Magento\Framework\ObjectManagerInterface objectManager */
@@ -83,7 +94,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testQuoteWithOptions()
@@ -93,7 +104,7 @@ public function testQuoteWithOptions()
 
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var $product Product */
         $product = $productRepository->get('bundle-product');
         $resultMock = $this->createMock(DataObject::class);
         $this->stockState->expects($this->any())->method('checkQtyIncrements')->willReturn($resultMock);
@@ -108,7 +119,7 @@ public function testQuoteWithOptions()
 
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testQuoteWithOptionsWithErrors()
@@ -117,7 +128,7 @@ public function testQuoteWithOptionsWithErrors()
         $session = $this->objectManager->create(Session::class);
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-        /** @var $product \Magento\Catalog\Model\Product */
+        /** @var $product Product */
         $product = $productRepository->get('bundle-product');
         /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
         $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
@@ -130,15 +141,127 @@ 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');
+        $this->assertCount(1, $quoteItem->getErrorInfos(), 'Expected 1 error 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.');
+    }
+
+    /**
+     * Tests quantity verifications for configurable product.
+     *
+     * @param int $quantity - quantity of configurable option.
+     * @param string $errorMessageRegexp - expected error message regexp.
+     * @return void
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     * @dataProvider quantityDataProvider
+     * @magentoDataFixture Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testConfigurableWithOptions(int $quantity, string $errorMessageRegexp): void
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var Product $product */
+        $product = $productRepository->get('configurable');
+        $product->setStatus(Status::STATUS_ENABLED)
+            ->setData('is_salable', true);
+        $productRepository->save($product);
+
+        /** @var StockItemRepository $stockItemRepository */
+        $stockItemRepository = $this->objectManager->create(StockItemRepository::class);
+
+        /** @var StockItemInterface $stockItem */
+        $stockItem = $stockItemRepository->get($product->getExtensionAttributes()
+            ->getStockItem()
+            ->getItemId());
+        $stockItem->setIsInStock(true)
+            ->setQty(1000);
+        $stockItemRepository->save($stockItem);
+
+        /** @var Config $eavConfig */
+        $eavConfig = $this->objectManager->get(Config::class);
+        /** @var  $attribute */
+        $attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+
+        $request = $this->objectManager->create(DataObject::class);
+        $request->setData(
+            [
+                'product_id' => $product->getId(),
+                'selected_configurable_option' => 1,
+                'super_attribute' => [
+                    $attribute->getAttributeId() => $attribute->getOptions()[1]->getValue()
+                ],
+                'qty' => $quantity
+            ]
+        );
+
+        try {
+            /** @var Quote $cart */
+            $cart = $this->objectManager->create(CartInterface::class);
+            $result = $cart->addProduct($product, $request);
+
+            if (empty($errorMessageRegexp)) {
+                self::assertEquals('Configurable Product', $result->getName());
+            }
+        } catch (LocalizedException $e) {
+            self::assertEquals(1, preg_match($errorMessageRegexp, $e->getMessage()));
+        }
+    }
+
+    /**
+     * Provides request quantity for configurable option
+     * and corresponding error message.
+     *
+     * @return array
+     */
+    public function quantityDataProvider(): array
+    {
+        $qtyRegexp = '/You can buy (this product|Configurable OptionOption 1) only in quantities of 500 at a time/';
+
+        return [
+            [
+                'quantity' => 1,
+                'error_regexp' => '/The fewest you may purchase is 500/'
+            ],
+            [
+                'quantity' => 501,
+                'error_regexp' => $qtyRegexp
+            ],
+            [
+                'quantity' => 1000,
+                'error_regexp' => ''
+            ],
+
+        ];
     }
 
     /**
      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
      *
-     * @param \Magento\Quote\Model\Quote $quote
-     * @param $productId
+     * @param Quote $quote
+     * @param int $productId
      * @return \Magento\Quote\Model\Quote\Item
      */
     private function _getQuoteItemIdByProductId($quote, $productId)
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStockTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStockTest.php
index ae6004d477699..5d790b6cfd008 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStockTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStockTest.php
@@ -36,6 +36,8 @@ protected function setUp()
      * @magentoDataFixture Magento/Store/_files/website.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      *
+     * @magentoDbIsolation disabled
+     *
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testReindexEntity()
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/ByStockItemRepositoryTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/ByStockItemRepositoryTest.php
index ae67d3fa1eddc..d2c964db90e6b 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/ByStockItemRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/ByStockItemRepositoryTest.php
@@ -56,6 +56,7 @@ public function setUp()
      * Test stock item saving via stock item repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSave()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByQuantityAndStockStatusTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByQuantityAndStockStatusTest.php
index 6864b9a345602..bdf3f1d793e25 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByQuantityAndStockStatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByQuantityAndStockStatusTest.php
@@ -41,8 +41,8 @@ class ByQuantityAndStockStatusTest extends \PHPUnit\Framework\TestCase
     private $productData = [
         ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
         'website_ids' => [1],
-        ProductInterface::NAME => 'Simple',
-        ProductInterface::SKU => 'simple',
+        ProductInterface::NAME => 'simpleForByQuantityAndStockStatusTest',
+        ProductInterface::SKU => 'simpleForByQuantityAndStockStatusTest',
         ProductInterface::PRICE => 100,
         ProductInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
@@ -81,7 +81,7 @@ public function testSaveBySetQuantityAndStockStatus()
         $product->setQuantityAndStockStatus($this->stockItemData);
         $product->save();
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByQuantityAndStockStatusTest', $this->stockItemData);
     }
 
     /**
@@ -96,6 +96,6 @@ public function testSaveBySetData()
         $product->setData('quantity_and_stock_status', $this->stockItemData);
         $product->save();
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByQuantityAndStockStatusTest', $this->stockItemData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockDataTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockDataTest.php
index eae20bda1a94a..a9186f3583ac4 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockDataTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockDataTest.php
@@ -41,8 +41,8 @@ class ByStockDataTest extends \PHPUnit\Framework\TestCase
     private $productData = [
         ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
         'website_ids' => [1],
-        ProductInterface::NAME => 'Simple',
-        ProductInterface::SKU => 'simple',
+        ProductInterface::NAME => 'simpleForByStockDataTest',
+        ProductInterface::SKU => 'simpleForByStockDataTest',
         ProductInterface::PRICE => 100,
         ProductInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
@@ -80,7 +80,7 @@ public function testSaveBySetStockData()
         $product->setStockData($this->stockItemData);
         $product->save();
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockDataTest', $this->stockItemData);
     }
 
     /**
@@ -95,6 +95,6 @@ public function testSaveBySetData()
         $product->setData('stock_data', $this->stockItemData);
         $product->save();
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockDataTest', $this->stockItemData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockItemTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockItemTest.php
index 25b9817bcf572..1209c16971056 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockItemTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductModel/ByStockItemTest.php
@@ -47,8 +47,8 @@ class ByStockItemTest extends \PHPUnit\Framework\TestCase
     private $productData = [
         ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
         'website_ids' => [1],
-        ProductInterface::NAME => 'Simple',
-        ProductInterface::SKU => 'simple',
+        ProductInterface::NAME => 'simpleByStockItemTest',
+        ProductInterface::SKU => 'simpleByStockItemTest',
         ProductInterface::PRICE => 100,
         ProductInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
@@ -88,7 +88,7 @@ public function testSave()
         $this->dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
         $product->save();
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleByStockItemTest', $this->stockItemData);
     }
 
     /**
@@ -107,6 +107,6 @@ public function testSaveManuallyCreatedStockItem()
         $product->getExtensionAttributes()->setStockItem($stockItem);
         $product->save();
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleByStockItemTest', $this->stockItemData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByQuantityAndStockStatusTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByQuantityAndStockStatusTest.php
index 6269d7a20f4fc..59f3526b7677b 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByQuantityAndStockStatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByQuantityAndStockStatusTest.php
@@ -47,8 +47,8 @@ class ByQuantityAndStockStatusTest extends \PHPUnit\Framework\TestCase
     private $productData = [
         ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
         'website_ids' => [1],
-        ProductInterface::NAME => 'Simple',
-        ProductInterface::SKU => 'simple',
+        ProductInterface::NAME => 'simpleForQuantityAndStockStatus',
+        ProductInterface::SKU => 'simpleForQuantityAndStockStatus',
         ProductInterface::PRICE => 100,
         ProductInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
@@ -90,7 +90,7 @@ public function testSaveBySetQuantityAndStockStatus()
         $product->setQuantityAndStockStatus($this->stockItemData);
         $this->productRepository->save($product);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForQuantityAndStockStatus', $this->stockItemData);
     }
 
     /**
@@ -105,6 +105,6 @@ public function testSaveBySetData()
         $product->setData('quantity_and_stock_status', $this->stockItemData);
         $this->productRepository->save($product);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForQuantityAndStockStatus', $this->stockItemData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockDataTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockDataTest.php
index fa7cc39f7584f..b8202e413cae3 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockDataTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockDataTest.php
@@ -47,8 +47,8 @@ class ByStockDataTest extends \PHPUnit\Framework\TestCase
     private $productData = [
         ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
         'website_ids' => [1],
-        ProductInterface::NAME => 'Simple',
-        ProductInterface::SKU => 'simple',
+        ProductInterface::NAME => 'simpleForByStockDataTest',
+        ProductInterface::SKU => 'simpleForByStockDataTest',
         ProductInterface::PRICE => 100,
         ProductInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
@@ -89,7 +89,7 @@ public function testSaveBySetStockData()
         $product->setStockData($this->stockItemData);
         $this->productRepository->save($product);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockDataTest', $this->stockItemData);
     }
 
     /**
@@ -104,6 +104,6 @@ public function testSaveBySetData()
         $product->setData('stock_data', $this->stockItemData);
         $this->productRepository->save($product);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockDataTest', $this->stockItemData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockItemTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockItemTest.php
index 857457325c755..3d227a8622c29 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockItemTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductCreate/ByProductRepository/ByStockItemTest.php
@@ -58,8 +58,8 @@ class ByStockItemTest extends \PHPUnit\Framework\TestCase
     private $productData = [
         ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
         'website_ids' => [1],
-        ProductInterface::NAME => 'Simple',
-        ProductInterface::SKU => 'simple',
+        ProductInterface::NAME => 'simpleForByStockItemTest',
+        ProductInterface::SKU => 'simpleForByStockItemTest',
         ProductInterface::PRICE => 100,
         ProductInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
@@ -103,7 +103,7 @@ public function testSave()
         $this->dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
         $this->productRepository->save($product);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockItemTest', $this->stockItemData);
     }
 
     /**
@@ -122,7 +122,7 @@ public function testSaveManuallyCreatedStockItem()
         $product->getExtensionAttributes()->setStockItem($stockItem);
         $this->productRepository->save($product);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockItemTest', $this->stockItemData);
     }
 
     /**
@@ -139,6 +139,6 @@ public function testAutomaticallyStockItemCreating()
         $this->dataObjectHelper->populateWithArray($stockItem, $this->stockItemData, StockItemInterface::class);
         $this->stockItemRepository->save($stockItem);
 
-        $this->stockItemDataChecker->checkStockItemData('simple', $this->stockItemData);
+        $this->stockItemDataChecker->checkStockItemData('simpleForByStockItemTest', $this->stockItemData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByQuantityAndStockStatusTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByQuantityAndStockStatusTest.php
index ce5d981e5caf2..3fb3fc17a7416 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByQuantityAndStockStatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByQuantityAndStockStatusTest.php
@@ -44,6 +44,7 @@ public function setUp()
      * model (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetQuantityAndStockStatus()
     {
@@ -60,6 +61,7 @@ public function testSaveBySetQuantityAndStockStatus()
      * via product model (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetData()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockDataTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockDataTest.php
index 0b7e76492b37a..9373805e2c415 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockDataTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockDataTest.php
@@ -44,6 +44,7 @@ public function setUp()
      * model (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetStockData()
     {
@@ -60,6 +61,7 @@ public function testSaveBySetStockData()
      * via product model (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetData()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockItemTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockItemTest.php
index 2a4b7937f7163..922d47ec15242 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockItemTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductModel/ByStockItemTest.php
@@ -58,6 +58,7 @@ public function setUp()
      * Test saving of stock item by product data via product model (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSave()
     {
@@ -75,6 +76,7 @@ public function testSave()
      * product model (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveManuallyCreatedStockItem()
     {
@@ -95,6 +97,7 @@ public function testSaveManuallyCreatedStockItem()
      * product repository (deprecated)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveManuallyUpdatedStockItem()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByQuantityAndStockStatusTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByQuantityAndStockStatusTest.php
index 4e04afd5d8b82..d4954370bbb7f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByQuantityAndStockStatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByQuantityAndStockStatusTest.php
@@ -44,6 +44,7 @@ public function setUp()
      * repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetQuantityAndStockStatus()
     {
@@ -60,6 +61,7 @@ public function testSaveBySetQuantityAndStockStatus()
      * via product repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetData()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockDataTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockDataTest.php
index 4969324ec84b9..e35d3afeea7dd 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockDataTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockDataTest.php
@@ -43,6 +43,7 @@ public function setUp()
      * Test saving of stock item on product save by 'setStockData' method (deprecated) via product repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetStockData()
     {
@@ -59,6 +60,7 @@ public function testSaveBySetStockData()
      * via product repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveBySetData()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockItemTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockItemTest.php
index 81871d3398c1e..fcd41efaae9b0 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockItemTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/OnProductUpdate/ByProductRepository/ByStockItemTest.php
@@ -65,6 +65,7 @@ public function setUp()
      * Test saving of stock item by product data via product repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSave()
     {
@@ -82,6 +83,7 @@ public function testSave()
      * product repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveManuallyCreatedStockItem()
     {
@@ -102,6 +104,7 @@ public function testSaveManuallyCreatedStockItem()
      * product repository
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
      */
     public function testSaveManuallyUpdatedStockItem()
     {
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 9913fea79817a..eabb26a87e38c 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/CatalogInventory/Observer/AddStockItemsObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Observer/AddStockItemsObserverTest.php
new file mode 100644
index 0000000000000..71af5d102a8d7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Observer/AddStockItemsObserverTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Observer;
+
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\ResourceModel\Quote\Item\Collection;
+use Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class AddStockItemsObserverTest extends TestCase
+{
+    /**
+     * Test addStockItemsObserver add stock items to products as extension attributes in quote item collection.
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     */
+    public function testAddStockItemsToProductCollection()
+    {
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+        /** @var CollectionFactory $collectionFactory */
+        $collectionFactory = Bootstrap::getObjectManager()->create(CollectionFactory::class);
+        /** @var Collection $collection */
+        $collection = $collectionFactory->create();
+        $collection->setQuote($quote);
+        /** @var Quote\Item $quoteItem */
+        foreach ($collection->getItems() as $quoteItem) {
+            self::assertNotEmpty($quoteItem->getProduct()->getExtensionAttributes()->getStockItem());
+            self::assertInstanceOf(
+                StockItemInterface::class,
+                $quoteItem->getProduct()->getExtensionAttributes()->getStockItem()
+            );
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php
new file mode 100644
index 0000000000000..901a1d3344480
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/configurable_options_advanced_inventory.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StockItemRepositoryInterface $stockItemRepository */
+$stockItemRepository = $objectManager->get(StockItemRepositoryInterface::class);
+
+/** @var ProductInterface $product */
+$product = $productRepository->get('simple_10');
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $product->getExtensionAttributes()->getStockItem();
+$stockItem->setIsInStock(true)
+    ->setQty(10000)
+    ->setUseConfigMinSaleQty(false)
+    ->setMinSaleQty(500)
+    ->setUseConfigEnableQtyInc(false)
+    ->setEnableQtyIncrements(true)
+    ->setUseConfigQtyIncrements(false)
+    ->setQtyIncrements(500);
+
+$stockItemRepository->save($stockItem);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php
index c06a1e9f6881e..11556dcfb7e7b 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/BatchIndexTest.php
@@ -60,7 +60,7 @@ protected function tearDown()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @dataProvider dataProvider
      * @magentoAppIsolation enabled
      * @magentoAppArea adminhtml
@@ -102,17 +102,20 @@ protected function prepareProducts($price)
             ->setUrlKey(null)
             ->setSku(uniqid($this->product->getSku() . '-'))
             ->setName(uniqid($this->product->getName() . '-'))
-            ->setWebsiteIds([1]);
-        $productSecond->save();
-        $productSecond->setPrice($price)->save();
+            ->setWebsiteIds([1])
+            ->save();
+        $productSecond->setPrice($price);
+        $this->productRepository->save($productSecond);
         $productThird = clone $this->product;
         $productThird->setId(null)
             ->setUrlKey(null)
-            ->setSku(uniqid($this->product->getSku() . '-'))
-            ->setName(uniqid($this->product->getName() . '-'))
+            ->setSku(uniqid($this->product->getSku() . '--'))
+            ->setName(uniqid($this->product->getName() . '--'))
             ->setWebsiteIds([1])
             ->save();
-        $productThird->setPrice($price)->save();
+        $productThird->setPrice($price);
+        $this->productRepository->save($productThird);
+
         return [
             $productSecond->getEntityId(),
             $productThird->getEntityId(),
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php
index 0a8eb0e72d8c8..13f6e5ae0e8ed 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php
@@ -65,7 +65,7 @@ protected function tearDown()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixture Magento/CatalogRule/_files/rule_by_attribute.php
@@ -83,7 +83,7 @@ public function testReindexById()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixture Magento/CatalogRule/_files/rule_by_attribute.php
@@ -110,7 +110,7 @@ public function testReindexByIds()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/rule_by_attribute.php
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php
new file mode 100644
index 0000000000000..495d19a2745e5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogRule\Model\Indexer\Product;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\CatalogRule\Model\ResourceModel\Rule;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\SortOrder;
+
+class PriceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Rule
+     */
+    private $resourceRule;
+
+    protected function setUp()
+    {
+        $this->resourceRule = Bootstrap::getObjectManager()->get(Rule::class);
+    }
+
+    /**
+     * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/configurable_product.php
+     * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/rule_by_attribute.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testPriceApplying()
+    {
+        $customerGroupId = 1;
+        $websiteId = 1;
+
+        $simpleProductId = 1;
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($simpleProductId);
+        $collection->addPriceData($customerGroupId, $websiteId);
+        $collection->load();
+        /** @var \Magento\Catalog\Model\Product $simpleProduct */
+        $simpleProduct = $collection->getFirstItem();
+        $simpleProduct->setPriceCalculation(false);
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, $customerGroupId, $simpleProductId);
+        $this->assertEquals($rulePrice, $simpleProduct->getFinalPrice());
+
+        $confProductId = 666;
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($confProductId);
+        $collection->addPriceData($customerGroupId, $websiteId);
+        $collection->load();
+        /** @var \Magento\Catalog\Model\Product $confProduct */
+        $confProduct = $collection->getFirstItem();
+        $this->assertEquals($simpleProduct->getFinalPrice(), $confProduct->getMinimalPrice());
+    }
+
+    /**
+     * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/simple_products.php
+     * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/rule_by_attribute.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoAppArea frontend
+     */
+    public function testSortByPrice()
+    {
+        $searchCriteria = Bootstrap::getObjectManager()->create(SearchCriteriaInterface::class);
+        $sortOrder = Bootstrap::getObjectManager()->create(SortOrder::class);
+        $sortOrder->setField('price')->setDirection(SortOrder::SORT_ASC);
+        $searchCriteria->setSortOrders([$sortOrder]);
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $searchResults = $productRepository->getList($searchCriteria);
+        /** @var \Magento\Catalog\Model\Product[] $products */
+        $products = array_values($searchResults->getItems());
+
+        $product1 = $products[0];
+        $product1->setPriceCalculation(false);
+        $this->assertEquals('simple1', $product1->getSku());
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product1->getId());
+        $this->assertEquals($rulePrice, $product1->getFinalPrice());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
index 76d17527d567a..911c7aa30641e 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
@@ -67,7 +67,7 @@ public function testReindexWithProductNotVisibleIndividually()
         $this->assertEquals(
             7.5,
             $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
-            "Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
+            "Catalog price rule doesn't apply to product with visibility value \"Not Visibility Individually\""
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/RuleProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/RuleProductTest.php
index 4fb9b5463e861..a4a99918fe052 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/RuleProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/RuleProductTest.php
@@ -32,6 +32,7 @@ protected function setUp()
     }
 
     /**
+     * @magentoDbIsolation disabled
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixtureBeforeTransaction Magento/CatalogRule/_files/rule_by_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
@@ -39,7 +40,7 @@ protected function setUp()
     public function testReindexAfterRuleCreation()
     {
         /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Catalog\Model\ProductRepository::class
         );
         $product = $productRepository->get('simple');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php
new file mode 100644
index 0000000000000..78fa255897dbc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php
@@ -0,0 +1,1017 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\ResourceModel\Product;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product;
+
+// @codingStandardsIgnoreFile
+
+class ConditionsToCollectionApplierTest extends \PHPUnit\Framework\TestCase
+{
+    private $objectManager;
+
+    private $productCollectionFactory;
+
+    private $conditionsToCollectionApplier;
+
+    private $combinedConditionFactory;
+
+    private $simpleConditionFactory;
+
+    private $categoryCollectionFactory;
+
+    private $setFactory;
+
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->productCollectionFactory = $this->objectManager
+            ->get(\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class);
+
+        $this->conditionsToCollectionApplier = $this->objectManager
+            ->get(\Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier::class);
+
+        $this->combinedConditionFactory = $this->objectManager
+            ->get(\Magento\CatalogRule\Model\Rule\Condition\CombineFactory::class);
+
+        $this->simpleConditionFactory = $this->objectManager
+            ->get(\Magento\CatalogRule\Model\Rule\Condition\ProductFactory::class);
+
+        $this->categoryCollectionFactory = $this->objectManager
+            ->get(\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class);
+
+        $this->setFactory = $this->objectManager
+            ->get(\Magento\Eav\Model\Entity\Attribute\SetFactory::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogRule/_files/conditions_to_collection/categories.php
+     * @magentoDataFixture Magento/CatalogRule/_files/conditions_to_collection/attribute_sets.php
+     * @magentoDataFixture Magento/CatalogRule/_files/conditions_to_collection/products.php
+     *
+     * @magentoDbIsolation disabled
+     */
+    public function testVariations()
+    {
+        foreach ($this->conditionProvider() as $variationName => $variationData) {
+            $condition = $variationData['condition'];
+            $expectedSkuList = $variationData['expected-sku'];
+
+            $productCollection = $this->productCollectionFactory->create();
+            $resultCollection = $this->conditionsToCollectionApplier
+                ->applyConditionsToCollection($condition, $productCollection);
+
+            $resultSkuList = array_map(
+                function (Product $product) {
+                    return $product->getSku();
+                },
+                array_values($resultCollection->getItems())
+            );
+
+            asort($expectedSkuList);
+            asort($resultSkuList);
+
+            $this->assertEquals($expectedSkuList, $resultSkuList, sprintf('%s failed', $variationName));
+        }
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Undefined rule operator "====" passed in. Valid operators are: ==,!=,>=,<=,>,<,{},!{},(),!()
+     *
+     * @magentoDbIsolation disabled
+     */
+    public function testExceptionUndefinedRuleOperator()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 0,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '====',
+                    'value' => 42,
+                    'attribute' => 'attribute_set_id'
+                ]
+            ]
+        ];
+
+        $combineCondition = $this->getCombineConditionFromArray($conditions);
+
+        $productCollection = $this->productCollectionFactory->create();
+        $this->conditionsToCollectionApplier
+            ->applyConditionsToCollection($combineCondition, $productCollection);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Undefined rule aggregator "olo-lo" passed in. Valid operators are: all,any
+     *
+     * @magentoDbIsolation disabled
+     */
+    public function testExceptionUndefinedRuleAggregator()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'olo-lo',
+            'value' => 0,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => 42,
+                    'attribute' => 'attribute_set_id'
+                ]
+            ]
+        ];
+
+        $combineCondition = $this->getCombineConditionFromArray($conditions);
+
+        $productCollection = $this->productCollectionFactory->create();
+        $this->conditionsToCollectionApplier
+            ->applyConditionsToCollection($combineCondition, $productCollection);
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    private function conditionProvider()
+    {
+        return [
+            // test filter by category without children
+            'variation 1' => [
+                'condition' => $this->getConditionsForVariation1(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-7',
+                    'simple-product-8'
+                ]
+            ],
+
+            // test filter by root category
+            'variation 2' => [
+                'condition' => $this->getConditionsForVariation2(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-7',
+                    'simple-product-8',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter by anchor category with children
+            'variation 3' => [
+                'condition' => $this->getConditionsForVariation3(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter by non existing category
+            'variation 4' => [
+                'condition' => $this->getConditionsForVariation4(),
+                'expected-sku' => []
+            ],
+
+            // test filter by sku
+            'variation 5' => [
+                'condition' => $this->getConditionsForVariation5(),
+                'expected-sku' => ['simple-product-2']
+            ],
+
+            // test filter by attribute set
+            'variation 6' => [
+                'condition' => $this->getConditionsForVariation6(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-4',
+                    'simple-product-7',
+                    'simple-product-10'
+                ]
+            ],
+
+            // test filter by product name
+            'variation 7' => [
+                'condition' => $this->getConditionsForVariation7(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-9',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter by not existing attribute
+            'variation 8' => [
+                'condition' => $this->getConditionsForVariation8(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-7',
+                    'simple-product-8',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter by category with empty value
+            'variation 9' => [
+                'condition' => $this->getConditionsForVariation9(),
+                'expected-sku' => []
+            ],
+
+            // test filter by sku with empty value
+            'variation 10' => [
+                'condition' => $this->getConditionsForVariation10(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-7',
+                    'simple-product-8',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter by name with empty value
+            'variation 11' => [
+                'condition' => $this->getConditionsForVariation11(),
+                'expected-sku' => []
+            ],
+
+            // test filter by like condition
+            'variation 12' => [
+                'condition' => $this->getConditionsForVariation12(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter with ALL aggregation
+            'variation 13' => [
+                'condition' => $this->getConditionsForVariation13(),
+                'expected-sku' => [
+                    'simple-product-7',
+                    'simple-product-8'
+                ]
+            ],
+
+            // test filter with ANY aggregation
+            'variation 14' => [
+                'condition' => $this->getConditionsForVariation14(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-7',
+                    'simple-product-8'
+                ]
+            ],
+
+            // test filter with array in product condition's value
+            'variation 15' => [
+                'condition' => $this->getConditionsForVariation15(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-7',
+                    'simple-product-8'
+                ]
+            ],
+
+            // test filter by multiple sku
+            'variation 16' => [
+                'condition' => $this->getConditionsForVariation16(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-5',
+                    'simple-product-11'
+                ]
+            ],
+
+            // test filter with multiple combined conditions
+            'variation 17' => [
+                'condition' => $this->getConditionsForVariation17(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-4',
+                    'simple-product-8',
+                    'simple-product-10'
+                ]
+            ],
+
+            // test filter with multiply levels in conditions
+            'variation 18' => [
+                'condition' => $this->getConditionsForVariation18(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-10',
+                    'simple-product-11'
+                ]
+            ],
+
+            // test filter with empty conditions
+            'variation 19' => [
+                'condition' => $this->getConditionsForVariation19(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-7',
+                    'simple-product-8',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+
+            // test filter for case "If ALL of these conditions are FALSE"
+            'variation 20' => [
+                'condition' => $this->getConditionsForVariation20(),
+                'expected-sku' => [
+                    'simple-product-2',
+                    'simple-product-5',
+                    'simple-product-8',
+                    'simple-product-11'
+                ]
+            ],
+
+            // test filter for case "If ANY of these conditions are FALSE"
+            'variation 21' => [
+                'condition' => $this->getConditionsForVariation21(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-5',
+                    'simple-product-6',
+                    'simple-product-7',
+                    'simple-product-8',
+                    'simple-product-9',
+                    'simple-product-10',
+                    'simple-product-11',
+                    'simple-product-12'
+                ]
+            ],
+        ];
+    }
+
+    private function getConditionsForVariation1()
+    {
+        $category2Name = 'Category 2';
+
+        $category2Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category2Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => implode(',', $category2Id),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation2()
+    {
+        $categoryName = 'Default Category';
+
+        $categoryId = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $categoryName)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => implode(',', $categoryId),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation3()
+    {
+        $category1Name = 'Category 1';
+
+        $category1Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category1Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => implode(',', $category1Id),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation4()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => implode(',', [308567758103]),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation5()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '{}',
+                    'value' => 'product-2',
+                    'attribute' => 'sku'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation6()
+    {
+        $attrSet = $this->setFactory->create()
+            ->load('Super Powerful Muffins', 'attribute_set_name');
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => $attrSet->getId(),
+                    'attribute' => 'attribute_set_id'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation7()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '{}',
+                    'value' => 'Sale',
+                    'attribute' => 'name'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation8()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => 'Sale',
+                    'attribute' => 'absolutely_random_attribute_name'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation9()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => '',
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation10()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => '',
+                    'attribute' => 'sku'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation11()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => '',
+                    'attribute' => 'name'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation12()
+    {
+        $category1Name = 'Category 1';
+
+        $category1Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category1Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '{}',
+                    'value' => implode(',', $category1Id),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation13()
+    {
+        $category3Name = 'Category 3';
+
+        $category3Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category3Name)
+            ->getAllIds();
+
+        $category2Name = 'Category 2';
+
+        $category2Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category2Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '{}',
+                    'value' => implode(',', $category3Id),
+                    'attribute' => 'category_ids'
+                ],
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => implode(',', $category2Id),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation14()
+    {
+        $category3Name = 'Category 3';
+
+        $category3Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category3Name)
+            ->getAllIds();
+
+        $category2Name = 'Category 2';
+
+        $category2Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category2Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '{}',
+                    'value' => implode(',', $category3Id),
+                    'attribute' => 'category_ids'
+                ],
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => implode(',', $category2Id),
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation15()
+    {
+        $category3Name = 'Category 3';
+
+        $category3Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category3Name)
+            ->getAllIds();
+
+        $category2Name = 'Category 2';
+
+        $category2Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category2Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '{}',
+                    'value' => [$category3Id[0], $category2Id[0]],
+                    'attribute' => 'category_ids'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation16()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '()',
+                    'value' => 'simple-product-1,simple-product-5,simple-product-11',
+                    'attribute' => 'sku'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation17()
+    {
+        $category1Name = 'Category 1';
+
+        $category1Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category1Name)
+            ->getAllIds();
+
+        $category2Name = 'Category 2';
+
+        $category2Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category2Name)
+            ->getAllIds();
+
+        $attributeSetMuffins = $this->setFactory->create()
+            ->load('Super Powerful Muffins', 'attribute_set_name');
+
+        $attributeSetRangers = $this->setFactory->create()
+            ->load('Banana Rangers', 'attribute_set_name');
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+                    'aggregator' => 'all',
+                    'value' => 1,
+                    'conditions' => [
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => implode(',', $category1Id),
+                            'attribute' => 'category_ids'
+                        ],
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => $attributeSetMuffins->getId(),
+                            'attribute' => 'attribute_set_id'
+                        ]
+                    ]
+                ],
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+                    'aggregator' => 'all',
+                    'value' => 1,
+                    'conditions' => [
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => implode(',', $category2Id),
+                            'attribute' => 'category_ids'
+                        ],
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => $attributeSetRangers->getId(),
+                            'attribute' => 'attribute_set_id'
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation18()
+    {
+        $category1Name = 'Category 1';
+
+        $category1Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category1Name)
+            ->getAllIds();
+
+        $attributeSetMuffins = $this->setFactory->create()
+            ->load('Super Powerful Muffins', 'attribute_set_name');
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 1,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+                    'aggregator' => 'all',
+                    'value' => 1,
+                    'conditions' => [
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => implode(',', $category1Id),
+                            'attribute' => 'category_ids'
+                        ],
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+                            'aggregator' => 'any',
+                            'value' => 1,
+                            'conditions' => [
+                                [
+                                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                                    'operator' => '!{}',
+                                    'value' => '(Sale)',
+                                    'attribute' => 'name'
+                                ],
+                                [
+                                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                                    'operator' => '==',
+                                    'value' => $attributeSetMuffins->getId(),
+                                    'attribute' => 'attribute_set_id'
+                                ],
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation19()
+    {
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 0,
+            'conditions' => []
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation20()
+    {
+        $attributeSetMuffins = $this->setFactory->create()
+            ->load('Super Powerful Muffins', 'attribute_set_name');
+
+        $attributeSetGuardians = $this->setFactory->create()
+            ->load('Guardians of the Refrigerator', 'attribute_set_name');
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 0,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => $attributeSetMuffins->getId(),
+                    'attribute' => 'attribute_set_id'
+                ],
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => $attributeSetGuardians->getId(),
+                    'attribute' => 'attribute_set_id'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getConditionsForVariation21()
+    {
+        $attributeSetMuffins = $this->setFactory->create()
+            ->load('Super Powerful Muffins', 'attribute_set_name');
+
+        $attributeSetGuardians = $this->setFactory->create()
+            ->load('Guardians of the Refrigerator', 'attribute_set_name');
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'any',
+            'value' => 0,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => $attributeSetMuffins->getId(),
+                    'attribute' => 'attribute_set_id'
+                ],
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                    'operator' => '==',
+                    'value' => $attributeSetGuardians->getId(),
+                    'attribute' => 'attribute_set_id'
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
+    private function getCombineConditionFromArray(array $data)
+    {
+        $combinedCondition = $this->combinedConditionFactory->create();
+        $combinedCondition->setPrefix('conditions');
+        $combinedCondition->loadArray($data);
+
+        return $combinedCondition;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Rule/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Rule/CollectionTest.php
index 675c1cae4e210..c42b13ac01125 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Rule/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Rule/CollectionTest.php
@@ -13,7 +13,6 @@
 use Magento\Catalog\Setup\CategorySetup;
 
 /**
- * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
 class CollectionTest extends \PHPUnit\Framework\TestCase
@@ -48,7 +47,7 @@ protected function setUp()
 
     /**
      * @magentoAppArea adminhtml
-     *
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/CatalogRule/_files/attribute.php
      * @magentoDataFixture Magento/CatalogRule/_files/rule_by_attribute.php
      * @magentoDataFixture Magento/CatalogRule/_files/two_rules.php
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/RuleTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/RuleTest.php
index 869a6281b79b1..6d5b87fd0949f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/RuleTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/RuleTest.php
@@ -33,7 +33,7 @@ protected function setUp()
 
         $this->_object = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\CatalogRule\Model\Rule::class,
-            ['resource' => $resourceMock]
+            ['ruleResourceModel' => $resourceMock]
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/attribute_sets.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/attribute_sets.php
new file mode 100644
index 0000000000000..ed902833bd949
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/attribute_sets.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$attributeSetFactory = $objectManager->get(\Magento\Eav\Api\Data\AttributeSetInterfaceFactory::class);
+$dataObjectHelper = $objectManager->get(\Magento\Framework\Api\DataObjectHelper::class);
+$attributeSetRepository = $objectManager->get(\Magento\Catalog\Api\AttributeSetRepositoryInterface::class);
+$attributeSetManagement = $objectManager->get(\Magento\Eav\Api\AttributeSetManagementInterface::class);
+
+$entityTypeId = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode('catalog_product')->getId();
+$defaultAttributeSet = $objectManager->get(Magento\Eav\Model\Config::class)
+    ->getEntityType('catalog_product')
+    ->getDefaultAttributeSetId();
+
+$attributeSet = $attributeSetFactory->create();
+$dataObjectHelper->populateWithArray(
+    $attributeSet,
+    [
+        'attribute_set_name' => 'Super Powerful Muffins',
+        'entity_type_id' => $entityTypeId,
+    ],
+    \Magento\Eav\Api\Data\AttributeSetInterface::class
+);
+$attributeSetManagement->create('catalog_product', $attributeSet, $defaultAttributeSet)->save();
+
+
+$attributeSet = $attributeSetFactory->create();
+$dataObjectHelper->populateWithArray(
+    $attributeSet,
+    [
+        'attribute_set_name' => 'Banana Rangers',
+        'entity_type_id' => $entityTypeId,
+    ],
+    \Magento\Eav\Api\Data\AttributeSetInterface::class
+);
+$attributeSetManagement->create('catalog_product', $attributeSet, $defaultAttributeSet)->save();
+
+$attributeSet = $attributeSetFactory->create();
+$dataObjectHelper->populateWithArray(
+    $attributeSet,
+    [
+        'attribute_set_name' => 'Guardians of the Refrigerator',
+        'entity_type_id' => $entityTypeId,
+    ],
+    \Magento\Eav\Api\Data\AttributeSetInterface::class
+);
+$attributeSetManagement->create('catalog_product', $attributeSet, $defaultAttributeSet)->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/attribute_sets_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/attribute_sets_rollback.php
new file mode 100644
index 0000000000000..9040ef15e0ccd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/attribute_sets_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
+    ->load('Super Powerful Muffins', 'attribute_set_name');
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}
+
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
+    ->load('Banana Rangers', 'attribute_set_name');
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}
+
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
+    ->load('Guardians of the Refrigerator', 'attribute_set_name');
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/categories.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/categories.php
new file mode 100644
index 0000000000000..fd10f32e5c594
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/categories.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category1 = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category1->isObjectNew(true);
+$category1
+    ->setName('Category 1')
+    ->setParentId(2)
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setIsActive(true)
+    ->setIsAnchor(true)
+    ->setPosition(1)
+    ->save();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category1_1 = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category1_1->isObjectNew(true);
+$category1_1
+    ->setName('Category 1.1')
+    ->setParentId($category1->getId())
+    ->setPath($category1->getPath())
+    ->setLevel(3)
+    ->setIsActive(true)
+    ->setIsAnchor(true)
+    ->setPosition(1)
+    ->save();
+
+$category1_2 = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category1_2->isObjectNew(true);
+$category1_2
+    ->setName('Category 1.2')
+    ->setParentId($category1->getId())
+    ->setPath($category1->getPath())
+    ->setLevel(3)
+    ->setIsActive(true)
+    ->setIsAnchor(true)
+    ->setPosition(2)
+    ->save();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category1_1_1 = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category1_1_1->isObjectNew(true);
+$category1_1_1
+    ->setName('Category 1.1.1')
+    ->setParentId($category1_1->getId())
+    ->setPath($category1_1->getPath())
+    ->setLevel(4)
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category2 = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category2->isObjectNew(true);
+$category2
+    ->setName('Category 2')
+    ->setParentId(2)
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setIsActive(true)
+    ->setPosition(2)
+    ->save();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category3 = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category3->isObjectNew(true);
+$category3
+    ->setName('Category 3')
+    ->setParentId(2)
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setIsActive(true)
+    ->setPosition(8)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/categories_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/categories_rollback.php
new file mode 100644
index 0000000000000..a128ae05769e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/categories_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Remove categories
+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection->addAttributeToFilter('level', ['gt' => 1]);
+
+foreach ($collection as $category) {
+    /** @var \Magento\Catalog\Model\Category $category */
+    if ($category->getLevel() !== 1) {
+        $category->delete();
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products.php
new file mode 100644
index 0000000000000..db44a3d10ac9c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$attributeSetMuffins = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
+    ->load('Super Powerful Muffins', 'attribute_set_name');
+$attributeSetRangers = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
+    ->load('Banana Rangers', 'attribute_set_name');
+$attributeSetGuardians = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
+    ->load('Guardians of the Refrigerator', 'attribute_set_name');
+
+$productsData = [
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetMuffins->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 1 (Sale)',
+        'sku' => 'simple-product-1',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 77, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1', 'Category 2'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetRangers->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 2',
+        'sku' => 'simple-product-2',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1', 'Category 2'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetGuardians->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 3',
+        'sku' => 'simple-product-3',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 100, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.1', 'Category 3'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetMuffins->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 4',
+        'sku' => 'simple-product-4',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.1', 'Category 3'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetRangers->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 5',
+        'sku' => 'simple-product-5',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.2', 'Category 1.1.1'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetGuardians->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 6',
+        'sku' => 'simple-product-6',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 97, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.2', 'Category 1.1.1'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetMuffins->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 7',
+        'sku' => 'simple-product-7',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 3', 'Category 2'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetRangers->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 8',
+        'sku' => 'simple-product-8',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 3', 'Category 2'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetGuardians->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 9 (Sale)',
+        'sku' => 'simple-product-9',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.1', 'Category 1.2'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetMuffins->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 10',
+        'sku' => 'simple-product-10',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.1', 'Category 1.2'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetRangers->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 11',
+        'sku' => 'simple-product-11',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.1.1'],
+    ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetGuardians->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 12 (Sale)',
+        'sku' => 'simple-product-12',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => ['Category 1.1.1'],
+    ],
+];
+
+foreach ($productsData as $productData) {
+    $categoriesIds = [];
+
+    foreach ($productData['categories'] as $category) {
+        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection */
+        $categoryCollection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+        $categoryCollection->addAttributeToFilter('name', $category);
+
+        array_push($categoriesIds, ...$categoryCollection->getAllIds());
+    }
+
+    /** @var $product \Magento\Catalog\Model\Product */
+    $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->create(\Magento\Catalog\Model\Product::class);
+
+    $product
+        ->setTypeId($productData['type-id'])
+        ->setAttributeSetId($productData['attribute-set-id'])
+        ->setWebsiteIds($productData['website-ids'])
+        ->setName($productData['name'])
+        ->setSku($productData['sku'])
+        ->setPrice($productData['price'])
+        ->setVisibility($productData['visibility'])
+        ->setStatus($productData['status'])
+        ->setStockData($productData['stock-data'])
+        ->setQty($productData['qty'])
+        ->setCategoryIds($categoriesIds);
+
+    $productRepository->save($product);
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products_rollback.php
new file mode 100644
index 0000000000000..1ac4e4ec87385
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+
+foreach ($collection as $product) {
+    /** @var \Magento\Catalog\Model\Product $category */
+    $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/configurable_product.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/configurable_product.php
new file mode 100644
index 0000000000000..ef7144d9d8438
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/configurable_product.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../ConfigurableProduct/_files/configurable_attribute.php';
+require __DIR__ . '/simple_products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$storeManager = $objectManager->get(\Magento\Store\Model\StoreManager::class);
+$store = $storeManager->getStore('default');
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$installer = $objectManager->get(\Magento\Catalog\Setup\CategorySetup::class);
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+$attributeValues = [];
+$associatedProductIds = [];
+
+$attributeRepository = $objectManager->get(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+$attribute = $attributeRepository->get('catalog_product', 'test_configurable');
+$options = $attribute->getOptions();
+array_shift($options); //remove the first option which is empty
+foreach (['simple1', 'simple2'] as $sku) {
+    $option = array_shift($options);
+    $product = $productRepository->get($sku);
+    $product->setTestConfigurable($option->getValue());
+    $productRepository->save($product);
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+}
+
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class)
+    ->setTypeId('configurable')
+    ->setId(666)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ]);
+$configurableAttributesData = [
+    [
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $attributeValues,
+    ],
+];
+$optionsFactory = $objectManager->get(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/configurable_product_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/configurable_product_rollback.php
new file mode 100644
index 0000000000000..915da48c915b2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/configurable_product_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('configurable', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Nothing to delete
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/simple_products_rollback.php';
+require __DIR__ . '/../../ConfigurableProduct/_files/configurable_attribute_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_products.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_products.php
new file mode 100644
index 0000000000000..84ce4e1bca87c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_products.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/attribute.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$storeManager = $objectManager->get(\Magento\Store\Model\StoreManager::class);
+$store = $storeManager->getStore('default');
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$installer = $objectManager->get(\Magento\Catalog\Setup\CategorySetup::class);
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class)
+    ->setTypeId('simple')
+    ->setId(1)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 1')
+    ->setSku('simple1')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ]);
+$productRepository->save($product);
+$productAction = $objectManager->get(\Magento\Catalog\Model\Product\Action::class);
+$productAction->updateAttributes([$product->getId()], ['test_attribute' => 'test_attribute_value'], $store->getId());
+
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class)
+    ->setTypeId('simple')
+    ->setId(2)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 2')
+    ->setSku('simple2')
+    ->setPrice(9.9)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ]);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_products_rollback.php
new file mode 100644
index 0000000000000..6625b1926fc10
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/_files/simple_products_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+foreach (['simple1', 'simple2'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Nothing to delete
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/attribute_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
index 29c8eaa0282b4..4cd0f124b6e46 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\CatalogSearch\Controller;
 
+/**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
 class ResultTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
@@ -59,4 +63,118 @@ public function testNoRedirectIfCurrentUrlAndRedirectTermAreSame()
 
         $this->assertFalse($responseBody->isRedirect());
     }
+
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/query.php
+     */
+    public function testPopularity()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var $query \Magento\Search\Model\Query */
+        $query = $objectManager->create(\Magento\Search\Model\Query::class);
+        $query->loadByQueryText('query_text');
+        $this->assertEquals(1, $query->getPopularity());
+
+        $this->dispatch('catalogsearch/searchTermsLog/save?q=query_text');
+
+        $responseBody = $this->getResponse()->getBody();
+        $data = '"success":true';
+        $this->assertContains($data, $responseBody);
+
+        $query->loadByQueryText('query_text');
+        $this->assertEquals(2, $query->getPopularity());
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/popular_query.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/query.php
+     */
+    public function testPopularSearch()
+    {
+        $this->cacheAndPopularitySetup();
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var $query \Magento\Search\Model\Query */
+        $query = $objectManager->create(\Magento\Search\Model\Query::class);
+        $query->loadByQueryText('popular_query_text');
+        $this->assertEquals(100, $query->getPopularity());
+
+        $this->dispatch('/catalogsearch/result/?q=popular_query_text');
+
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('Search results for: &#039;popular_query_text&#039;', $responseBody);
+        $this->assertContains('/catalogsearch/searchTermsLog/save/', $responseBody);
+
+        $query->loadByQueryText('popular_query_text');
+        $this->assertEquals(100, $query->getPopularity());
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/popular_query.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/query.php
+     */
+    public function testPopularSearchWithAdditionalRequestParameters()
+    {
+        $this->cacheAndPopularitySetup();
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var $query \Magento\Search\Model\Query */
+        $query = $objectManager->create(\Magento\Search\Model\Query::class);
+        $query->loadByQueryText('popular_query_text');
+        $this->assertEquals(100, $query->getPopularity());
+
+        $this->dispatch('/catalogsearch/result/?q=popular_query_text&additional_parameters=some');
+
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('Search results for: &#039;popular_query_text&#039;', $responseBody);
+        $this->assertNotContains('/catalogsearch/searchTermsLog/save/', $responseBody);
+
+        $query->loadByQueryText('popular_query_text');
+        $this->assertEquals(101, $query->getPopularity());
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/popular_query.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/query.php
+     */
+    public function testNotPopularSearch()
+    {
+        $this->cacheAndPopularitySetup();
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var $query \Magento\Search\Model\Query */
+        $query = $objectManager->create(\Magento\Search\Model\Query::class);
+        $query->loadByQueryText('query_text');
+        $this->assertEquals(1, $query->getPopularity());
+
+        $this->dispatch('/catalogsearch/result/?q=query_text');
+
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('Search results for: &#039;query_text&#039;', $responseBody);
+        $this->assertNotContains('/catalogsearch/searchTermsLog/save/', $responseBody);
+
+        $query->loadByQueryText('query_text');
+        $this->assertEquals(2, $query->getPopularity());
+    }
+
+    private function cacheAndPopularitySetup()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var $scopeConfig \Magento\Framework\App\MutableScopeConfig */
+        $scopeConfig = $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
+        $scopeConfig->setValue(
+            \Magento\Search\Model\PopularSearchTerms::XML_PATH_MAX_COUNT_CACHEABLE_SEARCH_TERMS,
+            1,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+
+        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
+        $cacheState = $objectManager->get(\Magento\Framework\App\Cache\StateInterface::class);
+        $cacheState->setEnabled(\Magento\PageCache\Model\Cache\Type::TYPE_IDENTIFIER, true);
+
+        /** @var $fpc \Magento\PageCache\Model\Cache\Type */
+        $fpc = $objectManager->get(\Magento\PageCache\Model\Cache\Type::class);
+        $fpc->clean();
+    }
 }
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 0000000000000..4d2a90f8f44f9
--- /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/Fulltext/Model/Plugin/CategoryTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/CategoryTest.php
new file mode 100644
index 0000000000000..ec2a14abafc18
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/CategoryTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Model\Plugin;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CategoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    protected function setUp()
+    {
+        $this->indexerProcessor = Bootstrap::getObjectManager()->create(Processor::class);
+        $this->categoryRepository = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
+     * @magentoAppArea adminhtml
+     */
+    public function testIndexerInvalidatedAfterCategoryDelete()
+    {
+        $this->indexerProcessor->reindexAll();
+        $isIndexerValid = (bool)$this->indexerProcessor->getIndexer()->isValid();
+
+        $category = $this->getCategories(1);
+        $this->categoryRepository->delete(array_pop($category));
+
+        $state = $this->indexerProcessor->getIndexer()->getState();
+        $state->loadByIndexer($this->indexerProcessor->getIndexerId());
+        $status = $state->getStatus();
+
+        $this->assertTrue($isIndexerValid);
+        $this->assertEquals(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID, $status);
+    }
+
+    /**
+     * @param int $count
+     * @return Category[]
+     */
+    private function getCategories($count)
+    {
+        /** @var Category $category */
+        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\Category::class
+        );
+
+        $result = $category->getCollection()->addAttributeToSelect('name')->getItems();
+        $result = array_slice($result, 2);
+
+        return array_slice($result, 0, $count);
+    }
+}
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 29d1547f2d872..7c72d18b97118 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php
@@ -3,9 +3,12 @@
  * 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;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -25,11 +28,6 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
      */
     protected $engine;
 
-    /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext
-     */
-    protected $resourceFulltext;
-
     /**
      * @var \Magento\CatalogSearch\Model\Fulltext
      */
@@ -82,10 +80,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
         );
@@ -186,15 +180,44 @@ public function testReindexRowAfterDelete()
         $this->assertCount(4, $products);
     }
 
+    /**
+     * Test the case when the last child product of the configurable becomes disabled/out of stock.
+     *
+     * Such behavior should enforce parent product to be deleted from the index as its latest child become unavailable
+     * and the configurable cannot be sold anymore.
+     *
+     * @return void
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_with_single_child.php
+     */
+    public function testReindexParentProductWhenChildBeingDisabled()
+    {
+        $this->indexer->reindexAll();
+
+        $visibilityFilter = [
+            Visibility::VISIBILITY_IN_SEARCH,
+            Visibility::VISIBILITY_IN_CATALOG,
+            Visibility::VISIBILITY_BOTH
+        ];
+        $products = $this->search('Configurable', $visibilityFilter);
+        $this->assertCount(1, $products);
+
+        $childProduct = $this->getProductBySku('configurable_option_single_child');
+        $childProduct->setStatus(Product\Attribute\Source\Status::STATUS_DISABLED)->save();
+
+        $products = $this->search('Configurable', $visibilityFilter);
+        $this->assertCount(0, $products);
+    }
+
     /**
      * Search the text and return result collection
      *
      * @param string $text
+     * @param array|null $visibilityFilter
      * @return Product[]
      */
-    protected function search($text)
+    protected function search(string $text, $visibilityFilter = null): array
     {
-        $this->resourceFulltext->resetSearchResults();
         $query = $this->queryFactory->get();
         $query->unsetData();
         $query->setQueryText($text);
@@ -207,6 +230,11 @@ protected function search($text)
             ]
         );
         $collection->addSearchFilter($text);
+
+        if (null !== $visibilityFilter) {
+            $collection->setVisibility($visibilityFilter);
+        }
+
         foreach ($collection as $product) {
             $products[] = $product;
         }
@@ -217,9 +245,9 @@ protected function search($text)
      * Return product by SKU
      *
      * @param string $sku
-     * @return Product
+     * @return Product|bool
      */
-    protected function getProductBySku($sku)
+    protected function getProductBySku(string $sku)
     {
         /** @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 c7b2271675713..127b4ec675cdc 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/Model/Layer/Filter/CategoryTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
index 51a98c3e4ff16..a017979028152 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
@@ -101,6 +101,9 @@ public function testGetName()
         $this->assertEquals('Category', $this->_model->getName());
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     */
     public function testGetItems()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
index 7d0f9148cd708..d92539396de58 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
@@ -155,7 +155,6 @@ private function getSqlForOneAttributeSearch()
 
         $joinConditions = [
             '`some_index`.`entity_id` = `field1_filter`.`entity_id`',
-            '`some_index`.`source_id` = `field1_filter`.`source_id`',
             sprintf('`field1_filter`.`attribute_id` = %s', $firstAttribute->getId()),
             sprintf('`field1_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
         ];
@@ -182,14 +181,12 @@ private function getSqlForTwoAttributeSearch()
 
         $joinConditions1 = [
             '`some_index`.`entity_id` = `field1_filter`.`entity_id`',
-            '`some_index`.`source_id` = `field1_filter`.`source_id`',
             sprintf('`field1_filter`.`attribute_id` = %s', $firstAttribute->getId()),
             sprintf('`field1_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
         ];
 
         $joinConditions2 = [
             '`some_index`.`entity_id` = `field2_filter`.`entity_id`',
-            '`some_index`.`source_id` = `field2_filter`.`source_id`',
             sprintf('`field2_filter`.`attribute_id` = %s', $secondAttribute->getId()),
             sprintf('`field2_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
         ];
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterTest.php
deleted file mode 100644
index a8a404a1ee2d6..0000000000000
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterTest.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\CatalogSearch\Model\Search\FilterMapper;
-
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
-use Magento\Framework\DB\Select;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\CatalogInventory\Model\Stock;
-
-class StockStatusFilterTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * Const to define if 'show out of stock' configuration flag enabled or not
-     */
-    const SHOW_OUT_OF_STOCK_ENABLED = true;
-    const SHOW_OUT_OF_STOCK_DISABLED = false;
-
-    /** @var \Magento\Framework\ObjectManagerInterface */
-    private $objectManager;
-
-    /** @var ResourceConnection */
-    private $resource;
-
-    /** @var ConditionManager */
-    private $conditionManager;
-
-    /** @var StockConfigurationInterface */
-    private $stockConfiguration;
-
-    /** @var StockRegistryInterface */
-    private $stockRegistry;
-
-    /** @var StockStatusFilter */
-    private $stockStatusFilter;
-
-    protected function setUp()
-    {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->resource = $this->objectManager->create(ResourceConnection::class);
-        $this->conditionManager = $this->objectManager->create(ConditionManager::class);
-        $this->stockConfiguration = $this->objectManager->create(StockConfigurationInterface::class);
-        $this->stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
-        $this->stockStatusFilter = $this->objectManager->create(StockStatusFilter::class);
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Invalid filter type: Luke I am your father!
-     */
-    public function testApplyWithWrongType()
-    {
-        $select = $this->resource->getConnection()->select();
-        $this->stockStatusFilter->apply(
-            $select,
-            Stock::STOCK_IN_STOCK,
-            'Luke I am your father!',
-            self::SHOW_OUT_OF_STOCK_ENABLED
-        );
-    }
-
-    public function testApplyGeneralFilterWithOutOfStock()
-    {
-        $select = $this->resource->getConnection()->select();
-        $select->from(
-            ['some_index' => 'some_table'],
-            ['entity_id' => 'entity_id']
-        );
-
-        $resultSelect = $this->stockStatusFilter->apply(
-            $select,
-            Stock::STOCK_IN_STOCK,
-            StockStatusFilter::FILTER_JUST_ENTITY,
-            self::SHOW_OUT_OF_STOCK_ENABLED
-        );
-
-        $expectedSelect = $this->getExpectedSelectForGeneralFilter(self::SHOW_OUT_OF_STOCK_ENABLED);
-
-        $this->assertEquals(
-            (string) $expectedSelect,
-            (string) $resultSelect,
-            'Select queries must be the same'
-        );
-    }
-
-    public function testApplyGeneralFilterWithoutOutOfStock()
-    {
-        $select = $this->resource->getConnection()->select();
-        $select->from(
-            ['some_index' => 'some_table'],
-            ['entity_id' => 'entity_id']
-        );
-
-        $resultSelect = $this->stockStatusFilter->apply(
-            $select,
-            Stock::STOCK_IN_STOCK,
-            StockStatusFilter::FILTER_JUST_ENTITY,
-            self::SHOW_OUT_OF_STOCK_DISABLED
-        );
-
-        $expectedSelect = $this->getExpectedSelectForGeneralFilter(self::SHOW_OUT_OF_STOCK_DISABLED);
-
-        $this->assertEquals(
-            (string) $expectedSelect,
-            (string) $resultSelect,
-            'Select queries must be the same'
-        );
-    }
-
-    public function testApplyFullFilterWithOutOfStock()
-    {
-        $select = $this->resource->getConnection()->select();
-        $select->from(
-            ['some_index' => 'some_table'],
-            ['entity_id' => 'entity_id']
-        );
-
-        $resultSelect = $this->stockStatusFilter->apply(
-            $select,
-            Stock::STOCK_IN_STOCK,
-            StockStatusFilter::FILTER_ENTITY_AND_SUB_PRODUCTS,
-            self::SHOW_OUT_OF_STOCK_ENABLED
-        );
-
-        $expectedSelect = $this->getExpectedSelectForFullFilter(self::SHOW_OUT_OF_STOCK_ENABLED);
-
-        $this->assertEquals(
-            (string) $expectedSelect,
-            (string) $resultSelect,
-            'Select queries must be the same'
-        );
-    }
-
-    public function testApplyFullFilterWithoutOutOfStock()
-    {
-        $select = $this->resource->getConnection()->select();
-        $select->from(
-            ['some_index' => 'some_table'],
-            ['entity_id' => 'entity_id']
-        );
-
-        $resultSelect = $this->stockStatusFilter->apply(
-            $select,
-            Stock::STOCK_IN_STOCK,
-            StockStatusFilter::FILTER_ENTITY_AND_SUB_PRODUCTS,
-            self::SHOW_OUT_OF_STOCK_DISABLED
-        );
-
-        $expectedSelect = $this->getExpectedSelectForFullFilter(self::SHOW_OUT_OF_STOCK_DISABLED);
-
-        $this->assertEquals(
-            (string) $expectedSelect,
-            (string) $resultSelect,
-            'Select queries must be the same'
-        );
-    }
-
-    /**
-     * @param bool $withOutOfStock
-     * @return Select
-     */
-    private function getExpectedSelectForGeneralFilter($withOutOfStock)
-    {
-        $select = $this->resource->getConnection()->select();
-        $select->from(
-            ['some_index' => 'some_table'],
-            ['entity_id' => 'entity_id']
-        )->joinInner(
-            ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
-            $this->conditionManager->combineQueries(
-                [
-                    'stock_index.product_id = some_index.entity_id',
-                    $this->conditionManager->generateCondition(
-                        'stock_index.website_id',
-                        '=',
-                        $this->stockConfiguration->getDefaultScopeId()
-                    ),
-                    $withOutOfStock
-                        ? ''
-                        : $this->conditionManager->generateCondition(
-                            'stock_index.stock_status',
-                            '=',
-                            Stock::STOCK_IN_STOCK
-                        ),
-                    $this->conditionManager->generateCondition(
-                        'stock_index.stock_id',
-                        '=',
-                        (int) $this->stockRegistry->getStock()->getStockId()
-                    ),
-                ],
-                Select::SQL_AND
-            ),
-            []
-        );
-
-        return $select;
-    }
-
-    /**
-     * @param bool $withOutOfStock
-     * @return Select
-     */
-    private function getExpectedSelectForFullFilter($withOutOfStock)
-    {
-        $select = $this->getExpectedSelectForGeneralFilter($withOutOfStock);
-        $select->joinInner(
-            ['sub_products_stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
-            $this->conditionManager->combineQueries(
-                [
-                    'sub_products_stock_index.product_id = some_index.source_id',
-                    $this->conditionManager->generateCondition(
-                        'sub_products_stock_index.website_id',
-                        '=',
-                        $this->stockConfiguration->getDefaultScopeId()
-                    ),
-                    $withOutOfStock
-                        ? ''
-                        : $this->conditionManager->generateCondition(
-                            'sub_products_stock_index.stock_status',
-                            '=',
-                            Stock::STOCK_IN_STOCK
-                        ),
-                    $this->conditionManager->generateCondition(
-                        'sub_products_stock_index.stock_id',
-                        '=',
-                        (int) $this->stockRegistry->getStock()->getStockId()
-                    ),
-                ],
-                Select::SQL_AND
-            ),
-            []
-        );
-
-        return $select;
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithFullFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithFullFilterTest.php
new file mode 100644
index 0000000000000..e94eda11a3fc5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithFullFilterTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Search\FilterMapper;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Search\Request\Filter\Term;
+use Magento\Framework\Search\Request\FilterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @magentoDbIsolation disabled
+ *
+ * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+ * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute.php
+ */
+class StockStatusFilterWithFullFilterTest extends TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var StockStatusFilter
+     */
+    private $stockStatusFilter;
+
+    /**
+     * @var CustomAttributeFilter
+     */
+    private $customAttributeFilter;
+
+    /**
+     * @var FilterInterface
+     */
+    private $filter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->resource = $this->objectManager->get(ResourceConnection::class);
+        $this->stockStatusFilter = $this->objectManager->get(StockStatusFilter::class);
+        $this->customAttributeFilter = $this->objectManager->get(CustomAttributeFilter::class);
+        $eavConfig = $this->objectManager->get(EavConfig::class);
+        $attribute = $eavConfig->getAttribute(Product::ENTITY, 'multiselect_attribute');
+
+        $productRepository = $this->objectManager->get(ProductRepository::class);
+        $product = $productRepository->get('simple_ms_2');
+        $multiSelectArray = explode(',', $product->getData('multiselect_attribute'));
+
+        $this->filter = $this->objectManager->create(
+            Term::class,
+            [
+                'field' => $attribute->getAttributeCode(),
+                'name' => $attribute->getAttributeCode() . '_filter',
+                'value' => reset($multiSelectArray),
+            ]
+        );
+    }
+
+    /**
+     * @param bool $showOutOfStockFlag
+     * @param int $expectedResult
+     * @return void
+     *
+     * @dataProvider applyDataProvider
+     */
+    public function testApply(bool $showOutOfStockFlag, int $expectedResult)
+    {
+        $select = $this->resource->getConnection()->select();
+        $select->from(
+            [$this->resource->getTableName('catalog_product_index_eav')],
+            ['entity_id']
+        )->distinct(true);
+        $select = $this->customAttributeFilter->apply($select, $this->filter);
+        $select = $this->stockStatusFilter->apply(
+            $select,
+            Stock::STOCK_IN_STOCK,
+            StockStatusFilter::FILTER_ENTITY_AND_SUB_PRODUCTS,
+            $showOutOfStockFlag
+        );
+
+        $data = $select->query()->fetchAll();
+
+        $this->assertEquals($expectedResult, count($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function applyDataProvider(): array
+    {
+        return [
+            [true, 2],
+            [false, 1],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithGeneralFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithGeneralFilterTest.php
new file mode 100644
index 0000000000000..809116e9c7d84
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithGeneralFilterTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Search\FilterMapper;
+
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Framework\App\ResourceConnection;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoDbIsolation disabled
+ *
+ * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+ * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute.php
+ */
+class StockStatusFilterWithGeneralFilterTest extends TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var StockStatusFilter
+     */
+    private $stockStatusFilter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->resource = $this->objectManager->get(ResourceConnection::class);
+        $this->stockStatusFilter = $this->objectManager->get(StockStatusFilter::class);
+    }
+
+    /**
+     * @return void
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid filter type: some_wrong_type
+     */
+    public function testApplyWithWrongType()
+    {
+        $select = $this->resource->getConnection()->select();
+        $this->stockStatusFilter->apply(
+            $select,
+            Stock::STOCK_IN_STOCK,
+            'some_wrong_type',
+            true
+        );
+    }
+
+    /**
+     * @param bool $showOutOfStockFlag
+     * @param int $expectedResult
+     * @return void
+     *
+     * @dataProvider applyDataProvider
+     */
+    public function testApply(bool $showOutOfStockFlag, int $expectedResult)
+    {
+        $select = $this->resource->getConnection()->select();
+        $select->from(
+            [$this->resource->getTableName('catalog_product_index_eav')],
+            ['entity_id']
+        )->distinct(true);
+
+        $select = $this->stockStatusFilter->apply(
+            $select,
+            Stock::STOCK_IN_STOCK,
+            StockStatusFilter::FILTER_JUST_ENTITY,
+            $showOutOfStockFlag
+        );
+        $data = $select->query()->fetchAll();
+
+        $this->assertEquals($expectedResult, count($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function applyDataProvider(): array
+    {
+        return [
+            [true, 6],
+            [false, 4],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/popular_query.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/popular_query.php
new file mode 100644
index 0000000000000..73e3b412688ab
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/popular_query.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $query \Magento\Search\Model\Query */
+$query = $objectManager->create(\Magento\Search\Model\Query::class);
+$query->setStoreId(1);
+$query->setQueryText(
+    'popular_query_text'
+)->setNumResults(
+    1
+)->setPopularity(
+    100
+)->setDisplayInTerms(
+    1
+)->setIsActive(
+    1
+)->setIsProcessed(
+    1
+)->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php
new file mode 100644
index 0000000000000..f0a8b125b2ea5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->reinitialize();
+
+require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/configurable_attribute.php';
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+
+/** @var $installer CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+
+/* Create simple products per each option value*/
+/** @var AttributeOptionInterface[] $options */
+$options = $attribute->getOptions();
+
+$attributeValues = [];
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+array_shift($options); //remove the first option which is empty
+
+$option = reset($options);
+
+/** @var $childProduct Product */
+$childProduct = Bootstrap::getObjectManager()->create(Product::class);
+$childProduct->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($attributeSetId)
+    ->setName('Configurable Product Option' . $option->getLabel())
+    ->setSku('configurable_option_single_child')
+    ->setPrice(11)
+    ->setTestConfigurable($option->getValue())
+    ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    );
+$childProduct = $productRepository->save($childProduct);
+
+$attributeValues[] = [
+    'label' => 'test',
+    'attribute_id' => $attribute->getId(),
+    'value_index' => $option->getValue(),
+];
+
+/** @var $product Product */
+$configurableProduct = Bootstrap::getObjectManager()->create(Product::class);
+
+/** @var Factory $optionsFactory */
+$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class);
+
+$configurableAttributesData = [
+    [
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $attributeValues,
+    ],
+];
+
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+
+$extensionConfigurableAttributes = $configurableProduct->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks([$childProduct->getId()]);
+
+$configurableProduct->setExtensionAttributes($extensionConfigurableAttributes);
+
+$configurableProduct->setTypeId(Configurable::TYPE_CODE)
+    ->setAttributeSetId($attributeSetId)
+    ->setName('Configurable Product with single child')
+    ->setSku('configurable_with_single_child')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'is_in_stock'               => 1,
+        ]
+    );
+$configurableProduct = $productRepository->save($configurableProduct);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php
new file mode 100644
index 0000000000000..de69cb599ab57
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$productSkus = ['configurable_option_single_child', 'configurable_with_single_child'];
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+$searchCriteriaBuilder->addFilter(ProductInterface::SKU, $productSkus, 'in');
+$result = $productRepository->getList($searchCriteriaBuilder->create());
+foreach ($result->getItems() as $product) {
+    $productRepository->delete($product);
+}
+
+require __DIR__ . '/../../../Magento/Framework/Search/_files/configurable_attribute_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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 0000000000000..afeb250a5921a
--- /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 0000000000000..00e2096ca734a
--- /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 0000000000000..b25d39b1d40b8
--- /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/CatalogUrlRewrite/Fixtures/product_custom_url_key.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
new file mode 100644
index 0000000000000..cae23dcc9c674
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+require __DIR__ . '/../_files/product_with_category.php';
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product->setStoreId(1);
+$product->setUrlKey('store-1-key');
+$product = $productRepository->save($product);
+$linkManagement->assignProductToCategories($product->getSku(), [Category::TREE_ROOT_ID, $category->getEntityId()]);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
new file mode 100644
index 0000000000000..517e9121a6d1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+require __DIR__ . '/../_files/product_with_category_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
index a4dabdbf1615a..a0cac124bea07 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -204,10 +204,8 @@ public function testGenerateUrlRewritesWithSaveHistory()
      */
     public function testGenerateUrlRewritesWithIncorrectUrlKey($urlKey)
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            'Invalid URL key'
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('Invalid URL key');
         /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
         $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
         $category = $repository->get(3);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
index 78f371d89fd78..1203ca191b459 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
@@ -30,7 +30,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testGenerateWithSpecificCategoryUrlKey()
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
new file mode 100644
index 0000000000000..c72a58197b1fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogUrlRewrite\Observer;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
+ */
+class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\ObjectManagerInterface */
+    protected $objectManager;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @param array $filter
+     * @return array
+     */
+    private function getActualResults(array $filter)
+    {
+        /** @var \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
+        $actualResults = [];
+        foreach ($urlFinder->findAllByData($filter) as $url) {
+            $actualResults[] = [
+                'request_path' => $url->getRequestPath(),
+                'target_path' => $url->getTargetPath(),
+                'is_auto_generated' => (int)$url->getIsAutogenerated(),
+                'redirect_type' => $url->getRedirectType(),
+                'store_id' => $url->getStoreId()
+            ];
+        }
+        return $actualResults;
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
+     * @magentoAppIsolation enabled
+     */
+    public function testUrlKeyHasChangedInGlobalContext()
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository*/
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Model\Product $product*/
+        $product = $productRepository->get('product1');
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore(0);
+
+        $testStore = $storeManager->getStore('test');
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+        ];
+
+        $expected = [
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1,
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore->getId(),
+            ],
+        ];
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+
+        $product->setData('save_rewrites_history', true);
+        $product->setUrlKey('new-url');
+        $product->setUrlPath('new-path');
+        $product->save();
+
+        $expected = [
+            [
+                'request_path' => "new-url.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1,
+            ],
+            [
+                'request_path' => "new-url.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore->getId(),
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "new-url.html",
+                'is_auto_generated' => 0,
+                'redirect_type' => 301,
+                'store_id' => 1,
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "new-url.html",
+                'is_auto_generated' => 0,
+                'redirect_type' => 301,
+                'store_id' => $testStore->getId(),
+            ],
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
+     * @magentoAppIsolation enabled
+     */
+    public function testUrlKeyHasChangedInStoreviewContextWithPermanentRedirection()
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository*/
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Model\Product $product*/
+        $product = $productRepository->get('product1');
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore(1);
+
+        $testStore = $storeManager->getStore('test');
+
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+        ];
+
+        $product->setData('save_rewrites_history', true);
+        $product->setUrlKey('new-url');
+        $product->setUrlPath('new-path');
+        $product->save();
+
+        $expected = [
+            [
+                'request_path' => "new-url.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1,
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore->getId(),
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "new-url.html",
+                'is_auto_generated' => 0,
+                'redirect_type' => 301,
+                'store_id' => 1,
+            ],
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
+     * @magentoAppIsolation enabled
+     */
+    public function testUrlKeyHasChangedInStoreviewContextWithoutPermanentRedirection()
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository*/
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Model\Product $product*/
+        $product = $productRepository->get('product1');
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore(1);
+
+        $testStore = $storeManager->getStore('test');
+
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+        ];
+
+        $product->setData('save_rewrites_history', false);
+        $product->setUrlKey('new-url');
+        $product->setUrlPath('new-path');
+        $product->save();
+
+        $expected = [
+            [
+                'request_path' => "new-url.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1,
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore->getId(),
+            ],
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
new file mode 100644
index 0000000000000..402db06a0bbc9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Observer;
+
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class UrlRewriteHandlerTest extends TestCase
+{
+    /**
+     * @var UrlRewriteHandler
+     */
+    private $handler;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->handler = $this->objectManager->get(UrlRewriteHandler::class);
+    }
+
+    /**
+     * Checks category URLs rewrites generation with enabled `Use Categories Path for Product URLs` option and
+     * store's specific product URL key.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
+     * @magentoConfigFixture admin_store catalog/seo/product_use_categories 1
+     */
+    public function testGenerateProductUrlRewrites()
+    {
+        $product = $this->getProduct('p002');
+        $category = $this->getCategory('category 1');
+        // change the category scope to the global
+        $category->setStoreId(0)
+            ->setChangedProductIds([$product->getId()])
+            ->setAffectedProductIds([$product->getId()])
+            ->setAnchorsAbove(false);
+
+        $generatedUrls = $this->handler->generateProductUrlRewrites($category);
+        $actual = array_values(array_map(function (UrlRewrite $urlRewrite) {
+            return $urlRewrite->getRequestPath();
+        }, $generatedUrls));
+
+        $expected = [
+            'store-1-key.html', // the Default store
+            'cat-1/store-1-key.html', // the Default store with Category URL key
+            '/store-1-key.html', // an anchor URL the Default store
+            'p002.html', // the Secondary store
+            'cat-1-2/p002.html', // the Secondary store with Category URL key
+            '/p002.html', // an anchor URL the Secondary store
+        ];
+        self::assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
+    }
+
+    /**
+     * Gets category by name.
+     *
+     * @param string $name
+     * @return CategoryInterface
+     */
+    private function getCategory(string $name): CategoryInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+            ->create();
+        /** @var CategoryListInterface $repository */
+        $repository = $this->objectManager->get(CategoryListInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets product by SKU.
+     *
+     * @param string $sku
+     * @return ProductInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getProduct(string $sku): ProductInterface
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        return $productRepository->get($sku);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_product_ids_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_product_ids_rollback.php
new file mode 100644
index 0000000000000..667138d3088ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_product_ids_rollback.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+
+$productCollection->load()->delete();
+
+$productSkuList = ['simple', '12345'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/categories_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php
index 7dd6ba630f3d2..ab252e9469a20 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php
@@ -14,6 +14,20 @@
 
 $productCollection->load()->delete();
 
+$productSkuList = ['simple', '12345'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
new file mode 100644
index 0000000000000..e86a998ebe82c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()
+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
+
+require __DIR__ . '/../../Store/_files/store.php';
+
+/** @var $installer CategorySetup */
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$storeManager->setCurrentStore(0);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setStoreId(0)
+    ->setWebsiteIds([1])
+    ->setName('Product1')
+    ->setSku('product1')
+    ->setPrice(10)
+    ->setWeight(18)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setUrlKey('product-1')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php
new file mode 100644
index 0000000000000..bcf399cb5e552
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_rewrite_multistore_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('product1', true);
+    if ($product->getId()) {
+        $productRepository->delete($product);
+    }
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Store/_files/store_rollback.php';
+require __DIR__ . '/../../Store/_files/second_store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_simple_rollback.php
new file mode 100644
index 0000000000000..86f0ce34af00c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_simple_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple', true);
+    if ($product->getId()) {
+        $productRepository->delete($product);
+    }
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
index 2e2be36743b0f..2f3d4ea4c3e7f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
@@ -60,13 +60,23 @@
     ->setAttributeSetId(4)
     ->setWebsiteIds([1])
     ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    )
     ->setQty(100)
     ->setWeight(1);
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
-$productRepository->save($product);
+$product = $productRepository->save($product);
 
 /** @var CategoryLinkManagementInterface $linkManagement */
 $linkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
-$linkManagement->assignProductToCategories($product->getSku(), [$category->getEntityId()]);
+$linkManagement->assignProductToCategories($product->getSku(), [Category::TREE_ROOT_ID, $category->getEntityId()]);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
index 046e502a9ade1..2598dd6693500 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
@@ -11,10 +11,18 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
-$productRepository->deleteById('p002');
+//$productRepository->deleteById('p002');
+$product = $productRepository->get('p002', false, null, true);
+$productRepository->delete($product);
 
 /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
 $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
@@ -33,4 +41,7 @@
     $categoryRepository->delete($category);
 }
 
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
 require __DIR__ . '/../../Store/_files/store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
index 6892f7b3a8a88..2695948e78314 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
@@ -38,6 +38,7 @@ protected function setUp()
      * 4. Set at least 2 options of multiselect attribute to match products for the product list widget
      * 5. Load collection for product list widget and make sure that number of loaded products is correct
      *
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
      */
     public function testCreateCollection()
@@ -68,7 +69,7 @@ public function testCreateCollection()
             . '`value`:[`' . implode(',', $multiselectAttributeOptionIds) . '`]^]^]';
         $this->block->setData('conditions_encoded', $encodedConditions);
 
-        // Load products collection filtered using specified conditions and perform assesrions
+        // Load products collection filtered using specified conditions and perform assertions
         $productCollection = $this->block->createCollection();
         $productCollection->load();
         $this->assertEquals(
@@ -77,4 +78,98 @@ public function testCreateCollection()
             "Product collection was not filtered according to the widget condition."
         );
     }
+
+    /**
+     * Test product list widget can process condition with dropdown type of attribute
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/products_with_dropdown_attribute.php
+     */
+    public function testCreateCollectionWithDropdownAttribute()
+    {
+        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        );
+        $attribute->load('dropdown_attribute', 'attribute_code');
+        $dropdownAttributeOptionIds = [];
+        foreach ($attribute->getOptions() as $option) {
+            if ($option->getValue()) {
+                $dropdownAttributeOptionIds[] = $option->getValue();
+            }
+        }
+        $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,' .
+            '`aggregator`:`any`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
+            '|Condition||Product`,`attribute`:`dropdown_attribute`,`operator`:`==`,`value`:`'
+            . $dropdownAttributeOptionIds[0] . '`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule|' .
+            '|Condition||Product`,`attribute`:`dropdown_attribute`,`operator`:`==`,`value`:`'
+            . $dropdownAttributeOptionIds[1] . '`^]^]';
+        $this->block->setData('conditions_encoded', $encodedConditions);
+        $this->performAssertions(2);
+        $attribute->setUsedInProductListing(0);
+        $attribute->save();
+        $this->performAssertions(2);
+        $attribute->setIsGlobal(1);
+        $attribute->save();
+        $this->performAssertions(2);
+    }
+
+    /**
+     * Check product collection includes correct amount of products.
+     *
+     * @param int $count
+     * @return void
+     */
+    private function performAssertions(int $count)
+    {
+        // Load products collection filtered using specified conditions and perform assertions.
+        $productCollection = $this->block->createCollection();
+        $productCollection->load();
+        $this->assertEquals(
+            $count,
+            $productCollection->count(),
+            "Product collection was not filtered according to the widget condition."
+        );
+    }
+
+    /**
+     * Check that collection returns correct result if use not contains operator for string attribute
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
+     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
+     * @dataProvider createCollectionForSkuDataProvider
+     * @param string $encodedConditions
+     * @param string $sku
+     * @return void
+     */
+    public function testCreateCollectionForSku($encodedConditions, $sku)
+    {
+        $this->block->setData('conditions_encoded', $encodedConditions);
+        $productCollection = $this->block->createCollection();
+        $productCollection->load();
+        $this->assertEquals(
+            1,
+            $productCollection->count(),
+            "Product collection was not filtered according to the widget condition."
+        );
+        $this->assertEquals($sku, $productCollection->getFirstItem()->getSku());
+    }
+
+    /**
+     * @return array
+     */
+    public function createCollectionForSkuDataProvider()
+    {
+        return [
+            'contains' => ['^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
+                . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
+                . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
+                . '`attribute`:`sku`,`operator`:`^[^]`,`value`:`virtual`^]^]' , 'virtual-product'],
+            'not contains' => ['^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
+                . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
+                . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
+                . '`attribute`:`sku`,`operator`:`!^[^]`,`value`:`virtual`^]^]', 'product-with-xss']
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
index 61ce3315fd9b5..f7967eee8b247 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\CatalogWidget\Model\Rule\Condition;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -18,6 +20,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -28,19 +33,26 @@ protected function setUp()
         $this->conditionProduct->setRule($rule);
     }
 
+    /**
+     * @return void
+     */
     public function testLoadAttributeOptions()
     {
         $this->conditionProduct->loadAttributeOptions();
         $options = $this->conditionProduct->getAttributeOption();
-        $this->assertArrayHasKey('sku', $options);
-        $this->assertArrayHasKey('attribute_set_id', $options);
+        $this->assertArrayHasKey(ProductInterface::SKU, $options);
+        $this->assertArrayHasKey(ProductInterface::ATTRIBUTE_SET_ID, $options);
         $this->assertArrayHasKey('category_ids', $options);
+        $this->assertArrayNotHasKey(ProductInterface::STATUS, $options);
         foreach ($options as $code => $label) {
             $this->assertNotEmpty($label);
             $this->assertNotEmpty($code);
         }
     }
 
+    /**
+     * @return void
+     */
     public function testAddGlobalAttributeToCollection()
     {
         $collection = $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
@@ -53,6 +65,9 @@ public function testAddGlobalAttributeToCollection()
         $this->assertEquals('at_special_price.value', $this->conditionProduct->getMappedSqlField());
     }
 
+    /**
+     * @return void
+     */
     public function testAddNonGlobalAttributeToCollectionNoProducts()
     {
         $collection = $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php
new file mode 100644
index 0000000000000..f6338c1ee1664
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api;
+
+use Braintree\Result\Error;
+use Magento\Braintree\Gateway\Http\Client\TransactionSale;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\State;
+use Magento\Framework\App\Area;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class PaymentInformationManagementTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PaymentInformationManagementTest extends TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var TransactionSale|MockObject
+     */
+    private $client;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->client = $this->getMockBuilder(TransactionSale::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager->addSharedInstance($this->client, TransactionSale::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(TransactionSale::class);
+        parent::tearDown();
+    }
+
+    /**
+     * Checks a case when payment method triggers an error during place order flow and
+     * error messages from payment gateway should be mapped.
+     * Error messages might be specific for different areas.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     * @magentoConfigFixture current_store payment/braintree/active 1
+     * @dataProvider getErrorPerAreaDataProvider
+     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+     * @param string $area
+     * @param array $testErrorCodes
+     * @param string $expectedOutput
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testSavePaymentInformationAndPlaceOrderWithErrors(
+        string $area,
+        array $testErrorCodes,
+        string $expectedOutput
+    ) {
+        /** @var State $state */
+        $state = $this->objectManager->get(State::class);
+        $state->setAreaCode($area);
+
+        $quote = $this->getQuote('test_order_1');
+
+        /** @var PaymentInterface $payment */
+        $payment = $this->objectManager->create(PaymentInterface::class);
+        $payment->setMethod(ConfigProvider::CODE);
+
+        $errors = ['errors' => []];
+
+        foreach ($testErrorCodes as $testErrorCode) {
+            array_push($errors['errors'], ['code' => $testErrorCode]);
+        }
+
+        $response = new Error(['errors' => $errors]);
+
+        $this->client->method('placeRequest')
+            ->willReturn(['object' => $response]);
+
+        $this->expectExceptionMessage($expectedOutput);
+
+        /** @var PaymentInformationManagementInterface $paymentInformationManagement */
+        $paymentInformationManagement = $this->objectManager->get(PaymentInformationManagementInterface::class);
+        $paymentInformationManagement->savePaymentInformationAndPlaceOrder(
+            $quote->getId(),
+            $payment
+        );
+    }
+
+    /**
+     * Gets list of areas with specific error messages.
+     *
+     * @return array
+     */
+    public function getErrorPerAreaDataProvider()
+    {
+        $testErrorGlobal = ['code' => 81802, 'message' => 'Company is too long.'];
+        $testErrorAdmin = ['code' => 91511, 'message' => 'Customer does not have any credit cards.'];
+        $testErrorFake = ['code' => 'fake_code', 'message' => 'Error message should not be mapped.'];
+
+        return [
+            [
+                Area::AREA_FRONTEND,
+                [$testErrorAdmin['code'], $testErrorFake['code']],
+                'Transaction has been declined. Please try again later.'
+            ], [
+                Area::AREA_FRONTEND,
+                [$testErrorGlobal['code'], $testErrorAdmin['code'], $testErrorFake['code']],
+                $testErrorGlobal['message']
+            ], [
+                Area::AREA_ADMINHTML,
+                [$testErrorGlobal['code'], $testErrorAdmin['code'], $testErrorFake['code']],
+                $testErrorGlobal['message'] . PHP_EOL . $testErrorAdmin['message']
+            ],
+        ];
+    }
+
+    /**
+     * Retrieves quote by provided order ID.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}
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 2036042d0463c..3e99c5cad3c39 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
@@ -6,6 +6,8 @@
 
 namespace Magento\Checkout\Controller\Cart\Index;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoDbIsolation enabled
  */
@@ -26,13 +28,14 @@ public function testExecute()
             'remove' => 0,
             'coupon_code' => 'test'
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->dispatch(
             'checkout/cart/couponPost/'
         );
 
         $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/Controller/Cart/UpdateItemQtyTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/UpdateItemQtyTest.php
new file mode 100644
index 0000000000000..4c653ab9ae33f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/UpdateItemQtyTest.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Controller\Cart;
+
+use Magento\Catalog\Model\Product;
+use Magento\Checkout\Model\Session;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Serialize\Serializer\Json;
+
+class UpdateItemQtyTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->json = $this->_objectManager->create(Json::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+        $this->session = $this->_objectManager->create(Session::class);
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Tests of cart validation.
+     *
+     * @param array $requestQuantity
+     * @param array $expectedResponse
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product.php
+     * @dataProvider requestDataProvider
+     */
+    public function testExecute($requestQuantity, $expectedResponse)
+    {
+        try {
+            /** @var $product Product */
+            $product = $this->productRepository->get('simple');
+        } catch (\Exception $e) {
+            $this->fail('No such product entity');
+        }
+
+        $quoteItem = $this->session
+            ->getQuote()
+            ->getItemByProduct($product);
+
+        $this->assertNotNull($quoteItem, 'Cannot get quote item for simple product');
+
+        $request = [];
+        if (!empty($requestQuantity) && is_array($requestQuantity)) {
+            $request= [
+                'form_key' => $this->formKey->getFormKey(),
+                'cart' => [
+                    $quoteItem->getId() => $requestQuantity,
+                ]
+            ];
+        }
+
+        $this->getRequest()->setPostValue($request);
+        $this->dispatch('checkout/cart/updateItemQty');
+        $response = $this->getResponse()->getBody();
+
+        $this->assertEquals($this->json->unserialize($response), $expectedResponse);
+    }
+
+    /**
+     * Variations of request data.
+     * @returns array
+     */
+    public function requestDataProvider(): array
+    {
+        return [
+            [
+                'request' => [],
+                'response' => [
+                    'success' => false,
+                    'error_message' => 'Something went wrong while saving the page.'.
+                        ' Please refresh the page and try again.'
+                ]
+            ],
+            [
+                'request' => ['qty' => 2],
+                'response' => [
+                    'success' => true,
+                ]
+            ],
+            [
+                'request' => ['qty' => 230],
+                'response' => [
+                    'success' => false,
+                    'error_message' => 'The requested qty is not available']
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
index 5ffaa789cf2eb..fc85cc384a3db 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -11,13 +11,18 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Customer\Model\ResourceModel\CustomerRepository;
 use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Request;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
 use Magento\Sales\Model\ResourceModel\Order\Item\Collection as OrderItemCollection;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -25,6 +30,28 @@
  */
 class CartTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /** @var CheckoutSession */
+    private $checkoutSession;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->checkoutSession = $this->_objectManager->get(CheckoutSession::class);
+        $this->_objectManager->addSharedInstance($this->checkoutSession, CheckoutSession::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(CheckoutSession::class);
+        parent::tearDown();
+    }
+
     /**
      * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product
      *
@@ -32,8 +59,8 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     public function testConfigureActionWithSimpleProduct()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $session CheckoutSession */
+        $session = $this->_objectManager->create(CheckoutSession::class);
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -63,19 +90,20 @@ public function testConfigureActionWithSimpleProduct()
     /**
      * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product and custom option
      *
-     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_and_custom_option.php
+     * @magentoDataFixture Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
      */
     public function testConfigureActionWithSimpleProductAndCustomOption()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var Quote $quote */
+        $quote = $this->getQuote('test_order_item_with_custom_options');
+        $this->checkoutSession->setQuoteId($quote->getId());
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
         /** @var $product \Magento\Catalog\Model\Product */
-        $product = $productRepository->get('simple');
+        $product = $productRepository->get('simple_with_custom_options');
 
-        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
+        $quoteItem = $this->_getQuoteItemIdByProductId($quote, $product->getId());
         $this->assertNotNull($quoteItem, 'Cannot get quote item for simple product with custom option');
 
         $this->dispatch(
@@ -108,11 +136,12 @@ public function testConfigureActionWithSimpleProductAndCustomOption()
      * Test for \Magento\Checkout\Controller\Cart::configureAction() with bundle product
      *
      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
+     * @magentoDbIsolation disabled
      */
     public function testConfigureActionWithBundleProduct()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $session CheckoutSession */
+        $session = $this->_objectManager->create(CheckoutSession::class);
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -146,8 +175,8 @@ public function testConfigureActionWithBundleProduct()
      */
     public function testConfigureActionWithDownloadableProduct()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $session CheckoutSession */
+        $session = $this->_objectManager->create(CheckoutSession::class);
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -200,8 +229,8 @@ public function testUpdatePostAction()
         $productId = $product->getId();
         $originalQuantity = 1;
         $updatedQuantity = 2;
-        /** @var $checkoutSession \Magento\Checkout\Model\Session  */
-        $checkoutSession = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $checkoutSession CheckoutSession */
+        $checkoutSession = $this->_objectManager->create(CheckoutSession::class);
         $quoteItem = $this->_getQuoteItemIdByProductId($checkoutSession->getQuote(), $productId);
 
         /** @var FormKey $formKey */
@@ -211,6 +240,7 @@ public function testUpdatePostAction()
             'update_cart_action' => 'update_qty',
             'form_key' => $formKey->getFormKey(),
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         /** @var $customerSession \Magento\Customer\Model\Session */
         $customerSession = $this->_objectManager->create(\Magento\Customer\Model\Session::class);
@@ -234,11 +264,32 @@ public function testUpdatePostAction()
         $this->assertEquals($updatedQuantity, $quoteItem->getQty(), "Invalid quote item quantity");
     }
 
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+
     /**
      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
      *
      * @param \Magento\Quote\Model\Quote $quote
-     * @param $productId
+     * @param string|int $productId
+     *
      * @return \Magento\Quote\Model\Quote\Item|null
      */
     private function _getQuoteItemIdByProductId($quote, $productId)
@@ -273,6 +324,7 @@ public function testAddToCartSimpleProduct($area, $expectedPrice)
             'isAjax' => 1
         ];
         \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($area);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
 
         $quote =  $this->_objectManager->create(\Magento\Checkout\Model\Cart::class);
@@ -300,6 +352,77 @@ public function addAddProductDataProvider()
         ];
     }
 
+    /**
+     * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and activated redirect to cart
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 1
+     * @magentoAppIsolation enabled
+     */
+    public function testMessageAtAddToCartWithRedirect()
+    {
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $postData = [
+            'qty' => '1',
+            'product' => '1',
+            'custom_price' => 1,
+            'form_key' => $formKey->getFormKey(),
+            'isAjax' => 1
+        ];
+        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
+        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod('POST');
+
+        $this->dispatch('checkout/cart/add');
+
+        $this->assertEquals(
+            '{"backUrl":"http:\/\/localhost\/index.php\/checkout\/cart\/"}',
+            $this->getResponse()->getBody()
+        );
+
+        $this->assertSessionMessages(
+            $this->contains(
+                'You added Simple Product to your shopping cart.'
+            ),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and deactivated redirect to cart
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 0
+     * @magentoAppIsolation enabled
+     */
+    public function testMessageAtAddToCartWithoutRedirect()
+    {
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $postData = [
+            'qty' => '1',
+            'product' => '1',
+            'custom_price' => 1,
+            'form_key' => $formKey->getFormKey(),
+            'isAjax' => 1
+        ];
+        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
+        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod('POST');
+
+        $this->dispatch('checkout/cart/add');
+
+        $this->assertFalse($this->getResponse()->isRedirect());
+        $this->assertEquals('[]', $this->getResponse()->getBody());
+
+        $this->assertSessionMessages(
+            $this->contains(
+                "\n" . 'You added Simple Product to your ' .
+                '<a href="http://localhost/index.php/checkout/cart/">shopping cart</a>.'
+            ),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+    }
+
     /**
      * @covers \Magento\Checkout\Controller\Cart\Addgroup::execute()
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
index ed82831f25f0e..25be9ba0c12b4 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
@@ -34,10 +34,8 @@ protected function setUp()
      */
     public function testAddProductWithLowerQty()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            'The fewest you may purchase is 3'
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('The fewest you may purchase is 3');
         $product = $this->productRepository->get('simple');
         $this->cart->addProduct($product->getId(), ['qty' => 1]);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
index 57cbaef54e589..af572c556bb07 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -5,19 +5,50 @@
  */
 namespace Magento\Checkout\Model;
 
+use Magento\Catalog\Api\Data\ProductTierPriceInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Class SessionTest
+ */
 class SessionTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Checkout\Model\Session
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CustomerRepositoryInterface
      */
-    protected $_checkoutSession;
+    private $customerRepository;
 
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @return void
+     */
     protected function setUp()
     {
-        $this->_checkoutSession = Bootstrap::getObjectManager()->create(\Magento\Checkout\Model\Session::class);
-        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $this->customerSession = $this->objectManager->get(CustomerSession::class);
+        $this->checkoutSession = $this->objectManager->create(Session::class);
     }
 
     /**
@@ -29,15 +60,11 @@ protected function setUp()
      */
     public function testGetQuoteNotInitializedCustomerSet()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $customer = $customerRepository->getById(1);
-        $this->_checkoutSession->setCustomerData($customer);
+        $customer = $this->customerRepository->getById(1);
+        $this->checkoutSession->setCustomerData($customer);
 
         /** Execute SUT */
-        $quote = $this->_checkoutSession->getQuote();
+        $quote = $this->checkoutSession->getQuote();
         $this->_validateCustomerDataInQuote($quote);
     }
 
@@ -51,17 +78,11 @@ public function testGetQuoteNotInitializedCustomerSet()
      */
     public function testGetQuoteNotInitializedCustomerLoggedIn()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $customer = $customerRepository->getById(1);
-        /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
-        $customerSession->setCustomerDataObject($customer);
+        $customer = $this->customerRepository->getById(1);
+        $this->customerSession->setCustomerDataObject($customer);
 
         /** Execute SUT */
-        $quote = $this->_checkoutSession->getQuote();
+        $quote = $this->checkoutSession->getQuote();
         $this->_validateCustomerDataInQuote($quote);
     }
 
@@ -80,29 +101,86 @@ public function testGetQuoteNotInitializedCustomerLoggedIn()
      */
     public function testLoadCustomerQuoteCustomerWithoutQuote()
     {
-        $quote = $this->_checkoutSession->getQuote();
+        $quote = $this->checkoutSession->getQuote();
         $this->assertEmpty($quote->getCustomerId(), 'Precondition failed: Customer data must not be set to quote');
         $this->assertEmpty($quote->getCustomerEmail(), 'Precondition failed: Customer data must not be set to quote');
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $customer = $customerRepository->getById(1);
-        /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
-        $customerSession->setCustomerDataObject($customer);
+        $customer = $this->customerRepository->getById(1);
+        $this->customerSession->setCustomerDataObject($customer);
 
         /** Ensure that customer data is still unavailable before SUT invocation */
-        $quote = $this->_checkoutSession->getQuote();
+        $quote = $this->checkoutSession->getQuote();
         $this->assertEmpty($quote->getCustomerEmail(), 'Precondition failed: Customer data must not be set to quote');
 
         /** Execute SUT */
-        $this->_checkoutSession->loadCustomerQuote();
-        $quote = $this->_checkoutSession->getQuote();
+        $this->checkoutSession->loadCustomerQuote();
+        $quote = $this->checkoutSession->getQuote();
         $this->_validateCustomerDataInQuote($quote);
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     */
+    public function testGetQuoteWithProductWithTierPrice()
+    {
+        $reservedOrderId = 'test01';
+        $customerGroupId = 1;
+        $tierPriceQty = 1;
+        $tierPriceValue = 9;
+
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+        $tierPrice = $this->objectManager->create(ProductTierPriceInterface::class)
+            ->setCustomerGroupId($customerGroupId)
+            ->setQty($tierPriceQty)
+            ->setValue($tierPriceValue);
+        $product->setTierPrices([$tierPrice]);
+        $productRepository->save($product);
+
+        $quote = $this->getQuote($reservedOrderId);
+        $this->checkoutSession->setQuoteId($quote->getId());
+
+        $quote = $this->checkoutSession->getQuote();
+        $item = $quote->getItems()[0];
+        /** @var \Magento\Catalog\Model\Product $quoteProduct */
+        $quoteProduct = $item->getProduct();
+        $this->assertEquals(10, $quoteProduct->getTierPrice($tierPriceQty));
+
+        $customer = $this->customerRepository->getById(1);
+        $this->customerSession->setCustomerDataAsLoggedIn($customer);
+
+        $quote = $this->checkoutSession->getQuote();
+        $item = $quote->getItems()[0];
+        /** @var \Magento\Catalog\Model\Product $quoteProduct */
+        $quoteProduct = $item->getProduct();
+        $this->assertEquals($tierPriceValue, $quoteProduct->getTierPrice(1));
+    }
+
+    /**
+     * Returns quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        $filterBuilder = $this->objectManager->create(FilterBuilder::class);
+        $filter = $filterBuilder->setField('reserved_order_id')
+            ->setConditionType('=')
+            ->setValue($reservedOrderId)
+            ->create();
+        $searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilters([$filter])
+            ->create();
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $searchResult = $quoteRepository->getList($searchCriteria);
+        /** @var CartInterface[] $items */
+        $items = $searchResult->getItems();
+
+        return \array_values($items)[0];
+    }
+
     /**
      * Ensure that quote has customer data specified in customer fixture.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
new file mode 100644
index 0000000000000..994076badddae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Plugin\Model\Quote;
+
+use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\BillingAddressManagement;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test for \Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses
+ */
+class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     *
+     * @return void
+     */
+    public function testAfterRemoveItem(): void
+    {
+        /** @var Quote $quote */
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $quote->load('test_order_with_virtual_product', 'reserved_order_id');
+        /** @var QuoteAddress $quoteShippingAddress */
+        $quoteBillingAddress = Bootstrap::getObjectManager()->create(QuoteAddress::class);
+        $quoteBillingAddress->setRegion('CA')
+            ->setPostcode('90210')
+            ->setFirstname('a_unique_firstname')
+            ->setLastname('lastname')
+            ->setStreet('street')
+            ->setCity('Beverly Hills')
+            ->setEmail('admin@example.com')
+            ->setTelephone('1111111111')
+            ->setCountryId('US')
+            ->setAddressType('billing');
+
+        /** @var BillingAddressManagement $billingAddressManagement */
+        $billingAddressManagement = Bootstrap::getObjectManager()->create(BillingAddressManagement::class);
+        $billingAddressManagement->assign($quote->getId(), $quoteBillingAddress);
+        /** @var Session $checkoutSession */
+        $checkoutSession = Bootstrap::getObjectManager()->create(Session::class);
+        $checkoutSession->setQuoteId($quote->getId());
+        /** @var Cart $cart */
+        $cart = Bootstrap::getObjectManager()->create(Cart::class);
+
+        $activeQuote = $cart->getQuote();
+        // Dummy data is still persisted here. This is sufficient to check that it is removed
+        $activeQuote->getExtensionAttributes()->setShippingAssignments(['test']);
+
+        $cart->removeItem($activeQuote->getAllVisibleItems()[0]->getId());
+        $cart->save();
+
+        // Check that the shipping assignments were also unset
+        $this->assertEmpty($activeQuote->getExtensionAttributes()->getShippingAssignments());
+
+        /** @var Quote $quote */
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $quote->load('test_order_with_virtual_product', 'reserved_order_id');
+        $quoteBillingAddressUpdated = $quote->getBillingAddress();
+        $customer = $quote->getCustomer();
+
+        $this->assertEquals($quoteBillingAddressUpdated->getEmail(), $customer->getEmail());
+        $this->assertEmpty($quoteBillingAddressUpdated->getCountryId());
+        $this->assertEmpty($quoteBillingAddressUpdated->getRegionId());
+        $this->assertEmpty($quoteBillingAddressUpdated->getRegion());
+        $this->assertEmpty($quoteBillingAddressUpdated->getPostcode());
+        $this->assertEmpty($quoteBillingAddressUpdated->getCity());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
new file mode 100644
index 0000000000000..22367979adcab
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\DataObject;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_custom_options.php';
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple_with_custom_options');
+
+$options = [];
+/** @var $option Option */
+foreach ($product->getOptions() as $option) {
+    switch ($option->getGroupByType()) {
+        case ProductCustomOptionInterface::OPTION_GROUP_SELECT:
+            $value = key($option->getValues());
+            break;
+        default:
+            $value = 'test';
+            break;
+    }
+    $options[$option->getId()] = $value;
+}
+
+$requestInfo = new DataObject(['qty' => 1, 'options' => $options]);
+
+/** @var $cart \Magento\Checkout\Model\Cart */
+$quote = Bootstrap::getObjectManager()->create(Quote::class);
+$quote->setReservedOrderId('test_order_item_with_custom_options');
+$quote->addProduct($product, $requestInfo);
+$quote->save();
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$objectManager->removeSharedInstance(Session::class);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php
index ddc7d20631566..c88c87d74dfda 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product.php
@@ -35,6 +35,7 @@
 /** @var $cart \Magento\Checkout\Model\Cart */
 $cart = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Checkout\Model\Cart::class);
 $cart->addProduct($product, $requestInfo);
+$cart->getQuote()->setReservedOrderId('test_cart_with_bundle');
 $cart->save();
 
 /** @var $objectManager \Magento\TestFramework\ObjectManager */
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_rollback.php
new file mode 100644
index 0000000000000..090248820e246
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_rollback.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/*
+ * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
+ * bundled items should not contain products with required custom options.
+ * However, if to create such a bundle product, it will be always out of stock.
+ */
+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('bundle-product', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_cart_with_bundle', 'reserved_order_id');
+$quote->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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 0000000000000..5f3b024c3148e
--- /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/Checkout/_files/quote_with_shipping_method_and_items_categories_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method_and_items_categories_rollback.php
new file mode 100644
index 0000000000000..0efe941ac637f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method_and_items_categories_rollback.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productSkuList = ['simple_cat_3', 'simple_cat_4'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+//Remove categories
+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('level', 2)
+    ->load()
+    ->delete();
+
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1', 'reserved_order_id')->delete();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
+$quoteIdMask->delete($quote->getId());
+
+require __DIR__ . '/../../Checkout/_files/quote_with_address_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Api/SearchCriteria/ActiveStoreAgreementsFilterTest.php b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Api/SearchCriteria/ActiveStoreAgreementsFilterTest.php
new file mode 100644
index 0000000000000..131de7a510223
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Api/SearchCriteria/ActiveStoreAgreementsFilterTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CheckoutAgreements\Model\Api\SearchCriteria;
+
+class ActiveStoreAgreementsFilterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter
+     */
+    private $model;
+
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(
+            \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter::class
+        );
+    }
+
+    public function testBuildSearchCriteria()
+    {
+        $expected = [
+            'filter_groups' => [
+                [
+                    'filters' => [
+                        [
+                            'field' => 'store_id',
+                            'condition_type' => 'eq',
+                            'value' => 1,
+                        ]
+                    ]
+                ],
+                [
+                    'filters' => [
+                        [
+                            'field' => 'is_active',
+                            'condition_type' => 'eq',
+                            'value' => 1,
+                        ]
+                    ]
+                ],
+            ]
+        ];
+        $searchCriteria = $this->model->buildSearchCriteria();
+        $this->assertEquals($expected, $searchCriteria->__toArray());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php
index aad986975c295..34e7afb3f9176 100644
--- a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php
+++ b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CheckoutAgreements\Model\Checkout\Plugin;
 
 /**
@@ -142,7 +143,10 @@ public function testBeforeSavePaymentInformationAndPlaceOrder($agreementNames)
             $this->assertNotNull($orderId);
         } catch (\Magento\Framework\Exception\CouldNotSaveException $e) {
             $this->assertEquals(
-                __('Please agree to all the terms and conditions before placing the order.'),
+                __(
+                    "The order wasn't placed. "
+                    . "First, agree to the terms and conditions, then try placing your order again."
+                ),
                 $e->getMessage()
             );
         }
diff --git a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/ResourceModel/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/ResourceModel/Grid/CollectionTest.php
new file mode 100644
index 0000000000000..bc098cf1bd0ec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/ResourceModel/Grid/CollectionTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CheckoutAgreements\Model\ResourceModel\Grid;
+
+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid\Collection;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Check data in collection
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Collection;
+     */
+    private $collection;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->collection = Bootstrap::getObjectManager()
+            ->create(Collection::class);
+    }
+
+    /**
+     * Check that collection is filterable by store
+     *
+     * @magentoDataFixture Magento/CheckoutAgreements/_files/multi_agreements_active_with_text.php
+     */
+    public function testAddStoresToFilter(): void
+    {
+        $collectionSize = $this->collection->addStoreFilter(1)
+            ->load(false, false)
+            ->getSize();
+        $this->assertEquals(2, $collectionSize);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php
index 7ee1f569180a2..266fd66bc3db9 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php
@@ -31,5 +31,6 @@ public function testToHtml()
         $this->assertContains('<a href="http://example.com/', $result);
         $this->assertContains('<p>Config value: "http://example.com/".</p>', $result);
         $this->assertContains('<p>Custom variable: "HTML Value".</p>', $result);
+        $this->assertSame($cmsBlock->getIdentities(), $block->getIdentities());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/FulltextGridSearchTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/FulltextGridSearchTest.php
new file mode 100644
index 0000000000000..c740609773b90
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/FulltextGridSearchTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Controller\Adminhtml;
+
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * @magentoDataFixture Magento/Cms/Fixtures/page_list.php
+ */
+class FulltextGridSearchTest extends AbstractBackendController
+{
+    /**
+     * Checks a fulltext grid search by CMS page title.
+     *
+     * @param string $query
+     * @param int $expectedRows
+     * @param array $expectedTitles
+     * @dataProvider queryDataProvider
+     */
+    public function testSearchByTitle(string $query, int $expectedRows, array $expectedTitles)
+    {
+        $url = 'backend/mui/index/render/?namespace=cms_page_listing&search=' . $query;
+
+        $this->getRequest()
+            ->getHeaders()
+            ->addHeaderLine('Accept', 'application/json');
+        $this->dispatch($url);
+        $response = $this->getResponse();
+        $data = json_decode($response->getBody(), true);
+        self::assertEquals($expectedRows, $data['totalRecords']);
+
+        $titleList = array_column($data['items'], 'title');
+        self::assertEquals($expectedTitles, $titleList);
+    }
+
+    /**
+     * Gets list of variations with different search queries.
+     *
+     * @return array
+     */
+    public function queryDataProvider(): array
+    {
+        return [
+            [
+                'query' => 'simple',
+                'expectedRows' => 3,
+                'expectedTitles' => ['simplePage', 'simplePage01', '01simplePage']
+            ],
+            [
+                'query' => 'page01',
+                'expectedRows' => 1,
+                'expectedTitles' => ['simplePage01']
+            ],
+            [
+                'query' => '01simple',
+                'expectedRows' => 1,
+                'expectedTitles' => ['01simplePage']
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
new file mode 100644
index 0000000000000..1fc07d32c77b9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles class.
+ */
+class DeleteFilesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles
+     */
+    private $model;
+
+    /**
+     * @var  \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $imagesHelper;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
+    /**
+     * @var string
+     */
+    private $fileName = 'magento_small_image.jpg';
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $directoryName = 'directory1';
+        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper */
+        $this->imagesHelper = $this->objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->fullDirectoryPath = $this->imagesHelper->getStorageRoot() . '/' . $directoryName;
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $filePath =  $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
+        $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
+        copy($fixtureDir . '/' . $this->fileName, $filePath);
+        $path = $this->fullDirectoryPath . '/.htaccess';
+        if (!$this->mediaDirectory->isFile($path)) {
+            $this->mediaDirectory->writeFile($path, "Order deny,allow\nDeny from all");
+        }
+        $this->model = $this->objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::class);
+    }
+
+    /**
+     * Execute method with correct directory path and file name to check that files under WYSIWYG media directory
+     * can be removed.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('files', [$this->imagesHelper->idEncode($this->fileName)]);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+
+        $this->assertFalse(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . $this->fileName)
+            )
+        );
+    }
+
+    /**
+     * Check that htaccess file couldn't be removed via
+     * \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::execute method
+     *
+     * @return void
+     */
+    public function testDeleteHtaccess()
+    {
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('files', [$this->imagesHelper->idEncode('.htaccess')]);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+
+        $this->assertTrue(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . '.htaccess')
+            )
+        );
+    }
+
+    /**
+     * Execute method with traversal file path to check that there is no ability to remove file which is not
+     * under media directory.
+     *
+     * @return void
+     */
+    public function testExecuteWithWrongFileName()
+    {
+        $fileName = '/../../../etc/env.php';
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('files', [$this->imagesHelper->idEncode($fileName)]);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+
+        $this->assertFileExists($this->fullDirectoryPath . $fileName);
+    }
+
+    /**
+     * Execute method with correct directory path and file name to check that files under linked media directory
+     * can be removed.
+     *
+     * @return void
+     * @magentoDataFixture Magento/Cms/_files/linked_media.php
+     */
+    public function testExecuteWithLinkedMedia()
+    {
+        $directoryName = 'linked_media';
+        $fullDirectoryPath = $this->filesystem->getDirectoryRead(DirectoryList::PUB)
+                ->getAbsolutePath() . DIRECTORY_SEPARATOR . $directoryName;
+        $filePath =  $fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
+        $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
+        copy($fixtureDir . '/' . $this->fileName, $filePath);
+
+        $wysiwygDir = $this->mediaDirectory->getAbsolutePath() . '/wysiwyg';
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('files', [$this->imagesHelper->idEncode($this->fileName)]);
+        $this->model->getStorage()->getSession()->setCurrentPath($wysiwygDir);
+        $this->model->execute();
+        $this->assertFalse(is_file($fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        if ($directory->isExist('wysiwyg')) {
+            $directory->delete('wysiwyg');
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
new file mode 100644
index 0000000000000..a1a29706756b5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFolder class.
+ */
+class DeleteFolderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFolder
+     */
+    private $model;
+
+    /**
+     * @var  \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $imagesHelper;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        /** @var \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper */
+        $this->imagesHelper = $objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $this->fullDirectoryPath = $this->imagesHelper->getStorageRoot();
+        $this->model = $objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFolder::class);
+    }
+
+    /**
+     * Execute method with correct directory path to check that directories under WYSIWYG media directory
+     * can be removed.
+     *
+     * @return void
+     * @magentoAppIsolation enabled
+     */
+    public function testExecute()
+    {
+        $directoryName = DIRECTORY_SEPARATOR . 'NewDirectory';
+        $this->mediaDirectory->create(
+            $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $directoryName)
+        );
+        $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
+        $this->model->execute();
+
+        $this->assertFalse(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath(
+                    $this->fullDirectoryPath . $directoryName
+                )
+            )
+        );
+    }
+
+    /**
+     * Execute method with correct directory path to check that directories under linked media directory
+     * can be removed.
+     *
+     * @magentoDataFixture Magento/Cms/_files/linked_media.php
+     */
+    public function testExecuteWithLinkedMedia()
+    {
+        $linkedDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::PUB);
+        $linkedDirectoryPath =  $this->filesystem->getDirectoryRead(DirectoryList::PUB)
+                ->getAbsolutePath() . 'linked_media';
+        $directoryName = 'NewDirectory';
+
+        $linkedDirectory->create(
+            $linkedDirectory->getRelativePath($linkedDirectoryPath . DIRECTORY_SEPARATOR . $directoryName)
+        );
+        $this->model->getRequest()->setParams(
+            ['node' => $this->imagesHelper->idEncode('wysiwyg' . DIRECTORY_SEPARATOR . $directoryName)]
+        );
+        $this->model->execute();
+        $this->assertFalse(is_dir($linkedDirectoryPath . DIRECTORY_SEPARATOR . $directoryName));
+    }
+
+    /**
+     * Execute method with traversal directory path to check that there is no ability to remove folder which is not
+     * under media directory.
+     *
+     * @return void
+     */
+    public function testExecuteWithWrongDirectoryName()
+    {
+        $directoryName = '/../../etc/';
+        $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
+        $this->model->execute();
+
+        $this->assertFileExists($this->fullDirectoryPath . $directoryName);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        if ($directory->isExist('wysiwyg')) {
+            $directory->delete('wysiwyg');
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php
new file mode 100644
index 0000000000000..e509737a0020f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\NewFolder class.
+ */
+class NewFolderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\NewFolder
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
+    /**
+     * @var string
+     */
+    private $dirName= 'NewDirectory';
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $imagesHelper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper */
+        $this->imagesHelper = $objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->fullDirectoryPath = $this->imagesHelper->getStorageRoot();
+        $this->model = $objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\NewFolder::class);
+    }
+
+    /**
+     * Execute method with correct directory path to check that new folder can be created under WYSIWYG media directory.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('name', $this->dirName);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+
+        $this->assertTrue(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath(
+                    $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->dirName
+                )
+            )
+        );
+    }
+
+    /**
+     * Execute method with correct directory path to check that new folder can be created under WYSIWYG media directory.
+     *
+     * @magentoDataFixture Magento/Cms/_files/linked_media.php
+     */
+    public function testExecuteWithLinkedMedia()
+    {
+        $linkedDirectoryPath =  $this->filesystem->getDirectoryRead(DirectoryList::PUB)
+                ->getAbsolutePath()  . 'linked_media';
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('name', $this->dirName);
+        $this->model->getStorage()
+            ->getSession()
+            ->setCurrentPath($this->fullDirectoryPath . DIRECTORY_SEPARATOR . 'wysiwyg');
+        $this->model->execute();
+
+        $this->assertTrue(is_dir($linkedDirectoryPath . DIRECTORY_SEPARATOR . $this->dirName));
+    }
+
+    /**
+     * Execute method with traversal directory path to check that there is no ability to create new folder not
+     * under media directory.
+     *
+     * @return void
+     */
+    public function testExecuteWithWrongPath()
+    {
+        $dirPath = '/../../../';
+        $this->model->getRequest()->setMethod('POST')
+            ->setPostValue('name', $this->dirName);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath . $dirPath);
+        $this->model->execute();
+
+        $this->assertFileNotExists(
+            $this->fullDirectoryPath . $dirPath . $this->dirName
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        if ($directory->isExist('wysiwyg')) {
+            $directory->delete('wysiwyg');
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
new file mode 100644
index 0000000000000..bab14a8663eae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload class.
+ */
+class UploadTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
+    /**
+     * @var string
+     */
+    private $fileName = 'magento_small_image.jpg';
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $directoryName = 'directory1';
+        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper */
+        $imagesHelper = $this->objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->fullDirectoryPath = $imagesHelper->getStorageRoot() . DIRECTORY_SEPARATOR . $directoryName;
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $this->model = $this->objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload::class);
+        $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
+        $tmpFile = $this->filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath() . $this->fileName;
+        copy($fixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFile);
+        $_FILES = [
+            'image' => [
+                'name' => $this->fileName,
+                'type' => 'image/png',
+                'tmp_name' => $tmpFile,
+                'error' => 0,
+                'size' => filesize($fixtureDir),
+            ],
+        ];
+    }
+
+    /**
+     * Execute method with correct directory path and file name to check that file can be uploaded to the directory
+     * located under WYSIWYG media.
+     *
+     * @return void
+     * @magentoAppIsolation enabled
+     */
+    public function testExecute()
+    {
+        $this->model->getRequest()->setParams(['type' => 'image/png']);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+
+        $this->assertTrue(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath(
+                    $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName
+                )
+            )
+        );
+    }
+
+    /**
+     * Execute method with correct directory path and file name to check that file can be uploaded to the directory
+     * located under linked folder.
+     *
+     * @return void
+     * @magentoDataFixture Magento/Cms/_files/linked_media.php
+     */
+    public function testExecuteWithLinkedMedia()
+    {
+        $directoryName = 'linked_media';
+        $fullDirectoryPath = $this->filesystem->getDirectoryRead(DirectoryList::PUB)
+                ->getAbsolutePath() . DIRECTORY_SEPARATOR . $directoryName;
+        $wysiwygDir = $this->mediaDirectory->getAbsolutePath() . '/wysiwyg';
+        $this->model->getRequest()->setParams(['type' => 'image/png']);
+        $this->model->getStorage()->getSession()->setCurrentPath($wysiwygDir);
+        $this->model->execute();
+        $this->assertTrue(is_file($fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName));
+    }
+
+    /**
+     * Execute method with traversal directory path to check that there is no ability to create file not
+     * under media directory.
+     *
+     * @return void
+     */
+    public function testExecuteWithWrongPath()
+    {
+        $dirPath = '/../../../etc/';
+        $this->model->getRequest()->setParams(['type' => 'image/png']);
+        $this->model->getStorage()->getSession()->setCurrentPath($dirPath);
+        $this->model->execute();
+
+        $this->assertFileNotExists(
+            $this->fullDirectoryPath . $dirPath . $this->fileName
+        );
+    }
+
+    /**
+     * Execute method with traversal file path to check that there is no ability to create file not
+     * under media directory.
+     *
+     * @return void
+     */
+    public function testExecuteWithWrongFileName()
+    {
+        $newFilename = '/../../../../etc/new_file.png';
+        $_FILES['image']['name'] = $newFilename;
+        $_FILES['image']['tmp_name'] = __DIR__ . DIRECTORY_SEPARATOR . $this->fileName;
+        $this->model->getRequest()->setParams(['type' => 'image/png']);
+        $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
+        $this->model->execute();
+
+        $this->assertFileNotExists($this->fullDirectoryPath . $newFilename);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        if ($directory->isExist('wysiwyg')) {
+            $directory->delete('wysiwyg');
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
new file mode 100644
index 0000000000000..ae431f5c4cf1a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$data = [
+    [
+        'title' => 'simplePage',
+        'is_active' => 1
+    ],
+    [
+        'title' => 'simplePage01',
+        'is_active' => 1
+    ],
+    [
+        'title' => '01simplePage',
+        'is_active' => 1
+    ],
+];
+
+/** @var PageRepositoryInterface $pageRepository */
+$pageRepository = $objectManager->get(PageRepositoryInterface::class);
+foreach ($data as $item) {
+    $page = $objectManager->create(PageInterface::class, ['data' => $item]);
+    $pageRepository->save($page);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
new file mode 100644
index 0000000000000..261cdba589653
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PageRepositoryInterface $pageRepository */
+$pageRepository = $objectManager->get(PageRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('title', ['simplePage', 'simplePage01', '01simplePage'], 'in')
+    ->create();
+$result = $pageRepository->getList($searchCriteria);
+
+foreach ($result->getItems() as $item) {
+    $pageRepository->delete($item);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
index 12d2a467360ea..68273ebe6180d 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
@@ -6,9 +6,20 @@
 namespace Magento\Cms\Helper\Wysiwyg;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\TestFramework\ObjectManager;
 
 class ImagesTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
     public function testGetStorageRoot()
     {
         /** @var \Magento\Framework\Filesystem $filesystem */
@@ -17,17 +28,112 @@ public function testGetStorageRoot()
         );
         $mediaPath = $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath();
         /** @var \Magento\Cms\Helper\Wysiwyg\Images $helper */
-        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $helper = $this->objectManager->create(
             \Magento\Cms\Helper\Wysiwyg\Images::class
         );
         $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot());
     }
 
+    /**
+     * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/
+     */
     public function testGetCurrentUrl()
     {
-        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        /** @var \Magento\Cms\Helper\Wysiwyg\Images $helper */
+        $helper = $this->objectManager->create(
             \Magento\Cms\Helper\Wysiwyg\Images::class
         );
-        $this->assertStringStartsWith('http://localhost/', $helper->getCurrentUrl());
+        $this->assertStringStartsWith('http://example.com/', $helper->getCurrentUrl());
+    }
+
+    /**
+     * @param bool $isStaticUrlsAllowed
+     * @param string $filename
+     * @param bool $renderAsTag
+     * @param string|callable $expectedResult - string or callable to make unique assertions on $expectedResult
+     * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/
+     * @dataProvider providerGetImageHtmlDeclaration
+     */
+    public function testGetImageHtmlDeclaration(
+        $isStaticUrlsAllowed,
+        $filename,
+        $renderAsTag,
+        $expectedResult
+    ) {
+        $helper = $this->generateHelper($isStaticUrlsAllowed);
+
+        $actualResult = $helper->getImageHtmlDeclaration($filename, $renderAsTag);
+
+        if (is_callable($expectedResult)) {
+            $expectedResult($actualResult);
+        } else {
+            $this->assertEquals(
+                $expectedResult,
+                $actualResult
+            );
+        }
+    }
+
+    /**
+     * Data provider for testGetImageHtmlDeclaration
+     *
+     * @return array
+     */
+    public function providerGetImageHtmlDeclaration()
+    {
+        return [
+            [true, 'wysiwyg/hello.png', true, '<img src="http://example.com/pub/media/wysiwyg/hello.png" alt="" />'],
+            [
+                false,
+                'wysiwyg/hello.png',
+                false,
+                function ($actualResult) {
+                    $expectedResult = (
+                        '/backend/cms/wysiwyg/directive/___directive/' .
+                        'e3ttZWRpYSB1cmw9Ind5c2l3eWcvaGVsbG8ucG5nIn19/'
+                    );
+
+                    $this->assertContains($expectedResult, parse_url($actualResult, PHP_URL_PATH));
+                }
+            ],
+            [true, 'wysiwyg/hello.png', false, 'http://example.com/pub/media/wysiwyg/hello.png'],
+            [false, 'wysiwyg/hello.png', true, '<img src="{{media url=&quot;wysiwyg/hello.png&quot;}}" alt="" />'],
+        ];
+    }
+
+    /**
+     * Generate instance of Images Helper
+     *
+     * @param bool $isStaticUrlsAllowed - mock is created to override value of isUsingStaticUrlsAllowed method in class
+     * @return \Magento\Cms\Helper\Wysiwyg\Images
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function generateHelper($isStaticUrlsAllowed = false)
+    {
+        $storeId = 1;
+
+        $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+
+        $contextMock = $this->objectManager->create(\Magento\Framework\App\Helper\Context::class, [
+            'eventManager' => $eventManagerMock,
+        ]);
+
+        $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class, [
+            'context' => $contextMock
+        ]);
+
+        $checkResult = new \stdClass();
+        $checkResult->isAllowed = false;
+
+        $eventManagerMock->expects($this->any())
+            ->method('dispatch')
+            ->with('cms_wysiwyg_images_static_urls_allowed', ['result' => $checkResult, 'store_id' => $storeId])
+            ->willReturnCallback(function ($_, $arr) use ($isStaticUrlsAllowed) {
+                $arr['result']->isAllowed = $isStaticUrlsAllowed;
+            });
+
+        $helper->setStoreId($storeId);
+
+        return $helper;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
index 5907f02e50dd7..3925975a0f70e 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
@@ -7,8 +7,10 @@
 
 use Magento\Cms\Model\ResourceModel\Block;
 use Magento\Cms\Model\BlockFactory;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Stdlib\DateTime\Timezone;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -81,16 +83,29 @@ public function testGetByIdentifier(array $blockData)
      */
     public function testUpdateTime(array $blockData)
     {
+        /**
+         * @var $db \Magento\Framework\DB\Adapter\AdapterInterface
+         */
+        $db = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class)
+            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+
         # Prepare and save the temporary block
-        $tempBlock = $this->blockFactory->create();
+        $tempBlock       = $this->blockFactory->create();
         $tempBlock->setData($blockData);
+        $beforeTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
         $this->blockResource->save($tempBlock);
+        $afterTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
 
         # Load previously created block and compare identifiers
-        $storeId = reset($blockData['stores']);
-        $block   = $this->blockIdentifier->execute($blockData['identifier'], $storeId);
-        $date    = $this->objectManager->get(DateTime::class)->date();
-        $this->assertEquals($date, $block->getUpdateTime());
+        $storeId        = reset($blockData['stores']);
+        $block          = $this->blockIdentifier->execute($blockData['identifier'], $storeId);
+        $blockTimestamp = strtotime($block->getUpdateTime());
+
+        /*
+         * These checks prevent a race condition MAGETWO-87353
+         */
+        $this->assertGreaterThanOrEqual($beforeTimestamp, $blockTimestamp);
+        $this->assertLessThanOrEqual($afterTimestamp, $blockTimestamp);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
index 42697e1b66b7f..83e7c678ffc51 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 
 /**
@@ -79,13 +80,27 @@ public function testGenerateIdentifierFromTitle($data, $expectedIdentifier)
     public function testUpdateTime()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /**
+         * @var $db \Magento\Framework\DB\Adapter\AdapterInterface
+         */
+        $db = $objectManager->get(\Magento\Framework\App\ResourceConnection::class)
+            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+
         /** @var \Magento\Cms\Model\Page $page */
         $page = $objectManager->create(\Magento\Cms\Model\Page::class);
         $page->setData(['title' => 'Test', 'stores' => [1]]);
+        $beforeTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
         $page->save();
+        $afterTimestamp = $db->fetchCol('SELECT UNIX_TIMESTAMP()')[0];
         $page = $objectManager->get(PageRepositoryInterface::class)->getById($page->getId());
-        $date = $objectManager->get(DateTime::class)->date();
-        $this->assertEquals($date, $page->getUpdateTime());
+        $pageTimestamp = strtotime($page->getUpdateTime());
+
+        /*
+         * These checks prevent a race condition MAGETWO-95534
+         */
+        $this->assertGreaterThanOrEqual($beforeTimestamp, $pageTimestamp);
+        $this->assertLessThanOrEqual($afterTimestamp, $pageTimestamp);
     }
 
     public function generateIdentifierFromTitleDataProvider() : array
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
index 6942f7e2b7279..983d5657a4cee 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Cms\Model\Wysiwyg;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestModuleWysiwygConfig\Model\Config as TestModuleWysiwygConfig;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -13,73 +16,72 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
      */
-    protected $_model;
+    private $model;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Config\ScopeInterface::class
-        )->setCurrentScope(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
-        );
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Cms\Model\Wysiwyg\Config::class
-        );
+        $objectManager = Bootstrap::getObjectManager();
+        $this->model = $objectManager->create(\Magento\Cms\Model\Wysiwyg\Config::class);
     }
 
     /**
      * Tests that config returns valid config array in it
+     *
+     * @return void
      */
     public function testGetConfig()
     {
-        $config = $this->_model->getConfig();
+        $config = $this->model->getConfig();
         $this->assertInstanceOf(\Magento\Framework\DataObject::class, $config);
     }
 
     /**
      * Tests that config returns right urls going to the published library path
+     *
+     * @return void
      */
     public function testGetConfigCssUrls()
     {
-        $config = $this->_model->getConfig();
-        $publicPathPattern = 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/mage/%s';
-        $this->assertStringMatchesFormat($publicPathPattern, $config->getPopupCss());
-        $this->assertStringMatchesFormat($publicPathPattern, $config->getContentCss());
+        $config = $this->model->getConfig();
+        $publicPathPattern = 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/%s';
+        $tinyMce4Config = $config->getData('tinymce4');
+        $contentCss = $tinyMce4Config['content_css'];
+        if (is_array($contentCss)) {
+            foreach ($contentCss as $url) {
+                $this->assertStringMatchesFormat($publicPathPattern, $url);
+            }
+        } else {
+            $this->assertStringMatchesFormat($publicPathPattern, $contentCss);
+        }
     }
 
     /**
-     * @return array
+     * Test enabled module is able to modify WYSIWYG config
+     *
+     * @return void
+     *
+     * @magentoConfigFixture default/cms/wysiwyg/editor Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter
      */
-    public function getConfigNoProcessingDataProvider()
+    public function testTestModuleEnabledModuleIsAbleToModifyConfig()
     {
-        return [
-            [
-                [
-                    'files_browser_window_url' => 'http://example.com/111/',
-                    'directives_url' => 'http://example.com/222/',
-                    'popup_css' => 'http://example.com/333/popup.css',
-                    'content_css' => 'http://example.com/444/content.css',
-                    'directives_url_quoted' => 'http://example.com/555/',
-                ],
-            ],
-            [
-                [
-                    'files_browser_window_url' => '/111/',
-                    'directives_url' => '/222/',
-                    'popup_css' => '/333/popup.css',
-                    'content_css' => '/444/content.css',
-                    'directives_url_quoted' => '/555/',
-                ]
-            ],
-            [
-                [
-                    'files_browser_window_url' => '111/',
-                    'directives_url' => '222/',
-                    'popup_css' => '333/popup.css',
-                    'content_css' => '444/content.css',
-                    'directives_url_quoted' => '555/',
-                ]
-            ]
-        ];
+        $objectManager = Bootstrap::getObjectManager();
+        $compositeConfigProvider = $objectManager->create(\Magento\Cms\Model\Wysiwyg\CompositeConfigProvider::class);
+        $model = $objectManager->create(
+            \Magento\Cms\Model\Wysiwyg\Config::class,
+            ['configProvider' => $compositeConfigProvider]
+        );
+        $config = $model->getConfig();
+        $this->assertEquals(TestModuleWysiwygConfig::CONFIG_HEIGHT, $config['height']);
+        $this->assertEquals(TestModuleWysiwygConfig::CONFIG_CONTENT_CSS, $config['content_css']);
+        $this->assertArrayHasKey('tinymce4', $config);
+        $this->assertArrayHasKey('toolbar', $config['tinymce4']);
+        $this->assertNotContains(
+            'charmap',
+            $config['tinymce4']['toolbar'],
+            'Failed to address that the custom test module removes "charmap" button from the toolbar'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index 13a381008b2be..e25934fb25ee1 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -20,6 +20,24 @@ class StorageTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_baseDir;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Cms\Model\Wysiwyg\Images\Storage
+     */
+    private $storage;
+
+    /**
+     * @inheritdoc
+     */
     public static function setUpBeforeClass()
     {
         self::$_baseDir = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -31,6 +49,9 @@ public static function setUpBeforeClass()
         touch(self::$_baseDir . '/1.swf');
     }
 
+    /**
+     * @inheritdoc
+     */
     public static function tearDownAfterClass()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -40,19 +61,25 @@ public static function tearDownAfterClass()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->storage = $this->objectManager->create(\Magento\Cms\Model\Wysiwyg\Images\Storage::class);
+    }
+
     /**
      * @magentoAppIsolation enabled
+     * @return void
      */
-    public function testGetFilesCollection()
+    public function testGetFilesCollection(): void
     {
         \Magento\TestFramework\Helper\Bootstrap::getInstance()
             ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\View\DesignInterface::class)
-            ->setDesignTheme('Magento/backend');
-        /** @var $model \Magento\Cms\Model\Wysiwyg\Images\Storage */
-        $model = $objectManager->create(\Magento\Cms\Model\Wysiwyg\Images\Storage::class);
-        $collection = $model->getFilesCollection(self::$_baseDir, 'media');
+        $collection = $this->storage->getFilesCollection(self::$_baseDir, 'media');
         $this->assertInstanceOf(\Magento\Cms\Model\Wysiwyg\Images\Storage\Collection::class, $collection);
         foreach ($collection as $item) {
             $this->assertInstanceOf(\Magento\Framework\DataObject::class, $item);
@@ -67,45 +94,86 @@ public function testGetFilesCollection()
 
     /**
      * @magentoAppArea adminhtml
+     * @return void
      */
-    public function testGetThumbsPath()
+    public function testGetThumbsPath(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
-        $session = $objectManager->get(\Magento\Backend\Model\Session::class);
-        $backendUrl = $objectManager->get(\Magento\Backend\Model\UrlInterface::class);
-        $imageFactory = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class);
-        $assetRepo = $objectManager->get(\Magento\Framework\View\Asset\Repository::class);
-        $imageHelper = $objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
-        $coreFileStorageDb = $objectManager->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-        $storageCollectionFactory = $objectManager->get(
-            \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory::class
-        );
-        $storageFileFactory = $objectManager->get(\Magento\MediaStorage\Model\File\Storage\FileFactory::class);
-        $storageDatabaseFactory = $objectManager->get(\Magento\MediaStorage\Model\File\Storage\DatabaseFactory::class);
-        $directoryDatabaseFactory = $objectManager->get(
-            \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory::class
-        );
-        $uploaderFactory = $objectManager->get(\Magento\MediaStorage\Model\File\UploaderFactory::class);
-
-        $model = new \Magento\Cms\Model\Wysiwyg\Images\Storage(
-            $session,
-            $backendUrl,
-            $imageHelper,
-            $coreFileStorageDb,
-            $filesystem,
-            $imageFactory,
-            $assetRepo,
-            $storageCollectionFactory,
-            $storageFileFactory,
-            $storageDatabaseFactory,
-            $directoryDatabaseFactory,
-            $uploaderFactory
-        );
         $this->assertStringStartsWith(
-            $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(),
-            $model->getThumbsPath()
+            $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(),
+            $this->storage->getThumbsPath()
         );
     }
+
+    /**
+     * @return void
+     */
+    public function testUploadFile(): void
+    {
+        $fileName = 'magento_small_image.jpg';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $fixtureDir = realpath(__DIR__ . '/../../../../Catalog/_files');
+        copy($fixtureDir . DIRECTORY_SEPARATOR . $fileName, $filePath);
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->storage->uploadFile(self::$_baseDir);
+        $this->assertTrue(is_file(self::$_baseDir . DIRECTORY_SEPARATOR . $fileName));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     * @return void
+     */
+    public function testUploadFileWithWrongExtension(): void
+    {
+        $fileName = 'text.txt';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'text/plain',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->storage->uploadFile(self::$_baseDir);
+        $this->assertFalse(is_file(self::$_baseDir . DIRECTORY_SEPARATOR . $fileName));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     * @return void
+     */
+    public function testUploadFileWithWrongFile(): void
+    {
+        $fileName = 'file.gif';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/gif',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->storage->uploadFile(self::$_baseDir);
+        $this->assertFalse(is_file(self::$_baseDir . DIRECTORY_SEPARATOR . $fileName));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php b/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php
index b3bbd64b83e7e..7dbc3d2cc1dbd 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php
@@ -34,8 +34,8 @@ public function convertDataProvider()
    <h2 class="title">Hot Sellers</h2>
    <p class="info">Here is what`s trending on Luma right now</p>
 </div>';
-        $serializedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="product/widget/content/grid.phtml" conditions_encoded="a:2:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;a:8:[i:0;s:4:`WS12`;i:1;s:4:`WT09`;i:2;s:4:`MT07`;i:3;s:4:`MH07`;i:4;s:7:`24-MB02`;i:5;s:7:`24-WB04`;i:6;s:8:`241-MB08`;i:7;s:8:`240-LV05`;]]]"}}';
-        $jsonEncodedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="product/widget/content/grid.phtml" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:[`WS12`,`WT09`,`MT07`,`MH07`,`24-MB02`,`24-WB04`,`241-MB08`,`240-LV05`]^]^]"}}';
+        $serializedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="Magento_CatalogWidget::product/widget/content/grid.phtml" conditions_encoded="a:2:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;a:8:[i:0;s:4:`WS12`;i:1;s:4:`WT09`;i:2;s:4:`MT07`;i:3;s:4:`MH07`;i:4;s:7:`24-MB02`;i:5;s:7:`24-WB04`;i:6;s:8:`241-MB08`;i:7;s:8:`240-LV05`;]]]"}}';
+        $jsonEncodedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="Magento_CatalogWidget::product/widget/content/grid.phtml" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:[`WS12`,`WT09`,`MT07`,`MH07`,`24-MB02`,`24-WB04`,`241-MB08`,`240-LV05`]^]^]"}}';
         // @codingStandardsIgnoreEnd
         return [
             'no widget' => [
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/block_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/block_rollback.php
new file mode 100644
index 0000000000000..9214dd543bd31
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/block_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var BlockRepositoryInterface $blockRepository */
+$blockRepository = $objectManager->get(BlockRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter(BlockInterface::IDENTIFIER, 'fixture_block')
+    ->create();
+$result = $blockRepository->getList($searchCriteria);
+
+/**
+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+ * In that case there is "if" which checks that "fixture_block" still exists in database.
+ */
+foreach ($result->getItems() as $item) {
+    $blockRepository->delete($item);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/blocks.php b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks.php
new file mode 100644
index 0000000000000..bbdc697645a42
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Cms\Api\Data\BlockInterfaceFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var BlockRepositoryInterface $blockRepository */
+$blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
+/** @var BlockInterfaceFactory $blockFactory */
+$blockFactory = Bootstrap::getObjectManager()->get(BlockInterfaceFactory::class);
+$storeId = Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId();
+
+/** @var BlockInterface $block */
+$block = $blockFactory->create([
+    'data' => [
+        BlockInterface::IDENTIFIER => 'enabled_block',
+        BlockInterface::TITLE => 'Enabled CMS Block Title',
+        BlockInterface::CONTENT => '
+            <h1>Enabled Block</h1>
+            <a href="{{store url=""}}">store url</a>
+            <p>Config value: "{{config path="web/unsecure/base_url"}}".</p>
+            <p>Custom variable: "{{customvar code="variable_code"}}".</p>
+            ',
+        BlockInterface::IS_ACTIVE => 1,
+        'store_id' => [$storeId],
+    ]
+]);
+$blockRepository->save($block);
+
+/** @var BlockInterface $block */
+$block = $blockFactory->create([
+    'data' => [
+        BlockInterface::IDENTIFIER => 'disabled_block',
+        BlockInterface::TITLE => 'Disabled CMS Block Title',
+        BlockInterface::CONTENT => '
+            <h1>Disabled Block</h1>
+            <a href="{{store url=""}}">store url</a>
+            <p>Config value: "{{config path="web/unsecure/base_url"}}".</p>
+            <p>Custom variable: "{{customvar code="variable_code"}}".</p>
+            ',
+        BlockInterface::IS_ACTIVE => 0,
+        'store_id' => [$storeId],
+    ]
+]);
+$blockRepository->save($block);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/blocks_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks_rollback.php
new file mode 100644
index 0000000000000..a7a2a51524cf0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/blocks_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var BlockRepositoryInterface $blockRepository */
+$blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
+
+foreach (['enabled_block', 'disabled_block'] as $blockId) {
+    try {
+        $blockRepository->deleteById($blockId);
+    } catch (NoSuchEntityException $e) {
+        /**
+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+         */
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/linked_media.php b/dev/tests/integration/testsuite/Magento/Cms/_files/linked_media.php
new file mode 100644
index 0000000000000..5921f871aaeb2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/linked_media.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$directoryName = 'linked_media';
+/** @var \Magento\Framework\Filesystem $filesystem */
+$filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+$fullDirectoryPath = $filesystem->getDirectoryRead(Magento\Framework\App\Filesystem\DirectoryList::PUB)
+        ->getAbsolutePath() . $directoryName;
+$mediaDirectory = $filesystem->getDirectoryWrite(Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+
+$wysiwygDir = $mediaDirectory->getAbsolutePath() . 'wysiwyg';
+$mediaDirectory->delete($wysiwygDir);
+if (!is_dir($fullDirectoryPath)) {
+    mkdir($fullDirectoryPath);
+}
+if (is_dir($fullDirectoryPath) && !is_dir($wysiwygDir)) {
+    symlink($fullDirectoryPath, $wysiwygDir);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/linked_media_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/linked_media_rollback.php
new file mode 100644
index 0000000000000..803fa67aff9de
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/linked_media_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$directoryName = 'linked_media';
+/** @var \Magento\Framework\Filesystem $filesystem */
+$filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+$pubDir = $filesystem->getDirectoryWrite(Magento\Framework\App\Filesystem\DirectoryList::PUB);
+$fullDirectoryPath = $pubDir->getAbsolutePath() . DIRECTORY_SEPARATOR . $directoryName;
+$mediaDirectory = $filesystem->getDirectoryWrite(Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+$wysiwygDir = $mediaDirectory->getAbsolutePath() . 'wysiwyg';
+if (is_link($wysiwygDir)) {
+    unlink($wysiwygDir);
+}
+if (is_dir($fullDirectoryPath)) {
+    $pubDir->delete($directoryName);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_rollback.php
new file mode 100644
index 0000000000000..038b36db32a3b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PageRepositoryInterface $pageRepository */
+$pageRepository = $objectManager->get(PageRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter(PageInterface::IDENTIFIER, ['page100', 'page_design_blank'], 'in')
+    ->create();
+$result = $pageRepository->getList($searchCriteria);
+
+/**
+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+ * In that case there is "if" which checks that "page100" and "page_design_blank" still exists in database.
+ */
+foreach ($result->getItems() as $item) {
+    $pageRepository->delete($item);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FieldArray.php b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FieldArray.php
new file mode 100644
index 0000000000000..53e5db67d0733
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FieldArray.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Block\System\Config;
+
+use Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray;
+
+/**
+ * Backend system config array field renderer for integration test.
+ */
+class FieldArray extends AbstractFieldArray
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _toHtml()
+    {
+        $value = '';
+        $element = $this->getElement();
+        if ($element->getValue() && is_array($element->getValue())) {
+            $value = implode('|', $element->getValue());
+        }
+
+        return sprintf(
+            '<input id="%s" name="%s" value="%s" />',
+            $element->getId(),
+            $element->getName(),
+            $value
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FormTest.php b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FormTest.php
index 032b852f64c33..e78f4831831ac 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FormTest.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\Config\Block\System\Config;
 
+use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Framework\App\Cache\State;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
 
 /**
  * @magentoAppArea adminhtml
@@ -16,50 +20,68 @@ class FormTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $_objectManager;
+    private $objectManager;
 
     /**
      * @var \Magento\Framework\Data\FormFactory
      */
-    protected $_formFactory;
+    private $formFactory;
 
     /**
      * @var \Magento\Config\Model\Config\Structure\Element\Section
      */
-    protected $_section;
+    private $section;
 
     /**
      * @var \Magento\Config\Model\Config\Structure\Element\Group
      */
-    protected $_group;
+    private $group;
 
     /**
      * @var \Magento\Config\Model\Config\Structure\Element\Field
      */
-    protected $_field;
+    private $field;
 
     /**
      * @var array
      */
-    protected $_configData;
+    private $configData;
+
+    /** @var string Encrypted value stored in config.xml */
+    private static $defaultConfigEncrypted = 'Encrypted value';
+
+    /** @var array Serialized value stored in config.xml  */
+    private static $defaultConfigSerialized = ['value1', 'value2'];
+
+    /** @var string Serialized value stored in config.xml  */
+    private static $defaultConfigString = 'test config value';
+
+    /** @var string Encrypted value stored in DB */
+    private static $websiteDbEncrypted = 'DB encrypted value';
+
+    /** @var array Serialized value stored in DB */
+    private static $websiteDbSerialized = ['value3', 'value4'];
+
+    /** @var string String value stored in DB */
+    private static $websiteDBString = 'test db value';
 
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_formFactory = $this->_objectManager->create(\Magento\Framework\Data\FormFactory::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->formFactory = $this->objectManager->create(\Magento\Framework\Data\FormFactory::class);
     }
 
     public function testDependenceHtml()
     {
         /** @var $layout \Magento\Framework\View\LayoutInterface */
-        $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $layout = Bootstrap::getObjectManager()->create(
             \Magento\Framework\View\Layout::class,
             ['area' => 'adminhtml']
         );
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Config\ScopeInterface::class
+        Bootstrap::getObjectManager()->get(
+            ScopeInterface::class
         )->setCurrentScope(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
+            FrontNameResolver::AREA_CODE
         );
         /** @var $block \Magento\Config\Block\System\Config\Form */
         $block = $layout->createBlock(\Magento\Config\Block\System\Config\Form::class, 'block');
@@ -92,76 +114,76 @@ public function testInitFieldsUseDefaultCheckbox(
     ) {
         $this->_setupFieldsInheritCheckbox($fieldId, $isConfigDataEmpty, $configDataValue);
 
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Config\ScopeInterface::class
+        Bootstrap::getObjectManager()->get(
+            ScopeInterface::class
         )->setCurrentScope(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
+            FrontNameResolver::AREA_CODE
         );
-        $form = $this->_formFactory->create();
-        $fieldset = $form->addFieldset($this->_section->getId() . '_' . $this->_group->getId(), []);
+        $form = $this->formFactory->create();
+        $fieldset = $form->addFieldset($this->section->getId() . '_' . $this->group->getId(), []);
 
         /* @TODO Eliminate stub by proper mock / config fixture usage */
-        /** @var $block \Magento\Config\Block\System\Config\FormStub */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        /** @var $block FormStub */
+        $block = Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\LayoutInterface::class
         )->createBlock(
-            \Magento\Config\Block\System\Config\FormStub::class
+            FormStub::class
         );
         $block->setScope(\Magento\Config\Block\System\Config\Form::SCOPE_WEBSITES);
-        $block->setStubConfigData($this->_configData);
-        $block->initFields($fieldset, $this->_group, $this->_section);
+        $block->setStubConfigData($this->configData);
+        $block->initFields($fieldset, $this->group, $this->section);
 
         $valueSel = sprintf(
             '//input[@id="%s_%s_%s"]',
-            $this->_section->getId(),
-            $this->_group->getId(),
-            $this->_field->getId()
+            $this->section->getId(),
+            $this->group->getId(),
+            $this->field->getId()
         );
         $valueDisabledSel = sprintf('%s[@disabled="disabled"]', $valueSel);
         $useDefaultSel = sprintf(
             '//input[@id="%s_%s_%s_inherit" and contains(@class,"checkbox")]',
-            $this->_section->getId(),
-            $this->_group->getId(),
-            $this->_field->getId()
+            $this->section->getId(),
+            $this->group->getId(),
+            $this->field->getId()
         );
         $useDefaultCheckedSel = sprintf('%s[@checked="checked"]', $useDefaultSel);
         $fieldsetHtml = $fieldset->getElementHtml();
         $this->assertGreaterThanOrEqual(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath('//fieldset', $fieldsetHtml),
+            Xpath::getElementsCountForXpath('//fieldset', $fieldsetHtml),
             'Fieldset HTML is invalid'
         );
         $this->assertEquals(
             $valueSelCtr,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath($valueSel, $fieldsetHtml),
+            Xpath::getElementsCountForXpath($valueSel, $fieldsetHtml),
             'Field input should appear ' . $valueSelCtr . ' times in fieldset HTML'
         );
         $this->assertEquals(
             $valueSelCtr,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath($useDefaultSel, $fieldsetHtml),
+            Xpath::getElementsCountForXpath($useDefaultSel, $fieldsetHtml),
             '"Use Default" checkbox should appear' . $valueSelCtr . ' times  in fieldset HTML.'
         );
 
         if ($expectedUseDefault) {
             $this->assertGreaterThanOrEqual(
                 1,
-                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath($useDefaultCheckedSel, $fieldsetHtml),
+                Xpath::getElementsCountForXpath($useDefaultCheckedSel, $fieldsetHtml),
                 '"Use Default" checkbox should be checked'
             );
             $this->assertGreaterThanOrEqual(
                 1,
-                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath($valueDisabledSel, $fieldsetHtml),
+                Xpath::getElementsCountForXpath($valueDisabledSel, $fieldsetHtml),
                 'Field input should be disabled'
             );
         } else {
             $this->assertEquals(
                 0,
-                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath($useDefaultCheckedSel, $fieldsetHtml),
+                Xpath::getElementsCountForXpath($useDefaultCheckedSel, $fieldsetHtml),
                 '"Use Default" checkbox should not be checked'
             );
             $this->assertEquals(
                 0,
-                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath($valueDisabledSel, $fieldsetHtml),
+                Xpath::getElementsCountForXpath($valueDisabledSel, $fieldsetHtml),
                 'Field input should not be disabled'
             );
         }
@@ -195,36 +217,36 @@ public function testInitFieldsUseConfigPath($fieldId, $isConfigDataEmpty, $confi
     {
         $this->_setupFieldsInheritCheckbox($fieldId, $isConfigDataEmpty, $configDataValue);
 
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Config\ScopeInterface::class
+        Bootstrap::getObjectManager()->get(
+            ScopeInterface::class
         )->setCurrentScope(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
+            FrontNameResolver::AREA_CODE
         );
-        $form = $this->_formFactory->create();
-        $fieldset = $form->addFieldset($this->_section->getId() . '_' . $this->_group->getId(), []);
+        $form = $this->formFactory->create();
+        $fieldset = $form->addFieldset($this->section->getId() . '_' . $this->group->getId(), []);
 
         /* @TODO Eliminate stub by proper mock / config fixture usage */
-        /** @var $block \Magento\Config\Block\System\Config\FormStub */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        /** @var $block FormStub */
+        $block = Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\LayoutInterface::class
         )->createBlock(
-            \Magento\Config\Block\System\Config\FormStub::class
+            FormStub::class
         );
         $block->setScope(\Magento\Config\Block\System\Config\Form::SCOPE_DEFAULT);
-        $block->setStubConfigData($this->_configData);
-        $block->initFields($fieldset, $this->_group, $this->_section);
+        $block->setStubConfigData($this->configData);
+        $block->initFields($fieldset, $this->group, $this->section);
 
         $valueSel = sprintf(
             '//input[@id="%s_%s_%s"]',
-            $this->_section->getId(),
-            $this->_group->getId(),
-            $this->_field->getId()
+            $this->section->getId(),
+            $this->group->getId(),
+            $this->field->getId()
         );
         $fieldsetHtml = $fieldset->getElementHtml();
 
         $this->assertGreaterThanOrEqual(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//fieldset',
                 $fieldsetHtml
             ),
@@ -233,7 +255,7 @@ public function testInitFieldsUseConfigPath($fieldId, $isConfigDataEmpty, $confi
 
         $this->assertEquals(
             $valueSelCtr,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 $valueSel,
                 $fieldsetHtml
             ),
@@ -256,6 +278,98 @@ public static function initFieldsUseConfigPathDataProvider()
         ];
     }
 
+    /**
+     * Test cases with retrieving config data with backend models for different scopes.
+     * Config data are stored in config.xml and database.
+     *
+     * @param string $fieldId
+     * @param string $expectedConfigValue
+     * @param string $currentScope
+     * @param string $currentScopeCode
+     * @param bool $isDbOverrideValue whether values should be overridden in the database for the current scope
+     *
+     * @dataProvider initFieldsWithBackendModelDataProvider
+     * @covers \Magento\Config\Block\System\Config\Form::initFields
+     */
+    public function testInitFieldsWithBackendModel(
+        $fieldId,
+        $expectedConfigValue,
+        $currentScope,
+        $currentScopeCode,
+        $isDbOverrideValue
+    ) {
+        $this->_setupFieldsInheritCheckbox($fieldId, false, $expectedConfigValue);
+
+        if ($isDbOverrideValue) {
+            $backendModel = $this->field->getAttribute('backend_model') ? : \Magento\Framework\App\Config\Value::class;
+            $path = $this->section->getId() .'/'. $this->group->getId() . '/' . $this->field->getId();
+            $model = Bootstrap::getObjectManager()->create($backendModel);
+            $model->setPath($path);
+            $model->setScopeId($currentScopeCode);
+            $model->setScope($currentScope);
+            $model->setScopeCode($currentScopeCode);
+            $model->setValue($expectedConfigValue);
+            $model->save();
+        }
+
+        $this->registerTestConfigXmlMetadata();
+        Bootstrap::getObjectManager()->get(\Magento\TestFramework\App\Config::class)->clean();
+
+        $form = $this->formFactory->create();
+        $fieldset = $form->addFieldset($this->section->getId() . '_' . $this->group->getId(), []);
+
+        /** @var $block FormStub */
+        $block = Bootstrap::getObjectManager()->get(
+            \Magento\Framework\View\LayoutInterface::class
+        )->createBlock(
+            FormStub::class
+        );
+
+        $block->setScope($currentScope);
+        $block->setScopeCode($currentScopeCode);
+        $block->setStubConfigData($this->configData);
+        $block->initFields($fieldset, $this->group, $this->section);
+
+        $fieldsetHtml = $fieldset->getElementHtml();
+
+        $elementId = $this->section->getId() .'_'. $this->group->getId() . '_' . $this->field->getId();
+        if (is_array($expectedConfigValue)) {
+            $expectedConfigValue = implode('|', $expectedConfigValue);
+        }
+        $this->assertEquals(
+            $expectedConfigValue,
+            $this->getElementAttributeValueById($fieldsetHtml, $elementId)
+        );
+    }
+
+    /**
+     * Provides config data variations with different data types and scopes.
+     *
+     * @return array
+     */
+    public static function initFieldsWithBackendModelDataProvider()
+    {
+        return [
+            /** Values stored in config.xml only for default scope, then retrieved for default scope. */
+            ['test_field_encrypted', self::$defaultConfigEncrypted, FormStub::SCOPE_DEFAULT, 0, false],
+            ['test_field_serialized', self::$defaultConfigSerialized, FormStub::SCOPE_DEFAULT, 0, false],
+            ['test_field', self::$defaultConfigString, FormStub::SCOPE_DEFAULT, 0, false],
+
+            /** Values stored in config.xml only for default scope, then retrieved for website scope. */
+            ['test_field_encrypted', self::$defaultConfigEncrypted, FormStub::SCOPE_WEBSITES, 1, false],
+            ['test_field_serialized', self::$defaultConfigSerialized, FormStub::SCOPE_WEBSITES, 1, false],
+            ['test_field', self::$defaultConfigString, FormStub::SCOPE_WEBSITES, 1, false],
+
+            /**
+             * Values stored in config.xml for default scope and in database for website scope,
+             * then retrieved for website scope.
+             */
+            ['test_field_encrypted', self::$websiteDbEncrypted, FormStub::SCOPE_WEBSITES, 1, true],
+            ['test_field_serialized', self::$websiteDbSerialized, FormStub::SCOPE_WEBSITES, 1, true],
+            ['test_field', self::$websiteDBString, FormStub::SCOPE_WEBSITES, 1, true],
+        ];
+    }
+
     /**
      * @param string $fieldId uses the test_field_use_config field if true
      * @param bool $isConfigDataEmpty if the config data array should be empty or not
@@ -263,28 +377,28 @@ public static function initFieldsUseConfigPathDataProvider()
      */
     protected function _setupFieldsInheritCheckbox($fieldId, $isConfigDataEmpty, $configDataValue)
     {
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize([
+        Bootstrap::getInstance()->reinitialize([
             State::PARAM_BAN_CACHE => true,
         ]);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get(\Magento\Framework\Config\ScopeInterface::class)
-            ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\AreaList::class)
-            ->getArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE)
+        Bootstrap::getObjectManager()
+            ->get(ScopeInterface::class)
+            ->setCurrentScope(FrontNameResolver::AREA_CODE);
+        Bootstrap::getObjectManager()->get(\Magento\Framework\App\AreaList::class)
+            ->getArea(FrontNameResolver::AREA_CODE)
             ->load(\Magento\Framework\App\Area::PART_CONFIG);
 
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\App\Config\FileResolver::class
         )->disableOriginalConstructor()->getMock();
-        $fileIteratorFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $fileIteratorFactory = Bootstrap::getObjectManager()->get(
             \Magento\Framework\Config\FileIteratorFactory::class
         );
         $fileIterator = $fileIteratorFactory->create(
-            [__DIR__ . '/_files/test_section_config.xml']
+            [__DIR__ . '/_files/test_system.xml']
         );
         $fileResolverMock->expects($this->any())->method('get')->will($this->returnValue($fileIterator));
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         $structureReader = $objectManager->create(
             \Magento\Config\Model\Config\Structure\Reader::class,
@@ -300,34 +414,34 @@ protected function _setupFieldsInheritCheckbox($fieldId, $isConfigDataEmpty, $co
             ['structureData' => $structureData]
         );
 
-        $this->_section = $structure->getElement('test_section');
+        $this->section = $structure->getElement('test_section');
 
-        $this->_group = $structure->getElement('test_section/test_group');
+        $this->group = $structure->getElement('test_section/test_group');
 
-        $this->_field = $structure->getElement('test_section/test_group/' . $fieldId);
+        $this->field = $structure->getElement('test_section/test_group/' . $fieldId);
 
-        $fieldPath = $this->_field->getConfigPath();
+        $fieldPath = $this->field->getConfigPath();
 
         if ($isConfigDataEmpty) {
-            $this->_configData = [];
+            $this->configData = [];
         } else {
-            $this->_configData = [$fieldPath => $configDataValue];
+            $this->configData = [$fieldPath => $configDataValue];
         }
     }
 
     public function testInitFormAddsFieldsets()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        Bootstrap::getObjectManager()->get(
             \Magento\Framework\App\ResponseInterface::class
         )->headersSentThrowsException = false;
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        Bootstrap::getObjectManager()->get(
             \Magento\Framework\App\RequestInterface::class
         )->setParam(
             'section',
             'general'
         );
         /** @var $block \Magento\Config\Block\System\Config\Form */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $block = Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\LayoutInterface::class
         )->createBlock(
             \Magento\Config\Block\System\Config\Form::class
@@ -383,4 +497,100 @@ public function testInitFormAddsFieldsets()
             }
         }
     }
+
+    /**
+     * Add metadata from test_config.xml to metadataConfigTypeProcessor.
+     */
+    private function registerTestConfigXmlMetadata()
+    {
+        /** @var \Magento\Framework\Encryption\EncryptorInterface $encryptor */
+        $encryptor = Bootstrap::getObjectManager()->get(\Magento\Framework\Encryption\EncryptorInterface::class);
+        $this->setEncryptedValue(
+            $encryptor->encrypt(self::$defaultConfigEncrypted)
+        );
+
+        $fileResolver = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\FileResolverInterface::class);
+        $directories = $fileResolver->get('config.xml', 'global');
+
+        $property = new \ReflectionProperty($directories, 'paths');
+        $property->setAccessible(true);
+        $property->setValue(
+            $directories,
+            array_merge($property->getValue($directories), [__DIR__ . '/_files/test_config.xml'])
+        );
+
+        $fileResolverMock = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolverMock->method('get')->willReturn($directories);
+
+        $initialReader = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\App\Config\Initial\Reader::class,
+            ['fileResolver' => $fileResolverMock]
+        );
+
+        $initialConfig = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\App\Config\Initial::class,
+            ['reader' => $initialReader]
+        );
+        $metadataConfigTypeProcessor = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\App\Config\MetadataConfigTypeProcessor::class,
+            ['initialConfig' => $initialConfig]
+        );
+
+        $composite = Bootstrap::getObjectManager()->get('systemConfigPostProcessorComposite');
+        $property = new \ReflectionProperty($composite, 'processors');
+        $property->setAccessible(true);
+        $processors = $property->getValue($composite);
+        $processors['metadata'] = $metadataConfigTypeProcessor;
+        $property->setValue($composite, $processors);
+
+        Bootstrap::getObjectManager()->get(\Magento\TestFramework\App\State::class)
+            ->setAreaCode(FrontNameResolver::AREA_CODE);
+    }
+
+    /**
+     * Finds element by id and returns value of attribute value property.
+     *
+     * @param string $html
+     * @param string $nodeId
+     *
+     * @return string
+     */
+    private function getElementAttributeValueById($html, $nodeId)
+    {
+        $domDocument = new \DOMDocument();
+        libxml_use_internal_errors(true);
+        $domDocument->loadHTML($html);
+        libxml_use_internal_errors(false);
+        $element = $domDocument->getElementById($nodeId);
+
+        return $element ? $element->attributes->getNamedItem('value')->nodeValue : '';
+    }
+
+    /**
+     * Save encrypted value to test_config.xml
+     *
+     * @param string $encryptedValue
+     */
+    private function setEncryptedValue($encryptedValue)
+    {
+        $config = simplexml_load_file(__DIR__ . '/_files/test_config.xml');
+        $config->default->test_section->test_group->test_field_encrypted = $encryptedValue;
+        $config->asXml(__DIR__ . '/_files/test_config.xml');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->setEncryptedValue('{ENCRYPTED_VALUE}');
+
+        $configResourceModel = Bootstrap::getObjectManager()->get(\Magento\Config\Model\ResourceModel\Config::class);
+        foreach (['test_field_encrypted', 'test_field_serialized', 'test_field'] as $field) {
+            $path = 'test_section/test_group/' . $field;
+            $configResourceModel->deleteConfig($path, FormStub::SCOPE_WEBSITES, 1);
+        }
+
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_config.xml b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_config.xml
new file mode 100644
index 0000000000000..2fd972939117b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <test_section>
+            <test_group>
+                 <test_field_encrypted backend_model="Magento\Config\Model\Config\Backend\Encrypted">{ENCRYPTED_VALUE}</test_field_encrypted>
+                 <test_field_serialized>["value1","value2"]</test_field_serialized>
+                 <test_field>test config value</test_field>
+            </test_group>
+        </test_section>
+    </default>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_section_config.xml b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_section_config.xml
deleted file mode 100644
index e77c1773cdce5..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_section_config.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
-    <system>
-        <tab id="Test">
-            <label>Test</label>
-        </tab>
-        <section id="test_section" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="0">
-            <label>Test Section</label>
-            <tab>Test</tab>
-
-            <group id="test_group" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="10">
-                <label>Test Group</label>
-                <field id="test_field" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
-                    <label>Test Field</label>
-                    <config_path>test_section/test_group/test_field</config_path>
-                </field>
-                <field id="test_field_use_config_module_1" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
-                    <label>Test Field</label>
-                    <config_path>test_config_section/test_group_config_node/test_field_value</config_path>
-                    <if_module_enabled>Magento_Config</if_module_enabled>
-                </field>
-                <field id="test_field_use_config_module_0" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
-                    <label>Test Field</label>
-                    <config_path>test_config_section/test_group_config_node/test_field_value</config_path>
-                    <if_module_enabled>Test_Module</if_module_enabled>
-                </field>
-            </group>
-        </section>
-    </system>
-</config>
diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_system.xml b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_system.xml
new file mode 100644
index 0000000000000..a0dca39d8fd28
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_system.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <tab id="Test">
+            <label>Test</label>
+        </tab>
+        <section id="test_section" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="0">
+            <label>Test Section</label>
+            <tab>Test</tab>
+
+            <group id="test_group" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="10">
+                <label>Test Group</label>
+                <field id="test_field_encrypted" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
+                    <label>Test Field</label>
+                    <config_path>test_section/test_group/test_field_encrypted</config_path>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                </field>
+                <field id="test_field_serialized" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" type="text" sortOrder="20">
+                    <label>Test Field</label>
+                    <config_path>test_section/test_group/test_field_serialized</config_path>
+                    <frontend_model>Magento\Config\Block\System\Config\FieldArray</frontend_model>
+                    <backend_model>Magento\Config\Model\Config\Backend\Serialized</backend_model>
+                </field>
+                <field id="test_field" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
+                    <label>Test Field</label>
+                    <config_path>test_section/test_group/test_field</config_path>
+                </field>
+                <field id="test_field_use_config_module_1" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
+                    <label>Test Field</label>
+                    <config_path>test_config_section/test_group_config_node/test_field_value</config_path>
+                    <if_module_enabled>Magento_Config</if_module_enabled>
+                </field>
+                <field id="test_field_use_config_module_0" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" type="text" sortOrder="20">
+                    <label>Test Field</label>
+                    <config_path>test_config_section/test_group_config_node/test_field_value</config_path>
+                    <if_module_enabled>Test_Module</if_module_enabled>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
index 91e8cbe1cad73..f68f3cf37b079 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\Model\Config\Backend\Admin\Custom;
@@ -141,7 +142,7 @@ private function loadConfig()
      * @magentoDbIsolation enabled
      * @dataProvider runLockDataProvider
      */
-    public function testRunLock($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
+    public function testRunLockEnv($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
     {
         $this->inputMock->expects($this->any())
             ->method('getArgument')
@@ -152,15 +153,15 @@ public function testRunLock($path, $value, $scope = ScopeConfigInterface::SCOPE_
         $this->inputMock->expects($this->any())
             ->method('getOption')
             ->willReturnMap([
-                [ConfigSetCommand::OPTION_LOCK, true],
+                [ConfigSetCommand::OPTION_LOCK_ENV, true],
                 [ConfigSetCommand::OPTION_SCOPE, $scope],
                 [ConfigSetCommand::OPTION_SCOPE_CODE, $scopeCode]
             ]);
         $this->outputMock->expects($this->exactly(2))
             ->method('writeln')
             ->withConsecutive(
-                ['<info>Value was saved and locked.</info>'],
-                ['<info>Value was saved and locked.</info>']
+                ['<info>Value was saved in app/etc/env.php and locked.</info>'],
+                ['<info>Value was saved in app/etc/env.php and locked.</info>']
             );
 
         /** @var ConfigSetCommand $command */
@@ -217,7 +218,7 @@ public function testRunExtended(
             [ConfigSetCommand::OPTION_SCOPE, $scope],
             [ConfigSetCommand::OPTION_SCOPE_CODE, $scopeCode]
         ];
-        $optionsLock = array_merge($options, [[ConfigSetCommand::OPTION_LOCK, true]]);
+        $optionsLock = array_merge($options, [[ConfigSetCommand::OPTION_LOCK_ENV, true]]);
 
         /** @var ConfigPathResolver $resolver */
         $resolver = $this->objectManager->get(ConfigPathResolver::class);
@@ -233,8 +234,8 @@ public function testRunExtended(
         );
         $this->assertSame(null, $this->arrayManager->get($configPath, $this->loadConfig()));
 
-        $this->runCommand($arguments, $optionsLock, '<info>Value was saved and locked.</info>');
-        $this->runCommand($arguments, $optionsLock, '<info>Value was saved and locked.</info>');
+        $this->runCommand($arguments, $optionsLock, '<info>Value was saved in app/etc/env.php and locked.</info>');
+        $this->runCommand($arguments, $optionsLock, '<info>Value was saved in app/etc/env.php and locked.</info>');
 
         $this->assertSame($value, $this->arrayManager->get($configPath, $this->loadConfig()));
     }
@@ -321,45 +322,45 @@ public function configSetValidationErrorDataProvider()
             [
                 'test/test/test',
                 'value',
-                'The "test/test/test" path does not exist'
+                'The "test/test/test" path doesn\'t exist. Verify and try again.'
             ],
             //wrong scope or scope code
             [
                 Custom::XML_PATH_GENERAL_LOCALE_CODE,
                 'en_UK',
-                'Enter a scope before proceeding.',
+                'A scope is missing. Enter a scope and try again.',
                 ''
             ],
             [
                 Custom::XML_PATH_GENERAL_LOCALE_CODE,
                 'en_UK',
-                'Enter a scope code before proceeding.',
+                'A scope code is missing. Enter a code and try again.',
                 ScopeInterface::SCOPE_WEBSITE
             ],
             [
                 Custom::XML_PATH_GENERAL_LOCALE_CODE,
                 'en_UK',
-                'Enter a scope code before proceeding.',
+                'A scope code is missing. Enter a code and try again.',
                 ScopeInterface::SCOPE_STORE
             ],
             [
                 Custom::XML_PATH_GENERAL_LOCALE_CODE,
                 'en_UK',
-                'The "wrong_scope" value doesn\'t exist. Enter another value.',
+                'The "wrong_scope" value doesn\'t exist. Enter another value and try again.',
                 'wrong_scope',
                 'base'
             ],
             [
                 Custom::XML_PATH_GENERAL_LOCALE_CODE,
                 'en_UK',
-                'The "wrong_website_code" value doesn\'t exist. Enter another value.',
+                'The "wrong_website_code" value doesn\'t exist. Enter another value and try again.',
                 ScopeInterface::SCOPE_WEBSITE,
                 'wrong_website_code'
             ],
             [
                 Custom::XML_PATH_GENERAL_LOCALE_CODE,
                 'en_UK',
-                'The "wrong_store_code" value doesn\'t exist. Enter another value.',
+                'The "wrong_store_code" value doesn\'t exist. Enter another value and try again.',
                 ScopeInterface::SCOPE_STORE,
                 'wrong_store_code'
             ],
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php
index 7dd27675ce286..7e78690e7b70c 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Console\Command;
 
 use Magento\Framework\App\DeploymentConfig\FileReader;
@@ -269,7 +270,7 @@ public function executeDataProvider()
                 Cli::RETURN_FAILURE,
                 [
                     'web/test/test_wrong_value' => [
-                        'The "some_scope" value doesn\'t exist. Enter another value.'
+                        'The "some_scope" value doesn\'t exist. Enter another value and try again.'
                     ],
                 ]
             ],
@@ -279,7 +280,7 @@ public function executeDataProvider()
                 Cli::RETURN_FAILURE,
                 [
                     'web/test/test_wrong_value' => [
-                        'The "scope_code" value doesn\'t exist. Enter another value.'
+                        'The "scope_code" value doesn\'t exist. Enter another value and try again.'
                     ],
                 ]
             ],
diff --git a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
index 2ad15fbea6c40..24b68e804cd57 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
@@ -7,12 +7,16 @@
 namespace Magento\Config\Controller\Adminhtml\System;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
  */
 class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * Test Configuration page existing.
+     */
     public function testEditAction()
     {
         $this->dispatch('backend/admin/system_config/edit');
@@ -20,6 +24,8 @@ public function testEditAction()
     }
 
     /**
+     * Test redirect after changing base URL.
+     *
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
      */
@@ -43,6 +49,8 @@ public function testChangeBaseUrl()
         )->setParam(
             'section',
             'web'
+        )->setMethod(
+            HttpRequest::METHOD_POST
         );
         $this->dispatch('backend/admin/system_config/save');
 
@@ -60,7 +68,9 @@ public function testChangeBaseUrl()
     }
 
     /**
-     * Reset test framework default base url
+     * Reset test framework default base url.
+     *
+     * @param string $defaultHost
      */
     protected function resetBaseUrl($defaultHost)
     {
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
index ebd8b78e52e58..04769401c147e 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
@@ -10,6 +10,7 @@
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
@@ -64,6 +65,7 @@ public function configurableImportDataProvider()
      * @param $optionSkuList Name of variations for configurable product
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
      * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
      * @dataProvider configurableImportDataProvider
      */
     public function testConfigurableImport($pathToFile, $productName, $optionSkuList)
@@ -148,4 +150,94 @@ public function testConfigurableImport($pathToFile, $productName, $optionSkuList
             $this->assertEquals(2, count($valuesData));
         }
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/enable_reindex_schedule.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
+     */
+    public function testConfigurableImportWithMultipleStores()
+    {
+        $productSku = 'Configurable 1';
+        $products = [
+            'default' => 'Configurable 1',
+            'fixture_second_store' => 'Configurable 1 Second Store'
+        ];
+        $filesystem = $this->objectManager->create(
+            \Magento\Framework\Filesystem::class
+        );
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' =>  __DIR__ . '/../../_files/import_configurable_for_multiple_store_views.csv',
+                'directory' => $directory
+            ]
+        );
+        $errors = $this->model->setSource(
+            $source
+        )->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product'
+            ]
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->model->importData();
+
+        foreach ($products as $storeCode => $productName) {
+            $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+            $store->load($storeCode, 'code');
+            /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+            $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+            /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+            $product = $productRepository->get($productSku, 0, $store->getId());
+            $this->assertFalse($product->isObjectNew());
+            $this->assertEquals($productName, $product->getName());
+            $this->assertEquals(self::TEST_PRODUCT_TYPE, $product->getTypeId());
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/enable_reindex_schedule.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea adminhtml
+     */
+    public function testConfigurableImportWithStoreSpecifiedMainItem()
+    {
+        {
+            $expectedErrorMessage = 'Product with assigned super attributes should not have specified "store_view_code"'
+                . ' value';
+            $filesystem = $this->objectManager->create(
+                \Magento\Framework\Filesystem::class
+            );
+
+            $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+            $source = $this->objectManager->create(
+                \Magento\ImportExport\Model\Import\Source\Csv::class,
+                [
+                    'file' =>  __DIR__ . '/../../_files/import_configurable_for_multiple_store_views_error.csv',
+                    'directory' => $directory
+                ]
+            );
+            $errors = $this->model->setSource(
+                $source
+            )->setParameters(
+                [
+                    'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                    'entity' => 'catalog_product'
+                ]
+            )->validateData();
+
+            $this->assertTrue($errors->getErrorsCount() == 1);
+            $this->assertEquals($expectedErrorMessage, $errors->getAllErrors()[0]->getErrorMessage());
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_for_multiple_store_views.csv b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_for_multiple_store_views.csv
new file mode 100644
index 0000000000000..f776f137d87ce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_for_multiple_store_views.csv
@@ -0,0 +1,5 @@
+sku,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,tax_class_name,visibility,price,url_key,display_product_options_in,map_price,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,configurable_variations,configurable_variation_labels,associated_skus
+Configurable 1-Option 1,,Default,simple,Configurable 1-Option 1,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-1,Block after Info Column,,"attribute_with_option=Option Label,has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 1",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
+Configurable 1-Option 2,,Default,simple,Configurable 1-Option 2,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-2,Block after Info Column,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 2",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
+Configurable 1,,Default,configurable,Configurable 1,,,,1,Taxable Goods,"Catalog, Search",10,configurable-1,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,"sku=Configurable 1-Option 1,test_configurable=Option 1|sku=Configurable 1-Option 2,test_configurable=Option 2",test_configurable=test_configurable_custom_label,
+Configurable 1,fixture_second_store,Default,configurable,Configurable 1 Second Store,,,,1,Taxable Goods,"Catalog, Search",10,configurable-1,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,,test_configurable=test_configurable_custom_label_second_store,
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_for_multiple_store_views_error.csv b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_for_multiple_store_views_error.csv
new file mode 100644
index 0000000000000..d2ede16a647a7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_for_multiple_store_views_error.csv
@@ -0,0 +1,4 @@
+sku,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,tax_class_name,visibility,price,url_key,display_product_options_in,map_price,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,configurable_variations,configurable_variation_labels,associated_skus
+Configurable 1-Option 1,,Default,simple,Configurable 1-Option 1,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-1,Block after Info Column,,"attribute_with_option=Option Label,has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 1",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
+Configurable 1-Option 2,,Default,simple,Configurable 1-Option 2,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-2,Block after Info Column,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 2",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
+Configurable 1,default,Default,configurable,Configurable 1,,,,1,Taxable Goods,"Catalog, Search",10,configurable-1,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,"sku=Configurable 1-Option 1,test_configurable=Option 1|sku=Configurable 1-Option 2,test_configurable=Option 2",test_configurable=test_configurable_custom_label,
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
index 4254a6ce9c71d..b71507ae43f9f 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Registry;
 use Magento\TestFramework\ObjectManager;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -23,6 +24,7 @@ public function testSaveActionAssociatedProductIds()
     {
         $associatedProductIds = ['3', '14', '15', '92'];
         $associatedProductIdsJSON = json_encode($associatedProductIds);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'id' => 1,
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
index f9776b2264ff3..0d93d3ad4f4ae 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\ConfigurableProduct\Controller;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class CartTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
@@ -85,13 +87,14 @@ public function testExecuteForConfigurableLastOption()
             'remove' => 0,
             'coupon_code' => 'test'
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->dispatch(
             'checkout/cart/couponPost/'
         );
 
         $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/ConfigurableProduct/Model/Category/ProductIndexerTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Category/ProductIndexerTest.php
index def8cbdbc0bba..203a3fb45bea2 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Category/ProductIndexerTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Category/ProductIndexerTest.php
@@ -11,7 +11,7 @@
  * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
  * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
  * @magentoAppIsolation enabled
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  */
 class ProductIndexerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/OptionRepositoryTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/OptionRepositoryTest.php
index e539f7ad9a328..00d6e51c736b5 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/OptionRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/OptionRepositoryTest.php
@@ -9,6 +9,7 @@ class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetListWithExtensionAttributes()
     {
@@ -24,9 +25,10 @@ public function testGetListWithExtensionAttributes()
         $joinedEntity = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
         $joinedEntity->load($options[0]->getId());
         $joinedExtensionAttributeValue = $joinedEntity->getAttributeCode();
+        $result = $options[0]->getExtensionAttributes()->__toArray();
         $this->assertEquals(
             $joinedExtensionAttributeValue,
-            $options[0]->getExtensionAttributes()->getTestDummyAttribute(),
+            $result['test_dummy_attribute'],
             "Extension attributes were not loaded correctly"
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/SaveHandlerTest.php
new file mode 100644
index 0000000000000..70cc0136cfb1c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/SaveHandlerTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Product;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ConfigurableResource;
+
+/**
+ * Tests for \Magento\ConfigurableProduct\Model\Product\SaveHandler.
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+ */
+class SaveHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Object under test
+     *
+     * @var SaveHandler
+     */
+    private $handler;
+
+    /**
+     * @var Product
+     */
+    private $product;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ConfigurableResource
+     */
+    private $resource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $this->product = $this->productRepository->get('configurable');
+        $this->resource = Bootstrap::getObjectManager()->create(ConfigurableResource::class);
+        $this->handler = Bootstrap::getObjectManager()->create(SaveHandler::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithConfigurableProductLinksChanged(): void
+    {
+        $childrenIds = $this->product->getTypeInstance()->getChildrenIds($this->product->getId());
+        $newChildrenIds = [reset($childrenIds[0])];
+        $product = $this->productRepository->getById($this->product->getId());
+        $extensionAttributes = $product->getExtensionAttributes();
+        $extensionAttributes->setConfigurableProductLinks($newChildrenIds);
+        $product->setExtensionAttributes($extensionAttributes);
+        $this->handler->execute($product);
+        $childrenIds = $this->product->getTypeInstance()->getChildrenIds($this->product->getId());
+        $savedChildrenIds = [reset($childrenIds[0])];
+
+        self::assertEquals($newChildrenIds, $savedChildrenIds);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithConfigurableProductLinksNotChanged(): void
+    {
+        $childrenIds = $this->product->getTypeInstance()->getChildrenIds($this->product->getId())[0];
+        $product = $this->productRepository->getById($this->product->getId());
+        $extensionAttributes = $product->getExtensionAttributes();
+        $extensionAttributes->setConfigurableProductLinks($childrenIds);
+        $product->setExtensionAttributes($extensionAttributes);
+        $oldProductLinks = $this->getCurrentProductLinks();
+        $this->handler->execute($product);
+        $newProductLinks = $this->getCurrentProductLinks();
+
+        self::assertEquals($oldProductLinks, $newProductLinks);
+    }
+
+    /**
+     * @return array
+     */
+    private function getCurrentProductLinks()
+    {
+        $select = $this->resource->getConnection()->select()->from(['l' => $this->resource->getMainTable()]);
+
+        return $this->resource->getConnection()->fetchAll($select);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php
index c39a2cea4b53d..e530029e9755e 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php
@@ -10,6 +10,7 @@
 
 /**
  * Class PriceTest
+ * @magentoDbIsolation disabled
  */
 class PriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -30,6 +31,7 @@ protected function setUp()
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetFinalPrice()
     {
@@ -40,6 +42,7 @@ public function testGetFinalPrice()
      * @magentoConfigFixture current_store tax/display/type 1
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetFinalPriceExcludingTax()
     {
@@ -50,6 +53,7 @@ public function testGetFinalPriceExcludingTax()
      * @magentoConfigFixture current_store tax/display/type 2
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetFinalPriceIncludingTax()
     {
@@ -61,6 +65,7 @@ public function testGetFinalPriceIncludingTax()
      * @magentoConfigFixture current_store tax/display/type 3
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetFinalPriceIncludingExcludingTax()
     {
@@ -71,6 +76,7 @@ public function testGetFinalPriceIncludingExcludingTax()
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetFinalPriceWithSelectedSimpleProduct()
     {
@@ -83,6 +89,7 @@ public function testGetFinalPriceWithSelectedSimpleProduct()
      * @magentoConfigFixture current_store tax/display/type 1
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testGetFinalPriceWithCustomOption()
     {
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index 8aa8d4cc810b1..78fa4733a2562 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 namespace Magento\ConfigurableProduct\Model\Product\Type;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -128,6 +130,10 @@ public function testGetUsedProductAttributes()
         $this->assertEquals($testConfigurable->getData(), $attributes[$attributeId]->getData());
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
     public function testGetConfigurableAttributes()
     {
         $collection = $this->model->getConfigurableAttributes($this->product);
@@ -151,6 +157,19 @@ public function testGetConfigurableAttributes()
         }
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_custom.php
+     */
+    public function testGetConfigurableAttributesWithSourceModel()
+    {
+        $collection = $this->model->getConfigurableAttributes($this->product);
+        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $configurableAttribute */
+        $configurableAttribute = $collection->getFirstItem();
+        $attribute = $this->_getAttributeByCode('test_configurable_with_sm');
+        $this->assertSameSize($attribute->getSource()->getAllOptions(), $configurableAttribute->getOptions());
+    }
+
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
@@ -235,6 +254,26 @@ public function testGetUsedProducts()
         }
     }
 
+    /**
+     * Test getUsedProducts returns array with same indexes regardless collections was cache or not.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testGetUsedProductsCached()
+    {
+        /** @var  \Magento\Framework\App\Cache\StateInterface $cacheState */
+        $cacheState = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Cache\StateInterface::class);
+        $cacheState->setEnabled(\Magento\Framework\App\Cache\Type\Collection::TYPE_IDENTIFIER, true);
+
+        $products = $this->getUsedProducts();
+        $productsCached = $this->getUsedProducts();
+        self::assertEquals(
+            array_keys($products),
+            array_keys($productsCached)
+        );
+    }
+
     public function testGetUsedProductCollection()
     {
         $this->assertInstanceOf(
@@ -299,8 +338,7 @@ public function testGetSelectedAttributesInfo()
         $attribute = reset($attributes);
         $optionValueId = $attribute['values'][0]['value_index'];
 
-        $product->addCustomOption(
-            'attributes',
+        $product->addCustomOption('attributes',
             $serializer->serialize([$attribute['attribute_id'] => $optionValueId])
         );
 
@@ -570,4 +608,14 @@ protected function _prepareForCart()
 
         return $product;
     }
+
+    /**
+     * @return ProductInterface[]
+     */
+    protected function getUsedProducts()
+    {
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $product->load(1);
+        return $this->model->getUsedProducts($product);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ProductTest.php
new file mode 100644
index 0000000000000..223c9fbe708e2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ProductTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+class ProductTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testGetIdentities()
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $confProduct = $productRepository->get('configurable');
+        $simple10Product = $productRepository->get('simple_10');
+        $simple20Product = $productRepository->get('simple_20');
+
+        $this->assertEmpty(array_diff($confProduct->getIdentities(), $simple10Product->getIdentities()));
+        $this->assertEmpty(array_diff($confProduct->getIdentities(), $simple20Product->getIdentities()));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
index 9d6ef7dfb1ae6..32eddb28151a7 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
@@ -12,11 +12,18 @@
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
+ * Configurable test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea adminhtml
  */
-class ConfigurableTest extends \PHPUnit\Framework\TestCase
+class ConfigurableTest extends TestCase
 {
     /**
      * @var StoreManagerInterface
@@ -28,25 +35,36 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
-    protected function setUp()
+    /**
+     * @var StockItemRepositoryInterface
+     */
+    private $stockRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
         $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->stockRepository = Bootstrap::getObjectManager()->get(StockItemRepositoryInterface::class);
     }
 
     /**
+     * Test get product final price if one of child is disabled
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
-    public function testGetProductFinalPriceIfOneOfChildIsDisabled()
+    public function testGetProductFinalPriceIfOneOfChildIsDisabled(): void
     {
-        /** @var Collection $collection */
-        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-            ->create();
-        $configurableProduct = $collection
-            ->addIdFilter([1])
-            ->addMinimalPrice()
-            ->load()
-            ->getFirstItem();
+        $configurableProduct = $this->getConfigurableProductFromCollection();
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
         $childProduct = $this->productRepository->getById(10, false, null, true);
@@ -57,33 +75,28 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabled()
         $this->productRepository->save($childProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
-        /** @var Collection $collection */
-        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-            ->create();
-        $configurableProduct = $collection
-            ->addIdFilter([1])
-            ->addMinimalPrice()
-            ->load()
-            ->getFirstItem();
+        $configurableProduct = $this->getConfigurableProductFromCollection();
         $this->assertEquals(20, $configurableProduct->getMinimalPrice());
     }
 
     /**
+     * Test get product final price if one of child is disabled per store
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
-    public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore()
+    public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore(): void
     {
-        /** @var Collection $collection */
-        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-            ->create();
-        $configurableProduct = $collection
-            ->addIdFilter([1])
-            ->addMinimalPrice()
-            ->load()
-            ->getFirstItem();
+        $configurableProduct = $this->getConfigurableProductFromCollection();
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
-        $childProduct = $this->productRepository->getById(10, false, null, true);
+        $childProduct = $this->productRepository->get('simple_10', false, null, true);
         $childProduct->setStatus(Status::STATUS_DISABLED);
 
         // update in default store scope
@@ -93,14 +106,53 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore()
         $this->productRepository->save($childProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
+        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
+    }
+
+    /**
+     * Test get product minimal price if one child is out of stock
+     *
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testGetProductMinimalPriceIfOneOfChildIsOutOfStock(): void
+    {
+        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
+
+        $childProduct = $this->productRepository->getById(10, false, null, true);
+        $stockItem = $childProduct->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
+    }
+
+    /**
+     * Retrieve configurable product.
+     * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php
+     * fixture
+     *
+     * @return ProductInterface
+     */
+    private function getConfigurableProductFromCollection(): ProductInterface
+    {
         /** @var Collection $collection */
         $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
             ->create();
+        /** @var ProductInterface $configurableProduct */
         $configurableProduct = $collection
             ->addIdFilter([1])
             ->addMinimalPrice()
             ->load()
             ->getFirstItem();
-        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
+
+        return $configurableProduct;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionProviderTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionProviderTest.php
index c24baa36461cb..8add544881c76 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionProviderTest.php
@@ -11,6 +11,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @magentoDbIsolation disabled
+ */
 class LowestPriceOptionProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerTest.php
index 581411cb8b8e7..dc5c07ad8dc2c 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerTest.php
@@ -43,6 +43,7 @@ protected function setUp()
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoDataFixture Magento/Catalog/_files/enable_price_index_schedule.php
+     * @magentoDbIsolation disabled
      */
     public function testFullReindexIfChildHasSpecialPrice()
     {
@@ -79,6 +80,7 @@ public function testFullReindexIfChildHasSpecialPrice()
      * Use collection to check data in index
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testOnSaveIndexationIfChildHasSpecialPrice()
     {
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
new file mode 100644
index 0000000000000..578cb47d14676
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Pricing\Price;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoDbIsolation disabled
+ * @group indexer_dimension
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ */
+class SpecialPriceIndexerWithDimensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->productCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+        $this->indexerProcessor = Bootstrap::getObjectManager()->get(Processor::class);
+    }
+
+    /**
+     * Use collection to check data in index
+     * Do not use magentoDbIsolation because index statement changing "tears" transaction (triggers creating)
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDataFixture Magento/Catalog/_files/enable_price_index_schedule.php
+     */
+    public function testFullReindexIfChildHasSpecialPrice()
+    {
+        $specialPrice = 2;
+        /** @var Product $childProduct */
+        $childProduct = $this->productRepository->get('simple_10', true);
+        $childProduct->setData('special_price', $specialPrice);
+        $this->productRepository->save($childProduct);
+
+        /** @var ProductCollection $collection */
+        $collection = $this->productCollectionFactory->create();
+        $collection
+            ->addPriceData()
+            ->addFieldToFilter(ProductInterface::SKU, 'configurable');
+
+        /** @var Product[] $items */
+        $items = array_values($collection->getItems());
+        self::assertEquals(10, $items[0]->getData('min_price'));
+
+        $this->indexerProcessor->reindexAll();
+
+        /** @var ProductCollection $collection */
+        $collection = $this->productCollectionFactory->create();
+        $collection
+            ->addPriceData()
+            ->addFieldToFilter(ProductInterface::SKU, 'configurable');
+
+        /** @var Product $item */
+        $item = $collection->getFirstItem();
+        self::assertEquals($specialPrice, $item->getData('min_price'));
+    }
+
+    /**
+     * Use collection to check data in index
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     */
+    public function testOnSaveIndexationIfChildHasSpecialPrice()
+    {
+        $specialPrice = 2;
+        /** @var Product $childProduct */
+        $childProduct = $this->productRepository->get('simple_10', true);
+        $childProduct->setData('special_price', $specialPrice);
+        $this->productRepository->save($childProduct);
+
+        /** @var ProductCollection $collection */
+        $collection = $this->productCollectionFactory->create();
+        $collection
+            ->addPriceData()
+            ->addFieldToFilter(ProductInterface::SKU, 'configurable');
+
+        /** @var Product $item */
+        $item = $collection->getFirstItem();
+        self::assertEquals($specialPrice, $item->getData('min_price'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceTest.php
index a944a5b6104c3..7edcf55f572f5 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceTest.php
@@ -34,6 +34,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
      */
     public function testPriceInfoIfChildHasSpecialPrice()
     {
@@ -56,6 +57,7 @@ public function testPriceInfoIfChildHasSpecialPrice()
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_simple_77.php
+     * @magentoDbIsolation disabled
      */
     public function testSortingOfProductsIfChildHasNotSpecialPrice()
     {
@@ -82,6 +84,7 @@ public function testSortingOfProductsIfChildHasNotSpecialPrice()
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_simple_77.php
+     * @magentoDbIsolation disabled
      */
     public function testSortingOfProductsIfChildHasSpecialPrice()
     {
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php
index 379e61e64c788..0e191f4a90147 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php
@@ -75,6 +75,7 @@ protected function setUp()
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoAppArea frontend
+     * @magentoDbIsolation disabled
      */
     public function testRenderingByDefault()
     {
@@ -83,7 +84,7 @@ public function testRenderingByDefault()
         $this->assertGreaterThanOrEqual(
             1,
             \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                '//*[contains(@class,"special-price")]',
+                '//*[contains(@class,"normal-price")]',
                 $html
             )
         );
@@ -109,6 +110,7 @@ public function testRenderingByDefault()
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoAppArea frontend
      * @dataProvider isProductListDataProvider
+     * @magentoDbIsolation disabled
      */
     public function testRenderingAccordingToIsProductListFlag($flag, $count)
     {
@@ -116,9 +118,9 @@ public function testRenderingAccordingToIsProductListFlag($flag, $count)
         $html = $this->finalPriceBox->toHtml();
         self::assertContains('5.99', $html);
         $this->assertEquals(
-            $count,
+            1,
             \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                '//*[contains(@class,"special-price")]',
+                '//*[contains(@class,"normal-price")]',
                 $html
             )
         );
@@ -137,7 +139,7 @@ public function testRenderingAccordingToIsProductListFlag($flag, $count)
     public function isProductListDataProvider()
     {
         return [
-            'is_not_product_list' => [false, true],
+            'is_not_product_list' => [false, 1],
             'is_product_list' => [true, 0],
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
new file mode 100644
index 0000000000000..b2e4fe6af3243
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Render\FinalPriceBox;
+use Magento\Framework\Pricing\Render\Amount;
+use Magento\Framework\Pricing\Render\RendererPool;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoDbIsolation disabled
+ * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @group indexer_dimension
+ * Test price rendering according to is_product_list flag for Configurable product
+ */
+class RenderingBasedOnIsProductListFlagWithDimensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductInterface
+     */
+    private $product;
+
+    /**
+     * @var FinalPrice
+     */
+    private $finalPrice;
+
+    /**
+     * @var RendererPool
+     */
+    private $rendererPool;
+
+    /**
+     * @var FinalPriceBox
+     */
+    private $finalPriceBox;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->product = $productRepository->get('configurable');
+        $this->finalPrice = Bootstrap::getObjectManager()->create(FinalPrice::class, [
+            'saleableItem' => $this->product,
+            'quantity' => null
+        ]);
+        $this->rendererPool = Bootstrap::getObjectManager()->create(RendererPool::class);
+        $this->rendererPool->setData(
+            [
+                'default' =>
+                    [
+                        'default_amount_render_class' => Amount::class,
+                        'default_amount_render_template' => 'Magento_Catalog::product/price/amount/default.phtml',
+                    ],
+            ]
+        );
+        $this->finalPriceBox = Bootstrap::getObjectManager()->create(FinalPriceBox::class, [
+            'saleableItem' => $this->product,
+            'price' => $this->finalPrice,
+            'rendererPool' => $this->rendererPool,
+        ]);
+        $this->finalPriceBox->setTemplate('Magento_ConfigurableProduct::product/price/final_price.phtml');
+
+        /** @var Product $childProduct */
+        $childProduct = $productRepository->get('simple_10', true);
+        $childProduct->setData('special_price', 5.99);
+        $productRepository->save($childProduct);
+    }
+
+    /**
+     * Test when is_product_list flag is not specified. Regular and Special price should be rendered
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea frontend
+     * @magentoDbIsolation disabled
+     */
+    public function testRenderingByDefault()
+    {
+        $html = $this->finalPriceBox->toHtml();
+        self::assertContains('5.99', $html);
+        $this->assertGreaterThanOrEqual(
+            1,
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//*[contains(@class,"normal-price")]',
+                $html
+            )
+        );
+        $this->assertGreaterThanOrEqual(
+            1,
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//*[contains(@class,"old-price")]',
+                $html
+            )
+        );
+    }
+
+    /**
+     * Test when is_product_list flag is specified
+     *
+     * Special price should be valid
+     * FinalPriceBox::hasSpecialPrice should not be call
+     * Regular price for Configurable product should be rendered for is_product_list = false (product page), but not be
+     * for for is_product_list = true (list of products)
+     *
+     * @param bool $flag
+     * @param int|bool $count
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea frontend
+     * @dataProvider isProductListDataProvider
+     * @magentoDbIsolation disabled
+     */
+    public function testRenderingAccordingToIsProductListFlag($flag, $count)
+    {
+        $this->finalPriceBox->setData('is_product_list', $flag);
+        $html = $this->finalPriceBox->toHtml();
+        self::assertContains('5.99', $html);
+        $this->assertEquals(
+            1,
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//*[contains(@class,"normal-price")]',
+                $html
+            )
+        );
+        $this->assertEquals(
+            $count,
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//*[contains(@class,"old-price")]',
+                $html
+            )
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function isProductListDataProvider()
+    {
+        return [
+            'is_not_product_list' => [false, 1],
+            'is_product_list' => [true, 0],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
new file mode 100644
index 0000000000000..1f30d53850833
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$eavSetup = $objectManager->create(\Magento\Eav\Setup\EavSetup::class);
+$eavSetup->addAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'test_configurable_with_sm',
+    [
+        'group' => 'General',
+        'type' => 'varchar',
+        'backend' => '',
+        'frontend' => '',
+        'label' => 'Test configurable with source model',
+        'input' => 'select',
+        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Mode::class,
+        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+        'visible' => true,
+        'required' => false,
+        'user_defined' => true,
+        'default' => '',
+        'searchable' => false,
+        'filterable' => false,
+        'comparable' => false,
+        'visible_on_front' => false,
+        'used_in_product_listing' => true,
+        'unique' => false,
+        'apply_to' => ''
+    ]
+);
+
+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php
new file mode 100644
index 0000000000000..8b6861516a86f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_configurable_with_sm');
+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute && $attribute->getId()) {
+    $attribute->delete();
+}
+$eavConfig->clear();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_rollback.php
index 4d5165b0f318c..42045c4439fed 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_rollback.php
@@ -17,7 +17,7 @@
 
 foreach (['simple_10', 'simple_20', 'configurable', 'simple_30', 'simple_40', 'configurable_12345'] as $sku) {
     try {
-        $product = $productRepository->get($sku, false, null, true);
+        $product = $productRepository->get($sku, true);
 
         $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
         $stockStatus->load($product->getEntityId(), 'product_id');
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php
new file mode 100644
index 0000000000000..d0bdf8f2e0bdd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/configurable_attribute_with_source_model.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_configurable_with_sm');
+$options = $attribute->getOptions();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$attributeValues = [];
+$associatedProductIds = [];
+$attributeSetId = $installer->getAttributeSetId(\Magento\Catalog\Model\Product::ENTITY, 'Default');
+
+foreach ($options as $key => $option) {
+    $productId = $key + 10;
+
+    $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+    $product->setTypeId(Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option ' . $option->getLabel())
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->setTestConfigurableWithSm($option->getValue())
+        ->setVisibility(Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    $product = $productRepository->save($product);
+
+    $stockItem = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+    $stockItem->load($productId, 'product_id');
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($productId);
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty(1000);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+}
+
+$optionsFactory = $objectManager->create(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
+$configurableAttributesData = [
+    [
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $attributeValues,
+    ],
+];
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
+    ->setId(1)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
+
+$categoryLinkManagement = $objectManager->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php
new file mode 100644
index 0000000000000..eb3db259d4cbf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+foreach (['simple_10', 'simple_11', 'simple_12', 'configurable'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, true);
+
+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+        $stockStatus->load($product->getEntityId(), 'product_id');
+        $stockStatus->delete();
+
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/configurable_attribute_with_source_model_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_rollback.php
index 80ad8e76d7b9c..171ddef1eca86 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_rollback.php
@@ -18,13 +18,15 @@
 
 foreach (['simple_10', 'simple_20', 'configurable'] as $sku) {
     try {
-        $product = $productRepository->get($sku, false, null, true);
+        $product = $productRepository->get($sku, true);
 
         $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
         $stockStatus->load($product->getEntityId(), 'product_id');
         $stockStatus->delete();
 
-        $productRepository->delete($product);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
     } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         //Product already removed
     }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
index 519841ddb61e4..b8449a829a227 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
@@ -55,8 +55,8 @@
     $eavAttributeValues = [
         'category_ids' => [2]
         ];
-    foreach ($eavAttributeValues as $eavCategoryAttributeCode => $eavCategoryAtttributeValues) {
-        $product->setCustomAttribute($eavCategoryAttributeCode, $eavCategoryAtttributeValues);
+    foreach ($eavAttributeValues as $eavCategoryAttributeCode => $eavCategoryAttributeValues) {
+        $product->setCustomAttribute($eavCategoryAttributeCode, $eavCategoryAttributeValues);
     }
 
     $product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77_rollback.php
new file mode 100644
index 0000000000000..1f4c5fe4d0725
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/**
+ * @var Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_77', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule_rollback.php
new file mode 100644
index 0000000000000..a1dbae8212999
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rule');
+$objectManager->create(\Magento\Tax\Model\Calculation\Rule::class)->load('Test Rule', 'code')->delete();
+
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate');
+$objectManager->create(\Magento\Tax\Model\Calculation\Rate::class)->loadByCode('*')->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
index b8dbfec59845b..c1255ae9b1aad 100644
--- a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
@@ -3,13 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Contact\Controller;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * Contact index controller test
  */
 class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /**
+     * Test contacting.
+     */
     public function testPostAction()
     {
         $params = [
@@ -18,26 +24,29 @@ public function testPostAction()
             'email' => 'user@example.com',
             'hideit' => '',
         ];
-        $this->getRequest()->setPostValue($params);
+        $this->getRequest()->setPostValue($params)->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('contact/index/post');
         $this->assertRedirect($this->stringContains('contact/index'));
         $this->assertSessionMessages(
             $this->contains(
-                "Thanks for contacting us with your comments and questions. We'll respond to you very soon."
+                "Thanks for contacting us with your comments and questions. We&#039;ll respond to you very soon."
             ),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
     }
 
     /**
+     * Test validation.
+     *
+     * @param array $params For Request.
+     * @param string $expectedMessage Expected response.
+     *
      * @dataProvider dataInvalidPostAction
-     * @param $params
-     * @param $expectedMessage
      */
     public function testInvalidPostAction($params, $expectedMessage)
     {
-        $this->getRequest()->setPostValue($params);
+        $this->getRequest()->setPostValue($params)->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('contact/index/post');
         $this->assertRedirect($this->stringContains('contact/index'));
@@ -47,6 +56,9 @@ public function testInvalidPostAction($params, $expectedMessage)
         );
     }
 
+    /**
+     * @return array
+     */
     public static function dataInvalidPostAction()
     {
         return [
@@ -57,7 +69,7 @@ public static function dataInvalidPostAction()
                     'email' => 'user@example.com',
                     'hideit' => '',
                 ],
-                'expectedMessage' => "Comment is missing",
+                'expectedMessage' => "Enter the comment and try again.",
             ],
             'missing_name' => [
                 'params' => [
@@ -66,7 +78,7 @@ public static function dataInvalidPostAction()
                     'email' => 'user@example.com',
                     'hideit' => '',
                 ],
-                'expectedMessage' => "Name is missing",
+                'expectedMessage' => "Enter the Name and try again.",
             ],
             'invalid_email' => [
                 'params' => [
@@ -75,7 +87,7 @@ public static function dataInvalidPostAction()
                     'email' => 'invalidemail',
                     'hideit' => '',
                 ],
-                'expectedMessage' => "Invalid email address",
+                'expectedMessage' => "The email address is invalid. Verify the email address and try again.",
             ],
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php b/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php
index 4e31ea1f18a3a..7b64eb36050f6 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php
@@ -54,6 +54,27 @@ public function testTryLockJobAlreadyLockedFails()
         $this->assertFalse($schedule->tryLockJob());
     }
 
+    /**
+     * If the job is already locked but lock time less than 1 day ago, attempting to lock it again should fail
+     */
+    public function testTryLockJobAlreadyLockedSucceeds()
+    {
+        $offsetInThePast = 2*24*60*60;
+
+        $oldSchedule = $this->scheduleFactory->create()
+            ->setCronExpr("* * * * *")
+            ->setJobCode("test_job")
+            ->setStatus(Schedule::STATUS_RUNNING)
+            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp() - $offsetInThePast))
+            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 60))
+            ->setExecutedAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 61));
+        $oldSchedule->save();
+
+        $schedule = $this->createSchedule("test_job", Schedule::STATUS_PENDING);
+
+        $this->assertTrue($schedule->tryLockJob());
+    }
+
     /**
      * If there's a job already locked, should not be able to lock another job
      */
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
index cdeb67afca471..99be1bcbae379 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
@@ -27,7 +27,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr 8 * * * *
+     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr * * * * *
      */
     public function testDispatchScheduled()
     {
@@ -35,6 +35,7 @@ public function testDispatchScheduled()
             \Magento\Cron\Model\ResourceModel\Schedule\Collection::class
         );
         $collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);
+        $collection->addFieldToFilter('job_code', 'catalog_product_alert');
         $this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
index 28f744aa4142f..8e25e5960a4b5 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
@@ -3,14 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
+/**
+ * Fetch Rates Test
+ */
 class FetchRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
      * Test fetch action without service
+     *
+     * @return void
      */
-    public function testFetchRatesActionWithoutService()
+    public function testFetchRatesActionWithoutService(): void
     {
         $request = $this->getRequest();
         $request->setParam(
@@ -20,15 +26,17 @@ public function testFetchRatesActionWithoutService()
         $this->dispatch('backend/admin/system_currency/fetchRates');
 
         $this->assertSessionMessages(
-            $this->contains('Please specify a correct Import Service.'),
+            $this->contains('The Import Service is incorrect. Verify the service and try again.'),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
 
     /**
      * Test save action with nonexistent service
+     *
+     * @return void
      */
-    public function testFetchRatesActionWithNonexistentService()
+    public function testFetchRatesActionWithNonexistentService(): void
     {
         $request = $this->getRequest();
         $request->setParam(
@@ -38,89 +46,8 @@ public function testFetchRatesActionWithNonexistentService()
         $this->dispatch('backend/admin/system_currency/fetchRates');
 
         $this->assertSessionMessages(
-            $this->contains('We can\'t initialize the import model.'),
+            $this->contains("The import model can't be initialized. Verify the model and try again."),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
-
-    /**
-     * Test save action with nonexistent service
-     */
-    public function testFetchRatesActionWithServiceErrors()
-    {
-        $this->runActionWithMockedImportService(['We can\'t retrieve a rate from url']);
-
-        $this->assertSessionMessages(
-            $this->contains('Click "Save" to apply the rates we found.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_WARNING
-        );
-    }
-
-    /**
-     * Test save action with nonexistent service
-     */
-    public function testFetchRatesActionWithoutServiceErrors()
-    {
-        $this->runActionWithMockedImportService();
-
-        $this->assertSessionMessages(
-            $this->contains('Click "Save" to apply the rates we found.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-        );
-    }
-
-    /**
-     * Run fetchRates with mocked external import service
-     *
-     * @param array $messages messages from external import service
-     */
-    protected function runActionWithMockedImportService(array $messages = [])
-    {
-        $importServiceMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Webservicex::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importServiceMock->method('fetchRates')
-            ->willReturn(['USD' => ['USD' => 1]]);
-
-        $importServiceMock->method('getMessages')
-            ->willReturn($messages);
-
-        $backendSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importServiceFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Factory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importServiceFactoryMock->method('create')
-            ->willReturn($importServiceMock);
-
-        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $objectManagerMap = [
-            [\Magento\Directory\Model\Currency\Import\Factory::class, $importServiceFactoryMock],
-            [\Magento\Backend\Model\Session::class, $backendSessionMock]
-        ];
-
-        $objectManagerMock->method('get')
-            ->will($this->returnValueMap($objectManagerMap));
-
-        $context =  $this->_objectManager->create(
-            \Magento\Backend\App\Action\Context::class,
-            ["objectManager" => $objectManagerMock]
-        );
-        $registry =  $this->_objectManager->get(\Magento\Framework\Registry::class);
-
-        $this->getRequest()->setParam('rate_services', 'webservicex');
-
-        $action = new \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\FetchRates(
-            $context,
-            $registry
-        );
-        $action->execute();
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
index c9f2ffad67644..fefd1a7b250c3 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class SaveRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
 
@@ -43,6 +45,7 @@ public function testSaveAction()
         $rate = 1.0000;
 
         $request = $this->getRequest();
+        $request->setMethod(HttpRequest::METHOD_POST);
         $request->setPostValue(
             'rate',
             [
@@ -75,6 +78,7 @@ public function testSaveWithWarningAction()
         $rate = '0';
 
         $request = $this->getRequest();
+        $request->setMethod(HttpRequest::METHOD_POST);
         $request->setPostValue(
             'rate',
             [
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
index 5217c3576a51d..2929f137be89f 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
@@ -5,10 +5,16 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
-     * Test save action
+     * Test save action.
+     *
+     * @param string $currencyCode
+     * @param string $inputCurrencySymbol
+     * @param string $outputCurrencySymbol
      *
      * @magentoConfigFixture               currency/options/allow USD
      * @magentoDbIsolation enabled
@@ -31,6 +37,7 @@ public function testSaveAction($currencyCode, $inputCurrencySymbol, $outputCurre
                 $currencyCode => $inputCurrencySymbol,
             ]
         );
+        $request->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/admin/system_currencysymbol/save');
 
         $this->assertRedirect();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
index 328622ca1bbbe..cf6e82639767e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
@@ -160,6 +160,13 @@ public function testSaveNewAddress()
         $expectedNewAddress = $this->_expectedAddresses[1];
         $expectedNewAddress->setId($savedAddress->getId());
         $expectedNewAddress->setRegion($this->_expectedAddresses[1]->getRegion());
+
+        $this->assertEquals($expectedNewAddress->getExtensionAttributes(), $savedAddress->getExtensionAttributes());
+        $this->assertEquals(
+            $expectedNewAddress->getRegion()->getExtensionAttributes(),
+            $savedAddress->getRegion()->getExtensionAttributes()
+        );
+
         $this->assertEquals($expectedNewAddress, $savedAddress);
     }
 
@@ -200,15 +207,50 @@ public function testSaveNewInvalidAddress()
             ->setId(null)
             ->setFirstname(null)
             ->setLastname(null)
-            ->setCustomerId(1);
+            ->setCustomerId(1)
+            ->setRegionId($invalidRegion = 10354);
         try {
             $this->repository->save($address);
         } catch (InputException $exception) {
             $this->assertEquals('One or more input exceptions have occurred.', $exception->getMessage());
             $errors = $exception->getErrors();
-            $this->assertCount(2, $errors);
-            $this->assertEquals('firstname is a required field.', $errors[0]->getLogMessage());
-            $this->assertEquals('lastname is a required field.', $errors[1]->getLogMessage());
+            $this->assertCount(3, $errors);
+            $this->assertEquals('"firstname" is required. Enter and try again.', $errors[0]->getLogMessage());
+            $this->assertEquals('"lastname" is required. Enter and try again.', $errors[1]->getLogMessage());
+            $this->assertEquals(
+                __(
+                    'Invalid value of "%value" provided for the %fieldName field.',
+                    ['fieldName' => 'regionId', 'value' => $invalidRegion]
+                ),
+                $errors[2]->getLogMessage()
+            );
+        }
+
+        $address->setCountryId($invalidCountry = 'invalid_id');
+        try {
+            $this->repository->save($address);
+        } catch (InputException $exception) {
+            $this->assertEquals(
+                'One or more input exceptions have occurred.',
+                $exception->getMessage()
+            );
+            $errors = $exception->getErrors();
+            $this->assertCount(3, $errors);
+            $this->assertEquals(
+                '"firstname" is required. Enter and try again.',
+                $errors[0]->getLogMessage()
+            );
+            $this->assertEquals(
+                '"lastname" is required. Enter and try again.',
+                $errors[1]->getLogMessage()
+            );
+            $this->assertEquals(
+                __(
+                    'Invalid value of "%value" provided for the %fieldName field.',
+                    ['fieldName' => 'countryId', 'value' => $invalidCountry]
+                ),
+                $errors[2]->getLogMessage()
+            );
         }
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php
index b4a00d497f5b6..e28a9602b9377 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php
@@ -65,10 +65,10 @@ public function testRenderingNewsletterBlock()
         $this->dispatch('backend/customer/index/edit');
         $body = $this->getResponse()->getBody();
 
-        $this->assertContains('<span>Newsletter Information<\/span>', $body);
-        $this->assertContains('<input id=\"_newslettersubscription\"', $body);
+        $this->assertContains('\u003Cspan\u003ENewsletter Information\u003C\/span\u003E', $body);
+        $this->assertContains('\u003Cinput id=\"_newslettersubscription\"', $body);
         $this->assertNotContains('checked="checked"', $body);
-        $this->assertContains('<span>Subscribed to Newsletter<\/span>', $body);
-        $this->assertContains('>No Newsletter Found<', $body);
+        $this->assertContains('\u003Cspan\u003ESubscribed to Newsletter\u003C\/span\u003E', $body);
+        $this->assertContains('\u003ENo Newsletter Found\u003C', $body);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
index 4ba1b44010c34..161734f47bfd7 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -110,16 +110,19 @@ public function testGetCustomer()
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
         foreach ($expectedCustomerData as $property => $value) {
-            $expectedValue = is_numeric($value) ? intval($value) : $value;
+            $expectedValue = is_numeric($value) ? (int)$value : $value;
             $actualValue = isset($actualCustomerData[$property]) ? $actualCustomerData[$property] : null;
-            $actualValue = is_numeric($actualValue) ? intval($actualValue) : $actualValue;
+            $actualValue = is_numeric($actualValue) ? (int)$actualValue : $actualValue;
             $this->assertEquals($expectedValue, $actualValue);
         }
     }
 
     public function testGetCustomerEmpty()
     {
-        $this->assertEquals($this->_createCustomer(), $this->_block->getCustomer());
+        $expectedCustomer = $this->createCustomerAndAddToBackendSession();
+        $actualCustomer = $this->_block->getCustomer();
+        $this->assertEquals($expectedCustomer->getExtensionAttributes(), $actualCustomer->getExtensionAttributes());
+        $this->assertEquals($expectedCustomer, $actualCustomer);
     }
 
     /**
@@ -133,7 +136,7 @@ public function testGetGroupName()
 
     public function testGetGroupNameNull()
     {
-        $this->_createCustomer();
+        $this->createCustomerAndAddToBackendSession();
         $this->assertNull($this->_block->getGroupName());
     }
 
@@ -243,7 +246,7 @@ public function testGetBillingAddressHtml()
 
     public function testGetBillingAddressHtmlNoDefaultAddress()
     {
-        $this->_createCustomer();
+        $this->createCustomerAndAddToBackendSession();
         $this->assertEquals(
             __('The customer does not have default billing address.'),
             $this->_block->getBillingAddressHtml()
@@ -253,7 +256,7 @@ public function testGetBillingAddressHtmlNoDefaultAddress()
     /**
      * @return \Magento\Customer\Api\Data\CustomerInterface
      */
-    private function _createCustomer()
+    private function createCustomerAndAddToBackendSession()
     {
         /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
         $customer = $this->_customerFactory->create()->setFirstname(
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
index 874811d159050..cb07b1a401fdf 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Customer\Block\Form;
 
+use Magento\Customer\Block\DataProviders\AddressAttributeData;
+use Magento\Framework\View\Element\Template;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test class for \Magento\Customer\Block\Form\Register
  *
@@ -15,14 +19,15 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testCompanyDefault()
+    public function testCompanyDefault(): void
     {
         /** @var \Magento\Customer\Block\Widget\Company $block */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Block\Form\Register::class
-        )->setTemplate('Magento_Customer::form/register.phtml')
-        ->setShowAddressFields(true);
+        $block = Bootstrap::getObjectManager()->create(Register::class)
+            ->setTemplate('Magento_Customer::form/register.phtml')
+            ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
 
         $this->assertContains('title="Company"', $block->toHtml());
     }
@@ -30,14 +35,16 @@ public function testCompanyDefault()
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testTelephoneDefault()
+    public function testTelephoneDefault(): void
     {
         /** @var \Magento\Customer\Block\Widget\Company $block */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Block\Form\Register::class
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
 
         $this->assertContains('title="Phone&#x20;Number"', $block->toHtml());
     }
@@ -45,14 +52,16 @@ public function testTelephoneDefault()
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testFaxDefault()
+    public function testFaxDefault(): void
     {
         /** @var \Magento\Customer\Block\Widget\Company $block */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Block\Form\Register::class
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
 
         $this->assertNotContains('title="Fax"', $block->toHtml());
     }
@@ -60,21 +69,23 @@ public function testFaxDefault()
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testCompanyDisabled()
+    public function testCompanyDisabled(): void
     {
         /** @var \Magento\Customer\Model\Attribute $model */
-        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $model = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Attribute::class
         );
         $model->loadByCode('customer_address', 'company')->setIsVisible('0');
         $model->save();
 
         /** @var \Magento\Customer\Block\Widget\Company $block */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Block\Form\Register::class
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
 
         $this->assertNotContains('title="Company"', $block->toHtml());
     }
@@ -82,21 +93,23 @@ public function testCompanyDisabled()
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testTelephoneDisabled()
+    public function testTelephoneDisabled(): void
     {
         /** @var \Magento\Customer\Model\Attribute $model */
-        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $model = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Attribute::class
         );
         $model->loadByCode('customer_address', 'telephone')->setIsVisible('0');
         $model->save();
 
         /** @var \Magento\Customer\Block\Widget\Company $block */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Block\Form\Register::class
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
 
         $this->assertNotContains('title="Phone&#x20;Number"', $block->toHtml());
     }
@@ -104,29 +117,46 @@ public function testTelephoneDisabled()
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testFaxEnabled()
+    public function testFaxEnabled(): void
     {
         /** @var \Magento\Customer\Model\Attribute $model */
-        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $model = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Attribute::class
         );
         $model->loadByCode('customer_address', 'fax')->setIsVisible('1');
         $model->save();
 
         /** @var \Magento\Customer\Block\Widget\Company $block */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Block\Form\Register::class
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
 
         $this->assertContains('title="Fax"', $block->toHtml());
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         /** @var \Magento\Eav\Model\Config $eavConfig */
-        $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+        $eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
         $eavConfig->clear();
     }
+
+    /**
+     * Set attribute data provider.
+     *
+     * @param Template $block
+     * @return void
+     */
+    private function setAttributeDataProvider(Template $block): void
+    {
+        $attributeData = Bootstrap::getObjectManager()->get(AddressAttributeData::class);
+        $block->setAttributeData($attributeData);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index ab65180bdc4f1..c94948e23ab4d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -8,12 +8,21 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Account\Redirect;
+use Magento\Customer\Model\Session;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\Http;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\Response;
+use Zend\Stdlib\Parameters;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -47,6 +56,38 @@ public function testIndexAction()
         $this->assertContains('Green str, 67', $body);
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_password.php
+     */
+    public function testLoginWithIncorrectPassword()
+    {
+        $expectedMessage = 'The account sign-in was incorrect or your account is disabled temporarily. '
+            . 'Please wait and try again later.';
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'login' => [
+                        'username' => 'customer@example.com',
+                        'password' => '123123q'
+                    ]
+                ]
+            );
+
+        $this->dispatch('customer/account/loginPost');
+        $this->assertRedirect($this->stringContains('customer/account/login'));
+        $this->assertSessionMessages(
+            $this->equalTo(
+                [
+                    $expectedMessage
+                ]
+            )
+        );
+    }
+
+    /**
+     * Test sign up form displaying.
+     */
     public function testCreateAction()
     {
         $this->dispatch('customer/account/create');
@@ -86,10 +127,8 @@ public function testForgotPasswordEmailMessageWithSpecialCharacters()
     {
         $email = 'customer@example.com';
 
-        $this->getRequest()
-            ->setPostValue([
-                'email' => $email,
-            ]);
+        $this->getRequest()->setPostValue(['email' => $email]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('customer/account/forgotPasswordPost');
         $this->assertRedirect($this->stringContains('customer/account/'));
@@ -120,7 +159,6 @@ public function testCreatepasswordActionWithDirectLink()
         $customer->save();
 
         $this->getRequest()->setParam('token', $token);
-        $this->getRequest()->setParam('id', $customer->getId());
 
         $this->dispatch('customer/account/createPassword');
 
@@ -128,12 +166,13 @@ public function testCreatepasswordActionWithDirectLink()
         $this->assertEquals(302, $response->getHttpResponseCode());
         $text = $response->getBody();
         $this->assertFalse((bool)preg_match('/' . $token . '/m', $text));
-        $this->assertRedirect($this->stringContains('customer/account/createpassword'));
+        $this->assertRedirect(
+            $this->stringContains('customer/account/createpassword')
+        );
 
-        /** @var \Magento\Customer\Model\Session $customer */
-        $session = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
+        /** @var Session $customer */
+        $session = Bootstrap::getObjectManager()->get(Session::class);
         $this->assertEquals($token, $session->getRpToken());
-        $this->assertEquals($customer->getId(), $session->getRpCustomerId());
         $this->assertNotContains($token, $response->getHeader('Location')->getFieldValue());
     }
 
@@ -211,6 +250,7 @@ public function testConfirmActionAlreadyActive()
     public function testNoFormKeyCreatePostAction()
     {
         $this->fillRequestWithAccountData('test1@email.com');
+        $this->getRequest()->setPostValue('form_key', null);
         $this->dispatch('customer/account/createPost');
 
         $this->assertNull($this->getCustomerByEmail('test1@email.com'));
@@ -365,10 +405,8 @@ public function testForgotPasswordPostAction()
     {
         $email = 'customer@example.com';
 
-        $this->getRequest()
-            ->setPostValue([
-                'email' => $email,
-            ]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['email' => $email]);
 
         $this->dispatch('customer/account/forgotPasswordPost');
         $this->assertRedirect($this->stringContains('customer/account/'));
@@ -388,6 +426,7 @@ public function testForgotPasswordPostAction()
      */
     public function testForgotPasswordPostWithBadEmailAction()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()
             ->setPostValue([
                 'email' => 'bad@email',
@@ -396,7 +435,7 @@ public function testForgotPasswordPostWithBadEmailAction()
         $this->dispatch('customer/account/forgotPasswordPost');
         $this->assertRedirect($this->stringContains('customer/account/forgotpassword'));
         $this->assertSessionMessages(
-            $this->equalTo(['Please correct the email address.']),
+            $this->equalTo(['The email address is incorrect. Verify the email address and try again.']),
             MessageInterface::TYPE_ERROR
         );
     }
@@ -409,6 +448,7 @@ public function testResetPasswordPostNoTokenAction()
         $this->getRequest()
             ->setParam('id', 1)
             ->setParam('token', '8ed8677e6c79e68b94e61658bd756ea5')
+            ->setMethod('POST')
             ->setPostValue([
                 'password' => 'new-password',
                 'password_confirmation' => 'new-password',
@@ -431,6 +471,7 @@ public function testResetPasswordPostAction()
         $this->getRequest()
             ->setQueryValue('id', 1)
             ->setQueryValue('token', '8ed8677e6c79e68b94e61658bd756ea5')
+            ->setMethod('POST')
             ->setPostValue([
                 'password' => 'new-Password1',
                 'password_confirmation' => 'new-Password1',
@@ -513,7 +554,7 @@ public function testEditPostAction()
 
         $this->dispatch('customer/account/editPost');
 
-        $this->assertRedirect($this->stringEndsWith('customer/account/'));
+        $this->assertRedirect($this->stringContains('customer/account/'));
         $this->assertSessionMessages(
             $this->equalTo(['You saved the account information.']),
             MessageInterface::TYPE_SUCCESS
@@ -561,7 +602,7 @@ public function testChangePasswordEditPostAction()
 
         $this->dispatch('customer/account/editPost');
 
-        $this->assertRedirect($this->stringEndsWith('customer/account/'));
+        $this->assertRedirect($this->stringContains('customer/account/'));
         $this->assertSessionMessages(
             $this->equalTo(['You saved the account information.']),
             MessageInterface::TYPE_SUCCESS
@@ -594,9 +635,9 @@ public function testMissingDataEditPostAction()
 
         $this->dispatch('customer/account/editPost');
 
-        $this->assertRedirect($this->stringEndsWith('customer/account/edit/'));
+        $this->assertRedirect($this->stringContains('customer/account/edit/'));
         $this->assertSessionMessages(
-            $this->equalTo(['"Email" is not a valid email address.']),
+            $this->equalTo(['&quot;Email&quot; is not a valid email address.']),
             MessageInterface::TYPE_ERROR
         );
     }
@@ -624,10 +665,10 @@ public function testWrongPasswordEditPostAction()
 
         $this->dispatch('customer/account/editPost');
 
-        $this->assertRedirect($this->stringEndsWith('customer/account/edit/'));
+        $this->assertRedirect($this->stringContains('customer/account/edit/'));
         // Not sure if its the most secure message. Not changing the behavior for now in the new AccountManagement APIs.
         $this->assertSessionMessages(
-            $this->equalTo(['The password doesn\'t match this account.']),
+            $this->equalTo(["The password doesn&#039;t match this account. Verify the password and try again."]),
             MessageInterface::TYPE_ERROR
         );
     }
@@ -653,13 +694,56 @@ public function testWrongConfirmationEditPostAction()
 
         $this->dispatch('customer/account/editPost');
 
-        $this->assertRedirect($this->stringEndsWith('customer/account/edit/'));
+        $this->assertRedirect($this->stringContains('customer/account/edit/'));
         $this->assertSessionMessages(
-            $this->equalTo(['Password confirmation doesn\'t match entered password.']),
+            $this->equalTo(['Password confirmation doesn&#039;t match entered password.']),
             MessageInterface::TYPE_ERROR
         );
     }
 
+    /**
+     * Test redirect customer to account dashboard after logging in.
+     *
+     * @param bool|null $redirectDashboard
+     * @param string $redirectUrl
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @dataProvider loginPostRedirectDataProvider
+     */
+    public function testLoginPostRedirect($redirectDashboard, string $redirectUrl)
+    {
+        if (isset($redirectDashboard)) {
+            $this->_objectManager->get(ScopeConfigInterface::class)->setValue(
+                'customer/startup/redirect_dashboard',
+                $redirectDashboard
+            );
+        }
+        $this->_objectManager->get(Redirect::class)->setRedirectCookie('test');
+        $configValue = $this->_objectManager->create(Value::class);
+        $configValue->load('web/unsecure/base_url', 'path');
+        $baseUrl = $configValue->getValue() ?: 'http://localhost/';
+        $request = $this->prepareRequest();
+        $app = $this->_objectManager->create(Http::class, ['_request' => $request]);
+        $response = $app->launch();
+        $this->assertResponseRedirect($response, $baseUrl . $redirectUrl);
+        $this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
+    }
+
+    /**
+     * Data provider for testLoginPostRedirect.
+     *
+     * @return array
+     */
+    public function loginPostRedirectDataProvider()
+    {
+        return [
+            [null, 'index.php/'],
+            [0, 'index.php/'],
+            [1, 'index.php/customer/account/'],
+        ];
+    }
+
     /**
      * @param string $email
      * @return void
@@ -727,4 +811,40 @@ private function getCustomerByEmail($email)
 
         return $customer;
     }
+
+    /**
+     * Prepare request for customer login.
+     *
+     * @return Request
+     */
+    private function prepareRequest()
+    {
+        $post = new Parameters([
+            'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+            'login' => [
+                'username' => 'customer@example.com',
+                'password' => 'password'
+            ]
+        ]);
+        $request = $this->getRequest();
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $request->setParam('form_key', $formKey->getFormKey());
+        $request->setMethod(Request::METHOD_POST);
+        $request->setRequestUri('customer/account/loginPost/');
+        $request->setPost($post);
+        return $request;
+    }
+
+    /**
+     * Assert response is redirect.
+     *
+     * @param Response $response
+     * @param string $redirectUrl
+     * @return void
+     */
+    private function assertResponseRedirect(Response $response, string $redirectUrl)
+    {
+        $this->assertTrue($response->isRedirect());
+        $this->assertSame($redirectUrl, $response->getHeader('Location')->getUri());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
index ddf23e1b6ea98..92e104496fed8 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
 {
@@ -18,6 +19,9 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
     /** @var FormKey */
     private $formKey;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -150,8 +154,8 @@ public function testFailedFormPostAction()
             $this->equalTo(
                 [
                     'One or more input exceptions have occurred.',
-                    'street is a required field.',
-                    'city is a required field.',
+                    '&quot;street&quot; is required. Enter and try again.',
+                    '&quot;city&quot; is required. Enter and try again.',
                 ]
             ),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
@@ -165,7 +169,7 @@ public function testFailedFormPostAction()
     public function testDeleteAction()
     {
         $this->getRequest()->setParam('id', 1);
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST);
         // we are overwriting the address coming from the fixture
         $this->dispatch('customer/address/delete');
 
@@ -183,7 +187,7 @@ public function testDeleteAction()
     public function testWrongAddressDeleteAction()
     {
         $this->getRequest()->setParam('id', 555);
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST);
         // we are overwriting the address coming from the fixture
         $this->dispatch('customer/address/delete');
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Address/SaveTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Address/SaveTest.php
new file mode 100644
index 0000000000000..cbfa794f94dc0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Address/SaveTest.php
@@ -0,0 +1,195 @@
+<?php
+declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Controller\Adminhtml\Address;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /** @var CustomerRepositoryInterface */
+    private $customerRepository;
+
+    /** @var AccountManagementInterface */
+    private $accountManagement;
+
+    /** @var \Magento\TestFramework\ObjectManager */
+    private $objectManager;
+
+    /** @var \Magento\Customer\Controller\Adminhtml\Address\Save */
+    private $customerAddress;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->customerRepository = Bootstrap::getObjectManager()->get(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
+        $this->accountManagement = Bootstrap::getObjectManager()->get(
+            \Magento\Customer\Api\AccountManagementInterface::class
+        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->customerAddress = $this->objectManager->get(\Magento\Customer\Controller\Adminhtml\Address\Save::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        /**
+         * Unset customer data
+         */
+        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->setCustomerData(null);
+
+        /**
+         * Unset messages
+         */
+        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getMessages(true);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     *
+     * Check that customer id set and addresses saved
+     */
+    public function testSaveActionWithValidAddressData()
+    {
+        $customer = $this->customerRepository->get('customer5@example.com');
+        $customerId = $customer->getId();
+        $post = [
+            'parent_id' => $customerId,
+            'firstname' => 'test firstname',
+            'lastname' => 'test lastname',
+            'street' => ['test street'],
+            'city' => 'test city',
+            'region_id' => 10,
+            'country_id' => 'US',
+            'postcode' => '01001',
+            'telephone' => '+7000000001',
+        ];
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+
+        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
+
+        $this->customerAddress->execute();
+
+        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+        /** Check that customer data were cleaned after it was saved successfully*/
+        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
+
+        $customer = $this->customerRepository->getById($customerId);
+
+        $this->assertEquals('Firstname', $customer->getFirstname());
+        $addresses = $customer->getAddresses();
+        $this->assertCount(1, $addresses);
+        $this->assertNull($this->accountManagement->getDefaultBillingAddress($customerId));
+        $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     *
+     * Check that customer id set and addresses saved
+     */
+    public function testSaveActionWithDefaultShippingAndBilling()
+    {
+        $customer = $this->customerRepository->get('customer5@example.com');
+        $customerId = $customer->getId();
+        $post = [
+            'parent_id' => $customerId,
+            'firstname' => 'test firstname',
+            'lastname' => 'test lastname',
+            'street' => ['test street'],
+            'city' => 'test city',
+            'region_id' => 10,
+            'country_id' => 'US',
+            'postcode' => '01001',
+            'telephone' => '+7000000001',
+            'default_billing' => true,
+            'default_shipping' => true
+        ];
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+
+        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
+
+        $this->customerAddress->execute();
+        /**
+         * Check that errors was generated and set to session
+         */
+        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+        /**
+         * Check that customer data were cleaned after it was saved successfully
+         */
+        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
+
+        /**
+         * Remove stored customer from registry
+         */
+        $this->objectManager->get(\Magento\Customer\Model\CustomerRegistry::class)->remove($customerId);
+        $customer = $this->customerRepository->get('customer5@example.com');
+        $this->assertEquals('Firstname', $customer->getFirstname());
+        $addresses = $customer->getAddresses();
+        $this->assertCount(1, $addresses);
+
+        $this->assertNotNull($this->accountManagement->getDefaultBillingAddress($customerId));
+        $this->assertNotNull($this->accountManagement->getDefaultShippingAddress($customerId));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     *
+     * Check that customer id set and addresses saved
+     */
+    public function testSaveActionWithExistingAdresses()
+    {
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customerId = $customer->getId();
+        $post = [
+            'parent_id' => $customerId,
+            'firstname' => 'test firstname',
+            'lastname' => 'test lastname',
+            'street' => ['test street'],
+            'city' => 'test city',
+            'region_id' => 10,
+            'country_id' => 'US',
+            'postcode' => '01001',
+            'telephone' => '+7000000001',
+        ];
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+
+        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
+
+        $this->customerAddress->execute();
+        /**
+         * Check that errors was generated and set to session
+         */
+        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+        /**
+         * Check that customer data were cleaned after it was saved successfully
+         */
+        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
+
+        $customer = $this->customerRepository->getById($customerId);
+
+        $this->assertEquals('test firstname', $customer->getFirstname());
+        $addresses = $customer->getAddresses();
+        $this->assertCount(4, $addresses);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php
index f2ce433b4e931..4a75c8c85747c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Adminhtml\Cart\Product\Composite;
 
 /**
@@ -26,7 +27,10 @@ public function setUp()
     public function testConfigureActionNoCustomerId()
     {
         $this->dispatch('backend/customer/cart_product_composite_cart/configure');
-        $this->assertEquals('{"error":true,"message":"No customer ID defined."}', $this->getResponse()->getBody());
+        $this->assertEquals(
+            '{"error":true,"message":"The customer ID isn\'t defined."}',
+            $this->getResponse()->getBody()
+        );
     }
 
     /**
@@ -38,7 +42,7 @@ public function testConfigureActionNoQuoteId()
         $this->getRequest()->setParam('website_id', 1);
         $this->dispatch('backend/customer/cart_product_composite_cart/configure');
         $this->assertEquals(
-            '{"error":true,"message":"Please correct the quote items and try again."}',
+            '{"error":true,"message":"The quote items are incorrect. Verify the quote items and try again."}',
             $this->getResponse()->getBody()
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
index 28c8d7556270a..db1cc4995e676 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -25,6 +26,11 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
     /** @var  \Magento\Customer\Api\GroupRepositoryInterface */
     private $groupRepository;
 
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
     public function setUp()
     {
         parent::setUp();
@@ -33,12 +39,18 @@ public function setUp()
         $this->groupRepository = $objectManager->get(\Magento\Customer\Api\GroupRepositoryInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
     public function tearDown()
     {
         parent::tearDown();
         //$this->session->unsCustomerGroupData();
     }
 
+    /**
+     * Test new group form.
+     */
     public function testNewActionNoCustomerGroupDataInSession()
     {
         $this->dispatch('backend/customer/group/new');
@@ -49,6 +61,9 @@ public function testNewActionNoCustomerGroupDataInSession()
         $this->assertContains($expected, $responseBody);
     }
 
+    /**
+     * Test form filling with data in session.
+     */
     public function testNewActionWithCustomerGroupDataInSession()
     {
         /** @var \Magento\Customer\Api\Data\GroupInterfaceFactory $customerGroupFactory */
@@ -76,21 +91,27 @@ public function testNewActionWithCustomerGroupDataInSession()
     }
 
     /**
+     * Test calling delete without an ID.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testDeleteActionNoGroupId()
     {
+        $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST);
         $this->dispatch('backend/customer/group/delete');
         $this->assertRedirect($this->stringStartsWith(self::BASE_CONTROLLER_URL));
     }
 
     /**
+     * Test deleting a group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testDeleteActionExistingGroup()
     {
         $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE);
         $this->getRequest()->setParam('id', $groupId);
+        $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST);
         $this->dispatch('backend/customer/group/delete');
 
         /**
@@ -104,11 +125,14 @@ public function testDeleteActionExistingGroup()
     }
 
     /**
+     * Tet deleting with wrong ID.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testDeleteActionNonExistingGroupId()
     {
         $this->getRequest()->setParam('id', 10000);
+        $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST);
         $this->dispatch('backend/customer/group/delete');
 
         /**
@@ -122,6 +146,8 @@ public function testDeleteActionNonExistingGroupId()
     }
 
     /**
+     * Test saving a valid group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionExistingGroup()
@@ -130,6 +156,7 @@ public function testSaveActionExistingGroup()
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
         $this->getRequest()->setParam('id', $groupId);
         $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -161,31 +188,42 @@ public function testSaveActionExistingGroup()
         );
     }
 
+    /**
+     * Test saving an invalid group.
+     */
     public function testSaveActionCreateNewGroupWithoutCode()
     {
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
         $this->assertSessionMessages(
-            $this->equalTo(['code is a required field.']),
+            $this->equalTo(['"code" is required. Enter and try again.']),
             MessageInterface::TYPE_ERROR
         );
     }
 
+    /**
+     * Test saving an empty group.
+     */
     public function testSaveActionForwardNewCreateNewGroup()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/group/save');
         $responseBody = $this->getResponse()->getBody();
         $this->assertRegExp('/<h1 class\="page-title">\s*New Customer Group\s*<\/h1>/', $responseBody);
     }
 
     /**
+     * Test saving an existing group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionForwardNewEditExistingGroup()
     {
         $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', $groupId);
         $this->dispatch('backend/customer/group/save');
 
@@ -193,10 +231,14 @@ public function testSaveActionForwardNewEditExistingGroup()
         $this->assertRegExp('/<h1 class\="page-title">\s*' . self::CUSTOMER_GROUP_CODE . '\s*<\/h1>/', $responseBody);
     }
 
+    /**
+     * Test using an invalid ID.
+     */
     public function testSaveActionNonExistingGroupId()
     {
         $this->getRequest()->setParam('id', 10000);
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -211,6 +253,8 @@ public function testSaveActionNonExistingGroupId()
     }
 
     /**
+     * Test using existing code.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionNewGroupWithExistingGroupCode()
@@ -220,6 +264,7 @@ public function testSaveActionNewGroupWithExistingGroupCode()
 
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
         $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -232,6 +277,8 @@ public function testSaveActionNewGroupWithExistingGroupCode()
     }
 
     /**
+     * Test saving an invalid group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionNewGroupWithoutGroupCode()
@@ -240,11 +287,12 @@ public function testSaveActionNewGroupWithoutGroupCode()
         $originalCode = $this->groupRepository->getById($groupId)->getCode();
 
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
         $this->assertSessionMessages(
-            $this->equalTo(['code is a required field.']),
+            $this->equalTo(['"code" is required. Enter and try again.']),
             MessageInterface::TYPE_ERROR
         );
         $this->assertSessionMessages($this->isEmpty(), MessageInterface::TYPE_SUCCESS);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
index b2ecd5bf7c3a2..761064ed61fcf 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -3,15 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Backend\Model\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
  * @magentoAppArea adminhtml
  */
-class MassAssignGroupTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+class MassAssignGroupTest extends AbstractBackendController
 {
     /**
      * Base controller URL
@@ -25,88 +32,116 @@ class MassAssignGroupTest extends \Magento\TestFramework\TestCase\AbstractBacken
      */
     protected $customerRepository;
 
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
     protected function setUp()
     {
         parent::setUp();
-        $this->customerRepository = Bootstrap::getObjectManager()->get(
-            \Magento\Customer\Api\CustomerRepositoryInterface::class
-        );
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
          * Unset customer data
          */
-        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->setCustomerData(null);
+        Bootstrap::getObjectManager()->get(Session::class)->setCustomerData(null);
 
         /**
          * Unset messages
          */
-        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getMessages(true);
+        Bootstrap::getObjectManager()->get(Session::class)->getMessages(true);
     }
 
     /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * Tests os update a single customer record.
+     *
+     * @magentoDataFixture Magento/Customer/_files/five_repository_customers.php
+     * @magentoDbIsolation disabled
      */
     public function testMassAssignGroupAction()
     {
-        $customer = $this->customerRepository->getById(1);
+        $customerEmail = 'customer1@example.com';
+        /** @var CustomerInterface $customer */
+        $customer = $this->customerRepository->get($customerEmail);
         $this->assertEquals(1, $customer->getGroupId());
 
-        $this->getRequest()
-            ->setParam('group', 0)
-            ->setPostValue('namespace', 'customer_listing')
-            ->setPostValue('selected', [1]);
+        $params = [
+            'group' => 0,
+            'namespace' => 'customer_listing',
+            'selected' => [$customer->getId()]
+        ];
+
+        $this->getRequest()->setParams($params)
+            ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massAssignGroup');
         $this->assertSessionMessages(
-            $this->equalTo(['A total of 1 record(s) were updated.']),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+            self::equalTo(['A total of 1 record(s) were updated.']),
+            MessageInterface::TYPE_SUCCESS
         );
         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
 
-        $customer = $this->customerRepository->getById(1);
+        $customer = $this->customerRepository->get($customerEmail);
         $this->assertEquals(0, $customer->getGroupId());
     }
 
     /**
-     * @magentoDataFixture Magento/Customer/_files/twenty_one_customers.php
+     * Tests os update a multiple customer records.
+     *
+     * @magentoDataFixture Magento/Customer/_files/five_repository_customers.php
+     * @magentoDbIsolation disabled
      */
     public function testLargeGroupMassAssignGroupAction()
     {
-
-        for ($i = 1; $i < 22; $i++) {
-            $customer = $this->customerRepository->getById($i);
+        $ids = [];
+        for ($i = 1; $i <= 5; $i++) {
+            /** @var CustomerInterface $customer */
+            $customer = $this->customerRepository->get('customer' . $i . '@example.com');
             $this->assertEquals(1, $customer->getGroupId());
+            $ids[] = $customer->getId();
         }
 
-        $this->getRequest()
-            ->setParam('group', 0)
-            ->setPostValue('namespace', 'customer_listing')
-            ->setPostValue('selected', [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]);
+        $params = [
+            'group' => 0,
+            'namespace' => 'customer_listing',
+            'selected' => $ids,
+        ];
+
+        $this->getRequest()->setParams($params)
+            ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massAssignGroup');
         $this->assertSessionMessages(
-            $this->equalTo(['A total of 21 record(s) were updated.']),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+            self::equalTo(['A total of 5 record(s) were updated.']),
+            MessageInterface::TYPE_SUCCESS
         );
         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
-        for ($i = 1; $i < 22; $i++) {
-            $customer = $this->customerRepository->getById($i);
+        for ($i = 1; $i < 5; $i++) {
+            /** @var CustomerInterface $customer */
+            $customer = $this->customerRepository->get('customer' . $i . '@example.com');
             $this->assertEquals(0, $customer->getGroupId());
         }
     }
 
     /**
      * Valid group Id but no customer Ids specified
+     *
      * @magentoDbIsolation enabled
      */
     public function testMassAssignGroupActionNoCustomerIds()
     {
-        $this->getRequest()->setParam('group', 0)->setPostValue('namespace', 'customer_listing');
+        $params = ['group'=> 0,'namespace'=> 'customer_listing',
+        ];
+        $this->getRequest()->setParams($params)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massAssignGroup');
         $this->assertSessionMessages(
-            $this->equalTo(['Please select item(s).']),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+            $this->equalTo(['An item needs to be selected. Select and try again.']),
+            MessageInterface::TYPE_ERROR
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
index ace40f982e8fe..eea94bb3f9867 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
@@ -3,60 +3,171 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Backend\Model\Session;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use PHPUnit\Framework\Constraint\Constraint;
+use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
  * @magentoAppArea adminhtml
  */
-class MassDeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+class MassDeleteTest extends AbstractBackendController
 {
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * Base controller URL
      *
      * @var string
      */
-    protected $baseControllerUrl = 'http://localhost/index.php/backend/customer/index/index';
+    private $baseControllerUrl = 'http://localhost/index.php/backend/customer/index/index';
+
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+    }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
          * Unset customer data
          */
-        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->setCustomerData(null);
+        Bootstrap::getObjectManager()->get(Session::class)->setCustomerData(null);
 
         /**
          * Unset messages
          */
-        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getMessages(true);
+        Bootstrap::getObjectManager()->get(Session::class)->getMessages(true);
     }
 
     /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * Validates failure attempts to delete customers from grid.
+     *
+     * @param array|null $ids
+     * @param Constraint $constraint
+     * @param string|null $messageType
+     * @magentoDataFixture Magento/Customer/_files/five_repository_customers.php
+     * @magentoDbIsolation disabled
+     * @dataProvider failedRequestDataProvider
      */
-    public function testMassDeleteAction()
+    public function testFailedMassDeleteAction($ids, Constraint $constraint, $messageType)
     {
-        $this->getRequest()->setPostValue('selected', [1])->setPostValue('namespace', 'customer_listing');
-        $this->dispatch('backend/customer/index/massDelete');
-        $this->assertSessionMessages(
-            $this->equalTo(['A total of 1 record(s) were deleted.']),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        $this->massDeleteAssertions($ids, $constraint, $messageType);
+    }
+
+    /**
+     * Validates success attempt to delete customer from grid.
+     *
+     * @param array $emails
+     * @param Constraint $constraint
+     * @param string $messageType
+     * @magentoDataFixture Magento/Customer/_files/five_repository_customers.php
+     * @magentoDbIsolation disabled
+     * @dataProvider successRequestDataProvider
+     */
+    public function testSuccessMassDeleteAction(array $emails, Constraint $constraint, string $messageType)
+    {
+        $ids = [];
+        foreach ($emails as $email) {
+            /** @var CustomerInterface $customer */
+            $customer = $this->customerRepository->get($email);
+            $ids[] = $customer->getId();
+        }
+
+        $this->massDeleteAssertions(
+            $ids,
+            $constraint,
+            $messageType
         );
-        $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
     }
 
     /**
-     * Valid group Id but no customer Ids specified
-     * @magentoDbIsolation enabled
+     * Performs required request and assertions.
+     *
+     * @param array|null $ids
+     * @param Constraint $constraint
+     * @param string|null $messageType
      */
-    public function testMassDeleteActionNoCustomerIds()
+    private function massDeleteAssertions($ids, Constraint $constraint, $messageType)
     {
-        $this->getRequest()->setPostValue('namespace', 'customer_listing');
+        $requestData = [
+            'selected' => $ids,
+            'namespace' => 'customer_listing',
+        ];
+
+        $this->getRequest()->setParams($requestData)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massDelete');
         $this->assertSessionMessages(
-            $this->equalTo(['Please select item(s).']),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+            $constraint,
+            $messageType
         );
+        $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
+    }
+
+    /**
+     * Provides sets of data for unsuccessful attempts.
+     *
+     * @return array
+     */
+    public function failedRequestDataProvider(): array
+    {
+        return [
+            [
+                'ids' => [],
+                'constraint' => self::equalTo(['An item needs to be selected. Select and try again.']),
+                'messageType' => MessageInterface::TYPE_ERROR,
+            ],
+            [
+                'ids' => [111],
+                'constraint' => self::isEmpty(),
+                'messageType' => null,
+            ],
+            [
+                'ids' => null,
+                'constraint' => self::equalTo(['An item needs to be selected. Select and try again.']),
+                'messageType' => MessageInterface::TYPE_ERROR,
+            ]
+        ];
+    }
+
+    /**
+     * Provides sets of data for successful attempts.
+     *
+     * @return array
+     */
+    public function successRequestDataProvider(): array
+    {
+        return [
+            [
+                'customerEmails' => ['customer1@example.com'],
+                'constraint' => self::equalTo(['A total of 1 record(s) were deleted.']),
+                'messageType' => MessageInterface::TYPE_SUCCESS,
+            ],
+            [
+                'customerEmails' => ['customer2@example.com', 'customer3@example.com'],
+                'constraint' => self::equalTo(['A total of 2 record(s) were deleted.']),
+                'messageType' => MessageInterface::TYPE_SUCCESS,
+            ],
+        ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassSubscribeTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassSubscribeTest.php
index d09688e9cda79..c2fc7b1b58756 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassSubscribeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassSubscribeTest.php
@@ -3,10 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Backend\Model\Session;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 
 /**
  * @magentoAppArea adminhtml
@@ -25,58 +32,90 @@ protected function tearDown()
         /**
          * Unset customer data
          */
-        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->setCustomerData(null);
+        Bootstrap::getObjectManager()->get(Session::class)->setCustomerData(null);
 
         /**
          * Unset messages
          */
-        Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getMessages(true);
+        Bootstrap::getObjectManager()->get(Session::class)->getMessages(true);
     }
 
     /**
-     * @magentoDataFixture Magento/Customer/_files/two_customers.php
+     * Tests subscriber status of customers.
+     *
+     * @magentoDataFixture Magento/Customer/_files/five_repository_customers.php
+     * @magentoDbIsolation disabled
      */
     public function testMassSubscriberAction()
     {
-        // Pre-condition
-        /** @var \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory */
-        $subscriberFactory = Bootstrap::getObjectManager()->get(\Magento\Newsletter\Model\SubscriberFactory::class);
-        $this->assertNull($subscriberFactory->create()->loadByCustomerId(1)->getSubscriberStatus());
-        $this->assertNull($subscriberFactory->create()->loadByCustomerId(2)->getSubscriberStatus());
-        // Setup
-        $this->getRequest()->setPostValue('selected', [1, 2])->setPostValue('namespace', 'customer_listing');
+        /** @var SubscriberFactory $subscriberFactory */
+        $subscriberFactory = Bootstrap::getObjectManager()->get(SubscriberFactory::class);
+        $customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+
+        $this->assertNull(
+            $subscriberFactory->create()
+                ->loadByEmail('customer1@example.com')
+                ->getSubscriberStatus()
+        );
+        $this->assertNull(
+            $subscriberFactory->create()
+                ->loadByEmail('customer2@example.com')
+                ->getSubscriberStatus()
+        );
+
+        /** @var CustomerInterface $customer1 */
+        $customer1 = $customerRepository->get('customer1@example.com');
+        /** @var CustomerInterface $customer2 */
+        $customer2 = $customerRepository->get('customer2@example.com');
+
+        $params = [
+            'selected' => [
+                $customer1->getId(),
+                $customer2->getId(),
+            ],
+            'namespace' => 'customer_listing',
+        ];
+        $this->getRequest()->setParams($params);
 
-        // Test
         $this->dispatch('backend/customer/index/massSubscribe');
 
         // Assertions
         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
         $this->assertSessionMessages(
-            $this->equalTo(['A total of 2 record(s) were updated.']),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+            self::equalTo(['A total of 2 record(s) were updated.']),
+            MessageInterface::TYPE_SUCCESS
         );
         $this->assertEquals(
             Subscriber::STATUS_SUBSCRIBED,
-            $subscriberFactory->create()->loadByCustomerId(1)->getSubscriberStatus()
+            $subscriberFactory->create()
+                ->loadByEmail('customer1@example.com')
+                ->getSubscriberStatus()
         );
         $this->assertEquals(
             Subscriber::STATUS_SUBSCRIBED,
-            $subscriberFactory->create()->loadByCustomerId(2)->getSubscriberStatus()
+            $subscriberFactory->create()
+                ->loadByEmail('customer2@example.com')
+                ->getSubscriberStatus()
         );
     }
 
     /**
+     * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
      */
     public function testMassSubscriberActionNoSelection()
     {
-        $this->getRequest()->setPostValue('namespace', 'customer_listing');
+        $params = [
+            'namespace' => 'customer_listing'
+        ];
+
+        $this->getRequest()->setParams($params);
         $this->dispatch('backend/customer/index/massSubscribe');
 
         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
         $this->assertSessionMessages(
-            $this->equalTo(['Please select item(s).']),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+            self::equalTo(['An item needs to be selected. Select and try again.']),
+            MessageInterface::TYPE_ERROR
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
index b5ca783d68cf2..789978d8180d0 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * ResetPassword controller test.
  *
@@ -32,7 +34,7 @@ public function testResetPasswordSuccess()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -41,6 +43,23 @@ public function testResetPasswordSuccess()
         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl . 'edit'));
     }
 
+    /**
+     * Checks reset password functionality cannot be performed with POST request
+     *
+     * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
+     * @magentoConfigFixture current_store customer/password/min_time_between_password_reset_requests 0
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testResetPasswordWithPost()
+    {
+        $this->passwordResetRequestEventCreate(
+            \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
+        );
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/customer/index/resetPassword');
+        $this->assertEquals('noroute', $this->getRequest()->getControllerName());
+    }
+
     /**
      * Checks reset password functionality with default restrictive min time between
      * password reset requests and customer reset request event.
@@ -55,7 +74,7 @@ public function testResetPasswordMinTimeError()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -78,7 +97,7 @@ public function testResetPasswordLimitError()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -103,7 +122,7 @@ public function testResetPasswordWithSecurityViolationException()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index 769120127329e..292d61c392d06 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Adminhtml;
 
 use Magento\Customer\Api\AccountManagementInterface;
@@ -11,6 +12,7 @@
 use Magento\Customer\Controller\RegistryConstants;
 use Magento\Customer\Model\EmailNotification;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -43,6 +45,9 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
     /** @var \Magento\TestFramework\ObjectManager */
     protected $objectManager;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -66,6 +71,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
@@ -84,7 +92,7 @@ protected function tearDown()
      */
     public function testSaveActionWithEmptyPostData()
     {
-        $this->getRequest()->setPostValue([]);
+        $this->getRequest()->setPostValue([])->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/save');
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
     }
@@ -95,7 +103,7 @@ public function testSaveActionWithEmptyPostData()
     public function testSaveActionWithInvalidFormData()
     {
         $post = ['account' => ['middlename' => 'test middlename', 'group_id' => 1]];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/save');
         /**
          * Check that errors was generated and set to session
@@ -104,229 +112,16 @@ public function testSaveActionWithInvalidFormData()
             $this->logicalNot($this->isEmpty()),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
+        /** @var \Magento\Backend\Model\Session $session */
+        $session = $this->objectManager->get(\Magento\Backend\Model\Session::class);
         /**
          * Check that customer data were set to session
          */
-        $this->assertEquals(
-            $post,
-            $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
-        );
+        $this->assertNotEmpty($session->getCustomerFormData());
+        $this->assertArraySubset($post, $session->getCustomerFormData());
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
     }
 
-    /**
-     * @magentoDbIsolation enabled
-     */
-    public function testSaveActionWithInvalidCustomerAddressData()
-    {
-        $post = [
-            'customer' => [
-                'middlename' => 'test middlename',
-                'group_id' => 1,
-                'website_id' => 0,
-                'firstname' => 'test firstname',
-                'lastname' => 'test lastname',
-                'email' => 'example@domain.com',
-                'default_billing' => '_item1',
-            ],
-            'address' => ['_item1' => []],
-        ];
-        $this->getRequest()->setPostValue($post);
-        $this->dispatch('backend/customer/index/save');
-        /**
-         * Check that errors was generated and set to session
-         */
-        $this->assertSessionMessages(
-            $this->logicalNot($this->isEmpty()),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-        );
-        /**
-         * Check that customer data were set to session
-         */
-        $this->assertEquals(
-            $post,
-            $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
-        );
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
-    }
-
-    /**
-     * @magentoDbIsolation enabled
-     */
-    public function testSaveActionWithValidCustomerDataAndValidAddressData()
-    {
-        $post = [
-            'customer' => [
-                'middlename' => 'test middlename',
-                'group_id' => 1,
-                'website_id' => 0,
-                'firstname' => 'test firstname',
-                'lastname' => 'test lastname',
-                'email' => 'example@domain.com',
-                'default_billing' => '_item1',
-                'password' => 'password',
-            ],
-            'address' => [
-                '_item1' => [
-                    'firstname' => 'test firstname',
-                    'lastname' => 'test lastname',
-                    'street' => ['test street'],
-                    'city' => 'test city',
-                    'region_id' => 10,
-                    'country_id' => 'US',
-                    'postcode' => '01001',
-                    'telephone' => '+7000000001',
-                    'default_billing' => 'true',
-                ],
-            ],
-        ];
-        $this->getRequest()->setPostValue($post);
-        $this->getRequest()->setParam('back', '1');
-
-        // Emulate setting customer data to session in editAction
-        $this->objectManager->get(\Magento\Backend\Model\Session::class)->setCustomerFormData($post);
-
-        $this->dispatch('backend/customer/index/save');
-        /**
-         * Check that errors was generated and set to session
-         */
-        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
-
-        /**
-         * Check that customer data were cleaned after it was saved successfully
-         */
-        $this->assertEmpty($this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerData());
-
-        /**
-         * Check that success message is set
-         */
-        $this->assertSessionMessages(
-            $this->logicalNot($this->isEmpty()),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-        );
-
-        /**
-         * Check that customer id set and addresses saved
-         */
-        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
-        $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
-        $customer = $this->customerRepository->getById($customerId);
-        $this->assertEquals('test firstname', $customer->getFirstname());
-        $addresses = $customer->getAddresses();
-        $this->assertEquals(1, count($addresses));
-        $this->assertNotEquals(0, $this->accountManagement->getDefaultBillingAddress($customerId));
-        $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
-
-        $this->assertRedirect(
-            $this->stringStartsWith($this->_baseControllerUrl . 'edit/id/' . $customerId . '/back/1')
-        );
-
-        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
-        $this->assertEmpty($subscriber->getId());
-        $subscriber->loadByCustomerId($customerId);
-        $this->assertEmpty($subscriber->getId());
-    }
-
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
-     */
-    public function testSaveActionExistingCustomerAndExistingAddressData()
-    {
-        $post = [
-            'customer' => [
-                'entity_id' => '1',
-                'middlename' => 'test middlename',
-                'group_id' => 1,
-                'website_id' => 1,
-                'firstname' => 'test firstname',
-                'lastname' => 'test lastname',
-                'email' => 'customer@example.com',
-                'new_password' => 'auto',
-                'sendemail_store_id' => '1',
-                'sendemail' => '1',
-                'created_at' => '2000-01-01 00:00:00',
-                'default_shipping' => '_item1',
-                'default_billing' => 1,
-            ],
-            'address' => [
-                '1' => [
-                    'firstname' => 'update firstname',
-                    'lastname' => 'update lastname',
-                    'street' => ['update street'],
-                    'city' => 'update city',
-                    'region_id' => 10,
-                    'country_id' => 'US',
-                    'postcode' => '01001',
-                    'telephone' => '+7000000001',
-                    'default_billing' => 'true',
-                ],
-                '_item1' => [
-                    'firstname' => 'new firstname',
-                    'lastname' => 'new lastname',
-                    'street' => ['new street'],
-                    'city' => 'new city',
-                    'region_id' => 10,
-                    'country_id' => 'US',
-                    'postcode' => '01001',
-                    'telephone' => '+7000000001',
-                    'default_shipping' => 'true',
-                ],
-                '_template_' => [
-                    'firstname' => '',
-                    'lastname' => '',
-                    'street' => [],
-                    'city' => '',
-                    'region_id' => 10,
-                    'country_id' => 'US',
-                    'postcode' => '',
-                    'telephone' => '',
-                ],
-            ],
-            'subscription' => '',
-        ];
-        $this->getRequest()->setPostValue($post);
-        $this->getRequest()->setParam('id', 1);
-        $this->dispatch('backend/customer/index/save');
-
-        /** Check that success message is set */
-        $this->assertSessionMessages(
-            $this->equalTo(['You saved the customer.']),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-        );
-
-        /** Check that customer id set and addresses saved */
-        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
-        $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
-        $customer = $this->customerRepository->getById($customerId);
-        $this->assertEquals('test firstname', $customer->getFirstname());
-
-        /**
-         * Addresses should be removed by
-         * \Magento\Customer\Model\ResourceModel\Customer::_saveAddresses during _afterSave
-         * addressOne - updated
-         * addressTwo - removed
-         * addressThree - removed
-         * _item1 - new address
-         */
-        $addresses = $customer->getAddresses();
-        $this->assertEquals(2, count($addresses));
-        $updatedAddress = $this->addressRepository->getById(1);
-        $this->assertEquals('update firstname', $updatedAddress->getFirstname());
-        $this->assertTrue($updatedAddress->isDefaultBilling());
-        $this->assertEquals($updatedAddress->getId(), $customer->getDefaultBilling());
-        $newAddress = $this->accountManagement->getDefaultShippingAddress($customerId);
-        $this->assertEquals('new firstname', $newAddress->getFirstname());
-
-        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
-        $this->assertEmpty($subscriber->getId());
-        $subscriber->loadByCustomerId($customerId);
-        $this->assertNotEmpty($subscriber->getId());
-        $this->assertEquals(1, $subscriber->getStatus());
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
-    }
-
     /**
      * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
      */
@@ -347,10 +142,11 @@ public function testSaveActionExistingCustomerUnsubscribeNewsletter()
                 'email' => 'customer@example.com',
                 'firstname' => 'test firstname',
                 'lastname' => 'test lastname',
+                'sendemail_store_id' => 1
             ],
             'subscription' => '0'
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/save');
 
@@ -386,13 +182,17 @@ public function testSaveActionExistingCustomerChangeEmail()
         $transportBuilderMock = $this->prepareEmailMock(
             2,
             'change_email_template',
-            'support',
+            [
+                'name' => 'CustomerSupport',
+                'email' => 'support@example.com',
+            ],
             $customerId,
             $newEmail
         );
         $this->addEmailMockToClass($transportBuilderMock, EmailNotification::class);
         $post = [
-            'customer' => ['entity_id' => $customerId,
+            'customer' => [
+                'entity_id' => $customerId,
                 'middlename' => 'test middlename',
                 'group_id' => 1,
                 'website_id' => 1,
@@ -407,7 +207,7 @@ public function testSaveActionExistingCustomerChangeEmail()
                 'default_billing' => 1,
             ]
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/save');
 
@@ -432,7 +232,10 @@ public function testInlineEditChangeEmail()
         $transportBuilderMock = $this->prepareEmailMock(
             2,
             'change_email_template',
-            'support',
+            [
+                'name' => 'CustomerSupport',
+                'email' => 'support@example.com',
+            ],
             $customerId,
             $newEmail
         );
@@ -451,7 +254,7 @@ public function testInlineEditChangeEmail()
             ]
         ];
         $this->getRequest()->setParam('ajax', true)->setParam('isAjax', true);
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/inlineEdit');
 
@@ -477,16 +280,16 @@ public function testSaveActionCoreException()
                 'password' => 'password',
             ],
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/save');
         /*
          * Check that error message is set
          */
         $this->assertSessionMessages(
-            $this->equalTo(['A customer with the same email already exists in an associated website.']),
+            $this->equalTo(['A customer with the same email address already exists in an associated website.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
-        $this->assertEquals(
+        $this->assertArraySubset(
             $post,
             Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
         );
@@ -506,6 +309,9 @@ public function testEditAction()
         $this->assertContains('<h1 class="page-title">test firstname test lastname</h1>', $body);
     }
 
+    /**
+     * Test new customer form page.
+     */
     public function testNewAction()
     {
         $this->dispatch('backend/customer/index/edit');
@@ -518,7 +324,7 @@ public function testNewAction()
     /**
      * Test the editing of a new customer that has not been saved but the page has been reloaded
      */
-    public function testNewActionWithCustomerData()
+    public function te1stNewActionWithCustomerData()
     {
         $customerData = [
             'customer_id' => 0,
@@ -641,7 +447,7 @@ public function testValidateCustomerWithAddressSuccess()
         /**
          * set customer data
          */
-        $this->getRequest()->setParams($customerData);
+        $this->getRequest()->setParams($customerData)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/validate');
         $body = $this->getResponse()->getBody();
 
@@ -653,68 +459,13 @@ public function testValidateCustomerWithAddressSuccess()
         $this->assertEquals('{"error":0}', $body);
     }
 
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDataFixture Magento/Customer/_files/customer_address.php
-     */
-    public function testValidateCustomerWithAddressFailure()
-    {
-        $customerData = [
-            'customer' => [
-                'entity_id' => '1',
-                'middlename' => 'new middlename',
-                'group_id' => 1,
-                'website_id' => 1,
-                'firstname' => '',
-                'lastname' => '',
-                'email' => '*',
-                'default_shipping' => '_item1',
-                'new_password' => 'auto',
-                'sendemail_store_id' => '1',
-                'sendemail' => '1',
-            ],
-            'address' => [
-                '1' => [
-                    'firstname' => '',
-                    'lastname' => '',
-                    'street' => ['update street'],
-                    'city' => 'update city',
-                    'postcode' => '01001',
-                    'telephone' => '',
-                ],
-                '_template_' => [
-                    'lastname' => '',
-                    'street' => [],
-                    'city' => '',
-                    'country_id' => 'US',
-                    'postcode' => '',
-                    'telephone' => '',
-                ],
-            ],
-        ];
-        /**
-         * set customer data
-         */
-        $this->getRequest()->setPostValue($customerData);
-        $this->dispatch('backend/customer/index/validate');
-        $body = $this->getResponse()->getBody();
-
-        $this->assertContains('{"error":true,"messages":', $body);
-        $this->assertContains('\"First Name\" is a required value', $body);
-        $this->assertContains('\"First Name\" length must be equal or greater than 1 characters', $body);
-        $this->assertContains('\"Last Name\" is a required value.', $body);
-        $this->assertContains('\"Last Name\" length must be equal or greater than 1 characters.', $body);
-        $this->assertContains('\"Country\" is a required value.', $body);
-        $this->assertContains('\"Phone Number\" is a required value.', $body);
-        $this->assertContains('\"Phone Number\" length must be equal or greater than 1 characters.', $body);
-    }
-
     /**
      * @magentoDbIsolation enabled
      */
     public function testResetPasswordActionNoCustomerId()
     {
         // No customer ID in post, will just get redirected to base
+        $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
     }
@@ -725,6 +476,7 @@ public function testResetPasswordActionNoCustomerId()
     public function testResetPasswordActionBadCustomerId()
     {
         // Bad customer ID in post, will just get redirected to base
+        $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
         $this->getRequest()->setPostValue(['customer_id' => '789']);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
@@ -736,6 +488,7 @@ public function testResetPasswordActionBadCustomerId()
     public function testResetPasswordActionSuccess()
     {
         $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -745,18 +498,23 @@ public function testResetPasswordActionSuccess()
     }
 
     /**
-     * Prepare email mock to test emails
+     * Prepare email mock to test emails.
      *
      * @param int $occurrenceNumber
      * @param string $templateId
-     * @param string $sender
+     * @param array $sender
      * @param int $customerId
      * @param string|null $newEmail
      * @return \PHPUnit_Framework_MockObject_MockObject
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
-    protected function prepareEmailMock($occurrenceNumber, $templateId, $sender, $customerId, $newEmail = null)
-    {
+    protected function prepareEmailMock(
+        int $occurrenceNumber,
+        string $templateId,
+        array $sender,
+        int $customerId,
+        $newEmail = null
+    ) : \PHPUnit_Framework_MockObject_MockObject {
         $area = \Magento\Framework\App\Area::AREA_FRONTEND;
         $customer = $this->customerRepository->getById($customerId);
         $storeId = $customer->getStoreId();
@@ -776,7 +534,7 @@ protected function prepareEmailMock($occurrenceNumber, $templateId, $sender, $cu
                     'setTemplateIdentifier',
                     'setTemplateVars',
                     'setTemplateOptions',
-                    'getTransport'
+                    'getTransport',
                 ]
             )
             ->getMock();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
index 97c5fe0b5b064..3db22b8379850 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
@@ -11,9 +11,11 @@ class LoadTest extends \Magento\TestFramework\TestCase\AbstractController
     public function testLoadInvalidSection()
     {
         $expected = [
-            'message' => '&quot;section&lt;invalid&quot; section source is not supported',
+            'message' => 'The &quot;section&lt;invalid&quot; section source isn&#039;t supported.',
         ];
-        $this->dispatch('/customer/section/load/?sections=section<invalid&update_section_id=false&_=147066166394');
+        $this->dispatch(
+            '/customer/section/load/?sections=section<invalid&force_new_section_timestamp=false&_=147066166394'
+        );
         self::assertEquals(json_encode($expected), $this->getResponse()->getBody());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/address_data.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/address_data.php
new file mode 100644
index 0000000000000..62b7fab906c57
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/address_data.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    [
+        'telephone' => 3468676,
+        'postcode' => 90230,
+        'country_id' => 'US',
+        'city' => 'Culver City',
+        'street' => 'Green str, 67',
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+        'region_id' => 12,
+    ],
+    [
+        'telephone' => 845454465,
+        'postcode' => 10178,
+        'country_id' => 'DE',
+        'city' => 'Berlin',
+        'street' => ['Tunnel Alexanderpl'],
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses.php
new file mode 100644
index 0000000000000..24a99638c64f0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/address_data.php';
+
+/** @var AddressRepositoryInterface $repository */
+$repository = $objectManager->get(AddressRepositoryInterface::class);
+foreach ($addressData as $data) {
+    /** @var AddressInterface $address */
+    $address = $objectManager->create(AddressInterface::class, ['data' => $data]);
+    $address->setCustomerId($customer->getId());
+    $repository->save($address);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses_rollback.php
new file mode 100644
index 0000000000000..9e29bd77e2bc5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_2_addresses_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website.php
new file mode 100644
index 0000000000000..781bcec1670f3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Store/_files/websites_different_countries.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CustomerInterface $customer */
+$customer = $objectManager->create(CustomerInterface::class);
+$customer->setWebsiteId($websiteId)
+    ->setEmail('customer.web@example.com')
+    ->setGroupId(1)
+    ->setStoreId($store->getId())
+    ->setFirstname('John')
+    ->setLastname('Doe')
+    ->setGender(1);
+
+/** @var $repository CustomerRepositoryInterface */
+$repository = $objectManager->get(CustomerRepositoryInterface::class);
+$customer = $repository->save($customer);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
new file mode 100644
index 0000000000000..5dafc0dcae3ef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/customer_sec_website.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/address_data.php';
+
+/** @var AddressRepositoryInterface $repository */
+$repository = $objectManager->get(AddressRepositoryInterface::class);
+foreach ($addressData as $data) {
+    /** @var AddressInterface $address */
+    $address = $objectManager->create(AddressInterface::class, ['data' => $data]);
+    $address->setCustomerId($customer->getId());
+    $repository->save($address);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses_rollback.php
new file mode 100644
index 0000000000000..77f1b5d07366e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_2_addresses_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/customer_sec_website_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_rollback.php
new file mode 100644
index 0000000000000..a5aab4132278a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Fixtures/customer_sec_website_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$website = $websiteRepository->get('test');
+
+/** @var $repository CustomerRepositoryInterface */
+$repository = $objectManager->get(CustomerRepositoryInterface::class);
+$customer = $repository->get('customer.web@example.com', $website->getId());
+$repository->delete($customer);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Store/_files/websites_different_countries_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
index 865a190f077b2..4810b6c28caef 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
@@ -179,7 +179,7 @@ public function testChangePassword()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      *
      * @expectedException \Magento\Framework\Exception\InvalidEmailOrPasswordException
-     * @expectedExceptionMessage The password doesn't match this account.
+     * @expectedExceptionMessage The password doesn't match this account. Verify the password and try again.
      */
     public function testChangePasswordWrongPassword()
     {
@@ -301,9 +301,9 @@ public function testValidateResetPasswordLinkTokenInvalid()
             $this->accountManagement->validateResetPasswordLinkToken(1, $invalidToken);
             $this->fail('Expected exception not thrown.');
         } catch (InputException $ie) {
-            $this->assertEquals('%fieldName is a required field.', $ie->getRawMessage());
-            $this->assertEquals('resetPasswordLinkToken is a required field.', $ie->getMessage());
-            $this->assertEquals('resetPasswordLinkToken is a required field.', $ie->getLogMessage());
+            $this->assertEquals('"%fieldName" is required. Enter and try again.', $ie->getRawMessage());
+            $this->assertEquals('"resetPasswordLinkToken" is required. Enter and try again.', $ie->getMessage());
+            $this->assertEquals('"resetPasswordLinkToken" is required. Enter and try again.', $ie->getLogMessage());
             $this->assertEmpty($ie->getErrors());
         }
     }
@@ -350,13 +350,36 @@ public function testValidateResetPasswordLinkTokenNull()
             $this->accountManagement->validateResetPasswordLinkToken(1, null);
             $this->fail('Expected exception not thrown.');
         } catch (InputException $ie) {
-            $this->assertEquals('%fieldName is a required field.', $ie->getRawMessage());
-            $this->assertEquals('resetPasswordLinkToken is a required field.', $ie->getMessage());
-            $this->assertEquals('resetPasswordLinkToken is a required field.', $ie->getLogMessage());
+            $this->assertEquals('"%fieldName" is required. Enter and try again.', $ie->getRawMessage());
+            $this->assertEquals('"resetPasswordLinkToken" is required. Enter and try again.', $ie->getMessage());
+            $this->assertEquals('"resetPasswordLinkToken" is required. Enter and try again.', $ie->getLogMessage());
             $this->assertEmpty($ie->getErrors());
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testValidateResetPasswordLinkTokenWithoutId()
+    {
+        $token = 'randomStr123';
+        $this->setResetPasswordData($token, 'Y-m-d H:i:s');
+        $this->assertTrue(
+            $this->accountManagement->validateResetPasswordLinkToken(null, $token)
+        );
+    }
+    /**
+     * @magentoDataFixture Magento/Customer/_files/two_customers.php
+     * @expectedException \Magento\Framework\Exception\State\ExpiredException
+     */
+    public function testValidateResetPasswordLinkTokenAmbiguous()
+    {
+        $token = 'randomStr123';
+        $this->setResetPasswordData($token, 'Y-m-d H:i:s', 1);
+        $this->setResetPasswordData($token, 'Y-m-d H:i:s', 2);
+        $this->accountManagement->validateResetPasswordLinkToken(null, $token);
+    }
+
     /**
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
@@ -449,7 +472,7 @@ public function testResetPasswordTokenExpired()
             $this->accountManagement->resetPassword('customer@example.com', $resetToken, $password);
             $this->fail('Expected exception not thrown.');
         } catch (ExpiredException $e) {
-            $this->assertEquals('Reset password token expired.', $e->getMessage());
+            $this->assertEquals('The password token is expired. Reset and try again.', $e->getMessage());
         }
     }
 
@@ -468,9 +491,9 @@ public function testResetPasswordTokenInvalid()
             $this->accountManagement->resetPassword('customer@example.com', $invalidToken, $password);
             $this->fail('Expected exception not thrown.');
         } catch (InputException $ie) {
-            $this->assertEquals('%fieldName is a required field.', $ie->getRawMessage());
-            $this->assertEquals('resetPasswordLinkToken is a required field.', $ie->getMessage());
-            $this->assertEquals('resetPasswordLinkToken is a required field.', $ie->getLogMessage());
+            $this->assertEquals('"%fieldName" is required. Enter and try again.', $ie->getRawMessage());
+            $this->assertEquals('"resetPasswordLinkToken" is required. Enter and try again.', $ie->getMessage());
+            $this->assertEquals('"resetPasswordLinkToken" is required. Enter and try again.', $ie->getLogMessage());
             $this->assertEmpty($ie->getErrors());
         }
     }
@@ -512,6 +535,31 @@ public function testResetPasswordTokenInvalidUserEmail()
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testResetPasswordWithoutEmail()
+    {
+        $resetToken = 'lsdj579slkj5987slkj595lkj';
+        $password = 'new_Password123';
+        $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s');
+        $this->assertTrue(
+            $this->accountManagement->resetPassword(null, $resetToken, $password)
+        );
+    }
+    /**
+     * @magentoDataFixture Magento/Customer/_files/two_customers.php
+     * @expectedException \Magento\Framework\Exception\State\ExpiredException
+     */
+    public function testResetPasswordAmbiguousToken()
+    {
+        $resetToken = 'lsdj579slkj5987slkj595lkj';
+        $password = 'new_Password123';
+        $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s', 1);
+        $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s', 2);
+        $this->accountManagement->resetPassword(null, $resetToken, $password);
+    }
+
     /**
      * @magentoAppArea frontend
      * @magentoAppIsolation enabled
@@ -576,7 +624,7 @@ public function testCreateCustomerException()
             $this->accountManagement->createAccount($customerEntity);
             $this->fail('Expected exception not thrown');
         } catch (InputException $ie) {
-            $this->assertEquals('Please enter a customer email.', $ie->getMessage());
+            $this->assertEquals('The customer email is missing. Enter and try again.', $ie->getMessage());
         }
     }
 
@@ -960,10 +1008,14 @@ public function testGetDefaultAddressesForNonExistentAddress()
      *
      * @param $resetToken
      * @param $date
+     * @param int $customerIdFromFixture Which customer to use.
+     * @throws \Exception
      */
-    protected function setResetPasswordData($resetToken, $date)
-    {
-        $customerIdFromFixture = 1;
+    protected function setResetPasswordData(
+        $resetToken,
+        $date,
+        int $customerIdFromFixture = 1
+    ) {
         /** @var \Magento\Customer\Model\Customer $customerModel */
         $customerModel = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
         $customerModel->load($customerIdFromFixture);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index d88c0934e3f69..794fce17480fa 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -51,16 +51,23 @@ protected function setUp()
 
     public function testGetCustomAttributesMetadata()
     {
-        $customAttributesMetadata = $this->service->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata, "Invalid number of attributes returned.");
+        $customAttributesMetadataQty = count($this->service->getCustomAttributesMetadata()) ;
 
         // Verify the consistency of getCustomerAttributeMetadata() function from the 2nd call of the same service
-        $customAttributesMetadata1 = $this->service->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata1, "Invalid number of attributes returned.");
+        $customAttributesMetadata1Qty = count($this->service->getCustomAttributesMetadata());
+        $this->assertEquals(
+            $customAttributesMetadataQty,
+            $customAttributesMetadata1Qty,
+            "Invalid number of attributes returned."
+        );
 
         // Verify the consistency of getCustomAttributesMetadata() function from the 2nd service
-        $customAttributesMetadata2 = $this->serviceTwo->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata2, "Invalid number of attributes returned.");
+        $customAttributesMetadata2Qty = count($this->serviceTwo->getCustomAttributesMetadata());
+        $this->assertEquals(
+            $customAttributesMetadataQty,
+            $customAttributesMetadata2Qty,
+            "Invalid number of attributes returned."
+        );
     }
 
     public function testGetNestedOptionsCustomerAttributesMetadata()
@@ -159,7 +166,7 @@ public function testGetCustomAttributesMetadataWithCustomAttributes()
         );
 
         // Verify the consistency of custom attribute metadata from two services
-        // after getAttrbiuteCode was called
+        // after getAttributeCode was called
         foreach ($customAttributesMetadata2 as $attribute) {
             $attribute->getAttributeCode();
         }
@@ -231,6 +238,12 @@ public function testGetCustomerAttributeMetadata()
         );
         $this->assertNotEmpty($attributes);
 
+        // remove odd extension attributes
+        $allAtrributes = $expectAttrsWithVals;
+        $allAtrributes['created_at'] = $attributes['created_at'];
+        $allAtrributes['updated_at'] = $attributes['updated_at'];
+        $attributes = array_intersect_key($attributes, $allAtrributes);
+
         foreach ($attributes as $attributeCode => $attributeValue) {
             $this->assertNotNull($attributeCode);
             $this->assertNotNull($attributeValue);
@@ -256,7 +269,7 @@ public function testGetCustomerAttributeMetadata()
             $this->assertEquals(
                 $attributeMetadata,
                 $attributeMetadata1,
-                'Attribute metadata from the the same service became different after getAttributeCode was called'
+                'Attribute metadata from the same service became different after getAttributeCode was called'
             );
             // Verify the consistency of attribute metadata from two services
             // after getAttributeCode was called
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
index 46cdf77860723..4177698389850 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
@@ -7,13 +7,16 @@
 namespace Magento\Customer\Model\ResourceModel;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 
 /**
- * Integration test for \Magento\Customer\Model\ResourceModel\AddressRepository
- *
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -24,37 +27,37 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
     private $repository;
 
     /** @var \Magento\Framework\ObjectManagerInterface */
-    private $_objectManager;
+    private $objectManager;
 
     /** @var \Magento\Customer\Model\Data\Address[] */
-    private $_expectedAddresses;
+    private $expectedAddresses;
 
     /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory */
-    private $_addressFactory;
+    private $addressFactory;
 
     /** @var  \Magento\Framework\Api\DataObjectHelper */
-    protected $dataObjectHelper;
+    private $dataObjectHelper;
 
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         /* @var \Magento\Framework\Config\CacheInterface $cache */
-        $cache = $this->_objectManager->create(\Magento\Framework\Config\CacheInterface::class);
+        $cache = $this->objectManager->create(\Magento\Framework\Config\CacheInterface::class);
         $cache->remove('extension_attributes_config');
 
-        $this->repository = $this->_objectManager->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
-        $this->_addressFactory = $this->_objectManager->create(
+        $this->repository = $this->objectManager->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
+        $this->addressFactory = $this->objectManager->create(
             \Magento\Customer\Api\Data\AddressInterfaceFactory::class
         );
-        $this->dataObjectHelper = $this->_objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
+        $this->dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
 
-        $regionFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\RegionInterfaceFactory::class);
+        $regionFactory = $this->objectManager->get(RegionInterfaceFactory::class);
         $region = $regionFactory->create()
             ->setRegionCode('AL')
             ->setRegion('Alabama')
             ->setRegionId(1);
-        $address = $this->_addressFactory->create()
+        $address = $this->addressFactory->create()
             ->setId('1')
             ->setCountryId('US')
             ->setCustomerId('1')
@@ -67,7 +70,7 @@ protected function setUp()
             ->setFirstname('John')
             ->setLastname('Smith')
             ->setCompany('CompanyName');
-        $address2 = $this->_addressFactory->create()
+        $address2 = $this->addressFactory->create()
             ->setId('2')
             ->setCountryId('US')
             ->setCustomerId('1')
@@ -80,7 +83,7 @@ protected function setUp()
             ->setFirstname('John')
             ->setLastname('Smith');
 
-        $this->_expectedAddresses = [$address, $address2];
+        $this->expectedAddresses = [$address, $address2];
     }
 
     protected function tearDown()
@@ -109,7 +112,7 @@ public function testSaveAddressChanges()
         $this->assertEquals(2, $proposedAddress->getId());
 
         $savedAddress = $this->repository->getById(2);
-        $this->assertNotEquals($this->_expectedAddresses[1]->getTelephone(), $savedAddress->getTelephone());
+        $this->assertNotEquals($this->expectedAddresses[1]->getTelephone(), $savedAddress->getTelephone());
     }
 
     /**
@@ -136,7 +139,7 @@ public function testGetAddressById()
     {
         $addressId = 2;
         $address = $this->repository->getById($addressId);
-        $this->assertEquals($this->_expectedAddresses[1], $address);
+        $this->assertEquals($this->expectedAddresses[1], $address);
     }
 
     /**
@@ -163,9 +166,15 @@ public function testSaveNewAddress()
 
         $savedAddress = $this->repository->getById($returnedAddress->getId());
 
-        $expectedNewAddress = $this->_expectedAddresses[1];
+        $expectedNewAddress = $this->expectedAddresses[1];
         $expectedNewAddress->setId($savedAddress->getId());
-        $expectedNewAddress->setRegion($this->_expectedAddresses[1]->getRegion());
+        $expectedNewAddress->setRegion($this->expectedAddresses[1]->getRegion());
+
+        $this->assertEquals($expectedNewAddress->getExtensionAttributes(), $savedAddress->getExtensionAttributes());
+        $this->assertEquals(
+            $expectedNewAddress->getRegion()->getExtensionAttributes(),
+            $savedAddress->getRegion()->getExtensionAttributes()
+        );
         $this->assertEquals($expectedNewAddress, $savedAddress);
     }
 
@@ -213,8 +222,8 @@ public function testSaveNewInvalidAddress()
             $this->assertEquals('One or more input exceptions have occurred.', $exception->getMessage());
             $errors = $exception->getErrors();
             $this->assertCount(2, $errors);
-            $this->assertEquals('firstname is a required field.', $errors[0]->getLogMessage());
-            $this->assertEquals('lastname is a required field.', $errors[1]->getLogMessage());
+            $this->assertEquals('"firstname" is required. Enter and try again.', $errors[0]->getLogMessage());
+            $this->assertEquals('"lastname" is required. Enter and try again.', $errors[1]->getLogMessage());
         }
     }
 
@@ -314,7 +323,7 @@ public function testDeleteAddressFromCustomerBadAddressId()
     public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult)
     {
         /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
-        $searchBuilder = $this->_objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+        $searchBuilder = $this->objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
         foreach ($filters as $filter) {
             $searchBuilder->addFilters([$filter]);
         }
@@ -416,6 +425,34 @@ public function searchAddressDataProvider()
         ];
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website.php
+     */
+    public function testSaveAddressWithRestrictedCountries()
+    {
+        $website = $this->getWebsite('test');
+        $customer = $this->getCustomer('customer.web@example.com', (int)$website->getId());
+        $regionFactory = $this->objectManager->get(RegionInterfaceFactory::class);
+        $region = $regionFactory->create()
+            ->setRegionCode('CA')
+            ->setRegion('California')
+            ->setRegionId(12);
+        $addressData = [
+            'customer_id' => $customer->getId(),
+            'firstname' => 'John',
+            'lastname' => 'Doe',
+            'street' => ['6161 Main Street'],
+            'city' => 'Culver City',
+            'country_id' => 'US',
+            'region' => $region,
+            'postcode' => 90230,
+            'telephone' => '555655431'
+        ];
+        $address = $this->addressFactory->create(['data' => $addressData]);
+        $saved = $this->repository->save($address);
+        self::assertNotEmpty($saved->getId());
+    }
+
     /**
      * Helper function that returns an Address Data Object that matches the data from customer_address fixture
      *
@@ -423,14 +460,14 @@ public function searchAddressDataProvider()
      */
     private function _createFirstAddress()
     {
-        $address = $this->_addressFactory->create();
+        $address = $this->addressFactory->create();
         $this->dataObjectHelper->mergeDataObjects(
             \Magento\Customer\Api\Data\AddressInterface::class,
             $address,
-            $this->_expectedAddresses[0]
+            $this->expectedAddresses[0]
         );
         $address->setId(null);
-        $address->setRegion($this->_expectedAddresses[0]->getRegion());
+        $address->setRegion($this->expectedAddresses[0]->getRegion());
         return $address;
     }
 
@@ -441,14 +478,44 @@ private function _createFirstAddress()
      */
     private function _createSecondAddress()
     {
-        $address = $this->_addressFactory->create();
+        $address = $this->addressFactory->create();
         $this->dataObjectHelper->mergeDataObjects(
             \Magento\Customer\Api\Data\AddressInterface::class,
             $address,
-            $this->_expectedAddresses[1]
+            $this->expectedAddresses[1]
         );
         $address->setId(null);
-        $address->setRegion($this->_expectedAddresses[1]->getRegion());
+        $address->setRegion($this->expectedAddresses[1]->getRegion());
         return $address;
     }
+
+    /**
+     * Gets customer entity.
+     *
+     * @param string $email
+     * @param int $websiteId
+     * @return CustomerInterface
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getCustomer(string $email, int $websiteId): CustomerInterface
+    {
+        /** @var CustomerRepositoryInterface $repository */
+        $repository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        return $repository->get($email, $websiteId);
+    }
+
+    /**
+     * Gets website entity.
+     *
+     * @param string $code
+     * @return WebsiteInterface
+     * @throws NoSuchEntityException
+     */
+    private function getWebsite(string $code): WebsiteInterface
+    {
+        /** @var WebsiteRepositoryInterface $repository */
+        $repository = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        return $repository->get($code);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
index fe9037e4ffd2b..75dfcf7e8f2fd 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
@@ -8,8 +8,24 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Customer\Model\Customer;
 
 /**
  * Checks Customer insert, update, search with repository
@@ -24,60 +40,65 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
     /** @var CustomerRepositoryInterface */
     private $customerRepository;
 
-    /** @var \Magento\Framework\ObjectManagerInterface */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
-    /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory */
+    /** @var CustomerInterfaceFactory */
     private $customerFactory;
 
-    /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory */
+    /** @var AddressInterfaceFactory */
     private $addressFactory;
 
-    /** @var \Magento\Customer\Api\Data\RegionInterfaceFactory */
+    /** @var RegionInterfaceFactory */
     private $regionFactory;
 
-    /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter */
+    /** @var ExtensibleDataObjectConverter */
     private $converter;
 
-    /** @var \Magento\Framework\Api\DataObjectHelper  */
+    /** @var DataObjectHelper  */
     protected $dataObjectHelper;
 
-    /** @var \Magento\Framework\Encryption\EncryptorInterface */
+    /** @var EncryptorInterface */
     protected $encryptor;
 
-    /** @var \Magento\Customer\Model\CustomerRegistry */
+    /** @var CustomerRegistry */
     protected $customerRegistry;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->customerRepository =
-            $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $this->customerFactory =
-            $this->objectManager->create(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class);
-        $this->addressFactory = $this->objectManager->create(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
-        $this->regionFactory = $this->objectManager->create(\Magento\Customer\Api\Data\RegionInterfaceFactory::class);
-        $this->accountManagement =
-            $this->objectManager->create(\Magento\Customer\Api\AccountManagementInterface::class);
-        $this->converter = $this->objectManager->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
-        $this->dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
-        $this->encryptor = $this->objectManager->create(\Magento\Framework\Encryption\EncryptorInterface::class);
-        $this->customerRegistry = $this->objectManager->create(\Magento\Customer\Model\CustomerRegistry::class);
-
-        /** @var \Magento\Framework\Config\CacheInterface $cache */
-        $cache = $this->objectManager->create(\Magento\Framework\Config\CacheInterface::class);
+        $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $this->customerFactory = $this->objectManager->create(CustomerInterfaceFactory::class);
+        $this->addressFactory = $this->objectManager->create(AddressInterfaceFactory::class);
+        $this->regionFactory = $this->objectManager->create(RegionInterfaceFactory::class);
+        $this->accountManagement = $this->objectManager->create(AccountManagementInterface::class);
+        $this->converter = $this->objectManager->create(ExtensibleDataObjectConverter::class);
+        $this->dataObjectHelper = $this->objectManager->create(DataObjectHelper::class);
+        $this->encryptor = $this->objectManager->create(EncryptorInterface::class);
+        $this->customerRegistry = $this->objectManager->create(CustomerRegistry::class);
+
+        /** @var CacheInterface $cache */
+        $cache = $this->objectManager->create(CacheInterface::class);
         $cache->remove('extension_attributes_config');
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         /** @var \Magento\Customer\Model\CustomerRegistry $customerRegistry */
-        $customerRegistry = $objectManager->get(\Magento\Customer\Model\CustomerRegistry::class);
+        $customerRegistry = $objectManager->get(CustomerRegistry::class);
         $customerRegistry->remove(1);
     }
 
     /**
+     * Check if first name update was successful
+     *
      * @magentoDbIsolation enabled
      */
     public function testCreateCustomerNewThenUpdateFirstName()
@@ -99,7 +120,7 @@ public function testCreateCustomerNewThenUpdateFirstName()
         $newCustomerFirstname = 'New First Name';
         $updatedCustomer = $this->customerFactory->create();
         $this->dataObjectHelper->mergeDataObjects(
-            \Magento\Customer\Api\Data\CustomerInterface::class,
+            CustomerInterface::class,
             $updatedCustomer,
             $customer
         );
@@ -112,6 +133,8 @@ public function testCreateCustomerNewThenUpdateFirstName()
     }
 
     /**
+     * Test create new customer
+     *
      * @magentoDbIsolation enabled
      */
     public function testCreateNewCustomer()
@@ -139,6 +162,8 @@ public function testCreateNewCustomer()
     }
 
     /**
+     * Test update customer
+     *
      * @dataProvider updateCustomerDataProvider
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
@@ -168,7 +193,7 @@ public function testUpdateCustomer($defaultBilling, $defaultShipping)
         $this->dataObjectHelper->populateWithArray(
             $customerDetails,
             $customerData,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         $this->customerRepository->save($customerDetails, $newPasswordHash);
         $customerAfter = $this->customerRepository->getById($existingCustomerId);
@@ -187,12 +212,12 @@ public function testUpdateCustomer($defaultBilling, $defaultShipping)
         $attributesBefore = $this->converter->toFlatArray(
             $customerBefore,
             [],
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         $attributesAfter = $this->converter->toFlatArray(
             $customerAfter,
             [],
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         // ignore 'updated_at'
         unset($attributesBefore['updated_at']);
@@ -215,6 +240,8 @@ public function testUpdateCustomer($defaultBilling, $defaultShipping)
     }
 
     /**
+     * Test update customer address
+     *
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -233,14 +260,14 @@ public function testUpdateCustomerAddress()
         $this->dataObjectHelper->populateWithArray(
             $newAddressDataObject,
             $newAddress,
-            \Magento\Customer\Api\Data\AddressInterface::class
+            AddressInterface::class
         );
         $newAddressDataObject->setRegion($addresses[0]->getRegion());
         $newCustomerEntity = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $newCustomerEntity,
             $customerDetails,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         $newCustomerEntity->setId($customerId)
             ->setAddresses([$newAddressDataObject, $addresses[1]]);
@@ -256,6 +283,8 @@ public function testUpdateCustomerAddress()
     }
 
     /**
+     * Test preserve all addresses after customer update
+     *
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -269,7 +298,7 @@ public function testUpdateCustomerPreserveAllAddresses()
         $this->dataObjectHelper->populateWithArray(
             $newCustomerEntity,
             $customerDetails,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         $newCustomerEntity->setId($customer->getId())
             ->setAddresses(null);
@@ -281,6 +310,8 @@ public function testUpdateCustomerPreserveAllAddresses()
     }
 
     /**
+     * Test update delete all addresses with empty arrays
+     *
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -294,7 +325,7 @@ public function testUpdateCustomerDeleteAllAddressesWithEmptyArray()
         $this->dataObjectHelper->populateWithArray(
             $newCustomerEntity,
             $customerDetails,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         $newCustomerEntity->setId($customer->getId())
             ->setAddresses([]);
@@ -306,6 +337,51 @@ public function testUpdateCustomerDeleteAllAddressesWithEmptyArray()
     }
 
     /**
+     * Test customer update with new address
+     *
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     */
+    public function testUpdateCustomerWithNewAddress()
+    {
+        $customerId = 1;
+        $customer = $this->customerRepository->getById($customerId);
+        $customerDetails = $customer->__toArray();
+        unset($customerDetails['default_billing']);
+        unset($customerDetails['default_shipping']);
+
+        $beforeSaveCustomer = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $beforeSaveCustomer,
+            $customerDetails,
+            CustomerInterface::class
+        );
+
+        $addresses = $customer->getAddresses();
+        $beforeSaveAddress = $addresses[0]->__toArray();
+        unset($beforeSaveAddress['id']);
+        $newAddressDataObject = $this->addressFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $newAddressDataObject,
+            $beforeSaveAddress,
+            AddressInterface::class
+        );
+
+        $beforeSaveCustomer->setAddresses([$newAddressDataObject]);
+        $this->customerRepository->save($beforeSaveCustomer);
+
+        $newCustomer = $this->customerRepository->getById($customerId);
+        $newCustomerAddresses = $newCustomer->getAddresses();
+        $addressId = $newCustomerAddresses[0]->getId();
+
+        $this->assertEquals($newCustomer->getDefaultBilling(), $addressId, "Default billing invalid value");
+        $this->assertEquals($newCustomer->getDefaultShipping(), $addressId, "Default shipping invalid value");
+    }
+
+    /**
+     * Test search customers
+     *
      * @param \Magento\Framework\Api\Filter[] $filters
      * @param \Magento\Framework\Api\Filter[] $filterGroup
      * @param array $expectedResult array of expected results indexed by ID
@@ -317,9 +393,8 @@ public function testUpdateCustomerDeleteAllAddressesWithEmptyArray()
      */
     public function testSearchCustomers($filters, $filterGroup, $expectedResult)
     {
-        /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
-        $searchBuilder = Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+        /** @var SearchCriteriaBuilder $searchBuilder */
+        $searchBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
         foreach ($filters as $filter) {
             $searchBuilder->addFilters([$filter]);
         }
@@ -346,19 +421,19 @@ public function testSearchCustomers($filters, $filterGroup, $expectedResult)
      */
     public function testSearchCustomersOrder()
     {
-        /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
+        /** @var SearchCriteriaBuilder $searchBuilder */
         $objectManager = Bootstrap::getObjectManager();
-        $searchBuilder = $objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+        $searchBuilder = $objectManager->create(SearchCriteriaBuilder::class);
 
         // Filter for 'firstname' like 'First'
-        $filterBuilder = $objectManager->create(\Magento\Framework\Api\FilterBuilder::class);
+        $filterBuilder = $objectManager->create(FilterBuilder::class);
         $firstnameFilter = $filterBuilder->setField('firstname')
             ->setConditionType('like')
             ->setValue('First%')
             ->create();
         $searchBuilder->addFilters([$firstnameFilter]);
         // Search ascending order
-        $sortOrderBuilder = $objectManager->create(\Magento\Framework\Api\SortOrderBuilder::class);
+        $sortOrderBuilder = $objectManager->create(SortOrderBuilder::class);
         $sortOrder = $sortOrderBuilder
             ->setField('lastname')
             ->setDirection(SortOrder::SORT_ASC)
@@ -383,6 +458,8 @@ public function testSearchCustomersOrder()
     }
 
     /**
+     * Test delete
+     *
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoAppIsolation enabled
@@ -393,14 +470,14 @@ public function testDelete()
         $customer = $this->customerRepository->get($fixtureCustomerEmail);
         $this->customerRepository->delete($customer);
         /** Ensure that customer was deleted */
-        $this->expectException(
-            \Magento\Framework\Exception\NoSuchEntityException::class,
-            'No such entity with email = customer@example.com, websiteId = 1'
-        );
+        $this->expectException(NoSuchEntityException::class);
+        $this->expectExceptionMessage('No such entity with email = customer@example.com, websiteId = 1');
         $this->customerRepository->get($fixtureCustomerEmail);
     }
 
     /**
+     * Test delete by id
+     *
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoAppIsolation enabled
@@ -411,10 +488,8 @@ public function testDeleteById()
         $fixtureCustomerId = 1;
         $this->customerRepository->deleteById($fixtureCustomerId);
         /** Ensure that customer was deleted */
-        $this->expectException(
-            \Magento\Framework\Exception\NoSuchEntityException::class,
-            'No such entity with email = customer@example.com, websiteId = 1'
-        );
+        $this->expectException(NoSuchEntityException::class);
+        $this->expectExceptionMessage('No such entity with email = customer@example.com, websiteId = 1');
         $this->customerRepository->get($fixtureCustomerEmail);
     }
 
@@ -437,9 +512,14 @@ public function updateCustomerDataProvider()
         ];
     }
 
+    /**
+     * Search customer data provider
+     *
+     * @return array
+     */
     public function searchCustomersDataProvider()
     {
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         return [
             'Customer with specific email' => [
                 [$builder->setField('email')->setValue('customer@search.example.com')->create()],
@@ -489,9 +569,9 @@ protected function expectedDefaultShippingsInCustomerModelAttributes(
         $defaultShipping
     ) {
         /**
-         * @var \Magento\Customer\Model\Customer $customer
+         * @var Customer $customer
          */
-        $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
+        $customer = $this->objectManager->create(Customer::class);
         /** @var \Magento\Customer\Model\Customer $customer */
         $customer->load($customerId);
         $this->assertEquals(
@@ -507,6 +587,8 @@ protected function expectedDefaultShippingsInCustomerModelAttributes(
     }
 
     /**
+     * Test update default shipping and default billing address
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDbIsolation enabled
      */
@@ -534,13 +616,13 @@ public function testUpdateDefaultShippingAndDefaultBillingTest()
         $this->assertEquals(
             $savedCustomer->getDefaultBilling(),
             $oldDefaultBilling,
-            'Default billing shoud not be overridden'
+            'Default billing should not be overridden'
         );
 
         $this->assertEquals(
             $savedCustomer->getDefaultShipping(),
             $oldDefaultShipping,
-            'Default shipping shoud not be overridden'
+            'Default shipping should not be overridden'
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
index d23113ee3bd06..016efd60ce786 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
@@ -8,7 +8,6 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -16,25 +15,17 @@
  */
 class CollectionTest extends \Magento\TestFramework\Indexer\TestCase
 {
-    /** @var \Magento\Framework\ObjectManagerInterface */
-    private $objectManager;
-
-    /** @var IndexerRegistry */
-    private $indexerRegistry;
-
-    /** @var \Magento\Customer\Model\ResourceModel\Grid\Collection */
-    private $targetObject;
-
-    /** @var CustomerRepositoryInterface */
-    private $customerRepository;
-
-    protected function setUp()
+    public static function setUpBeforeClass()
     {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->indexerRegistry = $this->objectManager->create(IndexerRegistry::class);
-        $this->targetObject = $this->objectManager
-            ->create(\Magento\Customer\Model\ResourceModel\Grid\Collection::class);
-        $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
     }
 
     /**
@@ -46,23 +37,41 @@ protected function setUp()
      *
      * @magentoDataFixture Magento/Customer/_files/customer_grid_indexer_enabled_update_on_schedule.php
      * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testGetItemByIdForUpdateOnSchedule()
     {
+        $targetObject = Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Model\ResourceModel\Grid\Collection::class
+        );
+        $customerRepository = Bootstrap::getObjectManager()->create(
+            CustomerRepositoryInterface::class
+        );
         /** Verify after first save */
+
         /** @var CustomerInterface $newCustomer */
-        $newCustomer = $this->customerRepository->get('customer@example.com');
+        $newCustomer = $customerRepository->get('customer@example.com');
         /** @var CustomerInterface $item */
-        $item = $this->targetObject->getItemById($newCustomer->getId());
+        $item = $targetObject->getItemById($newCustomer->getId());
         $this->assertNotEmpty($item);
         $this->assertSame($newCustomer->getEmail(), $item->getEmail());
         $this->assertSame('test street test city Armed Forces Middle East 01001', $item->getBillingFull());
 
         /** Verify after update */
+
         $newCustomer->setEmail('customer_updated@example.com');
-        $this->customerRepository->save($newCustomer);
-        $this->targetObject->clear();
-        $item = $this->targetObject->getItemById($newCustomer->getId());
+        $customerRepository->save($newCustomer);
+        $targetObject->clear();
+        $item = $targetObject->getItemById($newCustomer->getId());
         $this->assertSame($newCustomer->getEmail(), $item->getEmail());
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
index 6d0986d6a3949..c4296090a9a47 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\ResourceModel\Group\Grid;
 
 class ServiceCollectionTest extends \PHPUnit\Framework\TestCase
@@ -97,7 +98,7 @@ public function testSingleLikeFilter()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage When passing an array of fields there must be at least one field in the array.
+     * @expectedExceptionMessage The array of fields failed to pass. The array must include at one field.
      */
     public function testAddToFilterException()
     {
@@ -106,7 +107,7 @@ public function testAddToFilterException()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage When passing in a field array there must be a matching condition array.
+     * @expectedExceptionMessage The field array failed to pass. The array must have a matching condition array.
      */
     public function testAddToFilterExceptionArrayNotSymmetric()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php
new file mode 100644
index 0000000000000..0340f0f841ca6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Customer\Model\CustomerRegistry;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $repository \Magento\Customer\Api\CustomerRepositoryInterface */
+$repository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+$customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+/** @var Magento\Customer\Model\Customer $customer */
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('customer@example.com')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customer->isObjectNew(true);
+$customer->save();
+$customerRegistry->remove($customer->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php
new file mode 100644
index 0000000000000..414d31ac9d0ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+
+foreach ([1, 2] as $addressId) {
+    try {
+        $addressRepository->deleteById($addressId);
+    } catch (NoSuchEntityException $e) {
+        /**
+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+         */
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_website_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_website_rollback.php
new file mode 100644
index 0000000000000..2dbd1381b6f3c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_website_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\ObjectManagerInterface  $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Store\Model\StoreManager $store */
+$store = $objectManager->get(\Magento\Store\Model\StoreManager::class);
+
+/** @var $customer \Magento\Customer\Model\Customer*/
+$customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
+$customer->setWebsiteId($store->getDefaultStoreView()->getWebsiteId());
+$customer->loadByEmail('john.doe@magento.com');
+if ($customer->getId()) {
+    $customer->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
new file mode 100644
index 0000000000000..0948e46173615
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+/** @var Customer $customer */
+$customer = Bootstrap::getObjectManager()->get(Customer::class);
+
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('customer@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setGender(0)
+    ->save();
+$customerRegistry->remove($customer->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php
new file mode 100644
index 0000000000000..d5f9308ee77b7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $customerRepository->deleteById(1);
+} catch (NoSuchEntityException $e) {
+    /**
+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+     */
+}
+$customerRegistry->remove(1);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/five_repository_customers.php b/dev/tests/integration/testsuite/Magento/Customer/_files/five_repository_customers.php
new file mode 100644
index 0000000000000..1722e471a5bbc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/five_repository_customers.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Model\Customer;
+use Magento\Eav\Model\Config as EavModelConfig;
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var CustomerInterfaceFactory $customerFactory */
+$customerFactory = $objectManager->get(CustomerInterfaceFactory::class);
+
+for ($i = 1; $i <= 5; $i++) {
+    /** @var CustomerInterface $customer */
+    $customer = $customerFactory->create();
+    $customer->setFirstname('John')
+        ->setGroupId(1)
+        ->setLastname('Smith')
+        ->setWebsiteId(1)
+        ->setEmail('customer'.$i.'@example.com');
+    try {
+        $customerRepository->save($customer, 'password');
+    } catch (\Exception $e) {
+    }
+}
+
+/** @var EavModelConfig $eavConfig */
+$eavConfig = $objectManager->get(EavModelConfig::class);
+$eavConfig->clear();
+
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(IndexerRegistry::class);
+/** @var IndexerInterface $indexer */
+$indexer = $indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
+try {
+    $indexer->reindexAll();
+} catch (\Exception $e) {
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/five_repository_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/five_repository_customers_rollback.php
new file mode 100644
index 0000000000000..5272d9cdbf06d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/five_repository_customers_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Eav\Model\Config as EavModelConfig;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CustomerRepositoryInterface $repository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+
+for ($i = 1; $i <= 5; $i++) {
+    try {
+        /** @var CustomerInterface $customer */
+        $customer = $customerRepository->get('customer'.$i.'@example.com');
+        $customerRepository->delete($customer);
+    } catch (\Exception $e) {
+    }
+}
+
+/** @var EavModelConfig $eavConfig */
+$eavConfig = $objectManager->get(EavModelConfig::class);
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php
index 80b3613378d9b..9a90061a6de76 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 //Create customer
+/** @var Magento\Customer\Model\Customer $customer */
 $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Customer\Model\Customer::class
 );
@@ -75,5 +76,4 @@
 $addressSecond->isObjectNew(true);
 $customer->addAddress($addressSecond);
 $customer->setDefaultShipping($addressSecond->getId());
-$customer->isObjectNew(true);
 $customer->save();
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 0000000000000..a357fd3005b23
--- /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/Customer/_files/two_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php
new file mode 100644
index 0000000000000..5beb9e654de63
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Fixture for Customer List method.
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'customer_rollback.php';
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+try {
+    $customerRepository->deleteById(2);
+} catch (NoSuchEntityException $e) {
+    /**
+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+     */
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
index f11cc62928aff..96b7f8ce8ed67 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
@@ -10,6 +10,10 @@
 namespace Magento\CustomerImportExport\Model\Import;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\ImportExport\Model\Import as ImportModel;
+use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -86,10 +90,10 @@ class AddressTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         /** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
-        $this->customerResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $this->customerResource = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Model\ResourceModel\Customer::class
         );
-        $this->_entityAdapter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->_entityAdapter = Bootstrap::getObjectManager()->create(
             $this->_testClassName
         );
     }
@@ -128,15 +132,6 @@ public function testConstruct()
         );
         $this->assertAttributeNotEmpty('_attributes', $this->_entityAdapter, 'Attributes must not be empty');
 
-        // check addresses
-        $this->assertAttributeInternalType(
-            'array',
-            '_addresses',
-            $this->_entityAdapter,
-            'Addresses must be an array.'
-        );
-        $this->assertAttributeNotEmpty('_addresses', $this->_entityAdapter, 'Addresses must not be empty');
-
         // check country regions and regions
         $this->assertAttributeInternalType(
             'array',
@@ -150,62 +145,6 @@ public function testConstruct()
         $this->assertAttributeNotEmpty('_regions', $this->_entityAdapter, 'Regions must not be empty');
     }
 
-    /**
-     * Test _initAddresses
-     *
-     * @magentoDataFixture Magento/Customer/_files/import_export/customer_with_addresses.php
-     */
-    public function testInitAddresses()
-    {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        // get addressed from fixture
-        $customers = $objectManager->get(\Magento\Framework\Registry::class)->registry($this->_fixtureKey);
-        $correctAddresses = [];
-        /** @var $customer \Magento\Customer\Model\Customer */
-        foreach ($customers as $customer) {
-            $correctAddresses[$customer->getId()] = [];
-            /** @var $address \Magento\Customer\Model\Address */
-            foreach ($customer->getAddressesCollection() as $address) {
-                $correctAddresses[$customer->getId()][] = $address->getId();
-            }
-        }
-
-        // invoke _initAddresses
-        $initAddresses = new \ReflectionMethod($this->_testClassName, '_initAddresses');
-        $initAddresses->setAccessible(true);
-        $initAddresses->invoke($this->_entityAdapter);
-
-        // check addresses
-        $this->assertAttributeInternalType(
-            'array',
-            '_addresses',
-            $this->_entityAdapter,
-            'Addresses must be an array.'
-        );
-        $this->assertAttributeNotEmpty('_addresses', $this->_entityAdapter, 'Addresses must not be empty');
-
-        $addressesReflection = new \ReflectionProperty($this->_testClassName, '_addresses');
-        $addressesReflection->setAccessible(true);
-        $testAddresses = $addressesReflection->getValue($this->_entityAdapter);
-
-        $correctCustomerIds = array_keys($correctAddresses);
-        $testCustomerIds = array_keys($testAddresses);
-        sort($correctCustomerIds);
-        sort($testCustomerIds);
-        $this->assertEquals($correctCustomerIds, $testCustomerIds, 'Incorrect customer IDs in addresses array.');
-
-        foreach ($correctCustomerIds as $customerId) {
-            $this->assertInternalType('array', $correctAddresses[$customerId], 'Addresses must be an array.');
-            $correctAddressIds = $correctAddresses[$customerId];
-            $testAddressIds = $testAddresses[$customerId];
-            sort($correctAddressIds);
-            sort($testAddressIds);
-            $this->assertEquals($correctAddressIds, $testAddressIds, 'Incorrect addresses IDs.');
-        }
-    }
-
     /**
      * Test _saveAddressEntity
      *
@@ -217,7 +156,7 @@ public function testSaveAddressEntities()
         list($customerId, $addressId) = $this->_addTestAddress($this->_entityAdapter);
 
         // check DB
-        $testAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $testAddress = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Address::class
         );
         $testAddress->load($addressId);
@@ -234,7 +173,7 @@ public function testSaveAddressEntities()
     protected function _addTestAddress(Address $entityAdapter)
     {
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         $customers = $objectManager->get(\Magento\Framework\Registry::class)->registry($this->_fixtureKey);
         /** @var $customer \Magento\Customer\Model\Customer */
@@ -242,7 +181,7 @@ protected function _addTestAddress(Address $entityAdapter)
         $customerId = $customer->getId();
 
         /** @var $addressModel \Magento\Customer\Model\Address */
-        $addressModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $addressModel = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Address::class
         );
         $tableName = $addressModel->getResource()->getEntityTable();
@@ -301,7 +240,7 @@ public function testSaveAddressAttributes()
 
         // check DB
         /** @var $testAddress \Magento\Customer\Model\Address */
-        $testAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $testAddress = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Address::class
         );
         $testAddress->load($addressId);
@@ -317,7 +256,7 @@ public function testSaveAddressAttributes()
     public function testSaveCustomerDefaults()
     {
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         // get not default address
         $customers = $objectManager->get(\Magento\Framework\Registry::class)->registry($this->_fixtureKey);
@@ -359,7 +298,7 @@ public function testSaveCustomerDefaults()
 
         // check DB
         /** @var $testCustomer \Magento\Customer\Model\Customer */
-        $testCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $testCustomer = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Customer::class
         );
         $testCustomer->load($customerId);
@@ -387,20 +326,20 @@ public function testImportDataAddUpdate()
     {
         // set behaviour
         $this->_entityAdapter->setParameters(
-            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE]
+            ['behavior' => ImportModel::BEHAVIOR_ADD_UPDATE]
         );
 
         // set fixture CSV file
         $sourceFile = __DIR__ . '/_files/address_import_update.csv';
 
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $filesystem = $objectManager->create(\Magento\Framework\Filesystem::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $filesystem = $objectManager->create(Filesystem::class);
 
         $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         $result = $this->_entityAdapter->setSource(
-            \Magento\ImportExport\Model\Import\Adapter::findAdapterFor($sourceFile, $directoryWrite)
+            ImportAdapter::findAdapterFor($sourceFile, $directoryWrite)
         )
             ->validateData()
             ->hasToBeTerminated();
@@ -419,7 +358,7 @@ public function testImportDataAddUpdate()
         }
 
         // get addresses
-        $addressCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $addressCollection = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\ResourceModel\Address\Collection::class
         );
         $addressCollection->addAttributeToSelect($requiredAttributes);
@@ -460,7 +399,7 @@ public function testImportDataAddUpdate()
 
         // are default billing/shipping addresses have new value
         /** @var $customer \Magento\Customer\Model\Customer */
-        $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $customer = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\Customer::class
         );
         $customer->setWebsiteId(0);
@@ -486,17 +425,17 @@ public function testImportDataAddUpdate()
     public function testImportDataDelete()
     {
         // set behaviour
-        $this->_entityAdapter->setParameters(['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE]);
+        $this->_entityAdapter->setParameters(['behavior' => ImportModel::BEHAVIOR_DELETE]);
 
         // set fixture CSV file
         $sourceFile = __DIR__ . '/_files/address_import_delete.csv';
 
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $filesystem = $objectManager->create(\Magento\Framework\Filesystem::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $filesystem = $objectManager->create(Filesystem::class);
         $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $result = $this->_entityAdapter->setSource(
-            \Magento\ImportExport\Model\Import\Adapter::findAdapterFor($sourceFile, $directoryWrite)
+            ImportAdapter::findAdapterFor($sourceFile, $directoryWrite)
         )->validateData()->hasToBeTerminated();
         $this->assertTrue(!$result, 'Validation result must be true.');
 
@@ -508,7 +447,7 @@ public function testImportDataDelete()
 
         // get addresses
         /** @var $addressCollection \Magento\Customer\Model\ResourceModel\Address\Collection */
-        $addressCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $addressCollection = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\ResourceModel\Address\Collection::class
         );
         $addressCollection->addAttributeToSelect($keyAttribute);
@@ -522,4 +461,37 @@ public function testImportDataDelete()
         $this->assertArrayNotHasKey($this->_deleteData['delete'], $addresses, 'Address must not exist.');
         $this->assertArrayHasKey($this->_deleteData['not_delete'], $addresses, 'Address must exist.');
     }
+
+    /**
+     * Case when attribute settings for two websites are different.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/CustomerImportExport/_files/two_addresses.php
+     * @return void
+     */
+    public function testDifferentOptions(): void
+    {
+        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->create(Filesystem::class);
+
+        //Only add/update behaviour will have validation in place required to
+        //test this case
+        $this->_entityAdapter->setParameters(
+            ['behavior' => ImportModel::BEHAVIOR_ADD_UPDATE]
+        );
+        //Load from
+        $sourceFile = __DIR__ . '/_files/two_addresses_import_update.csv';
+        $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        //Validate
+        $adapter = ImportAdapter::findAdapterFor($sourceFile, $directoryWrite);
+        $errors = $this->_entityAdapter->setSource($adapter)->validateData();
+        $this->assertEmpty($errors->getErrorsCount(), 'CSV must be valid');
+        //Import
+        $imported = $this->_entityAdapter->importData();
+        $this->assertTrue($imported, 'Must be successfully imported');
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
index 5925eb06500e0..05d9c5d3acb1e 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
@@ -135,6 +135,82 @@ public function testImportData()
         );
     }
 
+    /**
+     * Tests importData() method.
+     *
+     * @magentoDataFixture Magento/Customer/_files/import_export/customer.php
+     *
+     * @return void
+     */
+    public function testImportDataWithOneAdditionalColumn(): void
+    {
+        $source = new \Magento\ImportExport\Model\Import\Source\Csv(
+            __DIR__ . '/_files/customer_to_import_with_one_additional_column.csv',
+            $this->directoryWrite
+        );
+
+        /** @var $customersCollection \Magento\Customer\Model\ResourceModel\Customer\Collection */
+        $customersCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Model\ResourceModel\Customer\Collection::class
+        );
+        $customersCollection->resetData();
+        $customersCollection->clear();
+
+        $this->_model
+            ->setParameters(['behavior' => Import::BEHAVIOR_ADD_UPDATE])
+            ->setSource($source)
+            ->validateData()
+            ->hasToBeTerminated();
+        sleep(1);
+        $this->_model->importData();
+
+        $customers = $customersCollection->getItems();
+
+        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $existingCustomer = $objectManager->get(\Magento\Framework\Registry::class)
+            ->registry('_fixture/Magento_ImportExport_Customer');
+
+        $updatedCustomer = $customers[$existingCustomer->getId()];
+
+        $this->assertNotEquals(
+            $existingCustomer->getFirstname(),
+            $updatedCustomer->getFirstname(),
+            'Firstname must be changed'
+        );
+
+        $this->assertNotEquals(
+            $existingCustomer->getUpdatedAt(),
+            $updatedCustomer->getUpdatedAt(),
+            'Updated at date must be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getLastname(),
+            $updatedCustomer->getLastname(),
+            'Lastname must not be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getStoreId(),
+            $updatedCustomer->getStoreId(),
+            'Store Id must not be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getCreatedAt(),
+            $updatedCustomer->getCreatedAt(),
+            'Creation date must not be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getCustomerGroupId(),
+            $updatedCustomer->getCustomerGroupId(),
+            'Customer group must not be changed'
+        );
+    }
+
     /**
      * Test importData() method (delete behavior)
      *
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/customer_to_import_with_one_additional_column.csv b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/customer_to_import_with_one_additional_column.csv
new file mode 100644
index 0000000000000..fd081e090eb85
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/customer_to_import_with_one_additional_column.csv
@@ -0,0 +1,2 @@
+email,_website,firstname
+CharlesTAlston@teleworm.us,base,Jhon
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/two_addresses_import_update.csv b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/two_addresses_import_update.csv
new file mode 100644
index 0000000000000..59261807986b3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/two_addresses_import_update.csv
@@ -0,0 +1,3 @@
+"_website","_email","_entity_id","city","company","country_id","fax","firstname","lastname","middlename","postcode","prefix","region","region_id","street","suffix","telephone","vat_id","vat_is_valid","vat_request_date","vat_request_id","vat_request_success","_address_default_billing_","_address_default_shipping_"
+"base","customer@example.com",1,"Montgivray",,"FR",,"John","Smith",,36400,,"Paris",257,"1 Avenue du Lion d'Argent",,"33254060414",,,,,,1,1
+"test","customer2@example.com",2,"Madrid",,"ES",,"First","Last",,28045,,"Madrid",161,"Calle de Méndez Álvaro, 72",,"34912759224",,,,,,1,1
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses.php
new file mode 100644
index 0000000000000..996b0c510c019
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
+use Magento\Store\Model\Website;
+use Magento\Store\Model\Store;
+
+include __DIR__ . '/../../Store/_files/websites_different_countries.php';
+
+//Creating two customers for different websites.
+$objectManager = Bootstrap::getObjectManager();
+//First for default website.
+$customer = $objectManager->create(Customer::class);
+/** @var Customer $customer */
+$customer->setId(1)
+    ->setPassword('password')
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0)
+    ->setWebsiteId(1)
+    ->setGroupId(1)
+    ->setEmail('customer@example.com')
+    ->setStoreId(1);
+
+$customer->isObjectNew(true);
+$customer->save();
+//Second for second website
+/** @var Website $secondWebsite */
+$secondWebsite = $objectManager->create(Website::class);
+$secondWebsite->load('test', 'code');
+/** @var Store $secondStore */
+$secondStore = $objectManager->create(Store::class);
+$secondStore->load('fixture_second_store', 'code');
+$customer = $objectManager->create(Customer::class);
+/** @var Customer $customer */
+$customer->setId(2)
+    ->setPassword('password')
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('Second')
+    ->setMiddlename(null)
+    ->setLastname('Customer')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0)
+    ->setWebsiteId($secondWebsite->getId())
+    ->setGroupId(1)
+    ->setEmail('customer2@example.com')
+    ->setStoreId($secondStore->getId());
+
+$customer->isObjectNew(true);
+$customer->save();
+
+//Creating address for the 1st customer.
+/** @var Address $customerAddress */
+$customerAddress = $objectManager->create(Address::class);
+$customerAddress->isObjectNew(true);
+$customerAddress->setData(
+    [
+        'entity_id' => 2,
+        'attribute_set_id' => 2,
+        'telephone' => '+33254060414',
+        'postcode' => 36400,
+        'country_id' => 'FR',
+        'city' => 'Montgivray',
+        'street' => ['1 Avenue du Lion d\'Argent'],
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+        'parent_id' => 1,
+        'region_id' => 1,
+    ]
+)->setCustomerId(1)
+    ->setStoreId(1)
+    ->setWebsiteId(1);
+$customerAddress->save();
+//Address for the 2nd customer
+/** @var Address $customerAddress */
+$customerAddress = $objectManager->create(Address::class);
+$customerAddress->isObjectNew(true);
+$customerAddress->setData(
+    [
+        'entity_id' => 3,
+        'attribute_set_id' => 2,
+        'telephone' => '+34912759224',
+        'postcode' => 28045,
+        'country_id' => 'ES',
+        'city' => 'Madrid',
+        'street' => ['Calle de Méndez Álvaro, 72'],
+        'lastname' => 'Last',
+        'firstname' => 'First',
+        'parent_id' => 1,
+        'region_id' => 1,
+    ]
+)->setCustomerId(2)
+    ->setStoreId($secondStore->getId())
+    ->setWebsiteId($secondWebsite->getId());
+$customerAddress->save();
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses_rollback.php
new file mode 100644
index 0000000000000..6e371a102d4a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses_rollback.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Integration\Model\Oauth\Token\RequestThrottler;
+use Magento\Framework\Registry;
+use Magento\Customer\Model\Customer;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Address;
+
+//Clearing websites.
+include __DIR__ . '/../../Store/_files/websites_different_countries_rollback.php';
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+
+//Removing customers.
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var $customer \Magento\Customer\Model\Customer*/
+$customer = Bootstrap::getObjectManager()->create(Customer::class);
+$customer->load(1);
+if ($customer->getId()) {
+    $customer->delete();
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+/* Unlock account if it was locked for tokens retrieval */
+/** @var RequestThrottler $throttler */
+$throttler = Bootstrap::getObjectManager()->create(RequestThrottler::class);
+$throttler->resetAuthenticationFailuresCount(
+    'customer@example.com',
+    RequestThrottler::USER_TYPE_CUSTOMER
+);
+//Second customer.
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var $customer \Magento\Customer\Model\Customer*/
+$customer = Bootstrap::getObjectManager()->create(Customer::class);
+$customer->load(2);
+if ($customer->getId()) {
+    $customer->delete();
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+/* Unlock account if it was locked for tokens retrieval */
+$throttler->resetAuthenticationFailuresCount(
+    'customer2@example.com',
+    RequestThrottler::USER_TYPE_CUSTOMER
+);
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ApplicationDumpCommandTest.php b/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ApplicationDumpCommandTest.php
index cb40b110f5fc6..c4551ac49d156 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ApplicationDumpCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ApplicationDumpCommandTest.php
@@ -176,7 +176,7 @@ public function testExecute()
             ->with(['system' => $comment]);
         $outputMock->expects($this->at(1))
             ->method('writeln')
-            ->with('<info>Done.</info>');
+            ->with($this->matchesRegularExpression('/<info>Done. Config types dumped: [a-z0-9,\s]+<\/info>/'));
 
         /** @var ApplicationDumpCommand command */
         $command = $this->objectManager->create(ApplicationDumpCommand::class);
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php b/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php
index ffeca0f16094d..bc190a8519ae9 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php
+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php
@@ -24,7 +24,7 @@ function rcopy($src, $destination)
         // If source is not a directory stop processing
         if (!is_dir($src)) {
             return false;
-        };
+        }
 
         // If the destination directory does not exist create it
         // If the destination directory could not be created stop processing
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json
index d0da19718eb33..cf28a42d60715 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json
@@ -5,11 +5,10 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0",
-        "magento/framework": "1.0.0-beta"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-theme",
-    "version": "1.0.0-beta",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
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 17026f9ce77ec..37a45fbbfe430 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/Deploy/_files/zoom2/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json
index 72bd3e4182d86..6038c48fab29d 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0",
-        "magento/framework": "1.0.0-beta",
-        "magento/theme-frontend-zoom1": "1.0.0-beta"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/theme-frontend-zoom1": "*"
     },
     "type": "magento2-theme",
-    "version": "1.0.0-beta",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json
index 1dbc757affb05..820abaee604bf 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json
@@ -5,12 +5,11 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0",
-        "magento/framework": "1.0.0-beta",
-        "magento/theme-frontend-zoom2": "1.0.0-beta"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/theme-frontend-zoom2": "*"
     },
     "type": "magento2-theme",
-    "version": "1.0.0-beta",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
index 71e61162d29c9..3bef48d8801f7 100644
--- a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
+++ b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
@@ -113,25 +113,27 @@ private function enableDebugging()
             ->getMockForAbstractClass();
         $this->outputMock = $this->getMockBuilder(OutputInterface::class)
             ->getMockForAbstractClass();
-        $this->inputMock->expects($this->exactly(2))
-            ->method('getArgument')
-            ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
-            ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
-        $this->inputMock->expects($this->exactly(3))
+        $this->inputMock->expects($this->exactly(4))
             ->method('getOption')
             ->withConsecutive(
+                [ConfigSetCommand::OPTION_LOCK_ENV],
+                [ConfigSetCommand::OPTION_LOCK_CONFIG],
                 [ConfigSetCommand::OPTION_SCOPE],
-                [ConfigSetCommand::OPTION_SCOPE_CODE],
-                [ConfigSetCommand::OPTION_LOCK]
+                [ConfigSetCommand::OPTION_SCOPE_CODE]
             )
             ->willReturnOnConsecutiveCalls(
+                true,
+                false,
                 ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-                null,
-                true
+                null
             );
+        $this->inputMock->expects($this->exactly(2))
+            ->method('getArgument')
+            ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
+            ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
         $this->outputMock->expects($this->once())
             ->method('writeln')
-            ->with('<info>Value was saved and locked.</info>');
+            ->with('<info>Value was saved in app/etc/env.php and locked.</info>');
         $this->assertFalse((bool)$this->configSetCommand->run($this->inputMock, $this->outputMock));
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
index 45a5473176e3c..45d84336337c5 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
@@ -42,6 +42,48 @@ public function testPostCodesThrowsExceptionIfCountryDoesNotExist()
         $this->validator->validate('12345', 'INVALID-CODE');
     }
 
+    /**
+     * @dataProvider getCanadaInvalidPostCodes
+     */
+    public function testInvalidCanadaZipCode($countryId, $invalidPostCode)
+    {
+        $this->assertFalse($this->validator->validate($invalidPostCode, $countryId));
+    }
+
+    /**
+     * @dataProvider getCanadaValidPostCodes
+     */
+    public function testValidCanadaZipCode($countryId, $validPostCode)
+    {
+        $this->assertTrue($this->validator->validate($validPostCode, $countryId));
+    }
+
+    /**
+     * @return array
+     */
+    public function getCanadaInvalidPostCodes()
+    {
+        return [
+            ['countryId' => 'CA', 'postcode' => '12345'],
+            ['countryId' => 'CA', 'postcode' => 'A1B2C3D'],
+            ['countryId' => 'CA', 'postcode' => 'A1B2C'],
+            ['countryId' => 'CA', 'postcode' => 'A1B  2C3'],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getCanadaValidPostCodes()
+    {
+        return [
+            ['countryId' => 'CA', 'postcode' => 'A1B2C3'],
+            ['countryId' => 'CA', 'postcode' => 'A1B 2C3'],
+            ['countryId' => 'CA', 'postcode' => 'Z9Y 8X7'],
+            ['countryId' => 'CA', 'postcode' => 'Z9Y8X7'],
+        ];
+    }
+
     /**
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -88,10 +130,10 @@ public function getPostcodesDataProvider()
             ['countryId' => 'IS', 'postcode' => '123'],
             ['countryId' => 'IN', 'postcode' => '123456'],
             ['countryId' => 'ID', 'postcode' => '12345'],
-            ['countryId' => 'IL', 'postcode' => '12345'],
+            ['countryId' => 'IL', 'postcode' => '1234567'],
             ['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/Directory/Model/CurrencyConfigTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
new file mode 100644
index 0000000000000..b620d9097b4be
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Model;
+
+use Magento\Directory\Model\Currency as CurrencyModel;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\App\State;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for CurrencyConfig model.
+ */
+class CurrencyConfigTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private $baseCurrencyPath = 'currency/options/base';
+
+    /**
+     * @var string
+     */
+    private $defaultCurrencyPath = 'currency/options/default';
+
+    /**
+     * @var string
+     */
+    private $allowedCurrenciesPath = 'currency/options/allow';
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var CurrencyModel
+     */
+    private $currency;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->currency = Bootstrap::getObjectManager()->get(CurrencyModel::class);
+        $this->config = Bootstrap::getObjectManager()->get(ConfigInterface::class);
+    }
+
+    /**
+     * Test get currency config for admin and storefront areas.
+     *
+     * @dataProvider getConfigCurrenciesDataProvider
+     * @magentoDataFixture Magento/Store/_files/store.php
+     * @magentoDbIsolation disabled
+     * @param string $areaCode
+     * @param array $expected
+     * @return void
+     */
+    public function testGetConfigCurrencies(string $areaCode, array $expected)
+    {
+        /** @var State $appState */
+        $appState = Bootstrap::getObjectManager()->get(State::class);
+        $appState->setAreaCode($areaCode);
+        $store = Bootstrap::getObjectManager()->get(Store::class);
+        $store->load('test', 'code');
+        $this->clearCurrencyConfig();
+        $this->setStoreConfig($store->getId());
+        $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore($store->getId());
+
+        if ($areaCode === Area::AREA_ADMINHTML) {
+            self::assertEquals($expected['allowed'], $this->currency->getConfigAllowCurrencies());
+            self::assertEquals($expected['base'], $this->currency->getConfigBaseCurrencies());
+            self::assertEquals($expected['default'], $this->currency->getConfigDefaultCurrencies());
+        } else {
+            /** @var StoreManagerInterface $storeManager */
+            $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+            foreach ($storeManager->getStores() as $store) {
+                $storeManager->setCurrentStore($store->getId());
+                self::assertEquals(
+                    $expected[$store->getCode()]['allowed'],
+                    $this->currency->getConfigAllowCurrencies()
+                );
+                self::assertEquals(
+                    $expected[$store->getCode()]['base'],
+                    $this->currency->getConfigBaseCurrencies()
+                );
+                self::assertEquals(
+                    $expected[$store->getCode()]['default'],
+                    $this->currency->getConfigDefaultCurrencies()
+                );
+            }
+        }
+    }
+
+    /**
+     * Provide test data for getConfigCurrencies test.
+     *
+     * @return array
+     */
+    public function getConfigCurrenciesDataProvider()
+    {
+        return [
+            [
+                'areaCode' => Area::AREA_ADMINHTML,
+                'expected' => [
+                    'allowed' => ['BDT', 'BNS', 'BTD', 'EUR', 'USD'],
+                    'base' => ['BDT', 'USD'],
+                    'default' => ['BDT', 'USD'],
+                ],
+            ],
+            [
+                'areaCode' => Area::AREA_FRONTEND,
+                'expected' => [
+                    'default' => [
+                        'allowed' => ['EUR', 'USD'],
+                        'base' => ['USD'],
+                        'default' => ['USD'],
+                    ],
+                    'test' => [
+                        'allowed' => ['BDT', 'BNS', 'BTD', 'USD'],
+                        'base' => ['BDT'],
+                        'default' => ['BDT'],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Remove currency config form Db.
+     *
+     * @return void
+     */
+    private function clearCurrencyConfig()
+    {
+        $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+        foreach ($storeManager->getStores() as $store) {
+            $this->config->deleteConfig(
+                $this->allowedCurrenciesPath,
+                'stores',
+                $store->getId()
+            );
+            $this->config->deleteConfig(
+                $this->baseCurrencyPath,
+                'stores',
+                $store->getId()
+            );
+            $this->config->deleteConfig(
+                $this->defaultCurrencyPath,
+                'stores',
+                $store->getId()
+            );
+        }
+    }
+
+    /**
+     * Set allowed, base and default currency config values for given store.
+     *
+     * @param string $storeId
+     * @return void
+     */
+    private function setStoreConfig(string $storeId)
+    {
+        $allowedCurrencies = 'BDT,BNS,BTD';
+        $baseCurrency = 'BDT';
+        $this->config->saveConfig(
+            $this->baseCurrencyPath,
+            $baseCurrency,
+            'stores',
+            $storeId
+        );
+        $this->config->saveConfig(
+            $this->defaultCurrencyPath,
+            $baseCurrency,
+            'stores',
+            $storeId
+        );
+        $this->config->saveConfig(
+            $this->allowedCurrenciesPath,
+            $allowedCurrencies,
+            'stores',
+            $storeId
+        );
+        Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class)->reinit();
+        Bootstrap::getObjectManager()->create(StoreManagerInterface::class)->reinitStores();
+    }
+
+    protected function tearDown()
+    {
+        $this->clearCurrencyConfig();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
deleted file mode 100644
index c3549a60e2444..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Model;
-
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-
-/**
- * Integration test for \Magento\Directory\Model\Observer
- */
-class ObserverTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var  ObjectManagerInterface */
-    protected $objectManager;
-
-    /** @var Observer */
-    protected $observer;
-
-    /** @var \Magento\Framework\App\MutableScopeConfig */
-    protected $scopeConfig;
-
-    /** @var string */
-    protected $baseCurrency = 'USD';
-
-    /** @var string */
-    protected $baseCurrencyPath = 'currency/options/base';
-
-    /** @var string */
-    protected $allowedCurrenciesPath = 'currency/options/allow';
-
-    /** @var \Magento\Config\Model\ResourceModel\Config */
-    protected $configResource;
-
-    public function setUp()
-    {
-        $this->objectManager = Bootstrap::getObjectManager();
-
-        $this->scopeConfig = $this->objectManager->create(\Magento\Framework\App\MutableScopeConfig::class);
-        $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', ScopeInterface::SCOPE_STORE);
-
-        $this->configResource = $this->objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
-        $this->configResource->saveConfig(
-            $this->baseCurrencyPath,
-            $this->baseCurrency,
-            ScopeInterface::SCOPE_STORE,
-            0
-        );
-
-        $this->observer = $this->objectManager->create(\Magento\Directory\Model\Observer::class);
-    }
-
-    public function testScheduledUpdateCurrencyRates()
-    {
-        //skipping test if service is unavailable
-        $url = str_replace(
-            '{{CURRENCY_FROM}}',
-            'USD',
-            \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL
-        );
-        $url = str_replace('{{CURRENCY_TO}}', 'GBP', $url);
-        try {
-            file_get_contents($url);
-        } catch (\PHPUnit\Framework\Exception $e) {
-            $this->markTestSkipped('http://www.webservicex.net is unavailable ');
-        }
-
-        $allowedCurrencies = 'USD,GBP,EUR';
-        $this->configResource->saveConfig(
-            $this->allowedCurrenciesPath,
-            $allowedCurrencies,
-            ScopeInterface::SCOPE_STORE,
-            0
-        );
-        $this->observer->scheduledUpdateCurrencyRates(null);
-        /** @var Currency $currencyResource */
-        $currencyResource = $this->objectManager
-            ->create(\Magento\Directory\Model\CurrencyFactory::class)
-            ->create()
-            ->getResource();
-        $rates = $currencyResource->getCurrencyRates($this->baseCurrency, explode(',', $allowedCurrencies));
-        $this->assertNotEmpty($rates);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php
index 4d19e973556c0..60c2a41fae49f 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php
@@ -1,6 +1,9 @@
 <?php
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable;
 
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Magento\Downloadable\Controller\Adminhtml\Downloadable\File
  *
@@ -10,6 +13,17 @@
  */
 class FileTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $filePath = dirname(__DIR__) . '/_files/sample.tmp';
+        if (is_file($filePath)) {
+            unlink($filePath);
+        }
+    }
+
     public function testUploadAction()
     {
         copy(dirname(__DIR__) . '/_files/sample.txt', dirname(__DIR__) . '/_files/sample.tmp');
@@ -23,13 +37,57 @@ public function testUploadAction()
             ],
         ];
 
+        $this->getRequest()->setMethod('POST');
         $this->dispatch('backend/admin/downloadable_file/upload/type/samples');
         $body = $this->getResponse()->getBody();
-        $result = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Json\Helper\Data::class
-        )->jsonDecode(
-            $body
-        );
+        $result = Bootstrap::getObjectManager()->get(Json::class)->unserialize($body);
         $this->assertEquals(0, $result['error']);
     }
+
+    /**
+     * Checks a case when php files are not allowed to upload.
+     *
+     * @param string $fileName
+     * @dataProvider extensionsDataProvider
+     */
+    public function testUploadProhibitedExtensions($fileName)
+    {
+        $path = dirname(__DIR__) . '/_files/';
+        copy($path . 'sample.txt', $path . 'sample.tmp');
+
+        $_FILES = [
+            'samples' => [
+                'name' => $fileName,
+                'type' => 'text/plain',
+                'tmp_name' => $path . 'sample.tmp',
+                'error' => 0,
+                'size' => 0,
+            ],
+        ];
+
+        $this->getRequest()->setMethod('POST');
+        $this->dispatch('backend/admin/downloadable_file/upload/type/samples');
+        $body = $this->getResponse()->getBody();
+        $result = Bootstrap::getObjectManager()->get(Json::class)->unserialize($body);
+
+        self::assertArrayHasKey('errorcode', $result);
+        self::assertEquals(0, $result['errorcode']);
+        self::assertEquals('Disallowed file type.', $result['error']);
+    }
+
+    /**
+     * Returns different php file extensions.
+     *
+     * @return array
+     */
+    public function extensionsDataProvider()
+    {
+        return [
+            ['sample.php'],
+            ['sample.php3'],
+            ['sample.php4'],
+            ['sample.php5'],
+            ['sample.php7'],
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Observer/SetLinkStatusObserverTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Observer/SetLinkStatusObserverTest.php
index 978b6e1964b0d..196fd4b3bfb75 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Observer/SetLinkStatusObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Observer/SetLinkStatusObserverTest.php
@@ -31,6 +31,7 @@ protected function setUp()
      *
      * @magentoDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product.php
+     * @magentoDbIsolation disabled
      */
     public function testCheckStatusOnOrderCancel()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php
index f9e63c0418f3c..b070ef81a14b6 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Model/ResourceModel/Indexer/PriceTest.php
@@ -40,7 +40,7 @@ protected function setUp()
      * 2. Run reindexing.
      * 3. Load the product again and check all the prices.
      *
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Downloadable/_files/product_downloadable_with_files.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
new file mode 100644
index 0000000000000..9c0b328fc1664
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/**
+ * @var \Magento\Catalog\Model\Product $product
+ */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId(\Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE)
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Downloadable Product')
+    ->setSku('downloadable-product')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setLinksPurchasedSeparately(true)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+            'manage_stock' => 1,
+        ]
+    )->setLinksTitle(
+        'Downloadable Product Link Title'
+    );
+
+/**
+ * @var \Magento\Downloadable\Api\Data\LinkInterfaceFactory $linkFactory
+ */
+$linkFactory = $objectManager->get(\Magento\Downloadable\Api\Data\LinkInterfaceFactory::class);
+$links = [];
+$linkData = [
+    'title' => 'Downloadable Product Link',
+    'type' => \Magento\Downloadable\Helper\Download::LINK_TYPE_URL,
+    'is_shareable' => \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG,
+    'link_url' => 'http://example.com/downloadable.txt',
+    'link_id' => 0,
+    'is_delete' => null,
+];
+$link = $linkFactory->create(['data' => $linkData]);
+$link->setId(null);
+$link->setLinkType($linkData['type']);
+$link->setStoreId($product->getStoreId());
+$link->setWebsiteId($product->getStore()->getWebsiteId());
+$link->setProductWebsiteIds($product->getWebsiteIds());
+$link->setSortOrder(1);
+$link->setPrice(0);
+$link->setNumberOfDownloads(0);
+$links[] = $link;
+
+$linkData = [
+    'title' => 'Downloadable Product Link',
+    'sample' => [
+        'type' => \Magento\Downloadable\Helper\Download::LINK_TYPE_URL,
+        'url' => 'http://sampleUrl.com',
+    ],
+    'type' => \Magento\Downloadable\Helper\Download::LINK_TYPE_FILE,
+    'is_shareable' => \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG,
+    'link_url' => 'http://example.com/downloadable.txt',
+    'is_delete' => null,
+    'number_of_downloads' => 0,
+    'price' => 0,
+];
+/**
+ * @var \Magento\Downloadable\Api\Data\File\ContentInterface $sampleContent
+ */
+$sampleContent = $objectManager->create(\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class)->create();
+$sampleContent->setFileData(
+    base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
+);
+$sampleContent->setName('jellyfish_1_3.jpg');
+$sampleLink = $linkFactory->create(['data' => $linkData]);
+$sampleLink->setId(null);
+$sampleLink->setSampleType($linkData['sample']['type']);
+$sampleLink->setSampleFileContent($sampleContent);
+$sampleLink->setSampleUrl($linkData['sample']['url']);
+$sampleLink->setLinkType($linkData['type']);
+$sampleLink->setStoreId($product->getStoreId());
+$sampleLink->setWebsiteId($product->getStore()->getWebsiteId());
+$sampleLink->setProductWebsiteIds($product->getWebsiteIds());
+$sampleLink->setSortOrder(2);
+/**
+ * @var \Magento\Downloadable\Api\Data\File\ContentInterface $content
+ */
+$content = $objectManager->create(\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class)->create();
+$content->setFileData(
+    base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
+);
+$content->setName('jellyfish_2_4.jpg');
+//$content->setName('');
+$sampleLink->setLinkFileContent($content);
+$links[] = $sampleLink;
+
+$downloadableData = [
+    'sample' => [
+        [
+            'is_delete' => 0,
+            'sample_id' => 0,
+            'title' => 'Downloadable Product Sample Title',
+            'type' => \Magento\Downloadable\Helper\Download::LINK_TYPE_FILE,
+            'file' => json_encode(
+                [
+                    [
+                        'file' => '/f/u/jellyfish_1_4.jpg',
+                        'name' => 'jellyfish_1_4.jpg',
+                        'size' => 1024,
+                        'status' => 0,
+                    ],
+                ]
+            ),
+            'sample_url' => null,
+            'sort_order' => '0',
+        ],
+    ],
+];
+
+$extension = $product->getExtensionAttributes();
+
+$samples = [];
+$sampleFactory = $objectManager->create(\Magento\Downloadable\Api\Data\SampleInterfaceFactory::class);
+foreach ($downloadableData['sample'] as $sampleData) {
+    if (!$sampleData || (isset($sampleData['is_delete']) && (bool)$sampleData['is_delete'])) {
+        continue;
+    } else {
+        unset($sampleData['sample_id']);
+        /**
+         * @var \Magento\Downloadable\Api\Data\SampleInterface $sample
+         */
+        $sample = $sampleFactory->create(['data' => $sampleData]);
+        $sample->setId(null);
+        $sample->setStoreId($product->getStoreId());
+        $sample->setSampleType($sampleData['type']);
+        $sample->setSampleUrl($sampleData['sample_url']);
+        /**
+         * @var \Magento\Downloadable\Api\Data\File\ContentInterface $content
+         */
+        $content = $objectManager->create(
+            \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
+        )->create();
+        $content->setFileData(
+            base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
+        );
+        $content->setName('jellyfish_1_4.jpg');
+        $sample->setSampleFileContent($content);
+        $sample->setSortOrder($sampleData['sort_order']);
+        $samples[] = $sample;
+    }
+}
+
+$extension = $product->getExtensionAttributes();
+$extension->setDownloadableProductSamples($samples);
+$extension->setDownloadableProductLinks($links);
+$product->setExtensionAttributes($extension);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product)->getData();
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url_rollback.php
new file mode 100644
index 0000000000000..9ad910eed8739
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url_rollback.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require __DIR__ . '/product_downloadable_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
index d457c0037d252..b7427a23b1803 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 $billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Address::class,
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_rollback.php
new file mode 100644
index 0000000000000..96e3adb65a7d6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Sales/_files/default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_with_additional_options_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_with_additional_options_rollback.php
new file mode 100644
index 0000000000000..96e3adb65a7d6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product_with_additional_options_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Sales/_files/default_rollback.php';
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 ccc607080aa29..19cf449912b66 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/Downloadable/_files/product_downloadable_with_files.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php
index cf0da5599914f..86aa61a99e1e8 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php
@@ -154,3 +154,10 @@
     $product->setTypeHasRequiredOptions(false)->setRequiredOptions(false);
 }
 $product->save();
+
+$stockRegistry = $objectManager->get(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
+$stockItem = $stockRegistry->getStockItem($product->getId());
+$stockItem->setUseConfigManageStock(true);
+$stockItem->setQty(100);
+$stockItem->setIsInStock(true);
+$stockRegistry->updateStockItemBySku($product->getSku(), $stockItem);
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index 7d5cb55ec2f96..9961101dac7cb 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -9,7 +9,7 @@
 use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\CacheInterface;
-use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Serialize\Serializer\Json as Serializer;
 use Magento\Eav\Model\Entity\Attribute;
 
@@ -44,9 +44,9 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
     private $cache;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @var Serializer
@@ -60,7 +60,7 @@ protected function setUp()
 
         $this->defaultFrontend = $this->objectManager->get(DefaultFrontend::class);
         $this->cache = $this->objectManager->get(CacheInterface::class);
-        $this->storeResolver = $this->objectManager->get(StoreResolverInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->serializer = $this->objectManager->get(Serializer::class);
         $this->attribute = $this->objectManager->get(Attribute::class);
 
@@ -78,6 +78,19 @@ public function testGetSelectOptions()
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+     */
+    public function testAttributeEntityValueNotSet()
+    {
+        $entity = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        $entity->setStoreId(0);
+        $entity->load(1);
+        $frontEnd = $this->attribute->loadByCode('catalog_product', 'dropdown_attribute');
+        $value = $frontEnd->getFrontend()->getValue($entity);
+        $this->assertFalse($value);
+    }
+
     /**
      * Cache key generation
      * @return string
@@ -86,6 +99,6 @@ private function getCacheKey()
     {
         return 'attribute-navigation-option-' .
             $this->defaultFrontend->getAttribute()->getAttributeCode() . '-' .
-            $this->storeResolver->getCurrentStoreId();
+            $this->storeManager->getStore()->getId();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php
new file mode 100644
index 0000000000000..2750e2a768aab
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Eav\Model\Entity;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Locale\ResolverInterface;
+
+class AttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Attribute
+     */
+    private $attribute;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $_localeResolver;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->attribute = $this->objectManager->get(Attribute::class);
+        $this->_localeResolver = $this->objectManager->get(ResolverInterface::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown()
+    {
+        $this->attribute = null;
+        $this->objectManager = null;
+        $this->_localeResolver = null;
+    }
+
+    /**
+     * @param string $defaultValue
+     * @param string $backendType
+     * @param string $locale
+     * @param string $expected
+     * @dataProvider beforeSaveDataProvider
+     * @throws
+     */
+    public function testBeforeSave($defaultValue, $backendType, $locale, $expected)
+    {
+        $this->attribute->setDefaultValue($defaultValue);
+        $this->attribute->setBackendType($backendType);
+        $this->_localeResolver->setLocale($locale);
+        $this->attribute->beforeSave();
+
+        $this->assertEquals($expected, $this->attribute->getDefaultValue());
+    }
+
+    /**
+     * Data provider for beforeSaveData.
+     *
+     * @return array
+     */
+    public function beforeSaveDataProvider()
+    {
+        return [
+            ['21/07/18', 'datetime', 'en_AU', '2018-07-21 00:00:00'],
+            ['07/21/18', 'datetime', 'en_US', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'fr_FR', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'de_DE', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'uk_UA', '2018-07-21 00:00:00'],
+            ['100.50', 'decimal', 'en_US', '100.50'],
+            ['100,50', 'decimal', 'uk_UA', '100.5'],
+        ];
+    }
+
+    /**
+     * @param string $defaultValue
+     * @param string $backendType
+     * @param string $locale
+     * @param string $expected
+     * @dataProvider beforeSaveErrorDataDataProvider
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testBeforeSaveErrorData($defaultValue, $backendType, $locale, $expected)
+    {
+        $this->attribute->setDefaultValue($defaultValue);
+        $this->attribute->setBackendType($backendType);
+        $this->_localeResolver->setLocale($locale);
+        $this->attribute->beforeSave();
+
+        $this->expectExceptionMessage($expected);
+    }
+
+    /**
+     * Data provider for beforeSaveData with error result.
+     *
+     * @return array
+     */
+    public function beforeSaveErrorDataDataProvider()
+    {
+        return [
+            'wrong date for Australia' => ['32/38', 'datetime', 'en_AU', 'Invalid default date'],
+            'wrong date for States' => ['32/38', 'datetime', 'en_US', 'Invalid default date'],
+            'wrong decimal separator for US' => ['100,50', 'decimal', 'en_US', 'Invalid default decimal value'],
+            'wrong decimal separator for UA' => ['100.50', 'decimal', 'uk_UA', 'Invalid default decimal value'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/Entity/Attribute/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/Entity/Attribute/CollectionTest.php
index e39f1e2fd8390..c273e87f6d738 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/Entity/Attribute/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/Entity/Attribute/CollectionTest.php
@@ -52,6 +52,20 @@ public function testSetAttributeGroupFilter()
         $this->assertEquals([$includeGroupId], $groups);
     }
 
+    /**
+     * Test if getAllIds method return results after using setInAllAttributeSetsFilter method
+     *
+     * @covers \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::setInAllAttributeSetsFilter()
+     * @covers \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::getAllIds()
+     */
+    public function testSetInAllAttributeSetsFilterWithGetAllIds()
+    {
+        $sets = [1];
+        $this->_model->setInAllAttributeSetsFilter($sets);
+        $attributeIds = $this->_model->getAllIds();
+        $this->assertGreaterThan(0, count($attributeIds));
+    }
+
     /**
      * Returns array of group ids, present in collection attributes
      *
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php
index eac9bd78ab478..3316a80a91a4f 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php
@@ -22,6 +22,7 @@ class UpdateHandlerTest extends \Magento\TestFramework\Indexer\TestCase
      * @param $snapshotValue
      * @param $newValue
      * @param $expected
+     * @magentoDbIsolation disabled
      */
     public function testExecuteProcessForAllStores($code, $snapshotValue, $newValue, $expected)
     {
@@ -57,6 +58,7 @@ public function testExecuteProcessForAllStores($code, $snapshotValue, $newValue,
      * @param $snapshotValue
      * @param $newValue
      * @param $expected
+     * @magentoDbIsolation disabled
      */
     public function testExecuteProcessForCustomStore($code, $snapshotValue, $newValue, $expected)
     {
@@ -101,6 +103,7 @@ public function testExecuteProcessForCustomStore($code, $snapshotValue, $newValu
      * @param $snapshotValue
      * @param $newValue
      * @param $expected
+     * @magentoDbIsolation disabled
      */
     public function testExecuteProcessForCustomAttributeInCustomStore(
         $code,
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/TypeLocatorTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/TypeLocatorTest.php
index db6c8ba915409..1ddfca26256b2 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/TypeLocatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/TypeLocatorTest.php
@@ -191,9 +191,9 @@ public function getExpectedAttributeTypesProvider(): array
                     'is_anchor' => 'int',
                     'custom_design_from' => 'string',
                     'custom_design_to' => 'string',
-                    'available_sort_by' => \Magento\Eav\Api\Data\AttributeOptionInterface::class,
+                    'available_sort_by' => 'string[]',
                     'page_layout' => 'string',
-                    'default_sort_by' => \Magento\Eav\Api\Data\AttributeOptionInterface::class,
+                    'default_sort_by' => 'string[]',
                     'filter_price_range' => 'double',
                     'custom_layout_update' => 'string',
                 ]
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
new file mode 100644
index 0000000000000..fcd8226aec50c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Controller\Adminhtml\Category;
+
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Category\Product as CategoryIndexer;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
+ */
+class SaveTest extends AbstractBackendController
+{
+    private $indexerSchedule = [];
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $config->method('isElasticsearchEnabled')
+            ->willReturn(true);
+        $this->_objectManager->addSharedInstance($config, Config::class);
+
+        $this->changeIndexerSchedule(FulltextIndexer::INDEXER_ID, true);
+        $this->changeIndexerSchedule(CategoryIndexer::INDEXER_ID, true);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(Config::class);
+        $this->changeIndexerSchedule(FulltextIndexer::INDEXER_ID, $this->indexerSchedule[FulltextIndexer::INDEXER_ID]);
+        $this->changeIndexerSchedule(CategoryIndexer::INDEXER_ID, $this->indexerSchedule[CategoryIndexer::INDEXER_ID]);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Checks a case when indexers are invalidated if products for category were changed.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     */
+    public function testExecute()
+    {
+        $fulltextIndexer = $this->getIndexer(FulltextIndexer::INDEXER_ID);
+        self::assertTrue($fulltextIndexer->isValid(), 'Fulltext indexer should be valid.');
+        $categoryIndexer = $this->getIndexer(CategoryIndexer::INDEXER_ID);
+        self::assertTrue($categoryIndexer->isValid(), 'Category indexer should be valid.');
+
+        $category = $this->getCategory('Category 1');
+        $productIdList = $this->getProductIdList(['simple1', 'simple2', 'simple3']);
+        $inputData = [
+            'category_products' => json_encode(array_fill_keys($productIdList, [0, 1, 2])),
+            'entity_id' => $category->getId(),
+            'default_sort_by' => 'position'
+        ];
+
+        $this->getRequest()->setPostValue($inputData);
+        $this->getRequest()->setMethod('POST');
+        $this->dispatch('backend/catalog/category/save');
+        $this->assertSessionMessages(
+            self::equalTo(['You saved the category.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        $fulltextIndexer = $this->getIndexer(FulltextIndexer::INDEXER_ID);
+        self::assertTrue($fulltextIndexer->isInvalid(), 'Fulltext indexer should be invalidated.');
+        $categoryIndexer = $this->getIndexer(CategoryIndexer::INDEXER_ID);
+        self::assertTrue($categoryIndexer->isInvalid(), 'Category indexer should be invalidated.');
+    }
+
+    /**
+     * Gets indexer from registry by ID.
+     *
+     * @param string $indexerId
+     * @return IndexerInterface
+     */
+    private function getIndexer(string $indexerId): IndexerInterface
+    {
+        /** @var IndexerRegistry $indexerRegistry */
+        $indexerRegistry = $this->_objectManager->get(IndexerRegistry::class);
+        return $indexerRegistry->get($indexerId);
+    }
+
+    /**
+     * Changes the scheduled state of indexer.
+     *
+     * @param string $indexerId
+     * @param bool $isScheduled
+     * @return void
+     */
+    private function changeIndexerSchedule(string $indexerId, bool $isScheduled): void
+    {
+        $indexer = $this->getIndexer($indexerId);
+        if (!isset($this->indexerSchedule[$indexerId])) {
+            $this->indexerSchedule[$indexerId] = $indexer->isScheduled();
+            $indexer->reindexAll();
+        }
+        $indexer->setScheduled($isScheduled);
+    }
+
+    /**
+     * Gets category by name.
+     *
+     * @param string $name
+     * @return CategoryInterface
+     */
+    private function getCategory(string $name): CategoryInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+            ->create();
+        /** @var CategoryListInterface $repository */
+        $repository = $this->_objectManager->get(CategoryListInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets list of product ID by SKU.
+     *
+     * @param array $skuList
+     * @return array
+     */
+    private function getProductIdList(array $skuList): array
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('sku', $skuList, 'in')
+            ->create();
+
+        /** @var ProductRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        $idList = array_map(function (ProductInterface $item) {
+            return $item->getId();
+        }, $items);
+
+        return $idList;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
new file mode 100644
index 0000000000000..978815f665341
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class AdapterTest
+ */
+class AdapterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter
+     */
+    private $adapter;
+
+    /**
+     * @var \Magento\Elasticsearch\Model\Client\Elasticsearch|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $clientMock;
+
+    /**
+     * @var \Magento\Framework\Search\Request\Builder
+     */
+    private $requestBuilder;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $contentManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contentManager
+            ->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->clientMock);
+        /** @var \Magento\Framework\Search\Request\Config\Converter $converter */
+        $converter = $objectManager->create(\Magento\Framework\Search\Request\Config\Converter::class);
+
+        $document = new \DOMDocument();
+        $document->load($this->getRequestConfigPath());
+        $requestConfig = $converter->convert($document);
+
+        /** @var \Magento\Framework\Search\Request\Config $config */
+        $config = $objectManager->create(\Magento\Framework\Search\Request\Config::class);
+        $config->merge($requestConfig);
+
+        $this->requestBuilder = $objectManager->create(
+            \Magento\Framework\Search\Request\Builder::class,
+            ['config' => $config]
+        );
+        $this->loggerMock = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
+
+        $this->adapter = $objectManager->create(
+            \Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class,
+            [
+                'connectionManager' => $contentManager,
+                'logger' => $this->loggerMock
+            ]
+        );
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     * @return void
+     */
+    public function testQuery()
+    {
+        $this->requestBuilder->bind('fulltext_search_query', 'socks');
+        $this->requestBuilder->setRequestName('one_match');
+        $queryRequest = $this->requestBuilder->create();
+        $exception = new \Exception('Test Message');
+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
+        $this->clientMock->expects($this->once())->method('query')->willThrowException($exception);
+        $actualResponse = $this->adapter->query($queryRequest);
+        $this->assertEmpty($actualResponse->getAggregations()->getBuckets());
+        $this->assertEquals(0, $actualResponse->count());
+    }
+
+    /**
+     * Get request config path
+     *
+     * @return string
+     */
+    private function getRequestConfigPath()
+    {
+        return __DIR__ . '/../../_files/requests.xml';
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
new file mode 100644
index 0000000000000..61add5f7d0ea7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Client;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Indexer\Model\Indexer;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
+ */
+class ElasticsearchTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConnectionManager
+     */
+    private $connectionManager;
+
+    /**
+     * @var ElasticsearchClient
+     */
+    private $client;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Config
+     */
+    private $clientConfig;
+
+    /**
+     * @var SearchIndexNameResolver
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->connectionManager = $objectManager->create(ConnectionManager::class);
+        $this->client = $this->connectionManager->getConnection();
+        $this->storeManager = $objectManager->create(StoreManagerInterface::class);
+        $this->clientConfig = $objectManager->create(Config::class);
+        $this->searchIndexNameResolver = $objectManager->create(SearchIndexNameResolver::class);
+        $this->productRepository = $objectManager->create(ProductRepositoryInterface::class);
+        $indexer = $objectManager->create(Indexer::class);
+        $indexer->load('catalogsearch_fulltext');
+        $indexer->reindexAll();
+    }
+
+    /**
+     * @param string $text
+     * @return array
+     */
+    private function search($text)
+    {
+        $storeId = $this->storeManager->getDefaultStoreView()->getId();
+        $searchQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($storeId, 'catalogsearch_fulltext'),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'minimum_should_match' => 1,
+                        'should' => [
+                            [
+                                'match' => [
+                                    '_all' => $text,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $queryResult = $this->client->query($searchQuery);
+        return isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : [];
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
+     */
+    public function testSearchConfigurableProductBySimpleProductName()
+    {
+        $this->assertProductWithSkuFound('configurable', $this->search('Configurable Option'));
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
+     */
+    public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
+    {
+        $this->assertProductWithSkuFound('configurable', $this->search('dog'));
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
+     */
+    public function testSearchConfigurableProductBySimpleProductAttributeSelect()
+    {
+        $this->assertProductWithSkuFound('configurable', $this->search('chair'));
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
+     */
+    public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()
+    {
+        $this->assertProductWithSkuFound('configurable', $this->search('simpledescription'));
+    }
+
+    /**
+     * Assert that product with SKU is present in response
+     *
+     * @param string $sku
+     * @param array $result
+     * @return bool
+     */
+    private function assertProductWithSkuFound($sku, array $result)
+    {
+        foreach ($result as $item) {
+            if ($item['_source']['sku'] == $sku) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
new file mode 100755
index 0000000000000..014aaf7679bc9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Indexer;
+
+use Magento\Catalog\Model\Product\Action as ProductAction;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Indexer\Model\Indexer;
+
+/**
+ * Important: Please make sure that each integration test file works with unique elastic search index. In order to
+ * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test
+ * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest'
+ *
+ * @magentoDbIsolation disabled
+ * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IndexHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ElasticsearchClient
+     */
+    private $client;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var int[]
+     */
+    private $storeIds;
+
+    /**
+     * @var string
+     */
+    private $entityType;
+
+    /**
+     * @var Indexer
+     */
+    private $indexer;
+
+    /**
+     * @var SearchIndexNameResolver
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $connectionManager = Bootstrap::getObjectManager()->create(ConnectionManager::class);
+        $this->client = $connectionManager->getConnection();
+
+        $this->storeManager = Bootstrap::getObjectManager()->create(StoreManagerInterface::class);
+        $this->storeIds = array_keys($this->storeManager->getStores());
+
+        $clientConfig = Bootstrap::getObjectManager()->create(Config::class);
+        $this->entityType = $clientConfig->getEntityType();
+
+        $this->indexer = Bootstrap::getObjectManager()->create(Indexer::class);
+        $this->indexer->load(CatalogSearchFulltextIndexer::INDEXER_ID);
+        $this->indexer->reindexAll();
+
+        $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create(SearchIndexNameResolver::class);
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
+     * @return void
+     */
+    public function testReindexAll(): void
+    {
+        $productApple = $this->productRepository->get('fulltext-1');
+        foreach ($this->storeIds as $storeId) {
+            $products = $this->searchByName('Apple', $storeId);
+            $this->assertCount(1, $products);
+            $this->assertEquals($productApple->getId(), $products[0]['_id']);
+
+            $products = $this->searchByName('Simple Product', $storeId);
+            $this->assertCount(5, $products);
+        }
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
+     * @return void
+     */
+    public function testReindexRowAfterEdit(): void
+    {
+        $this->storeManager->setCurrentStore('admin');
+        $productApple = $this->productRepository->get('fulltext-1');
+        $productApple->setName('Simple Product Cucumber');
+        $this->productRepository->save($productApple);
+
+        foreach ($this->storeIds as $storeId) {
+            $products = $this->searchByName('Apple', $storeId);
+            $this->assertCount(0, $products);
+
+            $products = $this->searchByName('Cucumber', $storeId);
+            $this->assertCount(1, $products);
+            $this->assertEquals($productApple->getId(), $products[0]['_id']);
+
+            $products = $this->searchByName('Simple Product', $storeId);
+            $this->assertCount(5, $products);
+        }
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
+     * @return void
+     */
+    public function testReindexRowAfterMassAction(): void
+    {
+        $productApple = $this->productRepository->get('fulltext-1');
+        $productBanana = $this->productRepository->get('fulltext-2');
+        $productIds = [
+            $productApple->getId(),
+            $productBanana->getId(),
+        ];
+        $attrData = [
+            'name' => 'Simple Product Common',
+        ];
+        /** @var ProductAction $action */
+        $action = Bootstrap::getObjectManager()->get(ProductAction::class);
+
+        foreach ($this->storeIds as $storeId) {
+            $action->updateAttributes($productIds, $attrData, $storeId);
+
+            $products = $this->searchByName('Apple', $storeId);
+            $this->assertCount(0, $products);
+
+            $products = $this->searchByName('Banana', $storeId);
+            $this->assertCount(0, $products);
+
+            $products = $this->searchByName('Unknown', $storeId);
+            $this->assertCount(0, $products);
+
+            $products = $this->searchByName('Common', $storeId);
+            $this->assertCount(2, $products);
+
+            $products = $this->searchByName('Simple Product', $storeId);
+            $this->assertCount(5, $products);
+        }
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testReindexRowAfterDelete(): void
+    {
+        $productBanana = $this->productRepository->get('fulltext-2');
+        $this->productRepository->delete($productBanana);
+
+        foreach ($this->storeIds as $storeId) {
+            $products = $this->searchByName('Banana', $storeId);
+            $this->assertEmpty($products);
+
+            $products = $this->searchByName('Simple Product', $storeId);
+            $this->assertCount(4, $products);
+        }
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
+     * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
+     * @return void
+     */
+    public function testReindexRowAfterUpdateStockStatus(): void
+    {
+        foreach ($this->storeIds as $storeId) {
+            $products = $this->searchByName('ProductOption1', $storeId);
+            $this->assertNotEmpty($products);
+        }
+        $product = $this->productRepository->get('simple_10');
+        /** @var StockRegistryInterface $stockRegistry */
+        $stockRegistry = Bootstrap::getObjectManager()->create(StockRegistryInterface::class);
+        $stockItem = $stockRegistry->getStockItem($product->getId());
+        $stockItem->setIsInStock(false);
+        /** @var StockItemRepositoryInterface $stockRepository */
+        $stockRepository = Bootstrap::getObjectManager()->create(StockItemRepositoryInterface::class);
+        $stockRepository->save($stockItem);
+
+        foreach ($this->storeIds as $storeId) {
+            $products = $this->searchByName('ProductOption1', $storeId);
+            $this->assertEmpty($products);
+
+            $products = $this->searchByName('Configurable', $storeId);
+            $this->assertNotEmpty($products);
+        }
+    }
+
+    /**
+     * Search docs in Elasticsearch by name.
+     *
+     * @param string $text
+     * @param int $storeId
+     * @return array
+     */
+    private function searchByName(string $text, int $storeId): array
+    {
+        $index = $this->searchIndexNameResolver->getIndexName($storeId, $this->indexer->getId());
+        $searchQuery = [
+            'index' => $index,
+            'type' => $this->entityType,
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'minimum_should_match' => 1,
+                        'should' => [
+                            [
+                                'match' => [
+                                    'name' => $text,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $queryResult = $this->client->query($searchQuery);
+        $products = isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : [];
+
+        return $products;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
new file mode 100644
index 0000000000000..d40ce9e8a0706
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Indexer;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Indexer\Model\Indexer;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+
+/**
+ * Important: Please make sure that each integration test file works with unique elastic search index. In order to
+ * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test
+ * method.
+ * E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable'
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ */
+class ReindexAllTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConnectionManager
+     */
+    private $connectionManager;
+
+    /**
+     * @var ElasticsearchClient
+     */
+    private $client;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Config
+     */
+    private $clientConfig;
+
+    /**
+     * @var SearchIndexNameResolver
+     */
+    private $searchIndexNameResolver;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->connectionManager = Bootstrap::getObjectManager()->create(ConnectionManager::class);
+        $this->client = $this->connectionManager->getConnection();
+        $this->storeManager = Bootstrap::getObjectManager()->create(StoreManagerInterface::class);
+        $this->clientConfig = Bootstrap::getObjectManager()->create(Config::class);
+        $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create(SearchIndexNameResolver::class);
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Test search of all products after full reindex
+     *
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     */
+    public function testSearchAll()
+    {
+        $this->reindexAll();
+        $result = $this->searchByName('Configurable Product');
+        self::assertGreaterThanOrEqual(2, $result);
+    }
+
+    /**
+     * Test search of specific product after full reindex
+     *
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     */
+    public function testSearchSpecificProduct()
+    {
+        $this->reindexAll();
+        $result = $this->searchByName('12345');
+        self::assertCount(1, $result);
+
+        $specificProduct = $this->productRepository->get('configurable_12345');
+        self::assertEquals($specificProduct->getId(), $result[0]['_id']);
+    }
+
+    /**
+     * @param string $text
+     * @return array
+     */
+    private function searchByName($text)
+    {
+        $storeId = $this->storeManager->getDefaultStoreView()->getId();
+        $searchQuery = [
+            'index' => $this->searchIndexNameResolver->getIndexName($storeId, 'catalogsearch_fulltext'),
+            'type' => $this->clientConfig->getEntityType(),
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'minimum_should_match' => 1,
+                        'should' => [
+                            [
+                                'match' => [
+                                    'name' => $text,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $queryResult = $this->client->query($searchQuery);
+        return isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : [];
+    }
+
+    /**
+     * Make fulltext catalog search reindex
+     *
+     * @return void
+     */
+    private function reindexAll()
+    {
+        // Perform full reindex
+        /** @var Indexer $indexer */
+        $indexer = Bootstrap::getObjectManager()->create(Indexer::class);
+        $indexer->load('catalogsearch_fulltext');
+        $indexer->reindexAll();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
new file mode 100644
index 0000000000000..dc288a18fadb7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -0,0 +1,372 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\SearchAdapter;
+
+use Magento\Elasticsearch\Model\Config;
+
+/**
+ * Class AdapterTest
+ *
+ * @magentoDbIsolation disabled
+ * @magentoDataFixture Magento/Framework/Search/_files/products.php
+ *
+ * Important: Please make sure that each integration test file works with unique elastic search index. In order to
+ * achieve this, use @ magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test
+ * method. E.g. '@ magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest'
+ *
+ * In ElasticSearch, a reindex is required if the test includes a new data fixture with new items to search, see
+ * testAdvancedSearchDateField().
+ *
+ */
+class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
+{
+    /**
+     * @var string
+     */
+    protected $searchEngine = Config::ENGINE_NAME;
+
+    /**
+     * Get request config path
+     *
+     * @return string
+     */
+    protected function getRequestConfigPath()
+    {
+        return __DIR__ . '/../_files/requests.xml';
+    }
+
+    /**
+     * @return \Magento\Framework\Search\AdapterInterface
+     */
+    protected function createAdapter()
+    {
+        return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class);
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testMatchQuery()
+    {
+        parent::testMatchQuery();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testMatchOrderedQuery()
+    {
+        $this->markTestSkipped(
+            'Elasticsearch not expected to order results by default. Test is skipped intentionally.'
+        );
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testAggregationsQuery()
+    {
+        $this->markTestSkipped('Range query is not supported. Test is skipped intentionally.');
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testMatchQueryFilters()
+    {
+        parent::testMatchQueryFilters();
+    }
+
+    /**
+     * Range filter test with all fields filled
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testRangeFilterWithAllFields()
+    {
+        parent::testRangeFilterWithAllFields();
+    }
+
+    /**
+     * Range filter test with all fields filled
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testRangeFilterWithoutFromField()
+    {
+        parent::testRangeFilterWithoutFromField();
+    }
+
+    /**
+     * Range filter test with all fields filled
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testRangeFilterWithoutToField()
+    {
+        parent::testRangeFilterWithoutToField();
+    }
+
+    /**
+     * Term filter test
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testTermFilter()
+    {
+        parent::testTermFilter();
+    }
+
+    /**
+     * Term filter test
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testTermFilterArray()
+    {
+        parent::testTermFilterArray();
+    }
+
+    /**
+     * Term filter test
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testWildcardFilter()
+    {
+        parent::testWildcardFilter();
+    }
+
+    /**
+     * Request limits test
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testSearchLimit()
+    {
+        parent::testSearchLimit();
+    }
+
+    /**
+     * Bool filter test
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testBoolFilter()
+    {
+        parent::testBoolFilter();
+    }
+
+    /**
+     * Test bool filter with nested negative bool filter
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testBoolFilterWithNestedNegativeBoolFilter()
+    {
+        parent::testBoolFilterWithNestedNegativeBoolFilter();
+    }
+
+    /**
+     * Test range inside nested negative bool filter
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
+    {
+        parent::testBoolFilterWithNestedRangeInNegativeBoolFilter();
+    }
+
+    /**
+     * Sample Advanced search request test
+     *
+     * @dataProvider elasticSearchAdvancedSearchDataProvider
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     * @param string $nameQuery
+     * @param string $descriptionQuery
+     * @param array $rangeFilter
+     * @param int $expectedRecordsCount
+     */
+    public function testSimpleAdvancedSearch(
+        $nameQuery,
+        $descriptionQuery,
+        $rangeFilter,
+        $expectedRecordsCount
+    ) {
+        parent::testSimpleAdvancedSearch(
+            $nameQuery,
+            $descriptionQuery,
+            $rangeFilter,
+            $expectedRecordsCount
+        );
+    }
+
+    /**
+     * Elastic Search specific data provider for advanced search test.
+     *
+     * The expected array is for Elastic Search is different that the one for MySQL
+     * because sometimes more matches are returned. For instance, 3rd index below
+     * will return 3 matches instead of 1 (which is what MySQL returns).
+     *
+     * @return array
+     */
+    public function elasticSearchAdvancedSearchDataProvider()
+    {
+        return [
+            ['white', 'shorts', ['from' => '16', 'to' => '18'], 0],
+            ['white', 'shorts',['from' => '12', 'to' => '18'], 1],
+            ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0],
+            ['shorts', 'green', ['from' => '12', 'to' => '22'], 3],
+            //Search with empty fields/values
+            ['white', '  ', ['from' => '12', 'to' => '22'], 1],
+            ['  ', 'green', ['from' => '12', 'to' => '22'], 2]
+        ];
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testCustomFilterableAttribute()
+    {
+        // Reindex Elastic Search since filterable_attribute data fixture added new fields to be indexed
+        $this->reindexAll();
+        parent::testCustomFilterableAttribute();
+    }
+
+    /**
+     * Test filtering by two attributes.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     * @dataProvider filterByAttributeValuesDataProvider
+     * @param string $requestName
+     * @param array $additionalData
+     * @return void
+     */
+    public function testFilterByAttributeValues($requestName, $additionalData)
+    {
+        // Reindex Elastic Search since filterable_attribute data fixture added new fields to be indexed
+        $this->reindexAll();
+        parent::testFilterByAttributeValues($requestName, $additionalData);
+    }
+
+    /**
+     * Advanced search request using date product attribute
+     *
+     * @param $rangeFilter
+     * @param $expectedRecordsCount
+     * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     * @magentoAppIsolation enabled
+     * @dataProvider dateDataProvider
+     */
+    public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
+    {
+        // Reindex Elastic Search since date_attribute data fixture added new fields to be indexed
+        $this->reindexAll();
+        parent::testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testAdvancedSearchCompositeProductWithOutOfStockOption()
+    {
+        parent::testAdvancedSearchCompositeProductWithOutOfStockOption();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testAdvancedSearchCompositeProductWithDisabledChild()
+    {
+        // Reindex Elastic Search since date_attribute data fixture added new fields to be indexed
+        $this->reindexAll();
+        parent::testAdvancedSearchCompositeProductWithDisabledChild();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
+     */
+    public function testSearchQueryBoost()
+    {
+        // Reindex Elastic Search since date_attribute data fixture added new fields to be indexed
+        $this->reindexAll();
+        parent::testSearchQueryBoost();
+    }
+
+    /**
+     * Perform full reindex
+     *
+     * @return void
+     */
+    private function reindexAll()
+    {
+        $indexer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Indexer\Model\Indexer::class
+        );
+        $indexer->load('catalogsearch_fulltext');
+        $indexer->reindexAll();
+    }
+
+    /**
+     * Date data provider
+     *
+     * @return array
+     */
+    public function dateDataProvider()
+    {
+        return [
+            [['from' => '1999-12-31T00:00:00Z', 'to' => '2000-01-01T00:00:00Z'], 1],
+            [['from' => '2000-02-01T00:00:00Z', 'to' => ''], 0],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php
new file mode 100644
index 0000000000000..7ec53d9099d35
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+
+$eavConfig->clear();
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+if (!$attribute->getId()) {
+    /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+    $attribute = Bootstrap::getObjectManager()->create(
+        \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+    );
+
+    /** @var AttributeRepositoryInterface $attributeRepository */
+    $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
+
+    $attribute->setData(
+        [
+            'attribute_code' => 'test_configurable',
+            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'select',
+            'is_unique' => 0,
+            'is_required' => 0,
+            'is_searchable' => 0,
+            'is_visible_in_advanced_search' => 0,
+            'is_comparable' => 0,
+            'is_filterable' => 0,
+            'is_filterable_in_search' => 0,
+            'is_used_for_promo_rules' => 0,
+            'is_html_allowed_on_front' => 1,
+            'is_visible_on_front' => 0,
+            'used_in_product_listing' => 0,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Test Configurable'],
+            'backend_type' => 'int',
+            'option' => [
+                'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
+                'order' => ['option_0' => 1, 'option_1' => 2],
+            ],
+        ]
+    );
+
+    $attributeRepository->save($attribute);
+
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+}
+
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php
new file mode 100644
index 0000000000000..7bdfbc6d7f9b3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+    && $attribute->getId()
+) {
+    $attribute->delete();
+}
+$eavConfig->clear();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php
new file mode 100644
index 0000000000000..f8872b02ba246
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/select_attribute.php';
+require __DIR__ . '/multiselect_attribute.php';
+require __DIR__ . '/configurable_attribute.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CategorySetup $installer */
+$installer = $objectManager->create(CategorySetup::class);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+
+/** @var AttributeOptionInterface[] $options */
+$options = $attribute->getOptions();
+
+$attributeValues = [];
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+$associatedProductIds = [];
+$productIds = [10, 20];
+array_shift($options);
+foreach ($options as $option) {
+    /** @var Product $product */
+    $product = $objectManager->create(Product::class);
+    $productId = array_shift($productIds);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option Product' . str_replace(' ', '', $option->getLabel()))
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->setTestConfigurable($option->getValue())
+        ->setShortDescription('simpledescription')
+        ->setMultiselectAttribute([$multiselectOptionsIds[0]])
+        ->setSelectAttribute([$selectOptionsIds[0]])
+        ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(
+            [
+                'use_config_manage_stock' => 1,
+                'qty' => 100,
+                'is_qty_decimal' => 0,
+                'is_in_stock' => 1
+            ]
+        );
+    $product = $productRepository->save($product);
+
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+}
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+/** @var Factory $optionsFactory */
+$optionsFactory = $objectManager->create(Factory::class);
+$configurableAttributesData = [
+    [
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $attributeValues,
+    ],
+];
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setId(1)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->cleanCache();
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php
new file mode 100644
index 0000000000000..e73d2ab1b5906
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple_10', 'simple_20', 'configurable'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    }
+}
+
+require __DIR__ . '/configurable_attribute_rollback.php';
+require __DIR__ . '/select_attribute_rollback.php';
+require __DIR__ . '/multiselect_attribute_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php
new file mode 100644
index 0000000000000..cf87be7e8d710
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\Framework\ObjectManagerInterface */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+
+/** @var \Magento\Store\Model\Store $store */
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$storeCode = 'secondary';
+
+if (!$store->load($storeCode)->getId()) {
+    $store->setCode($storeCode)
+        ->setWebsiteId($storeManager->getWebsite()->getId())
+        ->setGroupId($storeManager->getWebsite()->getDefaultGroupId())
+        ->setName('Secondary Store View')
+        ->setSortOrder(10)
+        ->setIsActive(1);
+    $store->save();
+
+    /** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */
+    $scopeConfig = $objectManager->get(\Magento\Framework\App\MutableScopeConfig::class);
+    $scopeConfig->setValue(
+        'general/locale/code',
+        'de_DE',
+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        $store->getId()
+    );
+}
+
+/** @var $productFirst \Magento\Catalog\Model\Product */
+$productFirst = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$productFirst->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Apple')
+    ->setSku('fulltext-1')
+    ->setPrice(10)
+    ->setMetaTitle('first meta title')
+    ->setMetaKeyword('first meta keyword')
+    ->setMetaDescription('first 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])
+    ->save();
+
+/** @var $productSecond \Magento\Catalog\Model\Product */
+$productSecond = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$productSecond->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Banana')
+    ->setSku('fulltext-2')
+    ->setPrice(20)
+    ->setMetaTitle('second meta title')
+    ->setMetaKeyword('second meta keyword')
+    ->setMetaDescription('second 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])
+    ->save();
+
+/** @var $productThird \Magento\Catalog\Model\Product */
+$productThird = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$productThird->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Orange')
+    ->setSku('fulltext-3')
+    ->setPrice(20)
+    ->setMetaTitle('third meta title')
+    ->setMetaKeyword('third meta keyword')
+    ->setMetaDescription('third 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])
+    ->save();
+
+/** @var $productFourth \Magento\Catalog\Model\Product */
+$productFourth = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$productFourth->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Papaya')
+    ->setSku('fulltext-4')
+    ->setPrice(20)
+    ->setMetaTitle('fourth meta title')
+    ->setMetaKeyword('fourth meta keyword')
+    ->setMetaDescription('fourth 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])
+    ->save();
+
+/** @var $productFifth \Magento\Catalog\Model\Product */
+$productFifth = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$productFifth->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Cherry')
+    ->setSku('fulltext-5')
+    ->setPrice(20)
+    ->setMetaTitle('fifth meta title')
+    ->setMetaKeyword('fifth meta keyword')
+    ->setMetaDescription('fifth 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])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php
new file mode 100644
index 0000000000000..9ca4f78660b3a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\Framework\ObjectManagerInterface */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+$collection->addAttributeToSelect('id')->load();
+if ($collection->count() > 0) {
+    $collection->delete();
+}
+
+/** @var \Magento\Store\Model\Store $store */
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$storeCode = 'secondary';
+$store->load($storeCode);
+if ($store->getId()) {
+    $store->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php
new file mode 100644
index 0000000000000..f9e4034f21552
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Setup\CategorySetup $installer */
+$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+$multiselectAttribute = $objectManager->create(
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+$multiselectAttribute->setData(
+    [
+        'attribute_code' => 'multiselect_attribute',
+        'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+        'is_global' => 1,
+        'is_user_defined' => 1,
+        'frontend_input' => 'multiselect',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 1,
+        'is_visible_in_advanced_search' => 0,
+        'is_comparable' => 0,
+        'is_filterable' => 1,
+        'is_filterable_in_search' => 0,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 0,
+        'used_in_product_listing' => 0,
+        'used_for_sort_by' => 0,
+        'frontend_label' => ['Multiselect Attribute'],
+        'backend_type' => 'varchar',
+        'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+        'option' => [
+            'value' => [
+                'dog' => ['Dog'],
+                'cat' => ['Cat'],
+            ],
+            'order' => [
+                'dog' => 1,
+                'cat' => 2,
+            ],
+        ],
+    ]
+);
+$multiselectAttribute->save();
+
+$installer->addAttributeToGroup(
+    'catalog_product',
+    'Default',
+    'General',
+    $multiselectAttribute->getId()
+);
+
+/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $multiselectOptions */
+$multiselectOptions = $objectManager->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$multiselectOptions->setAttributeFilter($multiselectAttribute->getId());
+$multiselectOptionsIds = $multiselectOptions->getAllIds();
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute_rollback.php
new file mode 100644
index 0000000000000..eda8e8bbe1c2a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+$attribute = $objectManager->create(
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+$attribute->load('multiselect_attribute', 'attribute_code');
+$attribute->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml
new file mode 100644
index 0000000000000..0aaaf9b85857f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml
@@ -0,0 +1,454 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Search/etc/search_request_merged.xsd">
+    <request query="one_match" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="one_match" boost="2">
+                <queryReference clause="must" ref="fulltext_search_query"/>
+            </query>
+
+            <query xsi:type="matchQuery" name="fulltext_search_query" value="$fulltext_search_query$" boost="5">
+                <match field="description" boost="2"/>
+            </query>
+        </queries>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="one_aggregations" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="one_aggregations" boost="2">
+                <queryReference clause="must" ref="fulltext_search_query"/>
+            </query>
+
+            <query xsi:type="matchQuery" name="fulltext_search_query" value="$fulltext_search_query$" boost="5">
+                <match field="description" boost="2"/>
+            </query>
+        </queries>
+        <aggregations>
+            <bucket xsi:type="termBucket" name="weight_bucket" field="weight">
+                <metrics>
+                    <metric type="count"/>
+                </metrics>
+            </bucket>
+            <bucket xsi:type="rangeBucket" name="price_bucket" field="price">
+                <metrics>
+                    <metric type="count"/>
+                </metrics>
+                <ranges>
+                    <range from="" to="14"/>
+                    <range from="14" to="18"/>
+                    <range from="18" to=""/>
+                </ranges>
+            </bucket>
+            <bucket xsi:type="dynamicBucket" method="manual" name="dynamic_price" field="price" />
+        </aggregations>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="one_wildcard" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="one_wildcard" boost="2">
+                <filterReference clause="must" ref="wildcard_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="wildcardFilter" name="wildcard_filter" value="$wildcard_filter$" field="name"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="one_match_filters" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="one_match_filters" boost="2">
+                <queryReference clause="must" ref="fulltext_search_query"/>
+                <queryReference clause="must" ref="filtered_query"/>
+                <queryReference clause="must" ref="filtered_query_rm"/>
+                <queryReference clause="must" ref="filtered_query_filter_rm"/>
+            </query>
+            <query xsi:type="matchQuery" name="fulltext_search_query" value="$fulltext_search_query$" boost="5">
+                <match field="description" boost="2"/>
+            </query>
+            <query xsi:type="filteredQuery" name="filtered_query">
+                <filterReference clause="must" ref="pid"/>
+            </query>
+            <query xsi:type="filteredQuery" name="filtered_query_rm">
+                <queryReference clause="must" ref="fulltext_search_query_rm"/>
+            </query>
+            <query xsi:type="filteredQuery" name="filtered_query_filter_rm">
+                <filterReference clause="must" ref="bool_filter_rm"/>
+            </query>
+            <query xsi:type="matchQuery" value="$not_bind$" name="fulltext_search_query_rm">
+                <match field="some"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="boolFilter" name="bool_filter_rm">
+                <filterReference clause="must" ref="term_rm"/>
+                <filterReference clause="must" ref="range_rm"/>
+            </filter>
+            <filter name="range_rm" xsi:type="rangeFilter" field="price" from="$not_bind$" to="$not_bind$"/>
+            <filter name="term_rm" xsi:type="termFilter" field="price" value="$not_bind$"/>
+            <filter xsi:type="boolFilter" name="pid">
+                <filterReference clause="should" ref="pidm"/>
+                <filterReference clause="should" ref="pidsh"/>
+            </filter>
+            <filter name="pidm" xsi:type="rangeFilter" field="price" from="$pidm_from$" to="$pidm_to$"/>
+            <filter name="pidsh" xsi:type="termFilter" field="price" value="$pidsh$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="range_filter" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="range_filter">
+                <filterReference clause="must" ref="range_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter name="range_filter"
+                    xsi:type="rangeFilter"
+                    field="price"
+                    from="$range_filter_from$"
+                    to="$range_filter_to$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="range_filter_without_from_field" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="range_filter_without_from_field">
+                <filterReference clause="must" ref="range_filter_without_from_field"/>
+            </query>
+        </queries>
+        <filters>
+            <filter name="range_filter_without_from_field"
+                    xsi:type="rangeFilter"
+                    field="price"
+                    to="$range_filter_to$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="range_filter_without_to_field" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="range_filter_without_to_field">
+                <filterReference clause="must" ref="range_filter_without_to_field"/>
+            </query>
+        </queries>
+        <filters>
+            <filter name="range_filter_without_to_field"
+                    xsi:type="rangeFilter"
+                    field="price"
+                    from="$range_filter_from$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="term_filter" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="term_filter">
+                <filterReference clause="must" ref="term_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter name="term_filter" xsi:type="termFilter" field="price" value="$request.price$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="bool_filter" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="bool_filter">
+                <filterReference clause="must" ref="bool_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="boolFilter" name="bool_filter">
+                <filterReference clause="must" ref="must_range_filter1"/>
+                <filterReference clause="should" ref="should_term_filter1"/>
+                <filterReference clause="should" ref="should_term_filter2"/>
+                <filterReference clause="should" ref="should_term_filter3"/>
+                <filterReference clause="should" ref="should_term_filter4"/>
+                <filterReference clause="not" ref="not_term_filter1"/>
+                <filterReference clause="not" ref="not_term_filter2"/>
+            </filter>
+            <filter name="must_range_filter1"
+                    xsi:type="rangeFilter"
+                    field="price"
+                    from="$must_range_filter1_from$"
+                    to="$must_range_filter1_to$"/>
+            <filter name="should_term_filter1"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$should_term_filter1$"/>
+            <filter name="should_term_filter2"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$should_term_filter2$"/>
+            <filter name="should_term_filter3"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$should_term_filter3$"/>
+            <filter name="should_term_filter4"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$should_term_filter4$"/>
+            <filter name="not_term_filter1"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$not_term_filter1$"/>
+            <filter name="not_term_filter2"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$not_term_filter2$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="bool_filter_with_nested_bool_filter" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="bool_filter_with_nested_bool_filter">
+                <filterReference clause="must" ref="bool_filter_with_nested_bool_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="boolFilter" name="bool_filter_with_nested_bool_filter">
+                <filterReference clause="not" ref="not_range_filter"/>
+                <filterReference clause="not" ref="not_bool_filter"/>
+            </filter>
+            <filter xsi:type="boolFilter" name="not_bool_filter">
+                <filterReference clause="not" ref="nested_not_term_filter"/>
+            </filter>
+            <filter name="not_range_filter"
+                    xsi:type="rangeFilter"
+                    field="price"
+                    from="$not_range_filter_from$"
+                    to="$not_range_filter_to$"/>
+            <filter name="nested_not_term_filter"
+                    xsi:type="termFilter"
+                    field="price"
+                    value="$nested_not_term_filter$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="bool_filter_with_range_in_nested_negative_filter" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="filteredQuery" name="bool_filter_with_range_in_nested_negative_filter">
+                <filterReference clause="must" ref="bool_filter_with_range_in_nested_negative_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="boolFilter" name="bool_filter_with_range_in_nested_negative_filter">
+                <filterReference clause="not" ref="not_bool_filter"/>
+            </filter>
+            <filter xsi:type="boolFilter" name="not_bool_filter">
+                <filterReference clause="must" ref="nested_must_range_filter"/>
+            </filter>
+            <filter name="nested_must_range_filter"
+                    xsi:type="rangeFilter"
+                    field="price"
+                    from="$nested_must_range_filter_from$"
+                    to="$nested_must_range_filter_to$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="advanced_search_test" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="advanced_search_test" boost="1">
+                <queryReference clause="should" ref="name_query"/>
+                <queryReference clause="should" ref="description_query"/>
+                <queryReference clause="should" ref="query_filter"/>
+            </query>
+            <query xsi:type="matchQuery" name="name_query" value="$name_query$">
+                <match field="name" boost="1"/>
+            </query>
+            <query xsi:type="matchQuery" name="description_query" value="$description_query$">
+                <match field="description" boost="1"/>
+            </query>
+            <query xsi:type="filteredQuery" name="query_filter">
+                <filterReference clause="must" ref="filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="boolFilter" name="filter">
+                <filterReference clause="must" ref="price_filter"/>
+            </filter>
+            <filter name="price_filter" xsi:type="rangeFilter" field="price" from="$request.from_price$" to="$request.to_price$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="filterable_custom_attributes" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="filterable_custom_attributes" boost="1">
+                <queryReference clause="must" ref="category"/>
+                <queryReference clause="must" ref="price"/>
+                <queryReference clause="must" ref="select_attribute"/>
+                <queryReference clause="must" ref="multiselect_attribute"/>
+            </query>
+            <query xsi:type="filteredQuery" name="category">
+                <filterReference clause="must" ref="category_filter"/>
+            </query>
+            <query xsi:type="filteredQuery" name="price">
+                <filterReference clause="must" ref="price_filter"/>
+            </query>
+            <query xsi:type="filteredQuery" name="select_attribute">
+                <filterReference clause="must" ref="select_attribute_filter"/>
+            </query>
+            <query xsi:type="filteredQuery" name="multiselect_attribute">
+                <filterReference clause="must" ref="multiselect_attribute_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="termFilter" name="category_filter" field="category_ids" value="$category_ids$"/>
+            <filter xsi:type="rangeFilter" name="price_filter" field="price" from="$price.from$" to="$price.to$"/>
+            <filter xsi:type="termFilter" name="select_attribute_filter" field="select_attribute" value="$select_attribute$"/>
+            <filter xsi:type="termFilter" name="multiselect_attribute_filter" field="multiselect_attribute" value="$multiselect_attribute$"/>
+        </filters>
+        <aggregations>
+            <bucket name="price_bucket" field="price" xsi:type="dynamicBucket" method="$price_dynamic_algorithm$">
+                <metrics>
+                    <metric type="count"/>
+                </metrics>
+            </bucket>
+            <bucket name="category_bucket" field="category_ids" xsi:type="termBucket">
+                <metrics>
+                    <metric type="count"/>
+                </metrics>
+            </bucket>
+        </aggregations>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="advanced_search_date_field" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="advanced_search_date_field" boost="1">
+                <queryReference clause="should" ref="query_filter"/>
+            </query>
+            <query xsi:type="filteredQuery" name="query_filter">
+                <filterReference clause="must" ref="filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="boolFilter" name="filter">
+                <filterReference clause="must" ref="date_filter"/>
+            </filter>
+            <filter name="date_filter" xsi:type="rangeFilter" field="date_attribute" from="$date.from$" to="$date.to$"/>
+        </filters>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="filter_out_of_stock_child" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="filter_out_of_stock_child" boost="1">
+                <queryReference clause="must" ref="test_configurable"/>
+                <queryReference clause="must" ref="visibility"/>
+            </query>
+            <query xsi:type="filteredQuery" name="test_configurable">
+                <filterReference clause="must" ref="test_configurable_filter"/>
+            </query>
+            <query xsi:type="filteredQuery" name="visibility">
+                <filterReference clause="must" ref="visibility_filter"/>
+            </query>
+        </queries>
+        <filters>
+            <filter xsi:type="termFilter" name="test_configurable_filter" field="test_configurable" value="$test_configurable$"/>
+            <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/>
+        </filters>
+        <aggregations/>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="search_boost" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="search_boost" boost="1">
+                <queryReference clause="should" ref="search_boost_name_query"/>
+                <queryReference clause="should" ref="search_boost_description_query"/>
+            </query>
+
+            <query xsi:type="matchQuery" name="search_boost_name_query" value="$query$" boost="1">
+                <match field="name"/>
+            </query>
+            <query xsi:type="matchQuery" name="search_boost_description_query" value="$query$" boost="1">
+                <match field="description"/>
+            </query>
+        </queries>
+        <from>0</from>
+        <size>10</size>
+    </request>
+    <request query="search_boost_name" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="search_boost_name" boost="1">
+                <queryReference clause="should" ref="search_boost_name_query"/>
+                <queryReference clause="should" ref="search_boost_description_query"/>
+            </query>
+
+            <query xsi:type="matchQuery" name="search_boost_name_query" value="$query$" boost="20">
+                <match field="name"/>
+            </query>
+            <query xsi:type="matchQuery" name="search_boost_description_query" value="$query$" boost="1">
+                <match field="description"/>
+            </query>
+        </queries>
+        <from>0</from>
+        <size>10</size>
+    </request>
+</requests>
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute.php
new file mode 100644
index 0000000000000..dc46ff4c9d75d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Setup\CategorySetup $installer */
+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+$selectAttribute = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+$selectAttribute->setData(
+    [
+        'attribute_code' => 'select_attribute',
+        'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+        'is_global' => 1,
+        'is_user_defined' => 1,
+        'frontend_input' => 'select',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 1,
+        'is_visible_in_advanced_search' => 0,
+        'is_comparable' => 0,
+        'is_filterable' => 1,
+        'is_filterable_in_search' => 0,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 0,
+        'used_in_product_listing' => 0,
+        'used_for_sort_by' => 0,
+        'frontend_label' => ['Select Attribute'],
+        'backend_type' => 'varchar',
+        'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+        'option' => [
+            'value' => [
+                'chair' => ['Chair'],
+                'table' => ['Table'],
+            ],
+            'order' => [
+                'chair' => 1,
+                'table' => 2,
+            ],
+        ],
+    ]
+);
+$selectAttribute->save();
+
+$installer->addAttributeToGroup(
+    'catalog_product',
+    'Default',
+    'General',
+    $selectAttribute->getId()
+);
+
+/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $selectOptions */
+$selectOptions = $objectManager->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$selectOptions->setAttributeFilter($selectAttribute->getId());
+$selectOptionsIds = $selectOptions->getAllIds();
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute_rollback.php
new file mode 100644
index 0000000000000..72b7f1d928972
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+$attribute = $objectManager->create(
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+$attribute->load('select_attribute', 'attribute_code');
+$attribute->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index c597741afca97..dd55dcc8b47c7 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -130,22 +130,22 @@ public function layoutDirectiveDataProvider()
             'area parameter - omitted' => [
                 'adminhtml',
                 'handle="email_template_test_handle"',
-                '<b>Email content for frontend/Magento/default theme</b>',
+                '<strong>Email content for frontend/Magento/default theme</strong>',
             ],
             'area parameter - frontend' => [
                 'adminhtml',
                 'handle="email_template_test_handle" area="frontend"',
-                '<b>Email content for frontend/Magento/default theme</b>',
+                '<strong>Email content for frontend/Magento/default theme</strong>',
             ],
             'area parameter - backend' => [
                 'frontend',
                 'handle="email_template_test_handle" area="adminhtml"',
-                '<b>Email content for adminhtml/Magento/default theme</b>',
+                '<strong>Email content for adminhtml/Magento/default theme</strong>',
             ],
             'custom parameter' => [
                 'frontend',
                 'handle="email_template_test_handle" template="Magento_Email::sample_email_content_custom.phtml"',
-                '<b>Custom Email content for frontend/Magento/default theme</b>',
+                '<strong>Custom Email content for frontend/Magento/default theme</strong>',
             ],
         ];
         return $result;
@@ -352,9 +352,9 @@ public function inlinecssDirectiveDataProvider()
                 false,
                 true,
             ],
-            'Production mode - File with compilation error results in unmodified markup' => [
+            'Production mode - File with compilation error results in structurally unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/file-with-error.css"}}</html>',
-                '<html><p></p> </html>',
+                '<p></p>',
                 true,
             ],
             'Developer mode - File with compilation error results in error message' => [
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index a83de07443e95..7789a79794f39 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -315,25 +315,25 @@ public function templateDirectiveDataProvider()
                 Area::AREA_FRONTEND,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="customer/create_account/email_template"}}',
-                '<b>customer_create_account_email_template template from Vendor/custom_theme</b>',
+                '<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>',
             ],
             'Template from parent theme - frontend' => [
                 Area::AREA_FRONTEND,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="customer/create_account/email_confirmation_template"}}',
-                '<b>customer_create_account_email_confirmation_template template from Vendor/default</b>',
+                '<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong',
             ],
             'Template from grandparent theme - frontend' => [
                 Area::AREA_FRONTEND,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="customer/create_account/email_confirmed_template"}}',
-                '<b>customer_create_account_email_confirmed_template template from Magento/default</b>',
+                '<strong>customer_create_account_email_confirmed_template template from Magento/default</strong',
             ],
             'Template from grandparent theme - adminhtml' => [
                 BackendFrontNameResolver::AREA_CODE,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="catalog/productalert_cron/error_email_template"}}',
-                '<b>catalog_productalert_cron_error_email_template template from Magento/default</b>',
+                '<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong',
                 null,
                 null,
                 true,
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
index d53468a38376f..bb0073cedee96 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<b>Email content for adminhtml/Magento/default theme</b>
+<strong>Email content for adminhtml/Magento/default theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
index f13e54edf93a4..d65f9d4c40877 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>catalog_productalert_cron_error_email_template template from Magento/default</b>
+<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
index f687fc041db1e..ffc4d8893fe98 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>customer_create_account_email_confirmed_template template from Magento/default</b>
+<strong>customer_create_account_email_confirmed_template template from Magento/default</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
index acbdf16d474df..9c973818272c8 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<b>Email content for frontend/Magento/default theme</b>
+<strong>Email content for frontend/Magento/default theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
index 1730bf904bb34..4ed5685ee0106 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<b>Custom Email content for frontend/Magento/default theme</b>
+<strong>Custom Email content for frontend/Magento/default theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
index 7e8f9bd1b12b6..46257060f8284 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>customer_create_account_email_template template from Vendor/custom_theme</b>
+<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
index c5801b6557a61..9c52c5a1b38cf 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>customer_create_account_email_confirmation_template template from Vendor/default</b>
+<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong>
diff --git a/dev/tests/integration/testsuite/Magento/EncryptionKey/Model/ResourceModel/Key/ChangeTest.php b/dev/tests/integration/testsuite/Magento/EncryptionKey/Model/ResourceModel/Key/ChangeTest.php
index c199214f68578..496d03dbd7c58 100644
--- a/dev/tests/integration/testsuite/Magento/EncryptionKey/Model/ResourceModel/Key/ChangeTest.php
+++ b/dev/tests/integration/testsuite/Magento/EncryptionKey/Model/ResourceModel/Key/ChangeTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\EncryptionKey\Model\ResourceModel\Key;
 
 class ChangeTest extends \PHPUnit\Framework\TestCase
@@ -79,7 +81,7 @@ public function testChangeEncryptionKey()
             )
         );
         $this->assertNotContains($testValue, $values1);
-        $this->assertRegExp('|([0-9]+:)([0-9]+:)([a-zA-Z0-9]+:)([a-zA-Z0-9+/]+=)|', current($values1));
+        $this->assertRegExp('|([0-9]+:)([0-9]+:)([a-zA-Z0-9+/]+=*)|', current($values1));
 
         // Verify that the credit card number has been encrypted
         $values2 = $connection->fetchPairs(
@@ -89,7 +91,7 @@ public function testChangeEncryptionKey()
             )
         );
         $this->assertNotContains('1111111111', $values2);
-        $this->assertRegExp('|([0-9]+:)([0-9]+:)([a-zA-Z0-9]+:)([a-zA-Z0-9+/]+=)|', current($values1));
+        $this->assertRegExp('|([0-9]+:)([0-9]+:)([a-zA-Z0-9+/]+=*)|', current($values2));
 
         /** clean up */
         $select = $connection->select()->from($configModel->getMainTable())->where('path=?', $testPath);
diff --git a/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php b/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php
new file mode 100644
index 0000000000000..3a47692bdb932
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\EncryptionKey\Setup\Patch\Data;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Encryption\Encryptor;
+
+class SodiumChachaPatchTest extends \PHPUnit\Framework\TestCase
+{
+    const PATH_KEY = 'crypt/key';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deployConfig;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->deployConfig = $this->objectManager->get(DeploymentConfig::class);
+    }
+
+    public function testChangeEncryptionKey()
+    {
+        $testPath = 'test/config';
+        $testValue = 'test';
+
+        $structureMock = $this->createMock(\Magento\Config\Model\Config\Structure\Proxy::class);
+        $structureMock->expects($this->once())
+            ->method('getFieldPathsByAttribute')
+            ->will($this->returnValue([$testPath]));
+
+        /** @var \Magento\Config\Model\ResourceModel\Config $configModel */
+        $configModel = $this->objectManager->create(\Magento\Config\Model\ResourceModel\Config::class);
+        $configModel->saveConfig($testPath, $this->legacyEncrypt($testValue), 'default', 0);
+
+        /** @var \Magento\EncryptionKey\Setup\Patch\Data\SodiumChachaPatch $patch */
+        $patch = $this->objectManager->create(
+            \Magento\EncryptionKey\Setup\Patch\Data\SodiumChachaPatch::class,
+            [
+                'structure' => $structureMock,
+            ]
+        );
+        $patch->apply();
+
+        $connection = $configModel->getConnection();
+        $values = $connection->fetchPairs(
+            $connection->select()->from(
+                $configModel->getMainTable(),
+                ['config_id', 'value']
+            )->where(
+                'path IN (?)',
+                [$testPath]
+            )->where(
+                'value NOT LIKE ?',
+                ''
+            )
+        );
+
+        /** @var \Magento\Framework\Encryption\EncryptorInterface $encyptor */
+        $encyptor = $this->objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
+
+        $rawConfigValue = array_pop($values);
+
+        $this->assertNotEquals($testValue, $rawConfigValue);
+        $this->assertStringStartsWith('0:' . Encryptor::CIPHER_LATEST . ':', $rawConfigValue);
+        $this->assertEquals($testValue, $encyptor->decrypt($rawConfigValue));
+    }
+
+    private function legacyEncrypt(string $data): string
+    {
+        // @codingStandardsIgnoreStart
+        $handle = @mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+        $initVectorSize = @mcrypt_enc_get_iv_size($handle);
+        $initVector = str_repeat("\0", $initVectorSize);
+        @mcrypt_generic_init($handle, $this->deployConfig->get(static::PATH_KEY), $initVector);
+
+        $encrpted = @mcrypt_generic($handle, $data);
+
+        @mcrypt_generic_deinit($handle);
+        @mcrypt_module_close($handle);
+        // @codingStandardsIgnoreEnd
+
+        return '0:' . Encryptor::CIPHER_RIJNDAEL_256 . ':' . base64_encode($encrpted);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php
index 2aaaae9dd38f2..51e66eec676ea 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Api;
 
+use Magento\TestModuleExtensionAttributes\Model\Data\FakeRegionFactory;
+use Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtension;
+
 /**
  * Test for \Magento\Framework\Api\AbstractExtensibleObject
  */
@@ -15,16 +18,14 @@ class AbstractExtensibleObjectTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
-        $autoloadWrapper->addPsr4('Magento\\Wonderland\\', realpath(__DIR__ . '/_files/Magento/Wonderland'));
         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->_objectManager->configure(
             [
                 'preferences' => [
-                    \Magento\Wonderland\Api\Data\FakeAddressInterface::class =>
-                        \Magento\Wonderland\Model\FakeAddress::class,
-                    \Magento\Wonderland\Api\Data\FakeRegionInterface::class =>
-                        \Magento\Wonderland\Model\FakeRegion::class,
+                    \Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressInterface::class =>
+                        \Magento\TestModuleExtensionAttributes\Model\FakeAddress::class,
+                    \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface::class =>
+                        \Magento\TestModuleExtensionAttributes\Model\FakeRegion::class,
                 ],
             ]
         );
@@ -41,30 +42,30 @@ public function testExtensionAttributes($expectedDataBefore, $expectedDataAfter)
     {
         /** @var \Magento\Framework\Api\ExtensionAttributesFactory $regionExtensionFactory */
         $regionExtensionFactory = $this->_objectManager->get(\Magento\Framework\Api\ExtensionAttributesFactory::class);
-        /** @var \Magento\Wonderland\Model\Data\FakeRegionFactory $regionFactory */
-        $regionFactory = $this->_objectManager->get(\Magento\Wonderland\Model\Data\FakeRegionFactory::class);
+        /** @var FakeRegionFactory $regionFactory */
+        $regionFactory = $this->_objectManager->get(FakeRegionFactory::class);
 
-        /** @var \Magento\Wonderland\Model\Data\FakeRegion $region */
+        /** @var \Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion $region */
         $region = $regionFactory->create();
 
         $regionCode = 'test_code';
-        /** @var \Magento\Wonderland\Model\Data\FakeRegionExtensionInterface $regionExtension */
+        /** @var \Magento\TestModuleExtensionAttributes\Model\Data\FakeRegionExtensionInterface $regionExtension */
         $regionExtension = $regionExtensionFactory->create(
-            \Magento\Wonderland\Model\Data\FakeRegion::class,
+            \Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion::class,
             ['data' => $expectedDataBefore]
         );
         $region->setRegionCode($regionCode)->setExtensionAttributes($regionExtension);
-        $this->assertInstanceOf(\Magento\Wonderland\Model\Data\FakeRegion::class, $region);
+        $this->assertInstanceOf(\Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion::class, $region);
 
         $extensionAttributes = $region->getExtensionAttributes();
-        $this->assertInstanceOf(\Magento\Wonderland\Api\Data\FakeRegionExtension::class, $extensionAttributes);
+        $this->assertInstanceOf(FakeRegionExtension::class, $extensionAttributes);
         $this->assertEquals($expectedDataBefore, $extensionAttributes->__toArray());
         $this->assertEquals($regionCode, $region->getRegionCode());
 
         $regionCode = 'changed_test_code';
         $region->setExtensionAttributes(
             $regionExtensionFactory->create(
-                \Magento\Wonderland\Model\Data\FakeRegion::class,
+                \Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion::class,
                 ['data' => $expectedDataAfter]
             )
         )->setRegionCode($regionCode); // change $regionCode to test AbstractExtensibleObject::setData
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/ExtensionAttributesGenerationTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/ExtensionAttributesGenerationTest.php
new file mode 100644
index 0000000000000..991998cf59167
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/ExtensionAttributesGenerationTest.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\Api\ExtensionAttribute;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
+
+/**
+ * Class to test the automatic generation of extension attributes object.
+ */
+class ExtensionAttributesGenerationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test extension attributes generation for extensible models.
+     *
+     * Make sure that extension attributes object is not empty after instantiation
+     * of objects inherited from @see \Magento\Framework\Model\AbstractExtensibleModel.
+     *
+     * In addition, verify that empty objects are not generated for complex extension attributes.
+     */
+    public function testAttributeObjectGenerationForExtensibleModel()
+    {
+        /** @var \Magento\Framework\ObjectManagerInterface */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var ProductInterface $product */
+        $product = $objectManager->get(ProductInterface::class);
+
+        $extensionAttributes = $product->getExtensionAttributes();
+        $this->assertInstanceOf(ProductExtensionInterface::class, $extensionAttributes);
+
+        $stockItemExtensionAttribute = $extensionAttributes->getStockItem();
+        $this->assertNull($stockItemExtensionAttribute);
+    }
+
+    /**
+     * Test extension attributes generation for extensible objects.
+     *
+     * Make sure that extension attributes object is not empty after instantiation
+     * of objects inherited from @see \Magento\Framework\Api\AbstractExtensibleObject
+     */
+    public function testAttributeObjectGenerationForExtensibleObject()
+    {
+        /** @var \Magento\Framework\ObjectManagerInterface */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var CustomerInterface $customer */
+        $customer = $objectManager->get(CustomerInterface::class);
+
+        $extensionAttributes = $customer->getExtensionAttributes();
+        $this->assertInstanceOf(CustomerExtensionInterface::class, $extensionAttributes);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php
index 2171f8fdf7351..1c86bd594c6a0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php
@@ -12,8 +12,6 @@ class ExtensionAttributesFactoryTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
-        $autoloadWrapper->addPsr4('Magento\\Wonderland\\', realpath(__DIR__ . '/_files/Magento/Wonderland'));
         /** @var \Magento\Framework\ObjectManagerInterface */
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
@@ -36,7 +34,7 @@ public function testCreateThrowExceptionIfInterfaceNotImplemented()
      */
     public function testCreateThrowExceptionIfInterfaceNotOverridden()
     {
-        $this->factory->create(\Magento\Wonderland\Model\Data\FakeExtensibleOne::class);
+        $this->factory->create(\Magento\TestModuleExtensionAttributes\Model\Data\FakeExtensibleOne::class);
     }
 
     /**
@@ -44,21 +42,21 @@ public function testCreateThrowExceptionIfInterfaceNotOverridden()
      */
     public function testCreateThrowExceptionIfReturnIsIncorrect()
     {
-        $this->factory->create(\Magento\Wonderland\Model\Data\FakeExtensibleTwo::class);
+        $this->factory->create(\Magento\TestModuleExtensionAttributes\Model\Data\FakeExtensibleTwo::class);
     }
 
     public function testCreate()
     {
         $this->assertInstanceOf(
-            \Magento\Wonderland\Api\Data\FakeRegionExtension::class,
-            $this->factory->create(\Magento\Wonderland\Model\Data\FakeRegion::class)
+            \Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionExtension::class,
+            $this->factory->create(\Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion::class)
         );
     }
 
     public function testCreateWithLogicException()
     {
-        $this->expectException(
-            'LogicException',
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage(
             "Class 'Magento\\Framework\\Api\\ExtensionAttributesFactoryTest' must implement an interface, "
             . "which extends from 'Magento\\Framework\\Api\\ExtensibleDataInterface'"
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeRegionInterface.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeRegionInterface.php
deleted file mode 100644
index 20784a289360a..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Api/Data/FakeRegionInterface.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Api\Data;
-
-use Magento\Framework\Api\ExtensibleDataInterface;
-
-/**
- * Customer address region interface.
- */
-interface FakeRegionInterface extends ExtensibleDataInterface
-{
-    /**#@+
-     * Constants for keys of data array
-     */
-    const REGION_CODE = 'region_code';
-    const REGION = 'region';
-    const REGION_ID = 'region_id';
-    /**#@-*/
-
-    /**
-     * Get region code
-     *
-     * @return string
-     */
-    public function getRegionCode();
-
-    /**
-     * Get region
-     *
-     * @return string
-     */
-    public function getRegion();
-
-    /**
-     * Get region id
-     *
-     * @return int
-     */
-    public function getRegionId();
-
-    /**
-     * Retrieve existing extension attributes object or create a new one.
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface|null
-     */
-    public function getExtensionAttributes();
-
-    /**
-     * Set an extension attributes object.
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface $extensionAttributes
-    );
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeAddress.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeAddress.php
deleted file mode 100644
index bc5413964c234..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeAddress.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Model\Data;
-
-use Magento\Framework\Api\AbstractExtensibleObject;
-use Magento\Wonderland\Api\Data\FakeAddressInterface;
-
-class FakeAddress extends AbstractExtensibleObject implements FakeAddressInterface
-{
-    /**
-     * Get ID
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->_get(self::ID);
-    }
-
-    /**
-     * Get customer ID
-     *
-     * @return int|null
-     */
-    public function getCustomerId()
-    {
-        return $this->_get(self::CUSTOMER_ID);
-    }
-
-    /**
-     * Get region
-     *
-     * @return \Magento\Wonderland\Model\Data\FakeRegion|null
-     */
-    public function getRegion()
-    {
-        return $this->_get(self::REGION);
-    }
-
-    /**
-     * Get region
-     *
-     * @return \Magento\Wonderland\Model\Data\FakeRegion[]|null
-     */
-    public function getRegions()
-    {
-        return $this->_get(self::REGIONS);
-    }
-
-    /**
-     * Two-letter country code in ISO_3166-2 format
-     *
-     * @return string|null
-     */
-    public function getCountryId()
-    {
-        return $this->_get(self::COUNTRY_ID);
-    }
-
-    /**
-     * Get street
-     *
-     * @return string[]|null
-     */
-    public function getStreet()
-    {
-        return $this->_get(self::STREET);
-    }
-
-    /**
-     * Get company
-     *
-     * @return string|null
-     */
-    public function getCompany()
-    {
-        return $this->_get(self::COMPANY);
-    }
-
-    /**
-     * Get telephone number
-     *
-     * @return string|null
-     */
-    public function getTelephone()
-    {
-        return $this->_get(self::TELEPHONE);
-    }
-
-    /**
-     * Get fax number
-     *
-     * @return string|null
-     */
-    public function getFax()
-    {
-        return $this->_get(self::FAX);
-    }
-
-    /**
-     * Get postcode
-     *
-     * @return string|null
-     */
-    public function getPostcode()
-    {
-        return $this->_get(self::POSTCODE);
-    }
-
-    /**
-     * Get city name
-     *
-     * @return string|null
-     */
-    public function getCity()
-    {
-        return $this->_get(self::CITY);
-    }
-
-    /**
-     * Get first name
-     *
-     * @return string|null
-     */
-    public function getFirstname()
-    {
-        return $this->_get(self::FIRSTNAME);
-    }
-
-    /**
-     * Get last name
-     *
-     * @return string|null
-     */
-    public function getLastname()
-    {
-        return $this->_get(self::LASTNAME);
-    }
-
-    /**
-     * Get middle name
-     *
-     * @return string|null
-     */
-    public function getMiddlename()
-    {
-        return $this->_get(self::MIDDLENAME);
-    }
-
-    /**
-     * Get prefix
-     *
-     * @return string|null
-     */
-    public function getPrefix()
-    {
-        return $this->_get(self::PREFIX);
-    }
-
-    /**
-     * Get suffix
-     *
-     * @return string|null
-     */
-    public function getSuffix()
-    {
-        return $this->_get(self::SUFFIX);
-    }
-
-    /**
-     * Get Vat id
-     *
-     * @return string|null
-     */
-    public function getVatId()
-    {
-        return $this->_get(self::VAT_ID);
-    }
-
-    /**
-     * Get if this address is default shipping address.
-     *
-     * @return bool|null
-     */
-    public function isDefaultShipping()
-    {
-        return $this->_get(self::DEFAULT_SHIPPING);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * Get if this address is default billing address
-     *
-     * @return bool|null
-     */
-    public function isDefaultBilling()
-    {
-        return $this->_get(self::DEFAULT_BILLING);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeExtensibleOne.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeExtensibleOne.php
deleted file mode 100644
index a4d5152990409..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeExtensibleOne.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Model\Data;
-
-use Magento\Wonderland\Api\Data\FakeExtensibleOneInterface;
-
-class FakeExtensibleOne implements FakeExtensibleOneInterface
-{
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeExtensibleTwo.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeExtensibleTwo.php
deleted file mode 100644
index 70ea680162a41..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeExtensibleTwo.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Model\Data;
-
-use Magento\Framework\Api\AbstractExtensibleObject;
-use Magento\Wonderland\Api\Data\FakeExtensibleTwoInterface;
-
-class FakeExtensibleTwo extends AbstractExtensibleObject implements FakeExtensibleTwoInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeRegion.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeRegion.php
deleted file mode 100644
index 7ee12ce5e3a3b..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeRegion.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Model\Data;
-
-use Magento\Framework\Api\AbstractExtensibleObject;
-
-class FakeRegion extends AbstractExtensibleObject implements \Magento\Wonderland\Api\Data\FakeRegionInterface
-{
-    /**
-     * Get region
-     *
-     * @return string
-     */
-    public function getRegion()
-    {
-        return $this->_get(self::REGION);
-    }
-
-    /**
-     * Get region code
-     *
-     * @return string
-     */
-    public function getRegionCode()
-    {
-        return $this->_get(self::REGION_CODE);
-    }
-
-    /**
-     * Get region id
-     *
-     * @return int
-     */
-    public function getRegionId()
-    {
-        return $this->_get(self::REGION_ID);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-
-    /**
-     * Set region code
-     *
-     * @param string $regionCode
-     * @return $this
-     */
-    public function setRegionCode($regionCode)
-    {
-        return $this->setData(self::REGION_CODE, $regionCode);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/FakeAddress.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/FakeAddress.php
deleted file mode 100644
index 2b657ffc25839..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/FakeAddress.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Model;
-
-use Magento\Framework\Model\AbstractExtensibleModel;
-use Magento\Wonderland\Api\Data\FakeAddressInterface;
-
-class FakeAddress extends AbstractExtensibleModel implements FakeAddressInterface
-{
-    /**
-     * Get ID
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->getData(self::ID);
-    }
-
-    /**
-     * Get customer ID
-     *
-     * @return int|null
-     */
-    public function getCustomerId()
-    {
-        return $this->getData(self::CUSTOMER_ID);
-    }
-
-    /**
-     * Get region
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionInterface|null
-     */
-    public function getRegion()
-    {
-        return $this->getData(self::REGION);
-    }
-
-    /**
-     * Get region
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionInterface[]|null
-     */
-    public function getRegions()
-    {
-        return $this->getData(self::REGIONS);
-    }
-
-    /**
-     * Two-letter country code in ISO_3166-2 format
-     *
-     * @return string|null
-     */
-    public function getCountryId()
-    {
-        return $this->getData(self::COUNTRY_ID);
-    }
-
-    /**
-     * Get street
-     *
-     * @return string[]|null
-     */
-    public function getStreet()
-    {
-        return $this->getData(self::STREET);
-    }
-
-    /**
-     * Get company
-     *
-     * @return string|null
-     */
-    public function getCompany()
-    {
-        return $this->getData(self::COMPANY);
-    }
-
-    /**
-     * Get telephone number
-     *
-     * @return string|null
-     */
-    public function getTelephone()
-    {
-        return $this->getData(self::TELEPHONE);
-    }
-
-    /**
-     * Get fax number
-     *
-     * @return string|null
-     */
-    public function getFax()
-    {
-        return $this->getData(self::FAX);
-    }
-
-    /**
-     * Get postcode
-     *
-     * @return string|null
-     */
-    public function getPostcode()
-    {
-        return $this->getData(self::POSTCODE);
-    }
-
-    /**
-     * Get city name
-     *
-     * @return string|null
-     */
-    public function getCity()
-    {
-        return $this->getData(self::CITY);
-    }
-
-    /**
-     * Get first name
-     *
-     * @return string|null
-     */
-    public function getFirstname()
-    {
-        return $this->getData(self::FIRSTNAME);
-    }
-
-    /**
-     * Get last name
-     *
-     * @return string|null
-     */
-    public function getLastname()
-    {
-        return $this->getData(self::LASTNAME);
-    }
-
-    /**
-     * Get middle name
-     *
-     * @return string|null
-     */
-    public function getMiddlename()
-    {
-        return $this->getData(self::MIDDLENAME);
-    }
-
-    /**
-     * Get prefix
-     *
-     * @return string|null
-     */
-    public function getPrefix()
-    {
-        return $this->getData(self::PREFIX);
-    }
-
-    /**
-     * Get suffix
-     *
-     * @return string|null
-     */
-    public function getSuffix()
-    {
-        return $this->getData(self::SUFFIX);
-    }
-
-    /**
-     * Get Vat id
-     *
-     * @return string|null
-     */
-    public function getVatId()
-    {
-        return $this->getData(self::VAT_ID);
-    }
-
-    /**
-     * Get if this address is default shipping address.
-     *
-     * @return bool|null
-     */
-    public function isDefaultShipping()
-    {
-        return $this->getData(self::DEFAULT_SHIPPING);
-    }
-
-    /**
-     * Get if this address is default billing address
-     *
-     * @return bool|null
-     */
-    public function isDefaultBilling()
-    {
-        return $this->getData(self::DEFAULT_BILLING);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeAddressExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/FakeRegion.php b/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/FakeRegion.php
deleted file mode 100644
index fcadfc36deea7..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/FakeRegion.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Wonderland\Model;
-
-use Magento\Framework\Model\AbstractExtensibleModel;
-use Magento\Wonderland\Api\Data\FakeRegionInterface;
-
-class FakeRegion extends AbstractExtensibleModel implements FakeRegionInterface
-{
-    /**
-     * Get region
-     *
-     * @return string
-     */
-    public function getRegion()
-    {
-        return $this->getData(self::REGION);
-    }
-
-    /**
-     * Get region code
-     *
-     * @return string
-     */
-    public function getRegionCode()
-    {
-        return $this->getData(self::REGION_CODE);
-    }
-
-    /**
-     * Get region id
-     *
-     * @return int
-     */
-    public function getRegionId()
-    {
-        return $this->getData(self::REGION_ID);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeRegionExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/etc/extension_attributes.xml b/dev/tests/integration/testsuite/Magento/Framework/Api/etc/extension_attributes.xml
deleted file mode 100644
index f8162d54c1ad1..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/etc/extension_attributes.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
-    <extension_attributes for="Magento\Catalog\Api\Data\ProductInterface">
-        <attribute code="test_stock_item" type="Magento\CatalogInventory\Api\Data\StockItemInterface">
-            <resources>
-                <resource ref="Magento_CatalogInventory::cataloginventory"/>
-            </resources>
-            <join reference_table="cataloginventory_stock_item"
-                  join_on_field="entity_id"
-                  reference_field="product_id"
-                    >
-                <field>qty</field>
-                <field>item_id</field>
-            </join>
-        </attribute>
-        <attribute code="test_stock_item_qty" type="string">
-            <resources>
-                <resource ref="Magento_CatalogInventory::cataloginventory"/>
-            </resources>
-            <join reference_table="cataloginventory_stock_item"
-                  join_on_field="entity_id"
-                  reference_field="product_id"
-                    >
-                <field>qty</field>
-            </join>
-        </attribute>
-    </extension_attributes>
-
-    <extension_attributes for="Magento\Wonderland\Api\Data\FakeCustomerInterface">
-        <attribute code="test_group_code" type="string">
-            <join reference_table="customer_group"
-                  join_on_field="group_id"
-                  reference_field="customer_group_id"
-                    >
-                <field>customer_group_code</field>
-            </join>
-        </attribute>
-    </extension_attributes>
-
-    <extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
-        <attribute code="test_group_code" type="string">
-            <join reference_table="customer_group"
-                  join_on_field="group_id"
-                  reference_field="customer_group_id"
-                    >
-                <field>customer_group_code</field>
-            </join>
-        </attribute>
-        <attribute code="test_group" type="Magento\Customer\Api\Data\GroupInterface">
-            <join reference_table="customer_group"
-                  join_on_field="group_id"
-                  reference_field="customer_group_id"
-                    >
-                <field>tax_class_id</field>
-                <field column="customer_group_code">code</field>
-            </join>
-        </attribute>
-    </extension_attributes>
-
-    <extension_attributes for="Magento\Customer\Api\Data\GroupInterface">
-        <attribute code="test_dummy_attribute" type="string">
-            <join reference_table="eav_attribute"
-                  reference_field="attribute_id"
-                  join_on_field="customer_group_id"
-                    >
-                <field>attribute_code</field>
-            </join>
-        </attribute>
-        <attribute code="test_complex_dummy_attribute" type="Magento\Catalog\Api\Data\ProductAttributeInterface">
-            <join reference_table="admin_user"
-                  reference_field="user_id"
-                  join_on_field="customer_group_id"
-                    >
-                <field column="username">attribute_code</field>
-                <field column="firstname">frontend_label</field>
-            </join>
-        </attribute>
-    </extension_attributes>
-
-    <extension_attributes for="Magento\Sales\Api\Data\InvoiceInterface">
-        <attribute code="test_dummy_attribute" type="string">
-            <join reference_table="eav_attribute"
-                  reference_field="attribute_id"
-                  join_on_field="entity_id"
-                    >
-                <field>attribute_code</field>
-            </join>
-        </attribute>
-    </extension_attributes>
-</config>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Cache/Frontend/FactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Cache/Frontend/FactoryTest.php
new file mode 100644
index 0000000000000..e6ee5297e4532
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Cache/Frontend/FactoryTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\Cache\Frontend;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class FactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Object Manager
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\App\Cache\Frontend\Factory
+     */
+    private $factory;
+
+    /**
+     * @var \Magento\Framework\App\Area
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->factory = $this->objectManager->create(
+            \Magento\Framework\App\Cache\Frontend\Factory::class
+        );
+    }
+
+    /**
+     * Check RemoteSynchronizedCache
+     * Removing any cache item in the RemoteSynchronizedCache must invalidate all cache items
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testRemoteSynchronizedCache()
+    {
+        $data = 'data';
+        $identifier = 'identifier';
+        $secondIdentifier = 'secondIdentifier';
+        $secondData = 'secondData';
+
+        $frontendOptions = ['backend' => 'remote_synchronized_cache'];
+        $this->model = $this->factory->create($frontendOptions);
+
+        //Saving data
+        $this->assertTrue($this->model->save($data, $identifier));
+        $this->assertTrue($this->model->save($secondData, $secondIdentifier));
+
+        //Checking data
+        $this->assertEquals($this->model->load($identifier), $data);
+        $this->assertEquals($this->model->load($secondIdentifier), $secondData);
+
+        //Removing data
+        sleep(2);
+        $this->assertTrue($this->model->remove($secondIdentifier));
+        $this->assertEquals($this->model->load($identifier), false);
+        $this->assertEquals($this->model->load($secondIdentifier), false);
+
+        //Saving data
+        $this->assertTrue($this->model->save($data, $identifier));
+        $this->assertTrue($this->model->save($secondData, $secondIdentifier));
+
+        //Checking data
+        $this->assertEquals($this->model->load($identifier), $data);
+        $this->assertEquals($this->model->load($secondIdentifier), $secondData);
+
+        //Removing data
+        sleep(2);
+        $this->assertTrue($this->model->remove($identifier));
+        $this->assertEquals($this->model->load($identifier), false);
+        $this->assertEquals($this->model->load($secondIdentifier), false);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/CreatePdfFileTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/CreatePdfFileTest.php
new file mode 100644
index 0000000000000..9ac778da91f29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/CreatePdfFileTest.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\App\Filesystem;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Filesystem;
+use Magento\TestFramework\Helper\Bootstrap;
+use Zend\Http\Header\ContentType;
+
+/**
+ * Class CreatePdfFileTest
+ *
+ * Integration test for testing a file creation from string
+ */
+class CreatePdfFileTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @throws \Exception
+     */
+    public function testGenerateFileFromString()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var FileFactory $fileFactory */
+        $fileFactory =  $objectManager->get(FileFactory::class);
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->get(Filesystem::class);
+        $filename = 'test.pdf';
+        $contentType = 'application/pdf';
+        $fileContent = ['type' => 'string', 'value' => ''];
+        $response = $fileFactory->create($filename, $fileContent, DirectoryList::VAR_DIR, $contentType);
+        /** @var ContentType $contentTypeHeader */
+        $contentTypeHeader = $response->getHeader('Content-type');
+
+        /* Check the system returns the correct type */
+        self::assertEquals("Content-Type: $contentType", $contentTypeHeader->toString());
+
+        $varDirectory = $filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
+        $varDirectory->isFile($filename);
+
+        /* Check the file is generated */
+        self::assertTrue($varDirectory->isFile($filename));
+
+        /* Check the file is removed after generation if the corresponding option is set */
+        $fileContent = ['type' => 'string', 'value' => '', 'rm' => true];
+        $fileFactory->create($filename, $fileContent, DirectoryList::VAR_DIR, $contentType);
+
+        self::assertFalse($varDirectory->isFile($filename));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
new file mode 100644
index 0000000000000..90d8473032c69
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\Filesystem;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test class for the \Magento\Framework\App\Filesystem\DirectoryResolver verification.
+ */
+class DirectoryResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryResolver
+     */
+    private $directoryResolver;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->directoryResolver = $this->objectManager
+            ->create(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
+        $this->filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+    }
+
+    /**
+     * @param string $path
+     * @param string $directoryConfig
+     * @param bool $expectation
+     * @dataProvider validatePathDataProvider
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testValidatePath($path, $directoryConfig, $expectation)
+    {
+        $directory = $this->filesystem
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath() .'/' .$path;
+        $this->assertEquals($expectation, $this->directoryResolver->validatePath($path, $directoryConfig));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\FileSystemException
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testValidatePathWithException()
+    {
+        $directory = $this->filesystem
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath();
+        $this->directoryResolver->validatePath($path, 'wrong_dir');
+    }
+
+    /**
+     * @param string $path
+     * @param string $directoryConfig
+     * @param bool $expectation
+     * @dataProvider validatePathDataProvider
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testValidatePathWithSymlink($path, $directoryConfig, $expectation)
+    {
+        $directory = $this->filesystem
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::PUB);
+        $driver = $directory->getDriver();
+
+        $mediaPath = $directory->getAbsolutePath('media');
+        $mediaMovedPath = $directory->getAbsolutePath('moved-media');
+
+        try {
+            $driver->rename($mediaPath, $mediaMovedPath);
+            $driver->symlink($mediaMovedPath, $mediaPath);
+            $this->testValidatePath($path, $directoryConfig, $expectation);
+        } finally {
+            // be defensive in case some operations failed
+            if ($driver->isExists($mediaPath) && $driver->isExists($mediaMovedPath)) {
+                $driver->deleteFile($mediaPath);
+                $driver->rename($mediaMovedPath, $mediaPath);
+            } elseif ($driver->isExists($mediaMovedPath)) {
+                $driver->rename($mediaMovedPath, $mediaPath);
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function validatePathDataProvider()
+    {
+        return [
+            [
+                '/',
+                DirectoryList::MEDIA,
+                true,
+            ],
+            [
+                '/../../pub/',
+                DirectoryList::MEDIA,
+                false,
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php
index 431c705430819..89240f4ab3241 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php
@@ -5,11 +5,21 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\Request\ValidatorInterface;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea frontend
  */
-class FrontControllerTest extends \PHPUnit\Framework\TestCase
+class FrontControllerTest extends TestCase
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
@@ -17,28 +27,94 @@ class FrontControllerTest extends \PHPUnit\Framework\TestCase
     protected $_objectManager;
 
     /**
-     * @var \Magento\Framework\App\FrontController
+     * @var FrontController
      */
     protected $_model;
 
+    /**
+     * @var ValidatorInterface
+     */
+    private $fakeRequestValidator;
+
+    /**
+     * @return ValidatorInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function createRequestValidator(): ValidatorInterface
+    {
+        if (!$this->fakeRequestValidator) {
+            $this->fakeRequestValidator = new class implements ValidatorInterface {
+                /**
+                 * @var bool
+                 */
+                public $valid;
+
+                /**
+                 * @inheritDoc
+                 */
+                public function validate(
+                    RequestInterface $request,
+                    ActionInterface $action
+                ): void {
+                    if (!$this->valid) {
+                        throw new InvalidRequestException(new NotFoundException(new Phrase('Not found')));
+                    }
+                }
+            };
+        }
+
+        return $this->fakeRequestValidator;
+    }
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_model = $this->_objectManager->create(\Magento\Framework\App\FrontController::class);
+        $this->_objectManager = Bootstrap::getObjectManager();
+        $this->_model = $this->_objectManager->create(
+            FrontController::class,
+            ['requestValidator' => $this->createRequestValidator()]
+        );
     }
 
+    /**
+     * Test dispatching an empty action.
+     */
     public function testDispatch()
     {
-        if (!\Magento\TestFramework\Helper\Bootstrap::canTestHeaders()) {
+        if (!Bootstrap::canTestHeaders()) {
+            $this->markTestSkipped('Can\'t test dispatch process without sending headers');
+        }
+        $this->fakeRequestValidator->valid = true;
+        $_SERVER['HTTP_HOST'] = 'localhost';
+        $this->_objectManager->get(State::class)->setAreaCode('frontend');
+        $request = $this->_objectManager->get(HttpRequest::class);
+        /* empty action */
+        $request->setRequestUri('core/index/index');
+        $this->assertInstanceOf(
+            ResultInterface::class,
+            $this->_model->dispatch($request)
+        );
+    }
+
+    /**
+     * Test request validator invalidating given request.
+     */
+    public function testInvalidRequest()
+    {
+        if (!Bootstrap::canTestHeaders()) {
             $this->markTestSkipped('Can\'t test dispatch process without sending headers');
         }
+        $this->fakeRequestValidator->valid = false;
         $_SERVER['HTTP_HOST'] = 'localhost';
-        $this->_objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-        $request = $this->_objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $this->_objectManager->get(State::class)->setAreaCode('frontend');
+        $request = $this->_objectManager->get(HttpRequest::class);
         /* empty action */
         $request->setRequestUri('core/index/index');
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\ResultInterface::class,
+            ResultInterface::class,
             $this->_model->dispatch($request)
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv b/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
index 0c13b51b55287..235d18468b739 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
@@ -1,2 +1,3 @@
 four and 75/100,4.75
-four and 5/10,4.50
\ No newline at end of file
+four and 5/10,4.50
+
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/ObjectManager/ConfigWriter/FilesystemTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/ObjectManager/ConfigWriter/FilesystemTest.php
new file mode 100644
index 0000000000000..843be22c57d67
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/ObjectManager/ConfigWriter/FilesystemTest.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\App\ObjectManager\ConfigWriter;
+
+class FilesystemTest extends \PHPUnit\Framework\TestCase
+{
+    const CACHE_KEY = 'filesystemtest';
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem
+     */
+    private $configWriter;
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager\ConfigLoader
+     */
+    private $configReader;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->configWriter = $objectManager->create(
+            \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem::class
+        );
+        $this->configReader = $objectManager->create(
+            \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::class
+        );
+    }
+
+    public function testWrite()
+    {
+        $sampleData = [
+            'classA' => true,
+            'classB' => false,
+        ];
+
+        $this->configWriter->write(self::CACHE_KEY, $sampleData);
+        $this->assertEquals($sampleData, $this->configReader->load(self::CACHE_KEY));
+    }
+
+    public function testOverwrite()
+    {
+        $this->configWriter->write(self::CACHE_KEY, ['hello' => 'world']);
+
+        $sampleData = [
+            'classC' => false,
+            'classD' => true,
+        ];
+
+        $this->configWriter->write(self::CACHE_KEY, $sampleData);
+        $this->assertEquals($sampleData, $this->configReader->load(self::CACHE_KEY));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Request/CsrfValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Request/CsrfValidatorTest.php
new file mode 100644
index 0000000000000..9246be52f41bf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Request/CsrfValidatorTest.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Zend\Stdlib\Parameters;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\App\Response\HttpFactory as HttpResponseFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CsrfValidatorTest extends TestCase
+{
+    private const AWARE_URL = 'test/1';
+
+    private const AWARE_VALIDATION_PARAM = 'test_param';
+
+    private const AWARE_MESSAGE = 'custom validation failed';
+
+    /**
+     * @var ActionInterface
+     */
+    private $mockUnawareAction;
+
+    /**
+     * @var ActionInterface
+     */
+    private $mockAwareAction;
+
+    /**
+     * @var CsrfValidator
+     */
+    private $validator;
+
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var HttpResponseFactory
+     */
+    private $httpResponseFactory;
+
+    /**
+     * @return ActionInterface
+     */
+    private function createUnawareAction(): ActionInterface
+    {
+        return new class implements ActionInterface {
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+        };
+    }
+
+    /**
+     * @return ActionInterface
+     */
+    private function createAwareAction(): ActionInterface
+    {
+        $u = self::AWARE_URL;
+        $m = self::AWARE_MESSAGE;
+        $p = self::AWARE_VALIDATION_PARAM;
+
+        return new class($u, $m, $p) implements CsrfAwareActionInterface {
+            /**
+             * @var string
+             */
+            private $url;
+
+            /**
+             * @var string
+             */
+            private $message;
+
+            /**
+             * @var string
+             */
+            private $param;
+
+            /**
+             * @param string $url
+             * @param string $message
+             * @param string $param
+             */
+            public function __construct(
+                string $url,
+                string $message,
+                string $param
+            ) {
+                $this->url = $url;
+                $this->message = $message;
+                $this->param = $param;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function createCsrfValidationException(
+                RequestInterface $request
+            ): ?InvalidRequestException {
+                /** @var RedirectFactory $redirectFactory */
+                $redirectFactory = Bootstrap::getObjectManager()
+                    ->get(RedirectFactory::class);
+                $redirect = $redirectFactory->create();
+                $redirect->setUrl($this->url);
+
+                return new InvalidRequestException(
+                    $redirect,
+                    [new Phrase($this->message)]
+                );
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function validateForCsrf(RequestInterface $request): ?bool
+            {
+                return (bool)$request->getParam($this->param);
+            }
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(HttpRequest::class);
+        $this->validator = $objectManager->get(CsrfValidator::class);
+        $this->mockUnawareAction = $this->createUnawareAction();
+        $this->mockAwareAction = $this->createAwareAction();
+        $this->formKey = $objectManager->get(FormKey::class);
+        $this->httpResponseFactory = $objectManager->get(
+            HttpResponseFactory::class
+        );
+    }
+
+    /**
+     * @magentoAppArea global
+     */
+    public function testValidateInWrongArea()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testValidateWithValidKey()
+    {
+        $this->request->setPost(
+            new Parameters(['form_key' => $this->formKey->getFormKey()])
+        );
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithInvalidKey()
+    {
+        $this->request->setPost(
+            new Parameters(['form_key' => $this->formKey->getFormKey() .'1'])
+        );
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testValidateInvalidWithAwareAction()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockAwareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        $this->assertNotNull($caught);
+        $this->assertInstanceOf(Redirect::class, $caught->getReplaceResult());
+        /** @var HttpResponse $response */
+        $response = $this->httpResponseFactory->create();
+        $caught->getReplaceResult()->renderResult($response);
+        $this->assertContains(
+            self::AWARE_URL,
+            $response->getHeaders()->toString()
+        );
+        $this->assertCount(1, $caught->getMessages());
+        $this->assertEquals(
+            self::AWARE_MESSAGE,
+            $caught->getMessages()[0]->getText()
+        );
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testValidateValidWithAwareAction()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+        $this->request->setPost(
+            new Parameters([self::AWARE_VALIDATION_PARAM => '1'])
+        );
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockAwareAction
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php
new file mode 100644
index 0000000000000..74aa5b8bfed05
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RequestInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+class HttpMethodValidatorTest extends TestCase
+{
+    /**
+     * @var HttpMethodValidator
+     */
+    private $validator;
+
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var HttpMethodMap
+     */
+    private $map;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->validator = $objectManager->get(HttpMethodValidator::class);
+        $this->request = $objectManager->get(RequestInterface::class);
+        if (!$this->request instanceof HttpRequest) {
+            throw new \RuntimeException('We need HTTP request');
+        }
+        $this->map = $objectManager->get(HttpMethodMap::class);
+    }
+
+    /**
+     * @return array
+     */
+    private function getMap(): array
+    {
+        $map = $this->map->getMap();
+        if (count($map) < 2) {
+            throw new \RuntimeException(
+                'We need at least 2 HTTP methods allowed'
+            );
+        }
+
+        $sorted = [];
+        foreach ($map as $method => $interface) {
+            $sorted[] = ['method' => $method, 'interface' => $interface];
+        }
+
+        return $sorted;
+    }
+
+    /**
+     * Test positive case.
+     *
+     * @throws InvalidRequestException
+     */
+    public function testAllowed()
+    {
+        $map = $this->getMap();
+
+        $action1 = $this->getMockForAbstractClass($map[0]['interface']);
+        $this->request->setMethod($map[0]['method']);
+        $this->validator->validate($this->request, $action1);
+
+        $action2 = $this->getMockForAbstractClass(ActionInterface::class);
+        $this->validator->validate($this->request, $action2);
+    }
+
+    /**
+     * Test negative case.
+     *
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     */
+    public function testNotAllowedMethod()
+    {
+        $this->request->setMethod('method' .rand(0, 1000));
+        $action = $this->getMockForAbstractClass(ActionInterface::class);
+
+        $this->validator->validate($this->request, $action);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     */
+    public function testRestrictedMethod()
+    {
+        $map = $this->getMap();
+
+        $this->request->setMethod($map[1]['method']);
+        $action = $this->getMockForAbstractClass($map[0]['interface']);
+
+        $this->validator->validate($this->request, $action);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php
index f3b30797b93ed..c286f6c57d87f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php
@@ -6,4 +6,4 @@
 
 use \Magento\Framework\Component\ComponentRegistrar;
 
-ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontent/Test/theme', __DIR__);
+ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Test/theme', __DIR__);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt
index 8f2df480aabc5..f9cd49de77d67 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt
@@ -1,2 +1,2 @@
 module Magento_Module *
-theme frontent/Test/theme One*
+theme frontend/Test/theme One*
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php b/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php
new file mode 100644
index 0000000000000..3ee68b1012c4e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Backup;
+
+use Magento\Backup\Helper\Data;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Module\Setup;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for \Magento\Framework\Backup\Db.
+ */
+class DbTest extends \Magento\TestFramework\Indexer\TestCase
+{
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * Test db backup includes triggers.
+     *
+     * @magentoConfigFixture default/system/backup/functionality_enabled 1
+     * @magentoDataFixture Magento/Framework/Backup/_files/trigger.php
+     * @magentoDbIsolation disabled
+     */
+    public function testBackupIncludesCustomTriggers()
+    {
+        $helper = Bootstrap::getObjectManager()->get(Data::class);
+        $time = time();
+        $backupManager = Bootstrap::getObjectManager()->get(Factory::class)->create(
+            Factory::TYPE_DB
+        )->setBackupExtension(
+            $helper->getExtensionByType(Factory::TYPE_DB)
+        )->setTime(
+            $time
+        )->setBackupsDir(
+            $helper->getBackupsDir()
+        )->setName('test_backup');
+        $backupManager->create();
+        $write = Bootstrap::getObjectManager()->get(Filesystem::class)->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $content = $write->readFile('/backups/' . $time . '_db_testbackup.sql');
+        $tableName = Bootstrap::getObjectManager()->get(Setup::class)
+            ->getTable('test_table_with_custom_trigger');
+        $this->assertRegExp(
+            '/CREATE  TRIGGER test_custom_trigger AFTER INSERT ON '. $tableName . ' FOR EACH ROW/',
+            $content
+        );
+        //Clean up.
+        $write->delete('/backups/' . $time . '_db_testbackup.sql');
+    }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Backup/_files/trigger.php b/dev/tests/integration/testsuite/Magento/Framework/Backup/_files/trigger.php
new file mode 100644
index 0000000000000..c0d52e9039da7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Backup/_files/trigger.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\DB\Ddl\Trigger;
+use Magento\Framework\DB\Ddl\TriggerFactory;
+use Magento\Framework\Module\Setup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$setup = Bootstrap::getObjectManager()->get(Setup::class);
+$tableName = $setup->getTable('test_table_with_custom_trigger');
+$table = $setup->getConnection()->newTable(
+    $tableName
+)->addColumn(
+    'id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    ['identity' => true, 'nullable' => false, 'primary' => true],
+    'ID'
+)->setComment(
+    'Test table with test custom trigger'
+);
+$setup->getConnection()->createTable($table);
+
+$trigger = Bootstrap::getObjectManager()->get(TriggerFactory::class)->create()
+    ->setName('test_custom_trigger')
+    ->setTime(Trigger::TIME_AFTER)
+    ->setEvent(Trigger::EVENT_INSERT)
+    ->setTable($tableName)
+    ->addStatement($setup->getConnection()->quoteInto('SET @test_variable = ?', 'test_value'));
+$setup->getConnection()->createTrigger($trigger);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Backup/_files/trigger_rollback.php b/dev/tests/integration/testsuite/Magento/Framework/Backup/_files/trigger_rollback.php
new file mode 100644
index 0000000000000..324f184b10af5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Backup/_files/trigger_rollback.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Module\Setup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$setup = Bootstrap::getObjectManager()->get(Setup::class);
+$tableName = $setup->getTable('test_table_with_custom_trigger');
+$setup->getConnection()->dropTrigger('test_custom_trigger');
+$setup->getConnection()->dropTable($tableName);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php
new file mode 100644
index 0000000000000..622f17cbf9ce7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.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\Code\File\Validator;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class NotProtectedExtension
+ */
+class NotProtectedExtensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test that phpt, pht is invalid extension type
+     * @dataProvider isValidDataProvider
+     */
+    public function testIsValid($extension)
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $model */
+        $model = $objectManager->create(\Magento\MediaStorage\Model\File\Validator\NotProtectedExtension::class);
+        $this->assertFalse($model->isValid($extension));
+    }
+
+    public function isValidDataProvider()
+    {
+        return [
+            ['phpt'],
+            ['pht']
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index d74a83c339326..a43013860c79c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Framework\Code;
 
-use Magento\Framework\Code\Generator;
+use Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
 use Magento\Framework\ObjectManager\Code\Generator as DIGenerator;
-use Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 require_once __DIR__ . '/GeneratorTest/SourceClassWithNamespace.php';
 require_once __DIR__ . '/GeneratorTest/ParentClassWithNamespace.php';
@@ -18,60 +19,77 @@
 
 /**
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class GeneratorTest extends \PHPUnit\Framework\TestCase
+class GeneratorTest extends TestCase
 {
-    const CLASS_NAME_WITH_NAMESPACE = \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace::class;
+    const CLASS_NAME_WITH_NAMESPACE = GeneratorTest\SourceClassWithNamespace::class;
 
     /**
-     * @var \Magento\Framework\Code\Generator
+     * @var Generator
      */
     protected $_generator;
 
     /**
-     * @var \Magento\Framework\Code\Generator\Io
+     * @var Generator/Io
      */
     protected $_ioObject;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Write
+     * @var Filesystem\Directory\Write
+     */
+    private $generatedDirectory;
+
+    /**
+     * @var Filesystem\Directory\Read
+     */
+    private $logDirectory;
+
+    /**
+     * @var string
      */
-    protected $varDirectory;
+    private $testRelativePath = './Magento/Framework/Code/GeneratorTest/';
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->varDirectory = $objectManager->get(
-            \Magento\Framework\Filesystem::class
-        )->getDirectoryWrite(
-            DirectoryList::VAR_DIR
-        );
-        $generationDirectory = $this->varDirectory->getAbsolutePath('generation');
-        $this->_ioObject = new \Magento\Framework\Code\Generator\Io(
-            new \Magento\Framework\Filesystem\Driver\File(),
-            $generationDirectory
-        );
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->get(Filesystem::class);
+        $this->generatedDirectory = $filesystem->getDirectoryWrite(DirectoryList::GENERATED_CODE);
+        $this->logDirectory = $filesystem->getDirectoryRead(DirectoryList::LOG);
+        $generatedDirectoryAbsolutePath = $this->generatedDirectory->getAbsolutePath();
+        $this->_ioObject = new Generator\Io(new Filesystem\Driver\File(), $generatedDirectoryAbsolutePath);
         $this->_generator = $objectManager->create(
-            \Magento\Framework\Code\Generator::class,
+            Generator::class,
             [
                 'ioObject' => $this->_ioObject,
                 'generatedEntities' => [
                     ExtensionAttributesInterfaceFactoryGenerator::ENTITY_TYPE =>
                         ExtensionAttributesInterfaceFactoryGenerator::class,
-                    DIGenerator\Factory::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Factory::class,
-                    DIGenerator\Proxy::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Proxy::class,
-                    InterceptionGenerator\Interceptor::ENTITY_TYPE =>
-                        \Magento\Framework\Interception\Code\Generator\Interceptor::class,
+                    DIGenerator\Factory::ENTITY_TYPE => DIGenerator\Factory::class,
+                    DIGenerator\Proxy::ENTITY_TYPE => DIGenerator\Proxy::class,
+                    InterceptionGenerator\Interceptor::ENTITY_TYPE => InterceptionGenerator\Interceptor::class,
                 ]
             ]
         );
         $this->_generator->setObjectManager($objectManager);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
-        $this->varDirectory->delete('generation');
         $this->_generator = null;
+        if ($this->generatedDirectory->isExist($this->testRelativePath)) {
+            if (!$this->generatedDirectory->isWritable($this->testRelativePath)) {
+                $this->generatedDirectory->changePermissionsRecursively($this->testRelativePath, 0775, 0664);
+            }
+            $this->generatedDirectory->delete($this->testRelativePath);
+        }
     }
 
     protected function _clearDocBlock($classBody)
@@ -79,81 +97,59 @@ protected function _clearDocBlock($classBody)
         return preg_replace('/(\/\*[\w\W]*)\nclass/', 'class', $classBody);
     }
 
+    /**
+     * Generates a new file with Factory class and compares with the sample from the
+     * SourceClassWithNamespaceFactory.php.sample file.
+     */
     public function testGenerateClassFactoryWithNamespace()
     {
         $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'Factory';
-        $result = false;
-        $generatorResult = $this->_generator->generateClass($factoryClassName);
-        if (\Magento\Framework\Code\Generator::GENERATION_ERROR !== $generatorResult) {
-            $result = true;
-        }
-        $this->assertTrue($result, 'Failed asserting that \'' . (string)$generatorResult . '\' equals \'success\'.');
-
-        $factory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create($factoryClassName);
-
-        $object = $factory->create();
-        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE, $object);
-
-        // This test is only valid if the factory created the object if Autoloader did not pick it up automatically
-        if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
-            $content = $this->_clearDocBlock(
-                file_get_contents(
-                    $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . 'Factory')
-                )
-            );
-            $expectedContent = $this->_clearDocBlock(
-                file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceFactory.php.sample')
-            );
-            $this->assertEquals($expectedContent, $content);
-        }
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($factoryClassName));
+        $factory = Bootstrap::getObjectManager()->create($factoryClassName);
+        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE, $factory->create());
+        $content = $this->_clearDocBlock(
+            file_get_contents($this->_ioObject->generateResultFileName($factoryClassName))
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceFactory.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
     }
 
+    /**
+     * Generates a new file with Proxy class and compares with the sample from the
+     * SourceClassWithNamespaceProxy.php.sample file.
+     */
     public function testGenerateClassProxyWithNamespace()
     {
         $proxyClassName = self::CLASS_NAME_WITH_NAMESPACE . '\Proxy';
-        $result = false;
-        $generatorResult = $this->_generator->generateClass($proxyClassName);
-        if (\Magento\Framework\Code\Generator::GENERATION_ERROR !== $generatorResult) {
-            $result = true;
-        }
-        $this->assertTrue($result, 'Failed asserting that \'' . (string)$generatorResult . '\' equals \'success\'.');
-
-        $proxy = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create($proxyClassName);
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($proxyClassName));
+        $proxy = Bootstrap::getObjectManager()->create($proxyClassName);
         $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE, $proxy);
-
-        // This test is only valid if the factory created the object if Autoloader did not pick it up automatically
-        if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
-            $content = $this->_clearDocBlock(
-                file_get_contents($this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Proxy'))
-            );
-            $expectedContent = $this->_clearDocBlock(
-                file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceProxy.php.sample')
-            );
-            $this->assertEquals($expectedContent, $content);
-        }
+        $content = $this->_clearDocBlock(
+            file_get_contents($this->_ioObject->generateResultFileName($proxyClassName))
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceProxy.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
     }
 
+    /**
+     * Generates a new file with Interceptor class and compares with the sample from the
+     * SourceClassWithNamespaceInterceptor.php.sample file.
+     */
     public function testGenerateClassInterceptorWithNamespace()
     {
         $interceptorClassName = self::CLASS_NAME_WITH_NAMESPACE . '\Interceptor';
-        $result = false;
-        $generatorResult = $this->_generator->generateClass($interceptorClassName);
-        if (\Magento\Framework\Code\Generator::GENERATION_ERROR !== $generatorResult) {
-            $result = true;
-        }
-        $this->assertTrue($result, 'Failed asserting that \'' . (string)$generatorResult . '\' equals \'success\'.');
-
-        if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
-            $content = $this->_clearDocBlock(
-                file_get_contents(
-                    $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Interceptor')
-                )
-            );
-            $expectedContent = $this->_clearDocBlock(
-                file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceInterceptor.php.sample')
-            );
-            $this->assertEquals($expectedContent, $content);
-        }
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($interceptorClassName));
+        $content = $this->_clearDocBlock(
+            file_get_contents($this->_ioObject->generateResultFileName($interceptorClassName))
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceInterceptor.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
     }
 
     /**
@@ -163,26 +159,35 @@ public function testGenerateClassInterceptorWithNamespace()
     public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespace()
     {
         $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
-        $this->varDirectory->create(
-            $this->varDirectory->getAbsolutePath('generation') . '/Magento/Framework/Code/GeneratorTest/'
-        );
-
-        $generatorResult = $this->_generator->generateClass($factoryClassName);
-
+        $this->generatedDirectory->create($this->testRelativePath);
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($factoryClassName));
         $factory = Bootstrap::getObjectManager()->create($factoryClassName);
-        $object = $factory->create();
-
-        $this->assertEquals($generatorResult, Generator::GENERATION_SUCCESS);
-        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE . 'Extension', $object);
-
+        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE . 'Extension', $factory->create());
         $content = $this->_clearDocBlock(
-            file_get_contents(
-                $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory')
-            )
+            file_get_contents($this->_ioObject->generateResultFileName($factoryClassName))
         );
         $expectedContent = $this->_clearDocBlock(
             file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample')
         );
         $this->assertEquals($expectedContent, $content);
     }
+
+    /**
+     * It tries to generate a new class file when the generated directory is read-only
+     */
+    public function testGeneratorClassWithErrorSaveClassFile()
+    {
+        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'Factory';
+        $msgPart = 'Class ' . $factoryClassName . ' generation error: The requested class did not generate properly, '
+            . 'because the \'generated\' directory permission is read-only.';
+        $regexpMsgPart = preg_quote($msgPart);
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessageRegExp("/.*$regexpMsgPart.*/");
+        $this->generatedDirectory->create($this->testRelativePath);
+        $this->generatedDirectory->changePermissionsRecursively($this->testRelativePath, 0555, 0444);
+        $generatorResult = $this->_generator->generateClass($factoryClassName);
+        $this->assertFalse($generatorResult);
+        $pathToSystemLog = $this->logDirectory->getAbsolutePath('system.log');
+        $this->assertContains($msgPart, file_get_contents($pathToSystemLog));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
index ba7df011eec9b..e5bce7c52db7a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
@@ -7,6 +7,9 @@
 
 use Zend\Code\Generator\ClassGenerator;
 
+/**
+ * Class  SourceClassWithNamespace
+ */
 class SourceClassWithNamespace extends ParentClassWithNamespace
 {
     /**
@@ -96,18 +99,72 @@ private function _privateChildMethod(
     ) {
     }
 
+    /**
+     * Test method
+     */
     public function publicChildWithoutParameters()
     {
     }
 
+    /**
+     * Test method
+     */
     public static function publicChildStatic()
     {
     }
 
     /**
+     * Test method
+     *
      * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
      */
     final public function publicChildFinal()
     {
     }
+
+    /**
+     * Test method
+     *
+     * @param mixed $arg1
+     * @param string $arg2
+     * @param int|null $arg3
+     * @param int|null $arg4
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function public71(
+        $arg1,
+        string $arg2,
+        ?int $arg3,
+        ?int $arg4 = null
+    ): void {
+    }
+
+    /**
+     * Test method
+     *
+     * @param \DateTime|null $arg1
+     * @param mixed $arg2
+     *
+     * @return null|string
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function public71Another(?\DateTime $arg1, $arg2 = false): ?string
+    {
+    }
+
+    /**
+     * Test method
+     *
+     * @param bool $arg
+     * @return SourceClassWithNamespace
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function publicWithSelf($arg = false): self
+    {
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
index 2f7f040d82c24..103df9f570a2a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
@@ -41,9 +41,12 @@ public function getConstructorArgumentTypesDataProvider()
                     '\Imported\Name\Space\One',
                     '\Imported\Name\Space\AnotherTest\Extended',
                     '\Imported\Name\Space\Test',
-                    '\Imported\Name\Space\Object\Under\Test',
-                    '\Imported\Name\Space\Object',
+                    '\Imported\Name\Space\ClassName\Under\Test',
+                    '\Imported\Name\Space\ClassName',
                     '\Some\Testing\Name\Space\Test',
+                    '\Exception',
+                    '',
+                    '\Imported\Name\Space\ClassName',
                     'array',
                     ''
                 ],
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
index 8bf978150d003..5efe7837e7a3a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
@@ -6,7 +6,7 @@
 namespace Some\Testing\Name\Space;
 
 use Imported\Name\Space\One as FirstImport;
-use Imported\Name\Space\Object;
+use Imported\Name\Space\ClassName;
 use Imported\Name\Space\Test as Testing, \Imported\Name\Space\AnotherTest ;
 
 class AnotherSimpleClass
@@ -16,9 +16,12 @@ class AnotherSimpleClass
         FirstImport $itemTwo,
         AnotherTest\Extended $itemThree,
         Testing $itemFour,
-        Object\Under\Test $itemFive,
-        Object $itemSix,
+        ClassName\Under\Test $itemFive,
+        ClassName $itemSix,
         Test $itemSeven,
+        ?\Exception $optionalException,
+        $defaultString = '$default),value;',
+        ?ClassName $optionalWithDefaultValue = null,
         array $itemEight = [],
         $itemNine = 'test'
     ) {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample
index ea00d8d782de6..ddf678f8eb820 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample
@@ -41,7 +41,7 @@ class SourceClassWithNamespaceExtensionInterfaceFactory
      * @param array $data
      * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
index ef12a68d5e45c..cedcae73f7e3f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
@@ -41,7 +41,7 @@ class SourceClassWithNamespaceFactory
      * @param array $data
      * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
index cf8611866a885..83191f2d1b099 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
@@ -18,7 +18,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
     /**
      * {@inheritdoc}
      */
-    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicChildMethod');
         if (!$pluginInfo) {
@@ -57,7 +57,46 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
     /**
      * {@inheritdoc}
      */
-    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function public71($arg1, string $arg2, ?int $arg3, ?int $arg4 = null) : void
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71');
+        if (!$pluginInfo) {
+            parent::public71($arg1, $arg2, $arg3, $arg4);
+        } else {
+            $this->___callPlugins('public71', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function public71Another(?\DateTime $arg1, $arg2 = false) : ?string
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71Another');
+        if (!$pluginInfo) {
+            return parent::public71Another($arg1, $arg2);
+        } else {
+            return $this->___callPlugins('public71Another', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publicWithSelf($arg = false) : \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicWithSelf');
+        if (!$pluginInfo) {
+            return parent::publicWithSelf($arg);
+        } else {
+            return $this->___callPlugins('publicWithSelf', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicParentMethod');
         if (!$pluginInfo) {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
index 345ac49c6a4f4..359854f2d481c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
@@ -93,7 +93,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
     /**
      * {@inheritdoc}
      */
-    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         return $this->_getSubject()->publicChildMethod($classGenerator, $param1, $param2, $param3, $array);
     }
@@ -117,7 +117,31 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
     /**
      * {@inheritdoc}
      */
-    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function public71($arg1, string $arg2, ?int $arg3, ?int $arg4 = null) : void
+    {
+        $this->_getSubject()->public71($arg1, $arg2, $arg3, $arg4);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function public71Another(?\DateTime $arg1, $arg2 = false) : ?string
+    {
+        return $this->_getSubject()->public71Another($arg1, $arg2);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publicWithSelf($arg = false) : \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+    {
+        return $this->_getSubject()->publicWithSelf($arg);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         return $this->_getSubject()->publicParentMethod($docBlockGenerator, $param1, $param2, $param3, $array);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Communication/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Communication/ConfigTest.php
index 7a13ca1a48284..8b5eb1b10b8eb 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Communication/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Communication/ConfigTest.php
@@ -38,7 +38,7 @@ public function testGetTopicsNumeric()
      * Get topic configuration by its name
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid XML in file 0:
+     * @expectedExceptionMessage The XML in file "0" is invalid:
     Element 'topic', attribute 'schema': [facet 'pattern'] The value '55\Customer\Api\CustomerRepositoryInterface::delete' is not accepted by the pattern '[a-zA-Z]+[a-zA-Z0-9\\]+::[a-zA-Z0-9]+'.
     Line: 9
 
@@ -50,6 +50,7 @@ public function testGetTopicsNumeric()
 
     Element 'handler', attribute 'type': '55\Customer\Api\CustomerRepositoryInterface' is not a valid value of the atomic type 'serviceTypeType'.
     Line: 10
+    Verify the XML and try again.
      *
      */
     // @codingStandardsIgnoreEnd
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php
index bfe8264d7cce6..211b28617cbe2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php
@@ -24,7 +24,7 @@ public function testRemove()
                 [
                     'command' => 'remove',
                     'packages' => ['magento/package-a', 'magento/package-b'],
-                    '--no-update' => true,
+                    '--no-update-with-dependencies' => true,
                 ]
             );
         $composerAppFactory->expects($this->once())
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json
index e8e5d4595bee3..fe1d382b361fa 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json
@@ -2,7 +2,6 @@
     "name": "magento/magento2ce",
     "description": "Magento 2 (Community Edition)",
     "type": "project",
-    "version": "0.74.0-beta9",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -22,7 +21,7 @@
         "lib-libxml": "*",
         "composer/composer": "1.0.0-alpha9",
         "magento/magento-composer-installer": "*",
-        "magento/zendframework1": "1.12.10",
+        "magento/zendframework1": "*",
         "monolog/monolog": "1.11.0",
         "oyejorge/less.php": "1.7.0.3",
         "phpseclib/phpseclib": "~0.3",
@@ -60,101 +59,101 @@
         "squizlabs/php_codesniffer": "1.5.3"
     },
     "replace": {
-        "magento/module-admin-notification": "100.0.0",
-        "magento/module-authorization": "100.0.0",
-        "magento/module-backend": "100.0.0",
-        "magento/module-backup": "100.0.0",
-        "magento/module-bundle": "100.0.0",
-        "magento/module-cache-invalidate": "100.0.0",
-        "magento/module-captcha": "100.0.0",
-        "magento/module-catalog": "100.0.0",
-        "magento/module-catalog-import-export": "100.0.0",
-        "magento/module-catalog-inventory": "100.0.0",
-        "magento/module-catalog-rule": "100.0.0",
-        "magento/module-catalog-search": "100.0.0",
-        "magento/module-catalog-url-rewrite": "100.0.0",
-        "magento/module-catalog-widget": "100.0.0",
-        "magento/module-centinel": "100.0.0",
-        "magento/module-checkout": "100.0.0",
-        "magento/module-checkout-agreements": "100.0.0",
-        "magento/module-cms": "100.0.0",
-        "magento/module-cms-url-rewrite": "100.0.0",
-        "magento/module-config": "100.0.0",
-        "magento/module-configurable-import-export": "100.0.0",
-        "magento/module-configurable-product": "100.0.0",
-        "magento/module-contact": "100.0.0",
-        "magento/module-cookie": "100.0.0",
-        "magento/module-cron": "100.0.0",
-        "magento/module-currency-symbol": "100.0.0",
-        "magento/module-customer": "100.0.0",
-        "magento/module-customer-import-export": "100.0.0",
-        "magento/module-developer": "100.0.0",
-        "magento/module-dhl": "100.0.0",
-        "magento/module-directory": "100.0.0",
-        "magento/module-downloadable": "100.0.0",
-        "magento/module-eav": "100.0.0",
-        "magento/module-email": "100.0.0",
-        "magento/module-fedex": "100.0.0",
-        "magento/module-gift-message": "100.0.0",
-        "magento/module-google-adwords": "100.0.0",
-        "magento/module-google-analytics": "100.0.0",
-        "magento/module-google-optimizer": "100.0.0",
-        "magento/module-grouped-import-export": "100.0.0",
-        "magento/module-grouped-product": "100.0.0",
-        "magento/module-import-export": "100.0.0",
-        "magento/module-indexer": "100.0.0",
-        "magento/module-integration": "100.0.0",
-        "magento/module-layered-navigation": "100.0.0",
-        "magento/module-media-storage": "100.0.0",
-        "magento/module-msrp": "100.0.0",
-        "magento/module-multishipping": "100.0.0",
-        "magento/module-newsletter": "100.0.0",
-        "magento/module-offline-payments": "100.0.0",
-        "magento/module-offline-shipping": "100.0.0",
-        "magento/module-page-cache": "100.0.0",
-        "magento/module-payment": "100.0.0",
-        "magento/module-persistent": "100.0.0",
-        "magento/module-product-alert": "100.0.0",
-        "magento/module-quote": "100.0.0",
-        "magento/module-reports": "100.0.0",
-        "magento/module-require-js": "100.0.0",
-        "magento/module-review": "100.0.0",
-        "magento/module-rss": "100.0.0",
-        "magento/module-rule": "100.0.0",
-        "magento/module-sales": "100.0.0",
-        "magento/module-sales-rule": "100.0.0",
-        "magento/module-sales-sequence": "100.0.0",
-        "magento/module-search": "100.0.0",
-        "magento/module-sendfriend": "100.0.0",
-        "magento/module-shipping": "100.0.0",
-        "magento/module-sitemap": "100.0.0",
-        "magento/module-store": "100.0.0",
-        "magento/module-tax": "100.0.0",
-        "magento/module-tax-import-export": "100.0.0",
-        "magento/module-theme": "100.0.0",
-        "magento/module-translation": "100.0.0",
-        "magento/module-ui": "100.0.0",
-        "magento/module-ups": "100.0.0",
-        "magento/module-url-rewrite": "100.0.0",
-        "magento/module-user": "100.0.0",
-        "magento/module-usps": "100.0.0",
-        "magento/module-variable": "100.0.0",
-        "magento/module-version": "100.0.0",
-        "magento/module-webapi": "100.0.0",
-        "magento/module-weee": "100.0.0",
-        "magento/module-widget": "100.0.0",
-        "magento/module-wishlist": "100.0.0",
-        "magento/theme-adminhtml-backend": "100.0.0",
-        "magento/theme-frontend-blank": "100.0.0",
-        "magento/theme-frontend-luma": "100.0.0",
-        "magento/language-de_de": "100.0.0",
-        "magento/language-en_us": "100.0.0",
-        "magento/language-es_es": "100.0.0",
-        "magento/language-fr_fr": "100.0.0",
-        "magento/language-nl_nl": "100.0.0",
-        "magento/language-pt_br": "100.0.0",
-        "magento/language-zh_cn": "100.0.0",
-        "magento/framework": "100.0.0",
+        "magento/module-admin-notification": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-backup": "*",
+        "magento/module-bundle": "*",
+        "magento/module-cache-invalidate": "*",
+        "magento/module-captcha": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-catalog-widget": "*",
+        "magento/module-centinel": "*",
+        "magento/module-checkout": "*",
+        "magento/module-checkout-agreements": "*",
+        "magento/module-cms": "*",
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-import-export": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-contact": "*",
+        "magento/module-cookie": "*",
+        "magento/module-cron": "*",
+        "magento/module-currency-symbol": "*",
+        "magento/module-customer": "*",
+        "magento/module-customer-import-export": "*",
+        "magento/module-developer": "*",
+        "magento/module-dhl": "*",
+        "magento/module-directory": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-email": "*",
+        "magento/module-fedex": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-google-adwords": "*",
+        "magento/module-google-analytics": "*",
+        "magento/module-google-optimizer": "*",
+        "magento/module-grouped-import-export": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-import-export": "*",
+        "magento/module-indexer": "*",
+        "magento/module-integration": "*",
+        "magento/module-layered-navigation": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-msrp": "*",
+        "magento/module-multishipping": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-offline-payments": "*",
+        "magento/module-offline-shipping": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-payment": "*",
+        "magento/module-persistent": "*",
+        "magento/module-product-alert": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-require-js": "*",
+        "magento/module-review": "*",
+        "magento/module-rss": "*",
+        "magento/module-rule": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-search": "*",
+        "magento/module-sendfriend": "*",
+        "magento/module-shipping": "*",
+        "magento/module-sitemap": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-tax-import-export": "*",
+        "magento/module-theme": "*",
+        "magento/module-translation": "*",
+        "magento/module-ui": "*",
+        "magento/module-ups": "*",
+        "magento/module-url-rewrite": "*",
+        "magento/module-user": "*",
+        "magento/module-usps": "*",
+        "magento/module-variable": "*",
+        "magento/module-version": "*",
+        "magento/module-webapi": "*",
+        "magento/module-weee": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*",
+        "magento/theme-adminhtml-backend": "*",
+        "magento/theme-frontend-blank": "*",
+        "magento/theme-frontend-luma": "*",
+        "magento/language-de_de": "*",
+        "magento/language-en_us": "*",
+        "magento/language-es_es": "*",
+        "magento/language-fr_fr": "*",
+        "magento/language-nl_nl": "*",
+        "magento/language-pt_br": "*",
+        "magento/language-zh_cn": "*",
+        "magento/framework": "*",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc",
         "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f",
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.json
index 16c63cd90a87f..58bbefe11b877 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.json
@@ -2,13 +2,12 @@
     "name": "magento/project-community-edition",
     "description": "eCommerce Platform for Growth (Community Edition)",
     "type": "project",
-    "version": "0.74.0-beta9",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/product-community-edition": "0.74.0-beta9"
+        "magento/product-community-edition": "*"
     },
     "repositories": [
         {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
index a94f384ba701b..756542fbdb222 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
@@ -782,34 +782,6 @@
                         "dev/tests/functional/.gitignore",
                         "dev/tests/functional/.gitignore"
                     ],
-                    [
-                        "dev/tests/js/JsTestDriver/run_js_tests.php",
-                        "dev/tests/js/JsTestDriver/run_js_tests.php"
-                    ],
-                    [
-                        "dev/tests/js/JsTestDriver/jsTestDriverOrder.php",
-                        "dev/tests/js/JsTestDriver/jsTestDriverOrder.php"
-                    ],
-                    [
-                        "dev/tests/js/JsTestDriver/jsTestDriver.php.dist",
-                        "dev/tests/js/JsTestDriver/jsTestDriver.php.dist"
-                    ],
-                    [
-                        "dev/tests/js/JsTestDriver/framework",
-                        "dev/tests/js/JsTestDriver/framework"
-                    ],
-                    [
-                        "dev/tests/js/JsTestDriver/testsuite/lib",
-                        "dev/tests/js/JsTestDriver/testsuite/lib"
-                    ],
-                    [
-                        "dev/tests/js/JsTestDriver/testsuite/mage",
-                        "dev/tests/js/JsTestDriver/testsuite/mage"
-                    ],
-                    [
-                        "dev/tests/js/JsTestDriver/.gitignore",
-                        "dev/tests/js/JsTestDriver/.gitignore"
-                    ],
                     [
                         "dev/tests/js/jasmine",
                         "dev/tests/js/jasmine"
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.json
index 840d4acea3ee2..96276f67751a9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.json
@@ -1,10 +1,9 @@
 {
-  "version": "0.74.0-beta9",
   "config": {
     "sort-packages": true
   },
   "require": {
-    "magento/product-community-edition": "0.74.0-beta2",
+    "magento/product-community-edition": "*",
     "magento/sample-module-minimal" : "*"
    },
   "autoload": {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
index f027a2397f97f..48fa6d0d0cd34 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
@@ -775,18 +775,6 @@
                         "dev/tests/functional/.gitignore",
                         "dev/tests/functional/.gitignore"
                     ],
-                    [
-                        "dev/tests/js/run_js_tests.php",
-                        "dev/tests/js/run_js_tests.php"
-                    ],
-                    [
-                        "dev/tests/js/jsTestDriverOrder.php",
-                        "dev/tests/js/jsTestDriverOrder.php"
-                    ],
-                    [
-                        "dev/tests/js/jsTestDriver.php.dist",
-                        "dev/tests/js/jsTestDriver.php.dist"
-                    ],
                     [
                         "dev/tests/js/spec",
                         "dev/tests/js/spec"
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
new file mode 100644
index 0000000000000..5b39a2afb9d6c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
@@ -0,0 +1,86 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Config;
+
+/**
+ * Tests Magento\Framework\Config\Convert
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * Tests config value "false" is not interpreted as true.
+     *
+     * @param string $sourceString
+     * @param array $expected
+     * @dataProvider parseVarElementDataProvider
+     */
+    public function testParseVarElement($sourceString, $expected)
+    {
+        $document = new \DOMDocument();
+        $document->loadXML($sourceString);
+        $actual = $this->converter->convert($document);
+
+        self::assertEquals(
+            $expected,
+            $actual
+        );
+    }
+
+    /**
+     * Data provider for testParseVarElement.
+     *
+     * @return array
+     */
+    public function parseVarElementDataProvider()
+    {
+        $sourceString = <<<'XML'
+<?xml version="1.0"?>
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
+    <vars module="Magento_Test">    
+        <var name="str">some string</var>  
+        <var name="int-1">1</var>        
+        <var name="int-0">0</var>        
+        <var name="bool-true">true</var> 
+        <var name="bool-false">false</var> 
+    </vars>
+ </view>
+XML;
+        $expectedResult = [
+            'vars' => [
+                'Magento_Test' => [
+                    'str' => 'some string',
+                    'int-1' => '1',
+                    'int-0' => '0',
+                    'bool-true' => true,
+                    'bool-false' => false
+                ]
+            ]
+        ];
+
+        return [
+            [
+                $sourceString,
+                $expectedResult
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->converter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+              ->create(\Magento\Framework\Config\Converter::class);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
new file mode 100644
index 0000000000000..7a439d84ce563
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Console;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CliTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var ConfigFilePool
+     */
+    private $configFilePool;
+
+    /**
+     * @var FileReader
+     */
+    private $reader;
+
+    /**
+     * @var Writer
+     */
+    private $writer;
+
+    /**
+     * @var array
+     */
+    private $envConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->configFilePool = $this->objectManager->get(ConfigFilePool::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->reader = $this->objectManager->get(FileReader::class);
+        $this->writer = $this->objectManager->get(Writer::class);
+
+        $this->envConfig = $this->reader->load(ConfigFilePool::APP_ENV);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->writeFile(
+            $this->configFilePool->getPath(ConfigFilePool::APP_ENV),
+            "<?php\n return array();\n"
+        );
+
+        $this->writer->saveConfig([ConfigFilePool::APP_ENV => $this->envConfig], true);
+    }
+
+    /**
+     * Checks that settings from env.php config file are applied
+     * to created application instance.
+     *
+     * @param bool $isPub
+     * @param array $params
+     * @dataProvider documentRootIsPubProvider
+     */
+    public function testDocumentRootIsPublic($isPub, $params)
+    {
+        $config = include __DIR__ . '/_files/env.php';
+        $config['directories']['document_root_is_pub'] = $isPub;
+        $this->writer->saveConfig([ConfigFilePool::APP_ENV => $config], true);
+
+        $cli = new Cli();
+        $cliReflection = new \ReflectionClass($cli);
+
+        $serviceManagerProperty = $cliReflection->getProperty('serviceManager');
+        $serviceManagerProperty->setAccessible(true);
+        $serviceManager = $serviceManagerProperty->getValue($cli);
+        $deploymentConfig = $this->objectManager->get(DeploymentConfig::class);
+        $serviceManager->setAllowOverride(true);
+        $serviceManager->setService(DeploymentConfig::class, $deploymentConfig);
+        $serviceManagerProperty->setAccessible(false);
+
+        $documentRootResolver = $cliReflection->getMethod('documentRootResolver');
+        $documentRootResolver->setAccessible(true);
+
+        self::assertEquals($params, $documentRootResolver->invoke($cli));
+    }
+
+    /**
+     * Provides document root setting and expecting
+     * properties for object manager creation.
+     *
+     * @return array
+     */
+    public function documentRootIsPubProvider(): array
+    {
+        return [
+            [true, [
+                'MAGE_DIRS' => [
+                    'pub' => ['uri' => ''],
+                    'media' => ['uri' => 'media'],
+                    'static' => ['uri' => 'static'],
+                    'upload' => ['uri' => 'media/upload']
+                ]
+            ]],
+            [false, []]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/_files/env.php b/dev/tests/integration/testsuite/Magento/Framework/Console/_files/env.php
new file mode 100644
index 0000000000000..e314e7638c22c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/_files/env.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'backend' => [
+        'frontName' => 'admin',
+    ],
+    'crypt' => [
+        'key' => 'some_key',
+    ],
+    'session' => [
+        'save' => 'files',
+    ],
+    'db' => [
+        'table_prefix' => '',
+        'connection' => [],
+    ],
+    'resource' => [],
+    'x-frame-options' => 'SAMEORIGIN',
+    'MAGE_MODE' => 'default',
+    'cache_types' => [
+        'config' => 1,
+        'layout' => 1,
+        'block_html' => 1,
+        'collections' => 1,
+        'reflection' => 1,
+        'db_ddl' => 1,
+        'eav' => 1,
+        'customer_notification' => 1,
+        'config_integration' => 1,
+        'config_integration_api' => 1,
+        'full_page' => 1,
+        'translate' => 1,
+        'config_webservice' => 1,
+    ],
+    'install' => [
+        'date' => 'Thu, 09 Feb 2017 14:28:00 +0000',
+    ],
+    'directories' => [
+        'document_root_is_pub' => true
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/TransactionTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/TransactionTest.php
index ec8407dd46ced..c4023d7e36a9d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DB/TransactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/TransactionTest.php
@@ -46,4 +46,31 @@ public function testSaveDelete()
         $test->load($first->getId());
         $this->assertEmpty($test->getId());
     }
+
+    /**
+     * @magentoDbIsolation disabled
+     */
+    public function testTransactionLevelDbIsolationDisable()
+    {
+        $resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\App\ResourceConnection::class);
+        $this->assertEquals(0, $resourceConnection->getConnection('default')->getTransactionLevel());
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     */
+    public function testTransactionLevelDbIsolationEnabled()
+    {
+        $resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\App\ResourceConnection::class);
+        $this->assertEquals(1, $resourceConnection->getConnection('default')->getTransactionLevel());
+    }
+
+    public function testTransactionLevelDbIsolationDefault()
+    {
+        $resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\App\ResourceConnection::class);
+        $this->assertEquals(0, $resourceConnection->getConnection('default')->getTransactionLevel());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/FieldsetTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/FieldsetTest.php
index 444e18927f9ee..9453b07f41fc8 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/FieldsetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/FieldsetTest.php
@@ -246,7 +246,7 @@ public function getSubFieldsetDataProvider()
         $fieldsetField = $textField;
         $fieldsetField[1] = 'fieldset';
         $advancedFieldsetFld = $fieldsetField;
-        // set isAdvenced flag
+        // set isAdvanced flag
         $advancedFieldsetFld[4] = true;
         $result = [[[$fieldsetField, $textField, $advancedFieldsetFld], 1]];
         return $result;
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/CopyTest.php b/dev/tests/integration/testsuite/Magento/Framework/DataObject/CopyTest.php
index dce6880a1dbab..e333fb4bc42cf 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/CopyTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DataObject/CopyTest.php
@@ -39,8 +39,6 @@ public function testCopyFieldset()
 
     public function testCopyFieldsetWithExtensionAttributes()
     {
-        $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
-        $autoloadWrapper->addPsr4('Magento\\Wonderland\\', realpath(__DIR__ . '/_files/Magento/Wonderland'));
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         $fieldsetConfigMock = $this->getMockBuilder(\Magento\Framework\DataObject\Copy\Config::class)
@@ -74,20 +72,22 @@ public function testCopyFieldsetWithExtensionAttributes()
 
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
         $dataObjectHelper = $objectManager->get(\Magento\Framework\Api\DataObjectHelper::class);
-        /** @var \Magento\Wonderland\Model\Data\FakeCustomerFactory $customerFactory */
-        $customerFactory = $objectManager->get(\Magento\Wonderland\Model\Data\FakeCustomerFactory::class);
-        /** @var \Magento\Wonderland\Api\Data\CustomerInterface $source */
+        /** @var \Magento\TestModuleExtensionAttributes\Model\Data\FakeCustomerFactory $customerFactory */
+        $customerFactory = $objectManager->get(
+            \Magento\TestModuleExtensionAttributes\Model\Data\FakeCustomerFactory::class
+        );
+        /** @var \Magento\TestModuleExtensionAttributes\Api\Data\CustomerInterface $source */
         $source = $customerFactory->create();
         $dataObjectHelper->populateWithArray(
             $source,
             $dataWithExtraField,
-            \Magento\Wonderland\Api\Data\FakeCustomerInterface::class
+            \Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerInterface::class
         );
-        /** @var \Magento\Wonderland\Api\Data\CustomerInterface $target */
+        /** @var \Magento\TestModuleExtensionAttributes\Api\Data\CustomerInterface $target */
         $target = $customerFactory->create();
         $target = $service->copyFieldsetToTarget($fieldset, $aspect, $source, $target);
 
-        $this->assertInstanceOf(\Magento\Wonderland\Api\Data\FakeCustomerInterface::class, $target);
+        $this->assertInstanceOf(\Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerInterface::class, $target);
         $this->assertNull(
             $target->getEmail(),
             "Email should not be set because it is not defined in the fieldset."
@@ -106,8 +106,6 @@ public function testCopyFieldsetWithExtensionAttributes()
 
     public function testCopyFieldsetWithAbstractSimpleObject()
     {
-        $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
-        $autoloadWrapper->addPsr4('Magento\\Wonderland\\', realpath(__DIR__ . '/_files/Magento/Wonderland'));
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         $fieldset = 'sales_copy_order';
@@ -130,13 +128,13 @@ public function testCopyFieldsetWithAbstractSimpleObject()
             ->method('getFieldSet')
             ->willReturn($data);
 
-        $source = $objectManager->get(\Magento\Wonderland\Model\Data\FakeAttributeMetadata::class);
+        $source = $objectManager->get(\Magento\TestModuleExtensionAttributes\Model\Data\FakeAttributeMetadata::class);
         $source->setStoreLabel('storeLabel');
         $source->setFrontendLabel('frontendLabel');
         $source->setAttributeCode('attributeCode');
         $source->setNote('note');
 
-        $target = $objectManager->get(\Magento\Wonderland\Model\Data\FakeAttributeMetadata::class);
+        $target = $objectManager->get(\Magento\TestModuleExtensionAttributes\Model\Data\FakeAttributeMetadata::class);
         $expectedTarget = $source;
 
         $this->assertEquals(
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/Data/FakeAttributeMetadata.php b/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/Data/FakeAttributeMetadata.php
deleted file mode 100644
index 2efe9f353c4df..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/Data/FakeAttributeMetadata.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Wonderland\Model\Data;
-
-/**
- * Customer attribute metadata class.
- */
-class FakeAttributeMetadata extends \Magento\Framework\Api\AbstractSimpleObject implements
-    \Magento\Wonderland\Api\Data\FakeAttributeMetadataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributeCode()
-    {
-        return $this->_get(self::ATTRIBUTE_CODE);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStoreLabel()
-    {
-        return $this->_get(self::STORE_LABEL);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFrontendLabel()
-    {
-        return $this->_get(self::FRONTEND_LABEL);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNote()
-    {
-        return $this->_get(self::NOTE);
-    }
-
-    /**
-     * Set attribute code
-     *
-     * @param string $attributeCode
-     * @return $this
-     */
-    public function setAttributeCode($attributeCode)
-    {
-        return $this->setData(self::ATTRIBUTE_CODE, $attributeCode);
-    }
-
-    /**
-     * Set label of the store.
-     *
-     * @param string $storeLabel
-     * @return $this
-     */
-    public function setStoreLabel($storeLabel)
-    {
-        return $this->setData(self::STORE_LABEL, $storeLabel);
-    }
-
-    /**
-     * Set label which supposed to be displayed on frontend.
-     *
-     * @param string $frontendLabel
-     * @return $this
-     */
-    public function setFrontendLabel($frontendLabel)
-    {
-        return $this->setData(self::FRONTEND_LABEL, $frontendLabel);
-    }
-
-    /**
-     * Set the note attribute for the element.
-     *
-     * @param string $note
-     * @return $this
-     */
-    public function setNote($note)
-    {
-        return $this->setData(self::NOTE, $note);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/Data/FakeCustomer.php b/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/Data/FakeCustomer.php
deleted file mode 100644
index 38022ef213875..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/Data/FakeCustomer.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Wonderland\Model\Data;
-
-/**
- * Class Customer
- *
- */
-class FakeCustomer extends \Magento\Framework\Api\AbstractExtensibleObject implements
-    \Magento\Wonderland\Api\Data\FakeCustomerInterface
-{
-    /**
-     * Get email address
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->_get(self::EMAIL);
-    }
-
-    /**
-     * Get first name
-     *
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->_get(self::FIRSTNAME);
-    }
-
-    /**
-     * Get customer id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->_get(self::ID);
-    }
-
-    /**
-     * Get last name
-     *
-     * @return string
-     */
-    public function getLastname()
-    {
-        return $this->_get(self::LASTNAME);
-    }
-
-    /**
-     * Set customer id
-     *
-     * @param int $id
-     * @return $this
-     */
-    public function setId($id)
-    {
-        return $this->setData(self::ID, $id);
-    }
-
-    /**
-     * Set email address
-     *
-     * @param string $email
-     * @return $this
-     */
-    public function setEmail($email)
-    {
-        return $this->setData(self::EMAIL, $email);
-    }
-
-    /**
-     * Set first name
-     *
-     * @param string $firstname
-     * @return $this
-     */
-    public function setFirstname($firstname)
-    {
-        return $this->setData(self::FIRSTNAME, $firstname);
-    }
-
-    /**
-     * Set last name
-     *
-     * @param string $lastname
-     * @return string
-     */
-    public function setLastname($lastname)
-    {
-        return $this->setData(self::LASTNAME, $lastname);
-    }
-
-    /**
-     * Get prefix
-     *
-     * @return string|null
-     */
-    public function getPrefix()
-    {
-        return $this->_get(self::PREFIX);
-    }
-
-    /**
-     * Set prefix
-     *
-     * @param string $prefix
-     * @return $this
-     */
-    public function setPrefix($prefix)
-    {
-        return $this->setData(self::PREFIX, $prefix);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/FakeAttributeMetadata.php b/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/FakeAttributeMetadata.php
deleted file mode 100644
index 293f238b24adf..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/FakeAttributeMetadata.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Wonderland\Api\Model;
-
-/**
- * Customer attribute metadata class.
- */
-class FakeAttributeMetadata extends \Magento\Framework\Api\AbstractSimpleObject implements
-    \Magento\Wonderland\Api\Data\FakeAttributeMetadataInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributeCode()
-    {
-        return $this->_get(self::ATTRIBUTE_CODE);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStoreLabel()
-    {
-        return $this->_get(self::STORE_LABEL);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFrontendLabel()
-    {
-        return $this->_get(self::FRONTEND_LABEL);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNote()
-    {
-        return $this->_get(self::NOTE);
-    }
-
-    /**
-     * Set attribute code
-     *
-     * @param string $attributeCode
-     * @return $this
-     */
-    public function setAttributeCode($attributeCode)
-    {
-        return $this->setData(self::ATTRIBUTE_CODE, $attributeCode);
-    }
-
-    /**
-     * Set label of the store.
-     *
-     * @param string $storeLabel
-     * @return $this
-     */
-    public function setStoreLabel($storeLabel)
-    {
-        return $this->setData(self::STORE_LABEL, $storeLabel);
-    }
-
-    /**
-     * Set label which supposed to be displayed on frontend.
-     *
-     * @param string $frontendLabel
-     * @return $this
-     */
-    public function setFrontendLabel($frontendLabel)
-    {
-        return $this->setData(self::FRONTEND_LABEL, $frontendLabel);
-    }
-
-    /**
-     * Set the note attribute for the element.
-     *
-     * @param string $note
-     * @return $this
-     */
-    public function setNote($note)
-    {
-        return $this->setData(self::NOTE, $note);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/FakeCustomer.php b/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/FakeCustomer.php
deleted file mode 100644
index 0f533ebf83bcc..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/DataObject/_files/Magento/Wonderland/Model/FakeCustomer.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Wonderland\Api\Model;
-
-/**
- * Class Customer
- *
- */
-class FakeCustomer extends \Magento\Framework\Api\AbstractExtensibleObject implements
-    \Magento\Wonderland\Api\Data\FakeCustomerInterface
-{
-    /**
-     * Get customer id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->_get(self::ID);
-    }
-
-    /**
-     * Get email address
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->_get(self::EMAIL);
-    }
-
-    /**
-     * Get first name
-     *
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->_get(self::FIRSTNAME);
-    }
-
-    /**
-     * Get last name
-     *
-     * @return string
-     */
-    public function getLastname()
-    {
-        return $this->_get(self::LASTNAME);
-    }
-
-    /**
-     * Get prefix
-     *
-     * @return string|null
-     */
-    public function getPrefix()
-    {
-        return $this->_get(self::PREFIX);
-    }
-
-    /**
-     * Set customer id
-     *
-     * @param int $id
-     * @return $this
-     */
-    public function setId($id)
-    {
-        return $this->setData(self::ID, $id);
-    }
-
-    /**
-     * Set email address
-     *
-     * @param string $email
-     * @return $this
-     */
-    public function setEmail($email)
-    {
-        return $this->setData(self::EMAIL, $email);
-    }
-
-    /**
-     * Set first name
-     *
-     * @param string $firstname
-     * @return $this
-     */
-    public function setFirstname($firstname)
-    {
-        return $this->setData(self::FIRSTNAME, $firstname);
-    }
-
-    /**
-     * Set last name
-     *
-     * @param string $lastname
-     * @return string
-     */
-    public function setLastname($lastname)
-    {
-        return $this->setData(self::LASTNAME, $lastname);
-    }
-
-    /**
-     * Set prefix
-     *
-     * @param string $prefix
-     * @return $this
-     */
-    public function setPrefix($prefix)
-    {
-        return $this->setData(self::PREFIX, $prefix);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(
-        \Magento\Wonderland\Api\Data\FakeCustomerExtensionInterface $extensionAttributes
-    ) {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Encryption/ModelTest.php b/dev/tests/integration/testsuite/Magento/Framework/Encryption/ModelTest.php
index f5b48e79b9860..12f398b705b2d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Encryption/ModelTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Encryption/ModelTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Encryption;
 
 class ModelTest extends \PHPUnit\Framework\TestCase
@@ -40,7 +42,16 @@ public function testEncryptDecrypt2()
     public function testValidateKey()
     {
         $validKey = md5(uniqid());
-        $this->assertInstanceOf(\Magento\Framework\Encryption\Crypt::class, $this->_model->validateKey($validKey));
+        $this->_model->validateKey($validKey);
+    }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function testValidateKeyInvalid()
+    {
+        $invalidKey = '----    ';
+        $this->_model->validateKey($invalidKey);
     }
 
     public function testGetValidateHash()
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
index f43a523a12ed0..bc77eeb932c9a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
@@ -7,6 +7,7 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\ValidatorException;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -34,13 +35,66 @@ public function testGetAbsolutePath()
         $this->assertContains('_files/foo/bar', $dir->getAbsolutePath('bar'));
     }
 
+    public function testGetAbsolutePathOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->getAbsolutePath('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->getAbsolutePath('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->getAbsolutePath('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     public function testGetRelativePath()
     {
         $dir = $this->getDirectoryInstance('foo');
+        $this->assertEquals(
+            'file_three.txt',
+            $dir->getRelativePath('file_three.txt')
+        );
         $this->assertEquals('', $dir->getRelativePath());
         $this->assertEquals('bar', $dir->getRelativePath(__DIR__ . '/../_files/foo/bar'));
     }
 
+    public function testGetRelativePathOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->getRelativePath(__DIR__ .'/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->getRelativePath(__DIR__ .'//./..////Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->getRelativePath(__DIR__ .'\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->getRelativePath('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(4, $exceptions);
+    }
+
     /**
      * Test for read method
      *
@@ -72,6 +126,28 @@ public function readProvider()
         ];
     }
 
+    public function testReadOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->read('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->read('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->read('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for search method
      *
@@ -103,6 +179,28 @@ public function searchProvider()
         ];
     }
 
+    public function testSearchOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->search('/*/*.txt', '../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->search('/*/*.txt', '//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->search('/*/*.txt', '\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for isExist method
      *
@@ -127,6 +225,28 @@ public function existsProvider()
         return [['foo', 'bar', true], ['foo', 'bar/baz/', true], ['foo', 'bar/notexists', false]];
     }
 
+    public function testIsExistOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->isExist('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isExist('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isExist('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for stat method
      *
@@ -168,6 +288,28 @@ public function statProvider()
         return [['foo', 'bar'], ['foo', 'file_three.txt']];
     }
 
+    public function testStatOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->stat('bar/../../../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->stat('bar//./..///../../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->stat('bar\..\..\..\Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for isReadable method
      *
@@ -182,6 +324,28 @@ public function testIsReadable($dirPath, $path, $readable)
         $this->assertEquals($readable, $dir->isReadable($path));
     }
 
+    public function testIsReadableOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->isReadable('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isReadable('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isReadable('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for isFile method
      *
@@ -194,6 +358,28 @@ public function testIsFile($path, $isFile)
         $this->assertEquals($isFile, $this->getDirectoryInstance('foo')->isFile($path));
     }
 
+    public function testIsFileOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->isFile('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isFile('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isFile('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for isDirectory method
      *
@@ -206,6 +392,28 @@ public function testIsDirectory($path, $isDirectory)
         $this->assertEquals($isDirectory, $this->getDirectoryInstance('foo')->isDirectory($path));
     }
 
+    public function testIsDirectoryOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->isDirectory('../../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isDirectory('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isDirectory('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Data provider for testIsReadable
      *
@@ -246,6 +454,28 @@ public function testOpenFile()
         $this->assertTrue($file instanceof \Magento\Framework\Filesystem\File\ReadInterface);
     }
 
+    public function testOpenFileOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->openFile('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->openFile('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->openFile('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test readFile
      *
@@ -268,10 +498,35 @@ public function readFileProvider()
     {
         return [
             ['popup.csv', 'var myData = 5;'],
-            ['data.csv', '"field1", "field2"' . "\n" . '"field3", "field4"' . "\n"]
+            [
+                'data.csv',
+                '"field1", "field2"' . PHP_EOL . '"field3", "field4"' . PHP_EOL
+            ]
         ];
     }
 
+    public function testReadFileOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->readFile('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->readFile('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->readFile('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Get readable file instance
      * Get full path for files located in _files directory
@@ -301,4 +556,26 @@ public function testReadRecursively()
         sort($expected);
         $this->assertEquals($expected, $actual);
     }
+
+    public function testReadRecursivelyOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('foo');
+        try {
+            $dir->readRecursively('../../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->readRecursively('//./..///../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->readRecursively('\..\..\Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
index 380c7998680a1..39a224ff902d5 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
@@ -7,6 +7,7 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -63,6 +64,28 @@ public function createProvider()
         ];
     }
 
+    public function testCreateOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->create('../../outsideDir');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->create('//./..///../outsideDir');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->create('\..\..\outsideDir');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for delete method
      *
@@ -88,6 +111,28 @@ public function deleteProvider()
         return [['subdir'], ['subdir/subsubdir']];
     }
 
+    public function testDeleteOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->delete('../../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->delete('//./..///../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->delete('\..\..\Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for rename method (in scope of one directory instance)
      *
@@ -119,6 +164,31 @@ public function renameProvider()
         return [['newDir1', 0777, 'first_name.txt', 'second_name.txt']];
     }
 
+    public function testRenameOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->renameFile('../../Directory/ReadTest.php', 'RenamedTest');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->renameFile(
+                '//./..///../Directory/ReadTest.php',
+                'RenamedTest'
+            );
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->renameFile('\..\..\Directory\ReadTest.php', 'RenamedTest');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for rename method (moving to new directory instance)
      *
@@ -185,6 +255,40 @@ public function copyProvider()
         ];
     }
 
+    public function testCopyOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        $dir->touch('test_file_for_copy_outside.txt');
+        try {
+            $dir->copyFile('../../Directory/ReadTest.php', 'CopiedTest');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->copyFile(
+                '//./..///../Directory/ReadTest.php',
+                'CopiedTest'
+            );
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->copyFile('\..\..\Directory\ReadTest.php', 'CopiedTest');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->copyFile(
+                'test_file_for_copy_outside.txt',
+                '../../Directory/copied_outside.txt'
+            );
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(4, $exceptions);
+    }
+
     /**
      * Test for copy method (copy to another directory instance)
      *
@@ -231,6 +335,28 @@ public function testChangePermissions()
         $this->assertTrue($directory->changePermissions('test_directory', 0644));
     }
 
+    public function testChangePermissionsOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->changePermissions('../../Directory', 0777);
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->changePermissions('//./..///../Directory', 0777);
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->changePermissions('\..\..\Directory', 0777);
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for changePermissionsRecursively method
      */
@@ -244,6 +370,28 @@ public function testChangePermissionsRecursively()
         $this->assertTrue($directory->changePermissionsRecursively('test_directory', 0777, 0644));
     }
 
+    public function testChangePermissionsRecursivelyOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->changePermissionsRecursively('../foo', 0777, 0777);
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->changePermissionsRecursively('//./..///foo', 0777, 0777);
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->changePermissionsRecursively('\..\foo', 0777, 0777);
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for touch method
      *
@@ -274,6 +422,28 @@ public function touchProvider()
         ];
     }
 
+    public function testTouchOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->touch('../../foo.tst');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->touch('//./..///../foo.tst');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->touch('\..\..\foo.tst');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test isWritable method
      */
@@ -285,6 +455,28 @@ public function testIsWritable()
         $this->assertTrue($directory->isWritable('bar'));
     }
 
+    public function testIsWritableOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->isWritable('../../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isWritable('//./..///../Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->isWritable('\..\..\Directory');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test for openFile method
      *
@@ -315,6 +507,28 @@ public function openFileProvider()
         ];
     }
 
+    public function testOpenFileOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->openFile('../../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->openFile('//./..///../Directory/ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->openFile('\..\..\Directory\ReadTest.php');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Test writeFile
      *
@@ -359,6 +573,28 @@ public function writeFileProvider()
         return [['file1', '123', '456'], ['folder1/file1', '123', '456']];
     }
 
+    public function testWriteFileOutside()
+    {
+        $exceptions = 0;
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        try {
+            $dir->writeFile('../../Directory/ReadTest.php', 'tst');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->writeFile('//./..///../Directory/ReadTest.php', 'tst');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        try {
+            $dir->writeFile('\..\..\Directory\ReadTest.php', 'tst');
+        } catch (ValidatorException $exception) {
+            $exceptions++;
+        }
+        $this->assertEquals(3, $exceptions);
+    }
+
     /**
      * Tear down
      */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php
index 26401c782efc4..5f53e62165502 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php
@@ -7,22 +7,27 @@
  */
 namespace Magento\Framework\Filesystem\Driver;
 
-use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Exception\FileSystemException;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Filesystem\Driver\File
+     * @var File
      */
-    protected $driver;
+    private $driver;
 
     /**
-     * @var string
+     * @var String
      */
-    protected $absolutePath;
+    private $absolutePath;
 
     /**
-     * get relative path for test
+     * @var String
+     */
+    private $generatedPath;
+
+    /**
+     * Returns relative path for the test.
      *
      * @param $relativePath
      * @return string
@@ -33,16 +38,26 @@ protected function getTestPath($relativePath)
     }
 
     /**
-     * Set up
+     * @inheritdoc
      */
     public function setUp()
     {
-        $this->driver = new \Magento\Framework\Filesystem\Driver\File();
+        $this->driver = new File();
         $this->absolutePath = dirname(__DIR__) . '/_files/';
+        $this->generatedPath = $this->getTestPath('generated');
+        $this->removeGeneratedDirectory();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->removeGeneratedDirectory();
     }
 
     /**
-     * test read recursively read
+     * Tests directory recursive read.
      */
     public function testReadDirectoryRecursively()
     {
@@ -60,7 +75,7 @@ public function testReadDirectoryRecursively()
     }
 
     /**
-     * test exception
+     * Tests directory reading exception.
      *
      * @expectedException \Magento\Framework\Exception\FileSystemException
      */
@@ -69,6 +84,11 @@ public function testReadDirectoryRecursivelyFailure()
         $this->driver->readDirectoryRecursively($this->getTestPath('not-existing-directory'));
     }
 
+    /**
+     * Tests of directory creating.
+     *
+     * @throws FileSystemException
+     */
     public function testCreateDirectory()
     {
         $generatedPath = $this->getTestPath('generated/roo/bar/baz/foo');
@@ -80,4 +100,39 @@ public function testCreateDirectory()
         $this->assertTrue($this->driver->createDirectory($generatedPath));
         $this->assertTrue(is_dir($generatedPath));
     }
+
+    /**
+     * Tests creation and removing of symlinks.
+     *
+     * @throws FileSystemException
+     * @return void
+     */
+    public function testSymlinks(): void
+    {
+        $sourceDirectory = $this->generatedPath . '/source';
+        $destinationDirectory = $this->generatedPath . '/destination';
+
+        $this->driver->createDirectory($sourceDirectory);
+        $this->driver->createDirectory($destinationDirectory);
+
+        $linkName = $destinationDirectory . '/link';
+
+        self::assertTrue($this->driver->isWritable($destinationDirectory));
+        self::assertTrue($this->driver->symlink($sourceDirectory, $linkName));
+        self::assertTrue($this->driver->isExists($linkName));
+        self::assertTrue($this->driver->deleteDirectory($linkName));
+    }
+
+    /**
+     * Remove generated directories.
+     *
+     * @throws FileSystemException
+     * @return void
+     */
+    private function removeGeneratedDirectory(): void
+    {
+        if (is_dir($this->generatedPath)) {
+            $this->driver->deleteDirectory($this->generatedPath);
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/TruncateFilterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/TruncateFilterTest.php
new file mode 100644
index 0000000000000..3736012848379
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/TruncateFilterTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter;
+
+class TruncateFilterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @param string $expectedValue
+     * @param string $expectedRemainder
+     * @param string $string
+     * @param int $length
+     * @param string $etc
+     * @param bool $breakWords
+     * @dataProvider truncateDataProvider
+     */
+    public function testFilter(
+        $expectedValue,
+        $expectedRemainder,
+        $string,
+        $length = 5,
+        $etc = '...',
+        $breakWords = true
+    ) {
+        /** @var TruncateFilter $truncateFilter */
+        $truncateFilter = \Magento\TestFramework\ObjectManager::getInstance()->create(
+            TruncateFilter::class,
+            [
+                'length' => $length,
+                'etc' => $etc,
+                'breakWords' => $breakWords,
+            ]
+        );
+        $result = $truncateFilter->filter($string);
+        $this->assertEquals($expectedValue, $result->getValue());
+        $this->assertEquals($expectedRemainder, $result->getRemainder());
+    }
+
+    public function truncateDataProvider() : array
+    {
+        return [
+            '1' => [
+                '12...',
+                '34567890',
+                '1234567890',
+            ],
+            '2' => [
+                '123..',
+                ' 456 789',
+                '123 456 789',
+                8,
+                '..',
+                false
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
new file mode 100644
index 0000000000000..7f8996daa6e97
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config;
+
+use Magento\Framework\App\Cache;
+use Magento\Framework\GraphQl\Config;
+use Magento\Framework\GraphQl\Schema\SchemaGenerator;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\GraphQl\Controller\GraphQl;
+
+/**
+ * Tests the entire process of generating a schema from a given SDL and processing a request/query
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppArea graphql
+ */
+class GraphQlReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var Config */
+    private $configModel;
+
+    /** @var  GraphQl */
+    private $graphQlController;
+
+    /** @var  ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var  SerializerInterface */
+    private $jsonSerializer;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var Cache $cache */
+        $cache = $this->objectManager->get(Cache::class);
+        $cache->clean();
+        $fileResolverMock = $this->getMockBuilder(
+            \Magento\Framework\Config\FileResolverInterface::class
+        )->disableOriginalConstructor()->getMock();
+        $fileList = [
+            file_get_contents(__DIR__ . '/../_files/schemaA.graphqls'),
+            file_get_contents(__DIR__ . '/../_files/schemaB.graphqls')
+        ];
+        $fileResolverMock->expects($this->any())->method('get')->will($this->returnValue($fileList));
+        $graphQlReader = $this->objectManager->create(
+            \Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
+            ['fileResolver' => $fileResolverMock]
+        );
+        $reader = $this->objectManager->create(
+            \Magento\Framework\GraphQlSchemaStitching\Reader::class,
+            ['readers' => ['graphql_reader' => $graphQlReader]]
+        );
+        $data = $this->objectManager->create(
+            \Magento\Framework\GraphQl\Config\Data ::class,
+            ['reader' => $reader]
+        );
+        $this->configModel = $this->objectManager->create(
+            \Magento\Framework\GraphQl\Config::class,
+            ['data' => $data]
+        );
+        $outputMapper = $this->objectManager->create(
+            \Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper::class,
+            ['config' => $this->configModel]
+        );
+        $schemaGenerator = $this->objectManager->create(
+            SchemaGenerator::class,
+            ['outputMapper' => $outputMapper]
+        );
+        $this->graphQlController = $this->objectManager->create(
+            GraphQl::class,
+            ['schemaGenerator' => $schemaGenerator]
+        );
+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDispatchIntrospectionWithCustomSDL()
+    {
+        $query
+            = <<<QUERY
+ query IntrospectionQuery {
+  __schema {
+    queryType { name }
+    types {
+      ...FullType
+    }
+  }
+}
+
+fragment FullType on __Type {
+  kind
+  name
+  description
+  fields(includeDeprecated: true) {
+    name
+    description
+    args {
+      ...InputValue
+    }
+    type {
+      ...TypeRef
+    }
+    isDeprecated
+    deprecationReason
+  }
+  inputFields {
+    ...InputValue
+  }
+  interfaces {
+    ...TypeRef
+  }
+  enumValues(includeDeprecated: true) {
+    name
+    description
+    isDeprecated
+  }
+  possibleTypes {
+    ...TypeRef
+  }
+}
+
+fragment InputValue on __InputValue {
+  name
+  description
+  type { ...TypeRef }
+  defaultValue
+}
+
+fragment TypeRef on __Type {
+  kind
+  name
+  ofType {
+    kind
+    name
+    ofType {
+      kind
+      name
+      ofType {
+        kind
+        name
+        ofType {
+          kind
+          name
+          ofType {
+            kind
+            name
+            ofType {
+              kind
+              name
+              ofType {
+                kind
+                name
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+
+QUERY;
+        $postData = [
+            'query'         => $query,
+            'variables'     => null,
+            'operationName' => 'IntrospectionQuery'
+        ];
+        /** @var Http $request */
+        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $request->setPathInfo('/graphql');
+        $request->setContent(json_encode($postData));
+        $headers = $this->objectManager->create(\Zend\Http\Headers::class)
+            ->addHeaders(['Content-Type' => 'application/json']);
+        $request->setHeaders($headers);
+        $response = $this->graphQlController->dispatch($request);
+        $output = $this->jsonSerializer->unserialize($response->getContent());
+        $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
+
+        $schemaResponseFields = $output['data']['__schema']['types'];
+        $schemaResponseFieldsFirstHalf = array_slice($schemaResponseFields, 0, 25);
+        $schemaResponseFieldsSecondHalf = array_slice($schemaResponseFields, -21, 21);
+        $mergedSchemaResponseFields = array_merge($schemaResponseFieldsFirstHalf, $schemaResponseFieldsSecondHalf);
+
+        foreach ($expectedOutput as $searchTerm) {
+            $sortFields = ['inputFields', 'fields'];
+            foreach ($sortFields as $sortField) {
+                isset($searchTerm[$sortField]) && is_array($searchTerm[$sortField])
+                    ? usort($searchTerm[$sortField], function ($a, $b) {
+                        $cmpField = 'name';
+                        return isset($a[$cmpField]) && isset($b[$cmpField])
+                            ? strcmp($a[$cmpField], $b[$cmpField]) : 0;
+                    }) : null;
+            }
+
+            $this->assertTrue(
+                (in_array($searchTerm, $mergedSchemaResponseFields)),
+                'Missing type in the response'
+            );
+        }
+        //Checks to make sure that the given description exists in the expectedOutput array
+        $this->assertTrue(
+            array_key_exists(
+                array_search(
+                    'Comment for empty PhysicalProductInterface',
+                    array_column($expectedOutput, 'description')
+                ),
+                $expectedOutput
+            )
+        );
+        $this->assertTrue(
+            array_key_exists(
+                array_search(
+                    'Comment for empty Enum',
+                    array_column($expectedOutput, 'description')
+                ),
+                $expectedOutput
+            )
+        );
+        $this->assertTrue(
+            array_key_exists(
+                array_search(
+                    'Comment for SearchResultPageInfo',
+                    array_column($expectedOutput, 'description')
+                ),
+                $expectedOutput
+            )
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
new file mode 100644
index 0000000000000..ef4612ea357ea
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl;
+
+use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\Cache;
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\GraphQl\Config\Config;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\GraphQl\Config\Data\Argument;
+use Magento\Framework\GraphQl\Config\Data\Enum;
+use Magento\Framework\GraphQl\Config\Data\Field;
+use Magento\Framework\GraphQl\Config\Data\StructureInterface;
+use Magento\Framework\GraphQl\Config\Data\Type;
+use Magento\Framework\GraphQl\Config\Element\EnumValue;
+use Magento\Framework\GraphQl\Config\Element\InterfaceType;
+use Magento\Framework\GraphQl\Config\Element\TypeFactory;
+use Magento\Framework\ObjectManagerInterface;
+
+class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
+{
+   /** @var \Magento\Framework\GraphQl\Config  */
+    private $model;
+
+    protected function setUp()
+    {
+        /** @var ObjectManagerInterface $objectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+       /** @var Cache $cache */
+        $cache = $objectManager->get(Cache::class);
+        $cache->clean();
+        $fileResolverMock = $this->getMockBuilder(
+            \Magento\Framework\Config\FileResolverInterface::class
+        )->disableOriginalConstructor()->getMock();
+        $fileList = [
+            file_get_contents(__DIR__ . '/_files/schemaC.graphqls'),
+            file_get_contents(__DIR__ . '/_files/schemaD.graphqls')
+        ];
+        $fileResolverMock->expects($this->any())->method('get')->will($this->returnValue($fileList));
+        $graphQlReader = $objectManager->create(
+            \Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
+            ['fileResolver' => $fileResolverMock]
+        );
+        $reader = $objectManager->create(
+            \Magento\Framework\GraphQlSchemaStitching\Reader::class,
+            ['readers' => ['graphql_reader' => $graphQlReader]]
+        );
+        $data = $objectManager->create(
+            \Magento\Framework\GraphQl\Config\Data ::class,
+            ['reader' => $reader]
+        );
+         $this->model = $objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
+    }
+
+    /**
+     * tests GraphQl type's structure object
+     */
+    public function testGraphQlTypeAndFieldConfigStructure()
+    {
+        $query = 'Query';
+        /** @var \Magento\Framework\GraphQl\Config\Element\Type $output */
+        $output = $this->model->getConfigElement($query);
+        $expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
+        $this->assertEquals($output->getName(), $query);
+        /** @var \Magento\Framework\GraphQl\Config\Element\Field $queryFields */
+        $queryFields = $output->getFields();
+        foreach (array_keys($queryFields) as $fieldKey) {
+            $fieldAssertionMap = [
+                ['response_field' => 'name', 'expected_value' => $queryFields[$fieldKey]->getName()],
+                ['response_field' => 'type', 'expected_value' => $queryFields[$fieldKey]->getTypeName()],
+                ['response_field' => 'required', 'expected_value' => $queryFields[$fieldKey]->isRequired()],
+                ['response_field' => 'isList', 'expected_value' => $queryFields[$fieldKey]->isList()],
+                ['response_field' => 'resolver', 'expected_value' => $queryFields[$fieldKey]->getResolver()],
+                ['response_field' => 'description', 'expected_value' => $queryFields[$fieldKey]->getDescription()]
+            ];
+            $this->assertResponseFields($expectedOutputArray['Query']['fields'][$fieldKey], $fieldAssertionMap);
+            /** @var \Magento\Framework\GraphQl\Config\Element\Argument $queryFieldArguments */
+            $queryFieldArguments = $queryFields[$fieldKey]->getArguments();
+            foreach (array_keys($queryFieldArguments) as $argumentKey) {
+                $argumentAssertionMap = [
+                   ['response_field' => 'name', 'expected_value' => $queryFieldArguments[$argumentKey]->getName()],
+                   ['response_field' => 'type', 'expected_value' => $queryFieldArguments[$argumentKey]->getTypeName()],
+                   ['response_field' => 'description', 'expected_value' => $queryFieldArguments[$argumentKey]
+                       ->getDescription()],
+                   ['response_field' => 'required', 'expected_value' => $queryFieldArguments[$argumentKey]
+                       ->isRequired()],
+                   ['response_field' => 'isList', 'expected_value' => $queryFieldArguments[$argumentKey]->isList()],
+                   ['response_field' => 'itemsRequired', 'expected_value' => $queryFieldArguments[$argumentKey]
+                       ->areItemsRequired()]
+                ];
+                $this->assertResponseFields(
+                    $expectedOutputArray['Query']['fields'][$fieldKey]['arguments'][$argumentKey],
+                    $argumentAssertionMap
+                );
+                $this->assertEquals(
+                    $expectedOutputArray['Query']['fields'][$fieldKey]['arguments'][$argumentKey]['defaultValue'],
+                    $queryFieldArguments[$argumentKey]->getDefaultValue()
+                );
+            }
+        }
+    }
+
+    /**
+     * Tests Structured data object for configured GraphQL enum type.
+     */
+    public function testGraphQlEnumTypeConfigStructure()
+    {
+        $queryEnum = 'PriceAdjustmentDescriptionEnum';
+        /** @var \Magento\Framework\GraphQl\Config\Element\Enum $outputEnum */
+        $outputEnum = $this->model->getConfigElement($queryEnum);
+        /** @var EnumValue $outputEnumValues */
+        $outputEnumValues = $outputEnum->getValues();
+        $expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
+        $this->assertEquals($outputEnum->getName(), $queryEnum);
+        $this->assertEquals($outputEnum->getDescription(), 'Description for enumType PriceAdjustmentDescriptionEnum');
+
+        foreach (array_keys($outputEnumValues) as $outputEnumValue) {
+            $this->assertEquals(
+                $expectedOutputArray['PriceAdjustmentDescriptionEnum']['values'][$outputEnumValue]['name'],
+                $outputEnumValues[$outputEnumValue]->getName()
+            );
+            $this->assertEquals(
+                $expectedOutputArray['PriceAdjustmentDescriptionEnum']['values'][$outputEnumValue]['value'],
+                $outputEnumValues[$outputEnumValue]->getValue()
+            );
+            $this->assertEquals(
+                $expectedOutputArray['PriceAdjustmentDescriptionEnum']['values'][$outputEnumValue]['description'],
+                $outputEnumValues[$outputEnumValue]->getDescription()
+            );
+        }
+    }
+
+    /**
+     * Tests Structured data object for configured GraphQL type that implements an interface.
+     */
+    public function testGraphQlTypeThatImplementsInterface()
+    {
+        $typeThatImplements = 'ProductLinks';
+        /** @var \Magento\Framework\GraphQl\Config\Element\Type $outputInterface */
+        $outputInterface = $this->model->getConfigElement($typeThatImplements);
+        $expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
+        $this->assertEquals($outputInterface->getName(), $typeThatImplements);
+        $outputInterfaceValues = $outputInterface->getInterfaces();
+        /** @var \Magento\Framework\GraphQl\Config\Element\Field $outputInterfaceFields */
+        $outputInterfaceFields =$outputInterface->getFields();
+        foreach (array_keys($outputInterfaceValues) as $outputInterfaceValue) {
+            $this->assertEquals(
+                $expectedOutputArray['ProductLinks']['interfaces'][$outputInterfaceValue]['interface'],
+                $outputInterfaceValues[$outputInterfaceValue]['interface']
+            );
+            $this->assertEquals(
+                $expectedOutputArray['ProductLinks']['interfaces'][$outputInterfaceValue]['copyFields'],
+                $outputInterfaceValues[$outputInterfaceValue]['copyFields']
+            );
+        }
+        foreach (array_keys($outputInterfaceFields) as $outputInterfaceField) {
+            $this->assertEquals(
+                $expectedOutputArray['ProductLinks']['fields'][$outputInterfaceField]['name'],
+                $outputInterfaceFields[$outputInterfaceField]->getName()
+            );
+            $this->assertEquals(
+                $expectedOutputArray['ProductLinks']['fields'][$outputInterfaceField]['type'],
+                $outputInterfaceFields[$outputInterfaceField]->getTypeName()
+            );
+            $this->assertEquals(
+                $expectedOutputArray['ProductLinks']['fields'][$outputInterfaceField]['required'],
+                $outputInterfaceFields[$outputInterfaceField]->isRequired()
+            );
+            $this->assertEquals(
+                $expectedOutputArray['ProductLinks']['fields'][$outputInterfaceField]['description'],
+                $outputInterfaceFields[$outputInterfaceField]->getDescription()
+            );
+            $this->assertEmpty($outputInterfaceFields[$outputInterfaceField]->getArguments());
+        }
+    }
+
+    public function testGraphQlInterfaceConfigElement()
+    {
+        $interfaceType ='ProductLinksInterface';
+        /** @var InterfaceType $outputConfigElement */
+        $outputConfigElement = $this->model->getConfigElement($interfaceType);
+        $expectedOutput = require __DIR__ . '/_files/query_array_output.php';
+        $this->assertEquals($outputConfigElement->getName(), $expectedOutput['ProductLinksInterface']['name']);
+        $this->assertEquals(
+            $outputConfigElement->getTypeResolver(),
+            $expectedOutput['ProductLinksInterface']['typeResolver']
+        );
+        $this->assertEquals(
+            $outputConfigElement->getDescription(),
+            $expectedOutput['ProductLinksInterface']['description']
+        );
+    }
+
+    /**
+     * @param array $actualResponse
+     * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]
+     *                         OR [['response_field' => $field, 'expected_value' => $value], ...]
+     */
+    private function assertResponseFields($actualResponse, $assertionMap)
+    {
+        foreach ($assertionMap as $key => $assertionData) {
+            $expectedValue = isset($assertionData['expected_value'])
+                ? $assertionData['expected_value']
+                : $assertionData;
+            $responseField = isset($assertionData['response_field']) ? $assertionData['response_field'] : $key;
+            $this->assertNotNull(
+                $expectedValue,
+                "Value of '{$responseField}' field must not be NULL"
+            );
+            $this->assertEquals(
+                $expectedValue,
+                $actualResponse[$responseField],
+                "Value of '{$responseField}' field in response does not match expected value: "
+                . var_export($expectedValue, true)
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown()
+    {
+        /** @var ObjectManagerInterface $objectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var Cache $cache */
+        $cache = $objectManager->get(Cache::class);
+        $cache->clean();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php
new file mode 100644
index 0000000000000..9ebd0160240a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/query_array_output.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'Query' =>
+        [
+            'name' => 'Query',
+            'fields' =>
+                [
+                    'customAttributeMetadata' =>
+                        [
+                            'name' => 'customAttributeMetadata',
+                            'type' => 'CustomAttributeMetadata',
+                            'arguments' =>
+                                [
+                                    'attributes' =>
+                                        [
+                                            'name' => 'attributes',
+                                            'type' => 'AttributeInput',
+                                            'description' => '',
+                                            'required' => true,
+                                            'isList' => true,
+                                            'itemsRequired' => true,
+                                            'defaultValue' => null
+                                        ],
+
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => 'Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata',
+                                'description' => 'Returns the attribute type, given an attribute code and entity type'
+                        ],
+                        'products' => [
+                        'name' => 'products',
+                        'type' => 'Products',
+                        'arguments' =>
+                            [
+                                'search' =>
+                                    [
+                                        'name' => 'search',
+                                        'type' => 'String',
+                                        'description' => '',
+                                        'required' => false,
+                                        'isList' => false,
+                                        'itemsRequired' => false,
+                                        'defaultValue' => null
+                                    ],
+
+                                    'filter' =>
+                                    [
+                                        'name' => 'filter',
+                                        'type' => 'ProductFilterInput',
+                                        'description' => '',
+                                        'required' => false,
+                                        'isList' => false,
+                                        'itemsRequired' => false,
+                                        'defaultValue' => null
+                                    ],
+
+                                    'pageSize' =>
+                                    [
+                                        'name' => 'pageSize',
+                                        'type' => 'Int',
+                                        'description' => 'number of records to display',
+                                        'required' => false,
+                                        'isList' => false,
+                                        'itemsRequired' => false,
+                                        'defaultValue' => 10
+                                    ],
+
+                                    'currentPage' =>
+                                    [
+                                        'name' => 'currentPage',
+                                        'type' => 'Int',
+                                        'description' => '',
+                                        'required' => false,
+                                        'isList' => false,
+                                        'itemsRequired' => false,
+                                        'defaultValue' => 1
+                                    ],
+                                    'sort' =>
+                                    [
+                                        'name' => 'sort',
+                                        'type' => 'ProductSortInput',
+                                        'description' => '',
+                                        'required' => false,
+                                        'isList' => false,
+                                        'itemsRequired' => false,
+                                        'defaultValue' => null
+                                    ]
+                            ],
+                            'required' => false,
+                            'isList' => false,
+                            'resolver' => 'Magento\\CatalogGraphQl\\Model\\Resolver\\Products',
+                            'description' => 'comment for products fields'
+                        ]
+                ]
+        ],
+        'PriceAdjustmentDescriptionEnum' =>
+        [
+            'name' => 'PriceAdjustmentDescriptionEnum',
+            'values' =>
+                [
+                    'INCLUDED' =>
+                        [
+                            'name' => 'included',
+                            'value' => 'INCLUDED',
+                            'description' => 'price is included'
+                        ],
+                        'EXCLUDED' =>
+                        [
+                            'name' => 'excluded',
+                            'value' => 'EXCLUDED',
+                            'description' => 'price is excluded'
+                        ]
+                ],
+                'description' => 'Description for enumType PriceAdjustmentDescriptionEnum'
+        ],
+        'ProductLinks' =>
+        [
+            'name' => 'ProductLinks',
+            'fields' =>
+                [
+                    'sku' =>
+                        [
+                            'name' => 'sku',
+                            'type' => 'String',
+
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => 'The identifier of the linked product',
+
+                        ],
+                        'link_type' =>
+                        [
+                            'name' => 'link_type',
+                            'type' => 'String',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => '',
+
+                        ],
+                        'linked_product_sku' =>
+                        [
+                            'name' => 'linked_product_sku',
+                            'type' => 'String',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => 'The SKU of the linked product',
+
+                        ],
+                        'linked_product_type' =>
+                        [
+                            'name' => 'linked_product_type',
+                            'type' => 'String',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => '',
+
+                        ],
+                        'position' =>
+                        [
+                            'name' => 'position',
+                            'type' => 'Int',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => 'The position within the list of product links',
+
+                        ]
+                ],
+                'interfaces' =>
+                [
+                    'ProductLinksInterface' =>
+                        [
+                            'interface' => 'ProductLinksInterface',
+                            'copyFields' => true,
+                        ],
+                ],
+                'description' => 'ProductLinks is an implementation of ProductLinksInterface.'
+        ],
+        'ProductLinksInterface' =>
+        [
+            'name' => 'ProductLinksInterface',
+            'fields' =>
+                [
+                    'sku' =>
+                        [
+                            'name' => 'sku',
+                            'type' => 'String',
+
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => 'The identifier of the linked product',
+
+                        ],
+                        'link_type' =>
+                        [
+                            'name' => 'link_type',
+                            'type' => 'String',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => '',
+
+                        ],
+                        'linked_product_sku' =>
+                        [
+                            'name' => 'linked_product_sku',
+                            'type' => 'String',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => 'The SKU of the linked product',
+
+                        ],
+                        'linked_product_type' =>
+                        [
+                            'name' => 'linked_product_type',
+                            'type' => 'String',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => '',
+
+                        ],
+                        'position' =>
+                        [
+                            'name' => 'position',
+                            'type' => 'Int',
+                            'arguments' =>
+                                [
+                                ],
+                                'required' => false,
+                                'isList' => false,
+                                'resolver' => '',
+                                'description' => 'The position within the list of product links',
+
+                        ]
+                ],
+                'typeResolver' => 'Magento\\CatalogGraphQl\\Model\\ProductLinkTypeResolverComposite',
+                'description' => 'description for ProductLinksInterface'
+        ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls
new file mode 100644
index 0000000000000..6c832e5f122a6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaA.graphqls
@@ -0,0 +1,49 @@
+type Query {
+    placeholder: String @doc(description: "comment for placeholder.")
+}
+
+type Mutation {
+    placeholder: String @doc(description: "comment for placeholder.")
+}
+
+input FilterTypeInput @doc(description:"Comment for FilterTypeInput") {
+    eq: String @doc(description:"Equal")
+    finset: [String]
+    from: String
+    gt: String
+    gteq: String
+    in: [String]
+    like: String
+    lt: String
+    lteq: String
+    moreq: String
+    neq: String
+    notnull: String
+    null: String
+    to: String
+    nin: [String]
+}
+
+type SearchResultPageInfo
+@doc(description:"Comment for SearchResultPageInfo")
+{
+    page_size: Int @doc(description:"Comment for page_size")
+    current_page: Int @doc(description:"Comment for current_page")
+}
+
+enum SortEnum @doc(description: "Comment for SortEnum.")
+{
+    ASC @doc(description:"Ascending Order")
+    DESC @doc(description:"Descending Order")
+}
+
+interface ProductInterface {
+    url_key: String @doc(description: "comment for url_key inside ProductInterface type.")
+    url_path: String
+}
+
+
+type SimpleProduct {
+    url_key: String @doc(description: "comment for url_key for simple product that implements [ProductInterface]")
+    url_path: String
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaB.graphqls b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaB.graphqls
new file mode 100644
index 0000000000000..08241135a8608
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaB.graphqls
@@ -0,0 +1,342 @@
+type Query {
+    products(
+    search: String,
+    filter: ProductFilterInput,
+    pageSize: Int,
+    currentPage: Int,
+    sort: ProductSortInput
+    ): Products
+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products")
+    @doc(description: "comment for products fields")
+}
+
+enum CurrencyEnum {
+    AFN
+    GBP
+    EUR
+    INR
+    USD
+}
+
+type Price {
+    amount: Money
+    adjustments: [PriceAdjustment]
+}
+
+type PriceAdjustment {
+    amount: Money
+    code: PriceAdjustmentCodesEnum
+    description: PriceAdjustmentDescriptionEnum
+}
+
+enum PriceAdjustmentCodesEnum {
+    TAX
+}
+
+enum PriceAdjustmentDescriptionEnum {
+    INCLUDED
+    EXCLUDED
+}
+
+enum PriceTypeEnum {
+    FIXED
+    PERCENT
+    DYNAMIC
+}
+
+type Money {
+    value: Float
+    currency: CurrencyEnum
+}
+
+type ProductPrices {
+    minimalPrice: Price
+    maximalPrice: Price
+    regularPrice: Price
+}
+
+type ProductCategoryLinks {
+    position: Int
+    category_id: String
+}
+
+
+type ProductLinks implements ProductLinksInterface {
+    sku: String
+    link_type: String
+    linked_product_sku: String
+    linked_product_type: String
+    position: Int
+}
+
+interface ProductLinksInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductLinkTypeResolverComposite") {
+    sku: String
+    link_type: String
+    linked_product_sku: String
+    linked_product_type: String
+    position: Int
+}
+
+type ProductTierPrices {
+    customer_group_id: String
+    qty: Float
+    value: Float
+    percentage_value: Float
+    website_id: Float
+}
+
+interface ProductInterface
+@typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite")
+@doc(description: "comment for ProductInterface")
+ {
+    id: Int @doc(description: "comment for [ProductInterface].")
+    name: String
+    sku: String
+    special_price: Float
+    special_from_date: String
+    attribute_set_id: Int
+    tier_price: Float
+    category_ids: [Int]
+    updated_at: String
+    country_of_manufacture: String
+    type_id: String
+    website_ids: [Int]
+    category_links: [ProductCategoryLinks]
+    product_links: [ProductLinksInterface]
+    media_gallery_entries: [MediaGalleryEntry]
+    tier_prices: [ProductTierPrices]
+    price: ProductPrices
+    manufacturer: Int
+}
+
+interface PhysicalProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description:"Comment for empty PhysicalProductInterface") {
+
+}
+
+
+type CustomizableAreaOption implements CustomizableOptionInterface {
+    value: CustomizableAreaValue
+    product_sku: String
+    title: String @doc(description:"Comment for title field for CustomizableAreaOption concrete type")
+    required: Boolean
+    sort_order: Int
+}
+
+type CustomizableAreaValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    max_characters: Int
+}
+
+type CustomizableDateOption implements CustomizableOptionInterface {
+    value: CustomizableDateValue
+    product_sku: String
+    title: String @doc(description:"This description should override interface comment.")
+    required: Boolean
+    sort_order: Int
+}
+
+type CustomizableDateValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+}
+
+type CustomizableDropDownOption implements CustomizableOptionInterface {
+    value: [CustomizableDropDownValue]
+    required: Boolean @doc(description:"Comment for required field for CustomizableDropDownOption concrete type")
+}
+
+type CustomizableDropDownValue {
+    option_type_id: Int
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    title: String
+    sort_order: Int
+}
+
+type CustomizableFieldOption implements CustomizableOptionInterface {
+    value: CustomizableFieldValue
+    product_sku: String
+    sort_order: Int @doc(description:"Comment for sort_order for CustomizableFieldOption concrete type")
+}
+
+type CustomizableFieldValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    max_characters: Int
+}
+
+type CustomizableFileOption implements CustomizableOptionInterface {
+    value: CustomizableFileValue
+    product_sku: String
+}
+
+type CustomizableFileValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    file_extension: String
+    image_size_x: Int
+    image_size_y: Int
+}
+
+interface CustomizableOptionInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CustomizableOptionTypeResolver") {
+    title: String @doc(description:"Comment for CustomizableOptionInterface")
+    required: Boolean
+    sort_order: Int
+}
+
+interface CustomizableProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") {
+    options: [CustomizableOptionInterface]
+}
+
+type CustomizableRadioOption implements CustomizableOptionInterface {
+    value: [CustomizableRadioValue]
+}
+
+type CustomizableRadioValue {
+    option_type_id: Int
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    title: String
+    sort_order: Int
+}
+
+type VirtualProduct implements ProductInterface, CustomizableProductInterface {
+}
+
+type SimpleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface
+@doc(description: "Comment for empty SimpleProduct type")
+{
+}
+
+type Products @doc(description:"Comment for Products") {
+    items: [ProductInterface] @doc(description: "comment for items[Products].")
+    page_info: SearchResultPageInfo @doc(description: "comment for page_info.")
+    total_count: Int
+}
+
+input ProductFilterInput @doc(description:"Comment for ProductFilterInput") {
+    name: FilterTypeInput
+    sku: FilterTypeInput @doc(description:"Comment for field_sku which is of type FilterTypeInput")
+    description: FilterTypeInput
+    short_description: FilterTypeInput
+    price: FilterTypeInput
+    special_price: FilterTypeInput
+    special_from_date: FilterTypeInput
+    special_to_date: FilterTypeInput
+    weight: FilterTypeInput
+    manufacturer: FilterTypeInput
+    meta_title: FilterTypeInput
+    meta_keyword: FilterTypeInput
+    meta_description: FilterTypeInput
+    image: FilterTypeInput
+    small_image: FilterTypeInput
+    thumbnail: FilterTypeInput
+    tier_price: FilterTypeInput
+    news_from_date: FilterTypeInput
+    news_to_date: FilterTypeInput
+    custom_design: FilterTypeInput
+    custom_design_from: FilterTypeInput
+    custom_design_to: FilterTypeInput
+    custom_layout_update: FilterTypeInput
+    page_layout: FilterTypeInput
+    category_ids: FilterTypeInput
+    options_container: FilterTypeInput
+    required_options: FilterTypeInput
+    has_options: FilterTypeInput
+    image_label: FilterTypeInput
+    small_image_label: FilterTypeInput
+    thumbnail_label: FilterTypeInput
+    created_at: FilterTypeInput
+    updated_at: FilterTypeInput
+    country_of_manufacture: FilterTypeInput
+    custom_layout: FilterTypeInput
+    gift_message_available: FilterTypeInput
+    or: ProductFilterInput
+}
+
+type ProductMediaGalleryEntriesContent @doc(description: "Comment for ProductMediaGalleryEntriesContent.") {
+    base64_encoded_data: String
+    type: String
+    name: String
+}
+
+type ProductMediaGalleryEntriesVideoContent {
+    media_type: String
+    video_provider: String
+    video_url: String
+    video_title: String
+    video_description: String
+    video_metadata: String
+}
+
+input ProductSortInput @doc(description:"Input ProductSortInput") {
+    name: SortEnum @doc(description:"Name")
+    sku: SortEnum
+    description: SortEnum
+    short_description: SortEnum
+    price: SortEnum
+    special_price: SortEnum
+    special_from_date: SortEnum
+    special_to_date: SortEnum
+    weight: SortEnum
+    manufacturer: SortEnum
+    meta_title: SortEnum
+    meta_keyword: SortEnum
+    meta_description: SortEnum
+    image: SortEnum
+    small_image: SortEnum
+    thumbnail: SortEnum
+    tier_price: SortEnum
+    news_from_date: SortEnum
+    news_to_date: SortEnum
+    custom_design: SortEnum
+    custom_design_from: SortEnum
+    custom_design_to: SortEnum
+    custom_layout_update: SortEnum
+    page_layout: SortEnum
+    category_ids: SortEnum
+    options_container: SortEnum
+    required_options: SortEnum
+    has_options: SortEnum
+    image_label: SortEnum
+    small_image_label: SortEnum
+    thumbnail_label: SortEnum
+    created_at: SortEnum
+    updated_at: SortEnum
+    country_of_manufacture: SortEnum
+    custom_layout: SortEnum
+    gift_message_available: SortEnum
+}
+
+type MediaGalleryEntry
+@doc(description: "Comment for MediaGalleryEntry type")
+{
+    id: Int @doc(description: "id for MediaGalleryEntry")
+    media_type: String
+    label: String
+    position: Int
+    disabled: Boolean
+    types: [String]
+    file: String
+    content: ProductMediaGalleryEntriesContent @doc(description: "Comment for ProductMediaGalleryEntriesContent on content field")
+    video_content: ProductMediaGalleryEntriesVideoContent
+}
+
+type EntityUrl {
+    id: Int
+    canonical_url: String
+    type: UrlRewriteEntityTypeEnum
+}
+enum UrlRewriteEntityTypeEnum @doc(description: "Comment for empty Enum")
+{
+
+}
+
+
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls
new file mode 100644
index 0000000000000..84609293f31a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaC.graphqls
@@ -0,0 +1,60 @@
+type Query {
+    customAttributeMetadata(attributes: [AttributeInput!]!): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata")
+    @doc(description: "Returns the attribute type, given an attribute code and entity type")
+}
+
+type CustomAttributeMetadata {
+    items: [Attribute] @doc(description: "An array of attributes")
+}
+
+input AttributeInput @doc(description: "AttributeInput specifies the attribute_code and entity_type to search") {
+    attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
+    entity_type: String @doc(description: "The type of entity that defines the attribute")
+}
+
+type Attribute @doc(description: "Attribute contains the attribute_type of the specified attribute_code and entity_type") {
+    attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
+    entity_type: String @doc(description: "The type of entity that defines the attribute")
+    attribute_type: String @doc(description: "The data type of the attribute")
+}
+input FilterTypeInput @doc(description:"Comment for FilterTypeInput") {
+    eq: String @doc(description:"Equal")
+    finset: [String]
+    from: String
+    gt: String
+    gteq: String
+    in: [String]
+    like: String
+    lt: String
+    lteq: String
+    moreq: String
+    neq: String
+    notnull: String
+    null: String
+    to: String
+    nin: [String]
+}
+
+type SearchResultPageInfo
+@doc(description:"Comment for SearchResultPageInfo")
+{
+    page_size: Int @doc(description:"Comment for page_size")
+    current_page: Int @doc(description:"Comment for current_page")
+}
+
+enum SortEnum @doc(description: "Comment for SortEnum.")
+{
+    ASC @doc(description:"Ascending Order")
+    DESC @doc(description:"Descending Order")
+}
+
+interface ProductInterface {
+    url_key: String @doc(description: "comment for url_key inside ProductInterface type.")
+    url_path: String
+}
+
+
+type SimpleProduct {
+    url_key: String @doc(description: "comment for url_key for simple product that implements [ProductInterface]")
+    url_path: String
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaD.graphqls b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaD.graphqls
new file mode 100644
index 0000000000000..00700499ed92b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schemaD.graphqls
@@ -0,0 +1,338 @@
+type Query {
+    products(
+    search: String,
+    filter: ProductFilterInput,
+    pageSize: Int =10 @doc(description: "number of records to display") ,
+    currentPage: Int = 1,
+    sort: ProductSortInput
+    ): Products
+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products")
+    @doc(description: "comment for products fields")
+}
+
+enum CurrencyEnum {
+    AFN
+    GBP
+    EUR
+    INR
+    USD
+}
+
+type Price {
+    amount: Money
+    adjustments: [PriceAdjustment]
+}
+
+type PriceAdjustment {
+    amount: Money
+    code: PriceAdjustmentCodesEnum
+    description: PriceAdjustmentDescriptionEnum
+}
+
+enum PriceAdjustmentCodesEnum {
+    TAX
+}
+
+enum PriceAdjustmentDescriptionEnum @doc(description: "Description for enumType PriceAdjustmentDescriptionEnum") {
+    INCLUDED @doc(description: "price is included")
+    EXCLUDED @doc(description: "price is excluded")
+}
+
+enum PriceTypeEnum {
+    FIXED
+    PERCENT
+    DYNAMIC
+}
+
+type Money {
+    value: Float
+    currency: CurrencyEnum
+}
+
+type ProductPrices {
+    minimalPrice: Price
+    maximalPrice: Price
+    regularPrice: Price
+}
+
+type ProductCategoryLinks {
+    position: Int
+    category_id: String
+}
+
+
+type ProductLinks implements ProductLinksInterface @doc(description: "ProductLinks is an implementation of ProductLinksInterface.") {
+
+}
+
+interface ProductLinksInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductLinkTypeResolverComposite") @doc(description: "description for ProductLinksInterface") {
+    sku: String @doc(description:"The identifier of the linked product")
+    link_type: String
+    linked_product_sku: String @doc(description:"The SKU of the linked product")
+    linked_product_type: String
+    position: Int @doc(description:"The position within the list of product links")
+}
+
+type ProductTierPrices {
+    customer_group_id: String
+    qty: Float
+    value: Float
+    percentage_value: Float
+    website_id: Float
+}
+
+interface ProductInterface
+@typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite")
+@doc(description: "comment for ProductInterface")
+ {
+    id: Int @doc(description: "comment for [ProductInterface].")
+    name: String
+    sku: String
+    special_price: Float
+    special_from_date: String
+    attribute_set_id: Int
+    tier_price: Float
+    category_ids: [Int]
+    updated_at: String
+    country_of_manufacture: String
+    type_id: String
+    website_ids: [Int]
+    category_links: [ProductCategoryLinks]
+    product_links: [ProductLinksInterface]
+    media_gallery_entries: [MediaGalleryEntry]
+    tier_prices: [ProductTierPrices]
+    price: ProductPrices
+    manufacturer: Int
+}
+
+interface PhysicalProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description:"Comment for empty PhysicalProductInterface") {
+
+}
+
+
+type CustomizableAreaOption implements CustomizableOptionInterface {
+    value: CustomizableAreaValue
+    product_sku: String
+    title: String @doc(description:"Comment for title field for CustomizableAreaOption concrete type")
+    required: Boolean
+    sort_order: Int
+}
+
+type CustomizableAreaValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    max_characters: Int
+}
+
+type CustomizableDateOption implements CustomizableOptionInterface {
+    value: CustomizableDateValue
+    product_sku: String
+    title: String @doc(description:"This description should override interface comment.")
+    required: Boolean
+    sort_order: Int
+}
+
+type CustomizableDateValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+}
+
+type CustomizableDropDownOption implements CustomizableOptionInterface {
+    value: [CustomizableDropDownValue]
+    required: Boolean @doc(description:"Comment for required field for CustomizableDropDownOption concrete type")
+}
+
+type CustomizableDropDownValue {
+    option_type_id: Int
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    title: String
+    sort_order: Int
+}
+
+type CustomizableFieldOption implements CustomizableOptionInterface {
+    value: CustomizableFieldValue
+    product_sku: String
+    sort_order: Int @doc(description:"Comment for sort_order for CustomizableFieldOption concrete type")
+}
+
+type CustomizableFieldValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    max_characters: Int
+}
+
+type CustomizableFileOption implements CustomizableOptionInterface {
+    value: CustomizableFileValue
+    product_sku: String
+}
+
+type CustomizableFileValue {
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    file_extension: String
+    image_size_x: Int
+    image_size_y: Int
+}
+
+interface CustomizableOptionInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CustomizableOptionTypeResolver") {
+    title: String @doc(description:"Comment for CustomizableOptionInterface")
+    required: Boolean
+    sort_order: Int
+}
+
+interface CustomizableProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") {
+    options: [CustomizableOptionInterface]
+}
+
+type CustomizableRadioOption implements CustomizableOptionInterface {
+    value: [CustomizableRadioValue]
+}
+
+type CustomizableRadioValue {
+    option_type_id: Int
+    price: Float
+    price_type: PriceTypeEnum
+    sku: String
+    title: String
+    sort_order: Int
+}
+
+type VirtualProduct implements ProductInterface, CustomizableProductInterface {
+}
+
+type SimpleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface
+@doc(description: "Comment for empty SimpleProduct type")
+{
+}
+
+type Products @doc(description:"Comment for Products") {
+    items: [ProductInterface] @doc(description: "comment for items[Products].")
+    page_info: SearchResultPageInfo @doc(description: "comment for page_info.")
+    total_count: Int
+}
+
+input ProductFilterInput @doc(description:"Comment for ProductFilterInput") {
+    name: FilterTypeInput
+    sku: FilterTypeInput @doc(description:"Comment for field_sku which is of type FilterTypeInput")
+    description: FilterTypeInput
+    short_description: FilterTypeInput
+    price: FilterTypeInput
+    special_price: FilterTypeInput
+    special_from_date: FilterTypeInput
+    special_to_date: FilterTypeInput
+    weight: FilterTypeInput
+    manufacturer: FilterTypeInput
+    meta_title: FilterTypeInput
+    meta_keyword: FilterTypeInput
+    meta_description: FilterTypeInput
+    image: FilterTypeInput
+    small_image: FilterTypeInput
+    thumbnail: FilterTypeInput
+    tier_price: FilterTypeInput
+    news_from_date: FilterTypeInput
+    news_to_date: FilterTypeInput
+    custom_design: FilterTypeInput
+    custom_design_from: FilterTypeInput
+    custom_design_to: FilterTypeInput
+    custom_layout_update: FilterTypeInput
+    page_layout: FilterTypeInput
+    category_ids: FilterTypeInput
+    options_container: FilterTypeInput
+    required_options: FilterTypeInput
+    has_options: FilterTypeInput
+    image_label: FilterTypeInput
+    small_image_label: FilterTypeInput
+    thumbnail_label: FilterTypeInput
+    created_at: FilterTypeInput
+    updated_at: FilterTypeInput
+    country_of_manufacture: FilterTypeInput
+    custom_layout: FilterTypeInput
+    gift_message_available: FilterTypeInput
+    or: ProductFilterInput
+}
+
+type ProductMediaGalleryEntriesContent @doc(description: "Comment for ProductMediaGalleryEntriesContent.") {
+    base64_encoded_data: String
+    type: String
+    name: String
+}
+
+type ProductMediaGalleryEntriesVideoContent {
+    media_type: String
+    video_provider: String
+    video_url: String
+    video_title: String
+    video_description: String
+    video_metadata: String
+}
+
+input ProductSortInput @doc(description:"Input ProductSortInput") {
+    name: SortEnum @doc(description:"Name")
+    sku: SortEnum
+    description: SortEnum
+    short_description: SortEnum
+    price: SortEnum
+    special_price: SortEnum
+    special_from_date: SortEnum
+    special_to_date: SortEnum
+    weight: SortEnum
+    manufacturer: SortEnum
+    meta_title: SortEnum
+    meta_keyword: SortEnum
+    meta_description: SortEnum
+    image: SortEnum
+    small_image: SortEnum
+    thumbnail: SortEnum
+    tier_price: SortEnum
+    news_from_date: SortEnum
+    news_to_date: SortEnum
+    custom_design: SortEnum
+    custom_design_from: SortEnum
+    custom_design_to: SortEnum
+    custom_layout_update: SortEnum
+    page_layout: SortEnum
+    category_ids: SortEnum
+    options_container: SortEnum
+    required_options: SortEnum
+    has_options: SortEnum
+    image_label: SortEnum
+    small_image_label: SortEnum
+    thumbnail_label: SortEnum
+    created_at: SortEnum
+    updated_at: SortEnum
+    country_of_manufacture: SortEnum
+    custom_layout: SortEnum
+    gift_message_available: SortEnum
+}
+
+type MediaGalleryEntry
+@doc(description: "Comment for MediaGalleryEntry type")
+{
+    id: Int @doc(description: "id for MediaGalleryEntry")
+    media_type: String
+    label: String
+    position: Int
+    disabled: Boolean
+    types: [String]
+    file: String
+    content: ProductMediaGalleryEntriesContent @doc(description: "Comment for ProductMediaGalleryEntriesContent on content field")
+    video_content: ProductMediaGalleryEntriesVideoContent
+}
+
+type EntityUrl {
+    id: Int
+    canonical_url: String
+    type: UrlRewriteEntityTypeEnum
+}
+enum UrlRewriteEntityTypeEnum @doc(description: "Comment for empty Enum")
+{
+
+}
+
+
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php
new file mode 100644
index 0000000000000..0a73b8ed445d5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_response_sdl_description.php
@@ -0,0 +1,4292 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Query',
+        'description' =>  null,
+        'fields' =>  [
+            [
+                'name' =>  'placeholder',
+                'description' =>  'comment for placeholder.',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'products',
+                'description' =>  'comment for products fields',
+                'args' =>  [
+                    [
+                        'name' =>  'search',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'SCALAR',
+                            'name' =>  'String',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'filter',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'INPUT_OBJECT',
+                            'name' =>  'ProductFilterInput',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'pageSize',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'SCALAR',
+                            'name' =>  'Int',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'currentPage',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'SCALAR',
+                            'name' =>  'Int',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'sort',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'INPUT_OBJECT',
+                            'name' =>  'ProductSortInput',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ]
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Products',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'String',
+        'description' => 'The `String` scalar type represents textual data, represented as UTF-8' . "\n" .
+            'character sequences. The String type is most often used by GraphQL to'. "\n" .
+            'represent free-form human-readable text.',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INPUT_OBJECT',
+        'name' =>  'ProductFilterInput',
+        'description' =>  'Comment for ProductFilterInput',
+        'fields'  =>   null,
+        'inputFields' =>  [
+            [
+                'name' =>  'name',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  'Comment for field_sku which is of type FilterTypeInput',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'short_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'weight',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'manufacturer',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_title',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_keyword',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'tier_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_from',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_to',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout_update',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'page_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'category_ids',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'options_container',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'required_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'has_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'created_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'updated_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'country_of_manufacture',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gift_message_available',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'or',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'ProductFilterInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ]
+        ],
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INPUT_OBJECT',
+        'name' =>  'FilterTypeInput',
+        'description' =>  'Comment for FilterTypeInput',
+        'fields' =>  null,
+        'inputFields' =>  [
+            [
+                'name' =>  'eq',
+                'description' =>  'Equal',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'finset',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'from',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gt',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gteq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'in',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'like',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'lt',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'lteq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'moreq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'neq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'notnull',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'null',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'to',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'nin',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'defaultValue' =>  null
+            ]
+        ],
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'Int',
+        'description' =>  'The `Int` scalar type represents non-fractional signed whole numeric' . "\n" .
+            'values. Int can represent values between -(2^31) and 2^31 - 1. ',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INPUT_OBJECT',
+        'name' =>  'ProductSortInput',
+        'description' =>  'Input ProductSortInput',
+        'fields' =>  null,
+        'inputFields' =>  [
+            [
+                'name' =>  'name',
+                'description' =>  'Name',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'short_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'weight',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'manufacturer',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_title',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_keyword',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'tier_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_from',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_to',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout_update',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'page_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'category_ids',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'options_container',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'required_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'has_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'created_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'updated_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'country_of_manufacture',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gift_message_available',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ]
+        ],
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'SortEnum',
+        'description' =>  'Comment for SortEnum.',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'ASC',
+                'description' =>  'Ascending Order',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'DESC',
+                'description' =>  'Descending Order',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Products',
+        'description' =>  'Comment for Products',
+        'fields' =>  [
+            [
+                'name' =>  'items',
+                'description' =>  'comment for items[Products].',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'INTERFACE',
+                        'name' =>  'ProductInterface',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'page_info',
+                'description' =>  'comment for page_info.',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'SearchResultPageInfo',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'total_count',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'INTERFACE',
+        'name'=> 'ProductInterface',
+        'description'=> 'comment for ProductInterface',
+        'fields'=> [
+            [
+                'name'=> 'url_key',
+                'description'=> 'comment for url_key inside ProductInterface type.',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_path',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'id',
+                'description'=> 'comment for [ProductInterface].',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'name',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_from_date',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'attribute_set_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'updated_at',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'country_of_manufacture',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'website_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductCategoryLinks',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'ProductLinksInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'media_gallery_entries',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'MediaGalleryEntry',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_prices',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductTierPrices',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'ProductPrices',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'manufacturer',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> null,
+        'enumValues'=> null,
+        'possibleTypes'=> [
+            [
+                'kind'=> 'OBJECT',
+                'name'=> 'SimpleProduct',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'OBJECT',
+                'name'=> 'VirtualProduct',
+                'ofType'=> null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'Float',
+        'description' =>  'The `Float` scalar type represents signed double-precision fractional' . "\n" .
+            'values as specified by' . "\n" .
+            '[IEEE 754](http://en.wikipedia.org/wiki/IEEE_floating_point). ',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductCategoryLinks',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'category_id',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'ProductLinksInterface',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'link_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'ProductLinks',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'MediaGalleryEntry',
+        'description' =>  'Comment for MediaGalleryEntry type',
+        'fields' =>  [
+            [
+                'name' =>  'id',
+                'description' =>  'id for MediaGalleryEntry',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'media_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'label',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'disabled',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Boolean',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'types',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'file',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'content',
+                'description' =>  'Comment for ProductMediaGalleryEntriesContent on content field',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'ProductMediaGalleryEntriesContent',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_content',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'ProductMediaGalleryEntriesVideoContent',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'Boolean',
+        'description' =>  'The `Boolean` scalar type represents `true` or `false`.',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductMediaGalleryEntriesContent',
+        'description' =>  'Comment for ProductMediaGalleryEntriesContent.',
+        'fields' =>  [
+            [
+                'name' =>  'base64_encoded_data',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'name',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductMediaGalleryEntriesVideoContent',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'media_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_provider',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_url',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_title',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_description',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_metadata',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductTierPrices',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'customer_group_id',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'qty',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'value',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'percentage_value',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'website_id',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductPrices',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'minimalPrice',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Price',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'maximalPrice',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Price',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'regularPrice',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Price',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Price',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'amount',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Money',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'adjustments',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'OBJECT',
+                        'name' =>  'PriceAdjustment',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Money',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'value',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'currency',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'CurrencyEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'CurrencyEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'AFN',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'GBP',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'EUR',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'INR',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'USD',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'PriceAdjustment',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'amount',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Money',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'code',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceAdjustmentCodesEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'description',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceAdjustmentDescriptionEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'PriceAdjustmentCodesEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'TAX',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'PriceAdjustmentDescriptionEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'INCLUDED',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'EXCLUDED',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'SearchResultPageInfo',
+        'description' =>  'Comment for SearchResultPageInfo',
+        'fields' =>  [
+            [
+                'name' =>  'page_size',
+                'description' =>  'Comment for page_size',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'current_page',
+                'description' =>  'Comment for current_page',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'SimpleProduct',
+        'description'=> 'Comment for empty SimpleProduct type',
+        'fields'=> [
+            [
+                'name'=> 'options',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'CustomizableOptionInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_key',
+                'description'=> 'comment for url_key for simple product that implements [ProductInterface]',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_path',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'id',
+                'description'=> 'comment for [ProductInterface].',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'name',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_from_date',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'attribute_set_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'updated_at',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'country_of_manufacture',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'website_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductCategoryLinks',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'ProductLinksInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'media_gallery_entries',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'MediaGalleryEntry',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_prices',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductTierPrices',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'ProductPrices',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'manufacturer',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'ProductInterface',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'PhysicalProductInterface',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableProductInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'PhysicalProductInterface',
+        'description' =>  'Comment for empty PhysicalProductInterface',
+        'fields' =>  [
+
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'SimpleProduct',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'CustomizableProductInterface',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'options',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'INTERFACE',
+                        'name' =>  'CustomizableOptionInterface',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'SimpleProduct',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'VirtualProduct',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'CustomizableOptionInterface',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'title',
+                'description' =>  'Comment for CustomizableOptionInterface',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'required',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Boolean',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'sort_order',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableAreaOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableDateOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableDropDownOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableFieldOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableFileOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableRadioOption',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductLinks',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'link_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+            [
+                'kind' =>  'INTERFACE',
+                'name' =>  'ProductLinksInterface',
+                'ofType' =>  null
+            ]
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableAreaOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for title field for CustomizableAreaOption concrete type',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableAreaValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'CustomizableAreaValue',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'price',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'price_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceTypeEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'max_characters',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'PriceTypeEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'FIXED',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'PERCENT',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'DYNAMIC',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableDateOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'This description should override interface comment.',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableDateValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'CustomizableDateValue',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'price',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'price_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceTypeEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableDropDownOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> 'Comment for required field for CustomizableDropDownOption concrete type',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'CustomizableDropDownValue',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableDropDownValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'option_type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'title',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFieldOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> 'Comment for sort_order for CustomizableFieldOption concrete type',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableFieldValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFieldValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'max_characters',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFileOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableFileValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFileValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'file_extension',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'image_size_x',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'image_size_y',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableRadioOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'CustomizableRadioValue',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableRadioValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'option_type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'title',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'VirtualProduct',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'options',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'CustomizableOptionInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_key',
+                'description'=> 'comment for url_key inside ProductInterface type.',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_path',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'id',
+                'description'=> 'comment for [ProductInterface].',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'name',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_from_date',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'attribute_set_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'updated_at',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'country_of_manufacture',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'website_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductCategoryLinks',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'ProductLinksInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'media_gallery_entries',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'MediaGalleryEntry',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_prices',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductTierPrices',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'ProductPrices',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'manufacturer',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'ProductInterface',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableProductInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' => 'OBJECT',
+        'name' => 'EntityUrl',
+        'description' => '',
+        'fields' => [
+            [
+                'name' => 'id',
+                'description' => null,
+                'args' => [
+
+                ],
+                'type' => [
+                    'kind' => 'SCALAR',
+                    'name' => 'Int',
+                    'ofType' => null
+                ],
+                'isDeprecated' => false,
+                'deprecationReason' => null
+            ],
+            [
+                'name' => 'canonical_url',
+                'description' => null,
+                'args' => [
+
+                ],
+                'type' => [
+                    'kind' => 'SCALAR',
+                    'name' => 'String',
+                    'ofType' => null
+                ],
+                'isDeprecated' => false,
+                'deprecationReason' => null
+            ],
+            [
+                'name' => 'type',
+                'description' => null,
+                'args' => [
+
+                ],
+                'type' => [
+                    'kind' => 'ENUM',
+                    'name' => 'UrlRewriteEntityTypeEnum',
+                    'ofType' => null
+                ],
+                'isDeprecated' => false,
+                'deprecationReason' => null
+            ]
+        ],
+        'inputFields' => null,
+        'interfaces' => [
+
+        ],
+        'enumValues' => null,
+        'possibleTypes' => null
+    ],
+    [
+        'kind' => 'ENUM',
+        'name' => 'UrlRewriteEntityTypeEnum',
+        'description' => 'Comment for empty Enum',
+        'fields' => null,
+        'inputFields' => null,
+        'interfaces' => null,
+        'enumValues' => [
+
+        ],
+        'possibleTypes' => null
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php
new file mode 100644
index 0000000000000..2aeb8f3d14430
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/_files/schema_with_description_sdl.php
@@ -0,0 +1,4292 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Query',
+        'description' =>  null,
+        'fields' =>  [
+            [
+                'name' =>  'placeholder',
+                'description' =>  'comment for placeholder.',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'products',
+                'description' =>  'comment for products fields',
+                'args' =>  [
+                    [
+                        'name' =>  'search',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'SCALAR',
+                            'name' =>  'String',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'filter',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'INPUT_OBJECT',
+                            'name' =>  'ProductFilterInput',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'pageSize',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'SCALAR',
+                            'name' =>  'Int',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'currentPage',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'SCALAR',
+                            'name' =>  'Int',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ],
+                    [
+                        'name' =>  'sort',
+                        'description' =>  '',
+                        'type' =>  [
+                            'kind' =>  'INPUT_OBJECT',
+                            'name' =>  'ProductSortInput',
+                            'ofType' =>  null
+                        ],
+                        'defaultValue' =>  null
+                    ]
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Products',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'String',
+        'description' => 'The `String` scalar type represents textual data, represented as UTF-8' . "\n" .
+            'character sequences. The String type is most often used by GraphQL to'. "\n" .
+            'represent free-form human-readable text.',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INPUT_OBJECT',
+        'name' =>  'ProductFilterInput',
+        'description' =>  'Comment for ProductFilterInput',
+        'fields'  =>   null,
+        'inputFields' =>  [
+            [
+                'name' =>  'name',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  'Comment for field_sku which is of type FilterTypeInput',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'short_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'weight',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'manufacturer',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_title',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_keyword',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'tier_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_from',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_to',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout_update',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'page_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'category_ids',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'options_container',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'required_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'has_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'created_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'updated_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'country_of_manufacture',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gift_message_available',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'FilterTypeInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'or',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'INPUT_OBJECT',
+                    'name' =>  'ProductFilterInput',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ]
+        ],
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INPUT_OBJECT',
+        'name' =>  'FilterTypeInput',
+        'description' =>  'Comment for FilterTypeInput',
+        'fields' =>  null,
+        'inputFields' =>  [
+            [
+                'name' =>  'eq',
+                'description' =>  'Equal',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'finset',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'from',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gt',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gteq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'in',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'like',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'lt',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'lteq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'moreq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'neq',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'notnull',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'null',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'to',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'nin',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'defaultValue' =>  null
+            ]
+        ],
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'Int',
+        'description' =>  'The `Int` scalar type represents non-fractional signed whole numeric' . "\n" .
+            'values. Int can represent values between -(2^31) and 2^31 - 1. ',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INPUT_OBJECT',
+        'name' =>  'ProductSortInput',
+        'description' =>  'Input ProductSortInput',
+        'fields' =>  null,
+        'inputFields' =>  [
+            [
+                'name' =>  'name',
+                'description' =>  'Name',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'short_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'special_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'weight',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'manufacturer',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_title',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_keyword',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'meta_description',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'tier_price',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_from_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'news_to_date',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_from',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_design_to',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout_update',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'page_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'category_ids',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'options_container',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'required_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'has_options',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'small_image_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'thumbnail_label',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'created_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'updated_at',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'country_of_manufacture',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'custom_layout',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ],
+            [
+                'name' =>  'gift_message_available',
+                'description' =>  '',
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'SortEnum',
+                    'ofType' =>  null
+                ],
+                'defaultValue' =>  null
+            ]
+        ],
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'SortEnum',
+        'description' =>  'Comment for SortEnum.',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'ASC',
+                'description' =>  'Ascending Order',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'DESC',
+                'description' =>  'Descending Order',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Products',
+        'description' =>  'Comment for Products',
+        'fields' =>  [
+            [
+                'name' =>  'items',
+                'description' =>  'comment for items[Products].',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'INTERFACE',
+                        'name' =>  'ProductInterface',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'page_info',
+                'description' =>  'comment for page_info.',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'SearchResultPageInfo',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'total_count',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'INTERFACE',
+        'name'=> 'ProductInterface',
+        'description'=> 'comment for ProductInterface',
+        'fields'=> [
+            [
+                'name'=> 'url_key',
+                'description'=> 'comment for url_key inside ProductInterface type.',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_path',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'id',
+                'description'=> 'comment for [ProductInterface].',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'name',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_from_date',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'attribute_set_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'updated_at',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'country_of_manufacture',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'website_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductCategoryLinks',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'ProductLinksInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'media_gallery_entries',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'MediaGalleryEntry',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_prices',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductTierPrices',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'ProductPrices',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'manufacturer',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> null,
+        'enumValues'=> null,
+        'possibleTypes'=> [
+            [
+                'kind'=> 'OBJECT',
+                'name'=> 'SimpleProduct',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'OBJECT',
+                'name'=> 'VirtualProduct',
+                'ofType'=> null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'Float',
+        'description' =>  'The `Float` scalar type represents signed double-precision fractional' . "\n" .
+           'values as specified by' . "\n" .
+            '[IEEE 754](http://en.wikipedia.org/wiki/IEEE_floating_point). ',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductCategoryLinks',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'category_id',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'ProductLinksInterface',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'link_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'ProductLinks',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'MediaGalleryEntry',
+        'description' =>  'Comment for MediaGalleryEntry type',
+        'fields' =>  [
+            [
+                'name' =>  'id',
+                'description' =>  'id for MediaGalleryEntry',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'media_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'label',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'disabled',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Boolean',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'types',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'SCALAR',
+                        'name' =>  'String',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'file',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'content',
+                'description' =>  'Comment for ProductMediaGalleryEntriesContent on content field',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'ProductMediaGalleryEntriesContent',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_content',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'ProductMediaGalleryEntriesVideoContent',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'SCALAR',
+        'name' =>  'Boolean',
+        'description' =>  'The `Boolean` scalar type represents `true` or `false`.',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductMediaGalleryEntriesContent',
+        'description' =>  'Comment for ProductMediaGalleryEntriesContent.',
+        'fields' =>  [
+            [
+                'name' =>  'base64_encoded_data',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'name',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductMediaGalleryEntriesVideoContent',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'media_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_provider',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_url',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_title',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_description',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'video_metadata',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductTierPrices',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'customer_group_id',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'qty',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'value',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'percentage_value',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'website_id',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductPrices',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'minimalPrice',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Price',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'maximalPrice',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Price',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'regularPrice',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Price',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Price',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'amount',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Money',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'adjustments',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'OBJECT',
+                        'name' =>  'PriceAdjustment',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'Money',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'value',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'currency',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'CurrencyEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'CurrencyEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'AFN',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'GBP',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'EUR',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'INR',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'USD',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'PriceAdjustment',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'amount',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'OBJECT',
+                    'name' =>  'Money',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'code',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceAdjustmentCodesEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'description',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceAdjustmentDescriptionEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'PriceAdjustmentCodesEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'TAX',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'PriceAdjustmentDescriptionEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'INCLUDED',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'EXCLUDED',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'SearchResultPageInfo',
+        'description' =>  'Comment for SearchResultPageInfo',
+        'fields' =>  [
+            [
+                'name' =>  'page_size',
+                'description' =>  'Comment for page_size',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'current_page',
+                'description' =>  'Comment for current_page',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'SimpleProduct',
+        'description'=> 'Comment for empty SimpleProduct type',
+        'fields'=> [
+            [
+                'name'=> 'options',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'CustomizableOptionInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_key',
+                'description'=> 'comment for url_key for simple product that implements [ProductInterface]',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_path',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'id',
+                'description'=> 'comment for [ProductInterface].',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'name',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_from_date',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'attribute_set_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'updated_at',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'country_of_manufacture',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'website_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductCategoryLinks',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'ProductLinksInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'media_gallery_entries',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'MediaGalleryEntry',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_prices',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductTierPrices',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'ProductPrices',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'manufacturer',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'ProductInterface',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'PhysicalProductInterface',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableProductInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'PhysicalProductInterface',
+        'description' =>  'Comment for empty PhysicalProductInterface',
+        'fields' =>  [
+
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'SimpleProduct',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'CustomizableProductInterface',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'options',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'LIST',
+                    'name' =>  null,
+                    'ofType' =>  [
+                        'kind' =>  'INTERFACE',
+                        'name' =>  'CustomizableOptionInterface',
+                        'ofType' =>  null
+                    ]
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'SimpleProduct',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'VirtualProduct',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'INTERFACE',
+        'name' =>  'CustomizableOptionInterface',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'title',
+                'description' =>  'Comment for CustomizableOptionInterface',
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'required',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Boolean',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'sort_order',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  null,
+        'possibleTypes' =>  [
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableAreaOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableDateOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableDropDownOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableFieldOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableFileOption',
+                'ofType' =>  null
+            ],
+            [
+                'kind' =>  'OBJECT',
+                'name' =>  'CustomizableRadioOption',
+                'ofType' =>  null
+            ]
+        ]
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'ProductLinks',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'link_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'linked_product_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'position',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+            [
+                'kind' =>  'INTERFACE',
+                'name' =>  'ProductLinksInterface',
+                'ofType' =>  null
+            ]
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableAreaOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for title field for CustomizableAreaOption concrete type',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableAreaValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'CustomizableAreaValue',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'price',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'price_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceTypeEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'max_characters',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Int',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind' =>  'ENUM',
+        'name' =>  'PriceTypeEnum',
+        'description' =>  '',
+        'fields' =>  null,
+        'inputFields' =>  null,
+        'interfaces' =>  null,
+        'enumValues' =>  [
+            [
+                'name' =>  'FIXED',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'PERCENT',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ],
+            [
+                'name' =>  'DYNAMIC',
+                'description' =>  '',
+                'isDeprecated' =>  false
+            ]
+        ],
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableDateOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'This description should override interface comment.',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableDateValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' =>  'OBJECT',
+        'name' =>  'CustomizableDateValue',
+        'description' =>  '',
+        'fields' =>  [
+            [
+                'name' =>  'price',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'Float',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'price_type',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'ENUM',
+                    'name' =>  'PriceTypeEnum',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ],
+            [
+                'name' =>  'sku',
+                'description' =>  null,
+                'args' =>  [
+
+                ],
+                'type' =>  [
+                    'kind' =>  'SCALAR',
+                    'name' =>  'String',
+                    'ofType' =>  null
+                ],
+                'isDeprecated' =>  false,
+                'deprecationReason' =>  null
+            ]
+        ],
+        'inputFields' =>  null,
+        'interfaces' =>  [
+
+        ],
+        'enumValues' =>  null,
+        'possibleTypes' =>  null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableDropDownOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> 'Comment for required field for CustomizableDropDownOption concrete type',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'CustomizableDropDownValue',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableDropDownValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'option_type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'title',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFieldOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> 'Comment for sort_order for CustomizableFieldOption concrete type',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableFieldValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFieldValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'max_characters',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFileOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'CustomizableFileValue',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableFileValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'file_extension',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'image_size_x',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'image_size_y',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableRadioOption',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'title',
+                'description'=> 'Comment for CustomizableOptionInterface',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'required',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Boolean',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'value',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'CustomizableRadioValue',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableOptionInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'CustomizableRadioValue',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'option_type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price_type',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'ENUM',
+                    'name'=> 'PriceTypeEnum',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'title',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sort_order',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind'=> 'OBJECT',
+        'name'=> 'VirtualProduct',
+        'description'=> '',
+        'fields'=> [
+            [
+                'name'=> 'options',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'CustomizableOptionInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_key',
+                'description'=> 'comment for url_key inside ProductInterface type.',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'url_path',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'id',
+                'description'=> 'comment for [ProductInterface].',
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'name',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'sku',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'special_from_date',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'attribute_set_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Float',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'updated_at',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'country_of_manufacture',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'type_id',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'String',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'website_ids',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'SCALAR',
+                        'name'=> 'Int',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'category_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductCategoryLinks',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'product_links',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'INTERFACE',
+                        'name'=> 'ProductLinksInterface',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'media_gallery_entries',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'MediaGalleryEntry',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'tier_prices',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'LIST',
+                    'name'=> null,
+                    'ofType'=> [
+                        'kind'=> 'OBJECT',
+                        'name'=> 'ProductTierPrices',
+                        'ofType'=> null
+                    ]
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'price',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'OBJECT',
+                    'name'=> 'ProductPrices',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ],
+            [
+                'name'=> 'manufacturer',
+                'description'=> null,
+                'args'=> [
+
+                ],
+                'type'=> [
+                    'kind'=> 'SCALAR',
+                    'name'=> 'Int',
+                    'ofType'=> null
+                ],
+                'isDeprecated'=> false,
+                'deprecationReason'=> null
+            ]
+        ],
+        'inputFields'=> null,
+        'interfaces'=> [
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'ProductInterface',
+                'ofType'=> null
+            ],
+            [
+                'kind'=> 'INTERFACE',
+                'name'=> 'CustomizableProductInterface',
+                'ofType'=> null
+            ]
+        ],
+        'enumValues'=> null,
+        'possibleTypes'=> null
+    ],
+    [
+        'kind' => 'OBJECT',
+        'name' => 'EntityUrl',
+        'description' => '',
+        'fields' => [
+            [
+                'name' => 'id',
+                'description' => null,
+                'args' => [
+
+                ],
+                'type' => [
+                    'kind' => 'SCALAR',
+                    'name' => 'Int',
+                    'ofType' => null
+                ],
+                'isDeprecated' => false,
+                'deprecationReason' => null
+            ],
+            [
+                'name' => 'canonical_url',
+                'description' => null,
+                'args' => [
+
+                ],
+                'type' => [
+                    'kind' => 'SCALAR',
+                    'name' => 'String',
+                    'ofType' => null
+                ],
+                'isDeprecated' => false,
+                'deprecationReason' => null
+            ],
+            [
+                'name' => 'type',
+                'description' => null,
+                'args' => [
+
+                ],
+                'type' => [
+                    'kind' => 'ENUM',
+                    'name' => 'UrlRewriteEntityTypeEnum',
+                    'ofType' => null
+                ],
+                'isDeprecated' => false,
+                'deprecationReason' => null
+            ]
+        ],
+        'inputFields' => null,
+        'interfaces' => [
+
+        ],
+        'enumValues' => null,
+        'possibleTypes' => null
+    ],
+    [
+        'kind' => 'ENUM',
+        'name' => 'UrlRewriteEntityTypeEnum',
+        'description' => 'Comment for empty Enum',
+        'fields' => null,
+        'inputFields' => null,
+        'interfaces' => null,
+        'enumValues' => [
+
+        ],
+        'possibleTypes' => null
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
index 420803d9530bd..bc8281d55ac4f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
@@ -337,6 +337,97 @@ public function rotateDataProvider()
         );
     }
 
+    /**
+     * Test if alpha transparency is correctly handled
+     *
+     * @param string $image
+     * @param string $watermark
+     * @param int $alphaPercentage
+     * @param array $comparePoint1
+     * @param array $comparePoint2
+     * @param string $adapterType
+     *
+     * @dataProvider imageWatermarkWithAlphaTransparencyDataProvider
+     * @depends testOpen
+     * @depends testImageSize
+     */
+    public function testWatermarkWithAlphaTransparency(
+        $image,
+        $watermark,
+        $alphaPercentage,
+        $comparePoint1,
+        $comparePoint2,
+        $adapterType
+    ) {
+        $imageAdapter = $this->_getAdapter($adapterType);
+        $imageAdapter->open($image);
+
+        $watermarkAdapter = $this->_getAdapter($adapterType);
+        $watermarkAdapter->open($watermark);
+
+        list($comparePoint1X, $comparePoint1Y) = $comparePoint1;
+        list($comparePoint2X, $comparePoint2Y) = $comparePoint2;
+
+        $imageAdapter
+            ->setWatermarkImageOpacity($alphaPercentage)
+            ->setWatermarkPosition(\Magento\Framework\Image\Adapter\AbstractAdapter::POSITION_TOP_LEFT)
+            ->watermark($watermark);
+
+        $comparePoint1Color = $imageAdapter->getColorAt($comparePoint1X, $comparePoint1Y);
+        unset($comparePoint1Color['alpha']);
+
+        $comparePoint2Color = $imageAdapter->getColorAt($comparePoint2X, $comparePoint2Y);
+        unset($comparePoint2Color['alpha']);
+
+        $result = $this->_compareColors($comparePoint1Color, $comparePoint2Color);
+        $message = sprintf(
+            '%s should be different to %s due to alpha transparency',
+            join(',', $comparePoint1Color),
+            join(',', $comparePoint2Color)
+        );
+        $this->assertFalse($result, $message);
+    }
+
+    public function imageWatermarkWithAlphaTransparencyDataProvider()
+    {
+        return $this->_prepareData(
+            [
+                // Watermark with alpha channel, 25%
+                [
+                    $this->_getFixture('watermark_alpha_base_image.jpg'),
+                    $this->_getFixture('watermark_alpha.png'),
+                    25,
+                    [ 23, 3 ],
+                    [ 23, 30 ]
+                ],
+                // Watermark with alpha channel, 50%
+                [
+                    $this->_getFixture('watermark_alpha_base_image.jpg'),
+                    $this->_getFixture('watermark_alpha.png'),
+                    50,
+                    [ 23, 3 ],
+                    [ 23, 30 ]
+                ],
+                // Watermark with no alpha channel, 50%
+                [
+                    $this->_getFixture('watermark_alpha_base_image.jpg'),
+                    $this->_getFixture('watermark.png'),
+                    50,
+                    [ 3, 3 ],
+                    [ 23,3 ]
+                ],
+                // Watermark with no alpha channel, 100%
+                [
+                    $this->_getFixture('watermark_alpha_base_image.jpg'),
+                    $this->_getFixture('watermark.png'),
+                    100,
+                    [ 3, 3 ],
+                    [ 3, 60 ]
+                ],
+            ]
+        );
+    }
+
     /**
      * Checks if watermark exists on the right position
      *
@@ -350,10 +441,10 @@ public function rotateDataProvider()
      * @param int $colorY
      * @param string $adapterType
      *
-     * @dataProvider imageWatermarkDataProvider
+     * @dataProvider imageWatermarkPositionDataProvider
      * @depends testOpen
      */
-    public function testWatermark(
+    public function testWatermarkPosition(
         $image,
         $watermark,
         $width,
@@ -387,7 +478,7 @@ public function testWatermark(
         $this->assertFalse($result, $message);
     }
 
-    public function imageWatermarkDataProvider()
+    public function imageWatermarkPositionDataProvider()
     {
         return $this->_prepareData(
             [
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark_alpha.png b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark_alpha.png
new file mode 100644
index 0000000000000..af05a14a99fdd
Binary files /dev/null and b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark_alpha.png differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark_alpha_base_image.jpg b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark_alpha_base_image.jpg
new file mode 100644
index 0000000000000..361ff523d2130
Binary files /dev/null and b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/watermark_alpha_base_image.jpg differ
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
index a85e5e7c89482..281a038a5a9a9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
@@ -7,25 +7,35 @@
 
 /**
  * Class GeneralTest
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractPlugin extends \PHPUnit\Framework\TestCase
 {
     /**
+     * Config reader
+     *
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $_configReader;
 
     /**
+     * Object Manager
+     *
      * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $_objectManager;
 
     /**
+     * Applicartion Object Manager
+     *
      * @var \Magento\Framework\ObjectManagerInterface
      */
     private $applicationObjectManager;
 
+    /**
+     * Set up
+     */
     public function setUp()
     {
         if (!$this->_objectManager) {
@@ -36,11 +46,19 @@ public function setUp()
         \Magento\Framework\App\ObjectManager::setInstance($this->_objectManager);
     }
 
+    /**
+     * Tear down
+     */
     public function tearDown()
     {
         \Magento\Framework\App\ObjectManager::setInstance($this->applicationObjectManager);
     }
 
+    /**
+     * Set up Interception Config
+     *
+     * @param array $pluginConfig
+     */
     public function setUpInterceptionConfig($pluginConfig)
     {
         $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
@@ -59,7 +77,8 @@ public function setUpInterceptionConfig($pluginConfig)
         $areaList->expects($this->any())->method('getCodes')->will($this->returnValue([]));
         $configScope = new \Magento\Framework\Config\Scope($areaList, 'global');
         $cache = $this->createMock(\Magento\Framework\Config\CacheInterface::class);
-        $cache->expects($this->any())->method('load')->will($this->returnValue(false));
+        $cacheManager = $this->createMock(\Magento\Framework\Interception\Config\CacheManager::class);
+        $cacheManager->method('load')->willReturn(null);
         $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
         $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
         $interceptionConfig = new Config\Config(
@@ -68,7 +87,10 @@ public function setUpInterceptionConfig($pluginConfig)
             $cache,
             $relations,
             $config,
-            $definitions
+            $definitions,
+            'interception',
+            null,
+            $cacheManager
         );
         $interceptionDefinitions = new Definition\Runtime();
         $json = new \Magento\Framework\Serialize\Serializer\Json();
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Config/CacheManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Config/CacheManagerTest.php
new file mode 100644
index 0000000000000..75737f0147274
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Config/CacheManagerTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Interception\Config;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+class CacheManagerTest extends \PHPUnit\Framework\TestCase
+{
+    const CACHE_ID = 'interceptiontest';
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Framework\Cache\FrontendInterface
+     */
+    private $cache;
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager\ConfigWriterInterface
+     */
+    private $configWriter;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->serializer = $this->objectManager->get(\Magento\Framework\Serialize\SerializerInterface::class);
+        $this->cache = $this->objectManager->get(\Magento\Framework\App\CacheInterface::class);
+        $this->configWriter =
+            $this->objectManager->get(\Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem::class);
+
+        $this->initializeMetadataDirectory();
+    }
+
+    /**
+     * Delete compiled file if it was created and clear cache data
+     */
+    protected function tearDown()
+    {
+        $compiledPath = \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::getFilePath(self::CACHE_ID);
+        if (file_exists($compiledPath)) {
+            unlink($compiledPath);
+        }
+
+        $this->cache->remove(self::CACHE_ID);
+    }
+
+    /**
+     * Test load interception cache from generated/metadata
+     * @dataProvider interceptionCompiledConfigDataProvider
+     * @param array $testConfig
+     */
+    public function testInstantiateFromCompiled(array $testConfig)
+    {
+        $this->configWriter->write(self::CACHE_ID, $testConfig);
+        $config = $this->getConfig();
+
+        $this->assertEquals($testConfig, $config->load(self::CACHE_ID));
+    }
+
+    /**
+     * Test load interception cache from backend cache
+     * @dataProvider interceptionCacheConfigDataProvider
+     * @param array $testConfig
+     */
+    public function testInstantiateFromCache(array $testConfig)
+    {
+        $this->cache->save($this->serializer->serialize($testConfig), self::CACHE_ID);
+        $config = $this->getConfig();
+
+        $this->assertEquals($testConfig, $config->load(self::CACHE_ID));
+    }
+
+    public function interceptionCompiledConfigDataProvider()
+    {
+        return [
+            [['classA' => true, 'classB' => false]],
+            [['classA' => false, 'classB' => true]],
+        ];
+    }
+
+    public function interceptionCacheConfigDataProvider()
+    {
+        return [
+            [['classC' => true, 'classD' => false]],
+            [['classC' => false, 'classD' => true]],
+        ];
+    }
+
+    /**
+     * Ensure generated/metadata exists
+     */
+    private function initializeMetadataDirectory()
+    {
+        $diPath = DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_METADATA][DirectoryList::PATH];
+        $fullPath = BP . DIRECTORY_SEPARATOR . $diPath;
+        if (!file_exists($fullPath)) {
+            mkdir($fullPath);
+        }
+    }
+
+    /**
+     * Create instance of Config class with specific cacheId. This is done to prevent our test
+     * from altering the interception config that may have been generated during application
+     * installation. Inject a new instance of the compileLoaded to bypass it's caching.
+     *
+     * @return \Magento\Framework\Interception\Config\CacheManager
+     */
+    private function getConfig()
+    {
+        return $this->objectManager->create(
+            \Magento\Framework\Interception\Config\CacheManager::class,
+            [
+                'cacheId' => self::CACHE_ID,
+                'compiledLoader' => $this->objectManager->create(
+                    \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::class
+                ),
+            ]
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php
new file mode 100644
index 0000000000000..f2a77db40bade
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+/**
+ * \Magento\Framework\Lock\Backend\Database test case
+ */
+class DatabaseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Lock\Backend\Database
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\Database::class);
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
new file mode 100644
index 0000000000000..ac86ddde5404b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Test of communication configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testGetConsumers()
+    {
+        $consumers = $this->getConfigData()->getConsumers();
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['consumers'], $consumers);
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testGetPublishers()
+    {
+        $publishers = $this->getConfigData()->getPublishers();
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['publishers'], $publishers);
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testGetBinds()
+    {
+        $binds = $this->getConfigData()->getBinds();
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['binds'], $binds);
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testGetMaps()
+    {
+        $topicName = 'topic.broker.test';
+        $queue = $this->getConfigData()->getQueuesByTopic($topicName);
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals(
+            $expectedParsedConfig['exchange_topic_to_queues_map']['magento--topic.broker.test'],
+            $queue
+        );
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testGetTopic()
+    {
+        $topicName = 'topic.broker.test';
+        $topic = $this->getConfigData()->getTopic($topicName);
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['topics'][$topicName], $topic);
+    }
+
+    /**
+     * Return mocked config data
+     *
+     * @return \Magento\Framework\MessageQueue\ConfigInterface
+     */
+    private function getConfigData()
+    {
+        return $this->getConfigInstance(
+            [
+                __DIR__ . '/_files/valid_new_queue.xml'
+            ]
+        );
+    }
+
+    /**
+     * Create config instance initialized with configuration from $configFilePath
+     *
+     * @param string|string[] $configFilePath
+     * @param string|null $envConfigFilePath
+     * @return \Magento\Framework\MessageQueue\ConfigInterface
+     */
+    protected function getConfigInstance($configFilePath, $envConfigFilePath = null)
+    {
+        $content = [];
+        if (is_array($configFilePath)) {
+            foreach ($configFilePath as $file) {
+                $content[] = file_get_contents($file);
+            }
+        } else {
+            $content[] = file_get_contents($configFilePath);
+        }
+        $fileResolver = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolver->expects($this->any())
+            ->method('get')
+            ->willReturn($content);
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $topicConverter = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig::class,
+            [
+                'communicationConfig' => $this->getCommunicationConfigInstance()
+            ]
+        );
+
+        $converter = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter::class,
+            [
+                'converters' => [
+                    ['converter' => $topicConverter, 'sortOrder' => 10]
+                ]
+            ]
+        );
+        $xmlReader = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml::class,
+            [
+                'fileResolver' => $fileResolver,
+                'converter' => $converter,
+            ]
+        );
+        $deploymentConfigReader = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig\Reader::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $envConfigData = include $envConfigFilePath ?: __DIR__ . '/_files/valid_queue_input.php';
+        $deploymentConfigReader->expects($this->any())->method('load')->willReturn($envConfigData);
+        $deploymentConfig = $objectManager->create(
+            \Magento\Framework\App\DeploymentConfig::class,
+            ['reader' => $deploymentConfigReader]
+        );
+        $envReader = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Env::class,
+            [
+                'deploymentConfig' => $deploymentConfig
+            ]
+        );
+        $methodsMap = $objectManager->create(\Magento\Framework\Reflection\MethodsMap::class);
+        $envValidator = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Env\Validator::class,
+            [
+                'methodsMap' => $methodsMap
+            ]
+        );
+
+        $compositeReader = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\CompositeReader::class,
+            [
+                'readers' => [
+                    ['reader' => $xmlReader, 'sortOrder' => 10],
+                    ['reader' => $envReader, 'sortOrder' => 20]
+                ],
+            ]
+        );
+
+        /** @var \Magento\Framework\MessageQueue\Config $configData */
+        $configData = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Data::class,
+            [
+                'reader' => $compositeReader,
+                'envValidator' => $envValidator
+            ]
+        );
+        return $objectManager->create(
+            \Magento\Framework\MessageQueue\Config::class,
+            ['queueConfigData' => $configData]
+        );
+    }
+
+    /**
+     * Get mocked Communication Config Instance
+     *
+     * @return \Magento\Framework\Communication\ConfigInterface
+     */
+    private function getCommunicationConfigInstance()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $fileResolver = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolver->expects($this->any())
+            ->method('get')
+            ->willReturn([file_get_contents(__DIR__ . '/_files/communication.xml')]);
+
+        $xmlReader = $objectManager->create(
+            \Magento\Framework\Communication\Config\Reader\XmlReader::class,
+            [
+                'fileResolver' => $fileResolver,
+            ]
+        );
+
+        $compositeReader = $objectManager->create(
+            \Magento\Framework\Communication\Config\CompositeReader::class,
+            [
+                'readers' => [
+                    ['reader' => $xmlReader, 'sortOrder' => 10],
+                    [
+                        'reader' => $objectManager->create(
+                            \Magento\Framework\Communication\Config\Reader\EnvReader::class
+                        ),
+                        'sortOrder' => 20
+                    ]
+                ],
+            ]
+        );
+
+        /** @var \Magento\Framework\Communication\Config $configData */
+        $configData = $objectManager->create(
+            \Magento\Framework\Communication\Config\Data::class,
+            [
+                'reader' => $compositeReader
+            ]
+        );
+
+        $config = $objectManager->create(
+            \Magento\Framework\Communication\ConfigInterface::class,
+            [
+                'configData' => $configData
+            ]
+        );
+        return $config;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php
new file mode 100644
index 0000000000000..6ff19121e3364
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+
+/**
+ * Test of queue consumer configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetConsumers()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+
+        $consumers = $config->getConsumers();
+        $consumer = $config->getConsumer('consumer1');
+
+        $this->assertEquals(
+            $consumer,
+            $consumers['consumer1'],
+            'Consumers received from collection and via getter must be the same'
+        );
+
+        $this->assertEquals('consumer1', $consumer->getName());
+        $this->assertEquals('queue1', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\BatchConsumer::class, $consumer->getConsumerInstance());
+        $this->assertEquals('100', $consumer->getMaxMessages());
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(1, $handlers);
+        $this->assertEquals('handlerMethodOne', $handlers[0]->getMethod());
+        $this->assertEquals('Magento\TestModuleMessageQueueConfiguration\HandlerOne', $handlers[0]->getType());
+    }
+
+    public function testGetConsumerWithDefaultValues()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+
+        $consumer = $config->getConsumer('consumer5');
+
+        $this->assertEquals('consumer5', $consumer->getName());
+        $this->assertEquals('queue5', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(0, $handlers);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Consumer 'undeclaredConsumer' is not declared.
+     */
+    public function testGetUndeclaredConsumer()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $config->getConsumer('undeclaredConsumer');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php
new file mode 100644
index 0000000000000..7a783cb1da5ce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+
+/**
+ * Test access to consumer configuration declared in deprecated queue.xml configs using Consumer\ConfigInterface.
+ *
+ * @magentoCache config disabled
+ */
+class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetConsumerMultipleHandlersFromCommunicationConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigAsyncBoolConsumer');
+
+        $this->assertEquals('deprecatedConfigAsyncBoolConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.2', $consumer->getQueue());
+        $this->assertEquals('db', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(2, $handlers);
+        $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals('methodWithMixedParam', $handlers[1]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[1]->getType());
+    }
+
+    public function testGetConsumerCustomHandler()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigAsyncMixedConsumer');
+
+        $this->assertEquals('deprecatedConfigAsyncMixedConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.3', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(1, $handlers);
+        $this->assertEquals('methodWithMixedParam', $handlers[0]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[0]->getType());
+    }
+
+    public function testGetConsumerCustomConnectionSync()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigSyncBoolConsumer');
+
+        $this->assertEquals('deprecatedConfigSyncBoolConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.4', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(1, $handlers);
+        $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\SyncHandler::class, $handlers[0]->getType());
+    }
+
+    public function testGetConsumerCustomConsumerAndMaxMessages()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigAsyncStringConsumer');
+
+        $this->assertEquals('deprecatedConfigAsyncStringConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.1', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\BatchConsumer::class, $consumer->getConsumerInstance());
+        $this->assertEquals(200, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(0, $handlers);
+    }
+
+    public function testGetOverlapWithQueueConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('overlappingConsumerDeclaration');
+
+        $this->assertEquals('overlappingConsumerDeclaration', $consumer->getName());
+        $this->assertEquals('consumer.config.queue', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(0, $handlers);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/MessageEncoderTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/MessageEncoderTest.php
new file mode 100644
index 0000000000000..342f280f6af4d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/MessageEncoderTest.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\Communication\Config;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MessageEncoderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var MessageEncoder */
+    protected $encoder;
+
+    /** @var \Magento\Framework\ObjectManagerInterface */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->encoder = $this->objectManager->create(MessageEncoder::class);
+        $this->setBackwardCompatibleProperty(
+            $this->encoder,
+            'communicationConfig',
+            $this->getConfig()
+        );
+        parent::setUp();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     */
+    public function testEncode()
+    {
+        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $fixtureCustomerId = 1;
+        $customer = $customerRepository->getById($fixtureCustomerId);
+        /** @var \Magento\Customer\Api\Data\CustomerExtensionInterface $customerExtension */
+        $customerExtension = $this->objectManager->create(\Magento\Customer\Api\Data\CustomerExtension::class);
+        $customerExtension->setTestGroupCode('Some Group Code');
+        $customer->setExtensionAttributes($customerExtension);
+        $encodedCustomerData = json_decode($this->encoder->encode('customer.created', $customer), true);
+        $createdAt = $customer->getCreatedAt();
+        $updatedAt = $customer->getUpdatedAt();
+        $expectedEncodedCustomerData = json_decode($this->getCustomerDataAsJson($createdAt, $updatedAt), true);
+        $this->assertEquals($expectedEncodedCustomerData, $encodedCustomerData);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     */
+    public function testEncodeArrayOfEntities()
+    {
+        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $fixtureCustomerId = 1;
+        $customer = $customerRepository->getById($fixtureCustomerId);
+        /** @var \Magento\Customer\Api\Data\CustomerExtensionInterface $customerExtension */
+        $customerExtension = $this->objectManager->create(\Magento\Customer\Api\Data\CustomerExtension::class);
+        $customerExtension->setTestGroupCode('Some Group Code');
+        $customer->setExtensionAttributes($customerExtension);
+        $encodedCustomerData = json_decode($this->encoder->encode('customer.list.retrieved', [$customer]), true);
+        $createdAt = $customer->getCreatedAt();
+        $updatedAt = $customer->getUpdatedAt();
+        $expectedEncodedCustomerData = json_decode($this->getCustomerDataAsJson($createdAt, $updatedAt), true);
+        $this->assertEquals($expectedEncodedCustomerData, $encodedCustomerData[0]);
+    }
+
+    public function testDecode()
+    {
+        $encodedMessage = $this->getCustomerDataAsJson('2015-07-22 12:43:36', '2015-07-22 12:45:36');
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $decodedCustomerObject */
+        $decodedCustomerObject = $this->encoder->decode('customer.created', $encodedMessage);
+        $this->assertInstanceOf(\Magento\Customer\Api\Data\CustomerInterface::class, $decodedCustomerObject);
+        $this->assertEquals('customer@example.com', $decodedCustomerObject->getEmail());
+        $this->assertEquals(1, $decodedCustomerObject->getGroupId());
+
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\CustomerExtensionInterface::class,
+            $decodedCustomerObject->getExtensionAttributes()
+        );
+        $this->assertEquals('Some Group Code', $decodedCustomerObject->getExtensionAttributes()->getTestGroupCode());
+        $addresses = $decodedCustomerObject->getAddresses();
+        $this->assertCount(1, $addresses, "Address was not decoded.");
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\AddressInterface::class,
+            $addresses[0]
+        );
+        $this->assertEquals('3468676', $addresses[0]->getTelephone());
+        $this->assertEquals(true, $addresses[0]->isDefaultBilling());
+
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\RegionInterface::class,
+            $addresses[0]->getRegion()
+        );
+        $this->assertEquals('AL', $addresses[0]->getRegion()->getRegionCode());
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Error occurred during message decoding
+     */
+    public function testDecodeInvalidMessageFormat()
+    {
+        $this->encoder->decode('customer.created', "{");
+    }
+
+    /**
+     * @expectedException \LogicException
+     */
+    public function testDecodeInvalidMessage()
+    {
+        $message = 'Property "NotExistingField" does not have accessor method "getNotExistingField" in class '
+            . '"Magento\Customer\Api\Data\CustomerInterface".';
+        $this->expectExceptionMessage($message);
+        $this->encoder->decode('customer.created', '{"not_existing_field": "value"}');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Error occurred during message decoding
+     */
+    public function testDecodeIncorrectMessage()
+    {
+        $this->encoder->decode('customer.created', "{");
+    }
+
+    /**
+     * @return \Magento\Framework\MessageQueue\Config
+     */
+    protected function getConfig()
+    {
+        $newData = include __DIR__ . '/_files/encoder_communication.php';
+        /** @var \Magento\Framework\Communication\Config\Data $configData */
+        $configData = $this->objectManager->create(\Magento\Framework\Communication\Config\Data::class);
+        $configData->reset();
+        $configData->merge($newData);
+        $config = $this->objectManager->create(Config::class, ['configData' => $configData]);
+
+        return $config;
+    }
+
+    /**
+     * Get fixture customer data in Json format
+     *
+     * @param string $createdAt
+     * @param string $updatedAt
+     * @return string
+     */
+    protected function getCustomerDataAsJson($createdAt, $updatedAt)
+    {
+        return <<<JSON
+{
+    "id": 1,
+    "group_id": 1,
+    "default_billing": "1",
+    "default_shipping": "1",
+    "created_at": "{$createdAt}",
+    "updated_at": "{$updatedAt}",
+    "email": "customer@example.com",
+    "firstname": "John",
+    "lastname": "Smith",
+    "middlename": "A",
+    "prefix": "Mr.",
+    "suffix": "Esq.",
+    "gender": 0,
+    "store_id": 1,
+    "taxvat": "12",
+    "website_id": 1,
+    "addresses": [
+        {
+            "id": 1,
+            "customer_id": 1,
+            "region": {
+                "region_code": "AL",
+                "region": "Alabama",
+                "region_id": 1
+            },
+            "region_id": 1,
+            "country_id": "US",
+            "street": [
+                "Green str, 67"
+            ],
+            "company": "CompanyName",
+            "telephone": "3468676",
+            "postcode": "75477",
+            "city": "CityM",
+            "firstname": "John",
+            "lastname": "Smith",
+            "default_shipping": true,
+            "default_billing": true
+        }
+    ],
+    "disable_auto_group_change": 0,
+    "extension_attributes": {
+        "test_group_code": "Some Group Code"
+    }
+}
+JSON;
+    }
+
+    /**
+     * Set mocked property
+     *
+     * @param object $object
+     * @param string $propertyName
+     * @param object $propertyValue
+     * @return void
+     */
+    public function setBackwardCompatibleProperty($object, $propertyName, $propertyValue)
+    {
+        $reflection = new \ReflectionClass(get_class($object));
+        $reflectionProperty = $reflection->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $propertyValue);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php
new file mode 100644
index 0000000000000..5dc9889198053
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+/**
+ * Test of queue publisher configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetPublishersWithOneEnabledConnection()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+
+        $publishers = $config->getPublishers();
+        $publisher = $config->getPublisher('topic.message.queue.config.01');
+        $itemFromList = null;
+        foreach ($publishers as $item) {
+            if ($item->getTopic() == 'topic.message.queue.config.01') {
+                $itemFromList = $item;
+                break;
+            }
+        }
+
+        $this->assertEquals($publisher, $itemFromList, 'Inconsistent publisher object');
+
+        $this->assertEquals('topic.message.queue.config.01', $publisher->getTopic(), 'Incorrect topic name');
+        $this->assertFalse($publisher->isDisabled(), 'Incorrect publisher state');
+        /** @var \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface $connection */
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName(), 'Incorrect connection name');
+        $this->assertEquals('magento2', $connection->getExchange(), 'Incorrect exchange name');
+        $this->assertFalse($connection->isDisabled(), 'Incorrect connection status');
+    }
+
+    public function testGetPublisherConnectionWithoutConfiguredExchange()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+
+        $publisher = $config->getPublisher('topic.message.queue.config.04');
+        $connection = $publisher->getConnection();
+        $this->assertEquals('magento', $connection->getExchange(), 'Incorrect exchange name');
+    }
+
+    public function testGetPublishersWithoutEnabledConnection()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+
+        $publisher = $config->getPublisher('topic.message.queue.config.02');
+
+        $this->assertEquals('topic.message.queue.config.02', $publisher->getTopic(), 'Incorrect topic name');
+        $this->assertFalse($publisher->isDisabled(), 'Incorrect publisher state');
+
+        /** @var \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface $connection */
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName(), 'Incorrect default connection name');
+        $this->assertEquals('magento', $connection->getExchange(), 'Incorrect default exchange name');
+        $this->assertFalse($connection->isDisabled(), 'Incorrect connection status');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Publisher 'topic.message.queue.config.03' is not declared.
+     */
+    public function testGetDisabledPublisherThrowsException()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $config->getPublisher('topic.message.queue.config.03');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php
new file mode 100644
index 0000000000000..9c2b4c075d890
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface;
+
+/**
+ * Test access to publisher configuration declared in deprecated queue.xml configs using Publisher\ConfigInterface.
+ *
+ * @magentoCache config disabled
+ */
+class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetPublisher()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $publisher = $config->getPublisher('deprecated.config.async.string.topic');
+        $this->assertEquals('deprecated.config.async.string.topic', $publisher->getTopic());
+        $this->assertEquals(false, $publisher->isDisabled());
+
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('magento', $connection->getExchange());
+        $this->assertEquals(false, $connection->isDisabled());
+    }
+
+    public function testGetPublisherCustomConnection()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $publisher = $config->getPublisher('deprecated.config.sync.bool.topic');
+        $this->assertEquals('deprecated.config.sync.bool.topic', $publisher->getTopic());
+        $this->assertEquals(false, $publisher->isDisabled());
+
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('customExchange', $connection->getExchange());
+        $this->assertEquals(false, $connection->isDisabled());
+    }
+
+    public function testGetOverlapWithQueueConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $publisher = $config->getPublisher('overlapping.topic.declaration');
+        $this->assertEquals('overlapping.topic.declaration', $publisher->getTopic());
+        $this->assertEquals(false, $publisher->isDisabled());
+
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('magento', $connection->getExchange());
+        $this->assertEquals(false, $connection->isDisabled());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/ConfigTest.php
new file mode 100644
index 0000000000000..a8e55602327f2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/ConfigTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+/**
+ * Test of queue topology configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetExchangeByName()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $exchange = $config->getExchange('magento-topic-based-exchange1', 'amqp');
+        $this->assertEquals('magento-topic-based-exchange1', $exchange->getName());
+        $this->assertEquals('topic', $exchange->getType());
+        $this->assertEquals('amqp', $exchange->getConnection());
+        $exchangeArguments = $exchange->getArguments();
+        $expectedArguments = ['alternate-exchange' => 'magento-log-exchange'];
+        $this->assertEquals($expectedArguments, $exchangeArguments);
+
+        /** @var BindingInterface $binding */
+        $binding = current($exchange->getBindings());
+        $this->assertEquals('topicBasedRouting1', $binding->getId());
+        $this->assertEquals('anotherTopic1', $binding->getTopic());
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topic-queue1', $binding->getDestination());
+        $bindingArguments = $binding->getArguments();
+        $expectedArguments = ['argument1' => 'value'];
+        $this->assertEquals($expectedArguments, $bindingArguments);
+    }
+
+    public function testGetExchangeByNameWithDefaultValues()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $exchange = $config->getExchange('magento-topic-based-exchange2', 'amqp');
+        $this->assertEquals('magento-topic-based-exchange2', $exchange->getName());
+        $this->assertEquals('topic', $exchange->getType());
+        $this->assertEquals('amqp', $exchange->getConnection());
+        $exchangeArguments = $exchange->getArguments();
+        $expectedArguments = [
+            'alternate-exchange' => 'magento-log-exchange',
+            'arrayValue' => [
+                'element01' => '10',
+                'element02' => '20',
+            ]
+        ];
+        $this->assertEquals($expectedArguments, $exchangeArguments);
+
+        /** @var BindingInterface $binding */
+        $binding = current($exchange->getBindings());
+        $this->assertEquals('topicBasedRouting2', $binding->getId());
+        $this->assertEquals('anotherTopic2', $binding->getTopic());
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topic-queue2', $binding->getDestination());
+        $bindingArguments = $binding->getArguments();
+        $expectedArguments = ['argument1' => 'value', 'argument2' => true, 'argument3' => 150];
+        $this->assertEquals($expectedArguments, $bindingArguments);
+    }
+
+    public function testGetAllExchanges()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $exchanges = $config->getExchanges();
+        $expectedResults = ['magento-topic-based-exchange1', 'magento-topic-based-exchange2'];
+        $actual = [];
+        foreach ($exchanges as $exchange) {
+            $actual[] = $exchange->getName();
+        }
+        $this->assertEmpty(array_diff($expectedResults, $actual));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php
new file mode 100644
index 0000000000000..30a1c27abf77b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding\Iterator as BindingIterator;
+
+/**
+ * Test access to topology configuration declared in deprecated queue.xml configs using Topology\ConfigInterface.
+ *
+ * @magentoCache config disabled
+ */
+class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetTopology()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $topology = $config->getExchange('deprecatedExchange', 'db');
+        $this->assertEquals('deprecatedExchange', $topology->getName());
+        $this->assertEquals('topic', $topology->getType());
+        $this->assertEquals('db', $topology->getConnection());
+        $this->assertEquals(true, $topology->isDurable());
+        $this->assertEquals(false, $topology->isAutoDelete());
+        $this->assertEquals(false, $topology->isInternal());
+
+        $arguments = $topology->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        // Verify bindings
+        $bindings = $topology->getBindings();
+        $this->assertInstanceOf(BindingIterator::class, $bindings);
+        $this->assertCount(1, $bindings);
+
+        $bindingId = 'queue--deprecated.config.queue.2--deprecated.config.async.bool.topic';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('deprecated.config.queue.2', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('deprecated.config.async.bool.topic', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+    }
+
+    public function testGetTopologyOverlapWithQueueConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $topology = $config->getExchange('overlappingDeprecatedExchange', 'amqp');
+        $this->assertEquals('overlappingDeprecatedExchange', $topology->getName());
+        $this->assertEquals('topic', $topology->getType());
+        $this->assertEquals('amqp', $topology->getConnection());
+        $this->assertEquals(true, $topology->isDurable());
+        $this->assertEquals(false, $topology->isAutoDelete());
+        $this->assertEquals(false, $topology->isInternal());
+
+        $arguments = $topology->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        // Verify bindings
+        $bindings = $topology->getBindings();
+        $this->assertInstanceOf(BindingIterator::class, $bindings);
+        $this->assertCount(3, $bindings);
+
+        // Note that connection was changed for this binding during merge with topology config
+        // since we do not support exchanges with the same names on different connections
+        $bindingId = 'queue--consumer.config.queue--overlapping.topic.declaration';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('consumer.config.queue', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('overlapping.topic.declaration', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        $bindingId = 'binding1';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topology.config.queue', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('overlapping.topic.declaration', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        $bindingId = 'binding2';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topology.config.queue', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('deprecated.config.async.string.topic', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
new file mode 100644
index 0000000000000..189d189d32c97
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration
+ * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride
+ */
+class TopologyTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * List of declared exchanges.
+     *
+     * @var array
+     */
+    private $declaredExchanges;
+
+    /**
+     * @var \Magento\TestFramework\Helper\Amqp
+     */
+    private $helper;
+
+    protected function setUp()
+    {
+        $this->helper = new \Magento\TestFramework\Helper\Amqp();
+        $this->declaredExchanges = $this->helper->getExchanges();
+    }
+
+    /**
+     * @dataProvider exchangeDataProvider
+     * @param array $expectedConfig
+     * @param array $bindingConfig
+     */
+    public function testTopologyInstallation(array $expectedConfig, array $bindingConfig)
+    {
+        $name = $expectedConfig['name'];
+        $this->assertArrayHasKey($name, $this->declaredExchanges);
+        unset($this->declaredExchanges[$name]['message_stats']);
+        $this->assertEquals(
+            $expectedConfig,
+            $this->declaredExchanges[$name],
+            'Invalid exchange configuration: ' . $name
+        );
+
+        $bindings = $this->helper->getExchangeBindings($name);
+        $bindings = array_map(function ($value) {
+            unset($value['properties_key']);
+            return $value;
+        }, $bindings);
+        $this->assertEquals(
+            $bindingConfig,
+            $bindings,
+            'Invalid exchange bindings configuration: ' . $name
+        );
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exchangeDataProvider()
+    {
+        return [
+            'magento-topic-based-exchange1' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange1',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => true,
+                    'auto_delete' => false,
+                    'internal' => false,
+                    'arguments' => [
+                        'alternate-exchange' => 'magento-log-exchange'
+                    ],
+                ],
+                'bindingConfig' => [
+                    [
+                        'source' => 'magento-topic-based-exchange1',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue1',
+                        'destination_type' => 'queue',
+                        'routing_key' => 'anotherTopic1',
+                        'arguments' => [
+                            'argument1' => 'value'
+                        ],
+                    ],
+                ]
+            ],
+            'magento-topic-based-exchange2' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange2',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => true,
+                    'auto_delete' => false,
+                    'internal' => false,
+                    'arguments' => [
+                        'alternate-exchange' => 'magento-log-exchange',
+                        'arrayValue' => ['10', '20']
+                    ],
+                ],
+                'bindingConfig' => [
+                    [
+                        'source' => 'magento-topic-based-exchange2',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue2',
+                        'destination_type' => 'queue',
+                        'routing_key' => 'anotherTopic2',
+                        'arguments' => [
+                            'argument1' => 'value',
+                            'argument2' => true,
+                            'argument3' => '150',
+                        ],
+                    ],
+                ]
+            ],
+            'magento-topic-based-exchange3' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange3',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => false,
+                    'auto_delete' => true,
+                    'internal' => true,
+                    'arguments' => [],
+                ],
+                'bindingConfig' => [],
+            ],
+            'magento-topic-based-exchange4' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange4',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => true,
+                    'auto_delete' => false,
+                    'internal' => false,
+                    'arguments' => [],
+                ],
+                'bindingConfig' => [
+                    [
+                        'source' => 'magento-topic-based-exchange4',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue1',
+                        'destination_type' => 'queue',
+                        'routing_key' => '#',
+                        'arguments' => [
+                            'test' => 'one'
+                        ],
+                    ],
+                    [
+                        'source' => 'magento-topic-based-exchange4',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue2',
+                        'destination_type' => 'queue',
+                        'routing_key' => '*.*.*',
+                        'arguments' => [],
+                    ],
+                ]
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleHandlersTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleHandlersTest.php
new file mode 100644
index 0000000000000..890a0d01c71f9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleHandlersTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\TestModuleAsyncAmqp\Model\AsyncTestData;
+
+class AsyncMultipleHandlersTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string
+     */
+    protected $expectedMessages;
+
+    /**
+     * @var string[]
+     */
+    protected $consumers = [
+        'mtmh.queue.1.consumer',
+        'mtmh.queue.2.consumer',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $topicValueMap = [
+        'mtmh.topic.1' => 'mtmh.topic.1',
+        'mtmh.topic.2' => ['mtmh.topic.2-1', 'mtmh.topic.2-2']
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $expectedValues = [
+        'string-mtmh.topic.1',
+        'mixed-mtmh.topic.1',
+        'array-mtmh.topic.2-1',
+        'array-mtmh.topic.2-2',
+        'mixed-mtmh.topic.2-1',
+        'mixed-mtmh.topic.2-2'
+    ];
+
+    /**
+     * Verify that Queue Framework supports multiple topics per queue.
+     *
+     * Current test is not test of Web API framework itself,
+     * it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testAsynchronousRpcCommunication()
+    {
+        foreach ($this->topicValueMap as $topic => $data) {
+            $message = null;
+            if (is_array($data)) {
+                foreach ($data as $key => $value) {
+                    /** @var AsyncTestData $testObject */
+                    $testObject = $this->objectManager->create(AsyncTestData::class);
+                    $testObject->setValue($value);
+                    $testObject->setTextFilePath($this->logFilePath);
+                    $message[$key] = $testObject;
+                }
+            } else {
+                $testObject = $this->objectManager->create(AsyncTestData::class);
+                $testObject->setValue($data);
+                $testObject->setTextFilePath($this->logFilePath);
+                $message = $testObject;
+            }
+            $this->publisher->publish($topic, $message);
+        }
+
+        $this->waitForAsynchronousResult(count($this->expectedValues), $this->logFilePath);
+
+        //assertions
+        foreach ($this->expectedValues as $item) {
+            $this->assertContains($item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleTopicsWithEachQueueTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleTopicsWithEachQueueTest.php
new file mode 100644
index 0000000000000..e1de6423152c7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleTopicsWithEachQueueTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class AsyncMultipleTopicsWithEachQueueTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string[]
+     */
+    protected $uniqueID;
+
+    /**
+     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     */
+    protected $msgObject;
+
+    /**
+     * @var string[]
+     */
+    protected $consumers = ['queue.for.multiple.topics.test.y', 'queue.for.multiple.topics.test.z'];
+
+    /**
+     * @var string[]
+     */
+    private $topics = ['multi.topic.queue.topic.y', 'multi.topic.queue.topic.z'];
+
+    /**
+     * Verify that Queue Framework processes multiple asynchronous topics sent to the same queue.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testAsyncMultipleTopicsPerQueue()
+    {
+        $this->msgObject = $this->objectManager->create(\Magento\TestModuleAsyncAmqp\Model\AsyncTestData::class);
+
+        foreach ($this->topics as $topic) {
+            $this->uniqueID[$topic] = md5(uniqid($topic));
+            $this->msgObject->setValue($this->uniqueID[$topic] . "_" . $topic);
+            $this->msgObject->setTextFilePath($this->logFilePath);
+            $this->publisher->publish($topic, $this->msgObject);
+        }
+
+        $this->waitForAsynchronousResult(count($this->uniqueID), $this->logFilePath);
+
+        //assertions
+        foreach ($this->topics as $item) {
+            $this->assertContains($this->uniqueID[$item] . "_" . $item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php
new file mode 100644
index 0000000000000..f361f8e4e62fb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase\DeprecatedFormat;
+
+use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
+
+class AsyncMultiTopicsSeparateQueuesTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string[]
+     */
+    protected $uniqueID;
+
+    /**
+     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     */
+    protected $msgObject;
+
+    /**
+     * @var string[]
+     */
+    protected $consumers = [
+        'queue.for.multiple.topics.test.c.deprecated',
+        'queue.for.multiple.topics.test.d.deprecated'
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $topics = ['multi.topic.queue.topic.c.deprecated', 'multi.topic.queue.topic.d.deprecated'];
+
+    /**
+     * Verify that Queue Framework processes multiple asynchronous topics sent to the same queue.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testAsyncMultipleTopicsPerQueue()
+    {
+        $this->msgObject = $this->objectManager->create(\Magento\TestModuleAsyncAmqp\Model\AsyncTestData::class);
+
+        foreach ($this->topics as $topic) {
+            $this->uniqueID[$topic] = md5(uniqid($topic));
+            $this->msgObject->setValue($this->uniqueID[$topic] . "_" . $topic);
+            $this->msgObject->setTextFilePath($this->logFilePath);
+            $this->publisher->publish($topic, $this->msgObject);
+        }
+
+        $this->waitForAsynchronousResult(count($this->uniqueID), $this->logFilePath);
+
+        //assertions
+        foreach ($this->topics as $item) {
+            $this->assertContains($this->uniqueID[$item] . "_" . $item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/RpcCommunicationTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/RpcCommunicationTest.php
new file mode 100644
index 0000000000000..2c2b9c94037f4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/RpcCommunicationTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase\DeprecatedFormat;
+
+use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
+
+class RpcCommunicationTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['synchronousRpcTestConsumer.deprecated'];
+
+    /**
+     * Verify that RPC call based on Rabbit MQ is processed correctly.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test RPC.
+     */
+    public function testSynchronousRpcCommunication()
+    {
+        $input = 'Input value';
+        $response = $this->publisher->publish('synchronous.rpc.test.deprecated', $input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php
new file mode 100644
index 0000000000000..a7987320e90c7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class MixSyncAndAsyncSingleQueueTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     */
+    protected $msgObject;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['mixed.sync.and.async.queue.consumer'];
+
+    /**
+     * @var string[]
+     */
+    protected $messages = ['message1', 'message2', 'message3'];
+
+    /**
+     * @var int
+     */
+    protected $maxMessages = 4;
+
+    public function testMixSyncAndAsyncSingleQueue()
+    {
+        $this->msgObject = $this->objectManager->create(\Magento\TestModuleAsyncAmqp\Model\AsyncTestData::class);
+
+        // Publish asynchronous messages
+        foreach ($this->messages as $item) {
+            $this->msgObject->setValue($item);
+            $this->msgObject->setTextFilePath($this->logFilePath);
+            $this->publisher->publish('multi.topic.queue.topic.c', $this->msgObject);
+        }
+
+        // Publish synchronous message to the same queue
+        $input = 'Input value';
+        $response = $this->publisher->publish('sync.topic.for.mixed.sync.and.async.queue', $input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+
+        $this->waitForAsynchronousResult(count($this->messages), $this->logFilePath);
+
+        // Verify that asynchronous messages were processed
+        foreach ($this->messages as $item) {
+            $this->assertContains($item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MultipleTopicsPerQueueTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MultipleTopicsPerQueueTest.php
new file mode 100644
index 0000000000000..edd0fb9d560d5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MultipleTopicsPerQueueTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class MultipleTopicsPerQueueTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = [
+        'queue.for.multiple.topics.test.a',
+        'queue.for.multiple.topics.test.b'
+    ];
+
+    /**
+     * Verify that Queue Framework supports multiple topics per queue.
+     *
+     * Current test is not test of Web API framework itself,
+     * it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testSynchronousRpcCommunication()
+    {
+        foreach (['multi.topic.queue.topic.a', 'multi.topic.queue.topic.b'] as $topic) {
+            $input = "Input value for topic '{$topic}'";
+            $response = $this->publisher->publish($topic, $input);
+            $this->assertEquals($input . ' processed by RPC handler', $response);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
new file mode 100644
index 0000000000000..bda232c7fb9c4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
+use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
+
+/**
+ * Base test case for message queue tests.
+ */
+class QueueTestCaseAbstract extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string[]
+     */
+    protected $consumers = [];
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var PublisherInterface
+     */
+    protected $publisher;
+
+    /**
+     * @var string
+     */
+    protected $logFilePath;
+
+    /**
+     * @var int|null
+     */
+    protected $maxMessages = null;
+
+    /**
+     * @var PublisherConsumerController
+     */
+    private $publisherConsumerController;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->logFilePath = TESTS_TEMP_DIR . "/MessageQueueTestLog.txt";
+        $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->publisherConsumerController->getPublisher();
+    }
+
+    protected function tearDown()
+    {
+        $this->publisherConsumerController->stopConsumers();
+    }
+
+    /**
+     * Wait for asynchronous handlers to log data to file.
+     *
+     * @param int $expectedLinesCount
+     * @param string $logFilePath
+     */
+    protected function waitForAsynchronousResult($expectedLinesCount, $logFilePath)
+    {
+        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
+     */
+    public static function tearDownAfterClass()
+    {
+        if (version_compare(phpversion(), '7') == -1) {
+            $closeConnection = new \ReflectionMethod(\Magento\Amqp\Model\Config::class, 'closeConnection');
+            $closeConnection->setAccessible(true);
+
+            $config = Bootstrap::getObjectManager()->get(\Magento\Amqp\Model\Config::class);
+            $closeConnection->invoke($config);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RemoteServiceCommunicationTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RemoteServiceCommunicationTest.php
new file mode 100644
index 0000000000000..a7f6845a86640
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RemoteServiceCommunicationTest.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\TestModuleSynchronousAmqp\Api\ServiceInterface;
+
+class RemoteServiceCommunicationTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['RemoteServiceTestConsumer'];
+
+    public function testRemoteServiceCommunication()
+    {
+        $input = 'Input value';
+        /** @var ServiceInterface $generatedRemoteService */
+        $generatedRemoteService = $this->objectManager->get(ServiceInterface::class);
+        $response = $generatedRemoteService->execute($input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RpcCommunicationTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RpcCommunicationTest.php
new file mode 100644
index 0000000000000..0acde6fc88457
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RpcCommunicationTest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class RpcCommunicationTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['synchronousRpcTestConsumer'];
+
+    /**
+     * Verify that RPC call based on Rabbit MQ is processed correctly.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test RPC.
+     */
+    public function testSynchronousRpcCommunication()
+    {
+        $input = 'Input value';
+        $response = $this->publisher->publish('synchronous.rpc.test', $input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php
new file mode 100644
index 0000000000000..d8c369334cbb1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\TestModuleAsyncAmqp\Model\AsyncTestData;
+
+class WildcardTopicTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string[]
+     */
+    protected $consumers = [
+        'wildcard.queue.one.consumer',
+        'wildcard.queue.two.consumer',
+        'wildcard.queue.three.consumer',
+        'wildcard.queue.four.consumer',
+    ];
+
+    /**
+     * @param string $topic
+     * @param string[] $matchingQueues
+     * @param string[] $nonMatchingQueues
+     *
+     * @dataProvider wildCardTopicsDataProvider
+     */
+    public function testWildCardMatchingTopic($topic, $matchingQueues, $nonMatchingQueues)
+    {
+        $testObject = $this->generateTestObject();
+        $this->publisher->publish($topic, $testObject);
+
+        $this->waitForAsynchronousResult(count($matchingQueues), $this->logFilePath);
+
+        $this->assertTrue(file_exists($this->logFilePath), "No handlers invoked (log file was not created).");
+        foreach ($nonMatchingQueues as $queueName) {
+            $this->assertNotContains($queueName, file_get_contents($this->logFilePath));
+        }
+        foreach ($matchingQueues as $queueName) {
+            $this->assertContains($queueName, file_get_contents($this->logFilePath));
+        }
+    }
+
+    public function wildCardTopicsDataProvider()
+    {
+        return [
+            'segment1.segment2.segment3.wildcard' => [
+                'segment1.segment2.segment3.wildcard',
+                ['wildcard.queue.one', 'wildcard.queue.two', 'wildcard.queue.four'],
+                ['wildcard.queue.three']
+            ],
+            'segment2.segment3.wildcard' => [
+                'segment2.segment3.wildcard',
+                ['wildcard.queue.one', 'wildcard.queue.three', 'wildcard.queue.four'],
+                ['wildcard.queue.two']
+            ]
+        ];
+    }
+
+    public function testWildCardNonMatchingTopic()
+    {
+        $testObject = $this->generateTestObject();
+        $this->publisher->publish('not.matching.wildcard.topic', $testObject);
+        sleep(2);
+        $this->assertFalse(file_exists($this->logFilePath), "No log file must be created for non-matching topic.");
+    }
+
+    /**
+     * @return AsyncTestData
+     */
+    private function generateTestObject()
+    {
+        $testObject = $this->objectManager->create(AsyncTestData::class);
+        $testObject->setValue('||Message Contents||');
+        $testObject->setTextFilePath($this->logFilePath);
+        return $testObject;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
new file mode 100644
index 0000000000000..0fc50f0432b93
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="topic.broker.test" request="string" response="string">
+        <handler name="topicBrokerHandler" type="Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    </topic>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/encoder_communication.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/encoder_communication.php
new file mode 100644
index 0000000000000..9870e1d234e02
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/encoder_communication.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'topics' => [
+        'customer.created' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'response' => null,
+        ],
+        'customer.list.retrieved' => [
+            'request_type' => 'object_interface',
+            'request' => 'Magento\Customer\Api\Data\CustomerInterface[]',
+            'response' => null,
+        ],
+        'customer.updated' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'response' => null,
+        ],
+        'customer.deleted' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'response' => null,
+        ],
+        'product.created' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Catalog\Api\Data\ProductInterface::class,
+            'response' => null,
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
new file mode 100644
index 0000000000000..b5f5145c32c72
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    "publishers" => [
+        "amqp-magento" => [
+            "name" => "amqp-magento",
+            "connection" => "amqp",
+            "exchange" => "magento"
+        ],
+        'demo-publisher-1' => [
+            'name' => 'demo-publisher-1',
+            'connection' => 'amqp',
+            "exchange" => "magento"
+        ],
+        "test-publisher-5" => [
+            "name" => "test-publisher-5",
+            "connection" => "amqp",
+            "exchange" => "test-exchange-10"
+        ]
+    ],
+    "topics" => [
+        "topic.broker.test" => [
+            "name" => "topic.broker.test",
+            "schema" => [
+                "schema_type" => "object",
+                "schema_value" => "string"
+            ],
+            "response_schema" => [
+                "schema_type" => "object",
+                "schema_value" => "string"
+            ],
+            "publisher" => "amqp-magento",
+            'is_synchronous' => true,
+        ],
+        "publisher5.topic" => [
+            "name" => "publisher5.topic",
+            "schema" => [
+                "schema_type" => "object",
+                "schema_value" => '\\' . \Magento\MysqlMq\Model\DataObject::class
+            ],
+            "response_schema" => [
+                "schema_type" => "object",
+                "schema_value" => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            "publisher" => "test-publisher-5"
+        ]
+    ],
+    "consumers" => [
+        "topicBrokerConsumer" => [
+            "name" => "topicBrokerConsumer",
+            "queue" => "demo-queue-1",
+            "connection" => "amqp",
+            "consumer_type" => "sync",
+            "handlers" => [
+                "topic.broker.test" => [
+                    "0" => [
+                        "type" => \Magento\MysqlMq\Model\Processor::class,
+                        "method" => "processMessage"
+                    ]
+                ]
+            ],
+            "max_messages" => null,
+            "instance_type" => \Magento\Framework\MessageQueue\ConsumerInterface::class
+        ]
+    ],
+    "binds" => [
+        "topic.broker.test--magento--demo-queue-1" => [
+            "queue" => "demo-queue-1",
+            "exchange" => "magento",
+            "topic" => "topic.broker.test"
+        ],
+        "publisher5.topic--test-exchange-10--demo-queue-1" => [
+            "queue" => "demo-queue-1",
+            "exchange" => "test-exchange-10",
+            "topic" => "publisher5.topic"
+        ]
+    ],
+    "exchange_topic_to_queues_map" => [
+        "magento--topic.broker.test" => [
+            "demo-queue-1"
+        ],
+        "test-exchange-10--publisher5.topic" => [
+            "demo-queue-1"
+        ]
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_new_queue.xml b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_new_queue.xml
new file mode 100644
index 0000000000000..f27f0b22f464f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_new_queue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="topic.broker.test" type="amqp" exchange="magento">
+        <queue consumer="topicBrokerConsumer" name="demo-queue-1" />
+    </broker>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
new file mode 100644
index 0000000000000..fdd4a7d3007a7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'queue' => [
+        'publishers' => [
+            'demo-publisher-1' => [
+                'name' => 'demo-publisher-1',
+                'connection' => 'amqp',
+                "exchange" => "magento"
+            ],
+            "test-publisher-5" => [
+                "name" => "test-publisher-5",
+                "connection" => "amqp",
+                "exchange" => "test-exchange-10"
+            ]
+        ],
+        "topics" => [
+            "publisher5.topic" => [
+                "name" => "publisher5.topic",
+                "schema" => [
+                    "schema_type" => "object",
+                    "schema_value" => "Magento\\MysqlMq\\Model\\DataObject"
+                ],
+                "response_schema" => [
+                    "schema_type" => "object",
+                    "schema_value" => "Magento\\Customer\\Api\\Data\\CustomerInterface"
+                ],
+                "publisher" => "test-publisher-5"
+            ]
+        ],
+        "binds" => [
+            "publisher5.topic--test-exchange-10--demo-queue-1" => [
+                "queue" => "demo-queue-1",
+                "exchange" => "test-exchange-10",
+                "topic" => "publisher5.topic"
+            ]
+        ],
+        "exchange_topic_to_queues_map" => [
+            "test-exchange-10--publisher5.topic" => [
+                "demo-queue-1"
+            ]
+        ]
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php
index 419a7d04b778a..2ee0953dcdbf1 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractTest.php
@@ -72,4 +72,42 @@ public function testGetAllIdsWithBind()
         $this->_model->addBindParam('code', 'admin');
         $this->assertEquals(['0'], $this->_model->getAllIds());
     }
+
+    /**
+     * Check add field to select doesn't remove expression field from select.
+     *
+     * @return void
+     */
+    public function testAddExpressionFieldToSelectWithAdditionalFields()
+    {
+        $expectedColumns = ['code', 'test_field'];
+        $actualColumns = [];
+
+        $testExpression = new \Zend_Db_Expr('(sort_order + group_id)');
+        $this->_model->addExpressionFieldToSelect('test_field', $testExpression, ['sort_order', 'group_id']);
+        $this->_model->addFieldToSelect('code', 'code');
+        $columns = $this->_model->getSelect()->getPart(\Magento\Framework\DB\Select::COLUMNS);
+        foreach ($columns as $columnEntry) {
+            $actualColumns[] = $columnEntry[2];
+        }
+
+        $this->assertEquals($expectedColumns, $actualColumns);
+    }
+
+    /**
+     * Check add expression field doesn't remove all fields from select.
+     *
+     * @return void
+     */
+    public function testAddExpressionFieldToSelectWithoutAdditionalFields()
+    {
+        $expectedColumns = ['*', 'test_field'];
+
+        $testExpression = new \Zend_Db_Expr('(sort_order + group_id)');
+        $this->_model->addExpressionFieldToSelect('test_field', $testExpression, ['sort_order', 'group_id']);
+        $columns = $this->_model->getSelect()->getPart(\Magento\Framework\DB\Select::COLUMNS);
+        $actualColumns = [$columns[0][1], $columns[1][2]];
+
+        $this->assertEquals($expectedColumns, $actualColumns);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 83ff08f6ddff9..7f00a881ab71d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -19,6 +19,7 @@ public function testValidationUpToDateDb()
      */
     public function testValidationOutdatedDb()
     {
+        $this->markTestSkipped();
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         /** @var \Magento\Framework\Module\ModuleListInterface $moduleList */
@@ -31,12 +32,13 @@ public function testValidationOutdatedDb()
             $moduleNameToTest = $moduleName;
             break;
         }
+        $moduleList->getOne($moduleName);
 
         // Prepend '0.' to DB Version, to cause it to be an older version
         /** @var \Magento\Framework\Module\ResourceInterface $resource */
         $resource = $objectManager->create(\Magento\Framework\Module\ResourceInterface::class);
         $currentDbVersion = $resource->getDbVersion($moduleNameToTest);
-        $resource->setDbVersion($moduleNameToTest, '0.' . $currentDbVersion);
+        $resource->setDataVersion($moduleNameToTest, '0.' . $currentDbVersion);
 
         /** @var \Magento\Framework\Cache\FrontendInterface $cache */
         $cache = $this->_objectManager->get(\Magento\Framework\App\Cache\Type\Config::class);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php
index b26a1cda2476d..c047bd4fffd3d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php
@@ -126,14 +126,14 @@ public function testGetList()
         $this->assertEquals(0, $this->model->getVersion());
         //the same that a table is empty
         $changelogName = $this->resource->getTableName($this->model->getName());
-        $testChengelogData = [
+        $testChangelogData = [
             ['version_id' => 1, 'entity_id' => 1],
             ['version_id' => 2, 'entity_id' => 1],
             ['version_id' => 3, 'entity_id' => 2],
             ['version_id' => 4, 'entity_id' => 3],
             ['version_id' => 5, 'entity_id' => 1],
         ];
-        foreach ($testChengelogData as $data) {
+        foreach ($testChangelogData as $data) {
             $this->connection->insert($changelogName, $data);
         }
         $this->assertEquals(5, $this->model->getVersion());
diff --git a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php
index 2f798deecd9d5..6d5da7243ffbe 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php
@@ -7,6 +7,11 @@
 
 class ObjectManagerTest extends \PHPUnit\Framework\TestCase
 {
+    /**#@+
+     * Test class with type error
+     */
+    const TEST_CLASS_WITH_TYPE_ERROR = \Magento\Framework\ObjectManager\TestAsset\ConstructorWithTypeError::class;
+
     /**#@+
      * Test classes for basic instantiation
      */
@@ -138,4 +143,17 @@ public function testNewInstance($actualClassName, array $properties = [], $expec
             }
         }
     }
+
+    /**
+     * Test creating an object and passing incorrect type of arguments to the constructor.
+     *
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage Error occurred when creating object
+     */
+    public function testNewInstanceWithTypeError()
+    {
+        self::$_objectManager->create(self::TEST_CLASS_WITH_TYPE_ERROR, [
+            'testArgument' => new \stdClass()
+        ]);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/TestAsset/ConstructorWithTypeError.php b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/TestAsset/ConstructorWithTypeError.php
new file mode 100644
index 0000000000000..92d16e4df3511
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/TestAsset/ConstructorWithTypeError.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\ObjectManager\TestAsset;
+
+/**
+ * Test asset used to test invalid argument types on the constructor invocation.
+ */
+class ConstructorWithTypeError
+{
+    /**
+     * @var Basic
+     */
+    private $testArgument;
+
+    /**
+     * @param Basic $testArgument
+     */
+    public function __construct(Basic $testArgument)
+    {
+        $this->testArgument = $testArgument;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php
index 50611e9a2242b..ecbce25cd3377 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php
@@ -7,9 +7,8 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection;
-use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 use Magento\Search\Model\EngineResolver;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -64,6 +63,10 @@ protected function setUp()
         );
 
         $this->adapter = $this->createAdapter();
+
+        $indexer = $this->objectManager->create(\Magento\Indexer\Model\Indexer::class);
+        $indexer->load('catalogsearch_fulltext');
+        $indexer->reindexAll();
     }
 
     /**
@@ -81,8 +84,7 @@ protected function getRequestConfigPath()
      */
     protected function assertPreConditions()
     {
-        $currentEngine = $this->objectManager->get(MutableScopeConfigInterface::class)
-            ->getValue(EngineInterface::CONFIG_ENGINE_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $currentEngine = $this->objectManager->get(EngineResolverInterface::class)->getCurrentSearchEngine();
         $this->assertEquals($this->searchEngine, $currentEngine);
     }
 
@@ -138,7 +140,7 @@ private function assertOrderedProductIds($queryResponse, $expectedIds)
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testMatchQuery()
     {
@@ -152,7 +154,7 @@ public function testMatchQuery()
 
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/products_multi_option.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testMatchOrderedQuery()
     {
@@ -169,7 +171,7 @@ public function testMatchOrderedQuery()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testAggregationsQuery()
     {
@@ -186,7 +188,7 @@ public function testAggregationsQuery()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testMatchQueryFilters()
     {
@@ -203,12 +205,12 @@ public function testMatchQueryFilters()
     /**
      * Range filter test with all fields filled
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testRangeFilterWithAllFields()
     {
         $this->requestBuilder->bind('range_filter_from', 11);
-        $this->requestBuilder->bind('range_filter_to', 16);
+        $this->requestBuilder->bind('range_filter_to', 17);
         $this->requestBuilder->setRequestName('range_filter');
 
         $queryResponse = $this->executeQuery();
@@ -218,7 +220,7 @@ public function testRangeFilterWithAllFields()
     /**
      * Range filter test with all fields filled
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testRangeFilterWithoutFromField()
     {
@@ -232,7 +234,7 @@ public function testRangeFilterWithoutFromField()
     /**
      * Range filter test with all fields filled
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testRangeFilterWithoutToField()
     {
@@ -246,7 +248,7 @@ public function testRangeFilterWithoutToField()
     /**
      * Term filter test
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testTermFilter()
     {
@@ -261,11 +263,11 @@ public function testTermFilter()
     /**
      * Term filter test
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testTermFilterArray()
     {
-        $this->requestBuilder->bind('request.price', [16, 18]);
+        $this->requestBuilder->bind('request.price', [17, 18]);
         $this->requestBuilder->setRequestName('term_filter');
 
         $queryResponse = $this->executeQuery();
@@ -275,7 +277,7 @@ public function testTermFilterArray()
     /**
      * Term filter test
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testWildcardFilter()
     {
@@ -291,7 +293,7 @@ public function testWildcardFilter()
     /**
      * Request limits test
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testSearchLimit()
     {
@@ -307,18 +309,18 @@ public function testSearchLimit()
     /**
      * Bool filter test
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testBoolFilter()
     {
         $expectedIds = [2, 3];
-        $this->requestBuilder->bind('must_range_filter1_from', 12);
+        $this->requestBuilder->bind('must_range_filter1_from', 13);
         $this->requestBuilder->bind('must_range_filter1_to', 22);
-        $this->requestBuilder->bind('should_term_filter1', 12);
-        $this->requestBuilder->bind('should_term_filter2', 14);
-        $this->requestBuilder->bind('should_term_filter3', 16);
+        $this->requestBuilder->bind('should_term_filter1', 13);
+        $this->requestBuilder->bind('should_term_filter2', 15);
+        $this->requestBuilder->bind('should_term_filter3', 17);
         $this->requestBuilder->bind('should_term_filter4', 18);
-        $this->requestBuilder->bind('not_term_filter1', 12);
+        $this->requestBuilder->bind('not_term_filter1', 13);
         $this->requestBuilder->bind('not_term_filter2', 18);
         $this->requestBuilder->setRequestName('bool_filter');
 
@@ -330,14 +332,14 @@ public function testBoolFilter()
     /**
      * Test bool filter with nested negative bool filter
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testBoolFilterWithNestedNegativeBoolFilter()
     {
         $expectedIds = [1];
         $this->requestBuilder->bind('not_range_filter_from', 14);
         $this->requestBuilder->bind('not_range_filter_to', 20);
-        $this->requestBuilder->bind('nested_not_term_filter', 12);
+        $this->requestBuilder->bind('nested_not_term_filter', 13);
         $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter');
 
         $queryResponse = $this->executeQuery();
@@ -348,7 +350,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter()
     /**
      * Test range inside nested negative bool filter
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
     {
@@ -365,7 +367,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
     /**
      * Sample Advanced search request test
      *
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider advancedSearchDataProvider
      * @param string $nameQuery
      * @param string $descriptionQuery
@@ -406,7 +408,7 @@ public function advancedSearchDataProvider()
 
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testCustomFilterableAttribute()
     {
@@ -469,7 +471,7 @@ public function filterByAttributeValuesDataProvider()
      * Test filtering by two attributes.
      *
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider filterByAttributeValuesDataProvider
      * @param string $requestName
      * @param array $additionalData
@@ -506,7 +508,7 @@ public function testFilterByAttributeValues($requestName, $additionalData)
      * @param $rangeFilter
      * @param $expectedRecordsCount
      * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider dateDataProvider
      */
     public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
@@ -521,11 +523,10 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
 
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
     {
-        $this->markTestSkipped('MAGETWO-71445: configurable product created incorrectly - children not linked').
         /** @var Attribute $attribute */
         $attribute = $this->objectManager->get(Attribute::class)
             ->loadByCode(Product::ENTITY, 'test_configurable');
@@ -534,9 +535,15 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
             ->create(Collection::class)
             ->setAttributeFilter($attribute->getId());
 
+        $visibility = [
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH,
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        ];
+
         $firstOption = $selectOptions->getFirstItem();
         $firstOptionId = $firstOption->getId();
         $this->requestBuilder->bind('test_configurable', $firstOptionId);
+        $this->requestBuilder->bind('visibility', $visibility);
         $this->requestBuilder->setRequestName('filter_out_of_stock_child');
 
         $queryResponse = $this->executeQuery();
@@ -545,6 +552,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
         $secondOption = $selectOptions->getLastItem();
         $secondOptionId = $secondOption->getId();
         $this->requestBuilder->bind('test_configurable', $secondOptionId);
+        $this->requestBuilder->bind('visibility', $visibility);
         $this->requestBuilder->setRequestName('filter_out_of_stock_child');
 
         $queryResponse = $this->executeQuery();
@@ -553,7 +561,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
 
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testAdvancedSearchCompositeProductWithDisabledChild()
     {
@@ -587,7 +595,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild()
      * and affects search results.
      *
      * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
-     * @magentoConfigFixture current_store catalog/search/engine mysql
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testSearchQueryBoost()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php
index 2f30cba3d8ee6..8a7c5246f373a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php
@@ -15,8 +15,6 @@
 use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
-Bootstrap::getInstance()->reinitialize();
-
 require __DIR__ . '/configurable_attribute.php';
 
 /** @var ProductRepositoryInterface $productRepository */
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 af3dbd121447a..106bb5ad43412 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/Search/_files/requests.xml b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml
index 70f9ac75b07f3..dcf3cd582507c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml
@@ -394,13 +394,18 @@
         <queries>
             <query xsi:type="boolQuery" name="filter_out_of_stock_child" boost="1">
                 <queryReference clause="must" ref="test_configurable"/>
+                <queryReference clause="must" ref="visibility"/>
             </query>
             <query xsi:type="filteredQuery" name="test_configurable">
                 <filterReference clause="must" ref="test_configurable_filter"/>
             </query>
+            <query xsi:type="filteredQuery" name="visibility">
+                <filterReference clause="must" ref="visibility_filter"/>
+            </query>
         </queries>
         <filters>
             <filter xsi:type="termFilter" name="test_configurable_filter" field="test_configurable" value="$test_configurable$"/>
+            <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/>
         </filters>
         <aggregations/>
         <from>0</from>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php
index b672fbe9f8cec..3902e78d1fb55 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php
@@ -7,18 +7,8 @@
  */
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Magento\Catalog\Model\Product\Type;
-use Magento\Catalog\Model\Product\Visibility;
-use Magento\Catalog\Setup\CategorySetup;
-use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
-Bootstrap::getInstance()->reinitialize();
-
 $objectManager = Bootstrap::getObjectManager();
 
 /** @var ProductRepositoryInterface $productRepository */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
index 629089ae4d99e..cab2d316b9f04 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -3,309 +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;
-
-    protected function setUp()
-    {
-        $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();
-        }
-        $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-
-        $this->deploymentConfigMock->expects($this->at(0))
-            ->method('get')
-            ->with(Config::PARAM_SESSION_SAVE_PATH)
-            ->will($this->returnValue(null));
-        $this->deploymentConfigMock->expects($this->at(1))
-            ->method('get')
-            ->with(Config::PARAM_SESSION_CACHE_LIMITER)
-            ->will($this->returnValue($this->_cacheLimiter));
-
-        $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);
-    }
+    // @codingStandardsIgnoreEnd
 
     /**
-     * @magentoAppIsolation enabled
-     */
-    public function testDefaultConfiguration()
-    {
-        /** @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'));
-    }
-
-    /**
-     * Unable to add integration tests for testGetLifetimePathNonDefault
+     * Mock ini_get global function
      *
-     * Error: Cannot modify header information - headers already sent
+     * @return string
      */
-    public function testGetLifetimePathNonDefault()
-    {
-    }
-
-    public function testSetOptionsInvalidValue()
+    function ini_get($varName)
     {
-        $preValue = $this->_model->getOptions();
-        $this->_model->setOptions('');
-        $this->assertEquals($preValue, $this->_model->getOptions());
+        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;
+        }
+        return call_user_func_array('\ini_get', func_get_args());
     }
 
     /**
-     * @dataProvider optionsProvider
+     * @magentoAppIsolation enabled
      */
-    public function testSetOptions($option, $getter, $value)
-    {
-        $options = [$option => $value];
-        $this->_model->setOptions($options);
-        $this->assertSame($value, $this->_model->{$getter}());
-    }
-
-    public function optionsProvider()
+    class ConfigTest extends \PHPUnit\Framework\TestCase
     {
-        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']
-        ];
-    }
+        /** @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 testNameIsMutable()
-    {
-        $this->_model->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', $this->_model->getName());
-    }
+        /**
+         * @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'));
+        }
 
-    public function testCookieLifetimeIsMutable()
-    {
-        $this->_model->setCookieLifetime(20);
-        $this->assertEquals(20, $this->_model->getCookieLifetime());
-    }
+        public function testSetOptionsInvalidValue()
+        {
+            $model = $this->getModel();
+            $preValue = $model->getOptions();
+            $model->setOptions('');
+            $this->assertEquals($preValue, $model->getOptions());
+        }
 
-    public function testCookieLifetimeCanBeZero()
-    {
-        $this->_model->setCookieLifetime(0);
-        $this->assertEquals(0, $this->_model->getCookieLifetime());
-    }
+        /**
+         * @dataProvider optionsProvider
+         */
+        public function testSetOptions($option, $getter, $value)
+        {
+            $model = $this->getModel();
+            $options = [$option => $value];
+            $model->setOptions($options);
+            $this->assertSame($value, $model->{$getter}());
+        }
 
-    public function testSettingInvalidCookieLifetime()
-    {
-        $preVal = $this->_model->getCookieLifetime();
-        $this->_model->setCookieLifetime('foobar_bogus');
-        $this->assertEquals($preVal, $this->_model->getCookieLifetime());
-    }
+        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 testSettingInvalidCookieLifetime2()
-    {
-        $preVal = $this->_model->getCookieLifetime();
-        $this->_model->setCookieLifetime(-1);
-        $this->assertEquals($preVal, $this->_model->getCookieLifetime());
-    }
+        public function testNameIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setName('FOOBAR');
+            $this->assertEquals('FOOBAR', $model->getName());
+        }
 
-    public function testWrongMethodCall()
-    {
-        $this->expectException(
-            '\BadMethodCallException',
-            'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
-        );
-        $this->_model->methodThatNotExist();
-    }
+        public function testCookieLifetimeIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setCookieLifetime(20);
+            $this->assertEquals(20, $model->getCookieLifetime());
+        }
 
-    public function testCookieSecureDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.cookie_secure'), $this->_model->getCookieSecure());
-    }
+        public function testCookieLifetimeCanBeZero()
+        {
+            $model = $this->getModel();
+            $model->setCookieLifetime(0);
+            $this->assertEquals(0, $model->getCookieLifetime());
+        }
 
-    public function testSetCookieSecureInOptions()
-    {
-        $this->_model->setCookieSecure(true);
-        $this->assertTrue($this->_model->getCookieSecure());
-    }
+        public function testSettingInvalidCookieLifetime()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieLifetime();
+            $model->setCookieLifetime('foobar_bogus');
+            $this->assertEquals($preVal, $model->getCookieLifetime());
+        }
+      
+        public function testSettingInvalidCookieLifetime2()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieLifetime();
+            $model->setCookieLifetime(-1);
+            $this->assertEquals($preVal, $model->getCookieLifetime());
+        }
 
-    public function testCookieDomainIsMutable()
-    {
-        $this->_model->setCookieDomain('example.com');
-        $this->assertEquals('example.com', $this->_model->getCookieDomain());
-    }
+        public function testWrongMethodCall()
+        {
+            $model = $this->getModel();
+            $this->expectException(
+                '\BadMethodCallException',
+                'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
+            );
+            $model->methodThatNotExist();
+        }
 
-    public function testCookieDomainCanBeEmpty()
-    {
-        $this->_model->setCookieDomain('');
-        $this->assertEquals('', $this->_model->getCookieDomain());
-    }
+        public function testCookieSecureDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame((bool)ini_get('session.cookie_secure'), $model->getCookieSecure());
+        }
 
-    public function testSettingInvalidCookieDomain()
-    {
-        $preVal = $this->_model->getCookieDomain();
-        $this->_model->setCookieDomain(24);
-        $this->assertEquals($preVal, $this->_model->getCookieDomain());
-    }
+        public function testSetCookieSecureInOptions()
+        {
+            $model = $this->getModel();
+            $model->setCookieSecure(true);
+            $this->assertTrue($model->getCookieSecure());
+        }
 
-    public function testSettingInvalidCookieDomain2()
-    {
-        $preVal = $this->_model->getCookieDomain();
-        $this->_model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
-        $this->assertEquals($preVal, $this->_model->getCookieDomain());
-    }
+        public function testCookieDomainIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setCookieDomain('example.com');
+            $this->assertEquals('example.com', $model->getCookieDomain());
+        }
 
-    public function testSetCookieHttpOnlyInOptions()
-    {
-        $this->_model->setCookieHttpOnly(true);
-        $this->assertTrue($this->_model->getCookieHttpOnly());
-    }
+        public function testCookieDomainCanBeEmpty()
+        {
+            $model = $this->getModel();
+            $model->setCookieDomain('');
+            $this->assertEquals('', $model->getCookieDomain());
+        }
 
-    public function testUseCookiesDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.use_cookies'), $this->_model->getUseCookies());
-    }
+        public function testSettingInvalidCookieDomain()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieDomain();
+            $model->setCookieDomain(24);
+            $this->assertEquals($preVal, $model->getCookieDomain());
+        }
 
-    public function testSetUseCookiesInOptions()
-    {
-        $this->_model->setUseCookies(true);
-        $this->assertTrue($this->_model->getUseCookies());
-    }
+        public function testSettingInvalidCookieDomain2()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieDomain();
+            $model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
+            $this->assertEquals($preVal, $model->getCookieDomain());
+        }
 
-    public function testUseOnlyCookiesDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.use_only_cookies'), $this->_model->getUseOnlyCookies());
-    }
+        public function testSetCookieHttpOnlyInOptions()
+        {
+            $model = $this->getModel();
+            $model->setCookieHttpOnly(true);
+            $this->assertTrue($model->getCookieHttpOnly());
+        }
 
-    public function testSetUseOnlyCookiesInOptions()
-    {
-        $this->_model->setOption('use_only_cookies', true);
-        $this->assertTrue((bool)$this->_model->getOption('use_only_cookies'));
-    }
+        public function testUseCookiesDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame((bool)ini_get('session.use_cookies'), $model->getUseCookies());
+        }
 
-    public function testRefererCheckDefaultsToIniSettings()
-    {
-        $this->assertSame(ini_get('session.referer_check'), $this->_model->getRefererCheck());
-    }
+        public function testSetUseCookiesInOptions()
+        {
+            $model = $this->getModel();
+            $model->setUseCookies(true);
+            $this->assertTrue($model->getUseCookies());
+        }
 
-    public function testRefererCheckIsMutable()
-    {
-        $this->_model->setOption('referer_check', 'FOOBAR');
-        $this->assertEquals('FOOBAR', $this->_model->getOption('referer_check'));
-    }
+        public function testUseOnlyCookiesDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame((bool)ini_get('session.use_only_cookies'), $model->getUseOnlyCookies());
+        }
 
-    public function testRefererCheckMayBeEmpty()
-    {
-        $this->_model->setOption('referer_check', '');
-        $this->assertEquals('', $this->_model->getOption('referer_check'));
-    }
+        public function testSetUseOnlyCookiesInOptions()
+        {
+            $model = $this->getModel();
+            $model->setOption('use_only_cookies', true);
+            $this->assertTrue((bool)$model->getOption('use_only_cookies'));
+        }
 
-    public function testSetSavePath()
-    {
-        $this->_model->setSavePath('some_save_path');
-        $this->assertEquals($this->_model->getOption('save_path'), 'some_save_path');
-    }
+        public function testRefererCheckDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame(ini_get('session.referer_check'), $model->getRefererCheck());
+        }
 
-    /**
-     * @dataProvider savePathDataProvider
-     */
-    public function testConstructorSavePath($existing, $given, $expected)
-    {
-        $sessionSavePath = ini_get('session.save_path');
-        if ($expected === 'default') {
-            $expected = $this->defaultSavePath . '/';
+        public function testRefererCheckIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setOption('referer_check', 'FOOBAR');
+            $this->assertEquals('FOOBAR', $model->getOption('referer_check'));
         }
-        $setup = ini_set('session.save_path', $existing);
-        if ($setup === false) {
-            $this->markTestSkipped('Cannot set session.save_path with ini_set');
+
+        public function testRefererCheckMayBeEmpty()
+        {
+            $model = $this->getModel();
+            $model->setOption('referer_check', '');
+            $this->assertEquals('', $model->getOption('referer_check'));
         }
 
-        $this->deploymentConfigMock->expects($this->at(0))
-            ->method('get')
-            ->with(Config::PARAM_SESSION_SAVE_PATH)
-            ->will($this->returnValue($given));
+        public function testSetSavePath()
+        {
+            $model = $this->getModel();
+            $model->setSavePath('some_save_path');
+            $this->assertEquals($model->getOption('save_path'), 'some_save_path');
+        }
 
-        $this->_model = $this->_objectManager->create(
-            \Magento\Framework\Session\Config::class,
-            ['deploymentConfig' => $this->deploymentConfigMock]
-        );
-        $this->assertEquals($expected, $this->_model->getOption('save_path'));
+        /**
+         * @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;
+        }
 
-        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 81630b1827037..c420f6fa9dd75 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 a36da56bb4633..3205c19445ee1 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
@@ -9,6 +9,10 @@
 }
 
 namespace Magento\Framework\Session {
+
+    use Magento\Framework\App\DeploymentConfig;
+    use Magento\Framework\App\State;
+
     // @codingStandardsIgnoreEnd
 
     /**
@@ -34,30 +38,82 @@ 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\TestFramework\ObjectManager
+         */
+        private $objectManager;
+
+        /**
+         * @var \Magento\Framework\App\RequestInterface
+         */
+        private $request;
 
         /**
-         * @var \Magento\Framework\ObjectManagerInterface
+         * @var State|\PHPUnit_Framework_MockObject_MockObject
          */
-        protected $objectManager;
+        private $appState;
 
         protected function setUp()
         {
@@ -69,39 +125,45 @@ protected function setUp()
             $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
             /** @var \Magento\Framework\Session\SidResolverInterface $sidResolver */
-            $this->_sidResolver = $this->objectManager->get(\Magento\Framework\Session\SidResolverInterface::class);
-
-            $this->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->appState = $this->getMockBuilder(State::class)
+                ->setMethods(['getAreaCode'])
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            /** @var \Magento\Framework\Session\SidResolver $sidResolver */
+            $this->sidResolver = $this->objectManager->create(
+                \Magento\Framework\Session\SidResolver::class,
                 [
-                    $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)
+                    'appState' => $this->appState,
                 ]
             );
+
+            $this->request = $this->objectManager->get(\Magento\Framework\App\RequestInterface::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);
@@ -109,46 +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->_model->setSessionId($this->_sidResolver->getSid($this->_model));
-            $this->assertEquals($sessionId, $this->_model->getSessionId());
-
-            $this->_model->setSessionId('test');
-            $this->assertEquals('test', $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('test');
+            $this->assertEquals('test', $this->model->getSessionId());
         }
 
         /**
@@ -156,37 +229,43 @@ public function testSetSessionId()
          */
         public function testSetSessionIdFromParam()
         {
-            $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->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());
             /* 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();
         }
 
         /**
@@ -204,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),
@@ -218,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 5af3e52420f11..5e70eb491b50c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\State;
 use Zend\Stdlib\Parameters;
 
 class SidResolverTest extends \PHPUnit\Framework\TestCase
@@ -49,6 +50,11 @@ class SidResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $request;
 
+    /**
+     * @var State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appState;
+
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -70,6 +76,11 @@ protected function setUp()
 
         $this->request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
 
+        $this->appState = $this->getMockBuilder(State::class)
+            ->setMethods(['getAreaCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = $objectManager->create(
             \Magento\Framework\Session\SidResolver::class,
             [
@@ -77,6 +88,7 @@ protected function setUp()
                 'urlBuilder' => $this->urlBuilder,
                 'sidNameMap' => [$this->customSessionName => $this->customSessionQueryParam],
                 'request' => $this->request,
+                'appState' => $this->appState,
             ]
         );
     }
@@ -95,10 +107,14 @@ public function tearDown()
      */
     public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
     {
+        $this->appState->expects($this->atLeastOnce())
+            ->method('getAreaCode')
+            ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
+
         $this->scopeConfig->expects(
             $this->any()
         )->method(
-            'getValue'
+            'isSetFlag'
         )->with(
             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -112,6 +128,7 @@ public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
             $this->request->getQuery()->set($this->model->getSessionIdQueryParam($this->session), $testSid);
         }
         $this->assertEquals($sid, $this->model->getSid($this->session));
+        $this->assertEquals($useFrontedSid, $this->model->getUseSessionInUrl());
     }
 
     /**
@@ -137,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()
@@ -150,10 +169,42 @@ public function testSetGetUseSessionVar()
         $this->assertTrue($this->model->getUseSessionVar());
     }
 
-    public function testSetGetUseSessionInUrl()
+    /**
+     * Variations of Use SID on frontend value.
+     *
+     * @return array
+     */
+    public function dataProviderSessionInUrl()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    /**
+     * Testing "Use SID in URLs" flag.
+     * Checking that the method returns config value if not explicitly
+     * overridden.
+     *
+     * @param bool $configValue Use SID on frontend config value.
+     * @dataProvider dataProviderSessionInUrl
+     */
+    public function testSetGetUseSessionInUrl($configValue)
     {
-        $this->assertTrue($this->model->getUseSessionInUrl());
-        $this->model->setUseSessionInUrl(false);
-        $this->assertFalse($this->model->getUseSessionInUrl());
+        $this->scopeConfig->expects(
+            $this->any()
+        )->method(
+            'isSetFlag'
+        )->with(
+            \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        )->will(
+            $this->returnValue($configValue)
+        );
+
+        $this->assertEquals($configValue, $this->model->getUseSessionInUrl());
+        $this->model->setUseSessionInUrl(!$configValue);
+        $this->assertEquals(!$configValue, $this->model->getUseSessionInUrl());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DateTimeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DateTimeTest.php
index 69c63c84388ef..6a0b9582f0621 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DateTimeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DateTimeTest.php
@@ -70,9 +70,15 @@ public function localeDatetimeFilterProvider()
             ['fr_FR', '01/02/2010 15:30', '2010-02-01 15:30:00'],
             ['fr_FR', '01/02/2010 1:00', '2010-02-01 01:00:00'],
             ['fr_FR', '01/02/2010 01:00', '2010-02-01 01:00:00'],
+            ['en_US', '11/28/2010', '2010-11-28 00:00:00'],
+            ['en_US', '11/28/2010 1:00am', '2010-11-28 01:00:00'],
+            ['en_US', '11/28/2010 01:00am', '2010-11-28 01:00:00'],
+            ['es_ES', '28/11/2010', '2010-11-28 00:00:00'],
+            ['es_ES', '28/11/2010 23:12:00', '2010-11-28 23:12:00'],
+            ['es_ES', '28/11/2010 23:12', '2010-11-28 23:12:00'],
             ['de_DE', '01/02/2010 15:30', '2010-02-01 15:30:00'],
             ['en_US', '2017-09-01T15:30:00.000Z', '2017-09-01 15:30:00'],
-            ['fr_FR', '2017-09-01T15:30:00.000Z', '2017-09-01 15:30:00'],
+            ['fr_FR', '2017-09-01T15:30:00.000Z', '2017-09-01 15:30:00']
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
index b05d98133980b..f1f65ec2ada80 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
@@ -48,7 +48,7 @@ public function testLoadDataCaching()
         /** @var \Magento\Framework\Translate $model */
         $model = $this->objectManager->get(\Magento\Framework\Translate::class);
 
-        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND); // this is supposed to cache the fixture
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true); // this is supposed to cache the fixture
         $this->assertEquals('Fixture Db Translation', new Phrase('Fixture String'));
 
         /** @var \Magento\Translation\Model\ResourceModel\StringUtils $translateString */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 73e6fba8276c7..6d820575896e4 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/Framework/View/Design/Fallback/RulePoolTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php
index 1500c91478a4a..c586c68b74573 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php
@@ -74,7 +74,8 @@ public function testGetRuleUnsupportedType()
      */
     public function testGetPatternDirsException($type, array $overriddenParams, $expectedErrorMessage)
     {
-        $this->expectException('InvalidArgumentException', $expectedErrorMessage);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedErrorMessage);
         $params = $overriddenParams + $this->defaultParams;
         $this->model->getRule($type)->getPatternDirs($params);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php
index 7040407cedef7..fde592aec9917 100755
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View;
 
 use Magento\Framework\App\State;
@@ -81,13 +82,16 @@ public function testRenderElement()
 
     /**
      * @expectedException \OutOfBoundsException
-     * @expectedExceptionMessage No element found with ID 'nonexisting_element'
      * @magentoAppIsolation enabled
      */
     public function testRenderNonExistentElementShouldThrowException()
     {
         $layout = $this->_getLayoutModel('render.xml');
         $this->assertEmpty($layout->renderElement('nonexisting_element'));
+
+        $this->expectExceptionMessage(
+            'The element with the "nonexisting_element" ID wasn\'t found. Verify the ID and try again.'
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
index c014b517f6463..66e8eb3e453f9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
@@ -275,7 +275,8 @@ public function testAddContainerInvalidHtmlTag()
         $msg = 'Html tag "span" is forbidden for usage in containers. ' .
             'Consider to use one of the allowed: aside, dd, div, dl, fieldset, main, nav, ' .
             'header, footer, ol, p, section, table, tfoot, ul.';
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $msg);
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage($msg);
         $this->_layout->addContainer('container', 'Container', ['htmlTag' => 'span']);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css
index b29e2c0fd9b88..e079dd3715e4f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css
@@ -13,7 +13,7 @@
     overflow: hidden;
     padding: 5px 6px 3px;
     margin-left: 12px;
-    color: #7a7976;;
+    color: #7a7976;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:hover,
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
index 18501ecfbbfbf..8e50fe1888104 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
@@ -9,17 +9,17 @@
     <block class="Magento\Framework\View\Element\Text" name="block1">
         <block class="Magento\Framework\View\Element\Text" name="block2" group="group1">
             <arguments>
-                <argument xsi:type="string" name="text">blok2</argument>
+                <argument xsi:type="string" name="text">block2</argument>
             </arguments>
         </block>
         <block class="Magento\Framework\View\Element\Text" name="block3" group="group1" >
             <arguments>
-                <argument xsi:type="string" name="text">blok3</argument>
+                <argument xsi:type="string" name="text">block3</argument>
             </arguments>
         </block>
         <block class="Magento\Framework\View\Element\Text" name="block4">
             <arguments>
-                <argument xsi:type="string" name="text">blok4</argument>
+                <argument xsi:type="string" name="text">block4</argument>
             </arguments>
         </block>
         </block>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css b/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css
index 99c21441f9dbc..7bb283e0b3514 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css
@@ -1 +1 @@
-table>caption{margin-bottom:5px}table thead{background:#676056;color:#f7f3eb}table thead .headings{background:#807a6e}table thead a{color:#f7f3eb;display:block}table thead a label{color:#f7f3eb;cursor:pointer;display:block}table thead a:hover,table thead a:focus{color:#dac7a2;text-decoration:none}table tfoot{background:#f2ebde;color:#676056}table tfoot tr th,table tfoot tr td{text-align:left}table th{background:0 0;border:solid #cac3b4;border-width:0 1px;font-size:14px;padding:6px 10px;text-align:center}table td{border:solid #cac3b4;border-width:0 1px;padding:6px 10px 7px;vertical-align:top}table tbody tr td{background:#fff;color:#676056;padding-top:12px}table tbody tr td:first-child{border-left:0}table tbody tr td:first-child input[type=checkbox]{margin:0}table tbody tr td:last-child{border-right:0}table tbody tr:last-child th,table tbody tr:last-child td{border-bottom-width:1px}table tbody tr:nth-child(odd) td,table tbody tr:nth-child(odd) th{background-color:#f7f3eb}table tbody.even tr td{background:#fff}table tbody.odd tr td{background:#f7f3eb}table .dropdown-menu li{padding:7px 15px;line-height:14px;cursor:pointer}table .col-draggable .draggable-handle{float:left;position:relative;top:0}.not-sort{padding-right:10px}.sort-arrow-asc,.sort-arrow-desc{padding-right:10px;position:relative}.sort-arrow-asc:after,.sort-arrow-desc:after{right:-11px;top:-1px;position:absolute;width:23px}.sort-arrow-asc:hover:after,.sort-arrow-desc:hover:after{color:#dac7a2}.sort-arrow-asc{display:inline-block;text-decoration:none}.sort-arrow-asc:after{font-family:'icons-blank-theme';content:'\e626';font-size:13px;line-height:inherit;color:#f7f3eb;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.sort-arrow-asc:hover:after{color:#dac7a2}.sort-arrow-desc{display:inline-block;text-decoration:none}.sort-arrow-desc:after{font-family:'icons-blank-theme';content:'\e623';font-size:13px;line-height:inherit;color:#f7f3eb;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.sort-arrow-desc:hover:after{color:#dac7a2}.grid-actions .input-text,.pager .input-text,.massaction .input-text,.filter .input-text,.grid-actions select,.pager select,.massaction select,.filter select,.grid-actions .select,.pager .select,.massaction .select,.filter .select{border-color:#989287;box-shadow:none;border-radius:1px;height:28px;margin:0 10px 0 0}.filter th{border:0 solid #676056;padding:6px 3px;vertical-align:top}.filter .ui-datepicker-trigger{cursor:pointer;margin-top:2px}.filter .input-text{padding:0 5px}.filter .range-line:not(:last-child){margin-bottom:5px}.filter .date{padding-right:28px;position:relative;display:inline-block;text-decoration:none}.filter .date .hasDatepicker{vertical-align:top;width:99%}.filter .date img{cursor:pointer;height:25px;width:25px;right:0;position:absolute;vertical-align:middle;z-index:2;opacity:0}.filter .date:before{font-family:'icons-blank-theme';content:'\e612';font-size:42px;line-height:30px;color:#f7f3eb;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.filter .date:hover:before{color:#dac7a2}.filter .date:before{height:29px;margin-left:5px;position:absolute;right:-3px;top:-3px;width:35px}.filter select{border-color:#cac3b4;margin:0;padding:0;width:99%}.filter input.input-text{border-color:#cac3b4;margin:0;width:99%}.filter input.input-text::-webkit-input-placeholder{color:#989287 !important;text-transform:lowercase}.filter input.input-text::-moz-placeholder{color:#989287 !important;text-transform:lowercase}.filter input.input-text:-moz-placeholder{color:#989287 !important;text-transform:lowercase}.filter input.input-text:-ms-input-placeholder{color:#989287 !important;text-transform:lowercase}.grid{background:#fff;color:#676056;font-size:13px;font-weight:400;padding:15px}.grid table{width:100%}.grid tbody tr.selected th,.grid tbody tr.selected td,.grid tbody tr:hover th,.grid tbody tr:hover td,.grid tbody tr:nth-child(odd):hover th,.grid tbody tr:nth-child(odd):hover td{background-color:#f2ebde;cursor:pointer}.grid tbody tr.selected th.empty-text,.grid tbody tr.selected td.empty-text,.grid tbody tr:hover th.empty-text,.grid tbody tr:hover td.empty-text,.grid tbody tr:nth-child(odd):hover th.empty-text,.grid tbody tr:nth-child(odd):hover td.empty-text{background-color:#f7f3eb;cursor:default}.grid .empty-text{font:400 20px/1.2 'Open Sans',sans-serif;text-align:center;white-space:nowrap}.grid .col-sku{max-width:100px;width:100px}.grid .col-select,.grid .col-massaction{text-align:center}.grid .editable .input-text{width:65px}.grid .col-actions .action-select{background:#fff;border-color:#989287;height:28px;margin:0;padding:4px 4px 5px;width:80px}.grid .col-position.editable{white-space:nowrap}.grid .col-position.editable .input-text{margin:-7px 5px 0;width:70%}.eq-ie9 .hor-scroll{display:inline-block;min-height:0;overflow-y:hidden;overflow-x:auto;width:100%}.data-table{border-collapse:separate;width:100%}.data-table thead,.data-table tfoot,.data-table th,.accordion .config .data-table thead th,.accordion .config .data-table tfoot td,.accordion .config .accordion .config .data-table tfoot td th{background:#fff;color:#676056;font-size:13px;font-weight:600}.data-table th{text-align:left}.data-table thead th,.accordion .config .data-table thead th th,.accordion .config .data-table tfoot td th,.accordion .config .accordion .config .data-table tfoot td th th{border:solid #c9c2b8;border-width:0 0 1px;padding:7px}.data-table td,.data-table tbody tr th,.data-table tbody tr td,.accordion .config .data-table td{background:#fff;border-width:0;padding:5px 7px;vertical-align:middle}.data-table tbody tr:nth-child(odd) th,.data-table tbody tr:nth-child(odd) td,.accordion .config .data-table tbody tr:nth-child(odd) td{background:#fbfaf6}.data-table tbody.odd tr th,.data-table tbody.odd tr td{background:#fbfaf6}.data-table tbody.even tr th,.data-table tbody.even tr td{background:#fff}.data-table tfoot tr:last-child th,.data-table tfoot tr:last-child td,.data-table .accordion .config .data-table tfoot tr:last-child td{border:0}.data-table.order-tables tbody td{vertical-align:top}.data-table.order-tables tbody:hover tr th,.data-table.order-tables tbody:hover tr td{background:#f7f3eb}.data-table.order-tables tfoot td{background:#f2ebde;color:#676056;font-size:13px;font-weight:600}.data-table input[type=text]{width:98%;padding-left:1%;padding-right:1%}.data-table select{margin:0;box-sizing:border-box}.data-table .col-actions .actions-split{margin-top:4px}.data-table .col-actions .actions-split [class^=action-]{background:0 0;border:1px solid #c8c3b5;padding:3px 5px;color:#bbb3a6;font-size:12px}.data-table .col-actions .actions-split [class^=action-]:first-child{border-right:0}.data-table .col-actions .actions-split .dropdown-menu{margin-top:-1px}.data-table .col-actions .actions-split .dropdown-menu a{display:block;color:#333;text-decoration:none}.data-table .col-actions .actions-split.active .action-toggle{position:relative;border-bottom-right-radius:0;box-shadow:none;background:#fff}.data-table .col-actions .actions-split.active .action-toggle:after{position:absolute;top:100%;left:0;right:0;height:2px;margin-top:-1px;background:#fff;content:'';z-index:2}.data-table .col-actions .actions-split.active .action-toggle .dropdown-menu{border-top-right-radius:0}.data-table .col-default{white-space:nowrap;text-align:center;vertical-align:middle}.data-table .col-delete{text-align:center;width:32px}.data-table .col-file{white-space:nowrap}.data-table .col-file input,.data-table .col-file .input-text{margin:0 5px;width:40%}.data-table .col-file input:first-child,.data-table .col-file .input-text:first-child{margin-left:0}.data-table .col-actions-add{padding:10px 0}.grid-actions{background:#fff;font-size:13px;line-height:28px;padding:10px 15px;position:relative}.grid-actions+.grid{padding-top:5px}.grid-actions .export,.grid-actions .filter-actions{float:right;margin-left:10px;vertical-align:top}.grid-actions .import{display:block;vertical-align:top}.grid-actions .action-reset{background:0 0;border:0;display:inline;line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;margin:6px 10px 0 0;vertical-align:top}.grid-actions .action-reset:visited{color:purple;text-decoration:none}.grid-actions .action-reset:hover{color:#006bb4;text-decoration:underline}.grid-actions .action-reset:active{color:#ff5501;text-decoration:underline}.grid-actions .action-reset:hover{color:#006bb4}.grid-actions .action-reset:hover,.grid-actions .action-reset:active,.grid-actions .action-reset:focus{background:0 0;border:0}.grid-actions .action-reset.disabled,.grid-actions .action-reset[disabled],fieldset[disabled] .grid-actions .action-reset{color:#1979c3;text-decoration:underline;cursor:default;pointer-events:none;opacity:.5}.grid-actions .import .label,.grid-actions .export .label,.massaction>.entry-edit .label{margin:0 14px 0 0;vertical-align:inherit}.grid-actions .import .action-,.grid-actions .export .action-,.grid-actions .filter-actions .action-,.massaction>.entry-edit .action-{vertical-align:inherit}.grid-actions .filter .date{float:left;margin:0 15px 0 0;position:relative}.grid-actions .filter .date:before{color:#676056;top:1px}.grid-actions .filter .date:hover:before{color:#31302b}.grid-actions .filter .label{margin:0}.grid-actions .filter .hasDatepicker{margin:0 5px;width:80px}.grid-actions .filter .show-by .select{margin-left:5px;padding:4px 4px 5px;vertical-align:top;width:auto}.grid-actions .filter.required:after{content:''}.grid-actions img{vertical-align:middle;height:22px;width:22px}.grid-actions .validation-advice{background:#f9d4d4;border:1px solid #e22626;border-radius:3px;color:#e22626;margin:5px 0 0;padding:3px 7px;position:absolute;white-space:nowrap;z-index:5}.grid-actions .validation-advice:before{width:0;height:0;border:5px solid transparent;border-bottom-color:#e22626;content:'';left:50%;margin-left:-5px;position:absolute;top:-11px}.grid-actions input[type=text].validation-failed{border-color:#e22626;box-shadow:0 0 8px rgba(226,38,38,.6)}.grid-actions .link-feed{white-space:nowrap}.pager{font-size:13px}.grid .pager{margin:15px 0 0;position:relative;text-align:center}.pager .pages-total-found{margin-right:25px}.pager .view-pages .select{margin:0 5px}.pager .link-feed{font-size:12px;margin:7px 15px 0 0;position:absolute;right:0;top:0}.pager .action-previous,.pager .action-next{background:0 0;border:0;display:inline;line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;line-height:.6;overflow:hidden;width:20px}.pager .action-previous:visited,.pager .action-next:visited{color:purple;text-decoration:none}.pager .action-previous:hover,.pager .action-next:hover{color:#006bb4;text-decoration:underline}.pager .action-previous:active,.pager .action-next:active{color:#ff5501;text-decoration:underline}.pager .action-previous:hover,.pager .action-next:hover{color:#006bb4}.pager .action-previous:hover,.pager .action-next:hover,.pager .action-previous:active,.pager .action-next:active,.pager .action-previous:focus,.pager .action-next:focus{background:0 0;border:0}.pager .action-previous.disabled,.pager .action-next.disabled,.pager .action-previous[disabled],.pager .action-next[disabled],fieldset[disabled] .pager .action-previous,fieldset[disabled] .pager .action-next{color:#1979c3;text-decoration:underline;cursor:default;pointer-events:none;opacity:.5}.pager .action-previous:before,.pager .action-next:before{margin-left:-10px}.pager .action-previous.disabled,.pager .action-next.disabled{opacity:.3}.pager .action-previous{display:inline-block;text-decoration:none}.pager .action-previous>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pager .action-previous>span.focusable:active,.pager .action-previous>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-previous>span.focusable:active,.pager .action-previous>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:40px;line-height:inherit;color:#026294;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.pager .action-previous:hover:before{color:#007dbd}.pager .action-next{display:inline-block;text-decoration:none}.pager .action-next>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pager .action-next>span.focusable:active,.pager .action-next>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-next>span.focusable:active,.pager .action-next>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-next:before{font-family:'icons-blank-theme';content:'\e608';font-size:40px;line-height:inherit;color:#026294;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.pager .action-next:hover:before{color:#007dbd}.pager .input-text{height:25px;line-height:16px;margin-right:5px;text-align:center;width:25px;vertical-align:top}.pager .pages-total{line-height:25px;vertical-align:top}.massaction{background:#fff;border-top:1px solid #f2ebde;font-size:13px;line-height:28px;padding:15px 15px 0}.massaction>.entry-edit{float:right}.massaction>.entry-edit .field-row{display:inline-block;vertical-align:top}.massaction>.entry-edit .validation-advice{display:none !important}.massaction>.entry-edit .form-inline{display:inline-block}.massaction>.entry-edit .label{padding:0;width:auto}.massaction>.entry-edit .action-{vertical-align:top}.massaction .select.validation-failed{border:1px dashed #e22626;background:#f9d4d4}.grid-severity-critical,.grid-severity-major,.grid-severity-notice,.grid-severity-minor{background:#feeee1;border:1px solid #ed4f2e;color:#ed4f2e;display:block;padding:0 3px;font-weight:700;line-height:17px;text-transform:uppercase;text-align:center}.grid-severity-critical,.grid-severity-major{border-color:#e22626;background:#f9d4d4;color:#e22626}.grid-severity-notice{border-color:#5b8116;background:#d0e5a9;color:#185b00}.grid tbody td input[type=text],.data-table tbody td input[type=text],.grid tbody th input[type=text],.data-table tbody th input[type=text],.grid tbody td .input-text,.data-table tbody td .input-text,.grid tbody th .input-text,.data-table tbody th .input-text,.grid tbody td select,.data-table tbody td select,.grid tbody th select,.data-table tbody th select,.grid tbody td .select,.data-table tbody td .select,.grid tbody th .select,.data-table tbody th .select{width:99%}.ui-tabs-panel .grid .col-sku{max-width:150px;width:150px}.col-indexer_status,.col-indexer_mode{width:160px}.fieldset-wrapper .grid-actions+.grid{padding-top:15px}.fieldset-wrapper .grid-actions{padding:10px 0 0}.fieldset-wrapper .grid{padding:0}.fieldset-wrapper .massaction{padding:0;border-top:none;margin-bottom:15px}.accordion .grid{padding:0}.ui-dialog-content .grid-actions,.ui-dialog-content .grid{padding-left:0;padding-right:0}.qty-table td{border:0;padding:0 5px 3px}.sales-order-create-index .sales-order-create-index .grid table .action-configure{float:right}.sales-order-create-index .data-table .border td{padding-bottom:15px}.sales-order-create-index .actions.update{margin:10px 0}.adminhtml-order-shipment-new .grid .col-product{max-width:770px;width:770px}.customer-index-index .grid .col-name{max-width:90px;width:90px}.customer-index-index .grid .col-billing_region{width:70px}.adminhtml-cms-hierarchy-index .col-title,.adminhtml-cms-hierarchy-index .col-identifier{max-width:410px;width:410px}.adminhtml-widget-instance-edit .grid-chooser .control{margin-top:-19px;width:80%}.eq-ie9 .adminhtml-widget-instance-edit .grid-chooser .control{margin-top:-18px}.adminhtml-widget-instance-edit .grid-chooser .control .grid-actions{padding:0 0 15px}.adminhtml-widget-instance-edit .grid-chooser .control .grid{padding:0}.adminhtml-widget-instance-edit .grid-chooser .control .addon input:last-child,.adminhtml-widget-instance-edit .grid-chooser .control .addon select:last-child{border-radius:0}.reports-report-product-sold .grid .col-name{max-width:720px;width:720px}.adminhtml-system-store-index .grid td{max-width:310px}.adminhtml-system-currency-index .grid{padding-top:0}.adminhtml-system-currency-index .col-currency-edit-rate{min-width:40px}.adminhtml-system-currency-index .col-base-currency{font-weight:700}.adminhtml-system-currency-index .old-rate{display:block;margin-top:3px;text-align:center}.adminhtml-system-currency-index .hor-scroll{overflow-x:auto;min-width:970px}.adminhtml-system-currencysymbol-index .col-currency{width:35%}.adminhtml-system-currencysymbol-index .grid .input-text{margin:0 10px 0 0;width:50%}.catalog-product-set-index .col-set_name{max-width:930px;width:930px}.adminhtml-export-index .grid td{vertical-align:middle}.adminhtml-export-index .grid .input-text-range{margin:0 10px 0 5px;width:37%}.adminhtml-export-index .grid .input-text-range-date{margin:0 5px;width:32%}.adminhtml-export-index .ui-datepicker-trigger{display:inline-block;margin:-3px 10px 0 0;vertical-align:middle}.adminhtml-notification-index .grid .col-select,.adminhtml-cache-index .grid .col-select,.adminhtml-process-list .grid .col-select,.indexer-indexer-list .grid .col-select{width:10px}@font-face{font-family:'icons-blank-theme';src:url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');src:url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg#icons-blank-theme') format('svg');font-weight:400;font-style:normal}@font-face{font-family:'icons-blank-theme';src:url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');src:url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype');font-weight:400;font-style:normal}.navigation{background-color:#676056;position:relative;z-index:5}.navigation .level-0.reverse>.submenu{right:1px}.navigation>ul{position:relative;text-align:right}.navigation .level-0>.submenu{display:none;position:absolute;top:100%;padding:19px 13px}.navigation .level-0>.submenu a{display:block;color:#676056;font-size:13px;font-weight:400;line-height:1.385;padding:3px 12px 3px;text-decoration:none}.navigation .level-0>.submenu a:focus,.navigation .level-0>.submenu a:hover{text-decoration:underline}.navigation .level-0>.submenu a:hover{color:#fff;background:#989287;text-decoration:none}.navigation .level-0>.submenu li{margin-bottom:1px}.navigation .level-0>.submenu a[href="#"]{cursor:default;display:block;color:#676056;font-size:14px;font-weight:700;line-height:1;margin:7px 0 6px;padding:0 12px}.navigation .level-0>.submenu a[href="#"]:focus,.navigation .level-0>.submenu a[href="#"]:hover{color:#676056;font-size:14px;font-weight:700;background:0 0;text-decoration:none}.navigation .level-0{display:inline-block;float:left;text-align:left;transition:display .15s ease-out}.navigation .level-0>a{background:0 0;display:block;padding:12px 13px 0;color:#f2ebde;font-size:13px;font-weight:600;text-transform:uppercase;text-decoration:none;transition:background .15s ease-out}.navigation .level-0>a:after{content:"";display:block;margin-top:10px;height:3px;font-size:0}.navigation .level-0.active>a{font-weight:700}.navigation .level-0.active>a:after{background:#ef672f}.navigation .level-0.hover.recent>a{background:#fff;color:#676056;font-size:13px;font-weight:600}.navigation .level-0.hover.recent>a:after{background:0 0}.navigation .level-0.hover.recent.active>a{font-weight:700}.navigation .level-0>.submenu{opacity:0;visibility:hidden}.navigation .level-0.recent.hover>.submenu{opacity:1;visibility:visible}.no-js .navigation .level-0:hover>.submenu,.no-js .navigation .level-0.hover>.submenu,.no-js .navigation .level-0>a:focus+.submenu{display:block}.navigation .level-0>.submenu{background:#fff;box-shadow:0 3px 3px rgba(50,50,50,.15)}.navigation .level-0>.submenu li{max-width:200px}.navigation .level-0>.submenu>ul{white-space:nowrap}.navigation .level-0>.submenu .column{display:inline-block;margin-left:40px;vertical-align:top}.navigation .level-0>.submenu .column:first-child{margin-left:0}.navigation .level-0 .submenu .level-1{white-space:normal}.navigation .level-0.parent .submenu .level-1.parent{margin:17px 0 25px}.navigation .level-0.parent .level-1.parent:first-child{margin-top:0}.navigation .level-2 .submenu{margin-left:7px}.navigation .level-0>.submenu .level-2>a[href="#"]{font-size:13px;margin-top:10px;margin-left:7px}.navigation .level-2>.submenu a{font-size:12px;line-height:1.231}.navigation .level-0>.submenu .level-3>a[href="#"],.navigation .level-3 .submenu{margin-left:15px}.navigation .level-0.item-system,.navigation .level-0.item-stores{float:none}.navigation .level-0.item-system>.submenu,.navigation .level-0.item-stores>.submenu{left:auto;right:1px}.adminhtml-dashboard-index .col-1-layout{max-width:1300px;border:none;border-radius:0;padding:0;background:#f7f3eb}.dashboard-inner{padding-top:35px}.dashboard-inner:before,.dashboard-inner:after{content:"";display:table}.dashboard-inner:after{clear:both}.dashboard-inner:before,.dashboard-inner:after{content:"";display:table}.dashboard-inner:after{clear:both}.dashboard-secondary{float:left;width:32%;margin:0 1.5%}.dashboard-main{float:right;width:65%}.dashboard-diagram-chart{max-width:100%;height:auto}.dashboard-diagram-nodata,.dashboard-diagram-switcher{padding:20px 0}.dashboard-diagram-image{background:#fff url(../mui/images/ajax-loader-small.gif) no-repeat 50% 50%}.dashboard-container .ui-tabs-panel{background-color:#fff;min-height:40px;padding:15px}.dashboard-store-stats{margin-top:35px}.dashboard-store-stats .ui-tabs-panel{background:#fff url(../mui/images/ajax-loader-small.gif) no-repeat 50% 50%}.dashboard-item{margin-bottom:30px}.dashboard-item-header{margin-left:5px}.dashboard-item.dashboard-item-primary{margin-bottom:35px}.dashboard-item.dashboard-item-primary .title{font-size:22px;margin-bottom:5px}.dashboard-item.dashboard-item-primary .dashboard-sales-value{display:block;text-align:right;font-weight:600;font-size:30px;margin-right:12px;padding-bottom:5px}.dashboard-item.dashboard-item-primary:first-child{color:#ef672f}.dashboard-item.dashboard-item-primary:first-child .title{color:#ef672f}.dashboard-totals{background:#fff;padding:50px 15px 25px}.dashboard-totals-list{margin:0;padding:0;list-style:none none}.dashboard-totals-list:before,.dashboard-totals-list:after{content:"";display:table}.dashboard-totals-list:after{clear:both}.dashboard-totals-list:before,.dashboard-totals-list:after{content:"";display:table}.dashboard-totals-list:after{clear:both}.dashboard-totals-item{float:left;width:18%;margin-left:7%;padding-top:15px;border-top:2px solid #cac3b4}.dashboard-totals-item:first-child{margin-left:0}.dashboard-totals-label{display:block;font-size:16px;font-weight:600;padding-bottom:2px}.dashboard-totals-value{color:#ef672f;font-size:20px}.dashboard-data{width:100%}.dashboard-data thead{background:0 0}.dashboard-data thead tr{background:0 0}.dashboard-data th,.dashboard-data td{border:none;padding:10px 12px;text-align:right}.dashboard-data th:first-child,.dashboard-data td:first-child{text-align:left}.dashboard-data th{color:#676056;font-weight:600}.dashboard-data td{background-color:transparent}.dashboard-data tbody tr:hover td{background-color:transparent}.dashboard-data tbody tr:nth-child(odd) td,.dashboard-data tbody tr:nth-child(odd):hover td,.dashboard-data tbody tr:nth-child(odd) th,.dashboard-data tbody tr:nth-child(odd):hover th{background-color:#e1dbcf}.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd) td,.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd):hover td,.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd) th,.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd):hover th{background-color:#f7f3eb}.dashboard-data td.empty-text{text-align:center}.ui-tabs-panel .dashboard-data{background-color:#fff}.mage-dropdown-dialog.ui-dialog .ui-dialog-content{overflow:visible}.mage-dropdown-dialog.ui-dialog .ui-dialog-buttonpane{padding:0}.message-system-inner{background:#f7f3eb;border:1px solid #c0bbaf;border-top:0;border-radius:0 0 5px 5px;float:right;overflow:hidden}.message-system-unread .message-system-inner{float:none}.message-system-list{margin:0;padding:0;list-style:none;float:left}.message-system .message-system-list{width:75%}.message-system-list li{padding:5px 13px 7px 36px;position:relative}.message-system-short{padding:5px 13px 7px;float:right}.message-system-short span{display:inline-block;margin-left:7px;border-left:1px #d1ccc3 solid}.message-system-short span:first-child{border:0;margin-left:0}.message-system-short a{padding-left:27px;position:relative;height:16px}.message-system .message-system-short a:before,.message-system-list li:before{font-family:'MUI-Icons';font-style:normal;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;height:16px;width:16px;font-size:16px;line-height:16px;text-align:center;position:absolute;left:7px;top:2px}.message-system-list li:before{top:5px;left:13px}.message-system .message-system-short .warning a:before,.message-system-list li.warning:before{content:"\e006";color:#f2a825}.message-system .message-system-short .error a:before,.message-system-list li.error:before{content:"\e086";font-family:'MUI-Icons';color:#c00815}.ui-dialog .message-system-list{margin-bottom:25px}.sales-order-create-index .order-errors .notice{color:#ed4f2e;font-size:11px;margin:5px 0 0}.order-errors .fieldset-wrapper-title .title{box-sizing:border-box;background:#fffbf0;border:1px solid #d87e34;border-radius:5px;color:#676056;font-size:14px;margin:20px 0;padding:10px 26px 10px 35px;position:relative}.order-errors .fieldset-wrapper-title .title:before{position:absolute;left:11px;top:50%;margin-top:-11px;width:auto;height:auto;font-family:'MUI-Icons';font-style:normal;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;font-size:16px;line-height:inherit;content:'\e046';color:#d87e34}.search-global.miniform{position:relative;z-index:1000;display:inline-block;vertical-align:top;margin:6px 10px 0}.search-global.miniform .mage-suggest{border:0;border-radius:0}.search-global-actions{display:none}.search-global-field{margin:0}.search-global-field .label{position:absolute;right:4px;z-index:2;cursor:pointer;display:inline-block;text-decoration:none}.search-global-field .label>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.search-global-field .label>span.focusable:active,.search-global-field .label>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.search-global-field .label>span.focusable:active,.search-global-field .label>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.search-global-field .label:before{font-family:'MUI-Icons';content:"\e01f";font-size:18px;line-height:29px;color:#cac3b4;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.search-global-field .control{width:48px;overflow:hidden;opacity:0;transition:all .3s ease}.search-global-field .control input[type=text]{background:0 0;border:none;width:100%}.search-global-field.active{z-index:2}.search-global-field.active .label:before{display:none}.search-global-field.active .control{overflow:visible;opacity:1;transition:all .3s ease;width:300px}.search-global-menu{box-sizing:border-box;display:block;width:100%}.notifications-summary{display:inline-block;text-align:left;position:relative;z-index:1}.notifications-summary.active{z-index:999}.notifications-action{color:#f2ebde;padding:12px 22px 11px;text-transform:capitalize;display:inline-block;text-decoration:none}.notifications-action:before{font-family:"MUI-Icons";content:"\e06e";font-size:18px;line-height:18px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.notifications-action:visited,.notifications-action:focus,.notifications-action:active,.notifications-action:hover{color:#f2ebde;text-decoration:none}.notifications-action.active{background-color:#fff;color:#676056}.notifications-action .text{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.notifications-action .text.focusable:active,.notifications-action .text.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-action .text.focusable:active,.notifications-action .text.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-action .qty.counter{display:inline-block;background:#ed4f2e;color:#f2ebde;font-size:12px;line-height:12px;font-weight:700;padding:1px 3px;position:absolute;top:6px;left:50%;border-radius:4px}.notifications-list{width:300px;padding:0;margin:0}.notifications-list .last{padding:10px;text-align:center;font-size:12px}.notifications-summary .notifications-entry{padding:15px;color:#676056;font-size:11px;font-weight:400}.notifications-entry{position:relative;z-index:1}.notifications-entry:hover .action{display:block}.notifications-entry-title{padding-right:15px;color:#ed4f2e;font-size:12px;font-weight:600;display:block;margin-bottom:10px}.notifications-entry-description{line-height:1.3;display:block;max-height:3.9em;overflow:hidden;margin-bottom:10px;text-overflow:ellipsis}.notifications-close.action{position:absolute;z-index:1;top:12px;right:12px;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;display:none}.notifications-close.action>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.notifications-close.action>span.focusable:active,.notifications-close.action>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-close.action>span.focusable:active,.notifications-close.action>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-close.action:before{font-family:'MUI-Icons';content:"\e07f";font-size:16px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.notifications-close.action:focus,.notifications-close.action:active{background:0 0;border:none}.notifications-close.action:hover{background:0 0;border:none}.notifications-close.action.disabled,.notifications-close.action[disabled],fieldset[disabled] .notifications-close.action{cursor:not-allowed;pointer-events:none;opacity:.5}.notifications-dialog-content{display:none}.notifications-critical .notifications-entry-title{padding-left:25px;display:inline-block;text-decoration:none}.notifications-critical .notifications-entry-title:before{font-family:'MUI-Icons';content:"\e086";font-size:18px;line-height:18px;color:#c00815;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.notifications-critical .notifications-entry-title:before{position:absolute;margin-left:-25px}.notifications-dialog-content .notifications-entry-time{color:#8c867e;font-size:13px;font-family:Helvetica,Arial,sans-serif;position:absolute;right:17px;bottom:27px;text-align:right}.notifications-url{display:inline-block;text-decoration:none}.notifications-url>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.notifications-url>span.focusable:active,.notifications-url>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-url>span.focusable:active,.notifications-url>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-url:after{font-family:'MUI-Icons';content:"\e084";font-size:16px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:-2px 0 0 10px}.notifications-dialog-content .notifications-entry-title{font-size:15px}.locale-switcher-field{white-space:nowrap;float:left}.locale-switcher-field .control,.locale-switcher-field .label{vertical-align:middle;margin:0 10px 0 0;display:inline-block}.locale-switcher-select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;border:1px solid #ada89e;max-width:200px;height:31px;background:url("../images/select-bg.svg") no-repeat 100% 50%;background-size:30px 60px;padding-right:29px;text-indent:.01px;text-overflow:''}.locale-switcher-select::-ms-expand{display:none}.lt-ie10 .locale-switcher-select{background-image:none;padding-right:4px}@-moz-document url-prefix(){.locale-switcher-select{background-image:none}}@-moz-document url-prefix(){.locale-switcher-select{background-image:none}}.mage-suggest{text-align:left;box-sizing:border-box;position:relative;display:inline-block;vertical-align:top;width:100%;background-color:#fff;border:1px solid #ada89e;border-radius:2px}.mage-suggest:after{position:absolute;top:3px;right:3px;bottom:0;width:22px;text-align:center;font-family:'MUI-Icons';font-style:normal;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;content:'\e01f';font-size:18px;color:#b2b2b2}.mage-suggest input[type=search],.mage-suggest input.search{width:100%;border:none;background:0 0;padding-right:30px}.mage-suggest.category-select input[type=search],.mage-suggest.category-select input.search{height:26px}.mage-suggest-dropdown{position:absolute;left:0;right:0;top:100%;margin:1px -1px 0;border:1px solid #cac2b5;background:#fff;box-shadow:0 2px 4px rgba(0,0,0,.2);z-index:990}.mage-suggest-dropdown ul{margin:0;padding:0;list-style:none}.mage-suggest-dropdown li{border-bottom:1px solid #e5e5e5;padding:0}.mage-suggest-dropdown li a{display:block}.mage-suggest-dropdown li a.ui-state-focus{background:#f5f5f5}.mage-suggest-dropdown li a,.mage-suggest-dropdown .jstree li a:hover,.mage-suggest-dropdown .jstree .jstree-hovered,.mage-suggest-dropdown .jstree .jstree-clicked{padding:6px 12px 5px;text-decoration:none;color:#333}.mage-suggest-dropdown .jstree li a:hover,.mage-suggest-dropdown .jstree .jstree-hovered,.mage-suggest-dropdown .jstree .jstree-clicked{border:none}.mage-suggest-dropdown .jstree li{border-bottom:0}.mage-suggest-dropdown .jstree li a{display:inline-block}.mage-suggest-dropdown .jstree .mage-suggest-selected>a{color:#000;background:#f1ffeb}.field-category_ids .mage-suggest-dropdown,.field-new_category_parent .mage-suggest-dropdown{max-height:200px;overflow:auto}.mage-suggest-dropdown .jstree .mage-suggest-selected>a:hover,.mage-suggest-dropdown .jstree .mage-suggest-selected>.jstree-hovered,.mage-suggest-dropdown .jstree .mage-suggest-selected>.jstree-clicked,.mage-suggest-dropdown .jstree .mage-suggest-selected.mage-suggest-not-active>.jstree-hovered,.mage-suggest-dropdown .jstree .mage-suggest-selected.mage-suggest-not-active>.jstree-clicked{background:#e5ffd9}.mage-suggest-dropdown .jstree .mage-suggest-not-active>a{color:#d4d4d4}.mage-suggest-dropdown .jstree .mage-suggest-not-active>a:hover,.mage-suggest-dropdown .jstree .mage-suggest-not-active>.jstree-hovered,.mage-suggest-dropdown .jstree .mage-suggest-not-active>.jstree-clicked{background:#f5f5f5}.mage-suggest-dropdown .category-path{font-size:11px;margin-left:10px;color:#9ba8b5}.suggest-expandable .action-dropdown .action-toggle{display:inline-block;max-width:500px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background:0 0;border:none;box-shadow:none;color:#676056;font-size:12px;padding:5px 4px;filter:none}.suggest-expandable .action-dropdown .action-toggle span{display:inline}.suggest-expandable .action-dropdown .action-toggle:before{display:inline-block;float:right;margin-left:4px;font-size:13px;color:#b2b0ad}.suggest-expandable .action-dropdown .action-toggle:hover:before{color:#7e7e7e}.suggest-expandable .dropdown-menu{margin:1px 0 0;left:0;right:auto;width:245px;z-index:4}.suggest-expandable .mage-suggest{border:none;border-radius:3px 3px 0 0}.suggest-expandable .mage-suggest:after{top:10px;right:8px}.suggest-expandable .mage-suggest-inner .title{margin:0;padding:0 10px 4px;text-transform:uppercase;color:#a6a098;font-size:12px;border-bottom:1px solid #e5e5e5}.suggest-expandable .mage-suggest-inner>input[type=search],.suggest-expandable .mage-suggest-inner>input.search{position:relative;margin:6px 5px 5px;padding-right:20px;border:1px solid #ada89e;width:236px;z-index:1}.suggest-expandable .mage-suggest-inner>input.ui-autocomplete-loading,.suggest-expandable .mage-suggest-inner>input.mage-suggest-state-loading{background:#fff url("../mui/images/ajax-loader-small.gif") no-repeat 190px 50%}.suggest-expandable .mage-suggest-dropdown{margin-top:0;border-top:0;border-radius:0 0 3px 3px;max-height:300px;overflow:auto;width:100%;float:left}.suggest-expandable .mage-suggest-dropdown ul{margin:0;padding:0;list-style:none}.suggest-expandable .action-show-all:hover,.suggest-expandable .action-show-all:active,.suggest-expandable .action-show-all:focus,.suggest-expandable .action-show-all[disabled]{border-top:1px solid #e5e5e5;display:block;width:100%;padding:8px 10px 10px;text-align:left;font:12px/1.333 Arial,Verdana,sans-serif;color:#676056}.product-actions .suggest-expandable{max-width:500px;float:left;margin-top:1px}.page-actions.fixed #product-template-suggest-container{display:none}.catalog-category-edit .col-2-left-layout:before{display:none}.category-content .ui-tabs-panel .fieldset{padding-top:40px}.category-content .ui-tabs-panel .fieldset .legend{display:none}.attributes-edit-form .field:not(.field-weight) .addon{display:block;position:relative}.attributes-edit-form .field:not(.field-weight) .addon input[type=text]{border-width:1px}.attributes-edit-form .field:not(.field-weight) .addon .addafter{display:block;border:0;height:auto;width:auto}.attributes-edit-form .field:not(.field-weight) .addon input:focus~.addafter{box-shadow:none}.attributes-edit-form .with-addon .textarea{margin:0}.attributes-edit-form .attribute-change-checkbox{display:block;margin-top:5px}.attributes-edit-form .attribute-change-checkbox .label{float:none;padding:0;width:auto}.attributes-edit-form .attribute-change-checkbox .checkbox{margin-right:5px;width:auto}.attributes-edit-form .field-price .addon>input,.attributes-edit-form .field-special_price .addon>input,.attributes-edit-form .field-gift_wrapping_price .addon>input,.attributes-edit-form .field-msrp .addon>input,.attributes-edit-form .field-gift_wrapping_price .addon>input{padding-left:23px}.attributes-edit-form .field-price .addafter>strong,.attributes-edit-form .field-special_price .addafter>strong,.attributes-edit-form .field-gift_wrapping_price .addafter>strong,.attributes-edit-form .field-msrp .addafter>strong,.attributes-edit-form .field-gift_wrapping_price .addafter>strong{left:5px;position:absolute;top:3px}.attributes-edit-form .field.type-price input:focus+label,.attributes-edit-form .field-price input:focus+label,.attributes-edit-form .field-special_price input:focus+label,.attributes-edit-form .field-msrp input:focus+label,.attributes-edit-form .field-weight input:focus+label{box-shadow:none}.attributes-edit-form .field-special_from_date>.control .input-text,.attributes-edit-form .field-special_to_date>.control .input-text,.attributes-edit-form .field-news_from_date>.control .input-text,.attributes-edit-form .field-news_to_date>.control .input-text,.attributes-edit-form .field-custom_design_from>.control .input-text,.attributes-edit-form .field-custom_design_to>.control .input-text{border-width:1px;width:130px}.attributes-edit-form .field-weight .fields-group-2 .control{padding-right:27px}.attributes-edit-form .field-weight .fields-group-2 .control .addafter+.addafter{border-width:1px 1px 1px 0;border-style:solid;height:28px;right:0;position:absolute;top:0}.attributes-edit-form .field-weight .fields-group-2 .control .addafter strong{line-height:28px}.attributes-edit-form .field-weight .fields-group-2 .control>input:focus+.addafter+.addafter{box-shadow:0 0 8px rgba(82,168,236,.6)}.attributes-edit-form .field-gift_message_available .addon>input[type=checkbox],.attributes-edit-form .field-gift_wrapping_available .addon>input[type=checkbox]{width:auto;margin-right:5px}.attributes-edit-form .fieldset>.addafter{display:none}.advanced-inventory-edit .field.choice{display:block;margin:3px 0 0}.advanced-inventory-edit .field.choice .label{padding-top:1px}.product-actions:before,.product-actions:after{content:"";display:table}.product-actions:after{clear:both}.product-actions:before,.product-actions:after{content:"";display:table}.product-actions:after{clear:both}.product-actions .switcher{float:right}#configurable-attributes-container .actions-select{display:inline-block;position:relative}#configurable-attributes-container .actions-select:before,#configurable-attributes-container .actions-select:after{content:"";display:table}#configurable-attributes-container .actions-select:after{clear:both}#configurable-attributes-container .actions-select:before,#configurable-attributes-container .actions-select:after{content:"";display:table}#configurable-attributes-container .actions-select:after{clear:both}#configurable-attributes-container .actions-select .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}#configurable-attributes-container .actions-select .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#configurable-attributes-container .actions-select .action.toggle:hover:after{color:inherit}#configurable-attributes-container .actions-select .action.toggle:active:after{color:inherit}#configurable-attributes-container .actions-select .action.toggle.active{display:inline-block;text-decoration:none}#configurable-attributes-container .actions-select .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#configurable-attributes-container .actions-select .action.toggle.active:hover:after{color:inherit}#configurable-attributes-container .actions-select .action.toggle.active:active:after{color:inherit}#configurable-attributes-container .actions-select ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}#configurable-attributes-container .actions-select ul.dropdown li{margin:0;padding:3px 5px}#configurable-attributes-container .actions-select ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}#configurable-attributes-container .actions-select.active{overflow:visible}#configurable-attributes-container .actions-select.active ul.dropdown{display:block}#configurable-attributes-container .actions-select .action.toggle{padding:1px 8px;border:1px solid #ada89e;background:#fff;border-radius:0 2px 2px 0}#configurable-attributes-container .actions-select .action.toggle:after{width:14px;text-indent:-2px}#configurable-attributes-container .actions-select ul.dropdown li:hover{background:#eef8fc}#configurable-attributes-container .actions-select ul.dropdown a{color:#333;text-decoration:none}#product-variations-matrix .actions-image-uploader{display:inline-block;position:relative;display:block;width:50px}#product-variations-matrix .actions-image-uploader:before,#product-variations-matrix .actions-image-uploader:after{content:"";display:table}#product-variations-matrix .actions-image-uploader:after{clear:both}#product-variations-matrix .actions-image-uploader:before,#product-variations-matrix .actions-image-uploader:after{content:"";display:table}#product-variations-matrix .actions-image-uploader:after{clear:both}#product-variations-matrix .actions-image-uploader .action.split{float:left;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle{float:right;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle{padding:6px 5px;display:inline-block;text-decoration:none}#product-variations-matrix .actions-image-uploader .action.toggle>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle:hover:after{color:inherit}#product-variations-matrix .actions-image-uploader .action.toggle:active:after{color:inherit}#product-variations-matrix .actions-image-uploader .action.toggle.active{display:inline-block;text-decoration:none}#product-variations-matrix .actions-image-uploader .action.toggle.active>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle.active:hover:after{color:inherit}#product-variations-matrix .actions-image-uploader .action.toggle.active:active:after{color:inherit}#product-variations-matrix .actions-image-uploader ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}#product-variations-matrix .actions-image-uploader ul.dropdown li{margin:0;padding:3px 5px}#product-variations-matrix .actions-image-uploader ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}#product-variations-matrix .actions-image-uploader.active{overflow:visible}#product-variations-matrix .actions-image-uploader.active ul.dropdown{display:block}#product-variations-matrix .actions-image-uploader .action.toggle{padding:0 2px;border:1px solid #b7b2a7;background:#fff;border-radius:0 4px 4px 0;border-left:none;height:33px}#product-variations-matrix .actions-image-uploader .action.toggle.no-display{display:none}#product-variations-matrix .actions-image-uploader .action.toggle:after{width:12px;text-indent:-5px}#product-variations-matrix .actions-image-uploader ul.dropdown{left:0;margin-left:0;width:100px}#product-variations-matrix .actions-image-uploader ul.dropdown li:hover{background:#eef8fc}#product-variations-matrix .actions-image-uploader ul.dropdown a{color:#333;text-decoration:none}.debugging-hints .page-actions{position:relative;z-index:1}.debugging-hints .page-actions .debugging-hint-template-file{left:auto !important;right:0 !important}.filter-segments{list-style:none;padding:0}.adminhtml-report-customer-test-detail .col-id{width:35px}.adminhtml-report-customer-test-detail .col-period{white-space:nowrap;width:70px}.adminhtml-report-customer-test-detail .col-zip{width:50px}.adminhtml-report-customer-test-segment .col-id{width:35px}.adminhtml-report-customer-test-segment .col-status{width:65px}.adminhtml-report-customer-test-segment .col-qty{width:145px}.adminhtml-report-customer-test-segment .col-segment,.adminhtml-report-customer-test-segment .col-website{width:35%}.adminhtml-report-customer-test-segment .col-select{width:45px}.test-custom-attributes{margin-bottom:20px}.adminhtml-test-index th.col-id{text-align:left}.adminhtml-test-index .col-price{text-align:right;width:50px}.adminhtml-test-index .col-actions{width:50px}.adminhtml-test-index .col-select{width:60px}.adminhtml-test-edit .field-image .control{line-height:28px}.adminhtml-test-edit .field-image a{display:inline-block;margin:0 5px 0 0}.adminhtml-test-edit .field-image img{vertical-align:middle}.adminhtml-test-new .field-image .input-file,.adminhtml-test-edit .field-image .input-file{display:inline-block;margin:0 15px 0 0;width:auto}.adminhtml-test-new .field-image .addafter,.adminhtml-test-edit .field-image .addafter{border:0;box-shadow:none;display:inline-block;margin:0 15px 0 0;height:auto;width:auto}.adminhtml-test-new .field-image .delete-image,.adminhtml-test-edit .field-image .delete-image{display:inline-block;white-space:nowrap}.adminhtml-test-edit .field-image .delete-image input{margin:-3px 5px 0 0;width:auto;display:inline-block}.adminhtml-test-edit .field-image .addon .delete-image input:focus+label{border:0;box-shadow:none}.adminhtml-test-index .col-id{width:35px}.adminhtml-test-index .col-status{white-space:normal;width:75px}.adminhtml-test-index .col-websites{white-space:nowrap;width:200px}.adminhtml-test-index .col-price .label{display:inline-block;min-width:60px;white-space:nowrap}.adminhtml-test-index .col-price .price-excl-tax .price,.adminhtml-test-index .col-price .price-incl-tax .price{font-weight:700}.invitee_information,.inviter_information{width:48.9362%}.invitee_information{float:left}.inviter_information{float:right}.test_information .data-table th,.invitee_information .data-table th,.inviter_information .data-table th{width:20%;white-space:nowrap}.test_information .data-table textarea,.test_information .data-table input{width:100%}.tests-history ul{margin:0;padding-left:25px}.tests-history ul .status:before{display:inline-block;content:"|";margin:0 10px}.adminhtml-report-test-order .col-period{white-space:nowrap;width:70px}.adminhtml-report-test-order .col-inv-sent,.adminhtml-report-test-order .col-inv-acc,.adminhtml-report-test-order .col-acc,.adminhtml-report-test-order .col-rate{text-align:right;width:23%}.adminhtml-report-test-customer .col-id{width:35px}.adminhtml-report-test-customer .col-period{white-space:nowrap;width:70px}.adminhtml-report-test-customer .col-inv-sent,.adminhtml-report-test-customer .col-inv-acc{text-align:right;width:120px}.adminhtml-report-test-index .col-period{white-space:nowrap}.adminhtml-report-test-index .col-inv-sent,.adminhtml-report-test-index .col-inv-acc,.adminhtml-report-test-index .col-inv-disc,.adminhtml-report-test-index .col-inv-acc-rate,.adminhtml-report-test-index .col-inv-disc-rate{text-align:right;width:19%}.test_information .data-table,.invitee_information .data-table,.inviter_information .data-table{width:100%}.test_information .data-table tbody tr th,.invitee_information .data-table tbody tr th,.inviter_information .data-table tbody tr th{font-weight:700}.test_information .data-table tbody tr td,.test_information .data-table tbody tr th,.invitee_information .data-table tbody tr td,.invitee_information .data-table tbody tr th,.inviter_information .data-table tbody tr td,.inviter_information .data-table tbody tr th{background-color:#fff;border:0;padding:9px 10px 10px;color:#666;vertical-align:top}.test_information .data-table tbody tr:nth-child(2n+1) td,.test_information .data-table tbody tr:nth-child(2n+1) th,.invitee_information .data-table tbody tr:nth-child(2n+1) td,.invitee_information .data-table tbody tr:nth-child(2n+1) th,.inviter_information .data-table tbody tr:nth-child(2n+1) td,.inviter_information .data-table tbody tr:nth-child(2n+1) th{background-color:#fbfaf6}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table .col-sort-order{width:80px}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table td,[class^=" adminhtml-test-"] .fieldset-wrapper-content .accordion .config .data-table td{vertical-align:top}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table td select,[class^=" adminhtml-test-"] .fieldset-wrapper-content .accordion .config .data-table td select{display:block;width:100%}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table td .input-radio.global-scope,[class^=" adminhtml-test-"] .fieldset-wrapper-content .accordion .config .data-table td .input-radio.global-scope{margin-top:9px}.sales-order-create-index .ui-dialog .content>.test .field.text .input-text{width:100%}.sales-order-create-index .ui-dialog .content>.test .note .price{font-weight:600}.sales-order-create-index .ui-dialog .content>.test .note .price:before{content:": "}.sales-order-create-index .ui-dialog .content>.test .fixed.amount .label:after{content:": "}.sales-order-create-index .ui-dialog .content>.test .fixed.amount .control{display:inline-block;font-weight:600}.sales-order-create-index .ui-dialog .content>.test .fixed.amount .control .control-value{margin:-2px 0 0;padding:0}.eq-ie9 [class^=" adminhtml-test-"] .custom-options .data-table{word-wrap:normal;table-layout:auto}.rma-items .col-actions a.disabled,.newRma .col-actions a.disabled{cursor:default;opacity:.5}.rma-items .col-actions a.disabled:hover,.newRma .col-actions a.disabled:hover{text-decoration:none}.block.mselect-list .mselect-input{width:100%}.block.mselect-list .mselect-input-container .mselect-save{top:4px}.block.mselect-list .mselect-input-container .mselect-cancel{top:4px}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body,html{height:100%;min-height:100%}body{color:#676056;font-family:'Open Sans',sans-serif;line-height:1.33;font-weight:400;font-size:1.4rem;background:#f2ebde;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}body>*{-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0;-webkit-flex-basis:auto;flex-basis:auto}.page-wrapper{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;min-height:100%;width:100%;max-width:100%;min-width:990px}.page-wrapper>*{-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0;-webkit-flex-basis:auto;flex-basis:auto}.page-header{text-align:right}.page-header-wrapper{background-color:#31302b}.page-header:after{content:"";display:table;clear:both}.page-header .logo{margin-top:5px;float:left;text-decoration:none;display:inline-block}.page-header .logo:before{content:"";display:inline-block;vertical-align:middle;width:109px;height:35px;background-image:url("../images/logo.svg");background-size:109px 70px;background-repeat:no-repeat}.page-header .logo:after{display:inline-block;vertical-align:middle;margin-left:10px;content:attr(data-edition);font-weight:600;font-size:16px;color:#ef672f;margin-top:-2px}.page-header .logo span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.page-header .logo span.focusable:active,.page-header .logo span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.page-header .logo span.focusable:active,.page-header .logo span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.page-header .dropdown-menu{border:0}.admin-user{display:inline-block;vertical-align:top;position:relative;text-align:left}.admin-user-account{text-decoration:none;display:inline-block;padding:12px 14px;color:#f2ebde}.admin-user-account:after{font-family:"MUI-Icons";content:"\e02c";font-size:13px;line-height:13px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:-3px 0 0}.admin-user-account:link,.admin-user-account:visited{color:#f2ebde}.admin-user-account:focus,.admin-user-account:active,.admin-user-account:hover{color:#f2ebde;text-decoration:none}.active .admin-user-account{background-color:#fff;color:#676056}.admin-user-menu{padding:15px;white-space:nowrap;margin-top:0}.admin-user-menu li{border:0;padding:0}.admin-user-menu li:hover{background:0 0}.admin-user-menu a{display:block;color:#676056;font-size:13px;font-weight:400;line-height:1.385;padding:3px 12px 3px;text-decoration:none}.admin-user-menu a:focus,.admin-user-menu a:hover{text-decoration:underline}.admin-user-menu a:hover{color:#fff;background:#989287;text-decoration:none}.admin-user-menu a span:before{content:"("}.admin-user-menu a span:after{content:")"}.page-actions.fixed .page-actions-buttons{padding-right:15px}.page-main-actions{background:#e0dace;color:#645d53;padding:15px;margin-left:auto;margin-right:auto;box-sizing:border-box}.page-main-actions:before,.page-main-actions:after{content:"";display:table}.page-main-actions:after{clear:both}.page-main-actions:before,.page-main-actions:after{content:"";display:table}.page-main-actions:after{clear:both}.page-main-actions .page-actions{float:right}.page-main-actions .page-actions .page-actions-buttons{float:right;display:-webkit-flex;display:-ms-flexbox;display:flex;justify-content:flex-end}.page-main-actions .page-actions button,.page-main-actions .page-actions .action-add.mselect-button-add{margin-left:13px}.page-main-actions .page-actions button.primary,.page-main-actions .page-actions .action-add.mselect-button-add.primary{float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-main-actions .page-actions button.save:not(.primary),.page-main-actions .page-actions .action-add.mselect-button-add.save:not(.primary){float:right;-ms-flex-order:1;-webkit-order:1;order:1}.page-main-actions .page-actions button.back,.page-main-actions .page-actions button.action-back,.page-main-actions .page-actions button.delete,.page-main-actions .page-actions .action-add.mselect-button-add.back,.page-main-actions .page-actions .action-add.mselect-button-add.action-back,.page-main-actions .page-actions .action-add.mselect-button-add.delete{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;margin:0 13px}.page-main-actions .page-actions button.back:focus,.page-main-actions .page-actions button.action-back:focus,.page-main-actions .page-actions button.delete:focus,.page-main-actions .page-actions button.back:active,.page-main-actions .page-actions button.action-back:active,.page-main-actions .page-actions button.delete:active,.page-main-actions .page-actions .action-add.mselect-button-add.back:focus,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:focus,.page-main-actions .page-actions .action-add.mselect-button-add.delete:focus,.page-main-actions .page-actions .action-add.mselect-button-add.back:active,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:active,.page-main-actions .page-actions .action-add.mselect-button-add.delete:active{background:0 0;border:none}.page-main-actions .page-actions button.back:hover,.page-main-actions .page-actions button.action-back:hover,.page-main-actions .page-actions button.delete:hover,.page-main-actions .page-actions .action-add.mselect-button-add.back:hover,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:hover,.page-main-actions .page-actions .action-add.mselect-button-add.delete:hover{background:0 0;border:none}.page-main-actions .page-actions button.back.disabled,.page-main-actions .page-actions button.action-back.disabled,.page-main-actions .page-actions button.delete.disabled,.page-main-actions .page-actions button.back[disabled],.page-main-actions .page-actions button.action-back[disabled],.page-main-actions .page-actions button.delete[disabled],fieldset[disabled] .page-main-actions .page-actions button.back,fieldset[disabled] .page-main-actions .page-actions button.action-back,fieldset[disabled] .page-main-actions .page-actions button.delete,.page-main-actions .page-actions .action-add.mselect-button-add.back.disabled,.page-main-actions .page-actions .action-add.mselect-button-add.action-back.disabled,.page-main-actions .page-actions .action-add.mselect-button-add.delete.disabled,.page-main-actions .page-actions .action-add.mselect-button-add.back[disabled],.page-main-actions .page-actions .action-add.mselect-button-add.action-back[disabled],.page-main-actions .page-actions .action-add.mselect-button-add.delete[disabled],fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-add.back,fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-add.action-back,fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-add.delete{cursor:not-allowed;pointer-events:none;opacity:.5}.ie .page-main-actions .page-actions button.back,.ie .page-main-actions .page-actions button.action-back,.ie .page-main-actions .page-actions button.delete,.ie .page-main-actions .page-actions .action-add.mselect-button-add.back,.ie .page-main-actions .page-actions .action-add.mselect-button-add.action-back,.ie .page-main-actions .page-actions .action-add.mselect-button-add.delete{margin-top:6px}.page-main-actions .page-actions button.delete,.page-main-actions .page-actions .action-add.mselect-button-add.delete{color:#e22626;float:left;-ms-flex-order:-1;-webkit-order:-1;order:-1}.page-main-actions .page-actions button.back,.page-main-actions .page-actions button.action-back,.page-main-actions .page-actions .action-add.mselect-button-add.back,.page-main-actions .page-actions .action-add.mselect-button-add.action-back{float:left;-ms-flex-order:-1;-webkit-order:-1;order:-1;display:inline-block;text-decoration:none}.page-main-actions .page-actions button.back:before,.page-main-actions .page-actions button.action-back:before,.page-main-actions .page-actions .action-add.mselect-button-add.back:before,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:before{font-family:'icons-blank-theme';content:'\e625';font-size:inherit;line-height:normal;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0 2px 0 0}.page-main-actions .page-actions .actions-split{margin-left:13px;float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-main-actions .page-actions .actions-split button.primary,.page-main-actions .page-actions .actions-split .action-add.mselect-button-add.primary{float:left}.page-main-actions .page-actions .actions-split .dropdown-menu{text-align:left}.page-main-actions .page-actions .actions-split .dropdown-menu .item{display:block}.page-main-actions .page-actions.fixed{position:fixed;top:0;left:0;right:0;z-index:10;padding:0;background:-webkit-linear-gradient(top,#f5f2ed 0%,#f5f2ed 56%,rgba(245,242,237,0) 100%);background:-ms-linear-gradient(top,#f5f2ed 0%,#f5f2ed 56%,rgba(245,242,237,0) 100%);background:linear-gradient(to bottom,#f5f2ed 0%,#f5f2ed 56%,rgba(245,242,237,0) 100%);background:#e0dace}.page-main-actions .page-actions.fixed .page-actions-inner{position:relative;padding-top:15px;padding-bottom:15px;min-height:36px;text-align:right;box-sizing:border-box}.page-main-actions .page-actions.fixed .page-actions-inner:before,.page-main-actions .page-actions.fixed .page-actions-inner:after{content:"";display:table}.page-main-actions .page-actions.fixed .page-actions-inner:after{clear:both}.page-main-actions .page-actions.fixed .page-actions-inner:before,.page-main-actions .page-actions.fixed .page-actions-inner:after{content:"";display:table}.page-main-actions .page-actions.fixed .page-actions-inner:after{clear:both}.page-main-actions .page-actions.fixed .page-actions-inner:before{text-align:left;content:attr(data-title);float:left;font-size:20px;max-width:50%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.lt-ie10 .page-main-actions .page-actions.fixed .page-actions-inner{background:#f5f2ed}.page-main-actions .store-switcher{margin-top:5px}.store-switcher{display:inline-block;font-size:13px}.store-switcher .label{margin-right:5px}.store-switcher .actions.dropdown{display:inline-block;position:relative}.store-switcher .actions.dropdown:before,.store-switcher .actions.dropdown:after{content:"";display:table}.store-switcher .actions.dropdown:after{clear:both}.store-switcher .actions.dropdown:before,.store-switcher .actions.dropdown:after{content:"";display:table}.store-switcher .actions.dropdown:after{clear:both}.store-switcher .actions.dropdown .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.store-switcher .actions.dropdown .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:20px;color:#645d53;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.store-switcher .actions.dropdown .action.toggle:hover:after{color:#645d53}.store-switcher .actions.dropdown .action.toggle:active:after{color:#645d53}.store-switcher .actions.dropdown .action.toggle.active{display:inline-block;text-decoration:none}.store-switcher .actions.dropdown .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:20px;color:#645d53;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.store-switcher .actions.dropdown .action.toggle.active:hover:after{color:#645d53}.store-switcher .actions.dropdown .action.toggle.active:active:after{color:#645d53}.store-switcher .actions.dropdown .dropdown-menu{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px #ada89e solid;position:absolute;z-index:100;top:100%;min-width:195px;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.store-switcher .actions.dropdown .dropdown-menu li{margin:0;padding:0}.store-switcher .actions.dropdown .dropdown-menu li:hover{background:0 0;cursor:pointer}.store-switcher .actions.dropdown.active{overflow:visible}.store-switcher .actions.dropdown.active .dropdown-menu{display:block}.store-switcher .actions.dropdown .action.toggle{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;color:#026294;line-height:normal;margin-top:2px;vertical-align:middle}.store-switcher .actions.dropdown .action.toggle:focus,.store-switcher .actions.dropdown .action.toggle:active{background:0 0;border:none}.store-switcher .actions.dropdown .action.toggle:hover{background:0 0;border:none}.store-switcher .actions.dropdown .action.toggle.disabled,.store-switcher .actions.dropdown .action.toggle[disabled],fieldset[disabled] .store-switcher .actions.dropdown .action.toggle{cursor:not-allowed;pointer-events:none;opacity:.5}.store-switcher .actions.dropdown ul.dropdown-menu{margin-top:4px;padding-top:5px;left:0}.store-switcher .actions.dropdown ul.dropdown-menu li{border:0;cursor:default}.store-switcher .actions.dropdown ul.dropdown-menu li:hover{cursor:default}.store-switcher .actions.dropdown ul.dropdown-menu li a,.store-switcher .actions.dropdown ul.dropdown-menu li span{padding:5px 13px;display:block;color:#645d53}.store-switcher .actions.dropdown ul.dropdown-menu li a{text-decoration:none}.store-switcher .actions.dropdown ul.dropdown-menu li a:hover{background:#edf9fb}.store-switcher .actions.dropdown ul.dropdown-menu li span{color:#ababab;cursor:default}.store-switcher .actions.dropdown ul.dropdown-menu li.current span{color:#645d53;background:#eee}.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store a,.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store span{padding-left:26px}.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store-view a,.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store-view span{padding-left:39px}.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar{border-top:1px #ededed solid;margin-top:10px}.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar a{display:inline-block;text-decoration:none;display:block}.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar a:before{font-family:'icons-blank-theme';content:'\e606';font-size:20px;line-height:normal;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:text-top;text-align:center;margin:0 3px 0 -4px}.tooltip{display:inline-block;margin-left:5px}.tooltip .help span,.tooltip .help a{width:16px;height:16px;text-align:center;background:rgba(194,186,169,.5);cursor:pointer;border-radius:10px;vertical-align:middle;display:inline-block;text-decoration:none}.tooltip .help span:hover,.tooltip .help a:hover{background:#c2baa9}.tooltip .help span>span,.tooltip .help a>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.tooltip .help span>span.focusable:active,.tooltip .help a>span.focusable:active,.tooltip .help span>span.focusable:focus,.tooltip .help a>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.tooltip .help span>span.focusable:active,.tooltip .help a>span.focusable:active,.tooltip .help span>span.focusable:focus,.tooltip .help a>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.tooltip .help span:before,.tooltip .help a:before{font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;content:'?';font-size:13px;line-height:16px;color:#5a534a;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center}.tooltip .help span:before,.tooltip .help a:before{font-weight:700}.tooltip .tooltip-content{display:none;position:absolute;max-width:200px;margin-top:10px;margin-left:-19px;padding:4px 8px;border-radius:3px;background:#000;background:rgba(49,48,43,.8);color:#fff;text-shadow:none;z-index:20}.tooltip .tooltip-content:before{content:'';position:absolute;width:0;height:0;top:-5px;left:20px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000;opacity:.8}.tooltip .tooltip-content.loading{position:absolute}.tooltip .tooltip-content.loading:before{border-bottom-color:rgba(0,0,0,.3)}.tooltip:hover>.tooltip-content{display:block}button,.action-add.mselect-button-add{border-radius:2px;background-image:none;background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;display:inline-block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:0;vertical-align:middle}button:focus,button:active,.action-add.mselect-button-add:focus,.action-add.mselect-button-add:active{background:#cac3b4;border:1px solid #989287}button:hover,.action-add.mselect-button-add:hover{background:#cac3b4}button.disabled,button[disabled],fieldset[disabled] button,.action-add.mselect-button-add.disabled,.action-add.mselect-button-add[disabled],fieldset[disabled] .action-add.mselect-button-add{cursor:default;pointer-events:none;opacity:.5}button.primary,.action-add.mselect-button-add.primary{background-image:none;background:#007dbd;padding:6px 13px;color:#fff;border:1px solid #0a6c9f;cursor:pointer;display:inline-block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;box-sizing:border-box;vertical-align:middle}button.primary:focus,button.primary:active,.action-add.mselect-button-add.primary:focus,.action-add.mselect-button-add.primary:active{background:#026294;border:1px solid #004c74;color:#fff}button.primary:hover,.action-add.mselect-button-add.primary:hover{background:#026294;border:1px solid #026294}button.primary.disabled,button.primary[disabled],fieldset[disabled] button.primary,.action-add.mselect-button-add.primary.disabled,.action-add.mselect-button-add.primary[disabled],fieldset[disabled] .action-add.mselect-button-add.primary{cursor:default;pointer-events:none;opacity:.5}.actions-split{display:inline-block;position:relative;vertical-align:middle}.actions-split button,.actions-split .action-add.mselect-button-add{margin-left:0!important}.actions-split:before,.actions-split:after{content:"";display:table}.actions-split:after{clear:both}.actions-split:before,.actions-split:after{content:"";display:table}.actions-split:after{clear:both}.actions-split .action-default{float:left;margin:0}.actions-split .action-toggle{float:right;margin:0}.actions-split button.action-default,.actions-split .action-add.mselect-button-add.action-default{border-top-right-radius:0;border-bottom-right-radius:0}.actions-split button+.action-toggle,.actions-split .action-add.mselect-button-add+.action-toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.actions-split .action-toggle{padding:6px 5px;display:inline-block;text-decoration:none}.actions-split .action-toggle>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.actions-split .action-toggle>span.focusable:active,.actions-split .action-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle>span.focusable:active,.actions-split .action-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.actions-split .action-toggle:hover:after{color:inherit}.actions-split .action-toggle:active:after{color:inherit}.actions-split .action-toggle.active{display:inline-block;text-decoration:none}.actions-split .action-toggle.active>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.actions-split .action-toggle.active>span.focusable:active,.actions-split .action-toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle.active>span.focusable:active,.actions-split .action-toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.actions-split .action-toggle.active:hover:after{color:inherit}.actions-split .action-toggle.active:active:after{color:inherit}.actions-split .dropdown-menu{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:175px;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.actions-split .dropdown-menu li{margin:0;padding:3px 5px}.actions-split .dropdown-menu li:hover{background:#e8e8e8;cursor:pointer}.actions-split .dropdown-menu:before,.actions-split .dropdown-menu:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.actions-split .dropdown-menu:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff}.actions-split .dropdown-menu:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb}.actions-split .dropdown-menu:before{top:-12px;right:10px}.actions-split .dropdown-menu:after{top:-14px;right:9px}.actions-split.active{overflow:visible}.actions-split.active .dropdown-menu{display:block}.actions-split .action-toggle:after{height:13px}.page-content:after{content:"";display:table;clear:both}.page-wrapper>.page-content{margin-bottom:20px}.page-footer{padding:15px 0}.page-footer-wrapper{background-color:#e0dacf;margin-top:auto}.page-footer:after{content:"";display:table;clear:both}.footer-legal{float:right;width:550px}.footer-legal .link-report,.footer-legal .magento-version,.footer-legal .copyright{font-size:13px}.footer-legal:before{content:"";display:inline-block;vertical-align:middle;position:absolute;z-index:1;margin-top:2px;margin-left:-35px;width:30px;height:35px;background-size:109px 70px;background:url("../images/logo.svg") no-repeat 0 -21px}.icon-error{margin-left:15px;color:#c00815;font-size:11px}.icon-error:before{font-family:'MUI-Icons';content:"\e086";font-size:13px;line-height:13px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:-1px 5px 0 0}.ui-widget-overlay{position:fixed}.control .nested{padding:0}.control *:first-child{margin-bottom:0}.field-tooltip{display:inline-block;vertical-align:top;margin-top:5px;position:relative;z-index:1;width:0;overflow:visible}.field-choice .field-tooltip{margin-top:10px}.field-tooltip:hover{z-index:99}.field-tooltip-action{position:relative;z-index:2;margin-left:18px;width:22px;height:22px;display:inline-block;cursor:pointer}.field-tooltip-action:before{content:"?";font-weight:500;font-size:18px;display:inline-block;overflow:hidden;height:22px;border-radius:11px;line-height:22px;width:22px;text-align:center;color:#fff;background-color:#514943}.field-tooltip-action span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.field-tooltip-action span.focusable:active,.field-tooltip-action span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.field-tooltip-action span.focusable:active,.field-tooltip-action span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.control-text:focus+.field-tooltip-content,.field-tooltip:hover .field-tooltip-content{display:block}.field-tooltip-content{display:none;position:absolute;z-index:1;width:320px;background:#fff8d7;padding:15px 25px;right:-66px;border:1px solid #adadad;border-radius:1px;bottom:42px;box-shadow:0 2px 8px 0 rgba(0,0,0,.3)}.field-tooltip-content:after,.field-tooltip-content:before{content:"";display:block;width:0;height:0;border:16px solid transparent;border-top-color:#adadad;position:absolute;right:20px;top:100%;z-index:3}.field-tooltip-content:after{border-top-color:#fff8d7;margin-top:-1px;z-index:4}.form__field.field-error .control [class*=control-]{border-color:#e22626}.form__field.field-error .control [class*=control-]:before{border-color:#e22626}.form__field .mage-error{border:1px solid #e22626;display:block;margin:2px 0 0;padding:6px 10px 10px;background:#fff8d6;color:#555;font-size:12px;font-weight:500;box-sizing:border-box;max-width:380px}.no-flexbox.no-flexboxlegacy .form__field .control-addon+.mage-error{display:inline-block;width:100%}.form__field{position:relative;z-index:1}.form__field:hover{z-index:2}.control .form__field{position:static}.form__field[data-config-scope]:before{content:attr(data-config-scope);display:inline-block;position:absolute;color:gray;right:0;top:6px}.control .form__field[data-config-scope]:nth-child(n+2):before{content:""}.form__field.field-disabled>.label{color:#999}.form__field.field-disabled.field .control [class*=control-][disabled]{background-color:#e9e9e9;opacity:.5;color:#303030;border-color:#adadad}.control-fields .label~.control{width:100%}.form__field{border:0;padding:0}.form__field .note{color:#303030;padding:0;margin:10px 0 0;max-width:380px}.form__field .note:before{display:none}.form__field.form__field{margin-bottom:0}.form__field.form__field+.form__field.form__field{margin-top:15px}.form__field.form__field:not(.choice)~.choice{margin-left:20px;margin-top:5px}.form__field.form__field.choice~.choice{margin-top:9px}.form__field.form__field~.choice:last-child{margin-bottom:8px}.fieldset>.form__field{margin-bottom:30px}.form__field .label{color:#303030}.form__field:not(.choice)>.label{font-size:14px;font-weight:600;width:30%;padding-right:30px;padding-top:0;line-height:33px;white-space:nowrap}.form__field:not(.choice)>.label:before{content:".";visibility:hidden;width:0;margin-left:-7px;overflow:hidden}.form__field:not(.choice)>.label span{white-space:normal;display:inline-block;vertical-align:middle;line-height:1.2}.form__field.required>.label:after{content:"";margin-left:0}.form__field.required>.label span:after{content:"*";color:#eb5202;display:inline;font-weight:500;font-size:16px;margin-top:2px;position:absolute;z-index:1;margin-left:10px}.form__field .control-file{margin-top:6px}.form__field .control-select{line-height:33px}.form__field .control-select:not([multiple]),.form__field .control-text{height:33px;max-width:380px}.form__field .control-addon{max-width:380px}.form__field .control-textarea,.form__field .control-select,.form__field .control-text{border:1px solid #adadad;border-radius:1px;padding:0 10px;color:#303030;background-color:#fff;font-weight:500;font-size:15px;min-width:11em}.form__field .control-textarea:focus,.form__field .control-select:focus,.form__field .control-text:focus{outline:0;border-color:#007bdb;box-shadow:none}.form__field .control-text{line-height:auto}.form__field .control-textarea{padding-top:6px;padding-bottom:6px;line-height:1.18em}.form__field .control-select[multiple],.form__field .control-textarea{width:100%;height:calc(6*1.2em + 14px)}.form__field .control-value{display:inline-block;padding:6px 10px}.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:active,.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:active,.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field .control-select{padding:0}.form__field .control-select option{box-sizing:border-box;padding:4px 10px;display:block}.form__field .control-select optgroup{font-weight:600;display:block;padding:4px 10px;line-height:33px;list-style:inside;font-style:normal}.form__field .control-range>.form__field:nth-child(2):before{content:"\2014";content:":";display:inline-block;margin-left:-25px;float:left;width:20px;line-height:33px;text-align:center}.form__field.choice{position:relative;z-index:1;padding-top:8px;padding-left:26px;padding-right:0}.form__field.choice .label{font-weight:500;padding:0;display:inline;float:none;line-height:18px}.form__field.choice input{position:absolute;top:8px;margin-top:3px!important}.form__field.choice input[disabled]+.label{opacity:.5;cursor:not-allowed}.control>.form__field.choice{max-width:380px}.control>.form__field.choice:nth-child(1):nth-last-child(2),.control>.form__field.choice:nth-child(2):nth-last-child(1){display:inline-block}.control>.form__field.choice:nth-child(1):nth-last-child(2)+.choice,.control>.form__field.choice:nth-child(2):nth-last-child(1)+.choice{margin-left:41px;margin-top:0}.control>.form__field.choice:nth-child(1):nth-last-child(2)+.choice:before,.control>.form__field.choice:nth-child(2):nth-last-child(1)+.choice:before{content:"";position:absolute;display:inline-block;height:20px;top:8px;left:-20px;width:1px;background:#ccc}.form__field.choice .label{cursor:pointer}.form__field.choice .label:before{content:"";position:absolute;z-index:1;border:1px solid #adadad;width:14px;height:14px;top:10px;left:0;border-radius:2px;background:url("../Magento_Ui/images/choice_bkg.png") no-repeat -100% -100%}.form__field.choice input:focus+.label:before{outline:0;border-color:#007bdb}.form__field.choice .control-radio+.label:before{border-radius:8px}.form__field.choice .control-radio:checked+.label:before{background-position:-26px -1px}.form__field.choice .control-checkbox:checked+.label:before{background-position:-1px -1px}.form__field.choice input{opacity:0}.fieldset>.form__field.choice{margin-left:30%}.form__field .control-after,.form__field .control-before{border:0;color:#858585;font-weight:300;font-size:15px;line-height:33px;display:inline-block;height:33px;box-sizing:border-box;padding:0 3px}.no-flexbox.no-flexboxlegacy .form__field .control-before,.no-flexbox.no-flexboxlegacy .form__field .control-addon{float:left;white-space:nowrap}.form__field .control-addon{display:inline-flex;max-width:380px;width:100%;flex-flow:row nowrap;position:relative;z-index:1}.form__field .control-addon>*{position:relative;z-index:1}.form__field .control-addon .control-text[disabled][type],.form__field .control-addon .control-select[disabled][type],.form__field .control-addon .control-select,.form__field .control-addon .control-text{background:transparent!important;border:0;width:auto;vertical-align:top;order:1;flex:1}.form__field .control-addon .control-text[disabled][type]:focus,.form__field .control-addon .control-select[disabled][type]:focus,.form__field .control-addon .control-select:focus,.form__field .control-addon .control-text:focus{box-shadow:none}.form__field .control-addon .control-text[disabled][type]:focus+label:before,.form__field .control-addon .control-select[disabled][type]:focus+label:before,.form__field .control-addon .control-select:focus+label:before,.form__field .control-addon .control-text:focus+label:before{outline:0;border-color:#007bdb}.form__field .control-addon .control-text[disabled][type]+label,.form__field .control-addon .control-select[disabled][type]+label,.form__field .control-addon .control-select+label,.form__field .control-addon .control-text+label{padding-left:10px;position:static!important;z-index:0}.form__field .control-addon .control-text[disabled][type]+label>*,.form__field .control-addon .control-select[disabled][type]+label>*,.form__field .control-addon .control-select+label>*,.form__field .control-addon .control-text+label>*{vertical-align:top;position:relative;z-index:2}.form__field .control-addon .control-text[disabled][type]+label:before,.form__field .control-addon .control-select[disabled][type]+label:before,.form__field .control-addon .control-select+label:before,.form__field .control-addon .control-text+label:before{box-sizing:border-box;border-radius:1px;border:1px solid #adadad;content:"";display:block;position:absolute;top:0;left:0;width:100%;height:100%;z-index:0;background:#fff}.form__field .control-addon .control-text[disabled][type][disabled]+label:before,.form__field .control-addon .control-select[disabled][type][disabled]+label:before,.form__field .control-addon .control-select[disabled]+label:before,.form__field .control-addon .control-text[disabled]+label:before{opacity:.5;background:#e9e9e9}.form__field .control-after{order:3}.form__field .control-after:last-child{padding-right:10px}.form__field .control-before{order:0}.form__field .control-some{display:flex}.form__field [class*=control-grouped]{display:table;width:100%;table-layout:fixed;box-sizing:border-box}.form__field [class*=control-grouped]>.form__field{display:table-cell;width:50%;vertical-align:top}.form__field [class*=control-grouped]>.form__field>.control{width:100%;float:none}.form__field [class*=control-grouped]>.form__field:nth-child(n+2){padding-left:20px}.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:active,.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:active,.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field [required]{box-shadow:none}fieldset.form__field{position:relative}fieldset.form__field [class*=control-grouped]>.form__field:first-child>.label,fieldset.form__field .control-fields>.form__field:first-child>.label{position:absolute;left:0;top:0;opacity:0;cursor:pointer;width:30%}.control-text+.ui-datepicker-trigger{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;line-height:inherit;font-weight:400;text-decoration:none;margin-left:-40px;display:inline-block}.control-text+.ui-datepicker-trigger img{display:none}.control-text+.ui-datepicker-trigger:focus,.control-text+.ui-datepicker-trigger:active{background:0 0;border:none}.control-text+.ui-datepicker-trigger:hover{background:0 0;border:none}.control-text+.ui-datepicker-trigger.disabled,.control-text+.ui-datepicker-trigger[disabled],fieldset[disabled] .control-text+.ui-datepicker-trigger{cursor:not-allowed;pointer-events:none;opacity:.5}.control-text+.ui-datepicker-trigger>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.control-text+.ui-datepicker-trigger>span.focusable:active,.control-text+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.control-text+.ui-datepicker-trigger>span.focusable:active,.control-text+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.control-text+.ui-datepicker-trigger:after{font-family:'icons-blank-theme';content:'\e612';font-size:38px;line-height:33px;color:#514943;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}[class*=tab-nav-item]:not(ul):active,[class*=tab-nav-item]:not(ul):focus{box-shadow:none;outline:none}.customer-index-edit .col-2-left-layout,.customer-index-edit .col-1-layout{background:#fff}.customer-index-edit{background:#fff}.customer-index-edit .col-2-left-layout{background:#fff}.customer-index-edit .main-col{padding-left:40px}.customer-index-edit .page-main-actions{background:0 0}.tab-nav.block{margin-bottom:40px}.tab-nav.block:first-child{margin-top:16px}.tab-nav.block .block-title{padding:7px 20px}.tab-nav-items{padding:0;border:1px solid #d3d3d3;box-shadow:0 0 4px rgba(50,50,50,.35);margin:0 0 40px;background:#f7f7f7}.tab-nav-item{padding:0;list-style-type:none;border-bottom:1px solid #e0e0e0;position:relative;margin:0 15px;z-index:1}.tab-nav-item:last-child{border-bottom:0}.tab-nav-item.ui-state-active{z-index:2;background:#fff;padding:1px 14px;border:2px solid #eb5202;margin:-1px}.tab-nav-item.ui-state-active .tab-nav-item-link{padding:13px 15px 13px;color:#eb5202}.tab-nav-item.ui-tabs-loading{position:relative;z-index:1}.tab-nav-item.ui-tabs-loading:before{content:"";display:block;position:absolute;z-index:2;background:url("../images/loader-2.gif") no-repeat 50% 50%;background-size:120px;width:20px;height:20px;top:13px;left:-10px}.tab-nav-item.ui-tabs-loading.ui-state-active:before{top:12px;left:4px}.tab-nav-item-link{display:block;padding:15px;color:#666;line-height:1}.tab-nav-item-link:focus,.tab-nav-item-link:active,.tab-nav-item-link:hover{outline:0;color:#eb5202;text-decoration:none}.ui-state-active .tab-nav-item-link{color:#666;font-weight:600}.tab-nav-item-link.changed{font-style:italic}.listing-tiles{overflow:hidden;margin-top:-10px;margin-left:-10px}.listing-tiles .listing-tile{background-color:#f2ebde;display:block;width:238px;height:200px;float:left;border:1px solid #676056;margin-top:10px;margin-left:10px;border-radius:4px;text-align:center}.listing-tiles .listing-tile.disabled{border-color:red}.listing-tiles .listing-tile.enabled{border-color:green}.listing .disabled{color:red}.listing .enabled{color:green}.pager{text-align:left;padding-bottom:10px}.pager:before,.pager:after{content:"";display:table}.pager:after{clear:both}.pager:before,.pager:after{content:"";display:table}.pager:after{clear:both}.pager [data-part=left]{display:inline-block;width:45%;float:left;text-align:left}.pager [data-part=right]{display:inline-block;width:45%;text-align:right;float:right;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.pager .action-next{cursor:pointer}.pager .action-previous{cursor:pointer}.pager{text-align:left}.pager [data-part=left]{display:inline-block;width:45%;text-align:left}.pager [data-part=right]{display:inline-block;width:45%;text-align:right;float:right}.grid .col-title{min-width:90px;text-align:center}.grid-actions [data-part=search]{display:inline-block;margin:0 30px}.grid-actions [data-part=search] input[type=text]{vertical-align:bottom;width:460px}.grid .actions-split .dropdown-menu{right:auto;left:auto;text-align:left;color:#676056;font-weight:400}.grid .actions-split .dropdown-menu:after{right:auto;left:9px}.grid .actions-split .dropdown-menu:before{right:auto;left:10px}.grid .grid-actions{padding:10px 0}.grid .hor-scroll{padding-top:10px}.grid .select-box{display:inline-block;vertical-align:top;margin:-12px -10px -7px;padding:12px 10px 7px;width:100%}.filters-toggle{background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.filters-toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:30px;line-height:15px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.filters-toggle:hover:after{color:inherit}.filters-toggle:active:after{color:inherit}.filters-toggle:focus,.filters-toggle:active{background:#cac3b4;border:1px solid #989287}.filters-toggle:hover{background:#cac3b4}.filters-toggle.disabled,.filters-toggle[disabled],fieldset[disabled] .filters-toggle{cursor:default;pointer-events:none;opacity:.5}.filters-toggle:focus,.filters-toggle:active{background:0 0;border:none}.filters-toggle:hover{background:0 0;border:none}.filters-toggle.disabled,.filters-toggle[disabled],fieldset[disabled] .filters-toggle{cursor:not-allowed;pointer-events:none;opacity:.5}.filters-toggle:after{margin-top:2px;margin-left:-3px}.filters-toggle.active:after{content:'\e618'}.filters-current{padding:10px 0;display:none}.filters-current.active{display:block}.filters-items{margin:0;padding:0;list-style:none none;display:inline}.filters-item{display:inline-block;margin:0 5px 5px 0;padding:2px 2px 2px 4px;border-radius:3px;background:#f7f3eb}.filters-item .item-label{font-weight:600}.filters-item .item-label:after{content:": "}.filters-item .action-remove{background-image:none;background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;text-decoration:none;padding:0}.filters-item .action-remove>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.filters-item .action-remove>span.focusable:active,.filters-item .action-remove>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-item .action-remove>span.focusable:active,.filters-item .action-remove>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-item .action-remove:before{font-family:'icons-blank-theme';content:'\e616';font-size:16px;line-height:16px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.filters-item .action-remove:hover:before{color:inherit}.filters-item .action-remove:active:before{color:inherit}.filters-item .action-remove:focus,.filters-item .action-remove:active{background:#cac3b4;border:1px solid #989287}.filters-item .action-remove:hover{background:#cac3b4}.filters-item .action-remove.disabled,.filters-item .action-remove[disabled],fieldset[disabled] .filters-item .action-remove{cursor:default;pointer-events:none;opacity:.5}.filters-form{position:relative;z-index:1;margin:14px 0;background:#fff;border:1px solid #bbb;box-shadow:0 3px 3px rgba(0,0,0,.15)}.filters-form .action-close{position:absolute;top:3px;right:7px;background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.filters-form .action-close>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.filters-form .action-close>span.focusable:active,.filters-form .action-close>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-form .action-close>span.focusable:active,.filters-form .action-close>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-form .action-close:before{font-family:'icons-blank-theme';content:'\e616';font-size:42px;line-height:42px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.filters-form .action-close:hover:before{color:inherit}.filters-form .action-close:active:before{color:inherit}.filters-form .action-close:focus,.filters-form .action-close:active{background:#cac3b4;border:1px solid #989287}.filters-form .action-close:hover{background:#cac3b4}.filters-form .action-close.disabled,.filters-form .action-close[disabled],fieldset[disabled] .filters-form .action-close{cursor:default;pointer-events:none;opacity:.5}.filters-form .action-close:focus,.filters-form .action-close:active{background:0 0;border:none}.filters-form .action-close:hover{background:0 0;border:none}.filters-form .action-close.disabled,.filters-form .action-close[disabled],fieldset[disabled] .filters-form .action-close{cursor:not-allowed;pointer-events:none;opacity:.5}.filters-actions{margin:18px;text-align:right}.filters-fieldset{padding-bottom:0}.filters-fieldset .field{border:0;margin:0 0 20px;box-sizing:border-box;display:inline-block;padding:0 12px 0 0;width:33.33333333%;vertical-align:top}.filters-fieldset .field:before,.filters-fieldset .field:after{content:"";display:table}.filters-fieldset .field:after{clear:both}.filters-fieldset .field:before,.filters-fieldset .field:after{content:"";display:table}.filters-fieldset .field:after{clear:both}.filters-fieldset .field.choice:before,.filters-fieldset .field.no-label:before{box-sizing:border-box;content:" ";height:1px;float:left;padding:6px 15px 0 0;width:35%}.filters-fieldset .field .description{box-sizing:border-box;float:left;padding:6px 15px 0 0;text-align:right;width:35%}.filters-fieldset .field:not(.choice)>.label{box-sizing:border-box;float:left;padding:6px 15px 0 0;text-align:right;width:35%}.filters-fieldset .field:not(.choice)>.control{float:left;width:65%}.filters-fieldset .field:last-child{margin-bottom:0}.filters-fieldset .field+.fieldset{clear:both}.filters-fieldset .field>.label{font-weight:700}.filters-fieldset .field>.label+br{display:none}.filters-fieldset .field .choice input{vertical-align:top}.filters-fieldset .field .fields.group:before,.filters-fieldset .field .fields.group:after{content:"";display:table}.filters-fieldset .field .fields.group:after{clear:both}.filters-fieldset .field .fields.group:before,.filters-fieldset .field .fields.group:after{content:"";display:table}.filters-fieldset .field .fields.group:after{clear:both}.filters-fieldset .field .fields.group .field{box-sizing:border-box;float:left}.filters-fieldset .field .fields.group.group-2 .field{width:50% !important}.filters-fieldset .field .fields.group.group-3 .field{width:33.3% !important}.filters-fieldset .field .fields.group.group-4 .field{width:25% !important}.filters-fieldset .field .fields.group.group-5 .field{width:20% !important}.filters-fieldset .field .addon{display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;padding:0;width:100%}.filters-fieldset .field .addon textarea,.filters-fieldset .field .addon select,.filters-fieldset .field .addon input{-ms-flex-order:2;-webkit-order:2;order:2;-webkit-flex-basis:100%;flex-basis:100%;box-shadow:none;display:inline-block;margin:0;width:auto}.filters-fieldset .field .addon .addbefore,.filters-fieldset .field .addon .addafter{-ms-flex-order:3;-webkit-order:3;order:3;display:inline-block;box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;width:auto;white-space:nowrap;vertical-align:middle}.filters-fieldset .field .addon .addbefore:disabled,.filters-fieldset .field .addon .addafter:disabled{opacity:.5}.filters-fieldset .field .addon .addbefore::-moz-placeholder,.filters-fieldset .field .addon .addafter::-moz-placeholder{color:#c2c2c2}.filters-fieldset .field .addon .addbefore::-webkit-input-placeholder,.filters-fieldset .field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.filters-fieldset .field .addon .addbefore:-ms-input-placeholder,.filters-fieldset .field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.filters-fieldset .field .addon .addbefore{float:left;-ms-flex-order:1;-webkit-order:1;order:1}.filters-fieldset .field .additional{margin-top:10px}.filters-fieldset .field.required>.label:after{content:'*';font-size:1.2rem;color:#e02b27;margin:0 0 0 5px}.filters-fieldset .field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.filters-fieldset .field .note:before{font-family:'icons-blank-theme';content:'\e618';font-size:24px;line-height:12px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.filters-fieldset .field .label{color:#676056;font-size:13px;font-weight:600;margin:0}.filters .field-date .group .hasDatepicker{width:100%;padding-right:30px}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;line-height:inherit;font-weight:400;text-decoration:none;margin-left:-33px;display:inline-block;width:30px}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger img{display:none}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:focus,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:active{background:0 0;border:none}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:hover{background:0 0;border:none}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger.disabled,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger[disabled],fieldset[disabled] .filters .field-date .group .hasDatepicker+.ui-datepicker-trigger{cursor:not-allowed;pointer-events:none;opacity:.5}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:active,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:active,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:after{font-family:'icons-blank-theme';content:'\e612';font-size:35px;line-height:30px;color:#514943;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.filters .field-range .group .field{margin-bottom:0}.filters .field-range .group .control{width:100%;box-sizing:border-box;padding-right:0;position:relative;z-index:1}.mass-select{position:relative;margin:-6px -10px;padding:6px 2px 6px 10px;z-index:1;white-space:nowrap}.mass-select.active{background:rgba(0,0,0,.2)}.mass-select-toggle{background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.mass-select-toggle>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.mass-select-toggle>span.focusable:active,.mass-select-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.mass-select-toggle>span.focusable:active,.mass-select-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.mass-select-toggle:before{font-family:'icons-blank-theme';content:'\e607';font-size:30px;line-height:15px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.mass-select-toggle:hover:before{color:inherit}.mass-select-toggle:active:before{color:inherit}.mass-select-toggle:focus,.mass-select-toggle:active{background:#cac3b4;border:1px solid #989287}.mass-select-toggle:hover{background:#cac3b4}.mass-select-toggle.disabled,.mass-select-toggle[disabled],fieldset[disabled] .mass-select-toggle{cursor:default;pointer-events:none;opacity:.5}.mass-select-toggle:focus,.mass-select-toggle:active{background:0 0;border:none}.mass-select-toggle:hover{background:0 0;border:none}.mass-select-toggle.disabled,.mass-select-toggle[disabled],fieldset[disabled] .mass-select-toggle{cursor:not-allowed;pointer-events:none;opacity:.5}.mass-select-toggle:before{margin-top:-2px;text-indent:-5px;color:#fff}.mass-select-toggle:hover:before{color:#fff}.mass-select-toggle:active:before,.mass-select-toggle.active:before{content:'\e618'}.mass-select-field{display:inline}.mass-select-menu{display:none;position:absolute;top:100%;left:0;text-align:left;margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;min-width:175px;box-shadow:0 3px 3px rgba(0,0,0,.15)}.mass-select-menu li{margin:0;padding:4px 15px;border-bottom:1px solid #e5e5e5}.mass-select-menu li:hover{background:#e8e8e8;cursor:pointer}.mass-select-menu span{font-weight:400;font-size:13px;color:#645d53}.mass-select-menu.active{display:block}.grid-loading-mask{position:absolute;left:0;top:0;right:0;bottom:0;background:rgba(255,255,255,.5);z-index:100}.grid-loading-mask .grid-loader{position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;width:218px;height:149px;background:url('../images/loader-2.gif') 50% 50% no-repeat}.addon input{border-width:1px 0 1px 1px}.addon input~.addafter strong{display:inline-block;background:#fff;line-height:24px;margin:0 3px 0 -2px;padding-left:4px;padding-right:4px;position:relative;font-size:12px;top:0}.addon input:focus~.addafter{border-color:#75b9f0;box-shadow:0 0 8px rgba(82,168,236,.6)}.addon input:focus~.addafter strong{margin-top:0}.addon .addafter{background:0 0;color:#a6a6a6;border-width:1px 1px 1px 0;border-radius:2px 2px 0 0;padding:0;border-color:#ada89e}.addon .pager input{border-width:1px}.field .control input[type=text][disabled],.field .control input[type=text][disabled]~.addafter,.field .control select[disabled],.field .control select[disabled]~.addafter{background-color:#fff;border-color:#eee;box-shadow:none;color:#999}.field .control input[type=text][disabled]~.addafter strong,.field .control select[disabled]~.addafter strong{background-color:#fff}.field-price.addon{direction:rtl}.field-price.addon>*{direction:ltr}.field-price.addon .addafter{border-width:1px 0 1px 1px;border-radius:2px 0 0 2px}.field-price.addon input:first-child{border-radius:0 2px 2px 0}.field-price input{border-width:1px 1px 1px 0}.field-price input:focus{box-shadow:0 0 8px rgba(82,168,236,.6)}.field-price input:focus~label.addafter{box-shadow:0 0 8px rgba(82,168,236,.6)}.field-price input~label.addafter strong{margin-left:2px;margin-right:-2px}.field-price.addon>input{width:99px;float:left}.field-price .control{position:relative}.field-price label.mage-error{position:absolute;left:0;top:30px}.version-fieldset .grid-actions{border-bottom:1px solid #f2ebde;margin:0 0 15px;padding:0 0 15px}.navigation>ul,.message-system,.page-header,.page-actions.fixed .page-actions-inner,.page-content,.page-footer{width:auto;min-width:960px;max-width:1300px;margin:0 auto;padding-left:15px;padding-right:15px;box-sizing:border-box;width:100%}.pager label.page,.filters .field-range .group .label,.mass-select-field .label{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visually-hidden.focusable:active,.visually-hidden.focusable:focus,.pager label.page.focusable:active,.pager label.page.focusable:focus,.filters .field-range .group .label.focusable:active,.filters .field-range .group .label.focusable:focus,.mass-select-field .label.focusable:active,.mass-select-field .label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}table th.required:after,.data-table th.required-entry:after,.data-table td.required-entry:after,.grid-actions .filter.required .label span:after,.grid-actions .required:after,.accordion .config .data-table td.required-entry:after{content:'*';color:#e22626;font-weight:400;margin-left:3px}.grid th.required:after,.grid th .required:after{content:'*';color:#f9d4d4;font-weight:400;margin-left:3px}.grid td.col-period,.grid td.col-date,.grid td.col-date_to,.grid td.col-date_from,.grid td.col-ended_at,.grid td.col-created_at,.grid td.col-updated_at,.grid td.col-customer_since,.grid td.col-session_start_time,.grid td.col-last_activity,.grid td.col-email,.grid td.col-name,.grid td.col-sku,.grid td.col-firstname,.grid td.col-lastname,.grid td.col-title,.grid td.col-label,.grid td.col-product,.grid td.col-set_name,.grid td.col-websites,.grid td.col-time,.grid td.col-billing_name,.grid td.col-shipping_name,.grid td.col-phone,.grid td.col-type,.product-options .grouped-items-table .col-name,.product-options .grouped-items-table .col-sku,.sales-order-create-index .data-table .col-product,[class^=' adminhtml-rma-'] .fieldset-wrapper .data-table td,[class^=' adminhtml-rma-'] .grid .col-product_sku,[class^=' adminhtml-rma-'] .grid .col-product_name,.col-grid_segment_name,.adminhtml-catalog-event-index .col-category,[class^=' catalog-search'] .col-search_query,[class^=' catalog-search'] .col-synonym_for,[class^=' catalog-search'] .col-redirect,.adminhtml-urlrewrite-index .col-request_path,.adminhtml-cms-page-index .col-title,.adminhtml-cms-page-index .col-identifier,.adminhtml-cms-hierarchy-index .col-title,.adminhtml-cms-hierarchy-index .col-identifier,.col-banner_name,.adminhtml-widget-instance-index .col-title,.reports-index-search .col-query_text,.adminhtml-rma-item-attribute-index .grid .col-attr-code,.adminhtml-system-store-index .grid td,.catalog-product-attribute-index .col-attr-code,.catalog-product-attribute-index .col-label,.adminhtml-export-index .col-code,.adminhtml-logging-index .grid .col-fullaction,.adminhtml-system-variable-index .grid .col-code,.adminhtml-logging-index .grid .col-info,.dashboard-secondary .dashboard-item tr>td:first-child,.ui-tabs-panel .dashboard-data .col-name,.data-table-td-max .data-table td,[class^=' adminhtml-rma-'] .fieldset-wrapper .accordion .config .data-table td,.data-table-td-max .accordion .config .data-table td,.order-account-information .data-table td,[class^=' adminhtml-rma-'] .rma-request-details .data-table td{overflow:hidden;text-overflow:ellipsis}td.col-period,td.col-date,td.col-date_to,td.col-date_from,td.col-ended_at,td.col-created_at,td.col-updated_at,td.col-customer_since,td.col-session_start_time,td.col-time,td.col-sku,td.col-type,[class^=' adminhtml-rma-'] #rma_items_grid_table .headings th,.adminhtml-process-list .col-action a,.adminhtml-process-list .col-mode{white-space:nowrap}table thead tr th:first-child,table tfoot tr th:first-child,table tfoot tr td:first-child{border-left:0}table thead tr th:last-child,table tfoot tr th:last-child,table tfoot tr td:last-child{border-right:0}.form-inline .grid-actions .label,.form-inline .massaction .label{padding:0;width:auto}.grid .col-action,.grid .col-actions,.grid .col-qty,.grid .col-purchases,.catalog-product-edit .ui-tabs-panel .grid .col-price,.catalog-product-edit .ui-tabs-panel .grid .col-position{width:50px}.grid .col-order-number,.grid .col-real_order_id,.grid .col-invoice-number,.grid .col-increment_id,.grid .col-transaction-id,.grid .col-parent-transaction-id,.grid .col-reference_id,.grid .col-status,.grid .col-price,.grid .col-position,.grid .col-base_grand_total,.grid .col-grand_total,.grid .col-sort_order,.grid .col-carts,.grid .col-priority,.grid .col-severity,.sales-order-create-index .col-in_products,[class^=' reports-'] [class^=col-total],[class^=' reports-'] [class^=col-average],[class^=' reports-'] [class^=col-ref-],[class^=' reports-'] [class^=col-rate],[class^=' reports-'] [class^=col-tax-amount],[class^=' adminhtml-customer-'] .col-required,.adminhtml-rma-item-attribute-index .col-required,[class^=' adminhtml-customer-'] .col-system,.adminhtml-rma-item-attribute-index .col-system,[class^=' adminhtml-customer-'] .col-is_visible,.adminhtml-rma-item-attribute-index .col-is_visible,[class^=' adminhtml-customer-'] .col-sort_order,.adminhtml-rma-item-attribute-index .col-sort_order,.catalog-product-attribute-index [class^=' col-is_'],.catalog-product-attribute-index .col-required,.catalog-product-attribute-index .col-system,.adminhtml-test-index .col-is_listed,[class^=' tests-report-test'] [class^=col-inv-]{width:70px}.grid .col-phone,.sales-order-view .grid .col-period,.sales-order-create-index .col-phone,[class^=' adminhtml-rma-'] .grid .col-product_sku,.adminhtml-rma-edit .col-product,.adminhtml-rma-edit .col-sku,.catalog-product-edit .ui-tabs-panel .grid .col-name,.catalog-product-edit .ui-tabs-panel .grid .col-type,.catalog-product-edit .ui-tabs-panel .grid .col-sku,.customer-index-index .grid .col-customer_since,.customer-index-index .grid .col-billing_country_id,[class^=' customer-index-'] .fieldset-wrapper .grid .col-created_at,[class^=' customer-index-'] .accordion .grid .col-created_at{max-width:70px;width:70px}.sales-order-view .grid .col-name,.sales-order-create-index .data-table .col-product,[class^=' adminhtml-rma-'] .grid .col-name,[class^=' adminhtml-rma-'] .grid .col-product,[class^=' catalog-search'] .col-search_query,[class^=' catalog-search'] .col-synonym_for,[class^=' catalog-search'] .col-redirect,.adminhtml-urlrewrite-index .col-request_path,.reports-report-shopcart-abandoned .grid .col-name,.tax-rule-index .grid .col-title,.adminhtml-rma-item-attribute-index .grid .col-attr-code,.dashboard-secondary .dashboard-item tr>td:first-child{max-width:150px;width:150px}[class^=' sales-order-'] .grid .col-name,.catalog-category-edit .grid .col-name,.adminhtml-catalog-event-index .col-category,.adminhtml-banner-edit .grid .col-name,.reports-report-product-lowstock .grid .col-sku,.newsletter-problem-index .grid .col-name,.newsletter-problem-index .grid .col-subject,.newsletter-problem-index .grid .col-product,.adminhtml-rma-item-attribute-index .grid .col-label,.adminhtml-export-index .col-label,.adminhtml-export-index .col-code,.adminhtml-scheduled-operation-index .grid .col-name,.adminhtml-logging-index .grid .col-fullaction,.test-report-customer-wishlist-wishlist .grid .col-name,.test-report-customer-wishlist-wishlist .grid .col-subject,.test-report-customer-wishlist-wishlist .grid .col-product{max-width:220px;width:220px}.grid .col-period,.grid .col-date,.grid .col-date_to,.grid .col-date_from,.grid .col-ended_at,.grid .col-created_at,.grid .col-updated_at,.grid .col-customer_since,.grid .col-session_start_time,.grid .col-last_activity,.grid .col-email,.grid .col-items_total,.grid .col-firstname,.grid .col-lastname,.grid .col-status-default,.grid .col-websites,.grid .col-time,.grid .col-billing_name,.grid .col-shipping_name,.sales-order-index .grid .col-name,.product-options .grouped-items-table .col-name,.product-options .grouped-items-table .col-sku,[class^=' sales-order-view'] .grid .col-customer_name,[class^=' adminhtml-rma-'] .grid .col-product_name,.catalog-product-index .grid .col-name,.catalog-product-review-index .grid .col-name,.catalog-product-review-index .grid .col-title,.customer-index-edit .ui-tabs-panel .grid .col-name,.review-product-index .grid .col-name,.adminhtml-cms-page-index .col-title,.adminhtml-cms-page-index .col-identifier,.catalog-product-attribute-index .col-attr-code,.catalog-product-attribute-index .col-label,.adminhtml-logging-index .grid .col-info{max-width:110px;width:110px}.grid .col-name,.grid .col-product,.col-banner_name,.adminhtml-widget-instance-index .col-title,[class^=' adminhtml-customer-'] .col-label,.adminhtml-rma-item-attribute-index .col-label,.adminhtml-system-variable-index .grid .col-code,.ui-tabs-panel .dashboard-data .col-name,.adminhtml-test-index .col-label{max-width:370px;width:370px}.col-grid_segment_name,.reports-index-search .col-query_text{max-width:570px;width:570px}[class^=' adminhtml-rma-'] .fieldset-wrapper .data-table td,.reports-report-product-lowstock .grid .col-name,.reports-report-shopcart-product .grid .col-name,.reports-report-review-customer .grid .col-name,[class^=' adminhtml-rma-'] .fieldset-wrapper .accordion .config .data-table td{max-width:670px;width:670px}.reports-report-sales-invoiced .grid .col-period,.reports-report-sales-refunde .grid .col-period,[class^=' tests-report-test'] .grid .col-period{width:auto}.grid .col-select,.grid .col-id,.grid .col-number{width:40px}.sales-order-create-index .grid,.sales-order-create-index .grid-actions,.adminhtml-export-index .grid-actions,.adminhtml-export-index .grid{padding-left:0;padding-right:0}[class^=' adminhtml-rma-'] .col-actions a,[class^=' customer-index-'] .col-action a,.adminhtml-notification-index .col-actions a{display:block;margin:0 0 3px;white-space:nowrap}.data-table-td-max .accordion .config .data-table td,.order-account-information .data-table td,[class^=' adminhtml-rma-'] .rma-request-details .data-table td{max-width:250px;width:250px}.catalog-product-edit .ui-tabs-panel .grid .hor-scroll,.catalog-product-index .grid .hor-scroll,.review-product-index .grid .hor-scroll,.adminhtml-rma-edit .hor-scroll{overflow-x:auto}.add-clearer:after,.massaction:after,.navigation>ul:after{content:"";display:table;clear:both}.test-content{width:calc(20px + 100*0.2)}.test-content:before{content:'.test {\A    ' attr(data-attribute) ': 0.2em;' '\A    content:\'';white-space:pre}.test-content:after{content:' Test\';\A}' "\A" '\A.test + .test._other ~ ul > li' " {\A    height: @var;\A    content: ' + ';\A}";white-space:pre}.test-content-calc{width:calc((100%/12*2) - 10px)}.test-svg-xml-image{background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 38 40"><style>.st0{fill:none;stroke:%23ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}</style><circle cx="14.7" cy="14.7" r="13.7" class="st0"/><path d="M23.9 24.7L37 39" class="st0"/></svg>') no-repeat left center}
\ No newline at end of file
+table>caption{margin-bottom:5px}table thead{background:#676056;color:#f7f3eb}table thead .headings{background:#807a6e}table thead a{color:#f7f3eb;display:block}table thead a label{color:#f7f3eb;cursor:pointer;display:block}table thead a:hover,table thead a:focus{color:#dac7a2;text-decoration:none}table tfoot{background:#f2ebde;color:#676056}table tfoot tr th,table tfoot tr td{text-align:left}table th{background:0 0;border:solid #cac3b4;border-width:0 1px;font-size:14px;padding:6px 10px;text-align:center}table td{border:solid #cac3b4;border-width:0 1px;padding:6px 10px 7px;vertical-align:top}table tbody tr td{background:#fff;color:#676056;padding-top:12px}table tbody tr td:first-child{border-left:0}table tbody tr td:first-child input[type=checkbox]{margin:0}table tbody tr td:last-child{border-right:0}table tbody tr:last-child th,table tbody tr:last-child td{border-bottom-width:1px}table tbody tr:nth-child(odd) td,table tbody tr:nth-child(odd) th{background-color:#f7f3eb}table tbody.even tr td{background:#fff}table tbody.odd tr td{background:#f7f3eb}table .dropdown-menu li{padding:7px 15px;line-height:14px;cursor:pointer}table .col-draggable .draggable-handle{float:left;position:relative;top:0}.not-sort{padding-right:10px}.sort-arrow-asc,.sort-arrow-desc{padding-right:10px;position:relative}.sort-arrow-asc:after,.sort-arrow-desc:after{right:-11px;top:-1px;position:absolute;width:23px}.sort-arrow-asc:hover:after,.sort-arrow-desc:hover:after{color:#dac7a2}.sort-arrow-asc{display:inline-block;text-decoration:none}.sort-arrow-asc:after{font-family:'icons-blank-theme';content:'\e626';font-size:13px;line-height:inherit;color:#f7f3eb;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.sort-arrow-asc:hover:after{color:#dac7a2}.sort-arrow-desc{display:inline-block;text-decoration:none}.sort-arrow-desc:after{font-family:'icons-blank-theme';content:'\e623';font-size:13px;line-height:inherit;color:#f7f3eb;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.sort-arrow-desc:hover:after{color:#dac7a2}.grid-actions .input-text,.pager .input-text,.massaction .input-text,.filter .input-text,.grid-actions select,.pager select,.massaction select,.filter select,.grid-actions .select,.pager .select,.massaction .select,.filter .select{border-color:#989287;box-shadow:none;border-radius:1px;height:28px;margin:0 10px 0 0}.filter th{border:0 solid #676056;padding:6px 3px;vertical-align:top}.filter .ui-datepicker-trigger{cursor:pointer;margin-top:2px}.filter .input-text{padding:0 5px}.filter .range-line:not(:last-child){margin-bottom:5px}.filter .date{padding-right:28px;position:relative;display:inline-block;text-decoration:none}.filter .date .hasDatepicker{vertical-align:top;width:99%}.filter .date img{cursor:pointer;height:25px;width:25px;right:0;position:absolute;vertical-align:middle;z-index:2;opacity:0}.filter .date:before{font-family:'icons-blank-theme';content:'\e612';font-size:42px;line-height:30px;color:#f7f3eb;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.filter .date:hover:before{color:#dac7a2}.filter .date:before{height:29px;margin-left:5px;position:absolute;right:-3px;top:-3px;width:35px}.filter select{border-color:#cac3b4;margin:0;padding:0;width:99%}.filter input.input-text{border-color:#cac3b4;margin:0;width:99%}.filter input.input-text::-webkit-input-placeholder{color:#989287 !important;text-transform:lowercase}.filter input.input-text::-moz-placeholder{color:#989287 !important;text-transform:lowercase}.filter input.input-text:-moz-placeholder{color:#989287 !important;text-transform:lowercase}.filter input.input-text:-ms-input-placeholder{color:#989287 !important;text-transform:lowercase}.grid{background:#fff;color:#676056;font-size:13px;font-weight:400;padding:15px}.grid table{width:100%}.grid tbody tr.selected th,.grid tbody tr.selected td,.grid tbody tr:hover th,.grid tbody tr:hover td,.grid tbody tr:nth-child(odd):hover th,.grid tbody tr:nth-child(odd):hover td{background-color:#f2ebde;cursor:pointer}.grid tbody tr.selected th.empty-text,.grid tbody tr.selected td.empty-text,.grid tbody tr:hover th.empty-text,.grid tbody tr:hover td.empty-text,.grid tbody tr:nth-child(odd):hover th.empty-text,.grid tbody tr:nth-child(odd):hover td.empty-text{background-color:#f7f3eb;cursor:default}.grid .empty-text{font:400 20px/1.2 'Open Sans',sans-serif;text-align:center;white-space:nowrap}.grid .col-sku{max-width:100px;width:100px}.grid .col-select,.grid .col-massaction{text-align:center}.grid .editable .input-text{width:65px}.grid .col-actions .action-select{background:#fff;border-color:#989287;height:28px;margin:0;padding:4px 4px 5px;width:80px}.grid .col-position.editable{white-space:nowrap}.grid .col-position.editable .input-text{margin:-7px 5px 0;width:70%}.eq-ie9 .hor-scroll{display:inline-block;min-height:0;overflow-y:hidden;overflow-x:auto;width:100%}.data-table{border-collapse:separate;width:100%}.data-table thead,.data-table tfoot,.data-table th,.accordion .config .data-table thead th,.accordion .config .data-table tfoot td,.accordion .config .accordion .config .data-table tfoot td th{background:#fff;color:#676056;font-size:13px;font-weight:600}.data-table th{text-align:left}.data-table thead th,.accordion .config .data-table thead th th,.accordion .config .data-table tfoot td th,.accordion .config .accordion .config .data-table tfoot td th th{border:solid #c9c2b8;border-width:0 0 1px;padding:7px}.data-table td,.data-table tbody tr th,.data-table tbody tr td,.accordion .config .data-table td{background:#fff;border-width:0;padding:5px 7px;vertical-align:middle}.data-table tbody tr:nth-child(odd) th,.data-table tbody tr:nth-child(odd) td,.accordion .config .data-table tbody tr:nth-child(odd) td{background:#fbfaf6}.data-table tbody.odd tr th,.data-table tbody.odd tr td{background:#fbfaf6}.data-table tbody.even tr th,.data-table tbody.even tr td{background:#fff}.data-table tfoot tr:last-child th,.data-table tfoot tr:last-child td,.data-table .accordion .config .data-table tfoot tr:last-child td{border:0}.data-table.order-tables tbody td{vertical-align:top}.data-table.order-tables tbody:hover tr th,.data-table.order-tables tbody:hover tr td{background:#f7f3eb}.data-table.order-tables tfoot td{background:#f2ebde;color:#676056;font-size:13px;font-weight:600}.data-table input[type=text]{width:98%;padding-left:1%;padding-right:1%}.data-table select{margin:0;box-sizing:border-box}.data-table .col-actions .actions-split{margin-top:4px}.data-table .col-actions .actions-split [class^=action-]{background:0 0;border:1px solid #c8c3b5;padding:3px 5px;color:#bbb3a6;font-size:12px}.data-table .col-actions .actions-split [class^=action-]:first-child{border-right:0}.data-table .col-actions .actions-split .dropdown-menu{margin-top:-1px}.data-table .col-actions .actions-split .dropdown-menu a{display:block;color:#333;text-decoration:none}.data-table .col-actions .actions-split.active .action-toggle{position:relative;border-bottom-right-radius:0;box-shadow:none;background:#fff}.data-table .col-actions .actions-split.active .action-toggle:after{position:absolute;top:100%;left:0;right:0;height:2px;margin-top:-1px;background:#fff;content:'';z-index:2}.data-table .col-actions .actions-split.active .action-toggle .dropdown-menu{border-top-right-radius:0}.data-table .col-default{white-space:nowrap;text-align:center;vertical-align:middle}.data-table .col-delete{text-align:center;width:32px}.data-table .col-file{white-space:nowrap}.data-table .col-file input,.data-table .col-file .input-text{margin:0 5px;width:40%}.data-table .col-file input:first-child,.data-table .col-file .input-text:first-child{margin-left:0}.data-table .col-actions-add{padding:10px 0}.grid-actions{background:#fff;font-size:13px;line-height:28px;padding:10px 15px;position:relative}.grid-actions+.grid{padding-top:5px}.grid-actions .export,.grid-actions .filter-actions{float:right;margin-left:10px;vertical-align:top}.grid-actions .import{display:block;vertical-align:top}.grid-actions .action-reset{background:0 0;border:0;display:inline;line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;margin:6px 10px 0 0;vertical-align:top}.grid-actions .action-reset:visited{color:purple;text-decoration:none}.grid-actions .action-reset:hover{color:#006bb4;text-decoration:underline}.grid-actions .action-reset:active{color:#ff5501;text-decoration:underline}.grid-actions .action-reset:hover{color:#006bb4}.grid-actions .action-reset:hover,.grid-actions .action-reset:active,.grid-actions .action-reset:focus{background:0 0;border:0}.grid-actions .action-reset.disabled,.grid-actions .action-reset[disabled],fieldset[disabled] .grid-actions .action-reset{color:#1979c3;text-decoration:underline;cursor:default;pointer-events:none;opacity:.5}.grid-actions .import .label,.grid-actions .export .label,.massaction>.entry-edit .label{margin:0 14px 0 0;vertical-align:inherit}.grid-actions .import .action-,.grid-actions .export .action-,.grid-actions .filter-actions .action-,.massaction>.entry-edit .action-{vertical-align:inherit}.grid-actions .filter .date{float:left;margin:0 15px 0 0;position:relative}.grid-actions .filter .date:before{color:#676056;top:1px}.grid-actions .filter .date:hover:before{color:#31302b}.grid-actions .filter .label{margin:0}.grid-actions .filter .hasDatepicker{margin:0 5px;width:80px}.grid-actions .filter .show-by .select{margin-left:5px;padding:4px 4px 5px;vertical-align:top;width:auto}.grid-actions .filter.required:after{content:''}.grid-actions img{vertical-align:middle;height:22px;width:22px}.grid-actions .validation-advice{background:#f9d4d4;border:1px solid #e22626;border-radius:3px;color:#e22626;margin:5px 0 0;padding:3px 7px;position:absolute;white-space:nowrap;z-index:5}.grid-actions .validation-advice:before{width:0;height:0;border:5px solid transparent;border-bottom-color:#e22626;content:'';left:50%;margin-left:-5px;position:absolute;top:-11px}.grid-actions input[type=text].validation-failed{border-color:#e22626;box-shadow:0 0 8px rgba(226,38,38,.6)}.grid-actions .link-feed{white-space:nowrap}.pager{font-size:13px}.grid .pager{margin:15px 0 0;position:relative;text-align:center}.pager .pages-total-found{margin-right:25px}.pager .view-pages .select{margin:0 5px}.pager .link-feed{font-size:12px;margin:7px 15px 0 0;position:absolute;right:0;top:0}.pager .action-previous,.pager .action-next{background:0 0;border:0;display:inline;line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;line-height:.6;overflow:hidden;width:20px}.pager .action-previous:visited,.pager .action-next:visited{color:purple;text-decoration:none}.pager .action-previous:hover,.pager .action-next:hover{color:#006bb4;text-decoration:underline}.pager .action-previous:active,.pager .action-next:active{color:#ff5501;text-decoration:underline}.pager .action-previous:hover,.pager .action-next:hover{color:#006bb4}.pager .action-previous:hover,.pager .action-next:hover,.pager .action-previous:active,.pager .action-next:active,.pager .action-previous:focus,.pager .action-next:focus{background:0 0;border:0}.pager .action-previous.disabled,.pager .action-next.disabled,.pager .action-previous[disabled],.pager .action-next[disabled],fieldset[disabled] .pager .action-previous,fieldset[disabled] .pager .action-next{color:#1979c3;text-decoration:underline;cursor:default;pointer-events:none;opacity:.5}.pager .action-previous:before,.pager .action-next:before{margin-left:-10px}.pager .action-previous.disabled,.pager .action-next.disabled{opacity:.3}.pager .action-previous{display:inline-block;text-decoration:none}.pager .action-previous>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pager .action-previous>span.focusable:active,.pager .action-previous>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-previous>span.focusable:active,.pager .action-previous>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:40px;line-height:inherit;color:#026294;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.pager .action-previous:hover:before{color:#007dbd}.pager .action-next{display:inline-block;text-decoration:none}.pager .action-next>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pager .action-next>span.focusable:active,.pager .action-next>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-next>span.focusable:active,.pager .action-next>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.pager .action-next:before{font-family:'icons-blank-theme';content:'\e608';font-size:40px;line-height:inherit;color:#026294;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.pager .action-next:hover:before{color:#007dbd}.pager .input-text{height:25px;line-height:16px;margin-right:5px;text-align:center;width:25px;vertical-align:top}.pager .pages-total{line-height:25px;vertical-align:top}.massaction{background:#fff;border-top:1px solid #f2ebde;font-size:13px;line-height:28px;padding:15px 15px 0}.massaction>.entry-edit{float:right}.massaction>.entry-edit .field-row{display:inline-block;vertical-align:top}.massaction>.entry-edit .validation-advice{display:none !important}.massaction>.entry-edit .form-inline{display:inline-block}.massaction>.entry-edit .label{padding:0;width:auto}.massaction>.entry-edit .action-{vertical-align:top}.massaction .select.validation-failed{border:1px dashed #e22626;background:#f9d4d4}.grid-severity-critical,.grid-severity-major,.grid-severity-notice,.grid-severity-minor{background:#feeee1;border:1px solid #ed4f2e;color:#ed4f2e;display:block;padding:0 3px;font-weight:700;line-height:17px;text-transform:uppercase;text-align:center}.grid-severity-critical,.grid-severity-major{border-color:#e22626;background:#f9d4d4;color:#e22626}.grid-severity-notice{border-color:#5b8116;background:#d0e5a9;color:#185b00}.grid tbody td input[type=text],.data-table tbody td input[type=text],.grid tbody th input[type=text],.data-table tbody th input[type=text],.grid tbody td .input-text,.data-table tbody td .input-text,.grid tbody th .input-text,.data-table tbody th .input-text,.grid tbody td select,.data-table tbody td select,.grid tbody th select,.data-table tbody th select,.grid tbody td .select,.data-table tbody td .select,.grid tbody th .select,.data-table tbody th .select{width:99%}.ui-tabs-panel .grid .col-sku{max-width:150px;width:150px}.col-indexer_status,.col-indexer_mode{width:160px}.fieldset-wrapper .grid-actions+.grid{padding-top:15px}.fieldset-wrapper .grid-actions{padding:10px 0 0}.fieldset-wrapper .grid{padding:0}.fieldset-wrapper .massaction{padding:0;border-top:none;margin-bottom:15px}.accordion .grid{padding:0}.ui-dialog-content .grid-actions,.ui-dialog-content .grid{padding-left:0;padding-right:0}.qty-table td{border:0;padding:0 5px 3px}.sales-order-create-index .sales-order-create-index .grid table .action-configure{float:right}.sales-order-create-index .data-table .border td{padding-bottom:15px}.sales-order-create-index .actions.update{margin:10px 0}.adminhtml-order-shipment-new .grid .col-product{max-width:770px;width:770px}.customer-index-index .grid .col-name{max-width:90px;width:90px}.customer-index-index .grid .col-billing_region{width:70px}.adminhtml-cms-hierarchy-index .col-title,.adminhtml-cms-hierarchy-index .col-identifier{max-width:410px;width:410px}.adminhtml-widget-instance-edit .grid-chooser .control{margin-top:-19px;width:80%}.eq-ie9 .adminhtml-widget-instance-edit .grid-chooser .control{margin-top:-18px}.adminhtml-widget-instance-edit .grid-chooser .control .grid-actions{padding:0 0 15px}.adminhtml-widget-instance-edit .grid-chooser .control .grid{padding:0}.adminhtml-widget-instance-edit .grid-chooser .control .addon input:last-child,.adminhtml-widget-instance-edit .grid-chooser .control .addon select:last-child{border-radius:0}.reports-report-product-sold .grid .col-name{max-width:720px;width:720px}.adminhtml-system-store-index .grid td{max-width:310px}.adminhtml-system-currency-index .grid{padding-top:0}.adminhtml-system-currency-index .col-currency-edit-rate{min-width:40px}.adminhtml-system-currency-index .col-base-currency{font-weight:700}.adminhtml-system-currency-index .old-rate{display:block;margin-top:3px;text-align:center}.adminhtml-system-currency-index .hor-scroll{overflow-x:auto;min-width:970px}.adminhtml-system-currencysymbol-index .col-currency{width:35%}.adminhtml-system-currencysymbol-index .grid .input-text{margin:0 10px 0 0;width:50%}.catalog-product-set-index .col-set_name{max-width:930px;width:930px}.adminhtml-export-index .grid td{vertical-align:middle}.adminhtml-export-index .grid .input-text-range{margin:0 10px 0 5px;width:37%}.adminhtml-export-index .grid .input-text-range-date{margin:0 5px;width:32%}.adminhtml-export-index .ui-datepicker-trigger{display:inline-block;margin:-3px 10px 0 0;vertical-align:middle}.adminhtml-notification-index .grid .col-select,.adminhtml-cache-index .grid .col-select,.adminhtml-process-list .grid .col-select,.indexer-indexer-list .grid .col-select{width:10px}@font-face{font-family:'icons-blank-theme';src:url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');font-weight:400;font-style:normal}@font-face{font-family:'icons-blank-theme';src:url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'),url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');font-weight:400;font-style:normal}.navigation{background-color:#676056;position:relative;z-index:5}.navigation .level-0.reverse>.submenu{right:1px}.navigation>ul{position:relative;text-align:right}.navigation .level-0>.submenu{display:none;position:absolute;top:100%;padding:19px 13px}.navigation .level-0>.submenu a{display:block;color:#676056;font-size:13px;font-weight:400;line-height:1.385;padding:3px 12px 3px;text-decoration:none}.navigation .level-0>.submenu a:focus,.navigation .level-0>.submenu a:hover{text-decoration:underline}.navigation .level-0>.submenu a:hover{color:#fff;background:#989287;text-decoration:none}.navigation .level-0>.submenu li{margin-bottom:1px}.navigation .level-0>.submenu a[href="#"]{cursor:default;display:block;color:#676056;font-size:14px;font-weight:700;line-height:1;margin:7px 0 6px;padding:0 12px}.navigation .level-0>.submenu a[href="#"]:focus,.navigation .level-0>.submenu a[href="#"]:hover{color:#676056;font-size:14px;font-weight:700;background:0 0;text-decoration:none}.navigation .level-0{display:inline-block;float:left;text-align:left;transition:display .15s ease-out}.navigation .level-0>a{background:0 0;display:block;padding:12px 13px 0;color:#f2ebde;font-size:13px;font-weight:600;text-transform:uppercase;text-decoration:none;transition:background .15s ease-out}.navigation .level-0>a:after{content:"";display:block;margin-top:10px;height:3px;font-size:0}.navigation .level-0.active>a{font-weight:700}.navigation .level-0.active>a:after{background:#ef672f}.navigation .level-0.hover.recent>a{background:#fff;color:#676056;font-size:13px;font-weight:600}.navigation .level-0.hover.recent>a:after{background:0 0}.navigation .level-0.hover.recent.active>a{font-weight:700}.navigation .level-0>.submenu{opacity:0;visibility:hidden}.navigation .level-0.recent.hover>.submenu{opacity:1;visibility:visible}.no-js .navigation .level-0:hover>.submenu,.no-js .navigation .level-0.hover>.submenu,.no-js .navigation .level-0>a:focus+.submenu{display:block}.navigation .level-0>.submenu{background:#fff;box-shadow:0 3px 3px rgba(50,50,50,.15)}.navigation .level-0>.submenu li{max-width:200px}.navigation .level-0>.submenu>ul{white-space:nowrap}.navigation .level-0>.submenu .column{display:inline-block;margin-left:40px;vertical-align:top}.navigation .level-0>.submenu .column:first-child{margin-left:0}.navigation .level-0 .submenu .level-1{white-space:normal}.navigation .level-0.parent .submenu .level-1.parent{margin:17px 0 25px}.navigation .level-0.parent .level-1.parent:first-child{margin-top:0}.navigation .level-2 .submenu{margin-left:7px}.navigation .level-0>.submenu .level-2>a[href="#"]{font-size:13px;margin-top:10px;margin-left:7px}.navigation .level-2>.submenu a{font-size:12px;line-height:1.231}.navigation .level-0>.submenu .level-3>a[href="#"],.navigation .level-3 .submenu{margin-left:15px}.navigation .level-0.item-system,.navigation .level-0.item-stores{float:none}.navigation .level-0.item-system>.submenu,.navigation .level-0.item-stores>.submenu{left:auto;right:1px}.adminhtml-dashboard-index .col-1-layout{max-width:1300px;border:none;border-radius:0;padding:0;background:#f7f3eb}.dashboard-inner{padding-top:35px}.dashboard-inner:before,.dashboard-inner:after{content:"";display:table}.dashboard-inner:after{clear:both}.dashboard-inner:before,.dashboard-inner:after{content:"";display:table}.dashboard-inner:after{clear:both}.dashboard-secondary{float:left;width:32%;margin:0 1.5%}.dashboard-main{float:right;width:65%}.dashboard-diagram-chart{max-width:100%;height:auto}.dashboard-diagram-nodata,.dashboard-diagram-switcher{padding:20px 0}.dashboard-diagram-image{background:#fff url(../mui/images/ajax-loader-small.gif) no-repeat 50% 50%}.dashboard-container .ui-tabs-panel{background-color:#fff;min-height:40px;padding:15px}.dashboard-store-stats{margin-top:35px}.dashboard-store-stats .ui-tabs-panel{background:#fff url(../mui/images/ajax-loader-small.gif) no-repeat 50% 50%}.dashboard-item{margin-bottom:30px}.dashboard-item-header{margin-left:5px}.dashboard-item.dashboard-item-primary{margin-bottom:35px}.dashboard-item.dashboard-item-primary .title{font-size:22px;margin-bottom:5px}.dashboard-item.dashboard-item-primary .dashboard-sales-value{display:block;text-align:right;font-weight:600;font-size:30px;margin-right:12px;padding-bottom:5px}.dashboard-item.dashboard-item-primary:first-child{color:#ef672f}.dashboard-item.dashboard-item-primary:first-child .title{color:#ef672f}.dashboard-totals{background:#fff;padding:50px 15px 25px}.dashboard-totals-list{margin:0;padding:0;list-style:none none}.dashboard-totals-list:before,.dashboard-totals-list:after{content:"";display:table}.dashboard-totals-list:after{clear:both}.dashboard-totals-list:before,.dashboard-totals-list:after{content:"";display:table}.dashboard-totals-list:after{clear:both}.dashboard-totals-item{float:left;width:18%;margin-left:7%;padding-top:15px;border-top:2px solid #cac3b4}.dashboard-totals-item:first-child{margin-left:0}.dashboard-totals-label{display:block;font-size:16px;font-weight:600;padding-bottom:2px}.dashboard-totals-value{color:#ef672f;font-size:20px}.dashboard-data{width:100%}.dashboard-data thead{background:0 0}.dashboard-data thead tr{background:0 0}.dashboard-data th,.dashboard-data td{border:none;padding:10px 12px;text-align:right}.dashboard-data th:first-child,.dashboard-data td:first-child{text-align:left}.dashboard-data th{color:#676056;font-weight:600}.dashboard-data td{background-color:transparent}.dashboard-data tbody tr:hover td{background-color:transparent}.dashboard-data tbody tr:nth-child(odd) td,.dashboard-data tbody tr:nth-child(odd):hover td,.dashboard-data tbody tr:nth-child(odd) th,.dashboard-data tbody tr:nth-child(odd):hover th{background-color:#e1dbcf}.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd) td,.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd):hover td,.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd) th,.ui-tabs-panel .dashboard-data tbody tr:nth-child(odd):hover th{background-color:#f7f3eb}.dashboard-data td.empty-text{text-align:center}.ui-tabs-panel .dashboard-data{background-color:#fff}.mage-dropdown-dialog.ui-dialog .ui-dialog-content{overflow:visible}.mage-dropdown-dialog.ui-dialog .ui-dialog-buttonpane{padding:0}.message-system-inner{background:#f7f3eb;border:1px solid #c0bbaf;border-top:0;border-radius:0 0 5px 5px;float:right;overflow:hidden}.message-system-unread .message-system-inner{float:none}.message-system-list{margin:0;padding:0;list-style:none;float:left}.message-system .message-system-list{width:75%}.message-system-list li{padding:5px 13px 7px 36px;position:relative}.message-system-short{padding:5px 13px 7px;float:right}.message-system-short span{display:inline-block;margin-left:7px;border-left:1px #d1ccc3 solid}.message-system-short span:first-child{border:0;margin-left:0}.message-system-short a{padding-left:27px;position:relative;height:16px}.message-system .message-system-short a:before,.message-system-list li:before{font-family:'MUI-Icons';font-style:normal;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;height:16px;width:16px;font-size:16px;line-height:16px;text-align:center;position:absolute;left:7px;top:2px}.message-system-list li:before{top:5px;left:13px}.message-system .message-system-short .warning a:before,.message-system-list li.warning:before{content:"\e006";color:#f2a825}.message-system .message-system-short .error a:before,.message-system-list li.error:before{content:"\e086";font-family:'MUI-Icons';color:#c00815}.ui-dialog .message-system-list{margin-bottom:25px}.sales-order-create-index .order-errors .notice{color:#ed4f2e;font-size:11px;margin:5px 0 0}.order-errors .fieldset-wrapper-title .title{box-sizing:border-box;background:#fffbf0;border:1px solid #d87e34;border-radius:5px;color:#676056;font-size:14px;margin:20px 0;padding:10px 26px 10px 35px;position:relative}.order-errors .fieldset-wrapper-title .title:before{position:absolute;left:11px;top:50%;margin-top:-11px;width:auto;height:auto;font-family:'MUI-Icons';font-style:normal;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;font-size:16px;line-height:inherit;content:'\e046';color:#d87e34}.search-global.miniform{position:relative;z-index:1000;display:inline-block;vertical-align:top;margin:6px 10px 0}.search-global.miniform .mage-suggest{border:0;border-radius:0}.search-global-actions{display:none}.search-global-field{margin:0}.search-global-field .label{position:absolute;right:4px;z-index:2;cursor:pointer;display:inline-block;text-decoration:none}.search-global-field .label>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.search-global-field .label>span.focusable:active,.search-global-field .label>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.search-global-field .label>span.focusable:active,.search-global-field .label>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.search-global-field .label:before{font-family:'MUI-Icons';content:"\e01f";font-size:18px;line-height:29px;color:#cac3b4;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.search-global-field .control{width:48px;overflow:hidden;opacity:0;transition:all .3s ease}.search-global-field .control input[type=text]{background:0 0;border:none;width:100%}.search-global-field.active{z-index:2}.search-global-field.active .label:before{display:none}.search-global-field.active .control{overflow:visible;opacity:1;transition:all .3s ease;width:300px}.search-global-menu{box-sizing:border-box;display:block;width:100%}.notifications-summary{display:inline-block;text-align:left;position:relative;z-index:1}.notifications-summary.active{z-index:999}.notifications-action{color:#f2ebde;padding:12px 22px 11px;text-transform:capitalize;display:inline-block;text-decoration:none}.notifications-action:before{font-family:"MUI-Icons";content:"\e06e";font-size:18px;line-height:18px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.notifications-action:visited,.notifications-action:focus,.notifications-action:active,.notifications-action:hover{color:#f2ebde;text-decoration:none}.notifications-action.active{background-color:#fff;color:#676056}.notifications-action .text{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.notifications-action .text.focusable:active,.notifications-action .text.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-action .text.focusable:active,.notifications-action .text.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-action .qty.counter{display:inline-block;background:#ed4f2e;color:#f2ebde;font-size:12px;line-height:12px;font-weight:700;padding:1px 3px;position:absolute;top:6px;left:50%;border-radius:4px}.notifications-list{width:300px;padding:0;margin:0}.notifications-list .last{padding:10px;text-align:center;font-size:12px}.notifications-summary .notifications-entry{padding:15px;color:#676056;font-size:11px;font-weight:400}.notifications-entry{position:relative;z-index:1}.notifications-entry:hover .action{display:block}.notifications-entry-title{padding-right:15px;color:#ed4f2e;font-size:12px;font-weight:600;display:block;margin-bottom:10px}.notifications-entry-description{line-height:1.3;display:block;max-height:3.9em;overflow:hidden;margin-bottom:10px;text-overflow:ellipsis}.notifications-close.action{position:absolute;z-index:1;top:12px;right:12px;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;display:none}.notifications-close.action>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.notifications-close.action>span.focusable:active,.notifications-close.action>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-close.action>span.focusable:active,.notifications-close.action>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-close.action:before{font-family:'MUI-Icons';content:"\e07f";font-size:16px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.notifications-close.action:focus,.notifications-close.action:active{background:0 0;border:none}.notifications-close.action:hover{background:0 0;border:none}.notifications-close.action.disabled,.notifications-close.action[disabled],fieldset[disabled] .notifications-close.action{cursor:not-allowed;pointer-events:none;opacity:.5}.notifications-dialog-content{display:none}.notifications-critical .notifications-entry-title{padding-left:25px;display:inline-block;text-decoration:none}.notifications-critical .notifications-entry-title:before{font-family:'MUI-Icons';content:"\e086";font-size:18px;line-height:18px;color:#c00815;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.notifications-critical .notifications-entry-title:before{position:absolute;margin-left:-25px}.notifications-dialog-content .notifications-entry-time{color:#8c867e;font-size:13px;font-family:Helvetica,Arial,sans-serif;position:absolute;right:17px;bottom:27px;text-align:right}.notifications-url{display:inline-block;text-decoration:none}.notifications-url>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.notifications-url>span.focusable:active,.notifications-url>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-url>span.focusable:active,.notifications-url>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.notifications-url:after{font-family:'MUI-Icons';content:"\e084";font-size:16px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:-2px 0 0 10px}.notifications-dialog-content .notifications-entry-title{font-size:15px}.locale-switcher-field{white-space:nowrap;float:left}.locale-switcher-field .control,.locale-switcher-field .label{vertical-align:middle;margin:0 10px 0 0;display:inline-block}.locale-switcher-select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;border:1px solid #ada89e;max-width:200px;height:31px;background:url("../images/select-bg.svg") no-repeat 100% 50%;background-size:30px 60px;padding-right:29px;text-indent:.01px;text-overflow:''}.locale-switcher-select::-ms-expand{display:none}.lt-ie10 .locale-switcher-select{background-image:none;padding-right:4px}@-moz-document url-prefix(){.locale-switcher-select{background-image:none}}@-moz-document url-prefix(){.locale-switcher-select{background-image:none}}.mage-suggest{text-align:left;box-sizing:border-box;position:relative;display:inline-block;vertical-align:top;width:100%;background-color:#fff;border:1px solid #ada89e;border-radius:2px}.mage-suggest:after{position:absolute;top:3px;right:3px;bottom:0;width:22px;text-align:center;font-family:'MUI-Icons';font-style:normal;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;content:'\e01f';font-size:18px;color:#b2b2b2}.mage-suggest input[type=search],.mage-suggest input.search{width:100%;border:none;background:0 0;padding-right:30px}.mage-suggest.category-select input[type=search],.mage-suggest.category-select input.search{height:26px}.mage-suggest-dropdown{position:absolute;left:0;right:0;top:100%;margin:1px -1px 0;border:1px solid #cac2b5;background:#fff;box-shadow:0 2px 4px rgba(0,0,0,.2);z-index:990}.mage-suggest-dropdown ul{margin:0;padding:0;list-style:none}.mage-suggest-dropdown li{border-bottom:1px solid #e5e5e5;padding:0}.mage-suggest-dropdown li a{display:block}.mage-suggest-dropdown li a.ui-state-focus{background:#f5f5f5}.mage-suggest-dropdown li a,.mage-suggest-dropdown .jstree li a:hover,.mage-suggest-dropdown .jstree .jstree-hovered,.mage-suggest-dropdown .jstree .jstree-clicked{padding:6px 12px 5px;text-decoration:none;color:#333}.mage-suggest-dropdown .jstree li a:hover,.mage-suggest-dropdown .jstree .jstree-hovered,.mage-suggest-dropdown .jstree .jstree-clicked{border:none}.mage-suggest-dropdown .jstree li{border-bottom:0}.mage-suggest-dropdown .jstree li a{display:inline-block}.mage-suggest-dropdown .jstree .mage-suggest-selected>a{color:#000;background:#f1ffeb}.field-category_ids .mage-suggest-dropdown,.field-new_category_parent .mage-suggest-dropdown{max-height:200px;overflow:auto}.mage-suggest-dropdown .jstree .mage-suggest-selected>a:hover,.mage-suggest-dropdown .jstree .mage-suggest-selected>.jstree-hovered,.mage-suggest-dropdown .jstree .mage-suggest-selected>.jstree-clicked,.mage-suggest-dropdown .jstree .mage-suggest-selected.mage-suggest-not-active>.jstree-hovered,.mage-suggest-dropdown .jstree .mage-suggest-selected.mage-suggest-not-active>.jstree-clicked{background:#e5ffd9}.mage-suggest-dropdown .jstree .mage-suggest-not-active>a{color:#d4d4d4}.mage-suggest-dropdown .jstree .mage-suggest-not-active>a:hover,.mage-suggest-dropdown .jstree .mage-suggest-not-active>.jstree-hovered,.mage-suggest-dropdown .jstree .mage-suggest-not-active>.jstree-clicked{background:#f5f5f5}.mage-suggest-dropdown .category-path{font-size:11px;margin-left:10px;color:#9ba8b5}.suggest-expandable .action-dropdown .action-toggle{display:inline-block;max-width:500px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background:0 0;border:none;box-shadow:none;color:#676056;font-size:12px;padding:5px 4px;filter:none}.suggest-expandable .action-dropdown .action-toggle span{display:inline}.suggest-expandable .action-dropdown .action-toggle:before{display:inline-block;float:right;margin-left:4px;font-size:13px;color:#b2b0ad}.suggest-expandable .action-dropdown .action-toggle:hover:before{color:#7e7e7e}.suggest-expandable .dropdown-menu{margin:1px 0 0;left:0;right:auto;width:245px;z-index:4}.suggest-expandable .mage-suggest{border:none;border-radius:3px 3px 0 0}.suggest-expandable .mage-suggest:after{top:10px;right:8px}.suggest-expandable .mage-suggest-inner .title{margin:0;padding:0 10px 4px;text-transform:uppercase;color:#a6a098;font-size:12px;border-bottom:1px solid #e5e5e5}.suggest-expandable .mage-suggest-inner>input[type=search],.suggest-expandable .mage-suggest-inner>input.search{position:relative;margin:6px 5px 5px;padding-right:20px;border:1px solid #ada89e;width:236px;z-index:1}.suggest-expandable .mage-suggest-inner>input.ui-autocomplete-loading,.suggest-expandable .mage-suggest-inner>input.mage-suggest-state-loading{background:#fff url("../mui/images/ajax-loader-small.gif") no-repeat 190px 50%}.suggest-expandable .mage-suggest-dropdown{margin-top:0;border-top:0;border-radius:0 0 3px 3px;max-height:300px;overflow:auto;width:100%;float:left}.suggest-expandable .mage-suggest-dropdown ul{margin:0;padding:0;list-style:none}.suggest-expandable .action-show-all:hover,.suggest-expandable .action-show-all:active,.suggest-expandable .action-show-all:focus,.suggest-expandable .action-show-all[disabled]{border-top:1px solid #e5e5e5;display:block;width:100%;padding:8px 10px 10px;text-align:left;font:12px/1.333 Arial,Verdana,sans-serif;color:#676056}.product-actions .suggest-expandable{max-width:500px;float:left;margin-top:1px}.page-actions.fixed #product-template-suggest-container{display:none}.catalog-category-edit .col-2-left-layout:before{display:none}.category-content .ui-tabs-panel .fieldset{padding-top:40px}.category-content .ui-tabs-panel .fieldset .legend{display:none}.attributes-edit-form .field:not(.field-weight) .addon{display:block;position:relative}.attributes-edit-form .field:not(.field-weight) .addon input[type=text]{border-width:1px}.attributes-edit-form .field:not(.field-weight) .addon .addafter{display:block;border:0;height:auto;width:auto}.attributes-edit-form .field:not(.field-weight) .addon input:focus~.addafter{box-shadow:none}.attributes-edit-form .with-addon .textarea{margin:0}.attributes-edit-form .attribute-change-checkbox{display:block;margin-top:5px}.attributes-edit-form .attribute-change-checkbox .label{float:none;padding:0;width:auto}.attributes-edit-form .attribute-change-checkbox .checkbox{margin-right:5px;width:auto}.attributes-edit-form .field-price .addon>input,.attributes-edit-form .field-special_price .addon>input,.attributes-edit-form .field-gift_wrapping_price .addon>input,.attributes-edit-form .field-msrp .addon>input,.attributes-edit-form .field-gift_wrapping_price .addon>input{padding-left:23px}.attributes-edit-form .field-price .addafter>strong,.attributes-edit-form .field-special_price .addafter>strong,.attributes-edit-form .field-gift_wrapping_price .addafter>strong,.attributes-edit-form .field-msrp .addafter>strong,.attributes-edit-form .field-gift_wrapping_price .addafter>strong{left:5px;position:absolute;top:3px}.attributes-edit-form .field.type-price input:focus+label,.attributes-edit-form .field-price input:focus+label,.attributes-edit-form .field-special_price input:focus+label,.attributes-edit-form .field-msrp input:focus+label,.attributes-edit-form .field-weight input:focus+label{box-shadow:none}.attributes-edit-form .field-special_from_date>.control .input-text,.attributes-edit-form .field-special_to_date>.control .input-text,.attributes-edit-form .field-news_from_date>.control .input-text,.attributes-edit-form .field-news_to_date>.control .input-text,.attributes-edit-form .field-custom_design_from>.control .input-text,.attributes-edit-form .field-custom_design_to>.control .input-text{border-width:1px;width:130px}.attributes-edit-form .field-weight .fields-group-2 .control{padding-right:27px}.attributes-edit-form .field-weight .fields-group-2 .control .addafter+.addafter{border-width:1px 1px 1px 0;border-style:solid;height:28px;right:0;position:absolute;top:0}.attributes-edit-form .field-weight .fields-group-2 .control .addafter strong{line-height:28px}.attributes-edit-form .field-weight .fields-group-2 .control>input:focus+.addafter+.addafter{box-shadow:0 0 8px rgba(82,168,236,.6)}.attributes-edit-form .field-gift_message_available .addon>input[type=checkbox],.attributes-edit-form .field-gift_wrapping_available .addon>input[type=checkbox]{width:auto;margin-right:5px}.attributes-edit-form .fieldset>.addafter{display:none}.advanced-inventory-edit .field.choice{display:block;margin:3px 0 0}.advanced-inventory-edit .field.choice .label{padding-top:1px}.product-actions:before,.product-actions:after{content:"";display:table}.product-actions:after{clear:both}.product-actions:before,.product-actions:after{content:"";display:table}.product-actions:after{clear:both}.product-actions .switcher{float:right}#configurable-attributes-container .actions-select{display:inline-block;position:relative}#configurable-attributes-container .actions-select:before,#configurable-attributes-container .actions-select:after{content:"";display:table}#configurable-attributes-container .actions-select:after{clear:both}#configurable-attributes-container .actions-select:before,#configurable-attributes-container .actions-select:after{content:"";display:table}#configurable-attributes-container .actions-select:after{clear:both}#configurable-attributes-container .actions-select .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}#configurable-attributes-container .actions-select .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#configurable-attributes-container .actions-select .action.toggle:hover:after{color:inherit}#configurable-attributes-container .actions-select .action.toggle:active:after{color:inherit}#configurable-attributes-container .actions-select .action.toggle.active{display:inline-block;text-decoration:none}#configurable-attributes-container .actions-select .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#configurable-attributes-container .actions-select .action.toggle.active:hover:after{color:inherit}#configurable-attributes-container .actions-select .action.toggle.active:active:after{color:inherit}#configurable-attributes-container .actions-select ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}#configurable-attributes-container .actions-select ul.dropdown li{margin:0;padding:3px 5px}#configurable-attributes-container .actions-select ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}#configurable-attributes-container .actions-select.active{overflow:visible}#configurable-attributes-container .actions-select.active ul.dropdown{display:block}#configurable-attributes-container .actions-select .action.toggle{padding:1px 8px;border:1px solid #ada89e;background:#fff;border-radius:0 2px 2px 0}#configurable-attributes-container .actions-select .action.toggle:after{width:14px;text-indent:-2px}#configurable-attributes-container .actions-select ul.dropdown li:hover{background:#eef8fc}#configurable-attributes-container .actions-select ul.dropdown a{color:#333;text-decoration:none}#product-variations-matrix .actions-image-uploader{display:inline-block;position:relative;display:block;width:50px}#product-variations-matrix .actions-image-uploader:before,#product-variations-matrix .actions-image-uploader:after{content:"";display:table}#product-variations-matrix .actions-image-uploader:after{clear:both}#product-variations-matrix .actions-image-uploader:before,#product-variations-matrix .actions-image-uploader:after{content:"";display:table}#product-variations-matrix .actions-image-uploader:after{clear:both}#product-variations-matrix .actions-image-uploader .action.split{float:left;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle{float:right;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle{padding:6px 5px;display:inline-block;text-decoration:none}#product-variations-matrix .actions-image-uploader .action.toggle>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle:hover:after{color:inherit}#product-variations-matrix .actions-image-uploader .action.toggle:active:after{color:inherit}#product-variations-matrix .actions-image-uploader .action.toggle.active{display:inline-block;text-decoration:none}#product-variations-matrix .actions-image-uploader .action.toggle.active>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:active,#product-variations-matrix .actions-image-uploader .action.toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}#product-variations-matrix .actions-image-uploader .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}#product-variations-matrix .actions-image-uploader .action.toggle.active:hover:after{color:inherit}#product-variations-matrix .actions-image-uploader .action.toggle.active:active:after{color:inherit}#product-variations-matrix .actions-image-uploader ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}#product-variations-matrix .actions-image-uploader ul.dropdown li{margin:0;padding:3px 5px}#product-variations-matrix .actions-image-uploader ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}#product-variations-matrix .actions-image-uploader.active{overflow:visible}#product-variations-matrix .actions-image-uploader.active ul.dropdown{display:block}#product-variations-matrix .actions-image-uploader .action.toggle{padding:0 2px;border:1px solid #b7b2a7;background:#fff;border-radius:0 4px 4px 0;border-left:none;height:33px}#product-variations-matrix .actions-image-uploader .action.toggle.no-display{display:none}#product-variations-matrix .actions-image-uploader .action.toggle:after{width:12px;text-indent:-5px}#product-variations-matrix .actions-image-uploader ul.dropdown{left:0;margin-left:0;width:100px}#product-variations-matrix .actions-image-uploader ul.dropdown li:hover{background:#eef8fc}#product-variations-matrix .actions-image-uploader ul.dropdown a{color:#333;text-decoration:none}.debugging-hints .page-actions{position:relative;z-index:1}.debugging-hints .page-actions .debugging-hint-template-file{left:auto !important;right:0 !important}.filter-segments{list-style:none;padding:0}.adminhtml-report-customer-test-detail .col-id{width:35px}.adminhtml-report-customer-test-detail .col-period{white-space:nowrap;width:70px}.adminhtml-report-customer-test-detail .col-zip{width:50px}.adminhtml-report-customer-test-segment .col-id{width:35px}.adminhtml-report-customer-test-segment .col-status{width:65px}.adminhtml-report-customer-test-segment .col-qty{width:145px}.adminhtml-report-customer-test-segment .col-segment,.adminhtml-report-customer-test-segment .col-website{width:35%}.adminhtml-report-customer-test-segment .col-select{width:45px}.test-custom-attributes{margin-bottom:20px}.adminhtml-test-index th.col-id{text-align:left}.adminhtml-test-index .col-price{text-align:right;width:50px}.adminhtml-test-index .col-actions{width:50px}.adminhtml-test-index .col-select{width:60px}.adminhtml-test-edit .field-image .control{line-height:28px}.adminhtml-test-edit .field-image a{display:inline-block;margin:0 5px 0 0}.adminhtml-test-edit .field-image img{vertical-align:middle}.adminhtml-test-new .field-image .input-file,.adminhtml-test-edit .field-image .input-file{display:inline-block;margin:0 15px 0 0;width:auto}.adminhtml-test-new .field-image .addafter,.adminhtml-test-edit .field-image .addafter{border:0;box-shadow:none;display:inline-block;margin:0 15px 0 0;height:auto;width:auto}.adminhtml-test-new .field-image .delete-image,.adminhtml-test-edit .field-image .delete-image{display:inline-block;white-space:nowrap}.adminhtml-test-edit .field-image .delete-image input{margin:-3px 5px 0 0;width:auto;display:inline-block}.adminhtml-test-edit .field-image .addon .delete-image input:focus+label{border:0;box-shadow:none}.adminhtml-test-index .col-id{width:35px}.adminhtml-test-index .col-status{white-space:normal;width:75px}.adminhtml-test-index .col-websites{white-space:nowrap;width:200px}.adminhtml-test-index .col-price .label{display:inline-block;min-width:60px;white-space:nowrap}.adminhtml-test-index .col-price .price-excl-tax .price,.adminhtml-test-index .col-price .price-incl-tax .price{font-weight:700}.invitee_information,.inviter_information{width:48.9362%}.invitee_information{float:left}.inviter_information{float:right}.test_information .data-table th,.invitee_information .data-table th,.inviter_information .data-table th{width:20%;white-space:nowrap}.test_information .data-table textarea,.test_information .data-table input{width:100%}.tests-history ul{margin:0;padding-left:25px}.tests-history ul .status:before{display:inline-block;content:"|";margin:0 10px}.adminhtml-report-test-order .col-period{white-space:nowrap;width:70px}.adminhtml-report-test-order .col-inv-sent,.adminhtml-report-test-order .col-inv-acc,.adminhtml-report-test-order .col-acc,.adminhtml-report-test-order .col-rate{text-align:right;width:23%}.adminhtml-report-test-customer .col-id{width:35px}.adminhtml-report-test-customer .col-period{white-space:nowrap;width:70px}.adminhtml-report-test-customer .col-inv-sent,.adminhtml-report-test-customer .col-inv-acc{text-align:right;width:120px}.adminhtml-report-test-index .col-period{white-space:nowrap}.adminhtml-report-test-index .col-inv-sent,.adminhtml-report-test-index .col-inv-acc,.adminhtml-report-test-index .col-inv-disc,.adminhtml-report-test-index .col-inv-acc-rate,.adminhtml-report-test-index .col-inv-disc-rate{text-align:right;width:19%}.test_information .data-table,.invitee_information .data-table,.inviter_information .data-table{width:100%}.test_information .data-table tbody tr th,.invitee_information .data-table tbody tr th,.inviter_information .data-table tbody tr th{font-weight:700}.test_information .data-table tbody tr td,.test_information .data-table tbody tr th,.invitee_information .data-table tbody tr td,.invitee_information .data-table tbody tr th,.inviter_information .data-table tbody tr td,.inviter_information .data-table tbody tr th{background-color:#fff;border:0;padding:9px 10px 10px;color:#666;vertical-align:top}.test_information .data-table tbody tr:nth-child(2n+1) td,.test_information .data-table tbody tr:nth-child(2n+1) th,.invitee_information .data-table tbody tr:nth-child(2n+1) td,.invitee_information .data-table tbody tr:nth-child(2n+1) th,.inviter_information .data-table tbody tr:nth-child(2n+1) td,.inviter_information .data-table tbody tr:nth-child(2n+1) th{background-color:#fbfaf6}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table .col-sort-order{width:80px}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table td,[class^=" adminhtml-test-"] .fieldset-wrapper-content .accordion .config .data-table td{vertical-align:top}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table td select,[class^=" adminhtml-test-"] .fieldset-wrapper-content .accordion .config .data-table td select{display:block;width:100%}[class^=" adminhtml-test-"] .fieldset-wrapper-content .data-table td .input-radio.global-scope,[class^=" adminhtml-test-"] .fieldset-wrapper-content .accordion .config .data-table td .input-radio.global-scope{margin-top:9px}.sales-order-create-index .ui-dialog .content>.test .field.text .input-text{width:100%}.sales-order-create-index .ui-dialog .content>.test .note .price{font-weight:600}.sales-order-create-index .ui-dialog .content>.test .note .price:before{content:": "}.sales-order-create-index .ui-dialog .content>.test .fixed.amount .label:after{content:": "}.sales-order-create-index .ui-dialog .content>.test .fixed.amount .control{display:inline-block;font-weight:600}.sales-order-create-index .ui-dialog .content>.test .fixed.amount .control .control-value{margin:-2px 0 0;padding:0}.eq-ie9 [class^=" adminhtml-test-"] .custom-options .data-table{word-wrap:normal;table-layout:auto}.rma-items .col-actions a.disabled,.newRma .col-actions a.disabled{cursor:default;opacity:.5}.rma-items .col-actions a.disabled:hover,.newRma .col-actions a.disabled:hover{text-decoration:none}.block.mselect-list .mselect-input{width:100%}.block.mselect-list .mselect-input-container .mselect-save{top:4px}.block.mselect-list .mselect-input-container .mselect-cancel{top:4px}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body,html{height:100%;min-height:100%}body{color:#676056;font-family:'Open Sans',sans-serif;line-height:1.33;font-weight:400;font-size:1.4rem;background:#f2ebde;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}body>*{-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0;-webkit-flex-basis:auto;flex-basis:auto}.page-wrapper{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;min-height:100%;width:100%;max-width:100%;min-width:990px}.page-wrapper>*{-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0;-webkit-flex-basis:auto;flex-basis:auto}.page-header{text-align:right}.page-header-wrapper{background-color:#31302b}.page-header:after{content:"";display:table;clear:both}.page-header .logo{margin-top:5px;float:left;text-decoration:none;display:inline-block}.page-header .logo:before{content:"";display:inline-block;vertical-align:middle;width:109px;height:35px;background-image:url("../images/logo.svg");background-size:109px 70px;background-repeat:no-repeat}.page-header .logo:after{display:inline-block;vertical-align:middle;margin-left:10px;content:attr(data-edition);font-weight:600;font-size:16px;color:#ef672f;margin-top:-2px}.page-header .logo span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.page-header .logo span.focusable:active,.page-header .logo span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.page-header .logo span.focusable:active,.page-header .logo span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.page-header .dropdown-menu{border:0}.admin-user{display:inline-block;vertical-align:top;position:relative;text-align:left}.admin-user-account{text-decoration:none;display:inline-block;padding:12px 14px;color:#f2ebde}.admin-user-account:after{font-family:"MUI-Icons";content:"\e02c";font-size:13px;line-height:13px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:-3px 0 0}.admin-user-account:link,.admin-user-account:visited{color:#f2ebde}.admin-user-account:focus,.admin-user-account:active,.admin-user-account:hover{color:#f2ebde;text-decoration:none}.active .admin-user-account{background-color:#fff;color:#676056}.admin-user-menu{padding:15px;white-space:nowrap;margin-top:0}.admin-user-menu li{border:0;padding:0}.admin-user-menu li:hover{background:0 0}.admin-user-menu a{display:block;color:#676056;font-size:13px;font-weight:400;line-height:1.385;padding:3px 12px 3px;text-decoration:none}.admin-user-menu a:focus,.admin-user-menu a:hover{text-decoration:underline}.admin-user-menu a:hover{color:#fff;background:#989287;text-decoration:none}.admin-user-menu a span:before{content:"("}.admin-user-menu a span:after{content:")"}.page-actions.fixed .page-actions-buttons{padding-right:15px}.page-main-actions{background:#e0dace;color:#645d53;padding:15px;margin-left:auto;margin-right:auto;box-sizing:border-box}.page-main-actions:before,.page-main-actions:after{content:"";display:table}.page-main-actions:after{clear:both}.page-main-actions:before,.page-main-actions:after{content:"";display:table}.page-main-actions:after{clear:both}.page-main-actions .page-actions{float:right}.page-main-actions .page-actions .page-actions-buttons{float:right;display:-webkit-flex;display:-ms-flexbox;display:flex;justify-content:flex-end}.page-main-actions .page-actions button,.page-main-actions .page-actions .action-add.mselect-button-add{margin-left:13px}.page-main-actions .page-actions button.primary,.page-main-actions .page-actions .action-add.mselect-button-add.primary{float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-main-actions .page-actions button.save:not(.primary),.page-main-actions .page-actions .action-add.mselect-button-add.save:not(.primary){float:right;-ms-flex-order:1;-webkit-order:1;order:1}.page-main-actions .page-actions button.back,.page-main-actions .page-actions button.action-back,.page-main-actions .page-actions button.delete,.page-main-actions .page-actions .action-add.mselect-button-add.back,.page-main-actions .page-actions .action-add.mselect-button-add.action-back,.page-main-actions .page-actions .action-add.mselect-button-add.delete{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;margin:0 13px}.page-main-actions .page-actions button.back:focus,.page-main-actions .page-actions button.action-back:focus,.page-main-actions .page-actions button.delete:focus,.page-main-actions .page-actions button.back:active,.page-main-actions .page-actions button.action-back:active,.page-main-actions .page-actions button.delete:active,.page-main-actions .page-actions .action-add.mselect-button-add.back:focus,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:focus,.page-main-actions .page-actions .action-add.mselect-button-add.delete:focus,.page-main-actions .page-actions .action-add.mselect-button-add.back:active,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:active,.page-main-actions .page-actions .action-add.mselect-button-add.delete:active{background:0 0;border:none}.page-main-actions .page-actions button.back:hover,.page-main-actions .page-actions button.action-back:hover,.page-main-actions .page-actions button.delete:hover,.page-main-actions .page-actions .action-add.mselect-button-add.back:hover,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:hover,.page-main-actions .page-actions .action-add.mselect-button-add.delete:hover{background:0 0;border:none}.page-main-actions .page-actions button.back.disabled,.page-main-actions .page-actions button.action-back.disabled,.page-main-actions .page-actions button.delete.disabled,.page-main-actions .page-actions button.back[disabled],.page-main-actions .page-actions button.action-back[disabled],.page-main-actions .page-actions button.delete[disabled],fieldset[disabled] .page-main-actions .page-actions button.back,fieldset[disabled] .page-main-actions .page-actions button.action-back,fieldset[disabled] .page-main-actions .page-actions button.delete,.page-main-actions .page-actions .action-add.mselect-button-add.back.disabled,.page-main-actions .page-actions .action-add.mselect-button-add.action-back.disabled,.page-main-actions .page-actions .action-add.mselect-button-add.delete.disabled,.page-main-actions .page-actions .action-add.mselect-button-add.back[disabled],.page-main-actions .page-actions .action-add.mselect-button-add.action-back[disabled],.page-main-actions .page-actions .action-add.mselect-button-add.delete[disabled],fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-add.back,fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-add.action-back,fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-add.delete{cursor:not-allowed;pointer-events:none;opacity:.5}.ie .page-main-actions .page-actions button.back,.ie .page-main-actions .page-actions button.action-back,.ie .page-main-actions .page-actions button.delete,.ie .page-main-actions .page-actions .action-add.mselect-button-add.back,.ie .page-main-actions .page-actions .action-add.mselect-button-add.action-back,.ie .page-main-actions .page-actions .action-add.mselect-button-add.delete{margin-top:6px}.page-main-actions .page-actions button.delete,.page-main-actions .page-actions .action-add.mselect-button-add.delete{color:#e22626;float:left;-ms-flex-order:-1;-webkit-order:-1;order:-1}.page-main-actions .page-actions button.back,.page-main-actions .page-actions button.action-back,.page-main-actions .page-actions .action-add.mselect-button-add.back,.page-main-actions .page-actions .action-add.mselect-button-add.action-back{float:left;-ms-flex-order:-1;-webkit-order:-1;order:-1;display:inline-block;text-decoration:none}.page-main-actions .page-actions button.back:before,.page-main-actions .page-actions button.action-back:before,.page-main-actions .page-actions .action-add.mselect-button-add.back:before,.page-main-actions .page-actions .action-add.mselect-button-add.action-back:before{font-family:'icons-blank-theme';content:'\e625';font-size:inherit;line-height:normal;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0 2px 0 0}.page-main-actions .page-actions .actions-split{margin-left:13px;float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-main-actions .page-actions .actions-split button.primary,.page-main-actions .page-actions .actions-split .action-add.mselect-button-add.primary{float:left}.page-main-actions .page-actions .actions-split .dropdown-menu{text-align:left}.page-main-actions .page-actions .actions-split .dropdown-menu .item{display:block}.page-main-actions .page-actions.fixed{position:fixed;top:0;left:0;right:0;z-index:10;padding:0;background:-webkit-linear-gradient(top,#f5f2ed 0%,#f5f2ed 56%,rgba(245,242,237,0) 100%);background:-ms-linear-gradient(top,#f5f2ed 0%,#f5f2ed 56%,rgba(245,242,237,0) 100%);background:linear-gradient(to bottom,#f5f2ed 0%,#f5f2ed 56%,rgba(245,242,237,0) 100%);background:#e0dace}.page-main-actions .page-actions.fixed .page-actions-inner{position:relative;padding-top:15px;padding-bottom:15px;min-height:36px;text-align:right;box-sizing:border-box}.page-main-actions .page-actions.fixed .page-actions-inner:before,.page-main-actions .page-actions.fixed .page-actions-inner:after{content:"";display:table}.page-main-actions .page-actions.fixed .page-actions-inner:after{clear:both}.page-main-actions .page-actions.fixed .page-actions-inner:before,.page-main-actions .page-actions.fixed .page-actions-inner:after{content:"";display:table}.page-main-actions .page-actions.fixed .page-actions-inner:after{clear:both}.page-main-actions .page-actions.fixed .page-actions-inner:before{text-align:left;content:attr(data-title);float:left;font-size:20px;max-width:50%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.lt-ie10 .page-main-actions .page-actions.fixed .page-actions-inner{background:#f5f2ed}.page-main-actions .store-switcher{margin-top:5px}.store-switcher{display:inline-block;font-size:13px}.store-switcher .label{margin-right:5px}.store-switcher .actions.dropdown{display:inline-block;position:relative}.store-switcher .actions.dropdown:before,.store-switcher .actions.dropdown:after{content:"";display:table}.store-switcher .actions.dropdown:after{clear:both}.store-switcher .actions.dropdown:before,.store-switcher .actions.dropdown:after{content:"";display:table}.store-switcher .actions.dropdown:after{clear:both}.store-switcher .actions.dropdown .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.store-switcher .actions.dropdown .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:20px;color:#645d53;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.store-switcher .actions.dropdown .action.toggle:hover:after{color:#645d53}.store-switcher .actions.dropdown .action.toggle:active:after{color:#645d53}.store-switcher .actions.dropdown .action.toggle.active{display:inline-block;text-decoration:none}.store-switcher .actions.dropdown .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:20px;color:#645d53;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.store-switcher .actions.dropdown .action.toggle.active:hover:after{color:#645d53}.store-switcher .actions.dropdown .action.toggle.active:active:after{color:#645d53}.store-switcher .actions.dropdown .dropdown-menu{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px #ada89e solid;position:absolute;z-index:100;top:100%;min-width:195px;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.store-switcher .actions.dropdown .dropdown-menu li{margin:0;padding:0}.store-switcher .actions.dropdown .dropdown-menu li:hover{background:0 0;cursor:pointer}.store-switcher .actions.dropdown.active{overflow:visible}.store-switcher .actions.dropdown.active .dropdown-menu{display:block}.store-switcher .actions.dropdown .action.toggle{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;color:#026294;line-height:normal;margin-top:2px;vertical-align:middle}.store-switcher .actions.dropdown .action.toggle:focus,.store-switcher .actions.dropdown .action.toggle:active{background:0 0;border:none}.store-switcher .actions.dropdown .action.toggle:hover{background:0 0;border:none}.store-switcher .actions.dropdown .action.toggle.disabled,.store-switcher .actions.dropdown .action.toggle[disabled],fieldset[disabled] .store-switcher .actions.dropdown .action.toggle{cursor:not-allowed;pointer-events:none;opacity:.5}.store-switcher .actions.dropdown ul.dropdown-menu{margin-top:4px;padding-top:5px;left:0}.store-switcher .actions.dropdown ul.dropdown-menu li{border:0;cursor:default}.store-switcher .actions.dropdown ul.dropdown-menu li:hover{cursor:default}.store-switcher .actions.dropdown ul.dropdown-menu li a,.store-switcher .actions.dropdown ul.dropdown-menu li span{padding:5px 13px;display:block;color:#645d53}.store-switcher .actions.dropdown ul.dropdown-menu li a{text-decoration:none}.store-switcher .actions.dropdown ul.dropdown-menu li a:hover{background:#edf9fb}.store-switcher .actions.dropdown ul.dropdown-menu li span{color:#ababab;cursor:default}.store-switcher .actions.dropdown ul.dropdown-menu li.current span{color:#645d53;background:#eee}.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store a,.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store span{padding-left:26px}.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store-view a,.store-switcher .actions.dropdown ul.dropdown-menu .store-switcher-store-view span{padding-left:39px}.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar{border-top:1px #ededed solid;margin-top:10px}.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar a{display:inline-block;text-decoration:none;display:block}.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar a:before{font-family:'icons-blank-theme';content:'\e606';font-size:20px;line-height:normal;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:text-top;text-align:center;margin:0 3px 0 -4px}.tooltip{display:inline-block;margin-left:5px}.tooltip .help span,.tooltip .help a{width:16px;height:16px;text-align:center;background:rgba(194,186,169,.5);cursor:pointer;border-radius:10px;vertical-align:middle;display:inline-block;text-decoration:none}.tooltip .help span:hover,.tooltip .help a:hover{background:#c2baa9}.tooltip .help span>span,.tooltip .help a>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.tooltip .help span>span.focusable:active,.tooltip .help a>span.focusable:active,.tooltip .help span>span.focusable:focus,.tooltip .help a>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.tooltip .help span>span.focusable:active,.tooltip .help a>span.focusable:active,.tooltip .help span>span.focusable:focus,.tooltip .help a>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.tooltip .help span:before,.tooltip .help a:before{font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;content:'?';font-size:13px;line-height:16px;color:#5a534a;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center}.tooltip .help span:before,.tooltip .help a:before{font-weight:700}.tooltip .tooltip-content{display:none;position:absolute;max-width:200px;margin-top:10px;margin-left:-19px;padding:4px 8px;border-radius:3px;background:#000;background:rgba(49,48,43,.8);color:#fff;text-shadow:none;z-index:20}.tooltip .tooltip-content:before{content:'';position:absolute;width:0;height:0;top:-5px;left:20px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000;opacity:.8}.tooltip .tooltip-content.loading{position:absolute}.tooltip .tooltip-content.loading:before{border-bottom-color:rgba(0,0,0,.3)}.tooltip:hover>.tooltip-content{display:block}button,.action-add.mselect-button-add{border-radius:2px;background-image:none;background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;display:inline-block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:0;vertical-align:middle}button:focus,button:active,.action-add.mselect-button-add:focus,.action-add.mselect-button-add:active{background:#cac3b4;border:1px solid #989287}button:hover,.action-add.mselect-button-add:hover{background:#cac3b4}button.disabled,button[disabled],fieldset[disabled] button,.action-add.mselect-button-add.disabled,.action-add.mselect-button-add[disabled],fieldset[disabled] .action-add.mselect-button-add{cursor:default;pointer-events:none;opacity:.5}button.primary,.action-add.mselect-button-add.primary{background-image:none;background:#007dbd;padding:6px 13px;color:#fff;border:1px solid #0a6c9f;cursor:pointer;display:inline-block;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;box-sizing:border-box;vertical-align:middle}button.primary:focus,button.primary:active,.action-add.mselect-button-add.primary:focus,.action-add.mselect-button-add.primary:active{background:#026294;border:1px solid #004c74;color:#fff}button.primary:hover,.action-add.mselect-button-add.primary:hover{background:#026294;border:1px solid #026294}button.primary.disabled,button.primary[disabled],fieldset[disabled] button.primary,.action-add.mselect-button-add.primary.disabled,.action-add.mselect-button-add.primary[disabled],fieldset[disabled] .action-add.mselect-button-add.primary{cursor:default;pointer-events:none;opacity:.5}.actions-split{display:inline-block;position:relative;vertical-align:middle}.actions-split button,.actions-split .action-add.mselect-button-add{margin-left:0!important}.actions-split:before,.actions-split:after{content:"";display:table}.actions-split:after{clear:both}.actions-split:before,.actions-split:after{content:"";display:table}.actions-split:after{clear:both}.actions-split .action-default{float:left;margin:0}.actions-split .action-toggle{float:right;margin:0}.actions-split button.action-default,.actions-split .action-add.mselect-button-add.action-default{border-top-right-radius:0;border-bottom-right-radius:0}.actions-split button+.action-toggle,.actions-split .action-add.mselect-button-add+.action-toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.actions-split .action-toggle{padding:6px 5px;display:inline-block;text-decoration:none}.actions-split .action-toggle>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.actions-split .action-toggle>span.focusable:active,.actions-split .action-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle>span.focusable:active,.actions-split .action-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.actions-split .action-toggle:hover:after{color:inherit}.actions-split .action-toggle:active:after{color:inherit}.actions-split .action-toggle.active{display:inline-block;text-decoration:none}.actions-split .action-toggle.active>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.actions-split .action-toggle.active>span.focusable:active,.actions-split .action-toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle.active>span.focusable:active,.actions-split .action-toggle.active>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.actions-split .action-toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:14px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.actions-split .action-toggle.active:hover:after{color:inherit}.actions-split .action-toggle.active:active:after{color:inherit}.actions-split .dropdown-menu{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:175px;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.actions-split .dropdown-menu li{margin:0;padding:3px 5px}.actions-split .dropdown-menu li:hover{background:#e8e8e8;cursor:pointer}.actions-split .dropdown-menu:before,.actions-split .dropdown-menu:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.actions-split .dropdown-menu:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff}.actions-split .dropdown-menu:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb}.actions-split .dropdown-menu:before{top:-12px;right:10px}.actions-split .dropdown-menu:after{top:-14px;right:9px}.actions-split.active{overflow:visible}.actions-split.active .dropdown-menu{display:block}.actions-split .action-toggle:after{height:13px}.page-content:after{content:"";display:table;clear:both}.page-wrapper>.page-content{margin-bottom:20px}.page-footer{padding:15px 0}.page-footer-wrapper{background-color:#e0dacf;margin-top:auto}.page-footer:after{content:"";display:table;clear:both}.footer-legal{float:right;width:550px}.footer-legal .link-report,.footer-legal .magento-version,.footer-legal .copyright{font-size:13px}.footer-legal:before{content:"";display:inline-block;vertical-align:middle;position:absolute;z-index:1;margin-top:2px;margin-left:-35px;width:30px;height:35px;background-size:109px 70px;background:url("../images/logo.svg") no-repeat 0 -21px}.icon-error{margin-left:15px;color:#c00815;font-size:11px}.icon-error:before{font-family:'MUI-Icons';content:"\e086";font-size:13px;line-height:13px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:-1px 5px 0 0}.ui-widget-overlay{position:fixed}.control .nested{padding:0}.control *:first-child{margin-bottom:0}.field-tooltip{display:inline-block;vertical-align:top;margin-top:5px;position:relative;z-index:1;width:0;overflow:visible}.field-choice .field-tooltip{margin-top:10px}.field-tooltip:hover{z-index:99}.field-tooltip-action{position:relative;z-index:2;margin-left:18px;width:22px;height:22px;display:inline-block;cursor:pointer}.field-tooltip-action:before{content:"?";font-weight:500;font-size:18px;display:inline-block;overflow:hidden;height:22px;border-radius:11px;line-height:22px;width:22px;text-align:center;color:#fff;background-color:#514943}.field-tooltip-action span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.field-tooltip-action span.focusable:active,.field-tooltip-action span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.field-tooltip-action span.focusable:active,.field-tooltip-action span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.control-text:focus+.field-tooltip-content,.field-tooltip:hover .field-tooltip-content{display:block}.field-tooltip-content{display:none;position:absolute;z-index:1;width:320px;background:#fff8d7;padding:15px 25px;right:-66px;border:1px solid #adadad;border-radius:1px;bottom:42px;box-shadow:0 2px 8px 0 rgba(0,0,0,.3)}.field-tooltip-content:after,.field-tooltip-content:before{content:"";display:block;width:0;height:0;border:16px solid transparent;border-top-color:#adadad;position:absolute;right:20px;top:100%;z-index:3}.field-tooltip-content:after{border-top-color:#fff8d7;margin-top:-1px;z-index:4}.form__field.field-error .control [class*=control-]{border-color:#e22626}.form__field.field-error .control [class*=control-]:before{border-color:#e22626}.form__field .mage-error{border:1px solid #e22626;display:block;margin:2px 0 0;padding:6px 10px 10px;background:#fff8d6;color:#555;font-size:12px;font-weight:500;box-sizing:border-box;max-width:380px}.no-flexbox.no-flexboxlegacy .form__field .control-addon+.mage-error{display:inline-block;width:100%}.form__field{position:relative;z-index:1}.form__field:hover{z-index:2}.control .form__field{position:static}.form__field[data-config-scope]:before{content:attr(data-config-scope);display:inline-block;position:absolute;color:gray;right:0;top:6px}.control .form__field[data-config-scope]:nth-child(n+2):before{content:""}.form__field.field-disabled>.label{color:#999}.form__field.field-disabled.field .control [class*=control-][disabled]{background-color:#e9e9e9;opacity:.5;color:#303030;border-color:#adadad}.control-fields .label~.control{width:100%}.form__field{border:0;padding:0}.form__field .note{color:#303030;padding:0;margin:10px 0 0;max-width:380px}.form__field .note:before{display:none}.form__field.form__field{margin-bottom:0}.form__field.form__field+.form__field.form__field{margin-top:15px}.form__field.form__field:not(.choice)~.choice{margin-left:20px;margin-top:5px}.form__field.form__field.choice~.choice{margin-top:9px}.form__field.form__field~.choice:last-child{margin-bottom:8px}.fieldset>.form__field{margin-bottom:30px}.form__field .label{color:#303030}.form__field:not(.choice)>.label{font-size:14px;font-weight:600;width:30%;padding-right:30px;padding-top:0;line-height:33px;white-space:nowrap}.form__field:not(.choice)>.label:before{content:".";visibility:hidden;width:0;margin-left:-7px;overflow:hidden}.form__field:not(.choice)>.label span{white-space:normal;display:inline-block;vertical-align:middle;line-height:1.2}.form__field.required>.label:after{content:"";margin-left:0}.form__field.required>.label span:after{content:"*";color:#eb5202;display:inline;font-weight:500;font-size:16px;margin-top:2px;position:absolute;z-index:1;margin-left:10px}.form__field .control-file{margin-top:6px}.form__field .control-select{line-height:33px}.form__field .control-select:not([multiple]),.form__field .control-text{height:33px;max-width:380px}.form__field .control-addon{max-width:380px}.form__field .control-textarea,.form__field .control-select,.form__field .control-text{border:1px solid #adadad;border-radius:1px;padding:0 10px;color:#303030;background-color:#fff;font-weight:500;font-size:15px;min-width:11em}.form__field .control-textarea:focus,.form__field .control-select:focus,.form__field .control-text:focus{outline:0;border-color:#007bdb;box-shadow:none}.form__field .control-text{line-height:auto}.form__field .control-textarea{padding-top:6px;padding-bottom:6px;line-height:1.18em}.form__field .control-select[multiple],.form__field .control-textarea{width:100%;height:calc(6*1.2em + 14px)}.form__field .control-value{display:inline-block;padding:6px 10px}.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:active,.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:active,.form__field .control-fields .form__field:nth-child(n+2):not(.choice)>.label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field .control-select{padding:0}.form__field .control-select option{box-sizing:border-box;padding:4px 10px;display:block}.form__field .control-select optgroup{font-weight:600;display:block;padding:4px 10px;line-height:33px;list-style:inside;font-style:normal}.form__field .control-range>.form__field:nth-child(2):before{content:"\2014";content:":";display:inline-block;margin-left:-25px;float:left;width:20px;line-height:33px;text-align:center}.form__field.choice{position:relative;z-index:1;padding-top:8px;padding-left:26px;padding-right:0}.form__field.choice .label{font-weight:500;padding:0;display:inline;float:none;line-height:18px}.form__field.choice input{position:absolute;top:8px;margin-top:3px!important}.form__field.choice input[disabled]+.label{opacity:.5;cursor:not-allowed}.control>.form__field.choice{max-width:380px}.control>.form__field.choice:nth-child(1):nth-last-child(2),.control>.form__field.choice:nth-child(2):nth-last-child(1){display:inline-block}.control>.form__field.choice:nth-child(1):nth-last-child(2)+.choice,.control>.form__field.choice:nth-child(2):nth-last-child(1)+.choice{margin-left:41px;margin-top:0}.control>.form__field.choice:nth-child(1):nth-last-child(2)+.choice:before,.control>.form__field.choice:nth-child(2):nth-last-child(1)+.choice:before{content:"";position:absolute;display:inline-block;height:20px;top:8px;left:-20px;width:1px;background:#ccc}.form__field.choice .label{cursor:pointer}.form__field.choice .label:before{content:"";position:absolute;z-index:1;border:1px solid #adadad;width:14px;height:14px;top:10px;left:0;border-radius:2px;background:url("../Magento_Ui/images/choice_bkg.png") no-repeat -100% -100%}.form__field.choice input:focus+.label:before{outline:0;border-color:#007bdb}.form__field.choice .control-radio+.label:before{border-radius:8px}.form__field.choice .control-radio:checked+.label:before{background-position:-26px -1px}.form__field.choice .control-checkbox:checked+.label:before{background-position:-1px -1px}.form__field.choice input{opacity:0}.fieldset>.form__field.choice{margin-left:30%}.form__field .control-after,.form__field .control-before{border:0;color:#858585;font-weight:300;font-size:15px;line-height:33px;display:inline-block;height:33px;box-sizing:border-box;padding:0 3px}.no-flexbox.no-flexboxlegacy .form__field .control-before,.no-flexbox.no-flexboxlegacy .form__field .control-addon{float:left;white-space:nowrap}.form__field .control-addon{display:inline-flex;max-width:380px;width:100%;flex-flow:row nowrap;position:relative;z-index:1}.form__field .control-addon>*{position:relative;z-index:1}.form__field .control-addon .control-text[disabled][type],.form__field .control-addon .control-select[disabled][type],.form__field .control-addon .control-select,.form__field .control-addon .control-text{background:transparent!important;border:0;width:auto;vertical-align:top;order:1;flex:1}.form__field .control-addon .control-text[disabled][type]:focus,.form__field .control-addon .control-select[disabled][type]:focus,.form__field .control-addon .control-select:focus,.form__field .control-addon .control-text:focus{box-shadow:none}.form__field .control-addon .control-text[disabled][type]:focus+label:before,.form__field .control-addon .control-select[disabled][type]:focus+label:before,.form__field .control-addon .control-select:focus+label:before,.form__field .control-addon .control-text:focus+label:before{outline:0;border-color:#007bdb}.form__field .control-addon .control-text[disabled][type]+label,.form__field .control-addon .control-select[disabled][type]+label,.form__field .control-addon .control-select+label,.form__field .control-addon .control-text+label{padding-left:10px;position:static!important;z-index:0}.form__field .control-addon .control-text[disabled][type]+label>*,.form__field .control-addon .control-select[disabled][type]+label>*,.form__field .control-addon .control-select+label>*,.form__field .control-addon .control-text+label>*{vertical-align:top;position:relative;z-index:2}.form__field .control-addon .control-text[disabled][type]+label:before,.form__field .control-addon .control-select[disabled][type]+label:before,.form__field .control-addon .control-select+label:before,.form__field .control-addon .control-text+label:before{box-sizing:border-box;border-radius:1px;border:1px solid #adadad;content:"";display:block;position:absolute;top:0;left:0;width:100%;height:100%;z-index:0;background:#fff}.form__field .control-addon .control-text[disabled][type][disabled]+label:before,.form__field .control-addon .control-select[disabled][type][disabled]+label:before,.form__field .control-addon .control-select[disabled]+label:before,.form__field .control-addon .control-text[disabled]+label:before{opacity:.5;background:#e9e9e9}.form__field .control-after{order:3}.form__field .control-after:last-child{padding-right:10px}.form__field .control-before{order:0}.form__field .control-some{display:flex}.form__field [class*=control-grouped]{display:table;width:100%;table-layout:fixed;box-sizing:border-box}.form__field [class*=control-grouped]>.form__field{display:table-cell;width:50%;vertical-align:top}.form__field [class*=control-grouped]>.form__field>.control{width:100%;float:none}.form__field [class*=control-grouped]>.form__field:nth-child(n+2){padding-left:20px}.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:active,.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:active,.form__field [class*=control-grouped]>.form__field:nth-child(n+2):not(.choice) .label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.form__field [required]{box-shadow:none}fieldset.form__field{position:relative}fieldset.form__field [class*=control-grouped]>.form__field:first-child>.label,fieldset.form__field .control-fields>.form__field:first-child>.label{position:absolute;left:0;top:0;opacity:0;cursor:pointer;width:30%}.control-text+.ui-datepicker-trigger{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;line-height:inherit;font-weight:400;text-decoration:none;margin-left:-40px;display:inline-block}.control-text+.ui-datepicker-trigger img{display:none}.control-text+.ui-datepicker-trigger:focus,.control-text+.ui-datepicker-trigger:active{background:0 0;border:none}.control-text+.ui-datepicker-trigger:hover{background:0 0;border:none}.control-text+.ui-datepicker-trigger.disabled,.control-text+.ui-datepicker-trigger[disabled],fieldset[disabled] .control-text+.ui-datepicker-trigger{cursor:not-allowed;pointer-events:none;opacity:.5}.control-text+.ui-datepicker-trigger>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.control-text+.ui-datepicker-trigger>span.focusable:active,.control-text+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.control-text+.ui-datepicker-trigger>span.focusable:active,.control-text+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.control-text+.ui-datepicker-trigger:after{font-family:'icons-blank-theme';content:'\e612';font-size:38px;line-height:33px;color:#514943;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}[class*=tab-nav-item]:not(ul):active,[class*=tab-nav-item]:not(ul):focus{box-shadow:none;outline:none}.customer-index-edit .col-2-left-layout,.customer-index-edit .col-1-layout{background:#fff}.customer-index-edit{background:#fff}.customer-index-edit .col-2-left-layout{background:#fff}.customer-index-edit .main-col{padding-left:40px}.customer-index-edit .page-main-actions{background:0 0}.tab-nav.block{margin-bottom:40px}.tab-nav.block:first-child{margin-top:16px}.tab-nav.block .block-title{padding:7px 20px}.tab-nav-items{padding:0;border:1px solid #d3d3d3;box-shadow:0 0 4px rgba(50,50,50,.35);margin:0 0 40px;background:#f7f7f7}.tab-nav-item{padding:0;list-style-type:none;border-bottom:1px solid #e0e0e0;position:relative;margin:0 15px;z-index:1}.tab-nav-item:last-child{border-bottom:0}.tab-nav-item.ui-state-active{z-index:2;background:#fff;padding:1px 14px;border:2px solid #eb5202;margin:-1px}.tab-nav-item.ui-state-active .tab-nav-item-link{padding:13px 15px 13px;color:#eb5202}.tab-nav-item.ui-tabs-loading{position:relative;z-index:1}.tab-nav-item.ui-tabs-loading:before{content:"";display:block;position:absolute;z-index:2;background:url("../images/loader-2.gif") no-repeat 50% 50%;background-size:120px;width:20px;height:20px;top:13px;left:-10px}.tab-nav-item.ui-tabs-loading.ui-state-active:before{top:12px;left:4px}.tab-nav-item-link{display:block;padding:15px;color:#666;line-height:1}.tab-nav-item-link:focus,.tab-nav-item-link:active,.tab-nav-item-link:hover{outline:0;color:#eb5202;text-decoration:none}.ui-state-active .tab-nav-item-link{color:#666;font-weight:600}.tab-nav-item-link.changed{font-style:italic}.listing-tiles{overflow:hidden;margin-top:-10px;margin-left:-10px}.listing-tiles .listing-tile{background-color:#f2ebde;display:block;width:238px;height:200px;float:left;border:1px solid #676056;margin-top:10px;margin-left:10px;border-radius:4px;text-align:center}.listing-tiles .listing-tile.disabled{border-color:red}.listing-tiles .listing-tile.enabled{border-color:green}.listing .disabled{color:red}.listing .enabled{color:green}.pager{text-align:left;padding-bottom:10px}.pager:before,.pager:after{content:"";display:table}.pager:after{clear:both}.pager:before,.pager:after{content:"";display:table}.pager:after{clear:both}.pager [data-part=left]{display:inline-block;width:45%;float:left;text-align:left}.pager [data-part=right]{display:inline-block;width:45%;text-align:right;float:right;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.pager .action-next{cursor:pointer}.pager .action-previous{cursor:pointer}.pager{text-align:left}.pager [data-part=left]{display:inline-block;width:45%;text-align:left}.pager [data-part=right]{display:inline-block;width:45%;text-align:right;float:right}.grid .col-title{min-width:90px;text-align:center}.grid-actions [data-part=search]{display:inline-block;margin:0 30px}.grid-actions [data-part=search] input[type=text]{vertical-align:bottom;width:460px}.grid .actions-split .dropdown-menu{right:auto;left:auto;text-align:left;color:#676056;font-weight:400}.grid .actions-split .dropdown-menu:after{right:auto;left:9px}.grid .actions-split .dropdown-menu:before{right:auto;left:10px}.grid .grid-actions{padding:10px 0}.grid .hor-scroll{padding-top:10px}.grid .select-box{display:inline-block;vertical-align:top;margin:-12px -10px -7px;padding:12px 10px 7px;width:100%}.filters-toggle{background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.filters-toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:30px;line-height:15px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.filters-toggle:hover:after{color:inherit}.filters-toggle:active:after{color:inherit}.filters-toggle:focus,.filters-toggle:active{background:#cac3b4;border:1px solid #989287}.filters-toggle:hover{background:#cac3b4}.filters-toggle.disabled,.filters-toggle[disabled],fieldset[disabled] .filters-toggle{cursor:default;pointer-events:none;opacity:.5}.filters-toggle:focus,.filters-toggle:active{background:0 0;border:none}.filters-toggle:hover{background:0 0;border:none}.filters-toggle.disabled,.filters-toggle[disabled],fieldset[disabled] .filters-toggle{cursor:not-allowed;pointer-events:none;opacity:.5}.filters-toggle:after{margin-top:2px;margin-left:-3px}.filters-toggle.active:after{content:'\e618'}.filters-current{padding:10px 0;display:none}.filters-current.active{display:block}.filters-items{margin:0;padding:0;list-style:none none;display:inline}.filters-item{display:inline-block;margin:0 5px 5px 0;padding:2px 2px 2px 4px;border-radius:3px;background:#f7f3eb}.filters-item .item-label{font-weight:600}.filters-item .item-label:after{content:": "}.filters-item .action-remove{background-image:none;background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;text-decoration:none;padding:0}.filters-item .action-remove>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.filters-item .action-remove>span.focusable:active,.filters-item .action-remove>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-item .action-remove>span.focusable:active,.filters-item .action-remove>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-item .action-remove:before{font-family:'icons-blank-theme';content:'\e616';font-size:16px;line-height:16px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.filters-item .action-remove:hover:before{color:inherit}.filters-item .action-remove:active:before{color:inherit}.filters-item .action-remove:focus,.filters-item .action-remove:active{background:#cac3b4;border:1px solid #989287}.filters-item .action-remove:hover{background:#cac3b4}.filters-item .action-remove.disabled,.filters-item .action-remove[disabled],fieldset[disabled] .filters-item .action-remove{cursor:default;pointer-events:none;opacity:.5}.filters-form{position:relative;z-index:1;margin:14px 0;background:#fff;border:1px solid #bbb;box-shadow:0 3px 3px rgba(0,0,0,.15)}.filters-form .action-close{position:absolute;top:3px;right:7px;background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.filters-form .action-close>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.filters-form .action-close>span.focusable:active,.filters-form .action-close>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-form .action-close>span.focusable:active,.filters-form .action-close>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters-form .action-close:before{font-family:'icons-blank-theme';content:'\e616';font-size:42px;line-height:42px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.filters-form .action-close:hover:before{color:inherit}.filters-form .action-close:active:before{color:inherit}.filters-form .action-close:focus,.filters-form .action-close:active{background:#cac3b4;border:1px solid #989287}.filters-form .action-close:hover{background:#cac3b4}.filters-form .action-close.disabled,.filters-form .action-close[disabled],fieldset[disabled] .filters-form .action-close{cursor:default;pointer-events:none;opacity:.5}.filters-form .action-close:focus,.filters-form .action-close:active{background:0 0;border:none}.filters-form .action-close:hover{background:0 0;border:none}.filters-form .action-close.disabled,.filters-form .action-close[disabled],fieldset[disabled] .filters-form .action-close{cursor:not-allowed;pointer-events:none;opacity:.5}.filters-actions{margin:18px;text-align:right}.filters-fieldset{padding-bottom:0}.filters-fieldset .field{border:0;margin:0 0 20px;box-sizing:border-box;display:inline-block;padding:0 12px 0 0;width:33.33333333%;vertical-align:top}.filters-fieldset .field:before,.filters-fieldset .field:after{content:"";display:table}.filters-fieldset .field:after{clear:both}.filters-fieldset .field:before,.filters-fieldset .field:after{content:"";display:table}.filters-fieldset .field:after{clear:both}.filters-fieldset .field.choice:before,.filters-fieldset .field.no-label:before{box-sizing:border-box;content:" ";height:1px;float:left;padding:6px 15px 0 0;width:35%}.filters-fieldset .field .description{box-sizing:border-box;float:left;padding:6px 15px 0 0;text-align:right;width:35%}.filters-fieldset .field:not(.choice)>.label{box-sizing:border-box;float:left;padding:6px 15px 0 0;text-align:right;width:35%}.filters-fieldset .field:not(.choice)>.control{float:left;width:65%}.filters-fieldset .field:last-child{margin-bottom:0}.filters-fieldset .field+.fieldset{clear:both}.filters-fieldset .field>.label{font-weight:700}.filters-fieldset .field>.label+br{display:none}.filters-fieldset .field .choice input{vertical-align:top}.filters-fieldset .field .fields.group:before,.filters-fieldset .field .fields.group:after{content:"";display:table}.filters-fieldset .field .fields.group:after{clear:both}.filters-fieldset .field .fields.group:before,.filters-fieldset .field .fields.group:after{content:"";display:table}.filters-fieldset .field .fields.group:after{clear:both}.filters-fieldset .field .fields.group .field{box-sizing:border-box;float:left}.filters-fieldset .field .fields.group.group-2 .field{width:50% !important}.filters-fieldset .field .fields.group.group-3 .field{width:33.3% !important}.filters-fieldset .field .fields.group.group-4 .field{width:25% !important}.filters-fieldset .field .fields.group.group-5 .field{width:20% !important}.filters-fieldset .field .addon{display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;padding:0;width:100%}.filters-fieldset .field .addon textarea,.filters-fieldset .field .addon select,.filters-fieldset .field .addon input{-ms-flex-order:2;-webkit-order:2;order:2;-webkit-flex-basis:100%;flex-basis:100%;box-shadow:none;display:inline-block;margin:0;width:auto}.filters-fieldset .field .addon .addbefore,.filters-fieldset .field .addon .addafter{-ms-flex-order:3;-webkit-order:3;order:3;display:inline-block;box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;width:auto;white-space:nowrap;vertical-align:middle}.filters-fieldset .field .addon .addbefore:disabled,.filters-fieldset .field .addon .addafter:disabled{opacity:.5}.filters-fieldset .field .addon .addbefore::-moz-placeholder,.filters-fieldset .field .addon .addafter::-moz-placeholder{color:#c2c2c2}.filters-fieldset .field .addon .addbefore::-webkit-input-placeholder,.filters-fieldset .field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.filters-fieldset .field .addon .addbefore:-ms-input-placeholder,.filters-fieldset .field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.filters-fieldset .field .addon .addbefore{float:left;-ms-flex-order:1;-webkit-order:1;order:1}.filters-fieldset .field .additional{margin-top:10px}.filters-fieldset .field.required>.label:after{content:'*';font-size:1.2rem;color:#e02b27;margin:0 0 0 5px}.filters-fieldset .field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.filters-fieldset .field .note:before{font-family:'icons-blank-theme';content:'\e618';font-size:24px;line-height:12px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.filters-fieldset .field .label{color:#676056;font-size:13px;font-weight:600;margin:0}.filters .field-date .group .hasDatepicker{width:100%;padding-right:30px}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger{background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;line-height:inherit;font-weight:400;text-decoration:none;margin-left:-33px;display:inline-block;width:30px}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger img{display:none}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:focus,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:active{background:0 0;border:none}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:hover{background:0 0;border:none}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger.disabled,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger[disabled],fieldset[disabled] .filters .field-date .group .hasDatepicker+.ui-datepicker-trigger{cursor:not-allowed;pointer-events:none;opacity:.5}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:active,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:active,.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.filters .field-date .group .hasDatepicker+.ui-datepicker-trigger:after{font-family:'icons-blank-theme';content:'\e612';font-size:35px;line-height:30px;color:#514943;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.filters .field-range .group .field{margin-bottom:0}.filters .field-range .group .control{width:100%;box-sizing:border-box;padding-right:0;position:relative;z-index:1}.mass-select{position:relative;margin:-6px -10px;padding:6px 2px 6px 10px;z-index:1;white-space:nowrap}.mass-select.active{background:rgba(0,0,0,.2)}.mass-select-toggle{background:#f2ebde;padding:6px 13px;color:#645d53;border:1px solid #ada89e;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;font-weight:500;line-height:1.4rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0 0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.mass-select-toggle>span{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.mass-select-toggle>span.focusable:active,.mass-select-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.mass-select-toggle>span.focusable:active,.mass-select-toggle>span.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.mass-select-toggle:before{font-family:'icons-blank-theme';content:'\e607';font-size:30px;line-height:15px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.mass-select-toggle:hover:before{color:inherit}.mass-select-toggle:active:before{color:inherit}.mass-select-toggle:focus,.mass-select-toggle:active{background:#cac3b4;border:1px solid #989287}.mass-select-toggle:hover{background:#cac3b4}.mass-select-toggle.disabled,.mass-select-toggle[disabled],fieldset[disabled] .mass-select-toggle{cursor:default;pointer-events:none;opacity:.5}.mass-select-toggle:focus,.mass-select-toggle:active{background:0 0;border:none}.mass-select-toggle:hover{background:0 0;border:none}.mass-select-toggle.disabled,.mass-select-toggle[disabled],fieldset[disabled] .mass-select-toggle{cursor:not-allowed;pointer-events:none;opacity:.5}.mass-select-toggle:before{margin-top:-2px;text-indent:-5px;color:#fff}.mass-select-toggle:hover:before{color:#fff}.mass-select-toggle:active:before,.mass-select-toggle.active:before{content:'\e618'}.mass-select-field{display:inline}.mass-select-menu{display:none;position:absolute;top:100%;left:0;text-align:left;margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;min-width:175px;box-shadow:0 3px 3px rgba(0,0,0,.15)}.mass-select-menu li{margin:0;padding:4px 15px;border-bottom:1px solid #e5e5e5}.mass-select-menu li:hover{background:#e8e8e8;cursor:pointer}.mass-select-menu span{font-weight:400;font-size:13px;color:#645d53}.mass-select-menu.active{display:block}.grid-loading-mask{position:absolute;left:0;top:0;right:0;bottom:0;background:rgba(255,255,255,.5);z-index:100}.grid-loading-mask .grid-loader{position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;width:218px;height:149px;background:url('../images/loader-2.gif') 50% 50% no-repeat}.addon input{border-width:1px 0 1px 1px}.addon input~.addafter strong{display:inline-block;background:#fff;line-height:24px;margin:0 3px 0 -2px;padding-left:4px;padding-right:4px;position:relative;font-size:12px;top:0}.addon input:focus~.addafter{border-color:#75b9f0;box-shadow:0 0 8px rgba(82,168,236,.6)}.addon input:focus~.addafter strong{margin-top:0}.addon .addafter{background:0 0;color:#a6a6a6;border-width:1px 1px 1px 0;border-radius:2px 2px 0 0;padding:0;border-color:#ada89e}.addon .pager input{border-width:1px}.field .control input[type=text][disabled],.field .control input[type=text][disabled]~.addafter,.field .control select[disabled],.field .control select[disabled]~.addafter{background-color:#fff;border-color:#eee;box-shadow:none;color:#999}.field .control input[type=text][disabled]~.addafter strong,.field .control select[disabled]~.addafter strong{background-color:#fff}.field-price.addon{direction:rtl}.field-price.addon>*{direction:ltr}.field-price.addon .addafter{border-width:1px 0 1px 1px;border-radius:2px 0 0 2px}.field-price.addon input:first-child{border-radius:0 2px 2px 0}.field-price input{border-width:1px 1px 1px 0}.field-price input:focus{box-shadow:0 0 8px rgba(82,168,236,.6)}.field-price input:focus~label.addafter{box-shadow:0 0 8px rgba(82,168,236,.6)}.field-price input~label.addafter strong{margin-left:2px;margin-right:-2px}.field-price.addon>input{width:99px;float:left}.field-price .control{position:relative}.field-price label.mage-error{position:absolute;left:0;top:30px}.version-fieldset .grid-actions{border-bottom:1px solid #f2ebde;margin:0 0 15px;padding:0 0 15px}.navigation>ul,.message-system,.page-header,.page-actions.fixed .page-actions-inner,.page-content,.page-footer{width:auto;min-width:960px;max-width:1300px;margin:0 auto;padding-left:15px;padding-right:15px;box-sizing:border-box;width:100%}.pager label.page,.filters .field-range .group .label,.mass-select-field .label{clip:rect(0,0,0,0);border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visually-hidden.focusable:active,.visually-hidden.focusable:focus,.pager label.page.focusable:active,.pager label.page.focusable:focus,.filters .field-range .group .label.focusable:active,.filters .field-range .group .label.focusable:focus,.mass-select-field .label.focusable:active,.mass-select-field .label.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}table th.required:after,.data-table th.required-entry:after,.data-table td.required-entry:after,.grid-actions .filter.required .label span:after,.grid-actions .required:after,.accordion .config .data-table td.required-entry:after{content:'*';color:#e22626;font-weight:400;margin-left:3px}.grid th.required:after,.grid th .required:after{content:'*';color:#f9d4d4;font-weight:400;margin-left:3px}.grid td.col-period,.grid td.col-date,.grid td.col-date_to,.grid td.col-date_from,.grid td.col-ended_at,.grid td.col-created_at,.grid td.col-updated_at,.grid td.col-customer_since,.grid td.col-session_start_time,.grid td.col-last_activity,.grid td.col-email,.grid td.col-name,.grid td.col-sku,.grid td.col-firstname,.grid td.col-lastname,.grid td.col-title,.grid td.col-label,.grid td.col-product,.grid td.col-set_name,.grid td.col-websites,.grid td.col-time,.grid td.col-billing_name,.grid td.col-shipping_name,.grid td.col-phone,.grid td.col-type,.product-options .grouped-items-table .col-name,.product-options .grouped-items-table .col-sku,.sales-order-create-index .data-table .col-product,[class^=' adminhtml-rma-'] .fieldset-wrapper .data-table td,[class^=' adminhtml-rma-'] .grid .col-product_sku,[class^=' adminhtml-rma-'] .grid .col-product_name,.col-grid_segment_name,.adminhtml-catalog-event-index .col-category,[class^=' catalog-search'] .col-search_query,[class^=' catalog-search'] .col-synonym_for,[class^=' catalog-search'] .col-redirect,.adminhtml-urlrewrite-index .col-request_path,.adminhtml-cms-page-index .col-title,.adminhtml-cms-page-index .col-identifier,.adminhtml-cms-hierarchy-index .col-title,.adminhtml-cms-hierarchy-index .col-identifier,.col-banner_name,.adminhtml-widget-instance-index .col-title,.reports-index-search .col-query_text,.adminhtml-rma-item-attribute-index .grid .col-attr-code,.adminhtml-system-store-index .grid td,.catalog-product-attribute-index .col-attr-code,.catalog-product-attribute-index .col-label,.adminhtml-export-index .col-code,.adminhtml-logging-index .grid .col-fullaction,.adminhtml-system-variable-index .grid .col-code,.adminhtml-logging-index .grid .col-info,.dashboard-secondary .dashboard-item tr>td:first-child,.ui-tabs-panel .dashboard-data .col-name,.data-table-td-max .data-table td,[class^=' adminhtml-rma-'] .fieldset-wrapper .accordion .config .data-table td,.data-table-td-max .accordion .config .data-table td,.order-account-information .data-table td,[class^=' adminhtml-rma-'] .rma-request-details .data-table td{overflow:hidden;text-overflow:ellipsis}td.col-period,td.col-date,td.col-date_to,td.col-date_from,td.col-ended_at,td.col-created_at,td.col-updated_at,td.col-customer_since,td.col-session_start_time,td.col-time,td.col-sku,td.col-type,[class^=' adminhtml-rma-'] #rma_items_grid_table .headings th,.adminhtml-process-list .col-action a,.adminhtml-process-list .col-mode{white-space:nowrap}table thead tr th:first-child,table tfoot tr th:first-child,table tfoot tr td:first-child{border-left:0}table thead tr th:last-child,table tfoot tr th:last-child,table tfoot tr td:last-child{border-right:0}.form-inline .grid-actions .label,.form-inline .massaction .label{padding:0;width:auto}.grid .col-action,.grid .col-actions,.grid .col-qty,.grid .col-purchases,.catalog-product-edit .ui-tabs-panel .grid .col-price,.catalog-product-edit .ui-tabs-panel .grid .col-position{width:50px}.grid .col-order-number,.grid .col-real_order_id,.grid .col-invoice-number,.grid .col-increment_id,.grid .col-transaction-id,.grid .col-parent-transaction-id,.grid .col-reference_id,.grid .col-status,.grid .col-price,.grid .col-position,.grid .col-base_grand_total,.grid .col-grand_total,.grid .col-sort_order,.grid .col-carts,.grid .col-priority,.grid .col-severity,.sales-order-create-index .col-in_products,[class^=' reports-'] [class^=col-total],[class^=' reports-'] [class^=col-average],[class^=' reports-'] [class^=col-ref-],[class^=' reports-'] [class^=col-rate],[class^=' reports-'] [class^=col-tax-amount],[class^=' adminhtml-customer-'] .col-required,.adminhtml-rma-item-attribute-index .col-required,[class^=' adminhtml-customer-'] .col-system,.adminhtml-rma-item-attribute-index .col-system,[class^=' adminhtml-customer-'] .col-is_visible,.adminhtml-rma-item-attribute-index .col-is_visible,[class^=' adminhtml-customer-'] .col-sort_order,.adminhtml-rma-item-attribute-index .col-sort_order,.catalog-product-attribute-index [class^=' col-is_'],.catalog-product-attribute-index .col-required,.catalog-product-attribute-index .col-system,.adminhtml-test-index .col-is_listed,[class^=' tests-report-test'] [class^=col-inv-]{width:70px}.grid .col-phone,.sales-order-view .grid .col-period,.sales-order-create-index .col-phone,[class^=' adminhtml-rma-'] .grid .col-product_sku,.adminhtml-rma-edit .col-product,.adminhtml-rma-edit .col-sku,.catalog-product-edit .ui-tabs-panel .grid .col-name,.catalog-product-edit .ui-tabs-panel .grid .col-type,.catalog-product-edit .ui-tabs-panel .grid .col-sku,.customer-index-index .grid .col-customer_since,.customer-index-index .grid .col-billing_country_id,[class^=' customer-index-'] .fieldset-wrapper .grid .col-created_at,[class^=' customer-index-'] .accordion .grid .col-created_at{max-width:70px;width:70px}.sales-order-view .grid .col-name,.sales-order-create-index .data-table .col-product,[class^=' adminhtml-rma-'] .grid .col-name,[class^=' adminhtml-rma-'] .grid .col-product,[class^=' catalog-search'] .col-search_query,[class^=' catalog-search'] .col-synonym_for,[class^=' catalog-search'] .col-redirect,.adminhtml-urlrewrite-index .col-request_path,.reports-report-shopcart-abandoned .grid .col-name,.tax-rule-index .grid .col-title,.adminhtml-rma-item-attribute-index .grid .col-attr-code,.dashboard-secondary .dashboard-item tr>td:first-child{max-width:150px;width:150px}[class^=' sales-order-'] .grid .col-name,.catalog-category-edit .grid .col-name,.adminhtml-catalog-event-index .col-category,.adminhtml-banner-edit .grid .col-name,.reports-report-product-lowstock .grid .col-sku,.newsletter-problem-index .grid .col-name,.newsletter-problem-index .grid .col-subject,.newsletter-problem-index .grid .col-product,.adminhtml-rma-item-attribute-index .grid .col-label,.adminhtml-export-index .col-label,.adminhtml-export-index .col-code,.adminhtml-scheduled-operation-index .grid .col-name,.adminhtml-logging-index .grid .col-fullaction,.test-report-customer-wishlist-wishlist .grid .col-name,.test-report-customer-wishlist-wishlist .grid .col-subject,.test-report-customer-wishlist-wishlist .grid .col-product{max-width:220px;width:220px}.grid .col-period,.grid .col-date,.grid .col-date_to,.grid .col-date_from,.grid .col-ended_at,.grid .col-created_at,.grid .col-updated_at,.grid .col-customer_since,.grid .col-session_start_time,.grid .col-last_activity,.grid .col-email,.grid .col-items_total,.grid .col-firstname,.grid .col-lastname,.grid .col-status-default,.grid .col-websites,.grid .col-time,.grid .col-billing_name,.grid .col-shipping_name,.sales-order-index .grid .col-name,.product-options .grouped-items-table .col-name,.product-options .grouped-items-table .col-sku,[class^=' sales-order-view'] .grid .col-customer_name,[class^=' adminhtml-rma-'] .grid .col-product_name,.catalog-product-index .grid .col-name,.catalog-product-review-index .grid .col-name,.catalog-product-review-index .grid .col-title,.customer-index-edit .ui-tabs-panel .grid .col-name,.review-product-index .grid .col-name,.adminhtml-cms-page-index .col-title,.adminhtml-cms-page-index .col-identifier,.catalog-product-attribute-index .col-attr-code,.catalog-product-attribute-index .col-label,.adminhtml-logging-index .grid .col-info{max-width:110px;width:110px}.grid .col-name,.grid .col-product,.col-banner_name,.adminhtml-widget-instance-index .col-title,[class^=' adminhtml-customer-'] .col-label,.adminhtml-rma-item-attribute-index .col-label,.adminhtml-system-variable-index .grid .col-code,.ui-tabs-panel .dashboard-data .col-name,.adminhtml-test-index .col-label{max-width:370px;width:370px}.col-grid_segment_name,.reports-index-search .col-query_text{max-width:570px;width:570px}[class^=' adminhtml-rma-'] .fieldset-wrapper .data-table td,.reports-report-product-lowstock .grid .col-name,.reports-report-shopcart-product .grid .col-name,.reports-report-review-customer .grid .col-name,[class^=' adminhtml-rma-'] .fieldset-wrapper .accordion .config .data-table td{max-width:670px;width:670px}.reports-report-sales-invoiced .grid .col-period,.reports-report-sales-refunde .grid .col-period,[class^=' tests-report-test'] .grid .col-period{width:auto}.grid .col-select,.grid .col-id,.grid .col-number{width:40px}.sales-order-create-index .grid,.sales-order-create-index .grid-actions,.adminhtml-export-index .grid-actions,.adminhtml-export-index .grid{padding-left:0;padding-right:0}[class^=' adminhtml-rma-'] .col-actions a,[class^=' customer-index-'] .col-action a,.adminhtml-notification-index .col-actions a{display:block;margin:0 0 3px;white-space:nowrap}.data-table-td-max .accordion .config .data-table td,.order-account-information .data-table td,[class^=' adminhtml-rma-'] .rma-request-details .data-table td{max-width:250px;width:250px}.catalog-product-edit .ui-tabs-panel .grid .hor-scroll,.catalog-product-index .grid .hor-scroll,.review-product-index .grid .hor-scroll,.adminhtml-rma-edit .hor-scroll{overflow-x:auto}.add-clearer:after,.massaction:after,.navigation>ul:after{content:"";display:table;clear:both}.test-content{width:calc(20px + 100*0.2)}.test-content:before{content:'.test {\A    ' attr(data-attribute) ': 0.2em;' '\A    content:\'';white-space:pre}.test-content:after{content:' Test\';\A}' "\A" '\A.test + .test._other ~ ul > li' " {\A    height: @var;\A    content: ' + ';\A}";white-space:pre}.test-content-calc{width:calc((100%/12*2) - 10px)}.test-svg-xml-image{background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 38 40"><style>.st0{fill:none;stroke:%23ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}</style><circle cx="14.7" cy="14.7" r="13.7" class="st0"/><path d="M23.9 24.7L37 39" class="st0"/></svg>') no-repeat left center}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css b/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css
index 8b1d0fae6d96b..90ca42321c921 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css
@@ -1000,15 +1000,13 @@ fieldset[disabled] .pager .action-next {
 }
 @font-face {
   font-family: 'icons-blank-theme';
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg#icons-blank-theme') format('svg');
+  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'icons-blank-theme';
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype');
+  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php b/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php
index e81b9b38054d0..7238ae56a2136 100644
--- a/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Model;
 
 class OrderItemRepositoryTest extends \PHPUnit\Framework\TestCase
@@ -60,7 +61,7 @@ public function testGet()
      * @magentoDataFixture Magento/GiftMessage/_files/order_with_message.php
      * @magentoConfigFixture default_store sales/gift_options/allow_items 1
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no item with provided id in the order
+     * @expectedExceptionMessage No item with the provided ID was found in the Order. Verify the ID and try again.
      */
     public function testGetNoProvidedItemId()
     {
@@ -105,7 +106,7 @@ public function testSave()
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_items 0
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Gift Message is not available
+     * @expectedExceptionMessage The gift message isn't available.
      */
     public function testSaveMessageIsNotAvailable()
     {
@@ -123,7 +124,7 @@ public function testSaveMessageIsNotAvailable()
      * @magentoDataFixture Magento/GiftMessage/_files/virtual_order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_items 1
      * @expectedException \Magento\Framework\Exception\State\InvalidTransitionException
-     * @expectedExceptionMessage Gift Messages are not applicable for virtual products
+     * @expectedExceptionMessage Gift messages can't be used for virtual products.
      */
     public function testSaveMessageIsVirtual()
     {
@@ -141,7 +142,7 @@ public function testSaveMessageIsVirtual()
      * @magentoDataFixture Magento/GiftMessage/_files/empty_order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_items 1
      * @expectedException  \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no item with provided id in the order
+     * @expectedExceptionMessage No item with the provided ID was found in the Order. Verify the ID and try again.
      */
     public function testSaveMessageNoProvidedItemId()
     {
diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderRepositoryTest.php b/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderRepositoryTest.php
index 21b017a87b917..332570b57aca5 100644
--- a/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Model;
 
 class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
@@ -77,7 +78,7 @@ public function testSave()
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_order 0
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Gift Message is not available
+     * @expectedExceptionMessage The gift message isn't available.
      */
     public function testSaveMessageIsNotAvailable()
     {
@@ -92,7 +93,7 @@ public function testSaveMessageIsNotAvailable()
      * @magentoDataFixture Magento/GiftMessage/_files/virtual_order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_order 1
      * @expectedException \Magento\Framework\Exception\State\InvalidTransitionException
-     * @expectedExceptionMessage Gift Messages are not applicable for virtual products
+     * @expectedExceptionMessage Gift messages can't be used for virtual products.
      */
     public function testSaveMessageIsVirtual()
     {
@@ -107,7 +108,6 @@ public function testSaveMessageIsVirtual()
      * @magentoDataFixture Magento/GiftMessage/_files/empty_order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_order 1
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Gift Messages are not applicable for empty order
      */
     public function testSaveMessageIsEmpty()
     {
@@ -116,13 +116,17 @@ public function testSaveMessageIsEmpty()
 
         /** @var \Magento\GiftMessage\Api\Data\MessageInterface $message */
         $this->giftMessageOrderRepository->save($order->getEntityId(), $this->message);
+
+        $this->expectExceptionMessage(
+            "Gift messages can't be used for an empty order. Create an order, add an item, and try again."
+        );
     }
 
     /**
      * @magentoDataFixture Magento/GiftMessage/_files/empty_order.php
      * @magentoConfigFixture default_store sales/gift_options/allow_order 1
      * @expectedException  \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage There is no order with provided id
+     * @expectedExceptionMessage No order exists with this ID. Verify your information and try again.
      */
     public function testSaveMessageNoProvidedItemId()
     {
diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php b/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php
new file mode 100644
index 0000000000000..0902c35568ee3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Observer;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\Quote;
+
+class SalesEventQuoteMergeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testQuoteMerge()
+    {
+        $giftMessageId = 6;
+        $objectManager = Bootstrap::getObjectManager();
+        $eventManager = $objectManager->get(ManagerInterface::class);
+        /** @var Quote $sourceQuote */
+        $sourceQuote = $objectManager->create(QuoteFactory::class)->create();
+        $targetQuote = clone($sourceQuote);
+        $sourceQuote->setGiftMessageId($giftMessageId);
+
+        $eventManager->dispatch(
+            'sales_quote_merge_after',
+            [
+                'quote' => $targetQuote,
+                'source' => $sourceQuote
+            ]
+        );
+
+        self::assertEquals($giftMessageId, $targetQuote->getGiftMessageId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php
index 22307b4d83956..cd17183be7f78 100644
--- a/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/_files/quote_with_item_message_rollback.php
@@ -20,7 +20,7 @@
     if ($product->getId()) {
         $product->delete();
     }
-};
+}
 $quote->delete();
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/GoogleAnalytics/Block/GaTest.php b/dev/tests/integration/testsuite/Magento/GoogleAnalytics/Block/GaTest.php
new file mode 100644
index 0000000000000..74714613fefad
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GoogleAnalytics/Block/GaTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GoogleAnalytics\Block;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+class GaTest extends AbstractController
+{
+    /**
+     * Layout instance
+     *
+     * @var \Magento\Framework\View\LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->dispatch('/');
+        $this->layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
+    }
+
+    /**
+     * Check for correct position of GA block
+     */
+    public function testBlockPresentInHead()
+    {
+        $this->assertNotNull(
+            $this->getGaBlockFromNode('head.additional')
+        );
+    }
+
+    /**
+     * Test that block has been successfully moved
+     * from body to head tag.
+     */
+    public function testBlockIsAbsentInBody()
+    {
+        $this->assertFalse(
+            $this->getGaBlockFromNode('after.body.start')
+        );
+    }
+
+    /**
+     * Test null output when GA is disabled
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture current_store google/analytics/active 0
+     * @magentoConfigFixture current_store google/analytics/account XXXXXXX
+     */
+    public function testBlockOutputIsEmptyWhenGaIsDisabled()
+    {
+        $this->assertEquals(
+            "",
+            $this->getGaBlockFromNode('head.additional')->toHtml()
+        );
+    }
+
+    /**
+     * Check, that block successfully gets rendered when configuration is
+     * active.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture current_store google/analytics/active 1
+     * @magentoConfigFixture current_store google/analytics/account XXXXXXX
+     */
+    public function testBlockOutputExistsWhenGaIsEnabled()
+    {
+        $this->assertNotEquals(
+            "",
+            $this->getGaBlockFromNode('head.additional')->toHtml()
+        );
+    }
+
+    /**
+     * Get GA block
+     *
+     * @param string $nodeName
+     * @return \Magento\Framework\View\Element\AbstractBlock|false
+     */
+    private function getGaBlockFromNode($nodeName = 'head.additional')
+    {
+        $childBlocks = $this->layout->getChildBlocks($nodeName);
+        foreach ($childBlocks as $block) {
+            if (strpos($block->getNameInLayout(), 'google_analytics') !== false) {
+                return $block;
+            }
+        }
+        return false;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
new file mode 100644
index 0000000000000..16a15cfcd2e26
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests the dispatch method in the GraphQl Controller class using a simple product query
+ *
+ * @magentoAppArea graphql
+ * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+ * @magentoDbIsolation disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
+{
+    const CONTENT_TYPE = 'application/json';
+
+    /** @var \Magento\Framework\ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var GraphQl */
+    private $graphql;
+
+    /** @var SerializerInterface */
+    private $jsonSerializer;
+
+    /** @var MetadataPool */
+    private $metadataPool;
+
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
+    protected function setUp() : void
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->graphql = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
+        $this->metadataPool = $this->objectManager->get(MetadataPool::class);
+    }
+
+    /**
+     * Test if a graphql schema is generated and request is dispatched and response generated
+     *
+     * @return void
+     */
+    public function testDispatch() : void
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+
+        /** @var ProductInterface $product */
+        $product = $productRepository->get('simple1');
+
+        $query
+            = <<<QUERY
+ {
+           products(filter: {sku: {eq: "simple1"}})
+           {
+               items {
+                   id
+                   name
+                   sku
+               }
+           }
+       }
+QUERY;
+        $postData = [
+            'query'         => $query,
+            'variables'     => null,
+            'operationName' => null
+        ];
+        /** @var Http $request */
+        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $request->setPathInfo('/graphql');
+        $request->setContent(json_encode($postData));
+        $headers = $this->objectManager->create(\Zend\Http\Headers::class)
+            ->addHeaders(['Content-Type' => 'application/json']);
+        $request->setHeaders($headers);
+        $response = $this->graphql->dispatch($request);
+        $output = $this->jsonSerializer->unserialize($response->getContent());
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
+        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
+        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
+        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
+        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
+        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
+    }
+
+    /**
+     * Test the errors on graphql output
+     *
+     * @return void
+     */
+    public function testError() : void
+    {
+        $this->markTestSkipped('Causes failiure with php unit and php 7.2');
+        $query
+            = <<<QUERY
+  {
+  customAttributeMetadata(attributes:[
+    {
+      attribute_code:"sku"
+      entity_type:"invalid"
+    }
+  ])
+    {
+      items{        
+      attribute_code
+      attribute_type
+      entity_type
+    }      
+    }  
+  }
+QUERY;
+
+        $postData = [
+            'query'         => $query,
+            'variables'     => null,
+            'operationName' => null
+        ];
+        /** @var Http $request */
+        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $request->setPathInfo('/graphql');
+        $request->setContent(json_encode($postData));
+        $headers = $this->objectManager->create(\Zend\Http\Headers::class)
+            ->addHeaders(['Content-Type' => 'application/json']);
+        $request->setHeaders($headers);
+        $response = $this->graphql->dispatch($request);
+        $outputResponse = $this->jsonSerializer->unserialize($response->getContent());
+        if (isset($outputResponse['errors'][0])) {
+            if (is_array($outputResponse['errors'][0])) {
+                foreach ($outputResponse['errors'] as $error) {
+                    $this->assertEquals(
+                        $error['category'],
+                        \Magento\Framework\GraphQl\Exception\GraphQlInputException::EXCEPTION_CATEGORY
+                    );
+                    if (isset($error['message'])) {
+                        $this->assertEquals($error['message'], 'Invalid entity_type specified: invalid');
+                    }
+                    if (isset($error['trace'])) {
+                        if (is_array($error['trace'])) {
+                            $this->assertNotEmpty($error['trace']);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php
new file mode 100644
index 0000000000000..9d98f945a936e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl;
+
+use Magento\Framework\GraphQl\Schema\Type\InputObjectType;
+use Magento\Framework\GraphQl\Schema\Type\ObjectType;
+use Magento\Framework\ObjectManagerInterface;
+
+class GraphQlIntrospectionTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\GraphQl\SchemaFactory */
+    private $schemaFactory;
+
+    /** @var  ObjectManagerInterface */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->schemaFactory = $this->objectManager->get(\Magento\Framework\GraphQl\SchemaFactory::class);
+    }
+
+    public function testIntrospectionQuery()
+    {
+        $emptySchema = $this->schemaFactory->create(
+            [
+                'query' => new ObjectType(
+                    [
+                        'name' => 'Query',
+                        'description' =>'Description at type level',
+                        'fields' => ['a' => \GraphQL\Type\Definition\Type::string()]
+                    ]
+                )
+            ]
+        );
+        $request =
+            <<<QUERY
+query IntrospectionQuery {
+__schema {
+queryType { name }
+types{
+...FullType
+}
+}
+}
+fragment FullType on __Type{
+name
+description
+kind
+fields(includeDeprecated:true){
+name
+args{
+...InputValue
+}
+ }
+}
+
+fragment TypeRef on __Type {
+kind
+name
+ofType{
+kind
+name
+}
+}
+fragment InputValue on __InputValue {
+name
+description
+type { ...TypeRef }
+defaultValue
+}
+QUERY;
+        $response = \GraphQL\GraphQL::executeQuery($emptySchema, $request);
+        $output = $response->toArray()['data']['__schema'];
+        $this->assertEquals('Query', $output['queryType']['name']);
+        $this->assertEquals($output['types'][0]['kind'], 'OBJECT');
+        $expectedFragment =
+            [
+                'name' => 'Query',
+                'description' => 'Description at type level',
+                'kind' => 'OBJECT',
+                'fields' => [
+                    [
+                        'name' => 'a',
+                        'args' => []
+                    ]
+                ]
+            ];
+        $this->assertContains($expectedFragment, $output['types']);
+    }
+
+    /**
+     * Tests an InputObjectType with NON Null field and description at Field level
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectsInputObjectWithNonNullInputField()
+    {
+        $testInputObject = new InputObjectType(
+            [
+                'name' => 'ProductFilterInput',
+                'fields' => [
+                    'attributeA' => [
+                        'type' => \GraphQL\Type\Definition\Type::nonNull(
+                            \GraphQL\Type\Definition\Type::string()
+                        ),
+                        'description' => 'testDescriptionForA'
+                    ],
+                    'attributeB' => [
+                        'type' => \GraphQL\Type\Definition\Type::listOf(
+                            \GraphQL\Type\Definition\Type::string()
+                        )
+                    ],
+                    'attributeC' => ['type' => \GraphQL\Type\Definition\Type::string(), 'defaultValue' => null],
+                    'attributeD' => [
+                        'type' => \GraphQL\Type\Definition\Type::string(),
+                        'defaultValue' => 'test',
+                        'description' => 'testDescriptionForD'
+                    ],
+                ]
+            ]
+        );
+        $TestType = new ObjectType([
+            'name' => 'Query',
+            'fields' => [
+                'field' => [
+                    'type' => \GraphQL\Type\Definition\Type::string(),
+                    'args' => ['complex' => ['type' => $testInputObject]],
+                    'resolve' => function ($args) {
+                        return json_encode($args['complex']);
+                    }
+                ]
+            ]
+        ]);
+        $testSchema = $this->schemaFactory->create(
+            ['query' => $TestType]
+        );
+
+        $request =
+            <<<QUERY
+{
+        __schema {
+          types {
+            kind
+            name
+            inputFields {
+              name
+              description
+              type { ...TypeRef }
+              defaultValue
+            }
+          }
+        }
+      }
+      fragment TypeRef on __Type {
+        kind
+        name
+        ofType {
+          kind
+          name
+          ofType {
+            kind
+            name
+            ofType {
+              kind
+              name
+            }
+          }
+        }
+}
+QUERY;
+        $response = \GraphQL\GraphQL::executeQuery($testSchema, $request);
+        $expectedResult =
+            [
+                'kind'=> 'INPUT_OBJECT',
+                'name'=> 'ProductFilterInput',
+                'inputFields'=> [
+                    [
+                        'name'=> 'attributeA',
+                        'description'=> 'testDescriptionForA',
+                        'type'=> [
+                            'kind'=> 'NON_NULL',
+                            'name'=> null,
+                            'ofType'=> [
+                                'kind'=> 'SCALAR',
+                                'name'=> 'String',
+                                'ofType'=> null
+                            ]
+                        ],
+                        'defaultValue'=> null
+                    ],
+                    [
+                        'name'=> 'attributeB',
+                        'description'=> null,
+                        'type'=> [
+                            'kind'=> 'LIST',
+                            'name'=> null,
+                            'ofType'=> [
+                                'kind'=> 'SCALAR',
+                                'name'=> 'String',
+                                'ofType'=> null
+                            ]
+                        ],
+                        'defaultValue'=> null
+                    ],
+                    [
+                        'name'=> 'attributeC',
+                        'description'=> null,
+                        'type'=> [
+                            'kind'=> 'SCALAR',
+                            'name'=> 'String',
+                            'ofType'=> null
+                        ],
+                        'defaultValue'=> 'null'
+                    ],
+                    [
+                        'name'=> 'attributeD',
+                        'description'=> 'testDescriptionForD',
+                        'type'=> [
+                            'kind'=> 'SCALAR',
+                            'name'=> 'String',
+                            'ofType'=> null
+                        ],
+                        'defaultValue'=> '"test"'
+                    ]
+                ]
+            ];
+        $output = $response->toArray()['data']['__schema']['types'];
+        $this->assertContains($expectedResult, $output);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectsIncludeTheDeprecatedParameter()
+    {
+        $testSchema = $this->schemaFactory->create(
+            [
+                'query' => new ObjectType(
+                    [
+                    'name' => 'Query',
+                    'fields' => [
+                       'deprecated' => [
+                         'type' => \GraphQL\Type\Definition\Type::string(),
+                         'deprecationReason' =>'Deprecated in an older version'
+                       ],
+                         'nonDeprecated' => [
+                            'type' => \GraphQL\Type\Definition\Type::string()
+                         ]
+                    ]
+                    ]
+                )
+              ]
+        );
+        $request =
+            <<<QUERY
+ {
+  __type(name:"Query")
+    {
+    name
+      kind
+    fields(includeDeprecated:true){
+      name
+      type{
+        kind
+        name
+      }
+      description
+      isDeprecated
+      deprecationReason
+      
+    }
+  }
+}           
+
+QUERY;
+        $response = \GraphQL\GraphQL::executeQuery($testSchema, $request);
+        $output = $response->toArray()['data']['__type'];
+        $expectedResult =
+            [
+                "name" =>"Query",
+                "kind" =>"OBJECT",
+                "fields" => [
+           [
+            'name'=> 'deprecated',
+            'type'=> [
+                'kind'=> 'SCALAR',
+                'name'=> 'String'
+            ],
+            'description'=> null,
+            'isDeprecated'=> true,
+            'deprecationReason'=> 'Deprecated in an older version'
+           ],
+           [
+            'name'=> 'nonDeprecated',
+            'type'=> [
+                'kind'=> 'SCALAR',
+                'name'=> 'String'
+            ],
+            'description'=> null,
+            'isDeprecated'=> false,
+            'deprecationReason'=> null
+           ]
+                ]
+                ];
+        $this->assertEquals($expectedResult, $output);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
index dcf4565873ea5..ed283d196e69c 100644
--- a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
@@ -5,8 +5,19 @@
  */
 namespace Magento\GroupedProduct\Model\Product\Type;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\CatalogInventory\Model\Configuration;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Value;
+
 class GroupedTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -20,16 +31,21 @@ class GroupedTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
         $this->_productType = $this->objectManager->get(\Magento\Catalog\Model\Product\Type::class);
+        $this->reinitableConfig = $this->objectManager->get(ReinitableConfigInterface::class);
+    }
+
+    protected function tearDown()
+    {
+        $this->dropConfigValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK);
     }
 
     public function testFactory()
     {
         $product = new \Magento\Framework\DataObject();
-        $product->setTypeId(\Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE);
+        $product->setTypeId(Grouped::TYPE_CODE);
         $type = $this->_productType->factory($product);
-        $this->assertInstanceOf(\Magento\GroupedProduct\Model\Product\Type\Grouped::class, $type);
+        $this->assertInstanceOf(Grouped::class, $type);
     }
 
     /**
@@ -38,12 +54,12 @@ public function testFactory()
      */
     public function testGetAssociatedProducts()
     {
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
 
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $productRepository->get('grouped-product');
         $type = $product->getTypeInstance();
-        $this->assertInstanceOf(\Magento\GroupedProduct\Model\Product\Type\Grouped::class, $type);
+        $this->assertInstanceOf(Grouped::class, $type);
 
         $associatedProducts = $type->getAssociatedProducts($product);
         $this->assertCount(2, $associatedProducts);
@@ -53,7 +69,7 @@ public function testGetAssociatedProducts()
     }
 
     /**
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      */
     private function assertProductInfo($product)
     {
@@ -92,25 +108,25 @@ public function testPrepareProduct()
             \Magento\Framework\DataObject::class,
             ['data' => ['value' => ['qty' => 2]]]
         );
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $product = $productRepository->get('grouped-product');
 
-        /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $type */
-        $type = $this->objectManager->get(\Magento\GroupedProduct\Model\Product\Type\Grouped::class);
+        /** @var Grouped $type */
+        $type = $this->objectManager->get(Grouped::class);
 
         $processModes = [
-            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_FULL,
-            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_LITE
+            Grouped::PROCESS_MODE_FULL,
+            Grouped::PROCESS_MODE_LITE
         ];
         $expectedData = [
-            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_FULL => [
+            Grouped::PROCESS_MODE_FULL => [
                 1  => '{"super_product_config":{"product_type":"grouped","product_id":"'
                     . $product->getId() . '"}}',
                 21 => '{"super_product_config":{"product_type":"grouped","product_id":"'
                     . $product->getId() . '"}}',
             ],
-            \Magento\GroupedProduct\Model\Product\Type\Grouped::PROCESS_MODE_LITE => [
+            Grouped::PROCESS_MODE_LITE => [
                 $product->getId() => '{"value":{"qty":2}}',
             ]
         ];
@@ -127,4 +143,152 @@ public function testPrepareProduct()
             }
         }
     }
+
+    /**
+     * Test adding grouped product to cart when one of subproducts is out of stock.
+     *
+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php
+     * @magentoAppArea frontend
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @dataProvider outOfStockSubProductDataProvider
+     * @param bool $outOfStockShown
+     * @param array $data
+     * @param array $expected
+     */
+    public function testOutOfStockSubProduct(bool $outOfStockShown, array $data, array $expected)
+    {
+        $this->changeConfigValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, $outOfStockShown);
+        $buyRequest = new \Magento\Framework\DataObject($data);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var Product $product */
+        $product = $productRepository->get('grouped-product');
+        /** @var Grouped $groupedProduct */
+        $groupedProduct = $this->objectManager->get(Grouped::class);
+        $actual = $groupedProduct->prepareForCartAdvanced($buyRequest, $product, Grouped::PROCESS_MODE_FULL);
+        self::assertEquals(
+            count($expected),
+            count($actual)
+        );
+        /** @var Product $product */
+        foreach ($actual as $product) {
+            $sku = $product->getSku();
+            self::assertEquals(
+                $expected[$sku],
+                $product->getCartQty(),
+                "Failed asserting that Product Cart Quantity matches expected"
+            );
+        }
+    }
+
+    /**
+     * Data provider for testOutOfStockSubProduct.
+     *
+     * @return array
+     */
+    public function outOfStockSubProductDataProvider()
+    {
+        return [
+            'Out of stock product are shown #1' => [
+                true,
+                [
+                    'product' => 3,
+                    'qty' => 1,
+                    'super_group' => [
+                        1 => 4,
+                        21 => 5,
+                    ],
+                ],
+                [
+                    'virtual-product' => 5,
+                    'simple' => 4
+                ],
+            ],
+            'Out of stock product are shown #2' => [
+                true,
+                [
+                    'product' => 3,
+                    'qty' => 1,
+                    'super_group' => [
+                        1 => 0,
+                    ],
+                ],
+                [
+                    'virtual-product' => 2.5, // This is a default quantity.
+                ],
+            ],
+            'Out of stock product are hidden #1' => [
+                false,
+                [
+                    'product' => 3,
+                    'qty' => 1,
+                    'super_group' => [
+                        1 => 4,
+                        21 => 5,
+                    ],
+                ],
+                [
+                    'virtual-product' => 5,
+                    'simple' => 4,
+                ],
+            ],
+            'Out of stock product are hidden #2' => [
+                false,
+                [
+                    'product' => 3,
+                    'qty' => 1,
+                    'super_group' => [
+                        1 => 0,
+                    ],
+                ],
+                [
+                    'virtual-product' => 2.5, // This is a default quantity.
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Write config value to database.
+     *
+     * @param string $path
+     * @param string $value
+     * @param string $scope
+     * @param int $scopeId
+     */
+    private function changeConfigValue(string $path, string $value, string $scope = 'default', int $scopeId = 0)
+    {
+        $configValue = $this->objectManager->create(Value::class);
+        $configValue->setPath($path)
+            ->setValue($value)
+            ->setScope($scope)
+            ->setScopeId($scopeId)
+            ->save();
+        $this->reinitConfig();
+    }
+
+    /**
+     * Delete config value from database.
+     *
+     * @param string $path
+     */
+    private function dropConfigValue(string $path)
+    {
+        $configValue = $this->objectManager->create(Value::class);
+        try {
+            $configValue->load($path, 'path');
+            $configValue->delete();
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            // do nothing
+        }
+        $this->reinitConfig();
+    }
+
+    /**
+     * Reinit config.
+     */
+    private function reinitConfig()
+    {
+        $this->reinitableConfig->reinit();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedTest.php
index 48ecd4688aadf..45af6db444e13 100644
--- a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedTest.php
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/GroupedTest.php
@@ -50,6 +50,7 @@ protected function setUp()
     /**
      * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testReindex()
     {
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
index 21453ac32104f..73a1b792da604 100644
--- a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
@@ -8,6 +8,7 @@
 require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 /** @var $product \Magento\Catalog\Model\Product */
@@ -60,7 +61,8 @@
     ->setQty(2);
 $newLinks[] = $productLink;
 $product->setProductLinks($newLinks);
-$product->save();
+$product->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
 
 /** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
 $categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_rollback.php
index 31c3cbaf2e540..008f65e626005 100644
--- a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_rollback.php
@@ -24,13 +24,12 @@
     //already deleted
 }
 
-/** @var $virtualProduct \Magento\Catalog\Model\Product */
-$virtualProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Catalog\Model\Product::class
-);
-$virtualProduct->load(21);
-if ($virtualProduct->getId()) {
+try {
+    /** @var $virtualProduct \Magento\Catalog\Model\Product */
+    $virtualProduct = $productRepository->get('virtual-product', false, null, true);
     $virtualProduct->delete();
+} catch (NoSuchEntityException $e) {
+    //already deleted
 }
 
 try {
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php
new file mode 100644
index 0000000000000..369ce7d490eea
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_associated.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_out_of_stock.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(
+    \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+)->setAttributeSetId(
+    4
+)->setWebsiteIds(
+    [1]
+)->setName(
+    'Grouped Product'
+)->setSku(
+    'grouped-product'
+)->setPrice(
+    100
+)->setTaxClassId(
+    0
+)->setVisibility(
+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+);
+
+$newLinks = [];
+$productLinkFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
+
+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+$productLink = $productLinkFactory->create();
+$linkedProduct = $productRepository->getById(1);
+$productLink->setSku($product->getSku())
+    ->setLinkType('associated')
+    ->setLinkedProductSku($linkedProduct->getSku())
+    ->setLinkedProductType($linkedProduct->getTypeId())
+    ->setPosition(1)
+    ->getExtensionAttributes()
+    ->setQty(1);
+$newLinks[] = $productLink;
+
+$subProductsSkus = ['virtual-product', 'virtual-product-out'];
+foreach ($subProductsSkus as $sku) {
+    /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+    $productLink = $productLinkFactory->create();
+    $linkedProduct = $productRepository->get($sku);
+    $productLink->setSku($product->getSku())
+        ->setLinkType('associated')
+        ->setLinkedProductSku($sku)
+        ->setLinkedProductType($linkedProduct->getTypeId())
+        ->getExtensionAttributes()
+        ->setQty(2.5);
+    $newLinks[] = $productLink;
+}
+$product->setProductLinks($newLinks);
+$product->save();
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock_rollback.php
new file mode 100644
index 0000000000000..26a7487077e44
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_out_of_stock_rollback.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require 'product_grouped_rollback.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_out_of_stock_rollback.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock_rollback.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_associated_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php
new file mode 100644
index 0000000000000..fc01daf2381bc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+
+$productLinkFactory = Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
+$productIds = ['11', '22'];
+
+foreach ($productIds as $productId) {
+    /** @var $product Product */
+    $product = Bootstrap::getObjectManager()->create(Product::class);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setWebsiteIds([1])
+        ->setAttributeSetId(4)
+        ->setName('Simple ' . $productId)
+        ->setSku('simple_' . $productId)
+        ->setPrice(100)
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+    $linkedProducts[] = $productRepository->save($product);
+}
+
+/** @var $product Product */
+$product = Bootstrap::getObjectManager()->create(Product::class);
+
+$product->setTypeId(Grouped::TYPE_CODE)
+    ->setId(1)
+    ->setWebsiteIds([1])
+    ->setAttributeSetId(4)
+    ->setName('Grouped Product')
+    ->setSku('grouped')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+
+foreach ($linkedProducts as $linkedProduct) {
+    /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+    $productLink = $productLinkFactory->create();
+    $productLink->setSku($product->getSku())
+        ->setLinkType('associated')
+        ->setLinkedProductSku($linkedProduct->getSku())
+        ->setLinkedProductType($linkedProduct->getTypeId())
+        ->getExtensionAttributes()
+        ->setQty(1);
+    $newLinks[] = $productLink;
+}
+
+$product->setProductLinks($newLinks);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
new file mode 100644
index 0000000000000..6ef9b5cd5b0a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+
+$productLinkFactory = Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
+$productConfigs = [
+    [
+        'id' => '100000001',
+        'stock_config' => ['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]
+    ],
+    [
+        'id' => '100000002',
+        'stock_config' =>  ['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0]
+    ]
+];
+
+foreach ($productConfigs as $productConfig) {
+    /** @var $product Product */
+    $product = Bootstrap::getObjectManager()->create(Product::class);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productConfig['id'])
+        ->setWebsiteIds([1])
+        ->setAttributeSetId(4)
+        ->setName('Simple ' . $productConfig['id'])
+        ->setSku('simple_' . $productConfig['id'])
+        ->setPrice(100)
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData($productConfig['stock_config']);
+
+    $linkedProducts[] = $productRepository->save($product);
+}
+
+/** @var $product Product */
+$product = Bootstrap::getObjectManager()->create(Product::class);
+
+$product->setTypeId(Grouped::TYPE_CODE)
+    ->setId('100000003')
+    ->setWebsiteIds([1])
+    ->setAttributeSetId(4)
+    ->setName('Grouped Product')
+    ->setSku('grouped')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+
+foreach ($linkedProducts as $linkedProduct) {
+    /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+    $productLink = $productLinkFactory->create();
+    $productLink->setSku($product->getSku())
+        ->setLinkType('associated')
+        ->setLinkedProductSku($linkedProduct->getSku())
+        ->setLinkedProductType($linkedProduct->getTypeId())
+        ->getExtensionAttributes()
+        ->setQty(1);
+    $newLinks[] = $productLink;
+}
+
+$product->setProductLinks($newLinks);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php
new file mode 100644
index 0000000000000..b81c008cf1ab6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_out_of_stock_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$skuList = ['simple_100000001', 'simple_100000002', 'grouped'];
+foreach ($skuList as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+
+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+        $stockStatus->load($product->getData('entity_id'), 'product_id');
+        $stockStatus->delete();
+
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php
new file mode 100644
index 0000000000000..bc2f04d7b19d0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$skuList = ['simple_11', 'simple_22', 'grouped'];
+foreach ($skuList as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+
+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+        $stockStatus->load($product->getEntityId(), 'product_id');
+        $stockStatus->delete();
+
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
index f30663a199a67..9afce0ed10bcd 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
@@ -17,11 +17,15 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
     /**
      * @dataProvider validationDataProvider
      * @param string $fileName
+     * @param string $mimeType
      * @param string $message
+     * @param string $delimiter
+     * @throws \Magento\Framework\Exception\FileSystemException
      * @backupGlobals enabled
      * @magentoDbIsolation enabled
+     * @SuppressWarnings(PHPMD.Superglobals)
      */
-    public function testValidationReturn($fileName, $message)
+    public function testValidationReturn(string $fileName, string $mimeType, string $message, string $delimiter)
     {
         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
 
@@ -36,7 +40,7 @@ public function testValidationReturn($fileName, $message)
         $this->getRequest()->setPostValue('behavior', 'append');
         $this->getRequest()->setPostValue(Import::FIELD_NAME_VALIDATION_STRATEGY, $validationStrategy);
         $this->getRequest()->setPostValue(Import::FIELD_NAME_ALLOWED_ERROR_COUNT, 0);
-        $this->getRequest()->setPostValue('_import_field_separator', ',');
+        $this->getRequest()->setPostValue('_import_field_separator', $delimiter);
 
         /** @var \Magento\TestFramework\App\Filesystem $filesystem */
         $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
@@ -49,7 +53,7 @@ public function testValidationReturn($fileName, $message)
         $_FILES = [
             'import_file' => [
                 'name' => $fileName,
-                'type' => 'text/csv',
+                'type' => $mimeType,
                 'tmp_name' => $target,
                 'error' => 0,
                 'size' => filesize($target)
@@ -83,12 +87,34 @@ public function validationDataProvider()
         return [
             [
                 'file_name' => 'catalog_product.csv',
-                'message' => 'File is valid'
+                'mime-type' => 'text/csv',
+                'message' => 'File is valid',
+                'delimiter' => ',',
             ],
             [
                 'file_name' => 'test.txt',
-                'message' => '\'txt\' file extension is not supported'
-            ]
+                'mime-type' => 'text/csv',
+                'message' => '\'txt\' file extension is not supported',
+                'delimiter' => ',',
+            ],
+            [
+                'file_name' => 'incorrect_catalog_product_comma.csv',
+                'mime-type' => 'text/csv',
+                'message' => 'Download full report',
+                'delimiter' => ',',
+            ],
+            [
+                'file_name' => 'incorrect_catalog_product_semicolon.csv',
+                'mime-type' => 'text/csv',
+                'message' => 'Download full report',
+                'delimiter' => ';',
+            ],
+            [
+                'file_name' => 'catalog_product.zip',
+                'mime-type' => 'application/zip',
+                'message' => 'File is valid',
+                'delimiter' => ',',
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip
new file mode 100644
index 0000000000000..812beae22b786
Binary files /dev/null and b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip differ
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/incorrect_catalog_product_comma.csv b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/incorrect_catalog_product_comma.csv
new file mode 100644
index 0000000000000..67114a40b2244
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/incorrect_catalog_product_comma.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
+Simple,,Default,simple,"Default Category/New",base,Simple,,,,1,"Taxable Goods","Catalo g, Search",100.0000,,,,simple,Simple,Simple,"Simple ",,,,,,,,,"10/25/17, 8:21 AM","10/25/17, 8:21 AM",,,"Block after Info Column",,,,"Use config",,,,,,,,,,100.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/incorrect_catalog_product_semicolon.csv b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/incorrect_catalog_product_semicolon.csv
new file mode 100644
index 0000000000000..d0a0b8639cf78
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/incorrect_catalog_product_semicolon.csv
@@ -0,0 +1,2 @@
+sku;store_view_code;attribute_set_code;product_type;categories;product_websites;name;description;short_description;weight;product_online;tax_class_name;visibility;price;special_price;special_price_from_date;special_price_to_date;url_key;meta_title;meta_keywords;meta_description;base_image;base_image_label;small_image;small_image_label;thumbnail_image;thumbnail_image_label;swatch_image;swatch_image_label;created_at;updated_at;new_from_date;new_to_date;display_product_options_in;map_price;msrp_price;map_enabled;gift_message_available;custom_design;custom_design_from;custom_design_to;custom_layout_update;page_layout;product_options_container;msrp_display_actual_price_type;country_of_manufacture;additional_attributes;qty;out_of_stock_qty;use_config_min_qty;is_qty_decimal;allow_backorders;use_config_backorders;min_cart_qty;use_config_min_sale_qty;max_cart_qty;use_config_max_sale_qty;is_in_stock;notify_on_stock_below;use_config_notify_stock_qty;manage_stock;use_config_manage_stock;use_config_qty_increments;qty_increments;use_config_enable_qty_inc;enable_qty_increments;is_decimal_divided;website_id;related_skus;related_position;crosssell_skus;crosssell_position;upsell_skus;upsell_position;additional_images;additional_image_labels;hide_from_product_page;custom_options;bundle_price_type;bundle_sku_type;bundle_price_view;bundle_weight_type;bundle_values;bundle_shipment_type;configurable_variations;configurable_variation_labels;associated_skus
+Simple;;Default;simple;"Default Category/New";base;Simple;;;;1;"Taxable Goods";"Catalo g, Search";100.0000;;;;simple;Simple;Simple;"Simple ";;;;;;;;;"10/25/17, 8,21 AM";"10/25/17, 8,21 AM";;;"Block after Info Column";;;;"Use config";;;;;;;;;;100.0000;0.0000;1;0;0;1;1.0000;1;10000.0000;1;1;1.0000;1;1;1;1;1.0000;1;0;0;0;;;;;;;;;;;;;;;;;;;
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/EntityAbstractTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/EntityAbstractTest.php
new file mode 100644
index 0000000000000..db4d9c5468640
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/EntityAbstractTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Model\Import\Entity;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\ImportExport\Model\Import\Source\Csv;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+
+/**
+ * Test class for \Magento\ImportExport\Model\Import\AbstractEntity
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class EntityAbstractTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test for method _saveValidatedBunches()
+     *
+     * @return void
+     */
+    public function testSaveValidatedBunches() : void
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $filesystem = $objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = new Csv(__DIR__ . '/_files/advanced_price_for_validation_test.csv', $directory);
+        $source->rewind();
+
+        $eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
+        $entityTypeMock = $this->createMock(\Magento\Eav\Model\Entity\Type::class);
+        $eavConfig->expects($this->any())->method('getEntityType')->willReturn($entityTypeMock);
+
+        /** @var $model AbstractEntity|\PHPUnit_Framework_MockObject_MockObject */
+        $model = $this->getMockForAbstractClass(
+            AbstractEntity::class,
+            [
+                $objectManager->get(\Magento\Framework\Json\Helper\Data::class),
+                $objectManager->get(\Magento\ImportExport\Helper\Data::class),
+                $objectManager->get(\Magento\ImportExport\Model\ResourceModel\Import\Data::class),
+                $eavConfig,
+                $objectManager->get(\Magento\Framework\App\ResourceConnection::class),
+                $objectManager->get(\Magento\ImportExport\Model\ResourceModel\Helper::class),
+                $objectManager->get(\Magento\Framework\Stdlib\StringUtils::class),
+                $objectManager->get(ProcessingErrorAggregatorInterface::class),
+            ],
+            '',
+            true,
+            false,
+            true,
+            ['validateRow', 'getEntityTypeCode']
+        );
+        $model->expects($this->any())->method('validateRow')->willReturn(true);
+        $model->expects($this->any())->method('getEntityTypeCode')->willReturn('catalog_product');
+
+        $model->setSource($source);
+
+        $method = new \ReflectionMethod($model, '_saveValidatedBunches');
+        $method->setAccessible(true);
+        $method->invoke($model);
+
+        $this->assertEquals(1, $model->getProcessedEntitiesCount());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/_files/advanced_price_for_validation_test.csv b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/_files/advanced_price_for_validation_test.csv
new file mode 100644
index 0000000000000..fb42afb901880
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/_files/advanced_price_for_validation_test.csv
@@ -0,0 +1,3 @@
+sku,tier_price_website,tier_price_customer_group,tier_price_qty,tier_price,tier_price_value_type
+SimpleProduct,All Websites [USD],ALL GROUPS,100,50,Fixed
+SimpleProduct,All Websites [USD],ALL GROUPS,33,55,Fixed
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
index 5ba955430021f..93fa04806d577 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\ImportExport\Model;
 
+use Magento\Framework\Phrase;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
@@ -33,9 +34,7 @@ class ImportTest extends \PHPUnit\Framework\TestCase
         'catalog_product' => [
             'token' => \Magento\ImportExport\Model\Source\Import\Behavior\Basic::class,
             'code' => 'basic_behavior',
-            'notes' => [
-                \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE => "Note: Product IDs will be regenerated."
-            ],
+            'notes' => [],
         ],
         'customer_composite' => [
             'token' => \Magento\ImportExport\Model\Source\Import\Behavior\Basic::class,
@@ -70,7 +69,7 @@ protected function setUp()
             \Magento\ImportExport\Model\Import\Config::class
         );
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\ImportExport\Model\Import::class,
+            Import::class,
             ['importConfig' => $this->_importConfig]
         );
     }
@@ -108,8 +107,8 @@ public function testValidateSource()
         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
 
         $this->_model->setEntity('catalog_product');
-        $this->_model->setData(\Magento\ImportExport\Model\Import::FIELD_NAME_VALIDATION_STRATEGY, $validationStrategy);
-        $this->_model->setData(\Magento\ImportExport\Model\Import::FIELD_NAME_ALLOWED_ERROR_COUNT, 0);
+        $this->_model->setData(Import::FIELD_NAME_VALIDATION_STRATEGY, $validationStrategy);
+        $this->_model->setData(Import::FIELD_NAME_ALLOWED_ERROR_COUNT, 0);
 
         /** @var \Magento\ImportExport\Model\Import\AbstractSource|\PHPUnit_Framework_MockObject_MockObject $source */
         $source = $this->getMockForAbstractClass(
@@ -159,6 +158,8 @@ public function testGetEntityEntityIsNotSet()
      */
     public function testGetEntityBehaviors()
     {
+        $this->prepareProductNotes();
+
         $importModel = $this->_model;
         $actualBehaviors = $importModel->getEntityBehaviors();
 
@@ -200,4 +201,24 @@ public function testGetUniqueEntityBehaviors()
             $this->assertEquals($behaviorClass, $actualBehaviors[$behaviorCode]);
         }
     }
+
+    /**
+     * Add Catalog Product Notes to expected results.
+     *
+     * @return void
+     * @ SuppressWarnings(PHPMD.)
+     */
+    private function prepareProductNotes(): void
+    {
+        $this->_entityBehaviors['catalog_product']['notes'] =
+            [
+                Import::BEHAVIOR_APPEND => new Phrase('New product data is added to the existing product data for'
+                    . ' the existing entries in the database. All fields except sku can be updated.'),
+                Import::BEHAVIOR_REPLACE => new Phrase('The existing product data is replaced with new data.'
+                    . ' <b>Exercise caution when replacing data because the existing product data will be completely'
+                    . ' cleared and all references in the system will be lost.</b>'),
+                Import::BEHAVIOR_DELETE => new  Phrase('Any entities in the import data that already exist in the'
+                    . ' database are deleted from the database.'),
+            ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php b/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
index 447b4da8ee4cb..102d1d1268afd 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
@@ -23,8 +23,8 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
+)->setCategoryIds(
     []
 )->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/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php
new file mode 100644
index 0000000000000..ac5d8005180b4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+namespace Magento\Integration\Block\Adminhtml\System\Config;
+
+class OauthSectionTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * Checks that OAuth Section in the system config is loaded
+     */
+    public function testOAuthSection()
+    {
+        $this->dispatch('backend/admin/system_config/edit/section/oauth/');
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('id="oauth_access_token_lifetime-head"', $body);
+        $this->assertContains('id="oauth_cleanup-head"', $body);
+        $this->assertContains('id="oauth_consumer-head"', $body);
+        $this->assertContains('id="oauth_authentication_lock-head"', $body);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
index 8011873577dc8..4da0c12c6087a 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Integration\Controller\Adminhtml;
 
 use Magento\TestFramework\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * \Magento\Integration\Controller\Adminhtml\Integration
@@ -20,6 +21,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
     /** @var \Magento\Integration\Model\Integration  */
     private $_integration;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -29,6 +33,9 @@ protected function setUp()
         $this->_integration = $integration->load('Fixture Integration', 'name');
     }
 
+    /**
+     * Test view page.
+     */
     public function testIndexAction()
     {
         $this->dispatch('backend/admin/integration/index');
@@ -44,6 +51,9 @@ public function testIndexAction()
         );
     }
 
+    /**
+     * Test creation form.
+     */
     public function testNewAction()
     {
         $this->dispatch('backend/admin/integration/new');
@@ -61,6 +71,9 @@ public function testNewAction()
         );
     }
 
+    /**
+     * Test update form.
+     */
     public function testEditAction()
     {
         $integrationId = $this->_integration->getId();
@@ -88,12 +101,16 @@ public function testEditAction()
         );
     }
 
+    /**
+     * Test saving.
+     */
     public function testSaveActionUpdateIntegration()
     {
         $integrationId = $this->_integration->getId();
         $integrationName = $this->_integration->getName();
         $this->getRequest()->setParam('id', $integrationId);
         $url = 'http://magento.ll/endpoint_url';
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'name' => $integrationName,
@@ -111,10 +128,14 @@ public function testSaveActionUpdateIntegration()
         $this->assertRedirect($this->stringContains('backend/admin/integration/index/'));
     }
 
+    /**
+     * Test saving.
+     */
     public function testSaveActionNewIntegration()
     {
         $url = 'http://magento.ll/endpoint_url';
         $integrationName = md5(rand());
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'name' => $integrationName,
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
index 96900b595bf64..369d71ddbff9b 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
@@ -73,13 +73,17 @@ public function testCreateAdminAccessTokenEmptyOrNullCredentials($username, $pas
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testCreateAdminAccessTokenInvalidCustomer()
     {
         $adminUserName = 'invalid';
         $password = 'invalid';
         $this->tokenService->createAdminAccessToken($adminUserName, $password);
+
+        $this->expectExceptionMessage(
+            'The account sign-in was incorrect or your account is disabled temporarily. '
+            . 'Please wait and try again later.'
+        );
     }
 
     /**
@@ -105,7 +109,7 @@ private function assertInputExceptionMessages($e)
         $this->assertEquals('One or more input exceptions have occurred.', $e->getMessage());
         $errors = $e->getErrors();
         $this->assertCount(2, $errors);
-        $this->assertEquals('username is a required field.', $errors[0]->getLogMessage());
-        $this->assertEquals('password is a required field.', $errors[1]->getLogMessage());
+        $this->assertEquals('"username" is required. Enter and try again.', $errors[0]->getLogMessage());
+        $this->assertEquals('"password" is required. Enter and try again.', $errors[1]->getLogMessage());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php b/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
index cc2841f1acf2c..d72a1359dfa52 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
@@ -9,6 +9,7 @@
         'endpoint_url' => 'http://example.com/endpoint1',
         'identity_link_url' => 'http://www.example.com/identity1',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Customer::customer',
             'Magento_Customer::manage',
             'Magento_Sales::sales',
@@ -26,6 +27,7 @@
         'endpoint_url' => 'http://example.com/integration2',
         'identity_link_url' => 'http://www.example.com/identity2',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Sales::sales',
             'Magento_Sales::sales_operation',
             'Magento_Sales::sales_order',
@@ -40,6 +42,7 @@
     'TestIntegration3' => [
         'email' => 'test-integration3@example.com',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Sales::sales',
             'Magento_Sales::sales_operation',
             'Magento_Sales::sales_order',
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php
new file mode 100644
index 0000000000000..ee14b3ba53dd8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Integration\Model;
+
+/**
+ * Test class for \Magento\Integration\Model\ConfigBasedIntegrationManager.php.
+ */
+class ConfigBasedIntegrationManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $consolidatedMock;
+
+    /**
+     * @var \Magento\Integration\Model\ConfigBasedIntegrationManager
+     */
+    protected $integrationManager;
+
+    /**
+     * @var \Magento\Integration\Api\IntegrationServiceInterface
+     */
+    protected $integrationService;
+
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->consolidatedMock = $this->createMock(\Magento\Integration\Model\ConsolidatedConfig::class);
+        $this->objectManager->addSharedInstance(
+            $this->consolidatedMock,
+            \Magento\Integration\Model\ConsolidatedConfig::class
+        );
+        $this->integrationManager = $this->objectManager->create(
+            \Magento\Integration\Model\ConfigBasedIntegrationManager::class,
+            []
+        );
+        $this->integrationService = $this->objectManager->create(
+            \Magento\Integration\Api\IntegrationServiceInterface::class,
+            []
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(\Magento\Integration\Model\ConsolidatedConfig::class);
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     */
+    public function testProcessConfigBasedIntegrations()
+    {
+        $newIntegrations = require __DIR__ . '/Config/Consolidated/_files/integration.php';
+        $this->consolidatedMock
+            ->expects($this->any())
+            ->method('getIntegrations')
+            ->willReturn($newIntegrations);
+
+        // Check that the integrations do not exist already
+        foreach ($newIntegrations as $integrationName => $integrationData) {
+            $integration = $this->integrationService->findByName($integrationName);
+            $this->assertEquals(null, $integration->getId(), 'Integration already exists');
+        }
+
+        // Create new integrations
+        $this->assertEquals(
+            $newIntegrations,
+            $this->integrationManager->processConfigBasedIntegrations($newIntegrations),
+            'Error processing config based integrations.'
+        );
+        $createdIntegrations = [];
+
+        // Check that the integrations are new with "inactive" status
+        foreach ($newIntegrations as $integrationName => $integrationData) {
+            $integration = $this->integrationService->findByName($integrationName);
+            $this->assertNotEmpty($integration->getId(), 'Integration was not created');
+            $this->assertEquals(
+                $integration::STATUS_INACTIVE,
+                $integration->getStatus(),
+                'Integration is not created with "inactive" status'
+            );
+            $createdIntegrations[$integrationName] = $integration;
+        }
+
+        // Rerun integration creation with the same data (data has not changed)
+        $this->assertEquals(
+            $newIntegrations,
+            $this->integrationManager->processConfigBasedIntegrations($newIntegrations),
+            'Error processing config based integrations.'
+        );
+
+        // Check that the integrations are not recreated when data has not actually changed
+        foreach ($newIntegrations as $integrationName => $integrationData) {
+            $integration = $this->integrationService->findByName($integrationName);
+            $this->assertEquals(
+                $createdIntegrations[$integrationName]->getId(),
+                $integration->getId(),
+                'Integration ID has changed'
+            );
+            $this->assertEquals(
+                $createdIntegrations[$integrationName]->getStatus(),
+                $integration->getStatus(),
+                'Integration status has changed'
+            );
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
index 740b1aa424556..6c4268db6db46 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
@@ -73,13 +73,17 @@ public function testCreateCustomerAccessTokenEmptyOrNullCredentials($username, $
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testCreateCustomerAccessTokenInvalidCustomer()
     {
         $customerUserName = 'invalid';
         $password = 'invalid';
         $this->tokenService->createCustomerAccessToken($customerUserName, $password);
+
+        $this->expectExceptionMessage(
+            'The account sign-in was incorrect or your account is disabled temporarily. '
+            . 'Please wait and try again later.'
+        );
     }
 
     /**
@@ -105,7 +109,7 @@ private function assertInputExceptionMessages($e)
         $this->assertEquals('One or more input exceptions have occurred.', $e->getMessage());
         $errors = $e->getErrors();
         $this->assertCount(2, $errors);
-        $this->assertEquals('username is a required field.', $errors[0]->getLogMessage());
-        $this->assertEquals('password is a required field.', $errors[1]->getLogMessage());
+        $this->assertEquals('"username" is required. Enter and try again.', $errors[0]->getLogMessage());
+        $this->assertEquals('"password" is required. Enter and try again.', $errors[1]->getLogMessage());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/ResourceModel/Oauth/TokenTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/ResourceModel/Oauth/TokenTest.php
index ef93099556dd9..57fac92aaabd7 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Model/ResourceModel/Oauth/TokenTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Model/ResourceModel/Oauth/TokenTest.php
@@ -252,7 +252,7 @@ public function deleteExpiredTokensDataProvider()
     }
 
     /**
-     * Make that only exired tokens were cleaned up
+     * Make that only expired tokens were cleaned up
      *
      * @param array $expectedRemovedTokenNumbers
      * @param array $expectedPreservedTokenNumbers
diff --git a/dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php b/dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php
new file mode 100644
index 0000000000000..ffc1005c61150
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Model\File\Storage;
+
+/**
+ * Tests for \Magento\MediaStorage\Model\File\Storage\Response class
+ */
+class ResponseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * test for \Magento\MediaStorage\Model\File\Storage\Response::sendResponse()
+     *
+     * @return void
+     */
+    public function testSendResponse(): void
+    {
+        $expectedHeaders = [
+            [
+                'field_name' => 'X-Content-Type-Options',
+                'field_value' => 'nosniff',
+            ],
+            [
+                'field_name' => 'X-XSS-Protection',
+                'field_value' => '1; mode=block',
+            ],
+            [
+                'field_name' => 'X-Frame-Options',
+                'field_value' => 'SAMEORIGIN',
+            ],
+        ];
+        $filePath = realpath(__DIR__ . '/../../../_files/test_file.html');
+        /** @var \Magento\MediaStorage\Model\File\Storage\Response $response */
+        $mediaStorageResponse = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\MediaStorage\Model\File\Storage\Response::class
+        );
+        $mediaStorageResponse->setFilePath($filePath);
+        ob_start();
+        $mediaStorageResponse->sendResponse();
+        ob_end_clean();
+        /** @var \Magento\Framework\App\Response\Http $frameworkResponse */
+        $frameworkResponse = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\HTTP\PhpEnvironment\Response::class
+        );
+        $actualHeaders = [];
+        foreach ($frameworkResponse->getHeaders() as $responseHeader) {
+            $actualHeaders[] = [
+                'field_name' => $responseHeader->getFieldName(),
+                'field_value' => $responseHeader->getFieldValue(),
+            ];
+        }
+        foreach ($expectedHeaders as $expected) {
+            $this->assertTrue(in_array($expected, $actualHeaders));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html b/dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html
new file mode 100644
index 0000000000000..082b3465b6ac4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html
@@ -0,0 +1 @@
+test data
diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
new file mode 100644
index 0000000000000..3fa80a2dcda1a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron;
+
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\ShellInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+
+/**
+ * Tests the different cases of consumers running by ConsumersRunner
+ *
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Consumer config provider
+     *
+     * @var ConsumerConfigInterface
+     */
+    private $consumerConfig;
+
+    /**
+     * @var PidConsumerManager
+     */
+    private $pid;
+
+    /**
+     * @var FileReader
+     */
+    private $reader;
+
+    /**
+     * @var ConsumersRunner
+     */
+    private $consumersRunner;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var ConfigFilePool
+     */
+    private $configFilePool;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $appConfig;
+
+    /**
+     * @var ShellInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shellMock;
+
+    /**
+     * @var array
+     */
+    private $config;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->shellMock = $this->getMockBuilder(ShellInterface::class)
+            ->getMockForAbstractClass();
+        $this->pid = $this->objectManager->get(PidConsumerManager::class);
+        $this->consumerConfig = $this->objectManager->get(ConsumerConfigInterface::class);
+        $this->reader = $this->objectManager->get(FileReader::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->configFilePool = $this->objectManager->get(ConfigFilePool::class);
+        $this->appConfig = $this->objectManager->get(ReinitableConfigInterface::class);
+        $this->consumersRunner = $this->objectManager->create(
+            ConsumersRunner::class,
+            ['shellBackground' => $this->shellMock]
+        );
+        $this->config = $this->loadConfig();
+
+        $this->shellMock->expects($this->any())
+            ->method('execute')
+            ->willReturnCallback(function ($command, $arguments) {
+                $command = vsprintf($command, $arguments);
+                $params = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams();
+                $params['MAGE_DIRS']['base']['path'] = BP;
+                $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
+                $command = str_replace('bin/magento', 'dev/tests/integration/bin/magento', $command);
+                $command = $params . ' ' . $command;
+
+                return exec("{$command} >/dev/null &");
+            });
+    }
+
+    /**
+     * Checks that pid files are created
+     *
+     * @return void
+     */
+    public function testCheckThatPidFilesWasCreated()
+    {
+        $this->markTestSkipped('MC-5904: Test Fails randomly,');
+        $this->consumersRunner->run();
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $this->waitConsumerPidFile($consumer->getName());
+        }
+    }
+
+    /**
+     * Tests running of specific consumer and his re-running when it is working
+     *
+     * @return void
+     */
+    public function testSpecificConsumerAndRerun()
+    {
+        $this->markTestSkipped('MC-5904: Test Fails randomly,');
+
+        $specificConsumer = 'quoteItemCleaner';
+        $pidFilePath = $this->getPidFileName($specificConsumer);
+        $config = $this->config;
+        $config['cron_consumers_runner'] = ['consumers' => [$specificConsumer], 'max_messages' => 0];
+
+        $this->writeConfig($config);
+        $this->reRunConsumersAndCheckPidFiles($specificConsumer);
+        $pid = $this->pid->getPid($pidFilePath);
+        $this->reRunConsumersAndCheckPidFiles($specificConsumer);
+        $this->assertSame($pid, $this->pid->getPid($pidFilePath));
+    }
+
+    /**
+     * @param string $specificConsumer
+     * @return void
+     */
+    private function reRunConsumersAndCheckPidFiles($specificConsumer)
+    {
+        $this->consumersRunner->run();
+
+        sleep(20);
+
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $consumerName = $consumer->getName();
+            $pidFileFullPath = $this->getPidFileFullPath($consumerName);
+
+            if ($consumerName === $specificConsumer) {
+                $this->assertTrue(file_exists($pidFileFullPath));
+            } else {
+                $this->assertFalse(file_exists($pidFileFullPath));
+            }
+        }
+    }
+
+    /**
+     * Tests disabling cron job which runs consumers
+     *
+     * @return void
+     */
+    public function testCronJobDisabled()
+    {
+        $config = $this->config;
+        $config['cron_consumers_runner'] = ['cron_run' => false];
+
+        $this->writeConfig($config);
+
+        $this->consumersRunner->run();
+
+        sleep(20);
+
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $pidFileFullPath = $this->getPidFileFullPath($consumer->getName());
+            $this->assertFalse(file_exists($pidFileFullPath));
+        }
+    }
+
+    /**
+     * @param string $consumerName
+     * @return void
+     */
+    private function waitConsumerPidFile($consumerName)
+    {
+        $pidFileFullPath = $this->getPidFileFullPath($consumerName);
+        $i = 0;
+        do {
+            sleep(1);
+        } while (!file_exists($pidFileFullPath) && ($i++ < 60));
+
+        if (!file_exists($pidFileFullPath)) {
+            $this->fail($consumerName . ' pid file does not exist.');
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function loadConfig()
+    {
+        return $this->reader->load(ConfigFilePool::APP_ENV);
+    }
+
+    /**
+     * @param array $config
+     * @return void
+     */
+    private function writeConfig(array $config)
+    {
+        /** @var Writer $writer */
+        $writer = $this->objectManager->get(Writer::class);
+        $writer->saveConfig([ConfigFilePool::APP_ENV => $config]);
+    }
+
+    /**
+     * @param string $consumerName
+     * @return string
+     */
+    private function getPidFileFullPath($consumerName)
+    {
+        $directoryList = $this->objectManager->get(DirectoryList::class);
+        return $directoryList->getPath(DirectoryList::VAR_DIR) . '/' . $this->getPidFileName($consumerName);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $consumerName = $consumer->getName();
+            $pidFileFullPath = $this->getPidFileFullPath($consumerName);
+            $pidFilePath = $this->getPidFileName($consumerName);
+            $pid = $this->pid->getPid($pidFilePath);
+
+            if ($pid && $this->pid->isRun($pidFilePath)) {
+                posix_kill($pid, SIGKILL);
+            }
+
+            if (file_exists($pidFileFullPath)) {
+                unlink($pidFileFullPath);
+            }
+        }
+
+        $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->writeFile(
+            $this->configFilePool->getPath(ConfigFilePool::APP_ENV),
+            "<?php\n return array();\n"
+        );
+        $this->writeConfig($this->config);
+        $this->appConfig->reinit();
+    }
+
+    /**
+     * @param string $consumerName The consumers name
+     * @return string The name to file with PID
+     */
+    private function getPidFileName($consumerName)
+    {
+        $sanitizedHostname = preg_replace('/[^a-z0-9]/i', '', gethostname());
+
+        return $consumerName . '-' . $sanitizedHostname . ConsumersRunner::PID_FILE_EXT;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Plugin/ResourceModel/LockTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Plugin/ResourceModel/LockTest.php
new file mode 100644
index 0000000000000..960114e35be7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Plugin/ResourceModel/LockTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Model\Plugin\ResourceModel;
+
+use Magento\TestFramework\Event\Magento;
+
+class LockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\LockInterface
+     */
+    protected $lock;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\WriterInterface
+     */
+    protected $writer;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\ReaderInterface
+     */
+    protected $reader;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->lock = $this->objectManager->get(\Magento\Framework\MessageQueue\LockInterface::class);
+        $this->writer = $this->objectManager->get(\Magento\Framework\MessageQueue\Lock\WriterInterface::class);
+        $this->reader = $this->objectManager->get(\Magento\Framework\MessageQueue\Lock\ReaderInterface::class);
+    }
+
+    /**
+     * Test to ensure Queue Lock Table is cleared when maintenance mode transitions from on to off.
+     *
+     * @return void
+     */
+    public function testLockClearedByMaintenanceModeOff()
+    {
+        /** @var $maintenanceMode \Magento\Framework\App\MaintenanceMode */
+        $maintenanceMode = $this->objectManager->get(\Magento\Framework\App\MaintenanceMode::class);
+        $code = md5('consumer.name-1');
+        $this->lock->setMessageCode($code);
+        $this->writer->saveLock($this->lock);
+        $this->reader->read($this->lock, $code);
+        $id = $this->lock->getId();
+        $maintenanceMode->set(true);
+        $maintenanceMode->set(false);
+        $this->reader->read($this->lock, $code);
+        $emptyId = $this->lock->getId();
+
+        $this->assertGreaterThanOrEqual('1', $id);
+        $this->assertEmpty($emptyId);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Controller/Checkout/CheckItemsTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/Checkout/CheckItemsTest.php
new file mode 100644
index 0000000000000..02f031fae336a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/Checkout/CheckItemsTest.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Controller\Checkout;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\Session;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Quote;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface as QuoteRepository;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Test class for \Magento\Multishipping\Controller\Checkout
+ *
+ * @magentoAppArea frontend
+ * @magentoDataFixture Magento/Sales/_files/quote.php
+ * @magentoDataFixture Magento/Customer/_files/customer.php
+ */
+class CheckItemsTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->checkoutSession = $this->_objectManager->get(Session::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $this->json = $this->_objectManager->get(Json::class);
+        $this->quote = $this->getQuote('test01');
+        $this->checkoutSession->setQuoteId($this->quote->getId());
+        $this->checkoutSession->setCartWasUpdated(false);
+    }
+
+    /**
+     * Validator of quote items.
+     *
+     * @param array $requestQuantity
+     * @param array $expectedResponse
+     *
+     * @magentoConfigFixture current_store multishipping/options/checkout_multiple 1
+     * @magentoConfigFixture current_store multishipping/options/checkout_multiple_maximum_qty 200
+     * @dataProvider requestDataProvider
+     */
+    public function testExecute($requestQuantity, $expectedResponse)
+    {
+        $this->loginCustomer();
+
+        try {
+            /** @var $product Product */
+            $product = $this->productRepository->get('simple');
+        } catch (\Exception $e) {
+            $this->fail('No such product entity');
+        }
+
+        $quoteItem = $this->quote->getItemByProduct($product);
+        $this->assertNotFalse($quoteItem, 'Cannot get quote item for simple product');
+
+        $request = [];
+        if (!empty($requestQuantity) && is_array($requestQuantity)) {
+            $request= [
+                'ship' => [
+                    [$quoteItem->getId() => $requestQuantity],
+                ]
+            ];
+        }
+
+        $this->getRequest()->setPostValue($request);
+        $this->dispatch('multishipping/checkout/checkItems');
+        $response = $this->getResponse()->getBody();
+
+        $this->assertEquals($expectedResponse, $this->json->unserialize($response));
+    }
+
+    /**
+     * Authenticates customer and creates customer session.
+     */
+    private function loginCustomer()
+    {
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        /** @var AccountManagementInterface $service */
+        $service = $this->_objectManager->create(AccountManagementInterface::class);
+        try {
+            $customer = $service->authenticate('customer@example.com', 'password');
+        } catch (LocalizedException $e) {
+            $this->fail($e->getMessage());
+        }
+        /** @var CustomerSession $customerSession */
+        $customerSession = $this->_objectManager->create(CustomerSession::class, [$logger]);
+        $customerSession->setCustomerDataAsLoggedIn($customer);
+    }
+
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->create(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+        /** @var QuoteRepository $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(QuoteRepository::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+        return array_pop($items);
+    }
+
+    /**
+     * Variations of request data.
+     * @returns array
+     */
+    public function requestDataProvider(): array
+    {
+        return [
+            [
+                'request' => [],
+                'response' => [
+                    'success' => false,
+                    'error_message' => 'We are unable to process your request. Please, try again later.'
+                ]
+            ],
+            [
+                'request' => ['qty' => 2],
+                'response' => [
+                    'success' => true,
+                ]
+            ],
+            [
+                'request' => ['qty' => 101],
+                'response' => [
+                    'success' => false,
+                    'error_message' => 'The requested qty is not available']
+            ],
+            [
+                'request' => ['qty' => 230],
+                'response' => [
+                    'success' => false,
+                    'error_message' => 'Maximum qty allowed for Shipping to multiple addresses is 200']
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php
new file mode 100644
index 0000000000000..fdf86540979e2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+$data = [
+    'firstname' => 'Jonh',
+    'lastname' => 'Doe',
+    'telephone' => '0333-233-221',
+    'street' => ['Third Division 1'],
+    'city' => 'New York',
+    'region' => 'NY',
+    'postcode' => 10029,
+    'country_id' => 'US',
+    'email' => 'customer001@billing.test',
+    'address_type' => 'billing',
+];
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var AddressInterface $address */
+$address = $objectManager->create(AddressInterface::class, ['data' => $data]);
+$quote->setBillingAddress($address);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php
new file mode 100644
index 0000000000000..0179410d67d50
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote\Item;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+$productList = [];
+require __DIR__ . '/simple_product_10.php';
+$productList[] = $product;
+
+require __DIR__ . '/simple_product_20.php';
+$productList[] = $product;
+
+require __DIR__ . '/virtual_product_5.php';
+$productList[] = $product;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+foreach ($productList as $product) {
+    /** @var Item $item */
+    $item = $objectManager->create(Item::class);
+    $item->setProduct($product)
+        ->setPrice($product->getPrice())
+        ->setQty(1);
+    $quote->addItem($item);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php
new file mode 100644
index 0000000000000..59eaf97f9c6fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/simple_product_10_rollback.php';
+require __DIR__ . '/simple_product_20_rollback.php';
+require __DIR__ . '/virtual_product_5_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php
new file mode 100644
index 0000000000000..4f00aecb58e76
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Api\Data\PaymentInterface;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PaymentInterface $payment */
+$payment = $objectManager->create(PaymentInterface::class);
+$payment->setMethod('checkmo');
+
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php
new file mode 100644
index 0000000000000..2689636324961
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\CartRepositoryInterface;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/shipping_address_list.php';
+require __DIR__ . '/billing_address.php';
+require __DIR__ . '/payment_method.php';
+require __DIR__ . '/items.php';
+
+$quote->setReservedOrderId('multishipping_quote_id')
+    ->setCustomerEmail('customer001@test.com');
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quote->collectTotals();
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php
new file mode 100644
index 0000000000000..15eddaba0a1be
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+require __DIR__ . '/items_rollback.php';
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', 'multishipping_quote_id')
+    ->create();
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$items = $quoteRepository->getList($searchCriteria)->getItems();
+
+if (!empty($items)) {
+    $quote = array_pop($items);
+    $quoteRepository->delete($quote);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php
new file mode 100644
index 0000000000000..847d15b6753a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote;
+
+require __DIR__ . '/quote.php';
+
+/**
+ * @var Quote $quote
+ */
+
+$items = $quote->getAllItems();
+$addressList = $quote->getAllShippingAddresses();
+
+foreach ($addressList as $key => $address) {
+    $item = $items[$key];
+    // set correct quantity per shipping address
+    $item->setQty(1);
+    $address->setTotalQty(1);
+    $address->addItem($item);
+}
+
+// assign virtual product to the billing address
+$billingAddress = $quote->getBillingAddress();
+$virtualItem = $items[sizeof($items) - 1];
+$billingAddress->setTotalQty(1);
+$billingAddress->addItem($virtualItem);
+
+// need to recollect totals
+$quote->setTotalsCollectedFlag(false);
+$quote->collectTotals();
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php
new file mode 100644
index 0000000000000..c39a2a980050c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Model\Quote\Address\Rate;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+$addressList = [
+    [
+        'firstname' => 'Jonh',
+        'lastname' => 'Doe',
+        'telephone' => '0333-233-221',
+        'street' => ['Main Division 1'],
+        'city' => 'Culver City',
+        'region' => 'CA',
+        'postcode' => 90800,
+        'country_id' => 'US',
+        'email' => 'customer001@shipping.test',
+        'address_type' => 'shipping',
+    ],
+    [
+        'firstname' => 'Antoni',
+        'lastname' => 'Holmes',
+        'telephone' => '0333-233-221',
+        'street' => ['Second Division 2'],
+        'city' => 'Denver',
+        'region' => 'CO',
+        'postcode' => 80203,
+        'country_id' => 'US',
+        'email' => 'customer002@shipping.test',
+        'address_type' => 'shipping'
+    ]
+];
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$methodCode = 'flatrate_flatrate';
+foreach ($addressList as $data) {
+    /** @var Rate $rate */
+    $rate = $objectManager->create(Rate::class);
+    $rate->setCode($methodCode)
+        ->setPrice(5.00);
+
+    $address = $objectManager->create(AddressInterface::class, ['data' => $data]);
+    $address->setShippingMethod($methodCode)
+        ->addShippingRate($rate)
+        ->setShippingAmount(5.00)
+        ->setBaseShippingAmount(5.00);
+
+    $quote->addAddress($address);
+}
+$quote->setIsMultiShipping(1);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php
new file mode 100644
index 0000000000000..b6bec1433d312
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 10')
+    ->setSku('simple_10')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php
new file mode 100644
index 0000000000000..87098986abfc6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->deleteById('simple_10');
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php
new file mode 100644
index 0000000000000..0677c1c3c0402
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 20')
+    ->setSku('simple_20')
+    ->setPrice(20)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php
new file mode 100644
index 0000000000000..4723f0bf8651b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->deleteById('simple_20');
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php
new file mode 100644
index 0000000000000..a441ce0031c1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_VIRTUAL)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product 5')
+    ->setSku('virtual_5')
+    ->setPrice(5)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php
new file mode 100644
index 0000000000000..01daee61b43bf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->deleteById('virtual_5');
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php
index 6ce1cb3848e3b..b4222c0d0189d 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php
@@ -5,10 +5,27 @@
  */
 namespace Magento\Multishipping\Model\Checkout\Type;
 
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Sales\Model\Service\OrderService;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @magentoAppArea frontend
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class MultishippingTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,23 +33,40 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
 
     const ADDRESS_TYPE_BILLING = 'billing';
 
-    /** @var \Magento\Multishipping\Model\Checkout\Type\Multishipping */
-    protected $_multishippingCheckout;
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Multishipping
+     */
+    private $model;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
 
     /**
-     * @var \Magento\Customer\Api\AddressRepositoryInterface
+     * @var CustomerRepositoryInterface
      */
-    protected $addressRepository;
+    private $customerRepository;
 
     protected function setUp()
     {
-        $this->_multishippingCheckout = Bootstrap::getObjectManager()->create(
-            \Magento\Multishipping\Model\Checkout\Type\Multishipping::class
-        );
-        $this->addressRepository = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Api\AddressRepositoryInterface::class
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->addressRepository = $this->objectManager->get(AddressRepositoryInterface::class);
+        $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $orderSender = $this->getMockBuilder(OrderSender::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $this->objectManager->create(
+            Multishipping::class,
+            ['orderSender' => $orderSender]
         );
-        parent::setUp();
     }
 
     /**
@@ -51,39 +85,28 @@ public function testGetCustomerDefaultAddress($addressType)
          * - second address is default address of {$addressType},
          * - current customer is set to customer session
          */
-        $fixtureCustomerId = 1;
         $secondFixtureAddressId = 2;
         $secondFixtureAddressStreet = ['Black str, 48'];
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\Customer::class
-        )->load($fixtureCustomerId);
-        if ($addressType == self::ADDRESS_TYPE_SHIPPING) {
-            $customer->setDefaultShipping($secondFixtureAddressId)->save();
-        } else {
-            // billing
-            $customer->setDefaultBilling($secondFixtureAddressId)->save();
-        }
-        /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
-        $customerSession->setCustomer($customer);
-
-        /** Execute SUT */
-        if ($addressType == self::ADDRESS_TYPE_SHIPPING) {
-            $addressId = $this->_multishippingCheckout->getCustomerDefaultShippingAddress();
-        } else {
-            // billing
-            $addressId = $this->_multishippingCheckout->getCustomerDefaultBillingAddress();
-        }
+
+        $methodName = 'getCustomerDefault' . ucfirst($addressType) . 'Address';
+        $setterMethodName = 'setDefault' . ucfirst($addressType);
+
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customer->$setterMethodName($secondFixtureAddressId);
+        $this->customerRepository->save($customer);
+
+        /** @var Customer $customerModel */
+        $customerModel = $this->objectManager->create(Customer::class);
+        $customerModel->updateData($customer);
+        /** @var Session $customerSession */
+        $customerSession = $this->objectManager->get(Session::class);
+        $customerSession->setCustomer($customerModel);
+
+        $addressId = $this->model->$methodName();
         $address = $this->addressRepository->getById($addressId);
 
-        $this->assertInstanceOf(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            $address,
-            "Address was not loaded."
-        );
-        $this->assertEquals($secondFixtureAddressId, $address->getId(), "Invalid address loaded.");
-        $this->assertEquals(
+        self::assertEquals($secondFixtureAddressId, $address->getId(), "Invalid address loaded.");
+        self::assertEquals(
             $secondFixtureAddressStreet,
             $address->getStreet(),
             "Street in default {$addressType} address is invalid."
@@ -91,17 +114,17 @@ public function testGetCustomerDefaultAddress($addressType)
 
         /** Ensure that results are cached properly by changing default address and invoking SUT once again */
         $firstFixtureAddressId = 1;
-        if ($addressType == self::ADDRESS_TYPE_SHIPPING) {
-            $customer->setDefaultShipping($firstFixtureAddressId)->save();
-            $addressId = $this->_multishippingCheckout->getCustomerDefaultShippingAddress();
-        } else {
-            // billing
-            $customer->setDefaultBilling($firstFixtureAddressId)->save();
-            $addressId = $this->_multishippingCheckout->getCustomerDefaultBillingAddress();
-        }
+        $customer->$setterMethodName($firstFixtureAddressId);
+        $this->customerRepository->save($customer);
+        $addressId = $this->model->$methodName();
+
         $address = $this->addressRepository->getById($addressId);
 
-        $this->assertEquals($secondFixtureAddressId, $address->getId(), "Method results are not cached properly.");
+        self::assertEquals(
+            $secondFixtureAddressId,
+            $address->getId(),
+            "Method results are not cached properly."
+        );
     }
 
     /**
@@ -120,39 +143,26 @@ public function testGetCustomerDefaultAddressDefaultAddressNotSet($addressType)
          * - customer has addresses, but default address of {$addressType} is not set
          * - current customer is set to customer session
          */
-        $fixtureCustomerId = 1;
         $firstFixtureAddressId = 1;
         $firstFixtureAddressStreet = ['Green str, 67'];
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\Customer::class
-        )->load($fixtureCustomerId);
-        if ($addressType == self::ADDRESS_TYPE_SHIPPING) {
-            $customer->setDefaultShipping(null)->save();
-        } else {
-            // billing
-            $customer->setDefaultBilling(null)->save();
-        }
-        /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
-        $customerSession->setCustomer($customer);
-
-        /** Execute SUT */
-        if ($addressType == self::ADDRESS_TYPE_SHIPPING) {
-            $addressId = $this->_multishippingCheckout->getCustomerDefaultShippingAddress();
-        } else {
-            // billing
-            $addressId = $this->_multishippingCheckout->getCustomerDefaultBillingAddress();
-        }
+        $customer = $this->customerRepository->get('customer@example.com');
+        $methodName = 'setDefault' . ucfirst($addressType);
+        $customer->$methodName(null);
+        $this->customerRepository->save($customer);
+
+        /** @var Customer $customerModel */
+        $customerModel = $this->objectManager->create(Customer::class);
+        $customerModel->updateData($customer);
+        /** @var Session $customerSession */
+        $customerSession = $this->objectManager->get(Session::class);
+        $customerSession->setCustomer($customerModel);
+
+        $methodName = 'getCustomerDefault' . ucfirst($addressType) . 'Address';
+        $addressId = $this->model->$methodName();
         $address = $this->addressRepository->getById($addressId);
 
-        $this->assertInstanceOf(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            $address,
-            "Address was not loaded."
-        );
-        $this->assertEquals($firstFixtureAddressId, $address->getId(), "Invalid address loaded.");
-        $this->assertEquals(
+        self::assertEquals($firstFixtureAddressId, $address->getId(), "Invalid address loaded.");
+        self::assertEquals(
             $firstFixtureAddressStreet,
             $address->getStreet(),
             "Street in default {$addressType} address is invalid."
@@ -174,31 +184,296 @@ public function testGetCustomerDefaultAddressCustomerWithoutAddresses($addressTy
          * - customer has no addresses
          * - current customer is set to customer session
          */
-        $fixtureCustomerId = 1;
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\Customer::class
-        )->load($fixtureCustomerId);
-        $customer->setDefaultShipping(null)->setDefaultBilling(null)->save();
-        /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
-        $customerSession->setCustomer($customer);
-
-        /** Execute SUT */
-        if ($addressType == self::ADDRESS_TYPE_SHIPPING) {
-            $address = $this->_multishippingCheckout->getCustomerDefaultShippingAddress();
-        } else {
-            // billing
-            $address = $this->_multishippingCheckout->getCustomerDefaultBillingAddress();
-        }
-        $this->assertNull($address, "When customer has no addresses, null is expected.");
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customer->setDefaultShipping(null)
+            ->setDefaultBilling(null);
+        $this->customerRepository->save($customer);
+
+        /** @var Customer $customerModel */
+        $customerModel = $this->objectManager->create(Customer::class);
+        $customerModel->updateData($customer);
+        /** @var Session $customerSession */
+        $customerSession = $this->objectManager->get(Session::class);
+        $customerSession->setCustomer($customerModel);
+
+        $methodName = 'getCustomerDefault' . ucfirst($addressType) . 'Address';
+        $address = $this->model->$methodName();
+
+        self::assertNull($address, "When customer has no addresses, null is expected.");
     }
 
+    /**
+     * @return array
+     */
     public function getCustomerDefaultAddressDataProvider()
     {
         return [
             self::ADDRESS_TYPE_SHIPPING => [self::ADDRESS_TYPE_SHIPPING],
-            self::ADDRESS_TYPE_BILLING => [self::ADDRESS_TYPE_BILLING]
+            self::ADDRESS_TYPE_BILLING => [self::ADDRESS_TYPE_BILLING],
         ];
     }
+
+    /**
+     * Checks a case when multiple orders with different shipping addresses are created successfully.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php
+     * @return void
+     */
+    public function testCreateOrders()
+    {
+        $quote = $this->getQuote('multishipping_quote_id');
+        /** @var CheckoutSession $session */
+        $session = $this->objectManager->get(CheckoutSession::class);
+        $session->replaceQuote($quote);
+
+        $this->model->createOrders();
+
+        $orderList = $this->getOrderList((int)$quote->getId());
+        self::assertCount(3, $orderList);
+
+        /**
+         * @var Order $firstOrder
+         * The order with $10 simple product
+         */
+        $firstOrder = array_shift($orderList);
+        /**
+         * @var Order $secondOrder
+         * The order with $20 simple product
+         */
+        $secondOrder = array_shift($orderList);
+        /**
+         * @var Order $thirdOrder
+         * The order with $5 virtual product and billing address as shipping
+         */
+        $thirdOrder = array_shift($orderList);
+
+        $this->performOrderAddressAssertions(
+            $firstOrder->getShippingAddress(),
+            [
+                'street' => ['Main Division 1'],
+                'city' => 'Culver City',
+                'region' => 'California',
+                'postcode' => 90800,
+            ]
+        );
+        $this->performOrderAddressAssertions(
+            $secondOrder->getShippingAddress(),
+            [
+                'street' => ['Second Division 2'],
+                'city' => 'Denver',
+                'region' => 'Colorado',
+                'postcode' => 80203,
+            ]
+        );
+        $this->performOrderAddressAssertions(
+            $thirdOrder->getBillingAddress(),
+            [
+                'street' => ['Third Division 1'],
+                'city' => 'New York',
+                'region' => 'New York',
+                'postcode' => 10029,
+            ]
+        );
+
+        $this->performOrderTotalAssertions(
+            $firstOrder->getBaseGrandTotal(),
+            15.00
+        );
+        $this->performOrderTotalAssertions(
+            $secondOrder->getBaseGrandTotal(),
+            25.00
+        );
+        $this->performOrderTotalAssertions(
+            $thirdOrder->getBaseGrandTotal(),
+            5.00
+        );
+    }
+
+    /**
+     * Checks a case when some of multiple orders are failed to place.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php
+     * @return void
+     */
+    public function testCreateOrdersWithSomeFailedOrders()
+    {
+        $quote = $this->getQuote('multishipping_quote_id');
+        /** @var CheckoutSession $session */
+        $checkoutSession = $this->objectManager->get(CheckoutSession::class);
+        $checkoutSession->replaceQuote($quote);
+
+        $this->objectManager->addSharedInstance(
+            $this->getOrderServiceMock(),
+            OrderService::class
+        );
+
+        $this->model->createOrders();
+        $session = $this->objectManager->get(SessionManagerInterface::class);
+
+        // get address errors, stored in session
+        $addressErrorsIds = array_keys($session->getAddressErrors());
+        $shippingFailedAddressId = $addressErrorsIds[0];
+        $billingFailedAddressId = $addressErrorsIds[1];
+
+        // successfully placed order shipping address has to be removed from quote
+        $this->assertFalse(
+            $this->findAddressInQuote(
+                [
+                    'street' => ['Main Division 1'],
+                    'city' => 'Culver City',
+                    'region' => 'California',
+                    'postcode' => '90800',
+                ],
+                $this->model->getQuote()
+            ),
+            'This shipping address shouldn\'t be present in quote'
+        );
+
+        // failed order shipping address has to remain in quote
+        $this->assertTrue(
+            $this->findAddressInQuote(
+                [
+                    'id' => (string)$shippingFailedAddressId,
+                    'street' => ['Second Division 2'],
+                    'city' => 'Denver',
+                    'region' => 'Colorado',
+                    'postcode' => '80203',
+                ],
+                $this->model->getQuote()
+            ),
+            'This shipping address should be present in quote'
+        );
+
+        $this->assertTrue(
+            $this->findAddressInQuote(
+                [
+                    'id' => (string)$billingFailedAddressId,
+                    'street' => ['Third Division 1'],
+                    'city' => 'New York',
+                    'region' => 'New York',
+                    'postcode' => '10029',
+                ],
+                $this->model->getQuote()
+            ),
+            'Billing address should be present in quote'
+        );
+    }
+
+    /**
+     * Returns order service mock with successful place on first call and exceptions on other calls.
+     *
+     * @return MockObject
+     */
+    private function getOrderServiceMock(): MockObject
+    {
+        $orderService = $this->getMockBuilder(OrderService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $exception = new \Exception('Place order error');
+        $orderService->expects($this->exactly(3))
+            ->method('place')
+            ->willReturnOnConsecutiveCalls(
+                $this->returnArgument(0),
+                $this->throwException($exception),
+                $this->throwException($exception)
+            );
+
+        return $orderService;
+    }
+
+    /**
+     * Retrieves quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Get list of orders by quote id.
+     *
+     * @param int $quoteId
+     * @return array
+     */
+    private function getOrderList(int $quoteId): array
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('quote_id', $quoteId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        return $orderRepository->getList($searchCriteria)->getItems();
+    }
+
+    /**
+     * Performs assertions for order address.
+     *
+     * @param OrderAddressInterface $address
+     * @param array $expected
+     * @return void
+     */
+    private function performOrderAddressAssertions(OrderAddressInterface $address, array $expected)
+    {
+        foreach ($expected as $key => $item) {
+            $methodName = 'get' . ucfirst($key);
+            self::assertEquals($item, $address->$methodName(), 'The "'. $key . '" does not match.');
+        }
+    }
+
+    /**
+     * Search address in quote address array.
+     *
+     * @param array $searchAddress
+     * @param Quote $quote
+     * @return bool
+     */
+    private function findAddressInQuote(array $searchAddress, Quote $quote)
+    {
+        $quoteAddresses = $quote->getAllShippingAddresses();
+        if ($quote->hasVirtualItems()) {
+            $quoteAddresses[] = $quote->getBillingAddress();
+        }
+
+        foreach ($quoteAddresses as $quoteAddress) {
+            $isFound = true;
+            foreach ($searchAddress as $key => $item) {
+                $methodName = 'get' . ucfirst($key);
+                $isFound = $isFound ? $item === $quoteAddress->$methodName() : false;
+            }
+            if ($isFound) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Perform assertions for order total amount.
+     *
+     * @param float $total
+     * @param float $expected
+     * @return void
+     */
+    private function performOrderTotalAssertions(float $total, float $expected)
+    {
+        self::assertEquals($expected, $total, 'Order total amount does not match.');
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php
new file mode 100644
index 0000000000000..31843be00a54b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+class DataObject extends \Magento\Framework\Api\AbstractExtensibleObject
+{
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_get('name');
+    }
+
+    /**
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        return $this->setData('name', $name);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getEntityId()
+    {
+        return $this->_get('entity_id');
+    }
+
+    /**
+     * @param int $entityId
+     * @return $this
+     */
+    public function setEntityId($entityId)
+    {
+        return $this->setData('entity_id', $entityId);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php
new file mode 100644
index 0000000000000..879872315ec51
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+class DataObjectRepository
+{
+    /**
+     * @param DataObject $dataObject
+     * @param string $requiredParam
+     * @param int|null $optionalParam
+     * @return bool
+     */
+    public function delayedOperation(
+        \Magento\MysqlMq\Model\DataObject $dataObject,
+        $requiredParam,
+        $optionalParam = null
+    ) {
+        echo "Processed '{$dataObject->getEntityId()}'; "
+            . "Required param '{$requiredParam}'; Optional param '{$optionalParam}'\n";
+        return true;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Driver/QueueTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Driver/QueueTest.php
new file mode 100644
index 0000000000000..974d2d78079de
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Driver/QueueTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+use Magento\MysqlMq\Model\Driver\Queue;
+
+/**
+ * Test for MySQL queue driver class.
+ *
+ * @magentoDbIsolation disabled
+ */
+class QueueTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Queue
+     */
+    protected $queue;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
+        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $queueConfig->reset();
+
+        $this->queue = $this->objectManager->create(
+            \Magento\MysqlMq\Model\Driver\Queue::class,
+            ['queueName' => 'queue2']
+        );
+    }
+
+    protected function tearDown()
+    {
+        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
+        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $queueConfig->reset();
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPushAndDequeue()
+    {
+        /** @var \Magento\Framework\MessageQueue\EnvelopeFactory $envelopFactory */
+        $envelopFactory = $this->objectManager->get(\Magento\Framework\MessageQueue\EnvelopeFactory::class);
+        $messageBody = '{"data": {"body": "Message body"}, "message_id": 1}';
+        $topicName = 'some.topic';
+        $envelop = $envelopFactory->create(['body' => $messageBody, 'properties' => ['topic_name' => $topicName]]);
+
+        $this->queue->push($envelop);
+
+        $messageFromQueue = $this->queue->dequeue();
+
+        $this->assertEquals($messageBody, $messageFromQueue->getBody());
+        $actualMessageProperties = $messageFromQueue->getProperties();
+        $this->assertArrayHasKey('topic_name', $actualMessageProperties);
+        $this->assertEquals($topicName, $actualMessageProperties['topic_name']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/ObserverTest.php
new file mode 100644
index 0000000000000..c22bf2823c10f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/ObserverTest.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+class ObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\MysqlMq\Model\Observer
+     */
+    private $observer;
+
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement
+     */
+    private $queueManagement;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->observer = $this->objectManager->get(\Magento\MysqlMq\Model\Observer::class);
+        $this->queueManagement = $this->objectManager->get(\Magento\MysqlMq\Model\QueueManagement::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_done_old.php
+     */
+    public function testCleanUpOld()
+    {
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory */
+        $messageStatusCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class);
+
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory $messageStatusCollectionFactory */
+        $messageCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory::class);
+
+        //Check how many messages in collection by the beginning of tests
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageId = $messageCollection->getFirstItem()->getId();
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(3, $messageStatusCollection->getSize());
+
+        //Run clean up once. It should move 3 out of 4 statuses to TO BE DELETED status
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(0, $messageCollection->getSize());
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(0, $messageStatusCollection->getSize());
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_done_old.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_done_recent.php
+     */
+    public function testCleanupMessages()
+    {
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory */
+        $messageStatusCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class);
+
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory $messageStatusCollectionFactory */
+        $messageCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory::class);
+
+        //Check how many messages in collection by the beginning of tests
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageId = $messageCollection->getFirstItem()->getId();
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(4, $messageStatusCollection->getSize());
+
+        //Run clean up once. It should move 3 out of 4 statuses to TO BE DELETED status
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId)
+            ->addFieldToFilter('status', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED);
+
+        $this->assertEquals(3, $messageStatusCollection->getSize());
+
+        // Change the Updated At in order to make job visible
+        $lastMessageStatus = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId)
+            ->addFieldToFilter('status', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE)
+            ->getFirstItem();
+        $lastMessageStatus->setUpdatedAt(time() - 1 - 24 * 7 * 60 * 60)
+            ->save();
+
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(0, $messageCollection->getSize());
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(0, $messageStatusCollection->getSize());
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_in_progress.php
+     */
+    public function testCleanupInProgressMessages()
+    {
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory */
+        $messageStatusCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class);
+
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory $messageStatusCollectionFactory */
+        $messageCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory::class);
+
+        //Check how many messages in collection by the beginning of tests
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic_second.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageId = $messageCollection->getFirstItem()->getId();
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(2, $messageStatusCollection->getSize());
+
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic_second.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId)
+            ->addFieldToFilter('status', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED);
+        $this->assertEquals(1, $messageStatusCollection->getSize());
+        $this->assertEquals(1, $messageStatusCollection->getFirstItem()->getNumberOfTrials());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php
new file mode 100644
index 0000000000000..3b2a76104a2cd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Test message processor is used by \Magento\MysqlMq\Model\PublisherTest
+ */
+class Processor
+{
+    /**
+     * @param \Magento\MysqlMq\Model\DataObject $message
+     */
+    public function processMessage($message)
+    {
+        echo "Processed {$message->getEntityId()}\n";
+    }
+
+    /**
+     * @param \Magento\MysqlMq\Model\DataObject $message
+     */
+    public function processMessageWithException($message)
+    {
+        throw new \LogicException("Exception during message processing happened. Entity: {{$message->getEntityId()}}");
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
new file mode 100644
index 0000000000000..f03d03d3a25fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+
+/**
+ * Test for MySQL publisher class.
+ *
+ * @magentoDbIsolation disabled
+ */
+class PublisherConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    const MAX_NUMBER_OF_TRIALS = 3;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\PublisherInterface
+     */
+    protected $publisher;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->markTestIncomplete('Should be converted to queue config v2.');
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $configPath = __DIR__ . '/../etc/queue.xml';
+        $fileResolverMock = $this->createMock(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolverMock->expects($this->any())
+            ->method('get')
+            ->willReturn([$configPath => file_get_contents(($configPath))]);
+
+        /** @var \Magento\Framework\MessageQueue\Config\Reader\Xml $xmlReader */
+        $xmlReader = $this->objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml::class,
+            ['fileResolver' => $fileResolverMock]
+        );
+
+        $newData = $xmlReader->read();
+
+        /** @var \Magento\Framework\MessageQueue\Config\Data $configData */
+        $configData = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $configData->reset();
+        $configData->merge($newData);
+
+        $this->publisher = $this->objectManager->create(\Magento\Framework\MessageQueue\PublisherInterface::class);
+    }
+
+    protected function tearDown()
+    {
+        $this->markTestIncomplete('Should be converted to queue config v2.');
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueTwo', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueThree', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueFour', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueFive', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX);
+
+        $objectManagerConfiguration = [\Magento\Framework\MessageQueue\Config\Reader\Xml::class => [
+                'arguments' => [
+                    'fileResolver' => ['instance' => \Magento\Framework\Config\FileResolverInterface::class],
+                ],
+            ],
+        ];
+        $this->objectManager->configure($objectManagerConfiguration);
+        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
+        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $queueConfig->reset();
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPublishConsumeFlow()
+    {
+        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
+        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
+        /** @var \Magento\MysqlMq\Model\DataObject $object */
+        $object = $objectFactory->create();
+        for ($i = 0; $i < 10; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.created', $object);
+        }
+        for ($i = 0; $i < 5; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.updated', $object);
+        }
+        for ($i = 0; $i < 3; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.custom.created', $object);
+        }
+
+        $outputPattern = '/(Processed \d+\s)/';
+        /** There are total of 10 messages in the first queue, total expected consumption is 7, 3 then 0 */
+        $this->consumeMessages('demoConsumerQueueOne', 7, 7, $outputPattern);
+        /** Consumer all messages which left in this queue */
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 3, $outputPattern);
+        $this->consumeMessages('demoConsumerQueueOne', 7, 0, $outputPattern);
+
+        /** Verify that messages were added correctly to second queue for update and create topics */
+        $this->consumeMessages('demoConsumerQueueTwo', 20, 15, $outputPattern);
+
+        /** Verify that messages were NOT added to fourth queue */
+        $this->consumeMessages('demoConsumerQueueFour', 11, 0, $outputPattern);
+
+        /** Verify that messages were added correctly by '*' pattern in bind config to third queue */
+        $this->consumeMessages('demoConsumerQueueThree', 20, 15, $outputPattern);
+
+        /** Verify that messages were added correctly by '#' pattern in bind config to fifth queue */
+        $this->consumeMessages('demoConsumerQueueFive', 20, 18, $outputPattern);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPublishAndConsumeWithFailedJobs()
+    {
+        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
+        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
+        /** @var \Magento\MysqlMq\Model\DataObject $object */
+        /** Try consume messages for MAX_NUMBER_OF_TRIALS and then consumer them without exception */
+        $object = $objectFactory->create();
+        for ($i = 0; $i < 5; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.created', $object);
+        }
+        $outputPattern = '/(Processed \d+\s)/';
+        for ($i = 0; $i < self::MAX_NUMBER_OF_TRIALS; $i++) {
+            $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX, 0, $outputPattern);
+        }
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 0, $outputPattern);
+
+        /** Try consume messages for MAX_NUMBER_OF_TRIALS+1 and then consumer them without exception */
+        for ($i = 0; $i < 5; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.created', $object);
+        }
+        /** Try consume messages for MAX_NUMBER_OF_TRIALS and then consumer them without exception */
+        for ($i = 0; $i < self::MAX_NUMBER_OF_TRIALS + 1; $i++) {
+            $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX, 0, $outputPattern);
+        }
+        /** Make sure that messages are not accessible anymore after number of trials is exceeded */
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 0, $outputPattern);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPublishAndConsumeSchemaDefinedByMethod()
+    {
+        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
+        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
+        /** @var \Magento\MysqlMq\Model\DataObject $object */
+        $object = $objectFactory->create();
+        $id = 33;
+        $object->setName('Object name ' . $id)->setEntityId($id);
+        $requiredStringParam = 'Required value';
+        $optionalIntParam = 44;
+        $this->publisher->publish('test.schema.defined.by.method', [$object, $requiredStringParam, $optionalIntParam]);
+        $outputPattern = "/Processed '{$object->getEntityId()}'; "
+            . "Required param '{$requiredStringParam}'; Optional param '{$optionalIntParam}'/";
+        $this->consumeMessages('delayedOperationConsumer', PHP_INT_MAX, 1, $outputPattern);
+    }
+
+    /**
+     * Make sure that consumers consume correct number of messages.
+     *
+     * @param string $consumerName
+     * @param int|null $messagesToProcess
+     * @param int|null $expectedNumberOfProcessedMessages
+     * @param string|null $outputPattern
+     */
+    protected function consumeMessages(
+        $consumerName,
+        $messagesToProcess,
+        $expectedNumberOfProcessedMessages = null,
+        $outputPattern = null
+    ) {
+        /** @var \Magento\Framework\MessageQueue\ConsumerFactory $consumerFactory */
+        $consumerFactory = $this->objectManager->create(\Magento\Framework\MessageQueue\ConsumerFactory::class);
+        $consumer = $consumerFactory->get($consumerName);
+        ob_start();
+        $consumer->process($messagesToProcess);
+        $consumersOutput = ob_get_contents();
+        ob_end_clean();
+        if ($outputPattern) {
+            $this->assertEquals(
+                $expectedNumberOfProcessedMessages,
+                preg_match_all($outputPattern, $consumersOutput)
+            );
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
new file mode 100644
index 0000000000000..197df29233297
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+use Magento\MysqlMq\Model\QueueManagement;
+
+/**
+ * Test for Queue Management class.
+ */
+class QueueManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var QueueManagement
+     */
+    protected $queueManagement;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->queueManagement = $this->objectManager->create(\Magento\MysqlMq\Model\QueueManagement::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testAllFlows()
+    {
+        $this->queueManagement->addMessageToQueues('topic1', 'messageBody1', ['queue1', 'queue2']);
+        $this->queueManagement->addMessageToQueues('topic2', 'messageBody2', ['queue2', 'queue3']);
+        $this->queueManagement->addMessageToQueues('topic3', 'messageBody3', ['queue1', 'queue3']);
+        $this->queueManagement->addMessageToQueues('topic4', 'messageBody4', ['queue1', 'queue2', 'queue3']);
+        $maxMessagesNumber = 2;
+        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+
+        $this->assertCount($maxMessagesNumber, $messages);
+
+        $firstMessage = array_shift($messages);
+        $this->assertEquals('topic2', $firstMessage[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody2', $firstMessage[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue3', $firstMessage[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $firstMessage[QueueManagement::MESSAGE_STATUS]
+        );
+        $this->assertTrue(is_numeric($firstMessage[QueueManagement::MESSAGE_QUEUE_ID]));
+        $this->assertTrue(is_numeric($firstMessage[QueueManagement::MESSAGE_ID]));
+        $this->assertTrue(is_numeric($firstMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]));
+        $this->assertEquals(0, $firstMessage[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
+        $this->assertCount(12, date_parse($firstMessage[QueueManagement::MESSAGE_UPDATED_AT]));
+
+        $secondMessage = array_shift($messages);
+        $this->assertEquals('topic3', $secondMessage[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody3', $secondMessage[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue3', $secondMessage[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $secondMessage[QueueManagement::MESSAGE_STATUS]
+        );
+        $this->assertTrue(is_numeric($secondMessage[QueueManagement::MESSAGE_QUEUE_ID]));
+        $this->assertTrue(is_numeric($secondMessage[QueueManagement::MESSAGE_ID]));
+        $this->assertTrue(is_numeric($secondMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]));
+        $this->assertEquals(0, $secondMessage[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
+        $this->assertCount(12, date_parse($secondMessage[QueueManagement::MESSAGE_UPDATED_AT]));
+
+        /** Mark one message as complete or failed and make sure it is not displayed in the list of read messages */
+        $this->queueManagement->changeStatus(
+            [
+                $secondMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
+            ],
+            QueueManagement::MESSAGE_STATUS_COMPLETE
+        );
+        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+        $this->assertCount(1, $messages);
+
+        $this->queueManagement->changeStatus(
+            [
+                $firstMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
+            ],
+            QueueManagement::MESSAGE_STATUS_ERROR
+        );
+        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+        $this->assertCount(0, $messages);
+
+        /** Ensure that message for retry is still accessible when reading messages from the queue */
+        $messages = $this->queueManagement->readMessages('queue2', 1);
+        $message = array_shift($messages);
+        $messageRelationId = $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+
+        for ($i = 0; $i < 2; $i++) {
+            $this->assertEquals($i, $message[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
+            $this->queueManagement->pushToQueueForRetry($message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
+            $messages = $this->queueManagement->readMessages('queue2', 1);
+            $message = array_shift($messages);
+            $this->assertEquals($messageRelationId, $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages.php
new file mode 100644
index 0000000000000..413ff50f70977
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message = $messageFactory->create();
+
+$message->setTopicName('topic.updated.use.just.in.tests')
+    ->setBody('{test:test}')
+    ->save();
+
+$message = $messageFactory->create();
+
+$message->setTopicName('topic_second.updated.use.just.in.tests')
+    ->setBody('{test:test}')
+    ->save();
+
+$message = $messageFactory->create();
+
+$message->setTopicName('topic_thrird.updated.use.just.in.tests')
+    ->setBody('{test:test}')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_old.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_old.php
new file mode 100644
index 0000000000000..64d0ffcadde8a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_old.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message1 = $messageFactory->create()
+    ->load('topic.updated.use.just.in.tests', 'topic_name');
+
+$messageId1 = $message1->getId();
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$queueFactory = $objectManager->create(\Magento\MysqlMq\Model\QueueFactory::class);
+$queueId1 = $queueFactory->create()
+    ->load('queue1', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId2 = $queueFactory->create()
+    ->load('queue2', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId3 = $queueFactory->create()
+    ->load('queue3', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId4 = $queueFactory->create()
+    ->load('queue4', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+
+$plan = [
+    [
+        $messageId1,
+        $queueId1,
+        time() - 1 - 24 * 7 * 60 * 60, Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE
+    ],
+    [
+        $messageId1,
+        $queueId2,
+        time() - 1 - 24 * 7 * 60 * 60, Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_ERROR
+    ],
+    [
+        $messageId1,
+        $queueId3,
+        time() - 1 - 24 * 7 * 60 * 60, Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE
+    ],
+];
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$messageStatusFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageStatusFactory::class);
+foreach ($plan as $instruction) {
+    $messageStatus = $messageStatusFactory->create();
+
+    $messageStatus->setQueueId($instruction[1])
+        ->setMessageId($instruction[0])
+        ->setUpdatedAt($instruction[2])
+        ->setStatus($instruction[3])
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_recent.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_recent.php
new file mode 100644
index 0000000000000..2a0f09b9967ba
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_recent.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message1 = $messageFactory->create()
+    ->load('topic.updated.use.just.in.tests', 'topic_name');
+
+$messageId1 = $message1->getId();
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$queueFactory = $objectManager->create(\Magento\MysqlMq\Model\QueueFactory::class);
+$queueId4 = $queueFactory->create()
+    ->load('queue4', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+
+$plan = [
+    [$messageId1, $queueId4, time(), Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE],
+];
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$messageStatusFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageStatusFactory::class);
+foreach ($plan as $instruction) {
+    $messageStatus = $messageStatusFactory->create();
+
+    $messageStatus->setQueueId($instruction[1])
+        ->setMessageId($instruction[0])
+        ->setUpdatedAt($instruction[2])
+        ->setStatus($instruction[3])
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_in_progress.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_in_progress.php
new file mode 100644
index 0000000000000..88607060f4fce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_in_progress.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message1 = $messageFactory->create()
+    ->load('topic_second.updated.use.just.in.tests', 'topic_name');
+
+$messageId1 = $message1->getId();
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$queueFactory = $objectManager->create(\Magento\MysqlMq\Model\QueueFactory::class);
+$queueId1 = $queueFactory->create()
+    ->load('queue1', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId2 = $queueFactory->create()
+    ->load('queue2', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId3 = $queueFactory->create()
+    ->load('queue3', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId4 = $queueFactory->create()
+    ->load('queue4', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+
+$plan = [
+    [$messageId1, $queueId1, time() - 1 - 24 * 7 * 60 * 60,
+        Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+    [$messageId1, $queueId2, time(), Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+];
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$messageStatusFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageStatusFactory::class);
+foreach ($plan as $instruction) {
+    $messageStatus = $messageStatusFactory->create();
+
+    $messageStatus->setQueueId($instruction[1])
+        ->setMessageId($instruction[0])
+        ->setUpdatedAt($instruction[2])
+        ->setStatus($instruction[3])
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/queues.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/queues.php
new file mode 100644
index 0000000000000..4038ee1bd12d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/queues.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$queues = [
+    'queue1',
+    'queue2',
+    'queue3',
+    'queue4',
+    'demo-queue-1',
+    'demo-queue-2',
+    'demo-queue-3',
+    'demo-queue-4',
+    'demo-queue-5',
+    'demo-queue-6',
+    'demo-queue-7',
+    'demo-queue-8',
+    'demo-queue-9',
+];
+foreach ($queues as $queueName) {
+    /** @var \Magento\MysqlMq\Model\Queue $queue */
+    $queue = $objectManager->create(\Magento\MysqlMq\Model\Queue::class);
+    $queue->load($queueName, 'name');
+    if (!$queue->getId()) {
+        $queue->setName($queueName)->save();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml b/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml
new file mode 100644
index 0000000000000..fd618d504df07
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <publisher name="demo-publisher-1" connection="db" exchange="magento"/>
+    <publisher name="demo-publisher-2" connection="db" exchange="magento"/>
+
+    <publisher name="test-publisher-1" connection="amqp" exchange="magento"/>
+    <publisher name="test-publisher-3" connection="amqp" exchange="test-exchange-1"/>
+
+    <topic name="demo.object.created" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-1"/>
+    <topic name="demo.object.updated" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-2"/>
+    <topic name="demo.object.custom.created" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-2"/>
+
+    <topic name="test.schema.defined.by.method" schema="Magento\MysqlMq\Model\DataObjectRepository::delayedOperation" publisher="demo-publisher-2"/>
+
+    <topic name="customer.created" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.created.one" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.created.one.two" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.created.two" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.updated" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="demo-publisher-2"/>
+    <topic name="customer.deleted" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="demo-publisher-2"/>
+    <topic name="cart.created" schema="Magento\Quote\Api\Data\CartInterface" publisher="test-publisher-3"/>
+    <topic name="cart.created.one" schema="Magento\Quote\Api\Data\CartInterface" publisher="test-publisher-3"/>
+
+    <consumer name="demoConsumerQueueOne" queue="demo-queue-1" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueOneWithException" queue="demo-queue-1" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessageWithException"/>
+    <consumer name="demoConsumerQueueTwo" queue="demo-queue-2" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueThree" queue="demo-queue-3" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueFour" queue="demo-queue-4" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueFive" queue="demo-queue-5" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+
+    <consumer name="customerCreatedListener" queue="test-queue-1" connection="amqp" class="Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="customerDeletedListener" queue="test-queue-2" connection="db" class="Magento\MysqlMq\Model\Processor" method="processMessage" max_messages="98765"/>
+    <consumer name="cartCreatedListener" queue="test-queue-3" connection="amqp" class="Magento\MysqlMq\Model\Processor" method="processMessage"/>
+
+    <consumer name="delayedOperationConsumer" queue="demo-queue-6" connection="db" class="Magento\MysqlMq\Model\DataObjectRepository" method="delayedOperation"/>
+
+    <bind queue="demo-queue-1" exchange="magento" topic="demo.object.created"/>
+    <bind queue="demo-queue-2" exchange="magento" topic="demo.object.created"/>
+    <bind queue="demo-queue-2" exchange="magento" topic="demo.object.updated"/>
+    <bind queue="demo-queue-3" exchange="magento" topic="demo.object.*"/>
+    <bind queue="demo-queue-5" exchange="magento" topic="demo.object.#"/>
+
+    <bind queue="demo-queue-6" exchange="magento" topic="test.schema.defined.by.method"/>
+
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created.one"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created.one.two"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created.two"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.updated"/>
+    <bind queue="test-queue-1" exchange="test-exchange-1" topic="cart.created"/>
+    <bind queue="test-queue-2" exchange="magento" topic="customer.created"/>
+    <bind queue="test-queue-2" exchange="magento" topic="customer.deleted"/>
+    <bind queue="test-queue-3" exchange="magento" topic="cart.created"/>
+    <bind queue="test-queue-3" exchange="magento" topic="cart.created.one"/>
+    <bind queue="test-queue-3" exchange="test-exchange-1" topic="cart.created"/>
+    <bind queue="test-queue-4" exchange="magento" topic="customer.*"/>
+    <bind queue="test-queue-5" exchange="magento" topic="customer.#"/>
+    <bind queue="test-queue-7" exchange="magento" topic="*.created.*"/>
+    <bind queue="test-queue-8" exchange="magento" topic="*.created.#"/>
+    <bind queue="test-queue-9" exchange="magento" topic="#"/>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php
new file mode 100644
index 0000000000000..9271e08942279
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\NewRelicReporting\Plugin;
+
+use Magento\Framework\App\State;
+use Magento\NewRelicReporting\Model\NewRelicWrapper;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SeparateAppsTest
+ */
+class SeparateAppsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoConfigFixture default/newrelicreporting/general/enable 1
+     * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills
+     * @magentoConfigFixture default/newrelicreporting/general/separate_apps 1
+     */
+    public function testAppNameIsSetWhenConfiguredCorrectly()
+    {
+        $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class)
+            ->setMethods(['setAppName'])
+            ->getMock();
+
+        $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]);
+        $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class);
+
+        $newRelicWrapper->expects($this->once())
+            ->method('setAppName')
+            ->with($this->equalTo('beverly_hills;beverly_hills_90210'));
+
+        $state = $this->objectManager->get(State::class);
+
+        $state->setAreaCode('90210');
+    }
+
+    /**
+     * @magentoConfigFixture default/newrelicreporting/general/enable 1
+     * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills
+     * @magentoConfigFixture default/newrelicreporting/general/separate_apps 0
+     */
+    public function testAppNameIsNotSetWhenDisabled()
+    {
+        $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class)
+            ->setMethods(['setAppName'])
+            ->getMock();
+
+        $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]);
+        $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class);
+
+        $newRelicWrapper->expects($this->never())->method('setAppName');
+
+        $state = $this->objectManager->get(State::class);
+
+        $state->setAreaCode('90210');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
index 5c1a11756c1b1..7a0ac030d120b 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -15,6 +17,9 @@ class NewsletterQueueTest extends \Magento\TestFramework\TestCase\AbstractBacken
      */
     protected $_model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -23,6 +28,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
@@ -47,6 +55,7 @@ public function testSaveActionQueueTemplateAndVerifySuccessMessage()
             'subject' => 'test subject',
             'text' => 'newsletter text',
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postForQueue);
 
         // Loading by code, since ID will vary. template_code is not actually used to load anywhere else.
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
index 50e89d92e434c..ae57703f9e8e2 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
@@ -20,6 +20,9 @@ class NewsletterTemplateTest extends \Magento\TestFramework\TestCase\AbstractBac
      */
     protected $model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -39,6 +42,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
@@ -138,19 +144,6 @@ public function testSaveActionTemplateWithGetAndVerifyRedirect()
         $this->getRequest()->setMethod(\Zend\Http\Request::METHOD_GET)->setParam('id', $this->model->getId());
         $this->dispatch('backend/newsletter/template/save');
 
-        /**
-         * Check that errors was generated and set to session
-         */
-        $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
-
-        /**
-         * Check that correct redirect performed.
-         */
-        $backendUrlModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Backend\Model\UrlInterface::class
-        );
-        $backendUrlModel->turnOffSecretKey();
-        $url = $backendUrlModel->getUrl('newsletter');
-        $this->assertRedirect($this->stringStartsWith($url));
+        $this->assertEquals(404, $this->getResponse()->getStatusCode());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php
index 1a27994b607f1..175c1c7c6c668 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/ManageTest.php
@@ -21,6 +21,9 @@ class ManageTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     protected $coreSession;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -31,10 +34,13 @@ protected function setUp()
         $this->coreSession->setData('_form_key', 'formKey');
     }
 
+    /**
+     * test tearDown
+     */
     protected function tearDown()
     {
         $this->customerSession->setCustomerId(null);
-        $this->coreSession->unsData('_form_key');
+        $this->coreSession->unsetData('_form_key');
     }
 
     /**
@@ -58,7 +64,7 @@ public function testSaveAction()
          * Check that success message
          */
         $this->assertSessionMessages(
-            $this->equalTo(['We saved the subscription.']),
+            $this->equalTo(['We have saved your subscription.']),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
     }
@@ -68,6 +74,7 @@ public function testSaveAction()
      */
     public function testSaveActionRemoveSubscription()
     {
+
         $this->getRequest()
             ->setParam('form_key', 'formKey')
             ->setParam('is_subscribed', '0');
@@ -84,7 +91,7 @@ public function testSaveActionRemoveSubscription()
          * Check that success message
          */
         $this->assertSessionMessages(
-            $this->equalTo(['We removed the subscription.']),
+            $this->equalTo(['We have updated your subscription.']),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
index 5347881f5e7d4..9dbf5c4d2a2a9 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
@@ -57,7 +57,7 @@ public function testNewActionUsedEmail()
         $this->dispatch('newsletter/subscriber/new');
 
         $this->assertSessionMessages($this->equalTo([
-                'There was a problem with the subscription: This email address is already assigned to another user.',
+                'Thank you for your subscription.',
             ]));
         $this->assertRedirect($this->anything());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
index 39db400d2d637..dbc666e49b6cf 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
@@ -167,4 +167,42 @@ private function verifySubscriptionNotExist($email)
         $this->assertEquals(0, (int)$subscriber->getId());
         return $subscriber;
     }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     */
+    public function testCustomerWithZeroStoreIdIsSubscribed()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $currentStore = $objectManager->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        )->getStore()->getId();
+
+        $subscriber = $objectManager->create(\Magento\Newsletter\Model\Subscriber::class);
+        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
+        $subscriber->setStoreId($currentStore)
+            ->setCustomerId(0)
+            ->setSubscriberEmail('customer@example.com')
+            ->setSubscriberStatus(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED)
+            ->save();
+
+        /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory */
+        $customerFactory = $objectManager->get(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class);
+        $customerDataObject = $customerFactory->create()
+            ->setFirstname('Firstname')
+            ->setLastname('Lastname')
+            ->setStoreId(0)
+            ->setEmail('customer@example.com');
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $this->accountManagement->createAccount($customerDataObject);
+
+        $this->customerRepository->save($customer);
+
+        $subscriber->loadByEmail('customer@example.com');
+
+        $this->assertEquals($customer->getId(), (int)$subscriber->getCustomerId());
+        $this->assertEquals($currentStore, (int)$subscriber->getStoreId());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
index 152d65681c54f..84e72979cc4c5 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
@@ -28,7 +28,7 @@
 
 $subscriber = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Newsletter\Model\Subscriber::class);
-$subscriber->setStoreId($otherStore)
+$subscriber->setStoreId($currentStore)
     // Intentionally setting ID to 0 instead of 2 to test fallback mechanism in Subscriber model
     ->setCustomerId(0)
     ->setSubscriberEmail('customer_two@example.com')
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website.php
new file mode 100644
index 0000000000000..52551e6dc96d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$website = $websiteRepository->get('test');
+
+/** @var ResourceConnection $resource */
+$resource = $objectManager->get(ResourceConnection::class);
+$connection = $resource->getConnection();
+$resourceModel = $objectManager->create(Tablerate::class);
+$entityTable = $resourceModel->getTable('shipping_tablerate');
+$data =
+    [
+        'website_id' => $website->getId(),
+        'dest_country_id' => 'US',
+        'dest_region_id' => 0,
+        'dest_zip' => '*',
+        'condition_name' => 'package_qty',
+        'condition_value' => 1,
+        'price' => 20,
+        'cost' => 20
+    ];
+$connection->query(
+    "INSERT INTO {$entityTable} (`website_id`,  `dest_country_id`, `dest_region_id`, `dest_zip`, `condition_name`,"
+    . "`condition_value`, `price`, `cost`) VALUES (:website_id,  :dest_country_id, :dest_region_id, :dest_zip,"
+    . " :condition_name, :condition_value, :price, :cost);",
+    $data
+);
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website_rollback.php
new file mode 100644
index 0000000000000..9606b0eb605fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_second_website_rollback.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$resourceModel = $objectManager->create(\Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate::class);
+$entityTable = $resourceModel->getTable('shipping_tablerate');
+$connection->query("DELETE FROM {$entityTable};");
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Block/System/Config/Form/Field/ExportTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Block/System/Config/Form/Field/ExportTest.php
index 8abe1e9711d99..19e6bf450e01c 100644
--- a/dev/tests/integration/testsuite/Magento/PageCache/Block/System/Config/Form/Field/ExportTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageCache/Block/System/Config/Form/Field/ExportTest.php
@@ -15,6 +15,8 @@ class ExportTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
      * @covers \Magento\PageCache\Block\System\Config\Form\Field\Export::_getElementHtml
      * @covers \Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish5::getVarnishVersion
      * @covers \Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4::getVarnishVersion
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
      */
     public function testExportButtons()
     {
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Plugin/RegisterFormKeyFromCookieTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Plugin/RegisterFormKeyFromCookieTest.php
new file mode 100644
index 0000000000000..eb23b0b185a00
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/PageCache/Plugin/RegisterFormKeyFromCookieTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Plugin;
+
+use Magento\Framework\App\FrontController;
+use Magento\Framework\App\RequestInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class RegisterFormKeyFromCookieTest extends TestCase
+{
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var FrontController
+     */
+    private $frontController;
+
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(RequestInterface::class);
+        $this->frontController = $objectManager->get(
+            FrontController::class
+        );
+        $this->formKeyValidator = $objectManager->get(FormKeyValidator::class);
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testTakenFromCookie()
+    {
+        if (!Bootstrap::canTestHeaders()) {
+            $this->markTestSkipped(
+                'Can\'t test dispatch process without sending headers'
+            );
+        }
+        $_SERVER['HTTP_HOST'] = 'localhost';
+        $formKey = 'customFormKey';
+        $_COOKIE['form_key'] = $formKey;
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+        $this->request->setParam('form_key', $formKey);
+        $this->request->setRequestUri('core/index/index');
+        $this->frontController->dispatch($this->request);
+        $this->assertTrue($this->formKeyValidator->validate($this->request));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php
new file mode 100644
index 0000000000000..dc02b9337636c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Controller\Adminhtml\Express;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Payment\Transaction;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Paypal\Model\Api\Nvp;
+use Magento\Paypal\Model\Api\Type\Factory as ApiFactory;
+use Magento\Sales\Model\Order\OrderValidatorInterface;
+use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\Sales\Model\Order\Validation\CanInvoice;
+
+/**
+ * Makes a test of the payment authorization for Paypal Express when payment action is order.
+ *
+ * @magentoAppArea adminhtml
+ */
+class AuthorizationTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->resource = 'Magento_Paypal::authorization';
+        $this->uri = 'backend/paypal/express/authorization';
+
+        parent::setUp();
+        $this->createSharedInstances();
+    }
+
+    /**
+     * Negative scenario for controller calls.
+     *
+     * @return void
+     */
+    public function testNoOrderPassed()
+    {
+        $this->dispatch('backend/paypal/express/authorization');
+        $this->assertRedirect($this->stringContains('backend/sales/order/index'));
+    }
+
+    /**
+     * Test of authorization of full order amount.
+     *
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoConfigFixture current_store payment/paypal_express/payment_action Order
+     * @magentoDataFixture Magento/Paypal/_files/order_express_payment_action_order.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testAuthorization()
+    {
+        /** @var Order $order */
+        $order = $this->_objectManager->create(Order::class);
+        $order->loadByIncrementId('100000001');
+
+        $orderValidator = $this->_objectManager->create(OrderValidatorInterface::class);
+
+        /** @var ValidatorResultInterface $validationResult */
+        $validationResult = $orderValidator->validate($order, [CanInvoice::class]);
+        $validationMessages = $validationResult->getMessages();
+
+        $this->assertCount(1, $validationMessages);
+        $this->assertEquals(
+            'An invoice cannot be created when none of authorization transactions available.',
+            $validationMessages[0]
+        );
+
+        /** @var RequestInterface $request */
+        $request = $this->getRequest();
+        $request->setParam('order_id', $order->getId());
+
+        $this->dispatch('backend/paypal/express/authorization');
+
+        $orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($order->getId());
+
+        /** @var Payment $payment */
+        $payment = $order->getPayment();
+
+        /** @var ValidatorResultInterface $validationResult */
+        $validationResult = $orderValidator->validate($order, [CanInvoice::class]);
+
+        $this->assertInstanceOf(
+            Transaction::class,
+            $payment->getAuthorizationTransaction()
+        );
+        $this->assertEquals($order->getBaseGrandTotal(), $payment->getAmountAuthorized());
+        $this->assertEmpty($validationResult->getMessages());
+        $this->assertRedirect($this->stringContains('backend/sales/order/view/order_id/' . $order->getId()));
+    }
+
+    /**
+     * Creates required shared instances.
+     */
+    private function createSharedInstances()
+    {
+        $nvpMock = $this->getMockBuilder(Nvp::class)
+            ->setMethods(['call'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $nvpMock->method('call')
+            ->willReturn([]);
+
+        $apiFactoryMock = $this->getMockBuilder(ApiFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $apiFactoryMock->method('create')
+            ->with(Nvp::class)
+            ->willReturn($nvpMock);
+
+        $this->_objectManager->addSharedInstance($apiFactoryMock, ApiFactory::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(ApiFactory::class);
+        parent::tearDown();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php
index b4904c10dc22e..81a9587d36f4a 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php
@@ -8,8 +8,8 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\DataObject;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Logger\Monolog;
+use Magento\Payment\Gateway\Command\CommandException;
 use Magento\Paypal\Model\Payflow\Service\Gateway;
 use Magento\Paypal\Model\Payflowlink;
 use Magento\Sales\Api\Data\OrderInterface;
@@ -93,7 +93,7 @@ public function testSuccessfulNotification($resultCode, $orderState, $orderStatu
     public function responseCodeDataProvider()
     {
         return [
-            [Payflowlink::RESPONSE_CODE_APPROVED, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
+            [Payflowlink::RESPONSE_CODE_APPROVED, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
             [Payflowlink::RESPONSE_CODE_FRAUDSERVICE_FILTER, Order::STATE_PAYMENT_REVIEW, Order::STATUS_FRAUD],
         ];
     }
@@ -116,7 +116,7 @@ public function testFraudulentNotification()
             ->getMock();
         $this->_objectManager->addSharedInstance($logger, Monolog::class);
 
-        $exception = new LocalizedException(__('Response message from PayPal gateway'));
+        $exception = new CommandException(__('Response message from PayPal gateway'));
         $logger->expects(self::once())
             ->method('critical')
             ->with(self::equalTo($exception));
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php
index 987f14c8c87e9..670cc6850b233 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php
@@ -5,32 +5,74 @@
  */
 namespace Magento\Paypal\Controller;
 
+use Magento\Checkout\Model\Session;
+use Magento\Paypal\Model\Config;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
 /**
  * @magentoDataFixture Magento/Sales/_files/order.php
  */
 class PayflowTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @var OrderInterface
+     */
+    private $order;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
 
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
-        $order->load('100000001', 'increment_id');
-        $order->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_PAYFLOWLINK);
+        /** @var FilterBuilder $filterBuilder */
+        $filterBuilder = $this->_objectManager->get(FilterBuilder::class);
+        $filters = [
+            $filterBuilder->setField(OrderInterface::INCREMENT_ID)
+                ->setValue('100000001')
+                ->create(),
+        ];
 
-        $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Quote\Model\Quote::class
-        )->setStoreId(
-            $order->getStoreId()
-        )->save();
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilters($filters)
+            ->create();
 
-        $order->setQuoteId($quote->getId());
-        $order->save();
+        $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $orders = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
 
-        $session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Checkout\Model\Session::class
-        );
-        $session->setLastRealOrderId($order->getRealOrderId())->setLastQuoteId($order->getQuoteId());
+        /** @var OrderInterface $order */
+        $this->order = array_pop($orders);
+        $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWLINK);
+
+        /** @var $quote \Magento\Quote\Model\Quote */
+        $quote = $this->_objectManager->create(Quote::class)->setStoreid($this->order->getStoreId());
+
+        $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $this->quoteRepository->save($quote);
+
+        $this->order->setQuoteId($quote->getId());
+        $this->orderRepository->save($this->order);
+
+        $session = $this->_objectManager->get(Session::class);
+        $session->setLastRealOrderId($this->order->getRealOrderId())->setLastQuoteId($this->order->getQuoteId());
     }
 
     public function testCancelPaymentActionIsContentGenerated()
@@ -65,22 +107,24 @@ public function testFormActionIsContentGenerated()
     }
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoConfigFixture current_store payment/paypal_payflow/active 1
      * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com
+     * @return void
      */
-    public function testCancelAction()
+    public function testCancelAction(): void
     {
-        $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class);
-        $session = $this->_objectManager->get(\Magento\Checkout\Model\Session::class);
+        $orderId = $this->order->getEntityId();
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->orderRepository->get($orderId);
+        /** @var $quote \Magento\Quote\Model\Quote */
+        $quote = $this->quoteRepository->get($order->getQuoteId());
 
-        $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class);
-        $quote->load('test02', 'reserved_order_id');
-        $order->load('100000001', 'increment_id')->setQuoteId($quote->getId())->save();
+        $session = $this->_objectManager->get(Session::class);
         $session->setQuoteId($quote->getId());
         $session->setPaypalStandardQuoteId($quote->getId())->setLastRealOrderId('100000001');
         $this->dispatch('paypal/payflow/cancelpayment');
-        $order->load('100000001', 'increment_id');
+
+        $order = $this->_objectManager->create(OrderRepositoryInterface::class)->get($orderId);
         $this->assertEquals('canceled', $order->getState());
         $this->assertEquals($session->getQuote()->getGrandTotal(), $quote->getGrandTotal());
         $this->assertEquals($session->getQuote()->getItemsCount(), $quote->getItemsCount());
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php
index ae6053a4801b0..bf404f74b769e 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php
@@ -5,30 +5,75 @@
  */
 namespace Magento\Paypal\Controller;
 
+use Magento\Checkout\Model\Session;
+use Magento\Paypal\Model\Config;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
 /**
  * @magentoDataFixture Magento/Sales/_files/order.php
  */
 class PayflowadvancedTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @var OrderInterface
+     */
+    private $order;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
 
-        $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->load('100000001', 'increment_id');
-        $order->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_PAYFLOWADVANCED);
+        /** @var FilterBuilder $filterBuilder */
+        $filterBuilder = $this->_objectManager->get(FilterBuilder::class);
+        $filters = [
+            $filterBuilder->setField(OrderInterface::INCREMENT_ID)
+                ->setValue('100000001')
+                ->create(),
+        ];
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilters($filters)
+            ->create();
 
-        $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Quote\Model\Quote::class
-        )->setStoreId(
-            $order->getStoreId()
-        )->save();
+        $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $orders = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
 
-        $order->setQuoteId($quote->getId());
-        $order->save();
+        /** @var OrderInterface $order */
+        $this->order = array_pop($orders);
+        $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWADVANCED);
 
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
-        $session->setLastRealOrderId($order->getRealOrderId())->setLastQuoteId($order->getQuoteId());
+        /** @var $quote \Magento\Quote\Model\Quote */
+        $quote = $this->_objectManager->create(Quote::class)
+            ->setStoreid($this->order->getStoreId());
+
+        $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $this->quoteRepository->save($quote);
+
+        $this->order->setQuoteId($quote->getId());
+        $this->orderRepository->save($this->order);
+
+        $session = $this->_objectManager->get(Session::class);
+        $session->setLastRealOrderId($this->order->getRealOrderId())->setLastQuoteId($this->order->getQuoteId());
     }
 
     public function testCancelPaymentActionIsContentGenerated()
@@ -55,23 +100,24 @@ public function testFormActionIsContentGenerated()
     }
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoConfigFixture current_store payment/paypal_payflow/active 1
      * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com
+     * @return void
      */
-    public function testCancelAction()
+    public function testCancelAction(): void
     {
-        $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class);
-        $session = $this->_objectManager->get(\Magento\Checkout\Model\Session::class);
+        $orderId = $this->order->getEntityId();
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->orderRepository->get($orderId);
+        /** @var $quote \Magento\Quote\Model\Quote */
+        $quote = $this->quoteRepository->get($order->getQuoteId());
 
-        $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class);
-        $quote->load('test02', 'reserved_order_id');
-        $order->load('100000001', 'increment_id')->setQuoteId($quote->getId())->save();
+        $session = $this->_objectManager->get(Session::class);
         $session->setQuoteId($quote->getId());
         $session->setPaypalStandardQuoteId($quote->getId())->setLastRealOrderId('100000001');
-        $this->dispatch('paypal/payflow/cancelpayment');
+        $this->dispatch('paypal/payflowadvanced/cancelpayment');
 
-        $order->load('100000001', 'increment_id');
+        $order = $this->_objectManager->create(OrderRepositoryInterface::class)->get($orderId);
         $this->assertEquals('canceled', $order->getState());
         $this->assertEquals($session->getQuote()->getGrandTotal(), $quote->getGrandTotal());
         $this->assertEquals($session->getQuote()->getItemsCount(), $quote->getItemsCount());
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php
new file mode 100644
index 0000000000000..2c1614b9317c5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/process_config_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var EncryptorInterface $encryptor */
+$encryptor = $objectManager->get(EncryptorInterface::class);
+
+// save payment configuration for the default scope
+$configData = [
+    'payment/payflowpro/partner' => 'def_partner',
+    'payment/payflowpro/vendor' => 'def_vendor',
+    'payment/payflowpro/user' => $encryptor->encrypt('def_user'),
+    'payment/payflowpro/pwd' => $encryptor->encrypt('def_pwd'),
+];
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+$processConfigData($defConfig, $configData);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php
new file mode 100644
index 0000000000000..b9cf1707c7b6c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/process_config_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$configData = [
+    'payment/payflowpro/partner',
+    'payment/payflowpro/vendor',
+    'payment/payflowpro/user',
+    'payment/payflowpro/pwd',
+];
+/** @var WriterInterface $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+$deleteConfigData($configWriter, $configData, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, 0);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php
new file mode 100644
index 0000000000000..2c672378fb832
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+
+$processConfigData = function (Config $config, array $data) {
+    foreach ($data as $key => $value) {
+        $config->setDataByPath($key, $value);
+        $config->save();
+    }
+};
+
+$deleteConfigData = function (WriterInterface $writer, array $configData, string $scope, int $scopeId) {
+    foreach ($configData as $path) {
+        $writer->delete($path, $scope, $scopeId);
+    }
+};
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php
new file mode 100644
index 0000000000000..e54349e118bb4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+// save payment configuration per store
+require __DIR__ . '/process_config_data.php';
+require __DIR__ . '/../../Store/_files/store.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var EncryptorInterface $encryptor */
+$encryptor = $objectManager->get(EncryptorInterface::class);
+
+$storeConfigData = [
+    'payment/payflowpro/partner' => 'store_partner',
+    'payment/payflowpro/vendor' => 'store_vendor',
+    'payment/payflowpro/user' => $encryptor->encrypt('store_user'),
+    'payment/payflowpro/pwd' => $encryptor->encrypt('store_pwd'),
+];
+/** @var Config $storeConfig */
+$storeConfig = $objectManager->create(Config::class);
+$storeConfig->setScope(ScopeInterface::SCOPE_STORES);
+$storeConfig->setStore('test');
+$processConfigData($storeConfig, $storeConfigData);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php
new file mode 100644
index 0000000000000..08fe9ca7049f2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/process_config_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$configData = [
+    'payment/payflowpro/partner',
+    'payment/payflowpro/vendor',
+    'payment/payflowpro/user',
+    'payment/payflowpro/pwd',
+];
+/** @var WriterInterface $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+/** @var StoreRepositoryInterface $storeRepository */
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+$store = $storeRepository->get('test');
+$deleteConfigData($configWriter, $configData, ScopeInterface::SCOPE_STORES, (int)$store->getId());
+require __DIR__ . '/../../Store/_files/store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php
new file mode 100644
index 0000000000000..90359ccf4fe1c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+// save payment website config data
+require __DIR__ . '/../../Store/_files/second_website_with_two_stores.php';
+require __DIR__ . '/process_config_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var EncryptorInterface $encryptor */
+$encryptor = $objectManager->get(EncryptorInterface::class);
+$websiteConfigData = [
+    'payment/payflowpro/partner' => 'website_partner',
+    'payment/payflowpro/vendor' => 'website_vendor',
+    'payment/payflowpro/user' => $encryptor->encrypt('website_user'),
+    'payment/payflowpro/pwd' => $encryptor->encrypt('website_pwd'),
+];
+/** @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/Paypal/Fixtures/website_payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration_rollback.php
new file mode 100644
index 0000000000000..1558d78e2504f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/process_config_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$configData = [
+    'payment/payflowpro/partner',
+    'payment/payflowpro/vendor',
+    'payment/payflowpro/user',
+    'payment/payflowpro/pwd',
+];
+/** @var WriterInterface $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$website = $websiteRepository->get('test');
+$deleteConfigData($configWriter, $configData, ScopeInterface::SCOPE_WEBSITES, (int)$website->getId());
+
+require __DIR__ . '/../../Store/_files/second_website_with_two_stores_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
index 8ea4f854d45c1..1b3d6aef39aa9 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
@@ -81,6 +81,7 @@ protected function setUp()
      * Checks a case when items and discount are present in the request.
      *
      * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php
+     * @magentoDbIsolation disabled
      */
     public function testRequestLineItems()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 671ab6e4b5619..2bd346a6e8f7b 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -350,7 +350,7 @@
                     <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
                         <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                         </comment>
                         <config_path>payment/payflow_express_bml/active</config_path>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
@@ -371,12 +371,12 @@
                     <group id="payflow_link_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="60">
                         <label>Advertise PayPal Credit</label>
                         <comment>
-                            <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                         from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                        or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                         </comment>
                         <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
                         <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
@@ -731,7 +731,7 @@
                         <label>Enable PayPal Credit</label>
                         <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                         </comment>
                         <config_path>payment/paypal_express_bml/active</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -753,12 +753,12 @@
                     <group id="advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Advertise PayPal Credit</label>
                         <comment>
-                            <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                         from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                        or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                         </comment>
                         <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
                             <label>Publisher ID</label>
@@ -767,9 +767,8 @@
                             <attribute type="shared">1</attribute>
                         </field>
                         <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
-                            <label></label>
                             <button_label>Get Publisher ID from PayPal</button_label>
-                            <button_url><![CDATA[https:/financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
+                            <button_url><![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
                         </field>
                         <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
@@ -1262,7 +1261,7 @@
                     <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
                         <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                         </comment>
                         <requires>
                             <field id="pphs_enable"/>
@@ -1271,12 +1270,12 @@
                     <group id="pphs_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="22">
                         <label>Advertise PayPal Credit</label>
                         <comment>
-                            <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                             from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                            or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                            or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                         </comment>
                         <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
                         <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
@@ -1537,7 +1536,7 @@
                         <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
                             <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                             </comment>
                             <config_path>payment/payflow_express_bml/active</config_path>
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
@@ -1837,7 +1836,7 @@
                             <label>Enable PayPal Credit</label>
                             <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                             </comment>
                             <config_path>payment/payflow_express_bml/active</config_path>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -1856,12 +1855,12 @@
                         <group id="paypal_payflow_advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="40">
                             <label>Advertise PayPal Credit</label>
                             <comment>
-                                <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
+                                <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
                                 from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
+                                or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
                             </comment>
                             <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
                             <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
index b1ba88f601cdd..cb83fa3abd857 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
@@ -12,6 +12,7 @@
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\Info;
 use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\ResourceModel\Quote\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -28,22 +29,22 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var Info
+     * @var Info|\PHPUnit_Framework_MockObject_MockObject
      */
     private $paypalInfo;
 
     /**
-     * @var Config
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
     private $paypalConfig;
 
     /**
-     * @var Factory
+     * @var Factory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $apiTypeFactory;
 
     /**
-     * @var Nvp
+     * @var Nvp|\PHPUnit_Framework_MockObject_MockObject
      */
     private $api;
 
@@ -96,7 +97,7 @@ protected function setUp()
      */
     public function testCheckoutStartWithBillingAddress()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $paypalConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -151,7 +152,7 @@ public function testCheckoutStartWithBillingAddress()
     public function testPrepareCustomerQuote()
     {
         /** @var Quote $quote */
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $quote->setCheckoutMethod(Onepage::METHOD_CUSTOMER); // to dive into _prepareCustomerQuote() on switch
         $quote->getShippingAddress()->setSameAsBilling(0);
         $quote->setReservedOrderId(null);
@@ -163,7 +164,7 @@ public function testPrepareCustomerQuote()
         /** @var \Magento\Customer\Model\Session $customerSession */
         $customerSession = $this->objectManager->get(\Magento\Customer\Model\Session::class);
         $customerSession->loginById(1);
-        $checkout = $this->_getCheckout($quote);
+        $checkout = $this->getCheckout($quote);
         $checkout->place('token');
 
         /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerService */
@@ -191,12 +192,12 @@ public function testPrepareCustomerQuote()
     public function testPlaceGuestQuote()
     {
         /** @var Quote $quote */
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $quote->setCheckoutMethod(Onepage::METHOD_GUEST); // to dive into _prepareGuestQuote() on switch
         $quote->getShippingAddress()->setSameAsBilling(0);
         $quote->setReservedOrderId(null);
 
-        $checkout = $this->_getCheckout($quote);
+        $checkout = $this->getCheckout($quote);
         $checkout->place('token');
 
         $this->assertNull($quote->getCustomerId());
@@ -218,7 +219,7 @@ public function testPlaceGuestQuote()
      * @param Quote $quote
      * @return Checkout
      */
-    protected function _getCheckout(Quote $quote)
+    protected function getCheckout(Quote $quote)
     {
         return $this->objectManager->create(
             Checkout::class,
@@ -242,7 +243,7 @@ protected function _getCheckout(Quote $quote)
      */
     public function testReturnFromPaypal()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $this->checkoutModel = $this->objectManager->create(
             Checkout::class,
             [
@@ -252,12 +253,13 @@ public function testReturnFromPaypal()
             ]
         );
 
-        $exportedBillingAddress = $this->_getExportedAddressFixture($quote->getBillingAddress()->getData());
+        $prefix = 'exported';
+        $exportedBillingAddress = $this->getExportedAddressFixture($quote->getBillingAddress()->getData(), $prefix);
         $this->api->expects($this->any())
             ->method('getExportedBillingAddress')
             ->will($this->returnValue($exportedBillingAddress));
 
-        $exportedShippingAddress = $this->_getExportedAddressFixture($quote->getShippingAddress()->getData());
+        $exportedShippingAddress = $this->getExportedAddressFixture($quote->getShippingAddress()->getData(), $prefix);
         $this->api->expects($this->any())
             ->method('getExportedShippingAddress')
             ->will($this->returnValue($exportedShippingAddress));
@@ -269,7 +271,7 @@ public function testReturnFromPaypal()
         $this->checkoutModel->returnFromPaypal('token');
 
         $billingAddress = $quote->getBillingAddress();
-        $this->assertContains('exported', $billingAddress->getFirstname());
+        $this->assertContains($prefix, $billingAddress->getFirstname());
         $this->assertEquals('note', $billingAddress->getCustomerNote());
 
         $shippingAddress = $quote->getShippingAddress();
@@ -291,6 +293,7 @@ public function testReturnFromPaypal()
     /**
      * The case when handling address data from Paypal button.
      * System's address fields are replacing from export Paypal data.
+     * Billing and Shipping address are the same
      *
      * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
      * @magentoAppIsolation enabled
@@ -298,27 +301,72 @@ public function testReturnFromPaypal()
      */
     public function testReturnFromPaypalButton()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $this->prepareCheckoutModel($quote);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
 
         $this->checkoutModel->returnFromPaypal('token');
 
         $shippingAddress = $quote->getShippingAddress();
+        $billingAddress = $quote->getBillingAddress();
+        $exportedShippingData = $this->getExportedData()['shipping'];
+
+        $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet());
+        $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname());
+        $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity());
+        $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
+        $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
+
+        $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet());
+        $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname());
+        $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity());
+        $this->assertEquals($exportedShippingData['telephone'], $billingAddress->getTelephone());
+        $this->assertEquals($exportedShippingData['email'], $billingAddress->getEmail());
+    }
 
-        $prefix = 'exported';
-        $this->assertEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet());
-        $this->assertEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname());
-        $this->assertEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity());
-        $this->assertEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone());
-        // This fields not in exported keys list. Fields the same as quote shipping and billing address.
-        $this->assertNotEquals($prefix . $this->getExportedData()['region'], $shippingAddress->getRegion());
-        $this->assertNotEquals($prefix . $this->getExportedData()['email'], $shippingAddress->getEmail());
+    /**
+     * The case when handling address data from Paypal button.
+     * System's address fields are replacing from export Paypal data.
+     * Billing and Shipping address are different
+     *
+     * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testReturnFromPaypalButtonWithReturnBillingAddress()
+    {
+        $quote = $this->getFixtureQuote();
+        $this->paypalConfig->expects($this->exactly(2))
+            ->method('getValue')
+            ->with('requireBillingAddress')
+            ->willReturn(1);
+        $this->prepareCheckoutModel($quote);
+        $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
+
+        $this->checkoutModel->returnFromPaypal('token');
+
+        $shippingAddress = $quote->getShippingAddress();
+        $billingAddress = $quote->getBillingAddress();
+        $exportedBillingData = $this->getExportedData()['billing'];
+        $exportedShippingData = $this->getExportedData()['shipping'];
+
+        $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet());
+        $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname());
+        $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity());
+        $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
+        $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
+
+        $this->assertEquals([$exportedBillingData['street']], $billingAddress->getStreet());
+        $this->assertEquals($exportedBillingData['firstname'], $billingAddress->getFirstname());
+        $this->assertEquals($exportedBillingData['city'], $billingAddress->getCity());
+        $this->assertEquals($exportedBillingData['telephone'], $billingAddress->getTelephone());
+        $this->assertEquals($exportedBillingData['email'], $billingAddress->getEmail());
     }
 
     /**
      * The case when handling address data from the checkout.
-     * System's address fields are not replacing from export Paypal data.
+     * System's address fields are not replacing from export PayPal data.
+     * Billing and Shipping address are the same
      *
      * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
      * @magentoAppIsolation enabled
@@ -326,20 +374,157 @@ public function testReturnFromPaypalButton()
      */
     public function testReturnFromPaypalIfCheckout()
     {
-        $quote = $this->_getFixtureQuote();
-        $this->prepareCheckoutModel($quote);
+        $prefix = 'exported';
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote, $prefix);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
 
+        $originalShippingAddress = $quote->getShippingAddress();
+        $originalBillingAddress = $quote->getBillingAddress();
+
         $this->checkoutModel->returnFromPaypal('token');
 
         $shippingAddress = $quote->getShippingAddress();
+        $billingAddress = $quote->getBillingAddress();
+
+        $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet());
+        $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname());
+        $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity());
+        $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone());
 
+        $this->assertEquals($originalBillingAddress->getStreet(), $billingAddress->getStreet());
+        $this->assertEquals($originalBillingAddress->getFirstname(), $billingAddress->getFirstname());
+        $this->assertEquals($originalBillingAddress->getCity(), $billingAddress->getCity());
+        $this->assertEquals($originalBillingAddress->getTelephone(), $billingAddress->getTelephone());
+    }
+
+    /**
+     * The case when handling address data from the checkout.
+     * System's address fields are replacing billing address from export PayPal data.
+     * Billing and Shipping address are different
+     *
+     * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testReturnFromPaypalIfCheckoutWithReturnBillingAddress()
+    {
         $prefix = 'exported';
+        $quote = $this->getFixtureQuote();
+        $this->paypalConfig->expects($this->exactly(2))
+            ->method('getValue')
+            ->with('requireBillingAddress')
+            ->willReturn(1);
+        $this->prepareCheckoutModel($quote, $prefix);
+        $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
+
+        $originalShippingAddress = $quote->getShippingAddress();
+
+        $this->checkoutModel->returnFromPaypal('token');
 
-        $this->assertNotEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet());
-        $this->assertNotEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname());
-        $this->assertNotEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity());
-        $this->assertNotEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone());
+        $shippingAddress = $quote->getShippingAddress();
+        $billingAddress = $quote->getBillingAddress();
+        $exportedBillingData = $this->getExportedData()['billing'];
+
+        $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet());
+        $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname());
+        $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity());
+        $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone());
+
+        $this->assertEquals([$prefix . $exportedBillingData['street']], $billingAddress->getStreet());
+        $this->assertEquals($prefix . $exportedBillingData['firstname'], $billingAddress->getFirstname());
+        $this->assertEquals($prefix . $exportedBillingData['city'], $billingAddress->getCity());
+        $this->assertEquals($prefix . $exportedBillingData['telephone'], $billingAddress->getTelephone());
+    }
+
+    /**
+     * Test case when customer doesn't have either billing or shipping addresses.
+     * Customer add virtual product to quote and place order using PayPal Express method.
+     * After return from PayPal quote billing address have to be updated by PayPal Express address.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testReturnFromPayPalForCustomerWithEmptyAddresses(): void
+    {
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote);
+        $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
+
+        $this->checkoutModel->returnFromPaypal('token');
+
+        $billingAddress = $quote->getBillingAddress();
+
+        $this->performQuoteAddressAssertions($billingAddress, $this->getExportedData()['billing']);
+    }
+
+    /**
+     * Test case when customer doesn't have either billing or shipping addresses.
+     * Customer add virtual product to quote and place order using PayPal Express method.
+     * Default store country is in PayPal Express allowed specific country list.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoConfigFixture current_store payment/paypal_express/allowspecific 1
+     * @magentoConfigFixture current_store payment/paypal_express/specificcountry US,GB
+     * @magentoConfigFixture current_store general/country/default US
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testPaymentValidationWithAllowedSpecificCountry(): void
+    {
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote);
+
+        $quote->getPayment()->getMethodInstance()->validate();
+    }
+
+    /**
+     * Test case when customer doesn't have either billing or shipping addresses.
+     * Customer add virtual product to quote and place order using PayPal Express method.
+     * PayPal Express allowed specific country list doesn't contain default store country.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoConfigFixture current_store payment/paypal_express/allowspecific 1
+     * @magentoConfigFixture current_store payment/paypal_express/specificcountry US,GB
+     * @magentoConfigFixture current_store general/country/default CA
+     *
+     * @magentoDbIsolation enabled
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage You can't use the payment type you selected to make payments to the billing country.
+     *
+     * @return void
+     */
+    public function testPaymentValidationWithAllowedSpecificCountryNegative(): void
+    {
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote);
+        $quote->getPayment()->getMethodInstance()->validate();
+    }
+
+    /**
+     * Performs quote address assertions.
+     *
+     * @param Address $address
+     * @param array $expected
+     * @return void
+     */
+    private function performQuoteAddressAssertions(Address $address, array $expected): void
+    {
+        foreach ($expected as $key => $item) {
+            $methodName = 'get' . ucfirst($key);
+            if ($key === 'street') {
+                $item = [$item];
+            }
+
+            $this->assertEquals($item, $address->$methodName(), 'The "'. $key . '" does not match.');
+        }
     }
 
     /**
@@ -347,7 +532,7 @@ public function testReturnFromPaypalIfCheckout()
      *
      * @param Quote $quote
      */
-    private function prepareCheckoutModel(Quote $quote)
+    private function prepareCheckoutModel(Quote $quote, $prefix = '')
     {
         $this->checkoutModel = $this->objectManager->create(
             Checkout::class,
@@ -358,18 +543,15 @@ private function prepareCheckoutModel(Quote $quote)
             ]
         );
 
-        $exportedBillingAddress = $this->_getExportedAddressFixture($this->getExportedData());
-        $this->api->expects($this->any())
-            ->method('getExportedBillingAddress')
-            ->will($this->returnValue($exportedBillingAddress));
+        $exportedBillingAddress = $this->getExportedAddressFixture($this->getExportedData()['billing'], $prefix);
+        $this->api->method('getExportedBillingAddress')
+            ->willReturn($exportedBillingAddress);
 
-        $exportedShippingAddress = $this->_getExportedAddressFixture($this->getExportedData());
-        $this->api->expects($this->any())
-            ->method('getExportedShippingAddress')
-            ->will($this->returnValue($exportedShippingAddress));
+        $exportedShippingAddress = $this->getExportedAddressFixture($this->getExportedData()['shipping'], $prefix);
+        $this->api->method('getExportedShippingAddress')
+            ->willReturn($exportedShippingAddress);
 
-        $this->paypalInfo->expects($this->once())
-            ->method('importToPayment')
+        $this->paypalInfo->method('importToPayment')
             ->with($this->api, $quote->getPayment());
     }
 
@@ -378,19 +560,34 @@ private function prepareCheckoutModel(Quote $quote)
      *
      * @return array
      */
-    private function getExportedData()
+    private function getExportedData(): array
     {
-        return
-            [
-                'company'    => 'Testcompany',
-                'email'      => 'buyeraccountmpi@gmail.com',
-                'firstname'  => 'testFirstName',
-                'country_id' => 'US',
-                'region'     => 'testRegion',
-                'city'       => 'testSity',
-                'street'     => 'testStreet',
-                'telephone'  => '223344',
-            ];
+        return [
+            'shipping' => [
+                'email'      => 'customer@example.com',
+                'firstname'  => 'John',
+                'lastname'   => 'Doe',
+                'country'    => 'US',
+                'region'     => 'Colorado',
+                'region_id'  => '13',
+                'city'       => 'Denver',
+                'street'     => '66 Pearl St',
+                'postcode'   => '80203',
+                'telephone'  => '555-555-555'
+            ],
+            'billing' => [
+                'email'      => 'customer@example.com',
+                'firstname'  => 'Jane',
+                'lastname'   => 'Doe',
+                'country'    => 'US',
+                'region'     => 'Texas',
+                'region_id'  => '13',
+                'city'       => 'Austin',
+                'street'     => '1100 Congress Ave',
+                'postcode'   => '78701',
+                'telephone'  => '555-555-555'
+            ]
+        ];
     }
 
     /**
@@ -402,7 +599,7 @@ private function getExportedData()
      */
     public function testGuestReturnFromPaypal()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $paypalConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -439,12 +636,12 @@ public function testGuestReturnFromPaypal()
             ->method('create')
             ->will($this->returnValue($api));
 
-        $exportedBillingAddress = $this->_getExportedAddressFixture($quote->getBillingAddress()->getData());
+        $exportedBillingAddress = $this->getExportedAddressFixture($quote->getBillingAddress()->getData());
         $api->expects($this->any())
             ->method('getExportedBillingAddress')
             ->will($this->returnValue($exportedBillingAddress));
 
-        $exportedShippingAddress = $this->_getExportedAddressFixture($quote->getShippingAddress()->getData());
+        $exportedShippingAddress = $this->getExportedAddressFixture($quote->getShippingAddress()->getData());
         $api->expects($this->any())
             ->method('getExportedShippingAddress')
             ->will($this->returnValue($exportedShippingAddress));
@@ -464,15 +661,27 @@ public function testGuestReturnFromPaypal()
      * Prepare fixture for exported address.
      *
      * @param array $addressData
+     * @param string $prefix
      * @return \Magento\Framework\DataObject
      */
-    protected function _getExportedAddressFixture(array $addressData)
+    private function getExportedAddressFixture(array $addressData, string $prefix = ''): \Magento\Framework\DataObject
     {
-        $addressDataKeys = ['firstname', 'lastname', 'street', 'city', 'telephone'];
+        $addressDataKeys = [
+            'country',
+            'firstname',
+            'lastname',
+            'street',
+            'city',
+            'telephone',
+            'postcode',
+            'region',
+            'region_id',
+            'email',
+        ];
         $result = [];
         foreach ($addressDataKeys as $key) {
             if (isset($addressData[$key])) {
-                $result[$key] = 'exported' . $addressData[$key];
+                $result[$key] = $prefix . $addressData[$key];
             }
         }
 
@@ -488,7 +697,7 @@ protected function _getExportedAddressFixture(array $addressData)
      *
      * @return Quote
      */
-    protected function _getFixtureQuote()
+    private function getFixtureQuote(): Quote
     {
         /** @var Collection $quoteCollection */
         $quoteCollection = $this->objectManager->create(Collection::class);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
index 2da602c52242d..1a22ea947f85a 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
@@ -123,7 +123,7 @@ public function testProcessIpnRequestPartialRefund()
     /**
      * Refund rest of order amount by Paypal Express IPN message service.
      *
-     * @magentoDataFixture Magento/Paypal/_files/order_express_with_invoice_and_creditmemo.php
+     * @magentoDataFixture Magento/Paypal/_files/order_express_with_invoice_and_shipping.php
      * @magentoConfigFixture current_store payment/paypal_express/active 1
      * @magentoConfigFixture current_store paypal/general/merchant_country US
      */
@@ -147,7 +147,7 @@ public function testProcessIpnRequestRestRefund()
         $creditmemoItems = $order->getCreditmemosCollection()->getItems();
 
         $this->assertEquals(Order::STATE_CLOSED, $order->getState()) ;
-        $this->assertEquals(2, count($creditmemoItems));
+        $this->assertEquals(1, count($creditmemoItems));
         $this->assertEquals(10, $order->getSubtotalRefunded());
         $this->assertEquals(10, $order->getBaseSubtotalRefunded());
         $this->assertEquals(20, $order->getShippingRefunded());
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php
new file mode 100644
index 0000000000000..04fb36312f300
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Model\Payflow\Service\Request;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
+use Magento\Paypal\Model\Payflow\Service\Gateway;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SecureTokenTest extends TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var SecureToken
+     */
+    private $service;
+
+    /**
+     * @var Gateway|MockObject
+     */
+    private $gateway;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @var Random|MockObject;
+     */
+    private $mathRandom;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->gateway = $this->getMockBuilder(Gateway::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $this->objectManager->addSharedInstance($this->gateway, Gateway::class);
+
+        $this->mathRandom = $this->getMockBuilder(Random::class)
+            ->getMock();
+
+        $this->service = $this->objectManager->create(
+            SecureToken::class,
+            [
+                'mathRandom' => $this->mathRandom,
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(Gateway::class);
+    }
+
+    /**
+     * Checks a case when secure token can be obtained with credentials for the default scope.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php
+     * @magentoDataFixture Magento/Paypal/Fixtures/default_payment_configuration.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testRequestToken(): void
+    {
+        $quote = $this->getQuote('100000015');
+        $quote->setStoreId(null);
+        $this->execute($quote, 'def_partner', 'def_vendor', 'def_user', 'def_pwd');
+    }
+
+    /**
+     * Checks a case when secure token can be obtained with credentials specified per store.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php
+     * @magentoDataFixture Magento/Paypal/Fixtures/store_payment_configuration.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testRequestTokenWithStoreConfiguration(): void
+    {
+        $quote = $this->getQuote('100000015');
+        $store = $this->getStore('test');
+        $quote->setStoreId($store->getId());
+        $this->execute($quote, 'store_partner', 'store_vendor', 'store_user', 'store_pwd');
+    }
+
+    /**
+     * Checks a case when secure token can be obtained with credentials specified per website.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php
+     * @magentoDataFixture Magento/Paypal/Fixtures/website_payment_configuration.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testRequestTokenWithWebsiteConfiguration(): void
+    {
+        $quote = $this->getQuote('100000015');
+        $store = $this->getStore('fixture_second_store');
+        $quote->setStoreId($store->getId());
+        $this->execute($quote, 'website_partner', 'website_vendor', 'website_user', 'website_pwd');
+    }
+
+    /**
+     * Retrieves secure token and perform test assertions.
+     *
+     * @param Quote $quote
+     * @param string $expPartner
+     * @param string $expVendor
+     * @param string $expUser
+     * @param string $expPwd
+     * @return void
+     */
+    private function execute(
+        Quote $quote,
+        string $expPartner,
+        string $expVendor,
+        string $expUser,
+        string $expPwd
+    ): void {
+        $secureTokenId = '31f2a7c8d257c70b1c9eb9051b90e0';
+        $token = '80IgSbabyj0CtBDWHZZeQN3';
+
+        $this->mathRandom->method('getUniqueHash')
+            ->willReturn($secureTokenId);
+
+        $response = new DataObject([
+            'result' => '0',
+            'respmsg' => 'Approved',
+            'securetoken' => $token,
+            'securetokenid' => $secureTokenId,
+            'result_code' => '0',
+        ]);
+        $self = $this;
+        $this->gateway->method('postRequest')
+            /** @var DataObject $request */
+            ->with(self::callback(function ($request) use ($self, $expPartner, $expVendor, $expUser, $expPwd) {
+                $self->performAssertion($expPartner, $request->getPartner(), '{Partner}');
+                $self->performAssertion($expVendor, $request->getVendor(), '{Vendor}');
+                $self->performAssertion($expUser, $request->getUser(), '{User}');
+                $self->performAssertion($expPwd, $request->getPwd(), '{Password}');
+
+                return true;
+            }))
+            ->willReturn($response);
+
+        $response = $this->service->requestToken($quote);
+        $this->performAssertion($token, $response->getData('securetoken'), '{Secure Token}');
+    }
+
+    /**
+     * Perform assertions test assertions.
+     *
+     * @param string $expected
+     * @param string $actual
+     * @param string $property
+     * @return void
+     */
+    private function performAssertion(string $expected, string $actual, string $property): void
+    {
+        self::assertEquals($expected, $actual, "$property should match.");
+    }
+
+    /**
+     * Loads quote by order increment id.
+     *
+     * @param string $orderIncrementId
+     * @return Quote
+     */
+    private function getQuote(string $orderIncrementId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $orderIncrementId)
+            ->create();
+
+        $items = $this->quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Loads store by provided code.
+     *
+     * @param string $code
+     * @return StoreInterface
+     */
+    private function getStore(string $code): StoreInterface
+    {
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        return $storeRepository->get($code);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
index 4f1953a802c00..0552b9b937ade 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
@@ -6,12 +6,26 @@
 namespace Magento\Paypal\Model\Payment\Method\Billing;
 
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
-class AbstractAgreementTest extends \PHPUnit\Framework\TestCase
+class AbstractAgreementTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /** @var \Magento\Paypal\Model\Method\Agreement */
     protected $_model;
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
         $config = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)->disableOriginalConstructor()->getMock();
@@ -72,4 +86,12 @@ public function testAssignData()
             $info->getAdditionalInformation(AbstractAgreement::PAYMENT_INFO_REFERENCE_ID)
         );
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php
new file mode 100644
index 0000000000000..55ce3be29f7c7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('name', '10$ discount')->create();
+$items = $ruleRepository->getList($searchCriteria)->getItems();
+
+/** @var RuleInterface $item */
+foreach ($items as $item) {
+    $ruleRepository->deleteById($item->getRuleId());
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php
new file mode 100644
index 0000000000000..50d063a6305d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\TransactionRepositoryInterface;
+use Magento\Sales\Model\Order\Payment\Transaction;
+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface as TransactionBuilder;
+use Magento\Sales\Model\Order\Item;
+
+require __DIR__ . '/order_express.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var TransactionBuilder $transactionBuilder */
+$transactionBuilder = $objectManager->create(TransactionBuilder::class);
+$transaction = $transactionBuilder->setPayment($payment)
+    ->setOrder($order)
+    ->setTransactionId(1)
+    ->build(Transaction::TYPE_ORDER);
+
+$transactionRepository = $objectManager->create(TransactionRepositoryInterface::class);
+$transactionRepository->save($transaction);
+
+/** @var Item $orderItem */
+$orderItem = $objectManager->create(Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(1);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setRowTotalInclTax($product->getPrice());
+$orderItem->setBaseRowTotal($product->getPrice());
+$orderItem->setBaseRowTotalInclTax($product->getPrice());
+$orderItem->setBaseRowInvoiced($product->getPrice());
+$orderItem->setProductType('simple');
+
+$totalAmount = $product->getPrice();
+
+/** @var Order $order */
+$order->addItem($orderItem)
+    ->setSubtotal($totalAmount)
+    ->setBaseSubtotal($totalAmount)
+    ->setBaseGrandTotal($totalAmount)
+    ->setGrandTotal($totalAmount);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderRepository->save($order);
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 9ba976a89e4b9..ba6f844b228a1 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 bc080c894d4d1..c95f9df151608 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php
@@ -5,6 +5,7 @@
  */
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
@@ -55,14 +56,16 @@
         ->setName('Simple ' . $i)
         ->setSku('simple' . $i)
         ->setAttributeSetId(4)
-        ->setStockData(
-            [
-                'qty' => 10,
-                'is_in_stock' => 10,
-            ]
-        )
         ->setPrice(5.69 + $i * 2)
         ->setWeight(1);
+
+    /** @var StockItemInterface $stockItem */
+    $stockItem = $objectManager->create(StockItemInterface::class);
+    $stockItem->setQty(10)
+        ->setIsInStock(true);
+    $extensionAttributes = $product->getExtensionAttributes();
+    $extensionAttributes->setStockItem($stockItem);
+
     $item = $productRepository->save($product);
     $quote->addProduct($item, $i);
 }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php
new file mode 100644
index 0000000000000..32a76834dbf27
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require 'fixed_discount_rollback.php';
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $productSearchCriteriaBuilder */
+$productSearchCriteriaBuilder = $objectManager->create(SearchCriteriaBuilder::class);
+$searchCriteria = $productSearchCriteriaBuilder->addFilter('sku', ['simple1', 'simple2', 'simple3'], 'in')
+    ->create();
+$productList = $productRepository->getList($searchCriteria)->getItems();
+
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+if (!empty($productList)) {
+    foreach ($productList as $product) {
+        $productRepository->delete($product);
+    }
+}
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->create(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', '100000015')->create();
+$items = $quoteRepository->getList($searchCriteria)->getItems();
+
+if (!empty($items)) {
+    $quote = array_pop($items);
+    $quoteRepository->delete($quote);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
new file mode 100644
index 0000000000000..d0c16c2b41f09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+Bootstrap::getInstance()->loadArea('adminhtml');
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_VIRTUAL)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product')
+    ->setSku('virtual-product-express')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var $productRepository ProductRepositoryInterface */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
+
+$billingAddress = $objectManager->create(Address::class);
+$billingAddress->setAddressType('billing');
+
+/** @var $quote Quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setCustomerIsGuest(false)
+    ->setCustomerId($customer->getId())
+    ->setCustomer($customer)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->setReservedOrderId('test02')
+    ->setBillingAddress($billingAddress);
+$item = $objectManager->create(Item::class);
+$item->setProduct($product)
+    ->setPrice($product->getPrice())
+    ->setQty(1);
+$quote->addItem($item);
+$quote->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_EXPRESS);
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->create(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+$quote = $quoteRepository->get($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website.php
new file mode 100644
index 0000000000000..e0dfba50fcd51
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * @var CustomerInterface $customer
+ * @var StoreInterface $store
+ * @var ProductInterface $product
+ */
+require __DIR__ . '/../../Customer/Fixtures/customer_sec_website.php';
+require __DIR__ . '/simple_product.php';
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/../../Customer/Fixtures/address_data.php';
+/** @var Address $shippingAddress */
+$shippingAddress = $objectManager->create(Address::class, ['data' => $addressData[0]]);
+$shippingAddress->setAddressType('shipping');
+
+$billingAddress = clone $shippingAddress;
+$billingAddress->setId(null)
+    ->setAddressType('billing');
+
+/** @var Quote $quote */
+$quote = $objectManager->create(
+    Quote::class,
+    [
+        'data' => [
+            'customer_id' => $customer->getId(),
+            'store_id' => $store->getId(),
+            'reserved_order_id' => '0000032134',
+            'is_active' => true,
+            'is_multishipping' => false
+        ]
+    ]
+);
+$quote->setShippingAddress($shippingAddress)
+    ->setBillingAddress($billingAddress)
+    ->addProduct($product);
+
+$quote->getPayment()
+    ->setMethod('checkmo');
+$quote->getShippingAddress()
+    ->setShippingMethod('flatrate_flatrate')
+    ->setCollectShippingRates(true);
+$quote->collectTotals();
+
+/** @var CartRepositoryInterface $repository */
+$repository = $objectManager->get(CartRepositoryInterface::class);
+$repository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website_rollback.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website_rollback.php
new file mode 100644
index 0000000000000..2244a1f22b1ba
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_sec_website_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Registry;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', '0000032134')
+    ->create();
+$items = $quoteRepository->getList($searchCriteria)
+    ->getItems();
+foreach ($items as $item) {
+    $quoteRepository->delete($item);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/simple_product_rollback.php';
+require __DIR__ . '/../../Customer/Fixtures/customer_sec_website_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product.php
new file mode 100644
index 0000000000000..49cb0501fe282
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+$product->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setName('Simple Product')
+    ->setSku('simple002')
+    ->setPrice(10)
+    ->setQty(100)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product_rollback.php
new file mode 100644
index 0000000000000..331615020ed70
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/simple_product_rollback.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('sku', 'simple002')
+    ->create();
+$items = $productRepository->getList($searchCriteria)
+    ->getItems();
+foreach ($items as $product) {
+    $productRepository->delete($product);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/MaskedQuoteIdToQuoteIdTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/MaskedQuoteIdToQuoteIdTest.php
new file mode 100644
index 0000000000000..8d4a2ab4899ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/MaskedQuoteIdToQuoteIdTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+use Magento\Quote\Api\GuestCartManagementInterface;
+
+class MaskedQuoteIdToQuoteIdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var GuestCartManagementInterface
+     */
+    private $guestCartManagement;
+
+    protected function setUp()
+    {
+        $objectManager = BootstrapHelper::getObjectManager();
+        $this->maskedQuoteIdToQuoteId = $objectManager->create(MaskedQuoteIdToQuoteIdInterface::class);
+        $this->guestCartManagement = $objectManager->create(GuestCartManagementInterface::class);
+    }
+
+    public function testMaskedIdToQuoteId()
+    {
+        $maskedQuoteId = $this->guestCartManagement->createEmptyCart();
+        $quoteId = $this->maskedQuoteIdToQuoteId->execute($maskedQuoteId);
+
+        self::assertGreaterThan(0, $quoteId);
+    }
+
+    public function testMaskedQuoteIdToQuoteIdForNonExistentQuote()
+    {
+        self::expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+
+        $this->maskedQuoteIdToQuoteId->execute('test');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Plugin/UpdateQuoteStoreTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Plugin/UpdateQuoteStoreTest.php
new file mode 100644
index 0000000000000..cbacab1139c10
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Plugin/UpdateQuoteStoreTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Plugin;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\FunctionalTestingFramework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreCookieManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\StoreRepository;
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+
+/**
+ * @magentoAppArea frontend
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class UpdateQuoteStoreTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    protected function setUp()
+    {
+        $this->objectManager = BootstrapHelper::getObjectManager();
+        $this->quoteRepository = $this->objectManager->create(CartRepositoryInterface::class);
+    }
+
+    /**
+     * Tests that active quote store id updates after store cookie change.
+     *
+     * @magentoDataFixture Magento/Quote/_files/empty_quote.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @throws \ReflectionException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testUpdateQuoteStoreAfterChangeStoreCookie()
+    {
+        $secondStoreCode = 'fixture_second_store';
+        $reservedOrderId = 'reserved_order_id';
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $currentStore = $storeManager->getStore();
+
+        $quote = $this->getQuote($reservedOrderId);
+        $this->assertEquals(
+            $currentStore->getId(),
+            $quote->getStoreId(),
+            'Current store id and quote store id are not match'
+        );
+
+        /** @var Session $checkoutSession */
+        $checkoutSession = $this->objectManager->get(Session::class);
+        $checkoutSession->setQuoteId($quote->getId());
+
+        $storeRepository = $this->objectManager->create(StoreRepository::class);
+        $secondStore = $storeRepository->get($secondStoreCode);
+
+        $storeCookieManager = $this->getStoreCookieManager($currentStore);
+        $storeCookieManager->setStoreCookie($secondStore);
+
+        $updatedQuote = $this->getQuote($reservedOrderId);
+        $this->assertEquals(
+            $secondStore->getId(),
+            $updatedQuote->getStoreId(),
+            'Active quote store id should be equal second store id'
+        );
+    }
+
+    /**
+     * Retrieves quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        $items = $this->quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Returns instance of StoreCookieManagerInterface with mocked cookieManager dependency.
+     *
+     * Mock is needed since integration test framework use own cookie manager with
+     * behavior that differs from real environment.
+     *
+     * @param $currentStore
+     * @return StoreCookieManagerInterface
+     * @throws \ReflectionException
+     */
+    private function getStoreCookieManager(StoreInterface $currentStore): StoreCookieManagerInterface
+    {
+        /** @var StoreCookieManagerInterface $storeCookieManager */
+        $storeCookieManager = $this->objectManager->get(StoreCookieManagerInterface::class);
+        $cookieManagerMock = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\PhpCookieManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieManagerMock->method('getCookie')
+            ->willReturn($currentStore->getCode());
+
+        $reflection = new \ReflectionClass($storeCookieManager);
+        $cookieManager = $reflection->getProperty('cookieManager');
+        $cookieManager->setAccessible(true);
+        $cookieManager->setValue($storeCookieManager, $cookieManagerMock);
+
+        return $storeCookieManager;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
index 3606636d8130f..62e417d27c51b 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
@@ -11,7 +11,7 @@
  * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
  * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
  */
-class AddressTest extends \PHPUnit\Framework\TestCase
+class AddressTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /** @var \Magento\Quote\Model\Quote $quote */
     protected $_quote;
@@ -25,6 +25,19 @@ class AddressTest extends \PHPUnit\Framework\TestCase
     /**@var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
     protected $customerRepository;
 
+    public static function setUpBeforeClass()
+    {
+        $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     /**
      * Initialize quote and customer fixtures
      */
@@ -225,7 +238,7 @@ public function testImportCustomerAddressDataWithCustomer()
             ->setLastname('Doe')
             ->setTelephone('123456')
             ->setPostcode('12345')
-            ->setCountryId(1)
+            ->setCountryId('US')
             ->setCity($city)
             ->setStreet([$street]);
         $addressData = $addressRepository->save($addressData);
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php
index 507dfc029d6bb..52ef9bfee68bd 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php
@@ -34,9 +34,18 @@ public function testGetList()
         $actualQuoteItem = array_pop($quoteItems);
         $this->assertInstanceOf(\Magento\Quote\Api\Data\CartItemInterface::class, $actualQuoteItem);
         /** @var \Magento\User\Api\Data\UserInterface $testAttribute */
-        $testAttribute = $actualQuoteItem->getExtensionAttributes()->getQuoteItemTestAttribute();
-        $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute->getFirstName());
-        $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute->getLastName());
-        $this->assertEquals($expectedExtensionAttributes['email'], $testAttribute->getEmail());
+        $testAttribute = $actualQuoteItem->getExtensionAttributes()->__toArray();
+        $this->assertEquals(
+            $expectedExtensionAttributes['firstname'],
+            $testAttribute['quoteItemTestAttribute']['firstname']
+        );
+        $this->assertEquals(
+            $expectedExtensionAttributes['lastname'],
+            $testAttribute['quoteItemTestAttribute']['lastname']
+        );
+        $this->assertEquals(
+            $expectedExtensionAttributes['email'],
+            $testAttribute['quoteItemTestAttribute']['email']
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php
new file mode 100644
index 0000000000000..a375b3c665f2a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Quote\Item;
+
+use Magento\Quote\Api\CartItemRepositoryInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests \Magento\Quote\Model\Quote\Item\Updater
+ */
+class UpdaterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Updater
+     */
+    private $updater;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->updater = $this->objectManager->create(Updater::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/quote_with_custom_price.php
+     * @return void
+     */
+    public function testUpdate(): void
+    {
+        /** @var CartItemRepositoryInterface $quoteItemRepository */
+        $quoteItemRepository = $this->objectManager->create(CartItemRepositoryInterface::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $quoteId = $quote->load('test01', 'reserved_order_id')->getId();
+        /** @var CartItemInterface[] $quoteItems */
+        $quoteItems = $quoteItemRepository->getList($quoteId);
+        /** @var CartItemInterface $actualQuoteItem */
+        $actualQuoteItem = array_pop($quoteItems);
+        $this->assertInstanceOf(CartItemInterface::class, $actualQuoteItem);
+
+        $this->updater->update($actualQuoteItem, ['qty' => 1]);
+
+        $this->assertNull(
+            $actualQuoteItem->getCustomPrice(),
+            'Item custom price has to be null'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteIdToMaskedQuoteIdTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteIdToMaskedQuoteIdTest.php
new file mode 100644
index 0000000000000..9301b76104d14
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteIdToMaskedQuoteIdTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+class QuoteIdToMaskedQuoteIdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedQuoteId;
+
+    protected function setUp()
+    {
+        $objectManager = BootstrapHelper::getObjectManager();
+        $this->quoteIdToMaskedQuoteId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteFactory = $objectManager->create(QuoteFactory::class);
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     */
+    public function testMaskedQuoteId()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test01', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedQuoteId->execute((int) $quote->getId());
+
+        self::assertNotEmpty($maskedQuoteId);
+    }
+
+    public function testMaskedQuoteIdWithNonExistentQuoteId()
+    {
+        self::expectException(NoSuchEntityException::class);
+
+        $this->quoteIdToMaskedQuoteId->execute(0);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
index b3e8605b54792..356117f2b3dc8 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -3,42 +3,139 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
+/**
+ * Class for testing QuoteManagement model
+ */
 class QuoteManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Create order with product that has child items
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->cartManagement = $this->objectManager->create(CartManagementInterface::class);
+    }
+
+    /**
+     * Creates order with product that has child items.
      *
+     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
      */
     public function testSubmit()
     {
-        /**
-         * Preconditions:
-         * Load quote with Bundle product that has at least to child products
-         */
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
-        /** Execute SUT */
-        /** @var \Magento\Quote\Api\CartManagementInterface $model */
-        $model = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
-        $order = $model->submit($quote);
-
-        /** Check if SUT caused expected effects */
+        $quote = $this->getQuote('test01');
+        $orderId = $this->cartManagement->placeOrder($quote->getId());
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->create(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($orderId);
+
         $orderItems = $order->getItems();
-        $this->assertCount(3, $orderItems);
+        self::assertCount(3, $orderItems);
         foreach ($orderItems as $orderItem) {
             if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
-                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
-                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
+                self::assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
+                self::assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
             }
         }
     }
+
+    /**
+     * Tries to create order with product that has child items and one of them was deleted.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some of the products below do not have all the required options.
+     */
+    public function testSubmitWithDeletedItem()
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple-2');
+        $productRepository->delete($product);
+        $quote = $this->getQuote('test01');
+
+        $this->cartManagement->placeOrder($quote->getId());
+    }
+
+    /**
+     * Tries to create order with item of stock during checkout.
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some of the products are out of stock.
+     * @magentoDbIsolation enabled
+     */
+    public function testSubmitWithItemOutOfStock()
+    {
+        $this->makeProductOutOfStock('simple');
+        $quote = $this->getQuote('test01');
+        $this->cartManagement->placeOrder($quote->getId());
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Makes provided product as out of stock.
+     *
+     * @param string $sku
+     * @return void
+     */
+    private function makeProductOutOfStock(string $sku)
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku);
+        $extensionAttributes = $product->getExtensionAttributes();
+        $stockItem = $extensionAttributes->getStockItem();
+        $stockItem->setIsInStock(false);
+        $productRepository->save($product);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
index 88c66fedd10ed..397591918129c 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Quote\Model;
 
+use Magento\Store\Model\StoreRepository;
 use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -19,6 +20,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoDbIsolation disabled
  */
 class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -42,6 +44,9 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $filterBuilder;
 
+    /**
+     * Set up
+     */
     protected function setUp()
     {
         $this->objectManager = BootstrapHelper::getObjectManager();
@@ -50,6 +55,34 @@ protected function setUp()
         $this->filterBuilder = $this->objectManager->create(FilterBuilder::class);
     }
 
+    /**
+     * Tests that quote saved with custom store id has same store id after getting via repository.
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testGetQuoteWithCustomStoreId()
+    {
+        $secondStoreCode = 'fixture_second_store';
+        $reservedOrderId = 'test01';
+
+        $storeRepository = $this->objectManager->create(StoreRepository::class);
+        $secondStore = $storeRepository->get($secondStoreCode);
+
+        // Set store_id in quote to second store_id
+        $quote = $this->getQuote($reservedOrderId);
+        $quote->setStoreId($secondStore->getId());
+        $this->quoteRepository->save($quote);
+
+        $savedQuote = $this->quoteRepository->get($quote->getId());
+
+        $this->assertEquals(
+            $secondStore->getId(),
+            $savedQuote->getStoreId(),
+            'Quote store id should be equal with store id value in DB'
+        );
+    }
+
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      */
@@ -75,7 +108,6 @@ public function testGetListDoubleCall()
     }
 
     /**
-     * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      */
     public function testSaveWithNotExistingCustomerAddress()
@@ -126,6 +158,24 @@ public function testSaveWithNotExistingCustomerAddress()
         );
     }
 
+    /**
+     * Returns quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId)
+    {
+        $searchCriteria = $this->getSearchCriteria($reservedOrderId);
+        $searchResult = $this->quoteRepository->getList($searchCriteria);
+        $items = $searchResult->getItems();
+
+        /** @var CartInterface $quote */
+        $quote = array_pop($items);
+
+        return $quote;
+    }
+
     /**
      * Get search criteria
      *
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
index 258b14bf6e0d3..72c5d7736a30d 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -3,21 +3,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Model\Data\Customer;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class QuoteTest extends \PHPUnit\Framework\TestCase
 {
-    private function convertToArray($entity)
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @param ExtensibleDataInterface $entity
+     * @return array
+     */
+    private function convertToArray(ExtensibleDataInterface $entity): array
     {
-        return Bootstrap::getObjectManager()
+        return $this->objectManager
             ->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class)
             ->toFlatArray($entity);
     }
@@ -25,14 +52,15 @@ private function convertToArray($entity)
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @return void
      */
-    public function testCollectTotalsWithVirtual()
+    public function testCollectTotalsWithVirtual(): void
     {
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        $quote = $this->objectManager->create(Quote::class);
         $quote->load('test01', 'reserved_order_id');
 
-        $productRepository = Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        $productRepository = $this->objectManager->create(
+            ProductRepositoryInterface::class
         );
         $product = $productRepository->get('virtual-product', false, null, true);
         $quote->addProduct($product);
@@ -44,16 +72,19 @@ public function testCollectTotalsWithVirtual()
         $this->assertEquals(20, $quote->getBaseGrandTotal());
     }
 
-    public function testSetCustomerData()
+    /**
+     * @return void
+     */
+    public function testSetCustomerData(): void
     {
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         /** @var CustomerInterfaceFactory $customerFactory */
-        $customerFactory = Bootstrap::getObjectManager()->create(
+        $customerFactory = $this->objectManager->create(
             CustomerInterfaceFactory::class
         );
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
-        $dataObjectHelper = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\DataObjectHelper::class);
+        $dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
         $expected = $this->_getCustomerDataArray();
         $customer = $customerFactory->create();
         $dataObjectHelper->populateWithArray(
@@ -64,21 +95,23 @@ public function testSetCustomerData()
 
         $this->assertEquals($expected, $this->convertToArray($customer));
         $quote->setCustomer($customer);
-        //
         $customer = $quote->getCustomer();
         $this->assertEquals($expected, $this->convertToArray($customer));
         $this->assertEquals('qa@example.com', $quote->getCustomerEmail());
     }
 
-    public function testUpdateCustomerData()
+    /**
+     * @return void
+     */
+    public function testUpdateCustomerData(): void
     {
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
-        $customerFactory = Bootstrap::getObjectManager()->create(
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $customerFactory = $this->objectManager->create(
             CustomerInterfaceFactory::class
         );
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
-        $dataObjectHelper = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\DataObjectHelper::class);
+        $dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
         $expected = $this->_getCustomerDataArray();
         //For save in repository
         $expected = $this->removeIdFromCustomerData($expected);
@@ -92,7 +125,7 @@ public function testUpdateCustomerData()
         /**
          * @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
          */
-        $customerRepository = Bootstrap::getObjectManager()
+        $customerRepository = $this->objectManager
             ->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $customerRepository->save($customerDataSet);
         $quote->setCustomer($customerDataSet);
@@ -116,18 +149,20 @@ public function testUpdateCustomerData()
 
     /**
      * Customer data is set to quote (which contains valid group ID).
+     *
+     * @return void
      */
-    public function testGetCustomerGroupFromCustomer()
+    public function testGetCustomerGroupFromCustomer(): void
     {
         /** Preconditions */
         /** @var CustomerInterfaceFactory $customerFactory */
-        $customerFactory = Bootstrap::getObjectManager()->create(
+        $customerFactory = $this->objectManager->create(
             CustomerInterfaceFactory::class
         );
         $customerGroupId = 3;
         $customerData = $customerFactory->create()->setId(1)->setGroupId($customerGroupId);
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->setCustomer($customerData);
         $quote->unsetData('customer_group_id');
 
@@ -137,8 +172,9 @@ public function testGetCustomerGroupFromCustomer()
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
+     * @return void
      */
-    public function testGetCustomerTaxClassId()
+    public function testGetCustomerTaxClassId(): void
     {
         /**
          * Preconditions: create quote and assign ID of customer group created in fixture to it.
@@ -146,10 +182,10 @@ public function testGetCustomerTaxClassId()
         $fixtureGroupCode = 'custom_group';
         $fixtureTaxClassId = 3;
         /** @var \Magento\Customer\Model\Group $group */
-        $group = Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Group::class);
+        $group = $this->objectManager->create(\Magento\Customer\Model\Group::class);
         $fixtureGroupId = $group->load($fixtureGroupCode, 'customer_group_code')->getId();
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->setCustomerGroupId($fixtureGroupId);
 
         /** Execute SUT */
@@ -162,15 +198,16 @@ public function testGetCustomerTaxClassId()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @return void
      */
-    public function testAssignCustomerWithAddressChangeAddressesNotSpecified()
+    public function testAssignCustomerWithAddressChangeAddressesNotSpecified(): void
     {
         /** Preconditions:
          * Customer with two addresses created
          * First address is default billing, second is default shipping.
          */
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
 
         /** Execute SUT */
@@ -227,16 +264,16 @@ public function testAssignCustomerWithAddressChangeAddressesNotSpecified()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @return void
      */
-    public function testAssignCustomerWithAddressChange()
+    public function testAssignCustomerWithAddressChange(): void
     {
         /** Preconditions:
          * Customer with two addresses created
          * First address is default billing, second is default shipping.
          */
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $objectManager = Bootstrap::getObjectManager();
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
         /** @var \Magento\Quote\Model\Quote\Address $quoteBillingAddress */
         $expectedBillingAddressData = [
@@ -249,7 +286,7 @@ public function testAssignCustomerWithAddressChange()
             'firstname' => 'FirstBilling',
             'region_id' => 1
         ];
-        $quoteBillingAddress = $objectManager->create(\Magento\Quote\Model\Quote\Address::class);
+        $quoteBillingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
         $quoteBillingAddress->setData($expectedBillingAddressData);
 
         $expectedShippingAddressData = [
@@ -262,7 +299,7 @@ public function testAssignCustomerWithAddressChange()
             'firstname' => 'FirstShipping',
             'region_id' => 1
         ];
-        $quoteShippingAddress = $objectManager->create(\Magento\Quote\Model\Quote\Address::class);
+        $quoteShippingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
         $quoteShippingAddress->setData($expectedShippingAddressData);
 
         /** Execute SUT */
@@ -292,17 +329,18 @@ public function testAssignCustomerWithAddressChange()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @return void
      */
-    public function testAddProductUpdateItem()
+    public function testAddProductUpdateItem(): void
     {
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->load('test01', 'reserved_order_id');
 
         $productStockQty = 100;
 
-        $productRepository = Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        $productRepository = $this->objectManager->create(
+            ProductRepositoryInterface::class
         );
         $product = $productRepository->get('simple-1', false, null, true);
 
@@ -323,10 +361,9 @@ public function testAddProductUpdateItem()
         $quote->setTotalsCollectedFlag(false)->collectTotals();
         $this->assertEquals(1, $quote->getItemsQty());
 
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            'We don\'t have as many "Simple Product" as you requested.'
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        // TODO: fix test or implementation as described in https://github.com/magento-engcom/msi/issues/1037
+//        $this->expectExceptionMessage('The requested qty is not available');
         $updateParams['qty'] = $productStockQty + 1;
         $quote->updateItem($updateParams['id'], $updateParams);
     }
@@ -336,17 +373,17 @@ public function testAddProductUpdateItem()
      *
      * Customer with two addresses created. First address is default billing, second is default shipping.
      *
-     * @param \Magento\Quote\Model\Quote $quote
-     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @param Quote $quote
+     * @return CustomerInterface
      */
-    protected function _prepareQuoteForTestAssignCustomerWithAddressChange($quote)
+    protected function _prepareQuoteForTestAssignCustomerWithAddressChange(Quote $quote): CustomerInterface
     {
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $customerRepository = $this->objectManager->create(
+            CustomerRepositoryInterface::class
+        );
         $fixtureCustomerId = 1;
         /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
+        $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
         $fixtureSecondAddressId = 2;
         $customer->load($fixtureCustomerId)->setDefaultShipping($fixtureSecondAddressId)->save();
         $customerData = $customerRepository->getById($fixtureCustomerId);
@@ -362,11 +399,11 @@ protected function _prepareQuoteForTestAssignCustomerWithAddressChange($quote)
     }
 
     /**
-     * @param $email
+     * @param string $email
      * @param array $customerData
      * @return array
      */
-    protected function changeEmailInCustomerData($email, array $customerData)
+    protected function changeEmailInCustomerData(string $email, array $customerData): array
     {
         $customerData[\Magento\Customer\Model\Data\Customer::EMAIL] = $email;
         return $customerData;
@@ -376,34 +413,36 @@ protected function changeEmailInCustomerData($email, array $customerData)
      * @param array $customerData
      * @return array
      */
-    protected function removeIdFromCustomerData(array $customerData)
+    protected function removeIdFromCustomerData(array $customerData): array
     {
         unset($customerData[\Magento\Customer\Model\Data\Customer::ID]);
         return $customerData;
     }
 
-    protected function _getCustomerDataArray()
+    /**
+     * @return array
+     */
+    protected function _getCustomerDataArray(): array
     {
         return [
-            \Magento\Customer\Model\Data\Customer::CONFIRMATION => 'test',
-            \Magento\Customer\Model\Data\Customer::CREATED_AT => '2/3/2014',
-            \Magento\Customer\Model\Data\Customer::CREATED_IN => 'Default',
-            \Magento\Customer\Model\Data\Customer::DEFAULT_BILLING => 'test',
-            \Magento\Customer\Model\Data\Customer::DEFAULT_SHIPPING => 'test',
-            \Magento\Customer\Model\Data\Customer::DOB => '2014-02-03 00:00:00',
-            \Magento\Customer\Model\Data\Customer::EMAIL => 'qa@example.com',
-            \Magento\Customer\Model\Data\Customer::FIRSTNAME => 'Joe',
-            \Magento\Customer\Model\Data\Customer::GENDER => 'Male',
-            \Magento\Customer\Model\Data\Customer::GROUP_ID =>
-                \Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID,
-            \Magento\Customer\Model\Data\Customer::ID => 1,
-            \Magento\Customer\Model\Data\Customer::LASTNAME => 'Dou',
-            \Magento\Customer\Model\Data\Customer::MIDDLENAME => 'Ivan',
-            \Magento\Customer\Model\Data\Customer::PREFIX => 'Dr.',
-            \Magento\Customer\Model\Data\Customer::STORE_ID => 1,
-            \Magento\Customer\Model\Data\Customer::SUFFIX => 'Jr.',
-            \Magento\Customer\Model\Data\Customer::TAXVAT => 1,
-            \Magento\Customer\Model\Data\Customer::WEBSITE_ID => 1
+            Customer::CONFIRMATION => 'test',
+            Customer::CREATED_AT => '2/3/2014',
+            Customer::CREATED_IN => 'Default',
+            Customer::DEFAULT_BILLING => 'test',
+            Customer::DEFAULT_SHIPPING => 'test',
+            Customer::DOB => '2014-02-03 00:00:00',
+            Customer::EMAIL => 'qa@example.com',
+            Customer::FIRSTNAME => 'Joe',
+            Customer::GENDER => 0,
+            Customer::GROUP_ID => \Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID,
+            Customer::ID => 1,
+            Customer::LASTNAME => 'Dou',
+            Customer::MIDDLENAME => 'Ivan',
+            Customer::PREFIX => 'Dr.',
+            Customer::STORE_ID => 1,
+            Customer::SUFFIX => 'Jr.',
+            Customer::TAXVAT => 1,
+            Customer::WEBSITE_ID => 1
         ];
     }
 
@@ -412,12 +451,12 @@ protected function _getCustomerDataArray()
      *
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoDataFixture Magento/Quote/_files/empty_quote.php
+     * @return void
      */
-    public function testReserveOrderId()
+    public function testReserveOrderId(): void
     {
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Quote\Model\Quote  $quote */
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote  $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->load('reserved_order_id', 'reserved_order_id');
         $quote->reserveOrderId();
         $this->assertEquals('reserved_order_id', $quote->getReservedOrderId());
@@ -429,40 +468,38 @@ public function testReserveOrderId()
     /**
      * Test to verify that disabled product cannot be added to cart
      * @magentoDataFixture Magento/Quote/_files/is_not_salable_product.php
+     * @return void
      */
-    public function testAddedProductToQuoteIsSalable()
+    public function testAddedProductToQuoteIsSalable(): void
     {
         $productId = 99;
-        $objectManager = Bootstrap::getObjectManager();
 
         /** @var ProductRepository $productRepository */
-        $productRepository = $objectManager->get(ProductRepository::class);
+        $productRepository = $this->objectManager->get(ProductRepository::class);
 
-        /** @var \Magento\Quote\Model\Quote  $quote */
+        /** @var Quote  $quote */
         $product = $productRepository->getById($productId, false, null, true);
 
-        $this->expectException(
-            LocalizedException::class,
-            'Product that you are trying to add is not available.'
-        );
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('Product that you are trying to add is not available.');
 
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        $quote = $this->objectManager->create(Quote::class);
         $quote->addProduct($product);
     }
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
      */
-    public function testGetItemById()
+    public function testGetItemById(): void
     {
-        $objectManager = Bootstrap::getObjectManager();
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        $quote = $this->objectManager->create(Quote::class);
         $quote->load('test01', 'reserved_order_id');
 
-        $quoteItem = $objectManager->create(\Magento\Quote\Model\Quote\Item::class);
+        $quoteItem = $this->objectManager->create(\Magento\Quote\Model\Quote\Item::class);
 
-        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $product = $productRepository->get('simple');
 
         $quoteItem->setProduct($product);
@@ -472,4 +509,101 @@ public function testGetItemById()
         $this->assertInstanceOf(\Magento\Quote\Model\Quote\Item::class, $quote->getItemById($quoteItem->getId()));
         $this->assertEquals($quoteItem->getId(), $quote->getItemById($quoteItem->getId())->getId());
     }
+
+    /**
+     * Tests of quotes merging.
+     *
+     * @param int|null $guestItemGiftMessageId
+     * @param int|null $customerItemGiftMessageId
+     * @param int|null $guestOrderGiftMessageId
+     * @param int|null $customerOrderGiftMessageId
+     * @param int|null $expectedItemGiftMessageId
+     * @param int|null $expectedOrderGiftMessageId
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @dataProvider giftMessageDataProvider
+     * @throws LocalizedException
+     * @return void
+     */
+    public function testMerge(
+        $guestItemGiftMessageId,
+        $customerItemGiftMessageId,
+        $guestOrderGiftMessageId,
+        $customerOrderGiftMessageId,
+        $expectedItemGiftMessageId,
+        $expectedOrderGiftMessageId
+    ): void {
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple', false, null, true);
+
+        /** @var Quote  $quote */
+        $guestQuote = $this->getQuote('test01');
+        $guestQuote->setGiftMessageId($guestOrderGiftMessageId);
+
+        /** @var Quote  $customerQuote */
+        $customerQuote = $this->objectManager->create(Quote::class);
+        $customerQuote->setReservedOrderId('test02')
+            ->setStoreId($guestQuote->getStoreId())
+            ->addProduct($product);
+        $customerQuote->setGiftMessageId($customerOrderGiftMessageId);
+
+        $guestItem = $guestQuote->getItemByProduct($product);
+        $guestItem->setGiftMessageId($guestItemGiftMessageId);
+
+        $customerItem = $customerQuote->getItemByProduct($product);
+        $customerItem->setGiftMessageId($customerItemGiftMessageId);
+
+        $customerQuote->merge($guestQuote);
+        $mergedItemItem = $customerQuote->getItemByProduct($product);
+
+        self::assertEquals($expectedOrderGiftMessageId, $customerQuote->getGiftMessageId());
+        self::assertEquals($expectedItemGiftMessageId, $mergedItemItem->getGiftMessageId());
+    }
+
+    /**
+     * Provides order- and item-level gift message Id.
+     *
+     * @return array
+     */
+    public function giftMessageDataProvider(): array
+    {
+        return [
+            [
+                'guestItemId' => null,
+                'customerItemId' => 1,
+                'guestOrderId' => null,
+                'customerOrderId' => 11,
+                'expectedItemId' => 1,
+                'expectedOrderId' => 11
+            ],
+            [
+                'guestItemId' => 1,
+                'customerItemId' => 2,
+                'guestOrderId' => 11,
+                'customerOrderId' => 22,
+                'expectedItemId' => 1,
+                'expectedOrderId' => 11
+            ]
+        ];
+    }
+
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php
new file mode 100644
index 0000000000000..34b709509e4dd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Model\Quote\Address\Rate;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class QuoteValidatorTest.
+ *
+ * @magentoDbIsolation enabled
+ */
+class QuoteValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var QuoteValidator
+     */
+    private $quoteValidator;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->quoteValidator = Bootstrap::getObjectManager()->create(QuoteValidator::class);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Please check the shipping address information.
+     */
+    public function testValidateBeforeSubmitShippingAddressInvalid()
+    {
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()->setPostcode('');
+
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some addresses can't be used due to the configurations for specific countries.
+     */
+    public function testValidateBeforeSubmitCountryIsNotAllowed()
+    {
+        /** @magentoConfigFixture does not allow to change the value for the website scope */
+        Bootstrap::getObjectManager()->get(
+            \Magento\Framework\App\Config\MutableScopeConfigInterface::class
+        )->setValue(
+            'general/country/allow',
+            'US',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()->setCountryId('AF');
+
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage The shipping method is missing. Select the shipping method and try again.
+     */
+    public function testValidateBeforeSubmitShippingMethodInvalid()
+    {
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()->setShippingMethod('NONE');
+
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Please check the billing address information.
+     */
+    public function testValidateBeforeSubmitBillingAddressInvalid()
+    {
+        $quote = $this->getQuote();
+        $quote->getBillingAddress()->setTelephone('');
+
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Enter a valid payment method and try again.
+     */
+    public function testValidateBeforeSubmitPaymentMethodInvalid()
+    {
+        $quote = $this->getQuote();
+        $quote->getPayment()->setMethod('');
+
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @magentoConfigFixture current_store sales/minimum_order/active 1
+     * @magentoConfigFixture current_store sales/minimum_order/amount 100
+     */
+    public function testValidateBeforeSubmitMinimumAmountInvalid()
+    {
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()
+            ->setBaseSubtotal(0);
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @return void
+     */
+    public function testValidateBeforeSubmitWithoutMinimumOrderAmount()
+    {
+        $this->quoteValidator->validateBeforeSubmit($this->getQuote());
+    }
+
+    /**
+     * @magentoConfigFixture current_store sales/minimum_order/active 1
+     * @magentoConfigFixture current_store sales/minimum_order/amount 100
+     */
+    public function testValidateBeforeSubmitWithMinimumOrderAmount()
+    {
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()
+            ->setBaseSubtotal(200);
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * Checks a case when the default website has country restrictions and the quote created
+     * for the another website with different country restrictions.
+     *
+     * @magentoDataFixture Magento/Quote/Fixtures/quote_sec_website.php
+     * @magentoDbIsolation disabled
+     */
+    public function testValidateBeforeSubmit()
+    {
+        $quote = $this->getQuoteById('0000032134');
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * @return Quote
+     */
+    private function getQuote(): Quote
+    {
+        /** @var Quote $quote */
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+
+        /** @var AddressInterface $billingAddress */
+        $billingAddress = Bootstrap::getObjectManager()->create(AddressInterface::class);
+        $billingAddress->setFirstname('Joe')
+            ->setLastname('Doe')
+            ->setCountryId('US')
+            ->setRegion('TX')
+            ->setCity('Austin')
+            ->setStreet('1000 West Parmer Line')
+            ->setPostcode('11501')
+            ->setTelephone('123456789');
+        $quote->setBillingAddress($billingAddress);
+
+        /** @var AddressInterface $shippingAddress */
+        $shippingAddress = Bootstrap::getObjectManager()->create(AddressInterface::class);
+        $shippingAddress->setFirstname('Joe')
+        ->setLastname('Doe')
+        ->setCountryId('US')
+        ->setRegion('TX')
+        ->setCity('Austin')
+        ->setStreet('1000 West Parmer Line')
+        ->setPostcode('11501')
+        ->setTelephone('123456789');
+        $quote->setShippingAddress($shippingAddress);
+
+        $quote->getShippingAddress()
+            ->setShippingMethod('flatrate_flatrate')
+            ->setCollectShippingRates(true);
+        /** @var Rate $shippingRate */
+        $shippingRate = Bootstrap::getObjectManager()->create(Rate::class);
+        $shippingRate->setMethod('flatrate')
+            ->setCarrier('flatrate')
+            ->setPrice('5')
+            ->setCarrierTitle('Flat Rate')
+            ->setCode('flatrate_flatrate');
+        $quote->getShippingAddress()
+            ->addShippingRate($shippingRate);
+
+        $quote->getPayment()->setMethod('CC');
+
+        /** @var QuoteRepository $quoteRepository */
+        $quoteRepository = Bootstrap::getObjectManager()->create(QuoteRepository::class);
+        $quoteRepository->save($quote);
+
+        return $quote;
+    }
+
+    /**
+     * Gets quote entity by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuoteById(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $repository */
+        $repository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php
deleted file mode 100644
index 3bd22ef29cb23..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Quote\Model\ResourceModel;
-
-/**
- * Class QuoteTest to verify isOrderIncrementIdUsed method behaviour
- */
-class QuoteTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
-     */
-    private $_resourceModel;
-
-    protected function setUp()
-    {
-        $this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Quote\Model\ResourceModel\Quote::class
-        );
-    }
-
-    /**
-     * Test to verify if isOrderIncrementIdUsed method works with numeric increment ids
-     *
-     * @magentoDataFixture Magento/Sales/_files/order.php
-     */
-    public function testIsOrderIncrementIdUsedNumericIncrementId()
-    {
-        $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('100000001'));
-    }
-
-    /**
-     * Test to verify if isOrderIncrementIdUsed method works with alphanumeric increment ids
-     *
-     * @magentoDataFixture Magento/Sales/_files/order_alphanumeric_id.php
-     */
-    public function testIsOrderIncrementIdUsedAlphanumericIncrementId()
-    {
-        $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('M00000001'));
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
index f73ee555eb520..8db7b65d0142d 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
@@ -13,6 +13,72 @@
  */
 class ShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_100_percent_off.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @return void
+     */
+    public function testRateAppliedToShipping(): void
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var \Magento\Quote\Api\CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+        $customerQuote = $quoteRepository->getForCustomer(1);
+        $this->assertEquals(0, $customerQuote->getBaseGrandTotal());
+    }
+
+    /**
+     * @magentoConfigFixture current_store carriers/tablerate/active 1
+     * @magentoConfigFixture current_store carriers/flatrate/active 0
+     * @magentoConfigFixture current_store carriers/freeshipping/active 0
+     * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_free_shipping_by_cart.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/OfflineShipping/_files/tablerates.php
+     * @return void
+     */
+    public function testTableRateFreeShipping()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Quote\Model\Quote $quote */
+        $quote = $objectManager->get(\Magento\Quote\Model\Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+        $cartId = $quote->getId();
+        if (!$cartId) {
+            $this->fail('quote fixture failed');
+        }
+        /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+        $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+            ->create();
+        $quoteIdMask->load($cartId, 'quote_id');
+        //Use masked cart Id
+        $cartId = $quoteIdMask->getMaskedId();
+        $data = [
+            'data' => [
+                'country_id' => "US",
+                'postcode' => null,
+                'region' => null,
+                'region_id' => null
+            ]
+        ];
+        /** @var \Magento\Quote\Api\Data\EstimateAddressInterface $address */
+        $address = $objectManager->create(\Magento\Quote\Api\Data\EstimateAddressInterface::class, $data);
+        /** @var  \Magento\Quote\Api\GuestShippingMethodManagementInterface $shippingEstimation */
+        $shippingEstimation = $objectManager->get(\Magento\Quote\Api\GuestShippingMethodManagementInterface::class);
+        $result = $shippingEstimation->estimateByAddress($cartId, $address);
+        $this->assertNotEmpty($result);
+        $expectedResult = [
+            'method_code' => 'bestway',
+            'amount' => 0
+        ];
+        foreach ($result as $rate) {
+            $this->assertEquals($expectedResult['amount'], $rate->getAmount());
+            $this->assertEquals($expectedResult['method_code'], $rate->getMethodCode());
+        }
+    }
+
     /**
      * @magentoConfigFixture current_store carriers/tablerate/active 1
      * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
@@ -36,6 +102,7 @@ public function testEstimateByAddressWithCartPriceRuleByItem()
      */
     public function testEstimateByAddressWithCartPriceRuleByShipment()
     {
+        $this->markTestSkipped('According to MAGETWO-69940 it is an incorrect behavior');
         // Rule applied to entire shipment should not overwrite flat or table rate shipping prices
         // Only rules applied to specific items should modify those prices (MAGETWO-63844)
         $this->executeTestFlow(5, 10);
diff --git a/dev/tests/integration/testsuite/Magento/ReleaseNotification/Controller/Adminhtml/Dashboard/IndexTest.php b/dev/tests/integration/testsuite/Magento/ReleaseNotification/Controller/Adminhtml/Dashboard/IndexTest.php
new file mode 100644
index 0000000000000..2f89f70a6c872
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ReleaseNotification/Controller/Adminhtml/Dashboard/IndexTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Controller\Adminhtml\Dashboard;
+
+use Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider;
+use Magento\ReleaseNotification\Model\ContentProviderInterface;
+use Magento\TestFramework\Helper\CacheCleaner;
+use Magento\TestFramework\ObjectManager;
+
+class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /** @var ObjectManager */
+    private $objectManager;
+
+    /**
+     * @var HttpContentProvider | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contentProviderMock;
+
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->contentProviderMock = $this->getMockBuilder(HttpContentProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager->addSharedInstance($this->contentProviderMock, HttpContentProvider::class);
+    }
+
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(ContentProviderInterface::class);
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testExecute()
+    {
+        $content = include __DIR__ . '/../../../_files/validContent.php';
+
+        CacheCleaner::cleanAll();
+        $this->contentProviderMock->expects($this->any())
+            ->method('getContent')
+            ->willReturn($content);
+
+        $this->dispatch('backend/admin/dashboard/index/');
+
+        $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
+
+        $actual = $this->getResponse()->getBody();
+        $this->assertContains('1-mainContent title', $actual);
+        $this->assertContains('2-mainContent title', $actual);
+        $this->assertContains('3-mainContent title', $actual);
+        $this->assertContains('4-mainContent title', $actual);
+    }
+
+    public function testExecuteEmptyContent()
+    {
+        CacheCleaner::cleanAll();
+        $this->contentProviderMock->expects($this->any())
+            ->method('getContent')
+            ->willReturn('[]');
+
+        $this->dispatch('backend/admin/dashboard/index/');
+
+        $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
+
+        $actual = $this->getResponse()->getBody();
+        $this->assertNotContains('"autoOpen":true', $actual);
+    }
+
+    public function testExecuteFalseContent()
+    {
+        CacheCleaner::cleanAll();
+        $this->contentProviderMock->expects($this->any())
+            ->method('getContent')
+            ->willReturn(false);
+
+        $this->dispatch('backend/admin/dashboard/index/');
+
+        $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
+
+        $actual = $this->getResponse()->getBody();
+        $this->assertNotContains('"autoOpen":true', $actual);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ReleaseNotification/Model/ResourceModel/Viewer/LoggerTest.php b/dev/tests/integration/testsuite/Magento/ReleaseNotification/Model/ResourceModel/Viewer/LoggerTest.php
new file mode 100644
index 0000000000000..930e7fe5317f8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ReleaseNotification/Model/ResourceModel/Viewer/LoggerTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ReleaseNotification\Model\ResourceModel\Viewer;
+
+use Magento\ReleaseNotification\Model\Viewer\Log;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoDbIsolation enabled
+ */
+class LoggerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Logger
+     */
+    private $logger;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->logger = $objectManager->get(Logger::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/User/_files/user_with_role.php
+     */
+    public function testLogAndGet()
+    {
+        $userModel = Bootstrap::getObjectManager()->get(\Magento\User\Model\User::class);
+        $adminUserNameFromFixture = 'adminUser';
+        $adminUserId = $userModel->loadByUsername($adminUserNameFromFixture)->getId();
+        $this->assertEmpty($this->logger->get($adminUserId)->getId());
+        $firstLogVersion = '2.2.2';
+        $this->logger->log($adminUserId, $firstLogVersion);
+        $firstLog = $this->logger->get($adminUserId);
+        $this->assertInstanceOf(Log::class, $firstLog);
+        $this->assertEquals($firstLogVersion, $firstLog->getLastViewVersion());
+        $this->assertEquals($adminUserId, $firstLog->getViewerId());
+
+        $secondLogVersion = '2.3.0';
+        $this->logger->log($adminUserId, $secondLogVersion);
+        $secondLog = $this->logger->get($adminUserId);
+        $this->assertInstanceOf(Log::class, $secondLog);
+        $this->assertEquals($secondLogVersion, $secondLog->getLastViewVersion());
+        $this->assertEquals($adminUserId, $secondLog->getViewerId());
+        $this->assertEquals($firstLog->getId(), $secondLog->getId());
+    }
+
+    /**
+     * @expectedException \Zend_Db_Statement_Exception
+     */
+    public function testLogNonExistUser()
+    {
+        $this->logger->log(200, '2.2.2');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ReleaseNotification/_files/validContent.php b/dev/tests/integration/testsuite/Magento/ReleaseNotification/_files/validContent.php
new file mode 100644
index 0000000000000..7d837ebce0cfb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ReleaseNotification/_files/validContent.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return '{
+    "pages": [
+      {
+        "id": 1,
+        "name": "1",
+        "mainContent": {
+          "title": "1-mainContent title",
+          "imageUrl": "1-mainContent imageUrl",
+          "content": [
+            {
+              "text": "1-mainContent content text1"
+            }
+          ],
+          "lists": []
+        },
+        "subHeading": [
+          {
+            "title": "1-subHeading title 1",
+            "imageUrl": "1-subHeading imageUrl1",
+            "content": "1-subHeading content1"
+          },
+          {
+            "title": "1-subHeading title 2",
+            "imageUrl": "1-subHeading imageUrl2",
+            "content": "1-subHeading content2"
+          },
+          {
+            "title": "1-subHeading title 3",
+            "imageUrl": "1-subHeading imageUrl3",
+            "content": "1-subHeading content3"
+          }
+        ],
+        "footer": {
+          "content": "1-subHeading footer content"
+        }
+      },
+      {
+        "id": 2,
+        "name": "2",
+        "mainContent": {
+          "title": "2-mainContent title",
+          "imageUrl": "2-mainContent imageUrl",
+          "content": [
+            {
+              "text": "2-mainContent content text1"
+            },
+            {
+              "text": "2-mainContent content text2"
+            },
+            {
+              "text": "2-mainContent content text3"
+            }
+          ],
+          "lists": []
+        },
+        "subHeading": [],
+        "footer": {
+          "content": ""
+        }
+      },
+      {
+        "id": 3,
+        "name": "3",
+        "mainContent": {
+          "title": "3-mainContent title",
+          "imageUrl": "3-mainContent imageUrl",
+          "content": [
+            {
+              "text": "3-mainContent content text1"
+            }
+          ],
+          "lists": [
+            {
+              "text": "3-mainContent list text1"
+            },
+            {
+              "text": "3-mainContent list text2"
+            },
+            {
+              "text": "3-mainContent list text3"
+            },
+            {
+              "text": "3-mainContent list text4"
+            }
+          ]
+        },
+        "subHeading": [],
+        "footer": {
+          "content": ""
+        }
+      },
+      {
+        "id": 4,
+        "name": "4",
+        "mainContent": {
+          "title": "4-mainContent title",
+          "imageUrl": "4-mainContent imageUrl",
+          "content": [
+            {
+              "text": "4-mainContent content text1"
+            }
+          ],
+          "lists": [
+            {
+              "text": "4-mainContent list text1"
+            },
+            {
+              "text": "4-mainContent list text2"
+            },
+            {
+              "text": "4-mainContent list text3"
+            },
+            {
+              "text": "4-mainContent list text4"
+            }
+          ]
+        },
+        "subHeading": [],
+        "footer": {
+          "content": ""
+        }
+      }
+    ]
+  }
+';
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
index bc9d0f895941b..7398d9c2392bd 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/GridTest.php
@@ -5,18 +5,84 @@
  */
 namespace Magento\Reports\Block\Adminhtml;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Reports\Model\ResourceModel\Product\Sold\Collection\Initial;
+
 /**
  * Test class for \Magento\Reports\Block\Adminhtml\Grid
  * @magentoAppArea adminhtml
  */
 class GridTest extends \PHPUnit\Framework\TestCase
 {
-    public function testGetDateFormat()
+    /**
+     * @var $block \Magento\Reports\Block\Adminhtml\Grid
+     */
+    private $block;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
     {
-        /** @var $block \Magento\Reports\Block\Adminhtml\Grid */
-        $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->block = Bootstrap::getObjectManager()->get(
             \Magento\Reports\Block\Adminhtml\Grid::class
         );
-        $this->assertNotEmpty($block->getDateFormat());
+    }
+
+    public function testGetDateFormat()
+    {
+        $this->assertNotEmpty($this->block->getDateFormat());
+    }
+
+    /**
+     *  Test apply filtering to collection
+     *
+     * @param string $from
+     * @param string $to
+     * @param string $period
+     * @param string $locale
+     * @param int $expected
+     * @dataProvider getSalesRepresentativeIdDataProvider
+     */
+    public function testGetPreparedCollection($from, $to, $period, $locale, $expected)
+    {
+        $encodedFilter = base64_encode('report_from='. $from . '&report_to=' . $to . '&report_period=' . $period);
+
+        $this->block->setVarNameFilter('filtername');
+        /** @var $request RequestInterface */
+        $request = Bootstrap::getObjectManager()->get(RequestInterface::class);
+        $request->setParams(['filtername' => $encodedFilter]);
+        $request->setParams(['locale' => $locale]);
+
+        /** @var $localeResolver ResolverInterface */
+        $localeResolver = Bootstrap::getObjectManager()->get(ResolverInterface::class);
+        $localeResolver->setLocale();
+
+        /** @var $initialCollection Initial */
+        $initialCollection = Bootstrap::getObjectManager()->create(
+            Initial::class
+        );
+        $this->block->setData(['dataSource' => $initialCollection]);
+
+        /** @var $collection Initial */
+        $collection = $this->block->getPreparedCollection();
+        $items = $collection->getItems();
+        $this->assertCount($expected, $items);
+    }
+
+    /**
+     * Data provider for testGetPreparedCollection method.
+     *
+     * @return array
+     */
+    public function getSalesRepresentativeIdDataProvider()
+    {
+        return [
+            'Data for US locale' =>             ['08/15/2018', '08/20/2018', 'day', 'en_US', 6],
+            'Data for Australian locale' =>     ['15/08/2018', '31/08/2018', 'day', 'en_AU', 17],
+            'Data for French locale' =>         ['20.08.2018', '30.08.2018', 'day', 'fr_FR', 11],
+        ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
index b8446839c8c99..0af32b32c7d48 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned;
 
 use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\View\LayoutInterface;
 
 /**
  * Test class for \Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid
@@ -20,12 +23,12 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac
     /**
      * @return void
      */
-    public function testGridContent()
+    public function testGridContent(): void
     {
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
         /** @var Grid $grid */
-        $grid = $layout->createBlock(\Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid::class);
+        $grid = $layout->createBlock(Grid::class);
         $grid->getRequest()->setParams(['filter' => base64_encode(urlencode('email=customer@example.com'))]);
         $result = $grid->getPreparedCollection();
 
@@ -35,4 +38,17 @@ public function testGridContent()
         $this->assertEquals('customer@example.com', $quote->getCustomerEmail());
         $this->assertEquals(10.00, $quote->getSubtotal());
     }
+
+    /**
+     * @return void
+     */
+    public function testPageSizeIsSetToNullWhenExportCsvFile(): void
+    {
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        /** @var Grid $grid */
+        $grid = $layout->createBlock(Grid::class);
+        $grid->getCsvFile();
+        $this->assertNull($grid->getCollection()->getPageSize());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php
new file mode 100644
index 0000000000000..49e980ed53602
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Review\Controller;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test review product controller behavior
+ *
+ * @magentoAppArea frontend
+ */
+class CaseCheckAddingProductReviewTest extends AbstractController
+{
+    /**
+     * Test adding a review for allowed guests with incomplete data by a not logged in user
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Review/_files/config.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testAttemptForGuestToAddReviewsWithIncompleteData()
+    {
+        $product = $this->getProduct();
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'nickname' => 'Test nick',
+            'title' => 'Summary',
+            'form_key' => $formKey->getFormKey(),
+        ];
+        $this->prepareRequestData($post);
+        $this->dispatch('review/product/post/id/' . $product->getId());
+        $this->assertSessionMessages(
+            $this->equalTo(['Please enter a review.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Test adding a review for not allowed guests by a guest
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Review/_files/disable_config.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testAttemptForGuestToAddReview()
+    {
+        $product = $this->getProduct();
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'nickname' => 'Test nick',
+            'title' => 'Summary',
+            'detail' => 'Test Details',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->prepareRequestData($post);
+        $this->dispatch('review/product/post/id/' . $product->getId());
+
+        $this->assertRedirect($this->stringContains('customer/account/login'));
+    }
+
+    /**
+     * Test successfully adding a product review by a guest
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Review/_files/config.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testSuccessfullyAddingProductReviewForGuest()
+    {
+        $product = $this->getProduct();
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'nickname' => 'Test nick',
+            'title' => 'Summary',
+            'detail' => 'Test Details',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->prepareRequestData($post);
+        $this->dispatch('review/product/post/id/' . $product->getId());
+
+        $this->assertSessionMessages(
+            $this->equalTo(['You submitted your review for moderation.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * @return ProductInterface
+     */
+    private function getProduct()
+    {
+        return $this->_objectManager->get(ProductRepositoryInterface::class)->get('custom-design-simple-product');
+    }
+
+    /**
+     * @param array $postData
+     * @return void
+     */
+    private function prepareRequestData($postData)
+    {
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($postData);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php
index c88bd5ed7cf77..7801cb2c78c24 100644
--- a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php
@@ -77,7 +77,8 @@ public function testRatingEdit()
      */
     public function testRatingSaveWithError()
     {
-        $this->expectException('Exception', 'Rolled back transaction has not been completed correctly');
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('Rolled back transaction has not been completed correctly');
         $rating = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Review\Model\Rating::class
         );
diff --git a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php
index a7f859b23dfa2..559c62e42dec3 100644
--- a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php
@@ -3,20 +3,88 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Review\Model\ResourceModel\Review\Product;
 
+/**
+ * Tests some functionality of the Product Review collection
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
+     * @param string $status
+     * @param int $expectedCount
+     * @param string $sortAttribute
+     * @param string $dir
+     * @param callable $assertion
+     * @dataProvider sortOrderAssertionsDataProvider
      * @magentoDataFixture Magento/Review/_files/different_reviews.php
      */
-    public function testGetResultingIds()
-    {
+    public function testGetResultingIds(
+        ?string $status,
+        int $expectedCount,
+        string $sortAttribute,
+        string $dir,
+        callable $assertion
+    ) {
+        /**
+         * @var $collection \Magento\Review\Model\ResourceModel\Review\Product\Collection
+         */
         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Review\Model\ResourceModel\Review\Product\Collection::class
         );
-        $collection->addStatusFilter(\Magento\Review\Model\Review::STATUS_APPROVED);
+        if ($status) {
+            $collection->addStatusFilter($status);
+        }
+        $collection->setOrder($sortAttribute, $dir);
         $actual = $collection->getResultingIds();
-        $this->assertCount(2, $actual);
+        $this->assertCount($expectedCount, $actual);
+        $assertion($actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function sortOrderAssertionsDataProvider() :array
+    {
+        return [
+            [
+                \Magento\Review\Model\Review::STATUS_APPROVED,
+                2,
+                'rt.review_id',
+                'DESC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[0], $actual[1]);
+                }
+            ],
+            [
+                \Magento\Review\Model\Review::STATUS_APPROVED,
+                2,
+                'rt.review_id',
+                'ASC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[1], $actual[0]);
+                }
+            ],
+            [
+                \Magento\Review\Model\Review::STATUS_APPROVED,
+                2,
+                'rt.created_at',
+                'ASC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[1], $actual[0]);
+                }
+            ],
+            [
+                null,
+                3,
+                'rt.review_id',
+                'ASC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[1], $actual[0]);
+                }
+            ]
+        ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Review/Observer/ProcessProductAfterDeleteEventObserverTest.php b/dev/tests/integration/testsuite/Magento/Review/Observer/ProcessProductAfterDeleteEventObserverTest.php
new file mode 100644
index 0000000000000..8c1fd8eca70f9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/Observer/ProcessProductAfterDeleteEventObserverTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Observer;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Review\Model\ResourceModel\Review\Collection as ReviewCollection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewCollectionFactory;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test checks that product review is removed when the corresponding product is removed
+ */
+class ProcessProductAfterDeleteEventObserverTest extends AbstractController
+{
+    /**
+     * @magentoDataFixture Magento/Review/_files/customer_review.php
+     */
+    public function testReviewIsRemovedWhenProductDeleted()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+
+        /** @var ReviewCollection $reviewsCollection */
+        $reviewsCollection = $objectManager->get(ReviewCollectionFactory::class)->create();
+        $reviewsCollection->addEntityFilter('product', $product->getId());
+
+        self::assertEquals(1, $reviewsCollection->count());
+
+        /* Remove product and ensure that the product review is removed as well */
+        $productRepository->delete($product);
+        $reviewsCollection->clear();
+
+        self::assertEquals(0, $reviewsCollection->count());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php b/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php
new file mode 100644
index 0000000000000..ee21150bd6129
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Value $config */
+use Magento\Framework\App\Config\Value;
+
+$config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Value::class);
+$config->setPath('catalog/review/allow_guest');
+$config->setScope('default');
+$config->setScopeId(0);
+$config->setValue(0);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php b/dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php
index c9640ceba87d2..4473d31047d4b 100644
--- a/dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php
@@ -7,60 +7,66 @@
 namespace Magento\Rule\Model\Condition\Sql;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\CatalogWidget\Model\RuleFactory;
+use Magento\CatalogWidget\Model\Rule\Condition\Combine as CombineCondition;
+use Magento\CatalogWidget\Model\Rule\Condition\Product as ProductCondition;
 
+/**
+ * Test for Magento\Rule\Model\Condition\Sql\Builder
+ */
 class BuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Rule\Model\Condition\Sql\Builder
+     * @var Builder
      */
     private $model;
 
     protected function setUp()
     {
-        $this->model = Bootstrap::getObjectManager()->create(\Magento\Rule\Model\Condition\Sql\Builder::class);
+        $this->model = Bootstrap::getObjectManager()->create(Builder::class);
     }
 
-    public function testAttachConditionToCollection()
+    /**
+     * @return void
+     */
+    public function testAttachConditionToCollection(): void
     {
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory */
-        $collectionFactory = Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
-        );
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+        /** @var ProductCollectionFactory $collectionFactory */
+        $collectionFactory = Bootstrap::getObjectManager()->create(ProductCollectionFactory::class);
         $collection = $collectionFactory->create();
 
-        /** @var \Magento\CatalogWidget\Model\RuleFactory $ruleFactory */
-        $ruleFactory = Bootstrap::getObjectManager()->create(\Magento\CatalogWidget\Model\RuleFactory::class);
-        /** @var \Magento\CatalogWidget\Model\Rule $rule */
+        /** @var RuleFactory $ruleFactory */
+        $ruleFactory = Bootstrap::getObjectManager()->create(RuleFactory::class);
         $rule = $ruleFactory->create();
 
         $ruleConditionArray = [
             'conditions' => [
                 '1' => [
-                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Combine::class,
+                    'type' => CombineCondition::class,
                     'aggregator' => 'all',
                     'value' => '1',
-                    'new_child' => ''
+                    'new_child' => '',
                 ],
                 '1--1' => [
-                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+                    'type' => ProductCondition::class,
                     'attribute' => 'category_ids',
                     'operator' => '==',
-                    'value' => '3'
+                    'value' => '3',
                 ],
                 '1--2' => [
-                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+                    'type' => ProductCondition::class,
                     'attribute' => 'special_to_date',
                     'operator' => '==',
-                    'value' => '2017-09-15'
+                    'value' => '2017-09-15',
                 ],
-            ]
+            ],
         ];
 
         $rule->loadPost($ruleConditionArray);
         $this->model->attachConditionToCollection($collection, $rule->getConditions());
 
-        $whereString = 'WHERE (category_id IN (\'3\')))) AND(IFNULL(`e`.`entity_id`, 0) = \'2017-09-15\') ))';
-        $this->assertNotFalse(strpos($collection->getSelectSql(true), $whereString));
+        $whereString = "/\(category_id IN \('3'\).+\(IFNULL\(`e`\.`entity_id`,.+\) = '2017-09-15'\)/";
+        $this->assertNotFalse(preg_match($whereString, $collection->getSelectSql(true)));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
new file mode 100644
index 0000000000000..cb6f4aaac07d3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Api;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for Magento\Sales\Api\OrderCustomerDelegateInterface class.
+ *
+ * @magentoAppIsolation enabled
+ */
+class OrderCustomerDelegateInterfaceTest extends TestCase
+{
+    /**
+     * @var OrderCustomerDelegateInterface
+     */
+    private $delegate;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->delegate = Bootstrap::getObjectManager()->get(
+            OrderCustomerDelegateInterface::class
+        );
+        $this->orderRepository = Bootstrap::getObjectManager()->get(
+            OrderRepositoryInterface::class
+        );
+        $this->customerFactory = Bootstrap::getObjectManager()->get(
+            CustomerInterfaceFactory::class
+        );
+        $this->accountManagement = Bootstrap::getObjectManager()->get(
+            AccountManagementInterface::class
+        );
+        $this->orderFactory = Bootstrap::getObjectManager()->get(
+            OrderFactory::class
+        );
+    }
+
+    /**
+     * @param OrderAddressInterface $orderAddress
+     * @param AddressInterface $address
+     *
+     * @return void
+     */
+    private function compareAddresses(
+        OrderAddressInterface $orderAddress,
+        AddressInterface $address
+    ): void {
+        $this->assertEquals(
+            $orderAddress->getFirstname(),
+            $address->getFirstname()
+        );
+        $this->assertEquals(
+            $orderAddress->getLastname(),
+            $address->getLastname()
+        );
+        $this->assertEquals(
+            $orderAddress->getCompany(),
+            $address->getCompany()
+        );
+        $this->assertEquals(
+            $orderAddress->getStreet(),
+            $address->getStreet()
+        );
+        $this->assertEquals(
+            $orderAddress->getCity(),
+            $address->getCity()
+        );
+        if (!$address->getRegionId()) {
+            $this->assertEmpty($address->getRegionId());
+        } else {
+            $this->assertEquals(
+                $orderAddress->getRegionId(),
+                $address->getRegionId()
+            );
+        }
+        $this->assertEquals(
+            $orderAddress->getPostcode(),
+            $address->getPostcode()
+        );
+        $this->assertEquals(
+            $orderAddress->getCountryId(),
+            $address->getCountryId()
+        );
+        $this->assertEquals(
+            $orderAddress->getTelephone(),
+            $address->getTelephone()
+        );
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @return void
+     */
+    public function testDelegateNew(): void
+    {
+        $orderAutoincrementId = '100000001';
+        /** @var Order $orderModel */
+        $orderModel = $this->orderFactory->create();
+        $orderModel->loadByIncrementId($orderAutoincrementId);
+        $orderId = (int)$orderModel->getId();
+        unset($orderModel);
+
+        $this->delegate->delegateNew($orderId);
+
+        //Saving new customer with prepared data from order.
+        /** @var CustomerInterface $customer */
+        $customer = $this->customerFactory->create();
+        $customer->setWebsiteId(1)
+            ->setEmail('customer_order_delegate@example.com')
+            ->setGroupId(1)
+            ->setStoreId(1)
+            ->setPrefix('Mr.')
+            ->setFirstname('John')
+            ->setMiddlename('A')
+            ->setLastname('Smith')
+            ->setSuffix('Esq.')
+            ->setTaxvat('12')
+            ->setGender(0);
+        $createdCustomer = $this->accountManagement->createAccount(
+            $customer,
+            '12345abcD'
+        );
+
+        //Testing that addresses from order and the order itself are assigned
+        //to customer.
+        $order = $this->orderRepository->get($orderId);
+        $this->assertCount(1, $createdCustomer->getAddresses());
+        $this->assertNotNull($createdCustomer->getDefaultBilling());
+        $this->assertNotNull($createdCustomer->getDefaultShipping());
+        foreach ($createdCustomer->getAddresses() as $address) {
+            $this->assertTrue(
+                $address->isDefaultBilling() || $address->isDefaultShipping()
+            );
+            if ($address->isDefaultBilling()) {
+                $this->compareAddresses($order->getBillingAddress(), $address);
+            } elseif ($address->isDefaultShipping()) {
+                $this->compareAddresses($order->getShippingAddress(), $address);
+            }
+        }
+        $this->assertEquals($order->getCustomerId(), $createdCustomer->getId());
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/order_different_addresses.php
+     * @return void
+     */
+    public function testDelegateNewDifferentAddresses(): void
+    {
+        $orderAutoincrementId = '100000001';
+        /** @var Order $orderModel */
+        $orderModel = $this->orderFactory->create();
+        $orderModel->loadByIncrementId($orderAutoincrementId);
+        $orderId = (int)$orderModel->getId();
+        unset($orderModel);
+
+        $this->delegate->delegateNew($orderId);
+
+        //Saving new customer with prepared data from order.
+        /** @var CustomerInterface $customer */
+        $customer = $this->customerFactory->create();
+        $customer->setWebsiteId(1)
+            ->setEmail('customer_order_delegate@example.com')
+            ->setGroupId(1)
+            ->setStoreId(1)
+            ->setPrefix('Mr.')
+            ->setFirstname('John')
+            ->setMiddlename('A')
+            ->setLastname('Smith')
+            ->setSuffix('Esq.')
+            ->setTaxvat('12')
+            ->setGender(0);
+        $createdCustomer = $this->accountManagement->createAccount(
+            $customer,
+            '12345abcD'
+        );
+
+        //Testing that addresses from order and the order itself are assigned
+        //to customer.
+        $order = $this->orderRepository->get($orderId);
+        $this->assertCount(2, $createdCustomer->getAddresses());
+        $this->assertNotNull($createdCustomer->getDefaultBilling());
+        $this->assertNotNull($createdCustomer->getDefaultShipping());
+        foreach ($createdCustomer->getAddresses() as $address) {
+            $this->assertTrue(
+                $address->isDefaultBilling() || $address->isDefaultShipping()
+            );
+            if ($address->isDefaultBilling()) {
+                $this->compareAddresses($order->getBillingAddress(), $address);
+            } elseif ($address->isDefaultShipping()) {
+                $this->compareAddresses($order->getShippingAddress(), $address);
+            }
+        }
+
+        $this->assertEquals($order->getCustomerId(), $createdCustomer->getId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/Column/NameTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/Column/NameTest.php
new file mode 100644
index 0000000000000..26bdbf3a6cfde
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/Column/NameTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Items\Column;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class NameTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Name
+     */
+    private $block;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var $layout \Magento\Framework\View\Layout */
+        $layout = $objectManager->create(\Magento\Framework\View\LayoutInterface::class);
+        /** @var $block \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+        $this->block = $layout->createBlock(Name::class, 'block');
+    }
+
+    public function testTruncateString() : void
+    {
+        $remainder = '';
+        $this->assertEquals(
+            '12345',
+            $this->block->truncateString('1234567890', 5, '', $remainder)
+        );
+    }
+
+    public function testGetFormattedOptiong() : void
+    {
+        $this->assertEquals(
+            [
+                'value' => '1234567890123456789012345678901234567890123456789012345',
+                'remainder' => '67890',
+            ],
+            $this->block->getFormattedOption(
+                '123456789012345678901234567890123456789012345678901234567890'
+            )
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/FormTest.php
index ff49cd2db7374..b7c280220c7d9 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/FormTest.php
@@ -47,9 +47,5 @@ public function testContentUpdated()
 
         $html = $block->toHtml();
         $this->assertContains('mage.apply()', $html);
-        $this->assertContains(
-            "order.setPaymentMethod('" . $block->escapeHtml($block->getSelectedMethodCode()) . "')",
-            $html
-        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
index 6b4e9a66f4c6b..999522a49e006 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
@@ -5,39 +5,50 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoAppArea adminhtml
  */
 class AccountTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account */
-    protected $_accountBlock;
+    /** @var Account */
+    private $accountBlock;
 
     /**
-     * @var \Magento\TestFramework\Helper\Bootstrap
+     * @var Bootstrap
      */
-    protected $_objectManager;
+    private $objectManager;
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      */
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class)->load(1);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $quote = $this->objectManager->create(Quote::class)->load(1);
         $sessionQuoteMock = $this->getMockBuilder(
-            \Magento\Backend\Model\Session\Quote::class
+            SessionQuote::class
         )->disableOriginalConstructor()->setMethods(
             ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
         )->getMock();
         $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
         $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
-        $this->_accountBlock = $layout->createBlock(
-            \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account::class,
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $this->accountBlock = $layout->createBlock(
+            Account::class,
             'address_block' . rand(),
             ['sessionQuote' => $sessionQuoteMock]
         );
@@ -50,7 +61,7 @@ protected function setUp()
     public function testGetForm()
     {
         $expectedFields = ['group_id', 'email'];
-        $form = $this->_accountBlock->getForm();
+        $form = $this->accountBlock->getForm();
         $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
         $fieldset = $form->getElements()[0];
 
@@ -63,4 +74,56 @@ public function testGetForm()
             );
         }
     }
+
+    /**
+     * Tests a case when user defined custom attribute has default value.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGetFormWithUserDefinedAttribute()
+    {
+        $formFactory = $this->getFormFactoryMock();
+        $this->objectManager->addSharedInstance($formFactory, FormFactory::class);
+
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $accountBlock = $layout->createBlock(Account::class, 'address_block' . rand());
+
+        $form = $accountBlock->getForm();
+        $form->setUseContainer(true);
+
+        $this->assertContains(
+            '<option value="1" selected="selected">Yes</option>',
+            $form->toHtml(),
+            'Default value for user defined custom attribute should be selected'
+        );
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
+    {
+        /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
+        $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
+        $booleanAttribute = $attributeMetadataFactory->create()
+            ->setAttributeCode('boolean')
+            ->setBackendType('boolean')
+            ->setFrontendInput('boolean')
+            ->setDefaultValue('1')
+            ->setFrontendLabel('Yes/No');
+
+        $form = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $form->method('getUserAttributes')->willReturn([$booleanAttribute]);
+        $form->method('getSystemAttributes')->willReturn([]);
+
+        $formFactory = $this->getMockBuilder(FormFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $formFactory->method('create')->willReturn($form);
+
+        return $formFactory;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
index 18b54e77124bf..f5a22ec19ccf3 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
@@ -3,159 +3,167 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Directory\Model\ResourceModel\Country\Collection;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 /**
- * Test class for \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
- *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea adminhtml
  */
 class AddressTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\ObjectManagerInterface */
-    protected $_objectManager;
-
-    /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address */
-    protected $_addressBlock;
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Api\AddressRepositoryInterface */
-    protected $addressRepository;
+    /**
+     * @var Address
+     */
+    private $block;
 
     /**
-     * @return int
+     * @var QuoteSession|MockObject
      */
-    private function getNumberOfCountryOptions()
-    {
-        /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $countryCollection */
-        $countryCollection = $this->_objectManager->create(
-            \Magento\Directory\Model\ResourceModel\Country\Collection::class
-        );
-        return count($countryCollection->toOptionArray());
-    }
+    private $quoteSession;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->addressRepository = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\AddressRepositoryInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getList']
-        );
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
-        $sessionQuoteMock = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class)
-            ->disableOriginalConstructor()->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote'])
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->quoteSession = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote'])
             ->getMock();
-        $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
 
-        $this->_addressBlock = $layout->createBlock(
-            \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address::class,
-            'address_block' . rand(),
-            ['addressService' => $this->addressRepository, 'sessionQuote' => $sessionQuoteMock]
+        $this->block = $this->objectManager->create(
+            Address::class,
+            ['sessionQuote' => $this->quoteSession]
         );
-        parent::setUp();
     }
 
+    /**
+     * Checks address collection.
+     *
+     * @magentoDataFixture Magento/Customer/Fixtures/customer_2_addresses.php
+     */
     public function testGetAddressCollection()
     {
-        $addressData = $this->_getAddresses();
-        $searchResult = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressSearchResultsInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getItems']
-        );
-        $searchResult->expects($this->any())
-            ->method('getItems')
-            ->will($this->returnValue($addressData));
-        $this->addressRepository->expects($this->any())
-            ->method('getList')
-            ->will($this->returnValue($searchResult));
-        $this->assertEquals($addressData, $this->_addressBlock->getAddressCollection());
+        $website = $this->getWebsite('base');
+        $customer = $this->getCustomer('customer@example.com', (int)$website->getId());
+        $addresses = $customer->getAddresses();
+        $this->quoteSession->method('getCustomerId')
+            ->willReturn($customer->getId());
+
+        $actual = $this->block->getAddressCollection();
+        self::assertNotEmpty($actual);
+        self::assertEquals($addresses, $actual);
     }
 
+    /**
+     * Checks address collection output encoded to json.
+     *
+     * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
+     */
     public function testGetAddressCollectionJson()
     {
-        $addressData = $this->_getAddresses();
-        $searchResult = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressSearchResultsInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getItems']
-        );
-        $searchResult->expects($this->any())
-            ->method('getItems')
-            ->will($this->returnValue($addressData));
-        $this->addressRepository->expects($this->any())
-            ->method('getList')
-            ->will($this->returnValue($searchResult));
-        $expectedOutput = '[
-            {
-                "firstname": false,
-                "lastname": false,
-                "company": false,
-                "street": "",
-                "city": false,
-                "country_id": "US",
-                "region": false,
-                "region_id": false,
-                "postcode": false,
-                "telephone": false,
-                "vat_id": false
-            },
-            {
-                "firstname": "FirstName1",
-                "lastname": "LastName1",
-                "company": false,
-                "street": "Street1",
-                "city": false,
-                "country_id": false,
-                "region": false,
-                "region_id": false,
-                "postcode": false,
-                "telephone": false,
-                "vat_id": false
-            },
-            {
-                "firstname": "FirstName2",
-                "lastname": "LastName2",
-                "company": false,
-                "street": "Street2",
-                "city": false,
-                "country_id": false,
-                "region": false,
-                "region_id": false,
-                "postcode": false,
-                "telephone": false,
-                "vat_id": false
-            }
-        ]';
-        $expectedOutput = str_replace(['    ', "\n", "\r"], '', $expectedOutput);
-        $expectedOutput = str_replace(': ', ':', $expectedOutput);
-
-        $this->assertEquals($expectedOutput, $this->_addressBlock->getAddressCollectionJson());
+        $website = $this->getWebsite('test');
+        $customer = $this->getCustomer('customer.web@example.com', (int)$website->getId());
+
+        $store = $this->getStore('fixture_second_store');
+        $this->quoteSession->method('getStore')
+            ->willReturn($store);
+        $this->quoteSession->method('getCustomerId')
+            ->willReturn($customer->getId());
+        $addresses = $customer->getAddresses();
+        $expected = [
+            0 => [
+                'firstname' => false,
+                'lastname' => false,
+                'company' => false,
+                'street' => '',
+                'city' => false,
+                'country_id' => 'US',
+                'region' => false,
+                'region_id' => false,
+                'postcode' => false,
+                'telephone' => false,
+                'vat_id' => false,
+            ],
+            $addresses[0]->getId() => [
+                'firstname' => 'John',
+                'lastname' => 'Smith',
+                'company' => false,
+                'street' => 'Green str, 67',
+                'city' => 'Culver City',
+                'country_id' => 'US',
+                'region' => 'California',
+                'region_id' => 12,
+                'postcode' => '90230',
+                'telephone' => '3468676',
+                'vat_id' => false,
+            ],
+            $addresses[1]->getId() => [
+                'telephone' => '845454465',
+                'postcode' => '10178',
+                'country_id' => 'DE',
+                'city' => 'Berlin',
+                'street' => 'Tunnel Alexanderpl',
+                'firstname' => 'John',
+                'lastname' => 'Smith',
+                'company' => false,
+                'region' => false,
+                'region_id' => 0,
+                'vat_id' => false,
+            ]
+        ];
+
+        $actual = json_decode($this->block->getAddressCollectionJson(), true);
+        self::assertEquals($expected, $actual);
     }
 
+    /**
+     * Checks one line address formatting
+     */
     public function testGetAddressAsString()
     {
-        $address = $this->_getAddresses()[0];
-        $expectedResult = "FirstName1 LastName1, Street1, ,  , ";
-        $this->assertEquals($expectedResult, $this->_addressBlock->getAddressAsString($address));
+        $data = [
+            'firstname' => 'John',
+            'lastname' => 'Smith',
+            'company' => 'Test Company',
+            'street' => 'Green str, 67',
+            'city' => 'Culver City',
+            'country_id' => 'US',
+            'region' => 'California',
+            'region_id' => 12,
+            'postcode' => '90230',
+            'telephone' => '3468676',
+        ];
+        $address = $this->objectManager->create(AddressInterface::class, ['data' => $data]);
+        $expected = 'John Smith, Green str, 67, Culver City, California 90230, United States';
+        self::assertEquals($expected, $this->block->getAddressAsString($address));
     }
 
-    /**
-     * Test \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address::_prepareForm() indirectly.
-     */
     public function testGetForm()
     {
         $expectedFields = [
@@ -175,18 +183,21 @@ public function testGetForm()
             'fax',
             'vat_id',
         ];
-        $form = $this->_addressBlock->getForm();
-        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
-        /** @var \Magento\Framework\Data\Form\Element\Fieldset $fieldset */
+
+        $form = $this->block->getForm();
+        self::assertEquals(1, $form->getElements()->count(), 'Form has invalid number of fieldsets');
+
+        /** @var Fieldset $fieldset */
         $fieldset = $form->getElements()[0];
-        $this->assertEquals(
+        self::assertEquals(
             count($expectedFields),
             $fieldset->getElements()->count(),
-            "Form has invalid number of fields"
+            'Form has invalid number of fields'
         );
-        /** @var \Magento\Framework\Data\Form\Element\AbstractElement $element */
+
+        /** @var AbstractElement $element */
         foreach ($fieldset->getElements() as $element) {
-            $this->assertTrue(
+            self::assertTrue(
                 in_array($element->getId(), $expectedFields),
                 sprintf('Unexpected field "%s" in form.', $element->getId())
             );
@@ -194,32 +205,61 @@ public function testGetForm()
 
         /** @var \Magento\Framework\Data\Form\Element\Select $countryIdField */
         $countryIdField = $fieldset->getElements()->searchById('country_id');
-        $this->assertEquals(
-            $this->getNumberOfCountryOptions(),
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                '//option',
-                $countryIdField->getElementHtml()
-            )
-        );
+        $actual = Xpath::getElementsCountForXpath('//option', $countryIdField->getElementHtml());
+        self::assertEquals($this->getNumberOfCountryOptions(), $actual);
+    }
+
+    /**
+     * Gets customer entity.
+     *
+     * @param string $email
+     * @param int $websiteId
+     * @return CustomerInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getCustomer(string $email, int $websiteId): CustomerInterface
+    {
+        /** @var CustomerRepositoryInterface $repository */
+        $repository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        return $repository->get($email, $websiteId);
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\AddressInterface[]
+     * Gets website by code.
+     *
+     * @param string $code
+     * @return WebsiteInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function _getAddresses()
+    private function getWebsite(string $code): WebsiteInterface
     {
-        /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory */
-        $addressFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
-        $addressData[] = $addressFactory->create()
-            ->setId(1)
-            ->setStreet(['Street1'])
-            ->setFirstname('FirstName1')
-            ->setLastname('LastName1');
-        $addressData[] = $addressFactory->create()
-            ->setId(2)
-            ->setStreet(['Street2'])
-            ->setFirstname('FirstName2')
-            ->setLastname('LastName2');
-        return $addressData;
+        /** @var WebsiteRepositoryInterface $repository */
+        $repository = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        return $repository->get($code);
+    }
+
+    /**
+     * Gets store by code.
+     *
+     * @param string $code
+     * @return StoreInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getStore(string $code): StoreInterface
+    {
+        /** @var StoreRepositoryInterface $repository */
+        $repository = $this->objectManager->get(StoreRepositoryInterface::class);
+        return $repository->get($code);
+    }
+
+    /**
+     * @return int
+     */
+    private function getNumberOfCountryOptions()
+    {
+        /** @var Collection $countryCollection */
+        $countryCollection = $this->objectManager->create(Collection::class);
+        return count($countryCollection->toOptionArray());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php
index b6df7eb05c03d..abdbab2c24d16 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php
@@ -1,151 +1,201 @@
 <?php
 /**
- * Test class for \Magento\Sales\Block\Adminhtml\Order\Create\Form
+ * Test class for Form
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create;
 
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FormTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form */
-    protected $_orderCreateBlock;
+    /**
+     * @var Form
+     */
+    private $block;
 
-    /** @var \Magento\Framework\ObjectManagerInterface */
-    protected $_objectManager;
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @var QuoteSession|MockObject
      */
+    private $session;
+
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $sessionMock = $this->getMockBuilder(
-            \Magento\Backend\Model\Session\Quote::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getCustomerId', 'getQuote', 'getStoreId', 'getStore']
-        )->getMock();
-        $sessionMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
-
-        $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class)->load(1);
-        $sessionMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
-
-        $sessionMock->expects($this->any())->method('getStoreId')->will($this->returnValue(1));
-
-        $storeMock = $this->getMockBuilder(
-            \Magento\Store\Model\Store::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getCurrentCurrencyCode']
-        )->getMock();
-        $storeMock->expects($this->any())->method('getCurrentCurrencyCode')->will($this->returnValue('USD'));
-        $sessionMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
-
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
-        $this->_orderCreateBlock = $layout->createBlock(
-            \Magento\Sales\Block\Adminhtml\Order\Create\Form::class,
-            'order_create_block' . rand(),
-            ['sessionQuote' => $sessionMock]
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->session = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getQuote', 'getStoreId', 'getStore', 'getQuoteId'])
+            ->getMock();
+        $this->session->method('getCustomerId')
+            ->willReturn(1);
+
+        $this->session->method('getStoreId')
+            ->willReturn(1);
+
+        $store = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCurrentCurrencyCode'])
+            ->getMock();
+        $store->method('getCurrentCurrencyCode')
+            ->willReturn('USD');
+        $this->session->method('getStore')
+            ->willReturn($store);
+
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $this->block = $layout->createBlock(
+            Form::class,
+            'order_create_block' . mt_rand(),
+            ['sessionQuote' => $this->session]
         );
         parent::setUp();
     }
 
     /**
+     * Checks if all needed order's data is correctly returned to the form.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
      */
     public function testOrderDataJson()
     {
-        /** @var array $addressIds */
-        $addressIds = $this->setUpMockAddress();
-        $orderDataJson = $this->_orderCreateBlock->getOrderDataJson();
-        $expectedOrderDataJson = <<<ORDER_DATA_JSON
-        {
-            "customer_id":1,
-            "addresses":
-                {"{$addressIds[0]}":
-                    {"firstname":"John","lastname":"Smith","company":false,"street":"Green str, 67","city":"CityM",
-                        "country_id":"US",
-                        "region":"Alabama","region_id":1,
-                        "postcode":"75477","telephone":"3468676","vat_id":false},
-                 "{$addressIds[1]}":
-                    {"firstname":"John","lastname":"Smith","company":false,"street":"Black str, 48","city":"CityX",
-                        "country_id":"US",
-                        "region":"Alabama","region_id":1,
-                        "postcode":"47676","telephone":"3234676","vat_id":false}
-                 },
-             "store_id":1,"currency_symbol":"$","shipping_method_reseted":true,"payment_method":null
-         }
-ORDER_DATA_JSON;
-
-        $this->assertEquals(json_decode($expectedOrderDataJson), json_decode($orderDataJson));
+        $customerId = 1;
+        $quote = $this->getQuote('test01');
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getQuoteId')
+            ->willReturn($quote->getId());
+        $addressData = $this->getAddressData();
+        $addressIds = $this->setUpMockAddress($customerId, $addressData);
+        $expected = [
+            'customer_id' => $customerId,
+            'addresses' => [
+                $addressIds[0] => $addressData[0],
+                $addressIds[1] => $addressData[1]
+            ],
+            'store_id' => 1,
+            'currency_symbol' => '$',
+            'shipping_method_reseted' => true,
+            'payment_method' => 'checkmo',
+            'quote_id' => $quote->getId()
+        ];
+
+        self::assertEquals($expected, json_decode($this->block->getOrderDataJson(), true));
     }
 
-    private function setUpMockAddress()
+    /**
+     * Saves customer's addresses.
+     *
+     * @param int $customerId
+     * @param array $addressData
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function setUpMockAddress(int $customerId, array $addressData)
     {
-        /** @var \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory */
-        $regionFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\RegionInterfaceFactory::class);
-
-        /** @var \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory */
-        $addressFactory = $this->_objectManager->create(\Magento\Customer\Api\Data\AddressInterfaceFactory::class);
-        /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
-        $addressRepository = $this->_objectManager->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
-
-        $addressData1 = $addressFactory->create()->setCountryId(
-            'US'
-        )->setCustomerId(
-            1
-        )->setIsDefaultBilling(
-            true
-        )->setIsDefaultShipping(
-            true
-        )->setPostcode(
-            '75477'
-        )->setRegion(
-            $regionFactory->create()->setRegionCode('AL')->setRegion('Alabama')->setRegionId(1)
-        )->setStreet(
-            ['Green str, 67']
-        )->setTelephone(
-            '3468676'
-        )->setCity(
-            'CityM'
-        )->setFirstname(
-            'John'
-        )->setLastname(
-            'Smith'
-        );
-
-        $addressData2 = $addressFactory->create()->setCountryId(
-            'US'
-        )->setCustomerId(
-            1
-        )->setIsDefaultBilling(
-            false
-        )->setIsDefaultShipping(
-            false
-        )->setPostcode(
-            '47676'
-        )->setRegion(
-            $regionFactory->create()->setRegionCode('AL')->setRegion('Alabama')->setRegionId(1)
-        )->setStreet(
-            ['Black str, 48']
-        )->setCity(
-            'CityX'
-        )->setTelephone(
-            '3234676'
-        )->setFirstname(
-            'John'
-        )->setLastname(
-            'Smith'
-        );
+        /** @var RegionInterfaceFactory $regionFactory */
+        $regionFactory = $this->objectManager->create(RegionInterfaceFactory::class);
+        /** @var AddressInterfaceFactory $addressFactory */
+        $addressFactory = $this->objectManager->create(AddressInterfaceFactory::class);
+        /** @var AddressRepositoryInterface $addressRepository */
+        $addressRepository = $this->objectManager->create(AddressRepositoryInterface::class);
+        $region = $regionFactory->create()
+            ->setRegionCode('AL')
+            ->setRegion('Alabama')
+            ->setRegionId(1);
+
+        $ids = [];
+        foreach ($addressData as $data) {
+            $address = $addressFactory->create(['data' => $data]);
+            $address->setRegion($region)
+                ->setCustomerId($customerId)
+                ->setIsDefaultBilling(true)
+                ->setIsDefaultShipping(true);
+            $address = $addressRepository->save($address);
+            $ids[] = $address->getId();
+        }
+
+        return $ids;
+    }
 
-        $savedAddress1 = $addressRepository->save($addressData1);
-        $savedAddress2 = $addressRepository->save($addressData2);
+    /**
+     * Gets test address data.
+     *
+     * @return array
+     */
+    private function getAddressData(): array
+    {
+        return [
+            [
+                'firstname' => 'John',
+                'lastname' => 'Smith',
+                'company' => false,
+                'street' => 'Green str, 67',
+                'city' => 'CityM',
+                'country_id' => 'US',
+                'region' => 'Alabama',
+                'region_id' => 1,
+                'postcode' => '75477',
+                'telephone' => '3468676',
+                'vat_id' => false
+            ],
+            [
+                'firstname' => 'John',
+                'lastname' => 'Smith',
+                'company' => false,
+                'street' => 'Black str, 48',
+                'city' => 'CityX',
+                'country_id' => 'US',
+                'region' => 'Alabama',
+                'region_id' => 1,
+                'postcode' => '47676',
+                'telephone' => '3234676',
+                'vat_id' => false,
+            ]
+        ];
+    }
 
-        return [$savedAddress1->getId(), $savedAddress2->getId()];
+    /**
+     * Gets quote by ID.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+        /** @var CartRepositoryInterface $repository */
+        $repository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php
deleted file mode 100644
index 020c9f51bb10f..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class AddCommentTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::comment';
-        $this->uri = 'backend/sales/order/addcomment';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
deleted file mode 100644
index 9cdd84a5971f3..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class AddressSaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::actions_edit';
-        $this->uri = 'backend/sales/order/addresssave';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
deleted file mode 100644
index 73e46b513287f..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class AddressTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::actions_edit';
-        $this->uri = 'backend/sales/order/address';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php
deleted file mode 100644
index c24191fe5e45e..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class CancelTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::cancel';
-        $this->uri = 'backend/sales/order/cancel';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
new file mode 100644
index 0000000000000..e2638b5df1f88
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Controller\Adminhtml\Order\Create;
+
+use Magento\Backend\Model\Session\Quote;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Model\Service\OrderService;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class SaveTest extends AbstractBackendController
+{
+    /**
+     * Checks a case when order creation is failed on payment method processing but new customer already created
+     * in the database and after new controller dispatching the customer should be already loaded in session
+     * to prevent invalid validation.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Sales/_files/quote_with_new_customer.php
+     */
+    public function testExecuteWithPaymentOperation()
+    {
+        $quote = $this->getQuote('2000000001');
+        $session = $this->_objectManager->get(Quote::class);
+        $session->setQuoteId($quote->getId());
+        $session->setCustomerId(0);
+
+        $email = 'john.doe001@test.com';
+        $data = [
+            'account' => [
+                'email' => $email
+            ]
+        ];
+        $this->getRequest()->setMethod(Http::METHOD_POST);
+        $this->getRequest()->setPostValue(['order' => $data]);
+
+        /** @var OrderService|MockObject $orderService */
+        $orderService = $this->getMockBuilder(OrderService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $orderService->method('place')
+            ->willThrowException(new LocalizedException(__('Transaction has been declined.')));
+        $this->_objectManager->addSharedInstance($orderService, OrderService::class);
+
+        $this->dispatch('backend/sales/order_create/save');
+        $this->assertSessionMessages(
+            self::equalTo(['Transaction has been declined.']),
+            MessageInterface::TYPE_ERROR
+        );
+
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->_objectManager->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($email);
+
+        self::assertNotEmpty($session->getCustomerId());
+        self::assertEquals($customer->getId(), $session->getCustomerId());
+
+        $this->_objectManager->removeSharedInstance(OrderService::class);
+    }
+
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return \Magento\Quote\Api\Data\CartInterface
+     */
+    private function getQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+        return array_pop($items);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
index 5f3dbdabc640a..a07616474a410 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
@@ -5,9 +5,27 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
 class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -16,6 +34,11 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
      */
     protected $productRepository;
 
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -23,8 +46,12 @@ protected function setUp()
             ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
     }
 
+    /**
+     * Test LoadBlock being dispatched.
+     */
     public function testLoadBlockAction()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', ',');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -42,6 +69,7 @@ public function testLoadBlockActionData()
         )->addProducts(
             [$product->getId() => ['qty' => 1]]
         );
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', 'data');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -53,10 +81,65 @@ public function testLoadBlockActionData()
     }
 
     /**
+     * Tests that shipping method 'Table rates' shows rates according to selected website.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Quote/Fixtures/quote_sec_website.php
+     * @magentoDataFixture Magento/OfflineShipping/_files/tablerates_second_website.php
+     * @magentoDbIsolation disabled
+     */
+    public function testLoadBlockShippingMethod()
+    {
+        $store = $this->getStore('fixture_second_store');
+
+        /** @var MutableScopeConfigInterface $mutableScopeConfig */
+        $mutableScopeConfig = $this->_objectManager->get(MutableScopeConfigInterface::class);
+        $mutableScopeConfig->setValue(
+            'carriers/tablerate/active',
+            1,
+            ScopeInterface::SCOPE_STORE,
+            $store->getCode()
+        );
+        $mutableScopeConfig->setValue(
+            'carriers/tablerate/condition_name',
+            'package_qty',
+            ScopeInterface::SCOPE_STORE,
+            $store->getCode()
+        );
+
+        $website = $this->getWebsite('test');
+        $customer = $this->getCustomer('customer.web@example.com', (int)$website->getId());
+        $quote = $this->getQuoteById('0000032134');
+        $session = $this->_objectManager->get(SessionQuote::class);
+        $session->setQuoteId($quote->getId());
+
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(
+            [
+                'customer_id' => $customer->getId(),
+                'collect_shipping_rates' => 1,
+                'store_id' => $store->getId(),
+                'json' => true
+            ]
+        );
+        $this->dispatch('backend/sales/order_create/loadBlock/block/shipping_method');
+        $body = $this->getResponse()->getBody();
+        $expectedTableRatePrice = '<span class=\"price\">$20.00<\/span>';
+
+        $this->assertContains($expectedTableRatePrice, $body, '');
+    }
+
+    /**
+     * Tests LoadBlock actions.
+     *
+     * @param string $block Block name.
+     * @param string $expected Contains HTML.
+     *
      * @dataProvider loadBlockActionsDataProvider
      */
     public function testLoadBlockActions($block, $expected)
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', $block);
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -64,6 +147,9 @@ public function testLoadBlockActions($block, $expected)
         $this->assertContains($expected, $html);
     }
 
+    /**
+     * @return array
+     */
     public function loadBlockActionsDataProvider()
     {
         return [
@@ -76,6 +162,8 @@ public function loadBlockActionsDataProvider()
     }
 
     /**
+     * Tests action items.
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testLoadBlockActionItems()
@@ -86,6 +174,7 @@ public function testLoadBlockActionItems()
         )->addProducts(
             [$product->getId() => ['qty' => 1]]
         );
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', 'items');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -149,6 +238,8 @@ public function testIndexAction()
     }
 
     /**
+     * Tests ACL.
+     *
      * @param string $actionName
      * @param boolean $reordered
      * @param string $expectedResult
@@ -158,7 +249,7 @@ public function testIndexAction()
      */
     public function testGetAclResource($actionName, $reordered, $expectedResult)
     {
-        $this->_objectManager->get(\Magento\Backend\Model\Session\Quote::class)->setReordered($reordered);
+        $this->_objectManager->get(SessionQuote::class)->setReordered($reordered);
         $orderController = $this->_objectManager->get(
             \Magento\Sales\Controller\Adminhtml\Order\Stub\OrderCreateStub::class
         );
@@ -211,6 +302,11 @@ public function testConfigureProductToAddAction()
         $this->assertContains(sprintf('"productId":"%s"', $product->getEntityId()), $body);
     }
 
+    /**
+     * Test not allowing to save.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testDeniedSaveAction()
     {
         $this->_objectManager->configure(
@@ -226,7 +322,127 @@ public function testDeniedSaveAction()
         \Magento\TestFramework\Helper\Bootstrap::getInstance()
             ->loadArea('adminhtml');
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/sales/order_create/save');
         $this->assertEquals('403', $this->getResponse()->getHttpResponseCode());
     }
+
+    /**
+     * Checks a case when shipping is the same as billing and billing address details was changed by request.
+     * Both billing and shipping addresses should be updated.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     */
+    public function testSyncBetweenQuoteAddresses()
+    {
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->_objectManager->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get('customer@example.com');
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $quote = $quoteRepository->getActiveForCustomer($customer->getId());
+
+        $session = $this->_objectManager->get(SessionQuote::class);
+        $session->setQuoteId($quote->getId());
+
+        $data = [
+            'firstname' => 'John',
+            'lastname' => 'Doe',
+            'street' => ['Soborna 23'],
+            'city' => 'Kyiv',
+            'country_id' => 'UA',
+            'region' => 'Kyivska',
+            'region_id' => 1
+        ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(
+            [
+                'order' => ['billing_address' => $data],
+                'reset_shipping' => 1,
+                'customer_id' => $customer->getId(),
+                'store_id' => 1,
+                'json' => true
+            ]
+        );
+
+        $this->dispatch('backend/sales/order_create/loadBlock/block/shipping_address');
+        self::assertEquals(200, $this->getResponse()->getHttpResponseCode());
+
+        $updatedQuote = $quoteRepository->get($quote->getId());
+
+        $billingAddress = $updatedQuote->getBillingAddress();
+        self::assertEquals($data['region_id'], $billingAddress->getRegionId());
+        self::assertEquals($data['country_id'], $billingAddress->getCountryId());
+
+        $shippingAddress = $updatedQuote->getShippingAddress();
+        self::assertEquals($data['city'], $shippingAddress->getCity());
+        self::assertEquals($data['street'], $shippingAddress->getStreet());
+    }
+
+    /**
+     * Gets quote entity by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuoteById(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets website entity.
+     *
+     * @param string $code
+     * @return WebsiteInterface
+     * @throws NoSuchEntityException
+     */
+    private function getWebsite(string $code): WebsiteInterface
+    {
+        /** @var WebsiteRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(WebsiteRepositoryInterface::class);
+        return $repository->get($code);
+    }
+
+    /**
+     * Gets customer entity.
+     *
+     * @param string $email
+     * @param int $websiteId
+     * @return CustomerInterface
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getCustomer(string $email, int $websiteId): CustomerInterface
+    {
+        /** @var CustomerRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(CustomerRepositoryInterface::class);
+        return $repository->get($email, $websiteId);
+    }
+
+    /**
+     * Gets store by code.
+     *
+     * @param string $code
+     * @return StoreInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getStore(string $code): StoreInterface
+    {
+        /** @var StoreRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(StoreRepositoryInterface::class);
+        return $repository->get($code);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
index 2cbd9b863ce05..2de06558ab66d 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
@@ -16,6 +16,7 @@ class CreditmemoTest extends \Magento\TestFramework\TestCase\AbstractBackendCont
      */
     public function testAddCommentAction()
     {
+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/393');
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var \Magento\CatalogInventory\Api\StockIndexInterface $stockIndex */
         $stockIndex = $objectManager->get(\Magento\CatalogInventory\Api\StockIndexInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
deleted file mode 100644
index 70fbb2ee9a5bd..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class EmailTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::email';
-        $this->uri = 'backend/sales/order/email';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php
deleted file mode 100644
index 4c90939d75b2d..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class HoldTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::hold';
-        $this->uri = 'backend/sales/order/hold';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php
deleted file mode 100644
index 96d197628584a..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class ReviewPaymentTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::review_payment';
-        $this->uri = 'backend/sales/order/reviewpayment';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php
deleted file mode 100644
index 351801d8a0558..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class UnholdTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::unhold';
-        $this->uri = 'backend/sales/order/unhold';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php
deleted file mode 100644
index 0374edfaad9d9..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class ViewTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::actions_view';
-        $this->uri = 'backend/sales/order/view';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php
deleted file mode 100644
index 7b9481db7997a..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Transactions;
-
-use Magento\TestFramework\TestCase\AbstractBackendController;
-
-class FetchTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::transactions_fetch';
-        $this->uri = 'backend/sales/transactions/fetch';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
new file mode 100644
index 0000000000000..7800d2363b364
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\CustomerData;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Customer\Model\Session;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class LastOrderedItemsTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
+     */
+    public function testDefaultFormatterIsAppliedWhenBasicIntegration()
+    {
+        /** @var Session $customerSession */
+        $customerSession = $this->objectManager->get(Session::class);
+        $customerSession->loginById(1);
+
+        /** @var LastOrderedItems $customerDataSectionSource */
+        $customerDataSectionSource = $this->objectManager->get(LastOrderedItems::class);
+        $data = $customerDataSectionSource->getSectionData();
+        $this->assertEquals(
+            LastOrderedItems::SIDEBAR_ORDER_LIMIT,
+            count($data['items']),
+            'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index 946d15b6a81d7..b1a8d8e685226 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -5,10 +5,20 @@
  */
 namespace Magento\Sales\Model\AdminOrder;
 
+use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\Data\OrderAddressExtensionInterface;
+use Magento\Sales\Api\Data\OrderAddressExtensionInterfaceFactory;
 use Magento\Sales\Api\OrderManagementInterface;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Sales\Model\Order;
-use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -18,91 +28,94 @@
 class CreateTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Sales\Model\AdminOrder\Create
+     * @var Create
+     */
+    private $model;
+
+    /**
+     * @var ManagerInterface
      */
-    protected $_model;
+    private $messageManager;
 
-    /** @var \Magento\Framework\Message\ManagerInterface */
-    protected $_messageManager;
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
 
     protected function setUp()
     {
-        parent::setUp();
-        $this->_messageManager = Bootstrap::getObjectManager()->get(\Magento\Framework\Message\ManagerInterface::class);
-        $this->_model = Bootstrap::getObjectManager()->create(
-            \Magento\Sales\Model\AdminOrder\Create::class,
-            ['messageManager' => $this->_messageManager]
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->messageManager = $this->objectManager->get(ManagerInterface::class);
+        $this->model =$this->objectManager->create(Create::class, ['messageManager' => $this->messageManager]);
     }
 
     /**
      * @magentoDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product.php
+     * @magentoDbIsolation disabled
      */
     public function testInitFromOrderShippingAddressSameAsBillingWhenEmpty()
     {
-        /** @var $order \Magento\Sales\Model\Order */
-        $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
+        /** @var $order Order */
+        $order = $this->objectManager->create(Order::class);
         $order->loadByIncrementId('100000001');
-        $this->assertNull($order->getShippingAddress());
+        self::assertNull($order->getShippingAddress());
 
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\Registry::class)->unregister('rule_data');
-        $this->_model->initFromOrder($order);
+        $this->objectManager->get(Registry::class)->unregister('rule_data');
+        $this->model->initFromOrder($order);
 
-        $this->assertNull($order->getShippingAddress());
+        self::assertNull($order->getShippingAddress());
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product_with_additional_options.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
     {
         /** @var $serializer \Magento\Framework\Serialize\Serializer\Json */
-        $serializer = Bootstrap::getObjectManager()->create(\Magento\Framework\Serialize\Serializer\Json::class);
+        $serializer = $this->objectManager->create(\Magento\Framework\Serialize\Serializer\Json::class);
 
-        /** @var $order \Magento\Sales\Model\Order */
-        $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
+        /** @var $order Order */
+        $order = $this->objectManager->create(Order::class);
         $order->loadByIncrementId('100000001');
 
         /** @var $orderCreate \Magento\Sales\Model\AdminOrder\Create */
-        $orderCreate = $this->_model->initFromOrder($order);
+        $orderCreate = $this->model->initFromOrder($order);
 
         $quoteItems = $orderCreate->getQuote()->getItemsCollection();
 
-        $this->assertEquals(1, $quoteItems->count());
+        self::assertEquals(1, $quoteItems->count());
 
         $quoteItem = $quoteItems->getFirstItem();
         $quoteItemOptions = $quoteItem->getOptionsByCode();
 
-        $this->assertEquals(
+        self::assertEquals(
             $serializer->serialize(['additional_option_key' => 'additional_option_value']),
             $quoteItemOptions['additional_options']->getValue()
         );
 
-        $session = Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session\Quote::class);
+        $session = $this->objectManager->get(SessionQuote::class);
         $session->setCustomerId(1);
 
-        $customer = Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Customer::class);
+        $customer = $this->objectManager->create(Customer::class);
         $customer->load(1)->setDefaultBilling(null)->setDefaultShipping(null)->save();
 
-        $rate = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote\Address\Rate::class);
+        $rate = $this->objectManager->create(Quote\Address\Rate::class);
         $rate->setCode('freeshipping_freeshipping');
 
-        $this->_model->getQuote()->getShippingAddress()->addShippingRate($rate);
-        $this->_model->getQuote()->getShippingAddress()->setCountryId('EE');
-        $this->_model->setShippingAsBilling(0);
-        $this->_model->setPaymentData(['method' => 'checkmo']);
+        $this->model->getQuote()->getShippingAddress()->addShippingRate($rate);
+        $this->model->getQuote()->getShippingAddress()->setCountryId('EE');
+        $this->model->setShippingAsBilling(0);
+        $this->model->setPaymentData(['method' => 'checkmo']);
 
-        $newOrder = $this->_model->createOrder();
+        $newOrder = $this->model->createOrder();
         $newOrderItems = $newOrder->getItemsCollection();
 
-        $this->assertEquals(1, $newOrderItems->count());
+        self::assertEquals(1, $newOrderItems->count());
 
         $order->loadByIncrementId('100000001');
         $this->assertEquals($newOrder->getRealOrderId(), $order->getRelationChildRealId());
@@ -110,7 +123,7 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
 
         $newOrderItem = $newOrderItems->getFirstItem();
 
-        $this->assertEquals(
+        self::assertEquals(
             ['additional_option_key' => 'additional_option_value'],
             $newOrderItem->getProductOptionByCode('additional_options')
         );
@@ -120,96 +133,102 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
      * @magentoDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product.php
      * @magentoDataFixture Magento/Sales/_files/order_shipping_address_same_as_billing.php
+     * @magentoDbIsolation disabled
      */
     public function testInitFromOrderShippingAddressSameAsBillingWhenSame()
     {
-        /** @var $order \Magento\Sales\Model\Order */
-        $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
+        /** @var $order Order */
+        $order = $this->objectManager->create(Order::class);
         $order->loadByIncrementId('100000001');
 
-        $this->assertNull($order->getShippingAddress()->getSameAsBilling());
+        self::assertNull($order->getShippingAddress()->getSameAsBilling());
+
+        /** @var OrderAddressExtensionInterface $shippingExtAttributes */
+        $shippingExtAttributes = $this->objectManager->get(OrderAddressExtensionInterfaceFactory::class)
+            ->create();
+
+        $billingExtAttributes = clone $shippingExtAttributes;
+
+        $shippingExtAttributes->setData('tmp', false);
+        $billingExtAttributes->setData('tmp', true);
 
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\Registry::class)->unregister('rule_data');
-        $this->_model->initFromOrder($order);
+        $order->getShippingAddress()->setExtensionAttributes($shippingExtAttributes);
+        $order->getBillingAddress()->setExtensionAttributes($billingExtAttributes);
 
-        $this->assertTrue($order->getShippingAddress()->getSameAsBilling());
+        $this->objectManager->get(Registry::class)->unregister('rule_data');
+        $this->model->initFromOrder($order);
+
+        self::assertTrue($order->getShippingAddress()->getSameAsBilling());
     }
 
     /**
      * @magentoDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product.php
      * @magentoDataFixture Magento/Sales/_files/order_shipping_address_different_to_billing.php
+     * @magentoDbIsolation disabled
      */
     public function testInitFromOrderShippingAddressSameAsBillingWhenDifferent()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-
-        /** @var $order \Magento\Sales\Model\Order */
-        $order = $objectManager->create(\Magento\Sales\Model\Order::class);
+        /** @var $order Order */
+        $order = $this->objectManager->create(Order::class);
         $order->loadByIncrementId('100000002');
 
-        $this->assertNull($order->getShippingAddress()->getSameAsBilling());
+        self::assertNull($order->getShippingAddress()->getSameAsBilling());
 
-        $objectManager->get(\Magento\Framework\Registry::class)->unregister('rule_data');
-        $this->_model->initFromOrder($order);
+        $this->objectManager->get(Registry::class)->unregister('rule_data');
+        $this->model->initFromOrder($order);
 
-        $this->assertFalse($order->getShippingAddress()->getSameAsBilling());
+        self::assertFalse($order->getShippingAddress()->getSameAsBilling());
     }
 
     /**
      * @magentoDataFixture Magento/Sales/_files/order_paid_with_payflowpro.php
+     * @magentoDbIsolation disabled
      */
     public function testInitFromOrderCcInformationDeleted()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-
-        /** @var $order \Magento\Sales\Model\Order */
-        $order = $objectManager->create(\Magento\Sales\Model\Order::class);
+        /** @var $order Order */
+        $order = $this->objectManager->create(Order::class);
         $order->loadByIncrementId('100000001');
 
         $payment = $order->getPayment();
-        $this->assertEquals('5', $payment->getCcExpMonth());
-        $this->assertEquals('2016', $payment->getCcExpYear());
-        $this->assertEquals('AE', $payment->getCcType());
-        $this->assertEquals('0005', $payment->getCcLast4());
-
-        $objectManager->get(\Magento\Framework\Registry::class)->unregister('rule_data');
-        $payment = $this->_model->initFromOrder($order)->getQuote()->getPayment();
-
-        $this->assertNull($payment->getCcExpMonth());
-        $this->assertNull($payment->getCcExpYear());
-        $this->assertNull($payment->getCcType());
-        $this->assertNull($payment->getCcLast4());
+        self::assertEquals('5', $payment->getCcExpMonth());
+        self::assertEquals('2016', $payment->getCcExpYear());
+        self::assertEquals('AE', $payment->getCcType());
+        self::assertEquals('0005', $payment->getCcLast4());
+
+        $this->objectManager->get(Registry::class)->unregister('rule_data');
+        $payment = $this->model->initFromOrder($order)->getQuote()->getPayment();
+
+        self::assertNull($payment->getCcExpMonth());
+        self::assertNull($payment->getCcExpYear());
+        self::assertNull($payment->getCcType());
+        self::assertNull($payment->getCcLast4());
     }
 
     /**
      * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoDbIsolation disabled
      */
     public function testInitFromOrderWithEmptyPaymentDetails()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var $order \Magento\Sales\Model\Order */
-        $order = $objectManager->create(Order::class);
+        /** @var $order Order */
+        $order = $this->objectManager->create(Order::class);
         $order->loadByIncrementId('100000001');
 
-        $objectManager->get(Registry::class)
+        $this->objectManager->get(Registry::class)
             ->unregister('rule_data');
 
-        $initOrder = $this->_model->initFromOrder($order);
+        $initOrder = $this->model->initFromOrder($order);
         $payment = $initOrder->getQuote()->getPayment();
 
-        static::assertEquals($initOrder->getQuote()->getId(), $payment->getData('quote_id'));
+        self::assertEquals($initOrder->getQuote()->getId(), $payment->getData('quote_id'));
         $payment->unsetData('quote_id');
 
-        static::assertEmpty($payment->getMethod());
-        static::assertEmpty($payment->getAdditionalInformation());
-        static::assertEmpty($payment->getAdditionalData());
-        static::assertEmpty($payment->getData());
+        self::assertEmpty($payment->getMethod());
+        self::assertEmpty($payment->getAdditionalInformation());
+        self::assertEmpty($payment->getAdditionalData());
+        self::assertEmpty($payment->getData());
     }
 
     /**
@@ -217,11 +236,11 @@ public function testInitFromOrderWithEmptyPaymentDetails()
      */
     public function testGetCustomerWishlistNoCustomerId()
     {
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->create(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId(null);
-        $this->assertFalse(
-            $this->_model->getCustomerWishlist(true),
+        self::assertFalse(
+            $this->model->getCustomerWishlist(true),
             'If customer ID is not set to session, false is expected to be returned.'
         );
     }
@@ -230,30 +249,29 @@ public function testGetCustomerWishlistNoCustomerId()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoAppIsolation enabled
-     * @magentoDbIsolation enabled
      */
     public function testGetCustomerWishlist()
     {
         $customerIdFromFixture = 1;
         $productIdFromFixture = 1;
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->create(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($customerIdFromFixture);
 
         /** Test new wishlist creation for the customer specified above */
         /** @var \Magento\Wishlist\Model\Wishlist $wishlist */
-        $wishlist = $this->_model->getCustomerWishlist(true);
-        $this->assertInstanceOf(
+        $wishlist = $this->model->getCustomerWishlist(true);
+        self::assertInstanceOf(
             \Magento\Wishlist\Model\Wishlist::class,
             $wishlist,
             'New Wish List is expected to be created if existing Customer does not have one yet.'
         );
-        $this->assertEquals(0, $wishlist->getItemsCount(), 'New Wish List must be empty just after creation.');
+        self::assertEquals(0, $wishlist->getItemsCount(), 'New Wish List must be empty just after creation.');
 
         /** Add new item to wishlist and try to get it using getCustomerWishlist once again */
         $wishlist->addNewItem($productIdFromFixture)->save();
-        $updatedWishlist = $this->_model->getCustomerWishlist(true);
-        $this->assertEquals(
+        $updatedWishlist = $this->model->getCustomerWishlist(true);
+        self::assertEquals(
             1,
             $updatedWishlist->getItemsCount(),
             'Wish List must contain a Product which was added to it earlier.'
@@ -261,14 +279,14 @@ public function testGetCustomerWishlist()
 
         /** Try to load wishlist from cache in the class after it is deleted from DB */
         $wishlist->delete();
-        $this->assertSame(
+        self::assertSame(
             $updatedWishlist,
-            $this->_model->getCustomerWishlist(false),
+            $this->model->getCustomerWishlist(false),
             'Wish List cached in class variable is expected to be returned.'
         );
-        $this->assertNotSame(
+        self::assertNotSame(
             $updatedWishlist,
-            $this->_model->getCustomerWishlist(true),
+            $this->model->getCustomerWishlist(true),
             'New Wish List is expected to be created when cache is forced to be refreshed.'
         );
     }
@@ -278,12 +296,12 @@ public function testGetCustomerWishlist()
      */
     public function testSetBillingAddress()
     {
-        $addressData = $this->_getValidAddressData();
+        $addressData = $this->getValidAddressData();
         /** Validate data before creating address object */
-        $this->_model->setIsValidate(true)->setBillingAddress($addressData);
-        $this->assertInstanceOf(
-            \Magento\Quote\Model\Quote\Address::class,
-            $this->_model->getBillingAddress(),
+        $this->model->setIsValidate(true)->setBillingAddress($addressData);
+        self::assertInstanceOf(
+            Quote\Address::class,
+            $this->model->getBillingAddress(),
             'Billing address object was not created.'
         );
 
@@ -291,7 +309,7 @@ public function testSetBillingAddress()
             $addressData,
             [
                 'address_type' => 'billing',
-                'quote_id' => $this->_model->getQuote()->getId(),
+                'quote_id' => $this->model->getQuote()->getId(),
                 'street' => "Line1\nLine2",
                 'save_in_address_book' => 0,
                 'region' => '',
@@ -299,47 +317,46 @@ public function testSetBillingAddress()
             ]
         );
 
-        $result = $this->_model->getBillingAddress()->getData();
+        $result = $this->model->getBillingAddress()->getData();
         foreach ($expectedAddressData as $key => $value) {
-            $this->assertArrayHasKey($key, $result);
-            $this->assertEquals($value, $result[$key]);
+            self::assertArrayHasKey($key, $result);
+            self::assertEquals($value, $result[$key]);
         }
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoAppIsolation enabled
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testSetBillingAddressValidationErrors()
     {
         $customerIdFromFixture = 1;
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->create(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($customerIdFromFixture);
-        $invalidAddressData = array_merge($this->_getValidAddressData(), ['firstname' => '', 'lastname' => '']);
+        $invalidAddressData = array_merge($this->getValidAddressData(), ['firstname' => '', 'lastname' => '']);
         /**
          * Note that validation errors are collected during setBillingAddress() call in the internal class variable,
          * but they are not set to message manager at this step.
          * They are set to message manager only during createOrder() call.
          */
-        $this->_model->setIsValidate(true)->setBillingAddress($invalidAddressData);
+        $this->model->setIsValidate(true)->setBillingAddress($invalidAddressData);
         try {
-            $this->_model->createOrder();
+            $this->model->createOrder();
             $this->fail('Validation errors are expected to lead to exception during createOrder() call.');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             /** createOrder is expected to throw exception with empty message when validation error occurs */
         }
         $errorMessages = [];
         /** @var $validationError \Magento\Framework\Message\Error */
-        foreach ($this->_messageManager->getMessages()->getItems() as $validationError) {
+        foreach ($this->messageManager->getMessages()->getItems() as $validationError) {
             $errorMessages[] = $validationError->getText();
         }
-        $this->assertTrue(
+        self::assertTrue(
             in_array('Billing Address: "First Name" is a required value.', $errorMessages),
             'Expected validation message is absent.'
         );
-        $this->assertTrue(
+        self::assertTrue(
             in_array('Billing Address: "Last Name" is a required value.', $errorMessages),
             'Expected validation message is absent.'
         );
@@ -347,7 +364,6 @@ public function testSetBillingAddressValidationErrors()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      */
     public function testCreateOrderNewCustomerDifferentAddresses()
@@ -361,9 +377,9 @@ public function testCreateOrderNewCustomerDifferentAddresses()
         $orderData = [
             'currency' => 'USD',
             'account' => ['group_id' => '1', 'email' => $customerEmail],
-            'billing_address' => array_merge($this->_getValidAddressData(), ['save_in_address_book' => '1']),
+            'billing_address' => array_merge($this->getValidAddressData(), ['save_in_address_book' => '1']),
             'shipping_address' => array_merge(
-                $this->_getValidAddressData(),
+                $this->getValidAddressData(),
                 ['save_in_address_book' => '1', 'firstname' => $firstNameForShippingAddress]
             ),
             'shipping_method' => $shippingMethod,
@@ -372,7 +388,7 @@ public function testCreateOrderNewCustomerDifferentAddresses()
         ];
         $paymentData = ['method' => $paymentMethod];
 
-        $this->_preparePreconditionsForCreateOrder(
+        $this->preparePreconditionsForCreateOrder(
             $productIdFromFixture,
             $customerEmail,
             $shippingMethod,
@@ -381,12 +397,12 @@ public function testCreateOrderNewCustomerDifferentAddresses()
             $orderData,
             $paymentMethod
         );
-        $order = $this->_model->createOrder();
-        $this->_verifyCreatedOrder($order, $shippingMethod);
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Customer::class);
+        $order = $this->model->createOrder();
+        $this->verifyCreatedOrder($order, $shippingMethod);
+        /** @var Customer $customer */
+        $customer = $this->objectManager->create(Customer::class);
         $customer->load($order->getCustomerId());
-        $this->assertEquals(
+        self::assertEquals(
             $firstNameForShippingAddress,
             $customer->getPrimaryShippingAddress()->getFirstname(),
             'Shipping address is saved incorrectly.'
@@ -394,8 +410,8 @@ public function testCreateOrderNewCustomerDifferentAddresses()
     }
 
     /**
-     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_decimal_qty.php
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testCreateOrderNewCustomer()
@@ -408,14 +424,14 @@ public function testCreateOrderNewCustomer()
         $orderData = [
             'currency' => 'USD',
             'account' => ['group_id' => '1', 'email' => $customerEmail],
-            'billing_address' => array_merge($this->_getValidAddressData(), ['save_in_address_book' => '1']),
+            'billing_address' => array_merge($this->getValidAddressData(), ['save_in_address_book' => '1']),
             'shipping_method' => $shippingMethod,
             'comment' => ['customer_note' => ''],
             'send_confirmation' => false,
         ];
         $paymentData = ['method' => $paymentMethod];
 
-        $this->_preparePreconditionsForCreateOrder(
+        $this->preparePreconditionsForCreateOrder(
             $productIdFromFixture,
             $customerEmail,
             $shippingMethod,
@@ -424,15 +440,19 @@ public function testCreateOrderNewCustomer()
             $orderData,
             $paymentMethod
         );
-        $order = $this->_model->createOrder();
-        $this->_verifyCreatedOrder($order, $shippingMethod);
+        $order = $this->model->createOrder();
+        //Check, order considering decimal qty in product.
+        foreach ($order->getItems() as $orderItem) {
+            self::assertTrue($orderItem->getIsQtyDecimal());
+        }
+        $this->verifyCreatedOrder($order, $shippingMethod);
     }
 
     /**
      * Tests order creation with new customer after failed first place order action.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @dataProvider createOrderNewCustomerWithFailedFirstPlaceOrderActionDataProvider
      * @param string $customerEmailFirstAttempt
@@ -450,14 +470,14 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
         $orderData = [
             'currency' => 'USD',
             'account' => ['group_id' => '1', 'email' => $customerEmail],
-            'billing_address' => array_merge($this->_getValidAddressData(), ['save_in_address_book' => '1']),
+            'billing_address' => array_merge($this->getValidAddressData(), ['save_in_address_book' => '1']),
             'shipping_method' => $shippingMethod,
             'comment' => ['customer_note' => ''],
             'send_confirmation' => false,
         ];
         $paymentData = ['method' => $paymentMethod];
 
-        $this->_preparePreconditionsForCreateOrder(
+        $this->preparePreconditionsForCreateOrder(
             $productIdFromFixture,
             $customerEmail,
             $shippingMethod,
@@ -471,17 +491,17 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
         $orderManagement = $this->getMockForAbstractClass(OrderManagementInterface::class);
         $orderManagement->method('place')
             ->willThrowException(new \Exception('Can\'t place order'));
-        Bootstrap::getObjectManager()->addSharedInstance($orderManagement, OrderManagementInterface::class);
+        $this->objectManager->addSharedInstance($orderManagement, OrderManagementInterface::class);
         try {
-            $this->_model->createOrder();
+            $this->model->createOrder();
         } catch (\Exception $e) {
-            Bootstrap::getObjectManager()->removeSharedInstance(OrderManagementInterface::class);
+            $this->objectManager->removeSharedInstance(OrderManagementInterface::class);
         }
 
-        $customerEmail = $customerEmailSecondAttempt ? :$this->_model->getQuote()->getCustomer()->getEmail();
+        $customerEmail = $customerEmailSecondAttempt ? :$this->model->getQuote()->getCustomer()->getEmail();
         $orderData['account']['email'] = $customerEmailSecondAttempt;
 
-        $this->_preparePreconditionsForCreateOrder(
+        $this->preparePreconditionsForCreateOrder(
             $productIdFromFixture,
             $customerEmail,
             $shippingMethod,
@@ -491,35 +511,29 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
             $paymentMethod
         );
 
-        $order = $this->_model->createOrder();
-        $this->_verifyCreatedOrder($order, $shippingMethod);
+        $order = $this->model->createOrder();
+        $this->verifyCreatedOrder($order, $shippingMethod);
     }
 
     /**
      * Email before and after failed first place order action.
      *
      * @case #1 Is the same.
-     * @case #2 Is empty.
-     * @case #3 Filled after failed first place order action.
-     * @case #4 Empty after failed first place order action.
-     * @case #5 Changed after failed first place order action.
+     * @case #2 Changed after failed first place order action.
      * @return array
      */
     public function createOrderNewCustomerWithFailedFirstPlaceOrderActionDataProvider()
     {
         return [
             1 => ['customer@email.com', 'customer@email.com'],
-            2 => ['', ''],
-            3 => ['', 'customer@email.com'],
-            4 => ['customer@email.com', ''],
-            5 => ['customer@email.com', 'changed_customer@email.com'],
+            2 => ['customer@email.com', 'changed_customer@email.com'],
         ];
     }
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testCreateOrderExistingCustomerDifferentAddresses()
@@ -533,9 +547,9 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
         $firstNameForShippingAddress = 'FirstNameForShipping';
         $orderData = [
             'currency' => 'USD',
-            'billing_address' => array_merge($this->_getValidAddressData(), ['save_in_address_book' => '1']),
+            'billing_address' => array_merge($this->getValidAddressData(), ['save_in_address_book' => '1']),
             'shipping_address' => array_merge(
-                $this->_getValidAddressData(),
+                $this->getValidAddressData(),
                 ['save_in_address_book' => '1', 'firstname' => $firstNameForShippingAddress]
             ),
             'shipping_method' => $shippingMethod,
@@ -544,7 +558,7 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
         ];
         $paymentData = ['method' => $paymentMethod];
 
-        $this->_preparePreconditionsForCreateOrder(
+        $this->preparePreconditionsForCreateOrder(
             $productIdFromFixture,
             $customerEmailFromFixture,
             $shippingMethod,
@@ -554,12 +568,15 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
             $paymentMethod,
             $customerIdFromFixture
         );
-        $order = $this->_model->createOrder();
-        $this->_verifyCreatedOrder($order, $shippingMethod);
-        $this->getCustomerRegistry()->remove($order->getCustomerId());
-        $customer = $this->getCustomerById($order->getCustomerId());
-        $address = $this->getAddressById($customer->getDefaultShipping());
-        $this->assertEquals(
+        $order = $this->model->createOrder();
+        $this->verifyCreatedOrder($order, $shippingMethod);
+        $this->objectManager->get(CustomerRegistry::class)
+            ->remove($order->getCustomerId());
+        $customer = $this->objectManager->get(CustomerRepositoryInterface::class)
+            ->getById($order->getCustomerId());
+        $address = $this->objectManager->get(AddressRepositoryInterface::class)
+            ->getById($customer->getDefaultShipping());
+        self::assertEquals(
             $firstNameForShippingAddress,
             $address->getFirstname(),
             'Shipping address is saved incorrectly.'
@@ -569,7 +586,7 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testCreateOrderExistingCustomer()
@@ -582,14 +599,14 @@ public function testCreateOrderExistingCustomer()
         $shippingAddressAsBilling = 1;
         $orderData = [
             'currency' => 'USD',
-            'billing_address' => array_merge($this->_getValidAddressData(), ['save_in_address_book' => '1']),
+            'billing_address' => array_merge($this->getValidAddressData(), ['save_in_address_book' => '1']),
             'shipping_method' => $shippingMethod,
             'comment' => ['customer_note' => ''],
             'send_confirmation' => false,
         ];
         $paymentData = ['method' => $paymentMethod];
 
-        $this->_preparePreconditionsForCreateOrder(
+        $this->preparePreconditionsForCreateOrder(
             $productIdFromFixture,
             $customerEmailFromFixture,
             $shippingMethod,
@@ -599,66 +616,68 @@ public function testCreateOrderExistingCustomer()
             $paymentMethod,
             $customerIdFromFixture
         );
-        $order = $this->_model->createOrder();
-        $this->_verifyCreatedOrder($order, $shippingMethod);
+        $order = $this->model->createOrder();
+        $this->verifyCreatedOrder($order, $shippingMethod);
     }
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testGetCustomerCartExistingCart()
     {
         $fixtureCustomerId = 1;
 
         /** Preconditions */
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->create(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($fixtureCustomerId);
-        /** @var $quoteFixture \Magento\Quote\Model\Quote */
-        $quoteFixture = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var $quoteFixture Quote */
+        $quoteFixture = $this->objectManager->create(Quote::class);
         $quoteFixture->load('test01', 'reserved_order_id');
         $quoteFixture->setCustomerIsGuest(false)->setCustomerId($fixtureCustomerId)->save();
 
         /** SUT execution */
-        $customerQuote = $this->_model->getCustomerCart();
-        $this->assertEquals($quoteFixture->getId(), $customerQuote->getId(), 'Quote ID is invalid.');
+        $customerQuote = $this->model->getCustomerCart();
+        self::assertEquals($quoteFixture->getId(), $customerQuote->getId(), 'Quote ID is invalid.');
 
         /** Try to load quote once again to ensure that caching works correctly */
-        $customerQuoteFromCache = $this->_model->getCustomerCart();
-        $this->assertSame($customerQuote, $customerQuoteFromCache, 'Customer quote caching does not work correctly.');
+        $customerQuoteFromCache = $this->model->getCustomerCart();
+        self::assertSame($customerQuote, $customerQuoteFromCache, 'Customer quote caching does not work correctly.');
     }
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testMoveQuoteItemToCart()
     {
         $fixtureCustomerId = 1;
 
         /** Preconditions */
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->create(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($fixtureCustomerId);
-        /** @var $quoteFixture \Magento\Quote\Model\Quote */
-        $quoteFixture = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+        /** @var $quoteFixture Quote */
+        $quoteFixture = $this->objectManager->create(Quote::class);
         $quoteFixture->load('test01', 'reserved_order_id');
         $quoteFixture->setCustomerIsGuest(false)->setCustomerId($fixtureCustomerId)->save();
 
-        $customerQuote = $this->_model->getCustomerCart();
+        $customerQuote = $this->model->getCustomerCart();
         $item = $customerQuote->getAllVisibleItems()[0];
 
-        $this->_model->moveQuoteItem($item, 'cart', 3);
-        $this->assertEquals(4, $item->getQty(), 'Number of Qty isn\'t correct for Quote item.');
-        $this->assertEquals(3, $item->getQtyToAdd(), 'Number of added qty isn\'t correct for Quote item.');
+        $this->model->moveQuoteItem($item, 'cart', 3);
+        self::assertEquals(4, $item->getQty(), 'Number of Qty isn\'t correct for Quote item.');
+        self::assertEquals(3, $item->getQtyToAdd(), 'Number of added qty isn\'t correct for Quote item.');
     }
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
     public function testGetCustomerCartNewCart()
@@ -667,14 +686,14 @@ public function testGetCustomerCartNewCart()
         $customerEmailFromFixture = 'customer@example.com';
 
         /** Preconditions */
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->create(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($customerIdFromFixture);
 
         /** SUT execution */
-        $customerQuote = $this->_model->getCustomerCart();
-        $this->assertNotEmpty($customerQuote->getId(), 'Quote ID is invalid.');
-        $this->assertEquals(
+        $customerQuote = $this->model->getCustomerCart();
+        self::assertNotEmpty($customerQuote->getId(), 'Quote ID is invalid.');
+        self::assertEquals(
             $customerEmailFromFixture,
             $customerQuote->getCustomerEmail(),
             'Customer data is preserved incorrectly in a newly quote.'
@@ -693,7 +712,7 @@ public function testGetCustomerCartNewCart()
      * @param string $paymentMethod
      * @param int|null $customerIdFromFixture
      */
-    protected function _preparePreconditionsForCreateOrder(
+    private function preparePreconditionsForCreateOrder(
         $productIdFromFixture,
         $customerEmail,
         $shippingMethod,
@@ -705,18 +724,18 @@ protected function _preparePreconditionsForCreateOrder(
     ) {
         /** Disable product options */
         /** @var \Magento\Catalog\Model\Product $product */
-        $product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $product->load($productIdFromFixture)->setHasOptions(false)->save();
 
         /** Set current customer */
-        /** @var \Magento\Backend\Model\Session\Quote $session */
-        $session = Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session\Quote::class);
+        /** @var SessionQuote $session */
+        $session = $this->objectManager->get(SessionQuote::class);
         if ($customerIdFromFixture !== null) {
             $session->setCustomerId($customerIdFromFixture);
 
             /** Unset fake IDs for default billing and shipping customer addresses */
-            /** @var \Magento\Customer\Model\Customer $customer */
-            $customer = Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Customer::class);
+            /** @var Customer $customer */
+            $customer = $this->objectManager->create(Customer::class);
             $customer->load($customerIdFromFixture)->setDefaultBilling(null)->setDefaultShipping(null)->save();
         } else {
             /**
@@ -727,48 +746,48 @@ protected function _preparePreconditionsForCreateOrder(
         }
 
         /** Emulate availability of shipping method (all are disabled by default) */
-        /** @var $rate \Magento\Quote\Model\Quote\Address\Rate */
-        $rate = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote\Address\Rate::class);
+        /** @var $rate Quote\Address\Rate */
+        $rate = $this->objectManager->create(Quote\Address\Rate::class);
         $rate->setCode($shippingMethod);
-        $this->_model->getQuote()->getShippingAddress()->addShippingRate($rate);
+        $this->model->getQuote()->getShippingAddress()->addShippingRate($rate);
 
-        $this->_model->setShippingAsBilling($shippingAddressAsBilling);
-        $this->_model->addProduct($productIdFromFixture, ['qty' => 1]);
-        $this->_model->setPaymentData($paymentData);
-        $this->_model->setIsValidate(true)->importPostData($orderData);
+        $this->model->setShippingAsBilling($shippingAddressAsBilling);
+        $this->model->addProduct($productIdFromFixture, ['qty' => 1]);
+        $this->model->setPaymentData($paymentData);
+        $this->model->setIsValidate(true)->importPostData($orderData);
 
         /** Check preconditions */
 
-        $this->assertEquals(
+        self::assertEquals(
             0,
-            $this->_messageManager->getMessages()->getCount(),
+            $this->messageManager->getMessages()->getCount(),
             "Precondition failed: Errors occurred before SUT execution."
         );
         /** Selectively check quote data */
-        $createOrderData = $this->_model->getData();
-        $this->assertEquals(
+        $createOrderData = $this->model->getData();
+        self::assertEquals(
             $shippingMethod,
             $createOrderData['shipping_method'],
             'Precondition failed: Shipping method specified in create order model is invalid'
         );
-        $this->assertEquals(
+        self::assertEquals(
             'FirstName',
             $createOrderData['billing_address']['firstname'],
             'Precondition failed: Address data is invalid in create order model'
         );
-        $this->assertEquals(
+        self::assertEquals(
             'Simple Product',
-            $this->_model->getQuote()->getItemByProduct($product)->getData('name'),
+            $this->model->getQuote()->getItemByProduct($product)->getData('name'),
             'Precondition failed: Quote items data is invalid in create order model'
         );
-        $this->assertEquals(
+        self::assertEquals(
             $customerEmail,
-            $this->_model->getQuote()->getCustomer()->getEmail(),
+            $this->model->getQuote()->getCustomer()->getEmail(),
             'Precondition failed: Customer data is invalid in create order model'
         );
-        $this->assertEquals(
+        self::assertEquals(
             $paymentMethod,
-            $this->_model->getQuote()->getPayment()->getData('method'),
+            $this->model->getQuote()->getPayment()->getData('method'),
             'Precondition failed: Payment method data is invalid in create order model'
         );
     }
@@ -776,26 +795,26 @@ protected function _preparePreconditionsForCreateOrder(
     /**
      * Ensure that order is created correctly via createOrder().
      *
-     * @param \Magento\Sales\Model\Order $order
+     * @param Order $order
      * @param string $shippingMethod
      */
-    protected function _verifyCreatedOrder($order, $shippingMethod)
+    private function verifyCreatedOrder($order, $shippingMethod)
     {
         /** Selectively check order data */
         $orderData = $order->getData();
-        $this->assertNotEmpty($orderData['increment_id'], 'Order increment ID is empty.');
-        $this->assertEquals($this->_model->getQuote()->getId(), $orderData['quote_id'], 'Quote ID is invalid.');
-        $this->assertEquals(
-            $this->_model->getQuote()->getCustomer()->getEmail(),
+        self::assertNotEmpty($orderData['increment_id'], 'Order increment ID is empty.');
+        self::assertEquals($this->model->getQuote()->getId(), $orderData['quote_id'], 'Quote ID is invalid.');
+        self::assertEquals(
+            $this->model->getQuote()->getCustomer()->getEmail(),
             $orderData['customer_email'],
             'Customer email is invalid.'
         );
-        $this->assertEquals(
-            $this->_model->getQuote()->getCustomer()->getFirstname(),
+        self::assertEquals(
+            $this->model->getQuote()->getCustomer()->getFirstname(),
             $orderData['customer_firstname'],
             'Customer first name is invalid.'
         );
-        $this->assertEquals($shippingMethod, $orderData['shipping_method'], 'Shipping method is invalid.');
+        self::assertEquals($shippingMethod, $orderData['shipping_method'], 'Shipping method is invalid.');
     }
 
     /**
@@ -803,7 +822,7 @@ protected function _verifyCreatedOrder($order, $shippingMethod)
      *
      * @return array
      */
-    protected function _getValidAddressData()
+    private function getValidAddressData()
     {
         return [
             'prefix' => 'prefix',
@@ -825,48 +844,4 @@ protected function _getValidAddressData()
             'vat_id' => ''
         ];
     }
-
-    /**
-     * @param int $id
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     */
-    private function getCustomerById($id)
-    {
-        return $this->getCustomerRepository()->getById($id);
-    }
-
-    /**
-     * @return \Magento\Customer\Api\CustomerRepositoryInterface
-     */
-    private function getCustomerRepository()
-    {
-        return Bootstrap::getObjectManager()->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-    }
-
-    /**
-     * @param int $id
-     * @return \Magento\Customer\Api\Data\AddressInterface
-     */
-    private function getAddressById($id)
-    {
-        return $this->getAddressRepository()->getById($id);
-    }
-
-    /**
-     * @return \Magento\Customer\Api\AddressRepositoryInterface
-     */
-    private function getAddressRepository()
-    {
-        /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
-        return Bootstrap::getObjectManager()->create(\Magento\Customer\Api\AddressRepositoryInterface::class);
-    }
-
-    /**
-     * @return \Magento\Customer\Model\CustomerRegistry
-     */
-    private function getCustomerRegistry()
-    {
-        /** @var \Magento\Customer\Model\CustomerRegistry $addressRepository */
-        return Bootstrap::getObjectManager()->get(\Magento\Customer\Model\CustomerRegistry::class);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/GridAsyncInsertTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/GridAsyncInsertTest.php
new file mode 100644
index 0000000000000..c300993cb220d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/GridAsyncInsertTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\ResourceModel\Grid as AbstractGrid;
+use Magento\Sales\Model\ResourceModel\Order\Grid;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Class for testing asynchronous inserts into grid.
+ */
+class GridAsyncInsertTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var GridAsyncInsert
+     */
+    private $gridAsyncInsert;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var AbstractGrid
+     */
+    private $grid;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        /** @var ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->get(ResourceConnection::class);
+        $this->connection = $resourceConnection->getConnection('sales');
+        $this->orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $this->grid = $this->objectManager->get(Grid::class);
+
+        $this->gridAsyncInsert = $this->objectManager->create(
+            GridAsyncInsert::class,
+            [
+                'entityGrid' => $this->grid,
+            ]
+        );
+    }
+
+    /**
+     * Checks a case when order's grid should be updated asynchronously.
+     *
+     * @magentoConfigFixture default/dev/grid/async_indexing 1
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @return void
+     */
+    public function testExecuteAsyncUpdateOrderGrid()
+    {
+        $order = $this->getOrder('100000001');
+        $this->performUpdateAssertions($order);
+
+        // to un-sync main table and grid table need to wait at least one second
+        sleep(1);
+        $order->setStatus('complete');
+        $this->orderRepository->save($order);
+
+        $gridRow = $this->getGridRow($order->getEntityId());
+        self::assertNotEquals($order->getStatus(), $gridRow['status']);
+
+        $this->gridAsyncInsert->asyncInsert();
+        $this->performUpdateAssertions($order);
+    }
+
+    /**
+     * Loads order entity by provided order increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId) : OrderInterface
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('increment_id', $incrementId)
+            ->create();
+
+        $items = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets row from `sales_order_grid` table by order's ID.
+     *
+     * @param int $entityId
+     * @return array
+     */
+    private function getGridRow(int $entityId) : array
+    {
+        $tableName = $this->grid->getGridTable();
+        $select = $this->connection->select()
+            ->from($tableName)
+            ->where($tableName . '.entity_id = ?', $entityId);
+
+        return $this->connection->fetchRow($select);
+    }
+
+    /**
+     * Perform assertions for updating grid test.
+     *
+     * @param OrderInterface $order
+     * @return void
+     */
+    private function performUpdateAssertions(OrderInterface $order)
+    {
+        $gridRow = $this->getGridRow($order->getEntityId());
+
+        self::assertEquals($order->getStatus(), $gridRow['status']);
+        self::assertEquals($order->getUpdatedAt(), $gridRow['updated_at']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php
new file mode 100644
index 0000000000000..332092946c4d6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model;
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class InvoiceEmailSenderHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection
+     */
+    private $entityCollection;
+
+    /**
+     * @var \Magento\Sales\Model\EmailSenderHandler
+     */
+    private $emailSender;
+
+    protected function setUp()
+    {
+        /** @var \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity $invoiceIdentity */
+        $invoiceIdentity = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::class
+        );
+        /** @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender */
+        $invoiceSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(
+                \Magento\Sales\Model\Order\Email\Sender\InvoiceSender::class,
+                [
+                    'identityContainer' => $invoiceIdentity,
+                ]
+            );
+        $entityResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Sales\Model\ResourceModel\Order\Invoice::class);
+        $this->entityCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection::class
+        );
+        $this->emailSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Model\EmailSenderHandler::class,
+            [
+                'emailSender'       => $invoiceSender,
+                'entityResource'    => $entityResource,
+                'entityCollection'  => $this->entityCollection,
+                'identityContainer' => $invoiceIdentity,
+            ]
+        );
+    }
+
+    /**
+     * @magentoAppIsolation  enabled
+     * @magentoDbIsolation   disabled
+     * @magentoDataFixture   Magento/Sales/_files/invoice_list_different_stores.php
+     */
+    public function testInvoiceEmailSenderExecute()
+    {
+        $expectedResult = 1;
+
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var Config $defConfig */
+        $defConfig = $objectManager->create(Config::class);
+        $defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        $defConfig->setDataByPath('sales_email/general/async_sending', 1);
+        $defConfig->save();
+
+        /** @var Config $storeConfig */
+        $storeConfig = $objectManager->create(Config::class);
+        $storeConfig->setScope(ScopeInterface::SCOPE_STORES);
+        $storeConfig->setStore('fixture_second_store');
+        $storeConfig->setDataByPath('sales_email/invoice/enabled', 0);
+        $storeConfig->save();
+
+        $sendCollection = clone $this->entityCollection;
+        $sendCollection->addFieldToFilter('send_email', ['eq' => 1]);
+        $sendCollection->addFieldToFilter('email_sent', ['null' => true]);
+
+        $this->emailSender->sendEmails();
+
+        $this->assertCount($expectedResult, $sendCollection->getItems());
+    }
+
+    /**
+     * @inheritdoc
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
+     */
+    protected function tearDown()
+    {
+        /** @var \Magento\Config\Model\Config $defConfig */
+        $defConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Config\Model\Config::class);
+        $defConfig->setScope(\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        $defConfig->setDataByPath('sales_email/general/async_sending', 0);
+        $defConfig->save();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php
index 1bad0eec7d1d0..d9c38d5697d96 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php
@@ -36,6 +36,9 @@ class RendererTest extends \PHPUnit\Framework\TestCase
      */
     private $config;
 
+    /**
+     * Set up
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -46,7 +49,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Sales/_files/order_fixture_store.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testFormat()
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreditmemoFactoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreditmemoFactoryTest.php
index 62807d20b6941..f76a5c83700e7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreditmemoFactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreditmemoFactoryTest.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test for CreditmemoFactory class.
  * @magentoDbIsolation enabled
@@ -17,44 +23,90 @@ class CreditmemoFactoryTest extends \PHPUnit\Framework\TestCase
     const ORDER_ITEM_ID_PLACEHOLDER = 'id_item_';
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
+    /**
+     * @var CreditmemoFactory
+     */
+    private $creditmemoFactory;
+
     /**
      * {@inheritdoc}
      */
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->creditmemoFactory = $this->objectManager->create(CreditmemoFactory::class);
     }
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/order_with_dummy_item_and_invoiced.php
+     * Checks a case when creditmemo created from the order.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_with_bundle_and_invoiced.php
      * @dataProvider createByOrderDataProvider
      * @param array $creditmemoData
      * @param int $expectedQty
      */
     public function testCreateByOrder(array $creditmemoData, $expectedQty)
     {
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->loadByIncrementId('100000001');
-        /** @var \Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory */
-        $creditmemoFactory = $this->objectManager->create(\Magento\Sales\Model\Order\CreditmemoFactory::class);
+        $order = $this->getOrder('100000001');
         $creditmemoData = $this->prepareCreditMemoData($order, $creditmemoData);
-        $creditmemo = $creditmemoFactory->createByOrder($order, $creditmemoData);
-        $this->assertEquals($expectedQty, $creditmemo->getTotalQty(), 'Creditmemo has wrong total qty.');
+        $creditmemo = $this->creditmemoFactory->createByOrder($order, $creditmemoData);
+        self::assertEquals($expectedQty, $creditmemo->getTotalQty(), 'Creditmemo has wrong total qty.');
+    }
+
+    /**
+     * @return array
+     */
+    public function createByOrderDataProvider(): array
+    {
+        return [
+            [
+                'creditmemoData' => [
+                    'qtys' => [
+                        self::ORDER_ITEM_ID_PLACEHOLDER . '2' => 2,
+                        self::ORDER_ITEM_ID_PLACEHOLDER . '3' => 10,
+                    ],
+                ],
+                'expectedQty' => 12,
+            ],
+            [
+                'creditmemoData' => [
+                    'qtys' => [
+                        self::ORDER_ITEM_ID_PLACEHOLDER . '1' => 2,
+                        self::ORDER_ITEM_ID_PLACEHOLDER . '2' => 2,
+                        self::ORDER_ITEM_ID_PLACEHOLDER . '3' => 10,
+                    ],
+                ],
+                'expectedQty' => 14,
+            ],
+        ];
+    }
+
+    /**
+     * Checks a case when creditmemo created from the invoice.
+     *
+     * @magentoDataFixture Magento/Sales/_files/invoice_with_bundle.php
+     *
+     * @return void
+     */
+    public function testCreateByInvoice()
+    {
+        $invoice = $this->getInvoice('100000001');
+        $creditmemo = $this->creditmemoFactory->createByInvoice($invoice);
+        self::assertEquals(14, $creditmemo->getTotalQty(), 'Creditmemo has wrong total qty.');
     }
 
     /**
      * Prepare Creditmemo data.
      *
-     * @param \Magento\Sales\Model\Order $order
+     * @param Order $order
      * @param array $creditmemoData
      * @return array
      */
-    private function prepareCreditMemoData(\Magento\Sales\Model\Order $order, array $creditmemoData)
+    private function prepareCreditMemoData(Order $order, array $creditmemoData): array
     {
         $result = [];
         $orderItems = $order->getAllItems();
@@ -78,23 +130,37 @@ private function prepareOrderItemKey($key)
     }
 
     /**
-     * @return array
+     * Retrieves order by increment ID.
+     *
+     * @param string $incrementId
+     * @return Order
      */
-    public function createByOrderDataProvider()
+    private function getOrder(string $incrementId): Order
     {
-        return [
-            // Variation #1
-            [
-                //$creditmemoData
-                [
-                    'qtys' => [
-                        self::ORDER_ITEM_ID_PLACEHOLDER . '1' => 1,
-                        self::ORDER_ITEM_ID_PLACEHOLDER . '2' => 1,
-                    ]
-                ],
-                //$expectedQty
-                4
-            ]
-        ];
+        /** @var Order $order */
+        $order = $this->objectManager->create(Order::class);
+        $order->loadByIncrementId($incrementId);
+
+        return $order;
+    }
+
+    /**
+     * Retrieves invoice by increment ID.
+     *
+     * @param string $incrementId
+     * @return Invoice
+     */
+    private function getInvoice(string $incrementId): Invoice
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder
+            ->addFilter('increment_id', $incrementId)
+            ->create();
+        /** @var InvoiceRepositoryInterface $repository */
+        $repository = $this->objectManager->get(InvoiceRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
index 869462de237ec..724865176188a 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoAppArea frontend
  */
@@ -15,20 +18,16 @@ class ShipmentSenderTest extends \PHPUnit\Framework\TestCase
      */
     public function testSend()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class)
-            ->setAreaCode('frontend');
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
+        Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
+        $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
         $order->setCustomerEmail('customer@example.com');
 
-        $shipment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Sales\Model\Order\Shipment::class
-        );
-        $shipment->setOrder($order);
+        $shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order);
 
         $this->assertEmpty($shipment->getEmailSent());
 
-        $orderSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        $orderSender = Bootstrap::getObjectManager()
             ->create(\Magento\Sales\Model\Order\Email\Sender\ShipmentSender::class);
         $result = $orderSender->send($shipment, true);
 
@@ -44,19 +43,18 @@ public function testSend()
      */
     public function testPackages()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         $objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
         $order = $objectManager->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
         $order->setCustomerEmail('customer@example.com');
-
+        $items = [];
+        foreach ($order->getItems() as $item) {
+            $items[$item->getId()] = $item->getQtyOrdered();
+        }
         /** @var \Magento\Sales\Model\Order\Shipment $shipment */
-        $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class);
-        $shipment->setOrder($order);
-
+        $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
         $packages = [['1'], ['2']];
-
-        $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class));
         $shipment->setPackages($packages);
         $this->assertEquals($packages, $shipment->getPackages());
         $shipment->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemRepositoryTest.php
new file mode 100644
index 0000000000000..8f0c255a903b9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemRepositoryTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+class ItemRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Sales\Model\Order */
+    private $order;
+
+    /** @var \Magento\Sales\Api\OrderItemRepositoryInterface */
+    private $orderItemRepository;
+
+    /** @var \Magento\Framework\Api\SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->order = $objectManager->create(\Magento\Sales\Model\Order::class);
+        $this->orderItemRepository = $objectManager->create(\Magento\Sales\Api\OrderItemRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_configurable_product.php
+     */
+    public function testAddOrderItemParent()
+    {
+        $this->order->load('100000001', 'increment_id');
+
+        foreach ($this->order->getItems() as $item) {
+            if ($item->getProductType() === \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) {
+                $orderItem = $this->orderItemRepository->get($item->getItemId());
+                $this->assertInstanceOf(\Magento\Sales\Api\Data\OrderItemInterface::class, $orderItem->getParentItem());
+            }
+        }
+
+        $itemList = $this->orderItemRepository->getList(
+            $this->searchCriteriaBuilder->addFilter('order_id', $this->order->getId())->create()
+        );
+
+        foreach ($itemList->getItems() as $item) {
+            if ($item->getProductType() === \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) {
+                $this->assertInstanceOf(\Magento\Sales\Api\Data\OrderItemInterface::class, $item->getParentItem());
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php
new file mode 100644
index 0000000000000..7f0ec2ae92f89
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for shipment document factory.
+ */
+class ShipmentDocumentFactoryTest extends TestCase
+{
+    /**
+     * @var Order
+     */
+    private $order;
+
+    /**
+     * @var ShipmentDocumentFactory
+     */
+    private $shipmentDocumentFactory;
+
+    /**
+     * @var ShipmentCreationArgumentsInterface
+     */
+    private $shipmentCreationArgumentsInterface;
+
+    /**
+     * @var ShipmentCreationArgumentsExtensionInterfaceFactory
+     */
+    private $shipmentCreationArgumentsExtensionInterfaceFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->order = $objectManager->create(Order::class);
+        $this->shipmentDocumentFactory = $objectManager->create(ShipmentDocumentFactory::class);
+        $this->shipmentCreationArgumentsInterface = $objectManager
+            ->create(ShipmentCreationArgumentsInterface::class);
+        $this->shipmentCreationArgumentsExtensionInterfaceFactory = $objectManager
+            ->create(ShipmentCreationArgumentsExtensionInterfaceFactory::class);
+    }
+
+    /**
+     * Create shipment with shipment creation arguments.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testCreate(): void
+    {
+        $order = $this->order->loadByIncrementId('100000001');
+        $argumentsExtensionAttributes = $this->shipmentCreationArgumentsExtensionInterfaceFactory->create([
+            'data' => ['test_attribute_value' => 'test_value']
+        ]);
+        $this->shipmentCreationArgumentsInterface->setExtensionAttributes($argumentsExtensionAttributes);
+        $shipment = $this->shipmentDocumentFactory->create(
+            $order,
+            [],
+            [],
+            null,
+            false,
+            [],
+            $this->shipmentCreationArgumentsInterface
+        );
+        $shipmentExtensionAttributes = $shipment->getExtensionAttributes();
+        self::assertEquals('test_value', $shipmentExtensionAttributes->getTestAttributeValue());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
index 46820d1440ca6..1d04a79ae3f84 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
@@ -3,80 +3,145 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Payment\Helper\Data;
+use Magento\Sales\Api\Data\CommentInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\Sales\Api\Data\ShipmentTrackInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
 /**
- * Class ShipmentTest
  * @magentoAppIsolation enabled
- * @package Magento\Sales\Model\Order
+ * @magentoDataFixture Magento/Sales/_files/order.php
  */
 class ShipmentTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ShipmentRepositoryInterface
+     */
+    private $shipmentRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->shipmentRepository = $this->objectManager->get(ShipmentRepositoryInterface::class);
+    }
+
     /**
      * Check the correctness and stability of set/get packages of shipment
      *
-     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoAppArea frontend
      */
     public function testPackages()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-        $order = $objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->loadByIncrementId('100000001');
-        $order->setCustomerEmail('customer@example.com');
+        $order = $this->getOrder('100000001');
 
         $payment = $order->getPayment();
-        $paymentInfoBlock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Payment\Helper\Data::class
-        )->getInfoBlock(
-            $payment
-        );
+        $paymentInfoBlock = $this->objectManager->get(Data::class)
+            ->getInfoBlock($payment);
         $payment->setBlockMock($paymentInfoBlock);
 
+        $items = [];
+        foreach ($order->getItems() as $item) {
+            $items[$item->getId()] = $item->getQtyOrdered();
+        }
         /** @var \Magento\Sales\Model\Order\Shipment $shipment */
-        $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class);
-        $shipment->setOrder($order);
+        $shipment = $this->objectManager->get(ShipmentFactory::class)->create($order, $items);
 
         $packages = [['1'], ['2']];
 
-        $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class));
         $shipment->setPackages($packages);
-        $this->assertEquals($packages, $shipment->getPackages());
-        $shipment->save();
-        $shipment->save();
-        $shipment->load($shipment->getId());
-        $this->assertEquals($packages, $shipment->getPackages());
+        $saved = $this->shipmentRepository->save($shipment);
+        self::assertEquals($packages, $saved->getPackages());
     }
 
     /**
      * Check that getTracksCollection() always return collection instance.
-     *
-     * @magentoDataFixture Magento/Sales/_files/order.php
      */
     public function testAddTrack()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $order = $this->getOrder('100000001');
 
-        $order = $objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->loadByIncrementId('100000001');
+        /** @var ShipmentTrackInterface $track */
+        $track = $this->objectManager->create(ShipmentTrackInterface::class);
+        $track->setNumber('Test Number')
+            ->setTitle('Test Title')
+            ->setCarrierCode('Test CODE');
 
+        $items = [];
+        foreach ($order->getItems() as $item) {
+            $items[$item->getId()] = $item->getQtyOrdered();
+        }
         /** @var \Magento\Sales\Model\Order\Shipment $shipment */
-        $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class);
-        $shipment->setOrder($order);
+        $shipment = $this->objectManager->get(ShipmentFactory::class)
+            ->create($order, $items);
+        $shipment->addTrack($track);
+        $this->shipmentRepository->save($shipment);
+        $saved = $this->shipmentRepository->get((int)$shipment->getEntityId());
+        self::assertNotEmpty($saved->getTracks());
+    }
+
+    /**
+     * Checks adding comment to the shipment entity.
+     */
+    public function testAddComment()
+    {
+        $message1 = 'Test Comment 1';
+        $message2 = 'Test Comment 2';
+        $order = $this->getOrder('100000001');
+
+        /** @var ShipmentInterface $shipment */
+        $shipment = $this->objectManager->create(ShipmentInterface::class);
+        $shipment->setOrder($order)
+            ->addItem($this->objectManager->create(ShipmentItemInterface::class))
+            ->addComment($message1)
+            ->addComment($message2);
 
-        $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class));
-        $shipment->save();
+        $saved = $this->shipmentRepository->save($shipment);
 
-        /** @var $track \Magento\Sales\Model\Order\Shipment\Track */
-        $track = $objectManager->get(\Magento\Sales\Model\Order\Shipment\Track::class);
-        $track->setNumber('Test Number')->setTitle('Test Title')->setCarrierCode('Test CODE');
+        $comments = $saved->getComments();
+        $actual = array_map(function (CommentInterface $comment) {
+            return $comment->getComment();
+        }, $comments);
+        self::assertEquals(2, count($actual));
+        self::assertEquals([$message1, $message2], $actual);
+    }
+
+    /**
+     * Gets order entity by increment id.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId): OrderInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', $incrementId)
+            ->create();
 
-        $this->assertEmpty($shipment->getTracks());
-        $shipment->addTrack($track)->save();
+        /** @var OrderRepositoryInterface $repository */
+        $repository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
 
-        //to empty cache
-        $shipment->setTracks(null);
-        $this->assertNotEmpty($shipment->getTracks());
+        return array_pop($items);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/StatusTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/StatusTest.php
new file mode 100644
index 0000000000000..e4b64e77d6e05
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/StatusTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Model\Order;
+
+/**
+ * Class ShipmentTest
+ * @package Magento\Sales\Model\Order
+ */
+class StatusTest extends \PHPUnit\Framework\TestCase
+{
+    public function theCorrectLabelIsUsedDependingOnTheAreaProvider()
+    {
+        return [
+            'backend label' => [
+                'adminhtml',
+                'Example',
+            ],
+            'store view label' => [
+                'frontend',
+                'Store view example',
+            ],
+        ];
+    }
+
+    /**
+     * In the backend the regular label must be showed.
+     *
+     * @param $area
+     * @param $result
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_status.php
+     * @dataProvider theCorrectLabelIsUsedDependingOnTheAreaProvider
+     */
+    public function testTheCorrectLabelIsUsedDependingOnTheArea($area, $result)
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->get(\Magento\Framework\App\State::class)->setAreaCode($area);
+
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId('100000001');
+
+        $this->assertEquals($result, $order->getStatusLabel());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php
new file mode 100644
index 0000000000000..6111c73038f7c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model;
+
+/**
+ * Class to verify isIncrementIdUsed method behaviour.
+ */
+class OrderIncrementIdCheckerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $checker;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->checker = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Model\OrderIncrementIdChecker::class
+        );
+    }
+
+    /**
+     * Test to verify if isIncrementIdUsed method works with numeric increment ids.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @return void
+     */
+    public function testIsOrderIncrementIdUsedNumericIncrementId(): void
+    {
+        $this->assertTrue($this->checker->isIncrementIdUsed('100000001'));
+    }
+
+    /**
+     * Test to verify if isIncrementIdUsed method works with alphanumeric increment ids.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_alphanumeric_id.php
+     * @return void
+     */
+    public function testIsOrderIncrementIdUsedAlphanumericIncrementId(): void
+    {
+        $this->assertTrue($this->checker->isIncrementIdUsed('M00000001'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php
new file mode 100644
index 0000000000000..1649706a51f6b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\ResourceModel\Order\Grid;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Tests collection properties.
+     *
+     * @throws \ReflectionException
+     * @return void
+     */
+    public function testCollectionCreate(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var Collection $gridCollection */
+        $gridCollection = $objectManager->get(Collection::class);
+        $tableDescription = $gridCollection->getConnection()
+            ->describeTable($gridCollection->getMainTable());
+
+        $mapper = new \ReflectionMethod(
+            Collection::class,
+            '_getMapper'
+        );
+        $mapper->setAccessible(true);
+        $map = $mapper->invoke($gridCollection);
+
+        self::assertInternalType('array', $map);
+        self::assertArrayHasKey('fields', $map);
+        self::assertInternalType('array', $map['fields']);
+        self::assertCount(count($tableDescription), $map['fields']);
+
+        foreach ($map['fields'] as $mappedName) {
+            self::assertContains('main_table.', $mappedName);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Payment/EncryptionUpdateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Payment/EncryptionUpdateTest.php
new file mode 100644
index 0000000000000..c0de639ea7429
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Payment/EncryptionUpdateTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\ResourceModel\Order\Payment;
+
+use Magento\Framework\Encryption\Encryptor;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class EncryptionUpdateTest extends \PHPUnit\Framework\TestCase
+{
+    const TEST_CC_NUMBER = '4111111111111111';
+
+    /**
+     * Tests re-encryption of credit card numbers
+     *
+     * @magentoDataFixture Magento/Sales/_files/payment_enc_cc.php
+     */
+    public function testReEncryptCreditCardNumbers()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var \Magento\Framework\Encryption\EncryptorInterface $encyptor */
+        $encyptor = $objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
+
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdate $resource */
+        $resource = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdate::class);
+        $resource->reEncryptCreditCardNumbers();
+
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Payment\Collection $collection */
+        $collection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Payment\Collection::class);
+        $collection->addFieldToFilter('cc_number_enc', ['notnull' => true]);
+
+        $this->assertGreaterThan(0, $collection->getTotalCount());
+
+        /** @var \Magento\Sales\Model\Order\Payment $payment */
+        foreach ($collection->getItems() as $payment) {
+            $this->assertEquals(
+                static::TEST_CC_NUMBER,
+                $encyptor->decrypt($payment->getCcNumberEnc())
+            );
+            
+            $this->assertStringStartsWith('0:' . Encryptor::CIPHER_LATEST . ':', $payment->getCcNumberEnc());
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php
new file mode 100644
index 0000000000000..6367ff6d1a6d3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Service;
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\PaymentFailuresInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests \Magento\Sales\Api\PaymentFailuresInterface.
+ */
+class PaymentFailuresServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cartRepositoryMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $this->cartRepositoryMock = $this->getMockBuilder(CartRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMockForAbstractClass();
+
+        $this->paymentFailures = Bootstrap::getObjectManager()->create(
+            PaymentFailuresInterface::class,
+            [
+                'cartRepository' => $this->cartRepositoryMock,
+            ]
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/quote_with_two_products_and_customer.php
+     * @magentoConfigFixture current_store payment/payflowpro/title Some Title Of The Method
+     * @magentoConfigFixture current_store carriers/freeshipping/title Some Shipping Method
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testHandlerWithCustomer(): void
+    {
+        $errorMessage = __('Transaction declined.');
+        $checkoutType = 'custom_checkout';
+
+        $this->quote->load('test01', 'reserved_order_id');
+        $this->cartRepositoryMock->method('get')
+            ->with($this->quote->getId())
+            ->willReturn($this->quote);
+
+        $this->paymentFailures->handle((int)$this->quote->getId(), $errorMessage->render());
+
+        $paymentReflection = new \ReflectionClass($this->paymentFailures);
+        $templateTimeMethod = $paymentReflection->getMethod('getLocaleDate');
+        $templateTimeMethod->setAccessible(true);
+
+        $templateVarsMethod = $paymentReflection->getMethod('getTemplateVars');
+        $templateVarsMethod->setAccessible(true);
+
+        $templateVars = $templateVarsMethod->invoke($this->paymentFailures, $this->quote, $errorMessage, $checkoutType);
+        $expectedVars = [
+            'reason' => $errorMessage,
+            'checkoutType' => $checkoutType,
+            'dateAndTime' => $templateTimeMethod->invoke($this->paymentFailures),
+            'customer' => 'John Smith',
+            'customerEmail' => 'aaa@aaa.com',
+            'paymentMethod' => 'Some Title Of The Method',
+            'shippingMethod' => 'Some Shipping Method',
+            'items' => 'Simple Product  x 2  USD 10<br />Custom Design Simple Product  x 1  USD 10',
+            'total' => 'USD 30.0000',
+            'billingAddress' => $this->quote->getBillingAddress(),
+            'shippingAddress' => $this->quote->getShippingAddress(),
+        ];
+
+        $this->assertEquals($expectedVars, $templateVars);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php b/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php
index 2d131bf5f57e2..394b13078010a 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php
@@ -6,6 +6,7 @@
 
 return [
     'region' => 'CA',
+    'region_id' => '12',
     'postcode' => '11111',
     'lastname' => 'lastname',
     'firstname' => 'firstname',
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 676fedbb19fc1..a0316b77348f5 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/invoice_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list.php
index 669b1a4268388..b5a4f5fa1eb0b 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list.php
@@ -53,9 +53,9 @@
     ],
 ];
 
-/** @var array $creditMemoData */
+/** @var array $invoiceData */
 foreach ($invoices as $invoiceData) {
-    /** @var \Magento\Sales\Model\Order\Creditmemo $creditMemo */
+    /** @var \Magento\Sales\Model\Order\Invoice $invoice */
     $invoice = $objectManager->create(\Magento\Sales\Model\Order\Invoice::class);
     $invoice
         ->setData($invoiceData)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores.php
new file mode 100644
index 0000000000000..e6a1947b72edd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+require __DIR__ . '/../../../Magento/Store/_files/second_store.php';
+
+$addressData = include __DIR__ . '/address_data.php';
+
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Store\Model\Store::class);
+$secondStoreId = $store->load('fixture_second_store')->getId();
+
+$orders = [
+    [
+        'increment_id'     => '100000002',
+        'state'            => \Magento\Sales\Model\Order::STATE_NEW,
+        'status'           => 'processing',
+        'grand_total'      => 120.00,
+        'subtotal'         => 120.00,
+        'base_grand_total' => 120.00,
+        'store_id'         => 0,
+        'website_id'       => 1,
+    ],
+    [
+        'increment_id'     => '100000003',
+        'state'            => \Magento\Sales\Model\Order::STATE_PROCESSING,
+        'status'           => 'processing',
+        'grand_total'      => 140.00,
+        'base_grand_total' => 140.00,
+        'subtotal'         => 140.00,
+        'store_id'         => 1,
+        'website_id'       => 0,
+    ],
+    [
+        'increment_id'     => '100000004',
+        'state'            => \Magento\Sales\Model\Order::STATE_PROCESSING,
+        'status'           => 'closed',
+        'grand_total'      => 140.00,
+        'base_grand_total' => 140.00,
+        'subtotal'         => 140.00,
+        'store_id'         => $secondStoreId,
+        'website_id'       => 1,
+    ],
+];
+
+/** @var \Magento\Sales\Model\Order\Address $billingAddress */
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var \Magento\Sales\Model\Order\Address $shippingAddress */
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var \Magento\Sales\Model\Order\Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+$payment->setAdditionalInformation('last_trans_id', '11122');
+$payment->setAdditionalInformation('metadata', [
+    'type'       => 'free',
+    'fraudulent' => false,
+]);
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(2);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType('simple');
+
+/** @var \Magento\Sales\Api\InvoiceManagementInterface $orderService */
+$orderService = \Magento\TestFramework\ObjectManager::getInstance()->create(
+    \Magento\Sales\Api\InvoiceManagementInterface::class
+);
+
+/** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+
+foreach ($orders as $orderFixture) {
+    /** @var \Magento\Sales\Model\Order $order */
+    $order = $objectManager->create(\Magento\Sales\Model\Order::class);
+    $order->setData($orderFixture);
+    $order->setIncrementId(
+        $orderFixture['increment_id']
+    )->setStoreId(
+        $orderFixture['store_id']
+    )->setState(
+        $orderFixture['state']
+    )->setStatus(
+        $orderFixture['status']
+    )->setSubtotal(
+        $orderFixture['subtotal']
+    )->setGrandTotal(
+        $orderFixture['grand_total']
+    )->setBaseSubtotal(
+        $orderFixture['subtotal']
+    )->setBaseGrandTotal(
+        $orderFixture['base_grand_total']
+    )->setCustomerIsGuest(
+        true
+    )->setCustomerEmail(
+        'customer@null.com'
+    )->setBillingAddress(
+        clone $billingAddress
+    )->setShippingAddress(
+        clone $shippingAddress
+    )->addItem(
+        clone $orderItem
+    )->setPayment(
+        clone $payment
+    );
+
+    $orderRepository->save($order);
+
+    /** @var \Magento\Sales\Model\Order\Invoice $invoice */
+    $invoice = $orderService->prepareInvoice($order, $order->getItems());
+    $invoice->register();
+    $invoice->setSendEmail(1);
+    $invoice->setStoreId($orderFixture['store_id']);
+    $order = $invoice->getOrder();
+    $order->setIsInProcess(true);
+    $transactionSave = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->create(\Magento\Framework\DB\Transaction::class);
+    $transactionSave->addObject($invoice)->addObject($order)->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php
new file mode 100644
index 0000000000000..803a69cabf77b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';
+require __DIR__ . '/../../../Magento/Store/_files/second_store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_bundle.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_bundle.php
new file mode 100644
index 0000000000000..1083b48d4b9a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_bundle.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\InvoiceItemRepositoryInterface;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\Order\Invoice\ItemFactory;
+use Magento\Sales\Model\Service\InvoiceService;
+use Magento\TestFramework\ObjectManager;
+
+require 'order_with_bundle_and_invoiced.php';
+/** @var \Magento\Sales\Model\Order $order */
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var InvoiceService $invoiceService */
+$invoiceService = $objectManager->get(InvoiceService::class);
+$invoice = $invoiceService->prepareInvoice($order);
+$invoice->setIncrementId('100000001');
+$invoice->register();
+
+/** @var InvoiceRepositoryInterface $invoiceRepository */
+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
+$invoice = $invoiceRepository->save($invoice);
+
+/** @var ItemFactory $itemFactory */
+$itemFactory = $objectManager->get(ItemFactory::class);
+/** @var InvoiceItemRepositoryInterface $itemRepository */
+$itemRepository = $objectManager->get(InvoiceItemRepositoryInterface::class);
+
+foreach ($order->getAllItems() as $item) {
+    $invoiceItem = $itemFactory->create(['data' => $item->getData()]);
+    $invoiceItem->setId(null)
+        ->setInvoice($invoice)
+        ->setOrderItem($item)
+        ->setQty($item->getQtyInvoiced());
+    $itemRepository->save($invoiceItem);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_bundle_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_bundle_rollback.php
new file mode 100644
index 0000000000000..f804444f543ae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_bundle_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order_with_bundle_and_invoiced_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index f1e2afc88b6f8..a1c5f8277762c 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -4,6 +4,13 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Store\Model\StoreManagerInterface;
+
 require 'default_rollback.php';
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 /** @var \Magento\Catalog\Model\Product $product */
@@ -12,57 +19,50 @@
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
 $billingAddress->setAddressType('billing');
 
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
-$payment->setMethod('checkmo');
-$payment->setAdditionalInformation('last_trans_id', '11122');
-$payment->setAdditionalInformation('metadata', [
-    'type' => 'free',
-    'fraudulent' => false
-]);
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('checkmo')
+    ->setAdditionalInformation('last_trans_id', '11122')
+    ->setAdditionalInformation(
+        'metadata',
+        [
+            'type' => 'free',
+            'fraudulent' => false,
+        ]
+    );
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple');
 
-/** @var \Magento\Sales\Model\Order\Item $orderItem */
-$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
-$orderItem->setProductId($product->getId())->setQtyOrdered(2);
-$orderItem->setBasePrice($product->getPrice());
-$orderItem->setPrice($product->getPrice());
-$orderItem->setRowTotal($product->getPrice());
-$orderItem->setProductType('simple');
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000001')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
 
-/** @var \Magento\Sales\Model\Order $order */
-$order = $objectManager->create(\Magento\Sales\Model\Order::class);
-$order->setIncrementId(
-    '100000001'
-)->setState(
-    \Magento\Sales\Model\Order::STATE_PROCESSING
-)->setStatus(
-    $order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING)
-)->setSubtotal(
-    100
-)->setGrandTotal(
-    100
-)->setBaseSubtotal(
-    100
-)->setBaseGrandTotal(
-    100
-)->setCustomerIsGuest(
-    true
-)->setCustomerEmail(
-    'customer@null.com'
-)->setBillingAddress(
-    $billingAddress
-)->setShippingAddress(
-    $shippingAddress
-)->setStoreId(
-    $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId()
-)->addItem(
-    $orderItem
-)->setPayment(
-    $payment
-);
-$order->save();
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product.php
new file mode 100644
index 0000000000000..65dffd015c809
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Sales\Model\Order\Payment;
+
+// @codingStandardsIgnoreFile
+
+require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
+
+/** @var \Magento\Catalog\Model\Product $product */
+$configurableProduct = $product;
+
+$addressData = include __DIR__ . '/address_data.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Sales\Model\Order\Address $billingAddress */
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('checkmo')
+    ->setAdditionalInformation([
+        'token_metadata' => [
+            'token'       => 'f34vjw',
+            'customer_id' => 1,
+        ],
+    ]);
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001')
+    ->setState(\Magento\Sales\Model\Order::STATE_PENDING_PAYMENT)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PENDING_PAYMENT))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId())
+    ->setPayment($payment);
+$order->save();
+
+$qtyOrdered = 2;
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderConfigurableItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderConfigurableItem->setProductId($configurableProduct->getId())->setQtyOrdered($qtyOrdered);
+$orderConfigurableItem->setBasePrice($configurableProduct->getPrice());
+$orderConfigurableItem->setPrice($configurableProduct->getPrice());
+$orderConfigurableItem->setRowTotal($configurableProduct->getPrice());
+$orderConfigurableItem->setParentItemId(null);
+$orderConfigurableItem->setProductType('configurable');
+$orderConfigurableItem->setOrder($order);
+/** @var \Magento\Sales\Api\OrderItemRepositoryInterface $orderItemsRepository */
+$orderItemsRepository = $objectManager->create(\Magento\Sales\Api\OrderItemRepositoryInterface::class);
+// Configurable item must be present in database to have its real ID to set parent id of simple product.
+$orderItemsRepository->save($orderConfigurableItem);
+
+if ($configurableProduct->getExtensionAttributes()
+    && (array)$configurableProduct->getExtensionAttributes()->getConfigurableProductLinks()
+) {
+    $simpleProductId = current($configurableProduct->getExtensionAttributes()->getConfigurableProductLinks());
+    /** @var \Magento\Catalog\Api\Data\ProductInterface $simpleProduct */
+    $simpleProduct = $productRepository->getById($simpleProductId);
+    $orderItem = $objectManager->create(\Magento\Sales\Api\Data\OrderItemInterface::class);
+    $orderItem->setBasePrice($simpleProduct->getPrice());
+    $orderItem->setPrice($simpleProduct->getPrice());
+    $orderItem->setRowTotal($simpleProduct->getPrice());
+    $orderItem->setProductType('simple');
+    // duplicate behavior with simple product associated with configurable one that happens during order process.
+    $orderItem->setProductId($simpleProduct->getId())->setQtyOrdered($qtyOrdered);
+    $orderItem->setParentItemId($orderConfigurableItem->getId());
+    $orderItem->setOrder($order);
+    $orderItemsRepository->save($orderItem);
+}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php
new file mode 100644
index 0000000000000..e838a8bc7f44a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
new file mode 100644
index 0000000000000..d2be07b1e097f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+// @codingStandardsIgnoreFile
+
+require 'default_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+$addressData = include __DIR__ . '/address_data.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Sales\Model\Order\Address $billingAddress */
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var \Magento\Sales\Model\Order\Address $shippingAddress */
+$shippingAddress = clone $billingAddress;
+$shippingAddress
+    ->setId(null)
+    ->setAddressType('shipping')
+    ->setCity('San Francisco');
+
+/** @var \Magento\Sales\Model\Order\Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+$payment->setAdditionalInformation('last_trans_id', '11122');
+$payment->setAdditionalInformation('metadata', [
+    'type' => 'free',
+    'fraudulent' => false,
+]);
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(2);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType('simple');
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001')
+    ->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+$order->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
index 31aa8aafd94d9..f3e528b9c0d28 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
@@ -85,6 +85,9 @@
 $invoice = $invoiceFactory->prepareInvoice($order, [$item->getId() => 10]);
 $invoice->register();
 $invoice->save();
+$order->save();
+
+$invoice = $objectManager->get(\Magento\Sales\Api\InvoiceRepositoryInterface::class)->get($invoice->getId());
 
 /** @var \Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory */
 $creditmemoFactory = $objectManager->get(\Magento\Sales\Model\Order\CreditmemoFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
index 43e98419798a8..251a384580062 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -5,6 +5,8 @@
  */
 
 use Magento\Sales\Model\Order;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Address as OrderAddress;
 
 require 'order.php';
 /** @var Order $order */
@@ -48,16 +50,32 @@
     ],
 ];
 
+$orderList = [];
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
 /** @var array $orderData */
 foreach ($orders as $orderData) {
     /** @var $order \Magento\Sales\Model\Order */
     $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
         \Magento\Sales\Model\Order::class
     );
+
+    // Reset addresses
+    /** @var Order\Address $billingAddress */
+    $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
+    $billingAddress->setAddressType('billing');
+
+    $shippingAddress = clone $billingAddress;
+    $shippingAddress->setId(null)->setAddressType('shipping');
+
     $order
         ->setData($orderData)
         ->addItem($orderItem)
+        ->setCustomerIsGuest(true)
+        ->setCustomerEmail('customer@null.com')
         ->setBillingAddress($billingAddress)
-        ->setBillingAddress($shippingAddress)
-        ->save();
+        ->setShippingAddress($shippingAddress);
+
+    $orderRepository->save($order);
+    $orderList[] = $order;
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php
index aae4a557ba1ed..6e24cee501f51 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_rollback.php
@@ -4,6 +4,4 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Sales\Model\Order;
-
 require 'default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php
new file mode 100644
index 0000000000000..48f6ccfead297
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Tax\ItemFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Sales\Order\TaxFactory;
+
+require 'default_rollback.php';
+require 'order_list.php';
+
+/** @var array $orderList */
+foreach ($orderList as $order) {
+    $amount = 45;
+    $taxFactory = $objectManager->create(TaxFactory::class);
+
+    /** @var \Magento\Tax\Model\Sales\Order\Tax  $tax */
+    $tax = $taxFactory->create();
+    $tax->setOrderId($order->getId())
+        ->setCode('US-NY-*-Rate 1')
+        ->setTitle('US-NY-*-Rate 1')
+        ->setPercent(8.37)
+        ->setAmount($amount)
+        ->setBaseAmount($amount)
+        ->setBaseRealAmount($amount);
+    $tax->save();
+
+    $salesOrderFactory = $objectManager->create(ItemFactory::class);
+
+    /** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
+    $salesOrderItem = $salesOrderFactory->create();
+    $salesOrderItem->setOrderId($order->getId())
+        ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+        ->setProductOptions([]);
+    $salesCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Item::class);
+    $salesCollection->save($salesOrderItem);
+
+    /** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
+    $salesOrderTaxItem = $salesOrderFactory->create();
+    $salesOrderTaxItem->setTaxId($tax->getId())
+        ->setTaxPercent(8.37)
+        ->setTaxAmount($amount)
+        ->setBaseAmount($amount)
+        ->setRealAmount($amount)
+        ->setRealBaseAmount($amount)
+        ->setAppliedTaxes([$tax])
+        ->setTaxableItemType('shipping')
+        ->setItemId($salesOrderItem->getId());
+
+    $taxItemCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Tax\Item::class);
+    $taxItemCollection->save($salesOrderTaxItem);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
new file mode 100644
index 0000000000000..dd52deab825cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_status.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status.php
new file mode 100644
index 0000000000000..e65dd6b682396
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/order.php';
+
+$orderStatus = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Sales\Model\Order\Status::class
+);
+
+$data = [
+    'status' => 'example',
+    'label' => 'Example',
+    'store_labels' => [
+        1 => 'Store view example',
+    ]
+];
+
+$orderStatus->setData($data)->setStatus('example');
+$orderStatus->save();
+
+$order->setStatus('example');
+$order->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php
new file mode 100644
index 0000000000000..4473fb8dfe72c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+
+require 'order.php';
+/** @var Order $order */
+
+$orderItems = [
+    [
+        OrderItemInterface::PRODUCT_ID => 2,
+        OrderItemInterface::BASE_PRICE => 100,
+        OrderItemInterface::ORDER_ID => $order->getId(),
+        OrderItemInterface::QTY_ORDERED => 2,
+        OrderItemInterface::QTY_INVOICED => 2,
+        OrderItemInterface::PRICE => 100,
+        OrderItemInterface::ROW_TOTAL => 102,
+        OrderItemInterface::PRODUCT_TYPE => 'bundle',
+        'product_options' => [
+            'product_calculations' => 0,
+            'info_buyRequest' => [
+                'bundle_option' => [1 => 1],
+                'bundle_option_qty' => 1,
+            ]
+        ],
+        'children' => [
+            [
+                OrderItemInterface::PRODUCT_ID => 13,
+                OrderItemInterface::ORDER_ID => $order->getId(),
+                OrderItemInterface::QTY_ORDERED => 10,
+                OrderItemInterface::QTY_INVOICED => 10,
+                OrderItemInterface::BASE_PRICE => 90,
+                OrderItemInterface::PRICE => 90,
+                OrderItemInterface::ROW_TOTAL => 92,
+                OrderItemInterface::PRODUCT_TYPE => 'simple',
+                'product_options' => [
+                    'bundle_selection_attributes' => [
+                        'qty' => 2,
+                    ],
+                ],
+            ],
+        ],
+    ],
+];
+
+if (!function_exists('saveOrderItems')) {
+    /**
+     * Save Order Items.
+     *
+     * @param array $orderItems
+     * @param Item|null $parentOrderItem [optional]
+     * @return void
+     */
+    function saveOrderItems(array $orderItems, Order $order, $parentOrderItem = null)
+    {
+        $objectManager = ObjectManager::getInstance();
+
+        foreach ($orderItems as $orderItemData) {
+            /** @var Item $orderItem */
+            $orderItem = $objectManager->create(Item::class);
+            if (null !== $parentOrderItem) {
+                $orderItemData['parent_item'] = $parentOrderItem;
+            }
+            $orderItem->setData($orderItemData);
+            $order->addItem($orderItem);
+
+            if (isset($orderItemData['children'])) {
+                saveOrderItems($orderItemData['children'], $order, $orderItem);
+            }
+        }
+    }
+}
+
+saveOrderItems($orderItems, $order);
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$order = $orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_invoiced.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_invoiced.php
new file mode 100644
index 0000000000000..53eb0018d9881
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_invoiced.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\OrderItemRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+
+require 'order.php';
+/** @var Order $order */
+
+$orderItems = [
+    [
+        OrderItemInterface::PRODUCT_ID => 2,
+        OrderItemInterface::BASE_PRICE => 100,
+        OrderItemInterface::ORDER_ID => $order->getId(),
+        OrderItemInterface::QTY_ORDERED => 2,
+        OrderItemInterface::QTY_INVOICED => 2,
+        OrderItemInterface::PRICE => 100,
+        OrderItemInterface::ROW_TOTAL => 102,
+        OrderItemInterface::PRODUCT_TYPE => 'bundle',
+        'product_options' => [
+            'product_calculations' => 0,
+        ],
+        'children' => [
+            [
+                OrderItemInterface::PRODUCT_ID => 13,
+                OrderItemInterface::ORDER_ID => $order->getId(),
+                OrderItemInterface::QTY_ORDERED => 10,
+                OrderItemInterface::QTY_INVOICED => 10,
+                OrderItemInterface::BASE_PRICE => 90,
+                OrderItemInterface::PRICE => 90,
+                OrderItemInterface::ROW_TOTAL => 92,
+                OrderItemInterface::PRODUCT_TYPE => 'simple',
+                'product_options' => [
+                    'bundle_selection_attributes' => [
+                        'qty' => 2,
+                    ],
+                ],
+            ],
+        ],
+    ],
+];
+
+/** @var OrderItemRepositoryInterface $itemRepository */
+$itemRepository = $objectManager->get(OrderItemRepositoryInterface::class);
+// Invoiced all existing order items.
+foreach ($order->getAllItems() as $item) {
+    $item->setQtyInvoiced($item->getQtyOrdered());
+    $itemRepository->save($item);
+}
+
+if (!function_exists('saveOrderItems')) {
+    /**
+     * Save Order Items.
+     *
+     * @param array $orderItems
+     * @param Item|null $parentOrderItem [optional]
+     * @return void
+     */
+    function saveOrderItems(array $orderItems, Order $order, $parentOrderItem = null)
+    {
+        $objectManager = ObjectManager::getInstance();
+
+        foreach ($orderItems as $orderItemData) {
+            /** @var Item $orderItem */
+            $orderItem = $objectManager->create(Item::class);
+            if (null !== $parentOrderItem) {
+                $orderItemData['parent_item'] = $parentOrderItem;
+            }
+            $orderItem->setData($orderItemData);
+            $order->addItem($orderItem);
+
+            if (isset($orderItemData['children'])) {
+                saveOrderItems($orderItemData['children'], $order, $orderItem);
+            }
+        }
+    }
+}
+
+saveOrderItems($orderItems, $order);
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$order = $orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_invoiced_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_invoiced_rollback.php
new file mode 100644
index 0000000000000..dd52deab825cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_invoiced_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_rollback.php
new file mode 100644
index 0000000000000..dd52deab825cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
new file mode 100644
index 0000000000000..08c54844f2749
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+include __DIR__ . '/order_with_multiple_items.php';
+include __DIR__ . '/../../../Magento/Customer/_files/customer.php';
+
+$customerIdFromFixture = 1;
+/** @var $order \Magento\Sales\Model\Order */
+$order->setCustomerId($customerIdFromFixture)->setCustomerIsGuest(false)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
new file mode 100644
index 0000000000000..a83b01589ea9c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Store\Model\StoreManagerInterface;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+$addressData = include __DIR__ . '/address_data.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('checkmo')
+    ->setAdditionalInformation('last_trans_id', '11122')
+    ->setAdditionalInformation(
+        'metadata',
+        [
+            'type' => 'free',
+            'fraudulent' => false,
+        ]
+    );
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple')
+    ->setDiscountAmount(2)
+    ->setBaseRowTotal($product->getPrice())
+    ->setBaseDiscountAmount(2);
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000001')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php
new file mode 100644
index 0000000000000..ae0523d34fd2f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order.php';
+/** @var \Magento\Catalog\Model\Product $product */
+/** @var \Magento\Sales\Model\Order $order */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_full_option_set.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_url_key.php';
+$orderItems[] = [
+        'product_id' => $product->getId(),
+        'base_price' => 123,
+        'order_id' => $order->getId(),
+        'price' => 123,
+        'row_total' => 126,
+        'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_all_fields.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_custom_attribute.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+/** @var array $orderItemData */
+foreach ($orderItems as $orderItemData) {
+    /** @var $orderItem \Magento\Sales\Model\Order\Item */
+    $orderItem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        \Magento\Sales\Model\Order\Item::class
+    );
+    $orderItem
+        ->setData($orderItemData)
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
index a889235ea1862..4c892904b3c3e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+
 require 'order.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -36,4 +39,10 @@
 
 $order->setIsInProcess(true);
 
-$transaction->addObject($invoice)->addObject($order)->save();
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+
+$transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php
new file mode 100644
index 0000000000000..0c7dc522f5759
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Tax\ItemFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Sales\Order\TaxFactory;
+
+require 'default_rollback.php';
+require 'order.php';
+
+$amount = 45;
+$taxFactory = $objectManager->create(TaxFactory::class);
+
+/** @var \Magento\Tax\Model\Sales\Order\Tax  $tax */
+$tax = $taxFactory->create();
+$tax->setOrderId($order->getId())
+    ->setCode('US-NY-*-Rate 1')
+    ->setTitle('US-NY-*-Rate 1')
+    ->setPercent(8.37)
+    ->setAmount($amount)
+    ->setBaseAmount($amount)
+    ->setBaseRealAmount($amount);
+$tax->save();
+
+$salesOrderFactory = $objectManager->create(ItemFactory::class);
+
+/** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
+$salesOrderItem = $salesOrderFactory->create();
+$salesOrderItem->setOrderId($order->getId())
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->setProductOptions([]);
+$salesCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Item::class);
+$salesCollection->save($salesOrderItem);
+
+/** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderTaxItem */
+$salesOrderTaxItem = $salesOrderFactory->create();
+$salesOrderTaxItem->setTaxId($tax->getId())
+    ->setTaxPercent(8.37)
+    ->setTaxAmount($amount)
+    ->setBaseAmount($amount)
+    ->setRealAmount($amount)
+    ->setRealBaseAmount($amount)
+    ->setAppliedTaxes([$tax])
+    ->setTaxableItemType('shipping')
+    ->setItemId($salesOrderItem->getId());
+
+$taxItemCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Tax\Item::class);
+$taxItemCollection->save($salesOrderTaxItem);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php
new file mode 100644
index 0000000000000..dd52deab825cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
new file mode 100644
index 0000000000000..753adb1f38596
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+
+require 'order.php';
+/** @var Order $order */
+/** @var Order\Payment $payment */
+/** @var Order\Item $orderItem */
+/** @var array $addressData Data for creating addresses for the orders. */
+$orders = [
+    [
+        'increment_id' => '100000002',
+        'state' => \Magento\Sales\Model\Order::STATE_NEW,
+        'status' => 'processing',
+        'grand_total' => 120.00,
+        'subtotal' => 120.00,
+        'base_grand_total' => 120.00,
+        'store_id' => 1,
+        'website_id' => 1,
+        'payment' => $payment
+    ],
+    [
+        'increment_id' => '100000003',
+        'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
+        'status' => 'processing',
+        'grand_total' => 130.00,
+        'base_grand_total' => 130.00,
+        'subtotal' => 130.00,
+        'store_id' => 0,
+        'website_id' => 0,
+        'payment' => $payment
+    ],
+    [
+        'increment_id' => '100000004',
+        'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
+        'status' => 'closed',
+        'grand_total' => 140.00,
+        'base_grand_total' => 140.00,
+        'subtotal' => 140.00,
+        'store_id' => 1,
+        'website_id' => 1,
+        'payment' => $payment
+    ],
+    [
+        'increment_id' => '100000005',
+        'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
+        'status' => 'complete',
+        'grand_total' => 150.00,
+        'base_grand_total' => 150.00,
+        'subtotal' => 150.00,
+        'store_id' => 1,
+        'website_id' => 1,
+        'payment' => $payment
+    ],
+    [
+        'increment_id' => '100000006',
+        'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
+        'status' => 'complete',
+        'grand_total' => 160.00,
+        'base_grand_total' => 160.00,
+        'subtotal' => 160.00,
+        'store_id' => 1,
+        'website_id' => 1,
+        'payment' => $payment
+    ],
+];
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+/** @var array $orderData */
+foreach ($orders as $orderData) {
+    /** @var $order \Magento\Sales\Model\Order */
+    $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        \Magento\Sales\Model\Order::class
+    );
+
+    // Reset addresses
+    /** @var Order\Address $billingAddress */
+    $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
+    $billingAddress->setAddressType('billing');
+
+    $shippingAddress = clone $billingAddress;
+    $shippingAddress->setId(null)->setAddressType('shipping');
+
+    $order
+        ->setData($orderData)
+        ->addItem($orderItem)
+        ->setCustomerIsGuest(false)
+        ->setCustomerId(1)
+        ->setCustomerEmail('customer@example.com')
+        ->setBillingAddress($billingAddress)
+        ->setShippingAddress($shippingAddress);
+
+    $orderRepository->save($order);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/payment_enc_cc.php b/dev/tests/integration/testsuite/Magento/Sales/_files/payment_enc_cc.php
new file mode 100644
index 0000000000000..bfa643fcf5f99
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/payment_enc_cc.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdateTest;
+use Magento\Framework\App\DeploymentConfig;
+
+require 'order.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var DeploymentConfig $deployConfig */
+$deployConfig = $objectManager->get(DeploymentConfig::class);
+
+/**
+ * Creates an encrypted card number with the current crypt key using
+ * a legacy cipher.
+ */
+// @codingStandardsIgnoreStart
+$handle = @mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
+$initVectorSize = @mcrypt_enc_get_iv_size($handle);
+$initVector = str_repeat("\0", $initVectorSize);
+@mcrypt_generic_init($handle, $deployConfig->get('crypt/key'), $initVector);
+
+$encCcNumber = @mcrypt_generic($handle, EncryptionUpdateTest::TEST_CC_NUMBER);
+
+@mcrypt_generic_deinit($handle);
+@mcrypt_module_close($handle);
+// @codingStandardsIgnoreEnd
+
+/** @var SearchCriteria $searchCriteria */
+$searchCriteria = $objectManager->get(SearchCriteriaBuilder::class)
+    ->addFilter('increment_id', '100000001')
+    ->create();
+
+$orders = $orderRepository->getList($searchCriteria)->getItems();
+$order = array_pop($orders);
+
+/** @var \Magento\Sales\Model\ResourceModel\Order\Payment $resource */
+$resource = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Payment::class);
+$resource->getConnection()->insert(
+    $resource->getMainTable(),
+    [
+        'parent_id' => $order->getId(),
+        'cc_number_enc' => '0:2:' . base64_encode($encCcNumber),
+    ]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
index 01e54689a3c7a..c99e7de47f3ea 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();
 
@@ -53,7 +54,10 @@
 $quote->getPayment()->setMethod('checkmo');
 $quote->setIsMultiShipping('1');
 $quote->collectTotals();
-$quote->save();
+
+$quoteRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+$quoteRepository->save($quote);
 
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
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 3694ad9dd7a60..aa5d97f0148ba 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/Sales/_files/quote_with_bundle_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
index 5a63a813caa96..c45e0aa4d9dc5 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
@@ -4,25 +4,29 @@
  * See COPYING.txt for license details.
  */
 
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
+// Delete quote
 /** @var $quote \Magento\Quote\Model\Quote */
-$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
 $quote->load('test01', 'reserved_order_id');
 if ($quote->getId()) {
     $quote->delete();
 }
-
-/** @var $product \Magento\Catalog\Model\Product */
-$productIds = [1, 2, 3];
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-foreach ($productIds as $productId) {
-    $product->load($productId);
-    if ($product->getId()) {
-        $product->delete();
+// Delete products
+$productSkus = ['simple-1', 'simple-2', 'bundle-product'];
+/** @var Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(Magento\Catalog\Api\ProductRepositoryInterface::class);
+foreach ($productSkus as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
     }
 }
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php
new file mode 100644
index 0000000000000..97fb4f7a8fc32
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+include __DIR__ . '/quote.php';
+
+$buyRequest = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Framework\DataObject::class,
+    [
+        'data' => [
+            'qty' => 1,
+            'custom_price' => 12,
+        ],
+    ]
+);
+/** @var \Magento\Quote\Model\Quote $items */
+$items = $quote->getItemsCollection()->getItems();
+$quoteItem = reset($items);
+$quote->updateItem($quoteItem->getId(), $buyRequest)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php
new file mode 100644
index 0000000000000..2bcbb636b97af
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+include __DIR__ . '/quote_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_new_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_new_customer.php
new file mode 100644
index 0000000000000..09e0c93107236
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_new_customer.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+$product->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setName('Simple Product')
+    ->setSku('simple001')
+    ->setPrice(10)
+    ->setQty(100)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
+
+$addressData = include __DIR__ . '/address_data.php';
+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)
+    ->setAddressType('shipping');
+
+/** @var \Magento\Store\Api\Data\StoreInterface $store */
+$store = $objectManager->get(StoreManagerInterface::class)
+    ->getStore();
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setCustomerIsGuest(false)
+    ->setCustomerEmail('john.doe001@test.com')
+    ->setStoreId($store->getId())
+    ->setReservedOrderId('2000000001')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->addProduct($product);
+
+$quote->getPayment()
+    ->setMethod('checkmo');
+$quote->getShippingAddress()
+    ->setShippingMethod('flatrate_flatrate')
+    ->setCollectShippingRates(true);
+$quote->collectTotals();
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php
new file mode 100644
index 0000000000000..b3b341c092d69
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Checkout/_files/quote_with_address.php';
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote->addProduct(
+    $customDesignProduct->load($customDesignProduct->getId()),
+    1
+);
+
+$quote->getPayment()->setMethod('payflowpro');
+$quote->setIsMultiShipping('0');
+$quote->getShippingAddress()->setShippingMethod('freeshipping_freeshipping');
+$quote->setReservedOrderId('test01');
+$quote->collectTotals()
+    ->save();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php
index 03fa3c151b788..6081ab59459f7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php
@@ -3,22 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
 require 'default_rollback.php';
 require __DIR__ . '/../../../Magento/Sales/_files/order.php';
 
 $payment = $order->getPayment();
-$paymentInfoBlock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get(\Magento\Payment\Helper\Data::class)
-    ->getInfoBlock($payment);
+$paymentInfoBlock = Bootstrap::getObjectManager()->get(\Magento\Payment\Helper\Data::class)->getInfoBlock($payment);
 $payment->setBlockMock($paymentInfoBlock);
 
-/** @var \Magento\Sales\Model\Order\Shipment $shipment */
-$shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class);
-$shipment->setOrder($order);
-
-$shipmentItem = $objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class);
-$shipmentItem->setOrderItem($orderItem);
-$shipment->addItem($shipmentItem);
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items);
 $shipment->setPackages([['1'], ['2']]);
 $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW);
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php
index 3a50b5bf21a7c..44b8635aae612 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php
@@ -7,9 +7,8 @@
 use Magento\Payment\Helper\Data;
 use Magento\Sales\Api\ShipmentCommentRepositoryInterface;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Shipment;
 use Magento\Sales\Model\Order\Shipment\Comment;
-use Magento\Sales\Model\Order\Shipment\Item;
+use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
 require 'default_rollback.php';
@@ -21,14 +20,12 @@
     ->getInfoBlock($payment);
 $payment->setBlockMock($paymentInfoBlock);
 
-/** @var Shipment $shipment */
-$shipment = Bootstrap::getObjectManager()->create(Shipment::class);
-$shipment->setOrder($order);
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items);
 
-/** @var Item $shipmentItem */
-$shipmentItem = Bootstrap::getObjectManager()->create(Item::class);
-$shipmentItem->setOrderItem($orderItem);
-$shipment->addItem($shipmentItem);
 $shipment->setPackages([['1'], ['2']]);
 $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW);
 $shipment->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php
index a394f6d5a5000..fcb5b84997b95 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php
@@ -6,12 +6,9 @@
 
 use Magento\Payment\Helper\Data;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Shipment;
-use Magento\Sales\Model\Order\Shipment\Item;
-use Magento\Sales\Model\Order\Shipment\ItemFactory;
 use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Sales\Api\ShipmentItemRepositoryInterface;
 
 require 'default_rollback.php';
 require __DIR__ . '/order.php';
@@ -22,21 +19,6 @@
     ->getInfoBlock($payment);
 $payment->setBlockMock($paymentInfoBlock);
 
-/** @var Shipment $shipment */
-$shipment = Bootstrap::getObjectManager()->create(Shipment::class);
-$shipment->setOrder($order);
-
-/** @var Item $shipmentItem */
-$shipmentItem = Bootstrap::getObjectManager()->create(Item::class);
-$shipmentItem->setOrderItem($orderItem);
-$shipment->addItem($shipmentItem);
-$shipment->setPackages([['1'], ['2']]);
-$shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW);
-$shipment->save();
-
-/** @var ItemFactory $shipmentItemFactory */
-$shipmentItemFactory = Bootstrap::getObjectManager()->create(ItemFactory::class);
-
 $items = [
     [
         'name' => 'item 1',
@@ -44,9 +26,6 @@
         'price' => 10,
         'row_total' => 10,
         'product_type' => 'simple',
-        'qty' => 10,
-        'qty_invoiced' => 10,
-        'qty_refunded' => 1,
     ],
     [
         'name' => 'item 2',
@@ -54,9 +33,6 @@
         'price' => 20,
         'row_total' => 20,
         'product_type' => 'simple',
-        'qty' => 10,
-        'qty_invoiced' => 10,
-        'qty_refunded' => 1,
     ],
     [
         'name' => 'item 3',
@@ -64,9 +40,6 @@
         'price' => 30,
         'row_total' => 30,
         'product_type' => 'simple',
-        'qty' => 10,
-        'qty_invoiced' => 10,
-        'qty_refunded' => 1,
     ],
     [
         'name' => 'item 4',
@@ -74,9 +47,6 @@
         'price' => 40,
         'row_total' => 40,
         'product_type' => 'simple',
-        'qty' => 10,
-        'qty_invoiced' => 10,
-        'qty_refunded' => 1,
     ],
     [
         'name' => 'item 5',
@@ -84,37 +54,31 @@
         'price' => 50,
         'row_total' => 50,
         'product_type' => 'simple',
-        'qty' => 2,
-        'qty_invoiced' => 20,
-        'qty_refunded' => 2,
     ],
 ];
 
-/** @var ShipmentItemRepositoryInterface $shipmentItemRepository */
-$shipmentItemRepository = Bootstrap::getObjectManager()->get(ShipmentItemRepositoryInterface::class);
-
 foreach ($items as $data) {
     /** @var OrderItem $orderItem */
     $orderItem = $objectManager->create(OrderItem::class);
-    $orderItem->setProductId($product->getId())->setQtyOrdered(10);
+    $orderItem->setName($data['name']);
+    $orderItem->setProductId($product->getId());
     $orderItem->setBasePrice($data['base_price']);
     $orderItem->setPrice($data['price']);
     $orderItem->setRowTotal($data['row_total']);
     $orderItem->setProductType($data['product_type']);
-    $orderItem->setQtyOrdered(100);
-    $orderItem->setQtyInvoiced(10);
+    $orderItem->setQtyOrdered(10);
+    $orderItem->setQtyInvoiced(5);
     $orderItem->setOriginalPrice(20);
 
     $order->addItem($orderItem);
     $order->save();
+}
 
-    /** @var Item $shipmentItem */
-    $shipmentItem = $shipmentItemFactory->create();
-    $shipmentItem->setShipment($shipment)
-        ->setName($data['name'])
-        ->setOrderItem($orderItem)
-        ->setOrderItemId($orderItem->getItemId())
-        ->setQty($data['qty'])
-        ->setPrice($data['price']);
-    $shipmentItemRepository->save($shipmentItem);
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
 }
+$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items);
+$shipment->setPackages([['1'], ['2']]);
+$shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW);
+$shipment->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php
index f66448460c884..60f4cadbaf51e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php
@@ -5,6 +5,8 @@
  */
 
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\TestFramework\Helper\Bootstrap;
 
 require 'order.php';
 
@@ -15,46 +17,46 @@
 $shipments = [
     [
         'increment_id' => '100000001',
-        'order_id' => $order->getId(),
         'shipping_address_id' => 1,
         'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
         'store_id' => 1,
+        'shipping_label' => 'shipping_label_100000001',
     ],
     [
         'increment_id' => '100000002',
-        'order_id' => $order->getId(),
         'shipping_address_id' => 3,
         'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
         'store_id' => 1,
+        'shipping_label' => 'shipping_label_100000002',
     ],
     [
         'increment_id' => '100000003',
-        'order_id' => $order->getId(),
         'shipping_address_id' => 3,
-        'status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
+        'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW,
         'store_id' => 1,
+        'shipping_label' => 'shipping_label_100000003',
     ],
     [
         'increment_id' => '100000004',
-        'order_id' => $order->getId(),
         'shipping_address_id' => 4,
         'shipment_status' => 'closed',
         'store_id' => 1,
+        'shipping_label' => 'shipping_label_100000004',
     ],
 ];
 
 /** @var array $shipmentData */
 foreach ($shipments as $shipmentData) {
-    /** @var $shipment \Magento\Sales\Model\Order\Shipment */
-    $shipment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-        \Magento\Sales\Model\Order\Shipment::class
-    );
-    /** @var \Magento\Sales\Model\Order\Shipment\Item $shipmentItem */
-    $shipmentItem = $objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class);
-    $shipmentItem->setParentId($order->getId());
-    $shipmentItem->setOrderItem($orderItem);
-    $shipment
-        ->setData($shipmentData)
-        ->addItem($shipmentItem)
-        ->save();
+    $items = [];
+    foreach ($order->getItems() as $orderItem) {
+        $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+    }
+    /** @var \Magento\Sales\Model\Order\Shipment $shipment */
+    $shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items);
+    $shipment->setIncrementId($shipmentData['increment_id']);
+    $shipment->setShippingAddressId($shipmentData['shipping_address_id']);
+    $shipment->setShipmentStatus($shipmentData['shipment_status']);
+    $shipment->setStoreId($shipmentData['store_id']);
+    $shipment->setShippingLabel($shipmentData['shipping_label']);
+    $shipment->save();
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php
index 056dcec489e14..f1c0faaa7fce5 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php
@@ -7,9 +7,8 @@
 use Magento\Payment\Helper\Data;
 use Magento\Sales\Api\ShipmentTrackRepositoryInterface;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Shipment;
-use Magento\Sales\Model\Order\Shipment\Item;
 use Magento\Sales\Model\Order\Shipment\Track;
+use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
 require 'default_rollback.php';
@@ -21,14 +20,11 @@
     ->getInfoBlock($payment);
 $payment->setBlockMock($paymentInfoBlock);
 
-/** @var Shipment $shipment */
-$shipment = Bootstrap::getObjectManager()->create(Shipment::class);
-$shipment->setOrder($order);
-
-/** @var Item $shipmentItem */
-$shipmentItem = Bootstrap::getObjectManager()->create(Item::class);
-$shipmentItem->setOrderItem($orderItem);
-$shipment->addItem($shipmentItem);
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items);
 $shipment->setPackages([['1'], ['2']]);
 $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW);
 $shipment->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/etc/extension_attributes.xml b/dev/tests/integration/testsuite/Magento/Sales/etc/extension_attributes.xml
new file mode 100644
index 0000000000000..abefb087024ef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/etc/extension_attributes.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:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\Sales\Api\Data\ShipmentInterface">
+        <attribute code="test_attribute_value" type="string"/>
+    </extension_attributes>
+    <extension_attributes for="Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface">
+        <attribute code="test_attribute_value" type="string"/>
+    </extension_attributes>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
index 12d7615943fb5..f619193d4921f 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
@@ -17,6 +17,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      * @dataProvider setValidationFilterDataProvider()
      * @param string $couponCode
      * @param array $expectedItems
+     * @magentoDbIsolation disabled
      */
     public function testSetValidationFilter($couponCode, $expectedItems)
     {
@@ -63,7 +64,7 @@ public function setValidationFilterDataProvider()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Checkout/_files/quote_with_shipping_method_and_items_categories.php
      * @magentoDataFixture Magento/SalesRule/_files/rules_group_any_categories.php
@@ -100,7 +101,7 @@ public function testSetValidationFilterWithGroup()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Checkout/_files/quote_with_shipping_method_and_items_categories.php
      * @magentoDataFixture Magento/SalesRule/_files/rules_group_any_categories.php
@@ -136,7 +137,7 @@ public function testSetValidationFilterAnyCategory()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Checkout/_files/quote_with_shipping_method_and_items_categories.php
      * @magentoDataFixture Magento/SalesRule/_files/rules_group_not_categories_sku_attr.php
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
new file mode 100644
index 0000000000000..694310f2cbc89
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Rule\Action\Discount;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Api\GuestCartItemRepositoryInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Api\GuestCartTotalRepositoryInterface;
+use Magento\Quote\Api\GuestCouponManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests for Magento\SalesRule\Model\Rule\Action\Discount\CartFixed.
+ */
+class CartFixedTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GuestCartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @var GuestCartItemRepositoryInterface
+     */
+    private $cartItemRepository;
+
+    /**
+     * @var GuestCouponManagementInterface
+     */
+    private $couponManagement;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->cartManagement = Bootstrap::getObjectManager()->create(GuestCartManagementInterface::class);
+        $this->couponManagement = Bootstrap::getObjectManager()->create(GuestCouponManagementInterface::class);
+        $this->cartItemRepository = Bootstrap::getObjectManager()->create(GuestCartItemRepositoryInterface::class);
+    }
+
+    /**
+     * Applies fixed discount amount on whole cart.
+     *
+     * @param array $productPrices
+     * @return void
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php
+     * @dataProvider applyFixedDiscountDataProvider
+     */
+    public function testApplyFixedDiscount(array $productPrices): void
+    {
+        $expectedDiscount = '-15.00';
+        $couponCode =  'CART_FIXED_DISCOUNT_15';
+        $cartId = $this->cartManagement->createEmptyCart();
+
+        foreach ($productPrices as $price) {
+            $product = $this->createProduct($price);
+
+            /** @var CartItemInterface $quoteItem */
+            $quoteItem = Bootstrap::getObjectManager()->create(CartItemInterface::class);
+            $quoteItem->setQuoteId($cartId);
+            $quoteItem->setProduct($product);
+            $quoteItem->setQty(1);
+            $this->cartItemRepository->save($quoteItem);
+        }
+
+        $this->couponManagement->set($cartId, $couponCode);
+
+        /** @var GuestCartTotalRepositoryInterface $cartTotalRepository */
+        $cartTotalRepository = Bootstrap::getObjectManager()->get(GuestCartTotalRepositoryInterface::class);
+        $total = $cartTotalRepository->get($cartId);
+
+        $this->assertEquals($expectedDiscount, $total->getBaseDiscountAmount());
+    }
+
+    /**
+     * @return array
+     */
+    public function applyFixedDiscountDataProvider(): array
+    {
+        return [
+            'prices when discount had wrong value 15.01' => [[22, 14, 43, 7.50, 0.00]],
+            'prices when discount had wrong value 14.99' => [[47, 33, 9.50, 42, 0.00]],
+        ];
+    }
+
+    /**
+     * Tests that coupon with wildcard symbols in code can be successfully applied.
+     *
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testCouponCodeWithWildcard()
+    {
+        $expectedDiscount = '-5.00';
+        $couponCode =  '2?ds5!2d';
+        $cartId = $this->cartManagement->createEmptyCart();
+        $productPrice = 10;
+
+        $product = $this->createProduct($productPrice);
+
+        /** @var CartItemInterface $quoteItem */
+        $quoteItem = Bootstrap::getObjectManager()->create(CartItemInterface::class);
+        $quoteItem->setQuoteId($cartId);
+        $quoteItem->setProduct($product);
+        $quoteItem->setQty(1);
+        $this->cartItemRepository->save($quoteItem);
+
+        $this->couponManagement->set($cartId, $couponCode);
+
+        /** @var GuestCartTotalRepositoryInterface $cartTotalRepository */
+        $cartTotalRepository = Bootstrap::getObjectManager()->get(GuestCartTotalRepositoryInterface::class);
+        $total = $cartTotalRepository->get($cartId);
+
+        $this->assertEquals($expectedDiscount, $total->getBaseDiscountAmount());
+    }
+
+    /**
+     * Returns simple product with given price.
+     *
+     * @param float $price
+     * @return ProductInterface
+     */
+    private function createProduct(float $price): ProductInterface
+    {
+        $name = 'simple-' . $price;
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepository::class);
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $product->setTypeId('simple')
+            ->setAttributeSetId($product->getDefaultAttributeSetId())
+            ->setWebsiteIds([1])
+            ->setName($name)
+            ->setSku(uniqid($name))
+            ->setPrice($price)
+            ->setMetaTitle('meta title')
+            ->setMetaKeyword('meta keyword')
+            ->setMetaDescription('meta description')
+            ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+            ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+            ->setStockData(['qty' => 1, 'is_in_stock' => 1])
+            ->setWeight(1);
+
+        return $productRepository->save($product);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php
index bde656c152963..70fa11fc78c87 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php
@@ -6,6 +6,14 @@
 
 namespace Magento\SalesRule\Model\Rule\Condition;
 
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -28,9 +36,11 @@ protected function setUp()
      * @magentoAppIsolation enabled
      * @param int $categoryId
      * @param bool $expectedResult
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
      * @magentoDataFixture Magento/SalesRule/_files/rules_category.php
      * @dataProvider validateProductConditionDataProvider
+     * @magentoDbIsolation disabled
      */
     public function testValidateCategorySalesRuleIncludesChildren($categoryId, $expectedResult)
     {
@@ -55,6 +65,28 @@ public function testValidateCategorySalesRuleIncludesChildren($categoryId, $expe
         $this->assertEquals($expectedResult, $rule->validate($quote));
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Bundle/_files/order_item_with_bundle_and_options.php
+     * @magentoDataFixture Magento/SalesRule/_files/rules_sku_exclude.php
+     *
+     * @return void
+     */
+    public function testValidateSalesRuleExcludesBundleChildren(): void
+    {
+        // Load the quote that contains a child of a bundle product
+        /** @var \Magento\Quote\Model\Quote  $quote */
+        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)
+            ->load('test_cart_with_bundle_and_options', 'reserved_order_id');
+
+        // Load the SalesRule looking for excluding products with selected sku
+        /** @var $rule \Magento\SalesRule\Model\Rule */
+        $rule = $this->objectManager->get(\Magento\Framework\Registry::class)
+            ->registry('_fixture/Magento_SalesRule_Sku_Exclude');
+
+        $this->assertEquals(false, $rule->validate($quote));
+    }
+
     /**
      * @return array
      */
@@ -73,4 +105,71 @@ public function validateProductConditionDataProvider()
             ]
         ];
     }
+
+    /**
+     * Ensure that SalesRules filtering on quote items quantity validates configurable product correctly
+     *
+     * 1. Load a quote with a configured product and a sales rule set to filter items with quantity 2.
+     * 2. Attempt to validate the sales rule against the quote and assert the output is negative.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off.php
+     */
+    public function testValidateQtySalesRuleWithConfigurable()
+    {
+        // Load the quote that contains a child of a configurable product with quantity 1.
+        $quote = $this->getQuote('test_cart_with_configurable');
+
+        // Load the SalesRule looking for products with quantity 2.
+        $rule = $this->getSalesRule('10% Off on orders with two items');
+
+        $this->assertFalse(
+            $rule->validate($quote->getBillingAddress())
+        );
+    }
+
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+        return array_pop($items);
+    }
+
+    /**
+     * Gets rule by name.
+     *
+     * @param string $name
+     * @return \Magento\SalesRule\Model\Rule
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getSalesRule(string $name): \Magento\SalesRule\Model\Rule
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $ruleRepository = $this->objectManager->get(RuleRepositoryInterface::class);
+        $items = $ruleRepository->getList($searchCriteria)->getItems();
+
+        $rule = array_pop($items);
+        /** @var \Magento\SalesRule\Model\Converter\ToModel $converter */
+        $converter = $this->objectManager->get(\Magento\SalesRule\Model\Converter\ToModel::class);
+
+        return $converter->toModel($rule);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off.php
new file mode 100644
index 0000000000000..1c2b725d19865
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+/** @var \Magento\SalesRule\Model\Rule $salesRule */
+$salesRule = $objectManager->create(\Magento\SalesRule\Model\Rule::class);
+$salesRule->setData(
+    [
+        'name' => '100% Off for all orders',
+        'is_active' => 1,
+        'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
+        'conditions' => [],
+        'simple_action' => 'by_percent',
+        'discount_amount' => 100,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Store\Model\StoreManagerInterface::class
+            )->getWebsite()->getId(),
+        ],
+        'discount_qty' => 0,
+        'apply_to_shipping' => 1,
+        'simple_free_shipping' => 1,
+    ]
+);
+$salesRule->save();
+$registry->unregister('Magento/SalesRule/_files/cart_rule_100_percent_off');
+$registry->register('Magento/SalesRule/_files/cart_rule_100_percent_off', $salesRule->getRuleId());
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php
new file mode 100644
index 0000000000000..c7d95455c78d5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_100_percent_off_rollback.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var Magento\SalesRule\Model\Rule $rule */
+$rule = $registry->registry('cart_rule_100_percent_off');
+if ($rule) {
+    $rule->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off.php
new file mode 100644
index 0000000000000..0761e5753da75
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$websiteId = Bootstrap::getObjectManager()->get(StoreManagerInterface::class)
+    ->getWebsite()
+    ->getId();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '10% Off on orders with two items',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_NO_COUPON,
+        'simple_action' => 'by_percent',
+        'discount_amount' => 10,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [$websiteId]
+    ]
+);
+
+$salesRule->getConditions()->loadArray([
+    'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+    'attribute' => null,
+    'operator' => null,
+    'value' => '1',
+    'is_value_processed' => null,
+    'aggregator' => 'all',
+    'conditions' =>
+        [
+            [
+                'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Subselect::class,
+                'attribute' => 'qty',
+                'operator' => '==',
+                'value' => '2',
+                'is_value_processed' => null,
+                'aggregator' => 'all',
+                'conditions' =>
+                    [
+                        [
+                            'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                            'attribute' => 'attribute_set_id',
+                            'operator' => '==',
+                            'value' => '4',
+                            'is_value_processed' => false,
+                        ],
+                    ],
+            ],
+        ],
+]);
+
+$salesRule->save();
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off_rollback.php
new file mode 100644
index 0000000000000..c6e145842f291
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off_rollback.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var Magento\SalesRule\Model\Rule $rule */
+$rule = $registry->registry('cart_rule_40_percent_off');
+if ($rule) {
+    $rule->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off_rollback.php
new file mode 100644
index 0000000000000..d694e9972ec73
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off_rollback.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var Magento\SalesRule\Model\Rule $rule */
+$rule = $registry->registry('cart_rule_50_percent_off');
+if ($rule) {
+    $rule->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php
new file mode 100644
index 0000000000000..08e3ffe6e046c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '15$ fixed discount on whole cart',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+        'conditions' => [
+            [
+                'type' => \Magento\SalesRule\Model\Rule\Condition\Address::class,
+                'attribute' => 'base_subtotal',
+                'operator' => '>',
+                'value' => 45,
+            ],
+        ],
+        'simple_action' => Rule::CART_FIXED_ACTION,
+        'discount_amount' => 15,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+        ],
+    ]
+);
+$objectManager->get(\Magento\SalesRule\Model\ResourceModel\Rule::class)->save($salesRule);
+
+// Create coupon and assign "15$ fixed discount" rule to this coupon.
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode('CART_FIXED_DISCOUNT_15')
+    ->setType(0);
+$objectManager->get(CouponRepositoryInterface::class)->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php
new file mode 100644
index 0000000000000..33a8b4285d8d7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Magento\Framework\Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var Magento\SalesRule\Model\Rule $rule */
+$rule = $registry->registry('cart_rule_fixed_discount_coupon');
+if ($rule) {
+    $rule->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
new file mode 100644
index 0000000000000..9005284f984cf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '5$ fixed discount on whole cart',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+        'conditions' => [],
+        'simple_action' => Rule::CART_FIXED_ACTION,
+        'discount_amount' => 5,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+        ],
+    ]
+);
+$objectManager->get(\Magento\SalesRule\Model\ResourceModel\Rule::class)->save($salesRule);
+
+// Create coupon and assign "15$ fixed discount" rule to this coupon.
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode('2?ds5!2d')
+    ->setType(0);
+
+/** @var CouponRepositoryInterface $couponRepository */
+$couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+$couponRepository->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
new file mode 100644
index 0000000000000..c9613c371bbe5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('name', '5$ fixed discount on whole cart')
+    ->create();
+
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+$items = $ruleRepository->getList($searchCriteria)
+    ->getItems();
+
+$salesRule = array_pop($items);
+
+/** @var Rule $salesRule */
+if ($salesRule !== null) {
+    /** @var RuleRepositoryInterface $ruleRepository */
+    $ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+    $ruleRepository->deleteById($salesRule->getRuleId());
+}
+
+$coupon = $objectManager->create(Coupon::class);
+$coupon->loadByCode('2?ds5!2d');
+if ($coupon->getCouponId()) {
+    /** @var CouponRepositoryInterface $couponRepository */
+    $couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+    $couponRepository->deleteById($coupon->getCouponId());
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
index 91369da7aa842..a2176364178dc 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
@@ -21,7 +21,7 @@
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
 $coupon->setRuleId($items[1]->getId())->setCode('autogenerated_2_2')->setType(1)->save();
 
-// type SPECIFIC with generated coupons 
+// type SPECIFIC with generated coupons
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
 $coupon->setRuleId($items[2]->getId())->setCode('autogenerated_3_1')->setType(1)->save();
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_rollback.php
new file mode 100644
index 0000000000000..f35c531af16f1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_rollback.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Model\Rule;
+
+$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\SalesRule\Model\ResourceModel\Rule\Collection::class);
+
+/** @var Rule $rule */
+foreach ($collection as $rule) {
+    $rule->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_sku_exclude.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_sku_exclude.php
new file mode 100644
index 0000000000000..9d88fe48ae111
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_sku_exclude.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/** @var \Magento\Eav\Api\AttributeRepositoryInterface $repository */
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+
+/** @var \Magento\Eav\Api\Data\AttributeInterface $skuAttribute */
+$skuAttribute = $repository->get(
+    'catalog_product',
+    'sku'
+);
+$data = $skuAttribute->getData();
+$data['is_used_for_promo_rules'] = 1;
+$skuAttribute->setData($data);
+$skuAttribute->save();
+
+/** @var \Magento\SalesRule\Model\Rule $rule */
+$salesRule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$salesRule->setData(
+    [
+        'name' => '20% Off',
+        'is_active' => 1,
+        'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
+        'simple_action' => 'by_percent',
+        'discount_amount' => 20,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Store\Model\StoreManagerInterface::class
+            )->getWebsite()->getId(),
+        ],
+    ]
+);
+
+$salesRule->getConditions()->loadArray([
+    'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+    'attribute' => null,
+    'operator' => null,
+    'value' => '1',
+    'is_value_processed' => null,
+    'aggregator' => 'all',
+    'conditions' =>
+        [
+            [
+                'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
+                'attribute' => null,
+                'operator' => null,
+                'value' => '1',
+                'is_value_processed' => null,
+                'aggregator' => 'all',
+                'conditions' =>
+                    [
+                        [
+                            'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                            'attribute' => 'sku',
+                            'operator' => '!=',
+                            'value' => 'product-bundle',
+                            'is_value_processed' => false,
+                        ],
+                    ],
+            ],
+        ],
+]);
+
+$salesRule->save();
+
+/** @var Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('_fixture/Magento_SalesRule_Sku_Exclude');
+$registry->register('_fixture/Magento_SalesRule_Sku_Exclude', $salesRule);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_sku_exclude_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_sku_exclude_rollback.php
new file mode 100644
index 0000000000000..79ec3259fd86a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_sku_exclude_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/** @var \Magento\Eav\Api\AttributeRepositoryInterface $repository */
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Eav\Api\AttributeRepositoryInterface::class);
+
+/** @var \Magento\Eav\Api\Data\AttributeInterface $skuAttribute */
+$skuAttribute = $repository->get(
+    'catalog_product',
+    'sku'
+);
+$data = $skuAttribute->getData();
+$data['is_used_for_promo_rules'] = 0;
+$skuAttribute->setData($data);
+$skuAttribute->save();
+
+/** @var Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/** @var Magento\SalesRule\Model\Rule $rule */
+$rule = $registry->registry('_fixture/Magento_SalesRule_Sku_Exclude');
+
+$rule->delete();
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json
index 2da7e427ff132..dae16d56b31a1 100644
--- a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json
+++ b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json
@@ -2,10 +2,9 @@
   "name": "magento/module-first",
   "description": "N/A",
   "suggest": {
-    "magento/module-first-sample-data": "Sample Data version:777.7.*"
+    "magento/module-first-sample-data": "Sample Data version: 777.7.*"
   },
   "type": "magento2-module",
-  "version": "777.7.7",
   "config": {
     "sort-packages": true
   }
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json
index 0322af9601e9b..91e8730e39bd3 100644
--- a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json
+++ b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/SecondModule/composer.json
@@ -5,7 +5,6 @@
     "magento/module-some-module": "Some Module:888.8.*"
   },
   "type": "magento2-module",
-  "version": "777.7.7",
   "config": {
     "sort-packages": true
   }
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json
index 3138b8892bc37..a67d31a4f48d6 100644
--- a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json
+++ b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/ThirdModule/composer.json
@@ -2,7 +2,6 @@
   "name": "magento/module-second",
   "description": "N/A",
   "type": "magento2-module",
-  "version": "777.7.7",
   "config": {
     "sort-packages": true
   }
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SearchEngine/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SearchEngine/ConfigTest.php
index 49d73e71672d4..74926abb52d41 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SearchEngine/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SearchEngine/ConfigTest.php
@@ -17,7 +17,7 @@ protected function setUp()
         $xmlPath = __DIR__ . '/../../_files/search_engine.xml';
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        // Clear out the clache
+        // Clear out the cache
         $cacheManager = $objectManager->create(\Magento\Framework\App\Cache\Manager::class);
         /** @var \Magento\Framework\App\Cache\Manager $cacheManager */
         $cacheManager->clean($cacheManager->getAvailableTypes());
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
index 892ab57080a98..9fc9b10c89fa4 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
@@ -42,10 +42,38 @@ public static function loadGetSynonymsForPhraseDataProvider()
                 'phrase' => 'universe is enormous',
                 'expectedResult' => [['universe', 'cosmos'], ['is'], ['big', 'huge', 'large', 'enormous']]
             ],
+            'WithCaseMismatch' => [
+                'phrase' => 'GNU\'s Not Unix',
+                'expectedResult' => [['GNU\'s'], ['Not'], ['unix', 'linux'],]
+            ],
+            'WithMultiWordPhrase' => [
+                'phrase' => 'Coastline of Great Britain stretches for 11,073 miles',
+                'expectedResult' => [
+                    ['Coastline'],
+                    ['of'],
+                    ['Great Britain', 'United Kingdom'],
+                    ['Britain'],
+                    ['stretches'],
+                    ['for'],
+                    ['11,073'],
+                    ['miles']
+                ]
+            ],
+            'PartialSynonymMatching' => [
+                'phrase' => 'Magento Engineering',
+                'expectedResult' => [
+                    ['orange', 'magento'],
+                    ['Engineering', 'Technical Staff']
+                ]
+            ],
             'noSynonyms' => [
                 'phrase' => 'this sentence has no synonyms',
                 'expectedResult' => [['this'], ['sentence'], ['has'], ['no'], ['synonyms']]
             ],
+            'multipleSpaces' => [
+                'phrase' => 'GNU\'s Not   Unix',
+                'expectedResult' => [['GNU\'s'], ['Not'], ['unix', 'linux'],]
+            ],
             'oneMoreTest' => [
                 'phrase' => 'schlicht',
                 'expectedResult' => [['schlicht', 'natürlich']]
diff --git a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_reader.php b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_reader.php
index f529b61522967..78c30cf458c51 100644
--- a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_reader.php
+++ b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_reader.php
@@ -24,9 +24,22 @@
 $synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
 $synonymsModel->setSynonyms('hill,mountain,peak')->setWebsiteId(1)->save();
 
+$synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
+$synonymsModel->setSynonyms('Community Engineering,Contributors,Magento Community Engineering')->setWebsiteId(1)
+    ->save();
+
+$synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
+$synonymsModel->setSynonyms('Engineering,Technical Staff')->setWebsiteId(1)->save();
+
 // Synonym groups for "All Store Views"
 $synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
 $synonymsModel->setSynonyms('universe,cosmos')->setWebsiteId(0)->save();
 
+$synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
+$synonymsModel->setSynonyms('unix,linux')->setWebsiteId(0)->save();
+
+$synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
+$synonymsModel->setSynonyms('Great Britain,United Kingdom')->setWebsiteId(0)->save();
+
 $synonymsModel = $objectManager->create(\Magento\Search\Model\SynonymReader::class);
 $synonymsModel->setSynonyms('big,huge,large,enormous')->setWebsiteId(0)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php b/dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php
index 7166779621001..52268dc96d8a3 100644
--- a/dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php
@@ -40,6 +40,11 @@ class AuthSessionTest extends \PHPUnit\Framework\TestCase
      */
     protected $dateTime;
 
+    /**
+     * @var \Magento\Security\Model\ConfigInterface
+     */
+    protected $securityConfig;
+
     /**
      * Set up
      */
@@ -54,8 +59,9 @@ protected function setUp()
         $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
         $this->adminSessionInfo = $this->objectManager->create(\Magento\Security\Model\AdminSessionInfo::class);
         $this->auth->setAuthStorage($this->authSession);
-        $this->adminSessionsManager = $this->objectManager->create(\Magento\Security\Model\AdminSessionsManager::class);
+        $this->adminSessionsManager = $this->objectManager->get(\Magento\Security\Model\AdminSessionsManager::class);
         $this->dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime::class);
+        $this->securityConfig = $this->objectManager->create(\Magento\Security\Model\ConfigInterface::class);
     }
 
     /**
@@ -73,7 +79,42 @@ protected function tearDown()
 
     /**
      * Test of prolong user action
+     * session manager will not trigger new prolong if previous prolong was less than X sec ago
+     * X - is calculated based on current admin session lifetime
      *
+     * @see \Magento\Security\Model\AdminSessionsManager::lastProlongIsOldEnough
+     * @magentoDbIsolation enabled
+     */
+    public function testConsecutiveProcessProlong()
+    {
+        $this->auth->login(
+            \Magento\TestFramework\Bootstrap::ADMIN_NAME,
+            \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
+        );
+        $sessionId = $this->authSession->getSessionId();
+        $prolongsDiff = log($this->securityConfig->getAdminSessionLifetime()) - 2; // X from comment above
+        $dateInPast = $this->dateTime->formatDate($this->authSession->getUpdatedAt() - $prolongsDiff);
+        $this->adminSessionsManager->getCurrentSession()
+            ->setData(
+                'updated_at',
+                $dateInPast
+            )
+            ->save();
+        $this->adminSessionInfo->load($sessionId, 'session_id');
+        $oldUpdatedAt = $this->adminSessionInfo->getUpdatedAt();
+        $this->authSession->prolong();
+        $this->adminSessionInfo->load($sessionId, 'session_id');
+        $updatedAt = $this->adminSessionInfo->getUpdatedAt();
+
+        $this->assertSame(strtotime($oldUpdatedAt), strtotime($updatedAt));
+    }
+
+    /**
+     * Test of prolong user action
+     * session manager will trigger new prolong if previous prolong was more than X sec ago
+     * X - is calculated based on current admin session lifetime
+     *
+     * @see \Magento\Security\Model\AdminSessionsManager::lastProlongIsOldEnough
      * @magentoDbIsolation enabled
      */
     public function testProcessProlong()
@@ -83,7 +124,8 @@ public function testProcessProlong()
             \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
         );
         $sessionId = $this->authSession->getSessionId();
-        $dateInPast = $this->dateTime->formatDate($this->authSession->getUpdatedAt() - 100);
+        $prolongsDiff = 4 * log($this->securityConfig->getAdminSessionLifetime()) + 2; // X from comment above
+        $dateInPast = $this->dateTime->formatDate($this->authSession->getUpdatedAt() - $prolongsDiff);
         $this->adminSessionsManager->getCurrentSession()
             ->setData(
                 'updated_at',
@@ -95,6 +137,7 @@ public function testProcessProlong()
         $this->authSession->prolong();
         $this->adminSessionInfo->load($sessionId, 'session_id');
         $updatedAt = $this->adminSessionInfo->getUpdatedAt();
-        $this->assertGreaterThan($oldUpdatedAt, $updatedAt);
+
+        $this->assertGreaterThan(strtotime($oldUpdatedAt), strtotime($updatedAt));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Security/Model/SecurityManagerTest.php b/dev/tests/integration/testsuite/Magento/Security/Model/SecurityManagerTest.php
index 4f4ee94290fc4..5f0249e9e581e 100644
--- a/dev/tests/integration/testsuite/Magento/Security/Model/SecurityManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Security/Model/SecurityManagerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Security\Model;
 
 use Magento\Customer\Api\AccountManagementInterface;
@@ -104,7 +105,6 @@ protected function getPasswordResetRequestEventCollection()
      * @magentoConfigFixture current_store customer/password/min_time_between_password_reset_requests 0
      * @magentoConfigFixture current_store contact/email/recipient_email hi@example.com
      * @expectedException \Magento\Framework\Exception\SecurityViolationException
-     * @expectedExceptionMessage Too many password reset requests. Please wait and try again or contact hi@example.com.
      * @magentoDbIsolation enabled
      */
     public function testPerformSecurityCheckLimitNumber()
@@ -114,7 +114,6 @@ public function testPerformSecurityCheckLimitNumber()
         $longIp = 127001;
         $accountReference = 'customer@example.com';
 
-        $i = 0;
         try {
             for ($i = 0; $i < $attempts; $i++) {
                 $this->securityManager->performSecurityCheck($requestType, $accountReference, $longIp);
@@ -125,6 +124,11 @@ public function testPerformSecurityCheckLimitNumber()
                 __($e->getMessage())
             );
         }
+
+        $this->expectExceptionMessage(
+            'We received too many requests for password resets. '
+            . 'Please wait and try again later or contact hi@example.com.'
+        );
     }
 
     /**
@@ -135,7 +139,6 @@ public function testPerformSecurityCheckLimitNumber()
      * @magentoConfigFixture current_store customer/password/min_time_between_password_reset_requests 1
      * @magentoConfigFixture current_store contact/email/recipient_email hi@example.com
      * @expectedException \Magento\Framework\Exception\SecurityViolationException
-     * @expectedExceptionMessage Too many password reset requests. Please wait and try again or contact hi@example.com.
      * @magentoDbIsolation enabled
      */
     public function testPerformSecurityCheckLimitTime()
@@ -145,7 +148,6 @@ public function testPerformSecurityCheckLimitTime()
         $longIp = 127001;
         $accountReference = 'customer@example.com';
 
-        $i = 0;
         try {
             for ($i = 0; $i < $attempts; $i++) {
                 $this->securityManager->performSecurityCheck($requestType, $accountReference, $longIp);
@@ -158,5 +160,10 @@ public function testPerformSecurityCheckLimitTime()
         }
 
         $this->fail('Something went wrong. Please check method execution logic.');
+
+        $this->expectExceptionMessage(
+            'We received too many requests for password resets. '
+            . 'Please wait and try again later or contact hi@example.com.'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
new file mode 100644
index 0000000000000..eaa8b2f6fdbbf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Console\Command;
+
+use Magento\Framework\App\ObjectManagerFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Indexer\Console\Command\IndexerReindexCommand;
+use Magento\Setup\Fixtures\FixtureModel;
+use Magento\TestFramework\Helper\Bootstrap;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * Class GenerateFixturesCommandCommandTest
+ * @package Magento\Setup\Console\Command
+ */
+class GenerateFixturesCommandTest extends \Magento\TestFramework\Indexer\TestCase
+{
+    /** @var  CommandTester */
+    private $indexerCommand;
+
+    /** @var  FixtureModel */
+    private $fixtureModelMock;
+
+    /** @var  ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var  GenerateFixturesCommand */
+    private $command;
+
+    /** @var  CommandTester */
+    private $commandTester;
+
+    /**
+     * Setup
+     */
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->objectManager->get(\Magento\TestFramework\App\Config::class)->clean();
+
+        $this->fixtureModelMock = $this->getMockBuilder(FixtureModel::class)
+            ->setMethods(['getObjectManager'])
+            ->setConstructorArgs([$this->objectManager->get(IndexerReindexCommand::class)])
+            ->getMock();
+        $this->fixtureModelMock
+            ->method('getObjectManager')
+            ->willReturn($this->objectManager);
+
+        $this->command = $this->objectManager->create(
+            GenerateFixturesCommand::class,
+            [
+                'fixtureModel' => $this->fixtureModelMock
+            ]
+        );
+
+        $objectFactoryMock = $this->getMockBuilder(ObjectManagerFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectFactoryMock
+            ->method('create')
+            ->willReturn($this->objectManager);
+
+        $this->indexerCommand = new CommandTester($this->objectManager->create(
+            IndexerReindexCommand::class,
+            ['objectManagerFactory' => $objectFactoryMock]
+        ));
+
+        $this->commandTester = new CommandTester($this->command);
+
+        $this->setIncrement(3);
+
+        parent::setUp();
+    }
+
+    /**
+     * @return string
+     */
+    private function getEdition()
+    {
+        return trim(file_get_contents(__DIR__  . '/_files/edition'));
+    }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        $this->setIncrement(1);
+
+        parent::tearDown();
+    }
+
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     */
+    public function testExecute()
+    {
+        $profile = BP . "/setup/performance-toolkit/profiles/{$this->getEdition()}/small.xml";
+        $this->commandTester->execute(
+            [
+                GenerateFixturesCommand::PROFILE_ARGUMENT => $profile,
+                '--' . GenerateFixturesCommand::SKIP_REINDEX_OPTION => true
+            ]
+        );
+        $this->indexerCommand->execute([]);
+
+        static::assertEquals(
+            Cli::RETURN_SUCCESS,
+            $this->indexerCommand->getStatusCode(),
+            $this->indexerCommand->getDisplay(true)
+        );
+
+        static::assertEquals(
+            Cli::RETURN_SUCCESS,
+            $this->commandTester->getStatusCode(),
+            $this->commandTester->getDisplay(true)
+        );
+    }
+
+    /**
+     * @param $value
+     */
+    private function setIncrement($value)
+    {
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $db */
+        $db = Bootstrap::getObjectManager()->get(ResourceConnection::class)->getConnection();
+        $db->query("SET @@session.auto_increment_increment=$value");
+        $db->query("SET @@session.auto_increment_offset=$value");
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php
new file mode 100644
index 0000000000000..c25dc65ccd73c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Console\Command;
+
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
+use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test command that sets indexer mode for catalog_product_price indexer
+ */
+class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\Indexer\TestCase
+{
+    /** @var  ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var  \Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand */
+    private $command;
+
+    /** @var  CommandTester */
+    private $commandTester;
+
+    /**
+     * setUp
+     */
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->objectManager->get(\Magento\TestFramework\App\Config::class)->clean();
+
+        $this->command = $this->objectManager->create(
+            \Magento\Indexer\Console\Command\IndexerSetDimensionsModeCommand::class
+        );
+
+        $this->commandTester = new CommandTester($this->command);
+
+        parent::setUp();
+    }
+
+    /**
+     * setUpBeforeClass
+     */
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     *
+     * @param string $previousMode
+     * @param string $currentMode
+     * @dataProvider modesDataProvider
+     */
+    public function testSwitchMode($previousMode, $currentMode)
+    {
+        $this->commandTester->execute(
+            [
+                'indexer' => 'catalog_product_price',
+                'mode'    => $currentMode,
+            ]
+        );
+        $expectedOutput = 'Dimensions mode for indexer "Product Price" was changed from \''
+            . $previousMode . '\' to \'' . $currentMode . '\'' . PHP_EOL;
+
+        $actualOutput = $this->commandTester->getDisplay();
+
+        $this->assertContains($expectedOutput, $actualOutput);
+
+        static::assertEquals(
+            Cli::RETURN_SUCCESS,
+            $this->commandTester->getStatusCode(),
+            $this->commandTester->getDisplay(true)
+        );
+    }
+
+    /**
+     * Modes data provider
+     * @return array
+     */
+    public function modesDataProvider()
+    {
+        return [
+            [DimensionModeConfiguration::DIMENSION_NONE, DimensionModeConfiguration::DIMENSION_WEBSITE],
+            [DimensionModeConfiguration::DIMENSION_WEBSITE, DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP],
+            [
+                DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP,
+                DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP
+            ],
+            [
+                DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP,
+                DimensionModeConfiguration::DIMENSION_NONE
+            ],
+            [
+                DimensionModeConfiguration::DIMENSION_NONE,
+                DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP
+            ],
+            [
+                DimensionModeConfiguration::DIMENSION_WEBSITE_AND_CUSTOMER_GROUP,
+                DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP
+            ],
+            [DimensionModeConfiguration::DIMENSION_CUSTOMER_GROUP, DimensionModeConfiguration::DIMENSION_WEBSITE],
+            [DimensionModeConfiguration::DIMENSION_WEBSITE, DimensionModeConfiguration::DIMENSION_NONE],
+        ];
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     */
+    public function testSwitchModeForSameMode()
+    {
+        $this->commandTester->execute(
+            [
+                'indexer' => 'catalog_product_price',
+                'mode' => DimensionModeConfiguration::DIMENSION_NONE
+            ]
+        );
+        $expectedOutput = 'Dimensions mode for indexer "Product Price" has not been changed' . PHP_EOL;
+
+        $actualOutput = $this->commandTester->getDisplay();
+
+        $this->assertContains($expectedOutput, $actualOutput);
+
+        static::assertEquals(
+            Cli::RETURN_SUCCESS,
+            $this->commandTester->getStatusCode(),
+            $this->commandTester->getDisplay(true)
+        );
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation enabled
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testSwitchModeWithInvalidArgument()
+    {
+        $this->commandTester->execute(
+            [
+                'indexer' => 'indexer_not_valid'
+            ]
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/edition b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/edition
new file mode 100644
index 0000000000000..a2a77c324b740
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/edition
@@ -0,0 +1 @@
+ce
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
index 4e7a28a4bc5c2..c6836f980647d 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
@@ -4,7 +4,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "0.1",
         "magento/module-b": "0.1"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/etc/module.xml b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
index d39e09c8f249a..e8e119f1ae48c 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_A" setup_version="2.0.0" />
+    <module name="Magento_A"  />
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
index f8d4bd3f296bd..25ec67cb999c0 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
@@ -4,8 +4,8 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "0.74.0-beta6",
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
         "magento/module-a": "0.1"
     },
     "version": "0.1"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/etc/module.xml b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
index e245ec4f4c0d8..9ab558e4147e0 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_B" setup_version="2.0.0" />
+    <module name="Magento_B"  />
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php
new file mode 100644
index 0000000000000..04f25f231c933
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Declaration;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Class WhitelistDeclarationTest
+ */
+class WhitelistDeclarationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ComponentRegistrarInterface
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var SchemaConfigInterface
+     */
+    private $schemaConfig;
+
+    public function setUp()
+    {
+        /** @var ObjectManagerInterface|ObjectManager $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+        $resourceConnection = $objectManager->create(ResourceConnection::class);
+        $objectManager->removeSharedInstance(ResourceConnection::class);
+        $objectManager->addSharedInstance($resourceConnection, ResourceConnection::class);
+        $this->componentRegistrar = $objectManager->get(ComponentRegistrarInterface::class);
+        $this->schemaConfig = $objectManager->create(SchemaConfigInterface::class);
+    }
+
+    /**
+     * Checks that all declared table elements also declared into whitelist declaration.
+     *
+     * @magentoAppIsolation enabled
+     * @throws \Exception
+     */
+    public function testConstraintsAndIndexesAreWhitelisted()
+    {
+        $undeclaredElements = [];
+        $resultMessage = "New table elements that do not exist in the whitelist declaration:\n";
+        $whitelistTables = $this->getWhiteListTables();
+        $declarativeSchema = $this->schemaConfig->getDeclarationConfig();
+
+        foreach ($declarativeSchema->getTables() as $schemaTable) {
+            $tableNameWithoutPrefix = $schemaTable->getNameWithoutPrefix();
+            foreach ($schemaTable->getConstraints() as $constraint) {
+                $constraintNameWithoutPrefix = $constraint->getNameWithoutPrefix();
+                if (isset($whitelistTables[$tableNameWithoutPrefix][Constraint::TYPE][$constraintNameWithoutPrefix])) {
+                    continue;
+                }
+
+                $undeclaredElements[$tableNameWithoutPrefix][Constraint::TYPE][] = $constraintNameWithoutPrefix;
+            }
+
+            foreach ($schemaTable->getIndexes() as $index) {
+                $indexNameWithoutPrefix = $index->getNameWithoutPrefix();
+                if (isset($whitelistTables[$tableNameWithoutPrefix][Index::TYPE][$indexNameWithoutPrefix])) {
+                    continue;
+                }
+
+                $undeclaredElements[$tableNameWithoutPrefix][Index::TYPE][] = $indexNameWithoutPrefix;
+            }
+        }
+
+        $undeclaredElements = $this->filterUndeclaredElements($undeclaredElements);
+
+        if (!empty($undeclaredElements)) {
+            $resultMessage .= json_encode($undeclaredElements, JSON_PRETTY_PRINT);
+        }
+
+        $this->assertEmpty($undeclaredElements, $resultMessage);
+    }
+
+    /**
+     * Excludes ignored elements from the list of undeclared table elements.
+     *
+     * @param array $undeclaredElements
+     * @return array
+     */
+    private function filterUndeclaredElements(array $undeclaredElements): array
+    {
+        $files = Files::getFiles([__DIR__ . '/_files/ignore_whitelisting'], '*.json');
+        $ignoredElements = [];
+        foreach ($files as $filePath) {
+            $ignoredElements = array_merge_recursive(
+                $ignoredElements,
+                json_decode(file_get_contents($filePath), true)
+            );
+        }
+
+        return $this->arrayRecursiveDiff($undeclaredElements, $ignoredElements);
+    }
+
+    /**
+     * Performs a recursive comparison of two arrays.
+     *
+     * @param array $array1
+     * @param array $array2
+     * @return array
+     */
+    private function arrayRecursiveDiff(array $array1, array $array2): array
+    {
+        $diffResult = [];
+
+        foreach ($array1 as $key => $value) {
+            if (array_key_exists($key, $array2)) {
+                if (is_array($value)) {
+                    $recursiveDiffResult = $this->arrayRecursiveDiff($value, $array2[$key]);
+                    if (count($recursiveDiffResult)) {
+                        $diffResult[$key] = $recursiveDiffResult;
+                    }
+                } else {
+                    if (!in_array($value, $array2)) {
+                        $diffResult[] = $value;
+                    }
+                }
+            } else {
+                $diffResult[$key] = $value;
+            }
+        }
+
+        return $diffResult;
+    }
+
+    /**
+     * @return array
+     */
+    private function getWhiteListTables(): array
+    {
+        $whiteListTables = [];
+
+        foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $path) {
+            $whiteListPath = $path . DIRECTORY_SEPARATOR . 'etc' .
+                DIRECTORY_SEPARATOR . 'db_schema_whitelist.json';
+
+            if (file_exists($whiteListPath)) {
+                $whiteListTables = array_replace_recursive(
+                    $whiteListTables,
+                    json_decode(file_get_contents($whiteListPath), true)
+                );
+            }
+        }
+
+        return $whiteListTables;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json b/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json
new file mode 100644
index 0000000000000..881481ab407bc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json
@@ -0,0 +1,7 @@
+{
+  "patch_list": {
+    "constraint": [
+      "PRIMARY"
+    ]
+  }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/FixtureGenerator/ProductGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Setup/Model/FixtureGenerator/ProductGeneratorTest.php
index 52316c4086161..ca1cb93eeef18 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Model/FixtureGenerator/ProductGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Model/FixtureGenerator/ProductGeneratorTest.php
@@ -9,11 +9,13 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Indexer\Model\Config;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * @magentoAppArea adminhtml
  * @magentoDataFixture Magento/Catalog/_files/category.php
+ * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
  */
 class ProductGeneratorTest extends \PHPUnit\Framework\TestCase
 {
@@ -37,6 +39,11 @@ class ProductGeneratorTest extends \PHPUnit\Framework\TestCase
      */
     private $indexersState = [];
 
+    /**
+     * @var WebsiteRepository
+     */
+    private $websiteRepository;
+
     /**
      * @return void
      */
@@ -45,7 +52,7 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productGenerator = $this->objectManager->get(ProductGenerator::class);
-
+        $this->websiteRepository = $this->objectManager->get(WebsiteRepository::class);
         $indexerRegistry = $this->objectManager->get(IndexerRegistry::class);
         $indexerListIds = $this->objectManager->get(Config::class)->getIndexers();
 
@@ -69,6 +76,9 @@ protected function tearDown()
         }
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     */
     public function testProductGeneration()
     {
         $name = 'Simple Product Name';
@@ -76,6 +86,7 @@ public function testProductGeneration()
         $price = 7.99;
         $url = 'simple-product-url';
         $categoryId = 333;
+        $secondWebsiteId = $this->websiteRepository->get('test')->getId();
 
         $fixtureMap = [
             'name' => function () use ($name) {
@@ -93,6 +104,9 @@ public function testProductGeneration()
             'category_ids' => function () use ($categoryId) {
                 return $categoryId;
             },
+            'website_ids' => function () use ($secondWebsiteId) {
+                return [1, $secondWebsiteId];
+            }
         ];
         $this->productGenerator->generate(1, $fixtureMap);
 
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.json
index 840d4acea3ee2..96276f67751a9 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.json
@@ -1,10 +1,9 @@
 {
-  "version": "0.74.0-beta9",
   "config": {
     "sort-packages": true
   },
   "require": {
-    "magento/product-community-edition": "0.74.0-beta2",
+    "magento/product-community-edition": "*",
     "magento/sample-module-minimal" : "*"
    },
   "autoload": {
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock
index f027a2397f97f..48fa6d0d0cd34 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock
@@ -775,18 +775,6 @@
                         "dev/tests/functional/.gitignore",
                         "dev/tests/functional/.gitignore"
                     ],
-                    [
-                        "dev/tests/js/run_js_tests.php",
-                        "dev/tests/js/run_js_tests.php"
-                    ],
-                    [
-                        "dev/tests/js/jsTestDriverOrder.php",
-                        "dev/tests/js/jsTestDriverOrder.php"
-                    ],
-                    [
-                        "dev/tests/js/jsTestDriver.php.dist",
-                        "dev/tests/js/jsTestDriver.php.dist"
-                    ],
                     [
                         "dev/tests/js/spec",
                         "dev/tests/js/spec"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/DataSetupTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/DataSetupTest.php
index 5abf33d9d5096..425840b44ba0e 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Module/DataSetupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/DataSetupTest.php
@@ -38,15 +38,6 @@ public function testUpdateTableRow()
         );
     }
 
-    /**
-     * @expectedException \Zend_Db_Statement_Exception
-     */
-    public function testGetTableRow()
-    {
-        $this->assertNotEmpty($this->_model->getTableRow('setup_module', 'module', 'Magento_AdminNotification'));
-        $this->_model->getTableRow('setup/module', 'module', 'Magento_AdminNotification');
-    }
-
     /**
      * @expectedException \Zend_Db_Statement_Exception
      */
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php
index 7bcdb3d9fce0d..5b486f4d3bd2c 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Setup\Module\I18n\Dictionary;
 
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Setup\Module\I18n\Dictionary\Generator;
 use Magento\Setup\Module\I18n\ServiceLocator;
 
 class GeneratorTest extends \PHPUnit\Framework\TestCase
@@ -46,6 +47,7 @@ protected function setUp()
         $paths = $reflection->getProperty('paths');
         $paths->setAccessible(true);
         $this->backupRegistrar = $paths->getValue();
+        $paths->setValue(['module' => [], 'theme' => []]);
         $paths->setAccessible(false);
 
         $this->testDir = realpath(__DIR__ . '/_files');
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php
index eaac89cc6851b..99a28812a12d5 100644
--- a/dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php
@@ -5,16 +5,18 @@
  */
 namespace Magento\Shipping\Helper;
 
+use Magento\Store\Model\StoreManagerInterface;
+
 class DataTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Shipping\Helper\Data
      */
-    protected $_helper = null;
+    private $helper;
 
     protected function setUp()
     {
-        $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $this->helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Shipping\Helper\Data::class
         );
     }
@@ -31,33 +33,77 @@ public function testGetTrackingPopupUrlBySalesModel($modelName, $getIdMethod, $e
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $constructArgs = [];
-        if (\Magento\Sales\Model\Order\Shipment::class == $modelName) {
-            $orderRepository = $this->_getMockOrderRepository($code);
+        if (\Magento\Sales\Model\Order\Shipment::class === $modelName) {
+            $orderRepository = $this->getMockOrderRepository($code);
+            $constructArgs['orderRepository'] = $orderRepository;
+        } elseif (\Magento\Sales\Model\Order\Shipment\Track::class === $modelName) {
+            $shipmentRepository = $this->getMockShipmentRepository($code);
+            $constructArgs['shipmentRepository'] = $shipmentRepository;
+        }
+
+        $model = $objectManager->create($modelName, $constructArgs);
+        $model->{$getIdMethod}($entityId);
+
+        if (\Magento\Sales\Model\Order::class === $modelName) {
+            $model->setProtectCode($code);
+        }
+        if (\Magento\Sales\Model\Order\Shipment\Track::class === $modelName) {
+            $model->setParentId(1);
+        }
+
+        $actual = $this->helper->getTrackingPopupUrlBySalesModel($model);
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * From the admin panel with custom URL we should have generated frontend URL
+     *
+     * @param string $modelName
+     * @param string $getIdMethod
+     * @param int $entityId
+     * @param string $code
+     * @param string $expected
+     * @magentoAppArea adminhtml
+     * @magentoConfigFixture admin_store web/unsecure/base_link_url http://admin.localhost/
+     * @dataProvider getTrackingPopupUrlBySalesModelDataProvider
+     */
+    public function testGetTrackingPopupUrlBySalesModelFromAdmin($modelName, $getIdMethod, $entityId, $code, $expected)
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $objectManager->create(StoreManagerInterface::class);
+        $storeManager->reinitStores();
+
+        $constructArgs = [];
+        if (\Magento\Sales\Model\Order\Shipment::class === $modelName) {
+            $orderRepository = $this->getMockOrderRepository($code);
             $constructArgs['orderRepository'] = $orderRepository;
-        } elseif (\Magento\Sales\Model\Order\Shipment\Track::class == $modelName) {
-            $shipmentRepository = $this->_getMockShipmentRepository($code);
+        } elseif (\Magento\Sales\Model\Order\Shipment\Track::class === $modelName) {
+            $shipmentRepository = $this->getMockShipmentRepository($code);
             $constructArgs['shipmentRepository'] = $shipmentRepository;
         }
 
         $model = $objectManager->create($modelName, $constructArgs);
         $model->{$getIdMethod}($entityId);
 
-        if (\Magento\Sales\Model\Order::class == $modelName) {
+        if (\Magento\Sales\Model\Order::class === $modelName) {
             $model->setProtectCode($code);
         }
-        if (\Magento\Sales\Model\Order\Shipment\Track::class == $modelName) {
+        if (\Magento\Sales\Model\Order\Shipment\Track::class === $modelName) {
             $model->setParentId(1);
         }
 
-        $actual = $this->_helper->getTrackingPopupUrlBySalesModel($model);
+        //Frontend URL should be used there
+        $actual = $this->helper->getTrackingPopupUrlBySalesModel($model);
         $this->assertEquals($expected, $actual);
     }
 
     /**
      * @param $code
-     * @return \Magento\Sales\Api\OrderRepositoryInterface
+     * @return \Magento\Sales\Api\OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected function _getMockOrderRepository($code)
+    private function getMockOrderRepository($code)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $order = $objectManager->create(\Magento\Sales\Model\Order::class);
@@ -71,10 +117,10 @@ protected function _getMockOrderRepository($code)
      * @param $code
      * @return \Magento\Sales\Model\Order\ShipmentRepository|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected function _getMockShipmentRepository($code)
+    private function getMockShipmentRepository($code)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $orderRepository = $this->_getMockOrderRepository($code);
+        $orderRepository = $this->getMockOrderRepository($code);
         $shipmentArgs = ['orderRepository' => $orderRepository];
 
         $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class, $shipmentArgs);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Block/Adminhtml/CaseInfoTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Block/Adminhtml/CaseInfoTest.php
new file mode 100644
index 0000000000000..7607526b1389e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Block/Adminhtml/CaseInfoTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Block\Adminhtml;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CaseInfoTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Order
+     */
+    private $order;
+
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->order = $this->objectManager->create(Order::class);
+        $this->layoutFactory = $this->objectManager->get(\Magento\Framework\View\LayoutFactory::class);
+    }
+
+    /**
+     * Checks that block has contents when case entity for order is exists
+     * even if Signifyd module is inactive.
+     *
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 0
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     * @magentoAppArea adminhtml
+     */
+    public function testModuleIsInactive()
+    {
+        $this->order->loadByIncrementId('100000001');
+
+        self::assertNotEmpty($this->getBlock()->toHtml());
+    }
+
+    /**
+     * Checks that block does not give contents
+     * if there is no case entity created for order.
+     *
+     * @covers \Magento\Signifyd\Block\Adminhtml\CaseInfo::getCaseEntity
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     * @magentoAppArea adminhtml
+     */
+    public function testCaseEntityNotExists()
+    {
+        $this->order->loadByIncrementId('100000001');
+
+        self::assertEmpty($this->getBlock()->toHtml());
+    }
+
+    /**
+     * Checks that:
+     * - block give contents
+     * - block contents guarantee decision field
+     *
+     * @covers \Magento\Signifyd\Block\Adminhtml\CaseInfo::getScoreClass
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     * @magentoAppArea adminhtml
+     */
+    public function testCaseEntityExists()
+    {
+        $this->order->loadByIncrementId('100000001');
+
+        $block = $this->getBlock();
+        self::assertNotEmpty($block->toHtml());
+        self::assertContains((string) $block->getCaseGuaranteeDisposition(), $block->toHtml());
+    }
+
+    /**
+     * Gets block.
+     *
+     * @return CaseInfo
+     */
+    private function getBlock()
+    {
+        $layout = $this->layoutFactory->create();
+
+        $layout->addContainer('order_additional_info', 'Container');
+
+        /** @var CaseInfo $block */
+        $block = $layout->addBlock(CaseInfo::class, 'order_case_info', 'order_additional_info');
+        $block->setAttribute('context', $this->getContext());
+        $block->setTemplate('Magento_Signifyd::case_info.phtml');
+
+        return $block;
+    }
+
+    /**
+     * Creates template context with necessary order id param.
+     *
+     * @return Context
+     */
+    private function getContext()
+    {
+        /** @var RequestInterface $request */
+        $request = $this->objectManager->get(RequestInterface::class);
+        $request->setParams(['order_id' => $this->order->getEntityId()]);
+
+        return $this->objectManager->create(Context::class, ['request' => $request]);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Block/FingerprintTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Block/FingerprintTest.php
new file mode 100644
index 0000000000000..1efbb8b6d33e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Block/FingerprintTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Block;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class FingerprintTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $bootstrap = Bootstrap::getInstance();
+        $bootstrap->loadArea(Area::AREA_FRONTEND);
+
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Checks if session id attribute is present when the module is enabled.
+     *
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testSessionIdPresent()
+    {
+        self::assertContains('data-order-session-id', $this->getBlockContents());
+    }
+
+    /**
+     * Checks if block is an empty when the module is disabled.
+     *
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 0
+     */
+    public function testBlockEmpty()
+    {
+        self::assertEmpty($this->getBlockContents());
+    }
+
+    /**
+     * Renders block contents.
+     *
+     * @return string
+     */
+    private function getBlockContents()
+    {
+        $block = $this->objectManager->get(LayoutInterface::class)
+            ->createBlock(Fingerprint::class);
+
+        return $block->fetchView($block->getTemplateFile());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Controller/Webhooks/HandlerTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Controller/Webhooks/HandlerTest.php
new file mode 100644
index 0000000000000..667cb079f9096
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Controller/Webhooks/HandlerTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Controller\Webhooks;
+
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * Class tests handling webhook post from Signifyd service.
+ */
+class HandlerTest extends AbstractController
+{
+    /**
+     * @var string
+     */
+    private static $entryPoint = 'signifyd/webhooks/handler';
+
+    /**
+     * Tests handling webhook message of cases/rescore type.
+     * Checks updated case entity and comment in order history.
+     *
+     * @covers \Magento\Signifyd\Controller\Webhooks\Handler::execute
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     * @magentoConfigFixture current_store fraud_protection/signifyd/api_key ApFZZvxGgIxuP8BazSm3v8eGN
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     */
+    public function testExecuteSuccess()
+    {
+        $caseId = 123;
+        $webhookRequest = $this->getWebhookRequest();
+        $this->_objectManager->addSharedInstance($webhookRequest, WebhookRequest::class);
+
+        $this->dispatch(self::$entryPoint);
+
+        /** @var CaseRepositoryInterface $caseManagement */
+        $caseRepository = $this->_objectManager->get(CaseRepositoryInterface::class);
+        /** @var CaseInterface $caseEntity */
+        $caseEntity = $caseRepository->getByCaseId($caseId);
+        $orderEntityId = $caseEntity->getOrderId();
+
+        self::assertNotEmpty($caseEntity);
+        self::assertEquals('2017-01-06 12:47:03', $caseEntity->getCreatedAt());
+        self::assertEquals('2017-01-06 12:47:03', $caseEntity->getUpdatedAt());
+        self::assertEquals('Magento', $caseEntity->getAssociatedTeam()['teamName']);
+        self::assertEquals(true, $caseEntity->isGuaranteeEligible());
+        self::assertEquals(CaseInterface::STATUS_OPEN, $caseEntity->getStatus());
+        self::assertEquals($orderEntityId, $caseEntity->getOrderId());
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($caseEntity->getOrderId());
+        $histories = $order->getStatusHistories();
+        self::assertNotEmpty($histories);
+
+        /** @var OrderStatusHistoryInterface $caseCreationComment */
+        $caseComment = array_pop($histories);
+        self::assertInstanceOf(OrderStatusHistoryInterface::class, $caseComment);
+
+        self::assertEquals(
+            "Case Update: New score for the order is 384. Previous score was 553.",
+            $caseComment->getComment()
+        );
+
+        $this->_objectManager->removeSharedInstance(WebhookRequest::class);
+    }
+
+    /**
+     * Tests handling webhook message of cases/test type.
+     * Controller should response with code 200.
+     *
+     * @covers \Magento\Signifyd\Controller\Webhooks\Handler::execute
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testExecuteTestSuccess()
+    {
+        $webhookRequest = $this->getTestWebhookRequest();
+        $this->_objectManager->addSharedInstance($webhookRequest, WebhookRequest::class);
+        $this->dispatch(self::$entryPoint);
+        $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
+        $this->_objectManager->removeSharedInstance(WebhookRequest::class);
+    }
+
+    /**
+     * Returns mocked WebhookRequest
+     *
+     * @return WebhookRequest|\PHPUnit\Framework\MockObject_MockObject
+     */
+    private function getWebhookRequest()
+    {
+        $webhookRequest = $this->getMockBuilder(WebhookRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookRequest->expects($this->any())
+            ->method('getBody')
+            ->willReturn(file_get_contents(__DIR__ . '/../../_files/webhook_body.json'));
+        $webhookRequest->expects($this->any())
+            ->method('getEventTopic')
+            ->willReturn('cases/rescore');
+        $webhookRequest->expects($this->any())
+            ->method('getHash')
+            ->willReturn('m/X29RcHWPSCDPgQuSXjnyTfKISJDopcdGbVsRLeqy8=');
+
+        return $webhookRequest;
+    }
+
+    /**
+     * Returns mocked test WebhookRequest
+     *
+     * @return WebhookRequest|\PHPUnit\Framework\MockObject_MockObject
+     */
+    private function getTestWebhookRequest()
+    {
+        $webhookRequest = $this->getMockBuilder(WebhookRequest::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $webhookRequest->expects($this->any())
+            ->method('getBody')
+            ->willReturn(file_get_contents(__DIR__ . '/../../_files/webhook_body.json'));
+        $webhookRequest->expects($this->any())
+            ->method('getEventTopic')
+            ->willReturn('cases/test');
+        $webhookRequest->expects($this->any())
+            ->method('getHash')
+            ->willReturn('wyG0r9mOmv1IqVlN6ZqJ5sgA635yKW6lbSsqlYF2b8U=');
+
+        return $webhookRequest;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseManagementTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseManagementTest.php
new file mode 100644
index 0000000000000..30603baf867ff
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseManagementTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Contains test methods for case management service
+ */
+class CaseManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CaseManagement
+     */
+    private $caseManagement;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    protected function setup()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->caseManagement = $this->objectManager->get(CaseManagement::class);
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseManagement::create
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testCreate()
+    {
+        $order = $this->getOrder();
+        $case = $this->caseManagement->create($order->getEntityId());
+
+        self::assertNotEmpty($case->getEntityId());
+        self::assertEquals(CaseInterface::STATUS_PENDING, $case->getStatus());
+        self::assertEquals(CaseInterface::GUARANTEE_PENDING, $case->getGuaranteeDisposition());
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseManagement::getByOrderId
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     */
+    public function testGetByOrderId()
+    {
+        $order = $this->getOrder();
+        $case = $this->caseManagement->getByOrderId($order->getEntityId());
+
+        self::assertEquals(CaseInterface::STATUS_PROCESSING, $case->getStatus());
+        self::assertEquals(CaseInterface::DISPOSITION_GOOD, $case->getReviewDisposition());
+        self::assertEquals('2016-12-12 15:17:17', $case->getCreatedAt());
+        self::assertEquals('2016-12-12 19:23:16', $case->getUpdatedAt());
+    }
+
+    /**
+     * Get stored order
+     * @return OrderInterface
+     */
+    private function getOrder()
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, '100000001')
+            ->create();
+
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $orders = $orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        /** @var OrderInterface $order */
+        return array_pop($orders);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseRepositoryTest.php
new file mode 100644
index 0000000000000..ca98a20b15bec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseRepositoryTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Testing case repository
+ */
+class CaseRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var CaseRepository
+     */
+    private $repository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filterBuilder = $this->objectManager->get(FilterBuilder::class);
+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $this->repository = $this->objectManager->get(CaseRepository::class);
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseRepository::delete
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     */
+    public function testDelete()
+    {
+        $filters = [
+            $this->filterBuilder->setField('case_id')
+                ->setValue(123)
+                ->create()
+        ];
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)->create();
+        $cases = $this->repository->getList($searchCriteria)
+            ->getItems();
+
+        $case = array_pop($cases);
+        $this->repository->delete($case);
+
+        self::assertEmpty($this->repository->getList($searchCriteria)->getItems());
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseRepository::getById
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     */
+    public function testGetById()
+    {
+        $filters = [
+            $this->filterBuilder->setField('case_id')
+                ->setValue(123)
+                ->create()
+        ];
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)->create();
+        $cases = $this->repository->getList($searchCriteria)
+            ->getItems();
+
+        $case = array_pop($cases);
+
+        $found = $this->repository->getById($case->getEntityId());
+
+        self::assertNotEmpty($found->getEntityId());
+        self::assertEquals($case->getEntityId(), $found->getEntityId());
+        self::assertEquals($case->getOrderId(), $found->getOrderId());
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseRepository::getList
+     * @magentoDataFixture Magento/Signifyd/_files/multiple_cases.php
+     */
+    public function testGetListDateInterval()
+    {
+        $startDateInterval = [
+            $this->filterBuilder->setField('created_at')
+                ->setConditionType('gteq')
+                ->setValue('2016-12-01 00:00:01')
+                ->create()
+        ];
+        $endDateInterval = [
+            $this->filterBuilder->setField('created_at')
+                ->setConditionType('lteq')
+                ->setValue('2016-12-03 23:59:59')
+                ->create()
+        ];
+
+        $this->searchCriteriaBuilder->addFilters($startDateInterval);
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters($endDateInterval)->create();
+        $items = $this->repository->getList($searchCriteria)
+            ->getItems();
+
+        self::assertCount(3, $items);
+
+        for ($i = 1; $i < 4; $i ++) {
+            $current = array_shift($items);
+            self::assertEquals($i, $current->getCaseId());
+        }
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseRepository::getList
+     * @magentoDataFixture Magento/Signifyd/_files/multiple_cases.php
+     */
+    public function testGetListStatusProcessing()
+    {
+        $filters = [
+            $this->filterBuilder->setField('status')
+                ->setValue(CaseInterface::STATUS_PROCESSING)
+                ->create()
+        ];
+
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)->create();
+        $items = $this->repository->getList($searchCriteria)
+            ->getItems();
+
+        self::assertCount(1, $items);
+
+        $case = array_pop($items);
+        self::assertEquals(123, $case->getCaseId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseServices/CreationServiceTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseServices/CreationServiceTest.php
new file mode 100644
index 0000000000000..6cf1e0bfddc9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseServices/CreationServiceTest.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\ResourceModel\Order\Grid\Collection;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Signifyd\Model\SignifydGateway\ApiClient;
+use Magento\Signifyd\Model\SignifydGateway\Client\RequestBuilder;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class tests interaction with Signifyd Case creation service
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreationServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var OrderInterface
+     */
+    private $order;
+
+    /**
+     * @var RequestBuilder|MockObject
+     */
+    private $requestBuilder;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var CreationService
+     */
+    private $service;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->requestBuilder = $this->getMockBuilder(RequestBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['doRequest'])
+            ->getMock();
+
+        $apiClient = $this->objectManager->create(
+            ApiClient::class,
+            ['requestBuilder' => $this->requestBuilder]
+        );
+
+        $gateway = $this->objectManager->create(
+            Gateway::class,
+            ['apiClient' => $apiClient]
+        );
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['error'])
+            ->getMockForAbstractClass();
+
+        $this->service = $this->objectManager->create(
+            CreationService::class,
+            [
+                'signifydGateway' => $gateway,
+                'logger'          => $this->logger
+            ]
+        );
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseServices\CreationService::createForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testCreateForOrderWithEmptyResponse()
+    {
+        $order = $this->getOrder();
+        $exceptionMessage = 'Response is not valid JSON: Decoding failed: Syntax error';
+
+        $this->requestBuilder->expects(self::once())
+            ->method('doRequest')
+            ->willThrowException(new ApiCallException($exceptionMessage));
+
+        $this->logger->expects(self::once())
+            ->method('error')
+            ->with($exceptionMessage);
+
+        $result = $this->service->createForOrder($order->getEntityId());
+        self::assertTrue($result);
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseServices\CreationService::createForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testCreateForOrderWithBadResponse()
+    {
+        $order = $this->getOrder();
+        $responseData = [
+            'messages' => [
+                'Something wrong'
+            ]
+        ];
+        $exceptionMessage = 'Bad Request - The request could not be parsed. Response: ' . json_encode($responseData);
+
+        $this->requestBuilder->expects(self::once())
+            ->method('doRequest')
+            ->willThrowException(new ApiCallException($exceptionMessage));
+
+        $this->logger->expects(self::once())
+            ->method('error')
+            ->with($exceptionMessage);
+
+        $result = $this->service->createForOrder($order->getEntityId());
+        self::assertTrue($result);
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseServices\CreationService::createForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testCreateOrderWithEmptyInvestigationId()
+    {
+        $order = $this->getOrder();
+
+        $this->requestBuilder->expects(self::once())
+            ->method('doRequest')
+            ->willReturn([]);
+
+        $this->logger->expects(self::once())
+            ->method('error')
+            ->with('Expected field "investigationId" missed.');
+
+        $result = $this->service->createForOrder($order->getEntityId());
+        self::assertTrue($result);
+    }
+
+    /**
+     * @covers \Magento\Signifyd\Model\CaseServices\CreationService::createForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testCreateForOrder()
+    {
+        $order = $this->getOrder();
+
+        $this->requestBuilder->expects(self::once())
+            ->method('doRequest')
+            ->willReturn(['investigationId' => 123123]);
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $result = $this->service->createForOrder($order->getEntityId());
+        self::assertTrue($result);
+
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $caseEntity = $caseRepository->getByCaseId(123123);
+        $gridGuarantyStatus = $this->getOrderGridGuarantyStatus($caseEntity->getOrderId());
+
+        self::assertNotEmpty($caseEntity);
+        self::assertEquals($order->getEntityId(), $caseEntity->getOrderId());
+        self::assertEquals(
+            $gridGuarantyStatus,
+            $caseEntity->getGuaranteeDisposition(),
+            'Signifyd guaranty status in sales_order_grid table does not match case entity guaranty status'
+        );
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($caseEntity->getOrderId());
+        self::assertEquals(Order::STATE_HOLDED, $order->getState());
+
+        $histories = $order->getStatusHistories();
+        self::assertNotEmpty($histories);
+
+        /** @var OrderStatusHistoryInterface $orderHoldComment */
+        $orderHoldComment = array_pop($histories);
+        self::assertInstanceOf(OrderStatusHistoryInterface::class, $orderHoldComment);
+        self::assertEquals("Awaiting the Signifyd guarantee disposition.", $orderHoldComment->getComment());
+    }
+
+    /**
+     * Get stored order
+     *
+     * @return OrderInterface
+     */
+    private function getOrder()
+    {
+        if ($this->order === null) {
+
+            /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+            $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+            $searchCriteria = $searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, '100000001')
+                ->create();
+
+            $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+            $orders = $orderRepository->getList($searchCriteria)
+                ->getItems();
+
+            $this->order = array_pop($orders);
+        }
+
+        return $this->order;
+    }
+
+    /**
+     * Returns value of signifyd_guarantee_status column from sales order grid
+     *
+     * @param int $orderEntityId
+     * @return string|null
+     */
+    private function getOrderGridGuarantyStatus($orderEntityId)
+    {
+        /** @var Collection $orderGridCollection */
+        $orderGridCollection = $this->objectManager->get(Collection::class);
+
+        $items = $orderGridCollection->addFilter($orderGridCollection->getIdFieldName(), $orderEntityId)
+            ->getItems();
+        $result = array_pop($items);
+
+        return isset($result['signifyd_guarantee_status']) ? $result['signifyd_guarantee_status'] : null;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseServices/UpdatingServiceTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseServices/UpdatingServiceTest.php
new file mode 100644
index 0000000000000..50e510ca072be
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/CaseServices/UpdatingServiceTest.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\CaseServices;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\ResourceModel\Order\Grid\Collection;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Contains tests for case entity updating service.
+ */
+class UpdatingServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var UpdatingService
+     */
+    private $service;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        /** @var GeneratorFactory $messageFactory */
+        $messageFactory = $this->objectManager->get(GeneratorFactory::class);
+        $messageGenerator = $messageFactory->create('cases/creation');
+
+        $this->service = $this->objectManager->create(UpdatingService::class, [
+            'messageGenerator' => $messageGenerator
+        ]);
+    }
+
+    /**
+     * Checks case updating flow and messages in order comments history.
+     * Also checks that order is unholded when case guarantee disposition is APPROVED.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     */
+    public function testUpdate()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId,
+            'score' => 750,
+            'orderId' => '100000001',
+            'reviewDisposition' => CaseInterface::DISPOSITION_FRAUDULENT,
+            'associatedTeam' => [
+                'teamName' => 'AnyTeam',
+                'teamId' => 26,
+                'getAutoDismiss' => true,
+                'getTeamDismissalDays' => 2
+            ],
+            'createdAt' => '2017-01-05T14:23:26-0800',
+            'updatedAt' => '2017-01-05T14:44:26-0800',
+            'guaranteeDisposition' => CaseInterface::GUARANTEE_APPROVED
+        ];
+
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        /** @var CaseInterface $caseEntity */
+        $caseEntity = $caseRepository->getByCaseId($caseId);
+
+        $this->service->update($caseEntity, $data);
+
+        $caseEntity = $caseRepository->getByCaseId($caseId);
+        $orderEntityId = $caseEntity->getOrderId();
+        $gridGuarantyStatus = $this->getOrderGridGuarantyStatus($orderEntityId);
+
+        self::assertNotEmpty($caseEntity);
+        self::assertEquals('2017-01-05 22:23:26', $caseEntity->getCreatedAt());
+        self::assertEquals(CaseInterface::GUARANTEE_APPROVED, $caseEntity->getGuaranteeDisposition());
+        self::assertEquals('AnyTeam', $caseEntity->getAssociatedTeam()['teamName']);
+        self::assertEquals(true, $caseEntity->isGuaranteeEligible());
+        self::assertEquals(CaseInterface::STATUS_PROCESSING, $caseEntity->getStatus());
+        self::assertEquals($orderEntityId, $caseEntity->getOrderId());
+        self::assertEquals(
+            $gridGuarantyStatus,
+            $caseEntity->getGuaranteeDisposition(),
+            'Signifyd guaranty status in sales_order_grid table does not match case entity guaranty status'
+        );
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($caseEntity->getOrderId());
+        self::assertEquals(Order::STATE_PROCESSING, $order->getState());
+        $histories = $order->getStatusHistories();
+        self::assertNotEmpty($histories);
+
+        /** @var OrderStatusHistoryInterface $caseCreationComment */
+        $caseCreationComment = array_pop($histories);
+        self::assertInstanceOf(OrderStatusHistoryInterface::class, $caseCreationComment);
+        self::assertEquals("Signifyd Case $caseId has been created for order.", $caseCreationComment->getComment());
+    }
+
+    /**
+     * Checks that order is holded when case guarantee disposition is DECLINED.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @magentoDataFixture Magento/Signifyd/_files/approved_case.php
+     */
+    public function testOrderStateAfterDeclinedGuaranteeDisposition()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId,
+            'orderId' => '100000001',
+            'guaranteeDisposition' => CaseInterface::GUARANTEE_DECLINED
+        ];
+
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $caseEntity = $caseRepository->getByCaseId($caseId);
+
+        $this->service->update($caseEntity, $data);
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($caseEntity->getOrderId());
+
+        self::assertEquals(Order::STATE_HOLDED, $order->getState());
+    }
+
+    /**
+     * Checks that order doesn't become holded
+     * when previous case guarantee disposition was DECLINED
+     * and webhook without guarantee disposition was received.
+     *
+     * @covers \Magento\Signifyd\Model\CaseServices\UpdatingService::update
+     * @magentoDataFixture Magento/Signifyd/_files/declined_case.php
+     */
+    public function testOrderStateAfterWebhookWithoutGuaranteeDisposition()
+    {
+        $caseId = 123;
+        $data = [
+            'caseId' => $caseId,
+            'orderId' => '100000001'
+        ];
+
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $caseEntity = $caseRepository->getByCaseId($caseId);
+
+        $this->service->update($caseEntity, $data);
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($caseEntity->getOrderId());
+
+        self::assertEquals(Order::STATE_PROCESSING, $order->getState());
+    }
+
+    /**
+     * Returns value of signifyd_guarantee_status column from sales order grid
+     *
+     * @param int $orderEntityId
+     * @return string|null
+     */
+    private function getOrderGridGuarantyStatus($orderEntityId)
+    {
+        /** @var Collection $orderGridCollection */
+        $orderGridCollection = $this->objectManager->get(Collection::class);
+
+        $items = $orderGridCollection->addFilter($orderGridCollection->getIdFieldName(), $orderEntityId)
+            ->getItems();
+        $result = array_pop($items);
+
+        return isset($result['signifyd_guarantee_status']) ? $result['signifyd_guarantee_status'] : null;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/Guarantee/CancelingServiceTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/Guarantee/CancelingServiceTest.php
new file mode 100644
index 0000000000000..2cc7a9a1f240a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/Guarantee/CancelingServiceTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\Guarantee;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Contains test cases for canceling Signifyd guarantee flow.
+ */
+class CancelingServiceTest extends \PHPUnit\Framework\TestCase
+{
+    private static $caseId = 123;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Gateway|MockObject
+     */
+    private $gateway;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var CancelingService;
+     */
+    private $service;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->gateway = $this->getMockBuilder(Gateway::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['cancelGuarantee'])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->service = $this->objectManager->create(CancelingService::class, [
+            'gateway' => $this->gateway,
+            'logger' => $this->logger
+        ]);
+    }
+
+    /**
+     * Checks a test case, when Signifyd guarantee was canceled.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testCancelForOrderWithCanceledGuarantee()
+    {
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $caseEntity = $caseRepository->getByCaseId(self::$caseId);
+        $caseEntity->setGuaranteeDisposition(CaseInterface::GUARANTEE_CANCELED);
+        $caseRepository->save($caseEntity);
+
+        $this->gateway->expects(self::never())
+            ->method('cancelGuarantee');
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $result = $this->service->cancelForOrder($caseEntity->getOrderId());
+        self::assertFalse($result);
+    }
+
+    /**
+     * Checks a test case, when Signifyd gateway throws an exception.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/approved_case.php
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testCancelForOrderWithFailedRequest()
+    {
+        $exceptionMessage = 'Something wrong.';
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $caseEntity = $caseRepository->getByCaseId(self::$caseId);
+
+        $this->gateway->expects(self::once())
+            ->method('cancelGuarantee')
+            ->with(self::equalTo(self::$caseId))
+            ->willThrowException(new GatewayException($exceptionMessage));
+
+        $this->logger->expects(self::once())
+            ->method('error')
+            ->with(self::equalTo($exceptionMessage));
+
+        $result = $this->service->cancelForOrder($caseEntity->getOrderId());
+        self::assertFalse($result);
+    }
+
+    /**
+     * Checks a test case, when request to cancel is submitted and case entity is updated successfully.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CancelingService::cancelForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/approved_case.php
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testCancelForOrder()
+    {
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $caseEntity = $caseRepository->getByCaseId(self::$caseId);
+
+        $this->gateway->expects(self::once())
+            ->method('cancelGuarantee')
+            ->with(self::equalTo(self::$caseId))
+            ->willReturn(CaseInterface::GUARANTEE_CANCELED);
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $result = $this->service->cancelForOrder($caseEntity->getOrderId());
+        self::assertTrue($result);
+
+        $updatedCase = $caseRepository->getByCaseId(self::$caseId);
+        self::assertEquals(CaseInterface::GUARANTEE_CANCELED, $updatedCase->getGuaranteeDisposition());
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($updatedCase->getOrderId());
+        $histories = $order->getStatusHistories();
+        self::assertNotEmpty($histories);
+
+        /** @var OrderStatusHistoryInterface $caseCreationComment */
+        $caseCreationComment = array_pop($histories);
+        self::assertInstanceOf(OrderStatusHistoryInterface::class, $caseCreationComment);
+        self::assertEquals('Case Update: Case guarantee has been cancelled.', $caseCreationComment->getComment());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/Guarantee/CreationServiceTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/Guarantee/CreationServiceTest.php
new file mode 100644
index 0000000000000..157e3270648b3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/Guarantee/CreationServiceTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\Guarantee;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\SignifydGateway\Gateway;
+use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Contains positive and negative test cases for Signifyd case guarantee creation flow.
+ */
+class CreationServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CreationService
+     */
+    private $service;
+
+    /**
+     * @var Gateway|MockObject
+     */
+    private $gateway;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        /** @var ObjectManager $objectManager */
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->gateway = $this->getMockBuilder(Gateway::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['submitCaseForGuarantee'])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->service = $this->objectManager->create(CreationService::class, [
+            'gateway' => $this->gateway,
+            'logger' => $this->logger
+        ]);
+    }
+
+    /**
+     * Checks a test case, when Signifyd case entity cannot be found
+     * for a specified order.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CreationService::createForOrder
+     */
+    public function testCreateWithoutCaseEntity()
+    {
+        $orderId = 123;
+
+        $this->gateway->expects(self::never())
+            ->method('submitCaseForGuarantee');
+
+        $result = $this->service->createForOrder($orderId);
+        self::assertFalse($result);
+    }
+
+    /**
+     * Checks a test case, when request is failing.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CreationService::createForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     */
+    public function testCreateWithFailedRequest()
+    {
+        $caseEntity = $this->getCaseEntity();
+
+        $this->gateway->expects(self::once())
+            ->method('submitCaseForGuarantee')
+            ->willThrowException(new GatewayException('Something wrong'));
+
+        $this->logger->expects(self::once())
+            ->method('error')
+            ->with('Something wrong');
+
+        $result = $this->service->createForOrder($caseEntity->getOrderId());
+        self::assertFalse($result);
+    }
+
+    /**
+     * Checks a test case, when case entity is updated successfully.
+     *
+     * @covers \Magento\Signifyd\Model\Guarantee\CreationService::createForOrder
+     * @magentoDataFixture Magento/Signifyd/_files/case.php
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testCreate()
+    {
+        $caseEntity = $this->getCaseEntity();
+
+        $this->gateway->expects(self::once())
+            ->method('submitCaseForGuarantee')
+            ->with($caseEntity->getCaseId())
+            ->willReturn(CaseInterface::GUARANTEE_IN_REVIEW);
+
+        $this->logger->expects(self::never())
+            ->method('error');
+
+        $result = $this->service->createForOrder($caseEntity->getOrderId());
+        self::assertTrue($result);
+
+        $updatedCase = $this->getCaseEntity();
+        self::assertEquals(CaseInterface::GUARANTEE_IN_REVIEW, $updatedCase->getGuaranteeDisposition());
+        self::assertEquals(CaseInterface::STATUS_PROCESSING, $updatedCase->getStatus());
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $order = $orderRepository->get($updatedCase->getOrderId());
+        $histories = $order->getStatusHistories();
+        self::assertNotEmpty($histories);
+
+        /** @var OrderStatusHistoryInterface $caseCreationComment */
+        $caseCreationComment = array_pop($histories);
+        self::assertInstanceOf(OrderStatusHistoryInterface::class, $caseCreationComment);
+        self::assertEquals('Case Update: Case is submitted for guarantee.', $caseCreationComment->getComment());
+    }
+
+    /**
+     * Gets case entity.
+     *
+     * @return \Magento\Signifyd\Api\Data\CaseInterface|null
+     */
+    private function getCaseEntity()
+    {
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        return $caseRepository->getByCaseId(123);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php
new file mode 100644
index 0000000000000..594c065185ac7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Model\SignifydGateway\Request;
+
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Signifyd\Model\SignifydOrderSessionId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Area;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sales\Model\Order;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\ProductMetadataInterface;
+
+/**
+ * Class CreateCaseBuilderTest
+ * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreateCaseBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CreateCaseBuilder
+     */
+    private $caseBuilder;
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * Initial setup
+     */
+    protected function setUp()
+    {
+        $bootstrap = Bootstrap::getInstance();
+        $bootstrap->loadArea(Area::AREA_FRONTEND);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->dateTimeFactory = $this->objectManager->create(DateTimeFactory::class);
+        $this->caseBuilder = $this->objectManager->create(CreateCaseBuilder::class);
+    }
+
+    /**
+     * Test builder on order with customer, simple product, frontend area,
+     * PayPal gateway, shipping and billing addresses, with two orders
+     *
+     * @covers \Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilder::build()
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreateCaseBuilderWithFullSetOfData()
+    {
+        /** @var Order $order */
+        $order = $this->objectManager->create(Order::class);
+        $order->loadByIncrementId('100000001');
+
+        $orderItems = $order->getAllItems();
+        $payment = $order->getPayment();
+        $billingAddress = $order->getBillingAddress();
+        $shippingAddress = $order->getShippingAddress();
+
+        /** @var  CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->getById($order->getCustomerId());
+
+        $productMetadata = $this->objectManager->create(ProductMetadataInterface::class);
+
+        /** @var SignifydOrderSessionId $signifydOrderSessionId */
+        $signifydOrderSessionId = $this->objectManager->create(SignifydOrderSessionId::class);
+
+        $expected = [
+            'purchase' => [
+                'orderSessionId' => $signifydOrderSessionId->get($order->getQuoteId()),
+                'browserIpAddress' => $order->getRemoteIp(),
+                'orderId' => $order->getIncrementId(),
+                'createdAt' => date('c', strtotime(date('Y-m-d 00:00:55'))),
+                'paymentGateway' => 'paypal_account',
+                'transactionId' => $payment->getLastTransId(),
+                'currency' => $order->getOrderCurrencyCode(),
+                'avsResponseCode' => '',
+                'cvvResponseCode' => '',
+                'orderChannel' => 'WEB',
+                'totalPrice' => $order->getGrandTotal(),
+                'shipments' => [
+                    0 => [
+                        'shipper' => 'Flat Rate',
+                        'shippingMethod' => 'Fixed',
+                        'shippingPrice' => $order->getShippingAmount()
+                    ]
+                ],
+                'products' => [
+                    0 => [
+                        'itemId' => $orderItems[0]->getSku(),
+                        'itemName' => $orderItems[0]->getName(),
+                        'itemPrice' => $orderItems[0]->getPrice(),
+                        'itemQuantity' => $orderItems[0]->getQtyOrdered(),
+                        'itemUrl' => $orderItems[0]->getProduct()->getProductUrl(),
+                        'itemWeight' => $orderItems[0]->getProduct()->getWeight()
+                    ],
+                    1 => [
+                        'itemId' => $orderItems[1]->getSku(),
+                        'itemName' => $orderItems[1]->getName(),
+                        'itemPrice' => $orderItems[1]->getPrice(),
+                        'itemQuantity' => $orderItems[1]->getQtyOrdered(),
+                        'itemUrl' => $orderItems[1]->getProduct()->getProductUrl(),
+                        'itemWeight' => $orderItems[1]->getProduct()->getWeight()
+                    ]
+                ],
+                'paymentMethod' => 'PAYPAL_ACCOUNT'
+            ],
+            'card' => [
+                'cardHolderName' => 'firstname lastname',
+                'last4' => $payment->getCcLast4(),
+                'expiryMonth' => $payment->getCcExpMonth(),
+                'expiryYear' =>  $payment->getCcExpYear(),
+                'billingAddress' => [
+                    'streetAddress' => 'street',
+                    'city' => $billingAddress->getCity(),
+                    'provinceCode' => $billingAddress->getRegionCode(),
+                    'postalCode' => $billingAddress->getPostcode(),
+                    'countryCode' => $billingAddress->getCountryId(),
+                    'unit' => ''
+                ]
+            ],
+            'recipient' => [
+                'fullName' => $shippingAddress->getName(),
+                'confirmationEmail' =>  $shippingAddress->getEmail(),
+                'confirmationPhone' => $shippingAddress->getTelephone(),
+                'deliveryAddress' => [
+                    'streetAddress' => '6161 West Centinela Avenue',
+                    'unit' => 'app. 33',
+                    'city' => $shippingAddress->getCity(),
+                    'provinceCode' => $shippingAddress->getRegionCode(),
+                    'postalCode' => $shippingAddress->getPostcode(),
+                    'countryCode' => $shippingAddress->getCountryId()
+                ]
+            ],
+            'userAccount' => [
+                'email' => $customer->getEmail(),
+                'username' => $customer->getEmail(),
+                'phone' => $order->getBillingAddress()->getTelephone(),
+                'accountNumber' => $customer->getId(),
+                'createdDate' => $this->formatDate($customer->getCreatedAt()),
+                'lastUpdateDate' => $this->formatDate($customer->getUpdatedAt()),
+                'aggregateOrderCount' => 2,
+                'aggregateOrderDollars' => 150.0
+            ],
+            'seller' => $this->getSellerData(),
+            'platformAndClient' => [
+                'storePlatform' => $productMetadata->getName() . ' ' . $productMetadata->getEdition(),
+                'storePlatformVersion' => $productMetadata->getVersion(),
+                'signifydClientApp' => $productMetadata->getName(),
+                'signifydClientAppVersion' => '1.0'
+            ]
+        ];
+
+        self::assertEquals(
+            $expected,
+            $this->caseBuilder->build($order->getEntityId())
+        );
+    }
+
+    /**
+     * Test builder on order with guest, virtual product, admin area,
+     * none PayPal gateway, no shipping address, without credit card data
+     *
+     * @covers \Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilder::build()
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_guest_and_virtual_product.php
+     */
+    public function testCreateCaseBuilderWithVirtualProductAndGuest()
+    {
+        /** @var Order $order */
+        $order = $this->objectManager->create(Order::class);
+        $order->loadByIncrementId('100000002');
+
+        $scope = $this->objectManager->get(ScopeInterface::class);
+        $scope->setCurrentScope(Area::AREA_ADMINHTML);
+
+        $orderItems = $order->getAllItems();
+        $product = $orderItems[0]->getProduct();
+        $payment = $order->getPayment();
+        $billingAddress = $order->getBillingAddress();
+        $productMetadata = $this->objectManager->create(ProductMetadataInterface::class);
+
+        /** @var SignifydOrderSessionId $quoteSessionId */
+        $quoteSessionId = $this->objectManager->create(SignifydOrderSessionId::class);
+
+        $expected = [
+            'purchase' => [
+                'orderSessionId' => $quoteSessionId->get($order->getQuoteId()),
+                'browserIpAddress' => $order->getRemoteIp(),
+                'orderId' => $order->getIncrementId(),
+                'createdAt' => '2016-12-12T12:00:55+00:00',
+                'paymentGateway' => $payment->getMethod(),
+                'transactionId' => $payment->getLastTransId(),
+                'currency' => $order->getOrderCurrencyCode(),
+                'avsResponseCode' => 'Y',
+                'cvvResponseCode' => 'M',
+                'orderChannel' => 'PHONE',
+                'totalPrice' => $order->getGrandTotal(),
+                'products' => [
+                    0 => [
+                        'itemId' => $orderItems[0]->getSku(),
+                        'itemName' => $orderItems[0]->getName(),
+                        'itemPrice' => $orderItems[0]->getPrice(),
+                        'itemQuantity' => $orderItems[0]->getQtyOrdered(),
+                        'itemUrl' => $product->getProductUrl()
+                    ],
+                ],
+                'paymentMethod' => 'PAYMENT_CARD'
+            ],
+            'card' => [
+                'cardHolderName' => 'firstname lastname',
+                'billingAddress' => [
+                    'streetAddress' => 'street',
+                    'city' => $billingAddress->getCity(),
+                    'provinceCode' => $billingAddress->getRegionCode(),
+                    'postalCode' => $billingAddress->getPostcode(),
+                    'countryCode' => $billingAddress->getCountryId(),
+                    'unit' => ''
+                ]
+            ],
+            'seller' => $this->getSellerData(),
+            'platformAndClient' => [
+                'storePlatform' => $productMetadata->getName() . ' ' . $productMetadata->getEdition(),
+                'storePlatformVersion' => $productMetadata->getVersion(),
+                'signifydClientApp' => $productMetadata->getName(),
+                'signifydClientAppVersion' => '1.0'
+            ]
+        ];
+
+        self::assertEquals(
+            $expected,
+            $this->caseBuilder->build($order->getEntityId())
+        );
+    }
+
+    /**
+     * Return seller data according to fixture
+     *
+     * @return array
+     */
+    private function getSellerData()
+    {
+        return [
+            'name' => 'Sample Store',
+            'domain' => 'm2.com',
+            'shipFromAddress' => [
+                'streetAddress' => '6161 West Centinela Avenue',
+                'unit' => 'app. 111',
+                'city' => 'Culver City',
+                'provinceCode' => 'AE',
+                'postalCode' => '90230',
+                'countryCode' => 'US',
+            ],
+            'corporateAddress' => [
+                'streetAddress' => '5th Avenue',
+                'unit' => '75',
+                'city' => 'New York',
+                'provinceCode' => 'MH',
+                'postalCode' => '19032',
+                'countryCode' => 'US',
+            ],
+        ];
+    }
+
+    /**
+     * Format date in ISO8601
+     *
+     * @param string $date
+     * @return string
+     */
+    private function formatDate($date)
+    {
+        $result = $this->dateTimeFactory->create(
+            $date,
+            new \DateTimeZone('UTC')
+        );
+
+        return $result->format(\DateTime::ATOM);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Observer/PlaceOrderTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Observer/PlaceOrderTest.php
new file mode 100644
index 0000000000000..e547187be5ed7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Observer/PlaceOrderTest.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Observer;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseCreationServiceInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Test for Magento\Signifyd\Observer\PlaceOrderTest class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PlaceOrderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CaseCreationServiceInterface|MockObject
+     */
+    private $creationService;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var PlaceOrder
+     */
+    private $placeOrder;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->creationService = $this->getMockBuilder(CaseCreationServiceInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['createForOrder'])
+            ->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->placeOrder = $this->objectManager->create(PlaceOrder::class, [
+            'caseCreationService' => $this->creationService,
+            'logger' => $this->logger
+        ]);
+    }
+
+    /**
+     * Checks a case when order placed with offline payment method.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testExecuteWithOfflinePayment()
+    {
+        $order = $this->getOrder('100000005');
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $event = $this->objectManager->create(
+            Event::class,
+            [
+                'data' => ['order' => $order]
+            ]
+        );
+
+        /** @var Observer $observer */
+        $observer = $this->objectManager->get(Observer::class);
+        $observer->setEvent($event);
+
+        $this->placeOrder->execute($observer);
+    }
+
+    /**
+     * Checks a test case when order placed with online payment method.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testExecute()
+    {
+        $order = $this->getOrder('100000001');
+
+        $this->creationService->expects(self::once())
+            ->method('createForOrder')
+            ->with(self::equalTo($order->getEntityId()));
+
+        $event = $this->objectManager->create(
+            Event::class,
+            [
+                'data' => ['order' => $order],
+            ]
+        );
+
+        /** @var Observer $observer */
+        $observer = $this->objectManager->get(Observer::class);
+        $observer->setEvent($event);
+
+        $this->placeOrder->execute($observer);
+    }
+
+    /**
+     * Signifyd is enabled for default store.
+     * Checks a test case when order placed with website where signifyd is disabled.
+     *
+     * @return void
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     * @magentoDataFixture Magento/Signifyd/_files/website_configuration.php
+     */
+    public function testExecuteWithWebsiteConfiguration(): void
+    {
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        $store = $storeRepository->get('test_second_store');
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore($store->getId());
+
+        $order = $this->getOrder('100000001');
+        $order->setStoreId($store->getId());
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $event = $this->objectManager->create(
+            Event::class,
+            [
+                'data' => ['order' => $order],
+            ]
+        );
+
+        /** @var Observer $observer */
+        $observer = $this->objectManager->get(Observer::class);
+        $observer->setEvent($event);
+
+        $this->placeOrder->execute($observer);
+    }
+
+    /**
+     * Checks a test case when observer event contains two orders:
+     * one order with offline payment and one order with online payment.
+     *
+     * @covers \Magento\Signifyd\Observer\PlaceOrder::execute
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     * @magentoDataFixture Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
+     */
+    public function testExecuteWithMultipleOrders()
+    {
+        $orderWithOnlinePayment = $this->getOrder('100000001');
+        $orderWithOfflinePayment = $this->getOrder('100000005');
+
+        // this service mock should be called only once for the order with online payment method.
+        $this->creationService->expects(self::once())
+            ->method('createForOrder')
+            ->with(self::equalTo($orderWithOnlinePayment->getEntityId()));
+
+        $event = $this->objectManager->create(
+            Event::class,
+            [
+                'data' => ['orders' => [$orderWithOfflinePayment, $orderWithOnlinePayment]]
+            ]
+        );
+
+        /** @var Observer $observer */
+        $observer = $this->objectManager->get(Observer::class);
+        $observer->setEvent($event);
+
+        $this->placeOrder->execute($observer);
+    }
+
+    /**
+     * Gets stored order.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder($incrementId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, $incrementId)
+            ->create();
+
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $orders = $orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        $order = array_pop($orders);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Plugin/CancelOrderTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Plugin/CancelOrderTest.php
new file mode 100644
index 0000000000000..7c1af95bdb89c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Plugin/CancelOrderTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Plugin;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\SignifydGateway\ApiClient;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+
+class CancelOrderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var int
+     */
+    private static $caseId = 123;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ApiClient|MockObject
+     */
+    private $apiClient;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->apiClient = $this->getMockBuilder(ApiClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['makeApiCall'])
+            ->getMock();
+
+        $this->objectManager->addSharedInstance($this->apiClient, ApiClient::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(ApiClient::class);
+    }
+
+    /**
+     * Checks a test case, when order has been cancelled
+     * and calls plugin to cancel Signifyd case guarantee.
+     *
+     * @covers \Magento\Signifyd\Plugin\OrderPlugin::afterCancel
+     * @magentoDataFixture Magento/Signifyd/_files/approved_case.php
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testAfterCancel()
+    {
+        $order = $this->getOrder();
+
+        $this->apiClient->expects(self::once())
+            ->method('makeApiCall')
+            ->with(
+                self::equalTo('/cases/' . self::$caseId . '/guarantee'),
+                'PUT',
+                [
+                    'guaranteeDisposition' => CaseInterface::GUARANTEE_CANCELED
+                ]
+            )
+            ->willReturn([
+                'disposition' => CaseInterface::GUARANTEE_CANCELED
+            ]);
+
+        /** @var OrderManagementInterface $orderService */
+        $orderService = $this->objectManager->get(OrderManagementInterface::class);
+        $orderService->cancel($order->getEntityId());
+
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $case = $caseRepository->getByCaseId(self::$caseId);
+
+        self::assertEquals(CaseInterface::GUARANTEE_CANCELED, $case->getGuaranteeDisposition());
+    }
+
+    /**
+     * Get stored order.
+     *
+     * @return OrderInterface
+     */
+    private function getOrder()
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, '100000001')
+            ->create();
+
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $orders = $orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        /** @var OrderInterface $order */
+        return array_pop($orders);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Plugin/DenyPaymentTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Plugin/DenyPaymentTest.php
new file mode 100644
index 0000000000000..72da71a630dff
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/Plugin/DenyPaymentTest.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Signifyd\Plugin;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Registry;
+use Magento\Payment\Model\Info as PaymentInfo;
+use Magento\Paypal\Model\Api\Nvp;
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\Express;
+use Magento\Paypal\Model\Info;
+use Magento\Paypal\Model\Pro;
+use Magento\Paypal\Model\ProFactory;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Model\SignifydGateway\ApiClient;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DenyPaymentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var int
+     */
+    private static $caseId = 123;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ApiClient|MockObject
+     */
+    private $apiClient;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->apiClient = $this->getMockBuilder(ApiClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['makeApiCall'])
+            ->getMock();
+
+        $this->registry = $this->objectManager->get(Registry::class);
+
+        $this->objectManager->addSharedInstance($this->apiClient, ApiClient::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(ApiClient::class);
+    }
+
+    /**
+     * Checks a test case, when payment has been denied
+     * and calls plugin to cancel Signifyd case guarantee.
+     *
+     * @covers \Magento\Signifyd\Plugin\PaymentPlugin::afterDenyPayment
+     * @magentoDataFixture Magento/Signifyd/_files/approved_case.php
+     * @magentoConfigFixture current_store fraud_protection/signifyd/active 1
+     */
+    public function testAfterDenyPayment()
+    {
+        $order = $this->getOrder();
+        $this->registry->register('current_order', $order);
+
+        $this->apiClient->expects(self::once())
+            ->method('makeApiCall')
+            ->with(
+                self::equalTo('/cases/' . self::$caseId . '/guarantee'),
+                'PUT',
+                [
+                    'guaranteeDisposition' => CaseInterface::GUARANTEE_CANCELED
+                ]
+            )
+            ->willReturn([
+                'disposition' => CaseInterface::GUARANTEE_CANCELED
+            ]);
+
+        /** @var \Magento\Sales\Model\Order\Payment $payment */
+        $payment = $order->getPayment();
+        $payment->setData('method_instance', $this->getMethodInstance());
+        $payment->deny();
+
+        /** @var CaseRepositoryInterface $caseRepository */
+        $caseRepository = $this->objectManager->get(CaseRepositoryInterface::class);
+        $case = $caseRepository->getByCaseId(self::$caseId);
+
+        self::assertEquals(CaseInterface::GUARANTEE_CANCELED, $case->getGuaranteeDisposition());
+    }
+
+    /**
+     * Get stored order.
+     *
+     * @return OrderInterface
+     */
+    private function getOrder()
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, '100000001')
+            ->create();
+
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $orders = $orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        /** @var OrderInterface $order */
+        return array_pop($orders);
+    }
+
+    /**
+     * Gets payment method instance.
+     *
+     * @return Express
+     */
+    private function getMethodInstance()
+    {
+        /** @var PaymentInfo $infoInstance */
+        $infoInstance = $this->objectManager->get(PaymentInfo::class);
+        $infoInstance->setAdditionalInformation(
+            Info::PAYMENT_STATUS_GLOBAL,
+            Info::PAYMENTSTATUS_PENDING
+        );
+        $infoInstance->setAdditionalInformation(
+            Info::PENDING_REASON_GLOBAL,
+            Info::PAYMENTSTATUS_PENDING
+        );
+
+        /** @var Express $methodInstance */
+        $methodInstance = $this->objectManager->create(
+            Express::class,
+            ['proFactory' => $this->getProFactory()]
+        );
+        $methodInstance->setData('info_instance', $infoInstance);
+
+        return $methodInstance;
+    }
+
+    /**
+     * Gets Pro factory mock.
+     *
+     * @return ProFactory|MockObject
+     */
+    protected function getProFactory()
+    {
+        $pro = $this->getMockBuilder(Pro::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getApi', 'setMethod', 'getConfig', '__wakeup', 'reviewPayment'])
+            ->getMock();
+        $nvpClient = $this->getMockBuilder(Nvp::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $pro->method('getConfig')
+            ->willReturn($this->getConfig());
+        $pro->method('getApi')
+            ->willReturn($nvpClient);
+        $pro->method('reviewPayment')
+            ->willReturn(true);
+
+        $proFactory = $this->getMockBuilder(ProFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $proFactory->method('create')
+            ->willReturn($pro);
+
+        return $proFactory;
+    }
+
+    /**
+     * Gets config mock.
+     *
+     * @return Config|MockObject
+     */
+    protected function getConfig()
+    {
+        $config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $config->method('getValue')
+            ->with('payment_action')
+            ->willReturn(Config::PAYMENT_ACTION_AUTH);
+
+        return $config;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/approved_case.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/approved_case.php
new file mode 100644
index 0000000000000..eaa3622c04e0e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/approved_case.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
+
+require __DIR__ . '/order_with_customer_and_two_simple_products.php';
+
+/** @var CaseInterfaceFactory $caseFactory */
+$caseFactory = $objectManager->get(CaseInterfaceFactory::class);
+
+$associatedTeam = [
+    'teamName' => 'Some Team',
+    'teamId' => 123,
+    'getAutoDismiss' => true,
+    'getTeamDismissalDays' => 3
+];
+
+/** @var CaseInterface $case */
+$case = $caseFactory->create();
+$case->setCaseId(123)
+    ->setGuaranteeEligible(false)
+    ->setGuaranteeDisposition(CaseInterface::GUARANTEE_APPROVED)
+    ->setStatus(CaseInterface::STATUS_PROCESSING)
+    ->setScore(553)
+    ->setOrderId($order->getEntityId())
+    ->setAssociatedTeam($associatedTeam)
+    ->setReviewDisposition(CaseInterface::DISPOSITION_GOOD)
+    ->setCreatedAt('2016-12-12T15:17:17+0000')
+    ->setUpdatedAt('2016-12-12T19:23:16+0000');
+
+/** @var CaseRepositoryInterface $caseRepository */
+$caseRepository = $objectManager->get(CaseRepositoryInterface::class);
+$caseRepository->save($case);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/case.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/case.php
new file mode 100644
index 0000000000000..4102233f6fb1f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/case.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
+
+require __DIR__ . '/order_with_customer_and_two_simple_products.php';
+
+/** @var OrderManagementInterface $orderManagement */
+$orderManagement = $objectManager->create(OrderManagementInterface::class);
+$orderManagement->hold($order->getEntityId());
+
+/** @var CaseInterfaceFactory $caseFactory */
+$caseFactory = $objectManager->get(CaseInterfaceFactory::class);
+
+$associatedTeam = [
+    'teamName' => 'Some Team',
+    'teamId' => 123,
+    'getAutoDismiss' => true,
+    'getTeamDismissalDays' => 3
+];
+
+/** @var CaseInterface $case */
+$case = $caseFactory->create();
+$case->setCaseId(123)
+    ->setGuaranteeEligible(true)
+    ->setStatus(CaseInterface::STATUS_PROCESSING)
+    ->setScore(553)
+    ->setOrderId($order->getEntityId())
+    ->setAssociatedTeam($associatedTeam)
+    ->setReviewDisposition(CaseInterface::DISPOSITION_GOOD)
+    ->setGuaranteeDisposition(CaseInterface::GUARANTEE_PENDING)
+    ->setCreatedAt('2016-12-12T15:17:17+0000')
+    ->setUpdatedAt('2016-12-12T19:23:16+0000');
+
+/** @var CaseRepositoryInterface $caseRepository */
+$caseRepository = $objectManager->get(CaseRepositoryInterface::class);
+$caseRepository->save($case);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/customer.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/customer.php
new file mode 100644
index 0000000000000..7c5f34cd203fa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/customer.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Customer\Model\Customer;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\CustomerRegistry;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+$customer = $objectManager->create(Customer::class);
+
+/** @var CustomerInterface $customer */
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('customer@example.com')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0)
+    ->setCreatedAt('2016-12-12T11:00:00+0000')
+    ->setUpdatedAt('2016-12-12T11:05:00+0000');
+
+$customer->isObjectNew(true);
+$customer->save();
+
+$customerRegistry->remove($customer->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/declined_case.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/declined_case.php
new file mode 100644
index 0000000000000..041cdb0291d83
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/declined_case.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Signifyd\Api\CaseRepositoryInterface;
+use Magento\Signifyd\Api\Data\CaseInterface;
+use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
+
+require __DIR__ . '/order_with_customer_and_two_simple_products.php';
+
+/** @var CaseInterfaceFactory $caseFactory */
+$caseFactory = $objectManager->get(CaseInterfaceFactory::class);
+
+$associatedTeam = [
+    'teamName' => 'Some Team',
+    'teamId' => 123,
+    'getAutoDismiss' => true,
+    'getTeamDismissalDays' => 3
+];
+
+/** @var CaseInterface $case */
+$case = $caseFactory->create();
+$case->setCaseId(123)
+    ->setGuaranteeEligible(false)
+    ->setGuaranteeDisposition(CaseInterface::GUARANTEE_DECLINED)
+    ->setStatus(CaseInterface::STATUS_PROCESSING)
+    ->setScore(553)
+    ->setOrderId($order->getEntityId())
+    ->setAssociatedTeam($associatedTeam)
+    ->setReviewDisposition(CaseInterface::DISPOSITION_FRAUDULENT)
+    ->setCreatedAt('2016-12-12T15:17:17+0000')
+    ->setUpdatedAt('2016-12-12T19:23:16+0000');
+
+/** @var CaseRepositoryInterface $caseRepository */
+$caseRepository = $objectManager->get(CaseRepositoryInterface::class);
+$caseRepository->save($case);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/multiple_cases.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/multiple_cases.php
new file mode 100644
index 0000000000000..4930906954148
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/multiple_cases.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Signifyd\Api\Data\CaseInterface;
+
+require __DIR__ . '/case.php';
+
+for ($i = 1; $i < 4; $i ++) {
+    $newOrder = clone $order;
+    $newOrder->setEntityId(null)
+        ->setIncrementId($order->getIncrementId() + $i);
+
+    $orderRepository->save($newOrder);
+
+    $newCase = clone $case;
+    $newCase->setEntityId(null)
+        ->setCaseId($i)
+        ->setOrderId($newOrder->getEntityId())
+        ->setStatus(CaseInterface::STATUS_OPEN)
+        ->setCreatedAt('2016-12-0' . $i . 'T15:' . $i . ':17+0000')
+        ->setUpdatedAt('2016-12-12T0' . $i . ':23:16+0000')
+        ->setId(null);
+
+    $caseRepository->save($newCase);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
new file mode 100644
index 0000000000000..49a0a2d33e236
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Item;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
+require __DIR__ . '/store.php';
+
+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)
+    ->setAddressType('shipping')
+    ->setStreet(['6161 West Centinela Avenue', 'app. 33'])
+    ->setFirstname('John')
+    ->setLastname('Doe')
+    ->setShippingMethod('flatrate_flatrate');
+
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('paypal_express')
+    ->setLastTransId('00001')
+    ->setCcLast4('1234')
+    ->setCcExpMonth('01')
+    ->setCcExpYear('21');
+
+/** @var Item $orderItem */
+$orderItem1 = $objectManager->create(Item::class);
+$orderItem1->setProductId($product->getId())
+    ->setSku($product->getSku())
+    ->setName($product->getName())
+    ->setQtyOrdered(1)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType($product->getTypeId());
+
+/** @var Item $orderItem */
+$orderItem2 = $objectManager->create(Item::class);
+$orderItem2->setProductId($product->getId())
+    ->setSku('simple2')
+    ->setName('Simple product')
+    ->setPrice(100)
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType($product->getTypeId());
+
+$orderAmount = 100;
+$customerEmail = $billingAddress->getEmail();
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000001')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus(Order::STATE_PROCESSING)
+    ->setCustomerId($customer->getId())
+    ->setCustomerIsGuest(false)
+    ->setRemoteIp('127.0.0.1')
+    ->setCreatedAt(date('Y-m-d 00:00:55'))
+    ->setOrderCurrencyCode('USD')
+    ->setBaseCurrencyCode('USD')
+    ->setSubtotal($orderAmount)
+    ->setGrandTotal($orderAmount)
+    ->setBaseSubtotal($orderAmount)
+    ->setBaseGrandTotal($orderAmount)
+    ->setCustomerEmail($customerEmail)
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setShippingDescription('Flat Rate - Fixed')
+    ->setShippingAmount(10)
+    ->setStoreId($store->getId())
+    ->addItem($orderItem1)
+    ->addItem($orderItem2)
+    ->setPayment($payment)
+    ->setQuoteId(1);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderRepository->save($order);
+
+$orderAmount2 = 50;
+$payment2 = $objectManager->create(Payment::class);
+$payment2->setMethod('checkmo');
+/** @var Order $order2 */
+$order2 = $objectManager->create(Order::class);
+$order2->setIncrementId('100000005')
+    ->setCustomerId($customer->getId())
+    ->setCustomerIsGuest(false)
+    ->setRemoteIp('127.0.0.1')
+    ->setCreatedAt('2016-12-12T12:00:55+0000')
+    ->setOrderCurrencyCode('USD')
+    ->setBaseCurrencyCode('USD')
+    ->setGrandTotal($orderAmount2)
+    ->setBaseGrandTotal($orderAmount2)
+    ->setCustomerEmail($customerEmail)
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setShippingDescription('Flat Rate - Fixed')
+    ->setShippingAmount(10)
+    ->setStoreId($store->getId())
+    ->addItem($orderItem1)
+    ->setPayment($payment2)
+    ->setQuoteId(2);
+
+$orderRepository->save($order2);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_guest_and_virtual_product.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_guest_and_virtual_product.php
new file mode 100644
index 0000000000000..ba0e92687dc17
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_guest_and_virtual_product.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Item;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual.php';
+require __DIR__ . '/store.php';
+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var OrderPaymentInterface $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('braintree')
+    ->setLastTransId('00001')
+    ->setAdditionalInformation('avsPostalCodeResponseCode', 'M')
+    ->setAdditionalInformation('avsStreetAddressResponseCode', 'M')
+    ->setAdditionalInformation('cvvResponseCode', 'M');
+
+/** @var Item $orderItem */
+$orderItem1 = $objectManager->create(Item::class);
+$orderItem1->setProductId($product->getId())
+    ->setSku($product->getSku())
+    ->setName($product->getName())
+    ->setQtyOrdered(1)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType($product->getTypeId());
+
+$orderAmount = 100;
+$customerEmail = $billingAddress->getEmail();
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000002')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus(Order::STATE_PROCESSING)
+    ->setCustomerIsGuest(true)
+    ->setRemoteIp('127.0.0.1')
+    ->setCreatedAt('2016-12-12T12:00:55+0000')
+    ->setOrderCurrencyCode('USD')
+    ->setBaseCurrencyCode('USD')
+    ->setSubtotal($orderAmount)
+    ->setGrandTotal($orderAmount)
+    ->setBaseSubtotal($orderAmount)
+    ->setBaseGrandTotal($orderAmount)
+    ->setCustomerEmail($customerEmail)
+    ->setBillingAddress($billingAddress)
+    ->setStoreId($store->getId())
+    ->addItem($orderItem1)
+    ->setPayment($payment)
+    ->setQuoteId(1);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/store.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/store.php
new file mode 100644
index 0000000000000..b814263bdc5ef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/store.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Store\Model\Store;
+use Magento\Store\Model\Information;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$store = $objectManager->get(StoreManagerInterface::class)->getStore();
+/** @var MutableScopeConfigInterface $mutableConfig */
+$mutableConfig = $objectManager->get(MutableScopeConfigInterface::class);
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_NAME, 'Sample Store', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Store::XML_PATH_UNSECURE_BASE_LINK_URL, 'http://m2.com/', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Shipment::XML_PATH_STORE_ADDRESS1, '6161 West Centinela Avenue', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Shipment::XML_PATH_STORE_ADDRESS2, 'app. 111', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Shipment::XML_PATH_STORE_CITY, 'Culver City', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Shipment::XML_PATH_STORE_REGION_ID, 10, ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Shipment::XML_PATH_STORE_ZIP, '90230', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Shipment::XML_PATH_STORE_COUNTRY_ID, 'US', ScopeInterface::SCOPE_STORE);
+
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_STREET_LINE1, '5th Avenue', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_STREET_LINE2, '75', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_CITY, 'New York', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_REGION_CODE, 30, ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_POSTCODE, '19032', ScopeInterface::SCOPE_STORE);
+$mutableConfig->setValue(Information::XML_PATH_STORE_INFO_COUNTRY_CODE, 'US', ScopeInterface::SCOPE_STORE);
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/webhook_body.json b/dev/tests/integration/testsuite/Magento/Signifyd/_files/webhook_body.json
new file mode 100644
index 0000000000000..4308c8bf833ef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/webhook_body.json
@@ -0,0 +1 @@
+{"investigationId":123,"analysisUrl":"https://signifyd.com/v2/cases/185088720/analysis","entriesUrl":"https://signifyd.com/v2/cases/185088720/entries","notesUrl":"https://signifyd.com/v2/cases/185088720/notes","orderUrl":"https://signifyd.com/v2/cases/185088720/order","currency":"USD","uuid":"368df42c-d25f-44ef-a1d9-92755f743901","createdAt":"2017-01-06T12:47:03+0000","updatedAt":"2017-01-06T12:47:03+0000","status":"OPEN","caseId":123,"score":384,"headline":"John Doe","orderId":"000000003","adjustedScore":385,"orderDate":"2017-01-06T12:46:58+0000","orderAmount":5.85,"orderOutcome":"SUCCESSFUL","associatedTeam":{"teamName":"Magento","teamId":7940},"testInvestigation":true,"reviewDisposition":null}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/website_configuration.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/website_configuration.php
new file mode 100644
index 0000000000000..e53b0431503e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/website_configuration.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResourceModel;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var $website Website */
+$website = $objectManager->create(Website::class);
+$website->setData(['code' => 'test_website', 'name' => 'Test Website', 'default_group_id' => '1', 'is_default' => '0']);
+$websiteResourceModel = $objectManager->create(WebsiteResourceModel::class);
+$websiteResourceModel->save($website);
+
+$websiteId = $website->getId();
+$store = $objectManager->create(Store::class);
+$groupId = Bootstrap::getObjectManager()->get(StoreManagerInterface::class)
+    ->getWebsite()
+    ->getDefaultGroupId();
+$store->setCode('test_second_store')
+    ->setWebsiteId($websiteId)
+    ->setGroupId($groupId)
+    ->setName('Test Second Store')
+    ->setSortOrder(10)
+    ->setIsActive(1);
+$storeResourceModel = $objectManager->create(StoreResourceModel::class);
+$storeResourceModel->save($store);
+
+/* Refresh stores memory cache */
+$objectManager->get(StoreManagerInterface::class)->reinitStores();
+
+$processConfigData = function (Config $config, array $data) {
+    foreach ($data as $key => $value) {
+        $config->setDataByPath($key, $value);
+        $config->save();
+    }
+};
+
+// save signifyd configuration for the default scope
+$configData = [
+    'fraud_protection/signifyd/active' => '1',
+];
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+$processConfigData($defConfig, $configData);
+
+// save signifyd website config data
+$websiteConfigData = [
+    'fraud_protection/signifyd/active' => '0',
+];
+/** @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/Signifyd/_files/website_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/website_configuration_rollback.php
new file mode 100644
index 0000000000000..9b731813fea3b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Signifyd/_files/website_configuration_rollback.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\Website;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$deleteConfigData = function (WriterInterface $writer, $scope, $scopeId) {
+    $configData = [
+        'fraud_protection/signifyd/active',
+    ];
+    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 WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$website = $websiteRepository->get('test_website');
+$deleteConfigData($configWriter, ScopeInterface::SCOPE_WEBSITES, $website->getId());
+
+$website = $objectManager->create(Website::class);
+/** @var $website Website */
+if ($website->load('test_website', 'code')->getId()) {
+    $website->delete();
+}
+$store = $objectManager->create(Store::class);
+if ($store->load('test_second_store', 'code')->getId()) {
+    $store->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Catalog/ProductTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Catalog/ProductTest.php
index 3a9378c77bc42..b8ae7751a15ee 100644
--- a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Catalog/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Catalog/ProductTest.php
@@ -17,7 +17,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * Base product image path
      */
-    const BASE_IMAGE_PATH = 'http://localhost/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff';
+    const BASE_IMAGE_PATH = 'http://localhost/pub/media/catalog/product/cache/8d4d2075b1a30681853bef5bdc41b164';
     
     /**
      * Test getCollection None images
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Cms/PageTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Cms/PageTest.php
new file mode 100644
index 0000000000000..5025671e03607
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ResourceModel/Cms/PageTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sitemap\Model\ResourceModel\Cms;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for Cms Page resource model.
+ */
+class PageTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->page = Bootstrap::getObjectManager()->get(Page::class);
+    }
+
+    /**
+     * Test Page::getCollection() will exclude home and no-route cms pages for site map.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Cms/_files/pages.php
+     * @return void
+     */
+    public function testGetCollection()
+    {
+        $excludedUrls = ['no-route', 'home'];
+        $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+        $result = $this->page->getCollection($storeManager->getDefaultStoreView()->getId());
+        $this->assertNotEmpty($result);
+        foreach ($result as $item) {
+            $this->assertFalse(in_array($item->getUrl(), $excludedUrls));
+        }
+    }
+}
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 4700bf18a37dc..895b418a4e495 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/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php
index 90ceaa4fcc5a0..e0a1321092a68 100644
--- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php
@@ -14,7 +14,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Store\App\Request\PathInfoProcessor
      */
-    protected $pathProcessor;
+    private $pathProcessor;
 
     protected function setUp()
     {
@@ -31,7 +31,11 @@ public function testProcessNotValidStoreCode($pathInfo)
     {
         /** @var \Magento\Framework\App\RequestInterface $request */
         $request = Bootstrap::getObjectManager()->create(\Magento\Framework\App\RequestInterface::class);
-        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
+        $info = $this->pathProcessor->process($request, $pathInfo);
+        $this->assertEquals($pathInfo, $info);
     }
 
     public function notValidStoreCodeDataProvider()
@@ -46,7 +50,7 @@ public function notValidStoreCodeDataProvider()
      * @covers \Magento\Store\App\Request\PathInfoProcessor::process
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
-    public function testProcessValidStoreCodeCase1()
+    public function testProcessValidStoreDisabledStoreUrl()
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
@@ -57,6 +61,7 @@ public function testProcessValidStoreCodeCase1()
 
         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
         $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
         $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode());
         $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
         $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
@@ -66,7 +71,7 @@ public function testProcessValidStoreCodeCase1()
      * @covers \Magento\Store\App\Request\PathInfoProcessor::process
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
-    public function testProcessValidStoreCodeCase2()
+    public function testProcessValidStoreCodeCaseProcessStoreName()
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
@@ -77,6 +82,7 @@ public function testProcessValidStoreCodeCase2()
 
         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
         $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
         $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode());
         $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
         $this->assertEquals('/m/c/a', $this->pathProcessor->process($request, $pathInfo));
@@ -86,7 +92,7 @@ public function testProcessValidStoreCodeCase2()
      * @covers \Magento\Store\App\Request\PathInfoProcessor::process
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      */
-    public function testProcessValidStoreCodeCase3()
+    public function testProcessValidStoreCodeWhenStoreIsDirectFrontNameWithFrontName()
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
@@ -100,9 +106,77 @@ public function testProcessValidStoreCodeCase3()
 
         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
         $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
         $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode());
         $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
         $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
-        $this->assertEquals('noroute', $request->getActionName());
+        $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName());
+    }
+
+    /**
+     * @covers \Magento\Store\App\Request\PathInfoProcessor::process
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     */
+    public function testProcessValidStoreCodeWhenStoreCodeInUrlIsDisabledWithFrontName()
+    {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
+        $store->load('fixturestore', 'code');
+
+        /** @var \Magento\Framework\App\RequestInterface $request */
+        $request = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\App\RequestInterface::class,
+            ['directFrontNames' => ['someFrontName' => true]]
+        );
+
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode());
+        $pathInfo = sprintf('/%s/m/c/a', $store->getCode());
+        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
+    }
+
+    /**
+     * @covers \Magento\Store\App\Request\PathInfoProcessor::process
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     */
+    public function testProcessValidStoreCodeWhenStoreCodeisAdmin()
+    {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class);
+        $store->load('fixturestore', 'code');
+
+        /** @var \Magento\Framework\App\RequestInterface $request */
+        $request = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\App\RequestInterface::class,
+            ['directFrontNames' => ['someFrontName' => true]]
+        );
+
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, true);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode());
+        $pathInfo = sprintf('/%s/m/c/a', 'admin');
+        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
+    }
+
+    /**
+     * @covers \Magento\Store\App\Request\PathInfoProcessor::process
+     */
+    public function testProcessValidStoreCodeWhenUrlConfigIsDisabled()
+    {
+        /** @var \Magento\Framework\App\RequestInterface $request */
+        $request = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\App\RequestInterface::class,
+            ['directFrontNames' => ['someFrontName' => true]]
+        );
+
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->setValue(Store::XML_PATH_STORE_IN_URL, false);
+        $pathInfo = sprintf('/%s/m/c/a', 'whatever');
+        $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo));
+        $this->assertEquals(null, $request->getActionName());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Block/SwitcherTest.php b/dev/tests/integration/testsuite/Magento/Store/Block/SwitcherTest.php
index b3707fc605017..9d1f584bfcd77 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Block/SwitcherTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Block/SwitcherTest.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Store\Block;
 
+use Magento\Framework\App\ActionInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Url\DecoderInterface;
+use Magento\Framework\App\ScopeInterface;
+
 /**
  * Integration tests for \Magento\Store\Block\Switcher block.
  */
@@ -15,6 +20,11 @@ class SwitcherTest extends \PHPUnit\Framework\TestCase
      */
     private $_objectManager;
 
+    /**
+     * @var DecoderInterface
+     */
+    private $decoder;
+
     /**
      * Set up.
      *
@@ -22,11 +32,12 @@ class SwitcherTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
+        $this->decoder = Bootstrap::getObjectManager()->create(DecoderInterface::class);
     }
 
     /**
-     * Test that GetTargetStorePostData() method return correct store URL.
+     * Test that GetTargetStorePostData() method returns correct data.
      *
      * @magentoDataFixture Magento/Store/_files/store.php
      * @return void
@@ -39,8 +50,16 @@ public function testGetTargetStorePostData()
         /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
         $storeRepository = $this->_objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
         $store = $storeRepository->get($storeCode);
+
         $result = json_decode($block->getTargetStorePostData($store), true);
-        
-        $this->assertContains($storeCode, $result['action']);
+        $url = parse_url($this->decoder->decode($result['data'][ActionInterface::PARAM_NAME_URL_ENCODED]));
+        $storeParsedQuery = [];
+        if (isset($url['query'])) {
+            parse_str($url['query'], $storeParsedQuery);
+        }
+
+        $this->assertSame($storeCode, $result['data']['___store']);
+        $this->assertSame($storeCode, $storeParsedQuery['___store']);
+        $this->assertSame(ScopeInterface::SCOPE_DEFAULT, $result['data']['___from_store']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php b/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php
index dfd979f03c576..bc8ca2ba07a80 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Controller/Store/SwitchActionTest.php
@@ -48,8 +48,5 @@ protected function changeStoreCode($from, $to)
         $store->load($from, 'code');
         $store->setCode($to);
         $store->save();
-        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
-        $storeManager = $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
-        $storeManager->reinitStores();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php
new file mode 100644
index 0000000000000..0e4d129d17aa6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model;
+
+use Magento\Framework\ObjectManagerInterface as ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class StoreSwitcherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var StoreSwitcher
+     */
+    private $storeSwitcher;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->storeSwitcher = $this->objectManager->get(StoreSwitcher::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/store.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @return void
+     * @throws StoreSwitcher\CannotSwitchStoreException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testSwitch(): void
+    {
+        $redirectUrl = "http://domain.com/?SID=e5h3e086dce3ckkqt9ia7avl27&___store=fixture_second_store";
+        $expectedUrl = "http://domain.com/";
+        $fromStoreCode = 'test';
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $fromStore = $storeRepository->get($fromStoreCode);
+
+        $toStoreCode = 'fixture_second_store';
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $toStore = $storeRepository->get($toStoreCode);
+
+        $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 9690199eeb8b6..bb6d1687052e3 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -6,9 +6,12 @@
 
 namespace Magento\Store\Model;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 use Zend\Stdlib\Parameters;
 
 /**
@@ -267,12 +270,89 @@ public function testIsCanDelete()
         $this->assertFalse($this->model->isCanDelete());
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
+     */
     public function testGetCurrentUrl()
     {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+        ->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
+
         $this->model->load('admin');
-        $this->model->expects($this->any())->method('getUrl')->will($this->returnValue('http://localhost/index.php'));
+        $this->model
+            ->expects($this->any())->method('getUrl')
+            ->will($this->returnValue('http://localhost/index.php'));
         $this->assertStringEndsWith('default', $this->model->getCurrentUrl());
         $this->assertStringEndsNotWith('default', $this->model->getCurrentUrl(false));
+
+        /** @var \Magento\Store\Model\Store $secondStore */
+        $secondStore = $objectManager->get(StoreRepositoryInterface::class)->get('secondstore');
+
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $objectManager->create(ProductRepository::class);
+        $product = $productRepository->get('simple');
+        $product->setStoreId($secondStore->getId());
+        $url = $product->getUrlInStore();
+
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'catalog/product/view/id/1/s/simple-product/',
+            $url
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'?___from_store=default',
+            $secondStore->getCurrentUrl()
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl(),
+            $secondStore->getCurrentUrl(false)
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoDbIsolation disabled
+     */
+    public function testGetCurrentUrlWithUseStoreInUrlFalse()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class)
+            ->setValue('web/url/use_store', false, ScopeInterface::SCOPE_STORE, 'default');
+
+        /** @var \Magento\Store\Model\Store $secondStore */
+        $secondStore = $objectManager->get(StoreRepositoryInterface::class)->get('fixture_second_store');
+
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $objectManager->create(ProductRepository::class);
+        $product = $productRepository->get('simple333');
+
+        $product->setStoreId($secondStore->getId());
+        $url = $product->getUrlInStore();
+
+         /** @var \Magento\Catalog\Model\CategoryRepository $categoryRepository */
+        $categoryRepository = $objectManager->get(\Magento\Catalog\Model\CategoryRepository::class);
+        $category = $categoryRepository->get(333, $secondStore->getStoreId());
+
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'catalog/category/view/s/category-1/id/333/',
+            $category->getUrl()
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().
+            'catalog/product/view/id/333/s/simple-product-three/?___store=fixture_second_store',
+            $url
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'?___store=fixture_second_store&___from_store=default',
+            $secondStore->getCurrentUrl()
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'?___store=fixture_second_store',
+            $secondStore->getCurrentUrl(false)
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
index e3971ad912a78..a4a640a24de50 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php
@@ -21,9 +21,6 @@
         ->setSortOrder(10)
         ->setIsActive(1);
     $store->save();
-
-    /* Refresh stores memory cache */
-    Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
 }
 
 //if test using this fixture relies on full text functionality it is required to explicitly perform re-indexation
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php
index d6b9e1d9abc70..95d13111e6193 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore_rollback.php
@@ -23,6 +23,3 @@
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
-
-/* Refresh stores memory cache */
-$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
index 139f36ca3c9d6..3cb429822eb9a 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
@@ -27,8 +27,3 @@
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
 $store->setCode('thirdstore')->setName('Third Store')->setSortOrder(10)->setIsActive(1);
 $store->save();
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
new file mode 100644
index 0000000000000..19d064bb79834
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Website::class);
+/** @var $website \Magento\Store\Model\Website */
+$websiteId = $website->load('secondwebsite', 'code')->getId();
+if ($websiteId) {
+    $website->delete();
+}
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if ($store->load('secondstore', 'code')->getId()) {
+    $store->delete();
+}
+
+/** @var $website \Magento\Store\Model\Website */
+$websiteId = $website->load('thirdwebsite', 'code')->getId();
+if ($websiteId) {
+    $website->delete();
+}
+
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if ($store->load('thirdstore', 'code')->getId()) {
+    $store->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php
index 064dfbcdbe2be..d5fd725e7df4d 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php
@@ -21,11 +21,4 @@
         ->setSortOrder(10)
         ->setIsActive(1);
     $store->save();
-
-    Bootstrap::getObjectManager()
-        ->get(\Magento\Framework\Event\ManagerInterface::class)
-        ->dispatch('store_add', ['store' => $store]);
-
-    /* Refresh stores memory cache */
-    Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
index c154cdfb80f8e..af008a28d611b 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
@@ -6,11 +6,13 @@
  * See COPYING.txt for license details.
  */
 
+/** @var \Magento\Store\Model\Store $store */
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
 if (!$store->load('fixture_second_store', 'code')->getId()) {
     $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
-    )->getWebsite()->getId();
+    )->getWebsite()
+        ->getId();
     $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
     )->getWebsite()->getDefaultGroupId();
@@ -29,8 +31,3 @@
     );
     $store->save();
 }
-
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
index bcde6810fa6ce..56ba31fad4ed2 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
@@ -5,18 +5,18 @@
  * See COPYING.txt for license details.
  */
 /** @var \Magento\Framework\Registry $registry */
-//$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-//
-//$registry->unregister('isSecureArea');
-//$registry->register('isSecureArea', true);
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
 
 /** @var Magento\Store\Model\Store $store */
-//$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-//$store->load('fixture_second_store');
-//
-//if ($store->getId()) {
-//    $store->delete();
-//}
-//
-//$registry->unregister('isSecureArea');
-//$registry->register('isSecureArea', false);
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+$store->load('fixture_second_store');
+
+if ($store->getId()) {
+    $store->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php
index 078b590132f06..016acca1e8e04 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php
@@ -51,10 +51,6 @@
     );
     $store->save();
 }
-/* Refresh stores memory cache */
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    \Magento\Store\Model\StoreManagerInterface::class
-)->reinitStores();
 
 /* Refresh CatalogSearch index */
 /** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store.php b/dev/tests/integration/testsuite/Magento/Store/_files/store.php
index 2f11196c99b1a..7e30978af48b2 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store.php
@@ -20,7 +20,31 @@
         ]
     );
     $store->save();
+} else {
+    if ($store->getId()) {
+        /** @var \Magento\TestFramework\Helper\Bootstrap $registry */
+        $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\Registry::class
+        );
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        $store->delete();
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+
+        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+        $store->setData(
+            [
+                'code' => 'test',
+                'website_id' => '1',
+                'group_id' => '1',
+                'name' => 'Test Store',
+                'sort_order' => '0',
+                'is_active' => '1',
+            ]
+        );
+        $store->save();
+    }
 }
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/* Refresh stores memory cache */
-$objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
index 3c0acfef24727..8289244d6581a 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
@@ -22,5 +22,12 @@
     $store->delete();
 }
 
+/** @var Store $store */
+$store = $objectManager->get(Store::class);
+$store->load('test', 'code');
+if ($store->getId()) {
+    $store->delete();
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/website_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/website_rollback.php
index 9c33f4c9ca674..2a5385f997389 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/website_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/website_rollback.php
@@ -20,3 +20,8 @@
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
+
+/* Refresh stores memory cache */
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Store\Model\StoreManagerInterface::class
+)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
new file mode 100644
index 0000000000000..970b1619f0214
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\Website;
+use Magento\Store\Model\Store;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndex;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Store\Model\Group;
+
+$objectManager = Bootstrap::getObjectManager();
+//Creating second website with a store.
+/** @var $website \Magento\Store\Model\Website */
+$website = $objectManager->create(Website::class);
+$website->load('test', 'code');
+
+if (!$website->getId()) {
+    $website->setData([
+        'code' => 'test',
+        'name' => 'Test Website',
+        'is_default' => '0',
+    ]);
+    $website->save();
+}
+
+/**
+ * @var Group $storeGroup
+ */
+$storeGroup = $objectManager->create(Group::class);
+$storeGroup->setCode('some_group')
+    ->setName('custom store group')
+    ->setWebsite($website);
+$storeGroup->save($storeGroup);
+
+$website->setDefaultGroupId($storeGroup->getId());
+$website->save($website);
+
+$websiteId = $website->getId();
+$store = $objectManager->create(Store::class);
+$store->load('fixture_second_store', 'code');
+
+if (!$store->getId()) {
+    $groupId = $website->getDefaultGroupId();
+    $store->setData([
+        'code' => 'fixture_second_store',
+        'website_id' => $websiteId,
+        'group_id' => $groupId,
+        'name' => 'Fixture Second Store',
+        'sort_order' => 10,
+        'is_active' => 1,
+    ]);
+    $store->save();
+}
+
+//Setting up allowed countries
+$configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+//Allowed countries for default website.
+$configResource->saveConfig(
+    'general/country/allow',
+    'FR',
+    \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
+    1
+);
+//Allowed countries for second website
+$configResource->saveConfig(
+    'general/country/allow',
+    'ES,US,UK,DE',
+    \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
+    $websiteId
+);
+
+/* Refresh CatalogSearch index */
+/** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(\Magento\Framework\Indexer\IndexerRegistry::class);
+$indexerRegistry->get(FulltextIndex::INDEXER_ID)->reindexAll();
+//Clear config cache.
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php
new file mode 100644
index 0000000000000..97f7db97aa27b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\Website;
+use Magento\Store\Model\Store;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndex;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Deleting second website's store.
+$store = $objectManager->create(Store::class);
+if ($store->load('fixture_second_store', 'code')->getId()) {
+    $store->delete();
+}
+
+//Deleting the second website.
+
+$configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+//Restoring allowed countries.
+$configResource->deleteConfig(
+    'general/country/allow',
+    \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
+    1
+);
+/** @var Website $website */
+$website = $objectManager->create(Website::class);
+$website->load('test');
+if ($website->getId()) {
+    $configResource->deleteConfig(
+        'general/country/allow',
+        \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
+        $website->getId()
+    );
+    $website->delete();
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+/* Refresh stores memory cache */
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+$storeManager->reinitStores();
+/* Refresh CatalogSearch index */
+/** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(\Magento\Framework\Indexer\IndexerRegistry::class);
+$indexerRegistry->get(FulltextIndex::INDEXER_ID)->reindexAll();
+//Clear config cache.
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
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 0000000000000..cf1c87e2b2225
--- /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/Swatches/Controller/Adminhtml/Iframe/ShowTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Iframe/ShowTest.php
index 0bd2a74e0d373..415ea79be9f07 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Iframe/ShowTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Iframe/ShowTest.php
@@ -25,7 +25,7 @@ public function testAclAccess()
         $this->dispatch('backend/swatches/iframe/show/');
 
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
-        $this->assertNotContains('Access denied', $this->getResponse()->getBody());
+        $this->assertNotContains('Sorry, you need permissions to view this content.', $this->getResponse()->getBody());
     }
 
     /**
@@ -43,6 +43,6 @@ public function testAclAccessDenied()
         $this->dispatch('backend/swatches/iframe/show/');
 
         $this->assertEquals(403, $this->getResponse()->getHttpResponseCode());
-        $this->assertContains('Access denied', $this->getResponse()->getBody());
+        $this->assertContains('Sorry, you need permissions to view this content.', $this->getResponse()->getBody());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
new file mode 100644
index 0000000000000..f806674d29705
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Controller\Adminhtml\Product;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Test for product attribute save controller.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * Generate random hex color.
+     *
+     * @return string
+     */
+    private function getRandomColor() : string
+    {
+        return '#' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), 6, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * Get visual swatches data set.
+     *
+     * @param int $optionsCount
+     * @return array
+     */
+    private function getSwatchVisualDataSet(int $optionsCount) : array
+    {
+        $optionsData = [];
+        $expectedOptionsLabels = [];
+        for ($i = 0; $i < $optionsCount; $i++) {
+            $expectedOptionLabelOnStoreView = 'value_' . $i .'_store_1';
+            $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
+            $optionId = 'option_' .$i;
+            $optionRowData = [];
+            $optionRowData['optionvisual']['order'][$optionId] = $i + 1;
+            $optionRowData['defaultvisual'][] = $optionId;
+            $optionRowData['swatchvisual']['value'][$optionId] = $this->getRandomColor();
+            $optionRowData['optionvisual']['value'][$optionId][0] = 'value_' . $i .'_admin';
+            $optionRowData['optionvisual']['value'][$optionId][1] = $expectedOptionLabelOnStoreView;
+            $optionRowData['optionvisual']['delete'][$optionId] = '';
+            $optionsData[] = http_build_query($optionRowData);
+        }
+        return [
+            'attribute_data' => array_merge_recursive(
+                [
+                    'serialized_options' => json_encode($optionsData),
+                ],
+                [
+                    'visual_swatch_validation' => '',
+                    'visual_swatch_validation_unique' => '',
+                ],
+                $this->getAttributePreset(),
+                [
+                    'frontend_input' => 'swatch_visual'
+                ]
+            ),
+            'expected_options_count' => $optionsCount + 1,
+            'expected_store_labels' => $expectedOptionsLabels
+        ];
+    }
+
+    /**
+     * Get text swatches data set.
+     *
+     * @param int $optionsCount
+     * @return array
+     */
+    private function getSwatchTextDataSet(int $optionsCount) : array
+    {
+        $optionsData = [];
+        $expectedOptionsLabels = [];
+        for ($i = 0; $i < $optionsCount; $i++) {
+            $expectedOptionLabelOnStoreView = 'value_' . $i . '_store_1';
+            $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
+            $optionId = 'option_' . $i;
+            $optionRowData = [];
+            $optionRowData['optiontext']['order'][$optionId] = $i + 1;
+            $optionRowData['defaulttext'][] = $optionId;
+            $optionRowData['swatchtext']['value'][$optionId] = 'x' . $i ;
+            $optionRowData['optiontext']['value'][$optionId][0] = 'value_' . $i . '_admin';
+            $optionRowData['optiontext']['value'][$optionId][1]= $expectedOptionLabelOnStoreView;
+            $optionRowData['optiontext']['delete'][$optionId]='';
+            $optionsData[] = http_build_query($optionRowData);
+        }
+        return [
+            'attribute_data' => array_merge_recursive(
+                [
+                    'serialized_options' => json_encode($optionsData),
+                ],
+                [
+                    'text_swatch_validation' => '',
+                    'text_swatch_validation_unique' => '',
+                ],
+                $this->getAttributePreset(),
+                [
+                    'frontend_input' => 'swatch_text'
+                ]
+            ),
+            'expected_options_count' => $optionsCount + 1,
+            'expected_store_labels' => $expectedOptionsLabels
+        ];
+    }
+
+    /**
+     * Get data preset for new attribute.
+     *
+     * @return array
+     */
+    private function getAttributePreset() : array
+    {
+        return [
+            'form_key' => 'XxtpPYjm2YPYUlAt',
+            'frontend_label' => [
+                0 => 'asdasd',
+                1 => '',
+                2 => '',
+            ],
+            'is_required' => '0',
+            'update_product_preview_image' => '0',
+            'use_product_image_for_swatch' => '0',
+            'is_global' => '0',
+            'default_value_text' => '512',
+            'default_value_yesno' => '1',
+            'default_value_date' => '1/1/70',
+            'default_value_textarea' => '512',
+            'is_unique' => '0',
+            'is_used_in_grid' => '1',
+            'is_visible_in_grid' => '1',
+            'is_filterable_in_grid' => '1',
+            'is_searchable' => '0',
+            'is_comparable' => '0',
+            'is_filterable' => '0',
+            'is_filterable_in_search' => '0',
+            'position' => '0',
+            'is_used_for_promo_rules' => '0',
+            'is_html_allowed_on_front' => '1',
+            'is_visible_on_front' => '0',
+            'used_in_product_listing' => '0',
+            'used_for_sort_by' => '0',
+            'attribute_code' => 'test_many_swatches',
+        ];
+    }
+
+    /**
+     * Data provider for large swatches amount test.
+     *
+     * @return array
+     */
+    public function getLargeSwatchesAmountAttributeData() : array
+    {
+        $maxInputVars = ini_get('max_input_vars');
+        // Each option is at least 7 variables array for a visual swatch.
+        // Set options count to exceed max_input_vars by 20 options (140 variables).
+        $swatchVisualOptionsCount = (int)floor($maxInputVars / 7) + 20;
+        $swatchTextOptionsCount = (int)floor($maxInputVars / 4) + 80;
+        return [
+            'visual swatches' => $this->getSwatchVisualDataSet($swatchVisualOptionsCount),
+            'text swatches' => $this->getSwatchTextDataSet($swatchTextOptionsCount)
+        ];
+    }
+
+    /**
+     * Test attribute saving with large amount of options exceeding maximum allowed by max_input_vars limit.
+     * @dataProvider getLargeSwatchesAmountAttributeData()
+     * @param array $attributeData
+     * @param int $expectedOptionsCount
+     * @param array $expectedLabels
+     * @return void
+     */
+    public function testLargeOptionsDataSet(
+        array $attributeData,
+        int $expectedOptionsCount,
+        array $expectedLabels
+    ) : void {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($attributeData);
+        $this->getRequest()->setPostValue('form_key', $this->formKey->getFormKey());
+        $this->dispatch('backend/catalog/product_attribute/save');
+        $entityTypeId = $this->_objectManager->create(
+            \Magento\Eav\Model\Entity::class
+        )->setType(
+            \Magento\Catalog\Model\Product::ENTITY
+        )->getTypeId();
+
+        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        $attribute = $this->_objectManager->create(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        )->setEntityTypeId(
+            $entityTypeId
+        );
+        try {
+            $attribute->loadByCode($entityTypeId, 'test_many_swatches');
+            $options = $attribute->getOptions();
+            // assert that all options are saved without truncation
+            $this->assertEquals(
+                $expectedOptionsCount,
+                count($options),
+                'Expected options count does not match (regarding first empty option for non-required attribute)'
+            );
+
+            foreach ($expectedLabels as $optionOrderNum => $label) {
+                $this->assertEquals(
+                    $label,
+                    $options[$optionOrderNum]->getLabel(),
+                    "Label for option #{$optionOrderNum} does not match expected."
+                );
+            }
+        } catch (LocalizedException $e) {
+            $this->fail('Test failed with exception on attribute model load: ' . $e);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Observer/AddSwatchAttributeTypeObserverTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Observer/AddSwatchAttributeTypeObserverTest.php
new file mode 100644
index 0000000000000..15d10c2ddffd4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Observer/AddSwatchAttributeTypeObserverTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Observer;
+
+use Magento\Framework\DataObject;
+use Magento\Swatches\Model\Swatch;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Event\ManagerInterface;
+
+/**
+ * Test checks that swatch types are added to the other attribute types
+ */
+class AddSwatchAttributeTypeObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testAddSwatchAttributeTypes()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $eventManager = $objectManager->get(ManagerInterface::class);
+        $response = new DataObject();
+        $response->setTypes([]);
+
+        $eventManager->dispatch(
+            'adminhtml_product_attribute_types',
+            ['response' => $response]
+        );
+
+        $responseTypes = $response->getTypes();
+
+        self::assertGreaterThan(0, count($responseTypes));
+
+        /* Iterate through values since other types (not swatches) might be added by observers */
+        $responseTypeValues = [];
+        foreach ($responseTypes as $responseType) {
+            $responseTypeValues[] = $responseType['value'];
+        }
+
+        self::assertTrue(in_array(Swatch::SWATCH_TYPE_VISUAL_ATTRIBUTE_FRONTEND_INPUT, $responseTypeValues));
+        self::assertTrue(in_array(Swatch::SWATCH_TYPE_TEXTUAL_ATTRIBUTE_FRONTEND_INPUT, $responseTypeValues));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php
new file mode 100644
index 0000000000000..215c32c4b521d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+$data = [
+    'attribute_code' => 'color_swatch',
+    'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+    'is_global' => 1,
+    'is_user_defined' => 1,
+    'frontend_input' => 'select',
+    'is_unique' => 0,
+    'is_required' => 0,
+    'is_searchable' => 1,
+    'is_visible_in_advanced_search' => 1,
+    'is_comparable' => 1,
+    'is_filterable' => 1,
+    'is_filterable_in_search' => 1,
+    'is_used_for_promo_rules' => 0,
+    'is_html_allowed_on_front' => 1,
+    'is_visible_on_front' => 1,
+    'used_in_product_listing' => 1,
+    'used_for_sort_by' => 1,
+    'frontend_label' => ['Test Swatch'],
+    'backend_type' => 'int',
+    'use_product_image_for_swatch' => 0,
+    'update_product_preview_image' => 0,
+];
+$optionsPerAttribute = 3;
+
+$data['swatch_input_type'] = 'visual';
+$data['swatchvisual']['value'] = array_reduce(
+    range(1, $optionsPerAttribute),
+    function ($values, $index) use ($optionsPerAttribute) {
+        $values['option_' . $index] = '#'
+            . str_repeat(
+                dechex(255 * $index / $optionsPerAttribute),
+                3
+            );
+        return $values;
+    },
+    []
+);
+$data['optionvisual']['value'] = array_reduce(
+    range(1, $optionsPerAttribute),
+    function ($values, $index) use ($optionsPerAttribute) {
+        $values['option_' . $index] = ['option ' . $index];
+        return $values;
+    },
+    []
+);
+
+$data['options']['option'] = array_reduce(
+    range(1, $optionsPerAttribute),
+    function ($values, $index) use ($optionsPerAttribute) {
+        $values[] = [
+            'label' => 'option ' . $index,
+            'value' => 'option_' . $index,
+        ];
+        return $values;
+    },
+    []
+);
+
+$options = [];
+foreach ($data['options']['option'] as $optionData) {
+    $options[] = $objectManager->get(AttributeOptionInterface::class)
+        ->setLabel($optionData['label'])
+        ->setValue($optionData['value']);
+}
+
+$attribute = $objectManager->create(
+    \Magento\Catalog\Api\Data\ProductAttributeInterface::class,
+    ['data' => $data]
+);
+$attribute->setOptions($options);
+$attribute->save();
+
+/* Assign attribute to attribute set */
+$installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+
+/** @var \Magento\Eav\Model\Config $eavConfig */
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$eavConfig->clear();
+
+$attribute = $eavConfig->getAttribute('catalog_product', 'color_swatch');
+$options = $attribute->getOptions();
+
+// workaround for saved attribute
+$attribute->setDefaultValue($options[1]->getValue());
+
+$attribute->save();
+$eavConfig->clear();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(10)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product1')
+    ->setSku('simple1')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setPrice(10)
+    ->setWeight(1)
+    ->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)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('5.99')
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(11)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product2')
+    ->setSku('simple2')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_ON_GESTURE)
+    ->setPrice(20)
+    ->setWeight(1)
+    ->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)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('15.99')
+    ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(12)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product3')
+    ->setSku('simple3')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setPrice(30)
+    ->setWeight(1)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('25.99')
+    ->save();
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(
+    333
+)->setCreatedAt(
+    '2014-06-23 09:50:07'
+)->setName(
+    'Category 1'
+)->setParentId(
+    2
+)->setPath(
+    '1/2/333'
+)->setLevel(
+    2
+)->setAvailableSortBy(
+    ['position', 'name']
+)->setDefaultSortBy(
+    'name'
+)->setIsActive(
+    true
+)->setPosition(
+    1
+)->setPostedProducts(
+    [10 => 10, 11 => 11, 12 => 12]
+)->save();
+
+/** @var \Magento\Indexer\Model\Indexer\Collection $indexerCollection */
+$indexerCollection = Bootstrap::getObjectManager()->get(\Magento\Indexer\Model\Indexer\Collection::class);
+$indexerCollection->load();
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+foreach ($indexerCollection->getItems() as $indexer) {
+    $indexer->reindexAll();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch_rollback.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch_rollback.php
new file mode 100644
index 0000000000000..decd6be971151
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch_rollback.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple1', 'simple2', 'simple3'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+        //Product already removed
+    }
+}
+
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->load(333);
+if ($category->getId()) {
+    $category->delete();
+}
+
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+
+$attribute->loadByCode(4, 'color_swatch');
+
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
index 91a845f151eaf..c2f7b498e63e3 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Tax\Controller\Adminhtml;
 
 /**
@@ -109,7 +110,7 @@ public function ajaxSaveActionDataInvalidDataProvider()
     {
         $expectedData = [
             'success' => false,
-            'error_message' => 'Make sure all required information is valid.',
+            'error_message' => 'The required information is invalid. Verify the information and try again.',
         ];
         return [
             [
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
index 07545754ca1b4..fef34c1dc85f9 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
@@ -289,9 +289,9 @@ public function createDataProvider()
                     'zip_to' => 'to',
                 ],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
                     'Invalid value of "from" provided for the zip_from field.',
                     'Invalid value of "to" provided for the zip_to field.',
                 ],
@@ -303,9 +303,9 @@ public function createDataProvider()
                     'zip_to' => '',
                 ],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
                     'Invalid value of "" provided for the zip_from field.',
                     'Invalid value of "" provided for the zip_to field.',
                 ],
@@ -313,10 +313,10 @@ public function createDataProvider()
             'empty' => [
                 [],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
-                    'postcode is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
+                    '"postcode" is required. Enter and try again.',
                 ],
             ],
             'zipRangeAndPostcode' => [
@@ -327,9 +327,9 @@ public function createDataProvider()
                     'zip_to' => 78780,
                 ],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
                 ],
             ],
             'higherRange' => [
@@ -339,9 +339,9 @@ public function createDataProvider()
                     'zip_to' => 78780,
                 ],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
                     'Range To should be equal or greater than Range From.',
                 ],
             ],
@@ -349,37 +349,37 @@ public function createDataProvider()
                 ['tax_country_id' => 'XX'],
                 'error' => [
                     'Invalid value of "XX" provided for the country_id field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
-                    'postcode is a required field.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
+                    '"postcode" is required. Enter and try again.',
                 ],
             ],
             'invalidCountry2' => [
                 ['tax_country_id' => ' '],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
-                    'postcode is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
+                    '"postcode" is required. Enter and try again.',
                 ],
             ],
             'invalidRegion1' => [
                 ['tax_region_id' => '-'],
                 'error' => [
-                    'country_id is a required field.',
+                    '"country_id" is required. Enter and try again.',
                     'Invalid value of "-" provided for the region_id field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
-                    'postcode is a required field.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
+                    '"postcode" is required. Enter and try again.',
                 ],
             ],
             'spaceRegion' => [
                 ['tax_region_id' => ' '],
                 'error' => [
-                    'country_id is a required field.',
-                    'percentage_rate is a required field.',
-                    'code is a required field.',
-                    'postcode is a required field.',
+                    '"country_id" is required. Enter and try again.',
+                    '"percentage_rate" is required. Enter and try again.',
+                    '"code" is required. Enter and try again.',
+                    '"postcode" is required. Enter and try again.',
                 ],
             ],
             'emptyPercentageRate' => [
@@ -393,7 +393,7 @@ public function createDataProvider()
                     'zip_to' => 78780,
                 ],
                 'error' => [
-                    'percentage_rate is a required field.',
+                    '"percentage_rate" is required. Enter and try again.',
                 ],
             ]
 
@@ -557,7 +557,6 @@ public function testDeleteThrowsExceptionIfTargetTaxRateDoesNotExist()
     }
 
     /**
-     *
      * @param \Magento\Framework\Api\Filter[] $filters
      * @param \Magento\Framework\Api\Filter[] $filterGroup
      * @param $expectedRateCodes
@@ -629,7 +628,17 @@ public function searchTaxRatesDataProvider()
                 ],
                 [],
                 ['US - 42 - 7.5', 'US - 12 - 7.5'],
-            ]
+            ],
+            'like_region_name' => [
+                [
+                    $filterBuilder->setField(Rate::KEY_REGION_NAME)
+                        ->setValue('%NM%')
+                        ->setConditionType('like')
+                        ->create(),
+                ],
+                null,
+                ['US - 42 - 7.5', 'US - 42 - 22'],
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php
index 2f95e11a4536b..d2dbcea3f70b0 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php
@@ -112,11 +112,9 @@ public function testCheckClassCanBeDeletedCustomerClassUsedInTaxRule()
 
         /** @var $model \Magento\Tax\Model\ClassModel */
         $model = $this->_objectManager->create(\Magento\Tax\Model\ClassModel::class)->load($customerClasses[0]);
-        $this->expectException(
-            \Magento\Framework\Exception\CouldNotDeleteException::class,
-            'You cannot delete this tax class because it is used in' .
-            ' Tax Rules. You have to delete the rules it is used in first.'
-        );
+        $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class);
+        $this->expectExceptionMessage('You cannot delete this tax class because it is used in' .
+            ' Tax Rules. You have to delete the rules it is used in first.');
         $model->delete();
     }
 
@@ -134,11 +132,9 @@ public function testCheckClassCanBeDeletedProductClassUsedInTaxRule()
 
         /** @var $model \Magento\Tax\Model\ClassModel */
         $model = $this->_objectManager->create(\Magento\Tax\Model\ClassModel::class)->load($productClasses[0]);
-        $this->expectException(
-            \Magento\Framework\Exception\CouldNotDeleteException::class,
-            'You cannot delete this tax class because it is used in' .
-            ' Tax Rules. You have to delete the rules it is used in first.'
-        );
+        $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class);
+        $this->expectExceptionMessage('You cannot delete this tax class because it is used in' .
+            ' Tax Rules. You have to delete the rules it is used in first.');
         $model->delete();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Rate/SourceTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Rate/SourceTest.php
index 47a153dc99eb4..f2857e2d9d0d0 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Rate/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Rate/SourceTest.php
@@ -9,8 +9,24 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Tax\Model\Rate\Provider;
 
-class SourceTest extends \PHPUnit\Framework\TestCase
+class SourceTest extends \Magento\TestFramework\Indexer\TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     */
     public function testToOptionArray()
     {
         /** @var \Magento\Tax\Model\ResourceModel\Calculation\Rate\Collection $collection */
@@ -39,4 +55,12 @@ public function testToOptionArray()
             'Tax rate options are invalid.'
         );
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
index a9a5c922c3d25..bd505fd4db035 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
@@ -141,6 +141,7 @@ class SetupUtil
         'discount_amount' => 40,
         'discount_step' => 0,
         'stop_rules_processing' => 1,
+        'apply_to_shipping' => 0,
         'website_ids' => [1],
     ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
index b021040079538..ae1f475d43b71 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\TestFramework\Helper\Bootstrap;
@@ -13,7 +15,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SubtotalTest extends \PHPUnit\Framework\TestCase
+class SubtotalTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * Object Manager
@@ -27,12 +29,23 @@ class SubtotalTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    public static function setUpBeforeClass()
+    {
+        $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->productRepository = $this->objectManager->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $this->productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
     }
 
     protected function getCustomerById($id)
@@ -46,6 +59,7 @@ protected function getCustomerById($id)
 
     /**
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDataFixture Magento/Tax/_files/tax_classes.php
@@ -61,8 +75,12 @@ public function testCollectUnitBased($expected)
         /** @var \Magento\Customer\Model\Customer $customer */
         $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class)->load($fixtureCustomerId);
         /** @var \Magento\Customer\Model\Group $customerGroup */
-        $customerGroup = $this->objectManager->create(\Magento\Customer\Model\Group::class)
-            ->load('custom_group', 'customer_group_code');
+        $customerGroup = $this->objectManager->create(
+            \Magento\Customer\Model\Group::class
+        )->load(
+            'custom_group',
+            'customer_group_code'
+        );
         $customerGroup->setTaxClassId($customerTaxClassId)->save();
         $customer->setGroupId($customerGroup->getId())->save();
 
@@ -160,6 +178,7 @@ public function collectUnitBasedDataProvider()
     }
 
     /**
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDataFixture Magento/Tax/_files/tax_classes.php
@@ -177,7 +196,10 @@ public function testCollectUnitBasedBundleProduct($expected)
         /** @var \Magento\Customer\Model\Group $customerGroup */
         $customerGroup = $this->objectManager->create(
             \Magento\Customer\Model\Group::class
-        )->load('custom_group', 'customer_group_code');
+        )->load(
+            'custom_group',
+            'customer_group_code'
+        );
         $customerGroup->setTaxClassId($customerTaxClassId)->save();
         $customer->setGroupId($customerGroup->getId())->save();
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 9b498afc2500d..19343e49192ac 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -5,17 +5,19 @@
  */
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
+use Magento\Quote\Model\Quote\TotalsCollector;
 use Magento\Tax\Model\Calculation;
 use Magento\TestFramework\Helper\Bootstrap;
 
 require_once __DIR__ . '/SetupUtil.php';
 require_once __DIR__ . '/../../../../_files/tax_calculation_data_aggregated.php';
+require_once __DIR__ . '/../../../../_files/full_discount_with_tax.php';
 
 /**
  * Class TaxTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class TaxTest extends \PHPUnit\Framework\TestCase
+class TaxTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * Utility object for setting up tax rates, tax classes and tax rules
@@ -24,6 +26,24 @@ class TaxTest extends \PHPUnit\Framework\TestCase
      */
     protected $setupUtil = null;
 
+    /**
+     * @var TotalsCollector
+     */
+    private $totalsCollector;
+
+    /**
+     * test setup
+     */
+    public function setUp()
+    {
+        /** @var  \Magento\Framework\ObjectManagerInterface $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+        $this->totalsCollector = $objectManager->create(TotalsCollector::class);
+        $this->setupUtil = new SetupUtil($objectManager);
+
+        parent::setUp();
+    }
+
     /**
      * Test taxes collection for quote.
      *
@@ -108,6 +128,40 @@ public function testCollect()
         );
     }
 
+    /**
+     * Test taxes collection with full discount for quote.
+     *
+     * Test tax calculation and price when the discount may be bigger than total
+     * This method will test the collector through $quote->collectTotals() method
+     *
+     * @see \Magento\SalesRule\Model\Utility::deltaRoundingFix
+     * @magentoDataFixture Magento/Tax/_files/full_discount_with_tax.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testFullDiscountWithDeltaRoundingFix()
+    {
+        global $fullDiscountIncTax;
+        $configData = $fullDiscountIncTax['config_data'];
+        $quoteData = $fullDiscountIncTax['quote_data'];
+        $expectedResults = $fullDiscountIncTax['expected_result'];
+
+        /** @var  \Magento\Framework\ObjectManagerInterface $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+
+        //Setup tax configurations
+        $this->setupUtil = new SetupUtil($objectManager);
+        $this->setupUtil->setupTax($configData);
+
+        $quote = $this->setupUtil->setupQuote($quoteData);
+
+        $quote->collectTotals();
+
+        $quoteAddress = $quote->getShippingAddress();
+
+        $this->verifyResult($quoteAddress, $expectedResults);
+    }
+
     /**
      * Verify fields in quote item
      *
@@ -227,25 +281,26 @@ protected function verifyResult($quoteAddress, $expectedResults)
      * @param array $configData
      * @param array $quoteData
      * @param array $expectedResults
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @dataProvider taxDataProvider
      * @return void
      */
     public function testTaxCalculation($configData, $quoteData, $expectedResults)
     {
-        /** @var  \Magento\Framework\ObjectManagerInterface $objectManager */
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var  \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector */
-        $totalsCollector = $objectManager->create(\Magento\Quote\Model\Quote\TotalsCollector::class);
-
+        $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
         //Setup tax configurations
-        $this->setupUtil = new SetupUtil($objectManager);
         $this->setupUtil->setupTax($configData);
 
         $quote = $this->setupUtil->setupQuote($quoteData);
         $quoteAddress = $quote->getShippingAddress();
-        $totalsCollector->collectAddressTotals($quote, $quoteAddress);
+        $this->totalsCollector->collectAddressTotals($quote, $quoteAddress);
         $this->verifyResult($quoteAddress, $expectedResults);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index e0bd6f3523612..dd5d12c5b9be3 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -2192,7 +2192,7 @@ protected function setupMultiRuleQuote()
     }
 
     /**
-     * Create the base results for the the multi rules test
+     * Create the base results for the multi rules test
      *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php
index 14a74c8ad12cd..fa20127984d77 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php
@@ -91,8 +91,8 @@ public function testSaveThrowsExceptionIfGivenDataIsInvalid()
             $this->taxClassRepository->save($taxClassDataObject);
         } catch (InputException $e) {
             $errors = $e->getErrors();
-            $this->assertEquals('class_name is a required field.', $errors[0]->getMessage());
-            $this->assertEquals('class_type is a required field.', $errors[1]->getMessage());
+            $this->assertEquals('"class_name" is required. Enter and try again.', $errors[0]->getMessage());
+            $this->assertEquals('"class_type" is required. Enter and try again.', $errors[1]->getMessage());
         }
     }
 
@@ -160,10 +160,8 @@ public function testDeleteById()
         $this->assertTrue($this->taxClassRepository->deleteById($taxClassId));
 
         // Verify if the tax class is deleted
-        $this->expectException(
-            \Magento\Framework\Exception\NoSuchEntityException::class,
-            "No such entity with class_id = $taxClassId"
-        );
+        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+        $this->expectExceptionMessage("No such entity with class_id = $taxClassId");
         $this->taxClassRepository->deleteById($taxClassId);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php
index 14dd0b7d9bb11..0b98b9a519391 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Tax\Model;
 
 use Magento\Framework\Api\Filter;
@@ -108,7 +109,7 @@ public function testSave()
      * @expectedExceptionMessage No such entity with taxRuleId = 9999
      * @magentoDbIsolation enabled
      */
-    public function testSaveThrowsExceptionIdTargetTaxRulDoesNotExist()
+    public function testSaveThrowsExceptionIdIfTargetTaxRuleDoesNotExist()
     {
         $taxRuleDataObject = $this->taxRuleFactory->create();
         $taxRuleDataObject->setId(9999)
@@ -277,7 +278,7 @@ public function testSaveUpdatesExistingTaxRule()
     /**
      * @magentoDbIsolation enabled
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage code is a required field
+     * @expectedExceptionMessage "code" is required. Enter and try again.
      */
     public function testSaveThrowsExceptionIsRequiredFieldsAreMissing()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php b/dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php
new file mode 100644
index 0000000000000..2b5ef07de341a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$fullDiscountIncTax = [
+        'config_data' => [
+                'config_overrides' => [
+                        Config::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT => 0,
+                        Config::CONFIG_XML_PATH_DISCOUNT_TAX => 1,
+                        Config::XML_PATH_ALGORITHM => 'ROW_BASE_CALCULATION',
+                        Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS => SetupUtil::SHIPPING_TAX_CLASS,
+                    ],
+                'tax_rate_overrides' => [
+                        SetupUtil::TAX_RATE_TX => 18,
+                        SetupUtil::TAX_RATE_SHIPPING => 0,
+                    ],
+                'tax_rule_overrides' => [
+                        [
+                            'code' => 'Product Tax Rule',
+                            'product_tax_class_ids' => [
+                                    SetupUtil::PRODUCT_TAX_CLASS_1
+                                ],
+                        ],
+                        [
+                            'code' => 'Shipping Tax Rule',
+                            'product_tax_class_ids' => [
+                                    SetupUtil::SHIPPING_TAX_CLASS
+                                ],
+                            'tax_rate_ids' => [
+                                    SetupUtil::TAX_RATE_SHIPPING,
+                                ],
+                        ],
+                    ],
+        ],
+        'quote_data' => [
+                'billing_address' => [
+                        'region_id' => SetupUtil::REGION_TX,
+                    ],
+                'shipping_address' => [
+                        'region_id' => SetupUtil::REGION_TX,
+                    ],
+                'items' => [
+                        [
+                            'sku' => 'simple1',
+                            'price' => 2542.37,
+                            'qty' => 2,
+                        ]
+                    ],
+                'shipping_method' => 'free',
+                'shopping_cart_rules' => [
+                        [
+                            'discount_amount' => 100
+                        ],
+                    ],
+        ],
+        'expected_result' => [
+                'address_data' => [
+                        'subtotal' => 5084.74,
+                        'base_subtotal' => 5084.74,
+                        'subtotal_incl_tax' => 5999.99,
+                        'base_subtotal_incl_tax' => 5999.99,
+                        'tax_amount' => 915.25,
+                        'base_tax_amount' => 915.25,
+                        'shipping_amount' => 0,
+                        'base_shipping_amount' => 0,
+                        'shipping_incl_tax' => 0,
+                        'base_shipping_incl_tax' => 0,
+                        'shipping_tax_amount' => 0,
+                        'base_shipping_tax_amount' => 0,
+                        'discount_amount' => -5999.99,
+                        'base_discount_amount' => -5999.99,
+                        'discount_tax_compensation_amount' => 0,
+                        'base_discount_tax_compensation_amount' => 0,
+                        'shipping_discount_tax_compensation_amount' => 0,
+                        'base_shipping_discount_tax_compensation_amount' => 0,
+                        'grand_total' => 0,
+                        'base_grand_total' => 0,
+                        'applied_taxes' => [
+                                SetupUtil::TAX_RATE_TX => [
+                                        'percent' => 18,
+                                        'amount' => 915.25,
+                                        'base_amount' => 915.25,
+                                        'rates' => [
+                                                [
+                                                    'code' => SetupUtil::TAX_RATE_TX,
+                                                    'title' => SetupUtil::TAX_RATE_TX,
+                                                    'percent' => 18,
+                                                ],
+                                            ],
+                                    ]
+                            ],
+                    ],
+                'items_data' => [
+                        'simple1' => [
+                                'row_total' => 5084.74,
+                                'base_row_total' => 5084.74,
+                                'tax_percent' => 18,
+                                'price' => 2542.37,
+                                'base_price' => 2542.37,
+                                'price_incl_tax' => 3000,
+                                'base_price_incl_tax' => 3000,
+                                'row_total_incl_tax' => 5999.99,
+                                'base_row_total_incl_tax' => 5999.99,
+                                'tax_amount' => 915.25,
+                                'base_tax_amount' => 915.25,
+                                'discount_amount' => 5999.99,
+                                'base_discount_amount' => 5999.99,
+                                'discount_percent' => 100,
+                                'discount_tax_compensation_amount' => 0,
+                                'base_discount_tax_compensation_amount' => 0,
+                            ],
+                    ],
+        ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
new file mode 100644
index 0000000000000..e0cb82e50cbd4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Calculation;
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$taxCalculationData['including_tax_apply_tax_after_discount'] = [
+    'config_data' => [
+        SetupUtil::CONFIG_OVERRIDES => [
+            Config::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT => 1,
+            Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
+            Config::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX => 1,
+            Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS => SetupUtil::SHIPPING_TAX_CLASS,
+            Config::XML_PATH_ALGORITHM => Calculation::CALC_ROW_BASE,
+        ],
+        SetupUtil::TAX_RATE_OVERRIDES => [
+            SetupUtil::TAX_RATE_TX => 10,
+            SetupUtil::TAX_STORE_RATE => 10,
+            SetupUtil::TAX_RATE_SHIPPING => 10,
+        ],
+        SetupUtil::TAX_RULE_OVERRIDES => [
+            [
+                //tax rule for product
+                'code' => 'Product Tax Rule',
+                'product_tax_class_ids' => [SetupUtil::PRODUCT_TAX_CLASS_1],
+            ],
+            [
+                //tax rule for shipping
+                'code' => 'Shipping Tax Rule',
+                'product_tax_class_ids' => [SetupUtil::SHIPPING_TAX_CLASS],
+                'tax_rate_ids' => [SetupUtil::TAX_RATE_SHIPPING],
+            ],
+        ],
+    ],
+    'quote_data' => [
+        'billing_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'shipping_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'items' => [
+            [
+                'sku' => 'simple1',
+                'price' => 29,
+                'qty' => 1,
+            ],
+        ],
+        'shipping_method' => 'flatrate_flatrate',
+        'shopping_cart_rules' => [
+            [
+                'discount_amount' => 50,
+                'apply_to_shipping' => 1,
+            ],
+        ],
+    ],
+    'expected_results' => [
+        'address_data' => [
+            'subtotal' => 26.36,
+            'base_subtotal' => 26.36,
+            'subtotal_incl_tax' => 29,
+            'base_subtotal_incl_tax' => 29,
+            'tax_amount' => 1.69,
+            'base_tax_amount' => 1.69,
+            'shipping_amount' => 4.55,
+            'base_shipping_amount' => 4.55,
+            'shipping_incl_tax' => 5,
+            'base_shipping_incl_tax' => 5,
+            'shipping_tax_amount' => 0.25,
+            'base_shipping_tax_amount' => 0.25,
+            'discount_amount' => -15.455,
+            'base_discount_amount' => -15.455,
+            'discount_tax_compensation_amount' => 1.2,
+            'base_discount_tax_compensation_amount' => 1.2,
+            'shipping_discount_tax_compensation_amount' => 0.2,
+            'base_shipping_discount_tax_compensation_amount' => 0.2,
+            'grand_total' => 18.545,
+            'base_grand_total' => 18.545,
+            'applied_taxes' => [
+                SetupUtil::TAX_RATE_TX => [
+                    'percent' => 10,
+                    'amount' => 1.44,
+                    'base_amount' => 1.44,
+                    'rates' => [
+                        [
+                            'code' => SetupUtil::TAX_RATE_TX,
+                            'title' => SetupUtil::TAX_RATE_TX,
+                            'percent' => 10,
+                        ],
+                    ],
+                ],
+                SetupUtil::TAX_RATE_SHIPPING => [
+                    'percent' => 10,
+                    'amount' => 0.25,
+                    'base_amount' => 0.25,
+                    'rates' => [
+                        [
+                            'code' => SetupUtil::TAX_RATE_SHIPPING,
+                            'title' => SetupUtil::TAX_RATE_SHIPPING,
+                            'percent' => 10,
+                        ],
+                    ],
+                ],
+            ],
+        ],
+        'items_data' => [
+            'simple1' => [
+                'row_total' => 26.36,
+                'base_row_total' => 26.36,
+                'tax_percent' => 10,
+                'price' => 26.36,
+                'base_price' => 26.36,
+                'price_incl_tax' => 29,
+                'base_price_incl_tax' => 29,
+                'row_total_incl_tax' => 29,
+                'base_row_total_incl_tax' => 29,
+                'tax_amount' => 1.44,
+                'base_tax_amount' => 1.44,
+                'discount_amount' => 13.18,
+                'base_discount_amount' => 13.18,
+                'discount_percent' => 50,
+                'discount_tax_compensation_amount' => 1.2,
+                'base_discount_tax_compensation_amount' => 1.2,
+            ],
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
index c47d348cedda5..f22b48a259685 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
@@ -30,3 +30,4 @@
 require_once __DIR__ . '/scenarios/multi_tax_rule_total_calculate_subtotal_yes.php';
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_row.php';
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_total.php';
+require_once __DIR__ . '/scenarios/including_tax_apply_tax_after_discount.php';
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes.php
index 95f69b1e522ee..515cda55ec584 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes.php
@@ -38,6 +38,15 @@
     \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT
 )->save();
 
+// Tax class created but not used in the rule to ensure that unused tax classes are handled properly
+$productTaxClass3 = $objectManager->create(
+    \Magento\Tax\Model\ClassModel::class
+)->setClassName(
+    'ProductTaxClass3'
+)->setClassType(
+    \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT
+)->save();
+
 $taxRate = [
     'tax_country_id' => 'US',
     'tax_region_id' => '12',
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_rollback.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_rollback.php
new file mode 100644
index 0000000000000..51ba48b881736
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_rollback.php
@@ -0,0 +1,43 @@
+<?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();
+
+$taxRules = [
+    'Test Rule',
+    'Test Rule Duplicate',
+];
+$taxClasses = [
+    'ProductTaxClass1',
+    'ProductTaxClass2',
+    'ProductTaxClass3',
+    'CustomerTaxClass1',
+    'CustomerTaxClass2',
+];
+
+
+$taxRuleResource = $objectManager->get(\Magento\Tax\Model\ResourceModel\Calculation\Rule::class);
+foreach ($taxRules as $taxRuleCode) {
+    $taxRule = $objectManager->create(\Magento\Tax\Model\Calculation\Rule::class);
+    $taxRuleResource->load($taxRule, $taxRuleCode, 'code');
+    $taxRuleResource->delete($taxRule);
+}
+
+/** @var \Magento\Tax\Model\ResourceModel\TaxClass $resourceModel */
+$resourceModel = $objectManager->get(\Magento\Tax\Model\ResourceModel\TaxClass::class);
+
+foreach ($taxClasses as $taxClass) {
+    try {
+        /** @var \Magento\Tax\Model\ClassModel $taxClassEntity */
+        $taxClassEntity = $objectManager->create(\Magento\Tax\Model\ClassModel::class);
+        $resourceModel->load($taxClassEntity, $taxClass, 'class_name');
+        $resourceModel->delete($taxClassEntity);
+    } catch (\Magento\Framework\Exception\CouldNotDeleteException $couldNotDeleteException) {
+        // It's okay if the entity already wiped from the database
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al.php
new file mode 100644
index 0000000000000..232ee89f82348
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$taxRate = [
+    'tax_country_id' => 'US',
+    'tax_region_id' => '1',
+    'tax_postcode' => '*',
+    'code' => 'US-AL-*-Rate-1',
+    'rate' => '7.5',
+];
+$rate = $objectManager->create(\Magento\Tax\Model\Calculation\Rate::class)->setData($taxRate)->save();
+
+/** @var Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate');
+$registry->register('_fixture/Magento_Tax_Model_Calculation_Rate', $rate);
+//$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rate_AL');
+//$registry->register('_fixture/Magento_Tax_Model_Calculation_Rate_NY_AL', $rate);
+
+$ruleData = [
+    'code' => 'AL Test Rule',
+    'priority' => '0',
+    'position' => '0',
+    'customer_tax_class_ids' => [3],
+    'product_tax_class_ids' => [2],
+    'tax_rate_ids' => [$rate->getId()],
+    'tax_rates_codes' => [$rate->getId() => $rate->getCode()],
+];
+
+$taxRule = $objectManager->create(\Magento\Tax\Model\Calculation\Rule::class)->setData($ruleData)->save();
+$registry->unregister('_fixture/Magento_Tax_Model_Calculation_Rule');
+$registry->register('_fixture/Magento_Tax_Model_Calculation_Rule', $taxRule);
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
index ed7613f3dd106..6c2c291e6c295 100644
--- a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -57,7 +57,7 @@ public function testImportFromCsvFileWithCorrectData()
     /**
      * @magentoDbIsolation enabled
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage One of the countries has invalid code.
+     * @expectedExceptionMessage Country code is invalid: ZZ
      */
     public function testImportFromCsvFileThrowsExceptionWhenCountryCodeIsInvalid()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
index 5f28698c15bfb..a11cd4b73b5c7 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
@@ -93,13 +93,11 @@ protected function isSkippedArgument(array $argumentData)
                 $typeAttr => 'object',
                 'value' => $prCollection,
             ],
-            [$typeAttr => 'object', 'value' => \Magento\Solr\Model\ResourceModel\Search\Grid\Collection::class],
             [$typeAttr => 'object', 'value' => \Magento\Wishlist\Model\ResourceModel\Item\Collection\Grid::class],
             [
                 $typeAttr => 'object',
                 'value' => \Magento\CustomerSegment\Model\ResourceModel\Segment\Report\Detail\Collection::class
             ],
-            [$typeAttr => 'options', 'model' => \Magento\Solr\Model\Adminhtml\Search\Grid\Options::class],
             [$typeAttr => 'options', 'model' => \Magento\Logging\Model\ResourceModel\Grid\ActionsGroup::class],
             [$typeAttr => 'options', 'model' => \Magento\Logging\Model\ResourceModel\Grid\Actions::class],
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/RouteConfigFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/RouteConfigFilesTest.php
index 2dd0a916f20de..5559d6c43feb8 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/RouteConfigFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/RouteConfigFilesTest.php
@@ -61,7 +61,7 @@ public function testRouteConfigsValidation()
             $files = array_merge($files, glob($mask));
         }
         $mergedConfig = new \Magento\Framework\Config\Dom(
-            '<config></config>',
+            '<config><router/></config>',
             $this->validationStateMock,
             $this->_idAttributes
         );
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
index 46036faa99fca..eee166ab341a9 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
@@ -6,8 +6,11 @@
 
 namespace Magento\Test\Integrity;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 /**
  * An integrity test that searches for references to static files and asserts that they are resolved via fallback
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class StaticFilesTest extends \PHPUnit\Framework\TestCase
 {
@@ -36,6 +39,23 @@ class StaticFilesTest extends \PHPUnit\Framework\TestCase
      */
     private $baseTheme;
 
+    /**
+     * @var \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative
+     */
+    private $alternativeResolver;
+
+    /**
+     * Factory for simple rule
+     *
+     * @var \Magento\Framework\View\Design\Fallback\Rule\SimpleFactory
+     */
+    private $simpleFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
     protected function setUp()
     {
         $om = \Magento\TestFramework\Helper\Bootstrap::getObjectmanager();
@@ -46,12 +66,17 @@ protected function setUp()
         $this->themeRepo = $om->get(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
         $this->design = $om->get(\Magento\Framework\View\DesignInterface::class);
         $this->baseTheme = $om->get(\Magento\Framework\View\Design\ThemeInterface::class);
+        $this->alternativeResolver = $om->get(
+            \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative::class
+        );
+        $this->simpleFactory = $om->get(\Magento\Framework\View\Design\Fallback\Rule\SimpleFactory::class);
+        $this->filesystem = $om->get(\Magento\Framework\Filesystem::class);
     }
 
     /**
      * Scan references to files from other static files and assert they are correct
      *
-     * The CSS or LESS files may refer to other resources using @import or url() notation
+     * The CSS or LESS files may refer to other resources using `import` or url() notation
      * We want to check integrity of all these references
      * Note that the references may have syntax specific to the Magento preprocessing subsystem
      *
@@ -93,8 +118,17 @@ public function testReferencesFromStaticFiles($area, $themePath, $locale, $modul
                 $relatedPath = \Magento\Framework\View\FileSystem::getRelatedPath($filePath, $relatedResource);
             }
             // the $relatedPath will be suitable for feeding to the fallback system
+            $staticFile = $this->getStaticFile($area, $themePath, $locale, $relatedPath, $fallbackModule);
+            if (empty($staticFile) && substr($relatedPath, 0, 2) === '..') {
+                //check if static file exists on lib level
+                $path = substr($relatedPath, 2);
+                $libDir = rtrim($this->filesystem->getDirectoryRead(DirectoryList::LIB_WEB)->getAbsolutePath(), '/');
+                $rule = $this->simpleFactory->create(['pattern' => $libDir]);
+                $params = ['area' => $area, 'theme' => $themePath, 'locale' => $locale];
+                $staticFile = $this->alternativeResolver->resolveFile($rule, $path, $params);
+            }
             $this->assertNotEmpty(
-                $this->getStaticFile($area, $themePath, $locale, $relatedPath, $fallbackModule),
+                $staticFile,
                 "The related resource cannot be resolved through fallback: '{$relatedResource}'"
             );
         }
@@ -132,7 +166,7 @@ private function getDefaultThemePath($area)
      * @param bool $isExplicit
      * @return bool|string
      */
-    private function getStaticFile($area, $theme, $locale, $filePath, $module, $isExplicit = false)
+    private function getStaticFile($area, $theme, $locale, $filePath, $module = null, $isExplicit = false)
     {
         if ($area == 'base') {
             $theme = $this->baseTheme;
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
index a55ca821cba60..cb684c0216889 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Theme\Controller\Adminhtml\System\Design\Config;
 
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
@@ -14,6 +15,11 @@
  */
 class SaveTest extends AbstractBackendController
 {
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
     /**
      * @inheritdoc
      */
@@ -24,6 +30,19 @@ class SaveTest extends AbstractBackendController
      */
     protected $uri = 'backend/theme/design_config/save';
 
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->formKey = $this->_objectManager->get(
+            FormKey::class
+        );
+        $this->httpMethod = Http::METHOD_POST;
+    }
+
     /**
      * Test design configuration save valid values.
      *
@@ -67,7 +86,7 @@ private function getRequestParams()
             'header_logo_height' => '',
             'header_logo_alt' => '',
             'header_welcome' => 'Default welcome msg!',
-            'footer_copyright' => 'Copyright © 2013-2017 Magento, Inc. All rights reserved.',
+            'footer_copyright' => 'Copyright © 2013-present Magento, Inc. All rights reserved.',
             'footer_absolute_footer' => '',
             'default_robots' => 'INDEX,FOLLOW',
             'custom_instructions' => '',
@@ -89,7 +108,21 @@ private function getRequestParams()
             'watermark_swatch_image_imageOpacity' => '',
             'watermark_swatch_image_position' => 'stretch',
             'scope' => 'default',
-            'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+            'form_key' => $this->formKey->getFormKey(),
         ];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->getRequest()->setParams(
+            [
+                'form_key' => $this->formKey->getFormKey()
+            ]
+        );
+
+        parent::testAclHasAccess();
+    }
 }
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 0000000000000..01c8ebca57ac2
--- /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/Theme/Model/Config/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php
index 5f3a1a1706d62..7e54d4f74c9e1 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Model\Config;
 
 use Magento\Email\Model\Template;
@@ -56,7 +57,6 @@ protected function setUp()
     /**
      * @magentoDataFixture Magento/Email/Model/_files/email_template.php
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a
      */
     public function testValidateHasRecursiveReference()
     {
@@ -95,6 +95,11 @@ public function testValidateHasRecursiveReference()
         $designElementMock->expects($this->once())->method('getValue')->willReturn($this->templateModel->getId());
 
         $this->model->validate($designConfigMock);
+
+        $this->expectExceptionMessage(
+            'The "email_header_template" template contains an incorrect configuration, with a reference to itself. '
+            . 'Remove or change the reference, then try again.'
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/Design/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Design/ConfigTest.php
new file mode 100644
index 0000000000000..0ff43a5fd41ca
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Design/ConfigTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Theme\Model\Design;
+
+/**
+ * Test for \Magento\Theme\Model\Design\Config\Storage.
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Theme\Model\Design\Config\Storage
+     */
+    private $storage;
+
+    protected function setUp()
+    {
+        $this->storage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Theme\Model\Design\Config\Storage::class
+        );
+    }
+
+    /**
+     * Test design/header/welcome if it is saved in db as empty(null) it should be shown on backend as empty.
+     *
+     * @magentoDataFixture Magento/Theme/_files/config_data.php
+     */
+    public function testLoad()
+    {
+        $data = $this->storage->load('stores', 1);
+        foreach ($data->getExtensionAttributes()->getDesignConfigData() as $configData) {
+            if ($configData->getPath() == 'design/header/welcome') {
+                $this->assertSame('', $configData->getValue());
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Theme/_files/config_data.php b/dev/tests/integration/testsuite/Magento/Theme/_files/config_data.php
new file mode 100644
index 0000000000000..b8cbebc1f67c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/config_data.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Config\Model\Config\Factory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Factory $configFactory */
+$configFactory = $objectManager->create(Factory::class);
+/** @var \Magento\Config\Model\Config $config */
+$config = $configFactory->create();
+$config->setScope('stores');
+$config->setStore('default');
+$config->setDataByPath('design/header/welcome', null);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Theme/_files/config_data_rollback.php b/dev/tests/integration/testsuite/Magento/Theme/_files/config_data_rollback.php
new file mode 100644
index 0000000000000..ac02e98b49373
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/config_data_rollback.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\App\ResourceConnection $resource */
+$resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$tableName = $resource->getTableName('core_config_data');
+
+$connection->query("DELETE FROM $tableName WHERE path = 'design/header/welcome';");
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 0000000000000..13693ffc9814b
--- /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/Ui/Component/ConfigurationTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/ConfigurationTest.php
index 8a8ba9db564a2..826afe82e2bb6 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/ConfigurationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/ConfigurationTest.php
@@ -7,13 +7,17 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentFile;
+use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\DirSearch;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Ui\Config\Reader\DefinitionMap;
-use Magento\Framework\Component\ComponentRegistrar;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ConfigurationTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -26,6 +30,11 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
      */
     private $appDir;
 
+    /**
+     * @var ReadInterface
+     */
+    private $rootDir;
+
     /**
      * @var \DOMDocument
      */
@@ -67,6 +76,7 @@ public function setUp()
         /** @var Filesystem $filesystem */
         $filesystem = $objectManager->create(Filesystem::class);
         $this->appDir = $filesystem->getDirectoryRead(DirectoryList::APP);
+        $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
     /**
@@ -84,7 +94,14 @@ public function testConfiguration()
         /** @var ComponentFile $file */
         foreach ($uiConfigurationFiles as $file) {
             $this->currentFile = $file;
-            $content = $this->appDir->readFile($this->appDir->getRelativePath($file->getFullPath()));
+            $fullPath = $file->getFullPath();
+            // by default search files in `app` directory but Magento can be installed via composer
+            // or some modules can be in `vendor` directory (like bundled extensions)
+            try {
+                $content = $this->appDir->readFile($this->appDir->getRelativePath($fullPath));
+            } catch (FileSystemException $e) {
+                $content = $this->rootDir->readFile($this->rootDir->getRelativePath($fullPath));
+            }
             $this->assertConfigurationSemantic($this->getDom($content), $result);
         }
         if (!empty($result)) {
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Config/ConverterTest.php b/dev/tests/integration/testsuite/Magento/Ui/Config/ConverterTest.php
index eedb2c1f9c5f4..3f5766eb3f478 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Config/ConverterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Config/ConverterTest.php
@@ -88,6 +88,7 @@ public function getComponentNameDataProvider()
             ['form'],
             ['hidden'],
             ['htmlContent'],
+            ['imageUploader'],
             ['input'],
             ['insertForm'],
             ['insertListing'],
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php b/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php
new file mode 100644
index 0000000000000..dbe721a76e2c6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Controller\Adminhtml\Index\Renderer;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\AuthorizationInterface;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class HandleTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @magentoDataFixture  Magento/Customer/_files/customer.php
+     */
+    public function testExecuteWhenUserDoesNotHavePermission()
+    {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                AuthorizationInterface::class => \Magento\Ui\Model\AuthorizationMock::class
+            ]
+        ]);
+        $this->getRequest()->setParam('handle', 'customer_index_index');
+        $this->getRequest()->setParam('namespace', 'customer_listing');
+        $this->getRequest()->setParam('sorting%5Bfield%5D', 'entity_id');
+        $this->getRequest()->setParam('paging%5BpageSize%5D', 20);
+        $this->getRequest()->setParam('isAjax', 1);
+        $this->dispatch('backend/mui/index/render_handle');
+        $output = $this->getResponse()->getBody();
+        $this->assertEmpty($output, 'The acl restriction wasn\'t applied properly');
+    }
+
+    /**
+     * @magentoDataFixture  Magento/Customer/_files/customer.php
+     */
+    public function testExecuteWhenUserHasPermission()
+    {
+        $this->getRequest()->setParam('handle', 'customer_index_index');
+        $this->getRequest()->setParam('namespace', 'customer_listing');
+        $this->getRequest()->setParam('sorting%5Bfield%5D', 'entity_id');
+        $this->getRequest()->setParam('paging%5BpageSize%5D', 20);
+        $this->getRequest()->setParam('isAjax', 1);
+        $this->dispatch('backend/mui/index/render_handle');
+        $output = $this->getResponse()->getBody();
+        $this->assertNotEmpty($output, 'The acl restriction wasn\'t applied properly');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php b/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php
new file mode 100644
index 0000000000000..76f472f30eb1f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.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;
+
+/**
+ * Class AuthorizationMock
+ */
+class AuthorizationMock extends \Magento\Framework\Authorization
+{
+    /**
+     * Check current user permission on resource and privilege
+     *
+     * @param   string $resource
+     * @param   string $privilege
+     * @return  boolean
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function isAllowed($resource, $privilege = null)
+    {
+        return $resource !== 'Magento_Customer::manage';
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/arbitrary/imageUploader.xml b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/arbitrary/imageUploader.xml
new file mode 100644
index 0000000000000..5cb50c2488773
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/arbitrary/imageUploader.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details. 
+ */
+-->
+<imageUploader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="config" xsi:type="array">
+            <item name="isMultipleFiles" xsi:type="boolean">false</item>
+            <item name="maxFileSize" xsi:type="number">0</item>
+            <item name="placeholderType" xsi:type="string">string</item>
+            <item name="allowedExtensions" xsi:type="string">string</item>
+            <item name="previewTmpl" xsi:type="string">string</item>
+            <item name="dropZone" xsi:type="string">string</item>
+            <item name="uploaderConfig" xsi:type="array">
+                <item name="anySimpleType" active="false" xsi:type="string">string</item>
+            </item>
+            <item name="openDialogTitle" xsi:type="string" translate="true">string</item>
+            <item name="initialMediaGalleryOpenSubpath" xsi:type="string">string</item>
+            <item name="visible" xsi:type="boolean">false</item>
+            <item name="disabled" xsi:type="boolean">false</item>
+            <item name="labelVisible" xsi:type="boolean">false</item>
+            <item name="showFallbackReset" xsi:type="boolean">false</item>
+            <item name="focused" xsi:type="boolean">false</item>
+            <item name="label" xsi:type="string" translate="true">string</item>
+            <item name="dataType" xsi:type="string">string</item>
+            <item name="elementTmpl" xsi:type="string">string</item>
+            <item name="tooltipTpl" xsi:type="string">string</item>
+            <item name="fallbackResetTpl" xsi:type="string">string</item>
+            <item name="placeholder" xsi:type="string" translate="true">text</item>
+            <item name="validation" xsi:type="array">
+                <item name="anySimpleType" active="false" xsi:type="boolean">true</item>
+            </item>
+            <item name="notice" xsi:type="string" translate="true">string</item>
+            <item name="required" xsi:type="boolean">false</item>
+            <item name="switcherConfig" xsi:type="array">
+                <item name="name" xsi:type="string">string</item>
+                <item name="component" xsi:type="string">string</item>
+                <item name="target" xsi:type="string">string</item>
+                <item name="property" xsi:type="string">string</item>
+                <item name="enabled" xsi:type="boolean">true</item>
+                <item name="rules" xsi:type="array">
+                    <item name="string" xsi:type="array">
+                        <item name="value" xsi:type="string">string</item>
+                        <item name="actions" xsi:type="array">
+                            <item name="string" xsi:type="array">
+                                <item name="target" xsi:type="string">string</item>
+                                <item name="callback" xsi:type="string">string</item>
+                                <item name="params" xsi:type="array">
+                                    <item name="string" active="true" xsi:type="string"/>
+                                </item>
+                            </item>
+                        </item>
+                    </item>
+                </item>
+            </item>
+            <item name="tooltip" xsi:type="array">
+                <item name="link" xsi:type="string">string</item>
+                <item name="description" xsi:type="string" translate="true">string</item>
+            </item>
+            <item name="additionalClasses" xsi:type="array">
+                <item name="string" xsi:type="boolean">false</item>
+            </item>
+            <item name="addbefore" xsi:type="string" translate="true">string</item>
+            <item name="addafter" xsi:type="string" translate="true">string</item>
+            <item name="provider" xsi:type="string">string</item>
+            <item name="component" xsi:type="string">string</item>
+            <item name="template" xsi:type="string">string</item>
+            <item name="sortOrder" xsi:type="number">0</item>
+            <item name="displayArea" xsi:type="string">string</item>
+            <item name="storageConfig" xsi:type="array">
+                <item name="provider" xsi:type="string">string</item>
+                <item name="namespace" xsi:type="string">string</item>
+                <item name="path" xsi:type="url" path="string">
+                    <param name="string">string</param>
+                </item>
+            </item>
+            <item name="statefull" xsi:type="array">
+                <item name="anySimpleType" xsi:type="boolean">true</item>
+            </item>
+            <item name="imports" xsi:type="array">
+                <item name="string" xsi:type="string">string</item>
+            </item>
+            <item name="exports" xsi:type="array">
+                <item name="string" xsi:type="string">string</item>
+            </item>
+            <item name="links" xsi:type="array">
+                <item name="string" xsi:type="string">string</item>
+            </item>
+            <item name="listens" xsi:type="array">
+                <item name="string" xsi:type="string">string</item>
+            </item>
+            <item name="ns" xsi:type="string">string</item>
+            <item name="componentType" xsi:type="string">string</item>
+            <item name="dataScope" xsi:type="string">string</item>
+        </item>
+        <item name="js_config" xsi:type="array">
+            <item name="deps" xsi:type="array">
+                <item name="0" xsi:type="string">string</item>
+            </item>
+        </item>
+    </argument>
+</imageUploader>
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/imageUploader.php b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/imageUploader.php
new file mode 100644
index 0000000000000..e4f783583f760
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/imageUploader.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'arguments' => [
+        'data' => [
+            'name' => 'data',
+            'xsi:type' => 'array',
+            'item' => [
+                'config' => [
+                    'name' => 'config',
+                    'xsi:type' => 'array',
+                    'item' => [
+                        'isMultipleFiles' => [
+                            'name' => 'isMultipleFiles',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'maxFileSize' => [
+                            'name' => 'maxFileSize',
+                            'xsi:type' => 'number',
+                            'value' => '0',
+                        ],
+                        'placeholderType' => [
+                            'name' => 'placeholderType',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'allowedExtensions' => [
+                            'name' => 'allowedExtensions',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'previewTmpl' => [
+                            'name' => 'previewTmpl',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'dropZone' => [
+                            'name' => 'dropZone',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'openDialogTitle' => [
+                            'name' => 'openDialogTitle',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                            'translate' => 'true'
+                        ],
+                        'initialMediaGalleryOpenSubpath' => [
+                            'name' => 'initialMediaGalleryOpenSubpath',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'uploaderConfig' => [
+                            'name' => 'uploaderConfig',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'anySimpleType' => [
+                                    'name' => 'anySimpleType',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                    'active' => 'false',
+                                ],
+                            ],
+                        ],
+                        'visible' => [
+                            'name' => 'visible',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'disabled' => [
+                            'name' => 'disabled',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'labelVisible' => [
+                            'name' => 'labelVisible',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'showFallbackReset' => [
+                            'name' => 'showFallbackReset',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'focused' => [
+                            'name' => 'focused',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'label' => [
+                            'name' => 'label',
+                            'translate' => 'true',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'dataType' => [
+                            'name' => 'dataType',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'elementTmpl' => [
+                            'name' => 'elementTmpl',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'tooltipTpl' => [
+                            'name' => 'tooltipTpl',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'fallbackResetTpl' => [
+                            'name' => 'fallbackResetTpl',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'placeholder' => [
+                            'name' => 'placeholder',
+                            'xsi:type' => 'string',
+                            'value' => 'text',
+                            'translate' => 'true',
+                        ],
+                        'validation' => [
+                            'name' => 'validation',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'anySimpleType' => [
+                                    'name' => 'anySimpleType',
+                                    'xsi:type' => 'boolean',
+                                    'value' => 'true',
+                                    'active' => 'false',
+                                ],
+                            ],
+                        ],
+                        'notice' => [
+                            'name' => 'notice',
+                            'translate' => 'true',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'required' => [
+                            'name' => 'required',
+                            'xsi:type' => 'boolean',
+                            'value' => 'false',
+                        ],
+                        'switcherConfig' => [
+                            'name' => 'switcherConfig',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'name' => [
+                                    'name' => 'name',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'component' => [
+                                    'name' => 'component',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'target' => [
+                                    'name' => 'target',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'property' => [
+                                    'name' => 'property',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'enabled' => [
+                                    'name' => 'enabled',
+                                    'xsi:type' => 'boolean',
+                                    'value' => 'true',
+                                ],
+                                'rules' => [
+                                    'name' => 'rules',
+                                    'xsi:type' => 'array',
+                                    'item' => [
+                                        'string' => [
+                                            'name' => 'string',
+                                            'xsi:type' => 'array',
+                                            'item' => [
+                                                'value' => [
+                                                    'name' => 'value',
+                                                    'xsi:type' => 'string',
+                                                    'value' => 'string',
+                                                ],
+                                                'actions' => [
+                                                    'name' => 'actions',
+                                                    'xsi:type' => 'array',
+                                                    'item' => [
+                                                        'string' => [
+                                                            'name' => 'string',
+                                                            'xsi:type' => 'array',
+                                                            'item' => [
+                                                                'target' => [
+                                                                    'name' => 'target',
+                                                                    'xsi:type' => 'string',
+                                                                    'value' => 'string',
+                                                                ],
+                                                                'callback' => [
+                                                                    'name' => 'callback',
+                                                                    'xsi:type' => 'string',
+                                                                    'value' => 'string',
+                                                                ],
+                                                                'params' => [
+                                                                    'name' => 'params',
+                                                                    'xsi:type' => 'array',
+                                                                    'item' => [
+                                                                        'string' => [
+                                                                            'name' => 'string',
+                                                                            'active' => 'true',
+                                                                            'xsi:type' => 'string',
+                                                                        ],
+                                                                    ],
+                                                                ],
+                                                            ],
+                                                        ],
+                                                    ],
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                        'tooltip' => [
+                            'name' => 'tooltip',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'link' => [
+                                    'name' => 'link',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'description' => [
+                                    'name' => 'description',
+                                    'translate' => 'true',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                            ],
+                        ],
+                        'additionalClasses' => [
+                            'name' => 'additionalClasses',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'string' => [
+                                    'name' => 'string',
+                                    'xsi:type' => 'boolean',
+                                    'value' => 'false',
+                                ],
+                            ],
+                        ],
+                        'addbefore' => [
+                            'name' => 'addbefore',
+                            'translate' => 'true',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'addafter' => [
+                            'name' => 'addafter',
+                            'translate' => 'true',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'provider' => [
+                            'name' => 'provider',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'component' => [
+                            'name' => 'component',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'template' => [
+                            'name' => 'template',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'sortOrder' => [
+                            'name' => 'sortOrder',
+                            'xsi:type' => 'number',
+                            'value' => '0',
+                        ],
+                        'displayArea' => [
+                            'name' => 'displayArea',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'storageConfig' => [
+                            'name' => 'storageConfig',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'provider' => [
+                                    'name' => 'provider',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'namespace' => [
+                                    'name' => 'namespace',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                                'path' => [
+                                    'name' => 'path',
+                                    'xsi:type' => 'url',
+                                    'param' => [
+                                        'string' => [
+                                            'name' => 'string',
+                                            'value' => 'string',
+                                        ],
+                                    ],
+                                    'path' => 'string',
+                                ],
+                            ],
+                        ],
+                        'statefull' => [
+                            'name' => 'statefull',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'anySimpleType' => [
+                                    'name' => 'anySimpleType',
+                                    'xsi:type' => 'boolean',
+                                    'value' => 'true',
+                                ],
+                            ],
+                        ],
+                        'imports' => [
+                            'name' => 'imports',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'string' => [
+                                    'name' => 'string',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                            ],
+                        ],
+                        'exports' => [
+                            'name' => 'exports',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'string' => [
+                                    'name' => 'string',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                            ],
+                        ],
+                        'links' => [
+                            'name' => 'links',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'string' => [
+                                    'name' => 'string',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                            ],
+                        ],
+                        'listens' => [
+                            'name' => 'listens',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                'string' => [
+                                    'name' => 'string',
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                            ],
+                        ],
+                        'ns' => [
+                            'name' => 'ns',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'componentType' => [
+                            'name' => 'componentType',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                        'dataScope' => [
+                            'name' => 'dataScope',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
+                    ],
+                ],
+                'js_config' => [
+                    'name' => 'js_config',
+                    'xsi:type' => 'array',
+                    'item' => [
+                        'deps' => [
+                            'name' => 'deps',
+                            'xsi:type' => 'array',
+                            'item' => [
+                                0 => [
+                                    'name' => 0,
+                                    'xsi:type' => 'string',
+                                    'value' => 'string',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
+    'children' => [],
+    'uiComponentType' => 'imageUploader',
+];
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/mixed/imageUploader.xml b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/mixed/imageUploader.xml
new file mode 100644
index 0000000000000..0b0d6d22e9316
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/mixed/imageUploader.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<imageUploader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd"
+              name="string"
+              template="string"
+              component="string"
+              class="string"
+              provider="string"
+              sortOrder="0"
+              displayArea="string">
+    <settings>
+
+        <!-- uiElementSettings -->
+        <statefull>
+            <property xsi:type="boolean" name="anySimpleType">true</property>
+        </statefull>
+        <imports>
+            <link active="false" name="string">string</link>
+        </imports>
+        <exports>
+            <link active="false" name="string">string</link>
+        </exports>
+        <links>
+            <link active="false" name="string">string</link>
+        </links>
+        <listens>
+            <link active="false" name="string">string</link>
+        </listens>
+        <deps>
+            <dep active="false">string</dep>
+        </deps>
+        <ns>string</ns>
+        <componentType>string</componentType>
+        <dataScope>string</dataScope>
+        <storageConfig>
+            <provider>string</provider>
+            <namespace>string</namespace>
+            <path path="string">
+                <param name="string">string</param>
+            </path>
+        </storageConfig>
+        <!-- /uiElementSettings -->
+
+        <!-- abstractSettings-->
+        <additionalClasses>
+            <class name="string">false</class>
+        </additionalClasses>
+        <label translate="false">string</label>
+        <addBefore translate="false">string</addBefore>
+        <addAfter translate="false">string</addAfter>
+        <dataType>string</dataType>
+        <elementTmpl>string</elementTmpl>
+        <visible>false</visible>
+        <disabled>false</disabled>
+        <notice translate="false">string</notice>
+        <focused>false</focused>
+        <tooltipTpl>string</tooltipTpl>
+        <fallbackResetTpl>string</fallbackResetTpl>
+        <placeholder translate="true">text</placeholder>
+        <labelVisible>false</labelVisible>
+        <showFallbackReset>false</showFallbackReset>
+        <required>false</required>
+        <validation>
+            <rule xsi:type="boolean" active="false" name="anySimpleType">true</rule>
+        </validation>
+        <switcherConfig>
+            <component>string</component>
+            <name>string</name>
+            <target>string</target>
+            <property>string</property>
+            <enabled>true</enabled>
+            <argument name="string" xsi:type="array">
+                <item name="string" xsi:type="string">string</item>
+            </argument>
+            <rules>
+                <rule name="string">
+                    <value>string</value>
+                    <actions>
+                        <action name="string">
+                            <target>string</target>
+                            <callback>string</callback>
+                            <params>
+                                <param name="string" active="true" xsi:type="string"/>
+                            </params>
+                        </action>
+                    </actions>
+                </rule>
+            </rules>
+        </switcherConfig>
+        <tooltip>
+            <link>string</link>
+            <description translate="true">string</description>
+        </tooltip>
+
+        <!-- /abstractSettings-->
+        <isMultipleFiles>false</isMultipleFiles>
+        <maxFileSize>0</maxFileSize>
+        <placeholderType>string</placeholderType>
+        <allowedExtensions>string</allowedExtensions>
+        <previewTmpl>string</previewTmpl>
+        <dropZone>string</dropZone>
+        <uploaderConfig>
+            <param xsi:type="string" active="false" name="anySimpleType">
+                string
+            </param>
+        </uploaderConfig>
+
+        <openDialogTitle>string</openDialogTitle>
+        <initialMediaGalleryOpenSubpath>string</initialMediaGalleryOpenSubpath>
+    </settings>
+</imageUploader>
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/semantic/imageUploader.xml b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/semantic/imageUploader.xml
new file mode 100644
index 0000000000000..e51f42d8667b1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/semantic/imageUploader.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<imageUploader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd"
+       name="string"
+       template="string"
+       component="string"
+       class="string"
+       provider="string"
+       sortOrder="0"
+       displayArea="string">
+    <settings>
+
+        <!-- uiElementSettings -->
+        <statefull>
+            <property xsi:type="boolean" name="anySimpleType">true</property>
+        </statefull>
+        <imports>
+            <link active="false" name="string">string</link>
+        </imports>
+        <exports>
+            <link active="false" name="string">string</link>
+        </exports>
+        <links>
+            <link active="false" name="string">string</link>
+        </links>
+        <listens>
+            <link active="false" name="string">string</link>
+        </listens>
+        <deps>
+            <dep active="false">string</dep>
+        </deps>
+        <ns>string</ns>
+        <componentType>string</componentType>
+        <dataScope>string</dataScope>
+        <storageConfig>
+            <provider>string</provider>
+            <namespace>string</namespace>
+            <path path="string">
+                <param name="string">string</param>
+            </path>
+        </storageConfig>
+        <!-- /uiElementSettings -->
+
+        <!-- abstractSettings-->
+        <additionalClasses>
+            <class name="string">false</class>
+        </additionalClasses>
+        <label translate="false">string</label>
+        <addBefore translate="false">string</addBefore>
+        <addAfter translate="false">string</addAfter>
+        <dataType>string</dataType>
+        <elementTmpl>string</elementTmpl>
+        <visible>false</visible>
+        <disabled>false</disabled>
+        <notice translate="false">string</notice>
+        <focused>false</focused>
+        <tooltipTpl>string</tooltipTpl>
+        <fallbackResetTpl>string</fallbackResetTpl>
+        <placeholder translate="true">text</placeholder>
+        <labelVisible>false</labelVisible>
+        <showFallbackReset>false</showFallbackReset>
+        <required>false</required>
+        <validation>
+            <rule xsi:type="boolean" active="false" name="anySimpleType">true</rule>
+        </validation>
+        <switcherConfig>
+            <component>string</component>
+            <name>string</name>
+            <target>string</target>
+            <property>string</property>
+            <enabled>true</enabled>
+            <argument name="string" xsi:type="array">
+                <item name="string" xsi:type="string">string</item>
+            </argument>
+            <rules>
+                <rule name="string">
+                    <value>string</value>
+                    <actions>
+                        <action name="string">
+                            <target>string</target>
+                            <callback>string</callback>
+                            <params>
+                                <param name="string" active="true" xsi:type="string"/>
+                            </params>
+                        </action>
+                    </actions>
+                </rule>
+            </rules>
+        </switcherConfig>
+        <tooltip>
+            <link>string</link>
+            <description translate="true">string</description>
+        </tooltip>
+
+        <!-- /abstractSettings-->
+        <isMultipleFiles>false</isMultipleFiles>
+        <maxFileSize>0</maxFileSize>
+        <placeholderType>string</placeholderType>
+        <allowedExtensions>string</allowedExtensions>
+        <previewTmpl>string</previewTmpl>
+        <dropZone>string</dropZone>
+
+        <uploaderConfig>
+            <param xsi:type="string" active="false" name="anySimpleType">
+                string
+            </param>
+        </uploaderConfig>
+
+        <openDialogTitle>string</openDialogTitle>
+        <initialMediaGalleryOpenSubpath>string</initialMediaGalleryOpenSubpath>
+    </settings>
+</imageUploader>
diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
index a9f6752c9de82..aa301e8d3e423 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -5,20 +5,27 @@
  */
 namespace Magento\Ups\Model;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+
 class CarrierTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Ups\Model\Carrier
+     * @var Carrier
      */
     private $carrier;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
-        $this->carrier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Ups\Model\Carrier::class
-        );
+        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class);
     }
 
+    /**
+     * @return void
+     */
     public function testGetShipAcceptUrl()
     {
         $this->assertEquals('https://wwwcie.ups.com/ups.app/xml/ShipAccept', $this->carrier->getShipAcceptUrl());
@@ -34,6 +41,9 @@ public function testGetShipAcceptUrlLive()
         $this->assertEquals('https://onlinetools.ups.com/ups.app/xml/ShipAccept', $this->carrier->getShipAcceptUrl());
     }
 
+    /**
+     * @return void
+     */
     public function testGetShipConfirmUrl()
     {
         $this->assertEquals('https://wwwcie.ups.com/ups.app/xml/ShipConfirm', $this->carrier->getShipConfirmUrl());
@@ -51,4 +61,27 @@ public function testGetShipConfirmUrlLive()
             $this->carrier->getShipConfirmUrl()
         );
     }
+
+    /**
+     * @magentoConfigFixture current_store carriers/ups/active 1
+     * @magentoConfigFixture current_store carriers/ups/allowed_methods 1DA,GND
+     * @magentoConfigFixture current_store carriers/ups/free_method GND
+     */
+    public function testCollectFreeRates()
+    {
+        $rateRequest = Bootstrap::getObjectManager()->get(RateRequestFactory::class)->create();
+        $rateRequest->setDestCountryId('US');
+        $rateRequest->setDestRegionId('CA');
+        $rateRequest->setDestPostcode('90001');
+        $rateRequest->setPackageQty(1);
+        $rateRequest->setPackageWeight(1);
+        $rateRequest->setFreeMethodWeight(0);
+        $rateRequest->setLimitCarrier($this->carrier::CODE);
+        $rateRequest->setFreeShipping(true);
+        $rateResult = $this->carrier->collectRates($rateRequest);
+        $result = $rateResult->asArray();
+        $methods = $result[$this->carrier::CODE]['methods'];
+        $this->assertEquals(0, $methods['GND']['price']);
+        $this->assertNotEquals(0, $methods['1DA']['price']);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php
index 7538942065d16..751a91b932a16 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\UrlRewrite\Block\Catalog\Category;
 
 /**
@@ -56,7 +57,27 @@ public function testGetTreeArrayApostropheReplaced()
         $tree = $this->_treeBlock->getTreeArray();
 
         $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']);
-        $this->assertEquals('&#039;Category 6&#039;', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertEquals(
+            '&#039;Category 6&#039;',
+            $tree['children'][0]['children'][0]['children'][0]['name']
+        );
+    }
+
+    /**
+     * Test that the getTreeArray() method scrubs single quotes and apostrophes from names
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_doublequotes.php
+     */
+    public function testGetTreeArrayDoubleQuotesReplaced()
+    {
+        $tree = $this->_treeBlock->getTreeArray();
+
+        $this->assertNotContains('\"', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertEquals(
+            '&quot;Category 6&quot;',
+            $tree['children'][0]['children'][0]['children'][0]['name']
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
index a356406a95a65..5593cecb10d91 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,19 +19,32 @@ 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'
+        );
     }
 
+    /**
+     * @return array
+     */
     public function requestDataProvider()
     {
         return [
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
new file mode 100644
index 0000000000000..2cb86358667c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewrite\Model\StoreSwitcher;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreSwitcher;
+use Magento\Framework\ObjectManagerInterface as ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class RewriteUrlTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var StoreSwitcher
+     */
+    private $storeSwitcher;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * Class dependencies initialization
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->storeSwitcher = $this->objectManager->get(StoreSwitcher::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @return void
+     * @throws StoreSwitcher\CannotSwitchStoreException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testSwitchToNonExistingPage(): void
+    {
+        $fromStoreCode = 'default';
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $fromStore = $storeRepository->get($fromStoreCode);
+
+        $toStoreCode = 'fixture_second_store';
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $toStore = $storeRepository->get($toStoreCode);
+
+        $this->setBaseUrl($toStore);
+
+        $product = $this->productRepository->get('simple333');
+
+        $redirectUrl = "http://domain.com/{$product->getUrlKey()}.html";
+        $expectedUrl = $toStore->getBaseUrl();
+
+        $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
+    }
+
+    /**
+     * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
+     * @return void
+     * @throws StoreSwitcher\CannotSwitchStoreException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testSwitchToExistingPage(): void
+    {
+        $fromStoreCode = 'default';
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $fromStore = $storeRepository->get($fromStoreCode);
+
+        $toStoreCode = 'fixture_second_store';
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $toStore = $storeRepository->get($toStoreCode);
+
+        $redirectUrl = $expectedUrl = "http://localhost/page-c";
+
+        $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
+    }
+
+    /**
+     * Set base url to store.
+     *
+     * @param StoreInterface $targetStore
+     * @return void
+     */
+    private function setBaseUrl(StoreInterface $targetStore): void
+    {
+        $configValue = $this->objectManager->create(Value::class);
+        $configValue->load('web/unsecure/base_url', 'path');
+        $baseUrl = 'http://domain.com/';
+        if (!$configValue->getPath()) {
+            $configValue->setPath('web/unsecure/base_url');
+        }
+        $configValue->setValue($baseUrl);
+        $configValue->setScope(ScopeInterface::SCOPE_STORES);
+        $configValue->setScopeId($targetStore->getId());
+        $configValue->save();
+
+        $reinitibleConfig = $this->objectManager->create(ReinitableConfigInterface::class);
+        $reinitibleConfig->reinit();
+    }
+}
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 37cb86aff3be8..8e82aa853d4a4 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/UrlRewrite/_files/url_rewrite_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
new file mode 100644
index 0000000000000..19cce769b1c19
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var \Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection $urlRewriteCollection */
+$urlRewriteCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection::class);
+$collection = $urlRewriteCollection
+    ->addFieldToFilter('entity_type', 'custom')
+    ->addFieldToFilter('request_path', ['page-a', 'page-b', 'page-c'])
+    ->addFieldToFilter('entity_id', '333')
+    ->load()
+    ->walk('delete');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php
index 1a726c4e2c174..5f4964d042da4 100644
--- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\User\Controller\Adminhtml;
 
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test class for \Magento\User\Controller\Adminhtml\Auth
  *
@@ -35,7 +38,7 @@ public function testForgotpasswordAction()
         $this->dispatch('backend/admin/auth/forgotpassword');
         $this->assertRedirect(
             $this->equalTo(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                Bootstrap::getObjectManager()->get(
                     \Magento\Backend\Helper\Data::class
                 )->getHomePageUrl()
             )
@@ -51,22 +54,25 @@ public function testForgotpasswordAction()
      */
     public function testEmailSendForgotPasswordAction()
     {
-        $transportBuilderMock = $this->prepareEmailMock(
-            1,
-            'admin_emails_forgot_email_template',
-            'general'
+        /** @var TransportBuilderMock $transportMock */
+        $transportMock = Bootstrap::getObjectManager()->get(
+            TransportBuilderMock::class
         );
-        $this->addMockToClass($transportBuilderMock, \Magento\User\Model\User::class);
-
         $this->getRequest()->setPostValue('email', 'adminUser@example.com');
         $this->dispatch('backend/admin/auth/forgotpassword');
         $this->assertRedirect(
             $this->equalTo(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                Bootstrap::getObjectManager()->get(
                     \Magento\Backend\Helper\Data::class
                 )->getHomePageUrl()
             )
         );
+        $message = $transportMock->getSentMessage();
+        $this->assertNotEmpty($message);
+        $this->assertEquals(
+            __('Password Reset Confirmation for %1', ['John Doe'])->render(),
+            $message->getSubject()
+        );
     }
 
     /**
@@ -79,13 +85,13 @@ public function testEmailSendForgotPasswordAction()
     public function testResetPasswordAction()
     {
         /** @var $user \Magento\User\Model\User */
-        $user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $user = Bootstrap::getObjectManager()->create(
             \Magento\User\Model\User::class
         )->loadByUsername(
             'dummy_username'
         );
         $this->assertNotEmpty($user->getId(), 'Broken fixture');
-        $resetPasswordToken = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $resetPasswordToken = Bootstrap::getObjectManager()->get(
             \Magento\User\Helper\Data::class
         )->generateResetPasswordLinkToken();
         $user->changeResetPasswordLinkToken($resetPasswordToken);
@@ -123,7 +129,7 @@ public function testResetPasswordActionWithDummyToken()
      */
     public function testResetPasswordPostAction($password, $passwordConfirmation, $isPasswordChanged)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var $user \Magento\User\Model\User */
         $user = $objectManager->create(\Magento\User\Model\User::class);
@@ -203,7 +209,7 @@ public function testResetPasswordPostActionWithDummyToken()
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var \Magento\Backend\Helper\Data $backendHelper */
         $backendHelper = $objectManager->get(\Magento\Backend\Helper\Data::class);
@@ -218,7 +224,7 @@ public function testResetPasswordPostActionWithDummyToken()
      */
     public function testResetPasswordPostActionWithInvalidPassword()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         $user = $objectManager->create(\Magento\User\Model\User::class);
         $user->loadByUsername('dummy_username');
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
index cfed67b9ddbdb..9cf8fc43951d4 100644
--- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\User\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\TestFramework\Bootstrap;
 
 /**
@@ -34,6 +36,7 @@ public function testIndexAction()
      */
     public function testSaveActionNoData()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/admin/user/save');
         $this->assertRedirect($this->stringContains('backend/admin/user/index/'));
     }
@@ -54,6 +57,7 @@ public function testSaveActionWrongId()
         $userId = $user->getId();
         $this->assertNotEmpty($userId, 'Broken fixture');
         $user->delete();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue('user_id', $userId);
         $this->dispatch('backend/admin/user/save');
         $this->assertSessionMessages(
@@ -71,6 +75,7 @@ public function testSaveActionWrongId()
     public function testSaveActionMissingCurrentAdminPassword()
     {
         $fixture = uniqid();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'username' => $fixture,
@@ -82,7 +87,11 @@ public function testSaveActionMissingCurrentAdminPassword()
             ]
         );
         $this->dispatch('backend/admin/user/save');
-        $this->assertSessionMessages($this->equalTo(['You have entered an invalid password for current user.']));
+        $this->assertSessionMessages(
+            $this->equalTo(
+                ['The password entered for the current user is invalid. Verify the password and try again.']
+            )
+        );
         $this->assertRedirect($this->stringContains('backend/admin/user/edit'));
     }
 
@@ -94,6 +103,7 @@ public function testSaveActionMissingCurrentAdminPassword()
     public function testSaveAction()
     {
         $fixture = uniqid();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'username' => $fixture,
@@ -121,6 +131,7 @@ public function testSaveAction()
      */
     public function testSaveActionDuplicateUser()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'username' => 'adminUser',
@@ -142,13 +153,17 @@ public function testSaveActionDuplicateUser()
     }
 
     /**
-     * Verify password change properly updates fields when the request is valid
+     * Verify password change properly updates fields when the request is valid.
+     *
+     * @param array $postData
+     * @param bool $isPasswordCorrect
      *
      * @magentoDbIsolation enabled
      * @dataProvider saveActionPasswordChangeDataProvider
      */
     public function testSaveActionPasswordChange($postData, $isPasswordCorrect)
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/admin/user/save');
 
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index c0fe917f104db..8b85339afd789 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -316,11 +316,11 @@ public function testHasAssigned2Role()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage User Name is a required field.
-     * @expectedExceptionMessage First Name is a required field.
-     * @expectedExceptionMessage Last Name is a required field.
+     * @expectedExceptionMessage "User Name" is required. Enter and try again.
+     * @expectedExceptionMessage "First Name" is required. Enter and try again.
+     * @expectedExceptionMessage "Last Name" is required. Enter and try again.
      * @expectedExceptionMessage Please enter a valid email.
-     * @expectedExceptionMessage Password is required field.
+     * @expectedExceptionMessage "Password" is required. Enter and try again.
      * @magentoDbIsolation enabled
      */
     public function testBeforeSaveRequiredFieldsValidation()
@@ -498,13 +498,16 @@ public function testPerformIdentityCheck()
      *
      * @magentoDataFixture Magento/User/_files/user_with_role.php
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage You have entered an invalid password for current user.
      */
     public function testPerformIdentityCheckWrongPassword()
     {
         $this->_model->loadByUsername('adminUser');
         $passwordString = 'wrongPassword';
         $this->_model->performIdentityCheck($passwordString);
+
+        $this->expectExceptionMessage(
+            'The password entered for the current user is invalid. Verify the password and try again.'
+        );
     }
 
     /**
@@ -512,11 +515,15 @@ public function testPerformIdentityCheckWrongPassword()
      *
      * @magentoDataFixture Magento/User/_files/locked_users.php
      * @expectedException \Magento\Framework\Exception\State\UserLockedException
-     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testPerformIdentityCheckLockExpires()
     {
         $this->_model->loadByUsername('adminUser2');
         $this->_model->performIdentityCheck(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD);
+
+        $this->expectExceptionMessage(
+            'The account sign-in was incorrect or your account is disabled temporarily. '
+            . 'Please wait and try again later.'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php b/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php
new file mode 100644
index 0000000000000..c4656a4801eaa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Usps/Api/GuestCouponManagementTest.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Usps\Api;
+
+use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\DataObject;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Api\Data\CartItemInterfaceFactory;
+use Magento\Quote\Api\Data\ShippingMethodInterface;
+use Magento\Quote\Api\GuestCartItemRepositoryInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Api\GuestCouponManagementInterface;
+use Magento\Quote\Api\GuestShipmentEstimationInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GuestCouponManagementTest extends TestCase
+{
+    /**
+     * @var GuestCouponManagementInterface
+     */
+    private $management;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ZendClient|MockObject
+     */
+    private $httpClient;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->management = $this->objectManager->get(GuestCouponManagementInterface::class);
+        $clientFactory = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->httpClient = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $clientFactory->method('create')
+            ->willReturn($this->httpClient);
+
+        $this->objectManager->addSharedInstance($clientFactory, ZendClientFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(ZendClientFactory::class);
+    }
+
+    /**
+     * Checks a case when coupon is applied for a guest cart and USPS Priority Mail 1-Day configured as free method.
+     *
+     * @magentoConfigFixture default_store carriers/usps/active 1
+     * @magentoConfigFixture default_store carriers/usps/free_method 1
+     * @magentoDataFixture Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php
+     * @magentoDataFixture Magento/Quote/_files/is_salable_product.php
+     * @return void
+     */
+    public function testFreeShippingWithCoupon(): void
+    {
+        $couponCode = 'IMPHBR852R61';
+        $cartId = $this->createGuestCart();
+
+        $request = new DataObject(['body' => file_get_contents(__DIR__ . '/../Fixtures/rates_response.xml')]);
+        $this->httpClient->method('request')
+            ->willReturn($request);
+
+        self::assertTrue($this->management->set($cartId, $couponCode));
+
+        $methods = $this->estimateShipping($cartId);
+        $methods = $this->filterFreeShippingMethods($methods);
+        self::assertEquals(['Fixed', 'Priority Mail 1-Day'], $methods);
+    }
+
+    /**
+     * Creates guest shopping cart.
+     *
+     * @return string
+     */
+    private function createGuestCart(): string
+    {
+        /** @var GuestCartManagementInterface $cartManagement */
+        $cartManagement = $this->objectManager->get(GuestCartManagementInterface::class);
+        $cartId = $cartManagement->createEmptyCart();
+
+        /** @var CartItemInterfaceFactory $cartItemFactory */
+        $cartItemFactory = $this->objectManager->get(CartItemInterfaceFactory::class);
+
+        /** @var CartItemInterface $cartItem */
+        $cartItem = $cartItemFactory->create();
+        $cartItem->setQuoteId($cartId);
+        $cartItem->setQty(1);
+        $cartItem->setSku('simple-99');
+        $cartItem->setProductType(Type::TYPE_SIMPLE);
+
+        /** @var GuestCartItemRepositoryInterface $itemRepository */
+        $itemRepository = $this->objectManager->get(GuestCartItemRepositoryInterface::class);
+        $itemRepository->save($cartItem);
+
+        return $cartId;
+    }
+
+    /**
+     * Estimates shipment for guest cart.
+     *
+     * @param string $cartId
+     * @return array ShippingMethodInterface[]
+     */
+    private function estimateShipping(string $cartId): array
+    {
+        $addressFactory = $this->objectManager->get(AddressInterfaceFactory::class);
+        /** @var AddressInterface $address */
+        $address = $addressFactory->create();
+        $address->setCountryId('US');
+        $address->setRegionId(12);
+        $address->setPostcode(90230);
+
+        /** @var GuestShipmentEstimationInterface $estimation */
+        $estimation = $this->objectManager->get(GuestShipmentEstimationInterface::class);
+        return $estimation->estimateByExtendedAddress($cartId, $address);
+    }
+
+    /**
+     * Filters free shipping methods.
+     *
+     * @param array $methods
+     * @return array
+     */
+    private function filterFreeShippingMethods(array $methods): array
+    {
+        $result = [];
+        /** @var ShippingMethodInterface $method */
+        foreach ($methods as $method) {
+            if ($method->getAmount() == 0) {
+                $result[] = $method->getMethodTitle();
+            }
+        }
+        return $result;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php
new file mode 100644
index 0000000000000..8d140593677ec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * @var Rule $salesRule
+ * @var Registry $registry
+ */
+require __DIR__ . '/../../SalesRule/_files/cart_rule_free_shipping.php';
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$salesRule->setCouponType(Rule::COUPON_TYPE_SPECIFIC)->setUseAutoGeneration(0);
+$salesRule->save();
+
+$couponCode = 'IMPHBR852R61';
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode($couponCode)
+    ->setType(0);
+$objectManager->get(CouponRepositoryInterface::class)
+    ->save($coupon);
+
+$registry->unregister('cart_rule_free_shipping');
+$registry->register('cart_rule_free_shipping', $salesRule);
diff --git a/dev/tests/integration/testsuite/Magento/Usps/Fixtures/cart_rule_coupon_free_shipping_rollback.php b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/cart_rule_coupon_free_shipping_rollback.php
new file mode 100644
index 0000000000000..17b37e3d024fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/cart_rule_coupon_free_shipping_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../SalesRule/_files/cart_rule_free_shipping_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Usps/Fixtures/rates_response.xml b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/rates_response.xml
new file mode 100644
index 0000000000000..22cf7035e4eae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Usps/Fixtures/rates_response.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<RateV4Response>
+    <Package ID="0">
+        <ZipOrigination>90034</ZipOrigination>
+        <ZipDestination>90230</ZipDestination>
+        <Pounds>1</Pounds>
+        <Ounces>0.00000000</Ounces>
+        <Size>REGULAR</Size>
+        <Machinable>TRUE</Machinable>
+        <Zone>1</Zone>
+        <Postage CLASSID="3">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
+            <Rate>24.70</Rate>
+        </Postage>
+        <Postage CLASSID="2">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Hold For Pickup</MailService>
+            <Rate>24.70</Rate>
+        </Postage>
+        <Postage CLASSID="13">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</MailService>
+            <Rate>24.70</Rate>
+        </Postage>
+        <Postage CLASSID="27">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope Hold For Pickup</MailService>
+            <Rate>24.70</Rate>
+        </Postage>
+        <Postage CLASSID="30">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</MailService>
+            <Rate>24.90</Rate>
+        </Postage>
+        <Postage CLASSID="31">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope Hold For Pickup</MailService>
+            <Rate>24.90</Rate>
+        </Postage>
+        <Postage CLASSID="62">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</MailService>
+            <Rate>25.40</Rate>
+        </Postage>
+        <Postage CLASSID="63">
+            <MailService>Priority Mail Express 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope Hold For Pickup</MailService>
+            <Rate>25.40</Rate>
+        </Postage>
+        <Postage CLASSID="1">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</MailService>
+            <Rate>6.70</Rate>
+        </Postage>
+        <Postage CLASSID="22">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Large Flat Rate Box</MailService>
+            <Rate>18.90</Rate>
+        </Postage>
+        <Postage CLASSID="17">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Medium Flat Rate Box</MailService>
+            <Rate>13.65</Rate>
+        </Postage>
+        <Postage CLASSID="28">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Small Flat Rate Box</MailService>
+            <Rate>7.20</Rate>
+        </Postage>
+        <Postage CLASSID="16">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</MailService>
+            <Rate>6.70</Rate>
+        </Postage>
+        <Postage CLASSID="44">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</MailService>
+            <Rate>7.00</Rate>
+        </Postage>
+        <Postage CLASSID="29">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</MailService>
+            <Rate>7.25</Rate>
+        </Postage>
+        <Postage CLASSID="38">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Gift Card Flat Rate Envelope</MailService>
+            <Rate>6.70</Rate>
+        </Postage>
+        <Postage CLASSID="42">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Small Flat Rate Envelope</MailService>
+            <Rate>6.70</Rate>
+        </Postage>
+        <Postage CLASSID="40">
+            <MailService>Priority Mail 1-Day&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Window Flat Rate Envelope</MailService>
+            <Rate>6.70</Rate>
+        </Postage>
+        <Postage CLASSID="6">
+            <MailService>Media Mail Parcel</MailService>
+            <Rate>2.66</Rate>
+        </Postage>
+        <Postage CLASSID="7">
+            <MailService>Library Mail Parcel</MailService>
+            <Rate>2.53</Rate>
+        </Postage>
+    </Package>
+</RateV4Response>
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Variable/Model/VariableTest.php b/dev/tests/integration/testsuite/Magento/Variable/Model/VariableTest.php
index f2ea20ac8016d..0684b5a732be9 100644
--- a/dev/tests/integration/testsuite/Magento/Variable/Model/VariableTest.php
+++ b/dev/tests/integration/testsuite/Magento/Variable/Model/VariableTest.php
@@ -77,4 +77,20 @@ public function testCollection()
         $collection->addValuesToResult();
         $this->assertContains('variable_value', (string)$collection->getSelect());
     }
+
+    /**
+     * Test to verify that returned by getVariablesOptionArray()
+     * custom variable label is HTML escaped.
+     */
+    public function testGetVariablesOptionArrayWithHtmlLabel()
+    {
+        $expectedLabel = '&lt;b&gt;HTML Name value&lt;/b&gt;';
+        $data = [
+            'code' => 'html_name',
+            'name' => '<b>HTML Name value</b>'
+        ];
+        $this->_model->setData($data)->save();
+        $actualLabel = current(current($this->_model->getVariablesOptionArray())['label']->getArguments());
+        $this->assertEquals($expectedLabel, $actualLabel);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php b/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php
index a7219f3d1a916..08ca6ff956657 100644
--- a/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php
+++ b/dev/tests/integration/testsuite/Magento/Vault/Model/ResourceModel/PaymentTokenTest.php
@@ -72,7 +72,7 @@ public function testAddLinkToOrderPaymentExists()
             ->getByGatewayToken(self::TOKEN, PayPalConfigProvider::PAYPAL_CODE, self::CUSTOMER_ID);
 
         $this->connection->insert(
-            $this->resource->getTableName(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE),
+            $this->resource->getTableName('vault_payment_token_order_payment_link'),
             [
                 'order_payment_id' => $this->order->getPayment()->getEntityId(),
                 'payment_token_id' => $paymentToken->getEntityId()
@@ -98,7 +98,7 @@ public function testAddLinkToOrderPaymentCreate()
             ->getByGatewayToken(self::TOKEN, PayPalConfigProvider::PAYPAL_CODE, self::CUSTOMER_ID);
 
         $select = $this->connection->select()
-            ->from($this->resource->getTableName(InstallSchema::ORDER_PAYMENT_TO_PAYMENT_TOKEN_TABLE))
+            ->from($this->resource->getTableName('vault_payment_token_order_payment_link'))
             ->where('order_payment_id = ?', (int) $this->order->getPayment()->getEntityId())
             ->where('payment_token_id =?', (int) $paymentToken->getEntityId());
 
diff --git a/dev/tests/integration/testsuite/Magento/Vault/_files/token.php b/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
index 396b2a5c20536..e1e0a31da4f5f 100644
--- a/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
+++ b/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
@@ -23,4 +23,4 @@
 
 /** @var PaymentTokenRepository $tokenRepository */
 $tokenRepository = $objectManager->create(PaymentTokenRepository::class);
-$tokenRepository->save($token);
+$token = $tokenRepository->save($token);
diff --git a/dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php b/dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php
index 6f402abf14211..9aa5420d2e8fa 100644
--- a/dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php
@@ -20,15 +20,26 @@ public function testIndexAction()
         $edition = $productMetadata->getEdition();
 
         $fullVersion = $productMetadata->getVersion();
-        $versionParts = explode('.', $fullVersion);
-        $majorMinor = $versionParts[0] . '.' . $versionParts[1];
+        if ($this->isComposerBasedInstallation($fullVersion)) {
+            $versionParts = explode('.', $fullVersion);
+            $majorMinor = $versionParts[0] . '.' . $versionParts[1];
 
-        // Response must contain Major.Minor version, product name, and edition
-        $this->assertContains($majorMinor, $body);
-        $this->assertContains($name, $body);
-        $this->assertContains($edition, $body);
+            // Response must contain Major.Minor version, product name, and edition
+            $this->assertContains($majorMinor, $body);
+            $this->assertContains($name, $body);
+            $this->assertContains($edition, $body);
 
-        // Response must not contain full version including patch version
-        $this->assertNotContains($fullVersion, $body);
+            // Response must not contain full version including patch version
+            $this->assertNotContains($fullVersion, $body);
+        } else {
+            // Response is supposed to be empty when the project is installed from git
+            $this->assertEmpty($body);
+        }
+    }
+
+    private function isComposerBasedInstallation($fullVersion)
+    {
+        $versionParts = explode('-', $fullVersion);
+        return !(isset($versionParts[0]) && $versionParts[0] == 'dev');
     }
 }
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 0000000000000..70437bcffbbc1
--- /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/Webapi/_files/webapi_user.php b/dev/tests/integration/testsuite/Magento/Webapi/_files/webapi_user.php
index 8aa089f929e65..63479bee9cf6d 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/_files/webapi_user.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/_files/webapi_user.php
@@ -10,6 +10,16 @@
 
 /** @var $model \Magento\User\Model\User */
 $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\User\Model\User::class);
+/** @var Magento\Framework\App\ResourceConnection $connection */
+$connection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(Magento\Framework\App\ResourceConnection::class);
+$adapter = $connection->getConnection();
+$select = $adapter->select()
+    ->from('authorization_role', ['role_id'])
+    ->where('role_name = ?', 'Administrators')
+    ->where('parent_id = ?', 0)
+    ->limit(1);
+$roleId = $adapter->fetchOne($select);
 $model->setFirstname("Web")
     ->setLastname("Api")
     ->setUsername('webapi_user')
@@ -19,6 +29,6 @@
     ->setResourceId('Magento_Backend::all')
     ->setPrivileges("")
     ->setAssertId(0)
-    ->setRoleId(2)
+    ->setRoleId((int) $roleId)
     ->setPermission('allow');
 $model->save();
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 0000000000000..f60e57fce8b0c
--- /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 0000000000000..67e4cdc9788f9
--- /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 0000000000000..a09db933c4185
--- /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 0000000000000..f4b4c84b24f6c
--- /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 0000000000000..701adfe7d9c86
--- /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/Model/ResourceModel/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/ResourceModel/AttributeTest.php
new file mode 100644
index 0000000000000..725a8f72c8d01
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/Model/ResourceModel/AttributeTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Weee\Model\ResourceModel;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute as EavAttribute;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * Test class for Magento\Catalog\Model\ResourceModel\Attribute class
+ * with backend model Magento\Weee\Model\Attribute\Backend\Weee\Tax.
+ *
+ * @see Magento\Catalog\Model\ResourceModel\Attribute
+ */
+class AttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Attribute
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product
+     */
+    protected $productResource;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(
+            \Magento\Catalog\Model\ResourceModel\Attribute::class
+        );
+        $this->productResource = $this->objectManager->get(
+            \Magento\Catalog\Model\ResourceModel\Product::class
+        );
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->metadataPool = $this->objectManager->get(MetadataPool::class);
+    }
+
+    /**
+     * Retrieve eav attribute row.
+     *
+     * @param int $entityTypeId
+     * @param int $attributeSetId
+     * @param int $attributeId
+     * @return array|false
+     */
+    private function getEavEntityAttributeRow(int $entityTypeId, int $attributeSetId, int $attributeId)
+    {
+        $connection = $this->productResource->getConnection();
+        $select = $connection->select()
+            ->from($this->productResource->getTable('eav_entity_attribute'))
+            ->where('attribute_set_id=?', $attributeSetId)
+            ->where('attribute_id=?', $attributeId)
+            ->where('entity_type_id=?', $entityTypeId);
+
+        return $connection->fetchRow($select);
+    }
+
+    /**
+     * Test to delete entity attribute with type "Fixed Product Tax".
+     *
+     * @magentoDataFixture Magento/Weee/_files/fixed_product_attribute.php
+     * @return void
+     */
+    public function testDeleteEntityFixedTax() : void
+    {
+        /* @var EavAttribute $attribute */
+        $attribute = $this->objectManager->get(EavAttribute::class);
+        $attribute->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'fixed_product_attribute');
+
+        $entityEavAttributeRow = $this->getEavEntityAttributeRow(
+            (int)$attribute->getEntityTypeId(),
+            4,
+            (int)$attribute->getId()
+        );
+        $this->assertNotEmpty(
+            $entityEavAttributeRow['entity_attribute_id'],
+            'The record is absent in table `eav_entity_attribute` for `fixed_product_attribute`'
+        );
+
+        $attribute->setData('entity_attribute_id', $entityEavAttributeRow['entity_attribute_id']);
+        $this->model->deleteEntity($attribute);
+
+        $entityEavAttributeRow = $this->getEavEntityAttributeRow(
+            (int)$attribute->getEntityTypeId(),
+            4,
+            (int)$attribute->getId()
+        );
+        $this->assertEmpty(
+            $entityEavAttributeRow,
+            'The record was not removed from table `eav_entity_attribute` for `fixed_product_attribute`'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php
new file mode 100644
index 0000000000000..a20d1cac94228
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+
+$entityType = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode('catalog_product');
+$defaultSetId = $objectManager->create(\Magento\Catalog\Model\Product::class)->getDefaultAttributeSetid();
+
+$attributeGroupId = $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId());
+
+$attributeData = [
+    'entity_type_id' => $entityType->getId(),
+    'attribute_code' => 'fixed_product_attribute',
+    'backend_model' => 'Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+    'is_required' => 0,
+    'is_user_defined' => 1,
+    'is_static' => 1,
+    'attribute_set_id' => $defaultSetId,
+    'attribute_group_id' => $attributeGroupId,
+];
+
+/** @var \Magento\Catalog\Model\Entity\Attribute $attribute */
+$attribute = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
+$attribute->setData($attributeData);
+$attribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute_rollback.php
new file mode 100644
index 0000000000000..1d6e15b2e9a97
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute_rollback.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/* @var EavAttribute $attribute */
+$attribute = $objectManager->get(\Magento\Eav\Model\Entity\Attribute::class);
+$attribute->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'fixed_product_attribute');
+$attribute->delete();
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 40d9cc74defdb..0e67a8947a79d 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/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php
index 26ed706e3eccb..f5b5fe533e108 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php
@@ -15,7 +15,7 @@ class WidgetTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
      */
     public function testLoadOptionsAction()
     {
-        $this->getRequest()->setPostValue(
+        $this->getRequest()->setParam(
             'widget',
             '{"widget_type":"Magento\\\\Cms\\\\Block\\\\Widget\\\\Page\\\\Link","values":{}}'
         );
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
index 095193ca0e764..fc3b0399d0497 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -20,4 +20,18 @@ public function testMediaDirective()
         $result = $filter->mediaDirective($construction);
         $this->assertEquals($baseUrl . $image, $result);
     }
+
+    public function testMediaDirectiveWithEncodedQuotes()
+    {
+        $image = 'wysiwyg/VB.png';
+        $construction = ['{{media url=&quot;' . $image . '&quot;}}', 'media', ' url=&quot;' . $image . '&quot;'];
+        $baseUrl = 'http://localhost/pub/media/';
+
+        /** @var \Magento\Widget\Model\Template\Filter $filter */
+        $filter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Widget\Model\Template\Filter::class
+        );
+        $result = $filter->mediaDirective($construction);
+        $this->assertEquals($baseUrl . $image, $result);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
index 0f3bd5d91f3ec..5fef52fac30d0 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
@@ -38,21 +38,23 @@ public function testGetPluginSettings()
         $config = new \Magento\Framework\DataObject();
         $settings = $this->_model->getPluginSettings($config);
 
-        $this->assertArrayHasKey('widget_plugin_src', $settings);
-        $this->assertArrayHasKey('widget_placeholders', $settings);
-        $this->assertArrayHasKey('widget_window_url', $settings);
+        $this->assertArrayHasKey('plugins', $settings);
+        $plugins = array_shift($settings['plugins']);
+        $this->assertArrayHasKey('options', $plugins);
+        $this->assertArrayHasKey('window_url', $plugins['options']);
+        $this->assertArrayHasKey('placeholders', $plugins['options']);
 
-        $jsFilename = $settings['widget_plugin_src'];
+        $jsFilename = $plugins['src'];
         $this->assertStringMatchesFormat(
             'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/%s/editor_plugin.js',
             $jsFilename
         );
 
-        $this->assertInternalType('array', $settings['widget_placeholders']);
+        $this->assertInternalType('array', $plugins['options']['placeholders']);
 
         $this->assertStringStartsWith(
             'http://localhost/index.php/backend/admin/widget/index/key',
-            $settings['widget_window_url']
+            $plugins['options']['window_url']
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php
index 083876d7eddb3..3d43fb5a44575 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php
@@ -32,9 +32,9 @@ public function testConvert($value, $expected)
     public function convertDataProvider()
     {
         // @codingStandardsIgnoreStart
-        $beginning = '<body><referenceContainer name="content"><block class="Magento\CatalogWidget\Block\Product\ProductsList" name="23e38bbfa7cc6474454570e51aeffcc3" template="product/widget/content/grid.phtml"><action method="setData"><argument name="name" xsi:type="string">show_pager</argument><argument name="value" xsi:type="string">0</argument></action><action method="setData"><argument name="name" xsi:type="string">products_count</argument><argument name="value" xsi:type="string">10</argument></action><action method="setData">';
+        $beginning = '<body><referenceContainer name="content"><block class="Magento\CatalogWidget\Block\Product\ProductsList" name="23e38bbfa7cc6474454570e51aeffcc3" template="Magento_CatalogWidget::product/widget/content/grid.phtml"><action method="setData"><argument name="name" xsi:type="string">show_pager</argument><argument name="value" xsi:type="string">0</argument></action><action method="setData"><argument name="name" xsi:type="string">products_count</argument><argument name="value" xsi:type="string">10</argument></action><action method="setData">';
         $serializedWidgetXml = '<argument name="name" xsi:type="string">conditions_encoded</argument><argument name="value" xsi:type="string">a:3:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;s:15:`simple, simple1`;]s:4:`1--2`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:5:`price`;s:8:`operator`;s:2:`&lt;=`;s:5:`value`;s:2:`10`;]]</argument>';
-        $jsonEncodedWidgetXml = '<argument name="name" xsi:type="string">conditions_encoded</argument><argument name="value" xsi:type="string">^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`simple, simple1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`price`,`operator`:`&lt;=`,`value`:`10`^]^]</argument>';
+        $jsonEncodedWidgetXml = '<argument name="name" xsi:type="string">conditions_encoded</argument><argument name="value" xsi:type="string">^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`simple, simple1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`price`,`operator`:`^(=`,`value`:`10`^]^]</argument>';
         $ending = '</action><action method="setData"><argument name="name" xsi:type="string">page_var_name</argument><argument name="value" xsi:type="string">pobqks</argument></action></block></referenceContainer></body>';
         // @codingStandardsIgnoreEnd
         return [
diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
index 4c41071f55925..489a5f1fcb6c4 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
@@ -5,8 +5,8 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "0.1.0-alpha103"
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*"
     },
     "type": "magento2-theme",
     "version": "0.1.0"
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
index 957612f22b4fd..92eae7a3fe3d7 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -122,6 +122,7 @@ public function testAddActionProductNameXss()
     }
 
     /**
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_product_qty_increments.php
      */
     public function testAllcartAction()
@@ -169,9 +170,7 @@ public function testSendAction()
             \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
         );
 
-        $actualResult = \Zend_Mime_Decode::decodeQuotedPrintable(
-            $transportBuilder->getSentMessage()->getRawMessage()
-        );
+        $actualResult = quoted_printable_decode($transportBuilder->getSentMessage()->getRawMessage());
 
         $this->assertStringMatchesFormat(
             '%A' . $this->_customerViewHelper->getCustomerName($this->_customerSession->getCustomerDataObject())
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 99f9aa4991b5e..b684da05dd254 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Wishlist\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 
@@ -85,4 +86,39 @@ public function testAddNewItemInvalidWishlistItemConfiguration()
         );
         $this->wishlist->addNewItem($product);
     }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testGetItemCollection()
+    {
+        $productSku = 'simple';
+        $customerId = 1;
+
+        $this->wishlist->loadByCustomerId($customerId, true);
+        $itemCollection = $this->wishlist->getItemCollection();
+        /** @var \Magento\Wishlist\Model\Item $item */
+        $item = $itemCollection->getFirstItem();
+        $this->assertEquals($productSku, $item->getProduct()->getSku());
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testGetItemCollectionWithDisabledProduct()
+    {
+        $productSku = 'simple';
+        $customerId = 1;
+
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku);
+        $product->setStatus(ProductStatus::STATUS_DISABLED);
+        $productRepository->save($product);
+
+        $this->wishlist->loadByCustomerId($customerId, true);
+        $itemCollection = $this->wishlist->getItemCollection();
+        $this->assertEmpty($itemCollection->getItems());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
index 4c183ad6368cc..73ced4d5462cc 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
@@ -12,14 +12,4 @@
 );
 $wishlist->loadByCustomerId($customer->getId(), true);
 $item = $wishlist->addNewItem($product, new \Magento\Framework\DataObject([]));
-//    'product' => '1',
-//    'related_product' => '',
-//    'options' => array(
-//        1 => '1-text',
-//        2 => array('month' => 1, 'day' => 1, 'year' => 2001, 'hour' => 1, 'minute' => 1),
-//        3 => '1',
-//        4 => '1',
-//    ),
-//    'validate_datetime_2' => '',
-//    'qty' => '1',
 $wishlist->setSharingCode('fixture_unique_code')->save();
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
new file mode 100644
index 0000000000000..61b5bbb7bd32f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlist->loadByCustomerId(1);
+$wishlist->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php
new file mode 100644
index 0000000000000..91392fec6b721
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlist->loadByCustomerId(1);
+$wishlist->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_special_price_rollback.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
diff --git a/dev/tests/js/JsTestDriver/.gitignore b/dev/tests/js/JsTestDriver/.gitignore
deleted file mode 100644
index e94f6f277fc54..0000000000000
--- a/dev/tests/js/JsTestDriver/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-test-output/
-jsTestDriver.php
-jsTestDriver.conf
\ No newline at end of file
diff --git a/dev/tests/js/JsTestDriver/framework/qunit/qunit-1.14.0.css b/dev/tests/js/JsTestDriver/framework/qunit/qunit-1.14.0.css
deleted file mode 100644
index 93026e3ba3f6d..0000000000000
--- a/dev/tests/js/JsTestDriver/framework/qunit/qunit-1.14.0.css
+++ /dev/null
@@ -1,237 +0,0 @@
-/*!
- * QUnit 1.14.0
- * http://qunitjs.com/
- *
- * Copyright 2013 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-01-31T16:40Z
- */
-
-/** Font Family and Sizes */
-
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
-	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
-}
-
-#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
-#qunit-tests { font-size: smaller; }
-
-
-/** Resets */
-
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
-	margin: 0;
-	padding: 0;
-}
-
-
-/** Header */
-
-#qunit-header {
-	padding: 0.5em 0 0.5em 1em;
-
-	color: #8699A4;
-	background-color: #0D3349;
-
-	font-size: 1.5em;
-	line-height: 1em;
-	font-weight: 400;
-
-	border-radius: 5px 5px 0 0;
-}
-
-#qunit-header a {
-	text-decoration: none;
-	color: #C2CCD1;
-}
-
-#qunit-header a:hover,
-#qunit-header a:focus {
-	color: #FFF;
-}
-
-#qunit-testrunner-toolbar label {
-	display: inline-block;
-	padding: 0 0.5em 0 0.1em;
-}
-
-#qunit-banner {
-	height: 5px;
-}
-
-#qunit-testrunner-toolbar {
-	padding: 0.5em 0 0.5em 2em;
-	color: #5E740B;
-	background-color: #EEE;
-	overflow: hidden;
-}
-
-#qunit-userAgent {
-	padding: 0.5em 0 0.5em 2.5em;
-	background-color: #2B81AF;
-	color: #FFF;
-	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
-}
-
-#qunit-modulefilter-container {
-	float: right;
-}
-
-/** Tests: Pass/Fail */
-
-#qunit-tests {
-	list-style-position: inside;
-}
-
-#qunit-tests li {
-	padding: 0.4em 0.5em 0.4em 2.5em;
-	border-bottom: 1px solid #FFF;
-	list-style-position: inside;
-}
-
-#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
-	display: none;
-}
-
-#qunit-tests li strong {
-	cursor: pointer;
-}
-
-#qunit-tests li a {
-	padding: 0.5em;
-	color: #C2CCD1;
-	text-decoration: none;
-}
-#qunit-tests li a:hover,
-#qunit-tests li a:focus {
-	color: #000;
-}
-
-#qunit-tests li .runtime {
-	float: right;
-	font-size: smaller;
-}
-
-.qunit-assert-list {
-	margin-top: 0.5em;
-	padding: 0.5em;
-
-	background-color: #FFF;
-
-	border-radius: 5px;
-}
-
-.qunit-collapsed {
-	display: none;
-}
-
-#qunit-tests table {
-	border-collapse: collapse;
-	margin-top: 0.2em;
-}
-
-#qunit-tests th {
-	text-align: right;
-	vertical-align: top;
-	padding: 0 0.5em 0 0;
-}
-
-#qunit-tests td {
-	vertical-align: top;
-}
-
-#qunit-tests pre {
-	margin: 0;
-	white-space: pre-wrap;
-	word-wrap: break-word;
-}
-
-#qunit-tests del {
-	background-color: #E0F2BE;
-	color: #374E0C;
-	text-decoration: none;
-}
-
-#qunit-tests ins {
-	background-color: #FFCACA;
-	color: #500;
-	text-decoration: none;
-}
-
-/*** Test Counts */
-
-#qunit-tests b.counts                       { color: #000; }
-#qunit-tests b.passed                       { color: #5E740B; }
-#qunit-tests b.failed                       { color: #710909; }
-
-#qunit-tests li li {
-	padding: 5px;
-	background-color: #FFF;
-	border-bottom: none;
-	list-style-position: inside;
-}
-
-/*** Passing Styles */
-
-#qunit-tests li li.pass {
-	color: #3C510C;
-	background-color: #FFF;
-	border-left: 10px solid #C6E746;
-}
-
-#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
-#qunit-tests .pass .test-name               { color: #366097; }
-
-#qunit-tests .pass .test-actual,
-#qunit-tests .pass .test-expected           { color: #999; }
-
-#qunit-banner.qunit-pass                    { background-color: #C6E746; }
-
-/*** Failing Styles */
-
-#qunit-tests li li.fail {
-	color: #710909;
-	background-color: #FFF;
-	border-left: 10px solid #EE5757;
-	white-space: pre;
-}
-
-#qunit-tests > li:last-child {
-	border-radius: 0 0 5px 5px;
-}
-
-#qunit-tests .fail                          { color: #000; background-color: #EE5757; }
-#qunit-tests .fail .test-name,
-#qunit-tests .fail .module-name             { color: #000; }
-
-#qunit-tests .fail .test-actual             { color: #EE5757; }
-#qunit-tests .fail .test-expected           { color: #008000; }
-
-#qunit-banner.qunit-fail                    { background-color: #EE5757; }
-
-
-/** Result */
-
-#qunit-testresult {
-	padding: 0.5em 0.5em 0.5em 2.5em;
-
-	color: #2B81AF;
-	background-color: #D2E0E6;
-
-	border-bottom: 1px solid #FFF;
-}
-#qunit-testresult .module-name {
-	font-weight: 700;
-}
-
-/** Fixture */
-
-#qunit-fixture {
-	position: absolute;
-	top: -10000px;
-	left: -10000px;
-	width: 1000px;
-	height: 1000px;
-}
diff --git a/dev/tests/js/JsTestDriver/framework/qunit/qunit-1.14.0.js b/dev/tests/js/JsTestDriver/framework/qunit/qunit-1.14.0.js
deleted file mode 100644
index 0e279fde17024..0000000000000
--- a/dev/tests/js/JsTestDriver/framework/qunit/qunit-1.14.0.js
+++ /dev/null
@@ -1,2288 +0,0 @@
-/*!
- * QUnit 1.14.0
- * http://qunitjs.com/
- *
- * Copyright 2013 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-01-31T16:40Z
- */
-
-(function( window ) {
-
-var QUnit,
-	assert,
-	config,
-	onErrorFnPrev,
-	testId = 0,
-	fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	// Keep a local reference to Date (GH-283)
-	Date = window.Date,
-	setTimeout = window.setTimeout,
-	clearTimeout = window.clearTimeout,
-	defined = {
-		document: typeof window.document !== "undefined",
-		setTimeout: typeof window.setTimeout !== "undefined",
-		sessionStorage: (function() {
-			var x = "qunit-test-string";
-			try {
-				sessionStorage.setItem( x, x );
-				sessionStorage.removeItem( x );
-				return true;
-			} catch( e ) {
-				return false;
-			}
-		}())
-	},
-	/**
-	 * Provides a normalized error string, correcting an issue
-	 * with IE 7 (and prior) where Error.prototype.toString is
-	 * not properly implemented
-	 *
-	 * Based on http://es5.github.com/#x15.11.4.4
-	 *
-	 * @param {String|Error} error
-	 * @return {String} error message
-	 */
-	errorString = function( error ) {
-		var name, message,
-			errorString = error.toString();
-		if ( errorString.substring( 0, 7 ) === "[object" ) {
-			name = error.name ? error.name.toString() : "Error";
-			message = error.message ? error.message.toString() : "";
-			if ( name && message ) {
-				return name + ": " + message;
-			} else if ( name ) {
-				return name;
-			} else if ( message ) {
-				return message;
-			} else {
-				return "Error";
-			}
-		} else {
-			return errorString;
-		}
-	},
-	/**
-	 * Makes a clone of an object using only Array or Object as base,
-	 * and copies over the own enumerable properties.
-	 *
-	 * @param {Object} obj
-	 * @return {Object} New object with only the own properties (recursively).
-	 */
-	objectValues = function( obj ) {
-		// Grunt 0.3.x uses an older version of jshint that still has jshint/jshint#392.
-		/*jshint newcap: false */
-		var key, val,
-			vals = QUnit.is( "array", obj ) ? [] : {};
-		for ( key in obj ) {
-			if ( hasOwn.call( obj, key ) ) {
-				val = obj[key];
-				vals[key] = val === Object(val) ? objectValues(val) : val;
-			}
-		}
-		return vals;
-	};
-
-
-// Root QUnit object.
-// `QUnit` initialized at top of scope
-QUnit = {
-
-	// call on start of module test to prepend name to all tests
-	module: function( name, testEnvironment ) {
-		config.currentModule = name;
-		config.currentModuleTestEnvironment = testEnvironment;
-		config.modules[name] = true;
-	},
-
-	asyncTest: function( testName, expected, callback ) {
-		if ( arguments.length === 2 ) {
-			callback = expected;
-			expected = null;
-		}
-
-		QUnit.test( testName, expected, callback, true );
-	},
-
-	test: function( testName, expected, callback, async ) {
-		var test,
-			nameHtml = "<span class='test-name'>" + escapeText( testName ) + "</span>";
-
-		if ( arguments.length === 2 ) {
-			callback = expected;
-			expected = null;
-		}
-
-		if ( config.currentModule ) {
-			nameHtml = "<span class='module-name'>" + escapeText( config.currentModule ) + "</span>: " + nameHtml;
-		}
-
-		test = new Test({
-			nameHtml: nameHtml,
-			testName: testName,
-			expected: expected,
-			async: async,
-			callback: callback,
-			module: config.currentModule,
-			moduleTestEnvironment: config.currentModuleTestEnvironment,
-			stack: sourceFromStacktrace( 2 )
-		});
-
-		if ( !validTest( test ) ) {
-			return;
-		}
-
-		test.queue();
-	},
-
-	// Specify the number of expected assertions to guarantee that failed test (no assertions are run at all) don't slip through.
-	expect: function( asserts ) {
-		if (arguments.length === 1) {
-			config.current.expected = asserts;
-		} else {
-			return config.current.expected;
-		}
-	},
-
-	start: function( count ) {
-		// QUnit hasn't been initialized yet.
-		// Note: RequireJS (et al) may delay onLoad
-		if ( config.semaphore === undefined ) {
-			QUnit.begin(function() {
-				// This is triggered at the top of QUnit.load, push start() to the event loop, to allow QUnit.load to finish first
-				setTimeout(function() {
-					QUnit.start( count );
-				});
-			});
-			return;
-		}
-
-		config.semaphore -= count || 1;
-		// don't start until equal number of stop-calls
-		if ( config.semaphore > 0 ) {
-			return;
-		}
-		// ignore if start is called more often then stop
-		if ( config.semaphore < 0 ) {
-			config.semaphore = 0;
-			QUnit.pushFailure( "Called start() while already started (QUnit.config.semaphore was 0 already)", null, sourceFromStacktrace(2) );
-			return;
-		}
-		// A slight delay, to avoid any current callbacks
-		if ( defined.setTimeout ) {
-			setTimeout(function() {
-				if ( config.semaphore > 0 ) {
-					return;
-				}
-				if ( config.timeout ) {
-					clearTimeout( config.timeout );
-				}
-
-				config.blocking = false;
-				process( true );
-			}, 13);
-		} else {
-			config.blocking = false;
-			process( true );
-		}
-	},
-
-	stop: function( count ) {
-		config.semaphore += count || 1;
-		config.blocking = true;
-
-		if ( config.testTimeout && defined.setTimeout ) {
-			clearTimeout( config.timeout );
-			config.timeout = setTimeout(function() {
-				QUnit.ok( false, "Test timed out" );
-				config.semaphore = 1;
-				QUnit.start();
-			}, config.testTimeout );
-		}
-	}
-};
-
-// We use the prototype to distinguish between properties that should
-// be exposed as globals (and in exports) and those that shouldn't
-(function() {
-	function F() {}
-	F.prototype = QUnit;
-	QUnit = new F();
-	// Make F QUnit's constructor so that we can add to the prototype later
-	QUnit.constructor = F;
-}());
-
-/**
- * Config object: Maintain internal state
- * Later exposed as QUnit.config
- * `config` initialized at top of scope
- */
-config = {
-	// The queue of tests to run
-	queue: [],
-
-	// block until document ready
-	blocking: true,
-
-	// when enabled, show only failing tests
-	// gets persisted through sessionStorage and can be changed in UI via checkbox
-	hidepassed: false,
-
-	// by default, run previously failed tests first
-	// very useful in combination with "Hide passed tests" checked
-	reorder: true,
-
-	// by default, modify document.title when suite is done
-	altertitle: true,
-
-	// by default, scroll to top of the page when suite is done
-	scrolltop: true,
-
-	// when enabled, all tests must call expect()
-	requireExpects: false,
-
-	// add checkboxes that are persisted in the query-string
-	// when enabled, the id is set to `true` as a `QUnit.config` property
-	urlConfig: [
-		{
-			id: "noglobals",
-			label: "Check for Globals",
-			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
-		},
-		{
-			id: "notrycatch",
-			label: "No try-catch",
-			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
-		}
-	],
-
-	// Set of all modules.
-	modules: {},
-
-	// logging callback queues
-	begin: [],
-	done: [],
-	log: [],
-	testStart: [],
-	testDone: [],
-	moduleStart: [],
-	moduleDone: []
-};
-
-// Initialize more QUnit.config and QUnit.urlParams
-(function() {
-	var i, current,
-		location = window.location || { search: "", protocol: "file:" },
-		params = location.search.slice( 1 ).split( "&" ),
-		length = params.length,
-		urlParams = {};
-
-	if ( params[ 0 ] ) {
-		for ( i = 0; i < length; i++ ) {
-			current = params[ i ].split( "=" );
-			current[ 0 ] = decodeURIComponent( current[ 0 ] );
-
-			// allow just a key to turn on a flag, e.g., test.html?noglobals
-			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
-			if ( urlParams[ current[ 0 ] ] ) {
-				urlParams[ current[ 0 ] ] = [].concat( urlParams[ current[ 0 ] ], current[ 1 ] );
-			} else {
-				urlParams[ current[ 0 ] ] = current[ 1 ];
-			}
-		}
-	}
-
-	QUnit.urlParams = urlParams;
-
-	// String search anywhere in moduleName+testName
-	config.filter = urlParams.filter;
-
-	// Exact match of the module name
-	config.module = urlParams.module;
-
-	config.testNumber = [];
-	if ( urlParams.testNumber ) {
-
-		// Ensure that urlParams.testNumber is an array
-		urlParams.testNumber = [].concat( urlParams.testNumber );
-		for ( i = 0; i < urlParams.testNumber.length; i++ ) {
-			current = urlParams.testNumber[ i ];
-			config.testNumber.push( parseInt( current, 10 ) );
-		}
-	}
-
-	// Figure out if we're running the tests from a server or not
-	QUnit.isLocal = location.protocol === "file:";
-}());
-
-extend( QUnit, {
-
-	config: config,
-
-	// Initialize the configuration options
-	init: function() {
-		extend( config, {
-			stats: { all: 0, bad: 0 },
-			moduleStats: { all: 0, bad: 0 },
-			started: +new Date(),
-			updateRate: 1000,
-			blocking: false,
-			autostart: true,
-			autorun: false,
-			filter: "",
-			queue: [],
-			semaphore: 1
-		});
-
-		var tests, banner, result,
-			qunit = id( "qunit" );
-
-		if ( qunit ) {
-			qunit.innerHTML =
-				"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" +
-				"<h2 id='qunit-banner'></h2>" +
-				"<div id='qunit-testrunner-toolbar'></div>" +
-				"<h2 id='qunit-userAgent'></h2>" +
-				"<ol id='qunit-tests'></ol>";
-		}
-
-		tests = id( "qunit-tests" );
-		banner = id( "qunit-banner" );
-		result = id( "qunit-testresult" );
-
-		if ( tests ) {
-			tests.innerHTML = "";
-		}
-
-		if ( banner ) {
-			banner.className = "";
-		}
-
-		if ( result ) {
-			result.parentNode.removeChild( result );
-		}
-
-		if ( tests ) {
-			result = document.createElement( "p" );
-			result.id = "qunit-testresult";
-			result.className = "result";
-			tests.parentNode.insertBefore( result, tests );
-			result.innerHTML = "Running...<br/>&nbsp;";
-		}
-	},
-
-	// Resets the test setup. Useful for tests that modify the DOM.
-	/*
-	DEPRECATED: Use multiple tests instead of resetting inside a test.
-	Use testStart or testDone for custom cleanup.
-	This method will throw an error in 2.0, and will be removed in 2.1
-	*/
-	reset: function() {
-		var fixture = id( "qunit-fixture" );
-		if ( fixture ) {
-			fixture.innerHTML = config.fixture;
-		}
-	},
-
-	// Safe object type checking
-	is: function( type, obj ) {
-		return QUnit.objectType( obj ) === type;
-	},
-
-	objectType: function( obj ) {
-		if ( typeof obj === "undefined" ) {
-			return "undefined";
-		}
-
-		// Consider: typeof null === object
-		if ( obj === null ) {
-			return "null";
-		}
-
-		var match = toString.call( obj ).match(/^\[object\s(.*)\]$/),
-			type = match && match[1] || "";
-
-		switch ( type ) {
-			case "Number":
-				if ( isNaN(obj) ) {
-					return "nan";
-				}
-				return "number";
-			case "String":
-			case "Boolean":
-			case "Array":
-			case "Date":
-			case "RegExp":
-			case "Function":
-				return type.toLowerCase();
-		}
-		if ( typeof obj === "object" ) {
-			return "object";
-		}
-		return undefined;
-	},
-
-	push: function( result, actual, expected, message ) {
-		if ( !config.current ) {
-			throw new Error( "assertion outside test context, was " + sourceFromStacktrace() );
-		}
-
-		var output, source,
-			details = {
-				module: config.current.module,
-				name: config.current.testName,
-				result: result,
-				message: message,
-				actual: actual,
-				expected: expected
-			};
-
-		message = escapeText( message ) || ( result ? "okay" : "failed" );
-		message = "<span class='test-message'>" + message + "</span>";
-		output = message;
-
-		if ( !result ) {
-			expected = escapeText( QUnit.jsDump.parse(expected) );
-			actual = escapeText( QUnit.jsDump.parse(actual) );
-			output += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + expected + "</pre></td></tr>";
-
-			if ( actual !== expected ) {
-				output += "<tr class='test-actual'><th>Result: </th><td><pre>" + actual + "</pre></td></tr>";
-				output += "<tr class='test-diff'><th>Diff: </th><td><pre>" + QUnit.diff( expected, actual ) + "</pre></td></tr>";
-			}
-
-			source = sourceFromStacktrace();
-
-			if ( source ) {
-				details.source = source;
-				output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText( source ) + "</pre></td></tr>";
-			}
-
-			output += "</table>";
-		}
-
-		runLoggingCallbacks( "log", QUnit, details );
-
-		config.current.assertions.push({
-			result: !!result,
-			message: output
-		});
-	},
-
-	pushFailure: function( message, source, actual ) {
-		if ( !config.current ) {
-			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
-		}
-
-		var output,
-			details = {
-				module: config.current.module,
-				name: config.current.testName,
-				result: false,
-				message: message
-			};
-
-		message = escapeText( message ) || "error";
-		message = "<span class='test-message'>" + message + "</span>";
-		output = message;
-
-		output += "<table>";
-
-		if ( actual ) {
-			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText( actual ) + "</pre></td></tr>";
-		}
-
-		if ( source ) {
-			details.source = source;
-			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText( source ) + "</pre></td></tr>";
-		}
-
-		output += "</table>";
-
-		runLoggingCallbacks( "log", QUnit, details );
-
-		config.current.assertions.push({
-			result: false,
-			message: output
-		});
-	},
-
-	url: function( params ) {
-		params = extend( extend( {}, QUnit.urlParams ), params );
-		var key,
-			querystring = "?";
-
-		for ( key in params ) {
-			if ( hasOwn.call( params, key ) ) {
-				querystring += encodeURIComponent( key ) + "=" +
-					encodeURIComponent( params[ key ] ) + "&";
-			}
-		}
-		return window.location.protocol + "//" + window.location.host +
-			window.location.pathname + querystring.slice( 0, -1 );
-	},
-
-	extend: extend,
-	id: id,
-	addEvent: addEvent,
-	addClass: addClass,
-	hasClass: hasClass,
-	removeClass: removeClass
-	// load, equiv, jsDump, diff: Attached later
-});
-
-/**
- * @deprecated: Created for backwards compatibility with test runner that set the hook function
- * into QUnit.{hook}, instead of invoking it and passing the hook function.
- * QUnit.constructor is set to the empty F() above so that we can add to it's prototype here.
- * Doing this allows us to tell if the following methods have been overwritten on the actual
- * QUnit object.
- */
-extend( QUnit.constructor.prototype, {
-
-	// Logging callbacks; all receive a single argument with the listed properties
-	// run test/logs.html for any related changes
-	begin: registerLoggingCallback( "begin" ),
-
-	// done: { failed, passed, total, runtime }
-	done: registerLoggingCallback( "done" ),
-
-	// log: { result, actual, expected, message }
-	log: registerLoggingCallback( "log" ),
-
-	// testStart: { name }
-	testStart: registerLoggingCallback( "testStart" ),
-
-	// testDone: { name, failed, passed, total, runtime }
-	testDone: registerLoggingCallback( "testDone" ),
-
-	// moduleStart: { name }
-	moduleStart: registerLoggingCallback( "moduleStart" ),
-
-	// moduleDone: { name, failed, passed, total }
-	moduleDone: registerLoggingCallback( "moduleDone" )
-});
-
-if ( !defined.document || document.readyState === "complete" ) {
-	config.autorun = true;
-}
-
-QUnit.load = function() {
-	runLoggingCallbacks( "begin", QUnit, {} );
-
-	// Initialize the config, saving the execution queue
-	var banner, filter, i, j, label, len, main, ol, toolbar, val, selection,
-		urlConfigContainer, moduleFilter, userAgent,
-		numModules = 0,
-		moduleNames = [],
-		moduleFilterHtml = "",
-		urlConfigHtml = "",
-		oldconfig = extend( {}, config );
-
-	QUnit.init();
-	extend(config, oldconfig);
-
-	config.blocking = false;
-
-	len = config.urlConfig.length;
-
-	for ( i = 0; i < len; i++ ) {
-		val = config.urlConfig[i];
-		if ( typeof val === "string" ) {
-			val = {
-				id: val,
-				label: val
-			};
-		}
-		config[ val.id ] = QUnit.urlParams[ val.id ];
-		if ( !val.value || typeof val.value === "string" ) {
-			urlConfigHtml += "<input id='qunit-urlconfig-" + escapeText( val.id ) +
-				"' name='" + escapeText( val.id ) +
-				"' type='checkbox'" +
-				( val.value ? " value='" + escapeText( val.value ) + "'" : "" ) +
-				( config[ val.id ] ? " checked='checked'" : "" ) +
-				" title='" + escapeText( val.tooltip ) +
-				"'><label for='qunit-urlconfig-" + escapeText( val.id ) +
-				"' title='" + escapeText( val.tooltip ) + "'>" + val.label + "</label>";
-		} else {
-			urlConfigHtml += "<label for='qunit-urlconfig-" + escapeText( val.id ) +
-				"' title='" + escapeText( val.tooltip ) +
-				"'>" + val.label +
-				": </label><select id='qunit-urlconfig-" + escapeText( val.id ) +
-				"' name='" + escapeText( val.id ) +
-				"' title='" + escapeText( val.tooltip ) +
-				"'><option></option>";
-			selection = false;
-			if ( QUnit.is( "array", val.value ) ) {
-				for ( j = 0; j < val.value.length; j++ ) {
-					urlConfigHtml += "<option value='" + escapeText( val.value[j] ) + "'" +
-						( config[ val.id ] === val.value[j] ?
-							(selection = true) && " selected='selected'" :
-							"" ) +
-						">" + escapeText( val.value[j] ) + "</option>";
-				}
-			} else {
-				for ( j in val.value ) {
-					if ( hasOwn.call( val.value, j ) ) {
-						urlConfigHtml += "<option value='" + escapeText( j ) + "'" +
-							( config[ val.id ] === j ?
-								(selection = true) && " selected='selected'" :
-								"" ) +
-							">" + escapeText( val.value[j] ) + "</option>";
-					}
-				}
-			}
-			if ( config[ val.id ] && !selection ) {
-				urlConfigHtml += "<option value='" + escapeText( config[ val.id ] ) +
-					"' selected='selected' disabled='disabled'>" +
-					escapeText( config[ val.id ] ) +
-					"</option>";
-			}
-			urlConfigHtml += "</select>";
-		}
-	}
-	for ( i in config.modules ) {
-		if ( config.modules.hasOwnProperty( i ) ) {
-			moduleNames.push(i);
-		}
-	}
-	numModules = moduleNames.length;
-	moduleNames.sort( function( a, b ) {
-		return a.localeCompare( b );
-	});
-	moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label><select id='qunit-modulefilter' name='modulefilter'><option value='' " +
-		( config.module === undefined  ? "selected='selected'" : "" ) +
-		">< All Modules ></option>";
-
-
-	for ( i = 0; i < numModules; i++) {
-			moduleFilterHtml += "<option value='" + escapeText( encodeURIComponent(moduleNames[i]) ) + "' " +
-				( config.module === moduleNames[i] ? "selected='selected'" : "" ) +
-				">" + escapeText(moduleNames[i]) + "</option>";
-	}
-	moduleFilterHtml += "</select>";
-
-	// `userAgent` initialized at top of scope
-	userAgent = id( "qunit-userAgent" );
-	if ( userAgent ) {
-		userAgent.innerHTML = navigator.userAgent;
-	}
-
-	// `banner` initialized at top of scope
-	banner = id( "qunit-header" );
-	if ( banner ) {
-		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
-	}
-
-	// `toolbar` initialized at top of scope
-	toolbar = id( "qunit-testrunner-toolbar" );
-	if ( toolbar ) {
-		// `filter` initialized at top of scope
-		filter = document.createElement( "input" );
-		filter.type = "checkbox";
-		filter.id = "qunit-filter-pass";
-
-		addEvent( filter, "click", function() {
-			var tmp,
-				ol = id( "qunit-tests" );
-
-			if ( filter.checked ) {
-				ol.className = ol.className + " hidepass";
-			} else {
-				tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
-				ol.className = tmp.replace( / hidepass /, " " );
-			}
-			if ( defined.sessionStorage ) {
-				if (filter.checked) {
-					sessionStorage.setItem( "qunit-filter-passed-tests", "true" );
-				} else {
-					sessionStorage.removeItem( "qunit-filter-passed-tests" );
-				}
-			}
-		});
-
-		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem( "qunit-filter-passed-tests" ) ) {
-			filter.checked = true;
-			// `ol` initialized at top of scope
-			ol = id( "qunit-tests" );
-			ol.className = ol.className + " hidepass";
-		}
-		toolbar.appendChild( filter );
-
-		// `label` initialized at top of scope
-		label = document.createElement( "label" );
-		label.setAttribute( "for", "qunit-filter-pass" );
-		label.setAttribute( "title", "Only show tests and assertions that fail. Stored in sessionStorage." );
-		label.innerHTML = "Hide passed tests";
-		toolbar.appendChild( label );
-
-		urlConfigContainer = document.createElement("span");
-		urlConfigContainer.innerHTML = urlConfigHtml;
-		// For oldIE support:
-		// * Add handlers to the individual elements instead of the container
-		// * Use "click" instead of "change" for checkboxes
-		// * Fallback from event.target to event.srcElement
-		addEvents( urlConfigContainer.getElementsByTagName("input"), "click", function( event ) {
-			var params = {},
-				target = event.target || event.srcElement;
-			params[ target.name ] = target.checked ?
-				target.defaultValue || true :
-				undefined;
-			window.location = QUnit.url( params );
-		});
-		addEvents( urlConfigContainer.getElementsByTagName("select"), "change", function( event ) {
-			var params = {},
-				target = event.target || event.srcElement;
-			params[ target.name ] = target.options[ target.selectedIndex ].value || undefined;
-			window.location = QUnit.url( params );
-		});
-		toolbar.appendChild( urlConfigContainer );
-
-		if (numModules > 1) {
-			moduleFilter = document.createElement( "span" );
-			moduleFilter.setAttribute( "id", "qunit-modulefilter-container" );
-			moduleFilter.innerHTML = moduleFilterHtml;
-			addEvent( moduleFilter.lastChild, "change", function() {
-				var selectBox = moduleFilter.getElementsByTagName("select")[0],
-					selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
-
-				window.location = QUnit.url({
-					module: ( selectedModule === "" ) ? undefined : selectedModule,
-					// Remove any existing filters
-					filter: undefined,
-					testNumber: undefined
-				});
-			});
-			toolbar.appendChild(moduleFilter);
-		}
-	}
-
-	// `main` initialized at top of scope
-	main = id( "qunit-fixture" );
-	if ( main ) {
-		config.fixture = main.innerHTML;
-	}
-
-	if ( config.autostart ) {
-		QUnit.start();
-	}
-};
-
-if ( defined.document ) {
-	addEvent( window, "load", QUnit.load );
-}
-
-// `onErrorFnPrev` initialized at top of scope
-// Preserve other handlers
-onErrorFnPrev = window.onerror;
-
-// Cover uncaught exceptions
-// Returning true will suppress the default browser handler,
-// returning false will let it run.
-window.onerror = function ( error, filePath, linerNr ) {
-	var ret = false;
-	if ( onErrorFnPrev ) {
-		ret = onErrorFnPrev( error, filePath, linerNr );
-	}
-
-	// Treat return value as window.onerror itself does,
-	// Only do our handling if not suppressed.
-	if ( ret !== true ) {
-		if ( QUnit.config.current ) {
-			if ( QUnit.config.current.ignoreGlobalErrors ) {
-				return true;
-			}
-			QUnit.pushFailure( error, filePath + ":" + linerNr );
-		} else {
-			QUnit.test( "global failure", extend( function() {
-				QUnit.pushFailure( error, filePath + ":" + linerNr );
-			}, { validTest: validTest } ) );
-		}
-		return false;
-	}
-
-	return ret;
-};
-
-function done() {
-	config.autorun = true;
-
-	// Log the last module results
-	if ( config.previousModule ) {
-		runLoggingCallbacks( "moduleDone", QUnit, {
-			name: config.previousModule,
-			failed: config.moduleStats.bad,
-			passed: config.moduleStats.all - config.moduleStats.bad,
-			total: config.moduleStats.all
-		});
-	}
-	delete config.previousModule;
-
-	var i, key,
-		banner = id( "qunit-banner" ),
-		tests = id( "qunit-tests" ),
-		runtime = +new Date() - config.started,
-		passed = config.stats.all - config.stats.bad,
-		html = [
-			"Tests completed in ",
-			runtime,
-			" milliseconds.<br/>",
-			"<span class='passed'>",
-			passed,
-			"</span> assertions of <span class='total'>",
-			config.stats.all,
-			"</span> passed, <span class='failed'>",
-			config.stats.bad,
-			"</span> failed."
-		].join( "" );
-
-	if ( banner ) {
-		banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" );
-	}
-
-	if ( tests ) {
-		id( "qunit-testresult" ).innerHTML = html;
-	}
-
-	if ( config.altertitle && defined.document && document.title ) {
-		// show ✖ for good, ✔ for bad suite result in title
-		// use escape sequences in case file gets loaded with non-utf-8-charset
-		document.title = [
-			( config.stats.bad ? "\u2716" : "\u2714" ),
-			document.title.replace( /^[\u2714\u2716] /i, "" )
-		].join( " " );
-	}
-
-	// clear own sessionStorage items if all tests passed
-	if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) {
-		// `key` & `i` initialized at top of scope
-		for ( i = 0; i < sessionStorage.length; i++ ) {
-			key = sessionStorage.key( i++ );
-			if ( key.indexOf( "qunit-test-" ) === 0 ) {
-				sessionStorage.removeItem( key );
-			}
-		}
-	}
-
-	// scroll back to top to show results
-	if ( config.scrolltop && window.scrollTo ) {
-		window.scrollTo(0, 0);
-	}
-
-	runLoggingCallbacks( "done", QUnit, {
-		failed: config.stats.bad,
-		passed: passed,
-		total: config.stats.all,
-		runtime: runtime
-	});
-}
-
-/** @return Boolean: true if this test should be ran */
-function validTest( test ) {
-	var include,
-		filter = config.filter && config.filter.toLowerCase(),
-		module = config.module && config.module.toLowerCase(),
-		fullName = ( test.module + ": " + test.testName ).toLowerCase();
-
-	// Internally-generated tests are always valid
-	if ( test.callback && test.callback.validTest === validTest ) {
-		delete test.callback.validTest;
-		return true;
-	}
-
-	if ( config.testNumber.length > 0 ) {
-		if ( inArray( test.testNumber, config.testNumber ) < 0 ) {
-			return false;
-		}
-	}
-
-	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
-		return false;
-	}
-
-	if ( !filter ) {
-		return true;
-	}
-
-	include = filter.charAt( 0 ) !== "!";
-	if ( !include ) {
-		filter = filter.slice( 1 );
-	}
-
-	// If the filter matches, we need to honour include
-	if ( fullName.indexOf( filter ) !== -1 ) {
-		return include;
-	}
-
-	// Otherwise, do the opposite
-	return !include;
-}
-
-// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions)
-// Later Safari and IE10 are supposed to support error.stack as well
-// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
-function extractStacktrace( e, offset ) {
-	offset = offset === undefined ? 3 : offset;
-
-	var stack, include, i;
-
-	if ( e.stacktrace ) {
-		// Opera
-		return e.stacktrace.split( "\n" )[ offset + 3 ];
-	} else if ( e.stack ) {
-		// Firefox, Chrome
-		stack = e.stack.split( "\n" );
-		if (/^error$/i.test( stack[0] ) ) {
-			stack.shift();
-		}
-		if ( fileName ) {
-			include = [];
-			for ( i = offset; i < stack.length; i++ ) {
-				if ( stack[ i ].indexOf( fileName ) !== -1 ) {
-					break;
-				}
-				include.push( stack[ i ] );
-			}
-			if ( include.length ) {
-				return include.join( "\n" );
-			}
-		}
-		return stack[ offset ];
-	} else if ( e.sourceURL ) {
-		// Safari, PhantomJS
-		// hopefully one day Safari provides actual stacktraces
-		// exclude useless self-reference for generated Error objects
-		if ( /qunit.js$/.test( e.sourceURL ) ) {
-			return;
-		}
-		// for actual exceptions, this is useful
-		return e.sourceURL + ":" + e.line;
-	}
-}
-function sourceFromStacktrace( offset ) {
-	try {
-		throw new Error();
-	} catch ( e ) {
-		return extractStacktrace( e, offset );
-	}
-}
-
-/**
- * Escape text for attribute or text content.
- */
-function escapeText( s ) {
-	if ( !s ) {
-		return "";
-	}
-	s = s + "";
-	// Both single quotes and double quotes (for attributes)
-	return s.replace( /['"<>&]/g, function( s ) {
-		switch( s ) {
-			case "'":
-				return "&#039;";
-			case "\"":
-				return "&quot;";
-			case "<":
-				return "&lt;";
-			case ">":
-				return "&gt;";
-			case "&":
-				return "&amp;";
-		}
-	});
-}
-
-function synchronize( callback, last ) {
-	config.queue.push( callback );
-
-	if ( config.autorun && !config.blocking ) {
-		process( last );
-	}
-}
-
-function process( last ) {
-	function next() {
-		process( last );
-	}
-	var start = new Date().getTime();
-	config.depth = config.depth ? config.depth + 1 : 1;
-
-	while ( config.queue.length && !config.blocking ) {
-		if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) {
-			config.queue.shift()();
-		} else {
-			setTimeout( next, 13 );
-			break;
-		}
-	}
-	config.depth--;
-	if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
-		done();
-	}
-}
-
-function saveGlobal() {
-	config.pollution = [];
-
-	if ( config.noglobals ) {
-		for ( var key in window ) {
-			if ( hasOwn.call( window, key ) ) {
-				// in Opera sometimes DOM element ids show up here, ignore them
-				if ( /^qunit-test-output/.test( key ) ) {
-					continue;
-				}
-				config.pollution.push( key );
-			}
-		}
-	}
-}
-
-function checkPollution() {
-	var newGlobals,
-		deletedGlobals,
-		old = config.pollution;
-
-	saveGlobal();
-
-	newGlobals = diff( config.pollution, old );
-	if ( newGlobals.length > 0 ) {
-		QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") );
-	}
-
-	deletedGlobals = diff( old, config.pollution );
-	if ( deletedGlobals.length > 0 ) {
-		QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") );
-	}
-}
-
-// returns a new Array with the elements that are in a but not in b
-function diff( a, b ) {
-	var i, j,
-		result = a.slice();
-
-	for ( i = 0; i < result.length; i++ ) {
-		for ( j = 0; j < b.length; j++ ) {
-			if ( result[i] === b[j] ) {
-				result.splice( i, 1 );
-				i--;
-				break;
-			}
-		}
-	}
-	return result;
-}
-
-function extend( a, b ) {
-	for ( var prop in b ) {
-		if ( hasOwn.call( b, prop ) ) {
-			// Avoid "Member not found" error in IE8 caused by messing with window.constructor
-			if ( !( prop === "constructor" && a === window ) ) {
-				if ( b[ prop ] === undefined ) {
-					delete a[ prop ];
-				} else {
-					a[ prop ] = b[ prop ];
-				}
-			}
-		}
-	}
-
-	return a;
-}
-
-/**
- * @param {HTMLElement} elem
- * @param {string} type
- * @param {Function} fn
- */
-function addEvent( elem, type, fn ) {
-	if ( elem.addEventListener ) {
-
-		// Standards-based browsers
-		elem.addEventListener( type, fn, false );
-	} else if ( elem.attachEvent ) {
-
-		// support: IE <9
-		elem.attachEvent( "on" + type, fn );
-	} else {
-
-		// Caller must ensure support for event listeners is present
-		throw new Error( "addEvent() was called in a context without event listener support" );
-	}
-}
-
-/**
- * @param {Array|NodeList} elems
- * @param {string} type
- * @param {Function} fn
- */
-function addEvents( elems, type, fn ) {
-	var i = elems.length;
-	while ( i-- ) {
-		addEvent( elems[i], type, fn );
-	}
-}
-
-function hasClass( elem, name ) {
-	return (" " + elem.className + " ").indexOf(" " + name + " ") > -1;
-}
-
-function addClass( elem, name ) {
-	if ( !hasClass( elem, name ) ) {
-		elem.className += (elem.className ? " " : "") + name;
-	}
-}
-
-function removeClass( elem, name ) {
-	var set = " " + elem.className + " ";
-	// Class name may appear multiple times
-	while ( set.indexOf(" " + name + " ") > -1 ) {
-		set = set.replace(" " + name + " " , " ");
-	}
-	// If possible, trim it for prettiness, but not necessarily
-	elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
-}
-
-function id( name ) {
-	return defined.document && document.getElementById && document.getElementById( name );
-}
-
-function registerLoggingCallback( key ) {
-	return function( callback ) {
-		config[key].push( callback );
-	};
-}
-
-// Supports deprecated method of completely overwriting logging callbacks
-function runLoggingCallbacks( key, scope, args ) {
-	var i, callbacks;
-	if ( QUnit.hasOwnProperty( key ) ) {
-		QUnit[ key ].call(scope, args );
-	} else {
-		callbacks = config[ key ];
-		for ( i = 0; i < callbacks.length; i++ ) {
-			callbacks[ i ].call( scope, args );
-		}
-	}
-}
-
-// from jquery.js
-function inArray( elem, array ) {
-	if ( array.indexOf ) {
-		return array.indexOf( elem );
-	}
-
-	for ( var i = 0, length = array.length; i < length; i++ ) {
-		if ( array[ i ] === elem ) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-function Test( settings ) {
-	extend( this, settings );
-	this.assertions = [];
-	this.testNumber = ++Test.count;
-}
-
-Test.count = 0;
-
-Test.prototype = {
-	init: function() {
-		var a, b, li,
-			tests = id( "qunit-tests" );
-
-		if ( tests ) {
-			b = document.createElement( "strong" );
-			b.innerHTML = this.nameHtml;
-
-			// `a` initialized at top of scope
-			a = document.createElement( "a" );
-			a.innerHTML = "Rerun";
-			a.href = QUnit.url({ testNumber: this.testNumber });
-
-			li = document.createElement( "li" );
-			li.appendChild( b );
-			li.appendChild( a );
-			li.className = "running";
-			li.id = this.id = "qunit-test-output" + testId++;
-
-			tests.appendChild( li );
-		}
-	},
-	setup: function() {
-		if (
-			// Emit moduleStart when we're switching from one module to another
-			this.module !== config.previousModule ||
-				// They could be equal (both undefined) but if the previousModule property doesn't
-				// yet exist it means this is the first test in a suite that isn't wrapped in a
-				// module, in which case we'll just emit a moduleStart event for 'undefined'.
-				// Without this, reporters can get testStart before moduleStart  which is a problem.
-				!hasOwn.call( config, "previousModule" )
-		) {
-			if ( hasOwn.call( config, "previousModule" ) ) {
-				runLoggingCallbacks( "moduleDone", QUnit, {
-					name: config.previousModule,
-					failed: config.moduleStats.bad,
-					passed: config.moduleStats.all - config.moduleStats.bad,
-					total: config.moduleStats.all
-				});
-			}
-			config.previousModule = this.module;
-			config.moduleStats = { all: 0, bad: 0 };
-			runLoggingCallbacks( "moduleStart", QUnit, {
-				name: this.module
-			});
-		}
-
-		config.current = this;
-
-		this.testEnvironment = extend({
-			setup: function() {},
-			teardown: function() {}
-		}, this.moduleTestEnvironment );
-
-		this.started = +new Date();
-		runLoggingCallbacks( "testStart", QUnit, {
-			name: this.testName,
-			module: this.module
-		});
-
-		/*jshint camelcase:false */
-
-
-		/**
-		 * Expose the current test environment.
-		 *
-		 * @deprecated since 1.12.0: Use QUnit.config.current.testEnvironment instead.
-		 */
-		QUnit.current_testEnvironment = this.testEnvironment;
-
-		/*jshint camelcase:true */
-
-		if ( !config.pollution ) {
-			saveGlobal();
-		}
-		if ( config.notrycatch ) {
-			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
-			return;
-		}
-		try {
-			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
-		} catch( e ) {
-			QUnit.pushFailure( "Setup failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
-		}
-	},
-	run: function() {
-		config.current = this;
-
-		var running = id( "qunit-testresult" );
-
-		if ( running ) {
-			running.innerHTML = "Running: <br/>" + this.nameHtml;
-		}
-
-		if ( this.async ) {
-			QUnit.stop();
-		}
-
-		this.callbackStarted = +new Date();
-
-		if ( config.notrycatch ) {
-			this.callback.call( this.testEnvironment, QUnit.assert );
-			this.callbackRuntime = +new Date() - this.callbackStarted;
-			return;
-		}
-
-		try {
-			this.callback.call( this.testEnvironment, QUnit.assert );
-			this.callbackRuntime = +new Date() - this.callbackStarted;
-		} catch( e ) {
-			this.callbackRuntime = +new Date() - this.callbackStarted;
-
-			QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
-			// else next test will carry the responsibility
-			saveGlobal();
-
-			// Restart the tests if they're blocking
-			if ( config.blocking ) {
-				QUnit.start();
-			}
-		}
-	},
-	teardown: function() {
-		config.current = this;
-		if ( config.notrycatch ) {
-			if ( typeof this.callbackRuntime === "undefined" ) {
-				this.callbackRuntime = +new Date() - this.callbackStarted;
-			}
-			this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
-			return;
-		} else {
-			try {
-				this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
-			} catch( e ) {
-				QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
-			}
-		}
-		checkPollution();
-	},
-	finish: function() {
-		config.current = this;
-		if ( config.requireExpects && this.expected === null ) {
-			QUnit.pushFailure( "Expected number of assertions to be defined, but expect() was not called.", this.stack );
-		} else if ( this.expected !== null && this.expected !== this.assertions.length ) {
-			QUnit.pushFailure( "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack );
-		} else if ( this.expected === null && !this.assertions.length ) {
-			QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.", this.stack );
-		}
-
-		var i, assertion, a, b, time, li, ol,
-			test = this,
-			good = 0,
-			bad = 0,
-			tests = id( "qunit-tests" );
-
-		this.runtime = +new Date() - this.started;
-		config.stats.all += this.assertions.length;
-		config.moduleStats.all += this.assertions.length;
-
-		if ( tests ) {
-			ol = document.createElement( "ol" );
-			ol.className = "qunit-assert-list";
-
-			for ( i = 0; i < this.assertions.length; i++ ) {
-				assertion = this.assertions[i];
-
-				li = document.createElement( "li" );
-				li.className = assertion.result ? "pass" : "fail";
-				li.innerHTML = assertion.message || ( assertion.result ? "okay" : "failed" );
-				ol.appendChild( li );
-
-				if ( assertion.result ) {
-					good++;
-				} else {
-					bad++;
-					config.stats.bad++;
-					config.moduleStats.bad++;
-				}
-			}
-
-			// store result when possible
-			if ( QUnit.config.reorder && defined.sessionStorage ) {
-				if ( bad ) {
-					sessionStorage.setItem( "qunit-test-" + this.module + "-" + this.testName, bad );
-				} else {
-					sessionStorage.removeItem( "qunit-test-" + this.module + "-" + this.testName );
-				}
-			}
-
-			if ( bad === 0 ) {
-				addClass( ol, "qunit-collapsed" );
-			}
-
-			// `b` initialized at top of scope
-			b = document.createElement( "strong" );
-			b.innerHTML = this.nameHtml + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
-
-			addEvent(b, "click", function() {
-				var next = b.parentNode.lastChild,
-					collapsed = hasClass( next, "qunit-collapsed" );
-				( collapsed ? removeClass : addClass )( next, "qunit-collapsed" );
-			});
-
-			addEvent(b, "dblclick", function( e ) {
-				var target = e && e.target ? e.target : window.event.srcElement;
-				if ( target.nodeName.toLowerCase() === "span" || target.nodeName.toLowerCase() === "b" ) {
-					target = target.parentNode;
-				}
-				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
-					window.location = QUnit.url({ testNumber: test.testNumber });
-				}
-			});
-
-			// `time` initialized at top of scope
-			time = document.createElement( "span" );
-			time.className = "runtime";
-			time.innerHTML = this.runtime + " ms";
-
-			// `li` initialized at top of scope
-			li = id( this.id );
-			li.className = bad ? "fail" : "pass";
-			li.removeChild( li.firstChild );
-			a = li.firstChild;
-			li.appendChild( b );
-			li.appendChild( a );
-			li.appendChild( time );
-			li.appendChild( ol );
-
-		} else {
-			for ( i = 0; i < this.assertions.length; i++ ) {
-				if ( !this.assertions[i].result ) {
-					bad++;
-					config.stats.bad++;
-					config.moduleStats.bad++;
-				}
-			}
-		}
-
-		runLoggingCallbacks( "testDone", QUnit, {
-			name: this.testName,
-			module: this.module,
-			failed: bad,
-			passed: this.assertions.length - bad,
-			total: this.assertions.length,
-			runtime: this.runtime,
-			// DEPRECATED: this property will be removed in 2.0.0, use runtime instead
-			duration: this.runtime
-		});
-
-		QUnit.reset();
-
-		config.current = undefined;
-	},
-
-	queue: function() {
-		var bad,
-			test = this;
-
-		synchronize(function() {
-			test.init();
-		});
-		function run() {
-			// each of these can by async
-			synchronize(function() {
-				test.setup();
-			});
-			synchronize(function() {
-				test.run();
-			});
-			synchronize(function() {
-				test.teardown();
-			});
-			synchronize(function() {
-				test.finish();
-			});
-		}
-
-		// `bad` initialized at top of scope
-		// defer when previous test run passed, if storage is available
-		bad = QUnit.config.reorder && defined.sessionStorage &&
-						+sessionStorage.getItem( "qunit-test-" + this.module + "-" + this.testName );
-
-		if ( bad ) {
-			run();
-		} else {
-			synchronize( run, true );
-		}
-	}
-};
-
-// `assert` initialized at top of scope
-// Assert helpers
-// All of these must either call QUnit.push() or manually do:
-// - runLoggingCallbacks( "log", .. );
-// - config.current.assertions.push({ .. });
-assert = QUnit.assert = {
-	/**
-	 * Asserts rough true-ish result.
-	 * @name ok
-	 * @function
-	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
-	 */
-	ok: function( result, msg ) {
-		if ( !config.current ) {
-			throw new Error( "ok() assertion outside test context, was " + sourceFromStacktrace(2) );
-		}
-		result = !!result;
-		msg = msg || ( result ? "okay" : "failed" );
-
-		var source,
-			details = {
-				module: config.current.module,
-				name: config.current.testName,
-				result: result,
-				message: msg
-			};
-
-		msg = "<span class='test-message'>" + escapeText( msg ) + "</span>";
-
-		if ( !result ) {
-			source = sourceFromStacktrace( 2 );
-			if ( source ) {
-				details.source = source;
-				msg += "<table><tr class='test-source'><th>Source: </th><td><pre>" +
-					escapeText( source ) +
-					"</pre></td></tr></table>";
-			}
-		}
-		runLoggingCallbacks( "log", QUnit, details );
-		config.current.assertions.push({
-			result: result,
-			message: msg
-		});
-	},
-
-	/**
-	 * Assert that the first two arguments are equal, with an optional message.
-	 * Prints out both actual and expected values.
-	 * @name equal
-	 * @function
-	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
-	 */
-	equal: function( actual, expected, message ) {
-		/*jshint eqeqeq:false */
-		QUnit.push( expected == actual, actual, expected, message );
-	},
-
-	/**
-	 * @name notEqual
-	 * @function
-	 */
-	notEqual: function( actual, expected, message ) {
-		/*jshint eqeqeq:false */
-		QUnit.push( expected != actual, actual, expected, message );
-	},
-
-	/**
-	 * @name propEqual
-	 * @function
-	 */
-	propEqual: function( actual, expected, message ) {
-		actual = objectValues(actual);
-		expected = objectValues(expected);
-		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
-	},
-
-	/**
-	 * @name notPropEqual
-	 * @function
-	 */
-	notPropEqual: function( actual, expected, message ) {
-		actual = objectValues(actual);
-		expected = objectValues(expected);
-		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
-	},
-
-	/**
-	 * @name deepEqual
-	 * @function
-	 */
-	deepEqual: function( actual, expected, message ) {
-		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
-	},
-
-	/**
-	 * @name notDeepEqual
-	 * @function
-	 */
-	notDeepEqual: function( actual, expected, message ) {
-		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
-	},
-
-	/**
-	 * @name strictEqual
-	 * @function
-	 */
-	strictEqual: function( actual, expected, message ) {
-		QUnit.push( expected === actual, actual, expected, message );
-	},
-
-	/**
-	 * @name notStrictEqual
-	 * @function
-	 */
-	notStrictEqual: function( actual, expected, message ) {
-		QUnit.push( expected !== actual, actual, expected, message );
-	},
-
-	"throws": function( block, expected, message ) {
-		var actual,
-			expectedOutput = expected,
-			ok = false;
-
-		// 'expected' is optional
-		if ( !message && typeof expected === "string" ) {
-			message = expected;
-			expected = null;
-		}
-
-		config.current.ignoreGlobalErrors = true;
-		try {
-			block.call( config.current.testEnvironment );
-		} catch (e) {
-			actual = e;
-		}
-		config.current.ignoreGlobalErrors = false;
-
-		if ( actual ) {
-
-			// we don't want to validate thrown error
-			if ( !expected ) {
-				ok = true;
-				expectedOutput = null;
-
-			// expected is an Error object
-			} else if ( expected instanceof Error ) {
-				ok = actual instanceof Error &&
-					 actual.name === expected.name &&
-					 actual.message === expected.message;
-
-			// expected is a regexp
-			} else if ( QUnit.objectType( expected ) === "regexp" ) {
-				ok = expected.test( errorString( actual ) );
-
-			// expected is a string
-			} else if ( QUnit.objectType( expected ) === "string" ) {
-				ok = expected === errorString( actual );
-
-			// expected is a constructor
-			} else if ( actual instanceof expected ) {
-				ok = true;
-
-			// expected is a validation function which returns true is validation passed
-			} else if ( expected.call( {}, actual ) === true ) {
-				expectedOutput = null;
-				ok = true;
-			}
-
-			QUnit.push( ok, actual, expectedOutput, message );
-		} else {
-			QUnit.pushFailure( message, null, "No exception was thrown." );
-		}
-	}
-};
-
-/**
- * @deprecated since 1.8.0
- * Kept assertion helpers in root for backwards compatibility.
- */
-extend( QUnit.constructor.prototype, assert );
-
-/**
- * @deprecated since 1.9.0
- * Kept to avoid TypeErrors for undefined methods.
- */
-QUnit.constructor.prototype.raises = function() {
-	QUnit.push( false, false, false, "QUnit.raises has been deprecated since 2012 (fad3c1ea), use QUnit.throws instead" );
-};
-
-/**
- * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
- * Kept to avoid TypeErrors for undefined methods.
- */
-QUnit.constructor.prototype.equals = function() {
-	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
-};
-QUnit.constructor.prototype.same = function() {
-	QUnit.push( false, false, false, "QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead" );
-};
-
-// Test for equality any JavaScript type.
-// Author: Philippe Rathé <prathe@gmail.com>
-QUnit.equiv = (function() {
-
-	// Call the o related callback with the given arguments.
-	function bindCallbacks( o, callbacks, args ) {
-		var prop = QUnit.objectType( o );
-		if ( prop ) {
-			if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) {
-				return callbacks[ prop ].apply( callbacks, args );
-			} else {
-				return callbacks[ prop ]; // or undefined
-			}
-		}
-	}
-
-	// the real equiv function
-	var innerEquiv,
-		// stack to decide between skip/abort functions
-		callers = [],
-		// stack to avoiding loops from circular referencing
-		parents = [],
-		parentsB = [],
-
-		getProto = Object.getPrototypeOf || function ( obj ) {
-			/*jshint camelcase:false */
-			return obj.__proto__;
-		},
-		callbacks = (function () {
-
-			// for string, boolean, number and null
-			function useStrictEquality( b, a ) {
-				/*jshint eqeqeq:false */
-				if ( b instanceof a.constructor || a instanceof b.constructor ) {
-					// to catch short annotation VS 'new' annotation of a
-					// declaration
-					// e.g. var i = 1;
-					// var j = new Number(1);
-					return a == b;
-				} else {
-					return a === b;
-				}
-			}
-
-			return {
-				"string": useStrictEquality,
-				"boolean": useStrictEquality,
-				"number": useStrictEquality,
-				"null": useStrictEquality,
-				"undefined": useStrictEquality,
-
-				"nan": function( b ) {
-					return isNaN( b );
-				},
-
-				"date": function( b, a ) {
-					return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
-				},
-
-				"regexp": function( b, a ) {
-					return QUnit.objectType( b ) === "regexp" &&
-						// the regex itself
-						a.source === b.source &&
-						// and its modifiers
-						a.global === b.global &&
-						// (gmi) ...
-						a.ignoreCase === b.ignoreCase &&
-						a.multiline === b.multiline &&
-						a.sticky === b.sticky;
-				},
-
-				// - skip when the property is a method of an instance (OOP)
-				// - abort otherwise,
-				// initial === would have catch identical references anyway
-				"function": function() {
-					var caller = callers[callers.length - 1];
-					return caller !== Object && typeof caller !== "undefined";
-				},
-
-				"array": function( b, a ) {
-					var i, j, len, loop, aCircular, bCircular;
-
-					// b could be an object literal here
-					if ( QUnit.objectType( b ) !== "array" ) {
-						return false;
-					}
-
-					len = a.length;
-					if ( len !== b.length ) {
-						// safe and faster
-						return false;
-					}
-
-					// track reference to avoid circular references
-					parents.push( a );
-					parentsB.push( b );
-					for ( i = 0; i < len; i++ ) {
-						loop = false;
-						for ( j = 0; j < parents.length; j++ ) {
-							aCircular = parents[j] === a[i];
-							bCircular = parentsB[j] === b[i];
-							if ( aCircular || bCircular ) {
-								if ( a[i] === b[i] || aCircular && bCircular ) {
-									loop = true;
-								} else {
-									parents.pop();
-									parentsB.pop();
-									return false;
-								}
-							}
-						}
-						if ( !loop && !innerEquiv(a[i], b[i]) ) {
-							parents.pop();
-							parentsB.pop();
-							return false;
-						}
-					}
-					parents.pop();
-					parentsB.pop();
-					return true;
-				},
-
-				"object": function( b, a ) {
-					/*jshint forin:false */
-					var i, j, loop, aCircular, bCircular,
-						// Default to true
-						eq = true,
-						aProperties = [],
-						bProperties = [];
-
-					// comparing constructors is more strict than using
-					// instanceof
-					if ( a.constructor !== b.constructor ) {
-						// Allow objects with no prototype to be equivalent to
-						// objects with Object as their constructor.
-						if ( !(( getProto(a) === null && getProto(b) === Object.prototype ) ||
-							( getProto(b) === null && getProto(a) === Object.prototype ) ) ) {
-								return false;
-						}
-					}
-
-					// stack constructor before traversing properties
-					callers.push( a.constructor );
-
-					// track reference to avoid circular references
-					parents.push( a );
-					parentsB.push( b );
-
-					// be strict: don't ensure hasOwnProperty and go deep
-					for ( i in a ) {
-						loop = false;
-						for ( j = 0; j < parents.length; j++ ) {
-							aCircular = parents[j] === a[i];
-							bCircular = parentsB[j] === b[i];
-							if ( aCircular || bCircular ) {
-								if ( a[i] === b[i] || aCircular && bCircular ) {
-									loop = true;
-								} else {
-									eq = false;
-									break;
-								}
-							}
-						}
-						aProperties.push(i);
-						if ( !loop && !innerEquiv(a[i], b[i]) ) {
-							eq = false;
-							break;
-						}
-					}
-
-					parents.pop();
-					parentsB.pop();
-					callers.pop(); // unstack, we are done
-
-					for ( i in b ) {
-						bProperties.push( i ); // collect b's properties
-					}
-
-					// Ensures identical properties name
-					return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
-				}
-			};
-		}());
-
-	innerEquiv = function() { // can take multiple arguments
-		var args = [].slice.apply( arguments );
-		if ( args.length < 2 ) {
-			return true; // end transition
-		}
-
-		return (function( a, b ) {
-			if ( a === b ) {
-				return true; // catch the most you can
-			} else if ( a === null || b === null || typeof a === "undefined" ||
-					typeof b === "undefined" ||
-					QUnit.objectType(a) !== QUnit.objectType(b) ) {
-				return false; // don't lose time with error prone cases
-			} else {
-				return bindCallbacks(a, callbacks, [ b, a ]);
-			}
-
-			// apply transition with (1..n) arguments
-		}( args[0], args[1] ) && innerEquiv.apply( this, args.splice(1, args.length - 1 )) );
-	};
-
-	return innerEquiv;
-}());
-
-/**
- * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
- * http://flesler.blogspot.com Licensed under BSD
- * (http://www.opensource.org/licenses/bsd-license.php) Date: 5/15/2008
- *
- * @projectDescription Advanced and extensible data dumping for Javascript.
- * @version 1.0.0
- * @author Ariel Flesler
- * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
- */
-QUnit.jsDump = (function() {
-	function quote( str ) {
-		return "\"" + str.toString().replace( /"/g, "\\\"" ) + "\"";
-	}
-	function literal( o ) {
-		return o + "";
-	}
-	function join( pre, arr, post ) {
-		var s = jsDump.separator(),
-			base = jsDump.indent(),
-			inner = jsDump.indent(1);
-		if ( arr.join ) {
-			arr = arr.join( "," + s + inner );
-		}
-		if ( !arr ) {
-			return pre + post;
-		}
-		return [ pre, inner + arr, base + post ].join(s);
-	}
-	function array( arr, stack ) {
-		var i = arr.length, ret = new Array(i);
-		this.up();
-		while ( i-- ) {
-			ret[i] = this.parse( arr[i] , undefined , stack);
-		}
-		this.down();
-		return join( "[", ret, "]" );
-	}
-
-	var reName = /^function (\w+)/,
-		jsDump = {
-			// type is used mostly internally, you can fix a (custom)type in advance
-			parse: function( obj, type, stack ) {
-				stack = stack || [ ];
-				var inStack, res,
-					parser = this.parsers[ type || this.typeOf(obj) ];
-
-				type = typeof parser;
-				inStack = inArray( obj, stack );
-
-				if ( inStack !== -1 ) {
-					return "recursion(" + (inStack - stack.length) + ")";
-				}
-				if ( type === "function" )  {
-					stack.push( obj );
-					res = parser.call( this, obj, stack );
-					stack.pop();
-					return res;
-				}
-				return ( type === "string" ) ? parser : this.parsers.error;
-			},
-			typeOf: function( obj ) {
-				var type;
-				if ( obj === null ) {
-					type = "null";
-				} else if ( typeof obj === "undefined" ) {
-					type = "undefined";
-				} else if ( QUnit.is( "regexp", obj) ) {
-					type = "regexp";
-				} else if ( QUnit.is( "date", obj) ) {
-					type = "date";
-				} else if ( QUnit.is( "function", obj) ) {
-					type = "function";
-				} else if ( typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined" ) {
-					type = "window";
-				} else if ( obj.nodeType === 9 ) {
-					type = "document";
-				} else if ( obj.nodeType ) {
-					type = "node";
-				} else if (
-					// native arrays
-					toString.call( obj ) === "[object Array]" ||
-					// NodeList objects
-					( typeof obj.length === "number" && typeof obj.item !== "undefined" && ( obj.length ? obj.item(0) === obj[0] : ( obj.item( 0 ) === null && typeof obj[0] === "undefined" ) ) )
-				) {
-					type = "array";
-				} else if ( obj.constructor === Error.prototype.constructor ) {
-					type = "error";
-				} else {
-					type = typeof obj;
-				}
-				return type;
-			},
-			separator: function() {
-				return this.multiline ?	this.HTML ? "<br />" : "\n" : this.HTML ? "&nbsp;" : " ";
-			},
-			// extra can be a number, shortcut for increasing-calling-decreasing
-			indent: function( extra ) {
-				if ( !this.multiline ) {
-					return "";
-				}
-				var chr = this.indentChar;
-				if ( this.HTML ) {
-					chr = chr.replace( /\t/g, "   " ).replace( / /g, "&nbsp;" );
-				}
-				return new Array( this.depth + ( extra || 0 ) ).join(chr);
-			},
-			up: function( a ) {
-				this.depth += a || 1;
-			},
-			down: function( a ) {
-				this.depth -= a || 1;
-			},
-			setParser: function( name, parser ) {
-				this.parsers[name] = parser;
-			},
-			// The next 3 are exposed so you can use them
-			quote: quote,
-			literal: literal,
-			join: join,
-			//
-			depth: 1,
-			// This is the list of parsers, to modify them, use jsDump.setParser
-			parsers: {
-				window: "[Window]",
-				document: "[Document]",
-				error: function(error) {
-					return "Error(\"" + error.message + "\")";
-				},
-				unknown: "[Unknown]",
-				"null": "null",
-				"undefined": "undefined",
-				"function": function( fn ) {
-					var ret = "function",
-						// functions never have name in IE
-						name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
-
-					if ( name ) {
-						ret += " " + name;
-					}
-					ret += "( ";
-
-					ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" );
-					return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" );
-				},
-				array: array,
-				nodelist: array,
-				"arguments": array,
-				object: function( map, stack ) {
-					/*jshint forin:false */
-					var ret = [ ], keys, key, val, i;
-					QUnit.jsDump.up();
-					keys = [];
-					for ( key in map ) {
-						keys.push( key );
-					}
-					keys.sort();
-					for ( i = 0; i < keys.length; i++ ) {
-						key = keys[ i ];
-						val = map[ key ];
-						ret.push( QUnit.jsDump.parse( key, "key" ) + ": " + QUnit.jsDump.parse( val, undefined, stack ) );
-					}
-					QUnit.jsDump.down();
-					return join( "{", ret, "}" );
-				},
-				node: function( node ) {
-					var len, i, val,
-						open = QUnit.jsDump.HTML ? "&lt;" : "<",
-						close = QUnit.jsDump.HTML ? "&gt;" : ">",
-						tag = node.nodeName.toLowerCase(),
-						ret = open + tag,
-						attrs = node.attributes;
-
-					if ( attrs ) {
-						for ( i = 0, len = attrs.length; i < len; i++ ) {
-							val = attrs[i].nodeValue;
-							// IE6 includes all attributes in .attributes, even ones not explicitly set.
-							// Those have values like undefined, null, 0, false, "" or "inherit".
-							if ( val && val !== "inherit" ) {
-								ret += " " + attrs[i].nodeName + "=" + QUnit.jsDump.parse( val, "attribute" );
-							}
-						}
-					}
-					ret += close;
-
-					// Show content of TextNode or CDATASection
-					if ( node.nodeType === 3 || node.nodeType === 4 ) {
-						ret += node.nodeValue;
-					}
-
-					return ret + open + "/" + tag + close;
-				},
-				// function calls it internally, it's the arguments part of the function
-				functionArgs: function( fn ) {
-					var args,
-						l = fn.length;
-
-					if ( !l ) {
-						return "";
-					}
-
-					args = new Array(l);
-					while ( l-- ) {
-						// 97 is 'a'
-						args[l] = String.fromCharCode(97+l);
-					}
-					return " " + args.join( ", " ) + " ";
-				},
-				// object calls it internally, the key part of an item in a map
-				key: quote,
-				// function calls it internally, it's the content of the function
-				functionCode: "[code]",
-				// node calls it internally, it's an html attribute value
-				attribute: quote,
-				string: quote,
-				date: quote,
-				regexp: literal,
-				number: literal,
-				"boolean": literal
-			},
-			// if true, entities are escaped ( <, >, \t, space and \n )
-			HTML: false,
-			// indentation unit
-			indentChar: "  ",
-			// if true, items in a collection, are separated by a \n, else just a space.
-			multiline: true
-		};
-
-	return jsDump;
-}());
-
-/*
- * Javascript Diff Algorithm
- *  By John Resig (http://ejohn.org/)
- *  Modified by Chu Alan "sprite"
- *
- * Released under the MIT license.
- *
- * More Info:
- *  http://ejohn.org/projects/javascript-diff-algorithm/
- *
- * Usage: QUnit.diff(expected, actual)
- *
- * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
- */
-QUnit.diff = (function() {
-	/*jshint eqeqeq:false, eqnull:true */
-	function diff( o, n ) {
-		var i,
-			ns = {},
-			os = {};
-
-		for ( i = 0; i < n.length; i++ ) {
-			if ( !hasOwn.call( ns, n[i] ) ) {
-				ns[ n[i] ] = {
-					rows: [],
-					o: null
-				};
-			}
-			ns[ n[i] ].rows.push( i );
-		}
-
-		for ( i = 0; i < o.length; i++ ) {
-			if ( !hasOwn.call( os, o[i] ) ) {
-				os[ o[i] ] = {
-					rows: [],
-					n: null
-				};
-			}
-			os[ o[i] ].rows.push( i );
-		}
-
-		for ( i in ns ) {
-			if ( hasOwn.call( ns, i ) ) {
-				if ( ns[i].rows.length === 1 && hasOwn.call( os, i ) && os[i].rows.length === 1 ) {
-					n[ ns[i].rows[0] ] = {
-						text: n[ ns[i].rows[0] ],
-						row: os[i].rows[0]
-					};
-					o[ os[i].rows[0] ] = {
-						text: o[ os[i].rows[0] ],
-						row: ns[i].rows[0]
-					};
-				}
-			}
-		}
-
-		for ( i = 0; i < n.length - 1; i++ ) {
-			if ( n[i].text != null && n[ i + 1 ].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null &&
-						n[ i + 1 ] == o[ n[i].row + 1 ] ) {
-
-				n[ i + 1 ] = {
-					text: n[ i + 1 ],
-					row: n[i].row + 1
-				};
-				o[ n[i].row + 1 ] = {
-					text: o[ n[i].row + 1 ],
-					row: i + 1
-				};
-			}
-		}
-
-		for ( i = n.length - 1; i > 0; i-- ) {
-			if ( n[i].text != null && n[ i - 1 ].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null &&
-						n[ i - 1 ] == o[ n[i].row - 1 ]) {
-
-				n[ i - 1 ] = {
-					text: n[ i - 1 ],
-					row: n[i].row - 1
-				};
-				o[ n[i].row - 1 ] = {
-					text: o[ n[i].row - 1 ],
-					row: i - 1
-				};
-			}
-		}
-
-		return {
-			o: o,
-			n: n
-		};
-	}
-
-	return function( o, n ) {
-		o = o.replace( /\s+$/, "" );
-		n = n.replace( /\s+$/, "" );
-
-		var i, pre,
-			str = "",
-			out = diff( o === "" ? [] : o.split(/\s+/), n === "" ? [] : n.split(/\s+/) ),
-			oSpace = o.match(/\s+/g),
-			nSpace = n.match(/\s+/g);
-
-		if ( oSpace == null ) {
-			oSpace = [ " " ];
-		}
-		else {
-			oSpace.push( " " );
-		}
-
-		if ( nSpace == null ) {
-			nSpace = [ " " ];
-		}
-		else {
-			nSpace.push( " " );
-		}
-
-		if ( out.n.length === 0 ) {
-			for ( i = 0; i < out.o.length; i++ ) {
-				str += "<del>" + out.o[i] + oSpace[i] + "</del>";
-			}
-		}
-		else {
-			if ( out.n[0].text == null ) {
-				for ( n = 0; n < out.o.length && out.o[n].text == null; n++ ) {
-					str += "<del>" + out.o[n] + oSpace[n] + "</del>";
-				}
-			}
-
-			for ( i = 0; i < out.n.length; i++ ) {
-				if (out.n[i].text == null) {
-					str += "<ins>" + out.n[i] + nSpace[i] + "</ins>";
-				}
-				else {
-					// `pre` initialized at top of scope
-					pre = "";
-
-					for ( n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
-						pre += "<del>" + out.o[n] + oSpace[n] + "</del>";
-					}
-					str += " " + out.n[i].text + nSpace[i] + pre;
-				}
-			}
-		}
-
-		return str;
-	};
-}());
-
-// For browser, export only select globals
-if ( typeof window !== "undefined" ) {
-	extend( window, QUnit.constructor.prototype );
-	window.QUnit = QUnit;
-}
-
-// For CommonJS environments, export everything
-if ( typeof module !== "undefined" && module.exports ) {
-	module.exports = QUnit;
-}
-
-
-// Get a reference to the global object, like window in browsers
-}( (function() {
-	return this;
-})() ));
diff --git a/dev/tests/js/JsTestDriver/framework/requirejs-util.js b/dev/tests/js/JsTestDriver/framework/requirejs-util.js
deleted file mode 100644
index b9d6b833d36af..0000000000000
--- a/dev/tests/js/JsTestDriver/framework/requirejs-util.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-(function ($, window) {
-    "use strict";
-
-    // List of define() calls with arguments and call stack
-    var defineCalls = [];
-
-    // Get current call stack, including script path information
-    var getFileStack = function() {
-        try {
-            throw new Error();
-        } catch (e) {
-            if (!e.stack) {
-                throw new Error('The browser needs to support Error.stack property');
-            }
-            return e.stack;
-        }
-    };
-
-    // Intercept RequireJS define() calls, which are performed by AMD scripts upon loading
-    window.define = function () {
-        var stack = getFileStack();
-        defineCalls.push({
-            stack: stack,
-            args: arguments
-        });
-    };
-
-    window.require = function(dependencies, callback){
-        return callback && callback();
-    };
-
-    // Exposed interface
-    var requirejsUtil = {
-        getDefineArgsInScript: function (scriptPath) {
-            var result;
-            for (var i = 0; i < defineCalls.length; i++) {
-                if (defineCalls[i].stack.indexOf(scriptPath) >= 0) {
-                    result = defineCalls[i].args;
-                    break;
-                }
-            }
-            return result;
-        }
-    };
-
-    window.jsunit = window.jsunit || {};
-    $.extend(window.jsunit, {requirejsUtil: requirejsUtil});
-})(jQuery, window);
diff --git a/dev/tests/js/JsTestDriver/framework/stub.js b/dev/tests/js/JsTestDriver/framework/stub.js
deleted file mode 100644
index c966ab578cac8..0000000000000
--- a/dev/tests/js/JsTestDriver/framework/stub.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-(function ($, window) {
-    "use strict";
-
-    function wrapMethod(object, property, method, copyProperties) {
-        if (!object) {
-            throw new TypeError("Should wrap property of object");
-        }
-
-        if (typeof method != "function") {
-            throw new TypeError("Method wrapper should be function");
-        }
-
-        var wrappedMethod = object[property],
-            error;
-
-        if ($.type(wrappedMethod) !== 'function') {
-            error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
-                property + " as function");
-        }
-
-        if (wrappedMethod.restore) {
-            error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
-        }
-
-        if (error) {
-            if (wrappedMethod._stack) {
-                error.stack += '\n--------------\n' + wrappedMethod._stack;
-            }
-            throw error;
-        }
-
-        // IE 8 does not support hasOwnProperty.
-        var owned = object.hasOwnProperty ?
-            object.hasOwnProperty(property) :
-            Object.prototype.hasOwnProperty.call(object, property);
-
-        object[property] = method;
-        method.displayName = property;
-        // Stack trace which can be used to find what line of code the original method was created on.
-        method._stack = (new Error('Stack Trace for original')).stack;
-
-        method.restore = function () {
-            if (!owned) {
-                delete object[property];
-            }
-            if (object[property] === method) {
-                object[property] = wrappedMethod;
-            }
-        };
-
-        if (copyProperties) {
-            for (var prop in wrappedMethod) {
-                if (!Object.prototype.hasOwnProperty.call(method, prop)) {
-                    method[prop] = wrappedMethod[prop];
-                }
-            }
-        }
-
-        return method;
-    }
-
-    function stub(object, property, func, copyProperties) {
-        if (!!func && typeof func != "function") {
-            throw new TypeError("Custom stub should be function");
-        }
-
-        var wrapper;
-
-        if (func) {
-            wrapper = func;
-        } else {
-            wrapper = stub.create();
-        }
-
-        if (!object && typeof property === "undefined") {
-            return stub.create();
-        }
-
-        if (typeof property === "undefined" && typeof object == "object") {
-            for (var prop in object) {
-                if (typeof object[prop] === "function") {
-                    stub(object, prop);
-                }
-            }
-
-            return object;
-        }
-
-        return wrapMethod(object, property, wrapper, copyProperties);
-    }
-
-    $.extend(stub, (function () {
-        var proto = {
-            create: function create() {
-                var functionStub = function () {
-                    functionStub.callCount = functionStub.callCount ? functionStub.callCount + 1 : 1;
-                    functionStub.lastCallArgs = arguments;
-                    functionStub.callArgsStack.push(arguments);
-                    if (functionStub.returnCallback && $.type(functionStub.returnCallback) === 'function') {
-                        return functionStub.returnCallback.apply(functionStub.returnCallback, arguments);
-                    } else if (functionStub.returnValue) {
-                        return functionStub.returnValue;
-                    }
-                };
-                $.extend(functionStub, stub);
-                functionStub.reset();
-                functionStub.displayName = "stub";
-                return functionStub;
-            },
-
-            reset: function() {
-                this.callCount = null;
-                this.lastCallArgs = [];
-                this.callArgsStack = [];
-                this.returnValue = null;
-                this.returnCallback = null;
-            }
-        };
-
-        return proto;
-    }()));
-
-    window.jsunit = window.jsunit || {};
-    $.extend(window.jsunit, {
-        stub: stub
-    });
-})(jQuery, window);
diff --git a/dev/tests/js/JsTestDriver/jsTestDriver.php.dist b/dev/tests/js/JsTestDriver/jsTestDriver.php.dist
deleted file mode 100644
index 089e5220f2d8f..0000000000000
--- a/dev/tests/js/JsTestDriver/jsTestDriver.php.dist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Returns an array containing the configuration used to generate the JsTestDriver configuration
- * file that gets used by JsTestDriver when it executes the Javascript unit tests.
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- *
- * @return array
- */
-return array(
-    'server' => 'http://localhost:9876',
-    'load' => array(
-        '/dev/tests/js/JsTestDriver/framework',
-        '/lib/web/mage/webapi.js',
-        '/lib/web/mage/validation/validation.js',
-        '/lib/web/jquery/jstree/jquery.jstree.js',
-        '/lib/web/jquery/jquery-ui-timepicker-addon.js',
-        '/lib/web/mage/cookies.js',
-        '/lib/web/mage/calendar.js',
-        '/lib/web/mage/loader_old.js',
-        '/lib/web/mage/edit-trigger.js',
-        '/lib/web/mage/translate-inline.js',
-        '/lib/web/mage/translate-inline-vde.js',
-        '/lib/web/mage/backend/form.js',
-        '/lib/web/mage/backend/button.js',
-        '/lib/web/mage/backend/tabs.js',
-        '/lib/web/mage/backend/menu.js',
-        '/lib/web/mage/backend/suggest.js',
-        '/lib/web/mage/backend/tree-suggest.js',
-        '/lib/web/mage/zoom.js',
-    ),
-    'test' => array('/dev/tests/js/JsTestDriver/testsuite'),
-    'JsTestDriver' => '{{path_to_jstestdriver_jar}}'
-);
diff --git a/dev/tests/js/JsTestDriver/jsTestDriverOrder.php b/dev/tests/js/JsTestDriver/jsTestDriverOrder.php
deleted file mode 100644
index 8ee790a281655..0000000000000
--- a/dev/tests/js/JsTestDriver/jsTestDriverOrder.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Returns an array of Javascript files that should be loaded first by JsTestDriver in the
- * order that they appear in the array when the Javascript unit tests are run.
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- *
- * @return array
- */
-return [
-    '/lib/web/jquery.js',
-    '/lib/web/jquery/jquery-migrate.js',
-    '/lib/web/underscore.js',
-    '/lib/web/mage/template.js',
-    '/lib/web/jquery/jquery-ui-1.9.2.js',
-    '/dev/tests/js/JsTestDriver/framework/requirejs-util.js',
-    '/lib/web/jquery/jquery.cookie.js',
-    '/lib/web/mage/apply/main.js',
-    '/lib/web/mage/mage.js',
-    '/lib/web/mage/decorate.js',
-    '/lib/web/jquery/jquery.validate.js',
-    '/lib/web/jquery/jquery.metadata.js',
-    '/lib/web/mage/translate.js'
-];
diff --git a/dev/tests/js/JsTestDriver/run_js_tests.php b/dev/tests/js/JsTestDriver/run_js_tests.php
deleted file mode 100644
index 77ce98a6b3b03..0000000000000
--- a/dev/tests/js/JsTestDriver/run_js_tests.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * This script executes all Magento JavaScript unit tests.
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define('RELATIVE_APP_ROOT', '../../../..');
-require __DIR__ . '/../../../../app/autoload.php';
-
-$userConfig = normalize('jsTestDriver.php');
-$defaultConfig = normalize('jsTestDriver.php.dist');
-
-$configFile = file_exists($userConfig) ? $userConfig : $defaultConfig;
-$config = require $configFile;
-
-if (isset($config['JsTestDriver'])) {
-    $jsTestDriver = $config['JsTestDriver'];
-} else {
-    echo "Value for the 'JsTestDriver' configuration parameter is not specified." . PHP_EOL;
-    showUsage();
-}
-if (!file_exists($jsTestDriver)) {
-    reportError('JsTestDriver jar file does not exist: ' . $jsTestDriver);
-}
-
-if (isset($config['Browser'])) {
-    $browser = $config['Browser'];
-} else {
-    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-        $browser = 'C:\Program Files (x86)\Mozilla Firefox\firefox.exe';
-    } elseif (PHP_OS === 'Darwin') {
-        $browser = '/Applications/Firefox.app/Contents/MacOS/firefox';
-    } else {
-        $browser = exec('which firefox');
-    }
-}
-if (!file_exists($browser)) {
-    reportError('Browser executable not found: ' . $browser);
-}
-
-$server = isset($config['server']) ? $config['server'] : "http://localhost:9876";
-$port = substr(strrchr($server, ':'), 1);
-
-$proxies = isset($config['proxy']) ? $config['proxy'] : [];
-
-$testFilesPath = isset($config['test']) ? $config['test'] : [];
-$testFiles = listFiles($testFilesPath);
-
-$loadFilesPath = isset($config['load']) ? $config['load'] : [];
-$loadFiles = listFiles($loadFilesPath);
-if (empty($loadFiles)) {
-    reportError('Could not find any files to load.');
-}
-
-$serveFilesPath = isset($config['serve']) ? $config['serve'] : [];
-$serveFiles = listFiles($serveFilesPath);
-
-$sortedFiles = [];
-
-$fileOrder = normalize('jsTestDriverOrder.php');
-if (file_exists($fileOrder)) {
-    $loadOrder = require $fileOrder;
-    foreach ($loadOrder as $file) {
-        $sortedFiles[] = RELATIVE_APP_ROOT . $file;
-    }
-    foreach ($loadFiles as $loadFile) {
-        $found = false;
-        $normalizedLoadFile = normalize($loadFile);
-        foreach ($loadOrder as $orderFile) {
-            if (strcmp(normalize(RELATIVE_APP_ROOT . $orderFile), $normalizedLoadFile) == 0) {
-                $found = true;
-                break;
-            }
-        }
-        if (!$found) {
-            array_push($sortedFiles, $loadFile);
-        }
-    }
-}
-
-$jsTestDriverConf = __DIR__ . '/jsTestDriver.conf';
-$fh = fopen($jsTestDriverConf, 'w');
-
-fwrite($fh, "server: $server" . PHP_EOL);
-
-if (count($proxies) > 0) {
-    fwrite($fh, "proxy:" . PHP_EOL);
-    foreach ($proxies as $proxy) {
-        $proxyServer = sprintf($proxy['server'], $server, normalize(RELATIVE_APP_ROOT));
-        fwrite($fh, '  - {matcher: "' . $proxy['matcher'] . '", server: "' . $proxyServer . '"}' . PHP_EOL);
-    }
-}
-
-fwrite($fh, "load:" . PHP_EOL);
-foreach ($sortedFiles as $file) {
-    if (!in_array($file, $serveFiles)) {
-        fwrite($fh, "  - " . $file . PHP_EOL);
-    }
-}
-
-fwrite($fh, "test:" . PHP_EOL);
-foreach ($testFiles as $file) {
-    fwrite($fh, "  - " . $file . PHP_EOL);
-}
-
-if (count($serveFiles) > 0) {
-    fwrite($fh, "serve:" . PHP_EOL);
-    foreach ($serveFiles as $file) {
-        fwrite($fh, "  - " . $file . PHP_EOL);
-    }
-}
-
-fclose($fh);
-
-$testOutput = __DIR__ . '/test-output';
-
-$filesystemAdapter = new \Magento\Framework\Filesystem\Driver\File();
-if ($filesystemAdapter->isExists($testOutput)) {
-    $filesystemAdapter->deleteDirectory($testOutput);
-}
-mkdir($testOutput);
-
-$command
-    = 'java -jar "' . $jsTestDriver . '" --config "' . $jsTestDriverConf . '" --reset --port ' . $port .
-    ' --browser "' . $browser . '" --raiseOnFailure true --tests all --testOutput "' . $testOutput . '"';
-
-echo $command . PHP_EOL;
-
-if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-    system($command);
-} else {
-    $commandFile = __DIR__ . '/run_js_tests.sh';
-    $fh = fopen($commandFile, 'w');
-
-    $shellCommand
-        = 'LSOF=`/usr/sbin/lsof -i :' . $port . ' -t`
-        if [ "$LSOF" != "" ];
-        then
-            kill -9 $LSOF
-        fi
-
-        # Skip Xvfb setup for OS X since there browsers do not support headless display that way
-        if [ "$(uname)" != "Darwin" ]; then
-            DISPLAY_NUM=99
-            ps -ef | egrep "[X]vfb.*:$DISPLAY_NUM"
-            if [ $? -eq 0 ] ; then
-                pkill Xvfb
-            fi
-    
-            XVFB=`which Xvfb`
-            if [ "$?" -eq 1 ];
-            then
-                echo "Xvfb not found."
-                exit 1
-            fi
-    
-            $XVFB :$DISPLAY_NUM -nolisten inet6 -ac &
-            PID_XVFB="$!"        # take the process ID
-            export DISPLAY=:$DISPLAY_NUM   # set display to use that of the Xvfb
-        fi
-        
-        USER=`whoami`
-        SUDO=`which sudo`
-
-        # run the tests
-        $SUDO -u $USER ' . $command . '
-
-        if [ "$(uname)" != "Darwin" ]; then
-            kill -9 $PID_XVFB    # shut down Xvfb (firefox will shut down cleanly by JsTestDriver)
-        fi
-        echo "Done."';
-
-    fwrite($fh, $shellCommand . PHP_EOL);
-    fclose($fh);
-    chmod($commandFile, 0750);
-
-    exec($commandFile);
-}
-
-/**
- * Show a message that displays how to use (invoke) this PHP script and exit.
- */
-function showUsage()
-{
-    reportError('Usage: php run_js_tests.php');
-}
-
-/**
- * Reports an error given an error message and exits, effectively halting the PHP script's execution.
- *
- * @param string $message - Error message to be displayed to the user.
- *
- * @SuppressWarnings(PHPMD.ExitExpression)
- */
-function reportError($message)
-{
-    echo $message . PHP_EOL;
-    exit(1);
-}
-
-/**
- * Takes a file or directory path in any form and normalizes it to fully absolute canonical form
- * relative to this PHP script's location.
- *
- * @param string $filePath - File or directory path to be fully normalized to canonical form.
- *
- * @return string - The fully resolved path converted to absolute form.
- */
-function normalize($filePath)
-{
-    return str_replace('\\', '/', realpath(__DIR__ . '/' . $filePath));
-}
-
-/**
- * Accepts an array of directories and generates a list of Javascript files (.js) in those directories and
- * all subdirectories recursively.
- *
- * @param array $dirs - An array of directories as specified in the configuration file (i.e. $configFile).
- *
- * @return array - An array of directory paths to all Javascript files found by recursively searching the
- * specified array of directories.
- */
-function listFiles($dirs)
-{
-    $baseDir = normalize(RELATIVE_APP_ROOT);
-    $result = [];
-    foreach ($dirs as $dir) {
-        $path = $baseDir . $dir;
-        if (is_file($path)) {
-            $path = substr_replace($path, RELATIVE_APP_ROOT, 0, strlen($baseDir));
-            array_push($result, $path);
-        } else {
-            $paths = glob($path . '/*', GLOB_ONLYDIR | GLOB_NOSORT);
-            $paths = substr_replace($paths, '', 0, strlen($baseDir));
-            $result = array_merge($result, listFiles($paths));
-
-            $files = glob($path . '/*.js', GLOB_NOSORT);
-            $files = substr_replace($files, RELATIVE_APP_ROOT, 0, strlen($baseDir));
-            $result = array_merge($result, $files);
-        }
-    }
-    return $result;
-}
diff --git a/dev/tests/js/JsTestDriver/testsuite/lib/ko/datepicker/datepicker.js b/dev/tests/js/JsTestDriver/testsuite/lib/ko/datepicker/datepicker.js
deleted file mode 100644
index 267c5d3df9a91..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/lib/ko/datepicker/datepicker.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-test('DatepickerBinding', function () {
-    expect(1);
-
-    var element    = $('#datepicker'),
-        observable = ko.observable(),
-        openBtn,
-        todayBtn,
-        todayDate,
-        dateFormat,
-        result;
-
-    ko.applyBindingsToNode(element, {
-        datepicker: observable
-    });
-
-    dateFormat = $(element).datepicker('option', 'dateFormat');
-    todayDate = moment().format(dateFormat);
-
-    btn      = $('img.ui-datepicker-trigger');
-    todayBtn = $('[data-handler="today"]');
-
-    btn.click();
-    todayBtn.click();
-
-    result = moment(observable()).format(dateFormat);
-
-    equal(todayDate, result);
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/lib/ko/datepicker/index.html b/dev/tests/js/JsTestDriver/testsuite/lib/ko/datepicker/index.html
deleted file mode 100644
index e66e34da43945..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/lib/ko/datepicker/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/**
- * @category    storage
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery.js"></script>
-    <script src="../../../pub/moment.js"></script>
-    <script src="../../../pub/lib/ko/ko.js"></script>
-    <script type="text/javascript" src="testsuite/lib/ko/datepicker/datepicker.js"></script>
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-    <input type="text" id="datepicker">
-</div>
-</body>
-</html>
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/lib/storage/index.html b/dev/tests/js/JsTestDriver/testsuite/lib/storage/index.html
deleted file mode 100644
index cd33350031db3..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/lib/storage/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-/**
- * @category    storage
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery.js"></script>
-    <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
-    <script src="../../../pub/lib/jquery/jquery.cookie.js"></script>
-    <script src="../../../pub/lib/lib/storage.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
-    <script type="text/javascript" src="testsuite/lib/storage/test-storage.js"></script>
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-</div>
-</body>
-</html>
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/lib/storage/test-storage.js b/dev/tests/js/JsTestDriver/testsuite/lib/storage/test-storage.js
deleted file mode 100644
index c0eebc166ec50..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/lib/storage/test-storage.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @category    mage.collapsible
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-test('Storage', function() {
-    expect(2);
-    var key = 'test-storage';
-    var storage = $.localStorage;
-    if(window.localStorage !== null) {
-        localStorage.setItem(key,'false');
-        storage.set(key,'true');
-        equal(localStorage.getItem(key),"true");
-        equal(localStorage.getItem(key),storage.get(key));
-    } else {
-        $.cookie(key,'false');
-        storage.set(key,'true');
-        equal($.cookie(key),"true");
-        equal($.cookie(key),storage.get(key));
-    }
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/_demo/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/_demo/index.html
deleted file mode 100644
index e541c6212a7a4..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/_demo/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-/**
- * @category    mage._demo
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-
-    <script type="text/javascript" src="testsuite/mage/_demo/test.js"></script>
-</head>
-<body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/_demo/test.js b/dev/tests/js/JsTestDriver/testsuite/mage/_demo/test.js
deleted file mode 100644
index 1d148f4318993..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/_demo/test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TestCase( "hello test", function() {
-    ok( 1 == "1", "Passed!" );
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/accordion/accordion.js b/dev/tests/js/JsTestDriver/testsuite/mage/accordion/accordion.js
deleted file mode 100644
index 562c5c096b654..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/accordion/accordion.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @category    mage.js
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/*
-
- */
-test( "Initialization", function() {
-    expect(2);
-    var accordion = $("<div></div>");
-    accordion.accordion();
-    ok( accordion.is(':mage-accordion'), "widget instantiated" );
-    accordion.accordion('destroy');
-    ok( !accordion.is(':mage-accordion'), "widget destroyed" );
-});
-
-
-
-test( "One-collapsible element", function() {
-    expect(4);
-    var accordion = $('<div></div>');
-    var title1 = $('<div data-role="collapsible"></div>').appendTo(accordion);
-    var content1 = $('<div data-role="content"></div>').appendTo(accordion);
-    var title2 = $('<div data-role="collapsible"></div>').appendTo(accordion);
-    var content2 = $('<div data-role="content"></div>').appendTo(accordion);
-    accordion.appendTo("body");
-
-    accordion.accordion();
-    ok( content1.is(':visible'), "content visible" );
-    ok( content2.is(':hidden'), "content hidden" );
-    title2.trigger('click');
-    ok( content1.is(':hidden'), "content hidden" );
-    ok( content2.is(':visible'), "content visible" );
-    accordion.accordion('destroy');
-
-});
-
-test( "Multi-collapsible elements", function() {
-    expect(4);
-    var accordion = $('<div></div>');
-    var title1 = $('<div data-role="collapsible"></div>').appendTo(accordion);
-    var content1 = $('<div data-role="content"></div>').appendTo(accordion);
-    var title2 = $('<div data-role="collapsible"></div>').appendTo(accordion);
-    var content2 = $('<div data-role="content"></div>').appendTo(accordion);
-    accordion.appendTo("body");
-
-    accordion.accordion({multipleCollapsible:true});
-    ok( content1.is(':visible'), "content visible" );
-    ok( content2.is(':hidden'), "content hidden" );
-    title2.trigger('click');
-    ok( content1.is(':visible'), "content visible" );
-    ok( content2.is(':visible'), "content visible" );
-    accordion.accordion('destroy');
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/accordion/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/accordion/index.html
deleted file mode 100644
index 093284c6f4fa8..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/accordion/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/**
- * @category    mage.accordion
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>Accordion Widget: QUnit Tests </title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="../../../pub/lib/jquery.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/tabs.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/accordion.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/collapsible.js"></script>
-    <script type="text/javascript" src="testsuite/mage/accordion/accordion.js"></script>
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-</div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/button/button-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/button/button-test.js
deleted file mode 100644
index b980acdc40545..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/button/button-test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-ButtonTest = TestCase('ButtonTest');
-ButtonTest.prototype.testInit = function() {
-    /*:DOC += <button id="test-button"></button>*/
-    assertTrue(jQuery('#test-button').button().is(':ui-button'));
-};
-ButtonTest.prototype.testBind = function() {
-    /*:DOC += <button id="test-button"></button><div id="event-target"></div>*/
-    var testEventTriggered = false;
-    jQuery('#event-target').on('testEvent', function(e) {
-        testEventTriggered = true;
-    });
-    jQuery('#test-button').button({
-        event: 'testEvent',
-        target: '#event-target'
-    }).click();
-    assertTrue(testEventTriggered);
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-qunit.js b/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-qunit.js
deleted file mode 100644
index 60dffe84db0fc..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-qunit.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-test( "initialization", function() {
-	var calendar = $('#calendar').calendar();
-	ok( calendar.is(':mage-calendar'), "this test is fine" );
-	calendar.calendar('destroy');
-});
-test( "global configuration merge", function() {
-	$.extend(true, $, {
-        calendarConfig: {
-            showOn: 'button',
-            showAnim: '',
-            buttonImageOnly: true,
-            showButtonPanel: true,
-            showWeek: true,
-            timeFormat: '',
-            showTime: false,
-            showHour: false,
-            showMinute: false
-        }
-    });
-    var calendar = $('#calendar').calendar();
-    equal('button', calendar.calendar('option', 'showOn'));
-    equal('', calendar.calendar('option', 'showAnim'));
-    ok(calendar.calendar('option', 'buttonImageOnly'));
-    ok(calendar.calendar('option', 'showButtonPanel'));
-    ok(calendar.calendar('option', 'showWeek'));
-    equal('', calendar.calendar('option', 'timeFormat'));
-    equal(false, calendar.calendar('option', 'showTime'));
-    equal(false, calendar.calendar('option', 'showHour'));
-    equal(false, calendar.calendar('option', 'showMinute'));
-	calendar.calendar('destroy');
-	delete $.calendarConfig;
-});
-test( "specifying AM/PM in timeformat option changes AMPM option to true", function(){
-	var calendar = $('#calendar').calendar({timeFormat: 'hh:mm tt', ampm: false});
-    ok(calendar.calendar('option', 'ampm'));
-    calendar.calendar('destroy');
-});
-test( "omitting AM/PM in timeformat option changes AMPM option to false", function(){
-	var calendar = $('#calendar').calendar({timeFormat: 'hh:mm'});
-    notEqual(true, calendar.calendar('option', 'ampm'));
-    calendar.calendar('destroy');
-});
-test( "with server timezone offset", function(){
-	var serverTimezoneSeconds = 1346122095,
-	calendar = $('#calendar').calendar({serverTimezoneSeconds: serverTimezoneSeconds}),
-        currentDate = new Date();
-    currentDate.setTime((serverTimezoneSeconds + currentDate.getTimezoneOffset() * 60) * 1000);
-    ok(currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
-    calendar.calendar('destroy');
-});
-test( "without sever timezone offset", function() {
-	var calendar = $('#calendar').calendar(),
-        currentDate = new Date();
-    ok(currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
-    calendar.calendar('destroy');
-});
-test( "dateTime format conversions", function() {
-	var calendar = $('#calendar').calendar({dateFormat: 'M/d/yy', timeFormat: 'h:mm a'});
-    equal('mm/d/yy', calendar.calendar('option', 'dateFormat'));
-    equal('h:mm tt', calendar.calendar('option', 'timeFormat'));
-    calendar.calendar('destroy');
-    calendar.calendar({dateFormat: 'MMMM/EEEE/yyyy', timeFormat: 'HH:mm'});
-    equal('MM/DD/yy', calendar.calendar('option', 'dateFormat'));
-    equal('hh:mm', calendar.calendar('option', 'timeFormat'));
-    calendar.calendar('destroy');
-});
-test( "destroy", function() {
-	var calendar = $('#calendar').calendar(),
-        calendarExist = calendar.is(':mage-calendar');
-    calendar.calendar('destroy');
-    equal(true, calendarExist != calendar.is(':mage-calendar'));
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js
deleted file mode 100644
index 7748106b303c3..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-CalendarTest = TestCase('CalendarTest');
-CalendarTest.prototype.testInit = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = jQuery('#calendar').calendar();
-    assertEquals(true, calendar.is(':mage-calendar'));
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testGlobalConfigurationMerge = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    $.extend(true, $, {
-        calendarConfig: {
-            showOn: 'button',
-            showAnim: '',
-            buttonImageOnly: true,
-            showButtonPanel: true,
-            showWeek: true,
-            timeFormat: '',
-            showTime: false,
-            showHour: false,
-            showMinute: false
-        }
-    });
-    var calendar = $('#calendar').calendar();
-    assertEquals('button', calendar.calendar('option', 'showOn'));
-    assertEquals('', calendar.calendar('option', 'showAnim'));
-    assertEquals(true, calendar.calendar('option', 'buttonImageOnly'));
-    assertEquals(true, calendar.calendar('option', 'showButtonPanel'));
-    assertEquals(true, calendar.calendar('option', 'showWeek'));
-    assertEquals('', calendar.calendar('option', 'timeFormat'));
-    assertEquals(false, calendar.calendar('option', 'showTime'));
-    assertEquals(false, calendar.calendar('option', 'showHour'));
-    assertEquals(false, calendar.calendar('option', 'showMinute'));
-    calendar.calendar('destroy');
-    delete $.calendarConfig;
-};
-CalendarTest.prototype.testEnableAMPM = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = $('#calendar').calendar({timeFormat: 'hh:mm tt', ampm: false});
-    assertEquals(true, calendar.calendar('option', 'ampm'));
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testDisableAMPM = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = $('#calendar').calendar({timeFormat: 'hh:mm'});
-    assertTrue(!calendar.calendar('option', 'ampm'));
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testWithServerTimezoneOffset = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var serverTimezoneSeconds = 1346122095,
-        calendar = $('#calendar').calendar({serverTimezoneSeconds: serverTimezoneSeconds}),
-        currentDate = new Date();
-    currentDate.setTime((serverTimezoneSeconds + currentDate.getTimezoneOffset() * 60) * 1000);
-    assertEquals(true, currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testWithServerTimezoneShift = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var serverTimezoneOffset = 43200,
-        calendar = $('#calendar').calendar({serverTimezoneOffset: serverTimezoneOffset}),
-        currentDate = new Date();
-
-    setTimeout(function () {
-        currentDate.setTime(currentDate.getTime() + (serverTimezoneOffset + currentDate.getTimezoneOffset() * 60) * 1000);
-        assertEquals(true, currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
-        calendar.calendar('destroy');
-    }, 61000);
-};
-CalendarTest.prototype.testWithoutServerTimezoneOffset = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = $('#calendar').calendar(),
-        currentDate = new Date();
-    assertEquals(true, currentDate.toString() === calendar.calendar('getTimezoneDate').toString());
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testInitDateTimePicker = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = $('#calendar').calendar();
-    assertEquals(true, calendar.hasClass('_has-datepicker'));
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testDateTimeMapping = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = $('#calendar').calendar({dateFormat: 'M/d/yy', timeFormat: 'h:mm a'});
-    assertEquals('mm/d/yy', calendar.calendar('option', 'dateFormat'));
-    assertEquals('h:mm TT', calendar.calendar('option', 'timeFormat'));
-    calendar.calendar('destroy');
-    calendar.calendar({dateFormat: 'MMMM/EEEE/yyyy'});
-    assertEquals('MM/DD/yy', calendar.calendar('option', 'dateFormat'));
-    calendar.calendar('destroy');
-};
-CalendarTest.prototype.testDestroy = function() {
-    /*:DOC += <input type="text" id="calendar" /> */
-    var calendar = $('#calendar').calendar(),
-        calendarExist = calendar.is(':mage-calendar');
-    calendar.calendar('destroy');
-    assertEquals(true, calendarExist != calendar.is(':mage-calendar'));
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar.html b/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar.html
deleted file mode 100644
index b474dc2d5ce95..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/**
- * @category    mage.calendar
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Calendar Widget: QUnit Tests </title>
-	<base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="../../../lib/web/jquery.js"></script>
-    <script type="text/javascript" src="../../../lib/web/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="../../../lib/web/jquery/jquery-ui-timepicker-addon.js"></script>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/calendar.js"></script>
-    <script type="text/javascript" src="testsuite/mage/calendar/calendar-qunit.js"></script>
-</head>
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture">
-  	<input type="text" id="calendar" />
-  </div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/date-range-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/calendar/date-range-test.js
deleted file mode 100644
index 61211c067ad12..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/date-range-test.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-DaterangeTest = TestCase('DaterangeTest');
-DaterangeTest.prototype.testInit = function() {
-    /*:DOC +=
-     <div id="date-range" />
-     */
-    var dateRange = jQuery('#date-range').dateRange();
-    assertEquals(true, dateRange.is(':mage-dateRange'));
-    dateRange.dateRange('destroy');
-};
-DaterangeTest.prototype.testInitDateRangeDatepickers = function() {
-    /*:DOC +=
-     <div id="date-range">
-         <input type="text" id="from" />
-         <input type="text" id="to" />
-     </div>
-     */
-    var options = {
-            from: {
-                id: "from"
-            },
-            to: {
-                id: "to"
-            }
-        },
-        dateRange = $('#date-range').dateRange(options),
-        from = $('#'+options.from.id),
-        to = $('#'+options.to.id);
-
-    assertEquals(true, from.hasClass('_has-datepicker'));
-    assertEquals(true, to.hasClass('_has-datepicker'));
-    dateRange.dateRange('destroy');
-};
-DaterangeTest.prototype.testDestroy = function() {
-    /*:DOC +=
-     <div id="date-range">
-     <input type="text" id="from" />
-     <input type="text" id="to" />
-     </div>
-     */
-    var options = {
-        from: {
-            id: "from"
-        },
-        to: {
-            id: "to"
-        }
-    },
-        dateRange = $('#date-range').dateRange(options),
-        from = $('#'+options.from.id),
-        to = $('#'+options.to.id),
-        dateRangeExist = dateRange.is(':mage-dateRange'),
-        fromExist = from.hasClass('_has-datepicker'),
-        toExist = to.hasClass('_has-datepicker');
-
-    dateRange.dateRange('destroy');
-    assertEquals(true, dateRangeExist != dateRange.is(':mage-dateRange'));
-    assertEquals(true, fromExist != from.hasClass('_has-datepicker'));
-    assertEquals(true, toExist != to.hasClass('_has-datepicker'));
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/content.html b/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/content.html
deleted file mode 100644
index e81938dfbeaba..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/content.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-/**
- * @category    mage.collapsible
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<HTML>
-<body>
-    <p>Test text</p>
-</body>
-</HTML>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/index.html
deleted file mode 100644
index ccfd4d97f0331..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/**
- * @category    mage.collapsible
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery.js"></script>
-    <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/collapsible.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/bootstrap.js"></script>
-    <script type="text/javascript" src="testsuite/mage/collapsible/test-collapsible.js"></script>
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-</div>
-</body>
-</html>
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/test-collapsible.js b/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/test-collapsible.js
deleted file mode 100644
index 1a22e5a79eb1d..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/collapsible/test-collapsible.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * @category    mage.collapsible
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/*
-    Test if the collapsible widget gets initialized when is called and destroy function works
- */
-test('initialization & destroy', function() {
-    expect(2);
-    var group = $('<div id="1"></div>');
-    group.collapsible();
-    ok( group.is(':mage-collapsible'), "widget instantiated" );
-    group.collapsible('destroy');
-    ok( !group.is(':mage-collapsible'), "widget destroyed" );
-});
-
-/*
- Test enable, disable, activate, deactivate functions
- */
-test('Enable, disable, activate, deactivate methods', function() {
-    expect(5);
-    var group = $('<div id="2"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    title.appendTo(group);
-    content.appendTo(group);
-    group.appendTo("body");
-    group.collapsible();
-    group.collapsible("deactivate");
-    ok(content.is(':hidden'), "Content is collapsed");
-    group.collapsible("activate");
-    ok(content.is(':visible'), "Content is expanded");
-    group.collapsible("disable");
-    ok(content.is(':hidden'), "Content is collapsed");
-    group.collapsible("activate");
-    ok(content.is(':hidden'), "Content is collapsed");
-    group.collapsible("enable");
-    group.collapsible("activate");
-    ok(content.is(':visible'), "Content is expanded");
-    group.collapsible('destroy');
-});
-
-/*
-    Test if the widget gets expanded/collapsed when the title is clicked
- */
-test('Collapse and expand', function() {
-    expect(3);
-    var group = $('<div id="3"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    title.appendTo(group);
-    content.appendTo(group);
-    group.appendTo("body");
-    group.collapsible();
-    group.collapsible("deactivate");
-    ok(content.is(':hidden'), "Content is collapsed");
-    title.trigger("click");
-    ok(content.is(':visible'), "Content gets expanded on click title");
-    title.trigger("click");
-    ok(content.is(':hidden'), "Content gets collapsed on click again");
-    group.collapsible('destroy');
-});
-
-
-/*
- Test state Classes
- */
-test('State classes', function() {
-    expect(3);
-    var group = $('<div id="4"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    title.appendTo(group);
-    content.appendTo(group);
-    group.collapsible({openedState:"opened", closedState:"closed", disabledState:"disabled"});
-    ok( group.hasClass("closed"));
-    title.trigger("click");
-    ok( group.hasClass("opened"));
-    group.collapsible("disable");
-    ok( group.hasClass("disabled"));
-    group.collapsible('destroy');
-});
-
-/*
-    Test if icons are added to title when widget gets initialized and are removed when gets destroyed
- */
-test('Create  & destroy icons', function() {
-    expect(2);
-    var group = $('<div id="5"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    title.appendTo(group);
-    content.appendTo(group);
-    group.collapsible({icons: {header:"minus",activeHeader:"plus"}});
-    ok(title.children("[data-role=icons]").length, "Icons added to title" );
-    group.collapsible('destroy');
-    ok(!title.children("[data-role=icons]").length, "Icons removed from title" );
-});
-
-/*
-    Test if icon classes are changed when content gets expanded/collapsed
- */
-test('Change icons when content gets expanded/collapsed', function() {
-    expect(2);
-    var group = $('<div id="6"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    title.appendTo(group);
-    content.appendTo(group);
-    group.collapsible({icons: {header:"minus",activeHeader:"plus"}});
-    group.collapsible("deactivate");
-    var icons = group.collapsible("option","icons");
-    ok(title.children("[data-role=icons]").hasClass(icons.header), "When content is collapsed,header has the right class for icons" );
-    title.trigger("click");
-    ok(title.children("[data-role=icons]").hasClass(icons.activeHeader), "When content is expanded,header has the right class for icons" );
-    group.collapsible('destroy');
-});
-
-
-/*
-    Test if content gets expanded/collapsed when certain keys are pressed
- */
-asyncTest( "keyboard support", function() {
-
-    expect( 5 );
-    var group = $('<div id="7"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    title.appendTo(group);
-    content.appendTo(group);
-    group.appendTo("body");
-    group.collapsible();
-    group.collapsible("deactivate");
-
-    title.on("focus",function(ev){
-        ok(content.is(':hidden'), "Content is collapsed");
-        title.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.ENTER } ));
-        ok(content.is(':visible'), "Content is expanded");
-        title.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.ENTER } ));
-        ok(content.is(':hidden'), "Content is collapsed");
-        title.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.SPACE } ));
-        ok(content.is(':visible'), "Content is expanded");
-        title.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.SPACE } ));
-        ok(content.is(':hidden'), "Content is collapsed");
-        group.collapsible('destroy');
-        start();
-    } );
-
-    setTimeout(function(){
-        title.focus();
-    },10);
-
-});
-
-/*
-    Test if content gets updated via Ajax when title is clicked
- */
-test('Update content via ajax', function() {
-    expect(2);
-    var group = $('<div id="8"></div>');
-    var title = $('<div data-role="title"></div>');
-    var content = $('<div data-role="content"></div>');
-    var ajax = $('<a data-ajax="true" href="testsuite/mage/collapsible/content.html"></a>');
-    title.appendTo(group);
-    content.appendTo(group);
-    ajax.appendTo(content);
-    group.appendTo("body");
-    group.collapsible({ajaxContent : true});
-    group.collapsible("deactivate");
-    ok(!content.children("p").length, "Content has no data");
-    title.trigger("click");
-    ok(content.children("p"), "Content gets data from content.html");
-    group.collapsible('destroy');
-});
-
-
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/decorate-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/decorate-test.js
deleted file mode 100644
index 96bad35a17e2e..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/decorate-test.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-DecoratorTest = TestCase('DecoratorTest');
-DecoratorTest.prototype.testDecoratorList = function () {
-    /*:DOC += <ul id="list">
-     <li>item1</li>
-     <li>item2</li>
-     <li>item3</li>
-     <li>item4</li>
-     </ul>
-     */
-    var list = $('#list');
-    list.decorate('list');
-    assertTrue($(list.find('li')[0]).hasClass('odd'));
-    assertFalse($(list.find('li')[0]).hasClass('even'));
-    assertTrue($(list.find('li')[1]).hasClass('even'));
-    assertFalse($(list.find('li')[1]).hasClass('odd'));
-    assertTrue($(list.find('li')[2]).hasClass('odd'));
-    assertFalse($(list.find('li')[2]).hasClass('even'));
-    assertTrue($(list.find('li')[3]).hasClass('even'));
-    assertFalse($(list.find('li')[3]).hasClass('odd'));
-    assertTrue($(list.find('li')[3]).hasClass('last'));
-};
-
-DecoratorTest.prototype.testDecoratorGeneral = function () {
-    /*:DOC += <div id="foo">
-     <div class="item even">item1</div>
-     <div class="item odd">item2</div>
-     <div class="item odd">item3</div>
-     <div class="item even">item4</div>
-     </div>
-     */
-    var itemClass = '.item';
-    $(itemClass).decorate('generic');
-    assertTrue($($(itemClass)[0]).hasClass('odd'));
-    assertFalse($($(itemClass)[0]).hasClass('even'));
-    assertTrue($($(itemClass)[0]).hasClass('first'));
-    assertFalse($($(itemClass)[0]).hasClass('last'));
-
-    assertFalse($($(itemClass)[1]).hasClass('odd'));
-    assertTrue($($(itemClass)[1]).hasClass('even'));
-    assertFalse($($(itemClass)[1]).hasClass('first'));
-    assertFalse($($(itemClass)[1]).hasClass('last'));
-
-    assertTrue($($(itemClass)[2]).hasClass('odd'));
-    assertFalse($($(itemClass)[2]).hasClass('even'));
-    assertFalse($($(itemClass)[2]).hasClass('first'));
-    assertFalse($($(itemClass)[2]).hasClass('last'));
-
-    assertFalse($($(itemClass)[3]).hasClass('odd'));
-    assertTrue($($(itemClass)[3]).hasClass('even'));
-    assertFalse($($(itemClass)[3]).hasClass('first'));
-    assertTrue($($(itemClass)[3]).hasClass('last'));
-};
-
-DecoratorTest.prototype.testDecoratorTable = function (){
-    /*:DOC += <table id="foo">
-     <thead>
-     <tr>
-     <th>Month</th>
-     <th>Savings</th>
-     </tr>
-     </thead>
-     <tfoot>
-     <tr>
-     <td>Sum</td>
-     <td>$180</td>
-     </tr>
-     </tfoot>
-     <tbody>
-     <tr>
-     <td>January</td>
-     <td>$100</td>
-     </tr>
-     <tr>
-     <td>February</td>
-     <td>$80</td>
-     </tr>
-     </tbody>
-     </table>
-     */
-    var tableId = '#foo';
-    $(tableId).decorate('table');
-    assertTrue($(tableId).find('thead tr').hasClass('first'));
-    assertTrue($(tableId).find('thead tr').hasClass('last'));
-    assertFalse($(tableId).find('thead tr').hasClass('odd'));
-    assertFalse($(tableId).find('thead tr').hasClass('even'));
-
-    assertTrue($(tableId).find('tfoot tr').hasClass('first'));
-    assertTrue($(tableId).find('tfoot tr').hasClass('last'));
-    assertFalse($(tableId).find('tfoot tr').hasClass('odd'));
-    assertFalse($(tableId).find('tfoot tr').hasClass('even'));
-
-    assertFalse($(tableId).find('tfoot tr td').last().hasClass('first'));
-    assertTrue($(tableId).find('tfoot tr td').last().hasClass('last'));
-    assertFalse($(tableId).find('tfoot tr td').last().hasClass('odd'));
-    assertFalse($(tableId).find('tfoot tr td').last().hasClass('even'));
-
-    assertTrue($(tableId).find('tbody tr').first().hasClass('first'));
-    assertTrue($(tableId).find('tbody tr').first().hasClass('odd'));
-    assertFalse($(tableId).find('tbody tr').first().hasClass('last'));
-    assertFalse($(tableId).find('tbody tr').first().hasClass('even'));
-    assertFalse($(tableId).find('tbody tr').last().hasClass('first'));
-    assertFalse($(tableId).find('tbody tr').last().hasClass('odd'));
-    assertTrue($(tableId).find('tbody tr').last().hasClass('last'));
-    assertTrue($(tableId).find('tbody tr').last().hasClass('even'));
-
-    assertFalse($(tableId).find('tbody tr td').last().hasClass('first'));
-    assertFalse($(tableId).find('tbody tr td').last().hasClass('odd'));
-    assertTrue($(tableId).find('tbody tr td').last().hasClass('last'));
-    assertFalse($(tableId).find('tbody tr td').last().hasClass('even'));
-};
-
-DecoratorTest.prototype.testDecoratorDataList = function () {
-    /*:DOC += <dl id="data-list">
-        <dt>item</dt>
-        <dt>item</dt>
-        <dd>item</dd>
-        <dd>item</dd>
-     </dl>
-     */
-    var listId = '#data-list';
-    $(listId).decorate('dataList');
-    assertTrue($(listId).find('dt').first().hasClass('odd'));
-    assertFalse($(listId).find('dt').first().hasClass('even'));
-    assertFalse($(listId).find('dt').first().hasClass('last'));
-
-    assertTrue($(listId).find('dt').last().hasClass('even'));
-    assertFalse($(listId).find('dt').last().hasClass('odd'));
-    assertTrue($(listId).find('dt').last().hasClass('last'));
-
-    assertTrue($(listId).find('dd').first().hasClass('odd'));
-    assertFalse($(listId).find('dd').first().hasClass('even'));
-    assertFalse($(listId).find('dd').first().hasClass('last'));
-
-    assertTrue($(listId).find('dd').last().hasClass('even'));
-    assertFalse($(listId).find('dd').last().hasClass('odd'));
-    assertTrue($(listId).find('dd').last().hasClass('last'));
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/dropdown/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/dropdown/index.html
deleted file mode 100644
index 3d6ed5a7c1d28..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/dropdown/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-/**
- * @category    mage.dropdown
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../lib/web/jquery.js"></script>
-    <script src="../../../lib/web/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/dropdown.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/bootstrap.js"></script>
-    <script type="text/javascript" src="testsuite/mage/dropdown/test-dropdown.js"></script>
-
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-</div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/dropdown/test-dropdown.js b/dev/tests/js/JsTestDriver/testsuite/mage/dropdown/test-dropdown.js
deleted file mode 100644
index e67c92b3d4018..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/dropdown/test-dropdown.js
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/*
-    testing if dialog opens when the triggerEvent is triggered
- */
-test( "triggerEvent", function() {
-    expect(2);
-    var opener = $('<div></div>');
-    var dialog = $('<div></div>');
-    dialog.dropdownDialog({"triggerEvent":"click", "triggerTarget":opener});
-    opener.trigger("click");
-    equal(dialog.dropdownDialog("isOpen"), true, "Dropdown opens when click opener");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"triggerEvent":null, "triggerTarget":opener});
-    opener.trigger("click");
-    equal(dialog.dropdownDialog("isOpen"), false, "Dropdown doesn't open when click opener");
-    dialog.dropdownDialog( "destroy" );
-
-});
-
-/*
-    testing if a specified class is added to the trigger
- */
-test( "triggerClass", function() {
-    expect(2);
-    var opener = $('<div></div>');
-    var dialog = $('<div></div>');
-    dialog.dropdownDialog({"triggerTarget":opener,"triggerClass":"active"});
-    dialog.dropdownDialog("open");
-    ok( opener.hasClass("active"), "Class added to opener when dialog opens" );
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"triggerEvent":opener, "triggerClass":null});
-    dialog.dropdownDialog("open");
-    ok( !opener.hasClass("active"), "Class added to opener when dialog opens" );
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-
-});
-
-/*
-    testing if a specified class is added to the element which the dialog appends to
- */
-test( "parentClass", function() {
-    expect(2);
-    var parent = $('<div></div>');
-    var dialog = $('<div></div>');
-
-    dialog.dropdownDialog({"parentClass":"active","appendTo":parent});
-    dialog.dropdownDialog("open");
-    ok( parent.hasClass("active"), "Class is added to parent when dialog opens" );
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"parentClass":null,"appendTo":parent});
-    dialog.dropdownDialog("open");
-    ok( !parent.hasClass("active"), "No class is added to parent when dialog opens" );
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-
-});
-
-/*
-    testing if a specified class is added to the element that becomes dialog
- */
-test( "dialogContentClass", function() {
-    expect(2);
-    var dialog = $('<div></div>');
-
-    dialog.dropdownDialog({"dialogContentClass":"active"});
-    dialog.dropdownDialog("open");
-    ok( $('.ui-dialog-content').hasClass("active"), "Class is added to dialog content when dialog opens" );
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"dialogContentClass": null});
-    dialog.dropdownDialog("open");
-    ok( !$('.ui-dialog-content').hasClass("active"), "No class is added to dialog content" );
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-});
-
-/*
- testing if a specified class is added to dialog
- */
-test( "defaultDialogClass", function() {
-    expect(3);
-    var dialog = $('<div></div>');
-
-    dialog.dropdownDialog({"defaultDialogClass":"custom"});
-    ok( $('.ui-dialog').hasClass("custom"), "Class is added to dialog" );
-    ok( !$('.ui-dialog').hasClass("mage-dropdown-dialog"), "Default class has been overwritten" );
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({});
-    ok( $('.ui-dialog').hasClass("mage-dropdown-dialog"), "Default class hasn't been overwritten" );
-    dialog.dropdownDialog( "destroy" );
-});
-
-/*
-    testing if the specified trigger actually opens the dialog
- */
-test( "triggerTarget", function() {
-    expect(2);
-    var opener = $('<div></div>');
-    var dialog = $('<div></div>');
-
-    dialog.dropdownDialog({"triggerTarget":opener});
-    opener.trigger("click");
-    equal(dialog.dropdownDialog("isOpen"), true, "Dropdown opens when click opener");
-    dialog.dropdownDialog("close");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"triggerTarget":null});
-    opener.trigger("click");
-    equal(dialog.dropdownDialog("isOpen"), false, "Dropdown doesn't open when click opener");
-    dialog.dropdownDialog( "destroy" );
-});
-
-/*
-    testing if the dialog gets closed when clicking outside of it
- */
-test( "closeOnClickOutside", function() {
-    expect(2);
-    var outside = $('<div></div>').attr({"id":"outside"});
-    var dialog = $('<div></div>').attr({"id":"dialog"});
-    outside.appendTo("#qunit-fixture");
-    dialog.appendTo("#qunit-fixture");
-
-    dialog.dropdownDialog({"closeOnClickOutside":true});
-    dialog.dropdownDialog("open");
-    outside.trigger("click");
-    equal(dialog.dropdownDialog("isOpen"), false, "Dropdown closes when click outside dropdown");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"closeOnClickOutside":false});
-    dialog.dropdownDialog("open");
-    outside.trigger("click");
-    equal(dialog.dropdownDialog("isOpen"), true, "Dropdown doesn't close when click outside dropdown");
-    dialog.dropdownDialog( "destroy" );
-});
-
-/*
-    testing if the dialog gets closed when mouse leaves the dialog area
- */
-asyncTest( "closeOnMouseLeave true", function() {
-    expect(1);
-    var outside = $('<div></div>').attr({"id":"outside"});
-    var dialog = $('<div></div>').attr({"id":"dialog"});
-    var opener = $('<div></div>').attr({"id":"opener"});
-    outside.appendTo("#qunit-fixture");
-    dialog.appendTo("#qunit-fixture");
-    opener.appendTo("#qunit-fixture");
-
-    dialog.dropdownDialog({"closeOnMouseLeave":true});
-    dialog.dropdownDialog("open");
-    dialog.trigger("mouseenter");
-    dialog.trigger("mouseleave");
-
-    setTimeout(function() {
-        equal(dialog.dropdownDialog("isOpen"), false, "Dropdown closes when mouseleave the dropdown area");
-        dialog.dropdownDialog( "destroy" );
-        start();
-    }, 3000);
-
-});
-
-/*
- testing if the dialog gets closed when mouse leaves the dialog area
- */
-asyncTest( "closeOnMouseLeave false", function() {
-    expect(1);
-    var outside = $('<div></div>').attr({"id":"outside"});
-    var dialog = $('<div></div>').attr({"id":"dialog"});
-    var opener = $('<div></div>').attr({"id":"opener"});
-    outside.appendTo("#qunit-fixture");
-    dialog.appendTo("#qunit-fixture");
-    opener.appendTo("#qunit-fixture");
-
-    dialog.dropdownDialog({"closeOnMouseLeave":false});
-    dialog.dropdownDialog("open");
-    dialog.trigger("mouseenter");
-    dialog.trigger("mouseleave");
-
-    setTimeout(function() {
-        equal(dialog.dropdownDialog("isOpen"), true, "Dropdown doesn't close when mouseleave the dropdown area");
-        dialog.dropdownDialog( "destroy" );
-        start();
-    }, 3000);
-
-});
-
-/*
-    testing if the dialog gets closed with the specified delay
- */
-asyncTest( "timeout", function() {
-    expect(2);
-    var outside = $('<div></div>').attr({"id":"outside"});
-    var dialog = $('<div></div>').attr({"id":"dialog"});
-    var opener = $('<div></div>').attr({"id":"opener"});
-    outside.appendTo("#qunit-fixture");
-    dialog.appendTo("#qunit-fixture");
-    opener.appendTo("#qunit-fixture");
-
-    dialog.dropdownDialog({"timeout":2000});
-    dialog.dropdownDialog("open");
-    dialog.trigger("mouseenter");
-    dialog.trigger("mouseleave");
-    equal(dialog.dropdownDialog("isOpen"), true, "Dropdown doesn't close when mouseleave the dropdown area");
-    setTimeout(function() {
-        equal(dialog.dropdownDialog("isOpen"), false, "Dropdown closes when mouseleave the dropdown area, after timeout passed");
-        dialog.dropdownDialog( "destroy" );
-        start();
-    }, 3000);
-
-});
-
-/*
-    testing if the title bar is prevented from being created
- */
-test( "createTitileBar", function() {
-    expect(2);
-    var dialog = $('<div></div>');
-    dialog.dropdownDialog({"createTitleBar":true});
-    ok(($(".ui-dialog").find(".ui-dialog-titlebar").length > 0), "Title bar is created");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"createTitleBar":false});
-    ok($(".ui-dialog").find(".ui-dialog-titlebar").length <= 0, "Title bar isn't created");
-    dialog.dropdownDialog( "destroy" );
-});
-
-/*
-    testing if the position function gets disabled
- */
-test( "autoPosition", function() {
-    expect(2);
-    var dialog = $('<div></div>');
-    dialog.dropdownDialog({"autoPosition":false});
-    dialog.dropdownDialog("open");
-    ok(($(".ui-dialog").css("top") === 'auto'), "_position function disabled");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"autoPosition":true});
-    dialog.dropdownDialog("open");
-    ok(($(".ui-dialog").css("top") !== '0px'), "_position function enabled");
-    dialog.dropdownDialog( "destroy" );
-});
-
-/*
-    testing if the size function gets disabled
- */
-test( "autoSize", function() {
-    expect(2);
-    var dialog = $('<div></div>');
-    dialog.dropdownDialog({"autoSize":true, width:"300"});
-    dialog.dropdownDialog("open");
-    ok(($(".ui-dialog").css("width") === '300px'), "_size function enabled");
-    dialog.dropdownDialog( "destroy" );
-
-    dialog.dropdownDialog({"autoSize":false, width:"300"});
-    dialog.dropdownDialog("open");
-    ok($(".ui-dialog").css("width") !== '300px', "_size function disabled");
-    dialog.dropdownDialog( "destroy" );
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/edit_trigger/edit-trigger-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/edit_trigger/edit-trigger-test.js
deleted file mode 100644
index c28f1e4943438..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/edit_trigger/edit-trigger-test.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-EditTriggerTest = TestCase('EditTriggerTest');
-EditTriggerTest.prototype.testInit = function() {
-    var editTrigger = jQuery('body').editTrigger();
-    assertEquals(true, !!editTrigger.data('mageEditTrigger'));
-    editTrigger.editTrigger('destroy');
-};
-EditTriggerTest.prototype.testCreate = function() {
-    /*:DOC += <script id="translate-inline-icon" type="text/x-magento-template">
-          <img alt="<%= data.alt %>" src="<%= data.img %>" height="16" width="16" class="translate-edit-icon">
-      </script>
-     */
-    var options = {
-            img: 'img.gif',
-            alt: 'translate'
-        },
-        editTrigger = jQuery('body').editTrigger(options);
-    var trigger = jQuery('.translate-edit-icon');
-    assertNotNull(trigger);
-    assertTrue(trigger.is('img'));
-    assertEquals(true, trigger.attr('src') === options.img);
-    assertEquals(true, trigger.attr('alt') === options.alt);
-    assertEquals(true, trigger.is(':hidden'));
-    editTrigger.editTrigger('destroy');
-};
-EditTriggerTest.prototype.testShowHideOnMouseMove = function() {
-    /*:DOC += <div class="container" style="height:100px;">
-     <div class="edit">text</div>
-     </div>
-     <script id="translate-inline-icon" type="text/x-magento-template">
-          <img alt="<%= data.alt %>" src="<%= data.img %>" height="16" width="16" class="translate-edit-icon">
-      </script>
-     */
-    var editTrigger = jQuery('body').editTrigger({
-            editSelector: '.edit',
-            delay: 0
-        }),
-        trigger = jQuery('.translate-edit-icon'),
-        editElement = jQuery('.edit'),
-        container = jQuery('.container');
-    editElement.trigger('mousemove');
-    assertEquals(true, trigger.is(':visible'));
-    container.trigger('mousemove');
-    assertEquals(true, trigger.is(':hidden'));
-    editTrigger.editTrigger('destroy');
-};
-EditTriggerTest.prototype.testTriggerClick = function() {
-    /*:DOC += <div class="edit">text</div>
-     <script id="translate-inline-icon" type="text/x-magento-template">
-          <img alt="<%= data.alt %>" src="<%= data.img %>" height="16" width="16" class="translate-edit-icon">
-      </script>
-    */
-    var editTrigger = jQuery('body').editTrigger({
-            editSelector: '.edit'
-        }),
-        trigger = jQuery('.translate-edit-icon'),
-        editElement = jQuery('.edit'),
-        editTriggered = false;
-    $('body').on('edit.editTrigger', function() { editTriggered = true; });
-    editElement.trigger('mousemove');
-    trigger.trigger('click');
-    assertEquals(true, editTriggered);
-    editTrigger.editTrigger('destroy');
-};
-EditTriggerTest.prototype.testDestroy = function() {
-    var editTrigger = jQuery('body').editTrigger(),
-        editProcessed = false,
-        mousemoveProcessed = false;
-
-    $('body')
-        .on('edit.editTrigger', function() {editProcessed = true;})
-        .on('mousemove.editTrigger', function() {mousemoveProcessed = true;});
-
-    editTrigger.editTrigger('destroy');
-    assertEquals(false, !!editTrigger.data('mageEditTrigger'));
-
-    $('body').trigger('edit.editTrigger');
-    assertEquals(false, editProcessed);
-
-    $('body').trigger('mousemove.editTrigger');
-    assertEquals(false, mousemoveProcessed);
-};
-var EditTriggerTestAsync = AsyncTestCase('EditTriggerTestAsync');
-EditTriggerTestAsync.prototype.testHideEditTriggerWithDelay = function(queue) {
-    /*:DOC += <div class="container" style="height:100px;">
-     <div class="edit">text</div>
-     </div>
-     <script id="translate-inline-icon" type="text/x-magento-template">
-          <img alt="<%= data.alt %>" src="<%= data.img %>" height="16" width="16" class="translate-edit-icon">
-     </script>
-     */
-    var editTrigger = jQuery(document).editTrigger({
-            editSelector: '.edit',
-            delay: 1000
-        }),
-        trigger = jQuery('.translate-edit-icon'),
-        editElement = jQuery('.edit'),
-        container = jQuery('.container'),
-        visibleOnMouseout,
-        hiddenAfterDelay;
-    editElement.trigger('mousemove');
-    container.trigger('mousemove');
-    queue.call('Step 1: Start hiding with delay', function(callbacks) {
-        visibleOnMouseout = trigger.is(':visible');
-        setTimeout(callbacks.add(function() {
-            hiddenAfterDelay = trigger.is(':hidden');
-        }), 1050);
-    });
-    queue.call('Step 2: Check is trigger are hidden after delay', function() {
-        assertEquals(true, visibleOnMouseout);
-        assertEquals(true, hiddenAfterDelay);
-        editTrigger.editTrigger('destroy');
-    });
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/form/form-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/form/form-test.js
deleted file mode 100644
index 83bdefd399eaf..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/form/form-test.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-FormTest = TestCase('FormTest');
-FormTest.prototype.setUp = function() {
-    /*:DOC += <form id="form" action="action/url" method="GET", target="_self" ></form>*/
-};
-FormTest.prototype.tearDown = function() {
-    var formInstance = jQuery('#form').data('form');
-    if(formInstance && formInstance.destroy) {
-        formInstance.destroy();
-    }
-};
-FormTest.prototype.testInit = function() {
-    var form = jQuery('#form').form();
-    assertTrue(form.is(':mage-form'));
-};
-FormTest.prototype.testRollback = function() {
-    var form = jQuery('#form').form(),
-        initialFormAttrs = {
-            action: form.prop('action'),
-            target: form.prop('target'),
-            method: form.prop('method')
-        };
-
-    form.data("form").oldAttributes = initialFormAttrs;
-    form.prop({
-        action: 'new/action/url',
-        target: '_blank',
-        method: 'POST'
-    });
-
-    assertNotEquals(form.prop('action'), initialFormAttrs.action);
-    assertNotEquals(form.prop('target'), initialFormAttrs.target);
-    assertNotEquals(form.prop('method'), initialFormAttrs.method);
-    form.data("form")._rollback();
-    assertEquals(form.prop('action'), initialFormAttrs.action);
-    assertEquals(form.prop('target'), initialFormAttrs.target);
-    assertEquals(form.prop('method'), initialFormAttrs.method);
-};
-FormTest.prototype.testGetHandlers = function() {
-    var form = jQuery('#form').form(),
-        handlersData = form.form('option', 'handlersData'),
-        handlers = [];
-    $.each(handlersData, function(key) {
-        handlers.push(key);
-    });
-    assertEquals(handlers.join(' '), form.data("form")._getHandlers().join(' '));
-};
-FormTest.prototype.testStoreAttribute = function() {
-    var form = jQuery('#form').form(),
-        initialFormAttrs = {
-            action: form.attr('action'),
-            target: form.attr('target'),
-            method: form.attr('method')
-        };
-    form.data("form")._storeAttribute('action');
-    form.data("form")._storeAttribute('target');
-    form.data("form")._storeAttribute('method');
-
-    assertEquals(form.data("form").oldAttributes.action, initialFormAttrs.action);
-    assertEquals(form.data("form").oldAttributes.target, initialFormAttrs.target);
-    assertEquals(form.data("form").oldAttributes.method, initialFormAttrs.method);
-};
-FormTest.prototype.testBind = function() {
-    var form = jQuery('#form').form(),
-        submitted = false,
-        handlersData = form.form('option', 'handlersData');
-
-    form.on('submit', function(e) {
-        submitted = true;
-        e.stopImmediatePropagation();
-        e.preventDefault();
-    });
-    $.each(handlersData, function(key) {
-        form.trigger(key);
-        assertTrue(submitted);
-        submitted = false;
-    });
-    form.off('submit');
-};
-FormTest.prototype.testGetActionUrl = function() {
-    var form = jQuery('#form').form(),
-        action = form.attr('action'),
-        testUrl = 'new/action/url',
-        testArgs = {
-            args: {arg: 'value'}
-        };
-
-    form.data("form")._storeAttribute('action');
-    assertEquals(form.data("form")._getActionUrl(testArgs), action + '/arg/value/');
-    assertEquals(form.data("form")._getActionUrl(testUrl), testUrl);
-    assertEquals(form.data("form")._getActionUrl(), action);
-};
-FormTest.prototype.testProcessData = function() {
-    var form = jQuery('#form').form(),
-        initialFormAttrs = {
-            action: form.attr('action'),
-            target: form.attr('target'),
-            method: form.attr('method')
-        },
-        testSimpleData = {
-            action: 'new/action/url',
-            target: '_blank',
-            method: 'POST'
-        },
-        testActionArgsData = {
-            action: {
-                args: {
-                    arg: 'value'
-                }
-            }
-        };
-    var processedData = form.data("form")._processData(testSimpleData);
-
-    assertEquals(form.data("form").oldAttributes.action, initialFormAttrs.action);
-    assertEquals(form.data("form").oldAttributes.target, initialFormAttrs.target);
-    assertEquals(form.data("form").oldAttributes.method, initialFormAttrs.method);
-
-    assertEquals(processedData.action, testSimpleData.action);
-    assertEquals(processedData.target, testSimpleData.target);
-    assertEquals(processedData.method, testSimpleData.method);
-
-    form.data("form")._rollback();
-
-    processedData = form.data("form")._processData(testActionArgsData);
-    form.data("form")._storeAttribute('action');
-    var newActionUrl = form.data("form")._getActionUrl(testActionArgsData.action);
-
-    assertEquals(processedData.action, newActionUrl);
-};
-FormTest.prototype.testBeforeSubmit = function() {
-    /*:DOC += <form id="test-form"></form> */
-    var testHandler = {
-            action: {
-                args: {
-                    arg1: 'value1'
-                }
-            }
-        },
-        form = jQuery('#form').form({handlersData: {
-                testHandler: testHandler
-            }
-        }),
-        beforeSubmitData = {
-            action: {
-                args: {
-                    arg2: 'value2'
-                }
-            },
-            target: '_blank'
-        },
-        eventData = {
-            method: 'POST'
-        },
-        resultData = $.extend(
-            true,
-            {},
-            testHandler,
-            beforeSubmitData,
-            eventData
-        );
-    form.data("form")._storeAttribute('action');
-
-    var testForm = jQuery('#test-form');
-    resultData = form.data("form")._processData(resultData);
-    testForm.prop(resultData);
-
-    form.on('beforeSubmit', function(e, data) {
-        jQuery.extend(data, beforeSubmitData);
-    });
-    form.on('submit', function(e) {
-        e.stopImmediatePropagation();
-        e.preventDefault();
-    });
-    form.data("form")._beforeSubmit('testHandler', eventData);
-
-    assertEquals(testForm.prop('action'), form.prop('action'));
-    assertEquals(testForm.prop('target'), form.prop('target'));
-    assertEquals(testForm.prop('method'), form.prop('method'));
-};
-FormTest.prototype.testSubmit = function() {
-    var form = jQuery('#form').form({
-            handlersData: {
-                save: {}
-            }
-        }),
-        formSubmitted = false;
-
-    form.data("form")._storeAttribute('action');
-    form.data("form")._storeAttribute('target');
-    form.data("form")._storeAttribute('method');
-    form
-        .on('submit', function(e) {
-            e.preventDefault();
-            e.stopImmediatePropagation();
-            e.preventDefault();
-            formSubmitted = true;
-        })
-        .prop({
-            action: 'new/action/url',
-            target: '_blank',
-            method: 'POST'
-        });
-
-    form.data("form")._submit({type: 'save'});
-
-    assertEquals(form.attr('action'), form.data("form").oldAttributes.action);
-    assertEquals(form.attr('target'), form.data("form").oldAttributes.target);
-    assertEquals(form.attr('method'), form.data("form").oldAttributes.method);
-    assertTrue(formSubmitted);
-    form.off('submit');
-};
-FormTest.prototype.testBuildURL = function() {
-    var dataProvider = [
-        {
-            params: ['http://domain.com//', {'key[one]': 'value 1', 'key2': '# value'}],
-            expected: 'http://domain.com/key[one]/value%201/key2/%23%20value/'
-        },
-        {
-            params: ['http://domain.com', {'key[one]': 'value 1', 'key2': '# value'}],
-            expected: 'http://domain.com/key[one]/value%201/key2/%23%20value/'
-        },
-        {
-            params: ['http://domain.com?some=param', {'key[one]': 'value 1', 'key2': '# value'}],
-            expected: 'http://domain.com?some=param&key[one]=value%201&key2=%23%20value'
-        },
-        {
-            params: ['http://domain.com?some=param&', {'key[one]': 'value 1', 'key2': '# value'}],
-            expected: 'http://domain.com?some=param&key[one]=value%201&key2=%23%20value'
-        }
-    ],
-        method = jQuery.mage.form._proto._buildURL,
-        quantity = dataProvider.length;
-
-    expectAsserts(quantity);
-    for (var i = 0; i < quantity; i++) {
-        assertEquals(dataProvider[i].expected, method.apply(null, dataProvider[i].params));
-    }
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/list/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/list/index.html
deleted file mode 100644
index 3d4672640bc3b..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/list/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery.js"></script>
-    <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/list.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/bootstrap.js"></script>
-    <script type="text/javascript" src="testsuite/mage/list/jquery-list-test.js"></script>
-</head>
-<body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/list/jquery-list-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/list/jquery-list-test.js
deleted file mode 100644
index affe9f11574ef..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/list/jquery-list-test.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @category    mage.loader
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-test('init & destroy', function() {
-    expect(2);
-    var element = $('<div></div>');
-    element.list();
-    ok(element.hasClass('list-widget'), "Class added" );
-    element.list('destroy');
-    ok(!element.hasClass('list-widget'), "Class removed" );
-});
-
-test('add to list', function() {
-    expect(1);
-    var element = $('<div></div>');
-    var button = $('<button data-button="add"></button>');
-    button.appendTo(element);
-    element.appendTo('body');
-    var destination = $('<div data-role="container"></div>');
-    destination.appendTo('body');
-    element.list({
-        template : '<span>test</span>',
-        templateWrapper : '<fieldset data-role="item"></fieldset>',
-        templateClass : 'fieldset'
-    });
-    button.trigger('click');
-    ok(destination.children('[data-role="addedItem"]').length, "Content is added to list");
-    element.list('destroy');
-    element.remove();
-    destination.remove();
-});
-
-test('remove from list', function() {
-    expect(1);
-    var button = $('<button></button>');
-    var removeButton = $('[data-button=remove]');
-    var destination = $('<div id="test"></div>');
-    button.list({template: '#template',destinationSelector: '#test',listLimit: 5});
-    button.trigger('click');
-    removeButton.trigger('click');
-    ok(!destination.children('[data-role=item]').length, "Content is removed from the list");
-    button.list('destroy');
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/loader/jquery-loader-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/loader/jquery-loader-test.js
deleted file mode 100644
index 174a4efc14da1..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/loader/jquery-loader-test.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TestCase('options', function() {
-	expect(3);
-
-	var element = $('<div>');
-	element.appendTo('body');
-	element.loader();
-	element.loader('show');
-	equal( element.find('p').text(), 'Please wait...', '.loader() text matches' );
-	equal( element.find('img').prop('src').split('/').pop(), 'icon.gif', '.loader() icons match' );
-	equal( element.find('img').prop('alt'), 'Loading...', '.loader() image alt text matches' );
-	element.loader('destroy');
-
-});
-
-TestCase( 'element init', function() {
-	expect(1);
-
-	var element = $('<div>');
-	element.appendTo('body');
-	element.loader();
-	element.loader('show');
-    equal(element.is(':mage-loader'), true, '.loader() init on element');
-    element.loader('destroy');
-
-});
-
-TestCase( 'body init', function() {
-	expect(1);
-
-	//Initialize Loader on Body
-	var body = $('body').loader();
-    body.loader('show');
-    equal(body.is(':mage-loader'), true, '.loader() init on body');
-    body.loader('destroy');
-});
-
-TestCase( 'show/hide', function() {
-	expect(3);
-
-	var element = $('<div>');
-	element.appendTo('body');
-	element.loader();
-
-	//Loader show
-	element.loader('show');
-	equal($('.loading-mask').is(':visible'), true, '.loader() open');
-
-	//Loader hide
-	element.loader('hide');
-	equal($('.loading-mask').is( ":hidden" ), true, '.loader() closed' );
-
-	//Loader hide on process complete
-    element.loader('show');
-    element.trigger('processStop');
-    equal($('.loading-mask').is('visible'), false, '.loader() closed after process');
-
-    element.loader('destroy');
-
-});
-
-TestCase( 'destroy', function() {
-	expect(1);
-
-	var element = $("#loader").loader();
-	element.loader('show');
-    element.loader('destroy');
-    equal( $('.loading-mask').is(':visible'), false, '.loader() destroyed');
-
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/loader/loader-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/loader/loader-test.js
deleted file mode 100644
index 3dd08f57ab8b3..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/loader/loader-test.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-LoaderTest = TestCase('LoaderTest');
-LoaderTest.prototype.setUp = function() {
-    /*:DOC += <div id="loader"></div> */
-};
-LoaderTest.prototype.tearDown = function() {
-    var loaderInstance = jQuery('#loader').data('loader');
-    if(loaderInstance && loaderInstance.destroy) {
-        loaderInstance.destroy();
-    }
-};
-LoaderTest.prototype.getInstance = function() {
-    return jQuery('#loader').data('loader');
-};
-LoaderTest.prototype.testInit = function() {
-    var div = jQuery('#loader').loader();
-    div.loader('show');
-    assertEquals(true, div.is(':mage-loader'));
-};
-// @TODO Need to be fixed to avoid errors on the bamboo server in context of MAGETWO-5085 ticket
-/*LoaderTest.prototype._testCreateOnBeforeSend = function() {
-    /*:DOC += <div id="loader"></div> */
-/*  var loader = jQuery('#loader').trigger('ajaxSend');
-    assertEquals(true, loader.is(':mage-loader'));
-    loader.loader('destroy');
-};*/
-LoaderTest.prototype.testLoaderOnBody = function() {
-    var body = jQuery('body').loader();
-    body.loader('show');
-    assertEquals(true, jQuery('body div:first').is('.loading-mask'));
-    body.loader('destroy');
-};
-LoaderTest.prototype.testLoaderOnDOMElement = function() {
-    var div = jQuery('#loader').loader(),
-        loaderInstance = this.getInstance();
-    div.loader('show');
-    assertEquals(true, div.find(':first-child').is(loaderInstance.spinner));
-};
-LoaderTest.prototype.testLoaderOptions = function() {
-    /*:DOC += <div id="loader"></div> */
-    var div = jQuery('#loader').loader({
-            icon: 'icon.gif',
-            texts: {
-                loaderText: 'Loader Text',
-                imgAlt: 'Image Alt Text'
-            }
-        }),
-        loaderInstance = this.getInstance();
-    div.loader('show');
-    assertEquals('icon.gif', loaderInstance.spinner.find('img').attr('src'));
-    assertEquals('Image Alt Text', loaderInstance.spinner.find('img').attr('alt'));
-    assertEquals('Loader Text', loaderInstance.spinner.find('div.popup-inner').text());
-    div.loader('destroy');
-    div.loader({
-        template:'<div id="test-template"></div>'
-    });
-    div.loader('show');
-    loaderInstance = this.getInstance();
-    assertEquals(true, loaderInstance.spinner.is('#test-template'));
-    div.loader('destroy');
-};
-LoaderTest.prototype.testHideOnComplete = function() {
-    /*:DOC += <div id="loader"></div> */
-    var div = jQuery('#loader').loader();
-    div.loader('show');
-    loaderIsVisible = jQuery('.loading-mask').is(':visible');
-    div.trigger('processStop');
-    assertEquals(false, jQuery('.loading-mask').is(':visible') === loaderIsVisible);
-};
-LoaderTest.prototype.testRender = function() {
-    /*:DOC += <div id="loader" style="widht:200px; height:200px;"></div> */
-    var div = jQuery('#loader').loader();
-    div.loader('show');
-    assertEquals(true, $('.loading-mask').is(':visible'));
-};
-LoaderTest.prototype.testShowHide = function() {
-    /*:DOC += <div id="loader" style="widht:200px; height:200px;"></div> */
-    var div = jQuery('#loader').loader();
-    div.loader('show');
-    assertEquals(true, $('.loading-mask').is(':visible'));
-    div.loader('hide');
-    assertEquals(false, $('.loading-mask').is(':visible'));
-};
-LoaderTest.prototype.testDestroy = function() {
-    /*:DOC += <div id="loader"></div> */
-    var div = jQuery('#loader').loader(),
-        loaderExist = div.is(':mage-loader');
-    div.loader('destroy');
-    assertEquals(false, div.is(':mage-loader') === loaderExist);
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/loader/loader.html b/dev/tests/js/JsTestDriver/testsuite/mage/loader/loader.html
deleted file mode 100644
index 362dec7138276..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/loader/loader.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script src="../../../lib/web/jquery.js"></script>
-    <script src="../../../lib/web/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/bootstrap.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/loader.js"></script>
-    <script type="text/javascript" src="testsuite/mage/loader/jquery-loader-test.js"></script>
-</head>
-<body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/mage-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/mage-test.js
deleted file mode 100644
index 445f6619e7e35..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/mage-test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-MageTest = TestCase('MageTest');
-
-MageTest.prototype.setUp = function() {
-    /*:DOC += <button id="save"></button>*/
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/menu/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/menu/index.html
deleted file mode 100644
index d0a3b9b873801..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/menu/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-/**
- * @category    mage.menu
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Unit test</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery.js"></script>
-    <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/menu.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/bootstrap.js"></script>
-    <script type="text/javascript" src="testsuite/mage/menu/test-menu.js"></script>
-
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-<ul id="menu">
-    <li class="foo">Aberdeen</li>
-    <li class="foo">Ada</li>
-    <li class="foo">Adamsville</li>
-    <li class="foo"><span class="ui-icon ui-icon-print"></span>Addyston</li>
-    <li>Delphi
-        <ul>
-            <li class="foo">Ada</li>
-            <li class="foo">Saarland</li>
-            <li class="foo">Salzburg</li>
-        </ul>
-    </li>
-    <li class="foo">Saarland</li>
-    <li>Salzburg
-        <ul>
-            <li>Delphi
-                <ul>
-                    <li class="foo">Ada</li>
-                    <li class="foo">Saarland</li>
-                    <li class="foo">Salzburg</li>
-                </ul>
-            </li>
-            <li>Delphi
-                <ul>
-                    <li class="foo">Ada</li>
-                    <li> - </li>
-                    <li class="foo">Saarland</li>
-                    <li></li>
-                    <li class="foo">Salzburg</li>
-                    <li>&ndash;</li>
-                </ul>
-            </li>
-            <li class="foo">Perch</li>
-        </ul>
-    </li>
-</ul>
-</div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/menu/test-menu.js b/dev/tests/js/JsTestDriver/testsuite/mage/menu/test-menu.js
deleted file mode 100644
index 0e1c4a3682b89..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/menu/test-menu.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * @category    mage.js
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
- /*
-    Set key logger to check key press event 
- */
- function KeyLogger( target ) {
-  if ( !(this instanceof KeyLogger) ) {
-    return new KeyLogger( target );
-  }
-  this.target = target;
-  this.log = [];
- 
-  var self = this;
-
-  this.target.off( 'keydown' ).on( 'keydown', function( event ) {
-    self.log.push( event.keyCode );
-  });
-}
-/*
-    testing if menu get expanded class when option set to true
- */
-test( 'Menu Expanded', function() {
-    expect(1);
-    var menu = $('#menu');
-    var menuItems = menu.find('li');
-    var submenu = menuItems.find('ul');
-    menu.menu({
-        expanded: true
-    });
-    ok(submenu.hasClass('expanded'), 'Expanded Class added');
-});
-/*
-    testing if down arrow is pressed
- */
-test( 'Down Arrow', function() {
-    expect(1);
-    var event,
-        menu = $('#menu'),
-        keys = KeyLogger(menu);
-    event = $.Event('keydown');
-    event.keyCode = $.ui.keyCode.DOWN;
-    menu.trigger( event );
-    equal( keys.log[ 0 ], 40, 'Down Arrow Was Pressed' );
-});
-/*
-    testing if up arrow is pressed
- */
-test( 'Up Arrow', function() {
-    expect(1);
-    var event,
-        menu = $('#menu'),
-        keys = KeyLogger(menu);
-    event = $.Event('keydown');
-    event.keyCode = $.ui.keyCode.UP;
-    menu.trigger( event );
-    equal( keys.log[ 0 ], 38, 'Up Arrow Was Pressed' );
-});
-/*
-    testing if left arrow is pressed
- */
-test( 'Left Arrow', function() {
-    expect(1);
-    var event,
-        menu = $('#menu'),
-        keys = KeyLogger(menu);
-    event = $.Event('keydown');
-    event.keyCode = $.ui.keyCode.LEFT;
-    menu.trigger( event );
-    equal( keys.log[ 0 ], 37, 'Left Arrow Was Pressed' );
-});
-/*
-    testing if right arrow is pressed
- */
-test( 'Right Arrow', function() {
-    expect(1);
-    var event,
-        menu = $('#menu'),
-        keys = KeyLogger(menu);
-    event = $.Event('keydown');
-    event.keyCode = $.ui.keyCode.RIGHT;
-    menu.trigger( event );
-    equal( keys.log[ 0 ], 39, 'Right Arrow Was Pressed' );
-});
-/*
-    testing if max limit being set
- */
-test( 'Max Limit', function() {
-    expect(1);
-    var menu = $('#menu');
-    menu.navigation({
-        maxItems: 3
-    });
-    var menuItems = menu.find('> li:visible');
-    equal(menuItems.length, 4, 'Max Limit Reach');
-});
-/*
-    testing if responsive menu is set
- */
-test( 'Responsive: More Menu', function() {
-    expect(1);
-    var menu = $('#menu');
-    menu.navigation({
-        responsive: 'onResize'
-    });
-    ok($('body').find('.ui-menu.more'), 'More Menu Created');
-});
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/search/regular-search-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/search/regular-search-test.js
deleted file mode 100644
index a79d05ba8a246..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/search/regular-search-test.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @category    mage.js
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-//Code to be tested for /app/code/Magento/Search/view/frontend/form-mini.js (_onSubmit)
-function regularSearch() {
-    if (this.document.getElementById('search').value === this.document.getElementById('search').placeholder || this.document.getElementById('search').value === '') {
-        this.document.getElementById('search').placeholder = 'Please specify at least one search term';
-        this.document.getElementById('search').value = this.document.getElementById('search').placeholder;
-    }
-}
-//The test case
-RegularSearchTest = TestCase("RegularSearchTest");
-RegularSearchTest.prototype.setUp = function() {
-    /*:DOC +=
-     <div id='main'>
-     <form id="search_mini_form" action="" method="get">
-     <div>
-     <label><span>Search</span></label>
-     <div>
-     <input id="search"
-     type="text"
-     name="q"
-     value=""
-     placeholder="Search entire store here..."/>
-     </div>
-     <div>
-     <button id="submit" type="submit"
-     title="Search">
-     <span>Search</span>
-     </button>
-     </div>
-     </form>
-     </div>*/
-};
-RegularSearchTest.prototype.testRegularSearch = function(){
-    //before
-    var inputValue = document.getElementById('search');
-    assertEquals("", inputValue.value);
-    regularSearch();
-    //after
-    inputValue = document.getElementById('search');
-    assertEquals("Please specify at least one search term", inputValue.value);
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/suggest/suggest-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/suggest/suggest-test.js
deleted file mode 100644
index 4b2b961f753ee..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/suggest/suggest-test.js
+++ /dev/null
@@ -1,952 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-SuggestTest = TestCase('SuggestTest');
-SuggestTest.prototype.setUp = function() {
-    /*:DOC += <input name="test-suggest" id="suggest" />*/
-    this.suggestElement = jQuery('#suggest');
-};
-SuggestTest.prototype.tearDown = function() {
-    this.suggestDestroy();
-};
-SuggestTest.prototype.suggestDestroy = function() {
-    if(this.suggestElement.data('suggest')) {
-        this.suggestElement.suggest('destroy');
-    }
-};
-SuggestTest.prototype.suggestCreate = function(options, element) {
-    return (element || this.suggestElement).suggest(options || {} ).data('suggest');
-};
-SuggestTest.prototype.uiHash = {
-    item: {
-        id: 1,
-        label: 'Test Label'
-    }
-};
-
-SuggestTest.prototype.testInit = function() {
-    this.suggestElement.suggest();
-    assertTrue(this.suggestElement.is(':mage-suggest'));
-};
-SuggestTest.prototype.testCreate = function() {
-    var suggestOptions = {
-            controls: {
-                selector: '.test',
-                eventsMap: {
-                    focus: ['testfocus'],
-                    blur: ['testblur'],
-                    select: ['testselect']
-                }
-            },
-            showRecent: true,
-            storageKey: 'jsTestDriver-test-suggest-recent',
-            multiselect: true
-        },
-        recentItems = [{
-            id: "1",
-            "label": "TestLabel1"
-        },
-        {
-            id: "2",
-            label: "TestLabel2"
-        }],
-        setTemplateExecuted,
-        prepareValueFieldExecuted,
-        renderExecuted,
-        bindExecuted;
-
-    if(window.localStorage) {
-        localStorage.setItem(suggestOptions.storageKey, JSON.stringify(recentItems));
-    }
-
-    var suggestInstance = this.suggestCreate(suggestOptions),
-        nonSelectedItem = {id: '', label: ''};
-
-    assertEquals(null, suggestInstance._term);
-    assertEquals(suggestInstance._nonSelectedItem, nonSelectedItem);
-    assertNull(suggestInstance._renderedContext);
-    assertEquals(suggestInstance._selectedItem, nonSelectedItem);
-    var control = suggestInstance.options.controls;
-    assertEquals(suggestInstance._control, control);
-    assertEquals(suggestInstance._recentItems, window.localStorage ? recentItems : []);
-    assertTrue(suggestInstance.valueField.is(':hidden'));
-    if(window.localStorage) {
-        localStorage.removeItem(suggestOptions.storageKey);
-    }
-};
-SuggestTest.prototype.testRender = function() {
-    var suggestOptions = {
-        dropdownWrapper: '<div class="wrapper-test"></div>',
-        className: 'test-suggest',
-        inputWrapper: '<div class="test-input-wrapper"></div>'
-    };
-
-    var suggestInstance = this.suggestCreate(suggestOptions);
-    suggestInstance._render();
-
-    assertTrue(suggestInstance.dropdown.hasClass('wrapper-test'));
-    assertTrue(suggestInstance.dropdown.is(':hidden'));
-    assertTrue(suggestInstance.element.closest('.test-input-wrapper').size() > 0);
-    assertTrue(suggestInstance.element.closest('.' + suggestOptions.className).size() > 0);
-    assertEquals(suggestInstance.element.attr('autocomplete'), 'off');
-
-    suggestOptions.appendMethod = 'before';
-    this.suggestDestroy();
-    suggestInstance = this.suggestCreate(suggestOptions);
-    suggestInstance._render();
-    assertTrue(suggestInstance.element.prev().is(suggestInstance.dropdown));
-
-    suggestOptions.appendMethod = 'after';
-    this.suggestDestroy();
-    suggestInstance = this.suggestCreate(suggestOptions);
-    suggestInstance._render();
-    assertTrue(suggestInstance.element.next().is(suggestInstance.dropdown));
-};
-SuggestTest.prototype.testCreateValueField = function() {
-    var suggestInstance = this.suggestCreate(),
-        valueField = suggestInstance._createValueField();
-    assertTrue(valueField.is('input'));
-    assertTrue(valueField.is(':hidden'));
-    this.suggestDestroy();
-
-    suggestInstance = this.suggestCreate({multiselect: true});
-    valueField = suggestInstance._createValueField();
-    assertTrue(valueField.is('select'));
-    assertTrue(valueField.is(':hidden'));
-    assertEquals(valueField.attr('multiple'), 'multiple');
-};
-SuggestTest.prototype.testPrepareValueField = function() {
-    var suggestInstance = this.suggestCreate(),
-        suggestName = this.suggestElement.attr('name');
-    suggestInstance._prepareValueField();
-
-    assertNotUndefined(suggestInstance.valueField);
-    assertTrue(suggestInstance.element.prev().is(suggestInstance.valueField));
-    assertUndefined(suggestInstance.element.attr('name'));
-    assertEquals(suggestInstance.valueField.attr('name'), suggestName);
-    this.suggestDestroy();
-
-
-    var valueField = jQuery('<input id="suggest-single-select-value" type="hidden" />');
-    jQuery('body').append(valueField);
-    suggestInstance = this.suggestCreate({valueField: '#suggest-single-select-value'});
-    assertTrue(suggestInstance.valueField.is(valueField));
-};
-SuggestTest.prototype.testDestroy = function() {
-    var suggestOptions = {
-            inputWrapper: '<div class="test-input-wrapper"></div>',
-            valueField: null
-        },
-        suggestInstance = this.suggestCreate(suggestOptions),
-        suggestName = suggestInstance.valueField.attr('name');
-
-    assertNotUndefined(suggestInstance.dropdown);
-    assertNotUndefined(suggestInstance.valueField);
-    assertUndefined(this.suggestElement.attr('name'));
-
-    this.suggestElement.suggest('destroy');
-
-    assertEquals(this.suggestElement.closest('.test-input-wrapper').length, 0);
-    assertUndefined(this.suggestElement.attr('autocomplete'));
-    assertEquals(this.suggestElement.attr('name'), suggestName);
-    assertFalse(suggestInstance.valueField.parents('html').length > 0);
-    assertFalse(suggestInstance.dropdown.parents('html').length > 0);
-};
-SuggestTest.prototype.testValue = function() {
-    var value = 'test-value';
-    this.suggestElement.val(value);
-    jQuery('body').append('<div id="suggest-div">' + value + '</div>');
-
-    var suggestInputInsatnce = this.suggestCreate(),
-        suggestDivInsatnce = this.suggestCreate(null, jQuery('#suggest-div'));
-
-    assertEquals(suggestInputInsatnce._value(), value);
-    assertEquals(suggestDivInsatnce._value(), value);
-};
-SuggestTest.prototype.testProxyEvents = function() {
-    var fakeEvent = $.extend({}, $.Event('keydown'), {
-            ctrlKey: false,
-            keyCode: $.ui.keyCode.ENTER,
-            which: $.ui.keyCode.ENTER
-        }),
-        suggestInstance = this.suggestCreate({controls: {selector: null}}),
-        ctrlKey,
-        keyCode,
-        which;
-
-    suggestInstance.dropdown.on('keydown', function(e) {
-        ctrlKey = e.ctrlKey;
-        keyCode = e.keyCode;
-        which = e.which;
-    });
-
-    suggestInstance._proxyEvents(fakeEvent);
-
-    assertEquals(ctrlKey, fakeEvent.ctrlKey);
-    assertEquals(keyCode, fakeEvent.keyCode);
-    assertEquals(which, fakeEvent.which);
-};
-SuggestTest.prototype.testBind = function() {
-    var eventIsBinded = false,
-        suggestOptions = {
-            events: {
-                click: function() {
-                    eventIsBinded = true;
-                }
-            }
-        };
-    this.suggestCreate(suggestOptions);
-
-    this.suggestElement.trigger('click');
-    assertTrue(eventIsBinded);
-};
-SuggestTest.prototype.testChange = function() {
-    var changeIsTriggered,
-        suggestInstance = this.suggestCreate();
-
-    suggestInstance._term = 'changed';
-    this.suggestElement.on('suggestchange', function(e) {
-        changeIsTriggered = true;
-    });
-
-    suggestInstance._change($.Event('click'));
-    assertTrue(changeIsTriggered);
-};
-SuggestTest.prototype.testBindDropdown = function() {
-    var suggestOptions = {
-        controls: {
-                eventsMap: {
-                    focus: ['testFocus'],
-                    blur: ['testBlur'],
-                    select: ['testSelect']
-                }
-            }
-        },
-        suggestInstance = this.suggestCreate(suggestOptions),
-        focusTriggered,
-        blurTriggered,
-        selectTriggered;
-
-    suggestInstance._onSelectItem = function() {
-        selectTriggered = true;
-    };
-    suggestInstance._focusItem = function() {
-        focusTriggered = true;
-    };
-    suggestInstance._blurItem = function() {
-        blurTriggered = true;
-    };
-    suggestInstance._bindDropdown();
-
-    suggestInstance.dropdown.trigger('testFocus');
-    suggestInstance.dropdown.trigger('testBlur');
-    suggestInstance.dropdown.trigger('testSelect');
-
-    assertTrue(focusTriggered);
-    assertTrue(blurTriggered);
-    assertTrue(selectTriggered);
-};
-SuggestTest.prototype.testTrigger = function() {
-    var propogationStopped = true,
-        suggestInstance = this.suggestCreate();
-
-    this.suggestElement
-        .on('suggesttestevent', function() {
-            return false;
-        });
-    this.suggestElement.parent().on('suggesttestevent', function() {
-            propogationStopped = false;
-        });
-    suggestInstance._trigger('testevent');
-
-    assertTrue(propogationStopped);
-};
-SuggestTest.prototype.testFocusItem = function() {
-    var focusUiParam = false,
-        suggestInstance = this.suggestCreate();
-
-    this.suggestElement.on('suggestfocus', function(e, ui) {
-        focusUiParam = ui;
-    });
-
-    assertUndefined(suggestInstance._focused);
-    assertEquals(suggestInstance.element.val(), '');
-
-    suggestInstance._focusItem($.Event('focus'), this.uiHash);
-    assertEquals(suggestInstance._focused, this.uiHash.item);
-    assertEquals(focusUiParam, this.uiHash);
-    assertEquals(suggestInstance.element.val(), this.uiHash.item.label);
-};
-SuggestTest.prototype.testBlurItem = function() {
-    var suggestInstance = this.suggestCreate();
-
-    suggestInstance._focusItem($.Event('focus'), this.uiHash);
-    assertEquals(suggestInstance._focused, this.uiHash.item);
-    assertEquals(suggestInstance.element.val(), this.uiHash.item.label);
-
-    suggestInstance._blurItem();
-    assertNull(suggestInstance._focused);
-    //assertEquals(suggestInstance.element.val(), suggestInstance._term.toString());
-};
-SuggestTest.prototype.testOnSelectItem = function() {
-    var item = this.uiHash.item,
-        beforeSelect,
-        beforeSelectUI,
-        beforeSelectPropagationStopped = true,
-        select,
-        selectUI,
-        selectPropagationStopped = true,
-        suggestInstance = this.suggestCreate();
-
-    suggestInstance._focused = item;
-    this.suggestElement
-        .on('suggestbeforeselect', function(e, ui) {
-            beforeSelect = true;
-            beforeSelectUI = ui;
-        })
-        .on('suggestselect', function(e, ui) {
-            select = true;
-            selectUI = ui;
-        })
-        .parent()
-        .on('suggestbeforeselect', function() {
-            beforeSelectPropagationStopped = false;
-        })
-        .on('suggestselect', function() {
-            selectPropagationStopped = false;
-        });
-
-    suggestInstance._onSelectItem($.Event('select'));
-
-    assertTrue(beforeSelect);
-    assertTrue(select);
-    assertFalse(beforeSelectPropagationStopped);
-    assertFalse(selectPropagationStopped);
-    assertEquals(beforeSelectUI.item, item);
-    assertEquals(selectUI.item, item);
-
-    beforeSelect = select = beforeSelectUI = selectUI = null;
-    beforeSelectPropagationStopped = selectPropagationStopped = true;
-
-    this.suggestElement
-        .on('suggestbeforeselect.returnfalse', function(e, ui) {
-            return false;
-        });
-
-    suggestInstance._focused = item;
-    suggestInstance._onSelectItem($.Event('select'));
-    assertTrue(beforeSelect);
-    assertNull(select);
-    assertTrue(beforeSelectPropagationStopped);
-    assertTrue(selectPropagationStopped);
-    assertEquals(beforeSelectUI.item, item);
-    assertNull(selectUI);
-
-    beforeSelect = select = beforeSelectUI = selectUI = null;
-    beforeSelectPropagationStopped = selectPropagationStopped = true;
-
-    this.suggestElement
-        .off('suggestbeforeselect.returnfalse')
-        .on('suggestselect.returnfalse', function() {
-            return false;
-        });
-
-    suggestInstance._focused = item;
-    suggestInstance._onSelectItem($.Event('select'));
-    assertTrue(beforeSelect);
-    assertTrue(select);
-    assertFalse(beforeSelectPropagationStopped);
-    assertTrue(selectPropagationStopped);
-    assertEquals(beforeSelectUI.item, item);
-    assertEquals(selectUI.item, item);
-
-    beforeSelect = select = beforeSelectUI = selectUI = null;
-    beforeSelectPropagationStopped = selectPropagationStopped = true;
-
-    this.suggestElement.off('suggestselect.returnfalse');
-    var event = $.Event('select');
-    event.target = this.suggestElement[0];
-
-    suggestInstance._onSelectItem(event, item);
-    assertEquals(suggestInstance._selectedItem, item);
-};
-SuggestTest.prototype.testSelectItem = function() {
-    var suggestInstance = this.suggestCreate();
-
-    suggestInstance._focused = suggestInstance._term = suggestInstance._selectedItem = null;
-    suggestInstance.valueField.val('');
-
-    suggestInstance._selectItem($.Event('select'));
-    assertNull(suggestInstance._selectedItem);
-    assertNull(suggestInstance._term);
-    assertEquals(suggestInstance.valueField.val(), '');
-
-    suggestInstance._focused = this.uiHash.item;
-
-    suggestInstance._selectItem($.Event('select'));
-    assertEquals(suggestInstance._selectedItem, suggestInstance._focused);
-    assertEquals(suggestInstance._term, suggestInstance._focused.label);
-    assertEquals(suggestInstance.valueField.val(), suggestInstance._focused.id);
-    assertTrue(suggestInstance.dropdown.is(':hidden'));
-
-    this.suggestDestroy();
-
-    var suggestOptions;
-    if(window.localStorage) {
-        suggestOptions = {
-            showRecent: true,
-            storageKey: 'jsTestDriver-test-suggest-recent'
-        };
-        suggestInstance = this.suggestCreate(suggestOptions);
-        suggestInstance._focused = this.uiHash.item;
-
-        suggestInstance._selectItem($.Event('select'));
-
-        var storedItem = localStorage.getItem(suggestOptions.storageKey);
-        assertEquals(storedItem, JSON.stringify([this.uiHash.item]));
-        localStorage.removeItem(suggestOptions.storageKey);
-    }
-};
-SuggestTest.prototype.testSelectItemMultiselect = function() {
-    var suggestInstance = this.suggestCreate({multiselect: true});
-
-    suggestInstance._focused = suggestInstance._term = suggestInstance._selectedItem = null;
-    suggestInstance.valueField.val('');
-
-    suggestInstance._selectItem($.Event('select'));
-    assertNull(suggestInstance._selectedItem);
-    assertNull(suggestInstance._term);
-    assertFalse(suggestInstance.valueField.find('option').length > 0);
-    assertTrue(suggestInstance.dropdown.is(':hidden'));
-
-    suggestInstance._focused = this.uiHash.item;
-    var selectedElement = jQuery('<div></div>');
-    var event = $.Event('select');
-    event.target = selectedElement[0];
-
-    suggestInstance._selectItem(event);
-    assertEquals(suggestInstance._selectedItem, suggestInstance._focused);
-    assertEquals(suggestInstance._term, '');
-    assertTrue(suggestInstance._getOption(suggestInstance._focused).length > 0);
-    assertTrue(selectedElement.hasClass(suggestInstance.options.selectedClass));
-    assertTrue(suggestInstance.dropdown.is(':hidden'));
-
-    suggestInstance._selectItem(event);
-    assertEquals(suggestInstance._selectedItem, suggestInstance._nonSelectedItem);
-    assertFalse(suggestInstance._getOption(suggestInstance._focused).length > 0);
-    assertFalse(selectedElement.hasClass(suggestInstance.options.selectedClass));
-    assertTrue(suggestInstance.dropdown.is(':hidden'));
-};
-SuggestTest.prototype.testResetSuggestValue = function() {
-    var suggestInstance = this.suggestCreate();
-    suggestInstance.valueField.val('test');
-    suggestInstance._resetSuggestValue();
-    assertEquals(suggestInstance.valueField.val(), suggestInstance._nonSelectedItem.id);
-};
-SuggestTest.prototype.testResetSuggestValueMultiselect = function() {
-    var suggestInstance = this.suggestCreate({multiselect: true});
-    suggestInstance._focused = this.uiHash.item;
-    var selectedElement = jQuery('<div></div>');
-    var event = $.Event('select');
-    event.target = selectedElement[0];
-
-    suggestInstance._selectItem(event);
-    suggestInstance._resetSuggestValue();
-
-    var suggestValue = suggestInstance.valueField.val();
-    assertArray(suggestValue);
-    assertNotUndefined(suggestValue[0]);
-    assertEquals(suggestValue[0], this.uiHash.item.id);
-};
-SuggestTest.prototype.testReadItemData = function() {
-    var testElement = jQuery('<div></div>'),
-        suggestInstance = this.suggestCreate();
-    assertEquals(suggestInstance._readItemData(testElement), suggestInstance._nonSelectedItem);
-    testElement.data('suggestOption', 'test');
-    assertEquals(suggestInstance._readItemData(testElement), 'test');
-};
-SuggestTest.prototype.testIsDropdownShown = function() {
-    var suggestInstance = this.suggestCreate();
-    suggestInstance.dropdown.hide();
-    assertFalse(suggestInstance.isDropdownShown());
-    suggestInstance.dropdown.show();
-    assertTrue(suggestInstance.isDropdownShown());
-};
-SuggestTest.prototype.testOpen = function() {
-    var openTriggered = false,
-        suggestInstance = this.suggestCreate();
-
-    this.suggestElement.on('suggestopen', function() {
-        openTriggered = true;
-    });
-
-    suggestInstance.dropdown.show();
-    suggestInstance.open($.Event('open'));
-    assertFalse(openTriggered);
-
-    suggestInstance.dropdown.hide();
-    suggestInstance.open($.Event('open'));
-    assertTrue(openTriggered);
-    assertTrue(suggestInstance.dropdown.is(':visible'));
-};
-SuggestTest.prototype.testClose = function() {
-    var closeTriggered = false,
-        suggestInstance = this.suggestCreate();
-
-    suggestInstance.element.val('test');
-    suggestInstance._renderedContext = 'test';
-    suggestInstance.dropdown.show().append('<div class="test"></div>');
-
-    this.suggestElement.on('suggestclose', function() {
-        closeTriggered = true;
-    });
-
-    suggestInstance.close($.Event('close'));
-    assertNull(suggestInstance._renderedContext);
-    assertTrue(suggestInstance.dropdown.is(':hidden'));
-    assertFalse(suggestInstance.dropdown.children().length > 0);
-    assertTrue(closeTriggered);
-};
-SuggestTest.prototype.testSetTemplate = function() {
-    /*:DOC += <script type="text/template" id="test-template"><div><%= data.test %></div></script>*/
-    var suggestInstance = this.suggestCreate({template: '<div><%= data.test %></div>'}),
-        tmpl,
-        html;
-
-    tmpl = suggestInstance.templates[suggestInstance.templateName]
-
-    html = jQuery('<div />').append(tmpl({
-        data: {
-            test: 'test'
-        }
-    })).html();
-
-    assertEquals(html, '<div>test</div>');
-
-    suggestInstance = this.suggestCreate({
-        template: '#test-template'
-    });
-
-    tmpl = suggestInstance.templates[suggestInstance.templateName];
-
-    html = jQuery('<div />').append(tmpl({
-        data: {
-            test: 'test'
-        }
-    })).html();
-
-    assertEquals(html, '<div>test</div>');
-};
-SuggestTest.prototype.testSearch = function() {
-    var searchTriggered = false,
-        seachPropagationStopped = true,
-        suggestInstance = this.suggestCreate();
-
-    this.suggestElement
-        .on('suggestsearch', function() {
-            searchTriggered = true;
-        })
-        .parent()
-        .on('suggestsearch', function() {
-            seachPropagationStopped = false;
-        });
-
-    suggestInstance._term = suggestInstance._value();
-    suggestInstance._selectedItem = null;
-
-    suggestInstance.preventBlur = true;
-    suggestInstance.search($.Event('search'));
-
-    assertNull(suggestInstance._selectedItem);
-    assertFalse(searchTriggered);
-    suggestInstance.preventBlur = false;
-
-    this.suggestElement.val('test');
-    suggestInstance.search($.Event('search'));
-
-    assertEquals(suggestInstance._term, suggestInstance._value());
-    assertTrue(searchTriggered);
-    assertFalse(seachPropagationStopped);
-
-    searchTriggered = false;
-    seachPropagationStopped = true;
-    suggestInstance._selectedItem = null;
-    suggestInstance.options.minLength = 10;
-    this.suggestElement.val('testtest');
-
-    suggestInstance.search($.Event('search'));
-
-    assertEquals(suggestInstance._selectedItem, suggestInstance._nonSelectedItem);
-    assertEquals(suggestInstance.valueField.val(), suggestInstance._selectedItem.id);
-    assertFalse(searchTriggered);
-
-    searchTriggered = false;
-    seachPropagationStopped = true;
-    suggestInstance._selectedItem = null;
-    suggestInstance.options.minLength = 1;
-    this.suggestElement.val('test');
-
-    this.suggestElement
-        .on('suggestsearch.returnfalse', function() {
-            return false;
-        });
-
-    suggestInstance.search($.Event('search'));
-
-    assertEquals(suggestInstance._term, suggestInstance._value());
-    assertTrue(searchTriggered);
-    assertTrue(seachPropagationStopped);
-};
-SuggestTest.prototype.testUderscoreSearch = function() {
-    var sourceLaunched = false,
-        sorceTerm = null,
-        responceExists = false,
-        suggestOptions = {
-            source: function(term, response){
-                sourceLaunched = true;
-                sorceTerm = term;
-                responceExists = (response && jQuery.type(response) === 'function');
-            },
-            delay: null
-        },
-        suggestInstance = this.suggestCreate(suggestOptions);
-
-    suggestInstance._search($.Event('search'), 'test', {});
-    assertTrue(sourceLaunched);
-    assertEquals(sorceTerm, 'test');
-    assertTrue(responceExists);
-    assertTrue(this.suggestElement.hasClass(suggestInstance.options.loadingClass));
-    assertUndefined(suggestInstance._searchTimeout);
-
-    suggestInstance.options.delay = 100;
-    suggestInstance._search($.Event('search'), 'test', {});
-    assertNotUndefined(suggestInstance._searchTimeout);
-};
-SuggestTest.prototype.testPrepareDropdownContext = function() {
-    var suggestInstance = this.suggestCreate();
-
-    suggestInstance._items = [this.uiHash.item];
-    suggestInstance._term = 'test';
-    suggestInstance._selectedItem = this.uiHash.item;
-
-    var context = suggestInstance._prepareDropdownContext({});
-
-    assertEquals(context.items, suggestInstance._items);
-    assertEquals(context.term, suggestInstance._term);
-    assertEquals(context.optionData(this.uiHash.item),
-        'data-suggest-option="' + JSON.stringify(this.uiHash.item).replace(/"/g, '&quot;') + '"');
-    assertTrue(context.itemSelected(this.uiHash.item));
-    assertNotUndefined(context.noRecordsText);
-    assertFalse(context.recentShown());
-    assertNotUndefined(context.recentTitle);
-    assertNotUndefined(context.showAllTitle);
-    assertFalse(context.allShown());
-};
-SuggestTest.prototype.testIsItemSelected = function() {
-    var suggestInstance = this.suggestCreate();
-    assertFalse(suggestInstance._isItemSelected(this.uiHash.item));
-    suggestInstance._selectedItem = this.uiHash.item;
-    assertTrue(suggestInstance._isItemSelected(this.uiHash.item));
-    this.suggestDestroy();
-
-    suggestInstance = this.suggestCreate({multiselect: true});
-    assertFalse(suggestInstance._isItemSelected(this.uiHash.item));
-    suggestInstance.valueField.append('<option value="1">Test Label1</option>');
-    assertTrue(suggestInstance._isItemSelected(this.uiHash.item));
-};
-SuggestTest.prototype.testRenderDropdown = function() {
-    var testContext = {
-            test: 'test'
-        },
-        contentUpdatedTriggered = false,
-        suggestOptions = {
-            template: '<div><%= data.test %></div>'
-        },
-        suggestInstance = this.suggestCreate(suggestOptions);
-
-    suggestInstance.dropdown.on('contentUpdated', function() {
-        contentUpdatedTriggered = true;
-    });
-    suggestInstance.element.addClass(suggestInstance.options.loadingClass);
-
-    suggestInstance._renderDropdown(null, [this.uiHash.item], testContext);
-
-    assertEquals(suggestInstance._items, [this.uiHash.item]);
-    assertEquals(suggestInstance.dropdown.html(), '<div>test</div>');
-    assertTrue(contentUpdatedTriggered);
-    assertEquals(suggestInstance._renderedContext, suggestInstance._prepareDropdownContext(testContext));
-    assertFalse(suggestInstance.element.hasClass(suggestInstance.options.loadingClass));
-    assertTrue(suggestInstance.dropdown.is(':visible'));
-};
-SuggestTest.prototype.testProcessResponse = function() {
-    var testContext = {
-            test: 'test'
-        },
-        responseTriggered = false,
-        suggestOptions = {
-            template: '<div><%= data.test %></div>'
-        },
-        responcePropagationStopped = true,
-        rendererExists,
-        responseData,
-        suggestInstance = this.suggestCreate(suggestOptions);
-
-    this.suggestElement
-        .on('suggestresponse', function(e, data, renderer) {
-            responseTriggered = true;
-            rendererExists = (renderer && jQuery.type(renderer) === 'function');
-            responseData = data;
-        })
-        .parent()
-        .on('suggestresponse', function() {
-            responcePropagationStopped = false;
-        });
-    suggestInstance._processResponse($.Event('response'), [this.uiHash.item], testContext);
-
-    assertTrue(responseTriggered);
-    assertTrue(rendererExists);
-    assertEquals(responseData, [this.uiHash.item]);
-    assertFalse(responcePropagationStopped);
-    assertEquals(suggestInstance.dropdown.html(), '<div>test</div>');
-
-    suggestInstance.dropdown.empty();
-    this.suggestElement
-        .on('suggestresponse.returnfalse', function() {
-            return false;
-        });
-    responcePropagationStopped = true;
-
-    suggestInstance._processResponse($.Event('response'), [this.uiHash.item], testContext);
-
-    assertTrue(responcePropagationStopped);
-    assertFalse(suggestInstance.dropdown.children().tength > 0);
-};
-SuggestTest.prototype.testSource = function() {
-    var sourceArray = [this.uiHash.item],
-        sourceUrl = 'www.test.url',
-        sourceFuncExecuted = false,
-        responseExecuted = false,
-        responseItems = null,
-        sourceFuncTerm = "",
-        sourceFuncResponse = null,
-        ajaxData = '',
-        ajaxUrl = '',
-        sourceFunc = function(term, response) {
-            sourceFuncExecuted = true;
-            sourceFuncTerm = term;
-            sourceFuncResponse = (response && jQuery.type(response) === 'function');
-        },
-        response = function (items) {
-            responseExecuted = true;
-            responseItems = items;
-        };
-
-    var suggestInstance = this.suggestCreate({
-        source: sourceArray
-    });
-
-    suggestInstance._source('test', response);
-
-    assertTrue(responseExecuted);
-    assertEquals(responseItems, sourceArray);
-    this.suggestDestroy();
-
-    responseExecuted = false;
-    responseItems = null;
-
-    suggestInstance = this.suggestCreate({
-        source: sourceUrl,
-        ajaxOptions: {
-            beforeSend: function(xhr, settings) {
-                xhr.abort();
-                ajaxData = settings.data;
-                ajaxUrl = settings.url;
-                settings.success(sourceArray);
-            }
-        },
-        termAjaxArgument: 'test'
-    });
-    suggestInstance._source('test', response);
-
-    assertTrue(responseExecuted);
-    assertEquals(responseItems, sourceArray);
-    assertEquals(ajaxData, 'test=test');
-    assertEquals(ajaxUrl, sourceUrl);
-    this.suggestDestroy();
-
-    responseExecuted = false;
-    responseItems = null;
-
-    suggestInstance = this.suggestCreate({
-        source: sourceFunc
-    });
-    suggestInstance._source('test', response);
-
-    assertTrue(sourceFuncExecuted);
-    assertEquals(sourceFuncTerm, 'test');
-    assertTrue(sourceFuncResponse);
-};
-SuggestTest.prototype.testAbortSearch = function() {
-    var searchAborted = false,
-        suggestInstance = this.suggestCreate();
-
-    this.suggestElement.addClass(suggestInstance.options.loadingClass);
-    suggestInstance._xhr = {
-        abort: function() {
-            searchAborted = true;
-        }
-    };
-
-    suggestInstance._abortSearch();
-
-    assertFalse(this.suggestElement.hasClass(suggestInstance.options.loadingClass));
-    assertTrue(searchAborted);
-};
-SuggestTest.prototype.testShowAll = function() {
-    var searchAborted,
-        showAllTerm,
-        showAllContext,
-        suggestInstance = this.suggestCreate();
-    suggestInstance._abortSearch = function() {
-        searchAborted = true;
-    };
-    suggestInstance._search = function(e, term, context) {
-        showAllTerm = term;
-        showAllContext = context;
-    };
-
-    suggestInstance._showAll(jQuery.Event('showAll'));
-
-    assertTrue(searchAborted);
-    assertEquals(showAllTerm, '');
-    assertEquals(showAllContext, {_allShown: true});
-};
-SuggestTest.prototype.testAddRecent = function() {
-    var recentItems = [
-            {id: 2, label: 'Test Label 2'},
-            {id: 3, label: 'Test Label 3'}
-        ],
-        suggestInstance = this.suggestCreate();
-
-    suggestInstance._recentItems = recentItems;
-    suggestInstance.options.storageKey = 'jsTestDriver-test-suggest-recent';
-    suggestInstance._addRecent(this.uiHash.item);
-
-    recentItems.unshift(this.uiHash.item);
-    assertEquals(recentItems, suggestInstance._recentItems);
-    if(window.localStorage) {
-        assertEquals(localStorage.getItem(suggestInstance.options.storageKey), JSON.stringify(recentItems));
-    }
-
-    suggestInstance._addRecent(this.uiHash.item);
-    assertEquals(recentItems, suggestInstance._recentItems);
-    if(window.localStorage) {
-        assertEquals(localStorage.getItem(suggestInstance.options.storageKey), JSON.stringify(recentItems));
-    }
-
-    suggestInstance.options.storageLimit = 1;
-    var newRecentItem = {id: 4, label: 'Test Label 4'};
-    suggestInstance._addRecent(newRecentItem);
-
-    assertEquals([newRecentItem], suggestInstance._recentItems);
-    if(window.localStorage) {
-        assertEquals(localStorage.getItem(suggestInstance.options.storageKey), JSON.stringify([newRecentItem]));
-        localStorage.removeItem(suggestInstance.options.storageKey);
-    }
-};
-SuggestTest.prototype.testRenderMultiselect = function() {
-    var suggestOptions = {
-            multiselect: true,
-            multiSuggestWrapper: '<div id="test-multisuggest-wrapper" data-role="parent-choice-element"></div>'
-        },
-        suggestInstance = this.suggestCreate(suggestOptions);
-
-    assertTrue(this.suggestElement.closest('[data-role="parent-choice-element"]').is('#test-multisuggest-wrapper'));
-    assertTrue(suggestInstance.elementWrapper.is('#test-multisuggest-wrapper'));
-};
-SuggestTest.prototype.testGetOptions = function() {
-    var suggestInstance = this.suggestCreate();
-
-    assertFalse(suggestInstance._getOptions().length > 0);
-
-    var option = jQuery('<option></option>');
-    suggestInstance.valueField.append(option);
-    assertTrue(suggestInstance._getOptions().is(option));
-};
-SuggestTest.prototype.testFilterSelected = function() {
-    var items = [this.uiHash.item, {id: 2, label: 'Test Label2'}],
-        suggestInstance = this.suggestCreate();
-
-    suggestInstance.valueField.append('<option value="2">Test Label2</option>');
-    assertEquals(suggestInstance._filterSelected(items), [this.uiHash.item]);
-};
-SuggestTest.prototype.testCreateOption = function() {
-    var suggestInstance = this.suggestCreate();
-
-    var option = suggestInstance._createOption(this.uiHash.item);
-    assertEquals(option.val(), "1");
-    assertEquals(option.prop('selected'), true);
-    assertEquals(option.text(), "Test Label");
-    assertNotUndefined(option.data('renderedOption'));
-};
-SuggestTest.prototype.testAddOption = function() {
-    var selectTarget = jQuery('<div />'),
-        event = jQuery.Event('add'),
-        suggestInstance = this.suggestCreate();
-
-    event.target = selectTarget[0];
-    suggestInstance._addOption(event, this.uiHash.item);
-
-    var option = suggestInstance.valueField.find('option[value=' + this.uiHash.item.id + ']');
-    assertTrue(option.length > 0);
-    assertTrue(option.data('selectTarget').is(selectTarget));
-};
-SuggestTest.prototype.testGetOption = function() {
-    var suggestInstance = this.suggestCreate();
-
-    assertFalse(suggestInstance._getOption(this.uiHash.item).length > 0);
-
-    var option = jQuery('<option value="1">Test Label</option>');
-    suggestInstance.valueField.append(option);
-    assertTrue(suggestInstance._getOption(this.uiHash.item).length > 0);
-    assertTrue(suggestInstance._getOption(option).length > 0);
-};
-SuggestTest.prototype.testRemoveLastAdded = function() {
-    var suggestInstance = this.suggestCreate({multiselect: true});
-
-    suggestInstance._addOption({}, this.uiHash.item);
-    assertTrue(suggestInstance.valueField.find('option').length > 0);
-    suggestInstance._removeLastAdded();
-    assertFalse(suggestInstance.valueField.find('option').length > 0);
-};
-SuggestTest.prototype.testRemoveOption = function() {
-    var selectTarget = jQuery('<div />'),
-        event = jQuery.Event('select'),
-        suggestInstance = this.suggestCreate({multiselect: true});
-
-    selectTarget.addClass(suggestInstance.options.selectedClass);
-    event.target = selectTarget[0];
-
-    suggestInstance._addOption(event, this.uiHash.item);
-    assertTrue(suggestInstance.valueField.find('option').length > 0);
-    suggestInstance.removeOption(event, this.uiHash.item);
-    assertFalse(suggestInstance.valueField.find('option').length > 0);
-    assertFalse(selectTarget.hasClass(suggestInstance.options.selectedClass));
-};
-SuggestTest.prototype.testRenderOption = function() {
-    var suggestInstance = this.suggestCreate(),
-        choiceTmpl;
-
-    suggestInstance.elementWrapper = jQuery('<div />').appendTo('body');
-
-    choiceTmpl = mageTemplate(suggestInstance.options.choiceTemplate, {
-        text: this.uiHash.item.label
-    });
-
-    var testOption = jQuery(choiceTmpl),
-        option = suggestInstance._renderOption(this.uiHash.item);
-
-    assertTrue(option.next().is(suggestInstance.elementWrapper));
-    assertEquals(jQuery('<div />').append(testOption).html(), jQuery('<div />').append(option).html());
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/suggest/tree-suggest-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/suggest/tree-suggest-test.js
deleted file mode 100644
index 2a63c6953ef87..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/suggest/tree-suggest-test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-TreeSuggestTest = TestCase('TreeSuggestTest');
-TreeSuggestTest.prototype.setUp = function() {
-    /*:DOC += <input name="test-suggest" id="tree-suggest" />*/
-    this.suggestElement = jQuery('#tree-suggest');
-};
-TreeSuggestTest.prototype.tearDown = function() {
-    this.treeSuggestDestroy();
-};
-TreeSuggestTest.prototype.treeSuggestDestroy = function() {
-    if(this.suggestElement.data('treeSuggest')) {
-        this.suggestElement.treeSuggest('destroy');
-    }
-};
-TreeSuggestTest.prototype.treeSuggestCreate = function(options, element) {
-    return (element || this.suggestElement).treeSuggest(options || {} ).data('treeSuggest');
-};
-TreeSuggestTest.prototype.uiHash = {
-    item: {
-        id: 1,
-        label: 'Test Label'
-    }
-};
-TreeSuggestTest.prototype.stub = function(instance, methodName, retVal) {
-    var d = $.Deferred();
-    if(instance && instance[methodName]) {
-        instance[methodName] = function() {
-            d.resolve(arguments);
-            if(retVal) {
-                return retVal;
-            }
-        };
-    }
-    return d.promise();
-};
-
-TreeSuggestTest.prototype.testInit = function() {
-    var treeSuggestInstance = this.treeSuggestCreate();
-    assertTrue(this.suggestElement.is(':mage-treeSuggest'));
-    assertEquals(treeSuggestInstance.widgetEventPrefix, 'suggest');
-};
-
-TreeSuggestTest.prototype.testClose = function() {
-    var treeSuggestInstance = this.treeSuggestCreate(),
-        elementFocused = false;
-    treeSuggestInstance.element.on('focus', function() {
-        elementFocused = true;
-    });
-    treeSuggestInstance.dropdown.text('test').show();
-    treeSuggestInstance.close();
-    assertEquals(treeSuggestInstance.dropdown.text(), '');
-    assertTrue(treeSuggestInstance.dropdown.is(':hidden'));
-
-    treeSuggestInstance.dropdown.text('test').show();
-    treeSuggestInstance.close(jQuery.Event('select'));
-    assertEquals(treeSuggestInstance.dropdown.text(), '');
-    assertTrue(treeSuggestInstance.dropdown.is(':hidden'));
-
-    treeSuggestInstance.dropdown.text('test').show();
-    treeSuggestInstance.close(jQuery.Event('select_tree_node'));
-    assertEquals(treeSuggestInstance.dropdown.text(), 'test');
-    assertTrue(treeSuggestInstance.dropdown.is(':visible'));
-};
-TreeSuggestTest.prototype.testFilterSelected = function() {
-    var treeSuggestInstance = this.treeSuggestCreate();
-    assertEquals(treeSuggestInstance._filterSelected([this.uiHash.item], {_allShown: true}), [this.uiHash.item]);
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/tabs/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/tabs/index.html
deleted file mode 100644
index 30c29e38cc102..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/tabs/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>Tabs Widget: QUnit Tests </title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="../../../pub/lib/jquery.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/tabs.js"></script>
-    <script type="text/javascript" src="../../../pub/lib/mage/collapsible.js"></script>
-    <script type="text/javascript" src="testsuite/mage/tabs/tabs.js"></script>
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-</div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/tabs/tabs-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/tabs/tabs-test.js
deleted file mode 100644
index 7129357159f9f..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/tabs/tabs-test.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TabsTest = TestCase('TabsTest');
-TabsTest.prototype.testInit = function() {
-    /*:DOC += <div id="tabs"></div>*/
-    var tabs = jQuery('#tabs').tabs();
-    assertTrue(tabs.is(':mage-tabs'));
-};
-
-TabsTest.prototype.testCreate = function() {
-    /*:DOC += <div id="tabs"><ul>
-        <li>
-            <a href="#tab1_content" id="tab1"></a>
-            <div id="tab1_content"></div>
-        </li>
-     <li>
-        <a href="#tab2_content" id="tab2"></a>
-        <div id="tab2_content"></div>
-     </li>
-    </ul></div>*/
-    var tabs = jQuery('#tabs').tabs({active: 'tab2'});
-    assertEquals(tabs.tabs('option', 'active'), tabs.data("tabs").anchors.index(jQuery('#tab2')));
-};
-
-TabsTest.prototype.testActiveAnchor = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-            <a href="#tab1_content" id="tab1"></a>
-            <div id="tab1_content"></div>
-         </li>
-         <li>
-            <a href="#tab2_content" id="tab2"></a>
-            <div id="tab2_content"></div>
-         </li>
-     </ul></div>*/
-    var tabs = jQuery('#tabs').tabs({active: 'tab2'});
-    assertTrue(tabs.tabs('activeAnchor').is(tabs.data("tabs").anchors.eq(tabs.tabs('option', 'active'))));
-};
-
-TabsTest.prototype.testGetTabIndex = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-             <a href="#tab1_content" id="tab1"></a>
-             <div id="tab1_content"></div>
-         </li>
-         <li>
-             <a href="#tab2_content" id="tab2"></a>
-             <div id="tab2_content"></div>
-         </li>
-     </ul></div>*/
-    var tabs = jQuery('#tabs').tabs();
-    assertEquals(0, tabs.data("tabs")._getTabIndex('tab1'));
-    assertEquals(1, tabs.data("tabs")._getTabIndex('tab2'));
-};
-
-TabsTest.prototype.testGetPanelForTab = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-             <a href="#tab1_content" id="tab1"></a>
-         </li>
-     </ul></div>
-     <div id="destination">
-        <div id="tab1_content"></div>
-     </div>*/
-    var tabs = jQuery('#tabs').tabs({destination: '#destination'});
-    assertTrue(jQuery(tabs.data("tabs")._getPanelForTab(jQuery('#tab1').closest('li'))).is('#tab1_content'));
-};
-
-TabsTest.prototype.testMovePanelsInDestination = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-            <a href="#tab1_content" id="tab1"></a>
-            <div id="tab1_content"></div>
-         </li>
-     </ul></div>
-     <div id="destination">
-     </div>*/
-    var tabs = jQuery('#tabs').tabs({destination: '#destination'});
-    var panel = jQuery('#tab1_content');
-    tabs.append(panel);
-    assertTrue(panel.parents('#tabs').length > 0);
-    assertEquals(panel.parents(tabs.tabs('option', 'destination')).length, 0);
-
-    tabs.data("tabs")._movePanelsInDestination(panel);
-    assertEquals(panel.parents('#tabs').length, 0);
-    assertTrue(panel.parents(tabs.tabs('option', 'destination')).length > 0);
-
-    tabs.tabs('option', 'destination', null);
-    tabs.append(panel);
-    assertTrue(panel.parents('#tabs').length > 0);
-
-    tabs.data("tabs")._movePanelsInDestination(panel);
-    assertTrue(panel.parents('#tabs').length > 0);
-};
-
-TabsTest.prototype.testAjaxLoad = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-             <a href="www.site.com" id="tab1">Tab 1</a>
-             <div id="tab1_content"></div>
-         </li>
-     </ul></div>
-     */
-    var tabs = jQuery('#tabs').tabs(),
-        ui = {
-            tab: jQuery('#tab1'),
-            panel: jQuery('#tab1_content')
-        };
-    tabs.tabs('option', 'load')({}, ui);
-    assertEquals(jQuery('#tab1').attr('href'), '#tab1_content');
-};
-
-TabsTest.prototype.testOnContentChange = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-             <a href="www.site.com" id="tab1">Tab 1</a>
-             <div id="tab1_content"></div>
-         </li>
-     </ul></div>
-     */
-    var eventMock = {
-            data: {
-                index: 0
-            }
-        },
-        tabs = jQuery('#tabs').tabs();
-
-    tabs.data("tabs")._onContentChange(eventMock);
-    assertTrue(jQuery('#tab1').hasClass('_changed'));
-};
-
-TabsTest.prototype.testOnFocus = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-             <a href="#tab1_content" id="tab1"></a>
-             <div id="tab1_content"></div>
-         </li>
-         <li>
-             <a href="#tab2_content" id="tab2"></a>
-             <div id="tab2_content"><input /></div>
-         </li>
-     </ul></div>
-     */
-    var eventMock = {
-            data: {
-                index: 1
-            }
-        },
-        tabs = jQuery('#tabs').tabs();
-
-    assertNotEquals(tabs.tabs('option', '_active'), eventMock.data.index);
-
-    tabs.data("tabs")._onFocus(eventMock);
-    assertEquals(tabs.tabs('option', '_active'), eventMock.data.index);
-};
-
-TabsTest.prototype.testOnBeforeSubmit = function() {
-    /*:DOC += <div id="tabs"><ul>
-         <li>
-             <a href="#tab1_content" id="tab1"></a>
-             <div id="tab1_content"></div>
-         </li>
-     </ul></div>
-     */
-    var tabs = jQuery('#tabs').tabs({active: 'tab1'}),
-        data= {},
-        testData = {
-            action: {
-                args: {
-                    tab: 'tab1'
-                }
-            }
-        },
-        testDataTabArgument = {
-            action: {
-                args: {
-                    testtab: 'tab1'
-                }
-            }
-        },
-        tabPrefix = 'test-',
-        tabIdArgument = 'testtab';
-
-    tabs.data("tabs")._onBeforeSubmit({}, data);
-    assertEquals(data, testData);
-    data = {};
-
-    jQuery('#tab1').prop('id', 'test-tab1');
-    tabs.tabs('option', 'tabsBlockPrefix', tabPrefix);
-    tabs.data("tabs")._onBeforeSubmit({}, data);
-    assertEquals(data, testData);
-    tabs.tabs('option', 'tabsBlockPrefix', null);
-    jQuery('#test-tab1').prop('id', 'tab1');
-    data = {};
-
-    tabs.tabs('option', 'tabIdArgument', tabIdArgument);
-    tabs.data("tabs")._onBeforeSubmit({}, data);
-    assertEquals(data, testDataTabArgument);
-};
-
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/tabs/tabs.js b/dev/tests/js/JsTestDriver/testsuite/mage/tabs/tabs.js
deleted file mode 100644
index 582c55da344d3..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/tabs/tabs.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * @category    mage.js
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/*
-
- */
-test( "Initialization", function() {
-    expect(2);
-    var tabs = $("<div></div>");
-    tabs.tabs();
-    ok( tabs.is(':mage-tabs'), "widget instantiated" );
-    tabs.tabs('destroy');
-    ok( !tabs.is(':mage-tabs'), "widget destroyed" );
-});
-
-test( "Collapsible instantiation", function() {
-    expect(2);
-    var tabs = $("<div></div>");
-    var title = $("<div></div>").attr("data-role","collapsible");
-    title.appendTo(tabs);
-    tabs.tabs();
-    ok( title.is(':mage-collapsible'), "widget instantiated" );
-    tabs.tabs('destroy');
-    ok( !title.is(':mage-collapsible'), "widget destroyed" );
-});
-
-test( "Tabs behavior - closing others tabs when one gets activated", function() {
-    expect(4);
-    var tabs = $('<div></div>');
-    var title1 = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content1 = $('<div data-role="content"></div>').appendTo(tabs);
-    var title2 = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content2 = $('<div data-role="content"></div>').appendTo(tabs);
-    tabs.appendTo("body");
-    tabs.tabs();
-    ok( content1.is(':visible'), "content visible" );
-    ok( content2.is(':hidden'), "content hidden" );
-    title2.trigger('click');
-    ok( content1.is(':hidden'), "content hidden" );
-    ok( content2.is(':visible'), "content visible" );
-    tabs.tabs('destroy');
-});
-
-test( "Testing enable,disable,activate,deactivate options", function() {
-    expect(6);
-    var tabs = $('<div></div>');
-    var title = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content = $('<div data-role="content"></div>').appendTo(tabs);
-    tabs.appendTo("body");
-    tabs.tabs();
-    ok( content.is(':visible'), "content visible" );
-    tabs.tabs("deactivate",0);
-    ok( content.is(':hidden'), "content hidden" );
-    tabs.tabs("activate",0);
-    ok( content.is(':visible'), "content visible" );
-    tabs.tabs("disable",0);
-    ok( content.is(':hidden'), "content hidden" );
-    title.trigger("click");
-    ok( content.is(':hidden'), "content hidden" );
-    tabs.tabs("enable",0);
-    title.trigger("click");
-    ok( content.is(':visible'), "content visible" );
-    tabs.tabs('destroy');
-});
-
-asyncTest( "Keyboard support for tabs view", function() {
-
-    expect( 5 );
-    var tabs = $('<div></div>');
-    var title1 = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content1 = $('<div data-role="content"></div>').appendTo(tabs);
-    var title2 = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content2 = $('<div data-role="content"></div>').appendTo(tabs);
-    tabs.appendTo("body");
-    tabs.tabs();
-
-    title1.on("focus",function(ev){
-        ok(content1.is(':visible'), "Content is expanded");
-        title1.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.RIGHT } ));
-        ok(content2.is(':visible'), "Content is expanded");
-        ok(content1.is(':hidden'), "Content is collapsed");
-        title2.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.LEFT } ));
-        ok(content1.is(':visible'), "Content is expanded");
-        ok(content2.is(':hidden'), "Content is collapsed");
-        tabs.tabs('destroy');
-        start();
-    } );
-
-    setTimeout(function(){
-        title1.focus();
-    },10);
-});
-
-asyncTest( "Keyboard support for accordion view", function() {
-
-    expect( 5 );
-    var tabs = $('<div></div>');
-    var title1 = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content1 = $('<div data-role="content"></div>').appendTo(tabs);
-    var title2 = $('<div data-role="collapsible"></div>').appendTo(tabs);
-    var content2 = $('<div data-role="content"></div>').appendTo(tabs);
-    tabs.appendTo("body");
-    tabs.tabs({openOnFocus:false});
-
-    title1.on("focus",function(ev){
-        ok(content1.is(':visible'), "Content is expanded");
-        title1.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.RIGHT } ));
-        ok(content1.is(':visible'), "Content is expanded");
-        ok(content2.is(':hidden'), "Content is collapsed");
-        title2.trigger($.Event( 'keydown', { keyCode: $.ui.keyCode.ENTER } ));
-        ok(content2.is(':visible'), "Content is expanded");
-        ok(content1.is(':hidden'), "Content is collapsed");
-        tabs.tabs('destroy');
-        start();
-    } );
-
-    setTimeout(function(){
-        title1.focus();
-    },10);
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/translate/translate-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/translate/translate-test.js
deleted file mode 100644
index a9bbc7fb10d2d..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/translate/translate-test.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TranslateTest = TestCase('TranslateTest');
-TranslateTest.prototype.testTranslateExist = function() {
-    assertNotUndefined(jQuery.mage.translate);
-};
-TranslateTest.prototype.testTranslationParametersOneArgument = function() {
-    jQuery.mage.translate.add('Hello World!');
-    assertEquals(
-        'Hello World!',
-        jQuery.mage.translate.translate('Hello World!'));
-};
-TranslateTest.prototype.testTranslationParametersArray = function() {
-    jQuery.mage.translate.add(['Hello World!', 'Bonjour tout le monde!']);
-    assertEquals(
-        'Hello World!',
-        jQuery.mage.translate.translate('Hello World!'));
-};
-TranslateTest.prototype.testTranslationParametersObject = function() {
-    var translation = {'Hello World!': 'Bonjour tout le monde!'};
-    jQuery.mage.translate.add(translation);
-    assertEquals(
-        translation['Hello World!'],
-        jQuery.mage.translate.translate('Hello World!'));
-
-    translation = {
-        'Hello World!': 'Hallo Welt!',
-        'Some text with symbols!-+"%#*': 'Ein Text mit Symbolen!-+"%#*'
-    };
-    jQuery.mage.translate.add(translation);
-    jQuery.each(translation, function(key) {
-        assertEquals(translation[key], jQuery.mage.translate.translate(key));
-    });
-};
-TranslateTest.prototype.testTranslationParametersTwoArguments = function() {
-    jQuery.mage.translate.add('Hello World!', 'Bonjour tout le monde!');
-    assertEquals(
-        'Bonjour tout le monde!',
-        jQuery.mage.translate.translate('Hello World!'));
-};
-TranslateTest.prototype.testTranslationAlias = function() {
-    var translation = {'Hello World!': 'Bonjour tout le monde!'};
-    jQuery.mage.translate.add(translation);
-    assertEquals(translation['Hello World!'], jQuery.mage.__('Hello World!'));
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline/translate-inline-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline/translate-inline-test.js
deleted file mode 100644
index 18a117f1913b1..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline/translate-inline-test.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TranslateInlineTest = TestCase('TranslateInlineTest');
-TranslateInlineTest.prototype.testInit = function() {
-    /*:DOC += <script id="translate-form-template" type="text/x-magento-template">
-      </script>
-      <div data-role="translate-dialog"></div>
-     */
-    var translateInline = jQuery('[data-role="translate-dialog"]').translateInline();
-    assertTrue(translateInline.is(':mage-translateInline'));
-    translateInline.translateInline('destroy');
-};
-TranslateInlineTest.prototype.testDialogOpenOnEdit = function() {
-    /*:DOC += <script id="translate-form-template" type="text/x-magento-template">
-      </script>
-      <div data-role="translate-dialog"></div>
-     */
-    var options= {
-            dialog: {
-                id: 'dialog-id'
-            }
-        };
-    var translateInline = jQuery('[data-role="translate-dialog"]').translateInline(options),
-        isDialogHiddenOnInit = translateInline.is(':hidden');
-    translateInline.trigger('edit.editTrigger');
-    var dialogVisibleAfterTriggerEdit = translateInline.is(':visible');
-    assertTrue(isDialogHiddenOnInit);
-    assertTrue(dialogVisibleAfterTriggerEdit);
-    translateInline.translateInline('destroy');
-};
-TranslateInlineTest.prototype.testTranslationFormTemplate = function() {
-    /*:DOC += <script id="translate-form-template" type="text/x-magento-template">
-      <form id="<%= data.id %>"><%= data.newTemplateVariable %></form>
-      </script>
-      <div data-role="translate-dialog"></div>
-     */
-    var options = {
-            translateForm: {
-                data:{
-                    id: 'translate-form-id',
-                    newTemplateVariable: 'New Template Variable'
-                }
-            }
-        },
-        translateInline = jQuery('[data-role="translate-dialog"]').translateInline(options);
-    translateInline.trigger('edit.editTrigger');
-    var translateForm = jQuery('#' + options.translateForm.data.id);
-    assertTrue(translateForm.size() > 0);
-    assertEquals(translateForm.text(), options.translateForm.data.newTemplateVariable);
-    translateInline.translateInline('destroy');
-};
-// @TODO Need to be fixed to avoid errors on the bamboo server in context of MAGETWO-5085 ticket
-/*TranslateInlineTest.prototype._testTranslateFormSubmit = function() {
-    FORM_KEY = 'form_key';
-    var options = {
-            ajaxUrl: 'www.test.com',
-            area: 'test',
-            translateForm: {
-                template:'<form id="<%= data.id %>"><input name="test" value="test" /></form>',
-                data:{
-                    id: 'translate-form-id'
-                }
-            },
-            dialog: {
-                id: 'dialog-id',
-                buttons : [{
-                    'class': 'submit-button'
-                }]
-            }
-        },
-        translateInline = jQuery(document).translateInline(options),
-        submit = jQuery('.ui-dialog-buttonset .submit-button'),
-        ajaxParametersCorrect = false;
-
-    translateInline.trigger('edit.editTrigger');
-    var parameters = jQuery.param({area: options.area}) +
-        '&' + jQuery('#' + options.translateForm.data.id).serialize(),
-        dialog = jQuery('#' + options.dialog.id),
-        dialogVisibleOnAjaxSend = false,
-        dialogHiddenAfterAjaxComplete = false;
-    jQuery(document)
-        .on('ajaxSend', function(e, jqXHR, settings){
-            jqXHR.abort();
-            dialogVisibleOnAjaxSend = dialog.is(':visible');
-            ajaxParametersCorrect = settings.data.indexOf(parameters) >= 0;
-            jQuery(this).trigger('ajaxComplete');
-        });
-    submit.trigger('click');
-    assertEquals(true, dialogVisibleOnAjaxSend);
-    assertEquals(true, ajaxParametersCorrect);
-    assertEquals(true, dialog.is(':hidden'));
-    translateInline.translateInline('destroy');
-};*/
-TranslateInlineTest.prototype.testDestroy = function() {
-    /*:DOC += <script id="translate-form-template" type="text/x-magento-template">
-      <form id="<%= data.id %>"><%= data.newTemplateVariable %></form>
-      </script>
-      <div data-role="translate-dialog"></div>
-      <img id="edit-trigger-id">
-     */
-    var options = {
-            translateForm: {
-                data:{
-                    id: 'translate-form-id',
-                    newTemplateVariable: ''
-                }
-            }
-        },
-        translateInline = jQuery('[data-role="translate-dialog"]').translateInline(options),
-        editTrigger = jQuery('#edit-trigger-id').editTrigger(),
-        editTriggerCreated = editTrigger.size() && jQuery('#edit-trigger-id').is(':mage-editTrigger'),
-        editTriggerEventIsBound = false;
-
-    assertTrue(translateInline.is(':mage-translateInline'));
-    assertTrue(editTriggerCreated);
-    translateInline.on('edit.editTrigger', function(){editTriggerEventIsBound = true;});
-    translateInline.translateInline('destroy');
-    translateInline.trigger('edit.editTrigger');
-    assertFalse(translateInline.is(':mage-translateInline'));
-    assertFalse(editTriggerEventIsBound);
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline_vde/translate-inline-vde-dialog-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline_vde/translate-inline-vde-dialog-test.js
deleted file mode 100644
index 358235eb13bf8..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline_vde/translate-inline-vde-dialog-test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TranslateInlineDialogVdeTest = TestCase('TranslateInlineDialogVdeTest');
-
-TranslateInlineDialogVdeTest.prototype.testInit = function() {
-    /*:DOC +=
-        <script id="translate-inline-dialog-form-template" type="text/x-magento-template">
-             <form id="<%= data.id %>" data-form="translate-inline-dialog-form">
-                 <% _.each(data.items, function(item, i) { %>
-                     <input id="perstore_<%= i %>" name="translate[<%= i %>][perstore]" type="hidden" value="0"/>
-                     <input name="translate[<%= i %>][original]" type="hidden" value="<%= data.escape(item.original) %>"/>
-                     <textarea id="custom_<%= i %>"
-                         name="translate[<%= i %>][custom]"
-                         data-translate-input-index="<%= i %>"><%= data.escape(item.translated) %></textarea>
-                 <% }) %>
-             </form>
-        </script>
-        <div id="translate-dialog" data-role="translate-dialog"></div>
-    */
-    var translateInlineDialogVde = jQuery('#translate-dialog').translateInlineDialogVde();
-    assertTrue(translateInlineDialogVde.is(':mage-translateInlineDialogVde'));
-    translateInlineDialogVde.translateInlineDialogVde('destroy');
-};
-TranslateInlineDialogVdeTest.prototype.testWithTemplate = function() {
-    /*:DOC +=
-        <script id="translate-inline-dialog-form-template" type="text/x-magento-template">
-             <form id="<%= data.id %>" data-form="translate-inline-dialog-form">
-                 <% _.each(data.items, function(item, i) { %>
-                    <input id="perstore_<%= i %>" name="translate[<%= i %>][perstore]" type="hidden" value="0"/>
-                    <input name="translate[<%= i %>][original]" type="hidden" value="<%= data.escape(item.original) %>"/>
-                    <textarea id="custom_<%= i %>"
-                        name="translate[<%= i %>][custom]"
-                        data-translate-input-index="<%= i %>"><%= data.escape(item.translated) %></textarea>
-                 <% }) %>
-             </form>
-        </script>
-        <div id="translate-dialog" data-role="translate-dialog"></div>
-    */
-    var translateInlineDialogVde = jQuery('#translate-dialog').translateInlineDialogVde();
-    assertEquals(true, translateInlineDialogVde.is(':mage-translateInlineDialogVde'));
-    translateInlineDialogVde.translateInlineDialogVde('destroy');
-};
-TranslateInlineDialogVdeTest.prototype.testOpenAndClose = function() {
-    /*:DOC += 
-        <div id="randomElement" data-translate=""></div>
-        <script id="translate-inline-dialog-form-template" type="text/x-magento-template">
-             <form id="<%= data.id %>" data-form="translate-inline-dialog-form">
-                 <% _.each(data.items, function(item, i) { %>
-                     <input id="perstore_<%= i %>" name="translate[<%= i %>][perstore]" type="hidden" value="0"/>
-                     <input name="translate[<%= i %>][original]" type="hidden" value="<%= data.escape(item.original) %>"/>
-                     <textarea id="custom_<%= i %>"
-                         name="translate[<%= i %>][custom]"
-                         data-translate-input-index="<%= i %>"><%= data.escape(item.translated) %></textarea>
-                 <% }) %>
-             </form>
-        </script>
-        <div id="translate-dialog" data-role="translate-dialog"></div>
-    */
-    var options = {
-      textTranslations: jQuery('[data-translate-mode="text"]'),
-      imageTranslations: jQuery('[data-translate-mode="alt"]'),
-      scriptTranslations: jQuery('[data-translate-mode="script"]')
-    };
-
-    var translateInlineDialogVde = jQuery('#translate-dialog').translateInlineDialogVde(options);
-
-    var widget = {
-      element : jQuery('#randomElement')
-    };
-
-    jQuery('#translate-dialog').translateInlineDialogVde('openWithWidget', null, widget, function() { });
-    assertTrue(jQuery('#translate-dialog').translateInlineDialogVde('isOpen'));
-
-    jQuery('#translate-dialog').translateInlineDialogVde('close');
-    assertFalse(jQuery('#translate-dialog').translateInlineDialogVde('isOpen'));
-
-    jQuery('#translate-dialog').translateInlineDialogVde('destroy');
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline_vde/translate-inline-vde-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline_vde/translate-inline-vde-test.js
deleted file mode 100644
index 3822310460132..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/translate_inline_vde/translate-inline-vde-test.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-TranslateInlineVdeTest = TestCase('TranslateInlineVdeTest');
-TranslateInlineVdeTest.prototype.testInit = function() {
-    /*:DOC += <div data-translate="true">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
-    assertTrue(translateInlineVde.is(':mage-translateInlineVde'));
-    translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testCreate = function() {
-    /*:DOC += <div data-translate="true">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    assertEquals(0, jQuery('[data-translate] > img').size());
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
-    assertEquals(1, jQuery('[data-translate] > img').size());
-    translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testHideAndShow = function() {
-    /*:DOC += <div data-translate="true">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde(),
-        iconImg = jQuery('[data-translate] > img');
-    assertFalse(iconImg.is('.hidden'));
-
-    translateInlineVde.translateInlineVde('hide');
-    assertTrue(iconImg.is('.hidden') );
-
-    translateInlineVde.translateInlineVde('show');
-    assertFalse(iconImg.is('.hidden') );
-    assertFalse(jQuery('[data-translate]').is(':hidden') );
-
-    translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testReplaceTextNormal = function() {
-    /*:DOC += <div id="translateElem"
-      data-translate="[{&quot;shown&quot; : &quot;Some value&quot;, &quot;translated&quot; : &quot;Translated value&quot;}]">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
-    var newValue = 'New value';
-
-    jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
-    var translateData = jQuery('#translateElem').data('translate');
-    assertEquals(newValue, translateData[0]['shown']);
-    assertEquals(newValue, translateData[0]['translated']);
-
-    translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testReplaceTextNullOrBlank = function() {
-    /*:DOC += <div id="translateElem"
-      data-translate="[{&quot;shown&quot; : &quot;Some value&quot;, &quot;translated&quot; : &quot;Translated value&quot;}]">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
-    var newValue = null;
-
-    jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
-    var translateData = jQuery('#translateElem').data('translate');
-    assertEquals('&nbsp;', translateData[0]['shown']);
-    assertEquals('&nbsp;', translateData[0]['translated']);
-
-    newValue = 'Some value';
-    jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
-    translateData = jQuery('#translateElem').data('translate');
-    assertEquals(newValue, translateData[0]['shown']);
-    assertEquals(newValue, translateData[0]['translated']);
-
-    newValue = '';
-    jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
-    translateData = jQuery('#translateElem').data('translate');
-    assertEquals('&nbsp;', translateData[0]['shown']);
-    assertEquals('&nbsp;', translateData[0]['translated']);
-
-    translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testClick = function() {
-    /*:DOC += <div id="translateElem" data-translate="[]">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    var counter = 0;
-    var callback = function() {
-      counter++;
-    };
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde({
-      onClick: callback
-      }),
-      iconImg = jQuery('[data-translate] > img');
-
-    iconImg.trigger('click');
-    assertEquals(1, counter);
-    assertTrue(jQuery('#translateElem').hasClass('invisible'));
-
-    translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testDblClick = function() {
-    /*:DOC += <div id="translateElem" data-translate="[]">text</div>
-    <script data-template="translate-inline-icon" type="text/x-magento-template">
-        <img src="<%= data.img %>" height="16" width="16">
-    </script>
-    */
-    var counter = 0;
-    var callback = function() {
-      counter++;
-    };
-    var translateInlineVde = jQuery('[data-translate]').translateInlineVde({
-      onClick: callback
-      }),
-      iconImg = jQuery('[data-translate] > img');
-
-    assertEquals(1, jQuery('#translateElem').find('img').size());
-
-    translateInlineVde.trigger('dblclick');
-    assertEquals(1, counter);
-
-    assertEquals(0, jQuery('#translateElem').find('img').size());
-    assertTrue(jQuery('#translateElem').hasClass('invisible'));
-
-    translateInlineVde.translateInlineVde('destroy');
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html
deleted file mode 100644
index 00661de6d8153..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-/**
- * @category    mage.validation
- * @package     test
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Validation</title>
-    <base href="../../../"/>
-    <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../lib/web/jquery.js"></script>
-
-    <script src="../../../lib/web/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/translate.js"></script>
-    <script src="../../../lib/web/jquery/jquery.validate.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/validation.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/validation/validation.js"></script>
-    <script type="text/javascript" src="../../../lib/web/mage/bootstrap.js"></script>
-    <script type="text/javascript" src="testsuite/mage/validation/test-validation.js"></script>
-
-
-</head>
-<body>
-<div id="qunit"></div>
-<div id="qunit-fixture">
-</div>
-</body>
-</html>
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js b/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
deleted file mode 100644
index 602ba4b8d3e60..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
+++ /dev/null
@@ -1,611 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-test( "testValidateNoHtmlTags", function() {
-    expect(4);
-    equal($.validator.methods['validate-no-html-tags'].call(this, ""),true);
-    equal($.validator.methods['validate-no-html-tags'].call(this, null),true);
-    equal($.validator.methods['validate-no-html-tags'].call(this, "abc"),true);
-    equal($.validator.methods['validate-no-html-tags'].call(this, "<div>abc</div>"),false);
-
-});
-
-test( "testAllowContainerClassName", function() {
-    expect(4);
-    var radio = $('<input type="radio" class="change-container-classname"/>');
-    radio.appendTo("#qunit-fixture");
-    equal($.validator.methods['allow-container-className'].call(this, radio[0]),true);
-    var checkbox = $('<input type="checkbox" class="change-container-classname"/>');
-    equal($.validator.methods['allow-container-className'].call(this, checkbox[0]),true);
-    var radio2 = $('<input type="radio"/>');
-    equal($.validator.methods['allow-container-className'].call(this, radio2[0]),false);
-    var checkbox2 = $('<input type="checkbox"/>');
-    equal($.validator.methods['allow-container-className'].call(this, checkbox2[0]),false);
-});
-
-test( "testValidateSelect", function() {
-    expect(5);
-    equal($.validator.methods['validate-select'].call(this, ""),false);
-    equal($.validator.methods['validate-select'].call(this, "none"),false);
-    equal($.validator.methods['validate-select'].call(this, null),false);
-    equal($.validator.methods['validate-select'].call(this, undefined),false);
-    equal($.validator.methods['validate-select'].call(this, "abc"),true);
-});
-
-test( "testValidateNotEmpty", function() {
-    expect(5);
-    ok(!$.validator.methods['validate-no-empty'].call(this, ""));
-    ok(!$.validator.methods['validate-no-empty'].call(this, null));
-    ok(!$.validator.methods['validate-no-empty'].call(this, undefined));
-    ok(!$.validator.methods['validate-no-empty'].call(this, "   "));
-    ok($.validator.methods['validate-no-empty'].call(this, "test"));
-});
-
-test( "testValidateStreet", function() {
-    expect(9);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, ""),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, null),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, undefined),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, "   "),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, "abc   "),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, " 123  "),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, "  abc123 "),true);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, "  !@# "),false);
-    equal($.validator.methods['validate-alphanum-with-spaces'].call(this, "  abc.123 "),false);
-});
-
-test( "testValidatePhoneStrict", function() {
-    expect(9);
-    equal($.validator.methods['validate-phoneStrict'].call(this, ""),true);
-    equal($.validator.methods['validate-phoneStrict'].call(this, null),true);
-    equal($.validator.methods['validate-phoneStrict'].call(this, undefined),true);
-    equal($.validator.methods['validate-phoneStrict'].call(this, "   "),false);
-    equal($.validator.methods['validate-phoneStrict'].call(this, "5121231234"),false);
-    equal($.validator.methods['validate-phoneStrict'].call(this, "512.123.1234"),false);
-    equal($.validator.methods['validate-phoneStrict'].call(this, "512-123-1234"),true);
-    equal($.validator.methods['validate-phoneStrict'].call(this, "(512)123-1234"),true);
-    equal($.validator.methods['validate-phoneStrict'].call(this, "(512) 123-1234"),true);
-});
-
-test( "testValidatePhoneLax", function() {
-    expect(11);
-    equal($.validator.methods['validate-phoneLax'].call(this, ""),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, null),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, undefined),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "   "),false);
-    equal($.validator.methods['validate-phoneLax'].call(this, "5121231234"),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "512.123.1234"),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "512-123-1234"),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "(512)123-1234"),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "(512) 123-1234"),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "(512)1231234"),true);
-    equal($.validator.methods['validate-phoneLax'].call(this, "(512)_123_1234"),false);
-});
-
-test( "testValidateFax", function() {
-    expect(9);
-    equal($.validator.methods['validate-fax'].call(this, ""),true);
-    equal($.validator.methods['validate-fax'].call(this, null),true);
-    equal($.validator.methods['validate-fax'].call(this, undefined),true);
-    equal($.validator.methods['validate-fax'].call(this, "   "),false);
-    equal($.validator.methods['validate-fax'].call(this, "5121231234"),false);
-    equal($.validator.methods['validate-fax'].call(this, "512.123.1234"),false);
-    equal($.validator.methods['validate-fax'].call(this, "512-123-1234"),true);
-    equal($.validator.methods['validate-fax'].call(this, "(512)123-1234"),true);
-    equal($.validator.methods['validate-fax'].call(this, "(512) 123-1234"),true);
-});
-
-test( "testValidateEmail", function() {
-    expect(11);
-    equal($.validator.methods['validate-email'].call(this, ""),true);
-    equal($.validator.methods['validate-email'].call(this, null),true);
-    equal($.validator.methods['validate-email'].call(this, undefined),true);
-    equal($.validator.methods['validate-email'].call(this, "   "),false);
-    equal($.validator.methods['validate-email'].call(this, "123@123.com"),true);
-    equal($.validator.methods['validate-email'].call(this, "abc@124.en"),true);
-    equal($.validator.methods['validate-email'].call(this, "abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-email'].call(this, "abc.abc.abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-email'].call(this, "abc.abc-abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-email'].call(this, "abc.abc_abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-email'].call(this, "abc.abc_abc@abc"),false);
-});
-
-test( "testValidateEmailSender", function() {
-    expect(10);
-    equal($.validator.methods['validate-emailSender'].call(this, ""),true);
-    equal($.validator.methods['validate-emailSender'].call(null),true);
-    equal($.validator.methods['validate-emailSender'].call(undefined),true);
-    equal($.validator.methods['validate-emailSender'].call("   "),true);
-    equal($.validator.methods['validate-emailSender'].call("123@123.com"),true);
-    equal($.validator.methods['validate-emailSender'].call("abc@124.en"),true);
-    equal($.validator.methods['validate-emailSender'].call("abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-emailSender'].call("abc.abc.abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-emailSender'].call("abc.abc-abc@abc.commmmm"),true);
-    equal($.validator.methods['validate-emailSender'].call("abc.abc_abc@abc.commmmm"),true);
-});
-
-test( "testValidatePassword", function() {
-    expect(9);
-    equal($.validator.methods['validate-password'].call(this, ""),true);
-    equal($.validator.methods['validate-password'].call(this, null),false);
-    equal($.validator.methods['validate-password'].call(this, undefined),false);
-    equal($.validator.methods['validate-password'].call(this, "   "),true);
-    equal($.validator.methods['validate-password'].call(this, "123@123.com"),true);
-    equal($.validator.methods['validate-password'].call(this, "abc"),false);
-    equal($.validator.methods['validate-password'].call(this, "abc       "),false);
-    equal($.validator.methods['validate-password'].call(this, "     abc      "),false);
-    equal($.validator.methods['validate-password'].call(this, "dddd"),false);
-});
-
-test( "testValidateAdminPassword", function() {
-    expect(9);
-    equal(true, $.validator.methods['validate-admin-password'].call(this, ""));
-    equal(false, $.validator.methods['validate-admin-password'].call(this, null));
-    equal(false, $.validator.methods['validate-admin-password'].call(this, undefined));
-    equal(true, $.validator.methods['validate-admin-password'].call(this, "   "));
-    equal(true, $.validator.methods['validate-admin-password'].call(this, "123@123.com"));
-    equal(false, $.validator.methods['validate-admin-password'].call(this, "abc"));
-    equal(false, $.validator.methods['validate-admin-password'].call(this, "abc       "));
-    equal(false, $.validator.methods['validate-admin-password'].call(this, "     abc      "));
-    equal(false, $.validator.methods['validate-admin-password'].call(this, "dddd"));
-});
-
-test( "testValidateUrl", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-url'].call(this, ""));
-    equal(true, $.validator.methods['validate-url'].call(this, null));
-    equal(true, $.validator.methods['validate-url'].call(this, undefined));
-    equal(false, $.validator.methods['validate-url'].call(this, "   "));
-    equal(true, $.validator.methods['validate-url'].call(this, "http://www.google.com"));
-    equal(true, $.validator.methods['validate-url'].call(this, "http://127.0.0.1:8080/index.php"));
-    equal(true, $.validator.methods['validate-url'].call(this, "http://app-spot.com/index.php"));
-    equal(true, $.validator.methods['validate-url'].call(this, "http://app-spot_space.com/index.php"));
-});
-
-test( "testValidateCleanUrl", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-clean-url'].call(this, ""));
-    equal(true, $.validator.methods['validate-clean-url'].call(this, null));
-    equal(true, $.validator.methods['validate-clean-url'].call(this, undefined));
-    equal(false, $.validator.methods['validate-clean-url'].call(this, "   "));
-    equal(true, $.validator.methods['validate-clean-url'].call(this, "http://www.google.com"));
-    equal(false, $.validator.methods['validate-clean-url'].call(this, "http://127.0.0.1:8080/index.php"));
-    equal(false, $.validator.methods['validate-clean-url'].call(this, "http://127.0.0.1:8080"));
-    equal(false, $.validator.methods['validate-clean-url'].call(this, "http://127.0.0.1"));
-});
-
-test( "testValidateXmlIdentifier", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-xml-identifier'].call(this, ""));
-    equal(true, $.validator.methods['validate-xml-identifier'].call(this, null));
-    equal(true, $.validator.methods['validate-xml-identifier'].call(this, undefined));
-    equal(false, $.validator.methods['validate-xml-identifier'].call(this, "   "));
-    equal(true, $.validator.methods['validate-xml-identifier'].call(this, "abc"));
-    equal(true, $.validator.methods['validate-xml-identifier'].call(this, "abc_123"));
-    equal(true, $.validator.methods['validate-xml-identifier'].call(this, "abc-123"));
-    equal(false, $.validator.methods['validate-xml-identifier'].call(this, "123-abc"));
-});
-
-test( "testValidateSsn", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-ssn'].call(this, ""));
-    equal(true, $.validator.methods['validate-ssn'].call(this, null));
-    equal(true, $.validator.methods['validate-ssn'].call(this, undefined));
-    equal(false, $.validator.methods['validate-ssn'].call(this, "   "));
-    equal(false, $.validator.methods['validate-ssn'].call(this, "abc"));
-    equal(true, $.validator.methods['validate-ssn'].call(this, "123-13-1234"));
-    equal(true, $.validator.methods['validate-ssn'].call(this, "012-12-1234"));
-    equal(false, $.validator.methods['validate-ssn'].call(this, "23-12-1234"));
-});
-
-test( "testValidateZip", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-zip-us'].call(this, ""));
-    equal(true, $.validator.methods['validate-zip-us'].call(this, null));
-    equal(true, $.validator.methods['validate-zip-us'].call(this, undefined));
-    equal(false, $.validator.methods['validate-zip-us'].call(this, "   "));
-    equal(true, $.validator.methods['validate-zip-us'].call(this, "12345-1234"));
-    equal(true, $.validator.methods['validate-zip-us'].call(this, "02345"));
-    equal(false, $.validator.methods['validate-zip-us'].call(this, "1234"));
-    equal(false, $.validator.methods['validate-zip-us'].call(this, "1234-1234"));
-});
-
-test( "testValidateDateAu", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-date-au'].call(this, ""));
-    equal(true, $.validator.methods['validate-date-au'].call(this, null));
-    equal(true, $.validator.methods['validate-date-au'].call(this, undefined));
-    equal(false, $.validator.methods['validate-date-au'].call(this, "   "));
-    equal(true, $.validator.methods['validate-date-au'].call(this, "01/01/2012"));
-    equal(true, $.validator.methods['validate-date-au'].call(this, "30/01/2012"));
-    equal(false, $.validator.methods['validate-date-au'].call(this, "01/30/2012"));
-    equal(false, $.validator.methods['validate-date-au'].call(this, "1/1/2012"));
-});
-
-test( "testValidateCurrencyDollar", function() {
-    expect(8);
-    equal(true, $.validator.methods['validate-currency-dollar'].call(this, ""));
-    equal(true, $.validator.methods['validate-currency-dollar'].call(this, null));
-    equal(true, $.validator.methods['validate-currency-dollar'].call(this, undefined));
-    equal(false, $.validator.methods['validate-currency-dollar'].call(this, "   "));
-    equal(true, $.validator.methods['validate-currency-dollar'].call(this, "$123"));
-    equal(true, $.validator.methods['validate-currency-dollar'].call(this, "$1,123.00"));
-    equal(true, $.validator.methods['validate-currency-dollar'].call(this, "$1234"));
-    equal(false, $.validator.methods['validate-currency-dollar'].call(this, "$1234.1234"));
-});
-
-test( "testValidateNotNegativeNumber", function() {
-    expect(11);
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, ""));
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, null));
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, undefined));
-    equal(false, $.validator.methods['validate-not-negative-number'].call(this, "   "));
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, "0"));
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, "1"));
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, "1234"));
-    equal(true, $.validator.methods['validate-not-negative-number'].call(this, "1,234.1234"));
-    equal(false, $.validator.methods['validate-not-negative-number'].call(this, "-1"));
-    equal(false, $.validator.methods['validate-not-negative-number'].call(this, "-1e"));
-    equal(false, $.validator.methods['validate-not-negative-number'].call(this, "-1,234.1234"));
-});
-
-test( "testValidateGreaterThanZero", function() {
-    expect(11);
-    equal(true, $.validator.methods['validate-greater-than-zero'].call(this, ""));
-    equal(true, $.validator.methods['validate-greater-than-zero'].call(this, null));
-    equal(true, $.validator.methods['validate-greater-than-zero'].call(this, undefined));
-    equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "   "));
-    equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "0"));
-    equal(true, $.validator.methods['validate-greater-than-zero'].call(this, "1"));
-    equal(true, $.validator.methods['validate-greater-than-zero'].call(this, "1234"));
-    equal(true, $.validator.methods['validate-greater-than-zero'].call(this, "1,234.1234"));
-    equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "-1"));
-    equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "-1e"));
-    equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "-1,234.1234"));
-});
-
-test( "testValidateCssLength", function() {
-    expect(11);
-    equal(true, $.validator.methods['validate-css-length'].call(this, ""));
-    equal(true, $.validator.methods['validate-css-length'].call(this, null));
-    equal(true, $.validator.methods['validate-css-length'].call(this, undefined));
-    equal(false, $.validator.methods['validate-css-length'].call(this, "   "));
-    equal(false, $.validator.methods['validate-css-length'].call(this, "0"));
-    equal(true, $.validator.methods['validate-css-length'].call(this, "1"));
-    equal(true, $.validator.methods['validate-css-length'].call(this, "1234"));
-    equal(true, $.validator.methods['validate-css-length'].call(this, "1,234.1234"));
-    equal(false, $.validator.methods['validate-css-length'].call(this, "-1"));
-    equal(false, $.validator.methods['validate-css-length'].call(this, "-1e"));
-    equal(false, $.validator.methods['validate-css-length'].call(this, "-1,234.1234"));
-});
-
-test( "testValidateData", function() {
-    expect(9);
-    equal(true, $.validator.methods['validate-data'].call(this, ""));
-    equal(true, $.validator.methods['validate-data'].call(this, null));
-    equal(true, $.validator.methods['validate-data'].call(this, undefined));
-    equal(false, $.validator.methods['validate-data'].call(this, "   "));
-    equal(false, $.validator.methods['validate-data'].call(this, "123abc"));
-    equal(true, $.validator.methods['validate-data'].call(this, "abc"));
-    equal(false, $.validator.methods['validate-data'].call(this, " abc"));
-    equal(true, $.validator.methods['validate-data'].call(this, "abc123"));
-    equal(false, $.validator.methods['validate-data'].call(this, "abc-123"));
-});
-
-
-test( "testValidateOneRequiredByName", function() {
-    expect(4);
-    var radio = $('<input type="radio" name="radio"/>');
-    radio.appendTo("#qunit-fixture");
-    ok(!$.validator.methods['validate-one-required-by-name'].call(this,
-        null, radio[0]));
-    var radio2 = $('<input type="radio" name="radio" checked/>');
-    radio2.appendTo("#qunit-fixture");
-    ok($.validator.methods['validate-one-required-by-name'].call(this,
-        null, radio2[0]));
-
-    var checkbox = $('<input type="checkbox" name="checkbox"/>');
-    checkbox.appendTo("#qunit-fixture");
-    ok(!$.validator.methods['validate-one-required-by-name'].call(this,
-        null, checkbox[0]));
-    var checkbox2 = $('<input type="checkbox" name="checkbox" checked/>');
-    checkbox2.appendTo("#qunit-fixture");
-    ok($.validator.methods['validate-one-required-by-name'].call(this,
-        null, checkbox2[0]));
-});
-
-test( "testLessThanEqualsTo", function() {
-    expect(5);
-    var elm1 =  $('<input type="text" value=6 id="element1" />');
-    var elm2 =  $('<input type="text" value=5 id="element2" />');
-    ok(!$.validator.methods['less-than-equals-to'].call(this, elm1[0].value,
-        elm1, elm2));
-    elm1[0].value = 4;
-    ok($.validator.methods['less-than-equals-to'].call(this, elm1[0].value,
-        elm1, elm2));
-
-    var elm3 =  $('<input type="text" id="element3" />');
-    var elm4=  $('<input type="text" value=5 id="element4" />');
-    ok($.validator.methods['less-than-equals-to'].call(this, elm3[0].value,
-        elm3, elm4));
-
-    var elm5 =  $('<input type="text" id="element6" />');
-    var elm6=  $('<input type="text" value=6 id="element5" />');
-    ok($.validator.methods['less-than-equals-to'].call(this, elm5[0].value,
-        elm5, elm6));
-
-    var elm7 =  $('<input type="text" value=20 id="element7" />');
-    var elm8=  $('<input type="text" value=100 id="element8" />');
-    ok($.validator.methods['less-than-equals-to'].call(this, elm7[0].value,
-        elm7, elm8));
-});
-
-test( "testGreaterThanEqualsTo", function() {
-    expect(5);
-
-    var elm1 =  $('<input type="text" value=6 id="element1" />');
-    var elm2 =  $('<input type="text" value=7 id="element2" />');
-    ok(!$.validator.methods['greater-than-equals-to'].call(this, elm1[0].value,
-        elm1, elm2));
-    elm1[0].value = 9;
-    ok($.validator.methods['greater-than-equals-to'].call(this, elm1[0].value,
-        elm1, elm2));
-
-    var elm3 =  $('<input type="text" id="element3" />');
-    var elm4=  $('<input type="text" value=5 id="element4" />');
-    ok($.validator.methods['greater-than-equals-to'].call(this, elm3[0].value,
-        elm3, elm4));
-
-    var elm5 =  $('<input type="text" id="element6" />');
-    var elm6=  $('<input type="text" value=6 id="element5" />');
-    ok($.validator.methods['greater-than-equals-to'].call(this, elm5[0].value,
-        elm5, elm6));
-
-    var elm7 =  $('<input type="text" value=100 id="element7" />');
-    var elm8=  $('<input type="text" value=20 id="element8" />');
-    ok($.validator.methods['greater-than-equals-to'].call(this, elm7[0].value,
-        elm7, elm8));
-});
-
-test( "testValidateGroupedQty", function() {
-    expect(5);
-    var div1 = $('<div id="div1"/>');
-    $('<input type="text"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-                             .appendTo(div1);
-    $('<input type="text"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-                             .appendTo(div1);
-    $('<input type="text"/>').appendTo(div1);
-
-    ok(!$.validator.methods['validate-grouped-qty'].call(this, null, null, div1[0]));
-
-    var div2 = $('<div id="div2"/>');
-    $('<input type="text"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div2);
-    $('<input type="text" value="a"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div2);
-    $('<input type="text"/>').appendTo(div2);
-    ok(!$.validator.methods['validate-grouped-qty'].call(this, null, null, div2[0]));
-
-    var div3 = $('<div id="div3"/>');
-    $('<input type="text"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div3);
-    $('<input type="text" value="-6"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div3);
-    $('<input type="text"/>').appendTo(div3);
-    ok(!$.validator.methods['validate-grouped-qty'].call(this, null, null, div3[0]));
-
-    var div4 = $('<div id="div4"/>');
-    $('<input type="text"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div4);
-    $('<input type="text" value="6"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div4);
-    $('<input type="text"/>').appendTo(div4);
-    ok($.validator.methods['validate-grouped-qty'].call(this, null, null, div4[0]));
-
-    var div5 = $('<div id="div5"/>');
-    $('<input type="text" value=""/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div5);
-    $('<input type="text" value="6"/>').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
-        .appendTo(div5);
-    $('<input type="text"/>').appendTo(div5);
-    ok($.validator.methods['validate-grouped-qty'].call(this, null, null, div5[0]));
-
-});
-
-test( "testValidateCCTypeSelect", function() {
-    expect(14);
-     var visaValid = $('<input id="visa-valid" type="text" value="4916808263499650"/>');
-     var visaInvalid = $('<input id="visa-invalid" type="text" value="1234567890123456"/>');
-     var mcValid = $('<input id="mc-valid" type="text" value="5203731841177490"/>');
-     var mcInvalid = $('<input id="mc-invalid" type="text" value="1111222233334444"/>');
-     var aeValid = $('<input id="ae-valid" type="text" value="376244899619217"/>');
-     var aeInvalid = $('<input id="ae-invalid" type="text" value="123451234512345"/>');
-
-    var diValid = $('<input id="di-valid" type="text" value="6011050000000009"/>');
-    var diInvalid = $('<input id="di-invalid" type="text" value="6011199900000005"/>');
-    var dnValid = $('<input id="dn-valid" type="text" value="3095434000000001"/>');
-    var dnInvalid = $('<input id="dn-invalid" type="text" value="3799999900000003"/>');
-    var jcbValid = $('<input id="jcb-valid" type="text" value="3528000000000007"/>');
-    var jcbInvalid = $('<input id="jcb-invalid" type="text" value="359000001111118"/>');
-    var upValid = $('<input id="up-valid" type="text" value="6221260000000000"/>');
-    var upInvalid = $('<input id="up-invalid" type="text" value="6229260000000002"/>');
-
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'VI', null, visaValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'VI', null, visaInvalid));
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'MC', null, mcValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'MC', null, mcInvalid));
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'AE', null, aeValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'AE', null, aeInvalid));
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'DI', null, diValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'DI', null, diInvalid));
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'DN', null, dnValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'DN', null, dnInvalid));
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'JCB', null, jcbValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'JCB', null, jcbInvalid));
-    ok($.validator.methods['validate-cc-type-select'].call(this, 'UP', null, upValid));
-    ok(!$.validator.methods['validate-cc-type-select'].call(this, 'UP', null, upInvalid));
-});
-
-test( "testValidateCCNumber", function() {
-    expect(37);
-    ok($.validator.methods['validate-cc-number'].call(this, '4916835098995909', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '5265071363284878', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '6011120623356953', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '371293266574617', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '4916835098995901', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '5265071363284870', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6011120623356951', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '371293266574619', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '2221220000000003', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '2721220000000008', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '601109020000000003', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6011111144444444', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '6011222233334444', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6011522233334447', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '601174455555553', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6011745555555550', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '601177455555556', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '601182455555556', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '601187999555558', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '601287999555556', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '6444444444444443', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6644444444444441', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '3044444444444444', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '3064444444444449', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '3095444444444442', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '3096444444444441', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '3696444444444445', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '3796444444444444', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '3896444444444443', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '3528444444444449', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '3529444444444448', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '6221262244444440', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6229981111111111', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '6249981111111117', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6279981111111110', null, null));
-    ok($.validator.methods['validate-cc-number'].call(this, '6282981111111115', null, null));
-    ok(!$.validator.methods['validate-cc-number'].call(this, '6289981111111118', null, null));
-});
-
-test( "testValidateCCType", function() {
-    expect(14);
-    var select = $('<select id="cc-type">' +
-        '<option value="">' +
-        '</option><option value="VI">' +
-        '</option><option value="MC">' +
-        '</option><option value="AE">' +
-        '</option><option value="DI">' +
-        '</option><option value="DN">' +
-        '</option><option value="JCB">' +
-        '</option><option value="UP">' +
-        '</option>' +
-        '</select>');
-
-    select.val('VI');
-    ok($.validator.methods['validate-cc-type'].call(this, '4916835098995909', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
-    select.val('MC');
-    ok($.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '4916835098995909', null, select));
-    select.val('AE');
-    ok($.validator.methods['validate-cc-type'].call(this, '371293266574617', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
-    select.val('DI');
-    ok($.validator.methods['validate-cc-type'].call(this, '6011050000000009', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '371293266574617', null, select));
-    select.val('DN');
-    ok($.validator.methods['validate-cc-type'].call(this, '3095434000000001', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '6011050000000009', null, select));
-    select.val('JCB');
-    ok($.validator.methods['validate-cc-type'].call(this, '3528000000000007', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '3095434000000001', null, select));
-    select.val('UP');
-    ok($.validator.methods['validate-cc-type'].call(this, '6221260000000000', null, select));
-    ok(!$.validator.methods['validate-cc-type'].call(this, '3528000000000007', null, select));
-});
-
-test( "testValidateCCExp", function() {
-    expect(3);
-    var year = $('<input id="year" type="text" value="4916808263499650"/>'),
-        currentTime  = new Date(),
-        currentMonth = currentTime.getMonth() + 1,
-        currentYear  = currentTime.getFullYear();
-    year.val(currentYear);
-    if (currentMonth > 1) {
-        ok(!$.validator.methods['validate-cc-exp'].call(this, currentMonth - 1, null, year));
-    }
-    ok($.validator.methods['validate-cc-exp'].call(this, currentMonth, null, year));
-    year.val(currentYear + 1);
-    ok($.validator.methods['validate-cc-exp'].call(this, currentMonth, null, year));
-
-});
-
-test( "testValidateCCCvn", function() {
-    expect(8);
-     var ccType = $('<select id="cc-type">'+
-     '<option value=""></option>'+
-     '<option value="VI"></option>'+
-     '<option value="MC"></option>'+
-     '<option value="AE"></option>'+
-     '<option value="DI"></option>'+
-     '</select>');
-
-    ccType.val('VI');
-    ok($.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
-    ok(!$.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
-    ccType.val('MC');
-    ok($.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
-    ok(!$.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
-    ccType.val('AE');
-    ok($.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
-    ok(!$.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
-    ccType.val('DI');
-    ok($.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
-    ok(!$.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
-});
-
-test( "testValidateNumberRange", function() {
-    expect(14);
-    ok($.validator.methods['validate-number-range'].call(this, '-1', null, null));
-    ok($.validator.methods['validate-number-range'].call(this, '1', null, null));
-    ok($.validator.methods['validate-number-range'].call(this, '', null, null));
-    ok($.validator.methods['validate-number-range'].call(this, null, null, null));
-    ok($.validator.methods['validate-number-range'].call(this, '0', null, null));
-    ok(!$.validator.methods['validate-number-range'].call(this, 'asds', null, null));
-
-    ok($.validator.methods['validate-number-range'].call(this, '10', null, '10-20.06'));
-    ok($.validator.methods['validate-number-range'].call(this, '15', null, '10-20.06'));
-    ok(!$.validator.methods['validate-number-range'].call(this, '1', null, '10-20.06'));
-    ok(!$.validator.methods['validate-number-range'].call(this, '30', null, '10-20.06'));
-
-    var el1 = $('<input type="text" value="" class="validate-number-range number-range-10-20 number-range-10-100.20">').get(0);
-    ok($.validator.methods['validate-number-range'].call(this, '10', el1, null));
-    ok($.validator.methods['validate-number-range'].call(this, '15', el1, null));
-    ok(!$.validator.methods['validate-number-range'].call(this, '1', el1, null));
-    ok($.validator.methods['validate-number-range'].call(this, '30', el1, null));
-});
-
-
-
-test( "testValidateDigitsRange", function() {
-    expect(15);
-    ok($.validator.methods['validate-digits-range'].call(this, '-1', null, null));
-    ok($.validator.methods['validate-digits-range'].call(this, '1', null, null));
-    ok($.validator.methods['validate-digits-range'].call(this, '', null, null));
-    ok($.validator.methods['validate-digits-range'].call(this, null, null, null));
-    ok($.validator.methods['validate-digits-range'].call(this, '0', null, null));
-    ok(!$.validator.methods['validate-digits-range'].call(this, 'asds', null, null));
-
-    ok($.validator.methods['validate-digits-range'].call(this, '10', null, '10-20'));
-    ok($.validator.methods['validate-digits-range'].call(this, '15', null, '10-20'));
-    ok(!$.validator.methods['validate-digits-range'].call(this, '1', null, '10-20'));
-    ok(!$.validator.methods['validate-digits-range'].call(this, '30', null, '10-20'));
-    ok($.validator.methods['validate-digits-range'].call(this, '30', null, '10-20.06'));
-
-    var el1 = $('<input type="text" value="" class="validate-digits-range digits-range-10-20 digits-range-10-100.20">').get(0);
-    ok($.validator.methods['validate-digits-range'].call(this, '10', el1, null));
-    ok($.validator.methods['validate-digits-range'].call(this, '15', el1, null));
-    ok(!$.validator.methods['validate-digits-range'].call(this, '1', el1, null));
-    ok(!$.validator.methods['validate-digits-range'].call(this, '30', el1, null));
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/webapi-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/webapi-test.js
deleted file mode 100644
index b03b3bc3d889a..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/webapi-test.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-WebapiTest = TestCase('WebapiTest');
-
-WebapiTest.prototype.testConstructorSuccess = function() {
-    var successCallback = function(){};
-    new $.mage.Webapi('baseUrl', {'timeout': 100, 'success': successCallback});
-};
-
-WebapiTest.prototype.testConstructorSuccessEmptyArgs = function() {
-    new $.mage.Webapi('baseUrl');
-};
-
-WebapiTest.prototype.testConstructorInvalidBaseUrl = function() {
-    expectAsserts(1);
-    try {
-        var invalidBaseUrl = 1;
-        new $.mage.Webapi(invalidBaseUrl);
-    } catch (e) {
-        var expectedException = "String baseUrl parameter required";
-        assertEquals("Invalid exception was thrown.", expectedException, e);
-    }
-};
-
-WebapiTest.prototype.testCallInvalidMethod = function() {
-    var Webapi = new $.mage.Webapi('baseUrl');
-    expectAsserts(1);
-    try {
-        Webapi.call('resourceUri', 'INVALID_HTTP_METHOD');
-    } catch (e) {
-        var expectedException = "Method name is not valid: INVALID_HTTP_METHOD";
-        assertEquals("Invalid exception was thrown.", expectedException, e);
-    }
-};
-
-WebapiTest.prototype.testCallSuccessCallback = function() {
-    // ensure that custom successCallback was executed
-    expectAsserts(1);
-    var successCallback = function(response) {
-        assertObject("Response is expected to be an object", response);
-    };
-    var Webapi = new $.mage.Webapi('baseUrl', {'success': successCallback});
-    $.ajax = function(settings) {
-        settings.success({});
-    };
-    Webapi.call('products', 'GET');
-};
-
-WebapiTest.prototype.testCallErrorCallback = function() {
-    // ensure that custom successCallback was executed
-    expectAsserts(1);
-    var errorCallback = function(response) {
-        assertObject("Response is expected to be an object", response);
-    };
-    var Webapi = new $.mage.Webapi('baseUrl', {'error': errorCallback});
-    $.ajax = function(settings) {
-        settings.error({});
-    };
-    Webapi.call('products', 'GET');
-};
-
-WebapiTest.prototype.testCallProductGet = function() {
-    var baseUri = 'baseUrl';
-    var Webapi = new $.mage.Webapi(baseUri);
-    var httpMethod = Webapi.method.get;
-    var idObj = {id: 1};
-    var productResourceUri = '/products/';
-    var resourceVersion = 'v1';
-    var expectedUri = baseUri + '/webapi/rest/' + resourceVersion + productResourceUri + '1';
-    // ensure that $.ajax() was executed
-    expectAsserts(3);
-    $.ajax = function(settings) {
-        assertEquals("URI for API call does not match with expected one.", expectedUri, settings.url);
-        assertEquals("HTTP method for API call does not match with expected one.", httpMethod, settings.type);
-        assertEquals("Data for API call does not match with expected one.", '1', settings.data);
-    };
-    Webapi.Product(resourceVersion).get(idObj);
-};
-
-WebapiTest.prototype.testCallProductCreate = function() {
-    var baseUri = 'baseUrl';
-    var Webapi = new $.mage.Webapi(baseUri);
-    var httpMethod = Webapi.method.create;
-    var productResourceUri = '/products/';
-    var resourceVersion = 'v1';
-    var expectedUri = baseUri + '/webapi/rest/' + resourceVersion + productResourceUri;
-    productData = {
-        "type_id": "simple",
-        "attribute_set_id": 4,
-        "sku": "1234567890",
-        "weight": 1,
-        "status": 1,
-        "visibility": 4,
-        "name": "Simple Product",
-        "description": "Simple Description",
-        "price": 99.95,
-        "tax_class_id": 0
-    };
-    // ensure that $.ajax() was executed
-    expectAsserts(3);
-    $.ajax = function(settings) {
-        assertEquals("URI for API call does not match with expected one.", expectedUri, settings.url);
-        assertEquals("HTTP method for API call does not match with expected one.", httpMethod, settings.type);
-        assertEquals("Data for API call does not match with expected one.", productData, settings.data);
-    };
-    Webapi.Product(resourceVersion).create(productData);
-};
-
-WebapiTest.prototype.testCallProductCreateInvalidVersion = function() {
-    expectAsserts(1);
-    var invalidVersion = 'invalidVersion';
-    try {
-        var Webapi = new $.mage.Webapi('BaseUrl');
-        Webapi.Product(invalidVersion);
-    } catch (e) {
-        var expectedException = "Incorrect version format: " + invalidVersion;
-        assertEquals("Invalid exception was thrown.", expectedException, e);
-    }
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/zoom/zoom-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/zoom/zoom-test.js
deleted file mode 100644
index a9dc0fd239a28..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/zoom/zoom-test.js
+++ /dev/null
@@ -1,337 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-ZoomTest = TestCase('ZoomTest');
-ZoomTest.prototype.setUp = function() {
-    /*:DOC +=
-     <script data-template="zoom-display" type="text/x-magento-template">
-        <div data-role="zoom-container">
-            <div data-role="zoom-inner"></div>
-        </div>
-     </script>
-     <script data-template="zoom-enlarged-image" type="text/x-magento-template">
-        <img data-role="enlarged-image" src="<%= data.img %>" />
-     </script>
-     <script data-template="zoom-track" type="text/x-magento-template">
-        <div data-role="zoom-track"></div>
-     </script>
-     <script data-template="zoom-lens" type="text/x-magento-template">
-        <div data-role="zoom-lens"></div>
-     </script>
-     <script data-template="notice" type="text/x-magento-template">
-        <p class="notice" data-role="notice"><%= data.text %></p>
-     </script>
-     <div data-role="zoom-test">
-        <img />
-     </div>
-     */
-    this.zoomElement = jQuery('[data-role=zoom-test]');
-};
-ZoomTest.prototype.tearDown = function() {
-    this.zoomDestroy();
-};
-ZoomTest.prototype.zoomDestroy = function() {
-    if(this.zoomElement.data('zoom')) {
-        this.zoomElement.zoom('destroy');
-    }
-};
-ZoomTest.prototype.zoomCreate = function(options, element) {
-    return (element || this.zoomElement).zoom(options || {} ).data('zoom');
-};
-ZoomTest.prototype.testInit = function() {
-    this.zoomElement.zoom();
-    assertTrue(this.zoomElement.is(':mage-zoom'));
-};
-ZoomTest.prototype.testCreate = function() {
-    var zoomInstance = this.zoomCreate(),
-        _setZoomData = jsunit.stub(zoomInstance, '_setZoomData'),
-        _render = jsunit.stub(zoomInstance, '_render'),
-        _bind = jsunit.stub(zoomInstance, '_bind'),
-        _hide = jsunit.stub(zoomInstance, '_hide'),
-        _largeImageLoaded = jsunit.stub(zoomInstance, '_largeImageLoaded');
-
-    zoomInstance.largeImage = [{
-        complete: false
-    }];
-
-    zoomInstance._create();
-    assertTrue(_setZoomData.callCount === 1);
-    assertTrue(_render.callCount === 1);
-    assertTrue(_bind.callCount === 1);
-    assertNull(_largeImageLoaded.callCount);
-    assertTrue(_hide.callCount === 2);
-    _setZoomData.reset();
-    _render.reset();
-    _bind.reset();
-    _hide.reset();
-
-    zoomInstance.largeImage[0].complete = true;
-    zoomInstance._create();
-    assertTrue(_setZoomData.callCount === 1);
-    assertTrue(_render.callCount === 1);
-    assertTrue(_bind.callCount === 1);
-    assertTrue(_largeImageLoaded.callCount === 1);
-    assertTrue(_hide.callCount === 2);
-};
-ZoomTest.prototype.testRender = function() {
-    var zoomInstance = this.zoomCreate(),
-        _renderControl = jsunit.stub(zoomInstance, '_renderControl'),
-        _renderLargeImage = jsunit.stub(zoomInstance, '_renderLargeImage');
-    _renderControl.returnCallback = function(control) {
-        return jQuery('<p />', {'data-control': control});
-    };
-
-    zoomInstance._render();
-    assertTrue(_renderControl.callCount === 4);
-    assertTrue(zoomInstance.element.find('[data-control=track]').length > 0);
-    assertTrue(zoomInstance.element.find('[data-control=lens]').length > 0);
-    assertTrue(zoomInstance.element.find('[data-control=display]').length > 0);
-    assertTrue(zoomInstance.element.find('[data-control=notice]').length > 0);
-    assertTrue(_renderLargeImage.callCount === 1);
-};
-ZoomTest.prototype.testToggleNotice = function() {
-    var zoomInstance = this.zoomCreate(),
-        getZoomRatio = jsunit.stub(zoomInstance, 'getZoomRatio');
-
-    zoomInstance.noticeOriginal = 'notice original';
-    zoomInstance.options.controls.notice = {
-        text: 'test text'
-    };
-
-    zoomInstance.notice.text('');
-    zoomInstance.largeImageSrc = 'image.large.jpg';
-    zoomInstance.activated = false;
-    getZoomRatio.returnValue = 2;
-    zoomInstance._toggleNotice();
-    assertEquals(zoomInstance.notice.text(), zoomInstance.options.controls.notice.text);
-    assertTrue(getZoomRatio.callCount === 1);
-
-    zoomInstance.notice.text('');
-    zoomInstance.largeImageSrc = null;
-    zoomInstance.activated = false;
-    getZoomRatio.returnValue = 2;
-    zoomInstance._toggleNotice();
-    assertEquals(zoomInstance.notice.text(), zoomInstance.noticeOriginal);
-
-    zoomInstance.notice.text('');
-    zoomInstance.largeImageSrc = 'image.large.jpg';
-    zoomInstance.activated = true;
-    getZoomRatio.returnValue = 2;
-    zoomInstance._toggleNotice();
-    assertEquals(zoomInstance.notice.text(), zoomInstance.noticeOriginal);
-
-    zoomInstance.notice.text('');
-    zoomInstance.largeImageSrc = 'image.large.jpg';
-    zoomInstance.activated = false;
-    getZoomRatio.returnValue = 0;
-    zoomInstance._toggleNotice();
-    assertEquals(zoomInstance.notice.text(), zoomInstance.noticeOriginal);
-};
-
-ZoomTest.prototype.testRefresh = function() {
-    var zoomInstance = this.zoomCreate(),
-        _refreshControl = jsunit.stub(zoomInstance, '_refreshControl');
-
-    zoomInstance._refresh();
-    assertTrue(_refreshControl.callCount === 3);
-    assertTrue(_refreshControl.callArgsStack[0][0] === 'display');
-    assertTrue(_refreshControl.callArgsStack[1][0] === 'track');
-    assertTrue(_refreshControl.callArgsStack[2][0] === 'lens');
-};
-
-ZoomTest.prototype.testBind = function() {
-    var zoomInstance = this.zoomCreate(),
-        _on = jsunit.stub(zoomInstance, '_on'),
-        events = {};
-
-    zoomInstance.largeImage = jQuery('<p />');
-    zoomInstance._bind();
-    assertTrue(_on.callCount > 0);
-    assertTrue(
-        _on.callArgsStack[0][0][
-            zoomInstance.options.startZoomEvent +
-            ' ' +
-            zoomInstance.options.selectors.image
-        ] === 'show'
-    );
-    assertTrue(
-        jQuery.type(_on.callArgsStack[0][0][
-            zoomInstance.options.stopZoomEvent +
-            ' ' +
-            zoomInstance.options.selectors.track
-        ]) === 'function'
-    );
-    assertTrue(_on.callArgsStack[0][0]['mousemove ' + zoomInstance.options.selectors.track] === '_move');
-    assertTrue(_on.callArgsStack[0][0].imageupdated === '_onImageUpdated');
-    assertTrue(_on.callArgsStack[1][0].is(zoomInstance.largeImage));
-    assertTrue(_on.callArgsStack[1][1].load === '_largeImageLoaded');
-};
-ZoomTest.prototype.testEnable = function() {
-    var zoomInstance = this.zoomCreate(),
-        _onImageUpdated = jsunit.stub(zoomInstance, '_onImageUpdated');
-
-    zoomInstance.enable();
-    assertTrue(_onImageUpdated.callCount === 1);
-};
-ZoomTest.prototype.testDisable = function() {
-    var zoomInstance = this.zoomCreate();
-
-    zoomInstance.noticeOriginal = 'original notice';
-    zoomInstance.notice.text('');
-    zoomInstance.disable();
-    assertEquals(zoomInstance.noticeOriginal, zoomInstance.notice.text());
-};
-ZoomTest.prototype.testShow = function() {
-    var zoomInstance = this.zoomCreate(),
-        e = {
-            preventDefault: jsunit.stub(),
-            stopImmediatePropagation: jsunit.stub()
-        },
-        getZoomRatio = jsunit.stub(zoomInstance, 'getZoomRatio'),
-        _show = jsunit.stub(zoomInstance, '_show'),
-        _refresh = jsunit.stub(zoomInstance, '_refresh'),
-        _toggleNotice = jsunit.stub(zoomInstance, '_toggleNotice'),
-        _trigger = jsunit.stub(zoomInstance, '_trigger');
-
-    getZoomRatio.returnValue = 0;
-    zoomInstance.show(e);
-    assertTrue(e.preventDefault.callCount === 1);
-
-    e.preventDefault.reset();
-    getZoomRatio.reset();
-    getZoomRatio.returnValue = 2;
-    zoomInstance.largeImageSrc = 'image.large.jpg';
-    zoomInstance.show(e);
-    assertTrue(e.preventDefault.callCount === 1);
-    assertTrue(e.stopImmediatePropagation.callCount === 1);
-    assertTrue(zoomInstance.activated);
-    assertTrue(_show.callCount > 0);
-    assertTrue(_refresh.callCount === 1);
-    assertTrue(_toggleNotice.callCount === 1);
-    assertTrue(_trigger.callCount === 1);
-    assertTrue(_trigger.lastCallArgs[0] === 'show');
-};
-ZoomTest.prototype.testHide = function() {
-    var zoomInstance = this.zoomCreate(),
-        _hide = jsunit.stub(zoomInstance, '_hide'),
-        _toggleNotice = jsunit.stub(zoomInstance, '_toggleNotice'),
-        _trigger = jsunit.stub(zoomInstance, '_trigger');
-
-    zoomInstance.hide();
-    assertTrue(_hide.callCount > 0);
-    assertTrue(_toggleNotice.callCount === 1);
-    assertTrue(_trigger.callCount === 1);
-    assertTrue(_trigger.lastCallArgs[0] === 'hide');
-};
-ZoomTest.prototype.testOnImageUpdated = function() {
-    var zoomInstance = this.zoomCreate(),
-        _setZoomData = jsunit.stub(zoomInstance, '_setZoomData'),
-        _refreshLargeImage = jsunit.stub(zoomInstance, '_refreshLargeImage'),
-        _refresh = jsunit.stub(zoomInstance, '_refresh'),
-        hide = jsunit.stub(zoomInstance, 'hide'),
-        testImage = jQuery('<p data-role="test-image" />');
-
-    zoomInstance.options.selectors.image = "[data-role=test-image]";
-    zoomInstance.element.append(testImage);
-    zoomInstance.image = testImage;
-    zoomInstance._onImageUpdated();
-    assertNull(_setZoomData.callCount);
-    assertNull(_refreshLargeImage.callCount);
-    assertNull(_refresh.callCount);
-    assertNull(hide.callCount);
-
-    zoomInstance.image = jQuery('<p />');
-    zoomInstance.largeImageSrc = null;
-    zoomInstance._onImageUpdated();
-    assertTrue(_setZoomData.callCount === 1);
-    assertNull(_refreshLargeImage.callCount);
-    assertNull(_refresh.callCount);
-    assertTrue(hide.callCount === 1);
-
-    _setZoomData.reset();
-    hide.reset();
-    zoomInstance.largeImageSrc = 'image.large.jpg';
-    zoomInstance._onImageUpdated();
-    assertTrue(_setZoomData.callCount === 1);
-    assertTrue(_refreshLargeImage.callCount === 1);
-    assertTrue(_refresh.callCount === 1);
-    assertNull(hide.callCount);
-};
-ZoomTest.prototype.testLargeImageLoaded = function() {
-    var zoomInstance = this.zoomCreate(),
-        _toggleNotice = jsunit.stub(zoomInstance, '_toggleNotice'),
-        _getAspectRatio = jsunit.stub(zoomInstance, '_getAspectRatio'),
-        _getWhiteBordersOffset = jsunit.stub(zoomInstance, '_getWhiteBordersOffset'),
-        processStopTriggered = false,
-        image = jQuery('<p data-role="test-image" />');
-
-    _getWhiteBordersOffset.returnValue = 1;
-    zoomInstance.element.append(image);
-    zoomInstance.options.selectors.image = '[data-role=test-image]';
-    zoomInstance.image = image;
-    _getAspectRatio.returnCallback = function(image) {
-        if (image.is(zoomInstance.image)) {
-            return 0;
-        } else {
-            return 1;
-        }
-    };
-
-    jQuery(zoomInstance.options.selectors.image).on('processStop', function() {
-        processStopTriggered = true;
-    });
-    zoomInstance.ratio = 1;
-
-    zoomInstance._largeImageLoaded();
-    assertNull(zoomInstance.ratio);
-    assertTrue(_toggleNotice.callCount === 1);
-    assertTrue(processStopTriggered);
-    assertTrue(_getAspectRatio.callCount > 0);
-    assertTrue(_getWhiteBordersOffset.callCount === 1);
-    assertEquals(zoomInstance.whiteBordersOffset, _getWhiteBordersOffset.returnValue);
-};
-ZoomTest.prototype.testRefreshLargeImage = function() {
-    var zoomInstance = this.zoomCreate(),
-        css = {top: 0, left: 0};
-    zoomInstance.largeImage = jQuery('<img />');
-    zoomInstance.largeImageSrc = 'large.image.jpg';
-
-    zoomInstance._refreshLargeImage();
-    assertNotUndefined(zoomInstance.largeImage.prop('src'));
-    assertEquals(zoomInstance.largeImage.css('top'), css.top + 'px');
-    assertEquals(zoomInstance.largeImage.css('left'), css.left + 'px');
-};
-ZoomTest.prototype.testRenderLargeImage = function() {
-    var zoomInstance = this.zoomCreate();
-
-    zoomInstance.element.append(jQuery('<p data-role="test-image" />'));
-    zoomInstance.options.selectors.image = '[data-role=test-image]';
-
-    var image = zoomInstance._renderLargeImage();
-    assertTrue(image.is('img'));
-    assertTrue(image.is(zoomInstance.largeImage));
-};
-ZoomTest.prototype.testGetZoomRatio = function() {
-    var zoomInstance = this.zoomCreate(),
-        imageSize = {width: 100, height: 100},
-        largeImageSize = {width: 200, height: 200};
-
-    zoomInstance.ratio = null;
-    zoomInstance.image = jQuery('<img />', imageSize);
-    zoomInstance.largeImageSize = largeImageSize;
-    var zoomRatio = zoomInstance.getZoomRatio();
-
-    assertEquals(zoomRatio, (largeImageSize.width / imageSize.width));
-    zoomInstance.ratio = 100;
-    zoomRatio = zoomInstance.getZoomRatio();
-    assertEquals(zoomRatio, zoomInstance.ratio);
-};
-ZoomTest.prototype.testGetAspectRatio = function() {
-    var zoomInstance = this.zoomCreate(),
-        aspectRatio = zoomInstance._getAspectRatio(),
-        size = {width: 200, height: 100};
-    assertNull(aspectRatio);
-    aspectRatio = zoomInstance._getAspectRatio(jQuery('<div />', size));
-    assertEquals((Math.round((size.width / size.height) * 100) / 100), aspectRatio);
-};
diff --git a/dev/tests/js/jasmine/assets/gallery/config.json b/dev/tests/js/jasmine/assets/gallery/config.json
index d1d8e94d7f220..72c36293bc152 100644
--- a/dev/tests/js/jasmine/assets/gallery/config.json
+++ b/dev/tests/js/jasmine/assets/gallery/config.json
@@ -59,8 +59,7 @@
         "arrows": "false",
         "thumbwidth": "90",
         "thumbheight": "90",
-        "ratio": "1",
-        "allowfullscreen": true
+        "ratio": "1"
     },
     "fullscreen": {
         "nav": false
diff --git a/dev/tests/js/jasmine/assets/lib/web/mage/menu.html b/dev/tests/js/jasmine/assets/lib/web/mage/menu.html
new file mode 100644
index 0000000000000..03c673a7dac5f
--- /dev/null
+++ b/dev/tests/js/jasmine/assets/lib/web/mage/menu.html
@@ -0,0 +1,38 @@
+<ul id="menu">
+    <li class="foo">Aberdeen</li>
+    <li class="foo">Ada</li>
+    <li class="foo">Adamsville</li>
+    <li class="foo"><span class="ui-icon ui-icon-print"></span>Addyston</li>
+    <li class="test-menu-item">
+        <a>Delphi</a>
+        <ul>
+            <li class="foo">Ada</li>
+            <li class="foo">Saarland</li>
+            <li class="foo">Salzburg</li>
+        </ul>
+    </li>
+    <li class="foo">Saarland</li>
+    <li>
+        <a>Salzburg</a>
+        <ul>
+            <li>Delphi
+                <ul>
+                    <li class="foo">Ada</li>
+                    <li class="foo">Saarland</li>
+                    <li class="foo">Salzburg</li>
+                </ul>
+            </li>
+            <li>Delphi
+                <ul>
+                    <li class="foo">Ada</li>
+                    <li> - </li>
+                    <li class="foo">Saarland</li>
+                    <li></li>
+                    <li class="foo">Salzburg</li>
+                    <li>&ndash;</li>
+                </ul>
+            </li>
+            <li class="foo">Perch</li>
+        </ul>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/assets/lib/web/mage/tabs.html b/dev/tests/js/jasmine/assets/lib/web/mage/tabs.html
new file mode 100644
index 0000000000000..dd4d665ca188e
--- /dev/null
+++ b/dev/tests/js/jasmine/assets/lib/web/mage/tabs.html
@@ -0,0 +1,8 @@
+<div id="tabs">
+    <div id="title1" data-role="collapsible">
+    </div>
+    <div id="content1" data-role="content"></div>
+    <div id="title2" data-role="collapsible">
+    </div>
+    <div id="content2" data-role="content"></div>
+</div>
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/assets/lib/web/mage/translate-inline.html b/dev/tests/js/jasmine/assets/lib/web/mage/translate-inline.html
new file mode 100644
index 0000000000000..5e48598a081a2
--- /dev/null
+++ b/dev/tests/js/jasmine/assets/lib/web/mage/translate-inline.html
@@ -0,0 +1,4 @@
+<script id="translate-form-template" type="text/x-magento-template">
+    <form id="<%= data.id %>"><%= data.newTemplateVariable %></form>
+</script>
+<div data-role="translate-dialog"></div>
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
index a4767fb551ee3..5614a9a1bc6e1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
@@ -64,9 +64,17 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         afterAll(function (done) {
             tplElement.remove();
             registry.remove(component.integrationName);
+
             done();
         });
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
index d71f517b5e7f9..8fdef2cbaadbb 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
@@ -19,7 +19,12 @@ define([
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable(),
                     paymentMethod: ko.observable(),
-                    totals: ko.observable({})
+                    totals: ko.observable({}),
+
+                    /** Stub */
+                    isVirtual: function () {
+                        return false;
+                    }
                 },
                 'Magento_Braintree/js/view/payment/validator-handler': jasmine.createSpyObj(
                     'validator-handler',
@@ -27,7 +32,7 @@ define([
                 ),
                 'Magento_Braintree/js/view/payment/adapter':  jasmine.createSpyObj(
                     'adapter',
-                    ['setup', 'setConfig']
+                    ['setup', 'setConfig', 'showError']
                 )
             },
             braintreeCcForm;
@@ -43,14 +48,24 @@ define([
             };
             injector.mock(mocks);
             injector.require(['Magento_Braintree/js/view/payment/method-renderer/cc-form'], function (Constr) {
-                    braintreeCcForm = new Constr({
-                        provider: 'provName',
-                        name: 'test',
-                        index: 'test'
-                    });
-
-                    done();
+                braintreeCcForm = new Constr({
+                    provider: 'provName',
+                    name: 'test',
+                    index: 'test',
+                    item: {
+                        title: 'Braintree'
+                    }
                 });
+
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
         });
 
         it('Check if payment code and message container are restored after onActiveChange call.', function () {
@@ -65,5 +80,21 @@ define([
             expect(braintreeCcForm.getCode()).toEqual(expectedCode);
             expect(braintreeCcForm.messageContainer).toEqual(expectedMessageContainer);
         });
+
+        it('Check if form validation fails when "Place Order" button should be active.', function () {
+            var errorMessage = 'Something went wrong.',
+
+                /**
+                 * Anonymous wrapper
+                 */
+                func = function () {
+                    braintreeCcForm.clientConfig.onError({
+                        'message': errorMessage
+                    });
+                };
+
+            expect(func).toThrow(errorMessage);
+            expect(braintreeCcForm.isPlaceOrderActionAllowed()).toBeTruthy();
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
index a9987f5e01ba8..4fc73caf7e14b 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
@@ -24,10 +24,32 @@ define([
                     paymentMethod: ko.observable(),
                     totals: ko.observable({
                         'base_grand_total': 0
-                    })
+                    }),
+
+                    /** Stub */
+                    isVirtual: function () {
+                        return false;
+                    }
                 },
                 'Magento_Braintree/js/view/payment/adapter': {
+                    config: {},
+
+                    /** Stub */
+                    onReady: function () {},
+
+                    /** Stub */
+                    setConfig: function (config) {
+                        this.config = config;
+                    },
+
+                    /** Stub */
+                    setup: function () {
+                        this.config.onReady(this.checkout);
+                    },
+
                     checkout: {
+                        /** Stub */
+                        teardown: function () {},
                         paypal: {
                             /** Stub */
                             initAuthFlow: function () {}
@@ -64,6 +86,13 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('The PayPal::initAuthFlow throws an exception.', function () {
 
             spyOn(additionalValidator, 'validate').and.returnValue(true);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js
index 88c28961d97e1..06206efa2bb3c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js
@@ -56,7 +56,6 @@ define(['Magento_Bundle/js/components/bundle-checkbox', 'uiRegistry'], function
                 unit.changeType('select');
 
                 expect(unit.prefer).toBe('radio');
-                expect(unit.clearValues).toHaveBeenCalled();
             });
         });
     });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/dynamic-rows-import-custom-options.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/dynamic-rows-import-custom-options.test.js
index c0d88f2f04ea1..3e904cd63821c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/dynamic-rows-import-custom-options.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/dynamic-rows-import-custom-options.test.js
@@ -55,7 +55,7 @@ define([
         describe('Check processingInsertData', function () {
             it('Check with empty data.', function () {
                 model.processingInsertData();
-                expect(model.cacheGridData).toEqual([]);
+                expect(JSON.parse(JSON.stringify(model.cacheGridData))).toEqual([]);
                 expect(model.insertData).not.toHaveBeenCalled();
             });
 
@@ -64,21 +64,21 @@ define([
                     'options': []
                 }];
                 model.processingInsertData(data);
-                expect(model.cacheGridData).toEqual([]);
+                expect(JSON.parse(JSON.stringify(model.cacheGridData))).toEqual([]);
                 expect(model.insertData).not.toHaveBeenCalled();
             });
 
             it('Check with fake imported custom options data.', function () {
                 model.processingInsertData(data);
                 expect(model.insertData).toHaveBeenCalled();
-                expect(model.cacheGridData[0]).toEqual({
+                expect(JSON.parse(JSON.stringify(model.cacheGridData[0]))).toEqual({
                     'option_type_id': 1,
                     'position': 1,
                     'values': [{
                         'some_fake_value': 1
                     }]
                 });
-                expect(model.cacheGridData[1]).toEqual({
+                expect(JSON.parse(JSON.stringify(model.cacheGridData[1]))).toEqual({
                     'option_type_id': 2,
                     'position': 2,
                     'values': [{}]
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/product-ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/product-ui-select.test.js
new file mode 100644
index 0000000000000..a89ddf62f829f
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/product-ui-select.test.js
@@ -0,0 +1,85 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*eslint max-nested-callbacks: 0*/
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Catalog/js/components/product-ui-select',
+    'ko',
+    'jquery'
+], function (_, registry, Constr, ko, $) {
+    'use strict';
+
+    describe('Magento_Catalog/js/components/product-ui-select', function () {
+        var obj,
+            originaljQueryAjax;
+
+        beforeEach(function () {
+            originaljQueryAjax = $.ajax;
+
+            obj = new Constr({
+                name: 'productUiSelect',
+                dataScope: '',
+                provider: 'provider',
+                options: [],
+                value: ''
+            });
+        });
+
+        afterEach(function () {
+            $.ajax = originaljQueryAjax;
+        });
+
+        describe('"validateInitialValue" method', function () {
+            it('Should be defined', function () {
+                expect(obj.hasOwnProperty('validateInitialValue')).toBeDefined();
+            });
+
+            it('Should call not call ajax if value is empty', function () {
+                $.ajax = jasmine.createSpy();
+
+                spyOn(obj, 'validationLoading');
+                spyOn(obj, 'value').and.returnValue('');
+
+                expect(obj.validateInitialValue()).toBeUndefined();
+
+                expect($.ajax).not.toHaveBeenCalled();
+                expect(obj.validationLoading).toHaveBeenCalledWith(false);
+            });
+
+            it('Should call ajax if value is not empty', function () {
+                var successCallback,
+                    completeCallback,
+                    responseData = {
+                    label: 'hello world',
+                    value: 'hello world'
+                };
+
+                $.ajax = jasmine.createSpy().and.callFake(function (request) {
+                    successCallback = request.success.bind(obj);
+                    completeCallback = request.complete.bind(obj);
+                });
+
+                spyOn(obj, 'validationLoading');
+                spyOn(obj, 'value').and.returnValue('hello world');
+                spyOn(obj, 'options');
+                spyOn(obj, 'setCaption');
+
+                expect(obj.validateInitialValue()).toBeUndefined();
+
+                successCallback(responseData);
+                completeCallback();
+
+                expect($.ajax).toHaveBeenCalled();
+
+                expect(obj.validationLoading).toHaveBeenCalledWith(false);
+                expect(obj.loadedOption).toBe(responseData);
+                expect(obj.options).toHaveBeenCalledWith([responseData]);
+
+                expect(obj.setCaption).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js
new file mode 100644
index 0000000000000..f3e53673a4e59
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js
@@ -0,0 +1,141 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define([
+    'underscore',
+    'Magento_Catalog/js/components/use-parent-settings/select',
+    'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin'
+], function (_, select, mixin) {
+    'use strict';
+
+    var CustomInput = mixin(select),
+        defaultProperties = {
+            name: 'uiSelect',
+            dataScope: '',
+            provider: 'provider',
+            service: true
+        },
+        obj;
+
+    describe('toggle-disabled-mixin structure tests', function () {
+        var defaultContext = require.s.contexts._;
+
+        obj = new CustomInput(defaultProperties);
+
+        it('mixin is present in RequireJs config', function () {
+            var requireJsConfig = defaultContext.config
+                .config.mixins['Magento_Catalog/js/components/use-parent-settings/select'];
+
+            expect(
+                requireJsConfig['Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin']
+            ).toBe(true);
+        });
+
+        it('Check for useParent property', function () {
+            expect(obj.hasOwnProperty('useParent')).toBeTruthy();
+            expect(typeof obj.useParent).toEqual('boolean');
+            expect(obj.useParent).toEqual(false);
+        });
+
+        it('Check for useDefaults property', function () {
+            expect(obj.hasOwnProperty('useDefaults')).toBeTruthy();
+            expect(typeof obj.useDefaults).toEqual('boolean');
+            expect(obj.useDefaults).toEqual(false);
+        });
+
+        it('Check for toggleDisabled method', function () {
+            expect(obj.toggleDisabled).toBeDefined();
+            expect(typeof obj.toggleDisabled).toEqual('function');
+        });
+
+        it('Check for saveUseDefaults method', function () {
+            expect(obj.saveUseDefaults).toBeDefined();
+            expect(typeof obj.saveUseDefaults).toEqual('function');
+        });
+
+        it('Check for setInitialValue method', function () {
+            expect(obj.setInitialValue).toBeDefined();
+            expect(typeof obj.setInitialValue).toEqual('function');
+        });
+
+        it('Check for toggleUseDefault method', function () {
+            expect(obj.toggleUseDefault).toBeDefined();
+            expect(typeof obj.toggleUseDefault).toEqual('function');
+        });
+    });
+
+    describe('toggle-disabled-mixin functionality', function () {
+        var dataProvider = [
+                {
+                    defaults: {
+                        useParent: false,
+                        useDefaults: false
+                    },
+                    expected: {
+                        disabled: false
+                    }
+                },
+                {
+                    defaults: {
+                        useParent: true,
+                        useDefaults: false
+                    },
+                    expected: {
+                        disabled: true
+                    }
+                },
+                {
+                    defaults: {
+                        useParent: false,
+                        useDefaults: true
+                    },
+                    expected: {
+                        disabled: true
+                    }
+                },
+                {
+                    defaults: {
+                        useParent: true,
+                        useDefaults: true
+                    },
+                    expected: {
+                        disabled: true
+                    }
+                }
+            ];
+
+        dataProvider.forEach(function (state) {
+            describe(JSON.stringify(state.defaults), function () {
+
+                beforeEach(function () {
+                    obj = new CustomInput(
+                        _.extend(defaultProperties, state.defaults)
+                    );
+                });
+
+                it('Check disabled state', function () {
+                    expect(obj.disabled()).toEqual(state.expected.disabled);
+                });
+
+                it('Check checked state', function () {
+                    expect(obj.isUseDefault()).toEqual(state.defaults.useDefaults);
+                });
+
+                it('Check of using parent settings', function () {
+                    obj.toggleDisabled(true);
+                    expect(obj.isUseDefault()).toEqual(state.defaults.useDefaults);
+                    expect(obj.disabled()).toEqual(true);
+                });
+
+                it('Check of using self settings', function () {
+                    obj.toggleDisabled(false);
+                    expect(obj.isUseDefault()).toEqual(state.defaults.useDefaults);
+                    expect(obj.disabled()).toEqual(obj.isUseDefault());
+                });
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
index 1e3e066998d09..13b68aa4d9ea7 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
@@ -28,6 +28,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/list/columns/final-price', function () {
         describe('"getPrice" method', function () {
             it('Check returned value', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
index 90ca32fcf8c23..776677ea04f11 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
@@ -37,6 +37,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/list/columns/image', function () {
         var image = {
             url: 'url',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
new file mode 100644
index 0000000000000..2d8f145bce1da
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
@@ -0,0 +1,278 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire',
+    'jquery',
+    'jquery/ui'
+], function (Squire, $) {
+    'use strict';
+
+    var injector = new Squire(),
+        widget,
+        menuContainer,
+        mocks = {
+            'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['push'])
+        },
+        defaultContext = require.s.contexts._,
+        menuItem = $(
+            '<li class="level0 category-item">' +
+            '<a href="http://localhost.com/cat1.html">Cat1</a>' +
+            '</li>'
+        )[0],
+
+        /**
+         * Create context object.
+         *
+         * @param {Object} prototype
+         * @param {*} options
+         * @return {Object}
+         */
+        createContext = function (prototype, options) {
+            options = options || {};
+
+            return $.extend(Object.create(prototype), options);
+        };
+
+    beforeAll(function (done) {
+
+        injector.mock(mocks);
+        injector.require(
+            [
+                'Magento_Catalog/js/product/breadcrumbs',
+                'Magento_Theme/js/view/breadcrumbs',
+                'jquery/ui'
+            ], function (mixin, breadcrumb) {
+                widget = mixin(breadcrumb);
+                done();
+            }
+        );
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
+    describe('Magento_Catalog/js/product/breadcrumbs', function () {
+        it('mixin is applied to Magento_Theme/js/view/breadcrumbs', function () {
+            var breadcrumbMixins = defaultContext.config.config.mixins['Magento_Theme/js/view/breadcrumbs'];
+
+            expect(breadcrumbMixins['Magento_Catalog/js/product/breadcrumbs']).toBe(true);
+        });
+
+        describe('Check Magento_Catalog/js/product/breadcrumbs methods', function () {
+            beforeEach(function () {
+                menuContainer = $('<nav data-action="navigation"><ul></ul></nav>');
+                $('body').append(menuContainer);
+            });
+
+            afterEach(function () {
+                menuContainer.remove();
+            });
+
+            it('Check _appendCatalogCrumbs call', function () {
+                var categoryCrumb = {
+                        'name': 'category100',
+                        'link': window.location.href,
+                        'title': 'Test'
+                    },
+                    context = {
+                        options: {
+                            product: 'simple'
+                        }
+                    },
+                    appendCatalogCrumbsHandler;
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._appendCatalogCrumbs).toBeDefined();
+
+                $('[data-action="navigation"] > ul').html(menuItem);
+
+                spyOn(widget.prototype, '_resolveCategoryCrumbs').and.returnValues([], [categoryCrumb]);
+                spyOn(widget.prototype, '_getProductCrumb');
+                spyOn(widget.prototype.options, 'product').and.returnValue('simple');
+
+                context = createContext(widget.prototype, context);
+                appendCatalogCrumbsHandler = widget.prototype._appendCatalogCrumbs.bind(context);
+                appendCatalogCrumbsHandler();
+
+                expect(widget.prototype._resolveCategoryCrumbs).toHaveBeenCalled();
+                expect(mocks['Magento_Theme/js/model/breadcrumb-list'].push).toHaveBeenCalled();
+                expect(mocks['Magento_Theme/js/model/breadcrumb-list'].push.calls.count()).toBe(1);
+                mocks['Magento_Theme/js/model/breadcrumb-list'].push.calls.reset();
+
+                appendCatalogCrumbsHandler();
+
+                expect(widget.prototype._resolveCategoryCrumbs).toHaveBeenCalled();
+                expect(mocks['Magento_Theme/js/model/breadcrumb-list'].push).toHaveBeenCalledWith(categoryCrumb);
+                expect(mocks['Magento_Theme/js/model/breadcrumb-list'].push.calls.count()).toBe(2);
+            });
+
+            it('Check _getCategoryCrumb call', function () {
+                var item = $('<a href="http://localhost.com/cat1.html">Cat1</a>');
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._getCategoryCrumb).toBeDefined();
+                expect(widget.prototype._getCategoryCrumb(item)).toEqual(jasmine.objectContaining(
+                    {
+                        'name': 'category',
+                        'label': 'Cat1',
+                        'link': 'http://localhost.com/cat1.html'
+                    }
+                ));
+            });
+
+            it('Check _getProductCrumb call', function () {
+                var context = {
+                        options: {
+                            product: 'simple'
+                        }
+                    },
+                    getProductCrumbHandler;
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._getProductCrumb).toBeDefined();
+
+                getProductCrumbHandler = widget.prototype._getProductCrumb.bind(context);
+
+                expect(getProductCrumbHandler()).toEqual(jasmine.objectContaining(
+                    {
+                        'name': 'product',
+                        'label': 'simple'
+                    }
+                ));
+            });
+
+            it('Check _resolveCategoryMenuItem call with empty navigation menu', function () {
+                var resolveCategoryMenuHandler,
+                    context;
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._resolveCategoryMenuItem).toBeDefined();
+
+                context = createContext(widget.prototype);
+                resolveCategoryMenuHandler = widget.prototype._resolveCategoryMenuItem.bind(context);
+
+                spyOn(widget.prototype, '_resolveCategoryUrl').and.returnValue('');
+
+                expect(resolveCategoryMenuHandler()).toBeNull();
+            });
+
+            it('Check _resolveCategoryMenuItem call with non-empty navigation menu', function () {
+                var result,
+                    context,
+                    resolveCategoryMenuHandler;
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._resolveCategoryMenuItem).toBeDefined();
+
+                $('[data-action="navigation"] > ul').html(menuItem);
+
+                spyOn(widget.prototype, '_resolveCategoryUrl').and.returnValue('http://localhost.com/cat1.html');
+
+                context = createContext(widget.prototype);
+                resolveCategoryMenuHandler = widget.prototype._resolveCategoryMenuItem.bind(context);
+                result = resolveCategoryMenuHandler();
+
+                expect(result).not.toBeNull();
+                expect(result.length).toBe(1);
+                expect(result[0].tagName.toLowerCase()).toEqual('a');
+                expect(result[0].href).toEqual('http://localhost.com/cat1.html');
+            });
+
+            it('Check _resolveCategoryCrumbs call with empty navigation menu', function () {
+                var result,
+                    context,
+                    resolveCategoryCrumbsHandler;
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._resolveCategoryCrumbs).toBeDefined();
+
+                spyOn(widget.prototype, '_resolveCategoryUrl').and.returnValue('');
+
+                context = createContext(widget.prototype);
+                resolveCategoryCrumbsHandler = widget.prototype._resolveCategoryCrumbs.bind(context);
+                result = resolveCategoryCrumbsHandler();
+
+                expect(result).toEqual(jasmine.any(Array));
+                expect(result).toEqual([]);
+            });
+
+            it('Check _resolveCategoryCrumbs call with non-empty navigation menu', function () {
+                var result,
+                    context,
+                    resolveCategoryCrumbsHandler;
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._resolveCategoryCrumbs).toBeDefined();
+
+                $('[data-action="navigation"] > ul').html(menuItem);
+
+                spyOn(widget.prototype, '_resolveCategoryUrl').and.returnValue('http://localhost.com/cat1.html');
+
+                context = createContext(widget.prototype);
+                resolveCategoryCrumbsHandler = widget.prototype._resolveCategoryCrumbs.bind(context);
+                result = resolveCategoryCrumbsHandler();
+
+                expect(result).not.toBeNull();
+                expect(result).toEqual(jasmine.any(Array));
+                expect(result.length).toBe(1);
+                expect(result[0]).toEqual(jasmine.objectContaining(
+                    {
+                        'name': 'category',
+                        'label': 'Cat1',
+                        'link': 'http://localhost.com/cat1.html'
+                    }
+                ));
+            });
+
+            it('Check _getParentMenuItem call', function () {
+                var result,
+                    menuItems = $(
+                        '<li class="level0 nav-1">' +
+                            '<a href="http://localhost.com/cat1.html">cat1</a>' +
+                            '<ul>' +
+                                '<li class="level1 nav-1-1">' +
+                                    '<a href="http://localhost.com/cat1/cat21.html">cat21</a>' +
+                                '</li>' +
+                            '</ul>' +
+                        '</li>'
+                    ),
+                    context,
+                    getParentMenuHandler;
+
+                $('[data-action="navigation"] > ul').html(menuItems);
+
+                expect(widget).toBeDefined();
+                expect(widget).toEqual(jasmine.any(Function));
+                expect(widget.prototype._getParentMenuItem).toBeDefined();
+
+                context = createContext(widget.prototype);
+                getParentMenuHandler = widget.prototype._getParentMenuItem.bind(context);
+                result = getParentMenuHandler($('[href="http://localhost.com/cat1/cat21.html"]'));
+
+                expect(result).toBeDefined();
+                expect(result.length).toBe(1);
+                expect(result[0].tagName.toLowerCase()).toEqual('a');
+                expect(result.attr('href')).toEqual('http://localhost.com/cat1.html');
+
+                result = getParentMenuHandler($('[href="http://localhost.com/cat1.html"]'));
+
+                expect(result).toBeNull();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js
new file mode 100644
index 0000000000000..3b64385a8894b
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js
@@ -0,0 +1,84 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_Catalog/js/product/remaining-characters',
+    'jquery'
+], function (remainingCharacters, $) {
+    'use strict';
+
+    describe('Magento_Catalog/js/product/remaining-characters', function () {
+        var widget,
+            note;
+
+        beforeEach(function () {
+            widget = $('<input type="text" data-selector="options[1]"/>');
+            note = $('<p class="note note_1"><span class="character-counter"></span></p>');
+            $('body').append(widget).append(note);
+
+            widget.remainingCharacters({
+                maxLength: '10',
+                noteSelector: '.note_1',
+                counterSelector: '.note_1 .character-counter'
+            });
+        });
+
+        afterEach(function () {
+            widget.remove();
+            note.remove();
+        });
+
+        describe('Note text is updated on input change', function () {
+            it('check empty input', function () {
+                var testData = {
+                    input: '',
+                    action: 'change',
+                    expectedText: '(10 remaining)'
+                };
+
+                widget.val(testData.input);
+                widget.trigger(testData.action);
+                expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+            });
+
+            it('check input length less than character limit', function () {
+                var testData = {
+                    input: 'abc',
+                    action: 'change',
+                    expectedText: '(7 remaining)'
+                };
+
+                widget.val(testData.input);
+                widget.trigger(testData.action);
+                expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+            });
+
+            it('check input length equals character limit', function () {
+                var testData = {
+                    input: 'abcdefghij',
+                    action: 'paste',
+                    expectedText: '(0 remaining)'
+                };
+
+                widget.val(testData.input);
+                widget.trigger(testData.action);
+                expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+            });
+
+            it('check input length greater than character limit', function () {
+                var testData = {
+                    input: 'abcdefghijkl',
+                    action: 'change',
+                    expectedText: '(2 too many)'
+                };
+
+                widget.val(testData.input);
+                widget.trigger(testData.action);
+                expect(note.find('.character-counter').text()).toBe(testData.expectedText);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
index 2ecfe41f29c13..0ab6b5fdf2b99 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
@@ -44,6 +44,14 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+        window.localStorage.clear();
+    });
+
     describe('Magento_Catalog/js/product/storage/data-storage', function () {
         describe('"initCustomerDataInvalidateListener" method', function () {
             it('check returned value', function () {
@@ -81,18 +89,20 @@ define([
                 };
             });
 
+            afterEach(function () {
+                window.localStorage.clear();
+            });
+
             it('check calls "dataHandler" method with data', function () {
                 var data = {
                     property: 'value'
                 };
 
                 obj.dataHandler(data);
-                expect(obj.localStorage.set).toHaveBeenCalledWith(data);
-                expect(obj.localStorage.removeAll).not.toHaveBeenCalled();
+                expect(window.localStorage.getItem(obj.namespace)).toBe(JSON.stringify(data));
             });
             it('check calls "dataHandler" method with empty data', function () {
                 obj.dataHandler({});
-                expect(obj.localStorage.set).not.toHaveBeenCalled();
                 expect(obj.localStorage.removeAll).toHaveBeenCalled();
             });
         });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
index da162a2e9cf4f..aa68c498e0fea 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
@@ -28,6 +28,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/storage/ids-storage-compare', function () {
         describe('"providerDataHandler" method', function () {
             it('check calls "prepareData" and "add" method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
index e4d3bd62a862d..624b159163bcb 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
@@ -22,6 +22,14 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+        window.localStorage.clear();
+    });
+
     describe('Magento_Catalog/js/product/storage/ids-storage', function () {
         describe('"getDataFromLocalStorage" method', function () {
             it('check calls localStorage get method', function () {
@@ -33,13 +41,6 @@ define([
                 expect(obj.localStorage.get).toHaveBeenCalled();
             });
         });
-        describe('"cachesDataFromLocalStorage" method', function () {
-            it('check calls localStorage get method', function () {
-                obj.getDataFromLocalStorage = jasmine.createSpy().and.returnValue({});
-
-                expect(obj.localStorage.get).toHaveBeenCalled();
-            });
-        });
         describe('"initLocalStorage" method', function () {
             it('check returned value', function () {
                 obj.namespace = 'test';
@@ -73,17 +74,16 @@ define([
             it('check calls with data that equal with data in localStorage', function () {
                 obj.internalDataHandler(data);
 
-                expect(obj.localStorage.get).toHaveBeenCalled();
-                expect(obj.localStorage.set).not.toHaveBeenCalled();
+                expect(window.localStorage.getItem(obj.namespace)).toBe(JSON.stringify(data));
             });
 
             it('check calls with data that not equal with data in localStorage', function () {
                 var emptyData = {};
 
+                obj.internalDataHandler(data);
                 obj.internalDataHandler(emptyData);
 
-                expect(obj.localStorage.get).toHaveBeenCalled();
-                expect(obj.localStorage.set).toHaveBeenCalledWith(emptyData);
+                expect(window.localStorage.getItem(obj.namespace)).toBe(JSON.stringify(emptyData));
             });
         });
         describe('"externalDataHandler" method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
index 5530666c7ed70..1a3a5726080bc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
@@ -12,21 +12,17 @@ define([
 
     var injector = new Squire(),
         mocks = {
-            'Magento_Catalog/js/product/storage/ids-storage': {
-                name: 'IdsStorage',
-                initialize: jasmine.createSpy().and.returnValue({})
-            },
             'Magento_Catalog/js/product/storage/data-storage': {},
             'Magento_Catalog/js/product/storage/ids-storage-compare': {}
         },
-        obj;
+        obj,
+        utils;
 
-    beforeEach(function (done) {
-        injector.mock(mocks);
-        injector.require(['Magento_Catalog/js/product/storage/storage-service'], function (insance) {
-            obj = insance;
-            done();
-        });
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
     });
 
     describe('Magento_Catalog/js/product/storage/storage-service', function () {
@@ -36,6 +32,19 @@ define([
             },
             storage;
 
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Catalog/js/product/storage/ids-storage',
+                'Magento_Catalog/js/product/storage/storage-service',
+                'mageUtils'
+            ], function (IdsStorage, instance, mageUtils) {
+                obj = instance;
+                utils = mageUtils;
+                done();
+            });
+        });
+
         describe('"createStorage" method', function () {
             it('create new storage', function () {
                 obj.processSubscribers = jasmine.createSpy();
@@ -66,5 +75,54 @@ define([
                 expect(typeof obj.getStorage(config.namespace)).toBe('object');
             });
         });
+        describe('"add" method', function () {
+            var storageValue;
+
+            beforeEach(function () {
+                storage = new obj.createStorage(config);
+                storageValue = {
+                    'property1': 1
+                };
+
+                storage.set(storageValue);
+            });
+
+            it('method exists', function () {
+                expect(storage.add).toBeDefined();
+                expect(typeof storage.add).toEqual('function');
+            });
+
+            it('update value', function () {
+                spyOn(utils, 'copy').and.callThrough();
+                expect(storage.get()).toEqual(storageValue);
+
+                storageValue = {
+                    'property2': 2
+                };
+
+                storage.add(storageValue);
+
+                expect(utils.copy).toHaveBeenCalled();
+                expect(storage.get()).toEqual(
+                    {
+                        'property1': 1,
+                        'property2': 2
+                    }
+                );
+            });
+
+            it('add empty value', function () {
+                spyOn(utils, 'copy').and.callThrough();
+
+                storage.add({});
+
+                expect(utils.copy).not.toHaveBeenCalled();
+                expect(storage.get()).toEqual(
+                    {
+                        'property1': 1
+                    }
+                );
+            });
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js
new file mode 100644
index 0000000000000..be92b6814da3b
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire',
+    'jquery',
+    'ko',
+    'jquery/ui'
+], function (Squire, $, ko) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Catalog/js/product/view/product-ids': ko.observableArray([])
+        },
+        form = $(
+            '<form>' +
+            '<input type="hidden" name="product" value="1">' +
+            '</form>'
+        ),
+        productIdResolver;
+
+    beforeAll(function (done) {
+
+        injector.mock(mocks);
+        injector.require(
+            [
+                'Magento_Catalog/js/product/view/product-ids-resolver'
+            ], function (resolver) {
+                productIdResolver = resolver;
+                done();
+            }
+        );
+    });
+
+    describe('Magento_Catalog/js/product/view/product-ids-resolver', function () {
+        var dataProvider = [
+            {
+                ids: [],
+                expected: ['1']
+            },
+            {
+                ids: ['2', '3'],
+                expected: ['2', '3', '1']
+            },
+            {
+                ids: ['3', '1', '5'],
+                expected: ['3', '1', '5']
+            }
+        ];
+
+        dataProvider.forEach(function (data) {
+            it('resolved product id\'s', function () {
+                mocks['Magento_Catalog/js/product/view/product-ids'](data.ids);
+                expect(productIdResolver(form)).toEqual(data.expected);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
index 4514684edf116..571113f481bf3 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
@@ -36,6 +36,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/storage-manager', function () {
         describe('"initStorages" method', function () {
             beforeEach(function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
index 8961d99170dcd..4b053b4322dea 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
@@ -27,6 +27,13 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('Checks if loader is called before redirect to success page.', function () {
             spyOn(window.location, 'replace').and.returnValue(false);
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js
index c796bd4f9f2ec..7f905a91048fa 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js
@@ -30,6 +30,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/model/cart/cache', function () {
         describe('Check the "get" method', function () {
             it('Check default call with "cart-data" key', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
index 216ad28cf496a..ce9c98c9d2560 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
@@ -65,6 +65,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/model/cart/estimate-service', function () {
 
         it('test subscribe when billingAddress was changed for  virtual quote', function () {
@@ -143,5 +150,12 @@ define([
             });
             expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals).toHaveBeenCalled();
         });
+
+        it('test subscribe when cart data was changed', function () {
+            mocks['Magento_Customer/js/customer-data'].get('cart')({
+                dataId: 2
+            });
+            expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals).toHaveBeenCalled();
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
index 44f06279dcbef..184118f1d02ec 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
@@ -89,6 +89,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/model/cart/totals-processor/default', function () {
 
         it('estimateTotals if data was cached', function () {
@@ -106,6 +113,8 @@ define([
         });
 
         it('estimateTotals if data wasn\'t cached and request was successfully sent', function () {
+            var deferral = new $.Deferred();
+
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(true);
             spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
                 ko.observable({
@@ -117,9 +126,9 @@ define([
                 data.shippingMethodCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['method_code'];
                 data.shippingCarrierCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['carrier_code'];
 
-                return new $.Deferred().resolve(result);
+                return deferral.resolve(result);
             });
-            expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
+            expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
             expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(totals);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
@@ -129,6 +138,8 @@ define([
         });
 
         it('estimateTotals if data wasn\'t cached and request returns error', function () {
+            var deferral = new $.Deferred();
+
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(true);
             spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
                 ko.observable({
@@ -137,9 +148,9 @@ define([
             );
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'get');
             spyOn(mocks['mage/storage'], 'post').and.callFake(function () {
-                return new $.Deferred().reject('Error Message');
+                return deferral.reject('Error Message');
             });
-            expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
+            expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
             expect(mocks['mage/storage'].post).toHaveBeenCalled();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js
new file mode 100644
index 0000000000000..772250eb7c66a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js
@@ -0,0 +1,72 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento_Checkout/js/model/error-processor', function () {
+        var injector = new Squire(),
+            mocks = {
+                'mage/url': {
+                    /** Method stub. */
+                    build: jasmine.createSpy()
+                },
+                'Magento_Ui/js/model/messageList': jasmine.createSpy('globalList')
+            },
+            model;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Checkout/js/model/error-processor'
+            ], function (processor) {
+                model = processor;
+
+                done();
+            });
+        });
+
+        describe('Check process method', function () {
+            it('check on success response with valid response data', function () {
+                var messageObject = {
+                        message: 'Valid error message!'
+                    },
+                    messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
+
+                model.process({
+                    status: 200,
+                    responseText: JSON.stringify(messageObject)
+                }, messageContainer);
+                expect(messageContainer.addErrorMessage).toHaveBeenCalledWith(messageObject);
+            });
+
+            it('check on success response with invalid response data', function () {
+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
+
+                model.process({
+                    status: 200,
+                    responseText: ''
+                }, messageContainer);
+                expect(messageContainer.addErrorMessage)
+                    .toHaveBeenCalledWith('Something went wrong with your request. Please try again later.');
+            });
+
+            it('check on failed status', function () {
+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
+
+                spyOn(window.location, 'replace').and.callFake(function () {});
+                model.process({
+                    status: 401,
+                    responseText: ''
+                }, messageContainer);
+                expect(mocks['mage/url'].build)
+                    .toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js
new file mode 100644
index 0000000000000..7c21a8aae2f26
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+/*jscs:disable jsDoc*/
+
+define([
+    'squire',
+    'jquery',
+    'ko'
+], function (Squire, $, ko) {
+    'use strict';
+
+    describe('Magento_Checkout/js/sidebar', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Customer/js/customer-data': {
+                    get: function () {
+                        return ko.observable();
+                    }
+                }
+            },
+            sidebar,
+            cartData = {
+                'items': [
+                    {
+                        'item_id': 1,
+                        'product_sku': 'bundle',
+                        'product_id': '1'
+                    },
+                    {
+                        'item_id': 5,
+                        'product_sku': 'simple',
+                        'product_id': '5'
+                    },
+                    {
+                        'item_id': 7,
+                        'product_sku': 'configurable',
+                        'product_id': '7'
+                    }
+                ]
+            },
+            cart = ko.observable(cartData);
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require(['Magento_Checkout/js/sidebar'], function (Constr) {
+                sidebar = new Constr;
+                done();
+            });
+        });
+
+        describe('Check remove mini-cart item callback.', function () {
+            beforeEach(function () {
+                spyOn(jQuery.fn, 'trigger');
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(cart);
+            });
+
+            it('Method "_removeItemAfter" is defined', function () {
+                expect(sidebar._removeItemAfter).toBeDefined();
+            });
+
+            it('Cart item is exists', function () {
+                var elem = $('<input>').data('cart-item', 5);
+
+                sidebar._removeItemAfter(elem);
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', {
+                    'productIds': ['5']
+                });
+            });
+
+            it('Cart item doesn\'t exists', function () {
+                var elem = $('<input>').data('cart-item', 100);
+
+                sidebar._removeItemAfter(elem);
+                expect(jQuery('body').trigger).not.toHaveBeenCalled();
+            });
+        });
+
+        describe('Check update item quantity callback.', function () {
+            beforeEach(function () {
+                spyOn(jQuery.fn, 'trigger');
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(cart);
+            });
+
+            it('Method "_updateItemQtyAfter" is defined', function () {
+                expect(sidebar._updateItemQtyAfter).toBeDefined();
+            });
+
+            it('Cart item is exists', function () {
+                var elem = $('<input>').data('cart-item', 5);
+
+                spyOn(sidebar, '_hideItemButton');
+
+                sidebar._updateItemQtyAfter(elem);
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty');
+                expect(sidebar._hideItemButton).toHaveBeenCalledWith(elem);
+            });
+
+            it('Cart item doesn\'t exists', function () {
+                var elem = $('<input>').data('cart-item', 100);
+
+                spyOn(sidebar, '_hideItemButton');
+
+                sidebar._updateItemQtyAfter(elem);
+                expect(jQuery('body').trigger).not.toHaveBeenCalled();
+                expect(sidebar._hideItemButton).toHaveBeenCalledWith(elem);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js
index 5e6dbfa5c0372..c1853d228c104 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js
@@ -53,6 +53,13 @@ define(['squire', 'ko'], function (Squire, ko) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/cart/shipping-estimation', function () {
         describe('"initElement" method', function () {
             it('Check for return value and element that initiated.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js
index 570de61052309..4f3949bd8124e 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js
@@ -41,6 +41,13 @@ define(['squire'], function (Squire) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/minicart', function () {
         describe('"getCartItems" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
index be27e16a13786..9b9b1ce5b1614 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
@@ -12,7 +12,7 @@ require.config({
     }
 });
 
-define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
+define(['squire', 'ko', 'jquery', 'uiRegistry', 'jquery/validate'], function (Squire, ko, $, registry) {
     'use strict';
 
     var injector = new Squire(),
@@ -28,7 +28,17 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
             'Magento_Checkout/js/model/address-converter': jasmine.createSpy(),
             'Magento_Checkout/js/model/quote': {
                 isVirtual: jasmine.createSpy(),
-                shippingMethod: ko.observable()
+                shippingMethod: ko.observable(),
+
+                /**
+                 * Stub
+                 */
+                shippingAddress: function () {
+
+                    return {
+                        'countryId': 'AD'
+                    };
+                }
             },
             'Magento_Checkout/js/action/create-shipping-address': jasmine.createSpy().and.returnValue(
                 jasmine.createSpyObj('newShippingAddress', ['getKey'])
@@ -52,7 +62,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
                 'checkoutData',
                 ['setSelectedShippingAddress', 'setNewCustomerShippingAddress', 'setSelectedShippingRate']
             ),
-            'uiRegistry': jasmine.createSpy(),
+            'Magento_Ui/js/lib/registry/registry': registry,
             'Magento_Checkout/js/model/shipping-rate-service': jasmine.createSpy()
         },
         obj;
@@ -63,6 +73,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
             obj = new Constr({
                 provider: 'provName',
                 name: '',
+                parentName: 'test',
                 index: '',
                 popUpForm: {
                     options: {
@@ -77,6 +88,13 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/shipping', function () {
         describe('"navigate" method', function () {
             it('Check for return value.', function () {
@@ -149,12 +167,26 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
 
         describe('"setShippingInformation" method', function () {
             it('Check method call.', function () {
+                spyOn(obj, 'validateShippingInformation').and.returnValue(false);
                 expect(obj.setShippingInformation()).toBeUndefined();
             });
         });
 
         describe('"validateShippingInformation" method', function () {
             it('Check method call on negative cases.', function () {
+                var country = {
+                    'indexedOptions': {
+                        'AD':
+                            {
+                                label: 'Andorra',
+                                labeltitle: 'Andorra',
+                                value: 'AD'
+                            }
+                    }
+                };
+
+                registry.set('test.shippingAddress.shipping-address-fieldset.country_id', country);
+                registry.set('checkout.errors', {});
                 obj.source = {
                     get: jasmine.createSpy().and.returnValue(true),
                     set: jasmine.createSpy(),
@@ -162,7 +194,9 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
                 };
 
                 expect(obj.validateShippingInformation()).toBeFalsy();
-                expect(obj.errorValidationMessage()).toBe('Please specify a shipping method.');
+                expect(obj.errorValidationMessage()).toBe(
+                    'The shipping method is missing. Select the shipping method and try again.'
+                );
                 spyOn(mocks['Magento_Checkout/js/model/quote'], 'shippingMethod').and.returnValue(true);
                 spyOn(mocks['Magento_Customer/js/model/customer'], 'isLoggedIn').and.returnValue(true);
                 expect(obj.validateShippingInformation()).toBeFalsy();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js
index d1698b2fedac3..d64f07ab619ba 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js
@@ -68,6 +68,13 @@ define(['squire'], function (Squire) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/summary/cart-items', function () {
         describe('"getItemsQty" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js
index afff4660cab41..ef33d49bf11d6 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js
@@ -36,6 +36,11 @@ define(['squire', 'jquery'], function (Squire, $) {
 
     afterEach(function () {
         $('.payment-method._active').remove();
+
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
     });
 
     describe('Magento_CheckoutAgreements/js/model/agreement-validator', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
new file mode 100644
index 0000000000000..1e3cf3e0280b6
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Checkout/js/action/place-order': jasmine.createSpy('placeOrderAction'),
+            'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner')
+        },
+        defaultContext = require.s.contexts._,
+        mixin,
+        placeOrderAction;
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            checkoutAgreements: {
+                isEnabled: true
+            }
+        };
+        injector.mock(mocks);
+        injector.require([
+            'Magento_CheckoutAgreements/js/model/place-order-mixin',
+            'Magento_Checkout/js/action/place-order'
+        ], function (Mixin, placeOrder) {
+            mixin = Mixin;
+            placeOrderAction = placeOrder;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
+    describe('Magento_CheckoutAgreements/js/model/place-order-mixin', function () {
+        it('mixin is applied to Magento_Checkout/js/action/place-order', function () {
+            var placeOrderMixins = defaultContext.config.config.mixins['Magento_Checkout/js/action/place-order'];
+
+            expect(placeOrderMixins['Magento_CheckoutAgreements/js/model/place-order-mixin']).toBe(true);
+        });
+
+        it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
+            var messageContainer = jasmine.createSpy('messageContainer'),
+                paymentData = {};
+
+            mixin(placeOrderAction)(paymentData, messageContainer);
+            expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner'])
+                .toHaveBeenCalledWith(paymentData);
+            expect(mocks['Magento_Checkout/js/action/place-order'])
+                .toHaveBeenCalledWith(paymentData, messageContainer);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
new file mode 100644
index 0000000000000..8ea07b78b02c9
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
@@ -0,0 +1,63 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Checkout/js/action/set-payment-information': jasmine.createSpy('placeOrderAction'),
+            'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner')
+        },
+        defaultContext = require.s.contexts._,
+        mixin,
+        placeOrderAction;
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            checkoutAgreements: {
+                isEnabled: true
+            }
+        };
+        injector.mock(mocks);
+        injector.require([
+            'Magento_CheckoutAgreements/js/model/set-payment-information-mixin',
+            'Magento_Checkout/js/action/set-payment-information'
+        ], function (Mixin, setPaymentInformation) {
+            mixin = Mixin;
+            placeOrderAction = setPaymentInformation;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
+    describe('Magento_CheckoutAgreements/js/model/set-payment-information-mixin', function () {
+        it('mixin is applied to Magento_Checkout/js/action/set-payment-information', function () {
+            var placeOrderMixins = defaultContext
+                .config.config.mixins['Magento_Checkout/js/action/set-payment-information'];
+
+            expect(placeOrderMixins['Magento_CheckoutAgreements/js/model/set-payment-information-mixin']).toBe(true);
+        });
+
+        it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
+            var messageContainer = jasmine.createSpy('messageContainer'),
+                paymentData = {};
+
+            mixin(placeOrderAction)(messageContainer, paymentData);
+            expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner'])
+                .toHaveBeenCalledWith(paymentData);
+            expect(mocks['Magento_Checkout/js/action/set-payment-information'])
+                .toHaveBeenCalledWith(messageContainer, paymentData);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
index ed2e29f4baf16..c98c459d98819 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
@@ -117,5 +117,64 @@ define([
             expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
             expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
         });
+
+        it('checks that "unserializeData" unserializes data', function () {
+            var matrixString = '[{"name":"Small Product","attributes":"Size: small","price":5.5},' +
+                '{"name":"Medium Product","attributes":"Size: medium","price":10.99},' +
+                '{"name":"Large Product","attributes":"Size: large","price":25}]',
+            idString = '[100, 101, 102]',
+            resultMatrix = JSON.parse(matrixString),
+            resultIds = JSON.parse(idString);
+
+            variation.source.data['configurable-matrix-serialized'] = matrixString;
+            variation.source.data['associated_product_ids_serialized'] = idString;
+
+            variation.unserializeData();
+
+            expect(variation.source.data['configurable-matrix-serialized']).toBeUndefined();
+            expect(variation.source.data['associated_product_ids_serialized']).toBeUndefined();
+            expect(variation.source.data['configurable-matrix']).toEqual(resultMatrix);
+            expect(variation.source.data['associated_product_ids']).toEqual(resultIds);
+        });
+
+        it('checks that "serializeData" and "unserializeData" give proper result', function () {
+            var matrix = [
+                    {
+                        name: 'Small Product',
+                        attributes: 'Size: small',
+                        price: 5.50
+                    },
+                    {
+                        name: 'Medium Product',
+                        attributes: 'Size: medium',
+                        price: 10.99
+                    },
+                    {
+                        name: 'Large Product',
+                        attributes: 'Size: large',
+                        price: 25
+                    }
+                ],
+                ids = [1, 2, 3],
+                resultMatrix = JSON.stringify(matrix),
+                resultIds = JSON.stringify(ids);
+
+            variation.source.data['configurable-matrix'] = matrix;
+            variation.source.data['associated_product_ids'] = ids;
+
+            variation.serializeData();
+
+            expect(variation.source.data['configurable-matrix']).toBeUndefined();
+            expect(variation.source.data['associated_product_ids']).toBeUndefined();
+            expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
+            expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
+
+            variation.unserializeData();
+
+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
+            expect(variation.source.data['configurable-matrix-serialized']).toBeUndefined();
+            expect(variation.source.data['associated_product_ids_serialized']).toBeUndefined();
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js
new file mode 100644
index 0000000000000..2ef8736b4f0b8
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/form.test.js
@@ -0,0 +1,71 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Customer/js/form/components/form',
+    'jquery'
+], function (_, registry, Constr, $) {
+    'use strict';
+
+    describe('Magento_Customer/js/form/components/form', function () {
+
+        var obj,
+            originaljQueryAjax;
+
+        beforeEach(function () {
+            originaljQueryAjax = $.ajax;
+            obj = new Constr({
+                provider: 'provName',
+                name: '',
+                index: ''
+            });
+        });
+
+        afterEach(function () {
+            $.ajax = originaljQueryAjax;
+        });
+
+        registry.set('provName', {
+            /** Stub */
+            on: function () {},
+
+            /** Stub */
+            get: function () {},
+
+            /** Stub */
+            set: function () {}
+        });
+
+        describe('"deleteAddress" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('deleteAddress')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.deleteAddress;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.deleteAddress()).toBeUndefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.deleteAddress();
+
+                expect(type).toEqual('undefined');
+            });
+            it('Should call not call ajax if arguments are empty', function () {
+                $.ajax = jasmine.createSpy();
+
+                spyOn(obj, 'deleteAddress');
+
+                expect(obj.deleteAddress()).toBeUndefined();
+
+                expect($.ajax).not.toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js
index 9067eb5d7fc71..4646eca268ec1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js
@@ -29,6 +29,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Customer/js/invalidation-processor', function () {
 
         describe('"process" method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
index 3004d0266f5af..8a8216a820dd4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
@@ -44,6 +44,13 @@ define(['squire'], function (Squire) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Customer/js/view/authentication-popup', function () {
         describe('"isActive" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
new file mode 100644
index 0000000000000..b61742b55fa2f
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
@@ -0,0 +1,107 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire',
+    'ko',
+    'jquery',
+    'mage/validation'
+], function (Squire, ko, $) {
+    'use strict';
+
+    var injector = new Squire(),
+        customerDataMock = ko.observable({}),
+        mocks = {
+            'Magento_Customer/js/customer-data': {
+                /**
+                 * Return customer data mock.
+                 * @return {*}
+                 */
+                get: function () {
+                    return customerDataMock;
+                }
+            },
+            'Magento_Ui/js/modal/confirm': jasmine.createSpy()
+        },
+        obj;
+
+    describe('Magento_InstantPurchase/js/view/instant-purchase', function () {
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require(['Magento_InstantPurchase/js/view/instant-purchase'], function (Constr) {
+                obj = Constr({
+                    index: 'purchase'
+                });
+                done();
+            });
+            $('body').append('<div id="product_addtocart_form"></div>');
+        });
+
+        afterEach(function () {
+            $('#product_addtocart_form').remove();
+
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
+        it('Check initialized data.', function () {
+            expect(obj.showButton()).toBeFalsy();
+            expect(obj.paymentToken()).toBeFalsy();
+            expect(obj.shippingAddress()).toBeFalsy();
+            expect(obj.billingAddress()).toBeFalsy();
+            expect(obj.shippingMethod()).toBeFalsy();
+        });
+
+        it('Check when customer data exists.', function () {
+            var dataStub = {
+                available: true,
+                paymentToken: 'paymentToken',
+                shippingAddress: 'shippingAddress',
+                billingAddress: 'billingAddress',
+                shippingMethod: 'shippingMethod'
+            };
+
+            customerDataMock(dataStub);
+
+            expect(obj.showButton()).toBe(dataStub.available);
+            expect(obj.paymentToken()).toBe(dataStub.paymentToken);
+            expect(obj.shippingAddress()).toBe(dataStub.shippingAddress);
+            expect(obj.billingAddress()).toBe(dataStub.billingAddress);
+            expect(obj.shippingMethod()).toBe(dataStub.shippingMethod);
+        });
+
+        it('Check "setPurchaseData".', function () {
+            var dataStub = {
+                available: true,
+                paymentToken: 'paymentToken',
+                shippingAddress: 'shippingAddress',
+                billingAddress: 'billingAddress',
+                shippingMethod: 'shippingMethod'
+            };
+
+            obj.setPurchaseData(dataStub);
+
+            expect(obj.showButton()).toBe(dataStub.available);
+            expect(obj.paymentToken()).toBe(dataStub.paymentToken);
+            expect(obj.shippingAddress()).toBe(dataStub.shippingAddress);
+            expect(obj.billingAddress()).toBe(dataStub.billingAddress);
+            expect(obj.shippingMethod()).toBe(dataStub.shippingMethod);
+        });
+
+        it('Check "instantPurchase" with failed validation.', function () {
+            spyOn(jQuery.fn, 'valid').and.returnValue(false);
+            expect(obj.instantPurchase()).toBeUndefined();
+            expect(mocks['Magento_Ui/js/modal/confirm']).not.toHaveBeenCalled();
+        });
+
+        it('Check "instantPurchase" with success validation.', function () {
+            spyOn(jQuery.fn, 'valid').and.returnValue(true);
+            expect(obj.instantPurchase()).toBeUndefined();
+            expect(mocks['Magento_Ui/js/modal/confirm']).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js
index 7a425e479b93b..0420256e20ef5 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js
@@ -51,6 +51,13 @@ define([
                 });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         describe('clientConfig.click method', function () {
 
             it('Check for properties defined ', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
index 8b942818168cb..395dd96822ea5 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
@@ -58,6 +58,13 @@ define([
                 });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         describe('"click" method checks', function () {
             it('check success request', function () {
                 mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
index dc520c5238568..9950c89ce3c9d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
@@ -16,13 +16,28 @@ define([
 
     describe('paypal/js/view/payment/method-renderer/paypal-express-abstract', function () {
         var injector = new Squire(),
+            successPromise = jasmine.createSpyObj('successPromise', ['done']),
+            setPaymentMock = jasmine.createSpy('set-payment-information', function () {
+                return successPromise;
+            }).and.callThrough(),
+            validateMock = jasmine.createSpy('validate', function () {
+                return true;
+            }).and.callThrough(),
             mocks = {
                 'Magento_Checkout/js/model/quote': {
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable(),
                     paymentMethod: ko.observable(),
-                    totals: ko.observable({})
+                    totals: ko.observable({}),
 
+                    /** Stub */
+                    isVirtual: function () {
+                        return false;
+                    }
+                },
+                'Magento_Checkout/js/action/set-payment-information': setPaymentMock,
+                'Magento_Checkout/js/model/payment/additional-validators': {
+                    validate: validateMock
                 }
             },
             paypalExpressAbstract,
@@ -61,6 +76,13 @@ define([
                 });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('showAcceptanceWindow is invoked when the anchor element of help link is clicked', function (done) {
             spyOn(paypalExpressAbstract, 'showAcceptanceWindow');
             setTimeout(function () {
@@ -85,6 +107,23 @@ define([
             }, 500);
         });
 
+        it('setPaymentMethodAction is called before redirect to paypal', function () {
+            spyOn(paypalExpressAbstract, 'selectPaymentMethod');
+            paypalExpressAbstract.continueToPayPal();
+            expect(paypalExpressAbstract.selectPaymentMethod).toHaveBeenCalled();
+            expect(validateMock).toHaveBeenCalled();
+            expect(validateMock.calls.mostRecent()).toEqual(jasmine.objectContaining({
+                object: mocks['Magento_Checkout/js/model/payment/additional-validators'],
+                args: [],
+                returnValue: true
+            }));
+            expect(setPaymentMock).toHaveBeenCalled();
+            expect(setPaymentMock.calls.mostRecent()).toEqual(jasmine.objectContaining({
+                returnValue: successPromise
+            }));
+            expect(successPromise.done).toHaveBeenCalledWith(jasmine.any(Function));
+        });
+
         afterAll(function (done) {
             tplElement.remove();
             done();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Review/view/frontend/web/js/process-review.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Review/view/frontend/web/js/process-review.test.js
index 78a860a6428ed..f379f4f389a53 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Review/view/frontend/web/js/process-review.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Review/view/frontend/web/js/process-review.test.js
@@ -14,24 +14,27 @@ define([
 
     describe('Test product page reviews processor', function () {
         var element,
-        config = {
-            reviewsTabSelector: '#review-tab'
-        };
+            originaljQueryAjax,
+            config = {
+                reviewsTabSelector: '#review-tab'
+            };
 
         beforeEach(function () {
             element = $('<div id="review-tab" role="tab"></div>');
 
             $('body').append(element);
+            originaljQueryAjax = $.ajax;
         });
 
         afterEach(function () {
             element.remove();
+            $.ajax = originaljQueryAjax;
         });
 
         it('Should automatically load reviews after page load if review tab is active', function () {
             element.addClass('active');
 
-            spyOn($, 'ajax').and.callFake(function () {
+            $.ajax = jasmine.createSpy().and.callFake(function () {
                 var d = $.Deferred();
 
                 d.promise().complete = function () {};
@@ -45,7 +48,7 @@ define([
         });
 
         it('Should not automatically load reviews after page load if review tab is not active', function () {
-            spyOn($, 'ajax').and.callFake(function () {
+            $.ajax = jasmine.createSpy().and.callFake(function () {
                 var d = $.Deferred();
 
                 d.promise().complete = function () {};
@@ -59,7 +62,7 @@ define([
         });
 
         it('Should load reviews if non active review tab was opened', function () {
-            spyOn($, 'ajax').and.callFake(function () {
+            $.ajax = jasmine.createSpy().and.callFake(function () {
                 var d = $.Deferred();
 
                 d.promise().complete = function () {};
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js
new file mode 100644
index 0000000000000..ec820e537789a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Rule/conditions-data-normalizer'
+], function ($, Normalizer) {
+    'use strict';
+
+    describe('Magento_Rule/conditions-data-normalizer', function () {
+        var normalizer;
+
+        beforeEach(function () {
+            normalizer = new Normalizer();
+        });
+
+        it('Check for empty object when input is a falsey value', function () {
+            expect(normalizer.normalize('')).toEqual({});
+            expect(normalizer.normalize()).toEqual({});
+            expect(normalizer.normalize(false)).toEqual({});
+            expect(normalizer.normalize(null)).toEqual({});
+            expect(normalizer.normalize(0)).toEqual({});
+        });
+
+        it('Check single level normalization.', function () {
+            var normal = normalizer.normalize({
+                foo: 'bar',
+                bar: 123
+            });
+
+            expect(normal.foo).toEqual('bar');
+            expect(normal.bar).toEqual(123);
+        });
+
+        it('Check one sub-level of normalization.', function () {
+            var normal = normalizer.normalize({
+                'foo[value]': 'bar',
+                'foo[name]': 123
+            });
+
+            expect(normal.foo.value).toEqual('bar');
+            expect(normal.foo.name).toEqual(123);
+        });
+
+        it('Check two sub-levels of normalization.', function () {
+            var normal = normalizer.normalize({
+                'foo[prefix][value]': 'bar',
+                'foo[prefix][name]': 123
+            });
+
+            expect(normal.foo.prefix.value).toEqual('bar');
+            expect(normal.foo.prefix.name).toEqual(123);
+        });
+
+        it('Check that numeric types don\'t get converted to array form.', function () {
+            var normal = normalizer.normalize({
+                'foo[1][name]': 'bar',
+                'foo[1][value]': 123,
+                'foo[1--1]': 321
+            });
+
+            expect(normal.foo['1'].name).toEqual('bar');
+            expect(normal.foo['1'].value).toEqual(123);
+            expect(normal.foo['1--1']).toEqual(321);
+        });
+
+        it('Check keys containing a dot are normalized', function () {
+            var normal = normalizer.normalize({
+                'foo[1][name.foo]': 'bar',
+                'foo[1][value.foo]': 123,
+                'foo[1--1]': 321
+            });
+
+            expect(normal.foo['1']['name.foo']).toEqual('bar');
+            expect(normal.foo['1']['value.foo']).toEqual(123);
+            expect(normal.foo['1--1']).toEqual(321);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Signifyd/frontend/js/Fingerprint.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Signifyd/frontend/js/Fingerprint.test.js
new file mode 100644
index 0000000000000..0be178c5a31f0
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Signifyd/frontend/js/Fingerprint.test.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /*eslint max-nested-callbacks: ["error", 5]*/
+    describe('Signifyd device fingerprint client script', function () {
+
+        it('SIGNIFYD_GLOBAL object initialization check', function (done) {
+            var script = document.createElement('script');
+
+            script.setAttribute('src', 'https://cdn-scripts.signifyd.com/api/script-tag.js');
+            script.setAttribute('id', 'sig-api');
+            script.setAttribute('type', 'text/javascript');
+            script.setAttribute('async', '');
+            script.setAttribute('data-order-session-id', 'mage-jasmin-test');
+
+            $(document.body).append(script);
+
+            setTimeout(function () {
+                var signifyd = window.SIGNIFYD_GLOBAL;
+
+                expect(signifyd).toBeDefined();
+                expect(typeof signifyd).toBe('object');
+                expect(signifyd.scriptTagHasLoaded).toBeDefined();
+                expect(typeof signifyd.scriptTagHasLoaded).toBe('function');
+                expect(signifyd.scriptTagHasLoaded()).toBe(true);
+                done();
+            }, 10000);
+
+        }, 12000);
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
index 4c78bd840d63e..2174c4a913ad0 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
@@ -35,6 +35,13 @@ define(['squire', 'ko'], function (Squire, ko) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Tax/js/view/checkout/summary/grand-total', function () {
         describe('"getGrandTotalExclTax" method', function () {
             it('Check if totals object empty.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js
new file mode 100644
index 0000000000000..9c7bbc161ac4a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks, no-undef */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Theme/js/model/breadcrumbs': jasmine.createSpy('breadcrumb'),
+            'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['unshift'])
+        };
+
+    describe('Magento_Theme/js/view/breadcrumbs', function () {
+        var breadcrumbs,
+            mixin,
+            defaultContext = require.s.contexts._;
+
+        beforeEach(function (done) {
+            window.BASE_URL = window.location.hostname;
+
+            injector.mock(mocks);
+            injector.require(
+                [
+                    'Magento_Theme/js/view/add-home-breadcrumb',
+                    'Magento_Theme/js/model/breadcrumbs'
+                ], function (homeMixin, breadcrumbWidget) {
+                    mixin = homeMixin;
+                    breadcrumbs = breadcrumbWidget;
+                    done();
+                }
+            );
+        });
+
+        afterEach(function () {
+            delete window.BASE_URL;
+
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
+        it('mixin is applied to Magento_Theme/js/view/breadcrumbs', function () {
+            var breadcrumbsMixins = defaultContext.config.config.mixins['Magento_Theme/js/view/breadcrumbs'];
+
+            expect(breadcrumbsMixins['Magento_Theme/js/view/add-home-breadcrumb']).toBe(true);
+        });
+
+        it('Magento_Theme/js/model/breadcrumb-list is populated with "Home Page" crumb', function () {
+
+            mixin(breadcrumbs);
+
+            expect(mocks['Magento_Theme/js/model/breadcrumb-list'].unshift).toHaveBeenCalledWith(
+                jasmine.objectContaining(
+                    {
+                        name: 'home',
+                        link: window.BASE_URL
+                    }
+                )
+            );
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.test.js
new file mode 100644
index 0000000000000..35f9c5c2efe90
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.test.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Theme/js/view/breadcrumbs',
+    'Magento_Theme/js/model/breadcrumb-list'
+], function ($, breadcrumbs, breadcrumbList) {
+    'use strict';
+
+    describe('Magento_Theme/js/view/breadcrumbs', function () {
+        var htmlContainer,
+            defaultCrumb = {
+                'name': 'home',
+                'link': 'http://localhost.com',
+                'title': 'Home',
+                'label': 'Go to Home Page'
+            };
+
+        beforeEach(function () {
+            htmlContainer = $('<div class="breadcrumbs"><ul class="items"></ul></div>');
+        });
+
+        afterEach(function () {
+            htmlContainer.remove();
+            breadcrumbList.pop();
+        });
+
+        it('Widget extends jQuery object.', function () {
+            expect($.fn.breadcrumbs).toBeDefined();
+        });
+
+        it('Check _render method call.', function () {
+
+            spyOn($.mage.breadcrumbs.prototype, '_render');
+
+            htmlContainer.breadcrumbs();
+
+            expect($.mage.breadcrumbs.prototype._render).toEqual(jasmine.any(Function));
+            expect($.mage.breadcrumbs.prototype._render).toHaveBeenCalled();
+        });
+
+        it('Check breadcrumb render with empty breadcrumb list.', function () {
+
+            htmlContainer.breadcrumbs();
+
+            expect($(htmlContainer).find('li').length).toBe(0);
+        });
+
+        it('Check breadcrumb render with non-empty breadcrumb list.', function () {
+
+            breadcrumbList.push(defaultCrumb);
+
+            htmlContainer.breadcrumbs();
+
+            expect($(htmlContainer).find('li').length).toBe(1);
+            expect($(htmlContainer).html()).toContain('<li class="item home">');
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
index 2eacea247d051..2e238eb993029 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
@@ -131,5 +131,43 @@ define([
             model.deleteRecord(1, 1);
             expect(model.recordData()).toEqual([]);
         });
+
+        it('"initHeader" sortOrder', function () {
+            var labels = [{
+                    name: 'Name 1',
+                    config: {
+                        label: 'Label 1',
+                        validation: false,
+                        columnsHeaderClasses: '',
+                        sortOrder: 10
+                    }
+                }, {
+                    name: 'Name 2',
+                    config: {
+                        label: 'Label 2',
+                        validation: false,
+                        columnsHeaderClasses: '',
+                        sortOrder: 5
+                    }
+                }],
+                result = [{
+                    label: 'Label 2',
+                    name: 'Name 2',
+                    required: false,
+                    columnsHeaderClasses: '',
+                    sortOrder: 5
+                }, {
+                    label: 'Label 1',
+                    name: 'Name 1',
+                    required: false,
+                    columnsHeaderClasses: '',
+                    sortOrder: 10
+                }];
+
+            model.childTemplate = {
+                children: labels
+            };
+            expect(JSON.stringify(model.labels())).toEqual(JSON.stringify(result));
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
index 7a1b2034d9274..24dc535638514 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
@@ -19,7 +19,8 @@ define([
                 name: '',
                 index: ''
             }),
-            jQueryMethods = {};
+            jQueryMethods = {},
+            originaljQueryAjax;
 
         window.FORM_KEY = 'magentoFormKey';
 
@@ -37,10 +38,15 @@ define([
             }
         });
 
+        beforeEach(function () {
+            originaljQueryAjax = $.ajax;
+        });
+
         afterEach(function () {
             _.each(jQueryMethods, function (value, key) {
                 $.fn[key] = value;
             });
+            $.ajax = originaljQueryAjax;
         });
 
         describe('"save" method', function () {
@@ -108,6 +114,7 @@ define([
                 $.ajax = jasmine.createSpy().and.callFake(function (req) {
                     request = req.success;
                 });
+                jQueryMethods.notification = $.fn.notification;
                 $.fn.notification = jasmine.createSpy();
                 obj.urls.beforeSave = 'requestPath';
                 obj.save();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
index cf79614ed05f8..4fbfb10392cb7 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
@@ -12,12 +12,7 @@ define([
     'use strict';
 
     describe('Magento_Ui/js/form/components/collection', function () {
-
-        var obj = new Constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
+        var obj;
 
         registry.set('provName', {
             /** Stub */
@@ -30,6 +25,12 @@ define([
             set: function () {}
         });
 
+        obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         describe('"initElement" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initElement')).toBeDefined();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
index c5b153f7cc100..e1d853e0b1b55 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
@@ -5,19 +5,50 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'Magento_Ui/js/form/element/abstract'
-], function (Abstract) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/abstract', function () {
-        var params, model;
-
-        beforeEach(function () {
+        var injector = new Squire(),
+            providerMock = {
+                get: jasmine.createSpy(),
+                set: jasmine.createSpy()
+            },
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return providerMock;
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            dataScope = 'abstract',
             params = {
-                dataScope: 'abstract'
-            };
-            model = new Abstract(params);
-            model.source = jasmine.createSpyObj('model.source', ['set']);
+                provider: 'provName',
+                name: '',
+                index: 'testIndex',
+                dataScope: dataScope,
+                service: {
+                    template: 'ui/form/element/helper/service'
+                }
+            },
+            model;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/abstract',
+                'knockoutjs/knockout-es5'
+            ], function (Constr) {
+                model = new Constr(params);
+
+                done();
+            });
         });
 
         describe('initialize method', function () {
@@ -50,8 +81,10 @@ define([
                 var expectedValue = 1;
 
                 spyOn(model, 'getInitialValue').and.returnValue(expectedValue);
+                model.service = true;
                 expect(model.setInitialValue()).toEqual(model);
                 expect(model.getInitialValue).toHaveBeenCalled();
+                expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 0);
                 expect(model.value()).toEqual(expectedValue);
             });
         });
@@ -303,5 +336,11 @@ define([
                 expect(model.validate).toHaveBeenCalled();
             });
         });
+        describe('serviceDisabled property', function () {
+            it('check property state', function () {
+                expect(typeof model.serviceDisabled).toEqual('function');
+                expect(model.serviceDisabled()).toBeFalsy();
+            });
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
index 4f64d1f53aa21..282badea0889f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/boolean.test.js
@@ -6,18 +6,45 @@
 /*eslint max-nested-callbacks: 0*/
 
 define([
-    'Magento_Ui/js/form/element/boolean'
-], function (BooleanElement) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/boolean', function () {
-        var params, model;
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            model,
+            dataScope = 'dataScope';
 
-        beforeEach(function () {
-            params = {
-                dataScope: 'abstract'
-            };
-            model = new BooleanElement(params);
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/boolean',
+                'knockoutjs/knockout-es5'
+            ], function (Constr) {
+                model = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope
+                });
+
+                done();
+            });
         });
 
         describe('getInitialValue method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/color-picker.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/color-picker.test.js
new file mode 100644
index 0000000000000..597c15287d52f
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/color-picker.test.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/color-picker'
+], function (ColorPicker) {
+    'use strict';
+
+    describe('ColorPicker UI Component Form Element', function () {
+        it('Should have colorPickerConfig.value set to UI component instance\'s value', function () {
+            var colorPicker = new ColorPicker({
+                dataScope: ''
+            });
+
+            expect(colorPicker.colorPickerConfig.value).toBe(colorPicker.value);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
index bd314bcc85736..01208a083a696 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js
@@ -6,23 +6,52 @@
 /*eslint max-nested-callbacks: 0*/
 
 define([
-    'Magento_Ui/js/form/element/date',
-    'mageUtils',
-    'moment'
-], function (DateElement, utils, moment) {
+    'squire'
+], function (Squire) {
     'use strict';
 
-    describe('Magento_Ui/js/form/element/date', function () {
-        var params, model;
-
-        beforeEach(function () {
-            params = {
-                dataScope: 'abstract',
-                options: {
-                    showsTime: true
-                }
-            };
-            model = new DateElement(params);
+    describe('Magento_Ui/js/form/element/date-time', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            model, utils, moment,
+            dataScope = 'abstract';
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/date',
+                'mageUtils',
+                'moment',
+                'knockoutjs/knockout-es5'
+            ], function (Constr, mageUtils, m) {
+                model = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope,
+                    options: {
+                        showsTime: true
+                    }
+                });
+                utils = mageUtils;
+                moment = m;
+
+                done();
+            });
         });
 
         it('Check prepareDateTimeFormats function', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
index 0b2290ba7a831..f9d379407fcbd 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
@@ -4,19 +4,50 @@
  */
 
 define([
-    'Magento_Ui/js/form/element/date',
-    'mageUtils'
-], function (DateElement, utils) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/date', function () {
-        var params, model;
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            model, utils,
+            dataScope = 'abstract';
 
-        beforeEach(function () {
-            params = {
-                dataScope: 'abstract'
-            };
-            model = new DateElement(params);
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/date',
+                'mageUtils',
+                'knockoutjs/knockout-es5'
+            ], function (Constr, mageUtils) {
+                model = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope,
+                    options: {
+                        showsTime: true
+                    }
+                });
+                utils = mageUtils;
+
+                done();
+            });
         });
 
         it('Check prepareDateTimeFormats function', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
index 03ee43835f961..46916054a29be 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js
@@ -7,28 +7,65 @@
 
 define([
     'jquery',
-    'Magento_Ui/js/form/element/file-uploader'
-], function ($, FileUploader) {
+    'squire'
+], function ($, Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/file-uploader', function () {
-        var component;
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/core/events': {
+                    on: jasmine.createSpy()
+                },
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            component,
+            dataScope = 'dataScope',
+            originalJQuery = jQuery.fn;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/file-uploader',
+                'knockoutjs/knockout-es5'
+            ], function (Constr) {
+                component = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope
+                });
 
-        beforeEach(function () {
-            component = new FileUploader({
-                dataScope: 'abstract'
+                done();
             });
         });
 
+        afterEach(function () {
+            jQuery.fn = originalJQuery;
+        });
+
         describe('initUploader method', function () {
             it('creates instance of file uploader', function () {
                 var elem = document.createElement('input');
 
-                spyOn($.fn, 'fileupload');
+                spyOn(jQuery.fn, 'fileupload');
 
                 component.initUploader(elem);
 
-                expect($.fn.fileupload).toHaveBeenCalled();
+                expect(jQuery.fn.fileupload).toHaveBeenCalled();
+
             });
         });
 
@@ -235,29 +272,77 @@ define([
 
         describe('onFileUploaded handler', function () {
             it('calls addFile method if upload was successful', function () {
+                spyOn(component, 'aggregateError');
                 spyOn(component, 'addFile');
 
                 component.onFileUploaded({}, {
+                    files: [{
+                        name: 'hello.jpg'
+                    }],
                     result: {
                         error: false
                     }
                 });
 
+                expect(component.aggregateError).not.toHaveBeenCalled();
                 expect(component.addFile).toHaveBeenCalled();
             });
 
-            it('calls notifyError method if upload resulted in error', function () {
-                spyOn(component, 'notifyError');
-                spyOn(component, 'addFile');
-
-                component.onFileUploaded({}, {
-                    result: {
-                        error: true
-                    }
+            it('should call uploaderConfig.stop when number of errors is equal to number of files', function () {
+                var fakeEvent = {
+                        target: document.createElement('input')
+                    },
+                    file = {
+                        name: 'hello.jpg'
+                    },
+                    data = {
+                        files: [file],
+                        originalFiles: [file]
+                    };
+
+                spyOn(component, 'isFileAllowed').and.callFake(function (fileArg) {
+                    expect(fileArg).toBe(file);
+
+                    return {
+                        passed: false,
+                        message: 'Not awesome enough'
+                    };
+                });
+                component.initUploader();
+                spyOn(component.uploaderConfig, 'done');
+                spyOn(component.uploaderConfig, 'stop');
+                component.onBeforeFileUpload(fakeEvent, data);
+                expect(component.uploaderConfig.stop).toHaveBeenCalled();
+            });
+            it('should not call uploaderConfig.stop when number of errors is unequal to number of files', function () {
+                var fakeEvent = {
+                        target: document.createElement('input')
+                    },
+                    file = {
+                        name: 'hello.jpg'
+                    },
+                    otherFileInQueue = {
+                        name: 'world.png'
+                    },
+                    data = {
+                        files: [file],
+                        originalFiles: [file, otherFileInQueue]
+                    };
+
+                component.initUploader();
+                spyOn(component.uploaderConfig, 'done');
+                spyOn(component.uploaderConfig, 'stop');
+                spyOn(component, 'isFileAllowed').and.callFake(function (fileArg) {
+                    expect(fileArg).toBe(file);
+
+                    return {
+                        passed: false,
+                        message: 'Not awesome enough'
+                    };
                 });
 
-                expect(component.notifyError).toHaveBeenCalled();
-                expect(component.addFile).not.toHaveBeenCalled();
+                component.onBeforeFileUpload(fakeEvent, data);
+                expect(component.uploaderConfig.stop).not.toHaveBeenCalled();
             });
         });
 
@@ -272,5 +357,18 @@ define([
                 expect(component.initUploader).toHaveBeenCalledWith(input);
             });
         });
+
+        describe('aggregateError method', function () {
+            it('should append onto aggregatedErrors array when called', function () {
+                spyOn(component.aggregatedErrors, 'push');
+
+                component.aggregateError('blah.jpg', 'File is too awesome');
+
+                expect(component.aggregatedErrors.push).toHaveBeenCalledWith({
+                    filename: 'blah.jpg',
+                    message: 'File is too awesome'
+                });
+            });
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js
new file mode 100644
index 0000000000000..31d1c1ce27e96
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js
@@ -0,0 +1,86 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+
+define([
+    'jquery',
+    'Magento_Ui/js/form/element/image-uploader',
+    'mage/adminhtml/browser'
+], function ($, ImageUploader, browser) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/element/image-uploader', function () {
+        var component;
+
+        beforeEach(function () {
+            component = new ImageUploader({
+                dataScope: 'abstract'
+            });
+        });
+
+        describe('initConfig method', function () {
+            it('sets mediaGalleryUid', function () {
+                component.initConfig();
+                expect(component.mediaGalleryUid).toBeDefined();
+            });
+        });
+
+        describe('addFileFromMediaGallery method', function () {
+            it('adds file', function () {
+                var $el = $('div');
+
+                spyOn(component, 'addFile');
+
+                $el.data({
+                    'size': 1024,
+                    'mime-type': 'image/png'
+                });
+
+                $el.val('/pub/media/something.png');
+
+                component.addFileFromMediaGallery(null, {
+                    target: $el
+                });
+
+                expect(component.addFile).toHaveBeenCalledWith({
+                    type: 'image/png',
+                    name: 'something.png',
+                    url: '/pub/media/something.png',
+                    size: 1024
+                });
+            });
+        });
+
+        describe('openMediaBrowserDialog method', function () {
+            it('opens browser dialog', function () {
+                var $el = $('div');
+
+                $el.attr('id', 'theTargetId');
+
+                component.mediaGallery = {
+                    openDialogUrl: 'http://example.com/',
+                    openDialogTitle: 'Hello world',
+                    storeId: 3,
+                    initialOpenSubpath: 'wysiwyg'
+                };
+
+                spyOn(browser, 'openDialog');
+
+                component.openMediaBrowserDialog(null, {
+                    target: $el
+                });
+
+                expect(browser.openDialog).toHaveBeenCalledWith(
+                    'http://example.com/target_element_id/theTargetId/store/3/type/image/' +
+                        '?isAjax=true&current_tree_path=d3lzaXd5Zw,,',
+                    null,
+                    null,
+                    'Hello world'
+                );
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
index 165cc1aff3ac5..d443784efe050 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
@@ -45,6 +45,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Ui/js/form/element/multiselect', function () {
         describe('"setPrepareToSendData" method', function () {
             it('Check method call with empty array as parameter.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
index 9bddfcd35642a..96bca1bbd8c6b 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/post-code.test.js
@@ -5,19 +5,45 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'uiRegistry',
-    'Magento_Ui/js/form/element/post-code'
-], function (registry, PostCodeElement) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/post-code', function () {
-        var params, model;
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            model,
+            dataScope = 'post-code';
 
-        beforeEach(function () {
-            params = {
-                dataScope: 'post-code'
-            };
-            model = new PostCodeElement(params);
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/post-code',
+                'knockoutjs/knockout-es5'
+            ], function (Constr) {
+                model = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope
+                });
+
+                done();
+            });
         });
 
         describe('update method', function () {
@@ -31,9 +57,9 @@ define([
                         }
                     };
 
-                spyOn(registry, 'get').and.returnValue(country);
+                spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
                 model.update(value);
-                expect(registry.get).toHaveBeenCalled();
+                expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
                 expect(model.error()).toEqual(false);
                 expect(model.required()).toEqual(false);
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
index 8e76d8e90729d..a36d3b0b7fefa 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js
@@ -5,19 +5,46 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'uiRegistry',
-    'Magento_Ui/js/form/element/region'
-], function (registry, RegionElement) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/region', function () {
-        var params, model;
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            model,
+            dataScope = 'dataScope';
 
-        beforeEach(function () {
-            params = {
-                dataScope: 'region'
-            };
-            model = new RegionElement(params);
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/region',
+                'knockoutjs/knockout-es5',
+                'Magento_Ui/js/lib/knockout/extender/observable_array'
+            ], function (Constr) {
+                model = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope
+                });
+
+                done();
+            });
         });
 
         describe('update method', function () {
@@ -31,9 +58,9 @@ define([
                         }
                     };
 
-                spyOn(registry, 'get').and.returnValue(country);
+                spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
                 model.update(value);
-                expect(registry.get).toHaveBeenCalled();
+                expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
                 expect(model.error()).toEqual(false);
                 expect(model.required()).toEqual(false);
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
index 6eac936974595..fffb045e8ce41 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/select.test.js
@@ -5,18 +5,49 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'Magento_Ui/js/form/element/select'
-], function (SelectElement) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/select', function () {
-        var params, model;
-
-        beforeEach(function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    options: jasmine.createSpy(),
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy(),
+                'Magento_Ui/js/core/renderer/layout': jasmine.createSpy()
+            },
+            dataScope = 'select',
             params = {
-                dataScope: 'select'
-            };
-            model = new SelectElement(params);
+                provider: 'provName',
+                name: '',
+                index: '',
+                dataScope: dataScope
+            },
+            model;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/select',
+                'knockoutjs/knockout-es5',
+                'Magento_Ui/js/lib/knockout/extender/observable_array'
+            ], function (Constr) {
+                model = new Constr(params);
+
+                done();
+            });
         });
 
         describe('initialize method', function () {
@@ -24,26 +55,20 @@ define([
                 expect(model).toBeDefined();
             });
             it('check for chainable', function () {
-                spyOn(model, 'initInput');
                 spyOn(model, 'initFilter');
                 expect(model.initialize(params)).toEqual(model);
-                expect(model.initInput).not.toHaveBeenCalled();
                 expect(model.initFilter).not.toHaveBeenCalled();
             });
             it('check for call initInput', function () {
-                spyOn(model, 'initInput');
                 spyOn(model, 'initFilter');
                 model.customEntry = true;
                 expect(model.initialize(params)).toEqual(model);
-                expect(model.initInput).toHaveBeenCalled();
                 expect(model.initFilter).not.toHaveBeenCalled();
             });
             it('check for call initFilter', function () {
-                spyOn(model, 'initInput');
                 spyOn(model, 'initFilter');
                 model.filterBy = true;
                 expect(model.initialize(params)).toEqual(model);
-                expect(model.initInput).not.toHaveBeenCalled();
                 expect(model.initFilter).toHaveBeenCalled();
             });
         });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js
new file mode 100644
index 0000000000000..f63e0adda1e17
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/single-checkbox-use-config.test.js
@@ -0,0 +1,78 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/element/single-checkbox-use-config', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            dataScope = 'dataScope',
+            params = {
+                provider: 'provName',
+                name: '',
+                index: '',
+                dataScope: dataScope
+            },
+            model;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/single-checkbox-use-config',
+                'knockoutjs/knockout-es5'
+            ], function (Constr) {
+                model = new Constr(params);
+                done();
+            });
+        });
+
+        describe('initObservable method', function () {
+            it('check for chainable', function () {
+                expect(model.initObservable({})).toEqual(model);
+            });
+            it('check for validation', function () {
+                spyOn(model, 'observe').and.returnValue(model);
+                expect(model.initObservable()).toEqual(model);
+                expect(model.validation).toEqual({});
+            });
+        });
+
+        describe('toggleElement method', function () {
+            it('check with isUseDefault false', function () {
+                spyOn(model, 'isUseDefault').and.returnValue(false);
+                spyOn(model, 'isUseConfig').and.returnValue(false);
+                expect(model.toggleElement()).toEqual(undefined);
+                expect(model.disabled()).toEqual(false);
+                expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 0);
+            });
+            it('check with isUseDefault true', function () {
+                spyOn(model, 'isUseDefault').and.returnValue(true);
+                spyOn(model, 'isUseConfig').and.returnValue(false);
+                expect(model.toggleElement()).toEqual(undefined);
+                expect(model.disabled()).toEqual(true);
+                expect(model.source.set).toHaveBeenCalledWith('data.use_default.' + model.index, 1);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
index 03b00f0c3a842..60beff8d9b628 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/textarea.test.js
@@ -4,18 +4,46 @@
  */
 
 define([
-    'Magento_Ui/js/form/element/textarea'
-], function (TextareaElement) {
+    'squire'
+], function (Squire) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/textarea', function () {
-        var params, model;
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    options: jasmine.createSpy(),
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            model,
+            dataScope = 'dataScope';
 
-        beforeEach(function () {
-            params = {
-                dataScope: 'textarea'
-            };
-            model = new TextareaElement(params);
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/textarea',
+                'knockoutjs/knockout-es5'
+            ], function (Constr) {
+                model = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope
+                });
+
+                done();
+            });
         });
 
         it('check if component defined', function () {
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 0000000000000..533faa7c2eef0
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/url-input.test.js
@@ -0,0 +1,116 @@
+/**
+ * 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);
+            });
+        });
+
+        describe('Parent config properties are propagated', function () {
+            it('sets the disabled property on the child element', function () {
+                var params = {
+                    dataScope: 'urlInput',
+                    disabled: true,
+                    urlTypes: {
+                        url: {
+                            label: 'Test label',
+                            component: 'Magento_Ui/js/form/element/abstract',
+                            template: 'ui/form/element/input',
+                            sortOrder: 40
+                        }
+                    }
+                };
+
+                component = new UrlInput(params);
+                expect(component.disabled()).toBe(true);
+                expect(component.urlTypes.url.disabled).toBe(true);
+            });
+
+            it('sets the visible property on the child element', function () {
+                var params = {
+                    dataScope: 'urlInput',
+                    visible: false,
+                    urlTypes: {
+                        url: {
+                            label: 'Test label',
+                            component: 'Magento_Ui/js/form/element/abstract',
+                            template: 'ui/form/element/input',
+                            sortOrder: 40
+                        }
+                    }
+                };
+
+                component = new UrlInput(params);
+                expect(component.visible()).toBe(false);
+                expect(component.urlTypes.url.visible).toBe(false);
+            });
+        });
+
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
index eec50f0e6bd78..ac6e230e7ed1c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
@@ -7,21 +7,60 @@
 define([
     'underscore',
     'uiRegistry',
-    'Magento_Ui/js/form/element/ui-select',
+    'squire',
     'ko'
-], function (_, registry, Constr, ko) {
+], function (_, registry, Squire, ko) {
     'use strict';
 
     describe('Magento_Ui/js/form/element/ui-select', function () {
+        var obj, jq, originaljQueryAjax,
+            injector = new Squire(),
+            mocks = {
+                'Magento_Ui/js/lib/registry/registry': {
+                    /** Method stub. */
+                    get: function () {
+                        return {
+                            get: jasmine.createSpy(),
+                            set: jasmine.createSpy()
+                        };
+                    },
+                    create: jasmine.createSpy(),
+                    set: jasmine.createSpy(),
+                    async: jasmine.createSpy()
+                },
+                '/mage/utils/wrapper': jasmine.createSpy()
+            },
+            dataScope = 'abstract';
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Ui/js/form/element/ui-select',
+                'jquery',
+                'knockoutjs/knockout-es5'
+            ], function (Constr, $) {
+                obj = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    dataScope: dataScope,
+                    options: {
+                        showsTime: true
+                    }
+                });
 
-        var obj = new Constr({
-            name: 'uiSelect',
-            dataScope: '',
-            provider: 'provider'
+                obj.value = ko.observableArray([]);
+                obj.cacheOptions.plain = [];
+                originaljQueryAjax = $.ajax;
+                jq = $;
+                done();
+            });
         });
 
-        obj.value = ko.observableArray([]);
-        obj.cacheOptions.plain = [];
+        afterEach(function () {
+            jq.ajax = originaljQueryAjax;
+            injector.clean();
+        });
 
         describe('"initialize" method', function () {
             it('Check for defined ', function () {
@@ -407,8 +446,52 @@ define([
 
                 expect(type).toEqual('string');
             });
-            it('Check returned value if selected array length more then 1', function () {
+            it('Should return label of selected option when not using multiple options and option exists', function () {
+                obj.multiple = false;
+                obj.cacheOptions.plain.push({
+                    label: 'one',
+                    value: 1
+                });
+                obj.value('1');
+
+                expect(obj.setCaption()).toEqual('one');
+            });
+            it(
+                'Should return select placeholder when isDisplayMissingValuePlaceholder is false ' +
+                ' and option does not exist',
+                function () {
+                    obj.isDisplayMissingValuePlaceholder = false;
+                    obj.value('1');
+
+                    obj.multiple = false;
+                    expect(obj.setCaption()).toEqual('Select...');
+                }
+            );
+            it(
+                'Should return missing value template when isDisplayMissingValuePlaceholder is true ' +
+                ' and option does not exist',
+                function () {
+                    obj.isDisplayMissingValuePlaceholder = true;
+                    obj.value('1');
+
+                    expect(obj.setCaption()).toEqual('Entity with ID: 1 doesn\'t exist');
+                }
+            );
+            it('Check returned value if selected array length more than 1 and options exist', function () {
                 obj.value(['one', 'two']);
+                obj.multiple = true;
+                obj.isDisplayMissingValuePlaceholder = false;
+
+                obj.cacheOptions.plain = [
+                    {
+                        label: 'one',
+                        value: 'one'
+                    },
+                    {
+                        label: 'two',
+                        value: 'one'
+                    }
+                ];
 
                 expect(obj.setCaption()).toEqual('2 ' + obj.selectedPlaceholders.lotPlaceholders);
             });
@@ -492,5 +575,126 @@ define([
                 expect(type).toEqual('string');
             });
         });
+        describe('"filterOptionsList" method', function () {
+            it('Should be defined on instance', function () {
+                expect(obj.hasOwnProperty('filterOptionsList')).toBeDefined();
+            });
+
+            it('Should call loadOptions with value when searchOptions is true', function (done) {
+                spyOn(obj, 'filterInputValue').and.returnValue(' heLlO ');
+
+                spyOn(obj, 'loadOptions');
+
+                obj.searchOptions = true;
+
+                obj.filterOptionsList();
+
+                setTimeout(function () {
+                    expect(obj.loadOptions).toHaveBeenCalledWith('hello');
+                    done();
+                }, obj.debounce);
+            });
+        });
+        describe('"isSelectedValue" method', function () {
+            it('Should return false if option is undefined', function () {
+                expect(obj.isSelectedValue()).toBe(false);
+            });
+
+            it('Should call isSelected with value of option', function () {
+                spyOn(obj, 'isSelected');
+
+                obj.isSelectedValue({
+                    value: 'hello'
+                });
+
+                expect(obj.isSelected).toHaveBeenCalledWith('hello');
+            });
+        });
+        describe('"loadOptions" method', function () {
+            it('Should call processRequest if search key is not cached', function () {
+                var searchKey = 'cake';
+
+                spyOn(obj, 'processRequest');
+                spyOn(obj, 'isSearchKeyCached').and.returnValue(false);
+                spyOn(obj, 'options');
+
+                obj.loadOptions(searchKey);
+
+                // assert options are set to empty array
+                expect(obj.options).toHaveBeenCalledWith([]);
+                expect(obj.processRequest).toHaveBeenCalledWith(searchKey, 1);
+            });
+        });
+        describe('"isSearchKeyCached" method', function () {
+            it('Should return false if searchKey has already been cached and total covers > 1 page', function () {
+                obj.deviation = 30;
+                obj.cachedSearchResults = {
+                    cake: {
+                        options: [/** 50 options **/],
+                        lastPage: 1,
+                        total: 50
+                    }
+                };
+
+                expect(obj.isSearchKeyCached('cake')).toBe(false);
+            });
+
+            it('Should return true if searchKey has already been cached and total only covers 1 page', function () {
+                obj.deviation = 30;
+                obj.cachedSearchResults = {
+                    cake: {
+                        options: [/** 29 options **/],
+                        lastPage: 1,
+                        total: 29
+                    }
+                };
+
+                expect(obj.isSearchKeyCached('cake')).toBe(true);
+            });
+
+            it('Should return false if searchKey is not cached', function () {
+                expect(obj.isSearchKeyCached('cake', 2)).toBe(false);
+            });
+        });
+        describe('Cached search results getting/setting', function () {
+            it('Should set cached search results and be able to be the same value when fetched', function () {
+                var options = [{
+                    value: 'delicious'
+                }];
+
+                obj.setCachedSearchResults('cake', options, 1, 1);
+
+                expect(obj.getCachedSearchResults('cake')).toEqual({
+                    options: options,
+                    lastPage: 1,
+                    total: 1
+                });
+            });
+        });
+        describe('"processRequest" method', function () {
+            it('Should store options successfully fetched from ajax request', function () {
+                var ajaxRequest,
+                    successfulAjaxResponse = {
+                    options: {
+                        '2053': {
+                            value: '2053',
+                            label: 'testProductName5a8ddfd933b5c',
+                            'is_active': 1,
+                            path: 'testSku5a8ddfd933b5c',
+                            optgroup: false
+                        }
+                    }
+                };
+
+                $.ajax = jasmine.createSpy().and.callFake(function (request) {
+                    ajaxRequest = request.success.bind(obj);
+                });
+
+                expect(obj.processRequest()).toBeUndefined();
+
+                ajaxRequest(successfulAjaxResponse);
+                expect(JSON.stringify(obj.options())).toEqual(JSON.stringify([successfulAjaxResponse.options['2053']]));
+            });
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
index ca2509c4ea707..de3387e31af88 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
@@ -43,8 +43,8 @@ define([
             });
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([]);
+            expect(multiSelect.excluded().toString()).toEqual('');
+            expect(multiSelect.selected().toString()).toEqual('');
         });
 
         it('Select specific several rows on several pages', function () {
@@ -52,8 +52,8 @@ define([
             multiSelect.selected.push(5);
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([4, 5]);
+            expect(multiSelect.excluded().toString()).toEqual('');
+            expect(multiSelect.selected().toString()).toEqual('4,5');
         });
 
         it('Select all rows on several pages', function () {
@@ -71,8 +71,8 @@ define([
             multiSelect.selectPage();
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([1, 2, 3, 4]);
+            expect(multiSelect.excluded().toString()).toEqual('');
+            expect(multiSelect.selected().toString()).toEqual('1,2,3,4');
         });
 
         it('Select all rows on current page with some specific rows on another page', function () {
@@ -94,8 +94,8 @@ define([
             }]);
             multiSelect.selected.push(6);
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([5]);
-            expect(multiSelect.selected()).toEqual([3, 4, 6]);
+            expect(multiSelect.excluded().toString()).toEqual('5');
+            expect(multiSelect.selected().toString()).toEqual('3,4,6');
         });
 
         it('Select all rows on several pages without some specific rows', function () {
@@ -113,8 +113,8 @@ define([
             multiSelect.selected.remove(4); // remove second
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([4]);
-            expect(multiSelect.selected()).toEqual([3]);
+            expect(multiSelect.excluded().toString()).toEqual('4');
+            expect(multiSelect.selected().toString()).toEqual('3');
         });
 
         it('Select all rows all over the Grid', function () {
@@ -131,8 +131,8 @@ define([
             }]);
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([3, 4, 1, 2]);
+            expect(multiSelect.excluded().toString()).toEqual('');
+            expect(multiSelect.selected().toString()).toEqual('3,4,1,2');
         });
 
         it('Select all rows all over the Grid without all rows on current page but with specific rows on another page',
@@ -156,8 +156,8 @@ define([
                 }]);
 
                 expect(multiSelect.allSelected()).toBeFalsy();
-                expect(multiSelect.excluded()).toEqual([3, 4]);
-                expect(multiSelect.selected()).toEqual([5, 6]);
+                expect(multiSelect.excluded().toString()).toEqual('3,4');
+                expect(multiSelect.selected().toString()).toEqual('5,6');
             });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/color-picker.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/color-picker.test.js
new file mode 100644
index 0000000000000..9b756a2f2a49a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/color-picker.test.js
@@ -0,0 +1,89 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko',
+    'jquery',
+    'Magento_Ui/js/lib/knockout/bindings/color-picker'
+], function (ko, $) {
+    'use strict';
+
+    var $input,
+        originaljQuery,
+        originaljQueryInit,
+        originaljQuerySpectrum;
+
+    beforeEach(function () {
+        originaljQuery = $;
+        originaljQueryInit = $.fn.init;
+        originaljQuerySpectrum = $.fn.spectrum;
+    });
+
+    afterEach(function () {
+        $ = originaljQuery;
+        $.fn.init = originaljQueryInit;
+        $.fn.spectrum = originaljQuerySpectrum;
+    });
+
+    describe('Colorpicker binding', function () {
+        it('Should call spectrum on $input with disabled configuration if view model disabled', function () {
+            var value = {
+                    configStuffInHere: true
+                },
+                valueAccessor = jasmine.createSpy().and.returnValue(value),
+                viewModel = {
+                    disabled: jasmine.createSpy().and.returnValue(true)
+                };
+
+            $.fn.spectrum = jasmine.createSpy();
+            $input = jasmine.createSpy();
+
+            ko.bindingHandlers.colorPicker.init($input, valueAccessor, null, viewModel);
+
+            expect(value.change).toEqual(jasmine.any(Function));
+            expect(value.hide).toEqual(jasmine.any(Function));
+            expect(value.show).toEqual(jasmine.any(Function));
+            expect(value.change).toBe(value.hide);
+
+            expect($.fn.spectrum.calls.allArgs()).toEqual([[value], ['disable']]);
+            expect(viewModel.disabled).toHaveBeenCalled();
+
+            $.fn.init = jasmine.createSpy().and.returnValue($.fn);
+
+            ko.bindingHandlers.colorPicker.init($input, valueAccessor, null, viewModel);
+
+            expect($.fn.init).toHaveBeenCalledWith($input, undefined);
+        });
+
+        it('Should call spectrum on $input with extra configuration if view model enabled', function () {
+            var value = {
+                    configStuffInHere: true
+                },
+                valueAccessor = jasmine.createSpy().and.returnValue(value),
+                viewModel = {
+                    disabled: jasmine.createSpy().and.returnValue(false)
+                };
+
+            $.fn.spectrum = jasmine.createSpy();
+            $input = jasmine.createSpy();
+
+            ko.bindingHandlers.colorPicker.init($input, valueAccessor, null, viewModel);
+
+            expect(value.change).toEqual(jasmine.any(Function));
+            expect(value.hide).toEqual(jasmine.any(Function));
+            expect(value.show).toEqual(jasmine.any(Function));
+            expect(value.change).toBe(value.hide);
+
+            expect($.fn.spectrum.calls.allArgs()).toEqual([[value], ['enable']]);
+            expect(viewModel.disabled).toHaveBeenCalled();
+
+            $.fn.init = jasmine.createSpy().and.returnValue($.fn);
+
+            ko.bindingHandlers.colorPicker.init($input, valueAccessor, null, viewModel);
+
+            expect($.fn.init).toHaveBeenCalledWith($input, undefined);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
index 0f50cc2b6b9b1..201959a2598fd 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
@@ -38,14 +38,18 @@ define([
             /** Stub */
             turnOffInlineTranslation = function () {
                 manageInlineTranslation(false);
-            };
+            },
+
+            storedConfig;
 
         beforeEach(function () {
+            storedConfig = context.config.config;
             $(document.body).append(elWithStaticText);
             $(document.body).append(elWithVariable);
         });
 
         afterEach(function () {
+            context.config.config = storedConfig;
             elWithStaticText.remove();
             elWithVariable.remove();
         });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
new file mode 100644
index 0000000000000..692c843d18e92
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_Ui/js/lib/validation/rules'
+], function (rules) {
+    'use strict';
+
+    describe('Magento_Ui/js/lib/validation/rules', function () {
+        describe('"range-words" method', function () {
+            it('Check on empty value', function () {
+                var value = '',
+                    params = [1,3];
+
+                expect(rules['range-words'].handler(value, params)).toBe(true);
+            });
+
+            it('Check on redundant words', function () {
+                var value = 'a b c d',
+                    params = [1,3];
+
+                expect(rules['range-words'].handler(value, params)).toBe(false);
+            });
+
+            it('Check with three words', function () {
+                var value = 'a b c',
+                    params = [1,3];
+
+                expect(rules['range-words'].handler(value, params)).toBe(true);
+            });
+
+            it('Check with one word', function () {
+                var value = 'a',
+                    params = [1,3];
+
+                expect(rules['range-words'].handler(value, params)).toBe(true);
+            });
+        });
+        describe('"validate-number" method', function () {
+            it('Check on empty value', function () {
+                var value = '';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
+            it('Check on integer', function () {
+                var value = '125';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
+            it('Check on float', function () {
+                var value = '1000.50';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
+            it('Check on formatted float', function () {
+                var value = '1,000,000.50';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
+            it('Check on not a number', function () {
+                var value = 'string';
+
+                expect(rules['validate-number'].handler(value)).toBe(false);
+            });
+        });
+    });
+
+    describe('validate-color', function () {
+        it('Should accept empty value', function () {
+            expect(rules['validate-color'].handler('', null)).toEqual(true);
+        });
+
+        it('Should not accept invalid value', function () {
+            expect(rules['validate-color'].handler('#FF')).toEqual(false);
+            expect(rules['validate-color'].handler('#GGG')).toEqual(false);
+        });
+
+        it('Should accept hex value', function () {
+            expect(rules['validate-color'].handler('#FFF')).toEqual(true);
+            expect(rules['validate-color'].handler('#FFFFFF')).toEqual(true);
+            expect(rules['validate-color'].handler('FFFFFF')).toEqual(true);
+            expect(rules['validate-color'].handler('FFF')).toEqual(true);
+        });
+
+        it('Should accept English color value', function () {
+            expect(rules['validate-color'].handler('red')).toEqual(true);
+            expect(rules['validate-color'].handler('BLuE')).toEqual(true);
+            expect(rules['validate-color'].handler(' GReEn     ')).toEqual(true);
+        });
+
+        it('Should accept rgb(a) value', function () {
+            expect(rules['validate-color'].handler('rgb(128, 128, 10)')).toEqual(true);
+            expect(rules['validate-color'].handler('rgb(255, 0, 57, 0.4)')).toEqual(true);
+        });
+
+        it('Should accept hsl(a) value', function () {
+            expect(rules['validate-color'].handler('hsl(0, 100, 50)')).toEqual(true);
+            expect(rules['validate-color'].handler('hsl(40, 75%, 25%)')).toEqual(true);
+            expect(rules['validate-color'].handler('hsl(50, 25, 50, 50)')).toEqual(true);
+        });
+
+        it('Should accept hsv value', function () {
+            expect(rules['validate-color'].handler('hsv(0, 100, 100)')).toEqual(true);
+            expect(rules['validate-color'].handler('hsv(25, 25%, 65%)')).toEqual(true);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
index 12354713400df..c82ca680336b4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
@@ -35,6 +35,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Ui/js/timeline/timeline', function () {
 
         describe('isActive method', function () {
diff --git a/dev/tests/js/jasmine/tests/lib/mage/accordion.test.js b/dev/tests/js/jasmine/tests/lib/mage/accordion.test.js
new file mode 100644
index 0000000000000..19a54d95cf704
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/accordion.test.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/accordion'
+], function ($) {
+    'use strict';
+
+    describe('Test for mage/accordion jQuery plugin', function () {
+        it('check if accordion can be initialized', function () {
+            var accordion = $('<div/>');
+
+            accordion.accordion();
+            expect(accordion.is(':mage-accordion')).toBeTruthy();
+
+            accordion.accordion('destroy');
+            expect(accordion.is(':mage-accordion')).toBeFalsy();
+        });
+        it('check one-collapsible element accordion', function () {
+            var accordion = $('<div/>'),
+                title1 = $('<div data-role="collapsible"></div>').appendTo(accordion),
+                content1 = $('<div data-role="content"></div>').appendTo(accordion),
+                title2 = $('<div data-role="collapsible"></div>').appendTo(accordion),
+                content2 = $('<div data-role="content"></div>').appendTo(accordion);
+
+            accordion.appendTo('body');
+
+            accordion.accordion();
+
+            expect(accordion.is(':mage-accordion')).toBeTruthy();
+
+            expect(content1.is(':visible')).toBeTruthy();
+            expect(content2.is(':hidden')).toBeTruthy();
+
+            title2.trigger('click');
+
+            expect(content1.is(':hidden')).toBeTruthy();
+            expect(content2.is(':visible')).toBeTruthy();
+
+            title1.trigger('click');
+
+            expect(content1.is(':visible')).toBeTruthy();
+            expect(content2.is(':hidden')).toBeTruthy();
+
+            accordion.accordion('destroy');
+
+            expect(accordion.is(':mage-accordion')).toBeFalsy();
+        });
+        it('check multi-collapsible element accordion', function () {
+            var accordion = $('<div/>'),
+                title1 = $('<div data-role="collapsible"></div>').appendTo(accordion),
+                content1 = $('<div data-role="content"></div>').appendTo(accordion),
+                title2 = $('<div data-role="collapsible"></div>').appendTo(accordion),
+                content2 = $('<div data-role="content"></div>').appendTo(accordion);
+
+            accordion.appendTo('body');
+
+            accordion.accordion({
+                multipleCollapsible: true
+            });
+
+            expect(accordion.is(':mage-accordion')).toBeTruthy();
+            expect(content1.is(':visible')).toBeTruthy();
+            expect(content2.is(':hidden')).toBeTruthy();
+
+            $(title1).trigger('click');
+            expect(content1.is(':visible')).toBeTruthy();
+            expect(content2.is(':hidden')).toBeTruthy();
+
+            $(title2).trigger('click');
+            expect(content1.is(':visible')).toBeTruthy();
+            expect(content2.is(':visible')).toBeTruthy();
+
+            accordion.accordion('destroy');
+            expect(accordion.is(':mage-accordion')).toBeFalsy();
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
index 538c7e60b60fd..60115c4ac2c64 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
@@ -2,32 +2,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/* global jQuery */
 /* eslint-disable max-nested-callbacks */
 define([
     'jquery',
-    'squire',
-    'mage/backend/notification'
-], function ($, Squire) {
+    'mage/backend/bootstrap'
+], function ($) {
     'use strict';
 
-    var injector = new Squire();
-
     describe('mage/backend/bootstrap', function () {
-        beforeEach(function (done) {
-            injector.require(['mage/backend/bootstrap'], function () {
-                done();
-            });
+        var $pageMainActions;
+
+        beforeEach(function () {
+            $pageMainActions = $('<div class="page-main-actions"></div>');
         });
+
+        afterEach(function () {
+            $pageMainActions.remove();
+        });
+
         describe('"sendPostponeRequest" method', function () {
             it('should insert "Error" notification if request failed', function () {
-                jQuery('<div class="page-main-actions"></div>').appendTo('body');
-                jQuery('body').notification();
+                $pageMainActions.appendTo('body');
+                $('body').notification();
 
-                jQuery.ajax().abort();
+                $.ajaxSettings.error();
 
-                expect(jQuery('.message-error').length).toBe(1);
-                expect(jQuery('body:contains("A technical problem with the server created an error")').length).toBe(1);
+                expect($('.message-error').length).toBe(1);
+                expect(
+                    $('body:contains("A technical problem with the server created an error")').length
+                ).toBe(1);
             });
         });
     });
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js
new file mode 100644
index 0000000000000..9cbad5841f9ec
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js
@@ -0,0 +1,524 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'mage/backend/suggest'
+], function ($) {
+    'use strict';
+
+    describe('mage/backend/suggest', function () {
+        var suggestSelector = '#suggest';
+
+        beforeEach(function () {
+            var $suggest = $('<input name="test-suggest" id="suggest" />');
+
+            $('body').append($suggest);
+            $('body').append('<script type="text/template" id="test-template">' +
+                '<div><%= data.test %></div>' +
+                '</script>');
+        });
+
+        afterEach(function () {
+            $(suggestSelector).remove();
+            $('#test-template').remove();
+            $(suggestSelector).suggest('destroy');
+        });
+
+        it('Check that suggest inited', function () {
+            var $suggest = $(suggestSelector).suggest({
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            });
+
+            expect($suggest.is(':mage-suggest')).toBe(true);
+        });
+
+        it('Check suggest create', function () {
+            var options = {
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    controls: {
+                        selector: '.test',
+                        eventsMap: {
+                            focus: ['testfocus'],
+                            blur: ['testblur'],
+                            select: ['testselect']
+                        }
+                    },
+                    showRecent: true,
+                    storageKey: 'test-suggest-recent',
+                    multiselect: true
+                },
+                recentItems = [{
+                        id: '1',
+                        label: 'TestLabel1'
+                    },
+                    {
+                        id: '2',
+                        label: 'TestLabel2'
+                    }
+                ],
+                nonSelectedItem = {
+                    id: '',
+                    label: ''
+                },
+                suggestInstance;
+
+            if (window.localStorage) {
+                localStorage.setItem(options.storageKey, JSON.stringify(recentItems));
+            }
+
+            suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+
+            expect(suggestInstance._term).toBe(null);
+            expect(suggestInstance._nonSelectedItem).toEqual(nonSelectedItem);
+            expect(suggestInstance._renderedContext).toBe(null);
+            expect(suggestInstance._selectedItem).toEqual(nonSelectedItem);
+            expect(suggestInstance._control).toEqual(suggestInstance.options.controls);
+            expect(suggestInstance._recentItems).toEqual(window.localStorage ? recentItems : []);
+            expect(suggestInstance.valueField.is(':hidden')).toBe(true);
+
+            if (window.localStorage) {
+                localStorage.removeItem(options.storageKey);
+            }
+        });
+
+        it('Check suggest render', function () {
+            var options = {
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    dropdownWrapper: '<div class="wrapper-test"></div>',
+                    className: 'test-suggest',
+                    inputWrapper: '<div class="test-input-wrapper"></div>'
+                },
+                suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+
+            suggestInstance._render();
+
+            expect(suggestInstance.dropdown.hasClass('wrapper-test')).toBe(true);
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+            expect(suggestInstance.element.closest('.test-input-wrapper').length).toBeGreaterThan(0);
+            expect(suggestInstance.element.closest('.' + options.className).length).toBeGreaterThan(0);
+            expect(suggestInstance.element.attr('autocomplete')).toBe('off');
+
+            options.appendMethod = 'before';
+            $(suggestSelector).suggest('destroy');
+            suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+            suggestInstance._render();
+            expect(suggestInstance.element.prev().is(suggestInstance.dropdown)).toBe(true);
+
+            options.appendMethod = 'after';
+            $(suggestSelector).suggest('destroy');
+            suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+            suggestInstance._render();
+            expect(suggestInstance.element.next().is(suggestInstance.dropdown)).toBe(true);
+        });
+
+        it('Check suggest createValueField', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                valueField = suggestInstance._createValueField();
+
+            expect(valueField.is('input')).toBe(true);
+            expect(valueField.is(':hidden')).toBe(true);
+
+            $(suggestSelector).suggest('destroy');
+            suggestInstance = $(suggestSelector).suggest({
+                multiselect: true,
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            }).data('mage-suggest');
+            valueField = suggestInstance._createValueField();
+
+            expect(valueField.is('select')).toBe(true);
+            expect(valueField.is(':hidden')).toBe(true);
+            expect(valueField.attr('multiple')).toBe('multiple');
+        });
+
+        it('Check suggest prepareValueField', function () {
+            var $suggest = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }),
+                suggestInstance = $suggest.data('mage-suggest'),
+                suggestName = $suggest.attr('name');
+
+            suggestInstance._prepareValueField();
+
+            expect(suggestInstance.valueField).not.toBe(true);
+            expect(suggestInstance.element.prev().is(suggestInstance.valueField)).toBe(true);
+            expect(suggestInstance.element.attr('name')).toBe(undefined);
+            expect(suggestInstance.valueField.attr('name')).toBe(suggestName);
+        });
+
+        it('Check suggest destroy', function () {
+            var options = {
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    inputWrapper: '<div class="test-input-wrapper"></div>',
+                    valueField: null
+                },
+                $suggest = $(suggestSelector).suggest(options),
+                suggestInstance = $suggest.data('mage-suggest'),
+                suggestName = $suggest.attr('name');
+
+            expect(suggestInstance.dropdown).not.toBe(undefined);
+            expect(suggestInstance.valueField).not.toBe(undefined);
+            expect(suggestName).toBe(undefined);
+
+            $suggest.suggest('destroy');
+
+            expect($suggest.closest('.test-input-wrapper').length).toBe(0);
+            expect($suggest.attr('autocomplete')).toBe(undefined);
+            expect($suggest.attr('name')).toBe(suggestInstance.valueField.attr('name'));
+            expect(suggestInstance.valueField.parents('html').length).not.toBeGreaterThan(0);
+            expect(suggestInstance.dropdown.parents('html').length).not.toBeGreaterThan(0);
+        });
+
+        it('Check suggest value', function () {
+            var value = 'test-value',
+                suggestInstance, suggestDivInstance;
+
+            $(suggestSelector).val(value);
+            $('body').append('<div id="suggest-div">' + value + '</div>');
+
+            suggestInstance = $(suggestSelector).suggest({
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            }).data('mage-suggest');
+            suggestDivInstance = $('#suggest-div').suggest({
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            }).data('mage-suggest');
+
+            expect(suggestInstance._value()).toBe(value);
+            expect(suggestDivInstance._value()).toBe(value);
+            $('#suggest-div').remove();
+        });
+
+        it('Check suggest bind', function () {
+            var eventIsBinded = false,
+                options = {
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    events: {
+                        /** Stub function */
+                        click: function () {
+                            eventIsBinded = true;
+                        }
+                    }
+                },
+                $suggest = $(suggestSelector).suggest(options);
+
+            $suggest.trigger('click');
+            expect(eventIsBinded).toBe(true);
+        });
+
+        it('Check suggest focus/blur', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                };
+
+            expect(suggestInstance._focused).toBe(undefined);
+            expect(suggestInstance.element.val()).toBe('');
+
+            suggestInstance._focusItem($.Event('focus'), uiHash);
+
+            expect(suggestInstance._focused).toEqual(uiHash.item);
+            expect(suggestInstance.element.val()).toBe(uiHash.item.label);
+
+            suggestInstance._blurItem();
+
+            expect(suggestInstance._focused).toBe(null);
+            expect(suggestInstance.element.val()).toBe('');
+        });
+
+        it('Check suggest select', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                };
+
+            suggestInstance._focused = suggestInstance._term = suggestInstance._selectedItem = null;
+            suggestInstance.valueField.val('');
+            suggestInstance._selectItem($.Event('select'));
+
+            expect(suggestInstance._selectedItem).toBe(null);
+            expect(suggestInstance._term).toBe(null);
+            expect(suggestInstance.valueField.val()).toBe('');
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+            suggestInstance._focused = uiHash.item;
+            suggestInstance._selectItem($.Event('select'));
+
+            expect(suggestInstance._selectedItem).toEqual(suggestInstance._focused);
+            expect(suggestInstance._term).toBe(suggestInstance._focused.label);
+            expect(suggestInstance.valueField.val()).toBe(suggestInstance._focused.id.toString());
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+        });
+
+        it('Check suggest multiselect', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    multiselect: true
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                },
+                event = $.Event('select'),
+                selectedElement = $('<div/>');
+
+            event.target = selectedElement[0];
+            suggestInstance._focused = suggestInstance._term = suggestInstance._selectedItem = null;
+            suggestInstance.valueField.val('');
+            suggestInstance._selectItem(event);
+
+            expect(suggestInstance._selectedItem).toBe(null);
+            expect(suggestInstance._term).toBe(null);
+            expect(suggestInstance.valueField.find('option').length).not.toBeGreaterThan(0);
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+            suggestInstance._focused = uiHash.item;
+            suggestInstance._selectItem(event);
+
+            expect(suggestInstance._selectedItem).toEqual(suggestInstance._focused);
+            expect(suggestInstance._term).toBe('');
+            expect(suggestInstance._getOption(suggestInstance._focused).length).toBeGreaterThan(0);
+            expect(selectedElement.hasClass(suggestInstance.options.selectedClass)).toBe(true);
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+            suggestInstance._selectItem(event);
+            expect(suggestInstance._selectedItem).toEqual(suggestInstance._nonSelectedItem);
+            expect(suggestInstance._term).toBe('');
+            expect(suggestInstance._getOption(suggestInstance._focused).length).not.toBeGreaterThan(0);
+            expect(selectedElement.hasClass(suggestInstance.options.selectedClass)).toBe(false);
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+        });
+
+        it('Check suggest reset value', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            }).data('mage-suggest');
+
+            suggestInstance.valueField.val('test');
+            expect(suggestInstance.valueField.val()).toBe('test');
+            suggestInstance._resetSuggestValue();
+            expect(suggestInstance.valueField.val()).toBe(suggestInstance._nonSelectedItem.id);
+        });
+
+        it('Check suggest reset multiselect value', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    multiselect: true
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                },
+                event = $.Event('select');
+
+            event.target = $('<div/>')[0];
+            suggestInstance._focused = uiHash.item;
+
+            suggestInstance._selectItem(event);
+            suggestInstance._resetSuggestValue();
+
+            expect(suggestInstance.valueField.val() instanceof Array).toBe(true);
+            expect(suggestInstance.valueField.val()[0]).not.toBe(undefined);
+            expect(suggestInstance.valueField.val()[0]).toBe(uiHash.item.id.toString());
+        });
+
+        it('Check suggest read item data', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                testElement = $('<div/>');
+
+            expect(suggestInstance._readItemData(testElement)).toEqual(suggestInstance._nonSelectedItem);
+            testElement.data('suggestOption', 'test');
+            expect(suggestInstance._readItemData(testElement)).toEqual('test');
+        });
+
+        it('Check suggest template', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '<div><%= data.test %></div>',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                tmpl = suggestInstance.templates[suggestInstance.templateName],
+                html = $('<div/>').append(tmpl({
+                    data: {
+                        test: 'test'
+                    }
+                })).html();
+
+            expect(html).toEqual('<div>test</div>');
+            suggestInstance.destroy();
+            $('body').append('<script type="text/template" id="test-template">' +
+                '<div><%= data.test %></div>' +
+                '</script>');
+
+            suggestInstance = $(suggestSelector).suggest({
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            }).data('mage-suggest');
+            tmpl = suggestInstance.templates[suggestInstance.templateName];
+            html = $('<div />').append(tmpl({
+                data: {
+                    test: 'test'
+                }
+            })).html();
+
+            expect(html).toEqual('<div>test</div>');
+            $('#test-template').remove();
+        });
+
+        it('Check suggest dropdown visibility', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                template: '#test-template',
+                choiceTemplate: '<li/>'
+            }).data('mage-suggest');
+
+            suggestInstance.dropdown.hide();
+            expect(suggestInstance.isDropdownShown()).toBe(false);
+            expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+            suggestInstance.dropdown.show();
+            expect(suggestInstance.isDropdownShown()).toBe(true);
+            expect(suggestInstance.dropdown.is(':visible')).toBe(true);
+        });
+
+        it('Check suggest create option', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                },
+                option = suggestInstance._createOption(uiHash.item);
+
+            expect(option.val()).toBe('1');
+            expect(option.prop('selected')).toBe(true);
+            expect(option.text()).toBe('Test Label');
+            expect(option.data('renderedOption')).not.toBe(undefined);
+        });
+
+        it('Check suggest add option', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                },
+                selectTarget = $('<div/>'),
+                event = $.Event('add'),
+                option;
+
+            event.target = selectTarget[0];
+            suggestInstance._addOption(event, uiHash.item);
+            option = suggestInstance.valueField.find('option[value=' + uiHash.item.id + ']');
+
+            expect(option.length).toBeGreaterThan(0);
+            expect(option.data('selectTarget').is(selectTarget)).toBe(true);
+        });
+
+        it('Check suggest get option', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>'
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                },
+                option = $('<option value="1">Test Label</option>');
+
+            expect(suggestInstance._getOption(uiHash.item).length).not.toBeGreaterThan(0);
+
+            suggestInstance.valueField.append(option);
+            expect(suggestInstance._getOption(uiHash.item).length).toBeGreaterThan(0);
+            expect(suggestInstance._getOption(option).length).toBeGreaterThan(0);
+        });
+
+        it('Check suggest last added', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    multiselect: true
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                };
+
+            suggestInstance._addOption({}, uiHash.item);
+            expect(suggestInstance.valueField.find('option').length).toBeGreaterThan(0);
+            suggestInstance._removeLastAdded();
+            expect(suggestInstance.valueField.find('option').length).not.toBeGreaterThan(0);
+        });
+
+        it('Check suggest remove option', function () {
+            var suggestInstance = $(suggestSelector).suggest({
+                    template: '#test-template',
+                    choiceTemplate: '<li/>',
+                    multiselect: true
+                }).data('mage-suggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                },
+                selectTarget = $('<div/>'),
+                event = $.Event('select');
+
+            selectTarget.addClass(suggestInstance.options.selectedClass);
+            event.target = selectTarget[0];
+
+            suggestInstance._addOption(event, uiHash.item);
+            expect(suggestInstance.valueField.find('option').length).toBeGreaterThan(0);
+            suggestInstance.removeOption(event, uiHash.item);
+            expect(suggestInstance.valueField.find('option').length).not.toBeGreaterThan(0);
+            expect(selectTarget.hasClass(suggestInstance.options.selectedClass)).toBe(false);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/tree-suggest.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/tree-suggest.test.js
new file mode 100644
index 0000000000000..b116fc7058808
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/tree-suggest.test.js
@@ -0,0 +1,52 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'mage/backend/tree-suggest'
+], function ($) {
+    'use strict';
+
+    describe('mage/backend/tree-suggest', function () {
+        var treeSuggestSelector = '#tree-suggest';
+
+        beforeEach(function () {
+            var $treeSuggest = $('<input name="test-tree-suggest" id="tree-suggest" />');
+
+            $('body').append($treeSuggest);
+        });
+
+        afterEach(function () {
+            $(treeSuggestSelector).remove();
+            $(treeSuggestSelector).treeSuggest('destroy');
+        });
+
+        it('Check that treeSuggest inited', function () {
+            var $treeSuggest = $(treeSuggestSelector).treeSuggest(),
+                treeSuggestInstance = $treeSuggest.data('mage-treeSuggest');
+
+            expect($treeSuggest.is(':mage-treeSuggest')).toBe(true);
+            expect(treeSuggestInstance.widgetEventPrefix).toBe('suggest');
+        });
+
+        it('Check treeSuggest filter', function () {
+            var treeSuggestInstance = $(treeSuggestSelector).treeSuggest().data('mage-treeSuggest'),
+                uiHash = {
+                    item: {
+                        id: 1,
+                        label: 'Test Label'
+                    }
+                };
+
+            expect(treeSuggestInstance._filterSelected(
+                [uiHash.item],
+                {
+                    _allShown: true
+                }
+            )).toEqual([uiHash.item]);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/calendar.test.js b/dev/tests/js/jasmine/tests/lib/mage/calendar.test.js
new file mode 100644
index 0000000000000..b2c6aed2c9fba
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/calendar.test.js
@@ -0,0 +1,173 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'jquery/ui',
+    'mage/calendar'
+], function ($) {
+    'use strict';
+
+    describe('mage/calendar', function () {
+        describe('Check calendar', function () {
+            var calendarSelector = '#calendar';
+
+            beforeEach(function () {
+                var $calendar = $('<input type="text" id="calendar" />');
+
+                $('body').append($calendar);
+            });
+
+            afterEach(function () {
+                $(calendarSelector).remove();
+                $(calendarSelector).calendar('destroy');
+            });
+
+            it('Check that calendar inited', function () {
+                var $calendar = $(calendarSelector).calendar();
+
+                expect($calendar.is(':mage-calendar')).toBe(true);
+            });
+
+            it('Check configuration merge', function () {
+                var $calendar;
+
+                $.extend(true, $, {
+                    calendarConfig: {
+                        showOn: 'button',
+                        showAnim: '',
+                        buttonImageOnly: true,
+                        showButtonPanel: true,
+                        showWeek: true,
+                        timeFormat: '',
+                        showTime: false,
+                        showHour: false,
+                        showMinute: false
+                    }
+                });
+
+                $calendar = $(calendarSelector).calendar();
+
+                expect($calendar.calendar('option', 'showOn')).toBe('button');
+                expect($calendar.calendar('option', 'showAnim')).toBe('');
+                expect($calendar.calendar('option', 'buttonImageOnly')).toBe(true);
+                expect($calendar.calendar('option', 'showButtonPanel')).toBe(true);
+                expect($calendar.calendar('option', 'showWeek')).toBe(true);
+                expect($calendar.calendar('option', 'timeFormat')).toBe('');
+                expect($calendar.calendar('option', 'showTime')).toBe(false);
+                expect($calendar.calendar('option', 'showHour')).toBe(false);
+                expect($calendar.calendar('option', 'showMinute')).toBe(false);
+
+                delete $.calendarConfig;
+            });
+
+            it('Specifying AM/PM in timeformat option changes AMPM option to true', function () {
+                var $calendar = $(calendarSelector).calendar({
+                    timeFormat: 'hh:mm tt',
+                    ampm: false
+                });
+
+                expect($calendar.calendar('option', 'ampm')).toBe(true);
+            });
+
+            it('Omitting AM/PM in timeformat option changes AMPM option to false', function () {
+                var $calendar = $(calendarSelector).calendar({
+                    timeFormat: 'hh:mm'
+                });
+
+                expect($calendar.calendar('option', 'ampm')).toBe(null);
+            });
+
+            it('With server timezone offset', function () {
+                var serverTimezoneSeconds = 1346122095,
+                    $calendar = $(calendarSelector).calendar({
+                        serverTimezoneSeconds: serverTimezoneSeconds
+                    }),
+                    currentDate = new Date();
+
+                currentDate.setTime((serverTimezoneSeconds + currentDate.getTimezoneOffset() * 60) * 1000);
+
+                expect($calendar.calendar('getTimezoneDate').toString()).toBe(currentDate.toString());
+            });
+
+            it('Without sever timezone offset', function () {
+                var $calendar = $(calendarSelector).calendar(),
+                    currentDate = new Date();
+
+                expect($calendar.calendar('getTimezoneDate').toString()).toBe(currentDate.toString());
+            });
+
+            it('Check destroy', function () {
+                var $calendar = $(calendarSelector).calendar();
+
+                expect($calendar.is(':mage-calendar')).toBe(true);
+                $calendar.calendar('destroy');
+                expect($calendar.is(':mage-calendar')).toBe(false);
+            });
+        });
+        describe('Check dateRange', function () {
+            var dateRangeSelector = '#date-range';
+
+            beforeEach(function () {
+                var $dateRange = $('<div id="date-range">' +
+                    '<input type="text" id="from" />' +
+                    '<input type="text" id="to" />' +
+                    '</div>');
+
+                $('body').append($dateRange);
+            });
+
+            afterEach(function () {
+                $(dateRangeSelector).remove();
+                $(dateRangeSelector).dateRange('destroy');
+            });
+
+            it('Check that dateRange inited', function () {
+                var $dateRange = $(dateRangeSelector).dateRange();
+
+                expect($dateRange.is(':mage-dateRange')).toBe(true);
+            });
+
+            it('Check that dateRange inited with additional options', function () {
+                var $from = $('#from'),
+                    $to = $('#to');
+
+                $(dateRangeSelector).dateRange({
+                    from: {
+                        id: 'from'
+                    },
+                    to: {
+                        id: 'to'
+                    }
+                });
+
+                expect($from.hasClass('_has-datepicker')).toBe(true);
+                expect($to.hasClass('_has-datepicker')).toBe(true);
+            });
+
+            it('Check destroy', function () {
+                var $dateRange = $(dateRangeSelector).dateRange({
+                        from: {
+                            id: 'from'
+                        },
+                        to: {
+                            id: 'to'
+                        }
+                    }),
+                    $from = $('#from'),
+                    $to = $('#to');
+
+                expect($dateRange.is(':mage-dateRange')).toBe(true);
+                expect($from.hasClass('_has-datepicker')).toBe(true);
+                expect($to.hasClass('_has-datepicker')).toBe(true);
+                $dateRange.dateRange('destroy');
+                expect($dateRange.is(':mage-dateRange')).toBe(false);
+                expect($from.hasClass('_has-datepicker')).toBe(false);
+                expect($to.hasClass('_has-datepicker')).toBe(false);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js b/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
new file mode 100644
index 0000000000000..1f34e48f8ae94
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
@@ -0,0 +1,221 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+/* jscs:disable jsDoc */
+
+define([
+    'jquery',
+    'jquery/ui',
+    'mage/collapsible'
+], function ($) {
+    'use strict';
+
+    describe('Test for mage/collapsible jQuery plugin', function () {
+        it('check if collapsible can be initialized and destroyed', function () {
+            var group = $('<div id="1"></div>');
+
+            group.collapsible();
+            expect(group.is(':mage-collapsible')).toBeTruthy();
+
+            group.collapsible('destroy');
+            expect(group.is(':mage-collapsible')).toBeFalsy();
+            group.remove();
+        });
+
+        describe('Test enable, disable, activate and deactivate methods', function () {
+            var group = $('<div id="2"></div>'),
+                content = $('<div data-role="content"></div>').appendTo(group),
+                emptyGroup = $('<div></div>');
+
+            $('<div data-role="title"></div>').prependTo(group);
+
+            beforeEach(function () {
+                group.appendTo('body');
+            });
+
+            afterEach(function () {
+                group.remove();
+            });
+
+            it('check enable and disable methods', function () {
+                group.collapsible();
+                expect(group.is(':mage-collapsible')).toBeTruthy();
+
+                group.collapsible('disable');
+                expect(content.is(':hidden')).toBeTruthy();
+
+                group.collapsible('enable');
+                expect(content.is(':visible')).toBeTruthy();
+
+                group.collapsible('destroy');
+                expect(group.is(':mage-collapsible')).toBeFalsy();
+            });
+
+            it('check activate and deactivate methods', function () {
+                group.collapsible();
+                expect(group.is(':mage-collapsible')).toBeTruthy();
+
+                group.collapsible('deactivate');
+                expect(content.is(':hidden')).toBeTruthy();
+
+                group.collapsible('activate');
+                expect(content.is(':visible')).toBeTruthy();
+
+                group.collapsible('destroy');
+                expect(group.is(':mage-collapsible')).toBeFalsy();
+            });
+
+            it('check activate method on empty group', function () {
+                emptyGroup.collapsible();
+                expect(emptyGroup.is(':mage-collapsible')).toBeTruthy();
+
+                expect(function () {
+                    emptyGroup.collapsible('activate');
+                }).not.toThrow();
+            });
+        });
+
+        it('check if the widget gets expanded/collapsed when the title is clicked', function () {
+            var group = $('<div id="3"></div>'),
+                title = $('<div data-role="title"></div>').appendTo(group),
+                content = $('<div data-role="content"></div>').appendTo(group);
+
+            group.appendTo('body');
+
+            group.collapsible();
+            expect(group.is(':mage-collapsible')).toBeTruthy();
+
+            group.collapsible('deactivate');
+            expect(content.is(':hidden')).toBeTruthy();
+
+            title.trigger('click');
+            expect(content.is(':visible')).toBeTruthy();
+
+            title.trigger('click');
+            expect(content.is(':hidden')).toBeTruthy();
+
+            group.collapsible('destroy');
+            expect(group.is(':mage-collapsible')).toBeFalsy();
+            group.remove();
+        });
+
+        it('check state classes', function () {
+            var group = $('<div id="4"></div>'),
+                title = $('<div data-role="title"></div>').appendTo(group);
+
+            $('<div data-role="content"></div>').appendTo(group);
+
+            group.appendTo('body');
+
+            group.collapsible({
+                openedState: 'opened',
+                closedState: 'closed',
+                disabledState: 'disabled'
+            });
+            expect(group.is(':mage-collapsible')).toBeTruthy();
+            expect(group.hasClass('closed')).toBeTruthy();
+
+            title.trigger('click');
+            expect(group.hasClass('opened')).toBeTruthy();
+
+            group.collapsible('disable');
+            expect(group.hasClass('disabled')).toBeTruthy();
+
+            group.collapsible('destroy');
+            expect(group.is(':mage-collapsible')).toBeFalsy();
+            group.remove();
+        });
+
+        it('check if icons are added to title when initialized and removed when destroyed', function () {
+            var group = $('<div id="5"></div>'),
+                title = $('<div data-role="title"></div>').appendTo(group);
+
+            $('<div data-role="content"></div>').appendTo(group);
+
+            group.appendTo('body');
+
+            group.collapsible({
+                icons: {
+                    header: 'minus',
+                    activeHeader: 'plus'
+                }
+            });
+            expect(group.is(':mage-collapsible')).toBeTruthy();
+            expect(title.children('[data-role=icons]').length).toBeTruthy();
+
+            group.collapsible('destroy');
+            expect(group.is(':mage-collapsible')).toBeFalsy();
+            expect(title.children('[data-role=icons]').length).toBeFalsy();
+            group.remove();
+        });
+
+        it('check if icon classes are changed when content gets expanded/collapsed', function () {
+            var group = $('<div id="6"></div>'),
+                title = $('<div data-role="title"></div>').appendTo(group),
+                content = $('<div data-role="content"></div>').appendTo(group),
+                icons;
+
+            group.appendTo('body');
+
+            group.collapsible({
+                icons: {
+                    header: 'minus',
+                    activeHeader: 'plus'
+                }
+            });
+            expect(group.is(':mage-collapsible')).toBeTruthy();
+
+            icons = group.collapsible('option', 'icons');
+            group.collapsible('deactivate');
+            expect(content.is(':hidden')).toBeTruthy();
+            expect(title.children('[data-role=icons]').hasClass(icons.header)).toBeTruthy();
+
+            title.trigger('click');
+            expect(title.children('[data-role=icons]').hasClass(icons.activeHeader)).toBeTruthy();
+
+            group.collapsible('destroy');
+            expect(group.is(':mage-collapsible')).toBeFalsy();
+            group.remove();
+        });
+
+        it('check if content gets updated via Ajax when title is clicked', function () {
+            var group = $('<div id="8"></div>'),
+                title = $('<div data-role="title"></div>').appendTo(group),
+                content = $('<div data-role="content"></div>').appendTo(group);
+
+            $('<a data-ajax="true" href="test.html"></a>').appendTo(group);
+
+            $.get = jasmine.createSpy().and.callFake(function () {
+                var d = $.Deferred();
+
+                d.promise().success = function () {
+                };
+
+                d.promise().complete = function () {
+                };
+
+                return d.promise();
+            });
+
+            group.appendTo('body');
+
+            group.collapsible({
+                ajaxContent: true
+            });
+            expect(group.is(':mage-collapsible')).toBeTruthy();
+
+            group.collapsible('deactivate');
+            expect(content.is(':hidden')).toBeTruthy();
+            expect(content.children('p').length).toBeFalsy();
+
+            title.trigger('click');
+            expect(content.children('p')).toBeTruthy();
+
+            group.collapsible('destroy');
+            expect(group.is(':mage-collapsible')).toBeFalsy();
+            group.remove();
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/decorate.test.js b/dev/tests/js/jasmine/tests/lib/mage/decorate.test.js
new file mode 100644
index 0000000000000..898bcf8b51128
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/decorate.test.js
@@ -0,0 +1,201 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'mage/decorate',
+    'jquery'
+], function (decorate, $) {
+    'use strict';
+
+    describe('mage/decorate', function () {
+        describe('"list" method', function () {
+            var listId = 'testList';
+
+            beforeEach(function () {
+                var list = $('<ul id="' + listId + '"><li/><li/><li/></ul>');
+
+                $('body').append(list);
+            });
+
+            afterEach(function () {
+                $('#' + listId).remove();
+            });
+
+            it('Check correct class decoration', function () {
+                var $list = $('#' + listId);
+
+                $list.decorate('list');
+                expect($list.find('li:first').hasClass('first')).toBe(false);
+                expect($list.find('li:first').hasClass('odd')).toBe(true);
+                expect($list.find('li:last').hasClass('last')).toBe(true);
+                expect($list.find('li:odd').hasClass('even')).toBe(true);
+                expect($list.find('li:even').hasClass('odd')).toBe(true);
+            });
+        });
+
+        describe('"generic" method', function () {
+            var listId = 'testList';
+
+            beforeEach(function () {
+                var list = $('<ul id="' + listId + '"><li/><li/><li/></ul>');
+
+                $('body').append(list);
+            });
+
+            afterEach(function () {
+                $('#' + listId).remove();
+            });
+
+            it('Check correct class decoration with default params', function () {
+                var $list = $('#' + listId);
+
+                $list.find('li').decorate('generic');
+                expect($list.find('li:first').hasClass('first')).toBe(true);
+                expect($list.find('li:first').hasClass('odd')).toBe(true);
+                expect($list.find('li:last').hasClass('last')).toBe(true);
+                expect($list.find('li:odd').hasClass('even')).toBe(true);
+                expect($list.find('li:even').hasClass('odd')).toBe(true);
+            });
+
+            it('Check correct class decoration with custom params', function () {
+                var $list = $('#' + listId);
+
+                $list.find('li').decorate('generic', ['last', 'first']);
+                expect($list.find('li:first').hasClass('first')).toBe(true);
+                expect($list.find('li:first').hasClass('odd')).toBe(false);
+                expect($list.find('li:last').hasClass('last')).toBe(true);
+                expect($list.find('li:odd').hasClass('even')).toBe(false);
+                expect($list.find('li:even').hasClass('odd')).toBe(false);
+            });
+
+            it('Check correct class decoration with empty items', function () {
+                var $list = $('#' + listId);
+
+                $list.find('span').decorate('generic', ['last', 'first']);
+                expect($list.find('li:first').hasClass('first')).toBe(false);
+                expect($list.find('li:first').hasClass('odd')).toBe(false);
+                expect($list.find('li:last').hasClass('last')).toBe(false);
+                expect($list.find('li:odd').hasClass('even')).toBe(false);
+                expect($list.find('li:even').hasClass('odd')).toBe(false);
+            });
+        });
+
+        describe('"table" method', function () {
+            var tableId = 'testTable';
+
+            beforeEach(function () {
+                var table = $('<table id="' + tableId + '">' +
+                    '<thead><tr><th/><th/></tr></thead>' +
+                    '<tbody>' +
+                    '<tr><td/><td/></tr>' +
+                    '<tr><td/><td/></tr>' +
+                    '<tr><td/><td/></tr>' +
+                    '</tbody>>' +
+                    '<tfoot><tr><th/><th/></tr></tfoot>' +
+                    '</table>');
+
+                $('body').append(table);
+            });
+
+            afterEach(function () {
+                $('#' + tableId).remove();
+            });
+
+            it('Check correct class decoration with default params', function () {
+                var $table = $('#' + tableId);
+
+                $table.decorate('table');
+                expect($table.find('tbody tr:first').hasClass('first')).toBe(true);
+                expect($table.find('tbody tr:first').hasClass('odd')).toBe(true);
+                expect($table.find('tbody tr:odd').hasClass('even')).toBe(true);
+                expect($table.find('tbody tr:even').hasClass('odd')).toBe(true);
+                expect($table.find('tbody tr:last').hasClass('last')).toBe(true);
+                expect($table.find('thead tr:first').hasClass('first')).toBe(true);
+                expect($table.find('thead tr:last').hasClass('last')).toBe(true);
+                expect($table.find('tfoot tr:first').hasClass('first')).toBe(true);
+                expect($table.find('tfoot tr:last').hasClass('last')).toBe(true);
+                expect($table.find('tr td:last').hasClass('last')).toBe(true);
+                expect($table.find('tr td:first').hasClass('first')).toBe(false);
+            });
+
+            it('Check correct class decoration with custom params', function () {
+                var $table = $('#' + tableId);
+
+                $table.decorate('table', {
+                    'tbody': ['first'],
+                    'tbody tr': ['first'],
+                    'thead tr': ['first'],
+                    'tfoot tr': ['last'],
+                    'tr td': ['first']
+                });
+                expect($table.find('tbody:first').hasClass('first')).toBe(true);
+                expect($table.find('tbody tr:first').hasClass('first')).toBe(true);
+                expect($table.find('tbody tr:first').hasClass('odd')).toBe(false);
+                expect($table.find('tbody tr:odd').hasClass('even')).toBe(false);
+                expect($table.find('tbody tr:even').hasClass('odd')).toBe(false);
+                expect($table.find('tbody tr:last').hasClass('last')).toBe(false);
+                expect($table.find('thead tr:first').hasClass('first')).toBe(true);
+                expect($table.find('thead tr:last').hasClass('last')).toBe(false);
+                expect($table.find('tfoot tr:first').hasClass('first')).toBe(false);
+                expect($table.find('tfoot tr:last').hasClass('last')).toBe(true);
+                expect($table.find('tr td:last').hasClass('last')).toBe(false);
+                expect($table.find('tr td:first').hasClass('first')).toBe(true);
+            });
+        });
+
+        describe('"dataList" method', function () {
+            var listId = 'testDataList';
+
+            beforeEach(function () {
+                var list = $('<dl id="' + listId + '"><dt/><dd/><dt/><dd/><dt/><dd/></dl>');
+
+                $('body').append(list);
+            });
+
+            afterEach(function () {
+                $('#' + listId).remove();
+            });
+
+            it('Check correct class decoration', function () {
+                var $list = $('#' + listId);
+
+                $list.decorate('dataList');
+                expect($list.find('dt:first').hasClass('first')).toBe(false);
+                expect($list.find('dt:first').hasClass('odd')).toBe(true);
+                expect($list.find('dt:odd').hasClass('even')).toBe(true);
+                expect($list.find('dt:even').hasClass('odd')).toBe(true);
+                expect($list.find('dt:last').hasClass('last')).toBe(true);
+                expect($list.find('dd:first').hasClass('first')).toBe(false);
+                expect($list.find('dd:first').hasClass('odd')).toBe(true);
+                expect($list.find('dd:odd').hasClass('even')).toBe(true);
+                expect($list.find('dd:even').hasClass('odd')).toBe(true);
+                expect($list.find('dd:last').hasClass('last')).toBe(true);
+            });
+        });
+
+        describe('Call decorate with fake method', function () {
+            var listId = 'testDataList';
+
+            beforeEach(function () {
+                var list = $('<dl id="' + listId + '"><dt/><dd/><dt/><dd/><dt/><dd/></dl>');
+
+                $('body').append(list);
+            });
+
+            afterEach(function () {
+                $('#' + listId).remove();
+            });
+
+            it('Check error message', function () {
+                var $list = $('#' + listId);
+
+                spyOn($, 'error');
+                $list.decorate('customMethod');
+                expect($.error).toHaveBeenCalledWith('Method customMethod does not exist on jQuery.decorate');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/dropdown.test.js b/dev/tests/js/jasmine/tests/lib/mage/dropdown.test.js
new file mode 100644
index 0000000000000..1d149efe040e0
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/dropdown.test.js
@@ -0,0 +1,357 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+
+define([
+    'jquery',
+    'mage/dropdown'
+], function ($) {
+    'use strict';
+
+    describe('Test for mage/dropdown jQuery plugin', function () {
+        it('check if dialog opens when the triggerEvent is triggered', function () {
+            var opener = $('<div/>'),
+                dialog = $('<div/>');
+
+            dialog.dropdownDialog({
+                'triggerEvent': 'click',
+                'triggerTarget': opener
+            });
+
+            opener.trigger('click');
+            expect(dialog.dropdownDialog('isOpen')).toBeTruthy();
+
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'triggerEvent': null,
+                'triggerTarget': opener
+            });
+
+            opener.trigger('click');
+            expect(dialog.dropdownDialog('isOpen')).toBeFalsy();
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if a specified class is added to the trigger', function () {
+            var opener = $('<div/>'),
+                dialog = $('<div/>');
+
+            dialog.dropdownDialog({
+                'triggerClass': 'active',
+                'triggerTarget': opener
+            });
+
+            dialog.dropdownDialog('open');
+            expect(opener.hasClass('active')).toBeTruthy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'triggerClass': null,
+                'triggerTarget': opener
+            });
+
+            dialog.dropdownDialog('open');
+            expect(opener.hasClass('active')).toBeFalsy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if a specified class is added to the element which the dialog appends to', function () {
+            var parent = $('<div/>'),
+                dialog = $('<div/>');
+
+            dialog.dropdownDialog({
+                'parentClass': 'active',
+                'appendTo': parent
+            });
+
+            dialog.dropdownDialog('open');
+            expect(parent.hasClass('active')).toBeTruthy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'parentClass': null,
+                'appendTo': parent
+            });
+
+            dialog.dropdownDialog('open');
+            expect(parent.hasClass('active')).toBeFalsy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if a specified class is added to the element that becomes dialog', function () {
+            var dialog = $('<div/>'),
+                content;
+
+            dialog.dropdownDialog({
+                'dialogContentClass': 'active'
+            });
+
+            content = $('.ui-dialog-content');
+            dialog.dropdownDialog('open');
+            expect(content.hasClass('active')).toBeTruthy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'dialogContentClass': null
+            });
+
+            dialog.dropdownDialog('open');
+            expect(content.hasClass('active')).toBeFalsy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if a specified class is added to dialog', function () {
+            var dialog = $('<div/>'),
+                uiClass = '.ui-dialog',
+                ui;
+
+            dialog.dropdownDialog({
+                'defaultDialogClass': 'custom'
+            });
+
+            ui = $(uiClass);
+            expect(ui.hasClass('custom')).toBeTruthy();
+            expect(ui.hasClass('mage-dropdown-dialog')).toBeFalsy();
+
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({});
+            ui = $(uiClass);
+            expect(ui.hasClass('mage-dropdown-dialog')).toBeTruthy();
+
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if the specified trigger actually opens the dialog', function () {
+            var opener = $('<div/>'),
+                dialog = $('<div/>');
+
+            dialog.dropdownDialog({
+                'triggerTarget': opener
+            });
+
+            opener.trigger('click');
+            expect(dialog.dropdownDialog('isOpen')).toBeTruthy();
+
+            dialog.dropdownDialog('close');
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'triggerTarget': null
+            });
+
+            opener.trigger('click');
+            expect(dialog.dropdownDialog('isOpen')).toBeFalsy();
+
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if the dialog gets closed when clicking outside of it', function () {
+            var container = $('<div/>'),
+                outside = $('<div/>').attr('id', 'outside').appendTo(container),
+                dialog = $('<div/>').attr('id', 'dialog').appendTo(container);
+
+            container.appendTo('body');
+
+            dialog.dropdownDialog({
+                'closeOnClickOutside': true
+            });
+
+            dialog.dropdownDialog('open');
+            outside.trigger('click');
+            expect(dialog.dropdownDialog('isOpen')).toBeFalsy();
+
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'closeOnClickOutside': false
+            });
+
+            dialog.dropdownDialog('open');
+            outside.trigger('click');
+            expect(dialog.dropdownDialog('isOpen')).toBeTruthy();
+
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if the dialog gets closed when mouse leaves the dialog area', function () {
+            var container = $('<div/>'),
+                dialog = $('<div/>').attr('id', 'dialog').appendTo(container);
+
+            $('<div/>').attr('id', 'outside').appendTo(container);
+            $('<div/>').attr('id', 'opener').appendTo(container);
+
+            container.appendTo('body');
+
+            jasmine.clock().install();
+
+            dialog.dropdownDialog({
+                'closeOnMouseLeave': true
+            });
+
+            dialog.dropdownDialog('open');
+            dialog.trigger('mouseenter');
+            expect(dialog.dropdownDialog('isOpen')).toBeTruthy();
+
+            dialog.trigger('mouseleave');
+
+            jasmine.clock().tick(10);
+
+            expect(dialog.dropdownDialog('isOpen')).toBeFalsy();
+            dialog.dropdownDialog('destroy');
+
+            jasmine.clock().uninstall();
+        });
+
+        it('check if the dialog does not close when mouse leaves the dialog area', function () {
+            var container = $('<div/>'),
+                dialog = $('<div/>').attr('id', 'dialog').appendTo(container);
+
+            $('<div/>').attr('id', 'outside').appendTo(container);
+            $('<div/>').attr('id', 'opener').appendTo(container);
+
+            container.appendTo('body');
+
+            jasmine.clock().install();
+
+            dialog.dropdownDialog({
+                'closeOnMouseLeave': false
+            });
+
+            dialog.dropdownDialog('open');
+            dialog.trigger('mouseenter');
+            dialog.trigger('mouseleave');
+            jasmine.clock().tick(10);
+            expect(dialog.dropdownDialog('isOpen')).toBeTruthy();
+            dialog.dropdownDialog('destroy');
+
+            jasmine.clock().uninstall();
+        });
+
+        it('check if the dialog gets closed with the specified delay', function (done) {
+            var container = $('<div/>'),
+                dialog = $('<div/>').attr('id', 'dialog').appendTo(container);
+
+            $('<div/>').attr('id', 'outside').appendTo(container);
+            $('<div/>').attr('id', 'opener').appendTo(container);
+
+            container.appendTo('body');
+
+            dialog.dropdownDialog({
+                'timeout': 5
+            });
+
+            dialog.dropdownDialog('open');
+            dialog.trigger('mouseenter');
+            dialog.trigger('mouseleave');
+            expect(dialog.dropdownDialog('isOpen')).toBeTruthy();
+
+            setTimeout(function () {
+                expect(dialog.dropdownDialog('isOpen')).toBeFalsy();
+                dialog.dropdownDialog('destroy');
+                done();
+            }, 6);
+        });
+
+        /*
+         * jQuery ui version 1.9.2 belongs to the adminhtml.
+         *
+         * This test will fail on backend since backend's jquery.ui will
+         * add ui-dialog-titlebar class anyway on create.
+         */
+        if ($.ui.version !== '1.9.2') {
+            it('check if the title bar is prevented from being created', function () {
+                var dialog = $('<div/>'),
+                    uiClass = '.ui-dialog',
+                    ui;
+
+                dialog.dropdownDialog({
+                    'createTitleBar': true
+                });
+
+                ui = $(uiClass);
+                expect(ui.find('.ui-dialog-titlebar').length > 0).toBeTruthy();
+
+                dialog.dropdownDialog('destroy');
+
+                dialog.dropdownDialog({
+                    'createTitleBar': false
+                });
+
+                ui = $(uiClass);
+                expect(ui.find('.ui-dialog-titlebar').length <= 0).toBeTruthy();
+
+                dialog.dropdownDialog('destroy');
+            });
+        }
+
+        it('check if the position function gets disabled', function () {
+            var dialog = $('<div/>'),
+                uiClass = '.ui-dialog',
+                ui;
+
+            dialog.dropdownDialog({
+                'autoPosition': false
+            });
+
+            ui = $(uiClass);
+            dialog.dropdownDialog('open');
+            expect(ui.css('top') === 'auto').toBeTruthy();
+
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'autoPosition': true
+            });
+
+            ui = $(uiClass);
+            dialog.dropdownDialog('open');
+            expect(ui.css('top') !== '0px').toBeTruthy();
+
+            dialog.dropdownDialog('destroy');
+        });
+
+        it('check if the size function gets disabled', function () {
+            var dialog = $('<div/>'),
+                uiClass = '.ui-dialog',
+                ui;
+
+            dialog.dropdownDialog({
+                'autoSize': true,
+                'width': '300'
+            });
+
+            ui = $(uiClass);
+            dialog.dropdownDialog('open');
+            expect(ui.css('width') === '300px').toBeTruthy();
+
+            dialog.dropdownDialog('destroy');
+
+            dialog.dropdownDialog({
+                'autoSize': false,
+                'width': '300'
+            });
+
+            ui = $(uiClass);
+            dialog.dropdownDialog('open');
+            expect(ui.css('width') === '300px').toBeFalsy();
+
+            dialog.dropdownDialog('destroy');
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/form.test.js b/dev/tests/js/jasmine/tests/lib/mage/form.test.js
new file mode 100644
index 0000000000000..6202f93da999a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/form.test.js
@@ -0,0 +1,262 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+/* jscs:disable jsDoc */
+
+define([
+    'jquery',
+    'mage/backend/form'
+], function ($) {
+    'use strict';
+
+    /*
+     * jQuery ui version 1.9.2 belongs to the adminhtml.
+     *
+     * This test will fail on frontend since mage/backend/form only belongs to backend.
+     */
+    if ($.ui.version === '1.9.2') {
+        describe('Test for mage/form jQuery plugin', function () {
+            var id = 'edit_form',
+                elementId = '#' + id;
+
+            beforeEach(function () {
+                var element = $('<form id="' + id + '" action="action/url" method="GET" target="_self" ></form>');
+
+                element.appendTo('body');
+            });
+
+            afterEach(function () {
+                $(elementId).remove();
+            });
+
+            it('check if form can be initialized', function () {
+                var form = $(elementId).form();
+
+                expect(form.is(':mage-form')).toBeTruthy();
+            });
+
+            it('check get handlers', function () {
+                var form = $(elementId).form(),
+                    handlersData = form.form('option', 'handlersData'),
+                    handlers = [];
+
+                $.each(handlersData, function (key) {
+                    handlers.push(key);
+                });
+                expect(handlers.join(' ')).toBe(form.data('form')._getHandlers().join(' '));
+            });
+
+            it('check store attribute', function () {
+                var form = $(elementId).form(),
+                    initialFormAttrs = {
+                        action: form.attr('action'),
+                        target: form.attr('target'),
+                        method: form.attr('method')
+                    };
+
+                form.data('form')._storeAttribute('action');
+                form.data('form')._storeAttribute('target');
+                form.data('form')._storeAttribute('method');
+
+                expect(form.data('form').oldAttributes.action).toBe(initialFormAttrs.action);
+                expect(form.data('form').oldAttributes.target).toBe(initialFormAttrs.target);
+                expect(form.data('form').oldAttributes.method).toBe(initialFormAttrs.method);
+            });
+
+            it('check bind', function () {
+                var form = $(elementId).form(),
+                    submitted = false,
+                    handlersData = form.form('option', 'handlersData');
+
+                form.on('submit', function (e) {
+                    submitted = true;
+                    e.stopImmediatePropagation();
+                    e.preventDefault();
+                });
+
+                $.each(handlersData, function (key) {
+                    form.trigger(key);
+                    expect(submitted).toBeTruthy();
+                    submitted = false;
+                });
+
+                form.off('submit');
+            });
+
+            it('check get action URL', function () {
+                var form = $(elementId).form(),
+                    action = form.attr('action'),
+                    testUrl = 'new/action/url',
+                    testArgs = {
+                        args: {
+                            arg: 'value'
+                        }
+                    };
+
+                form.data('form')._storeAttribute('action');
+                expect(form.data('form')._getActionUrl(testArgs)).toBe(action + '/arg/value/');
+                expect(form.data('form')._getActionUrl(testUrl)).toBe(testUrl);
+                expect(form.data('form')._getActionUrl()).toBe(action);
+            });
+
+            it('check process data', function () {
+                var form = $(elementId).form(),
+                    initialFormAttrs = {
+                        action: form.attr('action'),
+                        target: form.attr('target'),
+                        method: form.attr('method')
+                    },
+                    testSimpleData = {
+                        action: 'new/action/url',
+                        target: '_blank',
+                        method: 'POST'
+                    },
+                    testActionArgsData = {
+                        action: {
+                            args: {
+                                arg: 'value'
+                            }
+                        }
+                    },
+                    processedData = form.data('form')._processData(testSimpleData);
+
+                expect(form.data('form').oldAttributes.action).toBe(initialFormAttrs.action);
+                expect(form.data('form').oldAttributes.target).toBe(initialFormAttrs.target);
+                expect(form.data('form').oldAttributes.method).toBe(initialFormAttrs.method);
+                expect(processedData.action).toBe(testSimpleData.action);
+                expect(processedData.target).toBe(testSimpleData.target);
+                expect(processedData.method).toBe(testSimpleData.method);
+
+                form.data('form')._rollback();
+                processedData = form.data('form')._processData(testActionArgsData);
+                form.data('form')._storeAttribute('action');
+                expect(processedData.action).toBe(form.data('form')._getActionUrl(testActionArgsData.action));
+            });
+
+            it('check before submit', function () {
+                var testForm = $('<form id="test-form"></form>').appendTo('body'),
+                    testHandler = {
+                        action: {
+                            args: {
+                                arg1: 'value1'
+                            }
+                        }
+                    },
+                    form = $(elementId).form({
+                        handlersData: {
+                            testHandler: testHandler
+                        }
+                    }),
+                    beforeSubmitData = {
+                        action: {
+                            args: {
+                                arg2: 'value2'
+                            }
+                        },
+                        target: '_blank'
+                    },
+                    eventData = {
+                        method: 'POST'
+                    },
+                    resultData = $.extend(true, {}, testHandler, beforeSubmitData, eventData);
+
+                form.data('form')._storeAttribute('action');
+                resultData = form.data('form')._processData(resultData);
+                testForm.prop(resultData);
+
+                form.on('beforeSubmit', function (e, data) {
+                    $.extend(data, beforeSubmitData);
+                });
+
+                form.on('submit', function (e) {
+                    e.stopImmediatePropagation();
+                    e.preventDefault();
+                });
+
+                form.data('form')._beforeSubmit('testHandler', eventData);
+                expect(testForm.prop('action')).toBe(form.prop('action'));
+                expect(testForm.prop('target')).toBe(form.prop('target'));
+                expect(testForm.prop('method')).toBe(form.prop('method'));
+            });
+
+            it('check submit', function () {
+                var formSubmitted = false,
+                    form = $(elementId).form({
+                        handlersData: {
+                            save: {}
+                        }
+                    });
+
+                form.data('form')._storeAttribute('action');
+                form.data('form')._storeAttribute('target');
+                form.data('form')._storeAttribute('method');
+
+                form.on('submit', function (e) {
+                    e.preventDefault();
+                    e.stopImmediatePropagation();
+                    e.preventDefault();
+                    formSubmitted = true;
+                }).prop({
+                    action: 'new/action/url',
+                    target: '_blank',
+                    method: 'POST'
+                });
+
+                form.data('form')._submit({
+                    type: 'save'
+                });
+
+                expect(form.attr('action')).toBe(form.data('form').oldAttributes.action);
+                expect(form.attr('target')).toBe(form.data('form').oldAttributes.target);
+                expect(form.attr('method')).toBe(form.data('form').oldAttributes.method);
+                expect(formSubmitted).toBeTruthy();
+
+                form.off('submit');
+            });
+
+            it('check build URL', function () {
+                var dataProvider = [
+                        {
+                            params: ['http://domain.com//', {
+                                'key[one]': 'value 1',
+                                'key2': '# value'
+                            }],
+                            expected: 'http://domain.com/key[one]/value%201/key2/%23%20value/'
+                        },
+                        {
+                            params: ['http://domain.com', {
+                                'key[one]': 'value 1',
+                                'key2': '# value'
+                            }],
+                            expected: 'http://domain.com/key[one]/value%201/key2/%23%20value/'
+                        },
+                        {
+                            params: ['http://domain.com?some=param', {
+                                'key[one]': 'value 1',
+                                'key2': '# value'
+                            }],
+                            expected: 'http://domain.com?some=param&key[one]=value%201&key2=%23%20value'
+                        },
+                        {
+                            params: ['http://domain.com?some=param&', {
+                                'key[one]': 'value 1',
+                                'key2': '# value'
+                            }],
+                            expected: 'http://domain.com?some=param&key[one]=value%201&key2=%23%20value'
+                        }
+                    ],
+                    method = $.mage.form._proto._buildURL,
+                    quantity = dataProvider.length,
+                    i = 0;
+
+                expect(quantity).toBeTruthy();
+
+                for (i; i < quantity; i++) {
+                    expect(dataProvider[i].expected).toBe(method.apply(null, dataProvider[i].params));
+                }
+            });
+        });
+    }
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/loader.test.js b/dev/tests/js/jasmine/tests/lib/mage/loader.test.js
new file mode 100644
index 0000000000000..93dd2ee91902c
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/loader.test.js
@@ -0,0 +1,79 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'mage/loader'
+], function ($) {
+    'use strict';
+
+    describe('mage/loader', function () {
+        describe('Check loader', function () {
+            var loaderSelector = '#loader';
+
+            beforeEach(function () {
+                var $loader = $('<div id="loader"/>');
+
+                $('body').append($loader);
+            });
+
+            afterEach(function () {
+                $(loaderSelector).remove();
+                $(loaderSelector).loader('destroy');
+            });
+
+            it('Check that loader inited', function () {
+                var $loader = $(loaderSelector).loader({
+                    icon: 'icon.gif'
+                });
+
+                $loader.loader('show');
+
+                expect($loader.is(':mage-loader')).toBe(true);
+                expect($loader.find('p').text()).toBe('Please wait...');
+                expect($loader.find('img').prop('src').split('/').pop()).toBe('icon.gif');
+                expect($loader.find('img').prop('alt')).toBe('Loading...');
+            });
+
+            it('Body init', function () {
+                var $loader = $('body').loader();
+
+                $loader.loader('show');
+
+                expect($loader.is(':mage-loader')).toBe(true);
+                $loader.loader('destroy');
+            });
+
+            it('Check show/hide', function () {
+                var $loader = $(loaderSelector).loader(),
+                    $loadingMask;
+
+                $loader.loader('show');
+                $loadingMask = $('.loading-mask');
+                expect($loadingMask.is(':visible')).toBe(true);
+
+                $loader.loader('hide');
+                expect($loadingMask.is(':hidden')).toBe(true);
+
+                $loader.loader('show');
+                $loader.trigger('processStop');
+                expect($loadingMask.is(':hidden')).toBe(true);
+            });
+
+            it('Check destroy', function () {
+                var $loader = $(loaderSelector).loader(),
+                    $loadingMask;
+
+                $loader.loader('show');
+                $loadingMask = $('.loading-mask');
+                expect($loadingMask.is(':visible')).toBe(true);
+
+                $loader.loader('destroy');
+                expect($loadingMask.is(':visible')).toBe(false);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/menu.test.js b/dev/tests/js/jasmine/tests/lib/mage/menu.test.js
new file mode 100644
index 0000000000000..69d8af4ff3dba
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/menu.test.js
@@ -0,0 +1,110 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'mage/menu',
+    'text!tests/assets/lib/web/mage/menu.html'
+], function ($, menu, menuTmpl) {
+    'use strict';
+
+    describe('mage/menu', function () {
+        describe('Menu expanded', function () {
+            var menuSelector = '#menu';
+
+            beforeEach(function () {
+                var $menu = $(menuTmpl);
+
+                $('body').append($menu);
+            });
+
+            afterEach(function () {
+                $(menuSelector).remove();
+            });
+
+            it('Check that menu expanded', function () {
+                var $menu = $(menuSelector),
+                    $menuItems = $menu.find('li'),
+                    $submenu = $menuItems.find('ul');
+
+                menu.menu({
+                    expanded: true
+                }, $menu);
+                expect($submenu.hasClass('expanded')).toBe(true);
+            });
+        });
+
+        describe('Menu hover event', function () {
+            var menuSelector = '#menu',
+                $menu;
+
+            beforeEach(function () {
+                var $menuObject = $(menuTmpl);
+
+                $('body').append($menuObject);
+                $menu = $(menuSelector).menu({
+                    delay: 0,
+                    showDelay: 0,
+                    hideDelay: 0
+                });
+            });
+
+            afterEach(function () {
+                $(menuSelector).remove();
+            });
+
+            it('Check that menu expanded', function (done) {
+                var $menuItem = $menu.find('li.test-menu-item'),
+                    $submenu = $menuItem.find('ul');
+
+                $menuItem.trigger('mouseover');
+                setTimeout(function () {
+                    expect($submenu.attr('aria-expanded')).toBe('true');
+                    $menuItem.trigger('mouseout');
+                    setTimeout(function () {
+                        expect($submenu.attr('aria-expanded')).toBe('false');
+                        done();
+                    }, 300);
+                }, 300);
+            });
+        });
+
+        describe('Menu navigation', function () {
+            var menuSelector = '#menu',
+                $menu;
+
+            beforeEach(function () {
+                var $menuObject = $(menuTmpl);
+
+                $('body').append($menuObject);
+                $menu = $(menuSelector).menu();
+            });
+
+            afterEach(function () {
+                $(menuSelector).remove();
+            });
+
+            it('Check max item limit', function () {
+                var $menuItems;
+
+                $menu.navigation({
+                    maxItems: 3
+                });
+                $menuItems = $menu.find('li:visible');
+
+                expect($menuItems.length).toBe(4);
+            });
+
+            it('Check that More Menu item will be added', function () {
+                $menu.navigation({
+                    responsive: 'onResize'
+                });
+
+                expect($('body').find('.ui-menu-more').length).toBeGreaterThan(0);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/misc.test.js b/dev/tests/js/jasmine/tests/lib/mage/misc.test.js
index 45bbe5011c98f..f5dcd166149ef 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/misc.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/misc.test.js
@@ -11,6 +11,40 @@ define([
 
     describe('mageUtils', function () {
 
+        it('Check getUrlParameters function', function () {
+            var fixture,
+                url,
+                getParameters;
+
+            fixture = {
+                'not valid url': {},
+                'http://example.com/catalogsearch/result/': {},
+                'http://example.com/catalogsearch/result/?': {},
+                'http://example.com/catalogsearch/result/?q': {
+                    q: ''
+                },
+                'http://example.com/catalogsearch/result/?q=': {
+                    q: ''
+                },
+                'http://example.com/catalogsearch/result/?q=+Simple+99%2C+8%2F%3F&cat=3': {
+                    q: ' Simple 99, 8/?',
+                    cat: '3'
+                },
+                'http://example.com/catalogsearch/result/?q=Simple&cat=3&p=1': {
+                    q: 'Simple',
+                    cat: '3',
+                    p: '1'
+                }
+            };
+
+            for (url in fixture) {
+                if (fixture.hasOwnProperty(url)) {
+                    getParameters = fixture[url];
+                    expect(utils.getUrlParameters(url)).toEqual(getParameters);
+                }
+            }
+        });
+
         it('Check convertToMomentFormat function', function () {
             var format, momentFormat;
 
@@ -35,13 +69,13 @@ define([
         it('Check convertToMomentFormat function for all Magento supported locales', function () {
 
             var fixture,
-            localeValues,
-            format,
-            expectedValue,
-            momentFormat,
-            dt,
-            m,
-            p;
+                localeValues,
+                format,
+                expectedValue,
+                momentFormat,
+                dt,
+                m,
+                p;
 
             fixture = {
                 'af_ZA': {
diff --git a/dev/tests/js/jasmine/tests/lib/mage/tabs.test.js b/dev/tests/js/jasmine/tests/lib/mage/tabs.test.js
new file mode 100644
index 0000000000000..a6138df073434
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/tabs.test.js
@@ -0,0 +1,93 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'jquery/ui',
+    'mage/tabs',
+    'text!tests/assets/lib/web/mage/tabs.html'
+], function ($, ui, tabs, tabsTmpl) {
+    'use strict';
+
+    describe('mage/tabs', function () {
+        var tabsSelector = '#tabs';
+
+        beforeEach(function () {
+            var $tabs = $(tabsTmpl);
+
+            $('body').append($tabs);
+        });
+
+        afterEach(function () {
+            $(tabsSelector).remove();
+            $(tabsSelector).tabs('destroy');
+        });
+
+        it('Check tabs inited', function () {
+            var $tabs = $(tabsSelector).tabs();
+
+            expect($tabs.is(':mage-tabs')).toBe(true);
+        });
+
+        it('Check tabs collapsible inited', function () {
+            var $title1 = $('#title1'),
+                $title2 = $('#title2');
+
+            $(tabsSelector).tabs();
+
+            expect($title1.is(':mage-collapsible')).toBe(true);
+            expect($title2.is(':mage-collapsible')).toBe(true);
+        });
+
+        it('Check tabs active', function () {
+            var $content1 = $('#content1'),
+                $content2 = $('#content2');
+
+            $(tabsSelector).tabs({
+                active: 1
+            });
+
+            expect($content1.is(':hidden')).toBe(true);
+            expect($content2.is(':visible')).toBe(true);
+        });
+
+        it('Check tabs closing others tabs when one gets activated', function () {
+            var $title2 = $('#title2'),
+                $content1 = $('#content1'),
+                $content2 = $('#content2');
+
+            $(tabsSelector).tabs();
+
+            expect($content1.is(':visible')).toBe(true);
+            expect($content2.is(':hidden')).toBe(true);
+
+            $title2.trigger('click');
+
+            expect($content1.is(':hidden')).toBe(true);
+            expect($content2.is(':visible')).toBe(true);
+        });
+
+        it('Check tabs enable,disable,activate,deactivate options', function () {
+            var $title1 = $('#title1'),
+                $content1 = $('#content1'),
+                $tabs = $(tabsSelector).tabs();
+
+            expect($content1.is(':visible')).toBe(true);
+            $tabs.tabs('deactivate', 0);
+            expect($content1.is(':hidden')).toBe(true);
+            $tabs.tabs('activate', 0);
+            expect($content1.is(':visible')).toBe(true);
+            $tabs.tabs('disable', 0);
+            expect($content1.is(':hidden')).toBe(true);
+            $title1.trigger('click');
+            expect($content1.is(':hidden')).toBe(true);
+            $tabs.tabs('enable', 0);
+            expect($content1.is(':visible')).toBe(true);
+            $title1.trigger('click');
+            expect($content1.is(':visible')).toBe(true);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/translate-inline.test.js b/dev/tests/js/jasmine/tests/lib/mage/translate-inline.test.js
new file mode 100644
index 0000000000000..bcdfc4cc59705
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/translate-inline.test.js
@@ -0,0 +1,111 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'mage/translate-inline',
+    'text!tests/assets/lib/web/mage/translate-inline.html'
+], function ($, TranslateInline, translateTmpl) {
+    'use strict';
+
+    describe('mage/translate-inline', function () {
+        describe('Check translate', function () {
+            var translateSelector = '[data-role="translate-dialog"]',
+                translateTemplateSelector = '#translate-form-template';
+
+            beforeEach(function () {
+                var translateBlock = $(translateTmpl);
+
+                $('body').append(translateBlock);
+            });
+
+            afterEach(function () {
+                $(translateSelector).remove();
+                $(translateSelector).translateInline('destroy');
+                $(translateTemplateSelector).remove();
+            });
+
+            it('Check that translate inited', function () {
+                var translateInline = $(translateSelector).translateInline();
+
+                expect(translateInline.is(':mage-translateInline')).toBe(true);
+            });
+
+            it('Check that translate hidden on init and visible on trigger', function () {
+                var translateInline = $(translateSelector).translateInline({
+                        id: 'dialog-id'
+                    }),
+                    isDialogHiddenOnInit = translateInline.is(':hidden'),
+                    dialogVisibleAfterTriggerEdit;
+
+                translateInline.trigger('edit.editTrigger');
+                dialogVisibleAfterTriggerEdit = translateInline.is(':visible');
+                expect(isDialogHiddenOnInit).toBe(true);
+                expect(dialogVisibleAfterTriggerEdit).toBe(true);
+            });
+
+            it('Check translation form template', function () {
+                var translateFormId = 'translate-form-id',
+                    translateFormContent = 'New Template Variable',
+                    translateInline = $(translateSelector).translateInline({
+                        translateForm: {
+                            data: {
+                                id: translateFormId,
+                                newTemplateVariable: translateFormContent
+                            }
+                        }
+                    }),
+                    $translateForm;
+
+                translateInline.trigger('edit.editTrigger');
+                $translateForm = $('#' + translateFormId);
+
+                expect($translateForm.length).toBeGreaterThan(0);
+                expect($translateForm.text()).toBe(translateFormContent);
+            });
+
+            it('Check translation submit', function () {
+                var options = {
+                        ajaxUrl: 'www.test.com',
+                        area: 'test',
+                        translateForm: {
+                            template: '<form id="<%= data.id %>"><input name="test" value="test" /></form>',
+                            data: {
+                                id: 'translate-form-id'
+                            }
+                        }
+                    },
+                    expectedEequestData = 'area=test&test=test',
+                    translateInline = $(translateSelector).translateInline(options),
+                    $submitButton = $('body').find('.action-primary'),
+                    originalAjax = $.ajax;
+
+                $.ajax = jasmine.createSpy().and.callFake(function (request) {
+                    expect(request.url).toBe(options.ajaxUrl);
+                    expect(request.type).toBe('POST');
+                    expect(request.data).toBe(expectedEequestData);
+
+                    return {
+                        complete: jasmine.createSpy()
+                    };
+                });
+
+                translateInline.trigger('edit.editTrigger');
+                $submitButton.trigger('click');
+                $.ajax = originalAjax;
+            });
+
+            it('Check translation destroy', function () {
+                var translateInline = $(translateSelector).translateInline();
+
+                translateInline.trigger('edit.editTrigger');
+                expect(translateInline.is(':mage-translateInline')).toBe(true);
+                translateInline.translateInline('destroy');
+                expect(translateInline.is(':mage-translateInline')).toBe(false);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/translate.test.js b/dev/tests/js/jasmine/tests/lib/mage/translate.test.js
new file mode 100644
index 0000000000000..c87cfa227c1aa
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/translate.test.js
@@ -0,0 +1,49 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    describe('Test for mage/translate jQuery plugin', function () {
+        it('works with one string as parameter', function () {
+            $.mage.translate.add('Hello World!');
+            expect('Hello World!').toEqual($.mage.translate.translate('Hello World!'));
+        });
+        it('works with one array as parameter', function () {
+            $.mage.translate.add(['Hello World!', 'Bonjour tout le monde!']);
+            expect('Hello World!').toEqual($.mage.translate.translate('Hello World!'));
+        });
+        it('works with one object as parameter', function () {
+            var translation = {
+                'Hello World!': 'Bonjour tout le monde!'
+            };
+
+            $.mage.translate.add(translation);
+            expect(translation['Hello World!']).toEqual($.mage.translate.translate('Hello World!'));
+
+            translation = {
+                'Hello World!': 'Hallo Welt!',
+                'Some text with symbols!-+"%#*': 'Ein Text mit Symbolen!-+"%#*'
+            };
+
+            $.mage.translate.add(translation);
+            $.each(translation, function (key) {
+                expect(translation[key]).toEqual($.mage.translate.translate(key));
+            });
+        });
+        it('works with two string as parameter', function () {
+            $.mage.translate.add('Hello World!', 'Bonjour tout le monde!');
+            expect('Bonjour tout le monde!').toEqual($.mage.translate.translate('Hello World!'));
+        });
+        it('works with translation alias __', function () {
+            $.mage.translate.add('Hello World!');
+            expect('Hello World!').toEqual($.mage.__('Hello World!'));
+        });
+    });
+
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
index 50931f940c689..ca9ec877013f8 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
@@ -183,4 +183,983 @@ define([
             )).toEqual(true);
         });
     });
+
+    describe('Testing validate-no-html-tags', function () {
+        it('validate-no-html-tags', function () {
+            expect($.validator.methods['validate-no-html-tags']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-no-html-tags']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-no-html-tags']
+                .call($.validator.prototype, 'abc')).toEqual(true);
+            expect($.validator.methods['validate-no-html-tags']
+                .call($.validator.prototype, '<div>abc</div>')).toEqual(false);
+        });
+    });
+
+    describe('Testing allow-container-className', function () {
+        it('allow-container-className', function () {
+            var radio = $('<input type="radio" class="change-container-classname"/>'),
+                checkbox = $('<input type="checkbox" class="change-container-classname"/>'),
+                radio2 = $('<input type="radio"/>'),
+                checkbox2 = $('<input type="checkbox"/>');
+
+            expect($.validator.methods['allow-container-className']
+                .call($.validator.prototype, radio[0])).toEqual(true);
+            expect($.validator.methods['allow-container-className']
+                .call($.validator.prototype, checkbox[0])).toEqual(true);
+            expect($.validator.methods['allow-container-className']
+                .call($.validator.prototype, radio2[0])).toEqual(false);
+            expect($.validator.methods['allow-container-className']
+                .call($.validator.prototype, checkbox2[0])).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-select', function () {
+        it('validate-select', function () {
+            expect($.validator.methods['validate-select']
+                .call($.validator.prototype, '')).toEqual(false);
+            expect($.validator.methods['validate-select']
+                .call($.validator.prototype, 'none')).toEqual(false);
+            expect($.validator.methods['validate-select']
+                .call($.validator.prototype, null)).toEqual(false);
+            expect($.validator.methods['validate-select']
+                .call($.validator.prototype, undefined)).toEqual(false);
+            expect($.validator.methods['validate-select']
+                .call($.validator.prototype, 'abc')).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-no-empty', function () {
+        it('validate-no-empty', function () {
+            expect($.validator.methods['validate-no-empty']
+                .call($.validator.prototype, '')).toEqual(false);
+            expect($.validator.methods['validate-no-empty']
+                .call($.validator.prototype, null)).toEqual(false);
+            expect($.validator.methods['validate-no-empty']
+                .call($.validator.prototype, undefined)).toEqual(false);
+            expect($.validator.methods['validate-no-empty']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-no-empty']
+                .call($.validator.prototype, 'test')).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-alphanum-with-spaces', function () {
+        it('validate-alphanum-with-spaces', function () {
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, '   ')).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, 'abc   ')).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, ' 123  ')).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, '  abc123 ')).toEqual(true);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, '  !@# ')).toEqual(false);
+            expect($.validator.methods['validate-alphanum-with-spaces']
+                .call($.validator.prototype, '  abc.123 ')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-phoneStrict', function () {
+        it('validate-phoneStrict', function () {
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '5121231234')).toEqual(false);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '512.123.1234')).toEqual(false);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '512-123-1234')).toEqual(true);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '(512)123-1234')).toEqual(true);
+            expect($.validator.methods['validate-phoneStrict']
+                .call($.validator.prototype, '(512) 123-1234')).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-phoneLax', function () {
+        it('validate-phoneLax', function () {
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '5121231234')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '512.123.1234')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '512-123-1234')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '(512)123-1234')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '(512) 123-1234')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '(512)1231234')).toEqual(true);
+            expect($.validator.methods['validate-phoneLax']
+                .call($.validator.prototype, '(512)_123_1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-fax', function () {
+        it('validate-fax', function () {
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '5121231234')).toEqual(false);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '512.123.1234')).toEqual(false);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '512-123-1234')).toEqual(true);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '(512)123-1234')).toEqual(true);
+            expect($.validator.methods['validate-fax']
+                .call($.validator.prototype, '(512) 123-1234')).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-email', function () {
+        it('validate-email', function () {
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, '123@123.com')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, 'abc@124.en')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, 'abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, 'abc.abc.abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, 'abc.abc-abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, 'abc.abc_abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-email']
+                .call($.validator.prototype, 'abc.abc_abc@abc')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-emailSender', function () {
+        it('validate-emailSender', function () {
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, '   ')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, '123@123.com')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, 'abc@124.en')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, 'abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, 'abc.abc.abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, 'abc.abc-abc@abc.commmmm')).toEqual(true);
+            expect($.validator.methods['validate-emailSender']
+                .call($.validator.prototype, 'abc.abc_abc@abc.commmmm')).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-password', function () {
+        it('validate-password', function () {
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, null)).toEqual(false);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, undefined)).toEqual(false);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, '   ')).toEqual(true);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, '123@123.com')).toEqual(true);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, 'abc')).toEqual(false);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, 'abc       ')).toEqual(false);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, '     abc      ')).toEqual(false);
+            expect($.validator.methods['validate-password']
+                .call($.validator.prototype, 'dddd')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-admin-password', function () {
+        it('validate-admin-password', function () {
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, null)).toEqual(false);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, undefined)).toEqual(false);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, '   ')).toEqual(true);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, '123@123.com')).toEqual(true);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, 'abc')).toEqual(false);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, 'abc       ')).toEqual(false);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, '     abc      ')).toEqual(false);
+            expect($.validator.methods['validate-admin-password']
+                .call($.validator.prototype, 'dddd')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-url', function () {
+        it('validate-url', function () {
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, 'http://www.google.com')).toEqual(true);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, 'http://127.0.0.1:8080/index.php')).toEqual(true);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, 'http://app-spot.com/index.php')).toEqual(true);
+            expect($.validator.methods['validate-url']
+                .call($.validator.prototype, 'http://app-spot_space.com/index.php')).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-clean-url', function () {
+        it('validate-clean-url', function () {
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, 'http://www.google.com')).toEqual(true);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, 'http://127.0.0.1:8080/index.php')).toEqual(false);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, 'http://127.0.0.1:8080')).toEqual(false);
+            expect($.validator.methods['validate-clean-url']
+                .call($.validator.prototype, 'http://127.0.0.1')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-xml-identifier', function () {
+        it('validate-xml-identifier', function () {
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, 'abc')).toEqual(true);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, 'abc_123')).toEqual(true);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, 'abc-123')).toEqual(true);
+            expect($.validator.methods['validate-xml-identifier']
+                .call($.validator.prototype, '123-abc')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-ssn', function () {
+        it('validate-ssn', function () {
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, 'abc')).toEqual(false);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, '123-13-1234')).toEqual(true);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, '012-12-1234')).toEqual(true);
+            expect($.validator.methods['validate-ssn']
+                .call($.validator.prototype, '23-12-1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-zip-us', function () {
+        it('validate-zip-us', function () {
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, '12345-1234')).toEqual(true);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, '02345')).toEqual(true);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, '1234')).toEqual(false);
+            expect($.validator.methods['validate-zip-us']
+                .call($.validator.prototype, '1234-1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-date-au', function () {
+        it('validate-date-au', function () {
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, '01/01/2012')).toEqual(true);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, '30/01/2012')).toEqual(true);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, '01/30/2012')).toEqual(false);
+            expect($.validator.methods['validate-date-au']
+                .call($.validator.prototype, '1/1/2012')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-currency-dollar', function () {
+        it('validate-currency-dollar', function () {
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, '$123')).toEqual(true);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, '$1,123.00')).toEqual(true);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, '$1234')).toEqual(true);
+            expect($.validator.methods['validate-currency-dollar']
+                .call($.validator.prototype, '$1234.1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-not-negative-number', function () {
+        it('validate-not-negative-number', function () {
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '0')).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '1')).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '1234')).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '1,234.1234')).toEqual(true);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '-1')).toEqual(false);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '-1e')).toEqual(false);
+            expect($.validator.methods['validate-not-negative-number']
+                .call($.validator.prototype, '-1,234.1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-greater-than-zero', function () {
+        it('validate-greater-than-zero', function () {
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '0')).toEqual(false);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '1')).toEqual(true);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '1234')).toEqual(true);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '1,234.1234')).toEqual(true);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '-1')).toEqual(false);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '-1e')).toEqual(false);
+            expect($.validator.methods['validate-greater-than-zero']
+                .call($.validator.prototype, '-1,234.1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-css-length', function () {
+        it('validate-css-length', function () {
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, null)).toEqual(false);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, undefined)).toEqual(false);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '0')).toEqual(true);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '1')).toEqual(true);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '1234')).toEqual(true);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '1,234.1234')).toEqual(false);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '-1')).toEqual(false);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '-1e')).toEqual(false);
+            expect($.validator.methods['validate-css-length']
+                .call($.validator.prototype, '-1,234.1234')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-data', function () {
+        it('validate-data', function () {
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, '')).toEqual(true);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, null)).toEqual(true);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, undefined)).toEqual(true);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, '   ')).toEqual(false);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, '123abc')).toEqual(false);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, 'abc')).toEqual(true);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, ' abc')).toEqual(false);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, 'abc123')).toEqual(true);
+            expect($.validator.methods['validate-data']
+                .call($.validator.prototype, 'abc-123')).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-one-required-by-name', function () {
+        it('validate-one-required-by-name', function () {
+            var radio = $('<input type="radio" name="radio"/>'),
+                radio2 = $('<input type="radio" name="radio" checked/>'),
+                checkbox = $('<input type="checkbox" name="checkbox"/>'),
+                checkbox2 = $('<input type="checkbox" name="checkbox" checked/>'),
+                $test = $('<div id="test-block" />'),
+                prevForm = $.validator.prototype.currentForm;
+
+            $.validator.prototype.currentForm = $test[0];
+
+            $test.append(radio);
+            expect($.validator.methods['validate-one-required-by-name']
+                .call($.validator.prototype, null, radio[0], true)).toEqual(false);
+            $test.append(radio2);
+            expect($.validator.methods['validate-one-required-by-name']
+                .call($.validator.prototype, null, radio2[0], true)).toEqual(true);
+            $test.append(checkbox);
+            expect($.validator.methods['validate-one-required-by-name']
+                .call($.validator.prototype, null, checkbox[0], true)).toEqual(false);
+            $test.append(checkbox2);
+            expect($.validator.methods['validate-one-required-by-name']
+                .call($.validator.prototype, null, checkbox2[0], true)).toEqual(true);
+
+            $.validator.prototype.currentForm = prevForm;
+        });
+    });
+
+    describe('Testing less-than-equals-to', function () {
+        it('less-than-equals-to', function () {
+            var elm1 =  $('<input type="text" value="6" id="element1" />'),
+                elm2 =  $('<input type="text" value="5" id="element2" />'),
+                elm3 =  $('<input type="text" id="element3" />'),
+                elm4 =  $('<input type="text" value=5 id="element4" />'),
+                elm5 =  $('<input type="text" id="element6" />'),
+                elm6 =  $('<input type="text" value=6 id="element5" />'),
+                elm7 =  $('<input type="text" value=20 id="element7" />'),
+                elm8 =  $('<input type="text" value=100 id="element8" />');
+
+            expect($.validator.methods['less-than-equals-to']
+                .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(false);
+            elm1[0].value = 4;
+            expect($.validator.methods['less-than-equals-to']
+                .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(true);
+            expect($.validator.methods['less-than-equals-to']
+                .call($.validator.prototype, elm3[0].value, elm3, elm4)).toEqual(true);
+            expect($.validator.methods['less-than-equals-to']
+                .call($.validator.prototype, elm5[0].value, elm5, elm6)).toEqual(true);
+            expect($.validator.methods['less-than-equals-to']
+                .call($.validator.prototype, elm7[0].value, elm7, elm8)).toEqual(true);
+        });
+    });
+
+    describe('Testing greater-than-equals-to', function () {
+        it('greater-than-equals-to', function () {
+            var elm1 =  $('<input type="text" value=6 id="element1" />'),
+                elm2 =  $('<input type="text" value=7 id="element2" />'),
+                elm3 =  $('<input type="text" id="element3" />'),
+                elm4 =  $('<input type="text" value=5 id="element4" />'),
+                elm5 =  $('<input type="text" id="element6" />'),
+                elm6 =  $('<input type="text" value=6 id="element5" />'),
+                elm7 =  $('<input type="text" value=100 id="element7" />'),
+                elm8 =  $('<input type="text" value=20 id="element8" />');
+
+            expect($.validator.methods['greater-than-equals-to']
+                .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(false);
+            elm1[0].value = 9;
+            expect($.validator.methods['greater-than-equals-to']
+                .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(true);
+            expect($.validator.methods['greater-than-equals-to']
+                .call($.validator.prototype, elm3[0].value, elm3, elm4)).toEqual(true);
+            expect($.validator.methods['greater-than-equals-to']
+                .call($.validator.prototype, elm5[0].value, elm5, elm6)).toEqual(true);
+            expect($.validator.methods['greater-than-equals-to']
+                .call($.validator.prototype, elm7[0].value, elm7, elm8)).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-cc-type-select', function () {
+        it('validate-cc-type-select', function () {
+            var visaValid = $('<input id="visa-valid" type="text" value="4916808263499650"/>'),
+                visaInvalid = $('<input id="visa-invalid" type="text" value="1234567890123456"/>'),
+                mcValid = $('<input id="mc-valid" type="text" value="5203731841177490"/>'),
+                mcInvalid = $('<input id="mc-invalid" type="text" value="1111222233334444"/>'),
+                aeValid = $('<input id="ae-valid" type="text" value="376244899619217"/>'),
+                aeInvalid = $('<input id="ae-invalid" type="text" value="123451234512345"/>'),
+                diValid = $('<input id="di-valid" type="text" value="6011050000000009"/>'),
+                diInvalid = $('<input id="di-invalid" type="text" value="6011199900000005"/>'),
+                dnValid = $('<input id="dn-valid" type="text" value="3095434000000001"/>'),
+                dnInvalid = $('<input id="dn-invalid" type="text" value="3799999900000003"/>'),
+                jcbValid = $('<input id="jcb-valid" type="text" value="3528000000000007"/>'),
+                jcbInvalid = $('<input id="jcb-invalid" type="text" value="359000001111118"/>');
+
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'VI', null, visaValid)).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'VI', null, visaInvalid)).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'MC', null, mcValid)).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'MC', null, mcInvalid)).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'AE', null, aeValid)).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'AE', null, aeInvalid)).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'DI', null, diValid)).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'DI', null, diInvalid)).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'DN', null, dnValid)).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'DN', null, dnInvalid)).toEqual(false);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'JCB', null, jcbValid)).toEqual(true);
+            expect($.validator.methods['validate-cc-type-select']
+                .call($.validator.prototype, 'JCB', null, jcbInvalid)).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-cc-number', function () {
+        it('validate-cc-number', function () {
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '4916835098995909', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '5265071363284878', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6011120623356953', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '371293266574617', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '4916835098995901', null, null)).toEqual(false);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '5265071363284870', null, null)).toEqual(false);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6011120623356951', null, null)).toEqual(false);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '371293266574619', null, null)).toEqual(false);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '2221220000000003', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '2721220000000008', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '601109020000000003', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6011111144444444', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6011222233334444', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6011522233334447', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '601174455555553', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6011745555555550', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '601177455555556', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '601182455555556', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '601187999555558', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '601287999555556', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6444444444444443', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6644444444444441', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3044444444444444', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3064444444444449', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3095444444444442', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3096444444444441', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3696444444444445', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3796444444444444', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3896444444444443', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3528444444444449', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '3529444444444448', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6221262244444440', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6229981111111111', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6249981111111117', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6279981111111110', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6282981111111115', null, null)).toEqual(true);
+            expect($.validator.methods['validate-cc-number']
+                .call($.validator.prototype, '6289981111111118', null, null)).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-cc-type', function () {
+        it('validate-cc-type', function () {
+            var select = $('<select id="cc-type">' +
+                '<option value="">' +
+                '</option><option value="VI">' +
+                '</option><option value="MC">' +
+                '</option><option value="AE">' +
+                '</option><option value="DI">' +
+                '</option><option value="DN">' +
+                '</option><option value="JCB">' +
+                '</option><option value="UP">' +
+                '</option>' +
+                '</select>');
+
+            select.val('VI');
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '4916835098995909', null, select)).toEqual(true);
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '5265071363284878', null, select)).toEqual(false);
+
+            select.val('MC');
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '5265071363284878', null, select)).toEqual(true);
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '4916835098995909', null, select)).toEqual(false);
+
+            select.val('AE');
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '371293266574617', null, select)).toEqual(true);
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '5265071363284878', null, select)).toEqual(false);
+
+            select.val('DI');
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '6011050000000009', null, select)).toEqual(true);
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '371293266574617', null, select)).toEqual(false);
+
+            select.val('DN');
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '3095434000000001', null, select)).toEqual(true);
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '6011050000000009', null, select)).toEqual(false);
+
+            select.val('JCB');
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '3528000000000007', null, select)).toEqual(true);
+            expect($.validator.methods['validate-cc-type']
+                .call($.validator.prototype, '3095434000000001', null, select)).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-cc-exp', function () {
+        it('validate-cc-exp', function () {
+            var year = $('<input id="year" type="text" value="4916808263499650"/>'),
+                currentTime  = new Date(),
+                currentMonth = currentTime.getMonth() + 1,
+                currentYear  = currentTime.getFullYear();
+
+            year.val(currentYear);
+
+            if (currentMonth > 1) {
+                expect($.validator.methods['validate-cc-exp']
+                    .call($.validator.prototype, currentMonth - 1, null, year)).toEqual(false);
+            }
+            expect($.validator.methods['validate-cc-exp']
+                .call($.validator.prototype, currentMonth, null, year)).toEqual(true);
+            year.val(currentYear + 1);
+            expect($.validator.methods['validate-cc-exp']
+                .call($.validator.prototype, currentMonth, null, year)).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-cc-cvn', function () {
+        it('validate-cc-cvn', function () {
+            var ccType = $('<select id="cc-type">' +
+                '<option value=""></option>' +
+                '<option value="VI"></option>' +
+                '<option value="MC"></option>' +
+                '<option value="AE"></option>' +
+                '<option value="DI"></option>' +
+                '</select>');
+
+            ccType.val('VI');
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '123', null, ccType)).toEqual(true);
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '1234', null, ccType)).toEqual(false);
+
+            ccType.val('MC');
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '123', null, ccType)).toEqual(true);
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '1234', null, ccType)).toEqual(false);
+
+            ccType.val('AE');
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '1234', null, ccType)).toEqual(true);
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '123', null, ccType)).toEqual(false);
+
+            ccType.val('DI');
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '123', null, ccType)).toEqual(true);
+            expect($.validator.methods['validate-cc-cvn']
+                .call($.validator.prototype, '1234', null, ccType)).toEqual(false);
+        });
+    });
+
+    describe('Testing validate-number-range', function () {
+        it('validate-number-range', function () {
+            var el1 = $('<input type="text" value="" ' +
+                'class="validate-number-range number-range-10-20 number-range-10-100.20">').get(0);
+
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '-1', null, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '1', null, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '', null, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, null, null, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '0', null, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, 'asds', null, null)).toEqual(false);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '10', null, '10-20.06')).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '15', null, '10-20.06')).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '1', null, '10-20.06')).toEqual(false);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '30', null, '10-20.06')).toEqual(false);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '10', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '15', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '1', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-number-range']
+                .call($.validator.prototype, '30', el1, null)).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-digits-range', function () {
+        it('validate-digits-range', function () {
+            var el1 = $('<input type="text" value="" ' +
+                'class="validate-digits-range digits-range-10-20 digits-range-10-100.20">').get(0);
+
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '-1', null, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '1', null, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '', null, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, null, null, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '0', null, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, 'asds', null, null)).toEqual(false);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '10', null, '10-20')).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '15', null, '10-20')).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '1', null, '10-20')).toEqual(false);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '30', null, '10-20')).toEqual(false);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '30', null, '10-20.06')).toEqual(false);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '10', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '15', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '1', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-digits-range']
+                .call($.validator.prototype, '30', el1, null)).toEqual(false);
+        });
+    });
+
+    describe('Testing 3 bytes characters only policy (UTF-8)', function () {
+        it('rejects data, if any of the characters cannot be stored using UTF-8 collation', function () {
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '😅😂', null
+            )).toEqual(false);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '😅 test 😂', null
+            )).toEqual(false);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '💩 👻 💀', null
+            )).toEqual(false);
+        });
+
+        it('approves data, if all the characters can be stored using UTF-8 collation', function () {
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '!$-_%ç&#?!', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '1234567890', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '   ', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'test', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'испытание', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'тест', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'փորձարկում', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'परीक्षण', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'テスト', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '테스트', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '测试', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, '測試', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'ทดสอบ', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'δοκιμή', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'اختبار', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'تست', null
+            )).toEqual(true);
+            expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+                $.validator.prototype, 'מִבְחָן', null
+            )).toEqual(true);
+        });
+    });
+
+    describe('Testing validate-forbidden-extensions', function () {
+        it('validate-forbidden-extensions', function () {
+            var el1 = $('<input type="text" value="" ' +
+                'class="validate-extensions" data-validation-params="php,phtml">').get(0);
+
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'php', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'php,phtml', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'html', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'html,png', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'php,html', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'html,php', el1, null)).toEqual(false);
+        });
+    });
 });
diff --git a/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js
new file mode 100644
index 0000000000000..39fb5330a038a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js
@@ -0,0 +1,141 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'wysiwygAdapter'
+], function (wysiwygAdapter) {
+    'use strict';
+
+    var obj;
+
+    beforeEach(function () {
+
+        /**
+         * Dummy constructor to use for instantiation
+         * @constructor
+         */
+        var Constr = function () {};
+
+        Constr.prototype = wysiwygAdapter;
+
+        obj = new Constr();
+    });
+
+    describe('wysiwygAdapter - encoding and decoding directives', function () {
+
+        /**
+         * Tests encoding and decoding directives
+         *
+         * @param {String} decodedHtml
+         * @param {String} encodedHtml
+         */
+        function runTests(decodedHtml, encodedHtml) {
+            var encodedHtmlWithForwardSlashInImgSrc = encodedHtml.replace(/src="((?:(?!"|\\\?).)*)/, 'src="$1/');
+
+            describe('"encodeDirectives" method', function () {
+                it('converts media directive img src to directive URL', function () {
+                    expect(obj.encodeDirectives(decodedHtml)).toEqual(encodedHtml);
+                });
+            });
+
+            describe('"decodeDirectives" method', function () {
+                it(
+                    'converts directive URL img src without a trailing forward slash ' +
+                    'to media url without a trailing forward slash',
+                    function () {
+                        expect(obj.decodeDirectives(encodedHtml)).toEqual(decodedHtml);
+                    }
+                );
+
+                it('converts directive URL img src with a trailing forward slash ' +
+                    'to media url without a trailing forward slash',
+                    function () {
+                        expect(encodedHtmlWithForwardSlashInImgSrc).not.toEqual(encodedHtml);
+                        expect(obj.decodeDirectives(encodedHtmlWithForwardSlashInImgSrc)).toEqual(decodedHtml);
+                    }
+                );
+            });
+        }
+
+        describe('without SID in directive query string without secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C" alt="" width="612" height="459">' +
+                    '</p>';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': 'http://example.com/admin/cms/wysiwyg/directive/'
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
+        });
+
+        describe('without SID in directive query string with secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58" ' +
+                    'alt="" width="612" height="459">' +
+                    '</p>',
+                directiveUrl = 'http://example.com/admin/cms/wysiwyg/directive/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58/';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': directiveUrl
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
+        });
+
+        describe('with SID in directive query string without secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C?SID=something" ' +
+                    'alt="" width="612" height="459">' +
+                    '</p>',
+                directiveUrl = 'http://example.com/admin/cms/wysiwyg/directive?SID=something';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': directiveUrl
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
+        });
+
+        describe('with SID in directive query string with secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58?SID=something" ' +
+                    'alt="" width="612" height="459">' +
+                    '</p>',
+                directiveUrl = 'http://example.com/admin/cms/wysiwyg/directive/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58?SID=something';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': directiveUrl
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
+        });
+    });
+});
diff --git a/dev/tests/setup-integration/.gitignore b/dev/tests/setup-integration/.gitignore
index bb6021b884ee1..fcf4d47527542 100644
--- a/dev/tests/setup-integration/.gitignore
+++ b/dev/tests/setup-integration/.gitignore
@@ -1,3 +1,4 @@
 /*.xml
 /var/
 /etc/*.php
+/tmp
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/Setup/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/Setup/InstallSchema.php
new file mode 100644
index 0000000000000..b552402e07bef
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/Setup/InstallSchema.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule1\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * InstallSchema mock class
+ */
+class InstallSchema implements InstallSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
new file mode 100644
index 0000000000000..ae6c98e4627d2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
+                nullable="true"/>
+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
+                unsigned="true" nullable="true"/>
+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" scale="4" precision="12"/>
+        <column xsi:type="decimal" name="double" default="11111111.111111" precision="14" scale="6"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_UNIQUE">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_INDEX" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..49866f645d09d
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema_whitelist.json
@@ -0,0 +1,79 @@
+{
+  "reference_table": {
+    "column": {
+      "tinyint_ref": true,
+      "tinyint_without_padding": true,
+      "bigint_without_padding": true,
+      "integer_without_padding": true,
+      "smallint_with_big_padding": true,
+      "smallint_without_default": true,
+      "int_without_unsigned": true,
+      "int_unsigned": true,
+      "bigint_default_nullable": true,
+      "bigint_not_default_not_nullable": true,
+      "smallint_without_padding": true
+    },
+    "constraint": {
+      "tinyint_primary": true
+    }
+  },
+  "auto_increment_test": {
+    "column": {
+      "int_auto_increment_with_nullable": true,
+      "int_disabled_auto_increment": true
+    },
+    "constraint": {
+      "AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE": true
+    }
+  },
+  "test_table": {
+    "column": {
+      "smallint": true,
+      "tinyint": true,
+      "bigint": true,
+      "float": true,
+      "double": true,
+      "decimal": true,
+      "date": true,
+      "timestamp": true,
+      "datetime": true,
+      "longtext": true,
+      "mediumtext": true,
+      "varchar": true,
+      "mediumblob": true,
+      "blob": true,
+      "boolean": true,
+      "varbinary_rename": true
+    },
+    "index": {
+      "TEST_TABLE_TINYINT_BIGINT": true
+    },
+    "constraint": {
+      "TEST_TABLE_SMALLINT_BIGINT": true,
+      "TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF": true
+    }
+  },
+  "store": {
+    "column": {
+      "store_owner_id": true,
+      "store_owner": true
+    },
+    "constraint": {
+      "STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID": true
+    }
+  },
+  "store_owner": {
+    "column": {
+      "owner_id": true,
+      "label": true
+    },
+    "constraint": {
+      "": true
+    }
+  },
+  "some_table": {
+    "column": {
+      "some_column": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/module.xml
new file mode 100644
index 0000000000000..5d408109ff1ee
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule1" setup_version="0.0.1"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_modification.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_modification.php
new file mode 100644
index 0000000000000..a69e456ec4a8b
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_modification.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
+  `int_auto_increment_with_nullable` int(15) unsigned DEFAULT NULL,
+  `int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
+  UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'reference_table' => 'CREATE TABLE `reference_table` (
+  `tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
+  `tinyint_without_padding` tinyint(2) NOT NULL,
+  `bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
+  `smallint_without_padding` smallint(5) NOT NULL DEFAULT \'0\',
+  `integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
+  `smallint_with_big_padding` smallint(254) NOT NULL DEFAULT \'0\',
+  `smallint_without_default` smallint(2) DEFAULT NULL,
+  `int_without_unsigned` int(2) DEFAULT NULL,
+  `int_unsigned` int(2) unsigned DEFAULT NULL,
+  `bigint_default_nullable` bigint(2) unsigned DEFAULT \'123\',
+  `bigint_not_default_not_nullable` bigint(20) NOT NULL,
+  PRIMARY KEY (`tinyint_ref`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'test_table' => 'CREATE TABLE `test_table` (
+  `smallint` smallint(3) NOT NULL AUTO_INCREMENT,
+  `tinyint` tinyint(7) DEFAULT NULL,
+  `bigint` bigint(13) DEFAULT \'0\',
+  `float` float(12,10) DEFAULT \'0.0000000000\',
+  `double` double(245,10) DEFAULT NULL,
+  `decimal` decimal(15,4) DEFAULT \'0.0000\',
+  `date` date DEFAULT NULL,
+  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `datetime` datetime DEFAULT \'0000-00-00 00:00:00\',
+  `longtext` longtext,
+  `mediumtext` mediumtext,
+  `varchar` varchar(100) DEFAULT NULL,
+  `mediumblob` mediumblob,
+  `blob` blob,
+  `boolean` tinyint(1) DEFAULT \'1\',
+  UNIQUE KEY `TEST_TABLE_SMALLINT_BIGINT` (`smallint`,`bigint`),
+  KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
+  CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) 
+REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_removal.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_removal.php
new file mode 100644
index 0000000000000..0091b89845a73
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_removal.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
+  `int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
+  UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'reference_table' => 'CREATE TABLE `reference_table` (
+  `tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
+  `tinyint_without_padding` tinyint(2) NOT NULL DEFAULT \'0\',
+  `bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
+  `integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
+  `smallint_with_big_padding` smallint(254) NOT NULL DEFAULT \'0\',
+  `smallint_without_default` smallint(2) DEFAULT NULL,
+  `int_without_unsigned` int(2) DEFAULT NULL,
+  `int_unsigned` int(2) unsigned DEFAULT NULL,
+  `bigint_default_nullable` bigint(2) unsigned DEFAULT \'1\',
+  `bigint_not_default_not_nullable` bigint(2) unsigned NOT NULL,
+  PRIMARY KEY (`tinyint_ref`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'test_table' => 'CREATE TABLE `test_table` (
+  `smallint` smallint(3) NOT NULL AUTO_INCREMENT,
+  `tinyint` tinyint(7) DEFAULT NULL,
+  `bigint` bigint(13) DEFAULT \'0\',
+  `float` float(12,10) DEFAULT \'0.0000000000\',
+  `double` double(245,10) DEFAULT \'11111111.1111110000\',
+  `decimal` decimal(15,4) DEFAULT \'0.0000\',
+  `date` date DEFAULT NULL,
+  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datetime` datetime DEFAULT \'0000-00-00 00:00:00\',
+  `longtext` longtext,
+  `mediumtext` mediumtext,
+  `varchar` varchar(254) DEFAULT NULL,
+  `blob` blob,
+  `boolean` tinyint(1) DEFAULT NULL,
+  `varbinary_rename` varbinary(255) DEFAULT \'10101\',
+  UNIQUE KEY `TEST_TABLE_SMALLINT_BIGINT` (`smallint`,`bigint`),
+  KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
+  CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) 
+REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.php
new file mode 100644
index 0000000000000..01e007edb7684
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
+  `int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
+  `int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
+  UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'reference_table' => 'CREATE TABLE `reference_table` (
+  `tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
+  `tinyint_without_padding` tinyint(2) NOT NULL DEFAULT \'0\',
+  `bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
+  `smallint_without_padding` smallint(5) NOT NULL DEFAULT \'0\',
+  `integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
+  `smallint_with_big_padding` smallint(254) NOT NULL DEFAULT \'0\',
+  `smallint_without_default` smallint(2) DEFAULT NULL,
+  `int_without_unsigned` int(2) DEFAULT NULL,
+  `int_unsigned` int(2) unsigned DEFAULT NULL,
+  `bigint_default_nullable` bigint(2) unsigned DEFAULT \'1\',
+  `bigint_not_default_not_nullable` bigint(2) unsigned NOT NULL,
+  `smallint_ref` smallint(254) NOT NULL DEFAULT \'0\',
+  PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
+  UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'test_table' => 'CREATE TABLE `test_table` (
+  `smallint` smallint(3) DEFAULT NULL,
+  `tinyint` tinyint(7) DEFAULT NULL,
+  `bigint` bigint(13) DEFAULT \'0\',
+  `float` float(12,10) DEFAULT \'0.0000000000\',
+  `double` double(245,10) DEFAULT \'11111111.1111110000\',
+  `decimal` decimal(15,4) DEFAULT \'0.0000\',
+  `date` date DEFAULT NULL,
+  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datetime` datetime DEFAULT \'0000-00-00 00:00:00\',
+  `longtext` longtext,
+  `mediumtext` mediumtext,
+  `varchar` varchar(254) DEFAULT NULL,
+  `mediumblob` mediumblob,
+  `blob` blob,
+  `boolean` tinyint(1) DEFAULT NULL,
+  `integer_main` int(12) unsigned DEFAULT NULL,
+  `smallint_main` smallint(254) NOT NULL DEFAULT \'0\',
+  UNIQUE KEY `TEST_TABLE_SMALLINT_FLOAT` (`smallint`,`float`),
+  UNIQUE KEY `TEST_TABLE_DOUBLE` (`double`),
+  KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
+  KEY `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` (`smallint_main`),
+  KEY `FK_FB77604C299EB8612D01E4AF8D9931F2` (`integer_main`),
+  CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) 
+REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
+  CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) 
+REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
+  CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) 
+REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/installation.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/installation.php
new file mode 100644
index 0000000000000..3e807c25e3519
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/installation.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
+  `int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
+  `int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
+  UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'reference_table' => 'CREATE TABLE `reference_table` (
+  `tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
+  `tinyint_without_padding` tinyint(2) NOT NULL DEFAULT \'0\',
+  `bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
+  `smallint_without_padding` smallint(5) NOT NULL DEFAULT \'0\',
+  `integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
+  `smallint_with_big_padding` smallint(254) NOT NULL DEFAULT \'0\',
+  `smallint_without_default` smallint(2) DEFAULT NULL,
+  `int_without_unsigned` int(2) DEFAULT NULL,
+  `int_unsigned` int(2) unsigned DEFAULT NULL,
+  `bigint_default_nullable` bigint(2) unsigned DEFAULT \'1\',
+  `bigint_not_default_not_nullable` bigint(2) unsigned NOT NULL,
+  PRIMARY KEY (`tinyint_ref`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'test_table' => 'CREATE TABLE `test_table` (
+  `smallint` smallint(3) NOT NULL AUTO_INCREMENT,
+  `tinyint` tinyint(7) DEFAULT NULL,
+  `bigint` bigint(13) DEFAULT \'0\',
+  `float` float(12,4) DEFAULT \'0.0000\',
+  `double` decimal(14,6) DEFAULT \'11111111.111111\',
+  `decimal` decimal(15,4) DEFAULT \'0.0000\',
+  `date` date DEFAULT NULL,
+  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datetime` datetime DEFAULT \'0000-00-00 00:00:00\',
+  `longtext` longtext,
+  `mediumtext` mediumtext,
+  `varchar` varchar(254) DEFAULT NULL,
+  `mediumblob` mediumblob,
+  `blob` blob,
+  `boolean` tinyint(1) DEFAULT NULL,
+  UNIQUE KEY `TEST_TABLE_SMALLINT_BIGINT` (`smallint`,`bigint`),
+  KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
+  CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) 
+REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php
new file mode 100644
index 0000000000000..f5b98ce8a2735
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+// @codingStandardsIgnoreFile
+return [
+    'before' => [
+        'store' => 'CREATE TABLE `store` (
+  `store_owner_id` smallint(5) DEFAULT NULL COMMENT \'Store Owner Reference\',
+  KEY `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` (`store_owner_id`),
+  CONSTRAINT `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` FOREIGN KEY (`store_owner_id`) 
+REFERENCES `store_owner` (`owner_id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+        'store_owner' => 'CREATE TABLE `store_owner` (
+  `owner_id` smallint(5) NOT NULL AUTO_INCREMENT,
+  `store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
+  PRIMARY KEY (`owner_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\'Store owner information\''
+    ],
+    'after' => [
+        'store' => 'CREATE TABLE `store` (
+  `store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8'
+    ]
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.php
new file mode 100644
index 0000000000000..7bd0213c6590d
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
+  `int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
+  `int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
+  UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8'
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.php
new file mode 100644
index 0000000000000..0f2a05e142556
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'before' => 'CREATE TABLE `some_table` (
+  `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+    'after' => 'CREATE TABLE `some_table_renamed` (
+  `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php
new file mode 100644
index 0000000000000..e642e57701149
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+return ['CREATE TABLE `reference_table` (
+`tinyint_ref` tinyint(7)  NOT NULL  AUTO_INCREMENT , 
+`tinyint_without_padding` tinyint(2)  NOT NULL DEFAULT 0  , 
+`bigint_without_padding` bigint(20)  NOT NULL DEFAULT 0  , 
+`smallint_without_padding` smallint(5)  NOT NULL DEFAULT 0  , 
+`integer_without_padding` int(11)  NOT NULL DEFAULT 0  , 
+`smallint_with_big_padding` smallint(254)  NOT NULL DEFAULT 0  , 
+`smallint_without_default` smallint(2)  NULL   , 
+`int_without_unsigned` int(2)  NULL   , 
+`int_unsigned` int(2) UNSIGNED NULL   , 
+`bigint_default_nullable` bigint(2) UNSIGNED NULL DEFAULT 1  , 
+`bigint_not_default_not_nullable` bigint(2) UNSIGNED NOT NULL   , 
+CONSTRAINT  PRIMARY KEY (`tinyint_ref`)
+) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci 
+
+CREATE TABLE `auto_increment_test` (
+`int_auto_increment_with_nullable` int(12) UNSIGNED NOT NULL  AUTO_INCREMENT , 
+`int_disabled_auto_increment` smallint(12) UNSIGNED NULL DEFAULT 0  , 
+CONSTRAINT `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` UNIQUE KEY (`int_auto_increment_with_nullable`)
+) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci 
+
+CREATE TABLE `test_table` (
+`smallint` smallint(3)  NOT NULL  AUTO_INCREMENT , 
+`tinyint` tinyint(7)  NULL   , 
+`bigint` bigint(13)  NULL DEFAULT 0  , 
+`float` float(12, 4)  NULL DEFAULT 0 , 
+`double` decimal(14, 6)  NULL DEFAULT 11111111.111111 , 
+`decimal` decimal(15, 4)  NULL DEFAULT 0 , 
+`date` date NULL , 
+`timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP , 
+`datetime` datetime NULL DEFAULT 0  , 
+`longtext` longtext NULL , 
+`mediumtext` mediumtext NULL , 
+`varchar` varchar(254) NULL  , 
+`mediumblob` mediumblob NULL , 
+`blob` blob NULL , 
+`boolean` BOOLEAN NULL  , 
+CONSTRAINT `TEST_TABLE_SMALLINT_BIGINT` UNIQUE KEY (`smallint`,`bigint`), 
+CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`)  ON DELETE NO ACTION, 
+INDEX `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`)
+) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci 
+
+CREATE TABLE `patch_list` (
+`patch_id` int(11)  NOT NULL  AUTO_INCREMENT COMMENT "Patch Auto Increment", 
+`patch_name` varchar(1024) NOT NULL  COMMENT "Patch Class Name", 
+CONSTRAINT  PRIMARY KEY (`patch_id`)
+) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci COMMENT="List of data/schema patches"
+
+'];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php
new file mode 100644
index 0000000000000..ccc2d5b792917
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+return ['ALTER TABLE `reference_table` MODIFY COLUMN `tinyint_without_padding` tinyint(2)  NOT NULL   , MODIFY COLUMN `bigint_default_nullable` bigint(2) UNSIGNED NULL DEFAULT 123  , MODIFY COLUMN `bigint_not_default_not_nullable` bigint(20)  NOT NULL   
+
+ALTER TABLE `auto_increment_test` MODIFY COLUMN `int_auto_increment_with_nullable` int(15) UNSIGNED NULL   
+
+ALTER TABLE `test_table` MODIFY COLUMN `float` float(12, 10)  NULL DEFAULT 0 , MODIFY COLUMN `double` double(245, 10)  NULL  , MODIFY COLUMN `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP  , MODIFY COLUMN `varchar` varchar(100) NULL  , MODIFY COLUMN `boolean` BOOLEAN NULL DEFAULT 1 
+
+'];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php
new file mode 100644
index 0000000000000..e3068c1bd7625
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'table' => [
+        'reference_table' => [
+            'column' => [
+                'tinyint_ref' => [
+                    'type' => 'tinyint',
+                    'name' => 'tinyint_ref',
+                    'default' => '0',
+                    'padding' => '7',
+                    'nullable' => 'true',
+                    'unsigned' => 'false',
+                ],
+            ],
+            'name' => 'reference_table',
+            'resource' => 'default',
+        ],
+        'test_table' => [
+            'column' => [
+                'tinyint' => [
+                    'type' => 'tinyint',
+                    'name' => 'tinyint',
+                    'default' => '0',
+                    'padding' => '7',
+                    'nullable' => 'true',
+                    'unsigned' => 'false',
+                ],
+            ],
+            'constraint' => [
+                'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF' => [
+                    'type' => 'foreign',
+                    'referenceId' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
+                    'column' => 'tinyint',
+                    'table' => 'test_table',
+                    'referenceTable' => 'reference_table',
+                    'referenceColumn' => 'tinyint_ref',
+                ],
+            ],
+            'name' => 'test_table',
+            'resource' => 'default',
+        ],
+    ],
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
new file mode 100644
index 0000000000000..a064d096f6d38
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'table' => [
+        'reference_table' => [
+            'column' => [
+                'tinyint_ref' => [
+                    'type' => 'tinyint',
+                    'name' => 'tinyint_ref',
+                    'padding' => '7',
+                    'nullable' => 'false',
+                    'identity' => 'true',
+                    'unsigned' => 'false',
+                ],
+                'tinyint_without_padding' => [
+                    'type' => 'tinyint',
+                    'name' => 'tinyint_without_padding',
+                    'default' => '0',
+                    'nullable' => 'false',
+                    'unsigned' => 'false',
+                ],
+                'bigint_without_padding' => [
+                    'type' => 'bigint',
+                    'name' => 'bigint_without_padding',
+                    'default' => '0',
+                    'nullable' => 'false',
+                    'unsigned' => 'false',
+                ],
+                'smallint_without_padding' => [
+                    'type' => 'smallint',
+                    'name' => 'smallint_without_padding',
+                    'default' => '0',
+                    'nullable' => 'false',
+                    'unsigned' => 'false',
+                ],
+                'integer_without_padding' => [
+                    'type' => 'int',
+                    'name' => 'integer_without_padding',
+                    'default' => '0',
+                    'nullable' => 'false',
+                    'unsigned' => 'false',
+                ],
+                'smallint_with_big_padding' => [
+                    'type' => 'smallint',
+                    'name' => 'smallint_with_big_padding',
+                    'padding' => '254',
+                    'default' => '0',
+                    'nullable' => 'false',
+                    'unsigned' => 'false',
+                ],
+                'smallint_without_default' => [
+                    'type' => 'smallint',
+                    'name' => 'smallint_without_default',
+                    'padding' => '2',
+                    'nullable' => 'true',
+                    'unsigned' => 'false',
+                ],
+                'int_without_unsigned' => [
+                    'type' => 'int',
+                    'name' => 'int_without_unsigned',
+                    'padding' => '2',
+                    'nullable' => 'true',
+                ],
+                'int_unsigned' => [
+                    'type' => 'int',
+                    'name' => 'int_unsigned',
+                    'padding' => '2',
+                    'nullable' => 'true',
+                    'unsigned' => 'true',
+                ],
+                'bigint_default_nullable' => [
+                    'type' => 'bigint',
+                    'name' => 'bigint_default_nullable',
+                    'padding' => '2',
+                    'nullable' => 'true',
+                    'default' => '1',
+                    'unsigned' => 'true',
+                ],
+                'bigint_not_default_not_nullable' => [
+                    'type' => 'bigint',
+                    'name' => 'bigint_not_default_not_nullable',
+                    'padding' => '2',
+                    'nullable' => 'false',
+                    'unsigned' => 'true',
+                ],
+            ],
+            'constraint' => [
+                'tinyint_primary' => [
+                    'column' => [
+                        'tinyint_ref' => 'tinyint_ref',
+                    ],
+                    'type' => 'primary',
+                    'referenceId' => 'tinyint_primary',
+                ],
+            ],
+            'name' => 'reference_table',
+            'resource' => 'default',
+        ],
+        'auto_increment_test' => [
+            'column' => [
+                'int_auto_increment_with_nullable' => [
+                    'type' => 'int',
+                    'name' => 'int_auto_increment_with_nullable',
+                    'identity' => 'true',
+                    'padding' => '12',
+                    'unsigned' => 'true',
+                    'nullable' => 'true',
+                ],
+                'int_disabled_auto_increment' => [
+                    'type' => 'smallint',
+                    'name' => 'int_disabled_auto_increment',
+                    'default' => '0',
+                    'identity' => 'false',
+                    'padding' => '12',
+                    'unsigned' => 'true',
+                    'nullable' => 'true',
+                ],
+            ],
+            'constraint' => [
+                'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE' => [
+                    'column' => [
+                        'int_auto_increment_with_nullable' => 'int_auto_increment_with_nullable',
+                    ],
+                    'type' => 'unique',
+                    'referenceId' => 'AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE',
+                ],
+            ],
+            'name' => 'auto_increment_test',
+            'resource' => 'default',
+        ],
+        'test_table' => [
+            'column' => [
+                'smallint' => [
+                    'type' => 'smallint',
+                    'identity' => 'true',
+                    'name' => 'smallint',
+                    'padding' => '3',
+                    'nullable' => 'true',
+                ],
+                'tinyint' => [
+                    'type' => 'tinyint',
+                    'name' => 'tinyint',
+                    'padding' => '7',
+                    'nullable' => 'true',
+                    'unsigned' => 'false',
+                ],
+                'bigint' => [
+                    'type' => 'bigint',
+                    'name' => 'bigint',
+                    'default' => '0',
+                    'padding' => '13',
+                    'nullable' => 'true',
+                    'unsigned' => 'false',
+                ],
+                'float' => [
+                    'type' => 'float',
+                    'name' => 'float',
+                    'default' => '0',
+                    'scale' => '4',
+                    'precision' => '12',
+                ],
+                'double' => [
+                    'type' => 'decimal',
+                    'name' => 'double',
+                    'default' => '11111111.111111',
+                    'precision' => '14',
+                    'scale' => '6',
+                ],
+                'decimal' => [
+                    'type' => 'decimal',
+                    'name' => 'decimal',
+                    'default' => '0',
+                    'scale' => '4',
+                    'precision' => '15',
+                ],
+                'date' => [
+                    'type' => 'date',
+                    'name' => 'date',
+                ],
+                'timestamp' => [
+                    'type' => 'timestamp',
+                    'name' => 'timestamp',
+                    'default' => 'CURRENT_TIMESTAMP',
+                    'on_update' => 'true',
+                ],
+                'datetime' => [
+                    'type' => 'datetime',
+                    'name' => 'datetime',
+                    'default' => '0',
+                ],
+                'longtext' => [
+                    'type' => 'longtext',
+                    'name' => 'longtext',
+                ],
+                'mediumtext' => [
+                    'type' => 'mediumtext',
+                    'name' => 'mediumtext',
+                ],
+                'varchar' => [
+                    'type' => 'varchar',
+                    'name' => 'varchar',
+                    'length' => '254',
+                    'nullable' => 'true',
+                ],
+                'mediumblob' => [
+                    'type' => 'mediumblob',
+                    'name' => 'mediumblob',
+                ],
+                'blob' => [
+                    'type' => 'blob',
+                    'name' => 'blob',
+                ],
+                'boolean' => [
+                    'type' => 'boolean',
+                    'name' => 'boolean',
+                ],
+                'varbinary_rename' => [
+                    'type' => 'varbinary',
+                    'name' => 'varbinary_rename',
+                    'default' => '10101',
+                    'disabled' => 'true',
+                ],
+            ],
+            'constraint' => [
+                'TEST_TABLE_UNIQUE' => [
+                    'column' => [
+                        'smallint' => 'smallint',
+                        'bigint' => 'bigint',
+                    ],
+                    'type' => 'unique',
+                    'referenceId' => 'TEST_TABLE_UNIQUE',
+                ],
+                'TEST_TABLE_TINYINT_REFERENCE' => [
+                    'type' => 'foreign',
+                    'referenceId' => 'TEST_TABLE_TINYINT_REFERENCE',
+                    'column' => 'tinyint',
+                    'table' => 'test_table',
+                    'referenceTable' => 'reference_table',
+                    'referenceColumn' => 'tinyint_ref',
+                    'onDelete' => 'NO ACTION',
+                ],
+            ],
+            'index' => [
+                'TEST_TABLE_INDEX' => [
+                    'column' => [
+                        'tinyint' => 'tinyint',
+                        'bigint' => 'bigint',
+                    ],
+                    'referenceId' => 'TEST_TABLE_INDEX',
+                    'indexType' => 'btree',
+                ],
+            ],
+            'name' => 'test_table',
+            'resource' => 'default',
+        ],
+    ],
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/registration.php
new file mode 100644
index 0000000000000..eddf29fbb7f8c
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule1') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule1', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/after_rollback/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/after_rollback/db_schema.xml
new file mode 100644
index 0000000000000..467a9f9b5eca4
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/after_rollback/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="store">
+        <column name="store_owner" xsi:type="varchar" length="255" comment="Store Owner Name" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/InstallSchema.php
new file mode 100644
index 0000000000000..22cfcd1fa2870
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/InstallSchema.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestSetupDeclarationModule1\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * @codeCoverageIgnore
+ */
+class InstallSchema implements InstallSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+
+        $installer->startSetup();
+
+        //Create first table
+        $table = $installer->getConnection()
+            ->newTable($installer->getTable('reference_table'))
+            ->addColumn(
+                'smallint_ref',
+                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+                3,
+                ['primary' => true, 'identity' => true, 'nullable' => false],
+                'Smallint'
+            )
+            ->setComment('Reference table');
+        $installer->getConnection()->createTable($table);
+
+        $testTable = $installer->getConnection()->newTable($installer->getTable('test_table'))
+            ->addColumn(
+                'smallint',
+                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+                2,
+                ['nullable' => true, 'default' => 0],
+                'Smallint'
+            )
+            ->addColumn(
+                'bigint',
+                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
+                10,
+                ['nullable' => true, 'unsigned' => false, 'default' => 0],
+                'Bigint'
+            )
+            ->addColumn(
+                'float',
+                \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
+                null,
+                ['default' => 0],
+                'Float'
+            )
+            ->addColumn(
+                'date',
+                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
+                null,
+                [],
+                'Date'
+            )
+            ->addColumn(
+                'timestamp',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                null,
+                ['default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                'Timestamp'
+            )
+            ->addColumn(
+                'mediumtext',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                11222222,
+                [],
+                'Mediumtext'
+            )
+            ->addColumn(
+                'varchar',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                254,
+                ['nullable' => true],
+                'Varchar'
+            )
+            ->addColumn(
+                'boolean',
+                \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+                1,
+                [],
+                'Boolean'
+            )
+            ->addIndex(
+                $installer->getIdxName('test_table', ['smallint', 'bigint']),
+                ['smallint', 'bigint'],
+                ['type' => \Magento\Framework\DB\Adapter\Pdo\Mysql::INDEX_TYPE_UNIQUE]
+            )
+            ->addIndex(
+                $installer->getIdxName('test_table', ['bigint']),
+                ['bigint']
+            )
+            ->addForeignKey(
+                $installer->getFkName(
+                    $installer->getTable('test_table'),
+                    'smallint',
+                    'reference_table',
+                    'smallint_ref'
+                ),
+                'smallint',
+                $installer->getTable('reference_table'),
+                'smallint_ref',
+                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+            )
+            ->setComment('Test Table');
+        $installer->getConnection()->createTable($testTable);
+
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml
new file mode 100644
index 0000000000000..af66686e77b42
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/base_update/db_schema.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default" comment="Reference table">
+        <column xsi:type="smallint" name="smallint_ref" padding="6" nullable="false" unsigned="false" identity="true" comment="Smallint"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="smallint_ref"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="smallint" name="smallint" default="0" padding="6" nullable="true" unsigned="false" comment="Smallint"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="20" nullable="true" unsigned="false" comment="Bigint"/>
+        <column xsi:type="float" name="float" default="0" scale="0" precision="10" comment="Float"/>
+        <column xsi:type="date" name="date" comment="Date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true" comment="Timestamp"/>
+        <column xsi:type="mediumtext" name="mediumtext" comment="Mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true" comment="Varchar"/>
+        <column xsi:type="boolean" name="boolean" comment="Boolean"/>
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="smallint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="smallint_ref" onDelete="CASCADE"/>
+        <index referenceId="TEST_TABLE_BIGINT" indexType="btree">
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml
new file mode 100644
index 0000000000000..8c42f9efd129a
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/before_rollback/db_schema.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="store">
+        <column name="store_owner_id" xsi:type="smallint" nullable="true" comment="Store Owner Reference" />
+        <constraint xsi:type="foreign"
+                    name="STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID"
+                    column="store_owner_id"
+                    table="store"
+                    referenceTable="store_owner"
+                    referenceColumn="owner_id"
+                    onDelete="SET NULL" />
+    </table>
+    <table name="store_owner" comment="Store owner information" engine="innodb" resource="default">
+        <column name="owner_id" xsi:type="smallint" nullable="false" unsigned="false" identity="true" />
+        <column name="store_owner_name" onCreate="migrateDataFrom(label)" xsi:type="varchar" length="255" comment="Store Owner Name" />
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="owner_id" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
new file mode 100644
index 0000000000000..4f9a5ab6d5a92
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="123"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" nullable="false" unsigned="false"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" padding="15" unsigned="true" nullable="true"/>
+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
+                unsigned="true" nullable="true"/>
+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" precision="12" scale="10"/>
+        <column xsi:type="double" name="double" precision="245" scale="10"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="false"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="100" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean" default="true"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
new file mode 100644
index 0000000000000..a3c4fe010fd35
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
+                nullable="true"/>
+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" scale="10" precision="12"/>
+        <column xsi:type="double" name="double" default="11111111.111111" precision="245" scale="10"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob" disabled="true"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="false"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema_whitelist.json
new file mode 100644
index 0000000000000..9105a2b0b25cb
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema_whitelist.json
@@ -0,0 +1,56 @@
+{
+  "reference_table": {
+    "column": {
+      "tinyint_ref": true,
+      "tinyint_without_padding": true,
+      "bigint_without_padding": true,
+      "integer_without_padding": true,
+      "smallint_with_big_padding": true,
+      "smallint_without_default": true,
+      "int_without_unsigned": true,
+      "int_unsigned": true,
+      "bigint_default_nullable": true,
+      "bigint_not_default_not_nullable": true,
+      "smallint_without_padding": true
+    },
+    "constraint": {
+      "tinyint_primary": true
+    }
+  },
+  "auto_increment_test": {
+    "column": {
+      "int_auto_increment_with_nullable": true,
+      "int_disabled_auto_increment": true
+    },
+    "constraint": {
+      "AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE": true
+    }
+  },
+  "test_table": {
+    "column": {
+      "smallint": true,
+      "tinyint": true,
+      "bigint": true,
+      "float": true,
+      "double": true,
+      "decimal": true,
+      "date": true,
+      "timestamp": true,
+      "datetime": true,
+      "longtext": true,
+      "mediumtext": true,
+      "varchar": true,
+      "mediumblob": true,
+      "blob": true,
+      "boolean": true,
+      "varbinary_rename": true
+    },
+    "index": {
+      "TEST_TABLE_TINYINT_BIGINT": true
+    },
+    "constraint": {
+      "TEST_TABLE_SMALLINT_BIGINT": true,
+      "TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
new file mode 100644
index 0000000000000..93e6e13eb36f8
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_ref" padding="254" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+            <column name="smallint_ref"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="REFERENCE_TABLE_SMALLINT_REF">
+            <column name="smallint_ref"/>
+        </constraint>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
+                nullable="true"/>
+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
+                unsigned="true" nullable="true"/>
+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="int" name="integer_main" padding="12" unsigned="true" nullable="true"/>
+        <column xsi:type="smallint" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" scale="10" precision="12"/>
+        <column xsi:type="smallint" name="smallint_main" padding="254" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="double" name="double" default="11111111.111111" precision="245" scale="10"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_FLOAT">
+            <column name="smallint"/>
+            <column name="float"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_DOUBLE">
+            <column name="double"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="some_foreign_key_new" column="smallint_main" table="test_table"
+                    referenceTable="reference_table" referenceColumn="smallint_ref" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="FK_FB77604C299EB8612D01E4AF8D9931F2"
+                    column="integer_main" table="test_table"
+                    referenceTable="auto_increment_test" referenceColumn="int_auto_increment_with_nullable"/>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema_whitelist.json
new file mode 100644
index 0000000000000..16ff756ef552a
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema_whitelist.json
@@ -0,0 +1,56 @@
+{
+  "reference_table": {
+    "column": {
+      "tinyint_ref": true,
+      "tinyint_without_padding": true,
+      "bigint_without_padding": true,
+      "integer_without_padding": true,
+      "smallint_with_big_padding": true,
+      "smallint_without_default": true,
+      "int_without_unsigned": true,
+      "int_unsigned": true,
+      "bigint_default_nullable": true,
+      "bigint_not_default_not_nullable": true,
+      "smallint_without_padding": true
+    },
+    "constraint": {
+      "PRIMARY": true
+    }
+  },
+  "auto_increment_test": {
+    "column": {
+      "int_auto_increment_with_nullable": true,
+      "int_disabled_auto_increment": true
+    },
+    "constraint": {
+      "AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE": true
+    }
+  },
+  "test_table": {
+    "column": {
+      "smallint": true,
+      "tinyint": true,
+      "bigint": true,
+      "float": true,
+      "double": true,
+      "decimal": true,
+      "date": true,
+      "timestamp": true,
+      "datetime": true,
+      "longtext": true,
+      "mediumtext": true,
+      "varchar": true,
+      "mediumblob": true,
+      "blob": true,
+      "boolean": true,
+      "varbinary_rename": true
+    },
+    "index": {
+      "TEST_TABLE_TINYINT_BIGINT": true
+    },
+    "constraint": {
+      "TEST_TABLE_SMALLINT_BIGINT": true,
+      "TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
new file mode 100644
index 0000000000000..8a73d9e225546
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
+                nullable="true"/>
+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
+                unsigned="true" nullable="true"/>
+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/module.xml
new file mode 100644
index 0000000000000..a1b48d0ccb7a3
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule1" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml
new file mode 100644
index 0000000000000..8759b9f87ae86
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" name="smallint" default="0" scale="1" padding="3"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml
new file mode 100644
index 0000000000000..9733f3b1bbc4a
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" name="smallint" default="0" padding="3"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
new file mode 100644
index 0000000000000..479c4c87f6143
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" default="0" padding="7" nullable="true" unsigned="false"/>
+    </table>
+    <table name="test_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint" default="0" padding="7" nullable="true" unsigned="false"/>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/index_to_disable/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/index_to_disable/db_schema.xml
new file mode 100644
index 0000000000000..e10803af248c2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/index_to_disable/db_schema.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_UNIQUE">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_INDEX" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+        <index referenceId="TEST_TABLE_INDEX_VARCHAR" indexType="btree">
+            <column name="varchar"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/InstallSchema.php
new file mode 100644
index 0000000000000..8678218a51e05
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/InstallSchema.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule1\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * @codeCoverageIgnore
+ */
+class InstallSchema implements InstallSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+
+        $installer->startSetup();
+
+        //Create first table
+        $table = $installer->getConnection()
+            ->newTable($installer->getTable('reference_table'))
+            ->addColumn(
+                'smallint_ref',
+                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+                3,
+                ['primary' => true, 'identity' => true, 'nullable' => false],
+                'Smallint'
+            )
+            ->setComment('Reference table');
+        $installer->getConnection()->createTable($table);
+
+        $testTable = $installer->getConnection()->newTable('test_table')
+            ->addColumn(
+                'smallint',
+                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+                2,
+                ['nullable' => true, 'default' => 0],
+                'Smallint'
+            )
+            ->addColumn(
+                'bigint',
+                \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
+                10,
+                ['nullable' => true, 'unsigned' => false, 'default' => 0],
+                'Bigint'
+            )
+            ->addColumn(
+                'float',
+                \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
+                null,
+                ['default' => 0],
+                'Float'
+            )
+            ->addColumn(
+                'date',
+                \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
+                null,
+                [],
+                'Date'
+            )
+            ->addColumn(
+                'timestamp',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                null,
+                ['default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                'Timestamp'
+            )
+            ->addColumn(
+                'mediumtext',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                11222222,
+                [],
+                'Mediumtext'
+            )
+            ->addColumn(
+                'varchar',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                254,
+                ['nullable' => true],
+                'Varchar'
+            )
+            ->addColumn(
+                'boolean',
+                \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+                1,
+                [],
+                'Boolean'
+            )
+            ->addIndex(
+                $installer->getIdxName($installer->getTable('test_table'), ['smallint', 'bigint']),
+                ['smallint', 'bigint'],
+                ['type' => \Magento\Framework\DB\Adapter\Pdo\Mysql::INDEX_TYPE_UNIQUE]
+            )
+            ->addIndex(
+                $installer->getIdxName($installer->getTable('test_table'), ['bigint']),
+                ['bigint']
+            )
+            ->addForeignKey(
+                $installer->getFkName(
+                    $installer->getTable('test_table'),
+                    'smallint',
+                    $installer->getTable('reference_table'),
+                    'smallint_ref'
+                ),
+                'smallint',
+                $installer->getTable('reference_table'),
+                'smallint_ref',
+                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+            )
+            ->setComment('Test Table');
+        $installer->getConnection()->createTable($testTable);
+
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
new file mode 100644
index 0000000000000..1347a1ba8e3b1
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default" comment="Reference table">
+        <column xsi:type="smallint" name="smallint_ref" padding="6" nullable="false" unsigned="false" identity="true" comment="Smallint"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="smallint_ref"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="smallint" name="smallint" default="0" padding="6" nullable="true" unsigned="false" comment="Smallint"/>
+        <column xsi:type="bigint" name="bigint" default="1" padding="20" nullable="true" unsigned="false" comment="Bigint"/>
+        <column xsi:type="float" name="float" default="0" scale="0" precision="10" comment="Float"/>
+        <column xsi:type="date" name="date" comment="Date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true" comment="Timestamp"/>
+        <column xsi:type="mediumtext" name="mediumtext" comment="Mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true" comment="Varchar"/>
+        <column xsi:type="boolean" name="boolean" comment="Boolean"/>
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="smallint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="smallint_ref" onDelete="CASCADE"/>
+        <index referenceId="TEST_TABLE_BIGINT" indexType="btree">
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml
new file mode 100644
index 0000000000000..7598fbd54295f
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/table_rename/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/table_rename/db_schema.xml
new file mode 100644
index 0000000000000..558f15446fbe5
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/table_rename/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="some_table">
+        <column name="some_column" xsi:type="varchar" length="255" comment="Some Column Name" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/table_rename_after/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/table_rename_after/db_schema.xml
new file mode 100644
index 0000000000000..c478cd15a0b5d
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/table_rename_after/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="some_table_renamed" onCreate="migrateDataFromAnotherTable(some_table)">
+        <column name="some_column" xsi:type="varchar" length="255" comment="Some Column Name" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/whitelist_upgrade/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/whitelist_upgrade/db_schema.xml
new file mode 100644
index 0000000000000..90eaf91b10743
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/whitelist_upgrade/db_schema.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" scale="4" precision="12"/>
+        <column xsi:type="decimal" name="double" default="11111111.111111" precision="14" scale="6"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_UNIQUE">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_INDEX" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/Setup/InstallData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/Setup/InstallData.php
new file mode 100644
index 0000000000000..9f8dd9e8c1ebc
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/Setup/InstallData.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup;
+
+use Magento\Framework\Setup\InstallDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class InstallData implements InstallDataInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+        $adapter->insertArray('reference_table', ['some_integer'], [7, 2, 3, 5]);
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/Setup/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/Setup/UpgradeData.php
new file mode 100644
index 0000000000000..5c1a6b0f4387e
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/Setup/UpgradeData.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $setup->startSetup();
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
new file mode 100644
index 0000000000000..9bd6c438455b2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="int" name="some_integer" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="varchar" name="for_patch_testing" comment="For patch testing" />
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="varbinary" name="varbinary" default="10101" />
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="CASCADE"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="smallint" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/module.xml
new file mode 100644
index 0000000000000..ed76bd12c9737
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3" setup_version="0.0.1"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/registration.php
new file mode 100644
index 0000000000000..94ab9f3a90f54
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule3') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule3', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/all_patches_revision/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/all_patches_revision/module.xml
new file mode 100644
index 0000000000000..5b5eec3ecf1bf
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/all_patches_revision/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3" setup_version="0.0.3"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php
new file mode 100644
index 0000000000000..d12e8feda26e9
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class BicPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion()
+    {
+        return '0.0.3';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new \Exception("This patch can`t be applied, as it was created to test BIC");
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [
+            RefBicPatch::class
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php
new file mode 100644
index 0000000000000..a2db3bc8f4134
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class RefBicPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion()
+    {
+        return '0.0.3';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new \Exception("This patch can`t be applied, as it was created to test BIC");
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [
+            BicPatch::class
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/module.xml
new file mode 100644
index 0000000000000..0beb142b7752a
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3" setup_version="0.0.3" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/first_patch_revision/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/first_patch_revision/UpgradeData.php
new file mode 100644
index 0000000000000..dc8a41d24a38f
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/first_patch_revision/UpgradeData.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '0.0.2') < 0) {
+            $adapter->insertArray('reference_table', ['some_integer'], [6, 12]);
+        }
+
+        if (version_compare($context->getVersion(), '0.0.3') < 0) {
+            $adapter->delete('reference_table', 'some_integer = 7');
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/first_patch_revision/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/first_patch_revision/module.xml
new file mode 100644
index 0000000000000..5b5eec3ecf1bf
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/first_patch_revision/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3" setup_version="0.0.3"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/old_revision/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/old_revision/module.xml
new file mode 100644
index 0000000000000..7bcf829123f5c
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/old_revision/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3" setup_version="0.0.2"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php
new file mode 100644
index 0000000000000..b0ddae1a12cbc
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class IncrementalSomeIntegerPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '1.0.5';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $select = $adapter->select()->from('test_table', 'varchar')
+            ->where('`smallint` = ?', 1);
+        $refSelect = $adapter->select()->from('reference_table', 'for_patch_testing')
+            ->where('`tinyint_ref` = ?', 7);
+        $varchar = $adapter->fetchOne($select);
+        $varchar2 = $adapter->fetchOne($refSelect);
+        $adapter->insert('test_table', ['varchar' => $varchar . "_ref", 'varbinary' => 0101010]);
+        $adapter->insert('test_table', ['varchar' => $varchar2, 'varbinary' => 0]);
+    }
+
+    public function revert()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $select = $adapter->select()->from('test_table', 'varchar')
+            ->where('`smallint` = ?', 1);
+        $varchar = $adapter->fetchOne($select);
+        $refSelect = $adapter->select()->from('reference_table', 'for_patch_testing')
+            ->where('`tinyint_ref` = ?', 7);
+        $varchar2 = $adapter->fetchOne($refSelect);
+        $adapter->delete('test_table', ['`varchar` = ?' => $varchar . "_ref"]);
+        $adapter->delete('test_table', ['`varchar` = ?' => $varchar2]);
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [
+            ReferenceIncrementalSomeIntegerPatch::class,
+            NextChainPatch::class
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php
new file mode 100644
index 0000000000000..341da3bf7f31b
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class LlNextChainPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '0.0.5';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insertArray('reference_table', ['for_patch_testing'], ['very_secret_string']);
+    }
+
+    public function revert()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->delete('reference_table', ['for_patch_testing = ?' => 'very_secret_string']);
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [
+            ZFirstPatch::class
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php
new file mode 100644
index 0000000000000..cdb594d548fe4
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class NextChainPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '0.0.6';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $refSelect = $adapter->select()->from('reference_table', 'for_patch_testing')
+            ->where('`tinyint_ref` = ?', 7);
+        $varchar2 = $adapter->fetchOne($refSelect);
+        $adapter->update(
+            'reference_table',
+            ['for_patch_testing' => 'changed__' . $varchar2],
+            ['`tinyint_ref` = ?' => 7]
+        );
+    }
+
+    public function revert()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $refSelect = $adapter->select()->from('reference_table', 'for_patch_testing')
+            ->where('`tinyint_ref` = ?', 7);
+        $varchar2 = $adapter->fetchOne($refSelect);
+        $adapter->update(
+            'reference_table',
+            ['for_patch_testing' => str_replace('changed__', '', $varchar2)],
+            ['`tinyint_ref` = ?' => 7]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [
+            LlNextChainPatch::class,
+            ZFirstPatch::class
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php
new file mode 100644
index 0000000000000..493cb0375bcf3
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class ReferenceIncrementalSomeIntegerPatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class ReferenceIncrementalSomeIntegerPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '0.0.4';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insert('test_table', ['varchar' => 'Ololo123', 'varbinary' => 0101010]);
+    }
+
+    public function revert()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->delete('test_table', ['`smallint` = ?' => 1]);
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [
+            ZFirstPatch::class
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php
new file mode 100644
index 0000000000000..d26e35879cacc
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Setup\Exception;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class ZFirstPatch implements
+    DataPatchInterface,
+    PatchVersionInterface,
+    PatchRevertableInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '0.0.3';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new Exception('This patch should be covered by old script!');
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
new file mode 100644
index 0000000000000..8082157524ad4
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" />
+        <column xsi:type="varchar" name="email" nullable="false" />
+        <column xsi:type="varchar" name="title" />
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id" />
+            <column name="email" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..4036481252d46
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema_whitelist.json
@@ -0,0 +1,9 @@
+{
+  "test_table": {
+    "column": {
+      "page_id": true,
+      "email": true,
+      "title": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/module.xml
new file mode 100644
index 0000000000000..01f7a6d1b0b2c
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule4" setup_version="1.0.0" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php
new file mode 100644
index 0000000000000..e017996773622
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    [
+        'page_id' => '1',
+        'email' => '1@gmail.com',
+        'title' => 'Title1'
+    ],
+    [
+        'page_id' => '2',
+        'email' => '2@gmail.com',
+        'title' => 'Title2'
+    ],
+    [
+        'page_id' => '3',
+        'email' => '3@gmail.com',
+        'title' => 'Title3'
+    ],
+    [
+        'page_id' => '4',
+        'email' => '4@gmail.com',
+        'title' => 'Title4'
+    ]
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/registration.php
new file mode 100644
index 0000000000000..392171b1f5401
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule4') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule4', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
new file mode 100644
index 0000000000000..0eeff4174870a
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false"  />
+        <column xsi:type="varchar" name="email" nullable="false" />
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id" />
+            <column name="email" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
new file mode 100644
index 0000000000000..8082157524ad4
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" />
+        <column xsi:type="varchar" name="email" nullable="false" />
+        <column xsi:type="varchar" name="title" />
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id" />
+            <column name="email" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
new file mode 100644
index 0000000000000..9bd6c438455b2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="int" name="some_integer" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="varchar" name="for_patch_testing" comment="For patch testing" />
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="varbinary" name="varbinary" default="10101" />
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="CASCADE"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="smallint" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/module.xml
new file mode 100644
index 0000000000000..e383b81bc5c67
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule5" setup_version="1.0.4" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/registration.php
new file mode 100644
index 0000000000000..3bc0eee128e36
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule5') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule5', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/module-without-version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/module-without-version/module.xml
new file mode 100644
index 0000000000000..d5731572270e4
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/module-without-version/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule5" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/old-scripts/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/old-scripts/UpgradeData.php
new file mode 100644
index 0000000000000..5ce7ce9fc8583
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/old-scripts/UpgradeData.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule5\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '1.0.2') < 0) {
+            $adapter->insertArray('reference_table', ['some_integer'], [6, 12, 7]);
+        }
+
+        if (version_compare($context->getVersion(), '1.0.3') < 0) {
+            $adapter->delete('reference_table', 'some_integer = 7');
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomePatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomePatch.php
new file mode 100644
index 0000000000000..b98e35a01e181
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomePatch.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule5\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomePatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '1.0.5';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insert('test_table', ['varchar' => "_ref", 'varbinary' => 0101010]);
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomeSkippedPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomeSkippedPatch.php
new file mode 100644
index 0000000000000..833545ce88ba7
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomeSkippedPatch.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule5\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomeSkippedPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '1.0.2';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new \Exception('This patch should be skipped!');
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
new file mode 100644
index 0000000000000..d6be9376cb4da
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="sales">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
+        <constraint xsi:type="primary" referenceId="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
+                nullable="true"/>
+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
+                unsigned="true" nullable="true"/>
+        <constraint xsi:type="unique" referenceId="AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" scale="4" precision="12"/>
+        <column xsi:type="decimal" name="double" default="11111111.111111" precision="14" scale="6"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" referenceId="TEST_TABLE_SMALLINT_BIGINT">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF"
+                    column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
+        <!--Indexes-->
+        <index referenceId="TEST_TABLE_TINYINT_BIGINT" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..9105a2b0b25cb
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema_whitelist.json
@@ -0,0 +1,56 @@
+{
+  "reference_table": {
+    "column": {
+      "tinyint_ref": true,
+      "tinyint_without_padding": true,
+      "bigint_without_padding": true,
+      "integer_without_padding": true,
+      "smallint_with_big_padding": true,
+      "smallint_without_default": true,
+      "int_without_unsigned": true,
+      "int_unsigned": true,
+      "bigint_default_nullable": true,
+      "bigint_not_default_not_nullable": true,
+      "smallint_without_padding": true
+    },
+    "constraint": {
+      "tinyint_primary": true
+    }
+  },
+  "auto_increment_test": {
+    "column": {
+      "int_auto_increment_with_nullable": true,
+      "int_disabled_auto_increment": true
+    },
+    "constraint": {
+      "AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE": true
+    }
+  },
+  "test_table": {
+    "column": {
+      "smallint": true,
+      "tinyint": true,
+      "bigint": true,
+      "float": true,
+      "double": true,
+      "decimal": true,
+      "date": true,
+      "timestamp": true,
+      "datetime": true,
+      "longtext": true,
+      "mediumtext": true,
+      "varchar": true,
+      "mediumblob": true,
+      "blob": true,
+      "boolean": true,
+      "varbinary_rename": true
+    },
+    "index": {
+      "TEST_TABLE_TINYINT_BIGINT": true
+    },
+    "constraint": {
+      "TEST_TABLE_SMALLINT_BIGINT": true,
+      "TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/module.xml
new file mode 100644
index 0000000000000..af44654afd829
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule6" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/registration.php
new file mode 100644
index 0000000000000..a107dc2498460
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule6') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule6', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/InstallSchema.php
new file mode 100644
index 0000000000000..e7b9b22c5a284
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/InstallSchema.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * InstallSchema mock class
+ */
+class InstallSchema implements InstallSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+        $installer
+            ->getConnection()
+            ->modifyColumn('test_table', 'float', ['type' => 'float', 'default' => 25]);
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeData.php
new file mode 100644
index 0000000000000..68016d959bb77
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeData.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class UpgradeData
+ * @package Magento\TestSetupDeclarationModule7\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.0') < 0) {
+            $adapter->insertArray('reference_table', ['bigint_without_padding'], [6, 12, 7]);
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeSchema.php
new file mode 100644
index 0000000000000..8381dd3f24537
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeSchema.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+
+/**
+ * UpgradeSchema mock class
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.1') < 0) {
+            $installer
+                ->getConnection()
+                ->modifyColumn('test_table', 'float', ['type' => 'float', 'default' => 29]);
+        }
+
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/etc/module.xml
new file mode 100644
index 0000000000000..7affd773fd07e
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/etc/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.1">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/registration.php
new file mode 100644
index 0000000000000..e357c5171daa3
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule7') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule7', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomePatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomePatch.php
new file mode 100644
index 0000000000000..9f66308cbab34
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomePatch.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomePatch implements
+    DataPatchInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insert('test_table', ['varchar' => "_ref"]);
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomeSkippedPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomeSkippedPatch.php
new file mode 100644
index 0000000000000..7a598905a82f1
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomeSkippedPatch.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomeSkippedPatch implements
+    DataPatchInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new \Exception('This patch should be skipped!');
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/db_schema.xml
new file mode 100644
index 0000000000000..4e4d65baec251
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table">
+        <column xsi:type="float" name="float" default="35" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/module.xml
new file mode 100644
index 0000000000000..7affd773fd07e
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.1">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeData.php
new file mode 100644
index 0000000000000..6dd52909ec2da
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeData.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class UpgradeData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.0') < 0) {
+            $adapter->insertArray('reference_table', ['bigint_without_padding'], [6, 12, 7]);
+        }
+
+        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+            $adapter->delete('reference_table', 'bigint_without_padding = 7');
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeSchema.php
new file mode 100644
index 0000000000000..8a91d136a1f10
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeSchema.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+
+/**
+ * UpgradeSchema mock class
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.1') < 0) {
+            $installer
+                ->getConnection()
+                ->modifyColumn('test_table', 'float', ['type' => 'float', 'default' => 29]);
+        }
+        //Create table and check, that Magento can`t delete it
+        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+            $table = $setup->getConnection()->newTable(
+                $setup->getTable('custom_table')
+            )->addColumn(
+                'custom_id',
+                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+                null,
+                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+                'Custom Id'
+            )->addColumn(
+                'name',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                255,
+                [],
+                'Custom Name'
+            )->setComment(
+                'Custom Table'
+            );
+            $setup->getConnection()->createTable($table);
+        }
+
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml
new file mode 100644
index 0000000000000..b4957234be103
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.2">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/wl_remove_table/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/wl_remove_table/db_schema_whitelist.json
new file mode 100644
index 0000000000000..c55475234424c
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/wl_remove_table/db_schema_whitelist.json
@@ -0,0 +1,5 @@
+{
+  "custom_table": {
+    "column": {}
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/etc/module.xml
new file mode 100644
index 0000000000000..96a09ad477d41
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule8" setup_version="1.0.0" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/registration.php
new file mode 100644
index 0000000000000..cb8e645f1771d
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule8') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule8', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema.xml
new file mode 100644
index 0000000000000..f8860731aa808
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default">
+        <index referenceId="TEST_TABLE_INDEX_VARCHAR" disabled="1"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema_whitelist.json
new file mode 100644
index 0000000000000..a65bb6aab1c43
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/db_schema_whitelist.json
@@ -0,0 +1,7 @@
+{
+  "test_table": {
+    "index": {
+      "TEST_TABLE_VARCHAR": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/module.xml
new file mode 100644
index 0000000000000..a0b9bbe483bcf
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/disable_index_by_external_module/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_TestSetupDeclarationModule8">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule1" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
new file mode 100644
index 0000000000000..1b7d0dcb93ce7
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" unsigned="false" identity="true"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id"/>
+        </constraint>
+    </table>
+    <table name="dependent" resource="default" comment="Lol">
+        <column xsi:type="int" name="page_id_on" nullable="true" unsigned="true"/>
+        <constraint xsi:type="foreign" referenceId="FOREIGN" table="dependent" column="page_id_on" referenceColumn="page_id"
+                    referenceTable="test_table"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_auto_increment/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_auto_increment/db_schema.xml
new file mode 100644
index 0000000000000..bc889c5fdbefd
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_auto_increment/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" identity="true" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
new file mode 100644
index 0000000000000..b42d74aea06a1
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" identity="true" />
+        <column xsi:type="varchar" name="email" nullable="true" />
+        <column xsi:type="varchar" name="title" />
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id" />
+            <column name="email" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/unpatterned_fk_name/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/unpatterned_fk_name/db_schema.xml
new file mode 100644
index 0000000000000..eebeb154adf43
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/unpatterned_fk_name/db_schema.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" unsigned="false" identity="true"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="page_id"/>
+        </constraint>
+    </table>
+    <table name="test_scope_table" resource="default" comment="Test Scope Table">
+        <column xsi:type="int" name="scope_id" nullable="false" unsigned="false" identity="true"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="scope_id"/>
+        </constraint>
+    </table>
+    <table name="dependent" resource="default" comment="Lol">
+        <column xsi:type="int" name="page_id_on" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="scope_id_on" nullable="false" unsigned="false"/>
+        <!-- Expected name in DB: DEPENDENT_PAGE_ID_ON_TEST_TABLE_PAGE_ID -->
+        <constraint xsi:type="foreign" referenceId="DEPENDENT_PAGE_ID_ON_TEST_TABLE_PAGE_ID" table="dependent" column="page_id_on" referenceColumn="page_id"
+                    referenceTable="test_table"/>
+        <!-- Expected name in DB: DEPENDENT_SCOPE_ID_ON_TEST_SCOPE_TABLE_SCOPE_ID -->
+        <constraint xsi:type="foreign" referenceId="ScopeIDOnTOScopeTableAndScopeId" table="dependent" column="scope_id_on" referenceColumn="scope_id"
+                    referenceTable="test_scope_table"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/whitelist_upgrade/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/whitelist_upgrade/db_schema.xml
new file mode 100644
index 0000000000000..05ce3318ef73b
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/whitelist_upgrade/db_schema.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_test" resource="default">
+        <column xsi:type="smallint" identity="true" name="entity_id" padding="3" nullable="true"/>
+        <column xsi:type="smallint" identity="true" name="product_id" padding="3" nullable="true"/>
+        <index referenceId="ENTITY_ID_INDEX" indexType="btree">
+            <column name="entity_id"/>
+        </index>
+        <constraint xsi:type="unique" referenceId="UNIQUE_PAIR">
+            <column name="entity_id"/>
+            <column name="product_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="TEST_TABLE_TINYINT_REFERENCE"
+                    column="entity_id" table="reference_test"
+                    referenceTable="test_table" referenceColumn="smallint" onDelete="NO ACTION"/>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_counter" padding="12" unsigned="true"
+                nullable="true"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule1/Setup/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupModule1/Setup/InstallSchema.php
deleted file mode 100644
index 37c24afab75ed..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule1/Setup/InstallSchema.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\TestSetupModule1\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-
-        $installer->startSetup();
-
-        /**
-         * Create table 'setup_table1'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('setup_tests_table1')
-        )->addColumn(
-            'column_with_type_boolean',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-            null,
-            ['nullable' => false, 'default' => 0],
-            'Column with type boolean'
-        )->addColumn(
-            'column_with_type_smallint',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Column with type smallint'
-        )->addColumn(
-            'column_with_type_integer',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'identity' => true, 'nullable' => false, 'primary' => true],
-            'Column with type integer'
-        )->addColumn(
-            'column_with_type_bigint',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Column with type bigint'
-        )->addColumn(
-            'column_with_type_float',
-            \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Column with type float'
-        )->addColumn(
-            'column_with_type_numeric',
-            \Magento\Framework\DB\Ddl\Table::TYPE_NUMERIC,
-            '12,4',
-            ['unsigned' => true, 'nullable' => true],
-            'Column with type numeric'
-        )->addColumn(
-            'column_with_type_decimal',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['unsigned' => true, 'nullable' => true],
-            'Column with type decimal'
-        )->addColumn(
-            'column_with_type_datetime',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Column with type datetime'
-        )->addColumn(
-            'column_with_type_timestamp_update',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_UPDATE],
-            'Column with type timestamp update'
-        )->addColumn(
-            'column_with_type_date',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Column with type date'
-        )->addColumn(
-            'column_with_type_text',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            '64k',
-            [],
-            'Column with type text'
-        )->addColumn(
-            'column_with_type_blob',
-            \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
-            32,
-            [],
-            'Column with type blob'
-        )->addColumn(
-            'column_with_type_verbinary',
-            \Magento\Framework\DB\Ddl\Table::TYPE_VARBINARY,
-            '2m',
-            [],
-            'Column with type varbinary'
-        )->addIndex(
-            $installer->getIdxName(
-                'setup_tests_table1',
-                ['column_with_type_text'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT
-            ),
-            ['column_with_type_text'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT]
-        )->addIndex(
-            $installer->getIdxName(
-                'setup_tests_table1',
-                'column_with_type_integer',
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-            ),
-            'column_with_type_integer',
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
-        );
-
-        $installer->getConnection()->createTable($table);
-
-        $relatedTable = $installer->getConnection()->newTable(
-            $installer->getTable('setup_tests_table1_related')
-        )->addColumn(
-            'column_with_type_timestamp_init_update',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Column with type timestamp init update'
-        )->addColumn(
-            'column_with_type_timestamp_init',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Column with type timestamp init'
-        )->addColumn(
-            'column_with_relation',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false],
-            'Column with type integer and relation'
-        )->addForeignKey(
-            $installer->getFkName(
-                'setup_table1_related',
-                'column_with_relation',
-                'setup_tests_table1',
-                'column_with_type_integer'
-            ),
-            'column_with_relation',
-            $installer->getTable('setup_tests_table1'),
-            'column_with_type_integer',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Related Table'
-        );
-        $installer->getConnection()->createTable($relatedTable);
-        $installer->endSetup();
-    }
-}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule1/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupModule1/etc/module.xml
deleted file mode 100644
index a69c11e3ad489..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule1/etc/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestSetupModule1" setup_version="0.0.1"/>
-</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule1/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupModule1/registration.php
deleted file mode 100644
index a7e2dcfb5319a..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule1/registration.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-$registrar = new ComponentRegistrar();
-if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupModule1') === null) {
-    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupModule1', __DIR__);
-}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/Setup/InstallData.php b/dev/tests/setup-integration/_files/Magento/TestSetupModule2/Setup/InstallData.php
deleted file mode 100644
index 071496f14f4a4..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/Setup/InstallData.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestSetupModule2\Setup;
-
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        $setup->getConnection()->insertForce(
-            $setup->getTable('setup_tests_entity_table'),
-            [
-                'website_id' => 1,
-                'email_field' => 'entity@example.com',
-                'created_at' => '2017-10-30 09:41:25',
-                'updated_at' => '2017-10-30 09:45:05',
-                'created_in' => 'Default Store View',
-                'firstname' => 'John',
-                'lastname' => 'Doe',
-                'dob' => '1973-12-15',
-                'default_billing_address_id' => 1,
-                'default_shipping_address_id' => 1
-            ]
-        );
-        $setup->getConnection()->insertForce(
-            $setup->getTable('setup_tests_address_entity'),
-            [
-                'parent_id' => 1,
-                'created_at' => '2017-10-30 09:45:05',
-                'updated_at' => '2017-10-30 09:45:05',
-                'is_active' => 1,
-                'city' => 'city',
-                'company' => 'Magento',
-                'country_id' => 'US',
-                'firstname' => 'John',
-                'lastname' => 'Doe',
-                'postcode' => '90210',
-                'region' => 'Alabama',
-                'region_id' => 1,
-                'street' => 'street1',
-                'telephone' => 12345678,
-            ]
-        );
-
-        $setup->endSetup();
-    }
-}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/Setup/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupModule2/Setup/InstallSchema.php
deleted file mode 100644
index 7c5430dc1b745..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/Setup/InstallSchema.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\TestSetupModule2\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'entity_table'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('setup_tests_entity_table')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true],
-            'Website Id'
-        )->addColumn(
-            'email_field',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Email'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'created_in',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Created From'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'First Name'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            [],
-            'Last Name'
-        )->addColumn(
-            'dob',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-            null,
-            [],
-            'Date of Birth'
-        )->addColumn(
-            'default_billing_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'Default Billing Address'
-        )->addColumn(
-            'default_shipping_address_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'Default Shipping Address'
-        )->addIndex(
-            $installer->getIdxName(
-                'setup_tests_entity_table',
-                ['email_field', 'website_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['email_field', 'website_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('setup_tests_entity_table', ['website_id']),
-            ['website_id']
-        )->addIndex(
-            $installer->getIdxName('setup_tests_entity_table', ['firstname']),
-            ['firstname']
-        )->addIndex(
-            $installer->getIdxName('setup_tests_entity_table', ['lastname']),
-            ['lastname']
-        )->addForeignKey(
-            $installer->getFkName(
-                'setup_tests_entity_table',
-                'website_id',
-                'store_website',
-                'website_id'
-            ),
-            'website_id',
-            $installer->getTable('store_website'),
-            'website_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_SET_NULL
-        )->setComment(
-            'Entity Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'address_entity'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('setup_tests_address_entity')
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Entity Id'
-        )->addColumn(
-            'increment_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            50,
-            [],
-            'Increment Id'
-        )->addColumn(
-            'parent_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true],
-            'Parent Id'
-        )->addColumn(
-            'created_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-            'Created At'
-        )->addColumn(
-            'updated_at',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-            null,
-            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-            'Updated At'
-        )->addColumn(
-            'is_active',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '1'],
-            'Is Active'
-        )->addColumn(
-            'city',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'City'
-        )->addColumn(
-            'company',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Company'
-        )->addColumn(
-            'country_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Country'
-        )->addColumn(
-            'fax',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Fax'
-        )->addColumn(
-            'firstname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'First Name'
-        )->addColumn(
-            'lastname',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Last Name'
-        )->addColumn(
-            'middlename',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Middle Name'
-        )->addColumn(
-            'postcode',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'Zip/Postal Code'
-        )->addColumn(
-            'prefix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true, 'default' => null],
-            'Name Prefix'
-        )->addColumn(
-            'region',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => true, 'default' => null],
-            'State/Province'
-        )->addColumn(
-            'region_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => true, 'default' => null],
-            'State/Province'
-        )->addColumn(
-            'street',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            null,
-            ['nullable' => false],
-            'Street Address'
-        )->addColumn(
-            'suffix',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            40,
-            ['nullable' => true, 'default' => null],
-            'Name Suffix'
-        )->addColumn(
-            'telephone',
-            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-            255,
-            ['nullable' => false],
-            'Phone Number'
-        )->addIndex(
-            $installer->getIdxName('address_entity', ['parent_id']),
-            ['parent_id']
-        )->addForeignKey(
-            $installer->getFkName(
-                'setup_tests_address_entity',
-                'parent_id',
-                'setup_tests_entity_table',
-                'entity_id'
-            ),
-            'parent_id',
-            $installer->getTable('setup_tests_entity_table'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Address Entity'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'address_entity_datetime'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('setup_tests_address_entity_datetime')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME,
-            null,
-            ['nullable' => true, 'default' => null],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'setup_tests_address_entity_datetime',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('setup_tests_address_entity_datetime', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName(
-                'setup_tests_address_entity_datetime',
-                ['entity_id', 'attribute_id', 'value']
-            ),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName(
-                'address_entity_datetime',
-                'entity_id',
-                'address_entity',
-                'entity_id'
-            ),
-            'entity_id',
-            $installer->getTable('setup_tests_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Address Entity Datetime'
-        );
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'address_entity_decimal'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('setup_tests_address_entity_decimal')
-        )->addColumn(
-            'value_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['identity' => true, 'nullable' => false, 'primary' => true],
-            'Value Id'
-        )->addColumn(
-            'attribute_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Attribute Id'
-        )->addColumn(
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-            'Entity Id'
-        )->addColumn(
-            'value',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            ['nullable' => false, 'default' => '0.0000'],
-            'Value'
-        )->addIndex(
-            $installer->getIdxName(
-                'setup_tests_address_entity_decimal',
-                ['entity_id', 'attribute_id'],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-            ),
-            ['entity_id', 'attribute_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-        )->addIndex(
-            $installer->getIdxName('setup_tests_address_entity_decimal', ['attribute_id']),
-            ['attribute_id']
-        )->addIndex(
-            $installer->getIdxName('setup_tests_address_entity_decimal', ['entity_id', 'attribute_id', 'value']),
-            ['entity_id', 'attribute_id', 'value']
-        )->addForeignKey(
-            $installer->getFkName(
-                'setup_tests_address_entity_decimal',
-                'entity_id',
-                'setup_tests_address_entity',
-                'entity_id'
-            ),
-            'entity_id',
-            $installer->getTable('setup_tests_address_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->setComment(
-            'Address Entity Decimal'
-        );
-        $installer->getConnection()->createTable($table);
-    }
-}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupModule2/etc/module.xml
deleted file mode 100644
index b6a26d50753fb..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/etc/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestSetupModule2" setup_version="0.0.1"/>
-</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupModule2/registration.php
deleted file mode 100644
index cdf684229889c..0000000000000
--- a/dev/tests/setup-integration/_files/Magento/TestSetupModule2/registration.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-$registrar = new ComponentRegistrar();
-if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupModule2') === null) {
-    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupModule2', __DIR__);
-}
diff --git a/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/Setup/UpgradeData.php b/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/Setup/UpgradeData.php
deleted file mode 100644
index c1bc2ccd7e6da..0000000000000
--- a/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/Setup/UpgradeData.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestSetupModule2\Setup;
-
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeData implements UpgradeDataInterface
-{
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        // data update for TestSetupModule2 module < 0.0.2
-        if (version_compare($context->getVersion(), '0.0.2', '<')) {
-            // add one more row to address_entity table
-            $setup->getConnection()->insertForce(
-                $setup->getTable('setup_tests_address_entity'),
-                [
-                    'parent_id' => 1,
-                    'created_at' => '2017-10-30 13:34:19',
-                    'updated_at' => '2017-10-30 13:34:19',
-                    'is_active' => 1,
-                    'city' => 'Austin',
-                    'company' => 'X.Commerce',
-                    'country_id' => 'US',
-                    'firstname' => 'Joan',
-                    'lastname' => 'Doe',
-                    'postcode' => '36351',
-                    'region' => 'Alabama',
-                    'region_id' => 1,
-                    'street' => 'New Brockton',
-                    'telephone' => 12345678,
-                ]
-            );
-            $setup->getConnection()->update($setup->getTable('setup_tests_entity_table'), [
-                'increment_id'=> 1
-            ], 'increment_id = null');
-
-            $setup->getConnection()->insertForce(
-                $setup->getTable('setup_tests_entity_passwords'),
-                [
-                    'entity_id' => 1,
-                    'password_hash' => '139e2ee2785cd9d9eb5714a02aca579bbcc05f9062996389d6e0e329bab9841b',
-                ]
-            );
-        }
-        $setup->endSetup();
-    }
-}
diff --git a/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/Setup/UpgradeSchema.php b/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/Setup/UpgradeSchema.php
deleted file mode 100755
index 4ce4b91f7c6f5..0000000000000
--- a/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\TestSetupModule2\Setup;
-
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-
-/**
- * @codeCoverageIgnore
- */
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $setup->startSetup();
-
-        if (version_compare($context->getVersion(), '0.0.2') < 0) {
-            $connection = $setup->getConnection();
-
-            //add new column
-            $setup->getConnection()->addColumn(
-                $setup->getTable('setup_tests_entity_table'),
-                'group_id',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'unsigned' => true,
-                    'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Group Id'
-                ]
-            );
-            $setup->getConnection()->addColumn(
-                $setup->getTable('setup_tests_entity_table'),
-                'store_id',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                    'unsigned' => true,
-                    'default' => '0',
-                    'comment' => 'Store Id'
-                ]
-            );
-
-            //add index
-            $connection->addIndex(
-                $setup->getTable('setup_tests_entity_table'),
-                $setup->getIdxName('setup_tests_entity_table', ['store_id']),
-                ['store_id']
-            );
-
-            //modify existing column with type TEXT/TYPE_TIMESTAMP
-            $setup->getConnection()->modifyColumn(
-                $setup->getTable('setup_tests_address_entity'),
-                'suffix',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 100,
-                ]
-            )->modifyColumn(
-                $setup->getTable('setup_tests_entity_table'),
-                'created_at',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    'nullable' => false,
-                    'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE,
-                ]
-            );
-
-            //addTable
-            $table = $setup->getConnection()
-                ->newTable($setup->getTable('setup_tests_entity_passwords'))
-                ->addColumn(
-                    'password_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-                    'Password Id'
-                )
-                ->addColumn(
-                    'entity_id',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                    null,
-                    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                    'User Id'
-                )
-                ->addColumn(
-                    'password_hash',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    100,
-                    [],
-                    'Password Hash'
-                )
-                ->addIndex(
-                    $setup->getIdxName('setup_tests_entity_passwords', ['entity_id']),
-                    ['entity_id']
-                )
-                ->addForeignKey(
-                    $setup->getFkName(
-                        'setup_tests_entity_passwords',
-                        'entity_id',
-                        'setup_tests_entity_table',
-                        'entity_id'
-                    ),
-                    'entity_id',
-                    $setup->getTable('setup_tests_entity_table'),
-                    'entity_id',
-                    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-                )
-                ->setComment('Entity Passwords');
-
-            $setup->getConnection()->createTable($table);
-            //remove foreign key
-            $connection->dropForeignKey(
-                $setup->getTable('setup_tests_address_entity_decimal'),
-                $setup->getFkName(
-                    'setup_tests_address_entity_decimal',
-                    'entity_id',
-                    'setup_tests_address_entity',
-                    'entity_id'
-                )
-            );
-
-            //remove index
-            $connection->dropIndex(
-                $setup->getTable('setup_tests_address_entity_decimal'),
-                $setup->getIdxName(
-                    $setup->getTable('setup_tests_address_entity_decimal'),
-                    ['entity_id', 'attribute_id']
-                )
-            );
-            //remove column
-            $connection->dropColumn($setup->getTable('setup_tests_entity_table'), 'dob');
-
-            //remove table
-            $connection->dropTable($setup->getTable('setup_tests_address_entity_datetime'));
-        }
-
-        $setup->endSetup();
-    }
-}
diff --git a/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/etc/module.xml b/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/etc/module.xml
deleted file mode 100644
index d781d8991cfe5..0000000000000
--- a/dev/tests/setup-integration/_files/UpgradeScripts/TestSetupModule2/etc/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_TestSetupModule2" setup_version="0.0.2"/>
-</config>
diff --git a/dev/tests/setup-integration/config/install-config-mysql.php.dist b/dev/tests/setup-integration/config/install-config-mysql.php.dist
deleted file mode 100644
index dfe91c1c1a7f7..0000000000000
--- a/dev/tests/setup-integration/config/install-config-mysql.php.dist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-return [
-    'db-host' => 'localhost',
-    'db-user' => 'dbuser',
-    'db-password' => '123',
-    'db-name' => 'magento_setup_tests',
-    'db-prefix' => '',
-    'backend-frontname' => 'backend',
-    'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
-    'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
-    'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
-    'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
-    'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
-];
diff --git a/dev/tests/setup-integration/config/config-global.php.dist b/dev/tests/setup-integration/etc/config-global.php.dist
similarity index 99%
rename from dev/tests/setup-integration/config/config-global.php.dist
rename to dev/tests/setup-integration/etc/config-global.php.dist
index cd5cfab35fba2..fb82fa5c0695a 100644
--- a/dev/tests/setup-integration/config/config-global.php.dist
+++ b/dev/tests/setup-integration/etc/config-global.php.dist
@@ -3,5 +3,4 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 return [];
diff --git a/dev/tests/setup-integration/etc/install-config-mysql.php.dist b/dev/tests/setup-integration/etc/install-config-mysql.php.dist
new file mode 100644
index 0000000000000..d355100c446be
--- /dev/null
+++ b/dev/tests/setup-integration/etc/install-config-mysql.php.dist
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'default' => [
+        'db-host' => '{{db-host}}',
+        'db-user' => '{{db-user}}',
+        'db-password' => '{{db-password}}',
+        'db-name' => '{{db-name}}',
+        'db-prefix' => '',
+        'backend-frontname' => 'admin',
+        'admin-user' => 'admin',
+        'admin-password' => '123123q',
+        'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
+        'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
+        'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+        'enable-modules' => 'Magento_TestSetupModule2,Magento_TestSetupModule1,Magento_Backend',
+        'disable-modules' => 'all'
+    ],
+    'checkout' => [
+        'host' => '{{db-host}}',
+        'username' => '{{db-user}}',
+        'password' => '{{db-password}}',
+        'dbname' => '{{db-checkout}}'
+    ],
+    'sales' => [
+        'host' => '{{db-host}}',
+        'username' => '{{db-user}}',
+        'password' => '{{db-password}}',
+        'dbname' => '{{db-sales}}'
+    ]
+];
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php
new file mode 100644
index 0000000000000..be503e6de910a
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestFramework\Annotation;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Io\File;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+
+/**
+ * Handler for applying reinstallMagento annotation.
+ */
+class CopyModules
+{
+    /**
+     * @var TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * CopyModules constructor.
+     */
+    public function __construct()
+    {
+        $this->moduleManager = new TestModuleManager();
+        $this->cliCommand = new CliCommand($this->moduleManager);
+    }
+
+    /**
+     * Handler for 'startTest' event.
+     *
+     * @param  \PHPUnit\Framework\TestCase $test
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function startTest(\PHPUnit\Framework\TestCase $test)
+    {
+        $annotations = $test->getAnnotations();
+        //This annotation can be declared only on method level
+        if (isset($annotations['method']['moduleName'])) {
+            $moduleNames = $annotations['method']['moduleName'];
+
+            foreach ($moduleNames as $moduleName) {
+                $this->cliCommand->introduceModule($moduleName);
+                //Include module`s registration.php to load it
+                $path = MAGENTO_MODULES_PATH . explode("_", $moduleName)[1] . '/registration.php';
+                include $path;
+            }
+        }
+    }
+
+    /**
+     * Handler for 'startTest' event
+     *
+     * @param \PHPUnit\Framework\TestCase $test
+     */
+    public function endTest(\PHPUnit\Framework\TestCase $test)
+    {
+        $annotations = $test->getAnnotations();
+        //This annotation can be declared only on method level
+        if (!empty($annotations['method']['moduleName'])) {
+            foreach ($annotations['method']['moduleName'] as $moduleName) {
+                $path = MAGENTO_MODULES_PATH .
+                    //Take only module name from Magento_ModuleName
+                    explode("_", $moduleName)[1];
+                File::rmdirRecursive($path);
+                $this->unsergisterModuleFromComponentRegistrar($moduleName);
+            }
+        }
+    }
+
+    /**
+     * Unregister module from component registrar.
+     * The component registrar uses static private variable and does not provide unregister method,
+     * however unregister is required to remove registered modules after they are deleted from app/code.
+     *
+     * @param $moduleName
+     *
+     * @return void
+     */
+    private function unsergisterModuleFromComponentRegistrar($moduleName)
+    {
+        $reflection = new \ReflectionClass(ComponentRegistrar::class);
+        $reflectionProperty = $reflection->getProperty('paths');
+        $reflectionProperty->setAccessible(true);
+        $value = $reflectionProperty->getValue();
+        unset($value[ComponentRegistrar::MODULE][$moduleName]);
+        $reflectionProperty->setValue($value);
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/DataProviderFromFile.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/DataProviderFromFile.php
new file mode 100644
index 0000000000000..6bc513b659074
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/DataProviderFromFile.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestFramework\Annotation;
+
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\TestCase\MutableDataInterface;
+
+/**
+ * Handler for applying reinstallMagento annotation.
+ */
+class DataProviderFromFile
+{
+    /**
+     * @var TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * CopyModules constructor.
+     */
+    public function __construct()
+    {
+        $this->moduleManager = new TestModuleManager();
+        $this->cliCommand = new CliCommand($this->moduleManager);
+    }
+
+    /**
+     * Start test.
+     *
+     * @param \PHPUnit\Framework\TestCase $test
+     * @throws \Exception
+     */
+    public function startTest(\PHPUnit\Framework\TestCase $test)
+    {
+        $annotations = $test->getAnnotations();
+        //This annotation can be declared only on method level
+        if (isset($annotations['method']['dataProviderFromFile']) && $test instanceof MutableDataInterface) {
+            $data = include TESTS_MODULES_PATH . "/" . $annotations['method']['dataProviderFromFile'][0];
+            $test->setData($data);
+        } else if (!$test instanceof MutableDataInterface) {
+            throw new \Exception("Test type do not supports @dataProviderFromFile annotation");
+        }
+    }
+
+    /**
+     * Finish test.
+     *
+     * @param \PHPUnit\Framework\TestCase $test
+     * @throws \Exception
+     */
+    public function endTest(\PHPUnit\Framework\TestCase $test)
+    {
+        if ($test instanceof MutableDataInterface) {
+            $test->flushData();
+        }
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php
index 23097ba529300..e3825db2bd1f1 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php
@@ -6,9 +6,13 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Module\ModuleResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
 /**
- * Handler for applying reinstallMagento annotation
- *
+ * Handler for applying reinstallMagento annotation.
  */
 class ReinstallInstance
 {
@@ -27,32 +31,25 @@ public function __construct(\Magento\TestFramework\Application $application)
         $this->application = $application;
     }
 
+    public function startTest()
+    {
+        /** @var ObjectManager $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+        $resourceConnection = $objectManager->create(ResourceConnection::class);
+        $objectManager->removeSharedInstance(ResourceConnection::class);
+        $objectManager->addSharedInstance($resourceConnection, ResourceConnection::class);
+        $this->application->reinitialize();
+    }
+
     /**
-     * Handler for 'endTest' event
+     * Handler for 'endTest' event.
      *
-     * @param \PHPUnit\Framework\TestCase $test
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function endTest(\PHPUnit\Framework\TestCase $test)
+    public function endTest()
     {
-        $this->_hasNonIsolatedTests = true;
-
-        /* Determine an isolation from doc comment */
-        $annotations = $test->getAnnotations();
-        $annotations = array_replace((array) $annotations['class'], (array) $annotations['method']);
-        $isIsolationEnabled = false;
-        if (isset($annotations['reinstallMagento'])) {
-            $isolation = $annotations['reinstallMagento'];
-            if ($isolation !== ['enabled'] && $isolation !== ['disabled']) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Invalid "@reinstallMagento" annotation, can be "enabled" or "disabled" only.')
-                );
-            }
-            $isIsolationEnabled = $isolation === ['enabled'];
-        }
-        if ($isIsolationEnabled && $this->application->isInstalled()) {
-            $this->application->cleanup();
-            $this->application->install();
-        }
+        $this->application->cleanup();
+        $this->application->reinitialize();
+        ModuleResource::flush();
     }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/SchemaFixture.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/SchemaFixture.php
new file mode 100644
index 0000000000000..17b808d81697b
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/SchemaFixture.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Implementation of the @magentoSchemaFixture DocBlock annotation.
+ */
+namespace Magento\TestFramework\Annotation;
+
+/**
+ * Represents following construction handling:
+ *
+ * @magentoSchemaFixture {link_to_file.php}
+ */
+class SchemaFixture
+{
+    /**
+     * Fixtures base directory.
+     *
+     * @var string
+     */
+    protected $fixtureBaseDir;
+
+    /**
+     * Fixtures that have been applied.
+     *
+     * @var array
+     */
+    private $appliedFixtures = [];
+
+    /**
+     * Constructor.
+     *
+     * @param  string $fixtureBaseDir
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function __construct($fixtureBaseDir)
+    {
+        if (!is_dir($fixtureBaseDir)) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                new \Magento\Framework\Phrase("Fixture base directory '%1' does not exist.", [$fixtureBaseDir])
+            );
+        }
+        $this->fixtureBaseDir = realpath($fixtureBaseDir);
+    }
+
+    /**
+     * Apply magento data fixture on.
+     *
+     * @param  \PHPUnit\Framework\TestCase $test
+     * @return void
+     */
+    public function startTest(\PHPUnit\Framework\TestCase $test)
+    {
+        if ($this->_getFixtures($test)) {
+            $this->_applyFixtures($this->_getFixtures($test));
+        }
+    }
+
+    /**
+     * Finish test execution.
+     *
+     * @param \PHPUnit\Framework\TestCase $test
+     */
+    public function endTest(\PHPUnit\Framework\TestCase $test)
+    {
+        if ($this->_getFixtures($test)) {
+            $this->_revertFixtures();
+        }
+    }
+    
+    /**
+     * Retrieve fixtures from annotation.
+     *
+     * @param  \PHPUnit\Framework\TestCase $test
+     * @param  string                      $scope
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function _getFixtures(\PHPUnit\Framework\TestCase $test, $scope = null)
+    {
+        if ($scope === null) {
+            $annotations = $this->getAnnotations($test);
+        } else {
+            $annotations = $test->getAnnotations()[$scope];
+        }
+        $result = [];
+        if (!empty($annotations['magentoSchemaFixture'])) {
+            foreach ($annotations['magentoSchemaFixture'] as $fixture) {
+                if (strpos($fixture, '\\') !== false) {
+                    // usage of a single directory separator symbol streamlines search across the source code
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        new \Magento\Framework\Phrase('Directory separator "\\" is prohibited in fixture declaration.')
+                    );
+                }
+                $fixtureMethod = [get_class($test), $fixture];
+                if (is_callable($fixtureMethod)) {
+                    $result[] = $fixtureMethod;
+                } else {
+                    $result[] = $this->fixtureBaseDir . '/' . $fixture;
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Get annotations for test.
+     *
+     * @param \PHPUnit\Framework\TestCase $test
+     * @return array
+     */
+    private function getAnnotations(\PHPUnit\Framework\TestCase $test)
+    {
+        $annotations = $test->getAnnotations();
+        return array_replace($annotations['class'], $annotations['method']);
+    }
+
+    /**
+     * Execute single fixture script.
+     *
+     * @param  string|array $fixture
+     * @throws \Exception
+     */
+    protected function _applyOneFixture($fixture)
+    {
+        try {
+            if (is_callable($fixture)) {
+                call_user_func($fixture);
+            } else {
+                include $fixture;
+            }
+        } catch (\Exception $e) {
+            throw new \Exception(
+                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), $e->getMessage()),
+                500,
+                $e
+            );
+        }
+    }
+
+    /**
+     * Execute fixture scripts if any.
+     *
+     * @param  array $fixtures
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function _applyFixtures(array $fixtures)
+    {
+        /* Execute fixture scripts */
+        foreach ($fixtures as $oneFixture) {
+            /* Skip already applied fixtures */
+            if (in_array($oneFixture, $this->appliedFixtures, true)) {
+                continue;
+            }
+            $this->_applyOneFixture($oneFixture);
+            $this->appliedFixtures[] = $oneFixture;
+        }
+    }
+
+    /**
+     * Revert changes done by fixtures.
+     */
+    protected function _revertFixtures()
+    {
+        foreach ($this->appliedFixtures as $fixture) {
+            if (is_callable($fixture)) {
+                $fixture[1] .= 'Rollback';
+                if (is_callable($fixture)) {
+                    $this->_applyOneFixture($fixture);
+                }
+            } else {
+                $fileInfo = pathinfo($fixture);
+                $extension = '';
+                if (isset($fileInfo['extension'])) {
+                    $extension = '.' . $fileInfo['extension'];
+                }
+                $rollbackScript = $fileInfo['dirname'] . '/' . $fileInfo['filename'] . '_rollback' . $extension;
+                if (file_exists($rollbackScript)) {
+                    $this->_applyOneFixture($rollbackScript);
+                }
+            }
+        }
+        $this->appliedFixtures = [];
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php
index c04f6cbc56e0a..6732a8de4eb1e 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php
@@ -6,9 +6,10 @@
 namespace Magento\TestFramework\Bootstrap;
 
 /**
- * Bootstrap of the custom DocBlock annotations
+ * Bootstrap of the custom DocBlock annotations.
+ *
+ * \Magento\TestFramework\Isolation\DeploymentConfig was excluded for setup/upgrade tests.
  *
- * \Magento\TestFramework\Isolation\DeploymentConfig was excluded for setup/upgrade tests
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SetupDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock
@@ -16,7 +17,7 @@ class SetupDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock
     /**
      * Get list of subscribers. In addition, register <b>reinstallMagento</b> annotation processing.
      *
-     * @param \Magento\TestFramework\Application $application
+     * @param  \Magento\TestFramework\Application $application
      * @return array
      */
     protected function _getSubscribers(\Magento\TestFramework\Application $application)
@@ -26,24 +27,14 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
             new \Magento\TestFramework\Workaround\Cleanup\TestCaseProperties(),
             new \Magento\TestFramework\Workaround\Cleanup\StaticProperties(),
             new \Magento\TestFramework\Isolation\WorkingDirectory(),
-            new \Magento\TestFramework\Annotation\AppIsolation($application),
-            new \Magento\TestFramework\Isolation\AppConfig(),
-            new \Magento\TestFramework\Annotation\ConfigFixture(),
-            new \Magento\TestFramework\Annotation\DataFixtureBeforeTransaction($this->_fixturesBaseDir),
-            new \Magento\TestFramework\Event\Transaction(
-                new \Magento\TestFramework\EventManager(
-                    [
-                        new \Magento\TestFramework\Annotation\DbIsolation(),
-                        new \Magento\TestFramework\Annotation\DataFixture($this->_fixturesBaseDir),
-                    ]
-                )
-            ),
+            new \Magento\TestFramework\Workaround\DeploymentConfig(),
             new \Magento\TestFramework\Annotation\ComponentRegistrarFixture($this->_fixturesBaseDir),
-            new \Magento\TestFramework\Annotation\AppArea($application),
+            new \Magento\TestFramework\Annotation\SchemaFixture($this->_fixturesBaseDir),
             new \Magento\TestFramework\Annotation\Cache(),
-            new \Magento\TestFramework\Annotation\AdminConfigFixture(),
-            new \Magento\TestFramework\Annotation\ConfigFixture(),
-            new \Magento\TestFramework\Annotation\ReinstallInstance($application)
+            new \Magento\TestFramework\Workaround\CacheClean(),
+            new \Magento\TestFramework\Annotation\ReinstallInstance($application),
+            new \Magento\TestFramework\Annotation\CopyModules(),
+            new \Magento\TestFramework\Annotation\DataProviderFromFile()
         ];
     }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
index 68cac224ce4cc..10a839df83a5e 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\TestFramework\Deploy;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Shell;
+use Magento\Framework\Shell\CommandRenderer;
+use Magento\Setup\Console\Command\InstallCommand;
 
 /**
- * The purpose of this class is enable/disable module and upgrade commands execution
+ * The purpose of this class is enable/disable module and upgrade commands execution.
  */
 class CliCommand
 {
@@ -18,33 +21,39 @@ class CliCommand
     private $shell;
 
     /**
-     * @var array
+     * @var TestModuleManager
      */
-    private $initParams;
+    private $testEnv;
 
     /**
-     * @var TestModuleManager
+     * @var ParametersHolder
      */
-    private $testEnv;
+    private $parametersHolder;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
 
     /**
      * ShellCommand constructor.
      *
-     * @param \Magento\Framework\Shell $shell
-     * @param TestModuleManager $testEnv
+     * @param    TestModuleManager $testEnv
+     * @param DeploymentConfig $deploymentConfig
+     * @internal param Shell $shell
      */
     public function __construct(
-        \Magento\Framework\Shell $shell,
         \Magento\TestFramework\Deploy\TestModuleManager $testEnv
     ) {
-        $this->shell = $shell;
+        $this->shell = new Shell(new CommandRenderer());
         $this->testEnv = $testEnv;
+        $this->parametersHolder = new ParametersHolder();
     }
 
     /**
-     * Copy Test module files and execute enable module command
+     * Copy Test module files and execute enable module command.
      *
-     * @param string $moduleName
+     * @param  string $moduleName
      * @return string
      */
     public function introduceModule($moduleName)
@@ -54,79 +63,181 @@ public function introduceModule($moduleName)
     }
 
     /**
-     * Execute enable module command
+     * Execute enable module command.
      *
-     * @param string $moduleName
+     * @param  string $moduleName
      * @return string
      */
     public function enableModule($moduleName)
     {
-        $initParams = $this->getInitParams();
-        $enableModuleCommand = 'php -f ' . BP . '/bin/magento module:enable Magento_' . $moduleName
-            . ' -n -vvv --magento-init-params=' . $initParams;
+        $initParams = $this->parametersHolder->getInitParams();
+        $enableModuleCommand = 'php -f ' . BP . '/bin/magento module:enable ' . $moduleName
+            . ' -n -vvv --magento-init-params="' . $initParams['magento-init-params'] . '"';
         return $this->shell->execute($enableModuleCommand);
     }
 
     /**
-     * Execute upgrade magento command
+     * Execute upgrade magento command.
      *
+     * @param array $installParams
      * @return string
      */
-    public function upgrade()
+    public function upgrade($installParams = [])
     {
-        $initParams = $this->getInitParams();
-        $enableModuleCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params='
-            . $initParams;
-        return $this->shell->execute($enableModuleCommand);
+        $initParams = $this->parametersHolder->getInitParams();
+        $upgradeCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params="'
+            . $initParams['magento-init-params'] . '"';
+        $installParams = $this->toCliArguments($installParams);
+        $upgradeCommand .= ' ' . implode(" ", array_keys($installParams));
+
+        return $this->shell->execute($upgradeCommand, array_values($installParams));
     }
 
     /**
-     * Execute disable module command
+     * Execute disable module command.
      *
-     * @param string $moduleName
+     * @param  string $moduleName
      * @return string
      */
     public function disableModule($moduleName)
     {
-        $initParams = $this->getInitParams();
-        $disableModuleCommand = 'php -f ' . BP . '/bin/magento module:disable Magento_'. $moduleName
-            . ' -vvv --magento-init-params=' . $initParams;
+        $initParams = $this->parametersHolder->getInitParams();
+        $disableModuleCommand = 'php -f ' . BP . '/bin/magento module:disable '. $moduleName
+            . ' -vvv --magento-init-params="' . $initParams['magento-init-params'] . '"';
         return $this->shell->execute($disableModuleCommand);
     }
 
     /**
-     * Return application initialization parameters
+     * Split quote db configuration.
+     *
+     * @return void
+     */
+    public function splitQuote()
+    {
+        $initParams = $this->parametersHolder->getInitParams();
+        $installParams = $this->toCliArguments(
+            $this->parametersHolder->getDbData('checkout')
+        );
+        $command = 'php -f ' . BP . '/bin/magento setup:db-schema:split-quote ' .
+            implode(" ", array_keys($installParams)) .
+            ' -vvv --magento-init-params="' .
+            $initParams['magento-init-params'] . '"';
+
+        $this->shell->execute($command, array_values($installParams));
+    }
+
+    /**
+     * Split sales db configuration.
+     *
+     * @return void
+     */
+    public function splitSales()
+    {
+        $initParams = $this->parametersHolder->getInitParams();
+        $installParams = $this->toCliArguments(
+            $this->parametersHolder->getDbData('sales')
+        );
+        $command = 'php -f ' . BP . '/bin/magento setup:db-schema:split-sales ' .
+            implode(" ", array_keys($installParams)) .
+            ' -vvv --magento-init-params="' .
+            $initParams['magento-init-params'] . '"';
+
+        $this->shell->execute($command, array_values($installParams));
+    }
+
+    /**
+     * Clean all types of cache
+     */
+    public function cacheClean()
+    {
+        $initParams = $this->parametersHolder->getInitParams();
+        $command = 'php -f ' . BP . '/bin/magento cache:clean ' .
+            ' -vvv --magento-init-params=' .
+            $initParams['magento-init-params'];
+
+        $this->shell->execute($command);
+    }
+
+    /**
+     * Uninstall module
+     *
+     * @param string $moduleName
+     */
+    public function uninstallModule($moduleName)
+    {
+        $initParams = $this->parametersHolder->getInitParams();
+        $command = 'php -f ' . BP . '/bin/magento module:uninstall ' . $moduleName . ' --remove-data ' .
+            ' -vvv --non-composer --magento-init-params="' .
+            $initParams['magento-init-params'] . '"';
+
+        $this->shell->execute($command);
+    }
+
+    /**
+     * Convert from raw params to CLI arguments, like --admin-username.
      *
+     * @param  array $params
      * @return array
      */
-    private function getInitParams()
+    private function toCliArguments(array $params)
     {
-        if (!isset($this->initParams)) {
-            $testsBaseDir = dirname(__DIR__);
-            $settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
-            $appMode = $settings->get('TESTS_MAGENTO_MODE');
-            $customDirs = $this->getCustomDirs();
-            $initParams = [
-                \Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => $customDirs,
-                \Magento\Framework\App\State::PARAM_MODE => $appMode
-            ];
-            $this->initParams = urldecode(http_build_query($initParams));
+        $result = [];
+
+        foreach ($params as $key => $value) {
+            if (!empty($value)) {
+                $result["--{$key}=%s"] = $value;
+            }
         }
-        return $this->initParams;
+
+        return $result;
     }
 
     /**
-     * Get customized directory paths
+     * Execute install command.
      *
-     * @return array
+     * @param array $modules
+     * @param array $installParams
+     * @return string
+     * @throws \Exception
      */
-    private function getCustomDirs()
+    public function install(array $modules, array $installParams = [])
     {
-        $installDir = TESTS_TEMP_DIR;
-        $path = DirectoryList::PATH;
-        $customDirs = [
-            DirectoryList::CONFIG => [$path => "{$installDir}/etc"],
+        if (empty($modules)) {
+            throw new \Exception("Cannot install Magento without modules");
+        }
+
+        $params = $this->parametersHolder->getInitParams();
+        $installParams += [
+            InstallCommand::INPUT_KEY_ENABLE_MODULES => implode(",", $modules),
+            InstallCommand::INPUT_KEY_DISABLE_MODULES => 'all'
         ];
-        return $customDirs;
+        $installParams = $this->toCliArguments(
+            array_merge(
+                $params,
+                $this->parametersHolder->getDbData('default'),
+                $installParams
+            )
+        );
+        // run install script
+        $exitCode = $this->shell->execute(
+            PHP_BINARY . ' -f %s setup:install -vvv ' . implode(' ', array_keys($installParams)),
+            array_merge([BP . '/bin/magento'], array_values($installParams))
+        );
+        $this->afterInstall();
+        return $exitCode;
+    }
+
+    /**
+     * You can decorate this function in order to add your own events here
+     *
+     * @return void
+     */
+    public function afterInstall()
+    {
+        //Take current deployment config in order to flush it cache after installation
+        //Before installation usually we do not have any connections - so we need to add them
+        $this->deploymentConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(DeploymentConfig::class);
+        $this->deploymentConfig->resetData();
     }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php
new file mode 100644
index 0000000000000..fe008da2466d1
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Deploy;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaReader;
+
+/**
+ * The purpose of this class is adding test modules files to Magento code base.
+ */
+class DescribeTable
+{
+    /**
+     * Schema reader.
+     *
+     * @var DbSchemaReader
+     */
+    private $dbSchemaReader;
+
+    /**
+     * This registry is used to ignore some tables, during comparison
+     *
+     * @var array
+     */
+    private static $ignoredSystemTables = ['cache', 'cache_tag', 'flag', 'session', 'setup_module', 'patch_list'];
+
+    /**
+     * Constructor.
+     *
+     * @param DbSchemaReader $dbSchemaReader
+     */
+    public function __construct(DbSchemaReader $dbSchemaReader)
+    {
+        $this->dbSchemaReader = $dbSchemaReader;
+    }
+
+    /**
+     * Describe shards.
+     *
+     * @param  string $shardName
+     * @return array
+     */
+    public function describeShard($shardName)
+    {
+        $data = [];
+        $tables = $this->dbSchemaReader->readTables($shardName);
+
+        foreach ($tables as $table) {
+            if (in_array($table, self::$ignoredSystemTables)) {
+                continue;
+            }
+
+            $data[$table] = $this->dbSchemaReader->getCreateTableSql($table, $shardName)['Create Table'];
+        }
+
+        return $data;
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php
new file mode 100644
index 0000000000000..894bab3dfa2e7
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Deploy;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Shell;
+use Magento\Setup\Console\Command\InstallCommand;
+
+/**
+ * The purpose of this class is enable/disable module and upgrade commands execution.
+ */
+class ParametersHolder
+{
+    /**
+     * Initialize params.
+     *
+     * @var array
+     */
+    private $initParams;
+
+    /**
+     * Return application initialization parameters.
+     *
+     * @return array
+     */
+    public function getInitParams()
+    {
+        if (!isset($this->initParams)) {
+            $customDirs = $this->getCustomDirs();
+            $initParams = [
+                \Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => $customDirs,
+            ];
+            $this->initParams = ['magento-init-params' => urldecode(http_build_query($initParams))];
+        }
+        return $this->initParams;
+    }
+
+    /**
+     * Include data from config file and convert it to db format:
+     * -db-name
+     * -db-user-name
+     * -db-password
+     * -db-host
+     *
+     * @param  string $resource can be default, checkout, sales
+     * @return array
+     */
+    public function getDbData($resource)
+    {
+        $dbData = include TESTS_INSTALLATION_DB_CONFIG_FILE;
+        return $dbData[$resource];
+    }
+
+    /**
+     * Get customized directory paths.
+     *
+     * @return array
+     */
+    private function getCustomDirs()
+    {
+        $installDir = TESTS_TEMP_DIR;
+        $path = DirectoryList::PATH;
+        $var = "{$installDir}/var";
+        $customDirs = [
+            DirectoryList::CONFIG => [$path => "{$installDir}/etc"],
+            DirectoryList::VAR_DIR => [$path => $var],
+        ];
+        return $customDirs;
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php
new file mode 100644
index 0000000000000..1d9026acd211a
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Deploy;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * The purpose of this class is to describe what data is in table
+ */
+class TableData
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * TableData constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @param string $tableName
+     * @param string $columnName
+     * @return array
+     */
+    public function describeTableData($tableName, $columnName = null)
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $cols = $columnName ?: '*';
+        $select = $adapter
+            ->select()
+            ->from($tableName, $cols);
+        return $columnName ? $adapter->fetchCol($select) : $adapter->fetchAll($select);
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php
index 78efab1cb9413..fcf8695dc8510 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php
@@ -5,20 +5,30 @@
  */
 namespace Magento\TestFramework\Deploy;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleListInterface;
+
 /**
- * The purpose of this class is adding test modules files to Magento code base
+ * The purpose of this class is adding test modules files to Magento code base.
  */
 class TestModuleManager
 {
     /**
-     * Add test module files to Magento code base
+     * Name of file of DB XML declaration.
+     */
+    const DECLARATIVE_FILE_NAME = "db_schema.xml";
+
+    /**
+     * Add test module files to Magento code base.
      *
-     * @param string $moduleName
+     * @param  string $moduleName
      * @return void
      * @throws \RuntimeException
      */
     public function addModuleFiles($moduleName)
     {
+        $moduleName = str_replace("Magento_", "", $moduleName);
         $pathToCommittedTestModules = TESTS_MODULES_PATH . '/Magento/' . $moduleName;
         $pathToInstalledMagentoInstanceModules = MAGENTO_MODULES_PATH . $moduleName;
         $iterator = new \RecursiveIteratorIterator(
@@ -55,14 +65,68 @@ public function addModuleFiles($moduleName)
     }
 
     /**
-     * Remove test module files to Magento code base
+     * Copy revision folder to main module
      *
      * @param string $moduleName
+     * @param string $revisionName
+     * @param string $dir
      * @return void
      */
-    public function removeModuleFiles($moduleName)//add logic to remove every time and add ability to disable
+    public function addRevision($moduleName, $revisionName, $dir)
+    {
+        $modulePath = str_replace("Magento_", "", $moduleName);
+        $folder = MAGENTO_MODULES_PATH . $modulePath;
+        $desiredPath = $folder . '/' . $dir;
+        $revisionPath = $folder . '/revisions/' . $revisionName . '/';
+
+        if (!is_dir($desiredPath)) {
+            mkdir($desiredPath, 0777, true);
+        }
+        rename($revisionPath, $desiredPath);
+    }
+
+    /**
+     * Update module version.
+     *
+     * @param string $moduleName   Like Magento_TestSetupModule
+     * @param string $revisionName Folder name, like reviisions/revision_1/db_schema.xml
+     * @param string $fileName     For example db_schema.xml
+     * @param string $fileDir      For example etc or Setup
+     */
+    public function updateRevision($moduleName, $revisionName, $fileName, $fileDir)
     {
-        $folder = MAGENTO_MODULES_PATH . $moduleName;
+        $modulePath = str_replace("Magento_", "", $moduleName);
+        $folder = MAGENTO_MODULES_PATH . $modulePath;
+        $oldFile = $folder . DIRECTORY_SEPARATOR . $fileDir . "/" . $fileName;
+        $revisionFile = MAGENTO_MODULES_PATH . $modulePath . "/revisions/" .
+            $revisionName . DIRECTORY_SEPARATOR . $fileName;
+
+        if (!file_exists($oldFile)) {
+            $dir = dirname($oldFile);
+            if (!is_dir($dir)) {
+                mkdir($dir, 0777, true);
+            }
+            touch($oldFile);
+        }
+
+        if (file_exists($revisionFile)) {
+            unlink($oldFile);
+            copy($revisionFile, $oldFile);
+        } else {
+            throw new \InvalidArgumentException("Old File or revision files paths are invalid");
+        }
+    }
+
+    /**
+     * Remove test module files to Magento code base.
+     *
+     * @param  string $moduleName
+     * @return void
+     */
+    public function removeModuleFiles($moduleName)
+    {
+        $modulePath = str_replace("Magento_", "", $moduleName);
+        $folder = MAGENTO_MODULES_PATH . $modulePath;
 
         //remove test modules from magento codebase
         if (is_dir($folder)) {
@@ -71,9 +135,24 @@ public function removeModuleFiles($moduleName)//add logic to remove every time a
     }
 
     /**
-     * Update module files
+     * There can be situation when config version of module can be cached
+     * So proposed to clean shared instance of
+     * @see ModuleList in order to achieve clean installation
+     */
+    public function cleanModuleList()
+    {
+        /**
+         * @var \Magento\TestFramework\ObjectManager $objectManager
+         */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->removeSharedInstance(ModuleList::class);
+        $objectManager->removeSharedInstance(ModuleListInterface::class);
+    }
+
+    /**
+     * Update module files.
      *
-     * @param string $moduleName
+     * @param  string $moduleName
      * @return void
      */
     public function updateModuleFiles($moduleName)
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/SetupApplication.php b/dev/tests/setup-integration/framework/Magento/TestFramework/SetupApplication.php
index b2d84e7901fc7..719979c83db39 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/SetupApplication.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/SetupApplication.php
@@ -6,10 +6,9 @@
 namespace Magento\TestFramework;
 
 /**
- * Encapsulates application installation, initialization and uninstall, add flag to skip database dump
+ * Encapsulates application installation, initialization and uninstall, add flag to skip database dump.
  *
- *
- * Allow installation and uninstallation
+ * Allow installation and uninstallation.
  */
 class SetupApplication extends Application
 {
@@ -18,6 +17,16 @@ class SetupApplication extends Application
      */
     protected $dumpDb = false;
 
+    /**
+     * @var bool
+     */
+    protected $canLoadArea = false;
+
+    /**
+     * @var bool
+     */
+    protected $canInstallSequence = false;
+
     /**
      * {@inheritdoc}
      */
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/MutableDataInterface.php b/dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/MutableDataInterface.php
new file mode 100644
index 0000000000000..c354a1cb35347
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/MutableDataInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\TestCase;
+
+/**
+ * This interface allows to add data to test case dynamically, for example from startTest listeners
+ * in order to reuse it later.
+ */
+interface MutableDataInterface
+{
+    /**
+     * Set data providers data.
+     *
+     * @param  array $data
+     * @return void
+     */
+    public function setData(array $data);
+
+    /**
+     * Retrieve data injected dynamically in test case.
+     *
+     * @return array
+     */
+    public function getData();
+
+    /**
+     * Revert data to default dataProviders data.
+     *
+     * @return void
+     */
+    public function flushData();
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/SetupTestCase.php b/dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/SetupTestCase.php
new file mode 100644
index 0000000000000..e1efe5738910a
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/SetupTestCase.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\TestCase;
+
+use Magento\Framework\App\DesignInterface;
+use Magento\Framework\View\DesignExceptions;
+
+/**
+ * Instance of Setup test case. Used in order to tweak dataProviders functionality.
+ */
+class SetupTestCase extends \PHPUnit\Framework\TestCase implements MutableDataInterface
+{
+    /**
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * @inheritdoc
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function flushData()
+    {
+        $this->data = [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Workaround/CacheClean.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Workaround/CacheClean.php
new file mode 100644
index 0000000000000..93bc5d4df290e
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Workaround/CacheClean.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestFramework\Workaround;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Deployment config handler.
+ *
+ * @package Magento\TestFramework\Workaround
+ */
+class CacheClean
+{
+    /**
+     * Start test.
+     *
+     * @return void
+     */
+    public function endTest()
+    {
+        /** @var \Magento\Framework\App\Cache\Manager $cacheManager */
+        $cacheManager = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Cache\Manager::class);
+        $types = $cacheManager->getAvailableTypes();
+        $cacheManager->clean($types);
+    }
+}
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Workaround/DeploymentConfig.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Workaround/DeploymentConfig.php
new file mode 100644
index 0000000000000..cf2ddfdd2c0bd
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Workaround/DeploymentConfig.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestFramework\Workaround;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Deployment config handler.
+ *
+ * @package Magento\TestFramework\Workaround
+ */
+class DeploymentConfig
+{
+    /**
+     * Start test.
+     *
+     * @return void
+     */
+    public function startTest()
+    {
+        /** @var \Magento\Framework\App\DeploymentConfig $deploymentConfig */
+        $deploymentConfig = Bootstrap::getObjectManager()->get(\Magento\Framework\App\DeploymentConfig::class);
+        $deploymentConfig->resetData();
+    }
+}
diff --git a/dev/tests/setup-integration/framework/bootstrap.php b/dev/tests/setup-integration/framework/bootstrap.php
index f960fd3d5ab2c..01f60a3376ff8 100644
--- a/dev/tests/setup-integration/framework/bootstrap.php
+++ b/dev/tests/setup-integration/framework/bootstrap.php
@@ -8,10 +8,17 @@
 
 require_once __DIR__ . '/../../../../app/bootstrap.php';
 require_once __DIR__ . '/autoload.php';
+//to handle different types of errors on CI
+require __DIR__ . '/../../error_handler.php';
 
 $testsBaseDir = dirname(__DIR__);
 $integrationTestsDir = realpath("{$testsBaseDir}/../integration");
 $fixtureBaseDir = $integrationTestsDir. '/testsuite';
+
+if (!defined('TESTS_BASE_DIR')) {
+    define('TESTS_BASE_DIR', $testsBaseDir);
+}
+
 if (!defined('TESTS_TEMP_DIR')) {
     define('TESTS_TEMP_DIR', $testsBaseDir . '/tmp');
 }
@@ -23,37 +30,26 @@
 if (!defined('MAGENTO_MODULES_PATH')) {
     define('MAGENTO_MODULES_PATH', __DIR__ . '/../../../../app/code/Magento/');
 }
-try {
-    setCustomErrorHandler();
+$settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
 
-    /* Bootstrap the application */
-    $settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
 
-    if ($settings->get('TESTS_EXTRA_VERBOSE_LOG')) {
-        $filesystem = new \Magento\Framework\Filesystem\Driver\File();
-        $exceptionHandler = new \Magento\Framework\Logger\Handler\Exception($filesystem);
-        $loggerHandlers = [
-            'system'    => new \Magento\Framework\Logger\Handler\System($filesystem, $exceptionHandler),
-            'debug'     => new \Magento\Framework\Logger\Handler\Debug($filesystem)
-        ];
-        $shell = new \Magento\Framework\Shell(
-            new \Magento\Framework\Shell\CommandRenderer(),
-            new \Monolog\Logger('main', $loggerHandlers)
-        );
-    } else {
-        $shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());
-    }
-
-    $testFrameworkDir = __DIR__;
+try {
+    setCustomErrorHandler();
     $installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
     if (!file_exists($installConfigFile)) {
         $installConfigFile .= '.dist';
     }
+    if (!defined('TESTS_INSTALLATION_DB_CONFIG_FILE')) {
+        define('TESTS_INSTALLATION_DB_CONFIG_FILE', $installConfigFile);
+    }
+    /* Bootstrap the application */
+    $shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());
+    $testFrameworkDir = __DIR__;
+
     $globalConfigFile = $settings->getAsConfigFile('TESTS_GLOBAL_CONFIG_FILE');
     if (!file_exists($globalConfigFile)) {
         $globalConfigFile .= '.dist';
     }
-    $sandboxUniqueId = md5(sha1_file($installConfigFile));
 
     $dirList = new DirectoryList(BP);
     $installDir = TESTS_TEMP_DIR;
@@ -64,28 +60,26 @@
         $globalConfigFile,
         $settings->get('TESTS_GLOBAL_CONFIG_DIR'),
         $settings->get('TESTS_MAGENTO_MODE'),
-        AutoloaderRegistry::getAutoloader()
+        AutoloaderRegistry::getAutoloader(),
+        false
     );
 
     $bootstrap = new \Magento\TestFramework\Bootstrap(
         $settings,
         new \Magento\TestFramework\Bootstrap\Environment(),
-        new \Magento\TestFramework\Bootstrap\SetupDocBlock("{$integrationTestsDir}/testsuite"),
+        new \Magento\TestFramework\Bootstrap\SetupDocBlock("{$testsBaseDir}/_files/"),
         new \Magento\TestFramework\Bootstrap\Profiler(new \Magento\Framework\Profiler\Driver\Standard()),
         $shell,
         $application,
         new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
     );
+    //remove test modules files
+    include_once __DIR__ . '/../../setup-integration/framework/removeTestModules.php';
     $bootstrap->runBootstrap();
-    if ($settings->getAsBoolean('TESTS_CLEANUP')) {
-        $application->cleanup();
-        //remove test modules files
-        require_once __DIR__ . '/../../setup-integration/framework/removeTestModules.php';
-    }
-    if (!$application->isInstalled()) {
-        $application->install();
-    }
+    $application->createInstallDir();
+    //We do not want to install anything
     $application->initialize([]);
+    $application->cleanup();
 
     \Magento\TestFramework\Helper\Bootstrap::setInstance(new \Magento\TestFramework\Helper\Bootstrap($bootstrap));
 
@@ -107,41 +101,3 @@
     echo $e . PHP_EOL;
     exit(1);
 }
-
-
-/**
- * Set custom error handler
- */
-function setCustomErrorHandler()
-{
-    set_error_handler(
-        function ($errNo, $errStr, $errFile, $errLine) {
-            if (error_reporting()) {
-                $errorNames = [
-                    E_ERROR => 'Error',
-                    E_WARNING => 'Warning',
-                    E_PARSE => 'Parse',
-                    E_NOTICE => 'Notice',
-                    E_CORE_ERROR => 'Core Error',
-                    E_CORE_WARNING => 'Core Warning',
-                    E_COMPILE_ERROR => 'Compile Error',
-                    E_COMPILE_WARNING => 'Compile Warning',
-                    E_USER_ERROR => 'User Error',
-                    E_USER_WARNING => 'User Warning',
-                    E_USER_NOTICE => 'User Notice',
-                    E_STRICT => 'Strict',
-                    E_RECOVERABLE_ERROR => 'Recoverable Error',
-                    E_DEPRECATED => 'Deprecated',
-                    E_USER_DEPRECATED => 'User Deprecated',
-                ];
-
-                $errName = isset($errorNames[$errNo]) ? $errorNames[$errNo] : "";
-
-                throw new \PHPUnit\Framework\Exception(
-                    sprintf("%s: %s in %s:%s.", $errName, $errStr, $errFile, $errLine),
-                    $errNo
-                );
-            }
-        }
-    );
-}
diff --git a/dev/tests/setup-integration/framework/removeTestModules.php b/dev/tests/setup-integration/framework/removeTestModules.php
index f52901e911c70..ad50439e1f8bc 100644
--- a/dev/tests/setup-integration/framework/removeTestModules.php
+++ b/dev/tests/setup-integration/framework/removeTestModules.php
@@ -8,7 +8,9 @@
  * @var $testFrameworkDir string - Must be defined in parent script.
  */
 
-/** Copy test modules to app/code/Magento to make them visible for Magento instance */
+/**
+ * Copy test modules to app/code/Magento to make them visible for Magento instance.
+ */
 $pathToCommittedTestModules = $testFrameworkDir . '/../_files/Magento';
 $pathToInstalledMagentoInstanceModules = $testFrameworkDir . '/../../../../app/code/Magento';
 $iterator = new RecursiveIteratorIterator(
diff --git a/dev/tests/setup-integration/framework/tests/unit/framework/bootstrap.php b/dev/tests/setup-integration/framework/tests/unit/framework/bootstrap.php
new file mode 100644
index 0000000000000..94ca822568be1
--- /dev/null
+++ b/dev/tests/setup-integration/framework/tests/unit/framework/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$rootDir = realpath(__DIR__ . '/../../../../../../../');
+$testsBaseDir = realpath(__DIR__ . '/../../../../');
+
+require_once $rootDir . '/app/bootstrap.php';
+require_once $testsBaseDir . '/framework/autoload.php';
diff --git a/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
new file mode 100644
index 0000000000000..1a93397caaa4a
--- /dev/null
+++ b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         colors="true"
+         columns="max"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         bootstrap="./framework/bootstrap.php"
+>
+    <!-- Test suites definition -->
+    <testsuites>
+        <testsuite name="Unit Tests for Integration Tests Framework">
+            <directory suffix="Test.php">testsuite</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <ini name="date.timezone" value="America/Los_Angeles"/>
+    </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="@magentoDbIsolation">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
+</phpunit>
diff --git a/dev/tests/setup-integration/framework/tests/unit/testsuite/Magento/TestFramework/Test/Unit/Annotation/ReinstallInstanceTest.php b/dev/tests/setup-integration/framework/tests/unit/testsuite/Magento/TestFramework/Test/Unit/Annotation/ReinstallInstanceTest.php
new file mode 100644
index 0000000000000..483435ccb98e6
--- /dev/null
+++ b/dev/tests/setup-integration/framework/tests/unit/testsuite/Magento/TestFramework/Test/Unit/Annotation/ReinstallInstanceTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Test\Unit\Annotation;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Test for ReinstallInstance.
+ *
+ * @package Magento\TestFramework\Test\Unit\Annotation
+ */
+class ReinstallInstanceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\TestFramework\Annotation\ReinstallInstance
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\TestFramework\Application|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $applicationMock;
+
+    protected function setUp()
+    {
+        $this->applicationMock = $this
+            ->getMockBuilder(\Magento\TestFramework\Application::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\TestFramework\Annotation\ReinstallInstance::class,
+            [
+                'application' => $this->applicationMock
+            ]
+        );
+    }
+
+    public function testEndTest()
+    {
+        $this->applicationMock->expects($this->once())
+            ->method('cleanup');
+        $this->model->endTest();
+    }
+}
diff --git a/dev/tests/setup-integration/phpunit.xml.dist b/dev/tests/setup-integration/phpunit.xml.dist
index 4fbeb8e987863..620ebbb5b8f0f 100644
--- a/dev/tests/setup-integration/phpunit.xml.dist
+++ b/dev/tests/setup-integration/phpunit.xml.dist
@@ -28,30 +28,76 @@
     </filter>
     <!-- PHP INI settings and constants definition -->
     <php>
-        <includePath>./testsuite</includePath>
+        <includePath>.</includePath>
+        <includePath>testsuite</includePath>
         <ini name="date.timezone" value="America/Los_Angeles"/>
         <ini name="xdebug.max_nesting_level" value="200"/>
-        <!-- Local XML configuration file ('.dist' extension will be added, if the specified file doesn't exist) -->
-        <const name="TESTS_INSTALL_CONFIG_FILE" value="config/install-config-mysql.php"/>
-        <!-- Local XML configuration file ('.dist' extension will be added, if the specified file doesn't exist) -->
-        <const name="TESTS_GLOBAL_CONFIG_FILE" value="config/config-global.php"/>
-        <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
+        <const name="TESTS_INSTALL_CONFIG_FILE" value="{{local_config_file}}"/>
+        <const name="TESTS_GLOBAL_CONFIG_FILE" value="etc/config-global.php"/>
         <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
-        <!-- Whether to cleanup the application before running tests or not -->
-        <const name="TESTS_CLEANUP" value="enabled"/>
-        <!-- Memory usage and estimated leaks thresholds -->
-        <!--<const name="TESTS_MEM_USAGE_LIMIT" value="1024M"/>-->
-        <const name="TESTS_MEM_LEAK_LIMIT" value=""/>
-        <!-- Whether to output all CLI commands executed by the bootstrap and tests -->
-        <const name="TESTS_EXTRA_VERBOSE_LOG" value="1"/>
-        <!-- Magento mode for tests execution. Possible values are "default", "developer" and "production". -->
-        <const name="TESTS_MAGENTO_MODE" value="developer"/>
-        <!-- Minimum error log level to listen for. Possible values: -1 ignore all errors, and level constants form http://tools.ietf.org/html/rfc5424 standard -->
-        <const name="TESTS_ERROR_LOG_LISTENER_LEVEL" value="-1"/>
+        <const name="TESTS_CLEANUP" value="{{tests_cleanup}}"/>
+        <const name="TESTS_MAGENTO_MODE" value="{{app_mode}}"/>
+        <const name="TESTS_ERROR_LOG_LISTENER_LEVEL" value="1"/>
     </php>
     <!-- Test listeners -->
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
         <listener class="Magento\TestFramework\ErrorLog\Listener"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="moduleName">
+                        <string>moduleName</string>
+                    </element>
+                    <element key="dataProviderFromFile">
+                        <string>dataProviderFromFile</string>
+                    </element>
+                    <element key="magentoSchemaFixture">
+                        <string>magentoSchemaFixture</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php
new file mode 100644
index 0000000000000..434c99cb98765
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/Console/Command/TablesWhitelistGenerateCommandTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Console\Command;
+
+use Symfony\Component\Console\Tester\CommandTester;
+use Magento\TestFramework\TestCase\SetupTestCase;
+use Magento\Framework\Console\Cli;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+
+/**
+ * The purpose of this test is to verify the declaration:generate:whitelist command.
+ */
+class TablesWhitelistGenerateCommandTest extends SetupTestCase
+{
+    /**
+     * @var CommandTester
+     */
+    private $tester;
+
+    /**
+     * @var \Magento\Developer\Console\Command\TablesWhitelistGenerateCommand
+     */
+    private $command;
+
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * @var TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->command = $this->objectManager->create(
+            \Magento\Developer\Console\Command\TablesWhitelistGenerateCommand::class
+        );
+        $this->componentRegistrar = $this->objectManager->create(
+            \Magento\Framework\Component\ComponentRegistrar::class
+        );
+        $this->cliCommand = $this->objectManager->get(CliCommand::class);
+        $this->tester = new CommandTester($this->command);
+        $this->moduleManager = $this->objectManager->get(TestModuleManager::class);
+    }
+
+    /**
+     * Execute generate command for whitelist.
+     *
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @moduleName Magento_TestSetupDeclarationModule8
+     * @throws \Exception
+     */
+    public function testExecute()
+    {
+        $modules = [
+            'Magento_TestSetupDeclarationModule1',
+            'Magento_TestSetupDeclarationModule8',
+        ];
+
+        $this->cliCommand->install($modules);
+        foreach ($modules as $moduleName) {
+            $this->moduleManager->updateRevision(
+                $moduleName,
+                'whitelist_upgrade',
+                'db_schema.xml',
+                'etc'
+            );
+        }
+
+        foreach ($modules as $moduleName) {
+            $this->checkWhitelistFile($moduleName);
+        }
+    }
+
+    /**
+     * @param string $moduleName
+     */
+    private function checkWhitelistFile(string $moduleName)
+    {
+        $modulePath = $this->componentRegistrar->getPath('module', $moduleName);
+        $whiteListFileName = $modulePath
+            . DIRECTORY_SEPARATOR
+            . \Magento\Framework\Module\Dir::MODULE_ETC_DIR
+            . DIRECTORY_SEPARATOR
+            . \Magento\Framework\Setup\Declaration\Schema\Diff\Diff::GENERATED_WHITELIST_FILE_NAME;
+
+        //run bin/magento declaration:generate:whitelist Magento_TestSetupDeclarationModule1 command.
+        $this->tester->execute(['--module-name' => $moduleName], ['interactive' => false]);
+        $this->assertSame(Cli::RETURN_SUCCESS, $this->tester->getStatusCode());
+
+        $this->assertFileExists($whiteListFileName);
+        $this->assertContains('', $this->tester->getDisplay());
+
+        $whitelistFileContent = file_get_contents($whiteListFileName);
+        $expectedWhitelistContent = file_get_contents(
+            dirname(__DIR__, 2)
+            . DIRECTORY_SEPARATOR
+            . implode(
+                DIRECTORY_SEPARATOR,
+                [
+                    '_files',
+                    'WhitelistGenerate',
+                    str_replace('Magento_', '', $moduleName),
+                    'db_schema_whitelist.json'
+                ]
+            )
+        );
+        $this->assertEquals($expectedWhitelistContent, $whitelistFileContent);
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule1/db_schema_whitelist.json b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule1/db_schema_whitelist.json
new file mode 100644
index 0000000000000..55005b82ab8b5
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule1/db_schema_whitelist.json
@@ -0,0 +1,80 @@
+{
+    "reference_table": {
+        "column": {
+            "tinyint_ref": true,
+            "tinyint_without_padding": true,
+            "bigint_without_padding": true,
+            "integer_without_padding": true,
+            "smallint_with_big_padding": true,
+            "smallint_without_default": true,
+            "int_without_unsigned": true,
+            "int_unsigned": true,
+            "bigint_default_nullable": true,
+            "bigint_not_default_not_nullable": true,
+            "smallint_without_padding": true
+        },
+        "constraint": {
+            "tinyint_primary": true,
+            "PRIMARY": true
+        }
+    },
+    "auto_increment_test": {
+        "column": {
+            "int_auto_increment_with_nullable": true,
+            "int_disabled_auto_increment": true
+        },
+        "constraint": {
+            "AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE": true
+        }
+    },
+    "test_table": {
+        "column": {
+            "smallint": true,
+            "tinyint": true,
+            "bigint": true,
+            "float": true,
+            "double": true,
+            "decimal": true,
+            "date": true,
+            "timestamp": true,
+            "datetime": true,
+            "longtext": true,
+            "mediumtext": true,
+            "varchar": true,
+            "mediumblob": true,
+            "blob": true,
+            "boolean": true,
+            "varbinary_rename": true
+        },
+        "index": {
+            "TEST_TABLE_TINYINT_BIGINT": true
+        },
+        "constraint": {
+            "TEST_TABLE_SMALLINT_BIGINT": true,
+            "TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF": true
+        }
+    },
+    "store": {
+        "column": {
+            "store_owner_id": true,
+            "store_owner": true
+        },
+        "constraint": {
+            "STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID": true
+        }
+    },
+    "store_owner": {
+        "column": {
+            "owner_id": true,
+            "label": true
+        },
+        "constraint": {
+            "": true
+        }
+    },
+    "some_table": {
+        "column": {
+            "some_column": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule8/db_schema_whitelist.json b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule8/db_schema_whitelist.json
new file mode 100644
index 0000000000000..b4209edfe471a
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Developer/_files/WhitelistGenerate/TestSetupDeclarationModule8/db_schema_whitelist.json
@@ -0,0 +1,20 @@
+{
+    "reference_test": {
+        "column": {
+            "entity_id": true,
+            "product_id": true
+        },
+        "index": {
+            "REFERENCE_TEST_ENTITY_ID": true
+        },
+        "constraint": {
+            "REFERENCE_TEST_ENTITY_ID_PRODUCT_ID": true,
+            "REFERENCE_TEST_ENTITY_ID_TEST_TABLE_SMALLINT": true
+        }
+    },
+    "auto_increment_test": {
+        "column": {
+            "int_counter": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php
new file mode 100644
index 0000000000000..f40339fd02439
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\ModuleResource;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TableData;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is to check whether whole declarative installation is work
+ * in mixed mode
+ */
+class BCMultiModuleTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * @var DbVersionInfo
+     */
+    private $dbVersionInfo;
+
+    /**
+     * @var TableData
+     */
+    private $tableData;
+
+    /**
+     * @var ModuleResource
+     */
+    private $moduleResource;
+
+    /**
+     * @var DbSchemaReaderInterface
+     */
+    private $dbSchemaReader;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommand = $objectManager->get(CliCommand::class);
+        $this->dbVersionInfo = $objectManager->get(DbVersionInfo::class);
+        $this->tableData = $objectManager->get(TableData::class);
+        $this->moduleResource = $objectManager->get(ModuleResource::class);
+        $this->dbSchemaReader = $objectManager->get(DbSchemaReaderInterface::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule6
+     * @moduleName Magento_TestSetupDeclarationModule7
+     */
+    public function testFirstCleanInstall()
+    {
+        $this->cliCommand->install([
+            'Magento_TestSetupDeclarationModule6',
+            'Magento_TestSetupDeclarationModule7'
+        ]);
+        //Check if declaration is applied
+        $indexes = $this->dbSchemaReader->readIndexes('test_table', 'default');
+        self::assertCount(1, $indexes);
+        self::assertArrayHasKey('TEST_TABLE_TINYINT_BIGINT', $indexes);
+        //Check UpgradeSchema old format, that modify declaration
+        $columns = $this->dbSchemaReader->readColumns('test_table', 'default');
+        $floatColumn = $columns['float'];
+        self::assertEquals(29, $floatColumn['default']);
+    }
+
+    private function doUsToUsRevision()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'us_to_us',
+            'UpgradeSchema.php',
+            'Setup'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'us_to_us',
+            'module.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'us_to_us',
+            'UpgradeData.php',
+            'Setup'
+        );
+    }
+
+    private function doUsToDsRevision()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'swap_with_declaration',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'swap_with_declaration',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'swap_with_declaration',
+            'SomeSkippedPatch.php',
+            'Setup/Patch/Data'
+        );
+    }
+
+    /**
+     * Assert that data and schema of 2 modules are installed successfully
+     */
+    private function assertUsToUsUpgrade()
+    {
+        $usToUsTables = $this->dbSchemaReader->readTables('default');
+        self::assertContains('custom_table', $usToUsTables);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertEquals(
+            [6,12],
+            $this->tableData->describeTableData('reference_table', 'bigint_without_padding')
+        );
+    }
+
+    /**
+     * Assert that data and schema of 2 modules are installed successfully
+     */
+    private function assertUsToDsUpgrade()
+    {
+        //Check UpgradeSchema old format, that modify declaration
+        $columns = $this->dbSchemaReader->readColumns('test_table', 'default');
+        $floatColumn = $columns['float'];
+        //Check whether declaration will be applied
+        self::assertEquals(35, $floatColumn['default']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertEquals(
+            [6,12],
+            $this->tableData->describeTableData('reference_table', 'bigint_without_padding')
+        );
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule6
+     * @moduleName Magento_TestSetupDeclarationModule7
+     */
+    public function testDSFirstRelease()
+    {
+        $this->cliCommand->install([
+            'Magento_TestSetupDeclarationModule6',
+            'Magento_TestSetupDeclarationModule7'
+        ]);
+        //Check no change upgrade with US
+        $this->cliCommand->upgrade();
+
+        $this->doUsToUsRevision();
+        //Check US to US upgrade
+        $this->cliCommand->upgrade();
+        $this->assertUsToUsUpgrade();
+
+        $this->doUsToDsRevision();
+        //Check US to declarative schema upgrade
+        $this->cliCommand->upgrade();
+        $this->assertUsToDsUpgrade();
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'wl_remove_table',
+            'db_schema_whitelist.json',
+            'etc'
+        );
+        //Check removal case, when we need to remove table with declaration and table was created in old scripts
+        $this->cliCommand->upgrade();
+        $tables = $this->dbSchemaReader->readTables('default');
+        self::assertNotContains('custom_table', $tables);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProvider firstCleanInstallOneModuleDataProvider
+     * @param string $dbPrefix
+     * @param string $tableName
+     * @param string $indexName
+     * @param string $constraintName
+     * @param string $foreignKeyName
+     * @throws \Exception
+     */
+    public function testFirstCleanInstallOneModule(
+        string $dbPrefix,
+        string $tableName,
+        string $indexName,
+        string $constraintName,
+        string $foreignKeyName
+    ) {
+        $this->cliCommand->install(
+            [
+                'Magento_TestSetupDeclarationModule1'
+            ],
+            [
+                'db-prefix' => $dbPrefix,
+            ]
+        );
+
+        $indexes = $this->dbSchemaReader
+            ->readIndexes($tableName, 'default');
+        self::assertCount(1, $indexes);
+        self::assertArrayHasKey($indexName, $indexes);
+
+        $constraints = $this->dbSchemaReader
+            ->readConstraints($tableName, 'default');
+        self::assertCount(1, $constraints);
+        self::assertArrayHasKey($constraintName, $constraints);
+
+        $foreignKeys = $this->dbSchemaReader
+            ->readReferences($tableName, 'default');
+        self::assertCount(1, $foreignKeys);
+        self::assertArrayHasKey($foreignKeyName, $foreignKeys);
+    }
+
+    /**
+     * @return array
+     */
+    public function firstCleanInstallOneModuleDataProvider()
+    {
+        return [
+            'Installation without db prefix' => [
+                'dbPrefix' => '',
+                'tableName' => 'test_table',
+                'indexName' => 'TEST_TABLE_TINYINT_BIGINT',
+                'constraintName' => 'TEST_TABLE_SMALLINT_BIGINT',
+                'foreignKeyName' => 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF',
+            ],
+            'Installation with db prefix' => [
+                'dbPrefix' => 'spec_',
+                'tableName' => 'spec_test_table',
+                'indexName' => 'SPEC_TEST_TABLE_TINYINT_BIGINT',
+                'constraintName' => 'SPEC_TEST_TABLE_SMALLINT_BIGINT',
+                'foreignKeyName' => 'SPEC_TEST_TABLE_TINYINT_SPEC_REFERENCE_TABLE_TINYINT_REF',
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php
new file mode 100644
index 0000000000000..c74f07cd80aea
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleResource;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TableData;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is to check whether patch changes in Magento are backward compatible
+ */
+class BCPatchTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * @var DbVersionInfo
+     */
+    private $dbVersionInfo;
+
+    /**
+     * @var TableData
+     */
+    private $tableData;
+
+    /**
+     * @var ModuleResource
+     */
+    private $moduleResource;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommand = $objectManager->get(CliCommand::class);
+        $this->dbVersionInfo = $objectManager->get(DbVersionInfo::class);
+        $this->tableData = $objectManager->get(TableData::class);
+        $this->moduleResource = $objectManager->get(ModuleResource::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testSuccessfullInstall()
+    {
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testDataMixedMode()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'old-scripts',
+            'UpgradeData.php',
+            'Setup'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertEquals(
+            [6,12],
+            $this->tableData->describeTableData('reference_table', 'some_integer')
+        );
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testSkippedPatch()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomeSkippedPatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testDataInstallationWithoutVersion()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'module-without-version',
+            'module.xml',
+            'etc'
+        );
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        $this->moduleResource->setDataVersion('Magento_TestSetupDeclarationModule5', '1.0.2');
+        $this->moduleResource->setDataVersion('Magento_TestSetupDeclarationModule5', '1.0.2');
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'old-scripts',
+            'UpgradeData.php',
+            'Setup'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomeSkippedPatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->cliCommand->upgrade();
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        //Old scripts should be skipped because we do not have version
+        self::assertEquals(
+            [],
+            $this->tableData->describeTableData('reference_table', 'some_integer')
+        );
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php
new file mode 100644
index 0000000000000..a781972b85887
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Module\ModuleResource;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TableData;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+use Magento\TestSetupDeclarationModule3\Setup\Patch\Data\IncrementalSomeIntegerPatch;
+use Magento\TestSetupDeclarationModule3\Setup\Patch\Data\ReferenceIncrementalSomeIntegerPatch;
+use Magento\TestSetupDeclarationModule3\Setup\Patch\Data\ZFirstPatch;
+
+/**
+ * The purpose of this test is validating schema reader operations.
+ */
+class DataPatchInstallationTest extends SetupTestCase
+{
+    /**
+     * @var TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    /**
+     * @var ModuleResource
+     */
+    private $moduleResource;
+
+    /**
+     * @var PatchHistory
+     */
+    private $patchList;
+
+    /**
+     * @var TableData
+     */
+    private $tableData;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+        $this->moduleResource = $objectManager->get(ModuleResource::class);
+        $this->patchList = $objectManager->get(PatchHistory::class);
+        $this->tableData = $objectManager->get(TableData::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule3
+     */
+    public function testDataPatchesInstallation()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule3']
+        );
+
+        self::assertEquals(
+            '0.0.1',
+            $this->moduleResource->getDataVersion('Magento_TestSetupDeclarationModule3')
+        );
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'first_patch_revision',
+            'module.xml',
+            'etc'
+        );
+        $this->movePatches();
+        ModuleResource::flush();
+        $this->cliCommad->upgrade();
+        self::assertEquals(
+            '0.0.3',
+            $this->moduleResource->getDataVersion('Magento_TestSetupDeclarationModule3')
+        );
+        self::assertTrue($this->patchList->isApplied(IncrementalSomeIntegerPatch::class));
+        self::assertTrue($this->patchList->isApplied(ReferenceIncrementalSomeIntegerPatch::class));
+        self::assertTrue($this->patchList->isApplied(ZFirstPatch::class));
+        $tableData = $this->tableData->describeTableData('test_table');
+        self::assertEquals($this->getTestTableData(), $tableData);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule3
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCyclomaticDependency()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'cyclomatic_and_bic_revision',
+            'module.xml',
+            'etc'
+        );
+
+        $this->movePatches();
+        /**
+         * Test whether installation give the same result as upgrade
+         */
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule3']
+        );
+        $tableData = $this->tableData->describeTableData('test_table');
+        self::assertEquals($this->getTestTableData(), $tableData);
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'cyclomatic_and_bic_revision',
+            'BicPatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'cyclomatic_and_bic_revision',
+            'RefBicPatch.php',
+            'Setup/Patch/Data'
+        );
+
+        $this->cliCommad->upgrade();
+    }
+
+    /**
+     * Move patches
+     */
+    private function movePatches()
+    {
+        //Install with patches
+        $this->moduleManager->addRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'patches_revision',
+            'Setup/Patch/Data'
+        );
+        //Upgrade with UpgradeData
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'first_patch_revision',
+            'UpgradeData.php',
+            'Setup'
+        );
+
+        //Upgrade with UpgradeData
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'first_patch_revision',
+            'module.xml',
+            'etc'
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule3
+     */
+    public function testPatchesRevert()
+    {
+        $this->movePatches();
+        $this->cliCommad->install(['Magento_TestSetupDeclarationModule3']);
+        $this->cliCommad->uninstallModule('Magento_TestSetupDeclarationModule3');
+        $testTableData = $this->tableData->describeTableData('test_table');
+        $patchListTableData = $this->tableData->describeTableData('patch_list');
+        self::assertEmpty($patchListTableData);
+        self::assertEmpty($testTableData);
+        $refTableData = $this->tableData->describeTableData('reference_table');
+        self::assertEquals($this->getRefTableData(), $refTableData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getTestTableData()
+    {
+        return [
+            [
+                'smallint' => '1',
+                'tinyint' => null,
+                'varchar' => 'Ololo123',
+                'varbinary' => '33288',
+            ],
+            [
+                'smallint' => '2',
+                'tinyint' => null,
+                'varchar' => 'Ololo123_ref',
+                'varbinary' => '33288',
+            ],
+            [
+                'smallint' => '3',
+                'tinyint' => null,
+                'varchar' => 'changed__very_secret_string',
+                'varbinary' => '0',
+            ],
+        ];
+    }
+
+    /**
+     * Retrieve reference table data
+     *
+     * @return array
+     */
+    private function getRefTableData()
+    {
+        return [
+            [
+                'tinyint_ref' => '2',
+                'some_integer' => '2',
+                'for_patch_testing' => null,
+            ],
+            [
+                'tinyint_ref' => '3',
+                'some_integer' => '3',
+                'for_patch_testing' => null,
+            ],
+            [
+                'tinyint_ref' => '4',
+                'some_integer' => '5',
+                'for_patch_testing' => null,
+            ],
+            [
+                'tinyint_ref' => '5',
+                'some_integer' => '6',
+                'for_patch_testing' => null,
+            ],
+            [
+                'tinyint_ref' => '6',
+                'some_integer' => '12',
+                'for_patch_testing' => null,
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
new file mode 100644
index 0000000000000..f6497e8e4b162
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
@@ -0,0 +1,379 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\DescribeTable;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying declarative installation works.
+ */
+class DeclarativeInstallerTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    /**
+     * @var SchemaDiff
+     */
+    private $schemaDiff;
+
+    /**
+     * @var SchemaConfigInterface
+     */
+    private $schemaConfig;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DescribeTable
+     */
+    private $describeTable;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+        $this->describeTable = $objectManager->get(DescribeTable::class);
+        $this->schemaDiff = $objectManager->get(SchemaDiff::class);
+        $this->schemaConfig = $objectManager->get(SchemaConfigInterface::class);
+        $this->resourceConnection = $objectManager->get(ResourceConnection::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/installation.php
+     */
+    public function testInstallation()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+
+        $diff = $this->schemaDiff->diff(
+            $this->schemaConfig->getDeclarationConfig(),
+            $this->schemaConfig->getDbConfig()
+        );
+
+        //Second time installation should not find anything as we do not change anything
+        self::assertNull($diff->getAll());
+        $this->compareStructures();
+    }
+
+    /**
+     * Compare structure of DB and declared structure.
+     */
+    private function compareStructures()
+    {
+        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
+        foreach ($this->getTrimmedData() as $tableName => $sql) {
+            $this->assertArrayHasKey($tableName, $shardData);
+            /**
+             * MySQL 8.0 and above does not provide information about the ON DELETE instruction
+             * if ON DELETE NO ACTION
+             */
+            if (preg_match('#ON DELETE\s+NO ACTION#i', $shardData[$tableName] === 1)) {
+                preg_replace('#ON DELETE\s+NO ACTION#i', '', $sql);
+                self::assertEquals($sql, $shardData[$tableName]);
+            }
+        }
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_modification.php
+     */
+    public function testInstallationWithColumnsModification()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+
+        //Move InstallSchema file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'column_modifications',
+            'db_schema.xml',
+            'etc'
+        );
+
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+
+        $diff = $this->schemaDiff->diff(
+            $this->schemaConfig->getDeclarationConfig(),
+            $this->schemaConfig->getDbConfig()
+        );
+        self::assertNull($diff->getAll());
+        $this->compareStructures();
+    }
+
+    /**
+     * Updates revision for db_schema and db_schema_whitelist files
+     *
+     * @param string $revisionName
+     */
+    private function updateDbSchemaRevision($revisionName)
+    {
+        //Move InstallSchema file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            $revisionName,
+            'db_schema.xml',
+            'etc'
+        );
+        //Move InstallSchema file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            $revisionName,
+            'db_schema_whitelist.json',
+            'etc'
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/column_removal.php
+     */
+    public function testInstallationWithColumnsRemoval()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+        $this->updateDbSchemaRevision('column_removals');
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+
+        $diff = $this->schemaDiff->diff(
+            $this->schemaConfig->getDeclarationConfig(),
+            $this->schemaConfig->getDbConfig()
+        );
+        self::assertNull($diff->getAll());
+        $this->compareStructures();
+    }
+
+    /**
+     * As sometimes we want to ignore spaces and other special characters,
+     * we need to trim data before compare it
+     *
+     * @return array
+     */
+    private function getTrimmedData()
+    {
+        $data = [];
+        foreach ($this->getData() as $key => $createTable) {
+            $data[$key] = preg_replace('/(\s)\n/', '$1', $createTable);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.php
+     */
+    public function testInstallationWithConstraintsModification()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+        $this->updateDbSchemaRevision('constraint_modifications');
+        $this->cliCommad->upgrade();
+
+        $diff = $this->schemaDiff->diff(
+            $this->schemaConfig->getDeclarationConfig(),
+            $this->schemaConfig->getDbConfig()
+        );
+        self::assertNull($diff->getAll());
+        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
+        self::assertEquals($this->getTrimmedData(), $shardData);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.php
+     */
+    public function testInstallationWithDroppingTables()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+
+        //Move db_schema.xml file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'drop_table',
+            'db_schema.xml',
+            'etc'
+        );
+
+        $this->cliCommad->upgrade();
+
+        $diff = $this->schemaDiff->diff(
+            $this->schemaConfig->getDeclarationConfig(),
+            $this->schemaConfig->getDbConfig()
+        );
+        self::assertNull($diff->getAll());
+        $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
+        self::assertEquals($this->getData(), $shardData);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php
+     */
+    public function testInstallWithCodeBaseRollback()
+    {
+        //Move db_schema.xml file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'before_rollback',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+        $beforeRollback = $this->describeTable->describeShard('default');
+        self::assertEquals($this->getTrimmedData()['before'], $beforeRollback);
+        //Move db_schema.xml file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'after_rollback',
+            'db_schema.xml',
+            'etc'
+        );
+
+        $this->cliCommad->upgrade();
+        $afterRollback = $this->describeTable->describeShard('default');
+        self::assertEquals($this->getData()['after'], $afterRollback);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.php
+     */
+    public function testTableRename()
+    {
+        $dataToMigrate = ['some_column' => 'Some Value'];
+        //Move db_schema.xml file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'table_rename',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+        $before = $this->describeTable->describeShard('default');
+        $adapter = $this->resourceConnection->getConnection('default');
+        $adapter->insert(
+            $this->resourceConnection->getTableName('some_table'),
+            $dataToMigrate
+        );
+        self::assertEquals($this->getData()['before'], $before['some_table']);
+        //Move db_schema.xml file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'table_rename_after',
+            'db_schema.xml',
+            'etc'
+        );
+
+        $this->cliCommad->upgrade();
+        $after = $this->describeTable->describeShard('default');
+        self::assertEquals($this->getData()['after'], $after['some_table_renamed']);
+        $select = $adapter->select()
+            ->from($this->resourceConnection->getTableName('some_table_renamed'));
+        self::assertEquals([$dataToMigrate], $adapter->fetchAll($select));
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testForeignKeyReferenceId()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'unpatterned_fk_name',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->upgrade();
+        $tableStatements = $this->describeTable->describeShard('default');
+        $tableSql = $tableStatements['dependent'];
+        $this->assertRegExp('/CONSTRAINT\s`DEPENDENT_PAGE_ID_ON_TEST_TABLE_PAGE_ID`/', $tableSql);
+        $this->assertRegExp('/CONSTRAINT\s`DEPENDENT_SCOPE_ID_ON_TEST_SCOPE_TABLE_SCOPE_ID`/', $tableSql);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testDisableIndexByExternalModule()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1', 'Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'index_to_disable',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'disable_index_by_external_module',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'disable_index_by_external_module',
+            'db_schema_whitelist.json',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'disable_index_by_external_module',
+            'module.xml',
+            'etc'
+        );
+        $this->cliCommad->upgrade();
+        $tableStatements = $this->describeTable->describeShard('default');
+        $tableSql = $tableStatements['test_table'];
+        $this->assertNotRegExp(
+            '/KEY\s+`TEST_TABLE_VARCHAR`\s+\(`varchar`\)/',
+            $tableSql,
+            'Index is not being disabled by external module'
+        );
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php
new file mode 100644
index 0000000000000..d4126d9d1e16c
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * @magentoAppIsolation enabled
+ * The purpose of this test is verifying initial InstallSchema, InstallData scripts.
+ */
+class DeclarativeSchemaBuilderTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var SchemaConfig
+     */
+    private $schemaConfig;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->schemaConfig = $objectManager->create(SchemaConfig::class);
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+    }
+
+    /**
+     * Tests primary key constraint conversion from XML and renamed functionality.
+     *
+     * @moduleName Magento_TestSetupDeclarationModule1
+     */
+    public function testSchemaBuilder()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1']
+        );
+        $dbSchema = $this->schemaConfig->getDeclarationConfig();
+        $schemaTables = $dbSchema->getTables();
+        self::assertArrayHasKey('reference_table', $dbSchema->getTables());
+        self::assertArrayHasKey('test_table', $dbSchema->getTables());
+        //Test primary key and renaming
+        $referenceTable = $schemaTables['reference_table'];
+        /**
+         * @var Internal $primaryKey
+         */
+        $primaryKey = $referenceTable->getPrimaryConstraint();
+        $columns = $primaryKey->getColumns();
+        self::assertEquals('tinyint_ref', reset($columns)->getName());
+        //Test column
+        $testTable = $schemaTables['test_table'];
+        /**
+         * @var Timestamp $timestampColumn
+         */
+        $timestampColumn = $testTable->getColumnByName('timestamp');
+        self::assertEquals('CURRENT_TIMESTAMP', $timestampColumn->getOnUpdate());
+        //Test disabled
+        self::assertArrayNotHasKey('varbinary_rename', $testTable->getColumns());
+        //Test foreign key
+        /**
+         * @var Reference $foreignKey
+         */
+        $foreignKey = $testTable->getConstraintByName('TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF');
+        self::assertEquals('NO ACTION', $foreignKey->getOnDelete());
+        self::assertEquals('tinyint_ref', $foreignKey->getReferenceColumn()->getName());
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php
new file mode 100644
index 0000000000000..0521a832ae392
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\Diff\DiffFactory;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying initial InstallSchema, InstallData scripts.
+ */
+class DiffOldSchemaTest extends SetupTestCase
+{
+    /**
+     * @var TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    /**
+     * @var SchemaDiff
+     */
+    private $schemaDiff;
+
+    /**
+     * @var DiffFactory
+     */
+    private $changeRegistryFactory;
+
+    /**
+     * @var SchemaConfigInterface
+     */
+    private $schemaConfig;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+        $this->schemaConfig = $objectManager->get(SchemaConfigInterface::class);
+        $this->schemaDiff = $objectManager->get(SchemaDiff::class);
+        $this->changeRegistryFactory = $objectManager->get(DiffFactory::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     */
+    public function testOldDiff()
+    {
+        //Move db_schema.xml
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'old_diff_before',
+            'db_schema.xml',
+            'etc'
+        );
+        //Move InstallSchema file and tried to install
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'old_diff',
+            'InstallSchema.php',
+            'Setup'
+        );
+        $this->cliCommad->install(['Magento_TestSetupDeclarationModule1']);
+        //Move db_schema.xml
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'old_diff',
+            'db_schema.xml',
+            'etc'
+        );
+        $declarativeSchema = $this->schemaConfig->getDeclarationConfig();
+        $generatedSchema = $this->schemaConfig->getDbConfig();
+        $diff = $this->schemaDiff->diff($declarativeSchema, $generatedSchema);
+        $allChanges = $diff->getAll();
+        self::assertCount(1, $allChanges);
+        self::assertEquals(
+            $this->getBigIntKeyXmlSensitiveData(),
+            reset($allChanges)['modify_column'][0]->getNew()->getDiffSensitiveParams()
+        );
+        self::assertEquals(
+            $this->getBigIntKeyDbSensitiveData(),
+            reset($allChanges)['modify_column'][0]->getOld()->getDiffSensitiveParams()
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @param string $dbPrefix
+     * @throws \Exception
+     * @dataProvider oldSchemaUpgradeDataProvider
+     */
+    public function testOldSchemaUpgrade(string $dbPrefix)
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'old_diff_before',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'base_update',
+            'InstallSchema.php',
+            'Setup'
+        );
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1'],
+            ['db-prefix' => $dbPrefix]
+        );
+        //Move db_schema.xml
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'base_update',
+            'db_schema.xml',
+            'etc'
+        );
+        $declarativeSchema = $this->schemaConfig->getDeclarationConfig();
+        $generatedSchema = $this->schemaConfig->getDbConfig();
+        $diff = $this->schemaDiff->diff($declarativeSchema, $generatedSchema);
+        self::assertEmpty($diff->getAll());
+    }
+
+    /**
+     * @return array
+     */
+    public function oldSchemaUpgradeDataProvider(): array
+    {
+        return [
+            'Without db prefix' => [
+                'dbPrefix' => '',
+            ],
+            'With db prefix' => [
+                'dbPrefix' => 'spec_',
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getBigIntKeyDbSensitiveData()
+    {
+        return [
+            'type' => 'bigint',
+            'nullable' => true,
+            'padding' => 20,
+            'unsigned' => false,
+            'identity' => false,
+            'default' => 0,
+            'comment' => 'Bigint'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getBigIntKeyXmlSensitiveData()
+    {
+        return [
+            'type' => 'bigint',
+            'nullable' => true,
+            'padding' => 20,
+            'unsigned' => false,
+            'identity' => false,
+            'default' => 1,
+            'comment' => 'Bigint',
+        ];
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DryRunTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DryRunTest.php
new file mode 100644
index 0000000000000..562f88cea75e8
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DryRunTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying declarative installation works.
+ */
+class DryRunTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php
+     */
+    public function testDryRunOnCleanDatabase()
+    {
+        $logFileName = TESTS_TEMP_DIR . '/var/log/' . DryRunLogger::FILE_NAME;
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1'],
+            ['dry-run' => true]
+        );
+        self::assertFileExists($logFileName);
+        $data = file_get_contents($logFileName);
+        self::assertEquals($data, $this->getData()[0]);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php
+     */
+    public function testDryRunOnUpgrade()
+    {
+        $logFileName = TESTS_TEMP_DIR . '/var/log/' . DryRunLogger::FILE_NAME;
+        $this->cliCommad->install(['Magento_TestSetupDeclarationModule1']);
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'column_modifications',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->upgrade(['dry-run' => true]);
+        self::assertFileExists($logFileName);
+        $data = file_get_contents($logFileName);
+        self::assertEquals($data, $this->getData()[0]);
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/InstallTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/InstallTest.php
deleted file mode 100644
index 2c23bd3fb1c0b..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/InstallTest.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Setup;
-
-use Magento\TestFramework\Helper\Bootstrap;
-
-/**
- * The purpose of this test is verifying initial InstallSchema, InstallData scripts
- */
-class InstallTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\TestFramework\Deploy\CliCommand
-     */
-    private $shellCommand;
-
-    /**
-     * @var \Magento\TestFramework\Deploy\TestModuleManager
-     */
-    private $testModuleManager;
-
-    /**
-     * @var string
-     */
-    private static $moduleName = 'TestSetupModule1';
-
-    /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     */
-    private $connection;
-
-    /**
-     * @var array
-     */
-    private $tablesName = [];
-
-    protected function setUp()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->shellCommand = $objectManager->create(\Magento\TestFramework\Deploy\CliCommand::class);
-        $this->testModuleManager = $objectManager->create(\Magento\TestFramework\Deploy\TestModuleManager::class);
-        /** @var \Magento\Framework\Setup\ModuleDataSetupInterface $installer */
-        $installer = $objectManager->create(
-            \Magento\Framework\Setup\ModuleDataSetupInterface::class
-        );
-        $this->connection = $installer->getConnection();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $shellCommand = $objectManager->create(\Magento\TestFramework\Deploy\CliCommand::class);
-
-        $shellCommand->disableModule(self::$moduleName);
-        $testEnv = $objectManager->create(\Magento\TestFramework\Deploy\TestModuleManager::class);
-        $testEnv->removeModuleFiles(self::$moduleName);
-    }
-
-    public function testInstallSchema()
-    {
-        $moduleName = self::$moduleName;
-        //check that table not exists
-        foreach ($this->getTableNameMapping() as $name) {
-            $this->assertFalse($this->connection->isTableExists($name), "Table {$name} already exists");
-        }
-        $this->assertContains(
-            'The following modules have been enabled:',
-            $this->shellCommand->introduceModule($moduleName)
-        );
-        $this->assertContains("Module 'Magento_$moduleName':", $this->shellCommand->upgrade());
-        //check that table exists and have corresponded columns
-        foreach ($this->getTableNameMapping() as $name) {
-            $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        }
-    }
-
-    /**
-     * @param string $initialName
-     * @param string $name
-     * @dataProvider getAffectedTables
-     */
-    public function testColumnStructure($initialName, $name)
-    {
-        $expectedSchema = require __DIR__ . '/_files/expectedSchema.php';
-        //check if table prefix was defined
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        $tableSchema = $this->connection->describeTable($name);
-        $actualSchema = [];
-        foreach ($tableSchema as $columnName => $columnData) {
-            unset($columnData['TABLE_NAME']);
-            $actualSchema[$columnName] = $columnData;
-        }
-        $this->assertEquals($expectedSchema[$initialName], $actualSchema);
-    }
-
-    /**
-     * @param string $initialName
-     * @param string $name
-     * @dataProvider getAffectedTables
-     */
-    public function testVerifyRelations($initialName, $name)
-    {
-        $expectedRelations = require __DIR__ . '/_files/expectedRelations.php';
-        //check that table not exists
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        $actualForeignKeyName = $this->connection->getForeignKeys($name);
-        $actualData = [];
-        if (!empty($actualForeignKeyName)) {
-            $foreignKeyData = array_shift($actualForeignKeyName);
-            $actualData = [
-                'COLUMN_NAME' => $foreignKeyData['COLUMN_NAME'],
-                'REF_COLUMN_NAME' => $foreignKeyData['REF_COLUMN_NAME'],
-                'ON_DELETE' => $foreignKeyData['ON_DELETE'],
-            ];
-        }
-        $this->assertEquals(
-            $expectedRelations[$initialName],
-            $actualData,
-            "Relation data for $name table is corrupted"
-        );
-    }
-
-    /**
-     * @param string $initialName
-     * @param string $name
-     * @dataProvider getAffectedTables
-     */
-    public function testVerifyIndexes($initialName, $name)
-    {
-        $expectedIndexes = require __DIR__ . '/_files/expectedIndexes.php';
-        //check that table not exists
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        $actualIndexList = $this->connection->getIndexList($name);
-        $actualData = [];
-        if (!empty($actualIndexList)) {
-            foreach ($actualIndexList as $indexData) {
-                $actualData[] = [
-                    'COLUMNS_LIST' => $indexData['COLUMNS_LIST'],
-                    'INDEX_TYPE' => $indexData['INDEX_TYPE'],
-                    'INDEX_METHOD' => $indexData['INDEX_METHOD'],
-                    'type' => $indexData['type'],
-                    'fields' => $indexData['fields'],
-                ];
-            }
-        }
-        $this->assertEquals(
-            $expectedIndexes[$initialName],
-            $actualData,
-            "Indexes data for $name table is corrupted"
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function getAffectedTables()
-    {
-        $returnData = [];
-        foreach ($this->getTableNameMapping() as $initialName => $name) {
-            $returnData[] = [$initialName, $name];
-        }
-        return $returnData;
-    }
-
-    /**
-     * Return array of table names in format 'initial table name' => 'table name with prefix'
-     *
-     * @return array
-     */
-    private function getTableNameMapping()
-    {
-        $installer = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Setup\ModuleDataSetupInterface::class
-        );
-        if (empty($this->tablesName)) {
-            $installedTableNames = [
-                'setup_tests_table1',
-                'setup_tests_table1_related'
-            ];
-            foreach ($installedTableNames as $name) {
-                $this->tablesName[$name] = $installer->getTable($name);
-            }
-        }
-        return $this->tablesName;
-    }
-}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
new file mode 100644
index 0000000000000..5b42e6cf43e13
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\DescribeTable;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying safe declarative installation works.
+ */
+class SafeInstallerTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+        $this->resourceConnection = $objectManager->get(ResourceConnection::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule4
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php
+     */
+    public function testInstallation()
+    {
+        $testTableData = $this->getData();
+        $row = reset($testTableData);
+        $this->cliCommad->install(['Magento_TestSetupDeclarationModule4']);
+        $adapter = $this->resourceConnection->getConnection();
+        $testTableName = $this->resourceConnection->getTableName('test_table');
+        $adapter->insertArray(
+            $this->resourceConnection->getTableName('test_table'),
+            array_keys($row),
+            $this->getData()
+        );
+        //Move new db_schema.xml
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule4',
+            'remove_title_column',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->upgrade(
+            [
+                'safe-mode' => true,
+            ]
+        );
+        //Move new db_schema.xml with restored title field
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule4',
+            'restore_title_column',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->upgrade(
+            [
+                'data-restore' => true,
+            ]
+        );
+        $testTableSelect = $adapter->select()->from($testTableName);
+        self::assertEquals($testTableData, $adapter->fetchAll($testTableSelect));
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php
new file mode 100644
index 0000000000000..72f910527741c
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is validating schema reader operations.
+ */
+class SchemaReaderTest extends SetupTestCase
+{
+    /**
+     * @var  \Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader
+     */
+    private $reader;
+
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->reader = $objectManager->get(ReaderComposite::class);
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/valid_xml_revision_1.php
+     */
+    public function testSuccessfullRead()
+    {
+        $schema = $this->reader->read('all');
+        unset($schema['table']['patch_list']);
+        self::assertEquals($this->getData(), $schema);
+    }
+
+    /**
+     * Helper method. Decrease number of params
+     *
+     * @param  string $revisionName
+     * @return void
+     */
+    private function updateRevisionTo($revisionName)
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            $revisionName,
+            TestModuleManager::DECLARATIVE_FILE_NAME,
+            'etc'
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessageRegExp /The attribute 'scale' is not allowed./
+     * @moduleName Magento_TestSetupDeclarationModule1
+     */
+    public function testFailOnInvalidColumnDeclaration()
+    {
+        $this->updateRevisionTo('fail_on_column_declaration');
+        $this->reader->read('all');
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/foreign_key_interpreter_result.php
+     */
+    public function testForeignKeyInterpreter()
+    {
+        $this->updateRevisionTo('foreign_key_interpreter');
+        $schema = $this->reader->read('all');
+        unset($schema['table']['patch_list']);
+        self::assertEquals($this->getData(), $schema);
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/UpgradeTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/UpgradeTest.php
deleted file mode 100644
index d235b9978b1ea..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/UpgradeTest.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Setup;
-
-use Magento\TestFramework\Helper\Bootstrap;
-
-/**
- * The purpose of this test is verifying initial UpgradeSchema, UpgradeData scripts
- */
-class UpgradeTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\TestFramework\Deploy\CliCommand
-     */
-    private $shellCommand;
-
-    /**
-     * @var \Magento\TestFramework\Deploy\TestModuleManager
-     */
-    private $testModuleManager;
-
-    /**
-     * @var string
-     */
-    private static $moduleName = 'TestSetupModule2';
-
-    /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     */
-    private $connection;
-
-    /**
-     * @var array
-     */
-    private $tablesName = [];
-
-    /**
-     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
-     */
-    private $installer;
-
-    /**
-     * @var array
-     */
-    private $expectedData = [];
-
-    protected function setUp()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->shellCommand = $objectManager->create(\Magento\TestFramework\Deploy\CliCommand::class);
-        $this->testModuleManager = $objectManager->create(\Magento\TestFramework\Deploy\TestModuleManager::class);
-        /** @var \Magento\Framework\Setup\ModuleDataSetupInterface $installer */
-        $this->installer = $objectManager->create(
-            \Magento\Framework\Setup\ModuleDataSetupInterface::class
-        );
-        $this->connection = $this->installer->getConnection();
-        $this->getTableNameMapping($this->installer);
-    }
-
-    /**
-     * Install test module before test execution
-     */
-    public static function setUpBeforeClass()
-    {
-        $shellCommand = Bootstrap::getObjectManager()->create(\Magento\TestFramework\Deploy\CliCommand::class);
-        self::assertContains(
-            'The following modules have been enabled:',
-            $shellCommand->introduceModule(self::$moduleName)
-        );
-        self::assertContains('Magento_' . self::$moduleName, $shellCommand->upgrade());
-    }
-
-    /**
-     * Disable and remove test module files
-     */
-    public static function tearDownAfterClass()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $shellCommand = $objectManager->create(\Magento\TestFramework\Deploy\CliCommand::class);
-
-        $shellCommand->disableModule(self::$moduleName);
-        $testEnv = $objectManager->create(\Magento\TestFramework\Deploy\TestModuleManager::class);
-        $testEnv->removeModuleFiles(self::$moduleName);
-    }
-
-    /**
-     * @param string $initialName
-     * @param string $name
-     * @dataProvider tablesStructureDataProvider
-     */
-    public function testInstallSchema($initialName, $name)
-    {
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$initialName} doesn't not exists");
-    }
-
-    /**
-     * @param string $initialName
-     * @param string $name
-     * @dataProvider tablesStructureDataProvider
-     */
-    public function testTablesStructure($initialName, $name)
-    {
-        list($expectedSchema, $expectedRelations, $expectedIndexes) = $this->getExpectedData();
-        //check if table prefix was defined
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        $tableSchema = $this->connection->describeTable($name);
-        $this->assertEquals(
-            $expectedSchema[$initialName],
-            $this->getConvertedStructure($tableSchema),
-            "Table structure doesn't match expected data for $name"
-        );
-        $actualForeignKeyName = $this->connection->getForeignKeys($name);
-        $this->assertEquals(
-            $expectedRelations[$initialName],
-            $this->getForeignKeysData($actualForeignKeyName),
-            "Relation data for {$name} table is corrupted"
-        );
-        $actualIndexList = $this->connection->getIndexList($name);
-        $this->assertEquals(
-            $expectedIndexes[$initialName],
-            $this->getIndexesData($actualIndexList),
-            "Indexes data for {$name} table is corrupted"
-        );
-    }
-
-    public function tablesStructureDataProvider()
-    {
-        $returnData = [];
-        $installer = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Setup\ModuleDataSetupInterface::class
-        );
-        foreach ($this->getTableNameMapping($installer) as $initialName => $name) {
-            $returnData[] = [$initialName, $name];
-        }
-        return $returnData;
-    }
-
-    /**
-     * @param string $tableName
-     * @dataProvider tableDataAfterInstallDataProvider
-     */
-    public function testTableDataAfterInstall($tableName)
-    {
-        $expectedData = $expectedData = require __DIR__ . '/_files/expectedData.php';
-        $name = $this->tablesName[$tableName];
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        $select = $this->connection->select()->from($this->installer->getTable($name));
-        $dataFromTable = $this->connection->fetchAll($select);
-        $this->assertEquals(1, count($dataFromTable));
-        $this->assertEquals($expectedData[$tableName], $dataFromTable);
-    }
-
-    public function tableDataAfterInstallDataProvider()
-    {
-        return [
-            ['setup_tests_entity_table'],
-            ['setup_tests_address_entity']
-        ];
-    }
-
-    public function testUpgrade()
-    {
-        list($expectedSchema, $expectedRelations, $expectedIndexes) = $this->getExpectedData();
-        $this->testModuleManager->updateModuleFiles(self::$moduleName);
-        $this->shellCommand->upgrade();
-        $this->connection->resetDdlCache();
-        $newTableName = $this->installer->getTable('setup_tests_entity_passwords');
-        $this->assertTrue(
-            $this->connection->isTableExists($newTableName),
-            "Table {$newTableName} doesn't not exists"
-        );
-        $actualIndexesList = $this->connection->getIndexList($newTableName);
-        $actualRelations = $this->connection->getForeignKeys($newTableName);
-        $actualTableStructure = $this->connection->describeTable($newTableName);
-        $this->assertEquals(
-            $expectedSchema['setup_tests_entity_passwords'],
-            $this->getConvertedStructure($actualTableStructure),
-            "Table structure doesn't match expected data for {$newTableName}"
-        );
-        $this->assertEquals(
-            $expectedIndexes['setup_tests_entity_passwords'],
-            $this->getIndexesData($actualIndexesList),
-            "Indexes data for $newTableName table is corrupted"
-        );
-        $this->assertEquals(
-            $expectedRelations['setup_tests_entity_passwords'],
-            $this->getForeignKeysData($actualRelations),
-            "Relation data for $newTableName table is corrupted"
-        );
-        $dateTimeTable = $this->tablesName['setup_tests_address_entity_datetime'];
-        $this->assertFalse(
-            $this->connection->isTableExists($dateTimeTable),
-            "Table $dateTimeTable not exists"
-        );
-        $this->assertFalse(
-            $this->connection->tableColumnExists($this->tablesName['setup_tests_entity_table'], 'dob'),
-            'Column \'dob\' exists after upgrade'
-        );
-        $this->assertEmpty(
-            $this->connection->getForeignKeys($this->tablesName['setup_tests_address_entity_decimal']),
-            'Foreign key hasn\'t been removed after upgrade'
-        );
-        $indexesList = $this->connection->getIndexList($this->tablesName['setup_tests_address_entity_decimal']);
-        $this->assertEquals(3, count($indexesList), 'Index hasn\'t been removed after upgrade');
-    }
-
-    /**
-     * @param string $tableName
-     * @param int $count
-     * @dataProvider tableDataAfterUpgradeDataProvider
-     */
-    public function testDataAfterUpgrade($count, $tableName)
-    {
-        $expectedData = $expectedData = require __DIR__ . '/_files/expectedDataAfterUpgrade.php';
-        $name = $this->installer->getTable($tableName);
-        $this->assertTrue($this->connection->isTableExists($name), "Table {$name} doesn't not exists");
-        $select = $this->connection->select()->from($name);
-        $dataFromTable = $this->connection->fetchAll($select);
-        $this->assertEquals($count, count($dataFromTable));
-        $this->assertEquals($expectedData[$tableName], $dataFromTable);
-    }
-
-    public function tableDataAfterUpgradeDataProvider()
-    {
-        return [
-            [1, 'setup_tests_entity_table'],
-            [2, 'setup_tests_address_entity'],
-            [1, 'setup_tests_entity_passwords']
-        ];
-    }
-
-    /**
-     * Convert actual foreign keys data
-     *
-     * @param array $actualRelations
-     * @return array
-     */
-    private function getForeignKeysData($actualRelations)
-    {
-        $actualForeignKey = [];
-        if (!empty($actualRelations)) {
-            $foreignKeyData = array_shift($actualRelations);
-            $actualForeignKey = [
-                'COLUMN_NAME' => $foreignKeyData['COLUMN_NAME'],
-                'REF_COLUMN_NAME' => $foreignKeyData['REF_COLUMN_NAME'],
-                'ON_DELETE' => $foreignKeyData['ON_DELETE'],
-            ];
-        }
-        return $actualForeignKey;
-    }
-
-    /**
-     * Convert actual indexes data
-     *
-     * @param array $actualIndexesList
-     * @return array
-     */
-    private function getIndexesData($actualIndexesList)
-    {
-        $actualData = [];
-        foreach ($actualIndexesList as $indexData) {
-            $actualData[] = [
-                'COLUMNS_LIST' => $indexData['COLUMNS_LIST'],
-                'INDEX_TYPE' => $indexData['INDEX_TYPE'],
-                'INDEX_METHOD' => $indexData['INDEX_METHOD'],
-                'type' => $indexData['type'],
-                'fields' => $indexData['fields'],
-            ];
-        }
-        return $actualData;
-    }
-
-    /**
-     * Convert actual table schema structure
-     *
-     * @param array $actualTableStructure
-     * @return array
-     */
-    private function getConvertedStructure($actualTableStructure)
-    {
-        $actualSchema = [];
-        foreach ($actualTableStructure as $columnName => $columnData) {
-            unset($columnData['TABLE_NAME']);
-            $actualSchema[$columnName] = $columnData;
-        }
-        return $actualSchema;
-    }
-
-    /**
-     * Return expected data loaded from file
-     *
-     * @return array
-     */
-    private function getExpectedData()
-    {
-        if (empty($this->expectedData)) {
-            $expectedSchema = require __DIR__ . '/_files/expectedSchema.php';
-            $expectedRelations = require __DIR__ . '/_files/expectedRelations.php';
-            $expectedIndexes = require __DIR__ . '/_files/expectedIndexes.php';
-            $this->expectedData = [
-                $expectedSchema,
-                $expectedRelations,
-                $expectedIndexes
-            ];
-        }
-        return $this->expectedData;
-    }
-
-    /**
-     * Return array of table names in format 'initial table name' => 'table name with prefix'
-     *
-     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $installer
-     * @return array
-     */
-    private function getTableNameMapping($installer)
-    {
-
-        if (empty($this->tablesName)) {
-            $installedTableNames = [
-                'setup_tests_entity_table',
-                'setup_tests_address_entity',
-                'setup_tests_address_entity_datetime',
-                'setup_tests_address_entity_decimal'
-            ];
-            foreach ($installedTableNames as $name) {
-                $this->tablesName[$name] = $installer->getTable($name);
-            }
-        }
-        return $this->tablesName;
-    }
-}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php
new file mode 100644
index 0000000000000..a8709b2eee383
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying initial InstallSchema, InstallData scripts.
+ */
+class ValidationRulesTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var SchemaConfig
+     */
+    private $schemaConfig;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->schemaConfig = $objectManager->create(SchemaConfig::class);
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp
+     * /Primary key can`t be applied on table "test_table". All columns should be not nullable/
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testFailOnInvalidPrimaryKey()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'invalid_primary_key',
+            'db_schema.xml',
+            'etc'
+        );
+
+        $this->schemaConfig->getDeclarationConfig();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp
+     * /Column definition "page_id_on" and reference column definition "page_id"
+     * are different in tables "dependent" and "test_table"/
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testFailOnIncosistentReferenceDefinition()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'incosistence_reference_definition',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->schemaConfig->getDeclarationConfig();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp /Auto Increment column do not have index. Column - "page_id"/
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testFailOnInvalidAutoIncrementField()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'invalid_auto_increment',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->schemaConfig->getDeclarationConfig();
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedData.php b/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedData.php
deleted file mode 100644
index 214403fa3d2aa..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedData.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'setup_tests_entity_table' => [
-        ['entity_id' => '1',
-            'website_id' => '1',
-            'email_field' => 'entity@example.com',
-            'increment_id' => null,
-            'created_at' => '2017-10-30 09:41:25',
-            'updated_at' => '2017-10-30 09:45:05',
-            'created_in' => 'Default Store View',
-            'firstname' => 'John',
-            'lastname' => 'Doe',
-            'default_billing_address_id' => '1',
-            'default_shipping_address_id' => '1',
-            'dob' => '1973-12-15'
-        ],
-    ],
-    'setup_tests_address_entity' => [
-        [
-            'entity_id' => '1',
-            'increment_id' => null,
-            'parent_id' => '1',
-            'created_at' => '2017-10-30 09:45:05',
-            'updated_at' => '2017-10-30 09:45:05',
-            'is_active' => '1',
-            'city' => 'city',
-            'company' => 'Magento',
-            'country_id' => 'US',
-            'fax' => null,
-            'firstname' => 'John',
-            'lastname' => 'Doe',
-            'middlename' => null,
-            'postcode' => '90210',
-            'prefix' => null,
-            'region' => 'Alabama',
-            'region_id' => '1',
-            'street' => 'street1',
-            'suffix' => null,
-            'telephone' => '12345678',
-        ]
-    ]
-];
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedDataAfterUpgrade.php b/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedDataAfterUpgrade.php
deleted file mode 100644
index 68540dc0939fc..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedDataAfterUpgrade.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'setup_tests_entity_table' => [
-        [
-            'entity_id' => '1',
-            'website_id' => '1',
-            'email_field' => 'entity@example.com',
-            'increment_id' => null,
-            'created_at' => '2017-10-30 09:41:25',
-            'updated_at' => '2017-10-30 09:45:05',
-            'created_in' => 'Default Store View',
-            'firstname' => 'John',
-            'lastname' => 'Doe',
-            'default_billing_address_id' => '1',
-            'default_shipping_address_id' => '1',
-            'group_id' => '0',
-            'store_id' => '0',
-        ],
-    ],
-    'setup_tests_address_entity' => [
-        [
-            'entity_id' => '1',
-            'increment_id' => null,
-            'parent_id' => '1',
-            'created_at' => '2017-10-30 09:45:05',
-            'updated_at' => '2017-10-30 09:45:05',
-            'is_active' => '1',
-            'city' => 'city',
-            'company' => 'Magento',
-            'country_id' => 'US',
-            'fax' => null,
-            'firstname' => 'John',
-            'lastname' => 'Doe',
-            'middlename' => null,
-            'postcode' => '90210',
-            'prefix' => null,
-            'region' => 'Alabama',
-            'region_id' => '1',
-            'street' => 'street1',
-            'suffix' => null,
-            'telephone' => '12345678',
-        ],
-        [
-            'entity_id' => '2',
-            'increment_id' => null,
-            'parent_id' => '1',
-            'created_at' => '2017-10-30 13:34:19',
-            'updated_at' => '2017-10-30 13:34:19',
-            'is_active' => '1',
-            'city' => 'Austin',
-            'company' => 'X.Commerce',
-            'country_id' => 'US',
-            'fax' => null,
-            'firstname' => 'Joan',
-            'lastname' => 'Doe',
-            'middlename' => null,
-            'postcode' => '36351',
-            'prefix' => null,
-            'region' => 'Alabama',
-            'region_id' => '1',
-            'street' => 'New Brockton',
-            'suffix' => null,
-            'telephone' => '12345678',
-
-        ],
-    ],
-    'setup_tests_entity_passwords' => [
-        [
-            'password_id' => '1',
-            'entity_id' => '1',
-            'password_hash' => '139e2ee2785cd9d9eb5714a02aca579bbcc05f9062996389d6e0e329bab9841b',
-        ]
-    ]
-];
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedIndexes.php b/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedIndexes.php
deleted file mode 100644
index 76f3479dc53d1..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedIndexes.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'setup_tests_table1' => [
-        [
-            'COLUMNS_LIST' => [
-                'column_with_type_integer',
-                'column_with_type_bigint',
-            ],
-            'INDEX_TYPE' => 'primary',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'primary',
-            'fields' => [
-                'column_with_type_integer',
-                'column_with_type_bigint',
-            ],
-        ],
-        [
-            'COLUMNS_LIST' =>
-                ['column_with_type_integer',],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' =>
-                ['column_with_type_integer',]
-        ],
-        [
-            'COLUMNS_LIST' =>
-                ['column_with_type_text',],
-            'INDEX_TYPE' => 'fulltext',
-            'INDEX_METHOD' => 'FULLTEXT',
-            'type' => 'fulltext',
-            'fields' =>
-                ['column_with_type_text'],
-        ],
-    ],
-    'setup_tests_table1_related' => [
-        [
-            'COLUMNS_LIST' => [
-                'column_with_relation',
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' =>
-                ['column_with_relation'],
-        ],
-    ],
-    'setup_tests_entity_table' => [
-        [
-            'COLUMNS_LIST' => [
-                'entity_id',
-            ],
-            'INDEX_TYPE' => 'primary',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'primary',
-            'fields' =>
-                ['entity_id'],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'email_field',
-                'website_id'
-            ],
-            'INDEX_TYPE' => 'unique',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'unique',
-            'fields' =>
-                [
-                    'email_field',
-                    'website_id'
-                ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'website_id'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' =>
-                [
-                    'website_id'
-                ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'firstname'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' =>
-                [
-                    'firstname'
-                ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'lastname'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' =>
-                [
-                    'lastname'
-                ],
-        ]
-    ],
-    'setup_tests_address_entity' => [
-        [
-            'COLUMNS_LIST' => [
-                'entity_id'
-            ],
-            'INDEX_TYPE' => 'primary',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'primary',
-            'fields' =>
-                [
-                    'entity_id'
-                ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'parent_id'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' => [
-                    'parent_id'
-                ],
-        ]
-    ],
-    'setup_tests_address_entity_datetime' => [
-        [
-            'COLUMNS_LIST' => [
-                'value_id'
-            ],
-            'INDEX_TYPE' => 'primary',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'primary',
-            'fields' => [
-                'value_id'
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'entity_id',
-                'attribute_id'
-            ],
-            'INDEX_TYPE' => 'unique',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'unique',
-            'fields' => [
-                'entity_id',
-                'attribute_id'
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'attribute_id'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' => [
-                'attribute_id'
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'entity_id',
-                'attribute_id',
-                'value'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' => [
-                'entity_id',
-                'attribute_id',
-                'value'
-            ],
-        ],
-    ],
-    'setup_tests_address_entity_decimal' => [
-        [
-            'COLUMNS_LIST' => [
-                'value_id'
-            ],
-            'INDEX_TYPE' => 'primary',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'primary',
-            'fields' => [
-                'value_id'
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'entity_id',
-                'attribute_id'
-            ],
-            'INDEX_TYPE' => 'unique',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'unique',
-            'fields' => [
-                'entity_id',
-                'attribute_id'
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'attribute_id'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' => [
-                'attribute_id'
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'entity_id',
-                'attribute_id',
-                'value'
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' => [
-                'entity_id',
-                'attribute_id',
-                'value'
-            ],
-        ],
-    ],
-    'setup_tests_entity_passwords' => [
-        [
-            'COLUMNS_LIST' => [
-                'password_id',
-            ],
-            'INDEX_TYPE' => 'primary',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'primary',
-            'fields' => [
-                'password_id',
-            ],
-        ],
-        [
-            'COLUMNS_LIST' => [
-                'entity_id',
-            ],
-            'INDEX_TYPE' => 'index',
-            'INDEX_METHOD' => 'BTREE',
-            'type' => 'index',
-            'fields' => [
-                'entity_id',
-            ],
-        ],
-    ]
-];
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedRelations.php b/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedRelations.php
deleted file mode 100644
index d4777ec8581f4..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedRelations.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'setup_tests_table1' => [],
-    'setup_tests_table1_related' => [
-        'COLUMN_NAME' => 'column_with_relation',
-        'REF_COLUMN_NAME' => 'column_with_type_integer',
-        'ON_DELETE' => 'CASCADE',
-    ],
-    'setup_tests_entity_table' => [
-        'COLUMN_NAME' => 'website_id',
-        'REF_COLUMN_NAME' => 'website_id',
-        'ON_DELETE' => 'SET NULL',
-    ],
-    'setup_tests_address_entity' => [
-        'COLUMN_NAME' => 'parent_id',
-        'REF_COLUMN_NAME' => 'entity_id',
-        'ON_DELETE' => 'CASCADE',
-    ],
-    'setup_tests_address_entity_datetime' => [
-        'COLUMN_NAME' => 'entity_id',
-        'REF_COLUMN_NAME' => 'entity_id',
-        'ON_DELETE' => 'CASCADE',
-    ],
-    'setup_tests_address_entity_decimal' => [
-        'COLUMN_NAME' => 'entity_id',
-        'REF_COLUMN_NAME' => 'entity_id',
-        'ON_DELETE' => 'CASCADE',
-    ],
-    'setup_tests_entity_passwords' => [
-        'COLUMN_NAME' => 'entity_id',
-        'REF_COLUMN_NAME' => 'entity_id',
-        'ON_DELETE' => 'CASCADE',
-    ]
-];
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedSchema.php b/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedSchema.php
deleted file mode 100644
index c43291255287b..0000000000000
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/_files/expectedSchema.php
+++ /dev/null
@@ -1,908 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'setup_tests_table1' => [
-        'column_with_type_boolean' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_boolean',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'tinyint',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_smallint' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_smallint',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'smallint',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_integer' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_integer',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 1,
-            'IDENTITY' => true,
-        ],
-        'column_with_type_bigint' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_bigint',
-            'COLUMN_POSITION' => 4,
-            'DATA_TYPE' => 'bigint',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 2,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_float' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_float',
-            'COLUMN_POSITION' => 5,
-            'DATA_TYPE' => 'float',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_numeric' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_numeric',
-            'COLUMN_POSITION' => 6,
-            'DATA_TYPE' => 'decimal',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => '4',
-            'PRECISION' => '12',
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_decimal' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_decimal',
-            'COLUMN_POSITION' => 7,
-            'DATA_TYPE' => 'decimal',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => '4',
-            'PRECISION' => '12',
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_datetime' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_datetime',
-            'COLUMN_POSITION' => 8,
-            'DATA_TYPE' => 'datetime',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_timestamp_update' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_timestamp_update',
-            'COLUMN_POSITION' => 9,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => '0000-00-00 00:00:00',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_date' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_date',
-            'COLUMN_POSITION' => 10,
-            'DATA_TYPE' => 'date',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_text' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_text',
-            'COLUMN_POSITION' => 11,
-            'DATA_TYPE' => 'text',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_blob' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_blob',
-            'COLUMN_POSITION' => 12,
-            'DATA_TYPE' => 'varbinary(32)',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_verbinary' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_verbinary',
-            'COLUMN_POSITION' => 13,
-            'DATA_TYPE' => 'mediumblob',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-    ],
-    'setup_tests_table1_related' => [
-        'column_with_type_timestamp_init_update' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_timestamp_init_update',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => 'CURRENT_TIMESTAMP',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_type_timestamp_init' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_type_timestamp_init',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => 'CURRENT_TIMESTAMP',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'column_with_relation' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'column_with_relation',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-    ],
-    'setup_tests_entity_table' => [
-        'entity_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'entity_id',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 1,
-            'IDENTITY' => true,
-        ],
-        'website_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'website_id',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'smallint',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'email_field' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'email_field',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'increment_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'increment_id',
-            'COLUMN_POSITION' => 4,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '50',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'created_at' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'created_at',
-            'COLUMN_POSITION' => 5,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => 'CURRENT_TIMESTAMP',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'updated_at' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'updated_at',
-            'COLUMN_POSITION' => 6,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => 'CURRENT_TIMESTAMP',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'created_in' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'created_in',
-            'COLUMN_POSITION' => 7,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'firstname' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'firstname',
-            'COLUMN_POSITION' => 8,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'lastname' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'lastname',
-            'COLUMN_POSITION' => 9,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'dob' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'dob',
-            'COLUMN_POSITION' => 10,
-            'DATA_TYPE' => 'date',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'default_billing_address_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'default_billing_address_id',
-            'COLUMN_POSITION' => 11,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'default_shipping_address_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'default_shipping_address_id',
-            'COLUMN_POSITION' => 12,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-    ],
-    'setup_tests_address_entity' => [
-        'entity_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'entity_id',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 1,
-            'IDENTITY' => true,
-        ],
-        'increment_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'increment_id',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '50',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'parent_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'parent_id',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'created_at' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'created_at',
-            'COLUMN_POSITION' => 4,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => 'CURRENT_TIMESTAMP',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'updated_at' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'updated_at',
-            'COLUMN_POSITION' => 5,
-            'DATA_TYPE' => 'timestamp',
-            'DEFAULT' => 'CURRENT_TIMESTAMP',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'is_active' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'is_active',
-            'COLUMN_POSITION' => 6,
-            'DATA_TYPE' => 'smallint',
-            'DEFAULT' => '1',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'city' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'city',
-            'COLUMN_POSITION' => 7,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'company' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'company',
-            'COLUMN_POSITION' => 8,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'country_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'country_id',
-            'COLUMN_POSITION' => 9,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'fax' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'fax',
-            'COLUMN_POSITION' => 10,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'firstname' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'firstname',
-            'COLUMN_POSITION' => 11,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'lastname' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'lastname',
-            'COLUMN_POSITION' => 12,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'middlename' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'middlename',
-            'COLUMN_POSITION' => 13,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'postcode' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'postcode',
-            'COLUMN_POSITION' => 14,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'prefix' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'prefix',
-            'COLUMN_POSITION' => 15,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '40',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'region' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'region',
-            'COLUMN_POSITION' => 16,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'region_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'region_id',
-            'COLUMN_POSITION' => 17,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'street' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'street',
-            'COLUMN_POSITION' => 18,
-            'DATA_TYPE' => 'text',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'suffix' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'suffix',
-            'COLUMN_POSITION' => 19,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '40',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'telephone' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'telephone',
-            'COLUMN_POSITION' => 20,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => '255',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-
-    ],
-    'setup_tests_address_entity_datetime' => [
-        'value_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'value_id',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 1,
-            'IDENTITY' => true,
-        ],
-        'attribute_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'attribute_id',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'smallint',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'entity_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'entity_id',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'value' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'value',
-            'COLUMN_POSITION' => 4,
-            'DATA_TYPE' => 'datetime',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-    ],
-    'setup_tests_address_entity_decimal' => [
-        'value_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'value_id',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 1,
-            'IDENTITY' => true,
-        ],
-        'attribute_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'attribute_id',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'smallint',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'entity_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'entity_id',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'value' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'value',
-            'COLUMN_POSITION' => 4,
-            'DATA_TYPE' => 'decimal',
-            'DEFAULT' => '0.0000',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => '4',
-            'PRECISION' => '12',
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-
-    ],
-    'setup_tests_entity_passwords' => [
-        'password_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'password_id',
-            'COLUMN_POSITION' => 1,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => null,
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => true,
-            'PRIMARY_POSITION' => 1,
-            'IDENTITY' => true,
-        ],
-        'entity_id' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'entity_id',
-            'COLUMN_POSITION' => 2,
-            'DATA_TYPE' => 'int',
-            'DEFAULT' => '0',
-            'NULLABLE' => false,
-            'LENGTH' => null,
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => true,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-        'password_hash' => [
-            'SCHEMA_NAME' => null,
-            'COLUMN_NAME' => 'password_hash',
-            'COLUMN_POSITION' => 3,
-            'DATA_TYPE' => 'varchar',
-            'DEFAULT' => null,
-            'NULLABLE' => true,
-            'LENGTH' => '100',
-            'SCALE' => null,
-            'PRECISION' => null,
-            'UNSIGNED' => null,
-            'PRIMARY' => false,
-            'PRIMARY_POSITION' => null,
-            'IDENTITY' => false,
-        ],
-    ]
-];
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php
new file mode 100644
index 0000000000000..fb5938be61328
--- /dev/null
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CodeMessDetector\Rule\Design;
+
+use PDepend\Source\AST\ASTClass;
+use PHPMD\AbstractNode;
+use PHPMD\AbstractRule;
+use PHPMD\Node\ClassNode;
+use PHPMD\Rule\ClassAware;
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Actions must process a defined list of HTTP methods.
+ */
+class AllPurposeAction extends AbstractRule implements ClassAware
+{
+    /**
+     * @inheritdoc
+     *
+     * @param ClassNode|ASTClass $node
+     */
+    public function apply(AbstractNode $node)
+    {
+        try {
+            $impl = class_implements($node->getFullQualifiedName(), true);
+        } catch (\Throwable $exception) {
+            //Couldn't load a class.
+            return;
+        }
+
+        if (in_array(ActionInterface::class, $impl, true)) {
+            $methodsDefined = false;
+            foreach ($impl as $i) {
+                if (preg_match('/\\\Http[a-z]+ActionInterface$/i', $i)) {
+                    $methodsDefined = true;
+                    break;
+                }
+            }
+            if (!$methodsDefined) {
+                $this->addViolation($node, [$node->getFullQualifiedName()]);
+            }
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php
new file mode 100644
index 0000000000000..9ce891da718b4
--- /dev/null
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CodeMessDetector\Rule\Design;
+
+use PHPMD\AbstractNode;
+use PHPMD\AbstractRule;
+use PHPMD\Node\ClassNode;
+use PHPMD\Node\MethodNode;
+use PDepend\Source\AST\ASTMethod;
+use PHPMD\Rule\MethodAware;
+
+/**
+ * Detect direct request usages.
+ */
+class RequestAwareBlockMethod extends AbstractRule implements MethodAware
+{
+    /**
+     * @inheritDoc
+     *
+     * @param ASTMethod|MethodNode $method
+     */
+    public function apply(AbstractNode $method)
+    {
+        $definedIn = $method->getParentType();
+        try {
+            $isBlock = ($definedIn instanceof ClassNode)
+                && is_subclass_of(
+                    $definedIn->getFullQualifiedName(),
+                    \Magento\Framework\View\Element\AbstractBlock::class
+                );
+        } catch (\Throwable $exception) {
+            //Failed to load classes.
+            return;
+        }
+
+        if ($isBlock) {
+            $nodes = $method->findChildrenOfType('PropertyPostfix') + $method->findChildrenOfType('MethodPostfix');
+            foreach ($nodes as $node) {
+                $name = mb_strtolower($node->getFirstChildOfType('Identifier')->getImage());
+                if ($name === '_request' || $name === 'getrequest') {
+                    $this->addViolation($method, [$method->getFullQualifiedName()]);
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php
new file mode 100644
index 0000000000000..408853141e538
--- /dev/null
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CodeMessDetector\Test\Unit\Rule\Design;
+
+use Magento\CodeMessDetector\Rule\Design\AllPurposeAction;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ActionInterface;
+use PHPUnit\Framework\TestCase as TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
+use PHPMD\Report;
+use PHPMD\Node\ClassNode;
+
+class AllPurposeActionTest extends TestCase
+{
+    /**
+     * @param object $fakeAction
+     * @param bool $violates
+     *
+     * @dataProvider getCases
+     */
+    public function testApply($fakeAction, bool $violates)
+    {
+        $node = $this->createNodeMock($fakeAction);
+        $rule = new AllPurposeAction();
+        $this->expectsRuleViolation($rule, $violates);
+        $rule->apply($node);
+    }
+
+    /**
+     * @return array
+     */
+    public function getCases(): array
+    {
+        return [
+            [
+                new class implements ActionInterface, HttpGetActionInterface {
+                    /**
+                     * @inheritDoc
+                     */
+                    public function execute()
+                    {
+                        return null;
+                    }
+                },
+                false
+            ],
+            [
+                new class implements ActionInterface {
+                    /**
+                     * @inheritDoc
+                     */
+                    public function execute()
+                    {
+                        return null;
+                    }
+                },
+                true
+            ],
+            [
+                new class implements HttpGetActionInterface {
+                    /**
+                     * @inheritDoc
+                     */
+                    public function execute()
+                    {
+                        return null;
+                    }
+                },
+                false
+            ],
+            [
+                new class {
+
+                },
+                false
+            ]
+        ];
+    }
+
+    /**
+     * @param object $dynamicObject
+     *
+     * @return ClassNode|MockObject
+     */
+    private function createNodeMock($dynamicObject): MockObject
+    {
+        $node = $this->getMockBuilder(ClassNode::class)
+            ->disableOriginalConstructor()
+            ->disableProxyingToOriginalMethods()
+            ->setMethods([
+                // disable name lookup from AST artifact
+                'getNamespaceName',
+                'getParentName',
+                'getName',
+                'getFullQualifiedName',
+            ])
+            ->getMock();
+        $node->expects($this->any())
+            ->method('getFullQualifiedName')
+            ->willReturn(get_class($dynamicObject));
+
+        return $node;
+    }
+
+    /**
+     * @param AllPurposeAction $rule
+     * @param bool $expects
+     * @return InvocationMocker
+     */
+    private function expectsRuleViolation(
+        AllPurposeAction $rule,
+        bool $expects
+    ): InvocationMocker {
+        /** @var Report|MockObject $report */
+        $report = $this->getMockBuilder(Report::class)->getMock();
+        if ($expects) {
+            $violationExpectation = $this->atLeastOnce();
+        } else {
+            $violationExpectation = $this->never();
+        }
+        $invokation = $report->expects($violationExpectation)
+            ->method('addRuleViolation');
+        $rule->setReport($report);
+
+        return $invokation;
+    }
+}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
index 23875f543a419..ca944b5c60e11 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
@@ -8,8 +8,8 @@
 
 use PHPUnit\Framework\TestCase as TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use PHPUnit_Framework_MockObject_Matcher_InvokedRecorder as InvokedRecorder;
-use PHPUnit\Framework\MockObject_Builder_InvocationMocker as InvocationMocker;
+use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder as InvokedRecorder;
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
 use Magento\CodeMessDetector\Rule\Design\FinalImplementation;
 use PHPMD\Report;
 use PHPMD\AbstractNode;
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
index 61d4f7b3be81d..100e08276e6cf 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -29,6 +29,62 @@ final class Foo
 }
 class Baz {
     final public function bad() {}
+}
+            ]]>
+        </example>
+    </rule>
+    <rule name="AllPurposeAction"
+          class="Magento\CodeMessDetector\Rule\Design\AllPurposeAction"
+          message= "The class {0} does not restrict processed HTTP methods by implementing a Http*Method name*ActionInterface">
+        <description>
+            <![CDATA[
+Controllers (classes implementing ActionInterface) have to implement marker Http<Method>ActionInterface
+to restrict incoming requests by methods.
+            ]]>
+        </description>
+        <priority>2</priority>
+        <properties />
+        <example>
+            <![CDATA[
+class PostOrder implements ActionInterface
+{
+    public function execute()
+    {
+        //I process GET, POST, PATCH etc. while only intended for POST
+        ...
+        return $response;
+    }
+}
+            ]]>
+        </example>
+    </rule>
+    <rule name="RequestAwareBlockMethod"
+          class="Magento\CodeMessDetector\Rule\Design\RequestAwareBlockMethod"
+          message="{0} uses request object directly. Add user input validation and suppress this warning.">
+        <description>
+            <![CDATA[
+Blocks must not depend on being used with certain controllers.
+If you use request object in a block directly you must validate all user input inside the block.
+            ]]>
+        </description>
+        <priority>2</priority>
+        <properties />
+        <example>
+            <![CDATA[
+class MyOrder extends AbstractBlock
+{
+
+    .......
+
+    public function getOrder()
+    {
+        $orderId = $this->getRequest()->getParam('order_id');
+        //Validate customer having such order.
+        if (!$this->hasOrder($this->getCustomerId(), $orderId)) {
+            ...deny access...
+        }
+        .....
+    }
 }
             ]]>
         </example>
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
new file mode 100644
index 0000000000000..899a65c375321
--- /dev/null
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Class to validate annotation format
+ */
+class AnnotationFormatValidator
+{
+    /**
+     * Gets the short description end pointer position
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     * @return int
+     */
+    private function getShortDescriptionEndPosition(File $phpcsFile, int $shortPtr, $commentEndPtr) : int
+    {
+        $tokens = $phpcsFile->getTokens();
+        $shortPtrEnd = $shortPtr;
+        for ($i = ($shortPtr + 1); $i < $commentEndPtr; $i++) {
+            if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
+                if ($tokens[$i]['line'] === $tokens[$shortPtrEnd]['line'] + 1) {
+                    $shortPtrEnd = $i;
+                } else {
+                    break;
+                }
+            }
+        }
+        return $shortPtrEnd;
+    }
+
+    /**
+     * Validates whether the short description has multi lines in description
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     */
+    private function validateMultiLinesInShortDescription(
+        File $phpcsFile,
+        int $shortPtr,
+        int $commentEndPtr
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        $shortPtrEnd = $this->getShortDescriptionEndPosition(
+            $phpcsFile,
+            (int) $shortPtr,
+            $commentEndPtr
+        );
+        $shortPtrEndContent = $tokens[$shortPtrEnd]['content'];
+        if (preg_match('/^[a-z]/', $shortPtrEndContent)
+            && $shortPtrEnd != $shortPtr
+            && !preg_match('/\bSee\b/', $shortPtrEndContent)
+            && $tokens[$shortPtr]['line']+1 === $tokens[$shortPtrEnd]['line']
+            && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
+        ) {
+            $error = 'Short description should not be in multi lines';
+            $phpcsFile->addFixableError($error, $shortPtrEnd+1, 'MethodAnnotation');
+        }
+    }
+
+    /**
+     * Validates whether the spacing between short and long descriptions
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateSpacingBetweenShortAndLongDescriptions(
+        File $phpcsFile,
+        int $shortPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        $shortPtrEnd = $this->getShortDescriptionEndPosition(
+            $phpcsFile,
+            (int) $shortPtr,
+            $commentEndPtr
+        );
+        $shortPtrEndContent = $tokens[$shortPtrEnd]['content'];
+        if (preg_match('/^[A-Z]/', $shortPtrEndContent)
+            && !preg_match('/\bSee\b/', $shortPtrEndContent)
+            && $tokens[$shortPtr]['line']+1 === $tokens[$shortPtrEnd]['line']
+            && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
+        ) {
+            $error = 'There must be exactly one blank line between lines';
+            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+        }
+        if ($shortPtrEnd != $shortPtr) {
+            $this->validateLongDescriptionFormat($phpcsFile, $shortPtrEnd, $commentEndPtr, $emptyTypeTokens);
+        } else {
+            $this->validateLongDescriptionFormat($phpcsFile, $shortPtr, $commentEndPtr, $emptyTypeTokens);
+        }
+    }
+
+    /**
+     * Validates short description format
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtr
+     * @param int $stackPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateShortDescriptionFormat(
+        File $phpcsFile,
+        int $shortPtr,
+        int $stackPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$shortPtr]['line'] !== $tokens[$stackPtr]['line'] + 1) {
+            $error = 'No blank lines are allowed before short description';
+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+        }
+        if (strtolower($tokens[$shortPtr]['content']) === '{@inheritdoc}') {
+            $error = 'If the @inheritdoc not inline it shouldn’t have braces';
+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+        }
+        $shortPtrContent = $tokens[$shortPtr]['content'];
+        if (preg_match('/^\p{Ll}/u', $shortPtrContent) === 1) {
+            $error = 'Short description must start with a capital letter';
+            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+        }
+        $this->validateNoExtraNewLineBeforeShortDescription(
+            $phpcsFile,
+            $stackPtr,
+            $commentEndPtr,
+            $emptyTypeTokens
+        );
+        $this->validateSpacingBetweenShortAndLongDescriptions(
+            $phpcsFile,
+            $shortPtr,
+            $commentEndPtr,
+            $emptyTypeTokens
+        );
+        $this->validateMultiLinesInShortDescription(
+            $phpcsFile,
+            $shortPtr,
+            $commentEndPtr
+        );
+    }
+
+    /**
+     * Validates long description format
+     *
+     * @param File $phpcsFile
+     * @param int $shortPtrEnd
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateLongDescriptionFormat(
+        File $phpcsFile,
+        int $shortPtrEnd,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        $longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
+        if (strtolower($tokens[$longPtr]['content']) === '{@inheritdoc}') {
+            $error = '{@inheritdoc} imports only short description, annotation must have long description';
+            $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+        }
+        if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
+            if ($tokens[$longPtr]['line'] !== $tokens[$shortPtrEnd]['line'] + 2) {
+                $error = 'There must be exactly one blank line between descriptions';
+                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+            }
+            if (preg_match('/^\p{Ll}/u', $tokens[$longPtr]['content']) === 1) {
+                $error = 'Long description must start with a capital letter';
+                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+            }
+        }
+    }
+
+    /**
+     * Validates tags spacing format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     * @param array $emptyTypeTokens
+     */
+    public function validateTagsSpacingFormat(File $phpcsFile, int $commentStartPtr, array $emptyTypeTokens) : void
+    {
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$commentStartPtr]['comment_tags'][0])) {
+            $firstTagPtr = $tokens[$commentStartPtr]['comment_tags'][0];
+            $commentTagPtrContent = $tokens[$firstTagPtr]['content'];
+            $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $firstTagPtr - 1, $commentStartPtr, true);
+            if ($tokens[$firstTagPtr]['line'] !== $tokens[$prevPtr]['line'] + 2
+                && strtolower($commentTagPtrContent) !== '@inheritdoc'
+            ) {
+                $error = 'There must be exactly one blank line before tags';
+                $phpcsFile->addFixableError($error, $firstTagPtr, 'MethodAnnotation');
+            }
+        }
+    }
+
+    /**
+     * Validates tag grouping format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     */
+    public function validateTagGroupingFormat(File $phpcsFile, int $commentStartPtr) : void
+    {
+        $tokens = $phpcsFile->getTokens();
+        $tagGroups = [];
+        $groupId = 0;
+        $paramGroupId = null;
+        foreach ($tokens[$commentStartPtr]['comment_tags'] as $position => $tag) {
+            if ($position > 0) {
+                $prevPtr = $phpcsFile->findPrevious(
+                    T_DOC_COMMENT_STRING,
+                    $tag - 1,
+                    $tokens[$commentStartPtr]['comment_tags'][$position - 1]
+                );
+                if ($prevPtr === false) {
+                    $prevPtr = $tokens[$commentStartPtr]['comment_tags'][$position - 1];
+                }
+
+                if ($tokens[$prevPtr]['line'] !== $tokens[$tag]['line'] - 1) {
+                    $groupId++;
+                }
+            }
+
+            if (strtolower($tokens[$tag]['content']) === '@param') {
+                if ($paramGroupId !== null
+                    && $paramGroupId !== $groupId) {
+                    $error = 'Parameter tags must be grouped together';
+                    $phpcsFile->addFixableError($error, $tag, 'MethodAnnotation');
+                }
+                if ($paramGroupId === null) {
+                    $paramGroupId = $groupId;
+                }
+            }
+            $tagGroups[$groupId][] = $tag;
+        }
+    }
+
+    /**
+     * Validates extra newline before short description
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    private function validateNoExtraNewLineBeforeShortDescription(
+        File $phpcsFile,
+        int $commentStartPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $commentEndPtr - 1, $commentStartPtr, true);
+        if ($tokens[$prevPtr]['line'] < ($tokens[$commentEndPtr]['line'] - 1)) {
+            $error = 'Additional blank lines found at end of the annotation block';
+            $phpcsFile->addFixableError($error, $commentEndPtr, 'MethodAnnotation');
+        }
+    }
+
+    /**
+     * Validates structure description format
+     *
+     * @param File $phpcsFile
+     * @param int $commentStartPtr
+     * @param int $shortPtr
+     * @param int $commentEndPtr
+     * @param array $emptyTypeTokens
+     */
+    public function validateDescriptionFormatStructure(
+        File $phpcsFile,
+        int $commentStartPtr,
+        int $shortPtr,
+        int $commentEndPtr,
+        array $emptyTypeTokens
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        if (isset($tokens[$commentStartPtr]['comment_tags'][0])
+        ) {
+            $commentTagPtr = $tokens[$commentStartPtr]['comment_tags'][0];
+            $commentTagPtrContent = $tokens[$commentTagPtr]['content'];
+            if ($tokens[$shortPtr]['code'] !== T_DOC_COMMENT_STRING
+                && strtolower($commentTagPtrContent) !== '@inheritdoc'
+            ) {
+                $error = 'Missing short description';
+                $phpcsFile->addFixableError($error, $commentStartPtr, 'MethodAnnotation');
+            } else {
+                $this->validateShortDescriptionFormat(
+                    $phpcsFile,
+                    (int) $shortPtr,
+                    $commentStartPtr,
+                    $commentEndPtr,
+                    $emptyTypeTokens
+                );
+            }
+        } else {
+            $this->validateShortDescriptionFormat(
+                $phpcsFile,
+                (int) $shortPtr,
+                $commentStartPtr,
+                $commentEndPtr,
+                $emptyTypeTokens
+            );
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
new file mode 100644
index 0000000000000..01834ff81e81b
--- /dev/null
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff to validate structure of class, interface annotations
+ */
+class ClassAnnotationStructureSniff implements Sniff
+{
+    /**
+     * @var AnnotationFormatValidator
+     */
+    private $annotationFormatValidator;
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_CLASS
+        ];
+    }
+
+    /**
+     * AnnotationStructureSniff constructor.
+     */
+    public function __construct()
+    {
+        $this->annotationFormatValidator = new AnnotationFormatValidator();
+    }
+
+    /**
+     * Validates whether annotation block exists for interface, abstract or final classes
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentClosePtr
+     * @param int $stackPtr
+     */
+    private function validateInterfaceOrAbstractOrFinalClassAnnotationBlockExists(
+        File $phpcsFile,
+        int $previousCommentClosePtr,
+        int $stackPtr
+    ) : void {
+        $tokens = $phpcsFile->getTokens();
+        if ($tokens[$stackPtr]['type'] === 'T_CLASS') {
+            if ($tokens[$stackPtr - 2]['type'] === 'T_ABSTRACT' &&
+                $tokens[$stackPtr - 4]['content'] != $tokens[$previousCommentClosePtr]['content']
+            ) {
+                $error = 'Interface or abstract class is missing annotation block';
+                $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
+            }
+            if ($tokens[$stackPtr - 2]['type'] === 'T_FINAL' &&
+                $tokens[$stackPtr - 4]['content'] != $tokens[$previousCommentClosePtr]['content']
+            ) {
+                $error = 'Final class is missing annotation block';
+                $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
+            }
+        }
+    }
+
+    /**
+     * Validates whether annotation block exists
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentClosePtr
+     * @param int $stackPtr
+     */
+    private function validateAnnotationBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr) : void
+    {
+        $tokens = $phpcsFile->getTokens();
+        $this->validateInterfaceOrAbstractOrFinalClassAnnotationBlockExists(
+            $phpcsFile,
+            $previousCommentClosePtr,
+            $stackPtr
+        );
+        if ($tokens[$stackPtr - 2]['content'] != 'class' && $tokens[$stackPtr - 2]['content'] != 'abstract'
+            && $tokens[$stackPtr - 2]['content'] != 'final'
+            && $tokens[$stackPtr - 2]['content'] !== $tokens[$previousCommentClosePtr]['content']
+        ) {
+            $error = 'Class is missing annotation block';
+            $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
+        $this->validateAnnotationBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr);
+        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
+        $emptyTypeTokens = [
+            T_DOC_COMMENT_WHITESPACE,
+            T_DOC_COMMENT_STAR
+        ];
+        $shortPtr = $phpcsFile->findNext($emptyTypeTokens, $commentStartPtr +1, $commentCloserPtr, true);
+        if ($shortPtr === false) {
+            $error = 'Annotation block is empty';
+            $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
+        } else {
+            $this->annotationFormatValidator->validateDescriptionFormatStructure(
+                $phpcsFile,
+                $commentStartPtr,
+                (int) $shortPtr,
+                $previousCommentClosePtr,
+                $emptyTypeTokens
+            );
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodAnnotationStructureSniff.php
new file mode 100644
index 0000000000000..445671d245e03
--- /dev/null
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodAnnotationStructureSniff.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff to validate structure of public, private, protected method annotations
+ */
+class MethodAnnotationStructureSniff implements Sniff
+{
+    /**
+     * @var AnnotationFormatValidator
+     */
+    private $annotationFormatValidator;
+
+    /**
+     * AnnotationStructureSniff constructor.
+     */
+    public function __construct()
+    {
+        $this->annotationFormatValidator = new AnnotationFormatValidator();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function register()
+    {
+        return [
+            T_FUNCTION
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0);
+        $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0);
+        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
+        $functionPtrContent = $tokens[$stackPtr+2]['content'] ;
+        if (preg_match('/(?i)__construct/', $functionPtrContent)) {
+            return;
+        }
+        $emptyTypeTokens = [
+            T_DOC_COMMENT_WHITESPACE,
+            T_DOC_COMMENT_STAR
+        ];
+        $shortPtr = $phpcsFile->findNext($emptyTypeTokens, $commentStartPtr + 1, $commentCloserPtr, true);
+        if ($shortPtr === false) {
+            $error = 'Annotation block is empty';
+            $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
+        } else {
+            $this->annotationFormatValidator->validateDescriptionFormatStructure(
+                $phpcsFile,
+                $commentStartPtr,
+                (int) $shortPtr,
+                $commentEndPtr,
+                $emptyTypeTokens
+            );
+            if (empty($tokens[$commentStartPtr]['comment_tags'])) {
+                return;
+            }
+            $this->annotationFormatValidator->validateTagsSpacingFormat(
+                $phpcsFile,
+                $commentStartPtr,
+                $emptyTypeTokens
+            );
+            $this->annotationFormatValidator->validateTagGroupingFormat($phpcsFile, $commentStartPtr);
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php
new file mode 100644
index 0000000000000..879334d8c553b
--- /dev/null
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -0,0 +1,587 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff to validate method arguments annotations
+ */
+class MethodArgumentsSniff implements Sniff
+{
+    /**
+     * @var array
+     */
+    private $validTokensBeforeClosingCommentTag = [
+        'T_WHITESPACE',
+        'T_PUBLIC',
+        'T_PRIVATE',
+        'T_PROTECTED',
+        'T_STATIC',
+        'T_ABSTRACT',
+        'T_FINAL'
+    ];
+
+    /**
+     * @var array
+     */
+    private $invalidTypes = [
+        'null',
+        'false',
+        'true',
+        'self'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register() : array
+    {
+        return [
+            T_FUNCTION
+        ];
+    }
+
+    /**
+     * Validates whether valid token exists before closing comment tag
+     *
+     * @param string $type
+     * @return bool
+     */
+    private function isTokenBeforeClosingCommentTagValid(string $type) : bool
+    {
+        return in_array($type, $this->validTokensBeforeClosingCommentTag);
+    }
+
+    /**
+     * Validates whether comment block exists
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentClosePtr
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function validateCommentBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr) : bool
+    {
+        $tokens = $phpcsFile->getTokens();
+        for ($tempPtr = $previousCommentClosePtr + 1; $tempPtr < $stackPtr; $tempPtr++) {
+            if (!$this->isTokenBeforeClosingCommentTagValid($tokens[$tempPtr]['type'])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether the parameter type is invalid
+     *
+     * @param string $type
+     * @return bool
+     */
+    private function isInvalidType(string $type) : bool
+    {
+        return in_array(strtolower($type), $this->invalidTypes);
+    }
+
+    /**
+     * Get arguments from method signature
+     *
+     * @param File $phpcsFile
+     * @param int $openParenthesisPtr
+     * @param int $closedParenthesisPtr
+     * @return array
+     */
+    private function getMethodArguments(File $phpcsFile, int $openParenthesisPtr, int $closedParenthesisPtr) : array
+    {
+        $tokens = $phpcsFile->getTokens();
+        $methodArguments = [];
+        for ($i = $openParenthesisPtr; $i < $closedParenthesisPtr; $i++) {
+            $argumentsPtr = $phpcsFile->findNext(T_VARIABLE, $i + 1, $closedParenthesisPtr);
+            if ($argumentsPtr === false) {
+                break;
+            } elseif ($argumentsPtr < $closedParenthesisPtr) {
+                $arguments = $tokens[$argumentsPtr]['content'];
+                $methodArguments[] = $arguments;
+                $i = $argumentsPtr - 1;
+            }
+        }
+        return $methodArguments;
+    }
+
+    /**
+     * Get parameters from method annotation
+     *
+     * @param array $paramDefinitions
+     * @return array
+     */
+    private function getMethodParameters(array $paramDefinitions) : array
+    {
+        $paramName = [];
+        for ($i = 0; $i < count($paramDefinitions); $i++) {
+            if (isset($paramDefinitions[$i]['paramName'])) {
+                $paramName[] = $paramDefinitions[$i]['paramName'];
+            }
+        }
+        return $paramName;
+    }
+
+    /**
+     * Validates whether @inheritdoc without braces [@inheritdoc] exists or not
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     */
+    private function validateInheritdocAnnotationWithoutBracesExists(
+        File $phpcsFile,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr
+    ) : bool {
+        return $this->validateInheritdocAnnotationExists(
+            $phpcsFile,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr,
+            '@inheritdoc'
+        );
+    }
+
+    /**
+     * Validates whether @inheritdoc with braces [{@inheritdoc}] exists or not
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     */
+    private function validateInheritdocAnnotationWithBracesExists(
+        File $phpcsFile,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr
+    ) : bool {
+        return $this->validateInheritdocAnnotationExists(
+            $phpcsFile,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr,
+            '{@inheritdoc}'
+        );
+    }
+
+    /**
+     * Validates inheritdoc annotation exists
+     *
+     * @param File $phpcsFile
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     * @param string $inheritdocAnnotation
+     * @return bool
+     */
+    private function validateInheritdocAnnotationExists(
+        File $phpcsFile,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr,
+        string $inheritdocAnnotation
+    ) : bool {
+        $tokens = $phpcsFile->getTokens();
+        for ($ptr = $previousCommentOpenPtr; $ptr < $previousCommentClosePtr; $ptr++) {
+            if (strtolower($tokens[$ptr]['content']) === $inheritdocAnnotation) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Validates if annotation exists for parameter in method annotation
+     *
+     * @param File $phpcsFile
+     * @param int $argumentsCount
+     * @param int $parametersCount
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     * @param int $stackPtr
+     */
+    private function validateParameterAnnotationForArgumentExists(
+        File $phpcsFile,
+        int $argumentsCount,
+        int $parametersCount,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr,
+        int $stackPtr
+    ) : void {
+        if ($argumentsCount > 0 && $parametersCount === 0) {
+            $inheritdocAnnotationWithoutBracesExists = $this->validateInheritdocAnnotationWithoutBracesExists(
+                $phpcsFile,
+                $previousCommentOpenPtr,
+                $previousCommentClosePtr
+            );
+            $inheritdocAnnotationWithBracesExists = $this->validateInheritdocAnnotationWithBracesExists(
+                $phpcsFile,
+                $previousCommentOpenPtr,
+                $previousCommentClosePtr
+            );
+            if ($inheritdocAnnotationWithBracesExists) {
+                $phpcsFile->addFixableError(
+                    '{@inheritdoc} does not import parameter annotation',
+                    $stackPtr,
+                    'MethodArguments'
+                );
+            } elseif ($this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)
+                && !$inheritdocAnnotationWithoutBracesExists
+            ) {
+                $phpcsFile->addFixableError(
+                    'Missing @param for argument in method annotation',
+                    $stackPtr,
+                    'MethodArguments'
+                );
+            }
+        }
+    }
+
+    /**
+     * Validates whether comment block have extra the parameters listed in method annotation
+     *
+     * @param File $phpcsFile
+     * @param int $argumentsCount
+     * @param int $parametersCount
+     * @param int $stackPtr
+     */
+    private function validateCommentBlockDoesnotHaveExtraParameterAnnotation(
+        File $phpcsFile,
+        int $argumentsCount,
+        int $parametersCount,
+        int $stackPtr
+    ) : void {
+        if ($argumentsCount < $parametersCount && $argumentsCount > 0) {
+            $phpcsFile->addFixableError(
+                'Extra @param found in method annotation',
+                $stackPtr,
+                'MethodArguments'
+            );
+        } elseif ($argumentsCount > 0 && $argumentsCount != $parametersCount && $parametersCount != 0) {
+            $phpcsFile->addFixableError(
+                '@param is not found for one or more params in method annotation',
+                $stackPtr,
+                'MethodArguments'
+            );
+        }
+    }
+
+    /**
+     * Validates whether the argument name exists in method parameter annotation
+     *
+     * @param int $stackPtr
+     * @param int $ptr
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     * @param array $paramDefinitions
+     */
+    private function validateArgumentNameInParameterAnnotationExists(
+        int $stackPtr,
+        int $ptr,
+        File $phpcsFile,
+        array $methodArguments,
+        array $paramDefinitions
+    ) : void {
+        $parameterNames = $this->getMethodParameters($paramDefinitions);
+        if (!in_array($methodArguments[$ptr], $parameterNames)) {
+            $error = $methodArguments[$ptr]. ' parameter is missing in method annotation';
+            $phpcsFile->addFixableError($error, $stackPtr, 'MethodArguments');
+        }
+    }
+
+    /**
+     * Validates whether parameter present in method signature
+     *
+     * @param int $ptr
+     * @param int $paramDefinitionsArguments
+     * @param array $methodArguments
+     * @param File $phpcsFile
+     * @param array $paramPointers
+     */
+    private function validateParameterPresentInMethodSignature(
+        int $ptr,
+        string $paramDefinitionsArguments,
+        array $methodArguments,
+        File $phpcsFile,
+        array $paramPointers
+    ) : void {
+        if (!in_array($paramDefinitionsArguments, $methodArguments)) {
+            $phpcsFile->addFixableError(
+                $paramDefinitionsArguments . ' parameter is missing in method arguments signature',
+                $paramPointers[$ptr],
+                'MethodArguments'
+            );
+        }
+    }
+
+    /**
+     * Validates whether the parameters are in order or not in method annotation
+     *
+     * @param array $paramDefinitions
+     * @param array $methodArguments
+     * @param File $phpcsFile
+     * @param array $paramPointers
+     */
+    private function validateParameterOrderIsCorrect(
+        array $paramDefinitions,
+        array $methodArguments,
+        File $phpcsFile,
+        array $paramPointers
+    ) : void {
+        $parameterNames = $this->getMethodParameters($paramDefinitions);
+        $paramDefinitionsCount = count($paramDefinitions);
+        for ($ptr = 0; $ptr < $paramDefinitionsCount; $ptr++) {
+            if (isset($methodArguments[$ptr]) && isset($parameterNames[$ptr])
+                && in_array($methodArguments[$ptr], $parameterNames)
+            ) {
+                if ($methodArguments[$ptr] != $parameterNames[$ptr]) {
+                    $phpcsFile->addFixableError(
+                        $methodArguments[$ptr].' parameter is not in order',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Validate whether duplicate annotation present in method annotation
+     *
+     * @param int $stackPtr
+     * @param array $paramDefinitions
+     * @param array $paramPointers
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     */
+    private function validateDuplicateAnnotationDoesnotExists(
+        int $stackPtr,
+        array $paramDefinitions,
+        array $paramPointers,
+        File $phpcsFile,
+        array $methodArguments
+    ) : void {
+        $argumentsCount = count($methodArguments);
+        $parametersCount = count($paramPointers);
+        if ($argumentsCount <= $parametersCount && $argumentsCount > 0) {
+            $duplicateParameters = [];
+            for ($i = 0; $i < sizeof($paramDefinitions); $i++) {
+                if (isset($paramDefinitions[$i]['paramName'])) {
+                    $parameterContent = $paramDefinitions[$i]['paramName'];
+                    for ($j = $i + 1; $j < count($paramDefinitions); $j++) {
+                        if (isset($paramDefinitions[$j]['paramName'])
+                            && $parameterContent === $paramDefinitions[$j]['paramName']
+                        ) {
+                            $duplicateParameters[] = $parameterContent;
+                        }
+                    }
+                }
+            }
+            foreach ($duplicateParameters as $value) {
+                $phpcsFile->addFixableError(
+                    $value . ' duplicate found in method annotation',
+                    $stackPtr,
+                    'MethodArguments'
+                );
+            }
+        }
+    }
+
+    /**
+     * Validate parameter annotation format is correct or not
+     *
+     * @param int $ptr
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     * @param array $paramDefinitions
+     * @param array $paramPointers
+     */
+    private function validateParameterAnnotationFormatIsCorrect(
+        int $ptr,
+        File $phpcsFile,
+        array $methodArguments,
+        array $paramDefinitions,
+        array $paramPointers
+    ) : void {
+        switch (count($paramDefinitions)) {
+            case 0:
+                $phpcsFile->addFixableError(
+                    'Missing both type and parameter',
+                    $paramPointers[$ptr],
+                    'MethodArguments'
+                );
+                break;
+            case 1:
+                if (preg_match('/^\$.*/', $paramDefinitions[0])) {
+                    $phpcsFile->addError(
+                        'Type is not specified',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                }
+                break;
+            case 2:
+                if ($this->isInvalidType($paramDefinitions[0])) {
+                    $phpcsFile->addFixableError(
+                        $paramDefinitions[0].' is not a valid PHP type',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                }
+                $this->validateParameterPresentInMethodSignature(
+                    $ptr,
+                    ltrim($paramDefinitions[1], '&'),
+                    $methodArguments,
+                    $phpcsFile,
+                    $paramPointers
+                );
+                break;
+            default:
+                if (preg_match('/^\$.*/', $paramDefinitions[0])) {
+                    $phpcsFile->addError(
+                        'Type is not specified',
+                        $paramPointers[$ptr],
+                        'MethodArguments'
+                    );
+                    if ($this->isInvalidType($paramDefinitions[0])) {
+                        $phpcsFile->addFixableError(
+                            $paramDefinitions[0].' is not a valid PHP type',
+                            $paramPointers[$ptr],
+                            'MethodArguments'
+                        );
+                    }
+                }
+                break;
+        }
+    }
+
+    /**
+     * Validate method parameter annotations
+     *
+     * @param int $stackPtr
+     * @param array $paramDefinitions
+     * @param array $paramPointers
+     * @param File $phpcsFile
+     * @param array $methodArguments
+     * @param int $previousCommentOpenPtr
+     * @param int $previousCommentClosePtr
+     */
+    private function validateMethodParameterAnnotations(
+        int $stackPtr,
+        array $paramDefinitions,
+        array $paramPointers,
+        File $phpcsFile,
+        array $methodArguments,
+        int $previousCommentOpenPtr,
+        int $previousCommentClosePtr
+    ) : void {
+        $argumentCount = count($methodArguments);
+        $paramCount = count($paramPointers);
+        $this->validateParameterAnnotationForArgumentExists(
+            $phpcsFile,
+            $argumentCount,
+            $paramCount,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr,
+            $stackPtr
+        );
+        $this->validateCommentBlockDoesnotHaveExtraParameterAnnotation(
+            $phpcsFile,
+            $argumentCount,
+            $paramCount,
+            $stackPtr
+        );
+        $this->validateDuplicateAnnotationDoesnotExists(
+            $stackPtr,
+            $paramDefinitions,
+            $paramPointers,
+            $phpcsFile,
+            $methodArguments
+        );
+        $this->validateParameterOrderIsCorrect(
+            $paramDefinitions,
+            $methodArguments,
+            $phpcsFile,
+            $paramPointers
+        );
+        for ($ptr = 0; $ptr < count($methodArguments); $ptr++) {
+            $tokens = $phpcsFile->getTokens();
+            if (isset($paramPointers[$ptr])) {
+                $this->validateArgumentNameInParameterAnnotationExists(
+                    $stackPtr,
+                    $ptr,
+                    $phpcsFile,
+                    $methodArguments,
+                    $paramDefinitions
+                );
+                $paramContent = $tokens[$paramPointers[$ptr]+2]['content'];
+                $paramContentExplode = explode(' ', $paramContent);
+                $this->validateParameterAnnotationFormatIsCorrect(
+                    $ptr,
+                    $phpcsFile,
+                    $methodArguments,
+                    $paramContentExplode,
+                    $paramPointers
+                );
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $numTokens = count($tokens);
+        $previousCommentOpenPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr-1, 0);
+        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr-1, 0);
+        if (!$this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)) {
+            $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
+            return;
+        }
+        $openParenthesisPtr = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr+1, $numTokens);
+        $closedParenthesisPtr = $phpcsFile->findNext(T_CLOSE_PARENTHESIS, $stackPtr+1, $numTokens);
+        $methodArguments = $this->getMethodArguments($phpcsFile, $openParenthesisPtr, $closedParenthesisPtr);
+        $paramPointers = $paramDefinitions = [];
+        for ($tempPtr = $previousCommentOpenPtr; $tempPtr < $previousCommentClosePtr; $tempPtr++) {
+            if (strtolower($tokens[$tempPtr]['content']) === '@param') {
+                $paramPointers[] = $tempPtr;
+                $paramAnnotationParts = explode(' ', $tokens[$tempPtr+2]['content']);
+                if (count($paramAnnotationParts) === 1) {
+                    if ((preg_match('/^\$.*/', $paramAnnotationParts[0]))) {
+                        $paramDefinitions[] = [
+                            'type' => null,
+                            'paramName' => rtrim(ltrim($tokens[$tempPtr+2]['content'], '&'), ',')
+                        ];
+                    } else {
+                        $paramDefinitions[] = [
+                            'type' => $tokens[$tempPtr+2]['content'],
+                            'paramName' => null
+                        ];
+                    }
+                } else {
+                    $paramDefinitions[] = [
+                        'type' => $paramAnnotationParts[0],
+                        'paramName' => rtrim(ltrim($paramAnnotationParts[1], '&'), ',')
+                    ];
+                }
+            }
+        }
+        $this->validateMethodParameterAnnotations(
+            $stackPtr,
+            $paramDefinitions,
+            $paramPointers,
+            $phpcsFile,
+            $methodArguments,
+            $previousCommentOpenPtr,
+            $previousCommentClosePtr
+        );
+    }
+}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
index f9cec6404dc69..49339054f8766 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
@@ -14,7 +14,6 @@
  * Ensure that id selector is not used
  *
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
- *
  */
 class AvoidIdSniff implements Sniff
 {
@@ -26,15 +25,36 @@ class AvoidIdSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
+     * Tokens that can appear in a selector
+     *
      * @var array
      */
-    private $symbolsBeforeId = [
-        TokenizerSymbolsInterface::INDENT_SPACES,
-        TokenizerSymbolsInterface::NEW_LINE,
+    private $selectorTokens = [
+        T_HASH,
+        T_WHITESPACE,
+        T_STRING_CONCAT,
+        T_OPEN_PARENTHESIS,
+        T_CLOSE_PARENTHESIS,
+        T_OPEN_SQUARE_BRACKET,
+        T_CLOSE_SQUARE_BRACKET,
+        T_DOUBLE_QUOTED_STRING,
+        T_CONSTANT_ENCAPSED_STRING,
+        T_DOUBLE_COLON,
+        T_COLON,
+        T_EQUAL,
+        T_MUL_EQUAL,
+        T_OR_EQUAL,
+        T_STRING,
+        T_NONE,
+        T_DOLLAR,
+        T_GREATER_THAN,
+        T_PLUS,
+        T_NS_SEPARATOR,
+        T_LNUMBER,
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -42,15 +62,38 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
+     * Will flag any selector that looks like the following:
+     * #foo[bar],
+     * #foo[bar=bash],
+     * #foo[bar~=bash],
+     * #foo[bar$=bash],
+     * #foo[bar*=bash],
+     * #foo[bar|=bash],
+     * #foo[bar='bash'],
+     * #foo:hover,
+     * #foo:nth-last-of-type(n),
+     * #foo::before,
+     * #foo + div,
+     * #foo > div,
+     * #foo ~ div,
+     * #foo\3Abar ~ div,
+     * #foo\:bar ~ div,
+     * #foo.bar .baz,
+     * div#foo {
+     *     blah: 'abc';
+     * }
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (T_WHITESPACE === $tokens[$stackPtr - 1]['code']
-            && in_array($tokens[$stackPtr - 1]['content'], $this->symbolsBeforeId)
-        ) {
+        // Find the next non-selector token
+        $nextToken = $phpcsFile->findNext($this->selectorTokens, $stackPtr + 1, null, true);
+
+        // Anything except a { or a , means this is not a selector
+        if ($nextToken !== false && in_array($tokens[$nextToken]['code'], [T_OPEN_CURLY_BRACKET, T_COMMA])) {
             $phpcsFile->addError('Id selector is used', $stackPtr, 'IdSelectorUsage');
         }
     }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
index 9d138c2efc6d3..798c13ff2699c 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
@@ -62,11 +62,5 @@ public function process(File $phpcsFile, $stackPtr)
         if (preg_match_all('/[^a-z0-9\-_]/U', $className, $matches)) {
             $phpcsFile->addError('Class name contains not allowed symbols', $stackPtr, 'NotAllowedSymbol', $matches);
         }
-
-        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX) !== false
-            && strpos($className, self::STRING_ALLOWED_UNDERSCORES) === false
-        ) {
-            $phpcsFile->addError('"_" symbol allowed only for helper classes', $stackPtr, 'UnderscoreSymbol');
-        }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
index a1fe346aae3b6..3f33d0b2c69d5 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -46,7 +46,7 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if ($tokens[$prevPtr]['line'] === $tokens[$stackPtr]['line']) {
-            $error = 'Each propery must be on a line by itself';
+            $error = 'Each property must be on a line by itself';
             $phpcsFile->addError($error, $stackPtr, 'SameLine');
         }
     }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
index 29b6d9a8cae9d..e59b5da37d0e2 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
@@ -100,6 +100,14 @@ public function process(File $phpcsFile, $stackPtr)
      */
     private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties)
     {
+        // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
+        $symbolsForSkip = ['(', 'block', 'field'];
+        $properties = array_filter(
+            $properties,
+            function ($var) use ($symbolsForSkip) {
+                return !in_array($var, $symbolsForSkip);
+            }
+        );
 
         $originalProperties = $properties;
         sort($properties);
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
index c696881588567..1b4fb53c45010 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
@@ -25,7 +25,7 @@ class ZeroUnitsSniff implements Sniff
     const CSS_PROPERTY_UNIT_REM = 'rem';
 
     /**
-     * List of available CSS Propery units
+     * List of available CSS Property units
      *
      * @var array
      */
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
index f41c235a6c0f8..e3cfdf532438c 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -64,7 +64,7 @@ protected function validateNamespace(File $sourceFile, $stackPtr)
                     'Cannot use "%s" in namespace as it is reserved since PHP %s',
                     $stackPtr,
                     'Namespace',
-                    [$namespacePart, $this->reservedWords[$namespacePart]]
+                    [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
                 );
             }
             $stackPtr++;
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
index cb186f7cb80a9..e11b85a6c20f5 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
@@ -12,6 +12,9 @@
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Runner;
 
+/**
+ * PHP Code Sniffer wrapper class
+ */
 class Wrapper extends Runner
 {
     /**
@@ -33,10 +36,21 @@ public function version()
         return $version;
     }
 
+    /**
+     * Initialize PHPCS runner and modifies the configuration settings
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+     */
     public function init()
     {
         $this->config->extensions = $this->settings['extensions'];
         unset($this->settings['extensions']);
+
+        $settings = $this->config->getSettings();
+        unset($settings['files']);
+
+        $this->config->setSettings($settings);
+
         $this->config->setSettings(array_replace_recursive(
             $this->config->getSettings(),
             $this->settings
@@ -45,6 +59,8 @@ public function init()
     }
 
     /**
+     * Sets the settings
+     *
      * @param array $settings
      */
     public function setSettings($settings)
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
new file mode 100644
index 0000000000000..72e4fff7e5162
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Rule for searching DB dependency
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Dependency;
+
+/**
+ * Rule for testing integrity within declarative schema.
+ *
+ * @package Magento\TestFramework\Dependency
+ */
+class DeclarativeSchemaRule implements RuleInterface
+{
+    /**
+     * Map of tables and modules
+     *
+     * @var array
+     */
+    protected $_moduleTableMap;
+
+    /**
+     * Constructor
+     *
+     * @param array $tables
+     */
+    public function __construct(array $tables)
+    {
+        $this->_moduleTableMap = $tables;
+    }
+
+    /**
+     * Gets external dependencies information for current module by analyzing db_schema.xml files contents.
+     *
+     * @param string $currentModule
+     * @param string $fileType
+     * @param string $file
+     * @param string $contents
+     * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
+    {
+        if ('db_schema' != $fileType || !preg_match('#.*/db_schema\.xml$#', $file)) {
+            return [];
+        }
+
+        $dependenciesInfo = [];
+        $unKnowTables = [];
+
+        $dom = new \DOMDocument();
+        $dom->loadXML($contents);
+        $tables = $dom->getElementsByTagName('table');
+        $constraints = $dom->getElementsByTagName('constraint');
+
+        $tableNames = [];
+        $foreignKeyTables = [];
+        $foreignKeyReferenceTables = [];
+
+        /** @var \DOMElement $table */
+        foreach ($tables as $table) {
+            $tableNames[] = $table->getAttribute('name');
+        }
+
+        /** @var \DOMElement $constraint */
+        foreach ($constraints as $constraint) {
+            $xsiType = $constraint->getAttribute('xsi:type');
+            if (strtolower($xsiType) == 'foreign' && $constraint->getAttribute('disabled') !== '1') {
+                $foreignKeyTables[] = $constraint->getAttribute('table');
+                $foreignKeyReferenceTables[] = $constraint->getAttribute('referenceTable');
+            }
+        }
+
+        $tableNames = array_unique(array_merge($tableNames, $foreignKeyReferenceTables, $foreignKeyTables));
+
+        /** @var string $table */
+        foreach ($tableNames as $table) {
+            if (!isset($this->_moduleTableMap[$table])) {
+                $unKnowTables[$file][$table] = $table;
+                continue;
+            }
+            if (strtolower($currentModule) !== strtolower($this->_moduleTableMap[$table])) {
+                $dependenciesInfo[] = [
+                    'module' => $this->_moduleTableMap[$table],
+                    'type' => RuleInterface::TYPE_HARD,
+                    'source' => $table,
+                ];
+            }
+        }
+
+        foreach ($unKnowTables as $tables) {
+            foreach ($tables as $table) {
+                $dependenciesInfo[] = ['module' => 'Unknown', 'source' => $table];
+            }
+        }
+        return $dependenciesInfo;
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
index 2b4497c544ab7..cdaa49e8d37fb 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
@@ -40,7 +40,7 @@ private function getPattern()
     {
         if ($this->pattern === null) {
             $this->pattern = '~\b(?<class>(?<module>('
-                . implode('_|', Files::init()->getNamespaces())
+                . implode('[_\\\\]|', Files::init()->getNamespaces())
                 . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';
         }
 
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
index e240e5037fb3e..800bba2a880bd 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
@@ -88,39 +88,67 @@ public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
             return [];
         }
 
-        $pattern = '~\b(?<class>(?<module>(' . implode(
-            '_|',
-            Files::init()->getNamespaces()
-        ) . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';
+        $dependenciesInfo = [];
+        $dependenciesInfo = $this->considerCaseDependencies(
+            $dependenciesInfo,
+            $this->caseClassesAndIdentifiers($currentModule, $file, $contents)
+        );
+        $dependenciesInfo = $this->considerCaseDependencies(
+            $dependenciesInfo,
+            $this->_caseGetUrl($currentModule, $contents)
+        );
+        $dependenciesInfo = $this->considerCaseDependencies(
+            $dependenciesInfo,
+            $this->_caseLayoutBlock($currentModule, $fileType, $file, $contents)
+        );
+        return $dependenciesInfo;
+    }
+
+    /**
+     * Check references to classes and identifiers defined in other modules
+     *
+     * @param string $currentModule
+     * @param string $file
+     * @param string $contents
+     * @return array
+     */
+    private function caseClassesAndIdentifiers($currentModule, $file, &$contents)
+    {
+        $pattern = '~\b(?<class>(?<module>('
+            . implode(
+                '[_\\\\]|',
+                Files::init()->getNamespaces()
+            )
+            . '[_\\\\])[a-zA-Z0-9]+)'
+            . '(?<class_inside_module>[a-zA-Z0-9_\\\\]*))\b(?:::(?<module_scoped_key>[a-z0-9_]+)[\'"])?~';
+
+        if (!preg_match_all($pattern, $contents, $matches)) {
+            return [];
+        }
 
         $dependenciesInfo = [];
-        if (preg_match_all($pattern, $contents, $matches)) {
-            $matches['module'] = array_unique($matches['module']);
-            foreach ($matches['module'] as $i => $referenceModule) {
-                $referenceModule = str_replace('_', '\\', $referenceModule);
-                if ($currentModule == $referenceModule) {
-                    continue;
-                }
-                $dependencyClass = trim($matches['class'][$i]);
+        $matches['module'] = array_unique($matches['module']);
+        foreach ($matches['module'] as $i => $referenceModule) {
+            $referenceModule = str_replace('_', '\\', $referenceModule);
+            if ($currentModule == $referenceModule) {
+                continue;
+            }
+
+            $dependencyClass = trim($matches['class'][$i]);
+            if (empty($matches['class_inside_module'][$i]) && !empty($matches['module_scoped_key'][$i])) {
+                $dependencyType = RuleInterface::TYPE_SOFT;
+            } else {
                 $currentClass = $this->getClassFromFilepath($file, $currentModule);
                 $dependencyType = $this->isPluginDependency($currentClass, $dependencyClass)
                     ? RuleInterface::TYPE_SOFT
                     : RuleInterface::TYPE_HARD;
-
-                $dependenciesInfo[] = [
-                    'module' => $referenceModule,
-                    'type' => $dependencyType,
-                    'source' => $dependencyClass,
-                ];
             }
-        }
-        $result = $this->_caseGetUrl($currentModule, $contents);
-        if (count($result)) {
-            $dependenciesInfo = array_merge($dependenciesInfo, $result);
-        }
-        $result = $this->_caseLayoutBlock($currentModule, $fileType, $file, $contents);
-        if (count($result)) {
-            $dependenciesInfo = array_merge($dependenciesInfo, $result);
+
+            $dependenciesInfo[] = [
+                'module' => $referenceModule,
+                'type' => $dependencyType,
+                'source' => $dependencyClass,
+            ];
         }
 
         return $dependenciesInfo;
@@ -366,4 +394,14 @@ protected function _getUniqueDependencies($dependencies = [])
         }
         return $result;
     }
+
+    /**
+     * @param array $known
+     * @param array $new
+     * @return array
+     */
+    private function considerCaseDependencies($known, $new)
+    {
+        return array_merge($known, $new);
+    }
 }
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
index 6470bc0c22086..3d7f5f2604d7a 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
@@ -32,7 +32,7 @@ public static function getPhpFiles($changedFilesList, $fileTypes = 0)
         $fileUtilities = Files::init();
         if (isset($_ENV['INCREMENTAL_BUILD'])) {
             $phpFiles = [];
-            foreach (glob($changedFilesList) as $listFile) {
+            foreach (glob($changedFilesList, GLOB_NOSORT) as $listFile) {
                 $phpFiles = array_merge($phpFiles, file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES));
             }
             array_walk(
diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
index 14d05b466b407..d0f0d38f8fa03 100644
--- a/dev/tests/static/framework/Magento/ruleset.xml
+++ b/dev/tests/static/framework/Magento/ruleset.xml
@@ -10,6 +10,10 @@
 
     <rule ref="PSR2"/>
 
+    <rule ref="PSR2.Files.ClosingTag">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
+
     <rule ref="Magento.Files.LineLength">
         <properties>
             <property name="lineLimit" value="120"/>
@@ -22,6 +26,26 @@
     <rule ref="Magento.LiteralNamespaces.LiteralNamespaces">
         <exclude-pattern>*/_files/*</exclude-pattern>
     </rule>
+    <rule ref="Magento.Annotation.MethodArguments">
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento.Annotation.MethodAnnotationStructure">
+        <include-pattern>*\.(php)</include-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
+    </rule>
+    <rule ref="Magento.Annotation.ClassAnnotationStructure">
+        <include-pattern>*\.(php)</include-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
+    </rule>
     <rule ref="Magento.Functions.OutputBuffering">
         <include-pattern>*/(app/code|vendor|setup/src|lib/internal/Magento)/*</include-pattern>
         <exclude-pattern>*/lib/internal/Magento/Framework/Image/Adapter/Gd2.php</exclude-pattern>
diff --git a/dev/tests/static/framework/bootstrap.php b/dev/tests/static/framework/bootstrap.php
index 1fe48e5a36ce6..5e3336ebc28de 100644
--- a/dev/tests/static/framework/bootstrap.php
+++ b/dev/tests/static/framework/bootstrap.php
@@ -14,6 +14,10 @@
 
 require __DIR__ . '/autoload.php';
 
+if (!defined('TESTS_TEMP_DIR')) {
+    define('TESTS_TEMP_DIR', __DIR__ . DIRECTORY_SEPARATOR . 'tmp');
+}
+
 setCustomErrorHandler();
 
 $componentRegistrar = new ComponentRegistrar();
diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
index 57c13a6b3931b..aca48f6f8d1d0 100644
--- a/dev/tests/static/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
@@ -20,4 +20,32 @@
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="@magentoDbIsolation">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php
new file mode 100644
index 0000000000000..b12cb1fbfcbd3
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Sniffs\Annotation;
+
+class ClassAnnotationStructureSniffTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            [
+                'ClassAnnotationFixture.php',
+                'class_annotation_errors.txt',
+            ],
+            [
+                'AbstractClassAnnotationFixture.php',
+                'abstract_class_annotation_errors.txt',
+            ],
+            [
+                'ClassAnnotationNoShortDescriptionFixture.php',
+                'class_annotation_noshortdescription_errors.txt',
+            ],
+            [
+                'ClassAnnotationNoSpacingBetweenLinesFixture.php',
+                'class_annotation_nospacingbetweenLines_errors.txt',
+            ]
+        ];
+    }
+
+    /**
+     * Copy a file
+     *
+     * @param string $source
+     * @param string $destination
+     */
+    private function copyFile($source, $destination) : void
+    {
+        $sourcePath = $source;
+        $destinationPath = $destination;
+        $sourceDirectory = opendir($sourcePath);
+        while ($readFile = readdir($sourceDirectory)) {
+            if ($readFile != '.' && $readFile != '..') {
+                if (!file_exists($destinationPath . $readFile)) {
+                    copy($sourcePath . $readFile, $destinationPath . $readFile);
+                }
+            }
+        }
+        closedir($sourceDirectory);
+    }
+
+    /**
+     * @param string $fileUnderTest
+     * @param string $expectedReportFile
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($fileUnderTest, $expectedReportFile)
+    {
+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
+        $this->copyFile(
+            __DIR__ . DIRECTORY_SEPARATOR . '_files'. DIRECTORY_SEPARATOR,
+            TESTS_TEMP_DIR
+        );
+        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
+            'Magento',
+            $reportFile,
+            new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
+        );
+        $result = $codeSniffer->run(
+            [TESTS_TEMP_DIR . $fileUnderTest]
+        );
+        $actual = file_get_contents($reportFile);
+        $expected = file_get_contents(
+            TESTS_TEMP_DIR . $expectedReportFile
+        );
+        unlink($reportFile);
+        $this->assertEquals(2, $result);
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/MethodAnnotationStructureSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/MethodAnnotationStructureSniffTest.php
new file mode 100644
index 0000000000000..b56239f4df8a5
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/MethodAnnotationStructureSniffTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+class MethodAnnotationStructureSniffTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            [
+                'MethodAnnotationFixture.php',
+                'method_annotation_errors.txt'
+            ]
+        ];
+    }
+
+    /**
+     * Copy a file
+     *
+     * @param string $source
+     * @param string $destination
+     */
+    private function copyFile($source, $destination): void
+    {
+        $sourcePath = $source;
+        $destinationPath = $destination;
+        $sourceDirectory = opendir($sourcePath);
+        while ($readFile = readdir($sourceDirectory)) {
+            if ($readFile != '.' && $readFile != '..') {
+                if (!file_exists($destinationPath . $readFile)) {
+                    copy($sourcePath . $readFile, $destinationPath . $readFile);
+                }
+            }
+        }
+        closedir($sourceDirectory);
+    }
+
+    /**
+     * @param string $fileUnderTest
+     * @param string $expectedReportFile
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($fileUnderTest, $expectedReportFile)
+    {
+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
+        $this->copyFile(
+            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR,
+            TESTS_TEMP_DIR
+        );
+        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
+            'Magento',
+            $reportFile,
+            new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
+        );
+        $result = $codeSniffer->run(
+            [TESTS_TEMP_DIR . $fileUnderTest]
+        );
+        $actual = file_get_contents($reportFile);
+        $expected = file_get_contents(
+            TESTS_TEMP_DIR . $expectedReportFile
+        );
+        unlink($reportFile);
+        $this->assertEquals(2, $result);
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php
new file mode 100644
index 0000000000000..43973b3083e56
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+abstract class AbstractClassAnnotationFixture
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php
new file mode 100644
index 0000000000000..f9a997dcfeb9d
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+class ClassAnnotationFixture
+{
+    /**
+     *
+     * @inheritdoc
+     */
+    public function getProductListDefaultSortBy1()
+    {
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php
new file mode 100644
index 0000000000000..be49cc6c788e9
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
+class ClassAnnotationNoShortDescriptionFixture
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php
new file mode 100644
index 0000000000000..382185734c281
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation;
+
+/**
+ * Class ClassAnnotationNoSpacingBetweenLinesFixture
+ * @see Magento\Sniffs\Annotation\_files
+ */
+class ClassAnnotationNoSpacingBetweenLinesFixture
+{
+
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/MethodAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/MethodAnnotationFixture.php
new file mode 100644
index 0000000000000..5ba185aba6414
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/MethodAnnotationFixture.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Annotation\_files;
+
+/**
+ * Class for method structure for annotations test cases
+ */
+class MethodAnnotationFixture
+{
+    /**
+     *
+     * @inheritdoc
+     */
+    public function getProductListDefaultSortBy1()
+    {
+    }
+
+    /**
+     *
+     * @inheritdoc
+     */
+    public function getProductListDefaultSortBy10($store = null)
+    {
+        return $store;
+    }
+
+    /**
+     * Block for short
+     *
+     * {@inheritdoc}
+     *
+     */
+    public function getProductListDefaultSortBy102()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProductListDefaultBy()
+    {
+        return;
+    }
+
+    /**
+     *
+     * {@inheritdoc}
+     *
+     */
+    public function getProductListDefaultSortBy13()
+    {
+        return;
+    }
+
+    /**
+     * ProductVisibilityCondition constructor
+     * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
+     */
+    public function content(\Magento\Catalog\Model\Product\Visibility $productVisibility)
+    {
+        $this->productVisibility = $productVisibility;
+    }
+
+    /**
+     * block description
+     *
+     * {@inheritdoc}
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @return void
+     */
+    public function construct(AbstractDb $collection)
+    {
+        /** @var */
+        $collection->setVisibility($this->productVisibility->getVisibleInCatalogIds());
+    }
+
+    /**
+     * Move category
+     *
+     *
+     * @param int $parentId new parent category id
+     *
+     * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+     */
+    public function move($parentId)
+    {
+        /**
+         * Validate new parent category id. (category model is used for backward
+         * compatibility in event params)
+         */
+        try {
+            $this->categoryRepository->get($parentId, $this->getStoreId());
+        } catch (NoSuchEntityException $e) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Sorry, but we can\'t find the new parent category you selected.'),
+                $e
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Block for short description
+     *
+     * This a long description {@inheritdoc} consists more lines as part of the long description
+     * on multi line.
+     *
+     * @param int $store
+     *
+     *
+     */
+    public function getProductListDefaultSortBy26032($store)
+    {
+        return $store;
+    }
+
+    /**
+     *
+     *
+     *
+     */
+    public function getProductListDefaultSortBy2632()
+    {
+    }
+
+    /**
+     * Block for short description
+     *
+     * This a long description {@inheritdoc} consists more lines as part of the long description
+     * on multi line.
+     *
+     * @param int $store
+     *
+     *
+     *
+     */
+    public function getProductListDefaultSortBy2002($store)
+    {
+        return $store;
+    }
+
+    /**
+     *
+     * block for short description
+     *
+     * @param int $store
+     * @return int
+     */
+    public function getProductListDefaultSortBy3002($store)
+    {
+        return $store;
+    }
+
+    /**
+     * Block for short description
+     *
+     * @see consists more lines as part of the long description
+     * on multi line.
+     *
+     * @param string $store
+     * @param string $foo
+     */
+    public function getProductListDefaultSortBy12($store, $foo)
+    {
+        return $store === $foo;
+    }
+
+    /**
+     * Block for short description
+     *
+     * {@inheritdoc}
+     *
+     * @param string $store
+     * @param string $foo
+     */
+    public function getProductListDefaultSort2($store, $foo)
+    {
+        return $store === $foo;
+    }
+
+    /**
+     * Block for short description
+     *
+     * a long description {@inheritdoc} consists more lines as part of the long description
+     * on multi line.
+     *
+     * @param string $store
+     * @param string $foo
+     */
+    public function getProductListDefault($store, $foo)
+    {
+        return $store === $foo;
+    }
+
+    /**
+     * Retrieve custom options
+     *
+     * @param ProductOptionInterface $productOption
+     *
+     * @return array
+     */
+    protected function getCustomOptions(ProductOptionInterface $productOption)
+    {
+        if ($productOption
+            && $productOption->getExtensionAttributes()
+            && $productOption->getExtensionAttributes()->getCustomOptions()
+        ) {
+            return $productOption->getExtensionAttributes()
+                ->getCustomOptions();
+        }
+        return [];
+    }
+
+    /**
+     * This is the summary for a DocBlock.
+     *
+     * This is the description for a DocBlock. This text may contain
+     * multiple lines and even some _markdown_.
+     * * Markdown style lists function too
+     * * Just try this out once
+     * The section after the description contains the tags; which provide
+     * structured meta-data concerning the given element.
+     *
+     * @param int $example  This is an example function/method parameter description.
+     * @param string $example2 This is a second example.
+     *
+     */
+    public function getProductListDefaultSortBy2($example, $example2)
+    {
+        return $example === $example2;
+    }
+
+    /**
+     * Returns the content of the tokens from the specified start position in
+     * the token stack for the specified length.
+     *
+     * @param int $start
+     * @param int $length
+     *
+     * @return string The token contents.
+     */
+    public function getProductListDefaultSortBy($start, $length)
+    {
+        return $start === $length;
+    }
+
+    /**
+     * Some text about this step/method returns the content of the tokens the token stack for the specified length
+     *
+     * @param string $name
+     * @param string $folder
+     *
+     * @see this file
+     * @When I create a file called :name in :folder
+     */
+    public function getProductListDefaultSortBy222($name, $folder)
+    {
+        return $name === $folder;
+    }
+
+    public function setExtensionAs(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     *
+     * short description
+     * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
+     * @return mixed
+     */
+    public function setEn(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
+     * @return mixed
+     */
+    public function setExtenw(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     *
+     * Short description
+     * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes
+     * @return mixed
+     */
+    public function setExff(\Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param int $start
+     * @param int $length
+     *
+     * @return string The token contents.
+     */
+    public function getProductSortBy($start, $length)
+    {
+        return $start === $length;
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt
new file mode 100644
index 0000000000000..23698cfb72e27
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt
@@ -0,0 +1,10 @@
+FILE: ...o/Sniffs/Annotation/_fixtures/AbstractClassAnnotationFixture.php
+----------------------------------------------------------------------
+FOUND 1 ERROR AFFECTING 1 LINE
+----------------------------------------------------------------------
+ 11 | ERROR | [x] Interface or abstract class is missing annotation
+    |       |     block
+----------------------------------------------------------------------
+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
+
+
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt
new file mode 100644
index 0000000000000..aca2721131608
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt
@@ -0,0 +1,11 @@
+
+FILE: ...Magento/Sniffs/Annotation/_fixtures/class_annotation_fixture.php
+----------------------------------------------------------------------
+FOUND 1 ERROR AFFECTING 1 LINE
+----------------------------------------------------------------------
+ 11 | ERROR | [x] Class is missing annotation block
+----------------------------------------------------------------------
+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+----------------------------------------------------------------------
+
+
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt
new file mode 100644
index 0000000000000..ecc702c568934
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt
@@ -0,0 +1,14 @@
+'\n
+FILE: ...nnotation/_fixtures/ClassAnnotationNoShortDescriptionFixture.php\n
+----------------------------------------------------------------------\n
+FOUND 1 ERROR AFFECTING 1 LINE\n
+----------------------------------------------------------------------\n
+ 11 | ERROR | [x] Missing short description\n
+----------------------------------------------------------------------\n
+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
+----------------------------------------------------------------------\n
+\n
+\n
+'
+
+
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
new file mode 100644
index 0000000000000..01c145ad6c29f
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
@@ -0,0 +1,12 @@
+'\n
+FILE: ...tation/_fixtures/ClassAnnotationNoSpacingBetweenLinesFixture.php\n
+----------------------------------------------------------------------\n
+FOUND 1 ERROR AFFECTING 1 LINE\n
+----------------------------------------------------------------------\n
+ 13 | ERROR | [x] There must be exactly one blank line between lines\n
+----------------------------------------------------------------------\n
+PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
+----------------------------------------------------------------------\n
+\n
+\n
+'
\ No newline at end of file
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/method_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/method_annotation_errors.txt
new file mode 100644
index 0000000000000..65f75f6564a65
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/method_annotation_errors.txt
@@ -0,0 +1,55 @@
+FILE: .../Magento/Sniffs/Annotation/_fixtures/MethodAnnotationFixture.php\n
+----------------------------------------------------------------------\n
+FOUND 29 ERRORS AFFECTING 26 LINES
+----------------------------------------------------------------------
+  18 | ERROR | [x] No blank lines are allowed before short
+     |       |     description
+  27 | ERROR | [x] {@inheritdoc} imports only short description,
+     |       |     annotation must have long description
+  29 | ERROR | [x] Additional blank lines found at end of the
+     |       |     annotation block
+  35 | ERROR | [x] {@inheritdoc} imports only short description,
+     |       |     annotation must have long description
+  44 | ERROR | [x] No blank lines are allowed before short
+     |       |     description
+  44 | ERROR | [x] {@inheritdoc} imports only short description,
+     |       |     annotation must have long description
+  46 | ERROR | [x] Additional blank lines found at end of the
+     |       |     annotation block
+  54 | ERROR | [x] There must be exactly one blank line before tags
+  62 | ERROR | [x] Short description must start with a capital letter
+  64 | ERROR | [x] {@inheritdoc} imports only short description,
+     |       |     annotation must have long description
+  79 | ERROR | [x] There must be exactly one blank line before tags
+ 110 | ERROR | [x] Additional blank lines found at end of the
+     |       |     annotation block
+ 116 | ERROR | [ ] Annotation block is empty
+ 135 | ERROR | [x] Additional blank lines found at end of the
+     |       |     annotation block
+ 143 | ERROR | [x] No blank lines are allowed before short
+     |       |     description
+ 143 | ERROR | [x] Short description must start with a capital letter
+ 170 | ERROR | [x] {@inheritdoc} imports only short description,
+     |       |     annotation must have long description
+ 183 | ERROR | [x] Long description must start with a capital letter
+ 226 | ERROR | [x] Additional blank lines found at end of the
+     |       |     annotation block
+ 234 | ERROR | [x] Short description should not be in multi lines
+ 260 | ERROR | [ ] Comment block is missing
+ 267 | ERROR | [x] No blank lines are allowed before short
+     |       |     description
+ 267 | ERROR | [x] Short description must start with a capital letter
+ 268 | ERROR | [x] There must be exactly one blank line before tags
+ 276 | ERROR | [x] Missing short description
+ 277 | ERROR | [x] There must be exactly one blank line before tags
+ 287 | ERROR | [x] No blank lines are allowed before short
+     |       |     description
+ 288 | ERROR | [x] There must be exactly one blank line before tags
+ 297 | ERROR | [x] {@inheritdoc} imports only short description,
+     |       |     annotation must have long description
+----------------------------------------------------------------------
+PHPCBF CAN FIX THE 27 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+----------------------------------------------------------------------
+\n
+\n
+'
\ No newline at end of file
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/AvoidIdSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/AvoidIdSniffTest.php
new file mode 100644
index 0000000000000..ad9e8edd4d1b3
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/AvoidIdSniffTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Less;
+
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\LessWrapper;
+
+class AvoidIdSniffTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            [
+                'avoid-ids.less',
+                'avoid-ids-errors.txt'
+            ]
+        ];
+    }
+
+    /**
+     * @param string $fileUnderTest
+     * @param string $expectedReportFile
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($fileUnderTest, $expectedReportFile)
+    {
+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
+        $wrapper = new LessWrapper();
+        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
+            'Magento',
+            $reportFile,
+            $wrapper
+        );
+        $codeSniffer->setExtensions([LessWrapper::LESS_FILE_EXTENSION]);
+        $result = $codeSniffer->run(
+            [__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileUnderTest]
+        );
+        // Remove the absolute path to the file from the output
+        $actual = preg_replace('/^.+\n/', '', ltrim(file_get_contents($reportFile)));
+        $expected = file_get_contents(
+            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $expectedReportFile
+        );
+        unlink($reportFile);
+        $this->assertEquals(1, $result);
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids-errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids-errors.txt
new file mode 100644
index 0000000000000..ebc01c4e0852e
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids-errors.txt
@@ -0,0 +1,26 @@
+---------------------------------------------------------------------------------------------------------------------------------
+FOUND 20 ERRORS AFFECTING 20 LINES
+---------------------------------------------------------------------------------------------------------------------------------
+  6 | ERROR | Id selector is used
+  7 | ERROR | Id selector is used
+  8 | ERROR | Id selector is used
+  9 | ERROR | Id selector is used
+ 10 | ERROR | Id selector is used
+ 11 | ERROR | Id selector is used
+ 12 | ERROR | Id selector is used
+ 13 | ERROR | Id selector is used
+ 14 | ERROR | Id selector is used
+ 15 | ERROR | Id selector is used
+ 16 | ERROR | Id selector is used
+ 17 | ERROR | Id selector is used
+ 18 | ERROR | Id selector is used
+ 19 | ERROR | Id selector is used
+ 20 | ERROR | Id selector is used
+ 21 | ERROR | Id selector is used
+ 22 | ERROR | Id selector is used
+ 26 | ERROR | Id selector is used
+ 27 | ERROR | Id selector is used
+ 28 | ERROR | Id selector is used
+---------------------------------------------------------------------------------------------------------------------------------
+
+
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids.less b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids.less
new file mode 100644
index 0000000000000..dd37677b5b53b
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Less/_files/avoid-ids.less
@@ -0,0 +1,39 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+#foo[bar],
+#foo[bar=bash],
+#foo[bar~=bash],
+#foo[bar$=bash],
+#foo[bar*=bash],
+#foo[bar|=bash],
+#foo[bar='bash'],
+#foo:hover,
+#foo:nth-last-of-type(n),
+#foo::before,
+#foo + div,
+#foo > div,
+#foo ~ div,
+#foo\3Abar ~ div,
+#foo\:bar ~ div,
+#foo.bar .baz,
+div#foo {
+    blah: 'abc';
+}
+
+.my #foo,
+#foo .blah,
+.my #foo .blah {
+    some: 'stuff';
+}
+.blah {
+    #bar .baz();
+    .foo #bar .baz();
+    #bar .baz();
+
+    #bar .baz;
+    .foo #bar .baz;
+    #bar .baz;
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
index 39ad80850dd30..65512653ce3fa 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
@@ -67,7 +67,7 @@ private function tokenizeString($fileContent)
         $lineNumber = 1;
         $tokens = token_get_all($fileContent);
         $snifferTokens = [];
-        for ($i = 0; $i < count($tokens); $i++) {
+        for ($i = 0, $count = count($tokens); $i < $count; $i++) {
             $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
             $snifferTokens[$i]['line'] = $lineNumber;
             $snifferTokens[$i]['content'] = $content;
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
new file mode 100644
index 0000000000000..269eff8087a91
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Dependency;
+
+/**
+ * Test for declarative schema integrity rule.
+ *
+ * @package Magento\TestFramework\Dependency
+ */
+class DeclarativeSchemaRuleTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DeclarativeSchemaRule
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->model = new DeclarativeSchemaRule(['some_table' => 'SomeModule']);
+    }
+
+    /**
+     * @param string $module
+     * @param string $file
+     * @param string $contents
+     * @param array $expected
+     * @dataProvider getDependencyInfoDataProvider
+     */
+    public function testGetDependencyInfo($module, $file, $contents, array $expected)
+    {
+        $actualDependencies = $this->model->getDependencyInfo($module, 'db_schema', $file, $contents);
+        $this->assertEquals(
+            $expected,
+            $actualDependencies
+        );
+    }
+
+    public function getDependencyInfoDataProvider()
+    {
+        return [
+            ['any', 'non-db-schema-file.php', 'any', []],
+            [
+                'any',
+                '/app/Magento/Module/etc/db_schema.xml',
+                '<table name="unknown_table"></table>',
+                [['module' => 'Unknown', 'source' => 'unknown_table']]
+            ],
+            [
+                'SomeModule',
+                '/app/some/path/etc/db_schema.xml',
+                '<table name="some_table"></table>',
+                []
+            ],
+            [
+                'any',
+                '/app/some/path/etc/db_schema.xml',
+                '<table name="some_table"></table>',
+                [
+                    [
+                        'module' => 'SomeModule',
+                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
+                        'source' => 'some_table',
+                    ]
+                ]
+            ],
+            [
+                'any',
+                '/app/some/path/etc/db_schema.xml',
+                '<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+                    <table name="some_table">
+                        <constraint xsi:type="foreign" 
+                        name="FK_NAME" 
+                        table="some_table" 
+                        column="some_col" 
+                        referenceTable="ref_table" 
+                        referenceColumn="ref_col"
+                        onDelete="CASCADE"/>
+                    </table>
+                </schema>',
+                [
+                    [
+                        'module' => 'SomeModule',
+                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
+                        'source' => 'some_table',
+                    ],
+                    [
+                        'module' => 'Unknown',
+                        'source' => 'ref_table',
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/static/get_github_changes.php b/dev/tests/static/get_github_changes.php
index 77dd88c4d001e..a619f951dac87 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);
 
 /**
@@ -136,6 +147,8 @@ function getRepo($options, $mainline)
 }
 
 /**
+ * Combine list of changed files based on comparison between forks.
+ *
  * @param string $mainline
  * @param GitRepo $repo
  * @param string $branchName
@@ -143,14 +156,27 @@ function getRepo($options, $mainline)
  */
 function retrieveChangesAcrossForks($mainline, GitRepo $repo, $branchName)
 {
-    return $repo->compareChanges($mainline, $branchName);
+    return $repo->compareChanges($mainline, $branchName, GitRepo::CHANGE_TYPE_ALL);
+}
+
+/**
+ * Combine list of new files based on comparison between forks.
+ *
+ * @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);
 }
 
 /**
  * Deletes temporary "base" repo
  *
  * @param GitRepo $repo
- * @param string $repo
+ * @param string $mainline
  */
 function cleanup($repo, $mainline)
 {
@@ -178,6 +204,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 +304,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 +319,8 @@ public function compareChanges($remoteAlias, $remoteBranch)
             ? $this->filterChangedFiles(
                 $result,
                 $remoteAlias,
-                $remoteBranch
+                $remoteBranch,
+                $changesType
             )
             : [];
     }
@@ -299,50 +331,114 @@ 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,
+                $fileName
+            )
+        );
+
+        return $result;
+    }
+
     /**
      * Set changed content for file.
      *
diff --git a/dev/tests/static/phpunit-all.xml.dist b/dev/tests/static/phpunit-all.xml.dist
index 626e753c3c242..7f067d9290f3a 100644
--- a/dev/tests/static/phpunit-all.xml.dist
+++ b/dev/tests/static/phpunit-all.xml.dist
@@ -20,5 +20,15 @@
     </testsuites>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
+        <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
+        <const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
index 0afaddb34caef..8ed80df002dfd 100644
--- a/dev/tests/static/phpunit.xml.dist
+++ b/dev/tests/static/phpunit.xml.dist
@@ -30,8 +30,17 @@
     </testsuites>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
-        <const name="TESTCODESTYLE_IS_FULL_SCAN" value="1"/>
+        <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
+        <const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
         <!-- TESTS_COMPOSER_PATH - specify the path to composer binary, if a relative reference cannot be resolved -->
         <!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
index deed829838936..e62c4112553b6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
@@ -44,9 +44,9 @@ protected function buildModulesDependencies()
             $moduleName = str_replace('/', '_', $moduleName[1]);
             $config = simplexml_load_file($configFile);
             $result = $config->xpath("/config/module/depends/module") ?: [];
-            while (list(, $node) = each($result)) {
+            foreach ($result as $node) {
                 /** @var \SimpleXMLElement $node */
-                $this->moduleDependencies[$moduleName][] = (string)$node['name'];
+                $this->moduleDependencies[$moduleName][] = (string) $node['name'];
             }
         }
     }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index b754536fd5b18..6d627574a3a18 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -11,20 +11,40 @@
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\App\Utility\Files;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
 class ClassesTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
     /**
      * List of already found classes to avoid checking them over and over again
      *
      * @var array
      */
-    protected static $_existingClasses = [];
+    private $existingClasses = [];
 
-    protected static $_keywordsBlacklist = ["String", "Array", "Boolean", "Element"];
+    /**
+     * @var array
+     */
+    private static $keywordsBlacklist = ["String", "Array", "Boolean", "Element"];
 
-    protected static $_namespaceBlacklist = null;
+    /**
+     * @var array|null
+     */
+    private $referenceBlackList = null;
 
-    protected static $_referenceBlackList = null;
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->componentRegistrar = new ComponentRegistrar();
+    }
 
     public function testPhpFiles()
     {
@@ -69,9 +89,9 @@ function ($file) {
                     $classes
                 );
 
-                $this->_collectResourceHelpersPhp($contents, $classes);
+                $this->collectResourceHelpersPhp($contents, $classes);
 
-                $this->_assertClassesExist($classes, $file);
+                $this->assertClassesExist($classes, $file);
             },
             Files::init()->getPhpFiles(
                 Files::INCLUDE_APP_CODE
@@ -89,8 +109,9 @@ function ($file) {
      *
      * @param string $contents
      * @param array &$classes
+     * @return void
      */
-    protected function _collectResourceHelpersPhp($contents, &$classes)
+    private function collectResourceHelpersPhp(string $contents, array &$classes): void
     {
         $regex = '/(?:\:\:|\->)getResourceHelper\(\s*\'([a-z\d\\\\]+)\'\s*\)/ix';
         $matches = Classes::getAllMatches($contents, $regex);
@@ -108,7 +129,7 @@ public function testConfigFiles()
              */
             function ($path) {
                 $classes = Classes::collectClassesInConfig(simplexml_load_file($path));
-                $this->_assertClassesExist($classes, $path);
+                $this->assertClassesExist($classes, $path);
             },
             Files::init()->getMainConfigFiles()
         );
@@ -145,7 +166,7 @@ function ($path) {
                 }
                 $classes = array_merge($classes, Classes::collectLayoutClasses($xml));
 
-                $this->_assertClassesExist(array_unique($classes), $path);
+                $this->assertClassesExist(array_unique($classes), $path);
             },
             Files::init()->getLayoutFiles()
         );
@@ -158,10 +179,12 @@ function ($path) {
      * Suppressing "unused variable" because of the "catch" block
      *
      * @param array $classes
+     * @param string $path
+     * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    protected function _assertClassesExist($classes, $path)
+    private function assertClassesExist(array $classes, string $path): void
     {
         if (!$classes) {
             return;
@@ -177,7 +200,7 @@ protected function _assertClassesExist($classes, $path)
                 } else {
                     $this->assertTrue(
                         isset(
-                            self::$_existingClasses[$class]
+                            $this->existingClasses[$class]
                         ) || Files::init()->classFileExists(
                             $class
                         ) || Classes::isVirtual(
@@ -187,7 +210,7 @@ protected function _assertClassesExist($classes, $path)
                         )
                     );
                 }
-                self::$_existingClasses[$class] = 1;
+                $this->existingClasses[$class] = 1;
             } catch (\PHPUnit\Framework\AssertionFailedError $e) {
                 $badClasses[] = '\\' . $class;
             }
@@ -230,7 +253,7 @@ function ($file) {
 
                 $classParts = explode(' ', $classNameMatch[0]);
                 $className = array_pop($classParts);
-                $this->_assertClassNamespace($file, $relativePath, $contents, $className);
+                $this->assertClassNamespace($file, $relativePath, $contents, $className);
             },
             Files::init()->getPhpFiles()
         );
@@ -244,8 +267,9 @@ function ($file) {
      * @param string $relativePath
      * @param string $contents
      * @param string $className
+     * @return void
      */
-    protected function _assertClassNamespace($file, $relativePath, $contents, $className)
+    private function assertClassNamespace(string $file, string $relativePath, string $contents, string $className): void
     {
         $namespacePattern = '/(Magento|Zend)\/[a-zA-Z]+[^\.]+/';
         $formalPattern = '/^namespace\s[a-zA-Z]+(\\\\[a-zA-Z0-9]+)*/m';
@@ -349,7 +373,7 @@ function ($file) {
                 $vendorClasses = array_filter($vendorClasses, 'strlen');
                 $vendorClasses = $this->referenceBlacklistFilter($vendorClasses);
                 if (!empty($vendorClasses)) {
-                    $this->_assertClassesExist($vendorClasses, $file);
+                    $this->assertClassesExist($vendorClasses, $file);
                 }
 
                 if (!empty($result3['exception']) && $result3['exception'][0] != "") {
@@ -368,7 +392,7 @@ function ($file) {
 
                 $badClasses = $this->referenceBlacklistFilter($badClasses);
                 $badClasses = $this->removeSpecialCases($badClasses, $file, $contents, $namespacePath);
-                $this->_assertClassReferences($badClasses, $file);
+                $this->assertClassReferences($badClasses, $file);
             },
             Files::init()->getPhpFiles()
         );
@@ -377,10 +401,11 @@ function ($file) {
     /**
      * Remove alias class name references that have been identified as 'bad'.
      *
-     * @param $aliasClasses
-     * @param $badClasses
+     * @param array $aliasClasses
+     * @param array $badClasses
+     * @return array
      */
-    protected function handleAliasClasses($aliasClasses, $badClasses)
+    private function handleAliasClasses(array $aliasClasses, array $badClasses): array
     {
         foreach ($aliasClasses as $aliasClass) {
             foreach ($badClasses as $badClass) {
@@ -389,32 +414,44 @@ protected function handleAliasClasses($aliasClasses, $badClasses)
                 }
             }
         }
+
         return $badClasses;
     }
 
     /**
      * This function is to remove legacy code usages according to _files/blacklist/reference.txt
-     * @param $classes
+     *
+     * @param array $classes
      * @return array
      */
-    protected function referenceBlacklistFilter($classes)
+    private function referenceBlacklistFilter(array $classes): array
     {
         // exceptions made for the files from the blacklist
-        self::_setReferenceBlacklist();
+        $classes = $this->getReferenceBlacklist();
         foreach ($classes as $class) {
-            if (in_array($class, self::$_referenceBlackList)) {
+            if (in_array($class, $this->referenceBlackList)) {
                 unset($classes[array_search($class, $classes)]);
             }
         }
+
         return $classes;
     }
 
-    protected function _setReferenceBlacklist()
+    /**
+     * Returns array of class names from black list.
+     *
+     * @return array
+     */
+    private function getReferenceBlacklist(): array
     {
-        if (!isset(self::$_referenceBlackList)) {
-            $blackList = file(__DIR__ . '/_files/blacklist/reference.txt', FILE_IGNORE_NEW_LINES);
-            self::$_referenceBlackList = $blackList;
+        if (!isset($this->referenceBlackList)) {
+            $this->referenceBlackList = file(
+                __DIR__ . '/_files/blacklist/reference.txt',
+                FILE_IGNORE_NEW_LINES
+            );
         }
+
+        return $this->referenceBlackList;
     }
 
     /**
@@ -426,18 +463,21 @@ protected function _setReferenceBlacklist()
      * @param string $namespacePath
      * @return array
      */
-    protected function removeSpecialCases($badClasses, $file, $contents, $namespacePath)
+    private function removeSpecialCases(array $badClasses, string $file, string $contents, string $namespacePath): array
     {
         foreach ($badClasses as $badClass) {
             // Remove valid usages of Magento modules from the list
             // for example: 'Magento_Sales::actions_edit'
-            if (preg_match('/Magento_[A-Z0-9][a-z0-9]*/', $badClass)) {
-                unset($badClasses[array_search($badClass, $badClasses)]);
-                continue;
+            if (preg_match('/^[A-Z][a-z]+_[A-Z0-9][a-z0-9]+$/', $badClass)) {
+                $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $badClass);
+                if ($moduleDir !== null) {
+                    unset($badClasses[array_search($badClass, $badClasses)]);
+                    continue;
+                }
             }
 
             // Remove usage of key words such as "Array", "String", and "Boolean"
-            if (in_array($badClass, self::$_keywordsBlacklist)) {
+            if (in_array($badClass, self::$keywordsBlacklist)) {
                 unset($badClasses[array_search($badClass, $badClasses)]);
                 continue;
             }
@@ -468,6 +508,7 @@ protected function removeSpecialCases($badClasses, $file, $contents, $namespaceP
                 continue;
             }
         }
+
         return $badClasses;
     }
 
@@ -482,12 +523,11 @@ protected function removeSpecialCases($badClasses, $file, $contents, $namespaceP
      */
     private function removeSpecialCasesNonFullyQualifiedClassNames($namespacePath, &$badClasses, $badClass)
     {
-        $componentRegistrar = new ComponentRegistrar();
         $namespaceParts = explode('/', $namespacePath);
         $moduleDir = null;
         if (isset($namespaceParts[1])) {
             $moduleName = array_shift($namespaceParts) . '_' . array_shift($namespaceParts);
-            $moduleDir = $componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+            $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
         }
         if ($moduleDir) {
             $fullPath = $moduleDir . '/' . implode('/', $namespaceParts) . '/' .
@@ -505,7 +545,7 @@ private function removeSpecialCasesNonFullyQualifiedClassNames($namespacePath, &
             unset($badClasses[array_search($badClass, $badClasses)]);
             return true;
         } else {
-            return $this->removeSpecialCasesForAllOthers($componentRegistrar, $namespacePath, $badClass, $badClasses);
+            return $this->removeSpecialCasesForAllOthers($namespacePath, $badClass, $badClasses);
         }
     }
 
@@ -516,11 +556,10 @@ private function removeSpecialCasesNonFullyQualifiedClassNames($namespacePath, &
      * @param string $badClass
      * @return null|string
      */
-    protected function getLibraryDirByPath($namespacePath, $badClass)
+    private function getLibraryDirByPath(string $namespacePath, string $badClass)
     {
         $libraryDir = null;
         $fullPath = null;
-        $componentRegistrar = new ComponentRegistrar();
         $namespaceParts = explode('/', $namespacePath);
         if (isset($namespaceParts[1]) && $namespaceParts[1]) {
             $vendor = array_shift($namespaceParts);
@@ -529,34 +568,43 @@ protected function getLibraryDirByPath($namespacePath, $badClass)
                 $subLib = $namespaceParts[0];
                 $subLib = strtolower(preg_replace('/(.)([A-Z])/', "$1-$2", $subLib));
                 $libraryName = $vendor . '/' . $lib . '-' . $subLib;
-                $libraryDir = $componentRegistrar->getPath(ComponentRegistrar::LIBRARY, strtolower($libraryName));
+                $libraryDir = $this->componentRegistrar->getPath(
+                    ComponentRegistrar::LIBRARY,
+                    strtolower($libraryName)
+                );
                 if ($libraryDir) {
                     array_shift($namespaceParts);
                 } else {
                     $libraryName = $vendor . '/' . $lib;
-                    $libraryDir = $componentRegistrar->getPath(ComponentRegistrar::LIBRARY, strtolower($libraryName));
+                    $libraryDir = $this->componentRegistrar->getPath(
+                        ComponentRegistrar::LIBRARY,
+                        strtolower($libraryName)
+                    );
                 }
             } else {
                 $lib = strtolower(preg_replace('/(.)([A-Z])/', "$1-$2", $lib));
                 $libraryName = $vendor . '/' . $lib;
-                $libraryDir = $componentRegistrar->getPath(ComponentRegistrar::LIBRARY, strtolower($libraryName));
+                $libraryDir = $this->componentRegistrar->getPath(
+                    ComponentRegistrar::LIBRARY,
+                    strtolower($libraryName)
+                );
             }
         }
         if ($libraryDir) {
             $fullPath = $libraryDir . '/' . implode('/', $namespaceParts) . '/' .
                 str_replace('\\', '/', $badClass) . '.php';
         }
+
         return $fullPath;
     }
 
     /**
-     * @param ComponentRegistrar $componentRegistrar
      * @param string $namespacePath
      * @param string $badClass
      * @param array $badClasses
      * @return bool
      */
-    private function removeSpecialCasesForAllOthers($componentRegistrar, $namespacePath, $badClass, &$badClasses)
+    private function removeSpecialCasesForAllOthers(string $namespacePath, string $badClass, array &$badClasses): bool
     {
         // Remove usage of classes that do NOT using fully-qualified class names (possibly under same namespace)
         $directories = [
@@ -571,16 +619,18 @@ private function removeSpecialCasesForAllOthers($componentRegistrar, $namespaceP
             BP . '/dev/tests/static/testsuite/',
             BP . '/setup/src/',
         ];
-        $libraryPaths = $componentRegistrar->getPaths(ComponentRegistrar::LIBRARY);
+        $libraryPaths = $this->componentRegistrar->getPaths(ComponentRegistrar::LIBRARY);
         $directories = array_merge($directories, $libraryPaths);
         // Full list of directories where there may be namespace classes
         foreach ($directories as $directory) {
             $fullPath = $directory . $namespacePath . '/' . str_replace('\\', '/', $badClass) . '.php';
             if (file_exists($fullPath)) {
                 unset($badClasses[array_search($badClass, $badClasses)]);
+
                 return true;
             }
         }
+
         return false;
     }
 
@@ -589,8 +639,9 @@ private function removeSpecialCasesForAllOthers($componentRegistrar, $namespaceP
      *
      * @param array $badClasses
      * @param string $file
+     * @return void
      */
-    protected function _assertClassReferences($badClasses, $file)
+    private function assertClassReferences(array $badClasses, string $file): void
     {
         if (empty($badClasses)) {
             return;
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 6752a98e38080..a42fe147303bb 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -35,22 +35,52 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
      */
     private static $objectManager;
 
+    /**
+     * @var string[]
+     */
+    private static $rootComposerModuleBlacklist = [];
+
+    /**
+     * @var string[]
+     */
+    private static $moduleNameBlacklist;
+
     public static function setUpBeforeClass()
     {
         self::$root = BP;
         self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'), true);
         self::$dependencies = [];
         self::$objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
+        // A block can be whitelisted and thus not be required to be public
+        self::$rootComposerModuleBlacklist = self::getBlacklist(
+            __DIR__ . '/_files/blacklist/composer_root_modules*.txt'
+        );
+        self::$moduleNameBlacklist = self::getBlacklist(__DIR__ . '/_files/blacklist/composer_module_names*.txt');
+    }
+
+    /**
+     * Return aggregated blacklist
+     *
+     * @param string $pattern
+     * @return string[]
+     */
+    public static function getBlacklist(string $pattern)
+    {
+        $blacklist = [];
+        foreach (glob($pattern) as $list) {
+            $blacklist = array_merge($blacklist, file($list, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES));
+        }
+        return $blacklist;
     }
 
     public function testValidComposerJson()
     {
         $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);
@@ -114,7 +144,7 @@ private function validateComposerJsonFile($path)
      */
     private function assertCodingStyle($contents)
     {
-        $this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: no space before colon.');
+        $this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: there should be no space before colon.');
         $this->assertNotRegExp('/":["{]/', $contents, 'Coding style: a space is necessary after colon.');
     }
 
@@ -131,7 +161,6 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
         $this->assertObjectHasAttribute('name', $json);
         $this->assertObjectHasAttribute('license', $json);
         $this->assertObjectHasAttribute('type', $json);
-        $this->assertObjectHasAttribute('version', $json);
         $this->assertObjectHasAttribute('require', $json);
         $this->assertEquals($packageType, $json->type);
         if ($packageType !== 'project') {
@@ -142,17 +171,21 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
         switch ($packageType) {
             case 'magento2-module':
                 $xml = simplexml_load_file("$dir/etc/module.xml");
-                $this->assertConsistentModuleName($xml, $json->name);
+                if ($this->isVendorMagento($json->name)) {
+                    $this->assertConsistentModuleName($xml, $json->name);
+                }
                 $this->assertDependsOnPhp($json->require);
                 $this->assertPhpVersionInSync($json->name, $json->require->php);
                 $this->assertDependsOnFramework($json->require);
                 $this->assertRequireInSync($json);
                 $this->assertAutoload($json);
+                $this->assertNoVersionSpecified($json);
                 break;
             case 'magento2-language':
                 $this->assertRegExp('/^magento\/language\-[a-z]{2}_([a-z]{4}_)?[a-z]{2}$/', $json->name);
                 $this->assertDependsOnFramework($json->require);
                 $this->assertRequireInSync($json);
+                $this->assertNoVersionSpecified($json);
                 break;
             case 'magento2-theme':
                 $this->assertRegExp('/^magento\/theme-(?:adminhtml|frontend)(\-[a-z0-9_]+)+$/', $json->name);
@@ -160,6 +193,7 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
                 $this->assertPhpVersionInSync($json->name, $json->require->php);
                 $this->assertDependsOnFramework($json->require);
                 $this->assertRequireInSync($json);
+                $this->assertNoVersionSpecified($json);
                 break;
             case 'magento2-library':
                 $this->assertDependsOnPhp($json->require);
@@ -167,15 +201,28 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
                 $this->assertPhpVersionInSync($json->name, $json->require->php);
                 $this->assertRequireInSync($json);
                 $this->assertAutoload($json);
+                $this->assertNoVersionSpecified($json);
                 break;
             case 'project':
                 $this->checkProject();
+                $this->assertNoVersionSpecified($json);
                 break;
             default:
                 throw new \InvalidArgumentException("Unknown package type {$packageType}");
         }
     }
 
+    /**
+     * Checks if package vendor is Magento.
+     *
+     * @param string $packageName
+     * @return bool
+     */
+    private function isVendorMagento(string $packageName): bool
+    {
+        return strpos($packageName, 'magento/') === 0;
+    }
+
     /**
      * Assert that component registrar is autoloaded in composer json
      *
@@ -191,6 +238,19 @@ private function assertAutoloadRegistrar(\StdClass $json, $dir)
         $this->assertFileExists("$dir/registration.php");
     }
 
+    /**
+     * Version must not be specified in the root and package composer JSON files in Git.
+     *
+     * All versions are added by tools during release publication by version setter tool.
+     *
+     * @param \StdClass $json
+     */
+    private function assertNoVersionSpecified(\StdClass $json)
+    {
+        $errorMessage = 'Version must not be specified in the root and package composer JSON files in Git';
+        $this->assertObjectNotHasAttribute('version', $json, $errorMessage);
+    }
+
     /**
      * Assert that there is PSR-4 autoload in composer json
      *
@@ -222,13 +282,15 @@ private function assertNoMap(\StdClass $json)
      */
     private function assertConsistentModuleName(\SimpleXMLElement $xml, $packageName)
     {
-        $moduleName = (string)$xml->module->attributes()->name;
-        $expectedPackageName = $this->convertModuleToPackageName($moduleName);
-        $this->assertEquals(
-            $expectedPackageName,
-            $packageName,
-            "For the module '{$moduleName}', the expected package name is '{$expectedPackageName}'"
-        );
+        if (!in_array($packageName, self::$moduleNameBlacklist)) {
+            $moduleName = (string)$xml->module->attributes()->name;
+            $expectedPackageName = $this->convertModuleToPackageName($moduleName);
+            $this->assertEquals(
+                $expectedPackageName,
+                $packageName,
+                "For the module '{$moduleName}', the expected package name is '{$expectedPackageName}'"
+            );
+        }
     }
 
     /**
@@ -264,12 +326,24 @@ private function assertDependsOnFramework(\StdClass $json)
     private function assertPhpVersionInSync($name, $phpVersion)
     {
         if (isset(self::$rootJson['require']['php'])) {
-            $this->assertEquals(
-                self::$rootJson['require']['php'],
-                $phpVersion,
-                "PHP version {$phpVersion} in component {$name} is inconsistent with version "
-                . self::$rootJson['require']['php'] . ' in root composer.json'
-            );
+            if ($this->isVendorMagento($name)) {
+                $this->assertEquals(
+                    self::$rootJson['require']['php'],
+                    $phpVersion,
+                    "PHP version {$phpVersion} in component {$name} is inconsistent with version "
+                    . self::$rootJson['require']['php'] . ' in root composer.json'
+                );
+            } else {
+                $composerVersionsPattern = '{\s*\|\|?\s*}';
+                $rootPhpVersions = preg_split($composerVersionsPattern, self::$rootJson['require']['php']);
+                $modulePhpVersions = preg_split($composerVersionsPattern, $phpVersion);
+
+                $this->assertEmpty(
+                    array_diff($rootPhpVersions, $modulePhpVersions),
+                    "PHP version {$phpVersion} in component {$name} is inconsistent with version "
+                    . self::$rootJson['require']['php'] . ' in root composer.json'
+                );
+            }
         }
     }
 
@@ -277,36 +351,48 @@ private function assertPhpVersionInSync($name, $phpVersion)
      * Make sure requirements of components are reflected in root composer.json
      *
      * @param \StdClass $json
+     * @return void
      */
     private function assertRequireInSync(\StdClass $json)
     {
-        $name = $json->name;
         if (preg_match('/magento\/project-*/', self::$rootJson['name']) == 1) {
             return;
         }
-        if (isset($json->require)) {
-            $errors = [];
-            foreach (array_keys((array)$json->require) as $depName) {
-                if ($depName == 'magento/magento-composer-installer') {
-                    // Magento Composer Installer is not needed for already existing components
-                    continue;
-                }
-                if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
-                    && !isset(self::$rootJson['replace'][$depName])) {
-                    $errors[] = "'$name' depends on '$depName'";
-                }
+        if (!in_array($json->name, self::$rootComposerModuleBlacklist) && isset($json->require)) {
+            $this->checkPackageInRootComposer($json);
+        }
+    }
+
+    /**
+     * Check if package is reflected in root composer.json
+     *
+     * @param \StdClass $json
+     * @return void
+     */
+    private function checkPackageInRootComposer(\StdClass $json)
+    {
+        $name = $json->name;
+        $errors = [];
+        foreach (array_keys((array)$json->require) as $depName) {
+            if ($depName == 'magento/magento-composer-installer') {
+                // Magento Composer Installer is not needed for already existing components
+                continue;
             }
-            if (!empty($errors)) {
-                $this->fail(
-                    "The following dependencies are missing in root 'composer.json',"
-                    . " while declared in child components.\n"
-                    . "Consider adding them to 'require-dev' section (if needed for child components only),"
-                    . " to 'replace' section (if they are present in the project),"
-                    . " to 'require' section (if needed for the skeleton).\n"
-                    . join("\n", $errors)
-                );
+            if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
+                && !isset(self::$rootJson['replace'][$depName])) {
+                $errors[] = "'$name' depends on '$depName'";
             }
         }
+        if (!empty($errors)) {
+            $this->fail(
+                "The following dependencies are missing in root 'composer.json',"
+                . " while declared in child components.\n"
+                . "Consider adding them to 'require-dev' section (if needed for child components only),"
+                . " to 'replace' section (if they are present in the project),"
+                . " to 'require' section (if needed for the skeleton).\n"
+                . join("\n", $errors)
+            );
+        }
     }
 
     /**
@@ -336,7 +422,8 @@ public function testComponentPathsInRoot()
             "If there are any component paths specified, then they must be reflected in 'replace' section"
         );
         $flat = $this->getFlatPathsInfo(self::$rootJson['extra']['component_paths']);
-        while (list(, list($component, $path)) = each($flat)) {
+        foreach ($flat as $item) {
+            list($component, $path) = $item;
             $this->assertFileExists(
                 self::$root . '/' . $path,
                 "Missing or invalid component path: {$component} -> {$path}"
@@ -400,7 +487,11 @@ private function checkProject()
                 }
             }
             sort($dependenciesListed);
-            $nonDeclaredDependencies = array_diff(self::$dependencies, $dependenciesListed);
+            $nonDeclaredDependencies = array_diff(
+                self::$dependencies,
+                $dependenciesListed,
+                self::$rootComposerModuleBlacklist
+            );
             $nonexistentDependencies = array_diff($dependenciesListed, self::$dependencies);
             $this->assertEmpty(
                 $nonDeclaredDependencies,
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 5c3f627ca35f2..a4113abed8030 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\TestFramework\Dependency\DbRule;
+use Magento\TestFramework\Dependency\DeclarativeSchemaRule;
 use Magento\TestFramework\Dependency\DiRule;
 use Magento\TestFramework\Dependency\LayoutRule;
 use Magento\TestFramework\Dependency\PhpRule;
@@ -19,6 +20,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DependencyTest extends \PHPUnit\Framework\TestCase
 {
@@ -54,6 +56,17 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_listConfigXml = [];
 
+    /**
+     * List of db_schema.xml files by modules
+     *
+     * Format: array(
+     *  '{Module_Name}' => '{Filename}'
+     * )
+     *
+     * @var array
+     */
+    protected static $_listDbSchemaXml = [];
+
     /**
      * List of routes.xml files by modules
      *
@@ -112,7 +125,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
      * )))
      * @var array
      */
-    protected static $_mapDependencies = [];
+    protected static $mapDependencies = [];
 
     /**
      * Regex pattern for validation file path of theme
@@ -161,6 +174,7 @@ public static function setUpBeforeClass()
         self::$_namespaces = implode('|', Files::init()->getNamespaces());
 
         self::_prepareListConfigXml();
+        self::_prepareListDbSchemaXml();
         self::_prepareListRoutesXml();
 
         self::_prepareMapRouters();
@@ -216,6 +230,7 @@ protected static function _initRules()
             $dbRuleTables = array_merge($dbRuleTables, @include $fileName);
         }
         self::$_rulesInstances = [
+            new DeclarativeSchemaRule($dbRuleTables),
             new PhpRule(self::$_mapRouters, self::$_mapLayoutBlocks),
             new DbRule($dbRuleTables),
             new LayoutRule(
@@ -246,6 +261,7 @@ protected function _getCleanedFileContents($fileType, $file)
                 break;
             case 'layout':
             case 'config':
+            case 'db_schema':
                 //Removing xml comments
                 $contents = preg_replace('~\<!\-\-/.*?\-\-\>~s', '', $contents);
                 break;
@@ -395,7 +411,7 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
             $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $module);
         }
 
-        $this->_addDependencies($currentModule, $type, self::MAP_TYPE_FOUND, $nsModule);
+        $this->addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $nsModule);
     }
 
     /**
@@ -406,9 +422,12 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
      */
     public function collectRedundant()
     {
-        foreach (array_keys(self::$_mapDependencies) as $module) {
+        foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-            $found = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+            $found = array_merge(
+                $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
+                $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND)
+            );
             $found['Magento\Framework'] = 'Magento\Framework';
             $this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
         }
@@ -422,7 +441,7 @@ public function collectRedundant()
     public function testRedundant()
     {
         $output = [];
-        foreach (array_keys(self::$_mapDependencies) as $module) {
+        foreach (array_keys(self::$mapDependencies) as $module) {
             $result = [];
             $redundant = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT);
             if (count($redundant)) {
@@ -489,6 +508,12 @@ public function getAllFiles()
             $this->_prepareFiles('config', Files::init()->getConfigFiles())
         );
 
+        // Get all configuration files
+        $files = array_merge(
+            $files,
+            $this->_prepareFiles('db_schema', Files::init()->getDbSchemaFiles())
+        );
+
         //Get all layout updates files
         $files = array_merge(
             $files,
@@ -505,7 +530,7 @@ public function getAllFiles()
     }
 
     /**
-     * Prepare list of config.xml files (by modules)
+     * Prepare list of config.xml files (by modules).
      */
     protected static function _prepareListConfigXml()
     {
@@ -518,6 +543,20 @@ protected static function _prepareListConfigXml()
         }
     }
 
+    /**
+     * Prepare list of db_schema.xml files (by modules)
+     */
+    protected static function _prepareListDbSchemaXml()
+    {
+        $files = Files::init()->getDbSchemaFiles('db_schema.xml', [], false);
+        foreach ($files as $file) {
+            if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
+                $module = $matches['namespace'] . '\\' . $matches['module'];
+                self::$_listDbSchemaXml[$module] = $file;
+            }
+        }
+    }
+
     /**
      * Prepare list of routes.xml files (by modules)
      */
@@ -649,37 +688,40 @@ protected static function _getTypes()
      * Converts a composer json component name into the Magento Module form
      *
      * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
+     * @param array $packageModuleMap Mapping package name with module namespace.
      * @return string The corresponding Magento Module e.g. 'Magento\Theme'
      */
-    protected static function convertModuleName($jsonName)
+    protected static function convertModuleName(string $jsonName, array $packageModuleMap): string
     {
-        if (strpos($jsonName, 'magento/module') !== false) {
-            $moduleName = str_replace('-', ' ', $jsonName);
-            $moduleName = ucwords($moduleName);
-            $moduleName = str_replace('module ', '', $moduleName);
-            $moduleName = str_replace(' ', '', $moduleName);
-            $moduleName = str_replace('/', '\\', $moduleName);
-            return $moduleName;
-        } elseif (strpos($jsonName, 'magento/magento') !== false || strpos($jsonName, 'magento/framework') !== false) {
+        if (isset($packageModuleMap[$jsonName])) {
+            return $packageModuleMap[$jsonName];
+        }
+
+        if (strpos($jsonName, 'magento/magento') !== false || strpos($jsonName, 'magento/framework') !== false) {
             $moduleName = str_replace('/', "\t", $jsonName);
             $moduleName = str_replace('framework-', "Framework\t", $moduleName);
             $moduleName = str_replace('-', ' ', $moduleName);
             $moduleName = ucwords($moduleName);
             $moduleName = str_replace("\t", '\\', $moduleName);
             $moduleName = str_replace(' ', '', $moduleName);
+
             return $moduleName;
         }
+
         return $jsonName;
     }
 
     /**
-     * Initialise map of dependencies
+     * Initialise map of dependencies.
      *
+     * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Exception
      */
     protected static function _initDependencies()
     {
+        $packageModuleMap = self::getPackageModuleMapping();
         $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
         foreach ($jsonFiles as $file) {
             $contents = file_get_contents($file);
@@ -688,12 +730,13 @@ protected static function _initDependencies()
                 throw new \Exception("Invalid Json: $file");
             }
             $json = new \Magento\Framework\Config\Composer\Package(json_decode($contents));
-            $moduleName = self::convertModuleName($json->get('name'));
-            self::$_mapDependencies[$moduleName] = @(self::$_mapDependencies[$moduleName] ?: []);
-
+            $moduleName = self::convertModuleName($json->get('name'), $packageModuleMap);
+            if (!isset(self::$mapDependencies[$moduleName])) {
+                self::$mapDependencies[$moduleName] = [];
+            }
             foreach (self::_getTypes() as $type) {
-                if (!isset(self::$_mapDependencies[$moduleName][$type])) {
-                    self::$_mapDependencies[$moduleName][$type] = [
+                if (!isset(self::$mapDependencies[$moduleName][$type])) {
+                    self::$mapDependencies[$moduleName][$type] = [
                         self::MAP_TYPE_DECLARED  => [],
                         self::MAP_TYPE_FOUND     => [],
                         self::MAP_TYPE_REDUNDANT => [],
@@ -701,59 +744,86 @@ protected static function _initDependencies()
                 }
             }
 
-            $require = $json->get('require');
-            if (isset($require) && !empty($require)) {
-                foreach ($require as $requiredModule => $version) {
-                    if (0 === strpos($requiredModule, 'magento/')
-                        && 'magento/magento-composer-installer' != $requiredModule
-                    ) {
-                        $type = self::TYPE_HARD;
-                        self::_addDependencies(
-                            $moduleName,
-                            $type,
-                            self::MAP_TYPE_DECLARED,
-                            self::convertModuleName($requiredModule)
-                        );
-                    }
-                }
-            }
-            $suggest = $json->get('suggest');
-            if (isset($suggest) && !empty($suggest)) {
-                foreach ($suggest as $requiredModule => $version) {
-                    if (0 === strpos($requiredModule, 'magento/')
-                        && 'magento/magento-composer-installer' != $requiredModule
-                    ) {
-                        $type = self::TYPE_SOFT;
-                        self::_addDependencies(
-                            $moduleName,
-                            $type,
-                            self::MAP_TYPE_DECLARED,
-                            self::convertModuleName($requiredModule)
-                        );
-                    }
-                }
-            }
+            $require = array_keys((array)$json->get('require'));
+            self::addDependencies($moduleName, $require, self::TYPE_HARD, $packageModuleMap);
+
+            $suggest = array_keys((array)$json->get('suggest'));
+            self::addDependencies($moduleName, $suggest, self::TYPE_SOFT, $packageModuleMap);
         }
     }
 
     /**
-     * Add dependency map items
+     * Add dependencies to dependency list.
      *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @param $dependencies
+     * @param string $moduleName
+     * @param array $packageNames
+     * @param string $type
+     * @param array $packageModuleMap
+     *
+     * @return void
      */
-    protected static function _addDependencies($module, $type, $mapType, $dependencies)
+    private static function addDependencies(
+        string $moduleName,
+        array $packageNames,
+        string $type,
+        array $packageModuleMap
+    ): void {
+        $packageNames = array_filter($packageNames, function ($packageName) use ($packageModuleMap) {
+            return isset($packageModuleMap[$packageName]) ||
+                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
+        });
+
+        foreach ($packageNames as $packageName) {
+            self::addDependency(
+                $moduleName,
+                $type,
+                self::MAP_TYPE_DECLARED,
+                self::convertModuleName($packageName, $packageModuleMap)
+            );
+        }
+    }
+
+    /**
+     * Add dependency map items.
+     *
+     * @param string $module
+     * @param string $type
+     * @param string $mapType
+     * @param string $dependency
+     *
+     * @return void
+     */
+    private static function addDependency(string $module, string $type, string $mapType, string $dependency): void
     {
-        if (!is_array($dependencies)) {
-            $dependencies = [$dependencies];
+        if (isset(self::$mapDependencies[$module][$type][$mapType])) {
+            self::$mapDependencies[$module][$type][$mapType][$dependency] = $dependency;
         }
-        foreach ($dependencies as $dependency) {
-            if (isset(self::$_mapDependencies[$module][$type][$mapType])) {
-                self::$_mapDependencies[$module][$type][$mapType][$dependency] = $dependency;
+    }
+
+    /**
+     * Returns package name on module name mapping.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private static function getPackageModuleMapping(): array
+    {
+        $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+
+        $packageModuleMapping = [];
+        foreach ($jsonFiles as $file) {
+            $contents = file_get_contents($file);
+            $composerJson = json_decode($contents);
+            if (null == $composerJson) {
+                throw new \Exception("Invalid Json: $file");
             }
+            $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
+            $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
+            $packageName = $composerJson->name;
+            $packageModuleMapping[$packageName] = $moduleName;
         }
+
+        return $packageModuleMapping;
     }
 
     /**
@@ -766,9 +836,10 @@ protected static function _addDependencies($module, $type, $mapType, $dependenci
      */
     protected function _getDependencies($module, $type, $mapType)
     {
-        if (isset(self::$_mapDependencies[$module][$type][$mapType])) {
-            return self::$_mapDependencies[$module][$type][$mapType];
+        if (isset(self::$mapDependencies[$module][$type][$mapType])) {
+            return self::$mapDependencies[$module][$type][$mapType];
         }
+
         return [];
     }
 
@@ -785,8 +856,8 @@ protected function _setDependencies($module, $type, $mapType, $dependencies)
         if (!is_array($dependencies)) {
             $dependencies = [$dependencies];
         }
-        if (isset(self::$_mapDependencies[$module][$type][$mapType])) {
-            self::$_mapDependencies[$module][$type][$mapType] = $dependencies;
+        if (isset(self::$mapDependencies[$module][$type][$mapType])) {
+            self::$mapDependencies[$module][$type][$mapType] = $dependencies;
         }
     }
 
@@ -798,6 +869,6 @@ protected function _setDependencies($module, $type, $mapType, $dependencies)
      */
     protected function _isFake($module)
     {
-        return isset(self::$_mapDependencies[$module]) ? false : true;
+        return isset(self::$mapDependencies[$module]) ? false : true;
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
index ec255b90a349f..42ef12072a91b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -62,6 +62,11 @@ class CompilerTest extends \PHPUnit\Framework\TestCase
      */
     protected $pluginValidator;
 
+    /**
+     * @var string[]|null
+     */
+    private $pluginBlacklist;
+
     protected function setUp()
     {
         $this->_shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());
@@ -107,6 +112,31 @@ protected function setUp()
         $this->pluginValidator = new PluginValidator(new InterfaceValidator());
     }
 
+    /**
+     * Return plugin blacklist class names
+     *
+     * @return string[]
+     */
+    private function getPluginBlacklist(): array
+    {
+        if ($this->pluginBlacklist === null) {
+            $blacklistFiles = str_replace(
+                '\\',
+                '/',
+                realpath(__DIR__) . '/../_files/blacklist/compiler_plugins*.txt'
+            );
+            $blacklistItems = [];
+            foreach (glob($blacklistFiles) as $fileName) {
+                $blacklistItems = array_merge(
+                    $blacklistItems,
+                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+                );
+            }
+            $this->pluginBlacklist = $blacklistItems;
+        }
+        return $this->pluginBlacklist;
+    }
+
     /**
      * Validate DI config file
      *
@@ -360,6 +390,7 @@ protected function validatePlugins($plugin, $type)
      * Get application plugins
      *
      * @return array
+     * @throws \Exception
      */
     protected function pluginDataProvider()
     {
@@ -376,8 +407,10 @@ protected function pluginDataProvider()
                 $type = \Magento\Framework\App\Utility\Classes::resolveVirtualType($type);
                 if ($node->attributes->getNamedItem('type')) {
                     $plugin = $node->attributes->getNamedItem('type')->nodeValue;
-                    $plugin = \Magento\Framework\App\Utility\Classes::resolveVirtualType($plugin);
-                    $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];
+                    if (!in_array($plugin, $this->getPluginBlacklist())) {
+                        $plugin = \Magento\Framework\App\Utility\Classes::resolveVirtualType($plugin);
+                        $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];
+                    }
                 }
             }
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ExceptionHierarchyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ExceptionHierarchyTest.php
deleted file mode 100644
index 7556ab2c1b47c..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ExceptionHierarchyTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Test\Integrity;
-
-use Magento\Framework\App\Utility\Files as UtilityFiles;
-
-/**
- * Checks that all Exceptions inherit LocalizedException
- */
-class ExceptionHierarchyTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @param \ReflectionClass $reflectionException
-     * @dataProvider isInheritedLocalizedExceptionDataProvider
-     */
-    public function testIsInheritedLocalizedException(\ReflectionClass $reflectionException)
-    {
-        $this->assertTrue(
-            $reflectionException->isSubclassOf(\Magento\Framework\Exception\LocalizedException::class),
-            "{$reflectionException->name} is not inherited LocalizedException"
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function isInheritedLocalizedExceptionDataProvider()
-    {
-        $files = UtilityFiles::init()->getPhpFiles(UtilityFiles::INCLUDE_APP_CODE | UtilityFiles::INCLUDE_LIBS);
-        $blacklistExceptions = $this->getBlacklistExceptions();
-
-        $data = [];
-        foreach ($files as $file) {
-            $className = $this->convertPathToClassName($file);
-            try {
-                $reflectionClass = new \ReflectionClass($className);
-                if ($reflectionClass->isSubclassOf('Exception') && !in_array($className, $blacklistExceptions)) {
-                    $data[$className] = [$reflectionClass];
-                }
-            } catch (\Exception $e) {
-                $this->fail("File name and class name '{$className}' is not appropriate");
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @param string $filePath
-     * @return string
-     */
-    protected function convertPathToClassName($filePath)
-    {
-        $componentRegistrar = new \Magento\Framework\Component\ComponentRegistrar();
-        $foundItems = null;
-        $moduleNamespace = null;
-        $foundItems = array_filter(
-            $componentRegistrar->getPaths(\Magento\Framework\Component\ComponentRegistrar::MODULE),
-            function ($item) use ($filePath) {
-                if (strpos($filePath, $item . '/') !== false) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        );
-        if ($foundItems) {
-            $moduleNamespace = str_replace('_', '\\', array_keys($foundItems)[0]);
-            $classPath = str_replace('/', '\\', str_replace(array_shift($foundItems), '', $filePath));
-        } else {
-            $foundItems = array_filter(
-                $componentRegistrar->getPaths(\Magento\Framework\Component\ComponentRegistrar::LIBRARY),
-                function ($item) use ($filePath) {
-                    if (strpos($filePath, $item . '/') !== false) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-            );
-            $libName = array_keys($foundItems)[0];
-            $libName = str_replace('framework-', 'framework/', $libName);
-            $namespaceParts = explode('/', $libName);
-            $namespaceParts = array_map(
-                function ($item) {
-                    return str_replace(' ', '', ucwords(str_replace('-', ' ', $item)));
-                },
-                $namespaceParts
-            );
-            $moduleNamespace = implode('\\', $namespaceParts);
-            $classPath = str_replace('/', '\\', str_replace(array_shift($foundItems), '', $filePath));
-        }
-
-        $className = '\\' . $moduleNamespace . $classPath;
-        $className = str_replace('.php', '', $className);
-        return $className;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getBlacklistExceptions()
-    {
-        $blacklistFiles = str_replace('\\', '/', realpath(__DIR__)) . '/_files/blacklist/exception_hierarchy*.txt';
-        $exceptions = [];
-        foreach (glob($blacklistFiles) as $fileName) {
-            $exceptions = array_merge($exceptions, file($fileName, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES));
-        }
-        return $exceptions;
-    }
-}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
index e33b771b3c645..c552e0daa97df 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
@@ -47,6 +47,24 @@ class HhvmCompatibilityTest extends \PHPUnit\Framework\TestCase
         'serialize_precision',
     ];
 
+    /**
+     * Whitelist of variables allowed in files.
+     *
+     * @var array
+     */
+    private $whitelistVarsInFiles = [
+        'max_input_vars' => [
+            'integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php',
+            'integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php',
+        ]
+    ];
+
+    /**
+     * Test allowed directives.
+     *
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
     public function testAllowedIniGetSetDirectives()
     {
         $deniedDirectives = [];
@@ -55,7 +73,19 @@ public function testAllowedIniGetSetDirectives()
             if ($fileDirectives) {
                 $fileDeniedDirectives = array_diff($fileDirectives, $this->allowedDirectives);
                 if ($fileDeniedDirectives) {
-                    $deniedDirectives[$file] = array_unique($fileDeniedDirectives);
+                    $deniedDirectivesInFile = array_unique($fileDeniedDirectives);
+                    foreach ($deniedDirectivesInFile as $key => $deniedDirective) {
+                        if (isset($this->whitelistVarsInFiles[$deniedDirective])) {
+                            foreach ($this->whitelistVarsInFiles[$deniedDirective] as $whitelistFile) {
+                                if (strpos($file, $whitelistFile) !== false) {
+                                    unset($deniedDirectivesInFile[$key]);
+                                }
+                            }
+                        }
+                    }
+                    if ($deniedDirectivesInFile) {
+                        $deniedDirectives[$file] = $deniedDirectivesInFile;
+                    }
                 }
             }
         }
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 ec1d719df2e5e..3bbada60fc4b9 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 f2370005afba2..3de3d85a222e3 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/Library/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
index 81088522bccb2..a4baacbe4d169 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
@@ -96,35 +96,6 @@ function ($file) {
         );
     }
 
-    public function testAppCodeUsage()
-    {
-        $files = Files::init();
-        $componentRegistrar = new ComponentRegistrar();
-        $libPaths = $componentRegistrar->getPaths(ComponentRegistrar::LIBRARY);
-        $invoker = new AggregateInvoker($this);
-        $invoker(
-            function ($file) use ($libPaths) {
-                $content = file_get_contents($file);
-                foreach ($libPaths as $libPath) {
-                    if (strpos($file, $libPath) === 0) {
-                        $this->assertSame(
-                            0,
-                            preg_match('~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS', $content),
-                            'Function __() is defined outside of the library and must not be used there. ' .
-                            'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
-                        );
-                    }
-                }
-            },
-            $files->getPhpFiles(
-                Files::INCLUDE_PUB_CODE |
-                Files::INCLUDE_LIBS |
-                Files::AS_DATA_SET |
-                Files::INCLUDE_NON_CLASSES
-            )
-        );
-    }
-
     /**
      * @inheritdoc
      */
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 620b6ad21bf75..46bdd3dd666df 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
@@ -31,7 +31,7 @@ class ControllerAclTest extends \PHPUnit\Framework\TestCase
      *
      * @var array
      */
-    private $whiteListetBackendControllers = [];
+    private $whiteListedBackendControllers = [];
 
     /**
      * List of ACL resources collected from acl.xml files.
@@ -57,7 +57,7 @@ protected function setUp()
             if (substr($item, 0, 1) === '#') {
                 continue;
             }
-            $this->whiteListetBackendControllers[$item] = 1;
+            $this->whiteListedBackendControllers[$item] = 1;
         }
     }
 
@@ -83,7 +83,7 @@ public function testAcl()
 
             $controllerClass = $this->getClassByFilePath($controllerPath);
             // skip whitelisted controllers.
-            if (isset($this->whiteListetBackendControllers[$controllerClass->getName()])) {
+            if (isset($this->whiteListedBackendControllers[$controllerClass->getName()])) {
                 continue;
             }
             // we don't have to check abstract classes.
@@ -97,7 +97,7 @@ public function testAcl()
                 $inheritanceMessage = "Backend controller $className have to inherit " . AbstractAction::class;
                 $errorMessages[] = $inheritanceMessage;
                 continue;
-            };
+            }
 
             $isAclRedefinedInTheChildClass = $this->isConstantOverwritten($controllerClass)
                 || $this->isMethodOverwritten($controllerClass);
@@ -148,10 +148,10 @@ private function getAclResources()
         if ($this->aclResources !== null) {
             return $this->aclResources;
         }
-        $aclFiles = array_keys(Files::init()->getConfigFiles('acl.xml', []));
+        $aclFiles = Files::init()->getConfigFiles('acl.xml', []);
         $xmlResources = [];
         array_map(function ($file) use (&$xmlResources) {
-            $config = simplexml_load_file($file);
+            $config = simplexml_load_file($file[0]);
             $nodes = $config->xpath('.//resource/@id') ?: [];
             foreach ($nodes as $node) {
                 $xmlResources[(string)$node] = $node;
@@ -232,8 +232,8 @@ 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 (preg_match('~(Magento\/[^\/]+\/Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
+            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 90e7ec138bff7..1119824f217bb 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,8 @@ 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
+Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Bulk\BulkPageProcessor
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 a0c1f53cd169e..571ed4afbb6ce 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/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
index 1563abcaf8bd1..0fd245561e6be 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
@@ -1,2 +1,3 @@
 module Magento_Payment Model/Info.php
-module Magento_Customer Model/Address/AbstractAddress.php
\ No newline at end of file
+module Magento_Customer Model/Address/AbstractAddress.php
+library magento/framework MessageQueue/Rpc/Publisher.php
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
index 22ac7a34ce81e..6dd9d2f2bddfd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -22,11 +22,42 @@ class PublicCodeTest extends \PHPUnit\Framework\TestCase
         '$this', 'void', 'string', 'int', 'bool', 'boolean', 'integer', 'null'
     ];
 
+    /**
+     * @var string[]|null
+     */
+    private $blockWhitelist;
+
+    /**
+     * Return whitelist class names
+     *
+     * @return string[]
+     */
+    private function getWhitelist(): array
+    {
+        if ($this->blockWhitelist === null) {
+            $whiteListFiles = str_replace(
+                '\\',
+                '/',
+                realpath(__DIR__) . '/_files/whitelist/public_code*.txt'
+            );
+            $whiteListItems = [];
+            foreach (glob($whiteListFiles) as $fileName) {
+                $whiteListItems = array_merge(
+                    $whiteListItems,
+                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+                );
+            }
+            $this->blockWhitelist = $whiteListItems;
+        }
+        return $this->blockWhitelist;
+    }
+
     /**
      * Since blocks can be referenced from templates, they should be stable not to break theme customizations.
      * So all blocks should be @api annotated. This test checks that all blocks declared in layout files are public
      *
      * @param $layoutFile
+     * @throws \ReflectionException
      * @dataProvider layoutFilesDataProvider
      */
     public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
@@ -37,7 +68,7 @@ public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
         /** @var $node \SimpleXMLElement */
         foreach ($elements as $node) {
             $class = (string) $node['class'];
-            if ($class && \class_exists($class)) {
+            if ($class && \class_exists($class) && !in_array($class, $this->getWhitelist())) {
                 $reflection = (new \ReflectionClass($class));
                 if (strpos($reflection->getDocComment(), '@api') === false) {
                     $nonPublishedBlocks[] = $class;
@@ -47,7 +78,7 @@ public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
         if (count($nonPublishedBlocks)) {
             $this->fail(
                 "Layout file '$layoutFile' uses following blocks that are not marked with @api annotation:\n"
-                . implode(",\n", $nonPublishedBlocks)
+                . implode(",\n", array_unique($nonPublishedBlocks))
             );
         }
     }
@@ -56,6 +87,7 @@ public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
      * Find all layout update files in magento modules and themes.
      *
      * @return array
+     * @throws \Exception
      */
     public function layoutFilesDataProvider()
     {
@@ -68,8 +100,8 @@ public function layoutFilesDataProvider()
      * This test walks through all public PHP types and makes sure that all their method arguments
      * and return values are public types.
      *
-     *
      * @param string $class
+     * @throws \ReflectionException
      * @dataProvider publicPHPTypesDataProvider
      */
     public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
@@ -102,7 +134,7 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
         if (count($nonPublishedClasses)) {
             $this->fail(
                 "Public type '" . $class . "' references following non-public types:\n"
-                . implode("\n", $nonPublishedClasses)
+                . implode("\n", array_unique($nonPublishedClasses))
             );
         }
     }
@@ -110,6 +142,7 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
     /**
      * Retrieve list of all interfaces and classes in Magento codebase that are marked with @api annotation.
      * @return array
+     * @throws \Exception
      */
     public function publicPHPTypesDataProvider()
     {
@@ -119,7 +152,9 @@ public function publicPHPTypesDataProvider()
             $fileContents = \file_get_contents($file);
             if (strpos($fileContents, '@api') !== false) {
                 foreach ($this->getDeclaredClassesAndInterfaces($file) as $class) {
-                    if (class_exists($class->getName()) || interface_exists($class->getName())) {
+                    if (!in_array($class->getName(), $this->getWhitelist())
+                        && (class_exists($class->getName()) || interface_exists($class->getName()))
+                    ) {
                         $result[$class->getName()] = [$class->getName()];
                     }
                 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php
index 3ba5b26615af6..8e33698ec15d7 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 6a2a63f65d986..69443544febfd 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);
@@ -68,7 +68,7 @@ public function getXmlFiles()
         $componentRegistrar = new ComponentRegistrar();
         $codeXml = [];
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $modulePath) {
-            $codeXml = array_merge($codeXml, $this->_getFiles($modulePath, '*.xml', '/.\/Test\/Unit\/./'));
+            $codeXml = array_merge($codeXml, $this->_getFiles($modulePath, '*.xml', '/.\/Test\/./'));
         }
         $this->_filterSpecialCases($codeXml);
         $designXml = [];
@@ -105,9 +105,11 @@ private function _filterSpecialCases(&$files)
         $list = [
             '#etc/countries.xml$#',
             '#conf/schema.xml$#',
-            '#conf/solrconfig.xml$#',
             '#layout/swagger_index_index.xml$#',
-            '#Doc/etc/doc/vars.xml$#'
+            '#Doc/etc/doc/vars.xml$#',
+            '#phpunit.xml$#',
+            '#etc/db_schema.xml$#',
+            '#Test/Mftf#',
         ];
         foreach ($list as $pattern) {
             foreach ($files as $key => $value) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt
index 9d7a09f75c2ac..8eb3392476400 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt
@@ -10,3 +10,6 @@
 \Magento\Framework\DB\DataConverter\DataConversionException
 \Magento\Framework\DB\FieldDataConversionException
 \Magento\Catalog\Model\Product\Image\NotLoadInfoImageException
+\Magento\Signifyd\Model\SignifydGateway\GatewayException
+\Magento\Signifyd\Model\SignifydGateway\ApiCallException
+\Magento\Framework\MessageQueue\ConnectionLostException
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
index 74493c4dc69a3..8920d44e04319 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
@@ -1,8 +1,6 @@
 PEAR_PackageFile
 Simple_Xml
 PersistentCustomerSegmentation
-SolrClient
-SolrQuery
 RegionUpdater
 Fixture_Module
 TheCompoundNamespace_TheCompoundModule
@@ -32,22 +30,23 @@ TestSuite
 DbTest
 Model1
 Model3
-\Magento\Wonderland\Api\Data\FakeRegionInterface
-\Magento\Wonderland\Api\Data\FakeAddressInterface
-\Magento\Wonderland\Api\Data\FakeExtensibleOneInterface
-\Magento\Wonderland\Api\Data\FakeExtensibleTwoInterface
-\Magento\Wonderland\Api\Data\FakeAttributeMetadataInterface
-\Magento\Wonderland\Api\Data\FakeCustomerInterface
-\Magento\Wonderland\Model\Data\FakeRegion
-\Magento\Wonderland\Model\Data\FakeAddress
-\Magento\Wonderland\Model\Data\FakeAttributeMetadata
-\Magento\Wonderland\Model\Data\FakeCustomer
-\Magento\Wonderland\Model\Data\FakeExtensibleOne
-\Magento\Wonderland\Model\Data\FakeExtensibleTwo
+\Magento\TestModuleExtensionAttributes\Api\Data\FakeRegionInterface
+\Magento\TestModuleExtensionAttributes\Api\Data\FakeAddressInterface
+\Magento\TestModuleExtensionAttributes\Api\Data\FakeExtensibleOneInterface
+\Magento\TestModuleExtensionAttributes\Api\Data\FakeExtensibleTwoInterface
+\Magento\TestModuleExtensionAttributes\Api\Data\FakeAttributeMetadataInterface
+\Magento\TestModuleExtensionAttributes\Api\Data\FakeCustomerInterface
+\Magento\TestModuleExtensionAttributes\Model\Data\FakeRegion
+\Magento\TestModuleExtensionAttributes\Model\Data\FakeAddress
+\Magento\TestModuleExtensionAttributes\Model\Data\FakeAttributeMetadata
+\Magento\TestModuleExtensionAttributes\Model\Data\FakeCustomer
+\Magento\TestModuleExtensionAttributes\Model\Data\FakeExtensibleOne
+\Magento\TestModuleExtensionAttributes\Model\Data\FakeExtensibleTwo
 \Magento\Framework\Error\Processor
 \Magento\TestModule3\Service\V1\Entity\Parameter
 \Magento\TestModule3\Service\V1\Entity\ParameterBuilder
 \Magento\TestModuleMSC\Api\Data\ItemInterface
+\Magento\TestModuleGraphQlQuery\Api\Data\ItemInterface
 \Magento\TestModule5\Service\V1\Entity\AllSoapAndRest
 \Magento\TestModule5\Service\V2\Entity\AllSoapAndRest
 \Magento\TestModule5\Service\V2\Entity\AllSoapAndRestBuilder
@@ -121,4 +120,8 @@ DoubleColon
 \Magento\Mtf\Client\ElementInterface
 BarFactory
 PartialNamespace\BarFactory
-Product\OptionFactory
\ No newline at end of file
+Product\OptionFactory
+Magento_Module
+Magento_Framework
+Magento_TestModule
+Magento_Test
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index d859cb5b11732..530f55504d009 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -300,4 +300,6 @@
     'theme_files'                                 => 'Magento\Theme',
     'variable'                                    => 'Magento\Variable',
     'variable_value'                              => 'Magento\Variable',
+    'job_queue'                                   => 'Magento\Queue',
+    'catalogsearch_recommendations'               => 'Magento\AdvancedSearch',
 ];
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 1c76dbe20cef2..181ecd43ce564 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
@@ -1,18 +1,6 @@
 app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/backbone-min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/handlebars.min-v4.0.10.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack_extended.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery-1.8.0.min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.ba-bbq.min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.slideto.min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.wiggle.min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jsoneditor.min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/lodash.min.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/object-assign-pollyfill.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/swagger-oauth.js
-app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.js
+app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js
+app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js
 app/code/Magento/Tinymce3/view/base/web/tiny_mce/**/*.js
 app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
 app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -25,5 +13,7 @@ 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
+
+// MINIFIED FILES
+app/code/**/*.min.js
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/InstallUpgradeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/InstallUpgradeTest.php
index 5c890aed6678d..5c920fb7ad225 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/InstallUpgradeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/InstallUpgradeTest.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Component\ComponentRegistrar;
 
 /**
- * Tests to find obsolete install/upgrade schema/data scripts
+ * Tests to find obsolete install/upgrade schema/data scripts.
  */
 class InstallUpgradeTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,6 +22,7 @@ public function testForOldInstallUpgradeScripts()
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleDir) {
             $scriptPattern[] = $moduleDir . '/sql';
             $scriptPattern[] = $moduleDir . '/data';
+            $scriptPattern[] = $moduleDir . '/Setup';
         }
         $invoker = new AggregateInvoker($this);
         $invoker(
@@ -32,7 +33,20 @@ function ($file) {
                 $this->assertStringStartsNotWith(
                     'install-',
                     basename($file),
-                    'Install scripts are obsolete. Please create class InstallSchema in module\'s Setup folder'
+                    'Install scripts are obsolete. '
+                    . 'Please use declarative schema approach in module\'s etc/db_schema.xml file'
+                );
+                $this->assertStringStartsNotWith(
+                    'InstallSchema',
+                    basename($file),
+                    'InstallSchema objects are obsolete. '
+                    . 'Please use declarative schema approach in module\'s etc/db_schema.xml file'
+                );
+                $this->assertStringStartsNotWith(
+                    'InstallData',
+                    basename($file),
+                    'InstallData objects are obsolete. '
+                    . 'Please use data patches approach in module\'s Setup/Patch/Data dir'
                 );
                 $this->assertStringStartsNotWith(
                     'data-install-',
@@ -42,21 +56,39 @@ function ($file) {
                 $this->assertStringStartsNotWith(
                     'upgrade-',
                     basename($file),
-                    'Upgrade scripts are obsolete. Please create class UpgradeSchema in module\'s Setup folder'
+                    'Upgrade scripts are obsolete. '
+                    . 'Please use declarative schema approach in module\'s etc/db_schema.xml file'
+                );
+                $this->assertStringStartsNotWith(
+                    'UpgradeSchema',
+                    basename($file),
+                    'UpgradeSchema scripts are obsolete. '
+                    . 'Please use declarative schema approach in module\'s etc/db_schema.xml file'
+                );
+                $this->assertStringStartsNotWith(
+                    'UpgradeData',
+                    basename($file),
+                    'UpgradeSchema scripts are obsolete. '
+                    . 'Please use data patches approach in module\'s Setup/Patch/Data dir'
                 );
                 $this->assertStringStartsNotWith(
                     'data-upgrade-',
                     basename($file),
-                    'Upgrade scripts are obsolete. Please create class UpgradeData in module\'s Setup folder'
+                    'Upgrade scripts are obsolete. '
+                    . 'Please use data patches approach in module\'s Setup/Patch/Data dir'
                 );
                 $this->assertStringStartsNotWith(
                     'recurring',
                     basename($file),
                     'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder'
                 );
-                $this->fail(
-                    'Invalid directory. Please convert data/sql scripts to a class within module\'s Setup folder'
-                );
+                if (preg_match('/.*\/(sql\/|data\/)/', dirname($file))) {
+                    $this->fail(
+                        "Invalid directory:\n"
+                        . "- Create an data patch within module's Setup/Patch/Data folder for data upgrades.\n"
+                        . "- Use declarative schema approach in module's etc/db_schema.xml file for schema changes."
+                    );
+                }
             },
             $this->convertArray(
                 Files::init()->getFiles($scriptPattern, '*.php')
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
index a7c0385a30cc5..1ee599a04463d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
@@ -355,7 +355,9 @@ public function getAllowedActionNodeMethods()
             'unsetChild',
             'unsetChildren',
             'updateButton',
-            'setIsProductListingContext'
+            'setIsProductListingContext',
+            'checkCompanyStatus', // MAGETWO-88965
+            'setRendererType', // MAGETWO-88965
         ];
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 8a00037d2513b..fe15c06bdea4a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -112,7 +112,7 @@ public function testPhpFiles()
         $changedFiles = ChangedFiles::getPhpFiles(__DIR__ . '/../_files/changed_files*');
         $blacklistFiles = $this->getBlacklistFiles();
         foreach ($blacklistFiles as $blacklistFile) {
-            unset($changedFiles[BP . $blacklistFile]);
+            unset($changedFiles[$blacklistFile]);
         }
         $invoker(
             function ($file) {
@@ -501,8 +501,8 @@ private function _checkConstantWithClasspath($constant, $class, $replacement, $c
     {
         $classPathParts = explode('\\', $class);
         $classPartialPath = '';
-        for ($i = count($classPathParts) - 1; $i >= 0; $i--) {
-            if ($i === (count($classPathParts) - 1)) {
+        for ($count = count($classPathParts), $i = $count - 1; $i >= 0; $i--) {
+            if ($i === ($count - 1)) {
                 $classPartialPath = $classPathParts[$i] . $classPartialPath;
             } else {
                 $classPartialPath = $classPathParts[$i] . '\\' . $classPartialPath;
@@ -920,7 +920,7 @@ private function processPattern($appPath, $pattern)
 
         $fileSet = glob($appPath . DIRECTORY_SEPARATOR . $pattern, GLOB_NOSORT);
         foreach ($fileSet as $file) {
-            $files[] = substr($file, $relativePathStart);
+            $files[] = ltrim(substr($file, $relativePathStart), '/');
         }
 
         return $files;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
index 34d3e7b77d291..7cb65c27d7fe6 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/Legacy/RestrictedCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/RestrictedCodeTest.php
index 241f2e64955bc..37ae345d8a6d4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/RestrictedCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/RestrictedCodeTest.php
@@ -60,7 +60,7 @@ protected static function _loadData(array &$data, $filePattern)
             $relativePath = str_replace(
                 '\\',
                 '/',
-                str_replace(BP, '', $file)
+                str_replace(BP . DIRECTORY_SEPARATOR, '', $file)
             );
             array_push(self::$_fixtureFiles, $relativePath);
             $data = array_merge_recursive($data, self::_readList($file));
@@ -88,8 +88,8 @@ public function testPhpFiles()
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $testFiles = \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/../_files/changed_files*');
         foreach (self::$_fixtureFiles as $fixtureFile) {
-            if (array_key_exists(BP . $fixtureFile, $testFiles)) {
-                unset($testFiles[BP . $fixtureFile]);
+            if (array_key_exists($fixtureFile, $testFiles)) {
+                unset($testFiles[$fixtureFile]);
             }
         }
         $invoker(
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php
index 24cc65eb8bf86..62816cd4e4f76 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php
@@ -7,6 +7,9 @@
     'dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php',
     'dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php',
     'dev/tests/static/testsuite/Magento/Test/Legacy/_files/*obsolete*.php',
+    'dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php',
     'lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php',
     'dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php',
+    'lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php',
+    'lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php'
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php
index 390f0020a5b58..0608808d89f3f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php
@@ -10,6 +10,7 @@
 return [
     'Magento_AdminNotification',
     'Magento_AdvancedPricingImportExport',
+    'Magento_AdvancedSearch',
     'Magento_Authorization',
     'Magento_Authorizenet',
     'Magento_Backend',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
index f80151a41573d..4ff5d0013892e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 return [
-    '/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf)$/',
+    '/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf|php\.dist)$/',
     '/pub\/opt\/magento\/var/',
-    '/COPYING\.txt/'
+    '/COPYING\.txt/',
+    '/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/',
+    '/app\/code\/(?!Magento)[^\/]*/'
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 23c0e71bdfc52..12c10990a3af5 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -707,35 +707,6 @@
         'Magento\LayeredNavigation\Block\Navigation\FilterRenderer',
     ],
     ['Magento\CatalogSearch\Model\Layer', 'Magento\Catalog\Model\Layer'],
-    ['Magento\Solr\Block\Catalog\Layer\View', 'Magento\LayeredNavigation\Block\Navigation'],
-    [
-        'Magento\Solr\Block\Catalog\Layer\Filter\Attribute',
-        'Magento\LayeredNavigation\Block\Navigation\FilterRenderer',
-    ],
-    [
-        'Magento\Solr\Block\Catalog\Layer\Filter\Category',
-        'Magento\LayeredNavigation\Block\Navigation\FilterRenderer',
-    ],
-    [
-        'Magento\Solr\Block\Catalog\Layer\Filter\Decimal',
-        'Magento\LayeredNavigation\Block\Navigation\FilterRenderer',
-    ],
-    [
-        'Magento\Solr\Block\Catalog\Layer\Filter\Price',
-        'Magento\LayeredNavigation\Block\Navigation\FilterRenderer',
-    ],
-    [
-        'Magento\Solr\Block\Catalogsearch\Layer\Filter\Attribute',
-        'Magento\LayeredNavigation\Block\Navigation\FilterRenderer',
-    ],
-    ['Magento\Solr\Block\Catalogsearch\Layer', 'Magento\LayeredNavigation\Block\Navigation\FilterRenderer'],
-    ['Magento\Solr\Model\Catalog\Layer', 'Magento\Catalog\Model\Layer\Category'],
-    ['Magento\Solr\Model\Catalog\Layer\Filter\Attribute', 'Magento\Catalog\Model\Layer\Filter\Attribute'],
-    ['Magento\Solr\Model\Catalog\Layer\Filter\Category', 'Magento\Catalog\Model\Layer\Filter\Category'],
-    ['Magento\Solr\Model\Catalog\Layer\Filter\Decimal', 'Magento\Catalog\Model\Layer\Filter\Decimal'],
-    ['Magento\Solr\Model\Catalog\Layer\Filter\Price', 'Magento\Catalog\Model\Layer\Filter\Price'],
-    ['Magento\Solr\Model\Search\Layer\Filter\Attribute', 'Magento\Catalog\Model\Layer\Filter\Attribute'],
-    ['Magento\Solr\Model\Search\Layer', 'Magento\Catalog\Model\Layer'],
     [
         'Magento\Catalog\Model\Product\Type\Configurable',
         'Magento\ConfigurableProduct\Model\Product\Type\Configurable',
@@ -4241,4 +4212,30 @@
     ['Magento\Framework\Acl\CacheInterface'],
     ['Magento\Framework\Acl\Test\Unit\CacheTest'],
     ['Magento\Eav\Model\Entity\Attribute\Backend\Serialized'],
+    ['Magento\Cms\Block\Adminhtml\Block\Edit\ResetButton'],
+    ['Magento\Cms\Block\Adminhtml\Block\Edit\SaveAndContinueButton'],
+    ['Magento\Fmework\MessageQueue\Config\Reader\Xml\Converter\DeprecatedFormat'],
+    [
+        'Magento\Framework\MessageQueue\Config\Converter',
+        'Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter'
+    ],
+    ['Magento\Framework\MessageQueue\Config\Reader', 'Magento\Framework\MessageQueue\Config\Reader\Xml'],
+    ['Magento\Framework\MessageQueue\PublisherFactory'],
+    ['Magento\Framework\MessageQueue\PublisherProxy'],
+    ['Magento\Cms\Block\Adminhtml\Page\Edit\SaveAndContinueButton'],
+    ['Magento\Cms\Block\Adminhtml\Page\Edit\ResetButton'],
+    ['Magento\Search\Block\SearchData', 'Magento\AdvancedSearch\Block\SearchData'],
+    ['Magento\Search\Block\Recommendations', 'Magento\AdvancedSearch\Block\Recommendations'],
+    ['Magento\Search\Block\SearchDataInterface', 'Magento\AdvancedSearch\Block\SearchDataInterface'],
+    ['Magento\Search\Block\Suggestions', 'Magento\AdvancedSearch\Block\Suggestions'],
+    ['Magento\Search\Model\SearchDataProvider', 'Magento\AdvancedSearch\Model\SearchDataProvider'],
+    ['Magento\Search\Model\SearchDataProviderInterface', 'Magento\AdvancedSearch\Model\SearchDataProviderInterface'],
+    [
+        'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest',
+        'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest'
+    ],
+    ['Zend_Feed', 'Zend\Feed'],
+    ['Zend_Uri', 'Zend\Uri\Uri'],
+    ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
+    ['Magento\Framework\Encryption\Crypt', 'Magento\Framework\Encryption\EncryptionAdapterInterface'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
index 74115dfc7740a..dcde3f7abc3c9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
@@ -94,7 +94,6 @@
     '/config/frontend/design' => 'Configurations moved to DI file settings',
     '/config/crontab' => 'All cron configurations moved to crontab.xml',
     '/config/global/areas' => 'Configurations moved to DI file settings',
-    '/config/global/configurators' => 'Solr proxy classes uses instead',
     '/config/vde' => 'Was moved to di',
     '/config/global/ignoredModules' => 'Was replaced using di',
     '/config/global/helpers' => 'Was replaced using di',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 90d4b465d3631..5bcc712be6f74 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -712,7 +712,6 @@
         'Magento\Sales\Block\Reorder\Sidebar',
         '\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT',
     ],
-    ['ENTITY', 'Magento\Framework\App\Config\ValueInterface'],
     ['XML_PATH_ALLOW_CURRENCIES_INSTALLED', 'Magento\Framework\Locale\CurrencyInterface'],
     [
         'DEFAULT_CURRENCY',
@@ -950,4 +949,8 @@
     ],
     ['TAB_GENERAL_CODE', 'Magento\Eav\Model\ResourceModel\Entity\Attribute\Group'],
     ['TAB_IMAGE_MANAGEMENT_CODE', 'Magento\Eav\Model\ResourceModel\Entity\Attribute\Group'],
+    [
+        'CALLBACK',
+        'Magento\Framework\MessageQueue\ConsumerConfiguration'
+    ],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 2d115b29a42f0..ff8e7db0f4260 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -6,7 +6,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreStart
+// @codingStandardsIgnoreFile
 
 return [
     ['__get', 'Magento\Framework\DataObject'],
@@ -2526,5 +2526,47 @@
     ['getDataFormTab', 'Magento\Backend\Test\Block\Widget\Tab', 'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::getFieldsData'],
     ['getBunchImages', 'Magento\CatalogImportExport\Model\Import\Product'],
     ['_isAttributeValueEmpty', 'Magento\Catalog\Model\ResourceModel\AbstractResource'],
-    ['var_dump', '']
+    ['var_dump', ''],
+    ['each', ''],
+    ['strval', ''],
+    ['create_function', ''],
+    ['configure', 'Magento\Framework\MessageQueue\BatchConsumer'],
+    [
+            'getExchangeByTopic',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getExchangeByTopic'
+        ],
+    [
+            'getQueuesByTopic',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getQueuesByTopic'
+        ],
+    [
+            'getConnectionByTopic',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getConnectionByTopic'
+        ],
+    [
+            'getConnectionByConsumer',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getConnectionByConsumer'
+        ],
+    [
+            'getMessageSchemaType',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getMessageSchemaType'
+        ],
+    [
+            'getCallback',
+            'Magento\Framework\MessageQueue\ConsumerConfiguration'
+        ],
+    [
+            'getCallback',
+            'Magento\Framework\MessageQueue\ConsumerConfigurationInterface'
+        ],
+    [
+            'configure',
+            'Magento\Framework\MessageQueue\ConsumerInterface'
+        ],
+    ['isOrderIncrementIdUsed', 'Magento\Quote\Model\ResourceModel\Quote', 'Magento\Sales\Model\OrderIncrementIdChecker::isIncrementIdUsed'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
index 169ecd4209883..0d9da334ea3ab 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
@@ -197,5 +197,7 @@
         'Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super',
         'Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations',
     ],
-    ['Magento\BraintreeTwo', 'Magento\Braintree']
+    ['Magento\BraintreeTwo', 'Magento\Braintree'],
+    ['Magento\MysqlMq\Model\Resource', 'Magento\MysqlMq\Model\ResourceModel'],
+    ['Magento\BulkOperations', 'Magento\AsynchronousOperations'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/restricted_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/restricted_classes.php
index a8127cb3f9678..745176433af85 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/restricted_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/restricted_classes.php
@@ -178,6 +178,11 @@
                 'name' => 'Magento_CatalogSearch',
                 'path' => 'Test/Unit/Model/Indexer/FulltextTest.php'
             ],
+            [
+                'type' => 'module',
+                'name' => 'Magento_Catalog',
+                'path' => 'Test/Unit/Model/ProductTest.php'
+            ],
             [
                 'type' => 'module',
                 'name' => 'Magento_CatalogSearch',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
index 1c8c2d77ffb90..1c23f8d8ccf8a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
@@ -39,7 +39,32 @@
     ],
     'md5' => [
         'replacement' => '',
-        'exclude' => []
+        'exclude' => [
+            /*
+             * Usage of md5 in MessageQueue key generation algorithm
+             * added to exclude list to avoid backward incompatible changes
+             */
+            [
+                'type' => 'library',
+                'name' => 'magento/framework',
+                'path' => 'MessageQueue/Rpc/Publisher.php',
+            ],
+            [
+                'type' => 'library',
+                'name' => 'magento/framework',
+                'path' => 'MessageQueue/MessageController.php',
+            ],
+            [
+                'type' => 'library',
+                'name' => 'magento/framework',
+                'path' => 'MessageQueue/Publisher.php',
+            ],
+            [
+                'type' => 'module',
+                'name' => 'Magento_AsynchronousOperations',
+                'path' => 'Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php'
+            ]
+        ]
     ],
     'srand' => [
         'replacement' => '',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
index d3c5abc11f97a..9bb00533a5da5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
@@ -53,7 +53,7 @@
             <word>overriden</word>
         </item>
         <item>
-            <path>composer.lock</path>
+            <path>dev/composer.lock</path>
         </item>
         <item>
             <path>app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js</path>
@@ -63,6 +63,9 @@
             <path>app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jsoneditor.min.js</path>
             <word>twig</word>
         </item>
+        <item>
+            <path>dev/tests/acceptance/composer.lock</path>
+        </item>
         <item>
             <path>dev/build/publication/sanity/ce.xml</path>
         </item>
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Less/LiveCodeTest.php
index c6bd53a806094..47d5df331e5cd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Less/LiveCodeTest.php
@@ -42,7 +42,7 @@ public static function setUpBeforeClass()
      */
     public function testCodeStyle()
     {
-        $reportFile = self::$reportDir . '/less_report.txt';
+        $reportFile = self::$reportDir . '/csless_report.txt';
         $wrapper = new LessWrapper();
         $codeSniffer = new CodeSniffer(realpath(__DIR__ . '/_files/lesscs'), $reportFile, $wrapper);
 
@@ -56,10 +56,11 @@ public function testCodeStyle()
 
         $result = $codeSniffer->run($this->filterFiles($fileList));
 
+        $report = file_exists($reportFile) ? file_get_contents($reportFile) : "";
         $this->assertEquals(
             0,
             $result,
-            "PHP Code Sniffer has found {$result} error(s): See detailed report in {$reportFile}"
+            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $report
         );
     }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
index db5c1cab06655..4c00371faede0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
@@ -4,6 +4,7 @@ app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/
 app/design/adminhtml/Magento/backend/Magento_Developer/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Msrp/web/css/source/_module-old.less
+app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
 app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
@@ -22,4 +23,4 @@ app/design/adminhtml/Magento/backend/web/mui/clearless/_settings.less
 app/design/adminhtml/Magento/backend/web/mui/clearless/_sprites.less
 app/design/adminhtml/Magento/backend/web/mui/styles/_abstract.less
 app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
-app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
+app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
index 4e4fbefd7871d..60f6f9b105ee2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
@@ -1,2 +1,2 @@
-theme * /
-library * /
\ No newline at end of file
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
+* * /
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index a7b9f3f8488e4..21ca0a495dd19 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;
+            }
+        );
+    }
+
+    /**
+     * 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 = ($changedFilesBaseDir ?: self::getChangedFilesBaseDir()) . '/_files/changed_files*';
+        $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,18 +248,27 @@ 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 [];
+        }
     }
 
+    /**
+     * Test code quality using phpcs
+     */
     public function testCodeStyle()
     {
-        $whiteList = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1'
-            ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
-
+        $isFullScan = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
         $reportFile = self::$reportDir . '/phpcs_report.txt';
+        if (!file_exists($reportFile)) {
+            touch($reportFile);
+        }
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
-        $result = $codeSniffer->run($whiteList);
-        $report = file_exists($reportFile) ? file_get_contents($reportFile) : '';
+        $result = $codeSniffer->run($isFullScan ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']));
+        $report = file_get_contents($reportFile);
         $this->assertEquals(
             0,
             $result,
@@ -213,6 +276,9 @@ public function testCodeStyle()
         );
     }
 
+    /**
+     * Test code quality using phpmd
+     */
     public function testCodeMess()
     {
         $reportFile = self::$reportDir . '/phpmd_report.txt';
@@ -241,6 +307,9 @@ public function testCodeMess()
         }
     }
 
+    /**
+     * Test code quality using phpcpd
+     */
     public function testCopyPaste()
     {
         $reportFile = self::$reportDir . '/phpcpd_report.xml';
@@ -269,4 +338,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/XssPhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
index 34531b6b7c658..fac14af5ecab8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
@@ -27,16 +27,14 @@ public function testXssSensitiveOutput()
              * Static test will cover the following cases:
              *
              * 1. /\* @noEscape \*\/ before output. Output doesn't require escaping. Test is green.
-             * 2. /\* @escapeNotVerified \*\/ before output. Output escaping is not checked and
-             *    should be verified. Test is green.
-             * 3. Methods which contains "html" in their names (e.g. echo $object->{suffix}Html{postfix}() ).
+             * 2. Methods which contains "html" in their names (e.g. echo $object->{suffix}Html{postfix}() ).
              *    Data is ready for the HTML output. Test is green.
-             * 4. AbstractBlock methods escapeHtml, escapeUrl, escapeQuote, escapeXssInUrl are allowed. Test is green.
-             * 5. Type casting and php function count() are allowed
+             * 3. AbstractBlock methods escapeHtml, escapeUrl, escapeQuote, escapeXssInUrl are allowed. Test is green.
+             * 4. Type casting and php function count() are allowed
              *    (e.g. echo (int)$var, echo (float)$var, echo (bool)$var, echo count($var)). Test is green.
-             * 6. Output in single quotes (e.g. echo 'some text'). Test is green.
-             * 7. Output in double quotes without variables (e.g. echo "some text"). Test is green.
-             * 8. Other of p.1-7. Output is not escaped. Test is red.
+             * 5. Output in single quotes (e.g. echo 'some text'). Test is green.
+             * 6. Output in double quotes without variables (e.g. echo "some text"). Test is green.
+             * 7. Other of p.1-6. Output is not escaped. Test is red.
              *
              * @param string $file
              */
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 0000000000000..877583e5b6a29
--- /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/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 0ab8e0216c249..9c40f33f27a12 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -199,3 +199,11 @@ Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem
 IntegrationConfig.php
 *Test.php
 setup/performance-toolkit/aggregate-report
+Magento/MessageQueue/Setup
+Magento/Elasticsearch/Elasticsearch5
+Test/_files
+Magento/InventoryCatalogAdminUi/Controller/Adminhtml
+Magento/InventoryConfigurableProductIndexer/Indexer
+Magento/InventoryGroupedProductIndexer/Indexer
+Magento/Customer/Model/FileUploaderDataResolver.php
+Magento/Customer/Model/Customer/DataProvider.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
index 76f76e2b23c56..2d9eb7478ce91 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
@@ -47,5 +47,7 @@
 
     <!-- Magento Specific Rules -->
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/FinalImplementation" />
+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/RequestAwareBlockMethod" />
 
 </ruleset>
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 79c5074caa375..6f4dc68addcf6 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/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
index 55104db48ba18..0d99320b15e7f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
@@ -6,6 +6,7 @@
 /* These are the modules that have not been refactored from @escapeNotVerified yet. */
 return [
     'Magento_AdminNotification',
+    'Magento_AdvancedSearch',
     'Magento_Backend',
     'Magento_Backup',
     'Magento_Bundle',
diff --git a/dev/tests/static/tmp/.gitignore b/dev/tests/static/tmp/.gitignore
new file mode 100644
index 0000000000000..a68d087bfe511
--- /dev/null
+++ b/dev/tests/static/tmp/.gitignore
@@ -0,0 +1,2 @@
+/*
+!/.gitignore
diff --git a/dev/tests/unit/framework/bootstrap.php b/dev/tests/unit/framework/bootstrap.php
index 68dba4e2ce00c..06aee53dafb14 100644
--- a/dev/tests/unit/framework/bootstrap.php
+++ b/dev/tests/unit/framework/bootstrap.php
@@ -11,7 +11,6 @@
 }
 
 require_once __DIR__ . '/autoload.php';
-require BP . '/app/functions.php';
 
 setCustomErrorHandler();
 
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
index d35f7fc1819fb..102c9c41505e2 100644
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
@@ -40,6 +40,26 @@
         </whitelist>
     </filter>
     <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="cover">
+                        <string>cover</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
         <listener class="Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager"/>
     </listeners>
     <logging>
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 2519a007df081..0000000000000
--- 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 55ebf482702c2..0000000000000
--- 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 03a7f75b238d2..0000000000000
--- 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 84edd36f43c0c..0000000000000
--- 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 31473b68d677e..0000000000000
--- 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 d30a41a77224a..0000000000000
--- 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 e91d663141294..0000000000000
--- 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 f73264580793e..0000000000000
--- 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 dcf54d062d7cd..0000000000000
--- 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/StaticReview/PhpCsFixerReview.php b/dev/tools/Magento/Tools/StaticReview/PhpCsFixerReview.php
deleted file mode 100644
index 113b139555dfb..0000000000000
--- a/dev/tools/Magento/Tools/StaticReview/PhpCsFixerReview.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * This file is part of StaticReview
- *
- * Copyright (c) 2014 Samuel Parkinson <@samparkinson_>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see http://github.com/sjparkinson/static-review/blob/master/LICENSE.md
- */
-namespace Magento\Tools\StaticReview;
-
-use StaticReview\File\FileInterface;
-use StaticReview\Reporter\ReporterInterface;
-use StaticReview\Review\AbstractReview;
-
-class PhpCsFixerReview extends AbstractReview
-{
-    /**
-     * @var array
-     */
-    protected $options;
-
-    /**
-     * @param array $options
-     */
-    public function __construct($options = [])
-    {
-        $this->options = $options;
-    }
-
-    /**
-     * Obtained from .php_cs configuration file.
-     *
-     * @param  FileInterface $file
-     * @return bool
-     */
-    public function canReview(FileInterface $file)
-    {
-        return in_array($file->getExtension(), ['php', 'phtml', 'xml', 'yml']);
-    }
-
-    /**
-     * Checks and fixes PHP files using PHP Coding Standards Fixer.
-     *
-     * @param ReporterInterface $reporter
-     * @param FileInterface $file
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function review(ReporterInterface $reporter, FileInterface $file)
-    {
-        $cmd = 'vendor/bin/php-cs-fixer -vvv ';
-        foreach ($this->options as $key => $value) {
-            $cmd .= ' --' . $key . '=' . escapeshellarg($value);
-        }
-        $cmd .= ' fix ' . escapeshellarg($file->getRelativePath());
-
-        $process = $this->getProcess($cmd);
-        $process->run();
-
-        $process = $this->getProcess('git add ' . escapeshellarg($file->getRelativePath()));
-        $process->run();
-    }
-}
diff --git a/dev/tools/Magento/Tools/StaticReview/pre-commit b/dev/tools/Magento/Tools/StaticReview/pre-commit
deleted file mode 100755
index 0bbb62797f434..0000000000000
--- a/dev/tools/Magento/Tools/StaticReview/pre-commit
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * This file is part of StaticReview
- *
- * Copyright (c) 2014 Samuel Parkinson <@samparkinson_>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/sjparkinson/static-review/blob/master/LICENSE
- */
-$included = include __DIR__ . '/../../../../../vendor/autoload.php';
-if (!$included) {
-    echo 'You must set up the project dependencies, run the following commands:' . PHP_EOL
-        . 'curl -sS https://getcomposer.org/installer | php' . PHP_EOL
-        . 'php composer.phar install' . PHP_EOL;
-
-    exit(1);
-}
-
-// Installation:
-// vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
-
-// Reference the required classes and the reviews you want to use.
-use League\CLImate\CLImate;
-use StaticReview\Reporter\Reporter;
-use StaticReview\Review\Composer\ComposerLintReview;
-use StaticReview\Review\General\LineEndingsReview;
-use StaticReview\Review\General\NoCommitTagReview;
-use StaticReview\Review\PHP\PhpLeadingLineReview;
-use StaticReview\Review\PHP\PhpLintReview;
-use Magento\Tools\StaticReview\PhpCsFixerReview;
-use StaticReview\StaticReview;
-use StaticReview\VersionControl\GitVersionControl;
-
-$reporter = new Reporter();
-$climate  = new CLImate();
-$git      = new GitVersionControl();
-
-// Apply review which modifies staged files first
-$review = new StaticReview($reporter);
-$phpCsFixer = new PhpCsFixerReview();
-$review->addReview($phpCsFixer);
-$review->review($git->getStagedFiles());
-
-// Apply read-only review then
-$review = new StaticReview($reporter);
-$review->addReview(new LineEndingsReview())
-    ->addReview(new PhpLeadingLineReview())
-    ->addReview(new NoCommitTagReview())
-    ->addReview(new PhpLintReview())
-    ->addReview(new ComposerLintReview());
-$review->review($git->getStagedFiles());
-
-// Check if any matching issues were found.
-if ($reporter->hasIssues()) {
-    $climate->out('')->out('');
-
-    foreach ($reporter->getIssues() as $issue) {
-        $climate->red($issue);
-    }
-
-    $climate->out('')->red('✘ Please fix the errors above.');
-
-    exit(1);
-} else {
-    $climate->out('')->green('✔ Looking good.')->white('Have you tested everything?');
-
-    exit(0);
-}
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 229fb53f2547f..0000000000000
--- 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/tools/UpgradeScripts/pre_composer_update_2.3.php b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
new file mode 100644
index 0000000000000..04e64ba45ba0e
--- /dev/null
+++ b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
@@ -0,0 +1,414 @@
+#!/usr/bin/php
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$_scriptName = basename(__FILE__);
+
+define(
+    'SYNOPSIS',
+<<<SYNOPSIS
+Updates Magento with 2.3 requirements that can't be done by `composer update` or `bin/magento setup:upgrade`. 
+Run this script after upgrading to PHP 7.1/7.2 and before running `composer update` or `bin/magento setup:upgrade`.
+
+Steps included:
+ - Require new version of the metapackage
+ - Update "require-dev" section
+ - Add "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/" to composer.json "autoload":"psr-4" section
+ - Update Magento/Updater if it's installed
+ - Update name, version, and description fields in the root composer.json 
+
+Usage: php -f $_scriptName -- --root='</path/to/magento/root/>' [--composer='</path/to/composer/executable>'] 
+           [--edition='<community|enterprise>'] [--repo='<composer_repo_url>'] [--version='<version_constraint>']
+           [--help]
+
+Required:
+ --root='</path/to/magento/root/>'
+    Path to the Magento installation root directory
+
+Optional:
+ --composer='</path/to/composer/executable>'
+    Path to the composer executable
+    - Default: The composer found in the system PATH
+    
+ --edition='<community|enterprise>'
+    Target Magento edition for the update.  Open Source = 'community', Commerce = 'enterprise'
+    - Default: The edition currently required in composer.json
+    
+ --repo='<composer_repo_url>'
+    The Magento repository url to use to pull the new packages
+    - Default: The Magento repository configured in composer.json
+    
+ --version='<version_constraint>'
+    A composer version constraint for allowable 2.3 packages. Versions other than 2.3 are not handled by this script
+    See https://getcomposer.org/doc/articles/versions.md#writing-version-constraints for more information.
+    - Default: The latest 2.3 version available in the Magento repository
+
+ --help
+    Display this message
+SYNOPSIS
+);
+
+$opts = getopt('', [
+    'root:',
+    'composer:',
+    'edition:',
+    'repo:',
+    'version:',
+    'help'
+]);
+
+// Log levels available for use with output() function
+define('INFO', 0);
+define('WARN', 1);
+define('ERROR', 2);
+
+if (isset($opts['help'])) {
+    output(SYNOPSIS);
+    exit(0);
+}
+
+try {
+    if (version_compare(PHP_VERSION, '7.1', '<') || version_compare(PHP_VERSION, '7.3', '>=')) {
+        preg_match('/^\d+\.\d+\.\d+/',PHP_VERSION, $matches);
+        $phpVersion = $matches[0];
+        throw new Exception("Invalid PHP version '$phpVersion'. Magento 2.3 requires PHP 7.1 or 7.2");
+    }
+
+    /**** Populate and Validate Settings ****/
+
+    if (empty($opts['root']) || !is_dir($opts['root'])) {
+        throw new BadMethodCallException('Existing Magento root directory must be supplied with --root');
+    }
+    $rootDir = $opts['root'];
+
+    $composerFile = "$rootDir/composer.json";
+    if (!file_exists($composerFile)) {
+        throw new InvalidArgumentException("Supplied Magento root directory '$rootDir' does not contain composer.json");
+    }
+
+    $composerData = json_decode(file_get_contents($composerFile), true);
+
+    $metapackageMatcher = '/^magento\/product\-(?<edition>community|enterprise)\-edition$/';
+    foreach (array_keys($composerData['require']) as $requiredPackage) {
+        if (preg_match($metapackageMatcher, $requiredPackage, $matches)) {
+            $edition = $matches['edition'];
+            break;
+        }
+    }
+    if (empty($edition)) {
+        throw new InvalidArgumentException("No Magento metapackage found in $composerFile");
+    }
+
+    // Override composer.json edition if one is passed to the script
+    if (!empty($opts['edition'])) {
+        $edition = $opts['edition'];
+    }
+    $edition = strtolower($edition);
+
+    if ($edition !== 'community' && $edition !== 'enterprise') {
+        throw new InvalidArgumentException("Only 'community' and 'enterprise' editions allowed; '$edition' given");
+    }
+
+    $composerExec = (!empty($opts['composer']) ? $opts['composer'] : 'composer');
+    if (basename($composerExec, '.phar') != 'composer') {
+        throw new InvalidArgumentException("'$composerExec' is not a composer executable");
+    }
+
+    // Use 'command -v' to check if composer is executable
+    exec("command -v $composerExec", $out, $composerFailed);
+    if ($composerFailed) {
+        if ($composerExec == 'composer') {
+            $message = 'Composer executable is not available in the system PATH';
+        }
+        else {
+            $message = "Invalid composer executable '$composerExec'";
+        }
+        throw new InvalidArgumentException($message);
+    }
+
+    // The composer command uses the Magento root as the working directory so this script can be run from anywhere
+    $composerExec = "$composerExec --working-dir='$rootDir'";
+
+    // Set the version constraint to any 2.3 package if not specified
+    $constraint = !empty($opts['version']) ? $opts['version'] : '2.3.*';
+
+    // Composer package names
+    $project = "magento/project-$edition-edition";
+    $metapackage = "magento/product-$edition-edition";
+
+    // Get the list of potential Magento repositories to search for the update package
+    $mageUrls = [];
+    $authFailed = [];
+    if (!empty($opts['repo'])) {
+        $mageUrls[] = $opts['repo'];
+    }
+    else {
+        foreach ($composerData['repositories'] as $label => $repo) {
+            if (is_string($label) && strpos(strtolower($label), 'mage') !== false || strpos($repo['url'], '.mage') !== false) {
+                $mageUrls[] = $repo['url'];
+            }
+        }
+
+        if (count($mageUrls) == 0) {
+            throw new InvalidArgumentException('No Magento repository urls found in composer.json');
+        }
+    }
+
+    $tempDir = findUnusedFilename($rootDir, 'temp_project');
+    $projectConstraint = "$project='$constraint'";
+    $version = null;
+    $description = null;
+
+    output("**** Searching for a matching version of $project ****");
+
+    // Try to retrieve a 2.3 package from each Magento repository until one is found
+    foreach ($mageUrls as $repoUrl) {
+        try {
+            output("\\nChecking $repoUrl");
+            deleteFilepath($tempDir);
+            runComposer("create-project --repository=$repoUrl $projectConstraint $tempDir --no-install");
+
+            // Make sure the downloaded package is 2.3
+            $newComposer = json_decode(file_get_contents("$tempDir/composer.json"), true);
+            $version = $newComposer['version'];
+            $description = $newComposer['description'];
+
+            if (strpos($version, '2.3.') !== 0) {
+                throw new InvalidArgumentException("Bad 2.3 version constraint '$constraint'; version $version found");
+            }
+
+            // If no errors occurred, set this as the correct repo, forget errors from previous repos, and move forward
+            output("\\n**** Found compatible $project version: $version ****");
+            $repo = $repoUrl;
+            unset($exception);
+            break;
+        }
+        catch (Exception $e) {
+            // If this repository doesn't have a valid package, save the error but continue checking any others
+            output("Failed to find a valid 2.3 $project package on $repoUrl", WARN);
+            $exception = $e;
+        }
+    }
+
+    // If a valid project package hasn't been found, throw the last error
+    if (isset($exception)) {
+        throw $exception;
+    }
+
+    output("\\n**** Executing Updates ****");
+
+    $composerBackup = findUnusedFilename($rootDir, 'composer.json.bak');
+    output("\\nBacking up $composerFile to $composerBackup");
+    copy($composerFile, $composerBackup);
+
+    // Add the repository to composer.json if needed without overwriting any existing ones
+    $repoUrls = array_map(function ($r) { return $r['url']; }, $composerData['repositories']);
+    if (!in_array($repo, $repoUrls)) {
+        $repoLabels = array_map('strtolower',array_keys($composerData['repositories']));
+        $newLabel = 'magento';
+        if (in_array($newLabel, $repoLabels)) {
+            $count = count($repoLabels);
+            for ($i = 1; $i <= $count; $i++) {
+                if (!in_array("$newLabel-$i", $repoLabels)) {
+                    $newLabel = "$newLabel-$i";
+                    break;
+                }
+            }
+        }
+        output("\\nAdding $repo to composer repositories under label '$newLabel'");
+        runComposer("config repositories.$newLabel composer $repo");
+    }
+
+    output("\\nUpdating Magento metapackage requirement to $metapackage=$version");
+    if ($edition == 'enterprise') {
+        // Community -> Enterprise upgrades need to remove the community edition metapackage
+        runComposer('remove magento/product-community-edition --no-update');
+        output('');
+    }
+    runComposer("require $metapackage=$version --no-update");
+
+    output('\nUpdating "require-dev" section of composer.json');
+    runComposer('require --dev ' .
+        'phpunit/phpunit:~6.2.0 ' .
+        'friendsofphp/php-cs-fixer:~2.10.1 ' .
+        'lusitanian/oauth:~0.8.10 ' .
+        'pdepend/pdepend:2.5.2 ' .
+        'sebastian/phpcpd:~3.0.0 ' .
+        'squizlabs/php_codesniffer:3.2.2 --no-update');
+    output('');
+    runComposer('remove --dev sjparkinson/static-review fabpot/php-cs-fixer --no-update');
+
+    output('\nAdding "Zend\\\\Mvc\\\\Controller\\\\": "setup/src/Zend/Mvc/Controller/" to "autoload": "psr-4"');
+    $composerData['autoload']['psr-4']['Zend\\Mvc\\Controller\\'] = 'setup/src/Zend/Mvc/Controller/';
+
+    if (preg_match('/^magento\/project\-(community|enterprise)\-edition$/', $composerData['name'])) {
+        output('\nUpdating project name, version, and description');
+        $composerData['name'] = $project;
+        $composerData['version'] = $version;
+        $composerData['description'] = $description;
+    }
+
+    file_put_contents($composerFile, json_encode($composerData, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT));
+
+    // Update Magento/Updater if it's installed
+    $updateDir = "$rootDir/update";
+    if (file_exists($updateDir)) {
+        $updateBackup = findUnusedFilename($rootDir, 'update.bak');
+        output("\\nBacking up Magento/Updater directory $updateDir to $updateBackup");
+        rename($updateDir, $updateBackup);
+        output('\nUpdating Magento/Updater');
+        rename("$tempDir/update", $updateDir);
+    }
+
+    // Remove temp project directory that was used for repo/version validation and new source for Magento/Updater
+    deleteFilepath($tempDir);
+
+    output("\\n**** Script Complete! $composerFile updated to Magento version $version ****");
+    if (count($authFailed) > 0) {
+        output('Repository authentication failures occurred!', WARN);
+        output(' * Failed authentication could result in incorrect package versions', WARN);
+        output(' * To resolve, add credentials for the repositories to auth.json', WARN);
+        output(' * URL(s) failing authentication: ' . join(', ', array_keys($authFailed)), WARN);
+    }
+} catch (Exception $e) {
+    if ($e->getPrevious()) {
+        $e = $e->getPrevious();
+    }
+
+    try {
+        output($e->getMessage(), ERROR, get_class($e));
+        output('Script failed! See usage information with --help', ERROR);
+
+        if (isset($composerBackup) && file_exists($composerBackup)) {
+            output("Resetting $composerFile backup");
+            deleteFilepath($composerFile);
+            rename($composerBackup, $composerFile);
+        }
+        if (isset($updateBackup) && file_exists($updateBackup)) {
+            output("Resetting $updateDir backup");
+            deleteFilepath($updateDir);
+            rename($updateBackup, $updateDir);
+        }
+        if (isset($tempDir) && file_exists($tempDir)) {
+            output('Removing temporary project directory');
+            deleteFilepath($tempDir);
+        }
+    }
+    catch (Exception $e2) {
+        output($e2->getMessage(), ERROR, get_class($e2));
+        output('Backup restoration or directory cleanup failed', ERROR);
+    }
+
+    exit($e->getCode() == 0 ? 1 : $e->getCode());
+}
+
+/**
+ * Gets a variant of a filename that doesn't already exist so we don't overwrite anything
+ *
+ * @param string $dir
+ * @param string $filename
+ * @return string
+ */
+function findUnusedFilename($dir, $filename) {
+    $unique = "$dir/$filename";
+    if (file_exists($unique)) {
+        $unique = tempnam($dir, "$filename.");
+        unlink($unique);
+    }
+    return $unique;
+}
+
+/**
+ * Execute a composer command, reload $composerData afterwards, and check for repo authentication warnings
+ *
+ * @param string $command
+ * @return array Command output split by lines
+ * @throws RuntimeException
+ */
+function runComposer($command)
+{
+    global $composerExec, $composerData, $composerFile, $authFailed;
+    $command = "$composerExec $command --no-interaction";
+    output(" Running command:\\n  $command");
+    exec("$command 2>&1", $lines, $exitCode);
+    $output = '    ' . join('\n    ', $lines);
+
+    // Reload composer object from the updated composer.json
+    $composerData = json_decode(file_get_contents($composerFile), true);
+
+    if (0 !== $exitCode) {
+        $output = "Error encountered running command:\\n $command\\n$output";
+        throw new RuntimeException($output, $exitCode);
+    }
+    output($output);
+
+    if (strpos($output, 'URL required authentication.') !== false) {
+        preg_match("/'(https?:\/\/)?(?<url>[^\/']+)(\/[^']*)?' URL required authentication/", $output, $matches);
+        $authUrl = $matches['url'];
+        $authFailed[$authUrl] = 1;
+        output("Repository authentication failed; make sure '$authUrl' exists in auth.json", WARN);
+    }
+
+    return $lines;
+}
+
+/**
+ * Deletes a file or a directory and all its contents
+ *
+ * @param string $path
+ * @throws Exception
+ */
+function deleteFilepath($path) {
+    if (!file_exists($path)) {
+        return;
+    }
+    if (is_dir($path)) {
+        $files = array_diff(scandir($path), array('..', '.'));
+        foreach ($files as $file) {
+            deleteFilepath("$path/$file");
+        }
+        rmdir($path);
+    }
+    else {
+        unlink($path);
+    }
+    if (file_exists($path)) {
+        throw new Exception("Failed to delete $path");
+    }
+}
+
+/**
+ * Logs the given text with \n newline replacement and log level formatting
+ *
+ * @param string $string Text to log
+ * @param int $level One of INFO, WARN, or ERROR
+ * @param string $label Optional message label; defaults to WARNING for $level = WARN and ERROR for $level = ERROR
+ */
+function output($string, $level = INFO, $label = '') {
+    $string = str_replace('\n', PHP_EOL, $string);
+
+    if (!empty($label)) {
+        $label = "$label: ";
+    }
+    else if ($level == WARN) {
+        $label = 'WARNING: ';
+    }
+    else if ($level == ERROR) {
+        $label = 'ERROR: ';
+    }
+    $string = "$label$string";
+
+    if ($level == WARN) {
+        error_log($string);
+    }
+    elseif ($level == ERROR) {
+        error_log(PHP_EOL . $string);
+    }
+    else {
+        echo $string . PHP_EOL;
+    }
+}
diff --git a/dev/tools/grunt/configs/autoprefixer.json b/dev/tools/grunt/configs/autoprefixer.json
index 78283d030919f..28cd9c8a1255f 100644
--- a/dev/tools/grunt/configs/autoprefixer.json
+++ b/dev/tools/grunt/configs/autoprefixer.json
@@ -2,7 +2,7 @@
     "options": {
         "browsers": [
             "last 2 versions",
-            "ie 9"
+            "ie 11"
         ]
     },
     "setup": {
diff --git a/dev/tools/grunt/tools/collect-validation-files.js b/dev/tools/grunt/tools/collect-validation-files.js
index a7bf4a2c67a16..15fb5e50be0a2 100644
--- a/dev/tools/grunt/tools/collect-validation-files.js
+++ b/dev/tools/grunt/tools/collect-validation-files.js
@@ -3,10 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
 'use strict';
 
 var glob = require('glob'),
@@ -29,8 +25,8 @@ module.exports = {
     getFilesForValidate: function () {
         var blackListFiles = glob.sync(pc.static.blacklist + '*.txt'),
             whiteListFiles = glob.sync(pc.static.whitelist + '*.txt'),
-            blackList = this.readFiles(blackListFiles),
-            whiteList = this.readFiles(whiteListFiles),
+            blackList = this.readFiles(blackListFiles).filter(this.isListEntryValid),
+            whiteList = this.readFiles(whiteListFiles).filter(this.isListEntryValid),
             files = [],
             entireBlackList = [];
 
@@ -45,6 +41,11 @@ module.exports = {
         return files;
     },
 
+    isListEntryValid: function(line) {
+        line = line.trim();
+        return line.length > 0 && line.startsWith('// ') !== true;
+    },
+
     getFiles: function (file) {
         if (file) {
             return file.split(',');
diff --git a/dev/travis/before_install.sh b/dev/travis/before_install.sh
index 63e1059f18abf..845d70e4e79fd 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
@@ -34,7 +34,7 @@ if [ test $TEST_SUITE == "js" ]; then
     yarn global add grunt-cli
 fi
 
-if [ $TEST_SUITE = "functional" ]; then
+if [ $TEST_SUITE = "functional" ] || [ $TEST_SUITE = "graphql-api-functional" ]; then
     # Install apache
     sudo apt-get update
     sudo apt-get install apache2 libapache2-mod-fastcgi
diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
index 7cf55ca8083f1..5d091efbb30a3 100755
--- a/dev/travis/before_script.sh
+++ b/dev/travis/before_script.sh
@@ -13,9 +13,9 @@ case $TEST_SUITE in
 
         test_set_list=$(find testsuite/* -maxdepth 1 -mindepth 1 -type d | sort)
         test_set_count=$(printf "$test_set_list" | wc -l)
-        test_set_size[1]=$(printf "%.0f" $(echo "$test_set_count*0.12" | bc))  #12%
-        test_set_size[2]=$(printf "%.0f" $(echo "$test_set_count*0.32" | bc))  #32%
-        test_set_size[3]=$((test_set_count-test_set_size[1]-test_set_size[2])) #56%
+        test_set_size[1]=$(printf "%.0f" $(echo "$test_set_count*0.13" | bc))  #13%
+        test_set_size[2]=$(printf "%.0f" $(echo "$test_set_count*0.30" | bc))  #30%
+        test_set_size[3]=$((test_set_count-test_set_size[1]-test_set_size[2])) #55%
         echo "Total = ${test_set_count}; Batch #1 = ${test_set_size[1]}; Batch #2 = ${test_set_size[2]}; Batch #3 = ${test_set_size[3]};";
 
         echo "==> preparing integration testsuite on index $INTEGRATION_INDEX with set size of ${test_set_size[$INTEGRATION_INDEX]}"
@@ -72,7 +72,7 @@ case $TEST_SUITE in
             --base-path="$TRAVIS_BUILD_DIR" \
             --repo='https://github.com/magento/magento2.git' \
             --branch="$TRAVIS_BRANCH"
-        cat "$changed_files_ce" | sed 's/^/  + including /'
+        sed 's/^/  + including /' "$changed_files_ce"
 
         cd ../../..
         ;;
@@ -129,8 +129,40 @@ case $TEST_SUITE in
         sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
         cp ./.htaccess.sample ./.htaccess
         cd ./utils
+        php -f generate/moduleSequence.php
         php -f mtf troubleshooting:check-all
 
         cd ../../..
         ;;
+
+    graphql-api-functional)
+        echo "Installing Magento"
+        mysql -uroot -e 'CREATE DATABASE magento2;'
+        php bin/magento setup:install -q \
+            --language="en_US" \
+            --timezone="UTC" \
+            --currency="USD" \
+            --base-url="http://${MAGENTO_HOST_NAME}/" \
+            --admin-firstname="John" \
+            --admin-lastname="Doe" \
+            --backend-frontname="backend" \
+            --admin-email="admin@example.com" \
+            --admin-user="admin" \
+            --use-rewrites=1 \
+            --admin-use-security-key=0 \
+            --admin-password="123123q"
+
+        echo "Prepare api-functional tests for running"
+        cd dev/tests/api-functional
+        cp -r _files/Magento/TestModuleGraphQl* ../../../app/code/Magento # Deploy and enable test modules before running tests
+
+        cp ./phpunit_graphql.xml.dist ./phpunit.xml
+        sed -e "s?magento.url?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
+
+        cd ../../..
+        php bin/magento setup:upgrade
+
+        echo "Enabling production mode"
+        php bin/magento deploy:mode:set production
+        ;;
 esac
diff --git a/lib/internal/GnuFreeFont/FreeSerif.ttf b/lib/internal/GnuFreeFont/FreeSerif.ttf
new file mode 100644
index 0000000000000..889c594f6674e
Binary files /dev/null and b/lib/internal/GnuFreeFont/FreeSerif.ttf differ
diff --git a/lib/internal/GnuFreeFont/FreeSerifBold.ttf b/lib/internal/GnuFreeFont/FreeSerifBold.ttf
new file mode 100644
index 0000000000000..49112d3a92c96
Binary files /dev/null and b/lib/internal/GnuFreeFont/FreeSerifBold.ttf differ
diff --git a/lib/internal/GnuFreeFont/FreeSerifItalic.ttf b/lib/internal/GnuFreeFont/FreeSerifItalic.ttf
new file mode 100644
index 0000000000000..4ea68896dc3d3
Binary files /dev/null and b/lib/internal/GnuFreeFont/FreeSerifItalic.ttf differ
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
index 1b4e70be3644f..68762a8a6c046 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
@@ -12,6 +12,7 @@ class Dom implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
+     * @throws \Exception
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
index 105f27cb330fc..3cc1087228174 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
@@ -27,6 +27,8 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function getSchema()
     {
@@ -35,6 +37,8 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
index c5b75d4ccd3b9..af781e19d045d 100644
--- a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
+++ b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
@@ -12,12 +12,15 @@
 use Magento\Framework\Acl\AclResource\ProviderInterface;
 use Magento\Framework\Acl\AclResourceFactory;
 
+/**
+ * ACL Loader
+ */
 class ResourceLoader implements \Magento\Framework\Acl\LoaderInterface
 {
     /**
      * Acl resource config
      *
-     * @var ProviderInterface $resourceProvider
+     * @var ProviderInterface
      */
     protected $_resourceProvider;
 
@@ -43,6 +46,7 @@ public function __construct(ProviderInterface $resourceProvider, AclResourceFact
      *
      * @param Acl $acl
      * @return void
+     * @throws \Zend_Acl_Exception
      */
     public function populateAcl(Acl $acl)
     {
@@ -57,6 +61,7 @@ public function populateAcl(Acl $acl)
      * @param AclResource $parent
      * @return void
      * @throws \InvalidArgumentException
+     * @throws \Zend_Acl_Exception
      */
     protected function _addResourceTree(Acl $acl, array $resources, AclResource $parent = null)
     {
diff --git a/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php b/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
index 9f7269455555c..260d8a5ca70e5 100644
--- a/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
+++ b/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
@@ -20,6 +20,12 @@ protected function setUp()
         $this->model = new Registry();
     }
 
+    /**
+     * @param $roleId
+     * @param $parentRoleId
+     * @return array
+     * @throws \Zend_Acl_Role_Registry_Exception
+     */
     protected function initRoles($roleId, $parentRoleId)
     {
         $parentRole = $this->createMock(\Zend_Acl_Role_Interface::class);
diff --git a/lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php b/lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php
new file mode 100644
index 0000000000000..3e4b9fdf6709f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Bulk;
+
+use Magento\Framework\MessageQueue\Bulk\ExchangeInterface;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * Used to send messages in bulk in AMQP queue.
+ */
+class Exchange implements ExchangeInterface
+{
+    /**
+     * @var \Magento\Framework\Amqp\Config
+     */
+    private $amqpConfig;
+
+    /**
+     * @var CommunicationConfigInterface
+     */
+    private $communicationConfig;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\Amqp\Exchange
+     */
+    private $exchange;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Amqp\Config $amqpConfig
+     * @param PublisherConfig $publisherConfig
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param \Magento\Framework\Amqp\Exchange $exchange
+     */
+    public function __construct(
+        \Magento\Framework\Amqp\Config $amqpConfig,
+        PublisherConfig $publisherConfig,
+        CommunicationConfigInterface $communicationConfig,
+        \Magento\Framework\Amqp\Exchange $exchange
+    ) {
+        $this->amqpConfig = $amqpConfig;
+        $this->communicationConfig = $communicationConfig;
+        $this->publisherConfig = $publisherConfig;
+        $this->exchange = $exchange;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue($topic, array $envelopes)
+    {
+        $topicData = $this->communicationConfig->getTopic($topic);
+        $isSync = $topicData[CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS];
+
+        if ($isSync) {
+            $responses = [];
+            foreach ($envelopes as $envelope) {
+                $responses[] = $this->exchange->enqueue($topic, $envelope);
+            }
+            return $responses;
+        }
+
+        $channel = $this->amqpConfig->getChannel();
+        $publisher = $this->publisherConfig->getPublisher($topic);
+        $exchange = $publisher->getConnection()->getExchange();
+
+        foreach ($envelopes as $envelope) {
+            $msg = new AMQPMessage($envelope->getBody(), $envelope->getProperties());
+            $channel->batch_basic_publish($msg, $exchange, $topic);
+        }
+        $channel->publish_batch();
+
+        return null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php
new file mode 100644
index 0000000000000..684c5cd38b1e4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Config.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\Amqp\Connection\FactoryOptions;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use PhpAmqpLib\Connection\AbstractConnection;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
+
+/**
+ * Reads the Amqp config in the deployed environment configuration
+ *
+ * @api
+ * @since 100.0.0
+ */
+class Config
+{
+    /**
+     * Queue config key
+     */
+    const QUEUE_CONFIG = 'queue';
+
+    /**
+     * Amqp config key
+     */
+    const AMQP_CONFIG = 'amqp';
+
+    const HOST = 'host';
+    const PORT = 'port';
+    const USERNAME = 'user';
+    const PASSWORD = 'password';
+    const VIRTUALHOST = 'virtualhost';
+    const SSL = 'ssl';
+    const SSL_OPTIONS = 'ssl_options';
+
+    /**
+     * Deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var AbstractConnection
+     */
+    private $connection;
+
+    /**
+     * @var AMQPChannel
+     */
+    private $channel;
+
+    /**
+     * Associative array of Amqp configuration
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * AMQP connection name.
+     *
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * @var ConnectionFactory
+     */
+    private $connectionFactory;
+
+    /**
+     * Initialize dependencies.
+     *
+     * Example environment config:
+     * <code>
+     * 'queue' =>
+     *     [
+     *         'amqp' => [
+     *             'host' => 'localhost',
+     *             'port' => 5672,
+     *             'username' => 'guest',
+     *             'password' => 'guest',
+     *             'virtual_host' => '/',
+     *             'ssl' => false,
+     *             'ssl_options' => [],
+     *         ],
+     *     ],
+     * </code>
+     *
+     * @param DeploymentConfig $config
+     * @param string $connectionName
+     * @param ConnectionFactory|null $connectionFactory
+     * @since 100.0.0
+     */
+    public function __construct(
+        DeploymentConfig $config,
+        $connectionName = 'amqp',
+        ConnectionFactory $connectionFactory = null
+    ) {
+        $this->deploymentConfig = $config;
+        $this->connectionName = $connectionName;
+        $this->connectionFactory = $connectionFactory
+            ?: ObjectManager::getInstance()->get(ConnectionFactory::class);
+    }
+
+    /**
+     * Destructor
+     *
+     * @return void
+     * @since 100.0.0
+     */
+    public function __destruct()
+    {
+        $this->closeConnection();
+    }
+
+    /**
+     * Returns the configuration set for the key.
+     *
+     * @param string $key
+     * @return string
+     * @throws \LogicException
+     * @since 100.0.0
+     */
+    public function getValue($key)
+    {
+        $this->load();
+        return $this->data[$key] ?? null;
+    }
+
+    /**
+     * Create amqp connection
+     *
+     * @return AbstractConnection
+     */
+    private function createConnection(): AbstractConnection
+    {
+        $sslEnabled = trim($this->getValue(self::SSL)) === 'true';
+        $options = new FactoryOptions();
+        $options->setHost($this->getValue(self::HOST));
+        $options->setPort($this->getValue(self::PORT));
+        $options->setUsername($this->getValue(self::USERNAME));
+        $options->setPassword($this->getValue(self::PASSWORD));
+        $options->setVirtualHost($this->getValue(self::VIRTUALHOST));
+        $options->setSslEnabled($sslEnabled);
+        /** @var array $sslOptions */
+        if ($sslOptions = $this->getValue(self::SSL_OPTIONS)) {
+            $options->setSslOptions($sslOptions);
+        }
+
+        return $this->connectionFactory->create($options);
+    }
+
+    /**
+     * Return Amqp channel
+     *
+     * @return AMQPChannel
+     * @throws \LogicException
+     * @since 100.0.0
+     */
+    public function getChannel()
+    {
+        if (!isset($this->connection) || !isset($this->channel)) {
+            $this->connection = $this->createConnection();
+
+            $this->channel = $this->connection->channel();
+        }
+        return $this->channel;
+    }
+
+    /**
+     * Load the configuration for Amqp
+     *
+     * @return void
+     * @throws \LogicException
+     */
+    private function load()
+    {
+        if (null === $this->data) {
+            $queueConfig = $this->deploymentConfig->getConfigData(self::QUEUE_CONFIG);
+            if ($this->connectionName == self::AMQP_CONFIG) {
+                $this->data = isset($queueConfig[self::AMQP_CONFIG]) ? $queueConfig[self::AMQP_CONFIG] : [];
+            } else {
+                $this->data = isset($queueConfig['connections'][$this->connectionName])
+                    ? $queueConfig['connections'][$this->connectionName]
+                    : [];
+            }
+            if (empty($this->data)) {
+                throw  new \LogicException('Unknown connection name ' . $this->connectionName);
+            }
+        }
+    }
+
+    /**
+     * Close Amqp connection and Channel
+     *
+     * @return void
+     */
+    private function closeConnection()
+    {
+        if (isset($this->channel)) {
+            $this->channel->close();
+            unset($this->channel);
+        }
+
+        if (isset($this->connection)) {
+            $this->connection->close();
+            unset($this->connection);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ConfigFactory.php b/lib/internal/Magento/Framework/Amqp/ConfigFactory.php
new file mode 100644
index 0000000000000..c1a85541447e1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ConfigFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * Factory class for @see Config
+ */
+class ConfigFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Config::class
+    ) {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Config
+     */
+    public function create(array $data = [])
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ConfigPool.php b/lib/internal/Magento/Framework/Amqp/ConfigPool.php
new file mode 100644
index 0000000000000..c3d565bc9964f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ConfigPool.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * AMQP connections pool.
+ */
+class ConfigPool
+{
+    /**
+     * @var ConfigFactory
+     */
+    private $configFactory;
+
+    /**
+     * @var Config[]
+     */
+    private $pool = [];
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConfigFactory $configFactory
+     */
+    public function __construct(ConfigFactory $configFactory)
+    {
+        $this->configFactory = $configFactory;
+    }
+
+    /**
+     * Get connection by name.
+     *
+     * @param string $connectionName
+     * @return Config
+     */
+    public function get($connectionName)
+    {
+        if (!isset($this->pool[$connectionName])) {
+            $this->pool[$connectionName] = $this->configFactory->create(['connectionName' => $connectionName]);
+        }
+        return $this->pool[$connectionName];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Connection/Factory.php b/lib/internal/Magento/Framework/Amqp/Connection/Factory.php
new file mode 100644
index 0000000000000..fbb954bf38dc6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Connection/Factory.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Amqp\Connection;
+
+use Magento\Framework\App\ObjectManager;
+use PhpAmqpLib\Connection\AbstractConnection;
+use PhpAmqpLib\Connection\AMQPSSLConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+/**
+ * Create connection based on options.
+ */
+class Factory
+{
+    /**
+     * Create connection according to given options.
+     *
+     * @param FactoryOptions $options
+     * @return AbstractConnection
+     */
+    public function create(FactoryOptions $options): AbstractConnection
+    {
+        $connectionType = $options->isSslEnabled() ? AMQPSSLConnection::class : AMQPStreamConnection::class;
+        $parameters = [
+            'host' => $options->getHost(),
+            'port' => $options->getPort(),
+            'user' => $options->getUsername(),
+            'password' => $options->getPassword(),
+            'vhost' => $options->getVirtualHost() !== null ? $options->getVirtualHost() : '/',
+        ];
+
+        if ($options->isSslEnabled()) {
+            $parameters['ssl_options'] = $options->getSslOptions() !== null
+                ? $options->getSslOptions()
+                : ['verify_peer' => true];
+        }
+
+        return ObjectManager::getInstance()->create($connectionType, $parameters);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php b/lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php
new file mode 100644
index 0000000000000..e7206438a688a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Amqp\Connection;
+
+/**
+ * Options a connection will be created according to.
+ */
+class FactoryOptions
+{
+    /**
+     * @var string
+     */
+    private $host;
+
+    /**
+     * @var string
+     */
+    private $port;
+
+    /**
+     * @var string
+     */
+    private $username;
+
+    /**
+     * @var string
+     */
+    private $password;
+
+    /**
+     * @var string
+     */
+    private $virtualHost;
+
+    /**
+     * @var bool
+     */
+    private $sslEnabled = false;
+
+    /**
+     * @var array|null
+     */
+    private $sslOptions;
+
+    /**
+     * @return string
+     */
+    public function getHost(): string
+    {
+        return $this->host;
+    }
+
+    /**
+     * @param string $host
+     *
+     * @return void
+     */
+    public function setHost(string $host)
+    {
+        $this->host = $host;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPort(): string
+    {
+        return $this->port;
+    }
+
+    /**
+     * @param string $port
+     *
+     * @return void
+     */
+    public function setPort(string $port)
+    {
+        $this->port = $port;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUsername(): string
+    {
+        return $this->username;
+    }
+
+    /**
+     * @param string $username
+     *
+     * @return void
+     */
+    public function setUsername(string $username)
+    {
+        $this->username = $username;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    /**
+     * @param string $password
+     *
+     * @return void
+     */
+    public function setPassword(string $password)
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getVirtualHost()
+    {
+        return $this->virtualHost;
+    }
+
+    /**
+     * @param string|null $virtualHost
+     *
+     * @return void
+     */
+    public function setVirtualHost(string $virtualHost = null)
+    {
+        $this->virtualHost = $virtualHost;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSslEnabled(): bool
+    {
+        return $this->sslEnabled;
+    }
+
+    /**
+     * @param bool $sslEnabled
+     *
+     * @return void
+     */
+    public function setSslEnabled(bool $sslEnabled)
+    {
+        $this->sslEnabled = $sslEnabled;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getSslOptions()
+    {
+        return $this->sslOptions;
+    }
+
+    /**
+     * @param array|null $sslOptions
+     *
+     * @return void
+     */
+    public function setSslOptions(array $sslOptions = null)
+    {
+        $this->sslOptions = $sslOptions;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php b/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
new file mode 100644
index 0000000000000..9b600278144f0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolverInterface;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Amqp connection type resolver.
+ *
+ * @api
+ * @since 100.0.0
+ */
+class ConnectionTypeResolver implements ConnectionTypeResolverInterface
+{
+    /**
+     * Amqp connection names.
+     *
+     * @var string[]
+     */
+    private $amqpConnectionName = [];
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DeploymentConfig $deploymentConfig
+     * @since 100.0.0
+     */
+    public function __construct(DeploymentConfig $deploymentConfig)
+    {
+        $queueConfig = $deploymentConfig->getConfigData(Config::QUEUE_CONFIG);
+        if (isset($queueConfig['connections']) && is_array($queueConfig['connections'])) {
+            $this->amqpConnectionName = array_keys($queueConfig['connections']);
+        }
+        if (isset($queueConfig[Config::AMQP_CONFIG])) {
+            $this->amqpConnectionName[] = Config::AMQP_CONFIG;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function getConnectionType($connectionName)
+    {
+        return in_array($connectionName, $this->amqpConnectionName) ? 'amqp' : null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Exchange.php b/lib/internal/Magento/Framework/Amqp/Exchange.php
new file mode 100644
index 0000000000000..e57fa09b83d1b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Exchange.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\ExchangeInterface;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * Class message exchange.
+ *
+ * @api
+ * @since 100.0.0
+ */
+class Exchange implements ExchangeInterface
+{
+    const RPC_CONNECTION_TIMEOUT = 30;
+
+    /**
+     * @var Config
+     */
+    private $amqpConfig;
+
+    /**
+     * @var CommunicationConfigInterface
+     */
+    private $communicationConfig;
+
+    /**
+     * @var int
+     */
+    private $rpcConnectionTimeout;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param PublisherConfig $publisherConfig
+     * @param ResponseQueueNameBuilder $responseQueueNameBuilder
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param int $rpcConnectionTimeout
+     * @since 100.0.0
+     */
+    public function __construct(
+        Config $amqpConfig,
+        PublisherConfig $publisherConfig,
+        ResponseQueueNameBuilder $responseQueueNameBuilder,
+        CommunicationConfigInterface $communicationConfig,
+        $rpcConnectionTimeout = self::RPC_CONNECTION_TIMEOUT
+    ) {
+        $this->amqpConfig = $amqpConfig;
+        $this->communicationConfig = $communicationConfig;
+        $this->rpcConnectionTimeout = $rpcConnectionTimeout;
+        $this->publisherConfig = $publisherConfig;
+        $this->responseQueueNameBuilder = $responseQueueNameBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function enqueue($topic, EnvelopeInterface $envelope)
+    {
+        $topicData = $this->communicationConfig->getTopic($topic);
+        $isSync = $topicData[CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS];
+
+        $channel = $this->amqpConfig->getChannel();
+        $exchange = $this->publisherConfig->getPublisher($topic)->getConnection()->getExchange();
+        $responseBody = null;
+
+        $msg = new AMQPMessage($envelope->getBody(), $envelope->getProperties());
+        if ($isSync) {
+            $correlationId = $envelope->getProperties()['correlation_id'];
+            /** @var AMQPMessage $response */
+            $callback = function ($response) use ($correlationId, &$responseBody, $channel) {
+                if ($response->get('correlation_id') == $correlationId) {
+                    $responseBody = $response->body;
+                    $channel->basic_ack($response->get('delivery_tag'));
+                } else {
+                    //push message back to the queue
+                    $channel->basic_reject($response->get('delivery_tag'), true);
+                }
+            };
+            if ($envelope->getProperties()['reply_to']) {
+                $replyTo = $envelope->getProperties()['reply_to'];
+            } else {
+                $replyTo = $this->responseQueueNameBuilder->getQueueName($topic);
+            }
+            $channel->basic_consume(
+                $replyTo,
+                '',
+                false,
+                false,
+                false,
+                false,
+                $callback
+            );
+            $channel->basic_publish($msg, $exchange, $topic);
+            while ($responseBody === null) {
+                try {
+                    $channel->wait(null, false, $this->rpcConnectionTimeout);
+                } catch (\PhpAmqpLib\Exception\AMQPTimeoutException $e) {
+                    throw new LocalizedException(
+                        new \Magento\Framework\Phrase(
+                            "The RPC (Remote Procedure Call) failed. The connection timed out after %time_out. "
+                            . "Please try again later.",
+                            ['time_out' => $this->rpcConnectionTimeout]
+                        )
+                    );
+                }
+            }
+        } else {
+            $channel->basic_publish($msg, $exchange, $topic);
+        }
+        return $responseBody;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php b/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
new file mode 100644
index 0000000000000..5291b3ab59794
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * Factory class for @see \Magento\Framework\Amqp\Exchange
+ *
+ * @api
+ * @since 100.0.0
+ */
+class ExchangeFactory implements \Magento\Framework\MessageQueue\ExchangeFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * @var ConfigPool
+     */
+    private $configPool;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ConfigPool $configPool
+     * @param string $instanceName
+     * @since 100.0.0
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        ConfigPool $configPool,
+        $instanceName = \Magento\Framework\Amqp\Exchange::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->configPool = $configPool;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function create($connectionName, array $data = [])
+    {
+        $data['amqpConfig'] = $this->configPool->get($connectionName);
+        return $this->objectManager->create(
+            $this->instanceName,
+            $data
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Queue.php b/lib/internal/Magento/Framework/Amqp/Queue.php
new file mode 100644
index 0000000000000..ff5bae5017fb9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Queue.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\MessageQueue\ConnectionLostException;
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use PhpAmqpLib\Exception\AMQPProtocolConnectionException;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Queue
+ *
+ * @api
+ * @since 100.0.0
+ */
+class Queue implements QueueInterface
+{
+    /**
+     * @var Config
+     */
+    private $amqpConfig;
+
+    /**
+     * @var string
+     */
+    private $queueName;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param EnvelopeFactory $envelopeFactory
+     * @param string $queueName
+     * @param LoggerInterface $logger
+     * @since 100.0.0
+     */
+    public function __construct(
+        Config $amqpConfig,
+        EnvelopeFactory $envelopeFactory,
+        $queueName,
+        LoggerInterface $logger
+    ) {
+        $this->amqpConfig = $amqpConfig;
+        $this->queueName = $queueName;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.0.0
+     */
+    public function dequeue()
+    {
+        $envelope = null;
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        /** @var AMQPMessage $message */
+        try {
+            $message = $channel->basic_get($this->queueName);
+        } catch (AMQPProtocolConnectionException $e) {
+            throw new ConnectionLostException(
+                $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        }
+
+        if ($message !== null) {
+            $properties = array_merge(
+                $message->get_properties(),
+                [
+                    'topic_name' => $message->delivery_info['routing_key'],
+                    'delivery_tag' => $message->delivery_info['delivery_tag'],
+                ]
+            );
+            $envelope = $this->envelopeFactory->create(['body' => $message->body, 'properties' => $properties]);
+        }
+
+        // @codingStandardsIgnoreEnd
+        return $envelope;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.0.0
+     */
+    public function acknowledge(EnvelopeInterface $envelope)
+    {
+        $properties = $envelope->getProperties();
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        try {
+            $channel->basic_ack($properties['delivery_tag']);
+        } catch (AMQPProtocolConnectionException $e) {
+            throw new ConnectionLostException(
+                $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        }
+        // @codingStandardsIgnoreEnd
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.0.0
+     */
+    public function subscribe($callback)
+    {
+        $callbackConverter = function (AMQPMessage $message) use ($callback) {
+            // @codingStandardsIgnoreStart
+            $properties = array_merge(
+                $message->get_properties(),
+                [
+                    'topic_name' => $message->delivery_info['routing_key'],
+                    'delivery_tag' => $message->delivery_info['delivery_tag'],
+                ]
+            );
+            // @codingStandardsIgnoreEnd
+            $envelope = $this->envelopeFactory->create(['body' => $message->body, 'properties' => $properties]);
+
+            if ($callback instanceof \Closure) {
+                $callback($envelope);
+            } else {
+                call_user_func($callback, $envelope);
+            }
+        };
+
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        $channel->basic_consume($this->queueName, '', false, false, false, false, $callbackConverter);
+        // @codingStandardsIgnoreEnd
+        while (count($channel->callbacks)) {
+            $channel->wait();
+        }
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.0.0
+     */
+    public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
+    {
+        $properties = $envelope->getProperties();
+
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        $channel->basic_reject($properties['delivery_tag'], $requeue);
+        // @codingStandardsIgnoreEnd
+        if ($rejectionMessage !== null) {
+            $this->logger->critical(
+                new \Magento\Framework\Phrase('Message has been rejected: %message', ['message' => $rejectionMessage])
+            );
+        }
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.0.0
+     */
+    public function push(EnvelopeInterface $envelope)
+    {
+        $messageProperties = $envelope->getProperties();
+        $msg = new AMQPMessage(
+            $envelope->getBody(),
+            [
+                'correlation_id' => $messageProperties['correlation_id'],
+                'delivery_mode' => 2
+            ]
+        );
+        $this->amqpConfig->getChannel()->basic_publish($msg, '', $this->queueName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/QueueFactory.php b/lib/internal/Magento/Framework/Amqp/QueueFactory.php
new file mode 100644
index 0000000000000..9f1635a87977b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/QueueFactory.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * Factory class for @see \Magento\Framework\Amqp\Queue
+ *
+ * @api
+ * @since 100.0.0
+ */
+class QueueFactory implements \Magento\Framework\MessageQueue\QueueFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * @var ConfigPool
+     */
+    private $configPool;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ConfigPool $configPool
+     * @param string $instanceName
+     * @since 100.0.0
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        ConfigPool $configPool,
+        $instanceName = \Magento\Framework\Amqp\Queue::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->configPool = $configPool;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function create($queueName, $connectionName)
+    {
+        return $this->objectManager->create(
+            $this->instanceName,
+            [
+                'amqpConfig' => $this->configPool->get($connectionName),
+                'queueName' => $queueName
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/README.md b/lib/internal/Magento/Framework/Amqp/README.md
new file mode 100644
index 0000000000000..0951caead685b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/README.md
@@ -0,0 +1 @@
+AMQP library is designed to provide default implementation for Message Queue Framework.
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Bulk/ExchangeTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Bulk/ExchangeTest.php
new file mode 100644
index 0000000000000..875d3088af692
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Bulk/ExchangeTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Amqp\Test\Unit\Bulk;
+
+/**
+ * Unit test for Exchange model.
+ */
+class ExchangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Amqp\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $amqpConfig;
+
+    /**
+     * @var \Magento\Framework\Communication\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\Amqp\Exchange|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchange;
+
+    /**
+     * @var \Magento\Framework\Amqp\Bulk\Exchange
+     */
+    private $bulkExchange;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->amqpConfig = $this->getMockBuilder(\Magento\Framework\Amqp\Config::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->communicationConfig = $this->getMockBuilder(\Magento\Framework\Communication\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchange = $this->getMockBuilder(\Magento\Framework\Amqp\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->bulkExchange = $objectManager->getObject(
+            \Magento\Framework\Amqp\Bulk\Exchange::class,
+            [
+                'amqpConfig' => $this->amqpConfig,
+                'communicationConfig' => $this->communicationConfig,
+                'publisherConfig' => $this->publisherConfig,
+                'exchange' => $this->exchange,
+            ]
+        );
+    }
+
+    /**
+     * Test for enqueue method.
+     *
+     * @return void
+     */
+    public function testEnqueue()
+    {
+        $topicName = 'topic.name';
+        $exchangeName = 'exchangeName';
+        $envelopeBody = 'envelopeBody';
+        $envelopeProperties = ['property_key_1' => 'property_value_1'];
+        $topicData = [
+            \Magento\Framework\Communication\ConfigInterface::TOPIC_IS_SYNCHRONOUS => false
+        ];
+        $this->communicationConfig->expects($this->once())
+            ->method('getTopic')->with($topicName)->willReturn($topicData);
+        $channel = $this->getMockBuilder(\AMQPChannel::class)
+            ->setMethods(['batch_basic_publish', 'publish_batch'])
+            ->disableOriginalConstructor()->getMock();
+        $this->amqpConfig->expects($this->once())->method('getChannel')->willReturn($channel);
+        $publisher = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig->expects($this->once())
+            ->method('getPublisher')->with($topicName)->willReturn($publisher);
+        $connection = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $publisher->expects($this->once())->method('getConnection')->with()->willReturn($connection);
+        $connection->expects($this->once())->method('getExchange')->with()->willReturn($exchangeName);
+        $envelope = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $envelope->expects($this->once())->method('getBody')->willReturn($envelopeBody);
+        $envelope->expects($this->once())->method('getProperties')->willReturn($envelopeProperties);
+        $channel->expects($this->once())->method('batch_basic_publish')
+            ->with($this->isInstanceOf(\PhpAmqpLib\Message\AMQPMessage::class), $exchangeName, $topicName);
+        $channel->expects($this->once())->method('publish_batch');
+        $this->assertNull($this->bulkExchange->enqueue($topicName, [$envelope]));
+    }
+
+    /**
+     * Test for enqueue method with synchronous topic.
+     *
+     * @return void
+     */
+    public function testEnqueueWithSynchronousTopic()
+    {
+        $topicName = 'topic.name';
+        $response = 'responseBody';
+        $topicData = [
+            \Magento\Framework\Communication\ConfigInterface::TOPIC_IS_SYNCHRONOUS => true
+        ];
+        $this->communicationConfig->expects($this->once())
+            ->method('getTopic')->with($topicName)->willReturn($topicData);
+        $envelope = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchange->expects($this->once())->method('enqueue')->with($topicName, $envelope)->willReturn($response);
+        $this->assertEquals([$response], $this->bulkExchange->enqueue($topicName, [$envelope]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigPoolTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigPoolTest.php
new file mode 100644
index 0000000000000..5549eb39e54c1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigPoolTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+class ConfigPoolTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnection()
+    {
+        $factory = $this->createMock(\Magento\Framework\Amqp\ConfigFactory::class);
+        $config = $this->createMock(\Magento\Framework\Amqp\Config::class);
+        $factory->expects($this->once())->method('create')->with(['connectionName' => 'amqp'])->willReturn($config);
+        $model = new \Magento\Framework\Amqp\ConfigPool($factory);
+        $this->assertEquals($config, $model->get('amqp'));
+        //test that object is cached
+        $this->assertEquals($config, $model->get('amqp'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php
new file mode 100644
index 0000000000000..570a5c416d7ae
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+use Magento\Framework\Amqp\Config;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $amqpConfig;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getConfigData'])
+            ->getMock();
+        $this->amqpConfig = $this->objectManager->getObject(
+            \Magento\Framework\Amqp\Config::class,
+            [
+                'config' => $this->deploymentConfigMock,
+            ]
+        );
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unknown connection name amqp
+     */
+    public function testGetNullConfig()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue(null));
+
+        $this->amqpConfig->getValue(Config::HOST);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unknown connection name amqp
+     */
+    public function testGetEmptyConfig()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue([]));
+
+        $this->amqpConfig->getValue(Config::HOST);
+    }
+
+    public function testGetStandardConfig()
+    {
+        $expectedHost = 'example.com';
+        $expectedPort = 5672;
+        $expectedUsername = 'guest_username';
+        $expectedPassword = 'guest_password';
+        $expectedVirtualHost = '/';
+        $expectedSsl = false;
+        $expectedSslOptions = ['some' => 'value'];
+
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue(
+                [
+                    Config::AMQP_CONFIG => [
+                        'host' => $expectedHost,
+                        'port' => $expectedPort,
+                        'user' => $expectedUsername,
+                        'password' => $expectedPassword,
+                        'virtualhost' => $expectedVirtualHost,
+                        'ssl' => $expectedSsl,
+                        'ssl_options' => $expectedSslOptions,
+                        'randomKey' => 'randomValue',
+                    ]
+                ]
+            ));
+
+        $this->assertEquals($expectedHost, $this->amqpConfig->getValue(Config::HOST));
+        $this->assertEquals($expectedPort, $this->amqpConfig->getValue(Config::PORT));
+        $this->assertEquals($expectedUsername, $this->amqpConfig->getValue(Config::USERNAME));
+        $this->assertEquals($expectedPassword, $this->amqpConfig->getValue(Config::PASSWORD));
+        $this->assertEquals($expectedVirtualHost, $this->amqpConfig->getValue(Config::VIRTUALHOST));
+        $this->assertEquals($expectedSsl, $this->amqpConfig->getValue(Config::SSL));
+        $this->assertEquals($expectedSslOptions, $this->amqpConfig->getValue(Config::SSL_OPTIONS));
+        $this->assertEquals('randomValue', $this->amqpConfig->getValue('randomKey'));
+    }
+
+    public function testGetCustomConfig()
+    {
+        $amqpConfig = new \Magento\Framework\Amqp\Config($this->deploymentConfigMock, 'connection-01');
+        $expectedHost = 'example.com';
+        $expectedPort = 5672;
+        $expectedUsername = 'guest_username';
+        $expectedPassword = 'guest_password';
+        $expectedVirtualHost = '/';
+        $expectedSsl = ['some' => 'value'];
+
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue(
+                [
+                    'connections' => [
+                        'connection-01' => [
+                            'host' => $expectedHost,
+                            'port' => $expectedPort,
+                            'user' => $expectedUsername,
+                            'password' => $expectedPassword,
+                            'virtualhost' => $expectedVirtualHost,
+                            'ssl' => $expectedSsl,
+                            'randomKey' => 'randomValue',
+                        ]
+                    ]
+                ]
+            ));
+
+        $this->assertEquals($expectedHost, $amqpConfig->getValue(Config::HOST));
+        $this->assertEquals($expectedPort, $amqpConfig->getValue(Config::PORT));
+        $this->assertEquals($expectedUsername, $amqpConfig->getValue(Config::USERNAME));
+        $this->assertEquals($expectedPassword, $amqpConfig->getValue(Config::PASSWORD));
+        $this->assertEquals($expectedVirtualHost, $amqpConfig->getValue(Config::VIRTUALHOST));
+        $this->assertEquals($expectedSsl, $amqpConfig->getValue(Config::SSL));
+        $this->assertEquals('randomValue', $amqpConfig->getValue('randomKey'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php
new file mode 100644
index 0000000000000..11d50d19dcbf8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Amqp\Test\Unit\Connection;
+
+use Magento\Framework\Amqp\Connection\Factory;
+use Magento\Framework\Amqp\Connection\FactoryOptions;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PhpAmqpLib\Connection\AMQPSSLConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+/**
+ * Tests \Magento\Framework\Amqp\Connection\Factory.
+ */
+class FactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Factory
+     */
+    private $object;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager
+     */
+    private $objectManagerInterface;
+
+    /**
+     * @var FactoryOptions|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $optionsMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $className = \Magento\Framework\ObjectManagerInterface::class;
+        $this->objectManagerInterface = $this->createMock($className);
+
+        $this->optionsMock = $this->getMockBuilder(FactoryOptions::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'isSslEnabled',
+                    'getHost',
+                    'getPort',
+                    'getUsername',
+                    'getPassword',
+                    'getVirtualHost',
+                    'getSslOptions',
+                ]
+            )
+            ->getMock();
+
+        $this->object = $this->objectManager->getObject(Factory::class);
+    }
+
+    /**
+     * @param bool $sslEnabled
+     * @param string $connectionClass
+     * @return void
+     * @dataProvider connectionDataProvider
+     */
+    public function testSSLConnection($sslEnabled, $connectionClass)
+    {
+        $this->optionsMock->expects($this->exactly(2))
+            ->method('isSslEnabled')
+            ->willReturn($sslEnabled);
+        $this->optionsMock->expects($this->once())
+            ->method('getHost')
+            ->willReturn('127.0.0.1');
+        $this->optionsMock->expects($this->once())
+            ->method('getPort')
+            ->willReturn('5672');
+        $this->optionsMock->expects($this->once())
+            ->method('getUsername')
+            ->willReturn('guest');
+        $this->optionsMock->expects($this->once())
+            ->method('getPassword')
+            ->willReturn('guest');
+        $this->optionsMock->expects($this->exactly(2))
+            ->method('getVirtualHost')
+            ->willReturn('/');
+        $this->optionsMock->expects($this->any())
+            ->method('getSslOptions')
+            ->willReturn(null);
+
+        $this->objectManagerInterface->expects($this->any())
+            ->method('create')
+            ->with($connectionClass)
+            ->willReturn($this->createMock($connectionClass));
+
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerInterface);
+
+        $connection = $this->object->create($this->optionsMock);
+
+        $this->assertInstanceOf($connectionClass, $connection);
+    }
+
+    /**
+     * @return array
+     */
+    public function connectionDataProvider()
+    {
+        return [
+            [
+                'ssl_enabled' => true,
+                'connection_class' => AMQPSSLConnection::class,
+            ],
+            [
+                'ssl_enabled' => false,
+                'connection_class' => AMQPStreamConnection::class,
+            ],
+        ];
+    }
+
+    protected function tearDown()
+    {
+        $this->objectManager->setBackwardCompatibleProperty(
+            null,
+            '_instance',
+            null,
+            \Magento\Framework\App\ObjectManager::class
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/ConnectionTypeResolverTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConnectionTypeResolverTest.php
new file mode 100644
index 0000000000000..491e323d6c57f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConnectionTypeResolverTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+use Magento\Framework\Amqp\ConnectionTypeResolver;
+use Magento\Framework\App\DeploymentConfig;
+
+class ConnectionTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnectionType()
+    {
+        $config = $this->createMock(DeploymentConfig::class);
+        $config->expects($this->once())
+            ->method('getConfigData')
+            ->with('queue')
+            ->will($this->returnValue(
+                [
+                    'amqp' => [
+                        'host' => '127.0.01',
+                        'port' => '8989',
+                        'user' => 'admin',
+                        'password' => 'admin',
+                        'virtualhost' => 'root',
+                        'ssl' => '',
+                        'randomKey' => 'randomValue',
+                    ],
+                    'connections' => [
+                        'connection-01' => [
+                            'host' => 'host',
+                            'port' => '1515',
+                            'user' => 'guest',
+                            'password' => 'guest',
+                            'virtualhost' => 'localhost',
+                            'ssl' => '',
+                            'randomKey' => 'randomValue',
+                        ]
+                    ]
+                ]
+            ));
+
+        $model = new ConnectionTypeResolver($config);
+        $this->assertEquals('amqp', $model->getConnectionType('connection-01'));
+        $this->assertEquals('amqp', $model->getConnectionType('amqp'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerTest.php
new file mode 100644
index 0000000000000..6233e9bf48be3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use Magento\Framework\Amqp\Topology\BindingInstaller;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class BindingInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    public function testInstall()
+    {
+        $installerOne = $this->createMock(BindingInstallerInterface::class);
+        $installerTwo = $this->createMock(BindingInstallerInterface::class);
+        $model = new BindingInstaller(
+            [
+                'queue' => $installerOne,
+                'exchange' => $installerTwo,
+            ]
+        );
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestinationType')->willReturn('queue');
+        $installerOne->expects($this->once())->method('install')->with($channel, $binding, 'magento');
+        $installerTwo->expects($this->never())->method('install');
+        $model->install($channel, $binding, 'magento');
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Installer type [test] is not configured
+     */
+    public function testInstallInvalidType()
+    {
+        $installerOne = $this->createMock(BindingInstallerInterface::class);
+        $installerTwo = $this->createMock(BindingInstallerInterface::class);
+        $model = new BindingInstaller(
+            [
+                'queue' => $installerOne,
+                'exchange' => $installerTwo,
+            ]
+        );
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestinationType')->willReturn('test');
+        $installerOne->expects($this->never())->method('install');
+        $installerTwo->expects($this->never())->method('install');
+        $model->install($channel, $binding, 'magento');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/ExchangeTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/ExchangeTest.php
new file mode 100644
index 0000000000000..ec8176b7016bc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/ExchangeTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology\BindingInstallerType;
+
+use Magento\Framework\Amqp\Topology\BindingInstallerType\Exchange;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class ExchangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Exchange
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Exchange();
+    }
+
+    public function testInstall()
+    {
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestination')->willReturn('queue01');
+        $binding->expects($this->once())->method('getTopic')->willReturn('topic01');
+        $binding->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+
+        $channel->expects($this->once())
+            ->method('exchange_bind')
+            ->with(
+                'queue01',
+                'magento',
+                'topic01',
+                false,
+                ['some' => ['S', 'value']],
+                null
+            );
+        $this->model->install($channel, $binding, 'magento');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/QueueTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/QueueTest.php
new file mode 100644
index 0000000000000..88a49127109ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/QueueTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology\BindingInstallerType;
+
+use Magento\Framework\Amqp\Topology\BindingInstallerType\Queue;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class QueueTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Queue
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Queue();
+    }
+
+    public function testInstall()
+    {
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestination')->willReturn('queue01');
+        $binding->expects($this->once())->method('getTopic')->willReturn('topic01');
+        $binding->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+
+        $channel->expects($this->once())
+            ->method('queue_bind')
+            ->with(
+                'queue01',
+                'magento',
+                'topic01',
+                false,
+                ['some' => ['S', 'value']],
+                null
+            );
+        $this->model->install($channel, $binding, 'magento');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ExchangeInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ExchangeInstallerTest.php
new file mode 100644
index 0000000000000..ac5faadb29ca8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ExchangeInstallerTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class ExchangeInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    public function testInstall()
+    {
+        $bindingInstaller = $this->createMock(BindingInstallerInterface::class);
+        $model = new ExchangeInstaller($bindingInstaller);
+        $channel = $this->createMock(AMQPChannel::class);
+
+        $binding = $this->createMock(BindingInterface::class);
+
+        $exchange = $this->createMock(ExchangeConfigItemInterface::class);
+        $exchange->expects($this->exactly(2))->method('getName')->willReturn('magento');
+        $exchange->expects($this->once())->method('getType')->willReturn('topic');
+        $exchange->expects($this->once())->method('isDurable')->willReturn(true);
+        $exchange->expects($this->once())->method('isAutoDelete')->willReturn(false);
+        $exchange->expects($this->once())->method('isInternal')->willReturn(false);
+        $exchange->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+        $exchange->expects($this->once())->method('getBindings')->willReturn(['bind01' => $binding]);
+
+        $channel->expects($this->once())
+            ->method('exchange_declare')
+            ->with('magento', 'topic', false, true, false, false, false, ['some' => ['S', 'value']], null);
+        $bindingInstaller->expects($this->once())->method('install')->with($channel, $binding, 'magento');
+        $model->install($channel, $exchange);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
new file mode 100644
index 0000000000000..f278952b83206
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+
+class QueueInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    public function testInstall()
+    {
+        $bindingInstaller = $this->createMock(QueueConfigItemInterface::class);
+        $model = new QueueInstaller($bindingInstaller);
+        $channel = $this->createMock(AMQPChannel::class);
+
+        $queue = $this->createMock(QueueConfigItemInterface::class);
+        $queue->expects($this->once())->method('getName')->willReturn('queue01');
+        $queue->expects($this->once())->method('isDurable')->willReturn(true);
+        $queue->expects($this->once())->method('isAutoDelete')->willReturn(false);
+        $queue->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+
+        $channel->expects($this->once())
+            ->method('queue_declare')
+            ->with('queue01', false, true, false, false, false, ['some' => ['S', 'value']], null);
+        $model->install($channel, $queue);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/TopologyInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/TopologyInstallerTest.php
new file mode 100644
index 0000000000000..87253a15948e9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/TopologyInstallerTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+use Magento\Framework\Amqp\TopologyInstaller;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface;
+use PhpAmqpLib\Exception\AMQPLogicException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Unit tests for @see \Magento\Framework\Amqp\TopologyInstaller
+ */
+class TopologyInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Amqp\TopologyInstaller
+     */
+    private $topologyInstaller;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ConfigInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $topologyConfigMock;
+
+    /**
+     * @var LoggerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * Initialize topology installer.
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->topologyConfigMock = $this->createMock(ConfigInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->topologyInstaller = $this->objectManager->getObject(
+            TopologyInstaller::class,
+            ['topologyConfig' => $this->topologyConfigMock, 'logger' => $this->loggerMock]
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Make sure that topology creation errors in log contain actual error message.
+     */
+    public function testInstallException()
+    {
+        $exceptionMessage = "Exception message";
+
+        $this->topologyConfigMock
+            ->expects($this->once())
+            ->method('getQueues')
+            ->willThrowException(new AMQPLogicException($exceptionMessage));
+
+        $this->loggerMock
+            ->expects($this->once())
+            ->method('error')
+            ->with($this->stringContains("AMQP topology installation failed: {$exceptionMessage}"));
+
+        $this->topologyInstaller->install();
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
new file mode 100644
index 0000000000000..caa5db4e7ef5c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+/**
+ * @deprecated 100.0.0
+ * see: https://github.com/php-amqplib/php-amqplib/issues/405
+ */
+trait ArgumentProcessor
+{
+    /**
+     * Process arguments
+     *
+     * @param array $arguments
+     * @return array
+     */
+    public function processArguments($arguments)
+    {
+        $output = [];
+        foreach ($arguments as $key => $value) {
+            if (is_array($value)) {
+                $output[$key] = ['A', $value];
+            } elseif (is_int($value)) {
+                $output[$key] = ['I', $value];
+            } elseif (is_bool($value)) {
+                $output[$key] = ['t', $value];
+            } elseif (is_string($value)) {
+                $output[$key] = ['S', $value];
+            } else {
+                throw new \InvalidArgumentException('Unknown argument type ' . gettype($value));
+            }
+        }
+        return $output;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstaller.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstaller.php
new file mode 100644
index 0000000000000..58e43c0141ea3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstaller.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+
+/**
+ * {@inheritdoc}
+ */
+class BindingInstaller implements BindingInstallerInterface
+{
+    /**
+     * @var BindingInstallerInterface[]
+     */
+    private $installers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BindingInstallerInterface[] $installers
+     */
+    public function __construct(array $installers)
+    {
+        $this->installers = $installers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName)
+    {
+        $this->getInstaller($binding->getDestinationType())->install($channel, $binding, $exchangeName);
+    }
+
+    /**
+     * Get binding installer by type.
+     *
+     * @param string $type
+     * @return BindingInstallerInterface
+     */
+    private function getInstaller($type)
+    {
+        if (!isset($this->installers[$type])) {
+            throw new \InvalidArgumentException(sprintf('Installer type [%s] is not configured', $type));
+        }
+        return $this->installers[$type];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerInterface.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerInterface.php
new file mode 100644
index 0000000000000..d18b6b0ad73b9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+
+/**
+ * Exchange binding installer.
+ */
+interface BindingInstallerInterface
+{
+    /**
+     * Install exchange bindings.
+     *
+     * @param AMQPChannel $channel
+     * @param BindingInterface $binding
+     * @param string $exchangeName
+     * @return void
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName);
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Exchange.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Exchange.php
new file mode 100644
index 0000000000000..9a5a653a2ce7f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Exchange.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology\BindingInstallerType;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\Amqp\Topology\ArgumentProcessor;
+
+/**
+ * {@inheritdoc}
+ */
+class Exchange implements BindingInstallerInterface
+{
+    use ArgumentProcessor;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName)
+    {
+        $channel->exchange_bind(
+            $binding->getDestination(),
+            $exchangeName,
+            $binding->getTopic(),
+            false,
+            $this->processArguments($binding->getArguments())
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Queue.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Queue.php
new file mode 100644
index 0000000000000..a3ea48e727fcf
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Queue.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology\BindingInstallerType;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\Amqp\Topology\ArgumentProcessor;
+
+/**
+ * {@inheritdoc}
+ */
+class Queue implements BindingInstallerInterface
+{
+    use ArgumentProcessor;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName)
+    {
+        $channel->queue_bind(
+            $binding->getDestination(),
+            $exchangeName,
+            $binding->getTopic(),
+            false,
+            $this->processArguments($binding->getArguments())
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/ExchangeInstaller.php b/lib/internal/Magento/Framework/Amqp/Topology/ExchangeInstaller.php
new file mode 100644
index 0000000000000..3951c21990097
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/ExchangeInstaller.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface;
+
+/**
+ * Exchange installer.
+ */
+class ExchangeInstaller
+{
+    use ArgumentProcessor;
+
+    /**
+     * @var BindingInstallerInterface
+     */
+    private $bindingInstaller;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BindingInstallerInterface $bindingInstaller
+     */
+    public function __construct(BindingInstallerInterface $bindingInstaller)
+    {
+        $this->bindingInstaller = $bindingInstaller;
+    }
+
+    /**
+     * Install exchange.
+     *
+     * @param \PhpAmqpLib\Channel\AMQPChannel $channel
+     * @param ExchangeConfigItemInterface $exchange
+     * @return void
+     */
+    public function install(\PhpAmqpLib\Channel\AMQPChannel $channel, ExchangeConfigItemInterface $exchange)
+    {
+        $channel->exchange_declare(
+            $exchange->getName(),
+            $exchange->getType(),
+            false,
+            $exchange->isDurable(),
+            $exchange->isAutoDelete(),
+            $exchange->isInternal(),
+            false,
+            $this->processArguments($exchange->getArguments())
+        );
+
+        foreach ($exchange->getBindings() as $binding) {
+            $this->bindingInstaller->install($channel, $binding, $exchange->getName());
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/QueueInstaller.php b/lib/internal/Magento/Framework/Amqp/Topology/QueueInstaller.php
new file mode 100644
index 0000000000000..83816bca9afb3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/QueueInstaller.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface;
+
+/**
+ * Queue installer.
+ */
+class QueueInstaller
+{
+    use ArgumentProcessor;
+
+    /**
+     * Install queue.
+     *
+     * @param \PhpAmqpLib\Channel\AMQPChannel $channel
+     * @param QueueConfigItemInterface $queue
+     * @return void
+     */
+    public function install(\PhpAmqpLib\Channel\AMQPChannel $channel, QueueConfigItemInterface $queue)
+    {
+        $channel->queue_declare(
+            $queue->getName(),
+            false,
+            $queue->isDurable(),
+            false,
+            $queue->isAutoDelete(),
+            false,
+            $this->processArguments($queue->getArguments())
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php b/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php
new file mode 100644
index 0000000000000..0b67bbb39191c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface;
+
+/**
+ * Class Topology creates topology for Amqp messaging
+ */
+class TopologyInstaller
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $topologyConfig;
+
+    /**
+     * @var \Magento\Framework\Amqp\Topology\ExchangeInstaller
+     */
+    private $exchangeInstaller;
+
+    /**
+     * @var ConfigPool
+     */
+    private $configPool;
+
+    /**
+     * @var \Magento\Framework\Amqp\Topology\QueueInstaller
+     */
+    private $queueInstaller;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConfigInterface $topologyConfig
+     * @param ExchangeInstaller $exchangeInstaller
+     * @param ConfigPool $configPool
+     * @param QueueInstaller $queueInstaller
+     * @param ConnectionTypeResolver $connectionTypeResolver
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        ConfigInterface $topologyConfig,
+        ExchangeInstaller $exchangeInstaller,
+        ConfigPool $configPool,
+        QueueInstaller $queueInstaller,
+        ConnectionTypeResolver $connectionTypeResolver,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->topologyConfig = $topologyConfig;
+        $this->exchangeInstaller = $exchangeInstaller;
+        $this->configPool = $configPool;
+        $this->queueInstaller = $queueInstaller;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Install Amqp Exchanges, Queues and bind them
+     *
+     * @return void
+     */
+    public function install()
+    {
+        try {
+            foreach ($this->topologyConfig->getQueues() as $queue) {
+                if ($this->connectionTypeResolver->getConnectionType($queue->getConnection()) != 'amqp') {
+                    continue;
+                }
+                $amqpConfig = $this->configPool->get($queue->getConnection());
+                $this->queueInstaller->install($amqpConfig->getChannel(), $queue);
+            }
+            foreach ($this->topologyConfig->getExchanges() as $exchange) {
+                if ($this->connectionTypeResolver->getConnectionType($exchange->getConnection()) != 'amqp') {
+                    continue;
+                }
+                $amqpConfig = $this->configPool->get($exchange->getConnection());
+                $this->exchangeInstaller->install($amqpConfig->getChannel(), $exchange);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error("AMQP topology installation failed: {$e->getMessage()}\n{$e->getTraceAsString()}");
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
new file mode 100644
index 0000000000000..b3d1b3e9d8eea
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/framework-amqp",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "type": "magento2-library",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "require": {
+        "magento/framework": "*",
+        "php": "~7.1.3||~7.2.0",
+        "php-amqplib/php-amqplib": "~2.7.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\Amqp\\": ""
+        },
+        "files": [
+            "registration.php"
+        ]
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/registration.php b/lib/internal/Magento/Framework/Amqp/registration.php
new file mode 100644
index 0000000000000..ab14d5aab8e94
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework-amqp', __DIR__);
diff --git a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
index 3ea43cbccd24f..97c24167d47e1 100644
--- a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
@@ -9,9 +9,8 @@
 
 /**
  * Base Class for extensible data Objects
- * @SuppressWarnings(PHPMD.NumberOfChildren)
- * TODO: This class can be split into Custom attribute and Extension attribute implementation classes
  *
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
  */
 abstract class AbstractExtensibleObject extends AbstractSimpleObject implements CustomAttributesDataInterface
@@ -51,6 +50,9 @@ public function __construct(
         $this->extensionFactory = $extensionFactory;
         $this->attributeValueFactory = $attributeValueFactory;
         parent::__construct($data);
+        if (isset($data[self::EXTENSION_ATTRIBUTES_KEY]) && is_array($data[self::EXTENSION_ATTRIBUTES_KEY])) {
+            $this->populateExtensionAttributes($data[self::EXTENSION_ATTRIBUTES_KEY]);
+        }
     }
 
     /**
@@ -74,7 +76,7 @@ public function getCustomAttribute($attributeCode)
      */
     public function getCustomAttributes()
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES]) ? $this->_data[self::CUSTOM_ATTRIBUTES] : [];
+        return $this->_data[self::CUSTOM_ATTRIBUTES] ?? [];
     }
 
     /**
@@ -129,7 +131,7 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      */
     protected function getCustomAttributesCodes()
     {
-        return isset($this->customAttributesCodes) ? $this->customAttributesCodes : [];
+        return $this->customAttributesCodes ?? [];
     }
 
     /**
@@ -160,9 +162,24 @@ protected function getEavAttributesCodes(\Magento\Framework\Api\MetadataServiceI
      */
     protected function _getExtensionAttributes()
     {
+        if (!$this->_get(self::EXTENSION_ATTRIBUTES_KEY)) {
+            $this->populateExtensionAttributes([]);
+        }
         return $this->_get(self::EXTENSION_ATTRIBUTES_KEY);
     }
 
+    /**
+     * Instantiate extension attributes object and populate it with the provided data.
+     *
+     * @param array $extensionAttributesData
+     * @return void
+     */
+    private function populateExtensionAttributes(array $extensionAttributesData = [])
+    {
+        $extensionAttributes = $this->extensionFactory->create(get_class($this), $extensionAttributesData);
+        $this->_setExtensionAttributes($extensionAttributes);
+    }
+
     /**
      * Set an extension attributes object.
      *
diff --git a/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php b/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php
index c5d72b59e12ac..7771c77b51697 100644
--- a/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php
+++ b/lib/internal/Magento/Framework/Api/AbstractServiceCollection.php
@@ -111,12 +111,14 @@ public function addFieldToFilter($field, $condition)
     {
         if (is_array($field) && is_array($condition) && count($field) != count($condition)) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase('When passing in a field array there must be a matching condition array.')
+                new \Magento\Framework\Phrase(
+                    'The field array failed to pass. The array must have a matching condition array.'
+                )
             );
         } elseif (is_array($field) && !count($field) > 0) {
             throw new LocalizedException(
                 new \Magento\Framework\Phrase(
-                    'When passing an array of fields there must be at least one field in the array.'
+                    'The array of fields failed to pass. The array must include at one field.'
                 )
             );
         }
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
index b907246139d42..9cc0ddab3bfcb 100644
--- a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
@@ -34,7 +34,7 @@ public function __construct(array $data = [])
      */
     protected function _get($key)
     {
-        return isset($this->_data[$key]) ? $this->_data[$key] : null;
+        return $this->_data[$key] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/CombinedFilterGroup.php b/lib/internal/Magento/Framework/Api/CombinedFilterGroup.php
new file mode 100644
index 0000000000000..190085ddcae00
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/CombinedFilterGroup.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Phrase;
+
+/**
+ * Groups two or more filters together using 'OR' or 'AND' strategy
+ */
+class CombinedFilterGroup extends AbstractSimpleObject
+{
+    /**
+     * Constants defined for keys of  data array
+     */
+    const FILTERS = 'filters';
+    const COMBINATION_MODE = 'combination_mode';
+
+    /**
+     * Possible aggregation strategies for filters
+     */
+    const COMBINED_WITH_AND = 'AND';
+    const COMBINED_WITH_OR = 'OR';
+
+    /**
+     * Returns a list of filters in this group
+     *
+     * @return \Magento\Framework\Api\Filter[]|null
+     */
+    public function getFilters()
+    {
+        $filters = $this->_get(self::FILTERS);
+        return $filters === null ? [] : $filters;
+    }
+
+    /**
+     * Set filters
+     *
+     * @param \Magento\Framework\Api\Filter[] $filters
+     * @return $this
+     * @codeCoverageIgnore
+     */
+    public function setFilters(array $filters = null): self
+    {
+        return $this->setData(self::FILTERS, $filters);
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getCombinationMode()
+    {
+        return $this->_get(self::COMBINATION_MODE);
+    }
+
+    /**
+     * @param string $mode
+     * @return $this
+     * @throws InputException
+     */
+    public function setCombinationMode(string $mode): self
+    {
+        if ($mode !== self::COMBINED_WITH_AND && $mode !== self::COMBINED_WITH_OR) {
+            throw new InputException(
+                new Phrase('Invalid combination mode: %1', [$mode])
+            );
+        }
+
+        return $this->setData(self::COMBINATION_MODE, $mode);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
index d7a92460a7f4d..2d5d4f751f5a7 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
@@ -42,14 +42,14 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $extensibleClassName
      * @param array $data
-     * @return object
+     * @return \Magento\Framework\Api\ExtensionAttributesInterface
      */
     public function create($extensibleClassName, $data = [])
     {
         $interfaceReflection = new \ReflectionClass($this->getExtensibleInterfaceName($extensibleClassName));
 
         $methodReflection = $interfaceReflection->getMethod('getExtensionAttributes');
-        if ($methodReflection->getDeclaringClass() == self::EXTENSIBLE_INTERFACE_NAME) {
+        if ($methodReflection->getDeclaringClass()->getName() === self::EXTENSIBLE_INTERFACE_NAME) {
             throw new \LogicException(
                 "Method 'getExtensionAttributes' must be overridden in the interfaces "
                 . "which extend '" . self::EXTENSIBLE_INTERFACE_NAME . "'. "
@@ -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);
@@ -97,7 +98,7 @@ public function getExtensibleInterfaceName($extensibleClassName)
         }
         $modelReflection = new \ReflectionClass($extensibleClassName);
         if ($modelReflection->isInterface()
-            && $modelReflection->isSubClassOf(self::EXTENSIBLE_INTERFACE_NAME)
+            && $modelReflection->isSubclassOf(self::EXTENSIBLE_INTERFACE_NAME)
             && $modelReflection->hasMethod('getExtensionAttributes')
         ) {
             $this->classInterfaceMap[$extensibleClassName] = $extensibleClassName;
diff --git a/lib/internal/Magento/Framework/Api/ImageProcessor.php b/lib/internal/Magento/Framework/Api/ImageProcessor.php
index e2c5f8c4083b9..83390b3853212 100644
--- a/lib/internal/Magento/Framework/Api/ImageProcessor.php
+++ b/lib/internal/Magento/Framework/Api/ImageProcessor.php
@@ -139,7 +139,7 @@ public function save(
     public function processImageContent($entityType, $imageContent)
     {
         if (!$this->contentValidator->isValid($imageContent)) {
-            throw new InputException(new Phrase('The image content is not valid.'));
+            throw new InputException(new Phrase('The image content is invalid. Verify the content and try again.'));
         }
 
         $fileContent = @base64_decode($imageContent->getBase64EncodedData(), true);
@@ -172,7 +172,7 @@ public function processImageContent($entityType, $imageContent)
      */
     protected function getMimeTypeExtension($mimeType)
     {
-        return isset($this->mimeTypeExtensionMap[$mimeType]) ? $this->mimeTypeExtensionMap[$mimeType] : '';
+        return $this->mimeTypeExtensionMap[$mimeType] ?? '';
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/Search/Document.php b/lib/internal/Magento/Framework/Api/Search/Document.php
index d60458a6e5585..7454fa7974ece 100644
--- a/lib/internal/Magento/Framework/Api/Search/Document.php
+++ b/lib/internal/Magento/Framework/Api/Search/Document.php
@@ -33,9 +33,7 @@ public function setId($id)
      */
     public function getCustomAttribute($attributeCode)
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])
-            ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]
-            : null;
+        return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
index f339214ca4dad..aef3df998a550 100644
--- a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
+++ b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
@@ -10,6 +10,8 @@
 
 /**
  * Groups two or more filters together using a logical OR
+ *
+ * @api
  */
 class FilterGroup extends AbstractSimpleObject
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
index 696a65fd710ca..cfde284524482 100644
--- a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
+++ b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
@@ -12,6 +12,8 @@
 
 /**
  * Builder for FilterGroup Data.
+ *
+ * @api
  */
 class FilterGroupBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/AdvancedFilterProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/AdvancedFilterProcessor.php
new file mode 100644
index 0000000000000..6f94407200e40
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/AdvancedFilterProcessor.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\SearchCriteria\CollectionProcessor;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Api\CombinedFilterGroup;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionProviderInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Collection processor that adds filters to collection based on passed search criteria
+ *
+ * Difference between FilterProcessor is that AdvancedFilterProcessor gives ability
+ * to add filters using different combination strategies
+ *
+ * For example you can add such filters:
+ *
+ * Select * FROM some_table
+ * WHERE
+ *  field_1 = 10
+ *  AND (
+ *      field_2 in (1,2,3)
+ *      OR
+ *      field_3 like '%banana%'
+ *  )
+ */
+class AdvancedFilterProcessor implements CollectionProcessorInterface
+{
+    /**
+     * @var CustomConditionProviderInterface
+     */
+    private $customConditionProvider;
+
+    /**
+     * @var CustomConditionInterface
+     */
+    private $defaultConditionProcessor;
+
+    /**
+     * @var ConditionManager
+     */
+    private $conditionManager;
+
+    /**
+     * @param CustomConditionInterface $defaultConditionProcessor
+     * @param ConditionManager $conditionManager
+     * @param CustomConditionProviderInterface $customConditionProvider
+     */
+    public function __construct(
+        CustomConditionInterface $defaultConditionProcessor,
+        ConditionManager $conditionManager,
+        CustomConditionProviderInterface $customConditionProvider
+    ) {
+        $this->defaultConditionProcessor = $defaultConditionProcessor;
+        $this->conditionManager = $conditionManager;
+        $this->customConditionProvider = $customConditionProvider;
+    }
+
+    /**
+     * Apply Search Criteria Filters to collection
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param AbstractDb $collection
+     * @return void
+     */
+    public function process(SearchCriteriaInterface $searchCriteria, AbstractDb $collection)
+    {
+        foreach ($searchCriteria->getFilterGroups() as $group) {
+            $conditions = $this->getConditionsFromFilterGroup($group);
+            $collection->getSelect()->where($conditions);
+        }
+    }
+
+    /**
+     * Add FilterGroup to the collection
+     *
+     * @param CombinedFilterGroup $filterGroup
+     * @return string
+     * @throws InputException
+     */
+    private function getConditionsFromFilterGroup(CombinedFilterGroup $filterGroup): string
+    {
+        $conditions = [];
+
+        foreach ($filterGroup->getFilters() as $filter) {
+            if ($filter instanceof CombinedFilterGroup) {
+                $conditions[] = $this->getConditionsFromFilterGroup($filter);
+                continue;
+            }
+
+            if ($filter instanceof Filter) {
+                $conditions[] = $this->getConditionsFromFilter($filter);
+                continue;
+            }
+
+            throw new InputException(
+                new Phrase('Undefined filter group "%1" passed in.', [get_class($filter)])
+            );
+        }
+
+        return $this->conditionManager->wrapBrackets(
+            $this->conditionManager->combineQueries($conditions, $filterGroup->getCombinationMode())
+        );
+    }
+
+    /**
+     * @param Filter $filter
+     * @return string
+     * @throws InputException
+     */
+    private function getConditionsFromFilter(Filter $filter): string
+    {
+        if ($this->customConditionProvider->hasProcessorForField($filter->getField())) {
+            $customProcessor = $this->customConditionProvider->getProcessorByField($filter->getField());
+            return $customProcessor->build($filter);
+        }
+
+        return $this->defaultConditionProcessor->build($filter);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionInterface.php
new file mode 100644
index 0000000000000..8e03d01286ff6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor;
+
+use Magento\Framework\Api\Filter;
+
+/**
+ * Implement it to build SQL conditions from Magento\Framework\Api\Filter
+ *
+ * Multiple conditions can be combined into groups with AND or OR combination
+ * and applied to select queries as WHERE parts to filter entity collections
+ *
+ * For example:
+ *      Select *
+ *      FROM `catalog_product_entity`
+ *      WHERE
+ *          CustomCondition_1
+ *          AND
+ *          (CustomCondition_2 OR CustomCondition_3)
+ *
+ */
+interface CustomConditionInterface
+{
+    /**
+     * @param Filter $filter
+     * @return string
+     */
+    public function build(Filter $filter): string;
+}
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProvider.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProvider.php
new file mode 100644
index 0000000000000..446cc622986da
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProvider.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Collection of all custom condition processors
+ */
+class CustomConditionProvider implements CustomConditionProviderInterface
+{
+    /**
+     * @var CustomConditionInterface[]
+     */
+    private $customConditionProcessors;
+
+    /**
+     * @param array $customConditionProcessors
+     * @throws InputException
+     */
+    public function __construct(array $customConditionProcessors = [])
+    {
+        foreach ($customConditionProcessors as $processor) {
+            if (!$processor instanceof CustomConditionInterface) {
+                throw new InputException(
+                    new Phrase('Custom processor must implement "%1".', [CustomConditionInterface::class])
+                );
+            }
+        }
+
+        $this->customConditionProcessors = $customConditionProcessors;
+    }
+
+    /**
+     * Get custom processor by field name
+     *
+     * @param string $fieldName
+     * @return CustomConditionInterface
+     * @throws InputException
+     */
+    public function getProcessorByField(string $fieldName): CustomConditionInterface
+    {
+        if (!$this->hasProcessorForField($fieldName)) {
+            throw new InputException(
+                new Phrase('Custom processor for field "%1" is absent.', [$fieldName])
+            );
+        }
+
+        return $this->customConditionProcessors[$fieldName];
+    }
+
+    /**
+     * Check if collection has custom processor for given field name
+     *
+     * @param string $fieldName
+     * @return bool
+     */
+    public function hasProcessorForField(string $fieldName): bool
+    {
+        return array_key_exists($fieldName, $this->customConditionProcessors);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProviderInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProviderInterface.php
new file mode 100644
index 0000000000000..504db29c2a184
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProviderInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+
+/**
+ * Provides collections of custom condition processors (CustomConditionInterface)
+ *
+ * Used to store processors as mapping attributeName => CustomConditionInterface
+ * You can use di.xml to configure with any custom conditions you need
+ */
+interface CustomConditionProviderInterface
+{
+    /**
+     * Get custom processor by field name
+     *
+     * @param string $fieldName
+     * @return CustomConditionInterface
+     * @throws InputException
+     */
+    public function getProcessorByField(string $fieldName): CustomConditionInterface;
+
+    /**
+     * Check if collection has custom processor for given field name
+     *
+     * @param string $fieldName
+     * @return bool
+     */
+    public function hasProcessorForField(string $fieldName): bool;
+}
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
index b663a3a2f733c..024a4d2af3847 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
@@ -72,6 +72,15 @@ private function addFilterGroupToCollection(
             if (!$isApplied) {
                 $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
                 $fields[] = $this->getFieldMapping($filter->getField());
+
+                if ($condition === 'fulltext') {
+                    // NOTE: This is not a fulltext search, but the best way to search something when
+                    // a SearchCriteria with "fulltext" condition is provided over a MySQL table
+                    // (see https://github.com/magento-engcom/msi/issues/1221)
+                    $condition = 'like';
+                    $filter->setValue('%' . $filter->getValue() . '%');
+                }
+
                 $conditions[] = [$condition => $filter->getValue()];
             }
         }
@@ -114,6 +123,6 @@ private function getCustomFilterForField($field)
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
index b8e52334bee1f..29029ab6efac5 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Data\Collection\AbstractDb;
 
+/**
+ * Search criteria join processor
+ */
 class JoinProcessor implements CollectionProcessorInterface
 {
     /**
@@ -28,7 +31,7 @@ class JoinProcessor implements CollectionProcessorInterface
     private $appliedFields = [];
 
     /**
-     * @param CustomJoinInterface[] $customFilters
+     * @param CustomJoinInterface[] $customJoins
      * @param array $fieldMapping
      */
     public function __construct(
@@ -121,6 +124,6 @@ private function getCustomJoin($field)
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
index 85a6d6f570d5e..9dda5cd682708 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
@@ -59,7 +59,7 @@ public function process(SearchCriteriaInterface $searchCriteria, AbstractDb $col
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
index a1f5acb4e60e7..49d824a4f2e5a 100644
--- a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
+++ b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
+/**
+ * Data object converter.
+ */
 class SimpleDataObjectConverter
 {
     /**
@@ -156,14 +159,13 @@ public static function snakeCaseToUpperCamelCase($input)
      */
     public static function snakeCaseToCamelCase($input)
     {
-        return lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $input))));
+        return lcfirst(self::snakeCaseToUpperCamelCase($input));
     }
 
     /**
      * Convert a CamelCase string read from method into field key in snake_case
      *
-     * e.g. DefaultShipping => default_shipping
-     *      Postcode => postcode
+     * For example [DefaultShipping => default_shipping, Postcode => postcode]
      *
      * @param string $name
      * @return string
diff --git a/lib/internal/Magento/Framework/Api/SortOrder.php b/lib/internal/Magento/Framework/Api/SortOrder.php
index 7d0bfec3950b1..67897ea22570d 100644
--- a/lib/internal/Magento/Framework/Api/SortOrder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrder.php
@@ -11,6 +11,8 @@
 
 /**
  * Data object for sort order.
+ *
+ * @api
  */
 class SortOrder extends AbstractSimpleObject
 {
@@ -23,6 +25,7 @@ class SortOrder extends AbstractSimpleObject
      * Initialize object and validate sort direction
      *
      * @param array $data
+     * @throws InputException
      */
     public function __construct(array $data = [])
     {
@@ -30,6 +33,9 @@ public function __construct(array $data = [])
         if (null !== $this->getDirection()) {
             $this->validateDirection($this->getDirection());
         }
+        if ($this->getField() !== null) {
+            $this->validateField($this->getField());
+        }
     }
 
     /**
@@ -46,10 +52,14 @@ public function getField()
      * Set sorting field.
      *
      * @param string $field
+     * @throws InputException
+     *
      * @return $this
      */
     public function setField($field)
     {
+        $this->validateField($field);
+
         return $this->setData(SortOrder::FIELD, $field);
     }
 
@@ -67,6 +77,8 @@ public function getDirection()
      * Set sorting direction.
      *
      * @param string $direction
+     * @throws InputException
+     *
      * @return $this
      */
     public function setDirection($direction)
@@ -79,10 +91,10 @@ public function setDirection($direction)
      * Validate direction argument ASC or DESC
      *
      * @param mixed $direction
-     * @return null
+     * @return void
      * @throws InputException
      */
-    private function validateDirection($direction)
+    private function validateDirection($direction): void
     {
         $this->validateDirectionIsString($direction);
         $this->validateDirectionIsAscOrDesc($direction);
@@ -91,9 +103,9 @@ private function validateDirection($direction)
     /**
      * @param string $direction
      * @throws InputException
-     * @return null
+     * @return void
      */
-    private function validateDirectionIsString($direction)
+    private function validateDirectionIsString($direction): void
     {
         if (!is_string($direction)) {
             throw new InputException(new Phrase(
@@ -106,9 +118,9 @@ private function validateDirectionIsString($direction)
     /**
      * @param string $direction
      * @throws InputException
-     * @return null
+     * @return void
      */
-    private function validateDirectionIsAscOrDesc($direction)
+    private function validateDirectionIsAscOrDesc($direction): void
     {
         $normalizedDirection = $this->normalizeDirectionInput($direction);
         if (!in_array($normalizedDirection, [SortOrder::SORT_ASC, SortOrder::SORT_DESC], true)) {
@@ -127,4 +139,23 @@ private function normalizeDirectionInput($direction)
     {
         return strtoupper($direction);
     }
+
+    /**
+     * Check if given value can be used as sorting field.
+     *
+     * @param string $field
+     * @return void
+     * @throws InputException
+     */
+    private function validateField(string $field): void
+    {
+        if (preg_match('/[^a-z0-9\_]/i', $field)) {
+            throw new InputException(
+                new Phrase(
+                    'Sort order field %1 contains restricted symbols',
+                    [$field]
+                )
+            );
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
index bb766aa6b951d..6960440d4d522 100644
--- a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
@@ -9,6 +9,8 @@
 /**
  * Builder for sort order data object.
  * @method SortOrder create()
+ *
+ * @api
  */
 class SortOrderBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
index 84dee31b73015..183313cd8d05d 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
@@ -119,7 +119,7 @@ public function testSaveWithNoImageData()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage The image content is not valid.
+     * @expectedExceptionMessage The image content is invalid. Verify the content and try again.
      */
     public function testSaveInputException()
     {
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php
index 47f520d4ee28a..c1ab91e3ccaa6 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php
@@ -31,12 +31,24 @@ abstract class EntityChildTestAbstract extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Code\Generator\DefinedClasses */
     protected $definedClassesMock;
 
+    /**
+     * @return mixed
+     */
     abstract protected function getSourceClassName();
 
+    /**
+     * @return mixed
+     */
     abstract protected function getResultClassName();
 
+    /**
+     * @return mixed
+     */
     abstract protected function getGeneratorClassName();
 
+    /**
+     * @return mixed
+     */
     abstract protected function getOutputFileName();
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt
index 21b81bad090e5..ec0397dac9e2d 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt
@@ -17,9 +17,9 @@ class SampleMapper
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Mapper constructor
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
index 4946f083004ba..f4855a6f69066 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
@@ -367,6 +367,9 @@ public function testMergeDataObjects($data1, $data2)
         $this->assertSame($firstAddressDataObject->getRegion(), $secondAddressDataObject->getRegion());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestMergeDataObjects()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php
index d874f155b16fb..972b165d8f31a 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php
@@ -15,7 +15,7 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProviderTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProviderTest.php
new file mode 100644
index 0000000000000..3361a250ea730
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/ConditionProcessor/CustomConditionProviderTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\Test\Unit\SearchCriteria\CollectionProcessor\ConditionProcessor;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionProvider;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
+
+class CustomConditionProviderTest extends \PHPUnit\Framework\TestCase
+{
+    private $customConditionProcessorBuilder;
+    private $customConditionMock;
+
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->customConditionMock = $this->getMockBuilder(CustomConditionInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->customConditionProcessorBuilder = $objectManagerHelper
+            ->getObject(
+                CustomConditionProvider::class,
+                [
+                    'customConditionProcessors' => [
+                        'my-valid-field' => $this->customConditionMock,
+                    ]
+                ]
+            );
+    }
+
+    public function testPositiveHasProcessorForField()
+    {
+        $testField = 'my-valid-field';
+
+        $this->assertTrue(
+            $this->customConditionProcessorBuilder->hasProcessorForField($testField)
+        );
+    }
+
+    public function testNegativeHasProcessorForField()
+    {
+        $testField = 'unknown-field';
+
+        $this->assertFalse(
+            $this->customConditionProcessorBuilder->hasProcessorForField($testField)
+        );
+    }
+
+    public function testPositiveGetProcessorByField()
+    {
+        $testField = 'my-valid-field';
+
+        $this->assertEquals(
+            $this->customConditionMock,
+            $this->customConditionProcessorBuilder->getProcessorByField($testField)
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Custom processor for field "unknown-field" is absent.
+     */
+    public function testNegativeGetProcessorByFieldExceptionFieldIsAbsent()
+    {
+        $testField = 'unknown-field';
+        $this->customConditionProcessorBuilder->getProcessorByField($testField);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Custom processor must implement "Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface".
+     */
+    public function testNegativeGetProcessorByFieldExceptionWrongClass()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->customConditionProcessorBuilder = $objectManagerHelper
+            ->getObject(
+                CustomConditionProvider::class,
+                [
+                    'customConditionProcessors' => [
+                        'my-valid-field' => $this->customConditionMock,
+                        'my-invalid-field' => 'olo-lo'
+                    ]
+                ]
+            );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php
index 01b272a9e911a..d8d4e48047404 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php
@@ -76,15 +76,25 @@ public function testProcess()
             ->method('getDirection')
             ->willReturn($orderThreeDirection);
 
+        /** @var SortOrder|\PHPUnit_Framework_MockObject_MockObject $sortOrderThreeMock */
+        $sortOrderFourMock = $this->getMockBuilder(SortOrder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $sortOrderFourMock->expects($this->once())
+            ->method('getField')
+            ->willReturn(null);
+        $sortOrderFourMock->expects($this->never())
+            ->method('getDirection');
+
         /** @var SearchCriteriaInterface|\PHPUnit_Framework_MockObject_MockObject $searchCriteriaMock */
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
             ->getMock();
 
         $searchCriteriaMock->expects($this->exactly(2))
             ->method('getSortOrders')
-            ->willReturn([$sortOrderOneMock, $sortOrderTwoMock, $sortOrderThreeMock]);
+            ->willReturn([$sortOrderOneMock, $sortOrderTwoMock, $sortOrderThreeMock, $sortOrderFourMock]);
 
-        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
+        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -130,7 +140,7 @@ public function testProcessWithDefaults()
             ->method('getSortOrders')
             ->willReturn([]);
 
-        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
+        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
index 05ecc0bdbcc61..31a07c97d782d 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
@@ -37,6 +37,9 @@ public function testItReturnsTheCorrectValuesIfSortOrderIsSet($sortOrder)
         $this->assertSame($sortOrder, $this->sortOrder->getDirection());
     }
 
+    /**
+     * @return array
+     */
     public function sortOrderDirectionProvider()
     {
         return [[SortOrder::SORT_ASC], [SortOrder::SORT_DESC]];
@@ -52,6 +55,9 @@ public function testItThrowsAnExceptionIfAnInvalidSortOrderIsSet($invalidDirecti
         $this->sortOrder->setDirection($invalidDirection);
     }
 
+    /**
+     * @return array
+     */
     public function invalidSortDirectionProvider()
     {
         return [
@@ -86,4 +92,14 @@ public function testItValidatesADirectionAssignedDuringInstantiation()
             SortOrder::DIRECTION => 'not-asc-or-desc'
         ]);
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     */
+    public function testValidateField()
+    {
+        $this->sortOrder = new SortOrder([
+            SortOrder::FIELD => 'invalid field (value);'
+        ]);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Api/Uploader.php b/lib/internal/Magento/Framework/Api/Uploader.php
index d3ae11100b9dc..5cea3a34569a9 100644
--- a/lib/internal/Magento/Framework/Api/Uploader.php
+++ b/lib/internal/Magento/Framework/Api/Uploader.php
@@ -19,7 +19,7 @@ public function __construct()
     }
 
     /**
-     * Explicitly set the the file attributes instead of setting it via constructor
+     * Explicitly set the file attributes instead of setting it via constructor
      *
      * @param array $fileAttributes
      * @return void
diff --git a/lib/internal/Magento/Framework/App/Action/Forward.php b/lib/internal/Magento/Framework/App/Action/Forward.php
index 7d6f956545b45..c81bc48ace4d5 100644
--- a/lib/internal/Magento/Framework/App/Action/Forward.php
+++ b/lib/internal/Magento/Framework/App/Action/Forward.php
@@ -10,6 +10,11 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 
+/**
+ * Forward request further.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Forward extends AbstractAction
 {
     /**
diff --git a/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php
new file mode 100644
index 0000000000000..426fe584bade6
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing CONNECT requests.
+ */
+interface HttpConnectActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.php
new file mode 100644
index 0000000000000..174f21cc57b4f
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing DELETE requests.
+ */
+interface HttpDeleteActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.php
new file mode 100644
index 0000000000000..308b77aa8dbcf
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing GET requests.
+ */
+interface HttpGetActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php
new file mode 100644
index 0000000000000..d2f9b70913c1f
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing HEAD requests.
+ */
+interface HttpHeadActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.php
new file mode 100644
index 0000000000000..fa768885a3de4
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing OPTIONS requests.
+ */
+interface HttpOptionsActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.php
new file mode 100644
index 0000000000000..bfc1ec94adcfe
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing PATCH requests.
+ */
+interface HttpPatchActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.php
new file mode 100644
index 0000000000000..a4b87ecfe8452
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing POST requests.
+ */
+interface HttpPostActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.php
new file mode 100644
index 0000000000000..7ddd32c4727c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing PROPFIND requests.
+ */
+interface HttpPropfindActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.php
new file mode 100644
index 0000000000000..a83e946d9a945
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing PUT requests.
+ */
+interface HttpPutActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.php
new file mode 100644
index 0000000000000..b776ab061e66d
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.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\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Marker for actions processing TRACE requests.
+ */
+interface HttpTraceActionInterface extends ActionInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/App/Action/Redirect.php b/lib/internal/Magento/Framework/App/Action/Redirect.php
index 702d78c84f616..9e211edfc0039 100644
--- a/lib/internal/Magento/Framework/App/Action/Redirect.php
+++ b/lib/internal/Magento/Framework/App/Action/Redirect.php
@@ -10,6 +10,11 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 
+/**
+ * Issue a redirect.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Redirect extends AbstractAction
 {
     /**
diff --git a/lib/internal/Magento/Framework/App/ActionFactory.php b/lib/internal/Magento/Framework/App/ActionFactory.php
index f929c38b75219..94f5ef36eb9c9 100644
--- a/lib/internal/Magento/Framework/App/ActionFactory.php
+++ b/lib/internal/Magento/Framework/App/ActionFactory.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App;
 
 /**
@@ -35,7 +36,9 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
     public function create($actionName)
     {
         if (!is_subclass_of($actionName, \Magento\Framework\App\ActionInterface::class)) {
-            throw new \InvalidArgumentException('Invalid action name provided');
+            throw new \InvalidArgumentException(
+                'The action name provided is invalid. Verify the action name and try again.'
+            );
         }
         return $this->_objectManager->create($actionName);
     }
diff --git a/lib/internal/Magento/Framework/App/ActionFlag.php b/lib/internal/Magento/Framework/App/ActionFlag.php
index 657c2ede9262d..55201504c968f 100644
--- a/lib/internal/Magento/Framework/App/ActionFlag.php
+++ b/lib/internal/Magento/Framework/App/ActionFlag.php
@@ -65,9 +65,7 @@ public function get($action, $flag = '')
             $action = $this->_request->getActionName();
         }
         if ('' === $flag) {
-            return isset(
-                $this->_flags[$this->_getControllerKey()]
-            ) ? $this->_flags[$this->_getControllerKey()] : [];
+            return $this->_flags[$this->_getControllerKey()] ?? [];
         } elseif (isset($this->_flags[$this->_getControllerKey()][$action][$flag])) {
             return $this->_flags[$this->_getControllerKey()][$action][$flag];
         } else {
diff --git a/lib/internal/Magento/Framework/App/Area.php b/lib/internal/Magento/Framework/App/Area.php
index 265a6554d2ddc..4bc7c769caf19 100644
--- a/lib/internal/Magento/Framework/App/Area.php
+++ b/lib/internal/Magento/Framework/App/Area.php
@@ -22,6 +22,7 @@ class Area implements \Magento\Framework\App\AreaInterface
     const AREA_CRONTAB = 'crontab';
     const AREA_WEBAPI_REST = 'webapi_rest';
     const AREA_WEBAPI_SOAP = 'webapi_soap';
+    const AREA_GRAPHQL = 'graphql';
 
     /**
      * @deprecated
diff --git a/lib/internal/Magento/Framework/App/AreaList.php b/lib/internal/Magento/Framework/App/AreaList.php
index 7c123f7ff9d60..fb28d09d5fe09 100644
--- a/lib/internal/Magento/Framework/App/AreaList.php
+++ b/lib/internal/Magento/Framework/App/AreaList.php
@@ -88,7 +88,7 @@ public function getCodeByFrontName($frontName)
      */
     public function getFrontName($areaCode)
     {
-        return isset($this->_areas[$areaCode]['frontName']) ? $this->_areas[$areaCode]['frontName'] : null;
+        return $this->_areas[$areaCode]['frontName'] ?? null;
     }
 
     /**
@@ -111,7 +111,7 @@ public function getCodes()
      */
     public function getDefaultRouter($areaCode)
     {
-        return isset($this->_areas[$areaCode]['router']) ? $this->_areas[$areaCode]['router'] : null;
+        return $this->_areas[$areaCode]['router'] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 4468954d189da..904c41ab9ec33 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Autoload\Populator;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Filesystem\DriverPool;
+use Psr\Log\LoggerInterface;
 
 /**
  * A bootstrap of Magento application
@@ -258,6 +259,7 @@ public function run(AppInterface $application)
                 \Magento\Framework\Profiler::stop('magento');
             } catch (\Exception $e) {
                 \Magento\Framework\Profiler::stop('magento');
+                $this->objectManager->get(LoggerInterface::class)->error($e->getMessage());
                 if (!$application->catchException($this, $e)) {
                     throw $e;
                 }
@@ -423,7 +425,7 @@ protected function terminate(\Exception $e)
                 if (!$this->objectManager) {
                     throw new \DomainException();
                 }
-                $this->objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->objectManager->get(LoggerInterface::class)->critical($e);
             } catch (\Exception $e) {
                 $message .= "Could not write error message to log. Please use developer mode to see the message.\n";
             }
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
index 4c539da0960ea..f84dd304643da 100644
--- a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
+++ b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
@@ -10,9 +10,7 @@
 namespace Magento\Framework\App\Cache\Frontend;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -71,7 +69,6 @@ class Factory
      */
     protected $_backendOptions = [
         'hashed_directory_level' => 1,
-        'hashed_directory_umask' => 0777,
         'file_name_prefix' => 'mage',
     ];
 
@@ -148,15 +145,17 @@ public function create(array $options)
         $result = $this->_objectManager->create(
             \Magento\Framework\Cache\Frontend\Adapter\Zend::class,
             [
-                'frontend' => \Zend_Cache::factory(
-                    $frontend['type'],
-                    $backend['type'],
-                    $frontend,
-                    $backend['options'],
-                    true,
-                    true,
-                    true
-                )
+                'frontendFactory' => function () use ($frontend, $backend) {
+                    return \Zend_Cache::factory(
+                        $frontend['type'],
+                        $backend['type'],
+                        $frontend,
+                        $backend['options'],
+                        true,
+                        true,
+                        true
+                    );
+                }
             ]
         );
         $result = $this->_applyDecorators($result);
@@ -266,6 +265,15 @@ protected function _getBackendOptions(array $cacheOptions)
                 $backendType = \Magento\Framework\Cache\Backend\Database::class;
                 $options = $this->_getDbAdapterOptions();
                 break;
+            case 'remote_synchronized_cache':
+                $backendType = \Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class;
+                $options['remote_backend'] = \Magento\Framework\Cache\Backend\Database::class;
+                $options['remote_backend_options'] = $this->_getDbAdapterOptions();
+                $options['local_backend'] = \Cm_Cache_Backend_File::class;
+                $cacheDir = $this->_filesystem->getDirectoryWrite(DirectoryList::CACHE);
+                $options['local_backend_options']['cache_dir'] = $cacheDir->getAbsolutePath();
+                $cacheDir->create();
+                break;
             default:
                 if ($type != $this->_defaultBackend) {
                     try {
diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php
index 08c1fca66ea17..9d268ac2d1bb7 100644
--- a/lib/internal/Magento/Framework/App/Cache/State.php
+++ b/lib/internal/Magento/Framework/App/Cache/State.php
@@ -11,6 +11,9 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\Config\File\ConfigFilePool;
 
+/**
+ * Cache State
+ */
 class State implements StateInterface
 {
     /**
@@ -74,7 +77,7 @@ public function __construct(DeploymentConfig $config, Writer $writer, $banAll =
     public function isEnabled($cacheType)
     {
         $this->load();
-        return isset($this->statuses[$cacheType]) ? (bool)$this->statuses[$cacheType] : false;
+        return (bool)($this->statuses[$cacheType] ?? false);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php
index 60698e14d1fbe..641da1d420a96 100644
--- a/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ConfigResource/ConfigInterface.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\App\Config\ConfigResource;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Resource for storing store configuration values
  */
@@ -19,7 +21,7 @@ interface ConfigInterface
      * @param int $scopeId
      * @return $this
      */
-    public function saveConfig($path, $value, $scope, $scopeId);
+    public function saveConfig($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0);
 
     /**
      * Delete config value from the storage resource
@@ -29,5 +31,5 @@ public function saveConfig($path, $value, $scope, $scopeId);
      * @param int $scopeId
      * @return $this
      */
-    public function deleteConfig($path, $scope, $scopeId);
+    public function deleteConfig($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0);
 }
diff --git a/lib/internal/Magento/Framework/App/Config/Initial.php b/lib/internal/Magento/Framework/App/Config/Initial.php
index 1933682346ad3..b65c9a2f53489 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial.php
@@ -72,9 +72,9 @@ public function getData($scope)
         list($scopeType, $scopeCode) = array_pad(explode('|', $scope), 2, null);
 
         if (ScopeConfigInterface::SCOPE_TYPE_DEFAULT == $scopeType) {
-            return isset($this->_data[$scopeType]) ? $this->_data[$scopeType] : [];
+            return $this->_data[$scopeType] ?? [];
         } elseif ($scopeCode) {
-            return isset($this->_data[$scopeType][$scopeCode]) ? $this->_data[$scopeType][$scopeCode] : [];
+            return $this->_data[$scopeType][$scopeCode] ?? [];
         }
         return [];
     }
diff --git a/lib/internal/Magento/Framework/App/Config/Initial/Reader.php b/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
index c8caefc42c071..161d8a8da702d 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial/Reader.php
@@ -105,7 +105,10 @@ public function read()
                 }
             } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase("Invalid XML in file %1:\n%2", [$file, $e->getMessage()])
+                    new \Magento\Framework\Phrase(
+                        'The XML in file "%1" is invalid:' . "\n%2\nVerify the XML and try again.",
+                        [$file, $e->getMessage()]
+                    )
                 );
             }
         }
diff --git a/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php b/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
index 6eb5fd7e9d3b1..bc23032903d23 100644
--- a/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
+++ b/lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php
@@ -11,6 +11,9 @@
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Post-process config values using their backend models.
+ */
 class MetadataConfigTypeProcessor implements PostProcessorInterface
 {
     /**
@@ -114,9 +117,14 @@ private function processScopeData(
         $scopeCode = null
     ) {
         foreach ($this->_metadata as $path => $metadata) {
-            $configPath = $this->configPathResolver->resolve($path, $scope, $scopeCode);
-            if (!empty($this->configSource->get($configPath))) {
-                continue;
+            try {
+                $configPath = $this->configPathResolver->resolve($path, $scope, $scopeCode);
+                if (!empty($this->configSource->get($configPath))) {
+                    continue;
+                }
+            } catch (\Throwable $exception) {
+                //Failed to load scopes or config source, perhaps config data received is outdated.
+                return $data;
             }
             /** @var \Magento\Framework\App\Config\Data\ProcessorInterface $processor */
             $processor = $this->_processorFactory->get($metadata['backendModel']);
diff --git a/lib/internal/Magento/Framework/App/Config/Scope/Validator.php b/lib/internal/Magento/Framework/App/Config/Scope/Validator.php
index 694ba70e1e1b0..9c0f60286e093 100644
--- a/lib/internal/Magento/Framework/App/Config/Scope/Validator.php
+++ b/lib/internal/Magento/Framework/App/Config/Scope/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Config\Scope;
 
 use InvalidArgumentException;
@@ -49,7 +50,7 @@ public function isValid($scope, $scopeCode = null)
         }
 
         if (empty($scope)) {
-            throw new LocalizedException(new Phrase('Enter a scope before proceeding.'));
+            throw new LocalizedException(new Phrase('A scope is missing. Enter a scope and try again.'));
         }
 
         $this->validateScopeCode($scopeCode);
@@ -58,10 +59,12 @@ public function isValid($scope, $scopeCode = null)
             $scopeResolver = $this->scopeResolverPool->get($scope);
             $scopeResolver->getScope($scopeCode)->getId();
         } catch (InvalidArgumentException $e) {
-            throw new LocalizedException(new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scope]));
+            throw new LocalizedException(
+                new Phrase('The "%1" value doesn\'t exist. Enter another value and try again.', [$scope])
+            );
         } catch (NoSuchEntityException $e) {
             throw new LocalizedException(
-                new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scopeCode])
+                new Phrase('The "%1" value doesn\'t exist. Enter another value and try again.', [$scopeCode])
             );
         }
 
@@ -79,7 +82,7 @@ public function isValid($scope, $scopeCode = null)
     private function validateScopeCode($scopeCode)
     {
         if (empty($scopeCode)) {
-            throw new LocalizedException(new Phrase('Enter a scope code before proceeding.'));
+            throw new LocalizedException(new Phrase('A scope code is missing. Enter a code and try again.'));
         }
 
         if (!preg_match('/^[a-z]+[a-z0-9_]*$/', $scopeCode)) {
diff --git a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
index 308c7656d5e7c..35b24692bd228 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/App/Config/Value.php b/lib/internal/Magento/Framework/App/Config/Value.php
index c85b484d51ce2..6fde4dded4695 100644
--- a/lib/internal/Magento/Framework/App/Config/Value.php
+++ b/lib/internal/Magento/Framework/App/Config/Value.php
@@ -8,6 +8,10 @@
 /**
  * Config data model
  *
+ * This model is temporarily marked as API since {@see \Magento\Framework\App\Config\ValueInterface} doesn't fit
+ * developers' needs of extensibility. In 2.4 we are going to introduce a new interface which should cover all needs
+ * and deprecate the mentioned together with the model
+ *
  * @method string getScope()
  * @method \Magento\Framework\App\Config\ValueInterface setScope(string $value)
  * @method int getScopeId()
@@ -17,6 +21,8 @@
  * @method string getValue()
  * @method \Magento\Framework\App\Config\ValueInterface setValue(string $value)
  *
+ * @api
+ *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
 class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\App\Config\ValueInterface
@@ -107,7 +113,7 @@ public function getFieldsetDataValue($key)
     }
 
     /**
-     * {@inheritdoc}
+     * Processing object after save data
      *
      * {@inheritdoc}. In addition, it sets status 'invalidate' for config caches
      *
@@ -123,7 +129,7 @@ public function afterSave()
     }
 
     /**
-     * {@inheritdoc}
+     * Processing object after delete data
      *
      * {@inheritdoc}. In addition, it sets status 'invalidate' for config caches
      *
diff --git a/lib/internal/Magento/Framework/App/Config/ValueInterface.php b/lib/internal/Magento/Framework/App/Config/ValueInterface.php
index 1e0747acc36f2..0aa600b84dcce 100644
--- a/lib/internal/Magento/Framework/App/Config/ValueInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ValueInterface.php
@@ -10,16 +10,22 @@
 /**
  * Interface \Magento\Framework\App\Config\ValueInterface
  *
+ * This interface cannot be marked as API since doesn't fit developers' needs of extensibility. In 2.4 we are going
+ * to introduce a new interface which should cover all needs and deprecate the this one with the model
+ * {@see \Magento\Framework\App\Config\Value}
  */
 interface ValueInterface
 {
     /**
      * Table name
+     *
+     * @deprecated since it is not used
      */
     const ENTITY = 'config_data';
 
     /**
      * Check if config data value was changed
+     *
      * @todo this method should be make as protected
      * @return bool
      */
diff --git a/lib/internal/Magento/Framework/App/Console/MaintenanceModeEnabler.php b/lib/internal/Magento/Framework/App/Console/MaintenanceModeEnabler.php
new file mode 100644
index 0000000000000..6f834d50c51f7
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Console/MaintenanceModeEnabler.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Class MaintenanceMode * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App\Console;
+
+use Magento\Framework\App\MaintenanceMode;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Class MaintenanceModeEnabler
+ * @package Magento\Framework\App\Console
+ */
+class MaintenanceModeEnabler
+{
+    /**
+     * @var MaintenanceMode
+     */
+    private $maintenanceMode;
+
+    /**
+     * @var bool
+     */
+    private $skipDisableMaintenanceMode;
+
+    /**
+     * @param MaintenanceMode $maintenanceMode
+     */
+    public function __construct(MaintenanceMode $maintenanceMode)
+    {
+        $this->maintenanceMode = $maintenanceMode;
+    }
+
+    /**
+     * Enable maintenance mode
+     *
+     * @param OutputInterface $output
+     * @return void
+     */
+    private function enableMaintenanceMode(OutputInterface $output)
+    {
+        if ($this->maintenanceMode->isOn()) {
+            $this->skipDisableMaintenanceMode = true;
+            $output->writeln('<info>Maintenance mode already enabled</info>');
+            return;
+        }
+
+        $this->maintenanceMode->set(true);
+        $this->skipDisableMaintenanceMode = false;
+        $output->writeln('<info>Enabling maintenance mode</info>');
+    }
+
+    /**
+     * Disable maintenance mode
+     *
+     * @param OutputInterface $output
+     * @return void
+     */
+    private function disableMaintenanceMode(OutputInterface $output)
+    {
+        if ($this->skipDisableMaintenanceMode) {
+            $output->writeln('<info>Skipped disabling maintenance mode</info>');
+            return;
+        }
+
+        $this->maintenanceMode->set(false);
+        $output->writeln('<info>Disabling maintenance mode</info>');
+    }
+
+    /**
+     * Run task in maintenance mode
+     *
+     * @param callable $task
+     * @param OutputInterface $output
+     * @param bool $holdMaintenanceOnFailure
+     * @return mixed
+     * @throws \Throwable if error occurred
+     */
+    public function executeInMaintenanceMode(callable $task, OutputInterface $output, bool $holdMaintenanceOnFailure)
+    {
+        $this->enableMaintenanceMode($output);
+
+        try {
+            $result = call_user_func($task);
+        } catch (\Throwable $e) {
+            if (!$holdMaintenanceOnFailure) {
+                $this->disableMaintenanceMode($output);
+            }
+            throw $e;
+        }
+
+        $this->disableMaintenanceMode($output);
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php b/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
new file mode 100644
index 0000000000000..8413b945a1141
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Magento\Framework\App\Request\InvalidRequestException;
+
+/**
+ * Action that's aware of CSRF protection.
+ */
+interface CsrfAwareActionInterface extends ActionInterface
+{
+    /**
+     * Create exception in case CSRF validation failed.
+     * Return null if default exception will suffice.
+     *
+     * @param RequestInterface $request
+     *
+     * @return InvalidRequestException|null
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException;
+
+    /**
+     * Perform custom request validation.
+     * Return null if default validation is needed.
+     *
+     * @param RequestInterface $request
+     *
+     * @return bool|null
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool;
+}
diff --git a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
index 61d0aa138f9a4..8a4188aed9605 100644
--- a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
+++ b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
@@ -32,6 +32,6 @@ public function __construct(array $parts)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 0fe7703ef81c0..615c295675adc 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,7 +70,7 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
-        return isset($this->flatData[$key]) ? $this->flatData[$key] : $defaultValue;
+        return $this->flatData[$key] ?? $defaultValue;
     }
 
     /**
@@ -117,7 +117,7 @@ public function resetData()
     }
 
     /**
-     * Check if data from deploy files is avaiable
+     * Check if data from deploy files is available
      *
      * @return bool
      * @since 100.1.3
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
index 06a66a2b3f873..ff7077213c5c3 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
@@ -9,7 +9,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\Phrase;
 
 /**
  * Deployment configuration reader.
@@ -87,6 +89,7 @@ public function getFiles()
      * @param string $fileKey The file key (deprecated)
      * @return array
      * @throws FileSystemException If file can not be read
+     * @throws RuntimeException If file is invalid
      * @throws \Exception If file key is not correct
      * @see FileReader
      */
@@ -99,6 +102,9 @@ public function load($fileKey = null)
             $filePath = $path . '/' . $this->configFilePool->getPath($fileKey);
             if ($fileDriver->isExists($filePath)) {
                 $result = include $filePath;
+                if (!is_array($result)) {
+                    throw new RuntimeException(new Phrase("Invalid configuration file: '%1'", [$filePath]));
+                }
             }
         } else {
             $configFiles = $this->configFilePool->getPaths();
@@ -108,11 +114,14 @@ public function load($fileKey = null)
                 $configFile = $path . '/' . $this->configFilePool->getPath($fileKey);
                 if ($fileDriver->isExists($configFile)) {
                     $fileData = include $configFile;
+                    if (!is_array($fileData)) {
+                        throw new RuntimeException(new Phrase("Invalid configuration file: '%1'", [$configFile]));
+                    }
                 } else {
                     continue;
                 }
                 $allFilesData[$configFile] = $fileData;
-                if (is_array($fileData) && count($fileData) > 0) {
+                if ($fileData) {
                     $result = array_replace_recursive($result, $fileData);
                 }
             }
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
index 3ff7a0c9539be..1722ca4fe2577 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\DeploymentConfig;
 
 use Magento\Framework\App\DeploymentConfig;
@@ -14,6 +15,7 @@
 
 /**
  * Deployment configuration writer to files: env.php, config.php.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Writer
 {
@@ -144,7 +146,7 @@ public function saveConfig(array $data, $override = false, $pool = null, array $
                     $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->writeFile($writeFilePath, $contents);
                 } catch (FileSystemException $e) {
                     throw new FileSystemException(
-                        new Phrase('Deployment config file %1 is not writable.', [$paths[$fileKey]])
+                        new Phrase('The "%1" deployment config file isn\'t writable.', [$paths[$fileKey]])
                     );
                 }
                 if (function_exists('opcache_invalidate')) {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
index b419b3827e5ff..d5a89c56b689f 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
@@ -11,6 +11,11 @@
  */
 class PhpFormatter implements FormatterInterface
 {
+    /**
+     * 4 space indentation for array formatting.
+     */
+    const INDENT = '    ';
+
     /**
      * Format deployment configuration.
      * If $comments is present, each item will be added
@@ -21,9 +26,9 @@ class PhpFormatter implements FormatterInterface
     public function format($data, array $comments = [])
     {
         if (!empty($comments) && is_array($data)) {
-            return "<?php\nreturn array (\n" . $this->formatData($data, $comments) . "\n);\n";
+            return "<?php\nreturn [\n" . $this->formatData($data, $comments) . "\n];\n";
         }
-        return "<?php\nreturn " . var_export($data, true) . ";\n";
+        return "<?php\nreturn " . $this->varExportShort($data, true) . ";\n";
     }
 
     /**
@@ -34,7 +39,7 @@ public function format($data, array $comments = [])
      * @param string $prefix
      * @return string
      */
-    private function formatData($data, $comments = [], $prefix = '  ')
+    private function formatData($data, $comments = [], $prefix = '    ')
     {
         $elements = [];
 
@@ -51,13 +56,12 @@ private function formatData($data, $comments = [], $prefix = '  ')
                     $elements[] = $prefix . " */";
                 }
 
-                $elements[] = $prefix . var_export($key, true) . ' => ' .
-                    (!is_array($value) ? var_export($value, true) . ',' : '');
-
                 if (is_array($value)) {
-                    $elements[] = $prefix . 'array (';
-                    $elements[] = $this->formatData($value, [], '  ' . $prefix);
-                    $elements[] = $prefix . '),';
+                    $elements[] = $prefix . $this->varExportShort($key) . ' => [';
+                    $elements[] = $this->formatData($value, [], '    ' . $prefix);
+                    $elements[] = $prefix . '],';
+                } else {
+                    $elements[] = $prefix . $this->varExportShort($key) . ' => ' . $this->varExportShort($value) . ',';
                 }
             }
             return implode("\n", $elements);
@@ -65,4 +69,29 @@ private function formatData($data, $comments = [], $prefix = '  ')
 
         return var_export($data, true);
     }
+
+    /**
+     * If variable to export is an array, format with the php >= 5.4 short array syntax. Otherwise use
+     * default var_export functionality.
+     *
+     * @param mixed $var
+     * @param integer $depth
+     * @return string
+     */
+    private function varExportShort($var, int $depth = 0)
+    {
+        if (!is_array($var)) {
+            return var_export($var, true);
+        }
+
+        $indexed = array_keys($var) === range(0, count($var) - 1);
+        $expanded = [];
+        foreach ($var as $key => $value) {
+            $expanded[] = str_repeat(self::INDENT, $depth)
+                . ($indexed ? '' : $this->varExportShort($key) . ' => ')
+                . $this->varExportShort($value, $depth + 1);
+        }
+
+        return sprintf("[\n%s\n%s]", implode(",\n", $expanded), str_repeat(self::INDENT, $depth - 1));
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php
new file mode 100644
index 0000000000000..1154749a75b94
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Feed.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Zend\Feed\Writer\FeedFactory;
+
+/**
+ * Default XML feed class
+ */
+class Feed implements FeedInterface
+{
+    /**
+     * @var array
+     */
+    private $feeds;
+
+    /**
+     * Feed constructor.
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->feeds = $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedContent() : string
+    {
+        return FeedFactory::factory($this->feeds)->export(FeedFactoryInterface::FORMAT_RSS);
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php
new file mode 100644
index 0000000000000..c80ece29f6143
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedFactory.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Magento\Framework\ObjectManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Feed factory
+ */
+class FeedFactory implements FeedFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var array
+     */
+    private $formats;
+
+    /**
+     * @param ObjectManagerInterface $objectManger
+     * @param LoggerInterface $logger
+     * @param array $formats
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManger,
+        LoggerInterface $logger,
+        array $formats
+    ) {
+        $this->objectManager = $objectManger;
+        $this->logger = $logger;
+        $this->formats = $formats;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data, string $format = FeedFactoryInterface::FORMAT_RSS) : FeedInterface
+    {
+        if (!isset($this->formats[$format])) {
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('The format is not supported')
+            );
+        }
+
+        if (!is_subclass_of($this->formats[$format], \Magento\Framework\App\FeedInterface::class)) {
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('Wrong format handler type')
+            );
+        }
+
+        try {
+            return $this->objectManager->create(
+                $this->formats[$format],
+                ['data' => $data]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            throw new \Magento\Framework\Exception\RuntimeException(
+                new \Magento\Framework\Phrase('There has been an error with import'),
+                $e
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
new file mode 100644
index 0000000000000..ac53a366bd127
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+/**
+ * Feed factory interface
+ */
+interface FeedFactoryInterface
+{
+    /**
+     * RSS feed input format
+     */
+    const FORMAT_RSS = 'rss';
+
+    /**
+     * Returns FeedInterface object from a custom array
+     *
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\RuntimeException
+     * @param array $data
+     * @param string $format
+     * @return FeedInterface
+     */
+    public function create(array $data, string $format = self::FORMAT_RSS) : FeedInterface;
+}
diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php
new file mode 100644
index 0000000000000..7d6346e107cfd
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+/**
+ * Feed interface
+ */
+interface FeedInterface
+{
+    /**
+     * Returns the formatted feed content
+     *
+     * @return string
+     */
+    public function getFormattedContent() : string;
+}
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
new file mode 100644
index 0000000000000..5ad3d888ffb57
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Filesystem;
+
+use Magento\Framework\Filesystem;
+
+/**
+ * Magento directories resolver.
+ */
+class DirectoryResolver
+{
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param DirectoryList $directoryList
+     * @param Filesystem $filesystem
+     */
+    public function __construct(DirectoryList $directoryList, Filesystem $filesystem)
+    {
+        $this->directoryList = $directoryList;
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Validate path.
+     *
+     * Gets real path for directory provided in parameters and compares it with specified root directory.
+     * Will return TRUE if real path of provided value contains root directory path and FALSE if not.
+     * Throws the \Magento\Framework\Exception\FileSystemException in case when directory path is absent
+     * in Directories configuration.
+     *
+     * @param string $path
+     * @param string $directoryConfig
+     * @return bool
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function validatePath($path, $directoryConfig = DirectoryList::MEDIA)
+    {
+        $directory = $this->filesystem->getDirectoryWrite($directoryConfig);
+        $realPath = $directory->getDriver()->getRealPathSafety($path);
+        $root = $this->directoryList->getPath($directoryConfig);
+
+        return strpos($realPath, $root) === 0;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
index 02b390289c9a9..ba23e010e3e3f 100644
--- a/lib/internal/Magento/Framework/App/FrontController.php
+++ b/lib/internal/Magento/Framework/App/FrontController.php
@@ -7,6 +7,18 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\App\Request\ValidatorInterface as RequestValidator;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Message\ManagerInterface as MessageManager;
+use Magento\Framework\App\Action\AbstractAction;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FrontController implements FrontControllerInterface
 {
     /**
@@ -15,32 +27,65 @@ class FrontController implements FrontControllerInterface
     protected $_routerList;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface
+     * @var ResponseInterface
      */
     protected $response;
 
+    /**
+     * @var RequestValidator
+     */
+    private $requestValidator;
+
+    /**
+     * @var MessageManager
+     */
+    private $messages;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var bool
+     */
+    private $validatedRequest = false;
+
     /**
      * @param RouterListInterface $routerList
-     * @param \Magento\Framework\App\ResponseInterface $response
+     * @param ResponseInterface $response
+     * @param RequestValidator|null $requestValidator
+     * @param MessageManager|null $messageManager
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         RouterListInterface $routerList,
-        \Magento\Framework\App\ResponseInterface $response
+        ResponseInterface $response,
+        ?RequestValidator $requestValidator = null,
+        ?MessageManager $messageManager = null,
+        ?LoggerInterface $logger = null
     ) {
         $this->_routerList = $routerList;
         $this->response = $response;
+        $this->requestValidator = $requestValidator
+            ?? ObjectManager::getInstance()->get(RequestValidator::class);
+        $this->messages = $messageManager
+            ?? ObjectManager::getInstance()->get(MessageManager::class);
+        $this->logger = $logger
+            ?? ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
      * Perform action and generate response
      *
-     * @param RequestInterface $request
-     * @return ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @param RequestInterface|HttpRequest $request
+     * @return ResponseInterface|ResultInterface
      * @throws \LogicException
      */
     public function dispatch(RequestInterface $request)
     {
         \Magento\Framework\Profiler::start('routers_match');
+        $this->validatedRequest = false;
         $routingCycleCounter = 0;
         $result = null;
         while (!$request->isDispatched() && $routingCycleCounter++ < 100) {
@@ -49,13 +94,10 @@ public function dispatch(RequestInterface $request)
                 try {
                     $actionInstance = $router->match($request);
                     if ($actionInstance) {
-                        $request->setDispatched(true);
-                        $this->response->setNoCacheHeaders();
-                        if ($actionInstance instanceof \Magento\Framework\App\Action\AbstractAction) {
-                            $result = $actionInstance->dispatch($request);
-                        } else {
-                            $result = $actionInstance->execute();
-                        }
+                        $result = $this->processRequest(
+                            $request,
+                            $actionInstance
+                        );
                         break;
                     }
                 } catch (\Magento\Framework\Exception\NotFoundException $e) {
@@ -72,4 +114,58 @@ public function dispatch(RequestInterface $request)
         }
         return $result;
     }
+
+    /**
+     * @param HttpRequest $request
+     * @param ActionInterface $actionInstance
+     * @throws NotFoundException
+     *
+     * @return ResponseInterface|ResultInterface
+     */
+    private function processRequest(
+        HttpRequest $request,
+        ActionInterface $actionInstance
+    ) {
+        $request->setDispatched(true);
+        $this->response->setNoCacheHeaders();
+        $result = null;
+
+        //Validating a request only once.
+        if (!$this->validatedRequest) {
+            try {
+                $this->requestValidator->validate(
+                    $request,
+                    $actionInstance
+                );
+            } catch (InvalidRequestException $exception) {
+                //Validation failed - processing validation results.
+                $this->logger->debug(
+                    'Request validation failed for action "'
+                    .get_class($actionInstance) .'"'
+                );
+                $result = $exception->getReplaceResult();
+                if ($messages = $exception->getMessages()) {
+                    foreach ($messages as $message) {
+                        $this->messages->addErrorMessage($message);
+                    }
+                }
+            }
+            $this->validatedRequest = true;
+        }
+
+        //Validation did not produce a result to replace the action's.
+        if (!$result) {
+            if ($actionInstance instanceof AbstractAction) {
+                $result = $actionInstance->dispatch($request);
+            } else {
+                $result = $actionInstance->execute();
+            }
+        }
+
+        //handling redirect to 404
+        if ($result instanceof NotFoundException) {
+            throw $result;
+        }
+        return $result;
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Http/Context.php b/lib/internal/Magento/Framework/App/Http/Context.php
index a5eba2753b510..79a15110234cd 100644
--- a/lib/internal/Magento/Framework/App/Http/Context.php
+++ b/lib/internal/Magento/Framework/App/Http/Context.php
@@ -84,9 +84,7 @@ public function unsValue($name)
      */
     public function getValue($name)
     {
-        return isset($this->data[$name])
-            ? $this->data[$name]
-            : (isset($this->default[$name]) ? $this->default[$name] : null);
+        return $this->data[$name] ?? ($this->default[$name] ?? null);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/HttpRequestInterface.php b/lib/internal/Magento/Framework/App/HttpRequestInterface.php
new file mode 100644
index 0000000000000..674ccdb07f49f
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/HttpRequestInterface.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+interface HttpRequestInterface
+{
+    /**
+     * Returned true if POST request
+     *
+     * @return boolean
+     */
+    public function isPost();
+
+    /**
+     * Returned true if GET request
+     *
+     * @return boolean
+     */
+    public function isGet();
+
+    /**
+     * Returned true if PATCH request
+     *
+     * @return boolean
+     */
+    public function isPatch();
+
+    /**
+     * Returned true if DELETE request
+     *
+     * @return boolean
+     */
+    public function isDelete();
+
+    /**
+     * Returned true if PUT request
+     *
+     * @return boolean
+     */
+    public function isPut();
+
+    /**
+     * Returned true if Ajax request
+     *
+     * @return boolean
+     */
+    public function isAjax();
+}
diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
index a8dc20d9465a3..d9a5ccb00d892 100644
--- a/lib/internal/Magento/Framework/App/Language/Dictionary.php
+++ b/lib/internal/Magento/Framework/App/Language/Dictionary.php
@@ -85,7 +85,7 @@ public function getDictionary($languageCode)
                 } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         new \Magento\Framework\Phrase(
-                            "Invalid XML in file %1:\n%2",
+                            'The XML in file "%1" is invalid:' . "\n%2\nVerify the XML and try again.",
                             [$path . '/language.xml', $e->getMessage()]
                         ),
                         $e
@@ -111,7 +111,9 @@ public function getDictionary($languageCode)
             /** @var Config $languageConfig */
             $languageConfig = $packInfo['language'];
             $dictionary = $this->readPackCsv($languageConfig->getVendor(), $languageConfig->getPackage());
-            $result = array_merge($result, $dictionary);
+            foreach ($dictionary as $key => $value) {
+                $result[$key] = $value;
+            }
         }
         return $result;
     }
@@ -193,7 +195,9 @@ private function readPackCsv($vendor, $package)
             foreach ($foundCsvFiles as $foundCsvFile) {
                 $file = $directoryRead->openFile($foundCsvFile);
                 while (($row = $file->readCsv()) !== false) {
-                    $result[$row[0]] = $row[1];
+                    if (is_array($row) && count($row) > 1) {
+                        $result[$row[0]] = $row[1];
+                    }
                 }
             }
         }
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriter/Filesystem.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriter/Filesystem.php
new file mode 100644
index 0000000000000..2b1cdd2a9c10b
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriter/Filesystem.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\ObjectManager\ConfigWriter;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager\ConfigWriterInterface;
+
+/**
+ * @inheritdoc
+ */
+class Filesystem implements ConfigWriterInterface
+{
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @param DirectoryList $directoryList
+     */
+    public function __construct(
+        DirectoryList $directoryList
+    ) {
+        $this->directoryList = $directoryList;
+    }
+
+    /**
+     * Writes config in storage
+     *
+     * @param string $key
+     * @param array $config
+     * @return void
+     */
+    public function write(string $key, array $config)
+    {
+        $this->initialize();
+        $configuration = sprintf('<?php return %s;', var_export($config, true));
+        file_put_contents(
+            $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $key  . '.php',
+            $configuration
+        );
+    }
+
+    /**
+     * Initializes writer
+     *
+     * @return void
+     */
+    private function initialize()
+    {
+        if (!file_exists($this->directoryList->getPath(DirectoryList::GENERATED_METADATA))) {
+            mkdir($this->directoryList->getPath(DirectoryList::GENERATED_METADATA));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
new file mode 100644
index 0000000000000..cccbb0ae30b99
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\ObjectManager;
+
+/**
+ * Write compiled object manager configuration to storage
+ */
+interface ConfigWriterInterface
+{
+    /**
+     * Writes config in storage
+     *
+     * @param string $key
+     * @param array $config
+     * @return void
+     */
+    public function write(string $key, array $config);
+}
diff --git a/lib/internal/Magento/Framework/App/Request/CompositeValidator.php b/lib/internal/Magento/Framework/App/Request/CompositeValidator.php
new file mode 100644
index 0000000000000..2b5205fddc9c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/CompositeValidator.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Use sequence of validators to validate requests.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct(array $validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void {
+        foreach ($this->validators as $validator) {
+            $validator->validate($request, $action);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/CsrfValidator.php b/lib/internal/Magento/Framework/App/Request/CsrfValidator.php
new file mode 100644
index 0000000000000..c930fc920907c
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/CsrfValidator.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\State as AppState;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Validate request for being CSRF protected.
+ */
+class CsrfValidator implements ValidatorInterface
+{
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactory;
+
+    /**
+     * @var AppState
+     */
+    private $appState;
+
+    /**
+     * @param FormKeyValidator $formKeyValidator
+     * @param RedirectFactory $redirectFactory
+     * @param AppState $appState
+     */
+    public function __construct(
+        FormKeyValidator $formKeyValidator,
+        RedirectFactory $redirectFactory,
+        AppState $appState
+    ) {
+        $this->formKeyValidator = $formKeyValidator;
+        $this->redirectFactory = $redirectFactory;
+        $this->appState = $appState;
+    }
+
+    /**
+     * @param HttpRequest $request
+     * @param ActionInterface  $action
+     *
+     * @return bool
+     */
+    private function validateRequest(
+        HttpRequest $request,
+        ActionInterface $action
+    ): bool {
+        $valid = null;
+        if ($action instanceof CsrfAwareActionInterface) {
+            $valid = $action->validateForCsrf($request);
+        }
+        if ($valid === null) {
+            $valid = !$request->isPost()
+                || $request->isAjax()
+                || $this->formKeyValidator->validate($request);
+        }
+
+        return $valid;
+    }
+
+    /**
+     * @param HttpRequest $request
+     * @param ActionInterface $action
+     *
+     * @return InvalidRequestException
+     */
+    private function createException(
+        HttpRequest $request,
+        ActionInterface $action
+    ): InvalidRequestException {
+        $exception = null;
+        if ($action instanceof CsrfAwareActionInterface) {
+            $exception = $action->createCsrfValidationException($request);
+        }
+        if (!$exception) {
+            $response = $this->redirectFactory->create()
+                ->setRefererOrBaseUrl()
+                ->setHttpResponseCode(302);
+            $messages = [
+                new Phrase('Invalid Form Key. Please refresh the page.'),
+            ];
+            $exception = new InvalidRequestException($response, $messages);
+        }
+
+        return $exception;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void {
+        try {
+            $areaCode = $this->appState->getAreaCode();
+        } catch (LocalizedException $exception) {
+            $areaCode = null;
+        }
+        if ($request instanceof HttpRequest
+            && in_array(
+                $areaCode,
+                [Area::AREA_FRONTEND, Area::AREA_ADMINHTML],
+                true
+            )
+        ) {
+            $valid = $this->validateRequest($request, $action);
+            if (!$valid) {
+                throw $this->createException($request, $action);
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/DataPersistor.php b/lib/internal/Magento/Framework/App/Request/DataPersistor.php
index bb3740aceb010..f0b8819621a1e 100644
--- a/lib/internal/Magento/Framework/App/Request/DataPersistor.php
+++ b/lib/internal/Magento/Framework/App/Request/DataPersistor.php
@@ -5,8 +5,12 @@
  */
 namespace Magento\Framework\App\Request;
 
+use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Session\SessionManagerInterface;
 
+/**
+ * Persist data to session.
+ */
 class DataPersistor implements DataPersistorInterface
 {
     /**
@@ -32,7 +36,7 @@ public function __construct(
      */
     public function set($key, $data)
     {
-        $method = 'set' . ucfirst($key) . 'Data';
+        $method = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key) . 'Data';
         call_user_func_array([$this->session, $method], [$data]);
     }
 
@@ -44,7 +48,7 @@ public function set($key, $data)
      */
     public function get($key)
     {
-        $method = 'get' . ucfirst($key) . 'Data';
+        $method = 'get' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key) . 'Data';
         return call_user_func_array([$this->session, $method], []);
     }
 
@@ -56,7 +60,7 @@ public function get($key)
      */
     public function clear($key)
     {
-        $method = 'uns' . ucfirst($key) . 'Data';
+        $method = 'uns' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($key) . 'Data';
         call_user_func_array([$this->session, $method], []);
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 5d4ca42d66cbe..4e709ed276954 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\App\Request;
 
+use Magento\Framework\App\HttpRequestInterface;
 use Magento\Framework\App\RequestContentInterface;
 use Magento\Framework\App\RequestSafetyInterface;
 use Magento\Framework\App\Route\ConfigInterface\Proxy as ConfigInterface;
@@ -16,7 +17,7 @@
 /**
  * Http request
  */
-class Http extends Request implements RequestContentInterface, RequestSafetyInterface
+class Http extends Request implements RequestContentInterface, RequestSafetyInterface, HttpRequestInterface
 {
     /**#@+
      * HTTP Ports
@@ -94,14 +95,20 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
      */
     private $distroBaseUrl;
 
+    /**
+     * @var PathInfo
+     */
+    private $pathInfoService;
+
     /**
      * @param CookieReaderInterface $cookieReader
      * @param StringUtils $converter
      * @param ConfigInterface $routeConfig
      * @param PathInfoProcessorInterface $pathInfoProcessor
-     * @param ObjectManagerInterface  $objectManager
+     * @param ObjectManagerInterface $objectManager
      * @param \Zend\Uri\UriInterface|string|null $uri
      * @param array $directFrontNames
+     * @param PathInfo|null $pathInfoService
      */
     public function __construct(
         CookieReaderInterface $cookieReader,
@@ -110,94 +117,71 @@ public function __construct(
         PathInfoProcessorInterface $pathInfoProcessor,
         ObjectManagerInterface $objectManager,
         $uri = null,
-        $directFrontNames = []
+        $directFrontNames = [],
+        PathInfo $pathInfoService = null
     ) {
         parent::__construct($cookieReader, $converter, $uri);
         $this->routeConfig = $routeConfig;
         $this->pathInfoProcessor = $pathInfoProcessor;
         $this->objectManager = $objectManager;
         $this->directFrontNames = $directFrontNames;
+        $this->pathInfoService = $pathInfoService ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            PathInfo::class
+        );
     }
 
     /**
-     * Returns ORIGINAL_PATH_INFO.
-     * This value is calculated instead of reading PATH_INFO
-     * directly from $_SERVER due to cross-platform differences.
+     * Return the ORIGINAL_PATH_INFO.
+     * This value is calculated and processed from $_SERVER due to cross-platform differences.
+     * instead of reading PATH_INFO
      *
      * @return string
      */
     public function getOriginalPathInfo()
     {
         if (empty($this->originalPathInfo)) {
-            $this->setPathInfo();
+            $originalPathInfoFromRequest = $this->pathInfoService->getPathInfo(
+                $this->getRequestUri(),
+                $this->getBaseUrl()
+            );
+            $this->originalPathInfo = (string)$this->pathInfoProcessor->process($this, $originalPathInfoFromRequest);
+            $this->requestString = $this->originalPathInfo
+                . $this->pathInfoService->getQueryString($this->getRequestUri());
         }
         return $this->originalPathInfo;
     }
 
     /**
-     * Set the PATH_INFO string
-     * Set the ORIGINAL_PATH_INFO string
-     *
-     * @param string|null $pathInfo
-     * @return $this
-     */
-    public function setPathInfo($pathInfo = null)
-    {
-        if ($pathInfo === null) {
-            $requestUri = $this->getRequestUri();
-            if ('/' === $requestUri) {
-                return $this;
-            }
-
-            $requestUri = $this->removeRepitedSlashes($requestUri);
-            $parsedRequestUri = explode('?', $requestUri, 2);
-            $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1];
-            $baseUrl = $this->getBaseUrl();
-            $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl));
-
-            if ($this->isNoRouteUri($baseUrl, $pathInfo)) {
-                $pathInfo = 'noroute';
-            }
-            $pathInfo = $this->pathInfoProcessor->process($this, $pathInfo);
-            $this->originalPathInfo = (string)$pathInfo;
-            $this->requestString = $pathInfo . $queryString;
-        }
-        $this->pathInfo = (string)$pathInfo;
-        return $this;
-    }
-
-    /**
-     * Remove repeated slashes from the start of the path.
+     * Return the path info
      *
-     * @param string $pathInfo
      * @return string
      */
-    private function removeRepitedSlashes($pathInfo)
+    public function getPathInfo()
     {
-        $firstChar = (string)substr($pathInfo, 0, 1);
-        if ($firstChar == '/') {
-            $pathInfo = '/' . ltrim($pathInfo, '/');
+        if (empty($this->pathInfo)) {
+            $this->pathInfo = $this->getOriginalPathInfo();
         }
-
-        return $pathInfo;
+        return $this->pathInfo;
     }
 
     /**
-     * Check is URI should be marked as no route, helps route to 404 URI like `index.phpadmin`.
+     * Set the PATH_INFO string.
+     *
+     * Set the ORIGINAL_PATH_INFO string.
      *
-     * @param string $baseUrl
-     * @param string $pathInfo
-     * @return bool
+     * @param string|null $pathInfo
+     * @return $this
      */
-    private function isNoRouteUri($baseUrl, $pathInfo)
+    public function setPathInfo($pathInfo = null)
     {
-        $firstChar = (string)substr($pathInfo, 0, 1);
-        return $baseUrl !== '' && !in_array($firstChar, ['/', '']);
+        $this->pathInfo = (string)$pathInfo;
+        return $this;
     }
 
     /**
-     * Check if code declared as direct access frontend name
-     * this mean what this url can be used without store code
+     * Check if code declared as direct access frontend name.
+     *
+     * This means what this url can be used without store code.
      *
      * @param   string $code
      * @return  bool
@@ -283,8 +267,7 @@ public function getControllerModule()
     }
 
     /**
-     * Collect properties changed by _forward in protected storage
-     * before _forward was called first time.
+     * Collect properties changed by _forward in protected storage before _forward was called first time.
      *
      * @return $this
      */
@@ -426,6 +409,8 @@ public function getFullActionName($delimiter = '_')
     }
 
     /**
+     * Sleep
+     *
      * @return array
      */
     public function __sleep()
@@ -434,7 +419,7 @@ public function __sleep()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isSafeMethod()
     {
diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php
new file mode 100644
index 0000000000000..4e7216954b0d4
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+/**
+ * Map of HTTP methods and interfaces that an action implements in order to process them.
+ */
+class HttpMethodMap
+{
+    /**
+     * @var string[]
+     */
+    private $map;
+
+    /**
+     * @param string[] $map
+     */
+    public function __construct(array $map)
+    {
+        $this->map = $this->processMap($map);
+    }
+
+    /**
+     * Filter given map.
+     *
+     * @param array $map
+     * @throws \InvalidArgumentException
+     *
+     * @return string[]
+     */
+    private function processMap(array $map): array
+    {
+        $filtered = [];
+        foreach ($map as $method => $interface) {
+            $interface = trim(preg_replace('/^\\\+/', '', $interface));
+            if (!(interface_exists($interface) || class_exists($interface))) {
+                throw new \InvalidArgumentException(
+                    "Interface '$interface' does not exist"
+                );
+            }
+            if (!$method) {
+                throw new \InvalidArgumentException('Invalid method given');
+            }
+
+            $filtered[$method] = $interface;
+        }
+
+        return $filtered;
+    }
+
+    /**
+     * Where keys are methods' names and values are interfaces' names.
+     *
+     * @return string[]
+     *
+     * @see \Zend\Http\Request Has list of methods as METHOD_* constants.
+     */
+    public function getMap(): array
+    {
+        return $this->map;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php
new file mode 100644
index 0000000000000..d3eb514caad1e
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Interception\InterceptorInterface;
+use Magento\Framework\Phrase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Make sure that a request's method can be processed by an action.
+ */
+class HttpMethodValidator implements ValidatorInterface
+{
+    /**
+     * @var HttpMethodMap
+     */
+    private $map;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $log;
+
+    /**
+     * @param HttpMethodMap $map
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        HttpMethodMap $map,
+        LoggerInterface $logger
+    ) {
+        $this->map = $map;
+        $this->log = $logger;
+    }
+
+    /**
+     * Create exception when invalid HTTP method used.
+     *
+     * @param Http $request
+     * @param ActionInterface $action
+     * @throws InvalidRequestException
+     *
+     * @return void
+     */
+    private function throwException(
+        Http $request,
+        ActionInterface $action
+    ): void {
+        $uri = $request->getRequestUri();
+        $method = $request->getMethod();
+        if ($action instanceof InterceptorInterface) {
+            $actionClass = get_parent_class($action);
+        } else {
+            $actionClass = get_class($action);
+        }
+        $this->log->debug(
+            "URI '$uri'' cannot be accessed with $method method ($actionClass)"
+        );
+
+        throw new InvalidRequestException(
+            new NotFoundException(new Phrase('Page not found.'))
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void {
+        if ($request instanceof Http) {
+            $method = $request->getMethod();
+            $map = $this->map->getMap();
+            //If we don't have an interface for the HTTP method or
+            //the action has HTTP method limitations and doesn't allow the
+            //received one then the request is invalid.
+            if (!array_key_exists($method, $map)
+                || (array_intersect($map, class_implements($action, true))
+                    && !$action instanceof $map[$method]
+                )
+            ) {
+                $this->throwException($request, $action);
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
new file mode 100644
index 0000000000000..f15ce494e9bb4
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Phrase;
+
+/**
+ * Received request is invalid.
+ */
+class InvalidRequestException extends RuntimeException
+{
+    /**
+     * @var ResponseInterface|ResultInterface
+     */
+    private $replaceResult;
+
+    /**
+     * @var Phrase[]|null
+     */
+    private $messages;
+
+    /**
+     * @param ResponseInterface|ResultInterface|NotFoundException $replaceResult
+     * Use this result instead of calling an action instance,
+     * if NotFoundException is given the the default 404 mechanism will be triggered.
+     * @param Phrase[]|null $messages Messages to show to client
+     * as error messages.
+     */
+    public function __construct($replaceResult, ?array $messages = null)
+    {
+        parent::__construct(new Phrase('Invalid request received'));
+
+        $this->replaceResult = $replaceResult;
+        $this->messages = $messages;
+    }
+
+    /**
+     * @return ResponseInterface|ResultInterface|NotFoundException
+     */
+    public function getReplaceResult()
+    {
+        return $this->replaceResult;
+    }
+
+    /**
+     * @return Phrase[]|null
+     */
+    public function getMessages(): ?array
+    {
+        return $this->messages;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/PathInfo.php b/lib/internal/Magento/Framework/App/Request/PathInfo.php
new file mode 100644
index 0000000000000..76a12d6aefe98
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/PathInfo.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\App\Request;
+
+/**
+ * Computes path info and query string from request
+ */
+class PathInfo
+{
+    /**
+     * Get path info using from the request URI and base URL
+     *
+     * @param string $requestUri
+     * @param string $baseUrl
+     * @return string
+     */
+    public function getPathInfo(string $requestUri, string $baseUrl) : string
+    {
+        if ($requestUri === '/') {
+            return '';
+        }
+
+        $requestUri = $this->removeRepeatedSlashes($requestUri);
+        $parsedRequestUri = explode('?', $requestUri, 2);
+        $pathInfo = (string)substr(current($parsedRequestUri), (int)strlen($baseUrl));
+
+        if ($this->isNoRouteUri($baseUrl, $pathInfo)) {
+            $pathInfo = \Magento\Framework\App\Router\Base::NO_ROUTE;
+        }
+        return $pathInfo;
+    }
+
+    /**
+     * Get query string using from the request URI
+     *
+     * @param string $requestUri
+     * @return string
+     */
+    public function getQueryString(string $requestUri) : string
+    {
+        $requestUri = $this->removeRepeatedSlashes($requestUri);
+        $parsedRequestUri = explode('?', $requestUri, 2);
+        $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1];
+        return $queryString;
+    }
+
+    /**
+     * Remove repeated slashes from the start of the path.
+     *
+     * @param string $pathInfo
+     * @return string
+     */
+    private function removeRepeatedSlashes($pathInfo) : string
+    {
+        $firstChar = (string)substr($pathInfo, 0, 1);
+        if ($firstChar == '/') {
+            $pathInfo = '/' . ltrim($pathInfo, '/');
+        }
+
+        return $pathInfo;
+    }
+
+    /**
+     * Check is URI should be marked as no route, helps route to 404 URI like `index.phpadmin`.
+     *
+     * @param string $baseUrl
+     * @param string $pathInfo
+     * @return bool
+     */
+    private function isNoRouteUri($baseUrl, $pathInfo) : bool
+    {
+        $firstChar = (string)substr($pathInfo, 0, 1);
+        return $baseUrl !== '' && !in_array($firstChar, ['/', '']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php b/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
new file mode 100644
index 0000000000000..f4b1503ac5cb6
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Validate interface before giving passing it to an ActionInterface.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate request and throw the exception if it's invalid.
+     *
+     * @param RequestInterface $request
+     * @param ActionInterface $action
+     * @throws InvalidRequestException If request was invalid.
+     *
+     * @return void
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void;
+}
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index 4a093dada3559..b543cc970f640 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -5,14 +5,15 @@
  */
 namespace Magento\Framework\App;
 
-use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
-use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 
 /**
  * Application provides ability to configure multiple connections to persistent storage.
+ *
  * This class provides access to all these connections.
+ *
  * @api
  */
 class ResourceConnection
@@ -26,35 +27,35 @@ class ResourceConnection
     const DEFAULT_CONNECTION = 'default';
 
     /**
-     * Instances of actual connections
+     * Instances of actual connections.
      *
      * @var \Magento\Framework\DB\Adapter\AdapterInterface[]
      */
     protected $connections = [];
 
     /**
-     * Mapped tables cache array
+     * Mapped tables cache array.
      *
      * @var array
      */
     protected $mappedTableNames;
 
     /**
-     * Resource config
+     * Resource config.
      *
      * @var ResourceConfigInterface
      */
     protected $config;
 
     /**
-     * Resource connection adapter factory
+     * Resource connection adapter factory.
      *
      * @var ConnectionFactoryInterface
      */
     protected $connectionFactory;
 
     /**
-     * @var DeploymentConfig $deploymentConfig
+     * @var DeploymentConfig
      */
     private $deploymentConfig;
 
@@ -82,7 +83,7 @@ public function __construct(
     }
 
     /**
-     * Retrieve connection to resource specified by $resourceName
+     * Retrieve connection to resource specified by $resourceName.
      *
      * @param string $resourceName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
@@ -92,24 +93,39 @@ public function __construct(
     public function getConnection($resourceName = self::DEFAULT_CONNECTION)
     {
         $connectionName = $this->config->getConnectionName($resourceName);
-        return $this->getConnectionByName($connectionName);
+        $connection = $this->getConnectionByName($connectionName);
+        return $connection;
     }
 
     /**
+     * Close connection.
+     *
      * @param string $resourceName
      * @return void
      * @since 100.1.3
      */
     public function closeConnection($resourceName = self::DEFAULT_CONNECTION)
     {
-        $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
-        if (isset($this->connections[$processConnectionName])) {
-            $this->connections[$processConnectionName] = null;
+        if ($resourceName === null) {
+            foreach ($this->connections as $processConnection) {
+                if ($processConnection !== null) {
+                    $processConnection->closeConnection();
+                }
+            }
+            $this->connections = [];
+        } else {
+            $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
+            if (isset($this->connections[$processConnectionName])) {
+                if ($this->connections[$processConnectionName] !== null) {
+                    $this->connections[$processConnectionName]->closeConnection();
+                }
+                $this->connections[$processConnectionName] = null;
+            }
         }
     }
 
     /**
-     * Retrieve connection by $connectionName
+     * Retrieve connection by $connectionName.
      *
      * @param string $connectionName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
@@ -137,6 +153,8 @@ public function getConnectionByName($connectionName)
     }
 
     /**
+     * Get conneciton name for process.
+     *
      * @param string $connectionName
      * @return string
      */
@@ -146,7 +164,7 @@ private function getProcessConnectionName($connectionName)
     }
 
     /**
-     * Get resource table name, validated by db adapter
+     * Get resource table name, validated by db adapter.
      *
      * @param   string|string[] $modelEntity
      * @param string $connectionName
@@ -179,7 +197,7 @@ public function getTableName($modelEntity, $connectionName = self::DEFAULT_CONNE
     }
 
     /**
-     * Gets table placeholder by table name
+     * Gets table placeholder by table name.
      *
      * @param string $tableName
      * @return string
@@ -192,7 +210,7 @@ public function getTablePlaceholder($tableName)
     }
 
     /**
-     * Build a trigger name
+     * Build a trigger name.
      *
      * @param string $tableName  The table that is the subject of the trigger
      * @param string $time  Either "before" or "after"
@@ -205,7 +223,7 @@ public function getTriggerName($tableName, $time, $event)
     }
 
     /**
-     * Set mapped table name
+     * Set mapped table name.
      *
      * @param string $tableName
      * @param string $mappedName
@@ -219,7 +237,7 @@ public function setMappedTableName($tableName, $mappedName)
     }
 
     /**
-     * Get mapped table name
+     * Get mapped table name.
      *
      * @param string $tableName
      * @return bool|string
@@ -234,7 +252,7 @@ public function getMappedTableName($tableName)
     }
 
     /**
-     * Retrieve 32bit UNIQUE HASH for a Table index
+     * Retrieve 32bit UNIQUE HASH for a Table index.
      *
      * @param string $tableName
      * @param string|string[] $fields
@@ -255,7 +273,7 @@ public function getIdxName(
     }
 
     /**
-     * Retrieve 32bit UNIQUE HASH for a Table foreign key
+     * Retrieve 32bit UNIQUE HASH for a Table foreign key.
      *
      * @param string $priTableName  the target table name
      * @param string $priColumnName the target table column name
@@ -274,17 +292,36 @@ public function getFkName($priTableName, $priColumnName, $refTableName, $refColu
     }
 
     /**
-     * Get table prefix
+     * Retrieve db name.
+     *
+     * That name can be needed, when we do request in information_schema to identify db.
+     *
+     * @param string $resourceName
+     * @return string
+     */
+    public function getSchemaName($resourceName)
+    {
+        return $this->deploymentConfig->get(
+            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS .
+            '/' .
+            $resourceName .
+            '/dbname'
+        );
+    }
+
+    /**
+     * Get table prefix.
      *
      * @return string
      */
-    private function getTablePrefix()
+    public function getTablePrefix()
     {
-        if (null === $this->tablePrefix) {
-            $this->tablePrefix = (string)$this->deploymentConfig->get(
-                ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX
-            );
+        if ($this->tablePrefix !== null) {
+            return $this->tablePrefix;
         }
-        return $this->tablePrefix;
+
+        return (string) $this->deploymentConfig->get(
+            ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Response/HeaderManager.php b/lib/internal/Magento/Framework/App/Response/HeaderManager.php
index 1c2721b862ad1..8b127d5f111a7 100644
--- a/lib/internal/Magento/Framework/App/Response/HeaderManager.php
+++ b/lib/internal/Magento/Framework/App/Response/HeaderManager.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Response;
 
 use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
@@ -24,7 +25,7 @@ public function __construct($headerProviderList)
     {
         foreach ($headerProviderList as $header) {
             if (!($header instanceof HeaderProviderInterface)) {
-                throw new LocalizedException(new Phrase('Invalid header provider'));
+                throw new LocalizedException(new Phrase('The header provider is invalid. Verify and try again.'));
             }
         }
         $this->headerProviders = $headerProviderList;
diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
index 099b1500cb14b..62ff94e7043f5 100644
--- a/lib/internal/Magento/Framework/App/Response/Http.php
+++ b/lib/internal/Magento/Framework/App/Response/Http.php
@@ -9,10 +9,12 @@
 
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Session\Config\ConfigInterface;
 
 class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
 {
@@ -50,25 +52,33 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
      */
     protected $dateTime;
 
+    /**
+     * @var \Magento\Framework\Session\Config\ConfigInterface
+     */
+    private $sessionConfig;
+
     /**
      * @param HttpRequest $request
      * @param CookieManagerInterface $cookieManager
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param Context $context
      * @param DateTime $dateTime
+     * @param ConfigInterface|null $sessionConfig
      */
     public function __construct(
         HttpRequest $request,
         CookieManagerInterface $cookieManager,
         CookieMetadataFactory $cookieMetadataFactory,
         Context $context,
-        DateTime $dateTime
+        DateTime $dateTime,
+        ConfigInterface $sessionConfig = null
     ) {
         $this->request = $request;
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->context = $context;
         $this->dateTime = $dateTime;
+        $this->sessionConfig = $sessionConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
@@ -91,7 +101,10 @@ public function sendVary()
     {
         $varyString = $this->context->getVaryString();
         if ($varyString) {
-            $sensitiveCookMetadata = $this->cookieMetadataFactory->createSensitiveCookieMetadata()->setPath('/');
+            $cookieLifeTime = $this->sessionConfig->getCookieLifetime();
+            $sensitiveCookMetadata = $this->cookieMetadataFactory->createSensitiveCookieMetadata(
+                [CookieMetadata::KEY_DURATION => $cookieLifeTime]
+            )->setPath('/');
             $this->cookieManager->setSensitiveCookie(self::COOKIE_VARY_STRING, $varyString, $sensitiveCookMetadata);
         } elseif ($this->request->get(self::COOKIE_VARY_STRING)) {
             $cookieMetadata = $this->cookieMetadataFactory->createSensitiveCookieMetadata()->setPath('/');
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 979ea1c429590..19a89681a2d5f 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -59,6 +59,7 @@ public function create(
         $dir = $this->_filesystem->getDirectoryWrite($baseDir);
         $isFile = false;
         $file = null;
+        $fileContent = $this->getFileContent($content);
         if (is_array($content)) {
             if (!isset($content['type']) || !isset($content['value'])) {
                 throw new \InvalidArgumentException("Invalid arguments. Keys 'type' and 'value' are required.");
@@ -76,7 +77,7 @@ public function create(
             ->setHeader('Pragma', 'public', true)
             ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
             ->setHeader('Content-type', $contentType, true)
-            ->setHeader('Content-Length', $contentLength === null ? strlen($content) : $contentLength, true)
+            ->setHeader('Content-Length', $contentLength === null ? strlen($fileContent) : $contentLength, true)
             ->setHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"', true)
             ->setHeader('Last-Modified', date('r'), true);
 
@@ -88,7 +89,8 @@ public function create(
                     echo $stream->read(1024);
                 }
             } else {
-                $dir->writeFile($fileName, $content);
+                $dir->writeFile($fileName, $fileContent);
+                $file = $fileName;
                 $stream = $dir->openFile($fileName, 'r');
                 while (!$stream->eof()) {
                     echo $stream->read(1024);
@@ -102,4 +104,19 @@ public function create(
         }
         return $this->_response;
     }
+
+    /**
+     * Returns file content for writing.
+     *
+     * @param string|array $content
+     * @return string|array
+     */
+    private function getFileContent($content)
+    {
+        if (isset($content['type']) && $content['type'] === 'string') {
+            return $content['value'];
+        }
+
+        return $content;
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
index ed9def8e1cf55..f810adcfd3491 100644
--- a/lib/internal/Magento/Framework/App/Router/Base.php
+++ b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -8,11 +8,18 @@
 namespace Magento\Framework\App\Router;
 
 /**
+ * Base router implementation.
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Base implements \Magento\Framework\App\RouterInterface
 {
+    /**
+     * No route constant used for request
+     */
+    const NO_ROUTE = 'noroute';
+
     /**
      * @var \Magento\Framework\App\ActionFactory
      */
@@ -303,7 +310,7 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
             if ($actionInstance === null) {
                 return null;
             }
-            $action = 'noroute';
+            $action = self::NO_ROUTE;
         }
 
         // set values only after all the checks are done
@@ -333,6 +340,7 @@ public function getActionClassName($module, $actionPath)
 
     /**
      * Check that request uses https protocol if it should.
+     *
      * Function redirects user to correct URL if needed.
      *
      * @param \Magento\Framework\App\RequestInterface $request
diff --git a/lib/internal/Magento/Framework/App/RouterList.php b/lib/internal/Magento/Framework/App/RouterList.php
index ae14f1ad3d2f4..75ea8766c960f 100644
--- a/lib/internal/Magento/Framework/App/RouterList.php
+++ b/lib/internal/Magento/Framework/App/RouterList.php
@@ -119,14 +119,6 @@ public function rewind()
      */
     protected function compareRoutersSortOrder($routerDataFirst, $routerDataSecond)
     {
-        if ((int)$routerDataFirst['sortOrder'] == (int)$routerDataSecond['sortOrder']) {
-            return 0;
-        }
-
-        if ((int)$routerDataFirst['sortOrder'] < (int)$routerDataSecond['sortOrder']) {
-            return -1;
-        } else {
-            return 1;
-        }
+        return (int)$routerDataFirst['sortOrder'] <=> (int)$routerDataSecond['sortOrder'];
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Scope/Validator.php b/lib/internal/Magento/Framework/App/Scope/Validator.php
index 242277ed98e8f..62839e634983e 100644
--- a/lib/internal/Magento/Framework/App/Scope/Validator.php
+++ b/lib/internal/Magento/Framework/App/Scope/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Scope;
 
 use InvalidArgumentException;
@@ -47,7 +48,7 @@ public function isValid($scope, $scopeCode = null)
         }
 
         if (empty($scope)) {
-            throw new LocalizedException(new Phrase('Enter a scope before proceeding.'));
+            throw new LocalizedException(new Phrase('A scope is missing. Enter a scope and try again.'));
         }
 
         $this->validateScopeCode($scopeCode);
@@ -56,10 +57,12 @@ public function isValid($scope, $scopeCode = null)
             $scopeResolver = $this->scopeResolverPool->get($scope);
             $scopeResolver->getScope($scopeCode)->getId();
         } catch (InvalidArgumentException $e) {
-            throw new LocalizedException(new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scope]));
+            throw new LocalizedException(
+                new Phrase('The "%1" value doesn\'t exist. Enter another value and try again.', [$scope])
+            );
         } catch (NoSuchEntityException $e) {
             throw new LocalizedException(
-                new Phrase('The "%1" value doesn\'t exist. Enter another value.', [$scopeCode])
+                new Phrase('The "%1" value doesn\'t exist. Enter another value and try again.', [$scopeCode])
             );
         }
 
@@ -77,7 +80,7 @@ public function isValid($scope, $scopeCode = null)
     private function validateScopeCode($scopeCode)
     {
         if (empty($scopeCode)) {
-            throw new LocalizedException(new Phrase('Enter a scope code before proceeding.'));
+            throw new LocalizedException(new Phrase('A scope code is missing. Enter a code and try again.'));
         }
 
         if (!preg_match('/^[a-z]+[a-z0-9_]*$/', $scopeCode)) {
diff --git a/lib/internal/Magento/Framework/App/State/CleanupFiles.php b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
index 4202fd8883ec0..c95caf8310b77 100644
--- a/lib/internal/Magento/Framework/App/State/CleanupFiles.php
+++ b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
@@ -106,7 +106,7 @@ private function emptyDir($code, $subPath = null)
                 $messages[] = $dirPath . $path;
                 try {
                     $dir->delete($path);
-                } catch (FilesystemException $e) {
+                } catch (FileSystemException $e) {
                     $messages[] = $e->getMessage();
                 }
             }
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index b4618bdec5035..575074fdb58ac 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -8,6 +8,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -62,6 +63,11 @@ class StaticResource implements \Magento\Framework\AppInterface
      */
     private $filesystem;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @var \Psr\Log\LoggerInterface
      */
@@ -76,6 +82,7 @@ class StaticResource implements \Magento\Framework\AppInterface
      * @param \Magento\Framework\Module\ModuleList $moduleList
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigLoaderInterface $configLoader
+     * @param DeploymentConfig|null $deploymentConfig
      */
     public function __construct(
         State $state,
@@ -85,7 +92,8 @@ public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\Module\ModuleList $moduleList,
         \Magento\Framework\ObjectManagerInterface $objectManager,
-        ConfigLoaderInterface $configLoader
+        ConfigLoaderInterface $configLoader,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->state = $state;
         $this->response = $response;
@@ -95,6 +103,7 @@ public function __construct(
         $this->moduleList = $moduleList;
         $this->objectManager = $objectManager;
         $this->configLoader = $configLoader;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
     }
 
     /**
@@ -108,7 +117,11 @@ public function launch()
         // disabling profiling when retrieving static resource
         \Magento\Framework\Profiler::reset();
         $appMode = $this->state->getMode();
-        if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
+        if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION
+            && !$this->deploymentConfig->getConfigData(
+                ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION
+            )
+        ) {
             $this->response->setHttpResponseCode(404);
         } else {
             $path = $this->request->get('resource');
@@ -152,9 +165,11 @@ protected function parsePath($path)
     {
         $path = ltrim($path, '/');
         $parts = explode('/', $path, 6);
-        if (count($parts) < 5) {
+        if (count($parts) < 5 || preg_match('/\.\.(\\\|\/)/', $path)) {
+            //Checking that path contains all required parts and is not above static folder.
             throw new \InvalidArgumentException("Requested path '$path' is wrong.");
         }
+
         $result = [];
         $result['area'] = $parts[0];
         $result['theme'] = $parts[1] . '/' . $parts[2];
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php
index ee45842013f64..c157f818242ef 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php
@@ -8,6 +8,9 @@
 
 class ActionStub extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
+     */
     public function execute()
     {
         // Empty method stub for test
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php b/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
index 678bb7a85272f..1813ff147190c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
@@ -276,6 +276,9 @@ public function testDetectDesignByRequest($value, $callNum, $callNum2)
         $this->object->detectDesign($requestMock);
     }
 
+    /**
+     * @return array
+     */
     public function detectDesignByRequestDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
index 1e2947084ee6b..32e495ed00a82 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
@@ -135,7 +135,7 @@ public function testCreateFilesystemDriverPool()
         );
         /** @var \Magento\Framework\Filesystem\DriverPool $result */
         $this->assertInstanceOf(\Magento\Framework\Filesystem\DriverPool::class, $result);
-        $this->assertInstanceof($driverClass, $result->getDriver('custom'));
+        $this->assertInstanceOf($driverClass, $result->getDriver('custom'));
     }
 
     public function testGetParams()
@@ -189,6 +189,9 @@ public function testIsDeveloperMode($modeFromEnvironment, $modeFromDeployment, $
         $this->assertEquals($isDeveloper, $bootstrap->isDeveloperMode());
     }
 
+    /**
+     * @return array
+     */
     public function testIsDeveloperModeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php
index e87eca57c058d..48a8420cfda60 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php
@@ -128,7 +128,7 @@ protected function _buildModelForCreate($enforcedOptions = [], $decorators = [])
         $processFrontendFunc = function ($class, $params) {
             switch ($class) {
                 case \Magento\Framework\Cache\Frontend\Adapter\Zend::class:
-                    return new $class($params['frontend']);
+                    return new $class($params['frontendFactory']);
                 case \Magento\Framework\App\Test\Unit\Cache\Frontend\FactoryTest\CacheDecoratorDummy::class:
                     $frontend = $params['frontend'];
                     unset($params['frontend']);
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php
index fdb962d7d295e..bfa37311884ba 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/PoolTest.php
@@ -105,6 +105,9 @@ public function testInitializationParams(
         $model->current();
     }
 
+    /**
+     * @return array
+     */
     public function initializationParamsDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
index 4348177ef326f..33b6ab7e99aed 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
@@ -40,14 +40,15 @@ protected function setUp()
 
     public function testGetTagsForNotObject()
     {
-        $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Provided argument is not an object');
         $this->model->getTags('some scalar');
     }
 
     public function testGetTagsForObject()
     {
         $strategyReturnValue = ['test tag'];
-        $object = new \StdClass;
+        $object = new \stdClass;
         $this->strategy->expects($this->once())
             ->method('getTags')
             ->with($object)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
index e8c76048f4eac..4f072e037f74e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
@@ -20,7 +20,8 @@ protected function setUp()
 
     public function testGetTagsWithScalar()
     {
-        $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Provided argument is not an object');
         $this->model->getTags('scalar');
     }
 
@@ -28,7 +29,7 @@ public function testGetTagsWithObject()
     {
         $emptyArray = [];
 
-        $this->assertEquals($emptyArray, $this->model->getTags(new \StdClass));
+        $this->assertEquals($emptyArray, $this->model->getTags(new \stdClass));
 
         $identityInterface = $this->getMockForAbstractClass(\Magento\Framework\DataObject\IdentityInterface::class);
         $this->assertEquals($emptyArray, $this->model->getTags($identityInterface));
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
index 7f570d9f13523..3e96c7ab9ca6c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
@@ -49,13 +49,14 @@ protected function setUp()
 
     public function testGetStrategyWithScalar()
     {
-        $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Provided argument is not an object');
         $this->model->getStrategy('some scalar');
     }
 
     public function testGetStrategyWithObject()
     {
-        $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \StdClass));
+        $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \stdClass));
     }
 
     public function testGetStrategyWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
index e2039c0517c53..4dc46d46e675e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
@@ -22,13 +22,14 @@ protected function setUp()
 
     public function testGetWithScalar()
     {
-        $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Provided argument is not an object');
         $this->model->getTags('scalar');
     }
 
     public function testGetTagsWithObject()
     {
-        $this->assertEquals([], $this->model->getTags(new \StdClass));
+        $this->assertEquals([], $this->model->getTags(new \stdClass));
     }
 
     public function testGetTagsWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
index 74a92d54f1934..380c45e383128 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
@@ -157,6 +157,9 @@ public function testCleanModeMatchingAnyTag($fixtureResultOne, $fixtureResultTwo
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function cleanModeMatchingAnyTagDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
index e8c0217b40b2c..bcae099815c98 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
@@ -89,6 +89,9 @@ public function testGet($fixtureConfigData, $inputCacheType, $expectedFrontendId
         $this->assertSame($accessProxy, $this->_model->get($inputCacheType));
     }
 
+    /**
+     * @return array
+     */
     public function getDataProvider()
     {
         $configData1 = [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php b/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php
index 236a65611422d..bb5748e0759a0 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/CacheTest.php
@@ -147,6 +147,9 @@ public function testSave($inputData, $inputId, $inputTags, $expectedData, $expec
         $this->_model->save($inputData, $inputId, $inputTags);
     }
 
+    /**
+     * @return array
+     */
     public function saveDataProvider()
     {
         $configTag = \Magento\Framework\App\Config::CACHE_TAG;
@@ -190,6 +193,9 @@ public function testRemove($result)
         $this->assertEquals($result, $this->_model->remove('test_id'));
     }
 
+    /**
+     * @return array
+     */
     public function successFailureDataProvider()
     {
         return ['success' => [true], 'failure' => [false]];
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
index 3cf552ae115a5..3adc4bada0665 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
@@ -55,6 +55,9 @@ public function testResolve($path, $scope, $scopeCode, $type, $expected)
         $this->assertSame($expected, $this->model->resolve($path, $scope, $scopeCode, $type));
     }
 
+    /**
+     * @return array
+     */
     public function resolveDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php
index f106ba6e151fd..6f137ede742ff 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/DataTest.php
@@ -35,6 +35,9 @@ public function testSetValue($path, $value)
         $this->assertEquals($value, $this->_model->getValue($path));
     }
 
+    /**
+     * @return array
+     */
     public function setValueDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
index 56589b20dcd0c..5a504cf6367af 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Test\Unit\Config\Initial;
 
 use Magento\Framework\Filesystem;
@@ -132,7 +133,7 @@ function ($arguments) use ($validationStateMock) {
     /**
      * @covers \Magento\Framework\App\Config\Initial\Reader::read
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessageRegExp /Invalid XML in file (.*?)/
+     * @expectedExceptionMessage Verify the XML and try again.
      */
     public function testReadInvalidConfig()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php
index 3d1cdf0023cc9..29ccd33d73d3b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialTest.php
@@ -65,6 +65,9 @@ public function testGetData($scope, $expected)
         $this->assertEquals($expected, $this->config->getData($scope));
     }
 
+    /**
+     * @return array
+     */
     public function getDataDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php
index f0863a81b7999..1e72017dcf7a8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Test\Unit\Config\Scope;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -81,7 +82,7 @@ public function testNotEmptyScopeCodeForDefaultScope()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Enter a scope before proceeding.
+     * @expectedExceptionMessage A scope is missing. Enter a scope and try again.
      */
     public function testEmptyScope()
     {
@@ -90,7 +91,7 @@ public function testEmptyScope()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Enter a scope code before proceeding.
+     * @expectedExceptionMessage A scope code is missing. Enter a code and try again.
      */
     public function testEmptyScopeCode()
     {
@@ -108,7 +109,7 @@ public function testWrongScopeCodeFormat()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "not_default_scope" value doesn't exist. Enter another value.
+     * @expectedExceptionMessage The "not_default_scope" value doesn't exist. Enter another value and try again.
      */
     public function testScopeNotExist()
     {
@@ -123,7 +124,7 @@ public function testScopeNotExist()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "not_exist_scope_code" value doesn't exist. Enter another value.
+     * @expectedExceptionMessage The "not_exist_scope_code" value doesn't exist. Enter another value and try again.
      */
     public function testScopeCodeNotExist()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php
index ef2b342936cd9..6159e5cac45e8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/ValueTest.php
@@ -184,6 +184,9 @@ public function testAfterSave($callNumber, $oldValue)
         $this->assertInstanceOf(get_class($this->model), $this->model->afterSave());
     }
 
+    /**
+     * @return array
+     */
     public function afterSaveDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
index f94c30b4fa3c8..da9826bfe8c95 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
@@ -73,6 +73,9 @@ public function testGetValue($scope, $scopeCode = null)
         $this->assertTrue($this->appConfig->getValue($path, $scope, $scopeCode ?: $this->scope));
     }
 
+    /**
+     * @return array
+     */
     public function getValueDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
new file mode 100644
index 0000000000000..b0891fca62f45
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App\Test\Unit\Console;
+
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
+use Magento\Framework\App\MaintenanceMode;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MaintenanceModeEnablerTest extends TestCase
+{
+    /**
+     * @dataProvider initialAppStateProvider
+     */
+    public function testSuccessfulTask(bool $maintenanceModeEnabledInitially)
+    {
+        $maintenanceMode = $this->createMaintenanceMode($maintenanceModeEnabledInitially);
+        $enabler = new MaintenanceModeEnabler($maintenanceMode);
+        $successTask = function () {
+            // do nothing
+        };
+
+        $enabler->executeInMaintenanceMode(
+            $successTask,
+            $this->createOutput(),
+            true
+        );
+
+        $this->assertEquals(
+            $maintenanceModeEnabledInitially,
+            $maintenanceMode->isOn(),
+            'Initial state is not restored'
+        );
+    }
+
+    /**
+     * @dataProvider initialAppStateProvider
+     */
+    public function testFailedTaskWithMaintenanceModeOnFailure(bool $maintenanceModeEnabledInitially)
+    {
+        $maintenanceMode = $this->createMaintenanceMode($maintenanceModeEnabledInitially);
+        $enabler = new MaintenanceModeEnabler($maintenanceMode);
+        $failedTask = function () {
+            throw new \Exception('Woops!');
+        };
+
+        try {
+            $enabler->executeInMaintenanceMode(
+                $failedTask,
+                $this->createOutput(),
+                true
+            );
+        } catch (\Exception $e) {
+            $this->assertEquals(
+                true,
+                $maintenanceMode->isOn(),
+                'Maintenance mode is not active after failure'
+            );
+        }
+    }
+
+    /**
+     * @dataProvider initialAppStateProvider
+     */
+    public function testFailedTaskWithRestoredModeOnFailure(bool $maintenanceModeEnabledInitially)
+    {
+        $maintenanceMode = $this->createMaintenanceMode($maintenanceModeEnabledInitially);
+        $enabler = new MaintenanceModeEnabler($maintenanceMode);
+        $failedTask = function () {
+            throw new \Exception('Woops!');
+        };
+
+        try {
+            $enabler->executeInMaintenanceMode(
+                $failedTask,
+                $this->createOutput(),
+                false
+            );
+        } catch (\Exception $e) {
+            $this->assertEquals(
+                $maintenanceModeEnabledInitially,
+                $maintenanceMode->isOn(),
+                'Initial state is not restored'
+            );
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function initialAppStateProvider()
+    {
+        return [
+            'Maintenance mode disabled initially' => [false],
+            'Maintenance mode enabled initially' => [true],
+        ];
+    }
+
+    /**
+     * @param bool $isOn
+     * @return MaintenanceMode
+     */
+    private function createMaintenanceMode(bool $isOn): MaintenanceMode
+    {
+        $maintenanceMode = $this->getMockBuilder(MaintenanceMode::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $maintenanceMode->method('isOn')->willReturnCallback(function () use (&$isOn) {
+            return $isOn;
+        });
+        $maintenanceMode->method('set')->willReturnCallback(function ($newValue) use (&$isOn) {
+            $isOn = (bool)$newValue;
+            return true;
+        });
+
+        return $maintenanceMode;
+    }
+
+    /**
+     * @return OutputInterface
+     */
+    private function createOutput(): OutputInterface
+    {
+        $output = $this->getMockBuilder(OutputInterface::class)
+            ->getMockForAbstractClass();
+        return $output;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php
index ec678d21a581b..18de140af8428 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Console/ResponseTest.php
@@ -34,6 +34,9 @@ public function testSetCode($code, $expectedCode)
         $this->assertEquals($expectedCode, $result);
     }
 
+    /**
+     * @return array
+     */
     public static function setCodeProvider()
     {
         $largeCode = 256;
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php b/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
index e2c77864d8e82..ce1f1661ad827 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
@@ -56,6 +56,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function prepareAreaListMock()
     {
         $areaMock = $this->createMock(\Magento\Framework\App\Area::class);
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/ReaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/ReaderTest.php
index 3e3eea322cafd..8f8399263384c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/ReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/ReaderTest.php
@@ -8,26 +8,29 @@
 
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Filesystem\DriverPool;
 
 class ReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Filesystem\DirectoryList|\PHPUnit_Framework_MockObject_MockObject
      */
     private $dirList;
 
     /**
-     * @var \Magento\Framework\Filesystem\DriverPool|\PHPUnit_Framework_MockObject_MockObject
+     * @var DriverPool|\PHPUnit_Framework_MockObject_MockObject
      */
     private $driverPool;
 
     /**
-     * @var \Magento\Framework\Filesystem\Driver\File|\PHPUnit_Framework_MockObject_MockObject
+     * @var File|\PHPUnit_Framework_MockObject_MockObject
      */
     private $fileDriver;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigFilePool|\PHPUnit_Framework_MockObject_MockObject
      */
     private $configFilePool;
 
@@ -38,7 +41,7 @@ protected function setUp()
             ->method('getPath')
             ->with(DirectoryList::CONFIG)
             ->willReturn(__DIR__ . '/_files');
-        $this->fileDriver = $this->createMock(\Magento\Framework\Filesystem\Driver\File::class);
+        $this->fileDriver = $this->createMock(File::class);
         $this->fileDriver
             ->expects($this->any())
             ->method('isExists')
@@ -51,12 +54,12 @@ protected function setUp()
                 [__DIR__ . '/_files/mergeTwo.php', true],
                 [__DIR__ . '/_files/nonexistent.php', false]
             ]));
-        $this->driverPool = $this->createMock(\Magento\Framework\Filesystem\DriverPool::class);
+        $this->driverPool = $this->createMock(DriverPool::class);
         $this->driverPool
             ->expects($this->any())
             ->method('getDriver')
             ->willReturn($this->fileDriver);
-        $this->configFilePool = $this->createMock(\Magento\Framework\Config\File\ConfigFilePool::class);
+        $this->configFilePool = $this->createMock(ConfigFilePool::class);
         $this->configFilePool
             ->expects($this->any())
             ->method('getPaths')
@@ -100,13 +103,97 @@ public function testLoad()
      */
     public function testCustomLoad($file, $expected)
     {
-        $configFilePool = $this->createMock(\Magento\Framework\Config\File\ConfigFilePool::class);
+        $configFilePool = $this->createMock(ConfigFilePool::class);
         $configFilePool->expects($this->any())->method('getPaths')->willReturn([$file]);
         $configFilePool->expects($this->any())->method('getPath')->willReturn($file);
         $object = new Reader($this->dirList, $this->driverPool, $configFilePool, $file);
         $this->assertSame($expected, $object->load($file));
     }
 
+    /**
+     * Test Reader::load() will throw exception in case of invalid configuration file(single file).
+     *
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessageRegExp /Invalid configuration file: \'.*\/\_files\/emptyConfig\.php\'/
+     * @return void
+     */
+    public function testLoadInvalidConfigurationFileWithFileKey()
+    {
+        $fileDriver = $this->getMockBuilder(File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fileDriver->expects($this->once())
+            ->method('isExists')
+            ->willReturn(true);
+        /** @var DriverPool|\PHPUnit_Framework_MockObject_MockObject $driverPool */
+        $driverPool = $this->getMockBuilder(DriverPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $driverPool
+            ->expects($this->once())
+            ->method('getDriver')
+            ->willReturn($fileDriver);
+        /** @var ConfigFilePool|\PHPUnit_Framework_MockObject_MockObject $configFilePool */
+        $configFilePool = $this->getMockBuilder(ConfigFilePool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configFilePool
+            ->expects($this->once())
+            ->method('getPath')
+            ->with($this->identicalTo('testConfig'))
+            ->willReturn('emptyConfig.php');
+        $object = new Reader($this->dirList, $driverPool, $configFilePool);
+        $object->load('testConfig');
+    }
+
+    /**
+     * Test Reader::load() will throw exception in case of invalid configuration file(multiple files).
+     *
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessageRegExp /Invalid configuration file: \'.*\/\_files\/emptyConfig\.php\'/
+     * @return void
+     */
+    public function testLoadInvalidConfigurationFile()
+    {
+        $fileDriver = $this->getMockBuilder(File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fileDriver->expects($this->exactly(2))
+            ->method('isExists')
+            ->willReturn(true);
+        /** @var DriverPool|\PHPUnit_Framework_MockObject_MockObject $driverPool */
+        $driverPool = $this->getMockBuilder(DriverPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $driverPool
+            ->expects($this->once())
+            ->method('getDriver')
+            ->willReturn($fileDriver);
+        /** @var ConfigFilePool|\PHPUnit_Framework_MockObject_MockObject $configFilePool */
+        $configFilePool = $this->getMockBuilder(ConfigFilePool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configFilePool->expects($this->exactly(2))
+            ->method('getPaths')
+            ->willReturn(
+                [
+                    'configKeyOne' => 'config.php',
+                    'testConfig' => 'emptyConfig.php'
+                ]
+            );
+        $configFilePool->expects($this->exactly(2))
+            ->method('getPath')
+            ->withConsecutive(
+                [$this->identicalTo('configKeyOne')],
+                [$this->identicalTo('testConfig')]
+            )->willReturnOnConsecutiveCalls(
+                'config.php',
+                'emptyConfig.php'
+            );
+        $object = new Reader($this->dirList, $driverPool, $configFilePool);
+        $object->load();
+    }
+
     /**
      * @return array
      */
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
index a1fdedc701e8c..1967a39fe4374 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
@@ -55,87 +55,101 @@ public function formatWithCommentDataProvider()
         ];
         $expectedResult1 = <<<TEXT
 <?php
-return array (
-  'ns1' => 
-  array (
-    's1' => 
-    array (
-      0 => 's11',
-      1 => 's12',
-    ),
-    's2' => 
-    array (
-      0 => 's21',
-      1 => 's22',
-    ),
-  ),
-  /**
-   * For the section: ns2
-   * comment for namespace 2
-   */
-  'ns2' => 
-  array (
-    's1' => 
-    array (
-      0 => 's11',
-    ),
-  ),
-  'ns3' => 'just text',
-  'ns4' => 'just text',
-);
+return [
+    'ns1' => [
+        's1' => [
+            0 => 's11',
+            1 => 's12',
+        ],
+        's2' => [
+            0 => 's21',
+            1 => 's22',
+        ],
+    ],
+    /**
+     * For the section: ns2
+     * comment for namespace 2
+     */
+    'ns2' => [
+        's1' => [
+            0 => 's11',
+        ],
+    ],
+    'ns3' => 'just text',
+    'ns4' => 'just text',
+];
 
 TEXT;
         $expectedResult2 = <<<TEXT
 <?php
-return array (
-  /**
-   * For the section: ns1
-   * comment for' namespace 1
-   */
-  'ns1' => 
-  array (
-    's1' => 
-    array (
-      0 => 's11',
-      1 => 's12',
-    ),
-    's2' => 
-    array (
-      0 => 's21',
-      1 => 's22',
-    ),
-  ),
-  /**
-   * For the section: ns2
-   * comment for namespace 2.
-   * Next comment for' namespace 2
-   */
-  'ns2' => 
-  array (
-    's1' => 
-    array (
-      0 => 's11',
-    ),
-  ),
-  /**
-   * For the section: ns3
-   * comment for" namespace 3
-   */
-  'ns3' => 'just text',
-  /**
-   * For the section: ns4
-   * comment for namespace 4
-   */
-  'ns4' => 'just text',
-);
+return [
+    /**
+     * For the section: ns1
+     * comment for' namespace 1
+     */
+    'ns1' => [
+        's1' => [
+            0 => 's11',
+            1 => 's12',
+        ],
+        's2' => [
+            0 => 's21',
+            1 => 's22',
+        ],
+    ],
+    /**
+     * For the section: ns2
+     * comment for namespace 2.
+     * Next comment for' namespace 2
+     */
+    'ns2' => [
+        's1' => [
+            0 => 's11',
+        ],
+    ],
+    /**
+     * For the section: ns3
+     * comment for" namespace 3
+     */
+    'ns3' => 'just text',
+    /**
+     * For the section: ns4
+     * comment for namespace 4
+     */
+    'ns4' => 'just text',
+];
+
+TEXT;
+
+        $expectedResult3 = <<<TEXT
+<?php
+return [
+    'ns1' => [
+        's1' => [
+            's11',
+            's12'
+        ],
+        's2' => [
+            's21',
+            's22'
+        ]
+    ],
+    'ns2' => [
+        's1' => [
+            's11'
+        ]
+    ],
+    'ns3' => 'just text',
+    'ns4' => 'just text'
+];
 
 TEXT;
         return [
             ['string', [], "<?php\nreturn 'string';\n"],
             ['string', ['comment'], "<?php\nreturn 'string';\n"],
-            [$array, [], "<?php\nreturn " . var_export($array, true) . ";\n"],
             [$array, $comments1, $expectedResult1],
             [$array, $comments2, $expectedResult2],
+            [$array, [], $expectedResult3],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
index d4783cd36a051..31d0ca96f1af7 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Test\Unit\DeploymentConfig;
 
 use Magento\Framework\App\DeploymentConfig;
@@ -243,7 +244,7 @@ public function testSaveConfigOverride()
 
     /**
      * @expectedException \Magento\Framework\Exception\FileSystemException
-     * @expectedExceptionMessage Deployment config file env.php is not writable.
+     * @expectedExceptionMessage The "env.php" deployment config file isn't writable.
      */
     public function testSaveConfigException()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/_files/emptyConfig.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/_files/emptyConfig.php
new file mode 100644
index 0000000000000..79549bf674aad
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/_files/emptyConfig.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+//Example of wrong(empty) configuration file.
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
index fa41d717cc521..80ab2302dc91c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
@@ -127,6 +127,9 @@ public function testKeyCollision(array $data)
         $object->get();
     }
 
+    /**
+     * @return array
+     */
     public function keyCollisionDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
index 7fda8de6d3216..23afbbc73d2b9 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
@@ -29,6 +29,9 @@ public function testIsPub($path, $isExist, $result)
         $this->assertSame($result, $model->isPub());
     }
 
+    /**
+     * @return array
+     */
     public function isPubDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
index 5301255818800..bba4d67ddd108 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
@@ -32,6 +32,9 @@ public function testHandler($errorNo, $errorStr, $errorFile, $expectedResult)
         $this->assertEquals($expectedResult, $this->object->handler($errorNo, $errorStr, $errorFile, 11));
     }
 
+    /**
+     * @return array
+     */
     public function handlerProvider()
     {
         return [
@@ -53,12 +56,16 @@ public function testHandlerException($errorNo, $errorPhrase)
         $errorFile = 'test_file';
         $errorLine = 'test_error_line';
 
-        $exceptedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine);
-        $this->expectException('Exception', $exceptedExceptionMessage);
+        $expectedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine);
+        $this->expectException('Exception');
+        $this->expectExceptionMessage($expectedExceptionMessage);
 
         $this->object->handler($errorNo, $errorStr, $errorFile, $errorLine);
     }
 
+    /**
+     * @return array
+     */
     public function handlerProviderException()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
index 183f9f2ac567c..a08dcc35f5ba3 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
@@ -23,10 +23,8 @@ public function testDirectoriesCustomization()
         $this->assertFileExists($object->getPath(DirectoryList::SYS_TMP));
         $this->assertEquals('/root/dir/foo', $object->getPath(DirectoryList::APP));
         $this->assertEquals('bar', $object->getUrlPath(DirectoryList::APP));
-        $this->expectException(
-            \Magento\Framework\Exception\FileSystemException::class,
-            "Unknown directory type: 'unknown'"
-        );
+        $this->expectException(\Magento\Framework\Exception\FileSystemException::class);
+        $this->expectExceptionMessage("Unknown directory type: 'unknown'");
         $object->getPath('unknown');
     }
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryResolverTest.php
new file mode 100644
index 0000000000000..955765455df16
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryResolverTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Test\Unit\Filesystem;
+
+/**
+ * Unit tests for the \Magento\Framework\App\Filesystem\DirectoryResolver class.
+ */
+class DirectoryResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryList|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryList;
+
+    /**
+     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryResolver
+     */
+    private $directoryResolver;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->directoryList = $this->getMockBuilder(\Magento\Framework\App\Filesystem\DirectoryList::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->directoryResolver = new \Magento\Framework\App\Filesystem\DirectoryResolver(
+            $this->directoryList,
+            $this->filesystem
+        );
+    }
+
+    /**
+     * @dataProvider validatePathDataProvider
+     * @param string $path
+     * @param bool $expectedResult
+     * @return void
+     */
+    public function testValidatePath(string $path, bool $expectedResult): void
+    {
+        $rootPath = '/path/root';
+        $directoryConfig = 'directory_config';
+        $directory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
+            ->setMethods(['getDriver'])
+            ->getMockForAbstractClass();
+        $driver = $this->getMockBuilder(\Magento\Framework\Filesystem\DriverInterface::class)
+            ->setMethods(['getRealPathSafety'])
+            ->getMockForAbstractClass();
+        $directory->expects($this->atLeastOnce())->method('getDriver')->willReturn($driver);
+        $driver->expects($this->atLeastOnce())->method('getRealPathSafety')->with($path)
+            ->willReturnArgument(0);
+        $this->filesystem->expects($this->atLeastOnce())->method('getDirectoryWrite')->with($directoryConfig)
+            ->willReturn($directory);
+        $this->directoryList->expects($this->atLeastOnce())->method('getPath')->with($directoryConfig)
+            ->willReturn($rootPath);
+        $this->assertEquals($expectedResult, $this->directoryResolver->validatePath($path, $directoryConfig));
+    }
+
+    /**
+     * @return array
+     */
+    public function validatePathDataProvider()
+    {
+        return [
+            ['/path/root/for/validation', true],
+            ['/path/invalid/for/validation', false],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
index 472fff4f4f287..748337443d7a8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
@@ -52,7 +52,7 @@ public function testDictionaryGetter()
         }
 
         $file = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\ReadInterface::class);
-        for ($i = 0; $i < count($data); $i++) {
+        for ($i = 0, $count = count($data); $i < $count; $i++) {
             $file->expects($this->at($i))->method('readCsv')->will($this->returnValue($data[$i]));
         }
         $file->expects($this->at($i))->method('readCsv')->will($this->returnValue(false));
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
index 15f6bed1ac0d3..23906486634ec 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
@@ -144,6 +144,9 @@ public function testVaryStringSource($cookieExists)
         $this->model->getValue();
     }
 
+    /**
+     * @return array
+     */
     public function trueFalseDataProvider()
     {
         return [[true], [false]];
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
index 20ea5d1a3e86f..db200f962f5b5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
@@ -241,6 +241,9 @@ function ($value) {
         $this->kernel->process($this->responseMock);
     }
 
+    /**
+     * @return array
+     */
     public function testProcessSaveCacheDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
index 74e673c8bfc26..8e1acc89437e2 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
@@ -45,6 +45,9 @@ public function testGetVersion($packageList, $expectedVersion)
         $this->assertEquals($expectedVersion, $productVersion);
     }
 
+    /**
+     * @return array
+     */
     public function testGetVersionGitInstallationDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php
new file mode 100644
index 0000000000000..6215da3ae901d
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Test\Unit\Request;
+
+use Magento\Framework\App\Request\HttpMethodMap;
+use PHPUnit\Framework\TestCase;
+
+class HttpMethodMapTest extends TestCase
+{
+    /**
+     * Test filtering of interface names.
+     */
+    public function testFilter()
+    {
+        $map = new HttpMethodMap(
+            ['method1' => '\\Throwable', 'method2' => 'DateTime']
+        );
+        $this->assertEquals(
+            ['method1' => \Throwable::class, 'method2' => \DateTime::class],
+            $map->getMap()
+        );
+    }
+
+    /**
+     * Test validation of interface names.
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testExisting()
+    {
+        new HttpMethodMap(['method1' => 'NonExistingClass']);
+    }
+
+    /**
+     * Test validation of method names.
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testMethod()
+    {
+        new HttpMethodMap([\Throwable::class]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
index 450e1ed0b3a00..81805e2df9690 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -10,32 +10,41 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Request\Http;
 
+/**
+ * @SuppressWarnings(PHPMD.TooManyMethods)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ */
 class HttpTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Framework\App\Request\Http
      */
-    protected $_model;
+    private $model;
 
     /**
      * @var \Magento\Framework\App\Route\ConfigInterface\Proxy | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_routerListMock;
+    private $routerListMock;
 
     /**
      * @var \Magento\Framework\App\Request\PathInfoProcessorInterface | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_infoProcessorMock;
+    private $infoProcessorMock;
+
+    /**
+     * @var \Magento\Framework\App\Request\PathInfo
+     */
+    private $pathInfo;
 
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $objectManagerMock;
+    private $objectManagerMock;
 
     /**
      * @var \Magento\Framework\Stdlib\StringUtils | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $converterMock;
+    private $converterMock;
 
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
@@ -49,12 +58,12 @@ class HttpTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->_routerListMock = $this->createPartialMock(
+        $this->routerListMock = $this->createPartialMock(
             \Magento\Framework\App\Route\ConfigInterface\Proxy::class,
             ['getRouteFrontName', 'getRouteByFrontName', '__wakeup']
         );
-        $this->_infoProcessorMock = $this->createMock(\Magento\Framework\App\Request\PathInfoProcessorInterface::class);
-        $this->_infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
+        $this->infoProcessorMock = $this->createMock(\Magento\Framework\App\Request\PathInfoProcessorInterface::class);
+        $this->infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
         $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->converterMock = $this->getMockBuilder(\Magento\Framework\Stdlib\StringUtils::class)
             ->disableOriginalConstructor()
@@ -66,6 +75,7 @@ protected function setUp()
         $this->serverArray = $_SERVER;
 
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->pathInfo =  $this->objectManager->getObject(\Magento\Framework\App\Request\PathInfo::class);
     }
 
     public function tearDown()
@@ -81,8 +91,9 @@ private function getModel($uri = null, $appConfigMock = true)
         $model = $this->objectManager->getObject(
             \Magento\Framework\App\Request\Http::class,
             [
-                'routeConfig' => $this->_routerListMock,
-                'pathInfoProcessor' => $this->_infoProcessorMock,
+                'routeConfig' => $this->routerListMock,
+                'pathInfoProcessor' => $this->infoProcessorMock,
+                'pathInfoService' => $this->pathInfo,
                 'objectManager' => $this->objectManagerMock,
                 'converter' => $this->converterMock,
                 'uri' => $uri,
@@ -100,91 +111,91 @@ private function getModel($uri = null, $appConfigMock = true)
     public function testGetOriginalPathInfoWithTestUri()
     {
         $uri = 'http://test.com/value?key=value';
-        $this->_model = $this->getModel($uri);
-        $this->assertEquals('/value', $this->_model->getOriginalPathInfo());
+        $this->model = $this->getModel($uri);
+        $this->assertEquals('/value', $this->model->getOriginalPathInfo());
     }
 
     public function testGetOriginalPathInfoWithEmptyUri()
     {
-        $this->_model = $this->getModel();
-        $this->assertEmpty($this->_model->getOriginalPathInfo());
+        $this->model = $this->getModel();
+        $this->assertEmpty($this->model->getOriginalPathInfo());
     }
 
     public function testGetBasePathWithPath()
     {
-        $this->_model = $this->getModel();
-        $this->_model->setBasePath('http:\/test.com\one/two');
-        $this->assertEquals('http://test.com/one/two', $this->_model->getBasePath());
+        $this->model = $this->getModel();
+        $this->model->setBasePath('http:\/test.com\one/two');
+        $this->assertEquals('http://test.com/one/two', $this->model->getBasePath());
     }
 
     public function testGetBasePathWithoutPath()
     {
-        $this->_model = $this->getModel();
-        $this->_model->setBasePath(null);
-        $this->assertEquals('/', $this->_model->getBasePath());
+        $this->model = $this->getModel();
+        $this->model->setBasePath(null);
+        $this->assertEquals('/', $this->model->getBasePath());
     }
 
     public function testSetRouteNameWithRouter()
     {
         $router = $this->createMock(\Magento\Framework\App\Route\ConfigInterface::class);
-        $this->_routerListMock->expects($this->any())->method('getRouteFrontName')->will($this->returnValue($router));
-        $this->_model = $this->getModel();
-        $this->_model->setRouteName('RouterName');
-        $this->assertEquals('RouterName', $this->_model->getRouteName());
+        $this->routerListMock->expects($this->any())->method('getRouteFrontName')->will($this->returnValue($router));
+        $this->model = $this->getModel();
+        $this->model->setRouteName('RouterName');
+        $this->assertEquals('RouterName', $this->model->getRouteName());
     }
 
     public function testSetRouteNameWithNullRouterValue()
     {
-        $this->_model = $this->getModel();
-        $this->_routerListMock->expects($this->once())->method('getRouteFrontName')->will($this->returnValue(null));
-        $this->_model->setRouteName('RouterName');
+        $this->model = $this->getModel();
+        $this->routerListMock->expects($this->once())->method('getRouteFrontName')->will($this->returnValue(null));
+        $this->model->setRouteName('RouterName');
     }
 
     public function testGetFrontName()
     {
         $uri = 'http://test.com/one/two';
-        $this->_model = $this->getModel($uri);
-        $this->assertEquals('one', $this->_model->getFrontName());
+        $this->model = $this->getModel($uri);
+        $this->assertEquals('one', $this->model->getFrontName());
     }
 
     public function testGetRouteNameWithNullValueRouteName()
     {
-        $this->_model = $this->getModel();
-        $this->_model->setRouteName('RouteName');
-        $this->assertEquals('RouteName', $this->_model->getRouteName());
+        $this->model = $this->getModel();
+        $this->model->setRouteName('RouteName');
+        $this->assertEquals('RouteName', $this->model->getRouteName());
     }
 
     public function testGetRouteName()
     {
-        $this->_model = $this->getModel();
+        $this->model = $this->getModel();
         $expected = 'RouteName';
-        $this->_model->setRouteName($expected);
-        $this->assertEquals($expected, $this->_model->getRouteName());
+        $this->model->setRouteName($expected);
+        $this->assertEquals($expected, $this->model->getRouteName());
     }
 
     public function testGetFullActionName()
     {
-        $this->_model = $this->getModel();
+        $this->model = $this->getModel();
         /* empty request */
-        $this->assertEquals('__', $this->_model->getFullActionName());
-        $this->_model->setRouteName('test')->setControllerName('controller')->setActionName('action');
-        $this->assertEquals('test/controller/action', $this->_model->getFullActionName('/'));
+        $this->assertEquals('__', $this->model->getFullActionName());
+        $this->model->setRouteName('test')->setControllerName('controller')->setActionName('action');
+        $this->assertEquals('test/controller/action', $this->model->getFullActionName('/'));
     }
 
     public function testInitForward()
     {
-        $expected = $this->_initForward();
-        $this->assertEquals($expected, $this->_model->getBeforeForwardInfo());
+        $expected = $this->initForward();
+        $this->assertEquals($expected, $this->model->getBeforeForwardInfo());
     }
 
     public function testGetBeforeForwardInfo()
     {
-        $beforeForwardInfo = $this->_initForward();
-        $this->assertNull($this->_model->getBeforeForwardInfo('not_existing_forward_info_key'));
+        $beforeForwardInfo = $this->initForward();
+        $this->assertNull($this->model->getBeforeForwardInfo('not_existing_forward_info_key'));
         foreach (array_keys($beforeForwardInfo) as $key) {
-            $this->assertEquals($beforeForwardInfo[$key], $this->_model->getBeforeForwardInfo($key));
+            $this->assertEquals($beforeForwardInfo[$key], $this->model->getBeforeForwardInfo($key));
         }
-        $this->assertEquals($beforeForwardInfo, $this->_model->getBeforeForwardInfo());
+        $this->assertEquals($beforeForwardInfo, $this->model->getBeforeForwardInfo());
     }
 
     /**
@@ -192,9 +203,9 @@ public function testGetBeforeForwardInfo()
      *
      * @return array Contents of $_beforeForwardInfo
      */
-    protected function _initForward()
+    private function initForward()
     {
-        $this->_model = $this->getModel();
+        $this->model = $this->getModel();
         $beforeForwardInfo = [
             'params' => ['one' => '111', 'two' => '222'],
             'action_name' => 'ActionName',
@@ -202,49 +213,49 @@ protected function _initForward()
             'module_name' => 'ModuleName',
             'route_name' => 'RouteName'
         ];
-        $this->_model->setParams($beforeForwardInfo['params']);
-        $this->_model->setActionName($beforeForwardInfo['action_name']);
-        $this->_model->setControllerName($beforeForwardInfo['controller_name']);
-        $this->_model->setModuleName($beforeForwardInfo['module_name']);
-        $this->_model->setRouteName($beforeForwardInfo['route_name']);
-        $this->_model->initForward();
+        $this->model->setParams($beforeForwardInfo['params']);
+        $this->model->setActionName($beforeForwardInfo['action_name']);
+        $this->model->setControllerName($beforeForwardInfo['controller_name']);
+        $this->model->setModuleName($beforeForwardInfo['module_name']);
+        $this->model->setRouteName($beforeForwardInfo['route_name']);
+        $this->model->initForward();
         return $beforeForwardInfo;
     }
 
     public function testIsAjax()
     {
-        $this->_model = $this->getModel();
+        $this->model = $this->getModel();
 
-        $this->assertFalse($this->_model->isAjax());
+        $this->assertFalse($this->model->isAjax());
 
-        $this->_model->clearParams();
-        $this->_model->setParam('ajax', 1);
-        $this->assertTrue($this->_model->isAjax());
+        $this->model->clearParams();
+        $this->model->setParam('ajax', 1);
+        $this->assertTrue($this->model->isAjax());
 
-        $this->_model->clearParams();
-        $this->_model->setParam('isAjax', 1);
-        $this->assertTrue($this->_model->isAjax());
+        $this->model->clearParams();
+        $this->model->setParam('isAjax', 1);
+        $this->assertTrue($this->model->isAjax());
 
-        $this->_model->clearParams();
-        $this->_model->getHeaders()->addHeaderLine('X-Requested-With', 'XMLHttpRequest');
-        $this->assertTrue($this->_model->isAjax());
+        $this->model->clearParams();
+        $this->model->getHeaders()->addHeaderLine('X-Requested-With', 'XMLHttpRequest');
+        $this->assertTrue($this->model->isAjax());
 
-        $this->_model->getHeaders()->clearHeaders();
-        $this->_model->getHeaders()->addHeaderLine('X-Requested-With', 'NotXMLHttpRequest');
-        $this->assertFalse($this->_model->isAjax());
+        $this->model->getHeaders()->clearHeaders();
+        $this->model->getHeaders()->addHeaderLine('X-Requested-With', 'NotXMLHttpRequest');
+        $this->assertFalse($this->model->isAjax());
     }
 
     /**
-     * @param $serverVariables array
-     * @param $expectedResult string
+     * @param array $serverVariables
+     * @param string $expectedResult
      * @dataProvider serverVariablesProvider
      */
     public function testGetDistroBaseUrl($serverVariables, $expectedResult)
     {
         $originalServerValue = $_SERVER;
         $_SERVER = $serverVariables;
-        $this->_model = $this->getModel();
-        $this->assertEquals($expectedResult, $this->_model->getDistroBaseUrl());
+        $this->model = $this->getModel();
+        $this->assertEquals($expectedResult, $this->model->getDistroBaseUrl());
 
         $_SERVER = $originalServerValue;
     }
@@ -259,6 +270,9 @@ public function testGetDistroBaseUrlPath($scriptName, $expected)
         $this->assertEquals($expected, Http::getDistroBaseUrlPath(['SCRIPT_NAME' => $scriptName]));
     }
 
+    /**
+     * @return array
+     */
     public function getDistroBaseUrlPathDataProvider()
     {
         return [
@@ -273,6 +287,9 @@ public function getDistroBaseUrlPathDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function serverVariablesProvider()
     {
         $returnValue = [];
@@ -332,7 +349,7 @@ public function serverVariablesProvider()
      */
     public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $headerOffloadValue, $configCall)
     {
-        $this->_model = $this->getModel(null, false);
+        $this->model = $this->getModel(null, false);
         $configOffloadHeader = 'Header-From-Proxy';
         $configMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
             ->disableOriginalConstructor()
@@ -345,39 +362,42 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
                 ScopeConfigInterface::SCOPE_TYPE_DEFAULT
             )->willReturn($configOffloadHeader);
 
-        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'appConfig', $configMock);
-        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'sslOffloadHeader', null);
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'appConfig', $configMock);
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'sslOffloadHeader', null);
 
-        $this->_model->getServer()->set($headerOffloadKey, $headerOffloadValue);
-        $this->_model->getServer()->set('HTTPS', $serverHttps);
+        $this->model->getServer()->set($headerOffloadKey, $headerOffloadValue);
+        $this->model->getServer()->set('HTTPS', $serverHttps);
 
-        $this->assertSame($isSecure, $this->_model->isSecure());
+        $this->assertSame($isSecure, $this->model->isSecure());
     }
 
     /**
      * @dataProvider httpSafeMethodProvider
      * @backupGlobals enabled
-     * @param string $method value of $_SERVER['REQUEST_METHOD']
+     * @param string $httpMethod value of $_SERVER['REQUEST_METHOD']
      */
     public function testIsSafeMethodTrue($httpMethod)
     {
-        $this->_model = $this->getModel();
+        $this->model = $this->getModel();
         $_SERVER['REQUEST_METHOD'] = $httpMethod;
-        $this->assertEquals(true, $this->_model->IsSafeMethod());
+        $this->assertEquals(true, $this->model->isSafeMethod());
     }
 
     /**
      * @dataProvider httpNotSafeMethodProvider
      * @backupGlobals enabled
-     * @param string $method value of $_SERVER['REQUEST_METHOD']
+     * @param string $httpMethod value of $_SERVER['REQUEST_METHOD']
      */
     public function testIsSafeMethodFalse($httpMethod)
     {
-        $this->_model = $this->getModel();
+        $this->model = $this->getModel();
         $_SERVER['REQUEST_METHOD'] = $httpMethod;
-        $this->assertEquals(false, $this->_model->IsSafeMethod());
+        $this->assertEquals(false, $this->model->isSafeMethod());
     }
 
+    /**
+     * @return array
+     */
     public function httpSafeMethodProvider()
     {
         return [
@@ -388,6 +408,9 @@ public function httpSafeMethodProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function httpNotSafeMethodProvider()
     {
         return [
@@ -400,6 +423,9 @@ public function httpNotSafeMethodProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function isSecureDataProvider()
     {
         /**
@@ -434,14 +460,30 @@ public function isSecureDataProvider()
      * @param string $basePath$
      * @param string $expected
      */
-    public function testSetPathInfo($requestUri, $basePath, $expected)
+    public function testGetPathInfo($requestUri, $basePath, $expected)
     {
-        $this->_model = $this->getModel($requestUri);
-        $this->_model->setBaseUrl($basePath);
-        $this->_model->setPathInfo();
-        $this->assertEquals($expected, $this->_model->getPathInfo());
+        $this->model = $this->getModel($requestUri);
+        $this->model->setBaseUrl($basePath);
+        $this->assertEquals($expected, $this->model->getPathInfo());
+        $this->assertEquals($expected, $this->model->getOriginalPathInfo());
     }
 
+    public function testSetPathInfo()
+    {
+        $requestUri = 'http://svr.com//module/route/mypage/myproduct?param1=1';
+        $basePath = '/module/route/';
+        $this->model = $this->getModel($requestUri);
+        $this->model->setBaseUrl($basePath);
+        $expected = '/mypage/myproduct';
+        $this->assertEquals($expected, $this->model->getOriginalPathInfo());
+        $this->model->setPathInfo('http://svr.com/something/route?param1=1');
+        $this->assertEquals('http://svr.com/something/route?param1=1', $this->model->getPathInfo());
+        $this->assertEquals($expected, $this->model->getOriginalPathInfo());
+    }
+
+    /**
+     * @return array
+     */
     public function setPathInfoDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
index 8a5c071e8c4ee..921fcf2e61e6d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
@@ -13,7 +13,7 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
index 11e305f806ba2..7ad2f21c89d71 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
@@ -67,7 +67,7 @@ public function testCreateIfContentDoesntHaveRequiredKeys()
 
     /**
      * @expectedException \Exception
-     * @exceptedExceptionMessage File not found
+     * @expectedExceptionMessage File not found
      */
     public function testCreateIfFileNotExist()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
index fc139ba2dd9c3..efb35b7321c3b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
@@ -8,6 +8,8 @@
 
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Session\Config\ConfigInterface;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -49,6 +51,19 @@ class HttpTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionConfigMock;
+
+    /**
+     * @var int
+     */
+    private $cookieLifeTime = 3600;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -68,6 +83,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->sessionConfigMock = $this->getMockBuilder(ConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->model = $this->objectManager->getObject(
             \Magento\Framework\App\Response\Http::class,
             [
@@ -75,13 +94,17 @@ protected function setUp()
                 'cookieManager' => $this->cookieManagerMock,
                 'cookieMetadataFactory' => $this->cookieMetadataFactoryMock,
                 'context' => $this->contextMock,
-                'dateTime' => $this->dateTimeMock
+                'dateTime' => $this->dateTimeMock,
+                'sessionConfig' => $this->sessionConfigMock,
             ]
         );
         $this->model->headersSentThrowsException = false;
         $this->model->setHeader('Name', 'Value');
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         unset($this->model);
@@ -108,9 +131,14 @@ public function testSendVary()
             ->method('getVaryString')
             ->will($this->returnValue($expectedCookieValue));
 
+        $this->sessionConfigMock->expects($this->once())
+            ->method('getCookieLifetime')
+            ->willReturn($this->cookieLifeTime);
+
         $this->cookieMetadataFactoryMock->expects($this->once())
             ->method('createSensitiveCookieMetadata')
-            ->will($this->returnValue($sensitiveCookieMetadataMock));
+            ->with([CookieMetadata::KEY_DURATION => $this->cookieLifeTime])
+            ->willReturn($sensitiveCookieMetadataMock);
 
         $this->cookieManagerMock->expects($this->once())
             ->method('setSensitiveCookie')
@@ -185,10 +213,8 @@ public function testSetPublicHeaders()
      */
     public function testSetPublicHeadersWithoutTtl()
     {
-        $this->expectException(
-            'InvalidArgumentException',
-            'Time to live is a mandatory parameter for set public headers'
-        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Time to live is a mandatory parameter for set public headers');
         $this->model->setPublicHeaders(null);
     }
 
@@ -223,10 +249,8 @@ public function testSetPrivateHeaders()
      */
     public function testSetPrivateHeadersWithoutTtl()
     {
-        $this->expectException(
-            'InvalidArgumentException',
-            'Time to live is a mandatory parameter for set private headers'
-        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Time to live is a mandatory parameter for set private headers');
         $this->model->setPrivateHeaders(null);
     }
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php
index 143de5ee47fae..61938b455295e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Route/Config/SchemaLocatorTest.php
@@ -12,10 +12,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $config;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolverMock;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
index 0bdbcccc40b35..e1a2171d2111a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
@@ -93,6 +93,9 @@ public function testGet($module, $area, $namespace, $action, $data, $expected)
         $this->assertEquals($expected, $this->actionList->get($module, $area, $namespace, $action));
     }
 
+    /**
+     * @return array
+     */
     public function getDataProvider()
     {
         $mockClassName = 'Mock_Action_Class';
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php
index b9df13c67a863..5c28899b4d405 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Test\Unit\Scope;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -76,7 +77,7 @@ public function testNotEmptyScopeCodeForDefaultScope()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Enter a scope before proceeding.
+     * @expectedExceptionMessage A scope is missing. Enter a scope and try again.
      */
     public function testEmptyScope()
     {
@@ -85,7 +86,7 @@ public function testEmptyScope()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Enter a scope code before proceeding.
+     * @expectedExceptionMessage A scope code is missing. Enter a code and try again.
      */
     public function testEmptyScopeCode()
     {
@@ -103,7 +104,7 @@ public function testWrongScopeCodeFormat()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "not_default_scope" value doesn't exist. Enter another value.
+     * @expectedExceptionMessage The "not_default_scope" value doesn't exist. Enter another value and try again.
      */
     public function testScopeNotExist()
     {
@@ -118,7 +119,7 @@ public function testScopeNotExist()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "not_exist_scope_code" value doesn't exist. Enter another value.
+     * @expectedExceptionMessage The "not_exist_scope_code" value doesn't exist. Enter another value and try again.
      */
     public function testScopeCodeNotExist()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
index 7a54cf17a87e4..0b7e0e00a2df8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ScopeResolverPoolTest.php
@@ -49,6 +49,9 @@ public function testGetException($scope)
         $scopeResolver->get($scope);
     }
 
+    /**
+     * @return array
+     */
     public function testGetExceptionDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
index a209c313a0a89..ae8a76f7bbc1f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
@@ -24,10 +24,14 @@ class SetupInfoTest extends \PHPUnit\Framework\TestCase
      */
     public function testConstructorExceptions($server, $expectedError)
     {
-        $this->expectException('\InvalidArgumentException', $expectedError);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($expectedError);
         new SetupInfo($server);
     }
 
+    /**
+     * @return array
+     */
     public function constructorExceptionsDataProvider()
     {
         $docRootErr = 'DOCUMENT_ROOT variable is unavailable.';
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php
index 9eed1fbedd954..65ac19cbc2996 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php
@@ -69,7 +69,8 @@ public function testExecuteFailure()
         );
         $this->driverMock->expects($this->once())->method('execute')->willReturn($response);
         $this->loggerMock->expects($this->once())->method('error')->with($logEntry);
-        $this->expectException(LocalizedException::class, "Command returned non-zero exit code:\n`$command`");
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage("Command returned non-zero exit code:\n`$command`");
         $this->model->execute($command, []);
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
index 46eec1e692424..a87322b6e90d9 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
@@ -87,6 +87,10 @@ public function testEmulateAreaCode()
         $this->assertEquals($this->model->getAreaCode(), $areaCode);
     }
 
+    /**
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function emulateAreaCodeCallback()
     {
         return $this->model->getAreaCode();
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
index 80b5e79582ee8..d69ce4956ce8c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
@@ -7,7 +7,19 @@
 namespace Magento\Framework\App\Test\Unit;
 
 use Magento\Framework\App\Bootstrap;
-use Magento\Framework\Filesystem;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\State;
+use Magento\Framework\App\Response\FileInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\View\Asset\Publisher;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\ObjectManager\ConfigLoader;
+use Magento\Framework\App\StaticResource;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Psr\Log\LoggerInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -15,89 +27,105 @@
 class StaticResourceTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     * @var State|MockObject
      */
-    private $state;
+    private $stateMock;
 
     /**
-     * @var \Magento\Framework\App\Response\FileInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var FileInterface|MockObject
      */
-    private $response;
+    private $responseMock;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var HttpRequest|MockObject
      */
-    private $request;
+    private $requestMock;
 
     /**
-     * @var \Magento\Framework\App\View\Asset\Publisher|\PHPUnit_Framework_MockObject_MockObject
+     * @var Publisher|MockObject
      */
-    private $publisher;
+    private $publisherMock;
 
     /**
-     * @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
+     * @var Repository|MockObject
      */
-    private $assetRepo;
+    private $assetRepoMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleList|\PHPUnit_Framework_MockObject_MockObject
+     * @var ModuleList|MockObject
      */
-    private $moduleList;
+    private $moduleListMock;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerInterface|MockObject
      */
-    private $objectManager;
+    private $objectManagerMock;
 
     /**
-     * @var \Magento\Framework\App\ObjectManager\ConfigLoader|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigLoader|MockObject
      */
-    private $configLoader;
+    private $configLoaderMock;
 
     /**
-     * @var \Magento\Framework\App\StaticResource
+     * @var LoggerInterface|MockObject
      */
-    private $object;
+    private $loggerMock;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DeploymentConfig|MockObject
      */
-    private $logger;
+    private $deploymentConfigMock;
+
+    /**
+     * @var StaticResource
+     */
+    private $object;
 
     protected function setUp()
     {
-        $this->state = $this->createMock(\Magento\Framework\App\State::class);
-        $this->response = $this->createMock(\Magento\MediaStorage\Model\File\Storage\Response::class);
-        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->publisher = $this->createMock(\Magento\Framework\App\View\Asset\Publisher::class);
-        $this->assetRepo = $this->createMock(\Magento\Framework\View\Asset\Repository::class);
-        $this->moduleList = $this->createMock(\Magento\Framework\Module\ModuleList::class);
-        $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
-        $this->logger = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
-        $this->configLoader = $this->createMock(\Magento\Framework\App\ObjectManager\ConfigLoader::class);
-        $this->object = new \Magento\Framework\App\StaticResource(
-            $this->state,
-            $this->response,
-            $this->request,
-            $this->publisher,
-            $this->assetRepo,
-            $this->moduleList,
-            $this->objectManager,
-            $this->configLoader,
-            $this->getMockForAbstractClass(\Magento\Framework\View\DesignInterface::class)
+        $this->stateMock = $this->createMock(State::class);
+        $this->responseMock = $this->getMockForAbstractClass(FileInterface::class);
+        $this->requestMock = $this->createMock(HttpRequest::class);
+        $this->publisherMock = $this->createMock(Publisher::class);
+        $this->assetRepoMock = $this->createMock(Repository::class);
+        $this->moduleListMock = $this->createMock(ModuleList::class);
+        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->configLoaderMock = $this->createMock(ConfigLoader::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->object = new StaticResource(
+            $this->stateMock,
+            $this->responseMock,
+            $this->requestMock,
+            $this->publisherMock,
+            $this->assetRepoMock,
+            $this->moduleListMock,
+            $this->objectManagerMock,
+            $this->configLoaderMock,
+            $this->deploymentConfigMock
         );
     }
 
     public function testLaunchProductionMode()
     {
-        $this->state->expects($this->once())
+        $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION));
-        $this->response->expects($this->once())
+            ->willReturn(State::MODE_PRODUCTION);
+        $this->responseMock->expects($this->once())
             ->method('setHttpResponseCode')
             ->with(404);
-        $this->response->expects($this->never())
+        $this->responseMock->expects($this->never())
             ->method('setFilePath');
+        $this->stateMock->expects($this->never())->method('setAreaCode');
+        $this->configLoaderMock->expects($this->never())->method('load');
+        $this->objectManagerMock->expects($this->never())->method('configure');
+        $this->requestMock->expects($this->never())->method('get');
+        $this->moduleListMock->expects($this->never())->method('has');
+        $asset = $this->getMockForAbstractClass(\Magento\Framework\View\Asset\LocalInterface::class);
+        $asset->expects($this->never())->method('getSourceFile');
+        $this->assetRepoMock->expects($this->never())->method('createAsset');
+        $this->publisherMock->expects($this->never())->method('publish');
+        $this->responseMock->expects($this->never())->method('setFilePath');
         $this->object->launch();
     }
 
@@ -108,6 +136,8 @@ public function testLaunchProductionMode()
      * @param bool $moduleExists
      * @param string $expectedFile
      * @param array $expectedParams
+     * @param int $getConfigDataExpects
+     * @param int $staticContentOmDemandInProduction
      *
      * @dataProvider launchDataProvider
      */
@@ -117,37 +147,47 @@ public function testLaunch(
         $requestedModule,
         $moduleExists,
         $expectedFile,
-        array $expectedParams
+        array $expectedParams,
+        $getConfigDataExpects,
+        $staticContentOmDemandInProduction
     ) {
-        $this->state->expects($this->once())
+        $this->deploymentConfigMock->expects($this->exactly($getConfigDataExpects))
+            ->method('getConfigData')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn($staticContentOmDemandInProduction);
+        $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue($mode));
-        $this->state->expects($this->once())
+            ->willReturn($mode);
+        $this->stateMock->expects($this->once())
             ->method('setAreaCode')
             ->with('area');
-        $this->configLoader->expects($this->once())
+        $this->configLoaderMock->expects($this->once())
             ->method('load')
             ->with('area')
-            ->will($this->returnValue(['config']));
-        $this->objectManager->expects($this->once())
+            ->willReturn(['config']);
+        $this->objectManagerMock->expects($this->once())
             ->method('configure')
             ->with(['config']);
-        $this->request->expects($this->once())
+        $this->requestMock->expects($this->once())
             ->method('get')
             ->with('resource')
-            ->will($this->returnValue($requestedPath));
-        $this->moduleList->expects($this->any())
+            ->willReturn($requestedPath);
+        $this->moduleListMock->expects($this->any())
             ->method('has')
             ->with($requestedModule)
-            ->will($this->returnValue($moduleExists));
+            ->willReturn($moduleExists);
         $asset = $this->getMockForAbstractClass(\Magento\Framework\View\Asset\LocalInterface::class);
-        $asset->expects($this->once())->method('getSourceFile')->will($this->returnValue('resource/file.css'));
-        $this->assetRepo->expects($this->once())
+        $asset->expects($this->once())
+            ->method('getSourceFile')
+            ->willReturn('resource/file.css');
+        $this->assetRepoMock->expects($this->once())
             ->method('createAsset')
             ->with($expectedFile, $expectedParams)
-            ->will($this->returnValue($asset));
-        $this->publisher->expects($this->once())->method('publish')->with($asset);
-        $this->response->expects($this->once())
+            ->willReturn($asset);
+        $this->publisherMock->expects($this->once())
+            ->method('publish')
+            ->with($asset);
+        $this->responseMock->expects($this->once())
             ->method('setFilePath')
             ->with('resource/file.css');
         $this->object->launch();
@@ -166,6 +206,8 @@ public function launchDataProvider()
                 false,
                 'dir/file.js',
                 ['area' => 'area', 'locale' => 'locale', 'module' => '', 'theme' => 'Magento/theme'],
+                0,
+                0,
             ],
             'default mode with modular resource' => [
                 \Magento\Framework\App\State::MODE_DEFAULT,
@@ -176,6 +218,30 @@ public function launchDataProvider()
                 [
                     'area' => 'area', 'locale' => 'locale', 'module' => 'Namespace_Module', 'theme' => 'Magento/theme'
                 ],
+                0,
+                0,
+            ],
+            'production mode with static_content_on_demand_in_production and with non-modular resource' => [
+                \Magento\Framework\App\State::MODE_PRODUCTION,
+                'area/Magento/theme/locale/dir/file.js',
+                'dir',
+                false,
+                'dir/file.js',
+                ['area' => 'area', 'locale' => 'locale', 'module' => '', 'theme' => 'Magento/theme'],
+                1,
+                1,
+            ],
+            'production mode with static_content_on_demand_in_production and with modular resource' => [
+                \Magento\Framework\App\State::MODE_PRODUCTION,
+                'area/Magento/theme/locale/Namespace_Module/dir/file.js',
+                'Namespace_Module',
+                true,
+                'dir/file.js',
+                [
+                    'area' => 'area', 'locale' => 'locale', 'module' => 'Namespace_Module', 'theme' => 'Magento/theme'
+                ],
+                1,
+                1,
             ],
         ];
     }
@@ -186,29 +252,54 @@ public function launchDataProvider()
      */
     public function testLaunchWrongPath()
     {
-        $this->state->expects($this->once())
+        $this->stateMock->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue(\Magento\Framework\App\State::MODE_DEVELOPER));
-        $this->request->expects($this->once())
+        $this->requestMock->expects($this->once())
             ->method('get')
             ->with('resource')
-            ->will($this->returnValue('short/path.js'));
+            ->willReturn('short/path.js');
         $this->object->launch();
     }
 
     public function testCatchExceptionDeveloperMode()
     {
-        $this->objectManager->expects($this->once())
+        $this->objectManagerMock->expects($this->once())
             ->method('get')
             ->with(\Psr\Log\LoggerInterface::class)
-            ->willReturn($this->logger);
-        $this->logger->expects($this->once())
+            ->willReturn($this->loggerMock);
+        $this->loggerMock->expects($this->once())
             ->method('critical');
-        $bootstrap = $this->getMockBuilder(Bootstrap::class)->disableOriginalConstructor()->getMock();
-        $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(true);
+        $bootstrap = $this->getMockBuilder(Bootstrap::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $bootstrap->expects($this->once())
+            ->method('isDeveloperMode')
+            ->willReturn(true);
         $exception = new \Exception('Error: nothing works');
-        $this->response->expects($this->once())->method('setHttpResponseCode')->with(404);
-        $this->response->expects($this->once())->method('sendResponse');
+        $this->responseMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(404);
+        $this->responseMock->expects($this->once())
+            ->method('sendResponse');
         $this->assertTrue($this->object->catchException($bootstrap, $exception));
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testLaunchPathAbove()
+    {
+        $path = 'frontend/..\..\folder_above/././Magento_Ui/template/messages.html';
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->will($this->returnValue(State::MODE_DEVELOPER));
+        $this->requestMock->expects($this->once())
+            ->method('get')
+            ->with('resource')
+            ->willReturn('frontend/..\..\folder_above/././Magento_Ui/template/messages.html');
+        $this->expectExceptionMessage("Requested path '$path' is wrong.");
+
+        $this->object->launch();
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Utility/FilesTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Utility/FilesTest.php
index 40df3ca8ee4f5..254c50d51fd2b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Utility/FilesTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Utility/FilesTest.php
@@ -8,6 +8,11 @@
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 
+/**
+ * Test for Utility/Files class.
+ *
+ * @package Magento\Framework\App\Test\Unit\Utility
+ */
 class FilesTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -47,6 +52,21 @@ public function testGetConfigFiles()
         $this->assertSame($expected, $actual);
     }
 
+    public function testGetDbSchemaFiles()
+    {
+        $this->dirSearchMock->expects($this->once())
+            ->method('collectFiles')
+            ->with(ComponentRegistrar::MODULE, '/etc/db_schema.xml')
+            ->willReturn(['First/Module/etc/db_schema.xml', 'Second/Module/etc/db_schema.xml']);
+
+        $expected = [
+            'First/Module/etc/db_schema.xml' => ['First/Module/etc/db_schema.xml'],
+            'Second/Module/etc/db_schema.xml' => ['Second/Module/etc/db_schema.xml'],
+        ];
+        $actual = Files::init()->getDbSchemaFiles('db_schema.xml', ['Second/Module/etc/db_schema.xml']);
+        $this->assertSame($expected, $actual);
+    }
+
     public function testGetLayoutConfigFiles()
     {
         $this->dirSearchMock->expects($this->once())
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php
index c7a2764545357..1873cc593a655 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php
@@ -87,7 +87,8 @@ public function testCreateException()
 
         $factory = new Factory($this->objectManager, []);
 
-        $this->expectException('LogicException', 'No materialization strategy is supported');
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('No materialization strategy is supported');
         $factory->create($asset);
     }
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
index 68312bdc01044..d3ff7bf5d75bd 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
@@ -6,6 +6,12 @@
 namespace Magento\Framework\App\Test\Unit\View\Deployment;
 
 use Magento\Framework\App\View\Deployment\Version;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\State;
+use Magento\Framework\App\View\Deployment\Version\StorageInterface;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class VersionTest
@@ -18,29 +24,34 @@ class VersionTest extends \PHPUnit\Framework\TestCase
     private $object;
 
     /**
-     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     * @var State|MockObject
      */
     private $appStateMock;
 
     /**
-     * @var \Magento\Framework\App\View\Deployment\Version\StorageInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StorageInterface|MockObject
      */
     private $versionStorageMock;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|MockObject
      */
     private $loggerMock;
 
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->appStateMock = $this->createMock(\Magento\Framework\App\State::class);
-        $this->versionStorageMock = $this->createMock(
-            \Magento\Framework\App\View\Deployment\Version\StorageInterface::class
-        );
-        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->object = new Version($this->appStateMock, $this->versionStorageMock);
+        $this->versionStorageMock = $this->createMock(StorageInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+
+        $this->object = new Version($this->appStateMock, $this->versionStorageMock, $this->deploymentConfigMock);
         $objectManager->setBackwardCompatibleProperty($this->object, 'logger', $this->loggerMock);
     }
 
@@ -53,18 +64,24 @@ public function testGetValueFromStorage($appMode)
         $this->appStateMock
             ->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue($appMode));
-        $this->versionStorageMock->expects($this->once())->method('load')->will($this->returnValue('123'));
-        $this->versionStorageMock->expects($this->never())->method('save');
+            ->willReturn($appMode);
+        $this->versionStorageMock->expects($this->once())
+            ->method('load')
+            ->willReturn('123');
+        $this->versionStorageMock->expects($this->never())
+            ->method('save');
         $this->assertEquals('123', $this->object->getValue());
         $this->object->getValue(); // Ensure caching in memory
     }
 
+    /**
+     * @return array
+     */
     public function getValueFromStorageDataProvider()
     {
         return [
-            'default mode'      => [\Magento\Framework\App\State::MODE_DEFAULT],
-            'production mode'   => [\Magento\Framework\App\State::MODE_PRODUCTION],
+            'default mode'      => [State::MODE_DEFAULT],
+            'production mode'   => [State::MODE_PRODUCTION],
             'arbitrary mode'    => ['test'],
         ];
     }
@@ -90,7 +107,11 @@ public function testGetValueWithProductionModeAndException()
             ->willReturn(false);
         $this->appStateMock->expects($this->once())
             ->method('getMode')
-            ->willReturn(\Magento\Framework\App\State::MODE_PRODUCTION);
+            ->willReturn(State::MODE_PRODUCTION);
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(0);
         $this->loggerMock->expects($this->once())
             ->method('critical')
             ->with('Can not load static content version.');
@@ -98,14 +119,32 @@ public function testGetValueWithProductionModeAndException()
         $this->object->getValue();
     }
 
-    public function testGetValueWithProductionMode()
+    public function testGetValueWithDefaultMode()
+    {
+        $this->versionStorageMock->expects($this->once())
+            ->method('load')
+            ->willReturn(false);
+        $this->appStateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_DEFAULT);
+        $this->versionStorageMock->expects($this->once())
+            ->method('save');
+
+        $this->assertNotNull($this->object->getValue());
+    }
+
+    public function testGetValueWithProductionModeAndEnabledSCDonDemand()
     {
         $this->versionStorageMock->expects($this->once())
             ->method('load')
             ->willReturn(false);
         $this->appStateMock->expects($this->once())
             ->method('getMode')
-            ->willReturn(\Magento\Framework\App\State::MODE_DEFAULT);
+            ->willReturn(State::MODE_PRODUCTION);
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(1);
         $this->versionStorageMock->expects($this->once())
             ->method('save');
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
index 807a70ecd7599..f39a91161c1f5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
@@ -122,7 +122,7 @@ public function testGetLayout()
 
     /**
      * @expectedException \RuntimeException
-     * @exceptedExceptionMessage 'Layout must be loaded only once.'
+     * @expectedExceptionMessage Layout must be loaded only once.
      */
     public function testLoadLayoutWhenLayoutAlreadyLoaded()
     {
diff --git a/lib/internal/Magento/Framework/App/Utility/Classes.php b/lib/internal/Magento/Framework/App/Utility/Classes.php
index 7cd36f0e37fc8..3518264e1ab3b 100644
--- a/lib/internal/Magento/Framework/App/Utility/Classes.php
+++ b/lib/internal/Magento/Framework/App/Utility/Classes.php
@@ -9,6 +9,9 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 
+/**
+ * Utility for class names processing
+ */
 class Classes
 {
     /**
@@ -236,7 +239,7 @@ public static function getVirtualClasses()
     /**
      * Check if instance is virtual type
      *
-     * @param $className string
+     * @param string $className
      * @return bool
      */
     public static function isVirtual($className)
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 3cb54da48f5f8..b0dfc50e9f972 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -13,7 +13,7 @@
 use Magento\Framework\Filesystem\Glob;
 
 /**
- * A helper to gather specific kind of files in Magento application
+ * A helper to gather specific kind of files in Magento application.
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -162,7 +162,8 @@ public static function composeDataSets(array $files)
     {
         $result = [];
         foreach ($files as $file) {
-            $result[$file] = [$file];
+            $key = str_replace(BP . '/', '', $file);
+            $result[$key] = [$file];
         }
         return $result;
     }
@@ -391,7 +392,7 @@ public function getMainConfigFiles($asDataSet = true)
             $configXmlPaths = array_merge($globPaths, $configXmlPaths);
             $files = [];
             foreach ($configXmlPaths as $xmlPath) {
-                $files = array_merge($files, glob($xmlPath));
+                $files = array_merge($files, glob($xmlPath, GLOB_NOSORT));
             }
             self::$_cache[$cacheKey] = $files;
         }
@@ -475,6 +476,14 @@ public function getXmlCatalogFiles(
                     []
                 )
             );
+            $files = array_merge(
+                $files,
+                $this->getFilesSubset(
+                    $this->componentRegistrar->getPaths(ComponentRegistrar::SETUP),
+                    $fileNamePattern,
+                    []
+                )
+            );
             $files = array_filter(
                 $files,
                 function ($file) use ($excludedFileNames) {
@@ -1121,6 +1130,37 @@ public function getPhtmlFiles($withMetaInfo = false, $asDataSet = true)
         return self::$_cache[$key];
     }
 
+    /**
+     * Returns list of db_schema files, used by Magento application.
+     *
+     * @param string $fileNamePattern
+     * @param array $excludedFileNames
+     * @param bool $asDataSet
+     * @return array
+     * @codingStandardsIgnoreStart
+     */
+    public function getDbSchemaFiles(
+        $fileNamePattern = 'db_schema.xml',
+        $excludedFileNames = [],
+        $asDataSet = true
+    ) {
+        $cacheKey = __METHOD__ . '|' . $this->serializer->serialize([$fileNamePattern, $excludedFileNames, $asDataSet]);
+        if (!isset(self::$_cache[$cacheKey])) {
+            $files = $this->dirSearch->collectFiles(ComponentRegistrar::MODULE, "/etc/{$fileNamePattern}");
+            $files = array_filter(
+                $files,
+                function ($file) use ($excludedFileNames) {
+                    return !in_array(basename($file), $excludedFileNames);
+                }
+            );
+            self::$_cache[$cacheKey] = $files;
+        }
+        if ($asDataSet) {
+            return self::composeDataSets(self::$_cache[$cacheKey]);
+        }
+        return self::$_cache[$cacheKey];
+    }
+
     /**
      * Collect templates from themes
      *
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version.php b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
index 07efa1663c6c5..67f6d3c1ed779 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\App\View\Deployment;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -33,16 +36,24 @@ class Version
      */
     private $logger;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param \Magento\Framework\App\State $appState
      * @param Version\StorageInterface $versionStorage
+     * @param DeploymentConfig|null $deploymentConfig
      */
     public function __construct(
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\App\View\Deployment\Version\StorageInterface $versionStorage
+        \Magento\Framework\App\View\Deployment\Version\StorageInterface $versionStorage,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->appState = $appState;
         $this->versionStorage = $versionStorage;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
     }
 
     /**
@@ -68,7 +79,11 @@ protected function readValue($appMode)
     {
         $result = $this->versionStorage->load();
         if (!$result) {
-            if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
+            if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION
+                && !$this->deploymentConfig->getConfigData(
+                    ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION
+                )
+            ) {
                 $this->getLogger()->critical('Can not load static content version.');
                 throw new \UnexpectedValueException(
                     "Unable to retrieve deployment version of static files from the file system."
diff --git a/lib/internal/Magento/Framework/Archive.php b/lib/internal/Magento/Framework/Archive.php
index d43c976431b51..3b706f8e97d07 100644
--- a/lib/internal/Magento/Framework/Archive.php
+++ b/lib/internal/Magento/Framework/Archive.php
@@ -96,14 +96,14 @@ public function pack($source, $destination = 'packed.tgz', $skipRoot = false)
     {
         $archivers = $this->_getArchivers($destination);
         $interimSource = '';
-        for ($i = 0; $i < count($archivers); $i++) {
-            if ($i == count($archivers) - 1) {
+        for ($i = 0, $count = count($archivers); $i < $count; $i++) {
+            if ($i == $count - 1) {
                 $packed = $destination;
             } else {
                 $packed = dirname($destination) . '/~tmp-' . microtime(true) . $archivers[$i] . '.' . $archivers[$i];
             }
             $source = $this->_getArchiver($archivers[$i])->pack($source, $packed, $skipRoot);
-            if ($interimSource && $i < count($archivers)) {
+            if ($interimSource && $i < $count) {
                 unlink($interimSource);
             }
             $interimSource = $source;
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File.php b/lib/internal/Magento/Framework/Archive/Helper/File.php
index 60959a658e3f8..5d2a405578c8c 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File.php
@@ -96,7 +96,7 @@ public function open($mode = 'w+', $chmod = null)
             if (!is_writable($this->_fileLocation)) {
                 throw new LocalizedException(
                     new \Magento\Framework\Phrase(
-                        'Permission denied to write to %1',
+                        'You don\'t have permissions to write to the "%1" file.',
                         [$this->_fileLocation]
                     )
                 );
@@ -105,7 +105,7 @@ public function open($mode = 'w+', $chmod = null)
             if (is_file($this->_filePath) && !is_writable($this->_filePath)) {
                 throw new LocalizedException(
                     new \Magento\Framework\Phrase(
-                        "Can't open file %1 for writing. Permission denied.",
+                        'You don\'t have the permissions to open the "%1" file for writing access.',
                         [$this->_fileName]
                     )
                 );
@@ -115,13 +115,19 @@ public function open($mode = 'w+', $chmod = null)
         if ($this->_isReadableMode($mode) && (!is_file($this->_filePath) || !is_readable($this->_filePath))) {
             if (!is_file($this->_filePath)) {
                 throw new LocalizedException(
-                    new \Magento\Framework\Phrase('File %1 does not exist', [$this->_filePath])
+                    new \Magento\Framework\Phrase(
+                        'The "%1" file doesn\'t exist. Verify the file and try again.',
+                        [$this->_filePath]
+                    )
                 );
             }
 
             if (!is_readable($this->_filePath)) {
                 throw new LocalizedException(
-                    new \Magento\Framework\Phrase('Permission denied to read file %1', [$this->_filePath])
+                    new \Magento\Framework\Phrase(
+                        'You don\'t have permissions to read the "%1" file.',
+                        [$this->_filePath]
+                    )
                 );
             }
         }
@@ -200,7 +206,7 @@ protected function _open($mode)
 
         if (false === $this->_fileHandler) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase('Failed to open file %1', [$this->_filePath])
+                new \Magento\Framework\Phrase('The "%1" file failed to open.', [$this->_filePath])
             );
         }
     }
@@ -218,7 +224,7 @@ protected function _write($data)
 
         if (false === $result) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase('Failed to write data to %1', [$this->_filePath])
+                new \Magento\Framework\Phrase('The data failed to write to "%1".', [$this->_filePath])
             );
         }
     }
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
index a3623d2b05c9f..d84cf25c54137 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
@@ -24,7 +24,7 @@ protected function _open($mode)
 
         if (false === $this->_fileHandler) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to open file %1', [$this->_filePath])
+                new \Magento\Framework\Phrase('The "%1" file failed to open.', [$this->_filePath])
             );
         }
     }
@@ -38,7 +38,7 @@ protected function _write($data)
 
         if (false === $result) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to write data to %1', [$this->_filePath])
+                new \Magento\Framework\Phrase('The data failed to write to "%1".', [$this->_filePath])
             );
         }
     }
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
index db5038963c4f3..5204bcae9ae32 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
@@ -24,7 +24,7 @@ protected function _open($mode)
 
         if (false === $this->_fileHandler) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to open file %1', [$this->_filePath])
+                new \Magento\Framework\Phrase('The "%1" file failed to open.', [$this->_filePath])
             );
         }
     }
@@ -38,7 +38,7 @@ protected function _write($data)
 
         if (empty($result) && !empty($data)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to write data to %1', [$this->_filePath])
+                new \Magento\Framework\Phrase('The data failed to write to "%1".', [$this->_filePath])
             );
         }
     }
diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
index ccf9838d6649f..a858b2411515a 100644
--- a/lib/internal/Magento/Framework/Archive/Tar.php
+++ b/lib/internal/Magento/Framework/Archive/Tar.php
@@ -4,16 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Framework\Archive;
+
+use Magento\Framework\Archive\Helper\File;
+
 /**
  * Class to work with tar archives
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Framework\Archive;
-
-use Magento\Framework\Archive\Helper\File;
-use Magento\Framework\Filesystem\DriverInterface;
-
 class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
     /**
@@ -252,7 +251,7 @@ protected function _createTar($skipRoot = false, $finalize = false)
         $file = $this->_getCurrentFile();
 
         if (is_dir($file)) {
-            $dirFiles = scandir($file);
+            $dirFiles = scandir($file, SCANDIR_SORT_NONE);
 
             if (false === $dirFiles) {
                 throw new \Magento\Framework\Exception\LocalizedException(
@@ -260,10 +259,7 @@ protected function _createTar($skipRoot = false, $finalize = false)
                 );
             }
 
-            array_shift($dirFiles);
-            /* remove  './'*/
-            array_shift($dirFiles);
-            /* remove  '../'*/
+            $dirFiles = array_diff($dirFiles, ['..', '.']);
 
             foreach ($dirFiles as $item) {
                 $this->_setCurrentFile($file . $item)->_createTar();
diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
index f33ad8700f056..c41f8b28ce348 100644
--- a/lib/internal/Magento/Framework/Archive/Zip.php
+++ b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -4,13 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Class to work with zip archives
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Archive;
 
+/**
+ * Zip compressed file archive.
+ */
 class Zip extends AbstractArchive implements ArchiveInterface
 {
     /**
@@ -54,11 +52,34 @@ public function pack($source, $destination)
     public function unpack($source, $destination)
     {
         $zip = new \ZipArchive();
-        $zip->open($source);
-        $filename = $zip->getNameIndex(0);
-        $zip->extractTo(dirname($destination), $filename);
-        rename(dirname($destination).'/'.$filename, $destination);
-        $zip->close();
+        if ($zip->open($source) === true) {
+            $filename = $this->filterRelativePaths($zip->getNameIndex(0) ?: '');
+            if ($filename) {
+                $zip->extractTo(dirname($destination), $filename);
+                rename(dirname($destination).'/'.$filename, $destination);
+            } else {
+                $destination = '';
+            }
+            $zip->close();
+        } else {
+            $destination = '';
+        }
+
         return $destination;
     }
+
+    /**
+     * Filter file names with relative paths.
+     *
+     * @param string $path
+     * @return string
+     */
+    private function filterRelativePaths(string $path): string
+    {
+        if ($path && preg_match('#^\s*(../)|(/../)#i', $path)) {
+            $path = '';
+        }
+
+        return $path;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Backup/BackupInterface.php b/lib/internal/Magento/Framework/Backup/BackupInterface.php
index 3d054bdbd1a9c..16aada9689c11 100644
--- a/lib/internal/Magento/Framework/Backup/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/BackupInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * @api
+ *
+ * @deprecated Backups should be done using other means.
  */
 interface BackupInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
index 13e3c562bb527..a019ccac06b66 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * @api
+ *
+ * @deprecated Backups should be done using other means.
  */
 interface BackupDbInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
index f7459f629cb4a..ae5879290eb20 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * @api
+ *
+ * @deprecated Backups should be done using other means.
  */
 interface BackupInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
index 19109001b02c1..4820b83ceb7a8 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Backup\Filesystem\Rollback;
 
 use Magento\Framework\App\ObjectManager;
@@ -66,7 +67,7 @@ public function run()
             }
 
             throw new NotEnoughPermissions(
-                new Phrase('Unable to make rollback because not all files are writable')
+                new Phrase("The rollback can't be executed because not all files are writable.")
             );
         }
 
@@ -74,7 +75,7 @@ public function run()
 
         /**
          * we need these fake initializations because all magento's files in filesystem will be deleted and autoloader
-         * wont be able to load classes that we need for unpacking
+         * won't be able to load classes that we need for unpacking
          */
         new Tar();
         new Gz();
@@ -93,6 +94,8 @@ public function run()
     }
 
     /**
+     * Get file system helper instance
+     *
      * @return Helper
      * @deprecated 100.2.0
      */
diff --git a/lib/internal/Magento/Framework/Backup/Test/Unit/_files/app_dirs_rollback.php b/lib/internal/Magento/Framework/Backup/Test/Unit/_files/app_dirs_rollback.php
index 7a9814bcd6932..5d4f18037d023 100644
--- a/lib/internal/Magento/Framework/Backup/Test/Unit/_files/app_dirs_rollback.php
+++ b/lib/internal/Magento/Framework/Backup/Test/Unit/_files/app_dirs_rollback.php
@@ -15,7 +15,7 @@
     }
 }
 
-$files = glob(TESTS_TEMP_DIR . '/Magento/Backup/data/*');
+$files = glob(TESTS_TEMP_DIR . '/Magento/Backup/data/*', GLOB_NOSORT);
 foreach ($files as $file) {
     unlink($file);
 }
diff --git a/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php b/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
new file mode 100644
index 0000000000000..9cfb2b1c97a4d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface BulkManagementInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkManagementInterface
+{
+    /**
+     * Schedule new bulk
+     *
+     * @param string $bulkUuid
+     * @param OperationInterface[] $operations
+     * @param string $description
+     * @param int $userId
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null);
+
+    /**
+     * Delete bulk
+     *
+     * @param string $bulkId
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function deleteBulk($bulkId);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php b/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
new file mode 100644
index 0000000000000..0f1deb0ceeeaf
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface BulkStatusInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkStatusInterface
+{
+    /**
+     * Get failed operations by bulk uuid
+     *
+     * @param string $bulkUuid
+     * @param int|null $failureType
+     * @return \Magento\Framework\Bulk\OperationInterface[]
+     * @since 100.2.0
+     */
+    public function getFailedOperationsByBulkId($bulkUuid, $failureType = null);
+
+    /**
+     * Get operations count by bulk uuid and status.
+     *
+     * @param string $bulkUuid
+     * @param int $status
+     * @return int
+     * @since 100.2.0
+     */
+    public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
+
+    /**
+     * Get all bulks created by user
+     *
+     * @param int $userId
+     * @return BulkSummaryInterface[]
+     * @since 100.2.0
+     */
+    public function getBulksByUser($userId);
+
+    /**
+     * Computational status based on statuses of belonging operations
+     *
+     * FINISHED_SUCCESFULLY - all operations are handled succesfully
+     * FINISHED_WITH_FAILURE - some operations are handled with failure
+     *
+     * @param string $bulkUuid
+     * @return int NOT_STARTED | IN_PROGRESS | FINISHED_SUCCESFULLY | FINISHED_WITH_FAILURE
+     * @since 100.2.0
+     */
+    public function getBulkStatus($bulkUuid);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php b/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
new file mode 100644
index 0000000000000..69e9b71ca00c3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface BulkSummaryInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkSummaryInterface
+{
+    /**#@+
+     * Constants for keys of data array. Identical to the name of the getter in snake case
+     */
+    const BULK_ID = 'uuid';
+    const DESCRIPTION = 'description';
+    const START_TIME = 'start_time';
+    const USER_ID = 'user_id';
+    const OPERATION_COUNT = 'operation_count';
+    /**#@-*/
+
+    /**#@+
+     * Bulk statuses constants
+     */
+    const NOT_STARTED = 0;
+    const IN_PROGRESS = 1;
+    const FINISHED_SUCCESSFULLY = 2;
+    const FINISHED_WITH_FAILURE = 3;
+    /**#@-*/
+
+    /**
+     * Get bulk uuid
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getBulkId();
+
+    /**
+     * Set bulk uuid
+     *
+     * @param string $bulkUuid
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setBulkId($bulkUuid);
+
+    /**
+     * Get bulk description
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getDescription();
+
+    /**
+     * Set bulk description
+     *
+     * @param string $description
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setDescription($description);
+
+    /**
+     * Get bulk scheduled time
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getStartTime();
+
+    /**
+     * Set bulk scheduled time
+     *
+     * @param string $timestamp
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setStartTime($timestamp);
+
+    /**
+     * Get user id
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getUserId();
+
+    /**
+     * Set user id
+     *
+     * @param int $userId
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setUserId($userId);
+
+    /**
+     * Get total number of operations scheduled in scope of this bulk
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getOperationCount();
+
+    /**
+     * Set total number of operations scheduled in scope of this bulk
+     *
+     * @param int $operationCount
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setOperationCount($operationCount);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/OperationInterface.php b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
new file mode 100644
index 0000000000000..c1cac9f171430
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface OperationInterface
+ * @api
+ * @since 100.2.0
+ */
+interface OperationInterface extends \Magento\Framework\Api\ExtensibleDataInterface
+{
+    /**#@+
+     * Constants for keys of data array. Identical to the name of the getter in snake case
+     */
+    const ID = 'id';
+    const BULK_ID = 'bulk_uuid';
+    const TOPIC_NAME = 'topic_name';
+    const SERIALIZED_DATA = 'serialized_data';
+    const RESULT_SERIALIZED_DATA = 'result_serialized_data';
+    const STATUS = 'status';
+    const RESULT_MESSAGE = 'result_message';
+    const ERROR_CODE = 'error_code';
+    /**#@-*/
+
+    /**#@+
+     * Status types
+     */
+    const STATUS_TYPE_COMPLETE = 1;
+    const STATUS_TYPE_RETRIABLY_FAILED = 2;
+    const STATUS_TYPE_NOT_RETRIABLY_FAILED = 3;
+    const STATUS_TYPE_OPEN = 4;
+    const STATUS_TYPE_REJECTED = 5;
+    /**#@-*/
+
+    /**
+     * Operation id
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getId();
+
+    /**
+     * Set operation id
+     *
+     * @param int $id
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setId($id);
+
+    /**
+     * Get bulk uuid
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getBulkUuid();
+
+    /**
+     * Set bulk uuid
+     *
+     * @param string $bulkId
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setBulkUuid($bulkId);
+
+    /**
+     * Message Queue Topic
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getTopicName();
+
+    /**
+     * Set message queue topic
+     *
+     * @param string $topic
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setTopicName($topic);
+
+    /**
+     * Serialized Data
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getSerializedData();
+
+    /**
+     * Set serialized data
+     *
+     * @param string $serializedData
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setSerializedData($serializedData);
+
+    /**
+     * 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
+     *
+     * OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getStatus();
+
+    /**
+     * Set status
+     *
+     * @param int $status
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setStatus($status);
+
+    /**
+     * Get result message
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getResultMessage();
+
+    /**
+     * Set result message
+     *
+     * @param string $resultMessage
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setResultMessage($resultMessage);
+
+    /**
+     * Get error code
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getErrorCode();
+
+    /**
+     * Set error code
+     *
+     * @param int $errorCode
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setErrorCode($errorCode);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
new file mode 100644
index 0000000000000..e86d3ca8c1624
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface OperationManagementInterface
+ * @api
+ * @since 100.2.0
+ */
+interface OperationManagementInterface
+{
+    /**
+     * Used by consumer to change status after processing operation
+     *
+     * @param int $operationId
+     * @param int $status
+     * @param int|null $errorCode
+     * @param string|null $message property to update Result Message
+     * @param string|null $data serialized data object of failed message
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function changeOperationStatus($operationId, $status, $errorCode = null, $message = null, $data = null);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/README.md b/lib/internal/Magento/Framework/Bulk/README.md
new file mode 100644
index 0000000000000..8ddbc686147ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/README.md
@@ -0,0 +1 @@
+ This component is designed to provide Bulk Operations Framework.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json
new file mode 100644
index 0000000000000..db21ec9207770
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/framework-bulk",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "type": "magento2-library",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "require": {
+        "magento/framework": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\Bulk\\": ""
+        },
+        "files": [
+            "registration.php"
+        ]
+    }
+}
diff --git a/lib/internal/Magento/Framework/Bulk/registration.php b/lib/internal/Magento/Framework/Bulk/registration.php
new file mode 100644
index 0000000000000..f9f5606b76841
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework-bulk', __DIR__);
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
index 8bb786e335f74..231a8584cc8a5 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -27,11 +27,11 @@
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  */
 
-/**
- * Database cache backend
- */
 namespace Magento\Framework\Cache\Backend;
 
+/**
+ * Database cache backend.
+ */
 class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
 {
     /**
@@ -139,7 +139,7 @@ protected function _getTagsTable()
      *
      * Note : return value is always "string" (unserialization is done by the core not by the backend)
      *
-     * @param  string  $id                     Cache id
+     * @param  string $id Cache id
      * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
      * @return string|false cached datas
      */
@@ -216,16 +216,15 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
                 $time = time();
                 $expire = $lifetime === 0 || $lifetime === null ? 0 : $time + $lifetime;
 
+                $idCol = $connection->quoteIdentifier('id');
                 $dataCol = $connection->quoteIdentifier('data');
+                $createCol = $connection->quoteIdentifier('create_time');
+                $updateCol = $connection->quoteIdentifier('update_time');
                 $expireCol = $connection->quoteIdentifier('expire_time');
-                $query = "INSERT INTO {$dataTable} (\n                    {$connection->quoteIdentifier(
-                'id'
-            )},\n                    {$dataCol},\n                    {$connection->quoteIdentifier(
-                'create_time'
-            )},\n                    {$connection->quoteIdentifier(
-                'update_time'
-            )},\n                    {$expireCol})\n                VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE\n
-            {$dataCol}=VALUES({$dataCol}),\n                    {$expireCol}=VALUES({$expireCol})";
+
+                $query = "INSERT INTO {$dataTable} ({$idCol}, {$dataCol}, {$createCol}, {$updateCol}, {$expireCol}) " .
+                    "VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE {$dataCol}=VALUES({$dataCol}), " .
+                    "{$updateCol}=VALUES({$updateCol}), {$expireCol}=VALUES({$expireCol})";
 
                 $result = $connection->query($query, [$id, $data, $time, $time, $expire])->rowCount();
             }
@@ -433,7 +432,7 @@ public function touch($id, $extraLifetime)
             return $this->_getConnection()->update(
                 $this->_getDataTable(),
                 ['expire_time' => new \Zend_Db_Expr('expire_time+' . $extraLifetime)],
-                ['id=?' => $id, 'expire_time = 0 OR expire_time>' => time()]
+                ['id=?' => $id, 'expire_time = 0 OR expire_time>?' => time()]
             );
         } else {
             return true;
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
index c5e7a7e9e7c09..0621c63acbd86 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Memcached.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Cache\Backend;
 
+/**
+ * Memcached cache model
+ */
 class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Backend_ExtendedInterface
 {
     /**
@@ -46,7 +49,7 @@ public function __construct(array $options = [])
      * Returns ID of a specific chunk on the basis of data's ID
      *
      * @param string $id    Main data's ID
-     * @param int    $index Particular chunk number to return ID for
+     * @param int $index Particular chunk number to return ID for
      * @return string
      */
     protected function _getChunkId($id, $index)
@@ -58,7 +61,7 @@ protected function _getChunkId($id, $index)
      * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
      *
      * @param string $id     ID of data's info cell
-     * @param int    $chunks Number of chunks to remove (basically, the number after '{splitted}|')
+     * @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
      * @return null
      */
     protected function _cleanTheMess($id, $chunks)
@@ -84,7 +87,7 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
         if (is_string($data) && strlen($data) > $this->_options['slab_size']) {
             $dataChunks = str_split($data, $this->_options['slab_size']);
 
-            for ($i = 0, $cnt = count($dataChunks); $i < $cnt; $i++) {
+            for ($i = 0, $count = count($dataChunks); $i < $count; $i++) {
                 $chunkId = $this->_getChunkId($id, $i);
 
                 if (!parent::save($dataChunks[$i], $chunkId, $tags, $specificLifetime)) {
@@ -103,7 +106,7 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      * Load data from memcached, glue from several chunks if it was splitted upon save.
      *
      * @param string $id                     @see \Zend_Cache_Backend_Memcached::load()
-     * @param bool   $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
+     * @param bool $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
      * @return bool|false|string
      */
     public function load($id, $doNotTestCacheValidity = false)
diff --git a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
new file mode 100644
index 0000000000000..007f921259bed
--- /dev/null
+++ b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Cache\Backend;
+
+/**
+ * Remote synchronized cache
+ *
+ * This class created for correct work local caches with multiple web nodes,
+ * that will be check cache status from remote cache
+ */
+class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
+{
+    /**
+     * Local backend cache adapter
+     *
+     * @var \Zend_Cache_Backend_ExtendedInterface
+     */
+    private $local;
+
+    /**
+     * Remote backend cache adapter
+     *
+     * @var \Zend_Cache_Backend_ExtendedInterface
+     */
+    private $remote;
+
+    /**
+     * Cache invalidation time
+     *
+     * @var \Zend_Cache_Backend_ExtendedInterface
+     */
+    protected $cacheInvalidationTime;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $_options = [
+        'remote_backend' => '',
+        'remote_backend_invalidation_time_id' => 'default_remote_backend_invalidation_time',
+        'remote_backend_custom_naming' => true,
+        'remote_backend_autoload' => true,
+        'remote_backend_options' => [],
+        'local_backend' => '',
+        'local_backend_options' => [],
+        'local_backend_custom_naming' => true,
+        'local_backend_autoload' => true
+    ];
+
+    /**
+     * @param array $options
+     */
+    public function __construct(array $options = [])
+    {
+        parent::__construct($options);
+
+        $universalOptions = array_diff_key($options, $this->_options);
+
+        if ($this->_options['remote_backend'] === null) {
+            \Zend_Cache::throwException('remote_backend option must be set');
+        } elseif ($this->_options['remote_backend'] instanceof \Zend_Cache_Backend_ExtendedInterface) {
+            $this->remote = $this->_options['remote_backend'];
+        } else {
+            $this->remote = \Zend_Cache::_makeBackend(
+                $this->_options['remote_backend'],
+                array_merge($universalOptions, $this->_options['remote_backend_options']),
+                $this->_options['remote_backend_custom_naming'],
+                $this->_options['remote_backend_autoload']
+            );
+            if (!($this->remote instanceof \Zend_Cache_Backend_ExtendedInterface)) {
+                \Zend_Cache::throwException(
+                    'remote_backend must implement the Zend_Cache_Backend_ExtendedInterface interface'
+                );
+            }
+        }
+
+        if ($this->_options['local_backend'] === null) {
+            \Zend_Cache::throwException('local_backend option must be set');
+        } elseif ($this->_options['local_backend'] instanceof \Zend_Cache_Backend_ExtendedInterface) {
+            $this->local = $this->_options['local_backend'];
+        } else {
+            $this->local = \Zend_Cache::_makeBackend(
+                $this->_options['local_backend'],
+                array_merge($universalOptions, $this->_options['local_backend_options']),
+                $this->_options['local_backend_custom_naming'],
+                $this->_options['local_backend_autoload']
+            );
+            if (!($this->local instanceof \Zend_Cache_Backend_ExtendedInterface)) {
+                \Zend_Cache::throwException(
+                    'local_backend must implement the Zend_Cache_Backend_ExtendedInterface interface'
+                );
+            }
+        }
+    }
+
+    /**
+     * Update remote cache status info
+     *
+     * @return void
+     */
+    private function updateRemoteCacheStatusInfo()
+    {
+        $this->remote->save(time(), $this->_options['remote_backend_invalidation_time_id'], [], null);
+        $this->cacheInvalidationTime = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDirectives($directives)
+    {
+        return $this->local->setDirectives($directives);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $dataModificationTime = $this->local->test($id);
+        if ($this->cacheInvalidationTime === null) {
+            $this->cacheInvalidationTime = $this->remote->load($this->_options['remote_backend_invalidation_time_id']);
+        }
+        if ($dataModificationTime >= $this->cacheInvalidationTime) {
+            return $this->local->load($id, $doNotTestCacheValidity);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function test($id)
+    {
+        return $this->local->test($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save($data, $id, $tags = [], $specificLifetime = false)
+    {
+        return $this->local->save($data, $id, $tags, $specificLifetime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function remove($id)
+    {
+        $this->updateRemoteCacheStatusInfo();
+        return $this->local->remove($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
+    {
+        $this->updateRemoteCacheStatusInfo();
+        return $this->local->clean($mode, $tags);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIds()
+    {
+        return $this->local->getIds();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTags()
+    {
+        return $this->local->getTags();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIdsMatchingTags($tags = [])
+    {
+        return $this->local->getIdsMatchingTags($tags);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIdsNotMatchingTags($tags = [])
+    {
+        return $this->local->getIdsNotMatchingTags($tags);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIdsMatchingAnyTags($tags = [])
+    {
+        return $this->local->getIdsMatchingAnyTags($tags);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFillingPercentage()
+    {
+        return $this->local->getFillingPercentage();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadatas($id)
+    {
+        return $this->local->getMetadatas($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function touch($id, $extraLifetime)
+    {
+        return $this->local->touch($id, $extraLifetime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCapabilities()
+    {
+        return $this->local->getCapabilities();
+    }
+}
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php b/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php
index c8917a099689b..43d261c1ed078 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Adapter/Zend.php
@@ -16,11 +16,27 @@ class Zend implements \Magento\Framework\Cache\FrontendInterface
     protected $_frontend;
 
     /**
-     * @param \Zend_Cache_Core $frontend
+     * Factory that creates the \Zend_Cache_Cores
+     *
+     * @var \Closure
+     */
+    private $frontendFactory;
+
+    /**
+     * The pid that owns the $_frontend object
+     *
+     * @var int
      */
-    public function __construct(\Zend_Cache_Core $frontend)
+    private $pid;
+
+    /**
+     * @param \Closure $frontendFactory
+     */
+    public function __construct(\Closure $frontendFactory)
     {
-        $this->_frontend = $frontend;
+        $this->frontendFactory = $frontendFactory;
+        $this->_frontend = $frontendFactory();
+        $this->pid = getmypid();
     }
 
     /**
@@ -28,7 +44,7 @@ public function __construct(\Zend_Cache_Core $frontend)
      */
     public function test($identifier)
     {
-        return $this->_frontend->test($this->_unifyId($identifier));
+        return $this->getFrontEnd()->test($this->_unifyId($identifier));
     }
 
     /**
@@ -36,7 +52,7 @@ public function test($identifier)
      */
     public function load($identifier)
     {
-        return $this->_frontend->load($this->_unifyId($identifier));
+        return $this->getFrontEnd()->load($this->_unifyId($identifier));
     }
 
     /**
@@ -44,7 +60,7 @@ public function load($identifier)
      */
     public function save($data, $identifier, array $tags = [], $lifeTime = null)
     {
-        return $this->_frontend->save($data, $this->_unifyId($identifier), $this->_unifyIds($tags), $lifeTime);
+        return $this->getFrontEnd()->save($data, $this->_unifyId($identifier), $this->_unifyIds($tags), $lifeTime);
     }
 
     /**
@@ -52,13 +68,14 @@ public function save($data, $identifier, array $tags = [], $lifeTime = null)
      */
     public function remove($identifier)
     {
-        return $this->_frontend->remove($this->_unifyId($identifier));
+        return $this->getFrontEnd()->remove($this->_unifyId($identifier));
     }
 
     /**
      * {@inheritdoc}
      *
      * @throws \InvalidArgumentException Exception is thrown when non-supported cleaning mode is specified
+     * @throws \Zend_Cache_Exception
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
     {
@@ -76,7 +93,7 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
                 "Magento cache frontend does not support the cleaning mode '{$mode}'."
             );
         }
-        return $this->_frontend->clean($mode, $this->_unifyIds($tags));
+        return $this->getFrontEnd()->clean($mode, $this->_unifyIds($tags));
     }
 
     /**
@@ -84,7 +101,7 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
      */
     public function getBackend()
     {
-        return $this->_frontend->getBackend();
+        return $this->getFrontEnd()->getBackend();
     }
 
     /**
@@ -92,7 +109,7 @@ public function getBackend()
      */
     public function getLowLevelFrontend()
     {
-        return $this->_frontend;
+        return $this->getFrontEnd();
     }
 
     /**
@@ -119,4 +136,20 @@ protected function _unifyIds(array $ids)
         }
         return $ids;
     }
+
+    /**
+     * Get frontEnd cache adapter for current pid
+     *
+     * @return \Zend_Cache_Core
+     */
+    private function getFrontEnd()
+    {
+        if (getmypid() === $this->pid) {
+            return $this->_frontend;
+        }
+        $frontendFactory = $this->frontendFactory;
+        $this->_frontend = $frontendFactory();
+        $this->pid = getmypid();
+        return $this->_frontend;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php
index 172d0e486dc64..7e8347a9d2103 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/CompressionTest.php
@@ -129,12 +129,21 @@ public function testSaveLoad()
         $this->assertEquals($this->_testString, $loadedValue);
     }
 
+    /**
+     * @param $data
+     * @param $cacheId
+     * @return bool
+     */
     public static function mockSave($data, $cacheId)
     {
         self::$_cacheStorage[$cacheId] = $data;
         return true;
     }
 
+    /**
+     * @param $cacheId
+     * @return bool|mixed
+     */
     public static function mockLoad($cacheId)
     {
         return array_key_exists($cacheId, self::$_cacheStorage) ? self::$_cacheStorage[$cacheId] : false;
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
index 7a3aec7b66488..03ce339e90ba1 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/Decorator/DecoratorAbstractTest.php
@@ -54,7 +54,7 @@ public function testConstructor()
     }
 
     /**
-     * @param array options
+     * @param array $options
      * @expectedException \Zend_Cache_Exception
      * @dataProvider constructorExceptionDataProvider
      */
@@ -63,6 +63,9 @@ public function testConstructorException($options)
         $this->getMockForAbstractClass(\Magento\Framework\Cache\Backend\Decorator\AbstractDecorator::class, [$options]);
     }
 
+    /**
+     * @return array
+     */
     public function constructorExceptionDataProvider()
     {
         return [
@@ -86,6 +89,9 @@ public function testAllMethods($methodName)
         call_user_func([$decorator, $methodName], null, null);
     }
 
+    /**
+     * @return array
+     */
     public function allMethodsDataProvider()
     {
         $return = [];
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
index daa3081a07c35..435fc6535c1a2 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/MongoDbTest.php
@@ -45,6 +45,9 @@ public function testGetIds(array $ids, array $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function getIdsDataProvider()
     {
         return [
@@ -64,6 +67,9 @@ public function testGetTags(array $tags)
         $this->assertEquals($tags, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function getTagsDataProvider()
     {
         return ['no tags' => [[]], 'multiple tags' => [['tag1', 'tag2']]];
@@ -92,6 +98,9 @@ public function testGetIdsMatchingTags($method, $tags, $expectedInput)
         $this->assertEquals($expectedIds, $actualIds);
     }
 
+    /**
+     * @return array
+     */
     public function getIdsMatchingTagsDataProvider()
     {
         return [
@@ -170,6 +179,9 @@ public function testGetMetadatas($cacheId, $expectedInput, $mongoOutput, $expect
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function getMetadatasDataProvider()
     {
         $time = time();
@@ -237,6 +249,9 @@ public function testLoad($doNotTestValidity)
         $this->assertSame($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function loadDataProvider()
     {
         return ['test validity' => [false], 'do not test validity' => [true]];
@@ -322,6 +337,9 @@ public function testClean($mode, $tags, $expectedQuery)
         $this->_model->clean($mode, $tags);
     }
 
+    /**
+     * @return array
+     */
     public function cleanDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/RemoteSynchronizedCacheTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/RemoteSynchronizedCacheTest.php
new file mode 100644
index 0000000000000..6aca2bedd4989
--- /dev/null
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Backend/RemoteSynchronizedCacheTest.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Cache\Test\Unit\Backend;
+
+class RemoteSynchronizedCacheTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+    }
+
+    /**
+     * @param array $options
+     *
+     * @expectedException \Zend_Cache_Exception
+     * @dataProvider initializeWithExceptionDataProvider
+     */
+    public function testInitializeWithException($options)
+    {
+        $this->objectManager->getObject(
+            \Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class,
+            [
+                'options' => $options,
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function initializeWithExceptionDataProvider()
+    {
+        return [
+            'empty_backend_option' => [
+                'options' => [
+                    'remote_backend' => null,
+                    'local_backend' => null,
+                ],
+            ],
+            'empty_remote_backend_option' => [
+                'options' => [
+                    'remote_backend' => \Magento\Framework\Cache\Backend\Database::class,
+                    'local_backend' => null,
+                ],
+            ],
+            'empty_local_backend_option' => [
+                'options' => [
+                    'remote_backend' => null,
+                    'local_backend' => \Cm_Cache_Backend_File::class,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $options
+     *
+     * @dataProvider initializeWithOutExceptionDataProvider
+     */
+    public function testInitializeWithOutException($options)
+    {
+        $result = $this->objectManager->getObject(
+            \Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class,
+            [
+                'options' => $options,
+            ]
+        );
+        $this->assertInstanceOf(\Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function initializeWithOutExceptionDataProvider()
+    {
+        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        return [
+            'not_empty_backend_option' => [
+                'options' => [
+                    'remote_backend' => \Magento\Framework\Cache\Backend\Database::class,
+                    'remote_backend_options' => [
+                        'adapter_callback' => '',
+                        'data_table' => 'data_table',
+                        'data_table_callback' => 'data_table_callback',
+                        'tags_table' => 'tags_table',
+                        'tags_table_callback' => 'tags_table_callback',
+                        'store_data' => '',
+                        'adapter' => $connectionMock,
+                    ],
+                    'local_backend' => \Cm_Cache_Backend_File::class,
+                    'local_backend_options' => [
+                        'cache_dir' => '/tmp',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $options
+     * @param bool|string $expected
+     *
+     * @dataProvider loadDataProvider
+     */
+    public function testLoad($options, $expected)
+    {
+        /** @var \Magento\Framework\Cache\Backend\Database $database */
+        $database = $this->objectManager->getObject(
+            \Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class,
+            [
+                'options' => $options,
+            ]
+        );
+
+        $this->assertEquals($expected, $database->load(5));
+    }
+
+    /**
+     * @return array
+     */
+    public function loadDataProvider()
+    {
+        return [
+            'cacheInvalidationTime_is_less_than_that_dataModificationTime' => [
+                'options' => [
+                    'remote_backend' => $this->getDatabaseMock(444),
+                    'local_backend' => $this->getFileMock(555, 'loaded_value'),
+                ],
+                'expected' => 'loaded_value',
+            ],
+            'cacheInvalidationTime_is_greater_than_that_dataModificationTime' => [
+                'options' => [
+                    'remote_backend' => $this->getDatabaseMock(444),
+                    'local_backend' => $this->getFileMock(333, 'loaded_value'),
+                ],
+                'expected' => false,
+            ],
+            'cacheInvalidationTime_is_equal_to_the_dataModificationTime' => [
+                'options' => [
+                    'remote_backend' => $this->getDatabaseMock(444),
+                    'local_backend' => $this->getFileMock(444, 'loaded_value'),
+                ],
+                'expected' => 'loaded_value',
+            ],
+        ];
+    }
+
+    /**
+     * @param integer $cacheInvalidationTime
+     * @return \Magento\Framework\Cache\Backend\Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getDatabaseMock($cacheInvalidationTime)
+    {
+        $databaseMock = $this->getMockBuilder(\Magento\Framework\Cache\Backend\Database::class)
+            ->setMethods(['load'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $databaseMock->expects($this->once())
+            ->method('load')
+            ->will($this->returnValue($cacheInvalidationTime));
+
+        return $databaseMock;
+    }
+
+    /**
+     * @param integer $dataModificationTime
+     * @return \Cm_Cache_Backend_File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getFileMock($dataModificationTime, $cacheResult)
+    {
+        $fileMock = $this->getMockBuilder(\Cm_Cache_Backend_File::class)
+            ->setMethods(['test', 'load'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fileMock->expects($this->once())
+            ->method('test')
+            ->will($this->returnValue($dataModificationTime));
+        $fileMock->expects($this->any())
+            ->method('load')
+            ->will($this->returnValue($cacheResult));
+
+        return $fileMock;
+    }
+
+    public function testRemove()
+    {
+        $databaseMock = $this->getMockBuilder(\Magento\Framework\Cache\Backend\Database::class)
+            ->setMethods(['save'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $databaseMock->expects($this->once())
+            ->method('save')
+            ->will($this->returnValue(true));
+
+        $fileMock = $this->getMockBuilder(\Cm_Cache_Backend_File::class)
+            ->setMethods(['remove'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fileMock->expects($this->once())
+            ->method('remove')
+            ->will($this->returnValue(true));
+
+        /** @var \Magento\Framework\Cache\Backend\Database $database */
+        $database = $this->objectManager->getObject(
+            \Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class,
+            [
+                'options' => [
+                    'remote_backend' => $databaseMock,
+                    'local_backend' => $fileMock,
+                ]
+            ]
+        );
+
+        $this->assertEquals(true, $database->remove(5));
+    }
+
+    public function testClean()
+    {
+        $databaseMock = $this->getMockBuilder(\Magento\Framework\Cache\Backend\Database::class)
+            ->setMethods(['save'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $databaseMock->expects($this->once())
+            ->method('save')
+            ->will($this->returnValue(true));
+
+        $fileMock = $this->getMockBuilder(\Cm_Cache_Backend_File::class)
+            ->setMethods(['clean'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fileMock->expects($this->once())
+            ->method('clean')
+            ->will($this->returnValue(true));
+
+        /** @var \Magento\Framework\Cache\Backend\Database $database */
+        $database = $this->objectManager->getObject(
+            \Magento\Framework\Cache\Backend\RemoteSynchronizedCache::class,
+            [
+                'options' => [
+                    'remote_backend' => $databaseMock,
+                    'local_backend' => $fileMock,
+                ]
+            ]
+        );
+
+        $this->assertEquals(true, $database->clean());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
index 616c55f600e9e..4b634ae18c7af 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
@@ -61,6 +61,9 @@ public function testSetBackendException($decorators)
         $core->setBackend($this->_mockBackend);
     }
 
+    /**
+     * @return array
+     */
     public function setBackendExceptionProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php
index ee00a2154f415..fb646c7f87622 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php
@@ -17,7 +17,10 @@ class ZendTest extends \PHPUnit\Framework\TestCase
     public function testProxyMethod($method, $params, $expectedParams, $expectedResult)
     {
         $frontendMock = $this->createMock(\Zend_Cache_Core::class);
-        $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($frontendMock);
+        $frontendFactory = function () use ($frontendMock) {
+            return $frontendMock;
+        };
+        $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($frontendFactory);
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ProxyTesting();
         $result = $helper->invokeWithExpectations(
             $object,
@@ -80,11 +83,19 @@ public function proxyMethodDataProvider()
      */
     public function testCleanException($cleaningMode, $expectedErrorMessage)
     {
-        $this->expectException('InvalidArgumentException', $expectedErrorMessage);
-        $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($this->createMock(\Zend_Cache_Core::class));
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedErrorMessage);
+        $frontendMock = $this->createMock(\Zend_Cache_Core::class);
+        $frontendFactory = function () use ($frontendMock) {
+            return $frontendMock;
+        };
+        $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($frontendFactory);
         $object->clean($cleaningMode);
     }
 
+    /**
+     * @return array
+     */
     public function cleanExceptionDataProvider()
     {
         return [
@@ -106,7 +117,10 @@ public function cleanExceptionDataProvider()
     public function testGetLowLevelFrontend()
     {
         $frontendMock = $this->createMock(\Zend_Cache_Core::class);
-        $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($frontendMock);
+        $frontendFactory = function () use ($frontendMock) {
+            return $frontendMock;
+        };
+        $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($frontendFactory);
         $this->assertSame($frontendMock, $object->getLowLevelFrontend());
     }
 }
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/ProfilerTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/ProfilerTest.php
index bef4617add1b9..34e50900bc64e 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/ProfilerTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/ProfilerTest.php
@@ -63,7 +63,10 @@ public function proxyMethodDataProvider()
     {
         $backend = new \Zend_Cache_Backend_BlackHole();
         $adaptee = $this->createMock(\Zend_Cache_Core::class);
-        $lowLevelFrontend = new \Magento\Framework\Cache\Frontend\Adapter\Zend($adaptee);
+        $frontendFactory = function () use ($adaptee) {
+            return $adaptee;
+        };
+        $lowLevelFrontend = new \Magento\Framework\Cache\Frontend\Adapter\Zend($frontendFactory);
 
         return [
             [
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php
index 12774f182d6cd..33105ab52150c 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Decorator/TagScopeTest.php
@@ -128,6 +128,9 @@ public function testCleanModeMatchingAnyTag($fixtureResultOne, $fixtureResultTwo
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function cleanModeMatchingAnyTagDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
index f660b3d698293..bc44b361c57ea 100644
--- a/lib/internal/Magento/Framework/Code/GeneratedFiles.php
+++ b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -180,7 +180,7 @@ private function disableAllCacheTypes()
     }
 
     /**
-     * Enables apppropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
+     * Enables appropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
      * TODO: to be removed in scope of MAGETWO-53476
      *
      * @param string[] $cacheTypes
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index a845712b46598..4dec7d1a28146 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -7,6 +7,11 @@
 
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\EntityAbstract;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\Filesystem\Driver\File;
+use Psr\Log\LoggerInterface;
 
 class Generator
 {
@@ -17,7 +22,7 @@ class Generator
     const GENERATION_SKIP = 'skip';
 
     /**
-     * @var \Magento\Framework\Code\Generator\Io
+     * @var Io
      */
     protected $_ioObject;
 
@@ -32,26 +37,33 @@ class Generator
     protected $definedClasses;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
     /**
-     * @param Generator\Io   $ioObject
-     * @param array          $generatedEntities
+     * Logger instance
+     *
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Generator\Io $ioObject
+     * @param array $generatedEntities
      * @param DefinedClasses $definedClasses
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
-        \Magento\Framework\Code\Generator\Io $ioObject = null,
+        Io $ioObject = null,
         array $generatedEntities = [],
-        DefinedClasses $definedClasses = null
+        DefinedClasses $definedClasses = null,
+        LoggerInterface $logger = null
     ) {
-        $this->_ioObject = $ioObject
-            ?: new \Magento\Framework\Code\Generator\Io(
-                new \Magento\Framework\Filesystem\Driver\File()
-            );
+        $this->_ioObject = $ioObject ?: new Io(new File());
         $this->definedClasses = $definedClasses ?: new DefinedClasses();
         $this->_generatedEntities = $generatedEntities;
+        $this->logger = $logger;
     }
 
     /**
@@ -111,8 +123,16 @@ public function generateClass($className)
         if ($generator !== null) {
             $this->tryToLoadSourceClass($className, $generator);
             if (!($file = $generator->generate())) {
+                /** @var $logger LoggerInterface */
                 $errors = $generator->getErrors();
-                throw new \RuntimeException(implode(' ', $errors) . ' in [' . $className . ']');
+                $errors[] = 'Class ' . $className . ' generation error: The requested class did not generate properly, '
+                    . 'because the \'generated\' directory permission is read-only. '
+                    . 'If --- after running the \'bin/magento setup:di:compile\' CLI command when the \'generated\' '
+                    . 'directory permission is set to write --- the requested class did not generate properly, then '
+                    . 'you must add the generated class object to the signature of the related construct method, only.';
+                $message = implode(PHP_EOL, $errors);
+                $this->getLogger()->critical($message);
+                throw new \RuntimeException($message);
             }
             if (!$this->definedClasses->isClassLoadableFromMemory($className)) {
                 $this->_ioObject->includeFile($file);
@@ -121,13 +141,26 @@ public function generateClass($className)
         }
     }
 
+    /**
+     * Retrieve logger
+     *
+     * @return LoggerInterface
+     */
+    private function getLogger()
+    {
+        if (!$this->logger) {
+            $this->logger = $this->getObjectManager()->get(LoggerInterface::class);
+        }
+        return $this->logger;
+    }
+
     /**
      * Create entity generator
      *
      * @param string $generatorClass
      * @param string $entityName
      * @param string $className
-     * @return \Magento\Framework\Code\Generator\EntityAbstract
+     * @return EntityAbstract
      */
     protected function createGeneratorInstance($generatorClass, $entityName, $className)
     {
@@ -140,10 +173,10 @@ protected function createGeneratorInstance($generatorClass, $entityName, $classN
     /**
      * Set object manager instance.
      *
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ObjectManagerInterface $objectManager
      * @return $this
      */
-    public function setObjectManager(\Magento\Framework\ObjectManagerInterface $objectManager)
+    public function setObjectManager(ObjectManagerInterface $objectManager)
     {
         $this->objectManager = $objectManager;
         return $this;
@@ -152,11 +185,11 @@ public function setObjectManager(\Magento\Framework\ObjectManagerInterface $obje
     /**
      * Get object manager instance.
      *
-     * @return \Magento\Framework\ObjectManagerInterface
+     * @return ObjectManagerInterface
      */
     public function getObjectManager()
     {
-        if (!($this->objectManager instanceof \Magento\Framework\ObjectManagerInterface)) {
+        if (!($this->objectManager instanceof ObjectManagerInterface)) {
             throw new \LogicException(
                 "Object manager was expected to be set using setObjectManger() "
                 . "before getObjectManager() invocation."
@@ -169,7 +202,7 @@ public function getObjectManager()
      * Try to load/generate source class to check if it is valid or not.
      *
      * @param string $className
-     * @param \Magento\Framework\Code\Generator\EntityAbstract $generator
+     * @param EntityAbstract $generator
      * @return void
      * @throws \RuntimeException
      */
@@ -178,7 +211,7 @@ protected function tryToLoadSourceClass($className, $generator)
         $sourceClassName = $generator->getSourceClassName();
         if (!$this->definedClasses->isClassLoadable($sourceClassName)) {
             if ($this->generateClass($sourceClassName) !== self::GENERATION_SUCCESS) {
-                $phrase = new \Magento\Framework\Phrase(
+                $phrase = new Phrase(
                     'Source class "%1" for "%2" generation does not exist.',
                     [$sourceClassName, $className]
                 );
diff --git a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
index bb1c2262132f4..0a48945e55c2d 100644
--- a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
+++ b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
@@ -47,6 +47,7 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
         'abstract' => 'setAbstract',
         'visibility' => 'setVisibility',
         'body' => 'setBody',
+        'returntype' => 'setReturnType'
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index d8491398a37d2..3efe110ccf193 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Code\Generator;
 
+use Zend\Code\Generator\ValueGenerator;
+
 abstract class EntityAbstract
 {
     /**
@@ -293,11 +295,64 @@ protected function _fixCodeStyle($sourceCode)
     /**
      * Get value generator for null default value
      *
-     * @return \Zend\Code\Generator\ValueGenerator
+     * @return ValueGenerator
      */
     protected function _getNullDefaultValue()
     {
-        $value = new \Zend\Code\Generator\ValueGenerator(null, \Zend\Code\Generator\ValueGenerator::TYPE_NULL);
+        $value = new ValueGenerator(null, ValueGenerator::TYPE_NULL);
+
+        return $value;
+    }
+
+    /**
+     * @param \ReflectionParameter $parameter
+     *
+     * @return null|string
+     */
+    private function extractParameterType(
+        \ReflectionParameter $parameter
+    ): ?string {
+        /** @var string|null $typeName */
+        $typeName = null;
+        if ($parameter->hasType()) {
+            if ($parameter->isArray()) {
+                $typeName = 'array';
+            } elseif ($parameter->getClass()) {
+                $typeName = $this->_getFullyQualifiedClassName(
+                    $parameter->getClass()->getName()
+                );
+            } elseif ($parameter->isCallable()) {
+                $typeName = 'callable';
+            } else {
+                $typeName = $parameter->getType()->getName();
+            }
+
+            if ($parameter->allowsNull()) {
+                $typeName = '?' .$typeName;
+            }
+        }
+
+        return $typeName;
+    }
+
+    /**
+     * @param \ReflectionParameter $parameter
+     *
+     * @return null|ValueGenerator
+     */
+    private function extractParameterDefaultValue(
+        \ReflectionParameter $parameter
+    ): ?ValueGenerator {
+        /** @var ValueGenerator|null $value */
+        $value = null;
+        if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {
+            $valueType = ValueGenerator::TYPE_AUTO;
+            $defaultValue = $parameter->getDefaultValue();
+            if ($defaultValue === null) {
+                $valueType = ValueGenerator::TYPE_NULL;
+            }
+            $value = new ValueGenerator($defaultValue, $valueType);
+        }
 
         return $value;
     }
@@ -313,27 +368,13 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
         $parameterInfo = [
             'name' => $parameter->getName(),
             'passedByReference' => $parameter->isPassedByReference(),
-            'type' => $parameter->getType(),
             'variadic' => $parameter->isVariadic()
         ];
-
-        if ($parameter->isArray()) {
-            $parameterInfo['type'] = 'array';
-        } elseif ($parameter->getClass()) {
-            $parameterInfo['type'] = $this->_getFullyQualifiedClassName($parameter->getClass()->getName());
-        } elseif ($parameter->isCallable()) {
-            $parameterInfo['type'] = 'callable';
+        if ($type = $this->extractParameterType($parameter)) {
+            $parameterInfo['type'] = $type;
         }
-
-        if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {
-            $defaultValue = $parameter->getDefaultValue();
-            if (is_string($defaultValue)) {
-                $parameterInfo['defaultValue'] = $parameter->getDefaultValue();
-            } elseif ($defaultValue === null) {
-                $parameterInfo['defaultValue'] = $this->_getNullDefaultValue();
-            } else {
-                $parameterInfo['defaultValue'] = $defaultValue;
-            }
+        if ($default = $this->extractParameterDefaultValue($parameter)) {
+            $parameterInfo['defaultValue'] = $default;
         }
 
         return $parameterInfo;
diff --git a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
index 1bc71a342eb25..fe96e9cc742aa 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
@@ -27,10 +27,8 @@ public function getConstructor($className)
                     $result[] = [
                         $parameter->getName(),
                         $parameter->getClass() !== null ? $parameter->getClass()->getName() : null,
-                        !$parameter->isOptional(),
-                        $parameter->isOptional()
-                            ? ($parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null)
-                            : null,
+                        !$parameter->isOptional() && !$parameter->isDefaultValueAvailable(),
+                        $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null,
                     ];
                 } catch (\ReflectionException $e) {
                     $message = $e->getMessage();
diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
index 0fb3825d240a1..31243f6ad98f9 100644
--- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
@@ -37,8 +37,10 @@ public function __construct(NamespaceResolver $namespaceResolver = null)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false)
-    {
+    public function getConstructorArgumentTypes(
+        \ReflectionClass $class,
+        $inherited = false
+    ) {
         $output = [null];
         if (!$class->getFileName() || false == $class->hasMethod(
             '__construct'
@@ -46,49 +48,37 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
         ) {
             return $output;
         }
-        $reflectionConstructor = $class->getConstructor();
-        $fileContent = file($class->getFileName());
-        $availableNamespaces = $this->namespaceResolver->getImportedNamespaces($fileContent);
-        $availableNamespaces[0] = $class->getNamespaceName();
-        $constructorStartLine = $reflectionConstructor->getStartLine() - 1;
-        $constructorEndLine = $reflectionConstructor->getEndLine();
-        $fileContent = array_slice($fileContent, $constructorStartLine, $constructorEndLine - $constructorStartLine);
-        $source = '<?php ' . trim(implode('', $fileContent));
-
-        // Remove parameter default value.
-        $source = preg_replace("/ = (.*)/", ',)', $source);
 
-        $methodTokenized = token_get_all($source);
-        $argumentsStart = array_search('(', $methodTokenized) + 1;
-        $argumentsEnd = array_search(')', $methodTokenized);
-        $arguments = array_slice($methodTokenized, $argumentsStart, $argumentsEnd - $argumentsStart);
-        foreach ($arguments as &$argument) {
-            is_array($argument) ?: $argument = [1 => $argument];
-        }
-        unset($argument);
-        $arguments = array_filter($arguments, function ($token) {
-            $blacklist = [T_VARIABLE, T_WHITESPACE];
-            if (isset($token[0]) && in_array($token[0], $blacklist)) {
-                return false;
+        //Reading parameters' types.
+        $params = $class->getConstructor()->getParameters();
+        /** @var string[] $types */
+        $types = [];
+        foreach ($params as $param) {
+            //For the sake of backward compatibility.
+            $typeName = '';
+            if ($param->isArray()) {
+                //For the sake of backward compatibility.
+                $typeName = 'array';
+            } else {
+                try {
+                    $paramClass = $param->getClass();
+                    if ($paramClass) {
+                        $typeName = '\\' .$paramClass->getName();
+                    }
+                } catch (\ReflectionException $exception) {
+                    //If there's a problem loading a class then ignore it and
+                    //just return it's name.
+                    $typeName = '\\' .$param->getType()->getName();
+                }
             }
-            return true;
-        });
-        $arguments = array_map(function ($element) {
-            return $element[1];
-        }, $arguments);
-        $arguments = array_values($arguments);
-        $arguments = implode('', $arguments);
-        if (empty($arguments)) {
-            return $output;
+            $types[] = $typeName;
         }
-        $arguments = explode(',', $arguments);
-        foreach ($arguments as $key => &$argument) {
-            $argument = $this->removeToken($argument, '=');
-            $argument = $this->removeToken($argument, '&');
-            $argument = $this->namespaceResolver->resolveNamespace($argument, $availableNamespaces);
+        if (!$types) {
+            //For the sake of backward compatibility.
+            $types = [null];
         }
-        unset($argument);
-        return $arguments;
+
+        return $types;
     }
 
     /**
@@ -98,7 +88,7 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
      * @param array $availableNamespaces
      * @return string
      * @deprecated 100.2.0
-     * @see \Magento\Framework\Code\Reader\NamespaceResolver::resolveNamespace
+     * @see getConstructorArgumentTypes
      */
     protected function resolveNamespaces($argument, $availableNamespaces)
     {
@@ -111,6 +101,8 @@ protected function resolveNamespaces($argument, $availableNamespaces)
      * @param string $argument
      * @param string $token
      * @return string
+     *
+     * @deprecated Not used anymore.
      */
     protected function removeToken($argument, $token)
     {
@@ -127,7 +119,7 @@ protected function removeToken($argument, $token)
      * @param array $file
      * @return array
      * @deprecated 100.2.0
-     * @see \Magento\Framework\Code\Reader\NamespaceResolver::getImportedNamespaces
+     * @see getConstructorArgumentTypes
      */
     protected function getImportedNamespaces(array $file)
     {
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php
index 658b42e4b972d..abd413832f206 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/DefinedClassesTest.php
@@ -8,6 +8,10 @@
 namespace Magento\Framework\Code\Generator {
     use Magento\Framework\Code\Test\Unit\Generator\DefinedClassesTest;
 
+    /**
+     * @param $className
+     * @return bool
+     */
     function class_exists($className)
     {
         return DefinedClassesTest::$definedClassesTestActive
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
index 347bc6b46ace5..6462b3806647a 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
@@ -75,7 +75,8 @@ protected function setUp()
     public function testGenerate($additionalMethodsData, $expectedException, $expectedExceptionMessage)
     {
         if ($expectedException) {
-            $this->expectException($expectedException, $expectedExceptionMessage);
+            $this->expectException($expectedException);
+            $this->expectExceptionMessage($expectedExceptionMessage);
         }
         $methodsData = array_merge_recursive($this->methodsData, $additionalMethodsData);
         $this->interfaceGenerator->setClassDocBlock($this->interfaceDocBlock)
@@ -113,6 +114,9 @@ public function testGeneratePredefinedContentNotSet()
         $this->assertEquals($expectedContent, $generatedContent, "Generated content is invalid.");
     }
 
+    /**
+     * @return array
+     */
     public function generateDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
index bc23ef954f216..bc2ba24a2f9fe 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
@@ -97,7 +97,8 @@ public function testWriteResultFileAlreadyExists($resultFileName, $fileExists, $
         } else {
             $exceptionMessage = 'Some error renaming file';
             $renameMockEvent = $this->throwException(new FileSystemException(new Phrase($exceptionMessage)));
-            $this->expectException(\Magento\Framework\Exception\FileSystemException::class, $exceptionMessage);
+            $this->expectException(\Magento\Framework\Exception\FileSystemException::class);
+            $this->expectExceptionMessage($exceptionMessage);
         }
 
         $this->_filesystemDriverMock->expects($this->once())
@@ -110,6 +111,9 @@ public function testWriteResultFileAlreadyExists($resultFileName, $fileExists, $
         $this->assertSame($success, $this->_object->writeResultFile($resultFileName, self::FILE_CONTENT));
     }
 
+    /**
+     * @return array
+     */
     public function testWriteResultFileAlreadyExistsDataProvider()
     {
         return [
@@ -201,6 +205,9 @@ public function testFileExists($fileName, $exists)
         $this->assertSame($exists, $this->_object->fileExists($fileName));
     }
 
+    /**
+     * @return array
+     */
     public function fileExistsDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index dfb547ae3d53f..9cc93f7620b1f 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -3,14 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\Code\Test\Unit;
 
 use Magento\Framework\Code\Generator;
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\Io;
-
-class GeneratorTest extends \PHPUnit\Framework\TestCase
+use Psr\Log\LoggerInterface;
+use Magento\Framework\ObjectManager\Code\Generator\Factory;
+use Magento\Framework\ObjectManager\Code\Generator\Proxy;
+use Magento\Framework\Interception\Code\Generator\Interceptor;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Code\Generator\EntityAbstract;
+use Magento\GeneratedClass\Factory as GeneratedClassFactory;
+
+class GeneratorTest extends TestCase
 {
     /**
      * Class name parameter value
@@ -22,45 +30,57 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
      *
      * @var array
      */
-    protected $expectedEntities = [
-        'factory' => \Magento\Framework\ObjectManager\Code\Generator\Factory::ENTITY_TYPE,
-        'proxy' => \Magento\Framework\ObjectManager\Code\Generator\Proxy::ENTITY_TYPE,
-        'interceptor' => \Magento\Framework\Interception\Code\Generator\Interceptor::ENTITY_TYPE,
+    private $expectedEntities = [
+        'factory' => Factory::ENTITY_TYPE,
+        'proxy' => Proxy::ENTITY_TYPE,
+        'interceptor' => Interceptor::ENTITY_TYPE,
     ];
 
     /**
      * System under test
      *
-     * @var \Magento\Framework\Code\Generator
+     * @var Generator
      */
-    protected $model;
+    private $model;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Io */
-    protected $ioObjectMock;
+    /**
+     * @var Io|Mock
+     */
+    private $ioObjectMock;
 
-    /** @var \Magento\Framework\Code\Generator\DefinedClasses | \PHPUnit_Framework_MockObject_MockObject */
-    protected $definedClassesMock;
+    /**
+     * @var DefinedClasses|Mock
+     */
+    private $definedClassesMock;
+
+    /**
+     * @var LoggerInterface|Mock
+     */
+    private $loggerMock;
 
     protected function setUp()
     {
-        $this->definedClassesMock = $this->createMock(\Magento\Framework\Code\Generator\DefinedClasses::class);
-        $this->ioObjectMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\Io::class)
+        $this->definedClassesMock = $this->createMock(DefinedClasses::class);
+        $this->ioObjectMock = $this->getMockBuilder(Io::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->model = $this->buildModel(
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+
+        $this->model = new Generator(
             $this->ioObjectMock,
             [
-                'factory' => \Magento\Framework\ObjectManager\Code\Generator\Factory::class,
-                'proxy' => \Magento\Framework\ObjectManager\Code\Generator\Proxy::class,
-                'interceptor' => \Magento\Framework\Interception\Code\Generator\Interceptor::class
+                'factory' => Factory::class,
+                'proxy' => Proxy::class,
+                'interceptor' => Interceptor::class,
             ],
-            $this->definedClassesMock
+            $this->definedClassesMock,
+            $this->loggerMock
         );
     }
 
     public function testGetGeneratedEntities()
     {
-        $this->model = $this->buildModel(
+        $this->model = new Generator(
             $this->ioObjectMock,
             ['factory', 'proxy', 'interceptor'],
             $this->definedClassesMock
@@ -69,14 +89,16 @@ public function testGetGeneratedEntities()
     }
 
     /**
+     * @param string $className
+     * @param string $entityType
      * @expectedException \RuntimeException
      * @dataProvider generateValidClassDataProvider
      */
     public function testGenerateClass($className, $entityType)
     {
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         $fullClassName = $className . $entityType;
-        $entityGeneratorMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\EntityAbstract::class)
+        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
@@ -87,7 +109,7 @@ public function testGenerateClass($className, $entityType)
     public function testGenerateClassWithWrongName()
     {
         $this->assertEquals(
-            \Magento\Framework\Code\Generator::GENERATION_ERROR,
+            Generator::GENERATION_ERROR,
             $this->model->generateClass(self::SOURCE_CLASS)
         );
     }
@@ -95,12 +117,12 @@ public function testGenerateClassWithWrongName()
     /**
      * @expectedException \RuntimeException
      */
-    public function testGenerateClassWithError()
+    public function testGenerateClassWhenClassIsNotGenerationSuccess()
     {
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $entityGeneratorMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\EntityAbstract::class)
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
@@ -108,6 +130,57 @@ public function testGenerateClassWithError()
         $this->model->generateClass($resultClassName);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function testGenerateClassWithErrors()
+    {
+        $expectedEntities = array_values($this->expectedEntities);
+        $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
+        $errorMessages = [
+            'Error message 0',
+            'Error message 1',
+            'Error message 2',
+        ];
+        $mainErrorMessage = 'Class ' . $resultClassName . ' generation error: The requested class did not generate '
+            . 'properly, because the \'generated\' directory permission is read-only. '
+            . 'If --- after running the \'bin/magento setup:di:compile\' CLI command when the \'generated\' '
+            . 'directory permission is set to write --- the requested class did not generate properly, then '
+            . 'you must add the generated class object to the signature of the related construct method, only.';
+        $FinalErrorMessage = implode(PHP_EOL, $errorMessages) . "\n" . $mainErrorMessage;
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage($FinalErrorMessage);
+
+        /** @var ObjectManagerInterface|Mock $objectManagerMock */
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        /** @var EntityAbstract|Mock $entityGeneratorMock */
+        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($entityGeneratorMock);
+        $entityGeneratorMock->expects($this->once())
+            ->method('getSourceClassName')
+            ->willReturn(self::SOURCE_CLASS);
+        $this->definedClassesMock->expects($this->once())
+            ->method('isClassLoadable')
+            ->with(self::SOURCE_CLASS)
+            ->willReturn(true);
+        $entityGeneratorMock->expects($this->once())
+            ->method('generate')
+            ->willReturn(false);
+        $entityGeneratorMock->expects($this->once())
+            ->method('getErrors')
+            ->willReturn($errorMessages);
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->with($FinalErrorMessage);
+        $this->model->setObjectManager($objectManagerMock);
+        $this->model->generateClass($resultClassName);
+    }
+
     /**
      * @dataProvider trueFalseDataProvider
      */
@@ -124,11 +197,14 @@ public function testGenerateClassWithExistName($fileExists)
         $this->ioObjectMock->expects($this->exactly($includeFileInvokeCount))->method('includeFile');
 
         $this->assertEquals(
-            \Magento\Framework\Code\Generator::GENERATION_SKIP,
-            $this->model->generateClass(\Magento\GeneratedClass\Factory::class)
+            Generator::GENERATION_SKIP,
+            $this->model->generateClass(GeneratedClassFactory::class)
         );
     }
 
+    /**
+     * @return array
+     */
     public function trueFalseDataProvider()
     {
         return [[true], [false]];
@@ -151,17 +227,4 @@ public function generateValidClassDataProvider()
         }
         return $data;
     }
-
-    /**
-     * Build SUT object
-     *
-     * @param Io $ioObject
-     * @param array $generatedEntities
-     * @param DefinedClasses $definedClasses
-     * @return Generator
-     */
-    private function buildModel(Io $ioObject, array $generatedEntities, DefinedClasses $definedClasses)
-    {
-        return new Generator($ioObject, $generatedEntities, $definedClasses);
-    }
 }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php
index 588cdfa1d4f7f..b8d49f64569f9 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/NameBuilderTest.php
@@ -29,6 +29,9 @@ public function testBuildClassName($parts, $expected)
         $this->assertEquals($expected, $this->nameBuilder->buildClassName($parts));
     }
 
+    /**
+     * @return array
+     */
     public function buildClassNameDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
index 64bcb8970612e..e465e01916690 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ArgumentsReaderTest.php
@@ -263,6 +263,9 @@ public function testIsCompatibleType($requiredType, $actualType, $expectedResult
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function testIsCompatibleTypeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
index c867e39032e1e..800cd2851eb66 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
@@ -131,7 +131,7 @@ public function __construct(
         $this->_arrayVariable = $arrayVariable;
     }
 }
-class ThirdClassForParentCall extends firstClassForParentCall
+class ThirdClassForParentCall extends FirstClassForParentCall
 {
     /**
      * @var stdClass
@@ -154,7 +154,7 @@ public function __construct(\stdClass $stdClassObject, \ClassExtendsDefaultPhpTy
         $this->_secondClass = $secondClass;
     }
 }
-class WrongArgumentsOrder extends firstClassForParentCall
+class WrongArgumentsOrder extends FirstClassForParentCall
 {
     /**
      * @var stdClass
@@ -177,7 +177,7 @@ public function __construct(\stdClass $stdClassObject, \ClassExtendsDefaultPhpTy
         $this->_secondClass = $secondClass;
     }
 }
-class ArgumentsOnSeparateLines extends firstClassForParentCall
+class ArgumentsOnSeparateLines extends FirstClassForParentCall
 {
     /**
      * @var stdClass
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php
index d1692fd4ec012..96be42658f762 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php
@@ -51,7 +51,8 @@ public function testInvalidSequence()
             'Actual  : %s' .
             PHP_EOL;
         $message = sprintf($message, '\ArgumentSequence\InvalidChildClass', $expectedSequence, $actualSequence);
-        $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $message);
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage($message);
         $this->_validator->validate('\ArgumentSequence\InvalidChildClass');
     }
 }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php
index 2385ba83418ca..687632074b35f 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php
@@ -43,10 +43,8 @@ public function testValidateIfClassHasExtraArgumentInTheParentConstructor()
     {
         $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Four/Test.php');
         $fileName = str_replace('\\', '/', $fileName);
-        $this->expectException(
-            \Magento\Framework\Exception\ValidatorException::class,
-            'Extra parameters passed to parent construct: $factory. File: ' . $fileName
-        );
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage('Extra parameters passed to parent construct: $factory. File: ' . $fileName);
         $this->_model->validate(\Magento\SomeModule\Model\Four\Test::class);
     }
 
@@ -54,8 +52,8 @@ public function testValidateIfClassHasMissingRequiredArguments()
     {
         $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/Test.php');
         $fileName = str_replace('\\', '/', $fileName);
-        $this->expectException(
-            \Magento\Framework\Exception\ValidatorException::class,
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage(
             'Missed required argument factory in parent::__construct call. File: ' . $fileName
         );
         $this->_model->validate(\Magento\SomeModule\Model\Five\Test::class);
@@ -65,8 +63,8 @@ public function testValidateIfClassHasIncompatibleArguments()
     {
         $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/Test.php');
         $fileName = str_replace('\\', '/', $fileName);
-        $this->expectException(
-            \Magento\Framework\Exception\ValidatorException::class,
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage(
             'Incompatible argument type: Required type: \Magento\SomeModule\Model\Proxy. ' .
             'Actual type: \Magento\SomeModule\Model\ElementFactory; File: ' .
             PHP_EOL .
@@ -79,8 +77,8 @@ public function testValidateWrongOrderForParentArguments()
     {
         $fileName = realpath(__DIR__) . '/_files/ClassesForConstructorIntegrity.php';
         $fileName = str_replace('\\', '/', $fileName);
-        $this->expectException(
-            \Magento\Framework\Exception\ValidatorException::class,
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage(
             'Incompatible argument type: Required type: \Context. ' .
             'Actual type: \ClassA; File: ' .
             PHP_EOL .
@@ -93,8 +91,8 @@ public function testValidateWrongOptionalParamsType()
     {
         $fileName = realpath(__DIR__) . '/_files/ClassesForConstructorIntegrity.php';
         $fileName = str_replace('\\', '/', $fileName);
-        $this->expectException(
-            \Magento\Framework\Exception\ValidatorException::class,
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage(
             'Incompatible argument type: Required type: array. ' . 'Actual type: \ClassB; File: ' . PHP_EOL . $fileName
         );
         $this->_model->validate('ClassArgumentWithWrongParentArgumentsType');
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php
index 3822d148adca5..b17b10106f8a9 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php
@@ -34,6 +34,9 @@ public function testValidClasses($className)
         $this->assertTrue($this->_validator->validate($className));
     }
 
+    /**
+     * @return array
+     */
     public function validClassesDataProvider()
     {
         return [
@@ -49,7 +52,8 @@ public function testInvalidClass()
             $this->_fixturePath .
             PHP_EOL .
             'Multiple type injection [\TypeDuplication\ArgumentBaseClass]';
-        $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $message);
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage($message);
         $this->_validator->validate('\TypeDuplication\InvalidClassWithDuplicatedTypes');
     }
 }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php
index 90f422fb16777..1daa394bc7b2b 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php
@@ -40,6 +40,15 @@ class ParentClass
 
     protected $parentOptionalScalar;
 
+    /**
+     * ParentClass constructor.
+     * @param ContextObject $contextObject
+     * @param ParentRequiredObject $parentRequiredObject
+     * @param array $parentRequiredScalar
+     * @param ParentOptionalObject|null $parentOptionalObject
+     * @param array $data
+     * @param array $parentOptionalScalar
+     */
     public function __construct(
         ContextObject $contextObject,
         ParentRequiredObject $parentRequiredObject,
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php
index d61042c70e406..3078e7f4fc6d5 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php
@@ -57,6 +57,14 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      */
     protected $_implOfBInterface;
 
+    /**
+     * Context constructor.
+     * @param ClassA $exA
+     * @param ClassB $exB
+     * @param ClassC $exC
+     * @param FirstInterface $interfaceA
+     * @param ImplementationOfSecondInterface $implOfBInterface
+     */
     public function __construct(
         \ClassA $exA,
         \ClassB $exB,
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php
index 8a9d9866126bf..9e38bf2be7d49 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Five/Test.php
@@ -14,6 +14,10 @@ class Test extends \Magento\SomeModule\Model\Three\Test
      */
     protected $_proxy;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Model\Proxy $proxy
+     */
     public function __construct(\Magento\SomeModule\Model\Proxy $proxy)
     {
         parent::__construct($proxy);
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php
index 4701e76f08c59..7368ff1e7e767 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Four/Test.php
@@ -15,6 +15,11 @@ class Test extends \Magento\SomeModule\Model\One\Test
      */
     protected $_factory;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Model\Proxy $proxy
+     * @param \Magento\SomeModule\Model\ElementFactory $factory
+     */
     public function __construct(
         \Magento\SomeModule\Model\Proxy $proxy,
         \Magento\SomeModule\Model\ElementFactory $factory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php
index 90f5d40ab726d..9bb858cc16751 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/One/Test.php
@@ -13,6 +13,10 @@ class Test
      */
     protected $_proxy;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Model\Proxy $proxy
+     */
     public function __construct(\Magento\SomeModule\Model\Proxy $proxy)
     {
         $this->_proxy = $proxy;
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php
index d2539c9b73153..66c74bbf04e6f 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php
@@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator
      * @param array $data
      * @return TestThree
      */
-    public static function testMethod1(array &$data = array());
+    public static function testMethod1(array &$data = []);
 
     /**
      * Method short description
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php
index 0c736710f5c4e..6fe98d08547b6 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Six/Test.php
@@ -15,6 +15,11 @@ class Test extends \Magento\SomeModule\Model\One\Test
      */
     protected $_factory;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Model\Proxy $proxy
+     * @param \Magento\SomeModule\Model\ElementFactory $factory
+     */
     public function __construct(
         \Magento\SomeModule\Model\Proxy $proxy,
         \Magento\SomeModule\Model\ElementFactory $factory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php
index d080034ef978e..90086f1b1d50e 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Three/Test.php
@@ -20,6 +20,11 @@ class Test extends \Magento\SomeModule\Model\Two\Test
      */
     protected $_proxy;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Model\Proxy $proxy
+     * @param \Magento\SomeModule\Model\ElementFactory $factory
+     */
     public function __construct(
         \Magento\SomeModule\Model\Proxy $proxy,
         \Magento\SomeModule\Model\ElementFactory $factory
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php
index dee0b216b7641..f4ba4ab8e6a3e 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/Two/Test.php
@@ -14,6 +14,11 @@ class Test extends \Magento\SomeModule\Model\One\Test
      */
     protected $_proxy;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Model\Proxy $proxy
+     * @param array $data
+     */
     public function __construct(\Magento\SomeModule\Model\Proxy $proxy, $data = [])
     {
         $this->_proxy = $proxy;
diff --git a/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php b/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php
index f3af691426919..2ca64bf14d33b 100644
--- a/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php
+++ b/lib/internal/Magento/Framework/Communication/Config/CompositeReader.php
@@ -27,12 +27,10 @@ public function __construct(array $readers)
         usort(
             $readers,
             function ($firstItem, $secondItem) {
-                if (!isset($firstItem['sortOrder']) || !isset($secondItem['sortOrder'])
-                    || $firstItem['sortOrder'] == $secondItem['sortOrder']
-                ) {
+                if (!isset($firstItem['sortOrder']) || !isset($secondItem['sortOrder'])) {
                     return 0;
                 }
-                return $firstItem['sortOrder'] < $secondItem['sortOrder'] ? -1 : 1;
+                return $firstItem['sortOrder'] <=> $secondItem['sortOrder'];
             }
         );
         $this->readers = [];
diff --git a/lib/internal/Magento/Framework/Communication/Config/ConfigParser.php b/lib/internal/Magento/Framework/Communication/Config/ConfigParser.php
index 350ac247a560c..5456d3c717ad8 100644
--- a/lib/internal/Magento/Framework/Communication/Config/ConfigParser.php
+++ b/lib/internal/Magento/Framework/Communication/Config/ConfigParser.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Communication\Config;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -30,7 +31,7 @@ public function parseServiceMethod($serviceMethod)
         if (!isset($matches[1]) || !isset($matches[2])) {
             throw new LocalizedException(
                 new Phrase(
-                    'Service method "%serviceMethod" must match the following pattern: "%pattern"',
+                    'The "%serviceMethod" service method must match the "%pattern" pattern.',
                     ['serviceMethod' => $serviceMethod, 'pattern' => $pattern]
                 )
             );
diff --git a/lib/internal/Magento/Framework/Communication/Config/Validator.php b/lib/internal/Magento/Framework/Communication/Config/Validator.php
index 5e2687c3b08c1..76ef1b85b63eb 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Validator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Validator.php
@@ -38,6 +38,8 @@ public function __construct(
     }
 
     /**
+     * Validate response schema definition for topic
+     *
      * @param string $responseSchema
      * @param string $topicName
      * @return void
@@ -46,6 +48,12 @@ public function validateResponseSchemaType($responseSchema, $topicName)
     {
         try {
             $this->validateType($responseSchema);
+        } catch (\InvalidArgumentException $e) {
+            throw new \LogicException(
+                'Response schema definition has service class with wrong annotated methods',
+                $e->getCode(),
+                $e
+            );
         } catch (\Exception $e) {
             throw new \LogicException(
                 sprintf(
@@ -59,6 +67,8 @@ public function validateResponseSchemaType($responseSchema, $topicName)
     }
 
     /**
+     * Validate request schema definition for topic
+     *
      * @param string $requestSchema
      * @param string $topicName
      * @return void
@@ -67,6 +77,12 @@ public function validateRequestSchemaType($requestSchema, $topicName)
     {
         try {
             $this->validateType($requestSchema);
+        } catch (\InvalidArgumentException $e) {
+            throw new \LogicException(
+                'Request schema definition has service class with wrong annotated methods',
+                $e->getCode(),
+                $e
+            );
         } catch (\Exception $e) {
             throw new \LogicException(
                 sprintf(
@@ -80,6 +96,8 @@ public function validateRequestSchemaType($requestSchema, $topicName)
     }
 
     /**
+     * Validate service method specified in the definition of handler
+     *
      * @param string $serviceName
      * @param string $methodName
      * @param string $handlerName
@@ -109,6 +127,7 @@ public function validateResponseHandlersType($serviceName, $methodName, $handler
      * @param string $typeName
      * @return $this
      * @throws \Exception In case when type is invalid
+     * @throws \InvalidArgumentException if methods don't have annotation
      */
     protected function validateType($typeName)
     {
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
index 9c746177d6f7d..0a54d770300e8 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -21,6 +21,7 @@ class ComponentRegistrar implements ComponentRegistrarInterface
     const LIBRARY = 'library';
     const THEME = 'theme';
     const LANGUAGE = 'language';
+    const SETUP = 'setup';
     /**#@- */
 
     /**#@- */
@@ -29,6 +30,7 @@ class ComponentRegistrar implements ComponentRegistrarInterface
         self::LIBRARY => [],
         self::LANGUAGE => [],
         self::THEME => [],
+        self::SETUP => []
     ];
 
     /**
@@ -68,7 +70,7 @@ public function getPaths($type)
     public function getPath($type, $componentName)
     {
         self::validateType($type);
-        return isset(self::$paths[$type][$componentName]) ? self::$paths[$type][$componentName] : null;
+        return self::$paths[$type][$componentName] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php b/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
index 259fcd323b38b..2a641a41377a7 100644
--- a/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
+++ b/lib/internal/Magento/Framework/Composer/ComposerJsonFinder.php
@@ -13,7 +13,7 @@
 class ComposerJsonFinder
 {
     /**
-     * @var DirectoryList $directoryList
+     * @var DirectoryList
      */
     private $directoryList;
 
diff --git a/lib/internal/Magento/Framework/Composer/Remove.php b/lib/internal/Magento/Framework/Composer/Remove.php
index b7a9a20333d86..b7cea7769a176 100644
--- a/lib/internal/Magento/Framework/Composer/Remove.php
+++ b/lib/internal/Magento/Framework/Composer/Remove.php
@@ -46,7 +46,7 @@ public function remove(array $packages)
             [
                 'command' => 'remove',
                 'packages' => $packages,
-                '--no-update' => true,
+                '--no-update-with-dependencies' => true,
             ]
         );
     }
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
index 4ca43591c96ff..bf67f73009a08 100644
--- a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
+++ b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
@@ -7,7 +7,6 @@
 
 use Composer\Composer;
 use Composer\Package\Locker;
-use Magento\Framework\Composer\ComposerInformation;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ComposerInformationTest extends \PHPUnit\Framework\TestCase
@@ -28,12 +27,12 @@ class ComposerInformationTest extends \PHPUnit\Framework\TestCase
     private $lockerMock;
 
     /**
-     * @var \Composer\Repository\RepositoryInterface|\PHPUnit\Framework_MockObject_Builder_InvocationMocker:
+     * @var \Composer\Repository\RepositoryInterface|\PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     private $lockerRepositoryMock;
 
     /**
-     * @var \Composer\Package\CompletePackageInterface|\PHPUnit\Framework_MockObject_Builder_InvocationMocker:
+     * @var \Composer\Package\CompletePackageInterface|\PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     private $packageMock;
 
@@ -92,6 +91,9 @@ public function testIsMagentoRoot($packageName, $expected)
         $this->assertEquals($expected, $this->composerInformation->isMagentoRoot());
     }
 
+    /**
+     * @return array
+     */
     public function isMagentoRootDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
index 801d99373bc50..15ceb0c6c2755 100644
--- a/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
+++ b/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
@@ -69,7 +69,7 @@ function ($input, $buffer) {
                 $buffer->writeln($output);
             }
         );
-        $composerApp->Expects($this->at(6))->method('run')->willReturnCallback(
+        $composerApp->expects($this->at(6))->method('run')->willReturnCallback(
             function ($input, $buffer) {
                 $output = 'magento/package-d requires magento/package-c (1.0)' . PHP_EOL .
                     'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL;
diff --git a/lib/internal/Magento/Framework/Config/AbstractXml.php b/lib/internal/Magento/Framework/Config/AbstractXml.php
index a8d0eff6bce74..caead98147bf5 100644
--- a/lib/internal/Magento/Framework/Config/AbstractXml.php
+++ b/lib/internal/Magento/Framework/Config/AbstractXml.php
@@ -89,7 +89,10 @@ protected function _merge($configFiles)
                 $this->_getDomConfigModel()->merge($content);
             } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase("Invalid XML in file %1:\n%2", [$key, $e->getMessage()])
+                    new \Magento\Framework\Phrase(
+                        'The XML in file "%1" is invalid:' . "\n%2\nVerify the XML and try again.",
+                        [$key, $e->getMessage()]
+                    )
                 );
             }
         }
diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
index 3fdb57dd6282c..92f0302d93baf 100644
--- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Framework\Config;
 
 /**
@@ -38,6 +40,17 @@ class ConfigOptionsListConstants
     const CONFIG_PATH_DB_LOGGER_INCLUDE_STACKTRACE = 'db_logger/include_stacktrace';
     /**#@-*/
 
+    /**
+     * Parameter for disabling/enabling static content deployment on demand in production mode
+     * Can contains 0/1 value
+     */
+    const CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION = 'static_content_on_demand_in_production';
+
+    /**
+     * Paramater for forcing HTML minification even if file is already minified.
+     */
+    const CONFIG_PATH_FORCE_HTML_MINIFICATION = 'force_html_minification';
+
     /**#@+
      * Input keys for the options
      */
@@ -116,5 +129,5 @@ class ConfigOptionsListConstants
     /**
      * Size of random string generated for store's encryption key
      */
-    const STORE_KEY_RANDOM_STRING_SIZE = 32;
+    const STORE_KEY_RANDOM_STRING_SIZE = SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES;
 }
diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 0401471f27ea5..3e66f641b8697 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -103,7 +103,9 @@ protected function parseVarElement(\DOMElement $node)
             }
         }
         if (!count($result)) {
-            $result = $node->nodeValue;
+            $result = (strtolower($node->nodeValue) !== 'true' && strtolower($node->nodeValue) !== 'false')
+                ? $node->nodeValue
+                : filter_var($node->nodeValue, FILTER_VALIDATE_BOOLEAN);
         }
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php b/lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php
new file mode 100644
index 0000000000000..655e624ff0637
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Config\Data;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for ConfigData.
+ */
+class ConfigDataFactory
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Factory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Returns a new instance of ConfigData on every call.
+     *
+     * @param string $fileKey
+     * @return ConfigData
+     */
+    public function create($fileKey)
+    {
+        return $this->objectManager->create(ConfigData::class, ['fileKey' => $fileKey]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index 35d9626c90a94..1d995bab007e5 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -83,6 +83,7 @@ class Dom
 
     /**
      * @var array
+     * @since 2.2.0
      */
     private static $resolvedSchemaPaths = [];
 
@@ -121,6 +122,7 @@ public function __construct(
      *
      * @param string $errorFormat
      * @return string[]
+     * @since 2.1.0
      */
     private static function getXmlErrors($errorFormat)
     {
@@ -275,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/Config/Dom/UrnResolver.php b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
index 44d663041e156..41c83c940ca04 100644
--- a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
+++ b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
@@ -36,6 +36,7 @@ public function getRealPath($schema)
         $matches = [];
         $modulePattern = '/urn:(?<vendor>([a-zA-Z]*)):module:(?<module>([A-Za-z0-9\_]*)):(?<path>(.+))/';
         $frameworkPattern = '/urn:(?<vendor>([a-zA-Z]*)):(?<framework>(framework[A-Za-z\-]*)):(?<path>(.+))/';
+        $setupPattern = '/urn:(?<vendor>([a-zA-Z]*)):(?<setup>(setup[A-Za-z\-]*)):(?<path>(.+))/';
         if (preg_match($modulePattern, $schema, $matches)) {
             //urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd
             $package = $componentRegistrar
@@ -45,6 +46,10 @@ public function getRealPath($schema)
             //urn:magento:framework-amqp:Module/etc/module.xsd
             $package = $componentRegistrar
                 ->getPath(ComponentRegistrar::LIBRARY, $matches['vendor'] . '/' . $matches['framework']);
+        } elseif (preg_match($setupPattern, $schema, $matches)) {
+            //urn:magento:setup:
+            $package = $componentRegistrar
+                ->getPath(ComponentRegistrar::SETUP, $matches['vendor'] . '/' . $matches['setup']);
         } else {
             throw new NotFoundException(new Phrase("Unsupported format of schema location: '%1'", [$schema]));
         }
diff --git a/lib/internal/Magento/Framework/Config/FileResolverByModule.php b/lib/internal/Magento/Framework/Config/FileResolverByModule.php
new file mode 100644
index 0000000000000..efd84823dfbc9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/FileResolverByModule.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Config;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Module\Dir;
+use Magento\Framework\Oauth\Exception;
+
+/**
+ * Application config file resolver.
+ */
+class FileResolverByModule extends \Magento\Framework\App\Config\FileResolver
+{
+    /**
+     * This flag says, that we need to read from all modules.
+     */
+    const ALL_MODULES = 'all';
+
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * Constructor.
+     *
+     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param FileIteratorFactory $iteratorFactory
+     * @param ComponentRegistrar $componentRegistrar
+     * @param \Magento\Framework\Filesystem\Driver\File $driver
+     */
+    public function __construct(
+        \Magento\Framework\Module\Dir\Reader $moduleReader,
+        \Magento\Framework\Filesystem $filesystem,
+        \Magento\Framework\Config\FileIteratorFactory $iteratorFactory,
+        ComponentRegistrar $componentRegistrar,
+        \Magento\Framework\Filesystem\Driver\File $driver
+    ) {
+        parent::__construct($moduleReader, $filesystem, $iteratorFactory);
+        $this->componentRegistrar = $componentRegistrar;
+        $this->driver = $driver;
+    }
+
+    /**
+     * If scope is module.
+     *
+     * @inheritdoc
+     */
+    public function get($filename, $scope)
+    {
+        $iterator = $this->_moduleReader->getConfigurationFiles($filename)->toArray();
+        if ($scope !== self::ALL_MODULES) {
+            $path = $this->componentRegistrar->getPath('module', $scope);
+            $path .= '/' . Dir::MODULE_ETC_DIR . '/'. $filename;
+            $iterator = isset($iterator[$path]) ? [$path => $iterator[$path]] : [];
+        }
+        $primaryFile = parent::get($filename, 'primary')->toArray();
+        if (!$this->driver->isFile(key($primaryFile))) {
+            throw new \Exception("Primary db_schema file doesn`t exists");
+        }
+        /** Load primary configurations */
+        $iterator += $primaryFile;
+        return $iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/Reader.php b/lib/internal/Magento/Framework/Config/Reader.php
index c7ec5f3274366..9ace14ad9d8db 100644
--- a/lib/internal/Magento/Framework/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Config/Reader.php
@@ -63,10 +63,7 @@ function ($item) {
         uasort(
             $array,
             function ($firstItem, $nexItem) {
-                if ((int)$firstItem['sortOrder'] == (int)$nexItem['sortOrder']) {
-                    return 0;
-                }
-                return (int)$firstItem['sortOrder'] < (int)$nexItem['sortOrder'] ? -1 : 1;
+                return (int)$firstItem['sortOrder'] <=> (int)$nexItem['sortOrder'];
             }
         );
 
diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
index 744649ad45fa3..e2008b95c3b61 100644
--- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
+++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
@@ -6,6 +6,7 @@
  * See COPYING.txt for license details.
  *
  */
+
 namespace Magento\Framework\Config\Reader;
 
 /**
@@ -152,7 +153,10 @@ protected function _readFiles($fileList)
                 }
             } catch (\Magento\Framework\Config\Dom\ValidationException $e) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase("Invalid XML in file %1:\n%2", [$key, $e->getMessage()])
+                    new \Magento\Framework\Phrase(
+                        'The XML in file "%1" is invalid:' . "\n%2\nVerify the XML and try again.",
+                        [$key, $e->getMessage()]
+                    )
                 );
             }
         }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
index 09366c91a73a3..2ef915dc836df 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
@@ -24,6 +24,9 @@ public function testConvert($sourceFile, $resultFile)
         $this->assertEquals($resultFile, $converterDom->convert($dom));
     }
 
+    /**
+     * @return array
+     */
     public function convertDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
index b222f52dc738b..747560b29dfc1 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
@@ -42,10 +42,14 @@ public function testSetWrongKey($key, $expectedException)
 
         $configData = new ConfigData('testKey');
 
-        $this->expectException('InvalidArgumentException', $expectedException);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedException);
         $configData->set($key, 'value');
     }
 
+    /**
+     * @return array
+     */
     public function setWrongKeyDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php
index 380d095d85e64..f8c518d35add7 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ScopedTest.php
@@ -81,6 +81,9 @@ public function testGetConfigByPath($path, $expectedValue, $default)
         $this->assertEquals($expectedValue, $this->_model->get($path, $default));
     }
 
+    /**
+     * @return array
+     */
     public function getConfigByPathDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
index 94197fe737918..a2fbdce771f94 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
@@ -32,6 +32,9 @@ public function testMatch($pathPattern, $xpathSubject, $expectedResult)
         $this->assertSame($expectedResult, $actualResult);
     }
 
+    /**
+     * @return array
+     */
     public function getNodeInfoDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
index 6c8741245a87e..d497cef8ee70a 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
@@ -36,7 +36,7 @@ public function testGetRealPathNoUrn()
     public function testGetRealPathWithFrameworkUrn()
     {
         $xsdUrn = 'urn:magento:framework:Config/Test/Unit/_files/sample.xsd';
-        $xsdPath = realpath(dirname(__DIR__)) . '/_files/sample.xsd';
+        $xsdPath = str_replace('\\', '/', realpath(dirname(__DIR__)) . '/_files/sample.xsd');
         $result = $this->urnResolver->getRealPath($xsdUrn);
         $this->assertSame($xsdPath, $result, 'XSD paths does not match.');
     }
@@ -52,6 +52,17 @@ public function testGetRealPathWithModuleUrn()
         $this->assertSame($xsdPath, $result, 'XSD paths does not match.');
     }
 
+    public function testGetRealPathWithSetupUrn()
+    {
+        $xsdUrn = 'urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd';
+        $componentRegistrar = new ComponentRegistrar();
+        $xsdPath = $componentRegistrar->getPath(ComponentRegistrar::LIBRARY, 'magento/framework')
+            . '/Setup/Declaration/Schema/etc/schema.xsd';
+
+        $result = $this->urnResolver->getRealPath($xsdUrn);
+        $this->assertSame($xsdPath, $result, 'XSD paths does not match.');
+    }
+
     /**
      * @expectedException \Magento\Framework\Exception\NotFoundException
      * @expectedExceptionMessage Unsupported format of schema location: 'urn:magento:test:test:etc/test_test.xsd'
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php
index 77a7f869fb941..dfb0992307ac8 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/GenericSchemaLocatorTest.php
@@ -30,6 +30,13 @@ class GenericSchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     private $moduleReaderMock;
 
+    /**
+     * @param ModuleDirReader $reader
+     * @param $moduleName
+     * @param $mergeSchema
+     * @param $perFileSchema
+     * @return GenericSchemaLocator
+     */
     private function createNewSchemaLocatorInstance(ModuleDirReader $reader, $moduleName, $mergeSchema, $perFileSchema)
     {
         return new GenericSchemaLocator($reader, $moduleName, $mergeSchema, $perFileSchema);
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
index bd1aaa7ca791f..d48b9be427628 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
@@ -119,7 +119,7 @@ public function testReadWithInvalidDom()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid XML in file
+     * @expectedExceptionMessage The XML in file "0" is invalid:
      */
     public function testReadWithInvalidXml()
     {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php
index 17fa89068362e..4966a45c7b479 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/ThemeTest.php
@@ -7,10 +7,10 @@
 
 class ThemeTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolverMock;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index ef9c39e221e86..05863caeec2b6 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -71,7 +71,7 @@ public function __construct(
     public function getVars($module)
     {
         $this->initData();
-        return isset($this->data['vars'][$module]) ? $this->data['vars'][$module] : [];
+        return $this->data['vars'][$module] ?? [];
     }
 
     /**
@@ -110,7 +110,7 @@ public function getVarValue($module, $var)
     public function getMediaEntities($module, $mediaType)
     {
         $this->initData();
-        return isset($this->data['media'][$module][$mediaType]) ? $this->data['media'][$module][$mediaType] : [];
+        return $this->data['media'][$module][$mediaType] ?? [];
     }
 
     /**
@@ -124,9 +124,7 @@ public function getMediaEntities($module, $mediaType)
     public function getMediaAttributes($module, $mediaType, $mediaId)
     {
         $this->initData();
-        return isset($this->data['media'][$module][$mediaType][$mediaId])
-            ? $this->data['media'][$module][$mediaType][$mediaId]
-            : [];
+        return $this->data['media'][$module][$mediaType][$mediaId] ?? [];
     }
 
     /**
@@ -163,7 +161,7 @@ protected function getIdAttributes()
     public function getExcludedFiles()
     {
         $items = $this->getItems();
-        return isset($items['file']) ? $items['file'] : [];
+        return $items['file'] ?? [];
     }
 
     /**
@@ -174,7 +172,7 @@ public function getExcludedFiles()
     public function getExcludedDir()
     {
         $items = $this->getItems();
-        return isset($items['directory']) ? $items['directory'] : [];
+        return $items['directory'] ?? [];
     }
 
     /**
@@ -185,7 +183,7 @@ public function getExcludedDir()
     protected function getItems()
     {
         $this->initData();
-        return isset($this->data['exclude']) ? $this->data['exclude'] : [];
+        return $this->data['exclude'] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Config/etc/view.xsd b/lib/internal/Magento/Framework/Config/etc/view.xsd
index 20b6a7d4fbfd2..b908862b02147 100644
--- a/lib/internal/Magento/Framework/Config/etc/view.xsd
+++ b/lib/internal/Magento/Framework/Config/etc/view.xsd
@@ -49,13 +49,13 @@
             <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="background" minOccurs="0">
+                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0" nillable="true"/>
+                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0" nillable="true"/>
+                        <xs:element name="constrain" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="frame" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="transparency" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="background" minOccurs="0" nillable="true">
                             <xs:simpleType>
                                 <xs:restriction base="xs:string">
                                     <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
index 7fae09c10e5e7..e629a41056e60 100644
--- a/lib/internal/Magento/Framework/Console/Cli.php
+++ b/lib/internal/Magento/Framework/Console/Cli.php
@@ -9,7 +9,6 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ProductMetadata;
-use Magento\Framework\App\State;
 use Magento\Framework\Composer\ComposerJsonFinder;
 use Magento\Framework\Console\Exception\GenerationDirectoryAccessException;
 use Magento\Framework\Filesystem\Driver\File;
@@ -19,7 +18,7 @@
 use Magento\Setup\Console\CompilerPreparation;
 use Magento\Setup\Model\ObjectManagerProvider;
 use Symfony\Component\Console;
-use Zend\ServiceManager\ServiceManager;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * Magento 2 CLI Application.
@@ -74,7 +73,6 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
 
             $this->assertCompilerPreparation();
             $this->initObjectManager();
-            $this->assertGenerationPermissions();
         } catch (\Exception $exception) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln(
@@ -158,6 +156,13 @@ private function initObjectManager()
     {
         $params = (new ComplexParameter(self::INPUT_KEY_BOOTSTRAP))->mergeFromArgv($_SERVER, $_SERVER);
         $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
+        $params = $this->documentRootResolver($params);
+        $requestParams = $this->serviceManager->get('magento-init-params');
+        $appBootstrapKey = Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS;
+
+        if (isset($requestParams[$appBootstrapKey]) && !isset($params[$appBootstrapKey])) {
+            $params[$appBootstrapKey] = $requestParams[$appBootstrapKey];
+        }
 
         $this->objectManager = Bootstrap::create(BP, $params)->getObjectManager();
 
@@ -166,33 +171,6 @@ private function initObjectManager()
         $omProvider->setObjectManager($this->objectManager);
     }
 
-    /**
-     * Checks whether generation directory is read-only.
-     * Depends on the current mode:
-     *      production - application will proceed
-     *      default - application will be terminated
-     *      developer - application will be terminated
-     *
-     * @return void
-     * @throws GenerationDirectoryAccessException If generation directory is read-only in developer mode
-     */
-    private function assertGenerationPermissions()
-    {
-        /** @var GenerationDirectoryAccess $generationDirectoryAccess */
-        $generationDirectoryAccess = $this->objectManager->create(
-            GenerationDirectoryAccess::class,
-            ['serviceManager' => $this->serviceManager]
-        );
-        /** @var State $state */
-        $state = $this->objectManager->get(State::class);
-
-        if ($state->getMode() !== State::MODE_PRODUCTION
-            && !$generationDirectoryAccess->check()
-        ) {
-            throw new GenerationDirectoryAccessException();
-        }
-    }
-
     /**
      * Checks whether compiler is being prepared.
      *
@@ -237,4 +215,27 @@ protected function getVendorCommands($objectManager)
 
         return $commands;
     }
+
+    /**
+     * Provides updated configuration in
+     * accordance to document root settings.
+     *
+     * @param array $config
+     * @return array
+     */
+    private function documentRootResolver(array $config = []): array
+    {
+        $params = [];
+        $deploymentConfig = $this->serviceManager->get(DeploymentConfig::class);
+        if ((bool)$deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB)) {
+            $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = [
+                DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
+                DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],
+                DirectoryList::STATIC_VIEW => [DirectoryList::URL_PATH => 'static'],
+                DirectoryList::UPLOAD => [DirectoryList::URL_PATH => 'media/upload'],
+            ];
+        }
+
+        return array_merge_recursive($config, $params);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php b/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php
index 1e9ae60472563..58606bb38914d 100644
--- a/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php
+++ b/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Console\QuestionPerformer;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -65,7 +66,7 @@ public function execute(array $messages, InputInterface $input, OutputInterface
     }
 
     /**
-     * Creates Question object from from given array of messages.
+     * Creates Question object from given array of messages.
      *
      * @param string[] $messages array of messages
      * @return Question
@@ -81,7 +82,7 @@ private function getConfirmationQuestion(array $messages)
         $question->setValidator(function ($answer) {
             if (!in_array(strtolower($answer), ['yes', 'y', 'no', 'n'])) {
                 throw new LocalizedException(
-                    new Phrase('Please type [y]es or [n]o')
+                    new Phrase('A [y]es or [n]o selection needs to be made. Select and try again.')
                 );
             }
 
diff --git a/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php b/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php
index d8552f2ba5f31..4a951aa2987a8 100644
--- a/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php
+++ b/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php
@@ -11,8 +11,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\QuestionFactory;
 use Symfony\Component\Console\Question\Question;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Phrase;
 
 class YesNoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Json.php b/lib/internal/Magento/Framework/Controller/Result/Json.php
index 3349d4507577b..f46d0875c4250 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Json.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Json.php
@@ -28,12 +28,22 @@ class Json extends AbstractResult
      */
     protected $json;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      */
-    public function __construct(InlineInterface $translateInline)
-    {
+    public function __construct(
+        InlineInterface $translateInline,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+    ) {
         $this->translateInline = $translateInline;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -43,10 +53,14 @@ public function __construct(InlineInterface $translateInline)
      * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
      * @param array $options Additional options used during encoding
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function setData($data, $cycleCheck = false, $options = [])
     {
-        $this->json = \Zend_Json::encode($data, $cycleCheck, $options);
+        if ($data instanceof \Magento\Framework\DataObject) {
+            $data = $data->toArray();
+        }
+        $this->json = $this->serializer->serialize($data);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Controller/Result/Redirect.php b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
index d68caeb3e4409..120b18d873cff 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Redirect.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
@@ -9,6 +9,8 @@
 use Magento\Framework\App;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
 use Magento\Framework\Controller\AbstractResult;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\UrlInterface;
 
 /**
  * In many cases controller actions may result in a redirect
@@ -18,13 +20,14 @@
  */
 class Redirect extends AbstractResult
 {
+
     /**
-     * @var \Magento\Framework\App\Response\RedirectInterface
+     * @var RedirectInterface
      */
     protected $redirect;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlBuilder;
 
@@ -37,11 +40,11 @@ class Redirect extends AbstractResult
      * Constructor
      *
      * @param App\Response\RedirectInterface $redirect
-     * @param \Magento\Framework\UrlInterface $urlBuilder
+     * @param UrlInterface $urlBuilder
      */
     public function __construct(
         App\Response\RedirectInterface $redirect,
-        \Magento\Framework\UrlInterface $urlBuilder
+        UrlInterface $urlBuilder
     ) {
         $this->redirect = $redirect;
         $this->urlBuilder = $urlBuilder;
@@ -70,6 +73,7 @@ public function setRefererOrBaseUrl()
     }
 
     /**
+     * URL Setter
      * @param string $url
      * @return $this
      */
@@ -97,7 +101,11 @@ public function setPath($path, array $params = [])
      */
     protected function render(HttpResponseInterface $response)
     {
-        $response->setRedirect($this->url);
+        if (empty($this->httpResponseCode)) {
+            $response->setRedirect($this->url);
+        } else {
+            $response->setRedirect($this->url, $this->httpResponseCode);
+        }
         return $this;
     }
 }
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
index 0295f0713d429..881166b3e2218 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
@@ -6,10 +6,13 @@
 
 namespace Magento\Framework\Controller\Test\Unit\Result;
 
-use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use \PHPUnit\Framework\TestCase;
+use \Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use \Magento\Framework\App\Response\RedirectInterface;
 use \Magento\Framework\Controller\Result\Redirect;
+use \Magento\Framework\UrlInterface;
 
-class RedirectTest extends \PHPUnit\Framework\TestCase
+class RedirectTest extends TestCase
 {
     /** @var \Magento\Framework\Controller\Result\Redirect */
     protected $redirect;
@@ -28,9 +31,9 @@ class RedirectTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->redirectInterface = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->urlInterface = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->redirectInterface = $this->createMock(RedirectInterface::class);
+        $this->urlBuilder = $this->createMock(UrlInterface::class);
+        $this->urlInterface = $this->createMock(UrlInterface::class);
         $this->response = $this->createMock(HttpResponseInterface::class);
         $this->redirect = new Redirect($this->redirectInterface, $this->urlInterface);
     }
@@ -39,7 +42,7 @@ public function testSetRefererUrl()
     {
         $this->redirectInterface->expects($this->once())->method('getRefererUrl');
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
+            Redirect::class,
             $this->redirect->setRefererUrl()
         );
     }
@@ -48,7 +51,7 @@ public function testSetRefererOrBaseUrl()
     {
         $this->redirectInterface->expects($this->once())->method('getRedirectUrl');
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
+            Redirect::class,
             $this->redirect->setRefererOrBaseUrl()
         );
     }
@@ -56,7 +59,7 @@ public function testSetRefererOrBaseUrl()
     public function testSetUrl()
     {
         $url = 'http://test.com';
-        $this->assertInstanceOf(\Magento\Framework\Controller\Result\Redirect::class, $this->redirect->setUrl($url));
+        $this->assertInstanceOf(Redirect::class, $this->redirect->setUrl($url));
     }
 
     public function testSetPath()
@@ -67,17 +70,39 @@ public function testSetPath()
             $this->returnValue($params)
         );
         $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
+            Redirect::class,
             $this->redirect->setPath($path, $params)
         );
     }
 
-    public function testRender()
+    /**
+     * @return array
+     */
+    public function httpRedirectResponseStatusCodes()
     {
-        $this->response->expects($this->once())->method('setRedirect');
-        $this->assertInstanceOf(
-            \Magento\Framework\Controller\Result\Redirect::class,
-            $this->redirect->renderResult($this->response)
-        );
+        return [
+            [302, null],
+            [302, 302],
+            [303, 303]
+        ];
+    }
+
+    /**
+     * @param int $expectedStatusCode
+     * @param int|null $actualStatusCode
+     * @dataProvider httpRedirectResponseStatusCodes
+     */
+    public function testRender($expectedStatusCode, $actualStatusCode)
+    {
+        $url = 'http://test.com';
+        $this->redirect->setUrl($url);
+        $this->redirect->setHttpResponseCode($actualStatusCode);
+
+        $this->response
+            ->expects($this->once())
+            ->method('setRedirect')
+            ->with($url, $expectedStatusCode);
+
+        $this->redirect->renderResult($this->response);
     }
 }
diff --git a/lib/internal/Magento/Framework/Convert/ConvertArray.php b/lib/internal/Magento/Framework/Convert/ConvertArray.php
index 089c25a0da771..1cd377c7d2cc8 100644
--- a/lib/internal/Magento/Framework/Convert/ConvertArray.php
+++ b/lib/internal/Magento/Framework/Convert/ConvertArray.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Convert;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -24,7 +25,11 @@ class ConvertArray
     public function assocToXml(array $array, $rootName = '_')
     {
         if (empty($rootName) || is_numeric($rootName)) {
-            throw new LocalizedException(new \Magento\Framework\Phrase('Root element must not be empty or numeric'));
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase(
+                    "The root element can't be empty or use numbers. Change the element and try again."
+                )
+            );
         }
 
         $xmlStr = <<<XML
@@ -34,7 +39,9 @@ public function assocToXml(array $array, $rootName = '_')
         $xml = new \SimpleXMLElement($xmlStr);
         foreach (array_keys($array) as $key) {
             if (is_numeric($key)) {
-                throw new LocalizedException(new \Magento\Framework\Phrase('Array root keys must not be numeric.'));
+                throw new LocalizedException(
+                    new \Magento\Framework\Phrase('An error occurred. Use non-numeric array root keys and try again.')
+                );
             }
         }
         return self::_assocToXml($array, $rootName, $xml);
@@ -77,7 +84,8 @@ private function _assocToXml(array $array, $rootName, \SimpleXMLElement $xml)
                     if ($key === $rootName) {
                         throw new LocalizedException(
                             new \Magento\Framework\Phrase(
-                                'Associative key must not be the same as its parent associative key.'
+                                "An associative key can't be the same as its parent associative key. "
+                                . "Verify and try again."
                             )
                         );
                     }
@@ -94,7 +102,9 @@ private function _assocToXml(array $array, $rootName, \SimpleXMLElement $xml)
         }
         if ($hasNumericKey && $hasStringKey) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase('Associative and numeric keys must not be mixed at one level.')
+                new \Magento\Framework\Phrase(
+                    "Associative and numeric keys can't be mixed at one level. Verify and try again."
+                )
             );
         }
         return $xml;
diff --git a/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php b/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php
index 70414b2802c8a..d80e2b7e50015 100644
--- a/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php
+++ b/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Convert\Test\Unit;
 
 use \Magento\Framework\Convert\ConvertArray;
@@ -34,7 +35,7 @@ public function testAssocToXml()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Associative and numeric keys must not be mixed at one level.
+     * @expectedExceptionMessage Associative and numeric keys can't be mixed at one level. Verify and try again.
      */
     public function testAssocToXmlExceptionByKey()
     {
diff --git a/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php b/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php
index 5af254fcdd4dc..4102ece70a1ce 100644
--- a/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php
+++ b/lib/internal/Magento/Framework/Convert/Test/Unit/XmlTest.php
@@ -31,6 +31,9 @@ public function testXmlToAssoc()
         );
     }
 
+    /**
+     * @return string
+     */
     protected function getXml()
     {
         return <<<XML
diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
index 94e2027abd135..6049b7fba6d44 100644
--- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php
+++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Crontab;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -86,7 +87,7 @@ public function getTasks()
     public function saveTasks(array $tasks)
     {
         if (!$tasks) {
-            throw new LocalizedException(new Phrase('List of tasks is empty'));
+            throw new LocalizedException(new Phrase('The list of tasks is empty. Add tasks and try again.'));
         }
 
         $this->checkSupportedOs();
@@ -99,7 +100,7 @@ public function saveTasks(array $tasks)
             }
 
             if (empty($task['command'])) {
-                throw new LocalizedException(new Phrase('Command should not be empty'));
+                throw new LocalizedException(new Phrase("The command shouldn't be empty. Enter and try again."));
             }
 
             $tasks[$key]['command'] = str_replace(
diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
index 5f7984c085ac7..b160eb0a7f95e 100644
--- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
+++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Crontab\Test\Unit;
 
 use Magento\Framework\Crontab\CrontabManager;
@@ -192,7 +193,7 @@ public function removeTasksDataProvider()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage List of tasks is empty
+     * @expectedExceptionMessage The list of tasks is empty. Add tasks and try again.
      */
     public function testSaveTasksWithEmptyTasksList()
     {
@@ -219,7 +220,7 @@ public function testSaveTasksWithEmptyTasksList()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Command should not be empty
+     * @expectedExceptionMessage The command shouldn't be empty. Enter and try again.
      */
     public function testSaveTasksWithoutCommand()
     {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 7164e68c709fb..b54761698f16c 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter;
 
+use Magento\Framework\App\State;
 use Pelago\Emogrifier;
 
 /**
@@ -17,9 +18,13 @@ class CssInliner
      */
     private $emogrifier;
 
-    public function __construct()
+    /**
+     * @param State $appState
+     */
+    public function __construct(State $appState)
     {
         $this->emogrifier = new Emogrifier();
+        $this->emogrifier->setDebug($appState->getMode() === State::MODE_DEVELOPER);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
index c1c2a4f4a1d18..cdf7a1ec3734d 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
@@ -98,9 +98,9 @@ public function testGetFilesEmpty()
      *
      * @dataProvider getFilesDataProvider
      *
-     * @param $libraryFiles array Files in lib directory
-     * @param $baseFiles array Files in base directory
-     * @param $themeFiles array Files in theme
+     * @param array $libraryFiles Files in lib directory
+     * @param array $baseFiles Files in base directory
+     * @param array $themeFiles Files in theme
      * *
      * @return void
      */
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
index 962734feea18a..6080652a4ad35 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
@@ -129,8 +129,8 @@ public function testGetFilesEmpty()
      *
      * @dataProvider getFilesDataProvider
      *
-     * @param $libraryFiles array Files in lib directory
-     * @param $themeFiles array Files in theme
+     * @param array $libraryFiles Files in lib directory
+     * @param array $themeFiles Files in theme
      * *
      * @return void
      */
diff --git a/lib/internal/Magento/Framework/CurrencyInterface.php b/lib/internal/Magento/Framework/CurrencyInterface.php
index 4dbde431041fc..ca042bda849aa 100644
--- a/lib/internal/Magento/Framework/CurrencyInterface.php
+++ b/lib/internal/Magento/Framework/CurrencyInterface.php
@@ -235,23 +235,4 @@ public function isMore($value, $currency = null);
      * @return boolean
      */
     public function isLess($value, $currency = null);
-
-    /**
-     * Returns the set service class
-     *
-     * @return \Zend_Currency_CurrencyInterface
-     * @deprecated
-     * @see \Magento\Directory\Model\Currency\Import\ImportInterface
-     */
-    public function getService();
-
-    /**
-     * Sets a new exchange service
-     *
-     * @param string|\Zend_Currency_CurrencyInterface $service Service class
-     * @return \Zend_Currency_CurrencyInterface
-     * @deprecated
-     * @see \Magento\Directory\Model\Currency\Import\ImportInterface
-     */
-    public function setService($service);
 }
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index bce53caef8a39..9d043d6de7fbc 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -10,7 +10,6 @@
 use Magento\Framework\Data\ObjectFactory;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\DataObject;
 
 /**
  * Class AbstractMapper
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 89e50c2e7b6d7..5c9bc9c2fb2d7 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -495,6 +495,13 @@ public function insertForce($table, array $bind);
     /**
      * Updates table rows with specified data based on a WHERE clause.
      *
+     * The $where parameter in this instance can be a single WHERE clause or an array containing a multiple.  In all
+     * instances, a WHERE clause can be a string or an instance of {@see Zend_Db_Expr}.  In the event you use an array,
+     * you may specify the clause as the key and a value to be bound to it as the value. E.g., ['amt > ?' => $amt]
+     *
+     * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
+     * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
+     *
      * @param  mixed        $table The table to update.
      * @param  array        $bind  Column-value pairs.
      * @param  mixed        $where UPDATE WHERE clause(s).
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 2e5d38f2c6212..86266ec23fe47 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB\Adapter\Pdo;
 
 use Magento\Framework\App\ObjectManager;
@@ -25,6 +26,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\Setup\SchemaListener;
 
 // @codingStandardsIgnoreStart
 
@@ -216,6 +218,11 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
      */
     private $serializer;
 
+    /**
+     * @var SchemaListener
+     */
+    private $schemaListener;
+
     /**
      * Constructor
      *
@@ -422,6 +429,22 @@ protected function _connect()
         }
     }
 
+    /**
+     * Create new database connection
+     *
+     * @return \PDO
+     */
+    private function createConnection()
+    {
+        $connection = new \PDO(
+            $this->_dsn(),
+            $this->_config['username'],
+            $this->_config['password'],
+            $this->_config['driver_options']
+        );
+        return $connection;
+    }
+
     /**
      * Run RAW Query
      *
@@ -467,7 +490,7 @@ public function rawFetchRow($sql, $field = null)
         if (empty($field)) {
             return $row;
         } else {
-            return isset($row[$field]) ? $row[$field] : false;
+            return $row[$field] ?? false;
         }
     }
 
@@ -485,13 +508,14 @@ protected function _checkDdlTransaction($sql)
             $sqlMessage = explode(' ', $sql, 3);
             $startSql = strtolower(substr($sqlMessage[0], 0, 3));
             if (in_array($startSql, $this->_ddlRoutines) && strcasecmp($sqlMessage[1], 'temporary') !== 0) {
-                trigger_error(AdapterInterface::ERROR_DDL_MESSAGE, E_USER_ERROR);
+                throw new ConnectionException(AdapterInterface::ERROR_DDL_MESSAGE, E_USER_ERROR);
             }
         }
     }
 
     /**
      * Special handling for PDO query().
+     *
      * All bind parameter names must begin with ':'.
      *
      * @param string|\Magento\Framework\DB\Select $sql The SQL statement with placeholders.
@@ -542,6 +566,15 @@ protected function _query($sql, $bind = [])
                     $retry = true;
                     $triesCount++;
                     $this->closeConnection();
+
+                    /**
+                     * _connect() function does not allow port parameter, so put the port back with the host
+                     */
+                    if (!empty($this->_config['port'])) {
+                        $this->_config['host'] = implode(':', [$this->_config['host'], $this->_config['port']]);
+                        unset($this->_config['port']);
+                    }
+
                     $this->_connect();
                 }
 
@@ -563,6 +596,7 @@ protected function _query($sql, $bind = [])
 
     /**
      * Special handling for PDO query().
+     *
      * All bind parameter names must begin with ':'.
      *
      * @param string|\Magento\Framework\DB\Select $sql The SQL statement with placeholders.
@@ -575,15 +609,18 @@ protected function _query($sql, $bind = [])
     public function query($sql, $bind = [])
     {
         if (strpos(rtrim($sql, " \t\n\r\0;"), ';') !== false && count($this->_splitMultiQuery($sql)) > 1) {
-            throw new \Magento\Framework\Exception\LocalizedException(new Phrase('Cannot execute multiple queries'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                new Phrase("Multiple queries can't be executed. Run a single query and try again.")
+            );
         }
         return $this->_query($sql, $bind);
     }
 
     /**
+     * Allows multiple queries
+     *
      * Allows multiple queries -- to safeguard against SQL injection, USE CAUTION and verify that input
      * cannot be tampered with.
-     *
      * Special handling for PDO query().
      * All bind parameter names must begin with ':'.
      *
@@ -841,6 +878,7 @@ public function dropForeignKey($tableName, $fkName, $schemaName = null)
                 );
                 $this->resetDdlCache($tableName, $schemaName);
                 $this->rawQuery($sql);
+                $this->getSchemaListener()->dropForeignKey($tableName, $fkName);
             }
         }
         return $this;
@@ -927,6 +965,7 @@ public function tableColumnExists($tableName, $columnName, $schemaName = null)
      */
     public function addColumn($tableName, $columnName, $definition, $schemaName = null)
     {
+        $this->getSchemaListener()->addColumn($tableName, $columnName, $definition);
         if ($this->tableColumnExists($tableName, $columnName, $schemaName)) {
             return true;
         }
@@ -971,12 +1010,13 @@ public function dropColumn($tableName, $columnName, $schemaName = null)
         if (!$this->tableColumnExists($tableName, $columnName, $schemaName)) {
             return true;
         }
-
+        $this->getSchemaListener()->dropColumn($tableName, $columnName);
         $alterDrop = [];
 
         $foreignKeys = $this->getForeignKeys($tableName, $schemaName);
         foreach ($foreignKeys as $fkProp) {
             if ($fkProp['COLUMN_NAME'] == $columnName) {
+                $this->getSchemaListener()->dropForeignKey($tableName, $fkProp['FK_NAME']);
                 $alterDrop[] = 'DROP FOREIGN KEY ' . $this->quoteIdentifier($fkProp['FK_NAME']);
             }
         }
@@ -987,6 +1027,9 @@ public function dropColumn($tableName, $columnName, $schemaName = null)
             $idxColumnKey = array_search($columnName, $idxColumns);
             if ($idxColumnKey !== false) {
                 unset($idxColumns[$idxColumnKey]);
+                if (empty($idxColumns)) {
+                    $this->getSchemaListener()->dropIndex($tableName, $idxData['KEY_NAME'], 'index');
+                }
                 if ($idxColumns && $this->_getIndexByColumns($tableName, $idxColumns, $schemaName)) {
                     $this->dropIndex($tableName, $idxData['KEY_NAME'], $schemaName);
                 }
@@ -1046,6 +1089,12 @@ public function changeColumn(
         $flushData = false,
         $schemaName = null
     ) {
+        $this->getSchemaListener()->changeColumn(
+            $tableName,
+            $oldColumnName,
+            $newColumnName,
+            $definition
+        );
         if (!$this->tableColumnExists($tableName, $oldColumnName, $schemaName)) {
             throw new \Zend_Db_Exception(
                 sprintf(
@@ -1091,6 +1140,11 @@ public function changeColumn(
      */
     public function modifyColumn($tableName, $columnName, $definition, $flushData = false, $schemaName = null)
     {
+        $this->getSchemaListener()->modifyColumn(
+            $tableName,
+            $columnName,
+            $definition
+        );
         if (!$this->tableColumnExists($tableName, $columnName, $schemaName)) {
             throw new \Zend_Db_Exception(sprintf('Column "%s" does not exist in table "%s".', $columnName, $tableName));
         }
@@ -1227,6 +1281,7 @@ public function getForeignKeysTree()
 
     /**
      * Modify tables, used for upgrade process
+     *
      * Change columns definitions, reset foreign keys, change tables comments and engines.
      *
      * The value of each array element is an associative array
@@ -1418,9 +1473,9 @@ public function select()
      *
      * Method revrited for handle empty arrays in value param
      *
-     * @param string  $text  The text with a placeholder.
-     * @param mixed   $value The value to quote.
-     * @param string  $type  OPTIONAL SQL datatype
+     * @param string $text The text with a placeholder.
+     * @param mixed $value The value to quote.
+     * @param string $type OPTIONAL SQL datatype
      * @param integer $count OPTIONAL count of placeholders to replace
      * @return string An SQL-safe quoted value placed into the orignal text.
      */
@@ -1463,6 +1518,7 @@ protected function _getCacheId($tableKey, $ddlType)
 
     /**
      * Load DDL data from cache
+     *
      * Return false if cache does not exists
      *
      * @param string $tableCacheKey the table cache key
@@ -1517,7 +1573,8 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data)
 
     /**
      * Reset cached DDL data from cache
-     * if table name is null - reset all cached DDL data
+     *
+     * If table name is null - reset all cached DDL data
      *
      * @param string $tableName
      * @param string $schemaName OPTIONAL
@@ -1554,6 +1611,7 @@ public function resetDdlCache($tableName = null, $schemaName = null)
 
     /**
      * Disallow DDL caching
+     *
      * @return $this
      */
     public function disallowDdlCache()
@@ -1564,6 +1622,7 @@ public function disallowDdlCache()
 
     /**
      * Allow DDL caching
+     *
      * @return $this
      */
     public function allowDdlCache()
@@ -1624,9 +1683,10 @@ public function describeTable($tableName, $schemaName = null)
 
     /**
      * Format described column to definition, ready to be added to ddl table.
+     *
      * Return array with keys: name, type, length, options, comment
      *
-     * @param  array $columnData
+     * @param array $columnData
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -1841,6 +1901,7 @@ public function changeTableComment($tableName, $comment, $schemaName = null)
 
     /**
      * Inserts a table row with specified data
+     *
      * Special for Zero values to identity column
      *
      * @param string $table
@@ -1987,18 +2048,18 @@ public function insertArray($table, array $columns, array $data, $strategy = 0)
         $bind         = [];
         $columnsCount = count($columns);
         foreach ($data as $row) {
-            if ($columnsCount != count($row)) {
+            if (is_array($row) && $columnsCount != count($row)) {
                 throw new \Zend_Db_Exception('Invalid data for insert');
             }
             $values[] = $this->_prepareInsertData($row, $bind);
         }
 
         switch ($strategy) {
-            case self::INSERT_ON_DUPLICATE:
+            case self::REPLACE:
                 $query = $this->_getReplaceSqlQuery($table, $columns, $values);
                 break;
             default:
-                $query = $this->_getInsertSqlQuery($table, $columns, $values);
+                $query = $this->_getInsertSqlQuery($table, $columns, $values, $strategy);
         }
 
         // execute the statement and return the number of affected rows
@@ -2052,6 +2113,7 @@ public function newTable($tableName = null, $schemaName = null)
      */
     public function createTable(Table $table)
     {
+        $this->getSchemaListener()->createTable($table);
         $columns = $table->getColumns();
         foreach ($columns as $columnEntry) {
             if (empty($columnEntry['COMMENT'])) {
@@ -2071,7 +2133,12 @@ public function createTable(Table $table)
             implode(",\n", $sqlFragment),
             implode(" ", $tableOptions)
         );
-        $result = $this->query($sql);
+
+        if ($this->getTransactionLevel() > 0) {
+            $result = $this->createConnection()->query($sql);
+        } else {
+            $result = $this->query($sql);
+        }
         $this->resetDdlCache($table->getName(), $table->getSchema());
 
         return $result;
@@ -2382,6 +2449,7 @@ protected function _getColumnDefinition($options, $ddlType = null)
                 }
                 break;
             case Table::TYPE_DECIMAL:
+            case Table::TYPE_FLOAT:
             case Table::TYPE_NUMERIC:
                 $precision  = 10;
                 $scale      = 0;
@@ -2495,8 +2563,13 @@ public function dropTable($tableName, $schemaName = null)
     {
         $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
         $query = 'DROP TABLE IF EXISTS ' . $table;
-        $this->query($query);
+        if ($this->getTransactionLevel() > 0) {
+            $this->createConnection()->query($query);
+        } else {
+            $this->query($query);
+        }
         $this->resetDdlCache($tableName, $schemaName);
+        $this->getSchemaListener()->dropTable($tableName);
         return true;
     }
 
@@ -2566,13 +2639,17 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null)
         if ($this->isTableExists($newTableName, $schemaName)) {
             throw new \Zend_Db_Exception(sprintf('Table "%s" already exists', $newTableName));
         }
-
+        $this->getSchemaListener()->renameTable($oldTableName, $newTableName);
         $oldTable = $this->_getTableName($oldTableName, $schemaName);
         $newTable = $this->_getTableName($newTableName, $schemaName);
 
         $query = sprintf('ALTER TABLE %s RENAME TO %s', $oldTable, $newTable);
-        $this->query($query);
 
+        if ($this->getTransactionLevel() > 0) {
+            $this->createConnection()->query($query);
+        } else {
+            $this->query($query);
+        }
         $this->resetDdlCache($oldTableName, $schemaName);
 
         return true;
@@ -2599,6 +2676,12 @@ public function addIndex(
         $indexType = AdapterInterface::INDEX_TYPE_INDEX,
         $schemaName = null
     ) {
+        $this->getSchemaListener()->addIndex(
+            $tableName,
+            $indexName,
+            $fields,
+            $indexType
+        );
         $columns = $this->describeTable($tableName, $schemaName);
         $keyList = $this->getIndexList($tableName, $schemaName);
 
@@ -2680,22 +2763,28 @@ public function addIndex(
     public function dropIndex($tableName, $keyName, $schemaName = null)
     {
         $indexList = $this->getIndexList($tableName, $schemaName);
+        $indexType = 'index';
         $keyName = strtoupper($keyName);
         if (!isset($indexList[$keyName])) {
             return true;
         }
 
         if ($keyName == 'PRIMARY') {
+            $indexType = 'primary';
             $cond = 'DROP PRIMARY KEY';
         } else {
+            if (strpos($keyName, 'UNQ_') !== false) {
+                $indexType = 'unique';
+            }
             $cond = 'DROP KEY ' . $this->quoteIdentifier($indexList[$keyName]['KEY_NAME']);
         }
+
         $sql = sprintf(
             'ALTER TABLE %s %s',
             $this->quoteIdentifier($this->_getTableName($tableName, $schemaName)),
             $cond
         );
-
+        $this->getSchemaListener()->dropIndex($tableName, $keyName, $indexType);
         $this->resetDdlCache($tableName, $schemaName);
 
         return $this->rawQuery($sql);
@@ -2703,6 +2792,7 @@ public function dropIndex($tableName, $keyName, $schemaName = null)
 
     /**
      * Add new Foreign Key to table
+     *
      * If Foreign Key with same name is exist - it will be deleted
      *
      * @param string $fkName
@@ -2747,6 +2837,15 @@ public function addForeignKey(
             $query .= ' ON DELETE ' . strtoupper($onDelete);
         }
 
+        $this->getSchemaListener()->addForeignKey(
+            $fkName,
+            $tableName,
+            $columnName,
+            $refTableName,
+            $refColumnName,
+            $onDelete
+        );
+
         $result = $this->rawQuery($query);
         $this->resetDdlCache($tableName);
         return $result;
@@ -2928,6 +3027,7 @@ protected function _transformStringSqlCondition($conditionKey, $value)
 
     /**
      * Prepare value for save in column
+     *
      * Return converted to column data type value
      *
      * @param array $column     the column describe array
@@ -3051,6 +3151,8 @@ public function getIfNullSql($expression, $value = 0)
     }
 
     /**
+     * Generates case SQL fragment
+     *
      * Generate fragment of SQL, that check value against multiple condition cases
      * and return different result depends on them
      *
@@ -3075,6 +3177,7 @@ public function getCaseSql($valueName, $casesResults, $defaultValue = null)
 
     /**
      * Generate fragment of SQL, that combine together (concatenate) the results from data array
+     *
      * All arguments in data must be quoted
      *
      * @param string[] $data
@@ -3089,6 +3192,7 @@ public function getConcatSql(array $data, $separator = null)
 
     /**
      * Generate fragment of SQL that returns length of character string
+     *
      * The string argument must be quoted
      *
      * @param string $string
@@ -3100,6 +3204,8 @@ public function getLengthSql($string)
     }
 
     /**
+     * Generate least SQL fragment
+     *
      * Generate fragment of SQL, that compare with two or more arguments, and returns the smallest
      * (minimum-valued) argument
      * All arguments in data must be quoted
@@ -3113,6 +3219,8 @@ public function getLeastSql(array $data)
     }
 
     /**
+     * Generate greatest SQL fragment
+     *
      * Generate fragment of SQL, that compare with two or more arguments, and returns the largest
      * (maximum-valued) argument
      * All arguments in data must be quoted
@@ -3283,6 +3391,7 @@ public function getTriggerName($tableName, $time, $event)
 
     /**
      * Retrieve valid index name
+     *
      * Check index name length and allowed symbols
      *
      * @param string $tableName
@@ -3312,6 +3421,7 @@ public function getIndexName($tableName, $fields, $indexType = '')
 
     /**
      * Retrieve valid foreign key name
+     *
      * Check foreign key name length and allowed symbols
      *
      * @param string $priTableName
@@ -3580,6 +3690,7 @@ public function supportStraightJoin()
 
     /**
      * Adds order by random to select object
+     *
      * Possible using integer field for optimization
      *
      * @param Select $select
@@ -3641,16 +3752,18 @@ protected function _prepareInsertData($row, &$bind)
      * @param string $tableName
      * @param array $columns
      * @param array $values
+     * @param null|int $strategy
      * @return string
      */
-    protected function _getInsertSqlQuery($tableName, array $columns, array $values)
+    protected function _getInsertSqlQuery($tableName, array $columns, array $values, $strategy = null)
     {
         $tableName = $this->quoteIdentifier($tableName, true);
         $columns   = array_map([$this, 'quoteIdentifier'], $columns);
         $columns   = implode(',', $columns);
         $values    = implode(', ', $values);
+        $strategy = $strategy === self::INSERT_IGNORE ? 'IGNORE' : '';
 
-        $insertSql = sprintf('INSERT INTO %s (%s) VALUES %s', $tableName, $columns, $values);
+        $insertSql = sprintf('INSERT %s INTO %s (%s) VALUES %s', $strategy, $tableName, $columns, $values);
 
         return $insertSql;
     }
@@ -3755,6 +3868,7 @@ public function getPrimaryKeyName($tableName, $schemaName = null)
 
     /**
      * Parse text size
+     *
      * Returns max allowed size if value great it
      *
      * @param string|int $size
@@ -3767,13 +3881,13 @@ protected function _parseTextSize($size)
 
         switch ($last) {
             case 'k':
-                $size = intval($size) * 1024;
+                $size = (int)$size * 1024;
                 break;
             case 'm':
-                $size = intval($size) * 1024 * 1024;
+                $size = (int)$size * 1024 * 1024;
                 break;
             case 'g':
-                $size = intval($size) * 1024 * 1024 * 1024;
+                $size = (int)$size * 1024 * 1024 * 1024;
                 break;
         }
 
@@ -3784,11 +3898,12 @@ protected function _parseTextSize($size)
             return Table::MAX_TEXT_SIZE;
         }
 
-        return intval($size);
+        return (int)$size;
     }
 
     /**
      * Converts fetched blob into raw binary PHP data.
+     *
      * The MySQL drivers do it nice, no processing required.
      *
      * @param mixed $value
@@ -3899,4 +4014,19 @@ public function getAutoIncrementField($tableName, $schemaName = null)
         }
         return false;
     }
+
+    /**
+     * Get schema Listener.
+     *
+     * Required to listen all DDL changes done by 3-rd party modules with old Install/UpgradeSchema scripts.
+     *
+     * @return SchemaListener
+     */
+    public function getSchemaListener()
+    {
+        if ($this->schemaListener === null) {
+            $this->schemaListener = \Magento\Framework\App\ObjectManager::getInstance()->create(SchemaListener::class);
+        }
+        return $this->schemaListener;
+    }
 }
diff --git a/lib/internal/Magento/Framework/DB/Helper.php b/lib/internal/Magento/Framework/DB/Helper.php
index 4cb8304cdedf8..4d4eac62978ca 100644
--- a/lib/internal/Magento/Framework/DB/Helper.php
+++ b/lib/internal/Magento/Framework/DB/Helper.php
@@ -8,6 +8,9 @@
 
 namespace Magento\Framework\DB;
 
+/**
+ * DataBase Helper
+ */
 class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
 {
     /**
@@ -52,7 +55,7 @@ protected function _prepareOrder(\Magento\Framework\DB\Select $select, $autoRese
      * Field can be with 'dot' delimiter.
      *
      * @param string $field
-     * @param bool   $reverse OPTIONAL
+     * @param bool $reverse OPTIONAL
      * @return string
      */
     protected function _truncateAliasName($field, $reverse = false)
@@ -143,6 +146,7 @@ protected function _prepareHaving(\Magento\Framework\DB\Select $select, $autoRes
     }
 
     /**
+     * Assemble limit
      *
      * @param string $query
      * @param int $limitCount
@@ -153,12 +157,12 @@ protected function _prepareHaving(\Magento\Framework\DB\Select $select, $autoRes
     protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList = [])
     {
         if ($limitCount !== null) {
-            $limitCount = intval($limitCount);
+            $limitCount = (int)$limitCount;
             if ($limitCount <= 0) {
                 //throw new \Exception("LIMIT argument count={$limitCount} is not valid");
             }
 
-            $limitOffset = intval($limitOffset);
+            $limitOffset = (int)$limitOffset;
             if ($limitOffset < 0) {
                 //throw new \Exception("LIMIT argument offset={$limitOffset} is not valid");
             }
diff --git a/lib/internal/Magento/Framework/DB/Query.php b/lib/internal/Magento/Framework/DB/Query.php
index 04ac2006b5e1f..36aab54df3925 100644
--- a/lib/internal/Magento/Framework/DB/Query.php
+++ b/lib/internal/Magento/Framework/DB/Query.php
@@ -142,7 +142,7 @@ public function getSize()
             $sql = $this->getSelectCountSql();
             $this->totalRecords = $this->getConnection()->fetchOne($sql, $this->bindParams);
         }
-        return intval($this->totalRecords);
+        return (int)$this->totalRecords;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
index 7b4406fd9adb4..6485973ec359d 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
@@ -88,6 +88,8 @@ public function __construct(
     }
 
     /**
+     * Returns current select
+     *
      * @return Select
      */
     public function current()
@@ -101,6 +103,8 @@ public function current()
     }
 
     /**
+     * Returns next select
+     *
      * @return Select
      */
     public function next()
@@ -121,6 +125,8 @@ public function next()
     }
 
     /**
+     * Returns key
+     *
      * @return int
      */
     public function key()
@@ -129,6 +135,8 @@ public function key()
     }
 
     /**
+     * Returns is valid
+     *
      * @return bool
      */
     public function valid()
@@ -137,6 +145,8 @@ public function valid()
     }
 
     /**
+     * Rewind
+     *
      * @return void
      */
     public function rewind()
@@ -165,7 +175,7 @@ private function calculateBatchSize(Select $select)
         );
         $row = $this->connection->fetchRow($wrapperSelect);
         $this->minValue = $row['max'];
-        return intval($row['cnt']);
+        return (int)$row['cnt'];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
index 9871df1b16841..e2ef4ae530a9d 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
@@ -113,7 +113,7 @@ public function __construct(
     public function current()
     {
         if (null === $this->currentSelect) {
-            $this->isValid = ($this->currentOffset + $this->batchSize) <= $this->totalItemCount;
+            $this->isValid = $this->currentOffset < $this->totalItemCount;
             $this->currentSelect = $this->initSelectObject();
         }
         return $this->currentSelect;
@@ -144,7 +144,7 @@ public function next()
         if (null === $this->currentSelect) {
             $this->current();
         }
-        $this->isValid = ($this->batchSize + $this->currentOffset) <= $this->totalItemCount;
+        $this->isValid = $this->currentOffset < $this->totalItemCount;
         $select = $this->initSelectObject();
         if ($this->isValid) {
             $this->iteration++;
@@ -201,7 +201,7 @@ private function initSelectObject()
             );
             $row = $this->connection->fetchRow($wrapperSelect);
 
-            $this->totalItemCount = intval($row['cnt']);
+            $this->totalItemCount = (int)$row['cnt'];
         }
 
         $rangeField = is_array($this->rangeField) ? $this->rangeField : [$this->rangeField];
diff --git a/lib/internal/Magento/Framework/DB/Query/Generator.php b/lib/internal/Magento/Framework/DB/Query/Generator.php
index 1d903b05b8f75..0538aec760bd7 100644
--- a/lib/internal/Magento/Framework/DB/Query/Generator.php
+++ b/lib/internal/Magento/Framework/DB/Query/Generator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB\Query;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -75,7 +76,9 @@ public function generate(
         $fromSelect = $select->getPart(\Magento\Framework\DB\Select::FROM);
         if (empty($fromSelect)) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase('Select object must have correct "FROM" part')
+                new \Magento\Framework\Phrase(
+                    'The select object must have the correct "FROM" part. Verify and try again.'
+                )
             );
         }
 
@@ -143,7 +146,9 @@ public function generateByRange(
         $fromSelect = $select->getPart(\Magento\Framework\DB\Select::FROM);
         if (empty($fromSelect)) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase('Select object must have correct "FROM" part')
+                new \Magento\Framework\Phrase(
+                    'The select object must have the correct "FROM" part. Verify and try again.'
+                )
             );
         }
 
diff --git a/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php b/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php
index df046c92203c2..692843aaa37e3 100644
--- a/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\DB\Select;
 
 use Magento\Framework\DB\Select;
-use Magento\Framework\DB\Platform;
 use Magento\Framework\DB\Platform\Quote;
 
 /**
diff --git a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
index 36a075b9af8c9..dfe9c8949c353 100644
--- a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
@@ -40,12 +40,12 @@ public function render(Select $select, $sql = '')
             $order = [];
             foreach ($select->getPart(Select::ORDER) as $term) {
                 if (is_array($term)) {
-                    if (is_numeric($term[0]) && strval(intval($term[0])) == $term[0]) {
+                    if (is_numeric($term[0]) && (string)(int)$term[0] == $term[0]) {
                         $order[] = (int)trim($term[0]) . ' ' . $term[1];
                     } else {
                         $order[] = $this->quote->quoteIdentifier($term[0]) . ' ' . $term[1];
                     }
-                } elseif (is_numeric($term) && strval(intval($term)) == $term) {
+                } elseif (is_numeric($term) && (string)(int)$term == $term) {
                     $order[] = (int)trim($term);
                 } else {
                     $order[] = $this->quote->quoteIdentifier($term);
diff --git a/lib/internal/Magento/Framework/DB/SelectFactory.php b/lib/internal/Magento/Framework/DB/SelectFactory.php
index bdbc35b395af7..3c64e78839c4d 100644
--- a/lib/internal/Magento/Framework/DB/SelectFactory.php
+++ b/lib/internal/Magento/Framework/DB/SelectFactory.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\DB;
 
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Select\SelectRenderer;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
diff --git a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
index a0c3a803ca019..490e272d1a63a 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/Sql/LimitExpression.php b/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php
index 9e875e485c67e..3c5cb65e898f3 100644
--- a/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/LimitExpression.php
@@ -41,19 +41,19 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function __toString()
     {
         $sql = $this->sql;
-        $count = intval($this->count);
+        $count = (int)$this->count;
         if ($count <= 0) {
             /** @see Zend_Db_Adapter_Exception */
             #require_once 'Zend/Db/Adapter/Exception.php';
             throw new \Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
         }
 
-        $offset = intval($this->offset);
+        $offset = (int)$this->offset;
         if ($offset < 0) {
             /** @see Zend_Db_Adapter_Exception */
             #require_once 'Zend/Db/Adapter/Exception.php';
diff --git a/lib/internal/Magento/Framework/DB/TemporaryTableService.php b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
index 479cd0c6fddb9..881ebbe5c85ad 100644
--- a/lib/internal/Magento/Framework/DB/TemporaryTableService.php
+++ b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
@@ -6,11 +6,10 @@
 namespace Magento\Framework\DB;
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Select;
 
 /**
  * Class TemporaryTableService creates a temporary table in mysql from a Magento\Framework\DB\Select.
- * Use this class to create an index with that that you want to query later for quick data access
+ * Use this class to create an index with that you want to query later for quick data access
  *
  * @api
  * @since 100.2.0
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
index 85e8149d72d0c..98fcdc626a971 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
@@ -10,6 +10,8 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Select\SelectRenderer;
 use Magento\Framework\Model\ResourceModel\Type\Db\Pdo\Mysql;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Setup\SchemaListener;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
@@ -42,6 +44,16 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
      */
     protected $selectFactory;
 
+    /**
+     * @var SchemaListener|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $schemaListenerMock;
+
+    /**
+     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
     /**
      * Setup
      */
@@ -53,9 +65,14 @@ protected function setUp()
         $selectFactory = $this->getMockBuilder(\Magento\Framework\DB\SelectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-
+        $this->serializerMock = $this->getMockBuilder(SerializerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->schemaListenerMock = $this->getMockBuilder(SchemaListener::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->_mockAdapter = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
-            ->setMethods(['beginTransaction', 'getTransactionLevel'])
+            ->setMethods(['beginTransaction', 'getTransactionLevel', 'getSchemaListener'])
             ->setConstructorArgs(
                 [
                     'string' => $string,
@@ -67,6 +84,7 @@ protected function setUp()
                         'username' => 'user',
                         'password' => 'password',
                     ],
+                    'serializer' => $this->serializerMock
                 ]
             )
             ->getMock();
@@ -84,10 +102,10 @@ protected function setUp()
                     '_commit',
                     '_rollBack',
                     'query',
-                    'fetchRow'
+                    'fetchRow',
+                    'getSchemaListener'
                 ]
-            )
-            ->setConstructorArgs(
+            )->setConstructorArgs(
                 [
                     'string' => $string,
                     'dateTime' => $dateTime,
@@ -98,9 +116,16 @@ protected function setUp()
                         'username' => 'not_valid',
                         'password' => 'not_valid',
                     ],
+                    'serializer' => $this->serializerMock,
                 ]
             )
             ->getMock();
+        $this->_mockAdapter->expects($this->any())
+            ->method('getSchemaListener')
+            ->willReturn($this->schemaListenerMock);
+        $this->_adapter->expects($this->any())
+            ->method('getSchemaListener')
+            ->willReturn($this->schemaListenerMock);
 
         $profiler = $this->createMock(
             \Zend_Db_Profiler::class
@@ -195,7 +220,7 @@ public function testCheckDdlTransaction($ddlQuery)
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Cannot execute multiple queries
+     * @expectedExceptionMessage Multiple queries can't be executed. Run a single query and try again.
      */
     public function testMultipleQueryException()
     {
@@ -290,7 +315,7 @@ public function testAsymmetricRollBackSuccess()
     }
 
     /**
-     * Test successfull nested transaction
+     * Test successful nested transaction
      */
     public function testNestedTransactionCommitSuccess()
     {
@@ -312,7 +337,7 @@ public function testNestedTransactionCommitSuccess()
     }
 
     /**
-     * Test successfull nested transaction
+     * Test successful nested transaction
      */
     public function testNestedTransactionRollBackSuccess()
     {
@@ -334,7 +359,7 @@ public function testNestedTransactionRollBackSuccess()
     }
 
     /**
-     * Test successfull nested transaction
+     * Test successful nested transaction
      */
     public function testNestedTransactionLastRollBack()
     {
@@ -439,7 +464,7 @@ public function testInsertOnDuplicateWithQuotedColumnName()
             'insert' => 'insertValue',
         ];
         $fields = ['select', 'insert'];
-        $sqlQuery = "INSERT INTO `some_table` (`index`,`row`,`select`,`insert`) VALUES (?, ?, ?, ?) "
+        $sqlQuery = "INSERT  INTO `some_table` (`index`,`row`,`select`,`insert`) VALUES (?, ?, ?, ?) "
             . "ON DUPLICATE KEY UPDATE `select` = VALUES(`select`), `insert` = VALUES(`insert`)";
 
         $stmtMock = $this->createMock(\Zend_Db_Statement_Pdo::class);
@@ -464,9 +489,9 @@ public function testAddColumn($options, $expectedQuery)
     {
         $connectionMock = $this->createPartialMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
-            ['tableColumnExists', '_getTableName', 'rawQuery', 'resetDdlCache', 'quote']
+            ['tableColumnExists', '_getTableName', 'rawQuery', 'resetDdlCache', 'quote', 'getSchemaListener']
         );
-
+        $connectionMock->expects($this->any())->method('getSchemaListener')->willReturn($this->schemaListenerMock);
         $connectionMock->expects($this->any())->method('_getTableName')->will($this->returnArgument(0));
         $connectionMock->expects($this->any())->method('quote')->will($this->returnArgument(0));
         $connectionMock->expects($this->once())->method('rawQuery')->with($expectedQuery);
@@ -508,6 +533,9 @@ public function testGetIndexName($name, $fields, $indexType, $expectedName)
         );
     }
 
+    /**
+     * @return array
+     */
     public function getIndexNameDataProvider()
     {
         // 65 characters long - will be compressed
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Ddl/SequenceTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Ddl/SequenceTest.php
index 6410d4258491d..5309a3fd2a426 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Ddl/SequenceTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Ddl/SequenceTest.php
@@ -38,6 +38,9 @@ public function testDropSequence()
         );
     }
 
+    /**
+     * @return array
+     */
     public function createSequenceDdlDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php
index 0915abd98d495..19d6ddfb8e527 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php
@@ -22,6 +22,9 @@ public function testShortenEntityName($in, $prefix, $expectedOut)
         );
     }
 
+    /**
+     * @return array
+     */
     public function shortenEntityNameDataProvider()
     {
         $length64 = '________________________________________________________________';
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php
index 713f6471ded3c..05ec032e76113 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php
@@ -64,6 +64,9 @@ public function testMatch($isCondition)
         $this->assertEquals($select, $result);
     }
 
+    /**
+     * @return array
+     */
     public function matchProvider()
     {
         return [[true], [false]];
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php
index fd8bacaf6a940..722f274d14215 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/ColumnsRendererTest.php
@@ -82,6 +82,9 @@ public function testRender($columns, $sql, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->render($this->selectMock, $sql));
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
index 7ce0ba4e4eb45..2be211a6c3da0 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
@@ -7,8 +7,6 @@
 
 use \Magento\Framework\DB\Select;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
 /**
  * Class SelectTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php
deleted file mode 100644
index 8d3623d485b89..0000000000000
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * \Magento\Framework\DB\Tree\Node test case
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\DB\Test\Unit\Tree;
-
-class NodeTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @param array $data
-     * @param $expectedException
-     * @param $expectedExceptionMessage
-     * @dataProvider constructorDataProvider
-     */
-    public function testConstructorWithInvalidArgumentsThrowsException(
-        array $data,
-        $expectedException,
-        $expectedExceptionMessage
-    ) {
-        $this->expectException($expectedException, $expectedExceptionMessage);
-        new \Magento\Framework\DB\Tree\Node($data['node_data'], $data['keys']);
-    }
-
-    /**
-     * @param array $data
-     * @param string $assertMethod
-     * @dataProvider isParentDataProvider
-     */
-    public function testIsParent(array $data, $assertMethod)
-    {
-        $model = new \Magento\Framework\DB\Tree\Node($data['node_data'], $data['keys']);
-        $this->$assertMethod($model->isParent());
-    }
-
-    /**
-     * @return array
-     */
-    public function isParentDataProvider()
-    {
-        return [
-            [
-                [
-                    'node_data' => [
-                        'id' => 'id',
-                        'pid' => 'pid',
-                        'level' => 'level',
-                        'right_key' => 10,
-                        'left_key' => 5,
-                    ],
-                    'keys' => [
-                        'id' => 'id',
-                        'pid' => 'pid',
-                        'level' => 'level',
-                        'right' => 'right_key',
-                        'left' => 'left_key',
-                    ],
-                ],
-                'assertTrue',
-            ],
-            [
-                [
-                    'node_data' => [
-                        'id' => 'id',
-                        'pid' => 'pid',
-                        'level' => 'level',
-                        'right_key' => 5,
-                        'left_key' => 10,
-                    ],
-                    'keys' => [
-                        'id' => 'id',
-                        'pid' => 'pid',
-                        'level' => 'level',
-                        'right' => 'right_key',
-                        'left' => 'left_key',
-                    ],
-                ],
-                'assertFalse'
-            ]
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function constructorDataProvider()
-    {
-        return [
-            [
-                [
-                    'node_data' => null,
-                    'keys' => null,
-                ], \Magento\Framework\Exception\LocalizedException::class,
-                'Empty array of node information',
-            ],
-            [
-                [
-                    'node_data' => null,
-                    'keys' => true,
-                ], \Magento\Framework\Exception\LocalizedException::class,
-                'Empty array of node information'
-            ],
-            [
-                [
-                    'node_data' => true,
-                    'keys' => null,
-                ], \Magento\Framework\Exception\LocalizedException::class,
-                'Empty keys array'
-            ]
-        ];
-    }
-}
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index e96b5e123f8dd..9890c6ef0d240 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB;
 
 use Magento\Framework\DB\Tree\Node;
@@ -14,6 +15,8 @@
  * Magento Library
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @deprecated Not used anymore.
  */
 class Tree
 {
@@ -76,6 +79,8 @@ class Tree
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     *
+     * @deprecated Not used anymore.
      */
     public function __construct($config = [])
     {
@@ -103,7 +108,9 @@ public function __construct($config = [])
                 $conn->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
             }
         } else {
-            throw new LocalizedException(new Phrase('db object is not set in config'));
+            throw new LocalizedException(
+                new Phrase('The "db object" isn\'t set in config. Set the "db object" and try again.')
+            );
         }
 
         if (!empty($config['table'])) {
@@ -146,6 +153,8 @@ public function __construct($config = [])
      *
      * @param string $name
      * @return $this
+     *
+     * @deprecated Not used anymore.
      */
     public function setIdField($name)
     {
@@ -158,6 +167,8 @@ public function setIdField($name)
      *
      * @param string $name
      * @return $this
+     *
+     * @deprecated Not used anymore.
      */
     public function setLeftField($name)
     {
@@ -170,6 +181,8 @@ public function setLeftField($name)
      *
      * @param string $name
      * @return $this
+     *
+     * @deprecated Not used anymore.
      */
     public function setRightField($name)
     {
@@ -182,6 +195,8 @@ public function setRightField($name)
      *
      * @param string $name
      * @return $this
+     *
+     * @deprecated Not used anymore.
      */
     public function setLevelField($name)
     {
@@ -194,6 +209,8 @@ public function setLevelField($name)
      *
      * @param string $name
      * @return $this
+     *
+     * @deprecated Not used anymore.
      */
     public function setPidField($name)
     {
@@ -206,6 +223,8 @@ public function setPidField($name)
      *
      * @param string $name
      * @return $this
+     *
+     * @deprecated Not used anymore.
      */
     public function setTable($name)
     {
@@ -215,6 +234,8 @@ public function setTable($name)
 
     /**
      * @return array
+     *
+     * @deprecated Not used anymore.
      */
     public function getKeys()
     {
@@ -232,6 +253,8 @@ public function getKeys()
      *
      * @param array $data
      * @return string
+     *
+     * @deprecated Not used anymore.
      */
     public function clear($data = [])
     {
@@ -257,6 +280,8 @@ public function clear($data = [])
      *
      * @param string|int $nodeId
      * @return array
+     *
+     * @deprecated Not used anymore.
      */
     public function getNodeInfo($nodeId)
     {
@@ -276,6 +301,8 @@ public function getNodeInfo($nodeId)
      * @param array $data
      * @return false|string
      * @SuppressWarnings(PHPMD.ExitExpression)
+     *
+     * @deprecated Not used anymore.
      */
     public function appendChild($nodeId, $data)
     {
@@ -342,6 +369,8 @@ public function appendChild($nodeId, $data)
 
     /**
      * @return array
+     *
+     * @deprecated Not used anymore.
      */
     public function checkNodes()
     {
@@ -372,6 +401,8 @@ public function checkNodes()
     /**
      * @param string|int $nodeId
      * @return bool|Node|void
+     *
+     * @deprecated Not used anymore.
      */
     public function removeNode($nodeId)
     {
@@ -447,6 +478,8 @@ public function removeNode($nodeId)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExitExpression)
+     *
+     * @deprecated Not used anymore.
      */
     public function moveNode($eId, $pId, $aId = 0)
     {
@@ -782,6 +815,8 @@ public function moveNode($eId, $pId, $aId = 0)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @SuppressWarnings(PHPMD.ExitExpression)
+     *
+     * @deprecated Not used anymore.
      */
     public function moveNodes($eId, $pId, $aId = 0)
     {
@@ -980,6 +1015,8 @@ public function moveNodes($eId, $pId, $aId = 0)
      * @param string $joinCondition
      * @param string $fields
      * @return void
+     *
+     * @deprecated Not used anymore.
      */
     public function addTable($tableName, $joinCondition, $fields = '*')
     {
@@ -989,6 +1026,8 @@ public function addTable($tableName, $joinCondition, $fields = '*')
     /**
      * @param Select $select
      * @return void
+     *
+     * @deprecated Not used anymore.
      */
     protected function _addExtTablesToSelect(Select &$select)
     {
@@ -1003,6 +1042,8 @@ protected function _addExtTablesToSelect(Select &$select)
      * @param int $endLevel
      * @return NodeSet
      * @SuppressWarnings(PHPMD.ExitExpression)
+     *
+     * @deprecated Not used anymore.
      */
     public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
     {
@@ -1048,6 +1089,8 @@ public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
     /**
      * @param string|int $nodeId
      * @return Node
+     *
+     * @deprecated Not used anymore.
      */
     public function getNode($nodeId)
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree/Node.php b/lib/internal/Magento/Framework/DB/Tree/Node.php
index a11faecb851eb..eb954a696e21e 100644
--- a/lib/internal/Magento/Framework/DB/Tree/Node.php
+++ b/lib/internal/Magento/Framework/DB/Tree/Node.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB\Tree;
 
 use Magento\Framework\Exception\LocalizedException;
 
 /**
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ *
+ * @deprecated Not used anymore.
  */
 class Node
 {
@@ -49,11 +52,15 @@ class Node
 
     /**
      * @var bool
+     *
+     * @deprecated
      */
     public $hasChild = false;
 
     /**
      * @var float|int
+     *
+     * @deprecated
      */
     public $numChild = 0;
 
@@ -61,14 +68,20 @@ class Node
      * @param array $nodeData
      * @param array $keys
      * @throws LocalizedException
+     *
+     * @deprecated
      */
     public function __construct($nodeData, $keys)
     {
         if (empty($nodeData)) {
-            throw new LocalizedException(new \Magento\Framework\Phrase('Empty array of node information'));
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase('The node information is empty. Enter the information and try again.')
+            );
         }
         if (empty($keys)) {
-            throw new LocalizedException(new \Magento\Framework\Phrase('Empty keys array'));
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase("The encryption key can't be empty. Enter the key and try again.")
+            );
         }
 
         $this->id = $nodeData[$keys['id']];
@@ -89,6 +102,8 @@ public function __construct($nodeData, $keys)
     /**
      * @param string $name
      * @return null|array
+     *
+     * @deprecated
      */
     public function getData($name)
     {
@@ -101,6 +116,8 @@ public function getData($name)
 
     /**
      * @return int
+     *
+     * @deprecated
      */
     public function getLevel()
     {
@@ -109,6 +126,8 @@ public function getLevel()
 
     /**
      * @return int
+     *
+     * @deprecated
      */
     public function getLeft()
     {
@@ -117,6 +136,8 @@ public function getLeft()
 
     /**
      * @return int
+     *
+     * @deprecated
      */
     public function getRight()
     {
@@ -125,6 +146,8 @@ public function getRight()
 
     /**
      * @return string|int
+     *
+     * @deprecated
      */
     public function getPid()
     {
@@ -133,6 +156,8 @@ public function getPid()
 
     /**
      * @return string|int
+     *
+     * @deprecated
      */
     public function getId()
     {
@@ -143,6 +168,8 @@ public function getId()
      * Return true if node has child
      *
      * @return bool
+     *
+     * @deprecated
      */
     public function isParent()
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
index 52d67398303bd..75e677b77ae45 100644
--- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
+++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
@@ -8,8 +8,9 @@
 /**
  * TODO implements iterators
  *
+ * @deprecated Not used anymore.
  */
-class NodeSet implements \Iterator
+class NodeSet implements \Iterator, \Countable
 {
     /**
      * @var Node[]
@@ -33,6 +34,8 @@ class NodeSet implements \Iterator
 
     /**
      * Constructor
+     *
+     * @deprecated
      */
     public function __construct()
     {
@@ -45,6 +48,8 @@ public function __construct()
     /**
      * @param Node $node
      * @return int
+     *
+     * @deprecated
      */
     public function addNode(Node $node)
     {
@@ -55,6 +60,8 @@ public function addNode(Node $node)
 
     /**
      * @return int
+     *
+     * @deprecated
      */
     public function count()
     {
@@ -63,6 +70,8 @@ public function count()
 
     /**
      * @return bool
+     *
+     * @deprecated
      */
     public function valid()
     {
@@ -71,6 +80,8 @@ public function valid()
 
     /**
      * @return false|int
+     *
+     * @deprecated
      */
     public function next()
     {
@@ -83,6 +94,8 @@ public function next()
 
     /**
      * @return int
+     *
+     * @deprecated
      */
     public function key()
     {
@@ -91,6 +104,8 @@ public function key()
 
     /**
      * @return Node
+     *
+     * @deprecated
      */
     public function current()
     {
@@ -99,6 +114,8 @@ public function current()
 
     /**
      * @return void
+     *
+     * @deprecated
      */
     public function rewind()
     {
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
index c90ed2b03bf3d..d4811b79980a9 100644
--- a/lib/internal/Magento/Framework/Data/AbstractCriteria.php
+++ b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -274,7 +274,7 @@ public function getLimit()
      */
     public function getPart($name, $default = null)
     {
-        return isset($this->data[$name]) ? $this->data[$name] : $default;
+        return $this->data[$name] ?? $default;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/AbstractDataObject.php b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
index 5916100ffbbfa..da04fecc447cc 100644
--- a/lib/internal/Magento/Framework/Data/AbstractDataObject.php
+++ b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
@@ -50,6 +50,6 @@ public function toArray()
      */
     protected function get($key)
     {
-        return isset($this->data[$key]) ? $this->data[$key] : null;
+        return $this->data[$key] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
index b6426a8d26382..9a881ccf515ab 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php
@@ -28,7 +28,7 @@ public function __construct(InterpreterInterface $itemInterpreter)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @return array
      * @throws \InvalidArgumentException
      */
@@ -90,11 +90,11 @@ private function compareItems($firstItemKey, $secondItemKey, $indexedItems)
         $firstValue = 0;
         $secondValue = 0;
         if (isset($firstItem['sortOrder'])) {
-            $firstValue = intval($firstItem['sortOrder']);
+            $firstValue = (int)$firstItem['sortOrder'];
         }
 
         if (isset($secondItem['sortOrder'])) {
-            $secondValue = intval($secondItem['sortOrder']);
+            $secondValue = (int)$secondItem['sortOrder'];
         }
 
         if ($firstValue == $secondValue) {
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index b0b31fa3751a8..9c789e81913c4 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -285,7 +285,7 @@ public function getSize()
         if ($this->_totalRecords === null) {
             $this->_totalRecords = count($this->getItems());
         }
-        return intval($this->_totalRecords);
+        return (int)$this->_totalRecords;
     }
 
     /**
@@ -487,12 +487,11 @@ public function clear()
     }
 
     /**
-     * Walk through the collection and run model method or external callback
-     * with optional arguments
+     * Walk through the collection and run model method or external callback with optional arguments
      *
      * Returns array with results of callback for each item
      *
-     * @param string $callback
+     * @param callable $callback
      * @param array $args
      * @return array
      */
@@ -743,7 +742,7 @@ public function toArray($arrRequiredFields = [])
     /**
      * Convert items array to array for select options
      *
-     * return items array
+     * Return items array
      * array(
      *      $index => array(
      *          'value' => mixed
@@ -772,6 +771,8 @@ protected function _toOptionArray($valueField = 'id', $labelField = 'name', $add
     }
 
     /**
+     * Returns option array
+     *
      * @return array
      */
     public function toOptionArray()
@@ -780,6 +781,8 @@ public function toOptionArray()
     }
 
     /**
+     * Returns options hash
+     *
      * @return array
      */
     public function toOptionHash()
@@ -790,12 +793,12 @@ public function toOptionHash()
     /**
      * Convert items array to hash for select options
      *
-     * return items hash
+     * Return items hash
      * array($value => $label)
      *
-     * @param   string $valueField
-     * @param   string $labelField
-     * @return  array
+     * @param string $valueField
+     * @param string $labelField
+     * @return array
      */
     protected function _toOptionHash($valueField = 'id', $labelField = 'name')
     {
@@ -809,8 +812,8 @@ protected function _toOptionHash($valueField = 'id', $labelField = 'name')
     /**
      * Retrieve item by id
      *
-     * @param   mixed $idValue
-     * @return  \Magento\Framework\DataObject
+     * @param mixed $idValue
+     * @return \Magento\Framework\DataObject
      */
     public function getItemById($idValue)
     {
@@ -851,7 +854,7 @@ public function count()
      */
     public function getFlag($flag)
     {
-        return isset($this->_flags[$flag]) ? $this->_flags[$flag] : null;
+        return $this->_flags[$flag] ?? null;
     }
 
     /**
@@ -879,6 +882,8 @@ public function hasFlag($flag)
     }
 
     /**
+     * Sleep handler
+     *
      * @return string[]
      * @since 100.0.11
      */
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
index a36a97d0be7f1..308f2a12f506e 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -219,7 +219,7 @@ public function getSize()
             $sql = $this->getSelectCountSql();
             $this->_totalRecords = $this->getConnection()->fetchOne($sql, $this->_bindParams);
         }
-        return intval($this->_totalRecords);
+        return (int)$this->_totalRecords;
     }
 
     /**
@@ -237,7 +237,8 @@ public function getSelectCountSql()
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
         $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
 
-        if (!count($this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP))) {
+        $part = $this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP);
+        if (!is_array($part) || !count($part)) {
             $countSelect->columns(new \Zend_Db_Expr('COUNT(*)'));
             return $countSelect;
         }
@@ -275,7 +276,7 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     }
 
     /**
-     * self::setOrder() alias
+     * Sets order and direction.
      *
      * @param string $field
      * @param string $direction
@@ -364,6 +365,7 @@ protected function _renderFilters()
 
     /**
      * Hook for operations before rendering filters
+     *
      * @return void
      */
     protected function _renderFiltersBefore()
@@ -601,6 +603,7 @@ protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
     }
 
     /**
+     * Returns an items collection.
      * Returns a collection item that corresponds to the fetched row
      * and moves the internal data pointer ahead
      *
@@ -629,7 +632,7 @@ public function fetchItem()
     /**
      * Overridden to use _idFieldName by default.
      *
-     * @param null $valueField
+     * @param string|null $valueField
      * @param string $labelField
      * @param array $additional
      * @return array
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index 67d2a020864dd..330ff4e975e8a 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -243,7 +243,7 @@ protected function _collectRecursive($dir)
             $dir = [$dir];
         }
         foreach ($dir as $folder) {
-            if ($nodes = glob($folder . '/*')) {
+            if ($nodes = glob($folder . '/*', GLOB_NOSORT)) {
                 foreach ($nodes as $node) {
                     $collectedResult[] = $node;
                 }
diff --git a/lib/internal/Magento/Framework/Data/Form.php b/lib/internal/Magento/Framework/Data/Form.php
index fbec614dc3c96..abeda0c17542e 100644
--- a/lib/internal/Magento/Framework/Data/Form.php
+++ b/lib/internal/Magento/Framework/Data/Form.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Data;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
@@ -175,7 +176,9 @@ public function addElementToCollection($element)
     public function checkElementId($elementId)
     {
         if ($this->_elementIdExists($elementId)) {
-            throw new \InvalidArgumentException('Element with id "' . $elementId . '" already exists');
+            throw new \InvalidArgumentException(
+                'An element with a "' . $elementId . '" ID already exists.'
+            );
         }
         return true;
     }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 8db84c27980ad..a8451e43ade20 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -353,8 +353,13 @@ public function getElementHtml()
             $html .= '<label class="addbefore" for="' . $htmlId . '">' . $beforeElementHtml . '</label>';
         }
 
-        $html .= '<input id="' . $htmlId . '" name="' . $this->getName() . '" ' . $this->_getUiId() . ' value="' .
-            $this->getEscapedValue() . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>';
+        if (is_array($this->getValue())) {
+            foreach ($this->getValue() as $value) {
+                $html .= $this->getHtmlForInputByValue($this->_escape($value));
+            }
+        } else {
+            $html .= $this->getHtmlForInputByValue($this->getEscapedValue());
+        }
 
         $afterElementJs = $this->getAfterElementJs();
         if ($afterElementJs) {
@@ -574,4 +579,17 @@ public function isLocked()
     {
         return $this->getData($this->lockHtmlAttribute) == 1;
     }
+
+    /**
+     * Get input html by sting value.
+     *
+     * @param string|null $value
+     *
+     * @return string
+     */
+    private function getHtmlForInputByValue($value)
+    {
+        return '<input id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->_getUiId()
+            . ' value="' . $value . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>';
+    }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
index 76bc4fce5f95c..2a68432207b23 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -121,13 +121,13 @@ public function getChecked($value)
             return;
         }
         if (!is_array($checked)) {
-            $checked = [strval($checked)];
+            $checked = [(string)$checked];
         } else {
             foreach ($checked as $k => $v) {
-                $checked[$k] = strval($v);
+                $checked[$k] = (string)$v;
             }
         }
-        if (in_array(strval($value), $checked)) {
+        if (in_array((string)$value, $checked)) {
             return 'checked';
         }
         return;
@@ -141,13 +141,13 @@ public function getDisabled($value)
     {
         if ($disabled = $this->getData('disabled')) {
             if (!is_array($disabled)) {
-                $disabled = [strval($disabled)];
+                $disabled = [(string)$disabled];
             } else {
                 foreach ($disabled as $k => $v) {
-                    $disabled[$k] = strval($v);
+                    $disabled[$k] = (string)$v;
                 }
             }
-            if (in_array(strval($value), $disabled)) {
+            if (in_array((string)$value, $disabled)) {
                 return 'disabled';
             }
         }
@@ -178,14 +178,6 @@ public function getOnchange($value)
         return;
     }
 
-    //    public function getName($value)
-    //    {
-    //        if ($name = $this->getData('name')) {
-    //            return str_replace('$value', $value, $name);
-    //        }
-    //        return ;
-    //    }
-
     /**
      * @param array $option
      * @return string
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
index 7a544501861bd..ced1f4208223d 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/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index ef85876521d23..c519ecfed4c82 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -9,12 +9,15 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
+/**
+ * Date element
+ */
 class Date extends AbstractElement
 {
     /**
@@ -51,8 +54,7 @@ public function __construct(
     }
 
     /**
-     * If script executes on x64 system, converts large
-     * numeric values to timestamp limit
+     * If script executes on x64 system, converts large numeric values to timestamp limit
      *
      * @param int $value
      * @return int
@@ -83,13 +85,14 @@ public function setValue($value)
             $this->_value = $value;
             return $this;
         }
-        if (preg_match('/^[0-9]+$/', $value)) {
-            $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
-            return $this;
-        }
 
         try {
-            $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
+            if (preg_match('/^[0-9]+$/', $value)) {
+                $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
+            } else {
+                $this->_value = new \DateTime($value);
+                $this->_value->setTimezone(new \DateTimeZone($this->localeDate->getConfigTimezone()));
+            }
         } catch (\Exception $e) {
             $this->_value = '';
         }
@@ -98,6 +101,7 @@ public function setValue($value)
 
     /**
      * Get date value as string.
+     *
      * Format can be specified, or it will be taken from $this->getFormat()
      *
      * @param string $format (compatible with \DateTime)
@@ -167,6 +171,8 @@ public function getElementHtml()
                         'buttonImage' => $this->getImage(),
                         'buttonText' => 'Select Date',
                         'disabled' => $this->getDisabled(),
+                        'minDate' => $this->getMinDate(),
+                        'maxDate' => $this->getMaxDate(),
                     ],
                 ]
             )
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 3af44bc362cd2..b5f2017501c01 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -50,6 +50,8 @@ public function __construct(
     }
 
     /**
+     * Returns buttons translation
+     *
      * @return array
      */
     protected function getButtonTranslations()
@@ -64,10 +66,12 @@ protected function getButtonTranslations()
     }
 
     /**
+     * Returns JS config
+     *
      * @return bool|string
      * @throws \InvalidArgumentException
      */
-    private function getJsonConfig()
+    protected function getJsonConfig()
     {
         if (is_object($this->getConfig()) && method_exists($this->getConfig(), 'toJson')) {
             return $this->getConfig()->toJson();
@@ -79,6 +83,38 @@ private function getJsonConfig()
     }
 
     /**
+     * Fetch config options from plugin.  If $key is passed, return only that option key's value
+     *
+     * @param string $pluginName
+     * @param string|null $key
+     * @return mixed all options or single option if $key is passed; null if nonexistent
+     */
+    public function getPluginConfigOptions($pluginName, $key = null)
+    {
+        if (!is_array($this->getConfig('plugins'))) {
+            return null;
+        }
+
+        $plugins = $this->getConfig('plugins');
+
+        $pluginArrIndex = array_search($pluginName, array_column($plugins, 'name'));
+
+        if ($pluginArrIndex === false || !isset($plugins[$pluginArrIndex]['options'])) {
+            return null;
+        }
+
+        $pluginOptions = $plugins[$pluginArrIndex]['options'];
+
+        if ($key !== null) {
+            return $pluginOptions[$key] ?? null;
+        } else {
+            return $pluginOptions;
+        }
+    }
+
+    /**
+     * Returns element html
+     *
      * @return string
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -143,61 +179,14 @@ public function getElementHtml()
                 ' >' .
                 $this->getEscapedValue() .
                 '</textarea>' .
-                $js .
-                '
-                <script type="text/javascript">
-                //<![CDATA[
-                window.tinyMCE_GZ = window.tinyMCE_GZ || {}; 
-                window.tinyMCE_GZ.loaded = true;
-                require([
-                "jquery", 
-                "mage/translate", 
-                "mage/adminhtml/events", 
-                "mage/adminhtml/wysiwyg/tiny_mce/setup", 
-                "mage/adminhtml/wysiwyg/widget"
-                ], function(jQuery){' .
-                "\n" .
-                '  (function($) {$.mage.translate.add(' .
-                $this->serializer->serialize(
-                    $this->getButtonTranslations()
-                ) .
-                ')})(jQuery);' .
-                "\n" .
-                $jsSetupObject .
-                ' = new wysiwygSetup("' .
-                $this->getHtmlId() .
-                '", ' .
-                $this->getJsonConfig() .
-                ');' .
-                $forceLoad .
-                '
-                    editorFormValidationHandler = ' .
-                $jsSetupObject .
-                '.onFormValidation.bind(' .
-                $jsSetupObject .
-                ');
-                    Event.observe("toggle' .
-                $this->getHtmlId() .
-                '", "click", ' .
-                $jsSetupObject .
-                '.toggle.bind(' .
-                $jsSetupObject .
-                '));
-                    varienGlobalEvents.attachEventHandler("formSubmit", editorFormValidationHandler);
-                    varienGlobalEvents.clearEventHandlers("open_browser_callback");
-                    varienGlobalEvents.attachEventHandler("open_browser_callback", ' .
-                $jsSetupObject .
-                '.openFileBrowser);
-                //]]>
-                });
-                </script>';
+                $js . $this->getInlineJs($jsSetupObject, $forceLoad);
 
             $html = $this->_wrapIntoContainer($html);
             $html .= $this->getAfterElementHtml();
             return $html;
         } else {
             // Display only buttons to additional features
-            if ($this->getConfig('widget_window_url')) {
+            if ($this->getPluginConfigOptions('magentowidget', 'window_url')) {
                 $html = $this->_getButtonsHtml() . $js . parent::getElementHtml();
                 if ($this->getConfig('add_widgets')) {
                     $html .= '<script type="text/javascript">
@@ -218,6 +207,8 @@ public function getElementHtml()
     }
 
     /**
+     * Returns theme
+     *
      * @return mixed
      */
     public function getTheme()
@@ -285,7 +276,7 @@ protected function _getPluginButtonsHtml($visible = true)
                 [
                     'title' => $this->translate('Insert Widget...'),
                     'onclick' => "widgetTools.openDialog('"
-                        . $this->getConfig('widget_window_url')
+                        . $this->getPluginConfigOptions('magentowidget', 'window_url')
                         . "widget_target_id/" . $this->getHtmlId() . "/')",
                     'class' => 'action-add-widget plugin',
                     'style' => $visible ? '' : 'display:none',
@@ -361,6 +352,8 @@ protected function _checkPluginButtonOptions($pluginOptions)
     }
 
     /**
+     * Convert options
+     *
      * Convert options by replacing template constructions ( like {{var_name}} )
      * with data from this element object
      *
@@ -407,6 +400,7 @@ protected function _getButtonHtml($data)
 
     /**
      * Wraps Editor HTML into div if 'use_container' config option is set to true
+     *
      * If 'no_display' config option is set to true, the div will be invisible
      *
      * @param string $html HTML code to wrap
@@ -481,10 +475,80 @@ public function isHidden()
     }
 
     /**
+     * Is Toggle Button Visible
+     *
      * @return bool
      */
     protected function isToggleButtonVisible()
     {
         return !$this->getConfig()->hasData('toggle_button') || $this->getConfig('toggle_button');
     }
+
+    /**
+     * Returns inline js to initialize wysiwyg adapter
+     *
+     * @param string $jsSetupObject
+     * @param string $forceLoad
+     * @return string
+     */
+    protected function getInlineJs($jsSetupObject, $forceLoad)
+    {
+        $jsString = '
+                <script type="text/javascript">
+                //<![CDATA[
+                window.tinyMCE_GZ = window.tinyMCE_GZ || {}; 
+                window.tinyMCE_GZ.loaded = true;
+                require([
+                "jquery", 
+                "mage/translate", 
+                "mage/adminhtml/events", 
+                "mage/adminhtml/wysiwyg/tiny_mce/setup", 
+                "mage/adminhtml/wysiwyg/widget"
+                ], function(jQuery){' .
+            "\n" .
+            '  (function($) {$.mage.translate.add(' .
+            $this->serializer->serialize(
+                $this->getButtonTranslations()
+            ) .
+            ')})(jQuery);' .
+            "\n" .
+            $jsSetupObject .
+            ' = new wysiwygSetup("' .
+            $this->getHtmlId() .
+            '", ' .
+            $this->getJsonConfig() .
+            ');' .
+            $forceLoad .
+            '
+                    editorFormValidationHandler = ' .
+            $jsSetupObject .
+            '.onFormValidation.bind(' .
+            $jsSetupObject .
+            ');
+                    Event.observe("toggle' .
+            $this->getHtmlId() .
+            '", "click", ' .
+            $jsSetupObject .
+            '.toggle.bind(' .
+            $jsSetupObject .
+            '));
+                    varienGlobalEvents.attachEventHandler("formSubmit", editorFormValidationHandler);
+                    varienGlobalEvents.clearEventHandlers("open_browser_callback");
+                    varienGlobalEvents.attachEventHandler("open_browser_callback", ' .
+            $jsSetupObject .
+            '.openFileBrowser);
+                //]]>
+                });
+                </script>';
+        return $jsString;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getHtmlId()
+    {
+        $suffix = $this->getConfig('dynamic_id') ? '${ $.wysiwygUniqueSuffix }' : '';
+        return parent::getHtmlId() . $suffix;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Factory.php b/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
index 69f9fb18411d9..582b0c8cf6549 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Factory.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\ObjectManagerInterface;
 
+/**
+ * Form element Factory
+ */
 class Factory
 {
     /**
@@ -81,7 +81,7 @@ public function create($elementType, array $config = [])
         $element = $this->_objectManager->create($className, $config);
         if (!$element instanceof AbstractElement) {
             throw new \InvalidArgumentException(
-                $className . ' doesn\'n extend \Magento\Framework\Data\Form\Element\AbstractElement'
+                $className . ' doesn\'t extend \Magento\Framework\Data\Form\Element\AbstractElement'
             );
         }
         return $element;
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
index 66b1299b98696..90482ab55fc71 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
@@ -43,7 +43,8 @@ public function __construct(
      */
     public function getElementHtml()
     {
-        $html = '<fieldset id="' . $this->getHtmlId() . '"' . $this->serialize(
+        $html = $this->getBeforeElementHtml();
+        $html .= '<fieldset area-hidden="false" id="' . $this->getHtmlId() . '"' . $this->serialize(
             ['class']
         ) . $this->_getUiId() . '>' . "\n";
         if ($this->getLegend()) {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index be043bab8bbf9..03daa6c08fff4 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -57,8 +57,14 @@ public function getElementHtml()
         $this->addClass('select multiselect admin__control-multiselect');
         $html = '';
         if ($this->getCanBeEmpty()) {
-            $html .= '<input type="hidden" name="' . parent::getName() . '" value="" />';
+            $html .= '
+                <input type="hidden" id="' . $this->getHtmlId() . '_hidden" name="' . parent::getName() . '" value="" />
+                ';
         }
+        if (!empty($this->_data['disabled'])) {
+            $html .= '<input type="hidden" name="' . parent::getName() . '_disabled" value="" />';
+        }
+
         $html .= '<select id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->serialize(
             $this->getHtmlAttributes()
         ) . $this->_getUiId() . ' multiple="multiple">' . "\n";
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Text.php b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
index eb157c7279a71..2f001eb10307b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Text.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Form text element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
+/**
+ * Form text element
+ */
 class Text extends AbstractElement
 {
     /**
@@ -65,6 +63,7 @@ public function getHtmlAttributes()
             'placeholder',
             'data-form-part',
             'data-role',
+            'data-validation-params',
             'data-action'
         ];
     }
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Date.php b/lib/internal/Magento/Framework/Data/Form/Filter/Date.php
index 8765e136e2897..864c0f3e27e69 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Date.php
@@ -54,6 +54,10 @@ public function __construct(
      */
     public function inputFilter($value)
     {
+        if (!$value) {
+            return $value;
+        }
+
         $filterInput = new \Zend_Filter_LocalizedToNormalized(
             ['date_format' => $this->_dateFormat, 'locale' => $this->localeResolver->getLocale()]
         );
@@ -74,6 +78,10 @@ public function inputFilter($value)
      */
     public function outputFilter($value)
     {
+        if (!$value) {
+            return $value;
+        }
+
         $filterInput = new \Zend_Filter_LocalizedToNormalized(
             ['date_format' => DateTime::DATE_INTERNAL_FORMAT, 'locale' => $this->localeResolver->getLocale()]
         );
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Trim.php b/lib/internal/Magento/Framework/Data/Form/Filter/Trim.php
new file mode 100644
index 0000000000000..0dbbcf6dbf8d0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Trim.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Form Input/Output Trim Filter
+ *
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+namespace Magento\Framework\Data\Form\Filter;
+
+class Trim implements \Magento\Framework\Data\Form\Filter\FilterInterface
+{
+    /**
+     * Returns the result of filtering $value
+     *
+     * @param string $value
+     * @return string
+     */
+    public function inputFilter($value)
+    {
+        return trim($value, ' ');
+    }
+
+    /**
+     * Returns the result of filtering $value
+     *
+     * @param string $value
+     * @return string
+     */
+    public function outputFilter($value)
+    {
+        return $value;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Data/Form/FilterFactory.php b/lib/internal/Magento/Framework/Data/Form/FilterFactory.php
index 2763e8bd17cce..22dfabb8fb565 100644
--- a/lib/internal/Magento/Framework/Data/Form/FilterFactory.php
+++ b/lib/internal/Magento/Framework/Data/Form/FilterFactory.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Data\Form\Filter\FilterInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Phrase;
 
 class FilterFactory
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
index 0dbc9c879462e..225ff1fd140a9 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Data\Form\FormKey;
 
+use Magento\Framework\Encryption\Helper\Security;
+
 /**
  * @api
  */
@@ -32,9 +34,7 @@ public function __construct(\Magento\Framework\Data\Form\FormKey $formKey)
     public function validate(\Magento\Framework\App\RequestInterface $request)
     {
         $formKey = $request->getParam('form_key', null);
-        if (!$formKey || $formKey !== $this->_formKey->getFormKey()) {
-            return false;
-        }
-        return true;
+        
+        return $formKey && Security::compareStrings($formKey, $this->_formKey->getFormKey());
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
index 9cbee9c0e67c1..561a3c66ebcc6 100644
--- a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
+++ b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
@@ -188,8 +188,8 @@ public function toArray($arrRequiredFields = [])
     }
 
     /**
-     * @param null $valueField
-     * @param null $labelField
+     * @param string|null $valueField
+     * @param string|null $labelField
      * @param array $additional
      * @return array
      */
diff --git a/lib/internal/Magento/Framework/Data/Structure.php b/lib/internal/Magento/Framework/Data/Structure.php
index 9d540e8a49f08..b22395f1ba835 100644
--- a/lib/internal/Magento/Framework/Data/Structure.php
+++ b/lib/internal/Magento/Framework/Data/Structure.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Data;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -63,7 +64,7 @@ public function importElements(array $elements)
                     if ($group !== array_flip($group)) {
                         throw new LocalizedException(
                             new \Magento\Framework\Phrase(
-                                "Invalid format of group '%1': %2",
+                                '"%2" is an invalid format of "%1" group. Verify the format and try again.',
                                 [$groupName, var_export($group, 1)]
                             )
                         );
@@ -94,7 +95,8 @@ protected function _assertParentRelation($elementId)
             if (empty($this->_elements[$parentId][self::CHILDREN][$elementId])) {
                 throw new LocalizedException(
                     new \Magento\Framework\Phrase(
-                        "Broken parent-child relation: the '%1' is not in the nested set of '%2'.",
+                        'The "%1" is not in the nested set of "%2", causing the parent-child relation to break. '
+                        . 'Verify and try again.',
                         [$elementId, $parentId]
                     )
                 );
@@ -107,7 +109,10 @@ protected function _assertParentRelation($elementId)
             $this->_assertArray($children);
             if ($children !== array_flip(array_flip($children))) {
                 throw new LocalizedException(
-                    new \Magento\Framework\Phrase('Invalid format of children: %1', [var_export($children, 1)])
+                    new \Magento\Framework\Phrase(
+                        'The "%1" format of children is invalid. Verify and try again.',
+                        [var_export($children, 1)]
+                    )
                 );
             }
             foreach (array_keys($children) as $childId) {
@@ -118,7 +123,8 @@ protected function _assertParentRelation($elementId)
                 ) {
                     throw new LocalizedException(
                         new \Magento\Framework\Phrase(
-                            "Broken parent-child relation: the '%1' is supposed to have '%2' as parent.",
+                            'The "%1" doesn\'t have "%2" as parent, causing the parent-child relation to break. '
+                            . 'Verify and try again.',
                             [$childId, $elementId]
                         )
                     );
@@ -149,7 +155,7 @@ public function createElement($elementId, array $data)
     {
         if (isset($this->_elements[$elementId])) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase("Element with ID '%1' already exists.", [$elementId])
+                new \Magento\Framework\Phrase('An element with a "%1" ID already exists.', [$elementId])
             );
         }
         $this->_elements[$elementId] = [];
@@ -166,7 +172,7 @@ public function createElement($elementId, array $data)
      */
     public function getElement($elementId)
     {
-        return isset($this->_elements[$elementId]) ? $this->_elements[$elementId] : false;
+        return $this->_elements[$elementId] ?? false;
     }
 
     /**
@@ -225,7 +231,7 @@ public function setAttribute($elementId, $attribute, $value)
                 // break is intentionally omitted
             case self::CHILDREN:
             case self::GROUPS:
-                throw new \InvalidArgumentException("Attribute '{$attribute}' is reserved and cannot be set.");
+                throw new \InvalidArgumentException("The '{$attribute}' attribute is reserved and can't be set.");
             default:
                 $this->_elements[$elementId][$attribute] = $value;
         }
@@ -261,7 +267,7 @@ public function renameElement($oldId, $newId)
         $this->_assertElementExists($oldId);
         if (!$newId || isset($this->_elements[$newId])) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase("Element with ID '%1' is already defined.", [$newId])
+                new \Magento\Framework\Phrase('An element with a "%1" ID is already defined.', [$newId])
             );
         }
 
@@ -303,13 +309,17 @@ public function setAsChild($elementId, $parentId, $alias = '', $position = null)
     {
         if ($elementId == $parentId) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase("The '%1' cannot be set as child to itself.", [$elementId])
+                new \Magento\Framework\Phrase(
+                    'The "%1" was incorrectly set as a child to itself. Resolve the issue and try again.',
+                    [$elementId]
+                )
             );
         }
         if ($this->_isParentRecursively($elementId, $parentId)) {
             throw new LocalizedException(
                 new \Magento\Framework\Phrase(
-                    "The '%1' is a parent of '%2' recursively, therefore '%3' cannot be set as child to it.",
+                    'The "%3" cannot be set as child to "%1" because "%1" is a parent of "%2" recursively. '
+                    . 'Resolve the issue and try again.',
                     [$elementId, $parentId, $elementId]
                 )
             );
@@ -456,9 +466,7 @@ public function getChildId($parentId, $alias)
      */
     public function getChildren($parentId)
     {
-        return isset(
-            $this->_elements[$parentId][self::CHILDREN]
-        ) ? $this->_elements[$parentId][self::CHILDREN] : [];
+        return $this->_elements[$parentId][self::CHILDREN] ?? [];
     }
 
     /**
@@ -469,7 +477,7 @@ public function getChildren($parentId)
      */
     public function getParentId($childId)
     {
-        return isset($this->_elements[$childId][self::PARENT]) ? $this->_elements[$childId][self::PARENT] : false;
+        return $this->_elements[$childId][self::PARENT] ?? false;
     }
 
     /**
@@ -542,7 +550,10 @@ protected function _getChildOffset($parentId, $childId)
         $index = array_search($childId, array_keys($this->getChildren($parentId)));
         if (false === $index) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase("The '%1' is not a child of '%2'.", [$childId, $parentId])
+                new \Magento\Framework\Phrase(
+                    'The "%1" is not a child of "%2". Resolve the issue and try again.',
+                    [$childId, $parentId]
+                )
             );
         }
         return $index;
@@ -595,7 +606,7 @@ protected function _insertChild($targetParentId, $elementId, $offset, $alias)
         if (!empty($this->_elements[$elementId][self::PARENT])) {
             throw new LocalizedException(
                 new \Magento\Framework\Phrase(
-                    "The element '%1' already has a parent: '%2'",
+                    'The element "%1" can\'t have a parent because "%2" is already the parent of "%1".',
                     [$elementId, $this->_elements[$elementId][self::PARENT]]
                 )
             );
@@ -604,13 +615,16 @@ protected function _insertChild($targetParentId, $elementId, $offset, $alias)
         $children = $this->getChildren($targetParentId);
         if (isset($children[$elementId])) {
             throw new LocalizedException(
-                new \Magento\Framework\Phrase("The element '%1' already a child of '%2'", [$elementId, $targetParentId])
+                new \Magento\Framework\Phrase(
+                    'The element "%1" is already a child of "%2".',
+                    [$elementId, $targetParentId]
+                )
             );
         }
         if (false !== array_search($alias, $children)) {
             throw new LocalizedException(
                 new \Magento\Framework\Phrase(
-                    "The element '%1' already has a child with alias '%2'",
+                    'The element "%1" can\'t have a child because "%1" already has a child with alias "%2".',
                     [$targetParentId, $alias]
                 )
             );
@@ -638,7 +652,9 @@ protected function _insertChild($targetParentId, $elementId, $offset, $alias)
     private function _assertElementExists($elementId)
     {
         if (!isset($this->_elements[$elementId])) {
-            throw new \OutOfBoundsException("No element found with ID '{$elementId}'.");
+            throw new \OutOfBoundsException(
+                'The element with the "' . $elementId . '" ID wasn\'t found. Verify the ID and try again.'
+            );
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
index 20a0b384bad7e..9387ffbfed7a6 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
@@ -38,6 +38,9 @@ public function testEvaluateException($inputData)
         $this->_model->evaluate($inputData);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateExceptionDataProvider()
     {
         return [
@@ -62,6 +65,9 @@ public function testEvaluate(array $input, array $expected)
         $this->assertSame($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
index 768b8d3b9efa2..37d840b40ca47 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
@@ -55,10 +55,14 @@ public function testConstructWrongInterpreter()
      */
     public function testEvaluateWrongDiscriminator($input, $expectedExceptionMessage)
     {
-        $this->expectException('\InvalidArgumentException', $expectedExceptionMessage);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
         $this->_model->evaluate($input);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateWrongDiscriminatorDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
index bec2a37545e65..8981f5adb2e1a 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
@@ -30,6 +30,9 @@ public function testEvaluateException($input)
         $this->_model->evaluate($input);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateExceptionDataProvider()
     {
         return ['no value' => [[]], 'non-numeric value' => [['value' => 'non-numeric']]];
@@ -47,6 +50,9 @@ public function testEvaluate($input, $expected)
         $this->assertSame($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
index 5eea3f8790711..63eccb098bf0d 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php
@@ -296,6 +296,9 @@ public function testPrintLogQueryPrinting($printQuery, $printFlag, $query, $expe
         $this->collection->printLogQuery($printQuery, false, $query);
     }
 
+    /**
+     * @return array
+     */
     public function printLogQueryPrintingDataProvider()
     {
         return [
@@ -319,6 +322,9 @@ public function testPrintLogQueryLogging($logQuery, $logFlag, $expectedCalls)
         $this->collection->printLogQuery(false, $logQuery, 'some_query');
     }
 
+    /**
+     * @return array
+     */
     public function printLogQueryLoggingDataProvider()
     {
         return [
@@ -527,6 +533,9 @@ public function testDistinct($flag, $expectedFlag)
         $this->collection->distinct($flag);
     }
 
+    /**
+     * @return array
+     */
     public function distinctDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
index a34fdf21f7ab4..baeeb4ff6f5e3 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
@@ -54,8 +54,8 @@ protected function setUp()
 
     public function testGetElementHtmlException()
     {
-        $this->expectException(
-            'Exception',
+        $this->expectException('Exception');
+        $this->expectExceptionMessage(
             'Output format is not specified. Please specify "format" key in constructor, or set it using setFormat().'
         );
         $formMock = $this->getFormMock('never');
@@ -80,6 +80,9 @@ public function testGetElementHtmlDateFormat($fieldName)
         $this->model->getElementHtml();
     }
 
+    /**
+     * @return array
+     */
     public function providerGetElementHtmlDateFormat()
     {
         return [
@@ -88,6 +91,10 @@ public function providerGetElementHtmlDateFormat()
         ];
     }
 
+    /**
+     * @param $exactly
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getFormMock($exactly)
     {
         $functions = ['getFieldNameSuffix', 'getHtmlIdPrefix', 'getHtmlIdSuffix'];
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
index 93d35d5883c47..47eae73d8cd8c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -20,20 +20,58 @@ protected function setUp()
     }
 
     /**
-     * Verify that hidden input is present in multiselect
+     * Verify that hidden input is present in multiselect.
      *
      * @covers \Magento\Framework\Data\Form\Element\Multiselect::getElementHtml
+     * @return void
      */
     public function testHiddenFieldPresentInMultiSelect()
     {
-        $this->_model->setDisabled(true);
+        $fieldName = 'fieldName';
+        $fieldId = 'fieldId';
         $this->_model->setCanBeEmpty(true);
+        $this->_model->setName($fieldName);
+        $this->_model->setId($fieldId);
+        $elementHtml = $this->_model->getElementHtml();
+        $this->assertContains(
+            '<input type="hidden" id="' . $fieldId . '_hidden" name="' . $fieldName . '"',
+            $elementHtml
+        );
+    }
+
+    /**
+     * Verify that hidden input is present in multiselect when multiselect is disabled.
+     *
+     * @return void
+     */
+    public function testHiddenDisabledFieldPresentInMultiSelect()
+    {
+        $fieldName = 'fieldName';
+        $this->_model->setDisabled(true);
+        $this->_model->setName($fieldName);
         $elementHtml = $this->_model->getElementHtml();
-        $this->assertContains('<input type="hidden"', $elementHtml);
+        $this->assertContains('<input type="hidden" name="' . $fieldName . '_disabled"', $elementHtml);
     }
 
     /**
-     * Verify that js element is added
+     * Verify that hidden input is not present in multiselect when multiselect is not disabled.
+     *
+     * @covers \Magento\Framework\Data\Form\Element\Multiselect::getElementHtml
+     * @return void
+     */
+    public function testHiddenDisabledFieldNotPresentInMultiSelect()
+    {
+        $fieldName = 'fieldName';
+        $this->_model->setDisabled(false);
+        $this->_model->setName($fieldName);
+        $elementHtml = $this->_model->getElementHtml();
+        $this->assertNotContains('<input type="hidden" name="' . $fieldName . '_disabled"', $elementHtml);
+    }
+
+    /**
+     * Verify that js element is added.
+     *
+     * @return void
      */
     public function testGetAfterElementJs()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php
index 9e23610b97668..8b9de2c63953f 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKey/ValidatorTest.php
@@ -50,6 +50,9 @@ public function testValidate($formKey, $expected)
         $this->assertEquals($expected, $this->_model->validate($this->_requestMock));
     }
 
+    /**
+     * @return array
+     */
     public function validateDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php
index 89aff747238a1..fdda09d1462b1 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php
@@ -104,7 +104,7 @@ public function testSettersGetters()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Element with id "1" already exists
+     * @expectedExceptionMessage An element with a "1" ID already exists.
      */
     public function testElementExistsException()
     {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
index 58e6378759010..e91ec72dae112 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
@@ -40,7 +40,7 @@ public function testOffsets()
         $this->assertSame($this->collection->offsetExists('node1'), true);
         $this->collection->offsetSet('node1', 'Hello');
         $this->assertSame($this->collection->offsetExists('node1'), true);
-        $this->assertSame($this->collection->offsetget('node1'), 'Hello');
+        $this->assertSame($this->collection->offsetGet('node1'), 'Hello');
         $this->collection->offsetUnset('node1');
         $this->assertSame($this->collection->offsetExists('node1'), false);
     }
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
index 832fd18b48606..94990c0340a83 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/Data/Wysiwyg/ConfigProviderInterface.php b/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php
new file mode 100644
index 0000000000000..dc1dabd42d9e8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.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\Data\Wysiwyg;
+
+/**
+ * Interface ConfigProviderInterface
+ * @api
+ */
+interface ConfigProviderInterface
+{
+    /**
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject;
+}
diff --git a/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php b/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
index 62e7500a302a6..bbf10e9f574cf 100644
--- a/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
+++ b/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
@@ -10,12 +10,13 @@
  */
 class Normalizer
 {
-
     const WYSIWYG_RESERVED_CHARACTERS_REPLACEMENT_MAP = [
         '{' => '^[',
         '}' => '^]',
         '"' => '`',
         '\\' => '|',
+        '<' => '^(',
+        '>' => '^)'
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/DataObject/Copy.php b/lib/internal/Magento/Framework/DataObject/Copy.php
index 728f72e713d7f..8d8896c6cb62a 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Framework\DataObject;
+
 /**
  * Utility class for copying data sets between objects
  */
-namespace Magento\Framework\DataObject;
-
 class Copy
 {
     /**
@@ -116,14 +116,13 @@ protected function dispatchCopyFieldSetEvent($fieldset, $aspect, $source, $targe
     }
 
     /**
-     * Get data from object|array to object|array containing fields
-     * from fieldset matching an aspect.
+     * Get data from object|array to object|array containing fields from fieldset matching an aspect.
      *
      * @param string $fieldset
      * @param string $aspect a field name
      * @param array|\Magento\Framework\DataObject $source
      * @param string $root
-     * @return array $data
+     * @return array
      *
      * @api
      */
@@ -232,7 +231,7 @@ protected function _setFieldsetFieldValue($target, $targetCode, $value)
     /**
      * Access the extension get method
      *
-     * @param \Magento\Framework\Api\ExtensibleDataInterface $object
+     * @param \Magento\Framework\Api\ExtensibleDataInterface $source
      * @param string $code
      *
      * @return mixed
@@ -265,7 +264,7 @@ protected function getAttributeValueFromExtensibleDataObject($source, $code)
     /**
      * Access the extension set method
      *
-     * @param \Magento\Framework\Api\ExtensibleDataInterface $object
+     * @param \Magento\Framework\Api\ExtensibleDataInterface $target
      * @param string $code
      * @param mixed $value
      *
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config.php b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
index 2ad80321eb1fe..fa3ab6e2f7ce6 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
@@ -44,6 +44,6 @@ public function getFieldset($name, $root = 'global')
         if (empty($fieldsets)) {
             return null;
         }
-        return isset($fieldsets[$name]) ? $fieldsets[$name] : null;
+        return $fieldsets[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php
index c7417439bac1f..0d35b3a4264e0 100644
--- a/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\DataObject\Test\Unit\Copy\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php b/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php
index 677e4d654e52c..d2e16700bc904 100644
--- a/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php
+++ b/lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DomDocument;
 
 /**
diff --git a/lib/internal/Magento/Framework/Encryption/Adapter/EncryptionAdapterInterface.php b/lib/internal/Magento/Framework/Encryption/Adapter/EncryptionAdapterInterface.php
new file mode 100644
index 0000000000000..b9bbb089ae0cc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Encryption/Adapter/EncryptionAdapterInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Encryption\Adapter;
+
+interface EncryptionAdapterInterface
+{
+    /**
+     * @param $data
+     * @return string
+     */
+    public function encrypt(string $data): string;
+
+    /**
+     * @param string $data
+     * @return string
+     */
+    public function decrypt(string $data): string;
+}
diff --git a/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php b/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php
new file mode 100644
index 0000000000000..c2e82a6a7f6f8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Encryption/Adapter/Mcrypt.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Encryption\Adapter;
+
+/**
+ * Mcrypt adapter for decrypting values using legacy ciphers
+ */
+class Mcrypt implements EncryptionAdapterInterface
+{
+    /**
+     * @var string
+     */
+    private $cipher;
+
+    /**
+     * @var string
+     */
+    private $mode;
+
+    /**
+     * @var string
+     */
+    private $initVector;
+
+    /**
+     * Encryption algorithm module handle
+     *
+     * @var resource
+     */
+    private $handle;
+
+    /**
+     * Mcrypt constructor.
+     * @param string $key
+     * @param string $cipher
+     * @param string $mode
+     * @param string $initVector
+     * @throws \Exception
+     */
+    public function __construct(
+        string $key,
+        string $cipher = MCRYPT_BLOWFISH,
+        string $mode = MCRYPT_MODE_ECB,
+        string $initVector = null
+    ) {
+        $this->cipher = $cipher;
+        $this->mode = $mode;
+        // @codingStandardsIgnoreLine
+        $this->handle = @mcrypt_module_open($cipher, '', $mode, '');
+        try {
+            // @codingStandardsIgnoreLine
+            $maxKeySize = @mcrypt_enc_get_key_size($this->handle);
+            if (strlen($key) > $maxKeySize) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    new \Magento\Framework\Phrase('Key must not exceed %1 bytes.', [$maxKeySize])
+                );
+            }
+            // @codingStandardsIgnoreLine
+            $initVectorSize = @mcrypt_enc_get_iv_size($this->handle);
+            if (null === $initVector) {
+                /* Set vector to zero bytes to not use it */
+                $initVector = str_repeat("\0", $initVectorSize);
+            } elseif (!is_string($initVector) || strlen($initVector) != $initVectorSize) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    new \Magento\Framework\Phrase(
+                        'Init vector must be a string of %1 bytes.',
+                        [$initVectorSize]
+                    )
+                );
+            }
+            $this->initVector = $initVector;
+        } catch (\Exception $e) {
+            // @codingStandardsIgnoreLine
+            @mcrypt_module_close($this->handle);
+            throw new \Magento\Framework\Exception\LocalizedException(new \Magento\Framework\Phrase($e->getMessage()));
+        }
+        // @codingStandardsIgnoreLine
+        @mcrypt_generic_init($this->handle, $key, $initVector);
+    }
+
+    /**
+     * Destructor frees allocated resources
+     */
+    public function __destruct()
+    {
+        // @codingStandardsIgnoreStart
+        @mcrypt_generic_deinit($this->handle);
+        @mcrypt_module_close($this->handle);
+        // @codingStandardsIgnoreEnd
+    }
+
+    /**
+     * Retrieve a name of currently used cryptographic algorithm
+     *
+     * @return string
+     */
+    public function getCipher(): string
+    {
+        return $this->cipher;
+    }
+
+    /**
+     * Mode in which cryptographic algorithm is running
+     *
+     * @return string
+     */
+    public function getMode(): string
+    {
+        return $this->mode;
+    }
+
+    /**
+     * Retrieve an actual value of initial vector that has been used to initialize a cipher
+     *
+     * @return string
+     */
+    public function getInitVector(): ?string
+    {
+        return $this->initVector;
+    }
+
+    /**
+     * Get the current mcrypt handle
+     *
+     * @return resource
+     */
+    public function getHandle()
+    {
+        return $this->handle;
+    }
+
+    /**
+     * Encrypt a string
+     *
+     * @param  string $data String to encrypt
+     * @return string
+     * @throws \Exception
+     */
+    public function encrypt(string $data): string
+    {
+        if (strlen($data) == 0) {
+            return $data;
+        }
+        // @codingStandardsIgnoreLine
+        return @mcrypt_generic($this->getHandle(), $data);
+    }
+
+    /**
+     * Decrypt a string
+     *
+     * @param string $data
+     * @return string
+     */
+    public function decrypt(string $data): string
+    {
+        if (strlen($data) == 0) {
+            return $data;
+        }
+        // @codingStandardsIgnoreLine
+        $data = @mdecrypt_generic($this->handle, $data);
+        /*
+         * Returned string can in fact be longer than the unencrypted string due to the padding of the data
+         * @link http://www.php.net/manual/en/function.mdecrypt-generic.php
+         */
+        $data = rtrim($data, "\0");
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php b/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php
new file mode 100644
index 0000000000000..9f9facf98ff84
--- /dev/null
+++ b/lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Encryption\Adapter;
+
+/**
+ * Sodium adapter for encrypting and decrypting strings
+ */
+class SodiumChachaIetf implements EncryptionAdapterInterface
+{
+    /**
+     * @var string
+     */
+    private $key;
+
+    /**
+     * Sodium constructor.
+     * @param string $key
+     */
+    public function __construct(
+        string $key
+    ) {
+        $this->key = $key;
+    }
+
+    /**
+     * Encrypt a string
+     *
+     * @param string $data
+     * @return string string
+     */
+    public function encrypt(string $data): string
+    {
+        $nonce = random_bytes(SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES);
+        $cipherText = sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
+            (string)$data,
+            $nonce,
+            $nonce,
+            $this->key
+        );
+
+        return $nonce . $cipherText;
+    }
+
+    /**
+     * Decrypt a string
+     *
+     * @param string $data
+     * @return string
+     */
+    public function decrypt(string $data): string
+    {
+        $nonce = mb_substr($data, 0, SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES, '8bit');
+        $payload = mb_substr($data, SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES, null, '8bit');
+
+        $plainText = sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
+            $payload,
+            $nonce,
+            $nonce,
+            $this->key
+        );
+
+        return $plainText;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
index c304cdb23f85e..d52db40b395ab 100644
--- a/lib/internal/Magento/Framework/Encryption/Crypt.php
+++ b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Framework\Encryption;
 
 /**
  * Class encapsulates cryptographic algorithm
  *
  * @api
+ * @deprecated
  */
 class Crypt
 {
@@ -29,11 +32,11 @@ class Crypt
     protected $_initVector;
 
     /**
-     * Encryption algorithm module handle
+     * Mcrypt adapter
      *
-     * @var resource
+     * @var \Magento\Framework\Encryption\Adapter\Mcrypt
      */
-    protected $_handle;
+    private $mcrypt;
 
     /**
      * Constructor
@@ -53,64 +56,30 @@ public function __construct(
         $mode = MCRYPT_MODE_ECB,
         $initVector = false
     ) {
-        $this->_cipher = $cipher;
-        $this->_mode = $mode;
-        // @codingStandardsIgnoreStart
-        $this->_handle = @mcrypt_module_open($cipher, '', $mode, '');
-        // @codingStandardsIgnoreEnd
-        try {
-            // @codingStandardsIgnoreStart
-            $maxKeySize = @mcrypt_enc_get_key_size($this->_handle);
-            // @codingStandardsIgnoreEnd
-            if (strlen($key) > $maxKeySize) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase('Key must not exceed %1 bytes.', [$maxKeySize])
-                );
-            }
+        if (true === $initVector) {
             // @codingStandardsIgnoreStart
-            $initVectorSize = @mcrypt_enc_get_iv_size($this->_handle);
+            $handle = @mcrypt_module_open($cipher, '', $mode, '');
+            $initVectorSize = @mcrypt_enc_get_iv_size($handle);
             // @codingStandardsIgnoreEnd
-            if (true === $initVector) {
-                /* Generate a random vector from human-readable characters */
-                $abc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-                $initVector = '';
-                for ($i = 0; $i < $initVectorSize; $i++) {
-                    $initVector .= $abc[rand(0, strlen($abc) - 1)];
-                }
-            } elseif (false === $initVector) {
-                /* Set vector to zero bytes to not use it */
-                $initVector = str_repeat("\0", $initVectorSize);
-            } elseif (!is_string($initVector) || strlen($initVector) != $initVectorSize) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    new \Magento\Framework\Phrase(
-                        'Init vector must be a string of %1 bytes.',
-                        [$initVectorSize]
-                    )
-                );
+
+            /* Generate a random vector from human-readable characters */
+            $allowedCharacters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+            $initVector = '';
+            for ($i = 0; $i < $initVectorSize; $i++) {
+                $initVector .= $allowedCharacters[rand(0, strlen($allowedCharacters) - 1)];
             }
-            $this->_initVector = $initVector;
-        } catch (\Exception $e) {
             // @codingStandardsIgnoreStart
-            @mcrypt_module_close($this->_handle);
+            @mcrypt_generic_deinit($handle);
+            @mcrypt_module_close($handle);
             // @codingStandardsIgnoreEnd
-            throw $e;
         }
-        // @codingStandardsIgnoreStart
-        @mcrypt_generic_init($this->_handle, $key, $initVector);
-        // @codingStandardsIgnoreEnd
-    }
 
-    /**
-     * Destructor frees allocated resources
-     */
-    public function __destruct()
-    {
-        // @codingStandardsIgnoreStart
-        @mcrypt_generic_deinit($this->_handle);
-        // @codingStandardsIgnoreEnd
-        // @codingStandardsIgnoreStart
-        @mcrypt_module_close($this->_handle);
-        // @codingStandardsIgnoreEnd
+        $this->mcrypt = new \Magento\Framework\Encryption\Adapter\Mcrypt(
+            $key,
+            $cipher,
+            $mode,
+            $initVector === false ? null : $initVector
+        );
     }
 
     /**
@@ -120,7 +89,7 @@ public function __destruct()
      */
     public function getCipher()
     {
-        return $this->_cipher;
+        return $this->mcrypt->getCipher();
     }
 
     /**
@@ -130,7 +99,7 @@ public function getCipher()
      */
     public function getMode()
     {
-        return $this->_mode;
+        return $this->mcrypt->getMode();
     }
 
     /**
@@ -140,7 +109,7 @@ public function getMode()
      */
     public function getInitVector()
     {
-        return $this->_initVector;
+        return $this->mcrypt->getInitVector();
     }
 
     /**
@@ -154,9 +123,8 @@ public function encrypt($data)
         if (strlen($data) == 0) {
             return $data;
         }
-        // @codingStandardsIgnoreStart
-        return @mcrypt_generic($this->_handle, $data);
-        // @codingStandardsIgnoreEnd
+        // @codingStandardsIgnoreLine
+        return @mcrypt_generic($this->mcrypt->getHandle(), $data);
     }
 
     /**
@@ -167,17 +135,6 @@ public function encrypt($data)
      */
     public function decrypt($data)
     {
-        if (strlen($data) == 0) {
-            return $data;
-        }
-        // @codingStandardsIgnoreStart
-        $data = @mdecrypt_generic($this->_handle, $data);
-        // @codingStandardsIgnoreEnd
-        /*
-         * Returned string can in fact be longer than the unencrypted string due to the padding of the data
-         * @link http://www.php.net/manual/en/function.mdecrypt-generic.php
-         */
-        $data = rtrim($data, "\0");
-        return $data;
+        return $this->mcrypt->decrypt($data);
     }
 }
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index be329fc75a362..676feac5ed05f 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -3,11 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Framework\Encryption;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Encryption\Adapter\EncryptionAdapterInterface;
 use Magento\Framework\Encryption\Helper\Security;
 use Magento\Framework\Math\Random;
+use Magento\Framework\Encryption\Adapter\SodiumChachaIetf;
+use Magento\Framework\Encryption\Adapter\Mcrypt;
 
 /**
  * Class Encryptor provides basic logic for hashing strings and encrypting/decrypting misc data
@@ -56,7 +62,9 @@ class Encryptor implements EncryptorInterface
 
     const CIPHER_RIJNDAEL_256 = 2;
 
-    const CIPHER_LATEST = 2;
+    const CIPHER_AEAD_CHACHA20POLY1305 = 3;
+
+    const CIPHER_LATEST = 3;
     /**#@-*/
 
     /**
@@ -108,6 +116,7 @@ class Encryptor implements EncryptorInterface
     private $random;
 
     /**
+     * Encryptor constructor.
      * @param Random $random
      * @param DeploymentConfig $deploymentConfig
      */
@@ -118,7 +127,7 @@ public function __construct(
         $this->random = $random;
 
         // load all possible keys
-        $this->keys = preg_split('/\s+/s', trim($deploymentConfig->get(self::PARAM_CRYPT_KEY)));
+        $this->keys = preg_split('/\s+/s', trim((string)$deploymentConfig->get(self::PARAM_CRYPT_KEY)));
         $this->keyVersion = count($this->keys) - 1;
     }
 
@@ -133,7 +142,12 @@ public function __construct(
      */
     public function validateCipher($version)
     {
-        $types = [self::CIPHER_BLOWFISH, self::CIPHER_RIJNDAEL_128, self::CIPHER_RIJNDAEL_256];
+        $types = [
+            self::CIPHER_BLOWFISH,
+            self::CIPHER_RIJNDAEL_128,
+            self::CIPHER_RIJNDAEL_256,
+            self::CIPHER_AEAD_CHACHA20POLY1305,
+        ];
 
         $version = (int)$version;
         if (!in_array($version, $types, true)) {
@@ -148,7 +162,7 @@ public function validateCipher($version)
     public function getHash($password, $salt = false, $version = self::HASH_VERSION_LATEST)
     {
         if ($salt === false) {
-            return $this->hash($password);
+            return $this->hash($password, $version);
         }
         if ($salt === true) {
             $salt = self::DEFAULT_SALT_LENGTH;
@@ -160,7 +174,7 @@ public function getHash($password, $salt = false, $version = self::HASH_VERSION_
         return implode(
             self::DELIMITER,
             [
-                $this->hash($salt . $password),
+                $this->hash($salt . $password, $version),
                 $salt,
                 $version
             ]
@@ -172,7 +186,7 @@ public function getHash($password, $salt = false, $version = self::HASH_VERSION_
      */
     public function hash($data, $version = self::HASH_VERSION_LATEST)
     {
-        return hash($this->hashVersionMap[$version], $data);
+        return hash($this->hashVersionMap[$version], (string)$data);
     }
 
     /**
@@ -214,6 +228,8 @@ public function validateHashVersion($hash, $validateCount = false)
     }
 
     /**
+     * Explode password hash
+     *
      * @param string $hash
      * @return array
      */
@@ -229,6 +245,8 @@ private function explodePasswordHash($hash)
     }
 
     /**
+     * Get password hash
+     *
      * @return string
      */
     private function getPasswordHash()
@@ -237,6 +255,8 @@ private function getPasswordHash()
     }
 
     /**
+     * Get password salt
+     *
      * @return string
      */
     private function getPasswordSalt()
@@ -245,11 +265,19 @@ private function getPasswordSalt()
     }
 
     /**
+     * Get password version
+     *
      * @return array
      */
     private function getPasswordVersion()
     {
-        return array_map('intval', explode(self::DELIMITER, $this->passwordHashMap[self::PASSWORD_VERSION]));
+        return array_map(
+            'intval',
+            explode(
+                self::DELIMITER,
+                (string)$this->passwordHashMap[self::PASSWORD_VERSION]
+            )
+        );
     }
 
     /**
@@ -259,17 +287,30 @@ private function getPasswordVersion()
      * @return string
      */
     public function encrypt($data)
+    {
+        $crypt = new SodiumChachaIetf($this->keys[$this->keyVersion]);
+
+        return $this->keyVersion .
+            ':' . self::CIPHER_AEAD_CHACHA20POLY1305 .
+            ':' . base64_encode($crypt->encrypt($data));
+    }
+
+    /**
+     * Encrypt data using the fastest available algorithm
+     *
+     * @param string $data
+     * @return string
+     */
+    public function encryptWithFastestAvailableAlgorithm($data)
     {
         $crypt = $this->getCrypt();
         if (null === $crypt) {
             return $data;
         }
-        return $this->keyVersion . ':' . $this->cipher . ':' . (MCRYPT_MODE_CBC ===
-        $crypt->getMode() ? $crypt->getInitVector() . ':' : '') . base64_encode(
-            $crypt->encrypt((string)$data)
-        );
+        return $this->keyVersion .
+            ':' . $this->getCipherVersion() .
+            ':' . base64_encode($crypt->encrypt($data));
     }
-
     /**
      * Look for key and crypt versions in encrypted data before decrypting
      *
@@ -279,6 +320,7 @@ public function encrypt($data)
      *
      * @param string $data
      * @return string
+     * @throws \Exception
      */
     public function decrypt($data)
     {
@@ -286,11 +328,11 @@ public function decrypt($data)
             $parts = explode(':', $data, 4);
             $partsCount = count($parts);
 
-            $initVector = false;
+            $initVector = null;
             // specified key, specified crypt, specified iv
             if (4 === $partsCount) {
                 list($keyVersion, $cryptVersion, $iv, $data) = $parts;
-                $initVector = $iv ? $iv : false;
+                $initVector = $iv ? $iv : null;
                 $keyVersion = (int)$keyVersion;
                 $cryptVersion = self::CIPHER_RIJNDAEL_256;
                 // specified key, specified crypt
@@ -325,10 +367,9 @@ public function decrypt($data)
     }
 
     /**
-     * Return crypt model, instantiate if it is empty
+     * Validate key contains only allowed characters
      *
      * @param string|null $key NULL value means usage of the default key specified on constructor
-     * @return \Magento\Framework\Encryption\Crypt
      * @throws \Exception
      */
     public function validateKey($key)
@@ -336,7 +377,6 @@ public function validateKey($key)
         if (preg_match('/\s/s', $key)) {
             throw new \Exception((string)new \Magento\Framework\Phrase('The encryption key format is invalid.'));
         }
-        return $this->getCrypt($key);
     }
 
     /**
@@ -344,6 +384,7 @@ public function validateKey($key)
      *
      * @param string $key
      * @return $this
+     * @throws \Exception
      */
     public function setNewKey($key)
     {
@@ -370,13 +411,17 @@ public function exportKeys()
      *
      * @param string $key
      * @param int $cipherVersion
-     * @param bool $initVector
-     * @return Crypt|null
+     * @param string $initVector
+     * @return EncryptionAdapterInterface|null
+     * @throws \Exception
      */
-    protected function getCrypt($key = null, $cipherVersion = null, $initVector = true)
-    {
+    private function getCrypt(
+        string $key = null,
+        int $cipherVersion = null,
+        string $initVector = null
+    ): ?EncryptionAdapterInterface {
         if (null === $key && null === $cipherVersion) {
-            $cipherVersion = self::CIPHER_RIJNDAEL_256;
+            $cipherVersion = $this->getCipherVersion();
         }
 
         if (null === $key) {
@@ -392,6 +437,10 @@ protected function getCrypt($key = null, $cipherVersion = null, $initVector = tr
         }
         $cipherVersion = $this->validateCipher($cipherVersion);
 
+        if ($cipherVersion >= self::CIPHER_AEAD_CHACHA20POLY1305) {
+            return new SodiumChachaIetf($key);
+        }
+
         if ($cipherVersion === self::CIPHER_RIJNDAEL_128) {
             $cipher = MCRYPT_RIJNDAEL_128;
             $mode = MCRYPT_MODE_ECB;
@@ -403,6 +452,20 @@ protected function getCrypt($key = null, $cipherVersion = null, $initVector = tr
             $mode = MCRYPT_MODE_ECB;
         }
 
-        return new Crypt($key, $cipher, $mode, $initVector);
+        return new Mcrypt($key, $cipher, $mode, $initVector);
+    }
+
+    /**
+     * Get cipher version
+     *
+     * @return int
+     */
+    private function getCipherVersion()
+    {
+        if (extension_loaded('sodium')) {
+            return $this->cipher;
+        } else {
+            return self::CIPHER_RIJNDAEL_256;
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
new file mode 100644
index 0000000000000..452357003630c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Test case for \Magento\Framework\Encryption\Adapter\Mcrypt
+ */
+namespace Magento\Framework\Encryption\Test\Unit\Adapter;
+
+class McryptTest extends \PHPUnit\Framework\TestCase
+{
+    private $key;
+
+    private static $cipherInfo;
+
+    private const SUPPORTED_CIPHER_MODE_COMBINATIONS = [
+        MCRYPT_BLOWFISH => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_128 => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_256 => [MCRYPT_MODE_CBC],
+    ];
+
+    protected function setUp()
+    {
+        $this->key = substr(__CLASS__, -32, 32);
+    }
+
+    protected function getRandomString(int $length): string
+    {
+        $result = '';
+
+        do {
+            $result .= sha1(microtime());
+        } while (strlen($result) < $length);
+
+        return substr($result, -$length);
+    }
+
+    private function requireCipherInfo()
+    {
+        $filename = __DIR__ . '/../Crypt/_files/_cipher_info.php';
+
+        if (!self::$cipherInfo) {
+            self::$cipherInfo = include $filename;
+        }
+    }
+
+    private function getKeySize(string $cipherName, string $modeName): int
+    {
+        $this->requireCipherInfo();
+        return self::$cipherInfo[$cipherName][$modeName]['key_size'];
+    }
+
+    private function getInitVectorSize(string $cipherName, string $modeName): int
+    {
+        $this->requireCipherInfo();
+        return self::$cipherInfo[$cipherName][$modeName]['iv_size'];
+    }
+
+    public function getCipherModeCombinations(): array
+    {
+        $result = [];
+        foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
+                $result[$cipher . '-' . $mode] = [$cipher, $mode];
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @dataProvider getCipherModeCombinations
+     */
+    public function testConstructor(string $cipher, string $mode)
+    {
+        /* Generate random init vector */
+        $initVector = $this->getRandomString($this->getInitVectorSize($cipher, $mode));
+
+        $crypt = new \Magento\Framework\Encryption\Adapter\Mcrypt($this->key, $cipher, $mode, $initVector);
+
+        $this->assertEquals($cipher, $crypt->getCipher());
+        $this->assertEquals($mode, $crypt->getMode());
+        $this->assertEquals($initVector, $crypt->getInitVector());
+    }
+
+    public function getConstructorExceptionData(): array
+    {
+        $key = substr(__CLASS__, -32, 32);
+        $result = [];
+        foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
+                $tooLongKey = str_repeat('-', $this->getKeySize($cipher, $mode) + 1);
+                $tooShortInitVector = str_repeat('-', $this->getInitVectorSize($cipher, $mode) - 1);
+                $tooLongInitVector = str_repeat('-', $this->getInitVectorSize($cipher, $mode) + 1);
+                $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false];
+                $keyPrefix = 'key-' . $cipher . '-' . $mode;
+                $result[$keyPrefix . '-tooShortInitVector'] = [$key, $cipher, $mode, $tooShortInitVector];
+                $result[$keyPrefix . '-tooLongInitVector'] = [$key, $cipher, $mode, $tooLongInitVector];
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @dataProvider getConstructorExceptionData
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testConstructorException(string $key, string $cipher, string $mode, ?string $initVector = null)
+    {
+        new \Magento\Framework\Encryption\Adapter\Mcrypt($key, $cipher, $mode, $initVector);
+    }
+
+    public function testConstructorDefaults()
+    {
+        $cryptExpected = new \Magento\Framework\Encryption\Adapter\Mcrypt(
+            $this->key,
+            MCRYPT_BLOWFISH,
+            MCRYPT_MODE_ECB,
+            null
+        );
+        $cryptActual = new \Magento\Framework\Encryption\Adapter\Mcrypt($this->key);
+
+        $this->assertEquals($cryptExpected->getCipher(), $cryptActual->getCipher());
+        $this->assertEquals($cryptExpected->getMode(), $cryptActual->getMode());
+        $this->assertEquals($cryptExpected->getInitVector(), $cryptActual->getInitVector());
+    }
+
+    public function getCryptData(): array
+    {
+        $fixturesFilename = __DIR__ . '/../Crypt/_files/_crypt_fixtures.php';
+
+        $result = include $fixturesFilename;
+        /* Restore encoded string back to binary */
+        foreach ($result as &$cryptParams) {
+            $cryptParams[5] = base64_decode($cryptParams[5]);
+        }
+        unset($cryptParams);
+
+        return $result;
+    }
+
+    /**
+     * @dataProvider getCryptData
+     */
+    public function testDecrypt(
+        string $key,
+        string $cipher,
+        string $mode,
+        ?string $initVector,
+        string $expectedData,
+        string $inputData
+    ) {
+        $crypt = new \Magento\Framework\Encryption\Adapter\Mcrypt($key, $cipher, $mode, $initVector);
+        $actualData = $crypt->decrypt($inputData);
+        $this->assertEquals($expectedData, $actualData);
+    }
+
+    /**
+     * @dataProvider getCipherModeCombinations
+     */
+    public function testInitVectorNone(string $cipher, string $mode)
+    {
+        $crypt = new \Magento\Framework\Encryption\Adapter\Mcrypt(
+            $this->key,
+            $cipher,
+            $mode,
+            null
+        );
+        $actualInitVector = $crypt->getInitVector();
+
+        $expectedInitVector = str_repeat("\0", $this->getInitVectorSize($cipher, $mode));
+        $this->assertEquals($expectedInitVector, $actualInitVector);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php
new file mode 100644
index 0000000000000..8092ce55b42c8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/SodiumChachaIetfTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Test case for \Magento\Framework\Encryption\Adapter\SodiumChachaIetf
+ */
+namespace Magento\Framework\Encryption\Test\Unit\Adapter;
+
+class SodiumChachaIetfTest extends \PHPUnit\Framework\TestCase
+{
+    public function getCryptData(): array
+    {
+        $fixturesFilename = __DIR__ . '/../Crypt/_files/_sodium_chachaieft_fixtures.php';
+
+        $result = include $fixturesFilename;
+        /* Restore encoded string back to binary */
+        foreach ($result as &$cryptParams) {
+            $cryptParams['encrypted'] = base64_decode($cryptParams['encrypted']);
+        }
+        unset($cryptParams);
+
+        return $result;
+    }
+
+    /**
+     * @dataProvider getCryptData
+     */
+    public function testEncrypt(string $key, string $encrypted, string $decrypted)
+    {
+        $crypt = new \Magento\Framework\Encryption\Adapter\SodiumChachaIetf($key);
+        $result = $crypt->encrypt($decrypted);
+
+        $this->assertNotEquals($encrypted, $result);
+    }
+
+    /**
+     * @dataProvider getCryptData
+     */
+    public function testDecrypt(string $key, string $encrypted, string $decrypted)
+    {
+        $crypt = new \Magento\Framework\Encryption\Adapter\SodiumChachaIetf($key);
+        $result = $crypt->decrypt($encrypted);
+
+        $this->assertEquals($decrypted, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php
index 1b96b756f5ff0..c187d8d61bea6 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php
@@ -14,38 +14,6 @@
     5 => '',
   ],
   1 => [
-    0 => 'cc188f97f1bbd2f7a265e57c0dbb004ac29c1a88dc846ea6aed1c80c',
-    1 => 'blowfish',
-    2 => 'cbc',
-    3 => '48da27c4',
-    4 => '',
-    5 => '',
-  ],
-  2 => [
-    0 => '8bf1685366faa72ce1e4fbe1f89656e1de1fd186331c8fa255dde0eb',
-    1 => 'blowfish',
-    2 => 'cfb',
-    3 => '70c1592a',
-    4 => '',
-    5 => '',
-  ],
-  3 => [
-    0 => '5d304b80fbe2f6d6eaa51103d7558368e15f843b005fbd6353b7d0dd',
-    1 => 'blowfish',
-    2 => 'ofb',
-    3 => 'a8e85663',
-    4 => '',
-    5 => '',
-  ],
-  4 => [
-    0 => 'f33d7a68248758b77863569a9caa08271fcda17eb3903e8c8f01ea48',
-    1 => 'blowfish',
-    2 => 'nofb',
-    3 => '5919959b',
-    4 => '',
-    5 => '',
-  ],
-  5 => [
     0 => '7e34794ae07b3540a683cfd47b24a039',
     1 => 'rijndael-128',
     2 => 'ecb',
@@ -53,47 +21,7 @@
     4 => '',
     5 => '',
   ],
-  6 => [
-    0 => 'eed11fb167c5ba7c6666b0379d3f0efd',
-    1 => 'rijndael-128',
-    2 => 'cbc',
-    3 => 'f87fb9492e358ff7',
-    4 => '',
-    5 => '',
-  ],
-  7 => [
-    0 => 'b0baa1454a71e4902d2f21cca5822a43',
-    1 => 'rijndael-128',
-    2 => 'cfb',
-    3 => 'ca5f40f310fbf41c',
-    4 => '',
-    5 => '',
-  ],
-  8 => [
-    0 => '097577dd9bd37a37670d4ffac6db71ca',
-    1 => 'rijndael-128',
-    2 => 'ofb',
-    3 => '9662705b5c8a92e2',
-    4 => '',
-    5 => '',
-  ],
-  9 => [
-    0 => '26283c5ee61006051e109fb13cbeadd4',
-    1 => 'rijndael-128',
-    2 => 'nofb',
-    3 => 'fbae555d61cb4ab3',
-    4 => '',
-    5 => '',
-  ],
-  10 => [
-    0 => '912940718c6991dcc9927fe1357a59eb',
-    1 => 'rijndael-256',
-    2 => 'ecb',
-    3 => '6041192a9ed0647219bfba45306be4bc',
-    4 => '',
-    5 => '',
-  ],
-  11 => [
+  2 => [
     0 => '22eaec79b2ae279beac05375f1dd301f',
     1 => 'rijndael-256',
     2 => 'cbc',
@@ -101,31 +29,7 @@
     4 => '',
     5 => '',
   ],
-  12 => [
-    0 => '331ff7ee00849ef02acfcc4a4c44b002',
-    1 => 'rijndael-256',
-    2 => 'cfb',
-    3 => 'e7da553b177006fb878f2189815b146c',
-    4 => '',
-    5 => '',
-  ],
-  13 => [
-    0 => '52b9991fb182434f8ef64db604c1946a',
-    1 => 'rijndael-256',
-    2 => 'ofb',
-    3 => '95118150491d3acb936fed8f8aad942a',
-    4 => '',
-    5 => '',
-  ],
-  14 => [
-    0 => '42cba7ea2c940077df289a594170c846',
-    1 => 'rijndael-256',
-    2 => 'nofb',
-    3 => '11211b3d82f6a7d8cc864f3ffee958c1',
-    4 => '',
-    5 => '',
-  ],
-  15 => [
+  3 => [
     0 => '72f761d4c435986911087485b8664d40b28d12f818eca42edf84fecd',
     1 => 'blowfish',
     2 => 'ecb',
@@ -133,39 +37,7 @@
     4 => 'Hello world!!!',
     5 => 'UObRTUnq3jCNZjJOxwNubA==',
   ],
-  16 => [
-    0 => '63341175e4edd8ef27ea0d754f985b6bbfddd29b381ea8473a450b8c',
-    1 => 'blowfish',
-    2 => 'cbc',
-    3 => '8cc63606',
-    4 => 'Hello world!!!',
-    5 => '18QUXHt++6HiTQynQ4nUkg==',
-  ],
-  17 => [
-    0 => '5c4beba2e7571460dd0c2a6971dec5d707b6d8681a69e927ba8fac9f',
-    1 => 'blowfish',
-    2 => 'cfb',
-    3 => 'e93e050d',
-    4 => 'Hello world!!!',
-    5 => '11ubM60SiGkecJRFZMQ=',
-  ],
-  18 => [
-    0 => '073f901024e51b0ab85cf5944a90aea92bf353083ff642024f61a62d',
-    1 => 'blowfish',
-    2 => 'ofb',
-    3 => 'a9b4f0ca',
-    4 => 'Hello world!!!',
-    5 => 'SqliQR1lHxY4r/HCgoI=',
-  ],
-  19 => [
-    0 => '56df989b718351624480eb7776f827da7caf7996a6aa38dfa3e7328a',
-    1 => 'blowfish',
-    2 => 'nofb',
-    3 => '4178906f',
-    4 => 'Hello world!!!',
-    5 => 'vkPrtkjZ9TPapsG1sEY=',
-  ],
-  20 => [
+  4 => [
     0 => '6f326ec41c0e1d17fc030018043c0862',
     1 => 'rijndael-128',
     2 => 'ecb',
@@ -173,47 +45,7 @@
     4 => 'Hello world!!!',
     5 => 'dYsG1NhOM0lvXj32RqXJuw==',
   ],
-  21 => [
-    0 => '7891bd79c8bae053e795733dd6b99d4e',
-    1 => 'rijndael-128',
-    2 => 'cbc',
-    3 => '11e5244c25e3cdc2',
-    4 => 'Hello world!!!',
-    5 => '5rMjKp16UzjD1rxcTFqNfg==',
-  ],
-  22 => [
-    0 => '247ec5c7e7fa07628090ed1e07bc601f',
-    1 => 'rijndael-128',
-    2 => 'cfb',
-    3 => '7afdde5cb2adca91',
-    4 => 'Hello world!!!',
-    5 => 'OOhZb1g3owMU05jD2qk=',
-  ],
-  23 => [
-    0 => '0cedc5085da7c010a4136f7cc4c8f073',
-    1 => 'rijndael-128',
-    2 => 'ofb',
-    3 => 'f7cf137c927714de',
-    4 => 'Hello world!!!',
-    5 => 'iq9Kx0artzuKew+HWpU=',
-  ],
-  24 => [
-    0 => 'a0374d4b62c0394e01407f4133bc61c1',
-    1 => 'rijndael-128',
-    2 => 'nofb',
-    3 => '282ff6bb6270b4e5',
-    4 => 'Hello world!!!',
-    5 => 'gO5d+xbHk8E+8EH308E=',
-  ],
-  25 => [
-    0 => 'afa6f9c61c9199e2e4b6a1426dead6d4',
-    1 => 'rijndael-256',
-    2 => 'ecb',
-    3 => '1ae41175585077595667ef251d8f74e4',
-    4 => 'Hello world!!!',
-    5 => 'qTO/oVNzMhFZCnjCY90IuMuJcb7UVa7SXygKHWExX70=',
-  ],
-  26 => [
+  5 => [
     0 => '774bb6dac74b24796469d1865df679be',
     1 => 'rijndael-256',
     2 => 'cbc',
@@ -221,28 +53,4 @@
     4 => 'Hello world!!!',
     5 => '4APJzBRpwuZSqbIfr/GPS+Zb8wV/uo9qNSOvk68cGRM=',
   ],
-  27 => [
-    0 => '0a319daff472006ec9d10a70920dd592',
-    1 => 'rijndael-256',
-    2 => 'cfb',
-    3 => '99fa50190792623b19a62a2d59b40105',
-    4 => 'Hello world!!!',
-    5 => 'GbcnmzgYRB+4ETtw5zQ=',
-  ],
-  28 => [
-    0 => '4fbd81fce821dd6042b46051eddcc300',
-    1 => 'rijndael-256',
-    2 => 'ofb',
-    3 => 'b78b752f32a9788347f6f70e7a5fe1f0',
-    4 => 'Hello world!!!',
-    5 => 'PvbnFhmV0tej2c6zVIc=',
-  ],
-  29 => [
-    0 => 'c183b2078424e7c9c129ba425421c0eb',
-    1 => 'rijndael-256',
-    2 => 'nofb',
-    3 => '97b3940cce9106b7c5a7f266f0a334bd',
-    4 => 'Hello world!!!',
-    5 => '2HhsW5Wlw9glUVy9mGo=',
-  ],
 ];
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php
new file mode 100644
index 0000000000000..7917bd9ba83e8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_sodium_chachaieft_fixtures.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+return [
+    0 => [
+        'key' => '6wRADHwwCBGgdxbcHhovGB0upmg0mbsN',
+        'encrypted' => '146BhsQ3grT0VgkYuY3ii3gpClXHkFqlIcNpAD4+bAMBP+ToCHZHiJID',
+        'decrypted' => 'Hello World!!!',
+    ],
+    1 => [
+        'key' => 'uPuzBU067DXTM4PqEi14Sv5tbWjVcRZI',
+        'encrypted' => '6SQaVrCnY10n8tOxYyvWuVGKddjR12ZbGylM9K+bRHqsqltRwuLs15vV',
+        'decrypted' => 'Hello World!!!',
+    ],
+    2 => [
+        'key' => 'zsmVdKkwVgylxMM8ZzQ3GTv7SxvusKnJ',
+        'encrypted' => 'eQcREUJDV8EEB9WA1pBd5LbVQrs4Kyv6iWnkhOnjeitySuPQAcpIVoCM',
+        'decrypted' => 'Hello World!!!',
+    ],
+    3 => [
+        'key' => 'aggaHLvRCxRRyebpsrGAdLAIfSrufYrN',
+        'encrypted' => 'PSOa8KCpTsxnTgq4IKbpneF38FIp0JeAeiXQIf30vS5X+riylx05pz9b',
+        'decrypted' => 'Hello World!!!',
+    ],
+    4 => [
+        'key' => '6tEWnKY6AcdjS2XfPe1DjTbkvu2cFFZo',
+        'encrypted' => 'UglO9dEgslFpwPwejJmrK89PmBicv+I1pfdaXaEI69IrETD8LpdzOLF7',
+        'decrypted' => 'Hello World!!!',
+    ],
+];
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
index 6dc0d4a1d4628..c286cb0a1d803 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
@@ -15,14 +15,10 @@ class CryptTest extends \PHPUnit\Framework\TestCase
 
     private static $_cipherInfo;
 
-    protected $_supportedCiphers = [MCRYPT_BLOWFISH, MCRYPT_RIJNDAEL_128, MCRYPT_RIJNDAEL_256];
-
-    protected $_supportedModes = [
-        MCRYPT_MODE_ECB,
-        MCRYPT_MODE_CBC,
-        MCRYPT_MODE_CFB,
-        MCRYPT_MODE_OFB,
-        MCRYPT_MODE_NOFB,
+    private const SUPPORTED_CIPHER_MODE_COMBINATIONS = [
+        MCRYPT_BLOWFISH => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_128 => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_256 => [MCRYPT_MODE_CBC],
     ];
 
     protected function setUp()
@@ -30,6 +26,10 @@ protected function setUp()
         $this->_key = substr(__CLASS__, -32, 32);
     }
 
+    /**
+     * @param $length
+     * @return bool|string
+     */
     protected function _getRandomString($length)
     {
         $result = '';
@@ -42,46 +42,44 @@ protected function _getRandomString($length)
     protected function _requireCipherInfo()
     {
         $filename = __DIR__ . '/Crypt/_files/_cipher_info.php';
-        /* Generate allowed sizes for encryption key and init vector
-           $data = array();
-           foreach ($this->_supportedCiphers as $cipher) {
-           if (!array_key_exists($cipher, $data)) {
-           $data[$cipher] = array();
-           }
-           foreach ($this->_supportedModes as $mode) {
-           $cipherHandle = mcrypt_module_open($cipher, '', $mode, '');
-           $data[$cipher][$mode] = array(
-           'key_size' => mcrypt_enc_get_key_size($cipherHandle),
-           'iv_size'  => mcrypt_enc_get_iv_size($cipherHandle),
-           );
-           mcrypt_module_close($cipherHandle);
-           }
-           }
-           file_put_contents($filename, '<?php return ' . var_export($data, true) . ";\n", LOCK_EX);
-           */
+
         if (!self::$_cipherInfo) {
             self::$_cipherInfo = include $filename;
         }
     }
 
+    /**
+     * @param $cipherName
+     * @param $modeName
+     * @return mixed
+     */
     protected function _getKeySize($cipherName, $modeName)
     {
         $this->_requireCipherInfo();
         return self::$_cipherInfo[$cipherName][$modeName]['key_size'];
     }
 
+    /**
+     * @param $cipherName
+     * @param $modeName
+     * @return mixed
+     */
     protected function _getInitVectorSize($cipherName, $modeName)
     {
         $this->_requireCipherInfo();
         return self::$_cipherInfo[$cipherName][$modeName]['iv_size'];
     }
 
-    public function getCipherModeCombinations()
+    /**
+     * @return array
+     */
+    public function getCipherModeCombinations(): array
     {
         $result = [];
-        foreach ($this->_supportedCiphers as $cipher) {
-            foreach ($this->_supportedModes as $mode) {
-                $result[] = [$cipher, $mode];
+        foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
+                $result[$cipher . '-' . $mode] = [$cipher, $mode];
             }
         }
         return $result;
@@ -102,17 +100,23 @@ public function testConstructor($cipher, $mode)
         $this->assertEquals($initVector, $crypt->getInitVector());
     }
 
+    /**
+     * @return array
+     */
     public function getConstructorExceptionData()
     {
+        $key = substr(__CLASS__, -32, 32);
         $result = [];
-        foreach ($this->_supportedCiphers as $cipher) {
-            foreach ($this->_supportedModes as $mode) {
+        foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
                 $tooLongKey = str_repeat('-', $this->_getKeySize($cipher, $mode) + 1);
                 $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1);
                 $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1);
-                $result[] = [$tooLongKey, $cipher, $mode, false];
-                $result[] = [$this->_key, $cipher, $mode, $tooShortInitVector];
-                $result[] = [$this->_key, $cipher, $mode, $tooLongInitVector];
+                $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false];
+                $keyPrefix = 'key-' . $cipher . '-' . $mode;
+                $result[$keyPrefix . '-tooShortInitVector'] = [$key, $cipher, $mode, $tooShortInitVector];
+                $result[$keyPrefix . '-tooLongInitVector'] = [$key, $cipher, $mode, $tooLongInitVector];
             }
         }
         return $result;
@@ -137,30 +141,13 @@ public function testConstructorDefaults()
         $this->assertEquals($cryptExpected->getInitVector(), $cryptActual->getInitVector());
     }
 
+    /**
+     * @return mixed
+     */
     public function getCryptData()
     {
         $fixturesFilename = __DIR__ . '/Crypt/_files/_crypt_fixtures.php';
-        /* Generate fixtures
-           $fixtures = array();
-           foreach (array('', 'Hello world!!!') as $inputString) {
-           foreach ($this->_supportedCiphers as $cipher) {
-           foreach ($this->_supportedModes as $mode) {
-           $randomKey = $this->_getRandomString($this->_getKeySize($cipher, $mode));
-           $randomInitVector = $this->_getRandomString($this->_getInitVectorSize($cipher, $mode));
-           $crypt = new \Magento\Framework\Encryption\Crypt($randomKey, $cipher, $mode, $randomInitVector);
-           $fixtures[] = array(
-           $randomKey, // Encryption key
-           $cipher,
-           $mode,
-           $randomInitVector, // Init vector
-           $inputString, // String to encrypt
-           base64_encode($crypt->encrypt($inputString)) // Store result of encryption as base64
-           );
-           }
-           }
-           }
-           file_put_contents($fixturesFilename, '<?php return ' . var_export($fixtures, true) . ";\n", LOCK_EX);
-           */
+
         $result = include $fixturesFilename;
         /* Restore encoded string back to binary */
         foreach ($result as &$cryptParams) {
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
index 685c22f24c303..98bb1c5676d6c 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
@@ -3,14 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Framework\Encryption\Test\Unit;
 
+use Magento\Framework\Encryption\Adapter\Mcrypt;
+use Magento\Framework\Encryption\Adapter\SodiumChachaIetf;
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\Crypt;
-use Magento\Framework\App\DeploymentConfig;
 
 class EncryptorTest extends \PHPUnit\Framework\TestCase
 {
+    const CRYPT_KEY_1 = 'g9mY9KLrcuAVJfsmVUSRkKFLDdUPVkaZ';
+    const CRYPT_KEY_2 = '7wEjmrliuqZQ1NQsndSa8C8WHvddeEbN';
+
     /**
      * @var \Magento\Framework\Encryption\Encryptor
      */
@@ -28,7 +35,7 @@ protected function setUp()
         $deploymentConfigMock->expects($this->any())
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
-            ->will($this->returnValue('cryptKey'));
+            ->will($this->returnValue(self::CRYPT_KEY_1));
         $this->_model = new \Magento\Framework\Encryption\Encryptor($this->_randomGenerator, $deploymentConfigMock);
     }
 
@@ -86,6 +93,9 @@ public function testValidateHash($password, $hash, $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function validateHashDataProvider()
     {
         return [
@@ -99,6 +109,7 @@ public function validateHashDataProvider()
      * @param mixed $key
      *
      * @dataProvider encryptWithEmptyKeyDataProvider
+     * @expectedException \SodiumException
      */
     public function testEncryptWithEmptyKey($key)
     {
@@ -112,6 +123,9 @@ public function testEncryptWithEmptyKey($key)
         $this->assertEquals($value, $model->encrypt($value));
     }
 
+    /**
+     * @return array
+     */
     public function encryptWithEmptyKeyDataProvider()
     {
         return [[null], [0], [''], ['0']];
@@ -134,6 +148,9 @@ public function testDecryptWithEmptyKey($key)
         $this->assertEquals('', $model->decrypt($value));
     }
 
+    /**
+     * @return array
+     */
     public function decryptWithEmptyKeyDataProvider()
     {
         return [[null], [0], [''], ['0']];
@@ -147,20 +164,27 @@ public function testEncrypt()
         $actual = $this->_model->encrypt($data);
 
         // Extract the initialization vector and encrypted data
-        $parts = explode(':', $actual, 4);
-        list(, , $iv, $encryptedData) = $parts;
+        $parts = explode(':', $actual, 3);
+        list(, , $encryptedData) = $parts;
 
-        // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
-        $crypt = new Crypt('cryptKey', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
+        $crypt = new SodiumChachaIetf(self::CRYPT_KEY_1);
         // Verify decrypted matches original data
         $this->assertEquals($data, $crypt->decrypt(base64_decode((string)$encryptedData)));
     }
 
     public function testDecrypt()
+    {
+        $message = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
+        $encrypted = $this->_model->encrypt($message);
+
+        $this->assertEquals($message, $this->_model->decrypt($encrypted));
+    }
+
+    public function testLegacyDecrypt()
     {
         // sample data to encrypt
         $data = '0:2:z3a4ACpkU35W6pV692U4ueCVQP0m0v0p:' .
-            '7ZPIIRZzQrgQH+csfF3fyxYNwbzPTwegncnoTxvI3OZyqKGYlOCTSx5i1KRqNemCC8kuCiOAttLpAymXhzjhNQ==';
+            'DhEG8/uKGGq92ZusqrGb6X/9+2Ng0QZ9z2UZwljgJbs5/A3LaSnqcK0oI32yjHY49QJi+Z7q1EKu2yVqB8EMpA==';
 
         $actual = $this->_model->decrypt($data);
 
@@ -169,7 +193,7 @@ public function testDecrypt()
         list(, , $iv, $encrypted) = $parts;
 
         // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
-        $crypt = new Crypt('cryptKey', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
+        $crypt = new Crypt(self::CRYPT_KEY_1, MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
         // Verify decrypted matches original data
         $this->assertEquals($encrypted, base64_encode($crypt->encrypt($actual)));
     }
@@ -180,11 +204,11 @@ public function testEncryptDecryptNewKeyAdded()
         $deploymentConfigMock->expects($this->at(0))
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
-            ->will($this->returnValue("cryptKey1"));
+            ->will($this->returnValue(self::CRYPT_KEY_1));
         $deploymentConfigMock->expects($this->at(1))
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
-            ->will($this->returnValue("cryptKey1\ncryptKey2"));
+            ->will($this->returnValue(self::CRYPT_KEY_1 . "\n" . self::CRYPT_KEY_2));
         $model1 = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
         // simulate an encryption key is being added
         $model2 = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
@@ -200,11 +224,45 @@ public function testEncryptDecryptNewKeyAdded()
 
     public function testValidateKey()
     {
-        $actual = $this->_model->validateKey('some_key');
-        $crypt = new Crypt('some_key', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $actual->getInitVector());
-        $expectedEncryptedData = base64_encode($crypt->encrypt('data'));
-        $actualEncryptedData = base64_encode($actual->encrypt('data'));
-        $this->assertEquals($expectedEncryptedData, $actualEncryptedData);
-        $this->assertEquals($crypt->decrypt($expectedEncryptedData), $actual->decrypt($actualEncryptedData));
+        $this->_model->validateKey(self::CRYPT_KEY_1);
+    }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function testValidateKeyInvalid()
+    {
+        $this->_model->validateKey('-----    ');
+    }
+
+    /**
+     * @return array
+     */
+    public function useSpecifiedHashingAlgoDataProvider()
+    {
+        return [
+            ['password', 'salt', Encryptor::HASH_VERSION_MD5,
+             '67a1e09bb1f83f5007dc119c14d663aa:salt:0'],
+            ['password', 'salt', Encryptor::HASH_VERSION_SHA256,
+             '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1'],
+            ['password', false, Encryptor::HASH_VERSION_MD5,
+             '5f4dcc3b5aa765d61d8327deb882cf99'],
+            ['password', false, Encryptor::HASH_VERSION_SHA256,
+             '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8']
+        ];
+    }
+
+    /**
+     * @dataProvider useSpecifiedHashingAlgoDataProvider
+     *
+     * @param $password
+     * @param $salt
+     * @param $hashAlgo
+     * @param $expected
+     */
+    public function testGetHashMustUseSpecifiedHashingAlgo($password, $salt, $hashAlgo, $expected)
+    {
+        $hash = $this->_model->getHash($password, $salt, $hashAlgo);
+        $this->assertEquals($expected, $hash);
     }
 }
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php
index a0406cd0ec84b..fc241834c7ecf 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Helper/SecurityTest.php
@@ -31,6 +31,9 @@ public function testCompareStrings($expected, $actual, $result)
         $this->assertEquals($result, Security::compareStrings($expected, $actual));
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php b/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php
index ce35e72baea1f..9b31fcce10b9d 100644
--- a/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php
+++ b/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\EntityManager;
 
-use Magento\Framework\Model\AbstractModel;
-
 /**
  * Class AbstractModelHydrator
  */
diff --git a/lib/internal/Magento/Framework/EntityManager/Hydrator.php b/lib/internal/Magento/Framework/EntityManager/Hydrator.php
index ccf5b0c8557ab..0ea4eb3cedcd9 100644
--- a/lib/internal/Magento/Framework/EntityManager/Hydrator.php
+++ b/lib/internal/Magento/Framework/EntityManager/Hydrator.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Framework\EntityManager;
 
-use Magento\Framework\EntityManager\MapperPool;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class Hydrator
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php b/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php
index 5480b1c4feba9..6bc144929fb60 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
  * Class BeforeEntityDelete
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php b/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
index aadc968370bfd..b9c0de5f4c52a 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
@@ -118,7 +118,7 @@ public function execute($entity, $arguments = [])
             $entity = $this->deleteMain->execute($entity, $arguments);
             $this->eventManager->dispatchEntityEvent($entityType, 'delete_after', ['entity' => $entity]);
             $this->eventManager->dispatch(
-                'entity_manager_delete_before',
+                'entity_manager_delete_after',
                 [
                     'entity_type' => $entityType,
                     'entity' => $entity
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php
index 703ed96ece4b9..5d3d37bb830d5 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\EntityManager\Operation;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
  * Class ExtensionPool
diff --git a/lib/internal/Magento/Framework/EntityManager/OperationPool.php b/lib/internal/Magento/Framework/EntityManager/OperationPool.php
index 97d580e328b1b..90a5acb8b8a03 100644
--- a/lib/internal/Magento/Framework/EntityManager/OperationPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/OperationPool.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\EntityManager;
 
 use Magento\Framework\ObjectManagerInterface as ObjectManager;
-use Magento\Framework\EntityManager\OperationInterface;
 use Magento\Framework\EntityManager\Operation\CheckIfExists;
 use Magento\Framework\EntityManager\Operation\Read;
 use Magento\Framework\EntityManager\Operation\Create;
diff --git a/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php b/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
index 25af4743ac9b8..7d92c05d6c830 100644
--- a/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
+++ b/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
@@ -68,7 +68,7 @@ public function force($entityType, $identifier)
 
         if (!isset($sequenceInfo['sequenceTable'])) {
             throw new \Exception(
-                'TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesnt exists'
+                'TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesn\'t exists'
             );
         }
 
@@ -101,7 +101,7 @@ public function delete($entityType, $identifier)
         $metadata = $this->metadataPool->getMetadata($entityType);
         $sequenceInfo = $this->sequenceRegistry->retrieve($entityType);
         if (!isset($sequenceInfo['sequenceTable'])) {
-            throw new \Exception('TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesnt exists');
+            throw new \Exception('TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesn\'t exists');
         }
         try {
             $connection = $this->appResource->getConnectionByName($metadata->getEntityConnectionName());
diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php
index 1ab6074d6a36b..9b90e373de852 100644
--- a/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php
+++ b/lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php
@@ -32,7 +32,7 @@ public function setUp()
 
     /**
      * @param object $dataObject
-     * @param string $interfaceNames
+     * @param string $interfaceName
      * @dataProvider resolveDataProvider
      */
     public function testResolve($dataObject, $interfaceName)
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index fec64378189eb..19a9c0c1788fc 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework;
 
 /**
@@ -32,13 +33,37 @@ class Escaper
      */
     private $allowedAttributes = ['id', 'class', 'href', 'target', 'title', 'style'];
 
+    /**
+     * @var string
+     */
+    private static $xssFiltrationPattern =
+        '/((javascript(\\\\x3a|:|%3A))|(data(\\\\x3a|:|%3A))|(vbscript:))|'
+        . '((\\\\x6A\\\\x61\\\\x76\\\\x61\\\\x73\\\\x63\\\\x72\\\\x69\\\\x70\\\\x74(\\\\x3a|:|%3A))|'
+        . '(\\\\x64\\\\x61\\\\x74\\\\x61(\\\\x3a|:|%3A)))/i';
+
     /**
      * @var string[]
      */
     private $escapeAsUrlAttributes = ['href'];
 
     /**
-     * Escape string for HTML context. allowedTags will not be escaped, except the following: script, img, embed,
+     * @param \Magento\Framework\ZendEscaper|null $escaper
+     * @param \Psr\Log\LoggerInterface|null $logger
+     */
+    public function __construct(
+        \Magento\Framework\ZendEscaper $escaper = null,
+        \Psr\Log\LoggerInterface $logger = null
+    ) {
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\ZendEscaper::class);
+        $this->logger = $logger ?? \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Psr\Log\LoggerInterface::class);
+    }
+
+    /**
+     * Escape string for HTML context.
+     *
+     * AllowedTags will not be escaped, except the following: script, img, embed,
      * iframe, video, source, object, audio
      *
      * @param string|array $data
@@ -47,6 +72,10 @@ class Escaper
      */
     public function escapeHtml($data, $allowedTags = null)
     {
+        if (!is_array($data)) {
+            $data = (string)$data;
+        }
+
         if (is_array($data)) {
             $result = [];
             foreach ($data as $item) {
@@ -54,16 +83,7 @@ public function escapeHtml($data, $allowedTags = null)
             }
         } elseif (strlen($data)) {
             if (is_array($allowedTags) && !empty($allowedTags)) {
-                $notAllowedTags = array_intersect(
-                    array_map('strtolower', $allowedTags),
-                    $this->notAllowedTags
-                );
-                if (!empty($notAllowedTags)) {
-                    $this->getLogger()->critical(
-                        'The following tag(s) are not allowed: ' . implode(', ', $notAllowedTags)
-                    );
-                    $allowedTags = array_diff($allowedTags, $this->notAllowedTags);
-                }
+                $allowedTags = $this->filterProhibitedTags($allowedTags);
                 $wrapperElementId = uniqid();
                 $domDocument = new \DOMDocument('1.0', 'UTF-8');
                 set_error_handler(
@@ -71,6 +91,7 @@ function ($errorNumber, $errorString) {
                         throw new \Exception($errorString, $errorNumber);
                     }
                 );
+                $data = $this->prepareUnescapedCharacters($data);
                 $string = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
                 try {
                     $domDocument->loadHTML(
@@ -78,7 +99,7 @@ function ($errorNumber, $errorString) {
                     );
                 } catch (\Exception $e) {
                     restore_error_handler();
-                    $this->getLogger()->critical($e);
+                    $this->logger->critical($e);
                 }
                 restore_error_handler();
 
@@ -99,6 +120,19 @@ function ($errorNumber, $errorString) {
         return $result;
     }
 
+    /**
+     * Used to replace characters, that mb_convert_encoding will not process
+     *
+     * @param string $data
+     * @return string|null
+     */
+    private function prepareUnescapedCharacters(string $data): ?string
+    {
+        $patterns = ['/\&/u'];
+        $replacements = ['&amp;'];
+        return \preg_replace($patterns, $replacements, $data);
+    }
+
     /**
      * Remove not allowed tags
      *
@@ -195,9 +229,9 @@ private function escapeAttributeValue($name, $value)
     public function escapeHtmlAttr($string, $escapeSingleQuote = true)
     {
         if ($escapeSingleQuote) {
-            return $this->getEscaper()->escapeHtmlAttr((string) $string);
+            return $this->escaper->escapeHtmlAttr((string) $string);
         }
-        return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
+        return htmlspecialchars((string)$string, ENT_COMPAT, 'UTF-8', false);
     }
 
     /**
@@ -220,7 +254,7 @@ public function escapeUrl($string)
      */
     public function encodeUrlParam($string)
     {
-        return $this->getEscaper()->escapeUrl($string);
+        return $this->escaper->escapeUrl($string);
     }
 
     /**
@@ -259,7 +293,7 @@ function ($matches) {
      */
     public function escapeCss($string)
     {
-        return $this->getEscaper()->escapeCss($string);
+        return $this->escaper->escapeCss($string);
     }
 
     /**
@@ -278,14 +312,13 @@ public function escapeJsQuote($data, $quote = '\'')
                 $result[] = $this->escapeJsQuote($item, $quote);
             }
         } else {
-            $result = str_replace($quote, '\\' . $quote, $data);
+            $result = str_replace($quote, '\\' . $quote, (string)$data);
         }
         return $result;
     }
 
     /**
      * Escape xss in urls
-     * Remove `javascript:`, `vbscript:`, `data:` words from url
      *
      * @param string $data
      * @return string
@@ -293,15 +326,33 @@ public function escapeJsQuote($data, $quote = '\'')
      */
     public function escapeXssInUrl($data)
     {
-        $pattern = '/((javascript(\\\\x3a|:|%3A))|(data(\\\\x3a|:|%3A))|(vbscript:))|'
-            . '((\\\\x6A\\\\x61\\\\x76\\\\x61\\\\x73\\\\x63\\\\x72\\\\x69\\\\x70\\\\x74(\\\\x3a|:|%3A))|'
-            . '(\\\\x64\\\\x61\\\\x74\\\\x61(\\\\x3a|:|%3A)))/i';
-        $result = preg_replace($pattern, ':', $data);
-        return htmlspecialchars($result, ENT_COMPAT | ENT_HTML5 | ENT_HTML401, 'UTF-8', false);
+        return htmlspecialchars(
+            $this->escapeScriptIdentifiers((string)$data),
+            ENT_COMPAT | ENT_HTML5 | ENT_HTML401,
+            'UTF-8',
+            false
+        );
+    }
+
+    /**
+     * Remove `javascript:`, `vbscript:`, `data:` words from the string.
+     *
+     * @param string $data
+     * @return string
+     */
+    private function escapeScriptIdentifiers(string $data): string
+    {
+        $filteredData = preg_replace(self::$xssFiltrationPattern, ':', $data) ?: '';
+        if (preg_match(self::$xssFiltrationPattern, $filteredData)) {
+            $filteredData = $this->escapeScriptIdentifiers($filteredData);
+        }
+
+        return $filteredData;
     }
 
     /**
      * Escape quotes inside html attributes
+     *
      * Use $addSlashes = false for escaping js that inside html attribute (onClick, onSubmit etc)
      *
      * @param string $data
@@ -318,32 +369,25 @@ public function escapeQuote($data, $addSlashes = false)
     }
 
     /**
-     * Get escaper
+     * Filter prohibited tags.
      *
-     * @return \Magento\Framework\ZendEscaper
-     * @deprecated 100.2.0
+     * @param string[] $allowedTags
+     * @return string[]
      */
-    private function getEscaper()
+    private function filterProhibitedTags(array $allowedTags): array
     {
-        if ($this->escaper == null) {
-            $this->escaper = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\ZendEscaper::class);
-        }
-        return $this->escaper;
-    }
+        $notAllowedTags = array_intersect(
+            array_map('strtolower', $allowedTags),
+            $this->notAllowedTags
+        );
 
-    /**
-     * Get logger
-     *
-     * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.2.0
-     */
-    private function getLogger()
-    {
-        if ($this->logger == null) {
-            $this->logger = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Psr\Log\LoggerInterface::class);
+        if (!empty($notAllowedTags)) {
+            $this->logger->critical(
+                'The following tag(s) are not allowed: ' . implode(', ', $notAllowedTags)
+            );
+            $allowedTags = array_diff($allowedTags, $this->notAllowedTags);
         }
-        return $this->logger;
+
+        return $allowedTags;
     }
 }
diff --git a/lib/internal/Magento/Framework/Event.php b/lib/internal/Magento/Framework/Event.php
index 4c116d0a33629..c7b15a8eb0722 100644
--- a/lib/internal/Magento/Framework/Event.php
+++ b/lib/internal/Magento/Framework/Event.php
@@ -88,7 +88,7 @@ public function dispatch()
      */
     public function getName()
     {
-        return isset($this->_data['name']) ? $this->_data['name'] : null;
+        return $this->_data['name'] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Event/ObserverInterface.php b/lib/internal/Magento/Framework/Event/ObserverInterface.php
index 09358e0966216..e7c9b770ea1f5 100644
--- a/lib/internal/Magento/Framework/Event/ObserverInterface.php
+++ b/lib/internal/Magento/Framework/Event/ObserverInterface.php
@@ -10,6 +10,7 @@
 /**
  * Interface \Magento\Framework\Event\ObserverInterface
  *
+ * @api
  */
 interface ObserverInterface
 {
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php
index cd8a16b5c2c4f..66651174a87cf 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/SchemaLocatorTest.php
@@ -12,10 +12,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolverMock;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
index 33007b7295bca..e0dc7494cca19 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 return [
-    'without_event_handle' => [
-        '<?xml version="1.0"?><config></config>',
-        ["Element 'config': Missing child element(s). Expected is ( event ).\nLine: 1\n"],
-    ],
     'event_without_required_name_attribute' => [
         '<?xml version="1.0"?><config><event name="some_name"></event></config>',
         ["Element 'event': Missing child element(s). Expected is ( observer ).\nLine: 1\n"],
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/valid_events.xml b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/valid_events.xml
index 5cf120adb6b99..59eddd862dfa3 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/valid_events.xml
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/valid_events.xml
@@ -12,4 +12,7 @@
     <event name="authorization_roles_save_before">
         <observer name="second_name" instance="Some_Test_Value_Two" />
     </event>
+    <event name="authorization_roles_save_before123">
+        <observer name="second_name" instance="Some_Test_Value_Two"/>
+    </event>
 </config>
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
index 91c8afaef5d07..136dd8cc80eef 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
@@ -81,6 +81,9 @@ public function testGetObserverByName($name)
         $this->assertEquals($observer, $this->observerCollection->getObserverByName($name));
     }
 
+    /**
+     * @return array
+     */
     public function observerNameProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
index 511d547ebed44..1380cc0decf39 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
@@ -37,6 +37,9 @@ public function testGetNumeric($value, $expectedResult)
         $this->assertEquals($expectedResult, $this->cron->getNumeric($value));
     }
 
+    /**
+     * @return array
+     */
     public function numericValueProvider()
     {
         return [
@@ -78,6 +81,9 @@ public function testMatchCronExpression($expression, $number, $expectedResult)
         $this->assertEquals($expectedResult, $this->cron->matchCronExpression($expression, $number));
     }
 
+    /**
+     * @return array
+     */
     public function matchCronExpressionProvider()
     {
         return [
@@ -107,6 +113,9 @@ public function testIsValidFor($time, $expression, $expectedResult)
         $this->assertEquals($expectedResult, $this->cron->isValidFor($eventMock));
     }
 
+    /**
+     * @return array
+     */
     public function isValidForProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
index cfd3602fb030d..80d828930d118 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
@@ -44,6 +44,9 @@ public function testIsValidFor($pattern, $name, $expectedResult)
         $this->assertEquals($expectedResult, $this->regex->isValidFor($eventMock));
     }
 
+    /**
+     * @return array
+     */
     public function isValidForProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php
index 5e5c60e149837..378de874974c6 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php
@@ -8,8 +8,6 @@
 
 use \Magento\Framework\Event\Observer;
 
-use Magento\Framework\Event;
-
 /**
  * Class ConfigTest
  *
diff --git a/lib/internal/Magento/Framework/Event/etc/events.xsd b/lib/internal/Magento/Framework/Event/etc/events.xsd
index d656b7fdb6ed6..cac62af356760 100644
--- a/lib/internal/Magento/Framework/Event/etc/events.xsd
+++ b/lib/internal/Magento/Framework/Event/etc/events.xsd
@@ -9,7 +9,7 @@
     <xs:element name="config">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="event" type="eventDeclaration" minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="event" type="eventDeclaration" minOccurs="0" maxOccurs="unbounded">
                     <xs:unique name="uniqueObserverName">
                         <xs:annotation>
                             <xs:documentation>
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index 0b92e640713e4..ff142c5319006 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -78,6 +78,17 @@ public function addError(Phrase $phrase)
         return $this;
     }
 
+    /**
+     * @param LocalizedException $exception
+     * @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/AuthenticationException.php b/lib/internal/Magento/Framework/Exception/AuthenticationException.php
index fc097dc5562bd..9b20dea99ccf9 100644
--- a/lib/internal/Magento/Framework/Exception/AuthenticationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthenticationException.php
@@ -15,5 +15,5 @@ class AuthenticationException extends LocalizedException
     /**
      * @deprecated
      */
-    const AUTHENTICATION_ERROR = 'An authentication error occurred.';
+    const AUTHENTICATION_ERROR = 'An authentication error occurred. Verify and try again.';
 }
diff --git a/lib/internal/Magento/Framework/Exception/AuthorizationException.php b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
index 79bf95b22bccf..ed310117d6717 100644
--- a/lib/internal/Magento/Framework/Exception/AuthorizationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Exception;
 
 /**
@@ -15,5 +16,5 @@ class AuthorizationException extends LocalizedException
     /**
      * @deprecated
      */
-    const NOT_AUTHORIZED = 'Consumer is not authorized to access %resources';
+    const NOT_AUTHORIZED = "The consumer isn't authorized to access %resources.";
 }
diff --git a/lib/internal/Magento/Framework/Exception/BulkException.php b/lib/internal/Magento/Framework/Exception/BulkException.php
new file mode 100644
index 0000000000000..168e910e0d375
--- /dev/null
+++ b/lib/internal/Magento/Framework/Exception/BulkException.php
@@ -0,0 +1,60 @@
+<?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);
+    }
+
+    /**
+     * Add data
+     *
+     * @param array $data
+     */
+    public function addData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Retrieve data
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Exception/InputException.php b/lib/internal/Magento/Framework/Exception/InputException.php
index b332c88d42f71..7b1815dc0d1bb 100644
--- a/lib/internal/Magento/Framework/Exception/InputException.php
+++ b/lib/internal/Magento/Framework/Exception/InputException.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Exception;
 
 use Magento\Framework\Phrase;
@@ -42,7 +43,7 @@ class InputException extends AbstractAggregateException
     /**
      * @deprecated
      */
-    const REQUIRED_FIELD = '%fieldName is a required field.';
+    const REQUIRED_FIELD = '"%fieldName" is required. Enter and try again.';
 
     /**
      * Initialize the input exception.
@@ -87,7 +88,7 @@ public static function invalidFieldValue($fieldName, $fieldValue, \Exception $ca
     public static function requiredField($fieldName)
     {
         return new self(
-            new Phrase('%fieldName is a required field.', ['fieldName' => $fieldName])
+            new Phrase('"%fieldName" is required. Enter and try again.', ['fieldName' => $fieldName])
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/Exception/LocalizedException.php b/lib/internal/Magento/Framework/Exception/LocalizedException.php
index 0b1d5f1998bfb..977c69db77bbc 100644
--- a/lib/internal/Magento/Framework/Exception/LocalizedException.php
+++ b/lib/internal/Magento/Framework/Exception/LocalizedException.php
@@ -11,6 +11,8 @@
 use Magento\Framework\Phrase\Renderer\Placeholder;
 
 /**
+ * Localized exception
+ *
  * @api
  */
 class LocalizedException extends \Exception
@@ -33,7 +35,7 @@ class LocalizedException extends \Exception
     public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
         $this->phrase = $phrase;
-        parent::__construct($phrase->render(), intval($code), $cause);
+        parent::__construct($phrase->render(), (int)$code, $cause);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Exception/SerializationException.php b/lib/internal/Magento/Framework/Exception/SerializationException.php
index 27d0bc0c4371a..bae56b487975c 100644
--- a/lib/internal/Magento/Framework/Exception/SerializationException.php
+++ b/lib/internal/Magento/Framework/Exception/SerializationException.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Exception;
 
 use Magento\Framework\Phrase;
@@ -22,7 +23,7 @@ class SerializationException extends LocalizedException
     /**
      * @deprecated
      */
-    const TYPE_MISMATCH = 'Invalid type for value: "%value". Expected Type: "%type".';
+    const TYPE_MISMATCH = 'The "%value" value\'s type is invalid. The "%type" type was expected. Verify and try again.';
 
     /**
      * @param \Magento\Framework\Phrase $phrase
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php
index f728a0deacc7e..d0b8744c34ff1 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php
@@ -21,10 +21,13 @@ public function testConstructor()
     {
         $authenticationException = new AuthenticationException(
             new Phrase(
-                'An authentication error occurred.',
+                'An authentication error occurred. Verify and try again.',
                 ['consumer_id' => 1, 'resources' => 'record2']
             )
         );
-        $this->assertSame('An authentication error occurred.', $authenticationException->getMessage());
+        $this->assertSame(
+            'An authentication error occurred. Verify and try again.',
+            $authenticationException->getMessage()
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php
index 9b96587c8d195..667d97f20aa9e 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Exception\Test\Unit;
 
 use \Magento\Framework\Exception\AuthorizationException;
@@ -17,10 +18,10 @@ public function testConstructor()
     {
         $authorizationException = new AuthorizationException(
             new Phrase(
-                'Consumer is not authorized to access %resources',
+                'The consumer isn\'t authorized to access %resources.',
                 ['consumer_id' => 1, 'resources' => 'record2']
             )
         );
-        $this->assertSame('Consumer is not authorized to access record2', $authorizationException->getMessage());
+        $this->assertSame("The consumer isn't authorized to access record2.", $authorizationException->getMessage());
     }
 }
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php
index edc66f2231025..44cbd7226da49 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Exception\Test\Unit;
 
 use \Magento\Framework\Exception\InputException;
@@ -75,7 +76,9 @@ public function testAddError()
             $inputException->getLogMessage()
         );
 
-        $inputException->addError(new Phrase('%fieldName is a required field.', ['fieldName' => 'name']));
+        $inputException->addError(
+            new Phrase('"%fieldName" is required. Enter and try again.', ['fieldName' => 'name'])
+        );
         $this->assertTrue($inputException->wasErrorAdded());
         $this->assertCount(2, $inputException->getErrors());
 
@@ -102,9 +105,9 @@ public function testAddError()
             $errors[0]->getLogMessage()
         );
 
-        $this->assertEquals('%fieldName is a required field.', $errors[1]->getRawMessage());
-        $this->assertEquals('name is a required field.', $errors[1]->getMessage());
-        $this->assertEquals('name is a required field.', $errors[1]->getLogMessage());
+        $this->assertEquals('"%fieldName" is required. Enter and try again.', $errors[1]->getRawMessage());
+        $this->assertEquals('"name" is required. Enter and try again.', $errors[1]->getMessage());
+        $this->assertEquals('"name" is required. Enter and try again.', $errors[1]->getLogMessage());
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/File/Csv.php b/lib/internal/Magento/Framework/File/Csv.php
index 3d177f89e2968..571ad6b21efa7 100644
--- a/lib/internal/Magento/Framework/File/Csv.php
+++ b/lib/internal/Magento/Framework/File/Csv.php
@@ -126,17 +126,37 @@ public function getDataPairs($file, $keyIndex = 0, $valueIndex = 1)
     /**
      * Saving data row array into file
      *
-     * @param   string $file
-     * @param   array $data
-     * @return  $this
+     * @param string $file
+     * @param array $data
+     * @return $this
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @deprecated
+     * @see appendData
      */
     public function saveData($file, $data)
     {
-        $fh = fopen($file, 'w');
+        return $this->appendData($file, $data, 'w');
+    }
+
+    /**
+     * Replace the saveData method by allowing to select the input mode
+     *
+     * @param string $file
+     * @param array $data
+     * @param string $mode
+     *
+     * @return $this
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function appendData($file, $data, $mode = 'w')
+    {
+        $fileHandler = fopen($file, $mode);
         foreach ($data as $dataRow) {
-            $this->file->filePutCsv($fh, $dataRow, $this->_delimiter, $this->_enclosure);
+            $this->file->filePutCsv($fileHandler, $dataRow, $this->_delimiter, $this->_enclosure);
         }
-        fclose($fh);
+        fclose($fileHandler);
+
         return $this;
     }
 }
diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
index 7fbdab18d17ff..ed370b1beae54 100644
--- a/lib/internal/Magento/Framework/File/Mime.php
+++ b/lib/internal/Magento/Framework/File/Mime.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\File;
 
+/**
+ * Utility for mime type retrieval
+ */
 class Mime
 {
     /**
@@ -58,6 +61,23 @@ class Mime
         'ps'   => 'application/postscript',
     ];
 
+    /**
+     * List of mime types that can be defined by file extension.
+     *
+     * @var array
+     */
+    private $defineByExtensionList = [
+        'txt'  => 'text/plain',
+        'htm'  => 'text/html',
+        'html' => 'text/html',
+        'php'  => 'text/html',
+        'css'  => 'text/css',
+        'js'   => 'application/javascript',
+        'json' => 'application/json',
+        'xml'  => 'application/xml',
+        'svg' => 'image/svg+xml',
+    ];
+
     /**
      * Get mime type of a file
      *
@@ -71,19 +91,51 @@ public function getMimeType($file)
             throw new \InvalidArgumentException("File '$file' doesn't exist");
         }
 
-        $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-        if (isset($this->mimeTypes[$extension])) {
-            $result = $this->mimeTypes[$extension];
-        }
+        $result = null;
+        $extension = $this->getFileExtension($file);
 
-        if (empty($result) && (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
-            $result = mime_content_type($file);
+        if (function_exists('mime_content_type')) {
+            $result = $this->getNativeMimeType($file);
         }
 
-        if (empty($result)) {
+        if (null === $result && isset($this->mimeTypes[$extension])) {
+            $result = $this->mimeTypes[$extension];
+        } elseif (null === $result) {
             $result = 'application/octet-stream';
         }
 
         return $result;
     }
+
+    /**
+     * Get mime type by the native mime_content_type function.
+     *
+     * Search for extended mime type if mime_content_type() returned 'application/octet-stream' or 'text/plain'
+     *
+     * @param string $file
+     * @return string
+     */
+    private function getNativeMimeType(string $file): string
+    {
+        $extension = $this->getFileExtension($file);
+        $result = mime_content_type($file);
+        if (isset($this->mimeTypes[$extension], $this->defineByExtensionList[$extension])
+            && (strpos($result, 'text/') === 0 || strpos($result, 'image/svg') === 0)
+        ) {
+            $result = $this->mimeTypes[$extension];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get file extension by file name.
+     *
+     * @param string $file
+     * @return string
+     */
+    private function getFileExtension(string $file): string
+    {
+        return strtolower(pathinfo($file, PATHINFO_EXTENSION));
+    }
 }
diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php
index 6f48024f71c16..c5a51ec1760e7 100644
--- a/lib/internal/Magento/Framework/File/Size.php
+++ b/lib/internal/Magento/Framework/File/Size.php
@@ -36,7 +36,7 @@ class Size
      */
     public function getPostMaxSize()
     {
-        return $this->_iniget('post_max_size');
+        return $this->_iniGet('post_max_size');
     }
 
     /**
@@ -46,7 +46,7 @@ public function getPostMaxSize()
      */
     public function getUploadMaxSize()
     {
-        return $this->_iniget('upload_max_filesize');
+        return $this->_iniGet('upload_max_filesize');
     }
 
     /**
@@ -56,7 +56,7 @@ public function getUploadMaxSize()
      * @param int $mode
      * @return float
      */
-    public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN)
+    public function getMaxFileSizeInMb($precision = 0, $mode = \PHP_ROUND_HALF_DOWN)
     {
         return $this->getFileSizeInMb($this->getMaxFileSize(), $precision, $mode);
     }
@@ -69,7 +69,7 @@ public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN)
      * @param int $mode
      * @return float
      */
-    public function getFileSizeInMb($fileSize, $precision = 0, $mode = PHP_ROUND_HALF_DOWN)
+    public function getFileSizeInMb($fileSize, $precision = 0, $mode = \PHP_ROUND_HALF_DOWN)
     {
         return round($fileSize / (1024 * 1024), $precision, $mode);
     }
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
index 5429c9e862188..d945791282a2d 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
+++ b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
@@ -24,17 +24,23 @@ class HttpTest extends \PHPUnit\Framework\TestCase
      */
     private $mime;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->response = $this->createPartialMock(
             \Magento\Framework\HTTP\PhpEnvironment\Response::class,
-            ['setHeader', 'sendHeaders']
+            ['setHeader', 'sendHeaders', 'setHeaders']
         );
         $this->mime = $this->createMock(\Magento\Framework\File\Mime::class);
         $this->object = new Http($this->response, $this->mime);
     }
 
-    public function testSend()
+    /**
+     * @return void
+     */
+    public function testSend(): void
     {
         $file = __DIR__ . '/../../_files/javascript.js';
         $contentType = 'content/type';
@@ -56,11 +62,37 @@ public function testSend()
         $this->object->send($file);
     }
 
+    /**
+     * @return void
+     */
+    public function testSendWithOptions(): void
+    {
+        $file = __DIR__ . '/../../_files/javascript.js';
+        $contentType = 'content/type';
+
+        $headers = $this->getMockBuilder(\Zend\Http\Headers::class)->getMock();
+        $this->response->expects($this->atLeastOnce())
+            ->method('setHeader')
+            ->withConsecutive(['Content-length', filesize($file)], ['Content-Type', $contentType]);
+        $this->response->expects($this->atLeastOnce())
+            ->method('setHeaders')
+            ->with($headers);
+        $this->response->expects($this->once())
+            ->method('sendHeaders');
+        $this->mime->expects($this->once())
+            ->method('getMimeType')
+            ->with($file)
+            ->will($this->returnValue($contentType));
+        $this->expectOutputString(file_get_contents($file));
+
+        $this->object->send(['filepath' => $file, 'headers' => $headers]);
+    }
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Filename is not set
+     * @return void
      */
-    public function testSendNoFileSpecifiedException()
+    public function testSendNoFileSpecifiedException(): void
     {
         $this->object->send([]);
     }
@@ -68,8 +100,9 @@ public function testSendNoFileSpecifiedException()
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage File 'nonexistent.file' does not exists
+     * @return void
      */
-    public function testSendNoFileExistException()
+    public function testSendNoFileExistException(): void
     {
         $this->object->send('nonexistent.file');
     }
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD b/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD
index e69de29bb2d1d..b361f47e9c25d 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD
+++ b/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD
@@ -0,0 +1 @@
+�
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird b/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird
index e69de29bb2d1d..b361f47e9c25d 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird
+++ b/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird
@@ -0,0 +1 @@
+�
diff --git a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
index 1cd270329ed2c..aa527866eff55 100644
--- a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
+++ b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
@@ -40,20 +40,16 @@ public function __construct(
      */
     public function send($options = null)
     {
-        if (is_string($options)) {
-            $filepath = $options;
-        } elseif (is_array($options) && isset($options['filepath'])) {
-            $filepath = $options['filepath'];
-        } else {
-            throw new \InvalidArgumentException("Filename is not set.");
-        }
+        $filepath = $this->getFilePath($options);
 
         if (!is_file($filepath) || !is_readable($filepath)) {
             throw new \InvalidArgumentException("File '{$filepath}' does not exists.");
         }
 
         $mimeType = $this->mime->getMimeType($filepath);
-
+        if (is_array($options) && isset($options['headers']) && $options['headers'] instanceof \Zend\Http\Headers) {
+            $this->response->setHeaders($options['headers']);
+        }
         $this->response->setHeader('Content-length', filesize($filepath));
         $this->response->setHeader('Content-Type', $mimeType);
 
@@ -70,4 +66,26 @@ public function send($options = null)
             fclose($handle);
         }
     }
+
+    /**
+     * Get filepath by provided parameter $optons.
+     * If the $options is a string it assumes it's a file path. If the option is an array method will look for the
+     * 'filepath' key and return it's value.
+     *
+     * @param string|array|null $options
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    private function getFilePath($options): string
+    {
+        if (is_string($options)) {
+            $filePath = $options;
+        } elseif (is_array($options) && isset($options['filepath'])) {
+            $filePath = $options['filepath'];
+        } else {
+            throw new \InvalidArgumentException("Filename is not set.");
+        }
+
+        return $filePath;
+    }
 }
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index c3316db7be016..328a748cfd5df 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\File;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * File upload class
  *
@@ -118,6 +116,11 @@ class Uploader
      */
     protected $_validateCallbacks = [];
 
+    /**
+     * @var \Magento\Framework\File\Mime
+     */
+    private $fileMime;
+
     /**#@+
      * File upload type (multiple or single)
      */
@@ -133,12 +136,16 @@ class Uploader
     const TMP_NAME_EMPTY = 666;
 
     /**
-     * Max Image Width resolution in pixels. For image resizing on client side
+     * Maximum Image Width resolution in pixels. For image resizing on client side
+     * @deprecated
+     * @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxWidth()
      */
     const MAX_IMAGE_WIDTH = 1920;
 
     /**
-     * Max Image Height resolution in pixels. For image resizing on client side
+     * Maximum Image Height resolution in pixels. For image resizing on client side
+     * @deprecated
+     * @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxHeight()
      */
     const MAX_IMAGE_HEIGHT = 1200;
 
@@ -154,10 +161,13 @@ class Uploader
      * Init upload
      *
      * @param string|array $fileId
+     * @param \Magento\Framework\File\Mime|null $fileMime
      * @throws \Exception
      */
-    public function __construct($fileId)
-    {
+    public function __construct(
+        $fileId,
+        Mime $fileMime = null
+    ) {
         $this->_setUploadFileId($fileId);
         if (!file_exists($this->_file['tmp_name'])) {
             $code = empty($this->_file['tmp_name']) ? self::TMP_NAME_EMPTY : 0;
@@ -165,6 +175,7 @@ public function __construct($fileId)
         } else {
             $this->_fileExists = true;
         }
+        $this->fileMime = $fileMime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Mime::class);
     }
 
     /**
@@ -180,8 +191,7 @@ protected function _afterSave($result)
     }
 
     /**
-     * Used to save uploaded file into destination folder with
-     * original or new file name (if specified)
+     * Used to save uploaded file into destination folder with original or new file name (if specified).
      *
      * @param string $destinationFolder
      * @param string $newFileName
@@ -197,20 +207,22 @@ public function save($destinationFolder, $newFileName = null)
         $this->_result = false;
         $destinationFile = $destinationFolder;
         $fileName = isset($newFileName) ? $newFileName : $this->_file['name'];
-        $fileName = self::getCorrectFileName($fileName);
+        $fileName = static::getCorrectFileName($fileName);
         if ($this->_enableFilesDispersion) {
             $fileName = $this->correctFileNameCase($fileName);
             $this->setAllowCreateFolders(true);
-            $this->_dispretionPath = self::getDispretionPath($fileName);
+            $this->_dispretionPath = static::getDispersionPath($fileName);
             $destinationFile .= $this->_dispretionPath;
             $this->_createDestinationFolder($destinationFile);
         }
 
         if ($this->_allowRenameFiles) {
-            $fileName = self::getNewFileName(self::_addDirSeparator($destinationFile) . $fileName);
+            $fileName = static::getNewFileName(
+                static::_addDirSeparator($destinationFile) . $fileName
+            );
         }
 
-        $destinationFile = self::_addDirSeparator($destinationFile) . $fileName;
+        $destinationFile = static::_addDirSeparator($destinationFile) . $fileName;
 
         try {
             $this->_result = $this->_moveFile($this->_file['tmp_name'], $destinationFile);
@@ -258,6 +270,8 @@ private function validateDestination($destinationFolder)
     }
 
     /**
+     * Set access permissions to file.
+     *
      * @param string $file
      * @return void
      *
@@ -511,7 +525,7 @@ public function checkAllowedExtension($extension)
      */
     private function _getMimeType()
     {
-        return $this->_file['type'];
+        return $this->fileMime->getMimeType($this->_file['tmp_name']);
     }
 
     /**
@@ -534,7 +548,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 && !empty($file[0]) && !empty($file[1])) {
                 array_shift($file);
                 $this->_uploadType = self::MULTIPLE_STYLE;
 
@@ -547,7 +561,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 == '') {
@@ -610,8 +624,20 @@ public static function getNewFileName($destinationFile)
      *
      * @param string $fileName
      * @return string
+     * @deprecated
      */
     public static function getDispretionPath($fileName)
+    {
+        return self::getDispersionPath($fileName);
+    }
+
+    /**
+     * Get dispertion path
+     *
+     * @param string $fileName
+     * @return string
+     */
+    public static function getDispersionPath($fileName)
     {
         $char = 0;
         $dispertionPath = '';
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php
new file mode 100644
index 0000000000000..fe0e6b37666b7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filesystem\Directory;
+
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * @inheritDoc
+ *
+ * Validates paths using driver.
+ */
+class PathValidator implements PathValidatorInterface
+{
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @param DriverInterface $driver
+     */
+    public function __construct(DriverInterface $driver)
+    {
+        $this->driver = $driver;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        string $directoryPath,
+        string $path,
+        ?string $scheme = null,
+        bool $absolutePath = false
+    ): void {
+        $realDirectoryPath = $this->driver->getRealPathSafety($directoryPath);
+        if ($realDirectoryPath[-1] !== DIRECTORY_SEPARATOR) {
+            $realDirectoryPath .= DIRECTORY_SEPARATOR;
+        }
+        if (!$absolutePath) {
+            $actualPath = $this->driver->getRealPathSafety(
+                $this->driver->getAbsolutePath(
+                    $realDirectoryPath,
+                    $path,
+                    $scheme
+                )
+            );
+        } else {
+            $actualPath = $this->driver->getRealPathSafety($path);
+        }
+
+        if (mb_strpos($actualPath, $realDirectoryPath) !== 0
+            && $path .DIRECTORY_SEPARATOR !== $realDirectoryPath
+        ) {
+            throw new ValidatorException(
+                new Phrase(
+                    'Path "%1" cannot be used with directory "%2"',
+                    [$path, $directoryPath]
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/PathValidatorInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidatorInterface.php
new file mode 100644
index 0000000000000..ecb7da9aaeab6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidatorInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filesystem\Directory;
+
+use Magento\Framework\Exception\ValidatorException;
+
+/**
+ * Validate paths to be used with directories.
+ */
+interface PathValidatorInterface
+{
+    /**
+     * Validate if path can be used with a directory.
+     *
+     * @param string $directoryPath
+     * @param string $path
+     * @param string|null $scheme
+     * @param bool $absolutePath Is given path an absolute path?.
+     * @throws ValidatorException
+     *
+     * @return void
+     */
+    public function validate(
+        string $directoryPath,
+        string $path,
+        ?string $scheme = null,
+        bool $absolutePath = false
+    ): void;
+}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index 18c93f2f4e1c8..a3a4cec59953f 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -6,6 +6,7 @@
 namespace Magento\Framework\Filesystem\Directory;
 
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\ValidatorException;
 
 /**
  * @api
@@ -33,21 +34,52 @@ class Read implements ReadInterface
      */
     protected $driver;
 
+    /**
+     * @var PathValidatorInterface|null
+     */
+    private $pathValidator;
+
     /**
      * Constructor. Set properties.
      *
      * @param \Magento\Framework\Filesystem\File\ReadFactory $fileFactory
      * @param \Magento\Framework\Filesystem\DriverInterface $driver
      * @param string $path
+     * @param PathValidatorInterface|null $pathValidator
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\ReadFactory $fileFactory,
         \Magento\Framework\Filesystem\DriverInterface $driver,
-        $path
+        $path,
+        ?PathValidatorInterface $pathValidator = null
     ) {
         $this->fileFactory = $fileFactory;
         $this->driver = $driver;
         $this->setPath($path);
+        $this->pathValidator = $pathValidator;
+    }
+
+    /**
+     * @param null|string $path
+     * @param null|string $scheme
+     * @param bool $absolutePath
+     * @throws ValidatorException
+     *
+     * @return void
+     */
+    protected function validatePath(
+        ?string $path,
+        ?string $scheme = null,
+        bool $absolutePath = false
+    ): void {
+        if ($path && $this->pathValidator) {
+            $this->pathValidator->validate(
+                $this->path,
+                $path,
+                $scheme,
+                $absolutePath
+            );
+        }
     }
 
     /**
@@ -69,10 +101,13 @@ protected function setPath($path)
      *
      * @param string $path
      * @param string $scheme
+     * @throws ValidatorException
      * @return string
      */
     public function getAbsolutePath($path = null, $scheme = null)
     {
+        $this->validatePath($path, $scheme);
+
         return $this->driver->getAbsolutePath($this->path, $path, $scheme);
     }
 
@@ -80,10 +115,17 @@ public function getAbsolutePath($path = null, $scheme = null)
      * Retrieves relative path
      *
      * @param string $path
+     * @throws ValidatorException
      * @return string
      */
     public function getRelativePath($path = null)
     {
+        $this->validatePath(
+            $path,
+            null,
+            $path && $path[0] === DIRECTORY_SEPARATOR
+        );
+
         return $this->driver->getRelativePath($this->path, $path);
     }
 
@@ -91,10 +133,13 @@ public function getRelativePath($path = null)
      * Retrieve list of all entities in given path
      *
      * @param string|null $path
+     * @throws ValidatorException
      * @return string[]
      */
     public function read($path = null)
     {
+        $this->validatePath($path);
+
         $files = $this->driver->readDirectory($this->driver->getAbsolutePath($this->path, $path));
         $result = [];
         foreach ($files as $file) {
@@ -107,10 +152,13 @@ public function read($path = null)
      * Read recursively
      *
      * @param null $path
+     * @throws ValidatorException
      * @return string[]
      */
     public function readRecursively($path = null)
     {
+        $this->validatePath($path);
+
         $result = [];
         $paths = $this->driver->readDirectoryRecursively($this->driver->getAbsolutePath($this->path, $path));
         /** @var \FilesystemIterator $file */
@@ -126,10 +174,13 @@ public function readRecursively($path = null)
      *
      * @param string $pattern
      * @param string $path [optional]
+     * @throws ValidatorException
      * @return string[]
      */
     public function search($pattern, $path = null)
     {
+        $this->validatePath($path);
+
         if ($path) {
             $absolutePath = $this->driver->getAbsolutePath($this->path, $this->getRelativePath($path));
         } else {
@@ -150,9 +201,12 @@ public function search($pattern, $path = null)
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function isExist($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isExists($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -162,9 +216,12 @@ public function isExist($path = null)
      * @param string $path
      * @return array
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function stat($path)
     {
+        $this->validatePath($path);
+
         return $this->driver->stat($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -174,9 +231,12 @@ public function stat($path)
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function isReadable($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isReadable($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -184,11 +244,14 @@ public function isReadable($path = null)
      * Open file in read mode
      *
      * @param string $path
+     * @throws ValidatorException
      *
      * @return \Magento\Framework\Filesystem\File\ReadInterface
      */
     public function openFile($path)
     {
+        $this->validatePath($path);
+
         return $this->fileFactory->create(
             $this->driver->getAbsolutePath($this->path, $path),
             $this->driver
@@ -203,9 +266,12 @@ public function openFile($path)
      * @param resource|null $context
      * @return string
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function readFile($path, $flag = null, $context = null)
     {
+        $this->validatePath($path);
+
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
         return $this->driver->fileGetContents($absolutePath, $flag, $context);
     }
@@ -214,10 +280,13 @@ public function readFile($path, $flag = null, $context = null)
      * Check whether given path is file
      *
      * @param string $path
+     * @throws ValidatorException
      * @return bool
      */
     public function isFile($path)
     {
+        $this->validatePath($path);
+
         return $this->driver->isFile($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -225,10 +294,13 @@ public function isFile($path)
      * Check whether given path is directory
      *
      * @param string $path [optional]
+     * @throws ValidatorException
      * @return bool
      */
     public function isDirectory($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isDirectory($this->driver->getAbsolutePath($this->path, $path));
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
index a9fe7dcb7bf06..25a290455dc46 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
@@ -36,7 +36,15 @@ public function __construct(DriverPool $driverPool)
     public function create($path, $driverCode = DriverPool::FILE)
     {
         $driver = $this->driverPool->getDriver($driverCode);
-        $factory = new \Magento\Framework\Filesystem\File\ReadFactory($this->driverPool);
-        return new Read($factory, $driver, $path);
+        $factory = new \Magento\Framework\Filesystem\File\ReadFactory(
+            $this->driverPool
+        );
+
+        return new Read(
+            $factory,
+            $driver,
+            $path,
+            new PathValidator($driver)
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
index 5519245ec24b4..61108c64dda44 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Interface \Magento\Framework\Filesystem\Directory\ReadInterface
- *
+ * @api
  */
 interface ReadInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
index 4566f61b15572..3c6d2b7321b82 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\Directory;
 
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\ValidatorException;
 
+/**
+ * Write Interface implementation
+ */
 class Write extends Read implements WriteInterface
 {
     /**
@@ -23,16 +28,16 @@ class Write extends Read implements WriteInterface
      * @param \Magento\Framework\Filesystem\DriverInterface $driver
      * @param string $path
      * @param int $createPermissions
+     * @param PathValidatorInterface|null $pathValidator
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\WriteFactory $fileFactory,
         \Magento\Framework\Filesystem\DriverInterface $driver,
         $path,
-        $createPermissions = null
+        $createPermissions = null,
+        ?PathValidatorInterface $pathValidator = null
     ) {
-        $this->fileFactory = $fileFactory;
-        $this->driver = $driver;
-        $this->setPath($path);
+        parent::__construct($fileFactory, $driver, $path, $pathValidator);
         if (null !== $createPermissions) {
             $this->permissions = $createPermissions;
         }
@@ -51,7 +56,7 @@ protected function assertWritable($path)
             $path = (!$this->driver->isFile($path))
                 ? $this->getAbsolutePath($this->path, $path)
                 : $this->getAbsolutePath($path);
-            throw new FileSystemException(new \Magento\Framework\Phrase('The path "%1" is not writable', [$path]));
+            throw new FileSystemException(new \Magento\Framework\Phrase('The path "%1" is not writable.', [$path]));
         }
     }
 
@@ -68,7 +73,7 @@ protected function assertIsFile($path)
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
         if (!$this->driver->isFile($absolutePath)) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('The file "%1" doesn\'t exist or not a file', [$absolutePath])
+                new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$absolutePath])
             );
         }
     }
@@ -79,9 +84,11 @@ protected function assertIsFile($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function create($path = null)
     {
+        $this->validatePath($path);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
         if ($this->driver->isDirectory($absolutePath)) {
             return true;
@@ -97,9 +104,11 @@ public function create($path = null)
      * @param WriteInterface $targetDirectory
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function renameFile($path, $newPath, WriteInterface $targetDirectory = null)
     {
+        $this->validatePath($path);
         $this->assertIsFile($path);
         $targetDirectory = $targetDirectory ?: $this;
         if (!$targetDirectory->isExist($this->driver->getParentDirectory($newPath))) {
@@ -118,9 +127,11 @@ public function renameFile($path, $newPath, WriteInterface $targetDirectory = nu
      * @param WriteInterface $targetDirectory
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function copyFile($path, $destination, WriteInterface $targetDirectory = null)
     {
+        $this->validatePath($path);
         $this->assertIsFile($path);
 
         $targetDirectory = $targetDirectory ?: $this;
@@ -141,9 +152,11 @@ public function copyFile($path, $destination, WriteInterface $targetDirectory =
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function createSymlink($path, $destination, WriteInterface $targetDirectory = null)
     {
+        $this->validatePath($path);
         $targetDirectory = $targetDirectory ?: $this;
         $parentDirectory = $this->driver->getParentDirectory($destination);
         if (!$targetDirectory->isExist($parentDirectory)) {
@@ -161,9 +174,12 @@ public function createSymlink($path, $destination, WriteInterface $targetDirecto
      * @param string $path
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function delete($path = null)
     {
+        $exceptionMessages = [];
+        $this->validatePath($path);
         if (!$this->isExist($path)) {
             return true;
         }
@@ -171,11 +187,59 @@ public function delete($path = null)
         if ($this->driver->isFile($absolutePath)) {
             $this->driver->deleteFile($absolutePath);
         } else {
-            $this->driver->deleteDirectory($absolutePath);
+            try {
+                $this->deleteFilesRecursively($absolutePath);
+            } catch (FileSystemException $e) {
+                $exceptionMessages[] = $e->getMessage();
+            }
+            try {
+                $this->driver->deleteDirectory($absolutePath);
+            } catch (FileSystemException $e) {
+                $exceptionMessages[] = $e->getMessage();
+            }
+
+            if (!empty($exceptionMessages)) {
+                throw new FileSystemException(
+                    new \Magento\Framework\Phrase(
+                        \implode(' ', $exceptionMessages)
+                    )
+                );
+            }
         }
         return true;
     }
 
+    /**
+     * Delete files recursively
+     *
+     * Implemented in order to delete as much files as possible and collect all exceptions
+     *
+     * @param string $path
+     * @return void
+     * @throws FileSystemException
+     */
+    private function deleteFilesRecursively(string $path)
+    {
+        $exceptionMessages = [];
+        $entitiesList = $this->driver->readDirectoryRecursively($path);
+        foreach ($entitiesList as $entityPath) {
+            if ($this->driver->isFile($entityPath)) {
+                try {
+                    $this->driver->deleteFile($entityPath);
+                } catch (FileSystemException $e) {
+                    $exceptionMessages[] = $e->getMessage();
+                }
+            }
+        }
+        if (!empty($exceptionMessages)) {
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase(
+                    \implode(' ', $exceptionMessages)
+                )
+            );
+        }
+    }
+
     /**
      * Change permissions of given path
      *
@@ -183,10 +247,13 @@ public function delete($path = null)
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function changePermissions($path, $permissions)
     {
+        $this->validatePath($path);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->driver->changePermissions($absolutePath, $permissions);
     }
 
@@ -198,10 +265,13 @@ public function changePermissions($path, $permissions)
      * @param int $filePermissions
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function changePermissionsRecursively($path, $dirPermissions, $filePermissions)
     {
+        $this->validatePath($path);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->driver->changePermissionsRecursively($absolutePath, $dirPermissions, $filePermissions);
     }
 
@@ -212,9 +282,12 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
      * @param int|null $modificationTime
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function touch($path, $modificationTime = null)
     {
+        $this->validatePath($path);
+
         $folder = $this->driver->getParentDirectory($path);
         $this->create($folder);
         $this->assertWritable($folder);
@@ -224,12 +297,15 @@ public function touch($path, $modificationTime = null)
     /**
      * Check if given path is writable
      *
-     * @param null $path
+     * @param string|null $path
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function isWritable($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isWritable($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -240,13 +316,16 @@ public function isWritable($path = null)
      * @param string $mode
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function openFile($path, $mode = 'w')
     {
+        $this->validatePath($path);
         $folder = dirname($path);
         $this->create($folder);
         $this->assertWritable($this->isExist($path) ? $path : $folder);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->fileFactory->create($absolutePath, $this->driver, $mode);
     }
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
index a723ed6a7bea6..ff14b12f62047 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
@@ -37,7 +37,16 @@ public function __construct(DriverPool $driverPool)
     public function create($path, $driverCode = DriverPool::FILE, $createPermissions = null)
     {
         $driver = $this->driverPool->getDriver($driverCode);
-        $factory = new \Magento\Framework\Filesystem\File\WriteFactory($this->driverPool);
-        return new Write($factory, $driver, $path, $createPermissions);
+        $factory = new \Magento\Framework\Filesystem\File\WriteFactory(
+            $this->driverPool
+        );
+
+        return new Write(
+            $factory,
+            $driver,
+            $path,
+            $createPermissions,
+            new PathValidator($driver)
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
index c72651a78dad3..186cbcb81bff2 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Interface \Magento\Framework\Filesystem\Directory\WriteInterface
- *
+ * @api
  */
 interface WriteInterface extends ReadInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
index 2685ca13ac4ba..20874f60791c1 100644
--- a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
@@ -202,6 +202,7 @@ public function getRoot()
      *
      * @param string $code
      * @return string
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function getPath($code)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index 519ca21deadb2..59c9775d73a0a 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\Driver;
 
 use Magento\Framework\Exception\FileSystemException;
@@ -13,6 +14,7 @@
 
 /**
  * Class File
+ *
  * @package Magento\Framework\Filesystem\Driver
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -50,7 +52,7 @@ public function isExists($path)
         $result = @file_exists($this->getScheme() . $path);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Error occurred during execution %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase('An error occurred during "%1" execution.', [$this->getWarningMessage()])
             );
         }
         return $result;
@@ -88,7 +90,7 @@ public function isReadable($path)
         $result = @is_readable($this->getScheme() . $path);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Error occurred during execution %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase('An error occurred during "%1" execution.', [$this->getWarningMessage()])
             );
         }
         return $result;
@@ -107,7 +109,7 @@ public function isFile($path)
         $result = @is_file($this->getScheme() . $path);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Error occurred during execution %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase('An error occurred during "%1" execution.', [$this->getWarningMessage()])
             );
         }
         return $result;
@@ -126,7 +128,7 @@ public function isDirectory($path)
         $result = @is_dir($this->getScheme() . $path);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Error occurred during execution %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase('An error occurred during "%1" execution.', [$this->getWarningMessage()])
             );
         }
         return $result;
@@ -148,7 +150,7 @@ public function fileGetContents($path, $flag = null, $context = null)
         if (false === $result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Cannot read contents from file "%1" %2',
+                    'The contents from the "%1" file can\'t be read. %2',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -169,7 +171,7 @@ public function isWritable($path)
         $result = @is_writable($this->getScheme() . $path);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Error occurred during execution %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase('An error occurred during "%1" execution.', [$this->getWarningMessage()])
             );
         }
         return $result;
@@ -350,13 +352,13 @@ public function copy($source, $destination, DriverInterface $targetDriver = null
     public function symlink($source, $destination, DriverInterface $targetDriver = null)
     {
         $result = false;
-        if (get_class($targetDriver) == get_class($this)) {
+        if ($targetDriver === null || get_class($targetDriver) == get_class($this)) {
             $result = @symlink($this->getScheme() . $source, $destination);
         }
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Cannot create a symlink for "%1" and place it to "%2" %3',
+                    'A symlink for "%1" can\'t be created and placed to "%2". %3',
                     [
                         $source,
                         $destination,
@@ -380,7 +382,10 @@ public function deleteFile($path)
         $result = @unlink($this->getScheme() . $path);
         if (!$result) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('The file "%1" cannot be deleted %2', [$path, $this->getWarningMessage()])
+                new \Magento\Framework\Phrase(
+                    'The "%1" file can\'t be deleted. %2',
+                    [$path, $this->getWarningMessage()]
+                )
             );
         }
         return $result;
@@ -395,17 +400,36 @@ public function deleteFile($path)
      */
     public function deleteDirectory($path)
     {
+        $exceptionMessages = [];
         $flags = \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
         $iterator = new \FilesystemIterator($path, $flags);
         /** @var \FilesystemIterator $entity */
         foreach ($iterator as $entity) {
-            if ($entity->isDir()) {
-                $this->deleteDirectory($entity->getPathname());
-            } else {
-                $this->deleteFile($entity->getPathname());
+            try {
+                if ($entity->isDir()) {
+                    $this->deleteDirectory($entity->getPathname());
+                } else {
+                    $this->deleteFile($entity->getPathname());
+                }
+            } catch (FileSystemException $exception) {
+                $exceptionMessages[] = $exception->getMessage();
             }
         }
-        $result = @rmdir($this->getScheme() . $path);
+
+        if (!empty($exceptionMessages)) {
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase(
+                    \implode(' ', $exceptionMessages)
+                )
+            );
+        }
+
+        $fullPath = $this->getScheme() . $path;
+        if (is_link($fullPath)) {
+            $result = @unlink($fullPath);
+        } else {
+            $result = @rmdir($fullPath);
+        }
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
@@ -431,7 +455,7 @@ public function changePermissions($path, $permissions)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Cannot change permissions for path "%1" %2',
+                    'The permissions can\'t be changed for the "%1" path. %2.',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -459,7 +483,7 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Cannot change permissions for path "%1" %2',
+                    'The permissions can\'t be changed for the "%1" path. %2.',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -481,7 +505,7 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
             if (!$result) {
                 throw new FileSystemException(
                     new \Magento\Framework\Phrase(
-                        'Cannot change permissions for path "%1" %2',
+                        'The permissions can\'t be changed for the "%1" path. %2.',
                         [$path, $this->getWarningMessage()]
                     )
                 );
@@ -508,7 +532,7 @@ public function touch($path, $modificationTime = null)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'The file or directory "%1" cannot be touched %2',
+                    'The "%1" file or directory can\'t be touched. %2',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -531,7 +555,7 @@ public function filePutContents($path, $content, $mode = null)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'The specified "%1" file could not be written %2',
+                    'The specified "%1" file couldn\'t be written. %2',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -613,7 +637,10 @@ public function fileGetCsv($resource, $length = 0, $delimiter = ',', $enclosure
         $result = @fgetcsv($resource, $length, $delimiter, $enclosure, $escape);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Wrong CSV handle %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase(
+                    'The "%1" CSV handle is incorrect. Verify the handle and try again.',
+                    [$this->getWarningMessage()]
+                )
             );
         }
         return $result;
@@ -631,7 +658,7 @@ public function fileTell($resource)
         $result = @ftell($resource);
         if ($result === null) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Error occurred during execution %1', [$this->getWarningMessage()])
+                new \Magento\Framework\Phrase('An error occurred during "%1" execution.', [$this->getWarningMessage()])
             );
         }
         return $result;
@@ -652,7 +679,7 @@ public function fileSeek($resource, $offset, $whence = SEEK_SET)
         if ($result === -1) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Error occurred during execution of fileSeek %1',
+                    'An error occurred during "%1" fileSeek execution.',
                     [$this->getWarningMessage()]
                 )
             );
@@ -684,7 +711,7 @@ public function fileClose($resource)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Error occurred during execution of fileClose %1',
+                    'An error occurred during "%1" fileClose execution.',
                     [$this->getWarningMessage()]
                 )
             );
@@ -710,7 +737,7 @@ public function fileWrite($resource, $data)
             }
             if (false === $fwrite) {
                 $this->fileSystemException(
-                    'Error occurred during execution of fileWrite %1',
+                    'An error occurred during "%1" fileWrite execution.',
                     [$this->getWarningMessage()]
                 );
             }
@@ -763,7 +790,7 @@ public function filePutCsv($resource, array $data, $delimiter = ',', $enclosure
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Error occurred during execution of filePutCsv %1',
+                    'An error occurred during "%1" filePutCsv execution.',
                     [$this->getWarningMessage()]
                 )
             );
@@ -784,7 +811,7 @@ public function fileFlush($resource)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Error occurred during execution of fileFlush %1',
+                    'An error occurred during "%1" fileFlush execution.',
                     [$this->getWarningMessage()]
                 )
             );
@@ -806,7 +833,7 @@ public function fileLock($resource, $lockMode = LOCK_EX)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Error occurred during execution of fileLock %1',
+                    'An error occurred during "%1" fileLock execution.',
                     [$this->getWarningMessage()]
                 )
             );
@@ -827,7 +854,7 @@ public function fileUnlock($resource)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Error occurred during execution of fileUnlock %1',
+                    'An error occurred during "%1" fileUnlock execution.',
                     [$this->getWarningMessage()]
                 )
             );
@@ -836,6 +863,8 @@ public function fileUnlock($resource)
     }
 
     /**
+     * Returns an absolute path for the given one.
+     *
      * @param string $basePath
      * @param string $path
      * @param string|null $scheme
@@ -872,7 +901,8 @@ public function getRelativePath($basePath, $path = null)
     }
 
     /**
-     * Fixes path separator
+     * Fixes path separator.
+     *
      * Utility method.
      *
      * @param string $path
@@ -943,6 +973,13 @@ public function getRealPathSafety($path)
         if (strpos($path, DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR) === false) {
             return $path;
         }
+
+        //Removing redundant directory separators.
+        $path = preg_replace(
+            '/\\' .DIRECTORY_SEPARATOR .'\\' .DIRECTORY_SEPARATOR .'+/',
+            DIRECTORY_SEPARATOR,
+            $path
+        );
         $pathParts = explode(DIRECTORY_SEPARATOR, $path);
         $realPath = [];
         foreach ($pathParts as $pathPart) {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 09d5372291a0a..3668bd17477a4 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -5,13 +5,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\Driver;
 
 use Magento\Framework\Exception\FileSystemException;
 
 /**
  * Class Http
- *
  */
 class Http extends File
 {
@@ -35,6 +35,11 @@ public function isExists($path)
 
         $status = $headers[0];
 
+        /* Handling 302 redirection */
+        if (strpos($status, '302 Found') !== false && isset($headers[1])) {
+            $status = $headers[1];
+        }
+
         if (strpos($status, '200 OK') === false) {
             $result = false;
         } else {
@@ -91,7 +96,7 @@ public function fileGetContents($path, $flags = null, $context = null)
         if (false === $result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'Cannot read contents from file "%1" %2',
+                    'The contents from the "%1" file can\'t be read. %2',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -115,7 +120,7 @@ public function filePutContents($path, $content, $mode = null, $context = null)
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
-                    'The specified "%1" file could not be written %2',
+                    'The specified "%1" file couldn\'t be written. %2',
                     [$path, $this->getWarningMessage()]
                 )
             );
@@ -137,7 +142,9 @@ public function fileOpen($path, $mode)
         $urlProp = $this->parseUrl($this->getScheme() . $path);
 
         if (false === $urlProp) {
-            throw new FileSystemException(new \Magento\Framework\Phrase('Please correct the download URL.'));
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase('The download URL is incorrect. Verify and try again.')
+            );
         }
 
         $hostname = $urlProp['host'];
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Read.php b/lib/internal/Magento/Framework/Filesystem/File/Read.php
index e475bea31c380..f48e50b7d693d 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Read.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\File;
 
 use Magento\Framework\Filesystem\DriverInterface;
@@ -72,7 +73,9 @@ protected function open()
     protected function assertValid()
     {
         if (!$this->driver->isExists($this->path)) {
-            throw new FileSystemException(new \Magento\Framework\Phrase('The file "%1" doesn\'t exist', [$this->path]));
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$this->path])
+            );
         }
         return true;
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index 38b581da752b7..5d9badf42073f 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -8,6 +8,10 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Filesystem\DriverPool;
 
+/**
+ * Opens a file for reading
+ * @api
+ */
 class ReadFactory
 {
     /**
@@ -28,7 +32,7 @@ public function __construct(DriverPool $driverPool)
     }
 
     /**
-     * Create a readable file
+     * Create a {@see ReaderInterface}
      *
      * @param string $path
      * @param DriverInterface|string $driver Driver or driver code
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Write.php b/lib/internal/Magento/Framework/Filesystem/File/Write.php
index 03f8b38a6e930..913421aa91ad2 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Write.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\File;
 
 use Magento\Framework\Filesystem\DriverInterface;
@@ -33,7 +34,9 @@ protected function assertValid()
     {
         $fileExists = $this->driver->isExists($this->path);
         if (!$fileExists && preg_match('/r/', $this->mode)) {
-            throw new FileSystemException(new \Magento\Framework\Phrase('The file "%1" doesn\'t exist', [$this->path]));
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$this->path])
+            );
         } elseif ($fileExists && preg_match('/x/', $this->mode)) {
             throw new FileSystemException(new \Magento\Framework\Phrase('The file "%1" already exists', [$this->path]));
         }
@@ -100,7 +103,7 @@ public function flush()
      * @param int $lockMode
      * @return bool
      */
-    public function lock($lockMode = LOCK_EX)
+    public function lock($lockMode = \LOCK_EX)
     {
         return $this->driver->fileLock($this->resource, $lockMode);
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index 64683a104784d..af2a43ceaedc3 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -8,7 +8,11 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Filesystem\DriverPool;
 
-class WriteFactory
+/**
+ * Opens a file for reading and/or writing
+ * @api
+ */
+class WriteFactory extends ReadFactory
 {
     /**
      * Pool of filesystem drivers
@@ -24,16 +28,17 @@ class WriteFactory
      */
     public function __construct(DriverPool $driverPool)
     {
+        parent::__construct($driverPool);
         $this->driverPool = $driverPool;
     }
 
     /**
-     * Create a readable file.
+     * Create a {@see WriterInterface}
      *
      * @param string $path
      * @param DriverInterface|string $driver Driver or driver code
      * @param string $mode [optional]
-     * @return Write
+     * @return WriteInterface
      */
     public function create($path, $driver, $mode = 'r')
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
index 3592c34dae7f6..ecf554de808cc 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
@@ -44,7 +44,7 @@ public function flush();
      * @param int $lockMode
      * @return bool
      */
-    public function lock($lockMode = LOCK_EX);
+    public function lock($lockMode = \LOCK_EX);
 
     /**
      * File unlocking
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/File.php b/lib/internal/Magento/Framework/Filesystem/Io/File.php
index 7849fdf31031f..8fec7f7630257 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/File.php
@@ -233,7 +233,7 @@ public function streamStat($part = null, $default = null)
         }
         $stat = @fstat($this->_streamHandler);
         if ($part !== null) {
-            return isset($stat[$part]) ? $stat[$part] : $default;
+            return $stat[$part] ?? $default;
         }
         return $stat;
     }
@@ -366,7 +366,7 @@ protected static function _recursiveCallback($dir, array $fileCallback, array $d
             $dirCallback = $fileCallback;
         }
         if (is_dir($dir)) {
-            foreach (scandir($dir) as $item) {
+            foreach (scandir($dir, SCANDIR_SORT_NONE) as $item) {
                 if (!strcmp($item, '.') || !strcmp($item, '..')) {
                     continue;
                 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
index 2a1938df4d687..04df5fd3f3a6c 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\Io;
 
-use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Phrase;
 use Magento\Framework\Exception\LocalizedException;
 
@@ -78,7 +78,7 @@ public function open(array $args = [])
     {
         if (empty($args['host'])) {
             $this->_error = self::ERROR_EMPTY_HOST;
-            throw new LocalizedException(new Phrase('Empty host specified'));
+            throw new LocalizedException(new Phrase('The specified host is empty. Set the host and try again.'));
         }
 
         if (empty($args['port'])) {
@@ -111,20 +111,22 @@ public function open(array $args = [])
         }
         if (!$this->_conn) {
             $this->_error = self::ERROR_INVALID_CONNECTION;
-            throw new LocalizedException(new Phrase('Could not establish FTP connection, invalid host or port'));
+            throw new LocalizedException(
+                new Phrase("The FTP connection couldn't be established because of an invalid host or port.")
+            );
         }
 
         if (!@ftp_login($this->_conn, $this->_config['user'], $this->_config['password'])) {
             $this->_error = self::ERROR_INVALID_LOGIN;
             $this->close();
-            throw new LocalizedException(new Phrase('Invalid user name or password'));
+            throw new LocalizedException(new Phrase('The username or password is invalid. Verify both and try again.'));
         }
 
         if (!empty($this->_config['path'])) {
             if (!@ftp_chdir($this->_conn, $this->_config['path'])) {
                 $this->_error = self::ERROR_INVALID_PATH;
                 $this->close();
-                throw new LocalizedException(new Phrase('Invalid path'));
+                throw new LocalizedException(new Phrase('The path is invalid. Verify and try again.'));
             }
         }
 
@@ -132,7 +134,7 @@ public function open(array $args = [])
             if (!@ftp_pasv($this->_conn, true)) {
                 $this->_error = self::ERROR_INVALID_MODE;
                 $this->close();
-                throw new LocalizedException(new Phrase('Invalid file transfer mode'));
+                throw new LocalizedException(new Phrase('The file transfer mode is invalid. Verify and try again.'));
             }
         }
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
index c31d3ff9e52ba..93c85ebafe727 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Framework\Filesystem\Io;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * Input/output client interface
+ * @api
  */
 interface IoInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
index a04e4fcbb12d0..119c89f033480 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
@@ -17,7 +17,7 @@ class Sftp extends AbstractIo
     const SSH2_PORT = 22;
 
     /**
-     * @var \phpseclib\Net\SFTP $_connection
+     * @var \phpseclib\Net\SFTP
      */
     protected $_connection = null;
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php
index 8a96f79179bd7..96b56de8451c2 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php
@@ -21,7 +21,8 @@ public function testGetDefaultConfig()
      */
     public function testValidate($config, $expectedError)
     {
-        $this->expectException('\InvalidArgumentException', $expectedError);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($expectedError);
         DirectoryList::validate($config);
     }
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
index 97a3b8f498491..5d1f9664bde61 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
@@ -31,6 +31,9 @@ public function testGetAbsolutePath($basePath, $path, $expected)
         $this->assertEquals($expected, $file->getAbsolutePath($basePath, $path));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestGetAbsolutePath()
     {
         return [
@@ -50,6 +53,9 @@ public function testGetRelativePath($basePath, $path, $expected)
         $this->assertEquals($expected, $file->getRelativePath($basePath, $path));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestGetRelativePath()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
index 51a994dc73ff5..8fc57f458334e 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem\Test\Unit\Driver;
 
 use \Magento\Framework\Filesystem\Driver\Http;
@@ -40,6 +41,9 @@ public function testIsExists($status, $result)
         $this->assertEquals($result, (new Http())->isExists(''));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestIsExists()
     {
         return [['200 OK', true], ['404 Not Found', false]];
@@ -54,6 +58,9 @@ public function testStat($headers, $result)
         $this->assertEquals($result, (new Http())->stat(''));
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestStat()
     {
         $headers1 = [
@@ -130,7 +137,7 @@ public function testFilePutContentsFail()
 
     /**
      * @expectedException \Magento\Framework\Exception\FileSystemException
-     * @expectedExceptionMessage Please correct the download URL.
+     * @expectedExceptionMessage The download URL is incorrect. Verify and try again.
      */
     public function testFileOpenInvalidUrl()
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
index 07524f9c3595f..8dcb4befa6cac 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
@@ -39,6 +39,9 @@ public function testExclusion()
         $this->assertTrue(!in_array(BP . '/var/session/', $result), 'Filtered path should not be in array');
     }
 
+    /**
+     * @return \Generator
+     */
     private function getFilesIterator()
     {
         $files = [
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php
index c2115205e6bd2..93b12f8d56ff8 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php
@@ -7,8 +7,6 @@
 
 use \Magento\Framework\Filesystem\File\ReadFactory;
 
-use Magento\Framework\Filesystem\DriverPool;
-
 /**
  * Class ReadFactoryTest
  */
diff --git a/lib/internal/Magento/Framework/Filter/AbstractFactory.php b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
index 2a0ae0ba15e42..c30b07aa09061 100644
--- a/lib/internal/Magento/Framework/Filter/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
@@ -68,7 +68,7 @@ public function canCreateFilter($alias)
      */
     public function isShared($class)
     {
-        return isset($this->shared[$class]) ? $this->shared[$class] : $this->shareByDefault;
+        return $this->shared[$class] ?? $this->shareByDefault;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filter/DataObject/Grid.php b/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
index 7676558a927b0..54dccc8ae5b82 100644
--- a/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
+++ b/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Filter\DataObject;
 
-use Magento\Framework\DataObject;
-
 class Grid extends \Magento\Framework\Filter\DataObject
 {
     /**
diff --git a/lib/internal/Magento/Framework/Filter/Factory.php b/lib/internal/Magento/Framework/Filter/Factory.php
index a5e5978a83f06..dbe037ecbbbd1 100644
--- a/lib/internal/Magento/Framework/Filter/Factory.php
+++ b/lib/internal/Magento/Framework/Filter/Factory.php
@@ -32,6 +32,7 @@ class Factory extends AbstractFactory
         'decrypt' => \Magento\Framework\Filter\Decrypt::class,
         'translit' => \Magento\Framework\Filter\Translit::class,
         'translitUrl' => \Magento\Framework\Filter\TranslitUrl::class,
+        'truncateFilter' => \Magento\Framework\Filter\TruncateFilter::class,
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Filter/FilterManager.php b/lib/internal/Magento/Framework/Filter/FilterManager.php
index 52c9d017ad11c..ca5d998af833f 100644
--- a/lib/internal/Magento/Framework/Filter/FilterManager.php
+++ b/lib/internal/Magento/Framework/Filter/FilterManager.php
@@ -21,6 +21,7 @@
  * @method string removeTags(string $value, $params = array())
  * @method string stripTags(string $value, $params = array())
  * @method string truncate(string $value, $params = array())
+ * @method string truncateFilter(string $value, $params = array())
  * @method string encrypt(string $value, $params = array())
  * @method string decrypt(string $value, $params = array())
  * @method string translit(string $value)
diff --git a/lib/internal/Magento/Framework/Filter/Input.php b/lib/internal/Magento/Framework/Filter/Input.php
index 39c7a54786edb..6da748fcbeb9f 100644
--- a/lib/internal/Magento/Framework/Filter/Input.php
+++ b/lib/internal/Magento/Framework/Filter/Input.php
@@ -183,7 +183,7 @@ public function getFilters($name = null)
         if (null === $name) {
             return $this->_filters;
         } else {
-            return isset($this->_filters[$name]) ? $this->_filters[$name] : null;
+            return $this->_filters[$name] ?? null;
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Filter/RemoveTags.php b/lib/internal/Magento/Framework/Filter/RemoveTags.php
index 63528dd4234c3..ca581176de368 100644
--- a/lib/internal/Magento/Framework/Filter/RemoveTags.php
+++ b/lib/internal/Magento/Framework/Filter/RemoveTags.php
@@ -34,7 +34,8 @@ public function filter($value)
             [$this, '_convertEntities'],
             $value
         );
-        $value = strip_tags($value);
-        return htmlspecialchars_decode($value);
+        $value = htmlspecialchars_decode($value);
+        
+        return strip_tags($value);
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 10b6a17ea57dc..3e5f9bcf0bd27 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -10,6 +10,8 @@
 namespace Magento\Framework\Filter;
 
 /**
+ * Template filter
+ *
  * @api
  */
 class Template implements \Zend_Filter_Interface
@@ -228,8 +230,9 @@ protected function afterFilter($value)
     }
 
     /**
-     * Adds a callback to run after main filtering has happened. Callback must accept a single argument and return
-     * a string of the processed value.
+     * Adds a callback to run after main filtering has happened.
+     *
+     * Callback must accept a single argument and return a string of the processed value.
      *
      * @param callable $afterFilterCallback
      * @return $this
@@ -257,6 +260,8 @@ protected function resetAfterFilterCallbacks()
     }
 
     /**
+     * Get var directive
+     *
      * @param string[] $construction
      * @return string
      */
@@ -302,6 +307,8 @@ public function templateDirective($construction)
     }
 
     /**
+     * Get depend directive
+     *
      * @param string[] $construction
      * @return string
      */
@@ -320,6 +327,8 @@ public function dependDirective($construction)
     }
 
     /**
+     * If directive
+     *
      * @param string[] $construction
      * @return string
      */
@@ -374,7 +383,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
         $stackVars = $tokenizer->tokenize();
         $result = $default;
         $last = 0;
-        for ($i = 0; $i < count($stackVars); $i++) {
+        for ($i = 0, $count = count($stackVars); $i < $count; $i++) {
             if ($i == 0 && isset($this->templateVars[$stackVars[$i]['name']])) {
                 // Getting of template value
                 $stackVars[$i]['variable'] = & $this->templateVars[$stackVars[$i]['name']];
diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
index 67c2d17abe208..574ef9faf74a5 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
@@ -313,6 +313,6 @@ public function getNumber()
         if (!$this->isNumeric()) {
             $this->prev();
         }
-        return floatval($value);
+        return (float)$value;
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
index a8cf48eef433f..7c1ae92b10fc2 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
@@ -33,6 +33,9 @@ public function testFilter($input, $expectedOutput)
         );
     }
 
+    /**
+     * @return array
+     */
     public function filterDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php
index 7ac9a7fe583c4..8fc9685aa7c42 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/RemoveTagsTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Filter\Test\Unit;
 
+/**
+ * Test for \Magento\Framework\Filter\RemoveTags
+ */
 class RemoveTagsTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -19,4 +22,13 @@ public function testRemoveTags()
         $expected = '10 < 11 > 10';
         $this->assertSame($expected, $actual);
     }
+
+    public function testFilterEncodedValue()
+    {
+        $input = '&quot;&gt;&lt;script&gt;alert(&quot;website&quot;)&lt;/script&gt;&lt;br a=&quot;';
+        $removeTags = new \Magento\Framework\Filter\RemoveTags();
+        $actual = $removeTags->filter($input);
+        $expected = '">alert("website")';
+        $this->assertSame($expected, $actual);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php
index 2c42eb3d1c8db..f0dc0d9bd7874 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/StripTagsTest.php
@@ -12,7 +12,8 @@ class StripTagsTest extends \PHPUnit\Framework\TestCase
      */
     public function testStripTags()
     {
-        $stripTags = new \Magento\Framework\Filter\StripTags(new \Magento\Framework\Escaper());
+        $escaper = $this->createMock(\Magento\Framework\Escaper::class);
+        $stripTags = new \Magento\Framework\Filter\StripTags($escaper);
         $this->assertEquals('three', $stripTags->filter('<two>three</two>'));
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
index 126d3f9f2f691..fdce369ba2946 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
@@ -41,6 +41,9 @@ public function testGetValue($string, $expectedValue)
         $this->assertEquals($expectedValue, $this->_filter->getValue());
     }
 
+    /**
+     * @return array
+     */
     public function sampleTokenizeStringProvider()
     {
         return [
@@ -51,6 +54,9 @@ public function sampleTokenizeStringProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function sampleGetValueStringProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
index 793637203bb0d..4dad75a6bcb5b 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
@@ -30,6 +30,9 @@ public function testTokenize($string, $expectedValue)
         $this->assertEquals($expectedValue, $this->_filter->tokenize());
     }
 
+    /**
+     * @return array
+     */
     public function sampleTokenizeStringProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index d962f2265a01e..4883dc5fbe33b 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -138,6 +138,9 @@ public function testVarDirective($construction, $variables, $expectedResult)
         $this->assertEquals($expectedResult, $this->templateFilter->filter($construction));
     }
 
+    /**
+     * @return array
+     */
     public function varDirectiveDataProvider()
     {
         /* @var $dataObjectVariable \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/lib/internal/Magento/Framework/Filter/Translit.php b/lib/internal/Magento/Framework/Filter/Translit.php
index 7a84a6e33af18..a6162aa7a7fff 100644
--- a/lib/internal/Magento/Framework/Filter/Translit.php
+++ b/lib/internal/Magento/Framework/Filter/Translit.php
@@ -409,7 +409,7 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
         $convertConfig = $config->getValue('url/convert', 'default');
         if ($convertConfig) {
             foreach ($convertConfig as $configValue) {
-                $this->convertTable[strval($configValue['from'])] = strval($configValue['to']);
+                $this->convertTable[(string)$configValue['from']] = (string)$configValue['to'];
             }
         }
     }
diff --git a/lib/internal/Magento/Framework/Filter/Truncate.php b/lib/internal/Magento/Framework/Filter/Truncate.php
index fd4fbe9910427..a4dd35b302705 100644
--- a/lib/internal/Magento/Framework/Filter/Truncate.php
+++ b/lib/internal/Magento/Framework/Filter/Truncate.php
@@ -10,6 +10,9 @@
  *
  * Truncate a string to a certain length if necessary, appending the $etc string.
  * $remainder will contain the string that has been replaced with $etc.
+ *
+ * @deprecated
+ * @see \Magento\Framework\Filter\TruncateFilter
  */
 class Truncate implements \Zend_Filter_Interface
 {
diff --git a/lib/internal/Magento/Framework/Filter/TruncateFilter.php b/lib/internal/Magento/Framework/Filter/TruncateFilter.php
new file mode 100644
index 0000000000000..a41469bb6f2a9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/TruncateFilter.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter;
+
+use Magento\Framework\Filter\TruncateFilter\Result;
+use Magento\Framework\Filter\TruncateFilter\ResultFactory;
+
+/**
+ * Truncate filter
+ *
+ * Truncate a string to a certain length if necessary, appending the $etc string.
+ * $remainder will contain the string that has been replaced with $etc.
+ */
+class TruncateFilter implements \Zend_Filter_Interface
+{
+    /**
+     * @var int
+     */
+    private $length;
+
+    /**
+     * @var string
+     */
+    private $etc;
+
+    /**
+     * @var bool
+     */
+    private $breakWords;
+
+    /**
+     * @var \Magento\Framework\Stdlib\StringUtils
+     */
+    private $stringUtils;
+
+    /**
+     * @var ResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @param \Magento\Framework\Stdlib\StringUtils $stringUtils
+     * @param ResultFactory $resultFactory
+     * @param int $length
+     * @param string $etc
+     * @param bool $breakWords
+     */
+    public function __construct(
+        \Magento\Framework\Stdlib\StringUtils $stringUtils,
+        ResultFactory $resultFactory,
+        $length = 80,
+        $etc = '...',
+        $breakWords = true
+    ) {
+        $this->stringUtils = $stringUtils;
+        $this->resultFactory = $resultFactory;
+        $this->length = $length;
+        $this->etc = $etc;
+        $this->breakWords = $breakWords;
+    }
+
+    /**
+     * Filter value
+     *
+     * @param string $string
+     * @return Result
+     */
+    public function filter($string) : Result
+    {
+        /** @var Result $result */
+        $result = $this->resultFactory->create(['value' => $string, 'remainder' => '']);
+        $length = $this->length;
+        if (0 == $length) {
+            $result->setValue('');
+            return $result;
+        }
+
+        $originalLength = $this->stringUtils->strlen($string);
+        if ($originalLength > $length) {
+            $length -= $this->stringUtils->strlen($this->etc);
+            if ($length <= 0) {
+                $result->setValue('');
+                return $result;
+            }
+            $preparedString = $string;
+            $preparedLength = $length;
+            if (!$this->breakWords) {
+                $preparedString = preg_replace(
+                    '/\s+?(\S+)?$/u',
+                    '',
+                    $this->stringUtils->substr($string, 0, $length + 1)
+                );
+                $preparedLength = $this->stringUtils->strlen($preparedString);
+            }
+            $result->setRemainder($this->stringUtils->substr($string, $preparedLength, $originalLength));
+            $result->setValue($this->stringUtils->substr($preparedString, 0, $length) . $this->etc);
+            return $result;
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/TruncateFilter/Result.php b/lib/internal/Magento/Framework/Filter/TruncateFilter/Result.php
new file mode 100644
index 0000000000000..c1ee6be6dadf5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/TruncateFilter/Result.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\TruncateFilter;
+
+class Result
+{
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @var string
+     */
+    private $remainder;
+
+    /**
+     * Result constructor.
+     * @param string $value
+     * @param string $remainder
+     */
+    public function __construct(string $value, string $remainder)
+    {
+        $this->value = $value;
+        $this->remainder = $remainder;
+    }
+
+    /**
+     * Set result value
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue(string $value) : void
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Get value
+     *
+     * @return string
+     */
+    public function getValue() : string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set remainder
+     *
+     * @param string $remainder
+     * @return void
+     */
+    public function setRemainder(string $remainder) : void
+    {
+        $this->remainder = $remainder;
+    }
+
+    /**
+     * Get remainder
+     *
+     * @return string
+     */
+    public function getRemainder() : string
+    {
+        return $this->remainder;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument.php b/lib/internal/Magento/Framework/GraphQl/Argument.php
deleted file mode 100644
index 502e0ffcfa10c..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl;
-
-use Magento\Framework\GraphQl\Argument\ArgumentValueInterface;
-
-/**
- * Simple Implementation for interface ArgumentInterface, representing an argument of a field.
- */
-class Argument implements ArgumentInterface
-{
-    /** @var string */
-    protected $name;
-
-    /** @var ArgumentValueInterface|ArgumentValueInterface[]|int|int[]|string|string[]|float|float[]|bool */
-    protected $value;
-
-    /**
-     * @param string $name
-     * @param bool|float|int|ArgumentValueInterface|string $value
-     */
-    public function __construct($name, $value)
-    {
-        $this->name = $name;
-        $this->value = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/ArgumentValueInterface.php b/lib/internal/Magento/Framework/GraphQl/Argument/ArgumentValueInterface.php
deleted file mode 100644
index 53035b8e8daa3..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/ArgumentValueInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Argument;
-
-/**
- * Marker interface to be used for complex values for an argument of a field
- */
-interface ArgumentValueInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause.php b/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause.php
deleted file mode 100644
index 5cab7d06fae3c..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Argument\Filter;
-
-use Magento\Framework\GraphQl\Argument\Filter\Clause\ReferenceType;
-
-/**
- * Class clause refers to a closure in find argument.
- *
- * Example: {sku: {eq: "product"}}
- */
-class Clause
-{
-    /**
-     * @var ReferenceType
-     */
-    private $referenceType;
-
-    /**
-     * @var string
-     */
-    private $fieldName;
-
-    /**
-     * @var string
-     */
-    private $clauseType;
-
-    /**
-     * @var string
-     */
-    private $clauseValue;
-
-    /**
-     * @param ReferenceType $referenceType
-     * @param string $fieldName
-     * @param string $clauseType
-     * @param string|array $clauseValue
-     */
-    public function __construct(
-        ReferenceType $referenceType,
-        string $fieldName,
-        string $clauseType,
-        $clauseValue
-    ) {
-        $this->referenceType = $referenceType;
-        $this->fieldName = $fieldName;
-        $this->clauseType = $clauseType;
-        $this->clauseValue = $clauseValue;
-    }
-
-    /**
-     * Get the referenced type of the entity for the field
-     *
-     * @return ReferenceType
-     */
-    public function getReferencedType()
-    {
-        return $this->referenceType;
-    }
-
-    /**
-     * Get the field name
-     *
-     * @return string
-     */
-    public function getFieldName()
-    {
-        return $this->fieldName;
-    }
-
-    /**
-     * Get the clause type
-     *
-     * @return string
-     */
-    public function getClauseType()
-    {
-        return $this->clauseType;
-    }
-
-    /**
-     * Get the clause value
-     *
-     * @return string|array
-     */
-    public function getClauseValue()
-    {
-        return $this->clauseValue;
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause/ReferenceType.php b/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause/ReferenceType.php
deleted file mode 100644
index 5ae028043a61a..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause/ReferenceType.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\Filter\Clause;
-
-/**
- * Class that hold relation between entities through fields
- */
-class ReferenceType
-{
-    /**
-     * @var ReferenceType
-     */
-    private $referenceType;
-
-    /**
-     * @var string
-     */
-    private $entityType;
-
-    /**
-     * @var string
-     */
-    private $linkField;
-
-    /**
-     * @param string $entityType
-     * @param string|null $linkField
-     * @param ReferenceType|null $referenceType
-     */
-    public function __construct(
-        string $entityType,
-        string $linkField = null,
-        ReferenceType $referenceType = null
-    ) {
-        $this->entityType = $entityType;
-        $this->linkField = $linkField;
-        $this->referenceType = $referenceType;
-    }
-
-    /**
-     * Get the reference type
-     *
-     * @return ReferenceType
-     */
-    public function getReferenceType()
-    {
-        return $this->referenceType;
-    }
-
-    /**
-     * Get the linked field as string
-     *
-     * @return string
-     */
-    public function getLinkField()
-    {
-        return $this->linkField;
-    }
-
-    /**
-     * Get the entity type
-     *
-     * @return string
-     */
-    public function getEntityType()
-    {
-        return $this->entityType;
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause/ReferenceTypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause/ReferenceTypeFactory.php
deleted file mode 100644
index 3d683d85cceff..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Clause/ReferenceTypeFactory.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Argument\Filter\Clause;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Factory for @see ReferenceType
- */
-class ReferenceTypeFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(
-        ObjectManagerInterface $objectManager
-    ) {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Create ReferenceType class
-     *
-     * @param string $entityType
-     * @param string|null $linkField
-     * @param ReferenceType|null $referenceType
-     * @return ReferenceType
-     */
-    public function create(string $entityType, string $linkField = null, ReferenceType $referenceType = null)
-    {
-        return $this->objectManager->create(
-            ReferenceType::class,
-            [
-                'entityType' => $entityType,
-                'linkField' => $linkField,
-                'referenceType' => $referenceType
-            ]
-        );
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValue.php b/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValue.php
deleted file mode 100644
index 353505207c03a..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValue.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\Filter;
-
-/**
- * Class that holds the find structure is value of connective for easy parsing
- */
-class FilterArgumentValue implements FilterArgumentValueInterface
-{
-    /**
-     * @var Connective
-     */
-    private $value;
-
-    /**
-     * @param Connective $value
-     */
-    public function __construct(Connective $value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValueFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValueFactory.php
deleted file mode 100644
index c2d855b750df5..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValueFactory.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Argument\Filter;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Factory for @see FilterArgumentValue class
- */
-class FilterArgumentValueFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(
-        ObjectManagerInterface $objectManager
-    ) {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Create a FilterArgumentValue class
-     *
-     * @param Connective $connective
-     * @return FilterArgumentValue
-     */
-    public function create(Connective $connective)
-    {
-        return $this->objectManager->create(
-            FilterArgumentValue::class,
-            [
-                'value' => $connective,
-            ]
-        );
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValueInterface.php b/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValueInterface.php
deleted file mode 100644
index 8806069f9d0ec..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/FilterArgumentValueInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Argument\Filter;
-
-use Magento\Framework\GraphQl\Argument\ArgumentValueInterface;
-
-/**
- * Specific interface for the find argument of a field used for filtering
- */
-interface FilterArgumentValueInterface extends ArgumentValueInterface
-{
-    /**
-     * Return a structure as connective that defines a find argument used for filtering
-     *
-     * @return Connective
-     */
-    public function getValue();
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/CurrentPage.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/CurrentPage.php
deleted file mode 100644
index 11c50251c7cde..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/CurrentPage.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplier;
-
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplierInterface;
-use Magento\Framework\Phrase;
-
-/**
- * Class for CurrentPage Argument
- */
-class CurrentPage implements ArgumentApplierInterface
-{
-    const ARGUMENT_NAME = 'currentPage';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function applyArgument(SearchCriteriaInterface $searchCriteria, ArgumentInterface $argument)
-    {
-        if (is_int($argument->getValue()) || is_string($argument->getValue())) {
-            $searchCriteria->setCurrentPage($argument->getValue());
-        } else {
-            throw new \Magento\Framework\Exception\RuntimeException(
-                new Phrase('Argument %1 not of type Int', [$argument->getName()])
-            );
-        }
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Filter.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Filter.php
deleted file mode 100644
index e542e0bde5120..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Filter.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplier;
-
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\GraphQl\Argument\Filter\FilterArgumentValueInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplierInterface;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\FilterGroupFactory;
-use Magento\Framework\Phrase;
-
-/**
- * Class for Filter Argument
- */
-class Filter implements ArgumentApplierInterface
-{
-    const ARGUMENT_NAME = 'filter';
-
-    /**
-     * @var FilterGroupFactory
-     */
-    private $filterGroupFactory;
-
-    /**
-     * @param FilterGroupFactory|null $filterGroupFactory
-     */
-    public function __construct($filterGroupFactory = null)
-    {
-        $this->filterGroupFactory = $filterGroupFactory ?: ObjectManager::getInstance()
-            ->get(FilterGroupFactory::class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function applyArgument(SearchCriteriaInterface $searchCriteria, ArgumentInterface $argument)
-    {
-        $filter = $argument->getValue();
-        if ($filter instanceof FilterArgumentValueInterface) {
-            $searchCriteria->setFilterGroups($this->filterGroupFactory->create($filter));
-        } else {
-            throw new \Magento\Framework\Exception\RuntimeException(
-                new Phrase('Argument %1 not of type %2', [$argument->getName(), FilterArgumentValueInterface::class])
-            );
-        }
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/PageSize.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/PageSize.php
deleted file mode 100644
index 71b27f2754678..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/PageSize.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplier;
-
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplierInterface;
-use Magento\Framework\Phrase;
-
-/**
- * Class for PageSize Argument
- */
-class PageSize implements ArgumentApplierInterface
-{
-    const ARGUMENT_NAME = 'pageSize';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function applyArgument(SearchCriteriaInterface $searchCriteria, ArgumentInterface $argument)
-    {
-        if (is_int($argument->getValue()) || is_string($argument->getValue())) {
-            $searchCriteria->setPageSize($argument->getValue());
-        } else {
-            throw new \Magento\Framework\Exception\RuntimeException(
-                new Phrase('Argument %1 not of type Int', [$argument->getName()])
-            );
-        }
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Search.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Search.php
deleted file mode 100644
index 2264adc2bd9ef..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Search.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplier;
-
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Api\Search\FilterGroupBuilder;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplierInterface;
-use Magento\Framework\GraphQl\ArgumentInterface;
-
-class Search implements ArgumentApplierInterface
-{
-    const ARGUMENT_NAME = 'search';
-
-    /**
-     * @var FilterBuilder
-     */
-    private $filterBuilder;
-
-    /**
-     * @var FilterGroupBuilder
-     */
-    private $filterGroupBuilder;
-
-    /**
-     * @param FilterBuilder $filterBuilder
-     * @param FilterGroupBuilder $filterGroupBuilder
-     */
-    public function __construct(FilterBuilder $filterBuilder, FilterGroupBuilder $filterGroupBuilder)
-    {
-        $this->filterBuilder = $filterBuilder;
-        $this->filterGroupBuilder = $filterGroupBuilder;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function applyArgument(SearchCriteriaInterface $searchCriteria, ArgumentInterface $argument)
-    {
-        $searchTerm = $argument->getValue();
-        $searchTermFilter = $this->filterBuilder->setField('search_term')->setValue($searchTerm)->create();
-        $this->filterGroupBuilder->addFilter($searchTermFilter);
-        $filterGroups = $searchCriteria->getFilterGroups();
-        $filterGroups[] = $this->filterGroupBuilder->create();
-        $searchCriteria->setFilterGroups($filterGroups);
-        $searchCriteria->setRequestName('quick_search_container');
-        return $searchCriteria;
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Sort.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Sort.php
deleted file mode 100644
index ecd7a49980d94..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplier/Sort.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplier;
-
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\Api\SortOrder;
-use Magento\Framework\Api\SortOrderBuilder;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\GraphQl\Argument\SearchCriteria\ArgumentApplierInterface;
-use Magento\Framework\Phrase;
-
-/**
- * Class for Sort Argument
- */
-class Sort implements ArgumentApplierInterface
-{
-    const ARGUMENT_NAME = 'sort';
-
-    /** @var SortOrderBuilder */
-    private $sortOrderBuilder;
-
-    /**
-     * @param SortOrderBuilder|null $sortOrderBuilder
-     */
-    public function __construct($sortOrderBuilder = null)
-    {
-        $this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
-            ->get(SortOrderBuilder::class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function applyArgument(SearchCriteriaInterface $searchCriteria, ArgumentInterface $argument)
-    {
-        if (is_array($argument->getValue())) {
-            $sortOrders = [];
-            foreach ($argument->getValue() as $fieldName => $fieldValue) {
-                /** @var SortOrder $sortOrder */
-                $sortOrders[] = $this->sortOrderBuilder->setField($fieldName)
-                    ->setDirection($fieldValue == 'DESC' ? SortOrder::SORT_DESC : SortOrder::SORT_ASC)
-                    ->create();
-            }
-            $searchCriteria->setSortOrders($sortOrders);
-        } elseif (!empty($argument->getValue())) {
-            throw new \Magento\Framework\Exception\RuntimeException(
-                new Phrase('Argument %1 not of type array or null', [$argument->getName()])
-            );
-        }
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierInterface.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierInterface.php
deleted file mode 100644
index d404afc179fa1..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria;
-
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-
-/**
- * Interface used to apply each argument to a search criteria
- */
-interface ArgumentApplierInterface
-{
-    /**
-     * Apply a specific argument to a search criteria like filter, currentPage, etc.
-     *
-     * @param SearchCriteriaInterface $searchCriteria
-     * @param ArgumentInterface $argument
-     * @return SearchCriteriaInterface
-     */
-    public function applyArgument(SearchCriteriaInterface $searchCriteria, ArgumentInterface $argument);
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/Builder.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/Builder.php
deleted file mode 100644
index e5add9a7bba20..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/Builder.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria;
-
-use Magento\Framework\GraphQl\ArgumentInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterfaceFactory;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-
-/**
- * Builder to create search criteria and apply corespondent filters from arguments
- */
-class Builder
-{
-    /** @var SearchCriteriaInterfaceFactory */
-    private $searchCriteriaFactory;
-
-    /**
-     * @var ArgumentApplierFactory
-     */
-    private $argumentApplierFactory;
-    /**
-     * @param SearchCriteriaInterfaceFactory $searchCriteriaFactory
-     * @param ArgumentApplierFactory $argumentApplierFactory
-     */
-    public function __construct(
-        SearchCriteriaInterfaceFactory $searchCriteriaFactory,
-        ArgumentApplierFactory $argumentApplierFactory
-    ) {
-        $this->searchCriteriaFactory = $searchCriteriaFactory;
-        $this->argumentApplierFactory = $argumentApplierFactory;
-    }
-
-    /**
-     * Build a search criteria and apply arguments to it as filters
-     *
-     * @param ArgumentInterface[] $arguments
-     * @return SearchCriteriaInterface
-     */
-    public function build(array $arguments)
-    {
-        $searchCriteria = $this->searchCriteriaFactory->create();
-        foreach ($arguments as $argument) {
-            $argumentApplier = $this->argumentApplierFactory->create($argument->getName());
-            $argumentApplier->applyArgument($searchCriteria, $argument);
-        }
-        return $searchCriteria;
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/ValueParserInterface.php b/lib/internal/Magento/Framework/GraphQl/Argument/ValueParserInterface.php
deleted file mode 100644
index bdca461058fc4..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Argument/ValueParserInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Argument;
-
-/**
- * Class responsable for transforming an argument value from one array type to a complex or other type
- */
-interface ValueParserInterface
-{
-    /**
-     * Parse an argument value from an array or scalar to a ArgumentValueInterface
-     *
-     * @param array|int|string|float|bool $value
-     * @return ArgumentValueInterface|ArgumentValueInterface[]|int|int[]|string|string[]|float|float[]|bool
-     */
-    public function parse($value);
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/ArgumentFactory.php b/lib/internal/Magento/Framework/GraphQl/ArgumentFactory.php
deleted file mode 100644
index 4d57e313e916c..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/ArgumentFactory.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl;
-
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\GraphQl\Argument\ArgumentValueInterface;
-
-/**
- * Creates arguments represented by ArgumentInterface
- */
-class ArgumentFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(
-        ObjectManagerInterface $objectManager
-    ) {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Create a field argument from map
-     *
-     * @param string $argumentName
-     * @param bool|float|int|ArgumentValueInterface|string $argumentValue
-     * @return ArgumentInterface
-     */
-    public function create($argumentName, $argumentValue)
-    {
-        return $this->objectManager->create(
-            ArgumentInterface::class,
-            [
-                'name' => $argumentName,
-                'value' => $argumentValue
-            ]
-        );
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/ArgumentInterface.php b/lib/internal/Magento/Framework/GraphQl/ArgumentInterface.php
deleted file mode 100644
index 9ff8d3a33175b..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/ArgumentInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl;
-
-use Magento\Framework\GraphQl\Argument\ArgumentValueInterface;
-
-/**
- * General interface to use for representing an argument of a field.
- */
-interface ArgumentInterface
-{
-    /**
-     * Return argument name
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Return argument value
-     *
-     * @return ArgumentValueInterface|ArgumentValueInterface[]|int|int[]|string|string[]|float|float[]|bool
-     */
-    public function getValue();
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
new file mode 100644
index 0000000000000..75b6c64e9d24f
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl;
+
+use Magento\Framework\Config\DataInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\GraphQl\Query\Fields as QueryFields;
+
+/**
+ * Provides access to typing information for a configured GraphQL schema.
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @var DataInterface
+     */
+    private $configData;
+
+    /**
+     * @var ConfigElementFactoryInterface
+     */
+    private $configElementFactory;
+
+    /**
+     * @var QueryFields
+     */
+    private $queryFields;
+
+    /**
+     * @param DataInterface $data
+     * @param ConfigElementFactoryInterface $configElementFactory
+     * @param QueryFields $queryFields
+     */
+    public function __construct(
+        DataInterface $data,
+        ConfigElementFactoryInterface $configElementFactory,
+        QueryFields $queryFields
+    ) {
+        $this->configData = $data;
+        $this->configElementFactory = $configElementFactory;
+        $this->queryFields = $queryFields;
+    }
+
+    /**
+     * Get a data object with data pertaining to a GraphQL type's structural makeup.
+     *
+     * @param string $configElementName
+     * @return ConfigElementInterface
+     * @throws \LogicException
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function getConfigElement(string $configElementName) : ConfigElementInterface
+    {
+        $data = $this->configData->get($configElementName);
+        if (!isset($data['type'])) {
+            throw new \LogicException(
+                sprintf('Config element "%s" is not declared in GraphQL schema', $configElementName)
+            );
+        }
+
+        $fieldsInQuery = $this->queryFields->getFieldsUsedInQuery();
+        if (isset($data['fields'])) {
+            if (!empty($fieldsInQuery)) {
+                foreach ($data['fields'] as $fieldName => $fieldConfig) {
+                    if (!isset($fieldsInQuery[$fieldName])) {
+                        unset($data['fields'][$fieldName]);
+                    }
+                }
+            }
+
+            ksort($data['fields']);
+        }
+
+        return $this->configElementFactory->createFromConfigData($data);
+    }
+
+    /**
+     * Return all type names declared in a GraphQL schema's configuration.
+     *
+     * @return string[]
+     */
+    public function getDeclaredTypeNames() : array
+    {
+        $types = [];
+        foreach ($this->configData->get(null) as $item) {
+            if (isset($item['type']) && $item['type'] == 'graphql_type') {
+                $types[] = $item['name'];
+            }
+        }
+        return $types;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementFactory.php
new file mode 100644
index 0000000000000..7e7c70d78b61a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementFactory.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\GraphQl\Config;
+
+/**
+ * This factory allows instantiation of all supported GraphQL config element objects.
+ *
+ * It automatically detects the type of the object to be instantiated based on the provided config data.
+ */
+class ConfigElementFactory implements ConfigElementFactoryInterface
+{
+    /**
+     * @var ConfigElementFactoryInterface[]
+     */
+    private $factoryMapByConfigElementType;
+
+    /**
+     * @param ConfigElementFactoryInterface[] $factoryMapByConfigElementType
+     */
+    public function __construct(
+        array $factoryMapByConfigElementType
+    ) {
+        $this->factoryMapByConfigElementType = $factoryMapByConfigElementType;
+    }
+
+    /**
+     * Instantiate config element based on its type specified in $data
+     *
+     * @param array $data
+     * @return ConfigElementInterface
+     */
+    public function createFromConfigData(array $data): ConfigElementInterface
+    {
+        if (!isset($this->factoryMapByConfigElementType[$data['type']])) {
+            throw new \LogicException(
+                sprintf('Factory is not configured for config element of "%s" type', $data['type'])
+            );
+        }
+        return $this->factoryMapByConfigElementType[$data['type']]->createFromConfigData($data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementFactoryInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementFactoryInterface.php
new file mode 100644
index 0000000000000..660907a33cc23
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementFactoryInterface.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\GraphQl\Config;
+
+/**
+ * Responsible for translating data produced by configuration readers to config objects
+ */
+interface ConfigElementFactoryInterface
+{
+    /**
+     * Map data from passed by config readers to a data object format
+     *
+     * @param array $data
+     * @return ConfigElementInterface
+     */
+    public function createFromConfigData(array $data) : ConfigElementInterface;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementInterface.php
new file mode 100644
index 0000000000000..531e9bb0d5dc0
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/ConfigElementInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config;
+
+/**
+ * GraphQL config element.
+ */
+interface ConfigElementInterface
+{
+    /**
+     * @return string
+     */
+    public function getName() : string;
+
+    /**
+     * @return string
+     */
+    public function getDescription() : string;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Data/WrappedTypeProcessor.php b/lib/internal/Magento/Framework/GraphQl/Config/Data/WrappedTypeProcessor.php
new file mode 100644
index 0000000000000..28e213cd734b3
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Data/WrappedTypeProcessor.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Data;
+
+use Magento\Framework\GraphQl\Config\Element\FieldInterface;
+use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
+use Magento\Framework\GraphQl\Schema\TypeInterface;
+use Magento\Framework\GraphQl\Schema\TypeFactory;
+
+/**
+ * Processor for wrapped types for both custom and scalar types
+ */
+class WrappedTypeProcessor
+{
+    /**
+     * @var ScalarTypes
+     */
+    private $scalarTypes;
+
+    /**
+     * @var TypeFactory
+     */
+    private $typeFactory;
+
+    /**
+     * @param TypeFactory $typeFactory
+     * @param ScalarTypes $scalarTypes
+     */
+    public function __construct(TypeFactory $typeFactory, ScalarTypes $scalarTypes)
+    {
+        $this->typeFactory = $typeFactory;
+        $this->scalarTypes = $scalarTypes;
+    }
+
+    /**
+     * Determine the wrapped type from field
+     *
+     * Examples: nullable or required
+     *
+     * @param FieldInterface $field
+     * @param TypeInterface $object
+     * @return TypeInterface
+     */
+    public function processWrappedType(FieldInterface $field, TypeInterface $object = null) : TypeInterface
+    {
+        return $this->processIsNullable($field, $this->processIsList($field, $object));
+    }
+
+    /**
+     * Determine the wrapped type from field.
+     *
+     * Examples: nullable or required.
+     *
+     * @param FieldInterface $field
+     * @param TypeInterface $object
+     * @return \GraphQL\Type\Definition\Type
+     */
+    public function processScalarWrappedType(
+        FieldInterface $field,
+        TypeInterface $object = null
+    ) : \GraphQL\Type\Definition\Type {
+        if (!$object) {
+            $object = $this->scalarTypes->getScalarTypeInstance($field->getTypeName());
+        }
+        return $this->processScalarIsNullable($field, $this->processScalarIsList($field, $object));
+    }
+
+    /**
+     * Return passed in type wrapped as a non null type if definition determines necessary.
+     *
+     * @param FieldInterface $field
+     * @param TypeInterface $object
+     * @return TypeInterface
+     */
+    private function processIsNullable(FieldInterface $field, TypeInterface $object = null) : TypeInterface
+    {
+        if ($field->isRequired()) {
+            return $this->typeFactory->createNonNull($object);
+        }
+        return $object;
+    }
+
+    /**
+     * Return passed in type wrapped as a list if definition determines necessary.
+     *
+     * @param FieldInterface $field
+     * @param TypeInterface $object
+     * @return TypeInterface
+     */
+    private function processIsList(FieldInterface $field, TypeInterface $object = null) : TypeInterface
+    {
+        if ($field->isList()) {
+            if ($field instanceof \Magento\Framework\GraphQl\Config\Element\Argument) {
+                if ($field->areItemsRequired()) {
+                    $object = $this->typeFactory->createNonNull($object);
+                }
+            }
+            return $this->typeFactory->createList($object);
+        }
+        return $object;
+    }
+
+    /**
+     * Return passed in scalar type wrapped as a non null type if definition determines necessary.
+     *
+     * @param FieldInterface $field
+     * @param \GraphQL\Type\Definition\Type $object
+     * @return \GraphQL\Type\Definition\Type
+     */
+    private function processScalarIsNullable(
+        FieldInterface $field,
+        \GraphQL\Type\Definition\Type $object = null
+    ) : \GraphQL\Type\Definition\Type {
+        $object = $object ?: $this->scalarTypes->getScalarTypeInstance($field->getTypeName());
+        if ($field->isRequired()) {
+            return $this->scalarTypes->createNonNull($object);
+        }
+        return $object;
+    }
+
+    /**
+     * Return passed in scalar type wrapped as a list if definition determines necessary.
+     *
+     * @param FieldInterface $field
+     * @param \GraphQL\Type\Definition\Type $object
+     * @return \GraphQL\Type\Definition\Type
+     */
+    private function processScalarIsList(
+        FieldInterface $field,
+        \GraphQL\Type\Definition\Type $object = null
+    ) : \GraphQL\Type\Definition\Type {
+        $object = $object ?: $this->scalarTypes->getScalarTypeInstance($field->getTypeName());
+        if ($field->isList()) {
+            if ($field instanceof \Magento\Framework\GraphQl\Config\Element\Argument) {
+                if ($field->areItemsRequired()) {
+                    $object = $this->scalarTypes->createNonNull($object);
+                }
+            }
+            return $this->scalarTypes->createList($object);
+        }
+        return $object;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Argument.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Argument.php
new file mode 100644
index 0000000000000..39d767fa74ad8
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Argument.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Class representing 'argument' GraphQL config element.
+ *
+ * Arguments of a type in GraphQL are used to gather client input to affect how a query will return data.
+ */
+class Argument implements FieldInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @var string
+     */
+    private $baseType;
+
+    /**
+     * @var bool
+     */
+    private $required;
+
+    /**
+     * @var bool
+     */
+    private $isList;
+
+    /**
+     * @var bool
+     */
+    private $itemsRequired;
+
+    /**
+     * @var string|null
+     */
+    private $defaultValue;
+
+    /**
+     * @param string $name
+     * @param string $type
+     * @param string $baseType
+     * @param string $description
+     * @param bool $required
+     * @param bool $isList
+     * @param string $itemType
+     * @param bool $itemsRequired
+     * @param string $defaultValue
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        string $baseType,
+        string $description,
+        bool $required,
+        bool $isList,
+        string $itemType = '',
+        bool $itemsRequired = false,
+        string $defaultValue = null
+    ) {
+        $this->name = $name;
+        $this->type = $isList ? $itemType : $type;
+        $this->baseType = $baseType;
+        $this->description = $description;
+        $this->required = $required;
+        $this->isList = $isList;
+        $this->itemsRequired = $itemsRequired;
+        $this->defaultValue = $defaultValue;
+    }
+
+    /**
+     * Get the name of the argument.
+     *
+     * @return string
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the argument type's configured name
+     *
+     * @return string
+     */
+    public function getTypeName() : string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Get the argument's base type. This can be used to inherit fields for a filter or sort input, etc.
+     *
+     * @return string
+     */
+    public function getBaseType() : string
+    {
+        return $this->baseType;
+    }
+
+    /**
+     * Return true if argument is a list of input items, otherwise false if it is a single object/scalar.
+     *
+     * @return bool
+     */
+    public function isList() : bool
+    {
+        return $this->isList;
+    }
+
+    /**
+     * Return true if argument is required when invoking the query where the argument is specified. False otherwise.
+     *
+     * @return bool
+     */
+    public function isRequired() : bool
+    {
+        return $this->required;
+    }
+
+    /**
+     * Return true if item is a list, and if that list must be populated by at least one item. False otherwise.
+     *
+     * @return bool
+     */
+    public function areItemsRequired() : bool
+    {
+        return $this->itemsRequired;
+    }
+
+    /**
+     * Return the human-readable description of the argument containing it's documentation.
+     *
+     * @return string
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+
+    /**
+     * Return defaultValue if argument is a scalar and has a configured defaultValue. Otherwise return an empty string.
+     *
+     * @return string|null
+     */
+    public function getDefaultValue() : ?string
+    {
+        return $this->defaultValue;
+    }
+
+    /**
+     * Return true if defaultValue is set, otherwise false
+     *
+     * @return bool
+     */
+    public function hasDefaultValue() : bool
+    {
+        return $this->defaultValue ? true: false;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/ArgumentFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/ArgumentFactory.php
new file mode 100644
index 0000000000000..86eee7afd13bd
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/ArgumentFactory.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ArgumentFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create an argument object based off a configured Output/InputInterface's data.
+     *
+     * Argument data must contain name and type. Other values are optional and include baseType, itemType, description,
+     * required, and itemsRequired.
+     *
+     * @param array $argumentData
+     * @return Argument
+     */
+    public function createFromConfigData(
+        array $argumentData
+    ) : Argument {
+        return $this->objectManager->create(
+            Argument::class,
+            [
+                'name' => $argumentData['name'],
+                'type' => isset($argumentData['itemType']) ? $argumentData['itemType'] : $argumentData['type'],
+                'baseType' => isset($argumentData['baseType']) ? $argumentData['baseType'] : '',
+                'description' => isset($argumentData['description']) ? $argumentData['description'] : '',
+                'required' => isset($argumentData['required']) ? $argumentData['required'] : false,
+                'isList' => isset($argumentData['itemType']),
+                'itemType' => isset($argumentData['itemType']) ? $argumentData['itemType'] : '',
+                'itemsRequired' => isset($argumentData['itemsRequired']) ? $argumentData['itemsRequired'] : false,
+                'defaultValue' => isset($argumentData['defaultValue']) ? $argumentData['defaultValue'] : null
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
new file mode 100644
index 0000000000000..b1210e986b772
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+
+/**
+ * Class representing 'enum' GraphQL config element.
+ */
+class Enum implements ConfigElementInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var array
+     */
+    private $values;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param EnumValue[] $values
+     * @param string $description
+     */
+    public function __construct(
+        string $name,
+        array $values,
+        string $description = ""
+    ) {
+        $this->name = $name;
+        $this->values = $values;
+        $this->description = $description;
+    }
+
+    /**
+     * Get name.
+     *
+     * @return string
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get an array of all possible values for the Enum.
+     *
+     * @return EnumValue[]
+     */
+    public function getValues() : array
+    {
+        return $this->values;
+    }
+
+    /**
+     * Return human-readable description of Enum.
+     *
+     * @return string
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumFactory.php
new file mode 100644
index 0000000000000..3e0974aedd473
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumFactory.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class EnumFactory implements ConfigElementFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var EnumValueFactory
+     */
+    private $enumValueFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param EnumValueFactory $enumValueFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        EnumValueFactory $enumValueFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->enumValueFactory = $enumValueFactory;
+    }
+
+    /**
+     * Create an enum based off a configured enum type. Name and values required.
+     *
+     * @param string $name
+     * @param EnumValue[] $values
+     * @param string $description
+     * @return Enum
+     */
+    public function create(string $name, array $values, string $description = ''): Enum
+    {
+        return $this->objectManager->create(
+            Enum::class,
+            [
+                'name' => $name,
+                'values' => $values,
+                'description' => $description
+            ]
+        );
+    }
+
+    /**
+     * Instantiate an object representing 'enum' GraphQL config element.
+     *
+     * @param array $data
+     * @return ConfigElementInterface
+     */
+    public function createFromConfigData(array $data): ConfigElementInterface
+    {
+        $values = [];
+        foreach ($data['items'] as $item) {
+            $values[$item['_value']] = $this->enumValueFactory->create(
+                $item['name'],
+                $item['_value'],
+                isset($item['description']) ? $item['description'] : ''
+            );
+        }
+        return $this->create(
+            $data['name'],
+            $values,
+            isset($data['description']) ? $data['description'] : ''
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumValue.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumValue.php
new file mode 100644
index 0000000000000..151c07caf16a2
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumValue.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+
+/**
+ * Describes a value for an enum type.
+ */
+class EnumValue implements ConfigElementInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param string $value
+     * @param string $description
+     */
+    public function __construct(string $name, string $value, string $description = '')
+    {
+        $this->name = $name;
+        $this->value = $value;
+        $this->description = $description;
+    }
+
+    /**
+     * Get the enum value's name/key.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the enum value's value.
+     *
+     * @return string
+     */
+    public function getValue() : string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Get the enum value's description.
+     *
+     * @return string
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumValueFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumValueFactory.php
new file mode 100644
index 0000000000000..c5fb75fb3566c
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/EnumValueFactory.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for config elements of 'enum value' type.
+ */
+class EnumValueFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create an enum value object based off a configured EnumType's data. Name and value required.
+     *
+     * @param string $name
+     * @param string $value
+     * @param string $description
+     * @return EnumValue
+     */
+    public function create(string $name, string $value, string $description = ''): EnumValue
+    {
+        return $this->objectManager->create(
+            EnumValue::class,
+            [
+                'name' => $name,
+                'value' => $value,
+                'description' => $description
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php
new file mode 100644
index 0000000000000..76cfa06f9c11f
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Field.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Class representing 'field' GraphQL config element.
+ *
+ * Fields are used to describe possible values for a type/interface.
+ */
+class Field implements OutputFieldInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * @var bool
+     */
+    private $required;
+
+    /**
+     * @var bool
+     */
+    private $isList;
+
+    /**
+     * @var string
+     */
+    private $resolver;
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param string $type
+     * @param bool $required
+     * @param bool $isList
+     * @param string $itemType
+     * @param string $resolver
+     * @param string $description
+     * @param array $arguments
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        bool $required,
+        bool $isList,
+        string $itemType = '',
+        string $resolver = '',
+        string $description = '',
+        array $arguments = []
+    ) {
+        $this->name = $name;
+        $this->type = $isList ? $itemType : $type;
+        $this->required = $required;
+        $this->isList = $isList;
+        $this->resolver = $resolver;
+        $this->description = $description;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Get the field name.
+     *
+     * @return string
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the type's configured name.
+     *
+     * @return string
+     */
+    public function getTypeName() : string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Return true if field is a list of items. False otherwise.
+     *
+     * @return bool
+     */
+    public function isList() : bool
+    {
+        return $this->isList;
+    }
+
+    /**
+     * Return true if the field is required by an input type to be populated. False otherwise.
+     *
+     * @return bool
+     */
+    public function isRequired() : bool
+    {
+        return $this->required;
+    }
+
+    /**
+     * Get the resolver for a given field. If no resolver is specified, return an empty string.
+     *
+     * @return string
+     */
+    public function getResolver() : string
+    {
+        return $this->resolver;
+    }
+
+    /**
+     * Get the list of arguments configured for the field. Return an empty array if no arguments are configured.
+     *
+     * @return Argument[]
+     */
+    public function getArguments() : array
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Return the human-readable description of the field.
+     *
+     * @return string|null
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php
new file mode 100644
index 0000000000000..b9ec1dd87d122
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldFactory.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for config elements of 'field' type.
+ */
+class FieldFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create a field object from a configured array with optional arguments.
+     *
+     * Field data must contain name and type. Other values are optional and include required, itemType, description,
+     * and resolver. Arguments array must be in the format of [$argumentData['name'] => $argumentData].
+     *
+     * @param array $fieldData
+     * @param array $arguments
+     * @return Field
+     */
+    public function createFromConfigData(
+        array $fieldData,
+        array $arguments = []
+    ) : Field {
+        $fieldType = $fieldData['type'];
+        $isList = false;
+
+        //check if type ends with []
+        if ($fieldType{strlen($fieldType) - 2} == '[' && $fieldType{strlen($fieldType) - 1} == ']') {
+            $isList = true;
+            $fieldData['type'] = str_replace('[]', '', $fieldData['type']);
+            $fieldData['itemType'] = str_replace('[]', '', $fieldData['type']);
+        }
+
+        return $this->objectManager->create(
+            Field::class,
+            [
+                'name' => $fieldData['name'],
+                'type' => $fieldData['type'],
+                'required' => isset($fieldData['required']) ? $fieldData['required'] : false,
+                'isList' => isset($fieldData['itemType']) || $isList,
+                'itemType' => isset($fieldData['itemType']) ? $fieldData['itemType'] : '',
+                'resolver' => isset($fieldData['resolver']) ? $fieldData['resolver'] : '',
+                'description' => isset($fieldData['description']) ? $fieldData['description'] : '',
+                'arguments' => $arguments
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldInterface.php
new file mode 100644
index 0000000000000..a184080ff49e1
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+
+/**
+ * Defines contract for fields data as GraphQL objects.
+ */
+interface FieldInterface extends ConfigElementInterface
+{
+    /**
+     * Get the type's configured name.
+     *
+     * @return string
+     */
+    public function getTypeName() : string;
+
+    /**
+     * Return true if argument is a list of input items, otherwise false if it is a single object/scalar.
+     *
+     * @return bool
+     */
+    public function isList(): bool;
+
+    /**
+     * Return true if argument is required when invoking the query where the argument is specified. False otherwise.
+     *
+     * @return bool
+     */
+    public function isRequired(): bool;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php
new file mode 100644
index 0000000000000..ebf70478d4e43
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for config elements of 'interface' type.
+ */
+class InterfaceFactory implements ConfigElementFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ArgumentFactory
+     */
+    private $argumentFactory;
+    /**
+     * @var FieldFactory
+     */
+    private $fieldFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param ArgumentFactory $argumentFactory
+     * @param FieldFactory $fieldFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ArgumentFactory $argumentFactory,
+        FieldFactory $fieldFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->argumentFactory = $argumentFactory;
+        $this->fieldFactory = $fieldFactory;
+    }
+
+    /**
+     * Instantiate an object representing 'interface' GraphQL config element.
+     */
+    public function createFromConfigData(array $data): ConfigElementInterface
+    {
+        $fields = [];
+        foreach ($data['fields'] as $field) {
+            $arguments = [];
+            foreach ($field['arguments'] as $argument) {
+                $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
+            }
+            $fields[$field['name']] = $this->fieldFactory->createFromConfigData($field, $arguments);
+        }
+        return $this->create($data, $fields);
+    }
+
+    /**
+     * Create interface object based off array of configured GraphQL Output/InputInterface.
+     *
+     * Interface data must contain name, type resolver, and field definitions. The type resolver should point to an
+     * implementation of the TypeResolverInterface that decides what concrete GraphQL type to output. Description is
+     * the only optional field.
+     *
+     * @param array $interfaceData
+     * @param array $fields
+     * @return InterfaceType
+     */
+    public function create(
+        array $interfaceData,
+        array $fields
+    ) : InterfaceType {
+        return $this->objectManager->create(
+            InterfaceType::class,
+            [
+                'name' => $interfaceData['name'],
+                'typeResolver' => $interfaceData['typeResolver'],
+                'fields' => $fields,
+                'description' => isset($interfaceData['description']) ? $interfaceData['description'] : ''
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
new file mode 100644
index 0000000000000..320199c14a6d6
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Describes the configured data for a GraphQL interface type.
+ */
+class InterfaceType implements TypeInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var Field[]
+     */
+    private $fields;
+
+    /**
+     * @var string
+     */
+    private $typeResolver;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param string $typeResolver
+     * @param Field[] $fields
+     * @param string $description
+     */
+    public function __construct(
+        string $name,
+        string $typeResolver,
+        array $fields,
+        string $description = ""
+    ) {
+        $this->name = $name;
+        $this->fields = $fields;
+        $this->typeResolver = $typeResolver;
+        $this->description = $description;
+    }
+
+    /**
+     * Get the type name.
+     *
+     * @return string
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get a list of fields that make up the possible return or input values of a type.
+     *
+     * @return Field[]
+     */
+    public function getFields() : array
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Return the name of the resolver class that determines the concrete type to display in the result.
+     *
+     * @return string
+     */
+    public function getTypeResolver()
+    {
+        return $this->typeResolver;
+    }
+
+    /**
+     * Get a human-readable description of the type.
+     *
+     * @return string
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/OutputFieldInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/OutputFieldInterface.php
new file mode 100644
index 0000000000000..c05e801848a5e
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/OutputFieldInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Defines contract for output fields data as GraphQL objects.
+ */
+interface OutputFieldInterface extends FieldInterface
+{
+    /**
+     * Get the resolver for a given field. If no resolver is specified, return an empty string.
+     *
+     * @return string
+     */
+    public function getResolver() : string;
+
+    /**
+     * Get the list of arguments configured for the field. Return an empty array if no arguments are configured.
+     *
+     * @return Argument[]
+     */
+    public function getArguments() : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
new file mode 100644
index 0000000000000..24ff439db0347
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Describes all the configured data of an Output or Input type in GraphQL.
+ */
+class Type implements TypeInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var Field[]
+     */
+    private $fields;
+
+    /**
+     * @var string[]
+     */
+    private $interfaces;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param Field[] $fields
+     * @param string[] $interfaces
+     * @param string $description
+     */
+    public function __construct(
+        string $name,
+        array $fields,
+        array $interfaces,
+        string $description
+    ) {
+        $this->name = $name;
+        $this->fields = $fields;
+        $this->interfaces = $interfaces;
+        $this->description = $description;
+    }
+
+    /**
+     * Get the type name.
+     *
+     * @return string
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get a list of fields that make up the possible return or input values of a type.
+     *
+     * @return Field[]
+     */
+    public function getFields() : array
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Get interfaces the type implements, if any. Return an empty array if none are configured.
+     *
+     * @return string[]
+     */
+    public function getInterfaces() : array
+    {
+        return $this->interfaces;
+    }
+
+    /**
+     * Get a human-readable description of the type.
+     *
+     * @return string
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
new file mode 100644
index 0000000000000..c5f3187b04841
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for config elements of 'type' type.
+ */
+class TypeFactory implements ConfigElementFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ArgumentFactory
+     */
+    private $argumentFactory;
+
+    /**
+     * @var FieldFactory
+     */
+    private $fieldFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param ArgumentFactory $argumentFactory
+     * @param FieldFactory $fieldFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ArgumentFactory $argumentFactory,
+        FieldFactory $fieldFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->argumentFactory = $argumentFactory;
+        $this->fieldFactory = $fieldFactory;
+    }
+
+    /**
+     * Instantiate an object representing 'type' GraphQL config element.
+     *
+     * @param array $data
+     * @return ConfigElementInterface
+     */
+    public function createFromConfigData(array $data): ConfigElementInterface
+    {
+        $fields = [];
+        $data['fields'] = isset($data['fields']) ? $data['fields'] : [];
+        foreach ($data['fields'] as $field) {
+            $arguments = [];
+            foreach ($field['arguments'] as $argument) {
+                $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
+            }
+            $fields[$field['name']] = $this->fieldFactory->createFromConfigData(
+                $field,
+                $arguments
+            );
+        }
+        return $this->create(
+            $data,
+            $fields
+        );
+    }
+
+    /**
+     * Create type object based off array of configured GraphQL Output/InputType data.
+     *
+     * Type data must contain name and the type's fields. Optional data includes 'implements' (i.e. the interfaces
+     * implemented by the types), and description. An InputType cannot implement an interface.
+     *
+     * @param array $typeData
+     * @param array $fields
+     * @return Type
+     */
+    public function create(
+        array $typeData,
+        array $fields
+    ) : Type {
+        return $this->objectManager->create(
+            Type::class,
+            [
+                'name' => $typeData['name'],
+                'fields' => $fields,
+                'interfaces' => isset($typeData['implements']) ? $typeData['implements'] : [],
+                'description' => isset($typeData['description']) ? $typeData['description'] : ''
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeInterface.php
new file mode 100644
index 0000000000000..1ba796fb97bd2
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeInterface.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\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+
+/**
+ * Defines contracts for return type data as GraphQL objects.
+ */
+interface TypeInterface extends ConfigElementInterface
+{
+    /**
+     * Get a list of fields that make up the possible return or input values of a type.
+     *
+     * @return Field[]
+     */
+    public function getFields() : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php b/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
new file mode 100644
index 0000000000000..c2670967f1db5
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+
+/**
+ * Access all GraphQL type information declared in the schema's configuration.
+ *
+ * Data includes types, interfaces they implement, their arguments, and fields.
+ */
+interface ConfigInterface
+{
+    /**
+     * Get config element as an object by its name.
+     *
+     * @param string $configElementName
+     * @return ConfigElementInterface
+     */
+    public function getConfigElement(string $configElementName) : ConfigElementInterface;
+
+    /**
+     * Return all type names from a GraphQL schema's configuration.
+     *
+     * @return string[]
+     */
+    public function getDeclaredTypeNames() : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/ExceptionFormatter.php b/lib/internal/Magento/Framework/GraphQl/Exception/ExceptionFormatter.php
new file mode 100644
index 0000000000000..116a2ca3b07c2
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/ExceptionFormatter.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\GraphQl\Exception;
+
+use Magento\Framework\App\State;
+use Magento\Framework\Webapi\ErrorProcessor;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Wrapper for GraphQl Exception Formatter
+ */
+class ExceptionFormatter
+{
+    const HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS = 500;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param State $appState
+     * @param ErrorProcessor $errorProcessor
+     */
+    public function __construct(State $appState, ErrorProcessor $errorProcessor, LoggerInterface $logger)
+    {
+        $this->appState = $appState;
+        $errorProcessor->registerShutdownFunction();
+        $this->logger = $logger;
+    }
+
+    /**
+     * Format a GraphQL error from an exception by converting it to array to conform to GraphQL spec.
+     *
+     * This method only exposes exception message when exception implements ClientAware interface
+     * (or when debug flags are passed).
+     *
+     * @param \Throwable $exception
+     * @param string $internalErrorMessage
+     * @return array
+     * @throws \Throwable
+     */
+    public function create(\Throwable $exception, $internalErrorMessage = null) : array
+    {
+        if (!$this->shouldShowDetail()) {
+            $reportId = uniqid("graph-ql-");
+            $message = "Report ID: {$reportId}; Message: {$exception->getMessage()}";
+            $code = $exception->getCode();
+            $loggedException = new \Exception($message, $code, $exception);
+            $this->logger->critical($loggedException);
+        }
+
+        return \GraphQL\Error\FormattedError::createFromException(
+            $exception,
+            $this->shouldShowDetail()
+                ? \GraphQL\Error\Debug::INCLUDE_DEBUG_MESSAGE | \GraphQL\Error\Debug::INCLUDE_TRACE : false,
+            $internalErrorMessage
+        );
+    }
+
+    /**
+     * Return true if detailed error message should be displayed to client, false otherwise.
+     *
+     * @return bool
+     */
+    public function shouldShowDetail() : bool
+    {
+        return $this->appState->getMode() === State::MODE_DEVELOPER;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.php
new file mode 100644
index 0000000000000..8275219e9e554
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.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\GraphQl\Exception;
+
+use GraphQL\Error\ClientAware;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Phrase;
+
+/**
+ * Exception for GraphQL to be thrown when data already exists
+ */
+class GraphQlAlreadyExistsException extends AlreadyExistsException implements ClientAware
+{
+    /**
+     * Describing a category of the error
+     */
+    const EXCEPTION_CATEGORY = 'graphql-already-exists';
+
+    /**
+     * @var boolean
+     */
+    private $isSafe;
+
+    /**
+     * @param Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     * @param boolean $isSafe
+     */
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
+    {
+        $this->isSafe = $isSafe;
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isClientSafe(): bool
+    {
+        return $this->isSafe;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCategory(): string
+    {
+        return self::EXCEPTION_CATEGORY;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.php
new file mode 100644
index 0000000000000..44c3d07bd186f
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.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\GraphQl\Exception;
+
+use GraphQL\Error\ClientAware;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Phrase;
+
+/**
+ * Exception for GraphQL to be thrown when authentication fails
+ */
+class GraphQlAuthenticationException extends AuthenticationException implements ClientAware
+{
+    /**
+     * Describing a category of the error
+     */
+    const EXCEPTION_CATEGORY = 'graphql-authentication';
+
+    /**
+     * @var boolean
+     */
+    private $isSafe;
+
+    /**
+     * @param Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     * @param boolean $isSafe
+     */
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
+    {
+        $this->isSafe = $isSafe;
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isClientSafe(): bool
+    {
+        return $this->isSafe;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCategory(): string
+    {
+        return self::EXCEPTION_CATEGORY;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
new file mode 100644
index 0000000000000..f1232ebd4d14b
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Exception;
+
+use Magento\Framework\Phrase;
+use Magento\Framework\Exception\AuthorizationException;
+
+/**
+ * Exception for GraphQL to be thrown when authorization fails
+ */
+class GraphQlAuthorizationException extends AuthorizationException implements \GraphQL\Error\ClientAware
+{
+    const EXCEPTION_CATEGORY = 'graphql-authorization';
+
+    /**
+     * @var boolean
+     */
+    private $isSafe;
+
+    /**
+     * Initialize object
+     *
+     * @param Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     * @param boolean $isSafe
+     */
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
+    {
+        $this->isSafe = $isSafe;
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isClientSafe() : bool
+    {
+        return $this->isSafe;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCategory() : string
+    {
+        return self::EXCEPTION_CATEGORY;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
index a72a70bb5035b..429b7c04b7475 100644
--- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\GraphQl\Exception;
 
@@ -14,6 +15,8 @@
  */
 class GraphQlInputException extends InputException implements \GraphQL\Error\ClientAware
 {
+    const EXCEPTION_CATEGORY = 'graphql-input';
+
     /**
      * @var boolean
      */
@@ -34,18 +37,18 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0,
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
-    public function isClientSafe()
+    public function isClientSafe() : bool
     {
         return $this->isSafe;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
-    public function getCategory()
+    public function getCategory() : string
     {
-        return 'graphql-input';
+        return self::EXCEPTION_CATEGORY;
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
new file mode 100644
index 0000000000000..2a0b9d3bc2eaa
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Exception;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Phrase;
+
+/**
+ * Exception for GraphQL to be thrown when entity does not exists
+ */
+class GraphQlNoSuchEntityException extends NoSuchEntityException implements \GraphQL\Error\ClientAware
+{
+    const EXCEPTION_CATEGORY = 'graphql-no-such-entity';
+
+    /**
+     * @var boolean
+     */
+    private $isSafe;
+
+    /**
+     * Initialize object
+     *
+     * @param Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     * @param boolean $isSafe
+     */
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
+    {
+        $this->isSafe = $isSafe;
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isClientSafe() : bool
+    {
+        return $this->isSafe;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCategory() : string
+    {
+        return self::EXCEPTION_CATEGORY;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php b/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php
deleted file mode 100644
index ac7f62f70cf03..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl;
-
-/**
- * Wrapper for GraphQl Exception Formatter
- */
-class ExceptionFormatter
-{
-    /**
-     * Format a GraphQL error from an exception by converting it to array to conform to GraphQL spec.
-     *
-     * This method only exposes exception message when exception implements ClientAware interface
-     * (or when debug flags are passed).
-     *
-     * @param \Throwable $exception
-     * @param bool|int $debug
-     * @param string $internalErrorMessage
-     * @return array
-     * @throws \Throwable
-     */
-    public function create(\Throwable $exception, $debug = false, $internalErrorMessage = null)
-    {
-        return \GraphQL\Error\FormattedError::createFromException($exception, $debug, $internalErrorMessage);
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Promise.php b/lib/internal/Magento/Framework/GraphQl/Promise.php
deleted file mode 100644
index b5cb5c737f2db..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Promise.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl;
-
-/**
- * Wrapper for Promise
- */
-class Promise extends \GraphQL\Executor\Promise\Promise
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/EnumLookup.php b/lib/internal/Magento/Framework/GraphQl/Query/EnumLookup.php
new file mode 100644
index 0000000000000..faddd54e5f180
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/EnumLookup.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+use Magento\Framework\GraphQl\Config\Element\Enum;
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Schema\Type\Enum\DataMapperInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Processor that looks up definition data of an enum to lookup and convert data as it's specified in the schema.
+ */
+class EnumLookup
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $typeConfig;
+
+    /**
+     * @var DataMapperInterface
+     */
+    private $enumDataMapper;
+
+    /**
+     * @param ConfigInterface $typeConfig
+     * @param DataMapperInterface $enumDataMapper
+     */
+    public function __construct(ConfigInterface $typeConfig, DataMapperInterface $enumDataMapper)
+    {
+        $this->typeConfig = $typeConfig;
+        $this->enumDataMapper = $enumDataMapper;
+    }
+
+    /**
+     * Convert a field value from a db query to an enum value declared as an item in the graphql schema
+     *
+     * @param string $enumName
+     * @param string $fieldValue
+     * @return string
+     * @throws \Magento\Framework\Exception\RuntimeException
+     */
+    public function getEnumValueFromField(string $enumName, string $fieldValue) : string
+    {
+        $priceViewEnum = $this->typeConfig->getConfigElement($enumName);
+        if ($priceViewEnum instanceof Enum) {
+            foreach ($priceViewEnum->getValues() as $enumItem) {
+                $mappedValues = $this->enumDataMapper->getMappedEnums($enumName);
+                if (isset($mappedValues[$enumItem->getName()]) && $mappedValues[$enumItem->getName()] == $fieldValue) {
+                    return $enumItem->getValue();
+                }
+            }
+        } else {
+            throw new \Magento\Framework\Exception\RuntimeException(
+                new Phrase('Enum type "%1" not defined', [$enumName])
+            );
+        }
+        return '';
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/FieldTranslator.php b/lib/internal/Magento/Framework/GraphQl/Query/FieldTranslator.php
new file mode 100644
index 0000000000000..93cc8eedeee05
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/FieldTranslator.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+/**
+ * Translate field names to their database equivalent
+ */
+class FieldTranslator
+{
+    /**
+     * @var string[]
+     */
+    private $translationMap = [];
+
+    /**
+     * @param string[] $translationMap
+     */
+    public function __construct(array $translationMap)
+    {
+        $this->translationMap = $translationMap;
+    }
+
+    /**
+     * Return translated field name if present in configuration, otherwise return back the original passed in name.
+     *
+     * @param string $fieldName
+     * @return string
+     */
+    public function translate(string $fieldName) : string
+    {
+        if (isset($this->translationMap[$fieldName])) {
+            return $this->translationMap[$fieldName];
+        }
+
+        return $fieldName;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
new file mode 100644
index 0000000000000..d0bc9591265eb
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\NodeKind;
+
+/**
+ * This class holds a list of all queried fields and is used to enable performance optimization for schema loading.
+ */
+class Fields
+{
+    /**
+     * @var string[]
+     */
+    private $fieldsUsedInQuery = [];
+
+    /**
+     * Set Query for extracting list of fields.
+     *
+     * @param string $query
+     * @return void
+     */
+    public function setQuery($query)
+    {
+        $queryFields = [];
+        try {
+            $queryAst = \GraphQL\Language\Parser::parse(new \GraphQL\Language\Source($query ?: '', 'GraphQL'));
+            \GraphQL\Language\Visitor::visit(
+                $queryAst,
+                [
+                    'leave' => [
+                        NodeKind::NAME => function (Node $node) use (&$queryFields) {
+                            $queryFields[$node->value] = $node->value;
+                        }
+                    ]
+                ]
+            );
+        } catch (\Exception $e) {
+            // If a syntax error is encountered do not collect fields
+        }
+        if (isset($queryFields['IntrospectionQuery'])) {
+            // It must be possible to query any fields during introspection query
+            $queryFields = [];
+        }
+        $this->fieldsUsedInQuery = $queryFields;
+    }
+
+    /**
+     * Get list of fields used in GraphQL query.
+     *
+     * This method is stateful and relies on the query being set with setQuery.
+     *
+     * @return string[]
+     */
+    public function getFieldsUsedInQuery()
+    {
+        return $this->fieldsUsedInQuery;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/PostFetchProcessorInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/PostFetchProcessorInterface.php
new file mode 100644
index 0000000000000..064625b00d4aa
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/PostFetchProcessorInterface.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\GraphQl\Query;
+
+/**
+ * Processor or processors to re-format and add additional data outside of the scope of the query's fetch.
+ */
+interface PostFetchProcessorInterface
+{
+    /**
+     * Process data by formatting and add any necessary additional attributes.
+     *
+     * @param array $resultData
+     * @return array
+     */
+    public function process(array $resultData) : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Promise.php b/lib/internal/Magento/Framework/GraphQl/Query/Promise.php
new file mode 100644
index 0000000000000..44d4cc5373ab5
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Promise.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+/**
+ * Wrapper for Promise
+ */
+class Promise extends \GraphQL\Executor\Promise\Promise
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
new file mode 100644
index 0000000000000..5730156ca5b34
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.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\GraphQl\Query;
+
+use GraphQL\Validator\DocumentValidator;
+use GraphQL\Validator\Rules\DisableIntrospection;
+use GraphQL\Validator\Rules\QueryDepth;
+use GraphQL\Validator\Rules\QueryComplexity;
+
+/**
+ * QueryComplexityLimiter
+ *
+ * Sets limits for query complexity. A single GraphQL query can potentially
+ * generate thousands of database operations so, the very complex queries
+ * should be filtered and rejected.
+ *
+ * https://github.com/webonyx/graphql-php/blob/master/docs/security.md#query-complexity-analysis
+ */
+class QueryComplexityLimiter
+{
+    /**
+     * @var int
+     */
+    private $queryDepth;
+
+    /**
+     * @var int
+     */
+    private $queryComplexity;
+
+    /**
+     * @param int $queryDepth
+     * @param int $queryComplexity
+     */
+    public function __construct(
+        int $queryDepth,
+        int $queryComplexity
+    ) {
+        $this->queryDepth = $queryDepth;
+        $this->queryComplexity = $queryComplexity;
+    }
+
+    /**
+     * Sets limits for query complexity
+     *
+     * @return void
+     */
+    public function execute(): void
+    {
+        DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
+        DocumentValidator::addRule(new DisableIntrospection());
+        DocumentValidator::addRule(new QueryDepth($this->queryDepth));
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php
new file mode 100644
index 0000000000000..a6ad10dded849
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
+use Magento\Framework\GraphQl\Schema;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+
+/**
+ * Wrapper for GraphQl execution of a schema
+ */
+class QueryProcessor
+{
+    /**
+     * @var ExceptionFormatter
+     */
+    private $exceptionFormatter;
+
+    /**
+     * @var QueryComplexityLimiter
+     */
+    private $queryComplexityLimiter;
+
+    /**
+     * @param ExceptionFormatter $exceptionFormatter
+     * @param QueryComplexityLimiter $queryComplexityLimiter
+     */
+    public function __construct(
+        ExceptionFormatter $exceptionFormatter,
+        QueryComplexityLimiter $queryComplexityLimiter
+    ) {
+        $this->exceptionFormatter = $exceptionFormatter;
+        $this->queryComplexityLimiter = $queryComplexityLimiter;
+    }
+
+    /**
+     * Process a GraphQl query according to defined schema
+     *
+     * @param Schema $schema
+     * @param string $source
+     * @param ContextInterface $contextValue
+     * @param array|null $variableValues
+     * @param string|null $operationName
+     * @return Promise|array
+     */
+    public function process(
+        Schema $schema,
+        string $source,
+        ContextInterface $contextValue = null,
+        array $variableValues = null,
+        string $operationName = null
+    ) : array {
+        if (!$this->exceptionFormatter->shouldShowDetail()) {
+            $this->queryComplexityLimiter->execute();
+        }
+
+        $rootValue = null;
+        return \GraphQL\GraphQL::executeQuery(
+            $schema,
+            $source,
+            $rootValue,
+            $contextValue,
+            $variableValues,
+            $operationName
+        )->toArray(
+            $this->exceptionFormatter->shouldShowDetail() ?
+                \GraphQL\Error\Debug::INCLUDE_DEBUG_MESSAGE | \GraphQL\Error\Debug::INCLUDE_TRACE : false
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/AstConverter.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/AstConverter.php
new file mode 100644
index 0000000000000..0b03fc509c786
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/AstConverter.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument;
+
+use GraphQL\Language\AST\ListValueNode;
+use GraphQL\Language\AST\NodeList;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\ClauseFactory;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\Connective;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\ConnectiveFactory;
+
+/**
+ * Converts the input of an object type to a @see Connective format by using entity attributes to identify clauses
+ */
+class AstConverter
+{
+    /**
+     * @var ClauseFactory
+     */
+    private $clauseFactory;
+
+    /**
+     * @var ConnectiveFactory
+     */
+    private $connectiveFactory;
+
+    /**
+     * @var FieldEntityAttributesPool
+     */
+    private $fieldEntityAttributesPool;
+
+    /**
+     * @param ClauseFactory $clauseFactory
+     * @param ConnectiveFactory $connectiveFactory
+     * @param FieldEntityAttributesPool $fieldEntityAttributesPool
+     */
+    public function __construct(
+        ClauseFactory $clauseFactory,
+        ConnectiveFactory $connectiveFactory,
+        FieldEntityAttributesPool $fieldEntityAttributesPool
+    ) {
+        $this->clauseFactory = $clauseFactory;
+        $this->connectiveFactory = $connectiveFactory;
+        $this->fieldEntityAttributesPool = $fieldEntityAttributesPool;
+    }
+
+    /**
+     * Get a clause from an AST
+     *
+     * @param string $fieldName
+     * @param array $arguments
+     * @return array
+     */
+    public function getClausesFromAst(string $fieldName, array $arguments) : array
+    {
+        $attributes = $this->fieldEntityAttributesPool->getEntityAttributesForEntityFromField($fieldName);
+        $conditions = [];
+        foreach ($arguments as $argumentName => $argument) {
+            if (in_array($argumentName, $attributes)) {
+                foreach ($argument as $clauseType => $clause) {
+                    if (is_array($clause)) {
+                        $value = [];
+                        foreach ($clause as $item) {
+                            $value[] = $item;
+                        }
+                    } else {
+                        $value = $clause;
+                    }
+                    $conditions[] = $this->clauseFactory->create(
+                        $argumentName,
+                        $clauseType,
+                        $value
+                    );
+                }
+            } else {
+                $conditions[] =
+                    $this->connectiveFactory->create(
+                        $this->getClausesFromAst($fieldName, $argument),
+                        $argumentName
+                    );
+            }
+        }
+        return $conditions;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesInterface.php
new file mode 100644
index 0000000000000..b8e52eb394585
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesInterface.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\GraphQl\Query\Resolver\Argument;
+
+/**
+ * Contract for the classes that retrieve attributes for a given entity configured in @see FieldEntityAttributesPool.
+ */
+interface FieldEntityAttributesInterface
+{
+    /**
+     * Get the attributes for an entity
+     *
+     * @return array
+     */
+    public function getEntityAttributes() : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
new file mode 100644
index 0000000000000..e7d14a81b9dee
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.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\GraphQl\Query\Resolver\Argument;
+
+/**
+ * Retrieves attributes for a field for the ast converter
+ */
+class FieldEntityAttributesPool
+{
+    /**
+     * @var FieldEntityAttributesInterface[]
+     */
+    private $attributesInstances = [];
+
+    /**
+     * @param FieldEntityAttributesInterface[] $attributesInstances
+     */
+    public function __construct(
+        array $attributesInstances = []
+    ) {
+        $this->attributesInstances = $attributesInstances;
+    }
+
+    /**
+     * Get the attributes that can be filtered for based on the graphql field name that represents an entity
+     *
+     * @param string $fieldName
+     * @return array
+     * @throws \LogicException
+     */
+    public function getEntityAttributesForEntityFromField(string $fieldName) : array
+    {
+        if (isset($this->attributesInstances[$fieldName])) {
+            return $this->attributesInstances[$fieldName]->getEntityAttributes();
+        } else {
+            throw new \LogicException(sprintf('There is no attrribute class assigned to field %1', $fieldName));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Clause.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Clause.php
new file mode 100644
index 0000000000000..4f4adf63f14c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Clause.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\Filter;
+
+/**
+ * Class clause refers to a closure in find argument.
+ *
+ * Example: {sku: {eq: "product"}}
+ */
+class Clause
+{
+    /**
+     * @var string
+     */
+    private $fieldName;
+
+    /**
+     * @var string
+     */
+    private $clauseType;
+
+    /**
+     * @var string
+     */
+    private $clauseValue;
+
+    /**
+     * @param string $fieldName
+     * @param string $clauseType
+     * @param string|array $clauseValue
+     */
+    public function __construct(
+        string $fieldName,
+        string $clauseType,
+        $clauseValue
+    ) {
+        $this->fieldName = $fieldName;
+        $this->clauseType = $clauseType;
+        $this->clauseValue = $clauseValue;
+    }
+
+    /**
+     * Get the field name
+     *
+     * @return string
+     */
+    public function getFieldName() : string
+    {
+        return $this->fieldName;
+    }
+
+    /**
+     * Get the clause type
+     *
+     * @return string
+     */
+    public function getClauseType(): string
+    {
+        return $this->clauseType;
+    }
+
+    /**
+     * Get the clause value
+     *
+     * @return string
+     */
+    public function getClauseValue()
+    {
+        return $this->clauseValue;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/ClauseFactory.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/ClauseFactory.php
similarity index 80%
rename from lib/internal/Magento/Framework/GraphQl/Argument/Filter/ClauseFactory.php
rename to lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/ClauseFactory.php
index 2f3ac1c643144..b411c20c15d06 100644
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/ClauseFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/ClauseFactory.php
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\GraphQl\Argument\Filter;
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\Filter;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\GraphQl\Argument\Filter\Clause\ReferenceType;
 
 /**
  * Factory for the @see Clause class
@@ -30,22 +31,19 @@ public function __construct(
     /**
      * Create a clause class
      *
-     * @param ReferenceType $referenceType
      * @param string $fieldName
      * @param string $clauseType
      * @param string|array $clauseValue
      * @return Clause
      */
     public function create(
-        ReferenceType $referenceType,
         string $fieldName,
         string $clauseType,
         $clauseValue
-    ) {
+    ) : Clause {
         return $this->objectManager->create(
             Clause::class,
             [
-                'referenceType' => $referenceType,
                 'fieldName' => $fieldName,
                 'clauseType' => $clauseType,
                 'clauseValue' => $clauseValue
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Connective.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Connective.php
similarity index 83%
rename from lib/internal/Magento/Framework/GraphQl/Argument/Filter/Connective.php
rename to lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Connective.php
index 99cfb26dfb367..bd4a3635fa38f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Connective.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Connective.php
@@ -3,7 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\GraphQl\Argument\Filter;
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\Filter;
 
 /**
  * Class Represents logical connective whenever a condition will nest/branch.
@@ -39,7 +41,7 @@ public function __construct(
      *
      * @return Operator
      */
-    public function getOperator()
+    public function getOperator() : Operator
     {
         return $this->operator;
     }
@@ -49,7 +51,7 @@ public function getOperator()
      *
      * @return Connective[]|Clause[]
      */
-    public function getConditions()
+    public function getConditions(): array
     {
         return $this->conditions;
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/ConnectiveFactory.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/ConnectiveFactory.php
similarity index 75%
rename from lib/internal/Magento/Framework/GraphQl/Argument/Filter/ConnectiveFactory.php
rename to lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/ConnectiveFactory.php
index feea0268180d9..717fdc245cabd 100644
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/ConnectiveFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/ConnectiveFactory.php
@@ -3,7 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\GraphQl\Argument\Filter;
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\Filter;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,12 +37,15 @@ public function __construct(
     public function create(
         array $conditions,
         string $operator = null
-    ) {
+    ) : Connective {
         return $this->objectManager->create(
             Connective::class,
             [
                 'conditions' => $conditions,
-                'operator' => new Operator($operator)
+                'operator' => $this->objectManager->create(
+                    Operator::class,
+                    ['value' => $operator ?: Operator::AND]
+                )
             ]
         );
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Operator.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Operator.php
similarity index 82%
rename from lib/internal/Magento/Framework/GraphQl/Argument/Filter/Operator.php
rename to lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Operator.php
index 2b71527d6bcc2..ae2b8bfeabd1b 100644
--- a/lib/internal/Magento/Framework/GraphQl/Argument/Filter/Operator.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Operator.php
@@ -3,7 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\GraphQl\Argument\Filter;
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\Filter;
 
 use Magento\Framework\Phrase;
 
@@ -35,10 +37,10 @@ class Operator
     private $value;
 
     /**
-     * @param string $value
+     * @param string|null $value
      * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
      */
-    public function __construct($value = self::AND)
+    public function __construct(string $value = null)
     {
         if (!$value) {
             $value = self::AND;
@@ -57,18 +59,18 @@ public function __construct($value = self::AND)
      *
      * @return array
      */
-    public static function getOperators()
+    public static function getOperators() : array
     {
         $type = new \ReflectionClass(Operator::class);
         return $type->getConstants();
     }
 
-    /*
+    /**
      * Convert operator to string
      *
      * @return string
      */
-    public function __toString()
+    public function __toString() : string
     {
         return strtoupper($this->value);
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php
new file mode 100644
index 0000000000000..0e5feeba3bade
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplier;
+
+use Magento\Framework\GraphQl\Query\Resolver\Argument\AstConverter;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplierInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\FilterGroupFactory;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\ConnectiveFactory;
+
+/**
+ * Class for Filter Argument
+ */
+class Filter implements ArgumentApplierInterface
+{
+    const ARGUMENT_NAME = 'filter';
+
+    /**
+     * @var FilterGroupFactory
+     */
+    private $filterGroupFactory;
+
+    /**
+     * @var AstConverter
+     */
+    private $astConverter;
+
+    /**
+     * @var ConnectiveFactory
+     */
+    private $connectiveFactory;
+
+    /**
+     * @param AstConverter $astConverter
+     * @param FilterGroupFactory $filterGroupFactory
+     * @param ConnectiveFactory $connectiveFactory
+     */
+    public function __construct(
+        AstConverter $astConverter,
+        FilterGroupFactory $filterGroupFactory,
+        ConnectiveFactory $connectiveFactory
+    ) {
+        $this->astConverter = $astConverter;
+        $this->filterGroupFactory = $filterGroupFactory;
+        $this->connectiveFactory = $connectiveFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function applyArgument(
+        SearchCriteriaInterface $searchCriteria,
+        string $fieldName,
+        string $argumentName,
+        array $argument
+    ) : SearchCriteriaInterface {
+        $filters = $this->astConverter->getClausesFromAst($fieldName, $argument);
+        $filtersForGroup = $this->connectiveFactory->create($filters);
+        $filterGroups = $searchCriteria->getFilterGroups();
+        $filterGroups = array_merge($filterGroups, $this->filterGroupFactory->create($filtersForGroup));
+        $searchCriteria->setFilterGroups($filterGroups);
+        return $searchCriteria;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php
new file mode 100644
index 0000000000000..6ecb1896d685a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplier;
+
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplierInterface;
+
+/**
+ * Class for Sort Argument
+ */
+class Sort implements ArgumentApplierInterface
+{
+    const ARGUMENT_NAME = 'sort';
+
+    /** @var SortOrderBuilder */
+    private $sortOrderBuilder;
+
+    /**
+     * @param SortOrderBuilder|null $sortOrderBuilder
+     */
+    public function __construct(SortOrderBuilder $sortOrderBuilder = null)
+    {
+        $this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
+            ->get(SortOrderBuilder::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function applyArgument(
+        SearchCriteriaInterface $searchCriteria,
+        string $fieldName,
+        string $argumentName,
+        array $argument
+    ) : SearchCriteriaInterface {
+        $sortOrders = [];
+        foreach ($argument as $fieldName => $fieldValue) {
+            /** @var SortOrder $sortOrder */
+            $sortOrders[] = $this->sortOrderBuilder->setField($fieldName)
+                ->setDirection($fieldValue == 'DESC' ? SortOrder::SORT_DESC : SortOrder::SORT_ASC)
+                ->create();
+        }
+        $searchCriteria->setSortOrders($sortOrders);
+
+        return $searchCriteria;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierFactory.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierFactory.php
similarity index 75%
rename from lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierFactory.php
rename to lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierFactory.php
index 6d4753b4d7c02..332e6f14abc1a 100644
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierFactory.php
@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria;
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -34,14 +35,11 @@ public function __construct(
      * @return ArgumentApplierInterface
      * @throws \LogicException
      */
-    public function create(string $argumentName)
+    public function create(string $argumentName) : ArgumentApplierInterface
     {
         $appliers = [
             ArgumentApplier\Filter::ARGUMENT_NAME => ArgumentApplier\Filter::class,
-            ArgumentApplier\PageSize::ARGUMENT_NAME => ArgumentApplier\PageSize::class,
-            ArgumentApplier\CurrentPage::ARGUMENT_NAME => ArgumentApplier\CurrentPage::class,
-            ArgumentApplier\Sort::ARGUMENT_NAME => ArgumentApplier\Sort::class,
-            ArgumentApplier\Search::ARGUMENT_NAME => ArgumentApplier\Search::class
+            ArgumentApplier\Sort::ARGUMENT_NAME => ArgumentApplier\Sort::class
         ];
         if (isset($appliers[$argumentName])) {
             return $this->objectManager->create($appliers[$argumentName]);
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierInterface.php
new file mode 100644
index 0000000000000..ee6eb4107e31a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria;
+
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+
+/**
+ * Interface used to apply each argument to a search criteria
+ */
+interface ArgumentApplierInterface
+{
+    /**
+     * Apply a specific argument to a search criteria like filter, sort, etc.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param string $fieldName
+     * @param string $argumentName
+     * @param array $argument
+     * @return SearchCriteriaInterface
+     */
+    public function applyArgument(
+        SearchCriteriaInterface $searchCriteria,
+        string $fieldName,
+        string $argumentName,
+        array $argument
+    ) : SearchCriteriaInterface;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierPool.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierPool.php
new file mode 100644
index 0000000000000..2ea079fb72234
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplierPool.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Pool class for the retrieval of @see ArgumentApplierInterface classes
+ */
+class ArgumentApplierPool
+{
+    /** @var ArgumentApplierInterface[]  */
+    private $appliers = [];
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param $appliers
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $appliers = [
+            ArgumentApplier\Filter::ARGUMENT_NAME => ArgumentApplier\Filter::class,
+            ArgumentApplier\Sort::ARGUMENT_NAME => ArgumentApplier\Sort::class
+        ]
+    ) {
+        $this->objectManager = $objectManager;
+        $this->appliers = $appliers;
+    }
+
+    /**
+     * Create a search criteria argument applier instance
+     *
+     * @param string $argumentName
+     * @return ArgumentApplierInterface
+     * @throws \LogicException
+     */
+    public function getApplier(string $argumentName) : ArgumentApplierInterface
+    {
+        if (isset($this->appliers[$argumentName])) {
+            return $this->objectManager->get($this->appliers[$argumentName]);
+        } else {
+            throw new \LogicException(sprintf('Applier %s not found', $argumentName));
+        }
+    }
+
+    /**
+     * Check to see if a argument applier instance is configured
+     *
+     * @param string $argumentName
+     * @return bool
+     */
+    public function hasApplier(string $argumentName) : bool
+    {
+        if (isset($this->appliers[$argumentName])) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/Builder.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/Builder.php
new file mode 100644
index 0000000000000..316f6eeab5877
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/Builder.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria;
+
+use Magento\Framework\Api\Search\SearchCriteriaInterfaceFactory;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+
+/**
+ * Builder to create search criteria and apply corespondent filters from arguments
+ */
+class Builder
+{
+    /** @var SearchCriteriaInterfaceFactory */
+    private $searchCriteriaFactory;
+
+    /**
+     * @var ArgumentApplierPool
+     */
+    private $argumentApplierPool;
+    /**
+     * @param SearchCriteriaInterfaceFactory $searchCriteriaFactory
+     * @param ArgumentApplierPool $ArgumentApplierPool
+     */
+    public function __construct(
+        SearchCriteriaInterfaceFactory $searchCriteriaFactory,
+        ArgumentApplierPool $ArgumentApplierPool
+    ) {
+        $this->searchCriteriaFactory = $searchCriteriaFactory;
+        $this->argumentApplierPool = $ArgumentApplierPool;
+    }
+
+    /**
+     * Build a search criteria and apply arguments to it as filters
+     *
+     * @param string $fieldName
+     * @param array $arguments
+     * @return SearchCriteriaInterface
+     */
+    public function build(string $fieldName, array $arguments) : SearchCriteriaInterface
+    {
+        $searchCriteria = $this->searchCriteriaFactory->create();
+        foreach ($arguments as $argumentName => $argument) {
+            if ($this->argumentApplierPool->hasApplier($argumentName)) {
+                $argumentApplier = $this->argumentApplierPool->getApplier($argumentName);
+                $argumentApplier->applyArgument($searchCriteria, $fieldName, $argumentName, $argument);
+            }
+        }
+        return $searchCriteria;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/FilterGroupFactory.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/FilterGroupFactory.php
similarity index 87%
rename from lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/FilterGroupFactory.php
rename to lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/FilterGroupFactory.php
index 00ae30a4e675e..05f2d2071e71f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/FilterGroupFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/FilterGroupFactory.php
@@ -3,17 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Framework\GraphQl\Argument\SearchCriteria;
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria;
 
-use Magento\Framework\GraphQl\Argument\Filter\Clause;
-use Magento\Framework\GraphQl\Argument\Filter\Connective;
-use Magento\Framework\GraphQl\Argument\Filter\Operator;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\Clause;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\Connective;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\Filter\Operator;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;
-use Magento\Framework\GraphQl\Argument\Filter\FilterArgumentValueInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\Phrase;
+use Magento\Framework\Api\Search\FilterGroup;
 
 /**
  * Class FilterGroupFactory
@@ -41,13 +42,13 @@ public function __construct(
     /**
      * Create a filter groups from an AST
      *
-     * @param FilterArgumentValueInterface $arguments
+     * @param Connective $arguments
      * @return \Magento\Framework\Api\Search\FilterGroup[]
      * @throws GraphQlInputException
      */
-    public function create($arguments)
+    public function create(Connective $arguments) : array
     {
-        $filters = $arguments->getValue();
+        $filters = $arguments;
         /** @var \Magento\Framework\Api\Search\FilterGroup[] $searchCriteriaFilterGroups */
         $searchCriteriaFilterGroups = [];
 
@@ -72,10 +73,10 @@ public function create($arguments)
      * Process an AST Connective
      *
      * @param Connective $connective
-     * @return \Magento\Framework\Api\Search\FilterGroup
+     * @return FilterGroup
      * @throws GraphQlInputException
      */
-    private function processConnective(Connective $connective)
+    private function processConnective(Connective $connective) : FilterGroup
     {
         foreach ($connective->getConditions() as $subNode) {
             if ($subNode instanceof Clause) {
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/SearchFilter.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/SearchFilter.php
new file mode 100644
index 0000000000000..e7c31b16461f7
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/SearchFilter.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+
+class SearchFilter
+{
+    const ARGUMENT_NAME = 'search';
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var FilterGroupBuilder
+     */
+    private $filterGroupBuilder;
+
+    /**
+     * @param FilterBuilder $filterBuilder
+     * @param FilterGroupBuilder $filterGroupBuilder
+     */
+    public function __construct(FilterBuilder $filterBuilder, FilterGroupBuilder $filterGroupBuilder)
+    {
+        $this->filterBuilder = $filterBuilder;
+        $this->filterGroupBuilder = $filterGroupBuilder;
+    }
+
+    /**
+     * Add search term to the search criteria
+     *
+     * @param string $searchTerm
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return SearchCriteriaInterface
+     */
+    public function add(string $searchTerm, SearchCriteriaInterface $searchCriteria) : SearchCriteriaInterface
+    {
+        $searchTermFilter = $this->filterBuilder->setField('search_term')->setValue($searchTerm)->create();
+        $this->filterGroupBuilder->addFilter($searchTermFilter);
+        $filterGroups = $searchCriteria->getFilterGroups();
+        $filterGroups[] = $this->filterGroupBuilder->create();
+        $searchCriteria->setFilterGroups($filterGroups);
+        $searchCriteria->setRequestName('quick_search_container');
+        return $searchCriteria;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php
new file mode 100644
index 0000000000000..9bf708539ef07
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ContextInterface.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Resolver Context is used as a shared data extensible object in all resolvers that implement @see ResolverInterface.
+ *
+ * GraphQL will pass the same instance of this interface to each field resolver, so these resolvers could have
+ * shared access to the same data for ease of implementation purposes.
+ */
+interface ContextInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get the type of a user
+     *
+     * @see \Magento\Authorization\Model\UserContextInterface for corespondent values
+     *
+     * @return int
+     */
+    public function getUserType() : int;
+
+    /**
+     * Set type of a user
+     *
+     * @see \Magento\Authorization\Model\UserContextInterface for corespondent values
+     *
+     * @param int $typeId
+     * @return ContextInterface
+     */
+    public function setUserType(int $typeId) : ContextInterface;
+
+    /**
+     * Get id of the user
+     *
+     * @return int
+     */
+    public function getUserId() : int;
+
+    /**
+     * Set id of a user
+     *
+     * @param int $userId
+     * @return ContextInterface
+     */
+    public function setUserId(int $userId) : ContextInterface;
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
+     * @return ContextInterface
+     */
+    public function setExtensionAttributes(
+        \Magento\Framework\GraphQl\Query\Resolver\ContextExtensionInterface $extensionAttributes
+    ) : ContextInterface;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.php
new file mode 100644
index 0000000000000..34e9c0796b5a5
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.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\GraphQl\Query\Resolver;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Determines a concrete GraphQL type for data returned that implements an interface type.
+ */
+interface TypeResolverInterface
+{
+    /**
+     * Determine a concrete GraphQL type based off the given data.
+     *
+     * @param array $data
+     * @return string
+     * @throws GraphQlInputException
+     */
+    public function resolveType(array $data) : string;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Value.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Value.php
new file mode 100644
index 0000000000000..7468511ae7f7a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Value.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver;
+
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Return value for @see ResolverInterface
+ */
+class Value extends \GraphQL\Deferred
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ValueFactory.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ValueFactory.php
new file mode 100644
index 0000000000000..5bd34224bb077
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ValueFactory.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\GraphQl\Query\Resolver;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Create @see Value to return data from passed in callback to GraphQL library
+ */
+class ValueFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create value with passed in callback that returns data as parameter;
+     *
+     * @param callable $callback
+     * @return Value
+     */
+    public function create(callable $callback)
+    {
+        return $this->objectManager->create(Value::class, ['callback' => $callback]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php
new file mode 100644
index 0000000000000..c7b4c7688b9ab
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/ResolverInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+
+/**
+ * Resolver fetches the data and formats it according to the GraphQL schema.
+ */
+interface ResolverInterface
+{
+    /**
+     * Fetches the data from persistence models and format it according to the GraphQL schema.
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @throws \Exception
+     * @return mixed|Value
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    );
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/RequestProcessor.php b/lib/internal/Magento/Framework/GraphQl/RequestProcessor.php
deleted file mode 100644
index ce8c9e42cd140..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/RequestProcessor.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl;
-
-use Magento\Framework\GraphQl\Type\Schema;
-
-/**
- * Wrapper for GraphQl execution of a schema
- */
-class RequestProcessor
-{
-    /**
-     * Processes a GraphQl request according to defined schema
-     *
-     * @param Schema $schema
-     * @param string $source
-     * @param mixed $rootValue
-     * @param mixed $contextValue
-     * @param array|null $variableValues
-     * @param string|null $operationName
-     * @return Promise|array
-     */
-    public function process(
-        Schema $schema,
-        $source,
-        $rootValue = null,
-        $contextValue = null,
-        $variableValues = null,
-        $operationName = null
-    ) {
-        return \GraphQL\GraphQL::execute(
-            $schema,
-            $source,
-            $rootValue,
-            $contextValue,
-            $variableValues,
-            $operationName
-        );
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema.php b/lib/internal/Magento/Framework/GraphQl/Schema.php
new file mode 100644
index 0000000000000..b0a70d680e86b
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl;
+
+/**
+ * Schema object for a GraphQL endpoint describing queries and types for a client to consume.
+ */
+class Schema extends \GraphQL\Type\Schema
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
new file mode 100644
index 0000000000000..63fef73186b12
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema;
+
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
+use Magento\Framework\GraphQl\Schema;
+use Magento\Framework\GraphQl\SchemaFactory;
+
+/**
+ * Generate a query field and concrete types for GraphQL schema
+ */
+class SchemaGenerator implements SchemaGeneratorInterface
+{
+    /**
+     * @var SchemaFactory
+     */
+    private $schemaFactory;
+
+    /**
+     * @var OutputMapper
+     */
+    private $outputMapper;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param SchemaFactory $schemaFactory
+     * @param OutputMapper $outputMapper
+     * @param ConfigInterface $config
+     */
+    public function __construct(
+        SchemaFactory $schemaFactory,
+        OutputMapper $outputMapper,
+        ConfigInterface $config
+    ) {
+        $this->schemaFactory = $schemaFactory;
+        $this->outputMapper = $outputMapper;
+        $this->config = $config;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function generate() : Schema
+    {
+        $schema = $this->schemaFactory->create(
+            [
+                'query' => $this->outputMapper->getOutputType('Query'),
+                'mutation' => $this->outputMapper->getOutputType('Mutation'),
+                'typeLoader' => function ($name) {
+                    return $this->outputMapper->getOutputType($name);
+                },
+                'types' => function () {
+                    //all types should be generated only on introspection
+                    $typesImplementors = [];
+                    foreach ($this->config->getDeclaredTypeNames() as $name) {
+                        $typesImplementors [] = $this->outputMapper->getOutputType($name);
+                    }
+                    return $typesImplementors;
+                }
+            ]
+        );
+        return $schema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGeneratorInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGeneratorInterface.php
new file mode 100644
index 0000000000000..bbd69fd14d03a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGeneratorInterface.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\GraphQl\Schema;
+
+use Magento\Framework\GraphQl\Schema;
+
+/**
+ * GraphQL schema generator interface.
+ */
+interface SchemaGeneratorInterface
+{
+    /**
+     * Generate GraphQL schema.
+     *
+     * @return Schema
+     */
+    public function generate() : Schema;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/BooleanType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/BooleanType.php
new file mode 100644
index 0000000000000..15a6444999b2f
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/BooleanType.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl BooleanType
+ */
+class BooleanType extends \GraphQL\Type\Definition\BooleanType implements InputTypeInterface, OutputTypeInterface
+{
+    /**
+     * @var string
+     */
+    public $name = "Magento_Boolean";
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php
new file mode 100644
index 0000000000000..cacc1f9e28c02
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Entity;
+
+/**
+ * Default implementation for taking GraphQL types configured to be mapped to Resource Model entity names in the DI.
+ */
+class DefaultMapper implements MapperInterface
+{
+    /**
+     * @var array
+     */
+    private $map;
+
+    /**
+     * @param array $map
+     */
+    public function __construct(array $map = [])
+    {
+        $this->map = $map;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMappedTypes(string $entityName) : array
+    {
+        return $this->map[$entityName] ?? [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/MapperInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/MapperInterface.php
new file mode 100644
index 0000000000000..a8002770f0513
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/MapperInterface.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\GraphQl\Schema\Type\Entity;
+
+/**
+ * Produces mapped GraphQL type names to their respective entity models.
+ */
+interface MapperInterface
+{
+    /**
+     * Return GraphQL type names that leverage the given entity name's model.
+     *
+     * @param string $entityName
+     * @return string[]
+     */
+    public function getMappedTypes(string $entityName) : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DataMapperInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DataMapperInterface.php
new file mode 100644
index 0000000000000..832a6177be73b
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DataMapperInterface.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\GraphQl\Schema\Type\Enum;
+
+/**
+ * Produces mapped name to values for the Enum types to be map them against the data that comes from a database.
+ */
+interface DataMapperInterface
+{
+    /**
+     * Return GraphQL enum types with name-values pairs that map to the definition of the graphql schema
+     *
+     * @param string $enumName
+     * @return string[]
+     */
+    public function getMappedEnums(string $enumName) : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php
new file mode 100644
index 0000000000000..f560fcb0de774
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Enum;
+
+/**
+ * Default implementation for taking GraphQL enum types and map them to values by declaring an array map in the DI.
+ */
+class DefaultDataMapper implements DataMapperInterface
+{
+    /**
+     * @var array
+     */
+    private $map;
+
+    /**
+     * @param array $map
+     */
+    public function __construct(array $map)
+    {
+        $this->map = $map;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMappedEnums(string $enumName) : array
+    {
+        return $this->map[$enumName] ?? [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/Enum.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/Enum.php
new file mode 100644
index 0000000000000..6080fd0dd73e2
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/Enum.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Enum;
+
+use Magento\Framework\GraphQl\Config\Element\Enum as EnumElement;
+use Magento\Framework\GraphQl\Schema\Type\EnumType;
+
+/**
+ * Object representation of a GraphQL enum field
+ */
+class Enum extends EnumType
+{
+    /**
+     * @param EnumElement $configElement
+     */
+    public function __construct(EnumElement $configElement)
+    {
+        $config = [
+            'name' => $configElement->getName(),
+            'description' => $configElement->getDescription(),
+        ];
+        foreach ($configElement->getValues() as $value) {
+            $config['values'][$value->getValue()] = [
+                'value' => $value->getValue(),
+                'description' => $value->getDescription()
+            ];
+        }
+        parent::__construct($config);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/EnumType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/EnumType.php
new file mode 100644
index 0000000000000..3d09d7e7f9415
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/EnumType.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl EnumType
+ */
+class EnumType extends \GraphQL\Type\Definition\EnumType implements InputTypeInterface, OutputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/FloatType.php
new file mode 100644
index 0000000000000..8e314891c6a67
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/FloatType.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl FloatType
+ */
+class FloatType extends \GraphQL\Type\Definition\FloatType implements InputTypeInterface, OutputTypeInterface
+{
+    /**
+     * @var string
+     */
+    public $name = "Magento_Float";
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/IdType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/IdType.php
new file mode 100644
index 0000000000000..bf4a6af795a24
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/IdType.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl IdType
+ */
+class IdType extends \GraphQL\Type\Definition\IDType implements InputTypeInterface, OutputTypeInterface
+{
+    /**
+     * @var string
+     */
+    public $name = "Magento_Id";
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
new file mode 100644
index 0000000000000..cbbd97cfdb8c7
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Input;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+class InputFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $prototypes;
+
+    /**
+     * @var array
+     */
+    private $typeRegistry;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param array $prototypes
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $prototypes
+    ) {
+        $this->objectManager = $objectManager;
+        $this->prototypes = $prototypes;
+    }
+
+    /**
+     * @param ConfigElementInterface $configElement
+     * @return InputTypeInterface
+     */
+    public function create(ConfigElementInterface $configElement) : InputTypeInterface
+    {
+        if (!isset($this->typeRegistry[$configElement->getName()])) {
+            $this->typeRegistry[$configElement->getName()] =
+                $this->objectManager->create(
+                    $this->prototypes[get_class($configElement)],
+                    [
+                        'configElement' => $configElement
+                    ]
+                );
+        }
+        return $this->typeRegistry[$configElement->getName()];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
new file mode 100644
index 0000000000000..d806c0b3e68ab
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Input;
+
+use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
+use Magento\Framework\GraphQl\Config\Element\Argument;
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
+use Magento\Framework\GraphQl\Schema\TypeFactory;
+
+class InputMapper
+{
+    /**
+     * @var InputFactory
+     */
+    private $inputFactory;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var TypeFactory
+     */
+    private $typeFactory;
+
+    /**
+     * @var ScalarTypes
+     */
+    private $scalarTypes;
+
+    /**
+     * @var WrappedTypeProcessor
+     */
+    private $wrappedTypeProcessor;
+
+    /**
+     * @param InputFactory $inputFactory
+     * @param ConfigInterface $config
+     * @param TypeFactory $typeFactory
+     * @param ScalarTypes $scalarTypes
+     * @param WrappedTypeProcessor $wrappedTypeProcessor
+     */
+    public function __construct(
+        InputFactory $inputFactory,
+        ConfigInterface $config,
+        TypeFactory $typeFactory,
+        ScalarTypes $scalarTypes,
+        WrappedTypeProcessor $wrappedTypeProcessor
+    ) {
+        $this->inputFactory = $inputFactory;
+        $this->config = $config;
+        $this->typeFactory = $typeFactory;
+        $this->scalarTypes = $scalarTypes;
+        $this->wrappedTypeProcessor = $wrappedTypeProcessor;
+    }
+
+    /**
+     * Prepare argument's metadata for GraphQL schema generation.
+     *
+     * @param Argument $argument
+     * @return array
+     */
+    public function getRepresentation(Argument $argument) : array
+    {
+        $typeName = $argument->getTypeName();
+        if ($this->scalarTypes->isScalarType($typeName)) {
+            $instance = $this->wrappedTypeProcessor->processScalarWrappedType($argument);
+        } else {
+            $configElement = $this->config->getConfigElement($typeName);
+            $instance = $this->inputFactory->create($configElement);
+            $instance = $this->wrappedTypeProcessor->processWrappedType($argument, $instance);
+        }
+
+        $calculatedArgument = [
+            'type' => $instance,
+            'description' => $argument->getDescription()
+        ];
+
+        if ($this->scalarTypes->isScalarType($typeName) && $argument->hasDefaultValue()) {
+            switch ($argument->getTypeName()) {
+                case 'Int':
+                    $calculatedArgument['defaultValue'] = (int)$argument->getDefaultValue();
+                    break;
+                case 'Float':
+                    $calculatedArgument['defaultValue'] = (float)$argument->getDefaultValue();
+                    break;
+                case 'Boolean':
+                    $calculatedArgument['defaultValue'] = (bool)$argument->getDefaultValue();
+                    break;
+                default:
+                    $calculatedArgument['defaultValue'] = $argument->getDefaultValue();
+            }
+        }
+
+        return $calculatedArgument;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
new file mode 100644
index 0000000000000..ae2d07ade2ad0
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Input;
+
+use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
+use Magento\Framework\GraphQl\Config\Element\Type as TypeConfigElement;
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
+use Magento\Framework\GraphQl\Schema\TypeFactory;
+
+/**
+ * Class InputObjectType
+ */
+class InputObjectType extends \Magento\Framework\GraphQl\Schema\Type\InputObjectType
+{
+    /**
+     * @var TypeFactory
+     */
+    private $typeFactory;
+
+    /**
+     * @var ScalarTypes
+     */
+    private $scalarTypes;
+
+    /**
+     * @var WrappedTypeProcessor
+     */
+    private $wrappedTypeProcessor;
+
+    /**
+     * @var InputFactory
+     */
+    private $inputFactory;
+
+    /**
+     * @var ConfigInterface
+     */
+    public $graphQlConfig;
+
+    /**
+     * @param TypeConfigElement $configElement
+     * @param TypeFactory $typeFactory
+     * @param ScalarTypes $scalarTypes
+     * @param WrappedTypeProcessor $wrappedTypeProcessor
+     * @param InputFactory $inputFactory
+     * @param ConfigInterface $graphQlConfig
+     */
+    public function __construct(
+        TypeConfigElement $configElement,
+        TypeFactory $typeFactory,
+        ScalarTypes $scalarTypes,
+        WrappedTypeProcessor $wrappedTypeProcessor,
+        InputFactory $inputFactory,
+        ConfigInterface $graphQlConfig
+    ) {
+        $this->typeFactory = $typeFactory;
+        $this->scalarTypes = $scalarTypes;
+        $this->wrappedTypeProcessor = $wrappedTypeProcessor;
+        $this->inputFactory = $inputFactory;
+        $this->graphQlConfig = $graphQlConfig;
+        $config = [
+            'name' => $configElement->getName(),
+            'description' => $configElement->getDescription()
+        ];
+        foreach ($configElement->getFields() as $field) {
+            if ($this->scalarTypes->isScalarType($field->getTypeName())) {
+                $type = $type = $this->wrappedTypeProcessor->processScalarWrappedType($field);
+            } else {
+                if ($field->getTypeName() == $configElement->getName()) {
+                    $type = $this;
+                } else {
+                    $fieldConfigElement = $this->graphQlConfig->getConfigElement($field->getTypeName());
+                    $type = $this->inputFactory->create($fieldConfigElement);
+                }
+                $type = $this->wrappedTypeProcessor->processWrappedType($field, $type);
+            }
+
+            $config['fields'][$field->getName()] = [
+                'name' => $field->getName(),
+                'type' => $type,
+                'description'=> $field->getDescription()
+            ];
+        }
+        parent::__construct($config);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/InputObjectType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/InputObjectType.php
new file mode 100644
index 0000000000000..ec1b1981e7549
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/InputObjectType.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl InputObjectType
+ */
+class InputObjectType extends \GraphQL\Type\Definition\InputObjectType implements InputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/InputTypeInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/InputTypeInterface.php
new file mode 100644
index 0000000000000..7a68bd764ee0c
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/InputTypeInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+use Magento\Framework\GraphQl\Schema\TypeInterface;
+
+/**
+ * Interface for GraphQl InputType only used for input
+ */
+interface InputTypeInterface extends \GraphQL\Type\Definition\InputType, TypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/IntType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/IntType.php
new file mode 100644
index 0000000000000..fc9dc078deeda
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/IntType.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl IntType
+ */
+class IntType extends \GraphQL\Type\Definition\IntType implements InputTypeInterface, OutputTypeInterface
+{
+    /**
+     * @var string
+     */
+    public $name = "Magento_Int";
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/InterfaceType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/InterfaceType.php
new file mode 100644
index 0000000000000..8501096d932f3
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/InterfaceType.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl InterfaceType
+ */
+class InterfaceType extends \GraphQL\Type\Definition\InterfaceType implements OutputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ListOfType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ListOfType.php
new file mode 100644
index 0000000000000..2d9ad694de763
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ListOfType.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl ListOfType
+ */
+class ListOfType extends \GraphQL\Type\Definition\ListOfType implements
+    WrappedTypeInterface,
+    InputTypeInterface,
+    OutputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/NonNull.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/NonNull.php
new file mode 100644
index 0000000000000..221b45b51a3d4
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/NonNull.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl NonNull
+ */
+class NonNull extends \GraphQL\Type\Definition\NonNull implements
+    WrappedTypeInterface,
+    InputTypeInterface,
+    OutputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ObjectType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ObjectType.php
new file mode 100644
index 0000000000000..6feb64e7a1ad5
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ObjectType.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl ObjectType
+ */
+class ObjectType extends \GraphQL\Type\Definition\ObjectType implements OutputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper.php
new file mode 100644
index 0000000000000..a1db6d9902098
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
+
+/**
+ * Mapper of config element objects to the objects compatible with GraphQL schema generator.
+ */
+class ElementMapper
+{
+    /**
+     * @var FormatterInterface
+     */
+    private $formatter;
+
+    /**
+     * @param FormatterInterface $formatter
+     */
+    public function __construct(FormatterInterface $formatter)
+    {
+        $this->formatter = $formatter;
+    }
+
+    /**
+     * Convert provided config element to the object compatible with GraphQL schema generator.
+     *
+     * @param \Magento\Framework\GraphQl\Config\ConfigElementInterface $configElement
+     * @param OutputTypeInterface $outputType
+     * @return array
+     */
+    public function buildSchemaArray(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
+    {
+        return $this->formatter->format($configElement, $outputType);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
new file mode 100644
index 0000000000000..b54cd4d8ca218
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter;
+
+use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\Input\InputMapper;
+use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
+use Magento\Framework\GraphQl\Schema\TypeFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfoFactory;
+
+/**
+ * Convert fields of the given 'type' config element to the objects compatible with GraphQL schema generator.
+ */
+class Fields implements FormatterInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var OutputMapper
+     */
+    private $outputMapper;
+
+    /**
+     * @var InputMapper
+     */
+    private $inputMapper;
+
+    /**
+     * @var TypeFactory
+     */
+    private $typeFactory;
+
+    /**
+     * @var ScalarTypes
+     */
+    private $scalarTypes;
+
+    /**
+     * @var WrappedTypeProcessor
+     */
+    private $wrappedTypeProcessor;
+
+    /**
+     * @var ResolveInfoFactory
+     */
+    private $resolveInfoFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param OutputMapper $outputMapper
+     * @param InputMapper $inputMapper
+     * @param TypeFactory $typeFactory
+     * @param ScalarTypes $scalarTypes
+     * @param WrappedTypeProcessor $wrappedTypeProcessor
+     * @param ResolveInfoFactory $resolveInfoFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        OutputMapper $outputMapper,
+        InputMapper $inputMapper,
+        TypeFactory $typeFactory,
+        ScalarTypes $scalarTypes,
+        WrappedTypeProcessor $wrappedTypeProcessor,
+        ResolveInfoFactory $resolveInfoFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->outputMapper = $outputMapper;
+        $this->inputMapper = $inputMapper;
+        $this->typeFactory = $typeFactory;
+        $this->scalarTypes = $scalarTypes;
+        $this->wrappedTypeProcessor = $wrappedTypeProcessor;
+        $this->resolveInfoFactory = $resolveInfoFactory;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function format(TypeInterface $configElement, OutputTypeInterface $outputType): array
+    {
+        $typeConfig = [
+            'fields' => function () use ($configElement, $outputType) {
+                $fieldsConfig = [];
+                foreach ($configElement->getFields() as $field) {
+                    $fieldsConfig[$field->getName()] = $this->getFieldConfig($configElement, $outputType, $field);
+                }
+                return $fieldsConfig;
+            }
+        ];
+        return $typeConfig;
+    }
+
+    /**
+     * Get field's type object compatible with GraphQL schema generator.
+     *
+     * @param TypeInterface $typeConfigElement
+     * @param OutputTypeInterface $outputType
+     * @param Field $field
+     * @return TypeInterface
+     */
+    private function getFieldType(TypeInterface $typeConfigElement, OutputTypeInterface $outputType, Field $field)
+    {
+        if ($this->scalarTypes->isScalarType($field->getTypeName())) {
+            $type = $this->wrappedTypeProcessor->processScalarWrappedType($field);
+        } else {
+            if ($typeConfigElement->getName() == $field->getTypeName()) {
+                $type = $outputType;
+            } else {
+                $type = $this->outputMapper->getOutputType($field->getTypeName());
+            }
+
+            $type = $this->wrappedTypeProcessor->processWrappedType($field, $type);
+        }
+        return $type;
+    }
+
+    /**
+     * Generate field config.
+     *
+     * @param TypeInterface $typeConfigElement
+     * @param OutputTypeInterface $outputType
+     * @param Field $field
+     * @return array
+     */
+    private function getFieldConfig(
+        TypeInterface $typeConfigElement,
+        OutputTypeInterface $outputType,
+        Field $field
+    ): array {
+        $type = $this->getFieldType($typeConfigElement, $outputType, $field);
+        $fieldConfig = [
+            'name' => $field->getName(),
+            'type' => $type,
+        ];
+
+        if (!empty($field->getDescription())) {
+            $fieldConfig['description'] = $field->getDescription();
+        }
+
+        if ($field->getResolver() != null) {
+            /** @var ResolverInterface $resolver */
+            $resolver = $this->objectManager->get($field->getResolver());
+
+            $fieldConfig['resolve'] =
+                function ($value, $args, $context, $info) use ($resolver, $field) {
+                    $wrapperInfo = $this->resolveInfoFactory->create($info);
+                    return $resolver->resolve($field, $context, $wrapperInfo, $value, $args);
+                };
+        }
+        return $this->formatArguments($field, $fieldConfig);
+    }
+
+    /**
+     * Format arguments configured for passed in field.
+     *
+     * @param Field $field
+     * @param array $config
+     * @return array
+     */
+    private function formatArguments(Field $field, array $config) : array
+    {
+        foreach ($field->getArguments() as $argument) {
+            $inputType = $this->inputMapper->getRepresentation($argument);
+
+            $config['args'][$argument->getName()] = $inputType;
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
new file mode 100644
index 0000000000000..659c3f604508d
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter;
+
+use Magento\Framework\GraphQl\Config\Element\Type;
+use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
+
+/**
+ * Add interfaces implemented by type if configured.
+ */
+class Interfaces implements FormatterInterface
+{
+    /**
+     * @var OutputMapper
+     */
+    private $outputMapper;
+
+    /**
+     * @param OutputMapper $outputMapper
+     */
+    public function __construct(OutputMapper $outputMapper)
+    {
+        $this->outputMapper = $outputMapper;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function format(TypeInterface $configElement, OutputTypeInterface $outputType) : array
+    {
+        $config = [];
+        if ($configElement instanceof Type && !empty($configElement->getInterfaces())) {
+            $interfaces = [];
+            foreach ($configElement->getInterfaces() as $interface) {
+                $interfaces[$interface['interface']] = $this->outputMapper->getOutputType($interface['interface']);
+            }
+            $config['interfaces'] = $interfaces;
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
new file mode 100644
index 0000000000000..3a40e609eb952
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter;
+
+use Magento\Framework\GraphQl\Config\Element\InterfaceType;
+use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Add resolveType field to the schema config array based on 'type' config element.
+ */
+class ResolveType implements FormatterInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function format(TypeInterface $configElement, OutputTypeInterface $outputType) : array
+    {
+        $config = [];
+        if ($configElement instanceof InterfaceType) {
+            $typeResolver = $this->objectManager->create($configElement->getTypeResolver());
+            $config['resolveType'] = function ($value) use ($typeResolver) {
+                return $typeResolver->resolveType($value);
+            };
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
new file mode 100644
index 0000000000000..416b4122b7097
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.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\GraphQl\Schema\Type\Output\ElementMapper;
+
+use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class FormatterComposite implements FormatterInterface
+{
+    /**
+     * @var FormatterInterface[]
+     */
+    private $formatters;
+
+    /**
+     * @param FormatterInterface[] $formatters
+     */
+    public function __construct(array $formatters)
+    {
+        $this->formatters = $formatters;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function format(TypeInterface $configElement, OutputTypeInterface $outputType) : array
+    {
+        $config = [
+            'name' => $configElement->getName(),
+            'description' => $configElement->getDescription()
+        ];
+        foreach ($this->formatters as $formatter) {
+            $config = array_merge($config, $formatter->format($configElement, $outputType));
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
new file mode 100644
index 0000000000000..7d40b743a6a06
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper;
+
+use Magento\Framework\GraphQl\Config\Element\TypeInterface as TypeElementInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+
+/**
+ * Converter of GraphQL config elements to the objects compatible with GraphQL schema generator.
+ */
+interface FormatterInterface
+{
+    /**
+     * Convert GraphQL config element to the object compatible with GraphQL schema generator.
+     *
+     * @param TypeElementInterface $configElement
+     * @param OutputTypeInterface $outputType
+     * @return array
+     */
+    public function format(TypeElementInterface $configElement, OutputTypeInterface $outputType) : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
new file mode 100644
index 0000000000000..81dad11774b01
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for 'output type' objects compatible with GraphQL schema generator.
+ */
+class OutputFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $prototypes;
+
+    /**
+     * @var array
+     */
+    private $typeRegistry;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param array $prototypes
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $prototypes
+    ) {
+        $this->objectManager = $objectManager;
+        $this->prototypes = $prototypes;
+    }
+
+    /**
+     * Create output type.
+     *
+     * @param ConfigElementInterface $configElement
+     * @return OutputTypeInterface
+     */
+    public function create(ConfigElementInterface $configElement) : OutputTypeInterface
+    {
+        if (!isset($this->typeRegistry[$configElement->getName()])) {
+            $this->typeRegistry[$configElement->getName()] =
+                $this->objectManager->create(
+                    $this->prototypes[get_class($configElement)],
+                    [
+                        'configElement' => $configElement
+                    ]
+                );
+        }
+        return $this->typeRegistry[$configElement->getName()];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputInterfaceObject.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputInterfaceObject.php
new file mode 100644
index 0000000000000..16f321d8c94dc
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputInterfaceObject.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output;
+
+use Magento\Framework\GraphQl\Config\Element\InterfaceType as InterfaceElement;
+use Magento\Framework\GraphQl\Schema\Type\InterfaceType;
+
+/**
+ * 'interface' type compatible with GraphQL schema generator.
+ */
+class OutputInterfaceObject extends InterfaceType
+{
+    /**
+     * @param ElementMapper $elementMapper
+     * @param InterfaceElement $configElement
+     */
+    public function __construct(
+        ElementMapper $elementMapper,
+        InterfaceElement $configElement
+    ) {
+        parent::__construct($elementMapper->buildSchemaArray($configElement, $this));
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
new file mode 100644
index 0000000000000..b7f4b8a1f60db
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output;
+
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\GraphQl\Schema\TypeFactory;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Phrase;
+
+/**
+ * Map type names to their output type/interface classes.
+ */
+class OutputMapper
+{
+    /**
+     * @var OutputFactory
+     */
+    private $outputFactory;
+
+    /**
+     * @var OutputTypeInterface[]
+     */
+    private $outputTypes;
+
+    /**
+     * @var TypeFactory
+     */
+    private $typeFactory;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param OutputFactory $outputFactory
+     * @param TypeFactory $typeFactory
+     * @param ConfigInterface $config
+     */
+    public function __construct(
+        OutputFactory $outputFactory,
+        TypeFactory $typeFactory,
+        ConfigInterface $config
+    ) {
+        $this->outputFactory = $outputFactory;
+        $this->config = $config;
+        $this->typeFactory = $typeFactory;
+    }
+
+    /**
+     * Get GraphQL output type object by type name.
+     *
+     * @param string $typeName
+     * @return OutputTypeInterface
+     * @throws GraphQlInputException
+     */
+    public function getOutputType($typeName)
+    {
+        if (!isset($this->outputTypes[$typeName])) {
+            $configElement = $this->config->getConfigElement($typeName);
+            $this->outputTypes[$typeName] = $this->outputFactory->create($configElement);
+            if (!($this->outputTypes[$typeName] instanceof OutputTypeInterface)) {
+                throw new GraphQlInputException(
+                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
+                );
+            }
+        }
+
+        return $this->outputTypes[$typeName];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputTypeObject.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputTypeObject.php
new file mode 100644
index 0000000000000..260e33cfc5b1c
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputTypeObject.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output;
+
+use Magento\Framework\GraphQl\Config\Element\Type as TypeElement;
+use Magento\Framework\GraphQl\Schema\Type\ObjectType;
+
+/**
+ * 'output' type compatible with GraphQL schema generator.
+ */
+class OutputTypeObject extends ObjectType
+{
+    /**
+     * @param ElementMapper $elementMapper
+     * @param TypeElement $configElement
+     */
+    public function __construct(
+        ElementMapper $elementMapper,
+        TypeElement $configElement
+    ) {
+        parent::__construct($elementMapper->buildSchemaArray($configElement, $this));
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/OutputTypeInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/OutputTypeInterface.php
new file mode 100644
index 0000000000000..561c65e4cd82a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/OutputTypeInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+use Magento\Framework\GraphQl\Schema\TypeInterface;
+
+/**
+ * Interface for GraphQl OutputType only used for output
+ */
+interface OutputTypeInterface extends \GraphQL\Type\Definition\OutputType, TypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfo.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfo.php
new file mode 100644
index 0000000000000..fe479c9a0bae6
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfo.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl ResolveInfo
+ */
+class ResolveInfo extends \GraphQL\Type\Definition\ResolveInfo
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfoFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfoFactory.php
new file mode 100644
index 0000000000000..1dde923bb2a98
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfoFactory.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Factory for wrapper of GraphQl ResolveInfo
+ */
+class ResolveInfoFactory
+{
+    /**
+     * Create a wrapper resolver info from the instance of the library object
+     *
+     * @param \GraphQL\Type\Definition\ResolveInfo $info
+     * @return ResolveInfo
+     */
+    public function create(\GraphQL\Type\Definition\ResolveInfo $info) : ResolveInfo
+    {
+        $values = [];
+        foreach (get_object_vars($info) as $key => $value) {
+            $values[$key] = $value;
+        }
+
+        return new ResolveInfo($values);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ScalarTypes.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ScalarTypes.php
new file mode 100644
index 0000000000000..508cada1a6958
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ScalarTypes.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl ScalarType
+ */
+class ScalarTypes
+{
+    /**
+     * @param string $typeName
+     * @return bool
+     */
+    public function isScalarType(string $typeName) : bool
+    {
+        $internalTypes = \GraphQL\Type\Definition\Type::getInternalTypes();
+        return isset($internalTypes[$typeName]) ? true : false;
+    }
+
+    /**
+     * @param string $typeName
+     * @return \GraphQL\Type\Definition\ScalarType|\GraphQL\Type\Definition\Type
+     * @throws \LogicException
+     */
+    public function getScalarTypeInstance(string $typeName) : \GraphQL\Type\Definition\Type
+    {
+        $internalTypes = \GraphQL\Type\Definition\Type::getInternalTypes();
+        if ($this->isScalarType($typeName)) {
+            return $internalTypes[$typeName];
+        } else {
+            throw new \LogicException(sprintf('Scalar type %s doesn\'t exist', $typeName));
+        }
+    }
+
+    /**
+     * Create an list array type
+     *
+     * @param \GraphQL\Type\Definition\ScalarType|\GraphQL\Type\Definition\Type $definedType
+     * @return ListOfType
+     */
+    public function createList(\GraphQL\Type\Definition\Type $definedType) : ListOfType
+    {
+        return new ListOfType($definedType);
+    }
+
+    /**
+     * Create a non null type
+     *
+     * @param \GraphQL\Type\Definition\ScalarType|\GraphQL\Type\Definition\Type $definedType
+     * @return NonNull
+     */
+    public function createNonNull(\GraphQL\Type\Definition\Type $definedType) : NonNull
+    {
+        return new NonNull($definedType);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/StringType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/StringType.php
new file mode 100644
index 0000000000000..653d13b214bfb
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/StringType.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\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl StringType
+ */
+class StringType extends \GraphQL\Type\Definition\StringType implements InputTypeInterface, OutputTypeInterface
+{
+    /**
+     * @var string
+     */
+    public $name = "Magento_String";
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/WrappedTypeInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/WrappedTypeInterface.php
new file mode 100644
index 0000000000000..3b18dc15f4811
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/WrappedTypeInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+use Magento\Framework\GraphQl\Schema\TypeInterface;
+
+/**
+ * Interface for GraphQl WrappedType used to wrap other types like array or not null
+ */
+interface WrappedTypeInterface extends \GraphQL\Type\Definition\WrappingType, TypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php
new file mode 100644
index 0000000000000..3b31653382e3a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema;
+
+use Magento\Framework\GraphQl\Schema\Type\ObjectType;
+use Magento\Framework\GraphQl\Schema\Type\InterfaceType;
+use Magento\Framework\GraphQl\Schema\Type\InputObjectType;
+use Magento\Framework\GraphQl\Schema\Type\EnumType;
+use Magento\Framework\GraphQl\Schema\Type\ListOfType;
+use Magento\Framework\GraphQl\Schema\Type\NonNull;
+use Magento\Framework\GraphQl\Schema\TypeInterface;
+
+/**
+ * Factory for @see TypeInterface implementations
+ */
+class TypeFactory
+{
+    /**
+     * Create an object type
+     *
+     * @param array $config
+     * @return ObjectType
+     */
+    public function createObject(array $config) : ObjectType
+    {
+        return new ObjectType($config);
+    }
+
+    /**
+     * Create an interface type
+     *
+     * @param array $config
+     * @return InterfaceType
+     */
+    public function createInterface(array $config) : InterfaceType
+    {
+        return new InterfaceType($config);
+    }
+
+    /**
+     * Create an input object type
+     *
+     * @param array $config
+     * @return InputObjectType
+     */
+    public function createInputObject(array $config) : InputObjectType
+    {
+        return new InputObjectType($config);
+    }
+
+    /**
+     * Create an enum object type
+     *
+     * @param array $config
+     * @return EnumType
+     */
+    public function createEnum(array $config) : EnumType
+    {
+        return new EnumType($config);
+    }
+
+    /**
+     * Create an list array type
+     *
+     * @param TypeInterface $definedType
+     * @return ListOfType
+     */
+    public function createList(TypeInterface $definedType) : ListOfType
+    {
+        return new ListOfType($definedType);
+    }
+
+    /**
+     * Create a non null type
+     *
+     * @param TypeInterface $definedType
+     * @return NonNull
+     */
+    public function createNonNull(TypeInterface $definedType) : NonNull
+    {
+        return new NonNull($definedType);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/TypeInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/TypeInterface.php
new file mode 100644
index 0000000000000..3f93aa38e1b7d
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/TypeInterface.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema;
+
+/**
+ * Marker interface for all types compatible with GraphQL schema generator.
+ */
+interface TypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/SchemaFactory.php b/lib/internal/Magento/Framework/GraphQl/SchemaFactory.php
new file mode 100644
index 0000000000000..57af3ae9d8aaf
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/SchemaFactory.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\GraphQl;
+
+/**
+ * Factory for @see Schema
+ */
+class SchemaFactory
+{
+    /**
+     * Create a Schema class
+     *
+     * @param array $config
+     * @return Schema
+     */
+    public function create(array $config) : Schema
+    {
+        return new Schema($config);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/BooleanType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/BooleanType.php
deleted file mode 100644
index bbac9448db7bc..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/BooleanType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl BooleanType
- */
-class BooleanType extends \GraphQL\Type\Definition\BooleanType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/EnumType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/EnumType.php
deleted file mode 100644
index 4dc8ecc53b9ea..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/EnumType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl EnumType
- */
-class EnumType extends \GraphQL\Type\Definition\EnumType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
deleted file mode 100644
index 18cf0ac3373b0..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl FloatType
- */
-class FloatType extends \GraphQL\Type\Definition\FloatType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IdType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IdType.php
deleted file mode 100644
index 3a269817fb9ec..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IdType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl IdType
- */
-class IdType extends \GraphQL\Type\Definition\IDType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/InputObjectType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/InputObjectType.php
deleted file mode 100644
index 91e2ab9ba22c3..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/InputObjectType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl InputObjectType
- */
-class InputObjectType extends \GraphQL\Type\Definition\InputObjectType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
deleted file mode 100644
index 1849cccccacb1..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl IntType
- */
-class IntType extends \GraphQL\Type\Definition\IntType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/InterfaceType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/InterfaceType.php
deleted file mode 100644
index fb018a6fd214a..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/InterfaceType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl InterfaceType
- */
-class InterfaceType extends \GraphQL\Type\Definition\InterfaceType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/ListOfType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/ListOfType.php
deleted file mode 100644
index df9f58a50ce52..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/ListOfType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl ListOfType
- */
-class ListOfType extends \GraphQL\Type\Definition\ListOfType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/NonNull.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/NonNull.php
deleted file mode 100644
index 40be75a17e8eb..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/NonNull.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl NonNull
- */
-class NonNull extends \GraphQL\Type\Definition\NonNull implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/ObjectType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/ObjectType.php
deleted file mode 100644
index 1b0581678ae7a..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/ObjectType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl ObjectType
- */
-class ObjectType extends \GraphQL\Type\Definition\ObjectType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/ResolveInfo.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/ResolveInfo.php
deleted file mode 100644
index c05a2a0498b2f..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/ResolveInfo.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl ResolveInfo
- */
-class ResolveInfo extends \GraphQL\Type\Definition\ResolveInfo
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
deleted file mode 100644
index a8c9520292800..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Wrapper for GraphQl StringType
- */
-class StringType extends \GraphQL\Type\Definition\StringType implements TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/TypeInterface.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/TypeInterface.php
deleted file mode 100644
index 170211b0af6b0..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/TypeInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type\Definition;
-
-/**
- * Marker interface for GraphQl Type
- */
-interface TypeInterface
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Schema.php b/lib/internal/Magento/Framework/GraphQl/Type/Schema.php
deleted file mode 100644
index fd6dc540a7afb..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/Schema.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl\Type;
-
-class Schema extends \GraphQL\Type\Schema
-{
-
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/SchemaFactory.php b/lib/internal/Magento/Framework/GraphQl/Type/SchemaFactory.php
deleted file mode 100644
index 6ef60b56f8af2..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Type/SchemaFactory.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\GraphQl\Type;
-
-/**
- * Factory for @see Schema
- */
-class SchemaFactory
-{
-    /**
-     * Create a Schema class
-     *
-     * @param array $config
-     * @return Schema
-     */
-    public function create($config)
-    {
-        return new Schema($config);
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/TypeFactory.php
deleted file mode 100644
index bc32211c87907..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/TypeFactory.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\GraphQl;
-
-use Magento\Framework\GraphQl\Type\Definition;
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
-use Magento\Framework\GraphQl\Type\Definition\InterfaceType;
-use Magento\Framework\GraphQl\Type\Definition\InputObjectType;
-use Magento\Framework\GraphQl\Type\Definition\EnumType;
-use Magento\Framework\GraphQl\Type\Definition\ListOfType;
-use Magento\Framework\GraphQl\Type\Definition\NonNull;
-use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
-use GraphQL\Type\Definition\Type;
-
-/**
- * Factory for @see TypeInterface implementations
- */
-class TypeFactory
-{
-    /**
-     * @param string $type
-     * @return Type
-     */
-    public function createScalar(string $type)
-    {
-        $scalarTypes = Type::getInternalTypes();
-        return $scalarTypes[$type];
-    }
-
-    /**
-     * @param array $config
-     * @return TypeInterface
-     */
-    public function createObject(array $config)
-    {
-        return new ObjectType($config);
-    }
-
-    /**
-     * @param array $config
-     * @return TypeInterface
-     */
-    public function createInterface(array $config)
-    {
-        return new InterfaceType($config);
-    }
-
-    /**
-     * @param array $config
-     * @return TypeInterface
-     */
-    public function createInputObject(array $config)
-    {
-        return new InputObjectType($config);
-    }
-
-    /**
-     * @param array $config
-     * @return TypeInterface
-     */
-    public function createEnum(array $config)
-    {
-        return new EnumType($config);
-    }
-
-    /**
-     * @param TypeInterface|Type $definedType
-     * @return TypeInterface
-     */
-    public function createList(Type $definedType)
-    {
-        return new ListOfType($definedType);
-    }
-
-    /**
-     * @param TypeInterface|Type $definedType
-     * @return TypeInterface
-     */
-    public function createNonNull(Type $definedType)
-    {
-        return new NonNull($definedType);
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/Common/Reader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/Common/Reader.php
new file mode 100644
index 0000000000000..f382353ab4943
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/Common/Reader.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\Common;
+
+use Magento\Framework\Config\ReaderInterface;
+
+/**
+ * Composite configuration reader for GraphQL schema information.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(
+        array $readers = []
+    ) {
+        $this->readers = $readers;
+    }
+
+    /**
+     * Read configuration scope for GraphQL.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null) : array
+    {
+        $output = [];
+        foreach ($this->readers as $reader) {
+            $output = array_replace_recursive($output, $reader->read($scope));
+        }
+        return $output;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
new file mode 100644
index 0000000000000..91387d7b98469
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching;
+
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
+use Magento\Framework\Config\ReaderInterface;
+
+/**
+ * Reads *.graphqls files from modules and combines the results as array to be used with a library to configure objects
+ */
+class GraphQlReader implements ReaderInterface
+{
+    const GRAPHQL_PLACEHOLDER_FIELD_NAME = 'placeholder_graphql_field';
+
+    const GRAPHQL_SCHEMA_FILE = 'schema.graphqls';
+
+    /**
+     * File locator
+     *
+     * @var FileResolverInterface
+     */
+    private $fileResolver;
+
+    /**
+     * @var TypeReaderComposite
+     */
+    private $typeReader;
+
+    /**
+     * @var string
+     */
+    private $fileName;
+
+    /**
+     * @var string
+     */
+    private $defaultScope;
+
+    /**
+     * @param FileResolverInterface $fileResolver
+     * @param TypeReaderComposite $typeReader
+     * @param string $fileName
+     * @param string $defaultScope
+     */
+    public function __construct(
+        FileResolverInterface $fileResolver,
+        TypeReaderComposite $typeReader,
+        $fileName = self::GRAPHQL_SCHEMA_FILE,
+        $defaultScope = 'global'
+    ) {
+        $this->fileResolver = $fileResolver;
+        $this->typeReader = $typeReader;
+        $this->defaultScope = $defaultScope;
+        $this->fileName = $fileName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($scope = null) : array
+    {
+        $results = [];
+        $scope = $scope ?: $this->defaultScope;
+        $schemaFiles = $this->fileResolver->get($this->fileName, $scope);
+        if (!count($schemaFiles)) {
+            return $results;
+        }
+
+        /**
+         * Compatible with @see GraphQlReader::parseTypes
+         */
+        $knownTypes = [];
+        foreach ($schemaFiles as $partialSchemaContent) {
+            $partialSchemaTypes = $this->parseTypes($partialSchemaContent);
+
+            // Keep declarations from current partial schema, add missing declarations from all previously read schemas
+            $knownTypes = $partialSchemaTypes + $knownTypes;
+            $schemaContent = implode("\n", $knownTypes);
+
+            $partialResults = $this->readPartialTypes($schemaContent);
+
+            $results = array_replace_recursive($results, $partialResults);
+        }
+
+        $results = $this->copyInterfaceFieldsToConcreteTypes($results);
+        return $results;
+    }
+
+    /**
+     * Extract types as string from schema as string
+     *
+     * @param string $graphQlSchemaContent
+     * @return string[] [$typeName => $typeDeclaration, ...]
+     */
+    private function readPartialTypes(string $graphQlSchemaContent) : array
+    {
+        $partialResults = [];
+
+        $graphQlSchemaContent = $this->addPlaceHolderInSchema($graphQlSchemaContent);
+
+        $schema = \GraphQL\Utils\BuildSchema::build($graphQlSchemaContent);
+
+        foreach ($schema->getTypeMap() as $typeName => $typeMeta) {
+            // Only process custom types and skip built-in object types
+            if ((strpos($typeName, '__') !== 0 && (!$typeMeta instanceof \GraphQL\Type\Definition\ScalarType))) {
+                $type = $this->typeReader->read($typeMeta);
+                if (!empty($type)) {
+                    $partialResults[$typeName] = $type;
+                } else {
+                    throw new \LogicException("'{$typeName}' cannot be processed.");
+                }
+            }
+        }
+
+        $partialResults = $this->removePlaceholderFromResults($partialResults);
+
+        return $partialResults;
+    }
+
+    /**
+     * Extract types as string from a larger string that represents the graphql schema using regular expressions
+     *
+     * @param string $graphQlSchemaContent
+     * @return string[] [$typeName => $typeDeclaration, ...]
+     */
+    private function parseTypes(string $graphQlSchemaContent) : array
+    {
+        $typeKindsPattern = '(type|interface|union|enum|input)';
+        $typeNamePattern = '([_A-Za-z][_0-9A-Za-z]+)';
+        $typeDefinitionPattern = '([^\{]*)(\{[^\}]*\})';
+        $spacePattern = '[\s\t\n\r]+';
+
+        preg_match_all(
+            "/{$typeKindsPattern}{$spacePattern}{$typeNamePattern}{$spacePattern}{$typeDefinitionPattern}/i",
+            $graphQlSchemaContent,
+            $matches
+        );
+
+        $parsedTypes = [];
+
+        if (!empty($matches)) {
+            foreach ($matches[0] as $matchKey => $matchValue) {
+                $matches[0][$matchKey] = $this->convertInterfacesToAnnotations($matchValue);
+            }
+
+            /**
+             * $matches[0] is an indexed array with the whole type definitions
+             * $matches[2] is an indexed array with type names
+             */
+            $parsedTypes = array_combine($matches[2], $matches[0]);
+        }
+        return $parsedTypes;
+    }
+
+    /**
+     * Copy interface fields to concrete types
+     *
+     * @param array $source
+     * @return array
+     */
+    private function copyInterfaceFieldsToConcreteTypes(array $source): array
+    {
+        foreach ($source as $interface) {
+            if ($interface['type'] == 'graphql_interface') {
+                foreach ($source as $typeName => $type) {
+                    if (isset($type['implements'])
+                        && isset($type['implements'][$interface['name']])
+                        && isset($type['implements'][$interface['name']]['copyFields'])
+                        && $type['implements'][$interface['name']]['copyFields'] === true
+                    ) {
+                        $source[$typeName]['fields'] = isset($type['fields'])
+                            ? array_replace($interface['fields'], $type['fields']) : $interface['fields'];
+                    }
+                }
+            }
+        }
+
+        return $source;
+    }
+
+    /**
+     * Find the implements statement and convert them to annotation to enable copy fields feature
+     *
+     * @param string $graphQlSchemaContent
+     * @return string
+     */
+    private function convertInterfacesToAnnotations(string $graphQlSchemaContent): string
+    {
+        $implementsKindsPattern = 'implements';
+        $typeNamePattern = '([_A-Za-z][_0-9A-Za-z]+)';
+        $spacePattern = '([\s\t\n\r]+)';
+        $spacePatternNotMandatory = '[\s\t\n\r]*';
+        preg_match_all(
+            "/{$spacePattern}{$implementsKindsPattern}{$spacePattern}{$typeNamePattern}"
+            . "(,{$spacePatternNotMandatory}$typeNamePattern)*/im",
+            $graphQlSchemaContent,
+            $allMatchesForImplements
+        );
+
+        if (!empty($allMatchesForImplements)) {
+            foreach (array_unique($allMatchesForImplements[0]) as $implementsString) {
+                $implementsStatementString = preg_replace(
+                    "/{$spacePattern}{$implementsKindsPattern}{$spacePattern}/m",
+                    '',
+                    $implementsString
+                );
+                preg_match_all(
+                    "/{$typeNamePattern}+/im",
+                    $implementsStatementString,
+                    $implementationsMatches
+                );
+
+                if (!empty($implementationsMatches)) {
+                    $annotationString = ' @implements(interfaces: [';
+                    foreach ($implementationsMatches[0] as $interfaceName) {
+                        $annotationString.= "\"{$interfaceName}\", ";
+                    }
+                    $annotationString = rtrim($annotationString, ', ');
+                    $annotationString .= ']) ';
+                    $graphQlSchemaContent = str_replace($implementsString, $annotationString, $graphQlSchemaContent);
+                }
+            }
+        }
+
+        return $graphQlSchemaContent;
+    }
+
+    /**
+     * Add a placeholder field into the schema to allow parser to not throw error on empty types
+     * This method is paired with @see self::removePlaceholderFromResults()
+     * This is needed so that the placeholder doens't end up in the actual schema
+     *
+     * @param string $graphQlSchemaContent
+     * @return string
+     */
+    private function addPlaceHolderInSchema(string $graphQlSchemaContent) :string
+    {
+        $placeholderField = self::GRAPHQL_PLACEHOLDER_FIELD_NAME;
+        $typesKindsPattern = '(type|interface|input)';
+        $enumKindsPattern = '(enum)';
+        $typeNamePattern = '([_A-Za-z][_0-9A-Za-z]+)';
+        $typeDefinitionPattern = '([^\{]*)(\{[\s\t\n\r^\}]*\})';
+        $spacePattern = '([\s\t\n\r]+)';
+
+        //add placeholder in empty types
+        $graphQlSchemaContent = preg_replace(
+            "/{$typesKindsPattern}{$spacePattern}{$typeNamePattern}{$spacePattern}{$typeDefinitionPattern}/im",
+            "\$1\$2\$3\$4\$5{\n{$placeholderField}: String\n}",
+            $graphQlSchemaContent
+        );
+
+        //add placeholder in empty enums
+        $graphQlSchemaContent = preg_replace(
+            "/{$enumKindsPattern}{$spacePattern}{$typeNamePattern}{$spacePattern}{$typeDefinitionPattern}/im",
+            "\$1\$2\$3\$4\$5{\n{$placeholderField}\n}",
+            $graphQlSchemaContent
+        );
+        return $graphQlSchemaContent;
+    }
+
+    /**
+     * Remove parsed placeholders as these should not be present in final result
+     *
+     * @param array $partialResults
+     * @return array
+     */
+    private function removePlaceholderFromResults(array $partialResults) : array
+    {
+        $placeholderField = self::GRAPHQL_PLACEHOLDER_FIELD_NAME;
+        //remove parsed placeholders
+        foreach ($partialResults as $typeKeyName => $partialResultTypeArray) {
+            if (isset($partialResultTypeArray['fields'][$placeholderField])) {
+                //unset placeholder for fields
+                unset($partialResults[$typeKeyName]['fields'][$placeholderField]);
+            } elseif (isset($partialResultTypeArray['items'][$placeholderField])) {
+                //unset placeholder for enums
+                unset($partialResults[$typeKeyName]['items'][$placeholderField]);
+            }
+        }
+        return $partialResults;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/DocReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/DocReader.php
new file mode 100644
index 0000000000000..2660f6b276d7a
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/DocReader.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
+
+/**
+ * Reads documentation from the annotation @doc of an AST node
+ */
+class DocReader
+{
+    /**
+     * Read documentation annotation for a specific node if exists
+     *
+     * @param \GraphQL\Language\AST\NodeList $directives
+     * @return string
+     */
+    public function read(\GraphQL\Language\AST\NodeList $directives) : string
+    {
+        foreach ($directives as $directive) {
+            if ($directive->name->value == 'doc') {
+                foreach ($directive->arguments as $directiveArgument) {
+                    if ($directiveArgument->name->value == 'description') {
+                        return $directiveArgument->value->value;
+                    }
+                }
+            }
+        }
+        return '';
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php
new file mode 100644
index 0000000000000..736a944711004
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
+
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\TypeMetaWrapperReader;
+
+/**
+ * Reads fields and possible arguments from a meta field
+ */
+class FieldMetaReader
+{
+    /**
+     * @var TypeMetaWrapperReader
+     */
+    private $typeMetaReader;
+
+    /**
+     * @var DocReader
+     */
+    private $docReader;
+
+    /**
+     * @param TypeMetaWrapperReader $typeMetaReader
+     * @param DocReader $docReader
+     */
+    public function __construct(TypeMetaWrapperReader $typeMetaReader, DocReader $docReader)
+    {
+        $this->typeMetaReader = $typeMetaReader;
+        $this->docReader = $docReader;
+    }
+
+    /**
+     * Read field and possible arguments from a field meta
+     *
+     * @param \GraphQL\Type\Definition\FieldDefinition $fieldMeta
+     * @return array
+     */
+    public function read(\GraphQL\Type\Definition\FieldDefinition $fieldMeta) : array
+    {
+        $fieldName = $fieldMeta->name;
+        $fieldTypeMeta = $fieldMeta->getType();
+        $result = [
+            'name' => $fieldName,
+            'arguments' => []
+        ];
+
+        $fieldResolver = $this->getFieldResolver($fieldMeta);
+        if (!empty($fieldResolver)) {
+            $result['resolver'] = $fieldResolver;
+        }
+
+        $result = array_merge(
+            $result,
+            $this->typeMetaReader->read($fieldTypeMeta, TypeMetaWrapperReader::OUTPUT_FIELD_PARAMETER)
+        );
+
+        if ($this->docReader->read($fieldMeta->astNode->directives)) {
+            $result['description'] = $this->docReader->read($fieldMeta->astNode->directives);
+        }
+
+        $arguments = $fieldMeta->args;
+        foreach ($arguments as $argumentMeta) {
+            $argumentName = $argumentMeta->name;
+            $result['arguments'][$argumentName] = [
+                'name' => $argumentName,
+            ];
+            if ($argumentMeta->defaultValue !== null) {
+                $result['arguments'][$argumentName]['defaultValue'] = $argumentMeta->defaultValue;
+            }
+            $typeMeta = $argumentMeta->getType();
+            $result['arguments'][$argumentName] = array_merge(
+                $result['arguments'][$argumentName],
+                $this->typeMetaReader->read($typeMeta, TypeMetaWrapperReader::ARGUMENT_PARAMETER)
+            );
+
+            if ($this->docReader->read($argumentMeta->astNode->directives)) {
+                $result['arguments'][$argumentName]['description'] =
+                    $this->docReader->read($argumentMeta->astNode->directives);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Read resolver if an annotation with the class of the resolver is defined in the meta
+     *
+     * @param \GraphQL\Type\Definition\FieldDefinition $fieldMeta
+     * @return string
+     */
+    private function getFieldResolver(\GraphQL\Type\Definition\FieldDefinition $fieldMeta) : string
+    {
+        /** @var \GraphQL\Language\AST\NodeList $directives */
+        $directives = $fieldMeta->astNode->directives;
+        foreach ($directives as $directive) {
+            if ($directive->name->value == 'resolver') {
+                foreach ($directive->arguments as $directiveArgument) {
+                    if ($directiveArgument->name->value == 'class') {
+                        return $directiveArgument->value->value;
+                    }
+                }
+            }
+        }
+        return '';
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/ImplementsReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/ImplementsReader.php
new file mode 100644
index 0000000000000..0e45d919d844b
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/ImplementsReader.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
+
+/**
+ * Reads interfaces implementations from the annotation @implements of an AST node
+ */
+class ImplementsReader
+{
+    /**
+     * Read implements annotation for a specific node if exists
+     *
+     * @param \GraphQL\Language\AST\NodeList $directives
+     * @return string[]|null
+     */
+    public function read(\GraphQL\Language\AST\NodeList $directives) : array
+    {
+        foreach ($directives as $directive) {
+            if ($directive->name->value == 'implements') {
+                foreach ($directive->arguments as $directiveArgument) {
+                    if ($directiveArgument->name->value == 'interfaces') {
+                        if ($directiveArgument->value->kind == 'ListValue') {
+                            $interfacesNames = [];
+                            foreach ($directiveArgument->value->values as $stringValue) {
+                                $interfacesNames[] = $stringValue->value;
+                            }
+                            return $interfacesNames;
+                        } else {
+                            return [$directiveArgument->value->value];
+                        }
+                    }
+                }
+            }
+        }
+        return [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/TypeMetaWrapperReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/TypeMetaWrapperReader.php
new file mode 100644
index 0000000000000..78e3f28763385
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/TypeMetaWrapperReader.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
+
+/**
+ * Common cases for types that need extra formatting like wrapping or additional properties added to their definition
+ */
+class TypeMetaWrapperReader
+{
+    const ARGUMENT_PARAMETER = 'Argument';
+
+    const OUTPUT_FIELD_PARAMETER = 'OutputField';
+
+    const INPUT_FIELD_PARAMETER = 'InputField';
+
+    /**
+     * Read from type meta data and determine wrapping types that are needed and extra properties that need to be added
+     *
+     * @param \GraphQL\Type\Definition\Type $meta
+     * @param string $parameterType Argument|OutputField|InputField
+     * @return array
+     */
+    public function read(\GraphQL\Type\Definition\Type $meta, string $parameterType) : array
+    {
+        $result = [];
+        if ($meta instanceof \GraphQL\Type\Definition\NonNull) {
+            $result['required'] = true;
+            $meta = $meta->getWrappedType();
+        } else {
+            $result['required'] = false;
+        }
+        if ($meta instanceof \GraphQL\Type\Definition\ListOfType) {
+            $itemTypeMeta = $meta->ofType;
+            if ($itemTypeMeta instanceof \GraphQL\Type\Definition\NonNull) {
+                $result['itemsRequired'] = true;
+                $itemTypeMeta = $itemTypeMeta->getWrappedType();
+            } else {
+                $result['itemsRequired'] = false;
+            }
+            $itemTypeName = $itemTypeMeta->name;
+            $result['itemType'] = $itemTypeName;
+            if ($itemTypeMeta instanceof \GraphQL\Type\Definition\ScalarType) {
+                $result['type'] = 'ScalarArray' . $parameterType;
+            } else {
+                $result['type'] = 'ObjectArray' . $parameterType;
+            }
+        } else {
+            $result['type'] = $meta->name;
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
new file mode 100644
index 0000000000000..3e9e819078db8
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader;
+
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
+
+/**
+ * Composite configuration reader to handle the enum type meta
+ */
+class EnumType implements TypeMetaReaderInterface
+{
+    /**
+     * @var DocReader
+     */
+    private $docReader;
+
+    /**
+     * @param DocReader $docReader
+     */
+    public function __construct(DocReader $docReader)
+    {
+        $this->docReader = $docReader;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    {
+        if ($typeMeta instanceof \GraphQL\Type\Definition\EnumType) {
+            $result = [
+                'name' => $typeMeta->name,
+                'type' => 'graphql_enum',
+                'items' => [] // Populated later
+            ];
+            foreach ($typeMeta->getValues() as $enumValueMeta) {
+                $result['items'][$enumValueMeta->value] = [
+                    'name' => strtolower($enumValueMeta->name),
+                    '_value' => $enumValueMeta->value
+                ];
+
+                if ($this->docReader->read($enumValueMeta->astNode->directives)) {
+                    $result['items'][$enumValueMeta->value]['description'] =
+                        $this->docReader->read($enumValueMeta->astNode->directives);
+                }
+            }
+
+            if ($this->docReader->read($typeMeta->astNode->directives)) {
+                $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
+            }
+
+            return $result;
+        } else {
+            return [];
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
new file mode 100644
index 0000000000000..3aea555e67f98
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader;
+
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\TypeMetaWrapperReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
+
+/**
+ * Composite configuration reader to handle the input object type meta
+ */
+class InputObjectType implements TypeMetaReaderInterface
+{
+    /**
+     * @var TypeMetaWrapperReader
+     */
+    private $typeMetaReader;
+
+    /**
+     * @var DocReader
+     */
+    private $docReader;
+
+    /**
+     * @param TypeMetaWrapperReader $typeMetaReader
+     * @param DocReader $docReader
+     */
+    public function __construct(TypeMetaWrapperReader $typeMetaReader, DocReader $docReader)
+    {
+        $this->typeMetaReader = $typeMetaReader;
+        $this->docReader = $docReader;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    {
+        if ($typeMeta instanceof \GraphQL\Type\Definition\InputObjectType) {
+            $typeName = $typeMeta->name;
+            $result = [
+                'name' => $typeName,
+                'type' => 'graphql_input',
+                'fields' => [] // Populated later
+            ];
+            $fields = $typeMeta->getFields();
+            foreach ($fields as $fieldName => $fieldMeta) {
+                $result['fields'][$fieldName] = $this->readInputObjectFieldMeta($fieldMeta);
+            }
+
+            if ($this->docReader->read($typeMeta->astNode->directives)) {
+                $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
+            }
+            return $result;
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * @param \GraphQL\Type\Definition\InputObjectField $fieldMeta
+     * @return array
+     */
+    private function readInputObjectFieldMeta(\GraphQL\Type\Definition\InputObjectField $fieldMeta) : array
+    {
+        $fieldName = $fieldMeta->name;
+        $typeMeta = $fieldMeta->getType();
+        $result = [
+            'name' => $fieldName,
+            'required' => false,
+            'arguments' => []
+        ];
+
+        $result = array_merge(
+            $result,
+            $this->typeMetaReader->read($typeMeta, TypeMetaWrapperReader::INPUT_FIELD_PARAMETER)
+        );
+
+        if ($this->docReader->read($fieldMeta->astNode->directives)) {
+                $result['description'] = $this->docReader->read($fieldMeta->astNode->directives);
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
new file mode 100644
index 0000000000000..dd934ffebc2c1
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader;
+
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\FieldMetaReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
+
+/**
+ * Composite configuration reader to handle the interface object type meta
+ */
+class InterfaceType implements TypeMetaReaderInterface
+{
+    /**
+     * @var FieldMetaReader
+     */
+    private $fieldMetaReader;
+
+    /**
+     * @var DocReader
+     */
+    private $docReader;
+
+    /**
+     * @param FieldMetaReader $fieldMetaReader
+     * @param DocReader $docReader
+     */
+    public function __construct(FieldMetaReader $fieldMetaReader, DocReader $docReader)
+    {
+        $this->fieldMetaReader = $fieldMetaReader;
+        $this->docReader = $docReader;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    {
+        if ($typeMeta instanceof \GraphQL\Type\Definition\InterfaceType) {
+            $typeName = $typeMeta->name;
+            $result = [
+                'name' => $typeName,
+                'type' => 'graphql_interface',
+                'fields' => []
+            ];
+
+            $interfaceTypeResolver = $this->getInterfaceTypeResolver($typeMeta);
+            if (!empty($interfaceTypeResolver)) {
+                $result['typeResolver'] = $interfaceTypeResolver;
+            }
+
+            $fields = $typeMeta->getFields();
+            foreach ($fields as $fieldName => $fieldMeta) {
+                $result['fields'][$fieldName] = $this->fieldMetaReader->read($fieldMeta);
+            }
+
+            if ($this->docReader->read($typeMeta->astNode->directives)) {
+                $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
+            }
+
+            return $result;
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * Retrieve the interface type resolver if it exists from the meta data
+     *
+     * @param \GraphQL\Type\Definition\InterfaceType $interfaceTypeMeta
+     * @return string
+     */
+    private function getInterfaceTypeResolver(\GraphQL\Type\Definition\InterfaceType $interfaceTypeMeta) : string
+    {
+        /** @var \GraphQL\Language\AST\NodeList $directives */
+        $directives = $interfaceTypeMeta->astNode->directives;
+        foreach ($directives as $directive) {
+            if ($directive->name->value == 'typeResolver') {
+                foreach ($directive->arguments as $directiveArgument) {
+                    if ($directiveArgument->name->value == 'class') {
+                        return $directiveArgument->value->value;
+                    }
+                }
+            }
+        }
+        return '';
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
new file mode 100644
index 0000000000000..fb015922087b6
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader;
+
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\FieldMetaReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\ImplementsReader;
+
+/**
+ * Composite configuration reader to handle the object type meta
+ */
+class ObjectType implements TypeMetaReaderInterface
+{
+    /**
+     * @var FieldMetaReader
+     */
+    private $fieldMetaReader;
+
+    /**
+     * @var DocReader
+     */
+    private $docReader;
+
+    /**
+     * @var ImplementsReader
+     */
+    private $implementsAnnotation;
+
+    /**
+     * @param FieldMetaReader $fieldMetaReader
+     * @param DocReader $docReader
+     * @param ImplementsReader $implementsAnnotation
+     */
+    public function __construct(
+        FieldMetaReader $fieldMetaReader,
+        DocReader $docReader,
+        ImplementsReader $implementsAnnotation
+    ) {
+        $this->fieldMetaReader = $fieldMetaReader;
+        $this->docReader = $docReader;
+        $this->implementsAnnotation = $implementsAnnotation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    {
+        if ($typeMeta instanceof \GraphQL\Type\Definition\ObjectType) {
+            $typeName = $typeMeta->name;
+            $result = [
+                'name' => $typeName,
+                'type' => 'graphql_type',
+                'fields' => [], // Populated later
+            ];
+
+            $interfacesNames = $this->implementsAnnotation->read($typeMeta->astNode->directives);
+            foreach ($interfacesNames as $interfaceName) {
+                $result['implements'][$interfaceName] = [
+                    'interface' => $interfaceName,
+                    'copyFields' => true
+                ];
+            }
+
+            $fields = $typeMeta->getFields();
+            foreach ($fields as $fieldName => $fieldMeta) {
+                $result['fields'][$fieldName] = $this->fieldMetaReader->read($fieldMeta);
+            }
+
+            if ($this->docReader->read($typeMeta->astNode->directives)) {
+                    $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
+            }
+
+            return $result;
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * Find interface graphql type in array list of strings
+     *
+     * @param \GraphQL\Type\Definition\InterfaceType $interfacesType
+     * @param string[] $interfacesNames
+     * @return bool
+     */
+    public function isInInterfaceTypeInList(
+        \GraphQL\Type\Definition\InterfaceType  $interfacesType,
+        array $interfacesNames
+    ) : bool {
+        if (in_array($interfacesType->name, $interfacesNames)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeMetaReaderInterface.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeMetaReaderInterface.php
new file mode 100644
index 0000000000000..3a73be5fdda2e
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeMetaReaderInterface.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\GraphQlSchemaStitching\GraphQlReader;
+
+/**
+ * Reads and returns metadata as array for a specific type if it finds an adequate implementation for that type
+ */
+interface TypeMetaReaderInterface
+{
+    /**
+     * Read schema data from type metadata if proper type is provided for a specific implementation
+     *
+     * @param \GraphQL\Type\Definition\Type $typeMeta
+     * @return array|null
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta)  : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php
new file mode 100644
index 0000000000000..e9b899bb2bb5b
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.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\GraphQlSchemaStitching\GraphQlReader;
+
+/**
+ * Composite configured class used to determine which reader should be used for a specific type
+ */
+class TypeReaderComposite implements TypeMetaReaderInterface
+{
+    /** @var TypeMetaReaderInterface[] */
+    private $typeReaders = [];
+
+    /**
+     * @param array $typeReaders
+     */
+    public function __construct(
+        $typeReaders = []
+    ) {
+        $this->typeReaders = $typeReaders;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    {
+        foreach ($this->typeReaders as $typeReader) {
+            $result = $typeReader->read($typeMeta);
+            if (!empty($result)) {
+                return $result;
+            }
+        }
+        return [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md b/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md
new file mode 100644
index 0000000000000..b87cd2d7e4e7c
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md
@@ -0,0 +1 @@
+The GraphQlSchemaStitching library contains functionality for processing GraphQl SDL schema, to be used by Graphql library to build objects from the data generated.
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index db466ca30e7eb..15f09b8505202 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -154,7 +154,7 @@ public function connect($host, $port = 80, $secure = false)
      * Send request to the remote server
      *
      * @param string $method
-     * @param \Zend_Uri_Http|string $url
+     * @param string $url
      * @param string $http_ver
      * @param array $headers
      * @param string $body
@@ -163,9 +163,6 @@ public function connect($host, $port = 80, $secure = false)
      */
     public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '')
     {
-        if ($url instanceof \Zend_Uri_Http) {
-            $url = $url->getUri();
-        }
         $this->_applyConfig();
 
         // set url to post to
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Curl.php b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
index 788439aa4ff0d..0ac65a420ddcf 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
@@ -161,6 +161,7 @@ public function removeHeader($name)
 
     /**
      * Authorization: Basic header
+     *
      * Login credentials support
      *
      * @param string $login username
@@ -209,6 +210,7 @@ public function setCookies($cookies)
 
     /**
      * Clear cookies
+     *
      * @return void
      */
     public function removeCookies()
@@ -293,6 +295,7 @@ public function getCookies()
     /**
      * Get cookies array with details
      * (domain, expire time etc)
+     *
      * @return array
      */
     public function getCookiesFull()
@@ -327,6 +330,7 @@ public function getCookiesFull()
 
     /**
      * Get response status code
+     *
      * @see lib\Magento\Framework\HTTP\Client#getStatus()
      *
      * @return int
@@ -345,6 +349,7 @@ public function getStatus()
      * @param string $method
      * @param string $uri
      * @param array|string $params - use $params as a string in case of JSON or XML POST request.
+     *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -410,6 +415,7 @@ protected function makeRequest($method, $uri, $params = [])
 
     /**
      * Throw error exception
+     *
      * @param string $string
      * @return void
      * @throws \Exception
@@ -432,10 +438,10 @@ protected function parseHeaders($ch, $data)
     {
         if ($this->_headerCount == 0) {
             $line = explode(" ", trim($data), 3);
-            if (count($line) != 3) {
+            if (count($line) < 2) {
                 $this->doError("Invalid response line returned from server: " . $data);
             }
-            $this->_responseStatus = intval($line[1]);
+            $this->_responseStatus = (int)$line[1];
         } else {
             $name = $value = '';
             $out = explode(": ", trim($data), 2);
@@ -474,6 +480,7 @@ protected function curlOption($name, $value)
 
     /**
      * Set curl options array directly
+     *
      * @param array $arr
      * @return void
      */
@@ -484,6 +491,7 @@ protected function curlOptions($arr)
 
     /**
      * Set CURL options overrides array
+     *
      * @param array $arr
      * @return void
      */
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Socket.php b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
index 8157081139788..eba182b98b93e 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Socket.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
@@ -12,9 +12,8 @@
 namespace Magento\Framework\HTTP\Client;
 
 /**
- * @SuppressWarnings(PHPMD.UnusedPrivateField)
- */
-/**
+ * Socket client
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
  */
 class Socket implements \Magento\Framework\HTTP\ClientInterface
@@ -134,6 +133,7 @@ public function disconnect()
 
     /**
      * Set headers from hash
+     *
      * @param array $headers
      * @return void
      */
@@ -167,6 +167,7 @@ public function removeHeader($name)
 
     /**
      * Authorization: Basic header
+     *
      * Login credentials support
      *
      * @param string $login username
@@ -235,8 +236,7 @@ public function get($uri)
     }
 
     /**
-     * Set host, port from full url
-     * and return relative url
+     * Set host, port from full url and return relative url
      *
      * @param string $uri ex. http://google.com/index.php?a=b
      * @return string ex. /index.php?a=b
@@ -273,7 +273,7 @@ protected function parseUrl($uri)
      * Make POST request
      *
      * @param string $uri
-     * @param array $params
+     * @param array|string $params use string in case of JSON or XML POST request
      * @return void
      */
     public function post($uri, $params)
@@ -330,6 +330,7 @@ public function getCookies()
     /**
      * Get cookies array with details
      * (domain, expire time etc)
+     *
      * @return array
      */
     public function getCookiesFull()
@@ -424,7 +425,7 @@ protected function processResponse()
         if (count($line) != 3) {
             return $this->doError("Invalid response line returned from server: " . $responseLine);
         }
-        $this->_responseStatus = intval($line[1]);
+        $this->_responseStatus = (int)$line[1];
         $this->processResponseHeaders();
 
         $this->processRedirect();
@@ -444,6 +445,7 @@ protected function processRedirect()
 
     /**
      * Get response status code
+     *
      * @see \Magento\Framework\HTTP\Client#getStatus()
      *
      * @return int
@@ -455,10 +457,12 @@ public function getStatus()
 
     /**
      * Make request
+     *
      * @param string $method
      * @param string $uri
-     * @param array $params
+     * @param array|string $params use string in case of JSON or XML POST request
      * @return void
+     * @throws \Exception
      */
     protected function makeRequest($method, $uri, $params = [])
     {
@@ -473,8 +477,8 @@ protected function makeRequest($method, $uri, $params = [])
 
         $appendHeaders = [];
         $paramsStr = false;
-        if ($isPost && count($params)) {
-            $paramsStr = http_build_query($params);
+        if ($isPost && $params) {
+            $paramsStr = is_array($params) ? http_build_query($params) : $params;
             $appendHeaders['Content-type'] = 'application/x-www-form-urlencoded';
             $appendHeaders['Content-length'] = strlen($paramsStr);
         }
@@ -492,6 +496,7 @@ protected function makeRequest($method, $uri, $params = [])
 
     /**
      * Throw error exception
+     *
      * @param string $string
      * @return void
      * @throws \Exception
@@ -503,6 +508,7 @@ public function doError($string)
 
     /**
      * Convert headers hash to string
+     *
      * @param array $append
      * @return string
      */
diff --git a/lib/internal/Magento/Framework/HTTP/ClientInterface.php b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
index 643f298ef4c45..e2e4a89af8fba 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/HTTP/Mime.php b/lib/internal/Magento/Framework/HTTP/Mime.php
new file mode 100644
index 0000000000000..7979fb2b7d10e
--- /dev/null
+++ b/lib/internal/Magento/Framework/HTTP/Mime.php
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\HTTP;
+
+/**
+ * Support class for MultiPart Mime Messages
+ */
+class Mime
+{
+    const TYPE_OCTETSTREAM         = 'application/octet-stream';
+    const TYPE_TEXT                = 'text/plain';
+    const TYPE_HTML                = 'text/html';
+    const ENCODING_7BIT            = '7bit';
+    const ENCODING_8BIT            = '8bit';
+    const ENCODING_QUOTEDPRINTABLE = 'quoted-printable';
+    const ENCODING_BASE64          = 'base64';
+    const DISPOSITION_ATTACHMENT   = 'attachment';
+    const DISPOSITION_INLINE       = 'inline';
+    const LINELENGTH               = 72;
+    const LINEEND                  = "\n";
+    const MULTIPART_ALTERNATIVE    = 'multipart/alternative';
+    const MULTIPART_MIXED          = 'multipart/mixed';
+    const MULTIPART_RELATED        = 'multipart/related';
+}
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
index 3b2f79eecb370..dfe4b759e85be 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -5,20 +5,22 @@
  */
 namespace Magento\Framework\HTTP\PhpEnvironment;
 
+use Magento\Framework\App\RequestInterface;
+
 /**
- * Library for working with client ip address
+ * Library for working with client ip address.
  */
 class RemoteAddress
 {
     /**
-     * Request object
+     * Request object.
      *
-     * @var \Magento\Framework\App\RequestInterface
+     * @var RequestInterface
      */
     protected $request;
 
     /**
-     * Remote address cache
+     * Remote address cache.
      *
      * @var string
      */
@@ -30,46 +32,114 @@ class RemoteAddress
     protected $alternativeHeaders;
 
     /**
-     * @param \Magento\Framework\App\RequestInterface $httpRequest
+     * @var string[]|null
+     */
+    private $trustedProxies;
+
+    /**
+     * @param RequestInterface $httpRequest
      * @param array $alternativeHeaders
+     * @param string[]|null $trustedProxies
      */
-    public function __construct(\Magento\Framework\App\RequestInterface $httpRequest, array $alternativeHeaders = [])
-    {
+    public function __construct(
+        RequestInterface $httpRequest,
+        array $alternativeHeaders = [],
+        array $trustedProxies = null
+    ) {
         $this->request = $httpRequest;
         $this->alternativeHeaders = $alternativeHeaders;
+        $this->trustedProxies = $trustedProxies;
     }
 
     /**
-     * Retrieve Client Remote Address
+     * Read address based on settings.
      *
-     * @param bool $ipToLong converting IP to long format
-     * @return string IPv4|long
+     * @return string|null
      */
-    public function getRemoteAddress($ipToLong = false)
+    private function readAddress()
     {
-        if ($this->remoteAddress === null) {
-            foreach ($this->alternativeHeaders as $var) {
-                if ($this->request->getServer($var, false)) {
-                    $this->remoteAddress = $this->request->getServer($var);
-                    break;
-                }
+        $remoteAddress = null;
+        foreach ($this->alternativeHeaders as $var) {
+            if ($this->request->getServer($var, false)) {
+                $remoteAddress = $this->request->getServer($var);
+                break;
             }
+        }
 
-            if (!$this->remoteAddress) {
-                $this->remoteAddress = $this->request->getServer('REMOTE_ADDR');
+        if (!$remoteAddress) {
+            $remoteAddress = $this->request->getServer('REMOTE_ADDR');
+        }
+
+        return $remoteAddress;
+    }
+
+    /**
+     * Filter addresses by trusted proxies list.
+     *
+     * @param string $remoteAddress
+     * @return string|null
+     */
+    private function filterAddress(string $remoteAddress)
+    {
+        if (strpos($remoteAddress, ',') !== false) {
+            $ipList = explode(',', $remoteAddress);
+        } else {
+            $ipList = [$remoteAddress];
+        }
+        $ipList = array_filter(
+            $ipList,
+            function (string $ip) {
+                return filter_var(trim($ip), FILTER_VALIDATE_IP);
             }
+        );
+        if ($this->trustedProxies !== null) {
+            $ipList = array_filter(
+                $ipList,
+                function (string $ip) {
+                    return !in_array(trim($ip), $this->trustedProxies, true);
+                }
+            );
+            $remoteAddress = trim(array_pop($ipList));
+        } else {
+            $remoteAddress = trim(reset($ipList));
         }
 
-        if (!$this->remoteAddress) {
-            return false;
+        return $remoteAddress ?: null;
+    }
+
+    /**
+     * Retrieve Client Remote Address.
+     * If alternative headers are used and said headers allow multiple IPs
+     * it is suggested that trusted proxies is also used
+     * for more accurate IP recognition.
+     *
+     * @param bool $ipToLong converting IP to long format
+     *
+     * @return string IPv4|long
+     */
+    public function getRemoteAddress(bool $ipToLong = false)
+    {
+        if ($this->remoteAddress !== null) {
+            return $this->remoteAddress;
         }
 
-        if (strpos($this->remoteAddress, ',') !== false) {
-            $ipList = explode(',', $this->remoteAddress);
-            $this->remoteAddress = trim(reset($ipList));
+        $remoteAddress = $this->readAddress();
+        if (!$remoteAddress) {
+            $this->remoteAddress = false;
+
+            return false;
         }
+        $remoteAddress = $this->filterAddress($remoteAddress);
 
-        return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
+        if (!$remoteAddress) {
+            $this->remoteAddress = false;
+
+            return false;
+        } else {
+            $this->remoteAddress = $remoteAddress;
+
+            return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
+        }
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/HTTP/ResponseFactory.php b/lib/internal/Magento/Framework/HTTP/ResponseFactory.php
new file mode 100644
index 0000000000000..43f27f51db70e
--- /dev/null
+++ b/lib/internal/Magento/Framework/HTTP/ResponseFactory.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\HTTP;
+
+/**
+ * A factory for an HTTP response.
+ */
+class ResponseFactory
+{
+    /**
+     * Creates a new \Zend_Http_Response object from a string.
+     *
+     * @param string $response
+     * @return \Zend_Http_Response
+     */
+    public function create($response)
+    {
+        return \Zend_Http_Response::fromString($response);
+    }
+}
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
index 8fd28e8513d0b..852badb16d219 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
@@ -38,6 +38,9 @@ public function testRead($response)
         $this->assertEquals(file_get_contents(__DIR__ . '/_files/curl_response_expected.txt'), $this->model->read());
     }
 
+    /**
+     * @return array
+     */
     public function readDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
index 30b50d9360d81..538359edd4306 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
@@ -5,44 +5,70 @@
  */
 namespace Magento\Framework\HTTP\Test\Unit\PhpEnvironment;
 
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class RemoteAddressTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Request\Http
+     * @var \PHPUnit_Framework_MockObject_MockObject|\HttpRequest
      */
     protected $_request;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     protected $_objectManager;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->_request = $this->getMockBuilder(
-            \Magento\Framework\App\Request\Http::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getServer']
-        )->getMock();
+        $this->_request = $this->getMockBuilder(HttpRequest::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getServer'])
+            ->getMock();
 
-        $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->_objectManager = new ObjectManager($this);
     }
 
     /**
+     * @param string[] $alternativeHeaders
+     * @param array $serverValueMap
+     * @param string|bool $expected
+     * @param bool $ipToLong
+     * @param string[]|null $trustedProxies
+     * @return void
      * @dataProvider getRemoteAddressProvider
      */
-    public function testGetRemoteAddress($alternativeHeaders, $serverValueMap, $expected, $ipToLong)
-    {
+    public function testGetRemoteAddress(
+        array $alternativeHeaders,
+        array $serverValueMap,
+        $expected,
+        bool $ipToLong,
+        array $trustedProxies = null
+    ): void {
         $remoteAddress = $this->_objectManager->getObject(
-            \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class,
-            ['httpRequest' => $this->_request, 'alternativeHeaders' => $alternativeHeaders]
+            RemoteAddress::class,
+            [
+                'httpRequest' => $this->_request,
+                'alternativeHeaders' => $alternativeHeaders,
+                'trustedProxies' => $trustedProxies,
+            ]
         );
-        $this->_request->expects($this->any())->method('getServer')->will($this->returnValueMap($serverValueMap));
+        $this->_request->expects($this->any())
+            ->method('getServer')
+            ->will($this->returnValueMap($serverValueMap));
+
         $this->assertEquals($expected, $remoteAddress->getRemoteAddress($ipToLong));
     }
 
     /**
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getRemoteAddressProvider()
     {
@@ -52,18 +78,21 @@ public function getRemoteAddressProvider()
                 'serverValueMap' => [['REMOTE_ADDR', null, null]],
                 'expected' => false,
                 'ipToLong' => false,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => [],
                 'serverValueMap' => [['REMOTE_ADDR', null, '192.168.0.1']],
                 'expected' => '192.168.0.1',
-                'ipToLong' => false
+                'ipToLong' => false,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => [],
                 'serverValueMap' => [['REMOTE_ADDR', null, '192.168.1.1']],
                 'expected' => ip2long('192.168.1.1'),
-                'ipToLong' => true
+                'ipToLong' => true,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => ['TEST_HEADER'],
@@ -73,7 +102,8 @@ public function getRemoteAddressProvider()
                     ['TEST_HEADER', false, '192.168.0.1'],
                 ],
                 'expected' => '192.168.0.1',
-                'ipToLong' => false
+                'ipToLong' => false,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => ['TEST_HEADER'],
@@ -83,8 +113,74 @@ public function getRemoteAddressProvider()
                     ['TEST_HEADER', false, '192.168.0.1'],
                 ],
                 'expected' => ip2long('192.168.0.1'),
-                'ipToLong' => true
-            ]
+                'ipToLong' => true,
+                'trustedProxies' => null,
+            ],
+            [
+                'alternativeHeaders' => [],
+                'serverValueMap' => [
+                    ['REMOTE_ADDR', null, 'NotValidIp'],
+                ],
+                'expected' => false,
+                'ipToLong' => false,
+                'trustedProxies' => ['127.0.0.1'],
+            ],
+            [
+                'alternativeHeaders' => ['TEST_HEADER'],
+                'serverValueMap' => [
+                    ['TEST_HEADER', null, 'NotValid, 192.168.0.1'],
+                    ['TEST_HEADER', false, 'NotValid, 192.168.0.1'],
+                ],
+                'expected' => '192.168.0.1',
+                'ipToLong' => false,
+                'trustedProxies' => ['127.0.0.1'],
+            ],
+            [
+                'alternativeHeaders' => ['TEST_HEADER'],
+                'serverValueMap' => [
+                    ['TEST_HEADER', null, '192.168.0.2, 192.168.0.1'],
+                    ['TEST_HEADER', false, '192.168.0.2, 192.168.0.1'],
+                ],
+                'expected' => '192.168.0.2',
+                'ipToLong' => false,
+                'trustedProxies' => null,
+            ],
+            [
+                'alternativeHeaders' => [],
+                'serverValueMap' => [
+                    [
+                        'REMOTE_ADDR',
+                        null,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                    [
+                        'REMOTE_ADDR',
+                        false,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                ],
+                'expected' => '192.168.0.1',
+                'ipToLong' => false,
+                'trustedProxies' => ['192.168.0.3'],
+            ],
+            [
+                'alternativeHeaders' => [],
+                'serverValueMap' => [
+                    [
+                        'REMOTE_ADDR',
+                        null,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                    [
+                        'REMOTE_ADDR',
+                        false,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                ],
+                'expected' => '192.168.0.3',
+                'ipToLong' => false,
+                'trustedProxies' => [],
+            ],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
index a746b61ad0038..6bd8a977f2a2c 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
@@ -50,6 +50,10 @@ public function tearDown()
         $_SERVER = $this->serverArray;
     }
 
+    /**
+     * @param null $uri
+     * @return Request
+     */
     private function getModel($uri = null)
     {
         return new Request($this->cookieReader, $this->converter, $uri);
diff --git a/lib/internal/Magento/Framework/HTTP/ZendClient.php b/lib/internal/Magento/Framework/HTTP/ZendClient.php
index f5a001cf8e417..f88e6fabcb6f1 100644
--- a/lib/internal/Magento/Framework/HTTP/ZendClient.php
+++ b/lib/internal/Magento/Framework/HTTP/ZendClient.php
@@ -21,7 +21,7 @@ class ZendClient extends \Zend_Http_Client
     protected $_urlEncodeBody = true;
 
     /**
-     * @param null|\Zend_Uri_Http|string $uri
+     * @param null|string $uri
      * @param null|array $config
      */
     public function __construct($uri = null, $config = null)
diff --git a/lib/internal/Magento/Framework/Image.php b/lib/internal/Magento/Framework/Image.php
index 183f57ca26f69..b3867c0197b79 100644
--- a/lib/internal/Magento/Framework/Image.php
+++ b/lib/internal/Magento/Framework/Image.php
@@ -49,7 +49,7 @@ public function open()
         $this->_adapter->checkDependencies();
 
         if (!file_exists($this->_fileName)) {
-            throw new \Exception("File '{$this->_fileName}' does not exists.");
+            throw new \Exception("File '{$this->_fileName}' does not exist.");
         }
 
         $this->_adapter->open($this->_fileName);
@@ -262,7 +262,7 @@ public function instruction()
     public function setImageBackgroundColor($color)
     {
         /** @noinspection PhpUndefinedFieldInspection */
-        $this->_adapter->imageBackgroundColor = intval($color);
+        $this->_adapter->imageBackgroundColor = (int)$color;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
index a32561704d178..6042e4eee491d 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/Image/Adapter/Config.php b/lib/internal/Magento/Framework/Image/Adapter/Config.php
index ecba84b28bb47..636bbcdcbdb41 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Config.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Config.php
@@ -3,14 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Image\Adapter;
 
-class Config implements \Magento\Framework\Image\Adapter\ConfigInterface
+/**
+ * Image config provider.
+ */
+class Config implements ConfigInterface, UploadConfigInterface
 {
     const XML_PATH_IMAGE_ADAPTER = 'dev/image/default_adapter';
 
     const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters';
 
+    /**
+     * Config path for the maximal image width value
+     * @deprecated
+     */
+    const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width';
+
+    /**
+     * Config path for the maximal image height value
+     * @deprecated
+     */
+    const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height';
+
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
@@ -43,4 +60,28 @@ public function getAdapters()
     {
         return $this->config->getValue(self::XML_PATH_IMAGE_ADAPTERS);
     }
+
+    /**
+     * Get Maximum Image Width resolution in pixels. For image resizing on client side.
+     *
+     * @return int
+     * @deprecated
+     * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
+     */
+    public function getMaxWidth(): int
+    {
+        return (int)$this->config->getValue(self::XML_PATH_MAX_WIDTH_IMAGE);
+    }
+
+    /**
+     * Get Maximum Image Height resolution in pixels. For image resizing on client side.
+     *
+     * @return int
+     * @deprecated
+     * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
+     */
+    public function getMaxHeight(): int
+    {
+        return (int)$this->config->getValue(self::XML_PATH_MAX_HEIGHT_IMAGE);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 444ab7113d429..cfba1820bec05 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Framework\Image\Adapter;
 
+/**
+ * Gd2 adapter.
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
 class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
 {
     /**
@@ -62,7 +67,20 @@ public function open($filename)
             throw new \OverflowException('Memory limit has been reached.');
         }
         $this->imageDestroy();
-        $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
+        $this->_imageHandler = call_user_func(
+            $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
+            $this->_fileName
+        );
+        $fileType = $this->getImageType();
+        if (in_array($fileType, [IMAGETYPE_PNG, IMAGETYPE_GIF])) {
+            $this->_keepTransparency = true;
+            if ($this->_imageHandler) {
+                $isAlpha = $this->checkAlpha($this->_fileName);
+                if ($isAlpha) {
+                    $this->_fillBackgroundColor($this->_imageHandler);
+                }
+            }
+        }
     }
 
     /**
@@ -103,12 +121,13 @@ protected function _getImageNeedMemorySize($file)
         }
 
         return round(
-            ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + Pow(2, 16)) * 1.65
+            ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + pow(2, 16)) * 1.65
         );
     }
 
     /**
      * Converts memory value (e.g. 64M, 129K) to bytes.
+     *
      * Case insensitive value might be used.
      *
      * @param string $memoryValue
@@ -129,6 +148,7 @@ protected function _convertToByte($memoryValue)
 
     /**
      * Save image to specific path.
+     *
      * If some folders of path does not exist they will be created
      *
      * @param null|string $destination
@@ -185,7 +205,10 @@ public function save($destination = null, $newName = null)
     }
 
     /**
+     * Render image and return its binary contents.
+     *
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
+     *
      * @return string
      */
     public function getImage()
@@ -220,6 +243,7 @@ private function _getCallback($callbackType, $fileType = null, $unsupportedText
 
     /**
      * Fill image with main background color.
+     *
      * Returns a color identifier.
      *
      * @param resource &$imageResourceTo
@@ -404,7 +428,7 @@ public function rotate($angle)
      */
     public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
     {
-        list($watermarkSrcWidth, $watermarkSrcHeight, $watermarkFileType, ) = $this->_getImageOptions($imagePath);
+        list($watermarkSrcWidth, $watermarkSrcHeight, $watermarkFileType,) = $this->_getImageOptions($imagePath);
         $this->_getFileAttributes();
         $watermark = call_user_func(
             $this->_getCallback('create', $watermarkFileType, 'Unsupported watermark image format.'),
@@ -422,8 +446,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             $col = imagecolorallocate($newWatermark, 255, 255, 255);
             imagecolortransparent($newWatermark, $col);
             imagefilledrectangle($newWatermark, 0, 0, $this->getWatermarkWidth(), $this->getWatermarkHeight(), $col);
-            imagealphablending($newWatermark, true);
-            imageSaveAlpha($newWatermark, true);
+            imagesavealpha($newWatermark, true);
             imagecopyresampled(
                 $newWatermark,
                 $watermark,
@@ -447,8 +470,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             $col = imagecolorallocate($newWatermark, 255, 255, 255);
             imagecolortransparent($newWatermark, $col);
             imagefilledrectangle($newWatermark, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight, $col);
-            imagealphablending($newWatermark, true);
-            imageSaveAlpha($newWatermark, true);
+            imagesavealpha($newWatermark, true);
             imagecopyresampled(
                 $newWatermark,
                 $watermark,
@@ -465,7 +487,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
         } elseif ($this->getWatermarkPosition() == self::POSITION_CENTER) {
             $positionX = $this->_imageSrcWidth / 2 - imagesx($watermark) / 2;
             $positionY = $this->_imageSrcHeight / 2 - imagesy($watermark) / 2;
-            imagecopymerge(
+            $this->imagecopymergeWithAlphaFix(
                 $this->_imageHandler,
                 $watermark,
                 $positionX,
@@ -478,7 +500,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             );
         } elseif ($this->getWatermarkPosition() == self::POSITION_TOP_RIGHT) {
             $positionX = $this->_imageSrcWidth - imagesx($watermark);
-            imagecopymerge(
+            $this->imagecopymergeWithAlphaFix(
                 $this->_imageHandler,
                 $watermark,
                 $positionX,
@@ -490,7 +512,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
                 $this->getWatermarkImageOpacity()
             );
         } elseif ($this->getWatermarkPosition() == self::POSITION_TOP_LEFT) {
-            imagecopymerge(
+            $this->imagecopymergeWithAlphaFix(
                 $this->_imageHandler,
                 $watermark,
                 $positionX,
@@ -504,7 +526,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
         } elseif ($this->getWatermarkPosition() == self::POSITION_BOTTOM_RIGHT) {
             $positionX = $this->_imageSrcWidth - imagesx($watermark);
             $positionY = $this->_imageSrcHeight - imagesy($watermark);
-            imagecopymerge(
+            $this->imagecopymergeWithAlphaFix(
                 $this->_imageHandler,
                 $watermark,
                 $positionX,
@@ -517,7 +539,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             );
         } elseif ($this->getWatermarkPosition() == self::POSITION_BOTTOM_LEFT) {
             $positionY = $this->_imageSrcHeight - imagesy($watermark);
-            imagecopymerge(
+            $this->imagecopymergeWithAlphaFix(
                 $this->_imageHandler,
                 $watermark,
                 $positionX,
@@ -531,7 +553,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
         }
 
         if ($tile === false && $merged === false) {
-            imagecopymerge(
+            $this->imagecopymergeWithAlphaFix(
                 $this->_imageHandler,
                 $watermark,
                 $positionX,
@@ -547,7 +569,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             $offsetY = $positionY;
             while ($offsetY <= $this->_imageSrcHeight + imagesy($watermark)) {
                 while ($offsetX <= $this->_imageSrcWidth + imagesx($watermark)) {
-                    imagecopymerge(
+                    $this->imagecopymergeWithAlphaFix(
                         $this->_imageHandler,
                         $watermark,
                         $offsetX,
@@ -666,7 +688,7 @@ private function imageDestroy()
     private function _saveAlpha($imageHandler)
     {
         $background = imagecolorallocate($imageHandler, 0, 0, 0);
-        ImageColorTransparent($imageHandler, $background);
+        imagecolortransparent($imageHandler, $background);
         imagealphablending($imageHandler, false);
         imagesavealpha($imageHandler, true);
     }
@@ -727,6 +749,7 @@ protected function _createImageFromText($text)
 
     /**
      * Create Image using ttf font
+     *
      * Note: This function requires both the GD library and the FreeType library
      *
      * @param string $text
@@ -778,4 +801,68 @@ protected function _createEmptyImage($width, $height)
         $this->imageDestroy();
         $this->_imageHandler = $image;
     }
+
+    /**
+     * Fix an issue with the usage of imagecopymerge where the alpha channel is lost
+     *
+     * @param resource $dst_im
+     * @param resource $src_im
+     * @param int $dst_x
+     * @param int $dst_y
+     * @param int $src_x
+     * @param int $src_y
+     * @param int $src_w
+     * @param int $src_h
+     * @param int $pct
+     *
+     * @return bool
+     */
+    private function imagecopymergeWithAlphaFix(
+        $dst_im,
+        $src_im,
+        $dst_x,
+        $dst_y,
+        $src_x,
+        $src_y,
+        $src_w,
+        $src_h,
+        $pct
+    ) {
+        if ($pct >= 100) {
+            return imagecopy($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);
+        }
+
+        if ($pct < 0) {
+            return false;
+        }
+
+        $sizeX = imagesx($src_im);
+        $sizeY = imagesy($src_im);
+        if (false === $sizeX || false === $sizeY) {
+            return false;
+        }
+
+        $tmpImg = imagecreatetruecolor($src_w, $src_h);
+        if (false === $tmpImg) {
+            return false;
+        }
+
+        if (false === imagealphablending($tmpImg, false)) {
+            return false;
+        }
+
+        if (false === imagecopy($tmpImg, $src_im, 0, 0, 0, 0, $sizeX, $sizeY)) {
+            return false;
+        }
+
+        $transparancy = 127 - (($pct*127)/100);
+        if (false === imagefilter($tmpImg, IMG_FILTER_COLORIZE, 0, 0, 0, $transparancy)) {
+            return false;
+        }
+
+        $result = imagecopy($dst_im, $tmpImg, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);
+        imagedestroy($tmpImg);
+
+        return $result;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
index 50b9a5a013273..cd49f283d33a7 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -77,7 +77,7 @@ public function open($filename)
         try {
             $this->_imageHandler = new \Imagick($this->_fileName);
         } catch (\ImagickException $e) {
-            throw new \Exception('Unsupported image format.', $e->getCode(), $e);
+            throw new \Exception(sprintf('Unsupported image format. File: %s', $this->_fileName), $e->getCode(), $e);
         }
 
         $this->backgroundColor();
@@ -269,15 +269,17 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             );
         }
 
-        if (method_exists($watermark, 'setImageOpacity')) {
-            // available from imagick 6.3.1
-            $watermark->setImageOpacity($opacity);
-        } else {
-            // go to each pixel and make it transparent
-            $watermark->paintTransparentImage($watermark->getImagePixelColor(0, 0), 1, 65530);
-            $watermark->evaluateImage(\Imagick::EVALUATE_SUBTRACT, 1 - $opacity, \Imagick::CHANNEL_ALPHA);
+        if (method_exists($watermark, 'getImageAlphaChannel')) {
+            // available from imagick 6.4.0
+            if ($watermark->getImageAlphaChannel() == 0) {
+                $watermark->setImageAlphaChannel(\Imagick::ALPHACHANNEL_OPAQUE);
+            }
         }
 
+        $compositeChannels = \Imagick::CHANNEL_ALL;
+        $watermark->evaluateImage(\Imagick::EVALUATE_MULTIPLY, $opacity, \Imagick::CHANNEL_OPACITY);
+        $compositeChannels &= ~(\Imagick::CHANNEL_OPACITY);
+
         switch ($this->getWatermarkPosition()) {
             case self::POSITION_STRETCH:
                 $watermark->sampleImage($this->_imageSrcWidth, $this->_imageSrcHeight);
@@ -309,14 +311,26 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
                 $offsetY = $positionY;
                 while ($offsetY <= $this->_imageSrcHeight + $watermark->getImageHeight()) {
                     while ($offsetX <= $this->_imageSrcWidth + $watermark->getImageWidth()) {
-                        $this->_imageHandler->compositeImage($watermark, \Imagick::COMPOSITE_OVER, $offsetX, $offsetY);
+                        $this->_imageHandler->compositeImage(
+                            $watermark,
+                            \Imagick::COMPOSITE_OVER,
+                            $offsetX,
+                            $offsetY,
+                            $compositeChannels
+                        );
                         $offsetX += $watermark->getImageWidth();
                     }
                     $offsetX = $positionX;
                     $offsetY += $watermark->getImageHeight();
                 }
             } else {
-                $this->_imageHandler->compositeImage($watermark, \Imagick::COMPOSITE_OVER, $positionX, $positionY);
+                $this->_imageHandler->compositeImage(
+                    $watermark,
+                    \Imagick::COMPOSITE_OVER,
+                    $positionX,
+                    $positionY,
+                    $compositeChannels
+                );
             }
         } catch (\ImagickException $e) {
             throw new \Exception('Unable to create watermark.', $e->getCode(), $e);
diff --git a/lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php b/lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php
new file mode 100644
index 0000000000000..0a2dbefff8ee0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Image\Adapter;
+
+/**
+ * Interface UploadConfigInterface
+ * @deprecated moved to proper namespace and extended
+ * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface;
+ */
+interface UploadConfigInterface
+{
+    /**
+     * Get maximum image width.
+     *
+     * @return int
+     */
+    public function getMaxWidth(): int;
+
+    /**
+     * Get maximum image height.
+     *
+     * @return int
+     */
+    public function getMaxHeight(): int;
+}
diff --git a/lib/internal/Magento/Framework/Image/AdapterFactory.php b/lib/internal/Magento/Framework/Image/AdapterFactory.php
index ddb1f743d5064..8cb7b65ae73c9 100644
--- a/lib/internal/Magento/Framework/Image/AdapterFactory.php
+++ b/lib/internal/Magento/Framework/Image/AdapterFactory.php
@@ -34,7 +34,7 @@ public function __construct(
     ) {
         $this->objectManager = $objectManager;
         $this->config = $config;
-        $this->adapterMap = array_merge($config->getAdapters(), $adapterMap);
+        $this->adapterMap = $adapterMap;
     }
 
     /**
@@ -46,6 +46,7 @@ public function __construct(
      */
     public function create($adapterAlias = null)
     {
+        $this->adapterMap = array_merge($this->config->getAdapters(), $this->adapterMap);
         $adapterAlias = !empty($adapterAlias) ? $adapterAlias : $this->config->getAdapterAlias();
         if (empty($adapterAlias)) {
             throw new \InvalidArgumentException('Image adapter is not selected.');
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php
index d8e48f278f782..838d85c5fbf20 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/AbstractTest.php
@@ -109,6 +109,9 @@ public function testPrepareDestination($destination, $newName, $expectedResult)
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public function prepareDestinationDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
index fe0847f7f69b4..41281c96e1bb4 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
@@ -73,6 +73,9 @@ public function testOpen($fileData, $exception, $limit)
         $this->adapter->open('file');
     }
 
+    /**
+     * @return array
+     */
     public function filesProvider()
     {
         $smallFile = [
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
index af44ae45c2cc5..ae0348f489fd2 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
@@ -58,7 +58,8 @@ public function setup()
      */
     public function testWatermark($imagePath, $expectedMessage)
     {
-        $this->expectException('LogicException', $expectedMessage);
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage($expectedMessage);
         $this->imageMagic->watermark($imagePath);
     }
 
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Base.php b/lib/internal/Magento/Framework/Indexer/Action/Base.php
index 11cf1cec62636..636335192cbc5 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Base.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Base.php
@@ -221,7 +221,7 @@ protected function prepareDataSource(array $ids = [])
     {
         return !count($ids)
             ? $this->createResultCollection()
-            : $this->createResultCollection()->addFieldToFilter($this->getPrimaryResource()->getIdFieldname(), $ids);
+            : $this->createResultCollection()->addFieldToFilter($this->getPrimaryResource()->getIdFieldName(), $ids);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Indexer/CacheContext.php b/lib/internal/Magento/Framework/Indexer/CacheContext.php
index df0bed1dc1dcb..4a6964477ebd5 100644
--- a/lib/internal/Magento/Framework/Indexer/CacheContext.php
+++ b/lib/internal/Magento/Framework/Indexer/CacheContext.php
@@ -29,15 +29,14 @@ class CacheContext implements \Magento\Framework\DataObject\IdentityInterface
      */
     public function registerEntities($cacheTag, $ids)
     {
-        $this->entities[$cacheTag] =
-            array_merge($this->getRegisteredEntity($cacheTag), $ids);
+        $this->entities[$cacheTag] = array_merge($this->getRegisteredEntity($cacheTag), $ids);
         return $this;
     }
 
     /**
      * Register entity tags
      *
-     * @param string $cacheTag
+     * @param array $cacheTags
      * @return $this
      */
     public function registerTags($cacheTags)
diff --git a/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php b/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
index c9d7c8a35b243..661f9f9c0ff80 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
@@ -49,7 +49,7 @@ public function getIndexerIdsToRunAfter(string $indexerId): array
             if (array_search($indexerId, $indexerData['dependencies']) !== false) {
                 $result[] = $id;
             }
-        };
+        }
 
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/Indexer/Config/Reader.php b/lib/internal/Magento/Framework/Indexer/Config/Reader.php
index 6ef22b3b7f796..9ed35ef0e9af5 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/Reader.php
@@ -18,6 +18,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
         '/config/indexer/source'         => 'name',
         '/config/indexer/fieldset'       => 'name',
         '/config/indexer/fieldset/field' => 'name',
+        '/config/indexer/dependencies/indexer' => 'id',
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Indexer/Dimension.php b/lib/internal/Magento/Framework/Indexer/Dimension.php
new file mode 100644
index 0000000000000..dacc8d7f524f5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Dimension.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\Indexer;
+
+/**
+ * Index Dimension object
+ *
+ * @api
+ */
+class Dimension
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @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/DimensionFactory.php b/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
new file mode 100644
index 0000000000000..8eaeff5628d60
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
@@ -0,0 +1,47 @@
+<?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, string $value): Dimension
+    {
+        return $this->objectManager->create(
+            Dimension::class,
+            [
+                'name' => $name,
+                'value' => $value,
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Indexer/DimensionProviderInterface.php b/lib/internal/Magento/Framework/Indexer/DimensionProviderInterface.php
new file mode 100644
index 0000000000000..ea4f56eb48d41
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/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;
+
+/**
+ * @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/DimensionalIndexerInterface.php b/lib/internal/Magento/Framework/Indexer/DimensionalIndexerInterface.php
new file mode 100644
index 0000000000000..43c4e7a7fd70b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/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;
+
+/**
+ * @api
+ * Run indexer by dimensions
+ */
+interface DimensionalIndexerInterface
+{
+    /**
+     * Execute indexer by specified dimension.
+     * Accept array of dimensions DTO that represent indexer dimension
+     *
+     * @param \Magento\Framework\Indexer\Dimension[] $dimensions
+     * @param \Traversable $entityIds
+     * @return void
+     */
+    public function executeByDimensions(array $dimensions, \Traversable $entityIds);
+}
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
index 94f34ec7ba3b2..4b74ce50c9ed6 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
@@ -35,7 +35,7 @@ public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
                 'left'
             );
         } else {
-            $source->addAttributeToSelect($fieldInfo['origin'], 'left');
+            $source->addFieldToSelect($fieldInfo['origin'], 'left');
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructure.php b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
index c9376f00b711e..a39de2d5b8a62 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexStructure.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
@@ -13,6 +13,12 @@
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Search\Request\Dimension;
 
+/**
+ * Full text search index structure.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class IndexStructure implements IndexStructureInterface
 {
     /**
@@ -58,9 +64,7 @@ public function __construct(
     }
 
     /**
-     * @param string $index
-     * @param Dimension[] $dimensions
-     * @return void
+     * @inheritdoc
      */
     public function delete($index, array $dimensions = [])
     {
@@ -69,10 +73,7 @@ public function delete($index, array $dimensions = [])
     }
 
     /**
-     * @param string $index
-     * @param array $fields
-     * @param Dimension[] $dimensions
-     * @return void
+     * @inheritdoc
      */
     public function create($index, array $fields, array $dimensions = [])
     {
@@ -83,6 +84,8 @@ public function create($index, array $fields, array $dimensions = [])
     }
 
     /**
+     * Create full text index.
+     *
      * @param string $tableName
      * @throws \Zend_Db_Exception
      * @return void
@@ -94,6 +97,8 @@ protected function createFulltextIndex($tableName)
     }
 
     /**
+     * Configure full text index table.
+     *
      * @param Table $table
      * @return Table
      */
@@ -129,6 +134,8 @@ protected function configureFulltextTable(Table $table)
     }
 
     /**
+     * Create flat index.
+     *
      * @param string $tableName
      * @param array $fields
      * @throws \Zend_Db_Exception
@@ -160,6 +167,8 @@ protected function createFlatIndex($tableName, array $fields)
     }
 
     /**
+     * Drop table.
+     *
      * @param AdapterInterface $connection
      * @param string $tableName
      * @return void
diff --git a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
index c0e6416b8261a..bf572b94ccc94 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/Indexer/MultiDimensionProvider.php b/lib/internal/Magento/Framework/Indexer/MultiDimensionProvider.php
new file mode 100644
index 0000000000000..a02637f755b89
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/MultiDimensionProvider.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer;
+
+/**
+ * Multiply dimensions from provided DimensionProviderInterface
+ */
+class MultiDimensionProvider implements \IteratorAggregate
+{
+    /**
+     * @var array
+     */
+    private $dimensionsIterators = [];
+
+    /**
+     * @var array
+     */
+    private $dimensionsDataProviders = [];
+
+    /**
+     * @var int
+     */
+    private $dimensionsProvidersCount = 0;
+
+    /**
+     * @param DimensionProviderInterface[] $dimensionProviders
+     */
+    public function __construct(array $dimensionProviders = [])
+    {
+        foreach ($dimensionProviders as $dimensionDataProvider) {
+            $this->addDimensionDataProvider($dimensionDataProvider);
+        }
+    }
+
+    /**
+     * Returns generator that will return multiplied dimensions on each iteration
+     *
+     * @return \Traversable|Dimension[][]
+     * @throws \LogicException
+     */
+    public function getIterator(): \Traversable
+    {
+        // just return empty array if we have no dimension providers to iterate over
+        if ($this->dimensionsProvidersCount === 0) {
+            yield [];
+            return;
+        }
+
+        // this recreates iterators for dimension so we can iterate over them
+        $this->rewind();
+
+        // if at leas one dimension provider has no dimensions to return we can't multiple dimension at all
+        if (!$this->hasCurrentDimension()) {
+            throw new \LogicException('Can`t multiple dimensions because some of them are empty.');
+        }
+
+        // return dimensions until all iterators become invalid
+        while ($this->hasCurrentDimension()) {
+            yield $this->getCurrentDimension();
+            $this->setNextDimension();
+        }
+    }
+
+    /**
+     * Return all dimensions for current state of each dimension provider
+     *
+     * @return array
+     */
+    private function getCurrentDimension(): array
+    {
+        $dimensions = [];
+
+        foreach ($this->dimensionsIterators as $dimensionIterator) {
+            /** @var Dimension $dimension */
+            $dimension = $dimensionIterator->current();
+            $dimensions[$dimension->getName()] = $dimension;
+        }
+
+        return $dimensions;
+    }
+
+    /**
+     * Iterates over dimension iterators one by one starting from right to left
+     * This approach emulates iterations over X nested foreach loops e.g.:
+     *
+     * @return void
+     */
+    private function setNextDimension()
+    {
+        $this->dimensionsIterators[$this->dimensionsProvidersCount - 1]->next();
+
+        for ($i = ($this->dimensionsProvidersCount - 1); $i > 0; $i--) {
+            if (!$this->dimensionsIterators[$i]->valid()) {
+                $this->dimensionsIterators[$i] = $this->dimensionsDataProviders[$i]->getIterator();
+                $this->dimensionsIterators[$i-1]->next();
+            }
+        }
+    }
+
+    /**
+     * Recreates iterators so all MultiDimensionProvider can be iterated again
+     *
+     * @return void
+     */
+    private function rewind()
+    {
+        $this->dimensionsIterators = [];
+
+        foreach ($this->dimensionsDataProviders as $dimensionDataProvider) {
+            $this->dimensionsIterators[] = $dimensionDataProvider->getIterator();
+        }
+    }
+
+    /**
+     * Check if all dimension iterators are in valid state
+     *
+     * If at least one of dimension iterators is invalid before very first iteration - we assume
+     * that dimension provider has no dimensions at all, which means we can't multiple all dimensions
+     *
+     * If all dimension iterators became invalid - we assume that multiplication is already done
+     *
+     * @return bool
+     */
+    private function hasCurrentDimension(): bool
+    {
+        $valid = true;
+
+        foreach ($this->dimensionsIterators as $dimensionsIterator) {
+            // if at least one data provider is invalid at this stage - all generator is invalid
+            if (!$dimensionsIterator->valid()) {
+                return false;
+            }
+        }
+
+        // generator is valid only when all data providers are valid
+        return $valid;
+    }
+
+    /**
+     * Collects dimension data providers
+     * This was done via separate method to ensure that each provider has required interface
+     *
+     * @param DimensionProviderInterface $dimensionDataProvider
+     * @return void
+     */
+    private function addDimensionDataProvider(DimensionProviderInterface $dimensionDataProvider)
+    {
+        $this->dimensionsDataProviders[] = $dimensionDataProvider;
+        $this->dimensionsProvidersCount++;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
index 3908cf1e98762..3483eb004bea2 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
@@ -12,8 +12,10 @@
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
-use Magento\Framework\Indexer\SaveHandler\Batch;
 
+/**
+ * Save handler for indexer.
+ */
 class IndexerHandler implements IndexerInterface
 {
     /**
@@ -94,7 +96,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function saveIndex($dimensions, \Traversable $documents)
     {
@@ -105,7 +107,7 @@ public function saveIndex($dimensions, \Traversable $documents)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteIndex($dimensions, \Traversable $documents)
     {
@@ -118,7 +120,7 @@ public function deleteIndex($dimensions, \Traversable $documents)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function cleanIndex($dimensions)
     {
@@ -127,14 +129,16 @@ public function cleanIndex($dimensions)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function isAvailable()
+    public function isAvailable($dimensions = [])
     {
         return true;
     }
 
     /**
+     * Returns table name.
+     *
      * @param string $dataType
      * @param Dimension[] $dimensions
      * @return string
@@ -145,6 +149,8 @@ protected function getTableName($dataType, $dimensions)
     }
 
     /**
+     * Returns index name
+     *
      * @return string
      */
     protected function getIndexName()
@@ -153,6 +159,8 @@ protected function getIndexName()
     }
 
     /**
+     * Save searchable documents to storage.
+     *
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
@@ -167,6 +175,8 @@ private function insertDocumentsForSearchable(array $documents, array $dimension
     }
 
     /**
+     * Save filterable documents to storage.
+     *
      * @param array $documents
      * @param Dimension[] $dimensions
      * @return void
@@ -188,6 +198,8 @@ protected function insertDocumentsForFilterable(array $documents, array $dimensi
     }
 
     /**
+     * Prepare filterable fields.
+     *
      * @param array $documents
      * @return array
      */
@@ -207,6 +219,8 @@ protected function prepareFilterableFields(array $documents)
     }
 
     /**
+     * Prepare searchable fields.
+     *
      * @param array $documents
      * @return array
      */
@@ -229,6 +243,8 @@ private function prepareSearchableFields(array $documents)
     }
 
     /**
+     * Prepare fields.
+     *
      * @return void
      */
     private function prepareFields()
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
index 047539d28be3f..e03404d3eb8f6 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
@@ -47,7 +47,8 @@ public function cleanIndex($dimensions);
     /**
      * Define if engine is available
      *
+     * @param Dimension[] $dimensions
      * @return bool
      */
-    public function isAvailable();
+    public function isAvailable($dimensions = []);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
index 82e8a26553b89..80231dd7aa290 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Indexer;
 
-use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface as SaveHandlerInterface;
 
diff --git a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
index 891a6cd1efe12..a68de6ad36f9a 100644
--- a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
+++ b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
@@ -42,16 +42,18 @@ public function __construct(
      */
     public function resolve($index, array $dimensions)
     {
-        $tableNameParts = [$index];
+        $tableNameParts = [];
         foreach ($dimensions as $dimension) {
             switch ($dimension->getName()) {
                 case 'scope':
-                    $tableNameParts[] = $dimension->getName() . $this->getScopeId($dimension);
+                    $tableNameParts[$dimension->getName()] = $dimension->getName() . $this->getScopeId($dimension);
                     break;
                 default:
-                    $tableNameParts[] = $dimension->getName() . $dimension->getValue();
+                    $tableNameParts[$dimension->getName()] = $dimension->getName() . $dimension->getValue();
             }
         }
+        ksort($tableNameParts);
+        array_unshift($tableNameParts, $index);
 
         return $this->resource->getTableName(implode('_', $tableNameParts));
     }
diff --git a/lib/internal/Magento/Framework/Indexer/StructureFactory.php b/lib/internal/Magento/Framework/Indexer/StructureFactory.php
index f9b7eafdfc436..1b6729e4603ec 100644
--- a/lib/internal/Magento/Framework/Indexer/StructureFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/StructureFactory.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Indexer;
 
-use Magento\Framework\Indexer\IndexStructureInterface;
-
 class StructureFactory
 {
     /**
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php
index ee193da3f0bfe..5b09c558a9002 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/SchemaLocatorTest.php
@@ -13,10 +13,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolverMock;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php
new file mode 100644
index 0000000000000..9dca70fa55c33
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Test\Unit\Handler;
+
+use Magento\Framework\Indexer\Handler\AttributeHandler;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+
+/**
+ * Unit test for Magento\Framework\Indexer\Handler\AttributeHandler.
+ */
+class AttributeHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SourceProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $source;
+
+    /**
+     * @var AttributeHandler
+     */
+    private $subject;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->source = $this->getMockBuilder(SourceProviderInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['joinAttribute'])
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManager($this);
+
+        $this->subject = $objectManager->getObject(AttributeHandler::class);
+    }
+
+    public function testPrepareSqlWithBindAndExistingJoinAttributeMethod()
+    {
+        $alias = 'e';
+        $fieldInfo = [
+            'name' => 'is_approved',
+            'origin' => 'is_approved',
+            'type' => 'searchable',
+            'dataType' => 'varchar',
+            'entity' => 'customer',
+            'bind' => 'test',
+        ];
+
+        $this->source->expects($this->once())
+            ->method('joinAttribute')
+            ->with(
+                $fieldInfo['name'],
+                $fieldInfo['entity'] . '/' . $fieldInfo['origin'],
+                $fieldInfo['bind'],
+                null,
+                'left'
+            )
+            ->willReturnSelf();
+
+        $this->subject->prepareSql($this->source, $alias, $fieldInfo);
+    }
+
+    public function testPrepareSqlWithoutBind()
+    {
+        $alias = 'e';
+        $fieldInfo = [
+            'name' => 'is_approved',
+            'origin' => 'is_approved',
+            'type' => 'searchable',
+            'dataType' => 'varchar',
+            'entity' => 'customer',
+        ];
+        $this->source->expects($this->once())
+            ->method('addFieldToSelect')
+            ->with('is_approved', 'left');
+
+        $this->subject->prepareSql($this->source, $alias, $fieldInfo);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
index c68af718473a4..2c0d9124b9603 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Indexer\Test\Unit;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
 use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -186,6 +185,12 @@ private function createDimensionMock($name, $value)
         return $dimension;
     }
 
+    /**
+     * @param $callNumber
+     * @param $tableName
+     * @param $isTableExist
+     * @return mixed
+     */
     private function mockDropTable($callNumber, $tableName, $isTableExist)
     {
         $this->connectionInterface->expects($this->at($callNumber++))
@@ -201,6 +206,11 @@ private function mockDropTable($callNumber, $tableName, $isTableExist)
         return $callNumber;
     }
 
+    /**
+     * @param $callNumber
+     * @param $tableName
+     * @return mixed
+     */
     private function mockFlatTable($callNumber, $tableName)
     {
         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
@@ -223,6 +233,11 @@ private function mockFlatTable($callNumber, $tableName)
         return $callNumber;
     }
 
+    /**
+     * @param $callNumber
+     * @param $tableName
+     * @return mixed
+     */
     private function mockFulltextTable($callNumber, $tableName)
     {
         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
new file mode 100644
index 0000000000000..b55ace9bdec3d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Test\Unit;
+
+use \Magento\Framework\Indexer\MultiDimensionProvider;
+use \Magento\Framework\Indexer\DimensionProviderInterface;
+use \Magento\Framework\Indexer\Dimension;
+
+class MultiDimensionProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * tests that MultiDimensionProvider will return [[]] in case it has no dimension providers
+     */
+    public function testWithNoDataProviders()
+    {
+        // prepare expected dimensions
+        $expectedDimensions = [[]];
+
+        // collect actual dimensions
+        $multiDimensionProvider = new MultiDimensionProvider([]);
+
+        $actualDimensions = [];
+        foreach ($multiDimensionProvider as $dimension) {
+            $actualDimensions[] = $dimension;
+        }
+
+        $this->assertSame($expectedDimensions, $actualDimensions);
+    }
+
+    /**
+     * tests multiplication of dimensions from different providers
+     *
+     * e.g we have three dimensions:
+     *  - dimension X with values (x1, x2)
+     *  - dimension Y with values (y1, y2, y3)
+     *  - dimension Z with values (z1, z2)
+     *
+     * the multiplication result set will be:
+     * x1-y1-z1
+     * x1-y1-z2
+     * x1-y2-z1
+     * x1-y2-z2
+     * x1-y3-z1
+     * x1-y3-z2
+     * x2-y1-z1
+     * x2-y1-z2
+     * x2-y2-z1
+     * x2-y2-z2
+     * x2-y3-z1
+     * x2-y3-z2
+     */
+    public function testWithMultipleDataProviders()
+    {
+        // prepare expected dimensions
+        $dimensionXData = [
+            $this->getDimensionMock('x', '1'),
+            $this->getDimensionMock('x', '2'),
+            $this->getDimensionMock('x', '3'),
+        ];
+
+        $dimensionYData = [
+            $this->getDimensionMock('y', '1'),
+            $this->getDimensionMock('y', '2'),
+            $this->getDimensionMock('y', '3'),
+            $this->getDimensionMock('y', '4'),
+            $this->getDimensionMock('y', '5'),
+        ];
+
+        $dimensionZData = [
+            $this->getDimensionMock('z', '1'),
+            $this->getDimensionMock('z', '2'),
+        ];
+
+        $expectedDimensions = [];
+
+        foreach ($dimensionXData as $dimensionX) {
+            foreach ($dimensionYData as $dimensionY) {
+                foreach ($dimensionZData as $dimensionZ) {
+                    $expectedDimensions[] = [
+                        $dimensionX->getName() => $dimensionX,
+                        $dimensionY->getName() => $dimensionY,
+                        $dimensionZ->getName() => $dimensionZ,
+                    ];
+                }
+            }
+        }
+
+        // collect actual dimensions
+        $multiDimensionProvider = new MultiDimensionProvider(
+            [
+                $this->getDimensionProviderMock($dimensionXData),
+                $this->getDimensionProviderMock($dimensionYData),
+                $this->getDimensionProviderMock($dimensionZData),
+            ]
+        );
+
+        $actualDimensions = [];
+        foreach ($multiDimensionProvider as $dimension) {
+            $actualDimensions[] = $dimension;
+        }
+
+        $this->assertSame($expectedDimensions, $actualDimensions);
+    }
+
+    /**
+     * tests that the same MultiDimensionProvider can be used in foreach multiple times without creating again
+     */
+    public function testMultiDimensionProviderIsReIterable()
+    {
+        // prepare expected dimensions
+        $dimensionXData = [
+            $this->getDimensionMock('x', '1'),
+            $this->getDimensionMock('x', '2'),
+            $this->getDimensionMock('x', '3'),
+        ];
+
+        $dimensionZData = [
+            $this->getDimensionMock('z', '1'),
+            $this->getDimensionMock('z', '2'),
+        ];
+
+        // collect actual dimensions
+        $multiDimensionProvider = new MultiDimensionProvider(
+            [
+                $this->getDimensionProviderMock($dimensionXData),
+                $this->getDimensionProviderMock($dimensionZData),
+            ]
+        );
+
+        // first iteration
+        $actualDimensions1st = [];
+        foreach ($multiDimensionProvider as $dimension) {
+            $actualDimensions1st[] = $dimension;
+        }
+
+        // second iteration
+        $actualDimensions2nd = [];
+        foreach ($multiDimensionProvider as $dimension) {
+            $actualDimensions2nd[] = $dimension;
+        }
+
+        $this->assertSame($actualDimensions1st, $actualDimensions2nd);
+    }
+
+    /**
+     * tests that MultiDimensionProvider will throw exception when all dimension providers has nothing to return
+     *
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Can`t multiple dimensions because some of them are empty.
+     */
+    public function testMultiDimensionProviderWithEmptyDataProvider()
+    {
+        // collect actual dimensions
+        $multiDimensionProvider = new MultiDimensionProvider(
+            [
+                $this->getDimensionProviderMock([]),
+                $this->getDimensionProviderMock([]),
+            ]
+        );
+
+        $actualDimensions = [];
+        foreach ($multiDimensionProvider as $dimension) {
+            $actualDimensions[] = $dimension;
+        }
+    }
+
+    /**
+     * tests that MultiDimensionProvider will throw exception when one dimension providers has nothing to return
+     *
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Can`t multiple dimensions because some of them are empty.
+     */
+    public function testMultiDimensionProviderWithMixedDataProvider()
+    {
+
+        // prepare expected dimensions
+        $dimensionXData = [
+            $this->getDimensionMock('x', '1'),
+            $this->getDimensionMock('x', '2'),
+            $this->getDimensionMock('x', '3'),
+        ];
+
+        $dimensionYData = [
+            $this->getDimensionMock('y', '1'),
+            $this->getDimensionMock('y', '2'),
+            $this->getDimensionMock('y', '3'),
+            $this->getDimensionMock('y', '4'),
+            $this->getDimensionMock('y', '5'),
+        ];
+
+        $dimensionZData = [];
+
+        // collect actual dimensions
+        $multiDimensionProvider = new MultiDimensionProvider(
+            [
+                $this->getDimensionProviderMock($dimensionXData),
+                $this->getDimensionProviderMock($dimensionYData),
+                $this->getDimensionProviderMock($dimensionZData),
+            ]
+        );
+
+        $actualDimensions = [];
+        foreach ($multiDimensionProvider as $dimension) {
+            $actualDimensions[] = $dimension;
+        }
+    }
+
+    private function getDimensionProviderMock($dimensions)
+    {
+        $dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->setMethods(['getIterator'])
+            ->getMockForAbstractClass();
+
+        $dimensionProviderMock->expects($this->any())
+            ->method('getIterator')
+            ->will(
+                $this->returnCallback(
+                    function () use ($dimensions) {
+                        return \SplFixedArray::fromArray($dimensions);
+                    }
+                )
+            );
+
+        return $dimensionProviderMock;
+    }
+
+    private function getDimensionMock(string $name, string $value)
+    {
+        $dimensionMock = $this->getMockBuilder(Dimension::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->setMethods(['getName', 'getValue'])
+            ->getMock();
+
+        $dimensionMock->expects($this->any())
+            ->method('getName')
+            ->willReturn($name);
+
+        $dimensionMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($value);
+
+        return $dimensionMock;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php
index ae898657ccecf..b193a3eecdd98 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php
@@ -103,9 +103,19 @@ public function resolveDataProvider()
             ],
             [
                 'index' => 'index_name',
-                'dimensions' => [['dimension', 10], ['dimension', 20]],
+                'dimensions' => [['first', 10], ['second', 20]],
                 // actually you will get exception here thrown in ScopeResolverInterface
-                'expected' => 'index_name_dimension10_dimension20'
+                'expected' => 'index_name_first10_second20'
+            ],
+            [
+                'index' => 'index_name',
+                'dimensions' => [['second', 10], ['first', 20]],
+                'expected' => 'index_name_first20_second10'
+            ],
+            [
+                'index' => 'index_name',
+                'dimensions' => [[-1, 10], ['first', 20]],
+                'expected' => 'index_name_-110_first20'
             ]
         ];
     }
diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
index 04298011e792a..9297ca25928d3 100644
--- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -6,6 +6,11 @@
 
 namespace Magento\Framework\Interception\Code\Generator;
 
+/**
+ * Class Interceptor
+ ˚*
+ * @package Magento\Framework\Interception\Code\Generator
+ */
 class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
 {
     /**
@@ -14,6 +19,8 @@ class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
     const ENTITY_TYPE = 'interceptor';
 
     /**
+     * Returns default result class name
+     *
      * @param string $modelClassName
      * @return string
      */
@@ -102,18 +109,31 @@ protected function _getMethodInfo(\ReflectionMethod $method)
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
+        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
         $methodInfo = [
             'name' => ($method->returnsReference() ? '& ' : '') . $method->getName(),
             'parameters' => $parameters,
-            'body' => "\$pluginInfo = \$this->pluginList->getNext(\$this->subjectType, '{$method->getName()}');\n" .
-                "if (!\$pluginInfo) {\n" .
-                "    return parent::{$method->getName()}({$this->_getParameterList(
-                $parameters
-            )});\n" .
-            "} else {\n" .
-            "    return \$this->___callPlugins('{$method->getName()}', func_get_args(), \$pluginInfo);\n" .
-            "}",
-            'returnType' => $method->getReturnType(),
+            'body' => str_replace(
+                [
+                    '%methodName%',
+                    '%return%',
+                    '%parameters%'
+                ],
+                [
+                    $method->getName(),
+                    $returnTypeValue === 'void' ? '' : ' return',
+                    $this->_getParameterList($parameters)
+                ],
+                <<<'METHOD_BODY'
+$pluginInfo = $this->pluginList->getNext($this->subjectType, '%methodName%');
+if (!$pluginInfo) {
+   %return% parent::%methodName%(%parameters%);
+} else {
+   %return% $this->___callPlugins('%methodName%', func_get_args(), $pluginInfo);
+}
+METHOD_BODY
+            ),
+            'returnType' => $returnTypeValue,
             'docblock' => ['shortDescription' => '{@inheritdoc}'],
         ];
 
@@ -121,6 +141,8 @@ protected function _getMethodInfo(\ReflectionMethod $method)
     }
 
     /**
+     * Return parameters list
+     *
      * @param array $parameters
      * @return string
      */
@@ -159,14 +181,16 @@ protected function _generateCode()
         } else {
             $this->_classGenerator->setExtendedClass($typeName);
         }
-        $this->_classGenerator->addTrait('\\'. \Magento\Framework\Interception\Interceptor::class);
-        $interfaces[] =  '\\'. \Magento\Framework\Interception\InterceptorInterface::class;
+        $this->_classGenerator->addTrait('\\' . \Magento\Framework\Interception\Interceptor::class);
+        $interfaces[] = '\\' . \Magento\Framework\Interception\InterceptorInterface::class;
         $this->_classGenerator->setImplementedInterfaces($interfaces);
         return parent::_generateCode();
     }
 
     /**
-     * {@inheritdoc}
+     * Validates data
+     *
+     * @return bool
      */
     protected function _validateData()
     {
@@ -189,4 +213,22 @@ protected function _validateData()
         }
         return $result;
     }
+
+    /**
+     * Returns return type
+     *
+     * @param mixed $returnType
+     * @return null|string
+     */
+    private function getReturnTypeValue($returnType): ?string
+    {
+        $returnTypeValue = null;
+        if ($returnType) {
+            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
+            $returnTypeValue .= ($returnType->getName() === 'self')
+                ? $this->getSourceClassName()
+                : $returnType->getName();
+        }
+        return $returnTypeValue;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Interception/Config/CacheManager.php b/lib/internal/Magento/Framework/Interception/Config/CacheManager.php
new file mode 100644
index 0000000000000..a754215bbe743
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/Config/CacheManager.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Interception\Config;
+
+/**
+ * Interception cache manager.
+ *
+ * Responsible for handling interaction with compiled and uncompiled interception data
+ */
+class CacheManager
+{
+    /**
+     * @var \Magento\Framework\Cache\FrontendInterface
+     */
+    private $cache;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager\ConfigWriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled
+     */
+    private $compiledLoader;
+
+    /**
+     * @param \Magento\Framework\Cache\FrontendInterface $cache
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter
+     * @param \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled $compiledLoader
+     */
+    public function __construct(
+        \Magento\Framework\Cache\FrontendInterface $cache,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter,
+        \Magento\Framework\App\ObjectManager\ConfigLoader\Compiled $compiledLoader
+    ) {
+        $this->cache = $cache;
+        $this->serializer = $serializer;
+        $this->configWriter = $configWriter;
+        $this->compiledLoader = $compiledLoader;
+    }
+
+    /**
+     * Load the interception config from cache
+     *
+     * @param string $key
+     * @return array|null
+     */
+    public function load(string $key): ?array
+    {
+        if ($this->isCompiled($key)) {
+            return $this->compiledLoader->load($key);
+        }
+
+        $intercepted = $this->cache->load($key);
+        return $intercepted ? $this->serializer->unserialize($intercepted) : null;
+    }
+
+    /**
+     * Save config to cache backend
+     *
+     * @param string $key
+     * @param array $data
+     */
+    public function save(string $key, array $data)
+    {
+        $this->cache->save($this->serializer->serialize($data), $key);
+    }
+
+    /**
+     * Save config to filesystem
+     *
+     * @param string $key
+     * @param array $data
+     */
+    public function saveCompiled(string $key, array $data)
+    {
+        $this->configWriter->write($key, $data);
+    }
+
+    /**
+     * Purge interception cache
+     *
+     * @param string $key
+     */
+    public function clean(string $key)
+    {
+        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [$key]);
+    }
+
+    /**
+     * Check for the compiled config with the generated metadata
+     *
+     * @param string $key
+     * @return bool
+     */
+    private function isCompiled(string $key): bool
+    {
+        return file_exists(\Magento\Framework\App\ObjectManager\ConfigLoader\Compiled::getFilePath($key));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 7c80051537baa..3f16e9275bd08 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -1,15 +1,17 @@
 <?php
 /**
- * Interception config. Responsible for providing list of plugins configured for instance
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Interception\Config;
 
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Serialize\Serializer\Serialize;
 
+/**
+ * Interception config.
+ *
+ * Responsible for providing list of plugins configured for instance
+ */
 class Config implements \Magento\Framework\Interception\ConfigInterface
 {
     /**
@@ -35,7 +37,7 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
 
     /**
      * Cache
-     *
+     * @deprecated
      * @var \Magento\Framework\Cache\FrontendInterface
      */
     protected $_cache;
@@ -74,21 +76,24 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
     protected $_scopeList;
 
     /**
-     * @var SerializerInterface
+     * @var CacheManager
      */
-    private $serializer;
+    private $cacheManager;
 
     /**
      * Config constructor
      *
      * @param \Magento\Framework\Config\ReaderInterface $reader
      * @param \Magento\Framework\Config\ScopeListInterface $scopeList
-     * @param \Magento\Framework\Cache\FrontendInterface $cache
+     * @param \Magento\Framework\Cache\FrontendInterface $cache @deprecated
      * @param \Magento\Framework\ObjectManager\RelationsInterface $relations
      * @param \Magento\Framework\Interception\ObjectManager\ConfigInterface $omConfig
      * @param \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions
      * @param string $cacheId
-     * @param SerializerInterface|null $serializer
+     * @param SerializerInterface|null $serializer @deprecated
+     * @param CacheManager $cacheManager
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\Config\ReaderInterface $reader,
@@ -98,7 +103,8 @@ public function __construct(
         \Magento\Framework\Interception\ObjectManager\ConfigInterface $omConfig,
         \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions,
         $cacheId = 'interception',
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        CacheManager $cacheManager = null
     ) {
         $this->_omConfig = $omConfig;
         $this->_relations = $relations;
@@ -107,13 +113,13 @@ public function __construct(
         $this->_cacheId = $cacheId;
         $this->_reader = $reader;
         $this->_scopeList = $scopeList;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(Serialize::class);
-        $intercepted = $this->_cache->load($this->_cacheId);
-        if ($intercepted !== false) {
-            $this->_intercepted = $this->serializer->unserialize($intercepted);
+        $this->cacheManager =
+            $cacheManager ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CacheManager::class);
+        $intercepted = $this->cacheManager->load($cacheId);
+        if ($intercepted !== null) {
+            $this->_intercepted = $intercepted;
         } else {
-            $this->initialize($this->_classDefinitions->getClasses());
+            $this->initializeUncompiled($this->_classDefinitions->getClasses());
         }
     }
 
@@ -125,24 +131,9 @@ public function __construct(
      */
     public function initialize($classDefinitions = [])
     {
-        $this->_cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [$this->_cacheId]);
-        $config = [];
-        foreach ($this->_scopeList->getAllScopes() as $scope) {
-            $config = array_replace_recursive($config, $this->_reader->read($scope));
-        }
-        unset($config['preferences']);
-        foreach ($config as $typeName => $typeConfig) {
-            if (!empty($typeConfig['plugins'])) {
-                $this->_intercepted[ltrim($typeName, '\\')] = true;
-            }
-        }
-        foreach ($config as $typeName => $typeConfig) {
-            $this->hasPlugins($typeName);
-        }
-        foreach ($classDefinitions as $class) {
-            $this->hasPlugins($class);
-        }
-        $this->_cache->save($this->serializer->serialize($this->_intercepted), $this->_cacheId);
+        $this->generateIntercepted($classDefinitions);
+
+        $this->cacheManager->saveCompiled($this->_cacheId, $this->_intercepted);
     }
 
     /**
@@ -179,7 +170,7 @@ protected function _inheritInterception($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function hasPlugins($type)
     {
@@ -188,4 +179,43 @@ public function hasPlugins($type)
         }
         return $this->_inheritInterception($type);
     }
+
+    /**
+     * Write interception config to cache
+     *
+     * @param array $classDefinitions
+     */
+    private function initializeUncompiled($classDefinitions = [])
+    {
+        $this->cacheManager->clean($this->_cacheId);
+
+        $this->generateIntercepted($classDefinitions);
+
+        $this->cacheManager->save($this->_cacheId, $this->_intercepted);
+    }
+
+    /**
+     * Generate intercepted array to store in compiled metadata or frontend cache
+     *
+     * @param array $classDefinitions
+     */
+    private function generateIntercepted($classDefinitions)
+    {
+        $config = [];
+        foreach ($this->_scopeList->getAllScopes() as $scope) {
+            $config = array_replace_recursive($config, $this->_reader->read($scope));
+        }
+        unset($config['preferences']);
+        foreach ($config as $typeName => $typeConfig) {
+            if (!empty($typeConfig['plugins'])) {
+                $this->_intercepted[ltrim($typeName, '\\')] = true;
+            }
+        }
+        foreach ($config as $typeName => $typeConfig) {
+            $this->hasPlugins($typeName);
+        }
+        foreach ($classDefinitions as $class) {
+            $this->hasPlugins($class);
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 489755a2846fc..a4f728454a524 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -30,7 +30,7 @@ class PluginList extends Scoped implements InterceptionPluginList
      *
      * @var array
      */
-    protected $_inherited;
+    protected $_inherited = [];
 
     /**
      * Inherited plugin data, preprocessed for read
@@ -268,7 +268,7 @@ public function getNext($type, $method, $code = '__self')
             $this->_inheritPlugins($type);
         }
         $key = $type . '_' . lcfirst($method) . '_' . $code;
-        return isset($this->_processed[$key]) ? $this->_processed[$key] : null;
+        return $this->_processed[$key] ?? null;
     }
 
     /**
@@ -295,7 +295,7 @@ protected function _loadScopedData()
                 $virtualTypes = [];
                 foreach ($this->_scopePriorityScheme as $scopeCode) {
                     if (false == isset($this->_loadedScopes[$scopeCode])) {
-                        $data = $this->_reader->read($scopeCode);
+                        $data = $this->_reader->read($scopeCode) ?: [];
                         unset($data['preferences']);
                         if (count($data) > 0) {
                             $this->_inherited = [];
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
index a862228c07dfd..ea2ab9e55ac5e 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
@@ -15,6 +15,9 @@ public function getValue()
         return $this->attribute;
     }
 
+    /**
+     * @param $value
+     */
     public function setValue($value)
     {
         $this->attribute = $value;
@@ -24,17 +27,27 @@ public function & getReference()
     {
     }
 
+    /**
+     * @param mixed ...$variadicValue
+     */
     public function firstVariadicParameter(...$variadicValue)
     {
         $this->variadicAttribute = $variadicValue;
     }
 
+    /**
+     * @param $value
+     * @param mixed ...$variadicValue
+     */
     public function secondVariadicParameter($value, ...$variadicValue)
     {
         $this->attribute = $value;
         $this->variadicAttribute = $variadicValue;
     }
 
+    /**
+     * @param mixed ...$variadicValue
+     */
     public function byRefVariadic(& ...$variadicValue)
     {
         $this->variadicAttribute = $variadicValue;
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt
index 86e3a95f48a6a..71ea5b0475cfc 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt
@@ -12,6 +12,32 @@ class Interceptor extends \Magento\Framework\Interception\Code\Generator\TSample
         $this->___init();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function returnVoid() : void
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'returnVoid');
+        if (!$pluginInfo) {
+            parent::returnVoid();
+        } else {
+            $this->___callPlugins('returnVoid', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNullableValue() : ?string
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'getNullableValue');
+        if (!$pluginInfo) {
+            return parent::getNullableValue();
+        } else {
+            return $this->___callPlugins('getNullableValue', func_get_args(), $pluginInfo);
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
index df8e8570fdfb5..b51bc2026fc4d 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
@@ -10,27 +10,56 @@ class TSample
     private $value;
     private $variadicValue;
 
+    public function returnVoid() : void
+    {
+        // Nothing to do here
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getNullableValue() : ?string
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
     public function getValue() : string
     {
         return $this->value;
     }
 
+    /**
+     * @param string $value
+     */
     public function setValue(string $value)
     {
         $this->value = $value;
     }
 
+    /**
+     * @param string ...$variadicValue
+     */
     public function typeHintedFirstVariadicParameter(string ...$variadicValue)
     {
         $this->variadicValue = $variadicValue;
     }
 
+    /**
+     * @param string $value
+     * @param string ...$variadicValue
+     */
     public function typeHintedSecondVariadicParameter(string $value, string ...$variadicValue)
     {
         $this->value = $value;
         $this->variadicValue = $variadicValue;
     }
 
+    /**
+     * @param string ...$variadicValue
+     */
     public function byRefTypeHintedVariadic(string & ...$variadicValue)
     {
         $this->variadicValue = $variadicValue;
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
index 54dfa8a03b28c..61eb2e62091ea 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
@@ -31,11 +31,6 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $readerMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cacheMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -51,8 +46,10 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $relationsMock;
 
-    /** @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    private $serializerMock;
+    /**
+     * @var \Magento\Framework\Interception\Config\CacheManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cacheManagerMock;
 
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
     private $objectManagerHelper;
@@ -61,7 +58,6 @@ protected function setUp()
     {
         $this->readerMock = $this->createMock(\Magento\Framework\ObjectManager\Config\Reader\Dom::class);
         $this->configScopeMock = $this->createMock(\Magento\Framework\Config\ScopeListInterface::class);
-        $this->cacheMock = $this->createMock(\Magento\Framework\Cache\FrontendInterface::class);
         $this->omConfigMock = $this->getMockForAbstractClass(
             \Magento\Framework\Interception\ObjectManager\ConfigInterface::class
         );
@@ -69,7 +65,7 @@ protected function setUp()
         $this->relationsMock = $this->getMockForAbstractClass(
             \Magento\Framework\ObjectManager\RelationsInterface::class
         );
-        $this->serializerMock = $this->createMock(SerializerInterface::class);
+        $this->cacheManagerMock = $this->createMock(\Magento\Framework\Interception\Config\CacheManager::class);
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
     }
 
@@ -88,9 +84,9 @@ public function testHasPluginsWhenDataIsNotCached($expectedResult, $type, $entit
             ->method('getAllScopes')
             ->will($this->returnValue(['global', 'backend', 'frontend']));
         // turn cache off
-        $this->cacheMock->expects($this->any())
+        $this->cacheManagerMock->expects($this->any())
             ->method('load')
-            ->will($this->returnValue(false));
+            ->will($this->returnValue(null));
         $this->omConfigMock->expects($this->any())
             ->method('getOriginalInstanceType')
             ->will($this->returnValueMap(
@@ -138,21 +134,15 @@ public function testHasPluginsWhenDataIsNotCached($expectedResult, $type, $entit
         $this->relationsMock->expects($this->any())->method('has')->will($this->returnValue($expectedResult));
         $this->relationsMock->expects($this->any())->method('getParents')->will($this->returnValue($entityParents));
 
-        $this->serializerMock->expects($this->once())
-            ->method('serialize');
-
-        $this->serializerMock->expects($this->never())->method('unserialize');
-
         $model = $this->objectManagerHelper->getObject(
             \Magento\Framework\Interception\Config\Config::class,
             [
                 'reader' => $this->readerMock,
                 'scopeList' => $this->configScopeMock,
-                'cache' => $this->cacheMock,
+                'cacheManager' => $this->cacheManagerMock,
                 'relations' => $this->relationsMock,
                 'omConfig' => $this->omConfigMock,
                 'classDefinitions' => $this->definitionMock,
-                'serializer' => $this->serializerMock
             ]
         );
 
@@ -177,38 +167,33 @@ public function testHasPluginsWhenDataIsCached($expectedResult, $type)
             'virtual_custom_item' => true
         ];
         $this->readerMock->expects($this->never())->method('read');
-        $this->cacheMock->expects($this->never())->method('save');
-        $serializedValue = 'serializedData';
-        $this->cacheMock->expects($this->any())
+        $this->cacheManagerMock->expects($this->never())->method('save');
+        $this->cacheManagerMock->expects($this->any())
             ->method('load')
             ->with($cacheId)
-            ->will($this->returnValue($serializedValue));
-
-        $this->serializerMock->expects($this->never())->method('serialize');
-        $this->serializerMock->expects($this->once())
-            ->method('unserialize')
-            ->with($serializedValue)
-            ->willReturn($interceptionData);
+            ->will($this->returnValue($interceptionData));
 
         $model = $this->objectManagerHelper->getObject(
             \Magento\Framework\Interception\Config\Config::class,
             [
                 'reader' => $this->readerMock,
                 'scopeList' => $this->configScopeMock,
-                'cache' => $this->cacheMock,
+                'cacheManager' => $this->cacheManagerMock,
                 'relations' => $this->objectManagerHelper->getObject(
                     \Magento\Framework\ObjectManager\Relations\Runtime::class
                 ),
                 'omConfig' => $this->omConfigMock,
                 'classDefinitions' => $this->definitionMock,
                 'cacheId' => $cacheId,
-                'serializer' => $this->serializerMock
             ]
         );
 
         $this->assertEquals($expectedResult, $model->hasPlugins($type));
     }
 
+    /**
+     * @return array
+     */
     public function hasPluginsDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
index 2a623deca082f..fe685fdf35b73 100644
--- a/lib/internal/Magento/Framework/Locale/Config.php
+++ b/lib/internal/Magento/Framework/Locale/Config.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Locale;
 
+/**
+ * Allowed locale and currency configuration.
+ */
 class Config implements \Magento\Framework\Locale\ConfigInterface
 {
     /**
@@ -74,6 +77,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)*/
@@ -89,6 +93,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'sq_AL', /*Albanian (Albania)*/
         'sr_Cyrl_RS', /*Serbian (Serbia)*/
         'sv_SE', /*Swedish (Sweden)*/
+        'sv_FI', /*Swedish (Finland)*/
         'sw_KE', /*Swahili (Kenya)*/
         'th_TH', /*Thai (Thailand)*/
         'tr_TR', /*Turkish (Turkey)*/
@@ -101,6 +106,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'lo_LA', /*Laotian*/
         'es_VE', /*Spanish (Venezuela)*/
         'en_IE', /*English (Ireland)*/
+        'es_BO', /*Spanish (Bolivia)*/
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Locale/Deployed/Options.php b/lib/internal/Magento/Framework/Locale/Deployed/Options.php
index ea892ee7fcab0..82f80b8a3b576 100644
--- a/lib/internal/Magento/Framework/Locale/Deployed/Options.php
+++ b/lib/internal/Magento/Framework/Locale/Deployed/Options.php
@@ -3,9 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Locale\Deployed;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State;
+use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\AvailableLocalesInterface;
 use Magento\Framework\Locale\ListsInterface;
@@ -45,28 +50,36 @@ class Options implements OptionInterface
      */
     private $localeLists;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param ListsInterface $localeLists locales list
      * @param State $state application state class
      * @param AvailableLocalesInterface $availableLocales operates with available locales
      * @param DesignInterface $design operates with magento design settings
+     * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(
         ListsInterface $localeLists,
         State $state,
         AvailableLocalesInterface $availableLocales,
-        DesignInterface $design
+        DesignInterface $design,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->localeLists = $localeLists;
         $this->state = $state;
         $this->availableLocales = $availableLocales;
         $this->design = $design;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getOptionLocales()
+    public function getOptionLocales(): array
     {
         return $this->filterLocales($this->localeLists->getOptionLocales());
     }
@@ -74,7 +87,7 @@ public function getOptionLocales()
     /**
      * {@inheritdoc}
      */
-    public function getTranslatedOptionLocales()
+    public function getTranslatedOptionLocales(): array
     {
         return $this->filterLocales($this->localeLists->getTranslatedOptionLocales());
     }
@@ -82,7 +95,7 @@ public function getTranslatedOptionLocales()
     /**
      * Filter list of locales by available locales for current theme and depends on running application mode.
      *
-     * Applies filters only in production mode.
+     * Applies filters only in production mode when flag 'static_content_on_demand_in_production' is not enabled.
      * For example, if the current design theme has only one generated locale en_GB then for given array of locales:
      * ```php
      *     $locales = [
@@ -113,9 +126,10 @@ public function getTranslatedOptionLocales()
      * @param array $locales list of locales for filtering
      * @return array of filtered locales
      */
-    private function filterLocales(array $locales)
+    private function filterLocales(array $locales): array
     {
-        if ($this->state->getMode() != State::MODE_PRODUCTION) {
+        if ($this->state->getMode() != State::MODE_PRODUCTION
+            || $this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)) {
             return $locales;
         }
 
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index 7bb4cb4b7d432..ca50cdb2440f4 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -65,7 +65,7 @@ public function getNumber($value)
         }
 
         //trim spaces and apostrophes
-        $value = str_replace(['\'', ' '], '', $value);
+        $value = preg_replace('/[^0-9^\^.,-]/m', '', $value);
 
         $separatorComa = strpos($value, ',');
         $separatorDot = strpos($value, '.');
@@ -99,7 +99,10 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
             $currency = $this->_scopeResolver->getScope()->getCurrentCurrency();
         }
 
-        $formatter = new \NumberFormatter($localeCode, \NumberFormatter::CURRENCY);
+        $formatter = new \NumberFormatter(
+            $localeCode . '@currency=' . $currency->getCode(),
+            \NumberFormatter::CURRENCY
+        );
         $format = $formatter->getPattern();
         $decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
         $groupSymbol = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
@@ -128,7 +131,6 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
         } else {
             $group = strrpos($format, '.');
         }
-        $integerRequired = strpos($format, '.') - strpos($format, '0');
 
         $result = [
             //TODO: change interface
@@ -138,7 +140,7 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
             'decimalSymbol' => $decimalSymbol,
             'groupSymbol' => $groupSymbol,
             'groupLength' => $group,
-            'integerRequired' => $integerRequired,
+            'integerRequired' => $totalPrecision == 0,
         ];
 
         return $result;
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
index 5ef1a3097402b..3e917425c31e0 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Locale\Test\Unit;
 
 use Magento\Framework\Locale\Currency;
-use Magento\Framework\Locale\CurrencyInterface;
 
 class CurrencyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php
index 417bbfd402549..300bb83f05d19 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php
@@ -3,9 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Locale\Test\Unit\Deployed;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\State;
+use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
 use Magento\Framework\Locale\AvailableLocalesInterface;
 use Magento\Framework\Locale\Deployed\Options;
 use Magento\Framework\Locale\ListsInterface;
@@ -40,6 +44,11 @@ class OptionsTest extends \PHPUnit\Framework\TestCase
      */
     private $localeListsMock;
 
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
     /**
      * @var Options
      */
@@ -59,63 +68,123 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->localeListsMock = $this->getMockBuilder(ListsInterface::class)
             ->getMockForAbstractClass();
+        $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
 
         $this->model = new Options(
             $this->localeListsMock,
             $this->stateMock,
             $this->availableLocalesMock,
-            $this->designMock
+            $this->designMock,
+            $this->deploymentConfigMock
         );
     }
 
     /**
      * @param string $mode
+     * @param int $scdOnDemand
+     * @param array $locales
+     * @return void
+     *
+     * @dataProvider getFullLocalesDataProvider
+     */
+    public function testGetOptionLocalesFull(string $mode, int $scdOnDemand, array $locales): void
+    {
+        $this->localeListsMock->expects($this->once())
+            ->method('getOptionLocales')
+            ->willReturn($locales);
+
+        $this->prepareGetLocalesFull($mode, $scdOnDemand);
+
+        $this->assertEquals($locales, array_values($this->model->getOptionLocales()));
+    }
+
+    /**
+     * @param string $mode
+     * @param int $scdOnDemand
+     * @param array $locales
+     * @return void
+     *
+     * @dataProvider getFullLocalesDataProvider
+     */
+    public function testGetTranslatedOptionLocalesFull(string $mode, int $scdOnDemand, array $locales): void
+    {
+        $this->localeListsMock->expects($this->once())
+            ->method('getTranslatedOptionLocales')
+            ->willReturn($locales);
+
+        $this->prepareGetLocalesFull($mode, $scdOnDemand);
+
+        $this->assertEquals($locales, array_values($this->model->getTranslatedOptionLocales()));
+    }
+
+    /**
+     * @param string $mode
+     * @param int $scdOnDemand
      * @param array $locales
      * @param array $expectedLocales
      * @param array $deployedCodes
-     * @dataProvider getLocaleDataProvider
+     * @return void
+     *
+     * @dataProvider getLimitedLocalesDataProvider
      */
-    public function testGetOptionLocales($mode, $locales, $expectedLocales, $deployedCodes)
-    {
+    public function testGetOptionLocalesLimited(
+        string $mode,
+        int $scdOnDemand,
+        array $locales,
+        array $expectedLocales,
+        array $deployedCodes
+    ): void {
         $this->localeListsMock->expects($this->once())
             ->method('getOptionLocales')
             ->willReturn($locales);
 
-        $this->prepareGetLocales($mode, $deployedCodes);
+        $this->prepareGetLocalesLimited($mode, $scdOnDemand, $deployedCodes);
 
         $this->assertEquals($expectedLocales, array_values($this->model->getOptionLocales()));
     }
 
     /**
      * @param string $mode
+     * @param int $scdOnDemand
      * @param array $locales
      * @param array $expectedLocales
      * @param array $deployedCodes
-     * @dataProvider getLocaleDataProvider
+     * @return void
+     *
+     * @dataProvider getLimitedLocalesDataProvider
      */
-    public function testGetTranslatedOptionLocales($mode, $locales, $expectedLocales, $deployedCodes)
-    {
+    public function testGetTranslatedOptionLocalesLimited(
+        string $mode,
+        int $scdOnDemand,
+        array $locales,
+        array $expectedLocales,
+        array $deployedCodes
+    ): void {
         $this->localeListsMock->expects($this->once())
             ->method('getTranslatedOptionLocales')
             ->willReturn($locales);
 
-        $this->prepareGetLocales($mode, $deployedCodes);
+        $this->prepareGetLocalesLimited($mode, $scdOnDemand, $deployedCodes);
 
         $this->assertEquals($expectedLocales, array_values($this->model->getTranslatedOptionLocales()));
     }
 
     /**
-     * @param $mode
-     * @param $deployedCodes
+     * @param string $mode
+     * @param int $scdOnDemand
+     * @param array $deployedCodes
      * @return void
      */
-    private function prepareGetLocales($mode, $deployedCodes)
+    private function prepareGetLocalesLimited(string $mode, int $scdOnDemand, $deployedCodes): void
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
             ->willReturn($mode);
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('getConfigData')
+            ->with(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn($scdOnDemand);
 
-        if ($mode == State::MODE_PRODUCTION) {
             $area = 'area';
             $code = 'code';
             $themeMock = $this->getMockBuilder(ThemeInterface::class)
@@ -133,32 +202,94 @@ private function prepareGetLocales($mode, $deployedCodes)
                 ->method('getList')
                 ->with($code, $area)
                 ->willReturn($deployedCodes);
-        }
+    }
+
+    /**
+     * @param string $mode
+     * @param int $scdOnDemand
+     * @return void
+     */
+    private function prepareGetLocalesFull(string $mode, int $scdOnDemand): void
+    {
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn($mode);
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('getConfigData')
+            ->with(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn($scdOnDemand);
+
+        $this->designMock->expects($this->never())
+            ->method('getDesignTheme');
     }
 
     /**
      * @return array
      */
-    public function getLocaleDataProvider()
+    public function getFullLocalesDataProvider(): array
     {
+        $deLocale = [
+            'value' => 'de_DE',
+            'label' => 'German (German)'
+        ];
+        $daLocale = [
+            'value' => 'da_DK',
+            'label' => 'Danish (Denmark)'
+        ];
+
         return [
             [
                 State::MODE_PRODUCTION,
+                1,
+                [$daLocale, $deLocale],
+            ],
+            [
+                State::MODE_DEVELOPER,
+                0,
+                [$daLocale, $deLocale],
+            ],
+            [
+                State::MODE_DEVELOPER,
+                1,
+                [$deLocale],
+            ],
+            [
+                State::MODE_DEFAULT,
+                0,
+                [$daLocale],
+            ],
+            [
+                State::MODE_DEFAULT,
+                1,
+                [$daLocale, $deLocale],
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getLimitedLocalesDataProvider(): array
+    {
+        $deLocale = [
+            'value' => 'de_DE',
+            'label' => 'German (German)'
+        ];
+        $daLocale = [
+            'value' => 'da_DK',
+            'label' => 'Danish (Denmark)'
+        ];
+
+        return [
+            [
+                State::MODE_PRODUCTION,
+                0,
                 [
-                    [
-                        'value' => 'da_DK',
-                        'label' => 'Danish (Denmark)'
-                    ],
-                    [
-                        'value' => 'de_DE',
-                        'label' => 'German (German)'
-                    ]
+                    $daLocale,
+                    $deLocale
                 ],
                 [
-                    [
-                        'value' => 'de_DE',
-                        'label' => 'German (German)'
-                    ]
+                    $deLocale
                 ],
                 [
                     'de_DE'
@@ -166,38 +297,17 @@ public function getLocaleDataProvider()
             ],
             [
                 State::MODE_PRODUCTION,
+                0,
                 [
-                    [
-                        'value' => 'de_DE',
-                        'label' => 'German (German)'
-                    ]
-                ],
-                [],
-                []
-            ],
-            [
-                State::MODE_DEVELOPER,
-                [
-                    [
-                        'value' => 'da_DK',
-                        'label' => 'Danish (Denmark)'
-                    ],
-                    [
-                        'value' => 'de_DE',
-                        'label' => 'German (German)'
-                    ]
+                    $daLocale,
+                    $deLocale
                 ],
                 [
-                    [
-                        'value' => 'da_DK',
-                        'label' => 'Danish (Denmark)'
-                    ],
-                    [
-                        'value' => 'de_DE',
-                        'label' => 'German (German)'
-                    ]
+                    $daLocale,
+                    $deLocale
                 ],
                 [
+                    'da_DK',
                     'de_DE'
                 ]
             ],
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index 41583fd1383a5..1141f451c13a5 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -33,6 +33,9 @@ class FormatTest extends \PHPUnit\Framework\TestCase
      */
     protected $currency;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         $this->currency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
@@ -41,9 +44,7 @@ protected function setUp()
         $this->scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)
             ->setMethods(['getCurrentCurrency'])
             ->getMockForAbstractClass();
-        $this->scope->expects($this->once())
-            ->method('getCurrentCurrency')
-            ->willReturn($this->currency);
+
         $this->scopeResolver = $this->getMockBuilder(\Magento\Framework\App\ScopeResolverInterface::class)
             ->setMethods(['getScope'])
             ->getMockForAbstractClass();
@@ -52,7 +53,10 @@ protected function setUp()
             ->willReturn($this->scope);
         $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
             ->getMock();
+
+        /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject $currencyFactory */
         $currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $this->formatModel = new \Magento\Framework\Locale\Format(
@@ -63,21 +67,26 @@ protected function setUp()
     }
 
     /**
-     * @param $localeCode
-     * @param $expectedResult
+     * @param string $localeCode
+     * @param array $expectedResult
      * @dataProvider getPriceFormatDataProvider
      */
-    public function testGetPriceFormat($localeCode, $expectedResult)
+    public function testGetPriceFormat($localeCode, array $expectedResult): void
     {
+        $this->scope->expects($this->once())
+            ->method('getCurrentCurrency')
+            ->willReturn($this->currency);
+
         $result = $this->formatModel->getPriceFormat($localeCode);
         $intersection = array_intersect_assoc($result, $expectedResult);
         $this->assertCount(count($expectedResult), $intersection);
     }
 
     /**
+     *
      * @return array
      */
-    public function getPriceFormatDataProvider()
+    public function getPriceFormatDataProvider(): array
     {
         return [
             ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
@@ -86,4 +95,35 @@ public function getPriceFormatDataProvider()
             ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }
+
+    /**
+     *
+     * @param        mixed $value
+     * @param        float $expected
+     * @dataProvider provideNumbers
+     */
+    public function testGetNumber($value, $expected): void
+    {
+        $this->assertEquals($expected, $this->formatModel->getNumber($value));
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function provideNumbers(): array
+    {
+        return [
+            ['  2345.4356,1234', 23454356.1234],
+            ['+23,3452.123', 233452.123],
+            ['12343', 12343],
+            ['-9456km', -9456],
+            ['0', 0],
+            ['2 054,10', 2054.1],
+            ['2046,45', 2046.45],
+            ['2 054.52', 2054.52],
+            ['2,46 GB', 2.46],
+            ['2,054.00', 2054],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
new file mode 100644
index 0000000000000..ce6aeca66d657
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/Database.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the DB locks
+ */
+class Database implements \Magento\Framework\Lock\LockManagerInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var string Lock prefix
+     */
+    private $prefix;
+
+    /**
+     * @var string|false Holds current lock name if set, otherwise false
+     */
+    private $currentLock = false;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param DeploymentConfig $deploymentConfig
+     * @param string|null $prefix
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        DeploymentConfig $deploymentConfig,
+        string $prefix = null
+    ) {
+        $this->resource = $resource;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Sets a lock for name
+     *
+     * @param string $name lock name
+     * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
+     * @return bool
+     * @throws InputException
+     * @throws AlreadyExistsException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        $name = $this->addPrefix($name);
+
+        /**
+         * Before MySQL 5.7.5, only a single simultaneous lock per connection can be acquired.
+         * This limitation can be removed once MySQL minimum requirement has been raised,
+         * currently we support MySQL 5.6 way only.
+         */
+        if ($this->currentLock) {
+            throw new AlreadyExistsException(
+                new Phrase(
+                    'Current connection is already holding lock for $1, only single lock allowed',
+                    [$this->currentLock]
+                )
+            );
+        }
+
+        $result = (bool)$this->resource->getConnection()->query(
+            "SELECT GET_LOCK(?, ?);",
+            [(string)$name, (int)$timeout]
+        )->fetchColumn();
+
+        if ($result === true) {
+            $this->currentLock = $name;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Releases a lock for name
+     *
+     * @param string $name lock name
+     * @return bool
+     * @throws InputException
+     */
+    public function unlock(string $name): bool
+    {
+        $name = $this->addPrefix($name);
+
+        $result = (bool)$this->resource->getConnection()->query(
+            "SELECT RELEASE_LOCK(?);",
+            [(string)$name]
+        )->fetchColumn();
+
+        if ($result === true) {
+            $this->currentLock = false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Tests of lock is set for name
+     *
+     * @param string $name lock name
+     * @return bool
+     * @throws InputException
+     */
+    public function isLocked(string $name): bool
+    {
+        $name = $this->addPrefix($name);
+
+        return (bool)$this->resource->getConnection()->query(
+            "SELECT IS_USED_LOCK(?);",
+            [(string)$name]
+        )->fetchColumn();
+    }
+
+    /**
+     * Adds prefix and checks for max length of lock name
+     *
+     * Limited to 64 characters in MySQL.
+     *
+     * @param string $name
+     * @return string
+     * @throws InputException
+     */
+    private function addPrefix(string $name): string
+    {
+        $name = $this->getPrefix() . '|' . $name;
+
+        if (strlen($name) > 64) {
+            throw new InputException(new Phrase('Lock name too long: %1...', [substr($name, 0, 64)]));
+        }
+
+        return $name;
+    }
+
+    /**
+     * Get installation specific lock prefix to avoid lock conflicts
+     *
+     * @return string lock prefix
+     */
+    private function getPrefix(): string
+    {
+        if ($this->prefix === null) {
+            $this->prefix = (string)$this->deploymentConfig->get(
+                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT
+                . '/'
+                . ConfigOptionsListConstants::KEY_NAME,
+                ''
+            );
+        }
+
+        return $this->prefix;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/LockManagerInterface.php b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
new file mode 100644
index 0000000000000..76cc8506eb182
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/LockManagerInterface.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\Lock;
+
+/**
+ * Interface of a lock manager
+ *
+ * @api
+ */
+interface LockManagerInterface
+{
+    /**
+     * Sets a lock
+     *
+     * @param string $name lock name
+     * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
+     * @return bool
+     * @api
+     */
+    public function lock(string $name, int $timeout = -1): bool;
+
+    /**
+     * Releases a lock
+     *
+     * @param string $name lock name
+     * @return bool
+     * @api
+     */
+    public function unlock(string $name): bool;
+
+    /**
+     * Tests if lock is set
+     *
+     * @param string $name lock name
+     * @return bool
+     * @api
+     */
+    public function isLocked(string $name): bool;
+}
diff --git a/lib/internal/Magento/Framework/Lock/README.md b/lib/internal/Magento/Framework/Lock/README.md
new file mode 100644
index 0000000000000..cd5ae425b949d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/README.md
@@ -0,0 +1,8 @@
+# Lock library
+
+Lock library provides mechanism to acquire Magento system-wide lock. Default implementation is based on MySQL locks, where any locks are automatically released on connection close.
+
+The library provides interface *LockManagerInterface* which provides following methods:
+* *lock* - Acquires a named lock
+* *unlock* - Releases a named lock
+* *isLocked* - Tests if a named lock exists
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
new file mode 100644
index 0000000000000..db3add62ff550
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit\Backend;
+
+use Magento\Framework\Lock\Backend\Database;
+
+class DatabaseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\DB\Adapter\AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Zend_Db_Statement_Interface
+     */
+    private $statement;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Database
+     */
+    private $database;
+
+    protected function setUp()
+    {
+        $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statement = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->resource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connection);
+
+        $this->connection->expects($this->any())
+            ->method('query')
+            ->willReturn($this->statement);
+
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        /** @var Database $database */
+        $this->database = $this->objectManager->getObject(
+            Database::class,
+            ['resource' => $this->resource]
+        );
+    }
+
+    public function testLock()
+    {
+        $this->statement->expects($this->once())
+            ->method('fetchColumn')
+            ->willReturn(true);
+
+        $this->assertTrue($this->database->lock('testLock'));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     */
+    public function testlockWithTooLongName()
+    {
+        $this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\AlreadyExistsException
+     */
+    public function testlockWithAlreadyAcquiredLockInSameSession()
+    {
+        $this->statement->expects($this->any())
+            ->method('fetchColumn')
+            ->willReturn(true);
+
+        $this->database->lock('testLock');
+        $this->database->lock('differentLock');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Base.php b/lib/internal/Magento/Framework/Logger/Handler/Base.php
index 46c707a9254cf..4c136fd65a553 100644
--- a/lib/internal/Magento/Framework/Logger/Handler/Base.php
+++ b/lib/internal/Magento/Framework/Logger/Handler/Base.php
@@ -11,6 +11,9 @@
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
+/**
+ * Base stream handler
+ */
 class Base extends StreamHandler
 {
     /**
@@ -32,6 +35,7 @@ class Base extends StreamHandler
      * @param DriverInterface $filesystem
      * @param string $filePath
      * @param string $fileName
+     * @throws \Exception
      */
     public function __construct(
         DriverInterface $filesystem,
@@ -51,8 +55,9 @@ public function __construct(
     }
 
     /**
-     * @param string $fileName
+     * Remove dots from file name
      *
+     * @param string $fileName
      * @return string
      * @throws \InvalidArgumentException
      */
@@ -71,11 +76,7 @@ private function sanitizeFileName($fileName)
     }
 
     /**
-     * {@inheritDoc}
-     *
-     * @param $record array
-     *
-     * @return void
+     * @inheritDoc
      */
     public function write(array $record)
     {
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Syslog.php b/lib/internal/Magento/Framework/Logger/Handler/Syslog.php
new file mode 100644
index 0000000000000..4964cc45f85d7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Logger/Handler/Syslog.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Logger\Handler;
+
+use Monolog\Handler\SyslogHandler;
+use Monolog\Logger;
+
+/**
+ * @inheritdoc
+ */
+class Syslog extends SyslogHandler
+{
+    private const FACILITY = LOG_USER;
+    private const LEVEL = Logger::DEBUG;
+
+    /**
+     * @param string $ident The string ident to be added to each message
+     */
+    public function __construct(string $ident)
+    {
+        parent::__construct($ident, self::FACILITY, self::LEVEL);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Logger/Handler/System.php b/lib/internal/Magento/Framework/Logger/Handler/System.php
index b30195e979712..c519e320a254d 100644
--- a/lib/internal/Magento/Framework/Logger/Handler/System.php
+++ b/lib/internal/Magento/Framework/Logger/Handler/System.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Monolog\Logger;
 
+/**
+ * System stream handler
+ */
 class System extends Base
 {
     /**
@@ -43,7 +46,7 @@ public function __construct(
     /**
      * Writes formatted record through the handler.
      *
-     * @param $record array The record metadata
+     * @param array $record The record metadata
      * @return void
      */
     public function write(array $record)
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index a8374be59ff65..eac5d74c6e3dc 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -11,12 +11,14 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Mail\MessageInterface;
+use Magento\Framework\Mail\MessageInterfaceFactory;
 use Magento\Framework\Mail\TransportInterfaceFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 
 /**
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TransportBuilder
 {
@@ -88,25 +90,35 @@ class TransportBuilder
      */
     protected $mailTransportFactory;
 
+    /**
+     * @var \Magento\Framework\Mail\MessageInterfaceFactory
+     */
+    private $messageFactory;
+
     /**
      * @param FactoryInterface $templateFactory
      * @param MessageInterface $message
      * @param SenderResolverInterface $senderResolver
      * @param ObjectManagerInterface $objectManager
      * @param TransportInterfaceFactory $mailTransportFactory
+     * @param MessageInterfaceFactory $messageFactory
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         FactoryInterface $templateFactory,
         MessageInterface $message,
         SenderResolverInterface $senderResolver,
         ObjectManagerInterface $objectManager,
-        TransportInterfaceFactory $mailTransportFactory
+        TransportInterfaceFactory $mailTransportFactory,
+        MessageInterfaceFactory $messageFactory = null
     ) {
         $this->templateFactory = $templateFactory;
-        $this->message = $message;
         $this->objectManager = $objectManager;
         $this->_senderResolver = $senderResolver;
         $this->mailTransportFactory = $mailTransportFactory;
+        $this->messageFactory = $messageFactory ?: $this->objectManager->get(MessageInterfaceFactory::class);
+        $this->message = $this->messageFactory->create();
     }
 
     /**
@@ -242,7 +254,7 @@ public function getTransport()
      */
     protected function reset()
     {
-        $this->message = $this->objectManager->create(\Magento\Framework\Mail\Message::class);
+        $this->message = $this->messageFactory->create();
         $this->templateIdentifier = null;
         $this->templateVars = null;
         $this->templateOptions = null;
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
new file mode 100644
index 0000000000000..785c93824a57d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mail\Template;
+
+use Magento\Framework\Mail\MessageInterface;
+
+class TransportBuilderByStore
+{
+    /**
+     * Message.
+     *
+     * @var \Magento\Framework\Mail\Message
+     */
+    protected $message;
+
+    /**
+     * Sender resolver.
+     *
+     * @var \Magento\Framework\Mail\Template\SenderResolverInterface
+     */
+    private $senderResolver;
+
+    /**
+     * @param MessageInterface $message
+     * @param SenderResolverInterface $senderResolver
+     */
+    public function __construct(
+        MessageInterface $message,
+        SenderResolverInterface $senderResolver
+    ) {
+        $this->message = $message;
+        $this->senderResolver = $senderResolver;
+    }
+
+    /**
+     * Set mail from address by store.
+     *
+     * @param string|array $from
+     * @param string|int $store
+     *
+     * @return $this
+     */
+    public function setFromByStore($from, $store)
+    {
+        $result = $this->senderResolver->resolve($from, $store);
+        $this->message->setFrom($result['email'], $result['name']);
+
+        return $this;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
new file mode 100644
index 0000000000000..80df2887a3a93
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mail\Test\Unit\Template;
+
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
+
+class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Mail\Template\TransportBuilderByStore
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageMock;
+
+    /**
+     * @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $senderResolverMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
+        $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
+
+        $this->model = $objectManagerHelper->getObject(
+            TransportBuilderByStore::class,
+            [
+                'message' => $this->messageMock,
+                'senderResolver' => $this->senderResolverMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSetFromByStore()
+    {
+        $sender = ['email' => 'from@example.com', 'name' => 'name'];
+        $store = 1;
+        $this->senderResolverMock->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $store)
+            ->willReturn($sender);
+        $this->messageMock->expects($this->once())
+            ->method('setFrom')
+            ->with('from@example.com', 'name')
+            ->willReturnSelf();
+
+        $this->model->setFromByStore($sender, $store);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 48f54c33207b5..596640480c823 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Mail\Test\Unit\Template;
 
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Mail\MessageInterface;
+use Magento\Framework\Mail\MessageInterfaceFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class TransportBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -40,6 +45,11 @@ class TransportBuilderTest extends \PHPUnit\Framework\TestCase
      */
     protected $senderResolverMock;
 
+    /**
+     * @var \Magento\Framework\Mail\MessageInterfaceFactory| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageFactoryMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -59,7 +69,12 @@ protected function setUp()
             \Magento\Framework\Mail\TransportInterfaceFactory::class
         )->disableOriginalConstructor()
             ->setMethods(['create'])
-            ->getMock();
+            ->getMockForAbstractClass();
+        $this->messageFactoryMock = $this->getMockBuilder(\Magento\Framework\Mail\MessageInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+        $this->messageFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($this->messageMock);
         $this->builder = $objectManagerHelper->getObject(
             $this->builderClassName,
             [
@@ -67,7 +82,8 @@ protected function setUp()
                 'message' => $this->messageMock,
                 'objectManager' => $this->objectManagerMock,
                 'senderResolver' => $this->senderResolverMock,
-                'mailTransportFactory' => $this->mailTransportFactoryMock
+                'mailTransportFactory' => $this->mailTransportFactoryMock,
+                'messageFactory' => $this->messageFactoryMock
             ]
         );
     }
@@ -104,12 +120,12 @@ public function testGetTransport($templateType, $messageType, $bodyText, $templa
             ->with($this->equalTo('Email Subject'))
             ->willReturnSelf();
 
-        $this->messageMock->expects($this->exactly(intval($messageType == MessageInterface::TYPE_TEXT)))
+        $this->messageMock->expects($this->exactly((int)($messageType == MessageInterface::TYPE_TEXT)))
             ->method('setBodyText')
             ->with($this->equalTo($bodyText))
             ->willReturnSelf();
 
-        $this->messageMock->expects($this->exactly(intval($messageType == MessageInterface::TYPE_HTML)))
+        $this->messageMock->expects($this->exactly((int)($messageType == MessageInterface::TYPE_HTML)))
             ->method('setBodyHtml')
             ->with($this->equalTo($bodyText))
             ->willReturnSelf();
@@ -121,10 +137,7 @@ public function testGetTransport($templateType, $messageType, $bodyText, $templa
             ->with($this->equalTo(['message' => $this->messageMock]))
             ->willReturn($transport);
 
-        $this->objectManagerMock->expects($this->at(0))
-            ->method('create')
-            ->with($this->equalTo(\Magento\Framework\Mail\Message::class))
-            ->willReturn($transport);
+        $this->messageFactoryMock->expects($this->once())->method('create')->willReturn($transport);
 
         $this->builder->setTemplateIdentifier('identifier')->setTemplateVars($vars)->setTemplateOptions($options);
         $this->assertInstanceOf(\Magento\Framework\Mail\TransportInterface::class, $this->builder->getTransport());
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
index 12889d9af8fd7..3cbe6fc923cdd 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
@@ -10,7 +10,7 @@ class TransportTest extends \PHPUnit\Framework\TestCase
     /**
      * @covers \Magento\Framework\Mail\Transport::sendMessage
      * @expectedException \Magento\Framework\Exception\MailException
-     * @expectedExceptionMessage Invalid email; contains no "To" header
+     * @expectedExceptionMessage Invalid email; contains no at least one of "To", "Cc", and "Bcc" header
      */
     public function testSendMessageBrokenMessage()
     {
diff --git a/lib/internal/Magento/Framework/Mail/Transport.php b/lib/internal/Magento/Framework/Mail/Transport.php
index 29cb971b9fe0e..8a7ace17cc9a0 100644
--- a/lib/internal/Magento/Framework/Mail/Transport.php
+++ b/lib/internal/Magento/Framework/Mail/Transport.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Phrase;
-use Zend\Mail\Message;
+use Zend\Mail\Message as ZendMessage;
 use Zend\Mail\Transport\Sendmail;
 
 class Transport implements \Magento\Framework\Mail\TransportInterface
@@ -39,7 +39,7 @@ public function sendMessage()
     {
         try {
             $this->zendTransport->send(
-                Message::fromString($this->message->getRawMessage())
+                ZendMessage::fromString($this->message->getRawMessage())
             );
         } catch (\Exception $e) {
             throw new MailException(new Phrase($e->getMessage()), $e);
diff --git a/lib/internal/Magento/Framework/Math/FloatComparator.php b/lib/internal/Magento/Framework/Math/FloatComparator.php
new file mode 100644
index 0000000000000..4053404369956
--- /dev/null
+++ b/lib/internal/Magento/Framework/Math/FloatComparator.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\Math;
+
+/**
+ * Contains methods to compare float digits.
+ *
+ * @api
+ */
+class FloatComparator
+{
+    /**
+     * Precision for floats comparing.
+     *
+     * @var float
+     */
+    private static $epsilon = 0.00001;
+
+    /**
+     * Compares two float digits.
+     *
+     * @param float $a
+     * @param float $b
+     * @return bool
+     */
+    public function equal(float $a, float $b): bool
+    {
+        return abs($a - $b) <= self::$epsilon;
+    }
+
+    /**
+     * Compares if the first argument greater than the second argument.
+     *
+     * @param float $a
+     * @param float $b
+     * @return bool
+     */
+    public function greaterThan(float $a, float $b): bool
+    {
+        return ($a - $b) > self::$epsilon;
+    }
+
+    /**
+     * Compares if the first argument greater or equal to the second.
+     *
+     * @param float $a
+     * @param float $b
+     * @return bool
+     */
+    public function greaterThanOrEqual(float $a, float $b): bool
+    {
+        return $this->equal($a, $b) || $this->greaterThan($a, $b);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Math/Random.php b/lib/internal/Magento/Framework/Math/Random.php
index 7cb70c9a822cc..c2059e1935a80 100644
--- a/lib/internal/Magento/Framework/Math/Random.php
+++ b/lib/internal/Magento/Framework/Math/Random.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Math;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
 /**
  * Random data generator
  *
@@ -24,41 +27,24 @@ class Random
     /**#@-*/
 
     /**
-     * Get random string
+     * Get random string.
      *
      * @param int $length
      * @param null|string $chars
+     *
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getRandomString($length, $chars = null)
     {
         $str = '';
         if (null === $chars) {
-            $chars = self::CHARS_LOWERS . self::CHARS_UPPERS . self::CHARS_DIGITS;
+            $chars = self::CHARS_LOWERS.self::CHARS_UPPERS.self::CHARS_DIGITS;
         }
 
-        if (function_exists('openssl_random_pseudo_bytes')) {
-            // use openssl lib if it is installed
-            for ($i = 0, $lc = strlen($chars) - 1; $i < $length; $i++) {
-                $bytes = openssl_random_pseudo_bytes(PHP_INT_SIZE);
-                $hex = bin2hex($bytes); // hex() doubles the length of the string
-                $rand = abs(hexdec($hex) % $lc); // random integer from 0 to $lc
-                $str .= $chars[$rand]; // random character in $chars
-            }
-        } elseif ($fp = @fopen('/dev/urandom', 'rb')) {
-            // attempt to use /dev/urandom if it exists but openssl isn't available
-            for ($i = 0, $lc = strlen($chars) - 1; $i < $length; $i++) {
-                $bytes = @fread($fp, PHP_INT_SIZE);
-                $hex = bin2hex($bytes); // hex() doubles the length of the string
-                $rand = abs(hexdec($hex) % $lc); // random integer from 0 to $lc
-                $str .= $chars[$rand]; // random character in $chars
-            }
-            fclose($fp);
-        } else {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase("Please make sure you have 'openssl' extension installed")
-            );
+        $charsMaxKey = mb_strlen($chars) - 1;
+        for ($i = 0; $i < $length; $i++) {
+            $str .= $chars[self::getRandomNumber(0, $charsMaxKey)];
         }
 
         return $str;
@@ -67,47 +53,33 @@ public function getRandomString($length, $chars = null)
     /**
      * Return a random number in the specified range
      *
-     * @param $min [optional]
-     * @param $max [optional]
-     * @return int A random integer value between min (or 0) and max
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param int $min
+     * @param int $max
+     * @return int  A random integer value between min (or 0) and max
+     * @throws LocalizedException
      */
     public static function getRandomNumber($min = 0, $max = null)
     {
         if (null === $max) {
             $max = mt_getrandmax();
         }
-        $range = $max - $min + 1;
-        $offset = 0;
 
-        if (function_exists('openssl_random_pseudo_bytes')) {
-            // use openssl lib if it is installed
-            $bytes = openssl_random_pseudo_bytes(PHP_INT_SIZE);
-            $hex = bin2hex($bytes); // hex() doubles the length of the string
-            $offset = abs(hexdec($hex) % $range); // random integer from 0 to $range
-        } elseif ($fp = @fopen('/dev/urandom', 'rb')) {
-            // attempt to use /dev/urandom if it exists but openssl isn't available
-            $bytes = @fread($fp, PHP_INT_SIZE);
-            $hex = bin2hex($bytes); // hex() doubles the length of the string
-            $offset = abs(hexdec($hex) % $range); // random integer from 0 to $range
-            fclose($fp);
-        } else {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase("Please make sure you have 'openssl' extension installed")
-            );
+        if ($max < $min) {
+            throw new LocalizedException(new Phrase('Invalid range given.'));
         }
 
-        return $min + $offset; // random integer from $min to $max
+        return random_int($min, $max);
     }
 
     /**
-     * Generate a hash from unique ID
+     * Generate a hash from unique ID.
      *
      * @param string $prefix
      * @return string
+     * @throws LocalizedException
      */
     public function getUniqueHash($prefix = '')
     {
-        return $prefix . md5(uniqid(microtime() . self::getRandomNumber(), true));
+        return $prefix . $this->getRandomString(32);
     }
 }
diff --git a/lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php b/lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php
new file mode 100644
index 0000000000000..c9e5143ee789e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Math\Test\Unit;
+
+use Magento\Framework\Math\FloatComparator;
+use PHPUnit\Framework\TestCase;
+
+class FloatComparatorTest extends TestCase
+{
+    /**
+     * @var FloatComparator
+     */
+    private $comparator;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->comparator = new FloatComparator();
+    }
+
+    /**
+     * Checks a case when `a` and `b` are equal.
+     *
+     * @param float $a
+     * @param float $b
+     * @param bool $expected
+     * @dataProvider eqDataProvider
+     */
+    public function testEq(float $a, float $b, bool $expected)
+    {
+        self::assertEquals($expected, $this->comparator->equal($a, $b));
+    }
+
+    /**
+     * Gets list of variations to compare equal float.
+     *
+     * @return array
+     */
+    public function eqDataProvider(): array
+    {
+        return [
+            [10, 10.00001, true],
+            [10, 10.000001, true],
+            [10.0000099, 10.00001, true],
+            [1, 1.0001, false],
+            [1, -1.00001, false],
+        ];
+    }
+
+    /**
+     * Checks a case when `a` > `b`.
+     *
+     * @param float $a
+     * @param float $b
+     * @param bool $expected
+     * @dataProvider gtDataProvider
+     */
+    public function testGt(float $a, float $b, bool $expected)
+    {
+        self::assertEquals($expected, $this->comparator->greaterThan($a, $b));
+    }
+
+    /**
+     * Gets list of variations to compare if `a` > `b`.
+     *
+     * @return array
+     */
+    public function gtDataProvider(): array
+    {
+        return [
+            [10, 10.00001, false],
+            [10, 10.000001, false],
+            [10.0000099, 10.00001, false],
+            [1.0001, 1, true],
+            [1, -1.00001, true],
+        ];
+    }
+
+    /**
+     * Checks a case when `a` >= `b`.
+     *
+     * @param float $a
+     * @param float $b
+     * @param bool $expected
+     * @dataProvider gteDataProvider
+     */
+    public function testGte(float $a, float $b, bool $expected)
+    {
+        self::assertEquals($expected, $this->comparator->greaterThanOrEqual($a, $b));
+    }
+
+    /**
+     * Gets list of variations to compare if `a` >= `b`.
+     *
+     * @return array
+     */
+    public function gteDataProvider(): array
+    {
+        return [
+            [10, 10.00001, true],
+            [10, 10.000001, true],
+            [10.0000099, 10.00001, true],
+            [1.0001, 1, true],
+            [1, -1.00001, true],
+            [1.0001, 1.001, false],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php b/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php
index cd7f52f95a850..1dcdb0e9ae65d 100644
--- a/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php
+++ b/lib/internal/Magento/Framework/Math/Test/Unit/RandomTest.php
@@ -26,6 +26,9 @@ public function testGetRandomString($length, $chars = null)
         }
     }
 
+    /**
+     * @return array
+     */
     public function getRandomStringDataProvider()
     {
         return [
@@ -77,6 +80,9 @@ public function testGetRandomNumber($min, $max)
         $this->assertGreaterThanOrEqual($min, $number);
     }
 
+    /**
+     * @return array
+     */
     public function testGetRandomNumberProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Message/Collection.php b/lib/internal/Magento/Framework/Message/Collection.php
index 8805d433f4ffb..32e84fc28f5a0 100644
--- a/lib/internal/Magento/Framework/Message/Collection.php
+++ b/lib/internal/Magento/Framework/Message/Collection.php
@@ -136,7 +136,7 @@ public function getItems()
      */
     public function getItemsByType($type)
     {
-        return isset($this->messages[$type]) ? $this->messages[$type] : [];
+        return $this->messages[$type] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index f31892a938fb1..c3b5701057d73 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -67,7 +67,7 @@ class Manager implements ManagerInterface
      * @param Event\ManagerInterface $eventManager
      * @param LoggerInterface $logger
      * @param string $defaultGroup
-     * @param ExceptionMessageFactoryInterface|null exceptionMessageFactory
+     * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
      */
     public function __construct(
         Session $session,
@@ -89,7 +89,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultGroup()
     {
@@ -110,8 +110,8 @@ protected function prepareGroup($group)
     /**
      * @inheritdoc
      *
-     * @param string|null $group
      * @param bool $clear
+     * @param string|null $group
      * @return Collection
      */
     public function getMessages($clear = false, $group = null)
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
index 550f135ddc545..f4b73bdd2f293 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Message\Test\Unit;
 
-use Magento\Framework\Message\MessageInterface;
-
 /**
  * \Magento\Framework\Message\AbstractMessage test case
  */
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php
index f9e78eb0a36e6..88fe1309871e4 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php
@@ -38,8 +38,8 @@ public function testCreateWithWrongTypeException()
 
     public function testCreateWithWrongInterfaceImplementation()
     {
-        $this->expectException(
-            '\InvalidArgumentException',
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage(
             'Magento\Framework\Message\Error doesn\'t implement \Magento\Framework\Message\MessageInterface'
         );
         $messageMock = new \stdClass();
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
index f2b496b157c54..ea86985f057bf 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
@@ -308,6 +308,9 @@ public function testAddMessage($type, $methodName)
         $this->assertTrue($this->model->hasMessages());
     }
 
+    /**
+     * @return array
+     */
     public function addMessageDataProvider()
     {
         return [
@@ -338,6 +341,9 @@ public function testAddUniqueMessagesWhenMessagesImplementMessageInterface($mess
         $this->model->addUniqueMessages([$messages]);
     }
 
+    /**
+     * @return array
+     */
     public function addUniqueMessagesWhenMessagesImplementMessageInterfaceDataProvider()
     {
         return [
@@ -371,6 +377,9 @@ public function testAddUniqueMessages($messages)
         $this->model->addUniqueMessages($messages);
     }
 
+    /**
+     * @return array
+     */
     public function addUniqueMessagesDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php b/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
new file mode 100644
index 0000000000000..e7dc12be40e6d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
@@ -0,0 +1,305 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+
+/**
+ * Class BatchConsumer
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BatchConsumer implements ConsumerInterface
+{
+    /**
+     * @var ConsumerConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var MergerFactory
+     */
+    private $mergerFactory;
+
+    /**
+     * @var int
+     */
+    private $interval;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @var MessageProcessorLoader
+     */
+    private $messageProcessorLoader;
+
+    /**
+     * @var Resource
+     */
+    private $resource;
+
+    /**
+     * @var MessageController
+     */
+    private $messageController;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @param ConfigInterface $messageQueueConfig
+     * @param MessageEncoder $messageEncoder
+     * @param QueueRepository $queueRepository
+     * @param MergerFactory $mergerFactory
+     * @param ResourceConnection $resource
+     * @param ConsumerConfigurationInterface $configuration
+     * @param int $interval [optional]
+     * @param int $batchSize [optional]
+     * @param MessageProcessorLoader $messageProcessorLoader [optional]
+     * @param MessageController $messageController [optional]
+     * @param ConsumerConfig $consumerConfig [optional]
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        MessageQueueConfig $messageQueueConfig,
+        MessageEncoder $messageEncoder,
+        QueueRepository $queueRepository,
+        MergerFactory $mergerFactory,
+        ResourceConnection $resource,
+        ConsumerConfigurationInterface $configuration,
+        $interval = 5,
+        $batchSize = 0,
+        MessageProcessorLoader $messageProcessorLoader = null
+    ) {
+        $this->messageEncoder = $messageEncoder;
+        $this->queueRepository = $queueRepository;
+        $this->mergerFactory = $mergerFactory;
+        $this->interval = $interval;
+        $this->batchSize = $batchSize;
+        $this->resource = $resource;
+        $this->configuration = $configuration;
+        $this->messageProcessorLoader = $messageProcessorLoader
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(MessageProcessorLoader::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process($maxNumberOfMessages = null)
+    {
+        $queueName = $this->configuration->getQueueName();
+        $consumerName = $this->configuration->getConsumerName();
+        $connectionName = $this->getConsumerConfig()->getConsumer($consumerName)->getConnection();
+
+        $queue = $this->queueRepository->get($connectionName, $queueName);
+        $merger = $this->mergerFactory->create($consumerName);
+
+        if (!isset($maxNumberOfMessages)) {
+            $this->runDaemonMode($queue, $merger);
+        } else {
+            $this->run($queue, $merger, $maxNumberOfMessages);
+        }
+    }
+
+    /**
+     * Run process in a daemon mode.
+     *
+     * @param QueueInterface $queue
+     * @param MergerInterface $merger
+     * @return void
+     */
+    private function runDaemonMode(QueueInterface $queue, MergerInterface $merger)
+    {
+        $transactionCallback = $this->getTransactionCallback($queue, $merger);
+
+        while (true) {
+            $messages = $this->batchSize > 0
+                ? $this->getMessages($queue, $this->batchSize)
+                : $this->getAllMessages($queue);
+            $transactionCallback($messages);
+            sleep($this->interval);
+        }
+    }
+
+    /**
+     * Run short running process.
+     *
+     * @param QueueInterface $queue
+     * @param MergerInterface $merger
+     * @param int $maxNumberOfMessages
+     * @return void
+     */
+    private function run(QueueInterface $queue, MergerInterface $merger, $maxNumberOfMessages)
+    {
+        $count = $maxNumberOfMessages
+            ? $maxNumberOfMessages
+            : $this->configuration->getMaxMessages() ?: 1;
+        $transactionCallback = $this->getTransactionCallback($queue, $merger);
+
+        if ($this->batchSize) {
+            while ($count > 0) {
+                $messages = $this->getMessages($queue, $count > $this->batchSize ? $this->batchSize : $count);
+                $transactionCallback($messages);
+                $count -= $this->batchSize;
+            }
+        } else {
+            $messages = $this->getMessages($queue, $count);
+            $transactionCallback($messages);
+        }
+    }
+
+    /**
+     * Get all messages from a queue.
+     *
+     * @param QueueInterface $queue
+     * @return EnvelopeInterface[]
+     */
+    private function getAllMessages(QueueInterface $queue)
+    {
+        $messages = [];
+        while ($message = $queue->dequeue()) {
+            $messages[] = $message;
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Get $count messages from a queue.
+     *
+     * @param QueueInterface $queue
+     * @param int $count
+     * @return EnvelopeInterface[]
+     */
+    private function getMessages(QueueInterface $queue, $count)
+    {
+        $messages = [];
+        for ($i = $count; $i > 0; $i--) {
+            $message = $queue->dequeue();
+            if ($message === null) {
+                break;
+            }
+            $messages[] = $message;
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Decode provided messages.
+     *
+     * @param EnvelopeInterface[] $messages
+     * @return object[]
+     */
+    private function decodeMessages(array $messages)
+    {
+        $decodedMessages = [];
+        foreach ($messages as $messageId => $message) {
+            $properties = $message->getProperties();
+            $topicName = $properties['topic_name'];
+            $decodedMessages[$topicName][$messageId] = $this->messageEncoder->decode($topicName, $message->getBody());
+        }
+
+        return $decodedMessages;
+    }
+
+    /**
+     * Get transaction callback.
+     *
+     * @param QueueInterface $queue
+     * @param MergerInterface $merger
+     * @return \Closure
+     */
+    private function getTransactionCallback(QueueInterface $queue, MergerInterface $merger)
+    {
+        return function (array $messages) use ($queue, $merger) {
+            list($messages, $messagesToAcknowledge) = $this->lockMessages($messages);
+            $decodedMessages = $this->decodeMessages($messages);
+            $mergedMessages = $merger->merge($decodedMessages);
+            $messageProcessor = $this->messageProcessorLoader->load($mergedMessages);
+            $messageProcessor->process(
+                $queue,
+                $this->configuration,
+                $messages,
+                $messagesToAcknowledge,
+                $mergedMessages
+            );
+        };
+    }
+
+    /**
+     * Create lock for the messages.
+     *
+     * @param array $messages
+     * @return array
+     */
+    private function lockMessages(array $messages)
+    {
+        $toProcess = [];
+        $toAcknowledge = [];
+        foreach ($messages as $message) {
+            try {
+                $this->getMessageController()->lock($message, $this->configuration->getConsumerName());
+                $toProcess[] = $message;
+            } catch (MessageLockException $exception) {
+                $toAcknowledge[] = $message;
+            }
+        }
+        return [$toProcess, $toAcknowledge];
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * This getter serves as a workaround to add this dependency to this class without breaking constructor structure
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get message controller.
+     *
+     * This getter serves as a workaround to add this dependency to this class without breaking constructor structure
+     *
+     * @return MessageController
+     *
+     * @deprecated 100.1.0
+     */
+    private function getMessageController()
+    {
+        if ($this->messageController === null) {
+            $this->messageController = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\MessageQueue\MessageController::class);
+        }
+        return $this->messageController;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
new file mode 100644
index 0000000000000..47775ac857b07
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+class ExchangeFactory implements ExchangeFactoryInterface
+{
+    /**
+     * @var ExchangeFactoryInterface[]
+     */
+    private $exchangeFactories;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     * @since 100.2.0
+     */
+    protected $objectManager = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\ConnectionTypeResolver $connectionTypeResolver
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ExchangeFactoryInterface[] $exchangeFactories
+     * @since 100.2.0
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\ConnectionTypeResolver $connectionTypeResolver,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        array $exchangeFactories = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->exchangeFactories = $exchangeFactories;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = [])
+    {
+        $connectionType = $this->connectionTypeResolver->getConnectionType($connectionName);
+
+        if (!isset($this->exchangeFactories[$connectionType])) {
+            throw new \LogicException("Not found exchange for connection name '{$connectionName}' in config");
+        }
+
+        $factory = $this->exchangeFactories[$connectionType];
+        $exchange = $factory->create($connectionName, $data);
+
+        if (!$exchange instanceof ExchangeInterface) {
+            $exchangeInterface = \Magento\Framework\MessageQueue\Bulk\ExchangeInterface::class;
+            throw new \LogicException(
+                "Exchange for connection name '{$connectionName}' " .
+                "does not implement interface '{$exchangeInterface}'"
+            );
+        }
+        return $exchange;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
new file mode 100644
index 0000000000000..dc691e632c9ed
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Bulk\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ExchangeFactoryInterface
+{
+    /**
+     * Create exchange instance.
+     *
+     * @param string $connectionName
+     * @param array $data
+     * @return ExchangeInterface
+     * @throws \LogicException If exchange is not defined for the specified connection type
+     *                          or it doesn't implement ExchangeInterface
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = []);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
new file mode 100644
index 0000000000000..08b64689c2940
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Interface for bulk exchange.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ExchangeInterface
+{
+    /**
+     * Send messages in bulk to the queue.
+     *
+     * @param string $topic
+     * @param \Magento\Framework\MessageQueue\EnvelopeInterface[] $envelopes
+     * @return mixed
+     * @since 100.2.0
+     */
+    public function enqueue($topic, array $envelopes);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeRepository.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeRepository.php
new file mode 100644
index 0000000000000..dee0ba72c39e2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeRepository.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Used to get exchange instance from the pool.
+ */
+class ExchangeRepository
+{
+    /**
+     * @var ExchangeFactoryInterface
+     */
+    private $exchangeFactory;
+
+    /**
+     * Pool of exchange instances.
+     *
+     * @var ExchangeInterface[]
+     */
+    private $exchangePool = [];
+
+    /**
+     * @param ExchangeFactoryInterface $exchangeFactory
+     */
+    public function __construct(ExchangeFactoryInterface $exchangeFactory)
+    {
+        $this->exchangeFactory = $exchangeFactory;
+    }
+
+    /**
+     * Get exchange from the pool for the specified connection type.
+     *
+     * @param string $connectionName
+     * @return ExchangeInterface
+     * @throws \LogicException
+     */
+    public function getByConnectionName($connectionName)
+    {
+        if (!isset($this->exchangePool[$connectionName])) {
+            $exchange = $this->exchangeFactory->create($connectionName);
+            $this->exchangePool[$connectionName] = $exchange;
+        }
+        return $this->exchangePool[$connectionName];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/Publisher.php
new file mode 100644
index 0000000000000..7b71cc451b800
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/Publisher.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * A MessageQueue Publisher to handle publishing messages in bulk.
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     * @param PublisherConfig $publisherConfig
+     * @param \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator,
+        PublisherConfig $publisherConfig,
+        \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+        $this->publisherConfig = $publisherConfig;
+        $this->messageIdGenerator = $messageIdGenerator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function publish($topicName, $data)
+    {
+        $envelopes = [];
+        foreach ($data as $message) {
+            $this->messageValidator->validate($topicName, $message);
+            $message = $this->messageEncoder->encode($topicName, $message);
+            $envelopes[] = $this->envelopeFactory->create(
+                [
+                    'body' => $message,
+                    'properties' => [
+                        'delivery_mode' => 2,
+                        'message_id' => $this->messageIdGenerator->generate($topicName),
+                    ]
+                ]
+            );
+        }
+        $publisher = $this->publisherConfig->getPublisher($topicName);
+        $connectionName = $publisher->getConnection()->getName();
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        $exchange->enqueue($topicName, $envelopes);
+        return null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/Rpc/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/Rpc/Publisher.php
new file mode 100644
index 0000000000000..d7570c26bfad9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/Rpc/Publisher.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk\Rpc;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\Bulk\ExchangeRepository;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * A MessageQueue Publisher to handle publishing a message.
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     * @param ResponseQueueNameBuilder $responseQueueNameBuilder
+     * @param PublisherConfig $publisherConfig
+     * @param \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator,
+        ResponseQueueNameBuilder $responseQueueNameBuilder,
+        PublisherConfig $publisherConfig,
+        \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+        $this->responseQueueNameBuilder = $responseQueueNameBuilder;
+        $this->publisherConfig = $publisherConfig;
+        $this->messageIdGenerator = $messageIdGenerator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function publish($topicName, $data)
+    {
+        $envelopes = [];
+        $replyTo = $this->responseQueueNameBuilder->getQueueName($topicName);
+        foreach ($data as $message) {
+            $this->messageValidator->validate($topicName, $message);
+            $message = $this->messageEncoder->encode($topicName, $message);
+            $envelope = $this->envelopeFactory->create(
+                [
+                    'body' => $message,
+                    'properties' => [
+                        'reply_to' => $replyTo,
+                        'delivery_mode' => 2,
+                        'correlation_id' => rand(),
+                        'message_id' => $this->messageIdGenerator->generate($topicName),
+                    ]
+                ]
+            );
+            $envelopes[] = $envelope;
+        }
+        $publisher = $this->publisherConfig->getPublisher($topicName);
+        $connectionName = $publisher->getConnection()->getName();
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        return $exchange->enqueue($topicName, $envelopes);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/BulkPublisherInterface.php b/lib/internal/Magento/Framework/MessageQueue/BulkPublisherInterface.php
new file mode 100644
index 0000000000000..459966b2c91b8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/BulkPublisherInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Producer to publish messages in bulk via a specific transport to a specific queue or exchange.
+ */
+interface BulkPublisherInterface
+{
+    /**
+     * Publishes messages in bulk to a specific queue or exchange.
+     *
+     * @param string $topicName
+     * @param array|object $data
+     * @return null|mixed
+     */
+    public function publish($topicName, $data);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
new file mode 100644
index 0000000000000..cb80bc4becaec
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class CallbackInvoker to invoke callbacks for consumer classes
+ */
+class CallbackInvoker
+{
+    /**
+     * Run short running process
+     *
+     * @param QueueInterface $queue
+     * @param int $maxNumberOfMessages
+     * @param \Closure $callback
+     * @return void
+     */
+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
+    {
+        for ($i = $maxNumberOfMessages; $i > 0; $i--) {
+            do {
+                $message = $queue->dequeue();
+            } while ($message === null && (sleep(1) === 0));
+            $callback($message);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
new file mode 100644
index 0000000000000..6219dbf29b14c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+
+/**
+ * Remote service configuration reader.
+ */
+class Communication implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var ObjectManagerConfig
+     */
+    private $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $dataGenerator;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ObjectManagerConfig $objectManagerConfig
+     * @param ReflectionGenerator $dataGenerator
+     * @param ServiceMethodsMap $serviceMethodsMap
+     */
+    public function __construct(
+        ObjectManagerConfig $objectManagerConfig,
+        ReflectionGenerator $dataGenerator,
+        ServiceMethodsMap $serviceMethodsMap
+    ) {
+        $this->objectManagerConfig = $objectManagerConfig;
+        $this->dataGenerator = $dataGenerator;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+    }
+
+    /**
+     * Generate communication configuration based on remote services declarations in di.xml
+     *
+     * @param string|null $scope
+     * @return array
+     * @throws \LogicException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function read($scope = null)
+    {
+        $preferences = $this->objectManagerConfig->getPreferences();
+        $remoteServices = [];
+        foreach ($preferences as $type => $preference) {
+            if ($preference == $type . RemoteServiceGenerator::REMOTE_SERVICE_SUFFIX) {
+                $remoteServices[$type] = $preference;
+            }
+        }
+        $result = [];
+        foreach ($remoteServices as $serviceInterface => $remoteImplementation) {
+            try {
+                $methodsMap = $this->serviceMethodsMap->getMethodsMap($serviceInterface);
+            } catch (\Exception $e) {
+                throw new \LogicException(sprintf('Service interface was expected, "%s" given', $serviceInterface));
+            }
+            foreach ($methodsMap as $methodName => $returnType) {
+                $topicName = $this->dataGenerator->generateTopicName($serviceInterface, $methodName);
+                $result[$topicName] = $this->dataGenerator->generateTopicConfigForServiceMethod(
+                    $topicName,
+                    $serviceInterface,
+                    $methodName
+                );
+                $result[$topicName][CommunicationConfig::TOPIC_HANDLERS] = [];
+            }
+        }
+        return [CommunicationConfig::TOPICS => $result];
+    }
+
+    /**
+     * Generate topic name based on service type and method name.
+     *
+     * Perform the following conversion:
+     * \Magento\Customer\Api\RepositoryInterface + getById => magento.customer.api.repositoryInterface.getById
+     *
+     * @param string $typeName
+     * @param string $methodName
+     * @return string
+     *
+     * @deprecated 100.2.0
+     * @see \Magento\Framework\Communication\Config\ReflectionGenerator::generateTopicName
+     */
+    public function generateTopicName($typeName, $methodName)
+    {
+        return $this->dataGenerator->generateTopicName($typeName, $methodName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
new file mode 100644
index 0000000000000..9412e1c2384f0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Remote service configuration reader.
+ *
+ * @deprecated 100.2.0
+ */
+class MessageQueue implements \Magento\Framework\Config\ReaderInterface
+{
+    const DEFAULT_PUBLISHER = 'default';
+    const DEFAULT_CONNECTION = 'amqp';
+    const DEFAULT_EXCHANGE = 'magento';
+
+    /**
+     * @var Communication
+     */
+    private $communicationReader;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Communication $communicationReader
+     */
+    public function __construct(
+        Communication $communicationReader
+    ) {
+        $this->communicationReader = $communicationReader;
+    }
+
+    /**
+     * Generate communication configuration based on remote services declarations in di.xml
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $remoteServiceTopics = $this->communicationReader->read($scope);
+        $queueTopics = [];
+        $queueBinds = [];
+        $queueExchangeTopicToQueueMap = [];
+        foreach ($remoteServiceTopics[CommunicationConfig::TOPICS] as $topicName => $communicationConfig) {
+            $queueTopics[$topicName] = [
+                QueueConfig::TOPIC_NAME => $topicName,
+                QueueConfig::TOPIC_SCHEMA => [
+                    QueueConfig::TOPIC_SCHEMA_TYPE => QueueConfig::TOPIC_SCHEMA_TYPE_METHOD,
+                    QueueConfig::TOPIC_SCHEMA_VALUE => $communicationConfig[CommunicationConfig::TOPIC_REQUEST]
+                ],
+                QueueConfig::TOPIC_RESPONSE_SCHEMA => [
+                    QueueConfig::TOPIC_SCHEMA_TYPE => isset($communicationConfig[CommunicationConfig::TOPIC_RESPONSE])
+                        ? QueueConfig::TOPIC_SCHEMA_TYPE_OBJECT
+                        : null,
+                    QueueConfig::TOPIC_SCHEMA_VALUE => $communicationConfig[CommunicationConfig::TOPIC_RESPONSE]
+                ],
+                QueueConfig::TOPIC_PUBLISHER => self::DEFAULT_PUBLISHER
+            ];
+
+            $queueName = 'queue.' . $topicName;
+            $queueBinds[$topicName . '--' . self::DEFAULT_EXCHANGE . '--' . $queueName] = [
+                QueueConfig::BIND_TOPIC => $topicName,
+                QueueConfig::BIND_EXCHANGE => self::DEFAULT_EXCHANGE,
+                QueueConfig::BIND_QUEUE => $queueName,
+            ];
+
+            $queueExchangeTopicToQueueMap[self::DEFAULT_EXCHANGE . '--' . $topicName] = [$queueName];
+        }
+        $queuePublishers = [
+            self::DEFAULT_PUBLISHER => [
+                QueueConfig::PUBLISHER_NAME => self::DEFAULT_PUBLISHER,
+                QueueConfig::PUBLISHER_CONNECTION => self::DEFAULT_CONNECTION,
+                QueueConfig::PUBLISHER_EXCHANGE => self::DEFAULT_EXCHANGE
+            ]
+        ];
+        return [
+            QueueConfig::PUBLISHERS => $queuePublishers,
+            QueueConfig::TOPICS => $queueTopics,
+            QueueConfig::CONSUMERS => [],
+            QueueConfig::BINDS => $queueBinds,
+            QueueConfig::EXCHANGE_TOPIC_TO_QUEUES_MAP => $queueExchangeTopicToQueueMap,
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
new file mode 100644
index 0000000000000..0cd62963c547c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+use Magento\Framework\Code\Generator\DefinedClasses;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\Communication as RemoteServiceReader;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Zend\Code\Reflection\MethodReflection;
+
+/**
+ * Code generator for remote services.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class RemoteServiceGenerator extends \Magento\Framework\Code\Generator\EntityAbstract
+{
+    const ENTITY_TYPE = 'remote';
+    const REMOTE_SERVICE_SUFFIX = 'Remote';
+
+    /**
+     * @var CommunicationConfig
+     */
+    protected $communicationConfig;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CommunicationConfig $communicationConfig
+     * @param ServiceMethodsMap $serviceMethodsMap
+     * @param RemoteServiceReader $communicationRemoteServiceReader
+     * @param string|null $sourceClassName
+     * @param string|null $resultClassName
+     * @param Io $ioObject
+     * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
+     * @param DefinedClasses $definedClasses
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        CommunicationConfig $communicationConfig,
+        ServiceMethodsMap $serviceMethodsMap,
+        RemoteServiceReader $communicationRemoteServiceReader,
+        $sourceClassName = null,
+        $resultClassName = null,
+        Io $ioObject = null,
+        \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator = null,
+        DefinedClasses $definedClasses = null
+    ) {
+        $this->communicationConfig = $communicationConfig;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+        parent::__construct(
+            $sourceClassName,
+            $resultClassName,
+            $ioObject,
+            $classGenerator,
+            $definedClasses
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getDefaultConstructorDefinition()
+    {
+        return [
+            'name' => '__construct',
+            'parameters' => [
+                ['name' => 'publisher', 'type' => '\\' . \Magento\Framework\MessageQueue\PublisherInterface::class],
+            ],
+            'body' => "\$this->publisher = \$publisher;",
+            'docblock' => [
+                'shortDescription' => 'Initialize dependencies.',
+                'tags' => [
+                    [
+                        'name' => 'param',
+                        'description' => '\Magento\Framework\MessageQueue\PublisherInterface $publisher',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getClassProperties()
+    {
+        return [
+            [
+                'name' => 'publisher',
+                'visibility' => 'protected',
+                'docblock' => [
+                    'shortDescription' => 'Publisher',
+                    'tags' => [
+                        [
+                            'name' => 'var',
+                            'description' => '\\' . \Magento\Framework\MessageQueue\PublisherInterface::class,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getClassMethods()
+    {
+        $methods = [$this->_getDefaultConstructorDefinition()];
+        $interfaceMethodsMap = $this->serviceMethodsMap->getMethodsMap($this->getSourceClassName());
+        foreach (array_keys($interfaceMethodsMap) as $methodName) {
+            // Uses Zend Reflection instead MethodsMap service, because second does not support features of PHP 7.x
+            $methodReflection = new MethodReflection($this->getSourceClassName(), $methodName);
+            $sourceMethodParameters = $methodReflection->getParameters();
+            $methodParameters = [];
+            $topicParameters = [];
+            /** @var \Zend\Code\Reflection\ParameterReflection $methodParameter */
+            foreach ($sourceMethodParameters as $methodParameter) {
+                $parameterName = $methodParameter->getName();
+                $parameter = [
+                    'name' => $parameterName,
+                    'type' => $methodParameter->getType(),
+                ];
+                if ($methodParameter->isDefaultValueAvailable()) {
+                    $parameter['defaultValue'] = $methodParameter->getDefaultValue() !== null
+                        ? $methodParameter->getDefaultValue() : $this->_getNullDefaultValue();
+                }
+                $methodParameters[] = $parameter;
+                $topicParameters[] = "'{$parameterName}' => \${$parameterName}";
+            }
+            $topicName = $this->getReflectionGenerator()->generateTopicName($this->getSourceClassName(), $methodName);
+            $topicConfig = $this->communicationConfig->getTopic($topicName);
+            $methodBody = $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] ? 'return ' : '';
+            $methodBody .= "\$this->publisher->publish(\n"
+                . "    '{$topicName}',\n"
+                . "    [" . implode(', ', $topicParameters) . "]\n"
+                . ");";
+            $annotations = [['name' => 'inheritdoc']];
+            $method = [
+                'name' => $methodName,
+                'returnType' => $methodReflection->getReturnType(),
+                'parameters' => $methodParameters,
+                'body' => $methodBody,
+                'docblock' => ['tags' => $annotations],
+            ];
+            $methods[] = $method;
+        }
+        return $methods;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _validateData()
+    {
+        $classNameValidationResults = $this->validateResultClassName();
+        return parent::_validateData() && $classNameValidationResults;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _generateCode()
+    {
+        $this->_classGenerator->setImplementedInterfaces([$this->getSourceClassName()]);
+        return parent::_generateCode();
+    }
+
+    /**
+     * Ensure that result class name corresponds to the source class name.
+     *
+     * @return bool
+     */
+    protected function validateResultClassName()
+    {
+        $result = true;
+        $sourceClassName = $this->getSourceClassName();
+        $resultClassName = $this->_getResultClassName();
+        $interfaceSuffix = 'Interface';
+        if (substr($sourceClassName, -strlen($interfaceSuffix)) !== $interfaceSuffix) {
+            $this->_addError(
+                sprintf(
+                    'Remote service class "%s" should be set as preference for an interface, "%s" given',
+                    $resultClassName,
+                    $sourceClassName
+                )
+            );
+        }
+        $expectedResultClassName = $sourceClassName . self::REMOTE_SERVICE_SUFFIX;
+        if ($resultClassName !== $expectedResultClassName) {
+            $this->_addError(
+                'Invalid remote service class name [' . $resultClassName . ']. Use ' . $expectedResultClassName
+            );
+            $result = false;
+        }
+        return $result;
+    }
+
+    /**
+     * Get reflection generator.
+     *
+     * @return ReflectionGenerator
+     *
+     * @deprecated 100.2.0
+     */
+    private function getReflectionGenerator()
+    {
+        if ($this->reflectionGenerator === null) {
+            $this->reflectionGenerator = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ReflectionGenerator::class);
+        }
+        return $this->reflectionGenerator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config.php b/lib/internal/Magento/Framework/MessageQueue/Config.php
new file mode 100644
index 0000000000000..9a925e1417c12
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Queue configuration.
+ *
+ * @deprecated 100.2.0
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Data
+     */
+    protected $queueConfigData;
+
+    /**
+     * @param Config\Data $queueConfigData
+     */
+    public function __construct(Config\Data $queueConfigData)
+    {
+        $this->queueConfigData = $queueConfigData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExchangeByTopic($topicName)
+    {
+        $publisherConfig = $this->getPublisherConfigByTopic($topicName);
+        return $publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE] ?? null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getQueuesByTopic($topic)
+    {
+        $publisherConfig = $this->getPublisherConfigByTopic($topic);
+        $exchange = isset($publisherConfig[ConfigInterface::PUBLISHER_NAME])
+            ? $publisherConfig[ConfigInterface::PUBLISHER_NAME]
+            : null;
+        /**
+         * Exchange should be taken into account here to avoid retrieving queues, related to another exchange,
+         * which is not currently associated with topic, but is configured in binds
+         */
+        $bindKey = $exchange . '--' . $topic;
+        $output = $this->queueConfigData->get(ConfigInterface::EXCHANGE_TOPIC_TO_QUEUES_MAP . '/' . $bindKey);
+        if (!$output) {
+            throw new LocalizedException(
+                new Phrase(
+                    'No bindings configured for the "%topic" topic at "%exchange" exchange.',
+                    ['topic' => $topic, 'exchange' => $exchange]
+                )
+            );
+        }
+        return $output;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConnectionByTopic($topic)
+    {
+        try {
+            $publisherConfig = $this->getPublisherConfigByTopic($topic);
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            return null;
+        }
+        return $publisherConfig[ConfigInterface::PUBLISHER_CONNECTION] ?? null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConnectionByConsumer($consumer)
+    {
+        $connection = $this->queueConfigData->get(
+            ConfigInterface::CONSUMERS . '/'. $consumer . '/'. ConfigInterface::CONSUMER_CONNECTION
+        );
+        if (!$connection) {
+            throw new LocalizedException(
+                new Phrase('Consumer "%consumer" has not connection.', ['consumer' => $consumer])
+            );
+        }
+        return $connection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMessageSchemaType($topic)
+    {
+        return $this->queueConfigData->get(
+            ConfigInterface::TOPICS . '/' .
+            $topic . '/' . ConfigInterface::TOPIC_SCHEMA . '/' . ConfigInterface::TOPIC_SCHEMA_TYPE
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConsumerNames()
+    {
+        $queueConfig = $this->queueConfigData->get(ConfigInterface::CONSUMERS, []);
+        return array_keys($queueConfig);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConsumer($name)
+    {
+
+        return $this->queueConfigData->get(ConfigInterface::CONSUMERS . '/' . $name);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getBinds()
+    {
+        return $this->queueConfigData->get(ConfigInterface::BINDS, []);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPublishers()
+    {
+        return $this->queueConfigData->get(ConfigInterface::PUBLISHERS, []);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConsumers()
+    {
+        return $this->queueConfigData->get(ConfigInterface::CONSUMERS, []);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTopic($name)
+    {
+        return $this->queueConfigData->get(ConfigInterface::TOPICS . '/' . $name);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPublisher($name)
+    {
+        return $this->queueConfigData->get(ConfigInterface::PUBLISHERS . '/' . $name);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getResponseQueueName($topicName)
+    {
+        return ConfigInterface::RESPONSE_QUEUE_PREFIX . str_replace('-', '_', $topicName);
+    }
+
+    /**
+     * Get publisher config by topic
+     *
+     * @param string $topicName
+     * @return array|mixed|null
+     * @throws LocalizedException
+     */
+    protected function getPublisherConfigByTopic($topicName)
+    {
+        $publisherName = $this->queueConfigData->get(
+            ConfigInterface::TOPICS . '/' . $topicName . '/' . ConfigInterface::TOPIC_PUBLISHER
+        );
+
+        if (!$publisherName) {
+            throw new LocalizedException(
+                new Phrase('Message queue topic "%topic" is not configured.', ['topic' => $topicName])
+            );
+        }
+
+        $publisherConfig = $this->queueConfigData->get(ConfigInterface::PUBLISHERS . '/' . $publisherName);
+        if (!$publisherConfig) {
+            throw new LocalizedException(
+                new Phrase(
+                    'Message queue publisher "%publisher" is not configured.',
+                    ['publisher' => $publisherName]
+                )
+            );
+        }
+        return $publisherConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
new file mode 100644
index 0000000000000..86e83d678c0b0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config;
+
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Composite reader for communication config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param array $readers
+     */
+    public function __construct(array $readers)
+    {
+        $this->readers = [];
+        $readers = $this->sortReaders($readers);
+        foreach ($readers as $name => $readerInfo) {
+            if (!isset($readerInfo['reader']) || !($readerInfo['reader'] instanceof ReaderInterface)) {
+                throw new \InvalidArgumentException(
+                    new Phrase(
+                        'Reader [%name] must implement Magento\Framework\Config\ReaderInterface',
+                        ['name' => $name]
+                    )
+                );
+            }
+            $this->readers[] = $readerInfo['reader'];
+        }
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+        return $result;
+    }
+
+    /**
+     * Sort readers according to param 'sortOrder'
+     *
+     * @param array $readers
+     * @return array
+     */
+    private function sortReaders(array $readers)
+    {
+        usort(
+            $readers,
+            function ($firstItem, $secondItem) {
+                $firstValue = 0;
+                $secondValue = 0;
+                if (isset($firstItem['sortOrder'])) {
+                    $firstValue = (int)$firstItem['sortOrder'];
+                }
+                if (isset($secondItem['sortOrder'])) {
+                    $secondValue = (int)$secondItem['sortOrder'];
+                }
+                return $firstValue <=> $secondValue;
+            }
+        );
+        return $readers;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
new file mode 100644
index 0000000000000..c791baf4deb66
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Consumer;
+
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Consumer\Config\CompositeReader as ConsumerConfigCompositeReader;
+
+/**
+ * Plugin which provides access to consumers declared in queue config using consumer config interface.
+ *
+ * @deprecated 100.2.0
+ */
+class ConfigReaderPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ConfigInterface $config
+     */
+    public function __construct(ConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Read values from queue config and make them available via consumer config.
+     *
+     * @param ConsumerConfigCompositeReader $subject
+     * @param array $result
+     * @param string|null $scope
+     * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRead(ConsumerConfigCompositeReader $subject, $result, $scope = null)
+    {
+        return array_merge($this->getConsumerConfigDataFromQueueConfig(), $result);
+    }
+
+    /**
+     * Get data from queue config in format compatible with consumer config data internal structure.
+     *
+     * @return array
+     */
+    private function getConsumerConfigDataFromQueueConfig()
+    {
+        $result = [];
+
+        foreach ($this->config->getConsumers() as $consumerData) {
+            $consumerName = $consumerData['name'];
+            $handlers = [];
+
+            foreach ($consumerData['handlers'] as $topicHandlers) {
+                foreach ($topicHandlers as $handlerConfig) {
+                    $handlers[] = $handlerConfig;
+                }
+            }
+
+            $result[$consumerName] = [
+                'name' => $consumerName,
+                'queue' => $consumerData['queue'],
+                'consumerInstance' => $consumerData['instance_type'],
+                'handlers' => $handlers,
+                'connection' => $consumerData['connection'],
+                'maxMessages' => $consumerData['max_messages']
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Config/Data.php
new file mode 100644
index 0000000000000..03e01eda5ecd9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Data.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Class for access to MessageQueue configuration data.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * Data constructor
+     *
+     * @param CompositeReader $reader
+     * @param \Magento\Framework\Config\CacheInterface $cache
+     * @param Reader\Env $envReader
+     * @param Reader\Env\Validator $envValidator
+     * @param string|null $cacheId
+     * @param SerializerInterface|null $serializer
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\Config\CompositeReader $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        \Magento\Framework\MessageQueue\Config\Reader\Env $envReader,
+        \Magento\Framework\MessageQueue\Config\Reader\Env\Validator $envValidator,
+        $cacheId = 'message_queue_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+        $envValidator->validate($envReader->read(), $this->get());
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
new file mode 100644
index 0000000000000..78b82a67069bf
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Publisher;
+
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeReader as PublisherConfigCompositeReader;
+
+/**
+ * Plugin which provides access to publishers declared in queue config using publisher config interface.
+ *
+ * @deprecated 100.2.0
+ */
+class ConfigReaderPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ConfigInterface $config
+     */
+    public function __construct(ConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Read values from queue config and make them available via publisher config
+     *
+     * @param PublisherConfigCompositeReader $subject
+     * @param array $result
+     * @param string|null $scope
+     * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRead(PublisherConfigCompositeReader $subject, $result, $scope = null)
+    {
+        return array_merge($this->getPublisherConfigDataFromQueueConfig(), $result);
+    }
+
+    /**
+     * Get data from queue config in format compatible with publisher config data internal structure
+     *
+     * @return array
+     */
+    private function getPublisherConfigDataFromQueueConfig()
+    {
+        $result = [];
+
+        foreach ($this->config->getBinds() as $bindingConfig) {
+            $topic = $bindingConfig['topic'];
+            $result[$topic] = [
+                'topic' => $topic,
+                'connection' => [
+                    'name' => $this->config->getConnectionByTopic($topic),
+                    'exchange' => $bindingConfig['exchange'],
+                    'disabled' => false
+                ],
+                'disabled' => false
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
new file mode 100644
index 0000000000000..52e97e80e9dff
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\MessageQueue\Config\Reader\Env\Converter\Publisher as PublisherConverter;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Communication configuration reader. Reads data from env.php.
+ */
+class Env implements \Magento\Framework\Config\ReaderInterface
+{
+    const ENV_QUEUE  = 'queue';
+    const ENV_PUBLISHERS  = 'publishers';
+    const ENV_TOPICS = 'topics';
+    const ENV_CONSUMERS = 'consumers';
+    const ENV_CONSUMER_CONNECTION = 'connection';
+    const ENV_CONSUMER_MAX_MESSAGES = 'max_messages';
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var PublisherConverter
+     */
+    private $publisherConverter;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param PublisherConverter|null $publisherConverter
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig,
+        PublisherConverter $publisherConverter = null
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->publisherConverter = $publisherConverter ?: ObjectManager::getInstance()->get(PublisherConverter::class);
+    }
+
+    /**
+     * Read communication configuration from env.php
+     *
+     * @param string|null $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $configData = $this->deploymentConfig->getConfigData(self::ENV_QUEUE) ?: [];
+        if (isset($configData['config'])) {
+            $configData = $this->publisherConverter->convert($configData = $configData['config']);
+        }
+        return $configData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php
new file mode 100644
index 0000000000000..3ea96bd577ef3
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Config\Reader\Env\Converter;
+
+/**
+ * Converts publisher related data from env.php to MessageQueue config array
+ */
+class Publisher implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * Mapping between connection name and default exchange value
+     * @var array
+     */
+    private $connectionToExchangeMap;
+
+    /**
+     * @param array $connectionToExchangeMap
+     */
+    public function __construct(
+        $connectionToExchangeMap = []
+    ) {
+        $this->connectionToExchangeMap = $connectionToExchangeMap;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function convert($source)
+    {
+        $publishersConfig = isset($source[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_PUBLISHERS])
+            ? $source[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_PUBLISHERS]
+            : [];
+        $connections = [];
+        if (!empty($publishersConfig)) {
+            foreach ($publishersConfig as $configuration) {
+                if (isset($configuration['connections'])) {
+                    $publisherData = [];
+                    foreach ($configuration['connections'] as $connectionName => $config) {
+                        if (isset($this->connectionToExchangeMap[$connectionName])) {
+                            $publisherName = $connectionName . '-' . $this->connectionToExchangeMap[$connectionName];
+                            $config['connection'] = $config['name'];
+                            $config['name'] = $publisherName;
+                            $publisherData[$publisherName] = $config;
+                            $connections = array_replace_recursive($connections, $publisherData);
+                        }
+                    }
+                }
+            }
+            $source[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_PUBLISHERS] = $connections;
+        }
+        return $source;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
new file mode 100644
index 0000000000000..43f788343fa88
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader\Env;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\MessageQueue\Config\Validator as ConfigValidator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+
+/**
+ * Communication configuration validator. Validates data, that have been read from env.php.
+ */
+class Validator extends ConfigValidator
+{
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param TypeProcessor $typeProcessor
+     * @param MethodsMap $methodsMap
+     */
+    public function __construct(
+        TypeProcessor $typeProcessor,
+        MethodsMap $methodsMap
+    ) {
+        $this->methodsMap = $methodsMap;
+        parent::__construct($typeProcessor, $methodsMap);
+    }
+
+    /**
+     * Validate config data
+     *
+     * @param array $configData
+     * @param array|null $xmlConfigData
+     * @return void
+     */
+    public function validate($configData, array $xmlConfigData = [])
+    {
+        if (isset($configData[QueueConfig::TOPICS])) {
+            foreach ($configData[QueueConfig::TOPICS] as $topicName => $configDataItem) {
+                $schemaType = $configDataItem[QueueConfig::TOPIC_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+                $responseSchemaType =
+                    $configDataItem[QueueConfig::TOPIC_RESPONSE_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+                $publisherName = $configDataItem[QueueConfig::TOPIC_PUBLISHER];
+                $this->validateSchemaType($schemaType, $topicName);
+                $this->validateResponseSchemaType($responseSchemaType, $topicName);
+                $this->validateTopicPublisher(
+                    $this->getAvailablePublishers($configData, $xmlConfigData),
+                    $publisherName,
+                    $topicName
+                );
+            }
+        }
+        if (isset($configData[QueueConfig::CONSUMERS])) {
+            foreach ($configData[QueueConfig::CONSUMERS] as $consumerName => $configDataItem) {
+                $handlers = isset($configDataItem[QueueConfig::CONSUMER_HANDLERS])
+                    ? $configDataItem[QueueConfig::CONSUMER_HANDLERS] : [];
+                foreach ($handlers as $handler) {
+                    $this->validateHandlerType(
+                        $handler[QueueConfig::CONSUMER_CLASS],
+                        $handler[QueueConfig::CONSUMER_METHOD],
+                        $consumerName
+                    );
+                }
+            }
+        }
+        if (isset($configData[QueueConfig::BINDS])) {
+            foreach ($configData[QueueConfig::BINDS] as $configDataItem) {
+                $this->validateBindTopic(
+                    $this->getAvailableTopics($configData, $xmlConfigData),
+                    $configDataItem[QueueConfig::BIND_TOPIC]
+                );
+            }
+        }
+    }
+
+    /**
+     * Return all available publishers from xml and env configs
+     *
+     * @param array $configData
+     * @param array $xmlConfigData
+     * @return array
+     */
+    private function getAvailablePublishers($configData, $xmlConfigData)
+    {
+        $envConfigPublishers = isset($configData[QueueConfig::PUBLISHERS]) ? $configData[QueueConfig::PUBLISHERS] : [];
+        $xmlConfigPublishers = isset($xmlConfigData[QueueConfig::PUBLISHERS])
+            ? $xmlConfigData[QueueConfig::PUBLISHERS] : [];
+        return array_unique(
+            array_merge(
+                array_keys($xmlConfigPublishers),
+                array_keys($envConfigPublishers)
+            )
+        );
+    }
+
+    /**
+     * Return all available topics from xml and env configs
+     *
+     * @param array $configData
+     * @param array $xmlConfigData
+     * @return array
+     */
+    private function getAvailableTopics($configData, $xmlConfigData)
+    {
+        $envConfigTopics = isset($configData[QueueConfig::TOPICS]) ? $configData[QueueConfig::TOPICS] : [];
+        $xmlConfigTopics = isset($xmlConfigData[QueueConfig::TOPICS]) ? $xmlConfigData[QueueConfig::TOPICS] : [];
+        return array_unique(
+            array_merge(
+                array_keys($xmlConfigTopics),
+                array_keys($envConfigTopics)
+            )
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
new file mode 100644
index 0000000000000..16efacf628d57
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Config\Reader;
+
+/**
+ * MessageQueue configuration filesystem loader. Loads all publisher configuration from XML file
+ *
+ * @deprecated 100.2.0
+ */
+class Xml extends \Magento\Framework\Config\Reader\Filesystem
+{
+    /**
+     * List of id attributes for merge
+     *
+     * @var array
+     */
+    protected $_idAttributes = [
+        '/config/publisher' => 'name',
+        '/config/consumer' => 'name',
+        '/config/topic' => 'name',
+        '/config/bind' => ['queue', 'exchange', 'topic'],
+        '/config/broker' => 'topic',
+        '/config/broker/consumer' => 'name'
+    ];
+
+    /**
+     * @param \Magento\Framework\Config\FileResolverInterface $fileResolver
+     * @param \Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter $converter
+     * @param \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator $schemaLocator
+     * @param \Magento\Framework\Config\ValidationStateInterface $validationState
+     * @param string $fileName
+     * @param array $idAttributes
+     * @param string $domDocumentClass
+     * @param string $defaultScope
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        \Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter $converter,
+        \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
new file mode 100644
index 0000000000000..0184f720b3b4e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader\Xml;
+
+use Magento\Framework\Config\ConverterInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Converts MessageQueue config from \DOMDocument to array
+ *
+ * @deprecated 100.2.0
+ */
+class CompositeConverter implements ConverterInterface
+{
+    /**
+     * @var ConverterInterface[]
+     */
+    private $converters;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param array $converters
+     */
+    public function __construct(array $converters)
+    {
+        $this->converters = [];
+        $converters = $this->sortConverters($converters);
+        foreach ($converters as $name => $converterInfo) {
+            if (!isset($converterInfo['converter']) || !($converterInfo['converter'] instanceof ConverterInterface)) {
+                throw new \InvalidArgumentException(
+                    new Phrase(
+                        'Converter [%name] must implement Magento\Framework\Config\ConverterInterface',
+                        ['name' => $name]
+                    )
+                );
+            }
+            $this->converters[] = $converterInfo['converter'];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function convert($source)
+    {
+        $result = [];
+        foreach ($this->converters as $converter) {
+            $result = array_replace_recursive($result, $converter->convert($source));
+        }
+        return $result;
+    }
+
+    /**
+     * Sort converters according to param 'sortOrder'
+     *
+     * @param array $converters
+     * @return array
+     */
+    private function sortConverters(array $converters)
+    {
+        usort(
+            $converters,
+            function ($firstItem, $secondItem) {
+                $firstValue = 0;
+                $secondValue = 0;
+                if (isset($firstItem['sortOrder'])) {
+                    $firstValue = (int)$firstItem['sortOrder'];
+                }
+                if (isset($secondItem['sortOrder'])) {
+                    $secondValue = (int)$secondItem['sortOrder'];
+                }
+                return $firstValue <=> $secondValue;
+            }
+        );
+        return $converters;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
new file mode 100644
index 0000000000000..e33d6ab5b1fb8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader\Xml\Converter;
+
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Config\Validator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+
+/**
+ * Converts MessageQueue config from \DOMDocument to array
+ *
+ * @deprecated 100.2.0
+ */
+class TopicConfig implements \Magento\Framework\Config\ConverterInterface
+{
+    const DEFAULT_TYPE = 'amqp';
+    const DEFAULT_EXCHANGE = 'magento';
+    const DEFAULT_INSTANCE = ConsumerInterface::class;
+
+    /**
+     * @var Validator
+     */
+    private $xmlValidator;
+
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MethodsMap $methodsMap
+     * @param Validator $xmlValidator
+     * @param CommunicationConfig $communicationConfig
+     */
+    public function __construct(
+        MethodsMap $methodsMap,
+        Validator $xmlValidator,
+        CommunicationConfig $communicationConfig
+    ) {
+        $this->methodsMap = $methodsMap;
+        $this->xmlValidator = $xmlValidator;
+        $this->communicationConfig = $communicationConfig;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function convert($source)
+    {
+        $topics = $this->extractTopics($source);
+        $topics = $this->processWildcard($topics);
+        $publishers = $this->buildPublishers($topics);
+        $binds = $this->buildBinds($topics);
+        $map = $this->buildExchangeTopicToQueue($topics);
+        $consumers = $this->buildConsumers($topics);
+        return [
+            ConfigInterface::TOPICS => $this->buildTopicsConfiguration($topics),
+            ConfigInterface::PUBLISHERS => $publishers,
+            ConfigInterface::BINDS => $binds,
+            ConfigInterface::CONSUMERS => $consumers,
+            ConfigInterface::EXCHANGE_TOPIC_TO_QUEUES_MAP => $map,
+        ];
+    }
+
+    /**
+     * Generate list of topics.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildTopicsConfiguration($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $topicDefinition = $this->communicationConfig->getTopic($topicName);
+            $schemaType =
+                $topicDefinition['request_type'] == CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS
+                    ? QueueConfig::TOPIC_SCHEMA_TYPE_OBJECT
+                    : QueueConfig::TOPIC_SCHEMA_TYPE_METHOD;
+            $schemaValue = $topicDefinition[CommunicationConfig::TOPIC_REQUEST];
+            $output[$topicName] = [
+                'name' => $topicName,
+                'schema' => [
+                    'schema_type' => $schemaType,
+                    'schema_value' => $schemaValue
+                ],
+                'response_schema' => [
+                    'schema_type' => isset($topicDefinition['response']) ? QueueConfig::TOPIC_SCHEMA_TYPE_OBJECT : null,
+                    'schema_value' => $topicDefinition['response']
+                ],
+                'is_synchronous' => $topicDefinition[CommunicationConfig::TOPIC_IS_SYNCHRONOUS],
+                'publisher' => $topicConfig['type'] . '-' . $topicConfig['exchange']
+            ];
+        }
+        return $output;
+    }
+
+    /**
+     * Generate consumers.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildConsumers($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $topic = $this->communicationConfig->getTopic($topicName);
+            foreach ($topicConfig['queues'] as $queueName => $queueConfig) {
+                $handlers = [];
+                foreach ($queueConfig['handlers'] as $handler) {
+                    if (!isset($handler[QueueConfig::CONSUMER_CLASS])) {
+                        $handlerExploded = explode('::', $handler);
+                        unset($handler);
+                        $handler[QueueConfig::CONSUMER_CLASS] = $handlerExploded[0];
+                        $handler[QueueConfig::CONSUMER_METHOD] = $handlerExploded[1];
+                    }
+                    $handlers[] = $handler;
+                }
+                $queueConfig['handlers'] = $handlers;
+
+                $output[$queueConfig['consumer']] = [
+                    'name' => $queueConfig['consumer'],
+                    'queue' => $queueName,
+                    'handlers' => [$topicName => $queueConfig['handlers']],
+                    'instance_type' => $queueConfig['consumerInstance'] != null
+                        ? $queueConfig['consumerInstance'] : self::DEFAULT_INSTANCE,
+                    'consumer_type' => $topic[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] ? 'sync' : 'async',
+                    'max_messages' => $queueConfig['maxMessages'],
+                    'connection' => $topicConfig['type']
+                ];
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Generate topics list based on wildcards.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function processWildcard($topics)
+    {
+        $topicDefinitions = $this->communicationConfig->getTopics();
+        $wildcardKeys = [];
+        $topicNames = array_keys($topics);
+        foreach ($topicNames as $topicName) {
+            if (strpos($topicName, '*') !== false || strpos($topicName, '#') !== false) {
+                $wildcardKeys[] = $topicName;
+            }
+        }
+        foreach (array_unique($wildcardKeys) as $wildcardKey) {
+            $pattern = $this->xmlValidator->buildWildcardPattern($wildcardKey);
+            foreach (array_keys($topicDefinitions) as $topicName) {
+                if (preg_match($pattern, $topicName)) {
+                    if (isset($topics[$topicName])) {
+                        $topics[$topicName] = array_merge($topics[$topicName], $topics[$wildcardKey]);
+                    } else {
+                        $topics[$topicName] = $topics[$wildcardKey];
+                    }
+                }
+            }
+            unset($topics[$wildcardKey]);
+        }
+        return $topics;
+    }
+
+    /**
+     * Generate publishers
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildPublishers($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicConfig) {
+            $publisherName = $topicConfig['type'] . '-' . $topicConfig['exchange'];
+            $output[$publisherName] = [
+                'name' => $publisherName,
+                'connection' => $topicConfig['type'],
+                'exchange' => $topicConfig['exchange']
+            ];
+        }
+        return $output;
+    }
+
+    /**
+     * Generate binds
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildBinds($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $queueNames = array_keys($topicConfig['queues']);
+            foreach ($queueNames as $queueName) {
+                $name = $topicName . '--' . $topicConfig['exchange']. '--' .$queueName;
+                $output[$name] = [
+                    'queue' => $queueName,
+                    'exchange' => $topicConfig['exchange'],
+                    'topic' => $topicName,
+                ];
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Generate topic-to-queues map.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildExchangeTopicToQueue($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $key = $topicConfig['type'] . '-' . $topicConfig['exchange'] . '--' . $topicName;
+            $queueNames = array_keys($topicConfig['queues']);
+            foreach ($queueNames as $queueName) {
+                $output[$key][] = $queueName;
+                $output[$key] = array_unique($output[$key]);
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Extract topics configuration.
+     *
+     * @param \DOMDocument $config
+     * @return array
+     */
+    private function extractTopics($config)
+    {
+        $output = [];
+        /** @var $brokerNode \DOMElement */
+        foreach ($config->getElementsByTagName('broker') as $brokerNode) {
+            $topicName = $this->getAttributeValue($brokerNode, 'topic');
+            $output[$topicName] = [
+                ConfigInterface::TOPIC_NAME => $topicName,
+                'type' => $this->getAttributeValue($brokerNode, 'type', self::DEFAULT_TYPE),
+                'exchange' => $this->getAttributeValue($brokerNode, 'exchange', self::DEFAULT_EXCHANGE),
+                'consumerInstance' => $this->getAttributeValue($brokerNode, 'consumerInstance'),
+                'maxMessages' => $this->getAttributeValue($brokerNode, 'maxMessages'),
+                'queues' => $this->extractQueuesFromBroker($brokerNode, $topicName)
+            ];
+        }
+        return $output;
+    }
+
+    /**
+     * Extract queues configuration from the topic node.
+     *
+     * @param \DOMElement $brokerNode
+     * @param string $topicName
+     * @return array
+     */
+    protected function extractQueuesFromBroker(\DOMElement $brokerNode, $topicName)
+    {
+        $queues = [];
+        $topicConfig = $this->communicationConfig->getTopic($topicName);
+        /** @var $queueNode \DOMElement */
+        foreach ($brokerNode->getElementsByTagName('queue') as $queueNode) {
+            $handler = $this->getAttributeValue($queueNode, 'handler');
+            $queueName = $this->getAttributeValue($queueNode, 'name');
+            $queue = [
+               'name'=> $queueName,
+               'handlerName' => $this->getAttributeValue($queueNode, 'handlerName'),
+               'handlers' => $handler ? ['default' => $handler] : $topicConfig['handlers'],
+               'exchange' => $this->getAttributeValue($queueNode, 'exchange'),
+               'consumer' => $this->getAttributeValue($queueNode, 'consumer'),
+               'consumerInstance' => $this->getAttributeValue($queueNode, 'consumerInstance'),
+               'maxMessages' => $this->getAttributeValue($queueNode, 'maxMessages', null),
+               'type' => $this->getAttributeValue($queueNode, 'type')
+
+            ];
+            $queues[$queueName] = $queue;
+        }
+        return $queues;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    protected function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
new file mode 100644
index 0000000000000..613d564942e2f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Config\Reader\Xml;
+
+/**
+ * Schema locator for Publishers
+ *
+ * @deprecated 100.2.0
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue_merged.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
new file mode 100644
index 0000000000000..b5f8d179961c6
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Topology;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+
+/**
+ * Plugin which provides access to topology declared in queue config using topology config interface.
+ *
+ * @deprecated 100.2.0
+ */
+class ConfigReaderPlugin
+{
+    /**
+     * @var QueueConfig
+     */
+    private $queueConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     */
+    public function __construct(QueueConfig $queueConfig)
+    {
+        $this->queueConfig = $queueConfig;
+    }
+
+    /**
+     * Read values from queue config and make them available via topology config.
+     *
+     * @param \Magento\Framework\MessageQueue\Topology\Config\CompositeReader $subject
+     * @param array $result
+     * @param string|null $scope
+     * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRead(
+        \Magento\Framework\MessageQueue\Topology\Config\CompositeReader $subject,
+        array $result,
+        $scope = null
+    ) {
+        $topologyConfigDataFromQueueConfig = $this->getTopologyConfigDataFromQueueConfig();
+        foreach ($topologyConfigDataFromQueueConfig as $exchangeKey => $exchangeConfig) {
+            if (isset($result[$exchangeKey])) {
+                $result[$exchangeKey]['bindings'] = array_merge(
+                    $exchangeConfig['bindings'],
+                    $result[$exchangeKey]['bindings']
+                );
+            } else {
+                $result[$exchangeKey] = $exchangeConfig;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Get data from queue config in format compatible with topology config data internal structure.
+     *
+     * @return array
+     */
+    private function getTopologyConfigDataFromQueueConfig()
+    {
+        $result = [];
+        foreach ($this->queueConfig->getBinds() as $queueConfigBinding) {
+            $topic = $queueConfigBinding['topic'];
+            $destinationType = 'queue';
+            $destination = $queueConfigBinding['queue'];
+            $bindingId = $destinationType . '--' . $destination . '--' . $topic;
+            $bindingData = [
+                'id' => $bindingId,
+                'destinationType' => $destinationType,
+                'destination' => $destination,
+                'disabled' => false,
+                'topic' => $topic,
+                'arguments' => []
+            ];
+
+            $exchangeName = $queueConfigBinding['exchange'];
+            $connection = $this->queueConfig->getConnectionByTopic($topic);
+            if (isset($result[$exchangeName . '--' . $connection])) {
+                $result[$exchangeName . '--' . $connection]['bindings'][$bindingId] = $bindingData;
+            } else {
+                $result[$exchangeName . '--' . $connection] = [
+                    'name' => $exchangeName,
+                    'type' => 'topic',
+                    'connection' => $connection,
+                    'durable' => true,
+                    'autoDelete' => false,
+                    'internal' => false,
+                    'bindings' => [$bindingId => $bindingData],
+                    'arguments' => [],
+                ];
+            }
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Validator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Validator.php
new file mode 100644
index 0000000000000..47a2a4b8eed0a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Validator.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config;
+
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+
+/**
+ * Communication configuration validator.
+ */
+class Validator
+{
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * @var TypeProcessor
+     */
+    private $typeProcessor;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param TypeProcessor $typeProcessor
+     * @param MethodsMap $methodsMap
+     */
+    public function __construct(
+        TypeProcessor $typeProcessor,
+        MethodsMap $methodsMap
+    ) {
+        $this->typeProcessor = $typeProcessor;
+        $this->methodsMap = $methodsMap;
+    }
+
+    /**
+     * Validate schema Method Type
+     *
+     * @param string $schemaType
+     * @param string $schemaMethod
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateSchemaMethodType($schemaType, $schemaMethod, $topicName)
+    {
+        try {
+            $this->methodsMap->getMethodParams($schemaType, $schemaMethod);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Service method specified for topic "%s" is not available. Given "%s"',
+                    $topicName,
+                    $schemaType . '::' . $schemaMethod
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate handler type
+     *
+     * @param string $serviceName
+     * @param string $methodName
+     * @param string $consumerName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateHandlerType($serviceName, $methodName, $consumerName)
+    {
+        try {
+            $this->methodsMap->getMethodParams($serviceName, $methodName);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Service method specified in handler for consumer "%s"'
+                    . ' is not available. Given "%s"',
+                    $consumerName,
+                    $serviceName . '::' . $methodName
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate topic in a bind
+     *
+     * @param string[] $topics
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateBindTopic($topics, $topicName)
+    {
+        $isDefined = false;
+        if (strpos($topicName, '#') === false && strpos($topicName, '*') === false) {
+            if (in_array($topicName, $topics)) {
+                $isDefined = true;
+            }
+        } else {
+            $pattern = $this->buildWildcardPattern($topicName);
+            if (count(preg_grep($pattern, $topics))) {
+                $isDefined = true;
+            }
+        }
+        if (!$isDefined) {
+            throw new \LogicException(
+                sprintf('Topic "%s" declared in binds must be defined in topics', $topicName)
+            );
+        }
+    }
+
+    /**
+     * Construct perl regexp pattern for matching topic names from wildcard key.
+     *
+     * @param string $wildcardKey
+     * @return string
+     */
+    public function buildWildcardPattern($wildcardKey)
+    {
+        $pattern = '/^' . str_replace('.', '\.', $wildcardKey);
+        $pattern = str_replace('#', '.+', $pattern);
+        $pattern = str_replace('*', '[^\.]+', $pattern);
+        if (strpos($wildcardKey, '#') === strlen($wildcardKey)) {
+            $pattern .= '/';
+        } else {
+            $pattern .= '$/';
+        }
+
+        return $pattern;
+    }
+
+    /**
+     * Validate publisher in the topic
+     *
+     * @param string[] $publishers
+     * @param string $publisherName
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateTopicPublisher($publishers, $publisherName, $topicName)
+    {
+        if (!in_array($publisherName, $publishers)) {
+            throw new \LogicException(
+                sprintf(
+                    'Publisher "%s", specified in env.php for topic "%s" is not declared.',
+                    $publisherName,
+                    $topicName
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate response schema type
+     *
+     * @param string $responseSchema
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateResponseSchemaType($responseSchema, $topicName)
+    {
+        try {
+            $this->validateType($responseSchema);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Response schema definition for topic "%s" should reference existing type or service class. '
+                    . 'Given "%s"',
+                    $topicName,
+                    $responseSchema
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate schema type
+     *
+     * @param string $schema
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateSchemaType($schema, $topicName)
+    {
+        try {
+            $this->validateType($schema);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Schema definition for topic "%s" should reference existing type or service class. '
+                    . 'Given "%s"',
+                    $topicName,
+                    $schema
+                )
+            );
+        }
+    }
+
+    /**
+     * Ensure that specified type is either a simple type or a valid service data type.
+     *
+     * @param string $typeName
+     * @return $this
+     * @throws \Exception In case when type is invalid
+     */
+    protected function validateType($typeName)
+    {
+        if ($this->typeProcessor->isTypeSimple($typeName)) {
+            return $this;
+        }
+        if ($this->typeProcessor->isArrayType($typeName)) {
+            $arrayItemType = $this->typeProcessor->getArrayItemType($typeName);
+            $this->methodsMap->getMethodsMap($arrayItemType);
+        } else {
+            $this->methodsMap->getMethodsMap($typeName);
+        }
+        return $this;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
new file mode 100644
index 0000000000000..a88b5dedbd269
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * @deprecated 100.2.0
+ */
+interface ConfigInterface
+{
+    const PUBLISHERS = 'publishers';
+    const PUBLISHER_NAME = 'name';
+    const PUBLISHER_CONNECTION = 'connection';
+    const PUBLISHER_EXCHANGE = 'exchange';
+
+    const TOPICS = 'topics';
+    const TOPIC_NAME = 'name';
+    const TOPIC_PUBLISHER = 'publisher';
+    const TOPIC_SCHEMA = 'schema';
+    const TOPIC_RESPONSE_SCHEMA = 'response_schema';
+    const TOPIC_SCHEMA_TYPE = 'schema_type';
+    const TOPIC_SCHEMA_VALUE = 'schema_value';
+
+    const TOPIC_SCHEMA_TYPE_OBJECT = 'object';
+    const TOPIC_SCHEMA_TYPE_METHOD = 'method_arguments';
+
+    const SCHEMA_METHOD_PARAM_NAME = 'param_name';
+    const SCHEMA_METHOD_PARAM_POSITION = 'param_position';
+    const SCHEMA_METHOD_PARAM_TYPE = 'param_type';
+    const SCHEMA_METHOD_PARAM_IS_REQUIRED = 'is_required';
+
+    const CONSUMERS = 'consumers';
+    const CONSUMER_NAME = 'name';
+    const CONSUMER_QUEUE = 'queue';
+    const CONSUMER_CONNECTION = 'connection';
+    const CONSUMER_INSTANCE_TYPE = 'instance_type';
+    const CONSUMER_CLASS = 'type';
+    const CONSUMER_METHOD = 'method';
+    const CONSUMER_MAX_MESSAGES = 'max_messages';
+    const CONSUMER_HANDLERS = 'handlers';
+    const CONSUMER_HANDLER_TYPE = 'type';
+    const CONSUMER_HANDLER_METHOD = 'method';
+    const CONSUMER_TYPE = 'consumer_type';
+    const CONSUMER_TYPE_SYNC = 'sync';
+    const CONSUMER_TYPE_ASYNC = 'async';
+
+    const RESPONSE_QUEUE_PREFIX = 'responseQueue.';
+
+    const BINDS = 'binds';
+    const BIND_QUEUE = 'queue';
+    const BIND_EXCHANGE = 'exchange';
+    const BIND_TOPIC = 'topic';
+
+    const BROKER_TOPIC = 'topic';
+    const BROKER_TYPE = 'type';
+    const BROKER_EXCHANGE = 'exchange';
+    const BROKER_CONSUMERS = 'consumers';
+    const BROKER_CONSUMER_NAME = 'name';
+    const BROKER_CONSUMER_QUEUE = 'queue';
+    const BROKER_CONSUMER_INSTANCE_TYPE = 'instance_type';
+    const BROKER_CONSUMER_MAX_MESSAGES = 'max_messages';
+    const BROKERS = 'brokers';
+
+    /**
+     * Map which allows optimized search of queues corresponding to the specified exchange and topic pair.
+     */
+    const EXCHANGE_TOPIC_TO_QUEUES_MAP = 'exchange_topic_to_queues_map';
+
+    /**
+     * Identify configured exchange for the provided topic.
+     *
+     * @param string $topicName
+     * @return string
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getExchangeByTopic($topicName);
+
+    /**
+     * Identify a list of all queue names corresponding to the specified topic (and implicitly exchange).
+     *
+     * @param string $topic
+     * @return string[]
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Topology\ConfigInterface::getQueues
+     */
+    public function getQueuesByTopic($topic);
+
+    /**
+     * @param string $topic
+     * @return string
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getConnectionByTopic($topic);
+
+    /**
+     * @param string $consumer
+     * @return string
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumer
+     */
+    public function getConnectionByConsumer($consumer);
+
+    /**
+     * Identify which option is used to define message schema: data interface or service method params
+     *
+     * @param string $topic
+     * @return string
+     * @see \Magento\Framework\Communication\ConfigInterface::getTopic
+     */
+    public function getMessageSchemaType($topic);
+
+    /**
+     * Get all consumer names
+     *
+     * @return string[]
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumers
+     */
+    public function getConsumerNames();
+
+    /**
+     * Get consumer configuration
+     *
+     * @param string $name
+     * @return array|null
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumer
+     */
+    public function getConsumer($name);
+
+    /**
+     * Get queue binds
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Topology\ConfigInterface::getExchanges
+     */
+    public function getBinds();
+
+    /**
+     * Get publishers
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublishers
+     */
+    public function getPublishers();
+
+    /**
+     * Get consumers
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumers
+     */
+    public function getConsumers();
+
+    /**
+     * Get topic config
+     *
+     * @param string $name
+     * @return array
+     * @see \Magento\Framework\Communication\ConfigInterface::getTopic
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getTopic($name);
+
+    /**
+     * Get published config
+     * @param string $name
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getPublisher($name);
+
+    /**
+     * Get queue name for response
+     *
+     * @param string $topicName
+     * @return string
+     * @see \Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder::getQueueName
+     */
+    public function getResponseQueueName($topicName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConnectionLostException.php b/lib/internal/Magento/Framework/MessageQueue/ConnectionLostException.php
new file mode 100644
index 0000000000000..e22ac3184ae6b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConnectionLostException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class ConnectionLostException
+ */
+class ConnectionLostException extends \Exception
+{
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolver.php b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolver.php
new file mode 100644
index 0000000000000..7d9756c92988b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolver.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * {@inheritdoc}
+ */
+class ConnectionTypeResolver
+{
+    /**
+     * @var ConnectionTypeResolverInterface[]
+     */
+    private $resolvers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConnectionTypeResolverInterface[] $resolvers
+     */
+    public function __construct($resolvers)
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionType($connectionName)
+    {
+        $type = null;
+
+        foreach ($this->resolvers as $resolver) {
+            $type = $resolver->getConnectionType($connectionName);
+            if ($type != null) {
+                break;
+            }
+        }
+
+        if ($type === null) {
+            throw new \LogicException('Unknown connection name ' . $connectionName);
+        }
+        return $type;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolverInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolverInterface.php
new file mode 100644
index 0000000000000..20c1a8ebffe03
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolverInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Message Queue connection type resolver.
+ */
+interface ConnectionTypeResolverInterface
+{
+    /**
+     * Get connection type by connection name.
+     *
+     * @param string $connectionName
+     * @return string|null
+     */
+    public function getConnectionType($connectionName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
new file mode 100644
index 0000000000000..9bdacfbc1ff6c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\QueueRepository;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Consumer used to process a single message, unlike batch consumer.
+ *
+ * This could be used for both synchronous and asynchronous processing, depending on topic.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Consumer implements ConsumerInterface
+{
+    /**
+     * @var ConsumerConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var CallbackInvoker
+     */
+    private $invoker;
+
+    /**
+     * @var MessageController
+     */
+    private $messageController;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CallbackInvoker $invoker
+     * @param MessageEncoder $messageEncoder
+     * @param ResourceConnection $resource
+     * @param ConsumerConfigurationInterface $configuration
+     * @param LoggerInterface $logger
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        CallbackInvoker $invoker,
+        MessageEncoder $messageEncoder,
+        ResourceConnection $resource,
+        ConsumerConfigurationInterface $configuration,
+        LoggerInterface $logger = null
+    ) {
+        $this->invoker = $invoker;
+        $this->messageEncoder = $messageEncoder;
+        $this->resource = $resource;
+        $this->configuration = $configuration;
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()->get(LoggerInterface::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process($maxNumberOfMessages = null)
+    {
+        $queue = $this->configuration->getQueue();
+
+        if (!isset($maxNumberOfMessages)) {
+            $queue->subscribe($this->getTransactionCallback($queue));
+        } else {
+            $this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
+        }
+    }
+
+    /**
+     * Decode message and invoke callback method, return reply back for sync processing.
+     *
+     * @param EnvelopeInterface $message
+     * @param boolean $isSync
+     * @return string|null
+     * @throws LocalizedException
+     */
+    private function dispatchMessage(EnvelopeInterface $message, $isSync = false)
+    {
+        $properties = $message->getProperties();
+        $topicName = $properties['topic_name'];
+        $handlers = $this->configuration->getHandlers($topicName);
+        $decodedMessage = $this->messageEncoder->decode($topicName, $message->getBody());
+
+        if (isset($decodedMessage)) {
+            $messageSchemaType = $this->configuration->getMessageSchemaType($topicName);
+            if ($messageSchemaType == CommunicationConfig::TOPIC_REQUEST_TYPE_METHOD) {
+                foreach ($handlers as $callback) {
+                    $result = call_user_func_array($callback, $decodedMessage);
+                    return $this->processSyncResponse($topicName, $result);
+                }
+            } else {
+                foreach ($handlers as $callback) {
+                    $result = call_user_func($callback, $decodedMessage);
+                    if ($isSync) {
+                        return $this->processSyncResponse($topicName, $result);
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Validate and encode synchronous handler output.
+     *
+     * @param string $topicName
+     * @param mixed $result
+     * @return string
+     * @throws LocalizedException
+     */
+    private function processSyncResponse($topicName, $result)
+    {
+        if (isset($result)) {
+            $this->getMessageValidator()->validate($topicName, $result, false);
+            return $this->messageEncoder->encode($topicName, $result, false);
+        } else {
+            throw new LocalizedException(new Phrase('No reply message resulted in RPC.'));
+        }
+    }
+
+    /**
+     * Send RPC response message.
+     *
+     * @param EnvelopeInterface $envelope
+     * @return void
+     */
+    private function sendResponse(EnvelopeInterface $envelope)
+    {
+        $messageProperties = $envelope->getProperties();
+        $connectionName = $this->getConsumerConfig()
+            ->getConsumer($this->configuration->getConsumerName())->getConnection();
+        $queue = $this->getQueueRepository()->get($connectionName, $messageProperties['reply_to']);
+        $queue->push($envelope);
+    }
+
+    /**
+     * Get transaction callback. This handles the case of both sync and async.
+     *
+     * @param QueueInterface $queue
+     * @return \Closure
+     */
+    private function getTransactionCallback(QueueInterface $queue)
+    {
+        return function (EnvelopeInterface $message) use ($queue) {
+            /** @var LockInterface $lock */
+            $lock = null;
+            try {
+                $topicName = $message->getProperties()['topic_name'];
+                $topicConfig = $this->getCommunicationConfig()->getTopic($topicName);
+                $lock = $this->getMessageController()->lock($message, $this->configuration->getConsumerName());
+
+                if ($topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS]) {
+                    $responseBody = $this->dispatchMessage($message, true);
+                    $responseMessage = $this->getEnvelopeFactory()->create(
+                        ['body' => $responseBody, 'properties' => $message->getProperties()]
+                    );
+                    $this->sendResponse($responseMessage);
+                } else {
+                    $allowedTopics = $this->configuration->getTopicNames();
+                    if (in_array($topicName, $allowedTopics)) {
+                        $this->dispatchMessage($message);
+                    } else {
+                        $queue->reject($message);
+                        return;
+                    }
+                }
+                $queue->acknowledge($message);
+            } catch (MessageLockException $exception) {
+                $queue->acknowledge($message);
+            } catch (\Magento\Framework\MessageQueue\ConnectionLostException $e) {
+                if ($lock) {
+                    $this->resource->getConnection()
+                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
+                }
+            } catch (\Magento\Framework\Exception\NotFoundException $e) {
+                $queue->acknowledge($message);
+                $this->logger->warning($e->getMessage());
+            } catch (\Exception $e) {
+                $queue->reject($message, false, $e->getMessage());
+                if ($lock) {
+                    $this->resource->getConnection()
+                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
+                }
+            }
+        };
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+
+    /**
+     * Get queue repository.
+     *
+     * @return QueueRepository
+     *
+     * @deprecated 100.2.0
+     */
+    private function getQueueRepository()
+    {
+        if ($this->queueRepository === null) {
+            $this->queueRepository = \Magento\Framework\App\ObjectManager::getInstance()->get(QueueRepository::class);
+        }
+        return $this->queueRepository;
+    }
+
+    /**
+     * Get message controller.
+     *
+     * @return MessageController
+     *
+     * @deprecated 100.1.0
+     */
+    private function getMessageController()
+    {
+        if ($this->messageController === null) {
+            $this->messageController = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(MessageController::class);
+        }
+        return $this->messageController;
+    }
+
+    /**
+     * Get message validator.
+     *
+     * @return MessageValidator
+     *
+     * @deprecated 100.2.0
+     */
+    private function getMessageValidator()
+    {
+        if ($this->messageValidator === null) {
+            $this->messageValidator = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(MessageValidator::class);
+        }
+        return $this->messageValidator;
+    }
+
+    /**
+     * Get envelope factory.
+     *
+     * @return EnvelopeFactory
+     *
+     * @deprecated 100.2.0
+     */
+    private function getEnvelopeFactory()
+    {
+        if ($this->envelopeFactory === null) {
+            $this->envelopeFactory = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(EnvelopeFactory::class);
+        }
+        return $this->envelopeFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config.php
new file mode 100644
index 0000000000000..4b97943bcc929
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Iterator;
+use Magento\Framework\Phrase;
+
+/**
+ * {@inheritdoc}
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Item iterator.
+     *
+     * @var Iterator
+     */
+    private $iterator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Iterator $iterator
+     */
+    public function __construct(Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumer($name)
+    {
+        $consumer = $this->iterator[$name];
+        if (!$consumer) {
+            throw new LocalizedException(new Phrase("Consumer '%consumer' is not declared.", ['consumer' => $name]));
+        }
+        return $consumer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumers()
+    {
+        return $this->iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeReader.php
new file mode 100644
index 0000000000000..fc2878cafd454
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeReader.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+
+/**
+ * Composite reader for consumer config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * @var ValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface $validator
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(ValidatorInterface $validator, array $readers)
+    {
+        $this->validator = $validator;
+        $this->readers = $readers;
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+        $this->validator->validate($result);
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeValidator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeValidator.php
new file mode 100644
index 0000000000000..c673b16110722
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeValidator.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Composite validator for consumer config.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct(array $validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($this->validators as $validator) {
+            $validator->validate($configData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
new file mode 100644
index 0000000000000..92242698a5ba5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\IteratorFactory as HandlerIteratorFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class ConsumerConfigItem implements ConsumerConfigItemInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $queue;
+
+    /**
+     * @var string
+     */
+    private $consumerInstance;
+
+    /**
+     * @var HandlerIterator
+     */
+    private $handlers;
+
+    /**
+     * @var string
+     */
+    private $maxMessages;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param HandlerIteratorFactory $handlerIteratorFactory
+     */
+    public function __construct(HandlerIteratorFactory $handlerIteratorFactory)
+    {
+        $this->handlers = $handlerIteratorFactory->create();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumerInstance()
+    {
+        return $this->consumerInstance;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHandlers()
+    {
+        return $this->handlers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMaxMessages()
+    {
+        return $this->maxMessages;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->connection = $data['connection'];
+        $this->queue = $data['queue'];
+        $this->consumerInstance = $data['consumerInstance'];
+        $this->maxMessages = $data['maxMessages'];
+        $this->handlers->setData($data['handlers']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler.php
new file mode 100644
index 0000000000000..1226fb79d38d4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+/**
+ * {@inheritdoc}
+ */
+class Handler implements HandlerInterface
+{
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $method;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array $data)
+    {
+        $this->type = $data['type'];
+        $this->method = $data['method'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/Iterator.php
new file mode 100644
index 0000000000000..94a36ef0f0ba9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/Iterator.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\HandlerFactory;
+
+/**
+ * Consumer handler config iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Consumer config handler item.
+     *
+     * @var Handler
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param HandlerFactory $itemFactory
+     */
+    public function __construct(HandlerFactory $itemFactory)
+    {
+        $this->object = $itemFactory->create();
+    }
+
+    /**
+     * Set data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return Handler
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/IteratorFactory.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/IteratorFactory.php
new file mode 100644
index 0000000000000..b17f7deb417b2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/IteratorFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler;
+
+/**
+ * Factory class for @see Iterator
+ */
+class IteratorFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Iterator::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Iterator
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerFactory.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerFactory.php
new file mode 100644
index 0000000000000..9028ea9d2ad39
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+/**
+ * Factory type for @see Handler
+ */
+class HandlerFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Handler::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create type instance with specified parameters
+     *
+     * @param array $data
+     * @return Handler
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerInterface.php
new file mode 100644
index 0000000000000..2cbcb19ff74fd
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+/**
+ * Representation of message queue handler configuration.
+ */
+interface HandlerInterface
+{
+    /**
+     * Get handler type name.
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * Get handler method name.
+     *
+     * @return string
+     */
+    public function getMethod();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Iterator.php
new file mode 100644
index 0000000000000..d60b54a689791
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Iterator.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemFactory;
+use Magento\Framework\MessageQueue\Consumer\Config\Data;
+
+/**
+ * Consumer config item iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Consumer config item.
+     *
+     * @var ConsumerConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param ConsumerConfigItemFactory $itemFactory
+     */
+    public function __construct(Data $configData, ConsumerConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->get();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return ConsumerConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemFactory.php
new file mode 100644
index 0000000000000..47711b4fb7e79
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+/**
+ * Factory class for @see ConsumerConfigItem
+ */
+class ConsumerConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = ConsumerConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return ConsumerConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
new file mode 100644
index 0000000000000..0896b7789e1f1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\HandlerInterface;
+
+/**
+ * Items of this class represent config items declared in etc/queue_consumer.xsd
+ */
+interface ConsumerConfigItemInterface
+{
+    /**
+     * Get consumer name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get connection name.
+     *
+     * @return string
+     */
+    public function getConnection();
+
+    /**
+     * Get name of the queue current consumer is listening to.
+     *
+     * @return string
+     */
+    public function getQueue();
+
+    /**
+     * Get consumer class name.
+     *
+     * @return string
+     */
+    public function getConsumerInstance();
+
+    /**
+     * Get information about custom handlers to be used by current consumer.
+     *
+     * @return HandlerInterface[]
+     */
+    public function getHandlers();
+
+    /**
+     * Get maximum number of messages to be consumed from queue before terminating consumer.
+     *
+     * @return int
+     */
+    public function getMaxMessages();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Data.php
new file mode 100644
index 0000000000000..d94f5bd4a64da
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Consumer config data storage. Caches merged config.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        $cacheId = 'message_queue_consumer_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
new file mode 100644
index 0000000000000..a75aa1ea8ead2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Consumer\Config\Env;
+
+/**
+ * Communication configuration reader. Reads data from env.php.
+ */
+class Reader implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Env
+     */
+    private $envConfig;
+
+    /**
+     * @param \Magento\Framework\MessageQueue\Config\Reader\Env $envConfig
+     */
+    public function __construct(\Magento\Framework\MessageQueue\Config\Reader\Env $envConfig)
+    {
+        $this->envConfig = $envConfig;
+    }
+
+    /**
+     * Read consumers configuration from env.php
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $configData = $this->envConfig->read($scope);
+        return $configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS] ?? [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ReaderInterface.php
new file mode 100644
index 0000000000000..c56b14c3f6745
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ReaderInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+/**
+ * Queue consumer config reader interface.
+ */
+interface ReaderInterface extends \Magento\Framework\Config\ReaderInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/ConsumerInstance.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/ConsumerInstance.php
new file mode 100644
index 0000000000000..5d38fddc8f607
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/ConsumerInstance.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer;
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+
+/**
+ * Consumer config data validator for consumer instance.
+ */
+class ConsumerInstance implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerConfig) {
+            $this->validateConsumerInstance($consumerConfig);
+        }
+    }
+
+    /**
+     * Make sure that specified consumer instance is valid.
+     *
+     * @param array $consumerConfig
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateConsumerInstance($consumerConfig)
+    {
+        $consumerInstance = $consumerConfig['consumerInstance'];
+        if ($consumerInstance == ConsumerInterface::class) {
+            return;
+        }
+        if (!class_exists($consumerInstance)) {
+            throw new \LogicException(
+                sprintf(
+                    "'%s' does not exist and thus cannot be used as 'consumerInstance' for '%s' consumer.",
+                    $consumerInstance,
+                    $consumerConfig['name'],
+                    ConsumerInterface::class
+                )
+            );
+        }
+        $implementedInterfaces = class_implements($consumerInstance);
+        if (!in_array(ConsumerInterface::class, $implementedInterfaces)) {
+            throw new \LogicException(
+                sprintf(
+                    "'%s' cannot be specified as 'consumerInstance' for '%s' consumer,"
+                    . " unless it implements '%s' interface",
+                    $consumerInstance,
+                    $consumerConfig['name'],
+                    ConsumerInterface::class
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
new file mode 100644
index 0000000000000..d1409dec026de
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+
+/**
+ * Consumer config data validator for fields types.
+ */
+class FieldsTypes implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerName => $consumerConfig) {
+            $this->validateConsumerFieldsTypes($consumerName, $consumerConfig);
+        }
+    }
+
+    /**
+     * Make sure types of all fields in the consumer item config are correct.
+     *
+     * @param string $consumerName
+     * @param array $consumerConfig
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateConsumerFieldsTypes($consumerName, $consumerConfig)
+    {
+        $fields = [
+            'name' => 'string',
+            'queue' => 'string',
+            'handlers' => 'array',
+            'consumerInstance' => 'string',
+            'connection' => 'string'
+        ];
+        foreach ($fields as $fieldName => $expectedType) {
+            $actualType = gettype($consumerConfig[$fieldName]);
+            if ($actualType !== $expectedType) {
+                throw new \LogicException(
+                    sprintf(
+                        "Type of '%s' field specified in configuration of '%s' consumer is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $consumerName,
+                        $actualType,
+                        $expectedType
+                    )
+                );
+            }
+        }
+        if (null !== $consumerConfig['maxMessages'] && !is_numeric($consumerConfig['maxMessages'])) {
+            throw new \LogicException(
+                sprintf(
+                    "Type of 'maxMessages' field specified in configuration of '%s' consumer is invalid. "
+                    . "Given '%s', '%s' was expected.",
+                    $consumerName,
+                    gettype($consumerConfig['maxMessages']),
+                    'int|null'
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/Handlers.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/Handlers.php
new file mode 100644
index 0000000000000..fa6586d81b177
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/Handlers.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+use Magento\Framework\Reflection\MethodsMap;
+
+/**
+ * Consumer config data validator for handlers.
+ */
+class Handlers implements ValidatorInterface
+{
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MethodsMap $methodsMap
+     */
+    public function __construct(MethodsMap $methodsMap)
+    {
+        $this->methodsMap = $methodsMap;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerConfig) {
+            $consumerName = $consumerConfig['name'];
+            if (!is_array($consumerConfig['handlers'])) {
+                throw new \LogicException(
+                    sprintf(
+                        "'handlers' element must be an array for consumer '%s'",
+                        $consumerName
+                    )
+                );
+            }
+            foreach ($consumerConfig['handlers'] as $handler) {
+                $this->validateHandler($handler, $consumerName);
+            }
+        }
+    }
+
+    /**
+     * Validate handler configuration.
+     *
+     * @param array $handler
+     * @param string $consumerName
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateHandler($handler, $consumerName)
+    {
+        if (!isset($handler['type']) || !isset($handler['method'])) {
+            throw new \LogicException(
+                sprintf(
+                    "'%s' consumer declaration is invalid. "
+                    . "Every handler element must be an array. It must contain 'type' and 'method' elements.",
+                    $consumerName
+                )
+            );
+        }
+        try {
+            $this->methodsMap->getMethodParams($handler['type'], $handler['method']);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Service method specified as handler for of consumer "%s" is not available. Given "%s"',
+                    $consumerName,
+                    $handler['type'] . '::' . $handler['method']
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
new file mode 100644
index 0000000000000..87de2233381e2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+
+/**
+ * Consumer config data validator for required fields.
+ */
+class RequiredFields implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerName => $consumerConfig) {
+            $requiredFields = ['name', 'queue', 'handlers', 'consumerInstance', 'connection', 'maxMessages'];
+            foreach ($requiredFields as $fieldName) {
+                if (!array_key_exists($fieldName, $consumerConfig)) {
+                    throw new \LogicException(
+                        sprintf("'%s' field must be specified for consumer '%s'", $fieldName, $consumerName)
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ValidatorInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ValidatorInterface.php
new file mode 100644
index 0000000000000..70cad49728347
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ValidatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+/**
+ * Queue consumer config validator interface.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate merged consumer config data.
+     *
+     * @param array $configData
+     * @return void
+     * @throws \LogicException
+     */
+    public function validate($configData);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
new file mode 100644
index 0000000000000..352bc53e94e90
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Xml;
+
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\Framework\Communication\Config\ConfigParser;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Converts MessageQueue consumers config from \DOMDocument to array
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * @var string
+     */
+    private static $defaultInstance = ConsumerInterface::class;
+
+    /**
+     * @var ConfigParser
+     */
+    private $configParser;
+
+    /**
+     * Default value provider.
+     *
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConfigParser $configParser
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(ConfigParser $configParser, DefaultValueProvider $defaultValueProvider)
+    {
+        $this->configParser = $configParser;
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        /** @var $consumerNode \DOMElement */
+        foreach ($source->getElementsByTagName('consumer') as $consumerNode) {
+            $consumerName = $this->getAttributeValue($consumerNode, 'name');
+            $handler = $this->getAttributeValue($consumerNode, 'handler');
+            $result[$consumerName] = [
+                'name' => $consumerName,
+                'queue' => $this->getAttributeValue($consumerNode, 'queue'),
+                'consumerInstance' => $this->getAttributeValue(
+                    $consumerNode,
+                    'consumerInstance',
+                    self::$defaultInstance
+                ),
+                'handlers' => $handler ? [$this->parseHandler($handler)] : [],
+                'connection' => $this->getAttributeValue(
+                    $consumerNode,
+                    'connection',
+                    $this->defaultValueProvider->getConnection()
+                ),
+                'maxMessages' => $this->getAttributeValue($consumerNode, 'maxMessages')
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    private function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+
+    /**
+     * Parse service method callback to become compatible with handlers format.
+     *
+     * @param array $handler
+     * @return array
+     */
+    private function parseHandler($handler)
+    {
+        $parseServiceMethod = $this->configParser->parseServiceMethod($handler);
+        return [
+            CommunicationConfig::HANDLER_TYPE => $parseServiceMethod[ConfigParser::TYPE_NAME],
+            CommunicationConfig::HANDLER_METHOD => $parseServiceMethod[ConfigParser::METHOD_NAME]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Reader.php
new file mode 100644
index 0000000000000..52502e8f13940
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Reader.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Xml;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface;
+
+/**
+ * Reader for etc/queue_consumer.xml configs.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_idAttributes = [
+        '/config/consumer' => 'name'
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        \Magento\Framework\MessageQueue\Consumer\Config\Xml\Converter $converter,
+        \Magento\Framework\MessageQueue\Consumer\Config\Xml\SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue_consumer.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/SchemaLocator.php
new file mode 100644
index 0000000000000..3ddbc143f3b0a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/SchemaLocator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Xml;
+
+/**
+ * Schema locator for etc/queue_consumer.xml
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
new file mode 100644
index 0000000000000..344b5ef1d580c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+
+/**
+ * Consumer config interface provides access data declared in etc/queue_consumer.xml
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ConfigInterface
+{
+    /**
+     * Get consumer configuration by consumer name.
+     *
+     * @param string $name
+     * @return ConsumerConfigItemInterface
+     * @throws LocalizedException
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getConsumer($name);
+
+    /**
+     * Get list of all consumers declared in the system.
+     *
+     * @return ConsumerConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getConsumers();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
new file mode 100644
index 0000000000000..09cd5dcb8d909
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Value class which stores the configuration
+ */
+class ConsumerConfiguration implements ConsumerConfigurationInterface
+{
+    /**
+     * @deprecated
+     * @see ConsumerConfigurationInterface::TOPIC_TYPE
+     */
+    const CONSUMER_TYPE = "consumer_type";
+
+    /**
+     * @deprecated
+     * @see ConsumerConfigurationInterface::TOPIC_HANDLERS
+     */
+    const HANDLERS = 'handlers';
+
+    /**
+     * @var array
+     */
+    private $data;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueRepository $queueRepository
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param array $data configuration data
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(QueueRepository $queueRepository, MessageQueueConfig $messageQueueConfig, $data = [])
+    {
+        $this->data = $data;
+        $this->queueRepository = $queueRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumerName()
+    {
+        return $this->getData(self::CONSUMER_NAME);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMaxMessages()
+    {
+        return $this->getData(self::MAX_MESSAGES);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueueName()
+    {
+        return $this->getData(self::QUEUE_NAME);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        $topics = $this->getData(self::TOPICS);
+        if (count($topics) > 1) {
+            throw new \LogicException(
+                'Current method is deprecated and does not support more than 1 topic declarations for consumer. '
+                . 'Use \Magento\Framework\MessageQueue\ConsumerConfiguration::getConsumerType instead. '
+                . "Multiple topics declared for consumer '{$this->getConsumerName()}'"
+            );
+        } elseif (count($topics) < 1) {
+            throw new \LogicException(
+                "There must be at least one topic declared for consumer '{$this->getConsumerName()}'."
+            );
+        }
+        // Get the only topic and read consumer type from its declaration. Necessary for backward compatibility
+        $topicConfig = reset($topics);
+        return $topicConfig[self::TOPIC_TYPE];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHandlers($topicName)
+    {
+        return $this->getTopicConfig($topicName)[self::TOPIC_HANDLERS];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopicNames()
+    {
+        $topics = $this->getData(self::TOPICS);
+        return is_array($topics) && count($topics) ? array_keys($topics) : [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueue()
+    {
+        $connectionName = $this->getConsumerConfig()->getConsumer($this->getConsumerName())->getConnection();
+        return $this->queueRepository->get($connectionName, $this->getQueueName());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMessageSchemaType($topicName)
+    {
+        return $this->getCommunicationConfig()->getTopic($topicName)[CommunicationConfig::TOPIC_REQUEST_TYPE];
+    }
+
+    /**
+     * Get topic configuration for current consumer.
+     * @param string $topicName
+     * @return array
+     * @throws \LogicException
+     */
+    private function getTopicConfig($topicName)
+    {
+        if (!isset($this->getData(self::TOPICS)[$topicName])) {
+            throw new \LogicException("Consumer configuration for {$topicName} topic not found.");
+        }
+        return $this->getData(self::TOPICS)[$topicName];
+    }
+
+    /**
+     * Get specified data item.
+     *
+     * @param string $key
+     * @return string|null
+     */
+    private function getData($key)
+    {
+        if (!isset($this->data[$key])) {
+            return null;
+        }
+        return $this->data[$key];
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
new file mode 100644
index 0000000000000..b825949ddb019
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Configuration for the consumer.
+ */
+interface ConsumerConfigurationInterface
+{
+    const CONSUMER_NAME = "consumer_name";
+
+    const QUEUE_NAME = "queue_name";
+    const MAX_MESSAGES = "max_messages";
+    const SCHEMA_TYPE = "schema_type";
+    const TOPICS = 'topics';
+    const TOPIC_TYPE = 'consumer_type';
+    const TOPIC_HANDLERS = 'handlers';
+
+    const TYPE_SYNC = 'sync';
+    const TYPE_ASYNC = 'async';
+    const INSTANCE_TYPE_BATCH = 'batch';
+    const INSTANCE_TYPE_SINGULAR = 'singular';
+
+    /**
+     * Get consumer name.
+     *
+     * @return string
+     */
+    public function getConsumerName();
+
+    /**
+     * Get the name of queue which consumer will read from.
+     *
+     * @return string
+     */
+    public function getQueueName();
+
+    /**
+     * Get consumer type sync|async.
+     *
+     * @return string
+     * @deprecated 100.2.0
+     * @see \Magento\Framework\Communication\ConfigInterface::getTopic
+     * @throws \LogicException
+     */
+    public function getType();
+
+    /**
+     * Get maximum number of message, which will be read by consumer before termination of the process.
+     *
+     * @return int|null
+     */
+    public function getMaxMessages();
+
+    /**
+     * Get handlers by topic type.
+     *
+     * @param string $topicName
+     * @return callback[]
+     * @throws \LogicException
+     */
+    public function getHandlers($topicName);
+
+    /**
+     * Get topics.
+     *
+     * @return string[]
+     */
+    public function getTopicNames();
+
+    /**
+     * @param string $topicName
+     * @return string
+     */
+    public function getMessageSchemaType($topicName);
+
+    /**
+     * @return QueueInterface
+     */
+    public function getQueue();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
new file mode 100644
index 0000000000000..7d9f210b4a698
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class which creates Consumers
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumerFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     * @param ObjectManagerInterface $objectManager
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        QueueConfig $queueConfig,
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Return the actual Consumer implementation for the given consumer name.
+     *
+     * @param string $consumerName
+     * @param int $batchSize [optional]
+     * @return ConsumerInterface
+     * @throws LocalizedException
+     */
+    public function get($consumerName, $batchSize = 0)
+    {
+        $consumerConfig = $this->getConsumerConfig()->getConsumer($consumerName);
+        if ($consumerConfig === null) {
+            throw new LocalizedException(
+                new Phrase('Specified consumer "%consumer" is not declared.', ['consumer' => $consumerName])
+            );
+        }
+
+        return $this->objectManager->create(
+            $consumerConfig->getConsumerInstance(),
+            [
+                'configuration' => $this->createConsumerConfiguration($consumerConfig),
+                'batchSize' => $batchSize,
+            ]
+        );
+    }
+
+    /**
+     * Creates the objects necessary for the ConsumerConfigurationInterface to configure a Consumer.
+     *
+     * @param ConsumerConfigItemInterface $consumerConfigItem
+     * @return ConsumerConfigurationInterface
+     */
+    private function createConsumerConfiguration($consumerConfigItem)
+    {
+        $customConsumerHandlers = [];
+        foreach ($consumerConfigItem->getHandlers() as $handlerConfig) {
+            $customConsumerHandlers[] = [
+                $this->objectManager->create($handlerConfig->getType()),
+                $handlerConfig->getMethod()
+            ];
+        }
+        $topics = [];
+        foreach ($this->getCommunicationConfig()->getTopics() as $topicConfig) {
+            $topicName = $topicConfig[CommunicationConfig::TOPIC_NAME];
+            $topics[$topicName] = [
+                ConsumerConfigurationInterface::TOPIC_HANDLERS => $customConsumerHandlers
+                    ?: $this->getHandlersFromCommunicationConfig($topicName),
+                ConsumerConfigurationInterface::TOPIC_TYPE => $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS]
+                    ? ConsumerConfiguration::TYPE_SYNC
+                    : ConsumerConfiguration::TYPE_ASYNC
+            ];
+        }
+        $configData = [
+            ConsumerConfigurationInterface::CONSUMER_NAME => $consumerConfigItem->getName(),
+            ConsumerConfigurationInterface::QUEUE_NAME => $consumerConfigItem->getQueue(),
+            ConsumerConfigurationInterface::TOPICS => $topics,
+            ConsumerConfigurationInterface::MAX_MESSAGES => $consumerConfigItem->getMaxMessages(),
+        ];
+
+        return $this->objectManager->create(
+            \Magento\Framework\MessageQueue\ConsumerConfiguration::class,
+            ['data' => $configData]
+        );
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+
+    /**
+     * Get handlers by topic based on communication config.
+     *
+     * @param string $topicName
+     * @return array
+     */
+    private function getHandlersFromCommunicationConfig($topicName)
+    {
+        $topicConfig = $this->getCommunicationConfig()->getTopic($topicName);
+        $handlers = [];
+        foreach ($topicConfig[CommunicationConfig::TOPIC_HANDLERS] as $handlerConfig) {
+            $handlers[] = [
+                $this->objectManager->create($handlerConfig[CommunicationConfig::HANDLER_TYPE]),
+                $handlerConfig[CommunicationConfig::HANDLER_METHOD]
+            ];
+        }
+        return $handlers;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
new file mode 100644
index 0000000000000..ca45da7eca8ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Consumers will connect to a queue, read messages, and invoke a method to process the message contents.
+ *
+ * @api
+ */
+interface ConsumerInterface
+{
+    /**
+     * Connects to a queue, consumes a message on the queue, and invoke a method to process the message contents.
+     *
+     * @param int|null $maxNumberOfMessages if not specified - process all queued incoming messages and terminate,
+     *      otherwise terminate execution after processing the specified number of messages
+     * @return void
+     */
+    public function process($maxNumberOfMessages = null);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php b/lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php
new file mode 100644
index 0000000000000..592581a0259f9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Message Queue default config value provider.
+ */
+class DefaultValueProvider
+{
+    /**
+     * Default connection name.
+     *
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * Default exchange name.
+     *
+     * @var string
+     */
+    private $exchange;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param string $connection
+     * @param string $exchange
+     */
+    public function __construct($connection = 'amqp', $exchange = 'magento')
+    {
+        $this->connection = $connection;
+        $this->exchange = $exchange;
+    }
+
+    /**
+     * Get default connection name.
+     *
+     * @return string
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Get default exchange name.
+     *
+     * @return string
+     */
+    public function getExchange()
+    {
+        return $this->exchange;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Envelope.php b/lib/internal/Magento/Framework/MessageQueue/Envelope.php
new file mode 100644
index 0000000000000..07dd45efbf1bc
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Envelope.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+
+class Envelope implements EnvelopeInterface
+{
+    /**
+     * @var array
+     */
+    private $properties;
+
+    /**
+     * @var string
+     */
+    private $body;
+
+    /**
+     * @param string $body
+     * @param array $properties
+     */
+    public function __construct($body, array $properties = [])
+    {
+        $this->body = $body;
+        $this->properties = $properties;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProperties()
+    {
+        return $this->properties;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/EnvelopeFactory.php b/lib/internal/Magento/Framework/MessageQueue/EnvelopeFactory.php
new file mode 100644
index 0000000000000..0ffcc988bf405
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/EnvelopeFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Envelope
+ */
+class EnvelopeFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\Framework\MessageQueue\Envelope::class
+    ) {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Envelope
+     */
+    public function create(array $data = [])
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php b/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
new file mode 100644
index 0000000000000..07f12d1856317
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * @api
+ */
+interface EnvelopeInterface
+{
+    /**
+     * Binary representation of message
+     *
+     * @return string
+     */
+    public function getBody();
+
+    /**
+     * Message metadata
+     *
+     * @return array
+     */
+    public function getProperties();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
new file mode 100644
index 0000000000000..ca1ef769af90f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+class ExchangeFactory implements ExchangeFactoryInterface
+{
+    /**
+     * @var ExchangeFactoryInterface[]
+     */
+    private $exchangeFactories;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     * @since 100.2.0
+     */
+    protected $objectManager = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConnectionTypeResolver $connectionTypeResolver
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ExchangeFactoryInterface[] $exchangeFactories
+     * @since 100.2.0
+     */
+    public function __construct(
+        ConnectionTypeResolver $connectionTypeResolver,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        array $exchangeFactories = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->exchangeFactories = $exchangeFactories;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = [])
+    {
+        $connectionType = $this->connectionTypeResolver->getConnectionType($connectionName);
+
+        if (!isset($this->exchangeFactories[$connectionType])) {
+            throw new \LogicException("Not found exchange for connection name '{$connectionName}' in config");
+        }
+
+        $factory = $this->exchangeFactories[$connectionType];
+        $exchange = $factory->create($connectionName, $data);
+
+        if (!$exchange instanceof ExchangeInterface) {
+            $exchangeInterface = \Magento\Framework\MessageQueue\ExchangeInterface::class;
+            throw new \LogicException(
+                "Exchange for connection name '{$connectionName}' " .
+                "does not implement interface '{$exchangeInterface}'"
+            );
+        }
+        return $exchange;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
new file mode 100644
index 0000000000000..1e70b0266fc4f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ExchangeFactoryInterface
+{
+    /**
+     * Create exchange instance.
+     *
+     * @param string $connectionName
+     * @param array $data
+     * @return ExchangeInterface
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = []);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
new file mode 100644
index 0000000000000..bb36332ae25b1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface message Exchange
+ *
+ * @api
+ */
+interface ExchangeInterface
+{
+    /**
+     * Send message
+     *
+     * @param string $topic
+     * @param EnvelopeInterface $envelope
+     * @return mixed
+     */
+    public function enqueue($topic, EnvelopeInterface $envelope);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
new file mode 100644
index 0000000000000..1f26e5d785c1a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+class ExchangeRepository
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ExchangeFactoryInterface
+     */
+    private $exchangeFactory;
+
+    /**
+     * Pool of exchange instances.
+     *
+     * @var ExchangeInterface[]
+     */
+    private $exchangePool = [];
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string[] $exchanges
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $exchanges = [])
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param string $connectionName
+     * @return ExchangeInterface
+     * @throws \LogicException
+     */
+    public function getByConnectionName($connectionName)
+    {
+        if (!isset($this->exchangePool[$connectionName])) {
+            $exchange = $this->getExchangeFactory()->create($connectionName);
+            $this->exchangePool[$connectionName] = $exchange;
+        }
+        return $this->exchangePool[$connectionName];
+    }
+
+    /**
+     * Get exchange factory.
+     *
+     * @return ExchangeFactoryInterface
+     * @deprecated 100.2.0
+     */
+    private function getExchangeFactory()
+    {
+        if ($this->exchangeFactory === null) {
+            $this->exchangeFactory = $this->objectManager->get(ExchangeFactoryInterface::class);
+        }
+        return $this->exchangeFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Lock.php b/lib/internal/Magento/Framework/MessageQueue/Lock.php
new file mode 100644
index 0000000000000..15a9530d05483
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Lock.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class Lock to handle message lock transactions.
+ */
+class Lock extends \Magento\Framework\DataObject implements LockInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getId()
+    {
+        return $this->getData('id');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setId($value)
+    {
+        $this->setData('id', $value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMessageCode()
+    {
+        return $this->getData('message_code');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setMessageCode($value)
+    {
+        $this->setData('message_code', $value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCreatedAt()
+    {
+        return $this->getData('created_at');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setCreatedAt($value)
+    {
+        $this->setData('created_at', $value);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Lock/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Lock/ReaderInterface.php
new file mode 100644
index 0000000000000..33490f5137491
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Lock/ReaderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Lock;
+
+/**
+ * Message lock reader interface
+ */
+interface ReaderInterface
+{
+    /**
+     * Get lock from storage
+     *
+     * @param \Magento\Framework\MessageQueue\LockInterface $lock
+     * @param string $code
+     * @return void
+     */
+    public function read(\Magento\Framework\MessageQueue\LockInterface $lock, $code);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Lock/WriterInterface.php b/lib/internal/Magento/Framework/MessageQueue/Lock/WriterInterface.php
new file mode 100644
index 0000000000000..3d446f283c1ce
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Lock/WriterInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Lock;
+
+/**
+ * Message lock writer
+ */
+interface WriterInterface
+{
+    /**
+     * Save lock
+     *
+     * @param \Magento\Framework\MessageQueue\LockInterface $lock
+     * @return void
+     */
+    public function saveLock(\Magento\Framework\MessageQueue\LockInterface $lock);
+
+    /**
+     * Remove outdated locks
+     *
+     * @return void
+     */
+    public function releaseOutdatedLocks();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/LockInterface.php b/lib/internal/Magento/Framework/MessageQueue/LockInterface.php
new file mode 100644
index 0000000000000..1f3d4fd50c3f4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/LockInterface.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class Lock to handle message lock transactions.
+ */
+interface LockInterface
+{
+    /**
+     * Get lock id
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Set lock id
+     *
+     * @param int $value
+     * @return void
+     */
+    public function setId($value);
+
+    /**
+     * Get message code
+     *
+     * @return string
+     */
+    public function getMessageCode();
+
+    /**
+     * Set message code
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setMessageCode($value);
+
+    /**
+     * Get lock date
+     *
+     * @return string
+     */
+    public function getCreatedAt();
+
+    /**
+     * Set lock date
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setCreatedAt($value);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergedMessage.php b/lib/internal/Magento/Framework/MessageQueue/MergedMessage.php
new file mode 100644
index 0000000000000..31dfc423f7471
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergedMessage.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Provides mapping between merged message and appropriate original messages ids.
+ */
+class MergedMessage implements MergedMessageInterface
+{
+    /**
+     * @var mixed
+     */
+    private $mergedMessage;
+
+    /**
+     * @var array
+     */
+    private $originalMessagesIds;
+
+    /**
+     * @param mixed $mergedMessage
+     * @param array $originalMessagesIds
+     */
+    public function __construct($mergedMessage, array $originalMessagesIds)
+    {
+        $this->mergedMessage = $mergedMessage;
+        $this->originalMessagesIds = $originalMessagesIds;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMergedMessage()
+    {
+        return $this->mergedMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOriginalMessagesIds()
+    {
+        return $this->originalMessagesIds;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergedMessageInterface.php b/lib/internal/Magento/Framework/MessageQueue/MergedMessageInterface.php
new file mode 100644
index 0000000000000..ff291a7cdb970
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergedMessageInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for mapping between original and merged messages.
+ */
+interface MergedMessageInterface
+{
+    /**
+     * Get merged message instance.
+     *
+     * @return mixed
+     */
+    public function getMergedMessage();
+
+    /**
+     * Get original messages ids connected with the merged message.
+     *
+     * @return array
+     */
+    public function getOriginalMessagesIds();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergedMessageProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MergedMessageProcessor.php
new file mode 100644
index 0000000000000..eb37214aabc9c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergedMessageProcessor.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Processing messages implementing MergedMessageInterface.
+ */
+class MergedMessageProcessor implements MessageProcessorInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @param MessageStatusProcessor $messageStatusProcessor
+     */
+    public function __construct(MessageStatusProcessor $messageStatusProcessor)
+    {
+        $this->messageStatusProcessor = $messageStatusProcessor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messages,
+        array $messagesToAcknowledge,
+        array $mergedMessages
+    ) {
+        $this->messageStatusProcessor->acknowledgeMessages($queue, $messagesToAcknowledge);
+        $this->dispatchMessages($queue, $configuration, $mergedMessages, $messages);
+    }
+
+    /**
+     * Processing decoded messages, invoking callbacks, changing statuses for messages.
+     *
+     * @param QueueInterface $queue
+     * @param ConsumerConfigurationInterface $configuration
+     * @param array $messageList
+     * @param array $originalMessages
+     */
+    private function dispatchMessages(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messageList,
+        array $originalMessages
+    ) {
+        $originalMessagesIds = [];
+
+        try {
+            foreach ($messageList as $topicName => $messages) {
+                foreach ($messages as $message) {
+                    /**
+                     * @var \Magento\Framework\MessageQueue\MergedMessageInterface $message
+                     */
+                    $callbacks = $configuration->getHandlers($topicName);
+                    $originalMessagesIds = $message->getOriginalMessagesIds();
+
+                    foreach ($callbacks as $callback) {
+                        call_user_func($callback, $message->getMergedMessage());
+                    }
+
+                    $originalMessages = $this->getOriginalMessages($originalMessages, $originalMessagesIds);
+                    $this->messageStatusProcessor->acknowledgeMessages($queue, $originalMessages);
+                }
+            }
+        } catch (\Exception $e) {
+            $originalMessages = $this->getOriginalMessages($originalMessages, $originalMessagesIds);
+            $this->messageStatusProcessor->rejectMessages($queue, $originalMessages);
+        }
+    }
+
+    /**
+     * Get original messages by messages ids.
+     *
+     * @param array $messages
+     * @param array $messagesIds
+     * @return array
+     */
+    private function getOriginalMessages(array $messages, array $messagesIds)
+    {
+        $originalMessages = [];
+
+        foreach ($messagesIds as $messageId) {
+            if (isset($messages[$messageId])) {
+                $originalMessages[] = $messages[$messageId];
+            }
+        }
+
+        return $originalMessages;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergerFactory.php b/lib/internal/Magento/Framework/MessageQueue/MergerFactory.php
new file mode 100644
index 0000000000000..0647279258ae2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergerFactory.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\ObjectManagerInterface;
+
+class MergerFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string[]
+     */
+    private $mergers;
+
+    /**
+     * MergerFactory constructor.
+     * @param ObjectManagerInterface $objectManager
+     * @param string[] $mergers
+     */
+    public function __construct(ObjectManagerInterface $objectManager, $mergers = [])
+    {
+        $this->objectManager = $objectManager;
+        $this->mergers = $mergers;
+    }
+
+    /**
+     * @param string $consumerName
+     * @return MergerInterface
+     * @throws \LogicException
+     */
+    public function create($consumerName)
+    {
+        if (!isset($this->mergers[$consumerName])) {
+            throw new \LogicException("Not found merger for consumer name '{$consumerName}'");
+        }
+
+        $mergerClassName = $this->mergers[$consumerName];
+        $merger = $this->objectManager->get($mergerClassName);
+
+        if (!$merger instanceof MergerInterface) {
+            $mergerInterfaceName = \Magento\Framework\MessageQueue\MergerInterface::class;
+            throw new \LogicException(
+                "Merger '{$mergerClassName}' for consumer name '{$consumerName}' " .
+                "does not implement interface '{$mergerInterfaceName}'"
+            );
+        }
+
+        return $merger;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergerInterface.php b/lib/internal/Magento/Framework/MessageQueue/MergerInterface.php
new file mode 100644
index 0000000000000..a922cbf894d16
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergerInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for merging decoded queue messages.
+ */
+interface MergerInterface
+{
+    /**
+     * Merges or/and converts decoded queue messages.
+     *
+     * MergedMessage object contains array with ids of original queue messages
+     *
+     * @param object[] $messages
+     * @return object[]|MergedMessageInterface[]
+     */
+    public function merge(array $messages);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageController.php b/lib/internal/Magento/Framework/MessageQueue/MessageController.php
new file mode 100644
index 0000000000000..16853501e1d65
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageController.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+
+class MessageController
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\LockInterfaceFactory
+     */
+    private $lockFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\ReaderInterface
+     */
+    private $reader;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\WriterInterface
+     */
+    private $writer;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\LockInterfaceFactory $lockFactory
+     * @param Lock\ReaderInterface $reader
+     * @param Lock\WriterInterface $writer
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\LockInterfaceFactory $lockFactory,
+        \Magento\Framework\MessageQueue\Lock\ReaderInterface $reader,
+        \Magento\Framework\MessageQueue\Lock\WriterInterface $writer
+    ) {
+        $this->lockFactory = $lockFactory;
+        $this->reader = $reader;
+        $this->writer = $writer;
+    }
+
+    /**
+     * Create lock corresponding to the provided message. Throw MessageLockException if lock is already created.
+     *
+     * @param EnvelopeInterface $envelope
+     * @param string $consumerName
+     * @return LockInterface
+     * @throws MessageLockException
+     * @throws NotFoundException
+     */
+    public function lock(EnvelopeInterface $envelope, $consumerName)
+    {
+        $lock = $this->lockFactory->create();
+        $properties = $envelope->getProperties();
+        if (empty($properties['message_id'])) {
+            throw new NotFoundException(new Phrase("Property 'message_id' not found in properties."));
+        }
+        $code = $consumerName . '-' . $properties['message_id'];
+        $code = md5($code);
+        $this->reader->read($lock, $code);
+        if ($lock->getId()) {
+            throw new MessageLockException(new Phrase('The "%1" message code was already processed.', [$code]));
+        }
+        $this->writer->saveLock($lock);
+        return $lock;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php b/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
new file mode 100644
index 0000000000000..91ad24eaeb978
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\Webapi\ServicePayloadConverterInterface;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class which provides encoding and decoding capabilities for MessageQueue messages.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MessageEncoder
+{
+    const DIRECTION_ENCODE = 'encode';
+    const DIRECTION_DECODE = 'decode';
+
+    /**
+     * @var \Magento\Framework\Webapi\ServiceOutputProcessor
+     */
+    private $dataObjectEncoder;
+
+    /**
+     * @var \Magento\Framework\Webapi\ServiceInputProcessor
+     */
+    private $dataObjectDecoder;
+
+    /**
+     * @var \Magento\Framework\Json\EncoderInterface
+     */
+    private $jsonEncoder;
+
+    /**
+     * @var \Magento\Framework\Json\DecoderInterface
+     */
+    private $jsonDecoder;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\Framework\Json\DecoderInterface $jsonDecoder
+     * @param \Magento\Framework\Webapi\ServiceOutputProcessor $dataObjectEncoder
+     * @param \Magento\Framework\Webapi\ServiceInputProcessor $dataObjectDecoder
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        QueueConfig $queueConfig,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Framework\Json\DecoderInterface $jsonDecoder,
+        \Magento\Framework\Webapi\ServiceOutputProcessor $dataObjectEncoder,
+        \Magento\Framework\Webapi\ServiceInputProcessor $dataObjectDecoder
+    ) {
+        $this->dataObjectEncoder = $dataObjectEncoder;
+        $this->dataObjectDecoder = $dataObjectDecoder;
+        $this->jsonEncoder = $jsonEncoder;
+        $this->jsonDecoder = $jsonDecoder;
+    }
+
+    /**
+     * Encode message content based on current topic.
+     *
+     * @param string $topic
+     * @param mixed $message
+     * @param bool $requestType
+     * @return string
+     * @throws LocalizedException
+     */
+    public function encode($topic, $message, $requestType = true)
+    {
+        $convertedMessage = $this->convertMessage($topic, $message, self::DIRECTION_ENCODE, $requestType);
+        return $this->jsonEncoder->encode($convertedMessage);
+    }
+
+    /**
+     * Decode message content based on current topic.
+     *
+     * @param string $topic
+     * @param string $message
+     * @param bool $requestType
+     * @return mixed
+     * @throws LocalizedException
+     */
+    public function decode($topic, $message, $requestType = true)
+    {
+        try {
+            $decodedMessage = $this->jsonDecoder->decode($message);
+        } catch (\Exception $e) {
+            throw new LocalizedException(new Phrase("Error occurred during message decoding."));
+        }
+        return $this->convertMessage($topic, $decodedMessage, self::DIRECTION_DECODE, $requestType);
+    }
+
+    /**
+     * Identify message data schema by topic.
+     *
+     * @param string $topic
+     * @param bool $requestType
+     * @return array
+     * @throws LocalizedException
+     */
+    protected function getTopicSchema($topic, $requestType)
+    {
+        $topicConfig = $this->getCommunicationConfig()->getTopic($topic);
+        if ($topicConfig === null) {
+            throw new LocalizedException(new Phrase('Specified topic "%topic" is not declared.', ['topic' => $topic]));
+        }
+        if ($requestType) {
+            return [
+                'schema_type' => $topicConfig[CommunicationConfig::TOPIC_REQUEST_TYPE],
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_REQUEST]
+            ];
+        } else {
+            return [
+                'schema_type' => isset($topicConfig[CommunicationConfig::TOPIC_RESPONSE])
+                    ? CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS
+                    : null,
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_RESPONSE]
+            ];
+        }
+    }
+
+    /**
+     * Convert message according to the format associated with its topic using provided converter.
+     *
+     * @param string $topic
+     * @param mixed $message
+     * @param string $direction
+     * @param bool $requestType
+     * @return mixed
+     * @throws LocalizedException
+     */
+    protected function convertMessage($topic, $message, $direction, $requestType)
+    {
+        $topicSchema = $this->getTopicSchema($topic, $requestType);
+        if ($topicSchema['schema_type'] == CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS) {
+            /** Convert message according to the data interface associated with the message topic */
+            $messageDataType = $topicSchema[QueueConfig::TOPIC_SCHEMA_VALUE];
+            try {
+                $convertedMessage = $this->getConverter($direction)->convertValue($message, $messageDataType);
+            } catch (LocalizedException $e) {
+                throw new LocalizedException(
+                    new Phrase(
+                        'Message with topic "%topic" must be an instance of "%class".',
+                        ['topic' => $topic, 'class' => $messageDataType]
+                    )
+                );
+            }
+        } else {
+            /** Convert message according to the method signature associated with the message topic */
+            $message = (array)$message;
+            $isIndexedArray = array_keys($message) === range(0, count($message) - 1);
+            $convertedMessage = [];
+            /** Message schema type is defined by method signature */
+            foreach ($topicSchema['schema_value'] as $methodParameterMeta) {
+                $paramName = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_NAME];
+                $paramType = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_TYPE];
+                if ($isIndexedArray) {
+                    /** Encode parameters according to their positions in method signature */
+                    $paramPosition = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_POSITION];
+                    if (isset($message[$paramPosition])) {
+                        $convertedMessage[$paramName] = $this->getConverter($direction)
+                            ->convertValue($message[$paramPosition], $paramType);
+                    }
+                } else {
+                    /** Encode parameters according to their names in method signature */
+                    if (isset($message[$paramName])) {
+                        $convertedMessage[$paramName] = $this->getConverter($direction)
+                            ->convertValue($message[$paramName], $paramType);
+                    }
+                }
+
+                /** Ensure that all required params were passed */
+                if ($methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_IS_REQUIRED]
+                    && !isset($convertedMessage[$paramName])
+                ) {
+                    throw new LocalizedException(
+                        new Phrase(
+                            'Data item corresponding to "%param" must be specified '
+                            . 'in the message with topic "%topic".',
+                            [
+                                'topic' => $topic,
+                                'param' => $paramName
+                            ]
+                        )
+                    );
+                }
+            }
+        }
+        return $convertedMessage;
+    }
+
+    /**
+     * Get value converter based on conversion direction.
+     *
+     * @param string $direction
+     * @return ServicePayloadConverterInterface
+     */
+    protected function getConverter($direction)
+    {
+        return ($direction == self::DIRECTION_ENCODE) ? $this->dataObjectEncoder : $this->dataObjectDecoder;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php b/lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php
new file mode 100644
index 0000000000000..7f8196e1a5972
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Generate unique id for queue message.
+ */
+class MessageIdGenerator implements MessageIdGeneratorInterface
+{
+    /**
+     * @var \Magento\Framework\Encryption\EncryptorInterface
+     */
+    private $encryptor;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
+     */
+    public function __construct(
+        \Magento\Framework\Encryption\EncryptorInterface $encryptor
+    ) {
+        $this->encryptor = $encryptor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function generate($topicName)
+    {
+        return $this->encryptor->hash(uniqid($topicName));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php b/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
new file mode 100644
index 0000000000000..727db7d34761a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Used to generate unique id for queue message.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface MessageIdGeneratorInterface
+{
+    /**
+     * Generate unique message id based on topic name.
+     *
+     * @param string $topicName
+     * @return string
+     * @since 100.2.0
+     */
+    public function generate($topicName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php b/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
new file mode 100644
index 0000000000000..4ea462f7e1a8e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class MessageLockException to be thrown when a message being processed is already in the lock table.
+ *
+ * @api
+ * @since 100.1.0
+ */
+class MessageLockException extends LocalizedException
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
new file mode 100644
index 0000000000000..d71a527c9cbb1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Processes any type of messages except messages implementing MergedMessageInterface.
+ */
+class MessageProcessor implements MessageProcessorInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @param MessageStatusProcessor $messageStatusProcessor
+     * @param ResourceConnection $resource
+     */
+    public function __construct(
+        MessageStatusProcessor $messageStatusProcessor,
+        ResourceConnection $resource
+    ) {
+        $this->messageStatusProcessor = $messageStatusProcessor;
+        $this->resource = $resource;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messages,
+        array $messagesToAcknowledge,
+        array $mergedMessages
+    ) {
+        try {
+            $this->resource->getConnection()->beginTransaction();
+            $this->messageStatusProcessor->acknowledgeMessages($queue, $messagesToAcknowledge);
+            $this->dispatchMessages($configuration, $mergedMessages);
+            $this->resource->getConnection()->commit();
+            $this->messageStatusProcessor->acknowledgeMessages($queue, $messages);
+        } catch (ConnectionLostException $e) {
+            $this->resource->getConnection()->rollBack();
+        } catch (\Exception $e) {
+            $this->resource->getConnection()->rollBack();
+            $this->messageStatusProcessor->rejectMessages($queue, $messages);
+        }
+    }
+
+    /**
+     * Processes decoded messages, invokes callbacks, changes statuses for messages.
+     *
+     * @param ConsumerConfigurationInterface $configuration
+     * @param array $messageList
+     */
+    private function dispatchMessages(ConsumerConfigurationInterface $configuration, array $messageList)
+    {
+        foreach ($messageList as $topicName => $messages) {
+            foreach ($messages as $message) {
+                $callbacks = $configuration->getHandlers($topicName);
+                foreach ($callbacks as $callback) {
+                    call_user_func($callback, $message);
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessorInterface.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorInterface.php
new file mode 100644
index 0000000000000..c78485b7748e8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for processing queue messages.
+ */
+interface MessageProcessorInterface
+{
+    /**
+     * Processing decoded messages, invoking callbacks, changing statuses for messages.
+     *
+     * @param QueueInterface $queue
+     * @param ConsumerConfigurationInterface $configuration
+     * @param array $messages
+     * @param array $messagesToAcknowledge
+     * @param array $mergedMessages
+     * @return void
+     */
+    public function process(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messages,
+        array $messagesToAcknowledge,
+        array $mergedMessages
+    );
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessorLoader.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorLoader.php
new file mode 100644
index 0000000000000..ae6072e39cfec
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorLoader.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Loads message processor depending on the message type.
+ */
+class MessageProcessorLoader
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface
+     */
+    private $mergedMessageProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface
+     */
+    private $defaultMessageProcessor;
+
+    /**
+     * @param MessageProcessorInterface $mergedMessageProcessor
+     * @param MessageProcessorInterface $defaultMessageProcessor
+     */
+    public function __construct(
+        MessageProcessorInterface $mergedMessageProcessor,
+        MessageProcessorInterface $defaultMessageProcessor
+    ) {
+        $this->mergedMessageProcessor = $mergedMessageProcessor;
+        $this->defaultMessageProcessor = $defaultMessageProcessor;
+    }
+
+    /**
+     * Loads message processor depending on the message type.
+     *
+     * @param array $messages
+     * @return MessageProcessorInterface
+     */
+    public function load(array $messages)
+    {
+        $message = $this->getMergedMessage($messages);
+
+        return ($message instanceof MergedMessageInterface)
+            ? $this->mergedMessageProcessor : $this->defaultMessageProcessor;
+    }
+
+    /**
+     * Get first message from the list of merged messages.
+     *
+     * @param array $messages
+     * @return mixed|null
+     */
+    private function getMergedMessage(array $messages)
+    {
+        $message = null;
+
+        if ($messages) {
+            $topicMessages = array_shift($messages);
+
+            if ($topicMessages) {
+                $message = array_shift($topicMessages);
+            }
+        }
+
+        return $message;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageStatusProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MessageStatusProcessor.php
new file mode 100644
index 0000000000000..a6d97dd1e5114
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageStatusProcessor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Changes messages status.
+ */
+class MessageStatusProcessor
+{
+    /**
+     * Acknowledge all provided messages.
+     *
+     * @param QueueInterface $queue
+     * @param array $messages
+     * @return void
+     */
+    public function acknowledgeMessages(QueueInterface $queue, array $messages)
+    {
+        foreach ($messages as $message) {
+            $queue->acknowledge($message);
+        }
+    }
+
+    /**
+     * Reject all provided messages.
+     *
+     * @param QueueInterface $queue
+     * @param array $messages
+     * @return void
+     */
+    public function rejectMessages(QueueInterface $queue, array $messages)
+    {
+        foreach ($messages as $message) {
+            $queue->reject($message);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
new file mode 100644
index 0000000000000..a40bb9af1e0c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class MessageValidator to validate message with topic schema
+ *
+ */
+class MessageValidator
+{
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Identify message data schema by topic.
+     *
+     * @param string $topic
+     * @param bool $requestType
+     * @return array
+     * @throws LocalizedException
+     */
+    protected function getTopicSchema($topic, $requestType)
+    {
+        $topicConfig = $this->getCommunicationConfig()->getTopic($topic);
+        if ($topicConfig === null) {
+            throw new LocalizedException(new Phrase('Specified topic "%topic" is not declared.', ['topic' => $topic]));
+        }
+        if ($requestType) {
+            return [
+                'schema_type' => $topicConfig[CommunicationConfig::TOPIC_REQUEST_TYPE],
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_REQUEST]
+            ];
+        } else {
+            return [
+                'schema_type' => isset($topicConfig[CommunicationConfig::TOPIC_RESPONSE])
+                    ? CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS
+                    : null,
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_RESPONSE]
+            ];
+        }
+    }
+
+    /**
+     * Validate message according to the format associated with its topic
+     *
+     * @param string $topic
+     * @param mixed $message
+     * @param bool $requestType
+     * @return void
+     * @throws InvalidArgumentException
+     */
+    public function validate($topic, $message, $requestType = true)
+    {
+        $topicSchema = $this->getTopicSchema($topic, $requestType);
+        if ($topicSchema['schema_type'] == CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS) {
+            $messageDataType = $topicSchema['schema_value'];
+            $this->validateMessage($message, $messageDataType, $topic);
+        } else {
+            /** Validate message according to the method signature associated with the message topic */
+            $message = (array)$message;
+            $isIndexedArray = array_keys($message) === range(0, count($message) - 1);
+            foreach ($topicSchema['schema_value'] as $methodParameterMeta) {
+                $paramName = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_NAME];
+                $paramType = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_TYPE];
+                if ($isIndexedArray) {
+                    $paramPosition = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_POSITION];
+                    if (isset($message[$paramPosition])) {
+                        $this->validateMessage($message[$paramPosition], $paramType, $topic);
+                    }
+                } else {
+                    if (isset($message[$paramName])) {
+                        if (isset($message[$paramName])) {
+                            $this->validateMessage($message[$paramName], $paramType, $topic);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $message
+     * @param string $messageType
+     * @param string $topic
+     * @return void
+     */
+    protected function validateMessage($message, $messageType, $topic)
+    {
+        if (preg_match_all("/\\\\/", $messageType)) {
+            $this->validateClassType($message, $messageType, $topic);
+        } else {
+            $this->validatePrimitiveType($message, $messageType, $topic);
+        }
+    }
+
+    /**
+     * @param string $message
+     * @param string $messageType
+     * @param string $topic
+     * @return void
+     */
+    protected function validatePrimitiveType($message, $messageType, $topic)
+    {
+        $compareType = $messageType;
+        $realType = $this->getRealType($message);
+        if ($realType == 'array' && count($message) == 0) {
+            return;
+        } elseif ($realType == 'array' && count($message) > 0) {
+            $realType = $this->getRealType($message[0]);
+            $compareType = preg_replace('/\[\]/', '', $messageType);
+        }
+        if ($realType !== $compareType) {
+            throw new InvalidArgumentException(
+                new Phrase(
+                    'Data in topic "%topic" must be of type "%expectedType". '
+                    . '"%actualType" given.',
+                    [
+                        'topic' => $topic,
+                        'expectedType' => $messageType,
+                        'actualType' => $this->getRealType($message)
+                    ]
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string $message
+     * @param string $messageType
+     * @param string $topic
+     * @return void
+     */
+    protected function validateClassType($message, $messageType, $topic)
+    {
+        $origMessage = $message;
+        $compareType = $messageType;
+        $realType = $this->getRealType($message);
+        if ($realType == 'array' && count($message) == 0) {
+            return;
+        } elseif ($realType == 'array' && count($message) > 0) {
+            $message = $message[0];
+            $compareType = preg_replace('/\[\]/', '', $messageType);
+        }
+        if (!($message instanceof $compareType)) {
+            throw new InvalidArgumentException(
+                new Phrase(
+                    'Data in topic "%topic" must be of type "%expectedType". '
+                    . '"%actualType" given.',
+                    [
+                        'topic' => $topic,
+                        'expectedType' => $messageType,
+                        'actualType' => $this->getRealType($origMessage)
+                    ]
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string $message
+     * @return string
+     */
+    private function getRealType($message)
+    {
+        $type = is_object($message) ? get_class($message) : gettype($message);
+        $type = $type == 'boolean' ? 'bool' : $type;
+        $type = $type == 'double' ? 'float' : $type;
+        return $type == "integer" ? "int" : $type;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                CommunicationConfig::class
+            );
+        }
+        return $this->communicationConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Publisher.php
new file mode 100644
index 0000000000000..8fe77abe69136
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Amqp\Config as AmqpConfig;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * A MessageQueue Publisher to handle publishing a message.
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * Help check whether Amqp is configured.
+     *
+     * @var AmqpConfig
+     */
+    private $amqpConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     * @internal param ExchangeInterface $exchange
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageQueueConfig $messageQueueConfig,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publish($topicName, $data)
+    {
+        $this->messageValidator->validate($topicName, $data);
+        $data = $this->messageEncoder->encode($topicName, $data);
+        $envelope = $this->envelopeFactory->create(
+            [
+                'body' => $data,
+                'properties' => [
+                    'delivery_mode' => 2,
+                    'message_id' => md5(uniqid($topicName))
+                ]
+            ]
+        );
+        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $connectionName = ($connectionName === 'amqp' && !$this->isAmqpConfigured()) ? 'db' : $connectionName;
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        $exchange->enqueue($topicName, $envelope);
+        return null;
+    }
+
+    /**
+     * Check Amqp is configured.
+     *
+     * @return bool
+     */
+    private function isAmqpConfigured()
+    {
+        return $this->getAmqpConfig()->getValue(AmqpConfig::HOST) ? true : false;
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        if ($this->publisherConfig === null) {
+            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+        }
+        return $this->publisherConfig;
+    }
+
+    /**
+     * Get Amqp config instance.
+     *
+     * @return AmqpConfig
+     *
+     * @deprecated
+     */
+    private function getAmqpConfig()
+    {
+        if ($this->amqpConfig === null) {
+            $this->amqpConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(AmqpConfig::class);
+        }
+
+        return $this->amqpConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config.php
new file mode 100644
index 0000000000000..8f64ebedfeb14
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use \Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem\Iterator;
+
+/**
+ * Publisher config provides access data declared in etc/queue_publisher.xml
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Publisher config data iterator.
+     *
+     * @var Iterator
+     */
+    private $iterator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Iterator $iterator
+     */
+    public function __construct(Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublisher($topic)
+    {
+        $publisher = $this->iterator[$topic];
+        if (!$publisher) {
+            throw new LocalizedException(
+                new Phrase("Publisher '%publisher' is not declared.", ['publisher' => $topic])
+            );
+        }
+        return $publisher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublishers()
+    {
+        return $this->iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeReader.php
new file mode 100644
index 0000000000000..7c115c53c532a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeReader.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Composite reader for publisher config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * Config validator.
+     *
+     * @var ValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * Config reade list.
+     *
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface $validator
+     * @param DefaultValueProvider $defaultValueProvider
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(
+        ValidatorInterface $validator,
+        DefaultValueProvider $defaultValueProvider,
+        array $readers
+    ) {
+        $this->validator = $validator;
+        $this->readers = $readers;
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+
+        $result = $this->addDefaultConnection($result);
+
+        $this->validator->validate($result);
+
+        foreach ($result as $key => &$value) {
+            //Find enabled connection
+            $connection = null;
+            foreach ($value['connections'] as $connectionConfig) {
+                if (!$connectionConfig['disabled']) {
+                    $connection = $connectionConfig;
+                    break;
+                }
+            }
+            $value['connection'] = $connection;
+            unset($value['connections']);
+            $result[$key] = $value;
+        }
+        return $result;
+    }
+
+    /**
+     * Add default connection.
+     *
+     * @param array $config
+     * @return array
+     */
+    private function addDefaultConnection(array $config)
+    {
+        $defaultConnectionName = $this->defaultValueProvider->getConnection();
+        $default = [
+            'name' => $defaultConnectionName,
+            'exchange' => $this->defaultValueProvider->getExchange(),
+            'disabled' => false,
+        ];
+
+        foreach ($config as &$value) {
+            if (!isset($value['connections']) || empty($value['connections'])) {
+                $value['connections'][$defaultConnectionName] = $default;
+                continue;
+            }
+
+            $hasActiveConnection = false;
+            /** Find enabled connection */
+            foreach ($value['connections'] as $connectionConfig) {
+                if (!$connectionConfig['disabled']) {
+                    $hasActiveConnection = true;
+                    break;
+                }
+            }
+            if (!$hasActiveConnection) {
+                $value['connections'][$defaultConnectionName] = $default;
+            }
+        }
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeValidator.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeValidator.php
new file mode 100644
index 0000000000000..6021354b37bec
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeValidator.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Publisher config data validator.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * Config validator list.
+     *
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * Validator constructor.
+     *
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct($validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * Validate merged publisher config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     * @throws \LogicException
+     */
+    public function validate($configData)
+    {
+        foreach ($this->validators as $validator) {
+            if (!$validator instanceof ValidatorInterface) {
+                throw new \LogicException(
+                    sprintf(
+                        'Validator [%s] does not implements ' .
+                        'Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface',
+                        get_class($validator)
+                    )
+                );
+            }
+            $validator->validate($configData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Data.php
new file mode 100644
index 0000000000000..ae7552bf57496
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Publisher config data storage. Caches merged config.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        $cacheId = 'message_queue_publisher_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Env/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Env/Reader.php
new file mode 100644
index 0000000000000..77926917bf0eb
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Env/Reader.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Publisher\Config\Env;
+
+use Magento\Framework\MessageQueue\Config\Data as MessageQueueConfigData;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\MessageQueue\Config\Reader\Env as MessageQueueEnvReader;
+
+/**
+ * Publisher configuration reader. Reads data from env.php.
+ */
+class Reader implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Env
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var MessageQueueConfigData
+     */
+    private $configData;
+
+    /**
+     * Mapping between default publishers name and connections
+     *
+     * @var array
+     */
+    private $publisherNameToConnectionMap;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param MessageQueueConfigData $configData
+     * @param array $publisherNameToConnectionMap
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig,
+        MessageQueueConfigData $configData,
+        $publisherNameToConnectionMap = []
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->configData = $configData;
+        $this->publisherNameToConnectionMap = $publisherNameToConnectionMap;
+    }
+
+    /**
+     * Read publisher configuration from env.php
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $configData = $this->deploymentConfig->getConfigData(MessageQueueEnvReader::ENV_QUEUE);
+        if (isset($configData['config'])) {
+            $configData = isset($configData['config'][MessageQueueEnvReader::ENV_PUBLISHERS])
+                ? $configData['config'][MessageQueueEnvReader::ENV_PUBLISHERS]
+                : [];
+        } else {
+            $configData = isset($configData[MessageQueueEnvReader::ENV_PUBLISHERS])
+                ? $this->convertConfigData($scope)
+                : [];
+        }
+        return $configData;
+    }
+
+    /**
+     * Convert publisher related data to publisher config format
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    private function convertConfigData($scope)
+    {
+        $configData = [];
+        $topicsConfig = $this->configData->get('topics');
+        foreach ($topicsConfig as $topicName => $topicConfig) {
+            $configData[$topicName] = [];
+            if (isset($topicConfig['disabled'])) {
+                $configData[$topicName]['disabled'] = $topicConfig['disabled'];
+            }
+            $publisherName = $this->configData->get('topics/' . $topicName . '/publisher', $scope);
+            $config = $this->configData->get('publishers/' . $publisherName, $scope);
+            if (!empty($config) && isset($this->publisherNameToConnectionMap[$publisherName])) {
+                $connectionName = $this->publisherNameToConnectionMap[$publisherName];
+                $config['name'] = $config['connection'];
+                unset($config['connection']);
+                $disabled = isset($config['disabled']) ? $config['disabled'] : false;
+                $config['disabled'] = $disabled;
+                $configData[$topicName]['connections'][$connectionName] = $config;
+            }
+        }
+        return $configData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem.php
new file mode 100644
index 0000000000000..426d39efd9403
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * {@inheritdoc}
+ */
+class PublisherConfigItem implements PublisherConfigItemInterface
+{
+    /**
+     * Publisher topic name.
+     *
+     * @var string
+     */
+    private $topic;
+
+    /**
+     * Publisher connection.
+     *
+     * @var PublisherConnectionInterface
+     */
+    private $connection;
+
+    /**
+     * Flag. Is publisher disabled.
+     *
+     * @var bool
+     */
+    private $isDisabled;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param PublisherConnectionFactory $connectionFactory
+     */
+    public function __construct(PublisherConnectionFactory $connectionFactory)
+    {
+        $this->connection = $connectionFactory->create();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Set publisher config item data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->topic = $data['topic'];
+        $this->isDisabled = $data['disabled'];
+        $this->connection->setData($data['connection']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php
new file mode 100644
index 0000000000000..f0414edfc0c02
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem;
+
+use Magento\Framework\MessageQueue\Publisher\Config\Data;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemFactory;
+
+/**
+ * Publisher config data iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Publisher config item.
+     *
+     * @var PublisherConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param PublisherConfigItemFactory $itemFactory
+     */
+    public function __construct(Data $configData, PublisherConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->get();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return PublisherConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset) || $this->data[$offset]['disabled'] == true) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemFactory.php
new file mode 100644
index 0000000000000..c7e1577ed8cbb
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem
+ */
+class PublisherConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = PublisherConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemInterface.php
new file mode 100644
index 0000000000000..c9f583ddb7fca
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Instances of this class represent config items declared in etc/queue_publisher.xsd
+ */
+interface PublisherConfigItemInterface
+{
+    /**
+     * Get publisher name.
+     *
+     * @return string
+     */
+    public function getTopic();
+
+    /**
+     * Check if connection disabled.
+     *
+     * @return bool
+     */
+    public function isDisabled();
+
+    /**
+     * Get publisher connection.
+     *
+     * @return PublisherConnectionInterface
+     */
+    public function getConnection();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnection.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnection.php
new file mode 100644
index 0000000000000..542448747207b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnection.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Representation of publisher connection configuration.
+ */
+class PublisherConnection implements PublisherConnectionInterface
+{
+    /**
+     * Connection name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Exchange name.
+     *
+     * @var string
+     */
+    private $exchange;
+
+    /**
+     * Flag. Is connection disabled.
+     *
+     * @var bool
+     */
+    private $isDisabled;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchange()
+    {
+        return $this->exchange;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->exchange = $data['exchange'];
+        $this->isDisabled = $data['disabled'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionFactory.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionFactory.php
new file mode 100644
index 0000000000000..a2b51ecb0e22d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface
+ */
+class PublisherConnectionFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = PublisherConnection::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnection
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionInterface.php
new file mode 100644
index 0000000000000..71ad8c6beaef4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Representation of publisher connection configuration.
+ */
+interface PublisherConnectionInterface
+{
+    /**
+     * Get Connection name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get exchange name.
+     *
+     * @return string
+     */
+    public function getExchange();
+
+    /**
+     * Check if connection disabled.
+     *
+     * @return bool
+     */
+    public function isDisabled();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ReaderInterface.php
new file mode 100644
index 0000000000000..669daef963a13
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ReaderInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Publisher config reader interface
+ */
+interface ReaderInterface extends \Magento\Framework\Config\ReaderInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/RemoteService/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/RemoteService/Reader.php
new file mode 100644
index 0000000000000..656ed5450180f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/RemoteService/Reader.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+
+/**
+ * Reader for queue publisher configs based on remote service declaration in DI configs.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig
+     */
+    private $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DefaultValueProvider $defaultValueProvider
+     * @param ObjectManagerConfig $objectManagerConfig
+     * @param ReflectionGenerator $reflectionGenerator
+     * @param ServiceMethodsMap $serviceMethodsMap
+     */
+    public function __construct(
+        DefaultValueProvider $defaultValueProvider,
+        ObjectManagerConfig $objectManagerConfig,
+        ReflectionGenerator $reflectionGenerator,
+        ServiceMethodsMap $serviceMethodsMap
+    ) {
+        $this->defaultValueProvider = $defaultValueProvider;
+        $this->objectManagerConfig = $objectManagerConfig;
+        $this->reflectionGenerator = $reflectionGenerator;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        $connectionName = $this->defaultValueProvider->getConnection();
+        $connections = [
+            $connectionName => [
+                'name' => $connectionName,
+                'exchange' => $this->defaultValueProvider->getExchange(),
+                'disabled' => false,
+            ]
+        ];
+        foreach ($this->getRemoteServices() as $serviceInterface => $remoteImplementation) {
+            try {
+                $methodsMap = $this->serviceMethodsMap->getMethodsMap($serviceInterface);
+            } catch (\Exception $e) {
+                throw new \LogicException(sprintf('Service interface was expected, "%s" given', $serviceInterface));
+            }
+            foreach ($methodsMap as $methodName => $returnType) {
+                $topic = $this->reflectionGenerator->generateTopicName($serviceInterface, $methodName);
+                $result[$topic] = [
+                    'topic' => $topic,
+                    'disabled' => false,
+                    'connections' => $connections,
+
+                ];
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Get list of remote services declared in DI config.
+     *
+     * @return array
+     */
+    private function getRemoteServices()
+    {
+        $preferences = $this->objectManagerConfig->getPreferences();
+        $remoteServices = [];
+        foreach ($preferences as $type => $preference) {
+            if ($preference == $type . RemoteServiceGenerator::REMOTE_SERVICE_SUFFIX) {
+                $remoteServices[$type] = $preference;
+            }
+        }
+        return $remoteServices;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/EnabledConnection.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/EnabledConnection.php
new file mode 100644
index 0000000000000..01a0dff3cc73c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/EnabledConnection.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Validator;
+
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+
+/**
+ * Publisher config data validator. Validates that publisher has only one enabled connection at the same time
+ */
+class EnabledConnection implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $errors = [];
+        foreach ($configData as $name => $publisherData) {
+            if (!isset($publisherData['connections'])) {
+                continue;
+            }
+            $enabledConnections = 0;
+            foreach ($publisherData['connections'] as $connectionConfig) {
+                if ($connectionConfig['disabled'] == false) {
+                    $enabledConnections++;
+                }
+            }
+
+            if ($enabledConnections > 1) {
+                $errors[] = sprintf('More than 1 enabled connections configured for publisher %s.', $name);
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(' ', $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/Format.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/Format.php
new file mode 100644
index 0000000000000..10f8043649303
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/Format.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Validator;
+
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+
+/**
+ * Publisher config data validator. Validates that publisher config has all required fields.
+ */
+class Format implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $requiredPublisherFields = ['topic', 'disabled', 'connections'];
+        $requiredConnectionFields = ['name', 'disabled', 'exchange'];
+
+        $errors = [];
+        foreach ($configData as $name => $publisherData) {
+            $diff = array_diff($requiredPublisherFields, array_keys($publisherData));
+            foreach ($diff as $field) {
+                $errors[] = sprintf('Missing %s field for publisher %s.', $field, $name);
+            }
+
+            if (!array_key_exists('connections', $publisherData) || !is_array($publisherData['connections'])) {
+                $errors[] = sprintf('Invalid connections format for publisher %s.', $name);
+                continue;
+            }
+
+            foreach ($publisherData['connections'] as $connectionConfig) {
+                $diff = array_diff($requiredConnectionFields, array_keys($connectionConfig));
+                foreach ($diff as $field) {
+                    $errors[] = sprintf('Missing %s field for publisher %s in connection config.', $field, $name);
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(' ', $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ValidatorInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ValidatorInterface.php
new file mode 100644
index 0000000000000..8f210f44039c5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ValidatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Publisher config data validator.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate publisher config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     */
+    public function validate($configData);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php
new file mode 100644
index 0000000000000..10fc9716cb650
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Xml;
+
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Converts MessageQueue publishers config from \DOMDocument to array
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * Boolean value converter.
+     *
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Default value provider.
+     *
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BooleanUtils $booleanUtils
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(BooleanUtils $booleanUtils, DefaultValueProvider $defaultValueProvider)
+    {
+        $this->booleanUtils = $booleanUtils;
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        /** @var $publisherConfig \DOMElement */
+        foreach ($source->getElementsByTagName('publisher') as $publisherConfig) {
+            $topic = $this->getAttributeValue($publisherConfig, 'topic');
+
+            $connections = [];
+            /** @var \DOMNode $connectionConfig */
+            foreach ($publisherConfig->childNodes as $connectionConfig) {
+                if ($connectionConfig->nodeName != 'connection' || $connectionConfig->nodeType != XML_ELEMENT_NODE) {
+                    continue;
+                }
+                $connectionName = $this->getAttributeValue($connectionConfig, 'name');
+                if (!$connectionName) {
+                    throw new \InvalidArgumentException('Connection name is missing');
+                }
+                $exchangeName = $this->getAttributeValue(
+                    $connectionConfig,
+                    'exchange',
+                    $this->defaultValueProvider->getExchange()
+                );
+                $isDisabled = $this->getAttributeValue($connectionConfig, 'disabled', false);
+                $connections[$connectionName] = [
+                    'name' => $connectionName,
+                    'exchange' => $exchangeName,
+                    'disabled' => $this->booleanUtils->toBoolean($isDisabled),
+                ];
+            }
+            $isDisabled = $this->getAttributeValue($publisherConfig, 'disabled', false);
+            $result[$topic] = [
+                'topic' => $topic,
+                'disabled' => $this->booleanUtils->toBoolean($isDisabled),
+                'connections' => $connections,
+
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    private function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Reader.php
new file mode 100644
index 0000000000000..6a6625423f33e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Reader.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Xml;
+
+use \Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface;
+
+/**
+ * Reader for etc/queue_publisher.xml configs.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_idAttributes = [
+        '/config/publisher' => 'topic',
+        '/config/publisher/connection' => 'name'
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue_publisher.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/SchemaLocator.php
new file mode 100644
index 0000000000000..aa9b2127f0ea1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/SchemaLocator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Xml;
+
+/**
+ * Schema locator for etc/queue_publisher.xml
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
new file mode 100644
index 0000000000000..7b5586b28a273
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface;
+
+/**
+ * Publisher config interface provides access data declared in etc/queue_publisher.xml
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ConfigInterface
+{
+    /**
+     * Get publisher configuration by topic.
+     *
+     * @param string $topic
+     * @return PublisherConfigItemInterface
+     * @throws LocalizedException
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getPublisher($topic);
+
+    /**
+     * Get list of all publishers declared in the system.
+     *
+     * @return PublisherConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getPublishers();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php b/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
new file mode 100644
index 0000000000000..1aee963b1bd47
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Producer to publish messages via a specific transport to a specific queue or exchange.
+ *
+ * @api
+ */
+interface PublisherInterface
+{
+    /**
+     * Publishes a message to a specific queue or exchange.
+     *
+     * @param string $topicName
+     * @param array|object $data
+     * @return null|mixed
+     * @throws \InvalidArgumentException If message is not formed properly
+     */
+    public function publish($topicName, $data);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php b/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
new file mode 100644
index 0000000000000..2c1e4e64c7d71
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * Publishers pool.
+ *
+ * @api
+ * @since 100.1.0
+ */
+class PublisherPool implements PublisherInterface, BulkPublisherInterface
+{
+    const MODE_SYNC = 'sync';
+    const MODE_ASYNC = 'async';
+
+    /**
+     * @deprecated
+     */
+    const TYPE = 'type';
+
+    /**
+     * @deprecated
+     */
+    const CONNECTION_NAME = 'connectionName';
+
+    /**
+     * Publisher objects pool.
+     *
+     * @var \Magento\Framework\MessageQueue\PublisherInterface[]
+     * @since 100.1.0
+     */
+    protected $publishers = [];
+
+    /**
+     * Communication config.
+     *
+     * @var CommunicationConfig
+     * @since 100.1.0
+     */
+    protected $communicationConfig;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CommunicationConfig $communicationConfig
+     * @param QueueConfig $queueConfig
+     * @param string[] $publishers
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @since 100.1.0
+     */
+    public function __construct(
+        CommunicationConfig $communicationConfig,
+        QueueConfig $queueConfig,
+        array $publishers
+    ) {
+        $this->communicationConfig = $communicationConfig;
+        $this->initializePublishers($publishers);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.1.0
+     */
+    public function publish($topicName, $data)
+    {
+        $publisherType = $this->communicationConfig->getTopic($topicName)[CommunicationConfig::TOPIC_IS_SYNCHRONOUS]
+            ? self::MODE_SYNC
+            : self::MODE_ASYNC;
+        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $publisher = $this->getPublisherForConnectionNameAndType($publisherType, $connectionName);
+        return $publisher->publish($topicName, $data);
+    }
+
+    /**
+     * Initialize publisher objects pool.
+     *
+     * @param array $publishers
+     * @return void
+     */
+    private function initializePublishers(array $publishers)
+    {
+        $asyncPublishers = isset($publishers[self::MODE_ASYNC]) ? $publishers[self::MODE_ASYNC] : [];
+        $syncPublishers = isset($publishers[self::MODE_SYNC]) ? $publishers[self::MODE_SYNC] : [];
+        foreach ($asyncPublishers as $connectionType => $publisher) {
+            $this->addPublisherToPool(
+                self::MODE_ASYNC,
+                $connectionType,
+                $publisher
+            );
+        }
+        foreach ($syncPublishers as $connectionType => $publisher) {
+            $this->addPublisherToPool(
+                self::MODE_SYNC,
+                $connectionType,
+                $publisher
+            );
+        }
+    }
+
+    /**
+     * Add publisher.
+     *
+     * @param string $type
+     * @param string $connectionType
+     * @param PublisherInterface $publisher
+     * @return $this
+     */
+    private function addPublisherToPool($type, $connectionType, PublisherInterface $publisher)
+    {
+        $this->publishers[$type][$connectionType] = $publisher;
+        return $this;
+    }
+
+    /**
+     * Return an instance of a publisher for a connection name.
+     *
+     * @param string $type
+     * @param string $connectionName
+     * @return PublisherInterface
+     * @throws \LogicException
+     * @throws \InvalidArgumentException
+     */
+    private function getPublisherForConnectionNameAndType($type, $connectionName)
+    {
+        $connectionType = $this->getConnectionTypeResolver()->getConnectionType($connectionName);
+        if (!isset($this->publishers[$type])) {
+            throw new \InvalidArgumentException('Unknown publisher type ' . $type);
+        }
+
+        if (!isset($this->publishers[$type][$connectionType])) {
+            throw new \LogicException(
+                sprintf(
+                    'Could not find an implementation type for type "%s" and connection "%s".',
+                    $type,
+                    $connectionName
+                )
+            );
+        }
+        return $this->publishers[$type][$connectionType];
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        if ($this->publisherConfig === null) {
+            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+        }
+        return $this->publisherConfig;
+    }
+
+    /**
+     * Get connection type resolver.
+     *
+     * @return ConnectionTypeResolver
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConnectionTypeResolver()
+    {
+        if ($this->connectionTypeResolver === null) {
+            $this->connectionTypeResolver = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ConnectionTypeResolver::class);
+        }
+        return $this->connectionTypeResolver;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php b/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
new file mode 100644
index 0000000000000..eb734df06a59f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Queuenterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+class QueueFactory implements QueueFactoryInterface
+{
+    /**
+     * @var QueueFactoryInterface[]
+     */
+    private $queueFactories;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     * @since 100.2.0
+     */
+    protected $objectManager = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConnectionTypeResolver $connectionTypeResolver
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param QueueFactoryInterface[] $queueFactories
+     * @since 100.2.0
+     */
+    public function __construct(
+        ConnectionTypeResolver $connectionTypeResolver,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        array $queueFactories = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->queueFactories = $queueFactories;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.2.0
+     */
+    public function create($queueName, $connectionName)
+    {
+        $connectionType = $this->connectionTypeResolver->getConnectionType($connectionName);
+        if (!isset($this->queueFactories[$connectionType])) {
+            throw new \LogicException("Not found queue for connection name '{$connectionName}' in config");
+        }
+        $factory = $this->queueFactories[$connectionType];
+        $queue = $factory->create($queueName, $connectionName);
+
+        if (!$queue instanceof QueueInterface) {
+            $queueInterface = \Magento\Framework\MessageQueue\QueueInterface::class;
+            throw new \LogicException(
+                "Queue for connection name '{$connectionName}' does not implement interface '{$queueInterface}'"
+            );
+        }
+        return $queue;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
new file mode 100644
index 0000000000000..697db9296b5b0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\QueueInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface QueueFactoryInterface
+{
+    /**
+     * Create queue instance.
+     *
+     * @param string $queueName
+     * @param string $connectionName
+     * @return QueueInterface
+     * @since 100.2.0
+     */
+    public function create($queueName, $connectionName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php b/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
new file mode 100644
index 0000000000000..1b3814b8e857a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for interaction with message queue.
+ *
+ * @api
+ */
+interface QueueInterface
+{
+    /**
+     * Get message from queue
+     *
+     * @return EnvelopeInterface
+     */
+    public function dequeue();
+
+    /**
+     * Acknowledge message delivery
+     *
+     * @param EnvelopeInterface $envelope
+     * @return void
+     */
+    public function acknowledge(EnvelopeInterface $envelope);
+
+    /**
+     * Wait for messages and dispatch them
+     *
+     * @param callable|array $callback
+     * @return void
+     */
+    public function subscribe($callback);
+
+    /**
+     * Reject message
+     *
+     * @param EnvelopeInterface $envelope
+     * @param bool $requeue
+     * @param string $rejectionMessage
+     * @return void
+     */
+    public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null);
+
+    /**
+     * Push message to queue directly, without using exchange
+     *
+     * @param EnvelopeInterface $envelope
+     * @return void
+     * @since 100.1.0
+     */
+    public function push(EnvelopeInterface $envelope);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php b/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
new file mode 100644
index 0000000000000..5d04003c9ade0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Queue factory
+ */
+class QueueRepository
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var QueueInterface[]
+     */
+    private $queueInstances;
+
+    /**
+     * @var QueueFactoryInterface
+     */
+    private $queueFactory;
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string[] $queues
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $queues = [])
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Get queue instance by connection name and queue name.
+     *
+     * @param string $connectionName
+     * @param string $queueName
+     * @return QueueInterface
+     * @throws \LogicException
+     */
+    public function get($connectionName, $queueName)
+    {
+        if (!isset($this->queueInstances[$connectionName][$queueName])) {
+            $queue = $this->getQueueFactory()->create($queueName, $connectionName);
+            $this->queueInstances[$connectionName][$queueName] = $queue;
+        }
+        return $this->queueInstances[$connectionName][$queueName];
+    }
+
+    /**
+     * Get queue factory.
+     *
+     * @return QueueFactoryInterface
+     * @deprecated 100.2.0
+     */
+    private function getQueueFactory()
+    {
+        if ($this->queueFactory === null) {
+            $this->queueFactory = $this->objectManager->get(QueueFactoryInterface::class);
+        }
+        return $this->queueFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/README.md b/lib/internal/Magento/Framework/MessageQueue/README.md
new file mode 100644
index 0000000000000..9708d30102f43
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/README.md
@@ -0,0 +1 @@
+This component is designed to provide Message Queue Framework 
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
new file mode 100644
index 0000000000000..10ef24c462808
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Rpc;
+
+/**
+ * A MessageQueue Consumer to handle receiving, processing and replying to an RPC message.
+ *
+ * @deprecated 100.2.0
+ */
+class Consumer extends \Magento\Framework\MessageQueue\Consumer
+{
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
new file mode 100644
index 0000000000000..89b987cbb4405
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Rpc;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\ExchangeRepository;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * A MessageQueue Publisher to handle publishing a message.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    //@codingStandardsIgnoreStart
+    /**
+     * Initialize dependencies.
+     *
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param null $messageQueueConfig @deprecated obsolete dependency
+     * @param null $amqpConfig @deprecated obsolete dependency
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        $messageQueueConfig = null,
+        $amqpConfig = null,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+    }
+    //@codingStandardsIgnoreEnd
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publish($topicName, $data)
+    {
+        $this->messageValidator->validate($topicName, $data);
+        $data = $this->messageEncoder->encode($topicName, $data);
+        $replyTo = $this->getResponseQueueNameBuilder()->getQueueName($topicName);
+        $envelope = $this->envelopeFactory->create(
+            [
+                'body' => $data,
+                'properties' => [
+                    'reply_to' => $replyTo,
+                    'delivery_mode' => 2,
+                    'correlation_id' => rand(),
+                    'message_id' => md5(uniqid($topicName))
+                ]
+            ]
+        );
+        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        $responseMessage = $exchange->enqueue($topicName, $envelope);
+        return $this->messageEncoder->decode($topicName, $responseMessage, false);
+    }
+
+    /**
+     * Get response queue name builder.
+     *
+     * @return ResponseQueueNameBuilder
+     *
+     * @deprecated 100.2.0
+     */
+    private function getResponseQueueNameBuilder()
+    {
+        if ($this->responseQueueNameBuilder === null) {
+            $this->responseQueueNameBuilder = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ResponseQueueNameBuilder::class);
+        }
+        return $this->responseQueueNameBuilder;
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        if ($this->publisherConfig === null) {
+            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+        }
+        return $this->publisherConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/ResponseQueueNameBuilder.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/ResponseQueueNameBuilder.php
new file mode 100644
index 0000000000000..8115a5f6ee28d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/ResponseQueueNameBuilder.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Rpc;
+
+class ResponseQueueNameBuilder
+{
+    /**
+     * Response queue name prefix
+     */
+    const RESPONSE_QUEUE_PREFIX = 'responseQueue.';
+
+    /**
+     * Get response queue name.
+     *
+     * @param string $topicName
+     * @return string
+     */
+    public function getQueueName($topicName)
+    {
+        return self::RESPONSE_QUEUE_PREFIX . str_replace('-', '_', $topicName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/BatchConsumerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/BatchConsumerTest.php
new file mode 100644
index 0000000000000..32120e12cf677
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/BatchConsumerTest.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+/**
+ * Unit test for BatchConsumer class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BatchConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configuration;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\QueueRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MergerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mergerFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageController;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\BatchConsumer
+     */
+    private $batchConsumer;
+
+    /**
+     * @var int
+     */
+    private $batchSize = 10;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorLoader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageProcessorLoader;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configuration = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->mergerFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergerFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageProcessorLoader = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorLoader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->batchConsumer = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\BatchConsumer::class,
+            [
+                'configuration' => $this->configuration,
+                'messageEncoder' => $this->messageEncoder,
+                'queueRepository' => $this->queueRepository,
+                'mergerFactory' => $this->mergerFactory,
+                'resource' => $this->resource,
+                'batchSize' => $this->batchSize,
+                'messageProcessorLoader' => $this->messageProcessorLoader
+            ]
+        );
+
+        $this->consumerConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->batchConsumer,
+            'consumerConfig',
+            $this->consumerConfig
+        );
+        $this->messageController = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageController::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->batchConsumer,
+            'messageController',
+            $this->messageController
+        );
+    }
+
+    /**
+     * Test for process().
+     *
+     * @return void
+     */
+    public function testProcess()
+    {
+        $queueName = 'queue.name';
+        $consumerName = 'consumerName';
+        $connectionName = 'connection_name';
+        $topicName = 'topicName';
+        $messageBody = 'messageBody';
+        $message = ['message_data'];
+        $numberOfMessages = 2;
+        $this->configuration->expects($this->once())->method('getQueueName')->willReturn($queueName);
+        $this->configuration->expects($this->atLeastOnce())->method('getConsumerName')->willReturn($consumerName);
+        $consumerConfigItem = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->consumerConfig->expects($this->once())
+            ->method('getConsumer')->with($consumerName)->willReturn($consumerConfigItem);
+        $consumerConfigItem->expects($this->once())->method('getConnection')->willReturn($connectionName);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository->expects($this->once())
+            ->method('get')->with($connectionName, $queueName)->willReturn($queue);
+        $merger = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->mergerFactory->expects($this->once())->method('create')->with($consumerName)->willReturn($merger);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $queue->expects($this->exactly($numberOfMessages))->method('dequeue')->willReturn($envelope);
+        $this->messageController->expects($this->exactly($numberOfMessages))
+            ->method('lock')->with($envelope, $consumerName);
+        $envelope->expects($this->exactly($numberOfMessages))
+            ->method('getProperties')->willReturn(['topic_name' => $topicName]);
+        $envelope->expects($this->exactly($numberOfMessages))
+            ->method('getBody')->willReturn($messageBody);
+        $this->messageEncoder->expects($this->exactly($numberOfMessages))
+            ->method('decode')->with($topicName, $messageBody)->willReturn($message);
+        $messageProcessor = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->messageProcessorLoader->expects($this->atLeastOnce())->method('load')->willReturn($messageProcessor);
+        $merger->expects($this->once())->method('merge')
+            ->with([$topicName => [$message, $message]])->willReturnArgument(0);
+
+        $this->batchConsumer->process($numberOfMessages);
+    }
+
+    /**
+     * Test for process() with MessageLockException.
+     *
+     * @return void
+     */
+    public function testProcessWithMessageLockException()
+    {
+        $queueName = 'queue.name';
+        $consumerName = 'consumerName';
+        $connectionName = 'connection_name';
+        $numberOfMessages = 2;
+        $this->configuration->expects($this->once())->method('getQueueName')->willReturn($queueName);
+        $this->configuration->expects($this->atLeastOnce())->method('getConsumerName')->willReturn($consumerName);
+        $consumerConfigItem = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->consumerConfig->expects($this->once())
+            ->method('getConsumer')->with($consumerName)->willReturn($consumerConfigItem);
+        $consumerConfigItem->expects($this->once())->method('getConnection')->willReturn($connectionName);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository->expects($this->once())
+            ->method('get')->with($connectionName, $queueName)->willReturn($queue);
+        $merger = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->mergerFactory->expects($this->once())->method('create')->with($consumerName)->willReturn($merger);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $queue->expects($this->exactly($numberOfMessages))->method('dequeue')->willReturn($envelope);
+        $exception = new \Magento\Framework\MessageQueue\MessageLockException(__('Exception Message'));
+        $this->messageController->expects($this->atLeastOnce())
+            ->method('lock')->with($envelope, $consumerName)->willThrowException($exception);
+        $messageProcessor = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->messageProcessorLoader->expects($this->atLeastOnce())->method('load')->willReturn($messageProcessor);
+        $merger->expects($this->once())->method('merge')->willReturn([]);
+
+        $this->batchConsumer->process($numberOfMessages);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeFactoryTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeFactoryTest.php
new file mode 100644
index 0000000000000..fd8ccb86d970d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeFactoryTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk;
+
+/**
+ * Unit test for ExchangeFactory.
+ */
+class ExchangeFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConnectionTypeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $amqpExchangeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeFactory
+     */
+    private $exchangeFactory;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->connectionTypeResolver = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\ConnectionTypeResolver::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $this->amqpExchangeFactory = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\ExchangeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->exchangeFactory = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\ExchangeFactory::class,
+            [
+                'connectionTypeResolver' => $this->connectionTypeResolver,
+                'exchangeFactories' => ['amqp' => $this->amqpExchangeFactory],
+            ]
+        );
+    }
+
+    /**
+     * Test for create method.
+     *
+     * @return void
+     */
+    public function testCreate()
+    {
+        $connectionName = 'amqp';
+        $data = ['key1' => 'value1'];
+        $this->connectionTypeResolver->expects($this->once())
+            ->method('getConnectionType')->with($connectionName)->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->amqpExchangeFactory->expects($this->once())
+            ->method('create')->with($connectionName, $data)->willReturn($exchange);
+        $this->assertEquals($exchange, $this->exchangeFactory->create($connectionName, $data));
+    }
+
+    /**
+     * Test for create method with undefined connection type.
+     *
+     * @return void
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Not found exchange for connection name 'db' in config
+     */
+    public function testCreateWithUndefinedConnectionType()
+    {
+        $connectionName = 'db';
+        $data = ['key1' => 'value1'];
+        $this->connectionTypeResolver->expects($this->once())
+            ->method('getConnectionType')->with($connectionName)->willReturn($connectionName);
+        $this->amqpExchangeFactory->expects($this->never())->method('create');
+        $this->exchangeFactory->create($connectionName, $data);
+    }
+
+    /**
+     * Test for create method with wrong exchange type.
+     *
+     * @return void
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Exchange for connection name 'amqp' does not implement interface
+     */
+    public function testCreateWithWrongExchangeType()
+    {
+        $connectionName = 'amqp';
+        $data = ['key1' => 'value1'];
+        $this->connectionTypeResolver->expects($this->once())
+            ->method('getConnectionType')->with($connectionName)->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->amqpExchangeFactory->expects($this->once())
+            ->method('create')->with($connectionName, $data)->willReturn($exchange);
+        $this->exchangeFactory->create($connectionName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeRepositoryTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeRepositoryTest.php
new file mode 100644
index 0000000000000..63c7f37ff3f05
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeRepositoryTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk;
+
+/**
+ * Unit test for ExchangeRepository.
+ */
+class ExchangeRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exchangeFactory = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->exchangeRepository = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\ExchangeRepository::class
+        );
+        $objectManager->setBackwardCompatibleProperty(
+            $this->exchangeRepository,
+            'exchangeFactory',
+            $this->exchangeFactory
+        );
+    }
+
+    /**
+     * Test for getByConnectionName method.
+     *
+     * @return void
+     */
+    public function testGetByConnectionName()
+    {
+        $connectionName = 'amqp';
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchangeFactory->expects($this->once())->method('create')->with($connectionName)->willReturn($exchange);
+        $this->assertEquals($exchange, $this->exchangeRepository->getByConnectionName($connectionName));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/PublisherTest.php
new file mode 100644
index 0000000000000..c429a17096f90
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/PublisherTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk;
+
+/**
+ * Unit test for Publisher.
+ */
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\EnvelopeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageValidator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\Publisher
+     */
+    private $publisher;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exchangeRepository = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Bulk\ExchangeRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->envelopeFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageValidator = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageValidator::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageIdGeneratorInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->publisher = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\Publisher::class,
+            [
+                'exchangeRepository' => $this->exchangeRepository,
+                'envelopeFactory' => $this->envelopeFactory,
+                'messageEncoder' => $this->messageEncoder,
+                'messageValidator' => $this->messageValidator,
+                'publisherConfig' => $this->publisherConfig,
+                'messageIdGenerator' => $this->messageIdGenerator,
+            ]
+        );
+    }
+
+    /**
+     * Test for publish method.
+     *
+     * @return void
+     */
+    public function testPublish()
+    {
+        $messageId = 'message-id-001';
+        $topicName = 'topic.name';
+        $message = 'messageBody';
+        $encodedMessage = 'encodedMessageBody';
+        $connectionName = 'amqp';
+        $this->messageValidator->expects($this->once())->method('validate')->with($topicName, $message);
+        $this->messageEncoder->expects($this->once())
+            ->method('encode')->with($topicName, $message)->willReturn($encodedMessage);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator->expects($this->once())
+            ->method('generate')->with($topicName)->willReturn($messageId);
+        $this->envelopeFactory->expects($this->once())->method('create')->with(
+            [
+                'body' => $encodedMessage,
+                'properties' => [
+                    'delivery_mode' => 2,
+                    'message_id' => $messageId,
+                ]
+            ]
+        )->willReturn($envelope);
+        $publisher = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig->expects($this->once())
+            ->method('getPublisher')->with($topicName)->willReturn($publisher);
+        $connection = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $publisher->expects($this->once())->method('getConnection')->with()->willReturn($connection);
+        $connection->expects($this->once())->method('getName')->with()->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchangeRepository->expects($this->once())
+            ->method('getByConnectionName')->with($connectionName)->willReturn($exchange);
+        $exchange->expects($this->once())->method('enqueue')->with($topicName, [$envelope])->willReturn(null);
+        $this->assertNull($this->publisher->publish($topicName, [$message]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/Rpc/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/Rpc/PublisherTest.php
new file mode 100644
index 0000000000000..014fc234f3a5b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/Rpc/PublisherTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk\Rpc;
+
+/**
+ * Unit test for Publisher.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\EnvelopeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageValidator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\Rpc\Publisher
+     */
+    private $publisher;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exchangeRepository = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Bulk\ExchangeRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->envelopeFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageValidator = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageValidator::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->responseQueueNameBuilder = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageIdGeneratorInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->publisher = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\Rpc\Publisher::class,
+            [
+                'exchangeRepository' => $this->exchangeRepository,
+                'envelopeFactory' => $this->envelopeFactory,
+                'messageEncoder' => $this->messageEncoder,
+                'messageValidator' => $this->messageValidator,
+                'publisherConfig' => $this->publisherConfig,
+                'responseQueueNameBuilder' => $this->responseQueueNameBuilder,
+                'messageIdGenerator' => $this->messageIdGenerator,
+            ]
+        );
+    }
+
+    /**
+     * Test for publish method.
+     *
+     * @return void
+     */
+    public function testPublish()
+    {
+        $messageId = 'message-id-001';
+        $topicName = 'topic.name';
+        $message = 'messageBody';
+        $encodedMessage = 'encodedMessageBody';
+        $connectionName = 'amqp';
+        $queueName = 'queueName';
+        $this->responseQueueNameBuilder->expects($this->once())
+            ->method('getQueueName')->with($topicName)->willReturn($queueName);
+        $this->messageValidator->expects($this->once())->method('validate')->with($topicName, $message);
+        $this->messageEncoder->expects($this->once())
+            ->method('encode')->with($topicName, $message)->willReturn($encodedMessage);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator->expects($this->once())
+            ->method('generate')->with($topicName)->willReturn($messageId);
+        $this->envelopeFactory->expects($this->once())->method('create')->with(
+            $this->logicalAnd(
+                $this->arrayHasKey('body'),
+                $this->arrayHasKey('properties'),
+                $this->contains($encodedMessage)
+            )
+        )->willReturn($envelope);
+        $publisher = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig->expects($this->once())
+            ->method('getPublisher')->with($topicName)->willReturn($publisher);
+        $connection = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $publisher->expects($this->once())->method('getConnection')->with()->willReturn($connection);
+        $connection->expects($this->once())->method('getName')->with()->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchangeRepository->expects($this->once())
+            ->method('getByConnectionName')->with($connectionName)->willReturn($exchange);
+        $exchange->expects($this->once())->method('enqueue')->with($topicName, [$envelope])->willReturn(null);
+        $this->assertNull($this->publisher->publish($topicName, [$message]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/RemoteServiceGeneratorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/RemoteServiceGeneratorTest.php
new file mode 100644
index 0000000000000..e81dc65c6869e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/RemoteServiceGeneratorTest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Code\Generator;
+
+use Composer\Autoload\ClassLoader;
+use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class RemoteServiceGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CommunicationConfigInterface|MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var RemoteServiceGenerator|MockObject
+     */
+    private $generator;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->communicationConfig = $this->getMockBuilder(CommunicationConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $loader = new ClassLoader();
+        $loader->addPsr4(
+            'Magento\\Framework\\MessageQueue\\Code\\Generator\\',
+            __DIR__ . '/_files'
+        );
+        $loader->register();
+    }
+
+    /**
+     * Checks a test case when generator should be possible to generate code
+     * for a specified interface.
+     *
+     * @param string $sourceClassName
+     * @param string $resultClassName
+     * @param string $topicName
+     * @param string $fileName
+     * @dataProvider interfaceDataProvider
+     */
+    public function testGenerate($sourceClassName, $resultClassName, $topicName, $fileName)
+    {
+        $this->createGenerator($sourceClassName, $resultClassName);
+
+        $this->communicationConfig->method('getTopic')
+            ->willReturnMap(
+                [
+                    [$topicName . '.save', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.get', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.getById', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.getList', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.delete', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.deleteById', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                ]
+            );
+        $expectedResult = file_get_contents(__DIR__ . '/_files/' . $fileName);
+        $this->validateGeneratedCode($expectedResult);
+    }
+
+    /**
+     * Get list of variations for testing remote service generator.
+     *
+     * @return array
+     */
+    public function interfaceDataProvider()
+    {
+        return [
+            [
+                '\\' . \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                '\\' . \Magento\Customer\Api\CustomerRepositoryInterfaceRemote::class,
+                'magento.customer.api.customerRepositoryInterface',
+                'RemoteService.txt'
+            ],
+            [
+                '\\' . \Magento\Framework\MessageQueue\Code\Generator\TRepositoryInterface::class,
+                '\\' . \Magento\Framework\MessageQueue\Code\Generator\TRepositoryInterfaceRemote::class,
+                'magento.framework.messageQueue.code.generator.tRepositoryInterface',
+                'TRemoteService.txt'
+            ]
+        ];
+    }
+
+    /**
+     * Checks if generated code matches provided expected result.
+     *
+     * @param string $expectedResult
+     * @return void
+     */
+    private function validateGeneratedCode($expectedResult)
+    {
+        $reflectionObject = new \ReflectionObject($this->generator);
+        $reflectionMethod = $reflectionObject->getMethod('_generateCode');
+        $reflectionMethod->setAccessible(true);
+        $generatedCode = $reflectionMethod->invoke($this->generator);
+        self::assertEquals($expectedResult, $generatedCode);
+    }
+
+    /**
+     * Creates instance of RemoveServiceGenerator::class with all required dependencies.
+     *
+     * @param string $sourceClassName
+     * @param string $resultClassName
+     */
+    private function createGenerator($sourceClassName, $resultClassName)
+    {
+        $methodMap = $this->createMethodMap();
+        $this->generator = $this->objectManager->getObject(
+            RemoteServiceGenerator::class,
+            [
+                'communicationConfig' => $this->communicationConfig,
+                'serviceMethodsMap' => $methodMap,
+                'sourceClassName' => $sourceClassName,
+                'resultClassName' => $resultClassName,
+                'classGenerator' => null
+            ]
+        );
+
+        $reflectionGenerator = $this->objectManager->getObject(ReflectionGenerator::class);
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->generator,
+            'reflectionGenerator',
+            $reflectionGenerator
+        );
+    }
+
+    /**
+     * Creates instance of MethodsMap::class.
+     *
+     * @return MethodsMap
+     */
+    private function createMethodMap()
+    {
+        $cache = $this->getMockBuilder(FrontendInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cache->method('load')
+            ->willReturn(false);
+
+        $serializer = $this->getMockBuilder(SerializerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $typeProcessor = $this->objectManager->getObject(TypeProcessor::class);
+
+        /** @var MethodsMap $serviceMethodMap */
+        $serviceMethodMap = $this->objectManager->getObject(MethodsMap::class, [
+            'cache' => $cache,
+            'typeProcessor' => $typeProcessor
+        ]);
+        $this->objectManager->setBackwardCompatibleProperty(
+            $serviceMethodMap,
+            'serializer',
+            $serializer
+        );
+
+        return $serviceMethodMap;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/RemoteService.txt b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/RemoteService.txt
new file mode 100644
index 0000000000000..d5cfe74440699
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/RemoteService.txt
@@ -0,0 +1,90 @@
+namespace Magento\Customer\Api;
+
+/**
+ * Remote class for @see \Magento\Customer\Api\CustomerRepositoryInterface
+ */
+class CustomerRepositoryInterfaceRemote implements CustomerRepositoryInterface
+{
+    /**
+     * Publisher
+     *
+     * @var \Magento\Framework\MessageQueue\PublisherInterface
+     */
+    protected $publisher = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\PublisherInterface $publisher
+     */
+    public function __construct(\Magento\Framework\MessageQueue\PublisherInterface $publisher)
+    {
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.save',
+            ['customer' => $customer, 'passwordHash' => $passwordHash]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($email, $websiteId = null)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.get',
+            ['email' => $email, 'websiteId' => $websiteId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getById($customerId)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.getById',
+            ['customerId' => $customerId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.getList',
+            ['searchCriteria' => $searchCriteria]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.delete',
+            ['customer' => $customer]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteById($customerId)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.deleteById',
+            ['customerId' => $customerId]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TInterface.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TInterface.php
new file mode 100644
index 0000000000000..687d1f0cc11ac
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TInterface.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+interface TInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRemoteService.txt b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRemoteService.txt
new file mode 100644
index 0000000000000..6d88b6b59f8a4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRemoteService.txt
@@ -0,0 +1,90 @@
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+/**
+ * Remote class for @see \Magento\Framework\MessageQueue\Code\Generator\TRepositoryInterface
+ */
+class TRepositoryInterfaceRemote implements TRepositoryInterface
+{
+    /**
+     * Publisher
+     *
+     * @var \Magento\Framework\MessageQueue\PublisherInterface
+     */
+    protected $publisher = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\PublisherInterface $publisher
+     */
+    public function __construct(\Magento\Framework\MessageQueue\PublisherInterface $publisher)
+    {
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t) : \Magento\Framework\MessageQueue\Code\Generator\TInterface
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.save',
+            ['t' => $t]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get(string $attribute, int $typeId = null) : \Magento\Framework\MessageQueue\Code\Generator\TInterface
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.get',
+            ['attribute' => $attribute, 'typeId' => $typeId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getById(int $tId) : \Magento\Framework\MessageQueue\Code\Generator\TInterface
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.getById',
+            ['tId' => $tId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.getList',
+            ['searchCriteria' => $searchCriteria]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t) : bool
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.delete',
+            ['t' => $t]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteById(int $tId) : bool
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.deleteById',
+            ['tId' => $tId]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRepositoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRepositoryInterface.php
new file mode 100644
index 0000000000000..592cab83fef62
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRepositoryInterface.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+/**
+ * Stub interface for remote service generator with PHP 7.0 syntax.
+ */
+interface TRepositoryInterface
+{
+    /**
+     * Saves TInterface entity.
+     *
+     * @param TInterface $t
+     * @return \Magento\Framework\MessageQueue\Code\Generator\TInterface
+     */
+    public function save(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t)
+        : \Magento\Framework\MessageQueue\Code\Generator\TInterface;
+
+    /**
+     * Retrieves TInterfaces entity.
+     *
+     * @param string $attribute
+     * @param int|null $typeId
+     * @return TInterface
+     */
+    public function get(string $attribute, int $typeId = null)
+        : \Magento\Framework\MessageQueue\Code\Generator\TInterface;
+
+    /**
+     * Retrieves TInterface entity by id.
+     *
+     * @param int $tId
+     * @return TInterface
+     */
+    public function getById(int $tId) : \Magento\Framework\MessageQueue\Code\Generator\TInterface;
+
+    /**
+     * Gets list of TInterface entities.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Framework\MessageQueue\Code\Generator\TSearchResultsInterface
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+
+    /**
+     * Deletes TInterface entity.
+     *
+     * @param TInterface $t
+     * @return bool
+     */
+    public function delete(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t) : bool;
+
+    /**
+     * Deletes TInterface entity by id.
+     *
+     * @param int $tId
+     * @return bool
+     */
+    public function deleteById(int $tId) : bool;
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
new file mode 100644
index 0000000000000..0eaddf35004e7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Consumer;
+
+use Magento\Framework\MessageQueue\Config\Consumer\ConfigReaderPlugin as ConsumerConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Consumer\Config\CompositeReader as ConsumerConfigCompositeReader;
+
+class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConsumerConfigReaderPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ConsumerConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(ConsumerConfigCompositeReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            ConsumerConfigReaderPlugin::class,
+            ['config' => $this->configMock]
+        );
+    }
+
+    public function testAfterRead()
+    {
+        $result = ['consumer0' => []];
+        $consumers = [
+            [
+                'name' => 'consumer1',
+                'handlers' => [
+                    ['handlerConfig1_1_1', 'handlerConfig1_1_2'],
+                    ['handlerConfig1_2_1']
+                ],
+                'queue' => ['item1_1', 'item1_2'],
+                'instance_type' => 'type1',
+                'connection' => 'connection1',
+                'max_messages' => 100
+            ],
+            [
+                'name' => 'consumer2',
+                'handlers' => [],
+                'queue' => ['item2_1'],
+                'instance_type' => 'type2',
+                'connection' => 'connection2',
+                'max_messages' => 2
+            ]
+        ];
+        $finalResult = [
+            'consumer1' => [
+                'name' => 'consumer1',
+                'queue' => ['item1_1', 'item1_2'],
+                'consumerInstance' => 'type1',
+                'handlers' => ['handlerConfig1_1_1', 'handlerConfig1_1_2', 'handlerConfig1_2_1'],
+                'connection' => 'connection1',
+                'maxMessages' => 100
+            ],
+            'consumer2' => [
+                'name' => 'consumer2',
+                'queue' => ['item2_1'],
+                'consumerInstance' => 'type2',
+                'handlers' => [],
+                'connection' => 'connection2',
+                'maxMessages' => 2
+            ],
+            'consumer0' => []
+        ];
+
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getConsumers')
+            ->willReturn($consumers);
+
+        $this->assertEquals($finalResult, $this->plugin->afterRead($this->subjectMock, $result));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/DataTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/DataTest.php
new file mode 100644
index 0000000000000..e847420d15f5a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/DataTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Config;
+
+use Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\MessageQueue as RemoteServiceReader;
+
+class DataTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Xml|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $xmlReaderMock;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Env|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $envReaderMock;
+
+    /**
+     * @var RemoteServiceReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $remoteServiceReaderMock;
+
+    /**
+     * @var \Magento\Framework\Config\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cacheMock;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    protected function setUp()
+    {
+        $this->xmlReaderMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\Reader\Xml::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->envReaderMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\Reader\Env::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->remoteServiceReaderMock = $this
+            ->getMockBuilder(
+                \Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\MessageQueue::class
+            )->disableOriginalConstructor()
+            ->getMock();
+        $this->cacheMock = $this->getMockBuilder(\Magento\Framework\Config\CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class);
+    }
+
+    public function testGet()
+    {
+        $expected = ['someData' => ['someValue', 'someKey' => 'someValue']];
+        $this->cacheMock->expects($this->any())
+            ->method('load')
+            ->willReturn(json_encode($expected));
+
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn($expected);
+
+        $this->envReaderMock->expects($this->any())->method('read')->willReturn([]);
+        $this->remoteServiceReaderMock->expects($this->any())->method('read')->willReturn([]);
+        $this->assertEquals($expected, $this->getModel()->get());
+    }
+
+    /**
+     * Return Config Data Object
+     *
+     * @return \Magento\Framework\MessageQueue\Config\Data
+     */
+    private function getModel()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        return $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Config\Data::class,
+            [
+                'xmlReader' => $this->xmlReaderMock,
+                'cache' => $this->cacheMock,
+                'envReader' => $this->envReaderMock,
+                'remoteServiceReader' => $this->remoteServiceReaderMock,
+                'serializer' => $this->serializerMock,
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Publisher/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Publisher/ConfigReaderPluginTest.php
new file mode 100644
index 0000000000000..52297da5422d9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Publisher/ConfigReaderPluginTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Publisher;
+
+use Magento\Framework\MessageQueue\Config\Publisher\ConfigReaderPlugin as PublisherConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeReader as PublisherConfigCompositeReader;
+
+class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PublisherConfigReaderPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var PublisherConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(PublisherConfigCompositeReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            PublisherConfigReaderPlugin::class,
+            ['config' => $this->configMock]
+        );
+    }
+
+    public function testAfterRead()
+    {
+        $result = ['topic0' => []];
+        $binds = [
+            [
+                'topic' => 'topic1',
+                'exchange' => 'exchange1'
+            ],
+            [
+                'topic' => 'topic2',
+                'exchange' => 'exchange2'
+            ]
+        ];
+        $finalResult = [
+            'topic1' => [
+                'topic' => 'topic1',
+                'connection' => [
+                    'name' => 'connection1',
+                    'exchange' => 'exchange1',
+                    'disabled' => false
+                ],
+                'disabled' => false
+            ],
+            'topic2' => [
+                'topic' => 'topic2',
+                'connection' => [
+                    'name' => 'connection2',
+                    'exchange' => 'exchange2',
+                    'disabled' => false
+                ],
+                'disabled' => false
+            ],
+            'topic0' => []
+        ];
+
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getBinds')
+            ->willReturn($binds);
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getConnectionByTopic')
+            ->willReturnMap(
+                [
+                    ['topic1', 'connection1'],
+                    ['topic2', 'connection2']
+                ]
+            );
+
+        $this->assertEquals($finalResult, $this->plugin->afterRead($this->subjectMock, $result));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php
new file mode 100644
index 0000000000000..a4028f12300cf
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Reader\Env\Converter;
+
+use Magento\Framework\MessageQueue\Config\Reader\Env\Converter\Publisher as EnvPublisherConverter;
+use Magento\Framework\MessageQueue\Config\Reader\Env as ReaderEnv;
+
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var EnvPublisherConverter
+     */
+    private $converter;
+
+    protected function setUp()
+    {
+        $connectionToExchangeMap =  [
+            'amqp' => 'magento',
+            'db'=> 'magento-db'
+        ];
+        $this->converter = new EnvPublisherConverter(
+            $connectionToExchangeMap
+        );
+    }
+
+    public function testConvert()
+    {
+        $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        $expectedConfig = [
+            'amqp-magento' => [
+                'name' => 'amqp-magento',
+                'exchange' => 'magento-db',
+                'connection' =>'db'
+            ]
+        ];
+        $actualResult = $this->converter->convert($source['config']);
+        $this->assertEquals($expectedConfig, $actualResult[ReaderEnv::ENV_PUBLISHERS]);
+    }
+
+    public function testConvertIfPublisherConfigNotExist()
+    {
+        $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        unset($source['config'][ReaderEnv::ENV_PUBLISHERS]);
+        $actualResult = $this->converter->convert($source['config']);
+        $this->assertEquals($source['config'], $actualResult);
+    }
+    public function testConvertIfConnectionConfigNotExist()
+    {
+        $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        $topicName = 'inventory.counter.updated';
+        unset($source['config'][ReaderEnv::ENV_PUBLISHERS][$topicName]['connections']);
+        $actualResult = $this->converter->convert($source['config']);
+        $expectedResult[ReaderEnv::ENV_CONSUMERS] = $source['config'][ReaderEnv::ENV_CONSUMERS];
+        $expectedResult[ReaderEnv::ENV_PUBLISHERS] = [];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Xml/Converter/TopicConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Xml/Converter/TopicConverterTest.php
new file mode 100644
index 0000000000000..f6464a6d5be23
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Xml/Converter/TopicConverterTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Reader\Xml\Converter;
+
+/**
+ * Class TopicConverterTest to test <topic> root node type definition of MQ
+ */
+class TopicConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig
+     */
+    private $converter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $methodMapMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $validatorMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $communicationConfigMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->methodMapMock = $this->createMock(\Magento\Framework\Reflection\MethodsMap::class);
+        $this->validatorMock = $this->createMock(\Magento\Framework\MessageQueue\Config\Validator::class);
+        $this->communicationConfigMock = $this->createMock(\Magento\Framework\Communication\ConfigInterface::class);
+        $wildcardPatternMap = include(__DIR__ . '/../../../../_files/wildcard_pattern_map.php');
+        $topicsMap = include(__DIR__ . '/../../../../_files/topic_definitions_map.php');
+        $this->validatorMock->expects($this->any())
+            ->method('buildWildcardPattern')
+            ->willReturnMap($wildcardPatternMap);
+
+        $topicsDefinitions = [
+            'user.created.remote' => [],
+            'product.created.local' => [],
+        ];
+        $this->communicationConfigMock->expects($this->once())->method('getTopics')->willReturn($topicsDefinitions);
+
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturnMap($topicsMap);
+
+        $this->converter = new \Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig(
+            $this->methodMapMock,
+            $this->validatorMock,
+            $this->communicationConfigMock
+        );
+    }
+
+    /**
+     * Test converting valid configuration
+     */
+    public function testConvert()
+    {
+        $xmlFile = __DIR__ . '/../../../../_files/topic_config.xml';
+        $expectedData = include(__DIR__ . '/../../../../_files/expected_topic_config.php');
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $result = $this->converter->convert($dom);
+        $this->assertEquals($expectedData, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/XmlReader/SchemaLocatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/XmlReader/SchemaLocatorTest.php
new file mode 100644
index 0000000000000..a3a74b3991bf5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/XmlReader/SchemaLocatorTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Reader\XmlReader;
+
+class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator
+     */
+    protected $model;
+
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
+    protected $urnResolver;
+
+    protected function setUp()
+    {
+        $this->urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->model = new \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator($this->urnResolver);
+    }
+
+    public function testGetSchema()
+    {
+        $expected = $this->urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue_merged.xsd');
+        $actual = $this->model->getSchema();
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function testGetPerFileSchema()
+    {
+        $expected = $this->urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
+        $actual = $this->model->getPerFileSchema();
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
new file mode 100644
index 0000000000000..c270a923a759d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Topology;
+
+use Magento\Framework\MessageQueue\Config\Topology\ConfigReaderPlugin as TopologyConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Topology\Config\CompositeReader as TopologyConfigCompositeReader;
+
+class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TopologyConfigReaderPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var TopologyConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(TopologyConfigCompositeReader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBinds', 'getConnectionByTopic'])
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            TopologyConfigReaderPlugin::class,
+            ['queueConfig' => $this->configMock]
+        );
+    }
+
+    public function testAfterRead()
+    {
+        $binding = [
+            [
+                'queue' => 'catalog_product_removed_queue',
+                'exchange' => 'magento-db',
+                'topic' => 'catalog.product.removed'
+            ],
+            [
+                'queue' => 'inventory_qty_counter_queue',
+                'exchange' => 'magento',
+                'topic' => 'inventory.counter.updated'
+            ]
+        ];
+        $magento = [
+            'name' => 'magento',
+            'type' => 'topic',
+            'connection' => 'amqp',
+            'bindings' => []
+        ];
+        $dbDefaultBinding = [
+            'id' => 'defaultBinding',
+            'destinationType' => 'queue',
+            'destination' => 'catalog_product_removed_queue',
+            'topic' => 'catalog.product.removed',
+        ];
+        $amqpDefaultBinding = [
+            'id' => 'defaultBinding',
+            'destinationType' => 'queue',
+            'destination' => 'inventory_qty_counter_queue',
+            'topic' => 'inventory.counter.updated',
+        ];
+        $result = [
+            'magento' => $magento,
+            'magento-db--db' => [
+                'name' => 'magento-db',
+                'type' => 'topic',
+                'connection' => 'db',
+                'bindings' => [
+                    'defaultBinding' => $dbDefaultBinding
+                ]
+            ],
+            'magento--amqp' => [
+                'name' => 'magento',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'bindings' => [
+                    'defaultBinding' => $amqpDefaultBinding
+                ]
+            ]
+        ];
+        $expectedResult = [
+            'magento' => $magento,
+            'magento-db--db' => [
+                'name' => 'magento-db',
+                'type' => 'topic',
+                'connection' => 'db',
+                'bindings' => [
+                    'queue--catalog_product_removed_queue--catalog.product.removed' => [
+                        'id' => 'queue--catalog_product_removed_queue--catalog.product.removed',
+                        'destinationType' => 'queue',
+                        'destination' => 'catalog_product_removed_queue',
+                        'disabled' => false,
+                        'topic' => 'catalog.product.removed',
+                        'arguments' => []
+                    ],
+                    'defaultBinding' => $dbDefaultBinding
+                ]
+            ],
+            'magento--amqp' => [
+                'name' => 'magento',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'bindings' => [
+                    'queue--inventory_qty_counter_queue--inventory.counter.updated' => [
+                        'id' => 'queue--inventory_qty_counter_queue--inventory.counter.updated',
+                        'destinationType' => 'queue',
+                        'destination' => 'inventory_qty_counter_queue',
+                        'disabled' => false,
+                        'topic' => 'inventory.counter.updated',
+                        'arguments' => []
+                    ],
+                    'defaultBinding' => $amqpDefaultBinding
+                ]
+            ]
+        ];
+
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getBinds')
+            ->willReturn($binding);
+        $this->configMock->expects(static::exactly(2))
+            ->method('getConnectionByTopic')
+            ->willReturnMap([
+                ['catalog.product.removed', 'db'],
+                ['inventory.counter.updated', 'amqp']
+            ]);
+
+        $this->assertEquals($expectedResult, $this->plugin->afterRead($this->subjectMock, $result));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConnectionTypeResolverTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConnectionTypeResolverTest.php
new file mode 100644
index 0000000000000..14ccca75bb104
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConnectionTypeResolverTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolverInterface;
+use Magento\Framework\MessageQueue\ConnectionTypeResolver;
+
+class ConnectionTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnectionType()
+    {
+        $resolverOne = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverOne->expects($this->once())->method('getConnectionType')->with('test')->willReturn(null);
+
+        $resolverTwo = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverTwo->expects($this->once())->method('getConnectionType')->with('test')->willReturn('some-type');
+
+        $model = new ConnectionTypeResolver([$resolverOne, $resolverTwo]);
+        $this->assertEquals('some-type', $model->getConnectionType('test'));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unknown connection name test
+     */
+    public function testGetConnectionTypeWithException()
+    {
+        $resolverOne = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverOne->expects($this->once())->method('getConnectionType')->with('test')->willReturn(null);
+
+        $resolverTwo = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverTwo->expects($this->once())->method('getConnectionType')->with('test')->willReturn(null);
+
+        $model = new ConnectionTypeResolver([$resolverOne, $resolverTwo]);
+        $model->getConnectionType('test');
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Env/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Env/ReaderTest.php
new file mode 100644
index 0000000000000..93feadccbd0c8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Env/ReaderTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Env;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Env\Reader;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer\Config\Env\Reader
+     */
+    private $reader;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envConfig;
+
+    protected function setUp()
+    {
+        $this->envConfig =
+            $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\Reader\Env::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->reader = new Reader($this->envConfig);
+    }
+
+    public function testRead()
+    {
+        $configData['consumers'] = ['consumerConfig'];
+        $this->envConfig->expects($this->once())->method('read')->willReturn($configData);
+        $actual = $this->reader->read();
+        $this->assertEquals(['consumerConfig'], $actual);
+    }
+
+    public function testReadIfConsumerConfigNotExist()
+    {
+        $this->envConfig->expects($this->once())->method('read')->willReturn([]);
+        $actual = $this->reader->read();
+        $this->assertEquals([], $actual);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
new file mode 100644
index 0000000000000..903cf2ce9fd2d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\ConsumerInstance as ConsumerInstanceValidator;
+
+class ConsumerInstanceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConsumerInstanceValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $objectManager->getObject(ConsumerInstanceValidator::class);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => \Magento\Framework\MessageQueue\BatchConsumer::class,
+                        'handlers' => [
+                            ['type' => 'handlerClassOne', 'method' => 'handlerMethodOne'],
+                            ['type' => 'handlerClassTwo', 'method' => 'handlerMethodTwo'],
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'invalid, consumerInstance not implementing consumer interface' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => ConsumerInstanceTest::class,
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                // @codingStandardsIgnoreStart
+                "'Magento\\Framework\\MessageQueue\\Test\\Unit\\Consumer\\Config\\Validator\\ConsumerInstanceTest'"
+                . " cannot be specified as 'consumerInstance' for 'consumer1' consumer, unless it implements"
+                . " 'Magento\\Framework\\MessageQueue\\ConsumerInterface' interface"
+                // @codingStandardsIgnoreEnd
+            ],
+            'invalid, consumerInstance class does not exist' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']]
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumerClass1' does not exist and thus cannot be used as 'consumerInstance'"
+                . " for 'consumer1' consumer."
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
new file mode 100644
index 0000000000000..7a636fedd3fff
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\FieldsTypes as FieldsTypesValidator;
+
+class FieldsTypesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FieldsTypesValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $objectManager->getObject(FieldsTypesValidator::class);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ],
+            'valid, maxMessages == null' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => null,
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'invalid name' => [
+                [
+                    'consumer1' => [
+                        'name' => true,
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'name' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'invalid queue' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 1,
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'queue' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'integer', 'string' was expected."
+            ],
+            'invalid consumerInstance' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => (object)[],
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'consumerInstance' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'object', 'string' was expected."
+            ],
+            'invalid connection' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => [],
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'connection' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'array', 'string' was expected."
+            ],
+            'invalid handlers' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => '',
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'handlers' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'string', 'array' was expected."
+            ],
+            'invalid maxMessages' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => 'abc',
+                    ]
+                ],
+                "Type of 'maxMessages' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'string', 'int|null' was expected."
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
new file mode 100644
index 0000000000000..5013e1dca135b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\Handlers as HandlersValidator;
+use Magento\Framework\Reflection\MethodsMap;
+
+class HandlersTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var MethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $methodsMap;
+
+    /**
+     * @var HandlersValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->methodsMap = $this->getMockBuilder(MethodsMap::class)->disableOriginalConstructor()->getMock();
+        $this->validator = $objectManager->getObject(HandlersValidator::class, ['methodsMap' => $this->methodsMap]);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['type' => 'handlerClassOne', 'method' => 'handlerMethodOne'],
+                            ['type' => 'handlerClassTwo', 'method' => 'handlerMethodTwo'],
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ],
+            'valid, empty handlers' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [],
+                        'connection' => 'connection1',
+                        'maxMessages' => null,
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'invalid, not an array' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => ['handlerClassOne::handlerMethodOne'],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ],
+            'invalid, no required fields' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['handlerClassOne::handlerMethodOne']
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ],
+            'invalid, no method' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['type' => 'handlerClassOne']
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ],
+            'invalid, no type' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['method' => 'handlerMethodOne']
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ]
+        ];
+    }
+
+    public function testValidateUndeclaredService()
+    {
+        $configData = [
+            'consumer1' => [
+                'name' => 'consumer1',
+                'queue' => 'queue1',
+                'consumerInstance' => 'consumerClass1',
+                'handlers' => [
+                    ['type' => 'handlerClassOne', 'method' => 'handlerMethodOne'],
+                ],
+                'connection' => 'connection1',
+                'maxMessages' => '100',
+            ]
+        ];
+        $expectedExceptionMessage = 'Service method specified as handler for of consumer "consumer1" is not available.'
+        . ' Given "handlerClassOne::handlerMethodOne"';
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $this->methodsMap->expects($this->once())
+            ->method('getMethodParams')
+            ->with('handlerClassOne', 'handlerMethodOne')
+            ->willThrowException(new \Exception(''));
+
+        $this->validator->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
new file mode 100644
index 0000000000000..3df7045124480
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\RequiredFields as RequiredFieldsValidator;
+
+class RequiredFieldsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var RequiredFieldsValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $objectManager->getObject(RequiredFieldsValidator::class);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'missing name' => [
+                [
+                    'consumer1' => [
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'name' field must be specified for consumer 'consumer1'"
+            ],
+            'missing queue' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'queue' field must be specified for consumer 'consumer1'"
+            ],
+            'missing consumerInstance' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumerInstance' field must be specified for consumer 'consumer1'"
+            ],
+            'missing connection' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'connection' field must be specified for consumer 'consumer1'"
+            ],
+            'missing handlers' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'handlers' field must be specified for consumer 'consumer1'"
+            ],
+            'missing maxMessages' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                    ]
+                ],
+                "'maxMessages' field must be specified for consumer 'consumer1'"
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Xml/ConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Xml/ConverterTest.php
new file mode 100644
index 0000000000000..cb68d845a263e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Xml/ConverterTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Xml;
+
+use Magento\Framework\Communication\Config\ConfigParser;
+use Magento\Framework\MessageQueue\Consumer\Config\Xml\Converter;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var ConfigParser|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configParserMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->configParserMock = $this->createMock(ConfigParser::class);
+        $this->converter = new Converter($this->configParserMock, $this->defaultConfigProviderMock);
+    }
+
+    public function testConvert()
+    {
+        $this->defaultConfigProviderMock->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->configParserMock->expects($this->any())->method('parseServiceMethod')->willReturnCallback(
+            function ($handler) {
+                $parsedHandler = explode('::', $handler);
+                return ['typeName' => $parsedHandler[0], 'methodName' => $parsedHandler[1]];
+            }
+        );
+        $fixtureDir = __DIR__ . '/../../../_files/queue_consumer';
+        $xmlFile = $fixtureDir . '/valid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $result = $this->converter->convert($dom);
+
+        $expectedData = include($fixtureDir . '/valid.php');
+        $this->assertEquals($expectedData, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
new file mode 100644
index 0000000000000..448a8a3db7407
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config;
+
+class XsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private $schemaFile;
+
+    /**
+     * @var string
+     */
+    private $schemaQueueFile;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
+        $this->schemaQueueFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->atLeastOnce())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [],
+            ],
+            'non unique consumer name' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer1" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer': Duplicate key-sequence ['consumer1'] in unique identity-constraint 'consumer-unique-name'."
+                ],
+            ],
+            'invalid handler format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClass1::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethod2" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClass1::handlerMethodOne' is not accepted by the pattern '[a-zA-Z\\\\]+::[a-zA-Z]+'.",
+                    "Element 'consumer', attribute 'handler': 'handlerClass1::handlerMethodOne' is not a valid value of the atomic type 'handlerType'.",
+                    "Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClassTwo::handlerMethod2' is not accepted by the pattern '[a-zA-Z\\\\]+::[a-zA-Z]+'.",
+                    "Element 'consumer', attribute 'handler': 'handlerClassTwo::handlerMethod2' is not a valid value of the atomic type 'handlerType'.",
+                ],
+            ],
+            'invalid maxMessages format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="ABC"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'maxMessages': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
+                ],
+            ],
+            'unexpected element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <unexpected name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( consumer ).",
+                ],
+            ],
+            'unexpected attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4" unexpected=""/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarQueueXmlDataProvider
+     */
+    public function testExemplarQueueXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->atLeastOnce())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->schemaQueueFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarQueueXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+                     <broker topic="asd" >
+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="5"/>
+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5"/>
+                    </broker>
+                </config>',
+                [],
+            ],
+            'invalid handler format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+                    <broker topic="asd" >
+                        <queue name="queue1" consumer="consumer1" handler="handlerClass_One1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="5"/>
+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handler_Method2" consumerInstance="consumerClass2" maxMessages="5"/>
+                    </broker>
+                </config>',
+                [
+                    "Element 'queue', attribute 'handler': [facet 'pattern'] The value 'handlerClass_One1::handlerMethod1' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
+                    "Element 'queue', attribute 'handler': 'handlerClass_One1::handlerMethod1' is not a valid value of the atomic type 'handlerType'.",
+                    "Element 'queue', attribute 'handler': [facet 'pattern'] The value 'handlerClassOne2::handler_Method2' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
+                    "Element 'queue', attribute 'handler': 'handlerClassOne2::handler_Method2' is not a valid value of the atomic type 'handlerType'.",
+                ],
+            ],
+            'invalid instance format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+                     <broker topic="asd" >
+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumer_Class1" maxMessages="5"/>
+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass_2" maxMessages="5"/>
+                    </broker>
+                </config>',
+                [
+                    "Element 'queue', attribute 'consumerInstance': [facet 'pattern'] The value 'consumer_Class1' is not accepted by the pattern '[a-zA-Z0-9\\\\]+'.",
+                    "Element 'queue', attribute 'consumerInstance': 'consumer_Class1' is not a valid value of the atomic type 'instanceType'.",
+                    "Element 'queue', attribute 'consumerInstance': [facet 'pattern'] The value 'consumerClass_2' is not accepted by the pattern '[a-zA-Z0-9\\\\]+'.",
+                    "Element 'queue', attribute 'consumerInstance': 'consumerClass_2' is not a valid value of the atomic type 'instanceType'.",
+                ],
+            ],
+            'invalid maxMessages format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+                    <broker topic="asd" >
+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="ABC"/>
+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5"/>
+                    </broker>
+                </config>',
+                [
+                    "Element 'queue', attribute 'maxMessages': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
+                ],
+            ],
+            'unexpected element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+                    <broker topic="asd" >
+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="2"/>
+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5"/>
+                        <unexpected name="queue2"/>
+                    </broker>
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( queue ).",
+                ],
+            ],
+            'unexpected attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+                    <broker topic="asd" >
+                        <queue name="queue1" consumer="consumer1" handler="handlerClassOne1::handlerMethod1" consumerInstance="consumerClass1" maxMessages="2"/>
+                        <queue name="queue2" consumer="consumer2" handler="handlerClassOne2::handlerMethod2" consumerInstance="consumerClass2" maxMessages="5" unexpected="unexpected"/>
+                    </broker>
+                </config>',
+                [
+                    "Element 'queue', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerFactoryTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerFactoryTest.php
new file mode 100644
index 0000000000000..1cf1b57af87aa
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerFactoryTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\MessageQueue\ConsumerFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+class ConsumerFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /** @var CommunicationConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $communicationConfigMock;
+
+    /** @var ConsumerConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $consumerConfigMock;
+
+    const TEST_CONSUMER_NAME = "test_consumer_name";
+    const TEST_CONSUMER_QUEUE = "test_consumer_queue";
+    const TEST_CONSUMER_METHOD = "test_consumer_method";
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consumerConfigMock = $this->getMockBuilder(ConsumerConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage pecified consumer "test_consumer_name" is not declared.
+     */
+    public function testUndeclaredConsumerName()
+    {
+        $consumerFactory = $this->objectManager->getObject(ConsumerFactory::class);
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'consumerConfig',
+            $this->consumerConfigMock
+        );
+        $consumerFactory->get(self::TEST_CONSUMER_NAME);
+    }
+
+    public function testConnectionInjectedForConsumer()
+    {
+        $consumerType = 'async';
+        $consumerTypeValue = \Magento\Framework\MessageQueue\Model\TestConsumer::class;
+        $consumers = [
+            [
+                'type' => [$consumerType => $consumerTypeValue]
+            ]
+        ];
+        $consumerFactory = $this->getConsumerFactoryInstance($consumers);
+        $consumerInstanceMock = $this->getMockBuilder($consumerTypeValue)->getMock();
+        $this->assertInstanceOf(get_class($consumerInstanceMock), $consumerFactory->get(self::TEST_CONSUMER_NAME));
+    }
+
+    /**
+     * Return Consumer Factory with mocked objects
+     *
+     * @param array $consumers
+     * @return ConsumerFactory
+     */
+    private function getConsumerFactoryInstance($consumers)
+    {
+        $consumerTypeValue = \Magento\Framework\MessageQueue\Model\TestConsumer::class;
+        $handlerTypeValue = \Magento\Framework\DataObject::class;
+        $consumerType = 'async';
+
+        /** @var ConsumerConfigItem|\PHPUnit_Framework_MockObject_MockObject $consumerConfigItemMock */
+        $consumerConfigItemMock = $this->getMockBuilder(ConsumerConfigItem::class)->disableOriginalConstructor()
+            ->getMock();
+        $consumerConfigItemMock->expects($this->any())->method('getName')->willReturn(self::TEST_CONSUMER_NAME);
+        $consumerConfigItemMock->expects($this->any())->method('getQueue')->willReturn(self::TEST_CONSUMER_QUEUE);
+        $consumerConfigItemMock->expects($this->any())->method('getConsumerInstance')->willReturn($consumerTypeValue);
+        $consumerConfigItemMock->expects($this->any())->method('getHandlers')->willReturn([]);
+        $this->consumerConfigMock->expects($this->any())
+            ->method('getConsumer')
+            ->with('test_consumer_name')
+            ->willReturn($consumerConfigItemMock);
+        $this->communicationConfigMock->expects($this->any())
+            ->method('getTopics')
+            ->willReturn(
+                [
+                    [
+                        CommunicationConfig::TOPIC_NAME => 'topicName',
+                        CommunicationConfig::TOPIC_IS_SYNCHRONOUS => false
+                    ]
+                ]
+            );
+        $this->communicationConfigMock->expects($this->any())
+            ->method('getTopic')
+            ->with('topicName')
+            ->willReturn(
+                [
+                    CommunicationConfig::TOPIC_HANDLERS => [
+                        [
+                            CommunicationConfig::HANDLER_TYPE => $handlerTypeValue,
+                            CommunicationConfig::HANDLER_METHOD => self::TEST_CONSUMER_METHOD
+                        ]
+                    ],
+                ]
+            );
+
+        $consumerInstanceMock = $this->getMockBuilder($consumerTypeValue)->getMock();
+        $consumerMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)
+            ->setMethods(['configure'])
+            ->getMockForAbstractClass();
+
+        $consumerConfigurationMock =
+            $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+                ->disableOriginalConstructor()
+                ->getMockForAbstractClass();
+        $consumerConfigurationMock->expects($this->any())->method('getType')->willReturn($consumerType);
+
+        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+
+        $objectManagerMock->expects($this->any())
+            ->method('create')
+            ->willReturnOnConsecutiveCalls($consumerMock, $consumerConfigurationMock, $consumerInstanceMock);
+
+        $consumerFactory = $this->objectManager->getObject(
+            \Magento\Framework\MessageQueue\ConsumerFactory::class,
+            [
+                'objectManager' => $objectManagerMock,
+                'consumers' => $consumers
+            ]
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'consumerConfig',
+            $this->consumerConfigMock
+        );
+        return $consumerFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
new file mode 100644
index 0000000000000..5eb7cd587aaa2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Unit test for Consumer class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configuration;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\QueueRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\CallbackInvoker
+     */
+    private $callbackInvoker;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageController;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Framework\Communication\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer
+     */
+    private $consumer;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configuration = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        //Hard dependency used because CallbackInvoker invokes closure logic defined inside of Customer class.
+        $this->callbackInvoker = new \Magento\Framework\MessageQueue\CallbackInvoker();
+        $this->consumer = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Consumer::class,
+            [
+                'configuration' => $this->configuration,
+                'messageEncoder' => $this->messageEncoder,
+                'queueRepository' => $this->queueRepository,
+                'invoker' => $this->callbackInvoker,
+                'resource' => $this->resource,
+                'logger' => $this->logger
+            ]
+        );
+
+        $this->consumerConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->consumer,
+            'consumerConfig',
+            $this->consumerConfig
+        );
+        $this->messageController = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageController::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->consumer,
+            'messageController',
+            $this->messageController
+        );
+        $this->communicationConfig = $this
+            ->createMock(\Magento\Framework\Communication\ConfigInterface::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->consumer,
+            'communicationConfig',
+            $this->communicationConfig
+        );
+    }
+
+    /**
+     * Test for process method with NotFoundException.
+     *
+     * @return void
+     */
+    public function testProcessWithNotFoundException()
+    {
+        $properties = ['topic_name' => 'topic.name'];
+        $topicConfig = [];
+        $numberOfMessages = 1;
+        $consumerName = 'consumer.name';
+        $exceptionPhrase = new Phrase('Exception successfully thrown');
+
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->configuration->expects($this->once())->method('getQueue')->willReturn($queue);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $queue->expects($this->atLeastOnce())->method('dequeue')->willReturn($envelope);
+        $envelope->expects($this->once())->method('getProperties')->willReturn($properties);
+        $this->communicationConfig->expects($this->once())->method('getTopic')->with($properties['topic_name'])
+            ->willReturn($topicConfig);
+        $this->configuration->expects($this->once())->method('getConsumerName')->willReturn($consumerName);
+        $this->messageController->expects($this->once())->method('lock')->with($envelope, $consumerName)
+            ->willThrowException(
+                new \Magento\Framework\Exception\NotFoundException(
+                    $exceptionPhrase
+                )
+            );
+        $queue->expects($this->once())->method('acknowledge')->with($envelope);
+        $this->logger->expects($this->once())->method('warning')->with($exceptionPhrase->render());
+
+        $this->consumer->process($numberOfMessages);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MergedMessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MergedMessageProcessorTest.php
new file mode 100644
index 0000000000000..b3c80cf6af7c2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MergedMessageProcessorTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MergedMessageProcessor.
+ */
+class MergedMessageProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MergedMessageProcessor
+     */
+    private $mergedMessageProcessor;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageStatusProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageStatusProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->mergedMessageProcessor = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MergedMessageProcessor::class,
+            [
+                'messageStatusProcessor' => $this->messageStatusProcessor
+            ]
+        );
+    }
+
+    /**
+     * Test for process().
+     *
+     * @return void
+     */
+    public function testProcess()
+    {
+        $topicName = 'topic';
+        $messageId = 1;
+        $messagesToAcknowledge = [];
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
+        $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
+        $originalMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergedMessageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessage->expects($this->atLeastOnce())->method('getOriginalMessagesIds')->willReturn([$messageId]);
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [$messageId => $originalMessage];
+
+        $this->mergedMessageProcessor->process(
+            $queue,
+            $configuration,
+            $messages,
+            $messagesToAcknowledge,
+            $mergedMessages
+        );
+    }
+
+    /**
+     * Test for process() with Exception.
+     *
+     * @return void
+     */
+    public function testProcessWithException()
+    {
+        $topicName = 'topic';
+        $messageId = 1;
+        $messagesToAcknowledge = [];
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
+        $exception = new \Exception();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
+        $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
+        $originalMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergedMessageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [$messageId => $originalMessage];
+
+        $this->mergedMessageProcessor->process(
+            $queue,
+            $configuration,
+            $messages,
+            $messagesToAcknowledge,
+            $mergedMessages
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php
new file mode 100644
index 0000000000000..eb1d4c4cafdac
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+/**
+ * Unit test for MessageController class.
+ *
+ */
+class MessageControllerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\LockInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController
+     */
+    private $messageController;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->lockFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\LockInterfaceFactory::class)
+            ->disableOriginalConstructor()->setMethods(['create'])->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->messageController = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\MessageController::class,
+            [
+                'lockFactory' => $this->lockFactory
+            ]
+        );
+    }
+
+    /**
+     * Test for lock method with NotFoundException.
+     *
+     * @return void
+     */
+    public function testLockWithNotFoundException()
+    {
+        $properties = [];
+        $consumerName = '';
+        $this->expectException(\Magento\Framework\Exception\NotFoundException::class);
+        $this->expectExceptionMessage("Property 'message_id' not found in properties.");
+        $this->lockFactory->expects($this->once())->method('create');
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableArgumentCloning()->getMock();
+        $envelope->expects($this->once())->method('getProperties')->willReturn($properties);
+
+        $this->messageController->lock($envelope, $consumerName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageEncoderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageEncoderTest.php
new file mode 100644
index 0000000000000..58f11c6f7363c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageEncoderTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\MessageEncoder;
+
+/**
+ * Test class for Magento\Framework\MessageQueue\MessageEncoder
+ */
+class MessageEncoderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var MessageEncoder */
+    protected $encoder;
+
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    protected $objectManager;
+
+    /** @var CommunicationConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $communicationConfigMock;
+
+    /** @var \Magento\Framework\Webapi\ServiceOutputProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $dataObjectEncoderMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->dataObjectEncoderMock = $this->getMockBuilder(\Magento\Framework\Webapi\ServiceOutputProcessor::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $this->encoder = $this->objectManager->getObject(
+            MessageEncoder::class,
+            ['dataObjectEncoder' => $this->dataObjectEncoderMock]
+        );
+        $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->encoder,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+        parent::setUp();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Specified topic "customer.created" is not declared.
+     */
+    public function testEncodeInvalidTopic()
+    {
+        $this->encoder->encode('customer.created', 'Some message');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Specified topic "customer.created" is not declared.
+     */
+    public function testDecodeInvalidTopic()
+    {
+        $this->encoder->decode('customer.created', 'Some message');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data
+     */
+    public function testEncodeInvalidMessage()
+    {
+        $exceptionMessage = 'Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data"';
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigData()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $this->dataObjectEncoderMock
+            ->expects($this->once())
+            ->method('convertValue')
+            ->willThrowException(new LocalizedException(__($exceptionMessage)));
+
+        $this->encoder->encode('customer.created', $object);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data
+     */
+    public function testEncodeInvalidMessageArray()
+    {
+        $exceptionMessage = 'Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data"';
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigData()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $this->dataObjectEncoderMock
+            ->expects($this->once())
+            ->method('convertValue')
+            ->willThrowException(new LocalizedException(__($exceptionMessage)));
+
+        $this->encoder->encode('customer.created', [$object]);
+    }
+
+    /**
+     * Data provider for queue config
+     *
+     * @return array
+     */
+    private function getQueueConfigData()
+    {
+        return [
+            CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+            CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorLoaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorLoaderTest.php
new file mode 100644
index 0000000000000..e62f5682709c1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorLoaderTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MessageProcessorLoader.
+ */
+class MessageProcessorLoaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mergedMessageProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $defaultMessageProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorLoader
+     */
+    private $messageProcessorLoader;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->mergedMessageProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->defaultMessageProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->messageProcessorLoader = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MessageProcessorLoader::class,
+            [
+                'mergedMessageProcessor' => $this->mergedMessageProcessor,
+                'defaultMessageProcessor' => $this->defaultMessageProcessor
+            ]
+        );
+    }
+
+    /**
+     * Test for load().
+     *
+     * @param $message
+     * @dataProvider loadDataProvider
+     */
+    public function testLoad($message)
+    {
+        $messageTopic = 'topic';
+        $messages = [
+            $messageTopic => [$message]
+        ];
+
+        $this->assertInstanceOf(
+            \Magento\Framework\MessageQueue\MessageProcessorInterface::class,
+            $this->messageProcessorLoader->load($messages)
+        );
+    }
+
+    /**
+     * DataProvider for load().
+     *
+     * @return array
+     */
+    public function loadDataProvider()
+    {
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergedMessageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        return [
+            [$mergedMessage],
+            [$message]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
new file mode 100644
index 0000000000000..5e64d737034c8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MessageProcessor.
+ */
+class MessageProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessor
+     */
+    private $messageProcessor;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageStatusProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageStatusProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->messageProcessor = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MessageProcessor::class,
+            [
+                'messageStatusProcessor' => $this->messageStatusProcessor,
+                'resource' => $this->resource
+            ]
+        );
+    }
+
+    /**
+     * Test for process().
+     *
+     * @return void
+     */
+    public function testProcess()
+    {
+        $topicName = 'topic';
+        $messagesToAcknowledge = [];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->atLeastOnce())->method('beginTransaction');
+        $connection->expects($this->atLeastOnce())->method('commit');
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
+        $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
+        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [
+            $topicName => [$message]
+        ];
+
+        $this->messageProcessor->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+    }
+
+    /**
+     * Test for process() with ConnectionLostException.
+     *
+     * @return void
+     */
+    public function testProcessWithConnectionLostException()
+    {
+        $topicName = 'topic';
+        $messagesToAcknowledge = [];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->atLeastOnce())->method('beginTransaction');
+        $connection->expects($this->never())->method('commit');
+        $connection->expects($this->atLeastOnce())->method('rollBack');
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $exception = new \Magento\Framework\MessageQueue\ConnectionLostException(__('Exception Message'));
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
+        $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
+        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [
+            $topicName => [$message]
+        ];
+
+        $this->messageProcessor->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+    }
+
+    /**
+     * Test for process() with Exception.
+     *
+     * @return void
+     */
+    public function testProcessWithException()
+    {
+        $topicName = 'topic';
+        $messagesToAcknowledge = [];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->atLeastOnce())->method('beginTransaction');
+        $connection->expects($this->never())->method('commit');
+        $connection->expects($this->atLeastOnce())->method('rollBack');
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $exception = new \Exception();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
+        $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
+        $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
+        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [
+            $topicName => [$message]
+        ];
+
+        $this->messageProcessor->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageStatusProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageStatusProcessorTest.php
new file mode 100644
index 0000000000000..041f73f3a268a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageStatusProcessorTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MessageStatusProcessor.
+ */
+class MessageStatusProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->messageStatusProcessor = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MessageStatusProcessor::class
+        );
+    }
+
+    /**
+     * Test for acknowledgeMessages().
+     *
+     * @return void
+     */
+    public function testAcknowledgeMessages()
+    {
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $queue->expects($this->atLeastOnce())->method('acknowledge');
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->messageStatusProcessor->acknowledgeMessages($queue, [$message]);
+    }
+
+    /**
+     * Test for rejectMessages().
+     *
+     * @return void
+     */
+    public function testRejectMessages()
+    {
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $queue->expects($this->atLeastOnce())->method('reject');
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->messageStatusProcessor->rejectMessages($queue, [$message]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
new file mode 100644
index 0000000000000..bb21337dffcf8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\MessageValidator;
+
+/**
+ * @covers Magento\Framework\MessageQueue\MessageValidator
+ * @SuppressWarnings(PHPMD)
+ */
+class MessageValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var MessageValidator */
+    protected $model;
+
+    /** @var CommunicationConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $communicationConfigMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->model = $objectManager->getObject(MessageValidator::class);
+        $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Specified topic "customer.created" is not declared.
+     */
+    public function testValidateInvalidTopic()
+    {
+        $this->model->validate('customer.created', 'Some message', true);
+    }
+
+    public function testValidateValidObjectType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataObjectType()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->model->validate('customer.created', $object, true);
+    }
+
+    public function testValidateValidMethodType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataMethodType()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->model->validate('customer.created', [$object, 'password', 'redirect'], true);
+    }
+
+    public function testEncodeValidMessageObjectType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataObjectType()
+        );
+        $this->model->validate('customer.created', [], true);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Data in topic "customer.created" must be of type "Magento\Customer\Api\Data\CustomerInt
+     */
+    public function testEncodeInvalidMessageMethodType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataMethodType()
+        );
+        $this->model->validate('customer.created', [1, 2, 3], true);
+    }
+
+    /**
+     * Data provider for queue config of object type
+     *
+     * @return array
+     */
+    private function getQueueConfigDataObjectType()
+    {
+        return [
+            CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+            CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+        ];
+    }
+
+    /**
+     * Data provider for queue config of method type
+     *
+     * @return array
+     */
+    private function getQueueConfigDataMethodType()
+    {
+        return [
+            CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_METHOD,
+            CommunicationConfig::TOPIC_REQUEST => [
+                [
+                    'param_name' => 'customer',
+                    'param_position' => 0,
+                    'is_required' => true,
+                    'param_type' => \Magento\Customer\Api\Data\CustomerInterface::class,
+                ],
+                [
+                    'param_name' => 'password',
+                    'param_position' => 1,
+                    'is_required' => false,
+                    'param_type' => 'string',
+                ],
+                [
+                    'param_name' => 'redirectUrl',
+                    'param_position' => 2,
+                    'is_required' => false,
+                    'param_type' => 'string',
+                ],
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider getQueueConfigRequestType
+     */
+    public function testInvalidMessageType($requestType, $message, $expectedResult = null)
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn($requestType);
+        if ($expectedResult) {
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage($expectedResult);
+        }
+        $this->model->validate('topic', $message);
+    }
+
+    /**
+     * @return array
+     */
+    public function getQueueConfigRequestType()
+    {
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $customerMockTwo = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        return [
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string'
+                ],
+                'valid string',
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string'
+                ],
+                1,
+                'Data in topic "topic" must be of type "string". "int" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                ['string1', 'string2'],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                [],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                'single string',
+                'Data in topic "topic" must be of type "string[]". "string" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+                ],
+                $customerMock,
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+                ],
+                'customer',
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface". "string" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [$customerMock, $customerMockTwo],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                'customer',
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". "string" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                $customerMock,
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". '
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeReaderTest.php
new file mode 100644
index 0000000000000..88f33598366e8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeReaderTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config;
+
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeReader;
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+use Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface;
+
+class CompositeReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CompositeReader
+     */
+    private $reader;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerOneMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerTwoMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerThreeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->validatorMock = $this->createMock(ValidatorInterface::class);
+        $this->readerOneMock = $this->createMock(ReaderInterface::class);
+        $this->readerTwoMock = $this->createMock(ReaderInterface::class);
+        $this->readerThreeMock = $this->createMock(ReaderInterface::class);
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+
+        $this->reader = new CompositeReader(
+            $this->validatorMock,
+            $this->defaultConfigProviderMock,
+            [
+                'readerOne' => $this->readerOneMock,
+                'readerThree' => $this->readerThreeMock,
+                'readerTwo' => $this->readerTwoMock,
+            ]
+        );
+    }
+
+    public function testRead()
+    {
+        $this->defaultConfigProviderMock->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultConfigProviderMock->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $dataOne = include __DIR__ . '/../../_files/queue_publisher/reader_one.php';
+        $dataTwo = include __DIR__ . '/../../_files/queue_publisher/reader_two.php';
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+
+        $this->readerOneMock->expects($this->once())->method('read')->with(null)->willReturn($dataOne);
+        $this->readerTwoMock->expects($this->once())->method('read')->with(null)->willReturn($dataTwo);
+        $this->readerThreeMock->expects($this->once())->method('read')->with(null)->willReturn([]);
+
+        $this->validatorMock->expects($this->once())->method('validate')->with($expectedValidationData);
+
+        $data = $this->reader->read();
+
+        $expectedData = [
+            //disabling existing connection and adding new
+            'top04' => [
+                'topic' => 'top04',
+                'disabled' => false,
+                'connection' => ['name' => 'db', 'disabled' => false, 'exchange' => 'magento2'],
+            ],
+            //two disabled connections are ignored
+            'top05' => [
+                'topic' => 'top05',
+                'disabled' => false,
+                'connection' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            ],
+            //added default connection if not declared
+            'top06' => [
+                'topic' => 'top06',
+                'disabled' => false,
+                'connection' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false],
+            ],
+            //added default connection if all declared connections are disabled
+            'top07' => [
+                'topic' => 'top07',
+                'disabled' => false,
+                'connection' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false],
+            ],
+        ];
+
+        $this->assertEquals($expectedData, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php
new file mode 100644
index 0000000000000..412a58df86eb7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config;
+
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeValidator;
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+
+class CompositeValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CompositeValidator
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorOneMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorTwoMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->validatorOneMock = $this->createMock(ValidatorInterface::class);
+        $this->validatorTwoMock = $this->createMock(ValidatorInterface::class);
+
+        $this->model = new CompositeValidator([$this->validatorOneMock, $this->validatorTwoMock]);
+    }
+
+    public function testValidate()
+    {
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+        $this->validatorOneMock->expects($this->once())->method('validate')->with($expectedValidationData);
+        $this->validatorTwoMock->expects($this->once())->method('validate')->with($expectedValidationData);
+        $this->model->validate($expectedValidationData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage test
+     */
+    public function testValidatorThrowsException()
+    {
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+        $this->validatorOneMock
+            ->expects($this->once())
+            ->method('validate')
+            ->willThrowException(new \LogicException('test'));
+        $this->validatorTwoMock->expects($this->never())->method('validate');
+        $this->model->validate($expectedValidationData);
+    }
+
+    public function testInvalidReaderInstance()
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage(
+            'Validator [stdClass] does not implements ' .
+            'Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface'
+        );
+        $validator = new \stdClass();
+        $model = new CompositeValidator([$validator]);
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+        $model->validate($expectedValidationData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Env/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Env/ReaderTest.php
new file mode 100644
index 0000000000000..96528019cff85
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Env/ReaderTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Env;
+
+use Magento\Framework\MessageQueue\Publisher\Config\Env\Reader;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configDataMock;
+
+    /**
+     * @var Reader
+     *
+     */
+    private $reader;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cache = $this->getMockBuilder(\Magento\Framework\Config\CacheInterface::class)
+            ->getMock();
+        $data = [
+            'topics' => [
+                'inventory.counter.updated' => [
+                    'disabled' => false,
+                    'publisher' => 'amqp-magento'
+                ],
+            ],
+            'publishers' => [
+                'amqp-magento' => [
+                    'name' => 'amqp-magento',
+                    'connection' => 'db',
+                    'exchange' => 'magento-db'
+                ],
+            ]
+
+        ];
+        $reader = $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\CompositeReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $reader->expects($this->any())->method('read')->willReturn($data);
+        $cache->expects($this->any())->method('load')->willReturn(false);
+        $this->configDataMock = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Config\Data::class,
+            [
+                'cache' => $cache,
+                'reader' => $reader
+            ]
+        );
+
+        $this->reader = new Reader(
+            $this->deploymentConfigMock,
+            $this->configDataMock,
+            [
+                'amqp-magento' => 'amqp',
+                'db-magento-db' => 'db'
+            ]
+        );
+    }
+
+    public function testReadCurrentConfig()
+    {
+        $configData = include __DIR__ . '/../../../_files/env_2_2.php';
+        $this->deploymentConfigMock->expects($this->once())->method('getConfigData')
+            ->with('queue')->willReturn($configData);
+        $actualResult = $this->reader->read();
+        $this->assertEquals($configData['config']['publishers'], $actualResult);
+    }
+
+    public function testReadPreviousConfig()
+    {
+        $configData = include __DIR__ . '/../../../_files/env_2_1.php';
+        $this->deploymentConfigMock->expects($this->once())->method('getConfigData')
+            ->with('queue')->willReturn($configData);
+        $actualResult = $this->reader->read();
+        $expectedResult = [
+            'inventory.counter.updated' => [
+                'connections' => [
+                    'amqp' => [
+                        'name' => 'db',
+                        'exchange' => 'magento-db',
+                        'disabled' => false
+                    ]
+                ],
+                'disabled' => false
+            ]
+        ];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/RemoteService/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/RemoteService/ReaderTest.php
new file mode 100644
index 0000000000000..47c37077a5460
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/RemoteService/ReaderTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Publisher\Config\RemoteService\Reader;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @var DefaultValueProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $serviceMethodsMap;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->defaultValueProvider = $this->createMock(DefaultValueProvider::class);
+        $this->objectManagerConfig = $this->createMock(ObjectManagerConfig::class);
+        $this->reflectionGenerator = $this->createMock(ReflectionGenerator::class);
+        $this->serviceMethodsMap = $this->createMock(ServiceMethodsMap::class);
+        $this->reader = $objectManager->getObject(
+            Reader::class,
+            [
+                'defaultValueProvider' => $this->defaultValueProvider,
+                'objectManagerConfig' => $this->objectManagerConfig,
+                'reflectionGenerator' => $this->reflectionGenerator,
+                'serviceMethodsMap' => $this->serviceMethodsMap,
+            ]
+        );
+    }
+
+    public function testRead()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')->willReturn(
+            ['methodOne' => 'string', 'methodTwo' => 'string']
+        );
+
+        $this->reflectionGenerator->expects($this->exactly(2))->method('generateTopicName')->willReturnMap(
+            [
+                ['Some\Service\NameInterface', 'methodOne', 'topicOne'],
+                ['Some\Service\NameInterface', 'methodTwo', 'topicTwo']
+            ]
+        );
+
+        $expectedResult = [
+            'topicOne' => [
+                'topic' => 'topicOne',
+                'disabled' => false,
+                'connections' => ['amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]]
+            ],
+            'topicTwo' => [
+                'topic' => 'topicTwo',
+                'disabled' => false,
+                'connections' => ['amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]]
+            ],
+        ];
+
+        $this->assertEquals($expectedResult, $this->reader->read());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Service interface was expected, "Some\Service\NameInterface" given
+     */
+    public function testReadInvalidService()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')
+            ->willThrowException(new \Exception(''));
+
+        $this->reflectionGenerator->expects($this->exactly(0))->method('generateTopicName');
+
+        $this->reader->read();
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php
new file mode 100644
index 0000000000000..bd92b1c4d1cec
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Publisher\Config\Validator\EnabledConnection;
+
+class EnabledConnectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var EnabledConnection
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new EnabledConnection();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => true],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => true],
+                ]
+            ],
+            'pub03' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMultipleEnabledConnections()
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage(
+            'More than 1 enabled connections configured for publisher pub01. ' .
+            'More than 1 enabled connections configured for publisher pub02.'
+        );
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/FormatTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/FormatTest.php
new file mode 100644
index 0000000000000..1df7f078d9af8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/FormatTest.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Publisher\Config\Validator\Format;
+
+class FormatTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Format
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Format();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => true],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => true],
+                ]
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing topic field for publisher pub01.
+     */
+    public function testValidateMissingTopicName()
+    {
+        $configData = [
+            'pub01' => [
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing disabled field for publisher pub01.
+     */
+    public function testValidateMissingDisabledField()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing connections field for publisher pub01.
+     */
+    public function testValidateMissingConnectionsField()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Invalid connections format for publisher pub01.
+     */
+    public function testValidateInvalidConnectionsFormat()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => 'con1'
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing name field for publisher pub01 in connection config.
+     */
+    public function testValidateInvalidPublisherConnectionName()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['exchange' => 'exchange01', 'disabled' => false],
+                ]
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing exchange field for publisher pub01 in connection config.
+     */
+    public function testValidateInvalidConnectionExchange()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'disabled' => false],
+                ]
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing disabled field for publisher pub01 in connection config.
+     */
+    public function testValidateInvalidConnectionDisabledField()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'default'],
+                ]
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing topic field for publisher pub01. Missing disabled field for publisher pub02.
+     */
+    public function testValidateMultipleExceptions()
+    {
+        $configData = [
+            'pub01' => [
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Xml/ConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Xml/ConverterTest.php
new file mode 100644
index 0000000000000..86e8526114780
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Xml/ConverterTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Xml;
+
+use Magento\Framework\MessageQueue\Publisher\Config\Xml\Converter;
+use Magento\Framework\Stdlib\BooleanUtils;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->converter = new Converter(new BooleanUtils(), $this->defaultConfigProviderMock);
+    }
+
+    public function testConvert()
+    {
+        $fixtureDir = __DIR__ . '/../../../_files/queue_publisher';
+        $xmlFile = $fixtureDir . '/valid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $this->defaultConfigProviderMock->expects($this->any())->method('getExchange')->willReturn('magento');
+        $result = $this->converter->convert($dom);
+
+        $expectedData = include($fixtureDir . '/valid.php');
+        foreach ($expectedData as $key => $value) {
+            $this->assertEquals($value, $result[$key], 'Invalid data for ' . $key);
+        }
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Connection name is missing
+     */
+    public function testConvertWithException()
+    {
+        $fixtureDir = __DIR__ . '/../../../_files/queue_publisher';
+        $xmlFile = $fixtureDir . '/invalid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $this->converter->convert($dom);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
new file mode 100644
index 0000000000000..048ec82fb57c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher;
+
+class XsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    protected $_schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->_schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->_schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" />
+                        <connection name="db" exchange="magento2" disabled="true" />
+                    </publisher>
+                    <publisher topic="topic.message.queue.config.02">
+                        <connection name="amqp" exchange="magento2" disabled="true"/>
+                        <connection name="db" exchange="magento2" disabled="true" />
+                    </publisher>
+                    <publisher topic="topic.message.queue.config.03" disabled="true" />
+                </config>',
+                [],
+            ],
+            'non unique publisher topic' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" />
+                    </publisher>
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" disabled="true"/>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'publisher': Duplicate key-sequence ['topic.message.queue.config.01'] in unique identity-constraint 'unique-publisher-topic'."
+                ],
+            ],
+            'non unique publisher connection name' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" />
+                        <connection name="amqp" exchange="magento2" />
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection': Duplicate key-sequence ['amqp'] in unique identity-constraint 'unique-connection-name'."
+                ],
+            ],
+            'missed required publisher attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher disabled="false">
+                        <connection name="amqp" exchange="magento2" />                        
+                    </publisher>
+                </config>',
+                [
+                    "Element 'publisher': The attribute 'topic' is required but missing."
+                ],
+            ],
+            'missed required connection attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="top01">
+                        <connection exchange="magento2" />                        
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection': The attribute 'name' is required but missing."
+                ],
+            ],
+            'unexpected publisher element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <unexpected name="10">20</unexpected>
+                    <publisher topic="topic.message.queue.config.03" disabled="true" />
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( publisher )."
+                ],
+            ],
+            'unexpected connection element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true">
+                        <connection name="amqp" exchange="magento2" />
+                        <unexpected name="10">20</unexpected>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( connection )."
+                ],
+            ],
+            'unexpected publisher attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true" unexpected="10"/>
+                </config>',
+                [
+                    "Element 'publisher', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+            'unexpected connection attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true">
+                        <connection name="amqp" exchange="magento2" unexpected="10"/>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+            'invalid connection attribute value' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true">
+                        <connection name="amqp" exchange="magento2" disabled="disabled"/>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection', attribute 'disabled': 'disabled' is not a valid value of the atomic type 'xs:boolean'.",
+                ],
+            ],
+            'invalid publisher attribute value' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="disabled">
+                        <connection name="amqp" exchange="magento2" />
+                    </publisher>
+                </config>',
+                [
+                    "Element 'publisher', attribute 'disabled': 'disabled' is not a valid value of the atomic type 'xs:boolean'.",
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/PublisherTest.php
new file mode 100644
index 0000000000000..576da8b9a006b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/PublisherTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\Amqp\Config as AmqpConfig;
+use Magento\Framework\MessageQueue\Envelope;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\ExchangeRepository;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConnection;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MysqlMq\Model\Driver\Exchange;
+
+/**
+ * Class PublisherTest @covers \Magento\Framework\MessageQueue\Publisher
+ */
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var Publisher
+     */
+    private $publisher;
+
+    /**
+     * Publisher config mock.
+     *
+     * @var PublisherConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * Amqp config mock.
+     *
+     * @var AmqpConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $amqpConfig;
+
+    /**
+     * Message validator mock.
+     *
+     * @var MessageValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageValidator;
+
+    /**
+     * Message encoder mock.
+     *
+     * @var MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * Exchange repository mock.
+     *
+     * @var ExchangeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeRepository;
+
+    /**
+     * Envelope factory mock.
+     *
+     * @var EnvelopeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envelopeFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->publisherConfig = $this->getMockBuilder(PublisherConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->amqpConfig = $this->getMockBuilder(AmqpConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->messageValidator = $this->getMockBuilder(MessageValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->messageEncoder = $this->getMockBuilder(MessageEncoder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->exchangeRepository = $this->getMockBuilder(ExchangeRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->envelopeFactory = $this->getMockBuilder(EnvelopeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager = new ObjectManager($this);
+        $this->publisher = $objectManager->getObject(
+            Publisher::class,
+            [
+                'messageValidator' => $this->messageValidator,
+                'envelopeFactory' => $this->envelopeFactory,
+                'messageEncoder' => $this->messageEncoder,
+                'exchangeRepository' => $this->exchangeRepository,
+            ]
+        );
+        $objectManager->setBackwardCompatibleProperty($this->publisher, 'publisherConfig', $this->publisherConfig);
+        $objectManager->setBackwardCompatibleProperty($this->publisher, 'amqpConfig', $this->amqpConfig);
+    }
+
+    /**
+     * @covers \Magento\Framework\MessageQueue\Publisher::publish()
+     */
+    public function testPublish()
+    {
+        $topicName = 'tesTopicName';
+        $data = ['testData'];
+        $encodedData = 'testEncodedData';
+        $body = 'testBody';
+        $envelope = new Envelope($body);
+        $exchange = $this->getMockBuilder(Exchange::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $exchange->expects(self::once())
+            ->method('enqueue')
+            ->with(self::identicalTo($topicName), self::identicalTo($envelope))
+            ->willReturn(null);
+        $connection = $this->getMockBuilder(PublisherConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->expects(self::once())
+            ->method('getName')
+            ->willReturn('amqp');
+        $publisher = $this->getMockBuilder(PublisherConfigItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $publisher->expects(self::once())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $this->messageValidator->expects(self::once())
+            ->method('validate');
+        $this->messageEncoder->expects(self::once())
+            ->method('encode')
+            ->with(self::identicalTo($topicName), self::identicalTo($data))
+            ->willReturn($encodedData);
+        $this->envelopeFactory->expects(self::once())
+            ->method('create')
+            ->willReturn($envelope);
+        $this->publisherConfig->expects(self::once())
+            ->method('getPublisher')
+            ->with($topicName)
+            ->willReturn($publisher);
+        $this->amqpConfig->expects(self::once())
+            ->method('getValue')
+            ->with(AmqpConfig::HOST)
+            ->willReturn('');
+        $this->exchangeRepository->expects(self::once())
+            ->method('getByConnectionName')
+            ->with('db')
+            ->willReturn($exchange);
+        self::assertNull($this->publisher->publish($topicName, $data));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Rpc/ResponseQueueNameBuilderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Rpc/ResponseQueueNameBuilderTest.php
new file mode 100644
index 0000000000000..5034dc44d80e0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Rpc/ResponseQueueNameBuilderTest.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Rpc;
+
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+class ResponseQueueNameBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetQueueName()
+    {
+        $model = new ResponseQueueNameBuilder();
+        $this->assertEquals('responseQueue.topic.01', $model->getQueueName('topic.01'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php
new file mode 100644
index 0000000000000..cc5c4ac84440d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\QueueConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\Data;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem\DataMapper;
+
+class DataMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configData;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueNameBuilder;
+
+    /**
+     * @var DataMapper
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->configData = $this->createMock(Data::class);
+        $this->communicationConfig = $this->createMock(CommunicationConfig::class);
+        $this->queueNameBuilder = $this->createMock(ResponseQueueNameBuilder::class);
+        $this->model = new DataMapper($this->configData, $this->communicationConfig, $this->queueNameBuilder);
+    }
+
+    public function testGetMappedData()
+    {
+        $data = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'topic01',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                    'bind02' => [
+                        'id' => 'bind02',
+                        'topic' => 'topic02',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+            'ex02' => [
+                'name' => 'ex02',
+                'type' => 'exchange',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'topic01',
+                        'destinationType' => 'exchange',
+                        'destination' => 'some.exchange',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+
+        $communicationMap = [
+            ['topic01', ['name' => 'topic01', 'is_synchronous' => true]],
+            ['topic02', ['name' => 'topic02', 'is_synchronous' => false]],
+        ];
+
+        $this->communicationConfig->expects($this->exactly(2))->method('getTopic')->willReturnMap($communicationMap);
+        $this->configData->expects($this->once())->method('get')->willReturn($data);
+        $this->queueNameBuilder->expects($this->once())
+            ->method('getQueueName')
+            ->with('topic01')
+            ->willReturn('responseQueue.topic01');
+
+        $actualResult = $this->model->getMappedData();
+        $expectedResult = [
+            'responseQueue.topic01--amqp' => [
+                'name' => 'responseQueue.topic01',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'some.queue--amqp' => [
+                'name' => 'some.queue',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+        ];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testGetMappedDataForWildcard()
+    {
+        $data = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => '#',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                    'bind02' => [
+                        'id' => 'bind02',
+                        'topic' => '*.*.*',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                    'bind03' => [
+                        'id' => 'bind03',
+                        'topic' => 'topic01',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+            'ex02' => [
+                'name' => 'ex02',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => '#.some.*',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+
+        $communicationData = [
+            'topic01' =>  ['name' => 'topic01', 'is_synchronous' => true],
+            'topic02' =>  ['name' => 'topic02', 'is_synchronous' => true],
+            'topic03' =>  ['name' => 'topic03', 'is_synchronous' => true],
+            'topic04.04.04' =>  ['name' => 'topic04.04.04', 'is_synchronous' => true],
+            'topic05.05' =>  ['name' => 'topic05.05', 'is_synchronous' => true],
+            'topic06.06.06' =>  ['name' => 'topic06.06.06', 'is_synchronous' => false],
+            'topic07' =>  ['name' => 'topic07', 'is_synchronous' => false],
+            'topic08.part2.some.test' =>  ['name' => 'topic08.part2.some.test', 'is_synchronous' => true],
+        ];
+
+        $this->communicationConfig->expects($this->once())
+            ->method('getTopic')
+            ->with('topic01')
+            ->willReturn(['name' => 'topic01', 'is_synchronous' => true]);
+        $this->communicationConfig->expects($this->any())->method('getTopics')->willReturn($communicationData);
+        $this->configData->expects($this->once())->method('get')->willReturn($data);
+        $this->queueNameBuilder->expects($this->any())
+            ->method('getQueueName')
+            ->willReturnCallback(function ($value) {
+                return 'responseQueue.' . $value;
+            });
+
+        $actualResult = $this->model->getMappedData();
+        $expectedResult = [
+            'responseQueue.topic01--amqp' => [
+                'name' => 'responseQueue.topic01',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'some.queue--amqp' => [
+                'name' => 'some.queue',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic02--amqp' => [
+                'name' => 'responseQueue.topic02',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic03--amqp' => [
+                'name' => 'responseQueue.topic03',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic04.04.04--amqp' => [
+                'name' => 'responseQueue.topic04.04.04',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic05.05--amqp' => [
+                'name' => 'responseQueue.topic05.05',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic08.part2.some.test--amqp' => [
+                'name' => 'responseQueue.topic08.part2.some.test',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ]
+        ];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/RemoteService/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/RemoteService/ReaderTest.php
new file mode 100644
index 0000000000000..df402eb0331ec
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/RemoteService/ReaderTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Topology\Config\RemoteService\Reader;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @var DefaultValueProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $serviceMethodsMap;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->defaultValueProvider = $this->createMock(DefaultValueProvider::class);
+        $this->objectManagerConfig = $this->createMock(ObjectManagerConfig::class);
+        $this->reflectionGenerator = $this->createMock(ReflectionGenerator::class);
+        $this->serviceMethodsMap = $this->createMock(ServiceMethodsMap::class);
+        $this->reader = $objectManager->getObject(
+            Reader::class,
+            [
+                'defaultValueProvider' => $this->defaultValueProvider,
+                'objectManagerConfig' => $this->objectManagerConfig,
+                'reflectionGenerator' => $this->reflectionGenerator,
+                'serviceMethodsMap' => $this->serviceMethodsMap,
+            ]
+        );
+    }
+
+    public function testRead()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')->willReturn(
+            ['methodOne' => 'string', 'methodTwo' => 'string']
+        );
+
+        $this->reflectionGenerator->expects($this->exactly(2))->method('generateTopicName')->willReturnMap(
+            [
+                ['Some\Service\NameInterface', 'methodOne', 'topicOne'],
+                ['Some\Service\NameInterface', 'methodTwo', 'topicTwo']
+            ]
+        );
+
+        $expectedResult = [
+            'magento' => [
+                'name' => 'magento',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'internal' => false,
+                'bindings' => [
+                    'topicOne--magento--queue.topicOne' => [
+                        'id' => 'topicOne--magento--queue.topicOne',
+                        'destinationType' => 'queue',
+                        'destination' => 'queue.topicOne',
+                        'disabled' => false,
+                        'topic' => 'topicOne',
+                        'arguments' => []
+                    ],
+                    'topicTwo--magento--queue.topicTwo' => [
+                        'id' => 'topicTwo--magento--queue.topicTwo',
+                        'destinationType' => 'queue',
+                        'destination' => 'queue.topicTwo',
+                        'disabled' => false,
+                        'topic' => 'topicTwo',
+                        'arguments' => []
+                    ]
+                ],
+                'arguments' => []
+            ]
+        ];
+
+        $this->assertEquals($expectedResult, $this->reader->read());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Service interface was expected, "Some\Service\NameInterface" given
+     */
+    public function testReadInvalidService()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')
+            ->willThrowException(new \Exception(''));
+
+        $this->reflectionGenerator->expects($this->exactly(0))->method('generateTopicName');
+
+        $this->reader->read();
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php
new file mode 100644
index 0000000000000..4347d2ef03492
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Topology\Config\Validator\DependentFields;
+
+class DependantFieldsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DependentFields
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new DependentFields();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+            'ex02' => [
+                'name' => 'ex01',
+                'type' => 'headers',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMissingTopicField()
+    {
+        $expectedMessage = "Topic name is required for topic based exchange: ex01";
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedMessage);
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php
new file mode 100644
index 0000000000000..89c1313a10807
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php
@@ -0,0 +1,459 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\Validator\FieldsTypes;
+
+class FieldsTypesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FieldsTypes
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new FieldsTypes();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'type name' => [
+                [
+                    'ex01' => [
+                        'name' => true,
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'name' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'type type' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 100,
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'type' field specified in configuration of 'ex01' exchange is invalid. Given 'integer"
+            ],
+            'invalid type' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'some',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Value of 'type' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'some', 'topic' was expected."
+            ],
+            'type connection' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => false,
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'connection' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'type durable' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => 100,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'durable' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'boolean' was expected."
+            ],
+            'type internal' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => null,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'internal' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'NULL', 'boolean' was expected."
+            ],
+            'type autoDelete' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => 1,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'autoDelete' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'boolean' was expected."
+            ],
+            'type arguments' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => 'argument',
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'arguments' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'string', 'array' was expected."
+            ],
+            'type bindings' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => false,
+                    ],
+                ],
+                "Type of 'bindings' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'array' was expected."
+            ],
+            'type binding id' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 100,
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'id' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'string' was expected."
+            ],
+            'type binding destinationType' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => false,
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'destinationType' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'invalid binding destinationType' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'test',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Value of 'destinationType' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'test', 'queue' was expected."
+            ],
+            'type binding destination' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => null,
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'destination' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'NULL', 'string' was expected."
+            ],
+            'type binding disabled' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => 1,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'disabled' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'boolean' was expected."
+            ],
+            'type binding topic' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => false,
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ]
+                    ],
+                ],
+                "Type of 'topic' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'type binding arguments' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => 'args'
+                            ]
+                        ]
+                    ],
+                ],
+                "Type of 'arguments' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'string', 'array' was expected."
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php
new file mode 100644
index 0000000000000..bcd6dde06a511
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Topology\Config\Validator\Format;
+
+class FormatTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Format
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Format();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMissingRequiredExchangeFields()
+    {
+        $expectedMessage = "Missing [name] field for exchange ex01." . PHP_EOL .
+            "Missing [type] field for exchange ex01." . PHP_EOL .
+            "Missing [connection] field for exchange ex01." . PHP_EOL .
+            "Missing [durable] field for exchange ex01." . PHP_EOL .
+            "Missing [autoDelete] field for exchange ex01." . PHP_EOL .
+            "Missing [internal] field for exchange ex01." . PHP_EOL .
+            "Missing [arguments] field for exchange ex01.";
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedMessage);
+        $configData = [
+            'ex01' => [
+                'invalid' => 'format',
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'bind01',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMissingRequiredBindingFields()
+    {
+        $expectedMessage = "Missing [id] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [destinationType] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [destination] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [disabled] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [topic] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [arguments] field for binding ex01 in exchange config.";
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedMessage);
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'invalid' => 'format'
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateInvalidBindingsFormat()
+    {
+        $expectedMessage = "Invalid bindings format for exchange ex01.";
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage($expectedMessage);
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => 'binding'
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Xml/ConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Xml/ConverterTest.php
new file mode 100644
index 0000000000000..9d574685730cd
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Xml/ConverterTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Xml;
+
+use Magento\Framework\MessageQueue\Topology\Config\Xml\Converter;
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Data\Argument\InterpreterInterface;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $interpreter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->interpreter = $this->createMock(InterpreterInterface::class);
+        $this->converter = new Converter(new BooleanUtils(), $this->interpreter, $this->defaultConfigProviderMock);
+        $this->defaultConfigProviderMock->expects($this->any())->method('getConnection')->willReturn('amqp');
+    }
+
+    public function testConvert()
+    {
+        $fixtureDir = __DIR__ . '/../../../_files/queue_topology';
+        $xmlFile = $fixtureDir . '/valid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+
+        $this->interpreter->expects($this->any())->method('evaluate')->willReturn(10);
+        $result = $this->converter->convert($dom);
+
+        $expectedData = include($fixtureDir . '/valid.php');
+        foreach ($expectedData as $key => $value) {
+            $this->assertEquals($value, $result[$key], 'Invalid data for ' . $key);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
new file mode 100644
index 0000000000000..59f52c83a5f74
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology;
+
+class MergedXsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private $schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology_merged.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp" />
+                        <exchange name="ex02" type="topic" connection="amqp" />
+                        <exchange name="ex03" autoDelete="true" durable="false" internal="true" type="topic" connection="db">
+                            <arguments>
+                                <argument name="arg1" xsi:type="string">10</argument>
+                            </arguments>
+                        </exchange>
+                        <exchange name="ex04" type="topic" connection="amqp">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind02" destinationType="queue" destination="queue01" topic="top01">
+                                <arguments>
+                                    <argument name="arg01" xsi:type="string">10</argument>
+                                </arguments>
+                            </binding>
+                        </exchange>
+                </config>',
+                [],
+            ],
+            'non-unique-exchange' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp"/>
+                        <exchange name="ex01" type="topic" connection="amqp" />
+                </config>',
+                [
+                    "Element 'exchange': Duplicate key-sequence ['ex01', 'amqp'] in unique identity-constraint 'unique-exchange-name-connection'."
+                ],
+            ],
+            'non-unique-exchange-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" connection="amqp" type="topic">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                        </exchange>
+                </config>',
+                [
+                    "Element 'binding': Duplicate key-sequence ['bind01'] in unique identity-constraint 'unique-binding-id'."
+                ],
+            ],
+            'invalid-destination-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="topic" connection="amqp">
+                        <binding id="bind01" destinationType="topic" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'binding', attribute 'destinationType': [facet 'enumeration'] The value 'topic' is not an element of the set {'queue'}.",
+                    "Element 'binding', attribute 'destinationType': 'topic' is not a valid value of the atomic type 'destinationType'."
+                ],
+            ],
+            'invalid-exchange-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="exchange" connection="db">
+                        <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'exchange', attribute 'type': [facet 'enumeration'] The value 'exchange' is not an element of the set {'topic'}.",
+                    "Element 'exchange', attribute 'type': 'exchange' is not a valid value of the atomic type 'exchangeType'."
+                ],
+            ],
+            'missed-required-attributes' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" />
+                        <exchange name="ex02" connection="amqp" />                        
+                </config>',
+                [
+                    "Element 'exchange': The attribute 'connection' is required but missing.",
+                    "Element 'exchange': The attribute 'type' is required but missing."
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
new file mode 100644
index 0000000000000..46f57fc572914
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology;
+
+class XsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private $schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp"/>
+                        <exchange name="ex02" type="topic" connection="amqp-02" />
+                        <exchange name="ex03" autoDelete="true" durable="false" internal="true" type="topic" connection="db">
+                            <arguments>
+                                <argument name="arg1" xsi:type="string">10</argument>
+                            </arguments>
+                        </exchange>
+                        <exchange name="ex04" connection="amqp-03">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind02" destinationType="queue" destination="queue01" topic="top01">
+                                <arguments>
+                                    <argument name="arg01" xsi:type="string">10</argument>
+                                </arguments>
+                            </binding>
+                        </exchange>
+                </config>',
+                [],
+            ],
+            'non-unique-exchange' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp"/>
+                        <exchange name="ex01" type="topic" connection="amqp" />
+                </config>',
+                [
+                    "Element 'exchange': Duplicate key-sequence ['ex01', 'amqp'] in unique identity-constraint 'unique-exchange-name-connection'."
+                ],
+            ],
+            'non-unique-exchange-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" connection="amqp">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                        </exchange>
+                </config>',
+                [
+                    "Element 'binding': Duplicate key-sequence ['bind01'] in unique identity-constraint 'unique-binding-id'."
+                ],
+            ],
+            'invalid-destination-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="topic" connection="amqp">
+                        <binding id="bind01" destinationType="topic" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'binding', attribute 'destinationType': [facet 'enumeration'] The value 'topic' is not an element of the set {'queue'}.",
+                    "Element 'binding', attribute 'destinationType': 'topic' is not a valid value of the atomic type 'destinationType'."
+                ],
+            ],
+            'invalid-exchange-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="exchange" connection="amqp">
+                        <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'exchange', attribute 'type': [facet 'enumeration'] The value 'exchange' is not an element of the set {'topic'}.",
+                    "Element 'exchange', attribute 'type': 'exchange' is not a valid value of the atomic type 'exchangeType'."
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_1.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_1.php
new file mode 100644
index 0000000000000..f73846d21f809
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_1.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'publishers' => [
+        'amqp-magento' => [
+            'name' => 'amqp-magento',
+            'connection' => 'db',
+            'exchange' => 'magento-db'
+        ],
+    ],
+    'consumers' => [
+        'inventoryQtyCounter' => [
+            'connection' => 'db'
+        ],
+    ]
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_2.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_2.php
new file mode 100644
index 0000000000000..c8f71fe7b4748
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_2.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'config' => [
+        'publishers' => [
+            'inventory.counter.updated' => [
+                'connections' => [
+                    'amqp' => [
+                        'name' => 'db',
+                        'exchange' => 'magento-db'
+                    ],
+                ]
+            ]
+        ],
+        'consumers' => [
+            'inventoryQtyCounter' => [
+                'connection' => 'db'
+            ]
+        ]
+    ]
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_queue.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_queue.php
new file mode 100644
index 0000000000000..5dacfb241189d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_queue.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'publishers' => [
+        'test-publisher-1' => [
+            'name' => 'test-publisher-1',
+            'connection' => 'amqp',
+            'exchange' => 'magento',
+        ],
+        'test-publisher-2' => [
+            'name' => 'test-publisher-2',
+            'connection' => 'db',
+            'exchange' => 'magento',
+        ],
+        'test-publisher-3' => [
+            'name' => 'test-publisher-3',
+            'connection' => 'amqp',
+            'exchange' => 'test-exchange-1',
+        ],
+    ],
+    'topics' => [
+        'customer.created' => [
+            'name' => 'customer.created',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.created.one' => [
+            'name' => 'customer.created.one',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.created.one.two' => [
+            'name' => 'customer.created.one.two',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.created.two' => [
+            'name' => 'customer.created.two',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.updated' => [
+            'name' => 'customer.updated',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-2',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.deleted' => [
+            'name' => 'customer.deleted',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-2',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'cart.created' => [
+            'name' => 'cart.created',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Quote\Api\Data\CartInterface::class
+            ],
+            'publisher' => 'test-publisher-3',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'cart.created.one' => [
+            'name' => 'cart.created.one',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Quote\Api\Data\CartInterface::class
+            ],
+            'publisher' => 'test-publisher-3',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+    ],
+    'consumers' => [
+        'customerCreatedListener' => [
+            'name' => 'customerCreatedListener',
+            'queue' => 'test-queue-1',
+            'connection' => 'amqp',
+            'max_messages' => null,
+            'instance_type' => 'Test\Executor',
+            'consumer_type' => 'async',
+            'handlers' => [
+                'customer.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.created.one' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.created.one.two' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.created.two' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.updated' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'cart.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ]
+            ]
+        ],
+        'customerDeletedListener' => [
+            'name' => 'customerDeletedListener',
+            'queue' => 'test-queue-2',
+            'connection' => 'db',
+            'max_messages' => '98765',
+            'instance_type' => null,
+            'consumer_type' => 'async',
+            'handlers' => [
+                'customer.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage2'
+                    ]
+                ],
+                'customer.deleted' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage2'
+                    ]
+                ]
+            ]
+        ],
+        'cartCreatedListener' => [
+            'name' => 'cartCreatedListener',
+            'queue' => 'test-queue-3',
+            'connection' => 'amqp',
+            'max_messages' => null,
+            'instance_type' => null,
+            'consumer_type' => 'async',
+            'handlers' => [
+                'cart.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage3'
+                    ]
+                ],
+                'cart.created.one' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage3'
+                    ]
+                ]
+            ]
+        ],
+    ],
+    'binds' => [
+        'customer.created--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created"],
+        'customer.created.one--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created.one"],
+        'customer.created.one.two--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created.one.two"],
+        'customer.created.two--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created.two"],
+        'customer.updated--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.updated"],
+        'cart.created--test-exchange-1--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "test-exchange-1", 'topic' => "cart.created"],
+        'customer.created--magento--test-queue-2' =>
+            ['queue' => "test-queue-2", 'exchange' => "magento", 'topic' => "customer.created"],
+        'customer.deleted--magento--test-queue-2' =>
+            ['queue' => "test-queue-2", 'exchange' => "magento", 'topic' => "customer.deleted"],
+        'cart.created--magento--test-queue-3' =>
+            ['queue' => "test-queue-3", 'exchange' => "magento", 'topic' => "cart.created"],
+        'cart.created.one--magento--test-queue-3' =>
+            ['queue' => "test-queue-3", 'exchange' => "magento", 'topic' => "cart.created.one"],
+        'cart.created--test-exchange-1--test-queue-3' =>
+            ['queue' => "test-queue-3", 'exchange' => "test-exchange-1", 'topic' => "cart.created"],
+        'customer.*--magento--test-queue-4' =>
+            ['queue' => "test-queue-4", 'exchange' => "magento", 'topic' => "customer.*"],
+        'customer.#--magento--test-queue-5' =>
+            ['queue' => "test-queue-5", 'exchange' => "magento", 'topic' => "customer.#"],
+        'customer.*.one--magento--test-queue-6' =>
+            ['queue' => "test-queue-6", 'exchange' => "magento", 'topic' => "customer.*.one"],
+        '*.created.*--magento--test-queue-7' =>
+            ['queue' => "test-queue-7", 'exchange' => "magento", 'topic' => "*.created.*"],
+        '*.created.#--magento--test-queue-8' =>
+            ['queue' => "test-queue-8", 'exchange' => "magento", 'topic' => "*.created.#"],
+        '#--magento--test-queue-9' =>
+            ['queue' => "test-queue-9", 'exchange' => "magento", 'topic' => "#"],
+    ],
+    'exchange_topic_to_queues_map' => [
+        'magento--customer.created' => ['test-queue-1', 'test-queue-2', 'test-queue-4', 'test-queue-5', 'test-queue-9'],
+        'magento--customer.created.one' =>
+            ['test-queue-1', 'test-queue-5', 'test-queue-6', 'test-queue-7', 'test-queue-8', 'test-queue-9'],
+        'magento--customer.created.one.two' => ['test-queue-1', 'test-queue-5', 'test-queue-8', 'test-queue-9'],
+        'magento--customer.created.two' =>
+            ['test-queue-1', 'test-queue-5', 'test-queue-7', 'test-queue-8', 'test-queue-9'],
+        'magento--customer.updated' => ['test-queue-1', 'test-queue-4', 'test-queue-5', 'test-queue-9'],
+        'test-exchange-1--cart.created' => ['test-queue-1', 'test-queue-3'],
+        'magento--customer.deleted' => ['test-queue-2', 'test-queue-4', 'test-queue-5', 'test-queue-9'],
+        'magento--cart.created' => ['test-queue-3', 'test-queue-9'],
+        'magento--cart.created.one' => ['test-queue-3', 'test-queue-7', 'test-queue-8', 'test-queue-9'],
+    ]
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_topic_config.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_topic_config.php
new file mode 100644
index 0000000000000..d2d1bfc200462
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_topic_config.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'publishers' => [
+        'amqp-ex.01' => [
+            'name' => 'amqp-ex.01',
+            'connection' => 'amqp',
+            'exchange' => 'ex.01',
+        ],
+        'db-magento' => [
+            'name' => 'db-magento',
+            'connection' => 'db',
+            'exchange' => 'magento',
+        ],
+        'amqp-magento' => [
+            'name' => 'amqp-magento',
+            'connection' => 'amqp',
+            'exchange' => 'magento',
+        ],
+    ],
+    'binds' => [
+        'top.01--ex.01--q.01'   => ['queue' => 'q.01', 'exchange' => 'ex.01',   'topic' => 'top.01'],
+        'top.03--magento--q.03' => ['queue' => 'q.03', 'exchange' => 'magento', 'topic' => 'top.03'],
+        'top.04--magento--q.04' => ['queue' => 'q.04', 'exchange' => 'magento', 'topic' => 'top.04'],
+        'top.04--magento--q.05' => ['queue' => 'q.05', 'exchange' => 'magento', 'topic' => 'top.04'],
+        'top.04--magento--q.06' => ['queue' => 'q.06', 'exchange' => 'magento', 'topic' => 'top.04'],
+        'top.03--magento--q.04' => ['queue' => 'q.04', 'exchange' => 'magento', 'topic' => 'top.03'],
+        'user.created.remote--magento--q.log' => [
+            'queue' => 'q.log', 'exchange' => 'magento', 'topic' => 'user.created.remote'
+        ],
+        'product.created.local--magento--q.log' => [
+            'queue' => 'q.log', 'exchange' => 'magento', 'topic' => 'product.created.local'
+        ],
+    ],
+    'exchange_topic_to_queues_map' => [
+        'amqp-ex.01--top.01' => ['q.01'],
+        'amqp-magento--top.03' => ['q.03', 'q.04'],
+        'db-magento--top.04' => ['q.04', 'q.05', 'q.06'],
+        'amqp-magento--user.created.remote' => ['q.log'],
+        'amqp-magento--product.created.local' => ['q.log'],
+    ],
+    'consumers' => [
+        'cons.01' => [
+            'name' => 'cons.01',
+            'handlers' => [
+                'top.01' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'amqp',
+            'queue' => 'q.01'
+        ],
+        'cons.03' => [
+            'name' => 'cons.03',
+            'handlers' => [
+                'top.03' => [
+                    '0' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'save',
+                    ],
+                    '1' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'delete',
+                    ],
+                ]
+            ],
+            'instance_type' => 'Magento\Framework\MessageQueue\ConsumerInterface',
+            'consumer_type' => 'async',
+            'max_messages' => null,
+            'connection' => 'amqp',
+            'queue' => 'q.03'
+        ],
+        'cons.04' => [
+            'name' => 'cons.04',
+            'handlers' => [
+                'top.04' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'db',
+            'queue' => 'q.04'
+        ],
+        'cons.05' => [
+            'name' => 'cons.05',
+            'handlers' => [
+                'top.04' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'db',
+            'queue' => 'q.05'
+        ],
+         'cons.06' => [
+            'name' => 'cons.06',
+            'handlers' => [
+                'top.04' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'db',
+            'queue' => 'q.06'
+         ],
+        'cons.07' => [
+            'name' => 'cons.07',
+            'handlers' => [
+                'top.03' => [
+                    '0' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'save',
+                    ],
+                    '1' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'delete',
+                    ],
+                ]
+            ],
+            'instance_type' => 'Magento\Framework\MessageQueue\ConsumerInterface',
+            'consumer_type' => 'async',
+            'max_messages' => null,
+            'connection' => 'amqp',
+            'queue' => 'q.04'
+        ],
+        'cons.logger' => [
+            'name' => 'cons.logger',
+            'handlers' => [
+                'product.created.local' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'logger'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Framework\MessageQueue\ConsumerInterface',
+            'consumer_type' => 'async',
+            'max_messages' => null,
+            'connection' => 'amqp',
+            'queue' => 'q.log'
+        ],
+    ],
+    'topics' => [
+        'top.01' => [
+            'name' => 'top.01',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-ex.01',
+            'is_synchronous' => false,
+        ],
+        'top.03' => [
+            'name' => 'top.03',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-magento',
+            'is_synchronous' => false,
+        ],
+        'top.04' => [
+            'name' => 'top.04',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'db-magento',
+            'is_synchronous' => false,
+        ],
+        'user.created.remote' => [
+            'name' => 'user.created.remote',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-magento',
+            'is_synchronous' => false,
+        ],
+        'product.created.local' => [
+            'name' => 'product.created.local',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-magento',
+            'is_synchronous' => false,
+        ],
+    ]
+
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
new file mode 100644
index 0000000000000..5d22103b4c531
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'consumer1' => [
+        'name' => 'consumer1',
+        'queue' => 'queue1',
+        'consumerInstance' => 'consumerClass1',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassOne',
+                'method' => 'handlerMethodOne'
+            ],
+        ],
+        'connection' => 'connection1',
+        'maxMessages' => '100',
+    ],
+    'consumer2' => [
+        'name' => 'consumer2',
+        'queue' => 'queue2',
+        'consumerInstance' => 'consumerClass2',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassTwo',
+                'method' => 'handlerMethodTwo'
+            ],
+        ],
+        'connection' => 'connection2',
+        'maxMessages' => null,
+    ],
+    'consumer3' => [
+        'name' => 'consumer3',
+        'queue' => 'queue3',
+        'consumerInstance' => 'consumerClass3',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassThree',
+                'method' => 'handlerMethodThree'
+            ],
+        ],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+    ],
+    'consumer4' => [
+        'name' => 'consumer4',
+        'queue' => 'queue4',
+        'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassFour',
+                'method' => 'handlerMethodFour'
+            ],
+        ],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+    ],
+    'consumer5' => [
+        'name' => 'consumer5',
+        'queue' => 'queue5',
+        'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
+        'handlers' => [],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
new file mode 100644
index 0000000000000..f020c64a06965
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="connection1" maxMessages="100"/>
+    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="connection2"/>
+    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+    <consumer name="consumer5" queue="queue5"/>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/data_to_validate.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/data_to_validate.php
new file mode 100644
index 0000000000000..c4b750767e738
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/data_to_validate.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'top04' => [
+        'topic' => 'top04',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento8', 'disabled' => true],
+            'db' => ['name' => 'db', 'exchange' => 'magento2', 'disabled' => false]
+        ]
+    ],
+    'top05' => [
+        'topic' => 'top05',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+    'top06' => [
+        'topic' => 'top06',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]
+        ]
+    ],
+    'top07' => [
+        'topic' => 'top07',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/invalid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/invalid.xml
new file mode 100644
index 0000000000000..52a438b0a953a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/invalid.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="top04">
+        <connection ecxhange="exch01" />
+    </publisher>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_one.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_one.php
new file mode 100644
index 0000000000000..37db3771d0fae
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_one.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'top04' => [
+        'topic' => 'top04',
+        'disabled' => false,
+        'connections' => ['amqp' => ['name' => 'amqp', 'exchange' => 'magento8', 'disabled' => false]]
+    ],
+    'top06' => [
+        'topic' => 'top06',
+        'disabled' => false,
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_two.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_two.php
new file mode 100644
index 0000000000000..8f8c3486a5394
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_two.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'top04' => [
+        'topic' => 'top04',
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'disabled' => true],
+            'db' => ['name' => 'db', 'exchange' => 'magento2', 'disabled' => false]
+        ]
+    ],
+    'top05' => [
+        'topic' => 'top05',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+    'top07' => [
+        'topic' => 'top07',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => true],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.php
new file mode 100644
index 0000000000000..f2266665aea76
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'top01' => [
+        'topic' => 'top01',
+        'disabled' => false,
+        'connections' => []
+    ],
+    'top02' => [
+        'topic' => 'top02',
+        'disabled' => false,
+        'connections' => []
+    ],
+    'top03' => [
+        'topic' => 'top03',
+        'disabled' => true,
+        'connections' => []
+    ],
+    'top04' => [
+        'topic' => 'top04',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]
+        ]
+    ],
+    'top05' => [
+        'topic' => 'top05',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+    'top06' => [
+        'topic' => 'top06',
+        'disabled' => true,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true]
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.xml
new file mode 100644
index 0000000000000..8fd0b0a0e6bf5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="top01" />
+    <publisher topic="top02" disabled="false" />
+    <publisher topic="top03" disabled="true" />
+    <publisher topic="top04">
+        <connection name="amqp" />
+    </publisher>
+    <publisher topic="top05">
+        <connection name="amqp" exchange="exch01" />
+        <connection name="db" exchange="exch02" disabled="true"/>
+    </publisher>
+    <publisher topic="top06" disabled="true">
+        <connection name="amqp" exchange="exch01" />
+        <connection name="db" exchange="exch02" disabled="true"/>
+    </publisher>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.php
new file mode 100644
index 0000000000000..17049a5e0973f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'ex01--amqp' => [
+        'name' => 'ex01',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => true,
+        'autoDelete' => false,
+        'internal' => false,
+        'bindings' => [],
+        'arguments' => [],
+    ],
+    'ex02--amqp' => [
+        'name' => 'ex02',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => true,
+        'autoDelete' => false,
+        'internal' => false,
+        'bindings' => [],
+        'arguments' => [],
+    ],
+    'ex03--amqp' => [
+        'name' => 'ex03',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => false,
+        'autoDelete' => true,
+        'internal' => true,
+        'bindings' => [],
+        'arguments' => [
+            'arg1' => '10',
+        ],
+    ],
+    'ex04--amqp' => [
+        'name' => 'ex04',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => true,
+        'autoDelete' => false,
+        'internal' => false,
+        'bindings' => [
+            'bind01' => [
+                'id' => 'bind01',
+                'destinationType' => 'queue',
+                'destination' => 'queue01',
+                'disabled' => true,
+                'topic' => 'top01',
+                'arguments' => []
+            ],
+            'bind02' => [
+                'id' => 'bind02',
+                'destinationType' => 'queue',
+                'destination' => 'queue01',
+                'disabled' => false,
+                'topic' => 'top01',
+                'arguments' => [
+                    'arg01' => 10
+                ]
+            ],
+        ],
+        'arguments' => [],
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.xml
new file mode 100644
index 0000000000000..8686841e57fae
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="ex01" type="topic" connection="amqp"/>
+    <exchange name="ex02" type="topic" connection="amqp" />
+    <exchange name="ex03" autoDelete="true" durable="false" internal="true" type="topic" connection="amqp">
+        <arguments>
+            <argument name="arg1" xsi:type="string">10</argument>
+        </arguments>
+    </exchange>
+    <exchange name="ex04" type="topic" connection="amqp">
+        <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+        <binding id="bind02" destinationType="queue" destination="queue01" topic="top01">
+            <arguments>
+                <argument name="arg01" xsi:type="string">10</argument>
+            </arguments>
+        </binding>
+    </exchange>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_config.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_config.xml
new file mode 100644
index 0000000000000..6553d0468c3e9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config>
+    <broker topic="top.01" type="amqp" exchange="ex.01">
+        <queue name="q.01" handler="Magento\Handler\Class\Name::methodName" consumer="cons.01" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+    </broker>
+    <broker topic="top.03">
+        <queue name="q.03" consumer="cons.03" />
+        <queue name="q.04" consumer="cons.07" />
+    </broker>
+    <broker topic="top.04" type="db">
+        <queue name="q.04" handler="Magento\Handler\Class\Name::methodName" consumer="cons.04" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+        <queue name="q.05" handler="Magento\Handler\Class\Name::methodName" consumer="cons.05" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+        <queue name="q.06" handler="Magento\Handler\Class\Name::methodName" consumer="cons.06" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+    </broker>
+    <broker topic="*.created.*">
+        <queue name="q.log" handler="Magento\Handler\Class\Name::logger" consumer="cons.logger" />
+    </broker>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_definitions_map.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_definitions_map.php
new file mode 100644
index 0000000000000..27fe84a9ef8bd
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_definitions_map.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    [
+        'top.01',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'top.03',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'handlers' => [
+                'customerCreatedFirst' => [
+                    'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                    'method' => 'save',
+                ],
+                'customerCreatedSecond' => [
+                    'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                    'method' => 'delete',
+                ],
+            ]
+        ]
+    ],
+    [
+        'top.04',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'top.05',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'user.created.remote',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'product.created.local',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/wildcard_pattern_map.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/wildcard_pattern_map.php
new file mode 100644
index 0000000000000..0f2f0b2a3359d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/wildcard_pattern_map.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    ['customer.created', '/^customer\.created$/'],
+    ['customer.created.one', '/^customer\.created\.one$/'],
+    ['customer.created.one.two', '/^customer\.created\.one\.two$/'],
+    ['customer.created.two', '/^customer\.created\.two$/'],
+    ['customer.updated', '/^customer\.updated$/'],
+    ['cart.created', '/^cart\.created$/'],
+    ['customer.deleted', '/^customer\.deleted$/'],
+    ['cart.created.one', '/^cart\.created\.one$/'],
+    ['customer.*', '/^customer\.[^\.]+$/'],
+    ['customer.#', '/^customer\..+$/'],
+    ['customer.*.one', '/^customer\.[^\.]+\.one$/'],
+    ['*.created.*', '/^[^\.]+\.created\.[^\.]+$/'],
+    ['*.created.#', '/^[^\.]+\.created\..+$/'],
+    ['#', '/^.+$/']
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config.php
new file mode 100644
index 0000000000000..7add2bd286e1d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Iterator as ExchangeIterator;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem\Iterator as QueueIterator;
+
+/**
+ * Topology config provides access to data declared in etc/queue_topology.xml
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Exchange config data iterator.
+     *
+     * @var ExchangeIterator
+     */
+    private $exchangeIterator;
+
+    /**
+     * Exchange config data iterator.
+     *
+     * @var ExchangeIterator
+     */
+    private $queueIterator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ExchangeIterator $exchangeIterator
+     * @param QueueIterator $queueIterator
+     */
+    public function __construct(ExchangeIterator $exchangeIterator, QueueIterator $queueIterator)
+    {
+        $this->exchangeIterator = $exchangeIterator;
+        $this->queueIterator = $queueIterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchange($name, $connection)
+    {
+        $topology = $this->exchangeIterator[$name . '--' . $connection];
+        if (!$topology) {
+            throw new LocalizedException(
+                new Phrase(
+                    'The "%exchange" exchange is not declared for the "%connection" connection. Verify and try again.',
+                    [
+                        'exchange' => $name,
+                        'connection' => $connection
+                    ]
+                )
+            );
+        }
+        return $topology;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchanges()
+    {
+        return $this->exchangeIterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueues()
+    {
+        return $this->queueIterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeReader.php
new file mode 100644
index 0000000000000..b565916c7246a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeReader.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Composite reader for topology config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * Config validator.
+     *
+     * @var ValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * Config reade list.
+     *
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface $validator
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(ValidatorInterface $validator, array $readers)
+    {
+        $this->validator = $validator;
+        $this->readers = $readers;
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+        $this->validator->validate($result);
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeValidator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeValidator.php
new file mode 100644
index 0000000000000..279652419982c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeValidator.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Topology config data validator.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * Config validator list.
+     *
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * Validator constructor.
+     *
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct($validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * Validate merged topology config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     * @throws \LogicException
+     */
+    public function validate($configData)
+    {
+        foreach ($this->validators as $validator) {
+            if (!$validator instanceof ValidatorInterface) {
+                throw new \LogicException(
+                    sprintf(
+                        'Validator [%s] does not implements %s',
+                        ValidatorInterface::class,
+                        get_class($validator)
+                    )
+                );
+            }
+            $validator->validate($configData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Data.php
new file mode 100644
index 0000000000000..6711428f06654
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Topology config data storage. Caches merged config.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        $cacheId = 'message_queue_topology_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem.php
new file mode 100644
index 0000000000000..b767a516833af
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding\IteratorFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class ExchangeConfigItem implements ExchangeConfigItemInterface
+{
+    /**
+     * Exchange name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Exchange type.
+     *
+     * @var string
+     */
+    private $type;
+
+    /**
+     * Connection name.
+     *
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * Exchange bindings.
+     *
+     * @var BindingInterface[]
+     */
+    private $bindings;
+
+    /**
+     * Exchange arguments.
+     *
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * Flag. Is exchange durable.
+     *
+     * @var bool
+     */
+    private $isDurable;
+
+    /**
+     * Flag. Is auto-delete
+     *
+     * @var bool
+     */
+    private $isAutoDelete;
+
+    /**
+     * Flag. Is exchange internal.
+     *
+     * @var bool
+     */
+    private $isInternal;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param IteratorFactory $iteratorFactory
+     */
+    public function __construct(IteratorFactory $iteratorFactory)
+    {
+        $this->bindings = $iteratorFactory->create();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDurable()
+    {
+        return $this->isDurable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAutoDelete()
+    {
+        return $this->isAutoDelete;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isInternal()
+    {
+        return $this->isInternal;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBindings()
+    {
+        return $this->bindings;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Set exchange config item data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->type = $data['type'];
+        $this->connection = $data['connection'];
+        $this->isInternal = $data['internal'];
+        $this->isDurable = $data['durable'];
+        $this->isAutoDelete = $data['autoDelete'];
+        $this->arguments = $data['arguments'];
+        $this->bindings->setData($data['bindings']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding.php
new file mode 100644
index 0000000000000..f6d964c3d081e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+/**
+ * Instances of this class represent config binding items declared in etc/queue_topology.xsd
+ */
+class Binding implements BindingInterface
+{
+    /**
+     * Binding id.
+     *
+     * @var string
+     */
+    private $id;
+
+    /**
+     * Binding destination type.
+     *
+     * @var string
+     */
+    private $destinationType;
+
+    /**
+     * Binding destination.
+     *
+     * @var string
+     */
+    private $destination;
+
+    /**
+     * Flag. Is binding disabled.
+     * @var bool
+     */
+    private $isDisabled;
+
+    /**
+     * Topic name.
+     *
+     * @var string
+     */
+    private $topic;
+
+    /**
+     * Binding arguments.
+     *
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDestinationType()
+    {
+        return $this->destinationType;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDestination()
+    {
+        return $this->destination;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Set binding data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->id = $data['id'];
+        $this->destinationType = $data['destinationType'];
+        $this->destination = $data['destination'];
+        $this->arguments = $data['arguments'];
+        $this->topic = $data['topic'];
+        $this->isDisabled = $data['disabled'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/Iterator.php
new file mode 100644
index 0000000000000..1bc9adef61f51
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/Iterator.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingFactory;
+
+/**
+ * Exchange binding config data iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Exchange binding config.
+     *
+     * @var Binding
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BindingFactory $itemFactory
+     */
+    public function __construct(BindingFactory $itemFactory)
+    {
+        $this->object = $itemFactory->create();
+    }
+
+    /**
+     * Set iterator data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return Binding
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset) || $this->data[$offset]['disabled'] == true) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/IteratorFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/IteratorFactory.php
new file mode 100644
index 0000000000000..bc2faca4f341f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/IteratorFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding;
+
+/**
+ * Factory class for @see Iterator
+ */
+class IteratorFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Iterator::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Iterator
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingFactory.php
new file mode 100644
index 0000000000000..be83da6979912
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding
+ */
+class BindingFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Binding::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Binding
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingInterface.php
new file mode 100644
index 0000000000000..d6a5689f5b43c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingInterface.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+/**
+ * Instances of this interface represent config binging items declared in etc/queue_topology.xsd
+ */
+interface BindingInterface
+{
+    /**
+     * Get binding name.
+     *
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * Get binding destination type.
+     *
+     * @return string
+     */
+    public function getDestinationType();
+
+    /**
+     * Get destination.
+     *
+     * @return string
+     */
+    public function getDestination();
+
+    /**
+     * Check if binding is disabled.
+     *
+     * @return bool
+     */
+    public function isDisabled();
+
+    /**
+     * Get topic name.
+     *
+     * @return string
+     */
+    public function getTopic();
+
+    /**
+     * Get binding arguments
+     *
+     * @return array
+     */
+    public function getArguments();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php
new file mode 100644
index 0000000000000..85dad637191fe
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\Data;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemFactory;
+
+/**
+ * Exchange config data iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Exchange config.
+     *
+     * @var ExchangeConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param ExchangeConfigItemFactory $itemFactory
+     */
+    public function __construct(Data $configData, ExchangeConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->get();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return ExchangeConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemFactory.php
new file mode 100644
index 0000000000000..b684f36673637
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem
+ */
+class ExchangeConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = ExchangeConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemInterface.php
new file mode 100644
index 0000000000000..c5d6680a4bb22
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemInterface.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+/**
+ * Instances of this class represent config items declared in etc/queue_topology.xsd
+ */
+interface ExchangeConfigItemInterface
+{
+    /**
+     * Get exchange name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get exchange type.
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * Get exchange connection.
+     *
+     * @return string
+     */
+    public function getConnection();
+
+    /**
+     * Check if exchange is durable.
+     *
+     * @return bool
+     */
+    public function isDurable();
+
+    /**
+     * Check if exchange is auto delete.
+     *
+     * @return bool
+     */
+    public function isAutoDelete();
+
+    /**
+     * Check if exchange is internal.
+     *
+     * @return bool
+     */
+    public function isInternal();
+
+    /**
+     * Get exchange bindings.
+     *
+     * @return BindingInterface[]
+     */
+    public function getBindings();
+
+    /**
+     * Get exchange arguments
+     *
+     * @return array
+     */
+    public function getArguments();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem.php
new file mode 100644
index 0000000000000..ba201cdc1b6d5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Instances of this class represent queue config items.
+ */
+class QueueConfigItem implements QueueConfigItemInterface
+{
+    /**
+     * Queue name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Connection name.
+     *
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * Queue arguments.
+     *
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * Flag. Is queue durable.
+     *
+     * @var bool
+     */
+    private $isDurable;
+
+    /**
+     * Flag. Is auto-delete
+     *
+     * @var bool
+     */
+    private $isAutoDelete;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDurable()
+    {
+        return $this->isDurable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAutoDelete()
+    {
+        return $this->isAutoDelete;
+    }
+
+    /**
+     * Set exchange config item data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->connection = $data['connection'];
+        $this->isDurable = $data['durable'];
+        $this->isAutoDelete = $data['autoDelete'];
+        $this->arguments = $data['arguments'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php
new file mode 100644
index 0000000000000..7e8d35fb0940f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\Data;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+use Magento\Framework\Phrase;
+
+/**
+ * Topology queue config data mapper.
+ */
+class DataMapper
+{
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $mappedData;
+
+    /**
+     * @var Data
+     */
+    private $configData;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $queueNameBuilder;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param CommunicationConfig $communicationConfig
+     * @param ResponseQueueNameBuilder $queueNameBuilder
+     */
+    public function __construct(
+        Data $configData,
+        CommunicationConfig $communicationConfig,
+        ResponseQueueNameBuilder $queueNameBuilder
+    ) {
+        $this->configData = $configData;
+        $this->communicationConfig = $communicationConfig;
+        $this->queueNameBuilder = $queueNameBuilder;
+    }
+
+    /**
+     * Get mapped config data.
+     *
+     * @return array
+     */
+    public function getMappedData()
+    {
+        if (null === $this->mappedData) {
+            $this->mappedData = [];
+            foreach ($this->configData->get() as $exchange) {
+                $connection = $exchange['connection'];
+                foreach ($exchange['bindings'] as $binding) {
+                    if ($binding['destinationType'] === 'queue') {
+                        $queueItems = $this->createQueueItems($binding['destination'], $binding['topic'], $connection);
+                        $this->mappedData = array_merge($this->mappedData, $queueItems);
+                    }
+                }
+            }
+        }
+        return $this->mappedData;
+    }
+
+    /**
+     * Create queue config item.
+     *
+     * @param string $name
+     * @param string $topic
+     * @param string $connection
+     * @return array
+     */
+    private function createQueueItems($name, $topic, $connection)
+    {
+        $output = [];
+        $synchronousTopics = [];
+
+        if (strpos($topic, '*') !== false || strpos($topic, '#') !== false) {
+            $synchronousTopics = $this->matchSynchronousTopics($topic);
+        } elseif ($this->isSynchronousTopic($topic)) {
+            $synchronousTopics[$topic] = $topic;
+        }
+
+        foreach ($synchronousTopics as $topicName) {
+            $callbackQueueName = $this->queueNameBuilder->getQueueName($topicName);
+            $output[$callbackQueueName . '--' . $connection] = [
+                'name' => $callbackQueueName,
+                'connection' => $connection,
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ];
+        }
+
+        $output[$name . '--' . $connection] = [
+            'name' => $name,
+            'connection' => $connection,
+            'durable' => true,
+            'autoDelete' => false,
+            'arguments' => [],
+        ];
+        return $output;
+    }
+
+    /**
+     * Check whether the topic is in synchronous mode
+     *
+     * @param string $topicName
+     * @return bool
+     * @throws LocalizedException
+     */
+    private function isSynchronousTopic($topicName)
+    {
+        try {
+            $topic = $this->communicationConfig->getTopic($topicName);
+            $isSync = (bool)$topic[CommunicationConfig::TOPIC_IS_SYNCHRONOUS];
+        } catch (LocalizedException $e) {
+            throw new LocalizedException(new Phrase('Error while checking if topic is synchronous'));
+        }
+        return $isSync;
+    }
+
+    /**
+     * Generate topics list based on wildcards.
+     *
+     * @param string $wildcard
+     * @return array
+     */
+    private function matchSynchronousTopics($wildcard)
+    {
+        $topicDefinitions = array_filter(
+            $this->communicationConfig->getTopics(),
+            function ($item) {
+                return (bool)$item[CommunicationConfig::TOPIC_IS_SYNCHRONOUS];
+            }
+        );
+
+        $topics = [];
+        $pattern = $this->buildWildcardPattern($wildcard);
+        foreach (array_keys($topicDefinitions) as $topicName) {
+            if (preg_match($pattern, $topicName)) {
+                $topics[$topicName] = $topicName;
+            }
+        }
+        return $topics;
+    }
+
+    /**
+     * Construct perl regexp pattern for matching topic names from wildcard key.
+     *
+     * @param string $wildcardKey
+     * @return string
+     */
+    private function buildWildcardPattern($wildcardKey)
+    {
+        $pattern = '/^' . str_replace('.', '\.', $wildcardKey);
+        $pattern = str_replace('#', '.+', $pattern);
+        $pattern = str_replace('*', '[^\.]+', $pattern);
+        $pattern .= strpos($wildcardKey, '#') === strlen($wildcardKey) ? '/' : '$/';
+        return $pattern;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/Iterator.php
new file mode 100644
index 0000000000000..e76c88f556a4f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/Iterator.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemFactory;
+
+/**
+ * Queue config item iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Consumer config item.
+     *
+     * @var QueueConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DataMapper $configData
+     * @param QueueConfigItemFactory $itemFactory
+     */
+    public function __construct(DataMapper $configData, QueueConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->getMappedData();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return QueueConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemFactory.php
new file mode 100644
index 0000000000000..977bc80cd3542
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Queue\Config\QueueConfigItem
+ */
+class QueueConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = QueueConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return QueueConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemInterface.php
new file mode 100644
index 0000000000000..fbae97a9c17cc
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemInterface.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Instances of this class represent queue config items.
+ */
+interface QueueConfigItemInterface
+{
+    /**
+     * Get queue name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get queue connection.
+     *
+     * @return string
+     */
+    public function getConnection();
+
+    /**
+     * Check if queue is durable.
+     *
+     * @return bool
+     */
+    public function isDurable();
+
+    /**
+     * Check if queue is auto delete.
+     *
+     * @return bool
+     */
+    public function isAutoDelete();
+
+    /**
+     * Get queue arguments
+     *
+     * @return array
+     */
+    public function getArguments();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ReaderInterface.php
new file mode 100644
index 0000000000000..60eda0d3b8a9f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ReaderInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Topology config reader interface
+ */
+interface ReaderInterface extends \Magento\Framework\Config\ReaderInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/RemoteService/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/RemoteService/Reader.php
new file mode 100644
index 0000000000000..59b3fb716a407
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/RemoteService/Reader.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Topology\Config\ReaderInterface;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+
+/**
+ * Reader for queue topology configs based on remote service declaration in DI configs.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig
+     */
+    private $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DefaultValueProvider $defaultValueProvider
+     * @param ObjectManagerConfig $objectManagerConfig
+     * @param ReflectionGenerator $reflectionGenerator
+     * @param ServiceMethodsMap $serviceMethodsMap
+     */
+    public function __construct(
+        DefaultValueProvider $defaultValueProvider,
+        ObjectManagerConfig $objectManagerConfig,
+        ReflectionGenerator $reflectionGenerator,
+        ServiceMethodsMap $serviceMethodsMap
+    ) {
+        $this->defaultValueProvider = $defaultValueProvider;
+        $this->objectManagerConfig = $objectManagerConfig;
+        $this->reflectionGenerator = $reflectionGenerator;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($scope = null)
+    {
+        $exchangeName = $this->defaultValueProvider->getExchange();
+        return [
+            $exchangeName => [
+                'name' => $exchangeName,
+                'type' => 'topic',
+                'connection' => $this->defaultValueProvider->getConnection(),
+                'durable' => true,
+                'autoDelete' => false,
+                'internal' => false,
+                'bindings' => $this->generateBindings(),
+                'arguments' => [],
+            ]
+        ];
+    }
+
+    /**
+     * Generate list of bindings based on information about remote services declared in DI config.
+     *
+     * @return array
+     *
+     * @throws \LogicException
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function generateBindings()
+    {
+        $bindings = [];
+        foreach ($this->getRemoteServices() as $serviceInterface => $remoteImplementation) {
+            try {
+                $methodsMap = $this->serviceMethodsMap->getMethodsMap($serviceInterface);
+            } catch (\Exception $e) {
+                throw new \LogicException(sprintf('Service interface was expected, "%s" given', $serviceInterface));
+            }
+            foreach ($methodsMap as $methodName => $returnType) {
+                $topic = $this->reflectionGenerator->generateTopicName($serviceInterface, $methodName);
+                $exchangeName = $this->defaultValueProvider->getExchange();
+                $destination = 'queue.' . $topic;
+                $id = $topic . '--' . $exchangeName . '--' . $destination;
+                $bindings[$id] = [
+                    'id' => $id,
+                    'destinationType' => 'queue',
+                    'destination' => $destination,
+                    'disabled' => false,
+                    'topic' => $topic,
+                    'arguments' => []
+                ];
+            }
+        }
+        return $bindings;
+    }
+
+    /**
+     * Get list of remote services declared in DI config.
+     *
+     * @return array
+     */
+    private function getRemoteServices()
+    {
+        $preferences = $this->objectManagerConfig->getPreferences();
+        $remoteServices = [];
+        foreach ($preferences as $type => $preference) {
+            if ($preference == $type . RemoteServiceGenerator::REMOTE_SERVICE_SUFFIX) {
+                $remoteServices[$type] = $preference;
+            }
+        }
+        return $remoteServices;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/DependentFields.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/DependentFields.php
new file mode 100644
index 0000000000000..fcf10053e4148
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/DependentFields.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface;
+
+/**
+ * Topology config data validator.
+ */
+class DependentFields implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $errors = [];
+        foreach ($configData as $name => $data) {
+            foreach ((array)$data['bindings'] as $binding) {
+                if (isset($data['type']) && $data['type'] == 'topic' && !isset($binding['topic'])) {
+                    $errors[] = 'Topic name is required for topic based exchange: ' . $name;
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(PHP_EOL, $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/FieldsTypes.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/FieldsTypes.php
new file mode 100644
index 0000000000000..2e1cf52ee4cbe
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/FieldsTypes.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface;
+
+/**
+ * Consumer config data validator for fields types.
+ */
+class FieldsTypes implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $exchangeName => $exchangeConfig) {
+            $this->validateFieldsTypes($exchangeName, $exchangeConfig);
+        }
+    }
+
+    /**
+     * Make sure types of all fields in the exchange item config are correct.
+     *
+     * @param string $exchangeName
+     * @param array $exchangeConfig
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateFieldsTypes($exchangeName, $exchangeConfig)
+    {
+        $fields = [
+            'name' => ['type' => 'string', 'value' => null],
+            'type' => ['type' => 'string', 'value' => ['topic']],
+            'connection' => ['type' => 'string', 'value' => null],
+            'durable' => ['type' => 'boolean', 'value' => null],
+            'autoDelete' => ['type' => 'boolean', 'value' => null],
+            'internal' => ['type' => 'boolean', 'value' => null],
+            'bindings' => ['type' => 'array', 'value' => null],
+            'arguments' => ['type' => 'array', 'value' => null],
+        ];
+
+        $bindingFields = [
+            'id' => ['type' => 'string', 'value' => null],
+            'destinationType' => ['type' => 'string', 'value' => ['queue']],
+            'destination' => ['type' => 'string', 'value' => null],
+            'disabled' => ['type' => 'boolean', 'value' => null],
+            'topic' => ['type' => 'string', 'value' => null],
+            'arguments' => ['type' => 'array', 'value' => null],
+        ];
+
+        foreach ($fields as $fieldName => $expectedType) {
+            $actualType = gettype($exchangeConfig[$fieldName]);
+            if ($actualType !== $expectedType['type']) {
+                throw new \LogicException(
+                    sprintf(
+                        "Type of '%s' field specified in configuration of '%s' exchange is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $exchangeName,
+                        $actualType,
+                        $expectedType['type']
+                    )
+                );
+            }
+
+            if ($expectedType['value'] && !in_array($exchangeConfig[$fieldName], $expectedType['value'])) {
+                throw new \LogicException(
+                    sprintf(
+                        "Value of '%s' field specified in configuration of '%s' exchange is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $exchangeName,
+                        $exchangeConfig[$fieldName],
+                        implode(' or ', $expectedType['value'])
+                    )
+                );
+            }
+        }
+
+        $this->validateBindings($exchangeName, $exchangeConfig, $bindingFields);
+    }
+
+    /**
+     * Validate binding config.
+     *
+     * @param string $exchangeName
+     * @param array $exchangeConfig
+     * @param array $bindingFields
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateBindings($exchangeName, $exchangeConfig, $bindingFields)
+    {
+        foreach ($bindingFields as $bindFieldName => $bindExpectedType) {
+            foreach ($exchangeConfig['bindings'] as $bindingConfig) {
+                $actualType = gettype($bindingConfig[$bindFieldName]);
+                if ($actualType !== $bindExpectedType['type']) {
+                    throw new \LogicException(
+                        sprintf(
+                            "Type of '%s' field specified in configuration of '%s' exchange is invalid. "
+                            . "Given '%s', '%s' was expected.",
+                            $bindFieldName,
+                            $exchangeName,
+                            $actualType,
+                            $bindExpectedType['type']
+                        )
+                    );
+                }
+
+                if ($bindExpectedType['value'] &&
+                    !in_array($bindingConfig[$bindFieldName], $bindExpectedType['value'])
+                ) {
+                    throw new \LogicException(
+                        sprintf(
+                            "Value of '%s' field specified in configuration of '%s' exchange is invalid. "
+                            . "Given '%s', '%s' was expected.",
+                            $bindFieldName,
+                            $exchangeName,
+                            $bindingConfig[$bindFieldName],
+                            implode(' or ', $bindExpectedType['value'])
+                        )
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/Format.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/Format.php
new file mode 100644
index 0000000000000..50acb6cbd5fc3
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/Format.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface;
+
+/**
+ * Topology config data validator.
+ */
+class Format implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $requiredFields = ['name', 'type', 'connection', 'durable', 'autoDelete', 'internal', 'bindings', 'arguments'];
+        $requiredBindingFields = ['id', 'destinationType', 'destination', 'disabled', 'topic', 'arguments'];
+        $errors = [];
+        foreach ($configData as $name => $data) {
+            $diff = array_diff($requiredFields, array_keys($data));
+            foreach ($diff as $field) {
+                $errors[] = sprintf('Missing [%s] field for exchange %s.', $field, $name);
+            }
+
+            if (!array_key_exists('bindings', $data) || !is_array($data['bindings'])) {
+                $errors[] = sprintf('Invalid bindings format for exchange %s.', $name);
+                continue;
+            }
+
+            foreach ($data['bindings'] as $bindingConfig) {
+                $diff = array_diff($requiredBindingFields, array_keys($bindingConfig));
+                foreach ($diff as $field) {
+                    $errors[] = sprintf('Missing [%s] field for binding %s in exchange config.', $field, $name);
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(PHP_EOL, $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ValidatorInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ValidatorInterface.php
new file mode 100644
index 0000000000000..499671711736b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ValidatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Topology config data validator.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate topology config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     */
+    public function validate($configData);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php
new file mode 100644
index 0000000000000..516a4f080973f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Xml;
+
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\Config\Converter\Dom\Flat as FlatConverter;
+use Magento\Framework\Config\Dom\ArrayNodeConfig;
+use Magento\Framework\Config\Dom\NodePathMatcher;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Converts MessageQueue topology config from \DOMDocument to array
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * @var FlatConverter
+     */
+    private $converter;
+
+    /**
+     * Boolean value converter.
+     *
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Argument interpreter.
+     *
+     * @var InterpreterInterface
+     */
+    private $argumentInterpreter;
+
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValue;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BooleanUtils $booleanUtils
+     * @param InterpreterInterface $argumentInterpreter
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(
+        BooleanUtils $booleanUtils,
+        InterpreterInterface $argumentInterpreter,
+        DefaultValueProvider $defaultValueProvider
+    ) {
+        $this->booleanUtils = $booleanUtils;
+        $this->argumentInterpreter = $argumentInterpreter;
+        $this->defaultValue = $defaultValueProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        /** @var $exchange \DOMElement */
+        foreach ($source->getElementsByTagName('exchange') as $exchange) {
+            $name = $this->getAttributeValue($exchange, 'name');
+            $connection = $this->getAttributeValue($exchange, 'connection');
+
+            $bindings = [];
+            $exchangeArguments = [];
+            /** @var \DOMNode $node */
+            foreach ($exchange->childNodes as $node) {
+                if (!in_array($node->nodeName, ['binding', 'arguments']) || $node->nodeType != XML_ELEMENT_NODE) {
+                    continue;
+                }
+                switch ($node->nodeName) {
+                    case 'binding':
+                        $bindings = $this->processBindings($node, $bindings);
+                        break;
+
+                    case 'arguments':
+                        $exchangeArguments = $this->processArguments($node);
+                        break;
+                }
+            }
+
+            $autoDelete = $this->getAttributeValue($exchange, 'autoDelete', false);
+            $result[$name . '--' . $connection] = [
+                'name' => $name,
+                'type' => $this->getAttributeValue($exchange, 'type'),
+                'connection' => $connection,
+                'durable' => $this->booleanUtils->toBoolean($this->getAttributeValue($exchange, 'durable', true)),
+                'autoDelete' => $this->booleanUtils->toBoolean($autoDelete),
+                'internal' => $this->booleanUtils->toBoolean($this->getAttributeValue($exchange, 'internal', false)),
+                'bindings' => $bindings,
+                'arguments' => $exchangeArguments,
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieve instance of XML converter
+     *
+     * @return FlatConverter
+     */
+    private function getConverter()
+    {
+        if (!$this->converter) {
+            $arrayNodeConfig = new ArrayNodeConfig(new NodePathMatcher(), ['argument(/item)+' => 'name']);
+            $this->converter = new FlatConverter($arrayNodeConfig);
+        }
+        return $this->converter;
+    }
+
+    /**
+     * Process arguments.
+     *
+     * @param \DOMNode $node
+     * @return array
+     */
+    private function processArguments(\DOMNode $node)
+    {
+        $output = [];
+        /** @var \DOMNode $argumentNode */
+        foreach ($node->childNodes as $argumentNode) {
+            if ($argumentNode->nodeType != XML_ELEMENT_NODE || $argumentNode->nodeName != 'argument') {
+                continue;
+            }
+            $argumentName = $argumentNode->attributes->getNamedItem('name')->nodeValue;
+            $argumentData = $this->getConverter()->convert($argumentNode, 'argument');
+            $output[$argumentName] = $this->argumentInterpreter->evaluate($argumentData);
+        }
+        return $output;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    private function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+
+    /**
+     * Parse bindings.
+     *
+     * @param \DOMNode $node
+     * @param array $bindings
+     * @return array
+     */
+    private function processBindings($node, $bindings)
+    {
+        $bindingArguments = [];
+        $id = $this->getAttributeValue($node, 'id');
+        $isDisabled = $this->booleanUtils->toBoolean(
+            $this->getAttributeValue($node, 'disabled', false)
+        );
+        foreach ($node->childNodes as $arguments) {
+            if ($arguments->nodeName != 'arguments' || $arguments->nodeType != XML_ELEMENT_NODE) {
+                continue;
+            }
+            $bindingArguments = $this->processArguments($arguments);
+        }
+        $bindings[$id] = [
+            'id' => $id,
+            'destinationType' => $this->getAttributeValue($node, 'destinationType'),
+            'destination' => $this->getAttributeValue($node, 'destination'),
+            'disabled' => $isDisabled,
+            'topic' => $this->getAttributeValue($node, 'topic'),
+            'arguments' => $bindingArguments
+        ];
+        return $bindings;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Reader.php
new file mode 100644
index 0000000000000..6dbdf78d1f084
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Reader.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Xml;
+
+use \Magento\Framework\MessageQueue\Topology\Config\ReaderInterface;
+
+/**
+ * Reader for etc/queue_topology.xml configs.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_idAttributes = [
+        '/config/exchange' => ['name', 'connection'],
+        '/config/exchange/arguments/argument' => 'name',
+        '/config/exchange/arguments/argument(/item)+' => 'name',
+        '/config/exchange/binding' => 'id',
+        '/config/exchange/binding/arguments/argument' => 'name',
+        '/config/exchange/binding/arguments/argument(/item)+' => 'name',
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue_topology.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/SchemaLocator.php
new file mode 100644
index 0000000000000..0ed9f3f21df79
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/SchemaLocator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Xml;
+
+/**
+ * Schema locator for etc/queue_topology.xml
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology_merged.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
new file mode 100644
index 0000000000000..81d056999b573
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface;
+
+/**
+ * Topology config interface provides access data declared in etc/queue_topology.xml
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ConfigInterface
+{
+    /**
+     * Get exchange configuration by exchange name.
+     *
+     * @param string $name
+     * @param string $connection
+     * @return ExchangeConfigItemInterface
+     * @throws LocalizedException
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getExchange($name, $connection);
+
+    /**
+     * Get list of all exchanges declared in the system.
+     *
+     * @return ExchangeConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getExchanges();
+
+    /**
+     * Get list of all queues declared in the system.
+     *
+     * @return QueueConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getQueues();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json
new file mode 100644
index 0000000000000..6848e5dcaca31
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/framework-message-queue",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "type": "magento2-library",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "require": {
+        "magento/framework": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\MessageQueue\\": ""
+        },
+        "files": [
+            "registration.php"
+        ]
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
new file mode 100644
index 0000000000000..52bfc77bbb511
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="consumer" type="consumerType" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="consumer-unique-name">
+            <xs:selector xpath="consumer"/>
+            <xs:field xpath="@name"/>
+        </xs:unique>
+    </xs:element>
+    <xs:complexType name="consumerType">
+        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="xs:string" name="queue" use="required"/>
+        <xs:attribute type="handlerType" name="handler" use="optional"/>
+        <xs:attribute type="xs:string" name="consumerInstance" use="optional"/>
+        <xs:attribute name="connection" use="optional" type="xs:string" />
+        <xs:attribute type="xs:integer" name="maxMessages" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="handlerType">
+        <xs:annotation>
+            <xs:documentation>
+                Handler is expected in a format "Vendor\Module\Api\ServiceName::methodName".
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z\\]+::[a-zA-Z]+" />
+            <xs:minLength value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/publisher.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/publisher.xsd
new file mode 100644
index 0000000000000..812c4690545ac
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/publisher.xsd
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>XML Schema Definition for queue_publisher.xml</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element type="publisherType" name="publisher" minOccurs="1" maxOccurs="unbounded">
+                    <xs:unique name="unique-connection-name">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Publisher connection name must be unique
+                            </xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="connection"/>
+                        <xs:field xpath="@name"/>
+                    </xs:unique>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="unique-publisher-topic">
+            <xs:annotation>
+                <xs:documentation>
+                    Publisher topic must be unique
+                </xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="publisher"/>
+            <xs:field xpath="@topic"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="publisherType">
+        <xs:sequence>
+            <xs:element type="connectionType" name="connection" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="topic" use="required" />
+        <xs:attribute type="xs:boolean" name="disabled" use="optional" />
+    </xs:complexType>
+
+    <xs:complexType name="connectionType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" use="required" type="xs:string" />
+                <xs:attribute type="xs:string" name="exchange" use="optional"/>
+                <xs:attribute type="xs:boolean" name="disabled" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue.xsd
new file mode 100644
index 0000000000000..7c018403d176d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:include schemaLocation="urn:magento:framework-message-queue:etc/queue_base.xsd" />
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="broker" type="brokerType"/>
+            </xs:choice>
+        </xs:complexType>
+        <xs:unique name="broker-unique-name">
+            <xs:selector xpath="broker"/>
+            <xs:field xpath="@topic"/>
+        </xs:unique>
+        <xs:unique name="broker-queue-unique-name">
+            <xs:selector xpath="broker/queue"/>
+            <xs:field xpath="@name"/>
+        </xs:unique>
+    </xs:element>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
new file mode 100644
index 0000000000000..bede197ec34de
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:complexType name="brokerType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Broker configuration describes relations for topic, publisher, consumer, queue and exchange server
+            </xs:documentation>
+        </xs:annotation>
+        <xs:sequence  minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="queue" type="brokerQueueType" />
+        </xs:sequence>
+        <xs:attribute name="topic" type="xs:string" use="required"/>
+        <xs:attribute name="type" type="xs:string" use="optional"/>
+        <xs:attribute name="exchange" type="xs:string" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="brokerQueueType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Queue element of the broker element
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="name" type="xs:string" use="required" />
+        <xs:attribute name="handler" type="handlerType" use="optional" />
+        <xs:attribute name="consumer" type="xs:string" use="required" />
+        <xs:attribute name="consumerInstance" type="instanceType" use="optional" />
+        <xs:attribute name="maxMessages" type="xs:integer" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="instanceType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Instance is expected in a format "Vendor\Module\Api\ServiceName".
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z0-9\\]+" />
+            <xs:minLength value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="handlerType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Handler is expected in a format "Vendor\Module\Api\ServiceName::methodName".
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z0-9\\]+::[a-zA-Z0-9]+" />
+            <xs:minLength value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue_merged.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue_merged.xsd
new file mode 100644
index 0000000000000..2c3f947969190
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue_merged.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:include schemaLocation="urn:magento:framework-message-queue:etc/queue_base.xsd" />
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="broker" type="brokerType"/>
+            </xs:choice>
+        </xs:complexType>
+        <xs:unique name="broker-unique-name">
+            <xs:selector xpath="broker"/>
+            <xs:field xpath="@topic"/>
+        </xs:unique>
+    </xs:element>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/topology.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/topology.xsd
new file mode 100644
index 0000000000000..39862007b1d12
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/topology.xsd
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:complexType name="argumentType" abstract="true" mixed="true">
+        <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="argumentsType">
+        <xs:sequence>
+            <xs:element name="argument" type="argumentType" minOccurs="1" maxOccurs="unbounded">
+                <xs:key name="argumentItemName">
+                    <xs:selector xpath="item"></xs:selector>
+                    <xs:field xpath="@name"></xs:field>
+                </xs:key>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="array" mixed="true">
+        <xs:complexContent>
+            <xs:extension base="argumentType">
+                <xs:sequence>
+                    <xs:element name="item" type="argumentType" minOccurs="0" maxOccurs="unbounded">
+                        <xs:key name="itemName">
+                            <xs:selector xpath="item"></xs:selector>
+                            <xs:field xpath="@name"></xs:field>
+                        </xs:key>
+                    </xs:element>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="number">
+        <xs:complexContent>
+            <xs:extension base="argumentType"/>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="boolean">
+        <xs:complexContent>
+            <xs:extension base="argumentType"/>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="string">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element type="exchangeConfigType" name="exchange" maxOccurs="unbounded" minOccurs="0">
+                    <xs:unique name="unique-binding-id">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Binding id must be unique
+                            </xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="binding"/>
+                        <xs:field xpath="@id"/>
+                    </xs:unique>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="unique-exchange-name-connection">
+            <xs:annotation>
+                <xs:documentation>
+                    Exchange name must be unique
+                </xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="exchange"/>
+            <xs:field xpath="@name"/>
+            <xs:field xpath="@connection"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="bindingType" mixed="true">
+        <xs:sequence>
+            <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="id" use="required"/>
+        <xs:attribute type="destinationType" name="destinationType" use="optional"/>
+        <xs:attribute type="xs:string" name="destination" use="optional"/>
+        <xs:attribute type="xs:boolean" name="disabled" use="optional"/>
+        <xs:attribute type="xs:string" name="topic" use="optional"/>
+    </xs:complexType>
+
+    <xs:complexType name="exchangeConfigType">
+        <xs:choice maxOccurs="unbounded">
+            <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element type="bindingType" name="binding" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="exchangeType" name="type" use="optional"/>
+        <xs:attribute name="connection" type="xs:string" use="required" />
+        <xs:attribute type="xs:boolean" name="durable" use="optional"/>
+        <xs:attribute type="xs:boolean" name="autoDelete" use="optional"/>
+        <xs:attribute type="xs:boolean" name="internal" use="optional"/>
+    </xs:complexType>
+
+    <xs:simpleType name="exchangeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="topic" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="destinationType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="queue" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/topology_merged.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/topology_merged.xsd
new file mode 100644
index 0000000000000..e2b90343110f1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/topology_merged.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:redefine schemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+        <xs:complexType name="bindingType" mixed="true">
+            <xs:complexContent>
+                <xs:restriction base="bindingType">
+                    <xs:sequence>
+                        <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                    <xs:attribute type="xs:string" name="id" use="required"/>
+                    <xs:attribute type="destinationType" name="destinationType" use="required"/>
+                    <xs:attribute type="xs:string" name="destination" use="required"/>
+                    <xs:attribute type="xs:boolean" name="disabled" use="optional"/>
+                    <xs:attribute type="xs:string" name="topic" use="optional"/>
+                </xs:restriction>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:redefine>
+
+    <xs:redefine schemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+        <xs:complexType name="exchangeConfigType">
+            <xs:complexContent>
+                <xs:restriction base="exchangeConfigType">
+                    <xs:choice maxOccurs="unbounded">
+                        <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element type="bindingType" name="binding" maxOccurs="unbounded" minOccurs="0"/>
+                    </xs:choice>
+                    <xs:attribute type="xs:string" name="name" use="required"/>
+                    <xs:attribute type="exchangeType" name="type" use="required"/>
+                    <xs:attribute name="connection" type="xs:string" use="required" />
+                    <xs:attribute type="xs:boolean" name="durable" use="optional"/>
+                    <xs:attribute type="xs:boolean" name="autoDelete" use="optional"/>
+                    <xs:attribute type="xs:boolean" name="internal" use="optional"/>
+                </xs:restriction>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:redefine>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/registration.php b/lib/internal/Magento/Framework/MessageQueue/registration.php
new file mode 100644
index 0000000000000..aafb0fcffa7c5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework-message-queue', __DIR__);
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index 6966d9711cb56..1cffba2543b0b 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -69,6 +69,9 @@ public function __construct(
         if (isset($data['id'])) {
             $this->setId($data['id']);
         }
+        if (isset($data[self::EXTENSION_ATTRIBUTES_KEY]) && is_array($data[self::EXTENSION_ATTRIBUTES_KEY])) {
+            $this->populateExtensionAttributes($data[self::EXTENSION_ATTRIBUTES_KEY]);
+        }
     }
 
     /**
@@ -113,7 +116,12 @@ protected function initializeCustomAttributes()
             $customAttributeCodes = $this->getCustomAttributesCodes();
 
             foreach ($customAttributeCodes as $customAttributeCode) {
-                if (isset($this->_data[$customAttributeCode])) {
+                if (isset($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode])) {
+                    $customAttribute = $this->customAttributeFactory->create()
+                        ->setAttributeCode($customAttributeCode)
+                        ->setValue($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode]->getValue());
+                    $customAttributes[$customAttributeCode] = $customAttribute;
+                } elseif (isset($this->_data[$customAttributeCode])) {
                     $customAttribute = $this->customAttributeFactory->create()
                         ->setAttributeCode($customAttributeCode)
                         ->setValue($this->_data[$customAttributeCode]);
@@ -146,9 +154,7 @@ public function getCustomAttributes()
     public function getCustomAttribute($attributeCode)
     {
         $this->initializeCustomAttributes();
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])
-            ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]
-            : null;
+        return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;
     }
 
     /**
@@ -333,9 +339,24 @@ protected function _setExtensionAttributes(\Magento\Framework\Api\ExtensionAttri
      */
     protected function _getExtensionAttributes()
     {
+        if (!$this->getData(self::EXTENSION_ATTRIBUTES_KEY)) {
+            $this->populateExtensionAttributes([]);
+        }
         return $this->getData(self::EXTENSION_ATTRIBUTES_KEY);
     }
 
+    /**
+     * Instantiate extension attributes object and populate it with the provided data.
+     *
+     * @param array $extensionAttributesData
+     * @return void
+     */
+    private function populateExtensionAttributes(array $extensionAttributesData = [])
+    {
+        $extensionAttributes = $this->extensionAttributesFactory->create(get_class($this), $extensionAttributesData);
+        $this->_setExtensionAttributes($extensionAttributes);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index d8a7c96c63915..567d174938b11 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -42,7 +42,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
 
     /**
      * Data changes flag (true after setData|unsetData call)
-     * @var $_hasDataChange bool
+     * @var bool
      */
     protected $_hasDataChanges = false;
 
@@ -216,6 +216,8 @@ protected function _init($resourceModel)
     }
 
     /**
+     * Remove unneeded properties from serialization
+     *
      * @return string[]
      */
     public function __sleep()
@@ -337,8 +339,8 @@ public function hasDataChanges()
      *
      * If $key is an array, it will overwrite all the data in the object.
      *
-     * @param string|array  $key
-     * @param mixed         $value
+     * @param string|array $key
+     * @param mixed $value
      * @return $this
      */
     public function setData($key, $value = null)
@@ -616,6 +618,8 @@ protected function _hasModelChanged()
     }
 
     /**
+     * Check if save is allowed
+     *
      * @return bool
      */
     public function isSaveAllowed()
@@ -624,6 +628,8 @@ public function isSaveAllowed()
     }
 
     /**
+     * Set flag property _hasDataChanges
+     *
      * @param bool $flag
      * @return void
      */
@@ -719,6 +725,7 @@ public function validateBeforeSave()
 
     /**
      * Returns validator, which contains all rules to validate this model.
+     *
      * Returns FALSE, if no validation rules exist.
      *
      * @return \Zend_Validate_Interface|false
@@ -733,6 +740,7 @@ protected function _getValidatorBeforeSave()
 
     /**
      * Creates validator for the model with all validation rules in it.
+     *
      * Returns FALSE, if no validation rules exist.
      *
      * @return \Zend_Validate_Interface|bool
@@ -770,6 +778,7 @@ protected function _getValidationRulesBeforeSave()
 
     /**
      * Get list of cache tags applied to model object.
+     *
      * Return false if cache tags are not supported by model
      *
      * @return array|false
diff --git a/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php b/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php
index 341ff9226555f..f439c14b6ece0 100644
--- a/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php
+++ b/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php
@@ -50,7 +50,8 @@ public function __construct(
     public function create($entityType)
     {
         if (!isset($this->entities[$entityType])) {
-            $message = sprintf('Repository for entity type %s is not declared', $entityType);
+            $message =
+                sprintf('The repository for the "%s" entity type isn\'t declared. Verify and try again.', $entityType);
             throw new NotFoundException(new \Magento\Framework\Phrase($message));
         }
         return $this->objectManager->get($this->entities[$entityType]);
diff --git a/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php b/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
index ff7e359447cd8..f965fe65d3cda 100644
--- a/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
@@ -53,7 +53,13 @@ public function getEntityContext($entityType, $entityData = [])
         foreach ($metadata->getEntityContext() as $contextProviderClass) {
             $contextProvider =  $this->objectManager->get($contextProviderClass);
             if (!$contextProvider instanceof ScopeProviderInterface) {
-                throw new ConfigurationMismatchException(new Phrase('Wrong configuration for type %1', [$entityType]));
+                throw new ConfigurationMismatchException(
+                    new Phrase(
+                        'The configuration for the "%1" type is incorrect. '
+                        . 'Verify the type and configuration and try again.',
+                        [$entityType]
+                    )
+                );
             }
             $entityContext[] = $contextProvider->getContext($entityType, $entityData);
         }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
index c94de1534b29e..8ec47ed97e11c 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -45,6 +45,13 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
      */
     protected $_fieldsToSelect = null;
 
+    /**
+     * Expression fields to select in query.
+     *
+     * @var array
+     */
+    private $expressionFieldsToSelect = [];
+
     /**
      * Fields initial fields to select like id_field
      *
@@ -170,7 +177,7 @@ public function setMainTable($table)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _initSelect()
     {
@@ -205,7 +212,7 @@ protected function _initSelectFields()
         $columnsToSelect = [];
         foreach ($columns as $columnEntry) {
             list($correlationName, $column, $alias) = $columnEntry;
-            if ($correlationName !== 'main_table') {
+            if ($correlationName !== 'main_table' || isset($this->expressionFieldsToSelect[$alias])) {
                 // Add joined fields to select
                 if ($column instanceof \Zend_Db_Expr) {
                     $column = $column->__toString();
@@ -347,6 +354,7 @@ public function addExpressionFieldToSelect($alias, $expression, $fields)
         }
 
         $this->getSelect()->columns([$alias => $fullExpression]);
+        $this->expressionFieldsToSelect[$alias] = $fullExpression;
 
         return $this;
     }
@@ -496,9 +504,9 @@ public function getAllIds()
     /**
      * Join table to collection select
      *
-     * @param string $table
+     * @param string|array $table
      * @param string $cond
-     * @param string $cols
+     * @param string|array $cols
      * @return $this
      */
     public function join($table, $cond, $cols = '*')
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php
index 7ec43220dc85c..d7d63232c1191 100755
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Model\ResourceModel\Db;
 
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EntityMetadata;
 
 class DeleteEntityRow
 {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
index 433762556693d..f3ac5ed5ee1f8 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Model\ResourceModel\Db\Relation;
 
 use Magento\Framework\ObjectManagerInterface as ObjectManager;
-use Magento\Framework\Model\ResourceModel\Db\ProcessEntityRelationInterface;
 
 /**
  * Class ActionPool
@@ -50,9 +49,6 @@ public function getActions($entityType, $actionName)
         }
         foreach ($this->relationActions[$entityType][$actionName] as $actionClassName) {
             $action = $this->objectManager->get($actionClassName);
-            //if (!$action instanceof ProcessEntityRelationInterface) {
-            //    throw new \Exception('Not compliant with action interface');
-            //}
             $actions[] = $action;
         }
         return $actions;
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php b/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php
index a61835133b39f..694c230657965 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Iterator.php
@@ -62,11 +62,13 @@ protected function _getStatement($query, AdapterInterface $connection = null)
 
         if (is_string($query)) {
             if (!$connection instanceof AdapterInterface) {
-                throw new LocalizedException(new Phrase('Invalid connection'));
+                throw new LocalizedException(
+                    new Phrase('The connection is invalid. Verify the connection and try again.')
+                );
             }
             return $connection->query($query);
         }
 
-        throw new LocalizedException(new Phrase('Invalid query'));
+        throw new LocalizedException(new Phrase('The query is invalid. Verify the query and try again.'));
     }
 }
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 0000000000000..ca9f1c72c06ac
--- /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/Model/Test/Unit/AbstractExtensibleModelTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php
index 1b16427040709..7e68b8daf2aef 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Model\Test\Unit;
 
 use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
index 36061b83cb9e6..b69f50cf4f341 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
@@ -163,6 +163,9 @@ public function testGetMainTable($tableName, $expectedResult)
         $this->assertEquals($expectedResult, $this->_model->getMainTable());
     }
 
+    /**
+     * @return array
+     */
     public function getTableDataProvider()
     {
         return [
@@ -217,6 +220,9 @@ public function testGetChecksum($checksum, $expected)
         $this->assertEquals($expected, $this->_model->getChecksum($checksum));
     }
 
+    /**
+     * @return array
+     */
     public function getChecksumProvider()
     {
         return [
@@ -400,6 +406,9 @@ public function testGetDataChanged($getOriginData, $expected)
         $this->assertEquals($expected, $this->_model->hasDataChanged($abstractModelMock));
     }
 
+    /**
+     * @return array
+     */
     public function hasDataChangedDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
index bfd9b5a63d21b..4f27f083509d7 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db\Collection;
 
 use Magento\Framework\DB\Select;
-use Magento\Framework\DataObject as MagentoObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\ObjectManagerInterface;
 
@@ -95,6 +94,9 @@ protected function tearDown()
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
     }
 
+    /**
+     * @return object
+     */
     protected function getUut()
     {
         return $this->objectManagerHelper->getObject(
@@ -220,6 +222,9 @@ public function testGetSelect($idFieldNameRet, $getPartRet, $expected)
         $this->assertTrue($this->uut->getSelect() instanceof Select);
     }
 
+    /**
+     * @return array
+     */
     public function getSelectDataProvider()
     {
         $columnMock = $this->createPartialMock(\Zend_Db_Expr::class, ['__toString']);
@@ -246,6 +251,9 @@ public function testAddFieldToSelect($field, $alias, $expectedFieldsToSelect)
         $this->assertTrue($this->uut->wereFieldsToSelectChanged());
     }
 
+    /**
+     * @return array
+     */
     public function addFieldToSelectDataProvider()
     {
         return [
@@ -265,6 +273,9 @@ public function testAddExpressionFieldToSelect($alias, $expression, $fields, $ex
         $this->assertTrue($this->uut->addExpressionFieldToSelect($alias, $expression, $fields) instanceof Uut);
     }
 
+    /**
+     * @return array
+     */
     public function addExpressionFieldToSelectDataProvider()
     {
         return [
@@ -289,6 +300,9 @@ public function testRemoveFieldFromSelect(
         $this->assertEquals($expectedWereFieldsToSelectChanged, $this->uut->wereFieldsToSelectChanged());
     }
 
+    /**
+     * @return array
+     */
     public function removeFieldFromSelectDataProvider()
     {
         return [
@@ -376,6 +390,9 @@ public function testJoin($table, $cond, $cols, $expected)
         $this->assertEquals($expected, $this->uut->getJoinedTables());
     }
 
+    /**
+     * @return array
+     */
     public function joinDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php
index e55dbb3c9c3da..b224dccc83d03 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php
@@ -13,26 +13,41 @@
  */
 class Uut extends AbstractCollection
 {
+    /**
+     * @return bool
+     */
     public function wereFieldsToSelectChanged()
     {
         return $this->_fieldsToSelectChanged;
     }
 
+    /**
+     * @return array|null
+     */
     public function getFieldsToSelect()
     {
         return $this->_fieldsToSelect;
     }
 
+    /**
+     * @param array $fields
+     */
     public function setFieldsToSelect(array $fields)
     {
         $this->_fieldsToSelect = $fields;
     }
 
+    /**
+     * @param $resource
+     */
     public function setResource($resource)
     {
         $this->_resource = $resource;
     }
 
+    /**
+     * @return array
+     */
     public function getJoinedTables()
     {
         return $this->_joinedTables;
diff --git a/lib/internal/Magento/Framework/Module/DbVersionInfo.php b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
index 993f2853d2ce3..8333c7bb595b6 100644
--- a/lib/internal/Magento/Framework/Module/DbVersionInfo.php
+++ b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
@@ -30,6 +30,11 @@ class DbVersionInfo
      */
     private $moduleResource;
 
+    /**
+     * @var array
+     */
+    private $dbVersionErrorsCache = null;
+
     /**
      * @param ModuleListInterface $moduleList
      * @param ResourceInterface $moduleResource
@@ -64,27 +69,6 @@ public function isDataUpToDate($moduleName)
         return $this->isModuleVersionEqual($moduleName, $dataVer);
     }
 
-    /**
-     * Get array of errors if DB is out of date, return [] if DB is current
-     *
-     * @return string[] Array of errors, each error contains module name, current version, required version,
-     *                  and type (schema or data).  The array will be empty if all schema and data are current.
-     */
-    public function getDbVersionErrors()
-    {
-        $errors = [];
-        foreach ($this->moduleList->getNames() as $moduleName) {
-            if (!$this->isSchemaUpToDate($moduleName)) {
-                $errors[] = $this->getSchemaInfo($moduleName);
-            }
-
-            if (!$this->isDataUpToDate($moduleName)) {
-                $errors[] = $this->getDataInfo($moduleName);
-            }
-        }
-        return $errors;
-    }
-
     /**
      * Check if DB schema is up to date, version info if it is not.
      *
@@ -105,6 +89,29 @@ private function getSchemaInfo($moduleName)
         ];
     }
 
+    /**
+     * Get array of errors if DB is out of date, return [] if DB is current.
+     *
+     * @return string[] Array of errors, each error contains module name, current version, required version,
+     *                  and type (schema or data).  The array will be empty if all schema and data are current.
+     */
+    public function getDbVersionErrors()
+    {
+        if ($this->dbVersionErrorsCache === null) {
+            $this->dbVersionErrorsCache = [];
+            foreach ($this->moduleList->getNames() as $moduleName) {
+                if (!$this->isSchemaUpToDate($moduleName)) {
+                    $this->dbVersionErrorsCache[] = $this->getSchemaInfo($moduleName);
+                }
+                if (!$this->isDataUpToDate($moduleName)) {
+                    $this->dbVersionErrorsCache[] = $this->getDataInfo($moduleName);
+                }
+            }
+        }
+
+        return $this->dbVersionErrorsCache;
+    }
+
     /**
      * Get error data for an out-of-date schema or data.
      *
@@ -131,17 +138,20 @@ private function getDataInfo($moduleName)
      * @param string $moduleName
      * @param string|bool $version
      * @return bool
-     * @throws \UnexpectedValueException
      */
     private function isModuleVersionEqual($moduleName, $version)
     {
         $module = $this->moduleList->getOne($moduleName);
-        if (empty($module['setup_version'])) {
-            throw new \UnexpectedValueException("Setup version for module '$moduleName' is not specified");
+        $configVer = isset($module['setup_version']) ? $module['setup_version'] : null;
+
+        if (empty($configVer)) {
+            /**
+             * If setup_version was removed, this means that we want to ignore old scripts and do installation only
+             * with declarative schema and data/schema patches
+             */
+            return true;
         }
-        $configVer = $module['setup_version'];
 
-        return ($version !== false
-            && version_compare($configVer, $version) === ModuleDataSetupInterface::VERSION_COMPARE_EQUAL);
+        return version_compare($configVer, $version) === ModuleDataSetupInterface::VERSION_COMPARE_EQUAL;
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php b/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php
index 4759ee7c4f3d4..990f72c536dd8 100644
--- a/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php
+++ b/lib/internal/Magento/Framework/Module/Declaration/Converter/Dom.php
@@ -26,12 +26,8 @@ public function convert($source)
                 throw new \Exception('Attribute "name" is required for module node.');
             }
             $moduleData['name'] = $nameNode->nodeValue;
-            $name = $moduleData['name'];
             $versionNode = $moduleAttributes->getNamedItem('setup_version');
-            if ($versionNode === null) {
-                throw new \Exception("Attribute 'setup_version' is missing for module '{$name}'.");
-            }
-            $moduleData['setup_version'] = $versionNode->nodeValue;
+            $moduleData['setup_version'] = $versionNode ? $versionNode->nodeValue : null;
             $moduleData['sequence'] = [];
             /** @var $childNode \DOMNode */
             foreach ($moduleNode->childNodes as $childNode) {
diff --git a/lib/internal/Magento/Framework/Module/Dir.php b/lib/internal/Magento/Framework/Module/Dir.php
index 936fce3a046b7..e6b60453b9577 100644
--- a/lib/internal/Magento/Framework/Module/Dir.php
+++ b/lib/internal/Magento/Framework/Module/Dir.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Filesystem;
 
 class Dir
 {
@@ -20,6 +19,7 @@ class Dir
     const MODULE_I18N_DIR = 'i18n';
     const MODULE_VIEW_DIR = 'view';
     const MODULE_CONTROLLER_DIR = 'Controller';
+    const MODULE_SETUP_DIR = 'Setup';
     /**#@-*/
 
     /**#@-*/
@@ -45,12 +45,19 @@ public function getDir($moduleName, $type = '')
     {
         $path = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
 
+        // An empty $type means it's getting the directory of the module itself.
+        if (empty($type) && !isset($path)) {
+            // Note: do not throw \LogicException, as it would break backwards-compatibility.
+            throw new \InvalidArgumentException("Module '$moduleName' is not correctly registered.");
+        }
+
         if ($type) {
             if (!in_array($type, [
                 self::MODULE_ETC_DIR,
                 self::MODULE_I18N_DIR,
                 self::MODULE_VIEW_DIR,
-                self::MODULE_CONTROLLER_DIR
+                self::MODULE_CONTROLLER_DIR,
+                self::MODULE_SETUP_DIR
             ])) {
                 throw new \InvalidArgumentException("Directory type '{$type}' is not recognized.");
             }
diff --git a/lib/internal/Magento/Framework/Module/FullModuleList.php b/lib/internal/Magento/Framework/Module/FullModuleList.php
index 5ad5b05a413ef..c6e403dee0898 100644
--- a/lib/internal/Magento/Framework/Module/FullModuleList.php
+++ b/lib/internal/Magento/Framework/Module/FullModuleList.php
@@ -55,7 +55,7 @@ public function getAll()
     public function getOne($name)
     {
         $data = $this->getAll();
-        return isset($data[$name]) ? $data[$name] : null;
+        return $data[$name] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleList.php b/lib/internal/Magento/Framework/Module/ModuleList.php
index 406aa9efd31a0..6ee061cffb3d0 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList.php
@@ -90,7 +90,7 @@ public function getAll()
     public function getOne($name)
     {
         $enabled = $this->getAll();
-        return isset($enabled[$name]) ? $enabled[$name] : null;
+        return $enabled[$name] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
index ed740d459060e..b453ea4cba095 100644
--- a/lib/internal/Magento/Framework/Module/ModuleResource.php
+++ b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -10,6 +10,9 @@
 
 /**
  * Resource Model
+ *
+ * @deprecated Declarative schema and data patches replace old functionality and setup_module table
+ * So all resources related to this table, will be deprecated since 2.3.0
  */
 class ModuleResource extends AbstractDb implements ResourceInterface
 {
@@ -84,7 +87,7 @@ public function getDbVersion($moduleName)
             return false;
         }
         $this->_loadVersion('db');
-        return isset(self::$schemaVersions[$moduleName]) ? self::$schemaVersions[$moduleName] : false;
+        return self::$schemaVersions[$moduleName] ?? false;
     }
 
     /**
@@ -116,7 +119,7 @@ public function getDataVersion($moduleName)
             return false;
         }
         $this->_loadVersion('data');
-        return isset(self::$dataVersions[$moduleName]) ? self::$dataVersions[$moduleName] : false;
+        return self::$dataVersions[$moduleName] ?? false;
     }
 
     /**
@@ -134,4 +137,17 @@ public function setDataVersion($moduleName, $version)
             $this->getConnection()->insert($this->getMainTable(), $data);
         }
     }
+
+    /**
+     * Flush all class cache
+     *
+     * @deprecated This method was added as temporary solution, to increase modularity:
+     * Because before new modules appears in resource only on next bootstrap
+     * @return void
+     */
+    public static function flush()
+    {
+        self::$dataVersions = null;
+        self::$schemaVersions = [];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
index 7edb0c04ebf98..0dce507ba26f4 100644
--- a/lib/internal/Magento/Framework/Module/PackageInfo.php
+++ b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -283,6 +283,6 @@ public function getConflict($moduleName)
     public function getVersion($moduleName)
     {
         $this->load();
-        return isset($this->modulePackageVersionMap[$moduleName]) ? $this->modulePackageVersionMap[$moduleName] : '';
+        return $this->modulePackageVersionMap[$moduleName] ?? '';
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index bdaf59f02c300..96f9674704e17 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -50,14 +50,22 @@ public function __construct(FrontendCacheInterface $cache, DbVersionInfo $dbVers
     public function beforeDispatch(FrontController $subject, RequestInterface $request)
     {
         if (!$this->cache->load('db_is_up_to_date')) {
-            $errors = $this->dbVersionInfo->getDbVersionErrors();
-
-            if ($errors) {
+            list($versionTooLowErrors, $versionTooHighErrors) = array_values($this->getGroupedDbVersionErrors());
+            if ($versionTooHighErrors) {
+                $message = 'Please update your modules: '
+                    . "Run \"composer install\" from the Magento root directory.\n"
+                    . "The following modules are outdated:\n%1";
+                throw new LocalizedException(
+                    new Phrase($message, [implode("\n", $this->formatVersionTooHighErrors($versionTooHighErrors))])
+                );
+            } elseif ($versionTooLowErrors) {
                 $message = 'Please upgrade your database: '
                     . "Run \"bin/magento setup:upgrade\" from the Magento root directory.\n"
                     . "The following modules are outdated:\n%1";
 
-                throw new LocalizedException(new Phrase($message, [implode("\n", $this->formatErrors($errors))]));
+                throw new LocalizedException(
+                    new Phrase($message, [implode("\n", $this->formatVersionTooLowErrors($versionTooLowErrors))])
+                );
             } else {
                 $this->cache->save('true', 'db_is_up_to_date');
             }
@@ -70,7 +78,7 @@ public function beforeDispatch(FrontController $subject, RequestInterface $reque
      * @param array $errorsData array of error data from getOutOfDateDbErrors
      * @return array Messages that can be used to log the error
      */
-    private function formatErrors($errorsData)
+    private function formatVersionTooLowErrors($errorsData)
     {
         $formattedErrors = [];
 
@@ -82,4 +90,49 @@ private function formatErrors($errorsData)
 
         return $formattedErrors;
     }
+
+    /**
+     * Format each error in the error data from getOutOfDataDbErrors into a single message
+     *
+     * @param array $errorsData array of error data from getOutOfDateDbErrors
+     * @return array Messages that can be used to log the error
+     */
+    private function formatVersionTooHighErrors($errorsData)
+    {
+        $formattedErrors = [];
+        foreach ($errorsData as $error) {
+            $formattedErrors[] = $error[DbVersionInfo::KEY_MODULE] . ' ' . $error[DbVersionInfo::KEY_TYPE]
+                . ': code version - ' . $error[DbVersionInfo::KEY_REQUIRED]
+                . ', database version - ' . $error[DbVersionInfo::KEY_CURRENT];
+        }
+
+        return $formattedErrors;
+    }
+
+    /**
+     * Return DB version errors grouped by 'version_too_low' and 'version_too_high'
+     *
+     * @return mixed
+     */
+    private function getGroupedDbVersionErrors()
+    {
+        $allDbVersionErrors = $this->dbVersionInfo->getDbVersionErrors();
+        return array_reduce(
+            (array)$allDbVersionErrors,
+            function ($carry, $item) {
+                if ($item[DbVersionInfo::KEY_CURRENT] === 'none'
+                    || version_compare($item[DbVersionInfo::KEY_CURRENT], $item[DbVersionInfo::KEY_REQUIRED], '<')
+                ) {
+                    $carry['version_too_low'][] = $item;
+                } else {
+                    $carry['version_too_high'][] = $item;
+                }
+                return $carry;
+            },
+            [
+                'version_too_low' => [],
+                'version_too_high' => [],
+            ]
+        );
+    }
 }
diff --git a/lib/internal/Magento/Framework/Module/Setup.php b/lib/internal/Magento/Framework/Module/Setup.php
index 50e881c4ae534..7db2a41495e8f 100644
--- a/lib/internal/Magento/Framework/Module/Setup.php
+++ b/lib/internal/Magento/Framework/Module/Setup.php
@@ -7,9 +7,9 @@
  */
 namespace Magento\Framework\Module;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\App\ResourceConnection;
 
 class Setup implements SetupInterface
 {
diff --git a/lib/internal/Magento/Framework/Module/Setup/Context.php b/lib/internal/Magento/Framework/Module/Setup/Context.php
index 81b93ac447cc0..4c6240e4c82d4 100644
--- a/lib/internal/Magento/Framework/Module/Setup/Context.php
+++ b/lib/internal/Magento/Framework/Module/Setup/Context.php
@@ -99,6 +99,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve event manager
+     *
      * @return \Magento\Framework\Event\ManagerInterface
      */
     public function getEventManager()
@@ -107,7 +109,9 @@ public function getEventManager()
     }
 
     /**
-     * @return \Psr\Log\LoggerInterface $logger
+     * Retrieve logger
+     *
+     * @return \Psr\Log\LoggerInterface
      */
     public function getLogger()
     {
@@ -115,6 +119,8 @@ public function getLogger()
     }
 
     /**
+     * Retrieve module list
+     *
      * @return \Magento\Framework\Module\ModuleListInterface
      */
     public function getModuleList()
@@ -123,6 +129,8 @@ public function getModuleList()
     }
 
     /**
+     * Retrieve modules reader
+     *
      * @return \Magento\Framework\Module\Dir\Reader
      */
     public function getModulesReader()
@@ -131,6 +139,8 @@ public function getModulesReader()
     }
 
     /**
+     * Retrieve resource model
+     *
      * @return \Magento\Framework\App\ResourceConnection
      */
     public function getResourceModel()
@@ -139,6 +149,8 @@ public function getResourceModel()
     }
 
     /**
+     * Retrieve migration factory
+     *
      * @return \Magento\Framework\Module\Setup\MigrationFactory
      */
     public function getMigrationFactory()
@@ -147,6 +159,8 @@ public function getMigrationFactory()
     }
 
     /**
+     * Retrieve resource
+     *
      * @return \Magento\Framework\Module\ResourceInterface
      */
     public function getResource()
@@ -155,6 +169,8 @@ public function getResource()
     }
 
     /**
+     * Retrieve encryptor
+     *
      * @return \Magento\Framework\Encryption\EncryptorInterface
      */
     public function getEncryptor()
@@ -163,6 +179,8 @@ public function getEncryptor()
     }
 
     /**
+     * Retrieve filesystem
+     *
      * @return \Magento\Framework\Filesystem
      */
     public function getFilesystem()
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
index f6c978c3cef96..c36d4bf7d5e93 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
@@ -65,6 +65,12 @@ public function testIsDbSchemaUpToDate($moduleName, $dbVersion, $expectedResult)
             ->method('getDbVersion')
             ->with($moduleName)
             ->will($this->returnValue($dbVersion));
+        $this->moduleList->expects(self::once())
+            ->method('getOne')
+            ->with($moduleName)
+            ->willReturn(
+                ['setup_version' => $dbVersion]
+            );
         $this->assertEquals(
             $expectedResult,
             $this->dbVersionInfo->isSchemaUpToDate($moduleName)
@@ -84,6 +90,12 @@ public function testIsDbDataUpToDate($moduleName, $dbVersion, $expectedResult)
             ->method('getDataVersion')
             ->with($moduleName)
             ->will($this->returnValue($dbVersion));
+        $this->moduleList->expects(self::once())
+            ->method('getOne')
+            ->with($moduleName)
+            ->willReturn(
+                ['setup_version' => $dbVersion]
+            );
         $this->assertEquals(
             $expectedResult,
             $this->dbVersionInfo->isDataUpToDate($moduleName)
@@ -142,20 +154,18 @@ public function testGetDbVersionErrors()
     }
 
     /**
-     * @expectedException \UnexpectedValueException
-     * @expectedExceptionMessage Setup version for module 'Module_No_Schema' is not specified
+     * Test is DB schema up to date for module with no schema
      */
     public function testIsDbSchemaUpToDateException()
     {
-        $this->dbVersionInfo->isSchemaUpToDate('Module_No_Schema');
+        $this->assertTrue($this->dbVersionInfo->isSchemaUpToDate('Module_No_Schema'));
     }
 
     /**
-     * @expectedException \UnexpectedValueException
-     * @expectedExceptionMessage Setup version for module 'Module_No_Schema' is not specified
+     * Test is DB Data up to date for module with no schema
      */
     public function testIsDbDataUpToDateException()
     {
-        $this->dbVersionInfo->isDataUpToDate('Module_No_Schema');
+        $this->assertTrue($this->dbVersionInfo->isDataUpToDate('Module_No_Schema'));
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php
index ec9b41ff1b957..b6be79464684f 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/DomTest.php
@@ -42,12 +42,15 @@ public function testConvertWithInvalidDom($xmlString)
         }
     }
 
+    /**
+     * @return array
+     */
     public function convertWithInvalidDomDataProvider()
     {
         return [
             'Module node without "name" attribute' => ['<?xml version="1.0"?><config><module /></config>'],
             'Sequence module node without "name" attribute' => [
-                '<?xml version="1.0"?><config><module name="Module_One" setup_version="1.0.0.0">' .
+                '<?xml version="1.0"?><config><module name="Module_One" >' .
                 '<sequence><module/></sequence></module></config>',
             ],
         ];
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/converted_valid_module.php b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/converted_valid_module.php
index 810052fe5e237..d572cf2814fc9 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/converted_valid_module.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/converted_valid_module.php
@@ -6,12 +6,17 @@
 return [
     'Module_One' => [
         'name' => 'Module_One',
-        'setup_version' => '1.0.0.0',
+        'setup_version' => null,
+        'sequence' => [],
+    ],
+    'Module_OneAndHalf' => [
+        'name' => 'Module_OneAndHalf',
+        'setup_version' => '2.0',
         'sequence' => [],
     ],
     'Module_Two' => [
         'name' => 'Module_Two',
-        'setup_version' => '2.0.0.0',
+        'setup_version' => null,
         'sequence' => ['Module_One'],
     ]
 ];
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/valid_module.xml b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/valid_module.xml
index cec18c9bae7cc..e55ebcdfd7c2f 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/valid_module.xml
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Declaration/Converter/_files/valid_module.xml
@@ -7,9 +7,11 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <!-- commented text -->
-    <module name="Module_One" setup_version="1.0.0.0">
+    <module name="Module_One">
     </module>
-    <module name="Module_Two" setup_version="2.0.0.0">
+    <module name="Module_OneAndHalf" setup_version="2.0">
+    </module>
+    <module name="Module_Two">
         <sequence>
             <module name="Module_One" />
         </sequence>
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php
index f41f9bbd0d239..59249e3b92ae9 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php
@@ -11,7 +11,6 @@
 namespace Magento\Framework\Module\Test\Unit\Dir;
 
 use Magento\Framework\Config\FileIteratorFactory;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Module\Dir;
 
 class ReaderTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php
index f7a20252826ae..eb849fc457ddb 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReverseResolverTest.php
@@ -54,6 +54,9 @@ public function testGetModuleName($path, $expectedResult)
         $this->assertSame($expectedResult, $this->_model->getModuleName($path));
     }
 
+    /**
+     * @return array
+     */
     public function getModuleNameDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DirTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DirTest.php
index 335228888cc4b..a1c891df7bcb4 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DirTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DirTest.php
@@ -46,6 +46,16 @@ public function testGetDirModuleSubDir()
         $this->assertEquals('/Test/Module/etc', $this->_model->getDir('Test_Module', 'etc'));
     }
 
+    public function testGetSetupDirModule()
+    {
+        $this->moduleRegistryMock->expects($this->once())
+            ->method('getPath')
+            ->with(ComponentRegistrar::MODULE, 'Test_Module')
+            ->willReturn('/Test/Module');
+
+        $this->assertEquals('/Test/Module/Setup', $this->_model->getDir('Test_Module', 'Setup'));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Directory type 'unknown' is not recognized
@@ -59,4 +69,17 @@ public function testGetDirModuleSubDirUnknown()
 
         $this->_model->getDir('Test_Module', 'unknown');
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Module 'Test Module' is not correctly registered.
+     */
+    public function testGetDirModuleIncorrectlyRegistered()
+    {
+        $this->moduleRegistryMock->expects($this->once())
+            ->method('getPath')
+            ->with($this->identicalTo(ComponentRegistrar::MODULE), $this->identicalTo('Test Module'))
+            ->willReturn(null);
+        $this->_model->getDir('Test Module');
+    }
 }
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
index 44185b52b19a4..255f5783dbc60 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use Magento\Framework\Module\Plugin\DbStatusValidator;
-
 class ManagerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -83,6 +81,9 @@ public function testIsOutputEnabledGenericConfigPath($configValue, $expectedResu
         $this->assertEquals($expectedResult, $this->_model->isOutputEnabled('Module_One'));
     }
 
+    /**
+     * @return array
+     */
     public function isOutputEnabledGenericConfigPathDataProvider()
     {
         return ['output disabled' => [true, false], 'output enabled' => [false, true]];
@@ -103,6 +104,9 @@ public function testIsOutputEnabledCustomConfigPath($configValue, $expectedResul
         $this->assertEquals($expectedResult, $this->_model->isOutputEnabled('Module_Two'));
     }
 
+    /**
+     * @return array
+     */
     public function isOutputEnabledCustomConfigPathDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
index 51e86fcf68bee..07dfbacd5d29c 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
@@ -251,7 +251,7 @@ protected function _getFilesystemMock()
 
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Serialize\Serializer\Json
-     * @throws \PHPUnit_Framework_Exception
+     * @throws \PHPUnit\Framework\Exception
      */
     private function getSerializerMock()
     {
diff --git a/lib/internal/Magento/Framework/Module/etc/module.xsd b/lib/internal/Magento/Framework/Module/etc/module.xsd
index 839bddb982c73..ffc4101e70700 100644
--- a/lib/internal/Magento/Framework/Module/etc/module.xsd
+++ b/lib/internal/Magento/Framework/Module/etc/module.xsd
@@ -43,7 +43,7 @@
             </xs:element>
         </xs:all>
         <xs:attribute name="name" type="moduleName" use="required" />
-        <xs:attribute name="setup_version" type="setupVersion" use="required" />
+        <xs:attribute name="setup_version" type="setupVersion" use="optional" />
     </xs:complexType>
 
     <xs:complexType name="moduleSequence">
diff --git a/lib/internal/Magento/Framework/Mview/Config/Converter.php b/lib/internal/Magento/Framework/Mview/Config/Converter.php
index 55b2f1da21cb9..5c33ac150d00a 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Converter.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Mview\Config;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Mview\View\SubscriptionInterface;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
diff --git a/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
index 7cafc35ba1451..7eeea70ffe337 100644
--- a/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Mview\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php
index ea8b7cfc068ac..4830c5e140917 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Mview\Test\Unit\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class ReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
index e278de0fff914..b16b7c87e87ac 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Mview\Test\Unit\View;
 
 class ChangelogTest extends \PHPUnit\Framework\TestCase
@@ -45,7 +46,7 @@ public function testInstanceOf()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Write DB connection is not available
+     * @expectedExceptionMessage The write connection to the database isn't available. Please try again later.
      */
     public function testCheckConnectionException()
     {
@@ -110,10 +111,8 @@ public function testGetVersionWithExceptionNoAutoincrement()
             ->method('fetchRow')
             ->will($this->returnValue([]));
 
-        $this->expectException(
-            'Exception',
-            "Table status for `{$changelogTableName}` is incorrect. Can`t fetch version id."
-        );
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("Table status for `{$changelogTableName}` is incorrect. Can`t fetch version id.");
         $this->model->setViewId('viewIdtest');
         $this->model->getVersion();
     }
@@ -124,7 +123,8 @@ public function testGetVersionWithExceptionNoTable()
         $this->mockIsTableExists($changelogTableName, false);
         $this->mockGetTableName();
 
-        $this->expectException('Exception', "Table {$changelogTableName} does not exist");
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("Table {$changelogTableName} does not exist");
         $this->model->setViewId('viewIdtest');
         $this->model->getVersion();
     }
@@ -135,7 +135,8 @@ public function testDrop()
         $this->mockIsTableExists($changelogTableName, false);
         $this->mockGetTableName();
 
-        $this->expectException('Exception', "Table {$changelogTableName} does not exist");
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("Table {$changelogTableName} does not exist");
         $this->model->setViewId('viewIdtest');
         $this->model->drop();
     }
@@ -226,7 +227,8 @@ public function testGetListWithException()
         $this->mockIsTableExists($changelogTableName, false);
         $this->mockGetTableName();
 
-        $this->expectException('Exception', "Table {$changelogTableName} does not exist");
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("Table {$changelogTableName} does not exist");
         $this->model->setViewId('viewIdtest');
         $this->model->getList(mt_rand(1, 200), mt_rand(201, 400));
     }
@@ -237,7 +239,8 @@ public function testClearWithException()
         $this->mockIsTableExists($changelogTableName, false);
         $this->mockGetTableName();
 
-        $this->expectException('Exception', "Table {$changelogTableName} does not exist");
+        $this->expectException('Exception');
+        $this->expectExceptionMessage("Table {$changelogTableName} does not exist");
         $this->model->setViewId('viewIdtest');
         $this->model->clear(mt_rand(1, 200));
     }
@@ -255,6 +258,10 @@ protected function mockGetTableName()
         $this->resourceMock->expects($this->once())->method('getTableName')->will($this->returnArgument(0));
     }
 
+    /**
+     * @param $changelogTableName
+     * @param $result
+     */
     protected function mockIsTableExists($changelogTableName, $result)
     {
         $this->connectionMock->expects(
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
index 3fd8ea93c9bbe..3f806b319ef48 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
@@ -464,6 +464,9 @@ public function testResumeNotSuspended($status)
         $this->model->resume();
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderResumeNotSuspended()
     {
         return [
@@ -520,6 +523,9 @@ public function testIsEnabled($mode, $result)
         $this->assertEquals($result, $this->model->isEnabled());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderIsEnabled()
     {
         return [
@@ -541,6 +547,9 @@ public function testIsIdle($status, $result)
         $this->assertEquals($result, $this->model->isIdle());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderIsIdle()
     {
         return [
@@ -563,6 +572,9 @@ public function testIsWorking($status, $result)
         $this->assertEquals($result, $this->model->isWorking());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderIsWorking()
     {
         return [
@@ -585,6 +597,9 @@ public function testIsSuspended($status, $result)
         $this->assertEquals($result, $this->model->isSuspended());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderIsSuspended()
     {
         return [
@@ -617,6 +632,9 @@ protected function loadView()
         $this->model->load($viewId);
     }
 
+    /**
+     * @return array
+     */
     protected function getViewData()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
index a937c62dfc23a..1b32238813f86 100644
--- a/lib/internal/Magento/Framework/Mview/View.php
+++ b/lib/internal/Magento/Framework/Mview/View.php
@@ -10,6 +10,8 @@
 use Magento\Framework\Mview\View\SubscriptionFactory;
 
 /**
+ * Mview
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class View extends \Magento\Framework\DataObject implements ViewInterface
@@ -283,7 +285,7 @@ public function update()
                 for ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
                     // Don't go past the current version for atomicy.
                     $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
-                    $ids = $this->getChangelog()->getList($vsFrom, $versionTo);
+                    $ids = array_map('intval', $this->getChangelog()->getList($vsFrom, $versionTo));
 
                     // We run the actual indexer in batches.
                     // Chunked AFTER loading to avoid duplicates in separate chunks.
diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php
index 91caf66228360..4fb06ce3f06fd 100644
--- a/lib/internal/Magento/Framework/Mview/View/Changelog.php
+++ b/lib/internal/Magento/Framework/Mview/View/Changelog.php
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Mview\View;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Phrase;
 
 class Changelog implements ChangelogInterface
@@ -58,7 +58,7 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     protected function checkConnection()
     {
         if (!$this->connection) {
-            throw new \Exception('Write DB connection is not available');
+            throw new \Exception("The write connection to the database isn't available. Please try again later.");
         }
     }
 
@@ -121,7 +121,7 @@ public function clear($versionId)
             throw new ChangelogTableNotExistsException(new Phrase("Table %1 does not exist", [$changelogTableName]));
         }
 
-        $this->connection->delete($changelogTableName, ['version_id <= ?' => (int)$versionId]);
+        $this->connection->delete($changelogTableName, ['version_id < ?' => (int)$versionId]);
 
         return true;
     }
diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
index 2f781dcad0abe..67dff1a2cc5db 100644
--- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
@@ -10,6 +10,11 @@
 use Magento\Framework\DB\Ddl\Trigger;
 use Magento\Framework\Mview\View\StateInterface;
 
+/**
+ * Class Subscription
+ *
+ * @package Magento\Framework\Mview\View
+ */
 class Subscription implements SubscriptionInterface
 {
     /**
@@ -193,33 +198,32 @@ protected function getLinkedViews()
      */
     protected function buildStatement($event, $changelog)
     {
-        $columns = [];
-        if ($this->connection->isTableExists($this->getTableName())
-            && $describe = $this->connection->describeTable($this->getTableName())
-        ) {
-            foreach ($describe as $column) {
-                if (in_array($column['COLUMN_NAME'], $this->ignoredUpdateColumns)) {
-                    continue;
-                }
-                $columns[] = sprintf(
-                    'NEW.%1$s != OLD.%1$s',
-                    $this->connection->quoteIdentifier($column['COLUMN_NAME'])
-                );
-            }
-        }
-
         switch ($event) {
             case Trigger::EVENT_INSERT:
                 $trigger = "INSERT IGNORE INTO %s (%s) VALUES (NEW.%s);";
                 break;
             case Trigger::EVENT_UPDATE:
+                $tableName = $this->resource->getTableName($this->getTableName());
                 $trigger = "INSERT IGNORE INTO %s (%s) VALUES (NEW.%s);";
-                if ($columns) {
-                    $trigger = sprintf(
-                        "IF (%s) THEN %s END IF;",
-                        implode(' OR ', $columns),
-                        $trigger
-                    );
+                if ($this->connection->isTableExists($tableName) &&
+                    $describe = $this->connection->describeTable($tableName)
+                ) {
+                    $columnNames = array_column($describe, 'COLUMN_NAME');
+                    $columnNames = array_diff($columnNames, $this->ignoredUpdateColumns);
+                    if ($columnNames) {
+                        $columns = [];
+                        foreach ($columnNames as $columnName) {
+                            $columns[] = sprintf(
+                                'NEW.%1$s <=> OLD.%1$s',
+                                $this->connection->quoteIdentifier($columnName)
+                            );
+                        }
+                        $trigger = sprintf(
+                            "IF (%s) THEN %s END IF;",
+                            implode(' OR ', $columns),
+                            $trigger
+                        );
+                    }
                 }
                 break;
             case Trigger::EVENT_DELETE:
diff --git a/lib/internal/Magento/Framework/Notification/MessageList.php b/lib/internal/Magento/Framework/Notification/MessageList.php
index 8fb91890b2ff0..ac753b48c8944 100644
--- a/lib/internal/Magento/Framework/Notification/MessageList.php
+++ b/lib/internal/Magento/Framework/Notification/MessageList.php
@@ -72,7 +72,7 @@ protected function _loadMessages()
     public function getMessageByIdentity($identity)
     {
         $this->_loadMessages();
-        return isset($this->_messages[$identity]) ? $this->_messages[$identity] : null;
+        return $this->_messages[$identity] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Oauth/Helper/Request.php b/lib/internal/Magento/Framework/Oauth/Helper/Request.php
index 64971dbfb6d18..548c4a5990efe 100644
--- a/lib/internal/Magento/Framework/Oauth/Helper/Request.php
+++ b/lib/internal/Magento/Framework/Oauth/Helper/Request.php
@@ -6,6 +6,7 @@
 namespace Magento\Framework\Oauth\Helper;
 
 use Magento\Framework\App\RequestInterface;
+use Zend\Uri\UriFactory;
 
 class Request
 {
@@ -95,7 +96,7 @@ protected function _processRequest($authHeaderValue, $contentTypeHeader, $reques
         }
         $protocolParamsNotSet = !$protocolParams;
 
-        $queryString = \Zend_Uri_Http::fromString($requestUrl)->getQuery();
+        $queryString = UriFactory::factory($requestUrl)->getQuery();
         $this->_extractQueryStringParams($protocolParams, $queryString);
 
         if ($protocolParamsNotSet) {
diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php
index 247b0d4a53009..5e48fb5ed30f9 100644
--- a/lib/internal/Magento/Framework/Oauth/Oauth.php
+++ b/lib/internal/Magento/Framework/Oauth/Oauth.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Oauth;
 
 use Magento\Framework\Encryption\Helper\Security;
@@ -198,7 +199,7 @@ protected function _validateSignature($params, $consumerSecret, $httpMethod, $re
         );
 
         if (!Security::compareStrings($calculatedSign, $params['oauth_signature'])) {
-            throw new Exception(new Phrase('Invalid signature'));
+            throw new Exception(new Phrase('The signatire is invalid. Verify and try again.'));
         }
     }
 
@@ -213,7 +214,7 @@ protected function _validateVersionParam($version)
     {
         // validate version if specified
         if ('1.0' != $version) {
-            throw new OauthInputException(new Phrase('OAuth version %1 is not supported', [$version]));
+            throw new OauthInputException(new Phrase('The "%1" Oauth version isn\'t supported.', [$version]));
         }
     }
 
@@ -250,7 +251,7 @@ protected function _validateProtocolParams($protocolParams, $requiredParams = []
             $protocolParams['oauth_token']
         )
         ) {
-            throw new OauthInputException(new Phrase('Token is not the correct length'));
+            throw new OauthInputException(new Phrase('The token length is invalid. Check the length and try again.'));
         }
 
         // Validate signature method.
@@ -284,7 +285,9 @@ protected function _checkRequiredParams($protocolParams, $requiredParams)
         $exception = new OauthInputException();
         foreach ($requiredParams as $param) {
             if (!isset($protocolParams[$param])) {
-                $exception->addError(new Phrase('%fieldName is a required field.', ['fieldName' => $param]));
+                $exception->addError(
+                    new Phrase('"%fieldName" is required. Enter and try again.', ['fieldName' => $param])
+                );
             }
         }
         if ($exception->wasErrorAdded()) {
diff --git a/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php b/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php
index 72bf2fe7a6129..f67fd37c49662 100644
--- a/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php
+++ b/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Oauth\Test\Unit;
 
 use \Magento\Framework\Oauth\OauthInputException;
@@ -17,12 +18,14 @@ public function testGetAggregatedErrorMessage()
     {
         $exception = new OauthInputException();
         foreach (['field1', 'field2'] as $param) {
-            $exception->addError(new Phrase('%fieldName is a required field.', ['fieldName' => $param]));
+            $exception->addError(
+                new Phrase('"%fieldName" is required. Enter and try again.', ['fieldName' => $param])
+            );
         }
         $exception->addError(new Phrase('Message with period.'));
 
         $this->assertEquals(
-            'field1 is a required field, field2 is a required field, Message with period',
+            '"field1" is required. Enter and try again, "field2" is required. Enter and try again, Message with period',
             $exception->getAggregatedErrorMessage()
         );
     }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
index af866478028c0..efa1b4be60ced 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
@@ -5,8 +5,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\ObjectManager\Code\Generator;
 
+/**
+ * Class Proxy
+ *
+ * @package Magento\Framework\ObjectManager\Code\Generator
+ */
 class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
 {
     /**
@@ -20,6 +26,8 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
     const NON_INTERCEPTABLE_INTERFACE = \Magento\Framework\ObjectManager\NoninterceptableInterface::class;
 
     /**
+     * Returns default result class name
+     *
      * @param string $modelClassName
      * @return string
      */
@@ -112,13 +120,16 @@ protected function _getClassMethods()
         $reflectionClass = new \ReflectionClass($this->getSourceClassName());
         $publicMethods = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
         foreach ($publicMethods as $method) {
-            if (!($method->isConstructor() ||
+            if (!(
+                    $method->isConstructor() ||
                     $method->isFinal() ||
                     $method->isStatic() ||
-                    $method->isDestructor()) && !in_array(
-                        $method->getName(),
-                        ['__sleep', '__wakeup', '__clone']
-                    )
+                    $method->isDestructor()
+                )
+                && !in_array(
+                    $method->getName(),
+                    ['__sleep', '__wakeup', '__clone']
+                )
             ) {
                 $methods[] = $this->_getMethodInfo($method);
             }
@@ -128,6 +139,8 @@ protected function _getClassMethods()
     }
 
     /**
+     * Generates code
+     *
      * @return string
      */
     protected function _generateCode()
@@ -155,15 +168,22 @@ protected function _getMethodInfo(\ReflectionMethod $method)
         $parameterNames = [];
         $parameters = [];
         foreach ($method->getParameters() as $parameter) {
-            $parameterNames[] = '$' . $parameter->getName();
+            $name = $parameter->isVariadic() ? '... $' . $parameter->getName() : '$' . $parameter->getName();
+            $parameterNames[] = $name;
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
+        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
         $methodInfo = [
             'name' => $method->getName(),
             'parameters' => $parameters,
-            'body' => $this->_getMethodBody($method->getName(), $parameterNames),
+            'body' => $this->_getMethodBody(
+                $method->getName(),
+                $parameterNames,
+                $returnTypeValue === 'void'
+            ),
             'docblock' => ['shortDescription' => '{@inheritdoc}'],
+            'returntype' => $returnTypeValue,
         ];
 
         return $methodInfo;
@@ -212,20 +232,28 @@ protected function _getDefaultConstructorDefinition()
      *
      * @param string $name
      * @param array $parameters
+     * @param bool $withoutReturn
      * @return string
      */
-    protected function _getMethodBody($name, array $parameters = [])
-    {
+    protected function _getMethodBody(
+        $name,
+        array $parameters = [],
+        bool $withoutReturn = false
+    ) {
         if (count($parameters) == 0) {
             $methodCall = sprintf('%s()', $name);
         } else {
             $methodCall = sprintf('%s(%s)', $name, implode(', ', $parameters));
         }
-        return 'return $this->_getSubject()->' . $methodCall . ';';
+
+        return ($withoutReturn ? '' : 'return ')
+            . '$this->_getSubject()->' . $methodCall . ';';
     }
 
     /**
-     * {@inheritdoc}
+     * Validates data
+     *
+     * @return bool
      */
     protected function _validateData()
     {
@@ -243,4 +271,22 @@ protected function _validateData()
         }
         return $result;
     }
+
+    /**
+     * Returns return type
+     *
+     * @param mixed $returnType
+     * @return null|string
+     */
+    private function getReturnTypeValue($returnType): ?string
+    {
+        $returnTypeValue = null;
+        if ($returnType) {
+            $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
+            $returnTypeValue .= ($returnType->getName() === 'self')
+                ? $this->getSourceClassName()
+                : $returnType->getName();
+        }
+        return $returnTypeValue;
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index b1cdb53288216..be484f074342d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -156,9 +156,6 @@ protected function _getCollectionFactoryClassName()
     protected function _getPersistorClassName()
     {
         $target = $this->getSourceClassName();
-//        if (substr($target, -9) == 'Interface') {
-//            $target = substr($target, 1, strlen($target) -9);
-//        }
         return $target . 'Persistor';
     }
 
@@ -226,14 +223,18 @@ protected function _getGetMethod()
         /** @var ParameterReflection $parameterReflection */
         $parameterReflection = $methodReflection->getParameters()[0];
         $body = "if (!\$id) {\n"
-            . "    throw new \\" . InputException::class . "(new \\Magento\\Framework\\Phrase('ID required'));\n"
+            . "    throw new \\" . InputException::class . "(\n"
+            . "        new \\Magento\\Framework\\Phrase('An ID is needed. Set the ID and try again.')\n"
+            . "    );\n"
             . "}\n"
             . "if (!isset(\$this->registry[\$id])) {\n"
             . "    \$entity = \$this->" . $this->_getSourcePersistorPropertyName()
             . "->loadEntity(\$id);\n"
             . "    if (!\$entity->getId()) {\n"
             . "        throw new \\" . NoSuchEntityException::class . "(\n"
-            . "            new \\Magento\\Framework\\Phrase('Requested entity doesn\\'t exist')\n"
+            . "            new \\Magento\\Framework\\Phrase(\n"
+            . "                'The entity that was requested doesn\'t exist. Verify the entity and try again.'\n"
+            . "            )\n"
             . "        );\n"
             . "    }\n"
             . "    \$this->registry[\$id] = \$entity;\n"
diff --git a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
index e4e82fc1ac7b3..492af22815311 100644
--- a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
@@ -6,10 +6,7 @@
 namespace Magento\Framework\ObjectManager;
 
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
 use Magento\Framework\ObjectManager\Definition\Runtime;
-use Magento\Framework\ObjectManager\Profiler\Code\Generator as ProfilerGenerator;
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Code\Generator\Autoloader;
 
 /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 99b35509c4bad..15c4cb098b84d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\Framework\ObjectManager\Factory;
 
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 abstract class AbstractFactory implements \Magento\Framework\ObjectManager\FactoryInterface
 {
@@ -104,11 +108,23 @@ public function getDefinitions()
      * @param array $args
      *
      * @return object
-     *
+     * @throws RuntimeException
      */
     protected function createObject($type, $args)
     {
-        return new $type(...array_values($args));
+        try {
+            return new $type(...array_values($args));
+        } catch (\TypeError $exception) {
+            /** @var LoggerInterface $logger */
+            $logger = ObjectManager::getInstance()->get(LoggerInterface::class);
+            $logger->critical(
+                sprintf('Type Error occurred when creating object: %s, %s', $type, $exception->getMessage())
+            );
+
+            throw new RuntimeException(
+                new Phrase('Type Error occurred when creating object: %type', ['type' => $type])
+            );
+        }
     }
 
     /**
@@ -127,12 +143,12 @@ protected function createObject($type, $args)
     protected function resolveArgument(&$argument, $paramType, $paramDefault, $paramName, $requestedType)
     {
         if ($paramType && $argument !== $paramDefault && !is_object($argument)) {
-            $argumentType = $argument['instance'];
             if (!isset($argument['instance']) || $argument !== (array)$argument) {
                 throw new \UnexpectedValueException(
                     'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType
                 );
             }
+            $argumentType = $argument['instance'];
 
             if (isset($argument['shared'])) {
                 $isShared = $argument['shared'];
diff --git a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
index c99170b4112c8..b56b6361b36f1 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php
@@ -35,15 +35,7 @@ function ($component) {
         uasort(
             $declaredComponents,
             function ($firstComponent, $secondComponent) {
-                $firstComponentSortOrder = (int)$firstComponent['sortOrder'];
-                $secondComponentSortOrder = (int)$secondComponent['sortOrder'];
-                if ($firstComponentSortOrder == $secondComponentSortOrder) {
-                    return 0;
-                } elseif ($firstComponentSortOrder < $secondComponentSortOrder) {
-                    return -1;
-                } else {
-                    return 1;
-                }
+                return (int)$firstComponent['sortOrder'] <=> (int)$secondComponent['sortOrder'];
             }
         );
         $declaredComponents = array_values($declaredComponents);
diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
index 9221dad9090c4..c1c1e7c17709a 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,10 +7,13 @@
 
 use Magento\Framework\ObjectManager\Profiler\Tree\Item as Item;
 
+/**
+ * Class Log
+ */
 class Log
 {
     /**
-     * @var $this
+     * @var self
      */
     protected static $instance;
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
index 1bba19cb16a5a..72eccbc5e7dea 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
@@ -6,28 +6,39 @@
 namespace Magento\Framework\ObjectManager\Test\Unit\Code\Generator;
 
 use Magento\Framework\Api\Test\Unit\Code\Generator\EntityChildTestAbstract;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class RepositoryTest
  */
 class RepositoryTest extends EntityChildTestAbstract
 {
+    /**
+     * @return string
+     */
     protected function getSourceClassName()
     {
         return '\\' . \Magento\Framework\ObjectManager\Code\Generator\Sample::class;
     }
 
+    /**
+     * @return string
+     */
     protected function getResultClassName()
     {
         return '\\' . \Magento\Framework\ObjectManager\Code\Generator\Sample\Repository::class;
     }
 
+    /**
+     * @return string
+     */
     protected function getGeneratorClassName()
     {
         return '\\' . \Magento\Framework\ObjectManager\Code\Generator\Repository::class;
     }
 
+    /**
+     * @return string
+     */
     protected function getOutputFileName()
     {
         return 'SampleConverter.php';
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php
index d63391b9a3335..5979bb748ba8d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/Sample.php
@@ -16,6 +16,11 @@ class Sample
      */
     protected $messages = [];
 
+    /**
+     * @var array
+     */
+    private $config = [];
+
     /**
      * @param array $messages
      */
@@ -31,4 +36,20 @@ public function getMessages()
     {
         return $this->messages;
     }
+
+    /**
+     * @param array $config
+     */
+    public function setConfig(array $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        return $this->config;
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt
index 37960239cb2c3..ad78440c5c9f2 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt
@@ -37,7 +37,7 @@ class SampleFactory
      * @param array $data
      * @return \Magento\Framework\ObjectManager\Code\Generator\Sample
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
index 7dd1265044846..2c56472f323cf 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
@@ -101,4 +101,20 @@ class Sample_Proxy extends Sample implements \Magento\Framework\ObjectManager\No
     {
         return $this->_getSubject()->getMessages();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setConfig(array $config)
+    {
+        return $this->_getSubject()->setConfig($config);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig() : array
+    {
+        return $this->_getSubject()->getConfig();
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt
index 222d5c7ffc6d1..7c5fc6f97eef1 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt
@@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Extension attributes join processor.
@@ -71,13 +71,17 @@ class SampleRepository implements SampleRepositoryInterface
     public function get($id)
     {
         if (!$id) {
-            throw new \Magento\Framework\Exception\InputException(new \Magento\Framework\Phrase('ID required'));
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('An ID is needed. Set the ID and try again.')
+            );
         }
         if (!isset($this->registry[$id])) {
             $entity = $this->sampleInterfacePersistor->loadEntity($id);
             if (!$entity->getId()) {
                 throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    new \Magento\Framework\Phrase('Requested entity doesn\'t exist')
+                    new \Magento\Framework\Phrase(
+                        'The entity that was requested doesn\'t exist. Verify the entity and try again.'
+                    )
                 );
             }
             $this->registry[$id] = $entity;
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php
index 0bc899f580071..a91efe3ab8d45 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepositoryInterface.php
@@ -7,11 +7,27 @@
 
 interface SampleRepositoryInterface
 {
+    /**
+     * @param SampleInterface $entity
+     * @return mixed
+     */
     public function save(\Magento\Framework\ObjectManager\Code\Generator\SampleInterface $entity);
 
+    /**
+     * @param $id
+     * @return mixed
+     */
     public function get($id);
 
+    /**
+     * @param $id
+     * @return mixed
+     */
     public function deleteById($id);
 
+    /**
+     * @param SampleInterface $entity
+     * @return mixed
+     */
     public function delete(\Magento\Framework\ObjectManager\Code\Generator\SampleInterface $entity);
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt
index e4067e70670a4..10315080aefac 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt
@@ -27,9 +27,9 @@ class TSampleRepository implements TSampleRepositoryInterface
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Extension attributes join processor.
@@ -71,13 +71,17 @@ class TSampleRepository implements TSampleRepositoryInterface
     public function get(int $id) : \Magento\Framework\ObjectManager\Code\Generator\TSampleInterface
     {
         if (!$id) {
-            throw new \Magento\Framework\Exception\InputException(new \Magento\Framework\Phrase('ID required'));
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('An ID is needed. Set the ID and try again.')
+            );
         }
         if (!isset($this->registry[$id])) {
             $entity = $this->tSampleInterfacePersistor->loadEntity($id);
             if (!$entity->getId()) {
                 throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    new \Magento\Framework\Phrase('Requested entity doesn\'t exist')
+                    new \Magento\Framework\Phrase(
+                        'The entity that was requested doesn\'t exist. Verify the entity and try again.'
+                    )
                 );
             }
             $this->registry[$id] = $entity;
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php
index 99ab4ecadcd41..226054a17ff1c 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepositoryInterface.php
@@ -7,10 +7,22 @@
 
 interface TSampleRepositoryInterface
 {
+    /**
+     * @param int $id
+     * @return TSampleInterface
+     */
     public function get(int $id) : \Magento\Framework\ObjectManager\Code\Generator\TSampleInterface;
 
+    /**
+     * @param TSampleInterface $entity
+     * @return bool
+     */
     public function delete(\Magento\Framework\ObjectManager\Code\Generator\TSampleInterface $entity) : bool;
 
+    /**
+     * @param TSampleInterface $entity
+     * @return TSampleInterface
+     */
     public function save(\Magento\Framework\ObjectManager\Code\Generator\TSampleInterface $entity)
         : \Magento\Framework\ObjectManager\Code\Generator\TSampleInterface;
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php
index 894befc31e53f..7dc748cc31f5b 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php
@@ -33,6 +33,9 @@ public function validate($schemaFile, $errors)
         return true;
     }
 
+    /**
+     * @return string
+     */
     public function getDom()
     {
         return 'reader dom result';
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
index 1a653992e1e35..65018bcd87374 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
@@ -12,10 +12,10 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolver;
 
-    /** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
     protected $urnResolverMock;
 
     protected function setUp()
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
index 8deb2750653e7..309bf48548ec7 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
@@ -110,8 +110,8 @@ public function testCreateWithInjectable()
      */
     public function testCircular($startingClass, $terminationClass)
     {
-        $this->expectException(
-            '\LogicException',
+        $this->expectException('\LogicException');
+        $this->expectExceptionMessage(
             sprintf('Circular dependency: %s depends on %s and vice versa.', $startingClass, $terminationClass)
         );
         $this->factory->create($startingClass);
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
index ebb7d76dcb63c..0c1a2128560f8 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
@@ -26,6 +26,6 @@ public function __construct()
      */
     public function getArg($key)
     {
-        return isset($this->args[$key]) ? $this->args[$key] : null;
+        return $this->args[$key] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php
index 14a40c76bc470..8e3681cab611f 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php
@@ -9,7 +9,6 @@
 use \Magento\Framework\ObjectManager\Helper\Composite;
 
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php
index 1c88ab65021c4..0beeeb5e69738 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Relations/RuntimeTest.php
@@ -30,6 +30,9 @@ public function testGetParents($type, $parents)
         $this->assertEquals($parents, $this->model->getParents($type));
     }
 
+    /**
+     * @return array
+     */
     public function getParentsDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php
index 3c494b6abbb94..826e94c6cb8df 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/AggregateParent.php
@@ -17,6 +17,14 @@ class AggregateParent implements \Magento\Test\Di\Aggregate\AggregateInterface
 
     public $optionalScalar;
 
+    /**
+     * AggregateParent constructor.
+     * @param \Magento\Test\Di\DiInterface $interface
+     * @param \Magento\Test\Di\DiParent $parent
+     * @param \Magento\Test\Di\Child $child
+     * @param $scalar
+     * @param int $optionalScalar
+     */
     public function __construct(
         \Magento\Test\Di\DiInterface $interface,
         \Magento\Test\Di\DiParent $parent,
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php
index b84375e3b5436..2d24e640e90fa 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/Child.php
@@ -11,6 +11,16 @@ class Child extends \Magento\Test\Di\Aggregate\AggregateParent
 
     public $secondOptionalScalar;
 
+    /**
+     * Child constructor.
+     * @param \Magento\Test\Di\DiInterface $interface
+     * @param \Magento\Test\Di\DiParent $parent
+     * @param \Magento\Test\Di\Child $child
+     * @param $scalar
+     * @param $secondScalar
+     * @param int $optionalScalar
+     * @param string $secondOptionalScalar
+     */
     public function __construct(
         \Magento\Test\Di\DiInterface $interface,
         \Magento\Test\Di\DiParent $parent,
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php
index 1c5ac56e2735c..58ee7c819490d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Aggregate/WithOptional.php
@@ -11,6 +11,11 @@ class WithOptional
 
     public $child;
 
+    /**
+     * WithOptional constructor.
+     * @param \Magento\Test\Di\DiParent|null $parent
+     * @param \Magento\Test\Di\Child|null $child
+     */
     public function __construct(\Magento\Test\Di\DiParent $parent = null, \Magento\Test\Di\Child $child = null)
     {
         $this->parent = $parent;
diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php
index ecfa71227f9f2..054d9059b02f8 100644
--- a/lib/internal/Magento/Framework/Option/ArrayInterface.php
+++ b/lib/internal/Magento/Framework/Option/ArrayInterface.php
@@ -6,7 +6,10 @@
 namespace Magento\Framework\Option;
 
 /**
- * @todo Remove in favor of the ancestor interface
+ * Array marker interface
+ *
+ * @deprecated please use \Magento\Framework\Data\OptionSourceInterface instead.
+ * @see \Magento\Framework\Data\OptionSourceInterface
  */
 interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
index 4ba8c747fa12c..fd1b0c18ead17 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
@@ -40,6 +40,6 @@ public function render(array $source, array $arguments)
      */
     private function keyToPlaceholder($key)
     {
-        return '%' . (is_int($key) ? strval($key + 1) : $key);
+        return '%' . (is_int($key) ? (string)($key + 1) : $key);
     }
 }
diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php
index 57d8841455fd7..e302dc8f5ad5e 100644
--- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php
+++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php
@@ -85,7 +85,8 @@ public function testRenderException()
             ->method('render')
             ->willThrowException($exception);
 
-        $this->expectException('Exception', $message);
+        $this->expectException('Exception');
+        $this->expectExceptionMessage($message);
         $this->object->render(['text'], []);
     }
 }
diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
index 1acc79afe3584..d5b9443788dd2 100644
--- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
+++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
@@ -88,7 +88,8 @@ public function testRenderException()
             ->method('get')
             ->willThrowException($exception);
 
-        $this->expectException('Exception', $message);
+        $this->expectException('Exception');
+        $this->expectExceptionMessage($message);
         $this->renderer->render(['text'], []);
     }
 }
diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php
index fb4b3232cab31..d8a0b3673ad6d 100644
--- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php
+++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php
@@ -91,7 +91,8 @@ public function testRenderException()
             ->method('getData')
             ->willThrowException($exception);
 
-        $this->expectException('Exception', $message);
+        $this->expectException('Exception');
+        $this->expectExceptionMessage($message);
         $this->_renderer->render(['text'], []);
     }
 }
diff --git a/lib/internal/Magento/Framework/Phrase/__.php b/lib/internal/Magento/Framework/Phrase/__.php
new file mode 100644
index 0000000000000..6f3186231e3bb
--- /dev/null
+++ b/lib/internal/Magento/Framework/Phrase/__.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/**
+ * Create value-object \Magento\Framework\Phrase
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ * @return \Magento\Framework\Phrase
+ */
+function __()
+{
+    $argc = func_get_args();
+
+    $text = array_shift($argc);
+    if (!empty($argc) && is_array($argc[0])) {
+        $argc = $argc[0];
+    }
+
+    return new \Magento\Framework\Phrase($text, $argc);
+}
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/Base.php b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
index 2664ccc54944c..d055819a4a126 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/Base.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
@@ -105,9 +105,7 @@ public function getBaseAmount()
      */
     public function getAdjustmentAmount($adjustmentCode)
     {
-        return isset($this->adjustmentAmounts[$adjustmentCode])
-            ? $this->adjustmentAmounts[$adjustmentCode]
-            : false;
+        return $this->adjustmentAmounts[$adjustmentCode] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
index fe8fcbb6f430f..8c49385f7e60f 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
@@ -30,7 +30,7 @@ abstract class AbstractPrice implements PriceInterface
     protected $amount;
 
     /**
-     * @var \Magento\Framework\Pricing\Adjustment\Calculator
+     * @var \Magento\Framework\Pricing\Adjustment\CalculatorInterface
      */
     protected $calculator;
 
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Pool.php b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
index b460113fc32c8..dfdd0c52681e1 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Pool.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
@@ -141,6 +141,6 @@ public function offsetUnset($offset)
      */
     public function offsetGet($offset)
     {
-        return isset($this->prices[$offset]) ? $this->prices[$offset] : null;
+        return $this->prices[$offset] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
index 31f00d8b1345a..eb379b54d257f 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
@@ -78,6 +78,7 @@ public function convertAndFormat(
     /**
      * Round price
      *
+     * @deprecated
      * @param float $price
      * @return float
      */
@@ -93,6 +94,8 @@ public function round($price);
     public function getCurrency($scope = null, $currency = null);
 
     /**
+     * Get currency symbol
+     *
      * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
      * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @return string
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
index 9c23b38182f91..edcc4a7e56717 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
@@ -79,6 +79,9 @@ public function testGetItems($adjustments, $expectedResult)
         $this->assertEmpty(array_diff($expectedResult, array_keys($result)));
     }
 
+    /**
+     * @return array
+     */
     public function getItemsDataProvider()
     {
         return [
@@ -104,6 +107,9 @@ public function testGetItemByCode($adjustments, $code, $expectedResult)
         $this->assertEquals($expectedResult, $item->getAdjustmentCode());
     }
 
+    /**
+     * @return array
+     */
     public function getItemByCodeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
index 6fca39b2082fb..adf9ffae16390 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
@@ -65,6 +65,9 @@ public function testGetAdjustmentByCode($code, $expectedResult)
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public function getAdjustmentByCodeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php
index 2abf26601fbea..42af3268e559b 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Helper/DataTest.php
@@ -50,6 +50,9 @@ public function testCurrency($amount, $format, $includeContainer, $result)
         $this->assertEquals($result, $helper->currency($amount, $format, $includeContainer));
     }
 
+    /**
+     * @return array
+     */
     public function currencyDataProvider()
     {
         return [
@@ -84,6 +87,9 @@ public function testCurrencyByStore($amount, $store, $format, $includeContainer,
         $this->assertEquals($result, $helper->currencyByStore($amount, $store, $format, $includeContainer));
     }
 
+    /**
+     * @return array
+     */
     public function currencyByStoreDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php
index 5d1ab67e09587..ebe2fb453ca83 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/FactoryTest.php
@@ -80,6 +80,9 @@ protected function setUp()
         $this->factory = new Factory($this->types, $this->objectManagerMock);
     }
 
+    /**
+     * @return array
+     */
     public function createPriceInfoDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
index 009fb8236c4dc..dddcf0b47abf2 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
@@ -277,6 +277,12 @@ public function testAdjustmentsHtml()
         $this->assertEquals($adjustmentHtml1 . $adjustmentHtml2, $this->model->getAdjustmentsHtml());
     }
 
+    /**
+     * @param array $data
+     * @param string $html
+     * @param string $code
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function getAdjustmentRenderMock($data = [], $html = '', $code = 'adjustment_code')
     {
         $adjustmentRender = $this->getMockForAbstractClass(
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
index 905569936d036..f4588f7d25672 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
@@ -122,6 +122,9 @@ public function testToHtml($data, $priceCode, $cssClasses)
         $this->assertEquals($cssClasses, $priceBox->getData('css_classes'));
     }
 
+    /**
+     * @return array
+     */
     public function toHtmlDataProvider()
     {
         return [
@@ -225,6 +228,9 @@ public function testGetPriceId($prefix, $suffix, $defaultPrefix, $defaultSuffix)
         $this->assertEquals($expectedPriceId, $this->model->getPriceId($defaultPrefix, $defaultSuffix));
     }
 
+    /**
+     * @return array
+     */
     public function getPriceIdProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php
index 221f97f72daf4..a2923417d5018 100644
--- a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php
@@ -83,8 +83,8 @@ public function createDataProvider()
 
     public function testCreateUndefinedClass()
     {
-        $this->expectException(
-            'InvalidArgumentException',
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(
             'Cannot create profiler driver, class "Magento_Framework_Profiler_Driver_Test_Baz" doesn\'t exist.'
         );
         $this->_factory->create(['type' => 'baz']);
diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php
index 49468b3c347ac..6fddf6a0ac977 100644
--- a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php
@@ -83,8 +83,8 @@ public function createDataProvider()
 
     public function testCreateUndefinedClass()
     {
-        $this->expectException(
-            'InvalidArgumentException',
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(
             sprintf(
                 'Cannot create standard driver output, class "%s" doesn\'t exist.',
                 'Magento_Framework_Profiler_Driver_Standard_Output_Test_Baz'
@@ -95,8 +95,8 @@ public function testCreateUndefinedClass()
 
     public function testCreateInvalidClass()
     {
-        $this->expectException(
-            'InvalidArgumentException',
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(
             'Output class "stdClass" must implement \Magento\Framework\Profiler\Driver\Standard\OutputInterface.'
         );
         $this->_factory->create(['type' => 'stdClass']);
diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
index d694697284f8e..df74eeec972ba 100644
--- a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
+++ b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
@@ -395,7 +395,7 @@ public function fetchDataProvider()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedMessage Timer "foo" doesn't exist.
+     * @expectedExceptionMessage Timer "foo" doesn't exist.
      */
     public function testFetchInvalidTimer()
     {
@@ -404,7 +404,7 @@ public function testFetchInvalidTimer()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedMessage Timer "foo" doesn't have value for "bar".
+     * @expectedExceptionMessage Timer "foo" doesn't have value for "bar".
      */
     public function testFetchInvalidKey()
     {
diff --git a/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php b/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php
index f851dbcbc87f2..8af8088ccdb65 100644
--- a/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php
+++ b/lib/internal/Magento/Framework/Reflection/AttributeTypeResolver.php
@@ -48,7 +48,10 @@ public function resolveObjectType($attributeCode, $value, $context)
             $output = $this->typeProcessor->getArrayItemType($type);
             if (!(class_exists($output) || interface_exists($output))) {
                 throw new \LogicException(
-                    sprintf('Class "%s" does not exist. Please note that namespace must be specified.', $type)
+                    sprintf(
+                        'The "%s" class doesn\'t exist and the namespace must be specified. Verify and try again.',
+                        $type
+                    )
                 );
             }
         }
diff --git a/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php b/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
index 4fd3a17fb6c6a..18308724c0226 100644
--- a/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
@@ -6,11 +6,8 @@
 
 namespace Magento\Framework\Reflection;
 
-use Magento\Framework\Phrase;
 use Magento\Framework\Api\AttributeInterface;
 use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\Api\SimpleDataObjectConverter;
-use Zend\Code\Reflection\MethodReflection;
 use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\Api\AttributeTypeResolverInterface;
 
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 6311003bd2ad5..2f3caf08c534e 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -40,25 +40,33 @@ class DataObjectProcessor
      */
     private $customAttributesProcessor;
 
+    /**
+     * @var array
+     */
+    private $processors;
+
     /**
      * @param MethodsMap $methodsMapProcessor
      * @param TypeCaster $typeCaster
      * @param FieldNamer $fieldNamer
      * @param CustomAttributesProcessor $customAttributesProcessor
      * @param ExtensionAttributesProcessor $extensionAttributesProcessor
+     * @param array $processors
      */
     public function __construct(
         MethodsMap $methodsMapProcessor,
         TypeCaster $typeCaster,
         FieldNamer $fieldNamer,
         CustomAttributesProcessor $customAttributesProcessor,
-        ExtensionAttributesProcessor $extensionAttributesProcessor
+        ExtensionAttributesProcessor $extensionAttributesProcessor,
+        array $processors = []
     ) {
         $this->methodsMapProcessor = $methodsMapProcessor;
         $this->typeCaster = $typeCaster;
         $this->fieldNamer = $fieldNamer;
         $this->extensionAttributesProcessor = $extensionAttributesProcessor;
         $this->customAttributesProcessor = $customAttributesProcessor;
+        $this->processors = $processors;
     }
 
     /**
@@ -121,6 +129,27 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
 
             $outputData[$key] = $value;
         }
+
+        $outputData = $this->changeOutputArray($dataObject, $outputData);
+
+        return $outputData;
+    }
+
+    /**
+     * Change output array if needed.
+     *
+     * @param mixed $dataObject
+     * @param array $outputData
+     * @return array
+     */
+    private function changeOutputArray($dataObject, array $outputData): array
+    {
+        foreach ($this->processors as $dataObjectClassName => $processor) {
+            if ($dataObject instanceof $dataObjectClassName) {
+                $outputData = $processor->execute($dataObject, $outputData);
+            }
+        }
+
         return $outputData;
     }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php b/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
index 3e9eef4fd7b15..aa978e7f337cc 100644
--- a/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
@@ -11,7 +11,6 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Phrase;
 use Magento\Framework\Api\ExtensionAttributesInterface;
-use Magento\Framework\Reflection\MethodsMap;
 use Zend\Code\Reflection\MethodReflection;
 
 /**
diff --git a/lib/internal/Magento/Framework/Reflection/FieldNamer.php b/lib/internal/Magento/Framework/Reflection/FieldNamer.php
index 8e4d077c52e08..a208764352f58 100644
--- a/lib/internal/Magento/Framework/Reflection/FieldNamer.php
+++ b/lib/internal/Magento/Framework/Reflection/FieldNamer.php
@@ -6,12 +6,7 @@
 
 namespace Magento\Framework\Reflection;
 
-use Magento\Framework\Phrase;
-use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\Api\SimpleDataObjectConverter;
-use Zend\Code\Reflection\ClassReflection;
-use Zend\Code\Reflection\MethodReflection;
 
 /**
  * Determines the name to use for fields in a data output array given method metadata.
diff --git a/lib/internal/Magento/Framework/Reflection/MethodsMap.php b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
index 944cd8771ee33..6b0ddfbfc2127 100644
--- a/lib/internal/Magento/Framework/Reflection/MethodsMap.php
+++ b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
@@ -94,6 +94,8 @@ public function getMethodReturnType($typeName, $methodName)
      *  'validatePassword' => 'boolean'
      * ]
      * </pre>
+     * @throws \InvalidArgumentException if methods don't have annotation
+     * @throws \ReflectionException for missing DocBock or invalid reflection class
      */
     public function getMethodsMap($interfaceName)
     {
@@ -148,6 +150,8 @@ public function getMethodParams($serviceClassName, $serviceMethodName)
      *
      * @param string $interfaceName
      * @return array
+     * @throws \ReflectionException for missing DocBock or invalid reflection class
+     * @throws \InvalidArgumentException if methods don't have annotation
      */
     private function getMethodMapViaReflection($interfaceName)
     {
diff --git a/lib/internal/Magento/Framework/Reflection/NameFinder.php b/lib/internal/Magento/Framework/Reflection/NameFinder.php
index 97f4b2f81c128..5cd4ab744bb1b 100644
--- a/lib/internal/Magento/Framework/Reflection/NameFinder.php
+++ b/lib/internal/Magento/Framework/Reflection/NameFinder.php
@@ -99,8 +99,9 @@ public function findAccessorMethodName(
         } else {
             throw new \LogicException(
                 sprintf(
-                    'Property "%s" does not have corresponding setter in class "%s".',
+                    'Property "%s" does not have accessor method "%s" in class "%s".',
                     $camelCaseProperty,
+                    $accessorName,
                     $class->getName()
                 )
             );
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php
index f1e1368cafd0b..1f6fa25a51f22 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php
@@ -84,7 +84,6 @@ public function testResolveObjectTypeWithConfiguredAttribute()
 
     /**
      * @expectedException \LogicException
-     * @expectedExceptionMessage Class "\Some\Class" does not exist. Please note that namespace must be specified.
      */
     public function testResolveObjectTypeWithConfiguredAttributeAndNonExistedClass()
     {
@@ -106,5 +105,9 @@ public function testResolveObjectTypeWithConfiguredAttributeAndNonExistedClass()
 
         $this->configMock->expects($this->once())->method('get')->willReturn($config);
         $this->model->resolveObjectType($code, $value, $context);
+
+        $this->expectExceptionMessage(
+            'The "\Some\Class" class doesn\'t exist and the namespace must be specified. Verify and try again.'
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php
index 6816ecdbdf71c..9aada9d5dbe41 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Reflection\Test\Unit;
 
+use Magento\Framework\Reflection\Test\Unit\Fixture\TSampleInterface;
+
 /**
  * Dummy data object to be used by TypeProcessorTest
  */
@@ -13,18 +15,23 @@ class DataObject
     /**
      * @var string
      */
-    protected $attrName;
+    private $attrName;
 
     /**
      * @var bool
      */
-    protected $isActive;
+    private $isActive;
 
     /**
      * @var string
      */
     private $name;
 
+    /**
+     * @var array
+     */
+    private $data = [];
+
     /**
      * @return string
      */
@@ -70,4 +77,32 @@ public function setName($name = null)
         $this->name = $name;
         return $this;
     }
+
+    /**
+     * @param string $key Key is used as index
+     * @param string $value
+     * @return void
+     */
+    public function setData(string $key, string $value)
+    {
+        $this->data[$key] = $value;
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function addData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @param TSampleInterface[] $list
+     * @return void
+     */
+    public function addObjectList(array $list)
+    {
+        $this->data['objects'] = $list;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
index ed26efb5bff64..1977ed3f46456 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
@@ -86,6 +86,9 @@ public function testBuildOutputDataArray($extensionAttributes, $expectedOutputDa
         $this->assertEquals($expectedOutputDataArray, $outputData);
     }
 
+    /**
+     * @return array
+     */
     public function buildOutputDataArrayDataProvider()
     {
         $expectedOutputDataArray = [
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php
index 130c285bd3b08..6aebd99deabb0 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php
@@ -154,6 +154,9 @@ public function testBuildOutputDataArrayWithPermission($isPermissionAllowed, $ex
         );
     }
 
+    /**
+     * @return array
+     */
     public function buildOutputDataArrayWithPermissionProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php
new file mode 100644
index 0000000000000..1d78f9ed0a7d8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Reflection\Test\Unit\Fixture;
+
+class TSample implements TSampleInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getPropertyName()
+    {
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return '';
+    }
+}
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSampleInterface.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSampleInterface.php
new file mode 100644
index 0000000000000..db2fbd19736bf
--- /dev/null
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSampleInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Reflection\Test\Unit\Fixture;
+
+interface TSampleInterface
+{
+    /**
+     * Returns property name for a sample.
+     *
+     * @return string
+     */
+    public function getPropertyName();
+
+    /**
+     * Doc block without return tag.
+     */
+    public function getName();
+}
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php
index 9ddc6d6aa0c9a..e4c0294c0cfb5 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Reflection\Test\Unit;
 
 use Zend\Code\Reflection\ClassReflection;
-use Magento\Framework\Exception\SerializationException;
 
 /**
  * NameFinder Unit Test
@@ -27,7 +26,7 @@ protected function setUp()
 
     public function testGetSetterMethodName()
     {
-        $class = new ClassReflection("\\Magento\\Framework\\Reflection\\Test\\Unit\\DataObject");
+        $class = new ClassReflection(\Magento\Framework\Reflection\Test\Unit\DataObject::class);
         $setterName = $this->nameFinder->getSetterMethodName($class, 'AttrName');
         $this->assertEquals("setAttrName", $setterName);
 
@@ -37,21 +36,43 @@ public function testGetSetterMethodName()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessageRegExp /Property "InvalidAttribute" does not have corresponding setter in class (.*?)/
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessage Property "InvalidAttribute" does not have accessor method "setInvalidAttribute" in class "Magento\Framework\Reflection\Test\Unit\DataObject"
+     * @codingStandardsIgnoreEnd
      */
     public function testGetSetterMethodNameInvalidAttribute()
     {
-        $class = new ClassReflection("\\Magento\\Framework\\Reflection\\Test\\Unit\\DataObject");
+        $class = new ClassReflection(\Magento\Framework\Reflection\Test\Unit\DataObject::class);
         $this->nameFinder->getSetterMethodName($class, 'InvalidAttribute');
     }
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessageRegExp /Property "ActivE" does not have corresponding setter in class (.*?)/
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessage Property "ActivE" does not have accessor method "setActivE" in class "Magento\Framework\Reflection\Test\Unit\DataObject"
+     * @codingStandardsIgnoreEnd
      */
     public function testGetSetterMethodNameWrongCamelCasedAttribute()
     {
-        $class = new ClassReflection("\\Magento\\Framework\\Reflection\\Test\\Unit\\DataObject");
+        $class = new ClassReflection(\Magento\Framework\Reflection\Test\Unit\DataObject::class);
         $this->nameFinder->getSetterMethodName($class, 'ActivE');
     }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Property "Property" does not have accessor method "getProperty" in class "className".
+     */
+    public function testFindAccessorMethodName()
+    {
+        $reflectionClass = $this->createMock(\Zend\Code\Reflection\ClassReflection::class);
+        $reflectionClass->expects($this->atLeastOnce())->method('hasMethod')->willReturn(false);
+        $reflectionClass->expects($this->atLeastOnce())->method('getName')->willReturn('className');
+
+        $this->nameFinder->findAccessorMethodName(
+            $reflectionClass,
+            'Property',
+            'getProperty',
+            'isProperty'
+        );
+    }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php
index 4e40fe6860586..dede06153259a 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php
@@ -9,31 +9,50 @@ class TestDataObject implements TestDataInterface
 {
     private $extensionAttributes;
 
+    /**
+     * TestDataObject constructor.
+     * @param null $extensionAttributes
+     */
     public function __construct($extensionAttributes = null)
     {
         $this->extensionAttributes = $extensionAttributes;
     }
 
+    /**
+     * @return string
+     */
     public function getId()
     {
         return '1';
     }
 
+    /**
+     * @return string
+     */
     public function getAddress()
     {
         return 'someAddress';
     }
 
+    /**
+     * @return string
+     */
     public function isDefaultShipping()
     {
         return 'true';
     }
 
+    /**
+     * @return string
+     */
     public function isRequiredBilling()
     {
         return 'false';
     }
 
+    /**
+     * @return \Magento\Framework\Api\ExtensionAttributesInterface|null
+     */
     public function getExtensionAttributes()
     {
         return $this->extensionAttributes;
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
index 71e0834e784c0..86a4693d9e5b6 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
@@ -6,25 +6,24 @@
 // @codingStandardsIgnoreStart
 namespace Magento\Framework\Reflection\Test\Unit;
 
-use Zend\Code\Reflection\ClassReflection;
 use Magento\Framework\Exception\SerializationException;
+use Magento\Framework\Reflection\Test\Unit\Fixture\TSample;
+use Magento\Framework\Reflection\TypeProcessor;
+use Zend\Code\Reflection\ClassReflection;
 
-/**
- * Type processor Test
- */
 class TypeProcessorTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Reflection\TypeProcessor
+     * @var TypeProcessor
      */
-    protected $_typeProcessor;
+    private $typeProcessor;
 
     /**
      * Set up helper.
      */
     protected function setUp()
     {
-        $this->_typeProcessor = new \Magento\Framework\Reflection\TypeProcessor();
+        $this->typeProcessor = new TypeProcessor();
     }
 
     /**
@@ -32,11 +31,11 @@ protected function setUp()
      */
     public function testGetTypesData()
     {
-        $this->_typeProcessor->setTypeData('typeA', ['dataA']);
-        $this->_typeProcessor->setTypeData('typeB', ['dataB']);
+        $this->typeProcessor->setTypeData('typeA', ['dataA']);
+        $this->typeProcessor->setTypeData('typeB', ['dataB']);
         $this->assertEquals(
             ['typeA' => ['dataA'], 'typeB' => ['dataB']],
-            $this->_typeProcessor->getTypesData()
+            $this->typeProcessor->getTypesData()
         );
     }
 
@@ -45,20 +44,20 @@ public function testGetTypesData()
      */
     public function testSetTypesData()
     {
-        $this->_typeProcessor->setTypeData('typeC', ['dataC']);
-        $this->assertEquals(['typeC' => ['dataC']], $this->_typeProcessor->getTypesData());
+        $this->typeProcessor->setTypeData('typeC', ['dataC']);
+        $this->assertEquals(['typeC' => ['dataC']], $this->typeProcessor->getTypesData());
         $typeData = ['typeA' => ['dataA'], 'typeB' => ['dataB']];
-        $this->_typeProcessor->setTypesData($typeData);
-        $this->assertEquals($typeData, $this->_typeProcessor->getTypesData());
+        $this->typeProcessor->setTypesData($typeData);
+        $this->assertEquals($typeData, $this->typeProcessor->getTypesData());
     }
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Data type "NonExistentType" is not declared.
+     * @expectedExceptionMessage The "NonExistentType" data type isn't declared. Verify the type and try again.
      */
     public function testGetTypeDataInvalidArgumentException()
     {
-        $this->_typeProcessor->getTypeData('NonExistentType');
+        $this->typeProcessor->getTypeData('NonExistentType');
     }
 
     /**
@@ -66,8 +65,8 @@ public function testGetTypeDataInvalidArgumentException()
      */
     public function testGetTypeData()
     {
-        $this->_typeProcessor->setTypeData('typeA', ['dataA']);
-        $this->assertEquals(['dataA'], $this->_typeProcessor->getTypeData('typeA'));
+        $this->typeProcessor->setTypeData('typeA', ['dataA']);
+        $this->assertEquals(['dataA'], $this->typeProcessor->getTypeData('typeA'));
     }
 
     /**
@@ -75,135 +74,138 @@ public function testGetTypeData()
      */
     public function testSetTypeDataArrayMerge()
     {
-        $this->_typeProcessor->setTypeData('typeA', ['dataA1']);
-        $this->_typeProcessor->setTypeData('typeA', ['dataA2']);
-        $this->_typeProcessor->setTypeData('typeA', ['dataA3']);
-        $this->_typeProcessor->setTypeData('typeA', [null]);
-        $this->assertEquals(['dataA1', 'dataA2', 'dataA3', null], $this->_typeProcessor->getTypeData('typeA'));
+        $this->typeProcessor->setTypeData('typeA', ['dataA1']);
+        $this->typeProcessor->setTypeData('typeA', ['dataA2']);
+        $this->typeProcessor->setTypeData('typeA', ['dataA3']);
+        $this->typeProcessor->setTypeData('typeA', [null]);
+        $this->assertEquals(
+            ['dataA1', 'dataA2', 'dataA3', null],
+            $this->typeProcessor->getTypeData('typeA')
+        );
     }
 
     public function testNormalizeType()
     {
-        $this->assertEquals('blah', $this->_typeProcessor->normalizeType('blah'));
-        $this->assertEquals('string', $this->_typeProcessor->normalizeType('str'));
-        $this->assertEquals('int', $this->_typeProcessor->normalizeType('integer'));
-        $this->assertEquals('boolean', $this->_typeProcessor->normalizeType('bool'));
-        $this->assertEquals('anyType', $this->_typeProcessor->normalizeType('mixed'));
+        $this->assertEquals('blah', $this->typeProcessor->normalizeType('blah'));
+        $this->assertEquals('string', $this->typeProcessor->normalizeType('str'));
+        $this->assertEquals('int', $this->typeProcessor->normalizeType('integer'));
+        $this->assertEquals('boolean', $this->typeProcessor->normalizeType('bool'));
+        $this->assertEquals('anyType', $this->typeProcessor->normalizeType('mixed'));
     }
 
     public function testIsTypeSimple()
     {
-        $this->assertTrue($this->_typeProcessor->isTypeSimple('string'));
-        $this->assertTrue($this->_typeProcessor->isTypeSimple('string[]'));
-        $this->assertTrue($this->_typeProcessor->isTypeSimple('int'));
-        $this->assertTrue($this->_typeProcessor->isTypeSimple('float'));
-        $this->assertTrue($this->_typeProcessor->isTypeSimple('double'));
-        $this->assertTrue($this->_typeProcessor->isTypeSimple('boolean'));
-        $this->assertFalse($this->_typeProcessor->isTypeSimple('blah'));
+        $this->assertTrue($this->typeProcessor->isTypeSimple('string'));
+        $this->assertTrue($this->typeProcessor->isTypeSimple('string[]'));
+        $this->assertTrue($this->typeProcessor->isTypeSimple('int'));
+        $this->assertTrue($this->typeProcessor->isTypeSimple('float'));
+        $this->assertTrue($this->typeProcessor->isTypeSimple('double'));
+        $this->assertTrue($this->typeProcessor->isTypeSimple('boolean'));
+        $this->assertFalse($this->typeProcessor->isTypeSimple('blah'));
     }
 
     public function testIsTypeAny()
     {
-        $this->assertTrue($this->_typeProcessor->isTypeAny('mixed'));
-        $this->assertTrue($this->_typeProcessor->isTypeAny('mixed[]'));
-        $this->assertFalse($this->_typeProcessor->isTypeAny('int'));
-        $this->assertFalse($this->_typeProcessor->isTypeAny('int[]'));
+        $this->assertTrue($this->typeProcessor->isTypeAny('mixed'));
+        $this->assertTrue($this->typeProcessor->isTypeAny('mixed[]'));
+        $this->assertFalse($this->typeProcessor->isTypeAny('int'));
+        $this->assertFalse($this->typeProcessor->isTypeAny('int[]'));
     }
 
     public function testIsArrayType()
     {
-        $this->assertFalse($this->_typeProcessor->isArrayType('string'));
-        $this->assertTrue($this->_typeProcessor->isArrayType('string[]'));
+        $this->assertFalse($this->typeProcessor->isArrayType('string'));
+        $this->assertTrue($this->typeProcessor->isArrayType('string[]'));
     }
 
     public function testIsValidTypeDeclaration()
     {
-        $this->assertTrue($this->_typeProcessor->isValidTypeDeclaration('Traversable')); // Interface
-        $this->assertTrue($this->_typeProcessor->isValidTypeDeclaration('stdObj')); // Class
-        $this->assertTrue($this->_typeProcessor->isValidTypeDeclaration('array'));
-        $this->assertTrue($this->_typeProcessor->isValidTypeDeclaration('callable'));
-        $this->assertTrue($this->_typeProcessor->isValidTypeDeclaration('self'));
-        $this->assertTrue($this->_typeProcessor->isValidTypeDeclaration('self'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('string'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('string[]'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('int'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('float'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('double'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('boolean'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('[]'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('mixed[]'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('stdObj[]'));
-        $this->assertFalse($this->_typeProcessor->isValidTypeDeclaration('Traversable[]'));
+        $this->assertTrue($this->typeProcessor->isValidTypeDeclaration('Traversable')); // Interface
+        $this->assertTrue($this->typeProcessor->isValidTypeDeclaration('stdObj')); // Class
+        $this->assertTrue($this->typeProcessor->isValidTypeDeclaration('array'));
+        $this->assertTrue($this->typeProcessor->isValidTypeDeclaration('callable'));
+        $this->assertTrue($this->typeProcessor->isValidTypeDeclaration('self'));
+        $this->assertTrue($this->typeProcessor->isValidTypeDeclaration('self'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('string'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('string[]'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('int'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('float'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('double'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('boolean'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('[]'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('mixed[]'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('stdObj[]'));
+        $this->assertFalse($this->typeProcessor->isValidTypeDeclaration('Traversable[]'));
     }
 
     public function getArrayItemType()
     {
-        $this->assertEquals('string', $this->_typeProcessor->getArrayItemType('str[]'));
-        $this->assertEquals('string', $this->_typeProcessor->getArrayItemType('string[]'));
-        $this->assertEquals('integer', $this->_typeProcessor->getArrayItemType('int[]'));
-        $this->assertEquals('boolean', $this->_typeProcessor->getArrayItemType('bool[]'));
-        $this->assertEquals('any', $this->_typeProcessor->getArrayItemType('mixed[]'));
+        $this->assertEquals('string', $this->typeProcessor->getArrayItemType('str[]'));
+        $this->assertEquals('string', $this->typeProcessor->getArrayItemType('string[]'));
+        $this->assertEquals('integer', $this->typeProcessor->getArrayItemType('int[]'));
+        $this->assertEquals('boolean', $this->typeProcessor->getArrayItemType('bool[]'));
+        $this->assertEquals('any', $this->typeProcessor->getArrayItemType('mixed[]'));
     }
 
     public function testTranslateTypeName()
     {
         $this->assertEquals(
             'TestModule1V1EntityItem',
-            $this->_typeProcessor->translateTypeName(\Magento\TestModule1\Service\V1\Entity\Item::class)
+            $this->typeProcessor->translateTypeName(\Magento\TestModule1\Service\V1\Entity\Item::class)
         );
         $this->assertEquals(
             'TestModule3V1EntityParameter[]',
-            $this->_typeProcessor->translateTypeName('\Magento\TestModule3\Service\V1\Entity\Parameter[]')
+            $this->typeProcessor->translateTypeName('\Magento\TestModule3\Service\V1\Entity\Parameter[]')
         );
     }
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid parameter type "\Magento\TestModule3\V1\Parameter[]".
+     * @expectedExceptionMessage The "\Magento\TestModule3\V1\Parameter[]" parameter type is invalid. Verify the parameter and try again.
      */
     public function testTranslateTypeNameInvalidArgumentException()
     {
-        $this->_typeProcessor->translateTypeName('\Magento\TestModule3\V1\Parameter[]');
+        $this->typeProcessor->translateTypeName('\Magento\TestModule3\V1\Parameter[]');
     }
 
     public function testTranslateArrayTypeName()
     {
-        $this->assertEquals('ArrayOfComplexType', $this->_typeProcessor->translateArrayTypeName('complexType'));
+        $this->assertEquals('ArrayOfComplexType', $this->typeProcessor->translateArrayTypeName('complexType'));
     }
 
     public function testProcessSimpleTypeIntToString()
     {
         $value = 1;
         $type = 'string';
-        $this->assertSame('1', $this->_typeProcessor->processSimpleAndAnyType($value, $type));
+        $this->assertSame('1', $this->typeProcessor->processSimpleAndAnyType($value, $type));
     }
 
     public function testProcessSimpleTypeStringToInt()
     {
         $value = '1';
         $type = 'int';
-        $this->assertSame(1, $this->_typeProcessor->processSimpleAndAnyType($value, $type));
+        $this->assertSame(1, $this->typeProcessor->processSimpleAndAnyType($value, $type));
     }
 
     public function testProcessSimpleTypeMixed()
     {
         $value = 1;
         $type = 'mixed';
-        $this->assertSame(1, $this->_typeProcessor->processSimpleAndAnyType($value, $type));
+        $this->assertSame(1, $this->typeProcessor->processSimpleAndAnyType($value, $type));
     }
 
     public function testProcessSimpleTypeIntArrayToStringArray()
     {
         $value = [1, 2, 3, 4, 5];
         $type = 'string[]';
-        $this->assertSame(['1', '2', '3', '4', '5'], $this->_typeProcessor->processSimpleAndAnyType($value, $type));
+        $this->assertSame(['1', '2', '3', '4', '5'], $this->typeProcessor->processSimpleAndAnyType($value, $type));
     }
 
     public function testProcessSimpleTypeStringArrayToIntArray()
     {
         $value = ['1', '2', '3', '4', '5'];
         $type = 'int[]';
-        $this->assertSame([1, 2, 3, 4, 5], $this->_typeProcessor->processSimpleAndAnyType($value, $type));
+        $this->assertSame([1, 2, 3, 4, 5], $this->typeProcessor->processSimpleAndAnyType($value, $type));
     }
 
     /**
@@ -212,11 +214,15 @@ public function testProcessSimpleTypeStringArrayToIntArray()
     public function testProcessSimpleTypeException($value, $type)
     {
         $this->expectException(
-            SerializationException::class, 'Invalid type for value: "' . $value . '". Expected Type: "' . $type . '"'
+            SerializationException::class,
+            'Invalid type for value: "' . $value . '". Expected Type: "' . $type . '"'
         );
-        $this->_typeProcessor->processSimpleAndAnyType($value, $type);
+        $this->typeProcessor->processSimpleAndAnyType($value, $type);
     }
 
+    /**
+     * @return array
+     */
     public static function processSimpleTypeExceptionProvider()
     {
         return [
@@ -227,37 +233,125 @@ public static function processSimpleTypeExceptionProvider()
 
     /**
      * @expectedException \Magento\Framework\Exception\SerializationException
-     * @expectedExceptionMessage Invalid type for value: "integer". Expected Type: "int[]".
+     * @expectedExceptionMessage The "integer" value's type is invalid. The "int[]" type was expected. Verify and try again.
      */
     public function testProcessSimpleTypeInvalidType()
     {
         $value = 1;
         $type = 'int[]';
-        $this->_typeProcessor->processSimpleAndAnyType($value, $type);
+        $this->typeProcessor->processSimpleAndAnyType($value, $type);
     }
 
     /**
      * @expectedException \LogicException
      * @expectedExceptionMessageRegExp /@param annotation is incorrect for the parameter "name" \w+/
      */
-    public function testGetParamType()
+    public function testGetParamTypeWithIncorrectAnnotation()
     {
-        $class = new ClassReflection(\Magento\Framework\Reflection\Test\Unit\DataObject::class);
+        $class = new ClassReflection(DataObject::class);
         $methodReflection = $class->getMethod('setName');
         $paramsReflection = $methodReflection->getParameters();
-        $this->_typeProcessor->getParamType($paramsReflection[0]);
+        $this->typeProcessor->getParamType($paramsReflection[0]);
     }
 
-    public function testGetParameterDescription()
+    /**
+     * Checks a case for different array param types.
+     *
+     * @param string $methodName
+     * @param string $type
+     * @dataProvider arrayParamTypeDataProvider
+     */
+    public function testGetArrayParamType(string $methodName, string $type)
     {
-        $class = new ClassReflection(\Magento\Framework\Reflection\Test\Unit\DataObject::class);
-        $methodReflection = $class->getMethod('setName');
+        $class = new ClassReflection(DataObject::class);
+        $methodReflection = $class->getMethod($methodName);
+        $params = $methodReflection->getParameters();
+        $this->assertEquals($type, $this->typeProcessor->getParamType(array_pop($params)));
+    }
+
+    /**
+     * Get list of methods with expected param types.
+     *
+     * @return array
+     */
+    public function arrayParamTypeDataProvider()
+    {
+        return [
+            ['method name' => 'addData', 'type' => 'array[]'],
+            ['method name' => 'addObjectList', 'type' => 'TSampleInterface[]']
+        ];
+    }
+
+    /**
+     * Checks a case when method param has additional description.
+     *
+     * @param string $methodName
+     * @param array $descriptions
+     * @dataProvider methodParamsDataProvider
+     */
+    public function testGetParameterDescription(string $methodName, array $descriptions)
+    {
+        $class = new ClassReflection(DataObject::class);
+        $methodReflection = $class->getMethod($methodName);
         $paramsReflection = $methodReflection->getParameters();
-        $this->assertEquals('Name of the attribute', $this->_typeProcessor->getParamDescription($paramsReflection[0]));
+        foreach ($paramsReflection as $paramReflection) {
+            $description = array_shift($descriptions);
+            $this->assertEquals(
+                $description,
+                $this->typeProcessor->getParamDescription($paramReflection)
+            );
+        }
+    }
+
+    /**
+     * Gets list of method names with params and their descriptions.
+     *
+     * @return array
+     */
+    public function methodParamsDataProvider()
+    {
+        return [
+            ['method name' => 'setName', 'descriptions' => ['Name of the attribute']],
+            ['method name' => 'setData', 'descriptions' => ['Key is used as index', null]],
+        ];
     }
 
     public function testGetOperationName()
     {
-        $this->assertEquals("resNameMethodName", $this->_typeProcessor->getOperationName("resName", "methodName"));
+        $this->assertEquals(
+            "resNameMethodName",
+            $this->typeProcessor->getOperationName("resName", "methodName")
+        );
+    }
+
+    /**
+     * Checks a case when method has only `@inheritdoc` annotation.
+     */
+    public function testGetReturnTypeWithInheritDocBlock()
+    {
+        $expected = [
+            'type' => 'string',
+            'isRequired' => true,
+            'description' => null,
+            'parameterCount' => 0
+        ];
+
+        $classReflection = new ClassReflection(TSample::class);
+        $methodReflection = $classReflection->getMethod('getPropertyName');
+
+        self::assertEquals($expected, $this->typeProcessor->getGetterReturnType($methodReflection));
+    }
+
+    /**
+     * Checks a case when method and parent interface don't have `@return` annotation.
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Method's return type must be specified using @return annotation. See Magento\Framework\Reflection\Test\Unit\Fixture\TSample::getName()
+     */
+    public function testGetReturnTypeWithoutReturnTag()
+    {
+        $classReflection = new ClassReflection(TSample::class);
+        $methodReflection = $classReflection->getMethod('getName');
+        $this->typeProcessor->getGetterReturnType($methodReflection);
     }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
index 5d6054056d35e..d7206032c68c7 100644
--- a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Reflection;
 
 use Magento\Framework\Exception\SerializationException;
 use Magento\Framework\Phrase;
 use Zend\Code\Reflection\ClassReflection;
+use Zend\Code\Reflection\DocBlock\Tag\ParamTag;
+use Zend\Code\Reflection\DocBlock\Tag\ReturnTag;
 use Zend\Code\Reflection\DocBlockReflection;
 use Zend\Code\Reflection\MethodReflection;
 use Zend\Code\Reflection\ParameterReflection;
@@ -16,6 +19,7 @@
  * Type processor of config reader properties
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) this suppress MUST be removed after removing deprecated methods.
  */
 class TypeProcessor
 {
@@ -97,7 +101,9 @@ public function setTypesData($typesData)
     public function getTypeData($typeName)
     {
         if (!isset($this->_types[$typeName])) {
-            throw new \InvalidArgumentException(sprintf('Data type "%s" is not declared.', $typeName));
+            throw new \InvalidArgumentException(
+                sprintf('The "%s" data type isn\'t declared. Verify the type and try again.', $typeName)
+            );
         }
         return $this->_types[$typeName];
     }
@@ -135,7 +141,10 @@ public function register($type)
             $typeSimple = $this->getArrayItemType($type);
             if (!(class_exists($typeSimple) || interface_exists($typeSimple))) {
                 throw new \LogicException(
-                    sprintf('Class "%s" does not exist. Please note that namespace must be specified.', $type)
+                    sprintf(
+                        'The "%s" class doesn\'t exist and the namespace must be specified. Verify and try again.',
+                        $type
+                    )
                 );
             }
             $complexTypeName = $this->translateTypeName($type);
@@ -165,7 +174,7 @@ protected function _processComplexType($class)
         } else {
             if (!(class_exists($class) || interface_exists($class))) {
                 throw new \InvalidArgumentException(
-                    sprintf('Could not load the "%s" class as parameter type.', $class)
+                    sprintf('The "%s" class couldn\'t load as a parameter type.', $class)
                 );
             }
             $reflection = new ClassReflection($class);
@@ -275,22 +284,7 @@ protected function dataObjectGetterDescriptionToFieldDescription($shortDescripti
      */
     public function getGetterReturnType($methodReflection)
     {
-        $methodDocBlock = $methodReflection->getDocBlock();
-        if (!$methodDocBlock) {
-            throw new \InvalidArgumentException(
-                "Each getter must have description with @return annotation. "
-                . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodReflection->getName()}()"
-            );
-        }
-        $returnAnnotations = $methodDocBlock->getTags('return');
-        if (empty($returnAnnotations)) {
-            throw new \InvalidArgumentException(
-                "Getter return type must be specified using @return annotation. "
-                . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodReflection->getName()}()"
-            );
-        }
-        /** @var \Zend\Code\Reflection\DocBlock\Tag\ReturnTag $returnAnnotation */
-        $returnAnnotation = current($returnAnnotations);
+        $returnAnnotation = $this->getMethodReturnAnnotation($methodReflection);
         $types = $returnAnnotation->getTypes();
         $returnType = current($types);
         $nullable = in_array('null', $types);
@@ -362,7 +356,7 @@ public function isTypeSimple($type)
                 self::NORMALIZED_INT_TYPE,
                 self::NORMALIZED_FLOAT_TYPE,
                 self::NORMALIZED_DOUBLE_TYPE,
-                self::NORMALIZED_BOOLEAN_TYPE
+                self::NORMALIZED_BOOLEAN_TYPE,
             ]
         );
     }
@@ -438,7 +432,9 @@ public function translateTypeName($class)
 
             return ucfirst($moduleNamespace . $moduleName . implode('', $typeNameParts));
         }
-        throw new \InvalidArgumentException(sprintf('Invalid parameter type "%s".', $class));
+        throw new \InvalidArgumentException(
+            sprintf('The "%s" parameter type is invalid. Verify the parameter and try again.', $class)
+        );
     }
 
     /**
@@ -477,7 +473,8 @@ public function processSimpleAndAnyType($value, $type)
                 if ($value !== null && !settype($value[$key], $arrayItemType)) {
                     throw new SerializationException(
                         new Phrase(
-                            'Invalid type for value: "%value". Expected Type: "%type".',
+                            'The "%value" value\'s type is invalid. The "%type" type was expected. '
+                            . 'Verify and try again.',
                             ['value' => $value, 'type' => $type]
                         )
                     );
@@ -489,7 +486,7 @@ public function processSimpleAndAnyType($value, $type)
             if ($value !== null && !$this->isTypeAny($type) && !$this->setType($value, $type)) {
                 throw new SerializationException(
                     new Phrase(
-                        'Invalid type for value: "%value". Expected Type: "%type".',
+                        'The "%value" value\'s type is invalid. The "%type" type was expected. Verify and try again.',
                         ['value' => (string)$value, 'type' => $type]
                     )
                 );
@@ -497,7 +494,7 @@ public function processSimpleAndAnyType($value, $type)
         } elseif (!$this->isTypeAny($type)) {
             throw new SerializationException(
                 new Phrase(
-                    'Invalid type for value: "%value". Expected Type: "%type".',
+                    'The "%value" value\'s type is invalid. The "%type" type was expected. Verify and try again.',
                     ['value' => gettype($value), 'type' => $type]
                 )
             );
@@ -526,35 +523,24 @@ public function getParamType(ParameterReflection $param)
         }
         if ($type == 'array') {
             // try to determine class, if it's array of objects
-            $docBlock = $param->getDeclaringFunction()->getDocBlock();
-            $pattern = "/\@param\s+([\w\\\_]+\[\])\s+\\\${$param->getName()}\n/";
-            $matches = [];
-            if (preg_match($pattern, $docBlock->getContents(), $matches)) {
-                return $matches[1];
-            }
-            return "{$type}[]";
+            $paramDocBlock = $this->getParamDocBlockTag($param);
+            $paramTypes = $paramDocBlock->getTypes();
+            $paramType = array_shift($paramTypes);
+            return strpos($paramType, '[]') !== false ? $paramType : "{$paramType}[]";
         }
         return $type;
     }
 
     /**
-     * Get parameter description
+     * Gets method parameter description.
      *
      * @param ParameterReflection $param
      * @return string|null
      */
     public function getParamDescription(ParameterReflection $param)
     {
-        $docBlock = $param->getDeclaringFunction()->getDocBlock();
-        $docBlockLines = explode("\n", $docBlock->getContents());
-        $pattern = "/\@param\s+([\w\\\_\[\]\|]+)\s+(\\\${$param->getName()})\s(.*)/";
-        $matches = [];
-
-        foreach ($docBlockLines as $line) {
-            if (preg_match($pattern, $line, $matches)) {
-                return $matches[3];
-            }
-        }
+        $paramDocBlock = $this->getParamDocBlockTag($param);
+        return $paramDocBlock->getDescription();
     }
 
     /**
@@ -708,4 +694,70 @@ private function getNormalizedType($type)
         }
         return $type;
     }
+
+    /**
+     * Parses `return` annotation from reflection method.
+     *
+     * @param MethodReflection $methodReflection
+     * @return ReturnTag
+     * @throws \InvalidArgumentException if doc block is empty or `@return` annotation doesn't exist
+     */
+    private function getMethodReturnAnnotation(MethodReflection $methodReflection)
+    {
+        $methodName = $methodReflection->getName();
+        $returnAnnotations = $this->getReturnFromDocBlock($methodReflection);
+        if (empty($returnAnnotations)) {
+            // method can inherit doc block from implemented interface, like for interceptors
+            $implemented = $methodReflection->getDeclaringClass()->getInterfaces();
+            /** @var ClassReflection $parentClassReflection */
+            foreach ($implemented as $parentClassReflection) {
+                if ($parentClassReflection->hasMethod($methodName)) {
+                    $returnAnnotations = $this->getReturnFromDocBlock(
+                        $parentClassReflection->getMethod($methodName)
+                    );
+                    break;
+                }
+            }
+            // throw an exception if even implemented interface doesn't have return annotations
+            if (empty($returnAnnotations)) {
+                throw new \InvalidArgumentException(
+                    "Method's return type must be specified using @return annotation. "
+                    . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodName}()"
+                );
+            }
+        }
+        return $returnAnnotations;
+    }
+
+    /**
+     * Parses `return` annotation from doc block.
+     *
+     * @param MethodReflection $methodReflection
+     * @return ReturnTag
+     */
+    private function getReturnFromDocBlock(MethodReflection $methodReflection)
+    {
+        $methodDocBlock = $methodReflection->getDocBlock();
+        if (!$methodDocBlock) {
+            throw new \InvalidArgumentException(
+                "Each method must have a doc block. "
+                . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodReflection->getName()}()"
+            );
+        }
+        return current($methodDocBlock->getTags('return'));
+    }
+
+    /**
+     * Gets method's param doc block.
+     *
+     * @param ParameterReflection $param
+     * @return ParamTag
+     */
+    private function getParamDocBlockTag(ParameterReflection $param): ParamTag
+    {
+        $docBlock = $param->getDeclaringFunction()
+            ->getDocBlock();
+        $paramsTag = $docBlock->getTags('param');
+        return $paramsTag[$param->getPosition()];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Registry.php b/lib/internal/Magento/Framework/Registry.php
index 825d550fc1507..d1bc227437d5f 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/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 08131b2cccea3..ae45e29f38911 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -157,7 +157,7 @@ public function getConfig()
         $customConfigFiles = $this->fileSource->getFiles($this->design->getDesignTheme(), self::CONFIG_FILE_NAME);
         foreach ($customConfigFiles as $file) {
             /** @var $fileReader \Magento\Framework\Filesystem\File\Read */
-            $fileReader = $this->readFactory->create($file->getFileName(), DriverPool::FILE);
+            $fileReader = $this->readFactory->create($file->getFilename(), DriverPool::FILE);
             $config = $fileReader->readAll($file->getName());
             $distributedConfig .= str_replace(
                 ['%config%', '%context%'],
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
index 098782b4e814e..897b67d8d46ec 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
 use Magento\Framework\Search\AdapterInterface;
 use Magento\Framework\Search\RequestInterface;
@@ -15,6 +14,8 @@
 /**
  * MySQL Search Adapter
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Adapter implements AdapterInterface
@@ -70,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @throws \LogicException
      */
     public function query(RequestInterface $request)
@@ -105,6 +106,8 @@ private function getDocuments(Table $table)
     }
 
     /**
+     * Get connection.
+     *
      * @return false|\Magento\Framework\DB\Adapter\AdapterInterface
      */
     private function getConnection()
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
index 47d991274b9e0..4a5802dd44e04 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php
@@ -15,6 +15,10 @@
 use Magento\Framework\Search\RequestInterface;
 
 /**
+ * MySQL search aggregation builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  * @api
  */
 class Builder
@@ -66,6 +70,8 @@ public function __construct(
     }
 
     /**
+     * Build aggregations.
+     *
      * @param RequestInterface $request
      * @param Table $documentsTable
      * @param array $documents
@@ -77,6 +83,8 @@ public function build(RequestInterface $request, Table $documentsTable, array $d
     }
 
     /**
+     * Process aggregations.
+     *
      * @param RequestInterface $request
      * @param Table $documentsTable
      * @param array $documents
@@ -102,7 +110,7 @@ private function processAggregations(RequestInterface $request, Table $documents
     }
 
     /**
-     * Extract document ids
+     * Extract document ids.
      *
      * @param array $documents
      * @return array
@@ -113,7 +121,7 @@ private function extractDocumentIds(array $documents)
     }
 
     /**
-     * Get document ids
+     * Get document ids.
      *
      * @param Table $documentsTable
      * @return array
@@ -128,7 +136,7 @@ private function getDocumentIds(Table $documentsTable)
     }
 
     /**
-     * Get Connection
+     * Get Connection.
      *
      * @return AdapterInterface
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
index 90220676e0068..4fa2474d2258e 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php
@@ -11,12 +11,16 @@
 use Magento\Framework\Search\Request\Dimension;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder\BucketInterface
+ * MySQL search aggregation bucket builder.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface BucketInterface
 {
     /**
+     * Build bucket.
+     *
      * @param DataProviderInterface $dataProvider
      * @param Dimension[] $dimensions
      * @param RequestBucketInterface $bucket
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
index cba29ad6287d3..844cfc9f8741d 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
 
+/**
+ * MySQL search aggregation container builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Container
 {
     /**
@@ -21,6 +27,8 @@ public function __construct(array $buckets)
     }
 
     /**
+     * Get bucket by type.
+     *
      * @param string $bucketType
      * @return BucketInterface
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
index 481b2252dbf69..46828ab7a8c73 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php
@@ -12,6 +12,12 @@
 use Magento\Framework\Search\Request\Aggregation\DynamicBucket;
 use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
 
+/**
+ * MySQL search dynamic aggregation builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Dynamic implements BucketInterface
 {
     /**
@@ -37,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         DataProviderInterface $dataProvider,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
index 840f94622183a..e4cdb04052ef2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php
@@ -7,6 +7,12 @@
 
 use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
 
+/**
+ * MySQL search aggregation metrics builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Metrics
 {
     /**
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
index 29fc6806b50e7..aced57c100130 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php
@@ -14,6 +14,12 @@
 use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
 use Magento\Framework\Translate\AdapterInterface;
 
+/**
+ * MySQL search aggregation range builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Range implements BucketInterface
 {
     const GREATER_THAN = '>=';
@@ -46,7 +52,7 @@ public function __construct(Metrics $metricsBuilder, ResourceConnection $resourc
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         DataProviderInterface $dataProvider,
@@ -70,6 +76,8 @@ public function build(
     }
 
     /**
+     * Generate case.
+     *
      * @param Select $select
      * @param AggregationRange[] $ranges
      * @return Select
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
index ed3018756cdd6..547526be43ccd 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
@@ -6,10 +6,15 @@
 namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
 
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
 
+/**
+ * MySQL search aggregation term builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Term implements BucketInterface
 {
     /**
@@ -26,7 +31,7 @@ public function __construct(Metrics $metricsBuilder)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         DataProviderInterface $dataProvider,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
index 6a817bcbddf82..565b5eeef3351 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php
@@ -6,6 +6,10 @@
 namespace Magento\Framework\Search\Adapter\Mysql\Aggregation;
 
 /**
+ * MySQL search data provider container.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  * @api
  */
 class DataProviderContainer
@@ -24,6 +28,8 @@ public function __construct(array $dataProviders)
     }
 
     /**
+     * Get data provider by index name.
+     *
      * @param string $indexName
      * @return DataProviderInterface
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
index b18269335bc6f..c251265c694d2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php
@@ -11,8 +11,10 @@
 use Magento\Framework\Search\Request\Dimension;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface
+ * MySQL search data provider.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface DataProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
index ed5640d42274f..ba41a535f45c9 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
@@ -8,6 +8,12 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Dynamic\IntervalInterface;
 
+/**
+ * MySQL search aggregation interval.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Interval implements IntervalInterface
 {
     /**
@@ -41,7 +47,7 @@ private function getValueFiled()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function load($limit, $offset = null, $lower = null, $upper = null)
@@ -64,7 +70,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function loadPrevious($data, $index, $lower = null)
@@ -86,7 +92,7 @@ public function loadPrevious($data, $index, $lower = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function loadNext($data, $rightIndex, $upper = null)
@@ -124,6 +130,8 @@ public function loadNext($data, $rightIndex, $upper = null)
     }
 
     /**
+     * Convert array values to float.
+     *
      * @param array $prices
      * @return array
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
index 4d255705bf7df..756d9edc6fbe1 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/AggregationFactory.php
@@ -7,6 +7,9 @@
 
 /**
  * Aggregation Factory
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class AggregationFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
index 41d6b14b6a477..e56559563c35a 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
@@ -9,7 +9,11 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
+ * MySQL search condition manager
+ *
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class ConditionManager
 {
@@ -30,6 +34,8 @@ public function __construct(ResourceConnection $resource)
     }
 
     /**
+     * Wrap query with parentheses.
+     *
      * @param string $query
      * @return string
      */
@@ -41,6 +47,8 @@ public function wrapBrackets($query)
     }
 
     /**
+     * Combine multiple queries.
+     *
      * @param string[] $queries
      * @param string $unionOperator
      * @return string
@@ -54,6 +62,8 @@ public function combineQueries(array $queries, $unionOperator)
     }
 
     /**
+     * Generate query condition.
+     *
      * @param string $field
      * @param string $operator
      * @param mixed $value
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
index 3ca0e94852a5e..4e8854fad353a 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/DocumentFactory.php
@@ -13,7 +13,10 @@
 
 /**
  * Document Factory
+ *
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class DocumentFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
index 72495e68a26ff..0a340e7f76dc0 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
@@ -6,6 +6,11 @@
 
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
+/**
+ * @inheritdoc
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Field implements FieldInterface
 {
     /**
@@ -36,6 +41,8 @@ public function __construct($column, $attributeId = null, $type = self::TYPE_FUL
     }
 
     /**
+     * Get column.
+     *
      * @return string
      */
     public function getColumn()
@@ -44,6 +51,8 @@ public function getColumn()
     }
 
     /**
+     * Get attribute ID.
+     *
      * @return int|null
      */
     public function getAttributeId()
@@ -52,6 +61,8 @@ public function getAttributeId()
     }
 
     /**
+     * Get type.
+     *
      * @return int
      */
     public function getType()
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
index 9a3c55965740e..066d1832aefbf 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
@@ -7,7 +7,11 @@
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
 /**
+ * MySQL search field factory.
+ *
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class FieldFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
index 5f4e0027a8508..7dc74f39709f9 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
@@ -7,8 +7,10 @@
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface
+ * MySQL search field.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface FieldInterface
 {
@@ -16,19 +18,22 @@ interface FieldInterface
     const TYPE_FULLTEXT = 2;
 
     /**
-     * Get type of index
+     * Get type of index.
+     *
      * @return int
      */
     public function getType();
 
     /**
-     * Get ID of attribute
+     * Get ID of attribute.
+     *
      * @return int
      */
     public function getAttributeId();
 
     /**
-     * Get field name
+     * Get field nam.
+     *
      * @return string
      */
     public function getColumn();
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
index 5146177783ae2..908d6ccc50746 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Resolver.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
+/**
+ * @inheritdoc
+ */
 class Resolver implements ResolverInterface
 {
     /**
@@ -21,7 +24,7 @@ public function __construct(FieldFactory $fieldFactory)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resolve(array $fields)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
index f275c4f1b1c14..5455b91d73020 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/ResolverInterface.php
@@ -6,13 +6,15 @@
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface
+ * MySQL search field resolver.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface ResolverInterface
 {
     /**
-     * Resolve field
+     * Resolve field.
      *
      * @param array $fields
      * @return FieldInterface[]
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
index 80074ffc5e2b9..ce02bef244fbb 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder.php
@@ -15,6 +15,7 @@
 use Magento\Framework\Search\Request\Query\BoolExpression;
 
 /**
+ * @inheritdoc
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Builder implements BuilderInterface
@@ -58,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(RequestFilterInterface $filter, $conditionType)
     {
@@ -66,6 +67,8 @@ public function build(RequestFilterInterface $filter, $conditionType)
     }
 
     /**
+     * Process filter.
+     *
      * @param RequestFilterInterface $filter
      * @param bool $isNegation
      * @return string
@@ -87,6 +90,8 @@ private function processFilter(RequestFilterInterface $filter, $isNegation)
     }
 
     /**
+     * Process boolean filter.
+     *
      * @param RequestFilterInterface|\Magento\Framework\Search\Request\Filter\Bool $filter
      * @param bool $isNegation
      * @return string
@@ -111,6 +116,8 @@ private function processBoolFilter(RequestFilterInterface $filter, $isNegation)
     }
 
     /**
+     * Build filters.
+     *
      * @param \Magento\Framework\Search\Request\FilterInterface[] $filters
      * @param string $unionOperator
      * @param bool $isNegation
@@ -127,6 +134,8 @@ private function buildFilters(array $filters, $unionOperator, $isNegation)
     }
 
     /**
+     * Check if condition type is 'negative'.
+     *
      * @param string $conditionType
      * @return bool
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
index 787866a2bca38..6f8b63955a0c1 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/FilterInterface.php
@@ -8,12 +8,16 @@
 use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\Builder\FilterInterface
+ * MySQL search filter builder.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface FilterInterface
 {
     /**
+     * Build filter.
+     *
      * @param RequestFilterInterface $filter
      * @param bool $isNegation
      * @return string
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
index d4ee9542c5934..d14bfdcb548d3 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Range.php
@@ -9,6 +9,12 @@
 use Magento\Framework\Search\Request\Filter\Range as RangeFilterRequest;
 use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
 
+/**
+ * Range filter builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Range implements FilterInterface
 {
     const CONDITION_PART_GREATER_THAN = '>=';
@@ -31,7 +37,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function buildFilter(
         RequestFilterInterface $filter,
@@ -48,6 +54,8 @@ public function buildFilter(
     }
 
     /**
+     * Get left condition filter part.
+     *
      * @param RequestFilterInterface|RangeFilterRequest $filter
      * @param bool $isNegation
      * @return string
@@ -62,6 +70,8 @@ private function getLeftConditionPart(RequestFilterInterface $filter, $isNegatio
     }
 
     /**
+     * Get right condition filter part.
+     *
      * @param RequestFilterInterface|RangeFilterRequest $filter
      * @param bool $isNegation
      * @return string
@@ -76,6 +86,8 @@ private function getRightConditionPart(RequestFilterInterface $filter, $isNegati
     }
 
     /**
+     * Get filter part.
+     *
      * @param string $field
      * @param string $operator
      * @param string $value
@@ -89,6 +101,8 @@ private function getPart($field, $operator, $value)
     }
 
     /**
+     * Get condition union operator.
+     *
      * @param bool $isNegation
      * @return string
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
index 3ac755de2b8a3..c89ef50f3cb35 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Term.php
@@ -8,6 +8,12 @@
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
 
+/**
+ * Term filter builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Term implements FilterInterface
 {
     const CONDITION_OPERATOR_EQUALS = '=';
@@ -30,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function buildFilter(
         RequestFilterInterface $filter,
@@ -46,6 +52,8 @@ public function buildFilter(
     }
 
     /**
+     * Get condition operator.
+     *
      * @param string|array $value
      * @param bool $isNegation
      * @return string
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
index 308d1d564301d..9a2776ac20b2c 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Builder/Wildcard.php
@@ -7,6 +7,12 @@
 
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 
+/**
+ * Wildcard filter builder.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class Wildcard implements FilterInterface
 {
     const CONDITION_LIKE = 'LIKE';
@@ -27,7 +33,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function buildFilter(
         \Magento\Framework\Search\Request\FilterInterface $filter,
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
index ec3b88ad24507..3da989333d668 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/BuilderInterface.php
@@ -8,12 +8,16 @@
 use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\BuilderInterface
+ * MySQL search filter builder.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface BuilderInterface
 {
     /**
+     * Buil filter.
+     *
      * @param RequestFilterInterface $filter
      * @param string $conditionType
      * @return string
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
index a8bb8e255f2cb..32d134cfe8d6d 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/Preprocessor.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Request\FilterInterface;
 
+/**
+ * @inheritdoc
+ */
 class Preprocessor implements PreprocessorInterface
 {
     /**
@@ -24,7 +27,7 @@ public function __construct(ConditionManager $conditionManager)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(FilterInterface $filter, $isNegation, $query)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
index 430b775337b7f..eb0bbc6f3b563 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Filter/PreprocessorInterface.php
@@ -8,12 +8,16 @@
 use Magento\Framework\Search\Request\FilterInterface;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface
+ * MySQL search filter pre-processor.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface PreprocessorInterface
 {
     /**
+     * Process filter.
+     *
      * @param FilterInterface $filter
      * @param bool $isNegation
      * @param string $query
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
index 73c20406f35df..fbd35455c2294 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/IndexBuilderInterface.php
@@ -10,6 +10,9 @@
 
 /**
  * Build base Query for Index
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface IndexBuilderInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
index fb4ff5d298c12..e97a6690dbcc2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
@@ -22,8 +22,11 @@
 
 /**
  * Mapper class. Maps library request to specific adapter dependent query
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class Mapper
 {
@@ -344,6 +347,8 @@ private function processFilterQuery(
     }
 
     /**
+     * Add match queries to select.
+     *
      * @param RequestInterface $request
      * @param QueryContainer $queryContainer
      * @param ScoreBuilder $scoreBuilder
@@ -380,6 +385,8 @@ private function addDerivedQueries(
     }
 
     /**
+     * Get connection.
+     *
      * @return false|\Magento\Framework\DB\Adapter\AdapterInterface
      */
     private function getConnection()
@@ -388,6 +395,8 @@ private function getConnection()
     }
 
     /**
+     * Add match queries to select.
+     *
      * @param RequestInterface $request
      * @param Select $select
      * @param IndexBuilderInterface $indexBuilder
@@ -424,6 +433,8 @@ private function addMatchQueries(
     }
 
     /**
+     * Join previous result to select.
+     *
      * @param Select $query
      * @param Table $previousResultTable
      * @param ScoreBuilder $scoreBuilder
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index 8e3758817adf0..ea165e0cf9fcc 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -15,11 +15,18 @@
 use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 
 /**
+ * MySQL search query match.
+ *
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class Match implements QueryInterface
 {
-    const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
+    /**
+     * @var string
+     */
+    const SPECIAL_CHARACTERS = '+~/\\<>\'":*$#@()!,.?`=%&^';
 
     const MINIMAL_CHARACTER_LENGTH = 3;
 
@@ -69,7 +76,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         ScoreBuilder $scoreBuilder,
@@ -113,6 +120,8 @@ public function build(
     }
 
     /**
+     * Prepare query value for build function.
+     *
      * @param string $queryValue
      * @param string $conditionType
      * @return string
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
index a2446264d48d7..6796a1f995e4f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/QueryInterface.php
@@ -8,12 +8,16 @@
 use Magento\Framework\Search\Adapter\Mysql\ScoreBuilder;
 
 /**
- * Interface \Magento\Framework\Search\Adapter\Mysql\Query\Builder\QueryInterface
+ * MySQL search query builder.
  *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 interface QueryInterface
 {
     /**
+     * Build query.
+     *
      * @param \Magento\Framework\Search\Adapter\Mysql\ScoreBuilder $scoreBuilder
      * @param \Magento\Framework\DB\Select $select
      * @param \Magento\Framework\Search\Request\QueryInterface $query
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
index b694cd48a07af..6ed3338c040e2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
@@ -10,6 +10,12 @@
 
 // @codeCoverageIgnore
 
+/**
+ * MySQL search query match container.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class MatchContainer
 {
     /**
@@ -34,6 +40,8 @@ public function __construct(QueryInterface $request, $conditionType)
     }
 
     /**
+     * Get request.
+     *
      * @return QueryInterface
      */
     public function getRequest()
@@ -42,6 +50,8 @@ public function getRequest()
     }
 
     /**
+     * Get condition type.
+     *
      * @return string
      */
     public function getConditionType()
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
index ba103e060ae7c..cb10de7bdcbbc 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainerFactory.php
@@ -7,6 +7,9 @@
 
 /**
  * MatchContainer Factory
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class MatchContainerFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
index be8507838e44f..9161a30f9bc51 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
@@ -9,6 +9,12 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
 
+/**
+ * MySQL search query container.
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
+ */
 class QueryContainer
 {
     const DERIVED_QUERY_PREFIX = 'derived_';
@@ -32,6 +38,8 @@ public function __construct(MatchContainerFactory $matchContainerFactory)
     }
 
     /**
+     * Add query to select.
+     *
      * @param Select $select
      * @param RequestQueryInterface $query
      * @param string $conditionType
@@ -54,6 +62,8 @@ public function addMatchQuery(
     }
 
     /**
+     * Get queries.
+     *
      * @return MatchContainer[]
      */
     public function getMatchQueries()
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
index 70fefec13dd88..59ee4bb045b2a 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainerFactory.php
@@ -7,6 +7,9 @@
 
 /**
  * MatchContainer Factory
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class QueryContainerFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
index 8a269d8d95bc2..776dab93c2dcd 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
@@ -7,6 +7,9 @@
 
 /**
  * Response Factory
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class ResponseFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
index 190d3a04ed210..1cc417f891c19 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php
@@ -9,6 +9,8 @@
  * Class for generating sql condition for calculating store manager
  *
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class ScoreBuilder
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
index 4a7612fcc3042..70aa749fd859f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilderFactory.php
@@ -7,6 +7,9 @@
 
 /**
  * ScoreBuilder Factory
+ *
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class ScoreBuilderFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
index dcb977bfa2ae8..60ee2d5706067 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
@@ -13,7 +13,11 @@
 use Magento\Framework\DB\Select;
 
 /**
+ * MySQL search temporary storage.
+ *
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TemporaryStorage
 {
@@ -100,6 +104,8 @@ private function populateTemporaryTable(Table $table, $data)
     }
 
     /**
+     * Store select results in temporary table.
+     *
      * @param Select $select
      * @return Table
      * @throws \Zend_Db_Exception
@@ -112,6 +118,8 @@ public function storeDocumentsFromSelect(Select $select)
     }
 
     /**
+     * Get connection.
+     *
      * @return false|AdapterInterface
      */
     private function getConnection()
@@ -120,6 +128,8 @@ private function getConnection()
     }
 
     /**
+     * Create temporary table for search select results.
+     *
      * @return Table
      * @throws \Zend_Db_Exception
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
index 4a282faf317ce..208f6b39b9eb4 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
@@ -12,6 +12,8 @@
  *
  * @codeCoverageIgnore
  * @api
+ * @deprecated
+ * @see \Magento\ElasticSearch
  */
 class TemporaryStorageFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
index 3a964db113ef0..c2d7e4025b3b3 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Search\Dynamic\Algorithm;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -53,7 +54,7 @@ public function get($algorithmType, array $data = [])
         if (!isset($this->instances[$algorithmType])) {
             if (!isset($this->algorithms[$algorithmType])) {
                 throw new LocalizedException(
-                    new \Magento\Framework\Phrase('%1 was not found in algorithms', [$algorithmType])
+                    new \Magento\Framework\Phrase("The %1 value wasn't found in the algorithms.", [$algorithmType])
                 );
             }
 
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
index 0c4ed8c9a084f..6c3a59152a9a1 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Framework\Search\Dynamic;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * @api
@@ -26,20 +25,16 @@ class DataProviderFactory
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $dataProviders
-     * @param string $scope
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
-        $dataProviders,
-        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        EngineResolverInterface $engineResolver,
+        $dataProviders
     ) {
         $this->objectManager = $objectManager;
-        $configValue = $scopeConfig->getValue($configPath, $scope);
+        $configValue = $engineResolver->getCurrentSearchEngine();
         if (isset($dataProviders[$configValue])) {
             $this->dataProvider = $dataProviders[$configValue];
         } else {
@@ -58,7 +53,7 @@ public function create(array $data = [])
         $dataProvider = $this->objectManager->create($this->dataProvider, $data);
         if (!$dataProvider instanceof DataProviderInterface) {
             throw new \LogicException(
-                'DataProvider not instance of interface \Magento\Framework\Search\Dynamic\DataProviderInterface'
+                'DataProvider not instance of interface ' . DataProviderInterface::class
             );
         }
         return $dataProvider;
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
index 94e38eb152c66..90e66d1e7330c 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Framework\Search\Dynamic;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * @api
@@ -26,20 +25,16 @@ class IntervalFactory
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $intervals
-     * @param string $scope
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
-        $intervals,
-        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        EngineResolverInterface $engineResolver,
+        $intervals
     ) {
         $this->objectManager = $objectManager;
-        $configValue = $scopeConfig->getValue($configPath, $scope);
+        $configValue = $engineResolver->getCurrentSearchEngine();
         if (isset($intervals[$configValue])) {
             $this->interval = $intervals[$configValue];
         } else {
@@ -58,7 +53,7 @@ public function create(array $data = [])
         $interval = $this->objectManager->create($this->interval, $data);
         if (!$interval instanceof IntervalInterface) {
             throw new \LogicException(
-                'Interval not instance of interface \Magento\Framework\Search\Dynamic\IntervalInterface'
+                'Interval not instance of interface ' . IntervalInterface::class
             );
         }
         return $interval;
diff --git a/lib/internal/Magento/Framework/Search/EngineResolverInterface.php b/lib/internal/Magento/Framework/Search/EngineResolverInterface.php
new file mode 100644
index 0000000000000..57ba210121bc4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Search/EngineResolverInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Search;
+
+/**
+ * @api
+ */
+interface EngineResolverInterface
+{
+    /**
+     * Returns Current Search Engine
+     *
+     * It returns string identifier of Search Engine that is currently chosen in configuration
+     *
+     * @return string
+     */
+    public function getCurrentSearchEngine();
+}
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index 984065d1e2a2c..c015f90751a23 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Search\Request;
 
 use Magento\Framework\Exception\StateException;
@@ -60,7 +61,9 @@ public function clean(array $requestData)
         $this->clear();
 
         if (empty($requestData['queries']) && empty($requestData['filters'])) {
-            throw new EmptyRequestDataException(new Phrase('Request query and filters are not set'));
+            throw new EmptyRequestDataException(
+                new Phrase("The request query and filters aren't set. Verify the query and filters and try again.")
+            );
         }
 
         return $requestData;
@@ -82,7 +85,7 @@ private function cleanQuery($queryName)
             throw new \Exception('Query ' . $queryName . ' does not exist');
         } elseif (in_array($queryName, $this->mappedQueries)) {
             throw new StateException(
-                new Phrase('Cycle found. Query %1 already used in request hierarchy', [$queryName])
+                new Phrase('A cycle was found. The "%1" query is already used in the request hierarchy.', [$queryName])
             );
         }
         $this->mappedQueries[] = $queryName;
@@ -163,7 +166,10 @@ private function cleanFilter($filterName)
             throw new \Exception('Filter ' . $filterName . ' does not exist');
         } elseif (in_array($filterName, $this->mappedFilters)) {
             throw new StateException(
-                new Phrase('Cycle found. Filter %1 already used in request hierarchy', [$filterName])
+                new Phrase(
+                    'A cycle was found. The "%1" filter is already used in the request hierarchy.',
+                    [$filterName]
+                )
             );
         }
         $this->mappedFilters[] = $filterName;
diff --git a/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php b/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php
index d9412cb8517fa..9e907883bb2b9 100644
--- a/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/IndexScopeResolverInterface.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Search\Request;
 
 /**
- * Interface \Magento\Framework\Search\Request\IndexScopeResolverInterface
- *
+ * Resolve table name by provided dimensions. Scope Resolver must accept all dimensions that potentially can be used to
+ * resolve table name, but certain implementation can filter them if needed
  */
 interface IndexScopeResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Mapper.php b/lib/internal/Magento/Framework/Search/Request/Mapper.php
index 797d38ac7d39b..7586444d4b197 100644
--- a/lib/internal/Magento/Framework/Search/Request/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Request/Mapper.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Search\Request;
 
 use Magento\Framework\Exception\StateException;
@@ -114,7 +115,7 @@ private function mapQuery($queryName)
             throw new \Exception('Query ' . $queryName . ' does not exist');
         } elseif (in_array($queryName, $this->mappedQueries)) {
             throw new StateException(
-                new Phrase('Cycle found. Query %1 already used in request hierarchy', [$queryName])
+                new Phrase('A cycle was found. The "%1" query is already used in the request hierarchy.', [$queryName])
             );
         }
         $this->mappedQueries[] = $queryName;
@@ -183,7 +184,10 @@ private function mapFilter($filterName)
             throw new \Exception('Filter ' . $filterName . ' does not exist');
         } elseif (in_array($filterName, $this->mappedFilters)) {
             throw new StateException(
-                new Phrase('Cycle found. Filter %1 already used in request hierarchy', [$filterName])
+                new Phrase(
+                    'A cycle was found. The "%1" filter is already used in the request hierarchy.',
+                    [$filterName]
+                )
             );
         }
         $this->mappedFilters[] = $filterName;
@@ -351,7 +355,7 @@ public function getBuckets()
                     );
                     break;
                 default:
-                    throw new StateException(new Phrase('Invalid bucket type'));
+                    throw new StateException(new Phrase('The bucket type is invalid. Verify and try again.'));
                     break;
             }
             $buckets[] = $bucket;
diff --git a/lib/internal/Magento/Framework/Search/Response/Aggregation.php b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
index 9cb7a364ff21c..ea72597c53034 100644
--- a/lib/internal/Magento/Framework/Search/Response/Aggregation.php
+++ b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
@@ -47,7 +47,7 @@ public function getIterator()
      */
     public function getBucket($bucketName)
     {
-        return isset($this->buckets[$bucketName]) ? $this->buckets[$bucketName] : null;
+        return $this->buckets[$bucketName] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
index ef4a4d62322ed..55d26493ca379 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Search\Test\Unit\Adapter\Mysql;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
index 2a7aa8561b27d..26e6aba1d33bf 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
@@ -29,7 +29,7 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
     private $preprocessor;
 
     /**
-     * @var ConditionManager|\PHPUnit_Framework_MockObject_MockObject $conditionManager
+     * @var ConditionManager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $conditionManager;
 
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/DataProviderFactoryTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/DataProviderFactoryTest.php
new file mode 100644
index 0000000000000..b1418ff040740
--- /dev/null
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/DataProviderFactoryTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Search\Test\Unit\Dynamic;
+
+use Magento\Framework\Search\Dynamic\DataProviderFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Search\Dynamic\DataProviderInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+class DataProviderFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var DataProviderFactory */
+    private $model;
+
+    /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectManagerMock;
+
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
+            ->getMockForAbstractClass();
+    }
+
+    public function testCreate()
+    {
+        $dataProvider = 'current_provider';
+        $dataProviderClass = DataProviderInterface::class;
+        $dataProviders = [
+            $dataProvider => $dataProviderClass,
+        ];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($dataProvider);
+
+        $dataProviderMock = $this->getMockBuilder($dataProviderClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($dataProviderClass, $data)
+            ->willReturn($dataProviderMock);
+
+        $this->model = new DataProviderFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $dataProviders
+        );
+
+        $this->assertEquals($dataProviderMock, $this->model->create($data));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage DataProvider not found by config current_provider
+     */
+    public function testCreateWithoutProviders()
+    {
+        $dataProvider = 'current_provider';
+        $dataProviders = [];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($dataProvider);
+
+        $this->model = new DataProviderFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $dataProviders
+        );
+
+        $this->model->create($data);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage DataProvider not instance of interface
+     */
+    public function testCreateWithWrongProvider()
+    {
+        $dataProvider = 'current_provider';
+        $dataProviderClass = \stdClass::class;
+        $dataProviders = [
+            $dataProvider => $dataProviderClass,
+        ];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($dataProvider);
+
+        $dataProviderMock = $this->getMockBuilder($dataProviderClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($dataProviderClass, $data)
+            ->willReturn($dataProviderMock);
+
+        $this->model = new DataProviderFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $dataProviders
+        );
+
+        $this->model->create($data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php
index f24245fcf2f83..0084de2cebfbf 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php
@@ -5,125 +5,111 @@
  */
 namespace Magento\Framework\Search\Test\Unit\Dynamic;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Search\Dynamic\IntervalFactory;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Search\Dynamic\IntervalInterface;
-use Magento\Framework\App\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Search\EngineResolverInterface;
 
 class IntervalFactoryTest extends \PHPUnit\Framework\TestCase
 {
-    const CONFIG_PATH = 'config_path';
-    const INTERVAL = 'some_interval';
+    /** @var IntervalFactory */
+    private $model;
 
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $objectManager;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $scopeConfig;
+    /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectManagerMock;
 
-    /**
-     * @var \Magento\Framework\Search\Dynamic\IntervalInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $interval;
+    /** @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $engineResolverMock;
 
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    private $helper;
-
-    /**
-     * SetUp method
-     */
     protected function setUp()
     {
-        $this->helper = new ObjectManager($this);
-
-        $this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-            ->setMethods(['create', 'get', 'configure'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->setMethods(['getValue'])
-            ->disableOriginalConstructor()
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
             ->getMockForAbstractClass();
-
-        $this->interval = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\IntervalInterface::class)
-            ->disableOriginalConstructor()
+        $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
             ->getMockForAbstractClass();
     }
 
-    /**
-     * Test for method Create
-     */
     public function testCreate()
     {
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with(self::CONFIG_PATH, ScopeConfigInterface::SCOPE_TYPE_DEFAULT)
-            ->willReturn(self::CONFIG_PATH . 't');
-        $this->objectManager->expects($this->once())
+        $dataProvider = 'current_interval';
+        $dataProviderClass = IntervalInterface::class;
+        $dataProviders = [
+            $dataProvider => $dataProviderClass,
+        ];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($dataProvider);
+
+        $dataProviderMock = $this->getMockBuilder($dataProviderClass)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerMock->expects($this->once())
             ->method('create')
-            ->with(self::INTERVAL)
-            ->willReturn($this->interval);
+            ->with($dataProviderClass, $data)
+            ->willReturn($dataProviderMock);
 
-        $result = $this->factoryCreate();
+        $this->model = new IntervalFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $dataProviders
+        );
 
-        $this->assertEquals($this->interval, $result);
+        $this->assertEquals($dataProviderMock, $this->model->create($data));
     }
 
     /**
      * @expectedException \LogicException
-     * @expectedExceptionMessage Interval not found by config t
+     * @expectedExceptionMessage Interval not found by config current_interval
      */
-    public function testCreateIntervalNotFoundException()
+    public function testCreateWithoutIntervals()
     {
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with(self::CONFIG_PATH, ScopeConfigInterface::SCOPE_TYPE_DEFAULT)
-            ->willReturn('t');
+        $dataProvider = 'current_interval';
+        $dataProviders = [];
 
-        $this->factoryCreate();
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($dataProvider);
+
+        $this->model = new IntervalFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $dataProviders
+        );
     }
 
     /**
      * @expectedException \LogicException
-     * @expectedExceptionMessage Interval not instance of interface \Magento\Framework\Search\Dynamic\IntervalInterface
+     * @expectedExceptionMessage Interval not instance of interface
      */
-    public function testCreateIntervalNotImplementedInterfaceException()
+    public function testCreateWithWrongInterval()
     {
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with(self::CONFIG_PATH, ScopeConfigInterface::SCOPE_TYPE_DEFAULT)
-            ->willReturn(self::CONFIG_PATH . 't');
-        $this->objectManager->expects($this->once())
-            ->method('create')
-            ->with(self::INTERVAL)
-            ->willReturn($this->objectManager);
+        $dataProvider = 'current_interval';
+        $dataProviderClass = \stdClass::class;
+        $dataProviders = [
+            $dataProvider => $dataProviderClass,
+        ];
+        $data = ['data'];
+
+        $this->engineResolverMock->expects($this->once())
+            ->method('getCurrentSearchEngine')
+            ->willReturn($dataProvider);
+
+        $dataProviderMock = $this->getMockBuilder($dataProviderClass)
+            ->getMockForAbstractClass();
 
-        $this->factoryCreate();
-    }
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($dataProviderClass, $data)
+            ->willReturn($dataProviderMock);
 
-    /**
-     * @return IntervalInterface
-     */
-    private function factoryCreate()
-    {
-        /** @var \Magento\Framework\Search\Dynamic\IntervalFactory $factory */
-        $factory = $this->helper->getObject(
-            \Magento\Framework\Search\Dynamic\IntervalFactory::class,
-            [
-                'objectManager' => $this->objectManager,
-                'scopeConfig' => $this->scopeConfig,
-                'configPath' => self::CONFIG_PATH,
-                'intervals' => [self::CONFIG_PATH . 't' => self::INTERVAL]
-            ]
+        $this->model = new IntervalFactory(
+            $this->objectManagerMock,
+            $this->engineResolverMock,
+            $dataProviders
         );
 
-        return $factory->create();
+        $this->model->create($data);
     }
 }
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Request/CleanerTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Request/CleanerTest.php
index 42667b4e171c0..6902dfc70d2c6 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Request/CleanerTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Request/CleanerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Search\Test\Unit\Request;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -259,7 +260,7 @@ public function testCleanFilterType()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedExceptionMessage Cycle found. Query filtered_query already used in request hierarchy
+     * @expectedExceptionMessage A cycle was found. The "filtered_query" query is already used in the request hierarchy.
      */
     public function testCleanQueryCycle()
     {
@@ -338,7 +339,7 @@ public function testCleanQueryNotExists()
 
     /**
      * @expectedException \Magento\Framework\Search\Request\EmptyRequestDataException
-     * @expectedExceptionMessage Request query and filters are not set
+     * @expectedExceptionMessage The request query and filters aren't set. Verify the query and filters and try again.
      */
     public function testCleanEmptyQueryAndFilter()
     {
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
index c5e18423eab07..2a3e46b8887a6 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
@@ -852,6 +852,9 @@ public function testGetFilterException()
         $this->assertEquals($this->queryBool, $mapper->getRootQuery());
     }
 
+    /**
+     * @return array
+     */
     public function getQueryMatchProvider()
     {
         return [
@@ -879,6 +882,9 @@ public function getQueryMatchProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function getQueryFilterQueryReferenceProvider()
     {
         return [
@@ -926,6 +932,9 @@ public function getQueryFilterQueryReferenceProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function getQueryBoolProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php b/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php
new file mode 100644
index 0000000000000..a945822d92f97
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Serialize\Serializer;
+
+/**
+ * Class for processing of serialized form data.
+ */
+class FormData
+{
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @param Json $serializer
+     */
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Provides form data from the serialized data.
+     *
+     * @param string $serializedData
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    public function unserialize(string $serializedData): array
+    {
+        $encodedFields = $this->serializer->unserialize($serializedData);
+
+        if (!is_array($encodedFields)) {
+            throw new \InvalidArgumentException('Unable to unserialize value.');
+        }
+
+        $formData = [];
+        foreach ($encodedFields as $item) {
+            $decodedFieldData = [];
+            parse_str($item, $decodedFieldData);
+            $formData = array_replace_recursive($formData, $decodedFieldData);
+        }
+
+        return $formData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php
index 8cad058f88466..e93164537f927 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/Base64JsonTest.php
@@ -30,6 +30,9 @@ public function testSerialize($value, $expected)
         $this->assertEquals($expected, $this->base64json->serialize($value));
     }
 
+    /**
+     * @return array
+     */
     public function serializeDataProvider()
     {
         $dataObject = new \Magento\Framework\DataObject(['something']);
@@ -55,6 +58,9 @@ public function testUnserialize($value, $expected)
         $this->assertEquals($expected, $this->base64json->unserialize($value));
     }
 
+    /**
+     * @return array
+     */
     public function unserializeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
index d1fddbbdf2778..235567103edf7 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
@@ -34,6 +34,9 @@ public function testSerialize($value, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function serializeDataProvider()
     {
         $dataObject = new DataObject(['something']);
@@ -62,6 +65,9 @@ public function testUnserialize($value, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function unserializeDataProvider()
     {
         return [
@@ -95,6 +101,9 @@ public function testUnserializeException($value)
         $this->json->unserialize($value);
     }
 
+    /**
+     * @return array
+     */
     public function unserializeExceptionDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
index e74de735c1c1e..aac25400cec85 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Serialize\Serializer\Serialize;
 use Magento\Framework\Serialize\Signer;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\Serialize\InvalidSignatureException;
 
 class SerializeTest extends \PHPUnit\Framework\TestCase
@@ -33,6 +32,9 @@ public function testSerialize($value, $serializedValue)
         $this->assertEquals($serializedValue, $this->serialize->serialize($value));
     }
 
+    /**
+     * @return array
+     */
     public function serializeDataProvider()
     {
         return [
@@ -56,6 +58,9 @@ public function testUnserialize($serializedValue, $value)
         $this->assertEquals($value, $this->serialize->unserialize($serializedValue));
     }
 
+    /**
+     * @return array
+     */
     public function unserializeDataProvider()
     {
         return [
@@ -88,6 +93,9 @@ public function testUnserializeException($value)
         $this->serialize->unserialize($value);
     }
 
+    /**
+     * @return array
+     */
     public function unserializeExceptionDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 26ae1635f18f1..296b7944ea4f6 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
@@ -134,6 +133,14 @@ public function __construct(
             $this->setSavePath($savePath);
         }
 
+        /**
+        * Session save handler - memcache, files, etc
+        */
+        $saveHandler = $deploymentConfig->get(self::PARAM_SESSION_SAVE_METHOD);
+        if ($saveHandler) {
+            $this->setOption('session.save_handler', $saveHandler);
+        }
+
         /**
          * Session cache limiter
          */
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php
index 4ab3d8e28f169..7959130d1e41c 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/SaveHandler/DbTable.php b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
index 67ae707860640..cf3449a8c3fcf 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Session\SaveHandler;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\SessionException;
 use Magento\Framework\Phrase;
 
@@ -49,10 +49,14 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     protected function checkConnection()
     {
         if (!$this->connection) {
-            throw new SessionException(new Phrase('Write DB connection is not available'));
+            throw new SessionException(
+                new Phrase("The write connection to the database isn't available. Please try again later.")
+            );
         }
         if (!$this->connection->isTableExists($this->_sessionTable)) {
-            throw new SessionException(new Phrase('DB storage table does not exist'));
+            throw new SessionException(
+                new Phrase("The database storage table doesn't exist. Verify the table and try again.")
+            );
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
index 53af1847d1012..cd1cef5da6ddd 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
@@ -14,13 +14,28 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class Redis extends \Cm\RedisSession\Handler
+class Redis implements \SessionHandlerInterface
 {
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @var Filesystem
      */
     private $filesystem;
 
+    /**
+     * @var \Cm\RedisSession\Handler[]
+     */
+    private $connection;
+
     /**
      * @param ConfigInterface $config
      * @param LoggerInterface $logger
@@ -29,23 +44,117 @@ class Redis extends \Cm\RedisSession\Handler
      */
     public function __construct(ConfigInterface $config, LoggerInterface $logger, Filesystem $filesystem)
     {
+        $this->config = $config;
+        $this->logger = $logger;
         $this->filesystem = $filesystem;
-        try {
-            parent::__construct($config, $logger);
-        } catch (ConnectionFailedException $e) {
-            throw new SessionException(new Phrase($e->getMessage()));
+    }
+
+    /**
+     * Get connection
+     *
+     * @return \Cm\RedisSession\Handler
+     * @throws SessionException
+     */
+    private function getConnection()
+    {
+        $pid = getmypid();
+        if (!isset($this->connection[$pid])) {
+            try {
+                $this->connection[$pid] = new \Cm\RedisSession\Handler($this->config, $this->logger);
+            } catch (ConnectionFailedException $e) {
+                throw new SessionException(new Phrase($e->getMessage()));
+            }
         }
+        return $this->connection[$pid];
     }
 
     /**
-     * {@inheritdoc}
+     * Open session
+     *
+     * @param string $savePath ignored
+     * @param string $sessionName ignored
+     * @return bool
+     * @throws SessionException
+     */
+    public function open($savePath, $sessionName)
+    {
+        return $this->getConnection()->open($savePath, $sessionName);
+    }
+
+    /**
+     * Fetch session data
+     *
+     * @param string $sessionId
+     * @return string
+     * @throws ConcurrentConnectionsExceededException
+     * @throws SessionException
      */
     public function read($sessionId)
     {
         try {
-            return parent::read($sessionId);
+            return $this->getConnection()->read($sessionId);
         } catch (ConcurrentConnectionsExceededException $e) {
             require $this->filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/503.php');
         }
     }
+
+    /**
+     * Update session
+     *
+     * @param string $sessionId
+     * @param string $sessionData
+     * @return boolean
+     * @throws SessionException
+     */
+    public function write($sessionId, $sessionData)
+    {
+        return $this->getConnection()->write($sessionId, $sessionData);
+    }
+
+    /**
+     * Destroy session
+     *
+     * @param string $sessionId
+     * @return boolean
+     * @throws SessionException
+     */
+    public function destroy($sessionId)
+    {
+        return $this->getConnection()->destroy($sessionId);
+    }
+
+    /**
+     * Overridden to prevent calling getLifeTime at shutdown
+     *
+     * @return bool
+     * @throws SessionException
+     */
+    public function close()
+    {
+        return $this->getConnection()->close();
+    }
+
+    /**
+     * Garbage collection
+     *
+     * @param int $maxLifeTime ignored
+     * @return boolean
+     * @throws SessionException
+     * @SuppressWarnings(PHPMD.ShortMethodName)
+     */
+    public function gc($maxLifeTime)
+    {
+        return $this->getConnection()->gc($maxLifeTime);
+    }
+
+    /**
+     * Get the number of failed lock attempts
+     *
+     * @return int
+     * @throws SessionException
+     */
+    public function getFailedLockAttempts()
+    {
+        return $this->getConnection()->getFailedLockAttempts();
+    }
 }
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
index 724f949ca5b23..70b666f8a4e6b 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
@@ -100,6 +100,26 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      */
     const PARAM_BREAK_AFTER             = 'session/redis/break_after';
 
+    /**
+     * Configuration path for comma separated list of sentinel servers
+     */
+    const PARAM_SENTINEL_SERVERS        = 'session/redis/sentinel_servers';
+
+    /**
+     * Configuration path for sentinel master
+     */
+    const PARAM_SENTINEL_MASTER         = 'session/redis/sentinel_master';
+
+    /**
+     * Configuration path for verify sentinel master flag
+     */
+    const PARAM_SENTINEL_VERIFY_MASTER  = 'session/redis/sentinel_verify_master';
+
+    /**
+     * Configuration path for number of sentinel connection retries
+     */
+    const PARAM_SENTINEL_CONNECT_RETRIES = 'session/redis/sentinel_connect_retries';
+
     /**
      * Cookie lifetime config path
      */
@@ -115,10 +135,15 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      */
     const SESSION_MAX_LIFETIME = 31536000;
 
+    /**
+     * Try to break lock for at most this many seconds
+     */
+    const DEFAULT_FAIL_AFTER = 15;
+
     /**
      * Deployment config
      *
-     * @var DeploymentConfig $deploymentConfig
+     * @var DeploymentConfig
      */
     private $deploymentConfig;
 
@@ -148,7 +173,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLogLevel()
     {
@@ -156,7 +181,7 @@ public function getLogLevel()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getHost()
     {
@@ -164,7 +189,7 @@ public function getHost()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPort()
     {
@@ -172,7 +197,7 @@ public function getPort()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDatabase()
     {
@@ -180,7 +205,7 @@ public function getDatabase()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPassword()
     {
@@ -188,7 +213,7 @@ public function getPassword()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTimeout()
     {
@@ -196,7 +221,7 @@ public function getTimeout()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPersistentIdentifier()
     {
@@ -204,7 +229,7 @@ public function getPersistentIdentifier()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompressionThreshold()
     {
@@ -212,7 +237,7 @@ public function getCompressionThreshold()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompressionLibrary()
     {
@@ -220,7 +245,7 @@ public function getCompressionLibrary()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMaxConcurrency()
     {
@@ -228,7 +253,7 @@ public function getMaxConcurrency()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMaxLifetime()
     {
@@ -236,7 +261,7 @@ public function getMaxLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMinLifetime()
     {
@@ -244,7 +269,7 @@ public function getMinLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDisableLocking()
     {
@@ -252,7 +277,7 @@ public function getDisableLocking()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBotLifetime()
     {
@@ -260,7 +285,7 @@ public function getBotLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBotFirstLifetime()
     {
@@ -268,7 +293,7 @@ public function getBotFirstLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFirstLifetime()
     {
@@ -276,7 +301,7 @@ public function getFirstLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBreakAfter()
     {
@@ -284,7 +309,7 @@ public function getBreakAfter()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLifetime()
     {
@@ -293,4 +318,44 @@ public function getLifetime()
         }
         return (int)$this->scopeConfig->getValue(self::XML_PATH_COOKIE_LIFETIME, StoreScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelServers()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_SERVERS);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelMaster()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_MASTER);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelVerifyMaster()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_VERIFY_MASTER);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelConnectRetries()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_CONNECT_RETRIES);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFailAfter()
+    {
+        return self::DEFAULT_FAIL_AFTER;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index cfabff6955e49..b53c83acb48cf 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -124,9 +124,6 @@ public function __construct(
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->appState = $appState;
-
-        // Enable session.use_only_cookies
-        ini_set('session.use_only_cookies', '1');
         $this->start();
     }
 
@@ -183,10 +180,21 @@ public function start()
             // Need to apply the config options so they can be ready by session_start
             $this->initIniOptions();
             $this->registerSaveHandler();
+            if (isset($_SESSION['new_session_id'])) {
+                // Not fully expired yet. Could be lost cookie by unstable network.
+                session_commit();
+                session_id($_SESSION['new_session_id']);
+            }
             $sid = $this->sidResolver->getSid($this);
             // potential custom logic for session id (ex. switching between hosts)
             $this->setSessionId($sid);
             session_start();
+            if (isset($_SESSION['destroyed'])
+                && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
+            ) {
+                $this->destroy(['clear_storage' => true]);
+            }
+
             $this->validator->validate($this);
             $this->renewCookie($sid);
 
@@ -317,11 +325,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();
@@ -479,7 +484,7 @@ protected function _addHost()
      */
     protected function _getHosts()
     {
-        return isset($_SESSION[self::HOST_KEY]) ? $_SESSION[self::HOST_KEY] : [];
+        return $_SESSION[self::HOST_KEY] ?? [];
     }
 
     /**
@@ -504,21 +509,33 @@ public function regenerateId()
             return $this;
         }
 
-        //@see http://php.net/manual/en/function.session-regenerate-id.php#53480 workaround
         if ($this->isSessionExists()) {
-            $oldSessionId = session_id();
+            // Regenerate the session
             session_regenerate_id();
             $newSessionId = session_id();
-            session_id($oldSessionId);
-            session_destroy();
+            $_SESSION['new_session_id'] = $newSessionId;
+
+            // Set destroy timestamp
+            $_SESSION['destroyed'] = time();
+
+            // Write and close current session;
+            session_commit();
 
+            // Called after destroy()
             $oldSession = $_SESSION;
+
+            // Start session with new session ID
             session_id($newSessionId);
             session_start();
             $_SESSION = $oldSession;
+
+            // New session does not need them
+            unset($_SESSION['destroyed']);
+            unset($_SESSION['new_session_id']);
         } else {
             session_start();
         }
+
         $this->storage->init(isset($_SESSION) ? $_SESSION : []);
 
         if ($this->sessionConfig->getUseCookies()) {
@@ -576,13 +593,25 @@ public function expireSessionCookie()
      */
     private function initIniOptions()
     {
+        $result = ini_set('session.use_only_cookies', '1');
+        if ($result === false) {
+            $error = error_get_last();
+            throw new \InvalidArgumentException(
+                sprintf('Failed to set ini option session.use_only_cookies to value 1. %s', $error['message'])
+            );
+        }
+
         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/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index 40d985614a3c6..1208aeb31eaee 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -7,6 +7,11 @@
  */
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\State;
+
+/**
+ * Class SidResolver
+ */
 class SidResolver implements SidResolverInterface
 {
     /**
@@ -44,48 +49,62 @@ class SidResolver implements SidResolverInterface
     /**
      * Use session in URL flag
      *
-     * @var bool
+     * @var bool|null
      * @see \Magento\Framework\UrlInterface
      */
-    protected $_useSessionInUrl = true;
+    protected $_useSessionInUrl;
 
     /**
      * @var string
      */
     protected $_scopeType;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $scopeType
      * @param array $sidNameMap
+     * @param State|null $appState
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\App\RequestInterface $request,
         $scopeType,
-        array $sidNameMap = []
+        array $sidNameMap = [],
+        State $appState = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->urlBuilder = $urlBuilder;
         $this->request = $request;
         $this->sidNameMap = $sidNameMap;
         $this->_scopeType = $scopeType;
+        $this->appState = $appState ?: \Magento\Framework\App\ObjectManager::getInstance()->get(State::class);
     }
 
     /**
+     * Get Sid
+     *
      * @param SessionManagerInterface $session
-     * @return string
+     *
+     * @return string|null
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSid(SessionManagerInterface $session)
     {
+        if ($this->appState->getAreaCode() !== \Magento\Framework\App\Area::AREA_FRONTEND) {
+            return null;
+        }
+
         $sidKey = null;
-        $useSidOnFrontend = $this->scopeConfig->getValue(
-            self::XML_PATH_USE_FRONTEND_SID,
-            $this->_scopeType
-        );
+
+        $useSidOnFrontend = $this->getUseSessionInUrl();
         if ($useSidOnFrontend && $this->request->getQuery(
             $this->getSessionIdQueryParam($session),
             false
@@ -147,13 +166,22 @@ public function setUseSessionInUrl($flag = true)
     }
 
     /**
-     * Retrieve use session in URL flag
+     * Retrieve use session in URL flag.
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getUseSessionInUrl()
     {
+        if ($this->_useSessionInUrl === null) {
+            //Using config value by default, can be overridden by using the
+            //setter.
+            $this->_useSessionInUrl = $this->scopeConfig->isSetFlag(
+                self::XML_PATH_USE_FRONTEND_SID,
+                $this->_scopeType
+            );
+        }
+
         return $this->_useSessionInUrl;
     }
 }
diff --git a/lib/internal/Magento/Framework/Session/SidResolverInterface.php b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
index 8dd044adb6860..6f242c1c9e308 100644
--- a/lib/internal/Magento/Framework/Session/SidResolverInterface.php
+++ b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
@@ -22,7 +22,7 @@ interface SidResolverInterface
      * Get SID
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @return string
+     * @return string|null
      */
     public function getSid(\Magento\Framework\Session\SessionManagerInterface $session);
 
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
index 66fc12b493090..7a3bb98838ff3 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
@@ -82,6 +82,9 @@ public function testSetOptions($option, $getter, $value)
         $this->assertSame($value, $this->config->{$getter}());
     }
 
+    /**
+     * @return array
+     */
     public function optionsProvider()
     {
         return [
@@ -177,10 +180,8 @@ public function testSettingInvalidCookieLifetime2()
     public function testWrongMethodCall()
     {
         $this->getModel($this->validatorMock);
-        $this->expectException(
-            '\BadMethodCallException',
-            'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
-        );
+        $this->expectException('\BadMethodCallException');
+        $this->expectExceptionMessage('Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config');
         $this->config->methodThatNotExist();
     }
 
@@ -343,6 +344,9 @@ public function testConstructor($isValidSame, $isValid, $expected)
         $this->assertEquals($expected, $this->config->getOptions());
     }
 
+    /**
+     * @return array
+     */
     public function constructorDataProvider()
     {
         return [
@@ -350,33 +354,36 @@ public function constructorDataProvider()
                 true,
                 true,
                 [
-                    'session.cache_limiter' => 'files',
+                    'session.cache_limiter' => 'private_no_expire',
                     'session.cookie_lifetime' => 7200,
                     'session.cookie_path' => '/',
                     'session.cookie_domain' => 'init.host',
                     'session.cookie_httponly' => false,
                     'session.cookie_secure' => false,
+                    'session.save_handler' => 'files'
                 ],
             ],
             'all invalid' => [
                 true,
                 false,
                 [
-                    'session.cache_limiter' => 'files',
+                    'session.cache_limiter' => 'private_no_expire',
                     'session.cookie_httponly' => false,
                     'session.cookie_secure' => false,
+                    'session.save_handler' => 'files'
                 ],
             ],
             'invalid_valid' => [
                 false,
                 true,
                 [
-                    'session.cache_limiter' => 'files',
+                    'session.cache_limiter' => 'private_no_expire',
                     'session.cookie_lifetime' => 3600,
                     'session.cookie_path' => '/',
                     'session.cookie_domain' => 'init.host',
                     'session.cookie_httponly' => false,
                     'session.cookie_secure' => false,
+                    'session.save_handler' => 'files'
                 ],
             ],
         ];
@@ -429,14 +436,18 @@ protected function getModel($validator)
             ->will($this->returnValue($dirMock));
 
         $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $deploymentConfigMock->expects($this->at(0))
-            ->method('get')
-            ->with(Config::PARAM_SESSION_SAVE_PATH)
-            ->will($this->returnValue(null));
-        $deploymentConfigMock->expects($this->at(1))
+        $deploymentConfigMock
             ->method('get')
-            ->with(Config::PARAM_SESSION_CACHE_LIMITER)
-            ->will($this->returnValue('files'));
+            ->willReturnCallback(function ($configPath) {
+                switch ($configPath) {
+                    case Config::PARAM_SESSION_SAVE_METHOD:
+                        return 'files';
+                    case Config::PARAM_SESSION_CACHE_LIMITER:
+                        return 'private_no_expire';
+                    default:
+                        return null;
+                }
+            });
 
         $this->config = $this->helper->getObject(
             \Magento\Framework\Session\Config::class,
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/DbTableTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/DbTableTest.php
index 90b1ee2113472..659c8ab8e389a 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/DbTableTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/DbTableTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Session\Test\Unit\SaveHandler;
 
 class DbTableTest extends \PHPUnit\Framework\TestCase
@@ -88,7 +89,7 @@ public function testCheckConnection()
 
     /**
      * @expectedException \Magento\Framework\Exception\SessionException
-     * @expectedExceptionMessage Write DB connection is not available
+     * @expectedExceptionMessage The write connection to the database isn't available. Please try again later.
      */
     public function testCheckConnectionNoConnection()
     {
@@ -105,7 +106,7 @@ public function testCheckConnectionNoConnection()
 
     /**
      * @expectedException \Magento\Framework\Exception\SessionException
-     * @expectedExceptionMessage DB storage table does not exist
+     * @expectedExceptionMessage The database storage table doesn't exist. Verify the table and try again.
      */
     public function testCheckConnectionNoTable()
     {
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php
index 26f3d4c4c4e89..2859b486ec7a1 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php
@@ -246,4 +246,49 @@ public function testGetLifetimeFrontend()
             ->willReturn($expectedLifetime);
         $this->assertEquals($this->config->getLifetime(), $expectedLifetime);
     }
+
+    public function testGetSentinelServers()
+    {
+        $expected = 'server-1,server-2';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with(Config::PARAM_SENTINEL_SERVERS)
+            ->willReturn($expected);
+        $this->assertEquals($expected, $this->config->getSentinelServers());
+    }
+
+    public function testGetSentinelMaster()
+    {
+        $expected = 'master';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with(Config::PARAM_SENTINEL_MASTER)
+            ->willReturn($expected);
+        $this->assertEquals($this->config->getSentinelMaster(), $expected);
+    }
+
+    public function testGetSentinelVerifyMaster()
+    {
+        $expected = '1';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with(Config::PARAM_SENTINEL_VERIFY_MASTER)
+            ->willReturn($expected);
+        $this->assertEquals($this->config->getSentinelVerifyMaster(), $expected);
+    }
+
+    public function testGetSentinelConnectRetries()
+    {
+        $expected = '10';
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->willReturn(Config::PARAM_SENTINEL_CONNECT_RETRIES)
+            ->willReturn($expected);
+        $this->assertEquals($this->config->getSentinelConnectRetries(), $expected);
+    }
+
+    public function testGetFailAfter()
+    {
+        $this->assertEquals($this->config->getFailAfter(), Config::DEFAULT_FAIL_AFTER);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php
index 18050da435c32..a604178bc36cc 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/LoggerTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Session\Test\Unit\SaveHandler\Redis;
 
 use Cm\RedisSession\Handler\LoggerInterface;
-use Magento\Framework\Session\SaveHandler\Redis\Logger;
 
 class LoggerTest extends \PHPUnit\Framework\TestCase
 {
@@ -70,6 +69,9 @@ public function testLog($logLevel, $method)
         $this->logger->log($message, $logLevel);
     }
 
+    /**
+     * @return array
+     */
     public function logDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Session/Validator.php b/lib/internal/Magento/Framework/Session/Validator.php
index 65d3150cdbb59..a132d8644a3c6 100644
--- a/lib/internal/Magento/Framework/Session/Validator.php
+++ b/lib/internal/Magento/Framework/Session/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Session;
 
 use Magento\Framework\Exception\SessionException;
@@ -110,7 +111,7 @@ protected function _validate()
         ) {
             throw new SessionException(
                 new Phrase(
-                    'Invalid session %1 value.',
+                    'The "%1" session value is invalid. Verify and try again.',
                     [self::VALIDATOR_REMOTE_ADDR_KEY]
                 )
             );
@@ -122,7 +123,7 @@ protected function _validate()
         ) {
             throw new SessionException(
                 new Phrase(
-                    'Invalid session %1 value.',
+                    'The "%1" session value is invalid. Verify and try again.',
                     [self::VALIDATOR_HTTP_VIA_KEY]
                 )
             );
@@ -137,7 +138,7 @@ protected function _validate()
         ) {
             throw new SessionException(
                 new Phrase(
-                    'Invalid session %1 value.',
+                    'The "%1" session value is invalid. Verify and try again.',
                     [self::VALIDATOR_HTTP_X_FORWARDED_FOR_KEY]
                 )
             );
@@ -154,7 +155,7 @@ protected function _validate()
             }
             throw new SessionException(
                 new Phrase(
-                    'Invalid session %1 value.',
+                    'The "%1" session value is invalid. Verify and try again.',
                     [self::VALIDATOR_HTTP_USER_AGENT_KEY]
                 )
             );
diff --git a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
index ae123e15da23c..224f2024ba959 100644
--- a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
+++ b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
@@ -29,6 +29,6 @@ class BackendFrontnameGenerator
     public static function generate()
     {
         return self::ADMIN_AREA_PATH_PREFIX
-            . substr(base_convert(rand(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
+            . substr(base_convert(random_int(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
     }
 }
diff --git a/lib/internal/Magento/Framework/Setup/BackupRollback.php b/lib/internal/Magento/Framework/Setup/BackupRollback.php
index 568f0dfcabdea..6736875368d57 100644
--- a/lib/internal/Magento/Framework/Setup/BackupRollback.php
+++ b/lib/internal/Magento/Framework/Setup/BackupRollback.php
@@ -9,7 +9,6 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Backup\Exception\NotEnoughPermissions;
 use Magento\Framework\Backup\Factory;
-use Magento\Framework\Backup\Filesystem;
 use Magento\Framework\Backup\Filesystem\Helper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Driver\File;
@@ -148,10 +147,10 @@ public function codeBackup($time, $type = Factory::TYPE_FILESYSTEM)
     public function codeRollback($rollbackFile, $type = Factory::TYPE_FILESYSTEM, $keepSourceFile = false)
     {
         if (preg_match('/[0-9]_(filesystem)_(code|media)\.(tgz)$/', $rollbackFile) !== 1) {
-            throw new LocalizedException(new Phrase('Invalid rollback file.'));
+            throw new LocalizedException(new Phrase('The rollback file is invalid. Verify the file and try again.'));
         }
         if (!$this->file->isExists($this->backupsDir . '/' . $rollbackFile)) {
-            throw new LocalizedException(new Phrase('The rollback file does not exist.'));
+            throw new LocalizedException(new Phrase("The rollback file doesn't exist. Verify the file and try again."));
         }
         /** @var \Magento\Framework\Backup\Filesystem $fsRollback */
         $fsRollback = $this->objectManager->create(\Magento\Framework\Backup\Filesystem::class);
@@ -173,7 +172,7 @@ public function codeRollback($rollbackFile, $type = Factory::TYPE_FILESYSTEM, $k
         );
         if (!$filesInfo['writable']) {
             throw new NotEnoughPermissions(
-                new Phrase('Unable to make rollback because not all files are writable')
+                new Phrase("The rollback can't be executed because not all files are writable.")
             );
         }
         $fsRollback->setRootDir($this->directoryList->getRoot());
@@ -226,10 +225,10 @@ public function dbBackup($time)
     public function dbRollback($rollbackFile, $keepSourceFile = false)
     {
         if (preg_match('/[0-9]_(db)(.*?).(sql)$/', $rollbackFile) !== 1) {
-            throw new LocalizedException(new Phrase('Invalid rollback file.'));
+            throw new LocalizedException(new Phrase('The rollback file is invalid. Verify the file and try again.'));
         }
         if (!$this->file->isExists($this->backupsDir . '/' . $rollbackFile)) {
-            throw new LocalizedException(new Phrase('The rollback file does not exist.'));
+            throw new LocalizedException(new Phrase("The rollback file doesn't exist. Verify the file and try again."));
         }
         /** @var \Magento\Framework\Backup\Db $dbRollback */
         $dbRollback = $this->objectManager->create(\Magento\Framework\Backup\Db::class);
@@ -245,6 +244,10 @@ public function dbRollback($rollbackFile, $keepSourceFile = false)
         $this->log->log('DB rollback is starting...');
         $dbRollback->setKeepSourceFile($keepSourceFile);
         $dbRollback->setResourceModel($this->objectManager->create(\Magento\Backup\Model\ResourceModel\Db::class));
+        if ($dbRollback->getBackupFilename() !== $rollbackFile) {
+            $correctName = $this->getCorrectFileNameWithoutPrefix($dbRollback, $rollbackFile);
+            $dbRollback->setName($correctName);
+        }
         $dbRollback->rollback();
         $this->log->log('DB rollback filename: ' . $dbRollback->getBackupFilename());
         $this->log->log('DB rollback path: ' . $dbRollback->getBackupPath());
@@ -332,4 +335,25 @@ public function getDBDiskSpace()
         $dbBackup = $this->objectManager->create(\Magento\Framework\Backup\Db::class);
         return $dbBackup->getDBSize();
     }
+
+    /**
+     * Get correct file name without prefix.
+     *
+     * @param \Magento\Framework\Backup\Db $dbRollback
+     * @param string $rollbackFile
+     *
+     * @return string
+     */
+    private function getCorrectFileNameWithoutPrefix(\Magento\Framework\Backup\Db $dbRollback, $rollbackFile)
+    {
+        $namePrefix = $dbRollback->getTime() . '_' . $dbRollback->getType();
+        //delete prefix.
+        $fileNameWithoutPrefix = str_replace($namePrefix, '', $rollbackFile);
+        //change '_' to ' '.
+        $fileNameWithoutPrefix = str_replace('_', ' ', $fileNameWithoutPrefix);
+        //delete file extension.
+        $fileNameWithoutPrefix = pathinfo($fileNameWithoutPrefix, PATHINFO_FILENAME);
+
+        return $fileNameWithoutPrefix;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Comparator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Comparator.php
new file mode 100644
index 0000000000000..0c1f9ae42eaf3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Comparator.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Comparator allows to compare only sensitive params of 2 nodes
+ * that can come from different places.
+ */
+class Comparator
+{
+    /**
+     * Compare elements.
+     *
+     * @param ElementInterface | ElementDiffAwareInterface $first
+     * @param ElementInterface | ElementDiffAwareInterface $second
+     * @return bool
+     */
+    public function compare(ElementInterface $first, ElementInterface $second)
+    {
+        return get_class($first) === get_class($second) &&
+            $first->getDiffSensitiveParams() === $second->getDiffSensitiveParams();
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
new file mode 100644
index 0000000000000..149ad996a5fc4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Attributes configuration converter
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema\Config;
+
+/**
+ * This converter is required for Declaration Filesystem reader:
+ *
+ * @see \Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader
+ *
+ * Allows to convert declarative schema to raw array and add default values
+ * for column types and for constraints.
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * Convert config from XML to array.
+     *
+     * @param  \DOMDocument $source
+     * @return array
+     */
+    public function convert($source): array
+    {
+        $output = $this->recursiveConvert($this->getTablesNode($source));
+        return $output;
+    }
+
+    /**
+     * We exactly know, that our schema is consists from tables.
+     * So we do not need root elements in result, only table names.
+     * So proposed to select only tables from all DOMDocument.
+     *
+     * @param  \DOMDocument $element
+     * @return \DOMNodeList
+     */
+    private function getTablesNode(\DOMDocument $element): \DOMNodeList
+    {
+        return $element->getElementsByTagName('table');
+    }
+
+    /**
+     * Convert elements.
+     *
+     * @param \Traversable $source
+     * @return array
+     */
+    private function recursiveConvert(\Traversable $source): array
+    {
+        $output = [];
+        foreach ($source as $element) {
+            if ($element instanceof \DOMElement) {
+                $key = $this->getIdAttributeValue($element);
+
+                if ($element->hasChildNodes()) {
+                    $output[$element->tagName][$key] =
+                        array_replace(
+                            $this->recursiveConvert($element->childNodes),
+                            $this->interpretAttributes($element)
+                        );
+                } elseif ($this->hasAttributesExceptIdAttribute($element)) {
+                    $output[$element->tagName][$key] = $this->interpretAttributes($element);
+                } else {
+                    $output[$element->tagName][$key] = $key;
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Provide the value of the ID attribute for each element.
+     *
+     * @param \DOMElement $element
+     * @return string
+     */
+    private function getIdAttributeValue(\DOMElement $element): string
+    {
+        $idAttributeValue = '';
+        switch ($element->tagName) {
+            case ('table'):
+            case ('column'):
+                $idAttributeValue = $element->getAttribute('name');
+                break;
+            case ('index'):
+            case ('constraint'):
+                $idAttributeValue = $element->getAttribute('referenceId');
+                break;
+        }
+
+        return $idAttributeValue;
+    }
+
+    /**
+     * Check whether we have any attributes except ID attribute.
+     *
+     * @param  \DOMElement $element
+     * @return bool
+     */
+    private function hasAttributesExceptIdAttribute(\DOMElement $element)
+    {
+        return $element->hasAttribute('xsi:type') || $element->attributes->length >= 2;
+    }
+
+    /**
+     * Mix attributes that comes from XML schema with default ones.
+     *
+     * So if you will not have some attribute in schema - it will be taken from default one.
+     *
+     * @param  \DOMElement $domElement
+     * @return array
+     */
+    private function interpretAttributes(\DOMElement $domElement): array
+    {
+        $attributes = $this->getAttributes($domElement);
+        $xsiType = $domElement->getAttribute('xsi:type');
+
+        if ($xsiType) {
+            $attributes['type'] = $xsiType;
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Convert XML attributes into raw array with attributes.
+     *
+     * @param  \DOMElement $element
+     * @return array
+     */
+    private function getAttributes(\DOMElement $element): array
+    {
+        $attributes = [];
+        $attributeNodes = $element->attributes;
+
+        /** @var \DOMAttr $attribute */
+        foreach ($attributeNodes as $domAttr) {
+            $attributes[$domAttr->name] = $domAttr->value;
+        }
+
+        return $attributes;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/ColumnSavior.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/ColumnSavior.php
new file mode 100644
index 0000000000000..8394e9e16208e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/ColumnSavior.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\SelectFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Allows to dump and restore data for one specific field
+ */
+class ColumnSavior implements DataSaviorInterface
+{
+    /**
+     * @var SelectGeneratorFactory
+     */
+    private $selectGeneratorFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var UniqueConstraintsResolver
+     */
+    private $uniqueConstraintsResolver;
+
+    /**
+     * @var DumpAccessorInterface
+     */
+    private $dumpAccessor;
+
+    /**
+     * @var SelectFactory
+     */
+    private $selectFactory;
+
+    /**
+     * TableDump constructor.
+     * @param ResourceConnection $resourceConnection
+     * @param SelectGeneratorFactory $selectGeneratorFactory
+     * @param DumpAccessorInterface $dumpAccessor
+     * @param UniqueConstraintsResolver $uniqueConstraintsResolver
+     * @param SelectFactory $selectFactory
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        SelectGeneratorFactory $selectGeneratorFactory,
+        DumpAccessorInterface $dumpAccessor,
+        UniqueConstraintsResolver $uniqueConstraintsResolver,
+        SelectFactory $selectFactory
+    ) {
+        $this->selectGeneratorFactory = $selectGeneratorFactory;
+        $this->resourceConnection = $resourceConnection;
+        $this->uniqueConstraintsResolver = $uniqueConstraintsResolver;
+        $this->dumpAccessor = $dumpAccessor;
+        $this->selectFactory = $selectFactory;
+    }
+
+    /**
+     * Prepare select to database
+     *
+     * @param Column $column
+     * @param array $fieldsToDump
+     * @return \Magento\Framework\DB\Select
+     */
+    private function prepareColumnSelect(Column $column, array $fieldsToDump)
+    {
+        $adapter = $this->resourceConnection->getConnection($column->getTable()->getResource());
+        $select = $this->selectFactory->create($adapter);
+        $select->from($column->getTable()->getName(), $fieldsToDump);
+        return $select;
+    }
+
+    /**
+     * @inheritdoc
+     * @param Column | ElementInterface $column
+     * @return void
+     */
+    public function dump(ElementInterface $column)
+    {
+        $columns = $this->uniqueConstraintsResolver->resolve($column->getTable());
+
+        /**
+         * Only if table have unique keys or primary key
+         */
+        if ($columns) {
+            $connectionName = $column->getTable()->getResource();
+            $columns[] = $column->getName();
+            $select = $this->prepareColumnSelect($column, $columns);
+            $selectGenerator = $this->selectGeneratorFactory->create();
+            $resourceSignature = $this->generateDumpFileSignature($column);
+
+            foreach ($selectGenerator->generator($select, $connectionName) as $data) {
+                $this->dumpAccessor->save($resourceSignature, $data);
+            }
+        }
+    }
+
+    /**
+     * Do Insert on duplicate to table, where field should be restored
+     *
+     * @param Table $table
+     * @param array $data
+     */
+    private function applyDumpChunk(Table $table, $data)
+    {
+        $columns = [];
+        $adapter = $this->resourceConnection->getConnection($table->getResource());
+        $firstRow = reset($data);
+
+        /**
+         * Prepare all table fields
+         */
+        foreach ($table->getColumns() as $column) {
+            $columns[$column->getName()] = $column->getName();
+        }
+
+        $adapter->insertOnDuplicate($table->getName(), $data, array_keys($firstRow));
+    }
+
+    /**
+     * @param Column | ElementInterface $column
+     * @return string
+     */
+    private function generateDumpFileSignature(Column $column)
+    {
+        $dimensions = [
+            $column->getTable()->getName(),
+            $column->getElementType(),
+            $column->getName()
+        ];
+
+        return implode("_", $dimensions);
+    }
+
+    /**
+     * @param Column | ElementInterface $column
+     * @inheritdoc
+     */
+    public function restore(ElementInterface $column)
+    {
+        $file = $this->generateDumpFileSignature($column);
+        $generator = $this->dumpAccessor->read($file);
+
+        while ($generator->valid()) {
+            $data = $generator->current();
+            $this->applyDumpChunk(
+                $column->getTable(),
+                $data
+            );
+            $generator->next();
+        }
+
+        $this->dumpAccessor->destruct($file);
+    }
+
+    /**
+     * @param ElementInterface $element
+     * @return bool
+     */
+    public function isAcceptable(ElementInterface $element)
+    {
+        return $element instanceof Column;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DataSaviorInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DataSaviorInterface.php
new file mode 100644
index 0000000000000..d8453b3a76222
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DataSaviorInterface.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * This interface allows to dump data during declarative installation process
+ * and revert changes with applying previously saved data, if something goes wrong
+ */
+interface DataSaviorInterface
+{
+    /**
+     * Generate dump file by element
+     *
+     * For example, it can generate file for removed column is_allowed, in this case
+     * this file will consists of data in is_allowed column and additional data, that allows
+     * to identify each `is_allowed` value
+     *
+     * @param ElementInterface $element
+     * @return void
+     */
+    public function dump(ElementInterface $element);
+
+    /**
+     * Find the field, that was backed up by file name, and tries to restore data
+     * that is in this file
+     *
+     * @param ElementInterface $element
+     * @return mixed
+     */
+    public function restore(ElementInterface $element);
+
+    /**
+     * Check whether this element is acceptable by current implementation of data savior
+     *
+     * @param ElementInterface $element
+     * @return bool
+     */
+    public function isAcceptable(ElementInterface $element);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DumpAccessorInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DumpAccessorInterface.php
new file mode 100644
index 0000000000000..dbfb5eb8512c5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DumpAccessorInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+/**
+ * Allows to access dump, that can be persisted in any file format or in database
+ */
+interface DumpAccessorInterface
+{
+    /**
+     * Allows to persist data to different sources: file, database, etc
+     *
+     * @param string $resource - can be for example absolute path to file
+     * @param array $data - data format, in which data should be stored
+     * @return void
+     */
+    public function save($resource, array $data);
+
+    /**
+     * Allows to read data by batches from different resources
+     *
+     * By resource means connection to database to absolute path to file, depends to implementation
+     *
+     * @param string $resource
+     * @return \Generator
+     */
+    public function read($resource);
+
+    /**
+     * Destruct resource
+     *
+     * @param string $resource
+     * @return void
+     */
+    public function destruct($resource);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php
new file mode 100644
index 0000000000000..08da74fb6a2b6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Db\Select;
+
+/**
+ * Yields data from database by select objects
+ */
+class SelectGenerator
+{
+    /**
+     * @var int
+     */
+    private $batchSize = 30000;
+
+    /**
+     * @var int
+     */
+    private $baseBatchSize;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * TableDump constructor.
+     * @param ResourceConnection $resourceConnection
+     * @param int $baseBatchSize
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        $baseBatchSize = 30000
+    ) {
+        $this->baseBatchSize = $baseBatchSize;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * It retrieves data by batches
+     *
+     * Select generator do not know what data he will fetch, so you need to pass builded Select statement in it
+     *
+     * @param Select $select
+     * @param string $connectionName
+     * @return \Generator
+     */
+    public function generator(Select $select, $connectionName)
+    {
+        $page = 0;
+        $select->limit($this->batchSize, $page * $this->batchSize);
+        $adapter = $this->resourceConnection->getConnection($connectionName);
+        $data = $adapter->fetchAll($select);
+        yield $data;
+
+        while (count($data)) {
+            ++$page;
+            $select->limit($this->batchSize, $page * $this->batchSize + 1);
+            $data = $adapter->fetchAll($select);
+            yield $data;
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGeneratorFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
new file mode 100644
index 0000000000000..35b39a520d2d7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory which allows to create SQL select generator
+ */
+class SelectGeneratorFactory
+{
+    /**
+     * @var string
+     */
+    private $instanceName;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * SelectGeneratorFactory constructor.
+     * @param ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $instanceName = SelectGenerator::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @return SelectGenerator
+     */
+    public function create()
+    {
+        return $this->objectManager->create($this->instanceName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/TableSavior.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/TableSavior.php
new file mode 100644
index 0000000000000..806f5df0c774e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/TableSavior.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\SelectFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Allows to dump and restore data for specific table
+ */
+class TableSavior implements DataSaviorInterface
+{
+    /**
+     * @var SelectGeneratorFactory
+     */
+    private $selectGeneratorFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DumpAccessorInterface
+     */
+    private $dumpAccessor;
+
+    /**
+     * @var SelectFactory
+     */
+    private $selectFactory;
+
+    /**
+     * TableDump constructor.
+     * @param ResourceConnection $resourceConnection
+     * @param SelectGeneratorFactory $selectGeneratorFactory
+     * @param DumpAccessorInterface $dumpAccessor
+     * @param SelectFactory $selectFactory
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        SelectGeneratorFactory $selectGeneratorFactory,
+        DumpAccessorInterface $dumpAccessor,
+        SelectFactory $selectFactory
+    ) {
+        $this->selectGeneratorFactory = $selectGeneratorFactory;
+        $this->resourceConnection = $resourceConnection;
+        $this->dumpAccessor = $dumpAccessor;
+        $this->selectFactory = $selectFactory;
+    }
+
+    /**
+     * Prepare select to database
+     *
+     * @param Table $table
+     * @return \Magento\Framework\DB\Select
+     */
+    private function prepareTableSelect(Table $table)
+    {
+        $adapter = $this->resourceConnection->getConnection($table->getResource());
+        $select = $this->selectFactory->create($adapter);
+        $select->from($table->getName());
+        return $select;
+    }
+
+    /**
+     * @inheritdoc
+     * @param Table | ElementInterface $table
+     * @return void
+     */
+    public function dump(ElementInterface $table)
+    {
+        $connectionName = $table->getResource();
+        $select = $this->prepareTableSelect($table);
+        $selectGenerator = $this->selectGeneratorFactory->create();
+        $resourceSignature = $this->generateDumpFileSignature($table);
+
+        foreach ($selectGenerator->generator($select, $connectionName) as $data) {
+            $this->dumpAccessor->save($resourceSignature, $data);
+        }
+    }
+
+    /**
+     * Prepare list of column names
+     *
+     * @param Table $table
+     * @return array
+     */
+    private function getTableColumnNames(Table $table)
+    {
+        $columns = [];
+        /**
+         * Prepare all table fields
+         */
+        foreach ($table->getColumns() as $column) {
+            $columns[] = $column->getName();
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Do Insert to table, that should be restored
+     *
+     * @param Table $table
+     * @param array $data
+     */
+    private function applyDumpChunk(Table $table, $data)
+    {
+        $columns = $this->getTableColumnNames($table);
+        $adapter = $this->resourceConnection->getConnection($table->getResource());
+        $adapter->insertArray($table->getName(), $columns, $data);
+    }
+
+    /**
+     * @param Table $table
+     * @return string
+     */
+    private function generateDumpFileSignature(Table $table)
+    {
+        return $table->getName();
+    }
+
+    /**
+     * @param Table | ElementInterface $table
+     * @inheritdoc
+     */
+    public function restore(ElementInterface $table)
+    {
+        $file = $this->generateDumpFileSignature($table);
+        $generator = $this->dumpAccessor->read($file);
+
+        while ($generator->valid()) {
+            $data = $generator->current();
+            $this->applyDumpChunk($table, $data);
+            $generator->next();
+        }
+
+        $this->dumpAccessor->destruct($file);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isAcceptable(ElementInterface $element)
+    {
+        return $element instanceof Table;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
new file mode 100644
index 0000000000000..823f6e3e91590
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Search for any unique constraints in table
+ */
+class UniqueConstraintsResolver
+{
+    /**
+     * Retrieve list of all columns that are in one unique constraints. Yields the first constraint and stop on it
+     *
+     * @param Table $table
+     * @return array | bool If method return false, it means that table do not have any unique constraints and can`t be
+     * processed
+     */
+    public function resolve(Table $table)
+    {
+        $primaryKey = $table->getPrimaryConstraint();
+        if ($primaryKey) {
+            return $primaryKey->getColumnNames();
+        }
+
+        $constraints = $table->getConstraints();
+
+        foreach ($constraints as $constraint) {
+            if ($constraint instanceof Internal) {
+                return $constraint->getColumnNames();
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php
new file mode 100644
index 0000000000000..596e66367c727
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.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\Setup\Declaration\Schema\Db;
+
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+
+/**
+ * DDL triggers is events that can be fired:
+ *  - after element creation;
+ *  - before/after element modification
+ *  - before element removal
+ *
+ * Trigger is used to make changes in data not in schema, e.g migrate data from column of one table to
+ * column of another table.
+ *
+ * Please note: triggers are used to serve needs of some operations, that can`t be described with declarative schema,
+ * for example: renaming. Renaming implemented with removal column with old name and creating with new one.
+ * Question with data is solved with help of triggers, that allows to migrate data.
+ * This approach is correct from prospective of declaration but is not so fast as ALTER TABLE is.
+ * So if you need to perform some renaming operations quickly, please use raw SQL dump instead, that can be taken with
+ * help of --dry-run mode
+ */
+interface DDLTriggerInterface
+{
+    /**
+     * Check whether current trigger can be applied to current statement.
+     *
+     * @param string $statement
+     * @return bool
+     */
+    public function isApplicable(string $statement) : bool ;
+
+    /**
+     * Setup callback to current statement, can generate new statements.
+     *
+     * @param ElementHistory $elementHistory
+     * @return callable
+     */
+    public function getCallback(ElementHistory $elementHistory) : callable;
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbDefinitionProcessorInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
new file mode 100644
index 0000000000000..1bfae47601568
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Do processing strings to desired format:
+ * For example, from VARCHAR(255) to:
+ * 'type' => 'varchar'
+ * 'length' => 255
+ */
+interface DbDefinitionProcessorInterface
+{
+    /**
+     * Output always will be SQL definition.
+     *
+     * @param  ElementInterface $column
+     * @return string
+     */
+    public function toDefinition(ElementInterface $column);
+
+    /**
+     * Input always will be array of SQL definitions,
+     * like:
+     *  'type' => 'name VARCHAR(255)'\
+     *  'nullable' => 'no'
+     *
+     * @param  array $data
+     * @return array
+     */
+    public function fromDefinition(array $data);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php
new file mode 100644
index 0000000000000..9f1391970e975
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+/**
+ * This class is responsible for read different schema
+ * structural elements: indexes, constraints, table names and columns.
+ */
+interface DbSchemaReaderInterface
+{
+    /**
+     * Read indexes from Magento tables.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function readIndexes($tableName, $resource);
+
+    /**
+     * Read constraints from Magento tables.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function readConstraints($tableName, $resource);
+
+    /**
+     * Read columns from Magento tables.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function readColumns($tableName, $resource);
+
+    /**
+     * Show table options like engine, partitioning, etc.
+     *
+     * @param string $tableName
+     * @param string $resource
+     * @return array
+     */
+    public function getTableOptions($tableName, $resource);
+
+    /**
+     * Read references (foreign keys) from Magento tables.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function readReferences($tableName, $resource);
+
+    /**
+     * Read table names from Magento tables.
+     *
+     * @param  string $resource
+     * @return array
+     */
+    public function readTables($resource);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php
new file mode 100644
index 0000000000000..d8c2e7148562d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+/**
+ * This class is responsible for read different schema structural elements: indexes, constraints,
+ * table names and columns.
+ */
+interface DbSchemaWriterInterface
+{
+    /**
+     * Type for all alter statements.
+     */
+    const ALTER_TYPE = 'alter';
+
+    /**
+     * Type for all create statements.
+     */
+    const CREATE_TYPE = 'create';
+
+    /**
+     * Type for all drop statements.
+     */
+    const DROP_TYPE = 'drop';
+
+    /**
+     * Create table from SQL fragments, like columns, constraints, foreign keys, indexes, etc.
+     *
+     * @param $tableName
+     * @param $resource
+     * @param  array $definition
+     * @param array $options
+     * @return Statement
+     */
+    public function createTable($tableName, $resource, array $definition, array $options);
+
+    /**
+     * Drop table from SQL database.
+     *
+     * @param string $tableName
+     * @param string $resource
+     * @return Statement
+     */
+    public function dropTable($tableName, $resource);
+
+    /**
+     * Add generic element to table (table must be specified in elementOptions).
+     *
+     * Can be: column, constraint, index.
+     *
+     * @param string $elementName
+     * @param string $resource
+     * @param string $tableName
+     * @param string $elementDefinition , for example: like CHAR(200) NOT NULL
+     * @param string $elementType
+     * @return Statement
+     */
+    public function addElement($elementName, $resource, $tableName, $elementDefinition, $elementType);
+
+    /**
+     * Return statements which reset auto_increment to 1.
+     *
+     * @param string $tableName
+     * @param string $resource
+     * @return Statement
+     */
+    public function resetAutoIncrement($tableName, $resource);
+
+    /**
+     * Modify column and change it definition.
+     *
+     * Note: only column can be modified.
+     *
+     * @param string $columnName
+     * @param string $resource
+     * @param string $tableName
+     * @param  string $columnDefinition
+     * @return Statement
+     */
+    public function modifyColumn($columnName, $resource, $tableName, $columnDefinition);
+
+    /**
+     * Modify any table option, like comment, engine, etc...
+     *
+     * @param string $tableName
+     * @param string $resource
+     * @param string $optionName
+     * @param string $optionValue
+     * @return Statement
+     */
+    public function modifyTableOption($tableName, $resource, $optionName, $optionValue);
+
+    /**
+     * Drop any element (constraint, column, index) from index.
+     *
+     * @param string $resource
+     * @param string $elementName
+     * @param string $tableName
+     * @param string $type
+     * @return Statement
+     */
+    public function dropElement($resource, $elementName, $tableName, $type);
+
+    /**
+     * Compile statements and make SQL request from them.
+     *
+     * @param StatementAggregator $statementAggregator
+     * @param bool $dryRun
+     * @return void
+     */
+    public function compile(StatementAggregator $statementAggregator, $dryRun);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
new file mode 100644
index 0000000000000..f9918a1b8d504
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Holds different definitions and apply them depends on column, constraint, index types.
+ * Converts object to definition, and definition to array.
+ *
+ * @inheritdoc
+ */
+class DefinitionAggregator implements DbDefinitionProcessorInterface
+{
+    /**
+     * @var DbDefinitionProcessorInterface[]
+     */
+    private $definitionProcessors;
+
+    /**
+     * Constructor.
+     *
+     * @param DbDefinitionProcessorInterface[] $definitionProcessors
+     */
+    public function __construct(array $definitionProcessors)
+    {
+        $this->definitionProcessors = $definitionProcessors;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        $type = $column->getType();
+        if (!isset($this->definitionProcessors[$type])) {
+            throw new \InvalidArgumentException(
+                sprintf("Cannot process object to definition for type %s", $type)
+            );
+        }
+
+        $definitionProcessor = $this->definitionProcessors[$type];
+        return $definitionProcessor->toDefinition($column);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $type = $data['type'];
+        if (!isset($this->definitionProcessors[$type])) {
+            throw new \InvalidArgumentException(
+                sprintf("Cannot process definition to array for type %s", $type)
+            );
+        }
+
+        $definitionProcessor = $this->definitionProcessors[$type];
+        return $definitionProcessor->fromDefinition($data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php
new file mode 100644
index 0000000000000..4c1b2b8373c52
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\DataSavior\SelectGenerator;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+
+/**
+ * Used to migrate data from one column to another in scope of one table.
+ * Also can add statement in case when data can`t be migrate easily.
+ */
+class MigrateDataBetweenShards implements DDLTriggerInterface
+{
+    /**
+     * This flag says, whether we should to skip data migration from one shard to another
+     */
+    const SKIP_MIGRATION_DATA_FLAG = 'skip-migration';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var SelectGenerator
+     */
+    private $selectGenerator;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param SelectGenerator $selectGenerator
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        SelectGenerator $selectGenerator
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->selectGenerator = $selectGenerator;
+    }
+
+    /**
+     * If skip migration flag is enabled, we should skip data migration
+     *
+     * @inheritdoc
+     */
+    public function isApplicable(string $statement) : bool
+    {
+        return $statement !== self::SKIP_MIGRATION_DATA_FLAG;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCallback(ElementHistory $elementHistory) : callable
+    {
+        /** @var Table $newTable */
+        $newTable = $elementHistory->getNew();
+        /** @var Table $oldTable */
+        $oldTable = $elementHistory->getOld();
+        $that = $this;
+
+        return function () use ($newTable, $oldTable, $that) {
+            $firstConnection = $that->resourceConnection->getConnection($oldTable->getResource());
+            $secondConnection = $that->resourceConnection->getConnection($newTable->getResource());
+            $select = $firstConnection->select()->from($oldTable->getName());
+
+            foreach ($this->selectGenerator->generator($select, $oldTable->getResource()) as $data) {
+                if (count($data)) {
+                    $columns = array_keys($data[0]);
+                    $secondConnection->insertArray($newTable->getName(), $columns, $data);
+                }
+            }
+        };
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
new file mode 100644
index 0000000000000..cb969fb9367f2
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Sql\Expression;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+
+/**
+ * Used to migrate data from one column to another in scope of one table.
+ * Also can add statement in case when data can`t be migrate easily.
+ */
+class MigrateDataFrom implements DDLTriggerInterface
+{
+    /**
+     * Pattern with which we can match whether we can apply and use this trigger or not.
+     */
+    const MATCH_PATTERN = '/migrateDataFrom\(([^\)]+)\)/';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isApplicable(string $statement) : bool
+    {
+        return (bool) preg_match(self::MATCH_PATTERN, $statement);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCallback(ElementHistory $columnHistory) : callable
+    {
+        /** @var Column $column */
+        $column = $columnHistory->getNew();
+        preg_match(self::MATCH_PATTERN, $column->getOnCreate(), $matches);
+        return function () use ($column, $matches) {
+            $tableName = $column->getTable()->getName();
+            $adapter = $this->resourceConnection->getConnection(
+                $column->getTable()->getResource()
+            );
+            $adapter
+                ->update(
+                    $this->resourceConnection->getTableName($tableName),
+                    [
+                        $column->getName() => new Expression($matches[1])
+                    ]
+                );
+        };
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php
new file mode 100644
index 0000000000000..0f97fc9d6f243
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+
+/**
+ * Used to migrate all the data from one table to another one
+ */
+class MigrateDataFromAnotherTable implements DDLTriggerInterface
+{
+    /**
+     * Pattern with which we can match whether we can apply and use this trigger or not.
+     */
+    const MATCH_PATTERN = '/migrateDataFromAnotherTable\(([^\)]+)\)/';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isApplicable(string $statement) : bool
+    {
+        return (bool) preg_match(self::MATCH_PATTERN, $statement);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCallback(ElementHistory $tableHistory) : callable
+    {
+        /** @var Table $table */
+        $table = $tableHistory->getNew();
+        preg_match(self::MATCH_PATTERN, $table->getOnCreate(), $matches);
+        return function () use ($table, $matches) {
+            $tableName = $table->getName();
+            $oldTableName = $this->resourceConnection->getTableName($matches[1]);
+            $adapter = $this->resourceConnection->getConnection($table->getResource());
+            $select = $adapter->select()->from($oldTableName);
+            $adapter->query($adapter->insertFromSelect($select, $tableName));
+        };
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
new file mode 100644
index 0000000000000..1a57911d8ace1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Sql\Expression;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+
+/**
+ * @inheritdoc
+ */
+class DbSchemaReader implements DbSchemaReaderInterface
+{
+    /**
+     * Table type in information_schema.TABLES which allows to identify only tables and ignore views
+     */
+    const MYSQL_TABLE_TYPE = 'BASE TABLE';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param DefinitionAggregator $definitionAggregator
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        DefinitionAggregator $definitionAggregator
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->definitionAggregator = $definitionAggregator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTableOptions($tableName, $resource)
+    {
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $dbName = $this->resourceConnection->getSchemaName($resource);
+        $stmt = $adapter->select()
+            ->from(
+                ['i_tables' => 'information_schema.TABLES'],
+                [
+                    'engine' => 'ENGINE',
+                    'comment' => 'TABLE_COMMENT',
+                    'collation' => 'TABLE_COLLATION'
+                ]
+            )
+            ->joinInner(
+                ['charset_applicability' => 'information_schema.COLLATION_CHARACTER_SET_APPLICABILITY'],
+                'i_tables.table_collation = charset_applicability.collation_name',
+                [
+                    'charset' => 'charset_applicability.CHARACTER_SET_NAME'
+                ]
+            )
+            ->where('TABLE_SCHEMA = ?', $dbName)
+            ->where('TABLE_NAME = ?', $tableName);
+
+        return $adapter->fetchRow($stmt);
+    }
+
+    /**
+     * Prepare and fetch query: Describe {table_name}.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function readColumns($tableName, $resource)
+    {
+        $columns = [];
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $dbName = $this->resourceConnection->getSchemaName($resource);
+        $stmt = $adapter->select()
+            ->from(
+                'information_schema.COLUMNS',
+                [
+                    'name' => 'COLUMN_NAME',
+                    'default' => 'COLUMN_DEFAULT',
+                    'type' => 'DATA_TYPE',
+                    'nullable' => new Expression('IF(IS_NULLABLE="YES", true, false)'),
+                    'definition' => 'COLUMN_TYPE',
+                    'extra' => 'EXTRA',
+                    'comment' => new Expression('IF(COLUMN_COMMENT="", NULL, COLUMN_COMMENT)')
+                ]
+            )
+            ->where('TABLE_SCHEMA = ?', $dbName)
+            ->where('TABLE_NAME = ?', $tableName)
+            ->order('ORDINAL_POSITION ASC');
+
+        $columnsDefinition = $adapter->fetchAssoc($stmt);
+
+        foreach ($columnsDefinition as $columnDefinition) {
+            $column = $this->definitionAggregator->fromDefinition($columnDefinition);
+            $columns[$column['name']] = $column;
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Fetch all indexes from table.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function readIndexes($tableName, $resource)
+    {
+        $indexes = [];
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $condition = sprintf('`Non_unique` = 1');
+        $sql = sprintf('SHOW INDEXES FROM %s WHERE %s', $tableName, $condition);
+        $stmt = $adapter->query($sql);
+
+        // Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
+        $indexesDefinition = $stmt->fetchAll(\Zend_Db::FETCH_ASSOC);
+
+        foreach ($indexesDefinition as $indexDefinition) {
+            $indexDefinition['type'] = 'index';
+            $index = $this->definitionAggregator->fromDefinition($indexDefinition);
+
+            if (!isset($indexes[$index['name']])) {
+                $indexes[$index['name']] = [];
+            }
+
+            $indexes[$index['name']] = array_replace_recursive($indexes[$index['name']], $index);
+        }
+
+        return $indexes;
+    }
+
+    /**
+     * As MySQL has bug and do not show foreign keys during DESCRIBE and other directives required
+     * to take it from SHOW CREATE TABLE ...
+     * command
+     *
+     * @inheritdoc
+     */
+    public function readReferences($tableName, $resource)
+    {
+        $createTableSql = $this->getCreateTableSql($tableName, $resource);
+        $createTableSql['type'] = 'reference';
+        return $this->definitionAggregator->fromDefinition($createTableSql);
+    }
+
+    /**
+     * Retrieve Create table SQL, from SHOW CREATE TABLE query.
+     *
+     * @param  string $tableName
+     * @param  string $resource
+     * @return array
+     */
+    public function getCreateTableSql($tableName, $resource)
+    {
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $sql = sprintf('SHOW CREATE TABLE %s', $tableName);
+        $stmt = $adapter->query($sql);
+        return $stmt->fetch(\Zend_Db::FETCH_ASSOC);
+    }
+
+    /**
+     * Reading DB constraints.
+     * Primary and unique constraints are always non_unique=0.
+     *
+     * @inheritdoc
+     */
+    public function readConstraints($tableName, $resource)
+    {
+        $constraints = [];
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $condition = sprintf('`Non_unique` = 0');
+        $sql = sprintf('SHOW INDEXES FROM %s WHERE %s', $tableName, $condition);
+        $stmt = $adapter->query($sql);
+
+        // Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
+        $constraintsDefinition = $stmt->fetchAll(\Zend_Db::FETCH_ASSOC);
+
+        foreach ($constraintsDefinition as $constraintDefinition) {
+            $constraintDefinition['type'] = Constraint::TYPE;
+            $constraint = $this->definitionAggregator->fromDefinition($constraintDefinition);
+
+            if (!isset($constraints[$constraint['name']])) {
+                $constraints[$constraint['name']] = [];
+            }
+
+            $constraints[$constraint['name']] = array_replace_recursive($constraints[$constraint['name']], $constraint);
+        }
+
+        return $constraints;
+    }
+
+    /**
+     * Return names of all tables from shard.
+     *
+     * @param  string $resource Shard name.
+     * @return array
+     */
+    public function readTables($resource)
+    {
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $dbName = $this->resourceConnection->getSchemaName($resource);
+        $stmt = $adapter->select()
+            ->from(
+                ['information_schema.TABLES'],
+                ['TABLE_NAME']
+            )
+            ->where('TABLE_SCHEMA = ?', $dbName)
+            ->where('TABLE_TYPE = ?', self::MYSQL_TABLE_TYPE);
+        return $adapter->fetchCol($stmt);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
new file mode 100644
index 0000000000000..65998e7541111
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+
+/**
+ * @inheritdoc
+ */
+class DbSchemaWriter implements DbSchemaWriterInterface
+{
+    /**
+     * Statement directives with which we will decide what to do with tables.
+     *
+     * @var array
+     */
+    private $statementDirectives = [
+        self::ALTER_TYPE => 'ALTER TABLE %s %s',
+        self::CREATE_TYPE => 'CREATE TABLE %s %s',
+        self::DROP_TYPE => 'DROP TABLE %s'
+    ];
+
+    /**
+     * Table options mapping
+     *
+     * @var array
+     */
+    private $tableOptions = [
+        'charset' => 'DEFAULT CHARSET',
+        'collation' => 'DEFAULT COLLATE',
+        'engine' => 'ENGINE',
+        'comment' => 'COMMENT'
+    ];
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var StatementFactory
+     */
+    private $statementFactory;
+
+    /**
+     * @var DryRunLogger
+     */
+    private $dryRunLogger;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param StatementFactory $statementFactory
+     * @param DryRunLogger $dryRunLogger
+     * @param array $tableOptions
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        StatementFactory $statementFactory,
+        DryRunLogger $dryRunLogger,
+        array $tableOptions = []
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->statementFactory = $statementFactory;
+        $this->dryRunLogger = $dryRunLogger;
+        $this->tableOptions = array_replace($this->tableOptions, $tableOptions);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createTable($tableName, $resource, array $definition, array $options)
+    {
+        $sql = sprintf(
+            "(\n%s\n) ENGINE=%s DEFAULT CHARSET=%s DEFAULT COLLATE=%s %s",
+            implode(", \n", $definition),
+            $options['engine'],
+            $options['charset'],
+            $options['collation'],
+            isset($options['comment']) ? sprintf('COMMENT="%s"', $options['comment']) : ''
+        );
+
+        return $this->statementFactory->create(
+            $tableName,
+            $tableName,
+            self::CREATE_TYPE,
+            $sql,
+            $resource
+        );
+    }
+
+    /**
+     * Drop table from MySQL database.
+     *
+     * @inheritdoc
+     */
+    public function dropTable($tableName, $resource)
+    {
+        return $this->statementFactory->create(
+            $tableName,
+            $tableName,
+            self::DROP_TYPE,
+            '',
+            $resource
+        );
+    }
+
+    /**
+     * No names specified for Primary Keys.
+     *
+     * As MySQL do not have DROP CONSTRAINT syntax, different DROP statements for different operations are required.
+     *
+     * @param  string $type
+     * @param  string $name
+     * @return string
+     */
+    private function getDropElementSQL($type, $name)
+    {
+        switch ($type) {
+            case Constraint::PRIMARY_TYPE:
+                return 'DROP PRIMARY KEY';
+            case Constraint::UNIQUE_TYPE:
+                return sprintf('DROP KEY %s', $name);
+            case \Magento\Framework\Setup\Declaration\Schema\Dto\Index::TYPE:
+                return sprintf('DROP INDEX %s', $name);
+            case Reference::TYPE:
+                return sprintf('DROP FOREIGN KEY %s', $name);
+            default:
+                return sprintf('DROP COLUMN %s', $name);
+        }
+    }
+
+    /**
+     * Add element to existing table: column, constraint or index.
+     *
+     * @inheritdoc
+     */
+    public function addElement($elementName, $resource, $tableName, $elementDefinition, $elementType)
+    {
+        $addElementSyntax = $elementType === Column::TYPE ? 'ADD COLUMN %s' : 'ADD %s';
+        $sql = sprintf(
+            $addElementSyntax,
+            $elementDefinition
+        );
+        return $this->statementFactory->create(
+            $elementName,
+            $tableName,
+            self::ALTER_TYPE,
+            $sql,
+            $resource,
+            $elementType
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyTableOption($tableName, $resource, $optionName, $optionValue)
+    {
+        return $this->statementFactory->create(
+            $tableName,
+            $tableName,
+            self::ALTER_TYPE,
+            sprintf("%s='%s'", $this->tableOptions[$optionName], $optionValue),
+            $resource
+        );
+    }
+
+    /**
+     * Modify column and change its definition.
+     *
+     * @inheritdoc
+     */
+    public function modifyColumn($columnName, $resource, $tableName, $columnDefinition)
+    {
+        $sql = sprintf(
+            'MODIFY COLUMN %s',
+            $columnDefinition
+        );
+        return $this->statementFactory->create(
+            $columnName,
+            $tableName,
+            self::ALTER_TYPE,
+            $sql,
+            $resource
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function dropElement($resource, $elementName, $tableName, $type)
+    {
+        $adapter = $this->resourceConnection->getConnection($resource);
+
+        $sql = sprintf(
+            '%s',
+            $this->getDropElementSQL(
+                $type,
+                $adapter->quoteIdentifier($elementName)
+            )
+        );
+        return $this->statementFactory->create(
+            $elementName,
+            $tableName,
+            self::ALTER_TYPE,
+            $sql,
+            $resource,
+            $type
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resetAutoIncrement($tableName, $resource)
+    {
+        $sql = 'AUTO_INCREMENT = 1';
+        return $this->statementFactory->create(
+            sprintf('RESET_AUTOINCREMENT_%s', $tableName),
+            $tableName,
+            self::ALTER_TYPE,
+            $sql,
+            $resource
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function compile(StatementAggregator $statementAggregator, $dryRun)
+    {
+        foreach ($statementAggregator->getStatementsBank() as $statementBank) {
+            $statementsSql = [];
+            /** @var Statement $statement */
+            foreach ($statementBank as $statement) {
+                $statementsSql[] = $statement->getStatement();
+            }
+            $adapter = $this->resourceConnection->getConnection($statement->getResource());
+
+            if ($dryRun) {
+                $this->dryRunLogger->log(
+                    sprintf(
+                        $this->statementDirectives[$statement->getType()],
+                        $adapter->quoteIdentifier($statement->getTableName()),
+                        implode(", ", $statementsSql)
+                    )
+                );
+            } else {
+                $adapter->query(
+                    sprintf(
+                        $this->statementDirectives[$statement->getType()],
+                        $adapter->quoteIdentifier($statement->getTableName()),
+                        implode(", ", $statementsSql)
+                    )
+                );
+                //Do post update, like SQL DML operations or etc...
+                foreach ($statement->getTriggers() as $trigger) {
+                    call_user_func($trigger);
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
new file mode 100644
index 0000000000000..213e4a52beee0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Process blob and text types.
+ *
+ * @inheritdoc
+ */
+class Blob implements DbDefinitionProcessorInterface
+{
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * Blob constructor.
+     *
+     * @param Nullable $nullable
+     * @param Comment $comment
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        Nullable $nullable,
+        Comment $comment,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->nullable = $nullable;
+        $this->resourceConnection = $resourceConnection;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return sprintf(
+            '%s %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            $column->getType(),
+            $this->nullable->toDefinition($column),
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $matches = [];
+        if (preg_match('/^text\s*\((\d+)\)/', $data['definition'], $matches) && isset($matches[1])) {
+            $data['length'] = $matches[1];
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
new file mode 100644
index 0000000000000..5b8c5e2d4a60b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * As all MySQL aliases as BOOL or BOOLEAN are converted to TINYINT(1)
+ * proposed to processed tinyint as boolean.
+ *
+ * @inheritdoc
+ */
+class Boolean implements DbDefinitionProcessorInterface
+{
+    /**
+     * Type the column is persisted with.
+     */
+    const TYPE = 'BOOLEAN';
+
+    /**
+     * Type of integer that is used in MySQL for boolean.
+     */
+    const INTEGER_TYPE = 'tinyint';
+
+    /**
+     * Padding for integer described below.
+     */
+    const INTEGER_PADDING = '1';
+
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * Constructor.
+     *
+     * @param Nullable $nullable
+     * @param ResourceConnection $resourceConnection
+     * @param Comment $comment
+     */
+    public function __construct(
+        Nullable $nullable,
+        ResourceConnection $resourceConnection,
+        Comment $comment
+    ) {
+        $this->nullable = $nullable;
+        $this->resourceConnection = $resourceConnection;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return sprintf(
+            '%s %s %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            self::TYPE,
+            $this->nullable->toDefinition($column),
+            $column->getDefault() !== null ?
+                sprintf('DEFAULT %s', $column->getDefault() ? 1 : 0) : '',
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * Boolean is presented as tinyint(1).
+     *
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        if ($data['type'] === self::INTEGER_TYPE && $data['padding'] === self::INTEGER_PADDING) {
+            $data['type'] = strtolower(self::TYPE);
+            if (isset($data['default'])) {
+                $data['default'] = $data['default'] === null ? null : (bool) $data['default'];
+            }
+            $data['unsigned'] = false; //Not signed for boolean
+            unset($data['padding']);
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
new file mode 100644
index 0000000000000..203c9d7f86280
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Comment definition processor.
+ *
+ * @inheritdoc
+ */
+class Comment implements DbDefinitionProcessorInterface
+{
+    /**
+     * @param Column $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return $column->getComment() !== null ? sprintf('COMMENT "%s"', $column->getComment()) : '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
new file mode 100644
index 0000000000000..bc933e12f67b6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Date type processor.
+ *
+ * @inheritdoc
+ */
+class Date implements DbDefinitionProcessorInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param Nullable $nullable
+     * @param Comment $comment
+     */
+    public function __construct(ResourceConnection $resourceConnection, Nullable $nullable, Comment $comment)
+    {
+        $this->resourceConnection = $resourceConnection;
+        $this->comment = $comment;
+        $this->nullable = $nullable;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return sprintf(
+            '%s %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            $column->getType(),
+            $this->nullable->toDefinition($column),
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     * @codeCoverageIgnore
+     */
+    public function fromDefinition(array $data)
+    {
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
new file mode 100644
index 0000000000000..cf0c2b6edd2c9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnIdentityAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Identity (auto_increment) column processor.
+ *
+ * @inheritdoc
+ */
+class Identity implements DbDefinitionProcessorInterface
+{
+    /**
+     * Auto increment flag.
+     */
+    const IDENTITY_FLAG = 'auto_increment';
+
+    /**
+     * @param ColumnIdentityAwareInterface $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return $column->isIdentity() ? strtoupper(self::IDENTITY_FLAG) : '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        if (!empty($data['extra']) && stripos($data['extra'], self::IDENTITY_FLAG) !== false) {
+            $data['identity'] = true;
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
new file mode 100644
index 0000000000000..1d08c5bea4eb0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Integer type processor.
+ *
+ * Processes integer type and separate it on type and padding.
+ *
+ * @inheritdoc
+ */
+class Integer implements DbDefinitionProcessorInterface
+{
+    /**
+     * @var Unsigned
+     */
+    private $unsigned;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean
+     */
+    private $boolean;
+
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * @var Identity
+     */
+    private $identity;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * Constructor.
+     *
+     * @param Unsigned $unsigned
+     * @param bool $boolean
+     * @param Nullable $nullable
+     * @param Identity $identity
+     * @param Comment $comment
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        Unsigned $unsigned,
+        Boolean $boolean,
+        Nullable $nullable,
+        Identity $identity,
+        Comment $comment,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->unsigned = $unsigned;
+        $this->boolean = $boolean;
+        $this->nullable = $nullable;
+        $this->identity = $identity;
+        $this->resourceConnection = $resourceConnection;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @inheritdoc
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer $column
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return sprintf(
+            '%s %s(%s) %s %s %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            $column->getType(),
+            $column->getPadding(),
+            $this->unsigned->toDefinition($column),
+            $this->nullable->toDefinition($column),
+            $column->getDefault() !== null ?
+                sprintf('DEFAULT %s', (string) (int)$column->getDefault()) : '',
+            $this->identity->toDefinition($column),
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $matches = [];
+        if (preg_match('/^(big|small|tiny|medium)?int\((\d+)\)/', $data['definition'], $matches)) {
+            /**
+             * match[1] - prefix
+             * match[2] - padding, like 5 or 11
+             */
+            //Use shortcut for mediuminteger
+            $data['padding'] = $matches[2];
+            $data = $this->unsigned->fromDefinition($data);
+            $data = $this->nullable->fromDefinition($data);
+            $data = $this->identity->fromDefinition($data);
+            $data = $this->boolean->fromDefinition($data);
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
new file mode 100644
index 0000000000000..95b2a5eed5476
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Nullable columns processor.
+ *
+ * @inheritdoc
+ */
+class Nullable implements DbDefinitionProcessorInterface
+{
+    /**
+     * @param ColumnNullableAwareInterface $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        if ($column instanceof ColumnNullableAwareInterface) {
+            return $column->isNullable() ? 'NULL' : 'NOT NULL';
+        }
+
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
new file mode 100644
index 0000000000000..187f710b40edf
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * On update statement processor.
+ *
+ * @inheritdoc
+ */
+class OnUpdate implements DbDefinitionProcessorInterface
+{
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        if ($column instanceof \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp) {
+            return $column->getOnUpdate() ?
+                'ON UPDATE CURRENT_TIMESTAMP' : '';
+        }
+
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $matches = [];
+        if (preg_match('/^(?:on update)\s([\_\-\s\w\d]+)/', $data['extra'], $matches)) {
+            $data['on_update'] = true;
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
new file mode 100644
index 0000000000000..43542f617f857
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Process real types and separate them into type, scale and precision.
+ * See https://dev.mysql.com/doc/refman/5.7/en/precision-math-decimal-characteristics.html
+ *
+ * @inheritdoc
+ */
+class Real implements DbDefinitionProcessorInterface
+{
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * @var Unsigned
+     */
+    private $unsigned;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * @param Nullable $nullable
+     * @param Unsigned $unsigned
+     * @param Comment $comment
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        Nullable $nullable,
+        Unsigned $unsigned,
+        Comment $comment,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->nullable = $nullable;
+        $this->unsigned = $unsigned;
+        $this->resourceConnection = $resourceConnection;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        if ($column->getPrecision() === 0 && $column->getScale() === 0) {
+            $type = $column->getType();
+        } else {
+            $type = sprintf('%s(%s, %s)', $column->getType(), $column->getPrecision(), $column->getScale());
+        }
+
+        return sprintf(
+            '%s %s %s %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            $type,
+            $this->unsigned->toDefinition($column),
+            $this->nullable->toDefinition($column),
+            $column->getDefault() !== null ?
+                sprintf('DEFAULT %s', $column->getDefault()) : '',
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $matches = [];
+        if (preg_match('/^(float|decimal|double)\s*\((\d+)\s*,\s*(\d+)\)/i', $data['definition'], $matches)) {
+            /**
+             * match[1] - type
+             * match[2] - precision
+             * match[3] - scale
+             */
+            $data['precision'] = $matches[2];
+            $data['scale'] = $matches[3];
+            $data = $this->nullable->fromDefinition($data);
+            $data = $this->unsigned->fromDefinition($data);
+        } elseif (preg_match('/^decimal\s*\(\s*(\d+)\s*\)/i', $data['definition'], $matches)) {
+            $data['precision'] = $matches[1];
+            $data['scale'] = 0;
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
new file mode 100644
index 0000000000000..c2fd270a8f949
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Processor for following types: char, varchar, varbinary, binary.
+ *
+ * @inheritdoc
+ */
+class StringBinary implements DbDefinitionProcessorInterface
+{
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * @param Nullable $nullable
+     * @param ResourceConnection $resourceConnection
+     * @param Comment $comment
+     */
+    public function __construct(Nullable $nullable, ResourceConnection $resourceConnection, Comment $comment)
+    {
+        $this->nullable = $nullable;
+        $this->resourceConnection = $resourceConnection;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        if ($column->getDefault() !== null) {
+            $default = sprintf('DEFAULT "%s"', $column->getDefault());
+        } else {
+            $default = '';
+        }
+
+        return sprintf(
+            '%s %s(%s) %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            $column->getType(),
+            $column->getLength(),
+            $this->nullable->toDefinition($column),
+            $default,
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $matches = [];
+        if (preg_match('/^(char|binary|varchar|varbinary)\s*\((\d+)\)/', $data['definition'], $matches)) {
+            $data['length'] = $matches[2];
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
new file mode 100644
index 0000000000000..6313fa7286dc1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Processor for timestamp/datetime types.
+ *
+ * @inheritdoc
+ */
+class Timestamp implements DbDefinitionProcessorInterface
+{
+    /**
+     * This date and time can be used, when const value as DEFAULT 0 was passed for datetime type.
+     */
+    const CONST_DEFAULT_TIMESTAMP = '0000-00-00 00:00:00';
+
+    /**
+     * @var OnUpdate
+     */
+    private $onUpdate;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    /**
+     * Constructor.
+     *
+     * @param OnUpdate $onUpdate
+     * @param Nullable $nullable
+     * @param Comment $comment
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        OnUpdate $onUpdate,
+        Nullable $nullable,
+        Comment $comment,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->onUpdate = $onUpdate;
+        $this->resourceConnection = $resourceConnection;
+        $this->nullable = $nullable;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        $nullable = $this->nullable->toDefinition($column);
+        $default  = $column->getDefault() === 'NULL'
+            ? ''
+            : sprintf('DEFAULT %s', $column->getDefault());
+
+        return sprintf(
+            '%s %s %s %s %s %s',
+            $this->resourceConnection->getConnection()->quoteIdentifier($column->getName()),
+            $column->getType(),
+            $nullable,
+            $default,
+            $this->onUpdate->toDefinition($column),
+            $this->comment->toDefinition($column)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        if ($data['default'] === self::CONST_DEFAULT_TIMESTAMP) {
+            $data['default'] = '0';
+        }
+        $data = $this->nullable->fromDefinition($data);
+        $data = $this->onUpdate->fromDefinition($data);
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
new file mode 100644
index 0000000000000..776998e8bc4a9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnUnsignedAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Unsigned flag processor.
+ * Unsigned can be used for all numeric types.
+ *
+ * @inheritdoc
+ */
+class Unsigned implements DbDefinitionProcessorInterface
+{
+    /**
+     * Unsigned flag. Applicable only to numeric types.
+     */
+    const UNSIGNED_FLAG = 'unsigned';
+
+    /**
+     * @param ColumnUnsignedAwareInterface $column
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $column)
+    {
+        return $column->isUnsigned() ? strtoupper(self::UNSIGNED_FLAG) : '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        $data['unsigned'] = stripos($data['definition'], self::UNSIGNED_FLAG) !== false;
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
new file mode 100644
index 0000000000000..6d11542bb49d3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Foreign key constraint processor.
+ *
+ * MySQL holds foreign keys definitions only in "CREATE TABLE" sql. So we can access them
+ * only with parsing of this statement, and searching by ADD CONSTRAINT FOREIGN KEY.
+ *
+ * @inheritdoc
+ */
+class ForeignKey implements DbDefinitionProcessorInterface
+{
+    /**
+     * Foreign key statement.
+     */
+    const FOREIGN_KEY_STATEMENT = 'FOREIGN KEY';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $foreignKey)
+    {
+        $adapter = $this->resourceConnection->getConnection(
+            $foreignKey->getTable()->getResource()
+        );
+        $referenceTable = $this->resourceConnection->getTableName(
+            $foreignKey->getReferenceTable()->getName()
+        );
+        //CONSTRAINT `fk_name` FOREIGN KEY (`column`) REFERENCES `table` (`column`) option
+        $foreignKeySql = sprintf(
+            "CONSTRAINT %s %s (%s) REFERENCES %s (%s) %s",
+            $adapter->quoteIdentifier($foreignKey->getName()),
+            self::FOREIGN_KEY_STATEMENT,
+            $adapter->quoteIdentifier($foreignKey->getColumn()->getName()),
+            $adapter->quoteIdentifier($referenceTable),
+            $adapter->quoteIdentifier($foreignKey->getReferenceColumn()->getName()),
+            $foreignKey->getOnDelete() ? sprintf(" ON DELETE %s", $foreignKey->getOnDelete()) : ''
+        );
+
+        return $foreignKeySql;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        if (!isset($data['Create Table'])) {
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase('Can`t read foreign keys from current database')
+            );
+        }
+
+        $createMySQL = $data['Create Table'];
+        $ddl = [];
+        $regExp  = '#,\s*CONSTRAINT\s*`([^`]*)`\s*FOREIGN KEY\s*?\(`([^`]*)`\)\s*'
+            . 'REFERENCES\s*(`([^`]*)`\.)?`([^`]*)`\s*\(`([^`]*)`\)\s*'
+            . '(\s*ON\s+DELETE\s*(RESTRICT|CASCADE|SET NULL|NO ACTION|SET DEFAULT))?'
+            . '(\s*ON\s+UPDATE\s*(RESTRICT|CASCADE|SET NULL|NO ACTION|SET DEFAULT))?#';
+        $matches = [];
+
+        if (preg_match_all($regExp, $createMySQL, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $ddl[$match[1]] = [
+                    'type' => Reference::TYPE,
+                    'name' => $match[1],
+                    'column' => $match[2],
+                    'referenceTable' => $match[5],
+                    'referenceColumn' => $match[6],
+                    'onDelete' => isset($match[7]) ? $match[8] : 'NO ACTION'
+                ];
+            }
+        }
+
+        return $ddl;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
new file mode 100644
index 0000000000000..52abd28a1c7a9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Internal key (index) processor.
+ *
+ * Detect primary or unique constraints and map them to appropriate format.
+ *
+ * @inheritdoc
+ */
+class Internal implements DbDefinitionProcessorInterface
+{
+    /**
+     * Name of Primary Key.
+     */
+    const PRIMARY_NAME = 'PRIMARY';
+
+    /**
+     * Primary key statement.
+     */
+    const PRIMARY_KEY_NAME = 'PRIMARY KEY';
+
+    /**
+     * Unique key statement.
+     */
+    const UNIQUE_KEY_NAME = 'UNIQUE KEY';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal $constraint
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $constraint)
+    {
+        $adapter = $this->resourceConnection->getConnection(
+            $constraint->getTable()->getResource()
+        );
+        $columnsList = array_map(
+            function ($columnName) use ($adapter) {
+                return $adapter->quoteIdentifier($columnName);
+            },
+            $constraint->getColumnNames()
+        );
+        $isPrimary = $constraint->getType() === 'primary';
+
+        return sprintf(
+            'CONSTRAINT %s %s (%s)',
+            $isPrimary ? '' : $adapter->quoteIdentifier($constraint->getName()),
+            $isPrimary ? 'PRIMARY KEY' : 'UNIQUE KEY',
+            implode(',', $columnsList)
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        return [
+            'name' => $data['Key_name'],
+            'column' => [
+                $data['Column_name'] => $data['Column_name']
+            ],
+            'type' => $data['Key_name'] === self::PRIMARY_NAME ? 'primary' : 'unique'
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Index.php
new file mode 100644
index 0000000000000..30150efd51774
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Index.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Index (key) processor.
+ *
+ * @inheritdoc
+ */
+class Index implements DbDefinitionProcessorInterface
+{
+    /**
+     * Index statement.
+     */
+    const INDEX_KEY_NAME = 'INDEX';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Index constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Index $index
+     * @inheritdoc
+     */
+    public function toDefinition(ElementInterface $index)
+    {
+        $indexType = $index->getIndexType();
+        //There is no matter what connection to use -> so use default one
+        $adapter = $this->resourceConnection->getConnection();
+        $isFullText = $indexType === \Magento\Framework\Setup\Declaration\Schema\Dto\Index::FULLTEXT_INDEX;
+        //index types, that are similar to MySQL ones, can just be uppercased.
+        //[FULLTEXT ]INDEX `name` [USING [BTREE|HASH]] (columns)
+        return sprintf(
+            '%sINDEX %s%s (%s)',
+            $isFullText ? 'FULLTEXT ' : '',
+            $adapter->quoteIdentifier($index->getName()),
+            '', // placeholder for USING HASH|BTREE statement for non-fulltext indexes
+            implode(
+                ',',
+                array_map(
+                    function ($columnName) use ($adapter) {
+                        return $adapter->quoteIdentifier($columnName);
+                    },
+                    $index->getColumnNames()
+                )
+            )
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function fromDefinition(array $data)
+    {
+        return [
+            'indexType' => strtolower($data['Index_type']),
+            'name' => $data['Key_name'],
+            'column' => [
+                $data['Column_name'] => $data['Column_name']
+            ],
+            'type' => 'index'
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/ReferenceStatement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/ReferenceStatement.php
new file mode 100644
index 0000000000000..234f3f048c5ea
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/ReferenceStatement.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+/**
+ * Foreign key statement.
+ *
+ * @inheritdoc
+ */
+class ReferenceStatement extends Statement
+{
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php
new file mode 100644
index 0000000000000..f7a2a0d91396d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+use Magento\Framework\Phrase;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Exception;
+
+/**
+ * This type of builder is responsible for converting ENTIRE data, that comes from db
+ * into DTO`s format, with aggregation root: Schema.
+ *
+ * Note: SchemaBuilder can not be used for one structural element, like column or constraint
+ * because it should have references to other DTO objects.
+ * In order to convert build only 1 structural element use directly it factory.
+ *
+ * @see        Schema
+ * @inheritdoc
+ */
+class SchemaBuilder
+{
+    /**
+     * @var ElementFactory
+     */
+    private $elementFactory;
+
+    /**
+     * @var DbSchemaReaderInterface
+     */
+    private $dbSchemaReader;
+
+    /**
+     * @var Sharding
+     */
+    private $sharding;
+
+    /**
+     * @var array
+     */
+    private $tables;
+
+    /**
+     * Constructor.
+     *
+     * @param ElementFactory          $elementFactory
+     * @param DbSchemaReaderInterface $dbSchemaReader
+     * @param Sharding                $sharding
+     */
+    public function __construct(
+        ElementFactory $elementFactory,
+        DbSchemaReaderInterface $dbSchemaReader,
+        Sharding $sharding
+    ) {
+        $this->elementFactory = $elementFactory;
+        $this->dbSchemaReader = $dbSchemaReader;
+        $this->sharding = $sharding;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(Schema $schema)
+    {
+        foreach ($this->sharding->getResources() as $resource) {
+            foreach ($this->dbSchemaReader->readTables($resource) as $tableName) {
+                $columns = [];
+                $indexes = [];
+                $constraints = [];
+
+                $tableOptions = $this->dbSchemaReader->getTableOptions($tableName, $resource);
+                $columnsData = $this->dbSchemaReader->readColumns($tableName, $resource);
+                $indexesData = $this->dbSchemaReader->readIndexes($tableName, $resource);
+                $constrainsData = $this->dbSchemaReader->readConstraints($tableName, $resource);
+
+                /**
+                 * @var Table $table
+                 */
+                $table = $this->elementFactory->create(
+                    'table',
+                    [
+                        'name' => $tableName,
+                        'resource' => $resource,
+                        'engine' => strtolower($tableOptions['engine']),
+                        'comment' => $tableOptions['comment'] === '' ? null : $tableOptions['comment'],
+                        'charset' => $tableOptions['charset'],
+                        'collation' => $tableOptions['collation']
+                    ]
+                );
+
+                // Process columns
+                foreach ($columnsData as $columnData) {
+                    $columnData['table'] = $table;
+                    $column = $this->elementFactory->create($columnData['type'], $columnData);
+                    $columns[$column->getName()] = $column;
+                }
+
+                $table->addColumns($columns);
+                //Process indexes
+                foreach ($indexesData as $indexData) {
+                    $indexData['table'] = $table;
+                    $indexData['columns'] = $this->resolveInternalRelations($columns, $indexData);
+                    $index = $this->elementFactory->create('index', $indexData);
+                    $indexes[$index->getName()] = $index;
+                }
+                //Process internal constraints
+                foreach ($constrainsData as $constraintData) {
+                    $constraintData['table'] = $table;
+                    $constraintData['columns'] = $this->resolveInternalRelations($columns, $constraintData);
+                    $constraint = $this->elementFactory->create($constraintData['type'], $constraintData);
+                    $constraints[$constraint->getName()] = $constraint;
+                }
+
+                $table->addIndexes($indexes);
+                $table->addConstraints($constraints);
+                $this->tables[$table->getName()] = $table;
+            }
+        }
+
+        $this->processReferenceKeys($this->tables, $schema);
+        return $schema;
+    }
+
+    /**
+     * Process references for all tables. Schema validation required.
+     *
+     * @param  Table[] $tables
+     * @param Schema $schema
+     */
+    private function processReferenceKeys(array $tables, Schema $schema)
+    {
+        foreach ($tables as $table) {
+            $tableName = $table->getName();
+            if ($schema->getTableByName($tableName) instanceof Table) {
+                continue;
+            }
+            $referencesData = $this->dbSchemaReader->readReferences($tableName, $table->getResource());
+            $references = [];
+
+            foreach ($referencesData as $referenceData) {
+                //Prepare reference data
+                $referenceData['table'] = $table;
+                $referenceTableName = $referenceData['referenceTable'];
+                $referenceData['column'] = $table->getColumnByName($referenceData['column']);
+                $referenceData['referenceTable'] = $this->tables[$referenceTableName];
+                $referenceData['referenceColumn'] = $referenceData['referenceTable']->getColumnByName(
+                    $referenceData['referenceColumn']
+                );
+
+                $references[$referenceData['name']] = $this->elementFactory->create('foreign', $referenceData);
+                //We need to instantiate tables in order of references tree
+                if (isset($tables[$referenceTableName]) && $referenceTableName !== $tableName) {
+                    $this->processReferenceKeys([$referenceTableName => $tables[$referenceTableName]], $schema);
+                    unset($tables[$referenceTableName]);
+                }
+            }
+
+            $table->addConstraints($references);
+            $schema->addTable($table);
+        }
+    }
+
+    /**
+     * Retrieve column objects from names.
+     *
+     * @param  Column[] $columns
+     * @param  array    $data
+     * @return Column[]
+     * @throws Exception
+     */
+    private function resolveInternalRelations(array $columns, array $data)
+    {
+        if (!is_array($data['column'])) {
+            throw new Exception(
+                new Phrase("Cannot find columns for internal index")
+            );
+        }
+
+        $referenceColumns = [];
+        foreach ($data['column'] as $columnName) {
+            if (!isset($columns[$columnName])) {
+                $tableName = isset($data['table']) ? $data['table']->getName() : '';
+                trigger_error(
+                    new Phrase(
+                        'Column %1 does not exist for index/constraint %2 in table %3.',
+                        [
+                            $columnName,
+                            $data['name'],
+                            $tableName
+                        ]
+                    ),
+                    E_USER_WARNING
+                );
+            } else {
+                $referenceColumns[] = $columns[$columnName];
+            }
+        }
+
+        return $referenceColumns;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/Statement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/Statement.php
new file mode 100644
index 0000000000000..ccc4e38968e89
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/Statement.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+/**
+ * Statement aggregator for SQL statements for one table.
+ * All statements are independent with each other, but neither statement can be included with other in one alter query.
+ */
+class Statement
+{
+    /**
+     * @var string
+     */
+    private $statement;
+
+    /**
+     * Type can be: ALTER, CREATE or DROP operations.
+     * Depends on type different operations will be executed on compilation.
+     *
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $tableName;
+
+    /**
+     * @var string
+     */
+    private $resource;
+
+    /**
+     * @var callable[]
+     */
+    private $triggers = [];
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $tableName
+     * @param string $type
+     * @param string $statement
+     * @param string $resource
+     */
+    public function __construct(
+        string $name,
+        string $tableName,
+        string $type,
+        string $statement,
+        string $resource
+    ) {
+        $this->statement = $statement;
+        $this->type = $type;
+        $this->tableName = $tableName;
+        $this->resource = $resource;
+        $this->name = $name;
+    }
+
+    /**
+     * Get statement.
+     *
+     * @return string
+     */
+    public function getStatement(): string
+    {
+        return $this->statement;
+    }
+
+    /**
+     * Add trigger to current statement.
+     * This means, that statement is final and can`t be modified any more.
+     *
+     * @param callable $trigger
+     */
+    public function addTrigger(callable $trigger)
+    {
+        $this->triggers[] = $trigger;
+    }
+
+    /**
+     * Get statement type.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Get table name.
+     *
+     * @return string
+     */
+    public function getTableName(): string
+    {
+        return $this->tableName;
+    }
+
+    /**
+     * Get resource name.
+     *
+     * @return string
+     */
+    public function getResource(): string
+    {
+        return $this->resource;
+    }
+
+    /**
+     * Get triggers array.
+     *
+     * @return callable[]
+     */
+    public function getTriggers(): array
+    {
+        return $this->triggers;
+    }
+
+    /**
+     * Get statement name.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
new file mode 100644
index 0000000000000..2003ff18900ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+/**
+ * Statement aggregator.
+ *
+ * Statements are concatenated conditionally, decides which statements go separately and which may be concatenated.
+ */
+class StatementAggregator
+{
+    /**
+     * Statements batch.
+     * Statements that can be merged with each other are ain each bunch.
+     *
+     * @var array
+     */
+    private $statementsBank = [];
+
+    /**
+     * Verify that statements can be merged.
+     *
+     * @param Statement $bankStatement
+     * @param Statement $statement
+     * @return bool
+     */
+    private function canDoMerge(Statement $bankStatement, Statement $statement)
+    {
+        /** Modify reference only for 2 different requests */
+        if ($statement instanceof ReferenceStatement && $statement->getName() === $bankStatement->getName()) {
+            return false;
+        }
+
+        /**
+         * If we add trigger after some specific statement, than we say that statement is final
+         * and can`t be updated anymore. Otherwise trigger can fail.
+         *
+         * Example: while migrating data from one column to another and another column should be removed,
+         * we need to ensure that we create new column, finalize statement, do insert and only after insert
+         * do all other statements like DROP old column.
+         */
+        return empty($bankStatement->getTriggers()) &&
+            $statement->getType() === $bankStatement->getType() &&
+            $statement->getTableName() === $bankStatement->getTableName() &&
+            $statement->getResource() === $bankStatement->getResource();
+    }
+
+    /**
+     * Add one or few statements and divide them if they can`t be executed in one query.
+     *
+     * For example, foreign key modification can`t be done in one query.
+     * First existing foreign key should be dropped and only then new one can be created.
+     *
+     * @param Statement[] $statements
+     */
+    public function addStatements(array $statements)
+    {
+        foreach ($statements as $statement) {
+            /** Go through each bank and see whether statement can be added to it or not */
+            foreach ($this->statementsBank as $bankId => $bank) {
+                foreach ($bank as $bankStatement) {
+                    if (!$this->canDoMerge($bankStatement, $statement)) {
+                        continue 2;
+                    }
+                }
+
+                $this->statementsBank[$bankId][] = $statement;
+                continue 2;
+            }
+
+            $this->statementsBank[][] = $statement;
+        }
+    }
+
+    /**
+     * Return all statements separated in batches.
+     *
+     * @return Statement[]
+     */
+    public function getStatementsBank()
+    {
+        return $this->statementsBank;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregatorFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregatorFactory.php
new file mode 100644
index 0000000000000..474742de26a92
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregatorFactory.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for statement aggregator.
+ */
+class StatementAggregatorFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string $className
+     */
+    public function __construct(ObjectManagerInterface $objectManager, $className = StatementAggregator::class)
+    {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * Create statement aggregator object.
+     *
+     * @return StatementAggregator
+     */
+    public function create()
+    {
+        return $this->objectManager->create($this->className);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementFactory.php
new file mode 100644
index 0000000000000..ecc2bf08331fd
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementFactory.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+
+/**
+ * Statement factory.
+ * Statement aggregates SQL statements and executes them for one table.
+ */
+class StatementFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var string
+     */
+    private $referenceClassName;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string $className
+     * @param string $referenceClassName
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = Statement::class,
+        $referenceClassName = ReferenceStatement::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+        $this->referenceClassName = $referenceClassName;
+    }
+
+    /**
+     * Create statement object.
+     *
+     * @param string $name
+     * @param string $tableName
+     * @param string $type
+     * @param string $statement
+     * @param string $resource
+     * @param string|null $elementType
+     * @return Statement
+     */
+    public function create(
+        string $name,
+        string $tableName,
+        string $type,
+        string $statement,
+        string $resource,
+        string $elementType = null
+    ) {
+        $className = $elementType === Reference::TYPE ? $this->referenceClassName : $this->className;
+        return $this->objectManager->create($className, [
+            'name' => $name,
+            'tableName' => $tableName,
+            'resource' => $resource,
+            'type' => $type,
+            'statement' => $statement
+        ]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ReaderComposite.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ReaderComposite.php
new file mode 100644
index 0000000000000..5f3d5af4d3b13
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ReaderComposite.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ReaderInterface;
+
+/**
+ * Read schema from different places: XML, csv, etc.
+ * You can add one more reader from di.xml.
+ * Note: that schema from your reader will not be validated through XSD.
+ */
+class ReaderComposite implements ReaderInterface
+{
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(DeploymentConfig $deploymentConfig, array $readers = [])
+    {
+        $this->readers = $readers;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function read($scope = null)
+    {
+        $schema = ['table' => []];
+        foreach ($this->readers as $reader) {
+            $schema = array_replace_recursive($schema, $reader->read($scope));
+        }
+
+        return $schema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
new file mode 100644
index 0000000000000..34a99f26a4ef1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
@@ -0,0 +1,398 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
+
+use Magento\Framework\Phrase;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Setup\Exception;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+
+/**
+ * This type of builder is responsible for converting ENTIRE data, that comes from XML into DTO`s format.
+ *
+ * Note: SchemaBuilder can not be used for one structural element, like column or constraint
+ * because it should have references to other DTO objects.
+ * In order to convert build only 1 structural element use directly it factory.
+ *
+ * structure
+ *  - table[N,]
+ *   -column
+ *   -constraint
+ *    -internal (unique, primary, check, nullable)
+ *    -reference (referenceTable=<DTO>, referenceColumn=<DTO>, ...)
+ *   -index
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SchemaBuilder
+{
+    /**
+     * @var array
+     */
+    private $tablesData = [];
+
+    /**
+     * @var Sharding
+     */
+    private $sharding;
+
+    /**
+     * @var ElementFactory
+     */
+    private $elementFactory;
+
+    /**
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * @var ValidationComposite
+     */
+    private $validationComposite;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var ElementNameResolver
+     */
+    private $elementNameResolver;
+
+    /**
+     * SchemaBuilder constructor.
+     *
+     * @param    ElementFactory $elementFactory
+     * @param    BooleanUtils $booleanUtils
+     * @param    Sharding $sharding
+     * @param    ValidationComposite $validationComposite
+     * @param \Magento\Framework\App\ResourceConnection $resourceConnection
+     * @param ElementNameResolver $elementNameResolver
+     */
+    public function __construct(
+        ElementFactory $elementFactory,
+        BooleanUtils $booleanUtils,
+        Sharding $sharding,
+        ValidationComposite $validationComposite,
+        \Magento\Framework\App\ResourceConnection $resourceConnection,
+        ElementNameResolver $elementNameResolver
+    ) {
+        $this->sharding = $sharding;
+        $this->elementFactory = $elementFactory;
+        $this->booleanUtils = $booleanUtils;
+        $this->validationComposite = $validationComposite;
+        $this->resourceConnection = $resourceConnection;
+        $this->elementNameResolver = $elementNameResolver;
+    }
+
+    /**
+     * Add tables data to builder.
+     *
+     * Tables data holds tables information: columns, constraints, indexes, attributes.
+     *
+     * @param  array $tablesData
+     * @return self
+     */
+    public function addTablesData(array $tablesData)
+    {
+        $this->tablesData = $tablesData;
+        return $this;
+    }
+
+    /**
+     * Do schema validation and print all errors.
+     *
+     * @param  Schema $schema
+     * @throws Exception
+     */
+    private function validate(Schema $schema)
+    {
+        $errors = $this->validationComposite->validate($schema);
+
+        if (!empty($errors)) {
+            $messages = '';
+            foreach ($errors as $error) {
+                $messages .= sprintf("%s%s", PHP_EOL, $error['message']);
+            }
+
+            throw new Exception(new Phrase($messages));
+        }
+    }
+
+    /**
+     * Build schema.
+     *
+     * @param  Schema $schema
+     * @throws Exception
+     * @return Schema
+     */
+    public function build(Schema $schema): Schema
+    {
+        foreach ($this->tablesData as $tableData) {
+            if (!$schema->getTableByName($tableData['name'])) {
+                if (!$this->isDisabled($tableData)) {
+                    $this->processTable($schema, $tableData);
+                }
+            }
+        }
+
+        $this->validate($schema);
+
+        return $schema;
+    }
+
+    /**
+     * Get resource for structural elements.
+     *
+     * @param array $tableData
+     * @return string
+     */
+    private function getStructuralElementResource(array $tableData): string
+    {
+        return isset($tableData['resource']) && $this->sharding->canUseResource($tableData['resource']) ?
+            $tableData['resource'] : 'default';
+    }
+
+    /**
+     * Check whether element is disabled and should not appear in final declaration.
+     *
+     * @param  array $structuralElementData
+     * @return bool
+     */
+    private function isDisabled(array $structuralElementData): bool
+    {
+        return isset($structuralElementData['disabled']) &&
+            $this->booleanUtils->toBoolean($structuralElementData['disabled']);
+    }
+
+    /**
+     * Instantiate column DTO objects from array.
+     *
+     * If column was renamed new key will be associated to it.
+     *
+     * @param array $tableData
+     * @param string $resource
+     * @param Table $table
+     * @return array
+     */
+    private function processColumns(array $tableData, string $resource, Table $table): array
+    {
+        $columns = [];
+
+        foreach ($tableData['column'] as $columnData) {
+            if ($this->isDisabled($columnData)) {
+                continue;
+            }
+
+            $columnData = $this->processGenericData($columnData, $resource, $table);
+            $column = $this->elementFactory->create($columnData['type'], $columnData);
+            $columns[$column->getName()] = $column;
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Process generic data that is support by all 3 child types: columns, constraints, indexes.
+     *
+     * @param array $elementData
+     * @param string $resource
+     * @param Table $table
+     * @return array
+     */
+    private function processGenericData(array $elementData, string $resource, Table $table): array
+    {
+        $elementData['table'] = $table;
+        $elementData['resource'] = $resource;
+
+        return $elementData;
+    }
+
+    /**
+     * Process tables and add them to schema.
+     *
+     * If table already exists - then we need to skip it.
+     *
+     * @param  Schema $schema
+     * @param  array $tableData
+     * @return Table
+     */
+    private function processTable(Schema $schema, array $tableData): Table
+    {
+        if (!$schema->getTableByName($tableData['name'])) {
+            $resource = $this->getStructuralElementResource($tableData);
+            $tableData['resource'] = $resource;
+            $tableData['comment'] = $tableData['comment'] ?? null;
+            /** @var Table $table */
+            $table = $this->elementFactory->create('table', $tableData);
+            $columns = $this->processColumns($tableData, $resource, $table);
+            $table->addColumns($columns);
+            //Add indexes to table
+            $table->addIndexes($this->processIndexes($tableData, $resource, $table));
+            //Add internal and reference constraints
+            $table->addConstraints($this->processConstraints($tableData, $resource, $schema, $table));
+            $schema->addTable($table);
+        }
+
+        return $schema->getTableByName($tableData['name']);
+    }
+
+    /**
+     * Provides column by name.
+     *
+     * @param string $columnName
+     * @param Table $table
+     * @return Column
+     */
+    private function getColumnByName(string $columnName, Table $table): Column
+    {
+        $columnCandidate = $table->getColumnByName($columnName);
+
+        if (!$columnCandidate) {
+            throw new \LogicException(
+                sprintf('Table %s do not have column with name %s', $table->getName(), $columnName)
+            );
+        }
+
+        return $columnCandidate;
+    }
+
+    /**
+     * Convert column names to objects.
+     *
+     * @param  array $columnNames
+     * @param  Table $table
+     * @return array
+     */
+    private function convertColumnNamesToObjects(array $columnNames, Table $table): array
+    {
+        $columns = [];
+
+        foreach ($columnNames as $columnName) {
+            $columns[] = $this->getColumnByName($columnName, $table);
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Convert and instantiate index objects.
+     *
+     * @param  array $tableData
+     * @param  string $resource
+     * @param  Table $table
+     * @return Index[]
+     */
+    private function processIndexes(array $tableData, string $resource, Table $table): array
+    {
+        if (!isset($tableData['index'])) {
+            return [];
+        }
+
+        $indexes = [];
+
+        foreach ($tableData['index'] as $indexData) {
+            if ($this->isDisabled($indexData)) {
+                continue;
+            }
+
+            $indexData['name'] = $this->elementNameResolver->getFullIndexName(
+                $table,
+                $indexData['column'],
+                $indexData['indexType'] ?? null
+            );
+            $indexData = $this->processGenericData($indexData, $resource, $table);
+            $indexData['columns'] = $this->convertColumnNamesToObjects($indexData['column'], $table);
+            $index = $this->elementFactory->create('index', $indexData);
+            $indexes[$index->getName()] = $index;
+        }
+
+        return $indexes;
+    }
+
+    /**
+     * Convert and instantiate constraint objects.
+     *
+     * @param  array $tableData
+     * @param  string $resource
+     * @param  Schema $schema
+     * @param Table $table
+     * @return Constraint[]
+     */
+    private function processConstraints(array $tableData, string $resource, Schema $schema, Table $table): array
+    {
+        if (!isset($tableData['constraint'])) {
+            return [];
+        }
+
+        $constraints = [];
+
+        foreach ($tableData['constraint'] as $constraintData) {
+            if ($this->isDisabled($constraintData)) {
+                continue;
+            }
+            $constraintData = $this->processGenericData($constraintData, $resource, $table);
+            //As foreign constraint has different schema we need to process it in different way
+            if ($constraintData['type'] === 'foreign') {
+                $constraintData['column'] = $this->getColumnByName($constraintData['column'], $table);
+                $referenceTableData = $this->tablesData[$constraintData['referenceTable']];
+                //If we are referenced to the same table we need to specify it
+                //Get table name from resource connection regarding prefix settings
+                $refTableName = $this->resourceConnection->getTableName($referenceTableData['name']);
+                $referenceTable = $refTableName === $table->getName() ?
+                    $table :
+                    $this->processTable($schema, $referenceTableData);
+
+                if ($referenceTable->getResource() !== $table->getResource()) {
+                    continue; //we should avoid creating foreign keys
+                    //for tables that are on another shard
+                }
+                $constraintData['referenceTable'] = $referenceTable;
+
+                if (!$constraintData['referenceTable']) {
+                    throw new \LogicException(
+                        sprintf('Cannot find reference table with name %s', $constraints['referenceTable'])
+                    );
+                }
+
+                $constraintData['referenceColumn'] = $this->getColumnByName(
+                    $constraintData['referenceColumn'],
+                    $constraintData['referenceTable']
+                );
+                $constraintData['name'] = $this->elementNameResolver->getFullFKName(
+                    $table,
+                    $constraintData['column'],
+                    $constraintData['referenceTable'],
+                    $constraintData['referenceColumn']
+                );
+                $constraint = $this->elementFactory->create($constraintData['type'], $constraintData);
+                $constraints[$constraint->getName()] = $constraint;
+            } else {
+                $constraintData['name'] = $this->elementNameResolver->getFullIndexName(
+                    $table,
+                    $constraintData['column'],
+                    $constraintData['type']
+                );
+                $constraintData['columns'] = $this->convertColumnNamesToObjects($constraintData['column'], $table);
+                $constraint = $this->elementFactory->create($constraintData['type'], $constraintData);
+                $constraints[$constraint->getName()] = $constraint;
+            }
+        }
+
+        return $constraints;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php
new file mode 100644
index 0000000000000..fe7d1a822dae1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
+
+/**
+ * Provide names of table elements with autogenerated names.
+ */
+class ElementNameResolver
+{
+    /**
+     * @var TableNameResolver
+     */
+    private $tableNameResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param TableNameResolver $tableNameResolver
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(TableNameResolver $tableNameResolver, ResourceConnection $resourceConnection)
+    {
+        $this->tableNameResolver = $tableNameResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Provide the full index name based on the prefix value.
+     *
+     * @param Table $table
+     * @param string[] $columns
+     * @param string $type
+     * @return string
+     */
+    public function getFullIndexName(
+        Table $table,
+        array $columns,
+        ?string $type = AdapterInterface::INDEX_TYPE_INDEX
+    ): string {
+        if (AdapterInterface::INDEX_TYPE_PRIMARY === $type) {
+            return strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
+        }
+
+        /**
+         * Temporary solution.
+         * @see MAGETWO-91365
+         */
+        $isIndexTypeOutOfList = false === array_search(
+            $type,
+            [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
+        );
+        if ($type && $isIndexTypeOutOfList) {
+            $type = AdapterInterface::INDEX_TYPE_INDEX;
+        }
+
+        $tableName = $this->tableNameResolver->getNameOfOriginTable($table->getName());
+
+        return $this->resourceConnection
+            ->getIdxName(
+                $tableName,
+                $columns,
+                $type
+            );
+    }
+
+    /**
+     * Provide the index name without prefix value.
+     *
+     * @param string $name
+     * @param Table $table
+     * @param string[] $columns
+     * @param string $type
+     * @return string
+     */
+    public function getIndexNameWithoutPrefix(
+        string $name,
+        Table $table,
+        array $columns,
+        ?string $type = AdapterInterface::INDEX_TYPE_INDEX
+    ): string {
+        if (AdapterInterface::INDEX_TYPE_PRIMARY === $type) {
+            return strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
+        }
+
+        $nameWithoutPrefix = $name;
+
+        if ($this->resourceConnection->getTablePrefix()) {
+            /**
+             * Temporary solution.
+             * @see MAGETWO-91365
+             */
+            $isIndexTypeOutOfList = false === array_search(
+                $type,
+                [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
+            );
+            if ($type && $isIndexTypeOutOfList) {
+                $type = AdapterInterface::INDEX_TYPE_INDEX;
+            }
+
+            $nameWithoutPrefix = $this->resourceConnection
+                ->getConnection($table->getResource())
+                ->getIndexName(
+                    $this->tableNameResolver->getNameOfOriginTable(
+                        $table->getNameWithoutPrefix()
+                    ),
+                    $columns,
+                    $type
+                );
+        }
+
+        return $nameWithoutPrefix;
+    }
+
+    /**
+     * Provide the full foreign key name based on the prefix value.
+     *
+     * @param Table $table
+     * @param Column $column
+     * @param Table $referenceTable
+     * @param Column $referenceColumn
+     * @return string
+     */
+    public function getFullFKName(
+        Table $table,
+        Column $column,
+        Table $referenceTable,
+        Column $referenceColumn
+    ): string {
+        $fkName = $this->resourceConnection
+            ->getFkName(
+                $this->tableNameResolver->getNameOfOriginTable($table->getName()),
+                $column->getName(),
+                $referenceTable->getName(),
+                $referenceColumn->getName()
+            );
+
+        return $fkName;
+    }
+
+    /**
+     * Provide the foreign key name without prefix value.
+     *
+     * @param string $name
+     * @param Table $table
+     * @param Column $column
+     * @param Table $referenceTable
+     * @param Column $referenceColumn
+     * @return string
+     */
+    public function getFKNameWithoutPrefix(
+        string $name,
+        Table $table,
+        Column $column,
+        Table $referenceTable,
+        Column $referenceColumn
+    ): string {
+        $nameWithoutPrefix = $name;
+
+        if ($this->resourceConnection->getTablePrefix()) {
+            $nameWithoutPrefix = $this->resourceConnection
+                ->getConnection($table->getResource())
+                ->getForeignKeyName(
+                    $this->tableNameResolver->getNameOfOriginTable(
+                        $table->getNameWithoutPrefix()
+                    ),
+                    $column->getName(),
+                    $referenceTable->getNameWithoutPrefix(),
+                    $referenceColumn->getName()
+                );
+        }
+
+        return $nameWithoutPrefix;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationComposite.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationComposite.php
new file mode 100644
index 0000000000000..bf04f80c0e45e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationComposite.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * This validator holds different validations rules.
+ *
+ * @inheritdoc
+ */
+class ValidationComposite implements ValidationInterface
+{
+    /**
+     * @var ValidationInterface[]
+     */
+    private $rules;
+
+    /**
+     * Constructor.
+     *
+     * @param ValidationInterface[] $rules
+     */
+    public function __construct(array $rules)
+    {
+        $this->rules = $rules;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+
+        foreach ($this->rules as $rule) {
+            $errors = array_replace_recursive(
+                $errors,
+                $rule->validate($schema)
+            );
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationInterface.php
new file mode 100644
index 0000000000000..0f90a6bb8b1e5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * This class is responsible for basic validation rules.
+ */
+interface ValidationInterface
+{
+    /**
+     * Do different validations on db schema.
+     *
+     * @param  Schema $schema
+     * @return array Return array of errors. If everything is ok - retrieve empty array
+     */
+    public function validate(Schema $schema);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/AutoIncrementColumnValidation.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/AutoIncrementColumnValidation.php
new file mode 100644
index 0000000000000..fb31f7fcc6d98
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/AutoIncrementColumnValidation.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnIdentityAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Check whether autoincrement column is valid
+ *
+ * @inheritdoc
+ */
+class AutoIncrementColumnValidation implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'auto_increment_column_is_valid';
+
+    /**
+     * Error message, that will be shown.
+     */
+    const ERROR_MESSAGE = 'Auto Increment column do not have index. Column - "%s", table - "%s"';
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column instanceof ColumnIdentityAwareInterface && $column->isIdentity()) {
+                    foreach ($table->getConstraints() as $constraint) {
+                        if ($constraint instanceof Internal &&
+                            in_array($column->getName(), $constraint->getColumnNames())
+                        ) {
+                            //If we find that for auto increment column we have index or key
+                            continue 3;
+                        }
+                    }
+
+                    foreach ($table->getIndexes() as $index) {
+                        if (in_array($column->getName(), $index->getColumnNames())) {
+                            //If we find that for auto increment column we have index or key
+                            continue 3;
+                        }
+                    }
+
+                    $errors[] = [
+                        'column' => $column->getName(),
+                        'message' => sprintf(self::ERROR_MESSAGE, $column->getName(), $table->getName())
+                    ];
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
new file mode 100644
index 0000000000000..21c62ec2b29cc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Go through all tables in schema and see if reference columns in foreign keys
+ * has unique or primary key constraints.
+ *
+ * @inheritdoc
+ */
+class CheckReferenceColumnHasIndex implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'reference_column_without_unique_index';
+
+    /**
+     * Error message, that will be shown.
+     */
+    const ERROR_MESSAGE = 'Reference column %s in reference table %s do not have index';
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            foreach ($table->getReferenceConstraints() as $constraint) {
+                $referenceColumnName = $constraint->getReferenceColumn()->getName();
+                $indexesAndConstraints = array_merge(
+                    $constraint->getReferenceTable()->getConstraints(),
+                    $constraint->getReferenceTable()->getIndexes()
+                );
+                foreach ($indexesAndConstraints as $key) {
+                    if ($key instanceof Internal || $key instanceof Index) {
+                        if (in_array($referenceColumnName, $key->getColumnNames())) {
+                            continue 2;
+                        }
+                    }
+                }
+
+                $errors[] = [
+                    'column' => $referenceColumnName,
+                    'message' => sprintf(
+                        self::ERROR_MESSAGE,
+                        $referenceColumnName,
+                        $constraint->getReferenceTable()->getName()
+                    )
+                ];
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/IncosistentReferenceDefinition.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/IncosistentReferenceDefinition.php
new file mode 100644
index 0000000000000..02d2cee9979e2
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/IncosistentReferenceDefinition.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnUnsignedAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Go through all tables and find out what foreign keys columns definitions are not match each other
+ *
+ * @inheritdoc
+ */
+class IncosistentReferenceDefinition implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'reference_incosistence_definition';
+
+    /**
+     * Assert that column dimensions are the same
+     *
+     * This check should goes after types assertion
+     *
+     * @param Column $column
+     * @param Column | ColumnUnsignedAwareInterface | ColumnNullableAwareInterface $referenceColumn
+     * @return bool
+     */
+    private function assertDefinitionEqual(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Columns should have the same types
+         */
+        if ($column->getType() !== $referenceColumn->getType()) {
+            return true;
+        }
+
+        return $this->assertUnsigned($column, $referenceColumn) &&
+            $this->assertIntegersEquals($column, $referenceColumn) &&
+            $this->assertStringBinariesEqual($column, $referenceColumn);
+    }
+
+    /**
+     * @param Column $column
+     * @param Column | ColumnUnsignedAwareInterface $referenceColumn
+     * @return bool
+     */
+    private function assertUnsigned(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Check on unsigned
+         */
+        if ($column instanceof ColumnUnsignedAwareInterface &&
+            $column->isUnsigned() !== $referenceColumn->isUnsigned()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Column $column
+     * @param Column $referenceColumn
+     * @return bool
+     */
+    private function assertStringBinariesEqual(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Check whether column sizes are equal
+         * @var StringBinary $referenceColumn
+         */
+        if ($column instanceof StringBinary &&
+            $column->getLength() !== $referenceColumn->getLength()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Column $column
+     * @param Column | Integer $referenceColumn
+     * @return bool
+     */
+    private function assertIntegersEquals(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Check whether column sizes are equal
+         */
+        if ($column instanceof Integer &&
+            $column->getPadding() !== $referenceColumn->getPadding()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $message = 'Column definition "%s" and reference column definition "%s" are different in tables "%s" and "%s"';
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            foreach ($table->getReferenceConstraints() as $reference) {
+                $column = $reference->getColumn();
+                $referenceColumn = $reference->getReferenceColumn();
+
+                if (!$this->assertDefinitionEqual($column, $referenceColumn)) {
+                    $errors[] = [
+                        'column' => $column->getName(),
+                        'message' => sprintf(
+                            $message,
+                            $column->getName(),
+                            $referenceColumn->getName(),
+                            $column->getTable()->getName(),
+                            $referenceColumn->getTable()->getName()
+                        )
+                    ];
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/PrimaryKeyCanBeCreated.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/PrimaryKeyCanBeCreated.php
new file mode 100644
index 0000000000000..6e3703af9b098
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/PrimaryKeyCanBeCreated.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Go through all tables and find out if primary keys can be applied
+ *
+ * @inheritdoc
+ */
+class PrimaryKeyCanBeCreated implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'primary_key_cant_be_applied';
+
+    /**
+     * Error message, that will be shown.
+     */
+    const ERROR_MESSAGE = 'Primary key can`t be applied on table "%s". ';
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            $primaryConstraint = $table->getPrimaryConstraint();
+
+            if (!$primaryConstraint) {
+                continue;
+            }
+
+            foreach ($primaryConstraint->getColumns() as $column) {
+                if ($column instanceof ColumnNullableAwareInterface &&
+                    $column->isNullable()
+                ) {
+                    $errors[] = [
+                        'column' => $column->getName(),
+                        'message' => sprintf(self::ERROR_MESSAGE, $table->getName()) .
+                            "All columns should be not nullable"
+                    ];
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/RealTypes.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
new file mode 100644
index 0000000000000..8cb6ff3f95cb0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Go through all tables in schema and validate real types basis and fraction sizes are valid.
+ *
+ * @inheritdoc
+ */
+class RealTypes implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'real_type_basis_error';
+
+    /**
+     * Error message, that will be shown.
+     */
+    const ERROR_MESSAGE = 'Real type "precision" must be greater or equal to "scale". %s(%s,%s) is invalid in %s.';
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column instanceof Real) {
+                    if ($column->getScale() > $column->getPrecision()) {
+                        $errors[] = [
+                            'column' => $table->getName() . '.' . $column->getName(),
+                            'message' => sprintf(
+                                self::ERROR_MESSAGE,
+                                $column->getType(),
+                                $column->getPrecision(),
+                                $column->getScale(),
+                                $table->getName() . '.' . $column->getName()
+                            )
+                        ];
+                    }
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
new file mode 100644
index 0000000000000..0e857567689c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\TableElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropReference;
+
+/**
+ * Holds information about all changes between 2 schemas: db and declaration XML.
+ * Holds 2 items:
+ *  - new (Should be changed to)
+ *  - old ()
+ * @api
+ */
+class Diff implements DiffInterface
+{
+    /**
+     * Whitelist file name.
+     */
+    const GENERATED_WHITELIST_FILE_NAME = 'db_schema_whitelist.json';
+
+    /**
+     * @var array
+     */
+    private $changes;
+
+    /**
+     * This changes created only for debug reasons.
+     *
+     * @var array
+     */
+    public $debugChanges;
+
+    /**
+     * @var array
+     */
+    private $whiteListTables = [];
+
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var ElementHistoryFactory
+     */
+    private $elementHistoryFactory;
+
+    /**
+     * This indexes is needed to ensure that sort order in which table operations
+     * will be executed is correct.
+     *
+     * @var array
+     */
+    private $tableIndexes;
+
+    /**
+     * List of operations that are destructive from the point of declarative setup
+     * and can make system unstable, for example DropTable.
+     *
+     * @var string[]
+     */
+    private $destructiveOperations;
+
+    /**
+     * Constructor.
+     *
+     * @param ComponentRegistrar $componentRegistrar
+     * @param ElementHistoryFactory $elementHistoryFactory
+     * @param array $tableIndexes
+     * @param array $destructiveOperations
+     */
+    public function __construct(
+        ComponentRegistrar $componentRegistrar,
+        ElementHistoryFactory $elementHistoryFactory,
+        array $tableIndexes,
+        array $destructiveOperations
+    ) {
+        $this->componentRegistrar = $componentRegistrar;
+        $this->elementHistoryFactory = $elementHistoryFactory;
+        $this->tableIndexes = $tableIndexes;
+        $this->destructiveOperations = $destructiveOperations;
+    }
+
+    /**
+     * We return all sorted changes.
+     *
+     * All changes are sorted because there are dependencies between tables, like foreign keys.
+     *
+     * @inheritdoc
+     */
+    public function getAll()
+    {
+        if ($this->changes) {
+            ksort($this->changes);
+        }
+        return $this->changes;
+    }
+
+    /**
+     * Retrieve all changes for specific table.
+     *
+     * @param string $table
+     * @param string $operation
+     * @return ElementHistory[]
+     */
+    public function getChange($table, $operation)
+    {
+        $tableIndex = $this->tableIndexes[$table];
+        return $this->changes[$tableIndex][$operation] ?? [];
+    }
+
+    /**
+     * Retrieve array of whitelisted tables.
+     * Whitelist tables should have JSON format and should be added through
+     * CLI command: should be done in next story.
+     *
+     * @return array
+     */
+    private function getWhiteListTables()
+    {
+        if (!$this->whiteListTables) {
+            foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $path) {
+                $whiteListPath = $path . DIRECTORY_SEPARATOR . 'etc' .
+                    DIRECTORY_SEPARATOR . 'db_schema_whitelist.json';
+
+                if (file_exists($whiteListPath)) {
+                    $this->whiteListTables = array_replace_recursive(
+                        $this->whiteListTables,
+                        json_decode(file_get_contents($whiteListPath), true)
+                    );
+                }
+            }
+        }
+
+        return $this->whiteListTables;
+    }
+
+    /**
+     * Check whether element can be registered.
+     *
+     * For example, if element is not in db_schema_whitelist.json it cant
+     * be registered due to backward incompatibility
+     * Extensibility point: if you want to add some dynamic rules of applying or ignoring any schema elements
+     * you can do this by pluginizing this method
+     *
+     * @param  ElementInterface | Table $object
+     * @param string $operation
+     * @return bool
+     */
+    public function canBeRegistered(ElementInterface $object, $operation): bool
+    {
+        if (!isset($this->destructiveOperations[$operation])) {
+            return true;
+        }
+
+        $checkResult = false;
+        $whiteList = $this->getWhiteListTables();
+
+        if ($object instanceof TableElementInterface) {
+            $tableNameWithoutPrefix = $object->getTable()->getNameWithoutPrefix();
+            $type = $object->getElementType();
+
+            if ($this->isElementHaveAutoGeneratedName($object)) {
+                $checkResult =
+                    isset($whiteList[$tableNameWithoutPrefix][$type][$object->getNameWithoutPrefix()]);
+            } else {
+                $checkResult = isset($whiteList[$tableNameWithoutPrefix][$type][$object->getName()]);
+            }
+        } elseif ($object instanceof Table) {
+            $checkResult = isset($whiteList[$object->getNameWithoutPrefix()]);
+        }
+
+        return $checkResult;
+    }
+
+    /**
+     * Check if the element has an auto-generated name.
+     *
+     * @param ElementInterface $element
+     * @return bool
+     */
+    private function isElementHaveAutoGeneratedName(ElementInterface $element): bool
+    {
+        return in_array($element->getElementType(), [Index::TYPE, Constraint::TYPE], true);
+    }
+
+    /**
+     * Register DTO object.
+     *
+     * @param TableElementInterface $dtoObject
+     * @inheritdoc
+     */
+    public function register(
+        ElementInterface $dtoObject,
+        $operation,
+        ElementInterface $oldDtoObject = null
+    ) {
+        if (!$this->canBeRegistered($dtoObject, $operation)) {
+            return $this;
+        }
+
+        $historyData = ['new' => $dtoObject, 'old' => $oldDtoObject];
+        $history = $this->elementHistoryFactory->create($historyData);
+        //dtoObjects can have 4 types: column, constraint, index, table
+        $this->changes[$this->findTableIndex($dtoObject, $operation)][$operation][] = $history;
+        $this->debugChanges[$operation][] = $history;
+        return $this;
+    }
+
+    /**
+     * As tables can references to each other, we need to take into account
+     * that they should goes in specific structure: parent table -> child table
+     * Also we should take into account, that first of all in any case we need to remove all foreign keys
+     * from tables and only then modify that tables
+     *
+     * @param ElementInterface $element
+     * @param string $operation
+     * @return int
+     */
+    private function findTableIndex(ElementInterface $element, string $operation) : int
+    {
+        $elementName = $element instanceof TableElementInterface ?
+            $element->getTable()->getName() : $element->getName();
+        //We use not real tables but table indexes in order to be sure that order of table is correct
+        $tableIndex = $this->tableIndexes[$elementName] ?? INF;
+        return $operation === DropReference::OPERATION_NAME ? 0 : (int) $tableIndex;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffFactory.php
new file mode 100644
index 0000000000000..342bb87e1807e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffFactory.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * @see DiffInterface
+ */
+class DiffFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * ChangeRegistryFactory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create Diff object.
+     *
+     * @param array $data
+     * @return Diff
+     */
+    public function create(array $data)
+    {
+        return $this->objectManager->create(Diff::class, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
new file mode 100644
index 0000000000000..139e9b902684a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * DiffInterface is type of classes, that holds all information
+ * that need to be changed from one installation to another.
+ */
+interface DiffInterface
+{
+    /**
+     * Retrieve operations by type.
+     *
+     * Please note: that we wants to save history and we retrieve next structure:
+     * [
+     *   'column_a' => ElementHistory [
+     *      'new' => [
+     *          ...
+     *      ],
+     *      'old' => [
+     *          ...
+     *      ]
+     *   ]
+     * ]
+     *
+     * @return array
+     */
+    public function getAll();
+
+    /**
+     * Register operation.
+     *
+     * @param ElementInterface|object $dtoObject
+     * @param string $operation
+     * @param ElementInterface $oldDtoObject
+     * @return void
+     */
+    public function register(
+        ElementInterface $dtoObject,
+        $operation,
+        ElementInterface $oldDtoObject = null
+    );
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php
new file mode 100644
index 0000000000000..af1a35542603e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Setup\Declaration\Schema\Comparator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropReference;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ModifyColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ModifyTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ReCreateTable;
+
+/**
+ * Helper which provide methods, that helps to compare 2 different nodes:
+ * For instance, 2 columns between each other.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DiffManager
+{
+    /**
+     * @var Comparator
+     */
+    private $comparator;
+
+    /**
+     * Constructor.
+     *
+     * @param Comparator $comparator
+     */
+    public function __construct(Comparator $comparator)
+    {
+        $this->comparator = $comparator;
+    }
+
+    /**
+     * Check whether this is element is new or not, by checking it in db schema.
+     *
+     * @param  ElementInterface[] $generatedElements
+     * @param  ElementInterface   $element
+     * @return bool
+     */
+    public function shouldBeCreated(array $generatedElements, ElementInterface $element)
+    {
+        return !isset($generatedElements[$element->getName()]);
+    }
+
+    /**
+     * Check whether we have elements that should be removed from database.
+     *
+     * @param  array $generatedElements
+     * @return bool
+     */
+    public function shouldBeRemoved(array $generatedElements)
+    {
+        return !empty($generatedElements);
+    }
+
+    /**
+     * Register element, that should changes.
+     *
+     * @param  Diff    $diff
+     * @param  ElementInterface $element
+     * @param  ElementInterface $generatedElement
+     * @return DiffInterface
+     */
+    public function registerModification(
+        Diff $diff,
+        ElementInterface $element,
+        ElementInterface $generatedElement
+    ) {
+        if ($element instanceof Column) {
+            $diff->register($element, ModifyColumn::OPERATION_NAME, $generatedElement);
+        } else {
+            $diff = $this->registerRemoval($diff, [$generatedElement]);
+            $diff = $this->registerCreation($diff, $element);
+        }
+
+        return $diff;
+    }
+
+    /**
+     * If elements really dont exists in declaration - we will remove them.
+     * If some mistake happens (and element is just not preprocessed), we will throw exception.
+     *
+     * @param  Diff      $diff
+     * @param  ElementInterface[] $generatedElements
+     * @return DiffInterface
+     */
+    public function registerRemoval(
+        Diff $diff,
+        array $generatedElements
+    ) {
+        foreach ($generatedElements as $generatedElement) {
+            if ($generatedElement instanceof Reference) {
+                $diff->register($generatedElement, DropReference::OPERATION_NAME, $generatedElement);
+            } elseif ($generatedElement instanceof Table) {
+                $diff->register($generatedElement, DropTable::OPERATION_NAME, $generatedElement);
+            } else {
+                $diff->register($generatedElement, DropElement::OPERATION_NAME, $generatedElement);
+            }
+        }
+
+        return $diff;
+    }
+
+    /**
+     * Register creation.
+     *
+     * @param DiffInterface    $diff
+     * @param ElementInterface $element
+     * @return DiffInterface
+     */
+    public function registerCreation(DiffInterface $diff, ElementInterface $element)
+    {
+        if ($element instanceof Table) {
+            $operation = CreateTable::OPERATION_NAME;
+        } elseif ($element instanceof Column) {
+            $operation = AddColumn::OPERATION_NAME;
+        } else {
+            $operation = AddComplexElement::OPERATION_NAME;
+        }
+
+        $diff->register($element, $operation);
+
+        return $diff;
+    }
+
+    /**
+     * Depends on what should be changed we can re-create table or modify it.
+     *
+     * For example, we can modify table if we need to change comment or engine.
+     * Or we can re-create table, when we need to change it shard.
+     *
+     * @param Table $declaredTable
+     * @param Table $generatedTable
+     * @param Diff $diff
+     * @return void
+     */
+    public function registerTableModification(Table $declaredTable, Table $generatedTable, Diff $diff)
+    {
+        $diff->register(
+            $declaredTable,
+            ModifyTable::OPERATION_NAME,
+            $generatedTable
+        );
+    }
+
+    /**
+     * Register recreation of table, in case for example, when we need to move table from one shard to another
+     *
+     * @param Table $declaredTable
+     * @param Table $generatedTable
+     * @param Diff $diff
+     * @return void
+     */
+    public function registerRecreation(Table $declaredTable, Table $generatedTable, Diff $diff)
+    {
+        $diff->register(
+            $declaredTable,
+            ReCreateTable::OPERATION_NAME,
+            $generatedTable
+        );
+    }
+
+    /**
+     * Check whether element should be modified or not.
+     *
+     * @param  ElementInterface $element
+     * @param  ElementInterface $generatedElement
+     * @return bool
+     */
+    public function shouldBeModified(
+        ElementInterface $element,
+        ElementInterface $generatedElement
+    ) {
+        return !$this->comparator->compare($element, $generatedElement);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/SchemaDiff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/SchemaDiff.php
new file mode 100644
index 0000000000000..0486b5f645d19
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/SchemaDiff.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
+
+/**
+ * Aggregation root of all diffs.
+ * Loop through all tables and find difference between them.
+ *
+ * If table exists only in XML -> then we need to create table.
+ * If table exists in both version -> then we need to go deeper and inspect each element.
+ * If table exists only in db -> then we need to remove this table.
+ */
+class SchemaDiff
+{
+    /**
+     * @var TableDiff
+     */
+    private $tableDiff;
+
+    /**
+     * @var DiffManager
+     */
+    private $diffManager;
+
+    /**
+     * @var DiffFactory
+     */
+    private $diffFactory;
+
+    /**
+     * @var OperationsExecutor
+     */
+    private $operationsExecutor;
+
+    /**
+     * Constructor.
+     *
+     * @param DiffManager $diffManager
+     * @param TableDiff $tableDiff
+     * @param DiffFactory $diffFactory
+     * @param OperationsExecutor $operationsExecutor
+     */
+    public function __construct(
+        DiffManager $diffManager,
+        TableDiff $tableDiff,
+        DiffFactory $diffFactory,
+        OperationsExecutor $operationsExecutor
+    ) {
+        $this->tableDiff = $tableDiff;
+        $this->diffManager = $diffManager;
+        $this->diffFactory = $diffFactory;
+        $this->operationsExecutor = $operationsExecutor;
+    }
+
+    /**
+     * Create consistent table index from all tables
+     *
+     * All declared table names should have order, all tables exists only in db should goes after them
+     *
+     * @param array $tableNames
+     * @param array $generatedTableNames
+     * @return array
+     */
+    private function createTableIndex(array $tableNames, array $generatedTableNames)
+    {
+        foreach ($generatedTableNames as $tableName) {
+            //If table exists only in db
+            if (!in_array($tableName, $tableNames)) {
+                $tableNames[] = $tableName;
+            }
+        }
+
+        return array_flip($tableNames);
+    }
+
+    /**
+     * Create diff.
+     *
+     * @param Schema $schema
+     * @param Schema $generatedSchema
+     * @return Diff
+     */
+    public function diff(
+        Schema $schema,
+        Schema $generatedSchema
+    ) {
+        $generatedTables = $generatedSchema->getTables();
+        $tableNames = array_keys($schema->getTables());
+        $generatedTableNames = array_keys($generatedSchema->getTables());
+
+        $diff = $this->diffFactory->create(
+            [
+                'tableIndexes' => $this->createTableIndex($tableNames, $generatedTableNames),
+                'destructiveOperations' => $this->operationsExecutor->getDestructiveOperations()
+            ]
+        );
+
+        foreach ($schema->getTables() as $name => $table) {
+            if ($this->diffManager->shouldBeCreated($generatedTables, $table)) {
+                $diff = $this->diffManager->registerCreation($diff, $table);
+            } else {
+                $diff = $this->tableDiff->diff($table, $generatedTables[$name], $diff);
+            }
+
+            unset($generatedTables[$name]);
+        }
+        //Removal process
+        if ($this->diffManager->shouldBeRemoved($generatedTables)) {
+            $diff = $this->diffManager->registerRemoval($diff, $generatedTables);
+        }
+
+        return $diff;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php
new file mode 100644
index 0000000000000..87045df864a3e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ModifyColumn;
+
+/**
+ * As table can have different types of elements inside itself.
+ * We need to compare all of this elements.
+ *
+ * If element exists only in XML -> then we need to create element.
+ * If element exists in both version and are different -> then we need to modify element.
+ * If element exists only in db -> then we need to remove this element.
+ */
+class TableDiff
+{
+    /**
+     * Column type for diff.
+     */
+    const COLUMN_DIFF_TYPE = "columns";
+
+    /**
+     * Constraint type for diff.
+     */
+    const CONSTRAINT_DIFF_TYPE = "constraints";
+
+    /**
+     * Constraint type for diff.
+     */
+    const INDEX_DIFF_TYPE = "indexes";
+
+    /**
+     * @var DiffManager
+     */
+    private $diffManager;
+
+    /**
+     * Constructor.
+     *
+     * @param DiffManager $diffManager
+     */
+    public function __construct(DiffManager $diffManager)
+    {
+        $this->diffManager = $diffManager;
+    }
+
+    /**
+     * As SQL engine can automatically create indexes for foreign keys in order to speedup selection
+     * and we do not have this keys in declaration - we need to ignore them.
+     *
+     * @param  Table   $table
+     * @param  Index[] $indexes
+     * @return Index[]
+     */
+    private function excludeAutoIndexes(Table $table, array $indexes)
+    {
+        foreach ($table->getReferenceConstraints() as $constraint) {
+            unset($indexes[$constraint->getName()]);
+        }
+
+        return $indexes;
+    }
+
+    /**
+     * As foreign key is constraint, that do not allow to change column schema definition
+     * we need to disable it in order to change column definition. When column definition
+     * will be changed we need to enable foreign key again.
+     * We need to start column modification from parent table (reference table) and then go to
+     * tables that have foreign keys.
+     *
+     * @param Table $declaredTable
+     * @param Table $generatedTable
+     * @param Diff $diff
+     * @return Diff
+     */
+    private function turnOffForeignKeys(Table $declaredTable, Table $generatedTable, Diff $diff)
+    {
+        $changes = $diff->getChange($generatedTable->getName(), ModifyColumn::OPERATION_NAME);
+
+        foreach ($changes as $elementHistory) {
+            /** If this is column we need to recreate foreign key */
+            if ($elementHistory->getNew() instanceof Column) {
+                $column = $elementHistory->getNew();
+                $references = $generatedTable->getReferenceConstraints();
+                $declaredReferences = $this->getElementsListByNameWithoutPrefix(
+                    $declaredTable->getReferenceConstraints()
+                );
+
+                foreach ($references as $reference) {
+                    /** In case when we have foreign key on column, that should be modified */
+                    if ($reference->getColumn()->getName() === $column->getName() &&
+                        isset($declaredReferences[$reference->getNameWithoutPrefix()])
+                    ) {
+                        /**
+                         * Lets disable foreign key and enable it again
+                         * As between drop and create operations we have operation of modification
+                         * we will drop key, modify column, add key
+                         */
+                        $diff = $this->diffManager->registerRemoval($diff, [$reference]);
+                        $diff = $this->diffManager
+                            ->registerCreation(
+                                $diff,
+                                $declaredReferences[$reference->getNameWithoutPrefix()]
+                            );
+                    }
+                }
+            }
+        }
+
+        return $diff;
+    }
+
+    /**
+     * Switches keys of the array on the element name without prefix.
+     *
+     * @param Constraint[]|Index[] $elements
+     * @return array
+     */
+    private function getElementsListByNameWithoutPrefix(array $elements)
+    {
+        $elementsList = [];
+        foreach ($elements as $element) {
+            $elementsList[$element->getNameWithoutPrefix()] = $element;
+        }
+
+        return $elementsList;
+    }
+
+    /**
+     * Diff between tables.
+     *
+     * @param Table | ElementInterface $declaredTable
+     * @param Table | ElementInterface $generatedTable
+     * @param Diff                     $diff
+     * @inheritdoc
+     */
+    public function diff(
+        ElementInterface $declaredTable,
+        ElementInterface $generatedTable,
+        Diff $diff
+    ) {
+        if ($declaredTable->getResource() !== $generatedTable->getResource()) {
+            $this->diffManager->registerRecreation($declaredTable, $generatedTable, $diff);
+            return $diff;
+        }
+
+        if ($this->diffManager->shouldBeModified($declaredTable, $generatedTable)) {
+            $this->diffManager->registerTableModification($declaredTable, $generatedTable, $diff);
+        }
+
+        return $this->calculateDiff($declaredTable, $generatedTable, $diff);
+    }
+
+    /**
+     * Calculate the difference between tables.
+     *
+     * @param Table|ElementInterface $declaredTable
+     * @param Table|ElementInterface $generatedTable
+     * @param Diff $diff
+     * @return Diff
+     */
+    private function calculateDiff(ElementInterface $declaredTable, ElementInterface $generatedTable, Diff $diff)
+    {
+        $types = [self::COLUMN_DIFF_TYPE, self::CONSTRAINT_DIFF_TYPE, self::INDEX_DIFF_TYPE];
+        //We do inspection for each element type
+        foreach ($types as $elementType) {
+            $generatedElements = $generatedTable->getElementsByType($elementType);
+            $declaredElements = $declaredTable->getElementsByType($elementType);
+
+            if ($elementType === self::INDEX_DIFF_TYPE) {
+                $generatedElements = $this->excludeAutoIndexes($generatedTable, $generatedElements);
+                $declaredElements = $this->excludeAutoIndexes($declaredTable, $declaredElements);
+            }
+
+            if (in_array($elementType, [self::CONSTRAINT_DIFF_TYPE, self::INDEX_DIFF_TYPE], true)) {
+                $generatedElements = $this->getElementsListByNameWithoutPrefix($generatedElements);
+                $declaredElements = $this->getElementsListByNameWithoutPrefix($declaredElements);
+            }
+
+            foreach ($declaredElements as $elementName => $element) {
+                //If it is new for generated (generated from db) elements - we need to create it
+                if (!isset($generatedElements[$elementName])) {
+                    $diff = $this->diffManager->registerCreation($diff, $element);
+                } elseif ($this->diffManager->shouldBeModified(
+                    $element,
+                    $generatedElements[$elementName]
+                )) {
+                    $diff = $this->diffManager
+                        ->registerModification($diff, $element, $generatedElements[$elementName]);
+                }
+                //Unset processed elements from generated from db schema
+                //All other unprocessed elements will be added as removed ones
+                unset($generatedElements[$elementName]);
+            }
+
+            //Elements that should be removed
+            if ($this->diffManager->shouldBeRemoved($generatedElements)) {
+                $diff = $this->diffManager->registerRemoval($diff, $generatedElements);
+            }
+        }
+
+        $diff = $this->turnOffForeignKeys($declaredTable, $generatedTable, $diff);
+
+        return $diff;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DryRunLogger.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DryRunLogger.php
new file mode 100644
index 0000000000000..dcecfc4159619
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DryRunLogger.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * This class is responsible for logging dry run SQL`s
+ * By default it logs them into filesystem, but it can be extended and you can log them in CLI
+ * Current problem with logging output to CLI, is that we have redudant things in CLI output, like modules progress
+ */
+class DryRunLogger
+{
+    /**
+     * We will run installation or upgrade in Dry Run mode
+     */
+    const INPUT_KEY_DRY_RUN_MODE = 'dry-run';
+
+    /**
+     * File name, where all dry-run SQL`s will be puted
+     */
+    const FILE_NAME = 'dry-run-installation.log';
+
+    /**
+     * Allows to separate 2 different sql statements with this separator
+     * Be default is used 2 empty lines
+     */
+    const LINE_SEPARATOR = "\n\n";
+
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
+    private $fileDriver;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @param \Magento\Framework\Filesystem\Driver\File $fileDriver
+     * @param DirectoryList $directoryList
+     */
+    public function __construct(
+        \Magento\Framework\Filesystem\Driver\File $fileDriver,
+        DirectoryList $directoryList
+    ) {
+        $this->fileDriver = $fileDriver;
+        $this->directoryList = $directoryList;
+    }
+
+    /**
+     * Create log directory if it doest not exists
+     *
+     * @param string $logFolderPath
+     * @throws \Exception
+     */
+    private function assertLogFolderExists($logFolderPath)
+    {
+        if (!$this->fileDriver->isDirectory($logFolderPath)) {
+            $this->fileDriver->createDirectory($logFolderPath);
+        }
+
+        if (!$this->fileDriver->isDirectory($logFolderPath)) {
+            throw new \Exception(sprintf("Can`t create log directory: %s", $logFolderPath));
+        }
+    }
+
+    /**
+     * @param string $fileName
+     * @throws \Exception
+     */
+    private function assertFileExists($fileName)
+    {
+        if (!$this->fileDriver->isExists($fileName)) {
+            $this->fileDriver->touch($fileName);
+        }
+
+        if (!$this->fileDriver->isExists($fileName)) {
+            throw new \Exception(sprintf("Can`t create file %s", $fileName));
+        }
+    }
+
+    /**
+     * Make file empty from request to request
+     * @throws \Exception
+     * @return void
+     */
+    public function prepareToDryRun()
+    {
+        if ($this->fileDriver->isExists($this->getLoggerFile())) {
+            if (!$this->fileDriver->isWritable($this->getLoggerFile())) {
+                throw new \Exception(sprintf('Dry run logger file is not writable'));
+            }
+
+            $this->fileDriver->deleteFile($this->getLoggerFile());
+            $this->fileDriver->touch($this->getLoggerFile());
+        }
+    }
+
+    /**
+     * Return folder path, where dry run logged file will be placed
+     *
+     * @return string
+     */
+    private function getLoggerFolder()
+    {
+        return $this->directoryList->getPath(DirectoryList::VAR_DIR) .
+            DIRECTORY_SEPARATOR . 'log';
+    }
+
+    /**
+     * Return dry run logger file
+     *
+     * @return string
+     */
+    private function getLoggerFile()
+    {
+        return $this->getLoggerFolder() . DIRECTORY_SEPARATOR . self::FILE_NAME;
+    }
+
+    /**
+     * Do log of SQL query, 2 different SQL`s will be divided by one empty line
+     *
+     * @param string $sql
+     * @throws \Exception
+     * @return void
+     */
+    public function log($sql)
+    {
+        $loggerFolder = $this->getLoggerFolder();
+        $loggerFile = $this->getLoggerFile();
+        $this->assertLogFolderExists($loggerFolder);
+        $this->assertFileExists($loggerFile);
+
+        if ($this->fileDriver->isWritable($loggerFile)) {
+            $fd = $this->fileDriver->fileOpen($loggerFile, 'a');
+            $this->fileDriver->fileWrite($fd, $sql . self::LINE_SEPARATOR);
+        } else {
+            throw new \Exception(sprintf('Can`t write to file %s', $loggerFile));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Column.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Column.php
new file mode 100644
index 0000000000000..6dd2f554c6805
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Column.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Column structural element.
+ */
+class Column extends GenericElement implements
+    ElementInterface,
+    TableElementInterface
+{
+    /**
+     * Element type.
+     */
+    const TYPE = 'column';
+
+    /**
+     * @var Table
+     */
+    private $table;
+
+    /**
+     * @var null|string
+     */
+    private $onCreate;
+
+    /**
+     * @var string
+     */
+    private $comment;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param string $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type);
+        $this->table = $table;
+        $this->onCreate = $onCreate;
+        $this->comment = $comment;
+    }
+
+    /**
+     * Retrieve table name.
+     *
+     * @return Table
+     */
+    public function getTable()
+    {
+        return $this->table;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getElementType()
+    {
+        return self::TYPE;
+    }
+
+    /**
+     * Get On Create statement.
+     *
+     * @return null|string
+     */
+    public function getOnCreate()
+    {
+        return $this->onCreate;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Blob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Blob.php
new file mode 100644
index 0000000000000..0f202d9d98b6b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Blob.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * This column represent binary type.
+ * We can have few binary types: blob, mediumblob, longblob.
+ * Declared in SQL, like blob.
+ */
+class Blob extends Column implements
+    ElementDiffAwareInterface,
+    ColumnNullableAwareInterface
+{
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param bool $nullable
+     * @param string|null $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        bool $nullable = true,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->nullable = $nullable;
+    }
+
+    /**
+     * Check whether column can be nullable.
+     *
+     * @return bool
+     */
+    public function isNullable()
+    {
+        return $this->nullable;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'nullable' => $this->isNullable(),
+            'comment' => $this->getComment()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Boolean.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Boolean.php
new file mode 100644
index 0000000000000..df1ee502d46be
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Boolean.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Boolean column.
+ * Declared in SQL, like TINYINT(1) or BOOL or BOOLEAN. Alias for integer or binary type.
+ */
+class Boolean extends Column implements
+    ElementDiffAwareInterface,
+    ColumnNullableAwareInterface,
+    ColumnDefaultAwareInterface
+{
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * @var bool
+     */
+    private $default;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param bool $nullable
+     * @param bool $default
+     * @param string|null $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        bool $nullable = true,
+        bool $default = null,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->nullable = $nullable;
+        $this->default = $default;
+    }
+
+    /**
+     * Check whether column can be nullable.
+     *
+     * @return bool
+     */
+    public function isNullable()
+    {
+        return $this->nullable;
+    }
+
+    /**
+     * Return default value.
+     * Note: default value should be int.
+     *
+     * @return int|null
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'nullable' => $this->isNullable(),
+            'default' => $this->getDefault(),
+            'comment' => $this->getComment()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
new file mode 100644
index 0000000000000..6c043cd8ed838
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+/**
+ * Provides default value for column.
+ */
+interface ColumnDefaultAwareInterface
+{
+    /**
+     * Check whether element is unsigned or not.
+     *
+     * @return array
+     */
+    public function getDefault();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
new file mode 100644
index 0000000000000..63c13711404fd
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+/**
+ * Provides auto_increment flag for column.
+ */
+interface ColumnIdentityAwareInterface
+{
+    /**
+     * Check whether element is auto incremental or not.
+     *
+     * @return array
+     */
+    public function isIdentity();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
new file mode 100644
index 0000000000000..0ae403abd5702
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+/**
+ * Provides nullable flag for element.
+ * If column element implement this interface, than it will have NULL or NOT NULL flag in column definition.
+ */
+interface ColumnNullableAwareInterface
+{
+    /**
+     * Check is element nullable or not.
+     *
+     * @return array
+     */
+    public function isNullable();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
new file mode 100644
index 0000000000000..be5d6bf91ef75
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+/**
+ * Unsigned flag provider for element.
+ * If column element implement this interface, than it will have UNSIGNED flag in column
+ * definition.
+ */
+interface ColumnUnsignedAwareInterface
+{
+    /**
+     * Check whether element is unsigned or not.
+     *
+     * @return array
+     */
+    public function isUnsigned();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Date.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Date.php
new file mode 100644
index 0000000000000..13f6c0da0499d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Date.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Date column.
+ * Declared in SQL, like DATE.
+ * Does not have any additional params.
+ * Is represented like: YY:MM:DD.
+ */
+class Date extends Column implements
+    ElementDiffAwareInterface,
+    ColumnNullableAwareInterface
+{
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param bool $nullable
+     * @param string|null $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        bool $nullable = true,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->nullable = $nullable;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'nullable' => $this->isNullable(),
+            'comment' => $this->getComment()
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isNullable(): bool
+    {
+        return $this->nullable;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Integer.php
new file mode 100644
index 0000000000000..5c0c89dd0b4b8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Integer.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Integer column.
+ * Declared in SQL, like INT(11) or BIGINT(20).
+ * Where digit is padding, how many zeros should be added before first non-zero digit.
+ */
+class Integer extends Column implements
+    ElementDiffAwareInterface,
+    ColumnUnsignedAwareInterface,
+    ColumnNullableAwareInterface,
+    ColumnIdentityAwareInterface,
+    ColumnDefaultAwareInterface
+{
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * @var int
+     */
+    private $default;
+
+    /**
+     * @var bool
+     */
+    private $unsigned;
+    /**
+     * @var int
+     */
+    private $padding;
+    /**
+     * @var bool
+     */
+    private $identity;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param int $padding
+     * @param bool $nullable
+     * @param bool $unsigned
+     * @param bool $identity
+     * @param float|int $default
+     * @param string|null $comment
+     * @param string|null $onCreate
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        int $padding,
+        bool $nullable = true,
+        bool $unsigned = false,
+        bool $identity = false,
+        int $default = null,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->nullable = $nullable;
+        $this->default = $default;
+        $this->unsigned = $unsigned;
+        $this->padding = $padding;
+        $this->identity = $identity;
+    }
+
+    /**
+     * Column padding.
+     *
+     * @return int
+     */
+    public function getPadding()
+    {
+        return $this->padding;
+    }
+
+    /**
+     * Check whether column can be nullable.
+     *
+     * @return bool
+     */
+    public function isNullable()
+    {
+        return $this->nullable;
+    }
+
+    /**
+     * Return default value.
+     * Note: default value should be int.
+     *
+     * @return int | null
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * Check whether element is unsigned or not.
+     *
+     * @return bool
+     */
+    public function isUnsigned()
+    {
+        return $this->unsigned;
+    }
+
+    /**
+     * Define whether column can be autoincrement or not.
+     *
+     * @return bool
+     */
+    public function isIdentity()
+    {
+        return $this->identity;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'nullable' => $this->isNullable(),
+            'padding' => $this->getPadding(),
+            'unsigned' => $this->isUnsigned(),
+            'identity' => $this->isIdentity(),
+            'default' => $this->getDefault(),
+            'comment' => $this->getComment()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Real.php
new file mode 100644
index 0000000000000..fd24ff1c5523a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Real.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Real data column.
+ * Declared in SQL, like FLOAT(P, S), DOUBLE(P, S) or DECIMAL(P, S)
+ * where S - is scale, P - is precision.
+ * https://dev.mysql.com/doc/refman/5.7/en/precision-math-decimal-characteristics.html
+ */
+class Real extends Column implements
+    ElementDiffAwareInterface,
+    ColumnUnsignedAwareInterface,
+    ColumnNullableAwareInterface,
+    ColumnDefaultAwareInterface
+{
+    /**
+     * @var int
+     */
+    private $precision;
+
+    /**
+     * @var int
+     */
+    private $scale;
+
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * @var float
+     */
+    private $default;
+
+    /**
+     * @var bool
+     */
+    private $unsigned;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param int $precision
+     * @param int $scale
+     * @param bool $nullable
+     * @param bool $unsigned
+     * @param float $default
+     * @param string|null $comment
+     * @param string|null $onCreate
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        int $precision,
+        int $scale,
+        bool $nullable = true,
+        bool $unsigned = false,
+        float $default = null,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->precision = $precision;
+        $this->scale = $scale;
+        $this->nullable = $nullable;
+        $this->default = $default;
+        $this->unsigned = $unsigned;
+    }
+
+    /**
+     * Column precision.
+     *
+     * @return int
+     */
+    public function getPrecision()
+    {
+        return (int)$this->precision;
+    }
+
+    /**
+     * Column scale.
+     *
+     * @return int
+     */
+    public function getScale()
+    {
+        return (int)$this->scale;
+    }
+
+    /**
+     * Check whether column can be nullable.
+     *
+     * @return bool
+     */
+    public function isNullable()
+    {
+        return (bool)$this->nullable;
+    }
+
+    /**
+     * Return default value.
+     * Note: default value should be float.
+     *
+     * @return float|null
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * Check whether element is unsigned or not.
+     *
+     * @return bool
+     */
+    public function isUnsigned()
+    {
+        return (bool)$this->unsigned;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'nullable' => $this->isNullable(),
+            'precision' => $this->getPrecision(),
+            'scale' => $this->getScale(),
+            'unsigned' => $this->isUnsigned(),
+            'default' => $this->getDefault(),
+            'comment' => $this->getComment()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/StringBinary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/StringBinary.php
new file mode 100644
index 0000000000000..58e6df1146300
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/StringBinary.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * String or Binary column.
+ * Declared in SQL, like VARCHAR(L), BINARY(L)
+ * where L - length.
+ */
+class StringBinary extends Column implements
+    ElementDiffAwareInterface,
+    ColumnNullableAwareInterface,
+    ColumnDefaultAwareInterface
+{
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * @var int
+     */
+    private $default;
+
+    /**
+     * @var int
+     */
+    private $length;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param int $length
+     * @param bool $nullable
+     * @param string $default
+     * @param string|null $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        int $length,
+        bool $nullable = true,
+        string $default = null,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->nullable = $nullable;
+        $this->default = $default;
+        $this->length = $length;
+    }
+
+    /**
+     * Check whether column can be nullable.
+     *
+     * @return bool
+     */
+    public function isNullable()
+    {
+        return $this->nullable;
+    }
+
+    /**
+     * Return default value.
+     * Note: default value should be string.
+     *
+     * @return string | null
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * Length can be integer value from 0 to 255.
+     *
+     * @return int
+     */
+    public function getLength()
+    {
+        return $this->length;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'nullable' => $this->isNullable(),
+            'default' => $this->getDefault(),
+            'length' => $this->getLength(),
+            'comment' => $this->getComment()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Text.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Text.php
new file mode 100644
index 0000000000000..b127d5d50e08c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Text.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Text column.
+ * Declared in SQL, like: TEXT, TINYTEXT, MEDIUMTEXT, LONGTEXT.
+ */
+class Text extends Column implements
+    ElementDiffAwareInterface,
+    ColumnNullableAwareInterface
+{
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param bool $nullable
+     * @param string|null $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        bool $nullable = true,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->nullable = $nullable;
+    }
+
+    /**
+     * Check whether column can be nullable.
+     *
+     * @return bool
+     */
+    public function isNullable()
+    {
+        return $this->nullable;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'nullable' => $this->isNullable(),
+            'comment' => $this->getComment()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Timestamp.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Timestamp.php
new file mode 100644
index 0000000000000..240a4bd755dbe
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Timestamp.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Timestamp column.
+ * Declared in SQL, like Timestamp.
+ * Has 2 additional params: default and on_update.
+ */
+class Timestamp extends Column implements
+    ElementDiffAwareInterface,
+    ColumnDefaultAwareInterface,
+    ColumnNullableAwareInterface
+{
+    /**
+     * @var string
+     */
+    private $default;
+
+    /**
+     * @var null|string
+     */
+    private $onUpdate;
+
+    /**
+     * @var bool
+     */
+    private $nullable;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param string $default
+     * @param bool $nullable
+     * @param string|null $onUpdate
+     * @param string|null $comment
+     * @param string|null $onCreate
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        string $default,
+        bool $nullable = true,
+        string $onUpdate = null,
+        string $comment = null,
+        string $onCreate = null
+    ) {
+        parent::__construct($name, $type, $table, $comment, $onCreate);
+        $this->default = $default;
+        $this->onUpdate = $onUpdate;
+        $this->nullable = $nullable;
+    }
+
+    /**
+     * Return default value.
+     *
+     * @return int|null
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * Retrieve on_update param.
+     *
+     * @return string
+     */
+    public function getOnUpdate()
+    {
+        return $this->onUpdate;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'default' => $this->getDefault(),
+            'onUpdate' => $this->getOnUpdate(),
+            'comment' => $this->getComment()
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isNullable(): bool
+    {
+        return $this->nullable;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraint.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraint.php
new file mode 100644
index 0000000000000..9f03c1c20cf49
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraint.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Constraint structural element.
+ * Used for creating additional rules on db tables.
+ */
+class Constraint extends GenericElement implements
+    ElementInterface,
+    TableElementInterface
+{
+    /**
+     * In case if we will need to change this object: add, modify or drop, we will need
+     * to define it by its type.
+     */
+    const TYPE = 'constraint';
+
+    /**
+     * Means PRIMARY KEY
+     */
+    const PRIMARY_TYPE = 'primary';
+
+    /**
+     * Means UNIQUE KEY
+     */
+    const UNIQUE_TYPE = 'unique';
+
+    /**
+     * @var Table
+     */
+    private $table;
+
+    /**
+     * @var string
+     */
+    private $nameWithoutPrefix;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param string $nameWithoutPrefix
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        string $nameWithoutPrefix
+    ) {
+        parent::__construct($name, $type);
+        $this->table = $table;
+        $this->nameWithoutPrefix = $nameWithoutPrefix;
+    }
+
+    /**
+     * Retrieve table object.
+     *
+     * @return Table
+     */
+    public function getTable()
+    {
+        return $this->table;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getElementType()
+    {
+        return self::TYPE;
+    }
+
+    /**
+     * Retrieve the constraint name which is calculated without table prefix.
+     *
+     * @return string
+     */
+    public function getNameWithoutPrefix()
+    {
+        return $this->nameWithoutPrefix;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Internal.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Internal.php
new file mode 100644
index 0000000000000..486d43c023c7f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Internal.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Constraints;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Internal key constraint is constraint that add KEY onto table columns, on which it is declared.
+ * All columns that are holded in this constraint are represented as unique vector.
+ */
+class Internal extends Constraint implements ElementDiffAwareInterface
+{
+    /**
+     * As we can have only one primary key. It name should be always PRIMARY/
+     */
+    const PRIMARY_NAME = "PRIMARY";
+
+    /**
+     * @var array
+     */
+    private $columns;
+
+    /**
+     * Internal constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param string $nameWithoutPrefix
+     * @param array $columns
+     */
+    public function __construct(
+        $name,
+        $type,
+        Table $table,
+        string $nameWithoutPrefix,
+        array $columns
+    ) {
+        parent::__construct($name, $type, $table, $nameWithoutPrefix);
+        $this->columns = $columns;
+    }
+
+    /**
+     * Get key columns.
+     *
+     * @return Column[]
+     */
+    public function getColumns()
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Retrieve column names.
+     *
+     * @return array
+     */
+    public function getColumnNames()
+    {
+        return array_map(
+            function (Column $column) {
+                return $column->getName();
+            },
+            $this->getColumns()
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'columns' => $this->getColumnNames()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Reference.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Reference.php
new file mode 100644
index 0000000000000..b5c8d16311448
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Reference.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Constraints;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Reference (Foreign Key) constraint.
+ */
+class Reference extends Constraint implements ElementDiffAwareInterface
+{
+    /**
+     * In case if we will need to change this object: add, modify or drop, we will need
+     * to define it by its type.
+     */
+    const TYPE = 'reference';
+
+    /**
+     * @var Column
+     */
+    private $column;
+
+    /**
+     * @var Table
+     */
+    private $referenceTable;
+
+    /**
+     * @var Column
+     */
+    private $referenceColumn;
+
+    /**
+     * @var string
+     */
+    private $onDelete;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param string $nameWithoutPrefix
+     * @param Column $column
+     * @param Table $referenceTable
+     * @param Column $referenceColumn
+     * @param string $onDelete
+     * @SuppressWarnings(Magento.TypeDuplication)
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        string $nameWithoutPrefix,
+        Column $column,
+        Table $referenceTable,
+        Column $referenceColumn,
+        string $onDelete
+    ) {
+        parent::__construct($name, $type, $table, $nameWithoutPrefix);
+        $this->column = $column;
+        $this->referenceTable = $referenceTable;
+        $this->referenceColumn = $referenceColumn;
+        $this->onDelete = $onDelete;
+    }
+
+    /**
+     * Get column instance.
+     *
+     * @return Column
+     */
+    public function getColumn()
+    {
+        return $this->column;
+    }
+
+    /**
+     * Get external column in reference table.
+     *
+     * @return Column
+     */
+    public function getReferenceColumn()
+    {
+        return $this->referenceColumn;
+    }
+
+    /**
+     * Get external referenced table.
+     *
+     * @return Table
+     */
+    public function getReferenceTable()
+    {
+        return $this->referenceTable;
+    }
+
+    /**
+     * On delete action.
+     *
+     * @return string
+     */
+    public function getOnDelete()
+    {
+        return $this->onDelete;
+    }
+
+    /**
+     * For foreign key type is always 'reference'.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return self::TYPE;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'column' => $this->getColumn()->getName(),
+            'referenceColumn' => $this->getReferenceColumn()->getName(),
+            'referenceTableName' => $this->getReferenceTable()->getName(),
+            'tableName' => $this->getTable()->getName(),
+            'onDelete' => $this->getOnDelete(),
+            'resource' => $this->getTable()->getResource()
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementDiffAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementDiffAwareInterface.php
new file mode 100644
index 0000000000000..54413cc7234f5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementDiffAwareInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Element diff provider interface.
+ *
+ * This interface provides all params, that should participate in elements comparison.
+ */
+interface ElementDiffAwareInterface
+{
+    /**
+     * Return sensitive params, with respect of which we will compare db and xml
+     * For instance,
+     *  padding => '2'
+     *  identity => null
+     *
+     * Such params as name, renamedTo, disabled, tableName should be avoided here.
+     * As this params are system and must not participate in comparison at all.
+     *
+     * @return array
+     */
+    public function getDiffSensitiveParams();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementFactory.php
new file mode 100644
index 0000000000000..ff770e2d0dcd8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementFactory.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\FactoryInterface;
+
+/**
+ * DTO Element factory.
+ *
+ * Instantiates any type of structural elements.
+ *
+ * @see ElementInterface
+ */
+class ElementFactory
+{
+    /**
+     * Predefined types of elements, that can be instantiated using this factory.
+     *
+     * Where @key - is xsi:type of the object
+     * Where @value - is instance class name
+     */
+    private $typeFactories = [];
+
+    /**
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Constructor.
+     *
+     * @param FactoryInterface[] $typeFactories
+     * @param BooleanUtils       $booleanUtils
+     */
+    public function __construct(
+        array $typeFactories,
+        BooleanUtils $booleanUtils
+    ) {
+        $this->typeFactories = $typeFactories;
+        $this->booleanUtils = $booleanUtils;
+    }
+
+    /**
+     * Cast generic attributes.
+     *
+     * Common attributes for multiple types:
+     *  - nullable
+     *  - unsigned
+     *  - identity
+     * Casted to boolean value in factory.
+     *
+     * @param  array $elementStructuralData
+     * @return array
+     */
+    private function castGenericAttributes(array $elementStructuralData)
+    {
+        $booleanAttributes = ['nullable', 'unsigned', 'identity'];
+
+        foreach ($booleanAttributes as $booleanAttribute) {
+            if (isset($elementStructuralData[$booleanAttribute])) {
+                $elementStructuralData[$booleanAttribute] = $this->booleanUtils
+                    ->toBoolean($elementStructuralData[$booleanAttribute]);
+            }
+        }
+
+        return $elementStructuralData;
+    }
+
+    /**
+     * Instantiate different types of elements, depends on their xsi:type.
+     *
+     * @param  string $type
+     * @param  array  $elementStructuralData
+     * @return ElementInterface | object
+     */
+    public function create($type, array $elementStructuralData)
+    {
+        if (!isset($this->typeFactories[$type])) {
+            throw new \InvalidArgumentException(sprintf("Types %s is not declared", $type));
+        }
+
+        $elementStructuralData = $this->castGenericAttributes($elementStructuralData);
+        $elementStructuralData['type'] = $type;
+        return $this->typeFactories[$type]->create($elementStructuralData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
new file mode 100644
index 0000000000000..43c4c5d9d516a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Generic DTO Element interface.
+ *
+ * Is parent interface for all various schema structural elements:
+ * table, column, constraint, index.
+ * @api
+ */
+interface ElementInterface
+{
+    /**
+     * Return name of structural element.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Retrieve element low level type: varchar, char, foreign key, etc..
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * Retrieve high level type: column, constraint, index, table.
+     *
+     * On high level different elements can be created or modified in different ways.
+     * So for each high level type of elements were created different operations.
+     * And in order to distinguish this types of elements we use this method.
+     *
+     * @return string
+     */
+    public function getElementType();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Blob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Blob.php
new file mode 100644
index 0000000000000..739f42fd1710e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Blob.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Blob factory.
+ */
+class Blob implements FactoryInterface
+{
+    /**
+     * Default blob length.
+     */
+    const DEFAULT_BLOB_LENGTH = 65536;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Blob::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['length'])) {
+            $data['length'] = self::DEFAULT_BLOB_LENGTH;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Boolean.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Boolean.php
new file mode 100644
index 0000000000000..5e22fa70f6f60
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Boolean.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Stdlib\BooleanUtils;
+
+/**
+ * Boolean factory.
+ */
+class Boolean implements FactoryInterface
+{
+    /**
+     * Default value for boolean xsi:type.
+     */
+    const DEFAULT_BOOLEAN = false;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param BooleanUtils           $booleanUtils
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        BooleanUtils $booleanUtils,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+        $this->booleanUtils = $booleanUtils;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (isset($data['default'])) {
+            $data['default'] = $this->booleanUtils->toBoolean($data['default']);
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Date.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Date.php
new file mode 100644
index 0000000000000..f5e3271c5ff2a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Date.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Date factory.
+ * Remove default and nullable attributes, as date type must not have any attributes.
+ */
+class Date implements FactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Date::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/FactoryInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/FactoryInterface.php
new file mode 100644
index 0000000000000..26ed3e8a4d277
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/FactoryInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * DTO Element Factory Interface.
+ */
+interface FactoryInterface
+{
+    /**
+     * Create element using definition data array.
+     *
+     * @param  array $data
+     * @return ElementInterface
+     */
+    public function create(array $data);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
new file mode 100644
index 0000000000000..040549a5611ca
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
+use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
+
+/**
+ * Foreign key constraint factory.
+ */
+class Foreign implements FactoryInterface
+{
+    /**
+     * Default ON DELETE action.
+     */
+    const DEFAULT_ON_DELETE = "CASCADE";
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var TableNameResolver
+     */
+    private $tableNameResolver;
+
+    /**
+     * @var ElementNameResolver
+     */
+    private $elementNameResolver;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param ResourceConnection $resourceConnection
+     * @param TableNameResolver $tableNameResolver
+     * @param ElementNameResolver $elementNameResolver
+     * @param string $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ResourceConnection $resourceConnection,
+        TableNameResolver $tableNameResolver,
+        ElementNameResolver $elementNameResolver,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->resourceConnection = $resourceConnection;
+        $this->className = $className;
+        $this->tableNameResolver = $tableNameResolver;
+        $this->elementNameResolver = $elementNameResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['onDelete'])) {
+            $data['onDelete'] = self::DEFAULT_ON_DELETE;
+        }
+
+        $data['nameWithoutPrefix'] = $this->elementNameResolver->getFKNameWithoutPrefix(
+            $data['name'],
+            $data['table'],
+            $data['column'],
+            $data['referenceTable'],
+            $data['referenceColumn']
+        );
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
new file mode 100644
index 0000000000000..715f98c4177c0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
+use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
+
+/**
+ * Index element factory.
+ */
+class Index implements FactoryInterface
+{
+    /**
+     * Default index type.
+     */
+    const DEFAULT_INDEX_TYPE = "BTREE";
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var TableNameResolver
+     */
+    private $tableNameResolver;
+
+    /**
+     * @var ElementNameResolver
+     */
+    private $elementNameResolver;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param ResourceConnection $resourceConnection
+     * @param TableNameResolver $tableNameResolver
+     * @param ElementNameResolver $elementNameResolver
+     * @param string $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ResourceConnection $resourceConnection,
+        TableNameResolver $tableNameResolver,
+        ElementNameResolver $elementNameResolver,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Index::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->resourceConnection = $resourceConnection;
+        $this->className = $className;
+        $this->tableNameResolver = $tableNameResolver;
+        $this->elementNameResolver = $elementNameResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['indexType'])) {
+            $data['indexType'] = self::DEFAULT_INDEX_TYPE;
+        }
+
+        $data['nameWithoutPrefix'] = $this->elementNameResolver->getIndexNameWithoutPrefix(
+            $data['name'],
+            $data['table'],
+            $data['column'],
+            $data['indexType']
+        );
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Integer.php
new file mode 100644
index 0000000000000..5cd7bcac39736
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Integer.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Integer DTO element factory.
+ */
+class Integer implements FactoryInterface
+{
+    /**
+     * Describe default for different integer types.
+     *
+     * @var array
+     */
+    private static $defaultPadding = [
+        'int' => '11',
+        'tinyint' => '2',
+        'smallint' => '5',
+        'bigint' => '20'
+    ];
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['padding'])) {
+            $data['padding'] = self::$defaultPadding[$data['type']];
+        }
+        //Auto increment field can`t be null
+        if (isset($data['identity']) && $data['identity']) {
+            $data['nullable'] = false;
+        }
+
+        if (isset($data['default'])) {
+            $data['default'] = (int) $data['default'];
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongBlob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongBlob.php
new file mode 100644
index 0000000000000..17c0c9d27dc4c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongBlob.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * LongBlob DTO element factory.
+ */
+class LongBlob implements FactoryInterface
+{
+    /**
+     * Default long blog length.
+     */
+    const DEFAULT_BLOB_LENGTH = 2147483648;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Blob::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['length'])) {
+            $data['length'] = self::DEFAULT_BLOB_LENGTH;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongText.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongText.php
new file mode 100644
index 0000000000000..2e364a40a4bf5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongText.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * LongText DTO Element factory.
+ */
+class LongText implements FactoryInterface
+{
+    /**
+     * Default long text length.
+     */
+    const DEFAULT_TEXT_LENGTH = 2147483648;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Text::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['length'])) {
+            $data['length'] = self::DEFAULT_TEXT_LENGTH;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumBlob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumBlob.php
new file mode 100644
index 0000000000000..ae771d6e378fe
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumBlob.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Medium blob DTO element factory.
+ */
+class MediumBlob implements FactoryInterface
+{
+    /**
+     * Default medium blob length.
+     */
+    const DEFAULT_BLOB_LENGTH = 16777216;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Blob::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['length'])) {
+            $data['length'] = self::DEFAULT_BLOB_LENGTH;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumText.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumText.php
new file mode 100644
index 0000000000000..36c0207460126
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumText.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Medium text DTO element factory.
+ */
+class MediumText implements FactoryInterface
+{
+    /**
+     * Default medium text length.
+     */
+    const DEFAULT_TEXT_LENGTH = 16777216;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Text::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['length'])) {
+            $data['length'] = self::DEFAULT_TEXT_LENGTH;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Primary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Primary.php
new file mode 100644
index 0000000000000..836e32efec057
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Primary.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+
+/**
+ * Primary key DTO element factory.
+ *
+ * By default primary key can have only one name - PRIMARY to prevent duplicate primary key creation attempts.
+ */
+class Primary implements FactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        $data['name'] = Internal::PRIMARY_NAME;
+        $data['nameWithoutPrefix'] = $data['name'];
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
new file mode 100644
index 0000000000000..e0728b9a34fee
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Real type DTO element factory.
+ *
+ * Used for real numbers DTO elements like decimal, float or double.
+ * Decimal type is highly recommended for business math.
+ */
+class Real implements FactoryInterface
+{
+    /**
+     * Default SQL precision.
+     */
+    const DEFAULT_PRECISION = "10";
+
+    /**
+     * Default SQL scale.
+     */
+    const DEFAULT_SCALE = "0";
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['precision'])) {
+            $data['precision'] = ($data['type'] === 'decimal') ? self::DEFAULT_PRECISION : 0;
+        }
+
+        if (!isset($data['scale'])) {
+            $data['scale'] = ($data['type'] === 'decimal') ? self::DEFAULT_SCALE : 0;
+        }
+
+        if (isset($data['default'])) {
+            $data['default'] = (float)$data['default'];
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/StringBinary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/StringBinary.php
new file mode 100644
index 0000000000000..71b955ad7364c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/StringBinary.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * StringBinary DTO element factory.
+ *
+ * Used for char, varchar, binary, varbinary types.
+ */
+class StringBinary implements FactoryInterface
+{
+    /**
+     * Default data length.
+     */
+    const DEFAULT_TEXT_LENGTH = 255;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        $data['length'] = isset($data['length']) ? (int) $data['length'] : self::DEFAULT_TEXT_LENGTH;
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php
new file mode 100644
index 0000000000000..0a8f5b4ad23b3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Table DTO element factory.
+ */
+class Table implements FactoryInterface
+{
+    /**
+     * Default engine.
+     * May be redefined for other DBMS.
+     */
+    const DEFAULT_ENGINE = 'innodb';
+
+    /**
+     * Default charset for SQL
+     */
+    const DEFAULT_CHARSET = 'utf8';
+
+    /**
+     * Default collation
+     */
+    const DEFAULT_COLLATION = 'utf8_general_ci';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param ResourceConnection $resourceConnection
+     * @param string $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ResourceConnection $resourceConnection,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Table::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['engine'])) {
+            $data['engine'] = self::DEFAULT_ENGINE;
+        }
+        //Prepare charset
+        if (!isset($data['charset'])) {
+            $data['charset'] = self::DEFAULT_CHARSET;
+        }
+        //Prepare collation
+        if (!isset($data['collation'])) {
+            $data['collation'] = self::DEFAULT_COLLATION;
+        }
+        //Prepare triggers
+        if (!isset($data['onCreate'])) {
+            $data['onCreate'] = '';
+        }
+
+        $tablePrefix = $this->resourceConnection->getTablePrefix();
+        $nameWithoutPrefix = $data['name'];
+        if (!empty($tablePrefix) && strpos($nameWithoutPrefix, $tablePrefix) === 0) {
+            $data['nameWithoutPrefix'] = preg_replace('/^' . $tablePrefix . '/i', '', $data['name']);
+        } else {
+            $data['name'] = $tablePrefix . $data['name'];
+            $data['nameWithoutPrefix'] = $nameWithoutPrefix;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Text.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Text.php
new file mode 100644
index 0000000000000..24b3168d5679a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Text.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Text DTO element factory.
+ */
+class Text implements FactoryInterface
+{
+    /**
+     * Default text length.
+     */
+    const DEFAULT_TEXT_LENGTH = 65536;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Text::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        if (!isset($data['length'])) {
+            $data['length'] = self::DEFAULT_TEXT_LENGTH;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Timestamp.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Timestamp.php
new file mode 100644
index 0000000000000..4a7cca43919a1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Timestamp.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Stdlib\BooleanUtils;
+
+/**
+ * Timestamp DTO element factory.
+ *
+ * This format is used to save date (year, month, day).
+ * Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
+ * Date time in invalid format will be converted to '0000-00-00 00:00:00' string
+ * MySQL timestamp is similar to UNIX timestamp. You can pass you local time there and it will
+ * be converted to UTC timezone. Then when you will try to pull your time back it will be converted
+ * to your local time again.
+ * Unix range: 1970-01-01 00:00:01' UTC to '2038-01-09 03:14:07'
+ */
+class Timestamp implements FactoryInterface
+{
+    /**
+     * Nullable timestamp value.
+     */
+    const NULL_TIMESTAMP = 'NULL';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param BooleanUtils           $booleanUtils
+     * @param string                 $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        BooleanUtils $booleanUtils,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->className = $className;
+        $this->booleanUtils = $booleanUtils;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        $data['onUpdate'] = isset($data['on_update']) ? $data['on_update'] : null;
+        //OnUpdate is boolean as there is only one possible value for onUpdate statement.
+        if ($data['onUpdate'] && $data['onUpdate'] !== 'CURRENT_TIMESTAMP') {
+            if ($this->booleanUtils->toBoolean($data['onUpdate'])) {
+                $data['onUpdate'] = 'CURRENT_TIMESTAMP';
+            } else {
+                unset($data['onUpdate']);
+            }
+        }
+        //By default default attribute is not used.
+        if (!isset($data['default'])) {
+            $data['default'] = self::NULL_TIMESTAMP;
+        }
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
new file mode 100644
index 0000000000000..141e4a7083200
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\TableElement\ElementNameResolver;
+use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
+
+/**
+ * Unique constraint DTO element factory.
+ */
+class Unique implements FactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var TableNameResolver
+     */
+    private $tableNameResolver;
+
+    /**
+     * @var ElementNameResolver
+     */
+    private $elementNameResolver;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param ResourceConnection $resourceConnection
+     * @param TableNameResolver $tableNameResolver
+     * @param ElementNameResolver $elementNameResolver
+     * @param string $className
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ResourceConnection $resourceConnection,
+        TableNameResolver $tableNameResolver,
+        ElementNameResolver $elementNameResolver,
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->resourceConnection = $resourceConnection;
+        $this->className = $className;
+        $this->tableNameResolver = $tableNameResolver;
+        $this->elementNameResolver = $elementNameResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function create(array $data)
+    {
+        $data['nameWithoutPrefix'] = $this->elementNameResolver->getIndexNameWithoutPrefix(
+            $data['name'],
+            $data['table'],
+            $data['column'],
+            $data['type']
+        );
+
+        return $this->objectManager->create($this->className, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/GenericElement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/GenericElement.php
new file mode 100644
index 0000000000000..122f1afd6f9cc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/GenericElement.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Generic element DTO.
+ *
+ * Data transfer object, that provides access to basic attributes of various structural elements.
+ *
+ * Under structural element means one of next element, with can be represented in db schema :
+ *  - column
+ *  - constraint
+ *  - index
+ */
+abstract class GenericElement implements
+    ElementInterface
+{
+    /**
+     * High level type.
+     *
+     * @var string
+     */
+    private $type;
+
+    /**
+     * Element name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     */
+    public function __construct(string $name, string $type)
+    {
+        $this->type = $type;
+        $this->name = $name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Index.php
new file mode 100644
index 0000000000000..49436adad04e8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Index.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Index structural element.
+ * Used to speedup read operations from SQL database.
+ */
+class Index extends GenericElement implements
+    ElementInterface,
+    TableElementInterface,
+    ElementDiffAwareInterface
+{
+    /**
+     * Element type.
+     */
+    const TYPE = 'index';
+
+    /**
+     * Fulltext index type.
+     */
+    const FULLTEXT_INDEX = "fulltext";
+
+    /**
+     * @var Table
+     */
+    private $table;
+
+    /**
+     * @var array
+     */
+    private $columns;
+
+    /**
+     * @var string
+     */
+    private $indexType;
+
+    /**
+     * @var string
+     */
+    private $nameWithoutPrefix;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param Table $table
+     * @param array $columns
+     * @param string $indexType
+     * @param string $nameWithoutPrefix
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        Table $table,
+        array $columns,
+        string $indexType,
+        string $nameWithoutPrefix
+    ) {
+        parent::__construct($name, $type);
+        $this->table = $table;
+        $this->columns = $columns;
+        $this->indexType = $indexType;
+        $this->nameWithoutPrefix = $nameWithoutPrefix;
+    }
+
+    /**
+     * Return columns in order, in which they should go in composite index.
+     *
+     * @return Column[]
+     */
+    public function getColumns()
+    {
+        return $this->columns;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTable()
+    {
+        return $this->table;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'type' => $this->getType(),
+            'columns' => $this->getColumnNames(),
+            'indexType' => $this->getIndexType()
+        ];
+    }
+
+    /**
+     * Retrieve array with column names from column objects collections.
+     *
+     * @return array
+     */
+    public function getColumnNames()
+    {
+        return array_map(
+            function (Column $column) {
+                return $column->getName();
+            },
+            $this->getColumns()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getElementType()
+    {
+        return self::TYPE;
+    }
+
+    /**
+     * Get index type (FULLTEXT, BTREE, HASH).
+     *
+     * @return string
+     */
+    public function getIndexType()
+    {
+        return $this->indexType;
+    }
+
+    /**
+     * Retrieve the index name which is calculated without table prefix.
+     *
+     * @return string
+     */
+    public function getNameWithoutPrefix()
+    {
+        return $this->nameWithoutPrefix;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
new file mode 100644
index 0000000000000..fbbe188d127ae
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Schema DTO element.
+ *
+ * Aggregation root for all structural elements. Provides access to tables by their names.
+ */
+class Schema
+{
+    /**
+     * Resource connection.
+     *
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * Schema tables.
+     *
+     * @var Table[]
+     */
+    private $tables;
+
+    /**
+     * Schema constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+        $this->tables = [];
+    }
+
+    /**
+     * Retrieve all tables, that are presented in schema.
+     *
+     * @return Table[]
+     */
+    public function getTables()
+    {
+        return $this->tables;
+    }
+
+    /**
+     * Add table by name key to tables registry.
+     *
+     * @param  Table $table
+     * @return $this
+     */
+    public function addTable(Table $table)
+    {
+        $this->tables[$table->getName()] = $table;
+        return $this;
+    }
+
+    /**
+     * Retrieve table by it name.
+     *
+     * Return false if table is not present in schema.
+     *
+     * @param string $name
+     * @return bool|Table
+     */
+    public function getTableByName($name)
+    {
+        $name = $this->resourceConnection->getTableName($name);
+        return $this->tables[$name] ?? false;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/SchemaFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/SchemaFactory.php
new file mode 100644
index 0000000000000..561ed427e70e4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/SchemaFactory.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Schema DTO element factory.
+ */
+class SchemaFactory
+{
+    /**
+     * @var string
+     */
+    private $instanceName = Schema::class;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * SchemaFactory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create class instance with specified parameters.
+     *
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Schema
+     */
+    public function create()
+    {
+        return $this->objectManager->create($this->instanceName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
new file mode 100644
index 0000000000000..b864a3d927b0a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
@@ -0,0 +1,390 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+
+/**
+ * Table structural element
+ * Aggregate inside itself: columns, constraints and indexes
+ * Resource is also specified on this strucural element
+ */
+class Table extends GenericElement implements
+    ElementInterface,
+    ElementDiffAwareInterface
+{
+    /**
+     * In case if we will need to change this object: add, modify or drop, we will need
+     * to define it by its type
+     */
+    const TYPE = 'table';
+
+    /**
+     * @var Constraint[]
+     */
+    private $constraints = [];
+
+    /**
+     * @var Column[]
+     */
+    private $columns = [];
+
+    /**
+     * @var string
+     */
+    protected $type = 'table';
+
+    /**
+     * @var Index[]
+     */
+    private $indexes = [];
+
+    /**
+     * @var string
+     */
+    private $resource;
+
+    /**
+     * @var string
+     */
+    private $engine;
+
+    /**
+     * @var string
+     */
+    private $nameWithoutPrefix;
+
+    /**
+     * @var null|string
+     */
+    private $comment;
+
+    /**
+     * @var string
+     */
+    private $onCreate;
+
+    /**
+     * @var string
+     */
+    private $charset;
+
+    /**
+     * @var string
+     */
+    private $collation;
+
+    /**
+     * @param string $name
+     * @param string $type
+     * @param string $nameWithoutPrefix
+     * @param string $resource
+     * @param string $engine
+     * @param string $charset
+     * @param string $collation
+     * @param string $onCreate
+     * @param string|null $comment
+     * @param array $columns
+     * @param array $indexes
+     * @param array $constraints
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $name,
+        string $type,
+        string $nameWithoutPrefix,
+        string $resource,
+        string $engine,
+        string $charset,
+        string $collation,
+        string $onCreate,
+        string $comment = null,
+        array $columns = [],
+        array $indexes = [],
+        array $constraints = []
+    ) {
+        parent::__construct($name, $type);
+        $this->columns = $columns;
+        $this->indexes = $indexes;
+        $this->constraints = $constraints;
+        $this->resource = $resource;
+        $this->engine = $engine;
+        $this->nameWithoutPrefix = $nameWithoutPrefix;
+        $this->comment = $comment;
+        $this->onCreate = $onCreate;
+        $this->charset = $charset;
+        $this->collation = $collation;
+    }
+
+    /**
+     * Return different table constraints.
+     *
+     * It can be constraint like unique key or reference to another table, etc
+     *
+     * @return Constraint[]
+     */
+    public function getConstraints()
+    {
+        return $this->constraints;
+    }
+
+    /**
+     * Get constraint by name.
+     *
+     * @param string $name
+     * @return Constraint | bool
+     */
+    public function getConstraintByName($name)
+    {
+        return $this->constraints[$name] ?? false;
+    }
+
+    /**
+     * This method lookup only for foreign keys constraints
+     *
+     * @return Reference[]
+     */
+    public function getReferenceConstraints()
+    {
+        $constraints = [];
+
+        foreach ($this->getConstraints() as $constraint) {
+            if ($constraint instanceof Reference) {
+                $constraints[$constraint->getName()] = $constraint;
+            }
+        }
+
+        return $constraints;
+    }
+
+    /**
+     * Returns primary constraint
+     *
+     * As primary constraint always have one name
+     * and can be only one for table
+     * it name is allocated into it constraint
+     *
+     * @return bool|Internal
+     */
+    public function getPrimaryConstraint()
+    {
+        return $this->constraints[Internal::PRIMARY_NAME] ?? false;
+    }
+
+    /**
+     * Retrieve internal constraints
+     *
+     * @return array
+     */
+    public function getInternalConstraints() : array
+    {
+        $constraints = [];
+        foreach ($this->getConstraints() as $constraint) {
+            if ($constraint instanceof Internal) {
+                $constraints[] = $constraint;
+            }
+        }
+
+        return $constraints;
+    }
+
+    /**
+     * Get index by name
+     *
+     * @param string $name
+     * @return Index | bool
+     */
+    public function getIndexByName($name)
+    {
+        return $this->indexes[$name] ?? false;
+    }
+
+    /**
+     * Return all columns.
+     *
+     * Note, table always must have columns
+     *
+     * @return Column[]
+     */
+    public function getColumns()
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Return all indexes, that are applied to table
+     *
+     * @return Index[]
+     */
+    public function getIndexes()
+    {
+        return $this->indexes;
+    }
+
+    /**
+     * Retrieve shard name, on which table will exists
+     *
+     * @return string
+     */
+    public function getResource()
+    {
+        return $this->resource;
+    }
+
+    /**
+     * Add constraints
+     *
+     * This is workaround, as any DTO object couldnt be changed after instantiation.
+     * However there is case, when we have 2 tables with constraints in different tables,
+     * that depends to each other table. So we need to setup DTO first and only then pass
+     * problematic constraints to it, in order to avoid circular dependency.
+     *
+     * @param Constraint[] $constraints
+     */
+    public function addConstraints(array $constraints)
+    {
+        $this->constraints = array_replace($this->constraints, $constraints);
+    }
+
+    /**
+     * Add columns
+     *
+     * @param Column[] $columns
+     */
+    public function addColumns(array $columns)
+    {
+        $this->columns = array_replace($this->columns, $columns);
+    }
+
+    /**
+     * Retrieve information about trigger
+     *
+     * @return string
+     */
+    public function getOnCreate()
+    {
+        return $this->onCreate;
+    }
+
+    /**
+     * If column exists - retrieve column
+     *
+     * @param  string $nameOrId
+     * @return Column | bool
+     */
+    public function getColumnByName($nameOrId)
+    {
+        if (isset($this->columns[$nameOrId])) {
+            return $this->columns[$nameOrId];
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve elements by specific type
+     *
+     * Allowed types: columns, constraints, indexes...
+     *
+     * @param  string $type
+     * @return ElementInterface[]
+     */
+    public function getElementsByType($type)
+    {
+        if (!isset($this->{$type})) {
+            throw new \InvalidArgumentException(sprintf("Type %s is not defined", $type));
+        }
+
+        return $this->{$type};
+    }
+
+    /**
+     * Add indexes
+     *
+     * This is workaround, as any DTO object couldnt be changed after instantiation.
+     * However there is case, when we depends on column definition we need modify our indexes
+     *
+     * @param array $indexes
+     */
+    public function addIndexes(array $indexes)
+    {
+        $this->indexes = array_replace($this->indexes, $indexes);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getElementType()
+    {
+        return self::TYPE;
+    }
+
+    /**
+     * Get engine name
+     *
+     * @return string
+     */
+    public function getEngine(): string
+    {
+        return $this->engine;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDiffSensitiveParams()
+    {
+        return [
+            'resource' => $this->getResource(),
+            'engine' => $this->getEngine(),
+            'comment' => $this->getComment(),
+            'charset' => $this->getCharset(),
+            'collation' => $this->getCollation()
+        ];
+    }
+
+    /**
+     * Return charset of table
+     *
+     * @return string
+     */
+    public function getCharset() : string
+    {
+        return $this->charset;
+    }
+
+    /**
+     * Return charset of table
+     *
+     * @return string
+     */
+    public function getCollation() : string
+    {
+        return $this->collation;
+    }
+
+    /**
+     * Get name without prefix
+     *
+     * @return string
+     */
+    public function getNameWithoutPrefix(): string
+    {
+        return $this->nameWithoutPrefix;
+    }
+
+    /**
+     * Get comment
+     *
+     * @return null|string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/TableElementInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/TableElementInterface.php
new file mode 100644
index 0000000000000..630f09b18aa26
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/TableElementInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
+
+/**
+ * Table DTO Element interface.
+ *
+ * This interface can be used for elements that hold tables, like constraints.
+ */
+interface TableElementInterface
+{
+    /**
+     * Get table object.
+     *
+     * @return Table
+     */
+    public function getTable();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistory.php
new file mode 100644
index 0000000000000..f609d2715d324
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistory.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Element history container.
+ *
+ * This class holds history about element modifications.
+ */
+class ElementHistory
+{
+    /**
+     * @var ElementInterface
+     */
+    private $new;
+
+    /**
+     * @var ElementInterface
+     */
+    private $old;
+
+    /**
+     * Constructor.
+     *
+     * @param ElementInterface $new
+     * @param ElementInterface $old
+     */
+    public function __construct(ElementInterface $new, ElementInterface $old = null)
+    {
+        $this->new = $new;
+        $this->old = $old;
+    }
+
+    /**
+     * Retrieve element, that exists before we run installation.
+     *
+     * @return ElementInterface|null
+     */
+    public function getOld()
+    {
+        return $this->old;
+    }
+
+    /**
+     * Retrieve element, that comes from configuration.
+     *
+     * @return ElementInterface
+     */
+    public function getNew()
+    {
+        return $this->new;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistoryFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistoryFactory.php
new file mode 100644
index 0000000000000..174e213e75b6e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistoryFactory.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Element history container factory.
+ */
+class ElementHistoryFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create element history container.
+     *
+     * @param array $data
+     *  - Should consist of 2 params:
+     *      new
+     *      old
+     * @return mixed
+     */
+    public function create(array $data)
+    {
+        return $this->objectManager->create(ElementHistory::class, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/Csv.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/Csv.php
new file mode 100644
index 0000000000000..1720938c945b4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/Csv.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\FileSystem;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * CSV file operations wrapper.
+ */
+class Csv implements \Magento\Framework\Setup\Declaration\Schema\DataSavior\DumpAccessorInterface
+{
+    /**
+     * Folder where will be persisted all csv dumps
+     */
+    const DUMP_FOLDER = 'declarative_dumps_csv';
+
+    /**
+     * @var int
+     */
+    private $baseBatchSize;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
+    private $fileDriver;
+
+    /**
+     * Csv constructor.
+     * @param DirectoryList $directoryList
+     * @param \Magento\Framework\Filesystem\Driver\File $fileDriver
+     * @param int $baseBatchSize
+     */
+    public function __construct(
+        DirectoryList $directoryList,
+        \Magento\Framework\Filesystem\Driver\File $fileDriver,
+        $baseBatchSize = 15000
+    ) {
+        $this->baseBatchSize = $baseBatchSize;
+        $this->directoryList = $directoryList;
+        $this->fileDriver = $fileDriver;
+    }
+
+    /**
+     * Save to csv data with batches.
+     *
+     * @param string $file
+     * @param array $data
+     * @return $this
+     */
+    public function save($file, array $data)
+    {
+        $file = $this->prepareFile($file);
+        if (!count($data) || !$file) {
+            return $this;
+        }
+
+        if (!file_exists($file)) {
+            array_unshift($data, array_keys($data[0]));
+        }
+
+        $fh = fopen($file, 'a');
+
+        foreach ($data as $dataRow) {
+            fputcsv($fh, $dataRow);
+        }
+
+        fclose($fh);
+        return $this;
+    }
+
+    /**
+     * Prepare CSV file name
+     *
+     * @param string $file
+     * @return string | bool
+     */
+    private function prepareFile($file)
+    {
+        $absolutePath = $this->directoryList->getPath(DirectoryList::VAR_DIR);
+
+        if (!$this->fileDriver->isWritable($absolutePath)) {
+            return false;
+        }
+        $dumpsPath = $absolutePath . DIRECTORY_SEPARATOR . self::DUMP_FOLDER;
+        $this->ensureDirExists($dumpsPath);
+        $filePath = $dumpsPath . DIRECTORY_SEPARATOR . $file . '.csv';
+        return $filePath;
+    }
+
+    /**
+     * Create directory if not exists
+     *
+     * @param string $dir
+     */
+    private function ensureDirExists($dir)
+    {
+        if (!$this->fileDriver->isExists($dir)) {
+            $this->fileDriver->createDirectory($dir);
+        }
+    }
+
+    /**
+     * File read generator.
+     *
+     * This generator allows to load to memory only batch, with which we need to work at the moment
+     *
+     * @param string $file
+     * @return \Generator
+     */
+    public function read($file)
+    {
+        $file = $this->prepareFile($file);
+
+        if (!$this->fileDriver->isReadable($file)) {
+            return [];
+        }
+        $data = [];
+        $iterator = 0;
+        $fh = fopen($file, 'r');
+        $headers = fgetcsv($fh);
+        $rowData = fgetcsv($fh);
+
+        while ($rowData) {
+            if ($iterator++ > $this->baseBatchSize) {
+                $iterator = 0;
+                $finalData = $data;
+                $data = [];
+                yield $this->processCsvData($finalData, $headers);
+            }
+
+            $data[] = $rowData;
+            $rowData = fgetcsv($fh);
+        }
+
+        fclose($fh);
+        yield $this->processCsvData($data, $headers);
+    }
+
+    /**
+     * @param array $csvData
+     * @param array $headers
+     * @return array
+     */
+    private function processCsvData(array $csvData, array $headers)
+    {
+        $result = [];
+
+        foreach ($csvData as $rowIndex => $csvRow) {
+            foreach ($csvRow as $index => $item) {
+                $result[$rowIndex][$headers[$index]] = $item;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function destruct($resource)
+    {
+        $file = $this->prepareFile($resource);
+
+        if ($this->fileDriver->isExists($file)) {
+            $this->fileDriver->deleteFile($file);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php
new file mode 100644
index 0000000000000..5b7c97a4ef8ce
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+
+/**
+ * Schema operation interface.
+ */
+interface OperationInterface
+{
+    /**
+     * Retrieve operation identifier key.
+     *
+     * @return string
+     */
+    public function getOperationName();
+
+    /**
+     * Is operation destructive flag.
+     *
+     * Destructive operations can make system unstable.
+     *
+     * For example, if operation is destructive it can remove table or column created not with
+     * declarative schema (for example with old migration script).
+     *
+     * @return bool
+     */
+    public function isOperationDestructive();
+
+    /**
+     * Apply change of any type.
+     *
+     * @param  ElementHistory $elementHistory
+     * @return Statement[]
+     */
+    public function doOperation(ElementHistory $elementHistory);
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
new file mode 100644
index 0000000000000..71a1e2f92dfd8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Add column to table operation.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AddColumn implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'add_column';
+
+    /**
+     * This key is service key and need only for migration of data on auto_increment field.
+     */
+    const TEMPORARY_KEY = 'AUTO_INCREMENT_TEMPORARY_KEY';
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * @var ElementFactory
+     */
+    private $elementFactory;
+
+    /**
+     * @var ElementHistoryFactory
+     */
+    private $elementHistoryFactory;
+
+    /**
+     * @var AddComplexElement
+     */
+    private $addComplexElement;
+
+    /**
+     * @var DropElement
+     */
+    private $dropElement;
+
+    /**
+     * @var DDLTriggerInterface[]
+     */
+    private $triggers;
+
+    /**
+     * AddColumn constructor.
+     *
+     * @param DefinitionAggregator $definitionAggregator
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     * @param ElementFactory $elementFactory
+     * @param ElementHistoryFactory $elementHistoryFactory
+     * @param AddComplexElement $addComplexElement
+     * @param DropElement $dropElement
+     * @param array $triggers
+     */
+    public function __construct(
+        DefinitionAggregator $definitionAggregator,
+        DbSchemaWriterInterface $dbSchemaWriter,
+        ElementFactory $elementFactory,
+        ElementHistoryFactory $elementHistoryFactory,
+        AddComplexElement $addComplexElement,
+        DropElement $dropElement,
+        array $triggers = []
+    ) {
+        $this->definitionAggregator = $definitionAggregator;
+        $this->dbSchemaWriter = $dbSchemaWriter;
+        $this->elementFactory = $elementFactory;
+        $this->elementHistoryFactory = $elementHistoryFactory;
+        $this->addComplexElement = $addComplexElement;
+        $this->dropElement = $dropElement;
+        $this->triggers = $triggers;
+    }
+
+    /**
+     * Creates index history.
+     *
+     * @param Column $column
+     * @return ElementHistory
+     */
+    private function getTemporaryIndexHistory(Column $column)
+    {
+        $index = $this->elementFactory->create(
+            Index::TYPE,
+            [
+                'name' => self::TEMPORARY_KEY,
+                'column' => [$column->getName()],
+                'columns' => [$column],
+                'table' => $column->getTable()
+            ]
+        );
+        return $this->elementHistoryFactory->create(['new' => $index]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isOperationDestructive()
+    {
+        return false;
+    }
+
+    /**
+     * Check whether column is auto increment or not.
+     *
+     * @param Column $column
+     * @return bool
+     */
+    private function columnIsAutoIncrement(Column $column)
+    {
+        return $column instanceof Integer && $column->isIdentity();
+    }
+
+    /**
+     * Setup triggers if column have onCreate syntax.
+     *
+     * @param Statement $statement
+     * @param ElementHistory $elementHistory
+     * @return array
+     */
+    private function setupTriggersIfExists(Statement $statement, ElementHistory $elementHistory)
+    {
+        /** @var Column $column */
+        $column = $elementHistory->getNew();
+        //Add triggers to column
+        foreach ($this->triggers as $ddlTrigger) {
+            if ($ddlTrigger->isApplicable((string) $column->getOnCreate())) {
+                $statement->addTrigger($ddlTrigger->getCallback($elementHistory));
+            }
+        }
+        $statements = [$statement];
+        /**
+         * If column has triggers, only than we need to create temporary index on it.
+         * As triggers means, that we will not enable primary key until all data will be transferred,
+         * so column can left without key (as primary key is disabled) and this cause an error.
+         */
+        if ($this->columnIsAutoIncrement($column) && !empty($statement->getTriggers())) {
+            /**
+             * We need to create additional index for auto_increment.
+             * As we create new field, and for this field we do not have any key/index, that are
+             * required by SQL on any auto_increment field.
+             * Primary key will be added to the column later, because column is empty at the moment
+             * and if the table is not empty we will get error, such as "Duplicate key entry:".
+             */
+            $indexHistory = $this->getTemporaryIndexHistory($column);
+            /** Add index should goes first */
+            $statements = array_merge($this->addComplexElement->doOperation($indexHistory), $statements);
+            /** Drop index should goes last and in another query */
+            $statements = array_merge($statements, $this->dropElement->doOperation($indexHistory));
+        }
+
+        return $statements;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        /**
+         * @var Column $element
+         */
+        $element = $elementHistory->getNew();
+        $definition = $this->definitionAggregator->toDefinition($element);
+        
+        $statement = $this->dbSchemaWriter->addElement(
+            $element->getName(),
+            $element->getTable()->getResource(),
+            $element->getTable()->getName(),
+            $definition,
+            Column::TYPE
+        );
+        $statements = $this->setupTriggersIfExists($statement, $elementHistory);
+
+        if ($this->columnIsAutoIncrement($element)) {
+            /** We need to reset auto_increment as new field should goes from 1 */
+            $statements[] = $this->dbSchemaWriter->resetAutoIncrement(
+                $element->getTable()->getName(),
+                $element->getTable()->getResource()
+            );
+        }
+
+        return $statements;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddComplexElement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddComplexElement.php
new file mode 100644
index 0000000000000..7e1d94eeed8f5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddComplexElement.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\TableElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Add complex element operation.
+ *
+ * Adds element that has various dependencies, like foreign key that has dependencies to another table.
+ */
+class AddComplexElement implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'add_complex_element';
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * Constructor.
+     *
+     * @param DefinitionAggregator $definitionAggregator
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     */
+    public function __construct(
+        DefinitionAggregator $definitionAggregator,
+        DbSchemaWriterInterface $dbSchemaWriter
+    ) {
+        $this->definitionAggregator = $definitionAggregator;
+        $this->dbSchemaWriter = $dbSchemaWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        /**
+         * @var TableElementInterface | ElementInterface $element
+         */
+        $element = $elementHistory->getNew();
+        $definition = $this->definitionAggregator->toDefinition($element);
+
+        $statement = $this->dbSchemaWriter->addElement(
+            $element->getName(),
+            $element->getTable()->getResource(),
+            $element->getTable()->getName(),
+            $definition,
+            $element->getType()
+        );
+        return [$statement];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php
new file mode 100644
index 0000000000000..1550bc09866c7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Create table operation.
+ */
+class CreateTable implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'create_table';
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * @var DDLTriggerInterface[]
+     */
+    private $columnTriggers;
+
+    /**
+     * @var DDLTriggerInterface[]
+     */
+    private $triggers;
+
+    /**
+     * @var ElementHistoryFactory
+     */
+    private $elementHistoryFactory;
+
+    /**
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     * @param DefinitionAggregator $definitionAggregator
+     * @param ElementHistoryFactory $elementHistoryFactory
+     * @param array $columnTriggers
+     * @param array $triggers
+     */
+    public function __construct(
+        DbSchemaWriterInterface $dbSchemaWriter,
+        DefinitionAggregator $definitionAggregator,
+        ElementHistoryFactory $elementHistoryFactory,
+        array $columnTriggers = [],
+        array $triggers = []
+    ) {
+        $this->dbSchemaWriter = $dbSchemaWriter;
+        $this->definitionAggregator = $definitionAggregator;
+        $this->columnTriggers = $columnTriggers;
+        $this->triggers = $triggers;
+        $this->elementHistoryFactory = $elementHistoryFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return false;
+    }
+
+    /**
+     * Setup callbacks for newely created columns
+     *
+     * @param array $columns
+     * @param Statement $createTableStatement
+     * @return void
+     */
+    private function setupColumnTriggers(array $columns, Statement $createTableStatement)
+    {
+        foreach ($columns as $column) {
+            foreach ($this->columnTriggers as $trigger) {
+                if ($trigger->isApplicable((string) $column->getOnCreate())) {
+                    $elementHistory = $this->elementHistoryFactory->create([
+                        'new' => $column,
+                        'old' => $column
+                    ]);
+                    $createTableStatement->addTrigger(
+                        $trigger->getCallback($elementHistory)
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Setup triggers for entire table
+     *
+     * @param Table $table
+     * @param Statement $createTableStatement
+     * @return void
+     */
+    private function setupTableTriggers(Table $table, Statement $createTableStatement)
+    {
+        foreach ($this->triggers as $trigger) {
+            if ($trigger->isApplicable((string) $table->getOnCreate())) {
+                $elementHistory = $this->elementHistoryFactory->create([
+                    'new' => $table,
+                    'old' => $table
+                ]);
+                $createTableStatement->addTrigger(
+                    $trigger->getCallback($elementHistory)
+                );
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        /** @var Table $table */
+        $table = $elementHistory->getNew();
+        $definition = [];
+        $data = [
+            Column::TYPE => $table->getColumns(),
+            Constraint::TYPE => $table->getConstraints(),
+            Index::TYPE => $table->getIndexes()
+        ];
+
+        foreach ($data as $type => $elements) {
+            /**
+             * @var ElementInterface $element
+             */
+            foreach ($elements as $element) {
+                //Make definition as flat list.
+                $definition[$type . $element->getName()] = $this->definitionAggregator->toDefinition($element);
+            }
+        }
+
+        $createTableStatement = $this->dbSchemaWriter
+            ->createTable(
+                $table->getName(),
+                $elementHistory->getNew()->getResource(),
+                $definition,
+                $table->getDiffSensitiveParams()
+            );
+
+        $this->setupTableTriggers($table, $createTableStatement);
+        $this->setupColumnTriggers($table->getColumns(), $createTableStatement);
+
+        return [$createTableStatement];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropElement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropElement.php
new file mode 100644
index 0000000000000..97fb53597839d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropElement.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\AdapterMediator;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\TableElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Drop element operation.
+ *
+ * Drops structural element.
+ */
+class DropElement implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'drop_element';
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * Constructor.
+     *
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     * @param DefinitionAggregator $definitionAggregator
+     */
+    public function __construct(
+        DbSchemaWriterInterface $dbSchemaWriter,
+        DefinitionAggregator $definitionAggregator
+    ) {
+        $this->dbSchemaWriter = $dbSchemaWriter;
+        $this->definitionAggregator = $definitionAggregator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        /**
+         * @var TableElementInterface | ElementInterface $element
+         */
+        $element = $elementHistory->getNew();
+
+        return [
+            $this->dbSchemaWriter->dropElement(
+                $element->getTable()->getResource(),
+                $element->getName(),
+                $element->getTable()->getName(),
+                $element->getType()
+            )
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
new file mode 100644
index 0000000000000..95fc1c42210be
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Drop foreign key operation.
+ */
+class DropReference implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'drop_reference';
+
+    /**
+     * @var DropElement
+     */
+    private $dropElement;
+
+    /**
+     * Constructor.
+     *
+     * @param DropElement $dropElement
+     */
+    public function __construct(DropElement $dropElement)
+    {
+        $this->dropElement = $dropElement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isOperationDestructive()
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        return $this->dropElement->doOperation($elementHistory);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropTable.php
new file mode 100644
index 0000000000000..759fd15903fa1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropTable.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Drop table operation.
+ */
+class DropTable implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'drop_table';
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * Constructor.
+     *
+     * @param DefinitionAggregator $definitionAggregator
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     */
+    public function __construct(
+        DefinitionAggregator $definitionAggregator,
+        DbSchemaWriterInterface $dbSchemaWriter
+    ) {
+        $this->definitionAggregator = $definitionAggregator;
+        $this->dbSchemaWriter = $dbSchemaWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $tableHistory)
+    {
+        /**
+         * @var Table $table
+         */
+        $table = $tableHistory->getOld();
+        return [$this->dbSchemaWriter->dropTable($table->getName(), $table->getResource())];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyColumn.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyColumn.php
new file mode 100644
index 0000000000000..6bafc790c3455
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyColumn.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Modify column in table operation.
+ */
+class ModifyColumn implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'modify_column';
+
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitionAggregator;
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * Constructor.
+     *
+     * @param DefinitionAggregator $definitionAggregator
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     */
+    public function __construct(
+        DefinitionAggregator $definitionAggregator,
+        DbSchemaWriterInterface $dbSchemaWriter
+    ) {
+        $this->definitionAggregator = $definitionAggregator;
+        $this->dbSchemaWriter = $dbSchemaWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        /** @var Column $column */
+        $column = $elementHistory->getNew();
+
+        $definition = $this->definitionAggregator->toDefinition($column);
+
+        return [$this->dbSchemaWriter->modifyColumn(
+            $column->getName(),
+            $column->getTable()->getResource(),
+            $column->getTable()->getName(),
+            $definition
+        )];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyTable.php
new file mode 100644
index 0000000000000..9b352592f8f98
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyTable.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Modify table operation.
+ *
+ * Used to change table options.
+ */
+class ModifyTable implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'modify_table';
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     */
+    public function __construct(DbSchemaWriterInterface $dbSchemaWriter)
+    {
+        $this->dbSchemaWriter = $dbSchemaWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        /** @var Table $table */
+        $table = $elementHistory->getNew();
+        /** @var Table $oldTable */
+        $oldTable = $elementHistory->getOld();
+        $oldOptions = $oldTable->getDiffSensitiveParams();
+        $statements = [];
+
+        foreach ($table->getDiffSensitiveParams() as $optionName => $optionValue) {
+            if ($oldOptions[$optionName] !== $optionValue) {
+                $statements[] = $this->dbSchemaWriter->modifyTableOption(
+                    $table->getName(),
+                    $table->getResource(),
+                    $optionName,
+                    $optionValue
+                );
+            }
+        }
+
+        return $statements;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php
new file mode 100644
index 0000000000000..d7386c18d1251
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataBetweenShards;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
+
+/**
+ * Recreate table operation.
+ * Drops and creates table again.
+ */
+class ReCreateTable implements OperationInterface
+{
+    /**
+     * Operation name.
+     */
+    const OPERATION_NAME = 'recreate_table';
+
+    /**
+     * @var CreateTable
+     */
+    private $createTable;
+
+    /**
+     * @var DropTable
+     */
+    private $dropTable;
+
+    /**
+     * @var MigrateDataBetweenShards
+     */
+    private $migrateDataBetweenShards;
+
+    /**
+     * @var ElementHistoryFactory
+     */
+    private $elementHistoryFactory;
+
+    /**
+     * @var ElementFactory
+     */
+    private $elementFactory;
+
+    /**
+     * Constructor.
+     *
+     * @param CreateTable $createTable
+     * @param DropTable $dropTable
+     * @param MigrateDataBetweenShards $migrateDataBetweenShards
+     * @param ElementHistoryFactory $elementHistoryFactory
+     * @param ElementFactory $elementFactory
+     */
+    public function __construct(
+        CreateTable $createTable,
+        DropTable $dropTable,
+        MigrateDataBetweenShards $migrateDataBetweenShards,
+        ElementHistoryFactory $elementHistoryFactory,
+        ElementFactory $elementFactory
+    ) {
+        $this->createTable = $createTable;
+        $this->dropTable = $dropTable;
+        $this->migrateDataBetweenShards = $migrateDataBetweenShards;
+        $this->elementHistoryFactory = $elementHistoryFactory;
+        $this->elementFactory = $elementFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isOperationDestructive()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperationName()
+    {
+        return self::OPERATION_NAME;
+    }
+
+    /**
+     * Merge 2 tables: take old data from new table, columns and indexes from old tables:
+     * we need to take in account, that 3-rd party extensions can add columns and indexes and also
+     * internal constraints in old way: with UpgradeSchema/InstallSchema scripts
+     *
+     * @param ElementHistory $elementHistory
+     * @return Table
+     */
+    private function getRecreatedTable(ElementHistory $elementHistory) : Table
+    {
+        /** @var Table $newTable */
+        $newTable = $elementHistory->getNew();
+        /** @var Table $oldTable */
+        $oldTable = $elementHistory->getOld();
+        /** @var Table $recreationTable */
+        $recreationTable = $this->elementFactory->create(
+            'table',
+            [
+                'name' => $newTable->getName(),
+                'type' => 'table',
+                'nameWithoutPrefix' => $newTable->getNameWithoutPrefix(),
+                'resource' => $newTable->getResource(),
+                'engine' => $newTable->getEngine(),
+                'charset' => $newTable->getCharset(),
+                'collation' => $newTable->getCollation(),
+                'onCreate' => $newTable->getOnCreate(),
+                'comment' => $newTable->getOnCreate(),
+                'columns' => $oldTable->getColumns(),
+                'indexes' => $oldTable->getIndexes(),
+                'constraints' => array_merge($oldTable->getInternalConstraints(), $newTable->getReferenceConstraints())
+            ]
+        );
+
+        return $recreationTable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doOperation(ElementHistory $elementHistory)
+    {
+        $recreatedTable = $this->getRecreatedTable($elementHistory);
+        $recreatedElementHistory = $this->elementHistoryFactory->create(
+            [
+                'old' => $elementHistory->getOld(),
+                'new' => $recreatedTable
+            ]
+        );
+        $statements = $this->createTable->doOperation($recreatedElementHistory);
+        /** @var Statement $statement */
+        foreach ($statements as $statement) {
+            if ($this->migrateDataBetweenShards->isApplicable((string) $recreatedTable->getOnCreate())) {
+                $statement->addTrigger($this->migrateDataBetweenShards->getCallback($recreatedElementHistory));
+            }
+        }
+
+        return array_merge($statements, $this->dropTable->doOperation($recreatedElementHistory));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationsExecutor.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationsExecutor.php
new file mode 100644
index 0000000000000..ed1baff1d3323
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationsExecutor.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Declaration\Schema\DataSavior\DataSaviorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregatorFactory;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Diff\DiffInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ReCreateTable;
+
+/**
+ * Schema operations executor.
+ *
+ * Go through all available SQL operations and execute each one with data from change registry.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class OperationsExecutor
+{
+    /**
+     * Request keys.
+     */
+    const KEY_SAFE_MODE = 'safe-mode';
+    const KEY_DATA_RESTORE = 'data-restore';
+
+    /**
+     * @var OperationInterface[]
+     */
+    private $operations;
+
+    /**
+     * @var Sharding
+     */
+    private $sharding;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var StatementFactory
+     */
+    private $statementFactory;
+
+    /**
+     * @var DbSchemaWriterInterface
+     */
+    private $dbSchemaWriter;
+
+    /**
+     * @var StatementAggregatorFactory
+     */
+    private $statementAggregatorFactory;
+
+    /**
+     * @var DataSaviorInterface[]
+     */
+    private $dataSaviorsCollection;
+
+    /**
+     * @var DryRunLogger
+     */
+    private $dryRunLogger;
+
+    /**
+     * Constructor.
+     *
+     * @param array $operations
+     * @param array $dataSaviorsCollection
+     * @param Sharding $sharding
+     * @param ResourceConnection $resourceConnection
+     * @param StatementFactory $statementFactory
+     * @param DbSchemaWriterInterface $dbSchemaWriter
+     * @param StatementAggregatorFactory $statementAggregatorFactory
+     * @param DryRunLogger $dryRunLogger
+     */
+    public function __construct(
+        array $operations,
+        array $dataSaviorsCollection,
+        Sharding $sharding,
+        ResourceConnection $resourceConnection,
+        StatementFactory $statementFactory,
+        DbSchemaWriterInterface $dbSchemaWriter,
+        StatementAggregatorFactory $statementAggregatorFactory,
+        DryRunLogger $dryRunLogger
+    ) {
+        $this->operations = $operations;
+        $this->sharding = $sharding;
+        $this->resourceConnection = $resourceConnection;
+        $this->statementFactory = $statementFactory;
+        $this->dbSchemaWriter = $dbSchemaWriter;
+        $this->statementAggregatorFactory = $statementAggregatorFactory;
+        $this->dataSaviorsCollection = $dataSaviorsCollection;
+        $this->dryRunLogger = $dryRunLogger;
+    }
+
+    /**
+     * Retrieve only destructive operation names.
+     *
+     * For example, drop_table, recreate_table, etc.
+     *
+     * @return array
+     */
+    public function getDestructiveOperations()
+    {
+        $operations = [];
+
+        foreach ($this->operations as $operation) {
+            if ($operation->isOperationDestructive()) {
+                $operations[$operation->getOperationName()] = $operation->getOperationName();
+            }
+        }
+
+        return $operations;
+    }
+
+    /**
+     * In order to successfully run all operations we need to start setup for all
+     * connections first.
+     *
+     * @return void
+     */
+    private function startSetupForAllConnections()
+    {
+        foreach ($this->sharding->getResources() as $resource) {
+            $this->resourceConnection->getConnection($resource)
+                ->startSetup();
+            $this->resourceConnection->getConnection($resource)
+                ->query('SET UNIQUE_CHECKS=0');
+        }
+    }
+
+    /**
+     * In order to revert previous state we need to end setup for all connections
+     * connections first.
+     *
+     * @return void
+     */
+    private function endSetupForAllConnections()
+    {
+        foreach ($this->sharding->getResources() as $resource) {
+            $this->resourceConnection->getConnection($resource)
+                ->endSetup();
+        }
+    }
+
+    /**
+     * Check if during this operation we need to restore data
+     *
+     * @param OperationInterface $operation
+     * @return bool
+     */
+    private function operationIsOppositeToDestructive(OperationInterface $operation)
+    {
+        return $operation instanceof AddColumn ||
+            $operation instanceof CreateTable ||
+            $operation instanceof ReCreateTable;
+    }
+
+    /**
+     * Loop through all operations that are configured in di.xml
+     * and execute them with elements from Diff.
+     *
+     * @see    OperationInterface
+     * @param  DiffInterface $diff
+     * @param array $requestData
+     * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function execute(DiffInterface $diff, array $requestData)
+    {
+        $this->startSetupForAllConnections();
+        $tableHistories = $diff->getAll();
+        $dryRun = isset($requestData[DryRunLogger::INPUT_KEY_DRY_RUN_MODE]) &&
+            $requestData[DryRunLogger::INPUT_KEY_DRY_RUN_MODE];
+
+        if ($dryRun) {
+            $this->dryRunLogger->prepareToDryRun();
+        }
+
+        if (is_array($tableHistories)) {
+            foreach ($tableHistories as $tableHistory) {
+                $destructiveElements = [];
+                $oppositeToDestructiveElements = [];
+                $statementAggregator = $this->statementAggregatorFactory->create();
+
+                foreach ($this->operations as $operation) {
+                    if (isset($tableHistory[$operation->getOperationName()])) {
+                        /** @var ElementHistory $elementHistory */
+                        foreach ($tableHistory[$operation->getOperationName()] as $elementHistory) {
+                            $statementAggregator->addStatements($operation->doOperation($elementHistory));
+
+                            if ($operation->isOperationDestructive()) {
+                                $destructiveElements[] = $elementHistory->getOld();
+                            } elseif ($this->operationIsOppositeToDestructive($operation)) {
+                                $oppositeToDestructiveElements[] = $elementHistory->getNew();
+                            }
+                        }
+                    }
+                }
+
+                $this->doDump($destructiveElements, $requestData);
+                $this->dbSchemaWriter->compile($statementAggregator, $dryRun);
+                $this->doRestore($oppositeToDestructiveElements, $requestData);
+            }
+        }
+
+        $this->endSetupForAllConnections();
+    }
+
+    /**
+     * Do restore of destructive operations
+     *
+     * @param array $elements
+     * @param array $requestData
+     */
+    private function doRestore(array $elements, array $requestData)
+    {
+        $restoreMode = isset($requestData[self::KEY_DATA_RESTORE]) && $requestData[self::KEY_DATA_RESTORE];
+
+        if ($restoreMode) {
+            /**
+             * @var ElementInterface $element
+             */
+            foreach ($elements as $element) {
+                foreach ($this->dataSaviorsCollection as $dataSavior) {
+                    if ($dataSavior->isAcceptable($element)) {
+                        $dataSavior->restore($element);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Do dump of destructive operations
+     *
+     * @param array $elements
+     * @param array $requestData
+     */
+    private function doDump(array $elements, array $requestData)
+    {
+        $safeMode = isset($requestData[self::KEY_SAFE_MODE]) && $requestData[self::KEY_SAFE_MODE];
+
+        if ($safeMode) {
+            /**
+             * @var ElementInterface $element
+             */
+            foreach ($elements as $element) {
+                foreach ($this->dataSaviorsCollection as $dataSavior) {
+                    if ($dataSavior->isAcceptable($element)) {
+                        $dataSavior->dump($element);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php
new file mode 100644
index 0000000000000..4cd90cb35b236
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\Config\FileResolverByModule;
+use Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder as DbSchemaBuilder;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\SchemaBuilder as DeclarativeSchemaBuilder;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\Framework\Setup\Declaration\Schema\Dto\SchemaFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class SchemaConfig implements SchemaConfigInterface
+{
+    /**
+     * @var DbSchemaBuilder
+     */
+    private $dbSchemaBuilder;
+
+    /**
+     * @var DeclarativeSchemaBuilder
+     */
+    private $declarativeSchemaBuilder;
+
+    /**
+     * @var SchemaFactory
+     */
+    private $schemaFactory;
+
+    /**
+     * @var ReaderComposite
+     */
+    private $readerComposite;
+
+    /**
+     * Constructor.
+     *
+     * @param DbSchemaBuilder          $dbSchemaBuilder
+     * @param DeclarativeSchemaBuilder $declarativeSchemaBuilder
+     * @param SchemaFactory            $schemaFactory
+     * @param ReaderComposite          $readerComposite
+     */
+    public function __construct(
+        DbSchemaBuilder $dbSchemaBuilder,
+        DeclarativeSchemaBuilder $declarativeSchemaBuilder,
+        SchemaFactory $schemaFactory,
+        ReaderComposite $readerComposite
+    ) {
+        $this->dbSchemaBuilder = $dbSchemaBuilder;
+        $this->declarativeSchemaBuilder = $declarativeSchemaBuilder;
+        $this->schemaFactory = $schemaFactory;
+        $this->readerComposite = $readerComposite;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDbConfig()
+    {
+        $schema = $this->schemaFactory->create();
+        $schema = $this->dbSchemaBuilder->build($schema);
+        return $schema;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDeclarationConfig()
+    {
+        $schema = $this->schemaFactory->create();
+        $data = $this->readerComposite->read(FileResolverByModule::ALL_MODULES);
+        $this->declarativeSchemaBuilder->addTablesData($data['table']);
+        $schema = $this->declarativeSchemaBuilder->build($schema);
+        return $schema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfigInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfigInterface.php
new file mode 100644
index 0000000000000..1e6c5d63c8b3c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfigInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Schema configuration interface.
+ *
+ * Used to fetch schema object with data from either db or XML file.
+ *
+ * Declaration has 2 schema builders, that build schema from db and from XML.
+ */
+interface SchemaConfigInterface
+{
+    /**
+     * Parse DB schema
+     *
+     * @return Schema
+     */
+    public function getDbConfig();
+
+    /**
+     * Parse XML schema
+     *
+     * @return Schema
+     */
+    public function getDeclarationConfig();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Sharding.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Sharding.php
new file mode 100644
index 0000000000000..eff8d7c3c03bc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Sharding.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+
+/**
+ * Sharding provider.
+ *
+ * Sharding distributes structural elements among various shards (connections) described in deployment configuration.
+ */
+class Sharding
+{
+    /**
+     * Name of default connection.
+     */
+    const DEFAULT_CONNECTION = 'default';
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * Connection names.
+     *
+     * Each connection name represents each shard.
+     *
+     * @var array
+     */
+    private $resources;
+
+    /**
+     * Constructor.
+     *
+     * @param DeploymentConfig $deploymentConfig
+     * @param array            $resources
+     */
+    public function __construct(DeploymentConfig $deploymentConfig, array $resources)
+    {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->resources = $resources;
+    }
+
+    /**
+     * Depends on different settings we should have different qty of connection names.
+     *
+     * @return array
+     */
+    public function getResources()
+    {
+        $resources = [];
+
+        foreach ($this->resources as $resource) {
+            if ($this->canUseResource($resource)) {
+                $resources[] = $resource;
+            }
+        }
+
+        return $resources;
+    }
+
+    /**
+     * Check whether our resource is valid one.
+     *
+     * @param  string $scopeName
+     * @return bool
+     */
+    public function canUseResource($scopeName)
+    {
+        $connections = $this->deploymentConfig
+            ->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS);
+        return isset($connections[$scopeName]);
+    }
+
+    /**
+     * Retrieve default resource name, that is used by the system.
+     *
+     * @return string
+     */
+    public function getDefaultResource()
+    {
+        return self::DEFAULT_CONNECTION;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/TableNameResolver.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/TableNameResolver.php
new file mode 100644
index 0000000000000..6cca87bd19b80
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/TableNameResolver.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+/**
+ * Resolver of table names.
+ */
+class TableNameResolver
+{
+    /**
+     * RegEx pattern is used to search cloned temporary tables used as a replica.
+     *
+     * @var string
+     */
+    private $filterPattern = '';
+
+    /**
+     * Provides the name of the origin table for cloned tables.
+     *
+     * Replica tables should be identical to the original -
+     * indexes and constraints must use the original table name to calculate their own names.
+     *
+     * @param string $tableName
+     * @return string
+     */
+    public function getNameOfOriginTable(string $tableName): string
+    {
+        $tableIsReplica = preg_match($this->getFilterPattern(), $tableName, $matches);
+
+        return $tableIsReplica ? $matches['table_name'] : $tableName;
+    }
+
+    /**
+     * Provides a RegEx pattern used to search cloned temporary tables used as a replica.
+     *
+     * @return string
+     */
+    private function getFilterPattern(): string
+    {
+        if (!$this->filterPattern) {
+            $this->filterPattern = '#(?<table_name>\S+)_replica$#i';
+        }
+
+        return $this->filterPattern;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/UpToDateDeclarativeSchema.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/UpToDateDeclarativeSchema.php
new file mode 100644
index 0000000000000..d19c117dd620e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/UpToDateDeclarativeSchema.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\UpToDateValidatorInterface;
+
+/**
+ * Allows to validate if schema is up to date or not
+ */
+class UpToDateDeclarativeSchema implements UpToDateValidatorInterface
+{
+    /**
+     * @var SchemaConfigInterface
+     */
+    private $schemaConfig;
+
+    /**
+     * @var SchemaDiff
+     */
+    private $schemaDiff;
+
+    /**
+     * UpToDateSchema constructor.
+     * @param SchemaConfigInterface $schemaConfig
+     * @param SchemaDiff $schemaDiff
+     */
+    public function __construct(
+        SchemaConfigInterface $schemaConfig,
+        SchemaDiff $schemaDiff
+    ) {
+        $this->schemaConfig = $schemaConfig;
+        $this->schemaDiff = $schemaDiff;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNotUpToDateMessage() : string
+    {
+        return 'Declarative Schema is not up to date';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpToDate() : bool
+    {
+        $declarativeSchema = $this->schemaConfig->getDeclarationConfig();
+        $dbSchema = $this->schemaConfig->getDbConfig();
+        $diff = $this->schemaDiff->diff($declarativeSchema, $dbSchema);
+        return empty($diff->getAll());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
new file mode 100644
index 0000000000000..3eed77c37caac
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/operations.xsd" />
+
+    <xs:attributeGroup name="baseConstraint">
+        <xs:attributeGroup ref="basicOperations" />
+        <xs:attribute name="referenceId" type="referenceIdType" use="required" />
+    </xs:attributeGroup>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/foreign.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/foreign.xsd
new file mode 100644
index 0000000000000..950fbf66f90cf
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/foreign.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/constraint.xsd" />
+    <!--@TODO: why we need to specify table?-->
+    <xs:complexType name="foreign">
+        <xs:annotation>
+            <xs:documentation>
+                With help of this element, foreign key constraint can be described.
+                This constraint allows to have reference
+                For this you need 4 settings, described below.
+            </xs:documentation>
+        </xs:annotation>
+
+        <xs:sequence />
+
+        <xs:attribute name="table" type="xs:string" />
+        <xs:attribute name="column" type="xs:string" />
+        <xs:attribute name="referenceColumn" type="xs:string" />
+        <xs:attribute name="referenceTable" type="xs:string" />
+        <xs:attribute name="onDelete" type="referenceOptionsType"  />
+
+        <xs:attributeGroup ref="baseConstraint" />
+    </xs:complexType>
+    
+    <xs:simpleType name="referenceOptionsType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CASCADE" />
+            <xs:enumeration value="SET NULL" />
+            <xs:enumeration value="NO ACTION" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/primary.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/primary.xsd
new file mode 100644
index 0000000000000..f6d1e09823aba
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/primary.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/constraint.xsd" />
+    
+    <xs:complexType name="primary">
+        <xs:annotation>
+            <xs:documentation>
+                With help of this element, foreign key constraint can be described.
+                This constraint allows to have reference
+                For this you need 4 settings, described below.
+            </xs:documentation>
+        </xs:annotation>
+
+        <xs:sequence>
+            <xs:element name="column" type="constraintColumnType" maxOccurs="unbounded" minOccurs="0" />
+        </xs:sequence>
+
+        <xs:attributeGroup ref="baseConstraint" />
+    </xs:complexType>
+
+    <xs:complexType name="constraintColumnType">
+        <xs:attribute name="name" type="xs:string" />
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/unique.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/unique.xsd
new file mode 100644
index 0000000000000..e2d24ea65749c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/unique.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/constraint.xsd" />
+    
+    <xs:complexType name="unique">
+        <xs:annotation>
+            <xs:documentation>
+                This constraint allows to
+            </xs:documentation>
+        </xs:annotation>
+
+        <xs:sequence>
+            <xs:element name="column" type="constraintColumnTypeUnique" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+
+        <xs:attributeGroup ref="baseConstraint" />
+    </xs:complexType>
+
+    <xs:complexType name="constraintColumnTypeUnique">
+        <xs:attribute name="name" type="xs:string" />
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
new file mode 100644
index 0000000000000..cd08e3f43ad43
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:complexType name="index">
+        <xs:annotation>
+            <xs:documentation>
+                Describe different SQL indexes. With help of indexes you can improve read SQL
+                operations
+            </xs:documentation>
+        </xs:annotation>
+
+        <xs:sequence>
+            <xs:element name="column" type="indexColumnType" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+
+        <xs:attribute name="indexType" type="indexType" />
+        <xs:attribute name="referenceId" type="referenceIdType" use="required" />
+        <xs:attribute name="disabled" type="xs:boolean" />
+    </xs:complexType>
+
+    <xs:complexType name="indexColumnType">
+        <xs:attribute name="name" type="xs:string" />
+    </xs:complexType>
+
+    <xs:simpleType name="indexType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="fulltext" />
+            <xs:enumeration value="btree" />
+            <xs:enumeration value="hash" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
new file mode 100644
index 0000000000000..dbebdefbda0c2
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:simpleType name="nameType">
+        <xs:annotation>
+            <xs:documentation>
+                We can`t create column index or constraint with name length more than 64 char
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:maxLength value="64" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="referenceIdType">
+        <xs:union memberTypes="nameType">
+            <xs:simpleType>
+                <xs:annotation>
+                    <xs:documentation>
+                        The attribute can contain only [A-Z0-9_].
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:restriction base="xs:string">
+                    <xs:pattern value="[A-Z0-9_]+" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/operations.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/operations.xsd
new file mode 100644
index 0000000000000..77ef32cbf67c8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/operations.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:attributeGroup name="basicOperations">
+        <xs:annotation>
+            <xs:documentation>
+                `renameTo`: This operation allow to rename columns from 3-rd party module.
+                As you can not affect original declaration from 3-rd party module,
+                you can only extend it. So in order to rename external column, table, index or constraint
+                you need to specify additional param. Value of which will be desired name.
+                `disabled`: Allows to remove external column (created by external module).
+
+                Note: in order to remove or rename schema entity that comes with your module, you can
+                easily do it in your declaration, by removing schema entity declaration or renaming name attribute
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="disabled" type="xs:boolean" />
+    </xs:attributeGroup>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
new file mode 100644
index 0000000000000..a2f8611c4bd33
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+* Copyright © Magento, Inc. All rights reserved.
+* See COPYING.txt for license details.
+*/
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <!--Types-->
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/name.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/decimal.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/float.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/double.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/biginteger.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/text.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/longtext.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/varchar.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/blob.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/longblob.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/datetime.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/date.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/boolean.xsd" />
+    <!--Constraints-->
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/foreign.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/unique.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/primary.xsd" />
+    <!--Indexes-->
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/index.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+
+    <xs:element name="schema">
+        <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="table" type="table">
+                    <xs:unique name="uniqueColumnName">
+                        <xs:annotation>
+                            <xs:documentation>Column name be unique for each table</xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="column" />
+                        <xs:field xpath="@name" />
+                    </xs:unique>
+                    <xs:unique name="uniqueIndexReferenceId">
+                        <xs:annotation>
+                            <xs:documentation>Reference ID should be unique for indexes</xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="index" />
+                        <xs:field xpath="@referenceId" />
+                    </xs:unique>
+                    <xs:unique name="uniqueConstraintReferenceId">
+                        <xs:annotation>
+                            <xs:documentation>Reference ID should be unique for constraints</xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="constraint" />
+                        <xs:field xpath="@referenceId" />
+                    </xs:unique>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="uniqueTableName">
+            <xs:annotation>
+                <xs:documentation>Table name should be unique for each module</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="table" />
+            <xs:field xpath="@name" />
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="table">
+        <xs:annotation>
+            <xs:documentation>
+                Table definition. Here we can found column, constraints and indexes
+            </xs:documentation>
+        </xs:annotation>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="column" type="abstractColumnType"/>
+            <xs:element name="constraint" />
+            <xs:element name="index" type="index" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string" use="required" />
+        <xs:attribute name="resource" type="resourceType" />
+        <xs:attribute name="engine" type="engineType" />
+        <xs:attribute name="comment" type="xs:string" />
+        <xs:attribute name="collation" type="xs:string" />
+        <xs:attribute name="charset" type="xs:string" />
+        <xs:attribute name="onCreate" type="xs:string" />
+    </xs:complexType>
+
+    <xs:simpleType name="resourceType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="default" />
+            <xs:enumeration value="checkout" />
+            <xs:enumeration value="sales" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="engineType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="innodb" />
+            <xs:enumeration value="memory" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/blob.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/blob.xsd
new file mode 100644
index 0000000000000..b3812cedeb63e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/blob.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="blob">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/longblob.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/longblob.xsd
new file mode 100644
index 0000000000000..f69ea7c71641e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/longblob.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="longblob">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source. Different types can be used depends on data size
+                        you want to persist
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd
new file mode 100644
index 0000000000000..ac81024f3181d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="mediumblob">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd
new file mode 100644
index 0000000000000..0ee79199c29ae
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="varbinary">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="length">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:maxInclusive value="255"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="default" type="xs:string" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/boolean.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/boolean.xsd
new file mode 100644
index 0000000000000..65dec3ae2183a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/boolean.xsd
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+
+    <xs:complexType name="boolean">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:attribute name="default" type="xs:boolean" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/column.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/column.xsd
new file mode 100644
index 0000000000000..df485e38869bb
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/column.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/operations.xsd" />
+    <xs:attributeGroup name="baseColumn">
+        <xs:attributeGroup ref="basicOperations" />
+        <xs:attribute name="name" type="nameType" use="required" />
+        <xs:attribute name="comment" type="xs:string" />
+        <xs:attribute name="onCreate" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    Example migrateDataFrom(field) or migrateDataFrom(field * 2)
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+
+    <xs:complexType name="abstractColumnType">
+        <xs:attributeGroup ref="baseColumn" />
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/date.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/date.xsd
new file mode 100644
index 0000000000000..aeb6f34c41ae4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/date.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+
+    <xs:complexType name="date">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        This format is used to save date (year, month, day).
+                        Probably your SQL engine will save date in this format: 'YYYY-MM-DD'
+                        Dates in invalid format will be converted to '0000-00-00' string
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/datetime.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/datetime.xsd
new file mode 100644
index 0000000000000..c9c9d4052e12e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/datetime.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/default.xsd"/>
+
+    <xs:complexType name="datetime">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        This format is used to save date (year, month, day).
+                        Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
+                        Date time in invalid format will be converted to '0000-00-00 00:00:00' string
+                        Supported range is '1000-01-01 00:00:00' to '9999-12-31 23:59:59'
+                        DateTime format save date and time in your local time zone
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attributeGroup ref="default" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/default.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/default.xsd
new file mode 100644
index 0000000000000..f541d5a3912c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/default.xsd
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:attributeGroup name="default">
+        <xs:annotation>
+            <xs:documentation>
+                This is default types for timestamp and datetime DDL types.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="default" type="defaults" />
+        <xs:attribute name="nullable" type="xs:boolean" />
+        <xs:attribute name="on_update" type="xs:boolean">
+            <xs:annotation>
+                <xs:documentation>
+                    Logically on update can accept only one value - CURRENT_TIMESTAMP
+                    So we just choose if we want to add next construction or not
+                    'ON UPDATE CURRENT_TIMESTAMP'
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+
+    <xs:simpleType name="defaults">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="CURRENT_TIMESTAMP">
+                <xs:annotation>
+                    <xs:documentation>
+                        Use current time according to your SQL server time zone
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="0">
+                <xs:annotation>
+                    <xs:documentation>
+                        Please be aware that NO_ZERO_DATE SQL mode should be turned off. The default value will have next formatL:
+                        0000-00-00 00:00:00
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NULL">
+                <xs:annotation>
+                    <xs:documentation>
+                        In this case timestamp column will not have any value at all by default. And become
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd
new file mode 100644
index 0000000000000..0fd94540bae52
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/default.xsd"/>
+
+    <xs:complexType name="timestamp">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        This format is used to save date (year, month, day).
+                        Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
+                        Date time in invalid format will be converted to '0000-00-00 00:00:00' string
+                        MySQL timestamp is similar to UNIX timestamp. You can pass you local time there and it will
+                        be converted to UTC timezone. Then when you will try to pull your time back it will be converted
+                        to your local time again.
+                        Unix range: 1970-01-01 00:00:01' UTC to '2038-01-09 03:14:07'
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attributeGroup ref="default" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/biginteger.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/biginteger.xsd
new file mode 100644
index 0000000000000..df222eb93a3dc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/biginteger.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd"/>
+
+    <xs:complexType name="bigint">
+        <xs:complexContent>
+            <xs:extension base="int"/>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/integer.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/integer.xsd
new file mode 100644
index 0000000000000..e264060cba63d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/integer.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="int">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Serves needs in integer digits. Default padding is 11.
+                        Size is 4 bytes.
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:attribute name="default" type="xs:integer" />
+                <xs:attribute name="padding">
+                    <xs:annotation>
+                        <xs:documentation>
+                            We can use padding only from 2, because padding 1 used for boolean type.
+                            And we need to distinguish boolean and integer
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:maxInclusive value="255" />
+                            <xs:minInclusive value="2" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="unsigned" type="xs:boolean" />
+                <xs:attribute name="identity" type="xs:boolean" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd
new file mode 100644
index 0000000000000..5306fbc1d9f5b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd"/>
+
+    <xs:complexType name="smallint">
+        <xs:annotation>
+            <xs:documentation>
+                Serves needs in integer digits. Default padding is 5.
+                Size is 2 bytes.
+            </xs:documentation>
+        </xs:annotation>
+
+        <xs:complexContent>
+            <xs:extension base="int"/>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd
new file mode 100644
index 0000000000000..32d8294d9dc72
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd"/>
+
+    <xs:complexType name="tinyint">
+        <xs:complexContent>
+            <xs:extension base="int"/>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/decimal.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/decimal.xsd
new file mode 100644
index 0000000000000..2aa5387df497d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/decimal.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="decimal">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        A fixed point decimal fraction equal to SQL DECIMAL(PRECISION,SCALE) type, where
+                        - SCALE is a size of number in fractional part,
+                        - PRECISION is a whole size of decimal fraction.
+                        Please use this type for business oriented math like price or qty storages.
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="default" type="xs:decimal" />
+                <!--Note that scale must not be more than precision-->
+                <xs:attribute name="precision">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="65" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="unsigned" type="xs:boolean" />
+                <xs:attribute name="scale">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="30" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/double.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/double.xsd
new file mode 100644
index 0000000000000..652626ee9c144
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/double.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/float.xsd"/>
+
+    <xs:complexType name="double">
+        <xs:annotation>
+            <xs:documentation>
+                A double precision floating point binary number, has same rounding issues as float.
+                For business oriented math like price or qty storages please use decimal type.
+            </xs:documentation>
+        </xs:annotation>
+
+        <xs:complexContent>
+            <xs:extension base="float" />
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/float.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/float.xsd
new file mode 100644
index 0000000000000..3ddaed993a649
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/float.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="float">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        A floating point binary value with single precision. Has rounding issues.
+                        Float is good for scientific calculations.
+                        For business oriented math like price or qty storages please use decimal type.
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="default" type="xs:float" />
+                <!--Note that scale must not be more than precision-->
+                <xs:attribute name="precision">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="255" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="scale">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="253" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="nullable" type="xs:boolean" />
+                <xs:attribute name="unsigned" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/longtext.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/longtext.xsd
new file mode 100644
index 0000000000000..90b1b910c06ea
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/longtext.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="longtext">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Here plain text can be persisted. Length of this field is more than more than 16777216
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd
new file mode 100644
index 0000000000000..652d4b5cf4616
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="mediumtext">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Here plain text can be persisted. Length of this field is more than 65536 characters
+                        and less than 16777216
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/text.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/text.xsd
new file mode 100644
index 0000000000000..d1efce612489e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/text.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="text">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Here plain text can be persisted. Length of this field is more than 255 characters
+                        and less than 65536
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/varchar.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/varchar.xsd
new file mode 100644
index 0000000000000..a667b0b2481c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/varchar.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="varchar">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Varchar is the small text field. It do not have max length. But we suppose, that this field can be used for
+                        string columns that are in role of some key, like customer email or product sku. We add limitation for 1024 characters
+                        on this type. This limitation is justified by SQL engine limitations, like {max sort size} or {max index size}.
+                        For example, in MySQL, default max sort size (max_sort_length) is 1024 symbols.
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="length">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:maxInclusive value="1024"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="default" type="xs:string" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Exception.php b/lib/internal/Magento/Framework/Setup/Exception.php
new file mode 100644
index 0000000000000..c21bd1c503295
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Exception.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Exception thrown if an error occurs on setup process.
+ */
+class Exception extends LocalizedException
+{
+}
diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php
index d144cc2c2c9b1..af0db6498144e 100644
--- a/lib/internal/Magento/Framework/Setup/FilePermissions.php
+++ b/lib/internal/Magento/Framework/Setup/FilePermissions.php
@@ -9,6 +9,8 @@
 use Magento\Framework\Backup\Filesystem\Iterator\Filter;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Filter\ExcludeFilter;
+use Magento\Framework\App\State;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Checks permissions to files and folders.
@@ -25,6 +27,11 @@ class FilePermissions
      */
     protected $directoryList;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * List of required writable directories for installation
      *
@@ -63,13 +70,16 @@ class FilePermissions
     /**
      * @param Filesystem $filesystem
      * @param DirectoryList $directoryList
+     * @param State $state
      */
     public function __construct(
         Filesystem $filesystem,
-        DirectoryList $directoryList
+        DirectoryList $directoryList,
+        State $state = null
     ) {
         $this->filesystem = $filesystem;
         $this->directoryList = $directoryList;
+        $this->state = $state ?: ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -85,8 +95,10 @@ public function getInstallationWritableDirectories()
                 DirectoryList::VAR_DIR,
                 DirectoryList::MEDIA,
                 DirectoryList::STATIC_VIEW,
-                DirectoryList::GENERATED,
             ];
+            if ($this->state->getMode() !== State::MODE_PRODUCTION) {
+                $data[] = DirectoryList::GENERATED;
+            }
             foreach ($data as $code) {
                 $this->installationWritableDirectories[$code] = $this->directoryList->getPath($code);
             }
diff --git a/lib/internal/Magento/Framework/Setup/JsonPersistor.php b/lib/internal/Magento/Framework/Setup/JsonPersistor.php
new file mode 100644
index 0000000000000..b479ffe20e460
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/JsonPersistor.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup;
+
+/**
+ * Persist json files.
+ */
+class JsonPersistor
+{
+    /**
+     * Persist data to json file.
+     *
+     * @param array $data
+     * @param string $path
+     * @return bool
+     */
+    public function persist(array $data, $path)
+    {
+        return file_put_contents($path, json_encode($data, JSON_PRETTY_PRINT));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Lists.php b/lib/internal/Magento/Framework/Setup/Lists.php
index ce0dd8348acc3..1ee5baf28658e 100644
--- a/lib/internal/Magento/Framework/Setup/Lists.php
+++ b/lib/internal/Magento/Framework/Setup/Lists.php
@@ -21,12 +21,20 @@ class Lists
      */
     protected $allowedLocales;
 
+    /**
+     * List of allowed currencies
+     *
+     * @var array
+     */
+    private $allowedCurrencies;
+
     /**
      * @param ConfigInterface $localeConfig
      */
     public function __construct(ConfigInterface $localeConfig)
     {
         $this->allowedLocales = $localeConfig->getAllowedLocales();
+        $this->allowedCurrencies = $localeConfig->getAllowedCurrencies();
     }
 
     /**
@@ -64,6 +72,10 @@ public function getCurrencyList()
         $currencies = (new CurrencyBundle())->get(Resolver::DEFAULT_LOCALE)['Currencies'];
         $list = [];
         foreach ($currencies as $code => $data) {
+            $isAllowedCurrency = array_search($code, $this->allowedCurrencies) !== false;
+            if (!$isAllowedCurrency) {
+                continue;
+            }
             $list[$code] = $data[1] . ' (' . $code . ')';
         }
         asort($list);
diff --git a/lib/internal/Magento/Framework/Setup/OldDbValidator.php b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
new file mode 100644
index 0000000000000..4c224a6c713ef
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup;
+
+use Composer\Package\Version\VersionParser;
+use Magento\Framework\Module\DbVersionInfo;
+
+/**
+ * Old Validator for database
+ *
+ * Used in order to support backward compatability of modules that are installed
+ * in old way (with Install/Upgrade Schema/Data scripts)
+ */
+class OldDbValidator implements UpToDateValidatorInterface
+{
+    /**
+     * @var DbVersionInfo
+     */
+    private $dbVersionInfo;
+
+    /**
+     * @param DbVersionInfo $dbVersionInfo
+     */
+    public function __construct(DbVersionInfo $dbVersionInfo)
+    {
+        $this->dbVersionInfo = $dbVersionInfo;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNotUpToDateMessage(): string
+    {
+        $genericMessage = '<info>The module code base doesn\'t match the DB schema and data.</info>' .
+            PHP_EOL .
+            '<info>Some modules use code versions newer or older than the database.</info>';
+        $messages = [];
+        $versionParser = new VersionParser();
+        $codebaseUpdateNeeded = false;
+        foreach ($this->dbVersionInfo->getDbVersionErrors() as $error) {
+            if (!$codebaseUpdateNeeded && $error[DbVersionInfo::KEY_CURRENT] !== 'none') {
+                // check if module code base update is needed
+                $currentVersion = $versionParser->parseConstraints($error[DbVersionInfo::KEY_CURRENT]);
+                $requiredVersion = $versionParser->parseConstraints('>' . $error[DbVersionInfo::KEY_REQUIRED]);
+                if ($requiredVersion->matches($currentVersion)) {
+                    $codebaseUpdateNeeded = true;
+                }
+
+                $messages[] = sprintf(
+                    "<info>%20s %10s: %11s  ->  %-11s</info>",
+                    $error[DbVersionInfo::KEY_MODULE],
+                    $error[DbVersionInfo::KEY_TYPE],
+                    $error[DbVersionInfo::KEY_CURRENT],
+                    $error[DbVersionInfo::KEY_REQUIRED]
+                );
+            }
+        }
+
+        return implode(PHP_EOL, $messages) . ($codebaseUpdateNeeded ? $genericMessage : '');
+    }
+
+    /**
+     * Is up to date
+     *
+     * @return bool
+     */
+    public function isUpToDate(): bool
+    {
+        return empty($this->dbVersionInfo->getDbVersionErrors());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/DataPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/DataPatchInterface.php
new file mode 100644
index 0000000000000..e768d045e83be
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/DataPatchInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * This interface describe script, that atomic operations with data (DML, DQL) in SQL database
+ * This is wrapper for @see PatchInterface in order to define what kind of patch we have
+ */
+interface DataPatchInterface extends PatchInterface
+{
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
new file mode 100644
index 0000000000000..abda94a0e6f8e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * Each patch can have dependecies, that should be applied before such patch
+ *
+ *            /  Patch2 --- Patch3
+ *          /
+ *        /
+ * Patch1
+ *
+ * Here you see dependency of Patch1 to Patch2
+ */
+interface DependentPatchInterface
+{
+    /**
+     * Get array of patches that have to be executed prior to this.
+     *
+     * example of implementation:
+     *
+     * [
+     *      \Vendor_Name\Module_Name\Setup\Patch\Patch1::class,
+     *      \Vendor_Name\Module_Name\Setup\Patch\Patch2::class
+     * ]
+     *
+     * @return string[]
+     */
+    public static function getDependencies();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/NonTransactionableInterface.php b/lib/internal/Magento/Framework/Setup/Patch/NonTransactionableInterface.php
new file mode 100644
index 0000000000000..30800b3c89323
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/NonTransactionableInterface.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * Means that patch can`t be run in transaction
+ */
+interface NonTransactionableInterface
+{
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
new file mode 100644
index 0000000000000..d81d36d383f67
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\Setup\Exception;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+/**
+ * Apply patches per specific module
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PatchApplier
+{
+    /**
+     * Flag means, that we need to read schema patches
+     */
+    const SCHEMA_PATCH = 'schema';
+
+    /**
+     * Flag means, that we need to read data patches
+     */
+    const DATA_PATCH = 'data';
+
+    /**
+     * @var PatchRegistryFactory
+     */
+    private $patchRegistryFactory;
+
+    /**
+     * @var PatchReader
+     */
+    private $dataPatchReader;
+
+    /**
+     * @var PatchReader
+     */
+    private $schemaPatchReader;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var PatchHistory
+     */
+    private $patchHistory;
+
+    /**
+     * @var PatchFactory
+     */
+    private $patchFactory;
+
+    /**
+     * @var \Magento\Framework\Setup\SetupInterface
+     */
+    private $schemaSetup;
+
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var PatchBackwardCompatability
+     */
+    private $patchBackwardCompatability;
+
+    /**
+     * @var ModuleList
+     */
+    private $moduleList;
+
+    /**
+     * PatchApplier constructor.
+     * @param PatchReader $dataPatchReader
+     * @param PatchReader $schemaPatchReader
+     * @param PatchRegistryFactory $patchRegistryFactory
+     * @param ResourceConnection $resourceConnection
+     * @param PatchBackwardCompatability $patchBackwardCompatability
+     * @param PatchHistory $patchHistory
+     * @param PatchFactory $patchFactory
+     * @param ObjectManagerInterface $objectManager
+     * @param \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param ModuleList $moduleList
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(Magento.TypeDuplication)
+     */
+    public function __construct(
+        PatchReader $dataPatchReader,
+        PatchReader $schemaPatchReader,
+        PatchRegistryFactory $patchRegistryFactory,
+        ResourceConnection $resourceConnection,
+        PatchBackwardCompatability $patchBackwardCompatability,
+        PatchHistory $patchHistory,
+        PatchFactory $patchFactory,
+        ObjectManagerInterface $objectManager,
+        \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+        ModuleList $moduleList
+    ) {
+        $this->patchRegistryFactory = $patchRegistryFactory;
+        $this->dataPatchReader = $dataPatchReader;
+        $this->schemaPatchReader = $schemaPatchReader;
+        $this->resourceConnection = $resourceConnection;
+        $this->patchHistory = $patchHistory;
+        $this->patchFactory = $patchFactory;
+        $this->schemaSetup = $schemaSetup;
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->objectManager = $objectManager;
+        $this->patchBackwardCompatability = $patchBackwardCompatability;
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * Apply all patches for one module
+     *
+     * @param null | string $moduleName
+     * @throws Exception
+     */
+    public function applyDataPatch($moduleName = null)
+    {
+        $registry = $this->prepareRegistry($moduleName, self::DATA_PATCH);
+        foreach ($registry as $dataPatch) {
+            /**
+             * Due to backward compatabilities reasons some patches should be skipped
+             */
+            if ($this->patchBackwardCompatability->isSkipableByDataSetupVersion($dataPatch, $moduleName)) {
+                $this->patchHistory->fixPatch($dataPatch);
+                continue;
+            }
+
+            $dataPatch = $this->objectManager->create(
+                '\\' . $dataPatch,
+                ['moduleDataSetup' => $this->moduleDataSetup]
+            );
+            if (!$dataPatch instanceof DataPatchInterface) {
+                throw new Exception(
+                    new Phrase("Patch %1 should implement DataPatchInterface", [get_class($dataPatch)])
+                );
+            }
+            if ($dataPatch instanceof NonTransactionableInterface) {
+                $dataPatch->apply();
+                $this->patchHistory->fixPatch(get_class($dataPatch));
+            } else {
+                try {
+                    $this->moduleDataSetup->getConnection()->beginTransaction();
+                    $dataPatch->apply();
+                    $this->patchHistory->fixPatch(get_class($dataPatch));
+                    $this->moduleDataSetup->getConnection()->commit();
+                } catch (\Exception $e) {
+                    $this->moduleDataSetup->getConnection()->rollBack();
+                    throw new Exception(new Phrase($e->getMessage()));
+                } finally {
+                    unset($dataPatch);
+                }
+            }
+        }
+    }
+
+    /**
+     * Register all patches in registry in order to manipulate chains and dependencies of patches
+     * of patches
+     *
+     * @param string $moduleName
+     * @param string $patchType
+     * @return PatchRegistry
+     */
+    private function prepareRegistry($moduleName, $patchType)
+    {
+        $reader = $patchType === self::DATA_PATCH ? $this->dataPatchReader : $this->schemaPatchReader;
+        $registry = $this->patchRegistryFactory->create();
+
+        //Prepare modules to read
+        if ($moduleName === null) {
+            $patchNames = [];
+            foreach ($this->moduleList->getNames() as $moduleName) {
+                $patchNames += $reader->read($moduleName);
+            }
+        } else {
+            $patchNames = $reader->read($moduleName);
+        }
+
+        foreach ($patchNames as $patchName) {
+            $registry->registerPatch($patchName);
+        }
+
+        return $registry;
+    }
+
+    /**
+     * Apply all patches for one module
+     *
+     * Please note: that schema patches are not revertable
+     *
+     * @param null | string $moduleName
+     * @throws Exception
+     */
+    public function applySchemaPatch($moduleName = null)
+    {
+        $registry = $this->prepareRegistry($moduleName, self::SCHEMA_PATCH);
+        foreach ($registry as $schemaPatch) {
+            try {
+                /**
+                 * Skip patches that were applied in old style
+                 */
+                if ($this->patchBackwardCompatability->isSkipableBySchemaSetupVersion($schemaPatch, $moduleName)) {
+                    $this->patchHistory->fixPatch($schemaPatch);
+                    continue;
+                }
+                /**
+                 * @var SchemaPatchInterface $schemaPatch
+                 */
+                $schemaPatch = $this->patchFactory->create($schemaPatch, ['schemaSetup' => $this->schemaSetup]);
+                $schemaPatch->apply();
+                $this->patchHistory->fixPatch(get_class($schemaPatch));
+            } catch (\Exception $e) {
+                throw new Exception(
+                    new Phrase(
+                        'Unable to apply patch %1 for module %2. Original exception message: %3',
+                        [
+                            get_class($schemaPatch),
+                            $moduleName,
+                            $e->getMessage()
+                        ]
+                    )
+                );
+            } finally {
+                unset($schemaPatch);
+            }
+        }
+    }
+
+    /**
+     * Revert data patches for specific module
+     *
+     * @param null | string $moduleName
+     * @throws Exception
+     */
+    public function revertDataPatches($moduleName = null)
+    {
+        $registry = $this->prepareRegistry($moduleName, self::DATA_PATCH);
+        $adapter = $this->moduleDataSetup->getConnection();
+
+        foreach ($registry->getReverseIterator() as $dataPatch) {
+            $dataPatch = $this->objectManager->create(
+                '\\' . $dataPatch,
+                ['moduleDataSetup' => $this->moduleDataSetup]
+            );
+            if ($dataPatch instanceof PatchRevertableInterface) {
+                try {
+                    $adapter->beginTransaction();
+                    /** @var PatchRevertableInterface|DataPatchInterface $dataPatch */
+                    $dataPatch->revert();
+                    $this->patchHistory->revertPatchFromHistory(get_class($dataPatch));
+                    $adapter->commit();
+                } catch (\Exception $e) {
+                    $adapter->rollBack();
+                    throw new Exception(new Phrase($e->getMessage()));
+                } finally {
+                    unset($dataPatch);
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchApplierFactory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplierFactory.php
new file mode 100644
index 0000000000000..deb7c91c976ae
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchApplierFactory.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * This factory allows to create data patches applier
+ */
+class PatchApplierFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create new instance of patch applier
+     *
+     * @param array $arguments
+     * @return PatchInterface
+     */
+    public function create($arguments = [])
+    {
+        return $this->objectManager->create(\Magento\Framework\Setup\Patch\PatchApplier::class, $arguments);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchBackwardCompatability.php b/lib/internal/Magento/Framework/Setup/Patch/PatchBackwardCompatability.php
new file mode 100644
index 0000000000000..9f22c9491b050
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchBackwardCompatability.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\Module\ModuleResource;
+
+/**
+ * This class is information expert in questions of backward compatibility in data and schema patches
+ */
+class PatchBackwardCompatability
+{
+    /**
+     * @var ModuleResource
+     */
+    private $moduleResource;
+
+    /**
+     * @param ModuleResource $moduleResource
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(Magento.TypeDuplication)
+     */
+    public function __construct(ModuleResource $moduleResource)
+    {
+        $this->moduleResource = $moduleResource;
+    }
+
+    /**
+     * Check is patch skipable by data setup version in DB
+     *
+     * @param string $patchClassName
+     * @param string $moduleName
+     * @return bool
+     */
+    public function isSkipableByDataSetupVersion(string $patchClassName, string $moduleName) : bool
+    {
+        $dbVersion = (string) $this->moduleResource->getDataVersion($moduleName);
+        return in_array(PatchVersionInterface::class, class_implements($patchClassName)) &&
+            version_compare(call_user_func([$patchClassName, 'getVersion']), $dbVersion) <= 0;
+    }
+
+    /**
+     * Check is patch skipable by schema setup version in DB
+     *
+     * @param string $patchClassName
+     * @param string $moduleName
+     * @return bool
+     */
+    public function isSkipableBySchemaSetupVersion(string $patchClassName, string $moduleName) : bool
+    {
+        $dbVersion = (string) $this->moduleResource->getDbVersion($moduleName);
+        return in_array(PatchVersionInterface::class, class_implements($patchClassName)) &&
+            version_compare(call_user_func([$patchClassName, 'getVersion']), $dbVersion) <= 0;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchFactory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchFactory.php
new file mode 100644
index 0000000000000..e6c4832887efd
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchFactory.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * This factory allows to create data patches:
+ * @see PatchInterface
+ */
+class PatchFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create new instance of patch
+     *
+     * @param string $instanceName
+     * @param array $arguments
+     * @return PatchInterface
+     */
+    public function create($instanceName, $arguments = [])
+    {
+        $patchInstance = $this->objectManager->create('\\' . $instanceName, $arguments);
+        if (!$patchInstance instanceof PatchInterface) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    "%s should implement %s interface",
+                    $instanceName,
+                    PatchInterface::class
+                )
+            );
+        }
+
+        return $patchInstance;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
new file mode 100644
index 0000000000000..34b7c226185e3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * This is registry of all patches, that are already applied on database
+ */
+class PatchHistory
+{
+    /**
+     * Table name where patche names will be persisted
+     */
+    const TABLE_NAME = 'patch_list';
+
+    /**
+     * Name of a patch
+     */
+    const CLASS_NAME = "patch_name";
+
+    /**
+     * Patch type for schema patches
+     */
+    const SCHEMA_PATCH_TYPE = 'schema';
+
+    /**
+     * Patch type for data patches
+     */
+    const DATA_PATCH_TYPE = 'data';
+
+    /**
+     * @var array
+     */
+    private $patchesRegistry = null;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * PatchHistory constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Read and cache data patches from db
+     *
+     * All patches are store in patch_list table
+     * @see self::TABLE_NAME
+     *
+     * @return array
+     */
+    private function getAppliedPatches()
+    {
+        if ($this->patchesRegistry === null) {
+            $adapter = $this->resourceConnection->getConnection();
+            $filterSelect = $adapter
+                ->select()
+                ->from($this->resourceConnection->getTableName(self::TABLE_NAME), self::CLASS_NAME);
+            $this->patchesRegistry = $adapter->fetchCol($filterSelect);
+        }
+
+        return $this->patchesRegistry;
+    }
+
+    /**
+     * Fix patch in patch table in order to avoid reapplying of patch
+     *
+     * @param string $patchName
+     * @return void
+     */
+    public function fixPatch($patchName)
+    {
+        if ($this->isApplied($patchName)) {
+            throw new \LogicException(sprintf("Patch %s cannot be applied twice", $patchName));
+        }
+
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insert($this->resourceConnection->getTableName(self::TABLE_NAME), [self::CLASS_NAME => $patchName]);
+    }
+
+    /**
+     * Revert patch from history
+     *
+     * @param $patchName
+     * @return void
+     */
+    public function revertPatchFromHistory($patchName)
+    {
+        if (!$this->isApplied($patchName)) {
+            throw new \LogicException(
+                sprintf("Patch %s should be applied, before you can revert it", $patchName)
+            );
+        }
+
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->delete(
+            $this->resourceConnection->getTableName(self::TABLE_NAME),
+            [self::CLASS_NAME . "= ?" => $patchName]
+        );
+    }
+
+    /**
+     * Check whether patch was applied on the system or not
+     *
+     * @param string $patchName
+     * @return bool
+     */
+    public function isApplied($patchName)
+    {
+        return in_array($patchName, $this->getAppliedPatches());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
new file mode 100644
index 0000000000000..c69f754d4b978
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * This interface describe script, that is presented by atomic operations for data and schema
+ */
+interface PatchInterface extends DependentPatchInterface
+{
+    /**
+     * Get aliases (previous names) for the patch.
+     *
+     * @return string[]
+     */
+    public function getAliases();
+
+    /**
+     * Run code inside patch
+     * If code fails, patch must be reverted, in case when we are speaking about schema - than under revert
+     * means run PatchInterface::revert()
+     *
+     * If we speak about data, under revert means: $transaction->rollback()
+     *
+     * @return $this
+     */
+    public function apply();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchReader.php b/lib/internal/Magento/Framework/Setup/Patch/PatchReader.php
new file mode 100644
index 0000000000000..fc857e6a86990
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchReader.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\Filesystem\Glob;
+use Magento\Framework\Module\Dir;
+
+/**
+ * Allows to read all patches through the whole system
+ */
+class PatchReader
+{
+    /**
+     * Folder name, where patches are
+     */
+    const SETUP_PATCH_FOLDER = 'Patch';
+
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param ComponentRegistrar $componentRegistrar
+     * @param string $type
+     */
+    public function __construct(
+        ComponentRegistrar $componentRegistrar,
+        $type
+    ) {
+        $this->componentRegistrar = $componentRegistrar;
+        $this->type = $type;
+    }
+
+    /**
+     * Retrieve absolute path to modules patch folder
+     *
+     * @param string $modulePath
+     * @return string
+     */
+    private function getPatchFolder($modulePath)
+    {
+        return $modulePath . DIRECTORY_SEPARATOR . Dir::MODULE_SETUP_DIR .
+            DIRECTORY_SEPARATOR . self::SETUP_PATCH_FOLDER;
+    }
+
+    /**
+     * Retrieve module name prepared to usage in namespaces
+     *
+     * @param string $moduleName
+     * @return string
+     */
+    private function getModuleNameForNamespace($moduleName)
+    {
+        return str_replace('_', '\\', $moduleName);
+    }
+
+    /**
+     * Depends on type we want to handle schema and data patches in different folders
+     *
+     * @return string
+     */
+    private function getTypeFolder()
+    {
+        return ucfirst($this->type);
+    }
+
+    /**
+     * Create array of class patch names from module name
+     *
+     * @param string $moduleName
+     * @param string $modulePath
+     * @return array
+     */
+    private function getPatchClassesPerModule($moduleName, $modulePath)
+    {
+        $patchClasses = [];
+        $patchesPath = $this->getPatchFolder($modulePath);
+        $specificPatchPath = $patchesPath . DIRECTORY_SEPARATOR . $this->getTypeFolder();
+        $patchesMask = $specificPatchPath . DIRECTORY_SEPARATOR . '*.php';
+
+        foreach (Glob::glob($patchesMask) as $patchPath) {
+            $moduleName = $this->getModuleNameForNamespace($moduleName);
+            $patchClasses[] = $moduleName . '\\Setup\\' .
+                self::SETUP_PATCH_FOLDER . '\\' .
+                $this->getTypeFolder() . '\\' .
+                basename($patchPath, '.php');
+        }
+
+        return $patchClasses;
+    }
+
+    /**
+     * @param string $moduleName
+     * @return array
+     */
+    public function read($moduleName)
+    {
+        $modulePath = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        $patches = $this->getPatchClassesPerModule($moduleName, $modulePath);
+        return $patches;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
new file mode 100644
index 0000000000000..08e8f96bd5b60
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * Allows to read all patches through the whole system
+ */
+class PatchRegistry implements \IteratorAggregate
+{
+    /**
+     *
+     * @var array
+     */
+    private $dependents = [];
+
+    /**
+     * @var string[]
+     */
+    private $patches = [];
+
+    /**
+     * @var PatchFactory
+     */
+    private $patchFactory;
+
+    /**
+     * This classes need to do revert
+     *
+     * @var string[]
+     */
+    private $appliedPatches = [];
+
+    /**
+     * @var PatchHistory
+     */
+    private $patchHistory;
+
+    /**
+     * @var \Iterator
+     */
+    private $iterator = null;
+
+    /**
+     * @var \Iterator
+     */
+    private $reverseIterator = null;
+
+    /**
+     * @var array
+     */
+    private $cyclomaticStack = [];
+
+    /**
+     * PatchRegistry constructor.
+     * @param PatchFactory $patchFactory
+     * @param PatchHistory $patchHistory
+     */
+    public function __construct(PatchFactory $patchFactory, PatchHistory $patchHistory)
+    {
+        $this->patchFactory = $patchFactory;
+        $this->patchHistory = $patchHistory;
+    }
+
+    /**
+     * Register all dependents to patch
+     *
+     * @param string | DependentPatchInterface $patchName
+     */
+    private function registerDependents(string $patchName)
+    {
+        $dependencies = $patchName::getDependencies();
+
+        foreach ($dependencies as $dependency) {
+            $this->dependents[$dependency][] = $patchName;
+        }
+    }
+
+    /**
+     * Register patch and create chain of patches
+     *
+     * @param string $patchName
+     * @return PatchInterface | bool
+     */
+    public function registerPatch(string $patchName)
+    {
+        if ($this->patchHistory->isApplied($patchName)) {
+            $this->appliedPatches[$patchName] = $patchName;
+            $this->registerDependents($patchName);
+            return false;
+        }
+
+        if (isset($this->patches[$patchName])) {
+            return $this->patches[$patchName];
+        }
+
+        $this->patches[$patchName] = $patchName;
+        return $patchName;
+    }
+
+    /**
+     * Retrieve all patches, that depends on current one
+     *
+     * @param string $patch
+     * @return string[]
+     */
+    private function getDependentPatches(string $patch)
+    {
+        $patches = [];
+        $patchName = $patch;
+
+        /**
+         * Let`s check if patch is dependency for other patches
+         */
+        if (isset($this->dependents[$patchName])) {
+            foreach ($this->dependents[$patchName] as $dependent) {
+                if (isset($this->appliedPatches[$dependent])) {
+                    $dependent = $this->appliedPatches[$dependent];
+                    $patches = array_replace($patches, $this->getDependentPatches($dependent));
+                    $patches[$dependent] = $dependent;
+                    unset($this->appliedPatches[$dependent]);
+                }
+            }
+        }
+
+        return $patches;
+    }
+
+    /**
+     * @param string $patch
+     * @return string[]
+     */
+    private function getDependencies(string $patch)
+    {
+        $depInstances = [];
+        $deps = call_user_func([$patch, 'getDependencies']);
+        $this->cyclomaticStack[$patch] = true;
+
+        foreach ($deps as $dep) {
+            if (isset($this->cyclomaticStack[$dep])) {
+                throw new \LogicException("Cyclomatic dependency during patch installation");
+            }
+
+            $depInstance = $this->registerPatch($dep);
+            /**
+             * If a patch already have applied dependency - than we definently know
+             * that all other dependencies in dependency chain are applied too, so we can skip this dep
+             */
+            if (!$depInstance) {
+                continue;
+            }
+
+            $depInstances = array_replace($depInstances, $this->getDependencies($this->patches[$dep]));
+            $depInstances[$depInstance] = $depInstance;
+        }
+
+        unset($this->cyclomaticStack[$patch]);
+        return $depInstances;
+    }
+
+    /**
+     * If you want to uninstall system, there you will run all patches in reverse order
+     *
+     * But note, that patches also have dependencies, and if patch is dependency to any other patch
+     * you will to revert it dependencies first and only then patch
+     *
+     * @return \ArrayIterator
+     */
+    public function getReverseIterator()
+    {
+        if ($this->reverseIterator === null) {
+            $reversePatches = [];
+
+            while (!empty($this->appliedPatches)) {
+                $patch = array_pop($this->appliedPatches);
+                $reversePatches = array_replace($reversePatches, $this->getDependentPatches($patch));
+                $reversePatches[$patch] = $patch;
+            }
+
+            $this->reverseIterator = new \ArrayIterator($reversePatches);
+        }
+
+        return $this->reverseIterator;
+    }
+
+    /**
+     * Retrieve iterator of all patch instances
+     *
+     * If patch have dependencies, than first of all dependencies should be installed and only then desired patch
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        if ($this->iterator === null) {
+            $installPatches = [];
+            $patchInstances = $this->patches;
+
+            while (!empty($patchInstances)) {
+                $firstPatch = array_shift($patchInstances);
+                $deps = $this->getDependencies($firstPatch);
+
+                /**
+                 * Remove deps from patchInstances
+                 */
+                foreach ($deps as $dep) {
+                    unset($patchInstances[$dep]);
+                }
+
+                $installPatches = array_replace($installPatches, $deps);
+                $installPatches[$firstPatch] = $firstPatch;
+            }
+
+            $this->iterator = new \ArrayIterator($installPatches);
+        }
+
+        return $this->iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchRegistryFactory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistryFactory.php
new file mode 100644
index 0000000000000..0d8e242226700
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistryFactory.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Create instance of patch registry
+ */
+class PatchRegistryFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string
+     */
+    private $instanceName;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $instanceName = PatchRegistry::class
+    ) {
+
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * @return PatchRegistry
+     */
+    public function create()
+    {
+        return $this->objectManager->create($this->instanceName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchRevertableInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRevertableInterface.php
new file mode 100644
index 0000000000000..a69e0c61ad22f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRevertableInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * Revertable means, that patch can be reverted
+ *
+ * All patches (@see PatchInterface) that implement this interfaces should have next values:
+ * - do not use application layer: like Serilizer, Collections, etc
+ * - use only some DML operations: INSERT, UPDATE
+ * - DELETE DML operation is prohibited, because it can cause triggering foreign keys constraints
+ * - all schema patches are not revertable
+ */
+interface PatchRevertableInterface
+{
+    /**
+     * Rollback all changes, done by this patch
+     *
+     * @return void
+     */
+    public function revert();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
new file mode 100644
index 0000000000000..9fca3ffc364f9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * For backward compatibility with versioned style module installation. Deprecated since creation.
+ *
+ * @deprecated
+ */
+interface PatchVersionInterface
+{
+    /**
+     * This version associate patch with Magento setup version.
+     * For example, if Magento current setup version is 2.0.3 and patch version is 2.0.2 than
+     * this patch will be added to registry, but will not be applied, because it is already applied
+     * by old mechanism of UpgradeData.php script
+     *
+     *
+     * @return string
+     * @deprecated since appearance, required for backward compatibility
+     */
+    public static function getVersion();
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/SchemaPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/SchemaPatchInterface.php
new file mode 100644
index 0000000000000..ebc7c6f631c81
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/SchemaPatchInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Patch;
+
+/**
+ * This interface describe script, that atomic operations with schema (DDL) in SQL database
+ * This is wrapper for @see PatchInterface in order to define what kind of patch we have
+ */
+interface SchemaPatchInterface extends PatchInterface
+{
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/UpToDateData.php b/lib/internal/Magento/Framework/Setup/Patch/UpToDateData.php
new file mode 100644
index 0000000000000..e15d489a1f79a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/UpToDateData.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Setup\UpToDateValidatorInterface;
+
+/**
+ * Allows to validate if data patches is up to date or not
+ */
+class UpToDateData implements UpToDateValidatorInterface
+{
+    /**
+     * @var PatchHistory
+     */
+    private $patchHistory;
+
+    /**
+     * @var PatchReader
+     */
+    private $patchReader;
+
+    /**
+     * @var PatchBackwardCompatability
+     */
+    private $patchBackwardCompatability;
+
+    /**
+     * @var ModuleList
+     */
+    private $moduleList;
+
+    /**
+     * UpToDateData constructor.
+     * @param PatchHistory $patchHistory
+     * @param PatchReader $dataPatchReader
+     * @param PatchBackwardCompatability $patchBackwardCompatability
+     * @param ModuleList $moduleList
+     */
+    public function __construct(
+        PatchHistory $patchHistory,
+        PatchReader $dataPatchReader,
+        PatchBackwardCompatability $patchBackwardCompatability,
+        ModuleList $moduleList
+    ) {
+        $this->patchHistory = $patchHistory;
+        $this->patchReader = $dataPatchReader;
+        $this->patchBackwardCompatability = $patchBackwardCompatability;
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNotUpToDateMessage() : string
+    {
+        return 'Data patches are not up to date';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpToDate() : bool
+    {
+        foreach ($this->moduleList->getNames() as $moduleName) {
+            foreach ($this->patchReader->read($moduleName) as $patchName) {
+                if (!$this->patchBackwardCompatability->isSkipableByDataSetupVersion($patchName, $moduleName) &&
+                    !$this->patchHistory->isApplied($patchName)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Patch/UpToDateSchema.php b/lib/internal/Magento/Framework/Setup/Patch/UpToDateSchema.php
new file mode 100644
index 0000000000000..5fd940d19aab9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Patch/UpToDateSchema.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+namespace Magento\Framework\Setup\Patch;
+
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Setup\UpToDateValidatorInterface;
+
+/**
+ * Allows to validate if data patches is up to date or not
+ */
+class UpToDateSchema implements UpToDateValidatorInterface
+{
+    /**
+     * @var PatchHistory
+     */
+    private $patchHistory;
+
+    /**
+     * @var PatchReader
+     */
+    private $patchReader;
+
+    /**
+     * @var PatchBackwardCompatability
+     */
+    private $patchBackwardCompatability;
+
+    /**
+     * @var ModuleList
+     */
+    private $moduleList;
+
+    /**
+     * UpToDateData constructor.
+     * @param PatchHistory $patchHistory
+     * @param PatchReader $schemaReader
+     * @param PatchBackwardCompatability $patchBackwardCompatability
+     * @param ModuleList $moduleList
+     */
+    public function __construct(
+        PatchHistory $patchHistory,
+        PatchReader $schemaReader,
+        PatchBackwardCompatability $patchBackwardCompatability,
+        ModuleList $moduleList
+    ) {
+        $this->patchHistory = $patchHistory;
+        $this->patchReader = $schemaReader;
+        $this->patchBackwardCompatability = $patchBackwardCompatability;
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNotUpToDateMessage() : string
+    {
+        return 'Schema patches are not up to date';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpToDate() : bool
+    {
+        foreach ($this->moduleList->getNames() as $moduleName) {
+            foreach ($this->patchReader->read($moduleName) as $patchName) {
+                if (!$this->patchBackwardCompatability->isSkipableBySchemaSetupVersion($patchName, $moduleName) &&
+                    !$this->patchHistory->isApplied($patchName)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListener.php b/lib/internal/Magento/Framework/Setup/SchemaListener.php
new file mode 100644
index 0000000000000..c6407a2569a20
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListener.php
@@ -0,0 +1,553 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Setup\SchemaListenerDefinition\DefinitionConverterInterface;
+use Magento\Framework\Setup\SchemaListenerHandlers\SchemaListenerHandlerInterface;
+
+/**
+ * Listen for all changes and record them in order to reuse later.
+ */
+class SchemaListener
+{
+    /**
+     * Ignore all ddl queries.
+     */
+    const IGNORE_ON = 0;
+
+    /**
+     * Disable ignore mode.
+     */
+    const IGNORE_OFF = 1;
+
+    /**
+     * Staging FK keys installer key. Indicates that changes should be moved from ordinary module to staging module.
+     */
+    const STAGING_FK_KEYS = 2;
+
+    /**
+     * @var array
+     */
+    private $tables = [];
+
+    /**
+     * @var string
+     */
+    private $resource;
+
+    /**
+     * This flag allows to ignore some DDL operations.
+     *
+     * @var bool
+     */
+    private $ignore = self::IGNORE_OFF;
+
+    /**
+     * @var array
+     */
+    private static $mapping = [
+        'DATA_TYPE' => 'type',
+        'COLUMN_NAME' => 'name',
+        'TYPE' => 'type',
+        'DEFAULT' => 'default',
+        'NULLABLE' => 'nullable',
+        'LENGTH' => 'length',
+        'PRECISION' => 'precision',
+        'SCALE' => 'scale',
+        'UNSIGNED' => 'unsigned',
+        'IDENTITY' => 'identity',
+        'PRIMARY' => 'primary'
+    ];
+
+    /**
+     * @var array
+     */
+    private static $toUnset = [
+        'COLUMN_POSITION',
+        'COLUMN_TYPE',
+        'PRIMARY_POSITION',
+        'COMMENT'
+    ];
+
+    /**
+     * @var string
+     */
+    private $moduleName = '';
+
+    /**
+     * @var DefinitionConverterInterface[]
+     */
+    private $definitionMappers;
+
+    /**
+     * @var SchemaListenerHandlerInterface[]
+     */
+    private $handlers;
+
+    /**
+     * Constructor.
+     *
+     * @param array $definitionMappers
+     * @param array $handlers
+     */
+    public function __construct(
+        array $definitionMappers,
+        array $handlers = []
+    ) {
+        $this->definitionMappers = $definitionMappers;
+        $this->handlers = $handlers;
+    }
+
+    /**
+     * Drop foreign key in table by name.
+     *
+     * @param string $tableName
+     * @param string $fkName
+     */
+    public function dropForeignKey($tableName, $fkName)
+    {
+        $dataToLog['constraints']['foreign'][$fkName] = [
+            'disabled' => true,
+        ];
+        $this->log($tableName, $dataToLog);
+    }
+
+    /**
+     * Cast column definition.
+     *
+     * @param array $definition
+     * @param string $columnName
+     * @return array
+     */
+    private function castColumnDefinition($definition, $columnName)
+    {
+        if (is_string($definition)) {
+            $definition = ['type' => $definition];
+        }
+        $definition = $this->doColumnMapping($definition);
+        $definition['name'] = strtolower($columnName);
+        $definitionType = $definition['type'] === 'int' ? 'integer' : $definition['type'];
+        $definition = $this->definitionMappers[$definitionType]->convertToDefinition($definition);
+        if (isset($definition['default']) && $definition['default'] === false) {
+            $definition['default'] = null; //uniform default values
+        }
+        $definition['disabled'] = false;
+
+        return $definition;
+    }
+
+    /**
+     * Add primary key if exists in definition.
+     *
+     * @param string $tableName
+     * @param string $columnName
+     * @param array $definition
+     * @param string $primaryKeyName
+     * @return array
+     */
+    private function addPrimaryKeyIfExists($tableName, $columnName, $definition, $primaryKeyName)
+    {
+        if (isset($definition['primary']) && $definition['primary']) {
+            $dataToLog['constraints']['primary'][$primaryKeyName] = [
+                'type' => 'primary',
+                'name' => $primaryKeyName,
+                'disabled' => false,
+                'columns' => [$columnName => strtolower($columnName)]
+            ];
+
+            $this->log($tableName, $dataToLog);
+        }
+
+        unset($definition['primary']);
+        return $definition;
+    }
+
+    /**
+     * Rename table.
+     *
+     * @param string $oldTableName
+     * @param string $newTableName
+     * @return void
+     */
+    public function renameTable($oldTableName, $newTableName)
+    {
+        $moduleName = $this->getModuleName();
+
+        if (isset($this->tables[$moduleName][strtolower($oldTableName)])) {
+            $this->tables[$moduleName][strtolower($newTableName)] =
+                $this->tables[$moduleName][strtolower($oldTableName)];
+            unset($this->tables[$moduleName][strtolower($oldTableName)]);
+        }
+    }
+
+    /**
+     * Process definition to not specific format.
+     *
+     * @param array $definition
+     * @return array
+     */
+    private function doColumnMapping(array $definition)
+    {
+        foreach ($definition as $key => $keyValue) {
+            if (isset(self::$mapping[$key])) {
+                $definition[self::$mapping[$key]] = $keyValue;
+                unset($definition[$key]);
+            }
+
+            if (in_array($key, self::$toUnset)) {
+                unset($definition[$key]);
+            }
+        }
+
+        return $definition;
+    }
+
+    /**
+     * Add column.
+     *
+     * @param string $tableName
+     * @param string $columnName
+     * @param array $definition
+     * @param string $primaryKeyName
+     * @param null $onCreate
+     */
+    public function addColumn($tableName, $columnName, $definition, $primaryKeyName = 'PRIMARY', $onCreate = null)
+    {
+        $definition = $this->castColumnDefinition($definition, $columnName);
+        $definition = $this->addPrimaryKeyIfExists($tableName, $columnName, $definition, $primaryKeyName);
+        $definition['onCreate'] = $onCreate;
+        $dataToLog['columns'][strtolower($columnName)] = $definition;
+        $this->log($tableName, $dataToLog);
+    }
+
+    /**
+     * Drop index.
+     *
+     * @param string $tableName
+     * @param string $keyName
+     * @param string $indexType
+     */
+    public function dropIndex($tableName, $keyName, $indexType)
+    {
+        if ($indexType === 'index') {
+            $dataToLog['indexes'][$keyName] = [
+                'disabled' => true
+            ];
+        } else {
+            $dataToLog['constraints'][$indexType][$keyName] = [
+                'disabled' => true
+            ];
+        }
+
+        $this->log($tableName, $dataToLog);
+    }
+
+    /**
+     * Do drop column.
+     *
+     * @param string $tableName
+     * @param string $columnName
+     */
+    public function dropColumn($tableName, $columnName)
+    {
+        $dataToLog['columns'][strtolower($columnName)] = [
+            'disabled' => true
+        ];
+        $this->log($tableName, $dataToLog);
+    }
+
+    /**
+     * Change column is the same as rename.
+     *
+     * @param string $tableName
+     * @param string $oldColumnName
+     * @param string $newColumnName
+     * @param array $definition
+     */
+    public function changeColumn($tableName, $oldColumnName, $newColumnName, $definition)
+    {
+        foreach ($this->handlers as $handler) {
+            $this->tables = $handler->handle(
+                $this->moduleName,
+                $this->tables,
+                [
+                    'table' => $tableName,
+                    'old_column' => $oldColumnName,
+                    'new_column' => $newColumnName,
+                ],
+                $definition
+            );
+        }
+
+        $this->dropColumn($tableName, $oldColumnName);
+        $this->addColumn(
+            $tableName,
+            $newColumnName,
+            $definition,
+            'STAGING_PRIMARY',
+            sprintf('migrateDataFrom(%s)', $oldColumnName)
+        );
+    }
+
+    /**
+     * Modify column.
+     *
+     * @param string $tableName
+     * @param string $columnName
+     * @param array $definition
+     */
+    public function modifyColumn($tableName, $columnName, $definition)
+    {
+        $this->addColumn($tableName, $columnName, $definition);
+    }
+
+    /**
+     * Retrieved processed module name.
+     *
+     * @return string
+     */
+    private function getModuleName()
+    {
+        return $this->moduleName;
+    }
+
+    /**
+     * Log any change done.
+     *
+     * @param string $tableName
+     * @param array $dataToLog
+     * @return void
+     */
+    public function log($tableName, array $dataToLog)
+    {
+        if ($this->ignore & self::IGNORE_OFF === 0) {
+            return;
+        }
+        $moduleName = $this->getModuleName();
+        if (isset($this->tables[$moduleName][strtolower($tableName)])) {
+            $this->tables[$moduleName][strtolower($tableName)] = array_replace_recursive(
+                $this->tables[$moduleName][strtolower($tableName)],
+                $dataToLog
+            );
+        } else {
+            $this->tables[$moduleName][strtolower($tableName)] = $dataToLog;
+        }
+
+        $this->tables[$moduleName][strtolower($tableName)]['resource'] = $this->resource;
+    }
+
+    /**
+     * Add foreign key constraint.
+     *
+     * @param string $fkName
+     * @param string $tableName
+     * @param string $columnName
+     * @param string $refTableName
+     * @param string $refColumnName
+     * @param string $onDelete
+     */
+    public function addForeignKey(
+        $fkName,
+        $tableName,
+        $columnName,
+        $refTableName,
+        $refColumnName,
+        $onDelete = AdapterInterface::FK_ACTION_CASCADE
+    ) {
+        $dataToLog['constraints']['foreign'][$fkName] =
+            [
+                'table' => strtolower($tableName),
+                'column' => strtolower($columnName),
+                'referenceTable' => strtolower($refTableName),
+                'referenceColumn' => strtolower($refColumnName),
+                'onDelete' => $onDelete,
+                'disabled' => false
+            ];
+        $this->log($tableName, $dataToLog);
+    }
+
+    /**
+     * Convert all index columns to lower case.
+     *
+     * @param array $indexColumns
+     * @return array
+     */
+    private function prepareIndexColumns(array $indexColumns)
+    {
+        $columnNames = [];
+
+        foreach ($indexColumns as $key => $indexColumn) {
+            if (is_array($indexColumn)) {
+                $columnNames[strtolower($key)] = strtolower($key);
+            } else {
+                $columnNames[$indexColumn] = $indexColumn;
+            }
+        }
+
+        return $columnNames;
+    }
+
+    /**
+     * Add index for table column(s).
+     *
+     * @param string $tableName
+     * @param string $indexName
+     * @param array $fields
+     * @param string $indexType
+     * @param string $indexAlhoritm
+     */
+    public function addIndex(
+        $tableName,
+        $indexName,
+        $fields,
+        $indexType = AdapterInterface::INDEX_TYPE_INDEX,
+        $indexAlhoritm = 'btree'
+    ) {
+        if (!is_array($fields)) {
+            $fields = [$fields];
+        }
+        if ($indexType == AdapterInterface::INDEX_TYPE_FULLTEXT || $indexType === AdapterInterface::INDEX_TYPE_INDEX) {
+            if ($indexType === AdapterInterface::INDEX_TYPE_INDEX) {
+                $indexType = $indexAlhoritm;
+            }
+            $dataToLog['indexes'][$indexName] =
+                [
+                    'columns' => $this->prepareIndexColumns($fields),
+                    'indexType' => $indexType,
+                    'disabled' => false
+                ];
+        } else {
+            $dataToLog['constraints'][$indexType][$indexName] =
+                ['columns' => $this->prepareIndexColumns($fields), 'disabled' => false];
+        }
+
+        $this->log($tableName, $dataToLog);
+    }
+
+    /**
+     * Prepare table columns to registration.
+     *
+     * @param string $tableName
+     * @param array $tableColumns
+     */
+    private function prepareColumns($tableName, array $tableColumns)
+    {
+        foreach ($tableColumns as $name => $tableColumn) {
+            $this->addColumn($tableName, $name, $tableColumn);
+        }
+    }
+
+    /**
+     * Convert constraints from old format to new one.
+     *
+     * @param array $foreignKeys
+     * @param array $indexes
+     * @param string $tableName
+     */
+    private function prepareConstraintsAndIndexes(array $foreignKeys, array $indexes, $tableName, $engine)
+    {
+        //Process foreign keys
+        foreach ($foreignKeys as $name => $foreignKey) {
+            $this->addForeignKey(
+                $name,
+                $tableName,
+                $foreignKey['COLUMN_NAME'],
+                $foreignKey['REF_TABLE_NAME'],
+                $foreignKey['REF_COLUMN_NAME'],
+                $foreignKey['ON_DELETE']
+            );
+        }
+        //Process indexes
+        foreach ($indexes as $name => $index) {
+            $this->addIndex(
+                $tableName,
+                $name,
+                $index['COLUMNS'],
+                $index['TYPE'],
+                $engine === 'memory' ? 'hash' : 'btree'
+            );
+        }
+    }
+
+    /**
+     * Create table.
+     *
+     * @param Table $table
+     */
+    public function createTable(Table $table)
+    {
+        $engine = strtolower($table->getOption('type'));
+        $this->tables[$this->getModuleName()][strtolower($table->getName())]['engine'] = $engine;
+        $this->prepareColumns($table->getName(), $table->getColumns());
+        $this->prepareConstraintsAndIndexes($table->getForeignKeys(), $table->getIndexes(), $table->getName(), $engine);
+    }
+
+    /**
+     * Flush all tables.
+     *
+     * @return void
+     */
+    public function flush()
+    {
+        $this->tables = [];
+    }
+
+    /**
+     * Turn on/off ignore mode.
+     *
+     * @param bool $flag
+     */
+    public function toogleIgnore($flag)
+    {
+        $this->ignore = $flag;
+    }
+
+    /**
+     * Drop table.
+     *
+     * @param $tableName
+     */
+    public function dropTable($tableName)
+    {
+        if (isset($this->tables[$this->getModuleName()][strtolower($tableName)])) {
+            unset($this->tables[$this->getModuleName()][strtolower($tableName)]);
+        } else {
+            $this->tables[$this->getModuleName()][strtolower($tableName)]['disabled'] = true;
+        }
+    }
+
+    /**
+     * Set resource.
+     *
+     * @param string $resource
+     */
+    public function setResource(string $resource)
+    {
+        $this->resource = $resource;
+    }
+
+    /**
+     * Set module name.
+     *
+     * @param string $moduleName
+     */
+    public function setModuleName($moduleName)
+    {
+        $this->moduleName = $moduleName;
+    }
+
+    /**
+     * Get tables.
+     *
+     * @return array
+     */
+    public function getTables()
+    {
+        return $this->tables;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/BooleanDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/BooleanDefinition.php
new file mode 100644
index 0000000000000..a1d135ba11f18
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/BooleanDefinition.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+/**
+ * Boolean type definition.
+ */
+class BooleanDefinition implements DefinitionConverterInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function convertToDefinition(array $definition)
+    {
+        return [
+            'xsi:type' => $definition['type'],
+            'name' => $definition['name'],
+            'nullable' => $definition['nullable'] ?? true,
+            'default' => isset($definition['default']) ? (bool) $definition['default'] : null
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/DateDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/DateDefinition.php
new file mode 100644
index 0000000000000..69396d2cb2224
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/DateDefinition.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+/**
+ * Date type definition.
+ */
+class DateDefinition implements DefinitionConverterInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function convertToDefinition(array $definition)
+    {
+        return [
+            'xsi:type' => 'date',
+            'name' => $definition['name'],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/DefinitionConverterInterface.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/DefinitionConverterInterface.php
new file mode 100644
index 0000000000000..f273d5d35f012
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/DefinitionConverterInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+/**
+ * Definition formatting interface.
+ */
+interface DefinitionConverterInterface
+{
+    /**
+     * Takes definition and convert to new format.
+     *
+     * @param array $definition
+     * @return array
+     */
+    public function convertToDefinition(array $definition);
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/IntegerDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/IntegerDefinition.php
new file mode 100644
index 0000000000000..b89cef1a35244
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/IntegerDefinition.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+/**
+ * Convert definition for all integer types: int, smallint, bigint, tinyint, mediumint.
+ */
+class IntegerDefinition implements DefinitionConverterInterface
+{
+    /**
+     * If length is not specified we will use next numbers.
+     *
+     * @var array
+     */
+    private static $lengthDefaults = [
+        'tinyint' => 3,
+        'smallint' => 6,
+        'mediumint' => 8,
+        'int' => 11,
+        'bigint' => 20
+    ];
+
+    /**
+     * @var BooleanDefinition
+     */
+    private $booleanDefinition;
+
+    /**
+     * IntegerDefinition constructor.
+     *
+     * @param BooleanDefinition $booleanDefinition
+     */
+    public function __construct(BooleanDefinition $booleanDefinition)
+    {
+        $this->booleanDefinition = $booleanDefinition;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function convertToDefinition(array $definition)
+    {
+        if ($definition['type'] === 'integer') {
+            $definition['type'] = 'int';
+        }
+
+        if (isset($definition['length']) && (int) $definition['length'] === 1) {
+            $definition['type'] = 'boolean';
+            return $this->booleanDefinition->convertToDefinition($definition);
+        }
+        $length = $definition['length'] ?? self::$lengthDefaults[$definition['type']];
+        $unsigned = $definition['unsigned'] ?? false;
+
+        if ((bool) $unsigned && in_array($definition['type'], ['int', 'smallint'])) {
+            $length--;
+        }
+
+        return [
+            'xsi:type' => $definition['type'],
+            'name' => $definition['name'],
+            'padding' => $length,
+            'unsigned' => $unsigned,
+            'nullable' => $definition['nullable'] ?? true,
+            'identity' => $definition['identity'] ?? false,
+            'default' => isset($definition['default']) && $definition['default'] !== false ?
+                (int) $definition['default'] : null,
+            'primary' => $definition['primary'] ?? false
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/RealDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/RealDefinition.php
new file mode 100644
index 0000000000000..2c8a6c284dfd8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/RealDefinition.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+/**
+ * Convert definition for all real types: decimal, float, double.
+ */
+class RealDefinition implements DefinitionConverterInterface
+{
+    /**
+     * Decimal, double and float have different default values.
+     *
+     * @var array
+     */
+    private static $shapeByType = [
+        'float' => [
+            'precision' => '0',
+            'scale' => '0'
+        ],
+        'decimal' => [
+            'precision' => '0',
+            'scale' => '10'
+        ],
+        'double' => [
+            'precision' => '0',
+            'scale' => '0'
+        ]
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function convertToDefinition(array $definition)
+    {
+        if (isset($definition['length'])) {
+            list($definition['precision'], $definition['scale']) = explode(",", $definition['length']);
+        }
+        return [
+            'xsi:type' => $definition['type'],
+            'name' => $definition['name'],
+            //In previous adapter this 2 fields were switched, so we need to switch again
+            'scale' => $definition['scale'] ?? self::$shapeByType[$definition['type']]['scale'],
+            'precision' => $definition['precision'] ?? self::$shapeByType[$definition['type']]['precision'],
+            'unsigned' => $definition['unsigned'] ?? false,
+            'nullable' => $definition['nullable'] ?? true,
+            'default' => isset($definition['default']) && $definition['default'] !== false ?
+                (int) $definition['default'] : null,
+            'primary' => $definition['primary'] ?? false
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php
new file mode 100644
index 0000000000000..9e8d63b26cfca
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TextBlobDefinition.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+use Magento\Framework\DB\Ddl\Table;
+
+/**
+ * Convert definition for all text/blob types: tiny-, medium-, long- text(s) and blob(s).
+ */
+class TextBlobDefinition implements DefinitionConverterInterface
+{
+    /**
+     * Parse text size.
+     *
+     * Returns max allowed size if value great it.
+     *
+     * @param string|int $size
+     * @return int
+     */
+    private function parseTextSize($size)
+    {
+        $size = trim($size);
+        $last = strtolower(substr($size, -1));
+
+        switch ($last) {
+            case 'k':
+                $size = (int)$size * 1024;
+                break;
+            case 'm':
+                $size = (int)$size * 1024 * 1024;
+                break;
+            case 'g':
+                $size = (int)$size * 1024 * 1024 * 1024;
+                break;
+        }
+
+        if (empty($size)) {
+            return Table::DEFAULT_TEXT_SIZE;
+        }
+        if ($size >= Table::MAX_TEXT_SIZE) {
+            return Table::MAX_TEXT_SIZE;
+        }
+
+        return (int)$size;
+    }
+
+    /**
+     * Retrieve type of column by it length.
+     *
+     * @param string $ddlType
+     * @param int $length
+     * @return string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function getCTypeByLength($ddlType, $length)
+    {
+        if ($length > 0 && $length <= 255) {
+            $cType = $ddlType == Table::TYPE_TEXT ? 'varchar' : 'varbinary';
+        } elseif ($length > 255 && $length <= 65536) {
+            $cType = $ddlType == Table::TYPE_TEXT ? 'text' : 'blob';
+        } elseif ($length > 65536 && $length <= 16777216) {
+            $cType = $ddlType == Table::TYPE_TEXT ? 'mediumtext' : 'mediumblob';
+        } else {
+            $cType = $ddlType == Table::TYPE_TEXT ? 'longtext' : 'longblob';
+        }
+
+        return $cType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function convertToDefinition(array $definition)
+    {
+        $length = $this->parseTextSize($definition['length'] ?? 0);
+        $ddlType = $definition['type'];
+        $cType = $this->getCTypeByLength($ddlType, $length);
+
+        $newDefinition = [
+            'xsi:type' => $cType,
+            'name' => $definition['name'],
+            'nullable' => $definition['nullable'] ?? true,
+            'primary' => $definition['primary'] ?? false
+        ];
+
+        if (in_array($cType, ['varchar', 'varbinary'])) {
+            $newDefinition['length'] = $length;
+            $newDefinition['default'] = $definition['default'] ?? null;
+        }
+
+        return $newDefinition;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TimestampDefinition.php b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TimestampDefinition.php
new file mode 100644
index 0000000000000..c6924e5f87ade
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerDefinition/TimestampDefinition.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerDefinition;
+
+use Magento\Framework\DB\Ddl\Table;
+
+/**
+ * Convert definition for all text types: timestamp, datetime.
+ */
+class TimestampDefinition implements DefinitionConverterInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function convertToDefinition(array $definition)
+    {
+        $cDefault = $definition['default'] ?? null;
+        $cNullable = $definition['nullable'] ?? true;
+        $onUpdate = false;
+        if ($cDefault === null && !$cNullable) {
+            $cDefault = 'NULL';
+        } elseif ($cDefault == Table::TIMESTAMP_INIT) {
+            $cDefault = 'CURRENT_TIMESTAMP';
+        } elseif ($cDefault == Table::TIMESTAMP_UPDATE) {
+            $cDefault = '0';
+            $onUpdate = true;
+        } elseif ($cDefault == Table::TIMESTAMP_INIT_UPDATE) {
+            $cDefault = 'CURRENT_TIMESTAMP';
+            $onUpdate = true;
+        } elseif (!$cNullable && !$cDefault && $definition['type'] === 'timestamp') {
+            $cDefault = 'CURRENT_TIMESTAMP';
+            $onUpdate = true;
+            $cNullable = true;
+        }
+
+        return [
+            'xsi:type' => $definition['type'],
+            'name' => $definition['name'],
+            'on_update' => $onUpdate,
+            'nullable' => $cNullable,
+            'default' => $cDefault
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaListenerHandlers/SchemaListenerHandlerInterface.php b/lib/internal/Magento/Framework/Setup/SchemaListenerHandlers/SchemaListenerHandlerInterface.php
new file mode 100644
index 0000000000000..b55127fb7e4d8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaListenerHandlers/SchemaListenerHandlerInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\SchemaListenerHandlers;
+
+/**
+ * Here we will put schema listener handlers.
+ */
+interface SchemaListenerHandlerInterface
+{
+    /**
+     * Handle schema changes.
+     *
+     * @param string $moduleName
+     * @param array $tables
+     * @param array $params Params consist data as old_column_name, new_column_name, table_name, etc
+     * @param array $definition
+     * @return mixed
+     */
+    public function handle($moduleName, $tables, array $params, $definition);
+}
diff --git a/lib/internal/Magento/Framework/Setup/SchemaPersistor.php b/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
new file mode 100644
index 0000000000000..f3af56b8ac2ca
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Shell;
+
+/**
+ * Persist listened schema to db_schema.xml file.
+ */
+class SchemaPersistor
+{
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var XmlPersistor
+     */
+    private $xmlPersistor;
+
+    /**
+     * Constructor.
+     *
+     * @param ComponentRegistrar $componentRegistrar
+     * @param XmlPersistor $xmlPersistor
+     */
+    public function __construct(ComponentRegistrar $componentRegistrar, XmlPersistor $xmlPersistor)
+    {
+        $this->componentRegistrar = $componentRegistrar;
+        $this->xmlPersistor = $xmlPersistor;
+    }
+
+    /**
+     * Initialize bare DOM XML element.
+     *
+     * @return \SimpleXMLElement
+     */
+    private function initEmptyDom()
+    {
+        return new \SimpleXMLElement(
+            '<schema 
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+            </schema>'
+        );
+    }
+
+    /**
+     * Do persist by modules to db_schema.xml file.
+     *
+     * @param SchemaListener $schemaListener
+     */
+    public function persist(SchemaListener $schemaListener)
+    {
+        foreach ($schemaListener->getTables() as $moduleName => $tablesData) {
+            $path = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+            if (empty($path)) {
+                /** Empty path means that module does not exist */
+                continue;
+            }
+            $schemaPatch = sprintf('%s/etc/db_schema.xml', $path);
+            if (file_exists($schemaPatch)) {
+                $dom = new \SimpleXMLElement(file_get_contents($schemaPatch));
+            } else {
+                $dom = $this->initEmptyDom();
+            }
+
+            foreach ($tablesData as $tableName => $tableData) {
+                $tableData = $this->handleDefinition($tableData);
+                $table = $dom->addChild('table');
+                $table->addAttribute('name', $tableName);
+                $table->addAttribute('resource', $tableData['resource']);
+                if (isset($tableData['engine']) && $tableData['engine'] !== null) {
+                    $table->addAttribute('engine', $tableData['engine']);
+                }
+
+                $this->processColumns($tableData, $table);
+                $this->processConstraints($tableData, $table);
+                $this->processIndexes($tableData, $table);
+            }
+
+            $this->persistModule($dom, $schemaPatch);
+        }
+    }
+
+    /**
+     * If disabled attribute is set to false it remove it at all.
+     * Also handle other generic attributes.
+     *
+     * @param array $definition
+     * @return array
+     */
+    private function handleDefinition(array $definition)
+    {
+        if (isset($definition['disabled']) && !$definition['disabled']) {
+            unset($definition['disabled']);
+        }
+
+        return $definition;
+    }
+
+    /**
+     * Cast boolean types to string.
+     *
+     * @param bool $boolean
+     * @return string
+     */
+    private function castBooleanToString($boolean)
+    {
+        return $boolean ? 'true' : 'false';
+    }
+
+    /**
+     * Convert columns from array to XML format.
+     *
+     * @param array $tableData
+     * @param \SimpleXMLElement $table
+     * @return \SimpleXMLElement
+     */
+    private function processColumns(array $tableData, \SimpleXMLElement $table)
+    {
+        if (isset($tableData['columns'])) {
+            foreach ($tableData['columns'] as $columnData) {
+                $columnData = $this->handleDefinition($columnData);
+                $domColumn = $table->addChild('column');
+                $domColumn->addAttribute('xsi:type', $columnData['xsi:type'], 'xsi');
+                unset($columnData['xsi:type']);
+
+                foreach ($columnData as $attributeKey => $attributeValue) {
+                    if ($attributeValue === null) {
+                        continue;
+                    }
+
+                    if (is_bool($attributeValue)) {
+                        $attributeValue = $this->castBooleanToString($attributeValue);
+                    }
+
+                    $domColumn->addAttribute($attributeKey, $attributeValue);
+                }
+            }
+        }
+
+        return $table;
+    }
+
+    /**
+     * Convert columns from array to XML format.
+     *
+     * @param array $tableData
+     * @param \SimpleXMLElement $table
+     * @return \SimpleXMLElement
+     */
+    private function processIndexes(array $tableData, \SimpleXMLElement $table)
+    {
+        if (isset($tableData['indexes'])) {
+            foreach ($tableData['indexes'] as $indexName => $indexData) {
+                $indexData = $this->handleDefinition($indexData);
+                $domIndex = $table->addChild('index');
+                $domIndex->addAttribute('name', $indexName);
+
+                if (isset($indexData['disabled']) && $indexData['disabled']) {
+                    $domIndex->addAttribute('disabled', true);
+                } else {
+                    $domIndex->addAttribute('indexType', $indexData['indexType']);
+
+                    foreach ($indexData['columns'] as $column) {
+                        $columnXml = $domIndex->addChild('column');
+                        $columnXml->addAttribute('name', $column);
+                    }
+                }
+            }
+        }
+
+        return $table;
+    }
+
+    /**
+     * Convert constraints from array to XML format.
+     *
+     * @param array $tableData
+     * @param \SimpleXMLElement $table
+     * @return \SimpleXMLElement
+     */
+    private function processConstraints(array $tableData, \SimpleXMLElement $table)
+    {
+        if (isset($tableData['constraints'])) {
+            foreach ($tableData['constraints'] as $constraintType => $constraints) {
+                if ($constraintType === 'foreign') {
+                    foreach ($constraints as $name => $constraintData) {
+                        $constraintData = $this->handleDefinition($constraintData);
+                        $constraintDom = $table->addChild('constraint');
+                        $constraintDom->addAttribute('xsi:type', $constraintType, 'xsi');
+                        $constraintDom->addAttribute('name', $name);
+
+                        foreach ($constraintData as $attributeKey => $attributeValue) {
+                            $constraintDom->addAttribute($attributeKey, $attributeValue);
+                        }
+                    }
+                } else {
+                    foreach ($constraints as $name => $constraintData) {
+                        $constraintData = $this->handleDefinition($constraintData);
+                        $constraintDom = $table->addChild('constraint');
+                        $constraintDom->addAttribute('xsi:type', $constraintType, 'xsi');
+                        $constraintDom->addAttribute('name', $name);
+                        $constraintData['columns'] = $constraintData['columns'] ?? [];
+
+                        if (isset($constraintData['disabled'])) {
+                            $constraintDom->addAttribute('disabled', (bool) $constraintData['disabled']);
+                        }
+
+                        foreach ($constraintData['columns'] as $column) {
+                            $columnXml = $constraintDom->addChild('column');
+                            $columnXml->addAttribute('name', $column);
+                        }
+                    }
+                }
+            }
+        }
+
+        return $table;
+    }
+
+    /**
+     * Do schema persistence to specific module.
+     *
+     * @param \SimpleXMLElement $simpleXmlElementDom
+     * @param string $path
+     * @return void
+     */
+    private function persistModule(\SimpleXMLElement $simpleXmlElementDom, $path)
+    {
+        $this->xmlPersistor->persist($simpleXmlElementDom, $path);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/BackupRollbackTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/BackupRollbackTest.php
index 1f9b776abab0a..abe05e45248bf 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/BackupRollbackTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/BackupRollbackTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Setup\Test\Unit;
 
 use Magento\Framework\Backup\Factory;
@@ -138,7 +139,7 @@ public function testCodeRollback()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The rollback file does not exist.
+     * @expectedExceptionMessage The rollback file doesn't exist. Verify the file and try again.
      */
     public function testCodeRollbackWithInvalidFilePath()
     {
@@ -150,7 +151,7 @@ public function testCodeRollbackWithInvalidFilePath()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid rollback file.
+     * @expectedExceptionMessage The rollback file is invalid. Verify the file and try again.
      */
     public function testCodeRollbackWithInvalidFileType()
     {
@@ -181,6 +182,7 @@ public function testMediaRollback()
     public function testDbBackup()
     {
         $this->setupDbBackupRollback();
+        $this->database->expects($this->once())->method('getBackupFilename')->willReturn('RollbackFile_A.gz');
         $this->database->expects($this->once())->method('create');
         $this->file->expects($this->once())->method('isExists')->willReturn(false);
         $this->file->expects($this->once())->method('createDirectory');
@@ -190,12 +192,20 @@ public function testDbBackup()
     public function testDbRollback()
     {
         $this->setupDbBackupRollback();
+
         $this->database->expects($this->once())->method('rollback');
+        $this->database->expects($this->exactly(2))->method('getBackupFilename')
+            ->willReturnOnConsecutiveCalls('test', '1510140748_db_test_backup');
+        $this->database->expects($this->once())->method('getTime')->willReturn(1510140748);
+        $this->database->expects($this->once())->method('getType')->willReturn('db');
+        $this->database->expects($this->once())->method('setName')->with(' test backup');
+
         $this->file->expects($this->once())
             ->method('isExists')
-            ->with($this->path . '/backups/12345_db.sql')
+            ->with($this->path . '/backups/1510140748_db_test_backup.sql')
             ->willReturn(true);
-        $this->model->dbRollback('12345_db.sql');
+
+        $this->model->dbRollback('1510140748_db_test_backup.sql');
     }
 
     private function setupCodeBackupRollback()
@@ -226,9 +236,6 @@ private function setupDbBackupRollback()
             ->method('setBackupExtension');
         $this->database->expects($this->once())
             ->method('setTime');
-        $this->database->expects($this->once())
-            ->method('getBackupFilename')
-            ->willReturn('RollbackFile_A.gz');
         $this->database->expects($this->atLeastOnce())
             ->method('getBackupPath')
             ->willReturn('pathToFile/12345_db.sql');
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
new file mode 100644
index 0000000000000..80b0517f7bfd3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Config;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
+
+/**
+ * Test for Converter class.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Config.
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->converter = $this->objectManager->getObject(
+            Converter::class
+        );
+    }
+
+    /**
+     * Test converting table schema to array.
+     */
+    public function testConvert()
+    {
+        $dom = new \DOMDocument();
+        $dom->loadXML(
+            '<?xml version="1.0"?>
+            <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+                <table name="test_table" resource="default">
+                    <column xsi:type="int" name="id" nullable="false" identity="true" comment="Id"/>
+                    <column xsi:type="varchar" name="data" length="100" identity="false" comment="Data"/>
+                    <constraint xsi:type="primary" referenceId="PRIMARY_INDEX">
+                        <column name="id"/>
+                    </constraint>
+                </table>
+            </schema>'
+        );
+        $result = $this->converter->convert($dom);
+        $this->assertEquals(
+            [
+                'table' => [
+                    'test_table' => [
+                        'column' => [
+                            'id' => [
+                                'type' => 'int',
+                                'name' => 'id',
+                                'nullable' => 'false',
+                                'identity' => 'true',
+                                'comment' => 'Id',
+                            ],
+                            'data' => [
+                                'type' => 'varchar',
+                                'name' => 'data',
+                                'length' => '100',
+                                'identity' => 'false',
+                                'comment' => 'Data',
+                            ],
+                        ],
+                        'constraint' => [
+                            'PRIMARY_INDEX' => [
+                                'column' => [
+                                    'id' => 'id',
+                                ],
+                                'type' => 'primary',
+                                'referenceId' => 'PRIMARY_INDEX',
+                            ],
+                        ],
+                        'name' => 'test_table',
+                        'resource' => 'default',
+                    ],
+                ],
+            ],
+            $result
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DefinitionAggregatorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DefinitionAggregatorTest.php
new file mode 100644
index 0000000000000..393b10d3e5033
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DefinitionAggregatorTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+/**
+ * Test for Definition Aggregator.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db
+ */
+class DefinitionAggregatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DefinitionAggregator
+     */
+    private $definitonAggregator;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var DbDefinitionProcessorInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
+     */
+    private $definitonProcessors;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $intDefProcessor = $this->getMockBuilder(DbDefinitionProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $varcharDefProcessor = $this->getMockBuilder(DbDefinitionProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->definitonProcessors = [
+            'int' => $intDefProcessor,
+            'varchar' => $varcharDefProcessor,
+        ];
+        $this->definitonAggregator = $this->objectManager->getObject(
+            DefinitionAggregator::class,
+            [
+                'definitionProcessors' => $this->definitonProcessors
+            ]
+        );
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Cannot process object to definition for type text
+     */
+    public function testToDefinition()
+    {
+        /** @var ElementInterface|\PHPUnit_Framework_MockObject_MockObject $columnInt */
+        $columnInt = $this->getMockBuilder(ElementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var ElementInterface|\PHPUnit_Framework_MockObject_MockObject $columnVarchar */
+        $columnVarchar = $this->getMockBuilder(ElementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var ElementInterface|\PHPUnit_Framework_MockObject_MockObject $columnText */
+        $columnText = $this->getMockBuilder(ElementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $columnInt->expects($this->any())->method('getType')->willReturn('int');
+        $columnVarchar->expects($this->any())->method('getType')->willReturn('varchar');
+        $columnText->expects($this->any())->method('getType')->willReturn('text');
+        $this->definitonProcessors['int']->expects($this->once())->method('toDefinition');
+        $this->definitonProcessors['varchar']->expects($this->once())->method('toDefinition');
+        $this->definitonAggregator->toDefinition($columnInt);
+        $this->definitonAggregator->toDefinition($columnVarchar);
+        $this->definitonAggregator->toDefinition($columnText);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * Cannot process definition to array for type text
+     */
+    public function testFromDefinition()
+    {
+        $data = [
+            'col_int' => [
+                'type' => 'int'
+            ],
+            'col_varchar' => [
+                'type' => 'varchar'
+            ],
+            'col_text' => [
+                'type' => 'text'
+            ],
+        ];
+        $this->definitonProcessors['int']->expects($this->once())->method('fromDefinition');
+        $this->definitonProcessors['varchar']->expects($this->once())->method('fromDefinition');
+        foreach ($data as $colData) {
+            $this->definitonAggregator->fromDefinition($colData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
new file mode 100644
index 0000000000000..9693aceac394e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+class BlobTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Blob
+     */
+    private $blob;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->blob = $this->objectManager->getObject(
+            Blob::class,
+            [
+                'nullable' => $this->nullableMock,
+                'comment' => $this->commentMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var ElementInterface|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(ElementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('blob');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NULL');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` blob NULL COMMENT "Comment"',
+            $this->blob->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param bool $expectedLength
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedLength = false)
+    {
+        $expectedData = [
+            'definition' => $definition,
+        ];
+        if ($expectedLength) {
+            $expectedData['length'] = $expectedLength;
+        }
+        $result = $this->blob->fromDefinition(['definition' => $definition]);
+        $this->assertEquals($expectedData, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            ['blob'],
+            ['tinyblob'],
+            ['mediumblob'],
+            ['longblob'],
+            ['text (555)', 555],
+            ['tinytext'],
+            ['mediumtext'],
+            ['longtext'],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
new file mode 100644
index 0000000000000..8e28df4f6d4e3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
+
+class BooleanTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean
+     */
+    private $boolean;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->boolean = $this->objectManager->getObject(
+            Boolean::class,
+            [
+                'nullable' => $this->nullableMock,
+                'comment' => $this->commentMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var BooleanColumn|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(BooleanColumn::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('blob');
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn(0);
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NULL');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` BOOLEAN NULL DEFAULT 0 COMMENT "Comment"',
+            $this->boolean->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test from definition conversion.
+     */
+    public function testFromDefinitionTinyInt()
+    {
+        $expectedData = [
+            'type' => 'boolean',
+            'unsigned' => false,
+            'default' => true,
+        ];
+        $result = $this->boolean->fromDefinition(
+            [
+                'type' => 'tinyint',
+                'padding' => '1',
+                'default' => '1'
+            ]
+        );
+        $this->assertEquals($expectedData, $result);
+        $expectedData = [
+            'type' => 'boolean',
+            'unsigned' => false,
+        ];
+        $result = $this->boolean->fromDefinition(
+            [
+                'type' => 'tinyint',
+                'padding' => '1',
+            ]
+        );
+        $this->assertEquals($expectedData, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
new file mode 100644
index 0000000000000..1c2b3ccd9785b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+
+class CommentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment
+     */
+    private $comment;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->comment = $this->objectManager->getObject(
+            Comment::class
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var Column|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(Column::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getComment')
+            ->willReturn('comment');
+        $this->assertEquals(
+            'COMMENT "comment"',
+            $this->comment->toDefinition($column)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
new file mode 100644
index 0000000000000..2c13795af2b9b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
+
+class DateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date
+     */
+    private $date;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->date = $this->objectManager->getObject(
+            Date::class,
+            [
+                'nullable' => $this->nullableMock,
+                'comment' => $this->commentMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var BooleanColumn|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(BooleanColumn::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('DATE');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NULL');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` DATE NULL COMMENT "Comment"',
+            $this->date->toDefinition($column)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
new file mode 100644
index 0000000000000..7e872a73ca5d9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
+
+/**
+ * Test for Identity DTO class.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns
+ */
+class IdentityTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment
+     */
+    private $identity;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Dto\Column|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $columnMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->columnMock = $this->getMockBuilder(\Magento\Framework\Setup\Declaration\Schema\Dto\Column::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isIdentity'])
+            ->getMock();
+        $this->identity = $this->objectManager->getObject(
+            Identity::class
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        $this->columnMock->expects($this->any())
+            ->method('isIdentity')
+            ->willReturn(true);
+        $this->assertEquals(
+            'AUTO_INCREMENT',
+            $this->identity->toDefinition($this->columnMock)
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinitionFalse()
+    {
+        $this->columnMock->expects($this->any())
+            ->method('isIdentity')
+            ->willReturn(false);
+        $this->assertEquals(
+            '',
+            $this->identity->toDefinition($this->columnMock)
+        );
+    }
+
+    /**
+     * Test from definition.
+     */
+    public function testFromDefinition()
+    {
+        $data = [
+            'extra' => 'NOT NULL AUTO_INCREMENT'
+        ];
+        $expectedData = $data;
+        $expectedData['identity'] = true;
+        $this->assertEquals(
+            $expectedData,
+            $this->identity->fromDefinition($data)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
new file mode 100644
index 0000000000000..823a587fd48f4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer as IntegerColumnDto;
+
+class IntegerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer
+     */
+    private $integer;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var Identity|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $identityMock;
+
+    /**
+     * @var Unsigned|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $unsignedMock;
+
+    /**
+     * @var Boolean|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $booleanMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->identityMock = $this->getMockBuilder(Identity::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->unsignedMock = $this->getMockBuilder(Unsigned::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->booleanMock = $this->getMockBuilder(Boolean::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->integer = $this->objectManager->getObject(
+            Integer::class,
+            [
+                'unsigned' => $this->unsignedMock,
+                'boolean' => $this->booleanMock,
+                'nullable' => $this->nullableMock,
+                'identity' => $this->identityMock,
+                'comment' => $this->commentMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var IntegerColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(IntegerColumnDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('int_column');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('int');
+        $column->expects($this->any())
+            ->method('getPadding')
+            ->willReturn(10);
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn(0);
+        $this->unsignedMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('UNSIGNED');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NOT NULL');
+        $this->identityMock->expects($this->any())
+            ->method('toDefinition')
+            ->willReturn('AUTO_INCREMENT');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('int_column')
+            ->willReturn('`int_column`');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NULL');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`int_column` int(10) UNSIGNED NOT NULL DEFAULT 0 AUTO_INCREMENT COMMENT "Comment"',
+            $this->integer->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param bool $expectedLength
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedLength = false)
+    {
+        $expectedData = [
+            'definition' => $definition,
+        ];
+        if ($expectedLength) {
+            $expectedData['padding'] = $expectedLength;
+        }
+        $this->unsignedMock->expects($this->any())->method('fromDefinition')->willReturnArgument(0);
+        $this->identityMock->expects($this->any())->method('fromDefinition')->willReturnArgument(0);
+        $this->nullableMock->expects($this->any())->method('fromDefinition')->willReturnArgument(0);
+        $this->booleanMock->expects($this->any())->method('fromDefinition')->willReturnArgument(0);
+        $result = $this->integer->fromDefinition(['definition' => $definition]);
+        $this->assertEquals($expectedData, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            ['int'],
+            ['int(10)', 10],
+            ['tinyint'],
+            ['mediumint(5)', 5],
+            ['mediumint'],
+            ['smallint(3)', 3],
+            ['smallint'],
+            ['bigint(10)', 10],
+            ['bigint'],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
new file mode 100644
index 0000000000000..43dda0271eaf8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+
+class NullableTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Nullable
+     */
+    private $nullable;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullable = $this->objectManager->getObject(
+            Nullable::class
+        );
+    }
+
+    /**
+     * Test conversion to definition of nullable column.
+     */
+    public function testToDefinition()
+    {
+        /** @var BooleanColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(BooleanColumnDto::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isNullable'])
+            ->getMock();
+        $column->expects($this->any())
+            ->method('isNullable')
+            ->willReturn(true);
+        $this->assertEquals(
+            'NULL',
+            $this->nullable->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition for not nullable column.
+     */
+    public function testToDefinitionNotNull()
+    {
+        /** @var BooleanColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(BooleanColumnDto::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isNullable'])
+            ->getMock();
+        $column->expects($this->any())
+            ->method('isNullable')
+            ->willReturn(false);
+        $this->assertEquals(
+            'NOT NULL',
+            $this->nullable->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition of not nullable aware class.
+     */
+    public function testToDefinitionNotNullableAware()
+    {
+        /** @var ElementInterface|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(ElementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->assertEquals(
+            '',
+            $this->nullable->toDefinition($column)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
new file mode 100644
index 0000000000000..f92795364b26a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\OnUpdate;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+
+class OnUpdateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var OnUpdate
+     */
+    private $onUpdate;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->onUpdate = $this->objectManager->getObject(
+            OnUpdate::class
+        );
+    }
+
+    /**
+     * Test conversion to definition of column with onUpdate statement.
+     */
+    public function testToDefinition()
+    {
+        /** @var Timestamp|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(Timestamp::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOnUpdate'])
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getOnUpdate')
+            ->willReturn('on update');
+        $this->assertEquals(
+            'ON UPDATE CURRENT_TIMESTAMP',
+            $this->onUpdate->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition of column with no onUpdate statement.
+     */
+    public function testToDefinitionNonUpdate()
+    {
+        /** @var Timestamp|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(Timestamp::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOnUpdate'])
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getOnUpdate')
+            ->willReturn(null);
+        $this->assertEquals(
+            '',
+            $this->onUpdate->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition of non-timestamp column.
+     */
+    public function testToDefinitionNonTimestamp()
+    {
+        /** @var BooleanColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(BooleanColumnDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->assertEquals(
+            '',
+            $this->onUpdate->toDefinition($column)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
new file mode 100644
index 0000000000000..348152cfae48c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real as RealColumnDto;
+
+class RealTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real
+     */
+    private $real;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var Unsigned|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $unsignedMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->unsignedMock = $this->getMockBuilder(Unsigned::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->real = $this->objectManager->getObject(
+            Real::class,
+            [
+                'nullable' => $this->nullableMock,
+                'unsigned' => $this->unsignedMock,
+                'resourceConnection' => $this->resourceConnectionMock,
+                'comment' => $this->commentMock,
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinitionNoScale()
+    {
+        /** @var RealColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(RealColumnDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('float');
+        $column->expects($this->any())
+            ->method('getPrecision')
+            ->willReturn(0);
+        $column->expects($this->any())
+            ->method('getScale')
+            ->willReturn(0);
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn(0);
+        $this->unsignedMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('UNSIGNED');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NOT NULL');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` float UNSIGNED NOT NULL DEFAULT 0 COMMENT "Comment"',
+            $this->real->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var RealColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(RealColumnDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('float');
+        $column->expects($this->any())
+            ->method('getPrecision')
+            ->willReturn(10);
+        $column->expects($this->any())
+            ->method('getScale')
+            ->willReturn(4);
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn(0);
+        $this->unsignedMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('UNSIGNED');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NOT NULL');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` float(10, 4) UNSIGNED NOT NULL DEFAULT 0 COMMENT "Comment"',
+            $this->real->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinitionNoDefault()
+    {
+        /** @var RealColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(RealColumnDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('float');
+        $column->expects($this->any())
+            ->method('getPrecision')
+            ->willReturn(10);
+        $column->expects($this->any())
+            ->method('getScale')
+            ->willReturn(4);
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn(null);
+        $this->unsignedMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('UNSIGNED');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NOT NULL');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` float(10, 4) UNSIGNED NOT NULL  COMMENT "Comment"',
+            $this->real->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param bool $expectedPrecision
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedPrecision = false, $expectedScale = false)
+    {
+        $expectedData = [
+            'definition' => $definition,
+        ];
+        if ($expectedPrecision) {
+            $expectedData['precision'] = $expectedPrecision;
+            $expectedData['scale'] = $expectedScale;
+        }
+        $this->unsignedMock->expects($this->any())->method('fromDefinition')->willReturnArgument(0);
+        $this->nullableMock->expects($this->any())->method('fromDefinition')->willReturnArgument(0);
+        $result = $this->real->fromDefinition(['definition' => $definition]);
+        $this->assertEquals($expectedData, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            ['float'],
+            ['float(10,4)', 10, 4],
+            ['float(10)', false, false],
+            ['decimal(10)', 10, 0],
+            ['decimal(10, 6)', 10, 6],
+            ['double(10, 6)', 10, 6],
+            ['double', false, false],
+            ['double(10)', false, false],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
new file mode 100644
index 0000000000000..c266acfd32277
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary as StringBinaryColumn;
+
+/**
+ * Test for StringBinary class.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns
+ */
+class StringBinaryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var StringBinary
+     */
+    private $stringBinary;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stringBinary = $this->objectManager->getObject(
+            StringBinary::class,
+            [
+                'nullable' => $this->nullableMock,
+                'comment' => $this->commentMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var StringBinaryColumn|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(StringBinaryColumn::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('varchar');
+        $column->expects($this->any())
+            ->method('getLength')
+            ->willReturn(50);
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn('test');
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        $this->nullableMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('NULL');
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        $this->assertEquals(
+            '`col` varchar(50) NULL DEFAULT "test" COMMENT "Comment"',
+            $this->stringBinary->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param bool $expectedLength
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedLength = false)
+    {
+        $expectedData = [
+            'definition' => $definition,
+        ];
+        if ($expectedLength) {
+            $expectedData['length'] = $expectedLength;
+        }
+        $result = $this->stringBinary->fromDefinition(['definition' => $definition]);
+        $this->assertEquals($expectedData, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            ['char'],
+            ['char(30)', 30],
+            ['varchar'],
+            ['varchar (30)', 30],
+            ['binary'],
+            ['binary(20)', 20],
+            ['varbinary'],
+            ['varbinary(44)', 44],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
new file mode 100644
index 0000000000000..b64d716368323
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\OnUpdate;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
+
+class TimestampTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp
+     */
+    private $timestamp;
+
+    /**
+     * @var Nullable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $nullableMock;
+
+    /**
+     * @var Comment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var OnUpdate|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $onUpdateMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->nullableMock = $this->getMockBuilder(Nullable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->commentMock = $this->getMockBuilder(Comment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->onUpdateMock = $this->getMockBuilder(OnUpdate::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->timestamp = $this->objectManager->getObject(
+            Timestamp::class,
+            [
+                'onUpdate' => $this->onUpdateMock,
+                'nullable' => $this->nullableMock,
+                'comment' => $this->commentMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     * @dataProvider toDefinitionProvider()
+     * @param string $default
+     * @param bool $nullable
+     * @param bool $onUpdate
+     * @param string $expectedStatement
+     */
+    public function testToDefinition($default, $nullable, $onUpdate, $expectedStatement)
+    {
+        /** @var BooleanColumn|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(BooleanColumn::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $column->expects($this->any())
+            ->method('getName')
+            ->willReturn('col');
+        $column->expects($this->any())
+            ->method('getType')
+            ->willReturn('DATETIME');
+        $column->expects($this->any())
+            ->method('getDefault')
+            ->willReturn($default);
+        $adapterMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $adapterMock->expects($this->once())
+            ->method('quoteIdentifier')
+            ->with('col')
+            ->willReturn('`col`');
+        if ($nullable) {
+            $this->nullableMock->expects($this->any())
+                ->method('toDefinition')
+                ->with($column)
+                ->willReturn('NULL');
+        } else {
+            $this->nullableMock->expects($this->any())
+                ->method('toDefinition')
+                ->with($column)
+                ->willReturn('NOT NULL');
+        }
+        $this->commentMock->expects($this->any())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn('COMMENT "Comment"');
+        if ($onUpdate) {
+            $this->onUpdateMock->expects($this->any())
+                ->method('toDefinition')
+                ->with($column)
+                ->willReturn('ON UPDATE CURRENT_TIMESTAMP');
+        }
+        $this->assertEquals(
+            $expectedStatement,
+            $this->timestamp->toDefinition($column)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function toDefinitionProvider()
+    {
+        return [
+            [
+                'default' => 'NULL', // xsd replaced for no default value set in xml
+                'nullable' => true,
+                'onUpdate' => 'CURRENT_TIMESTAMP',
+                'expectedStatement' => '`col` DATETIME NULL  ON UPDATE CURRENT_TIMESTAMP COMMENT "Comment"',
+            ],
+            [
+                'default' => 'NULL', // xsd replaced for no default value set in xml
+                'nullable' => true,
+                'onUpdate' => 'CURRENT_TIMESTAMP',
+                'expectedStatement' => '`col` DATETIME NULL  ON UPDATE CURRENT_TIMESTAMP COMMENT "Comment"',
+            ],
+            [
+                'default' => 'NULL', // xsd replaced for no default value set in xml
+                'nullable' => false,
+                'onUpdate' => 'CURRENT_TIMESTAMP',
+                'expectedStatement' => '`col` DATETIME NOT NULL  ON UPDATE CURRENT_TIMESTAMP COMMENT "Comment"',
+            ],
+            [
+                'default' => 'CURRENT_TIMESTAMP',
+                'nullable' => false,
+                'onUpdate' => false,
+                'expectedStatement' => '`col` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP  COMMENT "Comment"',
+            ],
+            [
+                'default' => 'CURRENT_TIMESTAMP',
+                'nullable' => true,
+                'onUpdate' => 'CURRENT_TIMESTAMP',
+                'expectedStatement' => '`col` DATETIME NULL DEFAULT CURRENT_TIMESTAMP '
+                    . 'ON UPDATE CURRENT_TIMESTAMP COMMENT "Comment"',
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
new file mode 100644
index 0000000000000..298d055218cb9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer as IntegerColumnDto;
+
+class UnsignedTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Unsigned
+     */
+    private $unsigned;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->unsigned = $this->objectManager->getObject(
+            Unsigned::class
+        );
+    }
+
+    /**
+     * Test conversion to definition of column with unsigned flag.
+     */
+    public function testToDefinition()
+    {
+        /** @var IntegerColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(IntegerColumnDto::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isUnsigned'])
+            ->getMock();
+        $column->expects($this->any())
+            ->method('isUnsigned')
+            ->willReturn(true);
+        $this->assertEquals(
+            'UNSIGNED',
+            $this->unsigned->toDefinition($column)
+        );
+    }
+
+    /**
+     * Test conversion to definition of column with no unsigned flag.
+     */
+    public function testToDefinitionNotUnsigned()
+    {
+        /** @var IntegerColumnDto|\PHPUnit_Framework_MockObject_MockObject $column */
+        $column = $this->getMockBuilder(IntegerColumnDto::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isUnsigned'])
+            ->getMock();
+        $column->expects($this->any())
+            ->method('isUnsigned')
+            ->willReturn(false);
+        $this->assertEquals(
+            '',
+            $this->unsigned->toDefinition($column)
+        );
+    }
+
+    public function testFromDefinition()
+    {
+        $data = [
+            'definition' => 'NOT NULL UNSIGNED'
+        ];
+        $expectedData = $data;
+        $expectedData['unsigned'] = true;
+        $this->assertEquals(
+            $expectedData,
+            $this->unsigned->fromDefinition($data)
+        );
+    }
+
+    public function testFromDefinitionSigned()
+    {
+        $data = [
+            'definition' => 'NOT NULL'
+        ];
+        $expectedData = $data;
+        $expectedData['unsigned'] = false;
+        $this->assertEquals(
+            $expectedData,
+            $this->unsigned->fromDefinition($data)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
new file mode 100644
index 0000000000000..90bd32712285e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Test for Foreign Key constraint definition.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints
+ */
+class ForeignKeyTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ForeignKey
+     */
+    private $foreignKey;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->foreignKey = $this->objectManager->getObject(
+            ForeignKey::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     */
+    public function testToDefinition()
+    {
+        /** @var Reference|\PHPUnit_Framework_MockObject_MockObject $constraint */
+        $constraint = $this->getMockBuilder(Reference::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $columnMock = $this->getMockBuilder(Column::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $refColumnMock = $this->getMockBuilder(Column::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tableMock = $this->getMockBuilder(Table::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $refTableMock = $this->getMockBuilder(Table::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $columnMock->expects($this->any())->method('getName')->willReturn('col_name');
+        $refColumnMock->expects($this->any())->method('getName')->willReturn('ref_col_name');
+        $constraint->expects($this->any())->method('getName')->willReturn('fk_name');
+        $constraint->expects($this->any())->method('getOnDelete')->willReturn('CASCADE');
+        $tableMock->expects($this->any())->method('getResource')->willReturn('default');
+        $constraint->expects($this->any())->method('getTable')->willReturn($tableMock);
+        $refTableMock->expects($this->any())->method('getName')->willReturn('ref_table');
+        $constraint->expects($this->any())->method('getReferenceTable')->willReturn($refTableMock);
+        $constraint->expects($this->any())->method('getColumn')->willReturn($columnMock);
+        $constraint->expects($this->any())->method('getReferenceColumn')->willReturn($refColumnMock);
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->with('default')
+            ->willReturn($adapterMock);
+        $this->resourceConnectionMock->expects($this->any())->method('getTableName')->willReturnArgument(0);
+
+        $adapterMock->expects($this->any())
+            ->method('quoteIdentifier')
+            ->willReturnMap(
+                [
+                    ['fk_name', false, '`fk_name`'],
+                    ['col_name', false, '`col_name`'],
+                    ['ref_table', false, '`ref_table`'],
+                    ['`ref_table`', false, '`ref_table`'],
+                    ['ref_col_name', false, '`ref_col_name`'],
+                ]
+            );
+
+        $this->assertEquals(
+            'CONSTRAINT `fk_name` FOREIGN KEY (`col_name`) REFERENCES `ref_table` (`ref_col_name`)  ON DELETE CASCADE',
+            $this->foreignKey->toDefinition($constraint)
+        );
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param array $expectedDefinition
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedDefinition)
+    {
+        $result = $this->foreignKey->fromDefinition(['Create Table' => $definition]);
+        $this->assertEquals($expectedDefinition, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            [
+                'definition' => 'CREATE TABLE `table_name` ('
+                    . '`col_name` INT(10) UNSIGNED NOT NULL COMMENT \'column name\','
+                    . 'INDEX `TEST_INDEX` (`col_name`),'
+                    . 'CONSTRAINT `fk_name` FOREIGN KEY (`col_name`) '
+                    . 'REFERENCES `ref_table` (`ref_col_name`)  ON DELETE CASCADE',
+                'excpectedDefiniton' => [
+                    'fk_name' => [
+                        'type' => Reference::TYPE,
+                        'name' => 'fk_name',
+                        'column' => 'col_name',
+                        'referenceTable' => 'ref_table',
+                        'referenceColumn' => 'ref_col_name',
+                        'onDelete' => 'CASCADE'
+                    ]
+                ],
+            ],
+            [
+                'definition' => 'CREATE TABLE `table_name` ('
+                    . '`col_name` INT(10) UNSIGNED NOT NULL COMMENT \'column name\','
+                    . 'INDEX `TEST_INDEX` (`col_name`),'
+                    . 'CONSTRAINT `fk_name` FOREIGN KEY(`col_name`)'
+                    . 'REFERENCES `ref_table`(`ref_col_name`)ON DELETE NO ACTION',
+                'excpectedDefiniton' => [
+                    'fk_name' => [
+                        'type' => Reference::TYPE,
+                        'name' => 'fk_name',
+                        'column' => 'col_name',
+                        'referenceTable' => 'ref_table',
+                        'referenceColumn' => 'ref_col_name',
+                        'onDelete' => 'NO ACTION'
+                    ]
+                ]
+            ],
+            [
+                'definition' => 'CREATE TABLE `table_name` ('
+                    . '`column_name` INT(10) UNSIGNED NOT NULL COMMENT \'column name\','
+                    . 'INDEX `TEST_INDEX` (`col_name`),'
+                    . 'CONSTRAINT `fk_name` FOREIGN KEY(`column_name`)'
+                    . 'REFERENCES `ref_table`(`ref_col_name`)ON DELETE SET DEFAULT',
+                'excpectedDefiniton' => [
+                    'fk_name' => [
+                        'type' => Reference::TYPE,
+                        'name' => 'fk_name',
+                        'column' => 'column_name',
+                        'referenceTable' => 'ref_table',
+                        'referenceColumn' => 'ref_col_name',
+                        'onDelete' => 'SET DEFAULT'
+                    ]
+                ]
+            ],
+            [
+                'definition' => 'CREATE TABLE `table_name` ('
+                    . '`column_name` INT(10) UNSIGNED NOT NULL COMMENT \'column name\','
+                    . 'INDEX `TEST_INDEX` (`col_name`),'
+                    . 'CONSTRAINT `fk_name` FOREIGN KEY(`column_name`)'
+                    . 'REFERENCES `ref_table`(`ref_col_name`)ON DELETE SET NULL',
+                'excpectedDefiniton' => [
+                    'fk_name' => [
+                        'type' => Reference::TYPE,
+                        'name' => 'fk_name',
+                        'column' => 'column_name',
+                        'referenceTable' => 'ref_table',
+                        'referenceColumn' => 'ref_col_name',
+                        'onDelete' => 'SET NULL'
+                    ]
+                ]
+            ],
+            [
+                'definition' => 'CREATE TABLE `table_name` ('
+                    . '`column_name` INT(10) UNSIGNED NOT NULL COMMENT \'column name\','
+                    . 'INDEX `TEST_INDEX` (`col_name`),'
+                    . 'CONSTRAINT `fk_name` FOREIGN KEY(`column_name`)'
+                    . 'REFERENCES `ref_table`(`ref_col_name`)ON DELETE RESTRICT ON UPDATE RESTRICT',
+                'excpectedDefiniton' => [
+                    'fk_name' => [
+                        'type' => Reference::TYPE,
+                        'name' => 'fk_name',
+                        'column' => 'column_name',
+                        'referenceTable' => 'ref_table',
+                        'referenceColumn' => 'ref_col_name',
+                        'onDelete' => 'RESTRICT'
+                    ]
+                ]
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
new file mode 100644
index 0000000000000..07717611095e1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal as InternalConstraintDto;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Test for internal (primary key, unique key) constraint definition.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints
+ */
+class InternalTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Internal
+     */
+    private $internal;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->internal = $this->objectManager->getObject(
+            Internal::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     *
+     * @dataProvider toDefinitionDataProvider()
+     */
+    public function testToDefinition($name, $type, $columns, $expectedExpression)
+    {
+        /** @var InternalConstraintDto|\PHPUnit_Framework_MockObject_MockObject $constraint */
+        $constraint = $this->getMockBuilder(InternalConstraintDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tableMock = $this->getMockBuilder(Table::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $constraint->expects($this->any())->method('getTable')->willReturn($tableMock);
+        $tableMock->expects($this->any())->method('getResource')->willReturn('default');
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->with('default')
+            ->willReturn($adapterMock);
+        $constraint->expects($this->any())->method('getName')->willReturn($name);
+        $constraint->expects($this->any())->method('getType')->willReturn($type);
+        $constraint->expects($this->any())->method('getColumnNames')->willReturn($columns);
+        $adapterMock->expects($this->any())
+            ->method('quoteIdentifier')
+            ->willReturnCallback(
+                function ($name) {
+                    return '`' . $name . '`';
+                }
+            );
+
+        $this->assertEquals(
+            $expectedExpression,
+            $this->internal->toDefinition($constraint)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function toDefinitionDataProvider()
+    {
+        return [
+            [
+                'name' => 'constraint_name_primary',
+                'type' => 'primary',
+                'columns' => ['id', 'parent_id'],
+                'expectedExpression' => "CONSTRAINT  PRIMARY KEY (`id`,`parent_id`)"
+            ],
+            [
+                'name' => 'constraint_name_unique',
+                'type' => 'unique',
+                'columns' => ['id', 'parent_id'],
+                'expectedExpression' => "CONSTRAINT `constraint_name_unique` UNIQUE KEY (`id`,`parent_id`)"
+            ],
+        ];
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param array $expectedDefinition
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedDefinition)
+    {
+        $result = $this->internal->fromDefinition($definition);
+        $this->assertEquals($expectedDefinition, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            [
+                'definition' => [
+                    'Key_name' => 'PRIMARY',
+                    'Column_name' => 'id',
+                ],
+                'excpectedDefiniton' => [
+                    'name' => 'PRIMARY',
+                    'column' => ['id' => 'id'],
+                    'type' => 'primary',
+                ],
+            ],
+            [
+                'definition' => [
+                    'Key_name' => 'unique_key_1',
+                    'Column_name' => 'parent_id',
+                ],
+                'excpectedDefiniton' => [
+                    'name' => 'unique_key_1',
+                    'column' => ['parent_id' => 'parent_id'],
+                    'type' => 'unique',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/IndexTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
new file mode 100644
index 0000000000000..987b8cac42e19
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index as IndexDto;
+
+/**
+ * Test for index (key) definition.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints
+ */
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Index
+     */
+    private $index;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->index = $this->objectManager->getObject(
+            Index::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * Test conversion to definition.
+     *
+     * @dataProvider toDefinitionDataProvider()
+     */
+    public function testToDefinition($name, $type, $columns, $expectedExpression)
+    {
+        /** @var IndexDto|\PHPUnit_Framework_MockObject_MockObject $index */
+        $index = $this->getMockBuilder(IndexDto::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($adapterMock);
+
+        $index->expects($this->any())->method('getName')->willReturn($name);
+        $index->expects($this->any())->method('getIndexType')->willReturn($type);
+        $index->expects($this->any())->method('getColumnNames')->willReturn($columns);
+        $adapterMock->expects($this->any())
+            ->method('quoteIdentifier')
+            ->willReturnCallback(
+                function ($name) {
+                    return '`' . $name . '`';
+                }
+            );
+
+        $this->assertEquals(
+            $expectedExpression,
+            $this->index->toDefinition($index)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function toDefinitionDataProvider()
+    {
+        return [
+            [
+                'name' => 'ft_index',
+                'type' => IndexDto::FULLTEXT_INDEX,
+                'columns' => ['title', 'content'],
+                'expectedExpression' => "FULLTEXT INDEX `ft_index` (`title`,`content`)"
+            ],
+            [
+                'name' => 'ft_index',
+                'type' => IndexDto::FULLTEXT_INDEX,
+                'columns' => ['title'],
+                'expectedExpression' => "FULLTEXT INDEX `ft_index` (`title`)"
+            ],
+            [
+                'name' => 'ft_index',
+                'type' => 'btree',
+                'columns' => ['title'],
+                'expectedExpression' => "INDEX `ft_index` (`title`)"
+            ],
+            [
+                'name' => 'ft_index',
+                'type' => 'HASH',
+                'columns' => ['title'],
+                'expectedExpression' => "INDEX `ft_index` (`title`)"
+            ],
+        ];
+    }
+
+    /**
+     * Test from definition conversion.
+     *
+     * @param array $definition
+     * @param array $expectedDefinition
+     * @dataProvider definitionDataProvider()
+     */
+    public function testFromDefinition($definition, $expectedDefinition)
+    {
+        $result = $this->index->fromDefinition($definition);
+        $this->assertEquals($expectedDefinition, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function definitionDataProvider()
+    {
+        return [
+            [
+                'definition' => [
+                    'Index_type' => 'FULLTEXT',
+                    'Key_name' => 'ft_index',
+                    'Column_name' => 'text',
+                ],
+                'excpectedDefiniton' => [
+                    'indexType' => 'fulltext',
+                    'name' => 'ft_index',
+                    'column' => ['text' => 'text'],
+                    'type' => 'index',
+                ],
+            ],
+            [
+                'definition' => [
+                    'Index_type' => 'BTREE',
+                    'Key_name' => 'bt_index',
+                    'Column_name' => 'text',
+                ],
+                'excpectedDefiniton' => [
+                    'indexType' => 'btree',
+                    'name' => 'bt_index',
+                    'column' => ['text' => 'text'],
+                    'type' => 'index',
+                ],
+            ],
+            [
+                'definition' => [
+                    'Index_type' => 'HASH',
+                    'Key_name' => 'ht_index',
+                    'Column_name' => 'text',
+                ],
+                'excpectedDefiniton' => [
+                    'indexType' => 'hash',
+                    'name' => 'ht_index',
+                    'column' => ['text' => 'text'],
+                    'type' => 'index',
+                ],
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
new file mode 100644
index 0000000000000..4e0c129204012
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
@@ -0,0 +1,497 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+
+/**
+ * Test for SchemaBuilder.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SchemaBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ElementFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $elementFactoryMock;
+
+    /**
+     * @var DbSchemaReaderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dbSchemaReaderMock;
+
+    /**
+     * @var Sharding|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shardingMock;
+
+    protected function setUp()
+    {
+        $this->elementFactoryMock = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dbSchemaReaderMock = $this->getMockBuilder(DbSchemaReaderInterface::class)
+            ->getMockForAbstractClass();
+        $this->shardingMock = $this->getMockBuilder(Sharding::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder::class,
+            [
+                'elementFactory' => $this->elementFactoryMock,
+                'dbSchemaReader' => $this->dbSchemaReaderMock,
+                'sharding' => $this->shardingMock
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function dataProvider()
+    {
+        return [
+            [
+                'columns' => [
+                    'first_table' => [
+                        'first_column' => [
+                            'name' => 'first_column',
+                            'type' => 'int',
+                            'padding' => 10,
+                            'identity' => true,
+                            'nullable' => false
+                        ],
+                        'foreign_column' => [
+                            'name' => 'foreign_column',
+                            'type' => 'int',
+                            'padding' => 10,
+                            'nullable' => false
+                        ],
+                        'second_column' => [
+                            'name' => 'second_column',
+                            'type' => 'timestamp',
+                            'default' => 'CURRENT_TIMESTAMP',
+                            'on_update' => true
+                        ],
+                    ],
+                    'second_table' => [
+                        'ref_column' => [
+                            'name' => 'ref_column',
+                            'type' => 'int',
+                            'padding' => 10,
+                            'nullable' => false
+                        ],
+                    ]
+                ],
+                'references' => [
+                    'first_table' => [
+                        'some_foreign_key' => [
+                            'name' => 'some_foreign_key',
+                            'type' => 'foreign',
+                            'column' => 'foreign_column',
+                            'table' => 'first_table',
+                            'referenceTable' => 'second_table',
+                            'referenceColumn' => 'ref_column'
+                        ],
+                    ]
+                ],
+                'constraints' => [
+                    'first_table' => [
+                        'PRIMARY' => [
+                            'name' => 'PRIMARY',
+                            'type' => 'primary',
+                            'column' => [
+                                'first_column'
+                            ],
+                            'nameWithoutPrefix' => 'PRIMARY',
+                        ]
+                    ]
+                ],
+                'indexes' => [
+                    'second_table' => [
+                        'FIRST_INDEX' => [
+                            'name' => 'FIRST_INDEX',
+                            'nameWithoutPrefix' => 'FIRST_INDEX',
+                            'column' => [
+                                'ref_column'
+                            ],
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Create table.
+     *
+     * @param string $name
+     * @return Table
+     */
+    private function createTable($name)
+    {
+        return new Table(
+            $name,
+            $name,
+            'table',
+            'default',
+            'resource',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+    }
+
+    /**
+     * Create integer column with autoincrement.
+     *
+     * @param string $name
+     * @param Table $table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
+     */
+    private function createIntegerAIColumn($name, Table $table)
+    {
+        return new Integer(
+            $name,
+            'int',
+            $table,
+            10,
+            true,
+            false,
+            true
+        );
+    }
+
+    /**
+     * Create integer column.
+     *
+     * @param string $name
+     * @param Table $table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
+     */
+    private function createIntegerColumn($name, Table $table)
+    {
+        return new Integer(
+            $name,
+            'int',
+            $table,
+            10
+        );
+    }
+
+    /**
+     * Create primary key constraint.
+     *
+     * @param Table $table
+     * @param array $columns
+     * @return Internal
+     */
+    private function createPrimaryConstraint(Table $table, array $columns)
+    {
+        return new Internal(
+            'PRIMARY',
+            'primary',
+            $table,
+            'PRIMARY',
+            $columns
+        );
+    }
+
+    /**
+     * Create index.
+     *
+     * @param string $indexName
+     * @param Table $table
+     * @param array $columns
+     * @return Index
+     */
+    private function createIndex($indexName, Table $table, array $columns)
+    {
+        return new Index(
+            $indexName,
+            'index',
+            $table,
+            $columns,
+            'btree',
+            $indexName
+        );
+    }
+
+    /**
+     * Create timestamp column.
+     *
+     * @param string $name
+     * @param Table $table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp
+     */
+    private function createTimestampColumn($name, Table $table)
+    {
+        return new Timestamp(
+            $name,
+            'timestamp',
+            $table,
+            'CURRENT_TIMESTAMP',
+            false,
+            true
+        );
+    }
+
+    /**
+     * @dataProvider dataProvider
+     * @param array $columns
+     * @param array $references
+     * @param array $constraints
+     * @param array $indexes
+     */
+    public function testBuild(array $columns, array $references, array $constraints, array $indexes)
+    {
+        $this->prepareSchemaMocks($columns, $references, $constraints, $indexes);
+        $resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resourceConnectionMock->expects(self::any())
+            ->method('getTableName')
+            ->willReturnArgument(0);
+        /** @var Schema $schema */
+        $schema = $this->objectManagerHelper->getObject(
+            Schema::class,
+            ['resourceConnection' => $resourceConnectionMock]
+        );
+        $this->model->build($schema);
+    }
+
+    /**
+     * WARNING! The expected exception type may differ depending on PHPUnit version.
+     *
+     * @dataProvider dataProvider
+     * @param array $columns
+     * @param array $references
+     * @param array $constraints
+     * @param array $indexes
+     */
+    public function testBuildUnknownIndexColumn(array $columns, array $references, array $constraints, array $indexes)
+    {
+        $indexes['second_table']['FIRST_INDEX']['column'][] = 'unknown_column';
+        $this->prepareSchemaMocks($columns, $references, $constraints, $indexes);
+        $resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var Schema $schema */
+        $schema = $this->objectManagerHelper->getObject(
+            Schema::class,
+            ['resourceConnection' => $resourceConnectionMock]
+        );
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'User Warning: Column unknown_column does not exist for index/constraint FIRST_INDEX in table second_table.'
+        );
+        $this->model->build($schema);
+    }
+
+    /**
+     * Prepare mocks for test.
+     *
+     * @param array $columns
+     * @param array $references
+     * @param array $constraints
+     * @param array $indexes
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    private function prepareSchemaMocks(array $columns, array $references, array $constraints, array $indexes)
+    {
+        $withContext = [['first_table', 'default'], ['second_table', 'default']];
+        $this->shardingMock->expects(self::once())
+            ->method('getResources')
+            ->willReturn(['default']);
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('readTables')
+            ->with('default')
+            ->willReturn(['first_table', 'second_table']);
+        $this->dbSchemaReaderMock->expects($this->any())
+            ->method('getTableOptions')
+            ->withConsecutive(...array_values($withContext))
+            ->willReturnOnConsecutiveCalls(
+                ['engine' => 'innodb', 'comment' => '', 'charset' => 'utf-8', 'collation' => 'utf-8'],
+                ['engine' => 'innodb', 'comment' => 'Not null comment', 'charset' => 'utf-8', 'collation' => 'utf-8']
+            );
+        $this->dbSchemaReaderMock->expects($this->any())
+            ->method('readColumns')
+            ->withConsecutive(...array_values($withContext))
+            ->willReturnOnConsecutiveCalls($columns['first_table'], $columns['second_table']);
+        $this->dbSchemaReaderMock->expects($this->any())
+            ->method('readIndexes')
+            ->withConsecutive(...array_values($withContext))
+            ->willReturnOnConsecutiveCalls([], $indexes['second_table']);
+        $this->dbSchemaReaderMock->expects($this->any())
+            ->method('readConstraints')
+            ->withConsecutive(...array_values($withContext))
+            ->willReturnOnConsecutiveCalls($constraints['first_table'], []);
+        $this->dbSchemaReaderMock->expects($this->any())
+            ->method('readReferences')
+            ->withConsecutive(...array_values($withContext))
+            ->willReturnOnConsecutiveCalls($references['first_table'], []);
+        $table = $this->createTable('first_table');
+        $refTable = $this->createTable('second_table');
+        $refColumn = $this->createIntegerColumn('ref_column', $refTable);
+        $index = $this->createIndex('FIRST_INDEX', $table, [$refColumn]);
+        $refTable->addColumns([$refColumn]);
+        $refTable->addIndexes([$index]);
+        $firstColumn = $this->createIntegerAIColumn('first_column', $table);
+        $foreignColumn = $this->createIntegerColumn('foreign_column', $table);
+        $timestampColumn = $this->createTimestampColumn('second_column', $table);
+        $primaryKey = $this->createPrimaryConstraint($table, [$firstColumn]);
+        $foreignKey = new Reference(
+            'some_foreign_key',
+            'foreign',
+            $table,
+            'some_foreign_key',
+            $foreignColumn,
+            $refTable,
+            $refColumn,
+            'CASCADE'
+        );
+        $table->addColumns([$firstColumn, $foreignColumn, $timestampColumn]);
+        $table->addConstraints([$foreignKey, $primaryKey]);
+        $this->elementFactoryMock->expects($this->any())
+            ->method('create')
+            ->withConsecutive(
+                [
+                    'table',
+                    [
+                        'name' =>'first_table',
+                        'resource' => 'default',
+                        'engine' => 'innodb',
+                        'comment' => null,
+                        'charset' => 'utf-8',
+                        'collation' => 'utf-8'
+                    ]
+                ],
+                [
+                    'int',
+                    [
+                        'name' => 'first_column',
+                        'type' => 'int',
+                        'table' => $table,
+                        'padding' => 10,
+                        'identity' => true,
+                        'nullable' => false,
+                    ]
+                ],
+                [
+                    'int',
+                    [
+                        'name' => 'foreign_column',
+                        'type' => 'int',
+                        'table' => $table,
+                        'padding' => 10,
+                        'nullable' => false,
+                    ]
+                ],
+                [
+                    'timestamp',
+                    [
+                        'name' => 'second_column',
+                        'type' => 'timestamp',
+                        'table' => $table,
+                        'default' => 'CURRENT_TIMESTAMP',
+                        'on_update' => true,
+                    ]
+                ],
+                [
+                    'primary',
+                    [
+                        'name' => 'PRIMARY',
+                        'type' => 'primary',
+                        'columns' => [$firstColumn],
+                        'table' => $table,
+                        'nameWithoutPrefix' => 'PRIMARY',
+                        'column' => ['first_column'],
+                    ]
+                ],
+                [
+                    'table',
+                    [
+                        'name' =>'second_table',
+                        'resource' => 'default',
+                        'engine' => 'innodb',
+                        'comment' => 'Not null comment',
+                        'charset' => 'utf-8',
+                        'collation' => 'utf-8'
+                    ]
+                ],
+                [
+                    'int',
+                    [
+                        'name' => 'ref_column',
+                        'type' => 'int',
+                        'table' => $refTable,
+                        'padding' => 10,
+                        'nullable' => false,
+                    ]
+                ],
+                [
+                    'index',
+                    [
+                        'name' => 'FIRST_INDEX',
+                        'table' => $refTable,
+                        'column' => ['ref_column'],
+                        'columns' => [$refColumn],
+                        'nameWithoutPrefix' => 'FIRST_INDEX',
+                    ]
+                ],
+                [
+                    'foreign',
+                    [
+                        'name' => 'some_foreign_key',
+                        'type' => 'foreign',
+                        'column' => $foreignColumn,
+                        'table' => $table,
+                        'referenceTable' => $refTable,
+                        'referenceColumn' => $refColumn,
+                    ]
+                ]
+            )
+            ->willReturnOnConsecutiveCalls(
+                $table,
+                $firstColumn,
+                $foreignColumn,
+                $timestampColumn,
+                $primaryKey,
+                $refTable,
+                $refColumn,
+                $index,
+                $foreignKey
+            );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/StatementAggregatorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/StatementAggregatorTest.php
new file mode 100644
index 0000000000000..904b1791bc088
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/StatementAggregatorTest.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Db\ReferenceStatement;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
+
+/**
+ * Test for StatementAggregator.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db
+ */
+class StatementAggregatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator
+     */
+    private $model;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = new StatementAggregator();
+    }
+
+    public function testAddStatementsInOneBank()
+    {
+        $statementOne = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementTwo = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementsBank = [$statementOne, $statementTwo, $statementThree];
+        $statementOne->expects(self::exactly(2))
+            ->method('getTableName')
+            ->willReturn('first_table');
+        $statementTwo->expects(self::exactly(2))
+            ->method('getTableName')
+            ->willReturn('first_table');
+        $statementThree->expects(self::exactly(2))
+            ->method('getTableName')
+            ->willReturn('first_table');
+        $this->model->addStatements($statementsBank);
+        self::assertEquals(
+            [$statementsBank],
+            $this->model->getStatementsBank()
+        );
+    }
+
+    public function testAddStatementsForDifferentTables()
+    {
+        $statementOne = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementTwo = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementOne->expects(self::exactly(2))
+            ->method('getTableName')
+            ->willReturn('first_table');
+        $statementTwo->expects(self::exactly(1))
+            ->method('getTableName')
+            ->willReturn('second_table');
+        $statementThree->expects(self::exactly(1))
+            ->method('getTableName')
+            ->willReturn('first_table');
+        $this->model->addStatements([$statementOne, $statementTwo, $statementThree]);
+        self::assertEquals(
+            [[$statementOne, $statementThree], [$statementTwo]],
+            $this->model->getStatementsBank()
+        );
+    }
+
+    public function testAddStatementsForDifferentResources()
+    {
+        $statementOne = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementTwo = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementOne->expects(self::exactly(2))
+            ->method('getResource')
+            ->willReturn('non_default');
+        $this->model->addStatements([$statementOne, $statementTwo, $statementThree]);
+        self::assertEquals(
+            [[$statementOne], [$statementTwo, $statementThree]],
+            $this->model->getStatementsBank()
+        );
+    }
+
+    public function testAddStatementsWithTriggersInLastStatement()
+    {
+        $statementOne = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementTwo = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree->expects(self::exactly(0))
+            ->method('getTriggers')
+            ->willReturn(
+                [
+                    function () {
+                    }
+                ]
+            );
+        $this->model->addStatements([$statementOne, $statementTwo, $statementThree]);
+        self::assertEquals(
+            [[$statementOne, $statementTwo, $statementThree]],
+            $this->model->getStatementsBank()
+        );
+    }
+
+    public function testAddStatementsWithTriggers()
+    {
+        $statementOne = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementTwo = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementOne->expects(self::exactly(2))
+            ->method('getTriggers')
+            ->willReturn(
+                [
+                    function () {
+                    }
+                ]
+            );
+        $this->model->addStatements([$statementOne, $statementTwo, $statementThree]);
+        self::assertEquals(
+            [[$statementOne], [$statementTwo, $statementThree]],
+            $this->model->getStatementsBank()
+        );
+    }
+
+    public function testAddReferenceStatements()
+    {
+        $statementOne = $this->getMockBuilder(ReferenceStatement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementTwo = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree = $this->getMockBuilder(ReferenceStatement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statementThree->expects(self::exactly(1))
+            ->method('getName')
+            ->willReturn('some_foreign_key');
+        $statementOne->expects(self::exactly(1))
+            ->method('getName')
+            ->willReturn('some_foreign_key');
+        $this->model->addStatements([$statementOne, $statementTwo, $statementThree]);
+        self::assertEquals(
+            [[$statementOne, $statementTwo], [$statementThree]],
+            $this->model->getStatementsBank()
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Declaration/SchemaBuilderTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Declaration/SchemaBuilderTest.php
new file mode 100644
index 0000000000000..a590a50edb72f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Declaration/SchemaBuilderTest.php
@@ -0,0 +1,375 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Declaration;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationComposite;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+
+/**
+ * Test for SchemaBuilder.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Declaration
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SchemaBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Declaration\SchemaBuilder
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ElementFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $elementFactoryMock;
+
+    /**
+     * @var BooleanUtils|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $booleanUtilsMock;
+
+    /**
+     * @var Sharding|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shardingMock;
+
+    /**
+     * @var ValidationComposite|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validationCompositeMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->elementFactoryMock = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->booleanUtilsMock = $this->getMockBuilder(BooleanUtils::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shardingMock = $this->getMockBuilder(Sharding::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->validationCompositeMock = $this->getMockBuilder(ValidationComposite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\Declaration\Schema\Declaration\SchemaBuilder::class,
+            [
+                'elementFactory' => $this->elementFactoryMock,
+                'booleanUtils' => new BooleanUtils(),
+                'sharding' => $this->shardingMock,
+                'validationComposite' => $this->validationCompositeMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function tablesProvider()
+    {
+        return [
+            [
+                [
+                    'first_table' => [
+                        'name' => 'first_table',
+                        'engine' => 'innodb',
+                        'resource' => 'default',
+                        'column' => [
+                            'first_column' => [
+                                'name' => 'first_column',
+                                'type' => 'int',
+                                'padding' => 10,
+                                'identity' => true,
+                                'nullable' => false
+                            ],
+                            'foreign_column' => [
+                                'name' => 'foreign_column',
+                                'type' => 'int',
+                                'padding' => 10,
+                                'nullable' => false
+                            ],
+                            'some_disabled_column' => [
+                                'name' => 'some_disabled_column',
+                                'disabled' => 'true',
+                                'type' => 'int',
+                                'padding' => 10,
+                                'nullable' => false
+                            ],
+                            'second_column' => [
+                                'name' => 'second_column',
+                                'type' => 'timestamp',
+                                'default' => 'CURRENT_TIMESTAMP',
+                                'on_update' => true
+                            ],
+                        ],
+                        'constraint' => [
+                            'some_foreign_key' => [
+                                'name' => 'some_foreign_key',
+                                'type' => 'foreign',
+                                'column' => 'foreign_column',
+                                'table' => 'first_table',
+                                'referenceTable' => 'second_table',
+                                'referenceColumn' => 'ref_column'
+                            ],
+                            'PRIMARY' => [
+                                'name' => 'PRIMARY',
+                                'type' => 'primary',
+                                'column' => [
+                                    'first_column'
+                                ]
+                            ]
+                        ]
+                    ],
+                    'second_table' => [
+                        'name' => 'second_table',
+                        'engine' => 'innodb',
+                        'resource' => 'default',
+                        'column' => [
+                            'ref_column' => [
+                                'name' => 'ref_column',
+                                'type' => 'int',
+                                'padding' => 10,
+                                'nullable' => false
+                            ],
+                        ],
+                        'index' => [
+                            'FIRST_INDEX' => [
+                                'name' => 'FIRST_INDEX',
+                                'column' => [
+                                    'ref_column'
+                                ]
+                            ]
+                        ],
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Create table
+     *
+     * @param string $name
+     * @return Table
+     */
+    private function createTable($name)
+    {
+        return new Table(
+            $name,
+            $name,
+            'table',
+            'default',
+            'resource',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+    }
+
+    /**
+     * Create integer column with autoincrement.
+     *
+     * @param string $name
+     * @param Table $table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
+     */
+    private function createIntegerAIColumn($name, Table $table)
+    {
+        return new Integer(
+            $name,
+            'int',
+            $table,
+            10,
+            true,
+            false,
+            true
+        );
+    }
+
+    /**
+     * Create integer column.
+     *
+     * @param string $name
+     * @param Table $table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
+     */
+    private function createIntegerColumn($name, Table $table)
+    {
+        return new Integer(
+            $name,
+            'int',
+            $table,
+            10
+        );
+    }
+
+    /**
+     * Create PK constraint.
+     *
+     * @param Table $table
+     * @param array $columns
+     * @param string $nameWithoutPrefix
+     * @return Internal
+     */
+    private function createPrimaryConstraint(Table $table, array $columns, $nameWithoutPrefix = 'PRIMARY')
+    {
+        return new Internal(
+            'PRIMARY',
+            'primary',
+            $table,
+            $nameWithoutPrefix,
+            $columns
+        );
+    }
+
+    /**
+     * Create index.
+     *
+     * @param string $indexName
+     * @param Table $table
+     * @param array $columns
+     * @param string|null $nameWithoutPrefix
+     * @return Index
+     */
+    private function createIndex($indexName, Table $table, array $columns, $nameWithoutPrefix = null)
+    {
+        return new Index(
+            $indexName,
+            'index',
+            $table,
+            $columns,
+            'btree',
+            $nameWithoutPrefix ?: $indexName
+        );
+    }
+
+    /**
+     * Create timestamp column.
+     *
+     * @param string $name
+     * @param Table $table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp
+     */
+    private function createTimestampColumn($name, Table $table)
+    {
+        return new Timestamp(
+            $name,
+            'timestamp',
+            $table,
+            'CURRENT_TIMESTAMP',
+            false,
+            true
+        );
+    }
+
+    /**
+     * @dataProvider tablesProvider
+     * @param array $tablesData
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Magento\Framework\Setup\Exception
+     */
+    public function testBuild(array $tablesData)
+    {
+        $table = $this->createTable('first_table');
+        $refTable = $this->createTable('second_table');
+        $refColumn = $this->createIntegerColumn('ref_column', $refTable);
+        $index = $this->createIndex('PRE_FIRST_INDEX', $table, [$refColumn], 'FIRST_INDEX');
+        $refTable->addColumns([$refColumn]);
+        $refTable->addIndexes([$index]);
+        $firstColumn = $this->createIntegerAIColumn('first_column', $table);
+        $foreignColumn = $this->createIntegerColumn('foreign_column', $table);
+        $timestampColumn = $this->createTimestampColumn('second_column', $table);
+        $primaryKey = $this->createPrimaryConstraint($table, [$firstColumn]);
+        $foreignKey = new Reference(
+            'some_foreign_key',
+            'foreign',
+            $table,
+            'some_foreign_key',
+            $foreignColumn,
+            $refTable,
+            $refColumn,
+            'CASCADE'
+        );
+        $firstTableColumns = [$firstColumn, $foreignColumn, $timestampColumn];
+        $firstTableConstraints = [$foreignKey, $primaryKey];
+        $table->addColumns($firstTableColumns);
+        $table->addConstraints($firstTableConstraints);
+        $this->elementFactoryMock->expects(self::exactly(9))
+            ->method('create')
+            ->willReturnOnConsecutiveCalls(
+                $table,
+                $firstColumn,
+                $foreignColumn,
+                $timestampColumn,
+                $refTable,
+                $refColumn,
+                $index,
+                $foreignKey,
+                $primaryKey
+            );
+        $resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var Schema $schema */
+        $schema = $this->objectManagerHelper->getObject(
+            Schema::class,
+            ['resourceConnection' => $resourceConnectionMock]
+        );
+        $this->resourceConnectionMock->expects(self::once())
+            ->method('getTableName')
+            ->willReturn('second_table');
+        $resourceConnectionMock->expects(self::exactly(6))
+            ->method('getTableName')
+            ->withConsecutive(
+                ['first_table'],
+                ['first_table'],
+                ['second_table'],
+                ['second_table'],
+                ['first_table'],
+                ['second_table']
+            )
+            ->willReturnOnConsecutiveCalls(
+                'first_table',
+                'first_table',
+                'second_table',
+                'second_table',
+                'first_table',
+                'second_table'
+            );
+        $this->model->addTablesData($tablesData);
+        $this->model->build($schema);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Diff/DiffManagerTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Diff/DiffManagerTest.php
new file mode 100644
index 0000000000000..22dc6c6d18a9e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Diff/DiffManagerTest.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Diff;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Diff\Diff;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Test diff manager methods
+ */
+class DiffManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Diff\DiffManager
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\Comparator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $comparatorMock;
+
+    protected function setUp()
+    {
+        $this->comparatorMock = $this->getMockBuilder(\Magento\Framework\Setup\Declaration\Schema\Comparator::class)
+            ->getMockForAbstractClass();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\Declaration\Schema\Diff\DiffManager::class,
+            [
+                'comparator' => $this->comparatorMock
+            ]
+        );
+    }
+
+    public function testShouldBeCreated()
+    {
+        $elements = ['first' => new \stdClass(), 'second' => new \stdClass()];
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $element = new Column('third', 'int', $table);
+        $existingElement = new Column('second', 'int', $table);
+        self::assertTrue($this->model->shouldBeCreated($elements, $element));
+        self::assertFalse($this->model->shouldBeCreated($elements, $existingElement));
+    }
+
+    public function testRegisterModification()
+    {
+        /** @var Diff|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(Diff::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $element = new Column('third', 'int', $table);
+        $generatedElement = new Column('third', 'int', $table, 'Previous column');
+        $diff->expects(self::once())
+            ->method('register')
+            ->with($element, 'modify_column', $generatedElement);
+        $this->model->registerModification($diff, $element, $generatedElement);
+    }
+
+    public function testRegisterIndexModification()
+    {
+        /** @var Diff|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(Diff::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $column = new Column('third', 'int', $table, 'Previous column');
+        $index = new Index('index_type', 'index', $table, [$column], 'btree', 'index_type');
+        $generatedIndex = new Index('index_type', 'index', $table, [$column], 'hash', 'index_type');
+        $diff->expects(self::exactly(2))
+            ->method('register')
+            ->withConsecutive([$generatedIndex, 'drop_element', $generatedIndex], [$index, 'add_complex_element']);
+        $this->model->registerModification($diff, $index, $generatedIndex);
+    }
+
+    public function testRegisterRemovalReference()
+    {
+        /** @var Diff|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(Diff::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $refTable = new Table(
+            'ref_table',
+            'ref_table',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+        $column = new Column('third', 'int', $table, 'Previous column');
+        $reference = new Reference('ref', 'foreign', $table, 'ref', $column, $refTable, $column, 'CASCADE');
+        $diff->expects(self::exactly(2))
+            ->method('register')
+            ->withConsecutive(
+                [$reference, 'drop_reference', $reference],
+                [$table, 'drop_table', $table]
+            );
+        $this->model->registerRemoval($diff, [$reference, $table]);
+    }
+
+    public function testRegisterCreation()
+    {
+        /** @var Diff|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(Diff::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $column = new Column('third', 'int', $table, 'Previous column');
+        $reference = new Reference('ref', 'foreign', $table, 'ref', $column, $table, $column, 'CASCADE');
+        $diff->expects(self::exactly(3))
+            ->method('register')
+            ->withConsecutive(
+                [$table, 'create_table'],
+                [$column, 'add_column'],
+                [$reference, 'add_complex_element']
+            );
+        $this->model->registerCreation($diff, $table);
+        $this->model->registerCreation($diff, $column);
+        $this->model->registerCreation($diff, $reference);
+    }
+
+    public function testRegisterTableModificationWhenChangeResource()
+    {
+        /** @var Diff|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(Diff::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $generateTable = new Table(
+            'name',
+            'name',
+            'table',
+            'sales',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $diff->expects(self::once())
+            ->method('register')
+            ->with($table, 'recreate_table', $generateTable);
+        $this->model->registerRecreation($table, $generateTable, $diff);
+    }
+
+    public function testRegisterTableModificationWhenChangeEngine()
+    {
+        /** @var Diff|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(Diff::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $generateTable = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'memory',
+            'utf-8',
+            'utf_8_general_ci',
+            ''
+        );
+        $diff->expects(self::once())
+            ->method('register')
+            ->with($table, 'modify_table', $generateTable);
+        $this->model->registerTableModification($table, $generateTable, $diff);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/TableTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/TableTest.php
new file mode 100644
index 0000000000000..fc7e097dc446d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/TableTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Dto\Factories;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Test table factory
+ */
+class TableTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table */
+    protected $model;
+
+    /** @var ObjectManagerHelper */
+    protected $objectManagerHelper;
+
+    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $objectManagerMock;
+
+    /** @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject */
+    protected $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+             ->disableOriginalConstructor()
+             ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table::class,
+            [
+                'objectManager' => $this->objectManagerMock,
+                'resourceConnection' => $this->resourceConnectionMock
+            ]
+        );
+    }
+
+    public function testCreate()
+    {
+        $this->resourceConnectionMock->expects(self::once())
+            ->method('getTablePrefix')
+            ->willReturn('pf_');
+        $data = [
+            'name' => 'some_table',
+            'engine' => null,
+        ];
+        $expectedData = [
+            'name' => 'pf_some_table',
+            'engine' => 'innodb',
+            'nameWithoutPrefix' => 'some_table',
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'onCreate' => ''
+        ];
+        $this->objectManagerMock->expects(self::once())
+            ->method('create')
+            ->with(Table::class, $expectedData);
+        $this->model->create($data);
+    }
+
+    public function testCreateWithPrefix()
+    {
+        $this->resourceConnectionMock->expects(self::once())
+            ->method('getTablePrefix')
+            ->willReturn('pf_');
+        $data = [
+            'name' => 'pf_some_table',
+            'engine' => 'memory',
+            'nameWithoutPrefix' => 'some_table'
+        ];
+        $expectedData = [
+            'name' => 'pf_some_table',
+            'engine' => 'memory',
+            'nameWithoutPrefix' => 'some_table',
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'onCreate' => ''
+        ];
+        $this->objectManagerMock->expects(self::once())
+            ->method('create')
+            ->with(Table::class, $expectedData);
+        $this->model->create($data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Operations/AddColumnTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Operations/AddColumnTest.php
new file mode 100644
index 0000000000000..a8a8fb5b0c40c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Operations/AddColumnTest.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Operations;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFrom;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropElement;
+
+/**
+ * Test for AddColumn.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Operations
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AddColumnTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AddColumn
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var DefinitionAggregator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $definitionAggregatorMock;
+
+    /**
+     * @var DbSchemaWriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dbSchemaWriterMock;
+
+    /**
+     * @var ElementFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $elementFactoryMock;
+
+    /**
+     * @var ElementHistoryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $elementHistoryFactoryMock;
+
+    /**
+     * @var AddComplexElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addComplexElementMock;
+
+    /**
+     * @var DropElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dropElementMock;
+
+    /** @var MigrateDataFrom|\PHPUnit_Framework_MockObject_MockObject */
+    private $migrateDataTrigger;
+
+    protected function setUp()
+    {
+        $this->definitionAggregatorMock = $this->getMockBuilder(DefinitionAggregator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dbSchemaWriterMock = $this->getMockBuilder(DbSchemaWriterInterface::class)
+            ->getMockForAbstractClass();
+        $this->elementFactoryMock = $this->getMockBuilder(ElementFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->elementHistoryFactoryMock = $this->getMockBuilder(ElementHistoryFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->addComplexElementMock = $this->getMockBuilder(AddComplexElement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dropElementMock = $this->getMockBuilder(DropElement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->migrateDataTrigger = $this->getMockBuilder(MigrateDataFrom::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            AddColumn::class,
+            [
+                'definitionAggregator' => $this->definitionAggregatorMock,
+                'dbSchemaWriter' => $this->dbSchemaWriterMock,
+                'elementFactory' => $this->elementFactoryMock,
+                'elementHistoryFactory' => $this->elementHistoryFactoryMock,
+                'addComplexElement' => $this->addComplexElementMock,
+                'dropElement' => $this->dropElementMock,
+                'triggers' => [
+                    'migrateDataFrom' => $this->migrateDataTrigger
+                ]
+            ]
+        );
+    }
+
+    /**
+     * @return Column
+     */
+    private function prepareColumn()
+    {
+        $table = new Table(
+            'table',
+            'table',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+        $column = new Integer(
+            'int',
+            'int',
+            $table,
+            11,
+            false,
+            false,
+            true,
+            0,
+            'Azaza',
+            'migrateDataFrom(v)'
+        );
+        $table->addColumns([$column]);
+        return $column;
+    }
+
+    public function testDoOperation()
+    {
+        $addComplexStatement = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dropComplexElement = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $callback = function () {
+        };
+        $column = $this->prepareColumn();
+        $elementHistory = new ElementHistory($column);
+        $definition = '`int` INT(11) NOT NULL DEFAULT 0 Comment "Azaza"';
+        $this->definitionAggregatorMock->expects(self::once())
+            ->method('toDefinition')
+            ->with($column)
+            ->willReturn($definition);
+        $this->migrateDataTrigger->expects(self::once())
+            ->method('isApplicable')
+            ->with('migrateDataFrom(v)')
+            ->willReturn(true);
+        $this->migrateDataTrigger->expects(self::once())
+            ->method('getCallback')
+            ->with($elementHistory)
+            ->willReturn($callback);
+        $statement = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statement->expects(self::once())
+            ->method('addTrigger')
+            ->with($callback);
+        $this->dbSchemaWriterMock->expects(self::once())
+            ->method('addElement')
+            ->with('int', 'default', 'table', $definition, 'column')
+            ->willReturn($statement);
+        $index = new Index('index', 'index', $column->getTable(), [$column], 'btree', 'index');
+        $this->elementFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($index);
+        $indexHistory = new ElementHistory($index);
+        $statement->expects(self::once())
+            ->method('getTriggers')
+            ->willReturn([$callback]);
+        $this->elementHistoryFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($indexHistory);
+        $this->addComplexElementMock->expects(self::once())
+            ->method('doOperation')
+            ->with($indexHistory)
+            ->willReturn([$addComplexStatement]);
+        $this->dropElementMock->expects(self::once())
+            ->method('doOperation')
+            ->with($indexHistory)
+            ->willReturn([$dropComplexElement]);
+        $resetAIStatement = $this->getMockBuilder(Statement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dbSchemaWriterMock->expects(self::once())
+            ->method('resetAutoIncrement')
+            ->willReturn($resetAIStatement);
+        self::assertEquals(
+            [$addComplexStatement, $statement, $dropComplexElement, $resetAIStatement],
+            $this->model->doOperation($elementHistory)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/OperationsExecutorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/OperationsExecutorTest.php
new file mode 100644
index 0000000000000..26cbc0afc5595
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/OperationsExecutorTest.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregatorFactory;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Diff\DiffInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropElement;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+
+/**
+ * Test for OperationsExecutor.
+ *
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class OperationsExecutorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\Declaration\Schema\OperationsExecutor
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Sharding|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shardingMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var StatementFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementFactoryMock;
+
+    /**
+     * @var DbSchemaWriterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dbSchemaWriterMock;
+
+    /**
+     * @var StatementAggregatorFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementAggregatorFactoryMock;
+
+    /**
+     * @var CreateTable|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $createTableOperation;
+
+    /**
+     * @var DropElement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dropElement;
+
+    protected function setUp()
+    {
+        $this->shardingMock = $this->getMockBuilder(Sharding::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statementFactoryMock = $this->getMockBuilder(StatementFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dbSchemaWriterMock = $this->getMockBuilder(DbSchemaWriterInterface::class)
+            ->getMockForAbstractClass();
+        $this->statementAggregatorFactoryMock = $this->getMockBuilder(StatementAggregatorFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->createTableOperation = $this->getMockBuilder(CreateTable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->createTableOperation->expects(self::exactly(2))
+            ->method('getOperationName')
+            ->willReturn('create_table');
+        $this->dropElement = $this->getMockBuilder(DropElement::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\Declaration\Schema\OperationsExecutor::class,
+            [
+                'operations' => [
+                    'create_table' => $this->createTableOperation,
+                    'drop_element' => $this->dropElement
+                ],
+                'dataSaviorsCollection' => [],
+                'sharding' => $this->shardingMock,
+                'resourceConnection' => $this->resourceConnectionMock,
+                'statementFactory' => $this->statementFactoryMock,
+                'dbSchemaWriter' => $this->dbSchemaWriterMock,
+                'statementAggregatorFactory' => $this->statementAggregatorFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @return Table
+     */
+    private function prepareTable()
+    {
+        $table = new Table(
+            'table',
+            'table',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+        $column = new Integer(
+            'int',
+            'int',
+            $table,
+            11,
+            false,
+            false,
+            false
+        );
+        $table->addColumns([$column]);
+        return $table;
+    }
+
+    public function testExecute()
+    {
+        /** @var DiffInterface|\PHPUnit_Framework_MockObject_MockObject $diff */
+        $diff = $this->getMockBuilder(DiffInterface::class)
+            ->getMock();
+        $this->shardingMock->expects(self::exactly(2))
+            ->method('getResources')
+            ->willReturn(['default']);
+        $connectionMock = $this->getMockBuilder(Mysql::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock->expects(self::exactly(3))
+            ->method('getConnection')
+            ->with('default')
+            ->willReturn($connectionMock);
+        $statementAggregator = $this->getMockBuilder(StatementAggregator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statementAggregatorFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($statementAggregator);
+        $elementHistory = new ElementHistory($this->prepareTable());
+        $tablesHistories = [
+            'table' => [
+                'create_table' => [$elementHistory]
+            ]
+        ];
+        $this->createTableOperation->expects(self::once())
+            ->method('doOperation')
+            ->with($elementHistory)
+            ->willReturn(['TABLE table (`int` INT(11))']);
+        $statementAggregator->expects(self::once())
+            ->method('addStatements')
+            ->with(['TABLE table (`int` INT(11))']);
+        $this->dbSchemaWriterMock->expects(self::once())
+            ->method('compile')
+            ->with($statementAggregator);
+        $diff->expects(self::once())
+            ->method('getAll')
+            ->willReturn($tablesHistories);
+        $this->dropElement->expects(self::at(0))
+            ->method('doOperation');
+        $this->model->execute($diff, []);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ShardingTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ShardingTest.php
new file mode 100644
index 0000000000000..4a73816ba89ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ShardingTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ShardingTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\Setup\Declaration\Schema\Sharding */
+    private $model;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    /** @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject */
+    private $deploymentConfigMock;
+
+    protected function setUp()
+    {
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\Declaration\Schema\Sharding::class,
+            [
+                'deploymentConfig' => $this->deploymentConfigMock,
+                'resources' => ['default', 'checkout', 'sales']
+            ]
+        );
+    }
+
+    public function testCanUseResource()
+    {
+        $this->deploymentConfigMock->expects(self::once())
+            ->method('get')
+            ->with('db/connection')
+            ->willReturn(['default']);
+        self::assertFalse($this->model->canUseResource('checkout'));
+    }
+
+    public function testGetResources()
+    {
+        $this->deploymentConfigMock->expects(self::exactly(3))
+            ->method('get')
+            ->with('db/connection')
+            ->willReturn(['default' => 1, 'sales' => 2, 'index' => 3]);
+        self::assertEquals(['default', 'sales'], $this->model->getResources());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
new file mode 100644
index 0000000000000..396cc2b2e5b34
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+class CheckReferenceColumnHasIndexTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var CheckReferenceColumnHasIndex */
+    private $model;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            CheckReferenceColumnHasIndex::class,
+            [
+            ]
+        );
+    }
+
+    public function testValidate()
+    {
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+        $refTable = new Table(
+            'ref_table',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+
+        $column = new Real('decimal', 'decimal', $table, 10, 5);
+        $refColumn = new Real('ref_decimal', 'decimal', $refTable, 10, 5);
+        $reference = new Reference(
+            'ref',
+            'foreign',
+            $table,
+            'ref',
+            $column,
+            $refTable,
+            $refColumn,
+            'CASCADE'
+        );
+
+        $table->addColumns([$column]);
+        $refTable->addColumns([$refColumn]);
+        $table->addConstraints([$reference]);
+        /** @var Schema|\PHPUnit_Framework_MockObject_MockObject $schemaMock */
+        $schemaMock = $this->getMockBuilder(Schema::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaMock->expects(self::once())
+            ->method('getTables')
+            ->willReturn([$table]);
+        self::assertEquals(
+            [
+                [
+                        'column' => 'ref_decimal',
+                        'message' => 'Reference column ref_decimal in reference table ref_table do not have index',
+                ],
+            ],
+            $this->model->validate($schemaMock)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/RealTypesTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/RealTypesTest.php
new file mode 100644
index 0000000000000..0c0d4ac2b4555
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/RealTypesTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\RealTypes;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+class RealTypesTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var RealTypes */
+    private $model;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            RealTypes::class,
+            []
+        );
+    }
+
+    public function testValidate()
+    {
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+        $okColumn = new Real('decimal', 'decimal', $table, 10, 5);
+        $invalidColumn = new Real('float', 'float', $table, 5, 10);
+        $table->addColumns([$okColumn, $invalidColumn]);
+        /** @var Schema|\PHPUnit_Framework_MockObject_MockObject $schemaMock */
+        $schemaMock = $this->getMockBuilder(Schema::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaMock->expects(self::once())
+            ->method('getTables')
+            ->willReturn([$table]);
+
+        self::assertEquals(
+            [
+                [
+                    'column' => 'name.float',
+                    'message' =>
+                        'Real type "precision" must be greater or equal to "scale". ' .
+                        'float(5,10) is invalid in name.float.'
+                ]
+            ],
+            $this->model->validate($schemaMock)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php
new file mode 100644
index 0000000000000..ad547053f7bf2
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Class ValidationRulesTest
+ * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules
+ */
+class ValidationRulesTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var CheckReferenceColumnHasIndex */
+    private $model;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            CheckReferenceColumnHasIndex::class,
+            [
+            ]
+        );
+    }
+
+    public function testValidate()
+    {
+        $table = new Table(
+            'name',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+        $refTable = new Table(
+            'ref_table',
+            'name',
+            'table',
+            'default',
+            'innodb',
+            'utf-8',
+            'utf-8',
+            ''
+        );
+
+        $column = new Real('decimal', 'decimal', $table, 10, 5);
+        $refColumn = new Real('ref_decimal', 'decimal', $refTable, 10, 5);
+        $reference = new Reference(
+            'ref',
+            'foreign',
+            $table,
+            'ref',
+            $column,
+            $refTable,
+            $refColumn,
+            'CASCADE'
+        );
+
+        $table->addColumns([$column]);
+        $refTable->addColumns([$refColumn]);
+        $table->addConstraints([$reference]);
+        /** @var Schema|\PHPUnit_Framework_MockObject_MockObject $schemaMock */
+        $schemaMock = $this->getMockBuilder(Schema::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaMock->expects(self::once())
+            ->method('getTables')
+            ->willReturn([$table]);
+        self::assertEquals(
+            [
+                [
+                        'column' => 'ref_decimal',
+                        'message' => 'Reference column ref_decimal in reference table ref_table do not have index',
+                ],
+            ],
+            $this->model->validate($schemaMock)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
index fce077f7f8925..0636f3c597734 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
@@ -7,6 +7,7 @@
 
 use \Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
 
 class FilePermissionsTest extends \PHPUnit\Framework\TestCase
 {
@@ -25,6 +26,11 @@ class FilePermissionsTest extends \PHPUnit\Framework\TestCase
      */
     private $directoryListMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|State
+     */
+    private $stateMock;
+
     /**
      * @var FilePermissions
      */
@@ -34,6 +40,7 @@ public function setUp()
     {
         $this->directoryWriteMock = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
         $this->filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $this->stateMock = $this->createMock(State::class);
 
         $this->filesystemMock
             ->expects($this->any())
@@ -43,13 +50,21 @@ public function setUp()
 
         $this->filePermissions = new FilePermissions(
             $this->filesystemMock,
-            $this->directoryListMock
+            $this->directoryListMock,
+            $this->stateMock
         );
     }
 
-    public function testGetInstallationWritableDirectories()
+    /**
+     * @param string $mageMode
+     * @dataProvider modeDataProvider
+     */
+    public function testGetInstallationWritableDirectories($mageMode)
     {
         $this->setUpDirectoryListInstallation();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn($mageMode);
 
         $expected = [
             BP . '/app/etc',
@@ -62,6 +77,23 @@ public function testGetInstallationWritableDirectories()
         $this->assertEquals($expected, $this->filePermissions->getInstallationWritableDirectories());
     }
 
+    public function testGetInstallationWritableDirectoriesInProduction()
+    {
+        $this->setUpDirectoryListInstallationInProduction();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_PRODUCTION);
+
+        $expected = [
+            BP . '/app/etc',
+            BP . '/var',
+            BP . '/pub/media',
+            BP . '/pub/static'
+        ];
+
+        $this->assertEquals($expected, $this->filePermissions->getInstallationWritableDirectories());
+    }
+
     public function testGetApplicationNonWritableDirectories()
     {
         $this->directoryListMock
@@ -134,13 +166,18 @@ public function getApplicationCurrentNonWritableDirectoriesDataProvider()
     }
 
     /**
+     * @param string $mageMode
+     * @dataProvider modeDataProvider
      * @covers \Magento\Framework\Setup\FilePermissions::getMissingWritableDirectoriesForInstallation
      * @covers \Magento\Framework\Setup\FilePermissions::getMissingWritablePathsForInstallation
      */
-    public function testGetMissingWritableDirectoriesAndPathsForInstallation()
+    public function testGetMissingWritableDirectoriesAndPathsForInstallation($mageMode)
     {
         $this->setUpDirectoryListInstallation();
         $this->setUpDirectoryWriteInstallation();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn($mageMode);
 
         $expected = [
             BP . '/var',
@@ -160,6 +197,31 @@ public function testGetMissingWritableDirectoriesAndPathsForInstallation()
         );
     }
 
+    public function testGetMissingWritableDirectoriesAndPathsForInstallationInProduction()
+    {
+        $this->setUpDirectoryListInstallationInProduction();
+        $this->setUpDirectoryWriteInstallation();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_PRODUCTION);
+
+        $expected = [
+            BP . '/var',
+            BP . '/pub/media',
+            BP . '/pub/static'
+        ];
+
+        $this->assertEquals(
+            $expected,
+            array_values($this->filePermissions->getMissingWritableDirectoriesForInstallation())
+        );
+
+        $this->assertEquals(
+            $expected,
+            array_values($this->filePermissions->getMissingWritablePathsForInstallation())
+        );
+    }
+
     public function testGetMissingWritableDirectoriesForDbUpgrade()
     {
         $directoryMethods = ['isExist', 'isDirectory', 'isReadable', 'isWritable'];
@@ -212,6 +274,16 @@ public function getUnnecessaryWritableDirectoriesForApplicationDataProvider()
     }
 
     public function setUpDirectoryListInstallation()
+    {
+        $this->setUpDirectoryListInstallationInProduction();
+        $this->directoryListMock
+            ->expects($this->at(4))
+            ->method('getPath')
+            ->with(DirectoryList::GENERATED)
+            ->will($this->returnValue(BP . '/generated'));
+    }
+
+    public function setUpDirectoryListInstallationInProduction()
     {
         $this->directoryListMock
             ->expects($this->at(0))
@@ -233,11 +305,6 @@ public function setUpDirectoryListInstallation()
             ->method('getPath')
             ->with(DirectoryList::STATIC_VIEW)
             ->will($this->returnValue(BP . '/pub/static'));
-        $this->directoryListMock
-            ->expects($this->at(4))
-            ->method('getPath')
-            ->with(DirectoryList::GENERATED)
-            ->will($this->returnValue(BP . '/generated'));
     }
 
     public function setUpDirectoryWriteInstallation()
@@ -294,4 +361,15 @@ public function setUpDirectoryWriteInstallation()
             ->method('isWritable')
             ->will($this->returnValue(false));
     }
+
+    /**
+     * @return array
+     */
+    public function modeDataProvider()
+    {
+        return [
+            [State::MODE_DEFAULT],
+            [State::MODE_DEVELOPER],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php
index 6e7ca3ece43b1..a25771b4519f2 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php
@@ -58,6 +58,9 @@ protected function setUp()
         $this->mockConfig->expects($this->any())
             ->method('getAllowedLocales')
             ->willReturn($this->expectedLocales);
+        $this->mockConfig->expects($this->any())
+            ->method('getAllowedCurrencies')
+            ->willReturn($this->expectedCurrencies);
 
         $this->lists = new Lists($this->mockConfig);
     }
@@ -73,4 +76,13 @@ public function testGetLocaleList()
         $locales = array_intersect($this->expectedLocales, array_keys($this->lists->getLocaleList()));
         $this->assertEquals($this->expectedLocales, $locales);
     }
+
+    /**
+     * Test Lists:getCurrencyList() considering allowed currencies config values.
+     */
+    public function testGetCurrencyList()
+    {
+        $currencies = array_intersect($this->expectedCurrencies, array_keys($this->lists->getCurrencyList()));
+        $this->assertEquals($this->expectedCurrencies, $currencies);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
new file mode 100644
index 0000000000000..f89bdc9e137dd
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
@@ -0,0 +1,567 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Patch;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Module\ModuleResource;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\PatchBackwardCompatability;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchFactory;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchReader;
+use Magento\Framework\Setup\Patch\PatchRegistry;
+use Magento\Framework\Setup\Patch\PatchRegistryFactory;
+
+/**
+ * Class PatchApplierTest
+ * @package Magento\Framework\Setup\Test\Unit\Patch
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PatchApplierTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PatchRegistryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchRegistryFactoryMock;
+
+    /**
+     * @var PatchReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataPatchReaderMock;
+
+    /**
+     * @var PatchReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $schemaPatchReaderMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var ModuleResource|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleResourceMock;
+
+    /**
+     * @var PatchHistory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchHistoryMock;
+
+    /**
+     * @var PatchFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Setup\SetupInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $schemaSetupMock;
+
+    /**
+     * @var ModuleDataSetupInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleDataSetupMock;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var PatchApplier
+     */
+    private $patchApllier;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var PatchBackwardCompatability |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchBacwardCompatability;
+
+    protected function setUp()
+    {
+        $this->patchRegistryFactoryMock = $this->createMock(PatchRegistryFactory::class);
+        $this->dataPatchReaderMock = $this->createMock(PatchReader::class);
+        $this->schemaPatchReaderMock = $this->createMock(PatchReader::class);
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->moduleResourceMock = $this->createMock(ModuleResource::class);
+        $this->patchHistoryMock = $this->createMock(PatchHistory::class);
+        $this->patchFactoryMock = $this->createMock(PatchFactory::class);
+        $this->schemaSetupMock = $this->createMock(SchemaSetupInterface::class);
+        $this->moduleDataSetupMock = $this->createMock(ModuleDataSetupInterface::class);
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->moduleDataSetupMock->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
+
+        $objectManager = new ObjectManager($this);
+        $this->patchBacwardCompatability = $objectManager->getObject(
+            PatchBackwardCompatability::class,
+            [
+                'moduleResource' => $this->moduleResourceMock
+            ]
+        );
+        $this->patchApllier = $objectManager->getObject(
+            PatchApplier::class,
+            [
+                'patchRegistryFactory' => $this->patchRegistryFactoryMock,
+                'dataPatchReader' => $this->dataPatchReaderMock,
+                'schemaPatchReader' => $this->schemaPatchReaderMock,
+                'resourceConnection' => $this->resourceConnectionMock,
+                'moduleResource' => $this->moduleResourceMock,
+                'patchHistory' => $this->patchHistoryMock,
+                'patchFactory' => $this->patchFactoryMock,
+                'objectManager' => $this->objectManagerMock,
+                'schemaSetup' => $this->schemaSetupMock,
+                'moduleDataSetup' => $this->moduleDataSetupMock,
+                'patchBackwardCompatability' => $this->patchBacwardCompatability
+            ]
+        );
+        require_once __DIR__ . '/../_files/data_patch_classes.php';
+        require_once __DIR__ . '/../_files/schema_patch_classes.php';
+    }
+
+    /**
+     * @param $moduleName
+     * @param $dataPatches
+     * @param $moduleVersionInDb
+     *
+     * @dataProvider applyDataPatchDataNewModuleProvider()
+     */
+    public function testApplyDataPatchForNewlyInstalledModule($moduleName, $dataPatches, $moduleVersionInDb)
+    {
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with($moduleName)
+            ->willReturn($dataPatches);
+
+        $this->moduleResourceMock->expects($this->any())->method('getDataVersion')->willReturnMap(
+            [
+                [$moduleName, $moduleVersionInDb]
+            ]
+        );
+
+        $patches = [
+            \SomeDataPatch::class,
+            \OtherDataPatch::class
+        ];
+        $patchRegistryMock = $this->createAggregateIteratorMock(PatchRegistry::class, $patches, ['registerPatch']);
+        $patchRegistryMock->expects($this->exactly(2))
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $patch1 = $this->createMock(\SomeDataPatch::class);
+        $patch1->expects($this->once())->method('apply');
+        $patch2 = $this->createMock(\OtherDataPatch::class);
+        $patch2->expects($this->once())->method('apply');
+        $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                ['\\' . \SomeDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch1],
+                ['\\' . \OtherDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch2],
+            ]
+        );
+        $this->connectionMock->expects($this->exactly(2))->method('beginTransaction');
+        $this->connectionMock->expects($this->exactly(2))->method('commit');
+        $this->patchHistoryMock->expects($this->any())->method('fixPatch')->willReturnMap(
+            [
+                [get_class($patch1)],
+                [get_class($patch2)],
+            ]
+        );
+        $this->patchApllier->applyDataPatch($moduleName);
+    }
+
+    /**
+     * @return array
+     */
+    public function applyDataPatchDataNewModuleProvider()
+    {
+        return [
+            'newly installed module' => [
+                'moduleName' => 'Module1',
+                'dataPatches' => [
+                    \SomeDataPatch::class,
+                    \OtherDataPatch::class
+                ],
+                'moduleVersionInDb' => null,
+            ],
+        ];
+    }
+
+    /**
+     * @param $moduleName
+     * @param $dataPatches
+     * @param $moduleVersionInDb
+     *
+     * @dataProvider applyDataPatchDataInstalledModuleProvider()
+     */
+    public function testApplyDataPatchForInstalledModule($moduleName, $dataPatches, $moduleVersionInDb)
+    {
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with($moduleName)
+            ->willReturn($dataPatches);
+
+        $this->moduleResourceMock->expects($this->any())->method('getDataVersion')->willReturnMap(
+            [
+                [$moduleName, $moduleVersionInDb]
+            ]
+        );
+
+        $patches = [
+            \SomeDataPatch::class,
+            \OtherDataPatch::class
+        ];
+        $patchRegistryMock = $this->createAggregateIteratorMock(
+            PatchRegistry::class,
+            $patches,
+            ['registerPatch']
+        );
+        $patchRegistryMock->expects(self::exactly(2))
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects(self::any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $patch1 = $this->createMock(\SomeDataPatch::class);
+        $patch1->expects(self::never())->method('apply');
+        $patch2 = $this->createMock(\OtherDataPatch::class);
+        $patch2->expects(self::once())->method('apply');
+        $this->objectManagerMock->expects(self::any())->method('create')->willReturnMap(
+            [
+                ['\\' . \SomeDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch1],
+                ['\\' . \OtherDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch2],
+            ]
+        );
+        $this->connectionMock->expects(self::exactly(1))->method('beginTransaction');
+        $this->connectionMock->expects(self::exactly(1))->method('commit');
+        $this->patchHistoryMock->expects(self::exactly(2))->method('fixPatch');
+        $this->patchApllier->applyDataPatch($moduleName);
+    }
+
+    /**
+     * @return array
+     */
+    public function applyDataPatchDataInstalledModuleProvider()
+    {
+        return [
+            'upgrade module iwth only OtherDataPatch' => [
+                'moduleName' => 'Module1',
+                'dataPatches' => [
+                    \SomeDataPatch::class,
+                    \OtherDataPatch::class
+                ],
+                'moduleVersionInDb' => '2.0.0',
+            ]
+        ];
+    }
+
+    /**
+     * @param $moduleName
+     * @param $dataPatches
+     * @param $moduleVersionInDb
+     *
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessage Patch Apply Error
+     *
+     * @dataProvider applyDataPatchDataInstalledModuleProvider()
+     */
+    public function testApplyDataPatchRollback($moduleName, $dataPatches, $moduleVersionInDb)
+    {
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with($moduleName)
+            ->willReturn($dataPatches);
+
+        $this->moduleResourceMock->expects($this->any())->method('getDataVersion')->willReturnMap(
+            [
+                [$moduleName, $moduleVersionInDb]
+            ]
+        );
+
+        $patches = [
+            \SomeDataPatch::class,
+            \OtherDataPatch::class
+        ];
+        $patchRegistryMock = $this->createAggregateIteratorMock(PatchRegistry::class, $patches, ['registerPatch']);
+        $patchRegistryMock->expects($this->exactly(2))
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $patch1 = $this->createMock(\SomeDataPatch::class);
+        $patch1->expects($this->never())->method('apply');
+        $patch2 = $this->createMock(\OtherDataPatch::class);
+        $exception = new \Exception('Patch Apply Error');
+        $patch2->expects($this->once())->method('apply')->willThrowException($exception);
+        $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                ['\\' . \SomeDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch1],
+                ['\\' . \OtherDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch2],
+            ]
+        );
+        $this->connectionMock->expects($this->exactly(1))->method('beginTransaction');
+        $this->connectionMock->expects($this->never())->method('commit');
+        $this->connectionMock->expects($this->exactly(1))->method('rollback');
+        $this->patchHistoryMock->expects($this->exactly(1))->method('fixPatch');
+        $this->patchApllier->applyDataPatch($moduleName);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp "Patch [a-zA-Z0-9\_]+ should implement DataPatchInterface"
+     */
+    public function testNonDataPatchApply()
+    {
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with('module1')
+            ->willReturn([\stdClass::class]);
+        $patchRegistryMock = $this->createAggregateIteratorMock(
+            PatchRegistry::class,
+            [\stdClass::class],
+            ['registerPatch']
+        );
+        $patchRegistryMock->expects($this->exactly(1))
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                [
+                    '\\' . \stdClass::class,
+                    ['moduleDataSetup' => $this->moduleDataSetupMock],
+                    $this->createMock(\stdClass::class)
+                ],
+            ]
+        );
+
+        $this->patchApllier->applyDataPatch('module1');
+    }
+
+    public function testNonTransactionablePatch()
+    {
+        $patches = [\NonTransactionableDataPatch::class];
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with('module1')
+            ->willReturn($patches);
+        $patchRegistryMock = $this->createAggregateIteratorMock(
+            PatchRegistry::class,
+            $patches,
+            ['registerPatch']
+        );
+        $patchRegistryMock->expects($this->exactly(1))
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $patch1 = $this->createMock($patches[0]);
+        $patch1->expects($this->exactly(1))->method('apply');
+        $this->connectionMock->expects($this->never())->method('beginTransaction');
+        $this->connectionMock->expects($this->never())->method('commit');
+        $this->connectionMock->expects($this->never())->method('rollback');
+        $this->patchHistoryMock->expects($this->once())->method('fixPatch')->with(get_class($patch1));
+        $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                [
+                    '\\' . $patches[0],
+                    ['moduleDataSetup' => $this->moduleDataSetupMock],
+                    $patch1
+                ],
+            ]
+        );
+
+        $this->patchApllier->applyDataPatch('module1');
+    }
+
+    /**
+     * @param $moduleName
+     * @param $schemaPatches
+     * @param $moduleVersionInDb
+     *
+     * @dataProvider schemaPatchDataProvider()
+     */
+    public function testSchemaPatchAplly($moduleName, $schemaPatches, $moduleVersionInDb)
+    {
+        $this->schemaPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with($moduleName)
+            ->willReturn($schemaPatches);
+
+        $this->moduleResourceMock->expects($this->any())->method('getDbVersion')->willReturnMap(
+            [
+                [$moduleName, $moduleVersionInDb]
+            ]
+        );
+
+        $patches = [
+            \SomeSchemaPatch::class,
+            \OtherSchemaPatch::class
+        ];
+        $patchRegistryMock = $this->createAggregateIteratorMock(PatchRegistry::class, $patches, ['registerPatch']);
+        $patchRegistryMock->expects($this->exactly(2))
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $patch1 = $this->createMock(\SomeSchemaPatch::class);
+        $patch1->expects($this->never())->method('apply');
+        $patch2 = $this->createMock(\OtherSchemaPatch::class);
+        $patch2->expects($this->once())->method('apply');
+        $this->patchFactoryMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                [\SomeSchemaPatch::class, ['schemaSetup' => $this->schemaSetupMock], $patch1],
+                [\OtherSchemaPatch::class, ['schemaSetup' => $this->schemaSetupMock], $patch2],
+            ]
+        );
+        $this->connectionMock->expects($this->never())->method('beginTransaction');
+        $this->connectionMock->expects($this->never())->method('commit');
+        $this->patchHistoryMock->expects($this->exactly(2))->method('fixPatch');
+        $this->patchApllier->applySchemaPatch($moduleName);
+    }
+
+    public function testRevertDataPatches()
+    {
+        $patches = [\RevertableDataPatch::class];
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with('module1')
+            ->willReturn($patches);
+        $patchRegistryMock = $this->createAggregateIteratorMock(
+            PatchRegistry::class,
+            $patches,
+            ['registerPatch', 'getReverseIterator']
+        );
+        $patchRegistryMock->expects($this->exactly(1))
+            ->method('registerPatch');
+        $patchRegistryMock->expects($this->once())->method('getReverseIterator')
+            ->willReturn(array_reverse($patches));
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $patch1 = $this->createMock($patches[0]);
+        $patch1->expects($this->exactly(1))->method('revert');
+        $this->connectionMock->expects($this->once())->method('beginTransaction');
+        $this->connectionMock->expects($this->once())->method('commit');
+        $this->connectionMock->expects($this->never())->method('rollback');
+        $this->patchHistoryMock->expects($this->once())->method('revertPatchFromHistory')->with(get_class($patch1));
+        $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                [
+                    '\\' . $patches[0],
+                    ['moduleDataSetup' => $this->moduleDataSetupMock],
+                    $patch1
+                ],
+            ]
+        );
+
+        $this->patchApllier->revertDataPatches('module1');
+    }
+
+    /**
+     * @return array
+     */
+    public function schemaPatchDataProvider()
+    {
+        return [
+            'upgrade module iwth only OtherSchemaPatch' => [
+                'moduleName' => 'Module1',
+                'schemaPatches' => [
+                    \SomeSchemaPatch::class,
+                    \OtherSchemaPatch::class
+                ],
+                'moduleVersionInDb' => '2.0.0',
+            ]
+        ];
+    }
+    /**
+     * Create mock of class that implements IteratorAggregate
+     *
+     * @param string $className
+     * @param array $items
+     * @param array $methods
+     * @return \PHPUnit_Framework_MockObject_MockObject|\IteratorAggregate
+     * @throws \Exception
+     */
+    private function createAggregateIteratorMock($className, array $items = [], array $methods = [])
+    {
+        if (!in_array(ltrim(\IteratorAggregate::class, '\\'), class_implements($className))) {
+            throw new \Exception('Mock possible only for classes that implement IteratorAggregate interface.');
+        }
+        /**
+         * PHPUnit_Framework_MockObject_MockObject
+         */
+        $someIterator = $this->createMock(\ArrayIterator::class);
+
+        $mockIteratorAggregate = $this->getMockBuilder($className)
+            ->disableOriginalConstructor()
+            ->setMethods(array_merge($methods, ['getIterator']))
+            ->getMock();
+
+        $mockIteratorAggregate->expects($this->any())->method('getIterator')->willReturn($someIterator);
+
+        $iterator = new \ArrayIterator($items);
+
+        $someIterator->expects($this->any())
+            ->method('rewind')
+            ->willReturnCallback(function () use ($iterator) {
+                $iterator->rewind();
+            });
+
+        $someIterator->expects($this->any())
+            ->method('current')
+            ->willReturnCallback(function () use ($iterator) {
+                return $iterator->current();
+            });
+
+        $someIterator->expects($this->any())
+            ->method('key')
+            ->willReturnCallback(function () use ($iterator) {
+                return $iterator->key();
+            });
+
+        $someIterator->expects($this->any())
+            ->method('next')
+            ->willReturnCallback(function () use ($iterator) {
+                $iterator->next();
+            });
+
+        $someIterator->expects($this->any())
+            ->method('valid')
+            ->willReturnCallback(function () use ($iterator) {
+                return $iterator->valid();
+            });
+
+        return $mockIteratorAggregate;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchFactoryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchFactoryTest.php
new file mode 100644
index 0000000000000..b9f45d09a3b38
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchFactoryTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Patch;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Patch\PatchFactory;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchInterface;
+
+/**
+ * Class PatchFactoryTest
+ * @package Magento\Framework\Setup\Test\Unit\Patch
+ */
+class PatchFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PatchFactory
+     */
+    private $patchFactory;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $this->patchFactory = $objectManager->getObject(
+            PatchFactory::class,
+            [
+                'objectManager' => $this->objectManagerMock,
+            ]
+        );
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage stdClass should implement Magento\Framework\Setup\Patch\PatchInterface interface
+     */
+    public function testCreateNonPatchInterface()
+    {
+        $patchNonPatchInterface = $this->createMock(\stdClass::class);
+        $this->objectManagerMock->expects($this->any())
+            ->method('create')
+            ->with('\\stdClass')
+            ->willReturn($patchNonPatchInterface);
+
+        $this->patchFactory->create(\stdClass::class);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
new file mode 100644
index 0000000000000..5d9631fe27f12
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Patch;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchInterface;
+
+/**
+ * Class PatchHistoryTest
+ * @package Magento\Framework\Setup\Test\Unit\Patch
+ */
+class PatchHistoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PatchHistory
+     */
+    private $patchHistory;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->patchHistory = $objectManager->getObject(
+            PatchHistory::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock,
+            ]
+        );
+    }
+
+    /**
+     * Test fix non-applied patch
+     */
+    public function testFixPatch()
+    {
+        /** @var PatchInterface|\PHPUnit_Framework_MockObject_MockObject $patch1 */
+        $patch1 = $this->createMock(PatchInterface::class);
+        /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $adapterMock */
+        $adapterMock = $this->createMock(AdapterInterface::class);
+        $this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($adapterMock);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $selectMock->expects($this->once())->method('from');
+        $adapterMock->expects($this->any())->method('select')->willReturn($selectMock);
+        $adapterMock->expects($this->once())->method('fetchCol')->willReturn([]);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getTableName')
+            ->willReturn(PatchHistory::TABLE_NAME);
+        $adapterMock->expects($this->once())->method('insert')
+            ->with(PatchHistory::TABLE_NAME, [PatchHistory::CLASS_NAME => get_class($patch1)]);
+        $this->patchHistory->fixPatch(get_class($patch1));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessageRegExp "Patch [a-zA-Z0-9\_]+ cannot be applied twice"
+     */
+    public function testFixAppliedPatch()
+    {
+        /** @var PatchInterface|\PHPUnit_Framework_MockObject_MockObject $patch1 */
+        $patch1 = $this->createMock(PatchInterface::class);
+        /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $adapterMock */
+        $adapterMock = $this->createMock(AdapterInterface::class);
+        $this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($adapterMock);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $selectMock->expects($this->once())->method('from');
+        $adapterMock->expects($this->any())->method('select')->willReturn($selectMock);
+        $adapterMock->expects($this->once())->method('fetchCol')->willReturn([get_class($patch1)]);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getTableName')
+            ->willReturn(PatchHistory::TABLE_NAME);
+        $adapterMock->expects($this->never())->method('insert');
+        $this->patchHistory->fixPatch(get_class($patch1));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchRegirtryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchRegirtryTest.php
new file mode 100644
index 0000000000000..25c4c4730e7c4
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchRegirtryTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Patch;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Setup\Patch\PatchFactory;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchRegistry;
+
+/**
+ * Class PatchRegirtryTest
+ * @package Magento\Framework\Setup\Test\Unit\Patch
+ */
+class PatchRegirtryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PatchRegistry
+     */
+    private $patchRegistry;
+
+    /**
+     * @var PatchFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchFactoryMock;
+
+    /**
+     * @var PatchHistory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchHistoryMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->patchFactoryMock = $this->getMockBuilder(PatchFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        
+        $this->patchHistoryMock = $this->getMockBuilder(PatchHistory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->patchRegistry = $objectManager->getObject(
+            PatchRegistry::class,
+            [
+                'patchHistory' => $this->patchHistoryMock,
+                'patchFactory' => $this->patchFactoryMock,
+            ]
+        );
+        require_once __DIR__ . '/../_files/data_patch_classes.php';
+    }
+
+    public function testRegisterAppliedPatch()
+    {
+        $this->patchHistoryMock->expects($this->once())
+            ->method('isApplied')
+            ->with(\SomeDataPatch::class)
+            ->willReturn(false);
+
+        $this->assertEquals(\SomeDataPatch::class, $this->patchRegistry->registerPatch(\SomeDataPatch::class));
+    }
+
+    public function testRegisterNonAplliedPatch()
+    {
+        $this->patchHistoryMock->expects($this->once())
+            ->method('isApplied')
+            ->with(\SomeDataPatch::class)
+            ->willReturn(true);
+
+        $this->assertEquals(false, $this->patchRegistry->registerPatch(\SomeDataPatch::class));
+    }
+
+    public function testGetIterator()
+    {
+        $this->patchHistoryMock->expects($this->any())
+            ->method('isApplied')
+            ->willReturnMap(
+                [
+                    [\SomeDataPatch::class, false],
+                    [\OtherDataPatch::class, false]
+                ]
+            );
+
+        $this->assertEquals(\SomeDataPatch::class, $this->patchRegistry->registerPatch(\SomeDataPatch::class));
+
+        $actualPatches = [];
+        foreach ($this->patchRegistry->getIterator() as $patch) {
+            $actualPatches[] = $patch;
+        }
+        // assert that all dependencies are present and placed in valid sequence
+        $this->assertEquals(
+            [\OtherDataPatch::class, \SomeDataPatch::class],
+            $actualPatches,
+            'Failed to assert that actual non-apllied patches sequence is valid.'
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php
new file mode 100644
index 0000000000000..4e34b3aebbf3e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaListenerTest.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Test\Unit;
+
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Setup\SchemaListenerDefinition\BooleanDefinition;
+use Magento\Framework\Setup\SchemaListenerDefinition\IntegerDefinition;
+use Magento\Framework\Setup\SchemaListenerDefinition\RealDefinition;
+use Magento\Framework\Setup\SchemaListenerDefinition\TimestampDefinition;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for schema listener.
+ *
+ * @package Magento\Framework\Setup\Test\Unit
+ */
+class SchemaListenerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\SchemaListener
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    protected function setUp() : void
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\SchemaListener::class,
+            [
+                'definitionMappers' => [
+                    'timestamp' => new TimestampDefinition(),
+                    'integer' => new IntegerDefinition(
+                        new BooleanDefinition()
+                    ),
+                    'decimal' => new RealDefinition()
+                ]
+            ]
+        );
+        $this->model->flush();
+    }
+
+    /**
+     * @return Table
+     */
+    private function getCreateTableDDL($tableName) : Table
+    {
+        $table = new Table();
+        $table->setName($tableName);
+        $table->setOption('type', 'innodb');
+        return $table->addColumn(
+            'timestamp',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+            null,
+            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+            'Column with type timestamp init update'
+        )->addColumn(
+            'integer',
+            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+            null,
+            ['nullable' => false, 'primary' => true, 'identity' => true],
+            'Integer'
+        )->addColumn(
+            'decimal',
+            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
+            '25,12',
+            ['unsigned' => false, 'nullable' => false],
+            'Decimal'
+        )
+        ->addIndex(
+            'INDEX_KEY',
+            ['column_with_type_text'],
+            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_FULLTEXT]
+        )
+        ->addForeignKey(
+            'some_key',
+            'decimal',
+            'setup_tests_table1',
+            'column_with_type_integer',
+            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+        )->setComment(
+            'Related Table'
+        );
+    }
+
+    public function testRenameTable() : void
+    {
+        $this->model->setModuleName('First_Module');
+        $this->model->createTable($this->getCreateTableDDL('old_table'));
+        $this->model->renameTable('old_table', 'new_table');
+        $tables = $this->model->getTables();
+        self::assertArrayHasKey('new_table', $tables['First_Module']);
+        self::assertArrayNotHasKey('old_table', $tables['First_Module']);
+    }
+
+    public function testDropIndex() : void
+    {
+        $this->model->setModuleName('First_Module');
+        $this->model->createTable($this->getCreateTableDDL('index_table'));
+        $this->model->dropIndex('index_table', 'INDEX_KEY', 'index');
+        self::assertTrue($this->model->getTables()['First_Module']['index_table']['indexes']['INDEX_KEY']['disabled']);
+    }
+
+    public function testCreateTable() : void
+    {
+        $this->model->setModuleName('First_Module');
+        $this->model->createTable($this->getCreateTableDDL('new_table'));
+        $tables = $this->model->getTables();
+        self::assertArrayHasKey('new_table', $tables['First_Module']);
+        self::assertEquals(
+            [
+                'timestamp' =>
+                    [
+                        'xsi:type' => 'timestamp',
+                        'name' => 'timestamp',
+                        'on_update' => true,
+                        'nullable' => false,
+                        'default' => 'CURRENT_TIMESTAMP',
+                        'disabled' => false,
+                        'onCreate' => null,
+                    ],
+                'integer' =>
+                    [
+                        'xsi:type' => 'int',
+                        'name' => 'integer',
+                        'padding' => 11,
+                        'unsigned' => false,
+                        'nullable' => false,
+                        'identity' => true,
+                        'default' => null,
+                        'disabled' => false,
+                        'onCreate' => null,
+                    ],
+                'decimal' =>
+                    [
+                        'xsi:type' => 'decimal',
+                        'name' => 'decimal',
+                        'scale' => '12',
+                        'precision' => '25',
+                        'unsigned' => false,
+                        'nullable' => false,
+                        'default' => null,
+                        'disabled' => false,
+                        'onCreate' => null,
+                    ],
+            ],
+            $tables['First_Module']['new_table']['columns']
+        );
+        self::assertEquals(
+            [
+                'primary' =>
+                    [
+                        'PRIMARY' =>
+                            [
+                                'type' => 'primary',
+                                'name' => 'PRIMARY',
+                                'disabled' => false,
+                                'columns' =>
+                                    [
+                                        'INTEGER' => 'integer',
+                                    ],
+                            ],
+                    ],
+                'foreign' =>
+                    [
+                        'SOME_KEY' =>
+                            [
+                                'table' => 'new_table',
+                                'column' => 'decimal',
+                                'referenceTable' => 'setup_tests_table1',
+                                'referenceColumn' => 'column_with_type_integer',
+                                'onDelete' => 'CASCADE',
+                                'disabled' => false,
+                            ],
+                    ],
+            ],
+            $tables['First_Module']['new_table']['constraints']
+        );
+
+        self::assertEquals(
+            [
+                'INDEX_KEY' =>
+                    [
+                        'columns' =>
+                            [
+                                'column_with_type_text' => 'column_with_type_text',
+                            ],
+                        'indexType' => 'fulltext',
+                        'disabled' => false,
+                    ],
+            ],
+            $tables['First_Module']['new_table']['indexes']
+        );
+    }
+
+    public function testDropTable() : void
+    {
+        $this->model->setModuleName('Old_Module');
+        $this->model->createTable($this->getCreateTableDDL('old_table'));
+        $this->model->setModuleName('New_Module');
+        $this->model->dropTable('old_table');
+        self::assertTrue($this->model->getTables()['New_Module']['old_table']['disabled']);
+    }
+
+    public function testDropTableInSameModule() : void
+    {
+        $this->model->setModuleName('Old_Module');
+        $this->model->createTable($this->getCreateTableDDL('old_table'));
+        $this->model->dropTable('old_table');
+        self::assertArrayNotHasKey('old_table', $this->model->getTables()['Old_Module']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php
new file mode 100644
index 0000000000000..cc88af15a262b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/SchemaPersistorTest.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Test\Unit;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Setup\SchemaListener;
+use Magento\Framework\Setup\XmlPersistor;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for schema persistor.
+ *
+ * @package Magento\Framework\Setup\Test\Unit
+ */
+class SchemaPersistorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Setup\SchemaPersistor
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $componentRegistrarMock;
+
+    /**
+     * @var XmlPersistor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $xmlPersistor;
+
+    protected function setUp() : void
+    {
+        $this->componentRegistrarMock = $this->getMockBuilder(ComponentRegistrar::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->xmlPersistor = $this->getMockBuilder(XmlPersistor::class)
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Setup\SchemaPersistor::class,
+            [
+                'componentRegistrar' => $this->componentRegistrarMock,
+                'xmlPersistor' => $this->xmlPersistor
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider schemaListenerTablesDataProvider
+     * @param array $tables
+     * @param string $expectedXML
+     */
+    public function testPersist(array $tables, $expectedXML) : void
+    {
+        $moduleName = 'First_Module';
+        /** @var SchemaListener|\PHPUnit_Framework_MockObject_MockObject $schemaListenerMock */
+        $schemaListenerMock = $this->getMockBuilder(SchemaListener::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaListenerMock->expects(self::once())
+            ->method('getTables')
+            ->willReturn($tables);
+        $this->componentRegistrarMock->expects(self::once())
+            ->method('getPath')
+            ->with('module', $moduleName)
+            ->willReturn('some-non-existing-path');
+        $simpleXmlElement = new \SimpleXMLElement($expectedXML);
+        $this->xmlPersistor
+            ->expects(self::once())
+            ->method('persist')
+            ->with($simpleXmlElement, 'some-non-existing-path/etc/db_schema.xml');
+
+        $this->model->persist($schemaListenerMock);
+    }
+
+    /**
+     * Provide listened schema.
+     *
+     * @return array
+     */
+    public function schemaListenerTablesDataProvider() : array
+    {
+        return [
+            [
+                'schemaListenerTables' => [
+                    'First_Module' => [
+                        'first_table' => [
+                            'disabled' => false,
+                            'name' => 'first_table',
+                            'resource' => 'default',
+                            'engine' => 'innodb',
+                            'columns' => [
+                                'first_column' => [
+                                    'name' => 'first_column',
+                                    'xsi:type' => 'integer',
+                                    'nullable' => 1,
+                                    'unsigned' => '0',
+                                ],
+                                'second_column' => [
+                                    'name' => 'second_column',
+                                    'xsi:type' => 'date',
+                                    'nullable' => 0,
+                                ]
+                            ],
+                            'indexes' => [
+                                'TEST_INDEX' => [
+                                    'name' => 'TEST_INDEX',
+                                    'indexType' => 'btree',
+                                    'columns' => [
+                                        'first_column'
+                                    ]
+                                ]
+                            ],
+                            'constraints' => [
+                                'foreign' => [
+                                    'some_foreign_constraint' => [
+                                        'referenceTable' => 'table',
+                                        'referenceColumn' => 'column',
+                                        'table' => 'first_table',
+                                        'column' => 'first_column'
+                                    ]
+                                ],
+                                'primary' => [
+                                    'PRIMARY' => [
+                                        'xsi:type' => 'primary',
+                                        'name' => 'PRIMARY',
+                                        'columns' => [
+                                            'second_column'
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                // @codingStandardsIgnoreStart
+                'XMLResult' => '<?xml version="1.0"?>
+                        <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                            xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+                            <table name="first_table" resource="default" engine="innodb">
+                                <column xmlns:xsi="xsi" xsi:type="integer" name="first_column" nullable="1" 
+                                    unsigned="0"/>
+                                <column xmlns:xsi="xsi" xsi:type="date" name="second_column" nullable="0"/>
+                                <constraint xmlns:xsi="xsi" xsi:type="foreign" name="some_foreign_constraint" 
+                                    referenceTable="table" referenceColumn="column" 
+                                    table="first_table" column="first_column"/>
+                                <constraint xmlns:xsi="xsi" xsi:type="primary" name="PRIMARY">
+                                    <column name="second_column"/>
+                                </constraint>
+                                <index name="TEST_INDEX" indexType="btree">
+                                    <column name="first_column"/>
+                                </index>
+                            </table>
+                        </schema>'
+                // @codingStandardsIgnoreEnd
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/_files/data_patch_classes.php b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/data_patch_classes.php
new file mode 100644
index 0000000000000..b259f55b94407
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/data_patch_classes.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile - as of namespace absence
+
+class OtherDataPatch implements \Magento\Framework\Setup\Patch\DataPatchInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+    }
+}
+
+class SomeDataPatch implements
+    \Magento\Framework\Setup\Patch\DataPatchInterface,
+    \Magento\Framework\Setup\Patch\PatchVersionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            OtherDataPatch::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+}
+
+class NonTransactionableDataPatch implements
+    \Magento\Framework\Setup\Patch\DataPatchInterface,
+    \Magento\Framework\Setup\Patch\NonTransactionableInterface
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+    }
+}
+
+class RevertableDataPatch implements
+    \Magento\Framework\Setup\Patch\DataPatchInterface,
+    \Magento\Framework\Setup\Patch\PatchRevertableInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function revert()
+    {
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/_files/schema_patch_classes.php b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/schema_patch_classes.php
new file mode 100644
index 0000000000000..0f44d7a13346e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/schema_patch_classes.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile - as of namespace absence
+
+class OtherSchemaPatch implements \Magento\Framework\Setup\Patch\SchemaPatchInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+    }
+}
+
+class SomeSchemaPatch implements
+    \Magento\Framework\Setup\Patch\SchemaPatchInterface,
+    \Magento\Framework\Setup\Patch\PatchVersionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            OtherDataPatch::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/UpToDateValidatorInterface.php b/lib/internal/Magento/Framework/Setup/UpToDateValidatorInterface.php
new file mode 100644
index 0000000000000..033fdaa3de2e9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/UpToDateValidatorInterface.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\Setup;
+
+/**
+ * Allows to check whether specific component of database is up to date.
+ *
+ * New way of interaction with database implies that there can be components like:
+ *  - Declarative Schema
+ *  - Data Patches
+ *  - Schema Patches
+ *  - In Future (maybe): triggers, stored procedures, etc
+ *
+ * Old way implies, that each module has 2 components: data and schema
+ */
+interface UpToDateValidatorInterface
+{
+    /**
+     * Retrieve message, that uncover outdated component
+     *
+     * @return string
+     */
+    public function getNotUpToDateMessage() : string ;
+
+    /**
+     * Validate component whether it is up to date or not
+     *
+     * @return bool
+     */
+    public function isUpToDate() : bool ;
+}
diff --git a/lib/internal/Magento/Framework/Setup/XmlPersistor.php b/lib/internal/Magento/Framework/Setup/XmlPersistor.php
new file mode 100644
index 0000000000000..14a440bdee6f1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/XmlPersistor.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup;
+
+/**
+ * Persist listened schema to db_schema.xml file.
+ */
+class XmlPersistor
+{
+    /**
+     * Persist XML object to file.
+     *
+     * @param \SimpleXMLElement $simpleXMLElement
+     * @param $path
+     */
+    public function persist(\SimpleXMLElement $simpleXMLElement, $path)
+    {
+        $dom = new \DOMDocument('1.0');
+        $dom->preserveWhiteSpace = false;
+        $dom->formatOutput = true;
+        $dom->loadXML($simpleXMLElement->asXML());
+        file_put_contents(
+            $path,
+            str_replace(
+                ' xmlns:xsi="xsi"', //replace namespace, as we do not need it for xsi namespace
+                '',
+                $dom->saveXML()
+            )
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Shell.php b/lib/internal/Magento/Framework/Shell.php
index 8940903da81ee..9a70bec54811f 100644
--- a/lib/internal/Magento/Framework/Shell.php
+++ b/lib/internal/Magento/Framework/Shell.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework;
 
 use Magento\Framework\Shell\CommandRendererInterface;
@@ -51,12 +52,13 @@ public function execute($command, array $arguments = [])
 
         $disabled = explode(',', str_replace(' ', ',', ini_get('disable_functions')));
         if (in_array('exec', $disabled)) {
-            throw new Exception\LocalizedException(new \Magento\Framework\Phrase("exec function is disabled."));
+            throw new Exception\LocalizedException(new \Magento\Framework\Phrase('The exec function is disabled.'));
         }
 
         exec($command, $output, $exitCode);
         $output = implode(PHP_EOL, $output);
         $this->log($output);
+
         if ($exitCode) {
             $commandError = new \Exception($output, $exitCode);
             throw new Exception\LocalizedException(
diff --git a/lib/internal/Magento/Framework/Shell/Driver.php b/lib/internal/Magento/Framework/Shell/Driver.php
index 8a2cd2e5bb57d..f905b5a441ba3 100644
--- a/lib/internal/Magento/Framework/Shell/Driver.php
+++ b/lib/internal/Magento/Framework/Shell/Driver.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Shell;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -37,7 +38,7 @@ public function execute($command, $arguments)
     {
         $disabled = explode(',', str_replace(' ', ',', ini_get('disable_functions')));
         if (in_array('exec', $disabled)) {
-            throw new LocalizedException(new \Magento\Framework\Phrase("exec function is disabled."));
+            throw new LocalizedException(new \Magento\Framework\Phrase('The exec function is disabled.'));
         }
 
         $command = $this->commandRenderer->render($command, $arguments);
diff --git a/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php b/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php
index 213e2afa2c655..01964bdced655 100644
--- a/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php
+++ b/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererTest.php
@@ -24,6 +24,9 @@ public function testRender($expectedCommand, $actualCommand, $testArguments)
         );
     }
 
+    /**
+     * @return array
+     */
     public function commandsDataProvider()
     {
         $testArgument  = 'argument';
diff --git a/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php b/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php
index 2455b8f3cb500..ea2149e6f9e34 100644
--- a/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php
+++ b/lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php
@@ -108,6 +108,9 @@ public function testSetAttribute($name, $value)
         $this->assertEquals($xml->getAttribute($name), $value);
     }
 
+    /**
+     * @return array
+     */
     public function setAttributeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index 618c70b760d09..dff31a897e1ac 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -152,11 +152,11 @@ protected function setCookie($name, $value, array $metadataArray)
             $params['name'] = $name;
             if ($value == '') {
                 throw new FailureToSendException(
-                    new Phrase('Unable to delete the cookie with cookieName = %name', $params)
+                    new Phrase('The cookie with "%name" cookieName couldn\'t be deleted.', $params)
                 );
             } else {
                 throw new FailureToSendException(
-                    new Phrase('Unable to send the cookie with cookieName = %name', $params)
+                    new Phrase('The cookie with "%name" cookieName couldn\'t be sent. Please try again later.', $params)
                 );
             }
         }
@@ -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/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime.php
index 7f25620fdc736..36db84860b373 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime.php
@@ -79,6 +79,9 @@ public function isEmptyDate($date)
      * @param int $time
      * @return string The given time in given format
      *
+     * @deprecated
+     * @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
+     *
      * @codeCoverageIgnore
      */
     public function gmDate($format, $time)
@@ -92,6 +95,9 @@ public function gmDate($format, $time)
      * @param string $timeStr
      * @return int
      *
+     * @deprecated
+     * @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
+     *
      * @codeCoverageIgnore
      */
     public function strToTime($timeStr)
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
index 19a960568d9fc..24772955859d6 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Stdlib\DateTime;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -82,7 +83,9 @@ protected function doFormatObject($object, $format = null, $locale = null)
             $dateFormat = $timeFormat = \IntlDateFormatter::MEDIUM;
             $pattern = $format;
         } else {
-            throw new LocalizedException(new Phrase('Format type is invalid'));
+            throw new LocalizedException(
+                new Phrase('The format type is invalid. Verify the format type and try again.')
+            );
         }
 
         $timezone = $object->getTimezone();
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
index 90aec6024fe12..cf747bfa2b735 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -3,13 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Stdlib\DateTime;
 
-use \Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Phrase;
 
 /**
  * Timezone library
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Timezone implements TimezoneInterface
 {
@@ -29,7 +36,7 @@ class Timezone implements TimezoneInterface
     protected $_scopeType;
 
     /**
-     * @var \Magento\Framework\App\ScopeResolverInterface
+     * @var ScopeResolverInterface
      */
     protected $_scopeResolver;
 
@@ -44,28 +51,28 @@ class Timezone implements TimezoneInterface
     protected $_defaultTimezonePath;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Locale\ResolverInterface
+     * @var ResolverInterface
      */
     protected $_localeResolver;
 
     /**
-     * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param ScopeResolverInterface $scopeResolver
+     * @param ResolverInterface $localeResolver
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param ScopeConfigInterface $scopeConfig
      * @param string $scopeType
      * @param string $defaultTimezonePath
      */
     public function __construct(
-        \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        ScopeResolverInterface $scopeResolver,
+        ResolverInterface $localeResolver,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        ScopeConfigInterface $scopeConfig,
         $scopeType,
         $defaultTimezonePath
     ) {
@@ -78,7 +85,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultTimezonePath()
     {
@@ -86,7 +93,7 @@ public function getDefaultTimezonePath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultTimezone()
     {
@@ -94,7 +101,7 @@ public function getDefaultTimezone()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfigTimezone($scopeType = null, $scopeCode = null)
     {
@@ -106,7 +113,7 @@ public function getConfigTimezone($scopeType = null, $scopeCode = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDateFormat($type = \IntlDateFormatter::SHORT)
     {
@@ -118,7 +125,7 @@ public function getDateFormat($type = \IntlDateFormatter::SHORT)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDateFormatWithLongYear()
     {
@@ -130,7 +137,7 @@ public function getDateFormatWithLongYear()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTimeFormat($type = \IntlDateFormatter::SHORT)
     {
@@ -142,7 +149,7 @@ public function getTimeFormat($type = \IntlDateFormatter::SHORT)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDateTimeFormat($type)
     {
@@ -150,7 +157,7 @@ public function getDateTimeFormat($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true)
     {
@@ -174,6 +181,8 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
                     $timeType,
                     new \DateTimeZone($timezone)
                 );
+
+                $date = $this->appendTimeIfNeeded($date, $includeTime);
                 $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
                 break;
         }
@@ -182,7 +191,7 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function scopeDate($scope = null, $date = null, $includeTime = false)
     {
@@ -195,7 +204,7 @@ public function scopeDate($scope = null, $date = null, $includeTime = false)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $showTime = false)
     {
@@ -209,7 +218,7 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function scopeTimeStamp($scope = null)
     {
@@ -222,11 +231,11 @@ public function scopeTimeStamp($scope = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
     {
-        if (!$scope instanceof \Magento\Framework\App\ScopeInterface) {
+        if (!$scope instanceof ScopeInterface) {
             $scope = $this->_scopeResolver->getScope($scope);
         }
 
@@ -248,13 +257,7 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
     }
 
     /**
-     * @param string|\DateTimeInterface $date
-     * @param int $dateType
-     * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
-     * @param string|null $pattern
-     * @return string
+     * @inheritdoc
      */
     public function formatDateTime(
         $date,
@@ -290,13 +293,7 @@ public function formatDateTime(
     }
 
     /**
-     * Convert date from config timezone to Utc.
-     * If pass \DateTime object as argument be sure that timezone is the same with config timezone
-     *
-     * @param string|\DateTimeInterface $date
-     * @param string $format
-     * @throws LocalizedException
-     * @return string
+     * @inheritdoc
      */
     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
     {
@@ -309,7 +306,10 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
         } else {
             if ($date->getTimezone()->getName() !== $this->getConfigTimezone()) {
                 throw new LocalizedException(
-                    new Phrase('DateTime object timezone must be the same as config - %1', $this->getConfigTimezone())
+                    new Phrase(
+                        'The DateTime object timezone needs to be the same as the "%1" timezone in config.',
+                        $this->getConfigTimezone()
+                    )
                 );
             }
         }
@@ -318,4 +318,19 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
 
         return $date->format($format);
     }
+
+    /**
+     * Retrieve date with time
+     *
+     * @param string $date
+     * @param bool $includeTime
+     * @return string
+     */
+    private function appendTimeIfNeeded($date, $includeTime)
+    {
+        if ($includeTime && !preg_match('/\d{1}:\d{2}/', $date)) {
+            $date .= " 0:00am";
+        }
+        return $date;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverter.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverter.php
new file mode 100644
index 0000000000000..420fd6e543e07
--- /dev/null
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverter.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Stdlib\DateTime\Timezone;
+
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class LocalizedDateToUtcConverter
+ */
+class LocalizedDateToUtcConverter implements LocalizedDateToUtcConverterInterface
+{
+    /**
+     * Contains default date format
+     *
+     * @var string
+     */
+    private $defaultFormat = 'Y-m-d H:i:s';
+
+    /**
+     * @var TimezoneInterface
+     */
+    private $timezone;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * LocalizedDateToUtcConverter constructor.
+     *
+     * @param TimezoneInterface $timezone
+     * @param ResolverInterface $localeResolver
+     */
+    public function __construct(
+        TimezoneInterface $timezone,
+        ResolverInterface $localeResolver
+    ) {
+        $this->timezone = $timezone;
+        $this->localeResolver = $localeResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function convertLocalizedDateToUtc($date)
+    {
+        $configTimezone = $this->timezone->getConfigTimezone();
+        $locale = $this->localeResolver->getLocale();
+
+        $formatter = new \IntlDateFormatter(
+            $locale,
+            \IntlDateFormatter::MEDIUM,
+            \IntlDateFormatter::MEDIUM,
+            $configTimezone
+        );
+
+        $localTimestamp = $formatter->parse($date);
+        $gmtTimestamp = $this->timezone->date($localTimestamp)->getTimestamp();
+        $formattedUniversalTime = date($this->defaultFormat, $gmtTimestamp);
+
+        $date = new \DateTime($formattedUniversalTime, new \DateTimeZone($configTimezone));
+        $date->setTimezone(new \DateTimeZone('UTC'));
+
+        return $date->format($this->defaultFormat);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverterInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverterInterface.php
new file mode 100644
index 0000000000000..d10bd5f2fefb2
--- /dev/null
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/LocalizedDateToUtcConverterInterface.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\Stdlib\DateTime\Timezone;
+
+/*
+ * Interface for converting localized date to UTC
+ */
+interface LocalizedDateToUtcConverterInterface
+{
+    /**
+     * Convert localized date to UTC
+     *
+     * @param string $date
+     * @return string
+     */
+    public function convertLocalizedDateToUtc($date);
+}
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
index aef2bfb808842..43cc83a702f6c 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Stdlib\DateTime\Timezone;
 
 use Magento\Framework\Exception\ValidatorException;
@@ -53,7 +54,10 @@ public function validate($timestamp, $toDate)
 
         if ($transitionYear > $this->_yearMaxValue || $transitionYear < $this->_yearMinValue) {
             throw new ValidatorException(
-                new Phrase('Transition year is out of system date range.')
+                new Phrase(
+                    "The transition year isn't included in the system date range. "
+                    . "Verify the year date range and try again."
+                )
             );
         }
 
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
index 047ca9d8b4528..d1ac24c84be9a 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Stdlib\DateTime;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Timezone Interface
  * @api
@@ -80,6 +82,7 @@ public function scopeDate($scope = null, $date = null, $includeTime = false);
 
     /**
      * Get scope timestamp
+     *
      * Timestamp will be built with scope timezone settings
      *
      * @param   mixed $scope
@@ -121,11 +124,13 @@ public function getConfigTimezone($scopeType = null, $scopeCode = null);
     public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
 
     /**
+     * Format date according to date and time formats, locale, timezone and pattern.
+     *
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
+     * @param string|null $locale
+     * @param string|null $timezone
      * @param string|null $pattern
      * @return string
      */
@@ -139,9 +144,14 @@ public function formatDateTime(
     );
 
     /**
+     * Convert date from config timezone to UTC.
+     *
+     * If pass \DateTime object as argument be sure that timezone is the same with config timezone
+     *
      * @param string|\DateTimeInterface $date
      * @param string $format
      * @return string
+     * @throws LocalizedException
      * @since 100.1.0
      */
     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s');
diff --git a/lib/internal/Magento/Framework/Stdlib/StringUtils.php b/lib/internal/Magento/Framework/Stdlib/StringUtils.php
index 2ef7f3e79cd05..35decd7dab0a0 100644
--- a/lib/internal/Magento/Framework/Stdlib/StringUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/StringUtils.php
@@ -148,7 +148,7 @@ public function split($value, $length = 1, $keepWords = false, $trim = false, $w
      */
     public function strlen($string)
     {
-        return iconv_strlen($string, self::ICONV_CHARSET);
+        return mb_strlen($string, self::ICONV_CHARSET);
     }
 
     /**
@@ -159,15 +159,11 @@ public function strlen($string)
      */
     public function cleanString($string)
     {
-        if ('"libiconv"' == ICONV_IMPL) {
-            return iconv(self::ICONV_CHARSET, self::ICONV_CHARSET . '//IGNORE', $string);
-        } else {
-            return $string;
-        }
+        return mb_convert_encoding($string, self::ICONV_CHARSET);
     }
 
     /**
-     * Pass through to iconv_substr()
+     * Pass through to mb_substr()
      *
      * @param string $string
      * @param int $offset
@@ -180,7 +176,7 @@ public function substr($string, $offset, $length = null)
         if ($length === null) {
             $length = $this->strlen($string) - $offset;
         }
-        return iconv_substr($string, $offset, $length, self::ICONV_CHARSET);
+        return mb_substr($string, $offset, $length, self::ICONV_CHARSET);
     }
 
     /**
@@ -212,6 +208,6 @@ public function strrev($str)
      */
     public function strpos($haystack, $needle, $offset = null)
     {
-        return iconv_strpos($haystack, $needle, $offset, self::ICONV_CHARSET);
+        return mb_strpos($haystack, $needle, $offset, self::ICONV_CHARSET);
     }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
index 26dcbc81262a2..64eb1e9c4bf39 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
@@ -38,6 +38,9 @@ public function testToBoolean($input, $expected)
         $this->assertSame($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function toBooleanDataProvider()
     {
         return [
@@ -64,6 +67,9 @@ public function testToBooleanException($input)
         $this->object->toBoolean($input);
     }
 
+    /**
+     * @return array
+     */
     public function toBooleanExceptionDataProvider()
     {
         return [
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 b3cb5f2aeddce..5a29fad2b16ab 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.
@@ -234,7 +232,7 @@ public function testDeleteCookieWithFailureToSendException()
             } catch (FailureToSendException $fse) {
                 $this->assertTrue(self::$isSetCookieInvoked);
                 $this->assertSame(
-                    'Unable to delete the cookie with cookieName = exception_cookie_name',
+                    'The cookie with "exception_cookie_name" cookieName couldn\'t be deleted.',
                     $fse->getMessage()
                 );
             }
@@ -274,6 +272,9 @@ public function testSetSensitiveCookieNoMetadata($cookieName, $secure)
             $this->assertTrue(self::$isSetCookieInvoked);
         }
 
+        /**
+         * @return array
+         */
         public function isCurrentlySecureDataProvider()
         {
             return [
@@ -499,7 +500,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 +530,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;
             }
 
@@ -839,6 +843,11 @@ private static function assertCookieSize(
             self::assertEquals('', $path);
         }
 
+        /**
+         * @param $get
+         * @param $default
+         * @param $return
+         */
         protected function stubGetCookie($get, $default, $return)
         {
             $this->readerMock->expects($this->atLeastOnce())
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
index 9015968cee85c..d409a89c2cc91 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
@@ -59,6 +59,9 @@ public function testConstructorAndGetHttpOnly($metadata, $httpOnly)
         $this->assertEquals('path', $object->getPath());
     }
 
+    /**
+     * @return array
+     */
     public function constructorAndGetHttpOnlyTestDataProvider()
     {
         return [
@@ -104,6 +107,9 @@ public function testGetSecure($isSecure, $metadata, $expected, $callNum = 1)
         $this->assertEquals($expected, $object->getSecure());
     }
 
+    /**
+     * @return array
+     */
     public function getSecureDataProvider()
     {
         return [
@@ -160,6 +166,9 @@ public function testToArray($isSecure, $metadata, $expected, $callNum = 1)
         $this->assertEquals($expected, $object->__toArray());
     }
 
+    /**
+     * @return array
+     */
     public function toArrayDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
index e97dfab795c59..f89144f9753db 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Stdlib\Cookie;
 
-use \Magento\Framework\Stdlib\Cookie\PhpCookieManager;
 use \Magento\Framework\Stdlib\Test\Unit\Cookie\PhpCookieManagerTest;
 
 /**
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
index 5012c6a47f1c5..f5c8f370fe453 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Stdlib\Test\Unit\DateTime;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -118,7 +119,7 @@ public function dataProviderFormatObject()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Format type is invalid
+     * @expectedExceptionMessage The format type is invalid. Verify the format type and try again.
      */
     public function testFormatObjectIfPassedWrongFormat()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Timezone/ValidatorTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Timezone/ValidatorTest.php
index 71638a38c55b9..4242664c44b30 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Timezone/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Timezone/ValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Stdlib\Test\Unit\DateTime\Timezone;
 
 class ValidatorTest extends \PHPUnit\Framework\TestCase
@@ -15,12 +16,15 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
     /**
      * @dataProvider validateWithTimestampOutOfSystemRangeDataProvider
      * @expectedException \Magento\Framework\Exception\ValidatorException
-     * @expectedExceptionMessage Transition year is out of system date range.
      */
     public function testValidateWithTimestampOutOfSystemRangeThrowsException($range, $validateArgs)
     {
         $this->_validator = new \Magento\Framework\Stdlib\DateTime\Timezone\Validator($range['min'], $range['max']);
         $this->_validator->validate($validateArgs['timestamp'], $validateArgs['to_date']);
+
+        $this->expectExceptionMessage(
+            "The transition year isn't included in the system date range. Verify the year date range and try again."
+        );
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/System/Dirs.php b/lib/internal/Magento/Framework/System/Dirs.php
index 1bab4c90b3bec..6328921d40bb0 100644
--- a/lib/internal/Magento/Framework/System/Dirs.php
+++ b/lib/internal/Magento/Framework/System/Dirs.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\System;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 class Dirs
 {
     /**
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 216026be8d72e..14f55f32add82 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\System;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * Class to work with remote FTP server
  */
@@ -34,7 +32,7 @@ protected function checkConnected()
     }
 
     /**
-     * ftp_mkdir wrapper
+     * Wrapper for ftp_mkdir
      *
      * @param string $name
      * @return string the newly created directory name on success or <b>FALSE</b> on error.
@@ -58,7 +56,7 @@ public function mkdirRecursive($path, $mode = 0777)
         $dir = explode("/", $path);
         $path = "";
         $ret = true;
-        for ($i = 0; $i < count($dir); $i++) {
+        for ($i = 0, $count = count($dir); $i < $count; $i++) {
             $path .= "/" . $dir[$i];
             if (!@ftp_chdir($this->_conn, $path)) {
                 @ftp_chdir($this->_conn, "/");
@@ -107,6 +105,12 @@ public function validateConnectionString($string)
         if ($data['scheme'] != 'ftp') {
             throw new \Exception("Support for scheme unsupported: '{$data['scheme']}'");
         }
+        
+        // Decode user & password strings from URL
+        foreach (array_intersect(array_keys($data), ['user','pass']) as $key) {
+            $data[$key] = urldecode($data[$key]);
+        }
+        
         return $data;
     }
 
@@ -123,7 +127,7 @@ public function validateConnectionString($string)
     public function connect($string, $timeout = 900)
     {
         $params = $this->validateConnectionString($string);
-        $port = isset($params['port']) ? intval($params['port']) : 21;
+        $port = isset($params['port']) ? (int)$params['port'] : 21;
 
         $this->_conn = ftp_connect($params['host'], $port, $timeout);
 
@@ -143,7 +147,7 @@ public function connect($string, $timeout = 900)
     }
 
     /**
-     * ftp_fput wrapper
+     * Wrapper for ftp_fput
      *
      * @param string $remoteFile
      * @param resource $handle
@@ -158,7 +162,7 @@ public function fput($remoteFile, $handle, $mode = FTP_BINARY, $startPos = 0)
     }
 
     /**
-     * ftp_put wrapper
+     * Wrapper for ftp_put
      *
      * @param string $remoteFile
      * @param string $localFile
@@ -184,7 +188,7 @@ public function getcwd()
         if (empty($data[1])) {
             return false;
         }
-        if (intval($data[0]) != 257) {
+        if ((int)$data[0] != 257) {
             return false;
         }
         $out = trim($data[1], '"');
@@ -195,7 +199,7 @@ public function getcwd()
     }
 
     /**
-     * ftp_raw wrapper
+     * Wrapper for ftp_raw
      *
      * @param string $cmd
      * @return array The server's response as an array of strings.
@@ -268,7 +272,7 @@ public function download($remote, $local, $ftpMode = FTP_BINARY)
     }
 
     /**
-     * ftp_pasv wrapper
+     * Wrapper for ftp_pasv
      *
      * @param bool $pasv
      * @return bool
@@ -292,7 +296,7 @@ public function close()
     }
 
     /**
-     * ftp_chmod wrapper
+     * Wrapper for ftp_chmod
      *
      * @param int $mode
      * @param string $remoteFile
@@ -305,7 +309,7 @@ public function chmod($mode, $remoteFile)
     }
 
     /**
-     * ftp_chdir wrapper
+     * Wrapper for ftp_chdir
      *
      * @param string $dir
      * @return bool
@@ -317,7 +321,7 @@ public function chdir($dir)
     }
 
     /**
-     * ftp_cdup wrapper
+     * Wrapper for ftp_cdup
      *
      * @return bool
      */
@@ -328,7 +332,7 @@ public function cdup()
     }
 
     /**
-     * ftp_get wrapper
+     * Wrapper for ftp_get
      *
      * @param string $localFile
      * @param string $remoteFile
@@ -345,7 +349,7 @@ public function get($localFile, $remoteFile, $fileMode = FTP_BINARY, $resumeOffs
     }
 
     /**
-     * ftp_nlist wrapper
+     * Wrapper for ftp_nlist
      *
      * @param string $dir
      * @return bool
@@ -358,7 +362,7 @@ public function nlist($dir = "/")
     }
 
     /**
-     * ftp_rawlist wrapper
+     * Wrapper for ftp_rawlist
      *
      * @param string $dir
      * @param bool $recursive
diff --git a/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php b/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
index d0bb0b9d73470..686c09e947509 100644
--- a/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
@@ -61,6 +61,31 @@ protected function setUp()
         );
     }
 
+    public function testGetTablePrefixWithInjectedPrefix()
+    {
+        /** @var ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->getObject(
+            ResourceConnection::class,
+            [
+                'deploymentConfig' => $this->deploymentConfigMock,
+                'connectionFactory' => $this->connectionFactoryMock,
+                'config' => $this->configMock,
+                'tablePrefix' => 'some_prefix'
+            ]
+        );
+
+        self::assertEquals($resourceConnection->getTablePrefix(), 'some_prefix');
+    }
+
+    public function testGetTablePrefix()
+    {
+        $this->deploymentConfigMock->expects(self::once())
+            ->method('get')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX)
+            ->willReturn('pref_');
+        self::assertEquals('pref_', $this->unit->getTablePrefix());
+    }
+
     public function testGetConnectionByName()
     {
         $this->deploymentConfigMock->expects(self::once())->method('get')
diff --git a/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php b/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
index 68be50810d44f..d4a19428c61a0 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
@@ -64,6 +64,9 @@ public function testIsArchive($file, $isArchive)
         $this->assertEquals($isArchive, $this->archive->isArchive($file));
     }
 
+    /**
+     * @return array
+     */
     public function isArchiveProvider()
     {
         return [
@@ -98,6 +101,9 @@ public function testIsTar($file, $isArchive)
         $this->assertEquals($isArchive, $this->archive->isTar($file));
     }
 
+    /**
+     * @return array
+     */
     public function isTarProvider()
     {
         return [
@@ -143,6 +149,9 @@ public function testPackUnpackGzBz($destinationFile, $extensionRequired)
         $this->assertStringStartsWith($this->destinationDir, $this->unpacked);
     }
 
+    /**
+     * @return array
+     */
     public function destinationProvider()
     {
         return [
@@ -200,6 +209,9 @@ public function testExtract($destinationFile, $extensionRequired)
         $this->assertStringStartsWith($this->destinationDir, $this->unpacked);
     }
 
+    /**
+     * @return array
+     */
     public function tarProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php
new file mode 100644
index 0000000000000..55410af176af0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Test\Unit\Communication\Config;
+
+use Magento\Framework\Communication\Config\Validator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+
+/**
+ * Unit test for \Magento\Framework\Communication\Config\Validator class
+ */
+class ValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TypeProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $typeProcessor;
+
+    /**
+     * @var MethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $methodsMap;
+
+    public function setUp()
+    {
+        $this->methodsMap = $this->createMock(MethodsMap::class);
+
+        $this->methodsMap->expects(static::any())
+            ->method('getMethodsMap')
+            ->will($this->throwException(new \InvalidArgumentException('message', 333)));
+
+        $this->typeProcessor = $this->createMock(TypeProcessor::class);
+        $this->typeProcessor->expects(static::any())
+            ->method('isTypeSimple')
+            ->willReturn(false);
+
+        $this->typeProcessor->expects(static::any())
+            ->method('isTypeSimple')
+            ->willReturn(false);
+    }
+
+    /**
+     * @expectedException  \LogicException
+     * @expectedExceptionCode 333
+     * @expectedExceptionMessage Response schema definition has service class with wrong annotated methods
+     */
+    public function testValidateResponseSchemaType()
+    {
+        /** @var Validator $validator */
+        $validator = new Validator($this->typeProcessor, $this->methodsMap);
+        $validator->validateResponseSchemaType('123', '123');
+    }
+
+    /**
+     * @expectedException  \LogicException
+     * @expectedExceptionCode 333
+     * @expectedExceptionMessage Request schema definition has service class with wrong annotated methods
+     */
+    public function testValidateRequestSchemaType()
+    {
+        /** @var Validator $validator */
+        $validator = new Validator($this->typeProcessor, $this->methodsMap);
+        $validator->validateRequestSchemaType('123', '123');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/Config/FileResolverByModuleTest.php b/lib/internal/Magento/Framework/Test/Unit/Config/FileResolverByModuleTest.php
new file mode 100644
index 0000000000000..1a1f3391f0170
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Config/FileResolverByModuleTest.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Test\Unit\Config;
+
+use Magento\Framework\Config\FileIterator;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FileResolverByModuleTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Config\FileResolverByModule
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \Magento\Framework\Module\Dir\Reader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerMock;
+
+    /**
+     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var \Magento\Framework\Config\FileIteratorFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileIteratorFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $componentRegistrarMock;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileDriver;
+
+    protected function setUp()
+    {
+        $this->readerMock = $this->getMockBuilder(\Magento\Framework\Module\Dir\Reader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fileIteratorFactoryMock = $this->getMockBuilder(\Magento\Framework\Config\FileIteratorFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->componentRegistrarMock = $this->getMockBuilder(\Magento\Framework\Component\ComponentRegistrar::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fileDriver = $this->getMockBuilder(\Magento\Framework\Filesystem\Driver\File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Config\FileResolverByModule::class,
+            [
+                'moduleReader' => $this->readerMock,
+                'filesystem' => $this->filesystemMock,
+                'iteratorFactory' => $this->fileIteratorFactoryMock,
+                'componentRegistrar' => $this->componentRegistrarMock,
+                'driver' => $this->fileDriver
+            ]
+        );
+    }
+
+    public function testGet()
+    {
+        $iterator = $this->getMockBuilder(FileIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $iterator->expects(self::once())
+            ->method('toArray')
+            ->willReturn([
+                'some_path' => '<xml>Some Content</xml>'
+            ]);
+        $primaryIterator = $this->getMockBuilder(FileIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $primaryIterator->expects(self::once())
+            ->method('toArray')
+            ->willReturn([
+                '/www/app/etc/db_schema.xml' => '<xml>Primary Content</xml>'
+            ]);
+        $directoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $directoryMock->expects(self::once())
+            ->method('search')
+            ->with('{db_schema.xml,*/db_schema.xml}')
+            ->willReturn(['app/etc/db_schema.xml']);
+        $directoryMock->expects(self::once())
+            ->method('getAbsolutePath')
+            ->willReturn('/www/app/etc/db_schema.xml');
+        $this->readerMock->expects(self::once())
+            ->method('getConfigurationFiles')
+            ->willReturn($iterator);
+        $this->fileIteratorFactoryMock->expects(self::once())
+            ->method('create')
+            ->with(['/www/app/etc/db_schema.xml'])
+            ->willReturn($primaryIterator);
+        $this->fileDriver->expects(self::once())
+            ->method('isFile')
+            ->with('/www/app/etc/db_schema.xml')
+            ->willReturn(true);
+        $this->filesystemMock->expects(self::once())
+            ->method('getDirectoryRead')
+            ->willReturn($directoryMock);
+        self::assertEquals(
+            $this->model->get('db_schema.xml', 'all'),
+            [
+                'some_path' => '<xml>Some Content</xml>',
+                '/www/app/etc/db_schema.xml' => '<xml>Primary Content</xml>'
+            ]
+        );
+    }
+
+    /**
+     * @expectedExceptionMessage Primary db_schema file doesn`t exist
+     */
+    public function testGetWithException()
+    {
+        $iterator = $this->getMockBuilder(FileIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $iterator->expects(self::once())
+            ->method('toArray')
+            ->willReturn([
+                'some_path' => '<xml>Some Content</xml>'
+            ]);
+        $primaryIterator = $this->getMockBuilder(FileIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $primaryIterator->expects(self::once())
+            ->method('toArray')
+            ->willReturn([
+                '/www/app/etc/db_schema.xml' => '<xml>Primary Content</xml>'
+            ]);
+        $directoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $directoryMock->expects(self::once())
+            ->method('search')
+            ->with('{db_schema.xml,*/db_schema.xml}')
+            ->willReturn(['app/etc/db_schema.xml']);
+        $directoryMock->expects(self::once())
+            ->method('getAbsolutePath')
+            ->willReturn('/www/app/etc/db_schema.xml');
+        $this->readerMock->expects(self::once())
+            ->method('getConfigurationFiles')
+            ->willReturn($iterator);
+        $this->fileIteratorFactoryMock->expects(self::once())
+            ->method('create')
+            ->with(['/www/app/etc/db_schema.xml'])
+            ->willReturn($primaryIterator);
+        $this->fileDriver->expects(self::once())
+            ->method('isFile')
+            ->with('/www/app/etc/db_schema.xml')
+            ->willReturn(true);
+        $this->filesystemMock->expects(self::once())
+            ->method('getDirectoryRead')
+            ->willReturn($directoryMock);
+        $this->model->get('db_schema.xml', 'all');
+    }
+
+    public function testGetOneModule()
+    {
+        $iterator = $this->getMockBuilder(FileIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $iterator->expects(self::once())
+            ->method('toArray')
+            ->willReturn([
+                'some_path/etc/db_schema.xml' => '<xml>Some Content</xml>'
+            ]);
+        $primaryIterator = $this->getMockBuilder(FileIterator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $primaryIterator->expects(self::once())
+            ->method('toArray')
+            ->willReturn([
+                '/www/app/etc/db_schema.xml' => '<xml>Primary Content</xml>'
+            ]);
+        $directoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $directoryMock->expects(self::once())
+            ->method('search')
+            ->with('{db_schema.xml,*/db_schema.xml}')
+            ->willReturn(['app/etc/db_schema.xml']);
+        $directoryMock->expects(self::once())
+            ->method('getAbsolutePath')
+            ->willReturn('/www/app/etc/db_schema.xml');
+        $this->readerMock->expects(self::once())
+            ->method('getConfigurationFiles')
+            ->willReturn($iterator);
+        $this->fileIteratorFactoryMock->expects(self::once())
+            ->method('create')
+            ->with(['/www/app/etc/db_schema.xml'])
+            ->willReturn($primaryIterator);
+        $this->fileDriver->expects(self::once())
+            ->method('isFile')
+            ->with('/www/app/etc/db_schema.xml')
+            ->willReturn(true);
+        $this->filesystemMock->expects(self::once())
+            ->method('getDirectoryRead')
+            ->willReturn($directoryMock);
+        $this->componentRegistrarMock->expects(self::once())
+            ->method('getPath')
+            ->with('module', 'Magento_Some')
+            ->willReturn('some_path');
+        self::assertEquals(
+            [
+                'some_path/etc/db_schema.xml' => '<xml>Some Content</xml>',
+                '/www/app/etc/db_schema.xml' => '<xml>Primary Content</xml>'
+            ],
+            $this->model->get('db_schema.xml', 'Magento_Some')
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
index 22fdf0a05686a..9e2014c1b070a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
@@ -116,6 +116,6 @@ public function testIterations()
             $iterations++;
         }
 
-        $this->assertEquals(10, $iterations);
+        $this->assertEquals(11, $iterations);
     }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php
index e5b5876b65f46..bcb90714f9563 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Test\Unit\DB\Query;
 
 use Magento\Framework\DB\Query\BatchIterator;
@@ -87,7 +88,7 @@ public function testGenerate()
      * Test batch generation with invalid select object.
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage  Select object must have correct "FROM" part
+     * @expectedExceptionMessage The select object must have the correct "FROM" part. Verify and try again.
      * @return void
      */
     public function testGenerateWithoutFromPart()
diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
new file mode 100644
index 0000000000000..7d54337f377fa
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Test\Unit\Data\Form\Element;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for \Magento\Framework\Data\Form\Element\Hidden.
+ */
+class HiddenTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Data\Form\Element\Hidden
+     */
+    private $element;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->element = $objectManager->getObject(\Magento\Framework\Data\Form\Element\Hidden::class);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @dataProvider getElementHtmlDataProvider
+     */
+    public function testGetElementHtml($value)
+    {
+        $form = $this->createMock(\Magento\Framework\Data\Form::class);
+        $this->element->setForm($form);
+        $this->element->setValue($value);
+        $html = $this->element->getElementHtml();
+
+        if (is_array($value)) {
+            foreach ($value as $item) {
+                $this->assertContains($item, $html);
+            }
+            return;
+        }
+        $this->assertContains($value, $html);
+    }
+
+    /**
+     * @return array
+     */
+    public function getElementHtmlDataProvider()
+    {
+        return [
+            ['some_value'],
+            ['store_ids[]' => ['1', '2']],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
index a064535590f32..2c481e3606c85 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
@@ -384,6 +384,9 @@ public function testUnderscore($input, $expectedOutput)
         $this->assertEquals($expectedOutput, $output);
     }
 
+    /**
+     * @return array
+     */
     public function underscoreDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Test/Unit/DomDocument/DomDocumentFactoryTest.php b/lib/internal/Magento/Framework/Test/Unit/DomDocument/DomDocumentFactoryTest.php
new file mode 100644
index 0000000000000..e3ea74339e043
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/DomDocument/DomDocumentFactoryTest.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Test\Unit\DomDocument;
+
+use Magento\Framework\DomDocument\DomDocumentFactory;
+
+class DomDocumentFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    public function testCreateReturnsDomDocument()
+    {
+        $domDocumentFactory = new DomDocumentFactory();
+        $this->assertInstanceOf(
+            \DOMDocument::class,
+            $domDocumentFactory->create()
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index c728fdecfeaab..1599cae073f30 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -30,12 +30,9 @@ class EscaperTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->escaper = new Escaper();
         $this->zendEscaper = new \Magento\Framework\ZendEscaper();
         $this->loggerMock = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
-        $objectManagerHelper = new ObjectManager($this);
-        $objectManagerHelper->setBackwardCompatibleProperty($this->escaper, 'escaper', $this->zendEscaper);
-        $objectManagerHelper->setBackwardCompatibleProperty($this->escaper, 'logger', $this->loggerMock);
+        $this->escaper = new Escaper($this->zendEscaper, $this->loggerMock);
     }
 
     /**
@@ -72,9 +69,9 @@ public function testEscapeJsEscapesOwaspRecommendedRanges()
         // Exceptions to escaping ranges
         $immune = [',', '.', '_'];
         for ($chr = 0; $chr < 0xFF; $chr++) {
-            if ($chr >= 0x30 && $chr <= 0x39
-                || $chr >= 0x41 && $chr <= 0x5A
-                || $chr >= 0x61 && $chr <= 0x7A
+            if (($chr >= 0x30 && $chr <= 0x39)
+                || ($chr >= 0x41 && $chr <= 0x5A)
+                || ($chr >= 0x61 && $chr <= 0x7A)
             ) {
                 $literal = $this->codepointToUtf8($chr);
                 $this->assertEquals($literal, $this->escaper->escapeJs($literal));
@@ -103,6 +100,9 @@ public function testEscapeJs($data, $expected)
         $this->assertEquals($expected, $this->escaper->escapeJs($data));
     }
 
+    /**
+     * @return array
+     */
     public function escapeJsDataProvider()
     {
         return [
@@ -171,6 +171,11 @@ public function escapeHtmlDataProvider()
                 'data' => '&<>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
                 'expected' => '&amp;&lt;&gt;&quot;&#039;&amp;&lt;&gt;&quot;&#039;&#9;'
             ],
+            'text with special characters and allowed tag' => [
+                'data' => '&<br/>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
+                'expected' => '&amp;<br>&quot;&#039;&amp;&lt;&gt;&quot;&#039;&#9;',
+                'allowedTags' => ['br'],
+            ],
             'text with multiple allowed tags, includes self closing tag' => [
                 'data' => '<span>some text in tags<br /></span>',
                 'expected' => '<span>some text in tags<br></span>',
diff --git a/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php b/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
index 955f16d4241c2..ea6ddf56414ff 100644
--- a/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
@@ -112,6 +112,9 @@ public function testDeleteFlag($isFlagExist)
         );
     }
 
+    /**
+     * @param $flagCode
+     */
     private function setupFlagObject($flagCode)
     {
         $this->flagFactoryMock->expects($this->once())
diff --git a/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php b/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
index d5243cacb1616..805bd8fe4510a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
@@ -33,6 +33,9 @@ public function testCreate($mainMessage, $subMessages, $separator, $expectedResu
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         $subMessage1 = new Error('go jogging');
diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
index 3e739c3688694..5027bfae606a6 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
@@ -99,28 +99,11 @@ public function testBeforeDispatchOutOfDateNoErrors()
         $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
     }
 
-    public function testBeforeDispatchOutOfDateWithErrors()
+    /**
+     * @dataProvider beforeDispatchOutOfDateWithErrorsDataProvider
+     */
+    public function testBeforeDispatchOutOfDateWithErrors(array $errors, string $expectedMessage)
     {
-        $errors = [
-            [
-                DbVersionInfo::KEY_MODULE => 'Magento_Module1',
-                DbVersionInfo::KEY_TYPE => 'schema',
-                DbVersionInfo::KEY_CURRENT => '3.3.3',
-                DbVersionInfo::KEY_REQUIRED => '4.4.4'
-            ],
-            [
-                DbVersionInfo::KEY_MODULE => 'Magento_Module2',
-                DbVersionInfo::KEY_TYPE => 'data',
-                DbVersionInfo::KEY_CURRENT => '2.8.7',
-                DbVersionInfo::KEY_REQUIRED => '5.1.6'
-            ]
-        ];
-        $message = 'Please upgrade your database: '
-            . "Run \"bin/magento setup:upgrade\" from the Magento root directory.\n"
-            . "The following modules are outdated:\n"
-            . "Magento_Module1 schema: current version - 3.3.3, required version - 4.4.4\n"
-            . "Magento_Module2 data: current version - 2.8.7, required version - 5.1.6";
-
         $this->cacheMock->expects(static::any())
             ->method('load')
             ->with('db_is_up_to_date')
@@ -131,7 +114,79 @@ public function testBeforeDispatchOutOfDateWithErrors()
         $this->cacheMock->expects(static::never())
             ->method('save');
 
-        $this->expectException(LocalizedException::class, $message);
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage($expectedMessage);
         $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
     }
+
+    /**
+     * @return array
+     */
+    public static function beforeDispatchOutOfDateWithErrorsDataProvider()
+    {
+        return [
+            'module versions too low' => [
+                'errors' => [
+                    [
+                        DbVersionInfo::KEY_MODULE => 'Magento_Module1',
+                        DbVersionInfo::KEY_TYPE => 'schema',
+                        DbVersionInfo::KEY_CURRENT => 'none',
+                        DbVersionInfo::KEY_REQUIRED => '4.4.4'
+                    ],
+                    [
+                        DbVersionInfo::KEY_MODULE => 'Magento_Module2',
+                        DbVersionInfo::KEY_TYPE => 'data',
+                        DbVersionInfo::KEY_CURRENT => '2.8.7',
+                        DbVersionInfo::KEY_REQUIRED => '5.1.6'
+                    ],
+                ],
+                'expectedMessage' => 'Please upgrade your database: '
+                    . "Run \"bin/magento setup:upgrade\" from the Magento root directory.\n"
+                    . "The following modules are outdated:\n"
+                    . "Magento_Module1 schema: current version - none, required version - 4.4.4\n"
+                    . "Magento_Module2 data: current version - 2.8.7, required version - 5.1.6"
+            ],
+            'module versions too high' => [
+                'errors' => [
+                    [
+                        DbVersionInfo::KEY_MODULE => 'Magento_Module3',
+                        DbVersionInfo::KEY_TYPE => 'schema',
+                        DbVersionInfo::KEY_CURRENT => '2.0.0',
+                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
+                    ],
+                    [
+                        DbVersionInfo::KEY_MODULE => 'Magento_Module4',
+                        DbVersionInfo::KEY_TYPE => 'data',
+                        DbVersionInfo::KEY_CURRENT => '1.0.10',
+                        DbVersionInfo::KEY_REQUIRED => '1.0.9'
+                    ],
+                ],
+                'expectedMessage' => "Please update your modules: "
+                    . "Run \"composer install\" from the Magento root directory.\n"
+                    . "The following modules are outdated:\n"
+                    . "Magento_Module3 schema: code version - 1.0.0, database version - 2.0.0\n"
+                    . "Magento_Module4 data: code version - 1.0.9, database version - 1.0.10",
+            ],
+            'some versions too high, some too low' => [
+                'errors' => [
+                    [
+                        DbVersionInfo::KEY_MODULE => 'Magento_Module2',
+                        DbVersionInfo::KEY_TYPE => 'schema',
+                        DbVersionInfo::KEY_CURRENT => '1.9.0',
+                        DbVersionInfo::KEY_REQUIRED => '1.12.0'
+                    ],
+                    [
+                        DbVersionInfo::KEY_MODULE => 'Magento_Module1',
+                        DbVersionInfo::KEY_TYPE => 'schema',
+                        DbVersionInfo::KEY_CURRENT => '2.0.0',
+                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
+                    ],
+                ],
+                'expectedMessage' => "Please update your modules: "
+                    . "Run \"composer install\" from the Magento root directory.\n"
+                    . "The following modules are outdated:\n"
+                    . "Magento_Module1 schema: code version - 1.0.0, database version - 2.0.0"
+            ]
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/ShellTest.php b/lib/internal/Magento/Framework/Test/Unit/ShellTest.php
index 913fd883eaad2..9f223f916b97a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ShellTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/ShellTest.php
@@ -83,6 +83,9 @@ public function testExecuteLog($command, $commandArgs, $expectedResult, $expecte
         );
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         // backtick symbol (`) has to be replaced with environment-dependent quote character
diff --git a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
index 5c689adc6743c..0ec27d6d053c3 100644
--- a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Test\Unit;
 
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Translate;
 
 /**
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TranslateTest extends \PHPUnit\Framework\TestCase
@@ -58,7 +61,10 @@ class TranslateTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Filesystem\Directory\ReadInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $directory;
 
-    protected function setUp()
+    /** @var \Magento\Framework\Filesystem\DriverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $fileDriver;
+
+    protected function setUp(): void
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->viewDesign = $this->createMock(\Magento\Framework\View\DesignInterface::class);
@@ -84,6 +90,7 @@ protected function setUp()
         $this->directory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
         $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
         $filesystem->expects($this->once())->method('getDirectoryRead')->will($this->returnValue($this->directory));
+        $this->fileDriver = $this->createMock(\Magento\Framework\Filesystem\DriverInterface::class);
 
         $this->translate = new Translate(
             $this->viewDesign,
@@ -98,7 +105,8 @@ protected function setUp()
             $filesystem,
             $this->request,
             $this->csvParser,
-            $this->packDictionary
+            $this->packDictionary,
+            $this->fileDriver
         );
 
         $serializerMock = $this->createMock(SerializerInterface::class);
@@ -121,27 +129,63 @@ protected function setUp()
      * @param string $area
      * @param bool $forceReload
      * @param array $cachedData
+     * @dataProvider dataProviderLoadDataCachedTranslation
+     */
+    public function testLoadDataCachedTranslation($area, $forceReload, $cachedData): void
+    {
+        $this->expectsSetConfig('Magento/luma');
+
+        $this->cache->expects($this->once())
+            ->method('load')
+            ->will($this->returnValue(json_encode($cachedData)));
+
+        $this->appState->expects($this->exactly($area ? 0 : 1))
+            ->method('getAreaCode')
+            ->will($this->returnValue('frontend'));
+
+        $this->translate->loadData($area, $forceReload);
+        $this->assertEquals($cachedData, $this->translate->getData());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderLoadDataCachedTranslation(): array
+    {
+        $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
      * @dataProvider dataProviderForTestLoadData
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function testLoadData($area, $forceReload, $cachedData)
+    public function testLoadData($area, $forceReload): void
     {
-        $this->expectsSetConfig('themeId');
+        $this->expectsSetConfig('Magento/luma');
+
+        $this->appState->expects($this->exactly($area ? 0 : 1))
+            ->method('getAreaCode')
+            ->will($this->returnValue('frontend'));
 
         $this->cache->expects($this->exactly($forceReload ? 0 : 1))
             ->method('load')
-            ->will($this->returnValue(json_encode($cachedData)));
-
-        if (!$forceReload && $cachedData !== false) {
-            $this->translate->loadData($area, $forceReload);
-            $this->assertEquals($cachedData, $this->translate->getData());
-            return;
-        }
+            ->will($this->returnValue(false));
 
         $this->directory->expects($this->any())->method('isExist')->will($this->returnValue(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')->will($this->returnValue($modules));
         $moduleData = [
             'module original' => 'module translated',
             'module theme' => 'module-theme original translated',
@@ -166,11 +210,17 @@ public function testLoadData($area, $forceReload, $cachedData)
                     ]
                 )
             );
-
-        // _loadThemeTranslation()
-        $this->viewFileSystem->expects($this->any())
-            ->method('getLocaleFileName')
-            ->will($this->returnValue('/theme.csv'));
+        $this->fileDriver->expects($this->any())
+            ->method('isExists')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['/app/module/en_US.csv', true],
+                        ['/app/module/en_GB.csv', true],
+                        ['/theme.csv', true],
+                    ]
+                )
+            );
 
         // _loadPackTranslation
         $packData = [
@@ -180,6 +230,11 @@ public function testLoadData($area, $forceReload, $cachedData)
         ];
         $this->packDictionary->expects($this->once())->method('getDictionary')->will($this->returnValue($packData));
 
+        // _loadThemeTranslation()
+        $this->viewFileSystem->expects($this->any())
+            ->method('getLocaleFileName')
+            ->will($this->returnValue('/theme.csv'));
+
         // _loadDbTranslation()
         $dbData = [
             'db original' => 'db translated',
@@ -187,9 +242,7 @@ public function testLoadData($area, $forceReload, $cachedData)
         ];
         $this->resource->expects($this->any())->method('getTranslationArray')->will($this->returnValue($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,22 +258,18 @@ public function testLoadData($area, $forceReload, $cachedData)
         $this->assertEquals($expected, $this->translate->getData());
     }
 
-    public function dataProviderForTestLoadData()
+    /**
+     * @return array
+     */
+    public function dataProviderForTestLoadData(): array
     {
-        $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]
         ];
     }
 
@@ -229,7 +278,7 @@ public function dataProviderForTestLoadData()
      * @param $result
      * @dataProvider dataProviderForTestGetData
      */
-    public function testGetData($data, $result)
+    public function testGetData($data, $result): void
     {
         $this->cache->expects($this->once())
             ->method('load')
@@ -239,7 +288,10 @@ public function testGetData($data, $result)
         $this->assertEquals($result, $this->translate->getData());
     }
 
-    public function dataProviderForTestGetData()
+    /**
+     * @return array
+     */
+    public function dataProviderForTestGetData(): array
     {
         $data = ['original 1' => 'translated 1', 'original 2' => 'translated 2'];
         return [
@@ -248,7 +300,7 @@ public function dataProviderForTestGetData()
         ];
     }
 
-    public function testGetLocale()
+    public function testGetLocale(): void
     {
         $this->locale->expects($this->once())->method('getLocale')->will($this->returnValue('en_US'));
         $this->assertEquals('en_US', $this->translate->getLocale());
@@ -261,14 +313,14 @@ public function testGetLocale()
         $this->assertEquals('en_GB', $this->translate->getLocale());
     }
 
-    public function testSetLocale()
+    public function testSetLocale(): void
     {
         $this->translate->setLocale('en_GB');
         $this->locale->expects($this->never())->method('getLocale');
         $this->assertEquals('en_GB', $this->translate->getLocale());
     }
 
-    public function testGetTheme()
+    public function testGetTheme(): void
     {
         $this->request->expects($this->at(0))->method('getParam')->with('theme')->will($this->returnValue(''));
 
@@ -280,7 +332,7 @@ public function testGetTheme()
         $this->assertEquals('themeTheme Title', $this->translate->getTheme());
     }
 
-    public function testLoadDataNoTheme()
+    public function testLoadDataNoTheme(): void
     {
         $forceReload = true;
         $this->expectsSetConfig(null, null);
@@ -294,7 +346,7 @@ public function testLoadDataNoTheme()
     /**
      * Declare calls expectation for setConfig() method
      */
-    protected function expectsSetConfig($themeId, $localeCode = 'en_US')
+    protected function expectsSetConfig($themeId, $localeCode = 'en_US'): void
     {
         $this->locale->expects($this->any())->method('getLocale')->will($this->returnValue($localeCode));
         $scope = new \Magento\Framework\DataObject(['code' => 'frontendCode', 'id' => 1]);
@@ -309,7 +361,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/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index 5c5df5b462b70..939a9c484432a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -141,7 +141,7 @@ protected function getUrlModel($arguments = [])
         $modelProperty->setValue($model, $this->urlModifier);
 
         $zendEscaper = new \Magento\Framework\ZendEscaper();
-        $escaper = new \Magento\Framework\Escaper();
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
         $objectManager->setBackwardCompatibleProperty($escaper, 'escaper', $zendEscaper);
         $objectManager->setBackwardCompatibleProperty($model, 'escaper', $escaper);
 
@@ -149,8 +149,8 @@ protected function getUrlModel($arguments = [])
     }
 
     /**
-     * @param $httpHost string
-     * @param $url string
+     * @param string $httpHost
+     * @param string $url
      * @dataProvider getCurrentUrlProvider
      */
     public function testGetCurrentUrl($httpHost, $url)
@@ -163,6 +163,9 @@ public function testGetCurrentUrl($httpHost, $url)
         $this->assertEquals($url, $model->getCurrentUrl());
     }
 
+    /**
+     * @return array
+     */
     public function getCurrentUrlProvider()
     {
         return [
@@ -337,6 +340,9 @@ public function testGetUrlRouteUseRewrite()
         $this->assertEquals('/catalog/product/view/', $model->getUrl('catalog', ['_use_rewrite' => 1]));
     }
 
+    /**
+     * @return array
+     */
     public function getUrlDataProvider()
     {
         return [
@@ -429,7 +435,7 @@ public function testGetDirectUrl()
     }
 
     /**
-     * @param string $url
+     * @param string $inputUrl
      * @dataProvider getRebuiltUrlDataProvider
      */
     public function testGetRebuiltUrl($inputUrl, $outputUrl)
@@ -497,6 +503,9 @@ public function testGetRedirectUrlWithSessionId()
         $this->assertEquals('http://example.com/?foo=bar', $model->getRedirectUrl('http://example.com/'));
     }
 
+    /**
+     * @return array
+     */
     public function getRebuiltUrlDataProvider()
     {
         return [
@@ -558,6 +567,9 @@ public function testIsOwnOriginUrl($result, $referrer)
         $this->assertEquals($result, $model->isOwnOriginUrl());
     }
 
+    /**
+     * @return array
+     */
     public function isOwnOriginUrlDataProvider()
     {
         return [
@@ -607,6 +619,9 @@ public function testGetConfigData($urlType, $configPath, $isSecure, $isSecureCal
         $this->assertEquals('http://localhost/', $model->getConfigData($key));
     }
 
+    /**
+     * @return array
+     */
     public function getConfigDataDataProvider()
     {
         return [
@@ -712,6 +727,9 @@ public function testSessionUrlVarWithoutMatchedHostsAndBaseUrl()
         );
     }
 
+    /**
+     * @return array
+     */
     public function sessionUrlVarWithMatchedHostsAndBaseUrlDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
index 9721cdb8f9331..a232934e1c785 100644
--- a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
+++ b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
@@ -11,14 +11,14 @@ class MethodInvokedAtIndexTest extends \PHPUnit\Framework\TestCase
 {
     public function testMatches()
     {
-        $invocationObject = new \PHPUnit_Framework_MockObject_Invocation_Object(
+        $invocationObject = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'ClassName',
             'ValidMethodName',
             [],
             'void',
             new \StdClass()
         );
-        $matcher = new \Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex(0);
+        $matcher = new MethodInvokedAtIndex(0);
         $this->assertTrue($matcher->matches($invocationObject));
 
         $matcher = new MethodInvokedAtIndex(1);
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
index 03c7d85251ac4..2d8348f64a5af 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
@@ -65,7 +65,7 @@ public function load($className)
                     include $classSourceFile;
                     return true;
                 }
-            };
+            }
         }
 
         return false;
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
index 08d618637db69..f24500c788020 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
@@ -197,9 +197,9 @@ protected function _makeMock($className)
      * @param \PHPUnit_Framework_MockObject_MockObject                       $object
      * @param string                                                        $stubName
      * @param mixed                                                         $return
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount|null        $expects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount|null        $expects
      *
-     * @return \PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     * @return \PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     protected function _setStub(
         \PHPUnit_Framework_MockObject_MockObject $object,
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
index 0dc4d490280ec..3085770980dd3 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
@@ -40,12 +40,12 @@ public function invokeWithExpectations(
             $expectedParams = $params;
         }
         $builder = $proxiedObject->expects(
-            new \PHPUnit_Framework_MockObject_Matcher_InvokedCount(1)
+            new \PHPUnit\Framework\MockObject\Matcher\InvokedCount(1)
         )->method(
             $expectedMethod
         );
         $builder = call_user_func_array([$builder, 'with'], $expectedParams);
-        $builder->will(new \PHPUnit_Framework_MockObject_Stub_Return($proxiedResult));
+        $builder->will(new \PHPUnit\Framework\MockObject\Stub\ReturnStub($proxiedResult));
 
         return call_user_func_array([$object, $method], $params);
     }
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
index cd116521dbea5..c7d62205dcaf9 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\TestFramework\Unit\Matcher;
 
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\MockObject\Invocation as BaseInvocation;
+
 /**
  * Class MethodInvokedAtIndex
  * Matches invocations per 'method' at 'position'
@@ -18,30 +21,83 @@
  *
  * @package Magento\TestFramework\Matcher
  */
-class MethodInvokedAtIndex extends \PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
+class MethodInvokedAtIndex implements \PHPUnit\Framework\MockObject\Matcher\Invocation
 {
+    /**
+     * @var int
+     */
+    private $sequenceIndex;
+
+    /**
+     * @var int
+     */
+    private $currentIndex = -1;
+
     /**
      * @var array
      */
-    protected $indexes = [];
+    private $indexes = [];
+
+    /**
+     * @param int $sequenceIndex
+     */
+    public function __construct($sequenceIndex)
+    {
+        $this->sequenceIndex = $sequenceIndex;
+    }
+
+    /**
+     * @return string
+     */
+    public function toString(): string
+    {
+        return 'invoked at sequence index ' . $this->sequenceIndex;
+    }
 
     /**
-     * @param  \PHPUnit_Framework_MockObject_Invocation $invocation
+     * @param  \PHPUnit\Framework\MockObject\Invocation $invocation
      * @return boolean
      */
-    public function matches(\PHPUnit_Framework_MockObject_Invocation $invocation)
+    public function matches(BaseInvocation $invocation): bool
     {
         /** @noinspection PhpUndefinedFieldInspection */
-        if (!isset($this->indexes[$invocation->methodName])) {
+        if (!isset($this->indexes[$invocation->getMethodName()])) {
             /** @noinspection PhpUndefinedFieldInspection */
-            $this->indexes[$invocation->methodName] = 0;
+            $this->indexes[$invocation->getMethodName()] = 0;
         } else {
             /** @noinspection PhpUndefinedFieldInspection */
-            $this->indexes[$invocation->methodName]++;
+            $this->indexes[$invocation->getMethodName()]++;
         }
         $this->currentIndex++;
 
         /** @noinspection PhpUndefinedFieldInspection */
-        return $this->indexes[$invocation->methodName] == $this->sequenceIndex;
+        return $this->indexes[$invocation->getMethodName()] == $this->sequenceIndex;
+    }
+
+    /**
+     * @param BaseInvocation $invocation
+     * @return mixed
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function invoked(BaseInvocation $invocation)
+    {
+    }
+
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws ExpectationFailedException
+     */
+    public function verify(): void
+    {
+        if ($this->currentIndex < $this->sequenceIndex) {
+            throw new ExpectationFailedException(
+                \sprintf(
+                    'The expected invocation at index %s was never reached.',
+                    $this->sequenceIndex
+                )
+            );
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index 9ce3925925e1e..e992482609a87 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -3,9 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Translate library
@@ -15,6 +20,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
      *
@@ -49,7 +60,7 @@ class Translate implements \Magento\Framework\TranslateInterface
     protected $_viewDesign;
 
     /**
-     * @var \Magento\Framework\Cache\FrontendInterface $cache
+     * @var \Magento\Framework\Cache\FrontendInterface
      */
     protected $_cache;
 
@@ -113,6 +124,11 @@ class Translate implements \Magento\Framework\TranslateInterface
      */
     private $serializer;
 
+    /**
+     * @var DriverInterface
+     */
+    private $fileDriver;
+
     /**
      * @param \Magento\Framework\View\DesignInterface $viewDesign
      * @param \Magento\Framework\Cache\FrontendInterface $cache
@@ -127,6 +143,7 @@ class Translate implements \Magento\Framework\TranslateInterface
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\File\Csv $csvParser
      * @param \Magento\Framework\App\Language\Dictionary $packDictionary
+     * @param DriverInterface|null $fileDriver
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -143,7 +160,8 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Framework\File\Csv $csvParser,
-        \Magento\Framework\App\Language\Dictionary $packDictionary
+        \Magento\Framework\App\Language\Dictionary $packDictionary,
+        DriverInterface $fileDriver = null
     ) {
         $this->_viewDesign = $viewDesign;
         $this->_cache = $cache;
@@ -158,6 +176,16 @@ public function __construct(
         $this->directory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
         $this->_csvParser = $csvParser;
         $this->packDictionary = $packDictionary;
+        $this->fileDriver = $fileDriver
+            ?? ObjectManager::getInstance()->get(File::class);
+
+        $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 +197,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 +236,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 +258,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();
     }
 
@@ -244,6 +278,7 @@ protected function getConfig($key)
 
     /**
      * Retrieve name of the current module
+     *
      * @return mixed
      */
     protected function getControllerModuleName()
@@ -291,11 +326,14 @@ protected function _addData($data)
     {
         foreach ($data as $key => $value) {
             if ($key === $value) {
+                if (isset($this->_data[$key])) {
+                    unset($this->_data[$key]);
+                }
                 continue;
             }
 
             $key = str_replace('""', '"', $key);
-            $value  = str_replace('""', '"', $value);
+            $value = str_replace('""', '"', $value);
 
             $this->_data[$key] = $value;
         }
@@ -303,20 +341,21 @@ protected function _addData($data)
     }
 
     /**
-     * Load current theme translation
+     * Load current theme translation according to fallback
      *
      * @return $this
      */
     protected function _loadThemeTranslation()
     {
-        if (!$this->_config['theme']) {
-            return $this;
-        }
+        $themeFiles = $this->getThemeTranslationFilesList($this->getLocale());
 
-        $file = $this->_getThemeTranslationFile($this->getLocale());
-        if ($file) {
-            $this->_addData($this->_getFileData($file));
+        /** @var string $file */
+        foreach ($themeFiles as $file) {
+            if ($file) {
+                $this->_addData($this->_getFileData($file));
+            }
         }
+
         return $this;
     }
 
@@ -339,7 +378,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;
     }
 
@@ -357,17 +396,80 @@ protected function _getModuleTranslationFile($moduleName, $locale)
         return $file;
     }
 
+    /**
+     * Get theme translation locale file name
+     *
+     * @param string|null $locale
+     * @param array $config
+     * @return string|null
+     */
+    private function getThemeTranslationFileName(?string $locale, array $config): ?string
+    {
+        $fileName = $this->_viewFileSystem->getLocaleFileName(
+            'i18n' . '/' . $locale . '.csv',
+            $config
+        );
+
+        return $fileName ? $fileName : null;
+    }
+
+    /**
+     * Get parent themes for the current theme in fallback order
+     *
+     * @return array
+     */
+    private function getParentThemesList(): array
+    {
+        $themes = [];
+
+        $parentTheme = $this->_viewDesign->getDesignTheme()->getParentTheme();
+        while ($parentTheme) {
+            $themes[] = $parentTheme;
+            $parentTheme = $parentTheme->getParentTheme();
+        }
+        $themes = array_reverse($themes);
+
+        return $themes;
+    }
+
+    /**
+     * Retrieve translation files for themes according to fallback
+     *
+     * @param string $locale
+     *
+     * @return array
+     */
+    private function getThemeTranslationFilesList($locale): array
+    {
+        $translationFiles = [];
+
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
+        foreach ($this->getParentThemesList() as $theme) {
+            $config = $this->_config;
+            $config['theme'] = $theme->getCode();
+            $translationFiles[] = $this->getThemeTranslationFileName($locale, $config);
+        }
+
+        $translationFiles[] = $this->getThemeTranslationFileName($locale, $this->_config);
+
+        return $translationFiles;
+    }
+
     /**
      * Retrieve translation file for theme
      *
      * @param string $locale
      * @return string
+     *
+     * @deprecated
+     *
+     * @see \Magento\Framework\Translate::getThemeTranslationFilesList
      */
     protected function _getThemeTranslationFile($locale)
     {
         return $this->_viewFileSystem->getLocaleFileName(
             'i18n' . '/' . $locale . '.csv',
-            ['area' => $this->getConfig('area')]
+            $this->_config
         );
     }
 
@@ -380,7 +482,7 @@ protected function _getThemeTranslationFile($locale)
     protected function _getFileData($file)
     {
         $data = [];
-        if ($this->directory->isExist($this->directory->getRelativePath($file))) {
+        if ($this->fileDriver->isExists($file)) {
             $this->_csvParser->setDelimiter(',');
             $data = $this->_csvParser->getDataPairs($file);
         }
@@ -422,8 +524,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 +535,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 +581,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/Translate/Inline/ParserInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
index e8905f71ea732..4c3bfc1a1964b 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
@@ -43,7 +43,7 @@ public function getContent();
     /**
      * Sets the body content that is being parsed passed upon the passed in string.
      *
-     * @param $content string
+     * @param string $content
      * @return void
      */
     public function setContent($content);
diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
index 6e222ba90da8e..b1ef51f010c5b 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
@@ -74,6 +74,9 @@ public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $result)
         $this->assertEquals($result, $model->isAllowed());
     }
 
+    /**
+     * @return array
+     */
     public function isAllowedDataProvider()
     {
         return [
@@ -126,6 +129,9 @@ public function testProcessResponseBodyStripInline($body, $expected)
         $this->assertEquals($body, $expected);
     }
 
+    /**
+     * @return array
+     */
     public function processResponseBodyStripInlineDataProvider()
     {
         return [
@@ -192,6 +198,9 @@ public function testProcessResponseBody($scope, $body, $expected)
         $this->assertEquals($body, $expected);
     }
 
+    /**
+     * @return array
+     */
     public function processResponseBodyDataProvider()
     {
         return [
@@ -254,6 +263,9 @@ public function testProcessResponseBodyGetInlineScript($scope, $body, $expected)
         $this->assertEquals($body, $expected);
     }
 
+    /**
+     * @return array
+     */
     public function processResponseBodyGetInlineScriptDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php b/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
index 4888077104728..f053a9afff74d 100644
--- a/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
+++ b/lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php
@@ -55,6 +55,9 @@ public function testUnserializeObject($serialized)
         $this->assertFalse($this->unserialize->unserialize($serialized));
     }
 
+    /**
+     * @return array
+     */
     public function unserializeObjectDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index 11f828370d441..11aeb1c0c79b8 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -1074,7 +1074,7 @@ function ($match) {
                     if ($match[1] == '?') {
                         return isset($match[3]) ? '?' : '';
                     } elseif ($match[1] == '&amp;' || $match[1] == '&') {
-                        return isset($match[3]) ? $match[3] : '';
+                        return $match[3] ?? '';
                     }
                 }
             },
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolver.php b/lib/internal/Magento/Framework/Url/ScopeResolver.php
index b43f70713daed..674cb644bca5f 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolver.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Url;
 
 /**
@@ -40,7 +41,7 @@ public function getScope($scopeId = null)
         $scope = $this->scopeResolver->getScope($scopeId);
         if (!$scope instanceof \Magento\Framework\Url\ScopeInterface) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Invalid scope object')
+                new \Magento\Framework\Phrase('The scope object is invalid. Verify the scope object and try again.')
             );
         }
 
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php
index 5bb4f54b84a5c..016208d0920aa 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/Helper/DataTest.php
@@ -79,6 +79,9 @@ public function testGetEncodedUrl($url, $callNum)
         $this->assertEquals($encodedUrl, $helper->getEncodedUrl($url));
     }
 
+    /**
+     * @return array
+     */
     public function getEncodedUrlDataProvider()
     {
         return [
@@ -98,6 +101,9 @@ public function testAddRequestParam($param, $expected)
         $this->assertEquals($expected, $helper->addRequestParam('http://example.com', $param));
     }
 
+    /**
+     * @return array
+     */
     public function addRequestParamDataProvider()
     {
         return [
@@ -145,6 +151,9 @@ public function testRemoveRequestParam($paramKey, $expected)
         $this->assertEquals($expected, $helper->removeRequestParam($url, $paramKey));
     }
 
+    /**
+     * @return array
+     */
     public function removeRequestParamDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/ScopeResolverTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/ScopeResolverTest.php
index abc5a3750cb47..8b07cc553d456 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/ScopeResolverTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/ScopeResolverTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Url\Test\Unit;
 
 class ScopeResolverTest extends \PHPUnit\Framework\TestCase
@@ -50,7 +51,7 @@ public function testGetScope($scopeId)
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid scope object
+     * @expectedExceptionMessage The scope object is invalid. Verify the scope object and try again.
      */
     public function testGetScopeException()
     {
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php
index fbda5e36c9934..3fc332aa1af52 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php
@@ -32,6 +32,9 @@ public function testIsSecureChecksIfUrlIsInSecureList($url, $expected)
         $this->assertEquals($expected, $this->_model->isSecure($url));
     }
 
+    /**
+     * @return array
+     */
     public function secureUrlDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php
index 39946eac90472..843ee8b66e710 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php
@@ -12,13 +12,21 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Url\Validator */
     protected $object;
 
+    /** @var \Zend\Validator\Uri */
+    protected $zendValidator;
+
     /** @var string[] */
     protected $expectedValidationMessages = ['invalidUrl' => "Invalid URL '%value%'."];
 
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->object = $objectManager->getObject(\Magento\Framework\Url\Validator::class);
+
+        $this->zendValidator = $this->createMock(\Zend\Validator\Uri::class);
+        $this->object = $objectManager->getObject(
+            \Magento\Framework\Url\Validator::class,
+            ['validator' => $this->zendValidator]
+        );
     }
 
     public function testConstruct()
@@ -28,13 +36,23 @@ public function testConstruct()
 
     public function testIsValidWhenValid()
     {
-        $this->assertEquals(true, $this->object->isValid('http://example.com'));
+        $this->zendValidator
+            ->method('isValid')
+            ->with('http://example.com')
+            ->willReturn(true);
+
+        $this->assertTrue($this->object->isValid('http://example.com'));
         $this->assertEquals([], $this->object->getMessages());
     }
 
     public function testIsValidWhenInvalid()
     {
-        $this->assertEquals(false, $this->object->isValid('%value%'));
+        $this->zendValidator
+            ->method('isValid')
+            ->with('%value%')
+            ->willReturn(false);
+
+        $this->assertFalse($this->object->isValid('%value%'));
         $this->assertEquals($this->expectedValidationMessages, $this->object->getMessages());
     }
 }
diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php
index 3a47e9142b43d..489e8c502179d 100644
--- a/lib/internal/Magento/Framework/Url/Validator.php
+++ b/lib/internal/Magento/Framework/Url/Validator.php
@@ -19,13 +19,20 @@ class Validator extends \Zend_Validate_Abstract
     const INVALID_URL = 'invalidUrl';
     /**#@-*/
 
+    /**
+     * @var \Zend\Validator\Uri
+     */
+    private $validator;
+
     /**
      * Object constructor
      */
-    public function __construct()
+    public function __construct(\Zend\Validator\Uri $validator)
     {
         // set translated message template
         $this->setMessage((string)new \Magento\Framework\Phrase("Invalid URL '%value%'."), self::INVALID_URL);
+        $this->validator = $validator;
+        $this->validator->setAllowRelative(false);
     }
 
     /**
@@ -45,11 +52,12 @@ public function isValid($value)
     {
         $this->_setValue($value);
 
-        if (!\Zend_Uri::check($value)) {
+        $valid = $this->validator->isValid($value);
+
+        if (!$valid) {
             $this->_error(self::INVALID_URL);
-            return false;
         }
 
-        return true;
+        return $valid;
     }
 }
diff --git a/lib/internal/Magento/Framework/Validator/EmailAddress.php b/lib/internal/Magento/Framework/Validator/EmailAddress.php
index 59cd7cb45cff2..e1eb12be4f652 100644
--- a/lib/internal/Magento/Framework/Validator/EmailAddress.php
+++ b/lib/internal/Magento/Framework/Validator/EmailAddress.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Framework\Validator;
 
-use Zend_Config;
-
 class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Framework\Validator\ValidatorInterface
 {
     /**
@@ -21,7 +19,7 @@ class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Frame
      * 'mx'       => If MX check should be enabled, boolean
      * 'deep'     => If a deep MX check should be done, boolean
      *
-     * @param array|string|Zend_Config $options OPTIONAL
+     * @inheritdoc
      */
     public function __construct($options = [])
     {
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
index c70ecfabb52af..370f66c424b01 100644
--- a/lib/internal/Magento/Framework/Validator/Exception.php
+++ b/lib/internal/Magento/Framework/Validator/Exception.php
@@ -84,6 +84,6 @@ public function getMessages($type = '')
             }
             return $allMessages;
         }
-        return isset($this->messages[$type]) ? $this->messages[$type] : [];
+        return $this->messages[$type] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php
index 2df8d535ee788..1b1e48e6d574d 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php
@@ -341,7 +341,8 @@ protected function _getExpectedConstraints($constraint, $optionKey, $optionValue
      */
     public function testConstructorConfigValidation(array $options, $exception, $exceptionMessage)
     {
-        $this->expectException($exception, $exceptionMessage);
+        $this->expectException($exception);
+        $this->expectExceptionMessage($exceptionMessage);
         if (array_key_exists('method', $options)) {
             $options = ['methods' => [$options]];
         }
@@ -362,7 +363,8 @@ public function testConstructorConfigValidation(array $options, $exception, $exc
      */
     public function testAddConfigurationConfigValidation(array $options, $exception, $exceptionMessage)
     {
-        $this->expectException($exception, $exceptionMessage);
+        $this->expectException($exception);
+        $this->expectExceptionMessage($exceptionMessage);
 
         $constraints = [
             ['alias' => 'alias', 'class' => 'Some\Validator\Class', 'options' => null, 'type' => 'entity'],
@@ -411,10 +413,11 @@ public function invalidArgumentsDataProvider()
      */
     public function testCreateValidatorInvalidInstance()
     {
-        $this->expectException(
-            'InvalidArgumentException',
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(
             'Constraint class "StdClass" must implement \Magento\Framework\Validator\ValidatorInterface'
         );
+        
         $builder = $this->_objectManager->getObject(
             \Magento\Framework\Validator\Builder::class,
             [
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
index bf660396790f7..6717095376625 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
@@ -51,7 +51,7 @@ public function testConstructException()
     protected function _initConfig(array $files = null)
     {
         if (null === $files) {
-            $files = glob(__DIR__ . '/_files/validation/positive/*/validation.xml');
+            $files = glob(__DIR__ . '/_files/validation/positive/*/validation.xml', GLOB_NOSORT);
         }
         $configFiles = [];
         foreach ($files as $path) {
@@ -117,8 +117,8 @@ public function testCreateValidatorInvalidGroupName()
 
     public function testCreateValidatorInvalidConstraintClass()
     {
-        $this->expectException(
-            'InvalidArgumentException',
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(
             'Constraint class "stdClass" must implement \Magento\Framework\Validator\ValidatorInterface'
         );
         $this->_initConfig([__DIR__ . '/_files/validation/negative/invalid_constraint.xml']);
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php
index 91bd3a7608d67..75d58158c4560 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\Validator\Test\Unit\Constraint\Option;
 
+use Magento\Framework\Validator\Constraint\Option\Callback;
+use Magento\Framework\Validator\Test\Unit\Test\Callback as TestCallback;
+
 /**
  * Test case for \Magento\Framework\Validator\Constraint\Option\Callback
  */
@@ -28,7 +31,7 @@ class CallbackTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetValue($callback, $expectedResult, $arguments = null, $createInstance = false)
     {
-        $option = new \Magento\Framework\Validator\Constraint\Option\Callback($callback, $arguments, $createInstance);
+        $option = new Callback($callback, $arguments, $createInstance);
         $this->assertEquals($expectedResult, $option->getValue());
     }
 
@@ -37,32 +40,37 @@ public function testGetValue($callback, $expectedResult, $arguments = null, $cre
      */
     public function getConfigDataProvider()
     {
-        $functionName = create_function('', 'return "Value from function";');
         $closure = function () {
             return 'Value from closure';
         };
 
-        $mock = $this->getMockBuilder('Foo')->setMethods(['getValue'])->getMock();
-        $mock->expects(
-            $this->once()
-        )->method(
-            'getValue'
-        )->with(
-            'arg1',
-            'arg2'
-        )->will(
-            $this->returnValue('Value from mock')
-        );
+        $mock = $this->getMockBuilder('Foo')
+            ->setMethods(['getValue'])
+            ->getMock();
+        $mock->method('getValue')
+            ->with('arg1', 'arg2')
+            ->willReturn('Value from mock');
 
         return [
-            [$functionName, 'Value from function'],
-            [$closure, 'Value from closure'],
-            [[$this, 'getTestValue'], self::TEST_VALUE],
-            [[__CLASS__, 'getTestValueStatically'], self::TEST_VALUE],
-            [[$mock, 'getValue'], 'Value from mock', ['arg1', 'arg2']],
             [
-                [\Magento\Framework\Validator\Test\Unit\Test\Callback::class, 'getId'],
-                \Magento\Framework\Validator\Test\Unit\Test\Callback::ID,
+                $closure,
+                'Value from closure'
+            ],
+            [
+                [$this, 'getTestValue'],
+                self::TEST_VALUE
+            ],
+            [
+                [__CLASS__, 'getTestValueStatically'],
+                self::TEST_VALUE
+            ],
+            [
+                [$mock, 'getValue'],
+                'Value from mock', ['arg1', 'arg2']
+            ],
+            [
+                [TestCallback::class, 'getId'],
+                TestCallback::ID,
                 null,
                 true
             ]
@@ -90,15 +98,13 @@ public function getTestValue()
      *
      * @dataProvider setArgumentsDataProvider
      *
-     * @param mixed $value
-     * @param mixed $expectedValue
+     * @param string|array $value
+     * @param string|array $expectedValue
      */
     public function testSetArguments($value, $expectedValue)
     {
-        $option = new \Magento\Framework\Validator\Constraint\Option\Callback(
-            function () {
-            }
-        );
+        $option = new Callback(function () {
+        });
         $option->setArguments($value);
         $this->assertAttributeEquals($expectedValue, '_arguments', $option);
     }
@@ -108,7 +114,13 @@ function () {
      */
     public function setArgumentsDataProvider()
     {
-        return [['baz', ['baz']], [['foo', 'bar'], ['foo', 'bar']]];
+        return [
+            ['baz', ['baz']],
+            [
+                ['foo', 'bar'],
+                ['foo', 'bar']
+            ]
+        ];
     }
 
     /**
@@ -119,11 +131,13 @@ public function setArgumentsDataProvider()
      * @param mixed $callback
      * @param string $expectedMessage
      * @param bool $createInstance
+     * @expectedException \InvalidArgumentException
      */
     public function testGetValueException($callback, $expectedMessage, $createInstance = false)
     {
-        $option = new \Magento\Framework\Validator\Constraint\Option\Callback($callback, null, $createInstance);
-        $this->expectException('InvalidArgumentException', $expectedMessage);
+        $option = new Callback($callback, null, $createInstance);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedMessage);
         $option->getValue();
     }
 
@@ -139,10 +153,22 @@ public function getValueExceptionDataProvider()
                 ['Not_Existing_Callback_Class', 'someMethod'],
                 'Class "Not_Existing_Callback_Class" was not found',
             ],
-            [[$this, 'notExistingMethod'], 'Callback does not callable'],
-            [['object' => $this, 'method' => 'getTestValue'], 'Callback does not callable'],
-            ['unknown_function', 'Callback does not callable'],
-            [new \stdClass(), 'Callback does not callable'],
+            [
+                [$this, 'notExistingMethod'],
+                'Callback does not callable'
+            ],
+            [
+                ['object' => $this, 'method' => 'getTestValue'],
+                'Callback does not callable'
+            ],
+            [
+                'unknown_function',
+                'Callback does not callable'
+            ],
+            [
+                new \stdClass(),
+                'Callback does not callable'
+            ],
             [
                 [$this, 'getTestValue'],
                 'Callable expected to be an array with class name as first element',
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php
index a06297a382f57..0fd70b5bc5f1d 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ObjectTest.php
@@ -92,6 +92,9 @@ public function testIsValid(array $inputEntityData, array $expectedErrors)
         }
     }
 
+    /**
+     * @return array
+     */
     public function validateDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Asset/Config.php b/lib/internal/Magento/Framework/View/Asset/Config.php
index 2a3d0d3dad467..6a0548b3395a0 100644
--- a/lib/internal/Magento/Framework/View/Asset/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Config.php
@@ -8,7 +8,6 @@
 
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\State;
 
 /**
  * View asset configuration interface
@@ -55,7 +54,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      */
     public function isMergeCssFiles()
     {
-        return (bool)$this->scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_MERGE_CSS_FILES,
             ScopeInterface::SCOPE_STORE
         );
@@ -68,7 +67,7 @@ public function isMergeCssFiles()
      */
     public function isBundlingJsFiles()
     {
-        return (bool)$this->scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_JS_BUNDLING,
             ScopeInterface::SCOPE_STORE
         );
@@ -81,7 +80,7 @@ public function isBundlingJsFiles()
      */
     public function isMergeJsFiles()
     {
-        return (bool)$this->scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_MERGE_JS_FILES,
             ScopeInterface::SCOPE_STORE
         );
@@ -94,7 +93,7 @@ public function isMergeJsFiles()
      */
     public function isMinifyHtml()
     {
-        return (bool)$this->scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_MINIFICATION_HTML,
             ScopeInterface::SCOPE_STORE
         );
diff --git a/lib/internal/Magento/Framework/View/Asset/Merged.php b/lib/internal/Magento/Framework/View/Asset/Merged.php
index 5b206b235eb11..302eb1226b8ef 100644
--- a/lib/internal/Magento/Framework/View/Asset/Merged.php
+++ b/lib/internal/Magento/Framework/View/Asset/Merged.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\View\Asset;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * \Iterator that aggregates one or more assets and provides a single public file with equivalent behavior
  */
@@ -40,27 +42,39 @@ class Merged implements \Iterator
      */
     protected $contentType;
 
+    /**
+     * @var \Magento\Framework\App\View\Deployment\Version\StorageInterface
+     */
+    private $versionStorage;
+
     /**
      * @var bool
      */
     protected $isInitialized = false;
 
     /**
+     * Merged constructor.
+     *
      * @param \Psr\Log\LoggerInterface $logger
      * @param MergeStrategyInterface $mergeStrategy
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param MergeableInterface[] $assets
+     * @param \Magento\Framework\App\View\Deployment\Version\StorageInterface $versionStorage
      * @throws \InvalidArgumentException
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
         MergeStrategyInterface $mergeStrategy,
         \Magento\Framework\View\Asset\Repository $assetRepo,
-        array $assets
+        array $assets,
+        \Magento\Framework\App\View\Deployment\Version\StorageInterface $versionStorage = null
     ) {
         $this->logger = $logger;
         $this->mergeStrategy = $mergeStrategy;
         $this->assetRepo = $assetRepo;
+        $this->versionStorage = $versionStorage ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\App\View\Deployment\Version\StorageInterface::class
+        );
 
         if (!$assets) {
             throw new \InvalidArgumentException('At least one asset has to be passed for merging.');
@@ -116,6 +130,12 @@ private function createMergedAsset(array $assets)
             $paths[] = $asset->getPath();
         }
         $paths = array_unique($paths);
+
+        $version = $this->versionStorage->load();
+        if ($version) {
+            $paths[] = $version;
+        }
+
         $filePath = md5(implode('|', $paths)) . '.' . $this->contentType;
         return $this->assetRepo->createArbitrary($filePath, self::getRelativeDir());
     }
diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
index 686f794d6318a..087d57ffa4162 100644
--- a/lib/internal/Magento/Framework/View/Asset/Minification.php
+++ b/lib/internal/Magento/Framework/View/Asset/Minification.php
@@ -64,7 +64,7 @@ public function isEnabled($contentType)
         if (!isset($this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$contentType])) {
             $this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$contentType] =
                 $this->appState->getMode() != State::MODE_DEVELOPER &&
-                (bool)$this->scopeConfig->isSetFlag(
+                $this->scopeConfig->isSetFlag(
                     sprintf(self::XML_PATH_MINIFICATION_ENABLED, $contentType),
                     $this->scope
                 );
@@ -112,6 +112,8 @@ public function removeMinifiedSign($filename)
     }
 
     /**
+     * Is Minified Filename
+     *
      * @param string $filename
      * @return bool
      */
@@ -121,6 +123,8 @@ public function isMinifiedFilename($filename)
     }
 
     /**
+     * Is Excluded
+     *
      * @param string $filename
      * @return boolean
      */
@@ -135,6 +139,8 @@ public function isExcluded($filename)
     }
 
     /**
+     * Get Excludes
+     *
      * @param string $contentType
      * @return string[]
      */
@@ -143,7 +149,8 @@ public function getExcludes($contentType)
         if (!isset($this->configCache[self::XML_PATH_MINIFICATION_EXCLUDES][$contentType])) {
             $this->configCache[self::XML_PATH_MINIFICATION_EXCLUDES][$contentType] = [];
             $key = sprintf(self::XML_PATH_MINIFICATION_EXCLUDES, $contentType);
-            foreach (explode("\n", $this->scopeConfig->getValue($key, $this->scope)) as $exclude) {
+            $excludeValues = $this->getMinificationExcludeValues($key);
+            foreach ($excludeValues as $exclude) {
                 if (trim($exclude) != '') {
                     $this->configCache[self::XML_PATH_MINIFICATION_EXCLUDES][$contentType][] = trim($exclude);
                 }
@@ -151,4 +158,26 @@ public function getExcludes($contentType)
         }
         return $this->configCache[self::XML_PATH_MINIFICATION_EXCLUDES][$contentType];
     }
+
+    /**
+     * Get minification exclude values from configuration
+     *
+     * @param string $key
+     * @return string[]
+     */
+    private function getMinificationExcludeValues($key)
+    {
+        $configValues = $this->scopeConfig->getValue($key, $this->scope) ?? [];
+        //value used to be a string separated by 'newline' separator so we need to convert it to array
+        if (!is_array($configValues)) {
+            $configValuesFromString = [];
+            foreach (explode("\n", $configValues) as $exclude) {
+                if (trim($exclude) != '') {
+                    $configValuesFromString[] = trim($exclude);
+                }
+            }
+            $configValues = $configValuesFromString;
+        }
+        return array_values($configValues);
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
index 38f2b220dee6f..7016bbdb08ab2 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\View\Asset\PreProcessor;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\LockerProcessInterface;
diff --git a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
index ad86dfca47a25..4fe8f48d6b723 100644
--- a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
+++ b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
@@ -45,6 +45,6 @@ public function getProperties()
      */
     public function getProperty($name)
     {
-        return isset($this->properties[$name]) ? $this->properties[$name] : null;
+        return $this->properties[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index c50af9d5bbc5f..dff280057fdaf 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -72,6 +72,6 @@ public function get($name = null)
             return $this->blocks;
         }
 
-        return isset($this->blocks[$name]) ? $this->blocks[$name] : null;
+        return $this->blocks[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 0c3932ffe4bd7..c3f1c3e691c84 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -332,15 +332,11 @@ public function getModuleName()
     }
 
     /**
-     * Retrieve the module name
-     *
-     * @return string
-     *
-     * @todo alias of getModuleName
+     * @see getModuleName
      */
     public function getFrontName()
     {
-        return $this->getRequest()->getModuleName();
+        return $this->getModuleName();
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index 24bdb6639981b..94f4f1dceae97 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -80,7 +80,7 @@ public function get($name = null)
             return $this->dataSources;
         }
 
-        return isset($this->dataSources[$name]) ? $this->dataSources[$name] : null;
+        return $this->dataSources[$name] ?? null;
     }
 
     /**
@@ -107,6 +107,6 @@ public function assign($dataName, $namespace, $alias)
      */
     public function getNamespaceData($namespace)
     {
-        return isset($this->assignments[$namespace]) ? $this->assignments[$namespace] : [];
+        return $this->assignments[$namespace] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php
index 8150b386eddef..47c0e905fc25a 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/TemplateFile.php
@@ -10,6 +10,9 @@
 use Magento\Framework\View\Asset\ConfigInterface;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\Template\Html\MinifierInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\ConfigOptionsListConstants as Constants;
 
 /**
  * Provider of template view files
@@ -31,21 +34,29 @@ class TemplateFile extends File
      */
     protected $assetConfig;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param ResolverInterface $resolver
      * @param MinifierInterface $templateMinifier
      * @param State $appState
      * @param ConfigInterface $assetConfig
+     * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(
         ResolverInterface $resolver,
         MinifierInterface $templateMinifier,
         State $appState,
-        ConfigInterface $assetConfig
+        ConfigInterface $assetConfig,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->appState = $appState;
         $this->templateMinifier = $templateMinifier;
         $this->assetConfig = $assetConfig;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         parent::__construct($resolver);
     }
 
@@ -73,7 +84,7 @@ public function getFile($area, ThemeInterface $themeModel, $file, $module = null
         if ($template && $this->assetConfig->isMinifyHtml()) {
             switch ($this->appState->getMode()) {
                 case State::MODE_PRODUCTION:
-                    return $this->templateMinifier->getPathToMinified($template);
+                    return $this->getMinifiedTemplateInProduction($template);
                 case State::MODE_DEFAULT:
                     return $this->templateMinifier->getMinified($template);
                 case State::MODE_DEVELOPER:
@@ -83,4 +94,24 @@ public function getFile($area, ThemeInterface $themeModel, $file, $module = null
         }
         return $template;
     }
+
+    /**
+     * Returns path to minified template file
+     *
+     * If SCD on demand in production is disabled - returns the path to minified template file.
+     * Otherwise returns the path to minified template file,
+     * or minify if file not exist and returns path.
+     *
+     * @param string $template
+     * @return string
+     */
+    private function getMinifiedTemplateInProduction($template)
+    {
+        $forceMinification = $this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            || $this->deploymentConfig->getConfigData(Constants::CONFIG_PATH_FORCE_HTML_MINIFICATION);
+
+        return $forceMinification ?
+            $this->templateMinifier->getMinified($template)
+            : $this->templateMinifier->getPathToMinified($template);
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
index 826811b55b4bf..0d6ed2f98b522 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
@@ -40,7 +40,7 @@ class ThemeList extends \Magento\Framework\Data\Collection implements ListInterf
     protected $_itemObjectClass = ThemeInterface::class;
 
     /**
-     * @var \Magento\Framework\Config\ThemeFactory $themeConfigFactory
+     * @var \Magento\Framework\Config\ThemeFactory
      */
     protected $themeConfigFactory;
 
@@ -234,7 +234,7 @@ protected function _prepareConfigurationData($themePackage)
         $media = $themeConfig->getMedia();
 
         $parentPathPieces = $themeConfig->getParentTheme();
-        if (count($parentPathPieces) == 1) {
+        if (is_array($parentPathPieces) && count($parentPathPieces) == 1) {
             $pathPieces = $pathData['theme_path_pieces'];
             array_pop($pathPieces);
             $parentPathPieces = array_merge($pathPieces, $parentPathPieces);
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
index 06c78e7125040..04e775d730b56 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
@@ -118,7 +118,7 @@ public function addDataValidators($dataKey, $validators)
     public function getErrorMessages($dataKey = null)
     {
         if ($dataKey) {
-            return isset($this->_errorMessages[$dataKey]) ? $this->_errorMessages[$dataKey] : [];
+            return $this->_errorMessages[$dataKey] ?? [];
         }
         return $this->_errorMessages;
     }
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 0ffa9dce7f730..335006555d2f1 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -952,7 +952,7 @@ public function stripTags($data, $allowableTags = null, $allowHtmlEntities = fal
      */
     public function escapeUrl($string)
     {
-        return $this->_escaper->escapeUrl($string);
+        return $this->_escaper->escapeUrl((string)$string);
     }
 
     /**
@@ -1074,7 +1074,7 @@ protected function getCacheLifetime()
 
         $cacheLifetime = $this->getData('cache_lifetime');
         if (false === $cacheLifetime || null === $cacheLifetime) {
-            return $cacheLifetime;
+            return null;
         }
 
         return (int)$cacheLifetime;
@@ -1156,6 +1156,7 @@ public function getVar($name, $module = null)
 
     /**
      * Determine if the block scope is private or public.
+     *
      * Returns true if scope is private, false otherwise
      *
      * @return bool
diff --git a/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php b/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php
index 58fd3141c2b49..29b5557c9fcb1 100644
--- a/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php
@@ -8,6 +8,8 @@
 /**
  * Block argument interface.
  * All objects that are injected to block arguments should implement this interface.
+ *
+ * @api
  */
 interface ArgumentInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php b/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php
new file mode 100644
index 0000000000000..29d14553481d7
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Element/ComponentVisibilityInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\View\Element;
+
+/**
+ * Interface which allows to modify visibility behavior of UI components
+ */
+interface ComponentVisibilityInterface
+{
+    /**
+     * Defines if the component can be shown
+     *
+     * @return bool
+     */
+    public function isComponentVisible(): bool;
+}
diff --git a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php
index 1749eb9c554e1..101eea5349e77 100644
--- a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlock.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Element;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -43,7 +44,7 @@ public function __construct($blockName = '')
     public function __call($method, $args)
     {
         throw new LocalizedException(
-            new Phrase('Block %1 throws exception and cannot be rendered.', [$this->blockName])
+            new Phrase('The "%1" block threw an exception, and it can\'t be rendered.', [$this->blockName])
         );
     }
 
@@ -56,7 +57,7 @@ public function __call($method, $args)
     public function toHtml()
     {
         throw new LocalizedException(
-            new Phrase('Block %1 throws exception and cannot be rendered.', [$this->blockName])
+            new Phrase('The "%1" block threw an exception, and it can\'t be rendered.', [$this->blockName])
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
index 648d9ad6917e4..558e39427cb44 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Date.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Date.php
@@ -26,6 +26,7 @@ protected function _toHtml()
         $changeYear = $this->getChangeYear();
         $maxDate = $this->getMaxDate();
         $showOn = $this->getShowOn();
+        $firstDay = $this->getFirstDay();
 
         $html .= '<script type="text/javascript">
             require(["jquery", "mage/calendar"], function($){
@@ -59,6 +60,7 @@ protected function _toHtml()
             ($changeMonth === null ? '' : ', changeMonth: ' . $changeMonth) .
             ($changeYear === null ? '' : ', changeYear: ' . $changeYear) .
             ($showOn ? ', showOn: "' . $showOn . '"' : '') .
+            ($firstDay ? ', firstDay: ' . $firstDay : '') .
             '})
             });
             </script>';
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index 71b73918120f8..6c5761f8cea25 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -11,6 +11,8 @@
  * @method string getLabel()
  * @method string getPath()
  * @method string getTitle()
+ *
+ * @api
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index ab1bca9f4548c..7aac210dcab89 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Framework\View\Element\Html\Link;
 
+use Magento\Framework\App\DefaultPathInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+
 /**
  * Block representing link with two possible states.
  * "Current" state means link leads to URL equivalent to URL of currently displayed page.
@@ -17,25 +21,25 @@
  * @method null|bool                       getCurrent()
  * @method \Magento\Framework\View\Element\Html\Link\Current setCurrent(bool $value)
  */
-class Current extends \Magento\Framework\View\Element\Template
+class Current extends Template
 {
     /**
      * Default path
      *
-     * @var \Magento\Framework\App\DefaultPathInterface
+     * @var DefaultPathInterface
      */
     protected $_defaultPath;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
+     * @param Context $context
+     * @param DefaultPathInterface $defaultPath
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Framework\App\DefaultPathInterface $defaultPath,
+        Context $context,
+        DefaultPathInterface $defaultPath,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -56,18 +60,20 @@ public function getHref()
      * Get current mca
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     private function getMca()
     {
         $routeParts = [
-            'module' => $this->_request->getModuleName(),
-            'controller' => $this->_request->getControllerName(),
-            'action' => $this->_request->getActionName(),
+            (string)$this->_request->getModuleName(),
+            (string)$this->_request->getControllerName(),
+            (string)$this->_request->getActionName(),
         ];
 
         $parts = [];
+        $pathParts = explode('/', trim($this->_request->getPathInfo(), '/'));
         foreach ($routeParts as $key => $value) {
-            if (!empty($value) && $value != $this->_defaultPath->getPart($key)) {
+            if (isset($pathParts[$key]) && $pathParts[$key] === $value) {
                 $parts[] = $value;
             }
         }
@@ -104,13 +110,13 @@ protected function _toHtml()
         if ($this->isCurrent()) {
             $html = '<li class="nav item current">';
             $html .= '<strong>'
-                . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()))
+                . $this->escapeHtml(__($this->getLabel()))
                 . '</strong>';
             $html .= '</li>';
         } else {
             $html = '<li class="nav item' . $highlight . '"><a href="' . $this->escapeHtml($this->getHref()) . '"';
             $html .= $this->getTitle()
-                ? ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"'
+                ? ' title="' . $this->escapeHtml(__($this->getTitle())) . '"'
                 : '';
             $html .= $this->getAttributesHtml() . '>';
 
@@ -118,7 +124,7 @@ protected function _toHtml()
                 $html .= '<strong>';
             }
 
-            $html .= $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()));
+            $html .= $this->escapeHtml(__($this->getLabel()));
 
             if ($this->getIsHighlighted()) {
                 $html .= '</strong>';
diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
index 4b4e7e1bad467..285c05c9db69c 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
@@ -7,10 +7,10 @@
 
 use \Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
+use \Magento\Framework\Filesystem\Driver\File as FileDriver;
 
 /**
  * Class Validator
- * @package Magento\Framework\View\Element\Template\File
  */
 class Validator
 {
@@ -68,6 +68,11 @@ class Validator
      */
     protected $_compiledDir;
 
+    /**
+     * @var FileDriver
+     */
+    private $fileDriver;
+
     /**
      * Class constructor
      *
@@ -75,12 +80,14 @@ class Validator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface
      * @param ComponentRegistrar $componentRegistrar
      * @param string|null $scope
+     * @param FileDriver|null $fileDriver
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
         ComponentRegistrar $componentRegistrar,
-        $scope = null
+        $scope = null,
+        ?FileDriver $fileDriver = null
     ) {
         $this->_filesystem = $filesystem;
         $this->_isAllowSymlinks = $scopeConfigInterface->getValue(self::XML_PATH_TEMPLATE_ALLOW_SYMLINK, $scope);
@@ -88,6 +95,7 @@ public function __construct(
         $this->moduleDirs = $componentRegistrar->getPaths(ComponentRegistrar::MODULE);
         $this->_compiledDir = $this->_filesystem->getDirectoryRead(DirectoryList::TMP_MATERIALIZATION_DIR)
             ->getAbsolutePath();
+        $this->fileDriver = $fileDriver ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FileDriver::class);
     }
 
     /**
@@ -127,8 +135,9 @@ protected function isPathInDirectories($path, $directories)
         if (!is_array($directories)) {
             $directories = (array)$directories;
         }
+        $realPath = $this->fileDriver->getRealPath($path);
         foreach ($directories as $directory) {
-            if (0 === strpos($path, $directory)) {
+            if (0 === strpos($realPath, $directory)) {
                 return true;
             }
         }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
index b20726b79589f..015ecf403b3ec 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
@@ -341,7 +341,7 @@ public function createDomDocument($xml)
      * Validate dom document
      *
      * @param \DOMDocument $domDocument
-     * @param string|null $schemaFilePath
+     * @param string|null $schema
      * @return array of errors
      * @throws \Exception
      */
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
index 17a320164dad3..9ba7833a355d7 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
@@ -75,7 +75,7 @@ public function collectFiles($searchPattern = null)
         }
         $files = $this->collectorAggregated->getFiles($this->design->getDesignTheme(), $searchPattern);
         foreach ($files as $file) {
-            $fullFileName = $file->getFileName();
+            $fullFileName = $file->getFilename();
             $fileDir = dirname($fullFileName);
             $fileName = basename($fullFileName);
             $dirRead = $this->readFactory->create($fileDir);
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index 73f125be77c79..e472a9c9effb1 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -104,7 +104,7 @@ class Context implements ContextInterface
      * @param Processor $processor
      * @param UiComponentFactory $uiComponentFactory
      * @param DataProviderInterface|null $dataProvider
-     * @param null $namespace
+     * @param string|null $namespace
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -152,7 +152,7 @@ public function addComponentDefinition($name, array $config)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getComponentsDefinitions()
     {
@@ -160,7 +160,7 @@ public function getComponentsDefinitions()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRenderEngine()
     {
@@ -168,7 +168,7 @@ public function getRenderEngine()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getNamespace()
     {
@@ -176,7 +176,7 @@ public function getNamespace()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAcceptType()
     {
@@ -184,7 +184,7 @@ public function getAcceptType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRequestParams()
     {
@@ -192,7 +192,7 @@ public function getRequestParams()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRequestParam($key, $defaultValue = null)
     {
@@ -200,7 +200,7 @@ public function getRequestParam($key, $defaultValue = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFiltersParams()
     {
@@ -208,16 +208,16 @@ public function getFiltersParams()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFilterParam($key, $defaultValue = null)
     {
         $filter = $this->getFiltersParams();
-        return isset($filter[$key]) ? $filter[$key] : $defaultValue;
+        return $filter[$key] ?? $defaultValue;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDataProvider()
     {
@@ -225,7 +225,7 @@ public function getDataProvider()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDataSourceData(UiComponentInterface $component)
     {
@@ -250,7 +250,7 @@ public function getDataSourceData(UiComponentInterface $component)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPageLayout()
     {
@@ -258,7 +258,7 @@ public function getPageLayout()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addButtons(array $buttons, UiComponentInterface $component)
     {
@@ -297,14 +297,14 @@ public function addButtons(array $buttons, UiComponentInterface $component)
      */
     public function sortButtons(array $itemA, array $itemB)
     {
-        $sortOrderA = isset($itemA['sort_order']) ? intval($itemA['sort_order']) : 0;
-        $sortOrderB = isset($itemB['sort_order']) ? intval($itemB['sort_order']) : 0;
+        $sortOrderA = isset($itemA['sort_order']) ? (int)$itemA['sort_order'] : 0;
+        $sortOrderB = isset($itemB['sort_order']) ? (int)$itemB['sort_order'] : 0;
 
         return $sortOrderA - $sortOrderB;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function addHtmlBlocks(array $htmlBlocks, UiComponentInterface $component)
@@ -336,7 +336,7 @@ protected function setAcceptType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDataProvider(DataProviderInterface $dataProvider)
     {
@@ -344,7 +344,7 @@ public function setDataProvider(DataProviderInterface $dataProvider)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUrl($route = '', $params = [])
     {
@@ -370,7 +370,7 @@ protected function prepareDataSource(array & $data, UiComponentInterface $compon
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getProcessor()
     {
@@ -378,7 +378,7 @@ public function getProcessor()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUiComponentFactory()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
index b2288a47f8f83..baa4e94eed978 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
@@ -181,7 +181,7 @@ public function getMeta()
      */
     public function getFieldSetMetaInfo($fieldSetName)
     {
-        return isset($this->meta[$fieldSetName]) ? $this->meta[$fieldSetName] : [];
+        return $this->meta[$fieldSetName] ?? [];
     }
 
     /**
@@ -190,7 +190,7 @@ public function getFieldSetMetaInfo($fieldSetName)
      */
     public function getFieldsMetaInfo($fieldSetName)
     {
-        return isset($this->meta[$fieldSetName]['children']) ? $this->meta[$fieldSetName]['children'] : [];
+        return $this->meta[$fieldSetName]['children'] ?? [];
     }
 
     /**
@@ -200,9 +200,7 @@ public function getFieldsMetaInfo($fieldSetName)
      */
     public function getFieldMetaInfo($fieldSetName, $fieldName)
     {
-        return isset($this->meta[$fieldSetName]['children'][$fieldName])
-            ? $this->meta[$fieldSetName]['children'][$fieldName]
-            : [];
+        return $this->meta[$fieldSetName]['children'][$fieldName] ?? [];
     }
 
     /**
@@ -291,7 +289,7 @@ public function getData()
      */
     public function getConfigData()
     {
-        return isset($this->data['config']) ? $this->data['config'] : [];
+        return $this->data['config'] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
index e7cbc5000d337..f683e248aec91 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -62,6 +62,16 @@ function ($column) use ($alias) {
         return $columns;
     }
 
+    /**
+     * Escape against value
+     * @param string $value
+     * @return string
+     */
+    private function escapeAgainstValue(string $value): string
+    {
+        return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
+    }
+
     /**
      * Apply fulltext filters
      *
@@ -86,7 +96,7 @@ public function apply(Collection $collection, Filter $filter)
         $collection->getSelect()
             ->where(
                 'MATCH(' . implode(',', $columns) . ') AGAINST(?)',
-                $filter->getValue()
+                $this->escapeAgainstValue($filter->getValue())
             );
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
index 93fe88a30f065..626aebeb94269 100755
--- a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Element;
 
 use Magento\Framework\Config\DataInterface;
@@ -265,13 +266,17 @@ protected function getBundleChildren(array $children = [])
         foreach ($children as $identifier => $config) {
             if (!isset($config['componentType'])) {
                 throw new LocalizedException(new Phrase(
-                    'The configuration parameter "componentType" is a required for "%1" component.',
+                    'The "componentType" configuration parameter is required for the "%1" component.',
                     $identifier
                 ));
             }
 
             if (!isset($componentArguments['context'])) {
-                throw new LocalizedException(new \Magento\Framework\Phrase('Each UI component should have context.'));
+                throw new LocalizedException(
+                    new \Magento\Framework\Phrase(
+                        'An error occurred with the UI component. Each component needs context. Verify and try again.'
+                    )
+                );
             }
 
             $rawComponentData = $this->definitionData->get($config['componentType']);
@@ -382,7 +387,7 @@ protected function mergeMetadataItem(array $bundleComponents, array $metadata, $
             if (!$isMerged) {
                 if (!isset($data['arguments']['data']['config']['componentType'])) {
                     throw new LocalizedException(new Phrase(
-                        'The configuration parameter "componentType" is a required for "%1" component.',
+                        'The "componentType" configuration parameter is required for the "%1" component.',
                         [$name]
                     ));
                 }
diff --git a/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php
index ca5a6e31f1cb1..5cd7591098207 100755
--- a/lib/internal/Magento/Framework/View/Layout.php
+++ b/lib/internal/Magento/Framework/View/Layout.php
@@ -13,7 +13,6 @@
 use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Layout\Element;
-use Magento\Framework\View\Layout\ScheduledStructure;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
@@ -533,7 +532,7 @@ public function renderNonCachedElement($name)
             } elseif ($this->isBlock($name)) {
                 $result = $this->_renderBlock($name);
             } else {
-                $result = $this->_renderContainer($name);
+                $result = $this->_renderContainer($name, false);
             }
         } catch (\Exception $e) {
             if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
@@ -575,14 +574,15 @@ protected function _renderUiComponent($name)
      * Gets HTML of container element
      *
      * @param string $name
+     * @param bool $useCache
      * @return string
      */
-    protected function _renderContainer($name)
+    protected function _renderContainer($name, $useCache = true)
     {
         $html = '';
         $children = $this->getChildNames($name);
         foreach ($children as $child) {
-            $html .= $this->renderElement($child);
+            $html .= $this->renderElement($child, $useCache);
         }
         if ($html == '' || !$this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG)) {
             return $html;
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index d38c6b37fdd40..39da65a2d1f3d 100755
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -6,7 +6,9 @@
 namespace Magento\Framework\View\Layout\Generator;
 
 use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManager\Config\Reader\Dom;
+use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Layout;
 
 /**
@@ -60,6 +62,13 @@ class Block implements Layout\GeneratorInterface
      */
     protected $exceptionHandlerBlockFactory;
 
+    /**
+     * Default block class name. Will be used if no class name is specified in block configuration.
+     *
+     * @var string
+     */
+    private $defaultClass;
+
     /**
      * @param \Magento\Framework\View\Element\BlockFactory $blockFactory
      * @param \Magento\Framework\Data\Argument\InterpreterInterface $argumentInterpreter
@@ -69,6 +78,7 @@ class Block implements Layout\GeneratorInterface
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param \Magento\Framework\View\Element\ExceptionHandlerBlockFactory $exceptionHandlerBlockFactory
      * @param State $appState
+     * @param string $defaultClass
      */
     public function __construct(
         \Magento\Framework\View\Element\BlockFactory $blockFactory,
@@ -78,7 +88,8 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
         \Magento\Framework\View\Element\ExceptionHandlerBlockFactory $exceptionHandlerBlockFactory,
-        State $appState
+        State $appState,
+        $defaultClass = Template::class
     ) {
         $this->blockFactory = $blockFactory;
         $this->argumentInterpreter = $argumentInterpreter;
@@ -88,12 +99,11 @@ public function __construct(
         $this->scopeResolver = $scopeResolver;
         $this->exceptionHandlerBlockFactory = $exceptionHandlerBlockFactory;
         $this->appState = $appState;
+        $this->defaultClass = $defaultClass;
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @return string
+     * @inheritdoc
      */
     public function getType()
     {
@@ -210,7 +220,8 @@ protected function generateBlock(
         }
 
         // create block
-        $className = $attributes['class'];
+        $className = isset($attributes['class']) && !empty($attributes['class']) ?
+            $attributes['class'] : $this->defaultClass;
         $block = $this->createBlock($className, $elementName, [
             'data' => $this->evaluateArguments($data['arguments'])
         ]);
@@ -260,7 +271,7 @@ protected function getBlockInstance($block, array $arguments = [])
             }
         }
         if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 new \Magento\Framework\Phrase(
                     'Invalid block type: %1',
                     [is_object($block) ? get_class($block) : (string) $block]
diff --git a/lib/internal/Magento/Framework/View/Layout/Generic.php b/lib/internal/Magento/Framework/View/Layout/Generic.php
index b83545ff3c439..b527d1a817a96 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generic.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generic.php
@@ -200,6 +200,6 @@ protected function createChildFormComponent(UiComponentInterface $childComponent
      */
     protected function getConfig($name)
     {
-        return isset($this->data['config'][$name]) ? $this->data['config'][$name] : null;
+        return $this->data['config'][$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
index 25a04845a0728..3193e10282fd4 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
@@ -146,7 +146,7 @@ public function unsetElementToSort($elementName)
      */
     public function getElementToSort($elementName, array $default = [])
     {
-        return isset($this->elementsToSort[$elementName]) ? $this->elementsToSort[$elementName] : $default;
+        return $this->elementsToSort[$elementName] ?? $default;
     }
 
     /**
@@ -257,7 +257,7 @@ public function unsetElement($elementName)
      */
     public function getElementToMove($elementName, $default = null)
     {
-        return isset($this->scheduledMoves[$elementName]) ? $this->scheduledMoves[$elementName] : $default;
+        return $this->scheduledMoves[$elementName] ?? $default;
     }
 
     /**
@@ -370,7 +370,7 @@ public function unsetStructureElement($elementName)
      */
     public function getStructureElementData($elementName, $default = null)
     {
-        return isset($this->scheduledData[$elementName]) ? $this->scheduledData[$elementName] : $default;
+        return $this->scheduledData[$elementName] ?? $default;
     }
 
     /**
@@ -524,6 +524,6 @@ public function populateWithArray(array $data)
      */
     private function getArrayValueByKey($key, array $array)
     {
-        return isset($array[$key]) ? $array[$key] : [];
+        return $array[$key] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
index ea80380865e6a..39cdec05a65ea 100755
--- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
@@ -138,7 +138,7 @@
 
     <xs:simpleType name="blockClassType">
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z][a-zA-Z\d]*(\\[A-Z][a-zA-Z\d]*)*"/>
+            <xs:pattern value="[A-Z][_a-zA-Z\d]*(\\[A-Z][_a-zA-Z\d]*)*"/>
         </xs:restriction>
     </xs:simpleType>
 
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
index d64270a148eec..a913507ae17b3 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
@@ -18,6 +18,7 @@
         <xs:attribute name="sizes" type="xs:string"/>
         <xs:attribute name="target" type="xs:string"/>
         <xs:attribute name="type" type="xs:string"/>
+        <xs:attribute name="order" type="xs:integer"/>
         <xs:attribute name="src_type" type="xs:string"/>
     </xs:complexType>
 
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
index f830f41b53255..e50b8a9cf2808 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
@@ -62,4 +62,10 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
index 397b71fe70825..09ad246b3a64d 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
@@ -32,4 +32,10 @@
             <xs:field xpath="@name"/>
         </xs:unique>
     </xs:element>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd
index 915ba61748bab..8e5ecde1487af 100755
--- a/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd
@@ -7,6 +7,8 @@
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:include schemaLocation="urn:magento:framework:View/Layout/etc/elements.xsd"/>
+    <xs:include schemaLocation="urn:magento:framework:View/Layout/etc/head.xsd"/>
+    <xs:include schemaLocation="urn:magento:framework:View/Layout/etc/body.xsd"/>
 
     <xs:complexType name="pageLayoutType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -14,6 +16,8 @@
             <xs:element name="container" type="containerType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="update" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="move" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="head" type="headType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="body" type="bodyType" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
index ea8f74107954c..a0cdbfb7d8fe7 100644
--- a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -443,6 +443,9 @@ public function load($handles = [])
         if ($result) {
             $this->addUpdate($result);
             $this->pageLayout = $this->_loadCache($cacheIdPageLayout);
+            foreach ($this->getHandles() as $handle) {
+                $this->allHandles[$handle] = $this->handleProcessed;
+            }
             return $this;
         }
 
@@ -672,7 +675,7 @@ public function getFileLayoutUpdatesXml()
             $result = $this->_loadXmlString($result);
         } else {
             $result = $this->_loadFileLayoutUpdatesXml();
-            $this->_saveCache($result->asXml(), $cacheId);
+            $this->_saveCache($result->asXML(), $cacheId);
         }
         $this->layoutUpdatesCache = $result;
         return $result;
@@ -811,7 +814,7 @@ private function getXmlErrors($libXmlErrors)
     protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
         $result = $theme;
-        while ($result->getId() && !$result->isPhysical()) {
+        while ($result !== null && $result->getId() && !$result->isPhysical()) {
             $result = $result->getParentTheme();
         }
         if (!$result) {
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 4b081daea83aa..b29a0feda9d60 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -7,6 +7,7 @@
 namespace Magento\Framework\View\Page;
 
 use Magento\Framework\App;
+use Magento\Framework\App\Area;
 use Magento\Framework\View;
 
 /**
@@ -34,6 +35,15 @@ class Config
     const ELEMENT_TYPE_HEAD = 'head';
     /**#@-*/
 
+    const META_DESCRIPTION = 'description';
+    const META_CONTENT_TYPE = 'content_type';
+    const META_MEDIA_TYPE = 'media_type';
+    const META_CHARSET = 'charset';
+    const META_TITLE = 'title';
+    const META_KEYWORDS = 'keywords';
+    const META_ROBOTS = 'robots';
+    const META_X_UI_COMPATIBLE = 'x_ua_compatible';
+
     /**
      * Constant body attribute class
      */
@@ -117,6 +127,7 @@ class Config
         'description' => null,
         'keywords' => null,
         'robots' => null,
+        'title' => null,
     ];
 
     /**
@@ -178,6 +189,8 @@ public function __construct(
     }
 
     /**
+     * Set builder.
+     *
      * @param View\Layout\BuilderInterface $builder
      * @return $this
      */
@@ -189,6 +202,7 @@ public function setBuilder(View\Layout\BuilderInterface $builder)
 
     /**
      * Build page config from page configurations
+     *
      * @return void
      */
     protected function build()
@@ -199,7 +213,10 @@ protected function build()
     }
 
     /**
+     * Public build action
+     *
      * TODO Will be eliminated in MAGETWO-28359
+     *
      * @return void
      */
     public function publicBuild()
@@ -219,6 +236,8 @@ public function getTitle()
     }
 
     /**
+     * Set metadata.
+     *
      * @param string $name
      * @param string $content
      * @return void
@@ -230,6 +249,8 @@ public function setMetadata($name, $content)
     }
 
     /**
+     * Returns metadata
+     *
      * @return array
      */
     public function getMetadata()
@@ -239,12 +260,14 @@ public function getMetadata()
     }
 
     /**
+     * Set content type
+     *
      * @param string $contentType
      * @return void
      */
     public function setContentType($contentType)
     {
-        $this->setMetadata('content_type', $contentType);
+        $this->setMetadata(self::META_CONTENT_TYPE, $contentType);
     }
 
     /**
@@ -255,19 +278,21 @@ public function setContentType($contentType)
     public function getContentType()
     {
         $this->build();
-        if (strtolower($this->metadata['content_type']) === 'auto') {
-            $this->metadata['content_type'] = $this->getMediaType() . '; charset=' . $this->getCharset();
+        if (strtolower($this->metadata[self::META_CONTENT_TYPE]) === 'auto') {
+            $this->metadata[self::META_CONTENT_TYPE] = $this->getMediaType() . '; charset=' . $this->getCharset();
         }
-        return $this->metadata['content_type'];
+        return $this->metadata[self::META_CONTENT_TYPE];
     }
 
     /**
+     * Set media type
+     *
      * @param string $mediaType
      * @return void
      */
     public function setMediaType($mediaType)
     {
-        $this->setMetadata('media_type', $mediaType);
+        $this->setMetadata(self::META_MEDIA_TYPE, $mediaType);
     }
 
     /**
@@ -278,22 +303,24 @@ public function setMediaType($mediaType)
     public function getMediaType()
     {
         $this->build();
-        if (empty($this->metadata['media_type'])) {
-            $this->metadata['media_type'] = $this->scopeConfig->getValue(
+        if (empty($this->metadata[self::META_MEDIA_TYPE])) {
+            $this->metadata[self::META_MEDIA_TYPE] = $this->scopeConfig->getValue(
                 'design/head/default_media_type',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return $this->metadata['media_type'];
+        return $this->metadata[self::META_MEDIA_TYPE];
     }
 
     /**
+     * Set charset
+     *
      * @param string $charset
      * @return void
      */
     public function setCharset($charset)
     {
-        $this->setMetadata('charset', $charset);
+        $this->setMetadata(self::META_CHARSET, $charset);
     }
 
     /**
@@ -304,22 +331,24 @@ public function setCharset($charset)
     public function getCharset()
     {
         $this->build();
-        if (empty($this->metadata['charset'])) {
-            $this->metadata['charset'] = $this->scopeConfig->getValue(
+        if (empty($this->metadata[self::META_CHARSET])) {
+            $this->metadata[self::META_CHARSET] = $this->scopeConfig->getValue(
                 'design/head/default_charset',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return $this->metadata['charset'];
+        return $this->metadata[self::META_CHARSET];
     }
 
     /**
+     * Set description
+     *
      * @param string $description
      * @return void
      */
     public function setDescription($description)
     {
-        $this->setMetadata('description', $description);
+        $this->setMetadata(self::META_DESCRIPTION, $description);
     }
 
     /**
@@ -330,22 +359,49 @@ public function setDescription($description)
     public function getDescription()
     {
         $this->build();
-        if (empty($this->metadata['description'])) {
-            $this->metadata['description'] = $this->scopeConfig->getValue(
+        if (empty($this->metadata[self::META_DESCRIPTION])) {
+            $this->metadata[self::META_DESCRIPTION] = $this->scopeConfig->getValue(
                 'design/head/default_description',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return $this->metadata['description'];
+        return $this->metadata[self::META_DESCRIPTION];
+    }
+
+    /**
+     * Set meta title
+     *
+     * @param string $title
+     */
+    public function setMetaTitle($title)
+    {
+        $this->setMetadata(self::META_TITLE, $title);
+    }
+
+    /**
+     * Retrieve meta title
+     *
+     * @return string
+     */
+    public function getMetaTitle()
+    {
+        $this->build();
+        if (empty($this->metadata[self::META_TITLE])) {
+            return '';
+        }
+
+        return $this->metadata[self::META_TITLE];
     }
 
     /**
+     * Set keywords
+     *
      * @param string $keywords
      * @return void
      */
     public function setKeywords($keywords)
     {
-        $this->setMetadata('keywords', $keywords);
+        $this->setMetadata(self::META_KEYWORDS, $keywords);
     }
 
     /**
@@ -356,45 +412,50 @@ public function setKeywords($keywords)
     public function getKeywords()
     {
         $this->build();
-        if (empty($this->metadata['keywords'])) {
-            $this->metadata['keywords'] = $this->scopeConfig->getValue(
+        if (empty($this->metadata[self::META_KEYWORDS])) {
+            $this->metadata[self::META_KEYWORDS] = $this->scopeConfig->getValue(
                 'design/head/default_keywords',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return $this->metadata['keywords'];
+        return $this->metadata[self::META_KEYWORDS];
     }
 
     /**
+     * Set robots content
+     *
      * @param string $robots
      * @return void
      */
     public function setRobots($robots)
     {
-        $this->setMetadata('robots', $robots);
+        $this->setMetadata(self::META_ROBOTS, $robots);
     }
 
     /**
      * Retrieve URL to robots file
      *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getRobots()
     {
-        if ($this->getAreaResolver()->getAreaCode() !== 'frontend') {
+        if ($this->getAreaResolver()->getAreaCode() !== Area::AREA_FRONTEND) {
             return 'NOINDEX,NOFOLLOW';
         }
         $this->build();
-        if (empty($this->metadata['robots'])) {
-            $this->metadata['robots'] = $this->scopeConfig->getValue(
+        if (empty($this->metadata[self::META_ROBOTS])) {
+            $this->metadata[self::META_ROBOTS] = $this->scopeConfig->getValue(
                 'design/search_engine_robots/default_robots',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return $this->metadata['robots'];
+        return $this->metadata[self::META_ROBOTS];
     }
 
     /**
+     * Returns collection of the assets
+     *
      * @return \Magento\Framework\View\Asset\GroupedCollection
      */
     public function getAssetCollection()
@@ -404,6 +465,8 @@ public function getAssetCollection()
     }
 
     /**
+     * Add asset to page content
+     *
      * @param string $file
      * @param array $properties
      * @param string|null $name
@@ -507,17 +570,19 @@ public function setElementAttribute($elementType, $attribute, $value)
     public function getElementAttribute($elementType, $attribute)
     {
         $this->build();
-        return isset($this->elements[$elementType][$attribute]) ? $this->elements[$elementType][$attribute] : null;
+        return $this->elements[$elementType][$attribute] ?? null;
     }
 
     /**
+     * Returns element attributes
+     *
      * @param string $elementType
      * @return string[]
      */
     public function getElementAttributes($elementType)
     {
         $this->build();
-        return isset($this->elements[$elementType]) ? $this->elements[$elementType] : [];
+        return $this->elements[$elementType] ?? [];
     }
 
     /**
@@ -543,6 +608,8 @@ public function getPageLayout()
     }
 
     /**
+     * Returns favicon file
+     *
      * @return string
      */
     public function getFaviconFile()
@@ -551,6 +618,8 @@ public function getFaviconFile()
     }
 
     /**
+     * Returns default favicon
+     *
      * @return string
      */
     public function getDefaultFavicon()
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
index 637d773ddde45..3adcac6187f30 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
@@ -42,6 +42,7 @@ class Head implements Layout\GeneratorInterface
      */
     protected $assetProperties = [
         'ie_condition',
+        'order'
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
index 8328f03fd6db5..2e76493b8506d 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\View\Layout;
 use Magento\Framework\View\Page\Config as PageConfig;
+use Magento\Framework\View\Page\Config\Structure;
 
 /**
  * Head structure reader is intended for collecting assets, title and metadata
@@ -71,38 +72,19 @@ public function interpret(
         Layout\Element $headElement
     ) {
         $pageConfigStructure = $readerContext->getPageConfigStructure();
-        /** @var \Magento\Framework\View\Layout\Element $node */
+
+        $orderedNodes = [];
+
         foreach ($headElement as $node) {
-            switch ($node->getName()) {
-                case self::HEAD_CSS:
-                case self::HEAD_SCRIPT:
-                case self::HEAD_LINK:
-                    $this->addContentTypeByNodeName($node);
-                    $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
-                    break;
-
-                case self::HEAD_REMOVE:
-                    $pageConfigStructure->removeAssets($node->getAttribute('src'));
-                    break;
-
-                case self::HEAD_TITLE:
-                    $pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
-                    break;
-
-                case self::HEAD_META:
-                    $this->setMetadata($pageConfigStructure, $node);
-                    break;
-
-                case self::HEAD_ATTRIBUTE:
-                    $pageConfigStructure->setElementAttribute(
-                        PageConfig::ELEMENT_TYPE_HEAD,
-                        $node->getAttribute('name'),
-                        $node->getAttribute('value')
-                    );
-                    break;
-
-                default:
-                    break;
+            $nodeOrder = $node->getAttribute('order') ?: 0;
+            $orderedNodes[$nodeOrder][] = $node;
+        }
+
+        ksort($orderedNodes);
+        foreach ($orderedNodes as $nodes) {
+            /** @var \Magento\Framework\View\Layout\Element $node */
+            foreach ($nodes as $node) {
+                $this->processNode($node, $pageConfigStructure);
             }
         }
         return $this;
@@ -138,6 +120,48 @@ private function setMetadata($pageConfigStructure, $node)
             $metadataName = $node->getAttribute('name');
         }
 
-        $pageConfigStructure->setMetaData($metadataName, $node->getAttribute('content'));
+        $pageConfigStructure->setMetadata($metadataName, $node->getAttribute('content'));
+    }
+
+    /**
+     * Process given node based on it's name.
+     *
+     * @param Layout\Element $node
+     * @param Structure $pageConfigStructure
+     * @return void
+     */
+    private function processNode(Layout\Element $node, Structure $pageConfigStructure)
+    {
+        switch ($node->getName()) {
+            case self::HEAD_CSS:
+            case self::HEAD_SCRIPT:
+            case self::HEAD_LINK:
+                $this->addContentTypeByNodeName($node);
+                $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
+                break;
+
+            case self::HEAD_REMOVE:
+                $pageConfigStructure->removeAssets($node->getAttribute('src'));
+                break;
+
+            case self::HEAD_TITLE:
+                $pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
+                break;
+
+            case self::HEAD_META:
+                $this->setMetadata($pageConfigStructure, $node);
+                break;
+
+            case self::HEAD_ATTRIBUTE:
+                $pageConfigStructure->setElementAttribute(
+                    PageConfig::ELEMENT_TYPE_HEAD,
+                    $node->getAttribute('name'),
+                    $node->getAttribute('value')
+                );
+                break;
+
+            default:
+                break;
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index 9563cbfbcc532..ac46cf8a594cc 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Page\Config;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Asset\GroupedCollection;
 use Magento\Framework\View\Page\Config;
 
@@ -21,7 +23,7 @@ class Renderer implements RendererInterface
     protected $assetTypeOrder = ['css', 'ico', 'js'];
 
     /**
-     * @var \Magento\Framework\View\Page\Config
+     * @var Config
      */
     protected $pageConfig;
 
@@ -51,7 +53,7 @@ class Renderer implements RendererInterface
     protected $urlBuilder;
 
     /**
-     * @param \Magento\Framework\View\Page\Config $pageConfig
+     * @param Config $pageConfig
      * @param \Magento\Framework\View\Asset\MergeService $assetMergeService
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\Escaper $escaper
@@ -75,6 +77,8 @@ public function __construct(
     }
 
     /**
+     * Render element attributes
+     *
      * @param string $elementType
      * @return string
      */
@@ -88,6 +92,8 @@ public function renderElementAttributes($elementType)
     }
 
     /**
+     * Render head content
+     *
      * @return string
      */
     public function renderHeadContent()
@@ -102,6 +108,8 @@ public function renderHeadContent()
     }
 
     /**
+     * Render title
+     *
      * @return string
      */
     public function renderTitle()
@@ -110,6 +118,8 @@ public function renderTitle()
     }
 
     /**
+     * Render metadata
+     *
      * @return string
      */
     public function renderMetadata()
@@ -129,6 +139,8 @@ public function renderMetadata()
     }
 
     /**
+     * Process metadata content
+     *
      * @param string $name
      * @param string $content
      * @return mixed
@@ -136,6 +148,12 @@ public function renderMetadata()
     protected function processMetadataContent($name, $content)
     {
         $method = 'get' . $this->string->upperCaseWords($name, '_', '');
+        if ($name === 'title') {
+            if (!$content) {
+                $content = $this->escaper->escapeHtml($this->pageConfig->$method()->get());
+            }
+            return $content;
+        }
         if (method_exists($this->pageConfig, $method)) {
             $content = $this->pageConfig->$method();
         }
@@ -143,6 +161,8 @@ protected function processMetadataContent($name, $content)
     }
 
     /**
+     * Returns metadata template
+     *
      * @param string $name
      * @return bool|string
      */
@@ -153,19 +173,19 @@ protected function getMetadataTemplate($name)
         }
 
         switch ($name) {
-            case 'charset':
+            case Config::META_CHARSET:
                 $metadataTemplate = '<meta charset="%content"/>' . "\n";
                 break;
 
-            case 'content_type':
+            case Config::META_CONTENT_TYPE:
                 $metadataTemplate = '<meta http-equiv="Content-Type" content="%content"/>' . "\n";
                 break;
 
-            case 'x_ua_compatible':
+            case Config::META_X_UI_COMPATIBLE:
                 $metadataTemplate = '<meta http-equiv="X-UA-Compatible" content="%content"/>' . "\n";
                 break;
 
-            case 'media_type':
+            case Config::META_MEDIA_TYPE:
                 $metadataTemplate = false;
                 break;
 
@@ -177,6 +197,8 @@ protected function getMetadataTemplate($name)
     }
 
     /**
+     * Favicon preparation
+     *
      * @return void
      */
     public function prepareFavicon()
@@ -242,6 +264,8 @@ protected function renderAssetGroup(\Magento\Framework\View\Asset\PropertyGroup
     }
 
     /**
+     * Process assets merge
+     *
      * @param array $groupAssets
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return array
@@ -258,6 +282,8 @@ protected function processMerge($groupAssets, $group)
     }
 
     /**
+     * Returns group attributes
+     *
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return string|null
      */
@@ -279,6 +305,8 @@ protected function getGroupAttributes($group)
     }
 
     /**
+     * Add default attributes
+     *
      * @param string $contentType
      * @param string $attributes
      * @return string
@@ -298,6 +326,8 @@ protected function addDefaultAttributes($contentType, $attributes)
     }
 
     /**
+     * Returns assets template
+     *
      * @param string $contentType
      * @param string|null $attributes
      * @return string
@@ -318,6 +348,8 @@ protected function getAssetTemplate($contentType, $attributes)
     }
 
     /**
+     * Process IE condition
+     *
      * @param string $groupHtml
      * @param \Magento\Framework\View\Asset\PropertyGroup $group
      * @return string
@@ -352,7 +384,7 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $
                 );
                 $result .= sprintf($template, $asset->getUrl());
             }
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->logger->critical($e);
             $result .= sprintf($template, $this->urlBuilder->getUrl('', ['_direct' => 'core/index/notFound']));
         }
@@ -371,6 +403,8 @@ protected function getAssetContentType(\Magento\Framework\View\Asset\AssetInterf
     }
 
     /**
+     * Returns available groups.
+     *
      * @return array
      */
     public function getAvailableResultGroups()
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
index 280d62e9c5a7e..1a181952ed990 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Structure.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
@@ -251,6 +251,6 @@ public function populateWithArray(array $data)
      */
     private function getArrayValueByKey($key, array $array)
     {
-        return isset($array[$key]) ? $array[$key] : [];
+        return $array[$key] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
index 0e25331a1e687..796cc8bef0f28 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -131,8 +131,8 @@ public function minify($file)
                             '#(?<!:|\\\\|\'|")//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
                             '',
                             preg_replace(
-                                '#(?<!:|\'|")//[^\n\r]*(\s\?\>)#',
-                                '$1',
+                                '#(?<!:|\'|")//[^\n\r]*(\?\>)#',
+                                ' $1',
                                 preg_replace(
                                     '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
                                     '',
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
index 94d24124469cd..eda2e2e4b6dc7 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
@@ -122,7 +122,7 @@ public function postprocessing($content)
         return preg_replace_callback(
             '#' . $patternTag . '(.+?)' . $patternTag . '#',
             function ($match) {
-                return isset($this->data[$match[1]]) ? $this->data[$match[1]] : '';
+                return $this->data[$match[1]] ?? '';
             },
             $content
         );
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
index cd372399fcbc0..3a49cd85bb701 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\TemplateEngine\Xhtml;
 
 use Magento\Framework\Phrase;
@@ -54,7 +55,9 @@ public function create(array $arguments = [])
         $object = $this->objectManager->create($this->instanceName, $arguments);
 
         if (!($object instanceof Template)) {
-            throw new LocalizedException(new Phrase('This class must inherit from a class "Template"'));
+            throw new LocalizedException(
+                new Phrase('This class needs to inherit from a class "Template". Verify the class and try again.')
+            );
         }
 
         return $object;
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php
index 68b5f4bf3a20d..2d6ea2efe4958 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php
@@ -53,6 +53,9 @@ public function testGetConfigPath(
         $this->assertEquals($expectedResult, $this->fallbackContext->getConfigPath());
     }
 
+    /**
+     * @return array
+     */
     public function getConfigPathDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/FileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/FileTest.php
index b2953bc24e131..64d0419e070d0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/FileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/FileTest.php
@@ -134,6 +134,9 @@ public function testGetContent($content)
         $this->assertEquals($content, $this->object->getContent()); // no in-memory caching for content
     }
 
+    /**
+     * @return array
+     */
     public function getContentDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php
index c4b7cefcfa7c2..4c17a2c0b35f4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php
@@ -118,6 +118,9 @@ public function testGetMergedAssets(array $assets, $contentType, $appMode, $merg
         $this->assertSame($mergedAsset, $this->object->getMergedAssets($assets, $contentType));
     }
 
+    /**
+     * @return array
+     */
     public static function getMergedAssetsDataProvider()
     {
         $jsAssets = [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
index 164a2ca4d4d1b..52b45a510e722 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\View\Asset\Repository as AssetRepository;
 use Magento\Framework\View\Asset\MergeableInterface;
 use Magento\Framework\View\Asset\MergeStrategyInterface;
+use Magento\Framework\App\View\Deployment\Version\StorageInterface;
 
 /**
  * Class MergedTest
@@ -43,6 +44,11 @@ class MergedTest extends \PHPUnit\Framework\TestCase
      */
     private $assetRepo;
 
+    /**
+     * @var StorageInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $versionStorage;
+
     protected function setUp()
     {
         $this->assetJsOne = $this->getMockForAbstractClass(MergeableInterface::class);
@@ -66,6 +72,7 @@ protected function setUp()
         $this->assetRepo = $this->getMockBuilder(AssetRepository::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->versionStorage = $this->createMock(StorageInterface::class);
     }
 
     /**
@@ -74,7 +81,13 @@ protected function setUp()
      */
     public function testConstructorNothingToMerge()
     {
-        new \Magento\Framework\View\Asset\Merged($this->logger, $this->mergeStrategy, $this->assetRepo, []);
+        new \Magento\Framework\View\Asset\Merged(
+            $this->logger,
+            $this->mergeStrategy,
+            $this->assetRepo,
+            [],
+            $this->versionStorage
+        );
     }
 
     /**
@@ -90,6 +103,7 @@ public function testConstructorRequireMergeInterface()
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
             'assets' => [$this->assetJsOne, $assetUrl],
+            'versionStorage' => $this->versionStorage,
         ]);
     }
 
@@ -109,6 +123,7 @@ public function testConstructorIncompatibleContentTypes()
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
             'assets' => [$this->assetJsOne, $assetCss],
+            'versionStorage' => $this->versionStorage,
         ]);
     }
 
@@ -124,6 +139,7 @@ public function testIteratorInterfaceMerge()
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
             'assets' => $assets,
+            'versionStorage' => $this->versionStorage,
         ]);
 
         $mergedAsset = $this->createMock(\Magento\Framework\View\Asset\File::class);
@@ -158,6 +174,7 @@ public function testIteratorInterfaceMergeFailure()
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
             'assets' => [$this->assetJsOne, $this->assetJsTwo, $assetBroken],
+            'versionStorage' => $this->versionStorage,
         ]);
 
         $this->logger->expects($this->once())->method('critical')->with($this->identicalTo($mergeError));
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
index 2f6305f1cc73c..48fc8d5c775a4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
@@ -195,6 +195,8 @@ public function isMinifiedFilenameDataProvider()
     }
 
     /**
+     * Test dev/js/minify_exclude system value as array
+     *
      * @return void
      */
     public function testGetExcludes()
@@ -203,14 +205,48 @@ public function testGetExcludes()
             ->expects($this->once())
             ->method('getValue')
             ->with('dev/js/minify_exclude')
-            ->willReturn(
-                "    /tiny_mce/  \n" .
-                "  /tiny_mce2/  "
-            );
+            ->willReturn([
+                'tiny_mce' => '/tiny_mce/',
+                'some_other_unique_name' => '/tiny_mce2/'
+            ]);
 
         $expected = ['/tiny_mce/', '/tiny_mce2/'];
         $this->assertEquals($expected, $this->minification->getExcludes('js'));
         /** check cache: */
         $this->assertEquals($expected, $this->minification->getExcludes('js'));
     }
+
+    /**
+     * Test dev/js/minify_exclude system value backward compatibility when value was a string
+     *
+     * @param string $value
+     * @param array $expectedValue
+     * @return void
+     *
+     * @dataProvider getExcludesTinyMceAsStringDataProvider
+     */
+    public function testGetExcludesTinyMceAsString(string $value, array $expectedValue)
+    {
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with('dev/js/minify_exclude')
+            ->willReturn($value);
+
+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
+        /** check cache: */
+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
+    }
+
+    /**
+     * @return array
+     */
+    public function getExcludesTinyMceAsStringDataProvider()
+    {
+        return [
+            ["/tiny_mce/  \n  /tiny_mce2/", ['/tiny_mce/', '/tiny_mce2/']],
+            ['/tiny_mce/', ['/tiny_mce/']],
+            [' /tiny_mce/', ['/tiny_mce/']],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php
index 923ec2ff322b5..7e672d58d18e0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php
@@ -234,6 +234,9 @@ public function testGetAcceptType($headerAccept, $acceptType)
         $this->assertEquals($acceptType, $this->context->getAcceptType());
     }
 
+    /**
+     * @return array
+     */
     public function getAcceptTypeDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php
index 816087a906c2e..a1f20f2c79cc9 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php
@@ -45,6 +45,10 @@ public function testAddWithException()
         $this->dataSourcePool->add('DataSourcePoolTestBlock', 'NotExistingBlockClass');
     }
 
+    /**
+     * @param $blockClass
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     protected function createBlock($blockClass)
     {
         $block = $this->createMock(\Magento\Framework\View\Element\BlockInterface::class);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
index 6b4994e9e8d8c..a1a52ac261ccf 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
@@ -49,7 +49,8 @@ protected function setUp()
      */
     public function testConstructorException(array $alternativeExtensions)
     {
-        $this->expectException('\InvalidArgumentException', "\$alternativeExtensions must be an array with format:"
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage("\$alternativeExtensions must be an array with format:"
             . " array('ext1' => array('ext1', 'ext2'), 'ext3' => array(...)]");
 
         $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php
index 478a8a4d214e0..1b87b2108f046 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php
@@ -10,6 +10,10 @@
 use Magento\Framework\View\Design\Fallback\RulePool;
 use Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile;
 use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface;
+use Magento\Framework\View\Template\Html\MinifierInterface;
+use Magento\Framework\View\Asset\ConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 class TemplateFileTest extends \PHPUnit\Framework\TestCase
 {
@@ -19,12 +23,12 @@ class TemplateFileTest extends \PHPUnit\Framework\TestCase
     protected $resolver;
 
     /**
-     * @var \Magento\Framework\View\Template\Html\MinifierInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var MinifierInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $minifier;
 
     /**
-     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     * @var State|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $state;
 
@@ -34,26 +38,29 @@ class TemplateFileTest extends \PHPUnit\Framework\TestCase
     protected $object;
 
     /**
-     * @var \Magento\Framework\View\Asset\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $assetConfig;
 
     protected function setUp()
     {
-        $this->resolver = $this->createMock(
-            \Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface::class
-        );
-        $this->minifier = $this->createMock(\Magento\Framework\View\Template\Html\MinifierInterface::class);
-        $this->state = $this->getMockBuilder(
-            \Magento\Framework\App\State::class
-        )->disableOriginalConstructor()->getMock();
-        $this->assetConfig = $this->getMockForAbstractClass(
-            \Magento\Framework\View\Asset\ConfigInterface::class,
-            [],
-            '',
-            false
+        $this->resolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $this->minifier = $this->getMockForAbstractClass(MinifierInterface::class);
+        $this->state = $this->createMock(State::class);
+        $this->assetConfig = $this->getMockForAbstractClass(ConfigInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->object = new TemplateFile(
+            $this->resolver,
+            $this->minifier,
+            $this->state,
+            $this->assetConfig,
+            $this->deploymentConfigMock
         );
-        $this->object = new TemplateFile($this->resolver, $this->minifier, $this->state, $this->assetConfig);
     }
 
     /**
@@ -75,7 +82,7 @@ public function testGetFileWhenStateDeveloper()
         $this->resolver->expects($this->once())
             ->method('resolve')
             ->with(RulePool::TYPE_TEMPLATE_FILE, 'file.ext', 'frontend', $theme, null, 'Magento_Module')
-            ->will($this->returnValue($expected));
+            ->willReturn($expected);
 
         $actual = $this->object->getFile('frontend', $theme, 'file.ext', 'Magento_Module');
         $this->assertSame($expected, $actual);
@@ -84,10 +91,12 @@ public function testGetFileWhenStateDeveloper()
     /**
      * Cover getFile when mode is default
      * @param string $mode
+     * @param integer $onDemandInProduction
+     * @param integer $forceMinification
      * @param string $method
      * @dataProvider getMinifiedDataProvider
      */
-    public function testGetFileWhenModifiedNeeded($mode, $method)
+    public function testGetFileWhenModifiedNeeded($mode, $onDemandInProduction, $forceMinification, $method)
     {
         $this->assetConfig
             ->expects($this->once())
@@ -98,13 +107,19 @@ public function testGetFileWhenModifiedNeeded($mode, $method)
         $expected = 'some/file.ext';
         $expectedMinified = '/path/to/minified/some/file.ext';
 
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('getConfigData')
+            ->willReturnMap([
+                [ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION, $onDemandInProduction],
+                [ConfigOptionsListConstants::CONFIG_PATH_FORCE_HTML_MINIFICATION, $forceMinification],
+            ]);
         $this->state->expects($this->once())
             ->method('getMode')
             ->willReturn($mode);
         $this->resolver->expects($this->once())
             ->method('resolve')
             ->with(RulePool::TYPE_TEMPLATE_FILE, 'file.ext', 'frontend', $theme, null, 'Magento_Module')
-            ->will($this->returnValue($expected));
+            ->willReturn($expected);
         $this->minifier->expects($this->once())
             ->method($method)
             ->with($expected)
@@ -127,9 +142,10 @@ public function testGetFileIfMinificationIsDisabled()
         $this->resolver->expects($this->once())
             ->method('resolve')
             ->with(RulePool::TYPE_TEMPLATE_FILE, 'file.ext', 'frontend', $theme, null, 'Magento_Module')
-            ->will($this->returnValue($expected));
+            ->willReturn($expected);
 
-        $this->state->expects($this->never())->method('getMode');
+        $this->state->expects($this->never())
+            ->method('getMode');
 
         $actual = $this->object->getFile('frontend', $theme, 'file.ext', 'Magento_Module');
         $this->assertSame($expected, $actual);
@@ -143,8 +159,11 @@ public function testGetFileIfMinificationIsDisabled()
     public function getMinifiedDataProvider()
     {
         return [
-            'default' => [State::MODE_DEFAULT, 'getMinified'],
-            'production' => [State::MODE_PRODUCTION, 'getPathToMinified'],
+            'default with on demand' => [State::MODE_DEFAULT, 1, 1, 'getMinified'],
+            'default without on demand' => [State::MODE_DEFAULT, 0, 0, 'getMinified'],
+            'production with on demand' => [State::MODE_PRODUCTION, 1, 0, 'getMinified'],
+            'production without on demand' => [State::MODE_PRODUCTION, 0, 0, 'getPathToMinified'],
+            'production without on demand with minified' => [State::MODE_PRODUCTION, 0, 1, 'getMinified'],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php
index d6555a2264731..bc8a192d14523 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php
@@ -56,10 +56,8 @@ public function testCreateWithWrongThemeType()
 
         $themeDomainFactory = new \Magento\Framework\View\Design\Theme\Domain\Factory($objectManager);
 
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('Invalid type of theme domain model "%s"', $wrongThemeType)
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage(sprintf('Invalid type of theme domain model "%s"', $wrongThemeType));
         $themeDomainFactory->create($themeMock);
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index a3f34b732be82..5f7508438a6ed 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -220,9 +220,9 @@ public function testToHtmlWhenModuleIsDisabled()
      * @param string|bool $cacheLifetime
      * @param string|bool $dataFromCache
      * @param string $dataForSaveCache
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsDispatchEvent
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheLoad
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheSave
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave
      * @param string $expectedResult
      * @return void
      * @dataProvider getCacheLifetimeDataProvider
@@ -290,9 +290,9 @@ public function getCacheLifetimeDataProvider()
                 'dataFromCache' => 'dataFromCache',
                 'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
+                'expectsCacheLoad' => $this->never(),
                 'expectsCacheSave' => $this->never(),
-                'expectedResult' => 'dataFromCache',
+                'expectedResult' => '',
             ],
             [
                 'cacheLifetime' => 120,
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
index 4515a29c65e4f..7070ec9d48c11 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
@@ -17,11 +17,6 @@ class CurrentTest extends \PHPUnit\Framework\TestCase
      */
     protected $_requestMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_defaultPathMock;
-
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
@@ -32,7 +27,6 @@ protected function setUp()
         $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->_defaultPathMock = $this->createMock(\Magento\Framework\App\DefaultPathInterface::class);
     }
 
     public function testGetUrl()
@@ -57,32 +51,49 @@ public function testIsCurrentIfIsset()
         /** @var \Magento\Framework\View\Element\Html\Link\Current $link */
         $link = $this->_objectManager->getObject(\Magento\Framework\View\Element\Html\Link\Current::class);
         $link->setCurrent(true);
-        $this->assertTrue($link->IsCurrent());
+        $this->assertTrue($link->isCurrent());
     }
 
+    /**
+     * Test if the current url is the same as link path
+     *
+     * @return void
+     */
     public function testIsCurrent()
     {
-        $path = 'test/path';
-        $url = 'http://example.com/a/b';
-
-        $this->_requestMock->expects($this->once())->method('getModuleName')->will($this->returnValue('a'));
-        $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
-        $this->_requestMock->expects($this->once())->method('getActionName')->will($this->returnValue('d'));
-        $this->_defaultPathMock->expects($this->atLeastOnce())->method('getPart')->will($this->returnValue('d'));
+        $path = 'test/index';
+        $url = 'http://example.com/test/index';
+
+        $this->_requestMock->expects($this->once())
+            ->method('getPathInfo')
+            ->will($this->returnValue('/test/index/'));
+        $this->_requestMock->expects($this->once())
+            ->method('getModuleName')
+            ->will($this->returnValue('test'));
+        $this->_requestMock->expects($this->once())
+            ->method('getControllerName')
+            ->will($this->returnValue('index'));
+        $this->_requestMock->expects($this->once())
+            ->method('getActionName')
+            ->will($this->returnValue('index'));
+        $this->_urlBuilderMock->expects($this->at(0))
+            ->method('getUrl')
+            ->with($path)
+            ->will($this->returnValue($url));
+        $this->_urlBuilderMock->expects($this->at(1))
+            ->method('getUrl')
+            ->with('test/index')
+            ->will($this->returnValue($url));
 
-        $this->_urlBuilderMock->expects($this->at(0))->method('getUrl')->with($path)->will($this->returnValue($url));
-        $this->_urlBuilderMock->expects($this->at(1))->method('getUrl')->with('a/b')->will($this->returnValue($url));
-
-        $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
         /** @var \Magento\Framework\View\Element\Html\Link\Current $link */
         $link = $this->_objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link\Current::class,
             [
                 'urlBuilder' => $this->_urlBuilderMock,
-                'request' => $this->_requestMock,
-                'defaultPath' => $this->_defaultPathMock
+                'request' => $this->_requestMock
             ]
         );
+
         $link->setPath($path);
         $this->assertTrue($link->isCurrent());
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index 692dcb54d1447..b911a38dbb488 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -35,6 +35,9 @@ public function testGetLinkAttributes($link, $expected)
         $this->assertEquals($expected, $link->getLinkAttributes());
     }
 
+    /**
+     * @return array
+     */
     public function getLinkAttributesDataProvider()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Js/CookieTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Js/CookieTest.php
index 10e21763ba802..fefbdf0ed5111 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Js/CookieTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Js/CookieTest.php
@@ -83,6 +83,9 @@ public function testGetDomain($domain, $isIp, $expectedResult)
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public static function domainDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php
index afa0db13e97c3..8d4e852cf658a 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php
@@ -87,10 +87,8 @@ public function testRenderNoTemplate()
             ->method('getData')
             ->willReturn($messageData);
 
-        $this->expectException(
-            'InvalidArgumentException',
-            'Template should be provided for the renderer.'
-        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Template should be provided for the renderer.');
 
         $this->blockTemplate->expects(static::never())
             ->method('toHtml');
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
index 28d58f4685e80..7a3578993f375 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
@@ -20,21 +20,21 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
      *
      * @var \Magento\Framework\View\Element\Template\File\Validator
      */
-    private $_validator;
+    private $validator;
 
     /**
      * Mock for view file system
      *
      * @var \Magento\Framework\FileSystem|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $_fileSystemMock;
+    private $fileSystemMock;
 
     /**
      * Mock for scope config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $_scopeConfigMock;
+    private $scopeConfigMock;
 
     /**
      * Mock for root directory reader
@@ -62,12 +62,12 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->_fileSystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
-        $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->fileSystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->rootDirectoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
         $this->compiledDirectoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
 
-        $this->_fileSystemMock->expects($this->any())
+        $this->fileSystemMock->expects($this->any())
             ->method('getDirectoryRead')
             ->will($this->returnValueMap(
                 [
@@ -91,10 +91,18 @@ protected function setUp()
                     ]
                 )
             );
-        $this->_validator = new \Magento\Framework\View\Element\Template\File\Validator(
-            $this->_fileSystemMock,
-            $this->_scopeConfigMock,
-            $this->componentRegistrar
+
+        $fileDriverMock = $this->createMock(\Magento\Framework\Filesystem\Driver\File::class);
+        $fileDriverMock->expects($this->any())
+            ->method('getRealPath')
+            ->willReturnArgument(0);
+
+        $this->validator = new \Magento\Framework\View\Element\Template\File\Validator(
+            $this->fileSystemMock,
+            $this->scopeConfigMock,
+            $this->componentRegistrar,
+            null,
+            $fileDriverMock
         );
     }
 
@@ -103,23 +111,22 @@ protected function setUp()
      *
      * @param string $file
      * @param bool $expectedResult
-     *
-     * @dataProvider testIsValidDataProvider
-     *
      * @return void
+     *
+     * @dataProvider isValidDataProvider
      */
     public function testIsValid($file, $expectedResult)
     {
         $this->rootDirectoryMock->expects($this->any())->method('isFile')->will($this->returnValue(true));
-        $this->assertEquals($expectedResult, $this->_validator->isValid($file));
+        $this->assertEquals($expectedResult, $this->validator->isValid($file));
     }
 
     /**
      * Data provider for testIsValid
      *
-     * @return []
+     * @return array
      */
-    public function testIsValidDataProvider()
+    public function isValidDataProvider()
     {
         return [
             'empty' => ['', false],
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php
index 83813785886c5..b457a98b5e236 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php
@@ -175,7 +175,8 @@ public function testFetchViewWithNoFileNameDeveloperMode()
             ->method('getMode')
             ->willReturn(\Magento\Framework\App\State::MODE_DEVELOPER);
 
-        $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $exception);
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
+        $this->expectExceptionMessage($exception);
         $this->block->fetchView($template);
     }
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php
index b2b1db44d6a0b..6ac8355fe7371 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php
@@ -51,6 +51,9 @@ public function testToHtml($liParams, $innerText, $expectedHtml)
         $this->assertEquals($expectedHtml, $this->item->toHtml());
     }
 
+    /**
+     * @return array
+     */
     public function toHtmlDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php
index 785c41c1d6e2f..a16b1ca80c49e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php
@@ -54,6 +54,9 @@ public function testToHtml($liParams, $aParams, $innerText, $afterText, $expecte
         $this->assertEquals($expectedHtml, $this->link->toHtml());
     }
 
+    /**
+     * @return array
+     */
     public function toHtmlDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Decorator/ModuleDependencyTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Decorator/ModuleDependencyTest.php
index d6918c142cee0..8960aa71d22bb 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Decorator/ModuleDependencyTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Decorator/ModuleDependencyTest.php
@@ -53,6 +53,9 @@ public function testGetFiles(array $fixtureFiles, array $expectedFiles, $message
         $this->assertSame($expectedFiles, $this->_model->getFiles($theme, '*.xml'), $message);
     }
 
+    /**
+     * @return array
+     */
     public function getFilesDataProvider()
     {
         $fileOne = new \Magento\Framework\View\File('b.xml', 'Fixture_ModuleB');
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php
index d1a1851c06c52..cae621a09125f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php
@@ -169,7 +169,8 @@ public function testGetFilesWrongAncestor()
         $filePath = 'design/area/theme_path/Module_One/override/theme/vendor/parent_theme/1.xml';
         $expectedMessage = "Trying to override modular view file '$filePath' for theme 'vendor/parent_theme'"
             . ", which is not ancestor of theme 'vendor/theme_path'";
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $expectedMessage);
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage($expectedMessage);
 
         $theme = $this->getMockForAbstractClass(\Magento\Framework\View\Design\ThemeInterface::class);
         $theme->expects($this->once())->method('getFullPath')->willReturn($themePath);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php
index 19b450e2d4235..887f3f1f63a9f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php
@@ -53,6 +53,10 @@ public function testEvaluate()
         $this->assertSame($expected, $actual);
     }
 
+    /**
+     * @param $input
+     * @return string
+     */
     public function help($input)
     {
         $this->assertSame('some text (evaluated)', $input);
@@ -67,11 +71,15 @@ public function help($input)
      */
     public function testEvaluateException($helperMethod, $expectedExceptionMessage)
     {
-        $this->expectException('\InvalidArgumentException', $expectedExceptionMessage);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
         $input = ['value' => 'some text', 'helper' => $helperMethod];
         $this->_model->evaluate($input);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateExceptionDataProvider()
     {
         $nonExistingHelper = __CLASS__ . '::non_existing';
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php
index 65f72ef96f850..c4fff297b4ec1 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php
@@ -62,10 +62,14 @@ public function testEvaluate()
      */
     public function testEvaluateWrongParam($input, $expectedExceptionMessage)
     {
-        $this->expectException('\InvalidArgumentException', $expectedExceptionMessage);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
         $this->_model->evaluate($input);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateWrongParamDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
index 682106e01ad4e..7cc280a930d9c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
@@ -49,7 +49,8 @@ public function testEvaluate()
      */
     public function testEvaluateWrongClass($input, $expectedException, $expectedExceptionMessage)
     {
-        $this->expectException($expectedException, $expectedExceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
         $self = $this;
         $this->_objectManager->expects($this->any())->method('create')->willReturnCallback(
             function ($className) use ($self) {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
index ffb79790d33f8..d20af502084f5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
@@ -67,10 +67,16 @@ public function testEvaluate()
      */
     public function testEvaluateWrongModel($input, $expectedException, $expectedExceptionMessage)
     {
-        $this->expectException($expectedException, $expectedExceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->_objectManager->method('get')
+            ->willReturnSelf();
         $this->_model->evaluate($input);
     }
 
+    /**
+     * @return array
+     */
     public function evaluateWrongModelDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderFactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderFactoryTest.php
index 45754d0618d05..427e15d901d6d 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderFactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/BuilderFactoryTest.php
@@ -65,6 +65,9 @@ public function testCreate($type, $arguments, $layoutBuilderClass)
         $this->buildFactory->create($type, $arguments);
     }
 
+    /**
+     * @return array
+     */
     public function createDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
index 703334f896db5..ab623e59d3712 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
@@ -49,7 +49,7 @@ protected function setUp()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $loggerExpects
      * @param string $stateMode
      * @return void
      * @dataProvider reorderChildElementLogDataProvider
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ElementTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ElementTest.php
index ab5c908cb16af..a663b65561345 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ElementTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ElementTest.php
@@ -20,6 +20,9 @@ public function testGetElementName($xml, $name)
         $this->assertEquals($name, $model->getElementName());
     }
 
+    /**
+     * @return array
+     */
     public function elementNameDataProvider()
     {
         return [
@@ -31,6 +34,9 @@ public function elementNameDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function cacheableDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
index 4db2da1c1ece9..2a53dbe352cdd 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
@@ -20,10 +20,10 @@ class BlockTest extends \PHPUnit\Framework\TestCase
      * @param array $testArgumentData
      * @param bool $testIsFlag
      * @param bool $isNeedEvaluate
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $addToParentGroupCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setTemplateCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setTtlCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setIsFlag
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $addToParentGroupCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setTemplateCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setTtlCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setIsFlag
      * @dataProvider provider
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
index e69e778c85518..ac1dd43f4dd01 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
@@ -89,11 +89,11 @@ protected function setUp()
 
     /**
      * @param string $literal
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $scheduleStructureCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $scheduleStructureCount
      * @param string $ifconfigValue
      * @param array $expectedConditions
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCondition
      * @param string $aclKey
      * @param string $aclValue
      *
@@ -238,9 +238,9 @@ public function processBlockDataProvider()
     /**
      * @param string $literal
      * @param string $remove
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setRemoveCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setRemoveCondition
      * @dataProvider processReferenceDataProvider
      */
     public function testProcessReference(
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
index e4834accbcc07..1a3b77f1e7899 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
@@ -56,9 +56,9 @@ protected function setUp()
      * @param string $containerName
      * @param array $structureElement
      * @param array $expectedData
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getStructureCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setStructureCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setRemoveCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getStructureCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setStructureCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setRemoveCondition
      *
      * @dataProvider processDataProvider
      */
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php
index 795e985512022..a8c9eeb1a54d7 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php
@@ -26,8 +26,8 @@ public function testCreateInvalidArgument()
         $factory = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
             ->getObject(\Magento\Framework\View\Layout\ReaderFactory::class, ['objectManager' => $objectManager]);
 
-        $this->expectException(
-            '\InvalidArgumentException',
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage(
             $className . ' doesn\'t implement \Magento\Framework\View\Layout\ReaderInterface'
         );
         $factory->create($className, $data);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php
index 1568c381226e2..158718587ad60 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php
@@ -158,6 +158,9 @@ public function testInterpret($element)
         $this->model->interpret($this->context, $element);
     }
 
+    /**
+     * @return array
+     */
     public function interpretDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
index 6421610c6dbcd..401492a774adc 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
@@ -144,7 +144,7 @@ public function testScheduleNonExistentElement()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $loggerExpects
      * @param string $stateMode
      * @return void
      * @dataProvider scheduleElementLogDataProvider
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
index c0300164e26fe..f8a8939bbfe36 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
@@ -273,7 +273,7 @@ public function testGenerateXml()
             ->with($this->equalTo([]))
             ->will($this->returnSelf());
         $this->assertSame($this->model, $this->model->generateXml());
-        $this->assertSame('<some_update>123</some_update>', $this->model->getNode('some_update')->asXml());
+        $this->assertSame('<some_update>123</some_update>', $this->model->getNode('some_update')->asXML());
     }
 
     public function testGetChildBlock()
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
index a22689ae7cca4..c1bdc1ea344c3 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
@@ -60,6 +60,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testProcess()
     {
         $generatorContextMock = $this->createMock(Context::class);
@@ -82,6 +85,20 @@ public function testProcess()
                 'content_type' => 'css',
                 'media' => 'all',
             ],
+            'remoteCssOrderedLast' => [
+                'src' => 'file-url-css-last',
+                'src_type' => 'url',
+                'content_type' => 'css',
+                'media' => 'all',
+                'order' => 30,
+            ],
+            'remoteCssOrderedFirst' => [
+                'src' => 'file-url-css-first',
+                'src_type' => 'url',
+                'content_type' => 'css',
+                'media' => 'all',
+                'order' => 10,
+            ],
             'remoteLink' => [
                 'src' => 'file-url-link',
                 'src_type' => 'url',
@@ -106,8 +123,14 @@ public function testProcess()
             ->with('file-url-css', 'css', ['attributes' => ['media' => 'all']]);
         $this->pageConfigMock->expects($this->at(1))
             ->method('addRemotePageAsset')
-            ->with('file-url-link', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
+            ->with('file-url-css-last', 'css', ['attributes' => ['media' => 'all' ] , 'order' => 30]);
         $this->pageConfigMock->expects($this->at(2))
+            ->method('addRemotePageAsset')
+            ->with('file-url-css-first', 'css', ['attributes' => ['media' => 'all'] , 'order' => 10]);
+        $this->pageConfigMock->expects($this->at(3))
+            ->method('addRemotePageAsset')
+            ->with('file-url-link', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
+        $this->pageConfigMock->expects($this->at(4))
             ->method('addRemotePageAsset')
             ->with('http://magento.dev/customcss/render/css', 'css', ['attributes' => ['media' => 'all']]);
         $this->pageConfigMock->expects($this->once())
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
index d1717a9f05b42..9fd174bc52d2f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
@@ -59,7 +59,7 @@ public function testInterpret()
 
         $structureMock->expects($this->at(4))
             ->method('addAssets')
-            ->with('path/file.css', ['src' => 'path/file.css', 'media' => 'all', 'content_type' => 'css'])
+            ->with('path/file-3.css', ['src' => 'path/file-3.css', 'media' => 'all', 'content_type' => 'css'])
             ->willReturnSelf();
 
         $structureMock->expects($this->at(5))
@@ -82,6 +82,22 @@ public function testInterpret()
             ->with(Config::ELEMENT_TYPE_HEAD, 'head_attribute_name', 'head_attribute_value')
             ->willReturnSelf();
 
+        $structureMock->expects($this->at(9))
+            ->method('addAssets')
+            ->with(
+                'path/file-1.css',
+                ['src' => 'path/file-1.css', 'media' => 'all', 'content_type' => 'css', 'order' => 10]
+            )
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(10))
+            ->method('addAssets')
+            ->with(
+                'path/file-2.css',
+                ['src' => 'path/file-2.css', 'media' => 'all', 'content_type' => 'css', 'order' => 30]
+            )
+            ->willReturnSelf();
+
         $this->assertEquals($this->model, $this->model->interpret($readerContextMock, $element->children()[0]));
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
index f4f378d735648..4efbef82df441 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
@@ -11,7 +11,9 @@
         <meta name="meta_name" content="meta_content"/>
         <meta property="og:video:secure_url" content="https://secure.example.com/movie.swf" />
         <meta property="og:locale:alternate" content="uk_UA" />
-        <css src="path/file.css" media="all" />
+        <css src="path/file-1.css" order="10" media="all" />
+        <css src="path/file-2.css" order="30" media="all" />
+        <css src="path/file-3.css" media="all" />
         <script src="path/file.js" defer="defer"/>
         <link src="http://url.com" src_type="url"/>
         <remove src="path/remove/file.css"/>
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
index 400e9cf3d1ed7..44e6e878a18c1 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
@@ -13,7 +13,7 @@
 use Magento\Framework\View\Page\Config;
 
 /**
- * @covers Magento\Framework\View\Page\Config
+ * @covers \Magento\Framework\View\Page\Config
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -139,6 +139,7 @@ public function testMetadata()
             'description' => null,
             'keywords' => null,
             'robots' => null,
+            'title' => null,
             'name' => 'test_value',
             'html_encoded' => '&lt;title&gt;&lt;span class=&quot;test&quot;&gt;Test&lt;/span&gt;&lt;/title&gt;',
         ];
@@ -287,6 +288,9 @@ public function testAddPageAsset($file, $properties, $name, $expectedName)
         );
     }
 
+    /**
+     * @return array
+     */
     public function pageAssetDataProvider()
     {
         return [
@@ -326,6 +330,9 @@ public function testAddRemotePageAsset($url, $contentType, $properties, $name, $
         );
     }
 
+    /**
+     * @return array
+     */
     public function remotePageAssetDataProvider()
     {
         return [
@@ -382,6 +389,9 @@ public function testElementAttribute($elementType, $attribute, $value)
         $this->assertEquals($value, $this->model->getElementAttribute($elementType, $attribute));
     }
 
+    /**
+     * @return array
+     */
     public function elementAttributeDataProvider()
     {
         return [
@@ -412,13 +422,14 @@ public function elementAttributeDataProvider()
      */
     public function testElementAttributeException($elementType, $attribute, $value)
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            $elementType . " isn't allowed"
-        );
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage($elementType . " isn't allowed");
         $this->model->setElementAttribute($elementType, $attribute, $value);
     }
 
+    /**
+     * @return array
+     */
     public function elementAttributeExceptionDataProvider()
     {
         return [
@@ -454,6 +465,9 @@ public function testElementAttributes($elementType, $attributes)
         $this->assertEquals($attributes, $this->model->getElementAttributes($elementType));
     }
 
+    /**
+     * @return array
+     */
     public function elementAttributesDataProvider()
     {
         return [
@@ -478,6 +492,9 @@ public function testPageLayout($handle)
         $this->assertEquals($handle, $this->model->getPageLayout());
     }
 
+    /**
+     * @return array
+     */
     public function pageLayoutDataProvider()
     {
         return [
@@ -538,6 +555,9 @@ public function testGetIncludes($isAvailable, $result)
         $this->assertEquals($result, $model->getIncludes());
     }
 
+    /**
+     * @return array
+     */
     public function getIncludesDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
index 8b6e8d41b5645..d40d65dd2de77 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
@@ -98,8 +98,8 @@ public function testAddUpdate()
      * @param string $headerName
      * @param string $headerValue
      * @param bool $replaceHeader
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setHttpResponseCodeCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setHeaderCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setHttpResponseCodeCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setHeaderCount
      * @dataProvider renderResultDataProvider
      */
     public function testRenderResult(
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index 53b7fe827376f..f07f7f4bdd8c1 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -156,6 +156,11 @@ public function testMinify()
         <?php echo '//some.link.com/' ?>
         <em>inline text</em>
         <a href="http://www.<?php echo 'hi' ?>"></a>
+        <?php// if (\$block->getSomeVariable() > 1):?>
+            <?php echo \$block->getChildHtml('someChildBlock'); ?>
+        <?php //else:?>
+            <?php // echo \$block->getChildHtml('anotherChildBlock'); ?>
+        <?php // endif; ?>
     </body>
 </html>
 TEXT;
@@ -179,7 +184,7 @@ public function testMinify()
                 }
             });
             //]]>
-</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a></body></html>
+</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body></html>
 TEXT;
 
         $this->appDirectoryMock->expects($this->once())
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css b/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css
index d7ce9e81258db..420083613705f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css
@@ -2,8 +2,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-body {background: url(body.gif);}
 @import url(../recursive.css);
-p {background: url(1.gif?param);}
 @import url("deep/recursive.css");
+body {background: url(body.gif);}
+p {background: url(1.gif?param);}
 h1 {background: url('../h1.gif#param');} h2 {background: url(../images/h2.gif?test);}
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index 0655bfda0bbc0..6ffcaa0676a0a 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -195,7 +195,7 @@ public function renderException(\Exception $exception, $httpCode = self::DEFAULT
      * Log information about exception to exception log.
      *
      * @param \Exception $exception
-     * @return string $reportId
+     * @return string
      */
     protected function _critical(\Exception $exception)
     {
@@ -317,7 +317,7 @@ public function apiShutdownFunction()
     protected function _saveFatalErrorReport($reportData)
     {
         $this->directoryWrite->create('report/api');
-        $reportId = abs(intval(microtime(true) * rand(100, 1000)));
+        $reportId = abs((int)(microtime(true) * random_int(100, 1000)));
         $this->directoryWrite->writeFile('report/api/' . $reportId, $this->serializer->serialize($reportData));
         return $reportId;
     }
diff --git a/lib/internal/Magento/Framework/Webapi/Request.php b/lib/internal/Magento/Framework/Webapi/Request.php
index 47ab6bc7f994e..3628bfbafb060 100644
--- a/lib/internal/Magento/Framework/Webapi/Request.php
+++ b/lib/internal/Magento/Framework/Webapi/Request.php
@@ -34,7 +34,7 @@ class Request extends HttpRequest implements RequestInterface
      * @param StringUtils $converter
      * @param AreaList $areaList
      * @param ScopeInterface $configScope
-     * @param null|string|\Zend_Uri $uri
+     * @param null|string $uri
      */
     public function __construct(
         CookieReaderInterface $cookieReader,
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
index 21741a2c16c1d..828022353e4fa 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
@@ -34,6 +34,7 @@ interface ParamOverriderInterface
      * Returns the overridden value to use.
      *
      * @return string|int|null
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getOverriddenValue();
 }
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
index 9b50b45a9215c..eb8403501279f 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Webapi\Rest\Response;
 
+use Magento\Framework\Api\AbstractExtensibleObject;
+use Magento\Framework\Api\AttributeInterface;
 use Magento\Framework\Webapi\Rest\Request as RestRequest;
 
 /**
@@ -106,9 +108,9 @@ protected function parse($filterString)
             }
             switch ($filterString[$position]) {
                 case '[':
-                    array_push($parent, $currentElement);
+                    $parent[] = $currentElement;
                     // push current field in stack and initialize current
-                    array_push($stack, $current);
+                    $stack[] = $current;
                     $current = [];
                     break;
 
@@ -178,10 +180,47 @@ protected function recursiveArrayIntersectKey(array $array1, array $array2)
         //If the field in array2 (filter) is not present in array1 (response) it will be removed after intersect
         $arrayIntersect = array_intersect_key($array1, $array2);
         foreach ($arrayIntersect as $key => &$value) {
+            if ($key == AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY
+                && is_array($array2[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])
+            ) {
+                $value = $this->filterCustomAttributes(
+                    $value,
+                    $array2[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]
+                );
+                continue;
+            }
             if (is_array($value) && is_array($array2[$key])) {
                 $value = $this->applyFilter($value, $array2[$key]);
             }
         }
         return $arrayIntersect;
     }
+
+    /**
+     * Filter for custom attributes.
+     *
+     * @param array $item
+     * @param array $filter
+     * @return array
+     */
+    private function filterCustomAttributes(array $item, array $filter) : array
+    {
+        $fieldResult = [];
+        foreach ($item as $key => $field) {
+            $filterKeys = array_keys($filter);
+            if (in_array($field[AttributeInterface::ATTRIBUTE_CODE], $filterKeys)) {
+                $fieldResult[$key][AttributeInterface::ATTRIBUTE_CODE] = $field[AttributeInterface::ATTRIBUTE_CODE];
+                $fieldResult[$key][AttributeInterface::VALUE] = $field[AttributeInterface::VALUE];
+            } else {
+                if (isset($filter[AttributeInterface::ATTRIBUTE_CODE])) {
+                    $fieldResult[$key][AttributeInterface::ATTRIBUTE_CODE] = $field[AttributeInterface::ATTRIBUTE_CODE];
+                }
+                if (isset($filter[AttributeInterface::VALUE])) {
+                    $fieldResult[$key][AttributeInterface::VALUE] = $field[AttributeInterface::VALUE];
+                }
+            }
+        }
+
+        return $fieldResult;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
index b4cfc61611a93..f25cd219e3eae 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\Webapi\Rest\Response\Renderer;
 
+/**
+ * Renders response data in Xml format.
+ */
 class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
 {
     /**
@@ -111,8 +114,7 @@ protected function _formatValue($value)
             /** Without the following transformation boolean values are rendered incorrectly */
             $value = $value ? 'true' : 'false';
         }
-        $replacementMap = ['&' => '&amp;'];
-        return str_replace(array_keys($replacementMap), array_values($replacementMap), $value);
+        return (string) $value;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index f1df2b0ee53f0..26102f008c7c3 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -5,14 +5,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Webapi;
 
-use Magento\Framework\Webapi\ServiceTypeToEntityTypeMap;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\SerializationException;
+use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 use Magento\Framework\Reflection\MethodsMap;
@@ -65,6 +67,11 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
      */
     private $serviceTypeToEntityTypeMap;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
     /**
      * Initialize dependencies.
      *
@@ -74,6 +81,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
      * @param CustomAttributeTypeLocatorInterface $customAttributeTypeLocator
      * @param MethodsMap $methodsMap
      * @param ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap
+     * @param ConfigInterface $config
      */
     public function __construct(
         TypeProcessor $typeProcessor,
@@ -81,7 +89,8 @@ public function __construct(
         AttributeValueFactory $attributeValueFactory,
         CustomAttributeTypeLocatorInterface $customAttributeTypeLocator,
         MethodsMap $methodsMap,
-        ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap = null
+        ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap = null,
+        ConfigInterface $config = null
     ) {
         $this->typeProcessor = $typeProcessor;
         $this->objectManager = $objectManager;
@@ -90,6 +99,8 @@ public function __construct(
         $this->methodsMap = $methodsMap;
         $this->serviceTypeToEntityTypeMap = $serviceTypeToEntityTypeMap
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ServiceTypeToEntityTypeMap::class);
+        $this->config = $config
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
@@ -153,6 +164,33 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
         return $inputData;
     }
 
+    /**
+     * @param string $className
+     * @param array $data
+     * @return array
+     * @throws \ReflectionException
+     */
+    private function getConstructorData(string $className, array $data): array
+    {
+        $preferenceClass = $this->config->getPreference($className);
+        $class = new ClassReflection($preferenceClass ?: $className);
+
+        $constructor = $class->getConstructor();
+        if ($constructor === null) {
+            return [];
+        }
+
+        $res = [];
+        $parameters = $constructor->getParameters();
+        foreach ($parameters as $parameter) {
+            if (isset($data[$parameter->getName()])) {
+                $res[$parameter->getName()] = $data[$parameter->getName()];
+            }
+        }
+
+        return $res;
+    }
+
     /**
      * Creates a new instance of the given class and populates it with the array of data. The data can
      * be in different forms depending on the adapter being used, REST vs. SOAP. For REST, the data is
@@ -162,6 +200,7 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
      * @param array $data
      * @return object the newly created and populated object
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _createFromArray($className, $data)
     {
@@ -173,9 +212,17 @@ protected function _createFromArray($className, $data)
         if (is_subclass_of($className, self::EXTENSION_ATTRIBUTES_TYPE)) {
             $className = substr($className, 0, -strlen('Interface'));
         }
-        $object = $this->objectManager->create($className);
 
+        // Primary method: assign to constructor parameters
+        $constructorArgs = $this->getConstructorData($className, $data);
+        $object = $this->objectManager->create($className, $constructorArgs);
+
+        // Secondary method: fallback to setter methods
         foreach ($data as $propertyName => $value) {
+            if (isset($constructorArgs[$propertyName])) {
+                continue;
+            }
+
             // Converts snake_case to uppercase CamelCase to help form getter/setter method names
             // This use case is for REST only. SOAP request data is already camel cased
             $camelCaseProperty = SimpleDataObjectConverter::snakeCaseToUpperCamelCase($propertyName);
@@ -289,12 +336,21 @@ private function processCustomAttribute($customAttribute)
         }
 
         if (!$customAttributeCode && !isset($customAttribute[AttributeValue::VALUE])) {
-            throw new SerializationException(new Phrase('There is an empty custom attribute specified.'));
+            throw new SerializationException(
+                new Phrase('An empty custom attribute is specified. Enter the attribute and try again.')
+            );
         } elseif (!$customAttributeCode) {
-            throw new SerializationException(new Phrase('A custom attribute is specified without an attribute code.'));
+            throw new SerializationException(
+                new Phrase(
+                    'A custom attribute is specified with a missing attribute code. Verify the code and try again.'
+                )
+            );
         } elseif (!array_key_exists(AttributeValue::VALUE, $customAttribute)) {
             throw new SerializationException(
-                new Phrase('Value is not set for attribute code "' . $customAttributeCode . '"')
+                new Phrase(
+                    'The "' . $customAttributeCode .
+                    '" attribute code doesn\'t have a value set. Enter the value and try again.'
+                )
             );
         }
 
@@ -396,7 +452,9 @@ protected function processInputError($inputError)
         if (!empty($inputError)) {
             $exception = new InputException();
             foreach ($inputError as $errorParamField) {
-                $exception->addError(new Phrase('%fieldName is a required field.', ['fieldName' => $errorParamField]));
+                $exception->addError(
+                    new Phrase('"%fieldName" is required. Enter and try again.', ['fieldName' => $errorParamField])
+                );
             }
             if ($exception->wasErrorAdded()) {
                 throw $exception;
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
index d8e1a3de3670a..cdb6ed799aade 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Reflection\MethodsMap;
-use Magento\Framework\Webapi\ServicePayloadConverterInterface;
 
 /**
  * Data object converter
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php
index d30df5d76b75b..1fc6e92f87aa8 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/RequestTest.php
@@ -38,6 +38,9 @@ public function testGetRequestedServicesSuccess($requestParamServices, $expected
         $this->assertEquals($expectedResult, $this->request->getRequestedServices());
     }
 
+    /**
+     * @return array
+     */
     public function providerTestGetRequestedServicesSuccess()
     {
         $testModuleA = 'testModule1AllSoapAndRestV1';
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
index 341c82debead6..dd1ef5cfc53de 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
@@ -53,7 +53,8 @@ protected function tearDown()
 
     public function testDeserializerInvalidArgumentException()
     {
-        $this->expectException('InvalidArgumentException', '"boolean" data type is invalid. String is expected.');
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('"boolean" data type is invalid. String is expected.');
         $this->_jsonDeserializer->deserialize(false);
     }
 
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php
index 2c754f23b0b5c..4b9c90de7355e 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php
@@ -42,7 +42,8 @@ protected function tearDown()
 
     public function testDeserializeInvalidArgumentException()
     {
-        $this->expectException('InvalidArgumentException', '"boolean" data type is invalid. String is expected.');
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('"boolean" data type is invalid. String is expected.');
         $this->_xmlDeserializer->deserialize(false);
     }
 
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php
index 74d87095823f7..0c58e2c251ccd 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php
@@ -11,7 +11,8 @@ class DeserializerFactoryTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetLogicExceptionEmptyRequestAdapter()
     {
-        $this->expectException('LogicException', 'Request deserializer adapter is not set.');
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Request deserializer adapter is not set.');
         $interpreterFactory = new \Magento\Framework\Webapi\Rest\Request\DeserializerFactory(
             $this->createMock(\Magento\Framework\ObjectManagerInterface::class),
             []
@@ -39,10 +40,8 @@ public function testGet()
     public function testGetMagentoWebapiException()
     {
         $expectedMetadata = ['text_xml' => ['type' => 'text/xml', 'model' => 'Xml']];
-        $this->expectException(
-            \Magento\Framework\Webapi\Exception::class,
-            'Server cannot understand Content-Type HTTP header media type text_xml'
-        );
+        $this->expectException(\Magento\Framework\Webapi\Exception::class);
+        $this->expectExceptionMessage('Server cannot understand Content-Type HTTP header media type text_xml');
         $interpreterFactory = new \Magento\Framework\Webapi\Rest\Request\DeserializerFactory(
             $this->createMock(\Magento\Framework\ObjectManagerInterface::class),
             $expectedMetadata
@@ -57,8 +56,8 @@ public function testGetLogicExceptionInvalidRequestDeserializer()
             \Magento\Framework\Webapi\Response\Rest\Renderer\Json::class
         )->disableOriginalConstructor()->getMock();
 
-        $this->expectException(
-            'LogicException',
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage(
             'The deserializer must implement "Magento\Framework\Webapi\Rest\Request\DeserializerInterface".'
         );
         $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
index 396fbcdb1978b..71fb41491cc74 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
@@ -76,6 +76,11 @@ public function providerXmlRender()
                 '<?xml version="1.0"?><response><item_7key>value</item_7key></response>',
                 'Invalid XML render with numeric symbol in data index.'
             ],
+            [
+                ['key' => 'test & foo'],
+                '<?xml version="1.0"?><response><key>test &amp; foo</key></response>',
+                'Invalid XML render with ampersand symbol in data index.'
+            ],
             [
                 ['.key' => 'value'],
                 '<?xml version="1.0"?><response><item_key>value</item_key></response>',
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
index ba460c5a5f6e6..e17dcae74c91d 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
@@ -108,8 +108,8 @@ public function testGetWithWrongRendererClass()
             $this->returnValue(new \Magento\Framework\DataObject())
         );
 
-        $this->expectException(
-            'LogicException',
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage(
             'The renderer must implement "Magento\Framework\Webapi\Rest\Response\RendererInterface".'
         );
         $this->_factory->get();
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/SimpleConstructor.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/SimpleConstructor.php
new file mode 100644
index 0000000000000..f875861e42b02
--- /dev/null
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/SimpleConstructor.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor;
+
+class SimpleConstructor
+{
+    /**
+     * @var int
+     */
+    private $entityId;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @param int $entityId
+     * @param string $name
+     */
+    public function __construct(
+        int $entityId,
+        string $name
+    ) {
+        $this->entityId = $entityId;
+        $this->name = $name;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getEntityId()
+    {
+        return $this->entityId;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php
index a5f91c101aa56..34515e8460b57 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php
@@ -5,11 +5,6 @@
  */
 namespace Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor;
 
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\AssociativeArray;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\DataArray;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\Nested;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\SimpleArray;
-
 class TestService
 {
     const DEFAULT_VALUE = 42;
@@ -25,6 +20,15 @@ public function simple($entityId, $name)
         return [$entityId, $name];
     }
 
+    /**
+     * @param \Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\SimpleConstructor $simpleConstructor
+     * @return \Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\SimpleConstructor
+     */
+    public function simpleConstructor(SimpleConstructor $simpleConstructor)
+    {
+        return $simpleConstructor;
+    }
+
     /**
      * @param int $entityId
      * @return string[]
@@ -34,6 +38,15 @@ public function simpleDefaultValue($entityId = self::DEFAULT_VALUE)
         return [$entityId];
     }
 
+    /**
+     * @param int $entityId
+     * @return string[]
+     */
+    public function constructorArguments($entityId = self::DEFAULT_VALUE)
+    {
+        return [$entityId];
+    }
+
     /**
      * @param \Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\Nested $nested
      * @return \Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\Nested
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
index a4c3f00e374a8..1297ffca19eaf 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\ServiceInputProcessor;
 use Magento\Framework\Webapi\ServiceTypeToEntityTypeMap;
+use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\SimpleConstructor;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\WebapiBuilderFactory;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\AssociativeArray;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\DataArray;
@@ -59,8 +60,8 @@ protected function setUp()
         $this->objectManagerMock->expects($this->any())
             ->method('create')
             ->willReturnCallback(
-                function ($className) use ($objectManager) {
-                    return $objectManager->getObject($className);
+                function ($className, $arguments = []) use ($objectManager) {
+                    return $objectManager->getObject($className, $arguments);
                 }
             );
 
@@ -202,6 +203,22 @@ public function testNestedDataProperties()
         $this->assertEquals('Test', $details->getName());
     }
 
+    public function testSimpleConstructorProperties()
+    {
+        $data = ['simpleConstructor' => ['entityId' => 15, 'name' => 'Test']];
+        $result = $this->serviceInputProcessor->process(
+            \Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\TestService::class,
+            'simpleConstructor',
+            $data
+        );
+        $this->assertNotNull($result);
+        $arg = $result[0];
+
+        $this->assertTrue($arg instanceof SimpleConstructor);
+        $this->assertEquals(15, $arg->getEntityId());
+        $this->assertEquals('Test', $arg->getName());
+    }
+
     public function testSimpleArrayProperties()
     {
         $data = ['ids' => [1, 2, 3, 4]];
@@ -544,6 +561,9 @@ public function testCustomAttributesExceptions($inputData)
         );
     }
 
+    /**
+     * @return array
+     */
     public function invalidCustomAttributesDataProvider()
     {
         return [
diff --git a/lib/internal/Magento/Framework/Xml/Generator.php b/lib/internal/Magento/Framework/Xml/Generator.php
index 975073e443d0e..f165793c2e2a4 100644
--- a/lib/internal/Magento/Framework/Xml/Generator.php
+++ b/lib/internal/Magento/Framework/Xml/Generator.php
@@ -146,8 +146,6 @@ public function setIndexedArrayItemName($name)
      */
     protected function _getIndexedArrayItemName()
     {
-        return isset($this->_defaultIndexedArrayItemName)
-            ? $this->_defaultIndexedArrayItemName
-            : self::DEFAULT_ENTITY_ITEM_NAME;
+        return $this->_defaultIndexedArrayItemName ?? self::DEFAULT_ENTITY_ITEM_NAME;
     }
 }
diff --git a/lib/internal/Magento/Framework/Xml/Security.php b/lib/internal/Magento/Framework/Xml/Security.php
index 72af506a3294e..ec901a63ea862 100644
--- a/lib/internal/Magento/Framework/Xml/Security.php
+++ b/lib/internal/Magento/Framework/Xml/Security.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Xml;
 
 use DOMDocument;
-use Magento\Framework\Phrase;
 
 /**
  * Class Security
@@ -72,7 +71,7 @@ function ($errno, $errstr) {
             E_WARNING
         );
 
-        $result = (bool)$document->loadXml($xmlContent, LIBXML_NONET);
+        $result = (bool)$document->loadXML($xmlContent, LIBXML_NONET);
         restore_error_handler();
         // Entity load to previous setting
         libxml_disable_entity_loader($loadEntities);
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 02cffe152bb34..c360d57be107f 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -2,7 +2,6 @@
     "name": "magento/framework",
     "description": "N/A",
     "type": "magento2-library",
-    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -11,33 +10,41 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-gd": "*",
         "ext-hash": "*",
         "ext-iconv": "*",
-        "ext-mcrypt": "*",
         "ext-openssl": "*",
         "ext-simplexml": "*",
         "ext-spl": "*",
         "ext-xsl": "*",
+        "ext-bcmath": "*",
         "lib-libxml": "*",
-        "colinmollenhour/php-redis-session-abstract": "~1.2.2",
-        "composer/composer": "1.4.1",
+        "colinmollenhour/php-redis-session-abstract": "~1.4.0",
+        "composer/composer": "^1.6",
+        "magento/zendframework1": "~1.14.0",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
-        "symfony/console": "~2.3, !=2.7.0",
-        "symfony/process": "~2.1",
-        "tedivm/jshrink": "~1.1.0",
-        "zendframework/zend-code": "^3.1.0",
+        "symfony/console": "~4.1.0",
+        "symfony/process": "~4.1.0",
+        "tedivm/jshrink": "~1.3.0",
+        "zendframework/zend-code": "~3.3.0",
         "zendframework/zend-crypt": "^2.6.0",
         "zendframework/zend-http": "^2.6.0",
-        "zendframework/zend-mvc": "~2.6.3",
+        "zendframework/zend-mvc": "~2.7.0",
         "zendframework/zend-stdlib": "^2.7.7",
         "zendframework/zend-uri": "^2.5.1",
         "zendframework/zend-validator": "^2.6.0"
     },
+    "archive": {
+        "exclude": [
+            "Amqp",
+            "Bulk",
+            "MessageQueue"
+        ]
+    },
     "suggest": {
         "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
     },
diff --git a/lib/internal/Magento/Framework/registration.php b/lib/internal/Magento/Framework/registration.php
index dfe63ccde35d6..19012a264346c 100644
--- a/lib/internal/Magento/Framework/registration.php
+++ b/lib/internal/Magento/Framework/registration.php
@@ -7,3 +7,7 @@
 use \Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework', __DIR__);
+
+if (!function_exists('__')) {
+    require 'Phrase/__.php';
+}
diff --git a/lib/web/MutationObserver.js b/lib/web/MutationObserver.js
index 53424fbfa8d0c..4044aa465e745 100644
--- a/lib/web/MutationObserver.js
+++ b/lib/web/MutationObserver.js
@@ -324,7 +324,7 @@
     if (lastRecord === newRecord)
       return lastRecord;
 
-    // Check if the the record we are adding represents the same record. If
+    // Check if the record we are adding represents the same record. If
     // so, we keep the one with the oldValue in it.
     if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord))
       return recordWithOldValue;
diff --git a/lib/web/css/docs/actions-toolbar.html b/lib/web/css/docs/actions-toolbar.html
index 4a3fbe515ca95..0c2186bf0458c 100644
--- a/lib/web/css/docs/actions-toolbar.html
+++ b/lib/web/css/docs/actions-toolbar.html
@@ -301,4 +301,4 @@
     .example-actions-toolbar-12 {
        .lib-actions-toolbar-clear-floats();
     }
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/breadcrumbs.html b/lib/web/css/docs/breadcrumbs.html
index 9ada940b4c0de..e4bfc3a973aa1 100644
--- a/lib/web/css/docs/breadcrumbs.html
+++ b/lib/web/css/docs/breadcrumbs.html
@@ -502,4 +502,4 @@
             border-color: transparent transparent transparent #ccc;
         }
     }
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/buttons.html b/lib/web/css/docs/buttons.html
index 0890701226d3c..502d35da59a99 100644
--- a/lib/web/css/docs/buttons.html
+++ b/lib/web/css/docs/buttons.html
@@ -875,4 +875,4 @@ <h2 id="primary-button-big">Primary button big</h2>
       </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/components.html b/lib/web/css/docs/components.html
index 609bd4d3ffa00..9e0b149c989a9 100644
--- a/lib/web/css/docs/components.html
+++ b/lib/web/css/docs/components.html
@@ -147,4 +147,4 @@ <h1 class="modal-title" data-role="title">Modal Slide</h1>
       </tr>
     </table>
  </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/docs.css b/lib/web/css/docs/docs.css
index beb18b8b2194a..a3a372ad4eeb9 100644
--- a/lib/web/css/docs/docs.css
+++ b/lib/web/css/docs/docs.css
@@ -4187,7 +4187,7 @@ select {
   color: #000066;
 }
 .example-message-4:before {
-  background: #green;
+  background: green;
   width: 30px;
   content: '';
   display: block;
@@ -4230,7 +4230,7 @@ select {
   border: 5px solid transparent;
   height: 0;
   width: 0;
-  border-left-color: #green;
+  border-left-color: green;
   left: 30px;
 }
 .example-message-4 > *:first-child:after {
diff --git a/lib/web/css/docs/docs.html b/lib/web/css/docs/docs.html
index 164e5a1dfdc21..68e9d98eb2def 100644
--- a/lib/web/css/docs/docs.html
+++ b/lib/web/css/docs/docs.html
@@ -40,4 +40,4 @@
 body {
     padding: 15px;
     background-image: none;
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/dropdowns.html b/lib/web/css/docs/dropdowns.html
index 6f0c95a723beb..eb9efc9a65078 100644
--- a/lib/web/css/docs/dropdowns.html
+++ b/lib/web/css/docs/dropdowns.html
@@ -876,4 +876,4 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
         @_dropdown-split-list-shadow: none,
         @_dropdown-split-button-border-radius-fix: true
     );
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/forms.html b/lib/web/css/docs/forms.html
index ca3e2e6184677..dc08ddffd2066 100644
--- a/lib/web/css/docs/forms.html
+++ b/lib/web/css/docs/forms.html
@@ -713,7 +713,7 @@ <h2 id="simple-form-with-required-fields-message">Simple form with &quot;require
             <th>@_type</th>
             <td class="vars_value">@form-element-input-type</td>
             <td class="vars_value">'' [input-text | select | textarea | input-radio | input-checkbox]</td>
-            <td>Form control type.<br/><b>@form-element-input__[]</b> global variables are used to set up all form elements style. Control-specific global variables use these <b>@form-element-input__[]</b> variables by default. Control-specific global variables can be set up separately.<br/><b>@input-text__[]</b> is used to set up input-text controls style<br/><b>@select__[]</b> is used to set up selects style<br/><b>@textarea__[]</b> is used to set up textarea style</td>
+            <td>Form control type.<br/><strong>@form-element-input__[]</strong> global variables are used to set up all form elements style. Control-specific global variables use these <strong>@form-element-input__[]</strong> variables by default. Control-specific global variables can be set up separately.<br/><strong>@input-text__[]</strong> is used to set up input-text controls style<br/><strong>@select__[]</strong> is used to set up selects style<br/><strong>@textarea__[]</strong> is used to set up textarea style</td>
         </tr>
         <tr>
             <th>@_background</th>
@@ -1133,4 +1133,4 @@ <h2 id="simple-form-with-required-fields-message">Simple form with &quot;require
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/icons.html b/lib/web/css/docs/icons.html
index 1dca9797fc560..d7eeff7f802ca 100644
--- a/lib/web/css/docs/icons.html
+++ b/lib/web/css/docs/icons.html
@@ -847,4 +847,4 @@ <h2 id="icons-using-sprite">Icons using sprite</h2>
             }
         }
     }
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/index.html b/lib/web/css/docs/index.html
index cbf3de48cdfc7..07cd72e6f823f 100644
--- a/lib/web/css/docs/index.html
+++ b/lib/web/css/docs/index.html
@@ -608,4 +608,4 @@ <h3 id="location">Location</h3>
 Extends that used in more than one theme should be saved in lib <strong>lib/source/_abstract.less</strong> (will be renamed to _extend.less)</p>
 <h3 id="naming">Naming</h3>
 <p>Extend class names should have prefix <strong>.abs-</strong> (from abstract)</p>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/layout.html b/lib/web/css/docs/layout.html
index a75e366f621ad..77ed0597f0748 100644
--- a/lib/web/css/docs/layout.html
+++ b/lib/web/css/docs/layout.html
@@ -340,4 +340,4 @@ <h2 id="three-columns-page-layout">Three columns page layout</h2>
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/lib.html b/lib/web/css/docs/lib.html
index ccd5873e94303..001e8aeecd308 100644
--- a/lib/web/css/docs/lib.html
+++ b/lib/web/css/docs/lib.html
@@ -10,4 +10,4 @@
 <p>  The _lib.less file contains the includes of all Magento UI library files. To use Magento UI library in your theme add the following directive to the theme’s styles.less:</p>
 <pre><code class="lang-css">  @import &#39;source/lib/_lib&#39;;</code></pre>
 <p>  The lib.less file is designed to avoid manual adding of each Magento UI library file import instruction to your theme.</p>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/loaders.html b/lib/web/css/docs/loaders.html
index 6d63110cfafea..884b71c782905 100644
--- a/lib/web/css/docs/loaders.html
+++ b/lib/web/css/docs/loaders.html
@@ -182,4 +182,4 @@
       </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/messages.html b/lib/web/css/docs/messages.html
index 305266906e3d0..287bf1b0d3aa4 100644
--- a/lib/web/css/docs/messages.html
+++ b/lib/web/css/docs/messages.html
@@ -711,4 +711,4 @@
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/pages.html b/lib/web/css/docs/pages.html
index 8b7335d86b8da..1bbcac94c56f8 100644
--- a/lib/web/css/docs/pages.html
+++ b/lib/web/css/docs/pages.html
@@ -826,4 +826,4 @@
         @_pager-action-color-hover: #fff,
         @_pager-action-color-active: #fff
     );
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/popups.html b/lib/web/css/docs/popups.html
index d31d50f6ed7c6..9f7aff4c6569b 100644
--- a/lib/web/css/docs/popups.html
+++ b/lib/web/css/docs/popups.html
@@ -750,4 +750,4 @@ <h2 id="simple-popup">Simple popup</h2>
         @_overlay-opacity: .8,
         @_overlay-opacity-old: 80
     );
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/rating.html b/lib/web/css/docs/rating.html
index bf74c47c22f11..3cfe1a864dd98 100644
--- a/lib/web/css/docs/rating.html
+++ b/lib/web/css/docs/rating.html
@@ -343,4 +343,4 @@
 </div><div class="code"><pre><code>.example-rating-summary-7 {
     .lib-rating-summary();
     .lib-rating-summary-label-hide();
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/resets.html b/lib/web/css/docs/resets.html
index f2eb5ee9b48db..fc1cb092422c0 100644
--- a/lib/web/css/docs/resets.html
+++ b/lib/web/css/docs/resets.html
@@ -34,4 +34,4 @@ <h2 id="global-borderbox">Global border-box</h2>
 <p>  To set <code>box-sizing: border-box</code> globally, use mixin:</p>
 <pre><code class="lang-CSS">  .lib-set-default-border-box();</code></pre>
 <p>  &nbsp;</p>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/responsive.html b/lib/web/css/docs/responsive.html
index 5e9d3b38eddd0..48d0bd551bd92 100644
--- a/lib/web/css/docs/responsive.html
+++ b/lib/web/css/docs/responsive.html
@@ -80,4 +80,4 @@ <h2 id="gathering">Gathering</h2>
   @screen__l: 1024px;
   @screen__xl: 1440px;</code></pre>
 <p>  &nbsp;</p>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/sections.html b/lib/web/css/docs/sections.html
index c433216775ef4..8ed121578757a 100644
--- a/lib/web/css/docs/sections.html
+++ b/lib/web/css/docs/sections.html
@@ -643,4 +643,4 @@
   &lt;/dl&gt;</textarea>
 </div><div class="code"><pre><code>.example-sections-6 {
     .lib-data-accordion__base();
-}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+}</code></pre></div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/source/_buttons.less b/lib/web/css/docs/source/_buttons.less
index a81599c517ff8..b4b41905b961a 100644
--- a/lib/web/css/docs/source/_buttons.less
+++ b/lib/web/css/docs/source/_buttons.less
@@ -48,10 +48,10 @@ button {
     &.example-button-3 {
         .lib-button-s();
         border-radius: 0;
-        color: #000;
+        color: @color-black;
         &:hover,
         &.active {
-            color: #000;
+            color: @color-black;
         }
     }
 }
@@ -397,7 +397,7 @@ button {
 
 //  # Button with an icon on the left or right side of the text
 //
-//  <code>@_button-icon-font-position</code> variable is used to set up the icon postiton
+//  <code>@_button-icon-font-position</code> variable is used to set up the icon position
 //
 //  Use <code>before</code> to set up button icon position on the left:
 //  ```css
@@ -524,10 +524,10 @@ button {
     }
     &.example-button-6 {
         .lib-button-s();
-        color: #fff;
+        color: @color-white;
         &:hover,
         &.active {
-            color: #fff;
+            color: @color-white;
         }
     }
 }
@@ -721,13 +721,13 @@ button {
         @_button-padding: @button__padding,
         @_button-gradient-color-start: #1979c3,
         @_button-gradient-color-end: #006bb4,
-        @_button-color: #fff,
+        @_button-color: @color-white,
         @_button-gradient-color-start-hover: #006bb4,
         @_button-gradient-color-end-hover: #1979c3,
-        @_button-color-hover: #fff,
+        @_button-color-hover: @color-white,
         @_button-gradient-color-start-active: #006bb4,
         @_button-gradient-color-end-active: #006bb4,
-        @_button-color-active: #fff,
+        @_button-color-active: @color-white,
         @_button-gradient: true,
         @_button-gradient-direction: vertical,
         @_button-border: @button-primary__border,
@@ -818,7 +818,7 @@ button {
 
 //  # Link as a button
 //
-//  The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate paremeters.
+//  The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate parameters.
 //
 //  ```html
 //  <a href="#" class="example-button-9"><span>Button</span></a>
diff --git a/lib/web/css/docs/source/_layout.less b/lib/web/css/docs/source/_layout.less
index 37598197142f6..799f940b44c02 100644
--- a/lib/web/css/docs/source/_layout.less
+++ b/lib/web/css/docs/source/_layout.less
@@ -91,7 +91,7 @@ footer.footer {
 //            <th>@gutter-width</th>
 //            <td class="vars_value">0</td>
 //            <td class="vars_value">'' | false | value</td>
-//            <td>Distanse between columns</td>
+//            <td>Distance between columns</td>
 //        </tr>
 //        <tr>
 //            <th colspan="4" class="vars_section">Variables for layout columns</th>
@@ -361,7 +361,7 @@ footer.footer {
 
 //  # Layout width
 //
-//  The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applyed to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
+//  The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applied to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
 
 //  # Layout width variables
 //
diff --git a/lib/web/css/docs/source/_messages.less b/lib/web/css/docs/source/_messages.less
index 45d4538d14aff..91b3f280880ca 100644
--- a/lib/web/css/docs/source/_messages.less
+++ b/lib/web/css/docs/source/_messages.less
@@ -176,7 +176,7 @@
 //  ```
 //
 
-@message-custom__color: #000;
+@message-custom__color: @color-black;
 @message-custom__background: #fc0;
 @message-custom__border-color: orange;
 
@@ -185,7 +185,7 @@
 @message-custom-link__color-active: darken(@message-custom-link__color, 30%);
 
 @message-custom-icon: @icon-settings;
-@message-custom-icon__color-lateral: #000;
+@message-custom-icon__color-lateral: @color-black;
 @message-custom-icon__background: #green;
 @message-custom-icon__top: 15px;
 @message-custom-icon__right: false;
diff --git a/lib/web/css/docs/source/_pages.less b/lib/web/css/docs/source/_pages.less
index 0b94f84e54f47..6b01fa7549e92 100644
--- a/lib/web/css/docs/source/_pages.less
+++ b/lib/web/css/docs/source/_pages.less
@@ -852,22 +852,22 @@
 .example-pages-3 {
     .lib-pager(
         @_pager-label-display: none,
-        @_pager-color: #fff,
+        @_pager-color: @color-white,
         @_pager-background: @link__color,
-        @_pager-color-visited: #fff,
+        @_pager-color-visited: @color-white,
         @_pager-background-visited: @link__visited__color,
-        @_pager-color-hover: #fff,
+        @_pager-color-hover: @color-white,
         @_pager-background-hover: @link__hover__color,
-        @_pager-color-active: #fff,
+        @_pager-color-active: @color-white,
         @_pager-background-active: @link__active__color,
-        @_pager-current-color: #fff,
+        @_pager-current-color: @color-white,
         @_pager-current-background: @link__visited__color,
         @_pager-action-background: @link__color,
         @_pager-action-background-visited: @link__visited__color,
         @_pager-action-background-hover: @link__hover__color,
         @_pager-action-background-active: @link__active__color,
-        @_pager-action-color: #fff,
-        @_pager-action-color-hover: #fff,
-        @_pager-action-color-active: #fff
+        @_pager-action-color: @color-white,
+        @_pager-action-color-hover: @color-white,
+        @_pager-action-color-active: @color-white
     );
 }
diff --git a/lib/web/css/docs/source/_tables.less b/lib/web/css/docs/source/_tables.less
index 9d0df2350cee9..8feec72f33699 100644
--- a/lib/web/css/docs/source/_tables.less
+++ b/lib/web/css/docs/source/_tables.less
@@ -677,7 +677,7 @@
 .example-table-5 {
     .lib-table();
     .lib-table-background-color(
-        @_table-background-color: #fff,
+        @_table-background-color: @color-white,
         @_table-head-background-color: #ccf,
         @_table-foot-background-color: #cff,
         @_table-td-background-color: #fcc,
@@ -1253,7 +1253,7 @@
     .lib-table();
     .lib-table-striped(
         @_stripped-background-color: #ffc,
-        @_stripped-color: #000,
+        @_stripped-color: @color-black,
         @_stripped-direction: horizontal,
         @_stripped-highlight: even
     );
diff --git a/lib/web/css/docs/source/_typography.less b/lib/web/css/docs/source/_typography.less
index 294f6446fdf13..f6a355917ba8e 100644
--- a/lib/web/css/docs/source/_typography.less
+++ b/lib/web/css/docs/source/_typography.less
@@ -3,7 +3,7 @@
 //  * See COPYING.txt for license details.
 //  */
 
-//  # Typogrphy
+//  # Typography
 //
 //  Magento UI library provides mixins for typography styling. To configure typography, global variables from **_variables.less** file are used.
 //
@@ -947,12 +947,8 @@
 //    ) {
 //        @font-face {
 //            font-family: @family-name;
-//            src: url('@{font-path}.eot');
-//            src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
-//            url('@{font-path}.woff2') format('woff2'),
-//            url('@{font-path}.woff') format('woff'),
-//            url('@{font-path}.ttf') format('truetype'),
-//            url('@{font-path}.svg#@{family-name}') format('svg');
+//            src: url('@{font-path}.woff2') format('woff2'),
+//            url('@{font-path}.woff') format('woff');
 //            font-weight: @font-weight;
 //            font-style: @font-style;
 //        }
@@ -978,7 +974,7 @@
 
 //  # Text hide
 //
-//  The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applyed to.
+//  The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applied to.
 //
 //  ```html
 //  <p class="example-text-hide">
diff --git a/lib/web/css/docs/source/_utilities.less b/lib/web/css/docs/source/_utilities.less
index 312eeffe488ca..1ce15a9a50e2d 100644
--- a/lib/web/css/docs/source/_utilities.less
+++ b/lib/web/css/docs/source/_utilities.less
@@ -367,66 +367,3 @@
 //        </tr>
 //    </table>
 //  </pre>
-
-// # .lib-url-check()
-//
-//  The <code>.lib-url-check()</code> mixin wraps passed value with 'url( ... )' and returns <code>@lib-url-check-output</code> variable. Can be used with <code>.lib-css()</code> mixin.
-//
-
-.example-url-check {
-    //  Set image path variable
-    @_icon-image: '/images/test.png';
-
-    //  "Call" the mixin
-    .lib-url-check(@_icon-image);
-
-    //  Will return url('/images/test.png')
-    .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
-}
-
-//
-//  If the variable is set to <code>false</code>, the <code>.lib-url-check()</code> will return false.
-//
-//  ```
-//  <div class="example-url-check">
-//      Block with background.
-//  </div>
-//  ```
-//
-
-.example-url-check-false {
-    //  Set usage image path to false
-    @_icon-image: false;
-
-    //  "Call" the mixin
-    .lib-url-check(@_icon-image);
-
-    //  Will return 'false' and outputs nothing
-    .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
-}
-
-//  ```
-//  <div class="example-url-check-false">
-//      Block with no background.
-//  </div>
-//  ```
-//
-
-//  # .lib-url-check() variables
-//
-//  <pre>
-//    <table>
-//        <tr>
-//            <th class="vars_head">Mixin variable</th>
-//            <th class="vars_head">Allowed values</th>
-//            <th class="vars_head">Output variable</th>
-//            <th class="vars_head">Comment</th>
-//        </tr>
-//        <tr>
-//            <th>@_path</th>
-//            <td class="vars_value">'' | false | value</td>
-//            <td class="vars_value">@lib-url-check-output</td>
-//            <td>Passed url to wrap in 'url( ... )'. If the 'false' value passed mixin will return 'false'</td>
-//        </tr>
-//    </table>
-//  </pre>
diff --git a/lib/web/css/docs/source/_variables.less b/lib/web/css/docs/source/_variables.less
index 326580ead813f..e1845786067c8 100644
--- a/lib/web/css/docs/source/_variables.less
+++ b/lib/web/css/docs/source/_variables.less
@@ -7375,21 +7375,3 @@
 //        </tr>
 //    </table>
 //  </pre>
-//
-//  #### <code>.lib-url-check()</code> mixin variables
-//  <pre>
-//    <table>
-//        <tr>
-//            <th class="vars_head">Mixin variable</th>
-//            <th class="vars_head">Allowed values</th>
-//            <th class="vars_head">Output variable</th>
-//            <th class="vars_head">Comment</th>
-//        </tr>
-//        <tr>
-//            <th>@_path</th>
-//            <td class="vars_value">'' | false | value</td>
-//            <td class="vars_value">@lib-url-check-output</td>
-//            <td>Passed url to wrap in 'url( ... )'. If the 'false' value passed mixin will return 'false'</td>
-//        </tr>
-//    </table>
-//  </pre>
diff --git a/lib/web/css/docs/source/docs.less b/lib/web/css/docs/source/docs.less
index 4039d0562da53..952beb5c0f970 100644
--- a/lib/web/css/docs/source/docs.less
+++ b/lib/web/css/docs/source/docs.less
@@ -21,7 +21,6 @@
 @import '_icons.less';
 @import '_loaders.less';
 @import '_messages.less';
-//@import 'navigation.less';
 @import '_layout.less';
 @import '_pages.less';
 @import '_popups.less';
diff --git a/lib/web/css/docs/tables.html b/lib/web/css/docs/tables.html
index 5a5067ebd0e4b..280f32135de62 100644
--- a/lib/web/css/docs/tables.html
+++ b/lib/web/css/docs/tables.html
@@ -1498,4 +1498,4 @@
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/tooltips.html b/lib/web/css/docs/tooltips.html
index 20158046859f6..2b38aa0a55aef 100644
--- a/lib/web/css/docs/tooltips.html
+++ b/lib/web/css/docs/tooltips.html
@@ -186,4 +186,4 @@
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/typography.html b/lib/web/css/docs/typography.html
index 76f704c17c1bd..a933bcb46bf64 100644
--- a/lib/web/css/docs/typography.html
+++ b/lib/web/css/docs/typography.html
@@ -1686,4 +1686,4 @@
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/utilities.html b/lib/web/css/docs/utilities.html
index 29ecce2414e1e..8ab4a1136967e 100644
--- a/lib/web/css/docs/utilities.html
+++ b/lib/web/css/docs/utilities.html
@@ -261,50 +261,4 @@
         </tr>
     </table>
   </pre>
-</div></article><article id="liburlcheck" class="section"><div class="docs"><a href="#liburlcheck" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="liburlcheck">.lib-url-check()</h1>
-<p>  The <code>.lib-url-check()</code> mixin wraps passed value with &#39;url( ... )&#39; and returns <code>@lib-url-check-output</code> variable. Can be used with <code>.lib-css()</code> mixin.</p>
-<p>  If the variable is set to <code>false</code>, the <code>.lib-url-check()</code> will return false.</p>
-<textarea class="preview-code" spellcheck="false">  &lt;div class="example-url-check"&gt;
-      Block with background.
-  &lt;/div&gt;</textarea><textarea class="preview-code" spellcheck="false">  &lt;div class="example-url-check-false"&gt;
-      Block with no background.
-  &lt;/div&gt;</textarea>
-</div><div class="code"><pre><code>.example-url-check {
-    //  Set image path variable
-    @_icon-image: '/images/test.png';
-
-    //  "Call" the mixin
-    .lib-url-check(@_icon-image);
-
-    //  Will return url('/images/test.png')
-    .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
-}
-
-
-.example-url-check-false {
-    //  Set usage image path to false
-    @_icon-image: false;
-
-    //  "Call" the mixin
-    .lib-url-check(@_icon-image);
-
-    //  Will return 'false' and outputs nothing
-    .lib-css(background, #eee @lib-url-check-output no-repeat 0 0);
-}</code></pre></div></article><article id="liburlcheck-variables" class="section"><div class="docs"><a href="#liburlcheck-variables" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="liburlcheck-variables">.lib-url-check() variables</h1>
-  <pre>
-    <table>
-        <tr>
-            <th class="vars_head">Mixin variable</th>
-            <th class="vars_head">Allowed values</th>
-            <th class="vars_head">Output variable</th>
-            <th class="vars_head">Comment</th>
-        </tr>
-        <tr>
-            <th>@_path</th>
-            <td class="vars_value">'' | false | value</td>
-            <td class="vars_value">@lib-url-check-output</td>
-            <td>Passed url to wrap in 'url( ... )'. If the 'false' value passed mixin will return 'false'</td>
-        </tr>
-    </table>
-  </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/docs/variables.html b/lib/web/css/docs/variables.html
index 4423d682d0f80..ebbf2122ab209 100644
--- a/lib/web/css/docs/variables.html
+++ b/lib/web/css/docs/variables.html
@@ -3507,7 +3507,7 @@ <h4 id="the-codelibformelementinputcoed-mixin-variables">The <code>.lib-form-ele
             <th>@_type</th>
             <td class="vars_value">@form-element-input-type</td>
             <td class="vars_value">'' [input-text | select | textarea | input-radio | input-checkbox]</td>
-            <td>Form control type.<br/><b>@form-element-input__[]</b> global variables are used to set up all form elements style. Control-specific global variables use these <b>@form-element-input__[]</b> variables by default. Control-specific global variables can be set up separately.<br/><b>@input-text__[]</b> is used to set up input-text controls style<br/><b>@select__[]</b> is used to set up selects style<br/><b>@textarea__[]</b> is used to set up textarea style</td>
+            <td>Form control type.<br/><strong>@form-element-input__[]</strong> global variables are used to set up all form elements style. Control-specific global variables use these <strong>@form-element-input__[]</strong> variables by default. Control-specific global variables can be set up separately.<br/><strong>@input-text__[]</strong> is used to set up input-text controls style<br/><strong>@select__[]</strong> is used to set up selects style<br/><strong>@textarea__[]</strong> is used to set up textarea style</td>
         </tr>
         <tr>
             <th>@_background</th>
@@ -7391,4 +7391,4 @@ <h4 id="codeliburlcheckcode-mixin-variables"><code>.lib-url-check()</code> mixin
         </tr>
     </table>
   </pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:".lib-url-check()",filename:"utilities",url:"utilities.html#liburlcheck"},{title:".lib-url-check() variables",filename:"utilities",url:"utilities.html#liburlcheck-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Button as a link variables",filename:"buttons",url:"buttons.html#button-as-a-link-variables"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"components",filename:"components",url:"components.html"},{title:"Components",filename:"components",url:"components.html#components"},{title:"Components Variables",filename:"components",url:"components.html#components-variables"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables",filename:"forms",url:"forms.html#form-validation-variables"},{title:"icons",filename:"icons",url:"icons.html"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Base typography mixin variables",filename:"typography",url:"typography.html#base-typography-mixin-variables"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Headings typography mixin variables",filename:"typography",url:"typography.html#headings-typography-mixin-variables"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography lists mixin variables",filename:"typography",url:"typography.html#typography-lists-mixin-variables"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography code mixin variables",filename:"typography",url:"typography.html#typography-code-mixin-variables"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"Typography blockquote mixin variables",filename:"typography",url:"typography.html#typography-blockquote-mixin-variables"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".lib-clearfix()",filename:"utilities",url:"utilities.html#libclearfix"},{title:".lib-visibility-hidden()",filename:"utilities",url:"utilities.html#libvisibilityhidden"},{title:".lib-visually-hidden()",filename:"utilities",url:"utilities.html#libvisuallyhidden"},{title:".lib-visually-hidden-reset()",filename:"utilities",url:"utilities.html#libvisuallyhiddenreset"},{title:".lib-css()",filename:"utilities",url:"utilities.html#libcss"},{title:".lib-css() variables",filename:"utilities",url:"utilities.html#libcss-variables"},{title:".lib-rotate()",filename:"utilities",url:"utilities.html#librotate"},{title:".lib-rotate() variables",filename:"utilities",url:"utilities.html#librotate-variables"},{title:".lib-input-placeholder()",filename:"utilities",url:"utilities.html#libinputplaceholder"},{title:".lib-input-placeholder() variables",filename:"utilities",url:"utilities.html#libinputplaceholder-variables"},{title:".lib-background-gradient()",filename:"utilities",url:"utilities.html#libbackgroundgradient"},{title:".lib-background-gradient() variables",filename:"utilities",url:"utilities.html#libbackgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
index 80b1c85ceb46e..a8e8cebde3a6c 100644
--- a/lib/web/css/source/components/_modals.less
+++ b/lib/web/css/source/components/_modals.less
@@ -100,6 +100,16 @@
     left: 0;
     overflow-y: auto;
 
+    &.confirm {
+        .modal-inner-wrap {
+            .lib-css(width, @modal-popup-confirm__width);
+
+            .modal-content {
+                padding-right: 7rem;
+            }
+        }
+    }
+
     &._show {
         .modal-inner-wrap {
             -webkit-transform: translateY(0);
@@ -192,18 +202,14 @@
         &._inner-scroll {
             overflow-y: visible;
 
-            .ie11 &,
-            .ie10 &,
-            .ie9 & {
+            .ie11 & {
                 overflow-y: auto;
             }
 
             .modal-inner-wrap {
                 max-height: 90%;
 
-                .ie11 &,
-                .ie10 &,
-                .ie9 & {
+                .ie11 & {
                     max-height: none;
                 }
             }
diff --git a/lib/web/css/source/lib/_buttons.less b/lib/web/css/source/lib/_buttons.less
index 804302fcb69ac..a92093b742902 100644
--- a/lib/web/css/source/lib/_buttons.less
+++ b/lib/web/css/source/lib/_buttons.less
@@ -266,8 +266,7 @@
     &.disabled,
     &[disabled],
     fieldset[disabled] & {
-        cursor: not-allowed;
-        pointer-events: none; // Disabling of clicks
+        pointer-events: none; // Disabling of all pointer events
         .lib-css(opacity, @button__disabled__opacity);
     }
 }
@@ -277,6 +276,9 @@
 //  ---------------------------------------------
 
 .lib-button-primary(
+    @_button-font-family: @button-primary__font-family,
+    @_button-font-size: @button-primary__font-size,
+    @_button-font-weight: @button-primary__font-weight,
     @_button-line-height: @button-primary__line-height,
     @_button-width: @button-primary__width,
     @_button-margin: @button-primary__margin,
@@ -300,6 +302,9 @@
     @_button-gradient-direction: @button-primary__gradient-direction
 ) {
     .lib-button(
+        @_button-font-family: @_button-font-family,
+        @_button-font-size: @_button-font-size,
+        @_button-font-weight: @_button-font-weight,
         @_button-line-height: @_button-line-height,
         @_button-width: @_button-width,
         @_button-margin: @_button-margin,
diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less
index 800054e58c3dd..a22ec5f52db6d 100644
--- a/lib/web/css/source/lib/_forms.less
+++ b/lib/web/css/source/lib/_forms.less
@@ -288,7 +288,7 @@
         .lib-form-element-input(@_type: select);
     }
 
-    select[multiple="multiple"] {
+    select[multiple] {
         .lib-css(height, auto);
         background-image: none;
     }
@@ -300,6 +300,8 @@
 
     input[type="checkbox"] {
         .lib-form-element-choice(@_type: input-checkbox);
+        position: relative;
+        top: 2px;
     }
 
     input[type="radio"] {
@@ -465,11 +467,9 @@
     .lib-css(margin, @_margin);
     .lib-css(padding, @_padding);
     letter-spacing: -.31em;
-    //word-spacing: -.43em;
 
     > * {
         letter-spacing: normal;
-        //word-spacing: normal;
     }
 
     > .legend {
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
index 93101fd7c19b9..6232333fca33f 100644
--- a/lib/web/css/source/lib/_navigation.less
+++ b/lib/web/css/source/lib/_navigation.less
@@ -92,6 +92,9 @@
                 .lib-css(padding, @_nav-level0-item-padding);
                 .lib-css(text-transform, @_nav-level0-text-transform);
                 word-wrap: break-word;
+                &:hover {
+                    .lib-css(color, @navigation-level0-item__hover__color);
+                }
             }
 
             &.active {
@@ -139,6 +142,11 @@
         .submenu {
             > li {
                 word-wrap: break-word;
+                > a {
+                    &:hover {
+                        .lib-css(color, @navigation-level0-item__hover__color);
+                    }
+                }
             }
 
             &:not(:first-child) {
@@ -178,6 +186,9 @@
                             .lib-css(text-decoration, @_submenu-item-text-decoration);
                             display: block;
                             line-height: normal;
+                            &:hover {
+                                .lib-css(color, @navigation-level0-item__hover__color);
+                            }
                         }
                     }
                 }
@@ -305,6 +316,10 @@
             .lib-css(border-top, none);
         }
 
+        li.level1 {
+            position: relative;
+        }
+
         .level0 {
             .lib-css(margin, @_nav-level0-item-margin);
             display: inline-block;
@@ -315,6 +330,19 @@
                 padding-right: 0;
             }
 
+            &:hover {
+                &:after {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    top: 0;
+                    left: 100%;
+                    width: 10px;
+                    height: calc(100% + 3px);
+                    z-index: 1;
+                }
+            }
+
             > .level-top {
                 .lib-css(background, @_nav-level0-item-background-color);
                 .lib-css(border, @_nav-level0-item-border);
@@ -324,6 +352,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);
@@ -350,6 +379,25 @@
                 overflow: visible !important;
             }
 
+            &.parent {
+                > .level-top {
+                    padding-right: 20px;
+
+                    > .ui-menu-icon {
+                        position: absolute;
+                        right: 0;
+
+                        .lib-icon-font(
+                            @icon-down,
+                            @_icon-font-size: 12px,
+                            @_icon-font-line-height: 20px,
+                            @_icon-font-text-hide: true,
+                            @_icon-font-position: after
+                        );
+                    }
+                }
+            }
+
             .submenu {
                 .lib-css(background, @_submenu-background-color);
                 .lib-css(border, @_submenu-border-width @_submenu-border-style @_submenu-border-color);
@@ -373,6 +421,17 @@
                     @_left: @_submenu-arrow-left
                 );
 
+                &:before {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    width: 100%;
+                    height: 4px;
+                    left: 0;
+                    top: -4px;
+                    z-index: 1;
+                }
+
                 a {
                     display: block;
                     line-height: inherit;
@@ -409,6 +468,26 @@
                     left: auto !important;
                     right: 100%;
                 }
+
+                li {
+                    margin: 0;
+                    &.parent {
+                        > a {
+                            > .ui-menu-icon {
+                                position: absolute;
+                                right: 3px;
+
+                                .lib-icon-font(
+                                    @icon-next,
+                                    @_icon-font-size: 12px,
+                                    @_icon-font-line-height: 20px,
+                                    @_icon-font-text-hide: true,
+                                    @_icon-font-position: after
+                                );
+                            }
+                        }
+                    }
+                }
             }
 
             &.more {
diff --git a/lib/web/css/source/lib/_rating.less b/lib/web/css/source/lib/_rating.less
index e585e4489d65e..535fa44616039 100644
--- a/lib/web/css/source/lib/_rating.less
+++ b/lib/web/css/source/lib/_rating.less
@@ -38,7 +38,7 @@
     input[type="radio"] {
         .lib-visually-hidden();
 
-        &:focus,
+        &:hover,
         &:checked {
             + label {
                 &:before {
diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less
index 36c7e6bf4ded3..8228a07ef92ab 100644
--- a/lib/web/css/source/lib/_resets.less
+++ b/lib/web/css/source/lib/_resets.less
@@ -185,7 +185,7 @@
 
     mark {
         background: #ff0;
-        color: #000;
+        color: @color-black;
     }
 
     small {
@@ -465,13 +465,13 @@
 
     ins {
         background-color: #ff9;
-        color: #000;
+        color: @color-black;
         text-decoration: none;
     }
 
     mark {
         background-color: #ff9;
-        color: #000;
+        color: @color-black;
         font-style: italic;
         font-weight: bold;
     }
diff --git a/lib/web/css/source/lib/_responsive.less b/lib/web/css/source/lib/_responsive.less
index d1bbbae7f6875..efb706f85eac0 100644
--- a/lib/web/css/source/lib/_responsive.less
+++ b/lib/web/css/source/lib/_responsive.less
@@ -27,24 +27,24 @@
 
 & when (@media-target = 'mobile'), (@media-target = 'all') {
 
-    @media only screen and (max-width: (@screen__xxs - 1)) {
-        .media-width('max', @screen__xxs);
+    @media only screen and (max-width: @screen__m) {
+        .media-width('max', (@screen__m + 1));
     }
 
-    @media only screen and (max-width: (@screen__xs - 1)) {
-        .media-width('max', @screen__xs);
+    @media only screen and (max-width: (@screen__m - 1)) {
+        .media-width('max', @screen__m);
     }
 
     @media only screen and (max-width: (@screen__s - 1)) {
         .media-width('max', @screen__s);
     }
 
-    @media only screen and (max-width: (@screen__m - 1)) {
-        .media-width('max', @screen__m);
+    @media only screen and (max-width: (@screen__xs - 1)) {
+        .media-width('max', @screen__xs);
     }
 
-    @media only screen and (max-width: @screen__m) {
-        .media-width('max', (@screen__m + 1));
+    @media only screen and (max-width: (@screen__xxs - 1)) {
+        .media-width('max', @screen__xxs);
     }
 
     @media all and (min-width: @screen__s) {
diff --git a/lib/web/css/source/lib/_sections.less b/lib/web/css/source/lib/_sections.less
index 372008d061580..b73e317835955 100644
--- a/lib/web/css/source/lib/_sections.less
+++ b/lib/web/css/source/lib/_sections.less
@@ -49,16 +49,16 @@
     @_tab-control-color: @tab-control__color,
     @_tab-control-text-decoration: @tab-control__text-decoration,
 
-    @_tab-control-color-visited: @tab-control__color,
-    @_tab-control-text-decoration-visited: @tab-control__text-decoration,
+    @_tab-control-color-visited: @tab-control__visited__color,
+    @_tab-control-text-decoration-visited: @tab-control__visited__text-decoration,
 
     @_tab-control-background-color-hover: @tab-control__hover__background-color,
     @_tab-control-color-hover: @tab-control__hover__color,
-    @_tab-control-text-decoration-hover: @tab-control__text-decoration,
+    @_tab-control-text-decoration-hover: @tab-control__hover__text-decoration,
 
     @_tab-control-background-color-active: @tab-control__active__background-color,
     @_tab-control-color-active: @tab-control__active__color,
-    @_tab-control-text-decoration-active: @tab-control__text-decoration,
+    @_tab-control-text-decoration-active: @tab-control__active__text-decoration,
 
     @_tab-control-height: @tab-control__height,
     @_tab-control-margin-right: @tab-control__margin-right,
@@ -121,6 +121,7 @@
         &.active > .switch:hover {
             .lib-css(background, @_tab-control-background-color-active);
             .lib-css(color, @_tab-control-color-active);
+            .lib-css(text-decoration, @_tab-control-text-decoration-active);
         }
 
         &.active > .switch,
@@ -200,8 +201,8 @@
     @_accordion-control-color: @accordion-control__color,
     @_accordion-control-text-decoration: @accordion-control__text-decoration,
 
-    @_accordion-control-color-visited: @accordion-control__color,
-    @_accordion-control-text-decoration-visited: @accordion-control__text-decoration,
+    @_accordion-control-color-visited: @accordion-control__visited__color,
+    @_accordion-control-text-decoration-visited: @accordion-control__visited__text-decoration,
 
     @_accordion-control-background-color-hover: @accordion-control__hover__background-color,
     @_accordion-control-color-hover: @accordion-control__hover__color,
@@ -275,6 +276,8 @@
         &.active > .switch:focus,
         &.active > .switch:hover {
             .lib-css(background, @_accordion-control-background-color-active);
+            .lib-css(color, @_accordion-control-color-active);
+            .lib-css(text-decoration, @_accordion-control-text-decoration-active);
             .lib-css(padding-bottom, @_accordion-control-padding-bottom);
         }
     }
diff --git a/lib/web/css/source/lib/_tables.less b/lib/web/css/source/lib/_tables.less
index 9c37e17b4fe82..43b63152946f8 100644
--- a/lib/web/css/source/lib/_tables.less
+++ b/lib/web/css/source/lib/_tables.less
@@ -530,7 +530,7 @@
                 display: block;
                 .lib-css(padding, @_table-responsive-cell-padding);
 
-                &:before {
+                &[data-th]:before {
                     .lib-css(padding-right, @table-cell__padding-horizontal);
                     content: attr(data-th)': ';
                     display: inline-block;
diff --git a/lib/web/css/source/lib/_typography.less b/lib/web/css/source/lib/_typography.less
index fae368b148e74..62529fe08d1c8 100644
--- a/lib/web/css/source/lib/_typography.less
+++ b/lib/web/css/source/lib/_typography.less
@@ -15,12 +15,8 @@
 ) {
     @font-face {
         font-family: @family-name;
-        src: url('@{font-path}.eot');
-        src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
-        url('@{font-path}.woff2') format('woff2'),
-        url('@{font-path}.woff') format('woff'),
-        url('@{font-path}.ttf') format('truetype'),
-        url('@{font-path}.svg#@{family-name}') format('svg');
+        src: url('@{font-path}.woff2') format('woff2'),
+        url('@{font-path}.woff') format('woff');
         font-weight: @font-weight;
         font-style: @font-style;
     }
@@ -41,7 +37,7 @@
 }
 
 //  Rem line height
-.lib-line-height(@heightValue) when not (@heightValue = false) and not (ispercentage(@heightValue)) {
+.lib-line-height(@heightValue) when not (@heightValue = false) and not (@heightValue = normal) and not (ispercentage(@heightValue)) {
     .lib-font-size-value(@heightValue);
     .lib-css(line-height, @fontValue);
 }
@@ -50,6 +46,10 @@
     .lib-css(line-height, @heightValue);
 }
 
+.lib-line-height(@heightValue) when (@heightValue = normal) {
+    .lib-css(line-height, @heightValue);
+}
+
 .lib-wrap-words() {
     overflow-wrap: break-word;
     word-wrap: break-word;
diff --git a/lib/web/css/source/lib/_utilities.less b/lib/web/css/source/lib/_utilities.less
index 08a82494b3e5c..222eb4741e85e 100644
--- a/lib/web/css/source/lib/_utilities.less
+++ b/lib/web/css/source/lib/_utilities.less
@@ -260,9 +260,8 @@
     @_line-height: normal
 ) {
     .lib-font-size(@_font-size);
-    font-size: @_font-size;
+    .lib-line-height(@_line-height);
     letter-spacing: normal;
-    line-height: @_line-height;
 }
 
 //
diff --git a/lib/web/css/source/lib/variables/_buttons.less b/lib/web/css/source/lib/variables/_buttons.less
index 82f618faa1d0f..8729eca6aca6d 100644
--- a/lib/web/css/source/lib/variables/_buttons.less
+++ b/lib/web/css/source/lib/variables/_buttons.less
@@ -47,6 +47,9 @@
 @button__active__gradient-color-end: false;
 
 //  Primary button
+@button-primary__font-family: @button__font-family;
+@button-primary__font-size: @button__font-size;
+@button-primary__font-weight: @button__font-weight;
 @button-primary__line-height: false;
 @button-primary__width: false;
 @button-primary__margin: false;
@@ -54,14 +57,14 @@
 @button-primary__gradient: false;
 @button-primary__gradient-direction: false;
 
-@button-primary__background: @color-blue1;
-@button-primary__border: 1px solid @color-blue1;
+@button-primary__background: @theme__color__primary;
+@button-primary__border: 1px solid @theme__color__primary;
 @button-primary__color: @color-white;
 @button-primary__gradient-color-start: false;
 @button-primary__gradient-color-end: false;
 
-@button-primary__hover__background: @color-blue2;
-@button-primary__hover__border: 1px solid @color-blue2;
+@button-primary__hover__background: @theme__color__primary-alt;
+@button-primary__hover__border: 1px solid @theme__color__primary-alt;
 @button-primary__hover__color: @button-primary__color;
 @button-primary__hover__gradient-color-start: false;
 @button-primary__hover__gradient-color-end: false;
diff --git a/lib/web/css/source/lib/variables/_colors.less b/lib/web/css/source/lib/variables/_colors.less
index 01e0db03adcdc..9c694468e9f62 100644
--- a/lib/web/css/source/lib/variables/_colors.less
+++ b/lib/web/css/source/lib/variables/_colors.less
@@ -78,7 +78,7 @@
 @color-sky-blue1: #68a8e0;
 
 @color-pink1: #fae5e5;
-@color-dark-pink1: #800080;
+@color-dark-pink1: #800080; // Legacy pink
 
 @color-brownie1: #6f4400;
 @color-brownie-light1: #c07600;
@@ -92,6 +92,10 @@
 //  Color nesting
 //  ---------------------------------------------
 
+@theme__color__primary: @color-blue1;
+@theme__color__primary-alt: @color-blue2;
+@theme__color__secondary: @color-orange-red1;
+
 @primary__color: @color-gray20;
 @primary__color__dark: darken(@primary__color, 35%); // #000
 @primary__color__darker: darken(@primary__color, 13.5%); // #111
@@ -104,5 +108,5 @@
 @page__background-color: @color-white;
 @panel__background-color: darken(@page__background-color, 6%);
 
-@active__color: @color-orange-red1;
+@active__color: @theme__color__secondary;
 @error__color: @color-red10;
diff --git a/lib/web/css/source/lib/variables/_forms.less b/lib/web/css/source/lib/variables/_forms.less
index 69d0146fb3555..fff6141c67fd5 100644
--- a/lib/web/css/source/lib/variables/_forms.less
+++ b/lib/web/css/source/lib/variables/_forms.less
@@ -121,7 +121,7 @@
 @select__disabled__font-style: @form-element-input__disabled__font-style;
 
 //  Focus state
-@select__focus__background: @form-element-input__focus__background;
+@select__focus__background: false;
 @select__focus__border: @form-element-input__focus__border;
 @select__focus__color: @form-element-input__focus__color;
 @select__focus__font-style: @form-element-input__focus__font-style;
diff --git a/lib/web/css/source/lib/variables/_navigation.less b/lib/web/css/source/lib/variables/_navigation.less
index 8cffee7f8e71a..3ef1742547426 100644
--- a/lib/web/css/source/lib/variables/_navigation.less
+++ b/lib/web/css/source/lib/variables/_navigation.less
@@ -23,11 +23,12 @@
 @navigation-level0-item__text-decoration: none;
 
 @navigation-level0-item__active__background: '';
-@navigation-level0-item__active__border-color: @color-orange-red1;
+@navigation-level0-item__active__border-color: @active__color;
 @navigation-level0-item__active__border-style: solid;
 @navigation-level0-item__active__border-width: 0 0 0 8px;
 @navigation-level0-item__active__color: '';
 @navigation-level0-item__active__text-decoration: '';
+@navigation-level0-item__hover__color: @primary__color;
 
 @submenu__background: '';
 @submenu__border: '';
@@ -46,7 +47,7 @@
 
 @submenu-item__active__background: '';
 @submenu-item__active__border: 8px;
-@submenu-item__active__border-color: @color-orange-red1;
+@submenu-item__active__border-color: @active__color;
 @submenu-item__active__border-style: solid;
 @submenu-item__active__border-width: 0 0 0 @submenu-item__active__border;
 @submenu-item__active__color: '';
@@ -76,7 +77,7 @@
 @navigation-desktop-level0-item__hover__text-decoration: @navigation-desktop-level0-item__text-decoration;
 
 @navigation-desktop-level0-item__active__background: '';
-@navigation-desktop-level0-item__active__border-color: @color-orange-red1;
+@navigation-desktop-level0-item__active__border-color: @active__color;
 @navigation-desktop-level0-item__active__border-style: solid;
 @navigation-desktop-level0-item__active__border-width: 0 0 3px;
 @navigation-desktop-level0-item__active__color: @navigation-desktop-level0-item__hover__color;
@@ -108,7 +109,7 @@
 @submenu-desktop-item__hover__text-decoration: @navigation-desktop-level0-item__text-decoration;
 
 @submenu-desktop-item__active__background: '';
-@submenu-desktop-item__active__border-color: @color-orange-red1;
+@submenu-desktop-item__active__border-color: @active__color;
 @submenu-desktop-item__active__border-style: solid;
 @submenu-desktop-item__active__border-width: 0 0 0 3px;
 @submenu-desktop-item__active__color: '';
diff --git a/lib/web/css/source/lib/variables/_rating.less b/lib/web/css/source/lib/variables/_rating.less
index 2ffdab8beddfc..ec60d5916315c 100644
--- a/lib/web/css/source/lib/variables/_rating.less
+++ b/lib/web/css/source/lib/variables/_rating.less
@@ -14,6 +14,6 @@
 @rating-icon__letter-spacing: -10px;
 @rating-icon__color: @color-gray78;
 
-@rating-icon__active__color: @color-orange-red1;
+@rating-icon__active__color: @active__color;
 
 @rating-label__hide: false;
diff --git a/lib/web/css/source/lib/variables/_sections.less b/lib/web/css/source/lib/variables/_sections.less
index 7d961077e6f59..05226d8aa3a3c 100644
--- a/lib/web/css/source/lib/variables/_sections.less
+++ b/lib/web/css/source/lib/variables/_sections.less
@@ -40,6 +40,9 @@
 @tab-control__active__color: @text__color;
 @tab-control__active__text-decoration: @tab-control__text-decoration;
 
+@tab-control__visited__color: @tab-control__color;
+@tab-control__visited__text-decoration: @tab-control__text-decoration;
+
 @tab-content__background-color: @tab-control__active__background-color;
 @tab-content__border-top-status: false;
 @tab-content__border: @tab-control__border-width solid @tab-control__border-color;
@@ -72,8 +75,8 @@
 @accordion-control__padding-bottom: @tab-control__padding-bottom;
 @accordion-control__padding-left: @accordion-control__padding-right;
 
-@accordion-control__visited__color: @accordion-control__color;
-@accordion-control__visited__text-decoration: @accordion-control__text-decoration;
+@accordion-control__visited__color: @tab-control__visited__color;
+@accordion-control__visited__text-decoration: @tab-control__visited__text-decoration;
 
 @accordion-control__hover__background-color: @tab-control__hover__background-color;
 @accordion-control__hover__color: @tab-control__hover__color;
diff --git a/lib/web/css/source/lib/variables/_typography.less b/lib/web/css/source/lib/variables/_typography.less
index aae7997478545..205b1fa9c7a3b 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
@@ -84,13 +83,13 @@
 //  Links
 //  ---------------------------------------------
 
-@link__color: @color-blue1;
+@link__color: @theme__color__primary;
 @link__text-decoration: none;
 
 @link__visited__color: @link__color;
 @link__visited__text-decoration: none;
 
-@link__hover__color: @color-blue2;
+@link__hover__color: @theme__color__primary-alt;
 @link__hover__text-decoration: underline;
 
 @link__active__color: @active__color;
diff --git a/lib/web/extjs/ext-tree.js b/lib/web/extjs/ext-tree.js
index 35b41260569c2..362e928c541c9 100644
--- a/lib/web/extjs/ext-tree.js
+++ b/lib/web/extjs/ext-tree.js
@@ -10,7 +10,7 @@ Ext={};window["undefined"]=window["undefined"];Ext.apply=function(o,c,_3){if(_3)
 
 
 
-(function(){var _1;Ext.lib.Dom={getViewWidth:function(_2){return _2?this.getDocumentWidth():this.getViewportWidth();},getViewHeight:function(_3){return _3?this.getDocumentHeight():this.getViewportHeight();},getDocumentHeight:function(){var _4=(document.compatMode!="CSS1Compat")?document.body.scrollHeight:document.documentElement.scrollHeight;return Math.max(_4,this.getViewportHeight());},getDocumentWidth:function(){var _5=(document.compatMode!="CSS1Compat")?document.body.scrollWidth:document.documentElement.scrollWidth;return Math.max(_5,this.getViewportWidth());},getViewportHeight:function(){var _6=self.innerHeight;var _7=document.compatMode;if((_7||Ext.isIE)&&!Ext.isOpera){_6=(_7=="CSS1Compat")?document.documentElement.clientHeight:document.body.clientHeight;}return _6;},getViewportWidth:function(){var _8=self.innerWidth;var _9=document.compatMode;if(_9||Ext.isIE){_8=(_9=="CSS1Compat")?document.documentElement.clientWidth:document.body.clientWidth;}return _8;},isAncestor:function(p,c){p=Ext.getDom(p);c=Ext.getDom(c);if(!p||!c){return false;}if(p.contains&&!Ext.isSafari){return p.contains(c);}else{if(p.compareDocumentPosition){return !!(p.compareDocumentPosition(c)&16);}else{var _c=c.parentNode;while(_c){if(_c==p){return true;}else{if(!_c.tagName||_c.tagName.toUpperCase()=="HTML"){return false;}}_c=_c.parentNode;}return false;}}},getRegion:function(el){return Ext.lib.Region.getRegion(el);},getY:function(el){return this.getXY(el)[1];},getX:function(el){return this.getXY(el)[0];},getXY:function(el){var p,pe,b,_14,bd=document.body;el=Ext.getDom(el);if(el.getBoundingClientRect){b=el.getBoundingClientRect();_14=fly(document).getScroll();return [b.left+_14.left,b.top+_14.top];}else{var x=el.offsetLeft,y=el.offsetTop;p=el.offsetParent;var _18=false;if(p!=el){while(p){x+=p.offsetLeft;y+=p.offsetTop;if(Ext.isSafari&&!_18&&fly(p).getStyle("position")=="absolute"){_18=true;}if(Ext.isGecko){pe=fly(p);var bt=parseInt(pe.getStyle("borderTopWidth"),10)||0;var bl=parseInt(pe.getStyle("borderLeftWidth"),10)||0;x+=bl;y+=bt;if(p!=el&&pe.getStyle("overflow")!="visible"){x+=bl;y+=bt;}}p=p.offsetParent;}}if(Ext.isSafari&&(_18||fly(el).getStyle("position")=="absolute")){x-=bd.offsetLeft;y-=bd.offsetTop;}}p=el.parentNode;while(p&&p!=bd){if(!Ext.isOpera||(Ext.isOpera&&p.tagName!="TR"&&fly(p).getStyle("display")!="inline")){x-=p.scrollLeft;y-=p.scrollTop;}p=p.parentNode;}return [x,y];},setXY:function(el,xy){el=Ext.fly(el,"_setXY");el.position();var pts=el.translatePoints(xy);if(xy[0]!==false){el.dom.style.left=pts.left+"px";}if(xy[1]!==false){el.dom.style.top=pts.top+"px";}},setX:function(el,x){this.setXY(el,[x,false]);},setY:function(el,y){this.setXY(el,[false,y]);}};Ext.lib.Event={getPageX:function(e){return Event.pointerX(e.browserEvent||e);},getPageY:function(e){return Event.pointerY(e.browserEvent||e);},getXY:function(e){e=e.browserEvent||e;return [Event.pointerX(e),Event.pointerY(e)];},getTarget:function(e){return Event.element(e.browserEvent||e);},resolveTextNode:function(_26){if(_26&&3==_26.nodeType){return _26.parentNode;}else{return _26;}},getRelatedTarget:function(ev){ev=ev.browserEvent||ev;var t=ev.relatedTarget;if(!t){if(ev.type=="mouseout"){t=ev.toElement;}else{if(ev.type=="mouseover"){t=ev.fromElement;}}}return this.resolveTextNode(t);},on:function(el,_2a,fn){Event.observe(el,_2a,fn,false);},un:function(el,_2d,fn){Event.stopObserving(el,_2d,fn,false);},purgeElement:function(el){},preventDefault:function(e){e=e.browserEvent||e;if(e.preventDefault){e.preventDefault();}else{e.returnValue=false;}},stopPropagation:function(e){e=e.browserEvent||e;if(e.stopPropagation){e.stopPropagation();}else{e.cancelBubble=true;}},stopEvent:function(e){Event.stop(e.browserEvent||e);},onAvailable:function(el,fn,_35,_36){var _37=new Date(),iid;var f=function(){if(_37.getElapsed()>10000){clearInterval(iid);}var el=document.getElementById(id);if(el){clearInterval(iid);fn.call(_35||window,el);}};iid=setInterval(f,50);}};Ext.lib.Ajax=function(){var _3b=function(cb){return cb.success?function(xhr){cb.success.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};var _3e=function(cb){return cb.failure?function(xhr){cb.failure.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};return {request:function(_41,uri,cb,_44){new Ajax.Request(uri,{method:_41,parameters:_44||"",timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},formRequest:function(_45,uri,cb,_48,_49,_4a){new Ajax.Request(uri,{method:Ext.getDom(_45).method||"POST",parameters:Form.serialize(_45)+(_48?"&"+_48:""),timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},isCallInProgress:function(_4b){return false;},abort:function(_4c){return false;},serializeForm:function(_4d){return Form.serialize(_4d.dom||_4d,true);}};}();Ext.lib.Anim=function(){var _4e={easeOut:function(pos){return 1-Math.pow(1-pos,2);},easeIn:function(pos){return 1-Math.pow(1-pos,2);}};var _51=function(cb,_53){return {stop:function(_54){this.effect.cancel();},isAnimated:function(){return this.effect.state=="running";},proxyCallback:function(){Ext.callback(cb,_53);}};};return {scroll:function(el,_56,_57,_58,cb,_5a){var _5b=_51(cb,_5a);el=Ext.getDom(el);el.scrollLeft=_56.to[0];el.scrollTop=_56.to[1];_5b.proxyCallback();return _5b;},motion:function(el,_5d,_5e,_5f,cb,_61){return this.run(el,_5d,_5e,_5f,cb,_61);},color:function(el,_63,_64,_65,cb,_67){return this.run(el,_63,_64,_65,cb,_67);},run:function(el,_69,_6a,_6b,cb,_6d,_6e){var o={};for(var k in _69){switch(k){case "points":var by,pts,e=Ext.fly(el,"_animrun");e.position();if(by=_69.points.by){var xy=e.getXY();pts=e.translatePoints([xy[0]+by[0],xy[1]+by[1]]);}else{pts=e.translatePoints(_69.points.to);}o.left=pts.left+"px";o.top=pts.top+"px";break;case "width":o.width=_69.width.to+"px";break;case "height":o.height=_69.height.to+"px";break;case "opacity":o.opacity=String(_69.opacity.to);break;default:o[k]=String(_69[k].to);break;}}var _75=_51(cb,_6d);_75.effect=new Effect.Morph(Ext.id(el),{duration:_6a,afterFinish:_75.proxyCallback,transition:_4e[_6b]||Effect.Transitions.linear,style:o});return _75;}};}();function fly(el){if(!_1){_1=new Ext.Element.Flyweight();}_1.dom=el;return _1;}Ext.lib.Region=function(t,r,b,l){this.top=t;this[1]=t;this.right=r;this.bottom=b;this.left=l;this[0]=l;};Ext.lib.Region.prototype={contains:function(_7b){return (_7b.left>=this.left&&_7b.right<=this.right&&_7b.top>=this.top&&_7b.bottom<=this.bottom);},getArea:function(){return ((this.bottom-this.top)*(this.right-this.left));},intersect:function(_7c){var t=Math.max(this.top,_7c.top);var r=Math.min(this.right,_7c.right);var b=Math.min(this.bottom,_7c.bottom);var l=Math.max(this.left,_7c.left);if(b>=t&&r>=l){return new Ext.lib.Region(t,r,b,l);}else{return null;}},union:function(_81){var t=Math.min(this.top,_81.top);var r=Math.max(this.right,_81.right);var b=Math.max(this.bottom,_81.bottom);var l=Math.min(this.left,_81.left);return new Ext.lib.Region(t,r,b,l);},adjust:function(t,l,b,r){this.top+=t;this.left+=l;this.right+=r;this.bottom+=b;return this;}};Ext.lib.Region.getRegion=function(el){var p=Ext.lib.Dom.getXY(el);var t=p[1];var r=p[0]+el.offsetWidth;var b=p[1]+el.offsetHeight;var l=p[0];return new Ext.lib.Region(t,r,b,l);};Ext.lib.Point=function(x,y){if(x instanceof Array){y=x[1];x=x[0];}this.x=this.right=this.left=this[0]=x;this.y=this.top=this.bottom=this[1]=y;};Ext.lib.Point.prototype=new Ext.lib.Region();if(Ext.isIE){Event.observe(window,"unload",function(){var p=Function.prototype;delete p.createSequence;delete p.defer;delete p.createDelegate;delete p.createCallback;delete p.createInterceptor;});}})();
+(function(){var _1;Ext.lib.Dom={getViewWidth:function(_2){return _2?this.getDocumentWidth():this.getViewportWidth();},getViewHeight:function(_3){return _3?this.getDocumentHeight():this.getViewportHeight();},getDocumentHeight:function(){var _4=(document.compatMode!="CSS1Compat")?document.body.scrollHeight:document.documentElement.scrollHeight;return Math.max(_4,this.getViewportHeight());},getDocumentWidth:function(){var _5=(document.compatMode!="CSS1Compat")?document.body.scrollWidth:document.documentElement.scrollWidth;return Math.max(_5,this.getViewportWidth());},getViewportHeight:function(){var _6=self.innerHeight;var _7=document.compatMode;if((_7||Ext.isIE)&&!Ext.isOpera){_6=(_7=="CSS1Compat")?document.documentElement.clientHeight:document.body.clientHeight;}return _6;},getViewportWidth:function(){var _8=self.innerWidth;var _9=document.compatMode;if(_9||Ext.isIE){_8=(_9=="CSS1Compat")?document.documentElement.clientWidth:document.body.clientWidth;}return _8;},isAncestor:function(p,c){p=Ext.getDom(p);c=Ext.getDom(c);if(!p||!c){return false;}if(p.contains&&!Ext.isSafari){return p.contains(c);}else{if(p.compareDocumentPosition){return !!(p.compareDocumentPosition(c)&16);}else{var _c=c.parentNode;while(_c){if(_c==p){return true;}else{if(!_c.tagName||_c.tagName.toUpperCase()=="HTML"){return false;}}_c=_c.parentNode;}return false;}}},getRegion:function(el){return Ext.lib.Region.getRegion(el);},getY:function(el){return this.getXY(el)[1];},getX:function(el){return this.getXY(el)[0];},getXY:function(el){var p,pe,b,_14,bd=document.body;el=Ext.getDom(el);if(el.getBoundingClientRect){b=el.getBoundingClientRect();_14=fly(document).getScroll();return [b.left+_14.left,b.top+_14.top];}else{var x=el.offsetLeft,y=el.offsetTop;p=el.offsetParent;var _18=false;if(p!=el){while(p){x+=p.offsetLeft;y+=p.offsetTop;if(Ext.isSafari&&!_18&&fly(p).getStyle("position")=="absolute"){_18=true;}if(Ext.isGecko){pe=fly(p);var bt=parseInt(pe.getStyle("borderTopWidth"),10)||0;var bl=parseInt(pe.getStyle("borderLeftWidth"),10)||0;x+=bl;y+=bt;if(p!=el&&pe.getStyle("overflow")!="visible"){x+=bl;y+=bt;}}p=p.offsetParent;}}if(Ext.isSafari&&(_18||fly(el).getStyle("position")=="absolute")){x-=bd.offsetLeft;y-=bd.offsetTop;}}p=el.parentNode;while(p&&p!=bd){if(!Ext.isOpera||(Ext.isOpera&&p.tagName!="TR"&&fly(p).getStyle("display")!="inline")){x-=p.scrollLeft;y-=p.scrollTop;}p=p.parentNode;}return [x,y];},setXY:function(el,xy){el=Ext.fly(el,"_setXY");el.position();var pts=el.translatePoints(xy);if(xy[0]!==false){el.dom.style.left=pts.left+"px";}if(xy[1]!==false){el.dom.style.top=pts.top+"px";}},setX:function(el,x){this.setXY(el,[x,false]);},setY:function(el,y){this.setXY(el,[false,y]);}};Ext.lib.Event={getPageX:function(e){return Event.pointerX(e.browserEvent||e);},getPageY:function(e){return Event.pointerY(e.browserEvent||e);},getXY:function(e){e=e.browserEvent||e;return [Event.pointerX(e),Event.pointerY(e)];},getTarget:function(e){return Event.element(e.browserEvent||e);},resolveTextNode:function(_26){if(_26&&3==_26.nodeType){return _26.parentNode;}else{return _26;}},getRelatedTarget:function(ev){ev=ev.browserEvent||ev;var t=ev.relatedTarget;if(!t){if(ev.type=="mouseout"){t=ev.toElement;}else{if(ev.type=="mouseover"){t=ev.fromElement;}}}return this.resolveTextNode(t);},on:function(el,_2a,fn){Event.observe(el,_2a,fn,false);},un:function(el,_2d,fn){Event.stopObserving(el,_2d,fn,false);},purgeElement:function(el){},preventDefault:function(e){e=e.browserEvent||e;if(e.preventDefault){e.preventDefault();}else{e.returnValue=false;}},stopPropagation:function(e){e=e.browserEvent||e;if(e.stopPropagation){e.stopPropagation();}else{e.cancelBubble=true;}},stopEvent:function(e){Event.stop(e.browserEvent||e);},onAvailable:function(el,fn,_35,_36){var _37=new Date(),iid;var f=function(){if(_37.getElapsed()>10000){clearInterval(iid);}var el=document.getElementById(id);if(el){clearInterval(iid);fn.call(_35||window,el);}};iid=setInterval(f,50);}};Ext.lib.Ajax=function(){var _3b=function(cb){return cb.success?function(xhr){cb.success.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};var _3e=function(cb){return cb.failure?function(xhr){cb.failure.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};return {request:function(_41,uri,cb,_44){new Ajax.Request(uri,{method:_41,parameters:_44||"",timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},formRequest:function(_45,uri,cb,_48,_49,_4a){new Ajax.Request(uri,{method:Ext.getDom(_45).method||"POST",parameters:Form.serialize(_45)+(_48?"&"+_48:""),timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},isCallInProgress:function(_4b){return false;},abort:function(_4c){return false;},serializeForm:function(_4d){return Form.serialize(_4d.dom||_4d,true);}};}();Ext.lib.Anim=function(){var _4e={easeOut:function(pos){return 1-Math.pow(1-pos,2);},easeIn:function(pos){return 1-Math.pow(1-pos,2);}};var _51=function(cb,_53){return {stop:function(_54){this.effect.cancel();},isAnimated:function(){return this.effect.state=="running";},proxyCallback:function(){Ext.callback(cb,_53);}};};return {scroll:function(el,_56,_57,_58,cb,_5a){var _5b=_51(cb,_5a);el=Ext.getDom(el);el.scrollLeft=_56.scroll.to[0];el.scrollTop=_56.scroll.to[1];_5b.proxyCallback();return _5b;},motion:function(el,_5d,_5e,_5f,cb,_61){return this.run(el,_5d,_5e,_5f,cb,_61);},color:function(el,_63,_64,_65,cb,_67){return this.run(el,_63,_64,_65,cb,_67);},run:function(el,_69,_6a,_6b,cb,_6d,_6e){var o={};for(var k in _69){switch(k){case "points":var by,pts,e=Ext.fly(el,"_animrun");e.position();if(by=_69.points.by){var xy=e.getXY();pts=e.translatePoints([xy[0]+by[0],xy[1]+by[1]]);}else{pts=e.translatePoints(_69.points.to);}o.left=pts.left+"px";o.top=pts.top+"px";break;case "width":o.width=_69.width.to+"px";break;case "height":o.height=_69.height.to+"px";break;case "opacity":o.opacity=String(_69.opacity.to);break;default:o[k]=String(_69[k].to);break;}}var _75=_51(cb,_6d);_75.effect=new Effect.Morph(Ext.id(el),{duration:_6a,afterFinish:_75.proxyCallback,transition:_4e[_6b]||Effect.Transitions.linear,style:o});return _75;}};}();function fly(el){if(!_1){_1=new Ext.Element.Flyweight();}_1.dom=el;return _1;}Ext.lib.Region=function(t,r,b,l){this.top=t;this[1]=t;this.right=r;this.bottom=b;this.left=l;this[0]=l;};Ext.lib.Region.prototype={contains:function(_7b){return (_7b.left>=this.left&&_7b.right<=this.right&&_7b.top>=this.top&&_7b.bottom<=this.bottom);},getArea:function(){return ((this.bottom-this.top)*(this.right-this.left));},intersect:function(_7c){var t=Math.max(this.top,_7c.top);var r=Math.min(this.right,_7c.right);var b=Math.min(this.bottom,_7c.bottom);var l=Math.max(this.left,_7c.left);if(b>=t&&r>=l){return new Ext.lib.Region(t,r,b,l);}else{return null;}},union:function(_81){var t=Math.min(this.top,_81.top);var r=Math.max(this.right,_81.right);var b=Math.max(this.bottom,_81.bottom);var l=Math.min(this.left,_81.left);return new Ext.lib.Region(t,r,b,l);},adjust:function(t,l,b,r){this.top+=t;this.left+=l;this.right+=r;this.bottom+=b;return this;}};Ext.lib.Region.getRegion=function(el){var p=Ext.lib.Dom.getXY(el);var t=p[1];var r=p[0]+el.offsetWidth;var b=p[1]+el.offsetHeight;var l=p[0];return new Ext.lib.Region(t,r,b,l);};Ext.lib.Point=function(x,y){if(x instanceof Array){y=x[1];x=x[0];}this.x=this.right=this.left=this[0]=x;this.y=this.top=this.bottom=this[1]=y;};Ext.lib.Point.prototype=new Ext.lib.Region();if(Ext.isIE){Event.observe(window,"unload",function(){var p=Function.prototype;delete p.createSequence;delete p.defer;delete p.createDelegate;delete p.createCallback;delete p.createInterceptor;});}})();
 
 
 
diff --git a/lib/web/extjs/resources/css/ytheme-magento.css b/lib/web/extjs/resources/css/ytheme-magento.css
index 7be66ddd5efe5..fa54395806264 100644
--- a/lib/web/extjs/resources/css/ytheme-magento.css
+++ b/lib/web/extjs/resources/css/ytheme-magento.css
@@ -15,7 +15,7 @@
     background:url(../images/magento/loading_bg.gif) no-repeat #eae2ca;
     padding:85px 15px 15px 15px;
     font-size:14px;
-        font-weight:bold;;
+        font-weight:bold;
     color:#611B06;
     width:206px;
     text-align:center;
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot
deleted file mode 100644
index 806461187aa48..0000000000000
Binary files a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot and /dev/null differ
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg
deleted file mode 100644
index 37d511d157533..0000000000000
--- a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1024"><font-face units-per-em="1024" ascent="960" descent="-64" /><missing-glyph horiz-adv-x="1024" /><glyph unicode="&#x20;" d="" horiz-adv-x="512" /><glyph unicode="&#xe600;" d="M676.571 637.696c-59.867 28.197-131.255 2.523-159.415-57.307-1.975-4.133-3.657-9.362-5.157-15.397-1.499 6.034-3.182 11.264-5.157 15.397-28.197 59.831-99.547 85.504-159.415 57.307-59.831-28.197-85.504-99.547-57.271-159.378 28.197-59.867 221.806-231.424 221.806-231.424s0 0.219 0.037 0.585c0.037-0.366 0.037-0.585 0.037-0.585s193.646 171.557 221.806 231.424c28.233 59.831 2.597 131.182-57.271 159.378z" /><glyph unicode="&#xe601;" d="M676.571 637.696c-59.831 28.197-131.218 2.523-159.451-57.307-1.938-4.133-3.657-9.362-5.157-15.397-1.463 6.034-3.182 11.264-5.157 15.397-28.16 59.831-99.547 85.504-159.378 57.307s-85.467-99.547-57.271-159.378 221.806-231.424 221.806-231.424 0 0.219 0.037 0.585c0-0.402 0-0.622 0-0.622s193.646 171.557 221.842 231.424c28.233 59.867 2.597 131.218-57.271 159.415zM690.213 479.232c-25.417-43.776-174.007-184.722-174.007-184.722l-1.573 2.999c0 0-155.465 140.398-181.211 183.991-30.61 51.822-7.753 108.946 38.949 128.439 43.52 18.176 101.888-27.319 123.502-73.143 1.499-3.182 17.627-1.463 18.798-6.107 1.134 4.645 12.727 2.926 14.226 6.107 21.577 45.824 81.042 93.989 128 72.411 46.007-21.138 66.926-72.155 33.317-129.975z" /><glyph unicode="&#xe602;" d="M512 704.11l-296.85-512.256h593.701l-296.85 512.256zM544.219 254.135h-62.757v49.92h62.757v-49.92zM528.713 343.369h-31.269l-20.809 140.654-1.207 72.704h72.521v-72.704l-19.237-140.654z" /><glyph unicode="&#xe603;" d="M628.846 588.544c-34.085 28.343-75.63 42.24-116.773 42.24-47.47 0-94.757-18.578-130.085-54.382l-32.073 29.586-0.585-102.693 110.994-0.658-39.424 41.253c25.198 24.027 58.002 36.315 91.136 36.352 29.842-0.037 59.721-9.947 84.517-30.574 31.488-26.222 47.689-63.744 47.726-101.815 0-5.449-0.366-10.971-1.024-16.457l51.383 9.874c0.073 2.231 0.146 4.425 0.146 6.619 0.037 52.37-22.491 104.521-65.938 140.654zM603.794 352.768c-25.307-24.466-58.405-37.010-91.867-37.047-29.879 0.037-59.721 9.984-84.517 30.574-31.488 26.222-47.689 63.744-47.726 101.778 0 6.327 0.475 12.617 1.353 18.871l-51.602-9.691c-0.146-3.072-0.256-6.107-0.256-9.179-0.037-52.334 22.491-104.521 65.975-140.617 34.048-28.343 75.593-42.24 116.736-42.24h0.11c47.799 0 95.378 18.907 130.743 55.223l33.938-33.829 0.219 106.094-112.055 0.293 38.949-40.229z" /><glyph unicode="&#xe604;" d="M696.942 624.933l-19.273 6.107h-74.496v38.583l-12.544 21.029-22.711 13.495h-111.141l-23.333-13.495-12.581-21.029v-38.619h-73.765l-18.761-6.656-17.189-14.153v-88.869h19.017v-0.073h17.554v-329.435h36.571v0.293h255.415v-0.293h36.571v329.435h18.286v0.073h18.286v86.601l-15.909 17.006zM457.435 667.575h109.129v-36.571h-109.129v36.571zM639.707 228.718h-255.415v292.571h255.415v-292.571zM676.279 557.934h-328.558v36.498h328.558v-36.498zM457.435 483.511h-36.571v-218.587h36.571v218.587zM530.578 483.511h-36.571v-218.587h36.571v218.587zM603.721 483.511h-36.571v-218.587h36.571v218.587z" /><glyph unicode="&#xe605;" d="M804.645 515.401c-1.499 4.681-5.888 7.899-10.789 7.899h-206.958l-64.073 196.754c-1.536 4.645-5.888 7.826-10.825 7.826-4.901 0-9.289-3.182-10.825-7.863l-64.439-196.754h-206.592c-4.901 0-9.289-3.218-10.825-7.863-1.499-4.681 0.146-9.874 4.096-12.763l167.205-121.783-64.439-197.851c-1.536-4.681 0.146-9.838 4.133-12.727 3.95-2.889 9.399-2.889 13.349 0l168.338 122.185 167.936-122.149c2.011-1.463 4.315-2.231 6.693-2.231s4.681 0.768 6.693 2.231c4.023 2.889 5.669 8.009 4.133 12.727l-64.439 197.851 167.57 121.783c3.95 2.889 5.632 8.046 4.059 12.727z" /><glyph unicode="&#xe606;" d="M807.241 415.854v67.145l-9.509 3.145-71.936 23.442-19.2 46.373 36.937 78.080-47.506 47.506-8.923-4.498-67.438-34.304-46.373 19.2-29.111 81.298h-67.182l-26.624-81.445-46.336-19.163-78.043 36.901-47.506-47.506 4.498-8.96 34.267-67.438-19.2-46.336-81.298-29.074v-67.218l9.472-3.072 71.973-23.515 19.163-46.373-36.901-78.080 47.506-47.506 8.887 4.498 67.474 34.304 46.373-19.2 29.111-81.298h67.182l3.072 9.509 23.515 71.936 46.373 19.2 78.080-36.937 47.506 47.506-4.498 8.923-34.304 67.438 19.2 46.373 81.298 29.147zM512 353.938c-51.968 0-94.062 42.13-94.062 94.062 0 52.005 42.094 94.062 94.062 94.062 51.931 0 94.098-42.057 94.098-94.062-0.037-51.931-42.167-94.062-94.098-94.062z" /><glyph unicode="&#xe607;" d="M339.602 539.941l172.398-183.881 172.398 183.881z" /><glyph unicode="&#xe608;" d="M606.939 449.938l-158.391 162.853-27.794-26.075 132.827-136.558-136.521-140.361 27.173-26.587 153.198 157.55-0.146 0.146z" /><glyph unicode="&#xe609;" d="M127.634 740.571v-73.143h768.731v73.143h-768.731zM127.634 411.429h768.731v73.143h-768.731v-73.143zM127.634 155.429h768.731v73.143h-768.731v-73.143z" /><glyph unicode="&#xe60a;" d="M512 742.217c-102.437 0-185.417-83.054-185.417-185.454 0-102.437 185.417-403.017 185.417-403.017s185.454 300.581 185.454 403.017c-0.037 102.437-83.017 185.454-185.454 185.454zM512 500.443c-31.122 0-56.357 25.198-56.357 56.357 0 31.086 25.234 56.357 56.357 56.357 31.159 0 56.393-25.271 56.393-56.357-0.037-31.159-25.271-56.357-56.393-56.357z" /><glyph unicode="&#xe60b;" d="M219.429 485.595h255.927v254.793h-255.927v-254.793zM548.571 740.389v-109.349h256v109.349h-256zM219.429 156.453h255.927v254.793h-255.927v-254.793zM548.571 484.754h256v109.349h-256v-109.349zM548.571 301.897h256v109.349h-256v-109.349zM548.571 155.611h256v109.349h-256v-109.349z" /><glyph unicode="&#xe60c;" d="M579.511 677.010c-30.793 0-57.381-25.161-57.381-55.954 0-28.635 18.907-47.579 47.579-47.579 31.415 0 58.002 23.771 58.002 55.991 0 28.709-20.224 47.543-48.201 47.543zM593.518 336.494c-9.801 0-48.311-59.502-69.266-59.502-5.595 0-8.375 4.937-8.375 9.801 0 11.227 7.68 28.709 11.849 39.205l50.322 136.375c25.198 67.84-6.985 86.016-37.047 86.016-40.558 0-76.946-20.297-104.887-46.848-9.106-9.070-39.863-38.437-39.863-51.054 0-4.133 4.169-9.070 9.106-9.070 12.544 0 46.153 60.855 72.009 60.855 5.595 0 11.886-6.29 6.985-18.871l-48.896-123.173c-4.937-11.849-28.709-69.23-28.709-102.802 0-26.587 17.518-38.437 42.679-38.437 70.656 0 152.43 86.711 152.43 107.008 0 6.29-4.864 10.496-8.338 10.496z" /><glyph unicode="&#xe60d;" d="M219.063 593.92h147.017v147.017h-147.017v-147.017zM438.491 593.92h147.017v147.017h-147.017v-147.017zM657.92 740.937v-147.017h147.017v147.017h-147.017zM219.063 374.491h147.017v147.017h-147.017v-147.017zM438.491 374.491h147.017v147.017h-147.017v-147.017zM657.92 374.491h147.017v147.017h-147.017v-147.017zM219.063 155.063h147.017v147.017h-147.017v-147.017zM438.491 155.063h147.017v147.017h-147.017v-147.017zM657.92 155.063h147.017v147.017h-147.017v-147.017z" /><glyph unicode="&#xe60e;" d="M711.607 401.591l-5.486-5.522c21.065 27.794 32.878 60.197 32.219 94.72-1.975 99.218-106.679 177.627-233.874 175.141-127.232-2.487-228.791-84.992-226.816-184.21 1.938-99.182 106.679-177.554 233.911-175.067 28.635 0.585 50.432-5.815 75.63 2.121l159.232-78.702c-0.037-0.037-71.058 124.965-34.816 171.52z" /><glyph unicode="&#xe60f;" d="M236.946 466.286h550.107v-36.571h-550.107v36.571z" /><glyph unicode="&#xe610;" d="M749.129 663.698c-152.101-93.257-262.473-210.907-312.064-269.934l-121.417 95.159-53.65-43.264 209.847-213.394c36.096 92.489 150.491 273.298 290.158 401.737l-12.873 29.696z" /><glyph unicode="&#xe611;" d="M434.871 259.95c-35.218 0-63.707-28.526-63.707-63.744 0-35.182 28.489-63.671 63.707-63.671 35.182 0 63.707 28.489 63.707 63.671 0 35.218-28.526 63.744-63.707 63.744zM654.848 259.95c-35.218 0-63.707-28.526-63.707-63.744 0-35.182 28.489-63.671 63.707-63.671 35.145 0 63.707 28.489 63.707 63.671 0 35.218-28.562 63.744-63.707 63.744zM784.274 616.741c-163.511 0-427.227 0-427.227 0s-25.929 70.071-49.957 113.371c-24.027 43.227-57.893 32.037-57.893 32.037-26.843 0-39.314-16.055-39.314-42.971 0-26.843 16.457-48.64 43.337-48.64l16.603-14.848 121.929-330.533 356.425-0.256c0 0 65.17 261.705 61.806 251.355 11.959 36.974-3.255 40.485-25.71 40.485zM392.485 492.544c-18.725 0-33.902 15.177-33.902 33.902s15.177 33.902 33.902 33.902 33.902-15.177 33.902-33.902-15.177-33.902-33.902-33.902zM464.933 379.392c-18.725 0-33.902 15.177-33.902 33.902s15.177 33.902 33.902 33.902 33.902-15.177 33.902-33.902-15.177-33.902-33.902-33.902zM502.199 492.544c-18.725 0-33.902 15.177-33.902 33.902s15.177 33.902 33.902 33.902 33.902-15.177 33.902-33.902-15.177-33.902-33.902-33.902zM574.647 379.392c-18.725 0-33.865 15.177-33.865 33.902s15.177 33.902 33.865 33.902 33.938-15.177 33.938-33.902-15.214-33.902-33.938-33.902zM611.913 492.544c-18.725 0-33.938 15.177-33.938 33.902s15.214 33.902 33.938 33.902 33.865-15.177 33.865-33.902-15.141-33.902-33.865-33.902zM684.361 379.392c-18.725 0-33.865 15.177-33.865 33.902s15.141 33.902 33.865 33.902 33.938-15.177 33.938-33.902-15.214-33.902-33.938-33.902zM721.627 492.544c-18.725 0-33.938 15.177-33.938 33.902s15.214 33.902 33.938 33.902 33.865-15.177 33.865-33.902-15.141-33.902-33.865-33.902z" /><glyph unicode="&#xe612;" d="M642.487 578.304c11.959 0 21.65 9.691 21.65 21.65v77.934c0 11.959-9.691 21.65-21.65 21.65-11.922 0-21.65-9.691-21.65-21.65v-77.934c0.037-11.959 9.728-21.65 21.65-21.65zM381.842 578.304c11.922 0 21.65 9.691 21.65 21.65v77.934c0 11.959-9.728 21.65-21.65 21.65-11.959 0-21.65-9.691-21.65-21.65v-77.934c0.037-11.959 9.691-21.65 21.65-21.65zM671.269 636.562v-0.402c8.997-7.973 14.702-19.566 14.702-32.549 0-23.991-19.456-43.447-43.483-43.447-23.991 0-43.447 19.456-43.447 43.447 0 12.946 5.705 24.576 14.702 32.549v0.402h-203.154v-0.402c8.997-7.973 14.702-19.566 14.702-32.549 0-23.991-19.456-43.447-43.447-43.447-24.027 0-43.447 19.456-43.447 43.447 0 12.946 5.669 24.576 14.665 32.549v0.402h-96.841v-440.101h511.561v440.101h-96.512zM732.087 234.569h-437.76v291.694h437.76v-291.694zM619.301 407.113h-55.15v-55.113h55.15v55.113zM619.301 490.021h-55.15v-55.113h55.15v55.113zM619.301 326.51h-55.15v-55.15h55.15v55.15zM696.942 490.021h-55.15v-55.113h55.15v55.113zM696.942 407.113h-55.15v-55.113h55.15v55.113zM386.267 326.51h-55.113v-55.15h55.113v55.15zM463.982 326.51h-55.15v-55.15h55.15v55.15zM463.982 407.113h-55.15v-55.113h55.15v55.113zM386.267 407.113h-55.113v-55.113h55.113v55.113zM541.586 407.113h-55.113v-55.113h55.113v55.113zM541.586 490.021h-55.113v-55.113h55.113v55.113zM463.982 490.021h-55.15v-55.113h55.15v55.113zM541.586 326.51h-55.113v-55.15h55.113v55.15z" /><glyph unicode="&#xe613;" d="M512 677.742l-209.006-253.257h136.338v-206.19h145.298v206.19h136.375z" /><glyph unicode="&#xe614;" d="M584.631 471.515v206.226h-145.298v-206.226h-136.338l209.006-253.221 209.006 253.221z" /><glyph unicode="&#xe615;" d="M836.462 183.918c0 0-109.641 112.677-153.381 156.233-19.054 19.017-32.073 31.927-32.073 31.927 14.848 21.211 26.405 44.361 34.633 69.339s12.361 51.237 12.361 78.848c0 35.621-6.802 69.083-20.334 100.462-13.568 31.305-32 58.697-55.406 82.030-23.369 23.442-50.725 41.874-82.066 55.406-31.305 13.605-64.768 20.37-100.389 20.37-35.584 0-69.047-6.802-100.425-20.37-31.305-13.531-58.551-31.963-81.664-55.406-23.077-23.296-41.435-50.688-54.967-81.993-13.568-31.378-20.334-64.841-20.334-100.462s6.802-69.083 20.334-100.389c13.531-31.305 31.89-58.661 54.967-82.103 23.113-23.333 50.322-41.801 81.664-55.369 31.378-13.568 64.841-20.297 100.425-20.297 27.648 0 53.943 4.023 78.885 12.288s48.091 19.858 69.303 34.706c0 0 11.922-11.959 29.696-29.806 48.421-48.603 155.026-159.159 155.026-159.159 16.018-6.985 41.728 0.439 54.455 11.337s19.858 33.682 9.289 52.407zM612.718 447.013c-9.838-22.747-23.223-42.569-40.155-59.429-16.933-16.933-36.718-30.354-59.429-40.192-22.638-9.874-46.848-14.775-72.521-14.775-26.258 0-50.688 4.937-73.362 14.775s-42.496 23.259-59.429 40.192c-16.896 16.859-30.354 36.681-40.155 59.429-9.838 22.601-14.738 47.104-14.738 73.289 0 25.673 4.901 50.030 14.738 72.997 9.838 22.93 23.259 42.898 40.155 59.794 16.933 16.969 36.754 30.354 59.429 40.155 22.674 9.911 47.104 14.738 73.362 14.738 25.673 0 49.883-4.864 72.521-14.738 22.674-9.801 42.496-23.186 59.429-40.155 16.933-16.933 30.318-36.901 40.155-59.831 9.874-22.967 14.738-47.323 14.738-72.997 0-26.149-4.901-50.651-14.738-73.253z" /><glyph unicode="&#xe616;" d="M695.845 602.661l-29.147 29.111-154.697-154.734-154.734 154.734-29.111-29.111 154.734-154.734-154.624-154.624 29.111-29.074 154.624 154.587 154.661-154.587 29.038 29.074-154.587 154.624z" /><glyph unicode="&#xe617;" d="M470.418 450.158l132.791 136.558-27.794 26.075-158.354-162.853 9.618-9.033-0.11-0.146 153.234-157.55 27.136 26.587z" /><glyph unicode="&#xe618;" d="M512 539.941l-172.398-183.881h344.795z" /><glyph unicode="&#xe619;" d="M392.119 622.043v-348.087l239.726 174.043z" /><glyph unicode="&#xe61a;" d="M392.119 448l239.726-174.043v348.087z" /><glyph unicode="&#xe61b;" d="M237.714 191.159h73.728v513.682h-73.728v-513.682zM786.286 703.086h-440.283v-292.169h440.283l-148.078 144.128 148.078 148.041z" /><glyph unicode="&#xe61c;" d="M787.054 466.359h-256.219v256.695h-36.571v-256.695h-257.317v-36.571h257.317v-256.841h36.571v256.841h256.219z" /><glyph unicode="&#xe61d;" d="M769.134 594.286v36.571h-513.17v-25.271l-1.097-1.097 1.097-1.097v-9.106h0.622v-292.571h-0.622v-8.558l-1.097-1.097 1.097-1.097v-25.819h513.17v36.571h-0.585v292.571h0.585zM703.89 301.714h-387.657l119.881 119.881-25.856 25.856-117.138-117.138v236.361l220.014-217.088 25.856 25.856-1.39 1.353 194.377 194.341v-245.87l-122.149 122.149-25.856-25.856 119.918-119.845zM317.221 594.286h386.158l-191.781-191.781-194.377 191.781z" /><glyph unicode="&#xe61e;" d="M310.747 210.359h109.166v328.485h-109.166v-328.485zM604.050 355.584v-145.225h109.202v145.225h-109.202zM457.399 210.359h109.202v475.319h-109.202v-475.319z" /><glyph unicode="&#xe61f;" d="M310.747 210.359h109.166v328.485h-109.166v-328.485zM347.941 503.625h36.864v-256.768h-36.864v256.768zM604.050 355.584v-145.225h109.202v145.225h-109.202zM677.339 246.711h-36.827v71.863h36.827v-71.863zM457.399 210.359h109.202v475.319h-109.202v-475.319zM494.263 649.838h36.827v-402.834h-36.827v402.834z" /><glyph unicode="&#xe620;" d="M519.57 665.893c-127.232 2.487-231.936-75.922-233.911-175.141-0.695-34.487 11.154-66.926 32.219-94.72l-5.486 5.522c36.242-46.519-34.816-171.52-34.816-171.52l159.232 78.702c25.161-7.936 46.994-1.536 75.63-2.121 127.232-2.487 231.973 75.886 233.911 175.067 2.011 99.255-99.511 181.723-226.779 184.21z" /><glyph unicode="&#xe621;" d="M514.158 489.582l136.558-132.791 26.075 27.794-162.853 158.354-166.729-162.743 26.587-27.136z" /><glyph unicode="&#xe622;" d="M509.842 406.418l-136.558 132.791-26.075-27.794 162.853-158.354 166.729 162.743-26.587 27.136z" /><glyph unicode="&#xe623;" d="M512 52.005c-218.77 0-396.032 177.298-396.032 395.995s177.262 395.995 396.032 395.995c218.661 0 396.032-177.298 396.032-395.995s-177.371-395.995-396.032-395.995zM512 796.087c-191.89 0-348.087-156.197-348.087-348.087 0-191.927 156.197-348.087 348.087-348.087s348.050 156.16 348.050 348.087c-0.037 191.927-156.16 348.087-348.050 348.087zM611.328 442.441l-24.101-18.761c-13.166-10.24-21.87-22.126-26.185-35.84-2.743-8.558-4.681-18.907-4.901-37.12h-92.343c1.353 38.473 5.413 61.842 11.301 76.581 5.925 14.592 21.102 31.488 45.531 50.578l24.795 19.383c8.192 6.181 14.738 12.91 19.785 20.187 8.997 12.471 13.495 26.222 13.495 41.216 0 17.262-5.010 32.987-15.104 47.214-10.057 14.226-28.453 21.321-55.259 21.321-26.295 0-44.946-8.777-55.918-26.295s-16.384-33.463-16.384-52.37h-98.523c2.706 64.805 25.234 108.544 67.73 135.57 26.843 17.298 59.794 25.929 98.889 25.929 51.383 0 94.025-12.288 128-36.827 34.011-24.503 53.87-74.935 53.87-123.173 0-29.55-10.24-40.338-25.051-60.599-8.558-12.288-25.125-27.941-49.627-46.994zM561.042 202.423h-98.231v98.487h98.231v-98.487z" /><glyph unicode="&#xe624;" d="M1.994 518.75h748.928l-283.278 291.206h200.254l354.108-363.956-354.108-363.956h-200.254l283.278 291.174h-748.928v145.532z" /><glyph unicode="&#xe625;" d="M1022.006 375.25h-748.928l283.278-291.206h-200.254l-354.108 363.956 354.108 363.956h200.254l-283.278-291.174h748.928v-145.532z" /><glyph unicode="&#xe626;" d="M85.174 468.026l0.504-106.238 426.322-426.324 426.32 426.324 0.504 106.238-389.444-389.444 0.002 880.006h-74.764v-880.004z" /><glyph unicode="&#xe627;" d="M511.963 831.086c-211.529 0-383.049-171.52-383.049-383.086s171.483-383.086 383.049-383.086c211.602 0 383.086 171.483 383.086 383.086s-171.483 383.086-383.086 383.086zM511.963 794.514c191.086 0 346.514-155.429 346.514-346.514 0-79.909-27.429-153.344-73.070-212.041-5.486 1.975-11.008 3.84-16.274 6.107-34.926 14.629-73.801 31.781-108.654 46.153-9.911 2.706-19.931 5.413-29.842 8.155-11.849 8.155-23.589 35.365-29.915 48.933-6.29 0.914-12.654 1.792-19.017 2.633 0.914 20.992 13.934 22.126 19.017 38.071 4.498 14.080 0.512 32.439 7.57 45.495 4.937 9.070 16.128 9.070 21.65 16.933 5.083 6.985 8.411 19.273 9.984 27.941 2.853 15.799 5.339 37.339-2.158 53.029-4.279 8.96-6.985 9.874-8.229 20.736-1.426 13.275 3.913 56.43 4.133 65.755 0.512 24.21-0.073 26.149-5.925 49.737 0 0-7.058 21.358-18.213 27.831l-22.272 3.803-13.714 12.727c-55.369 34.085-114.761 10.167-146.505-2.67-45.824-14.885-74.789-59.758-54.565-155.538 3.474-16.421-8.96-23.698-8.155-32.658 1.829-19.566 2.158-66.487 20.59-78.080 1.719-1.061 14.811-4.352 14.738-3.438 1.792-19.017 3.621-38.071 5.376-57.015 4.608-12.654 15.689-14.080 18.907-31.927l-14.153-3.438c-6.363-13.568-17.993-40.777-29.879-48.933-9.947-2.706-19.931-5.413-29.879-8.155-34.889-14.373-73.691-31.488-108.654-46.153-1.902-0.768-3.877-1.39-5.815-2.158-43.776 58.112-70.071 130.011-70.071 208.165 0 191.086 155.429 346.514 346.478 346.514z" /><glyph unicode="&#xe628;" d="M427.703 653.019c0-10.569-8.558-19.090-19.090-19.090h-11.154c-10.533 0-19.090 8.521-19.090 19.090v68.462c0 10.533 8.594 19.090 19.090 19.090h11.154c10.533 0 19.090-8.558 19.090-19.090v-68.462zM645.778 653.019c0-10.569-8.521-19.090-19.054-19.090h-11.154c-10.533 0-19.054 8.521-19.054 19.090v68.462c-0.037 10.533 8.485 19.090 19.054 19.090h11.154c10.533 0 19.054-8.558 19.054-19.090v-68.462zM675.182 481.317l-38.729 31.598-152.795-187.282-81.518 64.805-28.891-36.242 120.21-95.634zM758.784 687.982h-71.351v-29.769c0-31.634-25.746-57.344-57.271-57.344h-11.227c-31.598 0-57.271 25.71-57.271 57.344v29.769h-97.682v-29.769c0-31.634-25.71-57.344-57.307-57.344h-11.154c-31.598 0-57.307 25.71-57.307 57.344v29.769h-72.96c-10.533 0-19.090-8.521-19.090-19.054v-494.373c-0.037-10.569 8.558-19.127 19.090-19.127h493.531c10.533 0 19.054 8.558 19.054 19.090v494.409c0 10.533-8.521 19.054-19.054 19.054zM720.567 240.677c0-10.569-8.558-19.090-19.090-19.090h-378.917c-10.569 0-19.090 8.521-19.090 19.090v288.11c0 10.569 8.521 19.054 19.090 19.054h378.88c10.533 0 19.090-8.485 19.090-19.054v-288.11z" /><glyph unicode="&#xe629;" d="M391.863 554.203h-128.219c-10.35 0-18.761-8.375-18.761-18.725v-91.429c0-10.35 8.375-18.725 18.761-18.725h128.219c10.35 0 18.761 8.375 18.761 18.725v91.429c0 10.386-8.375 18.725-18.761 18.725zM391.863 387.511h-90.734c-10.35 0-18.761-8.375-18.761-18.725v-194.633c0-10.35 8.411-18.725 18.761-18.725h90.734c10.35 0 18.761 8.375 18.761 18.725v194.633c0 10.35-8.375 18.725-18.761 18.725zM760.357 554.203h-279.845c-10.35 0-18.725-8.375-18.725-18.725v-91.429c0-10.35 8.375-18.725 18.725-18.725h279.845c10.313 0 18.725 8.375 18.725 18.725v91.429c-0.037 10.386-8.411 18.725-18.725 18.725zM721.701 385.573h-240.64c-10.313 0-18.725-8.375-18.725-18.761v-192.695c0-10.35 8.375-18.725 18.725-18.725h240.64c10.35 0 18.725 8.375 18.725 18.725v192.695c0 10.35-8.375 18.761-18.725 18.761zM507.355 575.634c21.87-3.986 42.971-6.327 62.647-6.327 99.072 0 152.832 53.248 153.088 103.387 0.183 32.293-23.698 67.291-78.117 67.84-72.923 0-118.089-51.493-141.605-89.71-23.918 38.107-69.266 88.576-142.373 88.576-52.882-0.549-76.763-35.547-76.581-67.84 0.256-50.139 54.016-103.424 153.088-103.424 0.037 0 0.037 0 0.037 0 21.394 0 44.398 2.414 68.425 7.241l1.39 0.256zM645.998 693.723c9.143-0.073 30.354-2.304 30.245-20.773-0.11-23.589-33.17-56.795-106.24-56.795-10.057 0-20.553 0.658-31.525 1.938 16.567 29.294 51.566 75.63 107.52 75.63zM437.504 614.985v0c-73.106 0-106.167 33.207-106.277 56.795-0.11 18.469 21.102 20.699 31.305 20.809 55.259 0 90.039-46.373 106.496-75.666-10.935-1.28-21.467-1.938-31.525-1.938z" /><glyph unicode="&#xe633;" d="M938.824 426.028l-0.504 106.238-426.32 426.322-426.322-426.322-0.504-106.238 389.444 389.442v-880.006h74.764v880.006z" /></font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf b/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf
deleted file mode 100644
index 6fabe5c3e8994..0000000000000
Binary files a/lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf and /dev/null differ
diff --git a/lib/web/fonts/MUI-Icons/MUI-Icons.eot b/lib/web/fonts/MUI-Icons/MUI-Icons.eot
deleted file mode 100644
index 47cc307843c7f..0000000000000
Binary files a/lib/web/fonts/MUI-Icons/MUI-Icons.eot and /dev/null differ
diff --git a/lib/web/fonts/MUI-Icons/MUI-Icons.svg b/lib/web/fonts/MUI-Icons/MUI-Icons.svg
deleted file mode 100644
index dddb55583c550..0000000000000
--- a/lib/web/fonts/MUI-Icons/MUI-Icons.svg
+++ /dev/null
@@ -1,706 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="16"></iconset>
-</metadata>
-<defs>
-<font id="MUI-Icons" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode="&#xe001;" d="M 470.70,72.193l-2.688,2.688l 0.006,0.002L 360.505,182.408c 14.938,25.732, 23.612,55.564, 23.816,87.451
-						c 0.626,97.615-77.986,177.243-175.599,177.857c-0.394,0.001-0.771,0.002-1.168,0.002
-						c-97.06-0.006-176.063-78.391-176.688-175.598c-0.618-97.609, 77.999-177.236, 175.597-177.859
-						c 0.389-0.002, 0.766-0.004, 1.155-0.004c 32.438,0.00, 62.846,8.79, 88.998,24.075l 107.415-107.433l 0.014,0.01l 2.688-2.688
-						c 8.125-8.123, 21.293-8.114, 29.41,0.00l 34.562,34.557C 478.819,50.895, 478.822,64.07, 470.70,72.193z M 300.39,177.58
-						c-24.834-24.67-57.78-38.252-92.768-38.252l-0.874,0.00 c-72.589,0.467-131.271,59.908-130.813,132.503
-						c 0.465,72.128, 59.516,130.811, 131.626,130.815l 0.879-0.002c 35.168-0.22, 68.146-14.123, 92.852-39.148
-						c 24.706-25.025, 38.188-58.178, 37.966-93.352C 339.031,235.128, 325.229,202.25, 300.39,177.58zM 223.902,351.597L 192.104,351.597L 192.104,287.997L 128.503,287.997L 128.503,256.203L 192.104,256.203L 192.104,192.604L 223.902,192.604L 223.902,256.203L 287.501,256.203L 287.501,287.997L 223.902,287.997 					z"  />
-<glyph unicode="&#xe002;" d="M 466.996,351.685c-3.893,12.271-9.538,21.313-21.31,21.313c0.00,0.00-80.181,11.00-189.351,11.00c-109.169,0.00-188.677-11.00-188.677-11.00
-					c-11.77,0.00-16.889-8.316-21.313-21.313c0.00,0.00-13.67-31.687-13.67-127.685s 13.67-131.685, 13.67-131.685
-					c 5.282-11.107, 9.543-21.313, 21.313-21.313c0.00,0.00, 92.343-7.00, 188.34-7.00s 189.688,9.00, 189.688,9.00c 11.771,0.00, 18.218,10.248, 21.31,21.313
-					c0.00,0.00, 13.00,49.185, 13.00,129.185S 466.996,351.685, 466.996,351.685z M 192.002,134.882L 192.002,313.118 L 346.358,224.00L 192.002,134.882z" />
-<glyph unicode="&#xe003;" d="M 259.559,206.271L 198.73,29.528c 18.165-5.344, 37.372-8.263, 57.27-8.263c 23.607,0.00, 46.25,4.077, 67.32,11.492
-					c-0.539,0.868-1.039,1.793-1.451,2.795L 259.559,206.271z M 392.855,234.231c0.00,25.062-9.006,42.404-16.719,55.904
-					c-10.273,16.708-19.912,30.844-19.912,47.551c0.00,18.63, 14.131,35.979, 34.045,35.979c 0.896,0.00, 1.754-0.108, 2.625-0.165
-					c-36.064,33.048-84.119,53.225-136.896,53.225c-70.82,0.00-133.128-36.34-169.375-91.37c 4.757-0.153, 9.241-0.244, 13.044-0.244
-					c 21.196,0.00, 54.027,2.576, 54.027,2.576c 10.929,0.639, 12.213-15.416, 1.30-16.707c0.00,0.00-10.985-1.282-23.198-1.929l 73.815-219.589
-					l 44.372,133.051l-31.584,86.541c-10.92,0.645-21.262,1.926-21.262,1.926c-10.927,0.646-9.646,17.347, 1.288,16.707
-					c0.00,0.00, 33.47-2.576, 53.39-2.576c 21.199,0.00, 54.031,2.576, 54.031,2.576c 10.93,0.64, 12.217-15.414, 1.297-16.707
-					c0.00,0.00-11.00-1.281-23.203-1.926l 73.262-217.916l 20.23,67.559C 386.182,196.747, 392.855,216.881, 392.855,234.231z M 357.918,48.78
-					c 60.27,35.14, 100.803,100.438, 100.803,175.227c0.00,35.246-9.004,68.381-24.83,97.254c 0.871-6.455, 1.365-13.382, 1.365-20.847
-					c0.00-20.563-3.854-43.688-15.416-72.608L 357.918,48.78z M 53.28,224.007c0.00-80.24, 46.624-149.592, 114.259-182.448l-96.705,264.95
-					C 59.581,281.298, 53.28,253.397, 53.28,224.007z M 255.996-19.985c-134.53,0.00-243.98,109.457-243.98,243.993
-					c0.00,134.527, 109.448,243.978, 243.98,243.978c 134.528,0.00, 243.988-109.449, 243.988-243.978
-					C 499.986,89.472, 390.526-19.985, 255.996-19.985z" />
-<glyph unicode="&#xe004;" d="M 511.998,192.10L 224.002,192.10L 224.002,7.489L 511.998-32.01 
-											zM 192.002,192.10L-0.012,192.10L-0.012,39.671L 192.002,10.416 
-											zM 192.002,406.668L-0.012,377.284L-0.012,223.598L 192.002,223.598 
-											zM 511.998,223.598L 511.998,447.50L 224.002,409.463L 224.002,223.598 
-											z" />
-<glyph unicode="&#xe005;" d="M 206.569,224.042c-23.637,12.147-46.615,18.31-68.313,18.31c-2.951,0.00-5.921-0.088-8.892-0.35
-					c-27.686-2.292-52.974-9.595-69.239-15.273c-4.314-1.584-8.736-3.258-13.292-5.106L 2.331,67.344
-					c 30.569,11.313, 57.616,16.814, 82.378,16.814c 40.054,0.00, 69.128-14.966, 93.14-30.373c 11.376,38.604, 38.667,131.833, 46.812,159.694
-					C 218.738,217.089, 212.731,220.697, 206.569,224.042z M 264.10,184.824l-44.812-155.644c 13.294-7.615, 58.017-31.732, 92.259-31.732
-					c 27.641,0.00, 58.588,7.082, 94.547,21.695l 42.786,149.614c-29.05-9.375-56.915-14.131-82.97-14.131
-					C 318.371,154.627, 285.096,170.035, 264.10,184.824z M 147.409,294.954c 38.208-0.396, 66.464-14.967, 89.882-29.976l 45.954,157.227
-					c-9.685,5.547-35.081,19.369-53.438,24.079c-12.082,2.816-24.782,4.269-38.251,4.269c-25.663-0.483-53.701-6.909-85.657-19.719
-					L 62.082,276.949c 32.109,12.107, 59.773,18.005, 85.259,18.005C 147.364,294.954, 147.409,294.954, 147.409,294.954z M 509.669,379.509
-					c-29.14-11.313-57.575-17.076-84.735-17.076c-45.426,0.00-78.922,15.756-100.623,30.899l-45.556-157.67
-					c 30.592-19.672, 63.561-29.666, 98.158-29.666c 28.215,0.00, 57.442,6.776, 86.933,20.158l-0.091,1.102l 1.851,0.438L 509.669,379.509z" />
-<glyph unicode="&#xe006;" d="M 497.573,54.108L 268.433,440.634c-2.945,5.237-8.634,8.138-14.595,7.183c-4.403-0.699-8.153-3.409-10.269-7.183
-							L 14.429,54.108c-2.514-4.467-2.518-10.199,0.00-14.646c 2.553-4.506, 7.277-7.46, 12.423-7.46l 458.294,0.00 
-							c 5.135,0.00, 9.876,2.954, 12.428,7.46C 500.087,43.909, 500.087,49.642, 497.573,54.108z M 61.171,64.149L 256.00,395.105
-							l 194.557-330.956L 61.171,64.149 zM 257.251,138.854c-13.655,0.00-24.724-11.319-24.724-25.289c0.00-13.971, 11.068-25.29, 24.724-25.29
-							s 24.724,11.319, 24.724,25.29C 281.975,127.535, 270.906,138.854, 257.251,138.854zM 239.835,160.002L 272.693,160.002L 279.811,319.998L 232.729,319.998 						z" />
-<glyph unicode="&#xe007;" d="M 428.26,271.336c-17.425,0.00-164.791,0.00-164.791,0.00s 12.625,48.421, 17.183,81.404
-											c 4.653,33.547-5.064,60.663-5.064,60.663s-16.546,42.303-21.052,44.116c-27.224,10.979-41.333-4.307-41.333-4.307
-											s0.00-62.789,0.00-71.317c0.00-7.919-1.445-13.601-1.445-13.601s-68.23-106.349-76.179-114.113
-											c-7.955-7.778-39.428-22.117-39.428-22.117s0.00-175.948,0.00-192.961c 1.949-3.057, 33.037,1.104, 33.831-5.85
-											c 0.788-6.943, 35.429-33.252, 35.429-33.252s 163.579,0.00, 181.953,0.00s 49.90,8.939, 54.987,20.781
-											c 8.712,20.289-2.082,33.68-1.728,39.291c 0.357,5.609, 27.639,9.498, 27.639,33.52c 3.612,29.285-14.391,27.271-13.421,34.07
-											c 0.98,6.801, 22.257,9.203, 26.379,24.717c 3.155,11.947, 5.866,34.635-12.967,44.708
-											C 490.329,218.555, 458.143,271.336, 428.26,271.336z" />
-<glyph unicode="&#xe008;" d="M 428.26,250.91c 18.83,10.072, 16.122,32.761, 12.968,44.708c-4.123,15.515-25.402,17.917-26.38,24.717
-											c-0.973,6.799, 17.033,4.783, 13.421,34.069c0.00,24.023-27.281,27.912-27.636,33.521c-0.354,5.609, 10.437,19.003, 1.725,39.29
-											c-5.087,11.844-36.612,20.782-54.987,20.782c-18.374,0.00-181.953,0.00-181.953,0.00s-34.638-26.308-35.429-33.25
-											c-0.794-6.955-31.882-2.792-33.831-5.85c0.00-17.015,0.00-192.964,0.00-192.964s 31.474-14.338, 39.428-22.117
-											c 7.948-7.764, 76.183-114.111, 76.183-114.111s 1.441-5.684, 1.441-13.60c0.00-8.529,0.00-71.318,0.00-71.318
-											s 14.109-15.285, 41.333-4.309c 4.508,1.814, 21.053,44.117, 21.053,44.117s 9.718,27.115, 5.067,60.66
-											c-4.559,32.984-17.187,81.404-17.187,81.404s 147.366,0.00, 164.792,0.00C 458.143,176.662, 490.329,229.444, 428.26,250.91z" />
-<glyph unicode="&#xe009;" d="M 479.194,328.27c-25.192-141.915-165.958-262.095-208.297-289.552c-42.348-27.455-80.973,10.994-94.983,40.054
-					c-16.035,33.166-64.104,212.868-76.683,227.765c-12.585,14.866-50.354-14.896-50.354-14.896L 30.56,315.658
-					c0.00,0.00, 76.695,91.58, 135.047,103.026c 61.872,12.141, 61.781-95.006, 76.663-154.485c 14.389-57.542, 24.063-90.471, 36.626-90.471
-					c 12.591,0.00, 36.636,32.096, 62.947,81.286c 26.363,49.242-1.139,92.74-52.649,61.791C 309.804,440.436, 504.375,470.161, 479.194,328.27z" />
-<glyph unicode="&#xe00a;" d="M 352.264,277.059l0.00-106.112 L 480.00,95.498L 480.00,351.497 L 352.264,277.059z M 299.569,351.497L 53.988,351.497 
-										c-11.77,0.00-21.313-9.542-21.313-21.313l0.00-212.869 c0.00-11.771, 9.543-21.313, 21.313-21.313l 245.581,0.00 
-										c 11.771,0.00, 21.31,9.537, 21.31,21.313L 320.879,330.184 C 320.876,341.955, 311.341,351.497, 299.569,351.497" />
-<glyph unicode="&#xe00b;" d="M 412.316,125.949c-20.918,8.813-76.904,30.871-82.859,32.495c-7.107,4.888-14.07,21.151-17.877,29.236
-				c-3.789,0.544-7.574,1.087-11.377,1.624c 0.586,12.514, 8.334,13.182, 11.377,22.742c 2.676,8.432, 0.279,19.387, 4.527,27.197
-				c 2.945,5.422, 9.617,5.457, 12.949,10.104c 3.02,4.216, 5.016,11.567, 5.955,16.732c 1.715,9.441, 3.217,22.354-1.268,31.716
-				c-2.57,5.38-4.199,5.897-4.918,12.426c-0.867,7.914, 2.332,33.72, 2.467,39.30c 0.326,14.477-0.025,15.654-3.527,29.754
-				c0.00,0.00-4.254,12.773-10.924,16.631L 303.547,398.20l-8.217,7.615c-33.106,20.365-68.602,6.081-87.613-1.623
-				c-27.389-8.893-44.709-35.711-32.618-93.018c 2.063-9.789-5.361-14.164-4.877-19.502c 1.062-11.678, 1.287-39.758, 12.322-46.672
-				c 1.024-0.642, 8.854-2.605, 8.803-2.068c 1.085-11.375, 2.167-22.754, 3.247-34.125c 2.756-7.553, 9.366-8.383, 11.288-19.063
-				l-8.459-2.063c-3.802-8.085-10.771-24.341-17.876-29.236c-5.955-1.624-61.941-23.683-82.861-32.495
-				c-19.05-8.036-34.543-21.347-34.543-47.359c0.00-26.015-0.388-29.216-0.058-45.959l 384.914-0.918
-				c0.00,17.815, 0.059,33.315, 0.059,46.877C 447.057,102.137, 431.367,117.913, 412.316,125.949zM 493.723,177.562c-11.002,4.635-40.446,16.237-43.581,17.091c-3.737,2.57-7.399,11.124-9.401,15.376
-				c-1.993,0.286-3.983,0.572-5.983,0.854c 0.307,6.581, 4.383,6.934, 5.983,11.961c 1.407,4.434, 0.147,10.197, 2.382,14.305
-				c 1.55,2.852, 5.058,2.87, 6.812,5.314c 1.587,2.218, 2.638,6.084, 3.131,8.80c 0.901,4.966, 1.691,11.758-0.667,16.682
-				c-1.353,2.829-2.208,3.101-2.585,6.535c-0.459,4.163, 1.225,17.735, 1.297,20.67c 0.171,7.615-0.013,8.233-1.856,15.649
-				c0.00,0.00-2.236,6.718-5.746,8.748l-6.99,1.206l-4.322,4.005c-17.412,10.711-36.081,3.198-46.081-0.854
-				c-14.404-4.677-23.515-18.782-17.154-48.923c 1.085-5.148-2.82-7.45-2.566-10.257c 0.559-6.143, 0.676-20.912, 6.481-24.548
-				c 0.538-0.337, 4.655-1.37, 4.629-1.087c 0.571-5.983, 1.14-11.967, 1.708-17.947c 1.449-3.973, 4.927-4.409, 5.938-10.027l-4.448-1.085
-				c-2.00-4.252-5.665-12.802-9.402-15.376c-1.837-0.501-12.729-4.70-23.643-9.022c-2.173-0.861, 2.669-8.846, 14.237-12.501
-				c 40.043-12.647, 94.992-44.956, 94.992-44.956l 55.079-0.176c0.00,9.37, 0.032,17.522, 0.032,24.655
-				C 511.996,165.037, 503.744,173.335, 493.723,177.562zM 18.275,177.562c 11.002,4.635, 40.447,16.237, 43.581,17.091c 3.738,2.57, 7.40,11.124, 9.402,15.376
-				c 1.993,0.286, 3.983,0.572, 5.983,0.854c-0.307,6.581-4.383,6.934-5.983,11.961c-1.407,4.434-0.147,10.197-2.382,14.305
-				c-1.549,2.852-5.058,2.87-6.811,5.314c-1.588,2.218-2.639,6.084-3.132,8.80c-0.902,4.966-1.691,11.758, 0.667,16.682
-				c 1.353,2.829, 2.209,3.101, 2.586,6.535c 0.458,4.163-1.227,17.735-1.297,20.67c-0.171,7.615, 0.013,8.233, 1.856,15.649
-				c0.00,0.00, 2.237,6.718, 5.746,8.748l 6.992,1.206l 4.321,4.005c 17.413,10.711, 36.082,3.198, 46.081-0.854
-				c 14.405-4.677, 23.515-18.782, 17.155-48.923c-1.085-5.148, 2.82-7.45, 2.565-10.257c-0.559-6.143-0.676-20.912-6.48-24.548
-				c-0.539-0.337-4.657-1.37-4.63-1.087c-0.571-5.983-1.141-11.967-1.708-17.947c-1.449-3.973-4.926-4.409-5.937-10.027l 4.449-1.085
-				c 2.00-4.252, 5.665-12.802, 9.402-15.376c 1.837-0.501, 12.729-4.70, 23.642-9.022c 2.174-0.861-2.667-8.846-14.237-12.501
-				c-40.042-12.647-94.991-44.956-94.991-44.956l-55.081-0.176c0.00,9.37-0.031,17.522-0.031,24.655
-				C 0.002,165.037, 8.254,173.335, 18.275,177.562z" />
-<glyph unicode="&#xe00c;" d="M 461.996,351.998L 273.498,351.998 L 238.50,351.998 L 50.002,351.998 c-9.941,0.00-18.00-8.059-18.00-18.00l0.00-251.996 c0.00-9.941, 8.059-18.00, 18.00-18.00c0.00,0.00, 60.537,0.00, 67.082,0.00
-					s 10.918,4.455, 10.918,10.824c0.00,4.139,0.00,8.244,0.00,10.467c0.00,5.588-4.325,10.721-9.813,10.721c-3.684,0.00-7.893,0.00-11.67,0.00
-					c-6.102,0.00-10.514,4.307-10.514,10.203c0.00,4.529,0.00,5.345,0.00,11.125s 3.349,10.66, 10.514,10.66c 3.366,0.00, 17.463,0.00, 33.267,0.00
-					c 2.776,0.00, 5.604,0.00, 8.437,0.00c 15.804,0.00, 29.90,0.00, 33.267,0.00c 7.165,0.00, 10.514-4.88, 10.514-10.66s0.00-6.596,0.00-11.125
-					c0.00-5.896-4.412-10.203-10.514-10.203c-3.777,0.00-7.986,0.00-11.67,0.00c-5.488,0.00-9.813-5.133-9.813-10.721c0.00-2.119,0.00-5.949,0.00-9.889
-					c0.00-4.417, 3.161-11.402, 9.888-11.402c 2.066,0.00, 30.587,0.00, 69.107,0.00c 11.868,0.00, 23.317,0.00, 33.999,0.00c 38.52,0.00, 67.04,0.00, 69.106,0.00
-					c 6.727,0.00, 9.888,6.985, 9.888,11.402c0.00,3.939,0.00,7.77,0.00,9.889c0.00,5.588-4.325,10.721-9.813,10.721c-3.684,0.00-7.893,0.00-11.67,0.00
-					c-6.102,0.00-10.514,4.307-10.514,10.203c0.00,4.529,0.00,5.345,0.00,11.125s 3.349,10.66, 10.514,10.66c 3.366,0.00, 17.463,0.00, 33.267,0.00
-					c 2.833,0.00, 5.66,0.00, 8.437,0.00c 15.804,0.00, 29.90,0.00, 33.267,0.00c 7.165,0.00, 10.514-4.88, 10.514-10.66s0.00-6.596,0.00-11.125
-					c0.00-5.896-4.412-10.203-10.514-10.203c-3.777,0.00-7.986,0.00-11.67,0.00c-5.488,0.00-9.813-5.133-9.813-10.721c0.00-2.223,0.00-6.328,0.00-10.467
-					c0.00-6.369, 4.373-10.824, 10.918-10.824s 67.082,0.00, 67.082,0.00c 9.941,0.00, 18.00,8.059, 18.00,18.00L 480.00,333.998 
-					C 479.996,343.938, 471.938,351.998, 461.996,351.998z M 222.797,160.861l-7.598,0.00 c 0.001,6.537, 0.022,12.242, 0.022,17.241
-					c0.00,8.832-5.885,14.749-13.03,17.763c-7.848,3.307-28.846,11.579-31.08,12.188c-2.667,1.834-5.28,7.935-6.706,10.968
-					c-1.421,0.203-2.84,0.407-4.267,0.607c 0.219,4.693, 3.126,4.947, 4.267,8.532c 1.003,3.162, 0.104,7.271, 1.698,10.20
-					c 1.105,2.035, 3.607,2.048, 4.858,3.791c 1.131,1.582, 1.881,4.339, 2.232,6.277c 0.645,3.541, 1.208,8.384-0.474,11.896
-					c-0.965,2.017-1.576,2.211-1.846,4.66c-0.325,2.97, 0.875,12.648, 0.926,14.742c 0.122,5.431-0.01,5.872-1.323,11.16
-					c0.00,0.00-1.596,4.792-4.098,6.238l-4.986,0.86l-3.082,2.856c-12.417,7.638-25.731,2.281-32.863-0.608
-					c-10.272-3.336-16.77-13.396-12.234-34.89c 0.774-3.672-2.011-5.313-1.829-7.315c 0.397-4.38, 0.482-14.913, 4.622-17.506
-					c 0.383-0.24, 3.32-0.977, 3.301-0.776c 0.407-4.266, 0.813-8.535, 1.219-12.799c 1.033-2.833, 3.513-3.144, 4.233-7.149l-3.172-0.774
-					c-1.427-3.033-4.041-9.13-6.706-10.968c-2.233-0.608-23.233-8.881-31.08-12.188c-7.145-3.014-12.956-8.007-12.956-17.763
-					c0.00-9.759-0.145-10.958-0.022-17.239l 0.818-0.002l-7.482,0.00 L 64.159,319.50 l 158.638,0.00 L 222.797,160.861 z M 447.996,192.002L 256.002,192.002 l0.00,20.896 l 191.994,0.00 
-					L 447.996,192.002 z M 447.996,234.831L 256.002,234.831 l0.00,20.896 l 191.994,0.00 L 447.996,234.831 z M 447.996,288.409L 256.002,288.409 L 256.002,319.50 l 191.994,0.00 L 447.996,288.409 z" />
-<glyph unicode="&#xe00d;" d="M 341.438,405.093c 4.086-16.444, 4.494-17.816, 4.115-34.70c-0.157-6.507-3.89-36.603-2.878-45.832
-										c 0.838-7.614, 2.737-8.217, 5.736-14.491c 5.229-10.918, 3.478-25.977, 1.478-36.987c-1.095-6.023-3.424-14.597-6.944-19.514
-										c-3.886-5.418-11.666-5.459-15.102-11.782c-4.955-9.108-2.16-21.884-5.28-31.717
-										c-3.549-11.149-12.585-11.928-13.267-26.521c 4.435-0.626, 8.848-1.26, 13.267-1.895c 4.439-9.428, 12.56-28.395, 20.848-34.095
-										c 6.946-1.894, 72.235-27.618, 96.632-37.896c 22.216-9.371, 40.514-27.77, 40.514-55.229c0.00-15.816-0.068-33.892-0.068-54.668
-										l-448.883,1.07c-0.385,19.526, 0.067,23.259, 0.067,53.598c0.00,30.335, 18.068,45.858, 40.284,55.229
-										c 24.396,10.277, 89.688,36.002, 96.632,37.896c 8.287,5.709, 16.414,24.667, 20.848,34.095l 9.865,2.406
-										c-2.241,12.455-9.95,13.424-13.164,22.231c-1.259,13.261-2.521,26.53-3.787,39.795c 0.059-0.626-9.072,1.665-10.267,2.413
-										c-12.869,8.063-13.131,40.81-14.369,54.429c-0.565,6.225, 8.094,11.327, 5.688,22.743
-										C 149.30,392.502, 169.50,423.777, 201.44,434.148c 22.171,8.984, 63.565,25.642, 102.174,1.893l 9.581-8.88l 15.504-2.673
-										C 336.478,419.988, 341.438,405.093, 341.438,405.093" />
-<glyph unicode="&#xe00e;" d="M 388.92,302.163c-7.027,0.00-13.911-0.609-20.617-1.732c-16.737,54.689-68.557,94.554-129.936,94.554
-									c-74.919,0.00-135.636-59.366-135.636-132.605c0.00-6.534, 0.51-12.956, 1.446-19.247c-3.597,0.413-7.228,0.692-10.935,0.692
-									c-50.938,0.00-92.237-40.385-92.237-90.168c0.00-49.81, 41.299-90.174, 92.237-90.174l 130.76,0.00 l0.00,64.52 l-56.678,0.00 l 89.248,117.308
-									l 89.245-117.308L 288.00,128.003 l0.00-64.519 l 100.921,0.00 c 67.425,0.00, 122.069,53.43, 122.069,119.339
-									C 510.992,248.735, 456.348,302.163, 388.92,302.163z" />
-<glyph unicode="&#xe00f;" d="M 384.00,256.00L 256.00,384.00L 128.00,256.00L 384.00,256.00 z M 128.00,160.00l 128.00-128.00l 128.00,128.00L 128.00,160.00 z" />
-<glyph unicode="&#xe010;" d="M 202.56,278.828l-55.689,55.691c 28.066,27.734, 66.521,44.819, 109.13,44.819
-										c 42.994-0.015, 81.616-17.334, 109.84-45.497c 28.158-28.218, 45.479-66.842, 45.492-109.847l 67.541,0.00 
-										C 478.85,347.104, 379.10,446.855, 255.998,446.88c-61.131,0.00-116.631-24.702-156.896-64.598L 47.707,433.679l 0.003-154.851L 202.56,278.828 z
-										M 366.408,114.775c-28.175-28.492-67.166-46.114-110.409-46.105c-43.007,0.008-81.625,17.331-109.841,45.492
-										c-28.173,28.214-45.483,66.832-45.50,109.832L 33.126,223.994 c 0.018-123.10, 99.767-222.846, 222.873-222.874
-										c 61.783,0.008, 117.812,25.24, 158.173,65.894l 50.007-50.011L 464.179,168.10 L 313.086,168.10 L 366.408,114.775z" />
-<glyph unicode="&#xe011;" d="M 402.127,223.999l-38.709,0.00 L 199.585,223.999 l-0.003,72.491c0.00,28.30-10.741,54.276-28.521,73.284
-									c-17.706,19.012-43.014,31.258-70.917,31.235c-27.905,0.022-53.211-12.224-70.917-31.235
-									c-17.785-19.008-28.521-44.985-28.522-73.285l0.00-73.395 l 51.881,0.00 l0.00,11.458 L 22.26,264.875l 30.322,0.00 l0.00,31.613 
-									c0.00,15.106, 5.712,28.409, 14.524,37.845c 8.897,9.432, 20.351,14.772, 33.035,14.793c 12.688-0.021, 24.13-5.361, 33.027-14.793
-									c 8.823-9.436, 15.436-22.738, 15.432-37.845l0.00-72.49 l-0.021,0.00 l-38.708,0.00 c-7.66,0.00-13.869-6.206-13.869-13.865l0.00-164.199 
-									c0.00-7.66, 6.209-13.869, 13.869-13.869l 292.255,0.00 c 7.665,0.00, 13.869,6.209, 13.869,13.869L 415.995,210.132 
-									C 415.996,217.793, 409.792,223.999, 402.127,223.999z" />
-<glyph unicode="&#xe012;" d="M 224.00,92.186L 224.00-32.00 L 32.00,160.00l 192.00,192.00l0.00-126.912 C 447.375,219.848, 437.794,376.984, 380.931,480.00
-					C 521.285,328.293, 491.48,85.215, 224.00,92.186z" />
-<glyph unicode="&#xe013;" d="M 79.536,313.536c 26.688,0.00, 48.317,21.619, 48.317,48.307c0.00,26.688-21.633,48.308-48.317,48.308
-											c-26.688,0.00-48.321-21.621-48.321-48.308C 31.215,335.156, 52.849,313.536, 79.536,313.536z M 80.632,273.397
-											c-26.688,0.00-48.321-21.633-48.321-48.307c0.00-26.688, 21.634-48.32, 48.321-48.32c 26.661,0.00, 48.294,21.633, 48.294,48.32
-											C 128.927,251.764, 107.293,273.397, 80.632,273.397z M 79.536,134.49c-26.688,0.00-48.321-21.633-48.321-48.32
-											s 21.634-48.321, 48.321-48.321c 26.687,0.00, 48.317,21.636, 48.317,48.321C 127.856,112.857, 106.224,134.49, 79.536,134.49z
-											 M 479.93,401.18L 179.733,401.18 l0.00-82.189 L 479.93,318.991 L 479.93,401.18 z M 179.733,44.587l 301.051,0.00 l0.00,83.06 L 179.733,127.647 L 179.733,44.587 z M 179.733,264.546l0.00-83.045 
-											l 301.051,0.00 l0.00,83.045 L 179.733,264.546 z" />
-<glyph unicode="&#xe014;" d="M 512.00,382.791c-18.839-8.354-39.082-14.001-60.33-16.54c 21.686,13.00, 38.343,33.585, 46.186,58.115
-					c-20.298-12.039-42.778-20.78-66.705-25.49c-19.16,20.415-46.461,33.17-76.673,33.17c-58.011,0.00-105.044-47.029-105.044-105.039
-					c0.00-8.233, 0.929-16.25, 2.72-23.939c-87.30,4.382-164.70,46.20-216.509,109.753c-9.042-15.514-14.223-33.558-14.223-52.809
-					c0.00-36.444, 18.544-68.596, 46.729-87.433c-17.219,0.546-33.416,5.271-47.576,13.139c-0.011-0.438-0.011-0.878-0.011-1.321
-					c0.00-50.894, 36.209-93.348, 84.262-103.00c-8.813-2.399-18.095-3.686-27.675-3.686c-6.769,0.00-13.349,0.66-19.764,1.886
-					c 13.368-41.729, 52.16-72.103, 98.126-72.948c-35.95-28.174-81.243-44.967-130.458-44.967c-8.479,0.00-16.84,0.497-25.058,1.471
-					c 46.485-29.806, 101.701-47.197, 161.021-47.197c 193.211,0.00, 298.868,160.063, 298.868,298.872c0.00,4.554-0.104,9.084-0.305,13.59
-					C 480.109,343.227, 497.918,361.727, 512.00,382.791z" />
-<glyph unicode="&#xe016;" d="M 442.164,448.415l-141.789-0.003L 34.382,183.809l 183.987-183.992l 261.465,261.466L 479.834,410.746 L 442.164,448.415z
-										 M 431.832,346.733c-14.828-14.833-38.88-14.833-53.709,0.00c-14.834,14.827-14.834,38.876,0.00,53.707
-										c 14.826,14.839, 38.881,14.839, 53.709,0.004C 446.664,385.61, 446.665,361.559, 431.832,346.733" />
-<glyph unicode="&#xe017;" d="M 63.50,416.50l 385.00,0.00 l0.00-385.00 l-385.00,0.00 L 63.50,416.50 z" />
-<glyph unicode="&#xe018;" d="M 256.004,377.987l 47.684-99.429c 4.326-9.021, 12.865-15.292, 22.768-16.721l 91.258-13.162l-64.933-67.069
-						c-6.173-6.376-9.206-15.158-8.284-23.984l 10.294-98.526l-82.57,52.256c-4.80,3.038-10.363,4.65-16.044,4.65l-0.304,0.00 
-						L 256.004,377.987 M 256.006,447.361L 181.263,291.53L 31.897,271.076l 105.769-110.336l-16.769-159.911l 134.975,85.174
-						c 0.11,0.00, 0.177,0.00, 0.304,0.00l 134.885-85.363l-16.727,160.101l 105.769,109.248L 330.737,291.53L 256.006,447.361L 256.006,447.361z" />
-<glyph unicode="&#xe019;" d="M 256.004,377.987l 47.684-99.429c 4.326-9.021, 12.865-15.292, 22.768-16.721l 91.258-13.162l-64.933-67.069
-						c-6.173-6.376-9.206-15.158-8.284-23.984l 10.294-98.526l-82.57,52.256c-4.80,3.038-10.363,4.65-16.044,4.65l-0.304,0.00 
-						c-5.667,0.00-11.218-1.605-16.01-4.629l-82.68-52.174l 10.32,98.411c 0.92,8.778-2.072,17.518-8.18,23.889L 94.29,249.34
-						l 91.043,12.468c 9.987,1.368, 18.62,7.66, 22.979,16.749L 256.004,377.987 M 256.006,447.361L 181.263,291.53L 31.897,271.076
-						l 105.769-110.336l-16.769-159.911l 134.975,85.174c 0.11,0.00, 0.177,0.00, 0.304,0.00l 134.885-85.363l-16.727,160.101l 105.769,109.248
-						L 330.737,291.53L 256.006,447.361L 256.006,447.361z" />
-<glyph unicode="&#xe01a;" d="M 391.061,0.639l-16.727,160.101l 105.769,109.248L 330.737,291.53L 256.006,447.361L 181.263,291.53L 31.897,271.076
-						l 105.769-110.336l-16.769-159.911l 134.975,85.174c 0.11,0.00, 0.177,0.00, 0.304,0.00L 391.061,0.639z" />
-<glyph unicode="&#xe01b;" d="M 32.005,64.994L 96.50,64.994L 96.50,0.496L 32.005,0.496zM 32.005,160.745L 192.024,160.745L 192.024,96.248L 32.005,96.248zM 32.005,256.496L 288.00,256.496L 288.00,191.998L 32.005,191.998zM 32.005,352.247L 383.996,352.247L 383.996,287.75L 32.005,287.75zM 32.005,447.998L 479.996,447.998L 479.996,383.501L 32.005,383.501z" />
-<glyph unicode="&#xe01c;" d="M 32.005,447.998L 96.50,447.998L 96.50,383.50L 32.005,383.50zM 32.005,352.247L 192.024,352.247L 192.024,287.749L 32.005,287.749zM 32.005,256.496L 288.00,256.496L 288.00,191.998L 32.005,191.998zM 32.005,160.744L 383.996,160.744L 383.996,96.247L 32.005,96.247zM 32.005,64.993L 479.996,64.993L 479.996,0.496L 32.005,0.496z" />
-<glyph unicode="&#xe01d;" d="M 160.187,61.865c-16.125,0.00-29.188-13.065-29.188-29.19c0.00-16.127, 13.063-29.188, 29.188-29.188
-											c 16.113,0.00, 29.188,13.062, 29.188,29.188C 189.372,48.80, 176.30,61.865, 160.187,61.865z M 255.917,61.865
-											c-16.126,0.00-29.19-13.065-29.19-29.19c0.00-16.127, 13.064-29.188, 29.19-29.188c 16.108,0.00, 29.179,13.062, 29.179,29.188
-											C 285.096,48.80, 272.028,61.865, 255.917,61.865z M 255.909,13.776c-10.436,0.00-18.894,8.459-18.894,18.891
-											c0.00,10.447, 8.458,18.905, 18.894,18.905c 10.435,0.00, 18.892-8.458, 18.892-18.905
-											C 274.801,22.235, 266.344,13.776, 255.909,13.776z M 32.479,416.00l0.00-320.00 l 449.247,0.00 L 481.726,416.00 L 32.479,416.00 z M 441.835,136.352L 73.713,136.352 
-											l-0.021,238.021l 366.813,0.00 l0.00-0.012 l 1.329,0.00 L 441.835,136.352L 441.835,136.352z M 351.763,61.865
-											c-16.126,0.00-29.188-13.065-29.188-29.19c0.00-16.127, 13.063-29.188, 29.188-29.188c 16.112,0.00, 29.183,13.062, 29.183,29.188
-											C 380.94,48.80, 367.875,61.865, 351.763,61.865z M 351.755,13.776c-10.436,0.00-18.894,8.459-18.894,18.891
-											c0.00,10.447, 8.458,18.905, 18.894,18.905c 10.438,0.00, 18.896-8.458, 18.896-18.905
-											C 370.646,22.235, 362.188,13.776, 351.755,13.776z" />
-<glyph unicode="&#xe01f;" d="M 470.70,72.193l-2.688,2.688l 0.006,0.002L 360.505,182.408c 14.938,25.732, 23.612,55.564, 23.816,87.451
-									c 0.626,97.615-77.986,177.243-175.599,177.857c-0.394,0.001-0.771,0.002-1.168,0.002
-									c-97.06-0.006-176.063-78.391-176.688-175.598c-0.618-97.609, 77.999-177.236, 175.597-177.859
-									c 0.389-0.002, 0.766-0.004, 1.155-0.004c 32.438,0.00, 62.846,8.79, 88.998,24.075l 107.415-107.433l 0.014,0.01l 2.688-2.688
-									c 8.125-8.123, 21.293-8.114, 29.41,0.00l 34.562,34.557C 478.819,50.895, 478.822,64.07, 470.70,72.193z M 300.39,177.58
-									c-24.834-24.67-57.78-38.252-92.768-38.252l-0.874,0.00 c-72.589,0.467-131.271,59.908-130.813,132.503
-									c 0.465,72.128, 59.516,130.811, 131.626,130.815l 0.879-0.002c 35.168-0.22, 68.146-14.123, 92.852-39.148
-									c 24.706-25.025, 38.188-58.178, 37.966-93.352C 339.031,235.128, 325.229,202.25, 300.39,177.58z" />
-<glyph unicode="&#xe020;" d="M 33.736,60.543A60.868,61.532 540.00 1 0 155.472,60.543000000000006A60.868,61.532 540.00 1 0 33.736,60.543000000000006zM 327.928-0.988l-86.229,0.00 c0.00,116.114-93.109,210.243-207.963,210.243l0.00,0.00l0.00,87.168 
-						C 196.222,296.423, 327.928,163.273, 327.928-0.988zM 388.798-0.988c0.00,198.244-158.96,358.949-355.062,358.949L 33.736,447.697 c 245.118,0.00, 443.826-200.885, 443.826-448.686L 388.798-0.989 
-						z" />
-<glyph unicode="&#xe021;" d="M 32.005,447.998L 479.996,447.998L 479.996,383.50L 32.005,383.50zM 32.005,352.247L 479.996,352.247L 479.996,287.749L 32.005,287.749zM 32.005,256.496L 479.996,256.496L 479.996,191.998L 32.005,191.998zM 32.005,160.744L 479.996,160.744L 479.996,96.247L 32.005,96.247zM 32.005,64.993L 479.996,64.993L 479.996,0.496L 32.005,0.496z" />
-<glyph unicode="&#xe022;" d="M 224.01,351.904l-67.942,0.00 L 256.012,472.979L 355.937,351.90l-67.932,0.00 l-0.001-255.803l 67.932,0.00 L 255.99-24.979
-										l-99.927,121.076l 67.943,0.00 L 224.01,351.904z" />
-<glyph unicode="&#xe023;" d="M 383.904,255.996l0.00,67.942 l 121.074-99.944L 383.90,124.069l0.00,67.932 l-255.803,0.001l0.00-67.932 L 7.022,224.016
-										l 121.076,99.926l0.00-67.943 L 383.904,255.996z" />
-<glyph unicode="&#xe024;" d="M 288.00,355.814L 288.00,480.00 l 192.00-192.00L 288.00,96.00L 288.00,222.912 C 64.625,228.153, 74.206,71.016, 131.069-32.00
-					C-9.286,119.707, 20.52,362.785, 288.00,355.814z" />
-<glyph unicode="&#xe025;" d="M 346.842,54.611c 21.076,11.557, 39.271,26.125, 54.399,43.698c 15.199,17.575, 26.912,37.946, 35.285,61.009
-									c 7.671,21.094, 11.471,40.729, 11.471,64.424c0.00,2.285-0.105,192.828-0.105,192.828L 256.00,416.57 l0.00-192.018 l 93.728,0.00 
-									c-0.599-26.107-5.876-45.195-15.728-63.121c-10.163-18.525-29.167-32.827-58.054-42.75l-3.201-1.092l0.00-85.777 l 5.313,0.703
-									C 302.758,35.683, 325.696,43.07, 346.842,54.611M 51.917,118.301l-3.171-1.092l0.00-85.779 l 5.316,0.704c 24.666,3.168, 47.64,10.556, 68.791,22.097
-									c 21.074,11.557, 39.229,26.125, 54.392,43.698c 15.206,17.575, 26.949,37.947, 35.288,61.01
-									c 7.67,21.093, 11.469,40.728, 11.469,64.424c0.00,2.284-0.076,192.825-0.076,192.825L 32.005,416.188 l0.00-192.017 l 93.729,0.00 
-									c-0.563-26.107-5.872-45.194-15.724-63.122C 99.839,142.525, 80.804,128.223, 51.917,118.301" />
-<glyph unicode="&#xe026;" d="M 133.16,393.389c-21.076-11.557-39.271-26.125-54.399-43.698c-15.199-17.575-26.912-37.947-35.285-61.009
-									c-7.671-21.094-11.471-40.728-11.471-64.423c0.00-2.285, 0.105-192.828, 0.105-192.828l 191.892,0.00 L 224.002,223.447 l-93.728,0.00 
-									c 0.599,26.107, 5.876,45.195, 15.728,63.122c 10.163,18.524, 29.167,32.827, 58.054,42.75l 3.201,1.091L 207.257,416.188 l-5.313-0.704
-									C 177.244,412.317, 154.306,404.929, 133.16,393.389M 428.085,329.699l 3.171,1.091L 431.256,416.57 l-5.316-0.704c-24.666-3.168-47.64-10.555-68.791-22.097
-									c-21.074-11.557-39.229-26.125-54.392-43.698c-15.206-17.576-26.949-37.947-35.288-61.01
-									C 259.799,267.968, 256.00,248.334, 256.00,224.638c0.00-2.284, 0.076-192.825, 0.076-192.825l 191.921,0.00 L 447.997,223.829 l-93.729,0.00 
-									c 0.563,26.107, 5.872,45.195, 15.724,63.122C 380.163,305.475, 399.198,319.777, 428.085,329.699" />
-<glyph unicode="&#xe027;" d="M 461.998,287.998l-44.865,0.00 l0.00,74.991 l-85.277,85.21L 96.004,448.199 l0.00-160.201 l-46.00,0.00 c-9.941,0.00-18.00-8.059-18.00-18.00l0.00-187.996 
-						c0.00-9.941, 8.059-18.00, 18.00-18.00l 46.00,0.00 l0.00-64.50 l 321.128,0.00 l0.00,64.50 l 44.865,0.00 c 9.941,0.00, 18.00,8.059, 18.00,18.00L 479.997,269.998 
-						C 479.998,279.938, 471.939,287.998, 461.998,287.998z M 96.004,97.50L 64.255,97.50 l0.00,93.654 l0.00,0.848 l 31.749,0.00 L 96.004,97.50 z M 319.37,415.375
-						l 64.453-63.377L 319.37,351.998 L 319.37,415.375 z M 383.998,32.002L 128.004,32.002 l0.00,160.00 l 255.994,0.00 L 383.998,32.002 z M 383.998,287.998L 128.004,287.998 l0.00,128.00 l 159.998,0.00 l0.00-96.00 
-						l 95.996,0.00 L 383.998,287.998 z M 448.298,97.50l-31.165,0.00 l0.00,94.502 l 30.118,0.00 l 1.047,0.00 L 448.298,97.50 zM 160.127,96.002L 351.50,96.002L 351.50,62.629L 160.127,62.629zM 160.127,161.437L 351.50,161.437L 351.50,128.064L 160.127,128.064z" />
-<glyph unicode="&#xe028;" d="M 427.182,320.352L 325.629,320.352 c 6.396,3.992, 12.695,8.69, 18.575,14.393c 30.401,29.163, 39.269,69.303, 19.804,89.555
-				c-7.468,7.76-17.991,11.484-29.858,11.484c-19.118,0.00-41.686-9.681-60.437-27.676c-7.679-7.383-13.959-15.469-18.775-23.762
-				c-4.834,8.293-11.11,16.378-18.793,23.762c-18.751,18.001-41.301,27.676-60.419,27.676c-11.881,0.00-22.435-3.724-29.903-11.484
-				c-19.458-20.252-10.587-60.392, 19.814-89.555c 5.896-5.703, 12.166-10.401, 18.606-14.393L 84.818,320.352 L 64.002,320.352 l0.00-98.164 l 32.00,0.00 l0.00-222.048 l 319.994,0.00 
-				L 415.996,222.188 l 32.00,0.00 l0.00,98.164 L 427.182,320.352 z M 272.212,353.958c 2.513,11.443, 10.075,23.888, 20.734,34.136
-				c 15.289,14.705, 31.298,19.919, 41.21,19.919c 2.606,0.00, 7.359-0.37, 9.83-2.943c 2.662-2.773, 3.327-8.961, 1.711-16.206
-				c-2.525-11.47-10.088-23.908-20.733-34.146c-15.303-14.691-31.298-19.905-41.196-19.905c-2.607,0.00-7.359,0.383-9.845,2.943
-				C 271.248,340.529, 270.61,346.714, 272.212,353.958z M 275.77,316.343l0.00-92.344 l-41.668,0.00 l0.00,92.344 L 275.77,316.343 z M 164.137,388.864
-				c-1.599,7.244-0.954,13.432, 1.71,16.206c 2.481,2.573, 7.22,2.943, 9.872,2.943c 9.885,0.00, 25.894-5.214, 41.183-19.933
-				c 10.659-10.241, 18.208-22.686, 20.73-34.122c 1.599-7.244, 0.954-13.429-1.724-16.202c-2.469-2.56-7.238-2.943-9.845-2.943
-				c-9.892,0.00-25.867,5.214-41.183,19.905C 174.235,364.957, 166.672,377.394, 164.137,388.864z M 411.896,128.002L 275.77,128.002 l0.00-124.127 l-41.668,0.00 
-				L 234.102,128.002 L 100.935,128.002 l0.00,32.165 l 133.167,0.00 l0.00,46.00 l 41.668,0.00 l0.00-46.00 l 136.126,0.00 L 411.896,128.002 z" />
-<glyph unicode="&#xe029;" d="M 255.982,360.004L 418.982,128.01L 93.018,128.002 					z" />
-<glyph unicode="&#xe02a;" d="M 392.004,223.983L 160.01,386.982L 160.002,61.018 					z" />
-<glyph unicode="&#xe02b;" d="M 119.995,223.983L 351.988,386.982L 351.996,61.018 					z" />
-<glyph unicode="&#xe02c;" d="M 255.982,87.996L 418.982,319.99L 93.018,319.998 					z" />
-<glyph unicode="&#xe02d;" d="M 415.996,255.998L 287.998,255.998L 287.998,383.998L 224.002,383.998L 224.002,255.998L 96.002,255.998L 96.002,192.002L 224.002,192.002L 224.002,64.002L 287.998,64.002L 287.998,192.002L 415.996,192.002 							z" />
-<glyph unicode="&#xe02e;" d="M 96.002,451.331L 436.998,224.00L 96.002-3.331L 96.002,451.331 z" />
-<glyph unicode="&#xe02f;" d="M 461.173,351.998L 351.786,351.998 l-25.911,53.007c0.00,0.00-5.165,10.993-18.42,10.993c-10.21,0.00-74.079,0.00-102.888,0.00
-						c-14.414,0.00-19.231-10.909-19.231-10.909l-25.131-53.091L 49.372,351.998 c-9.941,0.00-18.00-8.06-18.00-18.00l0.00-251.736 c0.00-9.941, 8.059-18.00, 18.00-18.00l 411.801,0.00 
-						c 9.941,0.00, 18.00,8.059, 18.00,18.00L 479.173,333.998 C 479.173,343.938, 471.114,351.998, 461.173,351.998z M 255.271,105.43
-						c-60.684,0.00-110.007,49.37-110.007,110.016c0.00,60.665, 49.339,110.012, 110.007,110.012c 60.656,0.00, 110.022-49.347, 110.022-110.012
-						C 365.294,154.791, 315.928,105.43, 255.271,105.43zM 255.271,281.456c-36.397,0.00-66.007-29.597-66.007-66.01c0.00-36.39, 29.609-66.001, 66.007-66.001
-						c 36.404,0.00, 66.008,29.611, 66.008,66.001C 321.279,251.859, 291.676,281.456, 255.271,281.456z" />
-<glyph unicode="&#xe030;" d="M 351.528,188.046c-6.412,3.971-16.018,2.871-21.464-2.468l-42.484-42.472
-					c-5.434-5.339-14.086-5.339-19.425,0.00l-95.473,95.506c-5.345,5.346-5.345,14.079,0.00,19.424l 40.016,40.003
-					c 5.353,5.346, 6.131,14.763, 1.798,20.933L 141.695,422.18c-4.299,6.164-12.724,7.372-18.626,2.676c0.00,0.00-56.792-45.067-56.792-86.471
-					c0.00-169.442, 137.367-306.795, 306.795-306.795c 41.425,0.00, 81.708,76.009, 81.708,76.009c 3.542,6.666, 1.194,15.413-5.217,19.383
-					L 351.528,188.046z" />
-<glyph unicode="&#xe031;" d="M 440.316,414.613c 12.849-6.288, 24.047-15.243, 32.251-26.241c 17.269-23.15, 22.118-54.686, 14.418-93.733
-					c-7.78-39.513-25.208-72.868-50.583-97.022c-4.641-4.852-9.611-9.373-14.902-13.54c-27.178-21.401-61.498-32.714-99.254-32.714
-					l-6.056,0.00 L 202.217,151.363 L 169.935,0.00l-66.212,0.00 l 5.043,23.15l 23.064,0.00 l 32.281,151.363l 94.136,0.00 c 90.124,0.00, 165.469,55.538, 185.629,149.967
-					C 466.736,431.398, 390.076,480.00, 324.171,480.00L 99.532,480.00 L0.00,23.15l 76.016,0.00 L 64.00-32.00l 131.83,0.00 l 32.281,151.363l 94.135,0.00 
-					c 90.125,0.00, 165.47,55.539, 185.63,149.968C 524.733,348.171, 487.474,395.297, 440.316,414.613z M 211.172,386.959l 64.565,0.00 
-					c 32.296,0.00, 53.801-27.769, 44.394-62.478c-8.068-34.72-41.693-62.488-75.32-62.488l-61.879,0.00 L 211.172,386.959z" />
-<glyph unicode="&#xe032;" d="M 96.002,415.333l 96.00,0.00 l0.00-382.667 l-96.00,0.00 L 96.002,415.333 z M 321.413,415.333l 94.583,0.00 l0.00-382.667 l-94.583,0.00 L 321.413,415.333 z" />
-<glyph unicode="&#xe033;" d="M 68.436,311.144l 22.881,0.00 L 91.317,424.772 L 72.669,424.772 c0.00-0.991-0.271-2.505-0.857-4.541c-0.991-3.39-2.465-6.122-4.367-8.158
-											c-2.813-2.975-6.479-4.957-10.958-5.948c-2.813-0.63-7.739-1.099-14.763-1.42l0.00-15.192 l 26.712,0.00 L 68.436,311.144 z M 64.685,219.003
-											c-11.843-8.466-19.345-16.45-22.532-24.032c-3.296-6.726-5.033-14.174-5.252-22.318l 77.729,0.00 l0.00,19.666 L 65.09,192.319 
-											c 1.393,2.357, 3.135,4.396, 5.197,6.162c 2.063,1.795, 5.895,4.662, 11.49,8.627l 8.926,6.324
-											c 7.525,5.33, 12.938,10.153, 16.233,14.494c 5.01,6.523, 7.528,13.985, 7.528,22.385c0.00,10.959-3.563,19.76-10.663,26.404
-											c-7.101,6.658-16.666,9.98-28.669,9.98c-15.191,0.00-25.774-5.653-31.723-16.986c-3.139-5.948-4.876-13.745-5.251-23.391
-											l 21.675,0.00 c 0.269,6.363, 1.099,10.999, 2.492,13.933c 2.465,5.051, 7.069,7.582, 13.879,7.582c 4.956,0.00, 8.761-1.594, 11.413-4.769
-											c 2.648-3.188, 3.988-7.167, 3.988-11.977c0.00-5.895-2.331-11.32-6.966-16.276C 81.618,231.623, 74.974,226.358, 64.685,219.003z
-											 M 110.151,86.539c-4.18,3.832-7.364,5.732-9.592,5.732c 2.947,1.146, 5.813,3.297, 8.547,6.432
-											c 4.341,5.037, 6.515,11.199, 6.515,18.514c0.00,10.344-3.617,18.567-10.905,24.73c-7.261,6.135-16.825,9.217-28.722,9.217
-											c-6.381,0.00-11.789-0.777-16.156-2.331c-4.396-1.526-8.198-3.778-11.391-6.672c-4.283-4.126-7.422-8.601-9.431-13.45
-											c-1.876-5.546-2.947-11.413-3.162-17.576l 22.801,0.00 c-0.104,6.109, 1.183,10.985, 3.889,14.656s 6.938,5.492, 12.70,5.492
-											c 5.01,0.00, 8.896-1.50, 11.651-4.447c 2.759-3.001, 4.152-6.859, 4.152-11.574c0.00-7.342-2.706-12.164-8.118-14.576
-											c-3.135-1.439-8.654-2.189-16.558-2.304l0.00-17.495 c 8.063,0.00, 13.981-0.771, 17.764-2.305c 6.591-2.76, 9.913-8.199, 9.913-16.371
-											c0.00-6.162-1.795-10.904-5.358-14.20c-3.563-3.269-7.717-4.896-12.513-4.896c-7.823,0.00-13.209,2.974-16.156,8.976
-											c-1.604,3.271-2.411,7.396-2.411,12.354L 33.632,64.445 c 0.402-9.893, 2.385-17.87, 6.002-23.979
-											c 6.832-11.494, 19.05-17.228, 36.625-17.228c 14.254,0.00, 25.025,3.985, 32.312,11.943c 7.288,7.957, 10.936,17.20, 10.936,27.73
-											C 119.503,72.90, 116.368,80.777, 110.151,86.539z M 480.145,401.296L 179.949,401.296 l0.00-82.189 l 300.188,0.00 L 480.145,401.296L 480.145,401.296z
-											 M 179.949,44.703L 481.00,44.703 l0.00,83.059 L 179.949,127.762 L 179.949,44.703 z M 179.949,264.663l0.00-83.045 L 481.00,181.618 l0.00,83.045 L 179.949,264.663 z" />
-<glyph unicode="&#xe034;" d="M 409.947,370.39c-12.927,12.917-33.873,12.917-46.794,0.00c-12.92-12.922-12.92-33.87,0.00-46.794l0.00,0.006 
-										c 29.647-29.682, 44.347-68.266, 44.382-107.154c-0.035-38.892-14.729-77.478-44.382-107.157
-										c-29.673-29.648-68.26-44.339-107.149-44.376c-38.896,0.037-77.481,14.731-107.146,44.376
-										c-29.653,29.68-44.353,68.266-44.389,107.157c 0.036,38.894, 14.731,77.472, 44.384,107.148
-										c 12.919,12.919, 12.926,33.869, 0.005,46.789c-12.92,12.923-33.869,12.923-46.79,0.006
-										c-42.455-42.423-63.812-98.336-63.771-153.942c-0.037-55.606, 21.315-111.52, 63.771-153.944
-										c 42.419-42.446, 98.332-63.802, 153.938-63.766l 0.142,0.00 c 55.563-0.002, 111.409,21.35, 153.80,63.766
-										c 42.444,42.425, 63.813,98.338, 63.767,153.944C 473.751,272.053, 452.394,327.963, 409.947,370.39zM 256.704,191.357c 18.271,0.00, 33.085,14.812, 33.085,33.083L 289.789,413.278 c0.00,18.271-14.813,33.085-33.085,33.085
-										c-18.274,0.00-33.086-14.816-33.086-33.085l0.00-188.836 C 223.618,206.173, 238.429,191.357, 256.704,191.357z" />
-<glyph unicode="&#xe035;" d="M 90.68,160.51L 126.742,124.447L 253.718,251.426L 380.691,124.448L 416.754,160.51L 253.718,323.551 		z" />
-<glyph unicode="&#xe036;" d="M 196.729,60.963L 160.666,97.025L 287.643,224.001L 160.667,350.975L 196.729,387.037L 359.768,224.001 		z" />
-<glyph unicode="&#xe037;" d="M 317.207,60.963L 353.27,97.025L 226.291,224.001L 353.269,350.975L 317.207,387.037L 154.166,224.001 		z" />
-<glyph unicode="&#xe038;" d="M 416.754,287.49L 380.691,323.553L 253.716,196.574L 126.742,323.552L 90.68,287.49L 253.716,124.449 		z" />
-<glyph unicode="&#xe039;" d="M 504.979,223.994L 383.904,323.938L 383.904,255.996L 288.005,255.997L 288.005,351.90L 355.937,351.90L 256.012,472.979L 156.067,351.904L 224.01,351.904L 224.009,255.998L 128.098,255.999L 128.098,323.942L 7.021,224.016L 128.098,124.07L 128.098,192.002L 224.008,192.002L 224.007,96.098L 156.063,96.098L 255.99-24.979L 355.936,96.098L 288.004,96.098L 288.004,192.001L 383.90,192.001L 383.90,124.069 			z" />
-<glyph unicode="&#xe03a;" d="M 96.002,255.998L 415.996,255.998L 415.996,192.002L 96.002,192.002z" />
-<glyph unicode="&#xe03b;" d="M 256.00,447.998c-83.058,0.00-150.374-67.286-150.374-150.374c0.00-73.704, 64.874-169.622, 116.446-249.789
-								c 39.066-60.729, 29.329-61.07, 67.853-0.004c 50.575,80.171, 116.449,176.088, 116.449,249.773
-								C 406.374,380.652, 339.058,447.998, 256.00,447.998z M 256.00,225.785c-39.67,0.00-71.858,32.16-71.858,71.858
-								c0.00,39.699, 32.188,71.839, 71.858,71.839c 39.669,0.00, 71.857-32.16, 71.857-71.858C 327.857,257.925, 295.669,225.785, 256.00,225.785z" />
-<glyph unicode="&#xe03c;" d="M 256.398,162.378c-4.897,0.00-9.814,1.545-13.934,4.642L 32.156,324.88l0.00-234.203 c0.00-16.487, 13.413-27.675, 29.90-27.675
-						l 388.676,0.00 c 16.492,0.00, 29.263,11.188, 29.263,27.675L 479.995,324.88 L 269.999,167.02C 265.882,163.923, 261.288,162.378, 256.398,162.378zM 451.282,352.018L 256.398,205.719L 61.513,352.018 					z" />
-<glyph unicode="&#xe03d;" d="M 255.875,451.175L 63.605,334.688l0.00-221.367 l 49.933-29.402L 113.538,305.29 l 142.381,86.565l 142.49-86.43
-					l 0.599-0.343l-0.059-220.832l 49.445,29.07L 448.394,334.688 L 255.875,451.175z M 281.322,314.901l0.00-258.805 l-25.447-15.566l-25.477,15.624
-					L 230.398,314.697 l-65.943-40.617l0.00-221.313 l 91.42-55.942l 92.20,56.333L 348.075,274.234 L 281.322,314.901z" />
-<glyph unicode="&#xe03e;" d="M 402.127,223.937l-38.709,0.00 l-0.006,64.061c0.00,30.667-11.64,58.792-30.863,79.345
-									c-19.156,20.557-46.447,33.753-76.542,33.729c-30.104,0.024-57.396-13.172-76.551-33.729
-									c-19.233-20.553-30.871-48.679-30.876-79.345l0.00-64.061 l-38.708,0.00 c-7.66,0.00-13.869-6.205-13.869-13.864l0.00-164.201 
-									c0.00-7.659, 6.209-13.869, 13.869-13.869l 292.255,0.00 c 7.665,0.00, 13.869,6.21, 13.869,13.869L 415.996,210.07 
-									C 415.996,217.731, 409.792,223.937, 402.127,223.937z M 312.404,223.937L 199.588,223.937 l0.00,64.061 c0.00,17.699, 6.701,33.356, 17.115,44.50
-									c 10.497,11.135, 24.163,17.544, 39.304,17.566c 15.13-0.022, 28.798-6.427, 39.287-17.566c 10.416-11.143, 17.11-26.801, 17.11-44.50
-									L 312.404,223.937 z" />
-<glyph unicode="&#xe03f;" d="M 221.533,116.203l-37.033-34.33c-8.995-8.319-20.297-12.079-31.93-11.681c-11.109,0.454-21.96,5.06-30.329,14.057
-					l-3.382,3.668c-8.303,8.996-12.084,20.234-11.68,31.698c 0.463,11.303, 5.053,22.158, 14.054,30.524l 85.934,79.645
-					c 5.046,4.659, 10.772,7.889, 16.835,9.763c0.00,8.613, 0.088,61.287, 0.088,72.72c-23.642-2.68-46.787-12.709-65.50-30.063
-					l-85.936-79.642c-23.266-21.53-35.834-50.785-36.921-80.225c-1.155-29.401, 9.047-59.642, 30.701-83.012l 3.384-3.651
-					c 21.434-23.149, 50.545-35.81, 80.027-36.919l 0.164-0.006c 29.321-1.117, 59.624,8.968, 83.062,30.703l 37.031,34.311
-					c 14.476,13.415, 15.337,36.023, 1.922,50.495C 258.617,128.737, 236.008,129.60, 221.533,116.203zM 476.256,325.848c 1.204,29.423-9.102,59.554-30.659,82.823l-3.384,3.669c-21.592,23.319-50.937,35.824-80.354,36.912
-					c-29.42,1.152-59.596-9.082-82.895-30.69l-35.342-32.747c-14.475-13.428-15.338-36.038-1.926-50.513s 36.02-15.337, 50.497-1.925
-					l 35.336,32.748c 9.029,8.334, 20.232,12.101, 31.604,11.716c 11.40-0.484, 22.282-5.09, 30.62-14.086l 3.416-3.654
-					c 8.303-9.013, 12.081-20.216, 11.683-31.538c-0.469-11.435-5.095-22.336-14.095-30.703l-85.932-79.628
-					c-5.012-4.634-10.729-7.859-16.826-9.736c0.00-14.327,0.00-56.327,0.00-72.708c 23.514,2.70, 46.64,12.627, 65.392,30.027l 85.967,79.63
-					C 462.698,267.083, 475.199,296.426, 476.256,325.848zM 119.299,339.487c 2.929-2.929, 6.768-4.394, 10.606-4.394s 7.678,1.464, 10.606,4.394c 5.858,5.858, 5.858,15.355,0.00,21.213
-					L 44.314,456.897c-5.857,5.858-15.355,5.858-21.213,0.00c-5.858-5.858-5.858-15.355,0.00-21.213L 119.299,339.487zM 192.002,352.095c 8.284,0.00, 15.00,6.716, 15.00,15.00L 207.002,446.436 c0.00,8.284-6.716,15.00-15.00,15.00s-15.00-6.716-15.00-15.00l0.00-79.341 
-					C 177.002,358.811, 183.718,352.095, 192.002,352.095zM 126.343,287.913c0.00,8.284-6.716,15.00-15.00,15.00L 32.002,302.913 c-8.284,0.00-15.00-6.716-15.00-15.00s 6.716-15.00, 15.00-15.00l 79.341,0.00 
-					C 119.627,272.913, 126.343,279.629, 126.343,287.913zM 392.621,108.95c-5.857,5.857-15.355,5.857-21.213,0.00c-5.858-5.857-5.858-15.355,0.00-21.213l 96.198-96.198
-					c 2.929-2.929, 6.768-4.394, 10.606-4.394s 7.678,1.465, 10.606,4.394c 5.858,5.857, 5.858,15.355,0.00,21.213L 392.621,108.95zM 319.919,96.342c-8.284,0.00-15.00-6.716-15.00-15.00l0.00-79.341 c0.00-8.284, 6.716-15.00, 15.00-15.00s 15.00,6.716, 15.00,15.00l0.00,79.341 
-					C 334.919,89.626, 328.203,96.342, 319.919,96.342zM 385.577,160.523c0.00-8.284, 6.716-15.00, 15.00-15.00l 79.342,0.00 c 8.284,0.00, 15.00,6.716, 15.00,15.00s-6.716,15.00-15.00,15.00l-79.342,0.00 
-					C 392.293,175.523, 385.577,168.808, 385.577,160.523z" />
-<glyph unicode="&#xe040;" d="M 221.533,116.203l-37.033-34.33c-8.995-8.319-20.297-12.079-31.93-11.681c-11.109,0.454-21.96,5.06-30.329,14.057
-										l-3.382,3.668c-8.303,8.996-12.084,20.234-11.68,31.698c 0.463,11.303, 5.053,22.158, 14.054,30.524l 85.934,79.645
-										c 9.028,8.335, 20.233,12.099, 31.639,11.698c 11.368-0.465, 22.252-5.074, 30.62-14.072l 3.381-3.669l 52.421,48.589l-3.386,3.652
-										l-6.175,6.648c-2.637,2.84-5.609,5.156-8.84,6.959c-19.25,14.601-42.242,22.475-65.31,23.321
-										c-29.449,1.155-59.625-9.097-82.928-30.707l-85.936-79.642c-23.266-21.53-35.834-50.785-36.921-80.225
-										c-1.155-29.401, 9.047-59.642, 30.701-83.012l 3.384-3.651c 21.434-23.149, 50.545-35.81, 80.027-36.919l 0.164-0.006
-										c 29.321-1.117, 59.624,8.968, 83.062,30.703l 37.031,34.311c 14.476,13.415, 15.337,36.023, 1.922,50.495
-										C 258.617,128.737, 236.008,129.60, 221.533,116.203zM 445.597,408.67l-3.384,3.669c-21.592,23.319-50.937,35.824-80.354,36.912c-29.42,1.152-59.596-9.082-82.895-30.69
-										l-35.342-32.747c-14.475-13.428-15.338-36.038-1.926-50.513s 36.02-15.337, 50.497-1.925l 35.336,32.748
-										c 9.029,8.334, 20.232,12.101, 31.604,11.716c 11.40-0.484, 22.282-5.09, 30.62-14.086l 3.416-3.654
-										c 8.303-9.013, 12.081-20.216, 11.683-31.538c-0.469-11.435-5.095-22.336-14.095-30.703l-85.932-79.628
-										c-8.996-8.318-20.266-12.10-31.931-11.687c-11.108,0.447-21.927,5.045-30.295,14.061l-3.386,3.652l-52.42-48.587l 3.38-3.654
-										c 21.403-23.132, 50.511-35.808, 79.998-36.896l 0.194-0.008c 29.318-1.118, 59.588,8.954, 83.024,30.702l 85.967,79.63
-										c 23.34,21.639, 35.841,50.982, 36.897,80.404C 477.46,355.271, 467.154,385.401, 445.597,408.67z" />
-<glyph unicode="&#xe041;" d="M 351.996,415.998L 351.996,237.18L 96.002,448.00L 96.002,0.00L 351.996,210.82L 351.996,32.002L 447.996,32.002L 447.996,415.998 				z" />
-<glyph unicode="&#xe042;" d="M 482.178,233.834L 342.742,379.832c-2.575,2.665-6.122,4.166-9.828,4.166L 45.484,383.998 c-7.561,0.00-13.687-6.126-13.687-13.688
-						l0.00-291.995 c0.00-7.562, 6.126-13.688, 13.687-13.688l 287.43,0.00 c 3.706,0.00, 7.253,1.502, 9.828,4.166l 139.436,145.998
-						C 487.324,220.098, 487.324,228.527, 482.178,233.834z M 327.112,95.931L 64.002,95.931 L 64.002,352.124 l 263.11,0.00 l 126.18-127.811L 327.112,95.931zM 267.427,325.312L 193.763,250.351L 120.094,325.312L 94.06,299.724L 168.178,224.312L 94.06,148.894L 120.094,123.306L 193.763,198.27L 267.427,123.306L 293.464,148.894L 219.349,224.312L 293.464,299.724 					z" />
-<glyph unicode="&#xe043;" d="M 29.815,214.791l 139.436-145.998c 2.575-2.664, 6.122-4.166, 9.828-4.166l 287.429,0.00 c 7.562,0.00, 13.688,6.127, 13.688,13.688
-						L 480.196,370.31 c0.00,7.561-6.126,13.688-13.688,13.688L 179.079,383.998 c-3.706,0.00-7.253-1.501-9.828-4.166L 29.815,233.834
-						C 24.669,228.527, 24.669,220.098, 29.815,214.791z M 58.701,224.312l 126.18,127.811l 263.108,0.00 l0.00-256.193 L 184.881,95.93 L 58.701,224.312zM 218.529,299.724L 292.644,224.312L 218.529,148.894L 244.566,123.306L 318.229,198.27L 391.898,123.306L 417.932,148.894L 343.814,224.312L 417.932,299.724L 391.898,325.312L 318.229,250.351L 244.566,325.312 					z" />
-<glyph unicode="&#xe044;" d="M 48.073,0.002l 79.011,0.017l 0.01,45.529l 49.23,0.013l 0.007,50.45l 47.674-0.009L 224.00,141.556
-					l 50.566,0.009l 37.571,32.034c 44.065-12.063, 92.902-1.09, 127.277,33.169c 51.184,51.347, 50.762,134.801-0.911,186.701
-					c-51.781,51.553-135.238,51.98-186.399,0.611c-34.485-34.339-45.464-83.306-33.298-127.414L 32.002,79.861l 0.291-64.071
-					C 32.355,4.206, 36.603,0.243, 48.073,0.002z M 361.38,316.957c-13.714,13.921-13.843,36.085-0.298,49.49
-					c 13.639,13.763, 35.798,13.644, 49.488-0.301c 13.755-13.50, 13.886-35.67, 0.313-49.499
-					C 397.273,303.30, 375.108,303.429, 361.38,316.957z" />
-<glyph unicode="&#xe045;" d="M 295.446,31.498L 108.404,31.498 l 3.648,21.205c 21.455,8.767, 42.379,14.598, 62.836,17.525l 91.339,305.806
-										c-9.792,1.964-45.405,14.313-54.792,18.273l 5.114,21.19l 187.044,0.00 l-4.396-21.19c-22.019-8.825-58.625-17.432-62.836-18.273
-										l-91.311-305.806c 10.509-2.121, 47.089-13.814, 54.069-17.525L 295.446,31.498z" />
-<glyph unicode="&#xe046;" d="M 335.49,115.189c-9.558,0.00-47.096-57.998-67.553-57.998c-5.459,0.00-8.17,4.787-8.17,9.558
-										c0.00,10.909, 7.506,27.979, 11.58,38.216l 49.13,133.011c 24.56,66.191-6.834,83.922-36.151,83.922
-										c-39.572,0.00-75.062-19.786-102.332-45.708c-5.076-5.068-16.971-16.651-26.377-27.822c-7.691-9.13-6.813-18.64-2.32-21.406
-										c 5.626-3.464, 14.265,3.051, 18.405,7.886c 14.991,17.518, 34.313,42.019, 50.521,42.019c 5.462,0.00, 11.605-6.136, 6.832-18.407
-										l-47.737-120.078c-4.796-11.606-27.983-67.556-27.983-100.294c0.00-25.929, 17.049-37.517, 41.61-37.517
-										c 68.91,0.00, 148.724,84.603, 148.724,104.389C 343.668,111.104, 338.891,115.189, 335.49,115.189zM 321.828,447.423c-30.018,0.00-55.938-24.553-55.938-54.568c0.00-27.979, 18.435-46.41, 46.398-46.41
-										c 30.703,0.00, 56.615,23.196, 56.615,54.591C 368.904,429.016, 349.137,447.423, 321.828,447.423z" />
-<glyph unicode="&#xe047;" d="M 352.381,251.944c 19.508,0.00, 35.292,16.00, 35.292,35.758c0.00,19.743-15.784,35.765-35.292,35.765
-										c-19.45,0.00-35.277-16.022-35.277-35.765C 317.104,267.944, 332.931,251.944, 352.381,251.944zM 244.799,175.919l-88.125,94.968L 96.748,158.586l0.00-30.938 l 297.645,0.00 C 356.489,160.775, 276.541,231.63, 276.541,231.63
-										L 244.799,175.919zM 32.00,384.00l0.00-319.782 l 447.50,0.00 L 479.50,384.00 L 32.00,384.00 z M 73.072,104.542l-0.019,237.854l 365.385,0.00 l0.00-0.012 l 1.32,0.00 l 0.005-237.842L 73.072,104.542 z" />
-<glyph unicode="&#xe048;" d="M 395.841,276.128L 395.841,360.032L 339.902,360.032L 339.902,332.064L 256.00,415.968L 32.255,191.932L 96.50,191.932L 96.50,31.598L 224.551,31.598L 224.551,159.598L 288.50,159.598L 288.50,31.598L 416.50,31.598L 416.50,191.932L 479.742,191.932 
-																	z" />
-<glyph unicode="&#xe049;" d="M 415.459,383.458C 372.866,426.051, 316.235,449.508, 256.00,449.508c-60.235,0.00-116.865-23.457-159.458-66.05
-									C 53.949,340.865, 30.492,284.235, 30.492,224.00s 23.457-116.866, 66.05-159.459c 42.593-42.593, 99.223-66.05, 159.458-66.05
-									c 60.235,0.00, 116.866,23.457, 159.459,66.05s 66.05,99.224, 66.05,159.459S 458.052,340.865, 415.459,383.458z M 256.00,31.092
-									C 149.631,31.092, 63.093,117.63, 63.093,224.00c0.00,106.369, 86.538,192.907, 192.907,192.907
-									c 106.37,0.00, 192.908-86.538, 192.908-192.907C 448.908,117.63, 362.37,31.092, 256.00,31.092zM 342.291,356.486c-21.754,19.24-51.033,28.861-87.842,28.861c-34.986,0.00-63.238-9.507-84.759-28.519
-									c-21.525-19.015-27.814-41.741-29.486-68.966l 55.262,0.271c 4.107,19.011, 9.93,25.194, 20.881,34.474
-									c 10.951,9.275, 24.563,13.917, 40.843,13.917c 16.882,0.00, 30.305-4.449, 40.269-13.346c 9.959-8.898, 14.943-19.586, 14.943-32.056
-									c0.00-8.976-2.816-17.19-8.441-24.641c-3.651-4.716-14.83-14.68-33.538-29.887c-18.711-15.212-31.186-28.917-37.421-41.083
-									c-6.238-12.17-9.277-27.145-9.125-35.508l 64.113,0.00 c-0.307,17.643, 10.188,26.305, 23.728,37.561
-									c 26.158,21.766, 43.235,38.952, 51.22,51.578c 7.986,12.624, 11.979,26.01, 11.979,40.155
-									C 374.916,314.849, 364.039,337.244, 342.291,356.486zM 223.877,128.011L 287.99,128.011L 287.99,63.903L 223.877,63.903z" />
-<glyph unicode="&#xe04a;" d="M 32.002,447.998L 160.002,447.998L 160.002,319.998L 32.002,319.998zM 192.00,447.998L 320.00,447.998L 320.00,319.998L 192.00,319.998zM 351.996,447.998L 479.996,447.998L 479.996,319.998L 351.996,319.998zM 32.002,288.00L 160.002,288.00L 160.002,160.00L 32.002,160.00zM 192.00,288.00L 320.00,288.00L 320.00,160.00L 192.00,160.00zM 351.996,288.00L 479.996,288.00L 479.996,160.00L 351.996,160.00zM 32.002,128.002L 160.002,128.002L 160.002,0.002L 32.002,0.002zM 192.00,128.002L 320.00,128.002L 320.00,0.002L 192.00,0.002zM 351.996,128.002L 479.996,128.002L 479.996,0.002L 351.996,0.002z" />
-<glyph unicode="&#xe04b;" d="M 279.533,448.00c0.00,0.00-100.479,0.00-133.971,0.00c-60.06,0.00-116.585-45.503-116.585-98.211c0.00-53.863, 40.941-97.333, 102.044-97.333
-					c 4.249,0.00, 8.378,0.085, 12.421,0.376c-3.965-7.593-6.801-16.144-6.801-25.021c0.00-14.969, 8.052-27.105, 18.234-37.012
-					c-7.693,0.00-15.121-0.224-23.227-0.224C 57.259,190.576,0.00,143.195,0.00,94.064c0.00-48.389, 62.771-78.656, 137.167-78.656
-					c 84.812,0.00, 131.652,48.122, 131.652,96.514c0.00,38.801-11.447,62.036-46.843,87.067c-12.107,8.571-35.265,29.418-35.265,41.672
-					c0.00,14.36, 4.098,21.434, 25.714,38.323c 22.156,17.312, 37.836,41.651, 37.836,69.958c0.00,33.703-15.01,66.549-43.186,77.386l 42.477,0.00 
-					L 279.533,448.00z M 232.74,120.271c 1.063-4.486, 1.642-9.104, 1.642-13.814c0.00-39.10-25.196-69.655-97.487-69.655
-					c-51.421,0.00-88.558,32.552-88.558,71.65c0.00,38.321, 46.063,70.222, 97.481,69.666c 12.00-0.127, 23.185-2.058, 33.335-5.345
-					C 207.066,153.359, 227.092,142.393, 232.74,120.271z M 150.409,266.112c-34.52,1.032-67.318,38.613-73.276,83.93
-					c-5.958,45.333, 17.185,80.021, 51.694,78.995c 34.505-1.037, 67.318-37.407, 73.278-82.729
-					C 208.059,300.978, 184.911,265.079, 150.409,266.112z M 416.00,352.00L 416.00,448.00 l-32.00,0.00 l0.00-96.00 l-96.00,0.00 l0.00-32.00 l 96.00,0.00 l0.00-96.00 l 32.00,0.00 l0.00,96.00 l 96.00,0.00 l0.00,32.00 L 416.00,352.00 z" />
-<glyph unicode="&#xe04c;" d="M 248.023,234.684L 247.35,235.809L 246.563,238.057L 247.124,238.73L 246.786,240.303L 244.764,238.73L 245.214,237.381L 245.775,235.248L 244.764,235.248L 244.764,234.237L 245.889,233.562 				zM 241.955,236.259L 242.293,234.684L 243.979,235.471L 244.426,236.82L 243.753,237.493 				zM 244.09,245.134L 244.426,246.033L 243.529,246.932L 241.73,247.043L 241.843,245.697 				zM 256.338,254.011L 256.898,253.788L 257.012,254.684L 256.338,255.022L 256.785,256.145L 254.764,255.022L 255.55,253.338 				zM 261.279,257.27L 260.158,257.831L 259.37,257.043L 260.831,256.82 				zM 256.00,449.078C 131.695,449.078, 30.922,348.308, 30.922,224.00S 131.695-1.078, 256.00-1.078
-					c 124.303,0.00, 225.078,100.771, 225.078,225.078S 380.303,449.078, 256.00,449.078z M 62.028,224.00c0.00,41.132, 12.838,79.241, 34.674,110.627
-					l 2.504-1.877l-1.513-6.073l 5.559-1.521l-1.013,8.093l 4.553,0.503l0.00,10.625 l 4.552,0.00 c0.00,0.00, 0.80-2.062, 1.642-4.224
-					c 0.923-2.376, 1.899-4.88, 1.899-4.88l 5.055-5.568c0.00,0.00-6.068-1.508-8.088-1.508c-2.022,0.00-1.013-8.093-1.013-8.093l 7.077-2.525
-					l 4.572,8.444l 10.601,11.782l 5.056,15.674l 9.612,9.111l-5.565,4.033l 6.073,4.047l 0.505,5.568l-17.701-5.056l-0.558,0.666
-					c 9.638,8.19, 20.077,15.455, 31.201,21.653l 8.299-3.614l-5.559-10.623l-11.133,0.00 l-2.024-9.604l 9.106,0.00 l 13.149,8.095l 9.106,9.096
-					l 1.513,8.599l-13.149,1.009l 9.103,6.073l 8.598-1.521l-1.514-9.099l 11.632,7.091l 2.027-5.568l 2.53-8.095l-6.577-8.093
-					l-7.082-6.572l-10.623,1.521l 5.06-10.619l-9.61,1.517l-16.184-16.692l 4.046-5.567l 13.149,1.018l 11.128,3.546l 14.167,1.508
-					l 6.572,1.519c0.00,0.00,0.00,4.046-0.507,6.572c-0.501,2.53, 5.06-0.50, 5.06-0.50l 6.071,3.532l 4.552,14.167l 16.688,7.595l-2.525,4.037
-					l 4.046,5.064l-13.148,2.026l 3.539,5.056l-16.692,5.568l-8.599,0.00 l 3.034,7.581l 3.539,3.547l-0.284,0.284
-					c 14.076,3.244, 28.72,5.018, 43.787,5.018c 23.479,0.00, 45.979-4.172, 66.808-11.817l-0.507-1.191l-8.423,0.563l0.00-5.064 l 3.376-2.246
-					l0.00-4.493 l 2.806-3.93l-10.111,6.176l-6.735-3.372l 3.368-7.873l 1.688-8.986l 4.492-5.064l 10.665-1.684l-2.242-4.493l-2.25-6.752
-					l 9.556-6.176l-0.563-2.81l-17.979,15.176l-1.116-5.627l 7.859-7.865l 4.493-1.684l-10.11-2.246l-1.126-5.064l-7.298,7.315
-					l-4.501,9.548l-1.688,9.557l-4.501-5.618l 3.376-13.487l 5.618-3.943l-2.242-12.914l-3.376,1.688l 0.563-6.752l-5.063,0.563
-					l-5.052,7.315l-6.176,0.00 l-8.995,1.125l-8.999-0.563l-8.423-6.752l-5.622-9.548l-11.804-8.994l-1.125-5.056l0.00-6.189 l 2.809-6.177
-					l 5.623,4.493l 1.683-3.367l 2.814-5.056l 0.563-1.134l 2.809-3.372l 5.061,3.368l-0.563,12.366l 6.176,7.873
-					c0.00,0.00, 0.313,1.332, 0.664,2.869c 0.479,2.046, 1.024,4.433, 1.024,4.433l 2.242,6.19l 3.943-0.563l-1.122-5.064l-2.259-11.232
-					l 10.691,1.125l 3.935-1.125l-8.436-2.255l 1.12-5.618l-9.557-6.176l 0.563-6.19l-8.423-2.25l-1.684-4.493l-6.748,2.247l-4.497,0.00 
-					l0.00,9.557 l-5.06-1.697l0.00-5.055 l-14.051-11.245l-7.869-2.809l-3.369-3.93l-11.245,2.809l-0.563-5.056l 7.306-2.817l-0.563-10.104
-					l-20.235,0.563l-2.81-4.493l-2.809-7.874l-3.376-6.752l 5.06-5.618l 5.623-6.739L 207.109,224.00l 1.125,6.739l 3.939,3.38l 6.743,2.247
-					l-0.563,4.493l 6.185,1.688l 8.988,1.684l 5.623-6.739l 10.115-7.315l 4.496-7.297l0.00-3.371 l 5.614,3.371l-2.805,5.051l 1.122,5.626
-					l-5.057,2.247l-4.496,6.176l 2.809,8.999l 5.051-7.311l 7.302-5.618l 2.805-10.12l 7.311-5.614l 1.696-6.189l 3.372,7.311l-1.125,3.372
-					l 1.685,2.809l 10.664,8.994l 2.251,11.246l 4.501,3.372l 5.618-0.563l 8.432,8.436l 0.563-6.752l 12.353-3.93l0.00-6.19 l-10.103,0.00 
-					l-15.175-7.86l-12.366-6.752l 3.371-7.302l 11.236-2.246l 6.19-2.81l 6.743,4.492l 0.554-19.113l-19.113-3.93l-20.209,5.627
-					l-7.873-6.189l 3.367-3.368l-6.189,1.121l-19.664,7.311l-5.618-0.571l-4.496,7.311l0.00,8.995 l-10.121,0.00 l-5.617,1.125l-17.987-3.943
-					l-14.05,1.134l-6.181-3.381l-3.934-0.563l-2.251-7.297l-12.924-8.999l-17.989-13.486l-1.125-17.413l-5.06-11.245l 0.563-6.735
-					l 4.497-7.878l 12.929-21.91l 13.487-6.185l 22.481-1.688l-1.125,9.562l-5.06,2.806l 2.247,5.055l 3.938-4.492l 3.93-11.805
-					l 16.861-1.125l 6.743-6.734l 9.553-3.943l 1.125-16.297l 10.121-12.928l 9.553-16.855l-8.428-10.119l 8.607-13.391
-					C 145.055,33.967, 62.028,119.269, 62.028,224.00z M 322.468,41.723l 23.449,17.047l-8.423,20.802l 26.975,35.397l 8.423,22.482
-					l 3.93,12.37l-14.032-6.753l-8.44-1.688l-20.784,12.933l-6.19,14.05l-7.868,7.869l-10.111,22.473l 8.423-6.739l 15.747-17.422
-					l 5.618-7.868l 11.228-5.619l 3.376-14.612l 13.495,8.986l 16.292,20.238l 7.869,20.79l-6.186,5.051l-3.372,6.189l-3.938-7.311
-					l-7.864-8.985l-11.24,12.366l-3.368,9.544l 7.869-1.685l 7.864-3.93l 11.241,3.93l 6.753-2.245l 17.967,12.365l 10.133-5.626
-					l 6.176,3.38l 13.438-21.158l 6.656,6.348l 0.132,8.063l 0.554,24.169l 4.132,11.452c 1.008-7.99, 1.583-16.116, 1.583-24.38
-					C 449.972,140.229, 396.859,68.854, 322.468,41.723z" />
-<glyph unicode="&#xe04d;" d="M 116.838,355.64c-25.396,0.00-47.242-8.403-65.542-25.208c-19.043-17.926-28.57-40.33-28.57-67.218
-					c0.00-17.926, 5.188-34.731, 15.647-50.416c 9.337-14.563, 19.09-23.903, 31.889-28.012l0.00-1.121 
-					c-12.799-5.224-18.482-18.295-18.482-39.209c0.00-16.062, 5.686-28.011, 18.482-35.854l0.00-1.121 
-					c-35.327-11.572-51.496-33.047-51.496-64.414c0.00-27.268, 11.874-47.244, 35.033-59.939C 72.094-26.959, 95.588-32.00, 123.972-32.00
-					c 69.085,0.00, 103.703,28.941, 103.703,86.832c0.00,36.223-26.661,58.441-80.063,66.658c-12.323,1.863-21.644,6.348-27.991,13.445
-					c-4.854,4.854-7.271,9.709-7.271,14.563c0.00,13.816, 7.479,21.848, 22.41,24.088c 22.779,3.357, 41.364,13.912, 55.743,31.648
-					c 14.375,17.74, 21.565,38.559, 21.565,62.458c0.00,7.469-2.26,15.498-5.244,24.086c 9.709,2.244, 16.524,4.297, 21.646,6.166L 228.47,355.64 
-					c-22.526-8.964-43.495-13.442-61.421-13.442C 151.361,351.159, 135.136,355.64, 116.838,355.64z M 123.00,76.115
-					c 31.372,0.00, 47.052-9.521, 47.052-28.57c0.00-20.168-14.377-30.246-43.132-30.246c-32.862,0.00-49.293,9.711-49.293,29.127
-					C 77.626,66.221, 92.749,76.115, 123.00,76.115z M 119.079,224.00c-23.527,0.00-35.293,12.882-35.293,38.654
-					c0.00,27.631, 11.766,41.453, 35.293,41.453c 11.201,0.00, 19.979-4.298, 26.326-12.884c 5.229-7.845, 7.845-17.18, 7.845-28.011
-					C 153.25,237.073, 141.857,224.00, 119.079,224.00z M 289.395,480.00c-10.828,0.00-20.069-4.107-27.727-12.324
-					c-7.661-8.218-11.489-18.108-11.489-29.688c0.00-11.205, 3.829-20.91, 11.489-29.129c 7.654-8.217, 16.896-12.32, 27.727-12.32
-					c 10.455,0.00, 19.514,4.104, 27.17,12.32c 7.656,8.219, 11.48,17.924, 11.48,29.129c0.00,11.58-3.824,21.472-11.48,29.688
-					C 308.905,475.893, 299.85,480.00, 289.395,480.00z M 320.768,352.001l-63.303,0.00 c 0.748-7.168-0.32-18.021-0.32-35.57l0.00-174.216 
-					c0.00-17.928, 1.068-32.387, 0.32-38.018l 63.303,0.00 c-0.75,8.188-2.697,22.334-2.697,41.379L 318.071,317.549 
-					C 318.067,333.981, 320.018,344.833, 320.768,352.001z M 460.371,157.90c-16.437,0.00-24.541,12.514-24.541,37.533L 435.83,298.753 l 24.932,0.00 
-					c 4.479,0.00, 8.516,0.246, 13.559-0.123c 5.043-0.374, 7.076-0.125, 9.64-0.125L 483.961,352.00 l-48.129,0.00 l0.00,23.808 c0.00,8.961, 1.407,17.151, 2.526,22.271
-					l-64.979,0.00 c 1.121-5.12, 1.014-12.938, 1.014-23.395L 374.393,352.00 l-28.16,0.00 l0.00-53.494 c 7.683,1.12, 14.545,1.678, 19.398,1.678l 8.762-0.559l0.00-0.292 l0.00,0.00
-					l0.00-101.101 c0.00-31.371, 3.979-54.336, 11.818-68.90c 10.461-19.42, 28.811-29.129, 56.067-29.129c 19.425,0.00, 36.56,3.732, 49.357,11.205
-					l0.00,56.016 C 481.398,161.074, 471.944,157.90, 460.371,157.90z" />
-<glyph unicode="&#xe04e;" d="M 444.797,255.998L 398.073,302.721L 479.835,384.482L 416.485,447.833L 334.724,366.071L 288.00,412.795L 288.00,255.998 				
-					zM 67.123,255.998L 113.847,302.721L 32.085,384.482L 95.435,447.833L 177.196,366.071L 223.92,412.795L 223.92,255.998 
-									zM 444.797,191.92L 398.073,145.196L 479.835,63.436L 416.485,0.085L 334.724,81.846L 288.00,35.123L 288.00,191.92 				
-					zM 67.123,191.92L 113.847,145.196L 32.085,63.436L 95.435,0.085L 177.196,81.846L 223.92,35.123L 223.92,191.92 
-									z" />
-<glyph unicode="&#xe04f;" d="M 177.285,208.636L 78.726,110.077L 32.004,156.801L 32.004,0.004L 188.801,0.004L 142.079,46.728L 240.636,145.286 						zM 188.801,447.996L 32.004,447.996L 32.004,291.199L 78.726,337.922L 177.285,239.364L 240.636,302.714L 142.079,401.272 						zM 334.714,208.636L 271.364,145.286L 369.923,46.728L 323.199,0.004L 479.996,0.004L 479.996,156.801L 433.272,110.077 						zM 323.199,447.996L 369.923,401.272L 271.364,302.714L 334.714,239.364L 433.272,337.922L 479.996,291.199L 479.996,447.996 						z" />
-<glyph unicode="&#xe050;" d="M 466.766,288.599c-68.667,0.00-338.019,0.00-356.766,0.00c-21.50,0.00-26.203-21.411-26.203-21.411L 55.08,82.854
-						c-1.239-7.888-14.837-6.083-13.466,2.646l 15.637,202.498c0.00,0.00, 4.249,32.602, 39.249,32.602c 28.227,0.00, 262.052,0.00, 351.496,0.00L 447.996,335.31 
-						c0.00,9.222-7.475,16.688-16.691,16.688L 216.757,351.998 l-43.624,58.994l-0.089-0.026c-3.031,3.094-7.244,5.032-11.916,5.032L 48.686,415.998 
-						c-9.211,0.00-16.683-7.475-16.683-22.561l 1.505-312.185c0.00-9.223, 7.472-16.688, 16.683-16.688l 381.114,0.00 
-						c 9.217,0.00, 16.688,7.465, 16.691,16.688l 35.601,185.334C 483.597,266.586, 489.336,288.285, 466.766,288.599z" />
-<glyph unicode="&#xe051;" d="M 431.305,351.998L 216.757,351.998 l-43.624,58.994l-0.089-0.026c-3.031,3.094-7.244,5.032-11.916,5.032L 48.686,415.998 
-						c-9.211,0.00-16.683-7.475-16.683-22.561l 1.505-312.185c0.00-9.223, 7.472-16.688, 16.683-16.688l 381.114,0.00 
-						c 9.217,0.00, 16.688,7.465, 16.691,16.688L 447.996,287.50 l0.00,47.81 C 447.996,344.532, 440.521,351.998, 431.305,351.998z M 240.00,95.205
-						c-62.186,0.00-112.596,50.41-112.596,112.596c0.00,62.181, 50.41,112.591, 112.596,112.591c 62.184,0.00, 112.596-50.41, 112.596-112.591
-						C 352.596,145.615, 302.184,95.205, 240.00,95.205zM 223.48,241.22L 161.002,241.223L 161.002,174.746L 223.478,174.745L 223.478,130.076L 317.874,207.981L 223.48,285.901 					z" />
-<glyph unicode="&#xe052;" d="M 160.50,223.696L 319.50,223.696L 319.50,191.902L 160.50,191.902zM 431.305,351.998L 216.757,351.998 l-43.624,58.994l-0.089-0.026c-3.031,3.094-7.244,5.032-11.916,5.032L 48.686,415.998 
-								c-9.211,0.00-16.683-7.475-16.683-22.561l 1.505-312.185c0.00-9.223, 7.472-16.688, 16.683-16.688l 381.114,0.00 
-								c 9.217,0.00, 16.688,7.465, 16.691,16.688L 447.996,287.50 l0.00,47.81 C 447.996,344.532, 440.521,351.998, 431.305,351.998z M 240.00,95.205
-								c-62.186,0.00-112.596,50.41-112.596,112.596c0.00,62.181, 50.41,112.591, 112.596,112.591c 62.184,0.00, 112.596-50.41, 112.596-112.591
-								C 352.596,145.615, 302.184,95.205, 240.00,95.205z" />
-<glyph unicode="&#xe053;" d="M 431.305,351.998L 216.757,351.998 l-43.624,58.994l-0.089-0.026c-3.031,3.094-7.244,5.032-11.916,5.032L 48.686,415.998 
-								c-9.211,0.00-16.683-7.475-16.683-22.561l 1.505-312.185c0.00-9.223, 7.472-16.688, 16.683-16.688l 381.114,0.00 
-								c 9.217,0.00, 16.688,7.465, 16.691,16.688L 447.996,287.50 l0.00,47.81 C 447.996,344.532, 440.521,351.998, 431.305,351.998z M 240.00,95.205
-								c-62.186,0.00-112.596,50.41-112.596,112.596c0.00,62.181, 50.41,112.591, 112.596,112.591c 62.184,0.00, 112.596-50.41, 112.596-112.591
-								C 352.596,145.615, 302.184,95.205, 240.00,95.205zM 255.898,287.297L 224.102,287.297L 224.102,223.696L 160.50,223.696L 160.50,191.902L 224.102,191.902L 224.102,128.301L 255.898,128.301L 255.898,191.902L 319.50,191.902L 319.50,223.696L 255.898,223.696 							z" />
-<glyph unicode="&#xe054;" d="M 431.305,351.998L 216.757,351.998 l-43.624,58.994l-0.089-0.026c-3.031,3.094-7.244,5.032-11.916,5.032L 48.686,415.998 
-						c-9.211,0.00-16.683-7.475-16.683-22.561l 1.505-312.185c0.00-9.223, 7.472-16.688, 16.683-16.688l 381.114,0.00 
-						c 9.217,0.00, 16.688,7.465, 16.691,16.688L 447.996,287.50 l0.00,47.81 C 447.996,344.532, 440.521,351.998, 431.305,351.998z" />
-<glyph unicode="&#xe055;" d="M 63.252,447.998L 95.65,447.998L 95.65,0.002L 63.252,0.002zM 401.471,415.998l-95.14-95.145l 96.834-96.851L 160.01,224.002 L 160.01,415.998 L 401.471,415.998  M 478.723,447.998L 128.01,447.998 l0.00-255.996 l 352.40,0.00 
-						L 351.583,320.851L 478.723,447.998L 478.723,447.998z" />
-<glyph unicode="&#xe056;" d="M 351.583,320.851L 478.723,447.998L 128.01,447.998L 128.01,192.002L 480.41,192.002 					zM 63.252,447.998L 95.65,447.998L 95.65,0.002L 63.252,0.002z" />
-<glyph unicode="&#xe057;" d="M 160.003,415.998L 160.003,237.18L 415.996,448.00L 415.996,0.00L 160.003,210.82L 160.003,32.002L 64.003,32.002L 64.003,415.998 				z" />
-<glyph unicode="&#xe058;" d="M 63.145,447.998L 63.145,383.998L 213.144,212.286L 213.144,40.859L 298.856-1.997L 298.856,212.286L 448.855,383.998L 448.855,447.998 					z" />
-<glyph unicode="&#xe059;" d="M 503.611,146.991l-45.414,44.548c 13.105,11.496, 24.191,22.291, 32.663,31.172
-									c-2.193,2.337-23.248,22.273-27.113,26.138c-2.402-2.128-104.908-114.769-207.756-114.769
-									c-86.444,0.00-181.754,86.349-207.225,115.06c-7.362-6.769-24.63-23.638-27.437-26.429
-									c 8.803-9.076, 19.852-19.751, 32.662-30.985L 8.387,146.991c-8.287-8.13-8.416-21.441-0.285-29.729
-									c 4.118-4.196, 9.559-6.301, 15.007-6.301c 5.313,0.00, 10.63,2.001, 14.723,6.017l 48.974,48.041
-									c 15.042-11.323, 31.434-22.418, 48.718-32.302l-29.787-62.356c-5.004-10.48-0.569-23.027, 9.908-28.036
-									c 2.051-0.979, 4.182-1.594, 6.316-1.876c 8.783-1.159, 17.691,3.36, 21.715,11.785l 29.501,61.759
-									c 20.12-8.455, 40.923-14.608, 61.80-17.17l0.00-64.193 c0.00-11.61, 9.412-21.022, 21.023-21.022s 21.023,9.412, 21.023,21.022l0.00,64.198 
-									c 20.775,2.549, 41.49,8.65, 61.519,17.008l 30.169-61.632c 4.108-8.391, 13.056-12.824, 21.826-11.583
-									c 2.136,0.304, 4.261,0.941, 6.299,1.943c 10.428,5.108, 14.742,17.697, 9.639,28.126l-30.236,61.768
-									c 17.484,9.933, 34.023,21.076, 49.119,32.401l 48.812-47.88c 4.092-4.018, 9.407-6.018, 14.72-6.018
-									c 5.447,0.00, 10.89,2.104, 15.009,6.301C 512.029,125.55, 511.90,138.861, 503.611,146.991z" />
-<glyph unicode="&#xe05a;" d="M 255.992,349.715c-116.967,0.00-234.758-127.177-234.758-127.177s 117.791-127.166, 234.758-127.166
-										c 116.984,0.00, 234.773,127.166, 234.773,127.166S 372.977,349.715, 255.992,349.715z M 255.992,133.905
-										c-49.705,0.00-90.00,40.261-90.00,90.011c0.00,49.703, 40.296,89.989, 90.00,89.989c 49.729,0.00, 90.023-40.286, 90.023-89.989
-										C 346.018,174.166, 305.721,133.905, 255.992,133.905zM 255.992,268.006c-24.32,0.00-44.104-19.78-44.104-44.09c0.00-24.313, 19.784-44.112, 44.104-44.112
-										c 24.332,0.00, 44.126,19.80, 44.126,44.112C 300.12,248.225, 280.326,268.006, 255.992,268.006z" />
-<glyph unicode="&#xe05b;" d="M 468.328,387.262l-47.784,48.149c-12.065,12.141-31.647,12.192-43.80,0.158l-30.197-29.965l 91.373-92.049
-							l 30.208,29.928C 480.271,355.555, 480.381,375.141, 468.328,387.262z M 85.751,146.693l 91.38-92.024l 238.881,237.066
-							l-91.432,92.096L 85.751,146.693z M 49.536,65.123L 32.512,2.57l 62.703,16.563l 58.26,15.346l-88.153,88.86L 49.536,65.123z" />
-<glyph unicode="&#xe05c;" d="M 322.097,448.198L 64.002,448.198 l0.00-448.696 l 352.527,0.00 L 416.529,354.50 L 322.097,448.198z M 319.368,415.375l 64.453-63.377l-64.453,0.00 L 319.368,415.375 z
-				 M 383.996,32.002L 96.002,32.002 L 96.002,415.998 L 288.00,415.998 l0.00-96.00 l 95.996,0.00 L 383.996,32.002 zM 127.404,207.801c0.00-62.186, 50.41-112.596, 112.596-112.596c 62.184,0.00, 112.596,50.41, 112.596,112.596
-				c0.00,62.181-50.412,112.591-112.596,112.591C 177.814,320.392, 127.404,269.982, 127.404,207.801z M 319.50,223.696l0.00-31.794 l-159.00,0.00 l0.00,31.794 
-				L 319.50,223.696 z" />
-<glyph unicode="&#xe05d;" d="M 322.097,448.198L 64.002,448.198 l0.00-448.696 l 352.527,0.00 L 416.529,354.50 L 322.097,448.198z M 319.368,415.375l 64.453-63.377l-64.453,0.00 L 319.368,415.375 z
-				 M 383.996,32.002L 96.002,32.002 L 96.002,415.998 L 288.00,415.998 l0.00-96.00 l 95.996,0.00 L 383.996,32.002 zM 127.404,207.801c0.00-62.186, 50.41-112.596, 112.596-112.596c 62.184,0.00, 112.596,50.41, 112.596,112.596
-				c0.00,62.181-50.412,112.591-112.596,112.591C 177.814,320.392, 127.404,269.982, 127.404,207.801z M 319.50,223.696l0.00-31.794 l-63.602,0.00 
-				l0.00-63.602 l-31.797,0.00 l0.00,63.602 L 160.50,191.902 l0.00,31.794 l 63.602,0.00 l0.00,63.601 l 31.797,0.00 l0.00-63.601 L 319.50,223.696 z" />
-<glyph unicode="&#xe05e;" d="M 322.097,448.198L 64.002,448.198 l0.00-448.696 l 352.527,0.00 L 416.529,354.50 L 322.097,448.198z M 319.368,415.375l 64.453-63.377l-64.453,0.00 L 319.368,415.375 z
-					 M 96.002,32.002L 96.002,415.998 L 288.00,415.998 l0.00-96.00 l 95.996,0.00 l0.00-287.996 L 96.002,32.002 z" />
-<glyph unicode="&#xe05f;" d="M 339.229,149.373c 0.009-0.672, 0.054-1.321, 0.054-1.988c0.00-68.036-55.351-123.383-123.39-123.383
-							c-68.031,0.00-123.383,55.347-123.383,123.383c0.00,41.116, 20.236,77.581, 51.258,100.014l-4.197,36.865
-							c-47.956-26.845-80.46-78.124-80.46-136.878c0.00-86.454, 70.329-156.783, 156.783-156.783c 73.287,0.00, 134.963,50.55, 152.064,118.604
-							L 339.229,149.373zM 155.871,409.356A39.893,39.893 540.00 1 0 235.657,409.356A39.893,39.893 540.00 1 0 155.871,409.356zM 452.941,100.229l-89.518,125.166c-4.685,6.555-12.505,9.654-20.441,8.976c-0.591,0.056-1.184,0.105-1.783,0.105
-						L 238.941,234.476 l-2.539,22.263l 76.006,0.00 c 8.842,0.00, 16.009,7.165, 16.009,16.004c0.00,8.837-7.167,16.001-16.009,16.001l-79.647,0.00 l-4.157,36.556
-						c-2.432,21.383-21.74,36.741-43.119,34.307c-21.383-2.437-36.741-21.741-34.305-43.117l 11.749-103.237
-						c 2.276-19.967, 19.247-34.658, 38.883-34.55c 0.067,0.00, 0.129-0.015, 0.201-0.015l 133.794,0.00 l 76.77-107.339
-						c 7.328-10.256, 22.315-12.11, 33.468-4.13C 457.188,75.191, 460.277,89.973, 452.941,100.229z" />
-<glyph unicode="&#xe060;" d="M 380.476,96.165A36.94,36.94 540.00 1 0 454.356,96.16500000000002A36.94,36.94 540.00 1 0 380.476,96.16500000000002zM 137.084,133.105c-20.396,0.00-36.936-16.539-36.936-36.939c0.00-20.402, 16.54-36.941, 36.936-36.941
-						c 20.406,0.00, 36.945,16.539, 36.945,36.941C 174.03,116.566, 157.491,133.105, 137.084,133.105zM 32.089,351.998L 319.996,351.998L 319.996,160.002L 32.089,160.002zM 447.996,287.998l-96.123,0.00 L 351.873,133.11 L 165.726,133.11 c 11.016-8.554, 18.113-21.914, 18.113-36.944l 186.825,0.00 
-						c0.00,25.823, 20.926,46.754, 46.752,46.754c 25.818,0.00, 46.752-20.931, 46.752-46.754l 6.414,0.00 c 5.15,0.00, 9.328,4.176, 9.328,9.332l0.00,18.005 
-						L 479.91,223.999 L 447.996,287.998z M 384.295,209.539l 0.115,46.223l 41.301,0.00 l 22.285-46.223L 384.295,209.539 zM 108.444,133.11L 32.196,133.11 L 32.10,119.348c0.00,0.00-1.209-23.182, 22.168-23.182s 25.151,0.00, 25.151,0.00L 90.33,96.166 
-						C 90.33,111.196, 97.428,124.557, 108.444,133.11z" />
-<glyph unicode="&#xe061;" d="M 462.879,367.121L 399.121,430.885L 256.00,287.769L 111.883,431.883L 48.119,368.119L 192.234,224.002L 47.115,78.885L 110.879,15.114L 256.00,160.239L 400.125,16.112L 463.883,79.883L 319.762,224.002 								z" />
-<glyph unicode="&#xe062;" d="M 256.50,450.167c-123.433,0.00-223.495-30.976-223.495-58.084c0.00-7.91,0.00-78.09,0.00-86.00c0.00-27.108, 100.063-58.084, 223.495-58.084
-						c 123.434,0.00, 223.496,30.976, 223.496,58.084c0.00,7.91,0.00,78.09,0.00,86.00C 479.996,419.19, 379.934,450.167, 256.50,450.167z M 256.50,352.218
-						c-92.096,0.00-166.755,16.965-166.755,34.191c0.00,17.226, 74.659,37.191, 166.755,37.191c 92.097,0.00, 166.757-19.965, 166.757-37.191
-						C 423.257,369.183, 348.597,352.218, 256.50,352.218zM 256.50,74.967c-121.174,0.00-219.815,27.18-223.385,53.602c-0.066-0.492-0.11-0.986-0.11-1.482c0.00-7.91,0.00-70.09,0.00-78.00
-						c0.00-27.108, 100.063-58.084, 223.495-58.084c 123.434,0.00, 223.496,30.976, 223.496,58.084c0.00,7.91,0.00,70.09,0.00,78.00
-						c0.00,0.496-0.044,0.99-0.11,1.482C 476.315,102.146, 377.675,74.967, 256.50,74.967zM 256.50,199.684c-121.174,0.00-219.815,30.18-223.385,56.602c-0.066-0.492-0.11-0.986-0.11-1.482c0.00-7.91,0.00-70.09,0.00-78.00
-						c0.00-27.108, 100.063-58.084, 223.495-58.084c 123.434,0.00, 223.496,30.976, 223.496,58.084c0.00,7.91,0.00,70.09,0.00,78.00
-						c0.00,0.496-0.044,0.99-0.11,1.482C 476.315,229.863, 377.675,199.684, 256.50,199.684z" />
-<glyph unicode="&#xe063;" d="M 32.003,384.085l0.00-256.083 l 447.994,0.00 L 479.997,384.085 L 32.003,384.085 z M 447.997,192.002
-				c-16.979,0.00-31.844-16.662-31.844-32.00c-85.539,0.00-312.823,0.00-319.494,0.00c0.00,15.988-12.478,33.004-32.656,33.004
-				c0.00,34.088,0.00,115.911,0.00,126.904c 23.808,0.00, 30.772,17.437, 30.772,32.176c 13.851,0.00, 306.301,0.00, 321.537,0.00
-				c0.00-15.313, 14.154-31.521, 31.685-31.521C 447.997,310.141, 447.997,199.875, 447.997,192.002zM 195.765,256.043A60.235,76.165 540.00 1 0 316.235,256.043A60.235,76.165 540.00 1 0 195.765,256.043zM 32.003,96.002L 479.997,96.002L 479.997,64.002L 32.003,64.002z" />
-<glyph unicode="&#xe064;" d="M 479.748,355.514c0.00,15.757-12.77,28.528-28.528,28.528L 60.78,384.042 c-15.756,0.00-28.528-12.771-28.528-28.528l0.00-263.027 
-					c0.00-15.759, 12.772-28.528, 28.528-28.528l 390.44,0.00 c 15.759,0.00, 28.528,12.77, 28.528,28.528L 479.748,355.514 z M 75.163,352.042l 362.455,0.00 
-					c 5.122,0.00, 10.629-5.509, 10.629-10.628l0.00-53.173 L 64.252,288.241 l0.00,53.173 C 64.252,346.533, 70.047,352.042, 75.163,352.042z M 437.617,96.046
-					L 75.163,96.046 c-5.116,0.00-10.91,3.203-10.91,8.32L 64.253,223.217 l 383.994,0.00 l0.00-118.851 C 448.246,99.249, 442.739,96.046, 437.617,96.046z" />
-<glyph unicode="&#xe065;" d="M 259.116,414.717C 136.071,417.138, 34.79,341.32, 32.90,245.367c-0.652-33.359, 10.793-64.75, 31.171-91.627l-0.004,0.00 
-									c 35.045-45.026-32.065-135.984-32.065-135.984l 141.793,62.193c 24.33-7.688, 50.769-12.167, 78.473-12.713
-									c 123.042-2.428, 224.325,73.396, 226.217,169.349C 480.369,332.54, 382.155,412.291, 259.116,414.717z" />
-<glyph unicode="&#xe066;" d="M 256.00-0.496C 132.211-0.496, 31.504,100.216, 31.504,224.00C 31.504,347.789, 132.211,448.496, 256.00,448.496
-							c 123.789,0.00, 224.496-100.708, 224.496-224.496C 480.496,100.216, 379.789-0.496, 256.00-0.496z M 256.00,394.617
-							c-94.078,0.00-170.617-76.539-170.617-170.617c0.00-94.082, 76.54-170.617, 170.617-170.617c 94.087,0.00, 170.617,76.535, 170.617,170.617
-							C 426.617,318.078, 350.087,394.617, 256.00,394.617zM 357.43,238.941l-83.642,0.00 l0.00,102.79 c0.00,12.339-9.996,22.339-22.345,22.339c-12.339,0.00-22.344-10.00-22.344-22.339l0.00-125.454 
-						c0.00-12.165, 9.87-22.025, 22.029-22.025L 357.43,194.252 c 12.339,0.00, 22.345,10.005, 22.345,22.344
-						C 379.774,228.936, 369.769,238.941, 357.43,238.941z" />
-<glyph unicode="&#xe067;" d="M 182.964,32.002c-25.798,69.719-85.798,136.165-148.651,176.979l 29.583,48.595
-								c 36.183-14.439, 115.92-60.484, 144.845-103.773c 47.26,107.101, 130.196,204.28, 238.443,265.649l 30.501-48.477
-								c-106.48-79.458-184.927-215.304-222.155-338.973L 182.964,32.002 z" />
-<glyph unicode="&#xe068;" d="M 463.271,351.953L 127.855,351.953 L 53.729,425.512C 43.326,435.835, 26.523,435.77, 16.20,425.367
-									C 5.877,414.964, 5.942,398.162, 16.345,387.839l 86.328-85.666l 34.09-156.646c0.00-9.678, 7.846-17.525, 17.525-17.525l 268.546,0.00 
-									c 9.686,0.00, 17.525,7.848, 17.525,17.525l 40.437,188.903C 480.797,344.112, 472.957,351.953, 463.271,351.953zM 334.075,48.083A47.978,47.978 540.00 1 0 430.031,48.08300000000003A47.978,47.978 540.00 1 0 334.075,48.08300000000003zM 144.259,48.083A47.978,47.978 540.00 1 0 240.215,48.08300000000003A47.978,47.978 540.00 1 0 144.259,48.08300000000003z" />
-<glyph unicode="&#xe069;" d="M 256.00,447.998C 132.289,447.998, 32.001,347.711, 32.001,224.00S 132.289,0.002, 256.00,0.002S 479.999,100.289, 479.999,224.00
-							S 379.711,447.998, 256.00,447.998z M 145.692,334.307c 29.464,29.464, 68.639,45.691, 110.308,45.691
-							c 28.047,0.00, 54.958-7.361, 78.544-21.152L 121.152,145.459c-13.79,23.585-21.151,50.495-21.151,78.541
-							C 100.001,265.668, 116.228,304.843, 145.692,334.307z M 366.308,113.693c-29.464-29.465-68.639-45.691-110.308-45.691
-							c-28.047,0.00-54.958,7.361-78.544,21.153l 213.387,213.394c 13.794-23.587, 21.156-50.50, 21.156-78.549
-							C 411.999,182.331, 395.772,143.157, 366.308,113.693z" />
-<glyph unicode="&#xe06a;" d="M 172.063,193.823L 217.844,193.823L 217.844,148.066L 172.063,148.066zM 236.52,132.598L 282.242,132.598L 282.242,86.848L 236.52,86.848zM 172.063,132.598L 217.844,132.598L 217.844,86.848L 172.063,86.848zM 172.063,255.05L 217.844,255.05L 217.844,209.319L 172.063,209.319zM 368.475,344.174c 10.469,0.00, 18.949,8.495, 18.949,18.977L 387.424,428.535 c-0.001,10.481-8.481,18.964-18.949,18.964
-										c-10.494,0.00-18.979-8.483-18.979-18.964l0.00-65.385 C 349.50,352.669, 357.981,344.174, 368.475,344.174zM 144.372,344.174c 10.467,0.00, 18.946,8.495, 18.946,18.977L 163.318,428.535 c0.00,10.481-8.479,18.964-18.946,18.964
-										c-10.495,0.00-18.979-8.483-18.979-18.964l0.00-65.385 C 125.395,352.669, 133.877,344.174, 144.372,344.174zM 107.603,193.823L 153.36,193.823L 153.36,148.066L 107.603,148.066zM 107.603,132.598L 153.36,132.598L 153.36,86.848L 107.603,86.848zM 236.52,193.823L 282.242,193.823L 282.242,148.066L 236.52,148.066zM 365.40,193.823L 411.155,193.823L 411.155,148.066L 365.40,148.066zM 365.40,255.05L 411.155,255.05L 411.155,209.319L 365.40,209.319zM 393.676,414.993l0.00-20.091 c 7.886-6.972, 12.886-17.154, 12.886-28.519c0.00-21.04-17.044-38.116-38.088-38.116
-										c-21.069,0.00-38.114,17.076-38.114,38.116c0.00,11.365, 5.001,21.547, 12.885,28.519L 343.245,414.993 L 169.575,414.993 l0.00-20.091 
-										c 7.885-6.972, 12.885-17.154, 12.885-28.519c0.00-21.04-17.044-38.116-38.087-38.116c-21.07,0.00-38.114,17.076-38.114,38.116
-										c0.00,11.365, 5.00,21.547, 12.884,28.519L 119.143,414.993 L 32.91,414.993 l0.00-415.021 l 447.103,0.00 L 480.013,414.993 L 393.676,414.993 z M 75.331,42.393L 75.331,307.647 l 363.134,0.00 
-										l 0.001-265.254L 75.331,42.393 zM 236.52,255.05L 282.242,255.05L 282.242,209.319L 236.52,209.319zM 300.972,255.05L 346.727,255.05L 346.727,209.319L 300.972,209.319zM 300.972,132.598L 346.727,132.598L 346.727,86.848L 300.972,86.848zM 300.972,193.823L 346.727,193.823L 346.727,148.066L 300.972,148.066z" />
-<glyph unicode="&#xe06b;" d="M 317.874,207.586L 223.48,285.505L 223.48,240.826L 161.002,240.828L 161.002,174.352L 223.478,174.35L 223.478,129.682 					zM 127.404,207.801c0.00,33.476, 14.616,63.534, 37.808,84.158L 32.002,336.244l0.00-260.247 L 224.50,12.002l0.00,84.27 
-						C 169.65,103.824, 127.404,150.875, 127.404,207.801zM 240.00,320.392c 15.104,0.00, 29.512-2.982, 42.674-8.377l 166.323,55.294L 240.50,436.634L 32.002,367.309l 165.772-55.11
-						C 210.815,317.478, 225.066,320.392, 240.00,320.392zM 352.596,207.801c0.00-56.84-42.12-103.833-96.848-111.494l0.00-84.305 l 192.497,63.995L 448.245,336.244 l-133.391-44.345
-						C 338.008,271.276, 352.596,241.244, 352.596,207.801z" />
-<glyph unicode="&#xe06c;" d="M 32.002,75.997L 224.50,12.002L 224.50,272.249L 32.002,336.244 					zM 240.50,436.634L 32.002,367.309L 240.50,297.995L 448.997,367.309 					zM 255.748,12.002L 448.245,75.997L 448.245,336.244L 255.748,272.249 					z" />
-<glyph unicode="&#xe06d;" d="M 381.254,375.126c 11.729-16.323, 17.626-35.857, 17.626-58.604c0.00-23.444-5.932-42.296-17.78-56.524
-										c-6.646-7.991-16.385-15.30-29.295-21.893c 19.581-7.107, 34.383-18.403, 44.349-33.856
-										c 9.959-15.455, 14.956-34.229, 14.956-56.263c0.00-22.745-5.709-43.133-17.101-61.193
-										c-7.229-11.979-16.293-22.063-27.188-30.225c-12.258-9.372-26.718-15.826-43.383-19.271
-										c-16.664-3.508-34.728-5.213-54.244-5.213l-173.00,0.00 L 96.194,416.011 l 185.54,0.00 C 328.561,415.327, 361.734,401.689, 381.254,375.126z
-										 M 172.782,349.338l0.00-84.655 l 93.312,0.00 c 16.665,0.00, 30.194,3.166, 40.59,9.496c 10.396,6.346, 15.609,17.581, 15.609,33.748
-										c0.00,17.875-6.893,29.682-20.639,35.423c-11.854,3.987-26.969,5.988-45.366,5.988L 172.782,349.338 z M 172.782,201.115l0.00-102.344 l 93.22,0.00 
-										c 16.632,0.00, 29.604,2.229, 38.885,6.765c 16.813,8.317, 25.229,24.298, 25.229,47.914c0.00,19.983-8.161,33.698-24.479,41.147
-										c-9.093,4.188-21.879,6.324-38.354,6.518L 172.782,201.115 z" />
-<glyph unicode="&#xe06e;" d="M 448.146,103.733c-32.37,33.626-39.422,96.247-46.244,144.357C 391.786,319.403, 389.655,399.545, 288.00,410.034L 288.00,422.951 
-					c0.00,12.958-19.774,23.464-32.732,23.464c-12.957,0.00-31.266-10.506-31.266-23.464l0.00-12.935 
-					c-100.815-10.558-104.324-90.674-114.348-161.949c-6.768-48.132-13.766-110.76-45.87-144.402
-					c-6.481-6.794-8.294-16.796-4.60-25.428c 3.698-8.639, 12.184-14.235, 21.576-14.235l 350.482,0.00 c 9.406,0.00, 17.907,5.619, 21.597,14.286
-					C 456.516,86.938, 454.672,96.957, 448.146,103.733zM 256.00-14.555c 25.712,0.00, 46.557,20.845, 46.557,46.557l-93.113,0.00 C 209.443,6.29, 230.287-14.555, 256.00-14.555z" />
-<glyph unicode="&#xe06f;" d="M 460.282,399.933c-29.559,29.429-80.832,26.523-110.294-3.051L 141.657,187.507
-					c-21.036-21.129-23.084-57.451-1.914-78.236c 21.114-21.168, 57.359-19.016, 78.394,2.113l 129.454,130.282
-					c 5.135,4.709, 5.525,12.354, 0.21,18.147c-4.96,5.409-15.472,5.629-19.813,1.268L 199.015,131.397l0.00,0.00
-					c-12.636-12.629-25.909-14.955-38.576-2.518c-12.674,12.531-12.258,27.254, 0.345,39.916l0.00,0.00l 206.882,207.896l0.00,0.00l-0.04,0.037
-					c 21.007,21.043, 50.964,23.467, 72.00,2.515c 20.731-20.977, 21.542-54.067, 0.265-75.111l 0.007,0.045L 186.923,49.795l 0.01-0.031
-					c-28.166-26.053-75.066-31.572-106.799-0.541c-29.505,29.422-26.095,77.855, 0.506,107.701l 175.476,176.465
-					c 2.717,2.805, 5.619,13.408-0.289,18.62c-5.189,4.579-15.311,5.955-18.934,2.314L 61.859,177.889
-					c-43.236-45.451-41.512-112.49-3.464-150.205c 38.01-37.904, 106.534-40.826, 149.494,2.51L 461.10,284.58
-					C 490.632,314.03, 489.853,370.50, 460.282,399.933z" />
-<glyph unicode="&#xe070;" d="M 256.023,463.354L 32.188,192.187L 160.536,192.187L 160.531-1.098L 351.492-1.098L 351.498,192.18L 479.813,192.18 					z" />
-<glyph unicode="&#xe071;" d="M 496.124,223.978L 224.957,447.812L 224.957,319.464L 31.672,319.469L 31.672,128.508L 224.949,128.502L 224.949,0.188 					z" />
-<glyph unicode="&#xe072;" d="M 15.544,223.978L 286.711,447.812L 286.711,319.464L 479.996,319.469L 479.996,128.508L 286.719,128.502L 286.719,0.188 					z" />
-<glyph unicode="&#xe073;" d="M 255.977-15.256L 479.813,255.912L 351.463,255.912L 351.469,449.198L 160.507,449.198L 160.501,255.92L 32.188,255.92 					z" />
-<glyph unicode="&#xe074;" d="M 395.786,207.949c-0.646,64.859, 52.894,95.965, 55.287,97.51c-30.085,44.022-76.946,50.053-93.647,50.749
-					c-39.881,4.039-77.818-23.48-98.059-23.48c-20.189,0.00-51.423,22.884-84.50,22.281c-43.47-0.646-83.552-25.275-105.935-64.207
-					c-45.164-78.371-11.565-194.472, 32.454-258.033c 21.51-31.111, 47.159-66.057, 80.835-64.808
-					c 32.43,1.295, 44.693,20.983, 83.90,20.983c 39.208,0.00, 50.229-20.983, 84.549-20.339c 34.896,0.648, 57.006,31.707, 78.366,62.914
-					c 24.702,36.094, 34.872,71.038, 35.472,72.832C 463.735,104.708, 396.461,130.479, 395.786,207.949z M 331.301,398.287
-					c 17.874,21.685, 29.938,51.77, 26.647,81.783c-25.746-1.048-56.954-17.149-75.426-38.785
-					c-16.575-19.194-31.083-49.826-27.194-79.24C 284.069,359.802, 313.408,376.65, 331.301,398.287z" />
-<glyph unicode="&#xe075;" d="M 432.00,320.00c-17.601,0.00-32.00-14.40-32.00-32.00l0.00-128.00 c0.00-17.60, 14.399-32.00, 32.00-32.00c 17.60,0.00, 32.00,14.40, 32.00,32.00L 464.00,288.00 C 464.00,305.60, 449.60,320.00, 432.00,320.00z
-					 M 48.00,320.00c-17.601,0.00-32.00-14.40-32.00-32.00l0.00-128.00 c0.00-17.60, 14.399-32.00, 32.00-32.00c 17.60,0.00, 32.00,14.40, 32.00,32.00L 80.00,288.00 C 80.00,305.60, 65.599,320.00, 48.00,320.00z M 96.00,112.00
-					c0.00-26.51, 21.49-48.00, 48.00-48.00l 16.00,0.00 l0.00-64.00 c0.00-17.60, 14.399-32.00, 32.00-32.00c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,64.00 l 32.00,0.00 l0.00-64.00 c0.00-17.60, 14.40-32.00, 32.00-32.00
-					c 17.599,0.00, 32.00,14.40, 32.00,32.00l0.00,64.00 l 16.00,0.00 c 26.51,0.00, 48.00,21.49, 48.00,48.00L 384.00,288.00 L 96.00,288.00 L 96.00,112.00 z M 299.299,435.253l 20.252,38.903
-					c 1.016,1.951, 0.25,4.379-1.701,5.395c-1.951,1.016-4.379,0.25-5.396-1.701l-20.559-39.493C 275.797,444.581, 258.299,448.00, 240.00,448.00
-					c-18.298,0.00-35.796-3.419-51.898-9.643L 167.544,477.849c-1.017,1.951-3.443,2.717-5.396,1.701
-					c-1.952-1.016-2.717-3.443-1.701-5.395l 20.25-38.904c-45.314-20.509-78.119-63.792-83.81-115.252l 286.22,0.00 
-					C 377.42,371.461, 344.614,414.743, 299.299,435.253z M 176.00,344.80c-12.813,0.00-23.20,10.387-23.20,23.20s 10.387,23.20, 23.20,23.20
-					c 12.813,0.00, 23.20-10.387, 23.20-23.20C 199.199,355.187, 188.813,344.80, 176.00,344.80z M 304.00,344.80c-12.813,0.00-23.201,10.387-23.201,23.20
-					S 291.188,391.20, 304.00,391.20c 12.812,0.00, 23.198-10.387, 23.198-23.20S 316.813,344.80, 304.00,344.80z" />
-<glyph unicode="&#xe076;" d="M 32.74,415.823l0.00-64.651 L 480.00,351.172 L 480.00,415.823 L 32.74,415.823 z M 480.00,320.151L 32.74,320.151 l0.00-64.652 L 480.00,255.499 L 480.00,320.151 z M 480.00,223.831L 32.74,223.831 l0.00-64.667 L 480.00,159.164 
-											L 480.00,223.831 z M 479.854,127.831L 241.426,127.831 l0.00-64.667 l 238.428,0.00 L 479.854,127.831 z" />
-<glyph unicode="&#xe077;" d="M 32.741,415.823l0.00-64.651 L 480.00,351.172 L 480.00,415.823 L 32.741,415.823 z M 32.741,255.861L 480.00,255.861 l0.00,64.652 L 32.741,320.513 L 32.741,255.861 z M 32.741,159.164L 480.00,159.164 
-											l0.00,64.667 L 32.741,223.831 L 32.741,159.164 z M 32.887,63.164l 238.427,0.00 l0.00,64.668 L 32.887,127.832 L 32.887,63.164 z" />
-<glyph unicode="&#xe078;" d="M 32.37,415.823l0.00-64.651 l 447.26,0.00 L 479.63,415.823 L 32.37,415.823 z M 32.37,255.861l 447.26,0.00 l0.00,64.652 L 32.37,320.513 L 32.37,255.861 z M 32.37,158.99l 447.26,0.00 
-											l0.00,64.666 L 32.37,223.656 L 32.37,158.99 z M 136.786,63.164l 238.428,0.00 l0.00,64.668 L 136.786,127.832 L 136.786,63.164 z" />
-<glyph unicode="&#xe079;" d="M 55.773,415.998L 89.242,65.979L 179.998,156.734L 316.659,20.057L 451.689,155.088L 315.025,291.759L 405.758,382.491 						z" />
-<glyph unicode="&#xe07a;" d="M 451.689,415.998L 418.221,65.979L 327.465,156.734L 190.804,20.057L 55.773,155.088L 192.438,291.759L 101.705,382.491 						z" />
-<glyph unicode="&#xe07b;" d="M 55.773,28.153L 89.242,378.178L 179.998,287.422L 316.659,424.10L 451.689,289.069L 315.025,152.393L 405.758,61.661 						z" />
-<glyph unicode="&#xe07c;" d="M 451.689,28.153L 418.221,378.178L 327.465,287.422L 190.804,424.10L 55.773,289.069L 192.438,152.393L 101.705,61.661 						z" />
-<glyph unicode="&#xe015;" d="M 255.50,479.00L 31.938,255.437L 159.688,255.437L 159.688-32.00L 351.313-32.00L 351.313,255.437L 479.063,255.437 	z" />
-<glyph unicode="&#xe01e;" d="M 142.056-32.649L-0.909,156.133L 88.021,223.45L 182.043,99.299L 418.531,479.002L 513.212,420.044L 233.86-32.649 			
-				z" />
-<glyph unicode="&#xe07d;" d="M 511.352,435.355L 467.354,479.351L 256.00,267.998L 44.646,479.351L 0.649,435.355L 212.003,224.00L 0.649,12.647L 44.646-31.351L 256.00,180.004L 467.354-31.351L 511.352,12.647L 299.997,224.00 	
-		z" />
-<glyph unicode="&#xe07e;" d="M 432.324,224.013c0.00,27.226, 16.741,48.712, 41.994,63.479c-4.563,15.178-10.563,29.739-17.998,43.431
-			c-28.278-7.384-51.198,3.691-70.452,22.971c-19.254,19.228-25.15,42.149-17.741,70.453c-13.69,7.409-28.253,13.434-43.456,17.972
-			c-14.767-25.254-41.456-41.996-68.685-41.996c-27.226,0.00-53.889,16.741-68.682,41.996c-15.204-4.539-29.74-10.563-43.456-17.972
-			c 7.409-28.304, 1.512-51.225-17.742-70.453c-19.254-19.279-42.149-30.354-70.453-22.971c-7.409-13.692-13.434-28.253-17.972-43.431
-			c 25.228-14.767, 41.996-36.252, 41.996-63.479c0.00-27.228-16.768-53.942-41.996-68.71c 4.539-15.177, 10.563-29.74, 17.972-43.43
-			c 28.304,7.383, 51.199,1.488, 70.453-17.74c 19.254-19.28, 25.151-42.175, 17.742-70.454c 13.715-7.436, 28.251-13.459, 43.456-17.997
-			c 14.793,25.228, 41.457,41.994, 68.682,41.994c 27.229,0.00, 53.918-16.767, 68.685-41.994c 15.203,4.538, 29.766,10.562, 43.456,17.997
-			c-7.383,28.279-1.513,51.174, 17.741,70.454c 19.254,19.229, 42.174,30.327, 70.452,22.918c 7.436,13.692, 13.436,28.253, 17.998,43.482
-			C 449.065,175.301, 432.324,196.785, 432.324,224.013z M 255.986,129.051c-52.428,0.00-94.936,42.508-94.936,94.962
-			c0.00,52.43, 42.508,94.911, 94.936,94.911c 52.456,0.00, 94.938-42.481, 94.938-94.911C 350.924,171.559, 308.442,129.051, 255.986,129.051z" />
-<glyph unicode="&#xe07f;" d="M 427.555,397.486L 84.457,397.486 l-28.806-54.838L 456.35,342.648 L 427.555,397.486zM 321.42,449.405L 189.754,449.405 l0.00-26.547 L 321.42,422.858 L 321.42,449.405 zM 114.156-1.405l 283.702,0.00 l 28.795,317.869L 85.348,316.464 L 114.156-1.405z M 322.633,288.831l 25.488,0.00 l0.00-261.495 l-25.488,0.00 L 322.633,288.831 z
-			 M 242.424,288.831l 26.314,0.00 l0.00-261.495 l-26.314,0.00 L 242.424,288.831 z M 163.04,288.831l 26.328,0.00 l0.00-261.495 L 163.04,27.336 L 163.04,288.831 z" />
-<glyph unicode="&#xe080;" d="M 256.00,479.511C 114.885,479.511, 0.489,365.115, 0.489,224.00c0.00-141.114, 114.396-255.512, 255.511-255.512
-					c 141.114,0.00, 255.512,114.397, 255.512,255.512C 511.512,365.115, 397.114,479.511, 256.00,479.511z M 256.00,127.719
-					c-53.174,0.00-96.281,43.107-96.281,96.281c0.00,53.174, 43.106,96.281, 96.281,96.281c 53.173,0.00, 96.281-43.106, 96.281-96.281
-					C 352.281,170.826, 309.173,127.719, 256.00,127.719z M 48.198,136.23C 36.447,164.014, 30.489,193.543, 30.489,224.00
-					s 5.958,59.987, 17.709,87.77c 11.357,26.85, 27.621,50.97, 48.341,71.69c 0.377,0.377, 0.765,0.743, 1.145,1.118l 70.208-70.208
-					c-23.534-22.95-38.173-54.98-38.173-90.37s 14.64-67.42, 38.173-90.37l-70.208-70.209c-0.38,0.375-0.767,0.74-1.145,1.118
-					C 75.819,85.26, 59.555,109.38, 48.198,136.23z M 415.461,64.539c-0.446-0.446-0.902-0.878-1.352-1.32L 343.90,133.427
-					c 23.655,22.964, 38.381,55.079, 38.381,90.573c0.00,35.494-14.726,67.608-38.38,90.572l 70.208,70.208
-					c 0.449-0.441, 0.905-0.874, 1.352-1.32c 20.72-20.72, 36.984-44.84, 48.341-71.691c 11.751-27.783, 17.71-57.313, 17.71-87.77
-					s-5.959-59.986-17.71-87.77C 452.445,109.38, 436.181,85.26, 415.461,64.539z"  />
-<glyph unicode="&#xe081;" d="M 388.625,403.627l-13.938-81.237c-23.799,14.508-50.48,25.514-77.758,30.756l-9.889-66.753
-				c 76.615-22.632, 114.924-50.506, 114.924-123.62c0.00-88.813-63.846-124.785-147.418-125.357l-9.291-67.92l-44.681,9.861l 8.708,60.941
-				c-34.83,5.217-67.325,16.844-99.248,33.662l 12.77,80.094c 40.047-21.465, 71.386-31.924, 103.297-36.545l 11.613,80.666
-				c-71.97,21.465-116.65,47.003-116.65,119.544c0.00,72.566, 49.326,117.831, 142.189,117.831c 1.738,0.00, 2.906,0.00, 4.646,0.00l 6.385,42.954
-				l 44.107-9.863l-5.217-37.736C 340.453,425.688, 365.992,416.397, 388.625,403.627z M 255.131,357.792
-				c-30.185,0.00-42.37-10.459-42.37-27.874c0.00-14.509, 8.708-23.204, 39.463-33.091l 8.708,60.965
-				C 259.191,357.792, 256.869,357.792, 255.131,357.792z M 310.27,149.408c0.00,18.012-8.721,28.445-37.725,38.309l-11.029-71.945
-				C 292.258,116.342, 310.27,127.945, 310.27,149.408z"  />
-<glyph unicode="&#xe082;" d="M 128.00,447.998L 192.00,447.998L 192.00,383.998L 128.00,383.998zM 128.00,351.998L 192.00,351.998L 192.00,287.998L 128.00,287.998zM 128.00,255.998L 192.00,255.998L 192.00,191.998L 128.00,191.998zM 128.00,159.897L 192.00,159.897L 192.00,95.897L 128.00,95.897zM 128.00,64.002L 192.00,64.002L 192.00,0.002L 128.00,0.002zM 224.00,447.998L 288.00,447.998L 288.00,383.998L 224.00,383.998zM 224.00,351.998L 288.00,351.998L 288.00,287.998L 224.00,287.998zM 224.00,255.998L 288.00,255.998L 288.00,191.998L 224.00,191.998zM 224.00,159.897L 288.00,159.897L 288.00,95.897L 224.00,95.897zM 224.00,64.002L 288.00,64.002L 288.00,0.002L 224.00,0.002zM 320.00,447.998L 384.00,447.998L 384.00,383.998L 320.00,383.998zM 320.00,351.998L 384.00,351.998L 384.00,287.998L 320.00,287.998zM 320.00,255.998L 384.00,255.998L 384.00,191.998L 320.00,191.998zM 320.00,159.897L 384.00,159.897L 384.00,95.897L 320.00,95.897zM 320.00,64.002L 384.00,64.002L 384.00,0.002L 320.00,0.002z"  />
-<glyph unicode="&#xe083;" d="M 160.00,352.00L 224.00,352.00L 224.00,288.00L 160.00,288.00zM 160.00,256.00L 224.00,256.00L 224.00,192.00L 160.00,192.00zM 160.00,160.00L 224.00,160.00L 224.00,96.00L 160.00,96.00zM 256.00,352.00L 320.00,352.00L 320.00,288.00L 256.00,288.00zM 256.00,256.00L 320.00,256.00L 320.00,192.00L 256.00,192.00zM 256.00,160.00L 320.00,160.00L 320.00,96.00L 256.00,96.00z"  />
-<glyph unicode="&#xe084;" d="M 479.47,447.998L 128.002,447.998 l0.00-128.00 c-40.639,0.00-96.00,0.00-96.00,0.00L 32.002,0.53 l 351.994,0.00 L 383.996,128.002 l 95.474,0.00 L 479.47,447.998 z
-			 M 319.996,64.002L 96.002,64.002 L 96.002,224.264 l 32.00,0.00 l0.00-96.262 l 191.994,0.00 C 319.996,102.986, 319.996,64.002, 319.996,64.002z M 415.996,192.002L 192.002,192.002 
-			L 192.002,351.998 l 223.994,0.00 L 415.996,192.002 z"  />
-<glyph unicode="&#xe085;" d="M 509.249,56.123L 269.033,461.332c-3.088,5.49-9.051,8.531-15.301,7.53
-			c-4.615-0.733-8.547-3.573-10.765-7.53L 2.752,56.123c-2.635-4.683-2.639-10.691,0.00-15.354c 2.676-4.724, 7.629-7.82, 13.023-7.82
-			l 480.445,0.00 c 5.383,0.00, 10.354,3.097, 13.028,7.82C 511.885,45.432, 511.885,51.44, 509.249,56.123z M 255.969,57.917
-			c-21.576,0.00-39.07,17.883-39.07,39.942c0.00,22.09, 17.494,39.972, 39.07,39.972c 21.562,0.00, 39.07-17.882, 39.07-39.972
-			C 295.039,75.80, 277.53,57.917, 255.969,57.917z M 278.495,161.388l-45.381,0.00 c0.00,0.00-16.312,96.182-16.312,162.234
-			c0.00,40.005, 4.77,60.375, 39.414,60.375c 26.641,0.00, 37.574-17.129, 37.574-58.226C 293.791,259.751, 278.495,161.388, 278.495,161.388z"  />
-<glyph unicode="&#xe086;" d="M 256.00,478.473c-140.549,0.00-254.489-113.94-254.489-254.458c0.00-140.581, 113.94-254.488, 254.489-254.488
-				s 254.488,113.907, 254.488,254.488C 510.488,364.533, 396.549,478.473, 256.00,478.473z M 304.791,336.772
-				c0.00-66.021-26.296-174.384-26.296-174.384l-45.38,0.00 c0.00,0.00-26.312,106.182-26.312,172.234c0.00,40.005, 14.769,61.378, 49.413,61.378
-				C 282.857,396.00, 304.791,377.868, 304.791,336.772z M 255.969,58.917c-21.576,0.00-39.07,17.883-39.07,39.942
-				c0.00,22.09, 17.494,39.972, 39.07,39.972c 21.562,0.00, 39.07-17.882, 39.07-39.972C 295.039,76.80, 277.53,58.917, 255.969,58.917z"  />
-<glyph unicode="&#xe000;" d="M 470.70,72.193l-2.688,2.688l 0.006,0.002L 360.505,182.408c 14.938,25.732, 23.612,55.564, 23.816,87.451
-						c 0.626,97.615-77.986,177.243-175.599,177.857c-0.394,0.001-0.771,0.002-1.168,0.002
-						c-97.06-0.006-176.063-78.391-176.688-175.598c-0.618-97.609, 77.999-177.236, 175.597-177.859
-						c 0.389-0.002, 0.766-0.004, 1.155-0.004c 32.438,0.00, 62.846,8.79, 88.998,24.075l 107.415-107.433l 0.014,0.01l 2.688-2.688
-						c 8.125-8.123, 21.293-8.114, 29.41,0.00l 34.562,34.557C 478.819,50.895, 478.822,64.07, 470.70,72.193z M 300.39,177.58
-						c-24.834-24.67-57.78-38.252-92.768-38.252l-0.874,0.00 c-72.589,0.467-131.271,59.908-130.813,132.503
-						c 0.465,72.128, 59.516,130.811, 131.626,130.815l 0.879-0.002c 35.168-0.22, 68.146-14.123, 92.852-39.148
-						c 24.706-25.025, 38.188-58.178, 37.966-93.352C 339.031,235.128, 325.229,202.25, 300.39,177.58zM 128.503,287.997L 287.501,287.997L 287.501,256.203L 128.503,256.203z"  />
-<glyph unicode="&#x20;" horiz-adv-x="256" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/MUI-Icons/MUI-Icons.ttf b/lib/web/fonts/MUI-Icons/MUI-Icons.ttf
deleted file mode 100644
index 533d70c5251f8..0000000000000
Binary files a/lib/web/fonts/MUI-Icons/MUI-Icons.ttf and /dev/null differ
diff --git a/lib/web/fonts/UX-Icons/UX-Icons.eot b/lib/web/fonts/UX-Icons/UX-Icons.eot
deleted file mode 100644
index 296bf3c19aa1f..0000000000000
Binary files a/lib/web/fonts/UX-Icons/UX-Icons.eot and /dev/null differ
diff --git a/lib/web/fonts/UX-Icons/UX-Icons.svg b/lib/web/fonts/UX-Icons/UX-Icons.svg
deleted file mode 100644
index 85a68c310325e..0000000000000
--- a/lib/web/fonts/UX-Icons/UX-Icons.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="icomoon" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
-<glyph unicode="&#xe600;" d="M709.921 789.454c8.139-32.295 8.927-34.974 8.192-68.162-0.263-12.813-7.772-71.943-5.724-90.112 1.628-14.966 5.461-16.174 11.448-28.514 10.398-21.425 6.984-51.095 2.941-72.678-2.206-11.868-6.827-28.725-13.916-38.387-7.667-10.66-23.211-10.713-30.142-23.158-9.872-17.854-4.306-43.008-10.503-62.385-7.142-21.898-25.101-23.421-26.466-52.145 8.822-1.155 17.592-2.468 26.466-3.623 8.822-18.59 25.049-55.874 41.59-67.059 13.863-3.728 27.727-7.457 41.59-11.185 48.627-19.64 102.558-43.061 151.237-63.33 44.373-18.432 97.411-24.996 113.48-70.84 0-31.035 2.941-104.501 2.153-145.25h-965.553c-0.893 40.697 2.153 114.215 2.153 145.25 15.964 45.844 69.002 52.408 113.375 70.84 48.679 20.27 102.61 43.691 151.237 63.33 13.811 3.728 27.674 7.457 41.59 11.185 16.489 11.185 32.715 48.522 41.538 67.059l19.692 4.621c-4.464 24.576-19.85 26.466-26.256 43.743-2.521 26.099-5.041 52.145-7.509 78.192 0.053-1.155-18.117 3.361-20.48 4.779-25.731 15.806-26.204 80.24-28.725 107.021-1.103 12.183 16.174 22.265 11.343 44.636-28.094 131.44 12.183 192.88 75.881 213.307 44.216 17.749 126.871 50.465 203.855 3.728l19.167-17.487 30.93-5.251c15.491-8.77 25.416-38.124 25.416-38.124z" horiz-adv-x="1090" />
-<glyph unicode="&#xe601;" d="M529.203 62.008l-468.465 628.209h936.931l-468.465-628.209z" horiz-adv-x="1085" />
-<glyph unicode="&#xe602;" d="M976.793-33.858h-910.388v910.388h910.388v-910.388zM912.622 812.359h-782.046v-782.088h782.046v782.088zM221.432 125.348h152.876v372.033h-152.876v-372.033zM466.323 127.914h350.932v366.53h-350.932v-366.53zM221.432 587.659h595.865v147.125h-595.865v-147.125z" horiz-adv-x="1034" />
-<glyph unicode="&#xe603;" d="M264.319 639.317c75.685 0 136.98 61.259 136.98 136.944 0 75.649-61.295 136.98-136.98 136.98s-137.017-61.331-137.017-136.98c0-75.649 61.331-136.944 137.017-136.944zM448.929 577.297c-28.962 28.926-63.325 46.252-187.655 46.252s-157.859-18.776-185.335-46.252c-27.44-27.44-18.196-320.43-18.196-320.43l60.824 144.411 38.241-430.334 110.23 220.278 102.907-220.278 36.393 430.334 60.824-144.411c-0.036 0 10.693 291.468-18.233 320.43z" horiz-adv-x="489" />
-<glyph unicode="&#xe604;" d="M680.975 874.42c-337.523 0-610.976-273.515-611.038-610.976 0.122-37.72 1.039-251.812 1.039-251.812h1219.997c0 0 0.978 239.219 1.039 251.812-0.183 337.523-273.637 610.976-611.038 610.976zM737.708 750.317c31.117-3.607 61.379-10.271 90.418-19.624l-19.93-61.685c-25.004 8.070-51.169 13.939-78.191 16.995l7.703 64.313zM270.091 274.998h-64.864c0 31.423 3.118 62.235 8.803 92.007l63.702-12.349c-5.135-25.799-7.642-52.392-7.642-79.658zM305.855 443.729l-59.178 26.288c12.655 28.489 28 55.449 45.79 80.636l52.942-37.475c-15.284-21.825-28.611-45.056-39.554-69.449zM407.46 582.993l-43.405 48.113c22.925 20.541 47.807 39.187 74.462 54.96l33.318-55.571c-22.987-13.755-44.567-29.65-64.374-47.501zM536.943 730.693c29.039 9.292 59.178 16.017 90.418 19.624l7.581-64.313c-26.838-3.057-53.003-8.926-78.13-16.995l-19.869 61.685zM761.673 146.616l-152.897-27.205-38.881 150.452 395.172 404.22-203.394-527.467zM1019.476 513.177l52.942 37.414c17.79-25.187 33.257-52.148 45.851-80.636l-59.178-26.288c-10.943 24.454-24.209 47.685-39.615 69.51zM1094.916 274.998c0 27.266-2.69 53.859-7.703 79.658l63.702 12.349c5.808-29.834 8.803-60.645 8.803-92.007h-64.802zM646.006 177.489c26.777-17.056 62.174-9.415 79.291 17.24 17.118 26.593 9.292 62.051-17.301 79.108-26.655 17.24-62.051 9.354-79.23-17.362-17.118-26.349-9.476-61.99 17.24-78.986z" horiz-adv-x="1376" />
-<glyph unicode="&#xe605;" d="M24.097 834.683h972.827v-111.922l-410.504-412.792v-238.366l-171.447-87.505v325.871l-390.875 415.877v108.837z" />
-<glyph unicode="&#xe606;" d="M454.495 899.249l-402.697-240.513v-457.026l104.632-60.727v457.049l298.157 178.728 299.698-179.142-0.138-455.922 103.528 60.013v457.026l-403.18 240.513zM507.766 617.868v-534.344l-53.271-32.124-53.34 32.262v533.792l-138.090-83.853v-456.934l191.453-115.516 193.087 116.322v456.451l-139.839 83.945z" horiz-adv-x="903" />
-<glyph unicode="&#xe607;" d="M870.821 216.311c-64.195 65.89-78.231 188.772-91.738 283.159-20.074 139.937-24.259 297.089-226.008 317.693v25.318c0 25.424-39.195 46.028-64.937 46.028s-62.024-20.551-62.024-46.028v-25.371c-200.054-20.816-206.993-177.914-226.855-317.693-13.453-94.439-27.331-217.268-91.049-283.264-12.818-13.348-16.473-32.998-9.11-49.947 7.362-16.843 24.153-27.913 42.797-27.913h695.343c18.75 0 35.593 11.070 42.903 28.019s3.655 36.653-9.322 50zM489.569-15.735c51.060 0 92.373 40.837 92.373 91.367h-184.694c-0.053-50.53 41.314-91.367 92.32-91.367z" horiz-adv-x="989" />
-<glyph unicode="&#xe608;" d="M252.137 794.92l-160.070-92.393 378.042-218.205 160.023 92.393-377.996 218.205zM845.638 701.085l-377.996 218.252-145.222-83.828 377.996-218.205 145.222 83.782zM502.784 421.998v-433.664l376.832 217.507v433.711l-376.832-217.553zM55.668 205.888l376.785-217.507v436.503l-376.785 217.46v-436.457z" horiz-adv-x="954" />
-<glyph unicode="&#xe609;" d="M59.153 413.966l164.053-38.141v303.902l-164.053-38.141v-227.621zM1122.198 888.995l-837.712-194.959v-335.978l140.328-376.832 151.712 57.45-104.049 279.113 649.668-151.18v722.385z" horiz-adv-x="1170" />
-<glyph unicode="&#xe60a;" d="M736.707-33.086h207.134v322.703h-207.134v-322.703zM399.646-33.086h207.134v946.793h-207.134v-946.793zM62.673-33.042h207.134v634.704h-207.134v-634.704z" horiz-adv-x="991" />
-<glyph unicode="&#xe60b;" d="M426.502 335.631c-15.866 13.512-42.796 25.753-80.79 36.723v-198.774c11.535 1.459 23.729 4.331 36.299 8.851 12.618 4.426 23.87 10.829 33.804 19.068 9.981 8.427 18.173 18.55 24.529 30.649 6.638 12.006 9.651 26.365 9.651 42.89 0.047 26.836-7.721 47.222-23.493 60.593zM576.736 211.292c-7.109-23.117-19.774-45.762-38.135-67.749-18.503-22.175-43.079-41.855-74.010-58.992-30.885-17.373-70.432-27.683-118.878-31.12v-88.088h-57.014v88.088c-72.080 5.603-128.483 29.237-169.113 71.374-40.536 42.090-63.935 104.095-70.432 185.544h136.251c-0.753-39.359 8.992-70.479 28.86-93.266 20.15-22.74 44.774-37.335 74.434-43.455v216.523c-3.060 1.318-7.486 2.919-12.994 4.567-5.508 1.789-11.393 3.343-17.938 4.708-23.776 6.827-47.175 15.019-70.291 24.294-23.493 9.369-44.114 21.704-62.523 37.335-18.456 15.584-33.098 34.84-43.879 57.956-11.111 23.211-16.478 51.977-16.478 86.487 0 35.31 6.168 66.336 18.785 93.313 12.665 26.836 29.143 49.529 49.858 67.702 20.621 18.314 44.303 32.58 71.468 42.419 27.071 10.122 55.037 16.149 83.992 18.314v79.66h57.014v-79.66c29.143-3.531 56.308-10.169 81.638-20.292 25.423-10.028 47.787-23.729 67.137-41.478 19.585-17.514 35.357-39.453 47.457-65.771 12.288-26.13 19.35-57.109 21.28-93.172h-137.287c-0.518 27.636-8.616 51.082-23.917 70.432-15.725 19.303-34.275 29.002-56.308 29.002v-183.331c7.862-2.072 15.631-4.143 23.729-6.12 8.098-2.072 16.525-4.567 25.565-7.297 47.645-13.983 84.415-31.12 110.168-51.318 25.8-20.292 44.726-41.666 56.92-63.653 12.335-22.175 19.633-44.256 21.704-66.336 2.448-22.081 3.531-41.713 3.531-59.039 0.047-15.207-3.531-34.416-10.593-57.579zM228.905 684.733c-8.38-7.156-15.113-16.196-19.962-26.883-4.802-10.781-7.062-23.352-7.062-37.759 0-22.834 6.733-40.536 20.103-52.824 13.653-12.618 35.734-22.552 66.713-30.131v168.831c-10.829 0-21.516-1.695-31.826-5.226-10.216-3.437-19.633-8.851-27.966-16.007z" horiz-adv-x="659" />
-<glyph unicode="&#xe60c;" d="M555.139 926.506c-218.775 71.601-457.062-40.29-532.231-250.028-75.227-209.681 41.211-437.665 259.928-509.208 218.717-71.601 457.004 40.348 532.231 250.028s-41.211 437.665-259.928 509.208zM320.076 271.103c-158.915 52.089-243.467 217.681-188.903 369.978 54.679 152.296 227.754 233.625 386.669 181.593s243.409-217.624 188.788-369.92c-54.622-152.296-227.696-233.567-386.554-181.65zM638.482 262.354l358.927-349.602 24.807 69.241 24.865 69.241-310.348 302.29z" horiz-adv-x="1109" />
-<glyph unicode="&#xe60d;" d="M1098.281 862.698c19.777 3.723 34.901 21.232 34.901 42.347-0.058 23.791-19.196 43.103-42.812 43.103h-900.508c-23.675 0-42.754-19.312-42.754-43.103 0-21.057 15.007-38.566 34.843-42.347l-181.951-354.421v-68.988c0-30.946 32.516-56.016 72.594-56.016 13.437 0 26.001 2.908 36.821 7.795v-466.919h1061.286v466.919c10.878-4.944 23.326-7.795 36.879-7.795 40.078 0 72.594 25.071 72.594 56.016v68.988l-181.893 354.421zM214.758 383.273c-38.217 0-69.221 25.071-69.221 56.016v6.457h-0.349v62.531l137.162 353.665h109.648l-107.961-353.665v-68.988c0 0 0 0 0 0 0-30.946-31.004-56.016-69.279-56.016zM498.447 383.273c-38.217 0-69.221 25.071-69.221 56.016v68.988l57.354 353.665h109.241l-28.095-353.665v-68.93c-0.058-31.004-31.004-56.075-69.279-56.075zM782.077 383.273c-38.217 0-69.162 25.071-69.162 56.016v68.988l-28.154 353.665h108.892l57.296-353.665v-68.988c0-0.931 0.175-1.92 0.233-2.792-1.803-29.666-32.051-53.224-69.104-53.224zM1134.637 439.289c0-30.946-31.004-56.016-69.221-56.016s-69.162 25.071-69.162 56.016v68.988l-108.019 353.665h109.59l137.22-353.665v-62.473h-0.349v-6.515h-0.058z" horiz-adv-x="1280" />
-<glyph unicode="&#xe60e;" d="M1024 380.306v116.547l-141.218 46.117-33.219 80.36 63.981 135.383-82.407 82.407-15.458-7.831-117.008-59.477-80.309 33.321-50.57 141.014h-116.496l-5.374-16.533-40.743-124.686-80.258-33.321-135.537 63.981-82.356-82.407 7.882-15.407 59.323-117.059-33.219-80.258-141.014-50.519v-116.547l141.218-46.066 33.219-80.36-63.878-135.383 82.254-82.407 15.458 7.831 117.008 59.425 80.36-33.27 50.468-140.963h116.496l5.426 16.43 40.692 124.737 80.309 33.27 135.383-63.981 82.458 82.407-7.882 15.458-59.374 116.957 33.27 80.36 141.116 50.468zM512 272.92c-90.136 0-163.177 73.040-163.177 163.177s73.040 163.177 163.177 163.177c90.187 0 163.177-73.040 163.177-163.177s-72.989-163.177-163.177-163.177z" />
-<glyph unicode="&#xe60f;" d="M944.97 619.106c-97.861 0-177.522-79.581-177.522-177.443 0-97.94 79.66-177.679 177.522-177.679 98.019 0 177.679 79.739 177.679 177.679 0 97.861-79.66 177.443-177.679 177.443zM944.97 948.148c-470.712 0-944.97-512-944.97-512s474.258-512 944.97-512c470.949 0 945.128 512 945.128 512s-474.179 512-945.128 512zM944.97 79.292c-200.057 0-362.292 162.078-362.292 362.45 0 200.057 162.236 362.292 362.292 362.292 200.214 0 362.45-162.236 362.45-362.292 0-200.451-162.236-362.45-362.45-362.45z" horiz-adv-x="1890" />
-<glyph unicode="&#xe610;" d="M1020.032 382.593v116.045l-16.41 5.376-124.237 40.525-33.152 80.102 63.718 134.784-82.048 82.125-15.411-7.808-116.531-59.213-80.077 33.178-50.278 140.442h-116.096l-45.875-140.698-80-33.126-134.963 63.744-82.022-82.074 7.834-15.334 59.162-116.608-33.126-80.026-140.518-50.253v-116.147l16.435-5.325 124.288-40.576 33.075-80-63.693-134.886 82.048-82.099 131.942 66.97 80.026-33.152 50.304-140.39h116.096l5.35 16.41 40.55 124.237 80.077 33.178 134.886-63.718 82.074 82.074-7.834 15.386-59.213 116.582 33.203 80.026 140.416 50.253zM510.003 275.559c-89.754 0-162.509 72.832-162.509 162.611 0 89.754 72.755 162.483 162.509 162.483 89.83 0 162.509-72.73 162.509-162.483 0.026-89.805-72.653-162.611-162.509-162.611z" />
-<glyph unicode="&#xe611;" d="M509.978 893.722l-509.978-509.926 95.949-95.949 414.106 413.978 413.875-413.978 95.949 95.898-509.901 509.978zM146.253 259.585v-335.437h259.917v304.819h207.514v-304.819h259.917v335.488l-363.622 363.597-363.725-363.648z" />
-<glyph unicode="&#xe612;" d="M0 211.738l498.278-287.59v421.402l-498.278 287.667v-421.478zM894.464 723.662v-44.262c0-32.819-62.797-59.418-140.365-59.418-77.466 0-140.262 26.598-140.262 59.418v73.216h0.435c4.71-30.925 65.408-55.475 139.853-55.475 77.568 0 140.365 26.624 140.365 59.29 0 32.845-62.797 59.366-140.365 59.366-6.195 0-12.262-0.205-18.202-0.563l-90.317 52.147v-55.706c0-32.819-62.72-59.392-140.262-59.392-48.691 0-91.597 10.496-116.813 26.47-3.584 3.712-7.987 7.245-13.312 10.598-6.579 6.861-10.24 14.387-10.24 22.323v53.939l-87.322-50.381c-6.272 0.307-12.646 0.614-19.123 0.614-77.491 0-140.314-26.522-140.314-59.366 0-32.691 62.822-59.29 140.314-59.29 74.445 0 135.219 24.525 139.93 55.475h0.384v-73.216c0-32.819-62.746-59.418-140.314-59.418-77.491 0-140.314 26.598-140.314 59.418v43.622l-108.083-62.31 499.994-288.563 496.691 286.694-112.358 64.768zM646.784 540.135c0-32.794-62.874-59.315-140.365-59.315s-140.339 26.522-140.339 59.315v73.267h0.41c4.762-30.95 65.459-55.475 139.93-55.475s135.142 24.525 139.904 55.475h0.486v-73.267zM525.645 341.914v-417.766l498.355 287.718v417.766l-498.355-287.718zM505.318 829.492c77.542 0 140.262 26.547 140.262 59.315s-62.72 59.315-140.262 59.315c-77.491 0-140.339-26.573-140.339-59.315-0.026-32.768 62.822-59.315 140.339-59.315z" />
-<glyph unicode="&#xe613;" d="M287.002 466.484c0.205-0.23 0.461-0.486 0.691-0.717l103.347-103.373 36.045 36.045-56.55 56.499 90.266 90.189 11.904-1.28c3.046-0.307 6.093-0.538 9.19-0.538 6.246 0 12.314 0.768 18.253 2.125l-66.381 66.381c-1.357 1.382-2.765 2.611-4.173 3.814 20.454 73.6 1.766 155.725-56.038 213.555-57.421 57.421-138.803 76.237-211.968 56.525l123.955-123.981-32.563-121.446-121.395-32.589-124.032 124.006c-19.712-73.19-0.896-154.573 56.525-212.019 60.262-60.288 147.021-77.952 222.925-53.197zM653.235 392.346c-1.997-8.909-2.509-18.202-1.459-27.546l1.306-11.93-90.189-90.189-56.55 56.55-36.070-36.122 327.219-327.194c20.198-20.173 46.618-30.259 73.062-30.259s52.915 10.086 73.037 30.259c40.346 40.32 40.346 105.728 0 146.074l-290.355 290.355zM905.907-10.214l-51.866-13.875-42.112 42.112 13.901 51.891 51.866 13.926 42.112-42.138-13.901-51.917zM506.701 354.049l56.576-56.576 64.128 64.154c-3.482 31.334 6.707 63.821 30.669 87.808 24.013 23.962 56.474 34.176 87.808 30.72l280.397 280.346-157.056 157.056-280.448-280.397c3.482-31.258-6.682-63.821-30.669-87.782-24.013-23.987-56.525-34.176-87.808-30.643l-64.102-64.205 56.499-56.422-277.043-277.12-10.138 10.138-53.248-42.829-89.421-141.312 22.835-22.835 141.312 89.421 42.803 53.222-10.138 10.138 277.043 277.12z" />
-<glyph unicode="&#xe614;" d="M517.99 948.148c-279.398 0-505.882-226.534-505.882-505.958s226.483-505.958 505.882-505.958c279.501 0 506.010 226.534 506.010 505.958s-226.509 505.958-506.010 505.958zM614.835 136.295v274.56h181.53l-278.272 337.203-278.349-337.203h181.555v-274.56z" />
-<glyph unicode="&#xe615;" d="M512.794 948.148c-283.187 0-512.794-229.581-512.794-512.794 0-283.187 229.606-512.794 512.794-512.794s512.794 229.632 512.794 512.794c0 283.213-229.581 512.794-512.794 512.794zM512.794-23.065c-253.158 0-458.394 205.261-458.394 458.368 0 253.158 205.261 458.394 458.394 458.394 253.184 0 458.394-205.235 458.394-458.394 0.026-253.107-205.21-458.368-458.394-458.368zM760.013 322.535l30.387 38.4-265.6 206.413-20.787 1.613-259.226-208.026 28.826-39.987 236.8 177.613z" />
-<glyph unicode="&#xe616;" d="M512.794 948.148c-283.187 0-512.794-229.581-512.794-512.794 0-283.187 229.606-512.794 512.794-512.794s512.794 229.606 512.794 512.794c0 283.213-229.581 512.794-512.794 512.794zM512.794-23.065c-253.158 0-458.394 205.261-458.394 458.394 0 253.158 205.261 458.394 458.394 458.394 253.184 0 458.394-205.235 458.394-458.394 0.026-253.133-205.21-458.394-458.394-458.394zM265.6 493.748l-30.387-38.4 265.574-206.387 20.813-1.613 259.2 208-28.8 39.987-236.8-177.587z" />
-<glyph unicode="&#xe617;" d="M259.2 948.148h214.323v-214.323h-214.323v214.323zM259.2 678.273h214.323v-214.349h-214.323v214.349zM259.2 408.372h214.323v-214.349h-214.323v214.349zM259.2 138.497h214.323v-214.349h-214.323v214.349zM549.325 948.148h214.323v-214.323h-214.323v214.323zM549.325 678.273h214.323v-214.349h-214.323v214.349zM549.325 408.372h214.323v-214.349h-214.323v214.349zM549.325 138.497h214.323v-214.349h-214.323v214.349z" />
-<glyph unicode="&#xe618;" d="M860.058 763.086v-272l-430.029 269.158-1.894-253.491-424.371 249.754-3.763-647.834 426.24 241.28-5.606-239.437 439.424 252.16v-259.635h163.942v660.045z" />
-<glyph unicode="&#xe619;" d="M163.942 103.041v271.974l430.029-269.133 1.894 253.491 424.397-249.754 3.738 647.834-426.24-241.28 5.606 239.437-439.424-252.16v259.635h-163.942v-660.045z" />
-<glyph unicode="&#xe61a;" d="M505.704 907.15c-260.096-3.489-468.158-217.202-464.706-477.336 3.489-259.982 217.202-468.12 477.298-464.631s468.158 217.202 464.706 477.336c-3.413 260.058-217.202 468.12-477.298 464.631zM557.928 750.175c47.863 0 62.009-27.762 62.009-59.544 0-39.671-31.782-76.383-86.016-76.383-45.359 0-66.901 22.831-65.65 60.53 0 31.782 26.624 75.435 89.657 75.435zM435.162 141.767c-32.73 0-56.661 19.873-33.792 107.217l37.547 154.814c6.485 24.841 7.585 34.778 0 34.778-9.785 0-52.262-17.143-77.407-34.057l-16.346 26.776c79.607 66.446 171.16 105.472 210.375 105.472 32.73 0 38.153-38.722 21.807-98.266l-43.008-162.816c-7.585-28.786-4.286-38.722 3.262-38.722 9.785 0 41.984 11.871 73.614 36.75l18.47-24.841c-77.369-77.369-161.792-107.179-194.56-107.179z" />
-<glyph unicode="&#xe61b;" d="M591.986 500.129h-16.005v192.019c0 105.851-86.13 192.019-192.019 192.019h-128c-105.851 0-192.019-86.13-192.019-192.019v-192.019h-16.005c-26.396 0-48.014-21.618-48.014-48.014v-479.991c0-26.396 21.618-48.014 48.014-48.014h544.009c26.396 0 48.014 21.618 48.014 48.014v479.991c0 26.396-21.618 48.014-48.014 48.014zM384 52.148h-128l27.838 139.188c-16.801 11.529-27.838 30.872-27.838 52.793 0 35.347 28.672 64.019 64.019 64.019s64.019-28.672 64.019-64.019c0-21.921-11.036-41.263-27.838-52.793l27.838-139.188zM448.019 500.129h-256v192.019c0 35.271 28.71 64.019 64.019 64.019h128c35.271 0 64.019-28.71 64.019-64.019v-192.019z" />
-<glyph unicode="&#xe61c;" d="M870.4 630.708h-194.56v-143.36h153.6v-215.040h-634.88v215.040h215.040v-112.64l204.8 184.32-204.8 184.32v-112.64h-256c-56.51 0-102.4-45.815-102.4-102.4v-296.96c0-56.51 45.89-102.4 102.4-102.4h716.8c56.585 0 102.4 45.89 102.4 102.4v296.96c0 56.585-45.815 102.4-102.4 102.4z" />
-<glyph unicode="&#xe61d;" d="M991.991 564.148h-351.991v351.991c0 17.673-14.336 32.009-32.009 32.009h-192.019c-17.673 0-32.009-14.336-32.009-32.009v-351.991h-351.991c-17.673 0-32.009-14.336-32.009-32.009v-192.019c0-17.673 14.336-32.009 32.009-32.009h351.991v-351.991c0-17.673 14.336-32.009 32.009-32.009h192.019c17.673 0 32.009 14.336 32.009 32.009v351.991h351.991c17.673 0 32.009 14.336 32.009 32.009v192.019c0 17.673-14.336 32.009-32.009 32.009z" />
-<glyph unicode="&#xe61e;" d="M505.704 907.15c-260.096-3.489-468.158-217.126-464.706-477.298 3.489-260.21 217.202-468.158 477.298-464.744 260.134 3.489 468.233 217.202 464.706 477.298-3.489 260.21-217.202 468.233-477.298 464.744zM506.577 845.748c70.163 0.986 136.382-15.853 194.56-46.118l-63.374-105.662c-38.002 18.47-80.631 28.937-125.762 28.937-45.056 0-87.723-10.43-125.687-28.975l-63.336 105.624c54.993 28.672 117.343 45.321 183.599 46.232zM254.255 310.461l-105.586-63.298c-28.672 54.955-45.321 117.305-46.194 183.486-0.986 70.201 15.853 136.457 46.118 194.56l105.624-63.45c-18.546-37.926-28.975-80.555-28.975-125.649 0-45.056 10.43-87.723 28.975-125.687zM517.461 26.586c-70.163-0.986-136.457 15.853-194.56 46.118l63.374 105.662c38.002-18.546 80.631-28.975 125.687-28.975 45.094 0 87.761 10.392 125.687 28.937l63.336-105.586c-54.993-28.634-117.305-45.246-183.561-46.194zM512 210.906c-124.397 0-225.242 100.883-225.242 225.242 0 124.397 100.883 225.28 225.242 225.28 124.473 0 225.28-100.883 225.28-225.28s-100.807-225.242-225.28-225.242zM769.745 310.461c18.546 38.002 28.975 80.631 28.975 125.687 0 45.094-10.43 87.723-28.975 125.687l105.586 63.374c28.672-54.993 45.359-117.305 46.232-183.561 0.91-70.201-15.929-136.457-46.194-194.56l-105.624 63.336z" />
-<glyph unicode="&#xe61f;" d="M906.126 812.335v0c-91.174 75.89-202.487 113.171-312.548 113.057-127.014 0.038-253.611-49.683-348.16-145.636l-95.004 79.265-1.593-305.342 300.184 56.282-99.442 82.944c67.546 64.247 155.269 97.204 244.015 97.28 79.948-0.038 159.782-26.7 226.114-81.806 84.347-70.125 127.659-170.629 127.772-272.46-0.038-14.715-0.948-29.431-2.769-44.070l137.519 26.283c0.19 5.954 0.303 11.871 0.303 17.787 0.152 140.098-60.151 279.78-176.431 376.415zM839.035 181.172c-67.736-65.498-156.255-99.025-245.912-99.1-79.986 0.038-159.82 26.738-226.114 81.806-84.347 70.125-127.697 170.629-127.772 272.498 0 16.839 1.252 33.716 3.679 50.366l-138.164-25.941c-0.379-8.116-0.683-16.346-0.683-24.462-0.114-140.174 60.226-279.817 176.545-376.491 91.136-75.852 202.411-113.057 312.51-112.981h0.341c127.924 0 255.241 50.441 349.943 147.759l90.795-75.207 0.569 305.38-299.956-57.344 104.183-86.281z" horiz-adv-x="1176" />
-<glyph unicode="&#xe620;" d="M593.351 926.416c-270.753 0-490.268-219.477-490.268-490.231s219.515-490.268 490.268-490.268 490.231 219.515 490.231 490.268c0 270.753-219.477 490.231-490.231 490.231zM828.947 264.495l-72.363-72.363-162.095 162.133-164.902-164.902-73.121 73.121 164.902 164.902-161.678 161.678 72.363 72.325 161.602-161.678 165.774 165.736 73.121-73.083-165.774-165.736 162.171-162.133z" horiz-adv-x="1176" />
-<glyph unicode="&#xe621;" d="M254.976 272.308v267.264h103.424l-179.2 203.776-179.2-203.776h103.424v-308.224c0-56.51 45.815-102.4 102.4-102.4h459.776l-131.186 143.36h-279.438zM920.538 332.724v308.224c0 56.51-45.89 102.4-102.4 102.4h-459.738l131.11-143.36h279.514v-267.264h-103.424l179.2-203.776 179.2 203.776h-103.462z" />
-<glyph unicode="&#xe622;" d="M768 884.129h-128c-105.851 0-192.019-86.13-192.019-192.019v-192.019h-400.005c-26.396 0-48.014-21.618-48.014-48.014v-479.991c0-26.396 21.618-48.014 48.014-48.014h544.009c26.396 0 48.014 21.618 48.014 48.014v479.991c0 26.396-21.618 48.014-48.014 48.014h-16.005v192.019c0 35.271 28.71 64.019 64.019 64.019h128c35.271 0 64.019-28.71 64.019-64.019v-192.019h128v192.019c0 105.851-86.13 192.019-192.019 192.019zM384 52.148h-128l27.838 139.188c-16.801 11.529-27.838 30.872-27.838 52.793 0 35.347 28.672 64.019 64.019 64.019s64.019-28.672 64.019-64.019c0-21.921-11.036-41.263-27.838-52.793l27.838-139.188z" />
-<glyph unicode="&#xe623;" d="M593.351 948.148l-593.351-1023.962h1186.74l-593.351 1023.962zM653.236 48.697h-125.421v121.211h125.421v-121.211zM622.175 219.819h-62.502l-34.816 288.313v156.748h131.3v-156.748l-33.982-288.313z" horiz-adv-x="1176" />
-<glyph unicode="&#xe624;" d="M0 436.148l512-512v320.019h512v384h-512v320.019z" />
-<glyph unicode="&#xe625;" d="M1024 436.148l-512 512v-320.019h-512v-384h512v-320.019z" />
-<glyph unicode="&#xe626;" d="M402.735 801.413l-320.019-320.019c-24.993-24.993-24.993-65.498 0-90.491l320.019-320.019c24.993-24.993 65.498-24.993 90.491 0s24.993 65.498 0 90.491l-210.754 210.754h613.49c35.347 0 64.019 28.634 64.019 64.019s-28.672 64.019-64.019 64.019h-613.49l210.754 210.754c12.478 12.478 18.735 28.862 18.735 45.246s-6.258 32.768-18.735 45.246c-24.993 24.993-65.498 24.993-90.491 0z" />
-<glyph unicode="&#xe627;" d="M507.259 369.626h-102.059v-101.717h102.059v101.717zM650.885 233.434h-101.945v-101.717h101.945v101.717zM507.259 233.434h-102.059v-101.717h102.059v101.717zM507.259 505.818h-102.059v-101.679h102.059v101.679zM843.131 704.057c23.4 0 42.287 18.887 42.287 42.174v145.408c0 23.324-18.887 42.174-42.287 42.174s-42.325-18.849-42.325-42.174v-145.408c0.038-23.324 18.925-42.174 42.325-42.174zM343.419 704.057c23.362 0 42.249 18.887 42.249 42.174v145.408c0 23.324-18.887 42.174-42.249 42.174-23.4 0-42.325-18.849-42.325-42.174v-145.408c0-23.324 18.925-42.174 42.325-42.174zM363.444 369.626h-102.059v-101.717h102.059v101.717zM363.444 233.434h-102.059v-101.717h102.059v101.717zM650.885 369.626h-101.945v-101.717h101.945v101.717zM938.325 369.626h-102.059v-101.717h102.059v101.717zM938.325 505.818h-102.059v-101.679h102.059v101.679zM899.337 863.763v-46.914c17.598-15.474 28.71-38.153 28.71-63.412 0-46.801-37.964-84.764-84.916-84.764s-84.954 37.964-84.954 84.764c0 25.259 11.15 47.938 28.71 63.412v46.914h-387.262v-46.914c17.56-15.474 28.71-38.153 28.71-63.412 0-46.801-38.002-84.764-84.916-84.764s-84.954 37.964-84.954 84.764c0 25.259 11.15 47.938 28.71 63.412v46.914h-192.322v-925.279h997.035v925.279h-192.512zM999.234 32.844h-809.832v589.938h809.832v-589.938zM650.885 505.818h-101.945v-101.679h101.945v101.679zM794.624 505.818h-101.983v-101.679h101.983v101.679zM794.624 233.434h-101.983v-101.717h101.983v101.717zM794.624 369.626h-101.983v-101.717h101.983v101.717z" horiz-adv-x="1176" />
-<glyph unicode="&#xe628;" d="M132.21 661.39c-13.881 13.729-36.295 13.729-50.138 0-13.805-13.653-13.805-35.878 0-49.607l404.897-400.877c13.881-13.729 36.257-13.729 50.138 0l404.897 400.877c13.805 13.729 13.881 35.878 0 49.607s-36.371 13.729-50.138 0.038l-379.866-365.606-379.79 365.568z" />
-<glyph unicode="&#xe629;" d="M737.242 56.358c13.729-13.881 13.729-36.257 0-50.138s-35.878-13.881-49.607 0l-400.877 404.821c-13.729 13.881-13.729 36.295 0 50.138l400.877 404.897c13.729 13.881 35.878 13.881 49.607 0s13.729-36.257 0-50.138l-365.568-379.79 365.568-379.79z" />
-<glyph unicode="&#xe62a;" d="M286.72 56.358c-13.729-13.881-13.729-36.257 0-50.138s35.878-13.881 49.607 0l400.877 404.821c13.729 13.881 13.729 36.295 0 50.138l-400.915 404.897c-13.729 13.881-35.878 13.881-49.607 0s-13.729-36.257 0-50.138l365.568-379.79-365.568-379.79z" />
-<glyph unicode="&#xe62b;" d="M891.79 210.906c13.881-13.729 36.295-13.729 50.138 0 13.881 13.729 13.881 35.878 0 49.607l-404.897 400.877c-13.805 13.729-36.257 13.729-50.062 0l-404.897-400.877c-13.805-13.729-13.881-35.878 0-49.607s36.257-13.729 50.138 0l379.79 365.606 379.79-365.606z" />
-<glyph unicode="&#xe62c;" d="M574.767 855.988c-227.593 0-412.672-182.386-418.247-409.335h-125.8l188.378-209.92 188.302 209.92h-146.242c5.537 168.998 143.777 304.393 313.609 304.393 173.397 0 313.913-140.971 313.913-314.899s-140.478-314.861-313.913-314.861c-69.48 0-133.689 22.718-185.685 61.099l-71.983-76.99c70.997-55.751 160.465-89.050 257.707-89.050 231.159 0 418.551 187.961 418.551 419.84-0.038 231.879-187.43 419.84-418.551 419.84z" />
-<glyph unicode="&#xe62d;" d="M996.617 821.362l-513.555-513.555-256.796 256.834-128.379-128.417 385.214-385.252 641.896 642.010z" horiz-adv-x="1176" />
-<glyph unicode="&#xe62e;" d="M512 907.188c-260.134 0-471.040-210.944-471.040-471.040 0-260.134 210.906-471.040 471.040-471.040s471.040 210.906 471.040 471.040c0 260.134-210.906 471.040-471.040 471.040zM512 67.508c-203.624 0-368.64 165.054-368.64 368.64s165.016 368.64 368.64 368.64 368.64-165.054 368.64-368.64-165.016-368.64-368.64-368.64zM547.84 702.388h-71.68v-281.069l174.345-174.345 50.669 50.707-153.335 153.335z" />
-<glyph unicode="&#xe62f;" d="M92.312 870.476l924.331-924.369 77.672 77.71-924.293 924.331-77.71-77.672zM1094.391 870.438l-924.369-924.369-77.672 77.71 924.331 924.369 77.71-77.71z" horiz-adv-x="1176" />
-<glyph unicode="&#xe630;" d="M337.541-72.856h513.024l64.512 645.916h-639.128l61.592-645.916zM737.394 793.979v116.508c0 19.191-15.398 34.702-34.361 34.702h-217.847c-19.001 0-34.361-15.55-34.361-34.702v-114.574c-73.576-8.382-150.149-24.614-226.494-52.338v-106.989h738.001v109.833c0 0-90.074 31.403-224.977 47.559zM668.937 800.389c-47.749 3.224-99.252 4.096-153.297 0.986v61.44c0 9.519 7.623 17.332 17.143 17.332h118.936c9.519 0 17.218-7.813 17.218-17.332v-62.426z" horiz-adv-x="1176" />
-<glyph unicode="&#xe631;" d="M928.503 921.259l-111.502-112.109 156.065-156.9 111.502 112.071-156.065 156.937zM215.002 203.738l156.065-156.9 535.211 538.093-156.065 156.9-535.211-538.093zM103.917-59.013l188.985 49.873-139.302 140.098-49.683-190.009z" horiz-adv-x="1176" />
-<glyph unicode="&#xe632;" d="M1014.67 125.497c0 0 0 0 0 0l-310.651 310.651 310.651 310.651c0 0 0 0 0 0 3.337 3.337 5.765 7.244 7.32 11.416 4.248 11.378 1.82 24.69-7.32 33.83l-146.735 146.735c-9.14 9.14-22.452 11.567-33.83 7.32-4.172-1.555-8.078-3.982-11.416-7.32 0 0 0 0 0 0l-310.651-310.651-310.651 310.651c0 0 0 0 0 0-3.337 3.337-7.244 5.765-11.416 7.32-11.378 4.248-24.69 1.82-33.83-7.32l-146.735-146.735c-9.14-9.14-11.567-22.452-7.32-33.83 1.555-4.172 3.982-8.078 7.32-11.416 0 0 0 0 0 0l310.651-310.651-310.651-310.651c0 0 0 0 0 0-3.337-3.337-5.765-7.244-7.32-11.416-4.248-11.378-1.82-24.69 7.32-33.83l146.735-146.735c9.14-9.14 22.452-11.567 33.83-7.32 4.172 1.555 8.078 3.982 11.416 7.32 0 0 0 0 0 0l310.651 310.651 310.651-310.651c0 0 0 0 0 0 3.337-3.337 7.244-5.765 11.416-7.32 11.378-4.248 24.69-1.82 33.83 7.32l146.735 146.735c9.14 9.14 11.567 22.452 7.32 33.83-1.555 4.172-3.982 8.078-7.32 11.416z" />
-<glyph unicode="&#xe633;" d="M593.351 925.582c-270.336 0-489.434-219.098-489.434-489.358s219.098-489.434 489.434-489.434 489.434 219.136 489.434 489.434-219.136 489.358-489.434 489.358zM635.752 121.552c-11.985-11.719-26.396-17.636-43.16-17.636-8.154 0-15.967 1.517-23.4 4.589-7.358 3.034-13.843 7.168-19.456 12.174-5.613 5.158-10.126 11.226-13.388 18.356-3.337 7.13-4.968 14.753-4.968 22.945 0 16.308 5.992 30.303 17.977 42.060 11.947 11.681 26.396 17.598 43.198 17.598 16.308 0 30.606-5.689 42.78-16.801 12.25-11.188 18.318-24.993 18.318-41.339-0.038-16.384-5.992-30.303-17.939-41.984zM778.923 565.475c-3.982-13.767-9.747-26.396-17.18-37.774-7.471-11.454-16.498-22.49-27.079-33.071s-22.49-21.618-35.65-33.033c-11.454-9.785-20.783-18.318-27.913-25.79-7.168-7.396-12.895-14.867-17.218-22.338-4.286-7.433-7.282-15.398-9.026-24.007-1.707-8.609-2.617-49.721-2.617-62.35v-22.338h-101.376v32.616c0 13.729 0.986 56.661 3.034 67.584s5.158 21.125 9.481 30.872 10.012 19.228 17.18 28.369c7.168 9.14 16.232 18.887 27.079 29.203l38.647 36.902c10.847 9.747 20.177 20.632 27.951 32.616 7.737 12.060 11.529 26.7 11.529 43.88 0 22.3-6.978 41.036-21.011 56.206-14.071 15.17-33.944 22.793-59.695 22.793-13.16 0-25.069-2.389-35.65-7.282-10.619-4.817-19.797-11.454-27.496-19.759-7.737-8.344-13.577-17.901-17.598-28.786-3.982-10.847-6.334-21.997-6.865-33.527l-105.624 9.444c3.413 27.496 10.733 51.959 21.921 73.463 11.112 21.466 25.562 39.595 43.311 54.575 17.711 14.829 38.078 26.169 61.023 33.944 22.869 7.699 47.521 11.605 73.842 11.605 24.614 0 47.976-3.603 70.049-10.771 21.959-7.168 41.491-17.711 58.406-31.782 16.839-14.033 30.227-31.365 39.936-51.959 9.709-20.632 14.564-44.411 14.564-71.263 0-18.356-2.010-34.475-5.992-48.166z" horiz-adv-x="1176" />
-<glyph unicode="&#xe634;" d="M574.805 855.988c-227.631 0-412.71-182.386-418.247-409.335h-125.838l188.378-209.958 188.302 209.958h-146.242c5.537 168.998 143.777 304.393 313.647 304.393 173.359 0 313.875-140.971 313.875-314.899s-140.478-314.861-313.875-314.861c-69.518 0-133.727 22.718-185.761 61.099l-71.983-76.99c71.073-55.751 160.503-89.050 257.745-89.050 231.121 0 418.513 187.961 418.513 419.84-0.038 231.879-187.43 419.84-418.513 419.84zM537.6 661.428v-240.109l153.865-153.865 50.669 50.669-132.855 132.855v210.413h-71.68z" />
-<glyph unicode="&#xe635;" d="M383.462 370.638h255.693v213.043h127.795l-255.642 255.667-255.642-255.667h127.795zM852.173 370.638v-170.394h-681.754v170.394h-170.419v-340.89h1022.618v340.89z" />
-<glyph unicode="&#xe636;" d="M639.155 839.348h-255.693v-213.043h-127.795l255.667-255.667 255.616 255.667h-127.795zM852.173 370.638v-170.394h-681.754v170.394h-170.419v-340.89h1022.618v340.89z" />
-<glyph unicode="&#xe637;" d="M1021.85 437.223c0-282.176-228.749-510.925-510.925-510.925s-510.925 228.749-510.925 510.925c0 282.176 228.749 510.925 510.925 510.925s510.925-228.749 510.925-510.925z" />
-<glyph unicode="&#xe638;" d="M510.413 948.148c-281.907 0-510.413-228.582-510.413-510.413 0-281.933 228.506-510.464 510.413-510.464s510.387 228.557 510.387 510.464c0 281.83-228.48 510.413-510.387 510.413zM865.843 437.735c0-69.99-20.506-135.27-55.578-190.285l-490.163 490.163c55.091 35.021 120.32 55.475 190.31 55.475 195.942 0 355.43-159.411 355.43-355.354zM154.957 437.735c0 69.939 20.506 135.245 55.578 190.31l490.189-490.189c-55.066-35.072-120.371-55.501-190.31-55.501-195.942-0.026-355.456 159.437-355.456 355.379z" />
-<glyph unicode="&#xe639;" d="M511.77 948.148c-282.778 0-512.102-229.222-512.102-512.179 0-282.829 229.325-512.102 512.102-512.102 282.931-0.026 512.23 229.248 512.23 512.102 0 282.957-229.299 512.179-512.23 512.179zM143.718 528.18h736.205v-184.269h-736.205v184.269z" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/UX-Icons/UX-Icons.ttf b/lib/web/fonts/UX-Icons/UX-Icons.ttf
deleted file mode 100644
index 1eba05243a164..0000000000000
Binary files a/lib/web/fonts/UX-Icons/UX-Icons.ttf and /dev/null differ
diff --git a/lib/web/fonts/opensans/bold/opensans-700.eot b/lib/web/fonts/opensans/bold/opensans-700.eot
deleted file mode 100644
index 5d20d916338a5..0000000000000
Binary files a/lib/web/fonts/opensans/bold/opensans-700.eot and /dev/null differ
diff --git a/lib/web/fonts/opensans/bold/opensans-700.svg b/lib/web/fonts/opensans/bold/opensans-700.svg
deleted file mode 100644
index 9ece857021152..0000000000000
--- a/lib/web/fonts/opensans/bold/opensans-700.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1169"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="fi" horiz-adv-x="1417" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm162 518q0 149 166 149t166-149q0-71-41.5-110.5T1106 1257q-166 0-166 150zM1258 0H953v1118h305V0z"/><glyph unicode="fl" horiz-adv-x="1417" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zM1258 0H953v1556h305V0z"/><glyph unicode="ffi" horiz-adv-x="2208" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm793 0h-264V0h-305v889H834v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm159 518q0 149 166 149t166-149q0-71-41.5-110.5T1896 1257q-166 0-166 150zM2048 0h-305v1118h305V0z"/><glyph unicode="ffl" horiz-adv-x="2208" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm793 0h-264V0h-305v889H834v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zM2048 0h-305v1556h305V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="586" d="M416 485H172l-51 977h346zM117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143z"/><glyph unicode="&amp;quot;" horiz-adv-x="967" d="M412 1462l-41-528H174l-41 528h279zm422 0l-41-528H596l-41 528h279z"/><glyph unicode="#" horiz-adv-x="1323" d="M999 844l-47-232h258V406H913L836 0H616l78 406H500L424 0H209l74 406H45v206h277l47 232H117v209h289l77 407h219l-77-407h198l78 407h215l-78-407h240V844H999zM539 612h196l47 232H586z"/><glyph unicode="$" d="M1092 457q0-159-115-255.5T655 86v-205H518V82q-244 5-428 86v264q87-43 209.5-76T518 317v310l-67 26q-198 78-280.5 169.5T88 1049q0 145 113.5 238.5T518 1401v153h137v-149q229-10 414-92l-94-234q-156 64-320 78V862q195-75 277.5-130t121-121 38.5-154zm-301-15q0 42-34 71t-102 60V324q136 23 136 118zm-402 607q0-44 30.5-72.5T518 918v235q-129-19-129-104z"/><glyph unicode="%" horiz-adv-x="1845" d="M315 1024q0-127 22.5-189.5T410 772q96 0 96 252 0 250-96 250-50 0-72.5-61.5T315 1024zm443 2q0-230-89-345.5T408 565q-165 0-255 118.5T63 1026q0 457 345 457 169 0 259.5-118.5T758 1026zm688 436L635 0H395l811 1462h240zM1339 440q0-127 22.5-189.5T1434 188q96 0 96 252 0 250-96 250-50 0-72.5-61.5T1339 440zm443 2q0-229-89-344.5T1432-18q-165 0-255 118.5T1087 442q0 457 345 457 169 0 259.5-118.5T1782 442z"/><glyph unicode="&amp;" horiz-adv-x="1536" d="M1536 0h-377l-115 113Q853-20 612-20 368-20 225 92T82 395q0 137 60.5 233.5T350 809q-75 86-109 164.5T207 1145q0 152 116.5 245t311.5 93q186 0 297.5-86.5T1044 1165q0-119-69-217.5T752 760l284-277q71 117 123 301h318q-36-135-99-263.5T1235 293zM403 424q0-86 64.5-137T633 236q126 0 227 61L528 627q-58-44-91.5-92T403 424zm359 709q0 53-36 83.5t-93 30.5q-67 0-105.5-32t-38.5-91q0-88 95-194 86 48 132 94.5t46 108.5z"/><glyph unicode="'" horiz-adv-x="545" d="M412 1462l-41-528H174l-41 528h279z"/><glyph unicode="(" horiz-adv-x="694" d="M82 561q0 265 77.5 496T383 1462h250q-141-193-213-424t-72-475q0-245 73.5-473.5T631-324H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="694" d="M612 561q0-263-77.5-490T311-324H63Q198-140 272 88.5T346 563q0 244-72 475T61 1462h250q147-175 224-406.5T612 561z"/><glyph unicode="*" horiz-adv-x="1116" d="M688 1556l-41-368 373 104 33-252-340-24 223-297-227-121-156 313-137-311-236 119 221 297-338 26 39 250 365-104-41 368h262z"/><glyph unicode="+" d="M475 612H88v219h387v390h219V831h387V612H694V227H475v385z"/><glyph unicode="," horiz-adv-x="594" d="M459 215Q407 13 283-264H63Q128 2 164 238h280z"/><glyph unicode="-" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="." horiz-adv-x="584" d="M117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143z"/><glyph unicode="/" horiz-adv-x="846" d="M836 1462L291 0H14l545 1462h277z"/><glyph unicode="0" d="M1096 731q0-383-125.5-567T584-20q-253 0-381.5 190T74 731q0 387 125 570.5T584 1485q253 0 382.5-192T1096 731zm-715 0q0-269 46.5-385.5T584 229q108 0 156 118t48 384q0 269-48.5 386.5T584 1235q-109 0-156-117.5T381 731z"/><glyph unicode="1" d="M846 0H537v846l3 139 5 152q-77-77-107-101L270 901l-149 186 471 375h254V0z"/><glyph unicode="2" d="M1104 0H82v215l367 371q163 167 213 231.5T734 937t22 114q0 88-48.5 131T578 1225q-85 0-165-39t-167-111L78 1274q108 92 179 130t155 58.5 188 20.5q137 0 242-50t163-140 58-206q0-101-35.5-189.5T917.5 716 655 451L467 274v-14h637V0z"/><glyph unicode="3" d="M1047 1135q0-137-83-233T731 770v-6q177-22 268-107.5t91-230.5q0-211-153-328.5T500-20Q262-20 78 59v263q85-43 187-70t202-27q153 0 226 52t73 167q0 103-84 146t-268 43H303v237h113q170 0 248.5 44.5T743 1067q0 166-208 166-72 0-146.5-24T223 1126L80 1339q200 144 477 144 227 0 358.5-92t131.5-256z"/><glyph unicode="4" d="M1137 303H961V0H659v303H35v215l641 944h285V543h176V303zM659 543v248q0 62 5 180t8 137h-8q-37-82-89-160L307 543h352z"/><glyph unicode="5" d="M614 934q212 0 337.5-119T1077 489q0-245-151-377T494-20q-244 0-394 79v267q79-42 184-68.5T483 231q283 0 283 232 0 221-293 221-53 0-117-10.5T252 651l-123 66 55 745h793v-262H455l-27-287 35 7q61 14 151 14z"/><glyph unicode="6" d="M72 621q0 434 183.5 646T805 1479q125 0 196-15v-247q-89 20-176 20-159 0-259.5-48T415 1047t-59-267h13q99 170 317 170 196 0 307-123t111-340q0-234-132-370.5T606-20q-162 0-282.5 75t-186 219T72 621zm528-394q99 0 152 66.5T805 483q0 107-49.5 168.5T606 713q-94 0-160.5-61T379 510q0-119 62.5-201T600 227z"/><glyph unicode="7" d="M227 0l549 1200H55v260h1049v-194L551 0H227z"/><glyph unicode="8" d="M586 1481q210 0 338.5-95.5T1053 1128q0-112-62-199.5T791 772q164-88 235.5-183.5T1098 379q0-180-141-289.5T586-20Q346-20 209 82T72 371q0 125 66.5 222T352 764q-125 79-180 169t-55 197q0 157 130 254t339 97zM358 389q0-86 60-134t164-48q115 0 172 49.5T811 387q0 67-56.5 125.5T571 637q-213-98-213-248zm226 866q-79 0-127.5-40.5T408 1106q0-60 38.5-107.5T586 901q98 46 137 94t39 111q0 69-50 109t-128 40z"/><glyph unicode="9" d="M1098 838q0-432-182-645T365-20Q235-20 168-6v248q84-21 176-21 155 0 255 45.5t153 143T813 678h-12q-58-94-134-132t-190-38q-191 0-301 122.5T66 971q0 235 133.5 371.5T563 1479q162 0 283.5-76t186.5-220.5 65-344.5zm-529 393q-96 0-150-66t-54-190q0-106 49-168t149-62q94 0 161 61.5T791 948q0 119-62.5 201T569 1231z"/><glyph unicode=":" horiz-adv-x="584" d="M117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143zm0 826q0 84 45 127t131 43q83 0 128.5-44T467 969q0-81-46.5-125.5T293 799q-84 0-130 44t-46 126z"/><glyph unicode=";" horiz-adv-x="594" d="M444 238l15-23Q407 13 283-264H63Q128 2 164 238h280zM117 969q0 84 45 127t131 43q83 0 128.5-44T467 969q0-81-46.5-125.5T293 799q-84 0-130 44t-46 126z"/><glyph unicode="<" d="M1081 203L88 641v143l993 496v-240L397 723l684-281V203z"/><glyph unicode="=" d="M88 805v219h993V805H88zm0-387v219h993V418H88z"/><glyph unicode=">" d="M88 442l684 281-684 317v240l993-496V641L88 203v239z"/><glyph unicode="?" horiz-adv-x="977" d="M276 485v74q0 96 41 167t150 151q105 75 138.5 122t33.5 105q0 65-48 99t-134 34q-150 0-342-98L6 1358q223 125 473 125 206 0 327.5-99T928 1120q0-110-50-190T688 750q-96-71-121.5-108T541 545v-60H276zm-32-342q0 84 45 127t131 43q83 0 128.5-44T594 143q0-79-46-124.5T420-27q-84 0-130 44.5T244 143z"/><glyph unicode="@" horiz-adv-x="1837" d="M1735 752q0-144-46-263.5T1559 301t-195-68q-74 0-131 35.5t-82 93.5h-16q-108-129-275-129-177 0-279 106.5T479 631q0 211 134 340t350 129q86 0 189.5-16.5T1323 1044l-23-489q0-139 76-139 64 0 102 93.5t38 244.5q0 161-67 284.5T1260.5 1227 983 1292q-202 0-351-83T403.5 969.5 324 608q0-276 147.5-423.5T899 37q106 0 233 23.5t250 68.5V-63q-214-91-475-91-380 0-592.5 200T102 602q0 247 108.5 448.5t309 316T981 1481q220 0 393-90t267-256 94-383zM711 627q0-211 172-211 90 0 137 63.5t57 206.5l13 221q-51 11-115 11-125 0-194.5-78T711 627z"/><glyph unicode="A" horiz-adv-x="1413" d="M1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381z"/><glyph unicode="B" horiz-adv-x="1376" d="M184 1462h455q311 0 451.5-88.5T1231 1092q0-131-61.5-215T1006 776v-10q139-31 200.5-116t61.5-226q0-200-144.5-312T731 0H184v1462zm310-579h180q126 0 182.5 39t56.5 129q0 84-61.5 120.5T657 1208H494V883zm0-246V256h202q128 0 189 49t61 150q0 182-260 182H494z"/><glyph unicode="C" horiz-adv-x="1305" d="M805 1225q-175 0-271-131.5T438 727q0-489 367-489 154 0 373 77V55Q998-20 776-20q-319 0-488 193.5T119 729q0 228 83 399.5t238.5 263T805 1483q213 0 428-103l-100-252q-82 39-165 68t-163 29z"/><glyph unicode="D" horiz-adv-x="1516" d="M1397 745q0-361-205.5-553T598 0H184v1462h459q358 0 556-189t198-528zm-322-8q0 471-416 471H494V256h133q448 0 448 481z"/><glyph unicode="E" horiz-adv-x="1147" d="M1026 0H184v1462h842v-254H494V887h495V633H494V256h532V0z"/><glyph unicode="F" horiz-adv-x="1124" d="M489 0H184v1462h838v-254H489V831h496V578H489V0z"/><glyph unicode="G" horiz-adv-x="1483" d="M739 821h580V63q-141-46-265.5-64.5T799-20q-331 0-505.5 194.5T119 733q0 354 202.5 552T883 1483q225 0 434-90l-103-248q-160 80-333 80-201 0-322-135T438 727q0-238 97.5-363.5T819 238q97 0 197 20v305H739v258z"/><glyph unicode="H" horiz-adv-x="1567" d="M1382 0h-309v631H494V0H184v1462h310V889h579v573h309V0z"/><glyph unicode="I" horiz-adv-x="678" d="M184 0v1462h310V0H184z"/><glyph unicode="J" horiz-adv-x="678" d="M31-430q-105 0-183 22v258q80-20 146-20 102 0 146 63.5T184 92v1370h310V94q0-256-117-390T31-430z"/><glyph unicode="K" horiz-adv-x="1360" d="M1360 0h-352L625 616l-131-94V0H184v1462h310V793l122 172 396 497h344L846 815z"/><glyph unicode="L" horiz-adv-x="1157" d="M184 0v1462h310V256h593V0H184z"/><glyph unicode="M" horiz-adv-x="1931" d="M803 0L451 1147h-9q19-350 19-467V0H184v1462h422L952 344h6l367 1118h422V0h-289v692q0 49 1.5 113t13.5 340h-9L1087 0H803z"/><glyph unicode="N" horiz-adv-x="1665" d="M1481 0h-394L451 1106h-9q19-293 19-418V0H184v1462h391l635-1095h7q-15 285-15 403v692h279V0z"/><glyph unicode="O" horiz-adv-x="1630" d="M1511 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733z"/><glyph unicode="P" horiz-adv-x="1286" d="M494 774h102q143 0 214 56.5T881 995q0 109-59.5 161T635 1208H494V774zm700 232q0-236-147.5-361T627 520H494V0H184v1462h467q266 0 404.5-114.5T1194 1006z"/><glyph unicode="Q" horiz-adv-x="1630" d="M1511 733q0-258-91.5-432.5T1151 45l352-393h-397L838-20h-23q-336 0-516 195T119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733z"/><glyph unicode="R" horiz-adv-x="1352" d="M494 813h100q147 0 217 49t70 154q0 104-71.5 148T588 1208h-94V813zm0-252V0H184v1462h426q298 0 441-108.5t143-329.5q0-129-71-229.5T922 637q330-493 430-637h-344L659 561H494z"/><glyph unicode="S" horiz-adv-x="1128" d="M1047 406q0-198-142.5-312T508-20Q274-20 94 68v288q148-66 250.5-93T532 236q102 0 156.5 39T743 391q0 43-24 76.5T648.5 532 459 631q-134 63-201 121T151 887t-40 180q0 194 131.5 305T606 1483q114 0 217.5-27t216.5-76l-100-241q-117 48-193.5 67T596 1225q-88 0-135-41t-47-107q0-41 19-71.5t60.5-59T690 844q205-98 281-196.5t76-241.5z"/><glyph unicode="T" horiz-adv-x="1186" d="M748 0H438v1204H41v258h1104v-258H748V0z"/><glyph unicode="U" horiz-adv-x="1548" d="M1374 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309z"/><glyph unicode="V" horiz-adv-x="1331" d="M1018 1462h313L834 0H496L0 1462h313l275-870q23-77 47.5-179.5T666 270q11 92 75 322z"/><glyph unicode="W" horiz-adv-x="1980" d="M1608 0h-353l-198 768q-11 41-37.5 169.5T989 1110q-6-54-30-173.5T922 766L725 0H373L0 1462h305l187-798q49-221 71-383 6 57 27.5 176.5T631 643l213 819h293l213-819q14-55 35-168t32-194q10 78 32 194.5t40 188.5l186 798h305z"/><glyph unicode="X" horiz-adv-x="1366" d="M1366 0h-354L672 553 332 0H0l485 754-454 708h342l315-526 309 526h334L872 737z"/><glyph unicode="Y" horiz-adv-x="1278" d="M639 860l305 602h334L793 569V0H485v559L0 1462h336z"/><glyph unicode="Z" horiz-adv-x="1186" d="M1137 0H49v201l701 1005H68v256h1050v-200L418 256h719V0z"/><glyph unicode="[" horiz-adv-x="678" d="M627-324H143v1786h484v-211H403V-113h224v-211z"/><glyph unicode="\" horiz-adv-x="846" d="M289 1462L834 0H557L12 1462h277z"/><glyph unicode="]" horiz-adv-x="678" d="M51-113h223v1364H51v211h484V-324H51v211z"/><glyph unicode="^" horiz-adv-x="1090" d="M8 520l438 950h144l495-950H846l-322 643-280-643H8z"/><glyph unicode="_" horiz-adv-x="842" d="M846-324H-4v140h850v-140z"/><glyph unicode="`" horiz-adv-x="1243" d="M707 1241q-63 44-185 142.5T332 1548v21h342q63-101 235-301v-27H707z"/><glyph unicode="a" horiz-adv-x="1237" d="M870 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92z"/><glyph unicode="b" horiz-adv-x="1296" d="M782 1139q198 0 310-154.5T1204 561q0-277-115.5-429T774-20q-197 0-309 143h-21L393 0H160v1556h305v-362q0-69-12-221h12q107 166 317 166zm-98-244q-113 0-165-69.5T465 596v-33q0-180 53.5-258T688 227q94 0 149.5 86.5T893 565t-56 247.5T684 895z"/><glyph unicode="c" horiz-adv-x="1053" d="M614-20Q92-20 92 553q0 285 142 435.5T641 1139q194 0 348-76l-90-236q-72 29-134 47.5T641 893q-238 0-238-338 0-328 238-328 88 0 163 23.5T954 324V63Q880 16 804.5-2T614-20z"/><glyph unicode="d" horiz-adv-x="1296" d="M514-20q-197 0-309.5 153T92 557q0 275 114.5 428.5T522 1139q211 0 322-164h10q-23 125-23 223v358h306V0H903l-59 145h-13Q727-20 514-20zm107 243q117 0 171.5 68T852 522v33q0 180-55.5 258T616 891q-102 0-158.5-86.5T401 553t57-247.5T621 223z"/><glyph unicode="e" horiz-adv-x="1210" d="M623 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20z"/><glyph unicode="f" horiz-adv-x="793" d="M778 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889z"/><glyph unicode="g" horiz-adv-x="1157" d="M1133 1118V963l-175-45q48-75 48-168 0-180-125.5-280.5T532 369l-55 3-45 5q-47-36-47-80 0-66 168-66h190q184 0 280.5-79T1120-80q0-196-163.5-304T487-492q-234 0-357.5 81.5T6-182Q6-81 69-13t185 97q-47 20-82 65.5T137 246q0 64 37 106.5T281 436q-88 38-139.5 122T90 756q0 183 119 283t340 100q47 0 111.5-8.5T743 1118h390zM270-158q0-63 60.5-99T500-293q164 0 257 45t93 123q0 63-55 87T625-14H467q-84 0-140.5-39.5T270-158zm111 910q0-91 41.5-144T549 555q86 0 126 53t40 144q0 202-166 202-168 0-168-202z"/><glyph unicode="h" horiz-adv-x="1346" d="M1192 0H887v653q0 242-180 242-128 0-185-87t-57-282V0H160v1556h305v-317q0-37-7-174l-7-90h16q102 164 324 164 197 0 299-106t102-304V0z"/><glyph unicode="i" horiz-adv-x="625" d="M147 1407q0 149 166 149t166-149q0-71-41.5-110.5T313 1257q-166 0-166 150zM465 0H160v1118h305V0z"/><glyph unicode="j" horiz-adv-x="625" d="M70-492q-117 0-201 25v240q70-19 143-19 77 0 112.5 43T160-76v1194h305V-121q0-178-103-274.5T70-492zm77 1899q0 149 166 149t166-149q0-71-41.5-110.5T313 1257q-166 0-166 150z"/><glyph unicode="k" horiz-adv-x="1270" d="M453 608l133 170 313 340h344L799 633 1270 0H918L596 453 465 348V0H160v1556h305V862l-16-254h4z"/><glyph unicode="l" horiz-adv-x="625" d="M465 0H160v1556h305V0z"/><glyph unicode="m" horiz-adv-x="2011" d="M1161 0H856v653q0 121-40.5 181.5T688 895q-117 0-170-86t-53-283V0H160v1118h233l41-143h17q45 77 130 120.5t195 43.5q251 0 340-164h27q45 78 132.5 121t197.5 43q190 0 287.5-97.5T1858 729V0h-306v653q0 121-40.5 181.5T1384 895q-112 0-167.5-80T1161 561V0z"/><glyph unicode="n" horiz-adv-x="1346" d="M1192 0H887v653q0 121-43 181.5T707 895q-128 0-185-85.5T465 526V0H160v1118h233l41-143h17q51 81 140.5 122.5T795 1139q195 0 296-105.5T1192 729V0z"/><glyph unicode="o" horiz-adv-x="1268" d="M403 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307z"/><glyph unicode="p" horiz-adv-x="1296" d="M774-20q-197 0-309 143h-16q16-140 16-162v-453H160v1610h248l43-145h14q107 166 317 166 198 0 310-153t112-425q0-179-52.5-311T1002 49 774-20zm-90 915q-113 0-165-69.5T465 596v-33q0-180 53.5-258T688 227q205 0 205 338 0 165-50.5 247.5T684 895z"/><glyph unicode="q" horiz-adv-x="1296" d="M623 219q116 0 170 66.5T852 518v37q0 180-55.5 258T618 891q-215 0-215-338 0-168 53.5-251T623 219zM514-20q-198 0-310 152.5T92 557q0 274 114.5 428T520 1139q106 0 185-40t139-124h8l27 143h258V-492H831v469q0 61 13 168h-13Q782 64 701 22T514-20z"/><glyph unicode="r" horiz-adv-x="930" d="M784 1139q62 0 103-9l-23-286q-37 10-90 10-146 0-227.5-75T465 569V0H160v1118h231l45-188h15q52 94 140.5 151.5T784 1139z"/><glyph unicode="s" horiz-adv-x="1018" d="M940 332q0-172-119.5-262T463-20Q341-20 255-3.5T94 45v252q85-40 191.5-67T473 203q166 0 166 96 0 36-22 58.5t-76 51T397 475q-129 54-189.5 100t-88 105.5T92 827q0 149 115.5 230.5T535 1139q202 0 393-88l-92-220q-84 36-157 59t-149 23q-135 0-135-73 0-41 43.5-71T629 680q131-53 192-99t90-106 29-143z"/><glyph unicode="t" horiz-adv-x="889" d="M631 223q80 0 192 35V31Q709-20 543-20q-183 0-266.5 92.5T193 350v539H47v129l168 102 88 236h195v-238h313V889H498V350q0-65 36.5-96t96.5-31z"/><glyph unicode="u" horiz-adv-x="1346" d="M952 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952z"/><glyph unicode="v" horiz-adv-x="1165" d="M426 0L0 1118h319l216-637q36-121 45-229h6q5 96 45 229l215 637h319L739 0H426z"/><glyph unicode="w" horiz-adv-x="1753" d="M1079 0l-86 391-116 494h-7L666 0H338L20 1118h304l129-495q31-133 63-367h6q4 76 35 241l16 85 138 536h336l131-536q4-22 12.5-65t16.5-91.5 14.5-95 7.5-74.5h6q9 72 32 197.5t33 169.5l134 495h299L1411 0h-332z"/><glyph unicode="x" horiz-adv-x="1184" d="M389 571L29 1118h346l217-356 219 356h346L793 571 1174 0H827L592 383 356 0H10z"/><glyph unicode="y" horiz-adv-x="1165" d="M0 1118h334l211-629q27-82 37-194h6q11 103 43 194l207 629h327L692-143q-65-175-185.5-262T225-492q-79 0-155 17v242q55-13 120-13 81 0 141.5 49.5T426-47l18 55z"/><glyph unicode="z" horiz-adv-x="999" d="M938 0H55v180l518 705H86v233h834V920L416 233h522V0z"/><glyph unicode="{" horiz-adv-x="807" d="M287 270q0 87-65.5 133T31 449v239q126 0 191 44t65 126v326q0 153 97 215.5t341 62.5v-225q-99-3-136.5-38T551 1096V797q-6-188-234-222v-12q234-35 234-212V43q0-68 37-103t137-38v-226q-244 0-341 62.5T287-45v315z"/><glyph unicode="|" horiz-adv-x="1128" d="M455 1550h219V-465H455v2015z"/><glyph unicode="}" horiz-adv-x="807" d="M520-45q0-112-41-169t-135.5-83.5T82-324v226q99 2 136.5 36T256 43v310q0 86 59 139.5T489 563v12q-227 34-233 222v299q0 70-37 104t-137 37v225q167 0 262-26.5t135.5-84T520 1184V856q0-84 61.5-126T776 688V449q-125 0-190.5-41T520 270V-45z"/><glyph unicode="~" d="M322 672q-55 0-117.5-33.5T88 551v231q103 109 256 109 73 0 137.5-16T621 827q129-55 227-55 53 0 116 32t117 89V662Q980 553 825 553q-66 0-126 13t-150 50q-131 56-227 56z"/><glyph unicode="¡" horiz-adv-x="586" d="M168 606h244l51-975H117zm299 342q0-84-45-127t-131-43q-83 0-128.5 44T117 948q0 81 46.5 125.5T291 1118q84 0 130-44t46-126z"/><glyph unicode="¢" d="M563 176q-420 59-420 565 0 261 104.5 403T563 1317v166h178v-158q166-9 299-74l-90-235q-72 29-134 47t-124 18q-121 0-179-83.5T455 743q0-327 237-327 82 0 148 15.5t166 60.5V238q-127-61-265-70V-20H563v196z"/><glyph unicode="£" d="M700 1483q195 0 390-82l-93-230q-157 64-272 64-78 0-120-44.5T563 1063V870h375V651H563V508q0-170-151-248h718V0H82v248q103 44 141.5 101T262 506v145H84v219h178v195q0 201 114.5 309.5T700 1483z"/><glyph unicode="¤" d="M188 723q0 102 54 197l-129 127 147 147 127-127q91 53 197 53 105 0 196-55l127 129 150-143-129-129q53-89 53-199 0-107-53-199l125-125-146-145-127 125q-95-51-196-51-115 0-199 51L260 256 115 401l127 125q-54 93-54 197zm207 0q0-77 54.5-132.5T584 535q81 0 136.5 55T776 723q0 80-56.5 135T584 913q-78 0-133.5-56T395 723z"/><glyph unicode="¥" d="M584 860l264 602h313L778 715h195V537H727V399h246V221H727V0H440v221H193v178h247v138H193v178h190L6 1462h316z"/><glyph unicode="¦" horiz-adv-x="1128" d="M455 1550h219V735H455v815zm0-1200h219v-815H455v815z"/><glyph unicode="§" horiz-adv-x="995" d="M121 805q0 79 36 144.5t97 105.5q-133 84-133 233 0 131 111.5 210t293.5 79q170 0 363-84l-82-190q-68 32-138.5 57.5T520 1386q-81 0-118-23t-37-71q0-49 49.5-86t163.5-82q163-64 240-148.5T895 782q0-177-125-260 62-40 93.5-92.5T895 303q0-148-119.5-235.5T455-20q-203 0-349 79v207q81-41 180-69.5T455 168q194 0 194 117 0 39-18.5 63T567 397.5 442 457q-183 74-252 152.5T121 805zm223 22q0-67 65-119t181-98q78 57 78 146 0 68-50.5 115T434 967q-37-14-63.5-53.5T344 827z"/><glyph unicode="¨" horiz-adv-x="1243" d="M279 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T418 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T823 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T682 1405z"/><glyph unicode="©" horiz-adv-x="1704" d="M895 1010q-97 0-150-74t-53-205q0-280 203-280 57 0 123 15t123 44V319q-120-57-252-57-204 0-316 125T461 733q0 220 110.5 342.5T881 1198q149 0 305-78l-74-168q-113 58-217 58zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm142 0q0-164 82-305.5t224-223T852 121q164 0 305.5 82t223 224 81.5 304q0 164-82 305.5t-224 223-304 81.5q-164 0-305.5-82t-223-224T242 731z"/><glyph unicode="ª" horiz-adv-x="784" d="M561 764l-31 110q-43-58-105-90t-136-32q-117 0-179.5 58.5T47 975q0 109 82.5 163.5T397 1202l99 4q0 117-127 117-81 0-217-61l-66 135q66 32 145.5 57t178.5 25q137 0 211.5-71t74.5-202V764H561zM252 977q0-38 23-56t55-18q77 0 121.5 41.5T496 1051v36l-99-6q-145-10-145-104z"/><glyph unicode="«" horiz-adv-x="1260" d="M82 573l371 455 219-119-279-348 279-348L453 94 82 547v26zm506 0l370 455 220-119-279-348 279-348L958 94 588 547v26z"/><glyph unicode="¬" d="M1081 248H862v364H88v219h993V248z"/><glyph unicode="­" horiz-adv-x="659" d="M61 424zm0 0v250h537V424H61z"/><glyph unicode="®" horiz-adv-x="1704" d="M1157 905q0-170-143-233l237-400H997L819 610h-47V272H543v916h264q181 0 265.5-70t84.5-213zM772 778h31q66 0 94.5 28.5T926 901q0 65-28 92t-97 27h-29V778zm-672-47q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm142 0q0-164 82-305.5t224-223T852 121q164 0 305.5 82t223 224 81.5 304q0 164-82 305.5t-224 223-304 81.5q-164 0-305.5-82t-223-224T242 731z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v201h1036v-201z"/><glyph unicode="°" horiz-adv-x="877" d="M92 1137q0 92 46 172t126 127 174 47q92 0 172.5-46t127-127 46.5-173q0-93-46.5-173.5T611 838t-173-45q-145 0-245.5 99.5T92 1137zm191 0q0-64 44.5-109T438 983t111 46 45 108q0 63-45.5 110T438 1294q-64 0-109.5-46T283 1137z"/><glyph unicode="±" d="M475 674H88v219h387v389h219V893h387V674H694V289H475v385zM88 0v219h993V0H88z"/><glyph unicode="²" horiz-adv-x="776" d="M702 586H55v168l224 219q102 100 130.5 144.5T438 1212q0 38-24 58t-64 20q-81 0-180-88L47 1354q147 129 336 129 137 0 216-66.5t79-183.5q0-85-47-160T455 881l-105-95h352V586z"/><glyph unicode="³" horiz-adv-x="776" d="M666 1249q0-143-170-198v-13q94-20 146-75t52-134q0-121-88-190.5T332 569q-143 0-273 70v190q148-90 271-90 143 0 143 107 0 53-44 79.5T307 952H195v160h92q83 0 123.5 26t40.5 83q0 38-25 63t-76 25q-47 0-89-19t-99-59L61 1372q62 47 137.5 78t178.5 31q127 0 208-64t81-168z"/><glyph unicode="´" horiz-adv-x="1243" d="M332 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T535 1241H332z"/><glyph unicode="µ" horiz-adv-x="1352" d="M465 465q0-121 44-181.5T647 223q126 0 183 86.5T887 592v526h305V0H961l-43 150h-15Q861 65 801 22.5T653-20q-62 0-114 23t-84 67l5-85 5-157v-320H160v1610h305V465z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1167-260h-161v1616H840V-260H678v819q-62-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h604V-260z"/><glyph unicode="·" horiz-adv-x="584" d="M117 723q0 84 45 127t131 43q83 0 128.5-44T467 723q0-81-46.5-125.5T293 553q-84 0-130 44t-46 126z"/><glyph unicode="¸" horiz-adv-x="420" d="M418-250q0-128-75.5-185T109-492q-78 0-146 21v168q27-7 72.5-14t70.5-7q72 0 72 62 0 83-166 108L90 0h193l-27-61q74-24 118-74.5T418-250z"/><glyph unicode="¹" horiz-adv-x="776" d="M584 586H346v446l3 112 5 95q-27-36-75-78l-78-61-109 127 301 235h191V586z"/><glyph unicode="º" horiz-adv-x="795" d="M737 1116q0-171-91.5-267.5T395 752q-153 0-245.5 98.5T57 1116q0 169 89.5 266t252.5 97q152 0 245-98.5t93-264.5zm-477 0q0-100 32.5-150.5T397 915t103.5 50.5T532 1116t-31.5 149.5T397 1315t-104.5-49.5T260 1116z"/><glyph unicode="»" horiz-adv-x="1260" d="M1178 547L807 94 588 213l278 348-278 348 219 119 371-455v-26zm-506 0L301 94 82 213l278 348L82 909l219 119 371-455v-26z"/><glyph unicode="¼" horiz-adv-x="1804" d="M46 0zm492 586H300v446l3 112 5 95q-27-36-75-78l-78-61-109 127 301 235h191V586zm832 876L559 0H320l811 1462h239zm312-1310h-125V1h-238v151H936v154l385 577h236V320h125V152zm-363 168v164q0 86 6 184-9-26-35.5-80t-41.5-77l-127-191h198z"/><glyph unicode="½" horiz-adv-x="1804" d="M46 0zm492 586H300v446l3 112 5 95q-27-36-75-78l-78-61-109 127 301 235h191V586zm832 876L559 0H320l811 1462h239zM1716 1h-647v168l224 219q102 100 130.5 144.5T1452 627q0 38-24 58t-64 20q-81 0-180-88l-123 152q147 129 336 129 137 0 216-66.5t79-183.5q0-85-47-160t-176-192l-105-95h352V1z"/><glyph unicode="¾" horiz-adv-x="1804" d="M90 0zm607 1249q0-143-170-198v-13q94-20 146-75t52-134q0-121-88-190.5T363 569q-143 0-273 70v190q148-90 271-90 143 0 143 107 0 53-44 79.5T338 952H226v160h92q83 0 123.5 26t40.5 83q0 38-25 63t-76 25q-47 0-89-19t-99-59L92 1372q62 47 137.5 78t178.5 31q127 0 208-64t81-168zm744 213L630 0H391l811 1462h239zm271-1310h-125V1h-238v151H966v154l385 577h236V320h125V152zm-363 168v164q0 86 6 184-9-26-35.5-80t-41.5-77l-127-191h198z"/><glyph unicode="¿" horiz-adv-x="977" d="M713 606v-74q0-98-44.5-169T516 215Q407 137 378.5 93T350-14q0-57 43.5-94T526-145q79 0 169 29t186 71l102-221q-98-56-221.5-90.5T532-391q-220 0-345.5 96.5T61-29q0 108 48.5 187T301 342q95 70 121.5 107t26.5 98v59h264zm32 342q0-84-45-127t-131-43q-83 0-128.5 44T395 948q0 81 46.5 125.5T569 1118q84 0 130-44t46-126z"/><glyph unicode="À" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm-186 971q-63 44-185 142.5T338 1886v21h342q63-101 235-301v-27H713z"/><glyph unicode="Á" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm-358 971v27q172 200 235 301h342v-21q-52-52-177.5-154.5T744 1579H541z"/><glyph unicode="Â" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm39 971q-157 93-234 176-78-81-229-176H272v27q189 189 256 301h357q31-52 107.5-141.5T1141 1606v-27H938z"/><glyph unicode="Ã" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zM543 1684q-31 0-59.5-26.5T442 1577H293q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T799 1798t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T850 1579q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="Ä" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zM365 1743q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T504 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T909 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T768 1743z"/><glyph unicode="Å" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm60 959q0-108-71-174t-183-66-180 64-68 174q0 108 67.5 172.5T705 1802q110 0 182-66t72-169zm-158-2q0 45-27 70.5t-69 25.5-69-25.5-27-70.5 24-71 72-26q42 0 69 26t27 71z"/><glyph unicode="Æ" horiz-adv-x="1950" d="M1829 0H956v348H465L315 0H0l655 1462h1174v-254h-563V887h526V633h-526V256h563V0zM578 608h378v590H829z"/><glyph unicode="Ç" horiz-adv-x="1305" d="M119 0zm686 1225q-175 0-271-131.5T438 727q0-489 367-489 154 0 373 77V55Q998-20 776-20q-319 0-488 193.5T119 729q0 228 83 399.5t238.5 263T805 1483q213 0 428-103l-100-252q-82 39-165 68t-163 29zM959-250q0-128-75.5-185T650-492q-78 0-146 21v168q27-7 72.5-14t70.5-7q72 0 72 62 0 83-166 108L631 0h193l-27-61q74-24 118-74.5T959-250z"/><glyph unicode="È" horiz-adv-x="1147" d="M184 0zm842 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM634 1579q-63 44-185 142.5T259 1886v21h342q63-101 235-301v-27H634z"/><glyph unicode="É" horiz-adv-x="1147" d="M184 0zm842 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM424 1579v27q172 200 235 301h342v-21q-52-52-177.5-154.5T627 1579H424z"/><glyph unicode="Ê" horiz-adv-x="1147" d="M175 0zm851 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM841 1579q-157 93-234 176-78-81-229-176H175v27q189 189 256 301h357q31-52 107.5-141.5T1044 1606v-27H841z"/><glyph unicode="Ë" horiz-adv-x="1147" d="M184 0zm842 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM272 1743q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T411 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T816 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T675 1743z"/><glyph unicode="Ì" horiz-adv-x="678" d="M0 0zm184 0v1462h310V0H184zm133 1579q-63 44-185 142.5T-58 1886v21h342q63-101 235-301v-27H317z"/><glyph unicode="Í" horiz-adv-x="678" d="M167 0zm17 0v1462h310V0H184zm-17 1579v27q172 200 235 301h342v-21q-52-52-177.5-154.5T370 1579H167z"/><glyph unicode="Î" horiz-adv-x="678" d="M0 0zm184 0v1462h310V0H184zm386 1579q-157 93-234 176-78-81-229-176H-96v27q189 189 256 301h357q31-52 107.5-141.5T773 1606v-27H570z"/><glyph unicode="Ï" horiz-adv-x="678" d="M0 0zm184 0v1462h310V0H184zM-3 1743q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T136 1610q-64 0-101.5 35T-3 1743zm403 0q0 70 40.5 102.5T541 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T400 1743z"/><glyph unicode="Ð" horiz-adv-x="1516" d="M47 850h137v612h459q358 0 556-189t198-528q0-361-205.5-553T598 0H184v596H47v254zm1028-113q0 232-104 351.5T657 1208H494V850h237V596H494V256h131q450 0 450 481z"/><glyph unicode="Ñ" horiz-adv-x="1665" d="M184 0zm1297 0h-394L451 1106h-9q19-293 19-418V0H184v1462h391l635-1095h7q-15 285-15 403v692h279V0zM668 1684q-31 0-59.5-26.5T567 1577H418q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T924 1798t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T975 1579q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="Ò" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm380 846q-63 44-185 142.5T449 1886v21h342q63-101 235-301v-27H824z"/><glyph unicode="Ó" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm214 846v27q172 200 235 301h342v-21q-52-52-177.5-154.5T861 1579H658z"/><glyph unicode="Ô" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm603 846q-157 93-234 176-78-81-229-176H381v27q189 189 256 301h357q31-52 107.5-141.5T1250 1606v-27h-203z"/><glyph unicode="Õ" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm208 951q-31 0-59.5-26.5T551 1577H402q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T908 1798t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T959 1579q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="Ö" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm30 1010q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T613 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T1018 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T877 1743z"/><glyph unicode="×" d="M428 723l-299 301 152 154 301-299 305 299 153-150-305-305 301-303-149-152-305 301-301-299-150 152z"/><glyph unicode="Ø" horiz-adv-x="1630" d="M1511 733q0-363-180-558T815-20q-197 0-336 65L389-90 227 18l90 136Q119 348 119 735q0 365 180.5 557.5T817 1485q198 0 344-70l84 125 160-104-88-131q194-194 194-572zm-1067 0q0-191 56-307l506 756q-84 45-189 45-185 0-279-124.5T444 733zm742 0q0 180-51 297L635 279q76-39 180-39 371 0 371 493z"/><glyph unicode="Ù" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-624 117q-63 44-185 142.5T375 1886v21h342q63-101 235-301v-27H750z"/><glyph unicode="Ú" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-772 117v27q172 200 235 301h342v-21q-52-52-177.5-154.5T805 1579H602z"/><glyph unicode="Û" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-368 117q-157 93-234 176-78-81-229-176H340v27q189 189 256 301h357q31-52 107.5-141.5T1209 1606v-27h-203z"/><glyph unicode="Ü" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-941 281q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T572 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T977 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T836 1743z"/><glyph unicode="Ý" horiz-adv-x="1278" d="M0 0zm639 860l305 602h334L793 569V0H485v559L0 1462h336zm-178 719v27q172 200 235 301h342v-21q-52-52-177.5-154.5T664 1579H461z"/><glyph unicode="Þ" horiz-adv-x="1286" d="M1194 770q0-229-142.5-353T647 293H494V0H184v1462h310v-229h178q254 0 388-119t134-344zM494 543h100q145 0 216 52.5T881 770q0 107-63.5 159T618 981H494V543z"/><glyph unicode="ß" horiz-adv-x="1456" d="M1249 1241q0-64-21-112.5t-53-86.5-69-67-69-53-53-45-21-43q0-27 26.5-53t92.5-66q146-91 198.5-140t78-110 25.5-139q0-172-116.5-259T924-20q-99 0-171 14.5T621 43v242q53-36 135.5-61T903 199q168 0 168 123 0 41-16 66.5T998 444t-115 72q-126 72-175 131.5T659 788q0 64 35 117t105 102q77 55 108 95t31 86q0 60-63.5 100.5T711 1329q-116 0-181-52.5T465 1128V0H160v1139q0 201 146.5 314.5T711 1567q244 0 391-88.5t147-237.5z"/><glyph unicode="à" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-166 723q-63 44-185 142.5T239 1548v21h342q63-101 235-301v-27H614z"/><glyph unicode="á" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-339 723v27q172 200 235 301h342v-21q-52-52-177.5-154.5T644 1241H441z"/><glyph unicode="â" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm63 722q-157 93-234 176-78-81-229-176H177v27q189 189 256 301h357q31-52 107.5-141.5T1046 1267v-27H843z"/><glyph unicode="ã" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-313 828q-31 0-59.5-26.5T366 1239H217q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T723 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T774 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="ä" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-495 887q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T424 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T829 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T688 1405z"/><glyph unicode="å" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm103 961q0-108-71-174t-183-66-180 64-68 174q0 108 67.5 172.5T629 1714q110 0 182-66t72-169zm-158-2q0 45-27 70.5t-69 25.5-69-25.5-27-70.5 24-71 72-26q42 0 69 26t27 71z"/><glyph unicode="æ" horiz-adv-x="1878" d="M1329-20q-137 0-249.5 50.5T895 186Q797 69 698.5 24.5T442-20q-161 0-258.5 94.5T86 334q0 178 121 262.5T569 690l191 6v84q0 69-44.5 102T594 915q-140 0-305-77l-99 202q189 101 422 101 227 0 342-131 66 64 152.5 96.5T1313 1139q221 0 349-137.5T1790 631V483h-723q5-130 77-203t202-73q196 0 380 88V59q-79-39-171-59t-226-20zM760 518l-113-4q-124-4-186-47.5T399 332q0-129 140-129 101 0 161 61t60 162v92zm547 404q-217 0-234-236h430q-2 112-55 174t-141 62z"/><glyph unicode="ç" horiz-adv-x="1053" d="M92 0zm522-20Q92-20 92 553q0 285 142 435.5T641 1139q194 0 348-76l-90-236q-72 29-134 47.5T641 893q-238 0-238-338 0-328 238-328 88 0 163 23.5T954 324V63Q880 16 804.5-2T614-20zm191-230q0-128-75.5-185T496-492q-78 0-146 21v168q27-7 72.5-14t70.5-7q72 0 72 62 0 83-166 108L477 0h193l-27-61q74-24 118-74.5T805-250z"/><glyph unicode="è" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zm-46 1261q-63 44-185 142.5T245 1548v21h342q63-101 235-301v-27H620z"/><glyph unicode="é" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zM447 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T650 1241H447z"/><glyph unicode="ê" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zm194 1261q-157 93-234 176-78-81-229-176H194v27q189 189 256 301h357q31-52 107.5-141.5T1063 1268v-27H860z"/><glyph unicode="ë" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zM297 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T436 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T841 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T700 1405z"/><glyph unicode="ì" horiz-adv-x="625" d="M0 0zm465 0H160v1118h305V0zM274 1241q-63 44-185 142.5T-101 1548v21h342q63-101 235-301v-27H274z"/><glyph unicode="í" horiz-adv-x="625" d="M145 0zm320 0H160v1118h305V0zM145 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T348 1241H145z"/><glyph unicode="î" horiz-adv-x="625" d="M0 0zm465 0H160v1118h305V0zm79 1241q-157 93-234 176-78-81-229-176h-203v27q189 189 256 301h357q31-52 107.5-141.5T747 1268v-27H544z"/><glyph unicode="ï" horiz-adv-x="625" d="M0 0zm465 0H160v1118h305V0zM-29 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T110 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T515 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T374 1405z"/><glyph unicode="ð" horiz-adv-x="1268" d="M510 1303q-80 53-152 92l101 176q144-65 258-141l225 139 100-154-170-104q156-143 230-324.5t74-413.5q0-280-145-436.5T631-20q-245 0-392 137T92 489q0 233 130 369.5T573 995q205 0 275-98l8 4q-67 162-192 281l-230-142-100 156zm354-771q0 108-61 173t-168 65q-121 0-176.5-68.5T403 487q0-140 60-211t172-71q123 0 176 82t53 245z"/><glyph unicode="ñ" horiz-adv-x="1346" d="M160 0zm1032 0H887v653q0 121-43 181.5T707 895q-128 0-185-85.5T465 526V0H160v1118h233l41-143h17q51 81 140.5 122.5T795 1139q195 0 296-105.5T1192 729V0zM508 1346q-31 0-59.5-26.5T407 1239H258q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T764 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T815 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="ò" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-564 680q-63 44-185 142.5T237 1548v21h342q63-101 235-301v-27H612z"/><glyph unicode="ó" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-709 680v27q172 200 235 301h342v-21q-52-52-177.5-154.5T670 1241H467z"/><glyph unicode="ô" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-312 680q-157 93-234 176-78-81-229-176H198v27q189 189 256 301h357q31-52 107.5-141.5T1067 1268v-27H864z"/><glyph unicode="õ" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-707 785q-31 0-59.5-26.5T368 1239H219q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T725 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T776 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="ö" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-885 844q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T430 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T835 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T694 1405z"/><glyph unicode="÷" d="M88 612v219h993V612H88zm356-239q0 76 37 113.5T584 524t102.5-39T723 373q0-70-37-111t-102-41-102.5 39T444 373zm0 698q0 75 37 113.5t103 38.5q67 0 103-40.5t36-111.5q0-70-37-110.5T584 920t-102.5 39-37.5 112z"/><glyph unicode="ø" horiz-adv-x="1268" d="M1176 561q0-273-144-427T631-20q-126 0-234 45L330-76 176 29l68 100Q92 285 92 561q0 274 143 426t402 152q132 0 248-52l55 82 152-108-58-84q142-155 142-416zm-773 0q0-94 19-166l317 475q-43 23-106 23-122 0-176-82.5T403 561zm461 0q0 81-12 141L543 240q38-15 92-15 122 0 175.5 84.5T864 561z"/><glyph unicode="ù" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zM620 1241q-63 44-185 142.5T245 1548v21h342q63-101 235-301v-27H620z"/><glyph unicode="ú" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zM498 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T701 1241H498z"/><glyph unicode="û" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zm-51 1241q-157 93-234 176-78-81-229-176H235v27q189 189 256 301h357q31-52 107.5-141.5T1104 1268v-27H901z"/><glyph unicode="ü" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zM326 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T465 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T870 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T729 1405z"/><glyph unicode="ý" horiz-adv-x="1165" d="M0 0zm0 1118h334l211-629q27-82 37-194h6q11 103 43 194l207 629h327L692-143q-65-175-185.5-262T225-492q-79 0-155 17v242q55-13 120-13 81 0 141.5 49.5T426-47l18 55zm393 123v27q172 200 235 301h342v-21q-52-52-177.5-154.5T596 1241H393z"/><glyph unicode="þ" horiz-adv-x="1296" d="M465 973q50 81 131 123.5t186 42.5q198 0 310-154.5T1204 561q0-273-111.5-427T782-20q-213 0-317 137h-14l7-62 7-94v-453H160v2048h305v-391l-7-120-7-72h14zm219-78q-113 0-165-69.5T465 596v-33q0-180 53.5-258T688 227q205 0 205 338 0 165-50.5 247.5T684 895z"/><glyph unicode="ÿ" horiz-adv-x="1165" d="M0 0zm0 1118h334l211-629q27-82 37-194h6q11 103 43 194l207 629h327L692-143q-65-175-185.5-262T225-492q-79 0-155 17v242q55-13 120-13 81 0 141.5 49.5T426-47l18 55zm243 287q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T382 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T787 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T646 1405z"/><glyph unicode="ı" horiz-adv-x="625" d="M465 0H160v1118h305V0z"/><glyph unicode="Œ" horiz-adv-x="1993" d="M1872 0H999q-38-9-109-14.5T774-20q-319 0-487 197T119 735q0 363 169.5 556.5T776 1485q61 0 127-7t101-16h868v-254h-563V887h526V633h-526V256h563V0zM776 1227q-166 0-252-125.5T438 733q0-244 86-368.5T774 240q65 0 126 10.5t99 28.5v907q-35 19-101.5 30T776 1227z"/><glyph unicode="œ" horiz-adv-x="2003" d="M1446-20q-271 0-420 155Q885-20 635-20q-162 0-286 70T158.5 252 92 561q0 277 141.5 427.5T633 1139q112 0 212-39.5T1016 983q144 156 383 156 244 0 380-135t136-373V483h-746v-8q7-127 81.5-197.5T1458 207q107 0 200 21t193 67V59q-81-39-175.5-59T1446-20zM403 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm1002 361q-94 0-156-57.5T1178 686h450q-2 111-60.5 173.5T1405 922z"/><glyph unicode="Ÿ" horiz-adv-x="1278" d="M0 0zm639 860l305 602h334L793 569V0H485v559L0 1462h336zm-342 883q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T436 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T841 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T700 1743z"/><glyph unicode="ˆ" horiz-adv-x="1243" d="M852 1241q-157 93-234 176-78-81-229-176H186v27q189 189 256 301h357q31-52 107.5-141.5T1055 1268v-27H852z"/><glyph unicode="˚" horiz-adv-x="1182" d="M842 1479q0-108-71-174t-183-66-180 64-68 174q0 108 67.5 172.5T588 1714q110 0 182-66t72-169zm-158-2q0 45-27 70.5t-69 25.5-69-25.5-27-70.5 24-71 72-26q42 0 69 26t27 71z"/><glyph unicode="˜" horiz-adv-x="1243" d="M457 1346q-31 0-59.5-26.5T356 1239H207q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T713 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T764 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="‐" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="‑" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="‒" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 436v230h860V436H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 436v230h1884V436H82z"/><glyph unicode="‘" horiz-adv-x="444" d="M39 961l-14 22q22 91 72.5 228.5T201 1462h219q-66-267-101-501H39z"/><glyph unicode="’" horiz-adv-x="444" d="M406 1462l14-22q-50-197-176-479H25q69 296 100 501h281z"/><glyph unicode="‚" horiz-adv-x="596" d="M459 215Q407 13 283-264H63Q128 2 164 238h280z"/><glyph unicode="“" horiz-adv-x="911" d="M492 983q22 91 72.5 228.5T668 1462h219q-66-267-101-501H506zm-467 0q22 91 72.5 228.5T201 1462h219q-66-267-101-501H39z"/><glyph unicode="”" horiz-adv-x="911" d="M420 1440q-50-197-176-479H25q69 296 100 501h281zm467 0q-50-197-176-479H492q69 296 100 501h280z"/><glyph unicode="„" horiz-adv-x="1061" d="M459 215Q407 13 283-264H63Q128 2 164 238h280zm467 0Q874 13 750-264H530Q595 2 631 238h280z"/><glyph unicode="•" horiz-adv-x="770" d="M98 748q0 154 74 235.5t213 81.5q137 0 212-82t75-235q0-152-75.5-235T385 430q-138 0-212.5 83T98 748z"/><glyph unicode="…" horiz-adv-x="1751" d="M117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143zm583 0q0 84 45 127t132 43q83 0 128.5-44t45.5-126q0-79-46-124.5T877-27q-85 0-131 44.5T700 143zm584 0q0 84 45 127t131 43q83 0 128.5-44t45.5-126q0-79-46-124.5T1460-27q-84 0-130 44.5T1284 143z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="754" d="M82 573l371 455 219-119-279-348 279-348L453 94 82 547v26z"/><glyph unicode="›" horiz-adv-x="754" d="M672 547L301 94 82 213l278 348L82 909l219 119 371-455v-26z"/><glyph unicode="⁄" horiz-adv-x="266" d="M657 1462L-154 0h-239l811 1462h239z"/><glyph horiz-adv-x="476"/><glyph unicode="⁴" horiz-adv-x="776" d="M758 737H633V586H395v151H12v154l385 577h236V905h125V737zM395 905v164q0 86 6 184-9-26-35.5-80t-41.5-77L197 905h198z"/><glyph unicode="€" d="M803 1225q-122 0-201-70.5T500 950h403V774H485l-2-35v-47l2-33h355V481H502q51-243 321-243 143 0 275 57V39Q982-20 805-20q-245 0-403 133T203 481H66v178h118q-4 23-4 62l2 53H66v176h133q37 242 199 382.5T803 1473q188 0 352-82l-98-232q-69 31-129 48.5T803 1225z"/><glyph unicode="™" horiz-adv-x="1534" d="M381 741H213v572H16v149h564v-149H381V741zm575 0l-165 529h-7l4-111V741H625v721h247l160-510 170 510h240V741h-168v408l4 121h-6l-174-529H956z"/><glyph unicode="" horiz-adv-x="1120" d="M0 1120h1120V0H0v1120z"/><glyph horiz-adv-x="1296" d="M0 0z"/><hkern u1="&amp;quot;" u2="Ÿ" k="-20"/><hkern u1="&amp;quot;" u2="œ" k="123"/><hkern u1="&amp;quot;" u2="ü" k="61"/><hkern u1="&amp;quot;" u2="û" k="61"/><hkern u1="&amp;quot;" u2="ú" k="61"/><hkern u1="&amp;quot;" u2="ù" k="61"/><hkern u1="&amp;quot;" u2="ø" k="123"/><hkern u1="&amp;quot;" u2="ö" k="123"/><hkern u1="&amp;quot;" u2="õ" k="123"/><hkern u1="&amp;quot;" u2="ô" k="123"/><hkern u1="&amp;quot;" u2="ó" k="123"/><hkern u1="&amp;quot;" u2="ò" k="123"/><hkern u1="&amp;quot;" u2="ë" k="123"/><hkern u1="&amp;quot;" u2="ê" k="123"/><hkern u1="&amp;quot;" u2="é" k="123"/><hkern u1="&amp;quot;" u2="è" k="123"/><hkern u1="&amp;quot;" u2="ç" k="123"/><hkern u1="&amp;quot;" u2="æ" k="82"/><hkern u1="&amp;quot;" u2="å" k="82"/><hkern u1="&amp;quot;" u2="ä" k="82"/><hkern u1="&amp;quot;" u2="ã" k="82"/><hkern u1="&amp;quot;" u2="â" k="82"/><hkern u1="&amp;quot;" u2="á" k="82"/><hkern u1="&amp;quot;" u2="à" k="123"/><hkern u1="&amp;quot;" u2="Ý" k="-20"/><hkern u1="&amp;quot;" u2="Å" k="143"/><hkern u1="&amp;quot;" u2="Ä" k="143"/><hkern u1="&amp;quot;" u2="Ã" k="143"/><hkern u1="&amp;quot;" u2="Â" k="143"/><hkern u1="&amp;quot;" u2="Á" k="143"/><hkern u1="&amp;quot;" u2="À" k="143"/><hkern u1="&amp;quot;" u2="u" k="61"/><hkern u1="&amp;quot;" u2="s" k="61"/><hkern u1="&amp;quot;" u2="r" k="61"/><hkern u1="&amp;quot;" u2="q" k="123"/><hkern u1="&amp;quot;" u2="p" k="61"/><hkern u1="&amp;quot;" u2="o" k="123"/><hkern u1="&amp;quot;" u2="n" k="61"/><hkern u1="&amp;quot;" u2="m" k="61"/><hkern u1="&amp;quot;" u2="g" k="61"/><hkern u1="&amp;quot;" u2="e" k="123"/><hkern u1="&amp;quot;" u2="d" k="123"/><hkern u1="&amp;quot;" u2="c" k="123"/><hkern u1="&amp;quot;" u2="a" k="82"/><hkern u1="&amp;quot;" u2="Y" k="-20"/><hkern u1="&amp;quot;" u2="W" k="-41"/><hkern u1="&amp;quot;" u2="V" k="-41"/><hkern u1="&amp;quot;" u2="T" k="-41"/><hkern u1="&amp;quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="œ" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="å" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à" k="123"/><hkern u1="'" u2="Ý" k="-20"/><hkern u1="'" u2="Å" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Á" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Œ" k="102"/><hkern u1="," u2="Ý" k="123"/><hkern u1="," u2="Ü" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ò" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Œ" k="102"/><hkern u1="." u2="Ý" k="123"/><hkern u1="." u2="Ü" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ò" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="”" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Œ" k="41"/><hkern u1="A" u2="Ý" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ò" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&amp;quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ý" k="20"/><hkern u1="B" u2="Å" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Á" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Œ" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ò" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ý" k="20"/><hkern u1="D" u2="Å" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Á" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Å" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Á" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Œ" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ò" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="”" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Œ" k="41"/><hkern u1="L" u2="Ý" k="61"/><hkern u1="L" u2="Ü" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ò" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&amp;quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ý" k="20"/><hkern u1="O" u2="Å" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Á" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Å" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Á" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ý" k="20"/><hkern u1="Q" u2="Å" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Á" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="œ" k="143"/><hkern u1="T" u2="Œ" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="å" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à" k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ò" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Å" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Á" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Å" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Á" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="œ" k="41"/><hkern u1="V" u2="Œ" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="å" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à" k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ò" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Å" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Á" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="œ" k="41"/><hkern u1="W" u2="Œ" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="å" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à" k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ò" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Å" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Á" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Œ" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ò" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="œ" k="102"/><hkern u1="Y" u2="Œ" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="å" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à" k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ò" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Å" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Á" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Œ" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ò" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="”" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&amp;quot;" k="20"/><hkern u1="b" u2="”" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&amp;quot;" k="20"/><hkern u1="c" u2="”" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&amp;quot;" k="-41"/><hkern u1="e" u2="”" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&amp;quot;" k="20"/><hkern u1="f" u2="”" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&amp;quot;" k="-123"/><hkern u1="h" u2="”" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&amp;quot;" k="20"/><hkern u1="k" u2="œ" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à" k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="”" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&amp;quot;" k="20"/><hkern u1="n" u2="”" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&amp;quot;" k="20"/><hkern u1="o" u2="”" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&amp;quot;" k="20"/><hkern u1="p" u2="”" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&amp;quot;" k="20"/><hkern u1="r" u2="”" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="œ" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="å" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à" k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&amp;quot;" k="-82"/><hkern u1="t" u2="”" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&amp;quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="”" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&amp;quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="”" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&amp;quot;" k="-82"/><hkern u1="x" u2="œ" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à" k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="”" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&amp;quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="”" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Œ" k="41"/><hkern u1="À" u2="Ý" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ò" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&amp;quot;" k="143"/><hkern u1="Á" u2="”" k="143"/><hkern u1="Á" u2="’" k="143"/><hkern u1="Á" u2="Ÿ" k="123"/><hkern u1="Á" u2="Œ" k="41"/><hkern u1="Á" u2="Ý" k="123"/><hkern u1="Á" u2="Ø" k="41"/><hkern u1="Á" u2="Ö" k="41"/><hkern u1="Á" u2="Õ" k="41"/><hkern u1="Á" u2="Ô" k="41"/><hkern u1="Á" u2="Ó" k="41"/><hkern u1="Á" u2="Ò" k="41"/><hkern u1="Á" u2="Ç" k="41"/><hkern u1="Á" u2="Y" k="123"/><hkern u1="Á" u2="W" k="82"/><hkern u1="Á" u2="V" k="82"/><hkern u1="Á" u2="T" k="143"/><hkern u1="Á" u2="Q" k="41"/><hkern u1="Á" u2="O" k="41"/><hkern u1="Á" u2="J" k="-266"/><hkern u1="Á" u2="G" k="41"/><hkern u1="Á" u2="C" k="41"/><hkern u1="Á" u2="'" k="143"/><hkern u1="Á" u2="&amp;quot;" k="143"/><hkern u1="Â" u2="”" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Œ" k="41"/><hkern u1="Â" u2="Ý" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ò" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&amp;quot;" k="143"/><hkern u1="Ã" u2="”" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Œ" k="41"/><hkern u1="Ã" u2="Ý" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ò" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&amp;quot;" k="143"/><hkern u1="Ä" u2="”" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Œ" k="41"/><hkern u1="Ä" u2="Ý" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ò" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&amp;quot;" k="143"/><hkern u1="Å" u2="”" k="143"/><hkern u1="Å" u2="’" k="143"/><hkern u1="Å" u2="Ÿ" k="123"/><hkern u1="Å" u2="Œ" k="41"/><hkern u1="Å" u2="Ý" k="123"/><hkern u1="Å" u2="Ø" k="41"/><hkern u1="Å" u2="Ö" k="41"/><hkern u1="Å" u2="Õ" k="41"/><hkern u1="Å" u2="Ô" k="41"/><hkern u1="Å" u2="Ó" k="41"/><hkern u1="Å" u2="Ò" k="41"/><hkern u1="Å" u2="Ç" k="41"/><hkern u1="Å" u2="Y" k="123"/><hkern u1="Å" u2="W" k="82"/><hkern u1="Å" u2="V" k="82"/><hkern u1="Å" u2="T" k="143"/><hkern u1="Å" u2="Q" k="41"/><hkern u1="Å" u2="O" k="41"/><hkern u1="Å" u2="J" k="-266"/><hkern u1="Å" u2="G" k="41"/><hkern u1="Å" u2="C" k="41"/><hkern u1="Å" u2="'" k="143"/><hkern u1="Å" u2="&amp;quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Œ" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ò" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ð" u2="„" k="82"/><hkern u1="Ð" u2="‚" k="82"/><hkern u1="Ð" u2="Ÿ" k="20"/><hkern u1="Ð" u2="Ý" k="20"/><hkern u1="Ð" u2="Å" k="41"/><hkern u1="Ð" u2="Ä" k="41"/><hkern u1="Ð" u2="Ã" k="41"/><hkern u1="Ð" u2="Â" k="41"/><hkern u1="Ð" u2="Á" k="41"/><hkern u1="Ð" u2="À" k="41"/><hkern u1="Ð" u2="Z" k="20"/><hkern u1="Ð" u2="Y" k="20"/><hkern u1="Ð" u2="X" k="41"/><hkern u1="Ð" u2="W" k="20"/><hkern u1="Ð" u2="V" k="20"/><hkern u1="Ð" u2="T" k="61"/><hkern u1="Ð" u2="A" k="41"/><hkern u1="Ð" u2="." k="82"/><hkern u1="Ð" u2="," k="82"/><hkern u1="Ò" u2="„" k="82"/><hkern u1="Ò" u2="‚" k="82"/><hkern u1="Ò" u2="Ÿ" k="20"/><hkern u1="Ò" u2="Ý" k="20"/><hkern u1="Ò" u2="Å" k="41"/><hkern u1="Ò" u2="Ä" k="41"/><hkern u1="Ò" u2="Ã" k="41"/><hkern u1="Ò" u2="Â" k="41"/><hkern u1="Ò" u2="Á" k="41"/><hkern u1="Ò" u2="À" k="41"/><hkern u1="Ò" u2="Z" k="20"/><hkern u1="Ò" u2="Y" k="20"/><hkern u1="Ò" u2="X" k="41"/><hkern u1="Ò" u2="W" k="20"/><hkern u1="Ò" u2="V" k="20"/><hkern u1="Ò" u2="T" k="61"/><hkern u1="Ò" u2="A" k="41"/><hkern u1="Ò" u2="." k="82"/><hkern u1="Ò" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ý" k="20"/><hkern u1="Ó" u2="Å" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Á" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ý" k="20"/><hkern u1="Ô" u2="Å" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Á" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ý" k="20"/><hkern u1="Õ" u2="Å" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Á" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ý" k="20"/><hkern u1="Ö" u2="Å" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Á" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ý" k="20"/><hkern u1="Ø" u2="Å" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Á" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Å" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Á" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Å" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Á" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Å" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Á" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ü" u2="„" k="41"/><hkern u1="Ü" u2="‚" k="41"/><hkern u1="Ü" u2="Å" k="20"/><hkern u1="Ü" u2="Ä" k="20"/><hkern u1="Ü" u2="Ã" k="20"/><hkern u1="Ü" u2="Â" k="20"/><hkern u1="Ü" u2="Á" k="20"/><hkern u1="Ü" u2="À" k="20"/><hkern u1="Ü" u2="A" k="20"/><hkern u1="Ü" u2="." k="41"/><hkern u1="Ü" u2="," k="41"/><hkern u1="Ý" u2="„" k="123"/><hkern u1="Ý" u2="‚" k="123"/><hkern u1="Ý" u2="œ" k="102"/><hkern u1="Ý" u2="Œ" k="41"/><hkern u1="Ý" u2="ü" k="61"/><hkern u1="Ý" u2="û" k="61"/><hkern u1="Ý" u2="ú" k="61"/><hkern u1="Ý" u2="ù" k="61"/><hkern u1="Ý" u2="ø" k="102"/><hkern u1="Ý" u2="ö" k="102"/><hkern u1="Ý" u2="õ" k="102"/><hkern u1="Ý" u2="ô" k="102"/><hkern u1="Ý" u2="ó" k="102"/><hkern u1="Ý" u2="ò" k="102"/><hkern u1="Ý" u2="ë" k="102"/><hkern u1="Ý" u2="ê" k="102"/><hkern u1="Ý" u2="é" k="102"/><hkern u1="Ý" u2="è" k="102"/><hkern u1="Ý" u2="ç" k="102"/><hkern u1="Ý" u2="æ" k="102"/><hkern u1="Ý" u2="å" k="102"/><hkern u1="Ý" u2="ä" k="102"/><hkern u1="Ý" u2="ã" k="102"/><hkern u1="Ý" u2="â" k="102"/><hkern u1="Ý" u2="á" k="102"/><hkern u1="Ý" u2="à" k="102"/><hkern u1="Ý" u2="Ø" k="41"/><hkern u1="Ý" u2="Ö" k="41"/><hkern u1="Ý" u2="Õ" k="41"/><hkern u1="Ý" u2="Ô" k="41"/><hkern u1="Ý" u2="Ó" k="41"/><hkern u1="Ý" u2="Ò" k="41"/><hkern u1="Ý" u2="Ç" k="41"/><hkern u1="Ý" u2="Å" k="123"/><hkern u1="Ý" u2="Ä" k="123"/><hkern u1="Ý" u2="Ã" k="123"/><hkern u1="Ý" u2="Â" k="123"/><hkern u1="Ý" u2="Á" k="123"/><hkern u1="Ý" u2="À" k="123"/><hkern u1="Ý" u2="z" k="41"/><hkern u1="Ý" u2="u" k="61"/><hkern u1="Ý" u2="s" k="82"/><hkern u1="Ý" u2="r" k="61"/><hkern u1="Ý" u2="q" k="102"/><hkern u1="Ý" u2="p" k="61"/><hkern u1="Ý" u2="o" k="102"/><hkern u1="Ý" u2="n" k="61"/><hkern u1="Ý" u2="m" k="61"/><hkern u1="Ý" u2="g" k="41"/><hkern u1="Ý" u2="e" k="102"/><hkern u1="Ý" u2="d" k="102"/><hkern u1="Ý" u2="c" k="102"/><hkern u1="Ý" u2="a" k="102"/><hkern u1="Ý" u2="Q" k="41"/><hkern u1="Ý" u2="O" k="41"/><hkern u1="Ý" u2="G" k="41"/><hkern u1="Ý" u2="C" k="41"/><hkern u1="Ý" u2="A" k="123"/><hkern u1="Ý" u2="?" k="-41"/><hkern u1="Ý" u2="." k="123"/><hkern u1="Ý" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Å" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Á" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à" u2="”" k="20"/><hkern u1="à" u2="’" k="20"/><hkern u1="à" u2="'" k="20"/><hkern u1="à" u2="&amp;quot;" k="20"/><hkern u1="á" u2="”" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&amp;quot;" k="20"/><hkern u1="â" u2="”" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&amp;quot;" k="20"/><hkern u1="ã" u2="”" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&amp;quot;" k="20"/><hkern u1="ä" u2="”" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&amp;quot;" k="20"/><hkern u1="å" u2="”" k="20"/><hkern u1="å" u2="’" k="20"/><hkern u1="å" u2="'" k="20"/><hkern u1="å" u2="&amp;quot;" k="20"/><hkern u1="è" u2="”" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&amp;quot;" k="20"/><hkern u1="é" u2="”" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&amp;quot;" k="20"/><hkern u1="ê" u2="”" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&amp;quot;" k="20"/><hkern u1="ë" u2="”" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&amp;quot;" k="20"/><hkern u1="ð" u2="”" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&amp;quot;" k="20"/><hkern u1="ò" u2="”" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&amp;quot;" k="20"/><hkern u1="ó" u2="”" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&amp;quot;" k="20"/><hkern u1="ô" u2="”" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&amp;quot;" k="20"/><hkern u1="ö" u2="”" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&amp;quot;" k="41"/><hkern u1="ø" u2="”" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&amp;quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="”" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&amp;quot;" k="-82"/><hkern u1="þ" u2="”" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&amp;quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="”" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&amp;quot;" k="-82"/><hkern u1="Œ" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="œ" k="102"/><hkern u1="Ÿ" u2="Œ" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="å" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à" k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ò" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Å" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Á" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="œ" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="å" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à" k="123"/><hkern u1="‘" u2="Ý" k="-20"/><hkern u1="‘" u2="Å" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Á" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="œ" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="å" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à" k="123"/><hkern u1="’" u2="Ý" k="-20"/><hkern u1="’" u2="Å" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Á" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Œ" k="102"/><hkern u1="‚" u2="Ý" k="123"/><hkern u1="‚" u2="Ü" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ò" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="œ" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="å" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à" k="123"/><hkern u1="“" u2="Ý" k="-20"/><hkern u1="“" u2="Å" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Á" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Œ" k="102"/><hkern u1="„" u2="Ý" k="123"/><hkern u1="„" u2="Ü" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ò" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/opensans/bold/opensans-700.ttf b/lib/web/fonts/opensans/bold/opensans-700.ttf
deleted file mode 100644
index 2109c958e3c5c..0000000000000
Binary files a/lib/web/fonts/opensans/bold/opensans-700.ttf and /dev/null differ
diff --git a/lib/web/fonts/opensans/light/opensans-300.eot b/lib/web/fonts/opensans/light/opensans-300.eot
deleted file mode 100644
index 14868406aa7d7..0000000000000
Binary files a/lib/web/fonts/opensans/light/opensans-300.eot and /dev/null differ
diff --git a/lib/web/fonts/opensans/light/opensans-300.svg b/lib/web/fonts/opensans/light/opensans-300.svg
deleted file mode 100644
index efddfe75be637..0000000000000
--- a/lib/web/fonts/opensans/light/opensans-300.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1169"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="fi" horiz-adv-x="1077" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zM895 0h-99v1087h99V0zM782 1389q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="fl" horiz-adv-x="1077" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zM895 0h-99v1556h99V0z"/><glyph unicode="ffi" horiz-adv-x="1692" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zm614 0H944V0h-99v1001H643v58l202 37v84q0 200 73.5 293.5T1159 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T944 1188v-101h256v-86zM1510 0h-99v1087h99V0zm-113 1389q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="ffl" horiz-adv-x="1692" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zm614 0H944V0h-99v1001H643v58l202 37v84q0 200 73.5 293.5T1159 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T944 1188v-101h256v-86zM1510 0h-99v1556h99V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="492" d="M276 377h-61l-29 1085h119zM164 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="&amp;quot;" horiz-adv-x="723" d="M260 1462l-33-528h-61l-33 528h127zm330 0l-33-528h-61l-33 528h127z"/><glyph unicode="#" horiz-adv-x="1323" d="M967 928l-76-398h303v-79H874L788 0h-90l88 451H426L340 0h-88l86 451H55v79h299l76 398H133v80h311l86 454h91l-89-454h365l88 454h86l-88-454h285v-80H967zM440 530h363l78 398H518z"/><glyph unicode="$" d="M991 440q0-133-99-217T618 117v-236h-81v232q-92 2-200.5 22.5T164 186v103q75-36 179.5-61T537 203v508q-145 44-215 88T220 903t-32 146q0 124 94.5 208.5T537 1362v192h81v-190q197-9 351-72l-33-90q-141 62-318 72V788q213-66 293-144t80-204zm-110 4q0 85-63 140.5T618 680V209q122 13 192.5 75T881 444zm-584 605q0-86 57-141t183-93v453q-119-16-179.5-76T297 1049z"/><glyph unicode="%" horiz-adv-x="1653" d="M211 1026q0-186 45-279.5T397 653q193 0 193 373 0 184-49.5 276.5T397 1395q-96 0-141-92.5T211 1026zm477 0q0-226-75-343.5T397 565q-133 0-208.5 120.5T113 1026q0 223 72 340t212 117q139 0 215-120.5t76-336.5zm375-588q0-185 45-277.5T1249 68q193 0 193 370 0 369-193 369-96 0-141-91.5T1063 438zm477 0q0-226-74-343.5T1251-23q-136 0-211 121.5T965 438q0 225 73.5 341T1251 895q137 0 213-120t76-337zm-260 1024L469 0h-96l811 1462h96z"/><glyph unicode="&amp;" horiz-adv-x="1460" d="M123 371q0 138 73.5 235T471 811l-75 82q-66 71-98 139t-32 142q0 143 95.5 227t256.5 84q155 0 245.5-81t90.5-224q0-105-70-192.5T631 793l452-457q61 72 104 157t75 201h96q-63-246-209-426L1415 0h-135l-193 197q-92-90-164-131.5T765.5 2 571-20Q362-20 242.5 83T123 371zM578 70q128 0 234.5 43.5T1022 260L539 745q-136-72-196.5-122.5t-88-109.5T227 375q0-143 93-224t258-81zM373 1176q0-79 40-146t152-174q159 85 221 159t62 169q0 94-62 152.5T618 1395q-114 0-179.5-58T373 1176z"/><glyph unicode="'" horiz-adv-x="393" d="M260 1462l-33-528h-61l-33 528h127z"/><glyph unicode="(" horiz-adv-x="557" d="M82 561q0 265 77.5 496T383 1462h113q-148-182-227-412.5T190 563q0-483 304-887H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="557" d="M475 561q0-263-77.5-490T174-324H63Q367 80 367 563q0 257-79 487.5T61 1462h113q147-175 224-406.5T475 561z"/><glyph unicode="*" horiz-adv-x="1128" d="M631 1556l-37-405 405 104 21-131-395-39 247-340-124-71-191 379-180-379-125 71 242 340-390 39 19 131 401-104-39 405h146z"/><glyph unicode="+" d="M625 764h434v-82H625V250h-82v432H111v82h432v434h82V764z"/><glyph unicode="," horiz-adv-x="440" d="M295 238l12-21Q232-48 133-264H68q77 275 110 502h117z"/><glyph unicode="-" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="." horiz-adv-x="487" d="M162 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="/" horiz-adv-x="698" d="M674 1462L129 0H25l544 1462h105z"/><glyph unicode="0" d="M1055 735q0-385-117.5-570T582-20q-229 0-348 190.5T115 735q0 382 115.5 566T582 1485q231 0 352-190.5T1055 735zm-832 0q0-340 89-502.5T582 70q189 0 275.5 168T944 735q0 324-86.5 492T582 1395t-274-168-85-492z"/><glyph unicode="1" d="M682 0h-98v1065q0 145 12 301-15-15-31-29t-309-243l-57 71 397 297h86V0z"/><glyph unicode="2" d="M1028 0H113v88l389 406q164 170 230 260t97 172 31 172q0 131-86 213t-223 82q-183 0-350-133l-54 69q183 154 406 154 191 0 300.5-102T963 1100q0-145-73.5-280.5T621 485L246 100v-4h782V0z"/><glyph unicode="3" d="M979 1118q0-136-85.5-229T664 770v-6q176-22 268-112t92-242q0-205-139.5-317.5T483-20Q260-20 94 63v99q84-44 188.5-69T479 68q221 0 332 89.5T922 410q0 145-113.5 223T475 711H317v96h160q182 0 288.5 86.5T872 1128q0 122-86.5 195.5T559 1397q-109 0-199-30.5T158 1262l-49 67q85 71 205 112.5t243 41.5q202 0 312-95.5T979 1118z"/><glyph unicode="4" d="M1141 373H889V0h-94v373H43v67l725 1030h121V459h252v-86zm-346 86v418q0 302 14 507h-8q-20-37-123-188L162 459h633z"/><glyph unicode="5" d="M537 879q234 0 368.5-113T1040 455q0-225-140-350T514-20Q405-20 307 1.5T143 63v103q108-55 192-76.5T514 68q192 0 308 101.5T938 444q0 163-113 256t-307 93q-130 0-272-39l-60 39 58 669h704v-96H338l-45-516q156 29 244 29z"/><glyph unicode="6" d="M131 623q0 285 77.5 479.5t220 288.5 343.5 94q94 0 172-23v-88q-73 27-176 27-247 0-384.5-178T229 705h13q76 98 174 148t207 50q205 0 320.5-117T1059 463q0-224-121.5-353.5T610-20q-222 0-350.5 169.5T131 623zM610 68q164 0 255 103t91 294q0 168-90 262t-245 94q-102 0-189.5-45T292 656.5 240 504q0-111 49.5-213.5t134-162.5T610 68z"/><glyph unicode="7" d="M334 0l602 1366H109v96h946v-73L451 0H334z"/><glyph unicode="8" d="M582 1487q186 0 299.5-95T995 1135q0-112-70.5-198T696 778q192-79 270-173t78-228q0-181-126.5-289T578-20Q357-20 239 81T121 375q0 131 83 230t257 169q-161 76-227 160.5T168 1137q0 105 53 184.5T369.5 1444t212.5 43zM223 360q0-138 93.5-214T578 70q164 0 264 80.5T942 369q0 124-78.5 201.5T561 733q-184-71-261-157t-77-216zm357 1037q-141 0-226.5-69.5T268 1137q0-70 31.5-123.5t91-97T590 815q163 63 234 139t71 183q0 120-84.5 190T580 1397z"/><glyph unicode="9" d="M1036 842q0-288-75.5-482t-220-287T391-20Q287-20 199 6v86q43-14 103.5-21.5T395 63q247 0 387 178.5T938 762h-12q-73-96-174-147.5T541 563q-203 0-316.5 112T111 993q0 220 124.5 356T559 1485q144 0 252-75.5T977.5 1188t58.5-346zm-477 555q-158 0-252-106.5T213 999q0-174 87-264t249-90q101 0 188.5 45t139 119.5T928 961q0 117-46.5 219t-130 159.5T559 1397z"/><glyph unicode=":" horiz-adv-x="487" d="M162 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98zm0 893q0 98 80 98 82 0 82-98 0-53-23.5-76T242 872q-34 0-57 23t-23 76z"/><glyph unicode=";" horiz-adv-x="487" d="M303 238l12-21Q240-48 141-264H76q29 97 62 245.5T186 238h117zM162 971q0 98 80 98 82 0 82-98 0-53-23.5-76T242 872q-34 0-57 23t-23 76z"/><glyph unicode="<" d="M1059 266L111 682v61l948 474v-95L236 717l823-355v-96z"/><glyph unicode="=" d="M111 885v82h948v-82H111zm0-408v82h948v-82H111z"/><glyph unicode=">" d="M111 362l823 355-823 405v95l948-474v-61L111 266v96z"/><glyph unicode="?" horiz-adv-x="862" d="M293 377v37q0 123 37.5 201T469 782l91 79q72 61 103 121t31 138q0 127-83.5 202T391 1397q-79 0-148-17.5T94 1323l-37 80q110 48 184.5 64t153.5 16q183 0 288-98.5T788 1114q0-68-18-119t-50.5-94.5-78.5-84T539 729q-64-54-98.5-98.5t-50-93.5T375 391v-14h-82zM260 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="@" horiz-adv-x="1815" d="M1702 725q0-228-90.5-366T1366 221q-89 0-144.5 54T1157 422h-4q-43-100-124-150.5T840 221q-148 0-229 96.5T530 588q0 202 120.5 330.5T965 1047q138 0 286-41l-22-464v-30q0-104 35-156.5t116-52.5q103 0 168.5 116.5T1614 723q0 194-79 340t-225.5 224.5T975 1366q-230 0-405.5-99.5T299.5 985 205 567q0-322 167-497.5T846-106q93 0 188.5 18T1266-18v-99q-203-80-414-80-349 0-544 200.5T113 561q0 256 108.5 460.5t307 317.5T977 1452q215 0 380.5-89t255-254.5T1702 725zM633 590q0-143 55-215t174-72q255 0 273 346l16 291q-79 27-193 27-149 0-237-102.5T633 590z"/><glyph unicode="A" horiz-adv-x="1229" d="M911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174z"/><glyph unicode="B" horiz-adv-x="1284" d="M207 1462h401q271 0 398-92t127-278q0-127-77.5-211.5T829 772v-6q175-26 257.5-110.5T1169 420q0-202-134-311T655 0H207v1462zm102-651h322q206 0 299.5 68.5T1024 1094t-105.5 212-314.5 66H309V811zm0-90V90h344q406 0 406 330 0 301-428 301H309z"/><glyph unicode="C" horiz-adv-x="1272" d="M831 1391q-275 0-433-176T240 733q0-313 149-486T815 74q184 0 338 47V31q-145-51-362-51-308 0-485 199T129 735q0 223 84.5 393t243 262.5T825 1483q214 0 383-80l-41-92q-160 80-336 80z"/><glyph unicode="D" horiz-adv-x="1446" d="M1317 745q0-368-193-556.5T557 0H207v1462h395q350 0 532.5-183T1317 745zm-111-4q0 314-159.5 472.5T578 1372H309V90h242q655 0 655 651z"/><glyph unicode="E" horiz-adv-x="1130" d="M1006 0H207v1462h799v-94H309V815h658v-94H309V94h697V0z"/><glyph unicode="F" horiz-adv-x="1028" d="M309 0H207v1462h801v-94H309V748h660v-95H309V0z"/><glyph unicode="G" horiz-adv-x="1481" d="M782 737h539V70q-212-90-477-90-346 0-530.5 195.5T129 729q0 223 91.5 395.5t262 266.5 391.5 94q239 0 429-88l-41-92q-190 88-394 88-289 0-458.5-178.5T240 733q0-330 161-496.5T874 70q202 0 343 57v514H782v96z"/><glyph unicode="H" horiz-adv-x="1473" d="M1266 0h-103v719H309V0H207v1462h102V813h854v649h103V0z"/><glyph unicode="I" horiz-adv-x="516" d="M207 0v1462h102V0H207z"/><glyph unicode="J" horiz-adv-x="506" d="M-33-369q-92 0-151 27v88q78-20 149-20 242 0 242 264v1472h102V0q0-369-342-369z"/><glyph unicode="K" horiz-adv-x="1190" d="M1190 0h-125L504 772 309 600V0H207v1462h102V702l162 162 573 598h130L575 844z"/><glyph unicode="L" horiz-adv-x="1051" d="M207 0v1462h102V96h697V0H207z"/><glyph unicode="M" horiz-adv-x="1767" d="M850 0L305 1350h-8q8-124 8-254V0h-98v1462h158L883 176h6l518 1286h154V0h-103v1108q0 116 12 240h-8L915 0h-65z"/><glyph unicode="N" horiz-adv-x="1477" d="M1270 0h-103L301 1298h-8q12-232 12-350V0h-98v1462h102l865-1296h6q-9 180-9 342v954h99V0z"/><glyph unicode="O" horiz-adv-x="1565" d="M1436 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733z"/><glyph unicode="P" horiz-adv-x="1198" d="M1087 1042q0-212-144-325T535 604H309V0H207v1462h358q522 0 522-420zM309 692h201q247 0 357 81.5T977 1038q0 169-104 250.5T551 1370H309V692z"/><glyph unicode="Q" horiz-adv-x="1565" d="M1436 733q0-294-126-486.5T961 0l333-348h-166L846-18l-33-2h-31q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733z"/><glyph unicode="R" horiz-adv-x="1217" d="M309 637V0H207v1462h348q272 0 402-100.5t130-302.5q0-147-77.5-248T774 666L1171 0h-122L672 637H309zm0 88h279q185 0 287 82.5T977 1051q0 167-100 243t-326 76H309V725z"/><glyph unicode="S" horiz-adv-x="1116" d="M1014 377q0-183-134.5-290T522-20q-268 0-411 59v102q158-67 403-67 180 0 285.5 82.5T905 373q0 83-35 137.5T756 610t-232 97q-224 77-309.5 166.5T129 1112q0 164 128.5 267.5T588 1483q206 0 387-78l-37-88q-182 76-348 76-162 0-258-75t-96-204q0-81 29.5-133t96.5-93.5T592 788q171-59 257-114.5t125.5-126T1014 377z"/><glyph unicode="T" horiz-adv-x="1073" d="M588 0H485v1366H10v96h1053v-96H588V0z"/><glyph unicode="U" horiz-adv-x="1473" d="M1282 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102z"/><glyph unicode="V" horiz-adv-x="1182" d="M1071 1462h111L635 0h-90L0 1462h109l368-995q84-225 113-338 20 75 79 233z"/><glyph unicode="W" horiz-adv-x="1827" d="M1372 0h-84L967 1128q-40 139-60 228-16-87-45.5-200T539 0h-86L51 1462h107l256-942q15-57 28-105.5t23.5-91 19-82T500 162q24 136 102 413l250 887h113l293-1018q51-176 73-284 13 72 33.5 153T1673 1462h103z"/><glyph unicode="X" horiz-adv-x="1102" d="M1102 0H985L553 682 113 0H0l492 762-447 700h115l395-626 401 626h109L612 764z"/><glyph unicode="Y" horiz-adv-x="1081" d="M543 662l428 800h110L594 565V0H489v557L0 1462h117z"/><glyph unicode="Z" horiz-adv-x="1180" d="M1098 0H82v76l856 1290H121v96h954v-76L217 96h881V0z"/><glyph unicode="[" horiz-adv-x="653" d="M602-324H174v1786h428v-94H272V-229h330v-95z"/><glyph unicode="\" horiz-adv-x="698" d="M127 1462L674 0H571L25 1462h102z"/><glyph unicode="]" horiz-adv-x="653" d="M51-229h330v1597H51v94h428V-324H51v95z"/><glyph unicode="^" d="M88 561l465 912h68l460-912H981l-395 791-398-791H88z"/><glyph unicode="_" horiz-adv-x="842" d="M846-266H-4v82h850v-82z"/><glyph unicode="`" horiz-adv-x="1182" d="M776 1241h-69q-96 79-188.5 171.5T393 1552v17h142q26-48 98.5-142T776 1257v-16z"/><glyph unicode="a" horiz-adv-x="1085" d="M842 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70z"/><glyph unicode="b" horiz-adv-x="1219" d="M641 1108q228 0 343.5-143.5T1100 545q0-271-121.5-418T637-20q-116 0-209 48T281 164h-9L244 0h-62v1556h99v-391q0-88-4-162l-3-85h7q62 98 149.5 144t210.5 46zm-2-90q-192 0-275-110t-83-363v-17q0-246 86.5-353T637 68q178 0 268 124.5T995 547q0 471-356 471z"/><glyph unicode="c" horiz-adv-x="973" d="M616-20q-233 0-365 147T119 537q0 270 137 420.5T631 1108q141 0 270-49l-27-88q-141 47-245 47-200 0-303-123.5T223 539q0-220 103-344.5T614 70q148 0 275 53V31Q785-20 616-20z"/><glyph unicode="d" horiz-adv-x="1219" d="M580 1108q118 0 204-43t154-147h6q-6 126-6 247v391h98V0h-65l-25 166h-8Q814-20 582-20q-225 0-344 140T119 528q0 282 118 431t343 149zm0-90q-178 0-267.5-125T223 530q0-462 359-462 184 0 270 107t86 353v17q0 252-84.5 362.5T580 1018z"/><glyph unicode="e" horiz-adv-x="1124" d="M621-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020z"/><glyph unicode="f" horiz-adv-x="614" d="M586 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86z"/><glyph unicode="g" horiz-adv-x="1071" d="M1030 1087v-69l-225-14q90-112 90-246 0-157-104.5-254.5T510 406q-74 0-104 6-59-31-90-73t-31-89q0-52 39.5-76T457 150h190q177 0 271-71.5t94-211.5q0-172-139.5-265.5T475-492q-205 0-317.5 79T45-193Q45-81 114.5-7T303 94q-49 21-78.5 59.5T195 242q0 109 139 192-95 39-148 122.5T133 748q0 163 103.5 261.5T516 1108q107 0 166-21h348zM150-184q0-224 333-224 428 0 428 273 0 98-67 142T627 51H449q-299 0-299-235zm83 932q0-126 76.5-195.5T514 483q136 0 208.5 69T795 752q0 139-74.5 208.5T512 1030q-130 0-204.5-74.5T233 748z"/><glyph unicode="h" horiz-adv-x="1208" d="M940 0v705q0 164-69 238.5T657 1018q-195 0-285.5-98.5T281 600V0h-99v1556h99v-495l-5-139h7q61 98 154 142t231 44q370 0 370-397V0h-98z"/><glyph unicode="i" horiz-adv-x="463" d="M281 0h-99v1087h99V0zM168 1389q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="j" horiz-adv-x="463" d="M37-492q-80 0-135 25v86q69-20 129-20 151 0 151 176v1312h99V-211q0-135-63.5-208T37-492zm131 1881q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="k" horiz-adv-x="991" d="M279 477l555 610h120L526 623 991 0H872L459 549 281 387V0h-99v1556h99V776l-7-299h5z"/><glyph unicode="l" horiz-adv-x="463" d="M281 0h-99v1556h99V0z"/><glyph unicode="m" horiz-adv-x="1808" d="M1540 0v713q0 159-62 232t-190 73q-167 0-247-92t-80-289V0H860v743q0 275-252 275-171 0-249-99.5T281 600V0h-99v1087h82l21-149h6q45 81 128 125.5t183 44.5q257 0 330-193h4q53 93 142.5 143t203.5 50q178 0 267-95t89-302V0h-98z"/><glyph unicode="n" horiz-adv-x="1208" d="M940 0v705q0 164-69 238.5T657 1018q-195 0-285.5-98.5T281 600V0h-99v1087h84l19-149h6q106 170 377 170 370 0 370-397V0h-98z"/><glyph unicode="o" horiz-adv-x="1200" d="M1081 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545z"/><glyph unicode="p" horiz-adv-x="1219" d="M647-20q-251 0-366 188h-7l3-84q4-74 4-162v-414h-99v1579h84l19-155h6q112 176 358 176 220 0 335.5-144.5T1100 543q0-268-121.5-415.5T647-20zm-2 88q167 0 258.5 124T995 539q0 479-346 479-190 0-279-104.5T281 573v-32q0-255 85.5-364T645 68z"/><glyph unicode="q" horiz-adv-x="1219" d="M569-20q-214 0-332 142T119 532q0 275 118 425.5T575 1108q236 0 353-174h6l18 153h84V-492h-98v414q0 122 6 248h-6Q820-20 569-20zm2 88q198 0 282.5 109T938 543v12q0 245-85 354t-271 109q-176 0-267.5-124T223 530q0-229 89.5-345.5T571 68z"/><glyph unicode="r" horiz-adv-x="797" d="M610 1108q69 0 148-14l-19-95q-68 17-141 17-139 0-228-118t-89-298V0h-99v1087h84l10-196h7q67 120 143 168.5t184 48.5z"/><glyph unicode="s" horiz-adv-x="954" d="M856 283q0-146-111-224.5T430-20Q212-20 84 47v107q164-82 346-82 161 0 244.5 53.5T758 268q0 82-66.5 138T473 516q-163 59-229 101.5t-99.5 96T111 844q0 122 102.5 193t286.5 71q176 0 334-66l-37-90q-160 66-297 66-133 0-211-44t-78-122q0-85 60.5-136T508 602q147-53 214-95.5T822.5 410 856 283z"/><glyph unicode="t" horiz-adv-x="686" d="M469 68q94 0 164 16V4q-72-24-166-24-144 0-212.5 77T186 299v702H25v58l161 45 50 246h51v-263h319v-86H287V313q0-125 44-185t138-60z"/><glyph unicode="u" horiz-adv-x="1208" d="M268 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98z"/><glyph unicode="v" horiz-adv-x="940" d="M420 0L0 1087h102l281-739q56-142 84-248h6q41 136 84 250l281 737h102L520 0H420z"/><glyph unicode="w" horiz-adv-x="1481" d="M1051 0L813 727q-23 74-59 217h-6l-21-74-45-145L440 0h-98L31 1087h106l174-630q61-234 80-344h6q59 234 86 311l224 663h90l213-661q72-235 88-311h6q8 65 80 348l166 624h100L1155 0h-104z"/><glyph unicode="x" horiz-adv-x="1020" d="M449 559L70 1087h114l324-458 321 458h109L565 559 965 0H850L508 485 164 0H55z"/><glyph unicode="y" horiz-adv-x="940" d="M0 1087h102l230-610Q437 196 465 98h6q42 129 137 385l230 604h102L453-176q-59-154-99-208t-93.5-81T131-492q-57 0-127 21v86q58-16 125-16 51 0 90 24t70.5 74.5 73 160T416 0z"/><glyph unicode="z" horiz-adv-x="944" d="M858 0H82v63l645 936H129v88h727v-63L207 88h651V0z"/><glyph unicode="{" horiz-adv-x="723" d="M389-27q0-102 59.5-152.5T651-233v-91q-195 0-277.5 75T291-18v337q0 205-230 209v80q122 2 176 51t54 148v350q0 299 360 305v-90q-138-5-200-58t-62-157V852q0-130-44-194t-142-85v-8q97-20 141.5-83.5T389 295V-27z"/><glyph unicode="|" horiz-adv-x="1108" d="M508 1561h92V-506h-92v2067z"/><glyph unicode="}" horiz-adv-x="723" d="M334 295q0 123 44.5 186.5T520 565v8q-97 20-141.5 84T334 852v305q0 103-61.5 156.5T72 1372v90q174 0 267-77.5t93-227.5V807q0-100 54.5-148.5T662 608v-80q-230-4-230-209V-18q0-155-82.5-230.5T72-324v91q141 2 201.5 52.5T334-27v322z"/><glyph unicode="~" d="M334 745q-49 0-108-30.5T111 625v94q108 110 233 110 61 0 115-13.5T614 758q126-58 220-58 56 0 109.5 30.5T1059 825v-96q-48-49-104.5-81T825 616q-116 0-270 72-124 57-221 57z"/><glyph unicode="¡" horiz-adv-x="492" d="M215 711h61l29-1086H186zm-49 299q0 98 80 98 82 0 82-98 0-53-23.5-76T246 911q-34 0-57 23t-23 76z"/><glyph unicode="¢" d="M602 190q-186 30-288.5 175T211 745q0 232 102.5 381.5T602 1309v174h82v-166h14q131 0 275-55l-31-84q-134 51-237 51-187 0-288.5-122.5T315 748q0-225 100.5-349.5T696 274q131 0 267 58v-92q-110-56-267-56h-12V-20h-82v210z"/><glyph unicode="£" d="M412 676V420q0-116-35-196T264 96h809V0H78v84q110 21 171.5 110T311 418v258H100v82h211v297q0 204 98 315t281 111q175 0 330-68l-35-86q-157 66-295 66-141 0-209.5-81T412 1059V758h411v-82H412z"/><glyph unicode="¤" d="M991 723q0-151-90-256l139-141-59-60-137 142q-110-93-260-93-153 0-260 93L186 266l-59 60 139 141q-90 106-90 256 0 147 90 258l-139 141 59 60 138-142q103 93 260 93 155 0 260-93l137 142 59-60-139-141q90-111 90-258zM584 395q134 0 228.5 95.5T907 723q0 136-95 233t-228 97q-134 0-229-97t-95-233 94.5-232T584 395z"/><glyph unicode="¥" d="M586 666l428 796h110L692 674h283v-82H637V387h338v-82H637V0H532v305H195v82h337v205H195v82h278L43 1462h117z"/><glyph unicode="¦" horiz-adv-x="1108" d="M508 1561h92V797h-92v764zm0-1303h92v-764h-92v764z"/><glyph unicode="§" horiz-adv-x="1057" d="M145 813q0 83 50.5 152.5T334 1073q-86 47-125 102t-39 136q0 117 101.5 183.5T547 1561q175 0 336-64l-35-80q-91 34-158.5 47T545 1477q-134 0-205.5-44.5T268 1313q0-54 25.5-88.5T379 1159t188-74q192-64 264-132.5T903 782q0-173-186-274 86-42 129-96t43-136q0-135-113-207.5T465-4q-92 0-171 15T129 63v95q182-78 332-78 162 0 247 49.5T793 270q0 55-25 87.5T679.5 423 489 502q-200 73-272 141.5T145 813zm101 12q0-65 31.5-104T383 646t250-99q82 41 126 98t44 121q0 62-32 102t-108.5 77-236.5 87q-81-23-130.5-79T246 825z"/><glyph unicode="¨" horiz-adv-x="1182" d="M336 1389q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="©" horiz-adv-x="1704" d="M897 1092q-142 0-222.5-94.5T594 733q0-186 74.5-275T889 369q84 0 198 43v-88q-102-45-208-45-187 0-288.5 115T489 725q0 208 111 332.5T897 1182q119 0 227-52l-37-83q-98 45-190 45zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm93 0q0-178 88.5-329.5T522 161t330-89 329.5 88.5T1422 401t89 330q0 174-85.5 325t-239 243-334.5 92q-176 0-328.5-88.5T282 1060t-89-329z"/><glyph unicode="ª" horiz-adv-x="686" d="M512 813l-25 72q-84-84-202-84-95 0-151 49T78 989q0 100 80 151.5t241 59.5l95 4v43q0 77-38 114.5T350 1399q-87 0-196-49l-33 73q117 56 231 56 228 0 228-215V813h-68zM168 993q0-54 35-85t96-31q90 0 142.5 50t52.5 142v64l-88-5q-116-6-177-36.5T168 993z"/><glyph unicode="«" horiz-adv-x="885" d="M82 543l309 393 62-43-254-363 254-362-62-43L82 516v27zm360 0l310 393 61-43-254-363 254-362-61-43-310 391v27z"/><glyph unicode="¬" d="M1038 764V270h-82v412H111v82h927z"/><glyph unicode="­" horiz-adv-x="659" d="M92 512zm0 0v82h475v-82H92z"/><glyph unicode="®" horiz-adv-x="1704" d="M709 731h112q91 0 143 46.5t52 135.5q0 172-197 172H709V731zm411 187q0-79-38.5-139.5T971 684l237-393h-121L877 651H709V291H608v880h211q143 0 222-62t79-191zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm93 0q0-178 88.5-329.5T522 161t330-89 329.5 88.5T1422 401t89 330q0 174-85.5 325t-239 243-334.5 92q-176 0-328.5-88.5T282 1060t-89-329z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v82h1036v-82z"/><glyph unicode="°" horiz-adv-x="877" d="M139 1184q0 132 86.5 215.5T438 1483t212.5-83.5T737 1184t-86.5-215.5T438 885q-130 0-214.5 83T139 1184zm90 0q0-91 61-154t148-63q86 0 147.5 62t61.5 155q0 92-60 154.5T438 1401q-90 0-149.5-64T229 1184z"/><glyph unicode="±" d="M111 1zm0 0v82h948V1H111zm514 763h434v-82H625V250h-82v432H111v82h432v434h82V764z"/><glyph unicode="²" horiz-adv-x="688" d="M629 586H53v78l242 237q125 121 172 193t47 149q0 71-46.5 112.5T344 1397q-108 0-217-82l-49 65q119 103 270 103 124 0 194-63.5t70-174.5q0-47-13-89t-40-85.5-68.5-90T182 674h447v-88z"/><glyph unicode="³" horiz-adv-x="688" d="M616 1260q0-78-44-131.5T455 1053q186-45 186-211 0-130-88.5-201.5T305 569q-144 0-264 60v88q136-62 266-62 115 0 174.5 49T541 840q0 83-59.5 122T303 1001H172v84h135q105 0 158 43.5t53 120.5q0 67-47 107.5T344 1397q-128 0-246-78l-47 70q130 94 293 94 127 0 199.5-60t72.5-163z"/><glyph unicode="´" horiz-adv-x="1182" d="M393 1257q73 79 144.5 171.5T635 1569h141v-17q-36-52-122.5-138T463 1241h-70v16z"/><glyph unicode="µ" horiz-adv-x="1221" d="M281 1087V383q0-164 69-238.5T563 70q194 0 285.5 98T940 487v600h98V0h-84l-18 150h-6Q880 73 780 26.5T563-20q-99 0-167.5 27.5T276 92q5-92 5-170v-414h-99v1579h99z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1106-260h-100v1722H778V-260H678v819q-64-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h543V-260z"/><glyph unicode="·" horiz-adv-x="487" d="M162 623zm0 98q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="¸" horiz-adv-x="420" d="M393-291q0-100-67.5-150.5T137-492q-68 0-94 11v88q30-10 92-10 78 0 119 28t41 80q0 94-193 121L195 0h96l-66-117q168-37 168-174z"/><glyph unicode="¹" horiz-adv-x="688" d="M350 1462h92V586h-98v547q0 99 12 233-26-23-233-145l-47 77z"/><glyph unicode="º" horiz-adv-x="739" d="M670 1141q0-161-80-250.5T367 801t-220 86-77 254q0 162 78 250t223 88q142 0 220.5-87t78.5-251zm-510 0q0-264 209-264t209 264q0 131-50 194.5T369 1399t-159-63.5-50-194.5z"/><glyph unicode="»" horiz-adv-x="885" d="M803 518L494 125l-62 43 254 362-254 363 62 43 309-391v-27zm-361 0L133 125l-61 43 254 362L72 893l61 43 309-391v-27z"/><glyph unicode="¼" horiz-adv-x="1516" d="M59 0zm274 1462h92V586h-98v547q0 99 12 233-26-23-233-145l-47 77zm815 0L337 0h-94l811 1462h94zm244-1220h-129V1h-90v241H760v60l407 581h96V320h129v-78zm-219 78v221q0 132 8 232-6-12-21.5-35.5T864 320h309z"/><glyph unicode="½" horiz-adv-x="1516" d="M11 0zm274 1462h92V586h-98v547q0 99 12 233-26-23-233-145l-47 77zm788 0L262 0h-94l811 1462h94zM1403 1H827v78l242 237q125 121 172 193t47 149q0 71-46.5 112.5T1118 812q-108 0-217-82l-49 65q119 103 270 103 124 0 194-63.5t70-174.5q0-47-13-89t-40-85.5-68.5-90T956 89h447V1z"/><glyph unicode="¾" horiz-adv-x="1516" d="M41 0zm575 1260q0-78-44-131.5T455 1053q186-45 186-211 0-130-88.5-201.5T305 569q-144 0-264 60v88q136-62 266-62 115 0 174.5 49T541 840q0 83-59.5 122T303 1001H172v84h135q105 0 158 43.5t53 120.5q0 67-47 107.5T344 1397q-128 0-246-78l-47 70q130 94 293 94 127 0 199.5-60t72.5-163zm684 202L489 0h-94l811 1462h94zm195-1220h-129V1h-90v241H863v60l407 581h96V320h129v-78zm-219 78v221q0 132 8 232-6-12-21.5-35.5T967 320h309z"/><glyph unicode="¿" horiz-adv-x="862" d="M569 711v-37q0-125-39.5-204.5T393 305l-90-79q-73-61-104-120.5T168-33q0-124 82-200t221-76q125 0 233 46l64 27 37-79q-111-48-185.5-64T467-395q-184 0-288.5 99T74-27q0 70 20 124t58.5 102T324 358q64 53 98.5 98.5t49.5 94T487 696v15h82zm-129 299q0 98 80 98 82 0 82-98 0-53-23.5-76T520 911q-34 0-57 23t-23 76z"/><glyph unicode="À" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm366 971h-69q-96 79-188.5 171.5T337 1890v17h142q26-48 98.5-142T720 1595v-16z"/><glyph unicode="Á" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm150 987q73 79 144.5 171.5T746 1907h141v-17q-36-52-122.5-138T574 1579h-70v16z"/><glyph unicode="Â" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm-26 987q62 67 131.5 156T570 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ã" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm430 973q-36 0-75 18.5T608 1671q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T360 1581h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="Ä" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm13 1119q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Å" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm482 1002q0-97-60-155t-157-58-157 58-60 155q0 94 60 152.5t157 58.5 157-59 60-152zm-354 0q0-66 37.5-103.5T619 1469t99.5 37.5T756 1610q0 64-39 101.5t-98 37.5q-62 0-99.5-38T482 1610z"/><glyph unicode="Æ" horiz-adv-x="1653" d="M1528 0H811v516H336L109 0H-2l653 1462h877v-94H913V815h576v-94H913V94h615V0zM377 608h434v760H711z"/><glyph unicode="Ç" horiz-adv-x="1272" d="M129 0zm702 1391q-275 0-433-176T240 733q0-313 149-486T815 74q184 0 338 47V31q-145-51-362-51-308 0-485 199T129 735q0 223 84.5 393t243 262.5T825 1483q214 0 383-80l-41-92q-160 80-336 80zm80-1682q0-100-67.5-150.5T655-492q-68 0-94 11v88q30-10 92-10 78 0 119 28t41 80q0 94-193 121L713 0h96l-66-117q168-37 168-174z"/><glyph unicode="È" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM697 1579h-69q-96 79-188.5 171.5T314 1890v17h142q26-48 98.5-142T697 1595v-16z"/><glyph unicode="É" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM463 1595q73 79 144.5 171.5T705 1907h141v-17q-36-52-122.5-138T533 1579h-70v16z"/><glyph unicode="Ê" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM315 1595q62 67 131.5 156T557 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ë" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM354 1727q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ì" horiz-adv-x="516" d="M0 0zm207 0v1462h102V0H207zm113 1579h-69q-96 79-188.5 171.5T-63 1890v17H79q26-48 98.5-142T320 1595v-16z"/><glyph unicode="Í" horiz-adv-x="516" d="M191 0zm16 0v1462h102V0H207zm-16 1595q73 79 144.5 171.5T433 1907h141v-17q-36-52-122.5-138T261 1579h-70v16z"/><glyph unicode="Î" horiz-adv-x="516" d="M0 0zm207 0v1462h102V0H207zM-32 1595q62 67 131.5 156T210 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ï" horiz-adv-x="516" d="M5 0zm202 0v1462h102V0H207zM5 1727q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ð" horiz-adv-x="1466" d="M1317 745q0-368-193-556.5T557 0H207v678H47v94h160v690h395q350 0 532.5-183T1317 745zm-111-4q0 314-159.5 472.5T578 1372H309V772h406v-94H309V90h242q655 0 655 651z"/><glyph unicode="Ñ" horiz-adv-x="1477" d="M207 0zm1063 0h-103L301 1298h-8q12-232 12-350V0h-98v1462h102l865-1296h6q-9 180-9 342v954h99V0zM897 1581q-36 0-75 18.5T721 1671q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T473 1581h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="Ò" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm645 846h-69q-96 79-188.5 171.5T502 1890v17h142q26-48 98.5-142T885 1595v-16z"/><glyph unicode="Ó" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm446 862q73 79 144.5 171.5T928 1907h141v-17q-36-52-122.5-138T756 1579h-70v16z"/><glyph unicode="Ô" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm252 862q62 67 131.5 156T734 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Õ" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm700 848q-36 0-75 18.5T764 1671q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T516 1581h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="Ö" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm289 994q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="×" d="M584 780l409 408 58-58-408-407 406-408-58-57-407 408-406-408-57 57 405 408-407 407 57 58z"/><glyph unicode="Ø" horiz-adv-x="1565" d="M1436 733q0-348-174-550.5T782-20q-236 0-395 120L301-20l-74 59 90 127Q129 366 129 735q0 349 175.5 549.5T784 1485q232 0 392-121l108 152 72-60-111-153q191-207 191-570zm-111 0q0 315-139 486L444 182Q577 76 782 76q264 0 403.5 170T1325 733zm-1085 0q0-312 139-483l739 1034q-133 102-334 102-261 0-402.5-170T240 733z"/><glyph unicode="Ù" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-449 117h-69q-96 79-188.5 171.5T450 1890v17h142q26-48 98.5-142T833 1595v-16z"/><glyph unicode="Ú" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-649 133q73 79 144.5 171.5T875 1907h141v-17q-36-52-122.5-138T703 1579h-70v16z"/><glyph unicode="Û" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-838 133q62 67 131.5 156T686 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ü" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-801 265q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ý" horiz-adv-x="1081" d="M0 0zm543 662l428 800h110L594 565V0H489v557L0 1462h117zm-109 933q73 79 144.5 171.5T676 1907h141v-17q-36-52-122.5-138T504 1579h-70v16z"/><glyph unicode="Þ" horiz-adv-x="1198" d="M1087 778q0-212-144-325T535 340H309V0H207v1462h102v-264h256q522 0 522-420zM309 428h201q247 0 357 81.5T977 774q0 169-104 250.5T551 1106H309V428z"/><glyph unicode="ß" horiz-adv-x="1194" d="M961 1284q0-139-139-250-81-64-110.5-100.5T682 858q0-44 14.5-68t51.5-57 102-78q106-75 151.5-124.5t68-103T1092 307q0-156-88-241.5T758-20q-95 0-174.5 18.5T457 47v107q65-38 148.5-62T758 68q114 0 174.5 54.5T993 283q0 83-39 144T805 563q-127 87-175 147t-48 146q0 60 32.5 110T721 1074q74 57 106.5 105.5T860 1286q0 93-70 143t-202 50q-145 0-226-69t-81-196V0h-99v1206q0 173 103.5 267t292.5 94q188 0 285.5-72.5T961 1284z"/><glyph unicode="à" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm196 1171h-69q-96 79-188.5 171.5T255 1552v17h142q26-48 98.5-142T638 1257v-16z"/><glyph unicode="á" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm-20 1187q73 79 144.5 171.5T664 1569h141v-17q-36-52-122.5-138T492 1241h-70v16z"/><glyph unicode="â" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zM251 1257q62 67 131.5 156T493 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ã" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm255 1173q-36 0-75 18.5T521 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T273 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="ä" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zM282 1389q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="å" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm317 1386q0-97-60-155t-157-58-157 58-60 155q0 94 60 152.5t157 58.5 157-59 60-152zm-354 0q0-66 37.5-103.5T542 1315t99.5 37.5T679 1456q0 64-39 101.5t-98 37.5q-62 0-99.5-38T405 1456z"/><glyph unicode="æ" horiz-adv-x="1731" d="M1243-20q-295 0-397 256-68-133-168-194.5T426-20q-156 0-242 82.5T98 289q0 154 125 243t377 97l201 6v72q0 155-61.5 234T541 1020q-148 0-305-84l-37 86q173 84 346 84 261 0 325-211 111 213 347 213 184 0 289.5-134.5T1612 610v-80H897q0-460 348-460 85 0 150 12t174 57V49q-92-41-165-55t-161-14zM434 70q169 0 266 99.5T797 446v107l-187-8q-219-11-313-71.5T203 285q0-102 61-158.5T434 70zm783 950q-284 0-314-402h604q0 188-77.5 295T1217 1020z"/><glyph unicode="ç" horiz-adv-x="973" d="M119 0zm497-20q-233 0-365 147T119 537q0 270 137 420.5T631 1108q141 0 270-49l-27-88q-141 47-245 47-200 0-303-123.5T223 539q0-220 103-344.5T614 70q148 0 275 53V31Q785-20 616-20zm107-271q0-100-67.5-150.5T467-492q-68 0-94 11v88q30-10 92-10 78 0 119 28t41 80q0 94-193 121L525 0h96l-66-117q168-37 168-174z"/><glyph unicode="è" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm93 221h-69q-96 79-188.5 171.5T302 1552v17h142q26-48 98.5-142T685 1257v-16z"/><glyph unicode="é" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm-140 237q73 79 144.5 171.5T694 1569h141v-17q-36-52-122.5-138T522 1241h-70v16z"/><glyph unicode="ê" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm-302 237q62 67 131.5 156T532 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ë" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm-261 369q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ì" horiz-adv-x="463" d="M0 0zm281 0h-99v1087h99V0zm68 1241h-69q-96 79-188.5 171.5T-34 1552v17h142q26-48 98.5-142T349 1257v-16z"/><glyph unicode="í" horiz-adv-x="463" d="M107 0zm174 0h-99v1087h99V0zM107 1257q73 79 144.5 171.5T349 1569h141v-17q-36-52-122.5-138T177 1241h-70v16z"/><glyph unicode="î" horiz-adv-x="463" d="M0 0zm281 0h-99v1087h99V0zM-58 1257q62 67 131.5 156T184 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ï" horiz-adv-x="463" d="M0 0zm281 0h-99v1087h99V0zM-21 1389q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ð" horiz-adv-x="1174" d="M1055 559q0-276-124-427.5T582-20q-214 0-339.5 130T117 471q0 228 126.5 357.5T586 958q108 0 187.5-33T922 829l4 2q-64 270-269 459l-270-157-49 77 244 146q-86 62-199 119l45 81q147-69 248-145l225 137 49-84-202-121q154-151 230.5-353t76.5-431zm-105-2q0 146-97 228.5T586 868q-185 0-275-100.5T221 463q0-186 94.5-289.5T584 70q179 0 272.5 123T950 557z"/><glyph unicode="ñ" horiz-adv-x="1208" d="M182 0zm758 0v705q0 164-69 238.5T657 1018q-195 0-285.5-98.5T281 600V0h-99v1087h84l19-149h6q106 170 377 170 370 0 370-397V0h-98zM779 1243q-36 0-75 18.5T603 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T355 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="ò" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm495 696h-69q-96 79-188.5 171.5T335 1552v17h142q26-48 98.5-142T718 1257v-16z"/><glyph unicode="ó" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm276 712q73 79 144.5 171.5T741 1569h141v-17q-36-52-122.5-138T569 1241h-70v16z"/><glyph unicode="ô" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm86 712q62 67 131.5 156T551 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="õ" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm538 698q-36 0-75 18.5T585 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T337 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="ö" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm123 844q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="÷" d="M111 682v82h948v-82H111zm393 393q0 99 80 99 82 0 82-99 0-52-23.5-75T584 977q-34 0-57 23t-23 75zm0-704q0 98 80 98 82 0 82-98 0-53-23.5-76T584 272q-34 0-57 23t-23 76z"/><glyph unicode="ø" horiz-adv-x="1200" d="M1081 545q0-266-129-415.5T596-20q-173 0-291 98L219-35l-72 58 93 120Q119 296 119 545q0 266 129 414.5T602 1108q179 0 301-104l96 124 74-55-104-137q112-147 112-391zm-858 0q0-200 78-322l543 705q-98 90-246 90-180 0-277.5-123.5T223 545zm754 0q0 190-72 309L362 152q94-82 238-82 180 0 278.5 125.5T977 545z"/><glyph unicode="ù" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm419 154h-69q-96 79-188.5 171.5T304 1552v17h142q26-48 98.5-142T687 1257v-16z"/><glyph unicode="ú" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm227 170q73 79 144.5 171.5T737 1569h141v-17q-36-52-122.5-138T565 1241h-70v16z"/><glyph unicode="û" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm45 170q62 67 131.5 156T555 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ü" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm82 302q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ý" horiz-adv-x="940" d="M0 0zm0 1087h102l230-610Q437 196 465 98h6q42 129 137 385l230 604h102L453-176q-59-154-99-208t-93.5-81T131-492q-57 0-127 21v86q58-16 125-16 51 0 90 24t70.5 74.5 73 160T416 0zm361 170q73 79 144.5 171.5T603 1569h141v-17q-36-52-122.5-138T431 1241h-70v16z"/><glyph unicode="þ" horiz-adv-x="1219" d="M281 918q114 190 368 190 220 0 335.5-144.5T1100 543q0-268-121.5-415.5T647-20q-251 0-366 188h-7l3-84q4-74 4-162v-414h-99v2048h99v-391l-7-247h7zM645 68q167 0 258.5 124T995 539q0 479-348 479-193 0-279.5-105T281 559v-18q0-255 85.5-364T645 68z"/><glyph unicode="ÿ" horiz-adv-x="940" d="M0 0zm0 1087h102l230-610Q437 196 465 98h6q42 129 137 385l230 604h102L453-176q-59-154-99-208t-93.5-81T131-492q-57 0-127 21v86q58-16 125-16 51 0 90 24t70.5 74.5 73 160T416 0zm214 302q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ı" horiz-adv-x="463" d="M281 0h-99v1087h99V0z"/><glyph unicode="Œ" horiz-adv-x="1839" d="M1714 0H958q-76-16-176-16-305 0-479 200T129 735q0 347 174.5 545.5T784 1479q78 0 183-17h747v-94h-655V815h616v-94h-616V94h655V0zM782 80q109 0 174 18v1266q-62 16-172 16-262 0-403-167.5T240 733q0-315 140.5-484T782 80z"/><glyph unicode="œ" horiz-adv-x="1942" d="M1438-20q-156 0-266.5 67.5T1006 246Q947 118 848 49T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q151 0 251-70t157-209q110 279 399 279 192 0 303-134t111-364v-80h-762q2-230 100.5-345T1438 70q93 0 163.5 13t178.5 56V49q-92-40-170-54.5T1438-20zM223 545q0-224 98.5-349.5T600 70q174 0 265 122.5T956 545q0 224-93 348.5T598 1018q-180 0-277.5-123.5T223 545zm1186 475q-155 0-242-104t-102-298h653q0 189-82 295.5T1409 1020z"/><glyph unicode="Ÿ" horiz-adv-x="1081" d="M0 0zm543 662l428 800h110L594 565V0H489v557L0 1462h117zM288 1727q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ˆ" horiz-adv-x="1182" d="M299 1257q62 67 131.5 156T541 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="˚" horiz-adv-x="1182" d="M805 1456q0-97-60-155t-157-58-157 58-60 155q0 94 60 152.5t157 58.5 157-59 60-152zm-354 0q0-66 37.5-103.5T588 1315t99.5 37.5T725 1456q0 64-39 101.5t-98 37.5q-62 0-99.5-38T451 1456z"/><glyph unicode="˜" horiz-adv-x="1182" d="M780 1243q-36 0-75 18.5T604 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T356 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="‐" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="‑" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="‒" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 512v82h860v-82H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 512v82h1884v-82H82z"/><glyph unicode="‘" horiz-adv-x="297" d="M41 961l-12 20q32 112 81.5 251t92.5 230h65q-30-101-64.5-257T158 961H41z"/><glyph unicode="’" horiz-adv-x="297" d="M256 1462l12-20q-75-265-174-481H29q29 96 61 241.5t49 259.5h117z"/><glyph unicode="‚" horiz-adv-x="451" d="M68 0zm227 238l12-20Q232-47 133-263H68q29 96 61 241.5T178 238h117z"/><glyph unicode="“" horiz-adv-x="614" d="M358 961l-12 20q34 120 83 255t91 226h66q-30-98-63-248.5T475 961H358zm-317 0l-12 20q32 112 81.5 251t92.5 230h65q-30-101-64.5-257T158 961H41z"/><glyph unicode="”" horiz-adv-x="614" d="M256 1462l12-20q-75-265-174-481H29q29 96 61 241.5t49 259.5h117zm317 0l13-20q-36-128-85-261t-89-220h-66q30 98 63 248.5t48 252.5h116z"/><glyph unicode="„" horiz-adv-x="768" d="M68 0zm227 238l12-20Q232-47 133-263H68q29 96 61 241.5T178 238h117zm317 0l13-20Q589 90 540-43t-89-220h-66q30 98 63 248.5T496 238h116z"/><glyph unicode="•" horiz-adv-x="770" d="M231 748q0 89 40.5 134.5T385 928t113.5-47T539 748q0-85-41-133t-113-48-113 47-41 134z"/><glyph unicode="…" horiz-adv-x="1466" d="M162 0zm0 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98zm489 0q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98zm490 0q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="524" d="M82 543l309 393 62-43-254-363 254-362-62-43L82 516v27z"/><glyph unicode="›" horiz-adv-x="524" d="M442 518L133 125l-61 43 254 362L72 893l61 43 309-391v-27z"/><glyph unicode="⁄" horiz-adv-x="246" d="M573 1462L-238 0h-94l811 1462h94z"/><glyph horiz-adv-x="476"/><glyph unicode="⁴" horiz-adv-x="688" d="M657 827H528V586h-90v241H25v60l407 581h96V905h129v-78zm-219 78v221q0 132 8 232-6-12-21.5-35.5T129 905h309z"/><glyph unicode="€" d="M803 1397q-174 0-288-125.5T360 907h502v-82H352l-4-104v-24q0-65 4-87h449v-82H358q30-217 147.5-338.5T807 68q148 0 287 65V39Q1013 5 943.5-7.5T803-20q-228 0-367.5 140T254 528H74v82h172q-4 38-4 113l4 102H74v82h184q39 272 183 425t362 153q88 0 161-17t148-57l-39-86q-132 72-270 72z"/><glyph unicode="™" horiz-adv-x="1485" d="M313 741h-86v643H10v78h522v-78H313V741zm600 0l-221 609h-6l4-201V741h-82v721h125l221-606 224 606h125V741h-86v398l4 207h-7L987 741h-74z"/><glyph unicode="−" d="M111 682v82h948v-82H111z"/><glyph unicode="" horiz-adv-x="1085" d="M0 1085h1085V0H0v1085z"/><glyph horiz-adv-x="1219" d="M0 0z"/><hkern u1="&amp;quot;" u2="Ÿ" k="-20"/><hkern u1="&amp;quot;" u2="œ" k="123"/><hkern u1="&amp;quot;" u2="ü" k="61"/><hkern u1="&amp;quot;" u2="û" k="61"/><hkern u1="&amp;quot;" u2="ú" k="61"/><hkern u1="&amp;quot;" u2="ù" k="61"/><hkern u1="&amp;quot;" u2="ø" k="123"/><hkern u1="&amp;quot;" u2="ö" k="123"/><hkern u1="&amp;quot;" u2="õ" k="123"/><hkern u1="&amp;quot;" u2="ô" k="123"/><hkern u1="&amp;quot;" u2="ó" k="123"/><hkern u1="&amp;quot;" u2="ò" k="123"/><hkern u1="&amp;quot;" u2="ë" k="123"/><hkern u1="&amp;quot;" u2="ê" k="123"/><hkern u1="&amp;quot;" u2="é" k="123"/><hkern u1="&amp;quot;" u2="è" k="123"/><hkern u1="&amp;quot;" u2="ç" k="123"/><hkern u1="&amp;quot;" u2="æ" k="82"/><hkern u1="&amp;quot;" u2="å" k="82"/><hkern u1="&amp;quot;" u2="ä" k="82"/><hkern u1="&amp;quot;" u2="ã" k="82"/><hkern u1="&amp;quot;" u2="â" k="82"/><hkern u1="&amp;quot;" u2="á" k="82"/><hkern u1="&amp;quot;" u2="à" k="123"/><hkern u1="&amp;quot;" u2="Ý" k="-20"/><hkern u1="&amp;quot;" u2="Å" k="143"/><hkern u1="&amp;quot;" u2="Ä" k="143"/><hkern u1="&amp;quot;" u2="Ã" k="143"/><hkern u1="&amp;quot;" u2="Â" k="143"/><hkern u1="&amp;quot;" u2="Á" k="143"/><hkern u1="&amp;quot;" u2="À" k="143"/><hkern u1="&amp;quot;" u2="u" k="61"/><hkern u1="&amp;quot;" u2="s" k="61"/><hkern u1="&amp;quot;" u2="r" k="61"/><hkern u1="&amp;quot;" u2="q" k="123"/><hkern u1="&amp;quot;" u2="p" k="61"/><hkern u1="&amp;quot;" u2="o" k="123"/><hkern u1="&amp;quot;" u2="n" k="61"/><hkern u1="&amp;quot;" u2="m" k="61"/><hkern u1="&amp;quot;" u2="g" k="61"/><hkern u1="&amp;quot;" u2="e" k="123"/><hkern u1="&amp;quot;" u2="d" k="123"/><hkern u1="&amp;quot;" u2="c" k="123"/><hkern u1="&amp;quot;" u2="a" k="82"/><hkern u1="&amp;quot;" u2="Y" k="-20"/><hkern u1="&amp;quot;" u2="W" k="-41"/><hkern u1="&amp;quot;" u2="V" k="-41"/><hkern u1="&amp;quot;" u2="T" k="-41"/><hkern u1="&amp;quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="œ" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="å" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à" k="123"/><hkern u1="'" u2="Ý" k="-20"/><hkern u1="'" u2="Å" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Á" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Œ" k="102"/><hkern u1="," u2="Ý" k="123"/><hkern u1="," u2="Ü" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ò" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Œ" k="102"/><hkern u1="." u2="Ý" k="123"/><hkern u1="." u2="Ü" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ò" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="”" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Œ" k="41"/><hkern u1="A" u2="Ý" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ò" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&amp;quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ý" k="20"/><hkern u1="B" u2="Å" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Á" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Œ" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ò" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ý" k="20"/><hkern u1="D" u2="Å" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Á" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Å" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Á" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Œ" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ò" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="”" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Œ" k="41"/><hkern u1="L" u2="Ý" k="61"/><hkern u1="L" u2="Ü" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ò" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&amp;quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ý" k="20"/><hkern u1="O" u2="Å" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Á" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Å" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Á" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ý" k="20"/><hkern u1="Q" u2="Å" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Á" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="œ" k="143"/><hkern u1="T" u2="Œ" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="å" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à" k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ò" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Å" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Á" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Å" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Á" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="œ" k="41"/><hkern u1="V" u2="Œ" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="å" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à" k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ò" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Å" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Á" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="œ" k="41"/><hkern u1="W" u2="Œ" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="å" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à" k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ò" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Å" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Á" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Œ" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ò" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="œ" k="102"/><hkern u1="Y" u2="Œ" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="å" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à" k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ò" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Å" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Á" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Œ" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ò" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="”" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&amp;quot;" k="20"/><hkern u1="b" u2="”" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&amp;quot;" k="20"/><hkern u1="c" u2="”" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&amp;quot;" k="-41"/><hkern u1="e" u2="”" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&amp;quot;" k="20"/><hkern u1="f" u2="”" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&amp;quot;" k="-123"/><hkern u1="h" u2="”" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&amp;quot;" k="20"/><hkern u1="k" u2="œ" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à" k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="”" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&amp;quot;" k="20"/><hkern u1="n" u2="”" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&amp;quot;" k="20"/><hkern u1="o" u2="”" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&amp;quot;" k="20"/><hkern u1="p" u2="”" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&amp;quot;" k="20"/><hkern u1="r" u2="”" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="œ" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="å" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à" k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&amp;quot;" k="-82"/><hkern u1="t" u2="”" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&amp;quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="”" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&amp;quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="”" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&amp;quot;" k="-82"/><hkern u1="x" u2="œ" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à" k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="”" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&amp;quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="”" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Œ" k="41"/><hkern u1="À" u2="Ý" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ò" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&amp;quot;" k="143"/><hkern u1="Á" u2="”" k="143"/><hkern u1="Á" u2="’" k="143"/><hkern u1="Á" u2="Ÿ" k="123"/><hkern u1="Á" u2="Œ" k="41"/><hkern u1="Á" u2="Ý" k="123"/><hkern u1="Á" u2="Ø" k="41"/><hkern u1="Á" u2="Ö" k="41"/><hkern u1="Á" u2="Õ" k="41"/><hkern u1="Á" u2="Ô" k="41"/><hkern u1="Á" u2="Ó" k="41"/><hkern u1="Á" u2="Ò" k="41"/><hkern u1="Á" u2="Ç" k="41"/><hkern u1="Á" u2="Y" k="123"/><hkern u1="Á" u2="W" k="82"/><hkern u1="Á" u2="V" k="82"/><hkern u1="Á" u2="T" k="143"/><hkern u1="Á" u2="Q" k="41"/><hkern u1="Á" u2="O" k="41"/><hkern u1="Á" u2="J" k="-266"/><hkern u1="Á" u2="G" k="41"/><hkern u1="Á" u2="C" k="41"/><hkern u1="Á" u2="'" k="143"/><hkern u1="Á" u2="&amp;quot;" k="143"/><hkern u1="Â" u2="”" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Œ" k="41"/><hkern u1="Â" u2="Ý" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ò" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&amp;quot;" k="143"/><hkern u1="Ã" u2="”" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Œ" k="41"/><hkern u1="Ã" u2="Ý" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ò" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&amp;quot;" k="143"/><hkern u1="Ä" u2="”" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Œ" k="41"/><hkern u1="Ä" u2="Ý" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ò" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&amp;quot;" k="143"/><hkern u1="Å" u2="”" k="143"/><hkern u1="Å" u2="’" k="143"/><hkern u1="Å" u2="Ÿ" k="123"/><hkern u1="Å" u2="Œ" k="41"/><hkern u1="Å" u2="Ý" k="123"/><hkern u1="Å" u2="Ø" k="41"/><hkern u1="Å" u2="Ö" k="41"/><hkern u1="Å" u2="Õ" k="41"/><hkern u1="Å" u2="Ô" k="41"/><hkern u1="Å" u2="Ó" k="41"/><hkern u1="Å" u2="Ò" k="41"/><hkern u1="Å" u2="Ç" k="41"/><hkern u1="Å" u2="Y" k="123"/><hkern u1="Å" u2="W" k="82"/><hkern u1="Å" u2="V" k="82"/><hkern u1="Å" u2="T" k="143"/><hkern u1="Å" u2="Q" k="41"/><hkern u1="Å" u2="O" k="41"/><hkern u1="Å" u2="J" k="-266"/><hkern u1="Å" u2="G" k="41"/><hkern u1="Å" u2="C" k="41"/><hkern u1="Å" u2="'" k="143"/><hkern u1="Å" u2="&amp;quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Œ" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ò" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ð" u2="„" k="82"/><hkern u1="Ð" u2="‚" k="82"/><hkern u1="Ð" u2="Ÿ" k="20"/><hkern u1="Ð" u2="Ý" k="20"/><hkern u1="Ð" u2="Å" k="41"/><hkern u1="Ð" u2="Ä" k="41"/><hkern u1="Ð" u2="Ã" k="41"/><hkern u1="Ð" u2="Â" k="41"/><hkern u1="Ð" u2="Á" k="41"/><hkern u1="Ð" u2="À" k="41"/><hkern u1="Ð" u2="Z" k="20"/><hkern u1="Ð" u2="Y" k="20"/><hkern u1="Ð" u2="X" k="41"/><hkern u1="Ð" u2="W" k="20"/><hkern u1="Ð" u2="V" k="20"/><hkern u1="Ð" u2="T" k="61"/><hkern u1="Ð" u2="A" k="41"/><hkern u1="Ð" u2="." k="82"/><hkern u1="Ð" u2="," k="82"/><hkern u1="Ò" u2="„" k="82"/><hkern u1="Ò" u2="‚" k="82"/><hkern u1="Ò" u2="Ÿ" k="20"/><hkern u1="Ò" u2="Ý" k="20"/><hkern u1="Ò" u2="Å" k="41"/><hkern u1="Ò" u2="Ä" k="41"/><hkern u1="Ò" u2="Ã" k="41"/><hkern u1="Ò" u2="Â" k="41"/><hkern u1="Ò" u2="Á" k="41"/><hkern u1="Ò" u2="À" k="41"/><hkern u1="Ò" u2="Z" k="20"/><hkern u1="Ò" u2="Y" k="20"/><hkern u1="Ò" u2="X" k="41"/><hkern u1="Ò" u2="W" k="20"/><hkern u1="Ò" u2="V" k="20"/><hkern u1="Ò" u2="T" k="61"/><hkern u1="Ò" u2="A" k="41"/><hkern u1="Ò" u2="." k="82"/><hkern u1="Ò" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ý" k="20"/><hkern u1="Ó" u2="Å" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Á" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ý" k="20"/><hkern u1="Ô" u2="Å" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Á" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ý" k="20"/><hkern u1="Õ" u2="Å" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Á" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ý" k="20"/><hkern u1="Ö" u2="Å" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Á" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ý" k="20"/><hkern u1="Ø" u2="Å" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Á" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Å" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Á" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Å" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Á" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Å" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Á" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ü" u2="„" k="41"/><hkern u1="Ü" u2="‚" k="41"/><hkern u1="Ü" u2="Å" k="20"/><hkern u1="Ü" u2="Ä" k="20"/><hkern u1="Ü" u2="Ã" k="20"/><hkern u1="Ü" u2="Â" k="20"/><hkern u1="Ü" u2="Á" k="20"/><hkern u1="Ü" u2="À" k="20"/><hkern u1="Ü" u2="A" k="20"/><hkern u1="Ü" u2="." k="41"/><hkern u1="Ü" u2="," k="41"/><hkern u1="Ý" u2="„" k="123"/><hkern u1="Ý" u2="‚" k="123"/><hkern u1="Ý" u2="œ" k="102"/><hkern u1="Ý" u2="Œ" k="41"/><hkern u1="Ý" u2="ü" k="61"/><hkern u1="Ý" u2="û" k="61"/><hkern u1="Ý" u2="ú" k="61"/><hkern u1="Ý" u2="ù" k="61"/><hkern u1="Ý" u2="ø" k="102"/><hkern u1="Ý" u2="ö" k="102"/><hkern u1="Ý" u2="õ" k="102"/><hkern u1="Ý" u2="ô" k="102"/><hkern u1="Ý" u2="ó" k="102"/><hkern u1="Ý" u2="ò" k="102"/><hkern u1="Ý" u2="ë" k="102"/><hkern u1="Ý" u2="ê" k="102"/><hkern u1="Ý" u2="é" k="102"/><hkern u1="Ý" u2="è" k="102"/><hkern u1="Ý" u2="ç" k="102"/><hkern u1="Ý" u2="æ" k="102"/><hkern u1="Ý" u2="å" k="102"/><hkern u1="Ý" u2="ä" k="102"/><hkern u1="Ý" u2="ã" k="102"/><hkern u1="Ý" u2="â" k="102"/><hkern u1="Ý" u2="á" k="102"/><hkern u1="Ý" u2="à" k="102"/><hkern u1="Ý" u2="Ø" k="41"/><hkern u1="Ý" u2="Ö" k="41"/><hkern u1="Ý" u2="Õ" k="41"/><hkern u1="Ý" u2="Ô" k="41"/><hkern u1="Ý" u2="Ó" k="41"/><hkern u1="Ý" u2="Ò" k="41"/><hkern u1="Ý" u2="Ç" k="41"/><hkern u1="Ý" u2="Å" k="123"/><hkern u1="Ý" u2="Ä" k="123"/><hkern u1="Ý" u2="Ã" k="123"/><hkern u1="Ý" u2="Â" k="123"/><hkern u1="Ý" u2="Á" k="123"/><hkern u1="Ý" u2="À" k="123"/><hkern u1="Ý" u2="z" k="41"/><hkern u1="Ý" u2="u" k="61"/><hkern u1="Ý" u2="s" k="82"/><hkern u1="Ý" u2="r" k="61"/><hkern u1="Ý" u2="q" k="102"/><hkern u1="Ý" u2="p" k="61"/><hkern u1="Ý" u2="o" k="102"/><hkern u1="Ý" u2="n" k="61"/><hkern u1="Ý" u2="m" k="61"/><hkern u1="Ý" u2="g" k="41"/><hkern u1="Ý" u2="e" k="102"/><hkern u1="Ý" u2="d" k="102"/><hkern u1="Ý" u2="c" k="102"/><hkern u1="Ý" u2="a" k="102"/><hkern u1="Ý" u2="Q" k="41"/><hkern u1="Ý" u2="O" k="41"/><hkern u1="Ý" u2="G" k="41"/><hkern u1="Ý" u2="C" k="41"/><hkern u1="Ý" u2="A" k="123"/><hkern u1="Ý" u2="?" k="-41"/><hkern u1="Ý" u2="." k="123"/><hkern u1="Ý" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Å" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Á" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à" u2="”" k="20"/><hkern u1="à" u2="’" k="20"/><hkern u1="à" u2="'" k="20"/><hkern u1="à" u2="&amp;quot;" k="20"/><hkern u1="á" u2="”" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&amp;quot;" k="20"/><hkern u1="â" u2="”" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&amp;quot;" k="20"/><hkern u1="ã" u2="”" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&amp;quot;" k="20"/><hkern u1="ä" u2="”" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&amp;quot;" k="20"/><hkern u1="å" u2="”" k="20"/><hkern u1="å" u2="’" k="20"/><hkern u1="å" u2="'" k="20"/><hkern u1="å" u2="&amp;quot;" k="20"/><hkern u1="è" u2="”" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&amp;quot;" k="20"/><hkern u1="é" u2="”" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&amp;quot;" k="20"/><hkern u1="ê" u2="”" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&amp;quot;" k="20"/><hkern u1="ë" u2="”" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&amp;quot;" k="20"/><hkern u1="ð" u2="”" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&amp;quot;" k="20"/><hkern u1="ò" u2="”" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&amp;quot;" k="20"/><hkern u1="ó" u2="”" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&amp;quot;" k="20"/><hkern u1="ô" u2="”" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&amp;quot;" k="20"/><hkern u1="ö" u2="”" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&amp;quot;" k="41"/><hkern u1="ø" u2="”" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&amp;quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="”" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&amp;quot;" k="-82"/><hkern u1="þ" u2="”" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&amp;quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="”" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&amp;quot;" k="-82"/><hkern u1="Œ" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="œ" k="102"/><hkern u1="Ÿ" u2="Œ" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="å" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à" k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ò" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Å" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Á" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="œ" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="å" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à" k="123"/><hkern u1="‘" u2="Ý" k="-20"/><hkern u1="‘" u2="Å" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Á" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="œ" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="å" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à" k="123"/><hkern u1="’" u2="Ý" k="-20"/><hkern u1="’" u2="Å" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Á" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Œ" k="102"/><hkern u1="‚" u2="Ý" k="123"/><hkern u1="‚" u2="Ü" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ò" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="œ" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="å" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à" k="123"/><hkern u1="“" u2="Ý" k="-20"/><hkern u1="“" u2="Å" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Á" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Œ" k="102"/><hkern u1="„" u2="Ý" k="123"/><hkern u1="„" u2="Ü" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ò" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/opensans/light/opensans-300.ttf b/lib/web/fonts/opensans/light/opensans-300.ttf
deleted file mode 100644
index 63af664cde6ab..0000000000000
Binary files a/lib/web/fonts/opensans/light/opensans-300.ttf and /dev/null differ
diff --git a/lib/web/fonts/opensans/regular/opensans-400.eot b/lib/web/fonts/opensans/regular/opensans-400.eot
deleted file mode 100644
index 6bbc3cf58cb01..0000000000000
Binary files a/lib/web/fonts/opensans/regular/opensans-400.eot and /dev/null differ
diff --git a/lib/web/fonts/opensans/regular/opensans-400.svg b/lib/web/fonts/opensans/regular/opensans-400.svg
deleted file mode 100644
index 3a4a57d6f20a8..0000000000000
--- a/lib/web/fonts/opensans/regular/opensans-400.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1171"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="fi" horiz-adv-x="1212" d="M29 0zm641 967H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1036 0H870v1096h166V0zM856 1393q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="fl" horiz-adv-x="1212" d="M29 0zm641 967H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1036 0H870v1556h166V0z"/><glyph unicode="ffi" horiz-adv-x="1909" d="M29 0zm1329 967h-279V0H913v967H717v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5t-45-200.5v-71h279V967zm-688 0H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1731 0h-166v1096h166V0zm-180 1393q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="ffl" horiz-adv-x="1909" d="M29 0zm1329 967h-279V0H913v967H717v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5t-45-200.5v-71h279V967zm-688 0H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1731 0h-166v1556h166V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="547" d="M326 403H221l-51 1059h207zM152 106q0 136 120 136 58 0 89.5-35T393 106q0-64-32-99.5T272-29q-52 0-86 31.5T152 106z"/><glyph unicode="&amp;quot;" horiz-adv-x="821" d="M319 1462l-40-528H174l-41 528h186zm369 0l-41-528H543l-41 528h186z"/><glyph unicode="#" horiz-adv-x="1323" d="M981 899l-66-340h283V430H891L807 0H670l84 430H451L369 0H233l80 430H51v129h287l68 340H129v127h299l82 436h139l-82-436h305l84 436h134l-84-436h264V899H981zM475 559h303l66 340H541z"/><glyph unicode="$" d="M1036 449q0-136-102-224.5T649 113v-232H520v223q-112 0-217 17.5T131 170v156q83-37 191.5-60.5T520 242v440q-205 65-287.5 151T150 1055q0 131 101.5 215T520 1372v182h129v-180q184-5 355-74l-52-131q-149 59-303 70V805q157-50 235-97.5t115-109 37-149.5zm-170-13q0 72-44.5 116.5T649 641V252q217 30 217 184zm-547 621q0-76 45-122t156-87v387q-99-16-150-62.5T319 1057z"/><glyph unicode="%" horiz-adv-x="1686" d="M242 1026q0-170 37-255t120-85q164 0 164 340 0 338-164 338-83 0-120-84t-37-254zm458 0q0-228-76.5-344.5T399 565q-140 0-217.5 119T104 1026q0 227 74.5 342T399 1483q145 0 223-119t78-338zm422-586q0-171 37-255.5t121-84.5 124 83.5 40 256.5q0 171-40 253.5T1280 776t-121-82.5-37-253.5zm459 0q0-227-76.5-343.5T1280-20q-142 0-218.5 119T985 440q0 227 74.5 342T1280 897q142 0 221.5-117.5T1581 440zm-258 1022L512 0H365l811 1462h147z"/><glyph unicode="&amp;" horiz-adv-x="1495" d="M414 1171q0-69 36-131.5T573 889q129 75 179.5 138.5T803 1174q0 77-51.5 125.5T614 1348q-89 0-144.5-48T414 1171zM569 129q241 0 400 154L532 707q-111-68-157-112.5T307 499t-22-116q0-117 77.5-185.5T569 129zM113 379q0 130 69.5 230T432 811q-85 95-115.5 144T268 1057t-18 110q0 150 98 234t273 84q162 0 255-83.5t93-232.5q0-107-68-197.5T676 788l407-391q56 62 89.5 145.5T1229 725h168q-68-286-205-434L1491 0h-229l-185 178Q959 72 837 26T565-20Q350-20 231.5 86T113 379z"/><glyph unicode="'" horiz-adv-x="453" d="M319 1462l-40-528H174l-41 528h186z"/><glyph unicode="(" horiz-adv-x="606" d="M82 561q0 265 77.5 496T383 1462h162q-144-193-216.5-424T256 563q0-240 74-469t213-418H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="606" d="M524 561q0-263-77.5-490T223-324H63Q202-136 276 93.5T350 563q0 244-72.5 475T61 1462h162q147-175 224-406.5T524 561z"/><glyph unicode="*" horiz-adv-x="1130" d="M657 1556l-43-395 398 111 26-182-381-31 248-326-172-94-176 362-160-362-176 94 242 326-377 31 29 182 391-111-43 395h194z"/><glyph unicode="+" d="M653 791h412V653H653V227H514v426H104v138h410v428h139V791z"/><glyph unicode="," horiz-adv-x="502" d="M350 238l15-23q-26-100-75-232.5T188-264H63Q90-160 122.5-7T168 238h182z"/><glyph unicode="-" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="." horiz-adv-x="545" d="M152 106q0 67 30.5 101.5T270 242q58 0 90.5-34.5T393 106q0-65-33-100t-90-35q-51 0-84.5 31.5T152 106z"/><glyph unicode="/" horiz-adv-x="752" d="M731 1462L186 0H20l545 1462h166z"/><glyph unicode="0" d="M1069 733q0-379-119.5-566T584-20q-236 0-359 191.5T102 733q0 382 119 567t363 185q238 0 361.5-193T1069 733zm-799 0q0-319 75-464.5T584 123q166 0 240.5 147.5T899 733t-74.5 461.5T584 1341q-164 0-239-144.5T270 733z"/><glyph unicode="1" d="M715 0H553v1042q0 130 8 246-21-21-47-44t-238-195l-88 114 387 299h140V0z"/><glyph unicode="2" d="M1061 0H100v143l385 387q176 178 232 254t84 148 28 155q0 117-71 185.5T561 1341q-91 0-172.5-30T207 1202l-88 113q202 168 440 168 206 0 323-105.5T999 1094q0-139-78-275T629 475L309 162v-8h752V0z"/><glyph unicode="3" d="M1006 1118q0-140-78.5-229T705 770v-8q176-22 261-112t85-236q0-209-145-321.5T494-20Q378-20 281.5-2.5T94 59v158q95-47 202.5-71.5T500 121q379 0 379 297 0 266-418 266H317v143h146q171 0 271 75.5T834 1112q0 107-73.5 168T561 1341q-96 0-181-26t-194-96l-84 112q90 71 207.5 111.5T557 1483q213 0 331-97.5t118-267.5z"/><glyph unicode="4" d="M1130 336H913V0H754v336H43v145l694 989h176V487h217V336zM754 487v486q0 143 10 323h-8q-48-96-90-159L209 487h545z"/><glyph unicode="5" d="M557 893q231 0 363.5-114.5T1053 465q0-227-144.5-356T510-20q-247 0-377 79v160q70-45 174-70.5T512 123q176 0 273.5 83T883 446q0 306-375 306-95 0-254-29l-86 55 55 684h727v-153H365l-37-439q115 23 229 23z"/><glyph unicode="6" d="M117 625q0 431 167.5 644.5T780 1483q113 0 178-19v-143q-77 25-176 25-235 0-359-146.5T287 739h12q110 172 348 172 197 0 310.5-119T1071 469q0-228-124.5-358.5T610-20q-227 0-360 170.5T117 625zm491-504q142 0 220.5 89.5T907 469q0 145-73 228t-218 83q-90 0-165-37T331.5 641 287 506q0-103 40-192t113.5-141T608 121z"/><glyph unicode="7" d="M285 0l606 1309H94v153h973v-133L469 0H285z"/><glyph unicode="8" d="M584 1483q200 0 317-93t117-257q0-108-67-197T737 774q178-85 253-178.5t75-216.5q0-182-127-290.5T590-20Q356-20 230 82.5T104 373q0 251 306 391-138 78-198 168.5T152 1135q0 159 117.5 253.5T584 1483zM268 369q0-120 83.5-187T586 115q149 0 232 70t83 192q0 97-78 172.5T551 696q-149-64-216-141.5T268 369zm314 979q-125 0-196-60t-71-160q0-92 59-158t218-132q143 60 202.5 129t59.5 161q0 101-72.5 160.5T582 1348z"/><glyph unicode="9" d="M1061 838q0-858-664-858-116 0-184 20v143q80-26 182-26 240 0 362.5 148.5T891 721h-12q-55-83-146-126.5T528 551q-194 0-308 116T106 991q0 228 127.5 360T569 1483q149 0 260.5-76.5t171.5-223 60-345.5zm-492 503q-143 0-221-92t-78-256q0-144 72-226.5T561 684q91 0 167.5 37T849 822t44 134q0 105-41 194t-114.5 140-168.5 51z"/><glyph unicode=":" horiz-adv-x="545" d="M152 106q0 67 30.5 101.5T270 242q58 0 90.5-34.5T393 106q0-65-33-100t-90-35q-51 0-84.5 31.5T152 106zm0 883q0 135 118 135 123 0 123-135 0-65-33-100t-90-35q-51 0-84.5 31.5T152 989z"/><glyph unicode=";" horiz-adv-x="545" d="M350 238l15-23q-26-100-75-232.5T188-264H63Q90-160 122.5-7T168 238h182zM147 989q0 135 119 135 123 0 123-135 0-65-33-100t-90-35q-58 0-88.5 35T147 989z"/><glyph unicode="<" d="M1065 242L104 664v98l961 479v-149L283 721l782-328V242z"/><glyph unicode="=" d="M119 858v137h930V858H119zm0-409v137h930V449H119z"/><glyph unicode=">" d="M104 393l783 326-783 373v149l961-479v-98L104 242v151z"/><glyph unicode="?" horiz-adv-x="879" d="M289 403v54q0 117 36 192.5T459 809q136 115 171.5 173t35.5 140q0 102-65.5 157.5T412 1335q-79 0-154-18.5T86 1249l-59 135q189 99 395 99 191 0 297-94t106-265q0-73-19.5-128.5t-57.5-105T584 731q-101-86-133.5-143T418 436v-33H289zm-49-297q0 136 120 136 58 0 89.5-35T481 106q0-64-32-99.5T360-29q-52 0-86 31.5T240 106z"/><glyph unicode="@" horiz-adv-x="1841" d="M1720 729q0-142-44-260t-124-183-184-65q-86 0-145 52t-70 133h-8q-40-87-114.5-136T854 221q-150 0-234.5 102.5T535 602q0 204 118 331.5T963 1061q68 0 154-12.5t155-34.5l-25-470v-22q0-178 133-178 91 0 148 107.5t57 279.5q0 181-74 317t-210.5 209.5T987 1331q-223 0-388-92.5t-252-264T260 578q0-305 161-469T885-55q210 0 436 86v-133q-192-84-436-84-363 0-563.5 199.5T121 571q0 260 107 463t305 314.5T987 1460q215 0 382.5-90.5t259-257T1720 729zM686 598q0-254 195-254 207 0 225 313l14 261q-72 20-157 20-130 0-203.5-90T686 598z"/><glyph unicode="A" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473z"/><glyph unicode="B" horiz-adv-x="1327" d="M201 1462h413q291 0 421-87t130-275q0-130-72.5-214.5T881 776v-10q333-57 333-350 0-196-132.5-306T711 0H201v1462zm170-626h280q180 0 259 56.5t79 190.5q0 123-88 177.5T621 1315H371V836zm0-144V145h305q177 0 266.5 68.5T1032 428q0 136-91.5 200T662 692H371z"/><glyph unicode="C" horiz-adv-x="1292" d="M827 1331q-241 0-380.5-160.5T307 731q0-287 134.5-443.5T825 131q153 0 349 55V37q-152-57-375-57-323 0-498.5 196T125 733q0 226 84.5 396t244 262 375.5 92q230 0 402-84l-72-146q-166 78-332 78z"/><glyph unicode="D" horiz-adv-x="1493" d="M1368 745q0-362-196.5-553.5T606 0H201v1462h448q341 0 530-189t189-528zm-180-6q0 286-143.5 431T618 1315H371V147h207q304 0 457 149.5T1188 739z"/><glyph unicode="E" horiz-adv-x="1139" d="M1016 0H201v1462h815v-151H371V840h606V690H371V152h645V0z"/><glyph unicode="F" horiz-adv-x="1057" d="M371 0H201v1462h815v-151H371V776h606V625H371V0z"/><glyph unicode="G" horiz-adv-x="1491" d="M844 766h497V55q-116-37-236-56T827-20q-332 0-517 197.5T125 731q0 228 91.5 399.5t263.5 262 403 90.5q234 0 436-86l-66-150q-198 84-381 84-267 0-417-159T305 731q0-296 144.5-449T874 129q152 0 297 35v450H844v152z"/><glyph unicode="H" horiz-adv-x="1511" d="M1311 0h-170v688H371V0H201v1462h170V840h770v622h170V0z"/><glyph unicode="I" horiz-adv-x="571" d="M201 0v1462h170V0H201z"/><glyph unicode="J" horiz-adv-x="547" d="M-12-385q-94 0-148 27v145q71-20 148-20 99 0 150.5 60T190 0v1462h170V14q0-190-96-294.5T-12-385z"/><glyph unicode="K" horiz-adv-x="1257" d="M1257 0h-200L524 709 371 573V0H201v1462h170V737l663 725h201L647 827z"/><glyph unicode="L" horiz-adv-x="1063" d="M201 0v1462h170V154h645V0H201z"/><glyph unicode="M" horiz-adv-x="1849" d="M848 0L352 1296h-8q14-154 14-366V0H201v1462h256L920 256h8l467 1206h254V0h-170v942q0 162 14 352h-8L985 0H848z"/><glyph unicode="N" horiz-adv-x="1544" d="M1343 0h-194L350 1227h-8q16-216 16-396V0H201v1462h192l797-1222h8q-2 27-9 173.5t-5 209.5v839h159V0z"/><glyph unicode="O" horiz-adv-x="1595" d="M1470 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733z"/><glyph unicode="P" horiz-adv-x="1233" d="M1128 1036q0-222-151.5-341.5T543 575H371V0H201v1462h379q548 0 548-426zM371 721h153q226 0 327 73t101 234q0 145-95 216t-296 71H371V721z"/><glyph unicode="Q" horiz-adv-x="1595" d="M1470 733q0-281-113-467T1038 14l348-362h-247L854-18l-55-2q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733z"/><glyph unicode="R" horiz-adv-x="1266" d="M371 608V0H201v1462h401q269 0 397.5-103t128.5-310q0-290-294-392L1231 0h-201L676 608H371zm0 146h233q180 0 264 71.5t84 214.5q0 145-85.5 209T592 1313H371V754z"/><glyph unicode="S" horiz-adv-x="1124" d="M1026 389q0-193-140-301T506-20q-260 0-400 67v164q90-38 196-60t210-22q170 0 256 64.5T854 373q0 76-30.5 124.5t-102 89.5T504 680q-204 73-291.5 173T125 1114q0 169 127 269t336 100q218 0 401-80l-53-148q-181 76-352 76-135 0-211-58t-76-161q0-76 28-124.5t94.5-89T623 809q230-82 316.5-176t86.5-244z"/><glyph unicode="T" horiz-adv-x="1133" d="M651 0H481v1311H18v151h1096v-151H651V0z"/><glyph unicode="U" horiz-adv-x="1491" d="M1305 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170z"/><glyph unicode="V" horiz-adv-x="1219" d="M1036 1462h183L692 0H524L0 1462h180l336-946q58-163 92-317 36 162 94 323z"/><glyph unicode="W" horiz-adv-x="1896" d="M1477 0h-168l-295 979q-21 65-47 164t-27 119q-22-132-70-289L584 0H416L27 1462h180l231-903q48-190 70-344 27 183 80 358l262 889h180l275-897q48-155 81-350 19 142 72 346l230 901h180z"/><glyph unicode="X" horiz-adv-x="1182" d="M1174 0H981L588 643 188 0H8l486 764-453 698h188l363-579 366 579h181L686 770z"/><glyph unicode="Y" horiz-adv-x="1147" d="M573 731l390 731h184L659 567V0H487v559L0 1462h186z"/><glyph unicode="Z" horiz-adv-x="1169" d="M1087 0H82v133l776 1176H106v153h959v-133L289 154h798V0z"/><glyph unicode="[" horiz-adv-x="674" d="M623-324H166v1786h457v-141H334V-182h289v-142z"/><glyph unicode="\" horiz-adv-x="752" d="M186 1462L733 0H567L23 1462h163z"/><glyph unicode="]" horiz-adv-x="674" d="M51-182h289v1503H51v141h457V-324H51v142z"/><glyph unicode="^" horiz-adv-x="1110" d="M49 551l434 922h99l477-922H907l-372 745-334-745H49z"/><glyph unicode="_" horiz-adv-x="918" d="M922-315H-4v131h926v-131z"/><glyph unicode="`" horiz-adv-x="1182" d="M786 1241H676q-65 52-154 148t-129 159v21h203q32-69 89-159.5T786 1266v-25z"/><glyph unicode="a" horiz-adv-x="1139" d="M850 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117z"/><glyph unicode="b" horiz-adv-x="1255" d="M686 1114q216 0 335.5-147.5T1141 549t-120.5-419.5T686-20q-107 0-195.5 39.5T342 141h-12L295 0H176v1556h166v-378q0-127-8-228h8q116 164 344 164zm-24-139q-170 0-245-97.5T342 549t77-330.5T666 119q153 0 228 111.5T969 551q0 214-75 319T662 975z"/><glyph unicode="c" horiz-adv-x="975" d="M614-20q-238 0-368.5 146.5T115 541q0 275 132.5 425T625 1116q79 0 158-17t124-40l-51-141q-55 22-120 36.5T621 969q-334 0-334-426 0-202 81.5-310T610 125q137 0 281 59V37Q781-20 614-20z"/><glyph unicode="d" horiz-adv-x="1255" d="M922 147h-9Q798-20 569-20q-215 0-334.5 147T115 545t120 421 334 150q223 0 342-162h13l-7 79-4 77v446h166V0H944zm-332-28q170 0 246.5 92.5T913 510v35q0 233-77.5 332.5T588 977q-146 0-223.5-113.5T287 543q0-210 77-317t226-107z"/><glyph unicode="e" horiz-adv-x="1149" d="M639-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977z"/><glyph unicode="f" horiz-adv-x="694" d="M670 967H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967z"/><glyph unicode="g" horiz-adv-x="1122" d="M1073 1096V991l-203-24q28-35 50-91.5T942 748q0-161-110-257t-302-96q-49 0-92 8-106-56-106-141 0-45 37-66.5T496 174h194q178 0 273.5-75t95.5-218q0-182-146-277.5T487-492q-215 0-331.5 80T39-186q0 100 64 173t180 99q-42 19-70.5 59T184 238q0 60 32 105t101 87q-85 35-138.5 119T125 741q0 180 108 277.5t306 97.5q86 0 155-20h379zM199-184q0-89 75-135t215-46q209 0 309.5 62.5T899-133q0 89-55 123.5T637 25H438q-113 0-176-54t-63-155zm90 929q0-115 65-174t181-59q243 0 243 236 0 247-246 247-117 0-180-63t-63-187z"/><glyph unicode="h" horiz-adv-x="1257" d="M926 0v709q0 134-61 200t-191 66q-173 0-252.5-94T342 573V0H176v1556h166v-471q0-85-8-141h10q49 79 139.5 124.5T690 1114q201 0 301.5-95.5T1092 715V0H926z"/><glyph unicode="i" horiz-adv-x="518" d="M342 0H176v1096h166V0zM162 1393q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="j" horiz-adv-x="518" d="M43-492q-95 0-154 25v135q69-20 136-20 78 0 114.5 42.5T176-180v1276h166V-168q0-324-299-324zm119 1885q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="k" horiz-adv-x="1075" d="M340 561q43 61 131 160l354 375h197L578 629 1053 0H852L465 518 340 410V0H176v1556h164V731q0-55-8-170h8z"/><glyph unicode="l" horiz-adv-x="518" d="M342 0H176v1556h166V0z"/><glyph unicode="m" horiz-adv-x="1905" d="M1573 0v713q0 131-56 196.5T1343 975q-155 0-229-89t-74-274V0H874v713q0 131-56 196.5T643 975q-156 0-228.5-93.5T342 575V0H176v1096h135l27-150h8q47 80 132.5 125t191.5 45q257 0 336-186h8q49 86 142 136t212 50q186 0 278.5-95.5T1739 715V0h-166z"/><glyph unicode="n" horiz-adv-x="1257" d="M926 0v709q0 134-61 200t-191 66q-172 0-252-93t-80-307V0H176v1096h135l27-150h8q51 81 143 125.5t205 44.5q198 0 298-95.5T1092 715V0H926z"/><glyph unicode="o" horiz-adv-x="1237" d="M1122 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319z"/><glyph unicode="p" horiz-adv-x="1255" d="M686-20q-107 0-195.5 39.5T342 141h-12q12-96 12-182v-451H176v1588h135l23-150h8q64 90 149 130t195 40q218 0 336.5-149T1141 549q0-270-120.5-419.5T686-20zm-24 995q-168 0-243-93t-77-296v-37q0-231 77-330.5T666 119q142 0 222.5 115T969 551q0 205-80.5 314.5T662 975z"/><glyph unicode="q" horiz-adv-x="1255" d="M590 119q166 0 242 89t81 300v37q0 230-78 331T588 977q-146 0-223.5-113.5T287 543t76.5-315.5T590 119zM565-20q-212 0-331 149T115 545q0 269 120 420t334 151q225 0 346-170h9l24 150h131V-492H913v469q0 100 11 170h-13Q796-20 565-20z"/><glyph unicode="r" horiz-adv-x="836" d="M676 1116q73 0 131-12l-23-154q-68 15-120 15-133 0-227.5-108T342 588V0H176v1096h137l19-203h8q61 107 147 165t189 58z"/><glyph unicode="s" horiz-adv-x="977" d="M883 299q0-153-114-236T449-20q-218 0-340 69v154q79-40 169.5-63T453 117q130 0 200 41.5T723 285q0 64-55.5 109.5T451 502q-153 57-217.5 99.5t-96 96.5T106 827q0 134 109 211.5t299 77.5q177 0 346-72l-59-135q-165 68-299 68-118 0-178-37t-60-102q0-44 22.5-75t72.5-59 192-81q195-71 263.5-143T883 299z"/><glyph unicode="t" horiz-adv-x="723" d="M530 117q44 0 85 6.5t65 13.5V10q-27-13-79.5-21.5T506-20q-318 0-318 335v652H31v80l157 69 70 234h96v-254h318V967H354V322q0-99 47-152t129-53z"/><glyph unicode="u" horiz-adv-x="1257" d="M332 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168z"/><glyph unicode="v" horiz-adv-x="1026" d="M416 0L0 1096h178l236-650q80-228 94-296h8q11 53 69.5 219.5T848 1096h178L610 0H416z"/><glyph unicode="w" horiz-adv-x="1593" d="M1071 0L870 643q-19 59-71 268h-8q-40-175-70-270L514 0H322L23 1096h174q106-413 161.5-629T422 176h8q11 57 35.5 147.5T508 467l201 629h180l196-629q56-172 76-289h8q4 36 21.5 111t208.5 807h172L1268 0h-197z"/><glyph unicode="x" horiz-adv-x="1073" d="M440 561L59 1096h189l289-420 288 420h187L631 561 1032 0H844L537 444 227 0H39z"/><glyph unicode="y" horiz-adv-x="1032" d="M2 1096h178l240-625q79-214 98-309h8q13 51 54.5 174.5T852 1096h178L559-152q-70-185-163.5-262.5T166-492q-76 0-150 17v133q55-12 123-12 171 0 244 192L444-6z"/><glyph unicode="z" horiz-adv-x="958" d="M877 0H82v113l598 854H119v129h743V967L272 129h605V0z"/><glyph unicode="{" horiz-adv-x="776" d="M475 12q0-102 58.5-148T705-184v-140q-190 2-294 87T307 2v303q0 104-63 148.5T61 498v141q130 2 188 48t58 142v306q0 155 108 241t290 86v-139q-230-6-230-199V829q0-215-223-254v-12q223-39 223-254V12z"/><glyph unicode="|" horiz-adv-x="1128" d="M494 1556h141V-496H494v2052z"/><glyph unicode="}" horiz-adv-x="776" d="M522 575q-223 39-223 254v295q0 193-227 199v139q184 0 289.5-87T467 1135V829q0-97 59-142.5T715 639V498q-122 0-185-44.5T467 305V2q0-153-102.5-238.5T72-324v140q111 2 169 48t58 148v297q0 114 55 174t168 80v12z"/><glyph unicode="~" d="M338 713q-53 0-116.5-33.5T104 592v151q100 109 244 109 68 0 124.5-14T618 786q66-28 115-41.5t96-13.5q54 0 118 32t118 89V702Q963 592 821 592q-72 0-135 16.5T551 657q-75 32-120 44t-93 12z"/><glyph unicode="¡" horiz-adv-x="547" d="M219 684h105l51-1057H168zm174 299q0-135-121-135-60 0-90 35.5T152 983q0 63 31.5 99t88.5 36q51 0 86-32t35-103z"/><glyph unicode="¢" d="M971 240q-105-54-252-60V-20H586v206q-203 32-299.5 168.5T190 741q0 508 396 570v172h135v-164q75-3 146-19.5t120-39.5l-49-140q-133 51-242 51-172 0-253-105.5T362 743q0-212 79.5-313.5T688 328q141 0 283 59V240z"/><glyph unicode="£" d="M682 1481q190 0 360-84l-61-133q-154 77-297 77-123 0-185.5-62T436 1077V782h422V655H436V434q0-100-32.5-168T297 154h795V0H63v141q205 47 205 291v223H70v127h198v316q0 178 112 280.5T682 1481z"/><glyph unicode="¤" d="M184 723q0 122 74 229l-135 140 94 92 135-133q104 73 234 73 127 0 229-73l137 133 95-92-134-138q74-113 74-231 0-131-74-234l131-135-92-92-137 133q-102-71-229-71-134 0-234 73L217 264l-92 92 133 136q-74 107-74 231zm129 0q0-112 78.5-192T586 451t195 79.5T860 723q0 114-80 195t-194 81q-116 0-194.5-82T313 723z"/><glyph unicode="¥" d="M584 735l379 727h174L721 692h262V565H666V395h317V268H666V0H502v268H186v127h316v170H186v127h256L31 1462h178z"/><glyph unicode="¦" horiz-adv-x="1128" d="M494 1556h141V780H494v776zm0-1275h141v-777H494v777z"/><glyph unicode="§" horiz-adv-x="1057" d="M139 809q0 86 43 154.5T303 1069q-74 40-116 95.5T145 1305q0 121 103.5 190.5T549 1565q94 0 173.5-14.5T899 1497l-53-131q-98 39-165.5 52.5T537 1432q-116 0-174-29.5t-58-93.5q0-60 61.5-102t215.5-97q186-68 261-143.5T918 784q0-90-41-160.5T762 512q153-81 153-227 0-140-117-216.5T469-8Q251-8 123 57v148q78-37 175-59.5T477 123q134 0 204.5 38T752 270q0 46-24 75t-78 58-169 72q-142 52-209 97T172 674t-33 135zm146 20q0-77 66-129.5T584 586l49-19q137 80 137 191 0 83-73.5 139T438 1010q-68-19-110.5-69T285 829z"/><glyph unicode="¨" horiz-adv-x="1182" d="M309 1393q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T399 1294q-37 0-63.5 24.5T309 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T780 1294t-63.5 24.5T690 1393z"/><glyph unicode="©" horiz-adv-x="1704" d="M893 1059q-125 0-192.5-87T633 731q0-168 63.5-249T891 401q86 0 211 45V322q-48-20-98.5-34T883 274q-194 0-298 120.5T481 731q0 209 110.5 332T893 1186q128 0 246-60l-58-118q-108 51-188 51zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm105 0q0-173 87-323.5t237.5-237T852 84q174 0 323 87t236.5 235.5T1499 731q0 174-87 323t-235.5 236.5T852 1378q-174 0-323-87t-236.5-235.5T205 731z"/><glyph unicode="ª" horiz-adv-x="725" d="M532 801l-24 84q-92-97-232-97-95 0-150.5 49.5T70 989t77 154.5 242 58.5l117 4v39q0 133-148 133-100 0-204-51l-43 96q114 56 247 56 130 0 198.5-52.5T625 1253V801h-93zM193 989q0-100 112-100 201 0 201 180v49l-98-4q-112-4-163.5-32.5T193 989z"/><glyph unicode="«" horiz-adv-x="1018" d="M82 551l342 407 119-69-289-350 289-351-119-71L82 524v27zm395 0l344 407 117-69-287-350 287-351-117-71-344 407v27z"/><glyph unicode="¬" d="M1065 791V264H928v389H104v138h961z"/><glyph unicode="­" horiz-adv-x="659" d="M84 473zm0 0v152h491V473H84z"/><glyph unicode="®" horiz-adv-x="1704" d="M723 762h108q80 0 128.5 41.5T1008 909q0 75-43 107.5T829 1049H723V762zm434 151q0-80-42.5-141.5T995 680l238-395h-168L858 639H723V285H575v891h261q166 0 243.5-65t77.5-198zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm105 0q0-173 87-323.5t237.5-237T852 84q174 0 323 87t236.5 235.5T1499 731q0 174-87 323t-235.5 236.5T852 1378q-174 0-323-87t-236.5-235.5T205 731z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v127h1036v-127z"/><glyph unicode="°" horiz-adv-x="877" d="M127 1171q0 130 90.5 221t220.5 91 221-90.5 91-221.5q0-84-41-155.5T595 902t-157-42q-130 0-220.5 90T127 1171zm115 0q0-82 58.5-139T440 975q80 0 137.5 56.5T635 1171q0 84-56.5 140.5T440 1368q-83 0-140.5-57T242 1171z"/><glyph unicode="±" d="M104 1zm549 790h412V653H653V227H514v426H104v138h410v428h139V791zM104 1v138h961V1H104z"/><glyph unicode="²" horiz-adv-x="711" d="M653 586H49v104l236 230q89 86 130 134.5t57.5 86.5 16.5 92q0 68-40 102.5T346 1370q-52 0-101-19t-118-69l-66 88q131 111 283 111 132 0 205.5-65t73.5-177q0-80-44.5-155.5T387 870L213 705h440V586z"/><glyph unicode="³" horiz-adv-x="711" d="M627 1255q0-80-41-131.5T477 1049q176-47 176-209 0-128-92-199.5T301 569q-152 0-268 56v123q147-68 270-68 211 0 211 162 0 145-231 145H166v107h119q103 0 152.5 39.5T487 1241q0 61-40 95t-107 34q-66 0-122-21.5T106 1292l-69 90q63 45 133 72t164 27q136 0 214.5-59.5T627 1255z"/><glyph unicode="´" horiz-adv-x="1182" d="M393 1266q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H393v25z"/><glyph unicode="µ" horiz-adv-x="1268" d="M342 381q0-262 254-262 171 0 250.5 94.5T926 520v576h166V0H956l-26 147h-10Q809-20 580-20q-150 0-238 92h-10q10-84 10-244v-320H176v1588h166V381z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1120-260h-114v1712H793V-260H678v819q-62-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h557V-260z"/><glyph unicode="·" horiz-adv-x="545" d="M152 723q0 66 31 100.5t87 34.5q58 0 90.5-34.5T393 723q0-65-33-100t-90-35q-51 0-84.5 31.5T152 723z"/><glyph unicode="¸" horiz-adv-x="465" d="M436-289q0-97-76.5-150T133-492q-51 0-96 9v106q45-8 104-8 79 0 119.5 20t40.5 74q0 43-39.5 69.5T113-178L201 0h110l-55-115q180-39 180-174z"/><glyph unicode="¹" horiz-adv-x="711" d="M338 1462h143V586H348v579q0 91 6 181-22-22-49-44.5T143 1184l-67 96z"/><glyph unicode="º" horiz-adv-x="768" d="M702 1135q0-164-85.5-255.5T381 788q-146 0-230.5 93T66 1135q0 163 84 253.5t235 90.5q152 0 234.5-91t82.5-253zm-514 0q0-122 45.5-183T383 891q105 0 151 61t46 183q0 123-46 182t-151 59q-103 0-149-59t-46-182z"/><glyph unicode="»" horiz-adv-x="1018" d="M936 524L592 117l-117 71 287 351-287 350 117 69 344-407v-27zm-395 0L197 117 80 188l287 351L80 889l117 69 344-407v-27z"/><glyph unicode="¼" horiz-adv-x="1597" d="M75 0zm1223 1462L395 0H252l903 1462h143zm-961 0h143V586H347v579q0 91 6 181-22-22-49-44.5T142 1184l-67 96zM1489 203h-125V1h-145v202H817v101l408 579h139V320h125V203zm-270 117v195q0 134 6 209-5-12-17-31.5t-27-42l-30-45-26-39.5-168-246h262z"/><glyph unicode="½" horiz-adv-x="1597" d="M46 0zm1184 1462L327 0H184l903 1462h143zm-922 0h143V586H318v579q0 91 6 181-22-22-49-44.5T113 1184l-67 96zM1499 1H895v104l236 230q89 86 130 134.5t57.5 86.5 16.5 92q0 68-40 102.5T1192 785q-52 0-101-19t-118-69l-66 88q131 111 283 111 132 0 205.5-65t73.5-177q0-80-44.5-155.5T1233 285l-174-165h440V1z"/><glyph unicode="¾" horiz-adv-x="1597" d="M26 0zm594 1255q0-80-41-131.5T470 1049q176-47 176-209 0-128-92-199.5T294 569q-152 0-268 56v123q147-68 270-68 211 0 211 162 0 145-231 145H159v107h119q103 0 152.5 39.5T480 1241q0 61-40 95t-107 34q-66 0-122-21.5T99 1292l-69 90q63 45 133 72t164 27q136 0 214.5-59.5T620 1255zm770 207L487 0H344l903 1462h143zm179-1259h-125V1h-145v202H897v101l408 579h139V320h125V203zm-270 117v195q0 134 6 209-5-12-17-31.5t-27-42l-30-45-26-39.5-168-246h262z"/><glyph unicode="¿" horiz-adv-x="879" d="M590 684v-51q0-122-37.5-196T418 279Q297 173 266.5 135.5t-43-76T211-35q0-100 66-156.5T465-248q80 0 155 19t173 67l59-135q-197-96-395-96-190 0-298 93T51-37q0 70 17.5 122.5t49.5 97 76.5 85.5 98.5 88q101 88 133.5 146T459 653v31h131zm49 299q0-135-121-135-59 0-90 34.5T397 983q0 64 33 99.5t88 35.5q51 0 86-32t35-103z"/><glyph unicode="À" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-161 961H614q-65 52-154 148t-129 159v21h203q32-69 89-159.5T724 1604v-25z"/><glyph unicode="Á" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-359 986q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H526v25z"/><glyph unicode="Â" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-582 984q127 136 178 200t74 105h166q22-42 76.5-108.5T977 1602v-23H858q-88 55-221 186-136-134-219-186H303v23z"/><glyph unicode="Ã" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-93 963q-43 0-84 18.5t-80.5 41-76 41T481 1700q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T487 1837q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T792 1581z"/><glyph unicode="Ä" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zM364 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T454 1632q-37 0-63.5 24.5T364 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T835 1632t-63.5 24.5T745 1731z"/><glyph unicode="Å" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-15 969q0-98-61.5-157.5T645 1370q-101 0-161 58.5T424 1585t60.5 155.5T645 1798q101 0 163-59.5t62-151.5zm-108-2q0 56-33 86.5t-84 30.5-84-30.5-33-86.5 30-86.5 87-30.5q52 0 84.5 30.5T762 1585z"/><glyph unicode="Æ" horiz-adv-x="1788" d="M1665 0H915v465H401L174 0H-2l698 1462h969v-151h-580V840h541V690h-541V152h580V0zM469 618h446v693H797z"/><glyph unicode="Ç" horiz-adv-x="1292" d="M125 0zm702 1331q-241 0-380.5-160.5T307 731q0-287 134.5-443.5T825 131q153 0 349 55V37q-152-57-375-57-323 0-498.5 196T125 733q0 226 84.5 396t244 262 375.5 92q230 0 402-84l-72-146q-166 78-332 78zM950-289q0-97-76.5-150T647-492q-51 0-96 9v106q45-8 104-8 79 0 119.5 20t40.5 74q0 43-39.5 69.5T627-178L715 0h110l-55-115q180-39 180-174z"/><glyph unicode="È" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM713 1579H603q-65 52-154 148t-129 159v21h203q32-69 89-159.5T713 1604v-25z"/><glyph unicode="É" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM456 1604q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H456v25z"/><glyph unicode="Ê" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM263 1602q127 136 178 200t74 105h166q22-42 76.5-108.5T937 1602v-23H818q-88 55-221 186-136-134-219-186H263v23z"/><glyph unicode="Ë" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM327 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T417 1632q-37 0-63.5 24.5T327 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T798 1632t-63.5 24.5T708 1731z"/><glyph unicode="Ì" horiz-adv-x="571" d="M5 0zm196 0v1462h170V0H201zm197 1579H288q-65 52-154 148T5 1886v21h203q32-69 89-159.5T398 1604v-25z"/><glyph unicode="Í" horiz-adv-x="571" d="M179 0zm22 0v1462h170V0H201zm-22 1604q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H179v25z"/><glyph unicode="Î" horiz-adv-x="571" d="M0 0zm201 0v1462h170V0H201zM-57 1602q127 136 178 200t74 105h166q22-42 76.5-108.5T617 1602v-23H498q-88 55-221 186-136-134-219-186H-57v23z"/><glyph unicode="Ï" horiz-adv-x="571" d="M5 0zm196 0v1462h170V0H201zM5 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T95 1632q-37 0-63.5 24.5T5 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T476 1632t-63.5 24.5T386 1731z"/><glyph unicode="Ð" horiz-adv-x="1479" d="M1352 745q0-362-196.5-553.5T590 0H201v649H47v150h154v663h434q337 0 527-187.5T1352 745zm-181-6q0 576-569 576H371V799h379V649H371V147h190q610 0 610 592z"/><glyph unicode="Ñ" horiz-adv-x="1544" d="M201 0zm1142 0h-194L350 1227h-8q16-216 16-396V0H201v1462h192l797-1222h8q-2 27-9 173.5t-5 209.5v839h159V0zM935 1581q-43 0-84 18.5t-80.5 41-76 41T624 1700q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T630 1837q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T935 1581z"/><glyph unicode="Ò" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm602 846H797q-65 52-154 148t-129 159v21h203q32-69 89-159.5T907 1604v-25z"/><glyph unicode="Ó" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm354 871q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H659v25z"/><glyph unicode="Ô" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm143 869q127 136 178 200t74 105h166q22-42 76.5-108.5T1122 1602v-23h-119q-88 55-221 186-136-134-219-186H448v23z"/><glyph unicode="Õ" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm637 848q-43 0-84 18.5t-80.5 41-76 41T631 1700q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T637 1837q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T942 1581z"/><glyph unicode="Ö" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm217 998q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T612 1632q-37 0-63.5 24.5T522 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T993 1632t-63.5 24.5T903 1731z"/><glyph unicode="×" d="M940 1176l96-99-352-354 350-352-96-99-354 351-348-351-101 99 350 352-352 352 100 101 353-355z"/><glyph unicode="Ø" horiz-adv-x="1595" d="M1470 733q0-351-177.5-552T799-20Q564-20 416 80L315-61 195 18l108 154Q125 370 125 735q0 357 176 553.5T801 1485q209 0 366-94l97 135 120-80-106-148q192-202 192-565zm-180 0q0 272-110 426L508 211q115-82 291-82 243 0 367 153t124 451zm-985 0q0-262 101-416l669 943q-106 73-274 73-243 0-369.5-153.5T305 733z"/><glyph unicode="Ù" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-449 117H746q-65 52-154 148t-129 159v21h203q32-69 89-159.5T856 1604v-25z"/><glyph unicode="Ú" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-705 142q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H600v25z"/><glyph unicode="Û" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-912 140q127 136 178 200t74 105h166q22-42 76.5-108.5T1067 1602v-23H948q-88 55-221 186-136-134-219-186H393v23z"/><glyph unicode="Ü" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-844 269q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T551 1632q-37 0-63.5 24.5T461 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T932 1632t-63.5 24.5T842 1731z"/><glyph unicode="Ý" horiz-adv-x="1147" d="M0 0zm573 731l390 731h184L659 567V0H487v559L0 1462h186zm-131 873q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H442v25z"/><glyph unicode="Þ" horiz-adv-x="1251" d="M1145 784q0-227-151.5-346T555 319H371V0H201v1462h170v-256h215q281 0 420-103.5T1145 784zM371 465h168q226 0 327 71.5T967 772q0 149-95 218t-297 69H371V465z"/><glyph unicode="ß" horiz-adv-x="1274" d="M1049 1266q0-135-143-250-88-70-116-103.5T762 846q0-32 13.5-53t49-49.5T938 664q140-95 191-173.5t51-179.5q0-160-97-245.5T807-20q-188 0-295 69v154q63-39 141-62.5T803 117q215 0 215 182 0 75-41.5 128.5T825 551q-127 82-175 143.5T602 840q0 63 34.5 116T742 1062q75 57 107 102t32 98q0 80-68 122.5T618 1427q-276 0-276-223V0H176v1202q0 178 110 271.5t332 93.5q206 0 318.5-78.5T1049 1266z"/><glyph unicode="à" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm197 1124H562q-65 52-154 148t-129 159v21h203q32-69 89-159.5T672 1266v-25z"/><glyph unicode="á" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm-39 1149q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H436v25z"/><glyph unicode="â" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zM228 1264q127 136 178 200t74 105h166q22-42 76.5-108.5T902 1264v-23H783q-88 55-221 186-136-134-219-186H228v23z"/><glyph unicode="ã" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm246 1126q-43 0-84 18.5t-80.5 41-76 41T410 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T416 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T721 1243z"/><glyph unicode="ä" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zM279 1393q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T369 1294q-37 0-63.5 24.5T279 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T750 1294t-63.5 24.5T660 1393z"/><glyph unicode="å" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm329 1341q0-98-61.5-157.5T579 1241q-101 0-161 58.5T358 1456t60.5 155.5T579 1669q101 0 163-59.5t62-151.5zm-108-2q0 56-33 86.5t-84 30.5-84-30.5-33-86.5 30-86.5 87-30.5q52 0 84.5 30.5T696 1456z"/><glyph unicode="æ" horiz-adv-x="1757" d="M94 303q0 161 124 250.5T596 651l184 6v68q0 129-58 190.5T545 977q-144 0-307-84l-52 127q74 41 173.5 67.5T557 1114q130 0 212.5-43.5T893 932q53 88 138.5 136t195.5 48q192 0 308-133.5T1651 627V520H950q8-395 322-395 91 0 169.5 17.5T1604 199V51q-86-38-160.5-54.5T1268-20q-289 0-414 233Q773 86 674.5 33T442-20q-163 0-255.5 85T94 303zm174-2q0-95 53.5-139.5T463 117q145 0 229 84.5T776 440v99l-158-7q-186-8-268-62.5T268 301zm957 676q-121 0-190.5-83T954 653h519q0 156-64 240t-184 84z"/><glyph unicode="ç" horiz-adv-x="975" d="M115 0zm499-20q-238 0-368.5 146.5T115 541q0 275 132.5 425T625 1116q79 0 158-17t124-40l-51-141q-55 22-120 36.5T621 969q-334 0-334-426 0-202 81.5-310T610 125q137 0 281 59V37Q781-20 614-20zm148-269q0-97-76.5-150T459-492q-51 0-96 9v106q45-8 104-8 79 0 119.5 20t40.5 74q0 43-39.5 69.5T439-178L527 0h110l-55-115q180-39 180-174z"/><glyph unicode="è" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm117 264H601q-65 52-154 148t-129 159v21h203q32-69 89-159.5T711 1266v-25z"/><glyph unicode="é" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm-123 289q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H471v25z"/><glyph unicode="ê" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm-335 287q127 136 178 200t74 105h166q22-42 76.5-108.5T933 1264v-23H814q-88 55-221 186-136-134-219-186H259v23z"/><glyph unicode="ë" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm-275 416q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T409 1294q-37 0-63.5 24.5T319 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T790 1294t-63.5 24.5T700 1393z"/><glyph unicode="ì" horiz-adv-x="518" d="M0 0zm342 0H176v1096h166V0zm13 1241H245q-65 52-154 148t-129 159v21h203q32-69 89-159.5T355 1266v-25z"/><glyph unicode="í" horiz-adv-x="518" d="M169 0zm173 0H176v1096h166V0zM169 1266q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H169v25z"/><glyph unicode="î" horiz-adv-x="518" d="M0 0zm342 0H176v1096h166V0zM-77 1264q127 136 178 200t74 105h166q22-42 76.5-108.5T597 1264v-23H478q-88 55-221 186-136-134-219-186H-77v23z"/><glyph unicode="ï" horiz-adv-x="518" d="M0 0zm342 0H176v1096h166V0zM-20 1393q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T70 1294q-37 0-63.5 24.5T-20 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T451 1294t-63.5 24.5T361 1393z"/><glyph unicode="ð" horiz-adv-x="1221" d="M1122 563q0-281-130.5-432T614-20q-222 0-361.5 134.5T113 475q0 230 131.5 361T596 967q226 0 326-121l8 4q-57 214-262 405l-271-155-73 108 233 133q-92 62-186 111l69 117q156-73 258-148l238 138 76-107-207-119q152-143 234.5-342t82.5-428zm-168-51q0 147-90 232t-246 85q-337 0-337-360 0-167 87.5-258.5T618 119q175 0 255.5 100.5T954 512z"/><glyph unicode="ñ" horiz-adv-x="1257" d="M176 0zm750 0v709q0 134-61 200t-191 66q-172 0-252-93t-80-307V0H176v1096h135l27-150h8q51 81 143 125.5t205 44.5q198 0 298-95.5T1092 715V0H926zM802 1243q-43 0-84 18.5t-80.5 41-76 41T491 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T497 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T802 1243z"/><glyph unicode="ò" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm455 692H632q-65 52-154 148t-129 159v21h203q32-69 89-159.5T742 1266v-25z"/><glyph unicode="ó" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm192 717q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H479v25z"/><glyph unicode="ô" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm-5 715q127 136 178 200t74 105h166q22-42 76.5-108.5T956 1264v-23H837q-88 55-221 186-136-134-219-186H282v23z"/><glyph unicode="õ" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm486 694q-43 0-84 18.5t-80.5 41-76 41T462 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T468 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T773 1243z"/><glyph unicode="ö" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm49 844q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T426 1294q-37 0-63.5 24.5T336 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T807 1294t-63.5 24.5T717 1393z"/><glyph unicode="÷" d="M104 653v138h961V653H104zm367-280q0 60 29.5 90.5T584 494q52 0 81-31.5t29-89.5q0-57-29.5-89T584 252q-52 0-82.5 31.5T471 373zm0 698q0 60 29.5 90.5T584 1192q52 0 81-31.5t29-89.5q0-57-29.5-89T584 950q-52 0-82.5 31.5T471 1071z"/><glyph unicode="ø" horiz-adv-x="1237" d="M1122 549q0-268-135-418.5T614-20q-154 0-266 69L264-68 150 10l94 131Q115 293 115 549q0 268 134 417.5T621 1116q154 0 270-76l84 119 117-76-97-133q127-152 127-401zm-835 0q0-171 53-273l465 646q-75 53-189 53-163 0-246-107t-83-319zm663 0q0 164-51 264L434 170q71-51 184-51 163 0 247.5 109.5T950 549z"/><glyph unicode="ù" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm394 145H616q-65 52-154 148t-129 159v21h203q32-69 89-159.5T726 1266v-25z"/><glyph unicode="ú" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm174 170q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H506v25z"/><glyph unicode="û" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm-46 168q127 136 178 200t74 105h166q22-42 76.5-108.5T960 1264v-23H841q-88 55-221 186-136-134-219-186H286v23z"/><glyph unicode="ü" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm10 297q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T432 1294q-37 0-63.5 24.5T342 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T813 1294t-63.5 24.5T723 1393z"/><glyph unicode="ý" horiz-adv-x="1032" d="M2 0zm0 1096h178l240-625q79-214 98-309h8q13 51 54.5 174.5T852 1096h178L559-152q-70-185-163.5-262.5T166-492q-76 0-150 17v133q55-12 123-12 171 0 244 192L444-6zm409 170q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H411v25z"/><glyph unicode="þ" horiz-adv-x="1255" d="M344 948q66 89 151 128.5t191 39.5q215 0 335-150t120-417q0-268-120.5-418.5T686-20q-222 0-344 161h-12l4-34q8-77 8-140v-459H176v2048h166v-466q0-52-6-142h8zm320 27q-168 0-244-92t-78-293v-41q0-231 77-330.5T666 119q303 0 303 432 0 215-74 319.5T664 975z"/><glyph unicode="ÿ" horiz-adv-x="1032" d="M2 0zm0 1096h178l240-625q79-214 98-309h8q13 51 54.5 174.5T852 1096h178L559-152q-70-185-163.5-262.5T166-492q-76 0-150 17v133q55-12 123-12 171 0 244 192L444-6zm232 297q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T324 1294q-37 0-63.5 24.5T234 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T705 1294t-63.5 24.5T615 1393z"/><glyph unicode="ı" horiz-adv-x="518" d="M342 0H176v1096h166V0z"/><glyph unicode="Œ" horiz-adv-x="1890" d="M1767 0H999Q897-20 805-20q-327 0-503.5 196.5T125 735q0 360 174 555t494 195q102 0 192-23h782v-151h-589V840h551V690h-551V152h589V0zM811 1333q-249 0-377.5-152.5T305 733q0-297 128.5-450.5T809 129q112 0 199 33v1141q-87 30-197 30z"/><glyph unicode="œ" horiz-adv-x="1929" d="M1430-20q-293 0-418 235Q950 99 845.5 39.5T604-20q-223 0-357 152.5T113 549q0 265 131 415t366 150q131 0 233.5-59.5T1008 881q58 112 154 172.5t222 60.5q201 0 320-132.5T1823 623V518h-729q8-393 338-393 94 0 174.5 17.5T1774 199V51q-88-39-164-55t-180-16zM287 549q0-211 76-320.5T606 119q163 0 239.5 106.5T922 541q0 221-77.5 327.5T602 975q-166 0-240.5-108T287 549zm1095 426q-127 0-199.5-82T1098 653h544q0 158-66 240t-194 82z"/><glyph unicode="Ÿ" horiz-adv-x="1147" d="M0 0zm573 731l390 731h184L659 567V0H487v559L0 1462h186zM294 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T384 1632q-37 0-63.5 24.5T294 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T765 1632t-63.5 24.5T675 1731z"/><glyph unicode="ˆ" horiz-adv-x="1212" d="M268 1264q127 136 178 200t74 105h166q22-42 76.5-108.5T942 1264v-23H823q-88 55-221 186-136-134-219-186H268v23z"/><glyph unicode="˚" horiz-adv-x="1182" d="M813 1458q0-98-61.5-157.5T588 1241q-101 0-161 58.5T367 1456t60.5 155.5T588 1669q101 0 163-59.5t62-151.5zm-108-2q0 56-33 86.5t-84 30.5-84-30.5-33-86.5 30-86.5 87-30.5q52 0 84.5 30.5T705 1456z"/><glyph unicode="˜" horiz-adv-x="1212" d="M788 1243q-43 0-84 18.5t-80.5 41-76 41T477 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T483 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T788 1243z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="‐" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="‑" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="‒" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 473v152h860V473H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 473v152h1884V473H82z"/><glyph unicode="‘" horiz-adv-x="348" d="M37 961l-12 22q22 90 71 224t105 255h123q-66-254-103-501H37z"/><glyph unicode="’" horiz-adv-x="348" d="M309 1462l15-22q-26-100-75-232.5T147 961H25q70 285 102 501h182z"/><glyph unicode="‚" horiz-adv-x="502" d="M63 0zm287 238l15-23q-26-100-75-232.5T188-264H63Q90-160 122.5-7T168 238h182z"/><glyph unicode="“" horiz-adv-x="717" d="M406 961l-15 22q56 215 178 479h123q-30-115-59.5-259.5T590 961H406zm-369 0l-12 22q22 90 71 224t105 255h123q-66-254-103-501H37z"/><glyph unicode="”" horiz-adv-x="717" d="M309 1462l15-22q-26-100-75-232.5T147 961H25q70 285 102 501h182zm369 0l14-22q-24-91-72-224T516 961H391q26 100 59 254t46 247h182z"/><glyph unicode="„" horiz-adv-x="829" d="M25 0zm284 238l15-22q-26-100-75-232.5T147-263H25Q95 22 127 238h182zm369 0l14-22q-24-91-72-224T516-263H391q26 100 59 254t46 247h182z"/><glyph unicode="•" horiz-adv-x="770" d="M164 748q0 121 56.5 184T385 995q105 0 163-62t58-185q0-119-57.5-183.5T385 500q-107 0-164 65.5T164 748z"/><glyph unicode="…" horiz-adv-x="1606" d="M152 0zm0 106q0 67 30.5 101.5T270 242q58 0 90.5-34.5T393 106q0-65-33-100t-90-35q-51 0-84.5 31.5T152 106zm530 0q0 67 30.5 101.5T800 242q58 0 90.5-34.5T923 106q0-65-33-100t-90-35q-51 0-84.5 31.5T682 106zm531 0q0 67 30.5 101.5T1331 242q58 0 90.5-34.5T1454 106q0-65-33-100t-90-35q-51 0-84.5 31.5T1213 106z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="623" d="M82 551l342 407 119-69-289-350 289-351-119-71L82 524v27z"/><glyph unicode="›" horiz-adv-x="623" d="M541 524L197 117 80 188l287 351L80 889l117 69 344-407v-27z"/><glyph unicode="⁄" horiz-adv-x="266" d="M655 1462L-248 0h-143l903 1462h143z"/><glyph horiz-adv-x="476"/><glyph unicode="⁴" horiz-adv-x="711" d="M692 788H567V586H422v202H20v101l408 579h139V905h125V788zM422 905v195q0 134 6 209-5-12-17-31.5t-27-42l-30-45-26-39.5-168-246h262z"/><glyph unicode="€" horiz-adv-x="1208" d="M795 1333q-319 0-398-403h510V801H383l-2-57v-64l2-45h463V506H399q37-180 138.5-278.5T809 129q156 0 309 66V45Q972-20 801-20q-237 0-381.5 134.5T229 506H63v129h152l-2 42v44l2 80H63v129h164q39 261 185 407t383 146q201 0 366-97l-71-139q-166 86-295 86z"/><glyph unicode="™" horiz-adv-x="1589" d="M369 741H246v615H37v106h543v-106H369V741zm600 0l-201 559h-8l6-129V741H647v721h187l196-559 203 559h180V741h-127v420l6 137h-8l-211-557H969z"/><glyph unicode="−" d="M104 653v138h961V653H104z"/><glyph unicode="" horiz-adv-x="1095" d="M0 1095h1095V0H0v1095z"/><glyph horiz-adv-x="1255" d="M0 0z"/><hkern u1="&amp;quot;" u2="Ÿ" k="-20"/><hkern u1="&amp;quot;" u2="œ" k="123"/><hkern u1="&amp;quot;" u2="ü" k="61"/><hkern u1="&amp;quot;" u2="û" k="61"/><hkern u1="&amp;quot;" u2="ú" k="61"/><hkern u1="&amp;quot;" u2="ù" k="61"/><hkern u1="&amp;quot;" u2="ø" k="123"/><hkern u1="&amp;quot;" u2="ö" k="123"/><hkern u1="&amp;quot;" u2="õ" k="123"/><hkern u1="&amp;quot;" u2="ô" k="123"/><hkern u1="&amp;quot;" u2="ó" k="123"/><hkern u1="&amp;quot;" u2="ò" k="123"/><hkern u1="&amp;quot;" u2="ë" k="123"/><hkern u1="&amp;quot;" u2="ê" k="123"/><hkern u1="&amp;quot;" u2="é" k="123"/><hkern u1="&amp;quot;" u2="è" k="123"/><hkern u1="&amp;quot;" u2="ç" k="123"/><hkern u1="&amp;quot;" u2="æ" k="82"/><hkern u1="&amp;quot;" u2="å" k="82"/><hkern u1="&amp;quot;" u2="ä" k="82"/><hkern u1="&amp;quot;" u2="ã" k="82"/><hkern u1="&amp;quot;" u2="â" k="82"/><hkern u1="&amp;quot;" u2="á" k="82"/><hkern u1="&amp;quot;" u2="à" k="123"/><hkern u1="&amp;quot;" u2="Ý" k="-20"/><hkern u1="&amp;quot;" u2="Å" k="143"/><hkern u1="&amp;quot;" u2="Ä" k="143"/><hkern u1="&amp;quot;" u2="Ã" k="143"/><hkern u1="&amp;quot;" u2="Â" k="143"/><hkern u1="&amp;quot;" u2="Á" k="143"/><hkern u1="&amp;quot;" u2="À" k="143"/><hkern u1="&amp;quot;" u2="u" k="61"/><hkern u1="&amp;quot;" u2="s" k="61"/><hkern u1="&amp;quot;" u2="r" k="61"/><hkern u1="&amp;quot;" u2="q" k="123"/><hkern u1="&amp;quot;" u2="p" k="61"/><hkern u1="&amp;quot;" u2="o" k="123"/><hkern u1="&amp;quot;" u2="n" k="61"/><hkern u1="&amp;quot;" u2="m" k="61"/><hkern u1="&amp;quot;" u2="g" k="61"/><hkern u1="&amp;quot;" u2="e" k="123"/><hkern u1="&amp;quot;" u2="d" k="123"/><hkern u1="&amp;quot;" u2="c" k="123"/><hkern u1="&amp;quot;" u2="a" k="82"/><hkern u1="&amp;quot;" u2="Y" k="-20"/><hkern u1="&amp;quot;" u2="W" k="-41"/><hkern u1="&amp;quot;" u2="V" k="-41"/><hkern u1="&amp;quot;" u2="T" k="-41"/><hkern u1="&amp;quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="œ" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="å" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à" k="123"/><hkern u1="'" u2="Ý" k="-20"/><hkern u1="'" u2="Å" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Á" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Œ" k="102"/><hkern u1="," u2="Ý" k="123"/><hkern u1="," u2="Ü" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ò" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Œ" k="102"/><hkern u1="." u2="Ý" k="123"/><hkern u1="." u2="Ü" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ò" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="”" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Œ" k="41"/><hkern u1="A" u2="Ý" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ò" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&amp;quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ý" k="20"/><hkern u1="B" u2="Å" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Á" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Œ" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ò" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ý" k="20"/><hkern u1="D" u2="Å" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Á" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Å" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Á" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Œ" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ò" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="”" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Œ" k="41"/><hkern u1="L" u2="Ý" k="61"/><hkern u1="L" u2="Ü" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ò" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&amp;quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ý" k="20"/><hkern u1="O" u2="Å" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Á" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Å" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Á" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ý" k="20"/><hkern u1="Q" u2="Å" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Á" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="œ" k="143"/><hkern u1="T" u2="Œ" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="å" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à" k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ò" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Å" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Á" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Å" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Á" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="œ" k="41"/><hkern u1="V" u2="Œ" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="å" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à" k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ò" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Å" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Á" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="œ" k="41"/><hkern u1="W" u2="Œ" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="å" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à" k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ò" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Å" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Á" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Œ" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ò" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="œ" k="102"/><hkern u1="Y" u2="Œ" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="å" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à" k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ò" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Å" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Á" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Œ" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ò" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="”" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&amp;quot;" k="20"/><hkern u1="b" u2="”" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&amp;quot;" k="20"/><hkern u1="c" u2="”" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&amp;quot;" k="-41"/><hkern u1="e" u2="”" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&amp;quot;" k="20"/><hkern u1="f" u2="”" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&amp;quot;" k="-123"/><hkern u1="h" u2="”" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&amp;quot;" k="20"/><hkern u1="k" u2="œ" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à" k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="”" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&amp;quot;" k="20"/><hkern u1="n" u2="”" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&amp;quot;" k="20"/><hkern u1="o" u2="”" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&amp;quot;" k="20"/><hkern u1="p" u2="”" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&amp;quot;" k="20"/><hkern u1="r" u2="”" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="œ" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="å" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à" k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&amp;quot;" k="-82"/><hkern u1="t" u2="”" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&amp;quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="”" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&amp;quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="”" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&amp;quot;" k="-82"/><hkern u1="x" u2="œ" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à" k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="”" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&amp;quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="”" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Œ" k="41"/><hkern u1="À" u2="Ý" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ò" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&amp;quot;" k="143"/><hkern u1="Á" u2="”" k="143"/><hkern u1="Á" u2="’" k="143"/><hkern u1="Á" u2="Ÿ" k="123"/><hkern u1="Á" u2="Œ" k="41"/><hkern u1="Á" u2="Ý" k="123"/><hkern u1="Á" u2="Ø" k="41"/><hkern u1="Á" u2="Ö" k="41"/><hkern u1="Á" u2="Õ" k="41"/><hkern u1="Á" u2="Ô" k="41"/><hkern u1="Á" u2="Ó" k="41"/><hkern u1="Á" u2="Ò" k="41"/><hkern u1="Á" u2="Ç" k="41"/><hkern u1="Á" u2="Y" k="123"/><hkern u1="Á" u2="W" k="82"/><hkern u1="Á" u2="V" k="82"/><hkern u1="Á" u2="T" k="143"/><hkern u1="Á" u2="Q" k="41"/><hkern u1="Á" u2="O" k="41"/><hkern u1="Á" u2="J" k="-266"/><hkern u1="Á" u2="G" k="41"/><hkern u1="Á" u2="C" k="41"/><hkern u1="Á" u2="'" k="143"/><hkern u1="Á" u2="&amp;quot;" k="143"/><hkern u1="Â" u2="”" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Œ" k="41"/><hkern u1="Â" u2="Ý" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ò" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&amp;quot;" k="143"/><hkern u1="Ã" u2="”" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Œ" k="41"/><hkern u1="Ã" u2="Ý" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ò" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&amp;quot;" k="143"/><hkern u1="Ä" u2="”" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Œ" k="41"/><hkern u1="Ä" u2="Ý" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ò" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&amp;quot;" k="143"/><hkern u1="Å" u2="”" k="143"/><hkern u1="Å" u2="’" k="143"/><hkern u1="Å" u2="Ÿ" k="123"/><hkern u1="Å" u2="Œ" k="41"/><hkern u1="Å" u2="Ý" k="123"/><hkern u1="Å" u2="Ø" k="41"/><hkern u1="Å" u2="Ö" k="41"/><hkern u1="Å" u2="Õ" k="41"/><hkern u1="Å" u2="Ô" k="41"/><hkern u1="Å" u2="Ó" k="41"/><hkern u1="Å" u2="Ò" k="41"/><hkern u1="Å" u2="Ç" k="41"/><hkern u1="Å" u2="Y" k="123"/><hkern u1="Å" u2="W" k="82"/><hkern u1="Å" u2="V" k="82"/><hkern u1="Å" u2="T" k="143"/><hkern u1="Å" u2="Q" k="41"/><hkern u1="Å" u2="O" k="41"/><hkern u1="Å" u2="J" k="-266"/><hkern u1="Å" u2="G" k="41"/><hkern u1="Å" u2="C" k="41"/><hkern u1="Å" u2="'" k="143"/><hkern u1="Å" u2="&amp;quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Œ" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ò" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ð" u2="„" k="82"/><hkern u1="Ð" u2="‚" k="82"/><hkern u1="Ð" u2="Ÿ" k="20"/><hkern u1="Ð" u2="Ý" k="20"/><hkern u1="Ð" u2="Å" k="41"/><hkern u1="Ð" u2="Ä" k="41"/><hkern u1="Ð" u2="Ã" k="41"/><hkern u1="Ð" u2="Â" k="41"/><hkern u1="Ð" u2="Á" k="41"/><hkern u1="Ð" u2="À" k="41"/><hkern u1="Ð" u2="Z" k="20"/><hkern u1="Ð" u2="Y" k="20"/><hkern u1="Ð" u2="X" k="41"/><hkern u1="Ð" u2="W" k="20"/><hkern u1="Ð" u2="V" k="20"/><hkern u1="Ð" u2="T" k="61"/><hkern u1="Ð" u2="A" k="41"/><hkern u1="Ð" u2="." k="82"/><hkern u1="Ð" u2="," k="82"/><hkern u1="Ò" u2="„" k="82"/><hkern u1="Ò" u2="‚" k="82"/><hkern u1="Ò" u2="Ÿ" k="20"/><hkern u1="Ò" u2="Ý" k="20"/><hkern u1="Ò" u2="Å" k="41"/><hkern u1="Ò" u2="Ä" k="41"/><hkern u1="Ò" u2="Ã" k="41"/><hkern u1="Ò" u2="Â" k="41"/><hkern u1="Ò" u2="Á" k="41"/><hkern u1="Ò" u2="À" k="41"/><hkern u1="Ò" u2="Z" k="20"/><hkern u1="Ò" u2="Y" k="20"/><hkern u1="Ò" u2="X" k="41"/><hkern u1="Ò" u2="W" k="20"/><hkern u1="Ò" u2="V" k="20"/><hkern u1="Ò" u2="T" k="61"/><hkern u1="Ò" u2="A" k="41"/><hkern u1="Ò" u2="." k="82"/><hkern u1="Ò" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ý" k="20"/><hkern u1="Ó" u2="Å" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Á" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ý" k="20"/><hkern u1="Ô" u2="Å" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Á" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ý" k="20"/><hkern u1="Õ" u2="Å" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Á" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ý" k="20"/><hkern u1="Ö" u2="Å" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Á" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ý" k="20"/><hkern u1="Ø" u2="Å" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Á" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Å" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Á" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Å" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Á" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Å" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Á" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ü" u2="„" k="41"/><hkern u1="Ü" u2="‚" k="41"/><hkern u1="Ü" u2="Å" k="20"/><hkern u1="Ü" u2="Ä" k="20"/><hkern u1="Ü" u2="Ã" k="20"/><hkern u1="Ü" u2="Â" k="20"/><hkern u1="Ü" u2="Á" k="20"/><hkern u1="Ü" u2="À" k="20"/><hkern u1="Ü" u2="A" k="20"/><hkern u1="Ü" u2="." k="41"/><hkern u1="Ü" u2="," k="41"/><hkern u1="Ý" u2="„" k="123"/><hkern u1="Ý" u2="‚" k="123"/><hkern u1="Ý" u2="œ" k="102"/><hkern u1="Ý" u2="Œ" k="41"/><hkern u1="Ý" u2="ü" k="61"/><hkern u1="Ý" u2="û" k="61"/><hkern u1="Ý" u2="ú" k="61"/><hkern u1="Ý" u2="ù" k="61"/><hkern u1="Ý" u2="ø" k="102"/><hkern u1="Ý" u2="ö" k="102"/><hkern u1="Ý" u2="õ" k="102"/><hkern u1="Ý" u2="ô" k="102"/><hkern u1="Ý" u2="ó" k="102"/><hkern u1="Ý" u2="ò" k="102"/><hkern u1="Ý" u2="ë" k="102"/><hkern u1="Ý" u2="ê" k="102"/><hkern u1="Ý" u2="é" k="102"/><hkern u1="Ý" u2="è" k="102"/><hkern u1="Ý" u2="ç" k="102"/><hkern u1="Ý" u2="æ" k="102"/><hkern u1="Ý" u2="å" k="102"/><hkern u1="Ý" u2="ä" k="102"/><hkern u1="Ý" u2="ã" k="102"/><hkern u1="Ý" u2="â" k="102"/><hkern u1="Ý" u2="á" k="102"/><hkern u1="Ý" u2="à" k="102"/><hkern u1="Ý" u2="Ø" k="41"/><hkern u1="Ý" u2="Ö" k="41"/><hkern u1="Ý" u2="Õ" k="41"/><hkern u1="Ý" u2="Ô" k="41"/><hkern u1="Ý" u2="Ó" k="41"/><hkern u1="Ý" u2="Ò" k="41"/><hkern u1="Ý" u2="Ç" k="41"/><hkern u1="Ý" u2="Å" k="123"/><hkern u1="Ý" u2="Ä" k="123"/><hkern u1="Ý" u2="Ã" k="123"/><hkern u1="Ý" u2="Â" k="123"/><hkern u1="Ý" u2="Á" k="123"/><hkern u1="Ý" u2="À" k="123"/><hkern u1="Ý" u2="z" k="41"/><hkern u1="Ý" u2="u" k="61"/><hkern u1="Ý" u2="s" k="82"/><hkern u1="Ý" u2="r" k="61"/><hkern u1="Ý" u2="q" k="102"/><hkern u1="Ý" u2="p" k="61"/><hkern u1="Ý" u2="o" k="102"/><hkern u1="Ý" u2="n" k="61"/><hkern u1="Ý" u2="m" k="61"/><hkern u1="Ý" u2="g" k="41"/><hkern u1="Ý" u2="e" k="102"/><hkern u1="Ý" u2="d" k="102"/><hkern u1="Ý" u2="c" k="102"/><hkern u1="Ý" u2="a" k="102"/><hkern u1="Ý" u2="Q" k="41"/><hkern u1="Ý" u2="O" k="41"/><hkern u1="Ý" u2="G" k="41"/><hkern u1="Ý" u2="C" k="41"/><hkern u1="Ý" u2="A" k="123"/><hkern u1="Ý" u2="?" k="-41"/><hkern u1="Ý" u2="." k="123"/><hkern u1="Ý" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Å" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Á" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à" u2="”" k="20"/><hkern u1="à" u2="’" k="20"/><hkern u1="à" u2="'" k="20"/><hkern u1="à" u2="&amp;quot;" k="20"/><hkern u1="á" u2="”" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&amp;quot;" k="20"/><hkern u1="â" u2="”" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&amp;quot;" k="20"/><hkern u1="ã" u2="”" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&amp;quot;" k="20"/><hkern u1="ä" u2="”" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&amp;quot;" k="20"/><hkern u1="å" u2="”" k="20"/><hkern u1="å" u2="’" k="20"/><hkern u1="å" u2="'" k="20"/><hkern u1="å" u2="&amp;quot;" k="20"/><hkern u1="è" u2="”" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&amp;quot;" k="20"/><hkern u1="é" u2="”" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&amp;quot;" k="20"/><hkern u1="ê" u2="”" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&amp;quot;" k="20"/><hkern u1="ë" u2="”" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&amp;quot;" k="20"/><hkern u1="ð" u2="”" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&amp;quot;" k="20"/><hkern u1="ò" u2="”" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&amp;quot;" k="20"/><hkern u1="ó" u2="”" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&amp;quot;" k="20"/><hkern u1="ô" u2="”" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&amp;quot;" k="20"/><hkern u1="ö" u2="”" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&amp;quot;" k="41"/><hkern u1="ø" u2="”" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&amp;quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="”" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&amp;quot;" k="-82"/><hkern u1="þ" u2="”" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&amp;quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="”" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&amp;quot;" k="-82"/><hkern u1="Œ" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="œ" k="102"/><hkern u1="Ÿ" u2="Œ" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="å" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à" k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ò" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Å" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Á" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="œ" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="å" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à" k="123"/><hkern u1="‘" u2="Ý" k="-20"/><hkern u1="‘" u2="Å" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Á" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="œ" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="å" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à" k="123"/><hkern u1="’" u2="Ý" k="-20"/><hkern u1="’" u2="Å" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Á" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Œ" k="102"/><hkern u1="‚" u2="Ý" k="123"/><hkern u1="‚" u2="Ü" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ò" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="œ" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="å" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à" k="123"/><hkern u1="“" u2="Ý" k="-20"/><hkern u1="“" u2="Å" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Á" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Œ" k="102"/><hkern u1="„" u2="Ý" k="123"/><hkern u1="„" u2="Ü" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ò" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/opensans/regular/opensans-400.ttf b/lib/web/fonts/opensans/regular/opensans-400.ttf
deleted file mode 100644
index c537f8382a429..0000000000000
Binary files a/lib/web/fonts/opensans/regular/opensans-400.ttf and /dev/null differ
diff --git a/lib/web/fonts/opensans/semibold/opensans-600.eot b/lib/web/fonts/opensans/semibold/opensans-600.eot
deleted file mode 100644
index d8375dd0ab130..0000000000000
Binary files a/lib/web/fonts/opensans/semibold/opensans-600.eot and /dev/null differ
diff --git a/lib/web/fonts/opensans/semibold/opensans-600.svg b/lib/web/fonts/opensans/semibold/opensans-600.svg
deleted file mode 100644
index d3e4516be5727..0000000000000
--- a/lib/web/fonts/opensans/semibold/opensans-600.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1169"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="fi" horiz-adv-x="1315" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zM1146 0H911v1106h235V0zM897 1399q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T1030 1270q-64 0-98.5 34.5T897 1399z"/><glyph unicode="fl" horiz-adv-x="1315" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zM1146 0H911v1556h235V0z"/><glyph unicode="ffi" horiz-adv-x="2058" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zm743 0h-270V0H960v928H778v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T1196 1178v-72h270V928zM1890 0h-235v1106h235V0zm-249 1399q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T1774 1270q-64 0-98.5 34.5T1641 1399z"/><glyph unicode="ffl" horiz-adv-x="2058" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zm743 0h-270V0H960v928H778v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T1196 1178v-72h270V928zM1890 0h-235v1556h235V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="565" d="M371 444H197l-52 1018h277zM133 125q0 74 39 112.5T283 276q71 0 109-40t38-111-38.5-112.5T283-29q-71 0-110.5 40T133 125z"/><glyph unicode="&amp;quot;" horiz-adv-x="893" d="M365 1462l-41-528H174l-41 528h232zm395 0l-41-528H569l-41 528h232z"/><glyph unicode="#" horiz-adv-x="1323" d="M989 870l-55-284h270V418H901L821 0H643l80 418H475L395 0H221l76 418H47v168h283l57 284H123v168h293l80 422h180l-80-422h252l80 422h174l-80-422h252V870H989zM506 586h250l57 284H563z"/><glyph unicode="$" d="M1063 453q0-145-106-239T651 98v-217H518V92q-248 4-407 76v211q86-42 201-70.5T518 279v374l-84 31q-164 63-239.5 150.5T119 1051q0 138 107.5 227T518 1386v168h133v-165q203-7 385-82l-73-183q-157 62-312 74V834l76-29q190-73 263-154t73-198zm-236-15q0 58-40.5 95.5T651 606V287q176 27 176 151zm-473 615q0-57 35.5-95T518 883v311q-80-12-122-49t-42-92z"/><glyph unicode="%" horiz-adv-x="1765" d="M279 1024q0-149 29-222t95-73q132 0 132 295t-132 295q-66 0-95-73t-29-222zm450 2q0-230-82.5-345.5T403 565q-152 0-235.5 119.5T84 1026q0 457 319 457 157 0 241.5-118.5T729 1026zm502-586q0-149 29.5-223t95.5-74q131 0 131 297 0 293-131 293-66 0-95.5-72T1231 440zm450 0q0-230-83-345T1356-20q-152 0-236 118.5T1036 440q0 457 320 457 154 0 239.5-118t85.5-339zm-297 1022L573 0H379l811 1462h194z"/><glyph unicode="&amp;" horiz-adv-x="1516" d="M451 1147q0-63 33.5-119T578 909q113 64 158.5 119.5T782 1153q0 65-43.5 104T623 1296q-79 0-125.5-40.5T451 1147zm149-965q183 0 313 107L530 666q-106-68-146-127.5T344 403q0-98 69.5-159.5T600 182zM96 387q0 131 64 228.5T391 809q-95 111-129.5 187.5T227 1155q0 152 108.5 240t291.5 88q177 0 278-85.5t101-230.5q0-114-67.5-207T713 774l346-334q81 107 135 314h242q-70-284-224-463L1513 0h-303l-149 145Q959 63 843.5 21.5T588-20Q358-20 227 89T96 387z"/><glyph unicode="'" horiz-adv-x="498" d="M365 1462l-41-528H174l-41 528h232z"/><glyph unicode="(" horiz-adv-x="649" d="M82 561q0 265 77.5 496T383 1462h205q-139-188-213-421.5T301 563t74-473 211-414H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="649" d="M567 561q0-263-77.5-490T266-324H63Q201-137 274.5 91T348 563q0 245-74 477.5T61 1462h205q147-175 224-406.5T567 561z"/><glyph unicode="*" horiz-adv-x="1122" d="M672 1556l-41-382 385 108 28-217-360-29 236-311-199-107-166 338-149-338-205 107 231 311-358 29 35 217 376-108-41 382h228z"/><glyph unicode="+" d="M494 633H96v178h398v408h180V811h399V633H674V227H494v406z"/><glyph unicode="," horiz-adv-x="547" d="M412 215Q364 29 236-264H63Q132 6 166 238h231z"/><glyph unicode="-" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="." horiz-adv-x="563" d="M133 125q0 73 38 112t110 39q73 0 111-40.5T430 125q0-71-38.5-112.5T281-29 171 12t-38 113z"/><glyph unicode="/" horiz-adv-x="799" d="M782 1462L238 0H16l545 1462h221z"/><glyph unicode="0" d="M1081 731q0-381-122.5-566T584-20q-244 0-370 191T88 731q0 387 122.5 570.5T584 1485q245 0 371-192t126-562zm-755 0q0-299 61.5-427T584 176t197.5 130T844 731q0 294-62.5 425.5T584 1288t-196.5-129T326 731z"/><glyph unicode="1" d="M780 0H545v944q0 169 8 268-23-24-56.5-53T272 975l-118 149 430 338h196V0z"/><glyph unicode="2" d="M1081 0H90v178l377 379q167 171 221.5 242.5T768 934t25 135q0 99-59.5 156T569 1282q-84 0-162.5-31T225 1139L98 1294q122 103 237 146t245 43q204 0 327-106.5t123-286.5q0-99-35.5-188t-109-183.5T641 463L387 217v-10h694V0z"/><glyph unicode="3" d="M1026 1126q0-139-81-231.5T717 770v-8q176-22 264-109.5t88-232.5q0-211-149-325.5T496-20Q253-20 86 59v209q93-46 197-71t200-25q170 0 254 63t84 195q0 117-93 172t-292 55H309v191h129q350 0 350 242 0 94-61 145t-180 51q-83 0-160-23.5T205 1171L90 1335q201 148 467 148 221 0 345-95t124-262z"/><glyph unicode="4" d="M1133 319H936V0H707v319H39v181l668 966h229V514h197V319zM707 514v367q0 196 10 321h-8q-28-66-88-160L258 514h449z"/><glyph unicode="5" d="M586 913q221 0 350-117t129-319q0-234-146.5-365.5T502-20q-245 0-385 79v213q81-46 186-71t195-25q159 0 242 71t83 208q0 262-334 262-47 0-116-9.5T252 686l-105 62 56 714h760v-209H410l-33-362q35 6 85.5 14t123.5 8z"/><glyph unicode="6" d="M94 623q0 858 699 858 110 0 186-17v-196q-76 22-176 22-235 0-353-126T322 760h12q47 81 132 125.5T666 930q199 0 310-122t111-331q0-230-128.5-363.5T608-20q-157 0-273 75.5t-178.5 220T94 623zm510-449q121 0 186.5 78T856 475q0 126-61.5 198T610 745q-76 0-140-32.5t-101-89T332 508q0-141 76.5-237.5T604 174z"/><glyph unicode="7" d="M256 0l578 1253H74v207h1011v-164L510 0H256z"/><glyph unicode="8" d="M584 1481q208 0 329-95.5t121-255.5q0-225-270-358 172-86 244.5-181t72.5-212q0-181-133-290T588-20Q350-20 219 82T88 371q0 122 68.5 219.5T381 764q-134 80-191 169t-57 200q0 159 125 253.5t326 94.5zM313 379q0-104 73-161.5T584 160q129 0 200.5 59.5T856 381q0 81-66 148T590 653l-29 13q-132-58-190-127.5T313 379zm269 921q-100 0-161-49.5T360 1116q0-52 22-93t64-74.5T588 868q120 53 169.5 111.5T807 1116q0 85-61.5 134.5T582 1300z"/><glyph unicode="9" d="M1079 838q0-432-174-645T381-20Q248-20 190-4v197q89-25 179-25 238 0 355 128t128 402h-12q-59-90-142.5-130T502 528q-194 0-305 121T86 981q0 229 128.5 364.5T565 1481q156 0 272-76t179-220.5 63-346.5zm-510 448q-122 0-187-79.5T317 983q0-125 60.5-196.5T561 715q119 0 200 71t81 166q0 89-34.5 166.5T711 1241t-142 45z"/><glyph unicode=":" horiz-adv-x="563" d="M133 125q0 73 38 112t110 39q73 0 111-40.5T430 125q0-71-38.5-112.5T281-29 171 12t-38 113zm0 854q0 151 148 151 75 0 112-40t37-111-38.5-112.5T281 825t-110 41-38 113z"/><glyph unicode=";" horiz-adv-x="569" d="M397 238l15-23Q364 29 236-264H63Q132 6 166 238h231zM131 979q0 151 148 151 75 0 112-40t37-111-38.5-112.5T279 825t-110 41-38 113z"/><glyph unicode="<" d="M1073 221L96 651v121l977 488v-195L340 721l733-303V221z"/><glyph unicode="=" d="M102 831v179h963V831H102zm0-399v178h963V432H102z"/><glyph unicode=">" d="M96 418l733 303-733 344v195l977-488V651L96 221v197z"/><glyph unicode="?" horiz-adv-x="928" d="M283 444v64q0 110 40 183t140 151q119 94 153.5 146t34.5 124q0 84-56 129t-161 45q-95 0-176-27t-158-65l-84 176q203 113 435 113 196 0 311-96t115-265q0-75-22-133.5T788.5 877 635 739q-93-73-124.5-121T479 489v-45H283zm-41-319q0 151 147 151 72 0 110-39.5T537 125q0-71-38.5-112.5T389-29 280 11.5 242 125z"/><glyph unicode="@" horiz-adv-x="1839" d="M1726 739q0-143-45-261.5T1554.5 293 1366 227q-79 0-137 42t-78 114h-12q-49-78-121-117t-162-39q-163 0-256.5 105T506 616q0 206 124 334.5T963 1079q76 0 168.5-13.5T1296 1028l-22-465v-24q0-160 104-160 79 0 125.5 102t46.5 260q0 171-70 300.5T1281 1241t-296 70q-213 0-370.5-88T374 971.5 291 592q0-290 155-446T891-10q221 0 461 90V-84q-210-86-457-86-370 0-577 199.5T111 586q0 261 112 464.5T533.5 1362 983 1470q217 0 386.5-90t263-256.5T1726 739zM698 612q0-233 183-233 193 0 211 293l12 239q-63 17-135 17-128 0-199.5-85T698 612z"/><glyph unicode="A" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426z"/><glyph unicode="B" horiz-adv-x="1352" d="M193 1462h434q302 0 436.5-88t134.5-278q0-128-66-213T942 776v-10q154-29 226.5-114.5T1241 420q0-197-137.5-308.5T721 0H193v1462zm239-604h230q150 0 219 47.5t69 161.5q0 103-74.5 149T639 1262H432V858zm0-194V201h254q150 0 226.5 57.5T989 440q0 114-78 169t-237 55H432z"/><glyph unicode="C" horiz-adv-x="1298" d="M815 1278q-206 0-324-146T373 729q0-269 113.5-407T815 184q93 0 180 18.5t181 47.5V45q-172-65-390-65-321 0-493 194.5T121 731q0 228 83.5 399T446 1392t371 91q224 0 414-94l-86-199q-74 35-156.5 61.5T815 1278z"/><glyph unicode="D" horiz-adv-x="1503" d="M1382 745q0-362-201-553.5T602 0H193v1462h452q349 0 543-188t194-529zm-252-8q0 525-491 525H432V201h170q528 0 528 536z"/><glyph unicode="E" horiz-adv-x="1143" d="M1020 0H193v1462h827v-202H432V862h551V662H432V203h588V0z"/><glyph unicode="F" horiz-adv-x="1090" d="M430 0H193v1462h825v-202H430V803h551V600H430V0z"/><glyph unicode="G" horiz-adv-x="1487" d="M791 793h538V59q-132-43-253.5-61T813-20q-332 0-512 196.5T121 731q0 353 203 552.5T883 1483q229 0 434-88l-84-199q-178 82-356 82-234 0-370-147T371 729q0-268 122.5-407.5T846 182q116 0 248 29v377H791v205z"/><glyph unicode="H" horiz-adv-x="1538" d="M1346 0h-240v659H432V0H193v1462h239V864h674v598h240V0z"/><glyph unicode="I" horiz-adv-x="625" d="M193 0v1462h239V0H193z"/><glyph unicode="J" horiz-adv-x="612" d="M8-408q-98 0-164 25v201q84-21 146-21 196 0 196 248v1417h240V53q0-224-106.5-342.5T8-408z"/><glyph unicode="K" horiz-adv-x="1309" d="M1309 0h-277L573 662 432 547V0H193v1462h239V764q98 120 195 231l395 467h272q-383-450-549-641z"/><glyph unicode="L" horiz-adv-x="1110" d="M193 0v1462h239V205h619V0H193z"/><glyph unicode="M" horiz-adv-x="1890" d="M825 0L401 1221h-8q17-272 17-510V0H193v1462h337L936 299h6l418 1163h338V0h-230v723q0 109 5.5 284t9.5 212h-8L1036 0H825z"/><glyph unicode="N" horiz-adv-x="1604" d="M1411 0h-293L399 1165h-8l5-65q14-186 14-340V0H193v1462h290l717-1159h6q-2 23-8 167.5t-6 225.5v766h219V0z"/><glyph unicode="O" horiz-adv-x="1612" d="M1491 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733z"/><glyph unicode="P" horiz-adv-x="1260" d="M1161 1020q0-229-150-351T584 547H432V0H193v1462h421q274 0 410.5-112t136.5-330zM432 748h127q184 0 270 64t86 200q0 126-77 188t-240 62H432V748z"/><glyph unicode="Q" horiz-adv-x="1612" d="M1491 733q0-266-101.5-448T1094 29l350-377h-322L846-20h-39q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733z"/><glyph unicode="R" horiz-adv-x="1309" d="M432 782h166q167 0 242 62t75 184q0 124-81 178t-244 54H432V782zm0-198V0H193v1462h413q283 0 419-106t136-320q0-273-284-389L1290 0h-272L668 584H432z"/><glyph unicode="S" horiz-adv-x="1126" d="M1036 397q0-195-141-306T506-20 100 57v226q100-47 212.5-74T522 182q142 0 209.5 54T799 381q0 82-62 139T481 655q-200 81-282 185t-82 250q0 183 130 288t349 105q210 0 418-92l-76-195q-195 82-348 82-116 0-176-50.5T354 1094q0-57 24-97.5t79-76.5 198-95q161-67 236-125t110-131 35-172z"/><glyph unicode="T" horiz-adv-x="1159" d="M698 0H459v1257H29v205h1099v-205H698V0z"/><glyph unicode="U" horiz-adv-x="1520" d="M1339 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239z"/><glyph unicode="V" horiz-adv-x="1274" d="M1026 1462h248L762 0H510L0 1462h246l305-909q24-65 51-167.5T637 233q13 76 40 176t44 148z"/><glyph unicode="W" horiz-adv-x="1937" d="M1542 0h-260l-248 872q-16 57-40 164.5T965 1186q-10-64-32.5-166T895 868L653 0H393L204 732 12 1462h244l209-852q49-205 70-362 11 85 33 190t40 170l238 854h237l244-858q35-119 74-356 15 143 72 364l208 850h242z"/><glyph unicode="X" horiz-adv-x="1274" d="M1270 0H995L629 598 260 0H4l485 758-454 704h266l338-553 338 553h258L778 754z"/><glyph unicode="Y" horiz-adv-x="1212" d="M606 795l346 667h260L725 567V0H485v559L0 1462h260z"/><glyph unicode="Z" horiz-adv-x="1178" d="M1112 0H66v166l737 1091H86v205h1006v-168L352 205h760V0z"/><glyph unicode="[" horiz-adv-x="676" d="M625-324H154v1786h471v-176H369V-147h256v-177z"/><glyph unicode="\" horiz-adv-x="799" d="M238 1462L782 0H561L16 1462h222z"/><glyph unicode="]" horiz-adv-x="676" d="M51-147h256v1433H51v176h469V-324H51v177z"/><glyph unicode="^" horiz-adv-x="1100" d="M29 535l436 935h121l485-935H877l-349 694-307-694H29z"/><glyph unicode="_" horiz-adv-x="879" d="M883-319H-4v135h887v-135z"/><glyph unicode="`" horiz-adv-x="1212" d="M690 1241q-69 52-174.5 150.5T362 1548v21h273q38-70 103.5-161T848 1266v-25H690z"/><glyph unicode="a" horiz-adv-x="1188" d="M860 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160z"/><glyph unicode="b" horiz-adv-x="1276" d="M733 1126q207 0 322.5-150T1171 555q0-272-117-423.5T729-20q-210 0-326 151h-16L344 0H168v1556h235v-370q0-41-4-122t-6-103h10q112 165 330 165zm-61-192q-142 0-204.5-83.5T403 571v-16q0-202 64-292.5T676 172q125 0 189.5 99T930 557q0 377-258 377z"/><glyph unicode="c" horiz-adv-x="1014" d="M614-20q-251 0-381.5 146.5T102 547q0 279 136.5 429T633 1126q175 0 315-65l-71-189q-149 58-246 58-287 0-287-381 0-186 71.5-279.5T625 176q157 0 297 78V49Q859 12 787.5-4T614-20z"/><glyph unicode="d" horiz-adv-x="1276" d="M541-20q-207 0-323 150T102 551q0 272 117.5 423.5T545 1126q218 0 332-161h12q-17 119-17 188v403h236V0H924l-41 145h-11Q759-20 541-20zm63 190q145 0 211 81.5T883 516v33q0 209-68 297t-213 88q-124 0-191-100.5T344 547q0-184 65-280.5T604 170z"/><glyph unicode="e" horiz-adv-x="1180" d="M651-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948z"/><glyph unicode="f" horiz-adv-x="743" d="M723 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928z"/><glyph unicode="g" horiz-adv-x="1139" d="M1102 1106V977l-189-35q26-35 43-86t17-108q0-171-118-269t-325-98q-53 0-96 8-76-47-76-110 0-38 35.5-57T524 203h193q183 0 278-78t95-225q0-188-155-290T487-492q-226 0-345 80T23-184Q23-82 87.5-12.5T268 84q-47 20-77.5 64.5T160 242q0 62 35 105t104 85q-86 37-139.5 120.5T106 748q0 180 113.5 279t323.5 99q47 0 98.5-6.5T719 1106h383zM233-172q0-76 68.5-117T494-330q192 0 286 55t94 146q0 72-51.5 102.5T631 4H453Q352 4 292.5-43.5T233-172zm101 920q0-104 53.5-160T541 532q204 0 204 218 0 108-50.5 166.5T541 975q-102 0-154.5-58T334 748z"/><glyph unicode="h" horiz-adv-x="1300" d="M1141 0H905v680q0 128-51.5 191T690 934q-148 0-217.5-88.5T403 549V0H168v1556h235v-395q0-95-12-203h15q48 80 133.5 124t199.5 44q402 0 402-405V0z"/><glyph unicode="i" horiz-adv-x="571" d="M403 0H168v1106h235V0zM154 1399q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T287 1270q-64 0-98.5 34.5T154 1399z"/><glyph unicode="j" horiz-adv-x="571" d="M55-492q-106 0-176 25v186q68-18 139-18 150 0 150 170v1235h235V-145q0-171-89.5-259T55-492zm99 1891q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T287 1270q-64 0-98.5 34.5T154 1399z"/><glyph unicode="k" horiz-adv-x="1171" d="M395 584l133 166 334 356h271L688 631 1161 0H885L530 485 401 379V0H168v1556h233V797l-12-213h6z"/><glyph unicode="l" horiz-adv-x="571" d="M403 0H168v1556h235V0z"/><glyph unicode="m" horiz-adv-x="1958" d="M1100 0H864v682q0 127-48 189.5T666 934q-136 0-199.5-88.5T403 551V0H168v1106h184l33-145h12q46 79 133.5 122t192.5 43q255 0 338-174h16q49 82 138 128t204 46q198 0 288.5-100t90.5-305V0h-235v682q0 127-48.5 189.5T1364 934q-137 0-200.5-85.5T1100 586V0z"/><glyph unicode="n" horiz-adv-x="1300" d="M1141 0H905v680q0 128-51.5 191T690 934q-149 0-218-88t-69-295V0H168v1106h184l33-145h12q50 79 142 122t204 43q398 0 398-405V0z"/><glyph unicode="o" horiz-adv-x="1251" d="M1149 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555z"/><glyph unicode="p" horiz-adv-x="1276" d="M729-20q-210 0-326 151h-14Q403-9 403-39v-453H168v1598h190q8-31 33-148h12q110 168 330 168 207 0 322.5-150T1171 555t-117.5-423T729-20zm-57 954q-140 0-204.5-82T403 590v-35q0-202 64-292.5T676 172q122 0 188 100t66 285q0 186-65.5 281.5T672 934z"/><glyph unicode="q" horiz-adv-x="1276" d="M606 168q148 0 212.5 85.5T883 512v37q0 205-66.5 295T602 934q-126 0-192-100t-66-287q0-379 262-379zM539-20q-205 0-321 150.5T102 551t118 422.5T545 1126q104 0 186.5-38.5T879 961h8l26 145h195V-492H872v469q0 44 4 93t7 75h-13Q766-20 539-20z"/><glyph unicode="r" horiz-adv-x="883" d="M729 1126q71 0 117-10l-23-219q-50 12-104 12-141 0-228.5-92T403 578V0H168v1106h184l31-195h12q55 99 143.5 157t190.5 58z"/><glyph unicode="s" horiz-adv-x="997" d="M911 315q0-162-118-248.5T455-20q-221 0-355 67v203q195-90 363-90 217 0 217 131 0 42-24 70t-79 58-153 68q-191 74-258.5 148T98 827q0 142 114.5 220.5T524 1126q195 0 369-79l-76-177q-179 74-301 74-186 0-186-106 0-52 48.5-88T590 651q137-53 199-97t92-101.5T911 315z"/><glyph unicode="t" horiz-adv-x="805" d="M580 170q86 0 172 27V20Q713 3 651.5-8.5T524-20q-334 0-334 352v596H39v104l162 86 80 234h145v-246h315V928H426V336q0-85 42.5-125.5T580 170z"/><glyph unicode="u" horiz-adv-x="1300" d="M948 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948z"/><glyph unicode="v" horiz-adv-x="1096" d="M420 0L0 1106h248l225-643q58-162 70-262h8q9 72 70 262l225 643h250L674 0H420z"/><glyph unicode="w" horiz-adv-x="1673" d="M1075 0L932 516q-26 82-94 381h-9q-58-270-92-383L590 0H330L20 1106h240l141-545q48-202 68-346h6q10 73 30.5 167.5T541 524l168 582h258l163-582q15-49 37.5-150t26.5-157h8q15 123 70 344l143 545h236L1339 0h-264z"/><glyph unicode="x" horiz-adv-x="1128" d="M414 565L43 1106h268l252-387 254 387h266L711 565 1102 0H836L563 414 291 0H25z"/><glyph unicode="y" horiz-adv-x="1098" d="M0 1106h256l225-627q51-134 68-252h8q9 55 33 133.5T844 1106h254L625-147Q496-492 195-492q-78 0-152 17v186q53-12 121-12 170 0 239 197L444 0z"/><glyph unicode="z" horiz-adv-x="979" d="M907 0H68v145l559 781H102v180h789V942L344 180h563V0z"/><glyph unicode="{" horiz-adv-x="791" d="M311 287q0 186-266 186v191q135 0 200.5 45.5T311 848v311q0 156 108.5 229.5T745 1462v-182q-114-5-165.5-46.5T528 1110V813q0-199-229-238v-12q229-36 229-237V27q0-82 51-124t166-44v-183q-231 2-332.5 78.5T311 2v285z"/><glyph unicode="|" horiz-adv-x="1128" d="M473 1552h180V-481H473v2033z"/><glyph unicode="}" horiz-adv-x="760" d="M463-20q0-156-99.5-229T45-324v183q95 1 148 38.5T246 27v262q0 121 53 187t176 87v12q-229 39-229 238v297q0 82-45.5 123.5T45 1280v182q223 0 320.5-76.5T463 1135V848q0-100 63.5-142T715 664V473q-123 0-187.5-42.5T463 287V-20z"/><glyph unicode="~" d="M330 692q-50 0-111.5-30T96 571v191q99 108 250 108 66 0 125-13t147-50q131-55 220-55 52 0 114.5 31t120.5 89V682Q968 571 823 571q-65 0-127.5 15.5T549 637q-127 55-219 55z"/><glyph unicode="¡" horiz-adv-x="565" d="M193 645h174l51-1016H141zm237 320q0-74-37.5-113T281 813q-72 0-110 39.5T133 965q0 69 38 111t110 42 110.5-40.5T430 965z"/><glyph unicode="¢" d="M987 238q-119-59-258-64V-20H573v200q-207 31-307 171T166 741q0 254 100.5 397T573 1313v170h158v-162q152-5 283-66l-70-188q-146 59-250 59-146 0-216-95t-70-288q0-194 72-283t210-89q75 0 142.5 15T987 438V238z"/><glyph unicode="£" d="M690 1481q194 0 375-82l-76-182q-162 71-284 71-205 0-205-219V825h397V653H500V471q0-91-33-155T354 207h756V0H72v195q98 30 145 96t47 178v184H76v172h188v256q0 188 113.5 294T690 1481z"/><glyph unicode="¤" d="M186 723q0 109 64 213l-133 133 121 119 131-129q100 63 215 63t213-65l133 131 121-117-131-133q63-100 63-215 0-119-63-217l129-129-119-119-133 129q-99-61-213-61-126 0-215 61L238 260 119 379l131 129q-64 99-64 215zm168 0q0-98 68-164.5T584 492q97 0 165 66.5T817 723q0 97-68 165t-165 68q-93 0-161.5-68T354 723z"/><glyph unicode="¥" d="M584 797l321 665h244L750 702h227V551H696V397h281V244H696V0H471v244H188v153h283v154H188v151h224L18 1462h246z"/><glyph unicode="¦" horiz-adv-x="1128" d="M473 1552h180V758H473v794zm0-1237h180v-796H473v796z"/><glyph unicode="§" horiz-adv-x="1026" d="M129 807q0 80 38.5 145.5T279 1061q-146 83-146 235 0 129 109.5 202t294.5 73q91 0 174-17t182-59l-68-162q-116 50-176 63t-121 13q-194 0-194-109 0-54 55-93.5t191-90.5q175-68 250-146.5T905 782q0-177-139-266 139-80 139-223 0-142-118-224.5T461-14q-212 0-346 71v179q77-40 173-65.5T465 145q235 0 235 131 0 43-21 70t-71 54-147 65q-141 55-206 101.5t-95.5 105T129 807zm184 20q0-45 24-80t78.5-69T610 588q109 65 109 168 0 75-62 126.5T436 987q-54-16-88.5-61.5T313 827z"/><glyph unicode="¨" horiz-adv-x="1212" d="M293 1399q0 62 33.5 89.5T408 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T801 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="©" horiz-adv-x="1704" d="M893 1034q-111 0-171-80.5T662 731q0-147 54-226t177-79q55 0 118 15t109 36V319q-115-51-235-51-197 0-305.5 120.5T471 731q0 214 110 337.5T887 1192q138 0 274-70l-65-143q-106 55-203 55zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm123 0q0-170 84.5-315.5T538 186t314-84q170 0 316 85.5t229.5 230T1481 731q0 168-84.5 314.5t-231 230.5-313.5 84q-168 0-312.5-83T309 1048t-86-317z"/><glyph unicode="ª" horiz-adv-x="754" d="M547 782l-29 97q-46-55-105-82t-130-27q-113 0-169.5 52.5T57 981q0 104 84 159.5t252 61.5l107 4q0 72-34.5 108T362 1350q-90 0-210-56l-54 115q144 70 285 70 138 0 207-62.5t69-187.5V782H547zm-146 316q-71-2-125.5-34T221 983q0-88 96-88 91 0 137 41t46 123v43z"/><glyph unicode="«" horiz-adv-x="1139" d="M82 561l356 432 168-94-282-350 282-348-168-97L82 535v26zm450 0l357 432 168-94-283-350 283-348-168-97-357 431v26z"/><glyph unicode="¬" d="M1073 256H895v377H96v178h977V256z"/><glyph unicode="­" horiz-adv-x="659" d="M72 449zm0 0v200h514V449H72z"/><glyph unicode="®" horiz-adv-x="1704" d="M748 770h69q74 0 112 35t38 100q0 72-36.5 100.5T815 1034h-67V770zm409 139q0-171-153-233l237-397h-211L838 625h-90V279H559v903h262q174 0 255-68t81-205zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm123 0q0-170 84.5-315.5T538 186t314-84q170 0 316 85.5t229.5 230T1481 731q0 168-84.5 314.5t-231 230.5-313.5 84q-168 0-312.5-83T309 1048t-86-317z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v164h1036v-164z"/><glyph unicode="°" horiz-adv-x="877" d="M109 1153q0 135 95 232.5t234 97.5q138 0 233-96t95-234q0-139-96-233.5T438 825q-88 0-164.5 43.5T153 988t-44 165zm153 0q0-70 51-122t125-52 125 51.5 51 122.5q0 76-52 127t-124 51-124-52-52-126z"/><glyph unicode="±" d="M494 664H96v178h398v407h180V842h399V664H674V258H494v406zM96 0v178h977V0H96z"/><glyph unicode="²" horiz-adv-x="743" d="M678 586H51v135l230 225q117 112 149.5 165t32.5 112q0 52-32 79t-83 27q-93 0-201-88l-94 121q139 119 309 119 136 0 211.5-66t75.5-180q0-83-46-158.5T420 874L281 745h397V586z"/><glyph unicode="³" horiz-adv-x="743" d="M645 1251q0-75-40.5-122.5T485 1042q94-21 141.5-76T674 834q0-127-93-196t-266-69q-148 0-270 62v157q145-79 270-79 179 0 179 135 0 125-199 125H180v133h105q184 0 184 129 0 52-34.5 80t-90.5 28q-57 0-105.5-20T133 1262l-84 114q61 46 134 75.5t171 29.5q134 0 212.5-61.5T645 1251z"/><glyph unicode="´" horiz-adv-x="1212" d="M362 1241v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T518 1241H362z"/><glyph unicode="µ" horiz-adv-x="1309" d="M403 422q0-252 218-252 146 0 215 88.5T905 555v551h236V0H958l-34 147h-13Q863 64 791.5 22T616-20q-140 0-219 90h-4q3-28 6.5-117t3.5-125v-320H168v1598h235V422z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1143-260h-137v1663H815V-260H678v819q-62-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h580V-260z"/><glyph unicode="·" horiz-adv-x="563" d="M133 723q0 73 38 112t110 39q73 0 111-40.5T430 723q0-71-38.5-112.5T281 569t-110 41-38 113z"/><glyph unicode="¸" horiz-adv-x="442" d="M426-270q0-222-305-222-66 0-121 15v137q54-14 123-14 54 0 85.5 16.5T240-276q0 85-179 110L145 0h152l-41-88q80-21 125-68.5T426-270z"/><glyph unicode="¹" horiz-adv-x="743" d="M532 586H346v512l3 103 5 91q-17-18-40.5-40T172 1141l-88 112 281 209h167V586z"/><glyph unicode="º" horiz-adv-x="780" d="M719 1124q0-164-87.5-259T387 770q-150 0-238 95.5T61 1124q0 169 88.5 262t241.5 93q152 0 240-94.5t88-260.5zm-496 0q0-111 39-166t127-55 127 55 39 166q0 113-39 167.5T389 1346t-127-54.5-39-167.5z"/><glyph unicode="»" horiz-adv-x="1139" d="M1057 535L698 104l-168 97 283 348-283 350 168 94 359-432v-26zm-451 0L248 104 80 201l282 348L80 899l168 94 358-432v-26z"/><glyph unicode="¼" horiz-adv-x="1700" d="M60 0zm1273 1462L477 0H285l858 1462h190zM508 586H322v512l3 103 5 91q-17-18-40.5-40T148 1141l-88 112 281 209h167V586zm1077-409h-125V1h-192v176H876v127l396 579h188V320h125V177zm-317 143v178q0 97 6 197-52-104-88-158l-148-217h230z"/><glyph unicode="½" horiz-adv-x="1700" d="M46 0zm1252 1462L442 0H250l858 1462h190zM494 586H308v512l3 103 5 91q-17-18-40.5-40T134 1141l-88 112 281 209h167V586zM1608 1H981v135l230 225q117 112 149.5 165t32.5 112q0 52-32 79t-83 27q-93 0-201-88l-94 121q139 119 309 119 136 0 211.5-66t75.5-180q0-83-46-158.5T1350 289l-139-129h397V1z"/><glyph unicode="¾" horiz-adv-x="1700" d="M55 0zm1360 1462L559 0H367l858 1462h190zm225-1285h-125V1h-192v176H931v127l396 579h188V320h125V177zm-317 143v178q0 97 6 197-52-104-88-158l-148-217h230zm-668 931q0-75-40.5-122.5T495 1042q94-21 141.5-76T684 834q0-127-93-196t-266-69q-148 0-270 62v157q145-79 270-79 179 0 179 135 0 125-199 125H190v133h105q184 0 184 129 0 52-34.5 80t-90.5 28q-57 0-105.5-20T143 1262l-84 114q61 46 134 75.5t171 29.5q134 0 212.5-61.5T655 1251z"/><glyph unicode="¿" horiz-adv-x="928" d="M651 645v-63q0-106-41-181T467 246Q343 148 312 99T281-25q0-78 54-125t161-47q90 0 174 27.5T836-104l82-179Q698-393 494-393q-207 0-323 95.5T55-33q0 73 21 130t64 109 157 142q94 76 125 124.5T453 600v45h198zm41 320q0-74-37.5-113T543 813q-72 0-110 39.5T395 965q0 69 38 111t110 42 110.5-40.5T692 965z"/><glyph unicode="À" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm-229 967q-69 52-174.5 150.5T334 1886v21h273q38-70 103.5-161T820 1604v-25H662z"/><glyph unicode="Á" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm-359 967v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T688 1579H532z"/><glyph unicode="Â" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm6 967q-123 73-228 180-103-103-225-180H286v25q191 198 254 303h260q63-110 256-303v-25H897z"/><glyph unicode="Ã" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm-70 967q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H281q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T836 1749q79 0 106 115h125q-12-134-77-209.5T821 1579z"/><glyph unicode="Ä" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zM363 1737q0 62 33.5 89.5T478 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T871 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Å" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm22 965q0-102-65.5-165.5T674 1348t-172 62.5-64 164.5q0 101 63.5 163.5T674 1801q104 0 171.5-62t67.5-162zm-133-2q0 50-30 78.5t-76 28.5q-47 0-77-28.5t-30-78.5q0-106 107-106 46 0 76 27.5t30 78.5z"/><glyph unicode="Æ" horiz-adv-x="1868" d="M1747 0H936v406H432L244 0H-2l678 1462h1071v-202h-571V862h532V662h-532V203h571V0zM522 612h414v641H813z"/><glyph unicode="Ç" horiz-adv-x="1298" d="M121 0zm694 1278q-206 0-324-146T373 729q0-269 113.5-407T815 184q93 0 180 18.5t181 47.5V45q-172-65-390-65-321 0-493 194.5T121 731q0 228 83.5 399T446 1392t371 91q224 0 414-94l-86-199q-74 35-156.5 61.5T815 1278zM952-270q0-222-305-222-66 0-121 15v137q54-14 123-14 54 0 85.5 16.5T766-276q0 85-179 110L671 0h152l-41-88q80-21 125-68.5T952-270z"/><glyph unicode="È" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM617 1579q-69 52-174.5 150.5T289 1886v21h273q38-70 103.5-161T775 1604v-25H617z"/><glyph unicode="É" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM440 1579v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T596 1579H440z"/><glyph unicode="Ê" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM831 1579q-123 73-228 180-103-103-225-180H220v25q191 198 254 303h260q63-110 256-303v-25H831z"/><glyph unicode="Ë" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM297 1737q0 62 33.5 89.5T412 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T805 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ì" horiz-adv-x="625" d="M0 0zm193 0v1462h239V0H193zm129 1579q-69 52-174.5 150.5T-6 1886v21h273q38-70 103.5-161T480 1604v-25H322z"/><glyph unicode="Í" horiz-adv-x="625" d="M179 0zm14 0v1462h239V0H193zm-14 1579v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T335 1579H179z"/><glyph unicode="Î" horiz-adv-x="625" d="M0 0zm193 0v1462h239V0H193zm343 1579q-123 73-228 180-103-103-225-180H-75v25q191 198 254 303h260q63-110 256-303v-25H536z"/><glyph unicode="Ï" horiz-adv-x="625" d="M1 0zm192 0v1462h239V0H193zM1 1737q0 62 33.5 89.5T116 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29T1 1737zm393 0q0 62 33.5 89.5T509 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ð" horiz-adv-x="1497" d="M1374 745q0-360-201-552.5T594 0H193v623H47v200h146v639h446q347 0 541-188.5T1374 745zm-252-8q0 260-124.5 392.5T629 1262H432V823h307V623H432V201h160q530 0 530 536z"/><glyph unicode="Ñ" horiz-adv-x="1604" d="M193 0zm1218 0h-293L399 1165h-8l5-65q14-186 14-340V0H193v1462h290l717-1159h6q-2 23-8 167.5t-6 225.5v766h219V0zM954 1579q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H414q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T969 1749q79 0 106 115h125q-12-134-77-209.5T954 1579z"/><glyph unicode="Ò" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm434 846q-69 52-174.5 150.5T481 1886v21h273q38-70 103.5-161T967 1604v-25H809z"/><glyph unicode="Ó" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm282 846v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T813 1579H657z"/><glyph unicode="Ô" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm649 846q-123 73-228 180-103-103-225-180H413v25q191 198 254 303h260q63-110 256-303v-25h-159z"/><glyph unicode="Õ" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm575 846q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H410q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T965 1749q79 0 106 115h125q-12-134-77-209.5T950 1579z"/><glyph unicode="Ö" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm121 1004q0 62 33.5 89.5T611 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5t81.5 27.5q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="×" d="M457 723l-326 326 125 127 328-326 329 326 125-123-329-330 325-328-123-125-329 326-324-326-125 125z"/><glyph unicode="Ø" horiz-adv-x="1612" d="M1491 733q0-357-178.5-555T807-20q-213 0-361 81L352-76 211 18l98 144Q121 358 121 735q0 362 178.5 556T809 1485q199 0 354-82l90 129 142-92-99-140q195-199 195-567zm-254 0q0 225-80 361L571 244q97-60 236-60 213 0 321.5 138T1237 733zm-862 0q0-231 78-362l587 850q-92 59-231 59-215 0-324.5-139T375 733z"/><glyph unicode="Ù" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-594 117q-69 52-174.5 150.5T417 1886v21h273q38-70 103.5-161T903 1604v-25H745z"/><glyph unicode="Ú" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-739 117v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T756 1579H600z"/><glyph unicode="Û" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-362 117q-123 73-228 180-103-103-225-180H366v25q191 198 254 303h260q63-110 256-303v-25H977z"/><glyph unicode="Ü" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-894 275q0 62 33.5 89.5T560 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T953 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ý" horiz-adv-x="1212" d="M0 0zm606 795l346 667h260L725 567V0H485v559L0 1462h260zm-156 784v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T606 1579H450z"/><glyph unicode="Þ" horiz-adv-x="1268" d="M1169 776q0-227-146-349T600 305H432V0H193v1462h239v-243h197q268 0 404-112t136-331zM432 504h133q187 0 273 63t86 203q0 127-78 188.5T596 1020H432V504z"/><glyph unicode="ß" horiz-adv-x="1364" d="M1149 1253q0-74-38.5-140.5T1006 995q-90-69-117-98t-27-57q0-30 22.5-55.5T964 721l95-64q92-62 135.5-109.5T1260 444t22-127q0-165-107-251T864-20q-190 0-299 65v199q58-37 139-61.5T852 158q192 0 192 151 0 61-34.5 105T854 532q-119 73-171 135t-52 146q0 63 34 115.5T770 1034q75 55 107 97.5t32 93.5q0 72-67 112.5T664 1378q-127 0-194-54t-67-159V0H168v1169q0 193 128.5 295.5T664 1567q225 0 355-84t130-230z"/><glyph unicode="à" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm77 1081q-69 52-174.5 150.5T259 1548v21h273q38-70 103.5-161T745 1266v-25H587z"/><glyph unicode="á" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm-72 1081v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T594 1241H438z"/><glyph unicode="â" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm304 1081q-123 73-228 180-103-103-225-180H203v25q191 198 254 303h260q63-110 256-303v-25H814z"/><glyph unicode="ã" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm238 1081q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H208q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T763 1411q79 0 106 115h125q-12-134-77-209.5T748 1241z"/><glyph unicode="ä" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zM282 1399q0 62 33.5 89.5T397 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T790 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="å" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm331 1308q0-102-65.5-165.5T602 1239t-172 62.5-64 164.5q0 101 63.5 163.5T602 1692q104 0 171.5-62t67.5-162zm-133-2q0 50-30 78.5t-76 28.5q-47 0-77-28.5t-30-78.5q0-106 107-106 46 0 76 27.5t30 78.5z"/><glyph unicode="æ" horiz-adv-x="1817" d="M90 317q0 172 121.5 258.5T582 670l188 6v76q0 194-201 194-141 0-307-82l-74 166q88 47 192.5 71.5T584 1126q241 0 340-155 120 155 346 155 206 0 328-134.5T1720 629V502h-712q10-336 301-336 184 0 356 80V55q-86-41-171.5-58T1298-20q-140 0-248.5 54.5T874 199Q780 74 683.5 27T442-20q-165 0-258.5 90T90 317zm244-2q0-155 166-155 124 0 196 72.5T768 432v96l-135-6q-155-6-227-54.5T334 315zm932 633q-112 0-177.5-69.5T1014 670h473q0 130-58.5 204T1266 948z"/><glyph unicode="ç" horiz-adv-x="1014" d="M102 0zm512-20q-251 0-381.5 146.5T102 547q0 279 136.5 429T633 1126q175 0 315-65l-71-189q-149 58-246 58-287 0-287-381 0-186 71.5-279.5T625 176q157 0 297 78V49Q859 12 787.5-4T614-20zm168-250q0-222-305-222-66 0-121 15v137q54-14 123-14 54 0 85.5 16.5T596-276q0 85-179 110L501 0h152l-41-88q80-21 125-68.5T782-270z"/><glyph unicode="è" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm1 293q-69 52-174.5 150.5T281 1548v21h273q38-70 103.5-161T767 1266v-25H609z"/><glyph unicode="é" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm-150 293v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T614 1241H458z"/><glyph unicode="ê" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm230 293q-123 73-228 180-103-103-225-180H227v25q191 198 254 303h260q63-110 256-303v-25H838z"/><glyph unicode="ë" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm-301 451q0 62 33.5 89.5T422 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T815 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ì" horiz-adv-x="571" d="M0 0zm403 0H168v1106h235V0zM259 1241q-69 52-174.5 150.5T-69 1548v21h273q38-70 103.5-161T417 1266v-25H259z"/><glyph unicode="í" horiz-adv-x="571" d="M156 0zm247 0H168v1106h235V0zM156 1241v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T312 1241H156z"/><glyph unicode="î" horiz-adv-x="571" d="M0 0zm403 0H168v1106h235V0zm108 1241q-123 73-228 180-103-103-225-180h-158v25q191 198 254 303h260q63-110 256-303v-25H511z"/><glyph unicode="ï" horiz-adv-x="571" d="M0 0zm403 0H168v1106h235V0zM-25 1399q0 62 33.5 89.5T90 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T483 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ð" horiz-adv-x="1243" d="M1149 567q0-279-137.5-433T623-20q-235 0-378 136T102 481q0 231 131 365.5T584 981q214 0 301-111l8 4q-62 189-227 345l-250-150-88 133 204 119q-86 59-167 102l84 146q140-63 258-144l231 138 88-129-188-113q152-140 231.5-330t79.5-424zm-240-45q0 127-75.5 202T627 799q-151 0-218-82t-67-240q0-153 74-234t211-81q148 0 215 91t67 269z"/><glyph unicode="ñ" horiz-adv-x="1300" d="M168 0zm973 0H905v680q0 128-51.5 191T690 934q-149 0-218-88t-69-295V0H168v1106h184l33-145h12q50 79 142 122t204 43q398 0 398-405V0zM809 1241q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H269q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T824 1411q79 0 106 115h125q-12-134-77-209.5T809 1241z"/><glyph unicode="ò" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm277 686q-69 52-174.5 150.5T293 1548v21h273q38-70 103.5-161T779 1266v-25H621z"/><glyph unicode="ó" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm129 686v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T629 1241H473z"/><glyph unicode="ô" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm506 686q-123 73-228 180-103-103-225-180H239v25q191 198 254 303h260q63-110 256-303v-25H850z"/><glyph unicode="õ" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm431 686q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H235q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T790 1411q79 0 106 115h125q-12-134-77-209.5T775 1241z"/><glyph unicode="ö" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm-33 844q0 62 33.5 89.5T426 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T819 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="÷" d="M96 633v178h977V633H96zm361-260q0 64 31.5 99.5T584 508q61 0 93-36t32-99-34-100-91-37q-60 0-93.5 35.5T457 373zm0 698q0 64 31.5 99.5T584 1206q61 0 93-36t32-99-34-100-91-37q-60 0-93.5 35.5T457 1071z"/><glyph unicode="ø" horiz-adv-x="1251" d="M1149 555q0-271-139-423T623-20q-144 0-250 57L297-72 162 18l82 117Q102 290 102 555q0 269 138 420t389 151q144 0 258-63l69 100 136-92-78-108q135-152 135-408zm-805 0q0-135 37-219l391 559q-60 39-147 39-148 0-214.5-98T344 555zm563 0q0 121-33 203L487 205q54-33 140-33 280 0 280 383z"/><glyph unicode="ù" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zM617 1241q-69 52-174.5 150.5T289 1548v21h273q38-70 103.5-161T775 1266v-25H617z"/><glyph unicode="ú" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zM501 1241v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T657 1241H501z"/><glyph unicode="û" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zm-77 1241q-123 73-228 180-103-103-225-180H260v25q191 198 254 303h260q63-110 256-303v-25H871z"/><glyph unicode="ü" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zM332 1399q0 62 33.5 89.5T447 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T840 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ý" horiz-adv-x="1098" d="M0 0zm0 1106h256l225-627q51-134 68-252h8q9 55 33 133.5T844 1106h254L625-147Q496-492 195-492q-78 0-152 17v186q53-12 121-12 170 0 239 197L444 0zm401 135v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T557 1241H401z"/><glyph unicode="þ" horiz-adv-x="1276" d="M403 961q61 86 142.5 125.5T733 1126q206 0 322-151t116-420q0-272-116.5-423.5T733-20q-219 0-330 149h-14l8-72 6-92v-457H168v2048h235v-430l-7-138-3-27h10zm271-27q-142 0-206.5-82T403 592v-37q0-202 64-292.5T676 172q254 0 254 385 0 190-61.5 283.5T674 934z"/><glyph unicode="ÿ" horiz-adv-x="1098" d="M0 0zm0 1106h256l225-627q51-134 68-252h8q9 55 33 133.5T844 1106h254L625-147Q496-492 195-492q-78 0-152 17v186q53-12 121-12 170 0 239 197L444 0zm239 293q0 62 33.5 89.5T354 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T747 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ı" horiz-adv-x="571" d="M403 0H168v1106h235V0z"/><glyph unicode="Œ" horiz-adv-x="1942" d="M1819 0H999Q897-20 788-20q-320 0-493.5 196.5T121 735q0 360 172 555t491 195q115 0 209-23h826v-202h-576V862h539V662h-539V203h576V0zM793 1280q-208 0-315-139T371 733t106-409 314-140q129 0 213 35v1024q-80 37-211 37z"/><glyph unicode="œ" horiz-adv-x="1966" d="M1438-20q-281 0-420 194Q886-20 618-20q-236 0-376 155T102 555q0 272 137 421.5T621 1126q121 0 223-49t168-145q131 194 379 194 221 0 349-133.5T1868 627V500h-738q11-164 85.5-249t228.5-85q102 0 187 18.5t181 61.5V55q-84-40-171.5-57.5T1438-20zM344 555q0-189 65.5-286T621 172q141 0 206.5 95.5T893 551q0 192-66 287.5T616 934q-143 0-207.5-95T344 555zm1049 393q-110 0-177.5-69.5T1137 670h497q0 134-63 206t-178 72z"/><glyph unicode="Ÿ" horiz-adv-x="1212" d="M0 0zm606 795l346 667h260L725 567V0H485v559L0 1462h260zm-313 942q0 62 33.5 89.5T408 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T801 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ˆ" horiz-adv-x="1227" d="M838 1241q-123 73-228 180-103-103-225-180H227v25q191 198 254 303h260q63-110 256-303v-25H838z"/><glyph unicode="˚" horiz-adv-x="1182" d="M827 1468q0-102-65.5-165.5T588 1239t-172 62.5-64 164.5q0 101 63.5 163.5T588 1692q104 0 171.5-62t67.5-162zm-133-2q0 50-30 78.5t-76 28.5q-47 0-77-28.5t-30-78.5q0-106 107-106 46 0 76 27.5t30 78.5z"/><glyph unicode="˜" horiz-adv-x="1227" d="M776 1241q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H236q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T791 1411q79 0 106 115h125q-12-134-77-209.5T776 1241z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="‐" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="‑" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="‒" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 455v190h860V455H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 455v190h1884V455H82z"/><glyph unicode="‘" horiz-adv-x="395" d="M37 961l-12 22q20 83 71 224t105 255h170q-64-256-101-501H37z"/><glyph unicode="’" horiz-adv-x="395" d="M356 1462l15-22q-53-209-176-479H25q69 289 100 501h231z"/><glyph unicode="‚" horiz-adv-x="549" d="M412 215Q364 29 236-264H63Q132 6 166 238h231z"/><glyph unicode="“" horiz-adv-x="813" d="M440 983q53 203 178 479h170q-69-296-100-501H455zm-415 0q20 83 71 224t105 255h170q-64-256-101-501H37z"/><glyph unicode="”" horiz-adv-x="813" d="M371 1440q-53-209-176-479H25q69 289 100 501h231zm417 0q-53-209-176-479H440q69 271 103 501h231z"/><glyph unicode="„" horiz-adv-x="944" d="M391 215Q336 1 215-264H43Q109-4 145 238h232zm418 0Q761 29 633-264H461Q527-4 563 238h232z"/><glyph unicode="•" horiz-adv-x="770" d="M131 748q0 138 66 210t188 72q121 0 187.5-72.5T639 748q0-135-67-209t-187-74-187 72.5T131 748z"/><glyph unicode="…" horiz-adv-x="1677" d="M133 125q0 73 38 112t110 39q73 0 111-40.5T430 125q0-71-38.5-112.5T281-29 171 12t-38 113zm557 0q0 73 38 112t110 39q73 0 111-40.5T987 125q0-71-38.5-112.5T838-29 728 12t-38 113zm557 0q0 73 38 112t110 39q73 0 111-40.5t38-110.5q0-71-38.5-112.5T1395-29t-110 41-38 113z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="688" d="M82 561l356 432 168-94-282-350 282-348-168-97L82 535v26z"/><glyph unicode="›" horiz-adv-x="688" d="M606 535L248 104 80 201l282 348L80 899l168 94 358-432v-26z"/><glyph unicode="⁄" horiz-adv-x="266" d="M655 1462L-201 0h-192l858 1462h190z"/><glyph horiz-adv-x="476"/><glyph unicode="⁴" horiz-adv-x="743" d="M725 762H600V586H408v176H16v127l396 579h188V905h125V762zM408 905v178q0 97 6 197-52-104-88-158L178 905h230z"/><glyph unicode="€" horiz-adv-x="1188" d="M799 1278q-141 0-230.5-84T449 940h456V786H434l-2-45v-55l2-39h408V494H451q64-312 364-312 143 0 293 62V41Q977-20 803-20q-241 0-391.5 132T215 494H63v153h136l-2 37v37l2 65H63v154h150q38 251 191 394t395 143q200 0 358-88l-84-187q-154 76-274 76z"/><glyph unicode="™" horiz-adv-x="1561" d="M375 741H229v592H27v129h553v-129H375V741zm588 0l-185 543h-6l4-119V741H635v721h217l178-534 187 534h210V741h-147v414l4 129h-6l-193-543H963z"/><glyph unicode="" horiz-adv-x="1105" d="M0 1105h1105V0H0v1105z"/><glyph horiz-adv-x="1276" d="M0 0z"/><hkern u1="&amp;quot;" u2="Ÿ" k="-20"/><hkern u1="&amp;quot;" u2="œ" k="123"/><hkern u1="&amp;quot;" u2="ü" k="61"/><hkern u1="&amp;quot;" u2="û" k="61"/><hkern u1="&amp;quot;" u2="ú" k="61"/><hkern u1="&amp;quot;" u2="ù" k="61"/><hkern u1="&amp;quot;" u2="ø" k="123"/><hkern u1="&amp;quot;" u2="ö" k="123"/><hkern u1="&amp;quot;" u2="õ" k="123"/><hkern u1="&amp;quot;" u2="ô" k="123"/><hkern u1="&amp;quot;" u2="ó" k="123"/><hkern u1="&amp;quot;" u2="ò" k="123"/><hkern u1="&amp;quot;" u2="ë" k="123"/><hkern u1="&amp;quot;" u2="ê" k="123"/><hkern u1="&amp;quot;" u2="é" k="123"/><hkern u1="&amp;quot;" u2="è" k="123"/><hkern u1="&amp;quot;" u2="ç" k="123"/><hkern u1="&amp;quot;" u2="æ" k="82"/><hkern u1="&amp;quot;" u2="å" k="82"/><hkern u1="&amp;quot;" u2="ä" k="82"/><hkern u1="&amp;quot;" u2="ã" k="82"/><hkern u1="&amp;quot;" u2="â" k="82"/><hkern u1="&amp;quot;" u2="á" k="82"/><hkern u1="&amp;quot;" u2="à" k="123"/><hkern u1="&amp;quot;" u2="Ý" k="-20"/><hkern u1="&amp;quot;" u2="Å" k="143"/><hkern u1="&amp;quot;" u2="Ä" k="143"/><hkern u1="&amp;quot;" u2="Ã" k="143"/><hkern u1="&amp;quot;" u2="Â" k="143"/><hkern u1="&amp;quot;" u2="Á" k="143"/><hkern u1="&amp;quot;" u2="À" k="143"/><hkern u1="&amp;quot;" u2="u" k="61"/><hkern u1="&amp;quot;" u2="s" k="61"/><hkern u1="&amp;quot;" u2="r" k="61"/><hkern u1="&amp;quot;" u2="q" k="123"/><hkern u1="&amp;quot;" u2="p" k="61"/><hkern u1="&amp;quot;" u2="o" k="123"/><hkern u1="&amp;quot;" u2="n" k="61"/><hkern u1="&amp;quot;" u2="m" k="61"/><hkern u1="&amp;quot;" u2="g" k="61"/><hkern u1="&amp;quot;" u2="e" k="123"/><hkern u1="&amp;quot;" u2="d" k="123"/><hkern u1="&amp;quot;" u2="c" k="123"/><hkern u1="&amp;quot;" u2="a" k="82"/><hkern u1="&amp;quot;" u2="Y" k="-20"/><hkern u1="&amp;quot;" u2="W" k="-41"/><hkern u1="&amp;quot;" u2="V" k="-41"/><hkern u1="&amp;quot;" u2="T" k="-41"/><hkern u1="&amp;quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="œ" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="å" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à" k="123"/><hkern u1="'" u2="Ý" k="-20"/><hkern u1="'" u2="Å" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Á" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Œ" k="102"/><hkern u1="," u2="Ý" k="123"/><hkern u1="," u2="Ü" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ò" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Œ" k="102"/><hkern u1="." u2="Ý" k="123"/><hkern u1="." u2="Ü" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ò" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="”" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Œ" k="41"/><hkern u1="A" u2="Ý" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ò" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&amp;quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ý" k="20"/><hkern u1="B" u2="Å" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Á" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Œ" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ò" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ý" k="20"/><hkern u1="D" u2="Å" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Á" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Å" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Á" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Œ" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ò" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="”" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Œ" k="41"/><hkern u1="L" u2="Ý" k="61"/><hkern u1="L" u2="Ü" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ò" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&amp;quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ý" k="20"/><hkern u1="O" u2="Å" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Á" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Å" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Á" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ý" k="20"/><hkern u1="Q" u2="Å" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Á" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="œ" k="143"/><hkern u1="T" u2="Œ" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="å" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à" k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ò" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Å" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Á" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Å" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Á" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="œ" k="41"/><hkern u1="V" u2="Œ" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="å" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à" k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ò" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Å" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Á" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="œ" k="41"/><hkern u1="W" u2="Œ" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="å" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à" k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ò" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Å" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Á" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Œ" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ò" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="œ" k="102"/><hkern u1="Y" u2="Œ" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="å" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à" k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ò" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Å" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Á" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Œ" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ò" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="”" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&amp;quot;" k="20"/><hkern u1="b" u2="”" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&amp;quot;" k="20"/><hkern u1="c" u2="”" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&amp;quot;" k="-41"/><hkern u1="e" u2="”" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&amp;quot;" k="20"/><hkern u1="f" u2="”" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&amp;quot;" k="-123"/><hkern u1="h" u2="”" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&amp;quot;" k="20"/><hkern u1="k" u2="œ" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à" k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="”" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&amp;quot;" k="20"/><hkern u1="n" u2="”" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&amp;quot;" k="20"/><hkern u1="o" u2="”" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&amp;quot;" k="20"/><hkern u1="p" u2="”" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&amp;quot;" k="20"/><hkern u1="r" u2="”" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="œ" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="å" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à" k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&amp;quot;" k="-82"/><hkern u1="t" u2="”" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&amp;quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="”" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&amp;quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="”" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&amp;quot;" k="-82"/><hkern u1="x" u2="œ" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à" k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="”" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&amp;quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="”" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Œ" k="41"/><hkern u1="À" u2="Ý" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ò" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&amp;quot;" k="143"/><hkern u1="Á" u2="”" k="143"/><hkern u1="Á" u2="’" k="143"/><hkern u1="Á" u2="Ÿ" k="123"/><hkern u1="Á" u2="Œ" k="41"/><hkern u1="Á" u2="Ý" k="123"/><hkern u1="Á" u2="Ø" k="41"/><hkern u1="Á" u2="Ö" k="41"/><hkern u1="Á" u2="Õ" k="41"/><hkern u1="Á" u2="Ô" k="41"/><hkern u1="Á" u2="Ó" k="41"/><hkern u1="Á" u2="Ò" k="41"/><hkern u1="Á" u2="Ç" k="41"/><hkern u1="Á" u2="Y" k="123"/><hkern u1="Á" u2="W" k="82"/><hkern u1="Á" u2="V" k="82"/><hkern u1="Á" u2="T" k="143"/><hkern u1="Á" u2="Q" k="41"/><hkern u1="Á" u2="O" k="41"/><hkern u1="Á" u2="J" k="-266"/><hkern u1="Á" u2="G" k="41"/><hkern u1="Á" u2="C" k="41"/><hkern u1="Á" u2="'" k="143"/><hkern u1="Á" u2="&amp;quot;" k="143"/><hkern u1="Â" u2="”" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Œ" k="41"/><hkern u1="Â" u2="Ý" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ò" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&amp;quot;" k="143"/><hkern u1="Ã" u2="”" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Œ" k="41"/><hkern u1="Ã" u2="Ý" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ò" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&amp;quot;" k="143"/><hkern u1="Ä" u2="”" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Œ" k="41"/><hkern u1="Ä" u2="Ý" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ò" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&amp;quot;" k="143"/><hkern u1="Å" u2="”" k="143"/><hkern u1="Å" u2="’" k="143"/><hkern u1="Å" u2="Ÿ" k="123"/><hkern u1="Å" u2="Œ" k="41"/><hkern u1="Å" u2="Ý" k="123"/><hkern u1="Å" u2="Ø" k="41"/><hkern u1="Å" u2="Ö" k="41"/><hkern u1="Å" u2="Õ" k="41"/><hkern u1="Å" u2="Ô" k="41"/><hkern u1="Å" u2="Ó" k="41"/><hkern u1="Å" u2="Ò" k="41"/><hkern u1="Å" u2="Ç" k="41"/><hkern u1="Å" u2="Y" k="123"/><hkern u1="Å" u2="W" k="82"/><hkern u1="Å" u2="V" k="82"/><hkern u1="Å" u2="T" k="143"/><hkern u1="Å" u2="Q" k="41"/><hkern u1="Å" u2="O" k="41"/><hkern u1="Å" u2="J" k="-266"/><hkern u1="Å" u2="G" k="41"/><hkern u1="Å" u2="C" k="41"/><hkern u1="Å" u2="'" k="143"/><hkern u1="Å" u2="&amp;quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Œ" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ò" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ð" u2="„" k="82"/><hkern u1="Ð" u2="‚" k="82"/><hkern u1="Ð" u2="Ÿ" k="20"/><hkern u1="Ð" u2="Ý" k="20"/><hkern u1="Ð" u2="Å" k="41"/><hkern u1="Ð" u2="Ä" k="41"/><hkern u1="Ð" u2="Ã" k="41"/><hkern u1="Ð" u2="Â" k="41"/><hkern u1="Ð" u2="Á" k="41"/><hkern u1="Ð" u2="À" k="41"/><hkern u1="Ð" u2="Z" k="20"/><hkern u1="Ð" u2="Y" k="20"/><hkern u1="Ð" u2="X" k="41"/><hkern u1="Ð" u2="W" k="20"/><hkern u1="Ð" u2="V" k="20"/><hkern u1="Ð" u2="T" k="61"/><hkern u1="Ð" u2="A" k="41"/><hkern u1="Ð" u2="." k="82"/><hkern u1="Ð" u2="," k="82"/><hkern u1="Ò" u2="„" k="82"/><hkern u1="Ò" u2="‚" k="82"/><hkern u1="Ò" u2="Ÿ" k="20"/><hkern u1="Ò" u2="Ý" k="20"/><hkern u1="Ò" u2="Å" k="41"/><hkern u1="Ò" u2="Ä" k="41"/><hkern u1="Ò" u2="Ã" k="41"/><hkern u1="Ò" u2="Â" k="41"/><hkern u1="Ò" u2="Á" k="41"/><hkern u1="Ò" u2="À" k="41"/><hkern u1="Ò" u2="Z" k="20"/><hkern u1="Ò" u2="Y" k="20"/><hkern u1="Ò" u2="X" k="41"/><hkern u1="Ò" u2="W" k="20"/><hkern u1="Ò" u2="V" k="20"/><hkern u1="Ò" u2="T" k="61"/><hkern u1="Ò" u2="A" k="41"/><hkern u1="Ò" u2="." k="82"/><hkern u1="Ò" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ý" k="20"/><hkern u1="Ó" u2="Å" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Á" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ý" k="20"/><hkern u1="Ô" u2="Å" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Á" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ý" k="20"/><hkern u1="Õ" u2="Å" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Á" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ý" k="20"/><hkern u1="Ö" u2="Å" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Á" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ý" k="20"/><hkern u1="Ø" u2="Å" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Á" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Å" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Á" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Å" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Á" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Å" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Á" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ü" u2="„" k="41"/><hkern u1="Ü" u2="‚" k="41"/><hkern u1="Ü" u2="Å" k="20"/><hkern u1="Ü" u2="Ä" k="20"/><hkern u1="Ü" u2="Ã" k="20"/><hkern u1="Ü" u2="Â" k="20"/><hkern u1="Ü" u2="Á" k="20"/><hkern u1="Ü" u2="À" k="20"/><hkern u1="Ü" u2="A" k="20"/><hkern u1="Ü" u2="." k="41"/><hkern u1="Ü" u2="," k="41"/><hkern u1="Ý" u2="„" k="123"/><hkern u1="Ý" u2="‚" k="123"/><hkern u1="Ý" u2="œ" k="102"/><hkern u1="Ý" u2="Œ" k="41"/><hkern u1="Ý" u2="ü" k="61"/><hkern u1="Ý" u2="û" k="61"/><hkern u1="Ý" u2="ú" k="61"/><hkern u1="Ý" u2="ù" k="61"/><hkern u1="Ý" u2="ø" k="102"/><hkern u1="Ý" u2="ö" k="102"/><hkern u1="Ý" u2="õ" k="102"/><hkern u1="Ý" u2="ô" k="102"/><hkern u1="Ý" u2="ó" k="102"/><hkern u1="Ý" u2="ò" k="102"/><hkern u1="Ý" u2="ë" k="102"/><hkern u1="Ý" u2="ê" k="102"/><hkern u1="Ý" u2="é" k="102"/><hkern u1="Ý" u2="è" k="102"/><hkern u1="Ý" u2="ç" k="102"/><hkern u1="Ý" u2="æ" k="102"/><hkern u1="Ý" u2="å" k="102"/><hkern u1="Ý" u2="ä" k="102"/><hkern u1="Ý" u2="ã" k="102"/><hkern u1="Ý" u2="â" k="102"/><hkern u1="Ý" u2="á" k="102"/><hkern u1="Ý" u2="à" k="102"/><hkern u1="Ý" u2="Ø" k="41"/><hkern u1="Ý" u2="Ö" k="41"/><hkern u1="Ý" u2="Õ" k="41"/><hkern u1="Ý" u2="Ô" k="41"/><hkern u1="Ý" u2="Ó" k="41"/><hkern u1="Ý" u2="Ò" k="41"/><hkern u1="Ý" u2="Ç" k="41"/><hkern u1="Ý" u2="Å" k="123"/><hkern u1="Ý" u2="Ä" k="123"/><hkern u1="Ý" u2="Ã" k="123"/><hkern u1="Ý" u2="Â" k="123"/><hkern u1="Ý" u2="Á" k="123"/><hkern u1="Ý" u2="À" k="123"/><hkern u1="Ý" u2="z" k="41"/><hkern u1="Ý" u2="u" k="61"/><hkern u1="Ý" u2="s" k="82"/><hkern u1="Ý" u2="r" k="61"/><hkern u1="Ý" u2="q" k="102"/><hkern u1="Ý" u2="p" k="61"/><hkern u1="Ý" u2="o" k="102"/><hkern u1="Ý" u2="n" k="61"/><hkern u1="Ý" u2="m" k="61"/><hkern u1="Ý" u2="g" k="41"/><hkern u1="Ý" u2="e" k="102"/><hkern u1="Ý" u2="d" k="102"/><hkern u1="Ý" u2="c" k="102"/><hkern u1="Ý" u2="a" k="102"/><hkern u1="Ý" u2="Q" k="41"/><hkern u1="Ý" u2="O" k="41"/><hkern u1="Ý" u2="G" k="41"/><hkern u1="Ý" u2="C" k="41"/><hkern u1="Ý" u2="A" k="123"/><hkern u1="Ý" u2="?" k="-41"/><hkern u1="Ý" u2="." k="123"/><hkern u1="Ý" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Å" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Á" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à" u2="”" k="20"/><hkern u1="à" u2="’" k="20"/><hkern u1="à" u2="'" k="20"/><hkern u1="à" u2="&amp;quot;" k="20"/><hkern u1="á" u2="”" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&amp;quot;" k="20"/><hkern u1="â" u2="”" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&amp;quot;" k="20"/><hkern u1="ã" u2="”" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&amp;quot;" k="20"/><hkern u1="ä" u2="”" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&amp;quot;" k="20"/><hkern u1="å" u2="”" k="20"/><hkern u1="å" u2="’" k="20"/><hkern u1="å" u2="'" k="20"/><hkern u1="å" u2="&amp;quot;" k="20"/><hkern u1="è" u2="”" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&amp;quot;" k="20"/><hkern u1="é" u2="”" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&amp;quot;" k="20"/><hkern u1="ê" u2="”" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&amp;quot;" k="20"/><hkern u1="ë" u2="”" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&amp;quot;" k="20"/><hkern u1="ð" u2="”" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&amp;quot;" k="20"/><hkern u1="ò" u2="”" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&amp;quot;" k="20"/><hkern u1="ó" u2="”" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&amp;quot;" k="20"/><hkern u1="ô" u2="”" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&amp;quot;" k="20"/><hkern u1="ö" u2="”" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&amp;quot;" k="41"/><hkern u1="ø" u2="”" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&amp;quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="”" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&amp;quot;" k="-82"/><hkern u1="þ" u2="”" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&amp;quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="”" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&amp;quot;" k="-82"/><hkern u1="Œ" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="œ" k="102"/><hkern u1="Ÿ" u2="Œ" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="å" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à" k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ò" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Å" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Á" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="œ" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="å" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à" k="123"/><hkern u1="‘" u2="Ý" k="-20"/><hkern u1="‘" u2="Å" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Á" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="œ" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="å" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à" k="123"/><hkern u1="’" u2="Ý" k="-20"/><hkern u1="’" u2="Å" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Á" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Œ" k="102"/><hkern u1="‚" u2="Ý" k="123"/><hkern u1="‚" u2="Ü" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ò" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="œ" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="å" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à" k="123"/><hkern u1="“" u2="Ý" k="-20"/><hkern u1="“" u2="Å" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Á" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Œ" k="102"/><hkern u1="„" u2="Ý" k="123"/><hkern u1="„" u2="Ü" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ò" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/lib/web/fonts/opensans/semibold/opensans-600.ttf b/lib/web/fonts/opensans/semibold/opensans-600.ttf
deleted file mode 100644
index b3290843a7a3e..0000000000000
Binary files a/lib/web/fonts/opensans/semibold/opensans-600.ttf and /dev/null differ
diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
index 0947164e5b0f2..093ee707d3f98 100644
--- a/lib/web/fotorama/fotorama.js
+++ b/lib/web/fotorama/fotorama.js
@@ -831,7 +831,7 @@ fotoramaVersion = '4.6.4';
                 }
                 type = 'youtube';
             }
-        } else if (href.host.match(/youtube\.com|youtu\.be/)) {
+        } else if (href.host.match(/youtube\.com|youtu\.be|youtube-nocookie.com/)) {
             id = href.pathname.replace(/^\/(embed\/|v\/)?/, '').replace(/\/.*/, '');
             type = 'youtube';
         } else if (href.host.match(/vimeo\.com/)) {
@@ -1218,6 +1218,14 @@ fotoramaVersion = '4.6.4';
     }
 
     function stubEvent($el, eventType) {
+        var isIOS = /ip(ad|hone|od)/i.test(window.navigator.userAgent);
+
+        if (isIOS && eventType === 'touchend') {
+            $el.on('touchend', function(e){
+                $DOCUMENT.trigger('mouseup', e);
+            })
+        }
+
         $el.on(eventType, function (e) {
             stopEvent(e, true);
 
@@ -1447,16 +1455,22 @@ fotoramaVersion = '4.6.4';
                 }
             } else {
                 stopEvent(e);
-                (options.onMove || noop).call(el, e, {touch: touchFLAG});
+                if (movedEnough(xDiff,yDiff)) {
+                    (options.onMove || noop).call(el, e, {touch: touchFLAG});
+                }
             }
 
-            if (!moved && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance) {
+            if (!moved && movedEnough(xDiff, yDiff) && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance) {
                 moved = true;
             }
 
             tail.checked = tail.checked || xWin || yWin;
         }
 
+        function movedEnough(xDiff, yDiff) {
+            return xDiff > yDiff && xDiff > 1.5;
+        }
+
         function onEnd(e) {
             (options.onTouchEnd || noop)();
 
@@ -1869,7 +1883,7 @@ fotoramaVersion = '4.6.4';
         fotoramaData.fotorama = this;
 
         /**
-         * Search video items in incomming data and transform object for video layout.
+         * Search video items in incoming data and transform object for video layout.
          *
          */
         function checkForVideo() {
@@ -1937,10 +1951,10 @@ fotoramaVersion = '4.6.4';
                             if (e.keyCode === 27) {
                                 catched = true;
                                 that.cancelFullScreen();
-                            } else if ((e.shiftKey && e.keyCode === 32 && allowKey('space')) || (e.keyCode === 37 && allowKey('left')) || (e.keyCode === 38 && allowKey('up') && $(':focus').attr('data-gallery-role'))) {
+                            } else if ((e.shiftKey && e.keyCode === 32 && allowKey('space')) || (!e.altKey && !e.metaKey && e.keyCode === 37 && allowKey('left')) || (e.keyCode === 38 && allowKey('up') && $(':focus').attr('data-gallery-role'))) {
                                 that.longPress.progress();
                                 index = '<';
-                            } else if ((e.keyCode === 32 && allowKey('space')) || (e.keyCode === 39 && allowKey('right')) || (e.keyCode === 40 && allowKey('down') && $(':focus').attr('data-gallery-role'))) {
+                            } else if ((e.keyCode === 32 && allowKey('space')) || (!e.altKey && !e.metaKey && e.keyCode === 39 && allowKey('right')) || (e.keyCode === 40 && allowKey('down') && $(':focus').attr('data-gallery-role'))) {
                                 that.longPress.progress();
                                 index = '>';
                             } else if (e.keyCode === 36 && allowKey('home')) {
@@ -2008,7 +2022,7 @@ fotoramaVersion = '4.6.4';
         }
 
         /**
-         * Set and install data from incomming @param {JSON} options or takes data attr from data-"name"=... values.
+         * Set and install data from incoming @param {JSON} options or takes data attr from data-"name"=... values.
          */
         function setData() {
             data = that.data = data || clone(opts.data) || getDataFromHtml($fotorama);
@@ -2084,7 +2098,7 @@ fotoramaVersion = '4.6.4';
                 o_navTop = opts.navposition === 'top';
                 classes.remove.push(selectClass);
 
-                $arrs.toggle(opts.arrows);
+                $arrs.toggle(!!opts.arrows);
             } else {
                 o_nav = false;
                 $arrs.hide();
@@ -2473,11 +2487,11 @@ fotoramaVersion = '4.6.4';
                         .append($videoPlay.clone());
 
                     // This solves tabbing problems
-                    addFocus(frame, function () {
+                    addFocus(frame, function (e) {
                         setTimeout(function () {
                             lockScroll($stage);
                         }, 0);
-                        clickToShow({index: frameData.eq, user: true});
+                        clickToShow({index: frameData.eq, user: true}, e);
                     });
 
                     $stageFrame = $stageFrame.add($frame);
@@ -2554,7 +2568,7 @@ fotoramaVersion = '4.6.4';
                     thisData.t > rightLimit : thisData.l > rightLimit;
                 specialMeasures.w = thisData.w;
 
-                if (thisData.l + thisData.w < leftLimit
+                if ((opts.navdir !== 'vertical' && thisData.l + thisData.w < leftLimit)
                     || exceedLimit
                     || callFit(thisData.$img, specialMeasures)) return;
 
@@ -3026,7 +3040,10 @@ fotoramaVersion = '4.6.4';
             return time;
         }
 
-        that.showStage = function (silent, options, time) {
+        that.showStage = function (silent, options, time, e) {
+            if (e !== undefined && e.target.tagName == 'IFRAME') {
+                return;
+            }
             unloadVideo($videoPlaying, activeFrame.i !== data[normalizeIndex(repositionIndex)].i);
             frameDraw(activeIndexes, 'stage');
             stageFramePosition(SLOW ? [dirtyIndex] : [dirtyIndex, getPrevIndex(dirtyIndex), getNextIndex(dirtyIndex)]);
@@ -3114,7 +3131,7 @@ fotoramaVersion = '4.6.4';
             }
         };
 
-        that.show = function (options) {
+        that.show = function (options, e) {
             that.longPress.singlePressInProgress = true;
 
             var index = calcActiveIndex(options);
@@ -3125,7 +3142,7 @@ fotoramaVersion = '4.6.4';
 
             var silent = _activeFrame === activeFrame && !options.user;
 
-            that.showStage(silent, options, time);
+            that.showStage(silent, options, time, e);
             that.showNav(silent, options, time);
 
             showedFLAG = typeof lastActiveIndex !== 'undefined' && lastActiveIndex !== activeIndex;
@@ -3485,7 +3502,7 @@ fotoramaVersion = '4.6.4';
 
         $stage.on('mousemove', stageCursor);
 
-        function clickToShow(showOptions) {
+        function clickToShow(showOptions, e) {
             clearTimeout(clickToShow.t);
 
             if (opts.clicktransition && opts.clicktransition !== opts.transition) {
@@ -3502,7 +3519,7 @@ fotoramaVersion = '4.6.4';
                     }, 10);
                 }, 0);
             } else {
-                that.show(showOptions);
+                that.show(showOptions, e);
             }
         }
 
@@ -3539,7 +3556,7 @@ fotoramaVersion = '4.6.4';
 
                 if ((result.moved || (toggleControlsFLAG && result.pos !== result.newPos && !result.control)) && result.$target[0] !== $fullscreenIcon[0]) {
                     var index = getIndexByPos(result.newPos, measures.w, opts.margin, repositionIndex);
-                    
+
                     that.show({
                         index: index,
                         time: o_fade ? o_transitionDuration : result.time,
diff --git a/lib/web/fotorama/fotorama.min.js b/lib/web/fotorama/fotorama.min.js
index 0139babea4bfe..0a0cbd9db7e74 100644
--- a/lib/web/fotorama/fotorama.min.js
+++ b/lib/web/fotorama/fotorama.min.js
@@ -1,5 +1 @@
-/*!
- * Fotorama 4.6.4 | http://fotorama.io/license/
- */
-fotoramaVersion="4.6.4",function(a,b,c,d,e){"use strict";function Ba(a){var b="bez_"+d.makeArray(arguments).join("_").replace(".","p");if("function"!=typeof d.easing[b]){var c=function(a,b){var c=[null,null],d=[null,null],e=[null,null],f=function(f,g){return e[g]=3*a[g],d[g]=3*(b[g]-a[g])-e[g],c[g]=1-e[g]-d[g],f*(e[g]+f*(d[g]+f*c[g]))},g=function(a){return e[0]+a*(2*d[0]+3*c[0]*a)},h=function(a){for(var d,b=a,c=0;++c<14&&(d=f(b,0)-a,!(Math.abs(d)<.001));)b-=d/g(b);return b};return function(a){return f(h(a),1)}};d.easing[b]=function(b,d,e,f,g){return f*c([a[0],a[1]],[a[2],a[3]])(d/g)+e}}return b}function eb(){}function fb(a,b,c){return Math.max(isNaN(b)?-(1/0):b,Math.min(isNaN(c)?1/0:c,a))}function gb(a,b){return a.match(/ma/)&&a.match(/-?\d+(?!d)/g)[a.match(/3d/)?"vertical"===b?13:12:"vertical"===b?5:4]}function hb(a,b){return Ia?+gb(a.css("transform"),b):+a.css("vertical"===b?"top":"left").replace("px","")}function ib(a,b){var c={};if(Ia)switch(b){case"vertical":c.transform="translate3d(0, "+a+"px,0)";break;case"list":break;default:c.transform="translate3d("+a+"px,0,0)"}else"vertical"===b?c.top=a:c.left=a;return c}function jb(a){return{"transition-duration":a+"ms"}}function kb(a,b){return isNaN(a)?b:a}function lb(a,b){return kb(+String(a).replace(b||"px",""))}function mb(a){return/%$/.test(a)?lb(a,"%"):e}function nb(a,b){return kb(mb(a)/100*b,lb(a))}function ob(a){return(!isNaN(lb(a))||!isNaN(lb(a,"%")))&&a}function pb(a,b,c,d){return(a-(d||0))*(b+(c||0))}function qb(a,b,c,d){return-Math.round(a/(b+(c||0))-(d||0))}function rb(a){var b=a.data();if(!b.tEnd){var c=a[0],d={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",msTransition:"MSTransitionEnd",transition:"transitionend"};Rb(c,d[wa.prefixed("transition")],function(a){b.tProp&&a.propertyName.match(b.tProp)&&b.onEndFn()}),b.tEnd=!0}}function sb(a,b,c,d){var e,f=a.data();f&&(f.onEndFn=function(){e||(e=!0,clearTimeout(f.tT),c())},f.tProp=b,clearTimeout(f.tT),f.tT=setTimeout(function(){f.onEndFn()},1.5*d),rb(a))}function tb(a,b){var c=a.navdir||"horizontal";if(a.length){var d=a.data();Ia?(a.css(jb(0)),d.onEndFn=eb,clearTimeout(d.tT)):a.stop();var e=ub(b,function(){return hb(a,c)});return a.css(ib(e,c)),e}}function ub(){for(var a,b=0,c=arguments.length;b<c&&(a=b?arguments[b]():arguments[b],"number"!=typeof a);b++);return a}function vb(a,b){return Math.round(a+(b-a)/1.5)}function wb(){return wb.p=wb.p||("https:"===c.protocol?"https://":"http://"),wb.p}function xb(a){var c=b.createElement("a");return c.href=a,c}function yb(a,b){if("string"!=typeof a)return a;a=xb(a);var c,d;if(a.host.match(/youtube\.com/)&&a.search){if(c=a.search.split("v=")[1]){var e=c.indexOf("&");e!==-1&&(c=c.substring(0,e)),d="youtube"}}else a.host.match(/youtube\.com|youtu\.be/)?(c=a.pathname.replace(/^\/(embed\/|v\/)?/,"").replace(/\/.*/,""),d="youtube"):a.host.match(/vimeo\.com/)&&(d="vimeo",c=a.pathname.replace(/^\/(video\/)?/,"").replace(/\/.*/,""));return c&&d||!b||(c=a.href,d="custom"),!!c&&{id:c,type:d,s:a.search.replace(/^\?/,""),p:wb()}}function zb(a,b,c){var e,f,g=a.video;return"youtube"===g.type?(f=wb()+"img.youtube.com/vi/"+g.id+"/default.jpg",e=f.replace(/\/default.jpg$/,"/hqdefault.jpg"),a.thumbsReady=!0):"vimeo"===g.type?d.ajax({url:wb()+"vimeo.com/api/v2/video/"+g.id+".json",dataType:"jsonp",success:function(d){a.thumbsReady=!0,Ab(b,{img:d[0].thumbnail_large,thumb:d[0].thumbnail_small},a.i,c)}}):a.thumbsReady=!0,{img:e,thumb:f}}function Ab(a,b,c,e){for(var f=0,g=a.length;f<g;f++){var h=a[f];if(h.i===c&&h.thumbsReady){var i={videoReady:!0};i[Xa]=i[Za]=i[Ya]=!1,e.splice(f,1,d.extend({},h,i,b));break}}}function Bb(a){function c(a,b,c){var f=a.children("img").eq(0),g=a.attr("href"),h=a.attr("src"),i=f.attr("src"),j=b.video,k=!!c&&yb(g,j===!0);k?g=!1:k=j,e(a,f,d.extend(b,{video:k,img:b.img||g||h||i,thumb:b.thumb||i||h||g}))}function e(a,b,c){var e=c.thumb&&c.img!==c.thumb,f=lb(c.width||a.attr("width")),g=lb(c.height||a.attr("height"));d.extend(c,{width:f,height:g,thumbratio:Qb(c.thumbratio||lb(c.thumbwidth||b&&b.attr("width")||e||f)/lb(c.thumbheight||b&&b.attr("height")||e||g))})}var b=[];return a.children().each(function(){var a=d(this),f=Pb(d.extend(a.data(),{id:a.attr("id")}));if(a.is("a, img"))c(a,f,!0);else{if(a.is(":empty"))return;e(a,null,d.extend(f,{html:this,_html:a.html()}))}b.push(f)}),b}function Cb(a){return 0===a.offsetWidth&&0===a.offsetHeight}function Db(a){return!d.contains(b.documentElement,a)}function Eb(a,b,c,d){return Eb.i||(Eb.i=1,Eb.ii=[!0]),d=d||Eb.i,"undefined"==typeof Eb.ii[d]&&(Eb.ii[d]=!0),a()?b():Eb.ii[d]&&setTimeout(function(){Eb.ii[d]&&Eb(a,b,c,d)},c||100),Eb.i++}function Fb(a,b){var c=a.data(),d=c.measures;if(d&&(!c.l||c.l.W!==d.width||c.l.H!==d.height||c.l.r!==d.ratio||c.l.w!==b.w||c.l.h!==b.h)){var e=fb(b.h,0,d.height),f=e*d.ratio;$b.setRatio(a,f,e),c.l={W:d.width,H:d.height,r:d.ratio,w:b.w,h:b.h}}return!0}function Gb(a,b){var c=a[0];c.styleSheet?c.styleSheet.cssText=b:a.html(b)}function Hb(a,b,c,d){return b!==c&&("vertical"===d?a<=b?"top":a>=c?"bottom":"top bottom":a<=b?"left":a>=c?"right":"left right")}function Ib(a,b,c){c=c||{},a.each(function(){var f,a=d(this),e=a.data();e.clickOn||(e.clickOn=!0,d.extend(hc(a,{onStart:function(a){f=a,(c.onStart||eb).call(this,a)},onMove:c.onMove||eb,onTouchEnd:c.onTouchEnd||eb,onEnd:function(a){a.moved||b.call(this,f)}}),{noMove:!0}))})}function Jb(a,b){return'<div class="'+a+'">'+(b||"")+"</div>"}function Kb(a){return"."+a}function Lb(a){var b='<iframe src="'+a.p+a.type+".com/embed/"+a.id+'" frameborder="0" allowfullscreen></iframe>';return b}function Mb(a){for(var b=a.length;b;){var c=Math.floor(Math.random()*b--),d=a[b];a[b]=a[c],a[c]=d}return a}function Nb(a){return"[object Array]"==Object.prototype.toString.call(a)&&d.map(a,function(a){return d.extend({},a)})}function Ob(a,b,c){a.scrollLeft(b||0).scrollTop(c||0)}function Pb(a){if(a){var b={};return d.each(a,function(a,c){b[a.toLowerCase()]=c}),b}}function Qb(a){if(a){var b=+a;return isNaN(b)?(b=a.split("/"),+b[0]/+b[1]||e):b}}function Rb(a,b,c,d){b&&(a.addEventListener?a.addEventListener(b,c,!!d):a.attachEvent("on"+b,c))}function Sb(a,b){return a>b.max?a=b.max:a<b.min&&(a=b.min),a}function Tb(a,b,c,d,e,f,g){var h,i,j;return"horizontal"===g?(i=a.thumbwidth,j=f.width()):(i=a.thumbheight,j=f.height()),h=(i+a.margin)*(c+1)>=j-d?"horizontal"===g?-e.position().left:-e.position().top:(i+a.margin)*c<=Math.abs(d)?"horizontal"===g?-e.position().left+j-(i+a.margin):-e.position().top+j-(i+a.margin):d,h=Sb(h,b),h||0}function Ub(a){return!!a.getAttribute("disabled")}function Vb(a,b){return b?{disabled:a}:{tabindex:a*-1+"",disabled:a}}function Wb(a,b){Rb(a,"keyup",function(c){Ub(a)||13==c.keyCode&&b.call(a,c)})}function Xb(a,b){Rb(a,"focus",a.onfocusin=function(c){b.call(a,c)},!0)}function Yb(a,b){a.preventDefault?a.preventDefault():a.returnValue=!1,b&&a.stopPropagation&&a.stopPropagation()}function Zb(a){return a?">":"<"}function _b(a,b){var c=a.data(),e=Math.round(b.pos),f=function(){c&&c.sliding&&(c.sliding=!1),(b.onEnd||eb)()};"undefined"!=typeof b.overPos&&b.overPos!==b.pos&&(e=b.overPos);var g=d.extend(ib(e,b.direction),b.width&&{width:b.width},b.height&&{height:b.height});c&&c.sliding&&(c.sliding=!0),Ia?(a.css(d.extend(jb(b.time),g)),b.time>10?sb(a,"transform",f,b.time):f()):a.stop().animate(g,b.time,_a,f)}function ac(a,b,c,e,f,g){var h="undefined"!=typeof g;if(h||(f.push(arguments),Array.prototype.push.call(arguments,f.length),!(f.length>1))){a=a||d(a),b=b||d(b);var i=a[0],j=b[0],k="crossfade"===e.method,l=function(){if(!l.done){l.done=!0;var a=(h||f.shift())&&f.shift();a&&ac.apply(this,a),(e.onEnd||eb)(!!a)}},m=e.time/(g||1);c.removeClass(P+" "+O),a.stop().addClass(P),b.stop().addClass(O),k&&j&&a.fadeTo(0,0),a.fadeTo(k?m:0,1,k&&l),b.fadeTo(m,0,l),i&&k||j||l()}}function gc(a){var b=(a.touches||[])[0]||a;a._x=b.pageX||b.originalEvent.pageX,a._y=b.clientY||b.originalEvent.clientY,a._now=d.now()}function hc(a,c){function p(a){return i=d(a.target),f.checked=l=m=o=!1,g||f.flow||a.touches&&a.touches.length>1||a.which>1||bc&&bc.type!==a.type&&dc||(l=c.select&&i.is(c.select,e))?l:(k="touchstart"===a.type,m=i.is("a, a *",e),j=f.control,n=f.noMove||f.noSwipe||j?16:f.snap?0:4,gc(a),h=bc=a,cc=a.type.replace(/down|start/,"move").replace(/Down/,"Move"),(c.onStart||eb).call(e,a,{control:j,$target:i}),g=f.flow=!0,void(k&&!f.go||Yb(a)))}function q(a){if(a.touches&&a.touches.length>1||Na&&!a.isPrimary||cc!==a.type||!g)return g&&r(),void(c.onTouchEnd||eb)();gc(a);var b=Math.abs(a._x-h._x),d=Math.abs(a._y-h._y),i=b-d,j=(f.go||f.x||i>=0)&&!f.noSwipe,l=i<0;k&&!f.checked?(g=j)&&Yb(a):(Yb(a),(c.onMove||eb).call(e,a,{touch:k})),!o&&Math.sqrt(Math.pow(b,2)+Math.pow(d,2))>n&&(o=!0),f.checked=f.checked||j||l}function r(a){(c.onTouchEnd||eb)();var b=g;f.control=g=!1,b&&(f.flow=!1),!b||m&&!f.checked||(a&&Yb(a),dc=!0,clearTimeout(ec),ec=setTimeout(function(){dc=!1},1e3),(c.onEnd||eb).call(e,{moved:o,$target:i,control:j,touch:k,startEvent:h,aborted:!a||"MSPointerCancel"===a.type}))}function s(){f.flow||(f.flow=!0)}function t(){f.flow&&(f.flow=!1)}var g,h,i,j,k,l,m,n,o,e=a[0],f={};return Na?(Rb(e,"MSPointerDown",p),Rb(b,"MSPointerMove",q),Rb(b,"MSPointerCancel",r),Rb(b,"MSPointerUp",r)):(Rb(e,"touchstart",p),Rb(e,"touchmove",q),Rb(e,"touchend",r),Rb(b,"touchstart",s),Rb(b,"touchend",t),Rb(b,"touchcancel",t),Ca.on("scroll",t),a.on("mousedown pointerdown",p),Da.on("mousemove pointermove",q).on("mouseup pointerup",r)),fc=wa.touch?"a":"div",a.on("click",fc,function(a){f.checked&&Yb(a)}),f}function ic(a,b){function w(d,e){v=!0,g=h="vertical"===r?d._y:d._x,m=d._now,l=[[m,g]],i=j=f.noMove||e?0:tb(a,(b.getPos||eb)()),(b.onStart||eb).call(c,d)}function x(b,c){o=f.min,p=f.max,q=f.snap,r=f.direction||"horizontal",a.navdir=r,s=b.altKey,v=u=!1,t=c.control,t||e.sliding||w(b)}function y(d,e){f.noSwipe||(v||w(d),h="vertical"===r?d._y:d._x,l.push([d._now,h]),j=i-(g-h),k=Hb(j,o,p,r),j<=o?j=vb(j,o):j>=p&&(j=vb(j,p)),f.noMove||(a.css(ib(j,r)),u||(u=!0,e.touch||Na||a.addClass(ea)),(b.onMove||eb).call(c,d,{pos:j,edge:k})))}function z(e){if(!f.noSwipe||!e.moved){v||w(e.startEvent,!0),e.touch||Na||a.removeClass(ea),n=d.now();for(var k,m,t,x,y,z,A,B,D,g=n-Pa,u=null,C=Qa,E=b.friction,F=l.length-1;F>=0;F--){if(k=l[F][0],m=Math.abs(k-g),null===u||m<t)u=k,x=l[F][1];else if(u===g||m>t)break;t=m}A=fb(j,o,p);var G=x-h,H=G>=0,I=n-u,J=I>Pa,K=!J&&j!==i&&A===j;q&&(A=fb(Math[K?H?"floor":"ceil":"round"](j/q)*q,o,p),o=p=A),K&&(q||A===j)&&(D=-(G/I),C*=fb(Math.abs(D),b.timeLow,b.timeHigh),y=Math.round(j+D*C/E),q||(A=y),(!H&&y>p||H&&y<o)&&(z=H?o:p,B=y-z,q||(A=z),B=fb(A+.03*B,z-50,z+50),C=Math.abs((j-B)/(D/E)))),C*=s?10:1,(b.onEnd||eb).call(c,d.extend(e,{moved:e.moved||J&&q,pos:j,newPos:A,overPos:B,time:C,dir:r}))}}var g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,c=a[0],e=a.data(),f={};return f=d.extend(hc(b.$wrap,d.extend({},b,{onStart:x,onMove:y,onEnd:z})),f)}function jc(a,b){var e,f,g,c=a[0],h={prevent:{}};return Rb(c,Oa,function(a){var c=a.wheelDeltaY||-1*a.deltaY||0,i=a.wheelDeltaX||-1*a.deltaX||0,j=Math.abs(i)&&!Math.abs(c),k=Zb(i<0),l=f===k,m=d.now(),n=m-g<Pa;f=k,g=m,j&&h.ok&&(!h.prevent[k]||e)&&(Yb(a,!0),e&&l&&n||(b.shift&&(e=!0,clearTimeout(h.t),h.t=setTimeout(function(){e=!1},Ra)),(b.onEnd||eb)(a,b.shift?k:i)))}),h}function kc(){d.each(d.Fotorama.instances,function(a,b){b.index=a})}function lc(a){d.Fotorama.instances.push(a),kc()}function mc(a){d.Fotorama.instances.splice(a.index,1),kc()}var f="fotorama",g="fotorama__fullscreen",h=f+"__wrap",i=h+"--css2",j=h+"--css3",k=h+"--video",l=h+"--fade",m=h+"--slide",n=h+"--no-controls",o=h+"--no-shadows",p=h+"--pan-y",q=h+"--rtl",s=h+"--no-captions",t=h+"--toggle-arrows",u=f+"__stage",v=u+"__frame",w=v+"--video",x=u+"__shaft",y=f+"__grab",z=f+"__pointer",A=f+"__arr",B=A+"--disabled",C=A+"--prev",D=A+"--next",E=f+"__nav",F=E+"-wrap",G=E+"__shaft",H=F+"--vertical",I=F+"--list",J=F+"--horizontal",K=E+"--dots",L=E+"--thumbs",M=E+"__frame",N=f+"__fade",O=N+"-front",P=N+"-rear",Q=f+"__shadow",R=Q+"s",S=R+"--left",T=R+"--right",U=R+"--top",V=R+"--bottom",W=f+"__active",X=f+"__select",Y=f+"--hidden",Z=f+"--fullscreen",$=f+"__fullscreen-icon",_=f+"__error",aa=f+"__loading",ba=f+"__loaded",ca=ba+"--full",da=ba+"--img",ea=f+"__grabbing",fa=f+"__img",ga=fa+"--full",ha=f+"__thumb",ia=ha+"__arr--left",ja=ha+"__arr--right",ka=ha+"-border",la=f+"__html",ma=f+"-video-container",na=f+"__video",oa=na+"-play",pa=na+"-close",qa=f+"_horizontal_ratio",ra=f+"_vertical_ratio",sa=f+"__spinner",ta=sa+"--show",ua=d&&d.fn.jquery.split(".");if(!ua||ua[0]<1||1==ua[0]&&ua[1]<8)throw"Fotorama requires jQuery 1.8 or later and will not run without it.";var va={},wa=function(a,b,c){function y(a){i.cssText=a}function A(a,b){return typeof a===b}function B(a,b){return!!~(""+a).indexOf(b)}function C(a,b){for(var d in a){var e=a[d];if(!B(e,"-")&&i[e]!==c)return"pfx"!=b||e}return!1}function D(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:A(f,"function")?f.bind(d||b):f}return!1}function E(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+n.join(d+" ")+d).split(" ");return A(b,"string")||A(b,"undefined")?C(e,b):(e=(a+" "+o.join(d+" ")+d).split(" "),D(e,b,c))}var j,u,x,d="2.8.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,l=({}.toString," -webkit- -moz- -o- -ms- ".split(" ")),m="Webkit Moz O ms",n=m.split(" "),o=m.toLowerCase().split(" "),p={},s=[],t=s.slice,v=function(a,c,d,e){var h,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))for(;d--;)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),l.appendChild(j);return h=["&#173;",'<style id="s',g,'">',a,"</style>"].join(""),l.id=g,(m?l:n).innerHTML+=h,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=f.style.overflow,f.style.overflow="hidden",f.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),f.style.overflow=k),!!i},w={}.hasOwnProperty;x=A(w,"undefined")||A(w.call,"undefined")?function(a,b){return b in a&&A(a.constructor.prototype[b],"undefined")}:function(a,b){return w.call(a,b)},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if("function"!=typeof c)throw new TypeError;var d=t.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(t.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(t.call(arguments)))};return e}),p.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:v(["@media (",l.join("touch-enabled),("),g,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=9===a.offsetTop}),c},p.csstransforms3d=function(){var a=!!E("perspective");return a&&"webkitPerspective"in f.style&&v("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=9===b.offsetLeft&&3===b.offsetHeight}),a},p.csstransitions=function(){return E("transition")};for(var F in p)x(p,F)&&(u=F.toLowerCase(),e[u]=p[F](),s.push((e[u]?"":"no-")+u));return e.addTest=function(a,b){if("object"==typeof a)for(var d in a)x(a,d)&&e.addTest(d,a[d]);else{if(a=a.toLowerCase(),e[a]!==c)return e;b="function"==typeof b?b():b,"undefined"!=typeof enableClasses&&enableClasses&&(f.className+=" "+(b?"":"no-")+a),e[a]=b}return e},y(""),h=j=null,e._version=d,e._prefixes=l,e._domPrefixes=o,e._cssomPrefixes=n,e.testProp=function(a){return C([a])},e.testAllProps=E,e.testStyles=v,e.prefixed=function(a,b,c){return b?E(a,b,c):E(a,"pfx")},e}(a,b),xa={ok:!1,is:function(){return!1},request:function(){},cancel:function(){},event:"",prefix:""},ya="webkit moz o ms khtml".split(" ");if("undefined"!=typeof b.cancelFullScreen)xa.ok=!0;else for(var za=0,Aa=ya.length;za<Aa;za++)if(xa.prefix=ya[za],"undefined"!=typeof b[xa.prefix+"CancelFullScreen"]){xa.ok=!0;break}xa.ok&&(xa.event=xa.prefix+"fullscreenchange",xa.is=function(){switch(this.prefix){case"":return b.fullScreen;case"webkit":return b.webkitIsFullScreen;default:return b[this.prefix+"FullScreen"]}},xa.request=function(a){return""===this.prefix?a.requestFullScreen():a[this.prefix+"RequestFullScreen"]()},xa.cancel=function(a){return""===this.prefix?b.cancelFullScreen():b[this.prefix+"CancelFullScreen"]()});var Ea,Fa,Ca=d(a),Da=d(b),Ga="quirks"===c.hash.replace("#",""),Ha=wa.csstransforms3d,Ia=Ha&&!Ga,Ja=Ha||"CSS1Compat"===b.compatMode,Ka=xa.ok,La=navigator.userAgent.match(/Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i),Ma=!Ia||La,Na=navigator.msPointerEnabled,Oa="onwheel"in b.createElement("div")?"wheel":b.onmousewheel!==e?"mousewheel":"DOMMouseScroll",Pa=250,Qa=300,Ra=1400,Sa=5e3,Ta=2,Ua=64,Va=500,Wa=333,Xa="$stageFrame",Ya="$navDotFrame",Za="$navThumbFrame",$a="auto",_a=Ba([.1,0,.25,1]),ab=1200,bb=1,cb={width:null,minwidth:null,maxwidth:"100%",height:null,minheight:null,maxheight:null,ratio:null,margin:Ta,nav:"dots",navposition:"bottom",navwidth:null,thumbwidth:Ua,thumbheight:Ua,thumbmargin:Ta,thumbborderwidth:Ta,allowfullscreen:!1,transition:"slide",clicktransition:null,transitionduration:Qa,captions:!0,startindex:0,loop:!1,autoplay:!1,stopautoplayontouch:!0,keyboard:!1,arrows:!0,click:!0,swipe:!1,trackpad:!1,shuffle:!1,direction:"ltr",shadows:!0,showcaption:!0,navdir:"horizontal",navarrows:!0,navtype:"thumbs"},db={left:!0,right:!0,down:!0,up:!0,space:!1,home:!1,end:!1};Eb.stop=function(a){Eb.ii[a]=!1};var bc,cc,dc,ec,fc,$b=function(){function a(a,b,c){var d=b/c;d<=1?(a.parent().removeClass(qa),a.parent().addClass(ra)):(a.parent().removeClass(ra),a.parent().addClass(qa))}function b(a,b,c){var f=c;a.attr(f)||a.attr(f)===e||a.attr(f,b),a.find("["+f+"]").length&&a.find("["+f+"]").each(function(){d(this).attr(f,b)})}function c(a,b,c){var e,d=!1;return e=a.showCaption===c||a.showCaption===!0,!!b&&(a.caption&&e&&(d=!0),d)}return{setRatio:a,setThumbAttr:b,isExpectedCaption:c}}($b||{},jQuery);jQuery.Fotorama=function(c,r){function Yc(){d.each(ea,function(a,b){if(!b.i){b.i=ha++;var c=yb(b.video,!0);if(c){var d={};b.video=c,b.img||b.thumb?b.thumbsReady=!0:d=zb(b,ea,N),Ab(ea,{img:d.img,thumb:d.thumb},b.i,N)}}})}function Zc(a){return Dc[a]}function $c(){if(ya!==e)if("vertical"==r.navdir){var a=r.thumbwidth+r.thumbmargin;ya.css("left",a),Ha.css("right",a),vb.css("right",a),wa.css("width",wa.css("width")+a),Aa.css("max-width",wa.width()-a)}else ya.css("left",""),Ha.css("right",""),vb.css("right",""),wa.css("width",wa.css("width")+a),Aa.css("max-width","")}function _c(a){var j,b="keydown."+f,c=f+O,e="keydown."+c,h="keyup."+c,i="resize."+c+" orientationchange."+c;a?(Da.on(e,function(a){var b,c;bc&&27===a.keyCode?(b=!0,Vd(bc,!0,!0)):(N.fullScreen||r.keyboard&&!N.index)&&(27===a.keyCode?(b=!0,N.cancelFullScreen()):a.shiftKey&&32===a.keyCode&&Zc("space")||37===a.keyCode&&Zc("left")||38===a.keyCode&&Zc("up")&&d(":focus").attr("data-gallery-role")?(N.longPress.progress(),c="<"):32===a.keyCode&&Zc("space")||39===a.keyCode&&Zc("right")||40===a.keyCode&&Zc("down")&&d(":focus").attr("data-gallery-role")?(N.longPress.progress(),c=">"):36===a.keyCode&&Zc("home")?(N.longPress.progress(),c="<<"):35===a.keyCode&&Zc("end")&&(N.longPress.progress(),c=">>")),(b||c)&&Yb(a),j={index:c,slow:a.altKey,user:!0},c&&(N.longPress.inProgress?N.showWhileLongPress(j):N.show(j))}),a&&Da.on(h,function(a){N.longPress.inProgress&&N.showEndLongPress({user:!0}),N.longPress.reset()}),N.index||Da.off(b).on(b,"textarea, input, select",function(a){!Fa.hasClass(g)&&a.stopPropagation()}),Ca.on(i,N.resize)):(Da.off(e),Ca.off(i))}function ad(a){a!==ad.f&&(a?(c.addClass(f+" "+P).before(va).before(ua),lc(N)):(va.detach(),ua.detach(),c.html(qa.urtext).removeClass(P),mc(N)),_c(a),ad.f=a)}function bd(){ea=N.data=ea||Nb(r.data)||Bb(c),ra=N.size=ea.length,ee.ok&&r.shuffle&&Mb(ea),Yc(),cc=id(cc),ra&&ad(!0)}function cd(){var a=ra<2||bc;Hc.noMove=a||wc,Hc.noSwipe=a||!r.swipe,!Ac&&Aa.toggleClass(y,!r.click&&!Hc.noMove&&!Hc.noSwipe),Na&&wa.toggleClass(p,!Hc.noSwipe)}function dd(a){a===!0&&(a=""),r.autoplay=Math.max(+a||Sa,1.5*zc)}function ed(a){a.navarrows&&"thumbs"===a.nav?(rb.show(),sb.show()):(rb.hide(),sb.hide())}function fd(a,b){return Math.floor(wa.width()/(b.thumbwidth+b.thumbmargin))}function gd(){function b(b,c){a[b?"add":"remove"].push(c)}r.nav&&"dots"!==r.nav||(r.navdir="horizontal"),N.options=r=Pb(r),bb=fd(wa,r),wc="crossfade"===r.transition||"dissolve"===r.transition,qc=r.loop&&(ra>2||wc&&(!Ac||"slide"!==Ac)),zc=+r.transitionduration||Qa,Cc="rtl"===r.direction,Dc=d.extend({},r.keyboard&&db,r.keyboard),ed(r);var a={add:[],remove:[]};ra>1?(rc=r.nav,tc="top"===r.navposition,a.remove.push(X),La.toggle(r.arrows)):(rc=!1,La.hide()),Ad(),Cd(),Bd(),r.autoplay&&dd(r.autoplay),xc=lb(r.thumbwidth)||Ua,yc=lb(r.thumbheight)||Ua,Ic.ok=Kc.ok=r.trackpad&&!Ma,cd(),Kd(r,[Fc]),sc="thumbs"===rc,Oa.filter(":hidden")&&rc&&Oa.show(),sc?(td(ra,"navThumb"),_a=eb,Vc=Za,Gb(ua,d.Fotorama.jst.style({w:xc,h:yc,b:r.thumbborderwidth,m:r.thumbmargin,s:O,q:!Ja})),Ra.addClass(L).removeClass(K)):"dots"===rc?(td(ra,"navDot"),_a=cb,Vc=Ya,Ra.addClass(K).removeClass(L)):(Oa.hide(),rc=!1,Ra.removeClass(L+" "+K)),rc&&(tc?Oa.insertBefore(ya):Oa.insertAfter(ya),xd.nav=!1,xd(_a,Ta,"nav")),uc=r.allowfullscreen,uc?(vb.prependTo(ya),vc=Ka&&"native"===uc):(vb.detach(),vc=!1),b(wc,l),b(!wc,m),b(!r.captions,s),b(Cc,q),b(r.arrows,t),Bc=r.shadows&&!Ma,b(!Bc,o),wa.addClass(a.add.join(" ")).removeClass(a.remove.join(" ")),Ec=d.extend({},r),$c()}function hd(a){return a<0?(ra+a%ra)%ra:a>=ra?a%ra:a}function id(a){return fb(a,0,ra-1)}function jd(a){return qc?hd(a):id(a)}function kd(a){return!!(a>0||qc)&&a-1}function ld(a){return!!(a<ra-1||qc)&&a+1}function md(){Hc.min=qc?-(1/0):-pb(ra-1,Fc.w,r.margin,fc),Hc.max=qc?1/0:-pb(0,Fc.w,r.margin,fc),Hc.snap=Fc.w+r.margin}function nd(){var a="vertical"===r.navdir,b=a?Ta.height():Ta.width(),c=a?Fc.h:Fc.nw;Jc.min=Math.min(0,c-b),Jc.max=0,Jc.direction=r.navdir,Ta.toggleClass(y,!(Jc.noMove=Jc.min===Jc.max))}function od(a,b,c){if("number"==typeof a){a=new Array(a);var e=!0}return d.each(a,function(a,d){if(e&&(d=a),"number"==typeof d){var f=ea[hd(d)];if(f){var g="$"+b+"Frame",h=f[g];c.call(this,a,d,f,h,g,h&&h.data())}}})}function pd(a,b,c,d){(!Gc||"*"===Gc&&d===pc)&&(a=ob(r.width)||ob(a)||Va,b=ob(r.height)||ob(b)||Wa,N.resize({width:a,ratio:r.ratio||c||a/b},0,d!==pc&&"*"))}function qd(a,b,c,e){od(a,b,function(a,f,g,h,i,j){function s(a){var b=hd(f);Ld(a,{index:b,src:p,frame:ea[b]})}function t(){m.remove(),d.Fotorama.cache[p]="error",g.html&&"stage"===b||!q||q===p?(!p||g.html||k?"stage"===b&&(h.trigger("f:load").removeClass(aa+" "+_).addClass(ba),s("load"),pd()):(h.trigger("f:error").removeClass(aa).addClass(_),s("error")),j.state="error",!(ra>1&&ea[f]===g)||g.html||g.deleted||g.video||k||(g.deleted=!0,N.splice(f,1))):(g[o]=p=q,j.$full=null,qd([f],b,c,!0))}function u(){d.Fotorama.measures[p]=n.measures=d.Fotorama.measures[p]||{width:l.width,height:l.height,ratio:l.width/l.height},pd(n.measures.width,n.measures.height,n.measures.ratio,f),m.off("load error").addClass(""+(k?ga:fa)).attr("aria-hidden","false").prependTo(h),h.hasClass(v)&&!h.hasClass(ma)&&h.attr("href",m.attr("src")),Fb(m,(d.isFunction(c)?c():c)||Fc),d.Fotorama.cache[p]=j.state="loaded",setTimeout(function(){h.trigger("f:load").removeClass(aa+" "+_).addClass(ba+" "+(k?ca:da)),"stage"===b?s("load"):(g.thumbratio===$a||!g.thumbratio&&r.thumbratio===$a)&&(g.thumbratio=n.measures.ratio,ce())},0)}function w(){var a=10;Eb(function(){return!Tc||!a--&&!Ma},function(){u()})}if(h){var k=N.fullScreen&&!j.$full&&"stage"===b;if(!j.$img||e||k){var l=new Image,m=d(l),n=m.data();j[k?"$full":"$img"]=m;var o="stage"===b?k?"full":"img":"thumb",p=g[o],q=k?g.img:g["stage"===b?"thumb":"img"];if("navThumb"===b&&(h=j.$wrap),!p)return void t();d.Fotorama.cache[p]?!function a(){"error"===d.Fotorama.cache[p]?t():"loaded"===d.Fotorama.cache[p]?setTimeout(w,0):setTimeout(a,100)}():(d.Fotorama.cache[p]="*",m.on("load",w).on("error",t)),j.state="",l.src=p,j.data.caption&&(l.alt=j.data.caption||""),j.data.full&&d(l).data("original",j.data.full),$b.isExpectedCaption(g,r.showcaption)&&d(l).attr("aria-labelledby",g.labelledby)}}})}function rd(){var a=dc[Xa];a&&!a.data().state&&(Ub.addClass(ta),a.on("f:load f:error",function(){a.off("f:load f:error"),Ub.removeClass(ta)}))}function sd(a){Wb(a,_d),Xb(a,function(){setTimeout(function(){Ob(Ra)},0),Fd({time:zc,guessIndex:d(this).data().eq,minMax:Jc})})}function td(a,b){od(a,b,function(a,c,e,f,g,h){if(!f){f=e[g]=wa[g].clone(),h=f.data(),h.data=e;var i=f[0],j="labelledby"+d.now();"stage"===b?(e.html&&d('<div class="'+la+'"></div>').append(e._html?d(e.html).removeAttr("id").html(e._html):e.html).appendTo(f),e.id&&(j=e.id||j),e.labelledby=j,$b.isExpectedCaption(e,r.showcaption)&&d(d.Fotorama.jst.frameCaption({caption:e.caption,labelledby:j})).appendTo(f),e.video&&f.addClass(w).append(xb.clone()),Xb(i,function(){setTimeout(function(){Ob(ya)},0),Yd({index:h.eq,user:!0})}),Ba=Ba.add(f)):"navDot"===b?(sd(i),cb=cb.add(f)):"navThumb"===b&&(sd(i),h.$wrap=f.children(":first"),eb=eb.add(f),e.video&&h.$wrap.append(xb.clone()))}})}function ud(a,b){return a&&a.length&&Fb(a,b)}function vd(a){od(a,"stage",function(a,b,c,e,f,g){if(e){var h=hd(b);g.eq=h,Rc[Xa][h]=e.css(d.extend({left:wc?0:pb(b,Fc.w,r.margin,fc)},wc&&jb(0))),Db(e[0])&&(e.appendTo(Aa),Vd(c.$video)),ud(g.$img,Fc),ud(g.$full,Fc),!e.hasClass(v)||"false"===e.attr("aria-hidden")&&e.hasClass(W)||e.attr("aria-hidden","true")}})}function wd(a,b){var c,e;"thumbs"!==rc||isNaN(a)||(c=-a,e=-a+Fc.nw,"vertical"===r.navdir&&(a-=r.thumbheight,e=-a+Fc.h),eb.each(function(){var a=d(this),f=a.data(),g=f.eq,h=function(){return{h:yc,w:f.w}},i=h(),j="vertical"===r.navdir?f.t>e:f.l>e;i.w=f.w,f.l+f.w<c||j||ud(f.$img,i)||b&&qd([g],"navThumb",h)}))}function xd(a,b,c){if(!xd[c]){var e="nav"===c&&sc,f=0,g=0;b.append(a.filter(function(){for(var a,b=d(this),c=b.data(),e=0,f=ea.length;e<f;e++)if(c.data===ea[e]){a=!0,c.eq=e;break}return a||b.remove()&&!1}).sort(function(a,b){return d(a).data().eq-d(b).data().eq}).each(function(){var a=d(this),b=a.data();$b.setThumbAttr(a,b.data.caption,"aria-label")}).each(function(){if(e){var a=d(this),b=a.data(),c=Math.round(yc*b.data.thumbratio)||xc,h=Math.round(xc/b.data.thumbratio)||yc;b.t=g,b.h=h,b.l=f,b.w=c,a.css({width:c}),g+=h+r.thumbmargin,f+=c+r.thumbmargin}})),xd[c]=!0}}function yd(a){return a-Wc>Fc.w/3}function zd(a){return!(qc||cc+a&&cc-ra+a||bc)}function Ad(){var a=zd(0),b=zd(1);Ga.toggleClass(B,a).attr(Vb(a,!1)),Ha.toggleClass(B,b).attr(Vb(b,!1))}function Bd(){var a=!1,b=!1;if("thumbs"!==r.navtype||r.loop||(a=0==cc,b=cc==r.data.length-1),"slides"===r.navtype){var c=hb(Ta,r.navdir);a=c>=Jc.max,b=c<=Jc.min}rb.toggleClass(B,a).attr(Vb(a,!0)),sb.toggleClass(B,b).attr(Vb(b,!0))}function Cd(){Ic.ok&&(Ic.prevent={"<":zd(0),">":zd(1)})}function Dd(a){var c,d,e,f,b=a.data();sc?(c=b.l,d=b.t,e=b.w,f=b.h):(c=a.position().left,e=a.width());var g={c:c+e/2,min:-c+10*r.thumbmargin,max:-c+Fc.w-e-10*r.thumbmargin},h={c:d+f/2,min:-d+10*r.thumbmargin,max:-d+Fc.h-f-10*r.thumbmargin};return"vertical"===r.navdir?h:g}function Ed(a){var b=dc[Vc].data();_b(mb,{time:1.2*a,pos:"vertical"===r.navdir?b.t:b.l,width:b.w,height:b.h,direction:r.navdir})}function Fd(a){var d,e,f,g,h,i,j,k,b=ea[a.guessIndex][Vc],c=r.navtype;b&&("thumbs"===c?(d=Jc.min!==Jc.max,f=a.minMax||d&&Dd(dc[Vc]),g=d&&(a.keep&&Fd.t?Fd.l:fb((a.coo||Fc.nw/2)-Dd(b).c,f.min,f.max)),h=d&&(a.keep&&Fd.l?Fd.l:fb((a.coo||Fc.nw/2)-Dd(b).c,f.min,f.max)),i="vertical"===r.navdir?g:h,j=d&&fb(i,Jc.min,Jc.max)||0,e=1.1*a.time,_b(Ta,{time:e,pos:j,direction:r.navdir,onEnd:function(){wd(j,!0),Bd()}}),Ud(Ra,Hb(j,Jc.min,Jc.max,r.navdir)),Fd.l=i):(k=hb(Ta,r.navdir),e=1.11*a.time,j=Tb(r,Jc,a.guessIndex,k,b,Oa,r.navdir),_b(Ta,{time:e,pos:j,direction:r.navdir,onEnd:function(){wd(j,!0),Bd()}}),Ud(Ra,Hb(j,Jc.min,Jc.max,r.navdir))))}function Gd(){Hd(Vc),Qc[Vc].push(dc[Vc].addClass(W).attr("data-active",!0))}function Hd(a){for(var b=Qc[a];b.length;)b.shift().removeClass(W).attr("data-active",!1)}function Id(a){var b=Rc[a];d.each(ec,function(a,c){delete b[hd(c)]}),d.each(b,function(a,c){delete b[a],c.detach()})}function Jd(a){fc=gc=cc;var b=dc[Xa];b&&(Hd(Xa),Qc[Xa].push(b.addClass(W).attr("data-active",!0)),b.hasClass(v)&&b.attr("aria-hidden","false"),a||N.showStage.onEnd(!0),tb(Aa,0,!0),Id(Xa),vd(ec),md(),nd(),Wb(Aa[0],function(){c.hasClass(Z)||(N.requestFullScreen(),vb.focus())}))}function Kd(a,b){a&&d.each(b,function(b,c){c&&d.extend(c,{width:a.width||c.width,height:a.height,minwidth:a.minwidth,maxwidth:a.maxwidth,minheight:a.minheight,maxheight:a.maxheight,ratio:Qb(a.ratio)})})}function Ld(a,b){c.trigger(f+":"+a,[N,b])}function Md(){clearTimeout(Nd.t),Tc=1,r.stopautoplayontouch?N.stopAutoplay():Oc=!0}function Nd(){Tc&&(r.stopautoplayontouch||(Od(),Pd()),Nd.t=setTimeout(function(){Tc=0},Qa+Pa))}function Od(){Oc=!(!bc&&!Pc)}function Pd(){if(clearTimeout(Pd.t),Eb.stop(Pd.w),!r.autoplay||Oc)return void(N.autoplay&&(N.autoplay=!1,Ld("stopautoplay")));N.autoplay||(N.autoplay=!0,Ld("startautoplay"));var a=cc,b=dc[Xa].data();Pd.w=Eb(function(){return b.state||a!==cc},function(){Pd.t=setTimeout(function(){if(!Oc&&a===cc){var b=oc,c=ea[b][Xa].data();Pd.w=Eb(function(){return c.state||b!==oc},function(){Oc||b!==oc||N.show(qc?Zb(!Cc):oc)})}},r.autoplay)})}function Qd(a){var b;return"object"!=typeof a?(b=a,a={}):b=a.index,b=">"===b?gc+1:"<"===b?gc-1:"<<"===b?0:">>"===b?ra-1:b,b=isNaN(b)?e:b,b="undefined"==typeof b?cc||0:b}function Rd(a){N.activeIndex=cc=jd(a),kc=kd(cc),nc=ld(cc),oc=hd(cc+(Cc?-1:1)),ec=[cc,kc,nc],gc=qc?a:cc}function Sd(a){var b=Math.abs(hc-gc),c=ub(a.time,function(){return Math.min(zc*(1+(b-1)/12),2*zc)});return a.slow&&(c*=10),c}function Td(){N.fullScreen&&(N.fullScreen=!1,Ka&&xa.cancel(Q),Fa.removeClass(g),Ea.removeClass(g),c.removeClass(Z).insertAfter(va),Fc=d.extend({},Sc),Vd(bc,!0,!0),$d("x",!1),N.resize(),qd(ec,"stage"),Ob(Ca,Mc,Lc),Ld("fullscreenexit"))}function Ud(a,b){Bc&&(a.removeClass(S+" "+T),a.removeClass(U+" "+V),b&&!bc&&a.addClass(b.replace(/^|\s/g," "+R+"--")))}function Vd(a,b,c){b&&(wa.removeClass(k),bc=!1,cd()),a&&a!==bc&&(a.remove(),Ld("unloadvideo")),c&&(Od(),Pd())}function Wd(a){wa.toggleClass(n,a)}function Xd(a){if(!Hc.flow){var b=a?a.pageX:Xd.x,c=b&&!zd(yd(b))&&r.click;Xd.p!==c&&ya.toggleClass(z,c)&&(Xd.p=c,Xd.x=b)}}function Yd(a){clearTimeout(Yd.t),r.clicktransition&&r.clicktransition!==r.transition?setTimeout(function(){var b=r.transition;N.setOptions({transition:r.clicktransition}),Ac=b,Yd.t=setTimeout(function(){N.show(a)},10)},0):N.show(a)}function Zd(a,b){var e=a.target,f=d(e);f.hasClass(oa)?N.playVideo():e===wb?N.toggleFullScreen():bc?e===Rb&&Vd(bc,!0,!0):c.hasClass(Z)||N.requestFullScreen()}function $d(a,b){Hc[a]=Jc[a]=b}function _d(a){var b=d(this).data().eq;Yd("thumbs"===r.navtype?{index:b,slow:a.altKey,user:!0,coo:a._x-Ra.offset().left}:{index:b,slow:a.altKey,user:!0})}function ae(a){Yd({index:La.index(this)?">":"<",slow:a.altKey,user:!0})}function be(a){Xb(a,function(){setTimeout(function(){Ob(ya)},0),Wd(!1)})}function ce(){if(bd(),gd(),!ce.i){ce.i=!0;var a=r.startindex;cc=fc=gc=hc=pc=jd(a)||0}if(ra){if(de())return;bc&&Vd(bc,!0),ec=[],Id(Xa),ce.ok=!0,N.show({index:cc,time:0}),N.resize()}else N.destroy()}function de(){if(!de.f===Cc)return de.f=Cc,cc=ra-1-cc,N.reverse(),!0}function ee(){ee.ok&&(ee.ok=!1,Ld("ready"))}Ea=d("html"),Fa=d("body");var ea,ra,_a,bc,dc,ec,fc,gc,hc,kc,nc,oc,pc,qc,rc,sc,tc,uc,vc,wc,xc,yc,zc,Ac,Bc,Cc,Dc,Gc,Lc,Mc,Nc,Oc,Pc,Sc,Tc,Uc,Vc,N=this,O=d.now(),P=f+O,Q=c[0],ha=1,qa=c.data(),ua=d("<style></style>"),va=d(Jb(Y)),wa=c.find(Kb(h)),ya=wa.find(Kb(u)),Aa=(ya[0],c.find(Kb(x))),Ba=d(),Ga=c.find(Kb(C)),Ha=c.find(Kb(D)),La=c.find(Kb(A)),Oa=c.find(Kb(F)),Ra=Oa.find(Kb(E)),Ta=Ra.find(Kb(G)),cb=d(),eb=d(),mb=(Aa.data(),Ta.data(),c.find(Kb(ka))),rb=c.find(Kb(ia)),sb=c.find(Kb(ja)),vb=c.find(Kb($)),wb=vb[0],xb=d(Jb(oa)),Cb=c.find(Kb(pa)),Rb=Cb[0],Ub=c.find(Kb(sa)),cc=!1,Ec={},Fc={},Hc={},Ic={},Jc={},Kc={},Qc={},Rc={},Wc=0,Xc=[];wa[Xa]=d('<div class="'+v+'"></div>'),wa[Za]=d(d.Fotorama.jst.thumb()),wa[Ya]=d(d.Fotorama.jst.dots()),
-    Qc[Xa]=[],Qc[Za]=[],Qc[Ya]=[],Rc[Xa]={},wa.addClass(Ia?j:i),qa.fotorama=this,N.startAutoplay=function(a){return N.autoplay?this:(Oc=Pc=!1,dd(a||r.autoplay),Pd(),this)},N.stopAutoplay=function(){return N.autoplay&&(Oc=Pc=!0,Pd()),this},N.showSlide=function(a){var c,b=hb(Ta,r.navdir),d=550,e="horizontal"===r.navdir?r.thumbwidth:r.thumbheight,f=function(){Bd()};"next"===a&&(c=b-(e+r.margin)*bb),"prev"===a&&(c=b+(e+r.margin)*bb),c=Sb(c,Jc),wd(c,!0),_b(Ta,{time:d,pos:c,direction:r.navdir,onEnd:f})},N.showWhileLongPress=function(a){if(!N.longPress.singlePressInProgress){var b=Qd(a);Rd(b);var c=Sd(a)/50,d=dc;N.activeFrame=dc=ea[cc];var e=d===dc&&!a.user;return N.showNav(e,a,c),this}},N.showEndLongPress=function(a){if(!N.longPress.singlePressInProgress){var b=Qd(a);Rd(b);var c=Sd(a)/50,d=dc;N.activeFrame=dc=ea[cc];var e=d===dc&&!a.user;return N.showStage(e,a,c),Nc="undefined"!=typeof hc&&hc!==cc,hc=cc,this}},N.showStage=function(a,b,c){Vd(bc,dc.i!==ea[hd(fc)].i),td(ec,"stage"),vd(Ma?[gc]:[gc,kd(gc),ld(gc)]),$d("go",!0),a||Ld("show",{user:b.user,time:c}),Oc=!0;var d=b.overPos,e=N.showStage.onEnd=function(c){if(!e.ok){if(e.ok=!0,c||Jd(!0),a||Ld("showend",{user:b.user}),!c&&Ac&&Ac!==r.transition)return N.setOptions({transition:Ac}),void(Ac=!1);rd(),qd(ec,"stage"),$d("go",!1),Cd(),Xd(),Od(),Pd(),N.fullScreen?(dc[Xa].find("."+ga).attr("aria-hidden",!1),dc[Xa].find("."+fa).attr("aria-hidden",!0)):(dc[Xa].find("."+ga).attr("aria-hidden",!0),dc[Xa].find("."+fa).attr("aria-hidden",!1))}};if(wc){var f=dc[Xa],g=ea[hc]&&cc!==hc?ea[hc][Xa]:null;ac(f,g,Ba,{time:c,method:r.transition,onEnd:e},Xc)}else _b(Aa,{pos:-pb(gc,Fc.w,r.margin,fc),overPos:d,time:c,onEnd:e});Ad()},N.showNav=function(a,b,c){if(Bd(),rc){Gd();var d=id(cc+fb(gc-hc,-1,1));Fd({time:c,coo:d!==cc&&b.coo,guessIndex:"undefined"!=typeof b.coo?d:cc,keep:a}),sc&&Ed(c)}},N.show=function(a){N.longPress.singlePressInProgress=!0;var b=Qd(a);Rd(b);var c=Sd(a),d=dc;N.activeFrame=dc=ea[cc];var e=d===dc&&!a.user;return N.showStage(e,a,c),N.showNav(e,a,c),Nc="undefined"!=typeof hc&&hc!==cc,hc=cc,N.longPress.singlePressInProgress=!1,this},N.requestFullScreen=function(){if(uc&&!N.fullScreen){var b=d((N.activeFrame||{}).$stageFrame||{}).hasClass("fotorama-video-container");if(b)return;Lc=Ca.scrollTop(),Mc=Ca.scrollLeft(),Ob(Ca),$d("x",!0),Sc=d.extend({},Fc),c.addClass(Z).appendTo(Fa.addClass(g)),Ea.addClass(g),Vd(bc,!0,!0),N.fullScreen=!0,vc&&xa.request(Q),N.resize(),qd(ec,"stage"),rd(),Ld("fullscreenenter"),"ontouchstart"in a||vb.focus()}return this},N.cancelFullScreen=function(){return vc&&xa.is()?xa.cancel(b):Td(),this},N.toggleFullScreen=function(){return N[(N.fullScreen?"cancel":"request")+"FullScreen"]()},N.resize=function(b){if(!ea)return this;var c=arguments[1]||0,e=arguments[2];bb=fd(wa,r),Kd(N.fullScreen?{width:d(a).width(),maxwidth:null,minwidth:null,height:d(a).height(),maxheight:null,minheight:null}:Pb(b),[Fc,e||N.fullScreen||r]);var f=Fc.width,g=Fc.height,h=Fc.ratio,i=Ca.height()-(rc?Ra.height():0);if(ob(f)&&(wa.css({width:""}),wa.css({height:""}),ya.css({width:""}),ya.css({height:""}),Aa.css({width:""}),Aa.css({height:""}),Ra.css({width:""}),Ra.css({height:""}),wa.css({minWidth:Fc.minwidth||0,maxWidth:Fc.maxwidth||ab}),"dots"===rc&&Oa.hide(),f=Fc.W=Fc.w=wa.width(),Fc.nw=rc&&nb(r.navwidth,f)||f,Aa.css({width:Fc.w,marginLeft:(Fc.W-Fc.w)/2}),g=nb(g,i),g=g||h&&f/h)){if(f=Math.round(f),g=Fc.h=Math.round(fb(g,nb(Fc.minheight,i),nb(Fc.maxheight,i))),ya.css({width:f,height:g}),"vertical"!==r.navdir||N.fullscreen||Ra.width(r.thumbwidth+2*r.thumbmargin),"horizontal"!==r.navdir||N.fullscreen||Ra.height(r.thumbheight+2*r.thumbmargin),"dots"===rc&&(Ra.width(f).height("auto"),Oa.show()),"vertical"===r.navdir&&N.fullScreen&&ya.css("height",Ca.height()),"horizontal"===r.navdir&&N.fullScreen&&ya.css("height",Ca.height()-Ra.height()),rc){switch(r.navdir){case"vertical":Oa.removeClass(J),Oa.removeClass(I),Oa.addClass(H),Ra.stop().animate({height:Fc.h,width:r.thumbwidth},c);break;case"list":Oa.removeClass(H),Oa.removeClass(J),Oa.addClass(I);break;default:Oa.removeClass(H),Oa.removeClass(I),Oa.addClass(J),Ra.stop().animate({width:Fc.nw},c)}Jd(),Fd({guessIndex:cc,time:c,keep:!0}),sc&&xd.nav&&Ed(c)}Gc=e||!0,ee.ok=!0,ee()}return Wc=ya.offset().left,$c(),this},N.setOptions=function(a){return d.extend(r,a),ce(),this},N.shuffle=function(){return ea&&Mb(ea)&&ce(),this},N.longPress={threshold:1,count:0,thumbSlideTime:20,progress:function(){this.inProgress||(this.count++,this.inProgress=this.count>this.threshold)},end:function(){this.inProgress&&(this.isEnded=!0)},reset:function(){this.count=0,this.inProgress=!1,this.isEnded=!1}},N.destroy=function(){return N.cancelFullScreen(),N.stopAutoplay(),ea=N.data=null,ad(),ec=[],Id(Xa),ce.ok=!1,this},N.playVideo=function(){var a=dc,b=a.video,c=cc;return"object"==typeof b&&a.videoReady&&(vc&&N.fullScreen&&N.cancelFullScreen(),Eb(function(){return!xa.is()||c!==cc},function(){c===cc&&(a.$video=a.$video||d(Jb(na)).append(Lb(b)),a.$video.appendTo(a[Xa]),wa.addClass(k),bc=a.$video,cd(),La.blur(),vb.blur(),Ld("loadvideo"))})),this},N.stopVideo=function(){return Vd(bc,!0,!0),this},N.spliceByIndex=function(a,b){b.i=a+1,b.img&&d.ajax({url:b.img,type:"HEAD",success:function(){ea.splice(a,1,b),ce()}})},ya.on("mousemove",Xd),Hc=ic(Aa,{onStart:Md,onMove:function(a,b){Ud(ya,b.edge)},onTouchEnd:Nd,onEnd:function(a){var b;if(Ud(ya),b=(Na&&!Uc||a.touch)&&r.arrows,(a.moved||b&&a.pos!==a.newPos&&!a.control)&&a.$target[0]!==vb[0]){var c=qb(a.newPos,Fc.w,r.margin,fc);N.show({index:c,time:wc?zc:a.time,overPos:a.overPos,user:!0})}else a.aborted||a.control||Zd(a.startEvent,b)},timeLow:1,timeHigh:1,friction:2,select:"."+X+", ."+X+" *",$wrap:ya,direction:"horizontal"}),Jc=ic(Ta,{onStart:Md,onMove:function(a,b){Ud(Ra,b.edge)},onTouchEnd:Nd,onEnd:function(a){function b(){Fd.l=a.newPos,Od(),Pd(),wd(a.newPos,!0),Bd()}if(a.moved)a.pos!==a.newPos?(Oc=!0,_b(Ta,{time:a.time,pos:a.newPos,overPos:a.overPos,direction:r.navdir,onEnd:b}),wd(a.newPos),Bc&&Ud(Ra,Hb(a.newPos,Jc.min,Jc.max,a.dir))):b();else{var c=a.$target.closest("."+M,Ta)[0];c&&_d.call(c,a.startEvent)}},timeLow:.5,timeHigh:2,friction:5,$wrap:Ra,direction:r.navdir}),Ic=jc(ya,{shift:!0,onEnd:function(a,b){Md(),Nd(),N.show({index:b,slow:a.altKey})}}),Kc=jc(Ra,{onEnd:function(a,b){Md(),Nd();var c=tb(Ta)+.25*b;Ta.css(ib(fb(c,Jc.min,Jc.max),r.navdir)),Bc&&Ud(Ra,Hb(c,Jc.min,Jc.max,r.navdir)),Kc.prevent={"<":c>=Jc.max,">":c<=Jc.min},clearTimeout(Kc.t),Kc.t=setTimeout(function(){Fd.l=c,wd(c,!0)},Pa),wd(c)}}),wa.hover(function(){setTimeout(function(){Tc||Wd(!(Uc=!0))},0)},function(){Uc&&Wd(!(Uc=!1))}),Ib(La,function(a){Yb(a),ae.call(this,a)},{onStart:function(){Md(),Hc.control=!0},onTouchEnd:Nd}),Ib(rb,function(a){Yb(a),"thumbs"===r.navtype?N.show("<"):N.showSlide("prev")}),Ib(sb,function(a){Yb(a),"thumbs"===r.navtype?N.show(">"):N.showSlide("next")}),La.each(function(){Wb(this,function(a){ae.call(this,a)}),be(this)}),Wb(wb,function(){c.hasClass(Z)?(N.cancelFullScreen(),Aa.focus()):(N.requestFullScreen(),vb.focus())}),be(wb),d.each("load push pop shift unshift reverse sort splice".split(" "),function(a,b){N[b]=function(){return ea=ea||[],"load"!==b?Array.prototype[b].apply(ea,arguments):arguments[0]&&"object"==typeof arguments[0]&&arguments[0].length&&(ea=Nb(arguments[0])),ce(),N}}),ce()},d.fn.fotorama=function(b){return this.each(function(){var c=this,e=d(this),f=e.data(),g=f.fotorama;g?g.setOptions(b,!0):Eb(function(){return!Cb(c)},function(){f.urtext=e.html(),new d.Fotorama(e,d.extend({},cb,a.fotoramaDefaults,b,f))})})},d.Fotorama.instances=[],d.Fotorama.cache={},d.Fotorama.measures={},d=d||{},d.Fotorama=d.Fotorama||{},d.Fotorama.jst=d.Fotorama.jst||{},d.Fotorama.jst.dots=function(a){var c="";va.escape;return c+='<div class="fotorama__nav__frame fotorama__nav__frame--dot" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__dot"></div>\r\n</div>'},d.Fotorama.jst.frameCaption=function(a){var b,c="";va.escape;return c+='<div class="fotorama__caption" aria-hidden="true">\r\n    <div class="fotorama__caption__wrap" id="'+(null==(b=a.labelledby)?"":b)+'">'+(null==(b=a.caption)?"":b)+"</div>\r\n</div>\r\n"},d.Fotorama.jst.style=function(a){var b,c="";va.escape;return c+=".fotorama"+(null==(b=a.s)?"":b)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+(null==(b=a.m)?"":b)+"px;\r\nheight:"+(null==(b=a.h)?"":b)+"px}\r\n.fotorama"+(null==(b=a.s)?"":b)+" .fotorama__thumb-border{\r\nheight:"+(null==(b=a.h)?"":b)+"px;\r\nborder-width:"+(null==(b=a.b)?"":b)+"px;\r\nmargin-top:"+(null==(b=a.m)?"":b)+"px}"},d.Fotorama.jst.thumb=function(a){var c="";va.escape;return c+='<div class="fotorama__nav__frame fotorama__nav__frame--thumb" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__thumb">\r\n    </div>\r\n</div>'}}(window,document,location,"undefined"!=typeof jQuery&&jQuery);
\ No newline at end of file
+fotoramaVersion="4.6.4";(function(window,document,location,$,undefined){"use strict";var _fotoramaClass="fotorama",_fullscreenClass="fotorama__fullscreen",wrapClass=_fotoramaClass+"__wrap",wrapCss2Class=wrapClass+"--css2",wrapCss3Class=wrapClass+"--css3",wrapVideoClass=wrapClass+"--video",wrapFadeClass=wrapClass+"--fade",wrapSlideClass=wrapClass+"--slide",wrapNoControlsClass=wrapClass+"--no-controls",wrapNoShadowsClass=wrapClass+"--no-shadows",wrapPanYClass=wrapClass+"--pan-y",wrapRtlClass=wrapClass+"--rtl",wrapOnlyActiveClass=wrapClass+"--only-active",wrapNoCaptionsClass=wrapClass+"--no-captions",wrapToggleArrowsClass=wrapClass+"--toggle-arrows",stageClass=_fotoramaClass+"__stage",stageFrameClass=stageClass+"__frame",stageFrameVideoClass=stageFrameClass+"--video",stageShaftClass=stageClass+"__shaft",grabClass=_fotoramaClass+"__grab",pointerClass=_fotoramaClass+"__pointer",arrClass=_fotoramaClass+"__arr",arrDisabledClass=arrClass+"--disabled",arrPrevClass=arrClass+"--prev",arrNextClass=arrClass+"--next",navClass=_fotoramaClass+"__nav",navWrapClass=navClass+"-wrap",navShaftClass=navClass+"__shaft",navShaftVerticalClass=navWrapClass+"--vertical",navShaftListClass=navWrapClass+"--list",navShafthorizontalClass=navWrapClass+"--horizontal",navDotsClass=navClass+"--dots",navThumbsClass=navClass+"--thumbs",navFrameClass=navClass+"__frame",fadeClass=_fotoramaClass+"__fade",fadeFrontClass=fadeClass+"-front",fadeRearClass=fadeClass+"-rear",shadowClass=_fotoramaClass+"__shadow",shadowsClass=shadowClass+"s",shadowsLeftClass=shadowsClass+"--left",shadowsRightClass=shadowsClass+"--right",shadowsTopClass=shadowsClass+"--top",shadowsBottomClass=shadowsClass+"--bottom",activeClass=_fotoramaClass+"__active",selectClass=_fotoramaClass+"__select",hiddenClass=_fotoramaClass+"--hidden",fullscreenClass=_fotoramaClass+"--fullscreen",fullscreenIconClass=_fotoramaClass+"__fullscreen-icon",errorClass=_fotoramaClass+"__error",loadingClass=_fotoramaClass+"__loading",loadedClass=_fotoramaClass+"__loaded",loadedFullClass=loadedClass+"--full",loadedImgClass=loadedClass+"--img",grabbingClass=_fotoramaClass+"__grabbing",imgClass=_fotoramaClass+"__img",imgFullClass=imgClass+"--full",thumbClass=_fotoramaClass+"__thumb",thumbArrLeft=thumbClass+"__arr--left",thumbArrRight=thumbClass+"__arr--right",thumbBorderClass=thumbClass+"-border",htmlClass=_fotoramaClass+"__html",videoContainerClass=_fotoramaClass+"-video-container",videoClass=_fotoramaClass+"__video",videoPlayClass=videoClass+"-play",videoCloseClass=videoClass+"-close",horizontalImageClass=_fotoramaClass+"_horizontal_ratio",verticalImageClass=_fotoramaClass+"_vertical_ratio",fotoramaSpinnerClass=_fotoramaClass+"__spinner",spinnerShowClass=fotoramaSpinnerClass+"--show";var JQUERY_VERSION=$&&$.fn.jquery.split(".");if(!JQUERY_VERSION||JQUERY_VERSION[0]<1||JQUERY_VERSION[0]==1&&JQUERY_VERSION[1]<8){throw"Fotorama requires jQuery 1.8 or later and will not run without it."}var _={};var Modernizr=function(window,document,undefined){var version="2.8.3",Modernizr={},docElement=document.documentElement,mod="modernizr",modElem=document.createElement(mod),mStyle=modElem.style,inputElem,toString={}.toString,prefixes=" -webkit- -moz- -o- -ms- ".split(" "),omPrefixes="Webkit Moz O ms",cssomPrefixes=omPrefixes.split(" "),domPrefixes=omPrefixes.toLowerCase().split(" "),tests={},inputs={},attrs={},classes=[],slice=classes.slice,featureName,injectElementWithStyles=function(rule,callback,nodes,testnames){var style,ret,node,docOverflow,div=document.createElement("div"),body=document.body,fakeBody=body||document.createElement("body");if(parseInt(nodes,10)){while(nodes--){node=document.createElement("div");node.id=testnames?testnames[nodes]:mod+(nodes+1);div.appendChild(node)}}style=["&#173;",'<style id="s',mod,'">',rule,"</style>"].join("");div.id=mod;(body?div:fakeBody).innerHTML+=style;fakeBody.appendChild(div);if(!body){fakeBody.style.background="";fakeBody.style.overflow="hidden";docOverflow=docElement.style.overflow;docElement.style.overflow="hidden";docElement.appendChild(fakeBody)}ret=callback(div,rule);if(!body){fakeBody.parentNode.removeChild(fakeBody);docElement.style.overflow=docOverflow}else{div.parentNode.removeChild(div)}return!!ret},_hasOwnProperty={}.hasOwnProperty,hasOwnProp;if(!is(_hasOwnProperty,"undefined")&&!is(_hasOwnProperty.call,"undefined")){hasOwnProp=function(object,property){return _hasOwnProperty.call(object,property)}}else{hasOwnProp=function(object,property){return property in object&&is(object.constructor.prototype[property],"undefined")}}if(!Function.prototype.bind){Function.prototype.bind=function bind(that){var target=this;if(typeof target!="function"){throw new TypeError}var args=slice.call(arguments,1),bound=function(){if(this instanceof bound){var F=function(){};F.prototype=target.prototype;var self=new F;var result=target.apply(self,args.concat(slice.call(arguments)));if(Object(result)===result){return result}return self}else{return target.apply(that,args.concat(slice.call(arguments)))}};return bound}}function setCss(str){mStyle.cssText=str}function setCssAll(str1,str2){return setCss(prefixes.join(str1+";")+(str2||""))}function is(obj,type){return typeof obj===type}function contains(str,substr){return!!~(""+str).indexOf(substr)}function testProps(props,prefixed){for(var i in props){var prop=props[i];if(!contains(prop,"-")&&mStyle[prop]!==undefined){return prefixed=="pfx"?prop:true}}return false}function testDOMProps(props,obj,elem){for(var i in props){var item=obj[props[i]];if(item!==undefined){if(elem===false)return props[i];if(is(item,"function")){return item.bind(elem||obj)}return item}}return false}function testPropsAll(prop,prefixed,elem){var ucProp=prop.charAt(0).toUpperCase()+prop.slice(1),props=(prop+" "+cssomPrefixes.join(ucProp+" ")+ucProp).split(" ");if(is(prefixed,"string")||is(prefixed,"undefined")){return testProps(props,prefixed)}else{props=(prop+" "+domPrefixes.join(ucProp+" ")+ucProp).split(" ");return testDOMProps(props,prefixed,elem)}}tests["touch"]=function(){var bool;if("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch){bool=true}else{injectElementWithStyles(["@media (",prefixes.join("touch-enabled),("),mod,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(node){bool=node.offsetTop===9})}return bool};tests["csstransforms3d"]=function(){var ret=!!testPropsAll("perspective");if(ret&&"webkitPerspective"in docElement.style){injectElementWithStyles("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(node,rule){ret=node.offsetLeft===9&&node.offsetHeight===3})}return ret};tests["csstransitions"]=function(){return testPropsAll("transition")};for(var feature in tests){if(hasOwnProp(tests,feature)){featureName=feature.toLowerCase();Modernizr[featureName]=tests[feature]();classes.push((Modernizr[featureName]?"":"no-")+featureName)}}Modernizr.addTest=function(feature,test){if(typeof feature=="object"){for(var key in feature){if(hasOwnProp(feature,key)){Modernizr.addTest(key,feature[key])}}}else{feature=feature.toLowerCase();if(Modernizr[feature]!==undefined){return Modernizr}test=typeof test=="function"?test():test;if(typeof enableClasses!=="undefined"&&enableClasses){docElement.className+=" "+(test?"":"no-")+feature}Modernizr[feature]=test}return Modernizr};setCss("");modElem=inputElem=null;Modernizr._version=version;Modernizr._prefixes=prefixes;Modernizr._domPrefixes=domPrefixes;Modernizr._cssomPrefixes=cssomPrefixes;Modernizr.testProp=function(prop){return testProps([prop])};Modernizr.testAllProps=testPropsAll;Modernizr.testStyles=injectElementWithStyles;Modernizr.prefixed=function(prop,obj,elem){if(!obj){return testPropsAll(prop,"pfx")}else{return testPropsAll(prop,obj,elem)}};return Modernizr}(window,document);var fullScreenApi={ok:false,is:function(){return false},request:function(){},cancel:function(){},event:"",prefix:""},browserPrefixes="webkit moz o ms khtml".split(" ");if(typeof document.cancelFullScreen!="undefined"){fullScreenApi.ok=true}else{for(var i=0,il=browserPrefixes.length;i<il;i++){fullScreenApi.prefix=browserPrefixes[i];if(typeof document[fullScreenApi.prefix+"CancelFullScreen"]!="undefined"){fullScreenApi.ok=true;break}}}if(fullScreenApi.ok){fullScreenApi.event=fullScreenApi.prefix+"fullscreenchange";fullScreenApi.is=function(){switch(this.prefix){case"":return document.fullScreen;case"webkit":return document.webkitIsFullScreen;default:return document[this.prefix+"FullScreen"]}};fullScreenApi.request=function(el){return this.prefix===""?el.requestFullScreen():el[this.prefix+"RequestFullScreen"]()};fullScreenApi.cancel=function(el){return this.prefix===""?document.cancelFullScreen():document[this.prefix+"CancelFullScreen"]()}}function bez(coOrdArray){var encodedFuncName="bez_"+$.makeArray(arguments).join("_").replace(".","p");if(typeof $["easing"][encodedFuncName]!=="function"){var polyBez=function(p1,p2){var A=[null,null],B=[null,null],C=[null,null],bezCoOrd=function(t,ax){C[ax]=3*p1[ax];B[ax]=3*(p2[ax]-p1[ax])-C[ax];A[ax]=1-C[ax]-B[ax];return t*(C[ax]+t*(B[ax]+t*A[ax]))},xDeriv=function(t){return C[0]+t*(2*B[0]+3*A[0]*t)},xForT=function(t){var x=t,i=0,z;while(++i<14){z=bezCoOrd(x,0)-t;if(Math.abs(z)<.001)break;x-=z/xDeriv(x)}return x};return function(t){return bezCoOrd(xForT(t),1)}};$["easing"][encodedFuncName]=function(x,t,b,c,d){return c*polyBez([coOrdArray[0],coOrdArray[1]],[coOrdArray[2],coOrdArray[3]])(t/d)+b}}return encodedFuncName}var $WINDOW=$(window),$DOCUMENT=$(document),$HTML,$BODY,QUIRKS_FORCE=location.hash.replace("#","")==="quirks",TRANSFORMS3D=Modernizr.csstransforms3d,CSS3=TRANSFORMS3D&&!QUIRKS_FORCE,COMPAT=TRANSFORMS3D||document.compatMode==="CSS1Compat",FULLSCREEN=fullScreenApi.ok,MOBILE=navigator.userAgent.match(/Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i),SLOW=!CSS3||MOBILE,MS_POINTER=navigator.msPointerEnabled,WHEEL="onwheel"in document.createElement("div")?"wheel":document.onmousewheel!==undefined?"mousewheel":"DOMMouseScroll",TOUCH_TIMEOUT=250,TRANSITION_DURATION=300,SCROLL_LOCK_TIMEOUT=1400,AUTOPLAY_INTERVAL=5e3,MARGIN=2,THUMB_SIZE=64,WIDTH=500,HEIGHT=333,STAGE_FRAME_KEY="$stageFrame",NAV_DOT_FRAME_KEY="$navDotFrame",NAV_THUMB_FRAME_KEY="$navThumbFrame",AUTO="auto",BEZIER=bez([.1,0,.25,1]),MAX_WIDTH=1200,thumbsPerSlide=1,OPTIONS={width:null,minwidth:null,maxwidth:"100%",height:null,minheight:null,maxheight:null,ratio:null,margin:MARGIN,nav:"dots",navposition:"bottom",navwidth:null,thumbwidth:THUMB_SIZE,thumbheight:THUMB_SIZE,thumbmargin:MARGIN,thumbborderwidth:MARGIN,allowfullscreen:false,transition:"slide",clicktransition:null,transitionduration:TRANSITION_DURATION,captions:true,startindex:0,loop:false,autoplay:false,stopautoplayontouch:true,keyboard:false,arrows:true,click:true,swipe:false,trackpad:false,shuffle:false,direction:"ltr",shadows:true,showcaption:true,navdir:"horizontal",navarrows:true,navtype:"thumbs"},KEYBOARD_OPTIONS={left:true,right:true,down:true,up:true,space:false,home:false,end:false};function noop(){}function minMaxLimit(value,min,max){return Math.max(isNaN(min)?-Infinity:min,Math.min(isNaN(max)?Infinity:max,value))}function readTransform(css,dir){return css.match(/ma/)&&css.match(/-?\d+(?!d)/g)[css.match(/3d/)?dir==="vertical"?13:12:dir==="vertical"?5:4]}function readPosition($el,dir){if(CSS3){return+readTransform($el.css("transform"),dir)}else{return+$el.css(dir==="vertical"?"top":"left").replace("px","")}}function getTranslate(pos,direction){var obj={};if(CSS3){switch(direction){case"vertical":obj.transform="translate3d(0, "+pos+"px,0)";break;case"list":break;default:obj.transform="translate3d("+pos+"px,0,0)";break}}else{direction==="vertical"?obj.top=pos:obj.left=pos}return obj}function getDuration(time){return{"transition-duration":time+"ms"}}function unlessNaN(value,alternative){return isNaN(value)?alternative:value}function numberFromMeasure(value,measure){return unlessNaN(+String(value).replace(measure||"px",""))}function numberFromPercent(value){return/%$/.test(value)?numberFromMeasure(value,"%"):undefined}function numberFromWhatever(value,whole){return unlessNaN(numberFromPercent(value)/100*whole,numberFromMeasure(value))}function measureIsValid(value){return(!isNaN(numberFromMeasure(value))||!isNaN(numberFromMeasure(value,"%")))&&value}function getPosByIndex(index,side,margin,baseIndex){return(index-(baseIndex||0))*(side+(margin||0))}function getIndexByPos(pos,side,margin,baseIndex){return-Math.round(pos/(side+(margin||0))-(baseIndex||0))}function bindTransitionEnd($el){var elData=$el.data();if(elData.tEnd)return;var el=$el[0],transitionEndEvent={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",msTransition:"MSTransitionEnd",transition:"transitionend"};addEvent(el,transitionEndEvent[Modernizr.prefixed("transition")],function(e){elData.tProp&&e.propertyName.match(elData.tProp)&&elData.onEndFn()});elData.tEnd=true}function afterTransition($el,property,fn,time){var ok,elData=$el.data();if(elData){elData.onEndFn=function(){if(ok)return;ok=true;clearTimeout(elData.tT);fn()};elData.tProp=property;clearTimeout(elData.tT);elData.tT=setTimeout(function(){elData.onEndFn()},time*1.5);bindTransitionEnd($el)}}function stop($el,pos){var dir=$el.navdir||"horizontal";if($el.length){var elData=$el.data();if(CSS3){$el.css(getDuration(0));elData.onEndFn=noop;clearTimeout(elData.tT)}else{$el.stop()}var lockedPos=getNumber(pos,function(){return readPosition($el,dir)});$el.css(getTranslate(lockedPos,dir));return lockedPos}}function getNumber(){var number;for(var _i=0,_l=arguments.length;_i<_l;_i++){number=_i?arguments[_i]():arguments[_i];if(typeof number==="number"){break}}return number}function edgeResistance(pos,edge){return Math.round(pos+(edge-pos)/1.5)}function getProtocol(){getProtocol.p=getProtocol.p||(location.protocol==="https:"?"https://":"http://");return getProtocol.p}function parseHref(href){var a=document.createElement("a");a.href=href;return a}function findVideoId(href,forceVideo){if(typeof href!=="string")return href;href=parseHref(href);var id,type;if(href.host.match(/youtube\.com/)&&href.search){id=href.search.split("v=")[1];if(id){var ampersandPosition=id.indexOf("&");if(ampersandPosition!==-1){id=id.substring(0,ampersandPosition)}type="youtube"}}else if(href.host.match(/youtube\.com|youtu\.be/)){id=href.pathname.replace(/^\/(embed\/|v\/)?/,"").replace(/\/.*/,"");type="youtube"}else if(href.host.match(/vimeo\.com/)){type="vimeo";id=href.pathname.replace(/^\/(video\/)?/,"").replace(/\/.*/,"")}if((!id||!type)&&forceVideo){id=href.href;type="custom"}return id?{id:id,type:type,s:href.search.replace(/^\?/,""),p:getProtocol()}:false}function getVideoThumbs(dataFrame,data,fotorama){var img,thumb,video=dataFrame.video;if(video.type==="youtube"){thumb=getProtocol()+"img.youtube.com/vi/"+video.id+"/default.jpg";img=thumb.replace(/\/default.jpg$/,"/hqdefault.jpg");dataFrame.thumbsReady=true}else if(video.type==="vimeo"){$.ajax({url:getProtocol()+"vimeo.com/api/v2/video/"+video.id+".json",dataType:"jsonp",success:function(json){dataFrame.thumbsReady=true;updateData(data,{img:json[0].thumbnail_large,thumb:json[0].thumbnail_small},dataFrame.i,fotorama)}})}else{dataFrame.thumbsReady=true}return{img:img,thumb:thumb}}function updateData(data,_dataFrame,i,fotorama){for(var _i=0,_l=data.length;_i<_l;_i++){var dataFrame=data[_i];if(dataFrame.i===i&&dataFrame.thumbsReady){var clear={videoReady:true};clear[STAGE_FRAME_KEY]=clear[NAV_THUMB_FRAME_KEY]=clear[NAV_DOT_FRAME_KEY]=false;fotorama.splice(_i,1,$.extend({},dataFrame,clear,_dataFrame));break}}}function getDataFromHtml($el){var data=[];function getDataFromImg($img,imgData,checkVideo){var $child=$img.children("img").eq(0),_imgHref=$img.attr("href"),_imgSrc=$img.attr("src"),_thumbSrc=$child.attr("src"),_video=imgData.video,video=checkVideo?findVideoId(_imgHref,_video===true):false;if(video){_imgHref=false}else{video=_video}getDimensions($img,$child,$.extend(imgData,{video:video,img:imgData.img||_imgHref||_imgSrc||_thumbSrc,thumb:imgData.thumb||_thumbSrc||_imgSrc||_imgHref}))}function getDimensions($img,$child,imgData){var separateThumbFLAG=imgData.thumb&&imgData.img!==imgData.thumb,width=numberFromMeasure(imgData.width||$img.attr("width")),height=numberFromMeasure(imgData.height||$img.attr("height"));$.extend(imgData,{width:width,height:height,thumbratio:getRatio(imgData.thumbratio||numberFromMeasure(imgData.thumbwidth||$child&&$child.attr("width")||separateThumbFLAG||width)/numberFromMeasure(imgData.thumbheight||$child&&$child.attr("height")||separateThumbFLAG||height))})}$el.children().each(function(){var $this=$(this),dataFrame=optionsToLowerCase($.extend($this.data(),{id:$this.attr("id")}));if($this.is("a, img")){getDataFromImg($this,dataFrame,true)}else if(!$this.is(":empty")){getDimensions($this,null,$.extend(dataFrame,{html:this,_html:$this.html()}))}else return;data.push(dataFrame)});return data}function isHidden(el){return el.offsetWidth===0&&el.offsetHeight===0}function isDetached(el){return!$.contains(document.documentElement,el)}function waitFor(test,fn,timeout,i){if(!waitFor.i){waitFor.i=1;waitFor.ii=[true]}i=i||waitFor.i;if(typeof waitFor.ii[i]==="undefined"){waitFor.ii[i]=true}if(test()){fn()}else{waitFor.ii[i]&&setTimeout(function(){waitFor.ii[i]&&waitFor(test,fn,timeout,i)},timeout||100)}return waitFor.i++}waitFor.stop=function(i){waitFor.ii[i]=false};function fit($el,measuresToFit){var elData=$el.data(),measures=elData.measures;if(measures&&(!elData.l||elData.l.W!==measures.width||elData.l.H!==measures.height||elData.l.r!==measures.ratio||elData.l.w!==measuresToFit.w||elData.l.h!==measuresToFit.h)){var height=minMaxLimit(measuresToFit.h,0,measures.height),width=height*measures.ratio;UTIL.setRatio($el,width,height);elData.l={W:measures.width,H:measures.height,r:measures.ratio,w:measuresToFit.w,h:measuresToFit.h}}return true}function setStyle($el,style){var el=$el[0];if(el.styleSheet){el.styleSheet.cssText=style}else{$el.html(style)}}function findShadowEdge(pos,min,max,dir){return min===max?false:dir==="vertical"?pos<=min?"top":pos>=max?"bottom":"top bottom":pos<=min?"left":pos>=max?"right":"left right"}function smartClick($el,fn,_options){_options=_options||{};$el.each(function(){var $this=$(this),thisData=$this.data(),startEvent;if(thisData.clickOn)return;thisData.clickOn=true;$.extend(touch($this,{onStart:function(e){startEvent=e;(_options.onStart||noop).call(this,e)},onMove:_options.onMove||noop,onTouchEnd:_options.onTouchEnd||noop,onEnd:function(result){if(result.moved)return;fn.call(this,startEvent)}}),{noMove:true})})}function div(classes,child){return'<div class="'+classes+'">'+(child||"")+"</div>"}function cls(className){return"."+className}function createVideoFrame(videoItem){var frame='<iframe src="'+videoItem.p+videoItem.type+".com/embed/"+videoItem.id+'" frameborder="0" allowfullscreen></iframe>';return frame}function shuffle(array){var l=array.length;while(l){var i=Math.floor(Math.random()*l--);var t=array[l];array[l]=array[i];array[i]=t}return array}function clone(array){return Object.prototype.toString.call(array)=="[object Array]"&&$.map(array,function(frame){return $.extend({},frame)})}function lockScroll($el,left,top){$el.scrollLeft(left||0).scrollTop(top||0)}function optionsToLowerCase(options){if(options){var opts={};$.each(options,function(key,value){opts[key.toLowerCase()]=value});return opts}}function getRatio(_ratio){if(!_ratio)return;var ratio=+_ratio;if(!isNaN(ratio)){return ratio}else{ratio=_ratio.split("/");return+ratio[0]/+ratio[1]||undefined}}function addEvent(el,e,fn,bool){if(!e)return;el.addEventListener?el.addEventListener(e,fn,!!bool):el.attachEvent("on"+e,fn)}function validateRestrictions(position,restriction){if(position>restriction.max){position=restriction.max}else{if(position<restriction.min){position=restriction.min}}return position}function validateSlidePos(opt,navShaftTouchTail,guessIndex,offsetNav,$guessNavFrame,$navWrap,dir){var position,size,wrapSize;if(dir==="horizontal"){size=opt.thumbwidth;wrapSize=$navWrap.width()}else{size=opt.thumbheight;wrapSize=$navWrap.height()}if((size+opt.margin)*(guessIndex+1)>=wrapSize-offsetNav){if(dir==="horizontal"){position=-$guessNavFrame.position().left}else{position=-$guessNavFrame.position().top}}else{if((size+opt.margin)*guessIndex<=Math.abs(offsetNav)){if(dir==="horizontal"){position=-$guessNavFrame.position().left+wrapSize-(size+opt.margin)}else{position=-$guessNavFrame.position().top+wrapSize-(size+opt.margin)}}else{position=offsetNav}}position=validateRestrictions(position,navShaftTouchTail);return position||0}function elIsDisabled(el){return!!el.getAttribute("disabled")}function disableAttr(FLAG,disable){if(disable){return{disabled:FLAG}}else{return{tabindex:FLAG*-1+"",disabled:FLAG}}}function addEnterUp(el,fn){addEvent(el,"keyup",function(e){elIsDisabled(el)||e.keyCode==13&&fn.call(el,e)})}function addFocus(el,fn){addEvent(el,"focus",el.onfocusin=function(e){fn.call(el,e)},true)}function stopEvent(e,stopPropagation){e.preventDefault?e.preventDefault():e.returnValue=false;stopPropagation&&e.stopPropagation&&e.stopPropagation()}function stubEvent($el,eventType){var isIOS=/ip(ad|hone|od)/i.test(window.navigator.userAgent);if(isIOS&&eventType==="touchend"){$el.on("touchend",function(e){$DOCUMENT.trigger("mouseup",e)})}$el.on(eventType,function(e){stopEvent(e,true);return false})}function getDirectionSign(forward){return forward?">":"<"}var UTIL=function(){function setRatioClass($el,wh,ht){var rateImg=wh/ht;if(rateImg<=1){$el.parent().removeClass(horizontalImageClass);$el.parent().addClass(verticalImageClass)}else{$el.parent().removeClass(verticalImageClass);$el.parent().addClass(horizontalImageClass)}}function setThumbAttr($frame,value,searchAttr){var attr=searchAttr;if(!$frame.attr(attr)&&$frame.attr(attr)!==undefined){$frame.attr(attr,value)}if($frame.find("["+attr+"]").length){$frame.find("["+attr+"]").each(function(){$(this).attr(attr,value)})}}function isExpectedCaption(frameItem,isExpected,undefined){var expected=false,frameExpected;frameItem.showCaption===undefined||frameItem.showCaption===true?frameExpected=true:frameExpected=false;if(!isExpected){return false}if(frameItem.caption&&frameExpected){expected=true}return expected}return{setRatio:setRatioClass,setThumbAttr:setThumbAttr,isExpectedCaption:isExpectedCaption}}(UTIL||{},jQuery);function slide($el,options){var elData=$el.data(),elPos=Math.round(options.pos),onEndFn=function(){if(elData&&elData.sliding){elData.sliding=false}(options.onEnd||noop)()};if(typeof options.overPos!=="undefined"&&options.overPos!==options.pos){elPos=options.overPos}var translate=$.extend(getTranslate(elPos,options.direction),options.width&&{width:options.width},options.height&&{height:options.height});if(elData&&elData.sliding){elData.sliding=true}if(CSS3){$el.css($.extend(getDuration(options.time),translate));if(options.time>10){afterTransition($el,"transform",onEndFn,options.time)}else{onEndFn()}}else{$el.stop().animate(translate,options.time,BEZIER,onEndFn)}}function fade($el1,$el2,$frames,options,fadeStack,chain){var chainedFLAG=typeof chain!=="undefined";if(!chainedFLAG){fadeStack.push(arguments);Array.prototype.push.call(arguments,fadeStack.length);if(fadeStack.length>1)return}$el1=$el1||$($el1);$el2=$el2||$($el2);var _$el1=$el1[0],_$el2=$el2[0],crossfadeFLAG=options.method==="crossfade",onEndFn=function(){if(!onEndFn.done){onEndFn.done=true;var args=(chainedFLAG||fadeStack.shift())&&fadeStack.shift();args&&fade.apply(this,args);(options.onEnd||noop)(!!args)}},time=options.time/(chain||1);$frames.removeClass(fadeRearClass+" "+fadeFrontClass);$el1.stop().addClass(fadeRearClass);$el2.stop().addClass(fadeFrontClass);crossfadeFLAG&&_$el2&&$el1.fadeTo(0,0);$el1.fadeTo(crossfadeFLAG?time:0,1,crossfadeFLAG&&onEndFn);$el2.fadeTo(time,0,onEndFn);_$el1&&crossfadeFLAG||_$el2||onEndFn()}var lastEvent,moveEventType,preventEvent,preventEventTimeout,dragDomEl;function extendEvent(e){var touch=(e.touches||[])[0]||e;e._x=touch.pageX||touch.originalEvent.pageX;e._y=touch.clientY||touch.originalEvent.clientY;e._now=$.now()}function touch($el,options){var el=$el[0],tail={},touchEnabledFLAG,startEvent,$target,controlTouch,touchFLAG,targetIsSelectFLAG,targetIsLinkFlag,tolerance,moved;function onStart(e){$target=$(e.target);tail.checked=targetIsSelectFLAG=targetIsLinkFlag=moved=false;if(touchEnabledFLAG||tail.flow||e.touches&&e.touches.length>1||e.which>1||lastEvent&&lastEvent.type!==e.type&&preventEvent||(targetIsSelectFLAG=options.select&&$target.is(options.select,el)))return targetIsSelectFLAG;touchFLAG=e.type==="touchstart";targetIsLinkFlag=$target.is("a, a *",el);controlTouch=tail.control;tolerance=tail.noMove||tail.noSwipe||controlTouch?16:!tail.snap?4:0;extendEvent(e);startEvent=lastEvent=e;moveEventType=e.type.replace(/down|start/,"move").replace(/Down/,"Move");(options.onStart||noop).call(el,e,{control:controlTouch,$target:$target});touchEnabledFLAG=tail.flow=true;if(!touchFLAG||tail.go)stopEvent(e)}function onMove(e){if(e.touches&&e.touches.length>1||MS_POINTER&&!e.isPrimary||moveEventType!==e.type||!touchEnabledFLAG){touchEnabledFLAG&&onEnd();(options.onTouchEnd||noop)();return}extendEvent(e);var xDiff=Math.abs(e._x-startEvent._x),yDiff=Math.abs(e._y-startEvent._y),xyDiff=xDiff-yDiff,xWin=(tail.go||tail.x||xyDiff>=0)&&!tail.noSwipe,yWin=xyDiff<0;if(touchFLAG&&!tail.checked){if(touchEnabledFLAG=xWin){stopEvent(e)}}else{stopEvent(e);if(movedEnough(xDiff,yDiff)){(options.onMove||noop).call(el,e,{touch:touchFLAG})}}if(!moved&&movedEnough(xDiff,yDiff)&&Math.sqrt(Math.pow(xDiff,2)+Math.pow(yDiff,2))>tolerance){moved=true}tail.checked=tail.checked||xWin||yWin}function movedEnough(xDiff,yDiff){return xDiff>yDiff&&xDiff>1.5}function onEnd(e){(options.onTouchEnd||noop)();var _touchEnabledFLAG=touchEnabledFLAG;tail.control=touchEnabledFLAG=false;if(_touchEnabledFLAG){tail.flow=false}if(!_touchEnabledFLAG||targetIsLinkFlag&&!tail.checked)return;e&&stopEvent(e);preventEvent=true;clearTimeout(preventEventTimeout);preventEventTimeout=setTimeout(function(){preventEvent=false},1e3);(options.onEnd||noop).call(el,{moved:moved,$target:$target,control:controlTouch,touch:touchFLAG,startEvent:startEvent,aborted:!e||e.type==="MSPointerCancel"})}function onOtherStart(){if(tail.flow)return;tail.flow=true}function onOtherEnd(){if(!tail.flow)return;tail.flow=false}if(MS_POINTER){addEvent(el,"MSPointerDown",onStart);addEvent(document,"MSPointerMove",onMove);addEvent(document,"MSPointerCancel",onEnd);addEvent(document,"MSPointerUp",onEnd)}else{addEvent(el,"touchstart",onStart);addEvent(el,"touchmove",onMove);addEvent(el,"touchend",onEnd);addEvent(document,"touchstart",onOtherStart);addEvent(document,"touchend",onOtherEnd);addEvent(document,"touchcancel",onOtherEnd);$WINDOW.on("scroll",onOtherEnd);$el.on("mousedown pointerdown",onStart);$DOCUMENT.on("mousemove pointermove",onMove).on("mouseup pointerup",onEnd)}if(Modernizr.touch){dragDomEl="a"}else{dragDomEl="div"}$el.on("click",dragDomEl,function(e){tail.checked&&stopEvent(e)});return tail}function moveOnTouch($el,options){var el=$el[0],elData=$el.data(),tail={},startCoo,coo,startElPos,moveElPos,edge,moveTrack,startTime,endTime,min,max,snap,dir,slowFLAG,controlFLAG,moved,tracked;function startTracking(e,noStop){tracked=true;startCoo=coo=dir==="vertical"?e._y:e._x;startTime=e._now;moveTrack=[[startTime,startCoo]];startElPos=moveElPos=tail.noMove||noStop?0:stop($el,(options.getPos||noop)());(options.onStart||noop).call(el,e)}function onStart(e,result){min=tail.min;max=tail.max;snap=tail.snap,dir=tail.direction||"horizontal",$el.navdir=dir;slowFLAG=e.altKey;tracked=moved=false;controlFLAG=result.control;if(!controlFLAG&&!elData.sliding){startTracking(e)}}function onMove(e,result){if(!tail.noSwipe){if(!tracked){startTracking(e)}coo=dir==="vertical"?e._y:e._x;moveTrack.push([e._now,coo]);moveElPos=startElPos-(startCoo-coo);edge=findShadowEdge(moveElPos,min,max,dir);if(moveElPos<=min){moveElPos=edgeResistance(moveElPos,min)}else if(moveElPos>=max){moveElPos=edgeResistance(moveElPos,max)}if(!tail.noMove){$el.css(getTranslate(moveElPos,dir));if(!moved){moved=true;result.touch||MS_POINTER||$el.addClass(grabbingClass)}(options.onMove||noop).call(el,e,{pos:moveElPos,edge:edge})}}}function onEnd(result){if(tail.noSwipe&&result.moved)return;if(!tracked){startTracking(result.startEvent,true)}result.touch||MS_POINTER||$el.removeClass(grabbingClass);endTime=$.now();var _backTimeIdeal=endTime-TOUCH_TIMEOUT,_backTime,_timeDiff,_timeDiffLast,backTime=null,backCoo,virtualPos,limitPos,newPos,overPos,time=TRANSITION_DURATION,speed,friction=options.friction;for(var _i=moveTrack.length-1;_i>=0;_i--){_backTime=moveTrack[_i][0];_timeDiff=Math.abs(_backTime-_backTimeIdeal);if(backTime===null||_timeDiff<_timeDiffLast){backTime=_backTime;backCoo=moveTrack[_i][1]}else if(backTime===_backTimeIdeal||_timeDiff>_timeDiffLast){break}_timeDiffLast=_timeDiff}newPos=minMaxLimit(moveElPos,min,max);var cooDiff=backCoo-coo,forwardFLAG=cooDiff>=0,timeDiff=endTime-backTime,longTouchFLAG=timeDiff>TOUCH_TIMEOUT,swipeFLAG=!longTouchFLAG&&moveElPos!==startElPos&&newPos===moveElPos;if(snap){newPos=minMaxLimit(Math[swipeFLAG?forwardFLAG?"floor":"ceil":"round"](moveElPos/snap)*snap,min,max);min=max=newPos}if(swipeFLAG&&(snap||newPos===moveElPos)){speed=-(cooDiff/timeDiff);time*=minMaxLimit(Math.abs(speed),options.timeLow,options.timeHigh);virtualPos=Math.round(moveElPos+speed*time/friction);if(!snap){newPos=virtualPos}if(!forwardFLAG&&virtualPos>max||forwardFLAG&&virtualPos<min){limitPos=forwardFLAG?min:max;overPos=virtualPos-limitPos;if(!snap){newPos=limitPos}overPos=minMaxLimit(newPos+overPos*.03,limitPos-50,limitPos+50);time=Math.abs((moveElPos-overPos)/(speed/friction))}}time*=slowFLAG?10:1;(options.onEnd||noop).call(el,$.extend(result,{moved:result.moved||longTouchFLAG&&snap,pos:moveElPos,newPos:newPos,overPos:overPos,time:time,dir:dir}))}tail=$.extend(touch(options.$wrap,$.extend({},options,{onStart:onStart,onMove:onMove,onEnd:onEnd})),tail);return tail}function wheel($el,options){var el=$el[0],lockFLAG,lastDirection,lastNow,tail={prevent:{}};addEvent(el,WHEEL,function(e){var yDelta=e.wheelDeltaY||-1*e.deltaY||0,xDelta=e.wheelDeltaX||-1*e.deltaX||0,xWin=Math.abs(xDelta)&&!Math.abs(yDelta),direction=getDirectionSign(xDelta<0),sameDirection=lastDirection===direction,now=$.now(),tooFast=now-lastNow<TOUCH_TIMEOUT;lastDirection=direction;lastNow=now;if(!xWin||!tail.ok||tail.prevent[direction]&&!lockFLAG){return}else{stopEvent(e,true);if(lockFLAG&&sameDirection&&tooFast){return}}if(options.shift){lockFLAG=true;clearTimeout(tail.t);tail.t=setTimeout(function(){lockFLAG=false},SCROLL_LOCK_TIMEOUT)}(options.onEnd||noop)(e,options.shift?direction:xDelta)});return tail}jQuery.Fotorama=function($fotorama,opts){$HTML=$("html");$BODY=$("body");var that=this,stamp=$.now(),stampClass=_fotoramaClass+stamp,fotorama=$fotorama[0],data,dataFrameCount=1,fotoramaData=$fotorama.data(),size,$style=$("<style></style>"),$anchor=$(div(hiddenClass)),$wrap=$fotorama.find(cls(wrapClass)),$stage=$wrap.find(cls(stageClass)),stage=$stage[0],$stageShaft=$fotorama.find(cls(stageShaftClass)),$stageFrame=$(),$arrPrev=$fotorama.find(cls(arrPrevClass)),$arrNext=$fotorama.find(cls(arrNextClass)),$arrs=$fotorama.find(cls(arrClass)),$navWrap=$fotorama.find(cls(navWrapClass)),$nav=$navWrap.find(cls(navClass)),$navShaft=$nav.find(cls(navShaftClass)),$navFrame,$navDotFrame=$(),$navThumbFrame=$(),stageShaftData=$stageShaft.data(),navShaftData=$navShaft.data(),$thumbBorder=$fotorama.find(cls(thumbBorderClass)),$thumbArrLeft=$fotorama.find(cls(thumbArrLeft)),$thumbArrRight=$fotorama.find(cls(thumbArrRight)),$fullscreenIcon=$fotorama.find(cls(fullscreenIconClass)),fullscreenIcon=$fullscreenIcon[0],$videoPlay=$(div(videoPlayClass)),$videoClose=$fotorama.find(cls(videoCloseClass)),videoClose=$videoClose[0],$spinner=$fotorama.find(cls(fotoramaSpinnerClass)),$videoPlaying,activeIndex=false,activeFrame,activeIndexes,repositionIndex,dirtyIndex,lastActiveIndex,prevIndex,nextIndex,nextAutoplayIndex,startIndex,o_loop,o_nav,o_navThumbs,o_navTop,o_allowFullScreen,o_nativeFullScreen,o_fade,o_thumbSide,o_thumbSide2,o_transitionDuration,o_transition,o_shadows,o_rtl,o_keyboard,lastOptions={},measures={},measuresSetFLAG,stageShaftTouchTail={},stageWheelTail={},navShaftTouchTail={},navWheelTail={},scrollTop,scrollLeft,showedFLAG,pausedAutoplayFLAG,stoppedAutoplayFLAG,toDeactivate={},toDetach={},measuresStash,touchedFLAG,hoverFLAG,navFrameKey,stageLeft=0,fadeStack=[];$wrap[STAGE_FRAME_KEY]=$('<div class="'+stageFrameClass+'"></div>');$wrap[NAV_THUMB_FRAME_KEY]=$($.Fotorama.jst.thumb());$wrap[NAV_DOT_FRAME_KEY]=$($.Fotorama.jst.dots());toDeactivate[STAGE_FRAME_KEY]=[];toDeactivate[NAV_THUMB_FRAME_KEY]=[];toDeactivate[NAV_DOT_FRAME_KEY]=[];toDetach[STAGE_FRAME_KEY]={};$wrap.addClass(CSS3?wrapCss3Class:wrapCss2Class);fotoramaData.fotorama=this;function checkForVideo(){$.each(data,function(i,dataFrame){if(!dataFrame.i){dataFrame.i=dataFrameCount++;var video=findVideoId(dataFrame.video,true);if(video){var thumbs={};dataFrame.video=video;if(!dataFrame.img&&!dataFrame.thumb){thumbs=getVideoThumbs(dataFrame,data,that)}else{dataFrame.thumbsReady=true}updateData(data,{img:thumbs.img,thumb:thumbs.thumb},dataFrame.i,that)}}})}function allowKey(key){return o_keyboard[key]}function setStagePosition(){if($stage!==undefined){if(opts.navdir=="vertical"){var padding=opts.thumbwidth+opts.thumbmargin;$stage.css("left",padding);$arrNext.css("right",padding);$fullscreenIcon.css("right",padding);$wrap.css("width",$wrap.css("width")+padding);$stageShaft.css("max-width",$wrap.width()-padding)}else{$stage.css("left","");$arrNext.css("right","");$fullscreenIcon.css("right","");$wrap.css("width",$wrap.css("width")+padding);$stageShaft.css("max-width","")}}}function bindGlobalEvents(FLAG){var keydownCommon="keydown."+_fotoramaClass,localStamp=_fotoramaClass+stamp,keydownLocal="keydown."+localStamp,keyupLocal="keyup."+localStamp,resizeLocal="resize."+localStamp+" "+"orientationchange."+localStamp,showParams;if(FLAG){$DOCUMENT.on(keydownLocal,function(e){var catched,index;if($videoPlaying&&e.keyCode===27){catched=true;unloadVideo($videoPlaying,true,true)}else if(that.fullScreen||opts.keyboard&&!that.index){if(e.keyCode===27){catched=true;that.cancelFullScreen()}else if(e.shiftKey&&e.keyCode===32&&allowKey("space")||!e.altKey&&!e.metaKey&&e.keyCode===37&&allowKey("left")||e.keyCode===38&&allowKey("up")&&$(":focus").attr("data-gallery-role")){that.longPress.progress();index="<"}else if(e.keyCode===32&&allowKey("space")||!e.altKey&&!e.metaKey&&e.keyCode===39&&allowKey("right")||e.keyCode===40&&allowKey("down")&&$(":focus").attr("data-gallery-role")){that.longPress.progress();index=">"}else if(e.keyCode===36&&allowKey("home")){that.longPress.progress();index="<<"}else if(e.keyCode===35&&allowKey("end")){that.longPress.progress();index=">>"}}(catched||index)&&stopEvent(e);showParams={index:index,slow:e.altKey,user:true};index&&(that.longPress.inProgress?that.showWhileLongPress(showParams):that.show(showParams))});if(FLAG){$DOCUMENT.on(keyupLocal,function(e){if(that.longPress.inProgress){that.showEndLongPress({user:true})}that.longPress.reset()})}if(!that.index){$DOCUMENT.off(keydownCommon).on(keydownCommon,"textarea, input, select",function(e){!$BODY.hasClass(_fullscreenClass)&&e.stopPropagation()})}$WINDOW.on(resizeLocal,that.resize)}else{$DOCUMENT.off(keydownLocal);$WINDOW.off(resizeLocal)}}function appendElements(FLAG){if(FLAG===appendElements.f)return;if(FLAG){$fotorama.addClass(_fotoramaClass+" "+stampClass).before($anchor).before($style);addInstance(that)}else{$anchor.detach();$style.detach();$fotorama.html(fotoramaData.urtext).removeClass(stampClass);hideInstance(that)}bindGlobalEvents(FLAG);appendElements.f=FLAG}function setData(){data=that.data=data||clone(opts.data)||getDataFromHtml($fotorama);size=that.size=data.length;ready.ok&&opts.shuffle&&shuffle(data);checkForVideo();activeIndex=limitIndex(activeIndex);size&&appendElements(true)}function stageNoMove(){var _noMove=size<2||$videoPlaying;stageShaftTouchTail.noMove=_noMove||o_fade;stageShaftTouchTail.noSwipe=_noMove||!opts.swipe;!o_transition&&$stageShaft.toggleClass(grabClass,!opts.click&&!stageShaftTouchTail.noMove&&!stageShaftTouchTail.noSwipe);MS_POINTER&&$wrap.toggleClass(wrapPanYClass,!stageShaftTouchTail.noSwipe)}function setAutoplayInterval(interval){if(interval===true)interval="";opts.autoplay=Math.max(+interval||AUTOPLAY_INTERVAL,o_transitionDuration*1.5)}function updateThumbArrow(opt){if(opt.navarrows&&opt.nav==="thumbs"){$thumbArrLeft.show();$thumbArrRight.show()}else{$thumbArrLeft.hide();$thumbArrRight.hide()}}function getThumbsInSlide($el,opts){return Math.floor($wrap.width()/(opts.thumbwidth+opts.thumbmargin))}function setOptions(){if(!opts.nav||opts.nav==="dots"){opts.navdir="horizontal"}that.options=opts=optionsToLowerCase(opts);thumbsPerSlide=getThumbsInSlide($wrap,opts);o_fade=opts.transition==="crossfade"||opts.transition==="dissolve";o_loop=opts.loop&&(size>2||o_fade&&(!o_transition||o_transition!=="slide"));o_transitionDuration=+opts.transitionduration||TRANSITION_DURATION;o_rtl=opts.direction==="rtl";o_keyboard=$.extend({},opts.keyboard&&KEYBOARD_OPTIONS,opts.keyboard);updateThumbArrow(opts);var classes={add:[],remove:[]};function addOrRemoveClass(FLAG,value){classes[FLAG?"add":"remove"].push(value)}if(size>1){o_nav=opts.nav;o_navTop=opts.navposition==="top";classes.remove.push(selectClass);$arrs.toggle(!!opts.arrows)}else{o_nav=false;$arrs.hide()}arrsUpdate();stageWheelUpdate();thumbArrUpdate();if(opts.autoplay)setAutoplayInterval(opts.autoplay);o_thumbSide=numberFromMeasure(opts.thumbwidth)||THUMB_SIZE;o_thumbSide2=numberFromMeasure(opts.thumbheight)||THUMB_SIZE;stageWheelTail.ok=navWheelTail.ok=opts.trackpad&&!SLOW;stageNoMove();extendMeasures(opts,[measures]);o_navThumbs=o_nav==="thumbs";if($navWrap.filter(":hidden")&&!!o_nav){$navWrap.show()}if(o_navThumbs){frameDraw(size,"navThumb");$navFrame=$navThumbFrame;navFrameKey=NAV_THUMB_FRAME_KEY;setStyle($style,$.Fotorama.jst.style({w:o_thumbSide,h:o_thumbSide2,b:opts.thumbborderwidth,m:opts.thumbmargin,s:stamp,q:!COMPAT}));$nav.addClass(navThumbsClass).removeClass(navDotsClass)}else if(o_nav==="dots"){frameDraw(size,"navDot");$navFrame=$navDotFrame;navFrameKey=NAV_DOT_FRAME_KEY;$nav.addClass(navDotsClass).removeClass(navThumbsClass)}else{$navWrap.hide();o_nav=false;$nav.removeClass(navThumbsClass+" "+navDotsClass)}if(o_nav){if(o_navTop){$navWrap.insertBefore($stage)}else{$navWrap.insertAfter($stage)}frameAppend.nav=false;frameAppend($navFrame,$navShaft,"nav")}o_allowFullScreen=opts.allowfullscreen;if(o_allowFullScreen){$fullscreenIcon.prependTo($stage);o_nativeFullScreen=FULLSCREEN&&o_allowFullScreen==="native";stubEvent($fullscreenIcon,"touchend")}else{$fullscreenIcon.detach();o_nativeFullScreen=false}addOrRemoveClass(o_fade,wrapFadeClass);addOrRemoveClass(!o_fade,wrapSlideClass);addOrRemoveClass(!opts.captions,wrapNoCaptionsClass);addOrRemoveClass(o_rtl,wrapRtlClass);addOrRemoveClass(opts.arrows,wrapToggleArrowsClass);o_shadows=opts.shadows&&!SLOW;addOrRemoveClass(!o_shadows,wrapNoShadowsClass);$wrap.addClass(classes.add.join(" ")).removeClass(classes.remove.join(" "));lastOptions=$.extend({},opts);setStagePosition()}function normalizeIndex(index){return index<0?(size+index%size)%size:index>=size?index%size:index}function limitIndex(index){return minMaxLimit(index,0,size-1)}function edgeIndex(index){return o_loop?normalizeIndex(index):limitIndex(index)}function getPrevIndex(index){return index>0||o_loop?index-1:false}function getNextIndex(index){return index<size-1||o_loop?index+1:false}function setStageShaftMinmaxAndSnap(){stageShaftTouchTail.min=o_loop?-Infinity:-getPosByIndex(size-1,measures.w,opts.margin,repositionIndex);stageShaftTouchTail.max=o_loop?Infinity:-getPosByIndex(0,measures.w,opts.margin,repositionIndex);stageShaftTouchTail.snap=measures.w+opts.margin}function setNavShaftMinMax(){var isVerticalDir=opts.navdir==="vertical";var param=isVerticalDir?$navShaft.height():$navShaft.width();var mainParam=isVerticalDir?measures.h:measures.nw;navShaftTouchTail.min=Math.min(0,mainParam-param);navShaftTouchTail.max=0;navShaftTouchTail.direction=opts.navdir;$navShaft.toggleClass(grabClass,!(navShaftTouchTail.noMove=navShaftTouchTail.min===navShaftTouchTail.max))}function eachIndex(indexes,type,fn){if(typeof indexes==="number"){indexes=new Array(indexes);var rangeFLAG=true}return $.each(indexes,function(i,index){if(rangeFLAG)index=i;if(typeof index==="number"){var dataFrame=data[normalizeIndex(index)];if(dataFrame){var key="$"+type+"Frame",$frame=dataFrame[key];fn.call(this,i,index,dataFrame,$frame,key,$frame&&$frame.data())}}})}function setMeasures(width,height,ratio,index){if(!measuresSetFLAG||measuresSetFLAG==="*"&&index===startIndex){width=measureIsValid(opts.width)||measureIsValid(width)||WIDTH;height=measureIsValid(opts.height)||measureIsValid(height)||HEIGHT;that.resize({width:width,ratio:opts.ratio||ratio||width/height},0,index!==startIndex&&"*")}}function loadImg(indexes,type,specialMeasures,again){eachIndex(indexes,type,function(i,index,dataFrame,$frame,key,frameData){if(!$frame)return;var fullFLAG=that.fullScreen&&!frameData.$full&&type==="stage";if(frameData.$img&&!again&&!fullFLAG)return;var img=new Image,$img=$(img),imgData=$img.data();frameData[fullFLAG?"$full":"$img"]=$img;var srcKey=type==="stage"?fullFLAG?"full":"img":"thumb",src=dataFrame[srcKey],dummy=fullFLAG?dataFrame["img"]:dataFrame[type==="stage"?"thumb":"img"];if(type==="navThumb")$frame=frameData.$wrap;function triggerTriggerEvent(event){var _index=normalizeIndex(index);triggerEvent(event,{index:_index,src:src,frame:data[_index]})}function error(){$img.remove();$.Fotorama.cache[src]="error";if((!dataFrame.html||type!=="stage")&&dummy&&dummy!==src){dataFrame[srcKey]=src=dummy;frameData.$full=null;loadImg([index],type,specialMeasures,true)}else{if(src&&!dataFrame.html&&!fullFLAG){$frame.trigger("f:error").removeClass(loadingClass).addClass(errorClass);triggerTriggerEvent("error")}else if(type==="stage"){$frame.trigger("f:load").removeClass(loadingClass+" "+errorClass).addClass(loadedClass);triggerTriggerEvent("load");setMeasures()}frameData.state="error";if(size>1&&data[index]===dataFrame&&!dataFrame.html&&!dataFrame.deleted&&!dataFrame.video&&!fullFLAG){dataFrame.deleted=true;that.splice(index,1)}}}function loaded(){$.Fotorama.measures[src]=imgData.measures=$.Fotorama.measures[src]||{width:img.width,height:img.height,ratio:img.width/img.height};setMeasures(imgData.measures.width,imgData.measures.height,imgData.measures.ratio,index);$img.off("load error").addClass(""+(fullFLAG?imgFullClass:imgClass)).attr("aria-hidden","false").prependTo($frame);if($frame.hasClass(stageFrameClass)&&!$frame.hasClass(videoContainerClass)){$frame.attr("href",$img.attr("src"))}fit($img,($.isFunction(specialMeasures)?specialMeasures():specialMeasures)||measures);$.Fotorama.cache[src]=frameData.state="loaded";setTimeout(function(){$frame.trigger("f:load").removeClass(loadingClass+" "+errorClass).addClass(loadedClass+" "+(fullFLAG?loadedFullClass:loadedImgClass));if(type==="stage"){triggerTriggerEvent("load")}else if(dataFrame.thumbratio===AUTO||!dataFrame.thumbratio&&opts.thumbratio===AUTO){dataFrame.thumbratio=imgData.measures.ratio;reset()}},0)}if(!src){error();return}function waitAndLoad(){var _i=10;waitFor(function(){return!touchedFLAG||!_i--&&!SLOW},function(){loaded()})}if(!$.Fotorama.cache[src]){$.Fotorama.cache[src]="*";$img.on("load",waitAndLoad).on("error",error)}else{(function justWait(){if($.Fotorama.cache[src]==="error"){error()}else if($.Fotorama.cache[src]==="loaded"){setTimeout(waitAndLoad,0)}else{setTimeout(justWait,100)}})()}frameData.state="";img.src=src;if(frameData.data.caption){img.alt=frameData.data.caption||""}if(frameData.data.full){$(img).data("original",frameData.data.full)}if(UTIL.isExpectedCaption(dataFrame,opts.showcaption)){$(img).attr("aria-labelledby",dataFrame.labelledby)}})}function updateFotoramaState(){var $frame=activeFrame[STAGE_FRAME_KEY];if($frame&&!$frame.data().state){$spinner.addClass(spinnerShowClass);$frame.on("f:load f:error",function(){$frame.off("f:load f:error");$spinner.removeClass(spinnerShowClass)})}}function addNavFrameEvents(frame){addEnterUp(frame,onNavFrameClick);addFocus(frame,function(){setTimeout(function(){lockScroll($nav)},0);slideNavShaft({time:o_transitionDuration,guessIndex:$(this).data().eq,minMax:navShaftTouchTail})})}function frameDraw(indexes,type){eachIndex(indexes,type,function(i,index,dataFrame,$frame,key,frameData){if($frame)return;$frame=dataFrame[key]=$wrap[key].clone();frameData=$frame.data();frameData.data=dataFrame;var frame=$frame[0],labelledbyValue="labelledby"+$.now();if(type==="stage"){if(dataFrame.html){$('<div class="'+htmlClass+'"></div>').append(dataFrame._html?$(dataFrame.html).removeAttr("id").html(dataFrame._html):dataFrame.html).appendTo($frame)}if(dataFrame.id){labelledbyValue=dataFrame.id||labelledbyValue}dataFrame.labelledby=labelledbyValue;if(UTIL.isExpectedCaption(dataFrame,opts.showcaption)){$($.Fotorama.jst.frameCaption({caption:dataFrame.caption,labelledby:labelledbyValue})).appendTo($frame)}dataFrame.video&&$frame.addClass(stageFrameVideoClass).append($videoPlay.clone());addFocus(frame,function(){setTimeout(function(){lockScroll($stage)},0);clickToShow({index:frameData.eq,user:true})});$stageFrame=$stageFrame.add($frame)}else if(type==="navDot"){addNavFrameEvents(frame);$navDotFrame=$navDotFrame.add($frame)}else if(type==="navThumb"){addNavFrameEvents(frame);frameData.$wrap=$frame.children(":first");$navThumbFrame=$navThumbFrame.add($frame);if(dataFrame.video){frameData.$wrap.append($videoPlay.clone())}}})}function callFit($img,measuresToFit){return $img&&$img.length&&fit($img,measuresToFit)}function stageFramePosition(indexes){eachIndex(indexes,"stage",function(i,index,dataFrame,$frame,key,frameData){if(!$frame)return;var normalizedIndex=normalizeIndex(index);frameData.eq=normalizedIndex;toDetach[STAGE_FRAME_KEY][normalizedIndex]=$frame.css($.extend({left:o_fade?0:getPosByIndex(index,measures.w,opts.margin,repositionIndex)},o_fade&&getDuration(0)));if(isDetached($frame[0])){$frame.appendTo($stageShaft);unloadVideo(dataFrame.$video)}callFit(frameData.$img,measures);callFit(frameData.$full,measures);if($frame.hasClass(stageFrameClass)&&!($frame.attr("aria-hidden")==="false"&&$frame.hasClass(activeClass))){$frame.attr("aria-hidden","true")}})}function thumbsDraw(pos,loadFLAG){var leftLimit,rightLimit,exceedLimit;if(o_nav!=="thumbs"||isNaN(pos))return;leftLimit=-pos;rightLimit=-pos+measures.nw;if(opts.navdir==="vertical"){pos=pos-opts.thumbheight;rightLimit=-pos+measures.h}$navThumbFrame.each(function(){var $this=$(this),thisData=$this.data(),eq=thisData.eq,getSpecialMeasures=function(){return{h:o_thumbSide2,w:thisData.w}},specialMeasures=getSpecialMeasures(),exceedLimit=opts.navdir==="vertical"?thisData.t>rightLimit:thisData.l>rightLimit;specialMeasures.w=thisData.w;if(thisData.l+thisData.w<leftLimit||exceedLimit||callFit(thisData.$img,specialMeasures))return;loadFLAG&&loadImg([eq],"navThumb",getSpecialMeasures)})}function frameAppend($frames,$shaft,type){if(!frameAppend[type]){var thumbsFLAG=type==="nav"&&o_navThumbs,left=0,top=0;$shaft.append($frames.filter(function(){var actual,$this=$(this),frameData=$this.data();for(var _i=0,_l=data.length;_i<_l;_i++){if(frameData.data===data[_i]){actual=true;frameData.eq=_i;break}}return actual||$this.remove()&&false}).sort(function(a,b){return $(a).data().eq-$(b).data().eq}).each(function(){var $this=$(this),frameData=$this.data();UTIL.setThumbAttr($this,frameData.data.caption,"aria-label")}).each(function(){if(!thumbsFLAG)return;var $this=$(this),frameData=$this.data(),thumbwidth=Math.round(o_thumbSide2*frameData.data.thumbratio)||o_thumbSide,thumbheight=Math.round(o_thumbSide/frameData.data.thumbratio)||o_thumbSide2;frameData.t=top;frameData.h=thumbheight;frameData.l=left;frameData.w=thumbwidth;$this.css({width:thumbwidth});top+=thumbheight+opts.thumbmargin;left+=thumbwidth+opts.thumbmargin}));frameAppend[type]=true}}function getDirection(x){return x-stageLeft>measures.w/3}function disableDirrection(i){return!o_loop&&(!(activeIndex+i)||!(activeIndex-size+i))&&!$videoPlaying}function arrsUpdate(){var disablePrev=disableDirrection(0),disableNext=disableDirrection(1);$arrPrev.toggleClass(arrDisabledClass,disablePrev).attr(disableAttr(disablePrev,false));$arrNext.toggleClass(arrDisabledClass,disableNext).attr(disableAttr(disableNext,false))}function thumbArrUpdate(){var isLeftDisable=false,isRightDisable=false;if(opts.navtype==="thumbs"&&!opts.loop){activeIndex==0?isLeftDisable=true:isLeftDisable=false;activeIndex==opts.data.length-1?isRightDisable=true:isRightDisable=false}if(opts.navtype==="slides"){var pos=readPosition($navShaft,opts.navdir);pos>=navShaftTouchTail.max?isLeftDisable=true:isLeftDisable=false;pos<=navShaftTouchTail.min?isRightDisable=true:isRightDisable=false}$thumbArrLeft.toggleClass(arrDisabledClass,isLeftDisable).attr(disableAttr(isLeftDisable,true));$thumbArrRight.toggleClass(arrDisabledClass,isRightDisable).attr(disableAttr(isRightDisable,true))}function stageWheelUpdate(){if(stageWheelTail.ok){stageWheelTail.prevent={"<":disableDirrection(0),">":disableDirrection(1)}}}function getNavFrameBounds($navFrame){var navFrameData=$navFrame.data(),left,top,width,height;if(o_navThumbs){left=navFrameData.l;top=navFrameData.t;width=navFrameData.w;height=navFrameData.h}else{left=$navFrame.position().left;width=$navFrame.width()}var horizontalBounds={c:left+width/2,min:-left+opts.thumbmargin*10,max:-left+measures.w-width-opts.thumbmargin*10};var verticalBounds={c:top+height/2,min:-top+opts.thumbmargin*10,max:-top+measures.h-height-opts.thumbmargin*10};return opts.navdir==="vertical"?verticalBounds:horizontalBounds}function slideThumbBorder(time){var navFrameData=activeFrame[navFrameKey].data();slide($thumbBorder,{time:time*1.2,pos:opts.navdir==="vertical"?navFrameData.t:navFrameData.l,width:navFrameData.w,height:navFrameData.h,direction:opts.navdir})}function slideNavShaft(options){var $guessNavFrame=data[options.guessIndex][navFrameKey],typeOfAnimation=opts.navtype;var overflowFLAG,time,minMax,boundTop,boundLeft,l,pos,x;if($guessNavFrame){if(typeOfAnimation==="thumbs"){overflowFLAG=navShaftTouchTail.min!==navShaftTouchTail.max;minMax=options.minMax||overflowFLAG&&getNavFrameBounds(activeFrame[navFrameKey]);boundTop=overflowFLAG&&(options.keep&&slideNavShaft.t?slideNavShaft.l:minMaxLimit((options.coo||measures.nw/2)-getNavFrameBounds($guessNavFrame).c,minMax.min,minMax.max));boundLeft=overflowFLAG&&(options.keep&&slideNavShaft.l?slideNavShaft.l:minMaxLimit((options.coo||measures.nw/2)-getNavFrameBounds($guessNavFrame).c,minMax.min,minMax.max));l=opts.navdir==="vertical"?boundTop:boundLeft;pos=overflowFLAG&&minMaxLimit(l,navShaftTouchTail.min,navShaftTouchTail.max)||0;time=options.time*1.1;slide($navShaft,{time:time,pos:pos,direction:opts.navdir,onEnd:function(){thumbsDraw(pos,true);thumbArrUpdate()}});setShadow($nav,findShadowEdge(pos,navShaftTouchTail.min,navShaftTouchTail.max,opts.navdir));slideNavShaft.l=l}else{x=readPosition($navShaft,opts.navdir);time=options.time*1.11;pos=validateSlidePos(opts,navShaftTouchTail,options.guessIndex,x,$guessNavFrame,$navWrap,opts.navdir);slide($navShaft,{time:time,pos:pos,direction:opts.navdir,onEnd:function(){thumbsDraw(pos,true);thumbArrUpdate()}});setShadow($nav,findShadowEdge(pos,navShaftTouchTail.min,navShaftTouchTail.max,opts.navdir))}}}function navUpdate(){deactivateFrames(navFrameKey);toDeactivate[navFrameKey].push(activeFrame[navFrameKey].addClass(activeClass).attr("data-active",true))}function deactivateFrames(key){var _toDeactivate=toDeactivate[key];while(_toDeactivate.length){_toDeactivate.shift().removeClass(activeClass).attr("data-active",false)}}function detachFrames(key){var _toDetach=toDetach[key];$.each(activeIndexes,function(i,index){delete _toDetach[normalizeIndex(index)]});$.each(_toDetach,function(index,$frame){delete _toDetach[index];$frame.detach()})}function stageShaftReposition(skipOnEnd){repositionIndex=dirtyIndex=activeIndex;var $frame=activeFrame[STAGE_FRAME_KEY];if($frame){deactivateFrames(STAGE_FRAME_KEY);toDeactivate[STAGE_FRAME_KEY].push($frame.addClass(activeClass).attr("data-active",true));if($frame.hasClass(stageFrameClass)){$frame.attr("aria-hidden","false")}skipOnEnd||that.showStage.onEnd(true);stop($stageShaft,0,true);detachFrames(STAGE_FRAME_KEY);stageFramePosition(activeIndexes);setStageShaftMinmaxAndSnap();setNavShaftMinMax();addEnterUp($stageShaft[0],function(){if(!$fotorama.hasClass(fullscreenClass)){that.requestFullScreen();$fullscreenIcon.focus()}})}}function extendMeasures(options,measuresArray){if(!options)return;$.each(measuresArray,function(i,measures){if(!measures)return;$.extend(measures,{width:options.width||measures.width,height:options.height,minwidth:options.minwidth,maxwidth:options.maxwidth,minheight:options.minheight,maxheight:options.maxheight,ratio:getRatio(options.ratio)})})}function triggerEvent(event,extra){$fotorama.trigger(_fotoramaClass+":"+event,[that,extra])}function onTouchStart(){clearTimeout(onTouchEnd.t);touchedFLAG=1;if(opts.stopautoplayontouch){that.stopAutoplay()}else{pausedAutoplayFLAG=true}}function onTouchEnd(){if(!touchedFLAG)return;if(!opts.stopautoplayontouch){releaseAutoplay();changeAutoplay()}onTouchEnd.t=setTimeout(function(){touchedFLAG=0},TRANSITION_DURATION+TOUCH_TIMEOUT)}function releaseAutoplay(){pausedAutoplayFLAG=!!($videoPlaying||stoppedAutoplayFLAG)}function changeAutoplay(){clearTimeout(changeAutoplay.t);waitFor.stop(changeAutoplay.w);if(!opts.autoplay||pausedAutoplayFLAG){if(that.autoplay){that.autoplay=false;triggerEvent("stopautoplay")}return}if(!that.autoplay){that.autoplay=true;triggerEvent("startautoplay")}var _activeIndex=activeIndex;var frameData=activeFrame[STAGE_FRAME_KEY].data();changeAutoplay.w=waitFor(function(){return frameData.state||_activeIndex!==activeIndex},function(){changeAutoplay.t=setTimeout(function(){if(pausedAutoplayFLAG||_activeIndex!==activeIndex)return;var _nextAutoplayIndex=nextAutoplayIndex,nextFrameData=data[_nextAutoplayIndex][STAGE_FRAME_KEY].data();changeAutoplay.w=waitFor(function(){return nextFrameData.state||_nextAutoplayIndex!==nextAutoplayIndex},function(){if(pausedAutoplayFLAG||_nextAutoplayIndex!==nextAutoplayIndex)return;that.show(o_loop?getDirectionSign(!o_rtl):nextAutoplayIndex)})},opts.autoplay)})}that.startAutoplay=function(interval){if(that.autoplay)return this;pausedAutoplayFLAG=stoppedAutoplayFLAG=false;setAutoplayInterval(interval||opts.autoplay);changeAutoplay();return this};that.stopAutoplay=function(){if(that.autoplay){pausedAutoplayFLAG=stoppedAutoplayFLAG=true;changeAutoplay()}return this};that.showSlide=function(slideDir){var currentPosition=readPosition($navShaft,opts.navdir),pos,time=500*1.1,size=opts.navdir==="horizontal"?opts.thumbwidth:opts.thumbheight,onEnd=function(){thumbArrUpdate()};if(slideDir==="next"){pos=currentPosition-(size+opts.margin)*thumbsPerSlide}if(slideDir==="prev"){pos=currentPosition+(size+opts.margin)*thumbsPerSlide}pos=validateRestrictions(pos,navShaftTouchTail);thumbsDraw(pos,true);slide($navShaft,{time:time,pos:pos,direction:opts.navdir,onEnd:onEnd})};that.showWhileLongPress=function(options){if(that.longPress.singlePressInProgress){return}var index=calcActiveIndex(options);calcGlobalIndexes(index);var time=calcTime(options)/50;var _activeFrame=activeFrame;that.activeFrame=activeFrame=data[activeIndex];var silent=_activeFrame===activeFrame&&!options.user;that.showNav(silent,options,time);return this};that.showEndLongPress=function(options){if(that.longPress.singlePressInProgress){return}var index=calcActiveIndex(options);calcGlobalIndexes(index);var time=calcTime(options)/50;var _activeFrame=activeFrame;that.activeFrame=activeFrame=data[activeIndex];var silent=_activeFrame===activeFrame&&!options.user;that.showStage(silent,options,time);showedFLAG=typeof lastActiveIndex!=="undefined"&&lastActiveIndex!==activeIndex;lastActiveIndex=activeIndex;return this};function calcActiveIndex(options){var index;if(typeof options!=="object"){index=options;options={}}else{index=options.index}index=index===">"?dirtyIndex+1:index==="<"?dirtyIndex-1:index==="<<"?0:index===">>"?size-1:index;index=isNaN(index)?undefined:index;index=typeof index==="undefined"?activeIndex||0:index;return index}function calcGlobalIndexes(index){that.activeIndex=activeIndex=edgeIndex(index);prevIndex=getPrevIndex(activeIndex);nextIndex=getNextIndex(activeIndex);nextAutoplayIndex=normalizeIndex(activeIndex+(o_rtl?-1:1));activeIndexes=[activeIndex,prevIndex,nextIndex];dirtyIndex=o_loop?index:activeIndex}function calcTime(options){var diffIndex=Math.abs(lastActiveIndex-dirtyIndex),time=getNumber(options.time,function(){return Math.min(o_transitionDuration*(1+(diffIndex-1)/12),o_transitionDuration*2)});if(options.slow){time*=10}return time}that.showStage=function(silent,options,time){unloadVideo($videoPlaying,activeFrame.i!==data[normalizeIndex(repositionIndex)].i);frameDraw(activeIndexes,"stage");stageFramePosition(SLOW?[dirtyIndex]:[dirtyIndex,getPrevIndex(dirtyIndex),getNextIndex(dirtyIndex)]);updateTouchTails("go",true);silent||triggerEvent("show",{user:options.user,time:time});pausedAutoplayFLAG=true;var overPos=options.overPos;var onEnd=that.showStage.onEnd=function(skipReposition){if(onEnd.ok)return;onEnd.ok=true;skipReposition||stageShaftReposition(true);if(!silent){triggerEvent("showend",{user:options.user})}if(!skipReposition&&o_transition&&o_transition!==opts.transition){that.setOptions({transition:o_transition});o_transition=false;return}updateFotoramaState();loadImg(activeIndexes,"stage");updateTouchTails("go",false);stageWheelUpdate();stageCursor();releaseAutoplay();changeAutoplay();if(that.fullScreen){activeFrame[STAGE_FRAME_KEY].find("."+imgFullClass).attr("aria-hidden",false);activeFrame[STAGE_FRAME_KEY].find("."+imgClass).attr("aria-hidden",true)}else{activeFrame[STAGE_FRAME_KEY].find("."+imgFullClass).attr("aria-hidden",true);activeFrame[STAGE_FRAME_KEY].find("."+imgClass).attr("aria-hidden",false)}};if(!o_fade){slide($stageShaft,{pos:-getPosByIndex(dirtyIndex,measures.w,opts.margin,repositionIndex),overPos:overPos,time:time,onEnd:onEnd})}else{var $activeFrame=activeFrame[STAGE_FRAME_KEY],$prevActiveFrame=data[lastActiveIndex]&&activeIndex!==lastActiveIndex?data[lastActiveIndex][STAGE_FRAME_KEY]:null;fade($activeFrame,$prevActiveFrame,$stageFrame,{time:time,method:opts.transition,onEnd:onEnd},fadeStack)}arrsUpdate()};that.showNav=function(silent,options,time){thumbArrUpdate();if(o_nav){navUpdate();var guessIndex=limitIndex(activeIndex+minMaxLimit(dirtyIndex-lastActiveIndex,-1,1));slideNavShaft({time:time,coo:guessIndex!==activeIndex&&options.coo,guessIndex:typeof options.coo!=="undefined"?guessIndex:activeIndex,keep:silent});if(o_navThumbs)slideThumbBorder(time)}};that.show=function(options){that.longPress.singlePressInProgress=true;var index=calcActiveIndex(options);calcGlobalIndexes(index);var time=calcTime(options);var _activeFrame=activeFrame;that.activeFrame=activeFrame=data[activeIndex];var silent=_activeFrame===activeFrame&&!options.user;that.showStage(silent,options,time);that.showNav(silent,options,time);showedFLAG=typeof lastActiveIndex!=="undefined"&&lastActiveIndex!==activeIndex;lastActiveIndex=activeIndex;that.longPress.singlePressInProgress=false;return this};that.requestFullScreen=function(){if(o_allowFullScreen&&!that.fullScreen){var isVideo=$((that.activeFrame||{}).$stageFrame||{}).hasClass("fotorama-video-container");if(isVideo){return}scrollTop=$WINDOW.scrollTop();scrollLeft=$WINDOW.scrollLeft();lockScroll($WINDOW);updateTouchTails("x",true);measuresStash=$.extend({},measures);$fotorama.addClass(fullscreenClass).appendTo($BODY.addClass(_fullscreenClass));$HTML.addClass(_fullscreenClass);unloadVideo($videoPlaying,true,true);that.fullScreen=true;if(o_nativeFullScreen){fullScreenApi.request(fotorama)}that.resize();loadImg(activeIndexes,"stage");updateFotoramaState();triggerEvent("fullscreenenter");if(!("ontouchstart"in window)){$fullscreenIcon.focus()}}return this};function cancelFullScreen(){if(that.fullScreen){that.fullScreen=false;if(FULLSCREEN){fullScreenApi.cancel(fotorama)}$BODY.removeClass(_fullscreenClass);$HTML.removeClass(_fullscreenClass);$fotorama.removeClass(fullscreenClass).insertAfter($anchor);measures=$.extend({},measuresStash);unloadVideo($videoPlaying,true,true);updateTouchTails("x",false);that.resize();loadImg(activeIndexes,"stage");lockScroll($WINDOW,scrollLeft,scrollTop);triggerEvent("fullscreenexit")}}that.cancelFullScreen=function(){if(o_nativeFullScreen&&fullScreenApi.is()){fullScreenApi.cancel(document)}else{cancelFullScreen()}return this};that.toggleFullScreen=function(){return that[(that.fullScreen?"cancel":"request")+"FullScreen"]()};that.resize=function(options){if(!data)return this;var time=arguments[1]||0,setFLAG=arguments[2];thumbsPerSlide=getThumbsInSlide($wrap,opts);extendMeasures(!that.fullScreen?optionsToLowerCase(options):{width:$(window).width(),maxwidth:null,minwidth:null,height:$(window).height(),maxheight:null,minheight:null},[measures,setFLAG||that.fullScreen||opts]);var width=measures.width,height=measures.height,ratio=measures.ratio,windowHeight=$WINDOW.height()-(o_nav?$nav.height():0);if(measureIsValid(width)){$wrap.css({width:""});$wrap.css({height:""});$stage.css({width:""});$stage.css({height:""});$stageShaft.css({width:""});$stageShaft.css({height:""});$nav.css({width:""});$nav.css({height:""});$wrap.css({minWidth:measures.minwidth||0,maxWidth:measures.maxwidth||MAX_WIDTH});if(o_nav==="dots"){$navWrap.hide()}width=measures.W=measures.w=$wrap.width();measures.nw=o_nav&&numberFromWhatever(opts.navwidth,width)||width;$stageShaft.css({width:measures.w,marginLeft:(measures.W-measures.w)/2});height=numberFromWhatever(height,windowHeight);height=height||ratio&&width/ratio;if(height){width=Math.round(width);height=measures.h=Math.round(minMaxLimit(height,numberFromWhatever(measures.minheight,windowHeight),numberFromWhatever(measures.maxheight,windowHeight)));$stage.css({width:width,height:height});if(opts.navdir==="vertical"&&!that.fullscreen){$nav.width(opts.thumbwidth+opts.thumbmargin*2)}if(opts.navdir==="horizontal"&&!that.fullscreen){$nav.height(opts.thumbheight+opts.thumbmargin*2)}if(o_nav==="dots"){$nav.width(width).height("auto");$navWrap.show()}if(opts.navdir==="vertical"&&that.fullScreen){$stage.css("height",$WINDOW.height())}if(opts.navdir==="horizontal"&&that.fullScreen){$stage.css("height",$WINDOW.height()-$nav.height())}if(o_nav){switch(opts.navdir){case"vertical":$navWrap.removeClass(navShafthorizontalClass);$navWrap.removeClass(navShaftListClass);$navWrap.addClass(navShaftVerticalClass);$nav.stop().animate({height:measures.h,width:opts.thumbwidth},time);break;case"list":$navWrap.removeClass(navShaftVerticalClass);$navWrap.removeClass(navShafthorizontalClass);$navWrap.addClass(navShaftListClass);break;default:$navWrap.removeClass(navShaftVerticalClass);$navWrap.removeClass(navShaftListClass);$navWrap.addClass(navShafthorizontalClass);$nav.stop().animate({width:measures.nw},time);break}stageShaftReposition();slideNavShaft({guessIndex:activeIndex,time:time,keep:true});if(o_navThumbs&&frameAppend.nav)slideThumbBorder(time)}measuresSetFLAG=setFLAG||true;ready.ok=true;ready()}}stageLeft=$stage.offset().left;setStagePosition();return this};that.setOptions=function(options){$.extend(opts,options);reset();return this};that.shuffle=function(){data&&shuffle(data)&&reset();return this};function setShadow($el,edge){if(o_shadows){$el.removeClass(shadowsLeftClass+" "+shadowsRightClass);$el.removeClass(shadowsTopClass+" "+shadowsBottomClass);edge&&!$videoPlaying&&$el.addClass(edge.replace(/^|\s/g," "+shadowsClass+"--"))}}that.longPress={threshold:1,count:0,thumbSlideTime:20,progress:function(){if(!this.inProgress){this.count++;this.inProgress=this.count>this.threshold}},end:function(){if(this.inProgress){this.isEnded=true}},reset:function(){this.count=0;this.inProgress=false;this.isEnded=false}};that.destroy=function(){that.cancelFullScreen();that.stopAutoplay();data=that.data=null;appendElements();activeIndexes=[];detachFrames(STAGE_FRAME_KEY);reset.ok=false;return this};that.playVideo=function(){var dataFrame=activeFrame,video=dataFrame.video,_activeIndex=activeIndex;if(typeof video==="object"&&dataFrame.videoReady){o_nativeFullScreen&&that.fullScreen&&that.cancelFullScreen();waitFor(function(){return!fullScreenApi.is()||_activeIndex!==activeIndex},function(){if(_activeIndex===activeIndex){dataFrame.$video=dataFrame.$video||$(div(videoClass)).append(createVideoFrame(video));dataFrame.$video.appendTo(dataFrame[STAGE_FRAME_KEY]);$wrap.addClass(wrapVideoClass);$videoPlaying=dataFrame.$video;stageNoMove();$arrs.blur();$fullscreenIcon.blur();triggerEvent("loadvideo")}})}return this};that.stopVideo=function(){unloadVideo($videoPlaying,true,true);return this};that.spliceByIndex=function(index,newImgObj){newImgObj.i=index+1;newImgObj.img&&$.ajax({url:newImgObj.img,type:"HEAD",success:function(){data.splice(index,1,newImgObj);reset()}})};function unloadVideo($video,unloadActiveFLAG,releaseAutoplayFLAG){if(unloadActiveFLAG){$wrap.removeClass(wrapVideoClass);$videoPlaying=false;stageNoMove()}if($video&&$video!==$videoPlaying){$video.remove();triggerEvent("unloadvideo")}if(releaseAutoplayFLAG){releaseAutoplay();changeAutoplay()}}function toggleControlsClass(FLAG){$wrap.toggleClass(wrapNoControlsClass,FLAG)}function stageCursor(e){if(stageShaftTouchTail.flow)return;var x=e?e.pageX:stageCursor.x,pointerFLAG=x&&!disableDirrection(getDirection(x))&&opts.click;if(stageCursor.p!==pointerFLAG&&$stage.toggleClass(pointerClass,pointerFLAG)){stageCursor.p=pointerFLAG;stageCursor.x=x}}$stage.on("mousemove",stageCursor);function clickToShow(showOptions){clearTimeout(clickToShow.t);if(opts.clicktransition&&opts.clicktransition!==opts.transition){setTimeout(function(){var _o_transition=opts.transition;that.setOptions({transition:opts.clicktransition});o_transition=_o_transition;clickToShow.t=setTimeout(function(){that.show(showOptions)},10)},0)}else{that.show(showOptions)}}function onStageTap(e,toggleControlsFLAG){var target=e.target,$target=$(target);if($target.hasClass(videoPlayClass)){that.playVideo()}else if(target===fullscreenIcon){that.toggleFullScreen()}else if($videoPlaying){target===videoClose&&unloadVideo($videoPlaying,true,true)}else if(!$fotorama.hasClass(fullscreenClass)){that.requestFullScreen()}}function updateTouchTails(key,value){stageShaftTouchTail[key]=navShaftTouchTail[key]=value}stageShaftTouchTail=moveOnTouch($stageShaft,{onStart:onTouchStart,onMove:function(e,result){setShadow($stage,result.edge)},onTouchEnd:onTouchEnd,onEnd:function(result){var toggleControlsFLAG;setShadow($stage);toggleControlsFLAG=(MS_POINTER&&!hoverFLAG||result.touch)&&opts.arrows;if((result.moved||toggleControlsFLAG&&result.pos!==result.newPos&&!result.control)&&result.$target[0]!==$fullscreenIcon[0]){var index=getIndexByPos(result.newPos,measures.w,opts.margin,repositionIndex);that.show({index:index,time:o_fade?o_transitionDuration:result.time,overPos:result.overPos,user:true})}else if(!result.aborted&&!result.control){onStageTap(result.startEvent,toggleControlsFLAG)}},timeLow:1,timeHigh:1,friction:2,select:"."+selectClass+", ."+selectClass+" *",$wrap:$stage,direction:"horizontal"});navShaftTouchTail=moveOnTouch($navShaft,{onStart:onTouchStart,onMove:function(e,result){setShadow($nav,result.edge)},onTouchEnd:onTouchEnd,onEnd:function(result){function onEnd(){slideNavShaft.l=result.newPos;releaseAutoplay();changeAutoplay();thumbsDraw(result.newPos,true);thumbArrUpdate()}if(!result.moved){var target=result.$target.closest("."+navFrameClass,$navShaft)[0];target&&onNavFrameClick.call(target,result.startEvent)}else if(result.pos!==result.newPos){pausedAutoplayFLAG=true;slide($navShaft,{time:result.time,pos:result.newPos,overPos:result.overPos,direction:opts.navdir,onEnd:onEnd});thumbsDraw(result.newPos);o_shadows&&setShadow($nav,findShadowEdge(result.newPos,navShaftTouchTail.min,navShaftTouchTail.max,result.dir))}else{onEnd()}},timeLow:.5,timeHigh:2,friction:5,$wrap:$nav,direction:opts.navdir});stageWheelTail=wheel($stage,{shift:true,onEnd:function(e,direction){onTouchStart();onTouchEnd();that.show({index:direction,slow:e.altKey})}});navWheelTail=wheel($nav,{onEnd:function(e,direction){onTouchStart();onTouchEnd();var newPos=stop($navShaft)+direction*.25;$navShaft.css(getTranslate(minMaxLimit(newPos,navShaftTouchTail.min,navShaftTouchTail.max),opts.navdir));o_shadows&&setShadow($nav,findShadowEdge(newPos,navShaftTouchTail.min,navShaftTouchTail.max,opts.navdir));navWheelTail.prevent={"<":newPos>=navShaftTouchTail.max,">":newPos<=navShaftTouchTail.min};clearTimeout(navWheelTail.t);navWheelTail.t=setTimeout(function(){slideNavShaft.l=newPos;thumbsDraw(newPos,true)},TOUCH_TIMEOUT);thumbsDraw(newPos)}});$wrap.hover(function(){setTimeout(function(){if(touchedFLAG)return;toggleControlsClass(!(hoverFLAG=true))},0)},function(){if(!hoverFLAG)return;toggleControlsClass(!(hoverFLAG=false))});function onNavFrameClick(e){var index=$(this).data().eq;if(opts.navtype==="thumbs"){clickToShow({index:index,slow:e.altKey,user:true,coo:e._x-$nav.offset().left})}else{clickToShow({index:index,slow:e.altKey,user:true})}}function onArrClick(e){clickToShow({index:$arrs.index(this)?">":"<",slow:e.altKey,user:true})}smartClick($arrs,function(e){stopEvent(e);onArrClick.call(this,e)},{onStart:function(){onTouchStart();stageShaftTouchTail.control=true},onTouchEnd:onTouchEnd});smartClick($thumbArrLeft,function(e){stopEvent(e);if(opts.navtype==="thumbs"){that.show("<")}else{that.showSlide("prev")}});smartClick($thumbArrRight,function(e){stopEvent(e);if(opts.navtype==="thumbs"){that.show(">")}else{that.showSlide("next")}});function addFocusOnControls(el){addFocus(el,function(){setTimeout(function(){lockScroll($stage)},0);toggleControlsClass(false)})}$arrs.each(function(){addEnterUp(this,function(e){onArrClick.call(this,e)});addFocusOnControls(this)});addEnterUp(fullscreenIcon,function(){if($fotorama.hasClass(fullscreenClass)){that.cancelFullScreen();$stageShaft.focus()}else{that.requestFullScreen();$fullscreenIcon.focus()}});addFocusOnControls(fullscreenIcon);function reset(){setData();setOptions();if(!reset.i){reset.i=true;var _startindex=opts.startindex;activeIndex=repositionIndex=dirtyIndex=lastActiveIndex=startIndex=edgeIndex(_startindex)||0}if(size){if(changeToRtl())return;if($videoPlaying){unloadVideo($videoPlaying,true)}activeIndexes=[];detachFrames(STAGE_FRAME_KEY);reset.ok=true;that.show({index:activeIndex,time:0});that.resize()}else{that.destroy()}}function changeToRtl(){if(!changeToRtl.f===o_rtl){changeToRtl.f=o_rtl;activeIndex=size-1-activeIndex;that.reverse();return true}}$.each("load push pop shift unshift reverse sort splice".split(" "),function(i,method){that[method]=function(){data=data||[];if(method!=="load"){Array.prototype[method].apply(data,arguments)}else if(arguments[0]&&typeof arguments[0]==="object"&&arguments[0].length){data=clone(arguments[0])}reset();return that}});function ready(){if(ready.ok){ready.ok=false;triggerEvent("ready")}}reset()};$.fn.fotorama=function(opts){return this.each(function(){var that=this,$fotorama=$(this),fotoramaData=$fotorama.data(),fotorama=fotoramaData.fotorama;if(!fotorama){waitFor(function(){return!isHidden(that)},function(){fotoramaData.urtext=$fotorama.html();new $.Fotorama($fotorama,$.extend({},OPTIONS,window.fotoramaDefaults,opts,fotoramaData))})}else{fotorama.setOptions(opts,true)}})};$.Fotorama.instances=[];function calculateIndexes(){$.each($.Fotorama.instances,function(index,instance){instance.index=index})}function addInstance(instance){$.Fotorama.instances.push(instance);calculateIndexes()}function hideInstance(instance){$.Fotorama.instances.splice(instance.index,1);calculateIndexes()}$.Fotorama.cache={};$.Fotorama.measures={};$=$||{};$.Fotorama=$.Fotorama||{};$.Fotorama.jst=$.Fotorama.jst||{};$.Fotorama.jst.dots=function(v){var __t,__p="",__e=_.escape;__p+='<div class="fotorama__nav__frame fotorama__nav__frame--dot" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__dot"></div>\r\n</div>';return __p};$.Fotorama.jst.frameCaption=function(v){var __t,__p="",__e=_.escape;__p+='<div class="fotorama__caption" aria-hidden="true">\r\n    <div class="fotorama__caption__wrap" id="'+((__t=v.labelledby)==null?"":__t)+'">'+((__t=v.caption)==null?"":__t)+"</div>\r\n</div>\r\n";return __p};$.Fotorama.jst.style=function(v){var __t,__p="",__e=_.escape;__p+=".fotorama"+((__t=v.s)==null?"":__t)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+((__t=v.m)==null?"":__t)+"px;\r\nheight:"+((__t=v.h)==null?"":__t)+"px}\r\n.fotorama"+((__t=v.s)==null?"":__t)+" .fotorama__thumb-border{\r\nheight:"+((__t=v.h)==null?"":__t)+"px;\r\nborder-width:"+((__t=v.b)==null?"":__t)+"px;\r\nmargin-top:"+((__t=v.m)==null?"":__t)+"px}";return __p};$.Fotorama.jst.thumb=function(v){var __t,__p="",__e=_.escape;__p+='<div class="fotorama__nav__frame fotorama__nav__frame--thumb" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__thumb">\r\n    </div>\r\n</div>';return __p}})(window,document,location,typeof jQuery!=="undefined"&&jQuery);
diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv
index 21cfb51d5e3c9..7938068871963 100644
--- a/lib/web/i18n/en_US.csv
+++ b/lib/web/i18n/en_US.csv
@@ -27,6 +27,7 @@ Submit,Submit
 "Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please"
 "Letters only please","Letters only please"
 "No white space please","No white space please"
+"No marginal white space please","No marginal white space please"
 "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"
 "A positive or negative non-decimal number please","A positive or negative non-decimal number please"
 "The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid."
@@ -95,10 +96,11 @@ Submit,Submit
 "Please enter valid SKU key.","Please enter valid SKU key."
 "Please enter a valid number.","Please enter a valid number."
 "This is required field","This is required field"
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
 "Password cannot be the same as email address.","Password cannot be the same as email address."
 "Please fix this field.","Please fix this field."
 "Please enter a valid email address.","Please enter a valid email address."
+"Please remove invalid characters: {0}.", "Please remove invalid characters: {0}."
 "Please enter a valid URL.","Please enter a valid URL."
 "Please enter a valid date (ISO).","Please enter a valid date (ISO)."
 "Please enter only digits.","Please enter only digits."
diff --git a/lib/web/images/logo.svg b/lib/web/images/logo.svg
index 013d6e7c5a107..0f29d4e3eef21 100644
--- a/lib/web/images/logo.svg
+++ b/lib/web/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
diff --git a/lib/web/images/magento-logo.svg b/lib/web/images/magento-logo.svg
index 0d5cc0e6233d6..0f29d4e3eef21 100644
--- a/lib/web/images/magento-logo.svg
+++ b/lib/web/images/magento-logo.svg
@@ -1 +1 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/><path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/><path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/><path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/><path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/><path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/><path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/><path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/><g fill="#E85D22"><path d="m26.845 8.857"/><polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/><polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/></g></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
diff --git a/lib/web/jquery.js b/lib/web/jquery.js
index e845f7db2ae57..9a98ef778ed58 100644
--- a/lib/web/jquery.js
+++ b/lib/web/jquery.js
@@ -7705,7 +7705,7 @@
 				value = hooks.expand( value );
 				delete props[ name ];
 
-				// not quite $.extend, this wont overwrite keys already present.
+				// not quite $.extend, this won't overwrite keys already present.
 				// also - reusing 'index' from above because we have the correct "name"
 				for ( index in value ) {
 					if ( !( index in props ) ) {
diff --git a/lib/web/jquery/editableMultiselect/js/jquery.editable.js b/lib/web/jquery/editableMultiselect/js/jquery.editable.js
index 87e5049db033f..6c9f0a4373dd5 100644
--- a/lib/web/jquery/editableMultiselect/js/jquery.editable.js
+++ b/lib/web/jquery/editableMultiselect/js/jquery.editable.js
@@ -129,7 +129,7 @@
                     return;
                 }
 
-                /* prevent throwing an exeption if edit field is clicked again */
+                /* prevent throwing an exception if edit field is clicked again */
                 if (self.editing) {
                     return;
                 }
@@ -191,7 +191,7 @@
                 if (settings.style) {
                     if ('inherit' == settings.style) {
                         form.attr('style', $(self).attr('style'));
-                        /* IE needs the second line or display wont be inherited */
+                        /* IE needs the second line or display won't be inherited */
                         form.css('display', $(self).css('display'));
                     } else {
                         form.attr('style', settings.style);
diff --git a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
index e36a93df36b57..44b628efb481c 100644
--- a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
+++ b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
@@ -52,17 +52,6 @@
   display: block;
 }
 
-/* Fix for IE 6: */
-*html .fileinput-button {
-  line-height: 22px;
-  margin: 1px -3px 0 0;
-}
-
-/* Fix for IE 7: */
-*+html .fileinput-button {
-  margin: 1px 0 0 0;
-}
-
 @media (max-width: 480px) {
   .files .btn span {
     display: none;
diff --git a/lib/web/jquery/jquery-migrate.js b/lib/web/jquery/jquery-migrate.js
index 25b6c813146a3..d5ce9187d5bb5 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 3c607bae3d6ec..0000000000000
--- 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/jquery/jstree/jquery.hotkeys.js b/lib/web/jquery/jstree/jquery.hotkeys.js
index 583ac24d59ab7..207c65bb06df6 100644
--- a/lib/web/jquery/jstree/jquery.hotkeys.js
+++ b/lib/web/jquery/jstree/jquery.hotkeys.js
@@ -48,8 +48,12 @@
 	
 		handleObj.handler = function( event ) {
 			// Don't fire in text-accepting inputs that we didn't directly bind to
+            /**
+             * Modified by Magento to ensure it doesn't fire on any content editable areas. This library is no
+             * longer maintained by its author however we require content editable to behave as expected.
+             */
 			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				 event.target.type === "text") ) {
+				 event.target.type === "text" || jQuery(event.target).attr('contenteditable')) ) {
 				return;
 			}
 			
diff --git a/lib/web/jquery/jstree/jquery.jstree.js b/lib/web/jquery/jstree/jquery.jstree.js
index e2f6330ba45eb..4671256b4207b 100644
--- a/lib/web/jquery/jstree/jquery.jstree.js
+++ b/lib/web/jquery/jstree/jquery.jstree.js
@@ -28,7 +28,7 @@
 "use strict";
 
 // top wrapper to prevent multiple inclusion (is this OK?)
-(function () { if(jQuery && jQuery.jstree) { return; }
+(function () {
 	var is_ie6 = false, is_ie7 = false, is_ff2 = false;
 
 /*
diff --git a/lib/web/jquery/patches/jquery-ui.js b/lib/web/jquery/patches/jquery-ui.js
new file mode 100644
index 0000000000000..ae2d8da7ece66
--- /dev/null
+++ b/lib/web/jquery/patches/jquery-ui.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * Patch for CVE-2016-7103 (XSS vulnerability).
+     * Can safely remove only when jQuery UI is upgraded to >= 1.12.x.
+     * https://www.cvedetails.com/cve/CVE-2016-7103/
+     */
+    function dialogPatch() {
+        $.widget('ui.dialog', $.ui.dialog, {
+            /** @inheritdoc */
+            _createTitlebar: function () {
+                this.options.closeText = $('<a>').text('' + this.options.closeText).html();
+
+                this._superApply();
+            },
+
+            /** @inheritdoc */
+            _setOption: function (key, value) {
+                if (key === 'closeText') {
+                    value = $('<a>').text('' + value).html();
+                }
+
+                this._super(key, value);
+            }
+        });
+    }
+
+    return function () {
+        var majorVersion = $.ui.version.split('.')[0],
+            minorVersion = $.ui.version.split('.')[1];
+
+        if (majorVersion === 1 && minorVersion >= 12 || majorVersion >= 2) {
+            console.warn('jQuery patch for CVE-2016-7103 is no longer necessary, and should be removed');
+        }
+
+        dialogPatch();
+    };
+});
diff --git a/lib/web/jquery/patches/jquery.js b/lib/web/jquery/patches/jquery.js
new file mode 100644
index 0000000000000..5c741d0832b75
--- /dev/null
+++ b/lib/web/jquery/patches/jquery.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    /**
+     * Patch for CVE-2015-9251 (XSS vulnerability).
+     * Can safely remove only when jQuery UI is upgraded to >= 3.3.x.
+     * https://www.cvedetails.com/cve/CVE-2015-9251/
+     */
+    function ajaxResponsePatch(jQuery) {
+        jQuery.ajaxPrefilter(function (s) {
+            if (s.crossDomain) {
+                s.contents.script = false;
+            }
+        });
+    }
+
+    return function ($) {
+        var majorVersion = $.fn.jquery.split('.')[0];
+
+        if (majorVersion >= 3) {
+            console.warn('jQuery patch for CVE-2015-9251 is no longer necessary, and should be removed');
+        }
+
+        ajaxResponsePatch($);
+
+        return $;
+    };
+});
diff --git a/lib/web/jquery/spectrum/spectrum.js b/lib/web/jquery/spectrum/spectrum.js
new file mode 100644
index 0000000000000..7e4933934fc63
--- /dev/null
+++ b/lib/web/jquery/spectrum/spectrum.js
@@ -0,0 +1,2323 @@
+// Spectrum Colorpicker v1.8.0
+// https://github.com/bgrins/spectrum
+// Author: Brian Grinstead
+// License: MIT
+
+(function (factory) {
+    "use strict";
+
+    if (typeof define === 'function' && define.amd) { // AMD
+        define(['jquery'], factory);
+    }
+    else if (typeof exports == "object" && typeof module == "object") { // CommonJS
+        module.exports = factory(require('jquery'));
+    }
+    else { // Browser
+        factory(jQuery);
+    }
+})(function($, undefined) {
+    "use strict";
+
+    var defaultOpts = {
+
+            // Callbacks
+            beforeShow: noop,
+            move: noop,
+            change: noop,
+            show: noop,
+            hide: noop,
+
+            // Options
+            color: false,
+            flat: false,
+            showInput: false,
+            allowEmpty: false,
+            showButtons: true,
+            clickoutFiresChange: true,
+            showInitial: false,
+            showPalette: false,
+            showPaletteOnly: false,
+            hideAfterPaletteSelect: false,
+            togglePaletteOnly: false,
+            showSelectionPalette: true,
+            localStorageKey: false,
+            appendTo: "body",
+            maxSelectionSize: 7,
+            cancelText: "cancel",
+            chooseText: "choose",
+            togglePaletteMoreText: "more",
+            togglePaletteLessText: "less",
+            clearText: "Clear Color Selection",
+            noColorSelectedText: "No Color Selected",
+            preferredFormat: false,
+            className: "", // Deprecated - use containerClassName and replacerClassName instead.
+            containerClassName: "",
+            replacerClassName: "",
+            showAlpha: false,
+            theme: "sp-light",
+            palette: [["#ffffff", "#000000", "#ff0000", "#ff8000", "#ffff00", "#008000", "#0000ff", "#4b0082", "#9400d3"]],
+            selectionPalette: [],
+            disabled: false,
+            offset: null
+        },
+        spectrums = [],
+        IE = !!/msie/i.exec( window.navigator.userAgent ),
+        rgbaSupport = (function() {
+            function contains( str, substr ) {
+                return !!~('' + str).indexOf(substr);
+            }
+
+            var elem = document.createElement('div');
+            var style = elem.style;
+            style.cssText = 'background-color:rgba(0,0,0,.5)';
+            return contains(style.backgroundColor, 'rgba') || contains(style.backgroundColor, 'hsla');
+        })(),
+        replaceInput = [
+            "<div class='sp-replacer'>",
+            "<div class='sp-preview'><div class='sp-preview-inner'></div></div>",
+            "<div class='sp-dd'>&#9660;</div>",
+            "</div>"
+        ].join(''),
+        markup = (function () {
+
+            // IE does not support gradients with multiple stops, so we need to simulate
+            //  that for the rainbow slider with 8 divs that each have a single gradient
+            var gradientFix = "";
+            if (IE) {
+                for (var i = 1; i <= 6; i++) {
+                    gradientFix += "<div class='sp-" + i + "'></div>";
+                }
+            }
+
+            return [
+                "<div class='sp-container sp-hidden'>",
+                "<div class='sp-palette-container'>",
+                "<div class='sp-palette sp-thumb sp-cf'></div>",
+                "<div class='sp-palette-button-container sp-cf'>",
+                "<button type='button' class='sp-palette-toggle'></button>",
+                "</div>",
+                "</div>",
+                "<div class='sp-picker-container'>",
+                "<div class='sp-top sp-cf'>",
+                "<div class='sp-fill'></div>",
+                "<div class='sp-top-inner'>",
+                "<div class='sp-color'>",
+                "<div class='sp-sat'>",
+                "<div class='sp-val'>",
+                "<div class='sp-dragger'></div>",
+                "</div>",
+                "</div>",
+                "</div>",
+                "<div class='sp-clear sp-clear-display'>",
+                "</div>",
+                "<div class='sp-hue'>",
+                "<div class='sp-slider'></div>",
+                gradientFix,
+                "</div>",
+                "</div>",
+                "<div class='sp-alpha'><div class='sp-alpha-inner'><div class='sp-alpha-handle'></div></div></div>",
+                "</div>",
+                "<div class='sp-input-container sp-cf'>",
+                "<input class='sp-input' type='text' spellcheck='false'  />",
+                "</div>",
+                "<div class='sp-initial sp-thumb sp-cf'></div>",
+                "<div class='sp-button-container sp-cf'>",
+                "<a class='sp-cancel' href='#'></a>",
+                "<button type='button' class='sp-choose'></button>",
+                "</div>",
+                "</div>",
+                "</div>"
+            ].join("");
+        })();
+
+    function paletteTemplate (p, color, className, opts) {
+        var html = [];
+        for (var i = 0; i < p.length; i++) {
+            var current = p[i];
+            if(current) {
+                var tiny = tinycolor(current);
+                var c = tiny.toHsl().l < 0.5 ? "sp-thumb-el sp-thumb-dark" : "sp-thumb-el sp-thumb-light";
+                c += (tinycolor.equals(color, current)) ? " sp-thumb-active" : "";
+                var formattedString = tiny.toString(opts.preferredFormat || "rgb");
+                var swatchStyle = rgbaSupport ? ("background-color:" + tiny.toRgbString()) : "filter:" + tiny.toFilter();
+                html.push('<span title="' + formattedString + '" data-color="' + tiny.toRgbString() + '" class="' + c + '"><span class="sp-thumb-inner" style="' + swatchStyle + ';" /></span>');
+            } else {
+                var cls = 'sp-clear-display';
+                html.push($('<div />')
+                    .append($('<span data-color="" style="background-color:transparent;" class="' + cls + '"></span>')
+                        .attr('title', opts.noColorSelectedText)
+                    )
+                    .html()
+                );
+            }
+        }
+        return "<div class='sp-cf " + className + "'>" + html.join('') + "</div>";
+    }
+
+    function hideAll() {
+        for (var i = 0; i < spectrums.length; i++) {
+            if (spectrums[i]) {
+                spectrums[i].hide();
+            }
+        }
+    }
+
+    function instanceOptions(o, callbackContext) {
+        var opts = $.extend({}, defaultOpts, o);
+        opts.callbacks = {
+            'move': bind(opts.move, callbackContext),
+            'change': bind(opts.change, callbackContext),
+            'show': bind(opts.show, callbackContext),
+            'hide': bind(opts.hide, callbackContext),
+            'beforeShow': bind(opts.beforeShow, callbackContext)
+        };
+
+        return opts;
+    }
+
+    function spectrum(element, o) {
+
+        var opts = instanceOptions(o, element),
+            flat = opts.flat,
+            showSelectionPalette = opts.showSelectionPalette,
+            localStorageKey = opts.localStorageKey,
+            theme = opts.theme,
+            callbacks = opts.callbacks,
+            resize = throttle(reflow, 10),
+            visible = false,
+            isDragging = false,
+            dragWidth = 0,
+            dragHeight = 0,
+            dragHelperHeight = 0,
+            slideHeight = 0,
+            slideWidth = 0,
+            alphaWidth = 0,
+            alphaSlideHelperWidth = 0,
+            slideHelperHeight = 0,
+            currentHue = 0,
+            currentSaturation = 0,
+            currentValue = 0,
+            currentAlpha = 1,
+            palette = [],
+            paletteArray = [],
+            paletteLookup = {},
+            selectionPalette = opts.selectionPalette.slice(0),
+            maxSelectionSize = opts.maxSelectionSize,
+            draggingClass = "sp-dragging",
+            shiftMovementDirection = null;
+
+        var doc = element.ownerDocument,
+            body = doc.body,
+            boundElement = $(element),
+            disabled = false,
+            container = $(markup, doc).addClass(theme),
+            pickerContainer = container.find(".sp-picker-container"),
+            dragger = container.find(".sp-color"),
+            dragHelper = container.find(".sp-dragger"),
+            slider = container.find(".sp-hue"),
+            slideHelper = container.find(".sp-slider"),
+            alphaSliderInner = container.find(".sp-alpha-inner"),
+            alphaSlider = container.find(".sp-alpha"),
+            alphaSlideHelper = container.find(".sp-alpha-handle"),
+            textInput = container.find(".sp-input"),
+            paletteContainer = container.find(".sp-palette"),
+            initialColorContainer = container.find(".sp-initial"),
+            cancelButton = container.find(".sp-cancel"),
+            clearButton = container.find(".sp-clear"),
+            chooseButton = container.find(".sp-choose"),
+            toggleButton = container.find(".sp-palette-toggle"),
+            isInput = boundElement.is("input"),
+            isInputTypeColor = isInput && boundElement.attr("type") === "color" && inputTypeColorSupport(),
+            shouldReplace = isInput && !flat,
+            replacer = (shouldReplace) ? $(replaceInput).addClass(theme).addClass(opts.className).addClass(opts.replacerClassName) : $([]),
+            offsetElement = (shouldReplace) ? replacer : boundElement,
+            previewElement = replacer.find(".sp-preview-inner"),
+            initialColor = opts.color || (isInput && boundElement.val()),
+            colorOnShow = false,
+            currentPreferredFormat = opts.preferredFormat,
+            clickoutFiresChange = !opts.showButtons || opts.clickoutFiresChange,
+            isEmpty = !initialColor,
+            allowEmpty = opts.allowEmpty && !isInputTypeColor;
+
+        function applyOptions() {
+
+            if (opts.showPaletteOnly) {
+                opts.showPalette = true;
+            }
+
+            toggleButton.text(opts.showPaletteOnly ? opts.togglePaletteMoreText : opts.togglePaletteLessText);
+
+            if (opts.palette) {
+                palette = opts.palette.slice(0);
+                paletteArray = $.isArray(palette[0]) ? palette : [palette];
+                paletteLookup = {};
+                for (var i = 0; i < paletteArray.length; i++) {
+                    for (var j = 0; j < paletteArray[i].length; j++) {
+                        var rgb = tinycolor(paletteArray[i][j]).toRgbString();
+                        paletteLookup[rgb] = true;
+                    }
+                }
+            }
+
+            container.toggleClass("sp-flat", flat);
+            container.toggleClass("sp-input-disabled", !opts.showInput);
+            container.toggleClass("sp-alpha-enabled", opts.showAlpha);
+            container.toggleClass("sp-clear-enabled", allowEmpty);
+            container.toggleClass("sp-buttons-disabled", !opts.showButtons);
+            container.toggleClass("sp-palette-buttons-disabled", !opts.togglePaletteOnly);
+            container.toggleClass("sp-palette-disabled", !opts.showPalette);
+            container.toggleClass("sp-palette-only", opts.showPaletteOnly);
+            container.toggleClass("sp-initial-disabled", !opts.showInitial);
+            container.addClass(opts.className).addClass(opts.containerClassName);
+
+            reflow();
+        }
+
+        function initialize() {
+
+            if (IE) {
+                container.find("*:not(input)").attr("unselectable", "on");
+            }
+
+            applyOptions();
+
+            if (shouldReplace) {
+                boundElement.after(replacer).hide();
+            }
+
+            if (!allowEmpty) {
+                clearButton.hide();
+            }
+
+            if (flat) {
+                boundElement.after(container).hide();
+            }
+            else {
+
+                var appendTo = opts.appendTo === "parent" ? boundElement.parent() : $(opts.appendTo);
+                if (appendTo.length !== 1) {
+                    appendTo = $("body");
+                }
+
+                appendTo.append(container);
+            }
+
+            updateSelectionPaletteFromStorage();
+
+            offsetElement.bind("click.spectrum touchstart.spectrum", function (e) {
+                if (!disabled) {
+                    toggle();
+                }
+
+                e.stopPropagation();
+
+                if (!$(e.target).is("input")) {
+                    e.preventDefault();
+                }
+            });
+
+            if(boundElement.is(":disabled") || (opts.disabled === true)) {
+                disable();
+            }
+
+            // Prevent clicks from bubbling up to document.  This would cause it to be hidden.
+            container.click(stopPropagation);
+
+            // Handle user typed input
+            textInput.change(setFromTextInput);
+            textInput.bind("paste", function () {
+                setTimeout(setFromTextInput, 1);
+            });
+            textInput.keydown(function (e) { if (e.keyCode == 13) { setFromTextInput(); } });
+
+            cancelButton.text(opts.cancelText);
+            cancelButton.bind("click.spectrum", function (e) {
+                e.stopPropagation();
+                e.preventDefault();
+                revert();
+                hide();
+            });
+
+            clearButton.attr("title", opts.clearText);
+            clearButton.bind("click.spectrum", function (e) {
+                e.stopPropagation();
+                e.preventDefault();
+                isEmpty = true;
+                move();
+
+                if(flat) {
+                    //for the flat style, this is a change event
+                    updateOriginalInput(true);
+                }
+            });
+
+            chooseButton.text(opts.chooseText);
+            chooseButton.bind("click.spectrum", function (e) {
+                e.stopPropagation();
+                e.preventDefault();
+
+                if (IE && textInput.is(":focus")) {
+                    textInput.trigger('change');
+                }
+
+                if (isValid()) {
+                    updateOriginalInput(true);
+                    hide();
+                }
+            });
+
+            toggleButton.text(opts.showPaletteOnly ? opts.togglePaletteMoreText : opts.togglePaletteLessText);
+            toggleButton.bind("click.spectrum", function (e) {
+                e.stopPropagation();
+                e.preventDefault();
+
+                opts.showPaletteOnly = !opts.showPaletteOnly;
+
+                // To make sure the Picker area is drawn on the right, next to the
+                // Palette area (and not below the palette), first move the Palette
+                // to the left to make space for the picker, plus 5px extra.
+                // The 'applyOptions' function puts the whole container back into place
+                // and takes care of the button-text and the sp-palette-only CSS class.
+                if (!opts.showPaletteOnly && !flat) {
+                    container.css('left', '-=' + (pickerContainer.outerWidth(true) + 5));
+                }
+                applyOptions();
+            });
+
+            draggable(alphaSlider, function (dragX, dragY, e) {
+                currentAlpha = (dragX / alphaWidth);
+                isEmpty = false;
+                if (e.shiftKey) {
+                    currentAlpha = Math.round(currentAlpha * 10) / 10;
+                }
+
+                move();
+            }, dragStart, dragStop);
+
+            draggable(slider, function (dragX, dragY) {
+                currentHue = parseFloat(dragY / slideHeight);
+                isEmpty = false;
+                if (!opts.showAlpha) {
+                    currentAlpha = 1;
+                }
+                move();
+            }, dragStart, dragStop);
+
+            draggable(dragger, function (dragX, dragY, e) {
+
+                // shift+drag should snap the movement to either the x or y axis.
+                if (!e.shiftKey) {
+                    shiftMovementDirection = null;
+                }
+                else if (!shiftMovementDirection) {
+                    var oldDragX = currentSaturation * dragWidth;
+                    var oldDragY = dragHeight - (currentValue * dragHeight);
+                    var furtherFromX = Math.abs(dragX - oldDragX) > Math.abs(dragY - oldDragY);
+
+                    shiftMovementDirection = furtherFromX ? "x" : "y";
+                }
+
+                var setSaturation = !shiftMovementDirection || shiftMovementDirection === "x";
+                var setValue = !shiftMovementDirection || shiftMovementDirection === "y";
+
+                if (setSaturation) {
+                    currentSaturation = parseFloat(dragX / dragWidth);
+                }
+                if (setValue) {
+                    currentValue = parseFloat((dragHeight - dragY) / dragHeight);
+                }
+
+                isEmpty = false;
+                if (!opts.showAlpha) {
+                    currentAlpha = 1;
+                }
+
+                move();
+
+            }, dragStart, dragStop);
+
+            if (!!initialColor) {
+                set(initialColor);
+
+                // In case color was black - update the preview UI and set the format
+                // since the set function will not run (default color is black).
+                updateUI();
+                currentPreferredFormat = opts.preferredFormat || tinycolor(initialColor).format;
+
+                addColorToSelectionPalette(initialColor);
+            }
+            else {
+                updateUI();
+            }
+
+            if (flat) {
+                show();
+            }
+
+            function paletteElementClick(e) {
+                if (e.data && e.data.ignore) {
+                    set($(e.target).closest(".sp-thumb-el").data("color"));
+                    move();
+                }
+                else {
+                    set($(e.target).closest(".sp-thumb-el").data("color"));
+                    move();
+                    updateOriginalInput(true);
+                    if (opts.hideAfterPaletteSelect) {
+                        hide();
+                    }
+                }
+
+                return false;
+            }
+
+            var paletteEvent = IE ? "mousedown.spectrum" : "click.spectrum touchstart.spectrum";
+            paletteContainer.delegate(".sp-thumb-el", paletteEvent, paletteElementClick);
+            initialColorContainer.delegate(".sp-thumb-el:nth-child(1)", paletteEvent, { ignore: true }, paletteElementClick);
+        }
+
+        function updateSelectionPaletteFromStorage() {
+
+            if (localStorageKey && window.localStorage) {
+
+                // Migrate old palettes over to new format.  May want to remove this eventually.
+                try {
+                    var oldPalette = window.localStorage[localStorageKey].split(",#");
+                    if (oldPalette.length > 1) {
+                        delete window.localStorage[localStorageKey];
+                        $.each(oldPalette, function(i, c) {
+                            addColorToSelectionPalette(c);
+                        });
+                    }
+                }
+                catch(e) { }
+
+                try {
+                    selectionPalette = window.localStorage[localStorageKey].split(";");
+                }
+                catch (e) { }
+            }
+        }
+
+        function addColorToSelectionPalette(color) {
+            if (showSelectionPalette) {
+                var rgb = tinycolor(color).toRgbString();
+                if (!paletteLookup[rgb] && $.inArray(rgb, selectionPalette) === -1) {
+                    selectionPalette.push(rgb);
+                    while(selectionPalette.length > maxSelectionSize) {
+                        selectionPalette.shift();
+                    }
+                }
+
+                if (localStorageKey && window.localStorage) {
+                    try {
+                        window.localStorage[localStorageKey] = selectionPalette.join(";");
+                    }
+                    catch(e) { }
+                }
+            }
+        }
+
+        function getUniqueSelectionPalette() {
+            var unique = [];
+            if (opts.showPalette) {
+                for (var i = 0; i < selectionPalette.length; i++) {
+                    var rgb = tinycolor(selectionPalette[i]).toRgbString();
+
+                    if (!paletteLookup[rgb]) {
+                        unique.push(selectionPalette[i]);
+                    }
+                }
+            }
+
+            return unique.reverse().slice(0, opts.maxSelectionSize);
+        }
+
+        function drawPalette() {
+
+            var currentColor = get();
+
+            var html = $.map(paletteArray, function (palette, i) {
+                return paletteTemplate(palette, currentColor, "sp-palette-row sp-palette-row-" + i, opts);
+            });
+
+            updateSelectionPaletteFromStorage();
+
+            if (selectionPalette) {
+                html.push(paletteTemplate(getUniqueSelectionPalette(), currentColor, "sp-palette-row sp-palette-row-selection", opts));
+            }
+
+            paletteContainer.html(html.join(""));
+        }
+
+        function drawInitial() {
+            if (opts.showInitial) {
+                var initial = colorOnShow;
+                var current = get();
+                initialColorContainer.html(paletteTemplate([initial, current], current, "sp-palette-row-initial", opts));
+            }
+        }
+
+        function dragStart() {
+            if (dragHeight <= 0 || dragWidth <= 0 || slideHeight <= 0) {
+                reflow();
+            }
+            isDragging = true;
+            container.addClass(draggingClass);
+            shiftMovementDirection = null;
+            boundElement.trigger('dragstart.spectrum', [ get() ]);
+        }
+
+        function dragStop() {
+            isDragging = false;
+            container.removeClass(draggingClass);
+            boundElement.trigger('dragstop.spectrum', [ get() ]);
+        }
+
+        function setFromTextInput() {
+
+            var value = textInput.val();
+
+            if ((value === null || value === "") && allowEmpty) {
+                set(null);
+                updateOriginalInput(true);
+            }
+            else {
+                var tiny = tinycolor(value);
+                if (tiny.isValid()) {
+                    set(tiny);
+                    updateOriginalInput(true);
+                }
+                else {
+                    textInput.addClass("sp-validation-error");
+                }
+            }
+        }
+
+        function toggle() {
+            if (visible) {
+                hide();
+            }
+            else {
+                show();
+            }
+        }
+
+        function show() {
+            var event = $.Event('beforeShow.spectrum');
+
+            if (visible) {
+                reflow();
+                return;
+            }
+
+            boundElement.trigger(event, [ get() ]);
+
+            if (callbacks.beforeShow(get()) === false || event.isDefaultPrevented()) {
+                return;
+            }
+
+            hideAll();
+            visible = true;
+
+            $(doc).bind("keydown.spectrum", onkeydown);
+            $(doc).bind("click.spectrum", clickout);
+            $(window).bind("resize.spectrum", resize);
+            replacer.addClass("sp-active");
+            container.removeClass("sp-hidden");
+
+            reflow();
+            updateUI();
+
+            colorOnShow = get();
+
+            drawInitial();
+            callbacks.show(colorOnShow);
+            boundElement.trigger('show.spectrum', [ colorOnShow ]);
+        }
+
+        function onkeydown(e) {
+            // Close on ESC
+            if (e.keyCode === 27) {
+                hide();
+            }
+        }
+
+        function clickout(e) {
+            // Return on right click.
+            if (e.button == 2) { return; }
+
+            // If a drag event was happening during the mouseup, don't hide
+            // on click.
+            if (isDragging) { return; }
+
+            if (clickoutFiresChange) {
+                updateOriginalInput(true);
+            }
+            else {
+                revert();
+            }
+            hide();
+        }
+
+        function hide() {
+            // Return if hiding is unnecessary
+            if (!visible || flat) { return; }
+            visible = false;
+
+            $(doc).unbind("keydown.spectrum", onkeydown);
+            $(doc).unbind("click.spectrum", clickout);
+            $(window).unbind("resize.spectrum", resize);
+
+            replacer.removeClass("sp-active");
+            container.addClass("sp-hidden");
+
+            callbacks.hide(get());
+            boundElement.trigger('hide.spectrum', [ get() ]);
+        }
+
+        function revert() {
+            set(colorOnShow, true);
+        }
+
+        function set(color, ignoreFormatChange) {
+            if (tinycolor.equals(color, get())) {
+                // Update UI just in case a validation error needs
+                // to be cleared.
+                updateUI();
+                return;
+            }
+
+            var newColor, newHsv;
+            if (!color && allowEmpty) {
+                isEmpty = true;
+            } else {
+                isEmpty = false;
+                newColor = tinycolor(color);
+                newHsv = newColor.toHsv();
+
+                currentHue = (newHsv.h % 360) / 360;
+                currentSaturation = newHsv.s;
+                currentValue = newHsv.v;
+                currentAlpha = newHsv.a;
+            }
+            updateUI();
+
+            if (newColor && newColor.isValid() && !ignoreFormatChange) {
+                currentPreferredFormat = opts.preferredFormat || newColor.getFormat();
+            }
+        }
+
+        function get(opts) {
+            opts = opts || { };
+
+            if (allowEmpty && isEmpty) {
+                return null;
+            }
+
+            return tinycolor.fromRatio({
+                h: currentHue,
+                s: currentSaturation,
+                v: currentValue,
+                a: Math.round(currentAlpha * 100) / 100
+            }, { format: opts.format || currentPreferredFormat });
+        }
+
+        function isValid() {
+            return !textInput.hasClass("sp-validation-error");
+        }
+
+        function move() {
+            updateUI();
+
+            callbacks.move(get());
+            boundElement.trigger('move.spectrum', [ get() ]);
+        }
+
+        function updateUI() {
+
+            textInput.removeClass("sp-validation-error");
+
+            updateHelperLocations();
+
+            // Update dragger background color (gradients take care of saturation and value).
+            var flatColor = tinycolor.fromRatio({ h: currentHue, s: 1, v: 1 });
+            dragger.css("background-color", flatColor.toHexString());
+
+            // Get a format that alpha will be included in (hex and names ignore alpha)
+            var format = currentPreferredFormat;
+            if (currentAlpha < 1 && !(currentAlpha === 0 && format === "name")) {
+                if (format === "hex" || format === "hex3" || format === "hex6" || format === "name") {
+                    format = "rgb";
+                }
+            }
+
+            var realColor = get({ format: format }),
+                displayColor = '';
+
+            //reset background info for preview element
+            previewElement.removeClass("sp-clear-display");
+            previewElement.css('background-color', 'transparent');
+
+            if (!realColor && allowEmpty) {
+                // Update the replaced elements background with icon indicating no color selection
+                previewElement.addClass("sp-clear-display");
+            }
+            else {
+                var realHex = realColor.toHexString(),
+                    realRgb = realColor.toRgbString();
+
+                // Update the replaced elements background color (with actual selected color)
+                if (rgbaSupport || realColor.alpha === 1) {
+                    previewElement.css("background-color", realRgb);
+                }
+                else {
+                    previewElement.css("background-color", "transparent");
+                    previewElement.css("filter", realColor.toFilter());
+                }
+
+                if (opts.showAlpha) {
+                    var rgb = realColor.toRgb();
+                    rgb.a = 0;
+                    var realAlpha = tinycolor(rgb).toRgbString();
+                    var gradient = "linear-gradient(left, " + realAlpha + ", " + realHex + ")";
+
+                    if (IE) {
+                        alphaSliderInner.css("filter", tinycolor(realAlpha).toFilter({ gradientType: 1 }, realHex));
+                    }
+                    else {
+                        alphaSliderInner.css("background", "-webkit-" + gradient);
+                        alphaSliderInner.css("background", "-moz-" + gradient);
+                        alphaSliderInner.css("background", "-ms-" + gradient);
+                        // Use current syntax gradient on unprefixed property.
+                        alphaSliderInner.css("background",
+                            "linear-gradient(to right, " + realAlpha + ", " + realHex + ")");
+                    }
+                }
+
+                displayColor = realColor.toString(format);
+            }
+
+            // Update the text entry input as it changes happen
+            if (opts.showInput) {
+                textInput.val(displayColor);
+            }
+
+            if (opts.showPalette) {
+                drawPalette();
+            }
+
+            drawInitial();
+        }
+
+        function updateHelperLocations() {
+            var s = currentSaturation;
+            var v = currentValue;
+
+            if(allowEmpty && isEmpty) {
+                //if selected color is empty, hide the helpers
+                alphaSlideHelper.hide();
+                slideHelper.hide();
+                dragHelper.hide();
+            }
+            else {
+                //make sure helpers are visible
+                alphaSlideHelper.show();
+                slideHelper.show();
+                dragHelper.show();
+
+                // Where to show the little circle in that displays your current selected color
+                var dragX = s * dragWidth;
+                var dragY = dragHeight - (v * dragHeight);
+                dragX = Math.max(
+                    -dragHelperHeight,
+                    Math.min(dragWidth - dragHelperHeight, dragX - dragHelperHeight)
+                );
+                dragY = Math.max(
+                    -dragHelperHeight,
+                    Math.min(dragHeight - dragHelperHeight, dragY - dragHelperHeight)
+                );
+                dragHelper.css({
+                    "top": dragY + "px",
+                    "left": dragX + "px"
+                });
+
+                var alphaX = currentAlpha * alphaWidth;
+                alphaSlideHelper.css({
+                    "left": (alphaX - (alphaSlideHelperWidth / 2)) + "px"
+                });
+
+                // Where to show the bar that displays your current selected hue
+                var slideY = (currentHue) * slideHeight;
+                slideHelper.css({
+                    "top": (slideY - slideHelperHeight) + "px"
+                });
+            }
+        }
+
+        function updateOriginalInput(fireCallback) {
+            var color = get(),
+                displayColor = '',
+                hasChanged = !tinycolor.equals(color, colorOnShow);
+
+            if (color) {
+                displayColor = color.toString(currentPreferredFormat);
+                // Update the selection palette with the current color
+                addColorToSelectionPalette(color);
+            }
+
+            if (isInput) {
+                boundElement.val(displayColor);
+            }
+
+            if (fireCallback && hasChanged) {
+                callbacks.change(color);
+                boundElement.trigger('change', [ color ]);
+            }
+        }
+
+        function reflow() {
+            if (!visible) {
+                return; // Calculations would be useless and wouldn't be reliable anyways
+            }
+            dragWidth = dragger.width();
+            dragHeight = dragger.height();
+            dragHelperHeight = dragHelper.height();
+            slideWidth = slider.width();
+            slideHeight = slider.height();
+            slideHelperHeight = slideHelper.height();
+            alphaWidth = alphaSlider.width();
+            alphaSlideHelperWidth = alphaSlideHelper.width();
+
+            if (!flat) {
+                container.css("position", "absolute");
+                if (opts.offset) {
+                    container.offset(opts.offset);
+                } else {
+                    container.offset(getOffset(container, offsetElement));
+                }
+            }
+
+            updateHelperLocations();
+
+            if (opts.showPalette) {
+                drawPalette();
+            }
+
+            boundElement.trigger('reflow.spectrum');
+        }
+
+        function destroy() {
+            boundElement.show();
+            offsetElement.unbind("click.spectrum touchstart.spectrum");
+            container.remove();
+            replacer.remove();
+            spectrums[spect.id] = null;
+        }
+
+        function option(optionName, optionValue) {
+            if (optionName === undefined) {
+                return $.extend({}, opts);
+            }
+            if (optionValue === undefined) {
+                return opts[optionName];
+            }
+
+            opts[optionName] = optionValue;
+
+            if (optionName === "preferredFormat") {
+                currentPreferredFormat = opts.preferredFormat;
+            }
+            applyOptions();
+        }
+
+        function enable() {
+            disabled = false;
+            boundElement.attr("disabled", false);
+            offsetElement.removeClass("sp-disabled");
+        }
+
+        function disable() {
+            hide();
+            disabled = true;
+            boundElement.attr("disabled", true);
+            offsetElement.addClass("sp-disabled");
+        }
+
+        function setOffset(coord) {
+            opts.offset = coord;
+            reflow();
+        }
+
+        initialize();
+
+        var spect = {
+            show: show,
+            hide: hide,
+            toggle: toggle,
+            reflow: reflow,
+            option: option,
+            enable: enable,
+            disable: disable,
+            offset: setOffset,
+            set: function (c) {
+                set(c);
+                updateOriginalInput();
+            },
+            get: get,
+            destroy: destroy,
+            container: container
+        };
+
+        spect.id = spectrums.push(spect) - 1;
+
+        return spect;
+    }
+
+    /**
+     * checkOffset - get the offset below/above and left/right element depending on screen position
+     * Thanks https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.datepicker.js
+     */
+    function getOffset(picker, input) {
+        var extraY = 0;
+        var dpWidth = picker.outerWidth();
+        var dpHeight = picker.outerHeight();
+        var inputHeight = input.outerHeight();
+        var doc = picker[0].ownerDocument;
+        var docElem = doc.documentElement;
+        var viewWidth = docElem.clientWidth + $(doc).scrollLeft();
+        var viewHeight = docElem.clientHeight + $(doc).scrollTop();
+        var offset = input.offset();
+        offset.top += inputHeight;
+
+        offset.left -=
+            Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+                Math.abs(offset.left + dpWidth - viewWidth) : 0);
+
+        offset.top -=
+            Math.min(offset.top, ((offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+                Math.abs(dpHeight + inputHeight - extraY) : extraY));
+
+        return offset;
+    }
+
+    /**
+     * noop - do nothing
+     */
+    function noop() {
+
+    }
+
+    /**
+     * stopPropagation - makes the code only doing this a little easier to read in line
+     */
+    function stopPropagation(e) {
+        e.stopPropagation();
+    }
+
+    /**
+     * Create a function bound to a given object
+     * Thanks to underscore.js
+     */
+    function bind(func, obj) {
+        var slice = Array.prototype.slice;
+        var args = slice.call(arguments, 2);
+        return function () {
+            return func.apply(obj, args.concat(slice.call(arguments)));
+        };
+    }
+
+    /**
+     * Lightweight drag helper.  Handles containment within the element, so that
+     * when dragging, the x is within [0,element.width] and y is within [0,element.height]
+     */
+    function draggable(element, onmove, onstart, onstop) {
+        onmove = onmove || function () { };
+        onstart = onstart || function () { };
+        onstop = onstop || function () { };
+        var doc = document;
+        var dragging = false;
+        var offset = {};
+        var maxHeight = 0;
+        var maxWidth = 0;
+        var hasTouch = ('ontouchstart' in window);
+
+        var duringDragEvents = {};
+        duringDragEvents["selectstart"] = prevent;
+        duringDragEvents["dragstart"] = prevent;
+        duringDragEvents["touchmove mousemove"] = move;
+        duringDragEvents["touchend mouseup"] = stop;
+
+        function prevent(e) {
+            if (e.stopPropagation) {
+                e.stopPropagation();
+            }
+            if (e.preventDefault) {
+                e.preventDefault();
+            }
+            e.returnValue = false;
+        }
+
+        function move(e) {
+            if (dragging) {
+                // Mouseup happened outside of window
+                if (IE && doc.documentMode < 9 && !e.button) {
+                    return stop();
+                }
+
+                var t0 = e.originalEvent && e.originalEvent.touches && e.originalEvent.touches[0];
+                var pageX = t0 && t0.pageX || e.pageX;
+                var pageY = t0 && t0.pageY || e.pageY;
+
+                var dragX = Math.max(0, Math.min(pageX - offset.left, maxWidth));
+                var dragY = Math.max(0, Math.min(pageY - offset.top, maxHeight));
+
+                if (hasTouch) {
+                    // Stop scrolling in iOS
+                    prevent(e);
+                }
+
+                onmove.apply(element, [dragX, dragY, e]);
+            }
+        }
+
+        function start(e) {
+            var rightclick = (e.which) ? (e.which == 3) : (e.button == 2);
+
+            if (!rightclick && !dragging) {
+                if (onstart.apply(element, arguments) !== false) {
+                    dragging = true;
+                    maxHeight = $(element).height();
+                    maxWidth = $(element).width();
+                    offset = $(element).offset();
+
+                    $(doc).bind(duringDragEvents);
+                    $(doc.body).addClass("sp-dragging");
+
+                    move(e);
+
+                    prevent(e);
+                }
+            }
+        }
+
+        function stop() {
+            if (dragging) {
+                $(doc).unbind(duringDragEvents);
+                $(doc.body).removeClass("sp-dragging");
+
+                // Wait a tick before notifying observers to allow the click event
+                // to fire in Chrome.
+                setTimeout(function() {
+                    onstop.apply(element, arguments);
+                }, 0);
+            }
+            dragging = false;
+        }
+
+        $(element).bind("touchstart mousedown", start);
+    }
+
+    function throttle(func, wait, debounce) {
+        var timeout;
+        return function () {
+            var context = this, args = arguments;
+            var throttler = function () {
+                timeout = null;
+                func.apply(context, args);
+            };
+            if (debounce) clearTimeout(timeout);
+            if (debounce || !timeout) timeout = setTimeout(throttler, wait);
+        };
+    }
+
+    function inputTypeColorSupport() {
+        return $.fn.spectrum.inputTypeColorSupport();
+    }
+
+    /**
+     * Define a jQuery plugin
+     */
+    var dataID = "spectrum.id";
+    $.fn.spectrum = function (opts, extra) {
+
+        if (typeof opts == "string") {
+
+            var returnValue = this;
+            var args = Array.prototype.slice.call( arguments, 1 );
+
+            this.each(function () {
+                var spect = spectrums[$(this).data(dataID)];
+                if (spect) {
+                    var method = spect[opts];
+                    if (!method) {
+                        throw new Error( "Spectrum: no such method: '" + opts + "'" );
+                    }
+
+                    if (opts == "get") {
+                        returnValue = spect.get();
+                    }
+                    else if (opts == "container") {
+                        returnValue = spect.container;
+                    }
+                    else if (opts == "option") {
+                        returnValue = spect.option.apply(spect, args);
+                    }
+                    else if (opts == "destroy") {
+                        spect.destroy();
+                        $(this).removeData(dataID);
+                    }
+                    else {
+                        method.apply(spect, args);
+                    }
+                }
+            });
+
+            return returnValue;
+        }
+
+        // Initializing a new instance of spectrum
+        return this.spectrum("destroy").each(function () {
+            var options = $.extend({}, opts, $(this).data());
+            var spect = spectrum(this, options);
+            $(this).data(dataID, spect.id);
+        });
+    };
+
+    $.fn.spectrum.load = true;
+    $.fn.spectrum.loadOpts = {};
+    $.fn.spectrum.draggable = draggable;
+    $.fn.spectrum.defaults = defaultOpts;
+    $.fn.spectrum.inputTypeColorSupport = function inputTypeColorSupport() {
+        if (typeof inputTypeColorSupport._cachedResult === "undefined") {
+            var colorInput = $("<input type='color'/>")[0]; // if color element is supported, value will default to not null
+            inputTypeColorSupport._cachedResult = colorInput.type === "color" && colorInput.value !== "";
+        }
+        return inputTypeColorSupport._cachedResult;
+    };
+
+    $.spectrum = { };
+    $.spectrum.localization = { };
+    $.spectrum.palettes = { };
+
+    $.fn.spectrum.processNativeColorInputs = function () {
+        var colorInputs = $("input[type=color]");
+        if (colorInputs.length && !inputTypeColorSupport()) {
+            colorInputs.spectrum({
+                preferredFormat: "hex6"
+            });
+        }
+    };
+
+    // TinyColor v1.1.2
+    // https://github.com/bgrins/TinyColor
+    // Brian Grinstead, MIT License
+
+    (function() {
+
+        var trimLeft = /^[\s,#]+/,
+            trimRight = /\s+$/,
+            tinyCounter = 0,
+            math = Math,
+            mathRound = math.round,
+            mathMin = math.min,
+            mathMax = math.max,
+            mathRandom = math.random;
+
+        var tinycolor = function(color, opts) {
+
+            color = (color) ? color : '';
+            opts = opts || { };
+
+            // If input is already a tinycolor, return itself
+            if (color instanceof tinycolor) {
+                return color;
+            }
+            // If we are called as a function, call using new instead
+            if (!(this instanceof tinycolor)) {
+                return new tinycolor(color, opts);
+            }
+
+            var rgb = inputToRGB(color);
+            this._originalInput = color,
+                this._r = rgb.r,
+                this._g = rgb.g,
+                this._b = rgb.b,
+                this._a = rgb.a,
+                this._roundA = mathRound(100*this._a) / 100,
+                this._format = opts.format || rgb.format;
+            this._gradientType = opts.gradientType;
+
+            // Don't let the range of [0,255] come back in [0,1].
+            // Potentially lose a little bit of precision here, but will fix issues where
+            // .5 gets interpreted as half of the total, instead of half of 1
+            // If it was supposed to be 128, this was already taken care of by `inputToRgb`
+            if (this._r < 1) { this._r = mathRound(this._r); }
+            if (this._g < 1) { this._g = mathRound(this._g); }
+            if (this._b < 1) { this._b = mathRound(this._b); }
+
+            this._ok = rgb.ok;
+            this._tc_id = tinyCounter++;
+        };
+
+        tinycolor.prototype = {
+            isDark: function() {
+                return this.getBrightness() < 128;
+            },
+            isLight: function() {
+                return !this.isDark();
+            },
+            isValid: function() {
+                return this._ok;
+            },
+            getOriginalInput: function() {
+                return this._originalInput;
+            },
+            getFormat: function() {
+                return this._format;
+            },
+            getAlpha: function() {
+                return this._a;
+            },
+            getBrightness: function() {
+                var rgb = this.toRgb();
+                return (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;
+            },
+            setAlpha: function(value) {
+                this._a = boundAlpha(value);
+                this._roundA = mathRound(100*this._a) / 100;
+                return this;
+            },
+            toHsv: function() {
+                var hsv = rgbToHsv(this._r, this._g, this._b);
+                return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this._a };
+            },
+            toHsvString: function() {
+                var hsv = rgbToHsv(this._r, this._g, this._b);
+                var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
+                return (this._a == 1) ?
+                    "hsv("  + h + ", " + s + "%, " + v + "%)" :
+                    "hsva(" + h + ", " + s + "%, " + v + "%, "+ this._roundA + ")";
+            },
+            toHsl: function() {
+                var hsl = rgbToHsl(this._r, this._g, this._b);
+                return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this._a };
+            },
+            toHslString: function() {
+                var hsl = rgbToHsl(this._r, this._g, this._b);
+                var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
+                return (this._a == 1) ?
+                    "hsl("  + h + ", " + s + "%, " + l + "%)" :
+                    "hsla(" + h + ", " + s + "%, " + l + "%, "+ this._roundA + ")";
+            },
+            toHex: function(allow3Char) {
+                return rgbToHex(this._r, this._g, this._b, allow3Char);
+            },
+            toHexString: function(allow3Char) {
+                return '#' + this.toHex(allow3Char);
+            },
+            toHex8: function() {
+                return rgbaToHex(this._r, this._g, this._b, this._a);
+            },
+            toHex8String: function() {
+                return '#' + this.toHex8();
+            },
+            toRgb: function() {
+                return { r: mathRound(this._r), g: mathRound(this._g), b: mathRound(this._b), a: this._a };
+            },
+            toRgbString: function() {
+                return (this._a == 1) ?
+                    "rgb("  + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ")" :
+                    "rgba(" + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ", " + this._roundA + ")";
+            },
+            toPercentageRgb: function() {
+                return { r: mathRound(bound01(this._r, 255) * 100) + "%", g: mathRound(bound01(this._g, 255) * 100) + "%", b: mathRound(bound01(this._b, 255) * 100) + "%", a: this._a };
+            },
+            toPercentageRgbString: function() {
+                return (this._a == 1) ?
+                    "rgb("  + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%)" :
+                    "rgba(" + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%, " + this._roundA + ")";
+            },
+            toName: function() {
+                if (this._a === 0) {
+                    return "transparent";
+                }
+
+                if (this._a < 1) {
+                    return false;
+                }
+
+                return hexNames[rgbToHex(this._r, this._g, this._b, true)] || false;
+            },
+            toFilter: function(secondColor) {
+                var hex8String = '#' + rgbaToHex(this._r, this._g, this._b, this._a);
+                var secondHex8String = hex8String;
+                var gradientType = this._gradientType ? "GradientType = 1, " : "";
+
+                if (secondColor) {
+                    var s = tinycolor(secondColor);
+                    secondHex8String = s.toHex8String();
+                }
+
+                return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")";
+            },
+            toString: function(format) {
+                var formatSet = !!format;
+                format = format || this._format;
+
+                var formattedString = false;
+                var hasAlpha = this._a < 1 && this._a >= 0;
+                var needsAlphaFormat = !formatSet && hasAlpha && (format === "hex" || format === "hex6" || format === "hex3" || format === "name");
+
+                if (needsAlphaFormat) {
+                    // Special case for "transparent", all other non-alpha formats
+                    // will return rgba when there is transparency.
+                    if (format === "name" && this._a === 0) {
+                        return this.toName();
+                    }
+                    return this.toRgbString();
+                }
+                if (format === "rgb") {
+                    formattedString = this.toRgbString();
+                }
+                if (format === "prgb") {
+                    formattedString = this.toPercentageRgbString();
+                }
+                if (format === "hex" || format === "hex6") {
+                    formattedString = this.toHexString();
+                }
+                if (format === "hex3") {
+                    formattedString = this.toHexString(true);
+                }
+                if (format === "hex8") {
+                    formattedString = this.toHex8String();
+                }
+                if (format === "name") {
+                    formattedString = this.toName();
+                }
+                if (format === "hsl") {
+                    formattedString = this.toHslString();
+                }
+                if (format === "hsv") {
+                    formattedString = this.toHsvString();
+                }
+
+                return formattedString || this.toHexString();
+            },
+
+            _applyModification: function(fn, args) {
+                var color = fn.apply(null, [this].concat([].slice.call(args)));
+                this._r = color._r;
+                this._g = color._g;
+                this._b = color._b;
+                this.setAlpha(color._a);
+                return this;
+            },
+            lighten: function() {
+                return this._applyModification(lighten, arguments);
+            },
+            brighten: function() {
+                return this._applyModification(brighten, arguments);
+            },
+            darken: function() {
+                return this._applyModification(darken, arguments);
+            },
+            desaturate: function() {
+                return this._applyModification(desaturate, arguments);
+            },
+            saturate: function() {
+                return this._applyModification(saturate, arguments);
+            },
+            greyscale: function() {
+                return this._applyModification(greyscale, arguments);
+            },
+            spin: function() {
+                return this._applyModification(spin, arguments);
+            },
+
+            _applyCombination: function(fn, args) {
+                return fn.apply(null, [this].concat([].slice.call(args)));
+            },
+            analogous: function() {
+                return this._applyCombination(analogous, arguments);
+            },
+            complement: function() {
+                return this._applyCombination(complement, arguments);
+            },
+            monochromatic: function() {
+                return this._applyCombination(monochromatic, arguments);
+            },
+            splitcomplement: function() {
+                return this._applyCombination(splitcomplement, arguments);
+            },
+            triad: function() {
+                return this._applyCombination(triad, arguments);
+            },
+            tetrad: function() {
+                return this._applyCombination(tetrad, arguments);
+            }
+        };
+
+        // If input is an object, force 1 into "1.0" to handle ratios properly
+        // String input requires "1.0" as input, so 1 will be treated as 1
+        tinycolor.fromRatio = function(color, opts) {
+            if (typeof color == "object") {
+                var newColor = {};
+                for (var i in color) {
+                    if (color.hasOwnProperty(i)) {
+                        if (i === "a") {
+                            newColor[i] = color[i];
+                        }
+                        else {
+                            newColor[i] = convertToPercentage(color[i]);
+                        }
+                    }
+                }
+                color = newColor;
+            }
+
+            return tinycolor(color, opts);
+        };
+
+        // Given a string or object, convert that input to RGB
+        // Possible string inputs:
+        //
+        //     "red"
+        //     "#f00" or "f00"
+        //     "#ff0000" or "ff0000"
+        //     "#ff000000" or "ff000000"
+        //     "rgb 255 0 0" or "rgb (255, 0, 0)"
+        //     "rgb 1.0 0 0" or "rgb (1, 0, 0)"
+        //     "rgba (255, 0, 0, 1)" or "rgba 255, 0, 0, 1"
+        //     "rgba (1.0, 0, 0, 1)" or "rgba 1.0, 0, 0, 1"
+        //     "hsl(0, 100%, 50%)" or "hsl 0 100% 50%"
+        //     "hsla(0, 100%, 50%, 1)" or "hsla 0 100% 50%, 1"
+        //     "hsv(0, 100%, 100%)" or "hsv 0 100% 100%"
+        //
+        function inputToRGB(color) {
+
+            var rgb = { r: 0, g: 0, b: 0 };
+            var a = 1;
+            var ok = false;
+            var format = false;
+
+            if (typeof color == "string") {
+                color = stringInputToObject(color);
+            }
+
+            if (typeof color == "object") {
+                if (color.hasOwnProperty("r") && color.hasOwnProperty("g") && color.hasOwnProperty("b")) {
+                    rgb = rgbToRgb(color.r, color.g, color.b);
+                    ok = true;
+                    format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb";
+                }
+                else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("v")) {
+                    color.s = convertToPercentage(color.s);
+                    color.v = convertToPercentage(color.v);
+                    rgb = hsvToRgb(color.h, color.s, color.v);
+                    ok = true;
+                    format = "hsv";
+                }
+                else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("l")) {
+                    color.s = convertToPercentage(color.s);
+                    color.l = convertToPercentage(color.l);
+                    rgb = hslToRgb(color.h, color.s, color.l);
+                    ok = true;
+                    format = "hsl";
+                }
+
+                if (color.hasOwnProperty("a")) {
+                    a = color.a;
+                }
+            }
+
+            a = boundAlpha(a);
+
+            return {
+                ok: ok,
+                format: color.format || format,
+                r: mathMin(255, mathMax(rgb.r, 0)),
+                g: mathMin(255, mathMax(rgb.g, 0)),
+                b: mathMin(255, mathMax(rgb.b, 0)),
+                a: a
+            };
+        }
+
+
+        // Conversion Functions
+        // --------------------
+
+        // `rgbToHsl`, `rgbToHsv`, `hslToRgb`, `hsvToRgb` modified from:
+        // <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
+
+        // `rgbToRgb`
+        // Handle bounds / percentage checking to conform to CSS color spec
+        // <http://www.w3.org/TR/css3-color/>
+        // *Assumes:* r, g, b in [0, 255] or [0, 1]
+        // *Returns:* { r, g, b } in [0, 255]
+        function rgbToRgb(r, g, b){
+            return {
+                r: bound01(r, 255) * 255,
+                g: bound01(g, 255) * 255,
+                b: bound01(b, 255) * 255
+            };
+        }
+
+        // `rgbToHsl`
+        // Converts an RGB color value to HSL.
+        // *Assumes:* r, g, and b are contained in [0, 255] or [0, 1]
+        // *Returns:* { h, s, l } in [0,1]
+        function rgbToHsl(r, g, b) {
+
+            r = bound01(r, 255);
+            g = bound01(g, 255);
+            b = bound01(b, 255);
+
+            var max = mathMax(r, g, b), min = mathMin(r, g, b);
+            var h, s, l = (max + min) / 2;
+
+            if(max == min) {
+                h = s = 0; // achromatic
+            }
+            else {
+                var d = max - min;
+                s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+                switch(max) {
+                    case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+                    case g: h = (b - r) / d + 2; break;
+                    case b: h = (r - g) / d + 4; break;
+                }
+
+                h /= 6;
+            }
+
+            return { h: h, s: s, l: l };
+        }
+
+        // `hslToRgb`
+        // Converts an HSL color value to RGB.
+        // *Assumes:* h is contained in [0, 1] or [0, 360] and s and l are contained [0, 1] or [0, 100]
+        // *Returns:* { r, g, b } in the set [0, 255]
+        function hslToRgb(h, s, l) {
+            var r, g, b;
+
+            h = bound01(h, 360);
+            s = bound01(s, 100);
+            l = bound01(l, 100);
+
+            function hue2rgb(p, q, t) {
+                if(t < 0) t += 1;
+                if(t > 1) t -= 1;
+                if(t < 1/6) return p + (q - p) * 6 * t;
+                if(t < 1/2) return q;
+                if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+                return p;
+            }
+
+            if(s === 0) {
+                r = g = b = l; // achromatic
+            }
+            else {
+                var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+                var p = 2 * l - q;
+                r = hue2rgb(p, q, h + 1/3);
+                g = hue2rgb(p, q, h);
+                b = hue2rgb(p, q, h - 1/3);
+            }
+
+            return { r: r * 255, g: g * 255, b: b * 255 };
+        }
+
+        // `rgbToHsv`
+        // Converts an RGB color value to HSV
+        // *Assumes:* r, g, and b are contained in the set [0, 255] or [0, 1]
+        // *Returns:* { h, s, v } in [0,1]
+        function rgbToHsv(r, g, b) {
+
+            r = bound01(r, 255);
+            g = bound01(g, 255);
+            b = bound01(b, 255);
+
+            var max = mathMax(r, g, b), min = mathMin(r, g, b);
+            var h, s, v = max;
+
+            var d = max - min;
+            s = max === 0 ? 0 : d / max;
+
+            if(max == min) {
+                h = 0; // achromatic
+            }
+            else {
+                switch(max) {
+                    case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+                    case g: h = (b - r) / d + 2; break;
+                    case b: h = (r - g) / d + 4; break;
+                }
+                h /= 6;
+            }
+            return { h: h, s: s, v: v };
+        }
+
+        // `hsvToRgb`
+        // Converts an HSV color value to RGB.
+        // *Assumes:* h is contained in [0, 1] or [0, 360] and s and v are contained in [0, 1] or [0, 100]
+        // *Returns:* { r, g, b } in the set [0, 255]
+        function hsvToRgb(h, s, v) {
+
+            h = bound01(h, 360) * 6;
+            s = bound01(s, 100);
+            v = bound01(v, 100);
+
+            var i = math.floor(h),
+                f = h - i,
+                p = v * (1 - s),
+                q = v * (1 - f * s),
+                t = v * (1 - (1 - f) * s),
+                mod = i % 6,
+                r = [v, q, p, p, t, v][mod],
+                g = [t, v, v, q, p, p][mod],
+                b = [p, p, t, v, v, q][mod];
+
+            return { r: r * 255, g: g * 255, b: b * 255 };
+        }
+
+        // `rgbToHex`
+        // Converts an RGB color to hex
+        // Assumes r, g, and b are contained in the set [0, 255]
+        // Returns a 3 or 6 character hex
+        function rgbToHex(r, g, b, allow3Char) {
+
+            var hex = [
+                pad2(mathRound(r).toString(16)),
+                pad2(mathRound(g).toString(16)),
+                pad2(mathRound(b).toString(16))
+            ];
+
+            // Return a 3 character hex if possible
+            if (allow3Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) {
+                return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0);
+            }
+
+            return hex.join("");
+        }
+        // `rgbaToHex`
+        // Converts an RGBA color plus alpha transparency to hex
+        // Assumes r, g, b and a are contained in the set [0, 255]
+        // Returns an 8 character hex
+        function rgbaToHex(r, g, b, a) {
+
+            var hex = [
+                pad2(convertDecimalToHex(a)),
+                pad2(mathRound(r).toString(16)),
+                pad2(mathRound(g).toString(16)),
+                pad2(mathRound(b).toString(16))
+            ];
+
+            return hex.join("");
+        }
+
+        // `equals`
+        // Can be called with any tinycolor input
+        tinycolor.equals = function (color1, color2) {
+            if (!color1 || !color2) { return false; }
+            return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString();
+        };
+        tinycolor.random = function() {
+            return tinycolor.fromRatio({
+                r: mathRandom(),
+                g: mathRandom(),
+                b: mathRandom()
+            });
+        };
+
+
+        // Modification Functions
+        // ----------------------
+        // Thanks to less.js for some of the basics here
+        // <https://github.com/cloudhead/less.js/blob/master/lib/less/functions.js>
+
+        function desaturate(color, amount) {
+            amount = (amount === 0) ? 0 : (amount || 10);
+            var hsl = tinycolor(color).toHsl();
+            hsl.s -= amount / 100;
+            hsl.s = clamp01(hsl.s);
+            return tinycolor(hsl);
+        }
+
+        function saturate(color, amount) {
+            amount = (amount === 0) ? 0 : (amount || 10);
+            var hsl = tinycolor(color).toHsl();
+            hsl.s += amount / 100;
+            hsl.s = clamp01(hsl.s);
+            return tinycolor(hsl);
+        }
+
+        function greyscale(color) {
+            return tinycolor(color).desaturate(100);
+        }
+
+        function lighten (color, amount) {
+            amount = (amount === 0) ? 0 : (amount || 10);
+            var hsl = tinycolor(color).toHsl();
+            hsl.l += amount / 100;
+            hsl.l = clamp01(hsl.l);
+            return tinycolor(hsl);
+        }
+
+        function brighten(color, amount) {
+            amount = (amount === 0) ? 0 : (amount || 10);
+            var rgb = tinycolor(color).toRgb();
+            rgb.r = mathMax(0, mathMin(255, rgb.r - mathRound(255 * - (amount / 100))));
+            rgb.g = mathMax(0, mathMin(255, rgb.g - mathRound(255 * - (amount / 100))));
+            rgb.b = mathMax(0, mathMin(255, rgb.b - mathRound(255 * - (amount / 100))));
+            return tinycolor(rgb);
+        }
+
+        function darken (color, amount) {
+            amount = (amount === 0) ? 0 : (amount || 10);
+            var hsl = tinycolor(color).toHsl();
+            hsl.l -= amount / 100;
+            hsl.l = clamp01(hsl.l);
+            return tinycolor(hsl);
+        }
+
+        // Spin takes a positive or negative amount within [-360, 360] indicating the change of hue.
+        // Values outside of this range will be wrapped into this range.
+        function spin(color, amount) {
+            var hsl = tinycolor(color).toHsl();
+            var hue = (mathRound(hsl.h) + amount) % 360;
+            hsl.h = hue < 0 ? 360 + hue : hue;
+            return tinycolor(hsl);
+        }
+
+        // Combination Functions
+        // ---------------------
+        // Thanks to jQuery xColor for some of the ideas behind these
+        // <https://github.com/infusion/jQuery-xcolor/blob/master/jquery.xcolor.js>
+
+        function complement(color) {
+            var hsl = tinycolor(color).toHsl();
+            hsl.h = (hsl.h + 180) % 360;
+            return tinycolor(hsl);
+        }
+
+        function triad(color) {
+            var hsl = tinycolor(color).toHsl();
+            var h = hsl.h;
+            return [
+                tinycolor(color),
+                tinycolor({ h: (h + 120) % 360, s: hsl.s, l: hsl.l }),
+                tinycolor({ h: (h + 240) % 360, s: hsl.s, l: hsl.l })
+            ];
+        }
+
+        function tetrad(color) {
+            var hsl = tinycolor(color).toHsl();
+            var h = hsl.h;
+            return [
+                tinycolor(color),
+                tinycolor({ h: (h + 90) % 360, s: hsl.s, l: hsl.l }),
+                tinycolor({ h: (h + 180) % 360, s: hsl.s, l: hsl.l }),
+                tinycolor({ h: (h + 270) % 360, s: hsl.s, l: hsl.l })
+            ];
+        }
+
+        function splitcomplement(color) {
+            var hsl = tinycolor(color).toHsl();
+            var h = hsl.h;
+            return [
+                tinycolor(color),
+                tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l}),
+                tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l})
+            ];
+        }
+
+        function analogous(color, results, slices) {
+            results = results || 6;
+            slices = slices || 30;
+
+            var hsl = tinycolor(color).toHsl();
+            var part = 360 / slices;
+            var ret = [tinycolor(color)];
+
+            for (hsl.h = ((hsl.h - (part * results >> 1)) + 720) % 360; --results; ) {
+                hsl.h = (hsl.h + part) % 360;
+                ret.push(tinycolor(hsl));
+            }
+            return ret;
+        }
+
+        function monochromatic(color, results) {
+            results = results || 6;
+            var hsv = tinycolor(color).toHsv();
+            var h = hsv.h, s = hsv.s, v = hsv.v;
+            var ret = [];
+            var modification = 1 / results;
+
+            while (results--) {
+                ret.push(tinycolor({ h: h, s: s, v: v}));
+                v = (v + modification) % 1;
+            }
+
+            return ret;
+        }
+
+        // Utility Functions
+        // ---------------------
+
+        tinycolor.mix = function(color1, color2, amount) {
+            amount = (amount === 0) ? 0 : (amount || 50);
+
+            var rgb1 = tinycolor(color1).toRgb();
+            var rgb2 = tinycolor(color2).toRgb();
+
+            var p = amount / 100;
+            var w = p * 2 - 1;
+            var a = rgb2.a - rgb1.a;
+
+            var w1;
+
+            if (w * a == -1) {
+                w1 = w;
+            } else {
+                w1 = (w + a) / (1 + w * a);
+            }
+
+            w1 = (w1 + 1) / 2;
+
+            var w2 = 1 - w1;
+
+            var rgba = {
+                r: rgb2.r * w1 + rgb1.r * w2,
+                g: rgb2.g * w1 + rgb1.g * w2,
+                b: rgb2.b * w1 + rgb1.b * w2,
+                a: rgb2.a * p  + rgb1.a * (1 - p)
+            };
+
+            return tinycolor(rgba);
+        };
+
+
+        // Readability Functions
+        // ---------------------
+        // <http://www.w3.org/TR/AERT#color-contrast>
+
+        // `readability`
+        // Analyze the 2 colors and returns an object with the following properties:
+        //    `brightness`: difference in brightness between the two colors
+        //    `color`: difference in color/hue between the two colors
+        tinycolor.readability = function(color1, color2) {
+            var c1 = tinycolor(color1);
+            var c2 = tinycolor(color2);
+            var rgb1 = c1.toRgb();
+            var rgb2 = c2.toRgb();
+            var brightnessA = c1.getBrightness();
+            var brightnessB = c2.getBrightness();
+            var colorDiff = (
+                Math.max(rgb1.r, rgb2.r) - Math.min(rgb1.r, rgb2.r) +
+                Math.max(rgb1.g, rgb2.g) - Math.min(rgb1.g, rgb2.g) +
+                Math.max(rgb1.b, rgb2.b) - Math.min(rgb1.b, rgb2.b)
+            );
+
+            return {
+                brightness: Math.abs(brightnessA - brightnessB),
+                color: colorDiff
+            };
+        };
+
+        // `readable`
+        // http://www.w3.org/TR/AERT#color-contrast
+        // Ensure that foreground and background color combinations provide sufficient contrast.
+        // *Example*
+        //    tinycolor.isReadable("#000", "#111") => false
+        tinycolor.isReadable = function(color1, color2) {
+            var readability = tinycolor.readability(color1, color2);
+            return readability.brightness > 125 && readability.color > 500;
+        };
+
+        // `mostReadable`
+        // Given a base color and a list of possible foreground or background
+        // colors for that base, returns the most readable color.
+        // *Example*
+        //    tinycolor.mostReadable("#123", ["#fff", "#000"]) => "#000"
+        tinycolor.mostReadable = function(baseColor, colorList) {
+            var bestColor = null;
+            var bestScore = 0;
+            var bestIsReadable = false;
+            for (var i=0; i < colorList.length; i++) {
+
+                // We normalize both around the "acceptable" breaking point,
+                // but rank brightness constrast higher than hue.
+
+                var readability = tinycolor.readability(baseColor, colorList[i]);
+                var readable = readability.brightness > 125 && readability.color > 500;
+                var score = 3 * (readability.brightness / 125) + (readability.color / 500);
+
+                if ((readable && ! bestIsReadable) ||
+                    (readable && bestIsReadable && score > bestScore) ||
+                    ((! readable) && (! bestIsReadable) && score > bestScore)) {
+                    bestIsReadable = readable;
+                    bestScore = score;
+                    bestColor = tinycolor(colorList[i]);
+                }
+            }
+            return bestColor;
+        };
+
+
+        // Big List of Colors
+        // ------------------
+        // <http://www.w3.org/TR/css3-color/#svg-color>
+        var names = tinycolor.names = {
+            aliceblue: "f0f8ff",
+            antiquewhite: "faebd7",
+            aqua: "0ff",
+            aquamarine: "7fffd4",
+            azure: "f0ffff",
+            beige: "f5f5dc",
+            bisque: "ffe4c4",
+            black: "000",
+            blanchedalmond: "ffebcd",
+            blue: "00f",
+            blueviolet: "8a2be2",
+            brown: "a52a2a",
+            burlywood: "deb887",
+            burntsienna: "ea7e5d",
+            cadetblue: "5f9ea0",
+            chartreuse: "7fff00",
+            chocolate: "d2691e",
+            coral: "ff7f50",
+            cornflowerblue: "6495ed",
+            cornsilk: "fff8dc",
+            crimson: "dc143c",
+            cyan: "0ff",
+            darkblue: "00008b",
+            darkcyan: "008b8b",
+            darkgoldenrod: "b8860b",
+            darkgray: "a9a9a9",
+            darkgreen: "006400",
+            darkgrey: "a9a9a9",
+            darkkhaki: "bdb76b",
+            darkmagenta: "8b008b",
+            darkolivegreen: "556b2f",
+            darkorange: "ff8c00",
+            darkorchid: "9932cc",
+            darkred: "8b0000",
+            darksalmon: "e9967a",
+            darkseagreen: "8fbc8f",
+            darkslateblue: "483d8b",
+            darkslategray: "2f4f4f",
+            darkslategrey: "2f4f4f",
+            darkturquoise: "00ced1",
+            darkviolet: "9400d3",
+            deeppink: "ff1493",
+            deepskyblue: "00bfff",
+            dimgray: "696969",
+            dimgrey: "696969",
+            dodgerblue: "1e90ff",
+            firebrick: "b22222",
+            floralwhite: "fffaf0",
+            forestgreen: "228b22",
+            fuchsia: "f0f",
+            gainsboro: "dcdcdc",
+            ghostwhite: "f8f8ff",
+            gold: "ffd700",
+            goldenrod: "daa520",
+            gray: "808080",
+            green: "008000",
+            greenyellow: "adff2f",
+            grey: "808080",
+            honeydew: "f0fff0",
+            hotpink: "ff69b4",
+            indianred: "cd5c5c",
+            indigo: "4b0082",
+            ivory: "fffff0",
+            khaki: "f0e68c",
+            lavender: "e6e6fa",
+            lavenderblush: "fff0f5",
+            lawngreen: "7cfc00",
+            lemonchiffon: "fffacd",
+            lightblue: "add8e6",
+            lightcoral: "f08080",
+            lightcyan: "e0ffff",
+            lightgoldenrodyellow: "fafad2",
+            lightgray: "d3d3d3",
+            lightgreen: "90ee90",
+            lightgrey: "d3d3d3",
+            lightpink: "ffb6c1",
+            lightsalmon: "ffa07a",
+            lightseagreen: "20b2aa",
+            lightskyblue: "87cefa",
+            lightslategray: "789",
+            lightslategrey: "789",
+            lightsteelblue: "b0c4de",
+            lightyellow: "ffffe0",
+            lime: "0f0",
+            limegreen: "32cd32",
+            linen: "faf0e6",
+            magenta: "f0f",
+            maroon: "800000",
+            mediumaquamarine: "66cdaa",
+            mediumblue: "0000cd",
+            mediumorchid: "ba55d3",
+            mediumpurple: "9370db",
+            mediumseagreen: "3cb371",
+            mediumslateblue: "7b68ee",
+            mediumspringgreen: "00fa9a",
+            mediumturquoise: "48d1cc",
+            mediumvioletred: "c71585",
+            midnightblue: "191970",
+            mintcream: "f5fffa",
+            mistyrose: "ffe4e1",
+            moccasin: "ffe4b5",
+            navajowhite: "ffdead",
+            navy: "000080",
+            oldlace: "fdf5e6",
+            olive: "808000",
+            olivedrab: "6b8e23",
+            orange: "ffa500",
+            orangered: "ff4500",
+            orchid: "da70d6",
+            palegoldenrod: "eee8aa",
+            palegreen: "98fb98",
+            paleturquoise: "afeeee",
+            palevioletred: "db7093",
+            papayawhip: "ffefd5",
+            peachpuff: "ffdab9",
+            peru: "cd853f",
+            pink: "ffc0cb",
+            plum: "dda0dd",
+            powderblue: "b0e0e6",
+            purple: "800080",
+            rebeccapurple: "663399",
+            red: "f00",
+            rosybrown: "bc8f8f",
+            royalblue: "4169e1",
+            saddlebrown: "8b4513",
+            salmon: "fa8072",
+            sandybrown: "f4a460",
+            seagreen: "2e8b57",
+            seashell: "fff5ee",
+            sienna: "a0522d",
+            silver: "c0c0c0",
+            skyblue: "87ceeb",
+            slateblue: "6a5acd",
+            slategray: "708090",
+            slategrey: "708090",
+            snow: "fffafa",
+            springgreen: "00ff7f",
+            steelblue: "4682b4",
+            tan: "d2b48c",
+            teal: "008080",
+            thistle: "d8bfd8",
+            tomato: "ff6347",
+            turquoise: "40e0d0",
+            violet: "ee82ee",
+            wheat: "f5deb3",
+            white: "fff",
+            whitesmoke: "f5f5f5",
+            yellow: "ff0",
+            yellowgreen: "9acd32"
+        };
+
+        // Make it easy to access colors via `hexNames[hex]`
+        var hexNames = tinycolor.hexNames = flip(names);
+
+
+        // Utilities
+        // ---------
+
+        // `{ 'name1': 'val1' }` becomes `{ 'val1': 'name1' }`
+        function flip(o) {
+            var flipped = { };
+            for (var i in o) {
+                if (o.hasOwnProperty(i)) {
+                    flipped[o[i]] = i;
+                }
+            }
+            return flipped;
+        }
+
+        // Return a valid alpha value [0,1] with all invalid values being set to 1
+        function boundAlpha(a) {
+            a = parseFloat(a);
+
+            if (isNaN(a) || a < 0 || a > 1) {
+                a = 1;
+            }
+
+            return a;
+        }
+
+        // Take input from [0, n] and return it as [0, 1]
+        function bound01(n, max) {
+            if (isOnePointZero(n)) { n = "100%"; }
+
+            var processPercent = isPercentage(n);
+            n = mathMin(max, mathMax(0, parseFloat(n)));
+
+            // Automatically convert percentage into number
+            if (processPercent) {
+                n = parseInt(n * max, 10) / 100;
+            }
+
+            // Handle floating point rounding errors
+            if ((math.abs(n - max) < 0.000001)) {
+                return 1;
+            }
+
+            // Convert into [0, 1] range if it isn't already
+            return (n % max) / parseFloat(max);
+        }
+
+        // Force a number between 0 and 1
+        function clamp01(val) {
+            return mathMin(1, mathMax(0, val));
+        }
+
+        // Parse a base-16 hex value into a base-10 integer
+        function parseIntFromHex(val) {
+            return parseInt(val, 16);
+        }
+
+        // Need to handle 1.0 as 100%, since once it is a number, there is no difference between it and 1
+        // <http://stackoverflow.com/questions/7422072/javascript-how-to-detect-number-as-a-decimal-including-1-0>
+        function isOnePointZero(n) {
+            return typeof n == "string" && n.indexOf('.') != -1 && parseFloat(n) === 1;
+        }
+
+        // Check to see if string passed in is a percentage
+        function isPercentage(n) {
+            return typeof n === "string" && n.indexOf('%') != -1;
+        }
+
+        // Force a hex value to have 2 characters
+        function pad2(c) {
+            return c.length == 1 ? '0' + c : '' + c;
+        }
+
+        // Replace a decimal with it's percentage value
+        function convertToPercentage(n) {
+            if (n <= 1) {
+                n = (n * 100) + "%";
+            }
+
+            return n;
+        }
+
+        // Converts a decimal to a hex value
+        function convertDecimalToHex(d) {
+            return Math.round(parseFloat(d) * 255).toString(16);
+        }
+        // Converts a hex value to a decimal
+        function convertHexToDecimal(h) {
+            return (parseIntFromHex(h) / 255);
+        }
+
+        var matchers = (function() {
+
+            // <http://www.w3.org/TR/css3-values/#integers>
+            var CSS_INTEGER = "[-\\+]?\\d+%?";
+
+            // <http://www.w3.org/TR/css3-values/#number-value>
+            var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";
+
+            // Allow positive/negative integer/number.  Don't capture the either/or, just the entire outcome.
+            var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
+
+            // Actual matching.
+            // Parentheses and commas are optional, but not required.
+            // Whitespace can take the place of commas or opening paren
+            var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+            var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+
+            return {
+                rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
+                rgba: new RegExp("rgba" + PERMISSIVE_MATCH4),
+                hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
+                hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
+                hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
+                hsva: new RegExp("hsva" + PERMISSIVE_MATCH4),
+                hex3: /^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
+                hex6: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,
+                hex8: /^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
+            };
+        })();
+
+        // `stringInputToObject`
+        // Permissive string parsing.  Take in a number of formats, and output an object
+        // based on detected format.  Returns `{ r, g, b }` or `{ h, s, l }` or `{ h, s, v}`
+        function stringInputToObject(color) {
+
+            color = color.replace(trimLeft,'').replace(trimRight, '').toLowerCase();
+            var named = false;
+            if (names[color]) {
+                color = names[color];
+                named = true;
+            }
+            else if (color == 'transparent') {
+                return { r: 0, g: 0, b: 0, a: 0, format: "name" };
+            }
+
+            // Try to match string input using regular expressions.
+            // Keep most of the number bounding out of this function - don't worry about [0,1] or [0,100] or [0,360]
+            // Just return an object and let the conversion functions handle that.
+            // This way the result will be the same whether the tinycolor is initialized with string or object.
+            var match;
+            if ((match = matchers.rgb.exec(color))) {
+                return { r: match[1], g: match[2], b: match[3] };
+            }
+            if ((match = matchers.rgba.exec(color))) {
+                return { r: match[1], g: match[2], b: match[3], a: match[4] };
+            }
+            if ((match = matchers.hsl.exec(color))) {
+                return { h: match[1], s: match[2], l: match[3] };
+            }
+            if ((match = matchers.hsla.exec(color))) {
+                return { h: match[1], s: match[2], l: match[3], a: match[4] };
+            }
+            if ((match = matchers.hsv.exec(color))) {
+                return { h: match[1], s: match[2], v: match[3] };
+            }
+            if ((match = matchers.hsva.exec(color))) {
+                return { h: match[1], s: match[2], v: match[3], a: match[4] };
+            }
+            if ((match = matchers.hex8.exec(color))) {
+                return {
+                    a: convertHexToDecimal(match[1]),
+                    r: parseIntFromHex(match[2]),
+                    g: parseIntFromHex(match[3]),
+                    b: parseIntFromHex(match[4]),
+                    format: named ? "name" : "hex8"
+                };
+            }
+            if ((match = matchers.hex6.exec(color))) {
+                return {
+                    r: parseIntFromHex(match[1]),
+                    g: parseIntFromHex(match[2]),
+                    b: parseIntFromHex(match[3]),
+                    format: named ? "name" : "hex"
+                };
+            }
+            if ((match = matchers.hex3.exec(color))) {
+                return {
+                    r: parseIntFromHex(match[1] + '' + match[1]),
+                    g: parseIntFromHex(match[2] + '' + match[2]),
+                    b: parseIntFromHex(match[3] + '' + match[3]),
+                    format: named ? "name" : "hex"
+                };
+            }
+
+            return false;
+        }
+
+        window.tinycolor = tinycolor;
+    })();
+
+    $(function () {
+        if ($.fn.spectrum.load) {
+            $.fn.spectrum.processNativeColorInputs();
+        }
+    });
+
+});
diff --git a/lib/web/jquery/spectrum/tinycolor.js b/lib/web/jquery/spectrum/tinycolor.js
new file mode 100644
index 0000000000000..8f7e17a6e1284
--- /dev/null
+++ b/lib/web/jquery/spectrum/tinycolor.js
@@ -0,0 +1,1195 @@
+// TinyColor v1.4.1
+// https://github.com/bgrins/TinyColor
+// Brian Grinstead, MIT License
+
+(function(Math) {
+
+    var trimLeft = /^\s+/,
+        trimRight = /\s+$/,
+        tinyCounter = 0,
+        mathRound = Math.round,
+        mathMin = Math.min,
+        mathMax = Math.max,
+        mathRandom = Math.random;
+
+    function tinycolor (color, opts) {
+
+        color = (color) ? color : '';
+        opts = opts || { };
+
+        // If input is already a tinycolor, return itself
+        if (color instanceof tinycolor) {
+            return color;
+        }
+        // If we are called as a function, call using new instead
+        if (!(this instanceof tinycolor)) {
+            return new tinycolor(color, opts);
+        }
+
+        var rgb = inputToRGB(color);
+        this._originalInput = color,
+            this._r = rgb.r,
+            this._g = rgb.g,
+            this._b = rgb.b,
+            this._a = rgb.a,
+            this._roundA = mathRound(100*this._a) / 100,
+            this._format = opts.format || rgb.format;
+        this._gradientType = opts.gradientType;
+
+        // Don't let the range of [0,255] come back in [0,1].
+        // Potentially lose a little bit of precision here, but will fix issues where
+        // .5 gets interpreted as half of the total, instead of half of 1
+        // If it was supposed to be 128, this was already taken care of by `inputToRgb`
+        if (this._r < 1) { this._r = mathRound(this._r); }
+        if (this._g < 1) { this._g = mathRound(this._g); }
+        if (this._b < 1) { this._b = mathRound(this._b); }
+
+        this._ok = rgb.ok;
+        this._tc_id = tinyCounter++;
+    }
+
+    tinycolor.prototype = {
+        isDark: function() {
+            return this.getBrightness() < 128;
+        },
+        isLight: function() {
+            return !this.isDark();
+        },
+        isValid: function() {
+            return this._ok;
+        },
+        getOriginalInput: function() {
+            return this._originalInput;
+        },
+        getFormat: function() {
+            return this._format;
+        },
+        getAlpha: function() {
+            return this._a;
+        },
+        getBrightness: function() {
+            //http://www.w3.org/TR/AERT#color-contrast
+            var rgb = this.toRgb();
+            return (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;
+        },
+        getLuminance: function() {
+            //http://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
+            var rgb = this.toRgb();
+            var RsRGB, GsRGB, BsRGB, R, G, B;
+            RsRGB = rgb.r/255;
+            GsRGB = rgb.g/255;
+            BsRGB = rgb.b/255;
+
+            if (RsRGB <= 0.03928) {R = RsRGB / 12.92;} else {R = Math.pow(((RsRGB + 0.055) / 1.055), 2.4);}
+            if (GsRGB <= 0.03928) {G = GsRGB / 12.92;} else {G = Math.pow(((GsRGB + 0.055) / 1.055), 2.4);}
+            if (BsRGB <= 0.03928) {B = BsRGB / 12.92;} else {B = Math.pow(((BsRGB + 0.055) / 1.055), 2.4);}
+            return (0.2126 * R) + (0.7152 * G) + (0.0722 * B);
+        },
+        setAlpha: function(value) {
+            this._a = boundAlpha(value);
+            this._roundA = mathRound(100*this._a) / 100;
+            return this;
+        },
+        toHsv: function() {
+            var hsv = rgbToHsv(this._r, this._g, this._b);
+            return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this._a };
+        },
+        toHsvString: function() {
+            var hsv = rgbToHsv(this._r, this._g, this._b);
+            var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
+            return (this._a == 1) ?
+                "hsv("  + h + ", " + s + "%, " + v + "%)" :
+                "hsva(" + h + ", " + s + "%, " + v + "%, "+ this._roundA + ")";
+        },
+        toHsl: function() {
+            var hsl = rgbToHsl(this._r, this._g, this._b);
+            return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this._a };
+        },
+        toHslString: function() {
+            var hsl = rgbToHsl(this._r, this._g, this._b);
+            var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
+            return (this._a == 1) ?
+                "hsl("  + h + ", " + s + "%, " + l + "%)" :
+                "hsla(" + h + ", " + s + "%, " + l + "%, "+ this._roundA + ")";
+        },
+        toHex: function(allow3Char) {
+            return rgbToHex(this._r, this._g, this._b, allow3Char);
+        },
+        toHexString: function(allow3Char) {
+            return '#' + this.toHex(allow3Char);
+        },
+        toHex8: function(allow4Char) {
+            return rgbaToHex(this._r, this._g, this._b, this._a, allow4Char);
+        },
+        toHex8String: function(allow4Char) {
+            return '#' + this.toHex8(allow4Char);
+        },
+        toRgb: function() {
+            return { r: mathRound(this._r), g: mathRound(this._g), b: mathRound(this._b), a: this._a };
+        },
+        toRgbString: function() {
+            return (this._a == 1) ?
+                "rgb("  + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ")" :
+                "rgba(" + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ", " + this._roundA + ")";
+        },
+        toPercentageRgb: function() {
+            return { r: mathRound(bound01(this._r, 255) * 100) + "%", g: mathRound(bound01(this._g, 255) * 100) + "%", b: mathRound(bound01(this._b, 255) * 100) + "%", a: this._a };
+        },
+        toPercentageRgbString: function() {
+            return (this._a == 1) ?
+                "rgb("  + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%)" :
+                "rgba(" + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%, " + this._roundA + ")";
+        },
+        toName: function() {
+            if (this._a === 0) {
+                return "transparent";
+            }
+
+            if (this._a < 1) {
+                return false;
+            }
+
+            return hexNames[rgbToHex(this._r, this._g, this._b, true)] || false;
+        },
+        toFilter: function(secondColor) {
+            var hex8String = '#' + rgbaToArgbHex(this._r, this._g, this._b, this._a);
+            var secondHex8String = hex8String;
+            var gradientType = this._gradientType ? "GradientType = 1, " : "";
+
+            if (secondColor) {
+                var s = tinycolor(secondColor);
+                secondHex8String = '#' + rgbaToArgbHex(s._r, s._g, s._b, s._a);
+            }
+
+            return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")";
+        },
+        toString: function(format) {
+            var formatSet = !!format;
+            format = format || this._format;
+
+            var formattedString = false;
+            var hasAlpha = this._a < 1 && this._a >= 0;
+            var needsAlphaFormat = !formatSet && hasAlpha && (format === "hex" || format === "hex6" || format === "hex3" || format === "hex4" || format === "hex8" || format === "name");
+
+            if (needsAlphaFormat) {
+                // Special case for "transparent", all other non-alpha formats
+                // will return rgba when there is transparency.
+                if (format === "name" && this._a === 0) {
+                    return this.toName();
+                }
+                return this.toRgbString();
+            }
+            if (format === "rgb") {
+                formattedString = this.toRgbString();
+            }
+            if (format === "prgb") {
+                formattedString = this.toPercentageRgbString();
+            }
+            if (format === "hex" || format === "hex6") {
+                formattedString = this.toHexString();
+            }
+            if (format === "hex3") {
+                formattedString = this.toHexString(true);
+            }
+            if (format === "hex4") {
+                formattedString = this.toHex8String(true);
+            }
+            if (format === "hex8") {
+                formattedString = this.toHex8String();
+            }
+            if (format === "name") {
+                formattedString = this.toName();
+            }
+            if (format === "hsl") {
+                formattedString = this.toHslString();
+            }
+            if (format === "hsv") {
+                formattedString = this.toHsvString();
+            }
+
+            return formattedString || this.toHexString();
+        },
+        clone: function() {
+            return tinycolor(this.toString());
+        },
+
+        _applyModification: function(fn, args) {
+            var color = fn.apply(null, [this].concat([].slice.call(args)));
+            this._r = color._r;
+            this._g = color._g;
+            this._b = color._b;
+            this.setAlpha(color._a);
+            return this;
+        },
+        lighten: function() {
+            return this._applyModification(lighten, arguments);
+        },
+        brighten: function() {
+            return this._applyModification(brighten, arguments);
+        },
+        darken: function() {
+            return this._applyModification(darken, arguments);
+        },
+        desaturate: function() {
+            return this._applyModification(desaturate, arguments);
+        },
+        saturate: function() {
+            return this._applyModification(saturate, arguments);
+        },
+        greyscale: function() {
+            return this._applyModification(greyscale, arguments);
+        },
+        spin: function() {
+            return this._applyModification(spin, arguments);
+        },
+
+        _applyCombination: function(fn, args) {
+            return fn.apply(null, [this].concat([].slice.call(args)));
+        },
+        analogous: function() {
+            return this._applyCombination(analogous, arguments);
+        },
+        complement: function() {
+            return this._applyCombination(complement, arguments);
+        },
+        monochromatic: function() {
+            return this._applyCombination(monochromatic, arguments);
+        },
+        splitcomplement: function() {
+            return this._applyCombination(splitcomplement, arguments);
+        },
+        triad: function() {
+            return this._applyCombination(triad, arguments);
+        },
+        tetrad: function() {
+            return this._applyCombination(tetrad, arguments);
+        }
+    };
+
+// If input is an object, force 1 into "1.0" to handle ratios properly
+// String input requires "1.0" as input, so 1 will be treated as 1
+    tinycolor.fromRatio = function(color, opts) {
+        if (typeof color == "object") {
+            var newColor = {};
+            for (var i in color) {
+                if (color.hasOwnProperty(i)) {
+                    if (i === "a") {
+                        newColor[i] = color[i];
+                    }
+                    else {
+                        newColor[i] = convertToPercentage(color[i]);
+                    }
+                }
+            }
+            color = newColor;
+        }
+
+        return tinycolor(color, opts);
+    };
+
+// Given a string or object, convert that input to RGB
+// Possible string inputs:
+//
+//     "red"
+//     "#f00" or "f00"
+//     "#ff0000" or "ff0000"
+//     "#ff000000" or "ff000000"
+//     "rgb 255 0 0" or "rgb (255, 0, 0)"
+//     "rgb 1.0 0 0" or "rgb (1, 0, 0)"
+//     "rgba (255, 0, 0, 1)" or "rgba 255, 0, 0, 1"
+//     "rgba (1.0, 0, 0, 1)" or "rgba 1.0, 0, 0, 1"
+//     "hsl(0, 100%, 50%)" or "hsl 0 100% 50%"
+//     "hsla(0, 100%, 50%, 1)" or "hsla 0 100% 50%, 1"
+//     "hsv(0, 100%, 100%)" or "hsv 0 100% 100%"
+//
+    function inputToRGB(color) {
+
+        var rgb = { r: 0, g: 0, b: 0 };
+        var a = 1;
+        var s = null;
+        var v = null;
+        var l = null;
+        var ok = false;
+        var format = false;
+
+        if (typeof color == "string") {
+            color = stringInputToObject(color);
+        }
+
+        if (typeof color == "object") {
+            if (isValidCSSUnit(color.r) && isValidCSSUnit(color.g) && isValidCSSUnit(color.b)) {
+                rgb = rgbToRgb(color.r, color.g, color.b);
+                ok = true;
+                format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb";
+            }
+            else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.v)) {
+                s = convertToPercentage(color.s);
+                v = convertToPercentage(color.v);
+                rgb = hsvToRgb(color.h, s, v);
+                ok = true;
+                format = "hsv";
+            }
+            else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.l)) {
+                s = convertToPercentage(color.s);
+                l = convertToPercentage(color.l);
+                rgb = hslToRgb(color.h, s, l);
+                ok = true;
+                format = "hsl";
+            }
+
+            if (color.hasOwnProperty("a")) {
+                a = color.a;
+            }
+        }
+
+        a = boundAlpha(a);
+
+        return {
+            ok: ok,
+            format: color.format || format,
+            r: mathMin(255, mathMax(rgb.r, 0)),
+            g: mathMin(255, mathMax(rgb.g, 0)),
+            b: mathMin(255, mathMax(rgb.b, 0)),
+            a: a
+        };
+    }
+
+
+// Conversion Functions
+// --------------------
+
+// `rgbToHsl`, `rgbToHsv`, `hslToRgb`, `hsvToRgb` modified from:
+// <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
+
+// `rgbToRgb`
+// Handle bounds / percentage checking to conform to CSS color spec
+// <http://www.w3.org/TR/css3-color/>
+// *Assumes:* r, g, b in [0, 255] or [0, 1]
+// *Returns:* { r, g, b } in [0, 255]
+    function rgbToRgb(r, g, b){
+        return {
+            r: bound01(r, 255) * 255,
+            g: bound01(g, 255) * 255,
+            b: bound01(b, 255) * 255
+        };
+    }
+
+// `rgbToHsl`
+// Converts an RGB color value to HSL.
+// *Assumes:* r, g, and b are contained in [0, 255] or [0, 1]
+// *Returns:* { h, s, l } in [0,1]
+    function rgbToHsl(r, g, b) {
+
+        r = bound01(r, 255);
+        g = bound01(g, 255);
+        b = bound01(b, 255);
+
+        var max = mathMax(r, g, b), min = mathMin(r, g, b);
+        var h, s, l = (max + min) / 2;
+
+        if(max == min) {
+            h = s = 0; // achromatic
+        }
+        else {
+            var d = max - min;
+            s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+            switch(max) {
+                case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+                case g: h = (b - r) / d + 2; break;
+                case b: h = (r - g) / d + 4; break;
+            }
+
+            h /= 6;
+        }
+
+        return { h: h, s: s, l: l };
+    }
+
+// `hslToRgb`
+// Converts an HSL color value to RGB.
+// *Assumes:* h is contained in [0, 1] or [0, 360] and s and l are contained [0, 1] or [0, 100]
+// *Returns:* { r, g, b } in the set [0, 255]
+    function hslToRgb(h, s, l) {
+        var r, g, b;
+
+        h = bound01(h, 360);
+        s = bound01(s, 100);
+        l = bound01(l, 100);
+
+        function hue2rgb(p, q, t) {
+            if(t < 0) t += 1;
+            if(t > 1) t -= 1;
+            if(t < 1/6) return p + (q - p) * 6 * t;
+            if(t < 1/2) return q;
+            if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+            return p;
+        }
+
+        if(s === 0) {
+            r = g = b = l; // achromatic
+        }
+        else {
+            var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+            var p = 2 * l - q;
+            r = hue2rgb(p, q, h + 1/3);
+            g = hue2rgb(p, q, h);
+            b = hue2rgb(p, q, h - 1/3);
+        }
+
+        return { r: r * 255, g: g * 255, b: b * 255 };
+    }
+
+// `rgbToHsv`
+// Converts an RGB color value to HSV
+// *Assumes:* r, g, and b are contained in the set [0, 255] or [0, 1]
+// *Returns:* { h, s, v } in [0,1]
+    function rgbToHsv(r, g, b) {
+
+        r = bound01(r, 255);
+        g = bound01(g, 255);
+        b = bound01(b, 255);
+
+        var max = mathMax(r, g, b), min = mathMin(r, g, b);
+        var h, s, v = max;
+
+        var d = max - min;
+        s = max === 0 ? 0 : d / max;
+
+        if(max == min) {
+            h = 0; // achromatic
+        }
+        else {
+            switch(max) {
+                case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+                case g: h = (b - r) / d + 2; break;
+                case b: h = (r - g) / d + 4; break;
+            }
+            h /= 6;
+        }
+        return { h: h, s: s, v: v };
+    }
+
+// `hsvToRgb`
+// Converts an HSV color value to RGB.
+// *Assumes:* h is contained in [0, 1] or [0, 360] and s and v are contained in [0, 1] or [0, 100]
+// *Returns:* { r, g, b } in the set [0, 255]
+    function hsvToRgb(h, s, v) {
+
+        h = bound01(h, 360) * 6;
+        s = bound01(s, 100);
+        v = bound01(v, 100);
+
+        var i = Math.floor(h),
+            f = h - i,
+            p = v * (1 - s),
+            q = v * (1 - f * s),
+            t = v * (1 - (1 - f) * s),
+            mod = i % 6,
+            r = [v, q, p, p, t, v][mod],
+            g = [t, v, v, q, p, p][mod],
+            b = [p, p, t, v, v, q][mod];
+
+        return { r: r * 255, g: g * 255, b: b * 255 };
+    }
+
+// `rgbToHex`
+// Converts an RGB color to hex
+// Assumes r, g, and b are contained in the set [0, 255]
+// Returns a 3 or 6 character hex
+    function rgbToHex(r, g, b, allow3Char) {
+
+        var hex = [
+            pad2(mathRound(r).toString(16)),
+            pad2(mathRound(g).toString(16)),
+            pad2(mathRound(b).toString(16))
+        ];
+
+        // Return a 3 character hex if possible
+        if (allow3Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) {
+            return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0);
+        }
+
+        return hex.join("");
+    }
+
+// `rgbaToHex`
+// Converts an RGBA color plus alpha transparency to hex
+// Assumes r, g, b are contained in the set [0, 255] and
+// a in [0, 1]. Returns a 4 or 8 character rgba hex
+    function rgbaToHex(r, g, b, a, allow4Char) {
+
+        var hex = [
+            pad2(mathRound(r).toString(16)),
+            pad2(mathRound(g).toString(16)),
+            pad2(mathRound(b).toString(16)),
+            pad2(convertDecimalToHex(a))
+        ];
+
+        // Return a 4 character hex if possible
+        if (allow4Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1) && hex[3].charAt(0) == hex[3].charAt(1)) {
+            return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0) + hex[3].charAt(0);
+        }
+
+        return hex.join("");
+    }
+
+// `rgbaToArgbHex`
+// Converts an RGBA color to an ARGB Hex8 string
+// Rarely used, but required for "toFilter()"
+    function rgbaToArgbHex(r, g, b, a) {
+
+        var hex = [
+            pad2(convertDecimalToHex(a)),
+            pad2(mathRound(r).toString(16)),
+            pad2(mathRound(g).toString(16)),
+            pad2(mathRound(b).toString(16))
+        ];
+
+        return hex.join("");
+    }
+
+// `equals`
+// Can be called with any tinycolor input
+    tinycolor.equals = function (color1, color2) {
+        if (!color1 || !color2) { return false; }
+        return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString();
+    };
+
+    tinycolor.random = function() {
+        return tinycolor.fromRatio({
+            r: mathRandom(),
+            g: mathRandom(),
+            b: mathRandom()
+        });
+    };
+
+
+// Modification Functions
+// ----------------------
+// Thanks to less.js for some of the basics here
+// <https://github.com/cloudhead/less.js/blob/master/lib/less/functions.js>
+
+    function desaturate(color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.s -= amount / 100;
+        hsl.s = clamp01(hsl.s);
+        return tinycolor(hsl);
+    }
+
+    function saturate(color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.s += amount / 100;
+        hsl.s = clamp01(hsl.s);
+        return tinycolor(hsl);
+    }
+
+    function greyscale(color) {
+        return tinycolor(color).desaturate(100);
+    }
+
+    function lighten (color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.l += amount / 100;
+        hsl.l = clamp01(hsl.l);
+        return tinycolor(hsl);
+    }
+
+    function brighten(color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var rgb = tinycolor(color).toRgb();
+        rgb.r = mathMax(0, mathMin(255, rgb.r - mathRound(255 * - (amount / 100))));
+        rgb.g = mathMax(0, mathMin(255, rgb.g - mathRound(255 * - (amount / 100))));
+        rgb.b = mathMax(0, mathMin(255, rgb.b - mathRound(255 * - (amount / 100))));
+        return tinycolor(rgb);
+    }
+
+    function darken (color, amount) {
+        amount = (amount === 0) ? 0 : (amount || 10);
+        var hsl = tinycolor(color).toHsl();
+        hsl.l -= amount / 100;
+        hsl.l = clamp01(hsl.l);
+        return tinycolor(hsl);
+    }
+
+// Spin takes a positive or negative amount within [-360, 360] indicating the change of hue.
+// Values outside of this range will be wrapped into this range.
+    function spin(color, amount) {
+        var hsl = tinycolor(color).toHsl();
+        var hue = (hsl.h + amount) % 360;
+        hsl.h = hue < 0 ? 360 + hue : hue;
+        return tinycolor(hsl);
+    }
+
+// Combination Functions
+// ---------------------
+// Thanks to jQuery xColor for some of the ideas behind these
+// <https://github.com/infusion/jQuery-xcolor/blob/master/jquery.xcolor.js>
+
+    function complement(color) {
+        var hsl = tinycolor(color).toHsl();
+        hsl.h = (hsl.h + 180) % 360;
+        return tinycolor(hsl);
+    }
+
+    function triad(color) {
+        var hsl = tinycolor(color).toHsl();
+        var h = hsl.h;
+        return [
+            tinycolor(color),
+            tinycolor({ h: (h + 120) % 360, s: hsl.s, l: hsl.l }),
+            tinycolor({ h: (h + 240) % 360, s: hsl.s, l: hsl.l })
+        ];
+    }
+
+    function tetrad(color) {
+        var hsl = tinycolor(color).toHsl();
+        var h = hsl.h;
+        return [
+            tinycolor(color),
+            tinycolor({ h: (h + 90) % 360, s: hsl.s, l: hsl.l }),
+            tinycolor({ h: (h + 180) % 360, s: hsl.s, l: hsl.l }),
+            tinycolor({ h: (h + 270) % 360, s: hsl.s, l: hsl.l })
+        ];
+    }
+
+    function splitcomplement(color) {
+        var hsl = tinycolor(color).toHsl();
+        var h = hsl.h;
+        return [
+            tinycolor(color),
+            tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l}),
+            tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l})
+        ];
+    }
+
+    function analogous(color, results, slices) {
+        results = results || 6;
+        slices = slices || 30;
+
+        var hsl = tinycolor(color).toHsl();
+        var part = 360 / slices;
+        var ret = [tinycolor(color)];
+
+        for (hsl.h = ((hsl.h - (part * results >> 1)) + 720) % 360; --results; ) {
+            hsl.h = (hsl.h + part) % 360;
+            ret.push(tinycolor(hsl));
+        }
+        return ret;
+    }
+
+    function monochromatic(color, results) {
+        results = results || 6;
+        var hsv = tinycolor(color).toHsv();
+        var h = hsv.h, s = hsv.s, v = hsv.v;
+        var ret = [];
+        var modification = 1 / results;
+
+        while (results--) {
+            ret.push(tinycolor({ h: h, s: s, v: v}));
+            v = (v + modification) % 1;
+        }
+
+        return ret;
+    }
+
+// Utility Functions
+// ---------------------
+
+    tinycolor.mix = function(color1, color2, amount) {
+        amount = (amount === 0) ? 0 : (amount || 50);
+
+        var rgb1 = tinycolor(color1).toRgb();
+        var rgb2 = tinycolor(color2).toRgb();
+
+        var p = amount / 100;
+
+        var rgba = {
+            r: ((rgb2.r - rgb1.r) * p) + rgb1.r,
+            g: ((rgb2.g - rgb1.g) * p) + rgb1.g,
+            b: ((rgb2.b - rgb1.b) * p) + rgb1.b,
+            a: ((rgb2.a - rgb1.a) * p) + rgb1.a
+        };
+
+        return tinycolor(rgba);
+    };
+
+
+// Readability Functions
+// ---------------------
+// <http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef (WCAG Version 2)
+
+// `contrast`
+// Analyze the 2 colors and returns the color contrast defined by (WCAG Version 2)
+    tinycolor.readability = function(color1, color2) {
+        var c1 = tinycolor(color1);
+        var c2 = tinycolor(color2);
+        return (Math.max(c1.getLuminance(),c2.getLuminance())+0.05) / (Math.min(c1.getLuminance(),c2.getLuminance())+0.05);
+    };
+
+// `isReadable`
+// Ensure that foreground and background color combinations meet WCAG2 guidelines.
+// The third argument is an optional Object.
+//      the 'level' property states 'AA' or 'AAA' - if missing or invalid, it defaults to 'AA';
+//      the 'size' property states 'large' or 'small' - if missing or invalid, it defaults to 'small'.
+// If the entire object is absent, isReadable defaults to {level:"AA",size:"small"}.
+
+// *Example*
+//    tinycolor.isReadable("#000", "#111") => false
+//    tinycolor.isReadable("#000", "#111",{level:"AA",size:"large"}) => false
+    tinycolor.isReadable = function(color1, color2, wcag2) {
+        var readability = tinycolor.readability(color1, color2);
+        var wcag2Parms, out;
+
+        out = false;
+
+        wcag2Parms = validateWCAG2Parms(wcag2);
+        switch (wcag2Parms.level + wcag2Parms.size) {
+            case "AAsmall":
+            case "AAAlarge":
+                out = readability >= 4.5;
+                break;
+            case "AAlarge":
+                out = readability >= 3;
+                break;
+            case "AAAsmall":
+                out = readability >= 7;
+                break;
+        }
+        return out;
+
+    };
+
+// `mostReadable`
+// Given a base color and a list of possible foreground or background
+// colors for that base, returns the most readable color.
+// Optionally returns Black or White if the most readable color is unreadable.
+// *Example*
+//    tinycolor.mostReadable(tinycolor.mostReadable("#123", ["#124", "#125"],{includeFallbackColors:false}).toHexString(); // "#112255"
+//    tinycolor.mostReadable(tinycolor.mostReadable("#123", ["#124", "#125"],{includeFallbackColors:true}).toHexString();  // "#ffffff"
+//    tinycolor.mostReadable("#a8015a", ["#faf3f3"],{includeFallbackColors:true,level:"AAA",size:"large"}).toHexString(); // "#faf3f3"
+//    tinycolor.mostReadable("#a8015a", ["#faf3f3"],{includeFallbackColors:true,level:"AAA",size:"small"}).toHexString(); // "#ffffff"
+    tinycolor.mostReadable = function(baseColor, colorList, args) {
+        var bestColor = null;
+        var bestScore = 0;
+        var readability;
+        var includeFallbackColors, level, size ;
+        args = args || {};
+        includeFallbackColors = args.includeFallbackColors ;
+        level = args.level;
+        size = args.size;
+
+        for (var i= 0; i < colorList.length ; i++) {
+            readability = tinycolor.readability(baseColor, colorList[i]);
+            if (readability > bestScore) {
+                bestScore = readability;
+                bestColor = tinycolor(colorList[i]);
+            }
+        }
+
+        if (tinycolor.isReadable(baseColor, bestColor, {"level":level,"size":size}) || !includeFallbackColors) {
+            return bestColor;
+        }
+        else {
+            args.includeFallbackColors=false;
+            return tinycolor.mostReadable(baseColor,["#fff", "#000"],args);
+        }
+    };
+
+
+// Big List of Colors
+// ------------------
+// <http://www.w3.org/TR/css3-color/#svg-color>
+    var names = tinycolor.names = {
+        aliceblue: "f0f8ff",
+        antiquewhite: "faebd7",
+        aqua: "0ff",
+        aquamarine: "7fffd4",
+        azure: "f0ffff",
+        beige: "f5f5dc",
+        bisque: "ffe4c4",
+        black: "000",
+        blanchedalmond: "ffebcd",
+        blue: "00f",
+        blueviolet: "8a2be2",
+        brown: "a52a2a",
+        burlywood: "deb887",
+        burntsienna: "ea7e5d",
+        cadetblue: "5f9ea0",
+        chartreuse: "7fff00",
+        chocolate: "d2691e",
+        coral: "ff7f50",
+        cornflowerblue: "6495ed",
+        cornsilk: "fff8dc",
+        crimson: "dc143c",
+        cyan: "0ff",
+        darkblue: "00008b",
+        darkcyan: "008b8b",
+        darkgoldenrod: "b8860b",
+        darkgray: "a9a9a9",
+        darkgreen: "006400",
+        darkgrey: "a9a9a9",
+        darkkhaki: "bdb76b",
+        darkmagenta: "8b008b",
+        darkolivegreen: "556b2f",
+        darkorange: "ff8c00",
+        darkorchid: "9932cc",
+        darkred: "8b0000",
+        darksalmon: "e9967a",
+        darkseagreen: "8fbc8f",
+        darkslateblue: "483d8b",
+        darkslategray: "2f4f4f",
+        darkslategrey: "2f4f4f",
+        darkturquoise: "00ced1",
+        darkviolet: "9400d3",
+        deeppink: "ff1493",
+        deepskyblue: "00bfff",
+        dimgray: "696969",
+        dimgrey: "696969",
+        dodgerblue: "1e90ff",
+        firebrick: "b22222",
+        floralwhite: "fffaf0",
+        forestgreen: "228b22",
+        fuchsia: "f0f",
+        gainsboro: "dcdcdc",
+        ghostwhite: "f8f8ff",
+        gold: "ffd700",
+        goldenrod: "daa520",
+        gray: "808080",
+        green: "008000",
+        greenyellow: "adff2f",
+        grey: "808080",
+        honeydew: "f0fff0",
+        hotpink: "ff69b4",
+        indianred: "cd5c5c",
+        indigo: "4b0082",
+        ivory: "fffff0",
+        khaki: "f0e68c",
+        lavender: "e6e6fa",
+        lavenderblush: "fff0f5",
+        lawngreen: "7cfc00",
+        lemonchiffon: "fffacd",
+        lightblue: "add8e6",
+        lightcoral: "f08080",
+        lightcyan: "e0ffff",
+        lightgoldenrodyellow: "fafad2",
+        lightgray: "d3d3d3",
+        lightgreen: "90ee90",
+        lightgrey: "d3d3d3",
+        lightpink: "ffb6c1",
+        lightsalmon: "ffa07a",
+        lightseagreen: "20b2aa",
+        lightskyblue: "87cefa",
+        lightslategray: "789",
+        lightslategrey: "789",
+        lightsteelblue: "b0c4de",
+        lightyellow: "ffffe0",
+        lime: "0f0",
+        limegreen: "32cd32",
+        linen: "faf0e6",
+        magenta: "f0f",
+        maroon: "800000",
+        mediumaquamarine: "66cdaa",
+        mediumblue: "0000cd",
+        mediumorchid: "ba55d3",
+        mediumpurple: "9370db",
+        mediumseagreen: "3cb371",
+        mediumslateblue: "7b68ee",
+        mediumspringgreen: "00fa9a",
+        mediumturquoise: "48d1cc",
+        mediumvioletred: "c71585",
+        midnightblue: "191970",
+        mintcream: "f5fffa",
+        mistyrose: "ffe4e1",
+        moccasin: "ffe4b5",
+        navajowhite: "ffdead",
+        navy: "000080",
+        oldlace: "fdf5e6",
+        olive: "808000",
+        olivedrab: "6b8e23",
+        orange: "ffa500",
+        orangered: "ff4500",
+        orchid: "da70d6",
+        palegoldenrod: "eee8aa",
+        palegreen: "98fb98",
+        paleturquoise: "afeeee",
+        palevioletred: "db7093",
+        papayawhip: "ffefd5",
+        peachpuff: "ffdab9",
+        peru: "cd853f",
+        pink: "ffc0cb",
+        plum: "dda0dd",
+        powderblue: "b0e0e6",
+        purple: "800080",
+        rebeccapurple: "663399",
+        red: "f00",
+        rosybrown: "bc8f8f",
+        royalblue: "4169e1",
+        saddlebrown: "8b4513",
+        salmon: "fa8072",
+        sandybrown: "f4a460",
+        seagreen: "2e8b57",
+        seashell: "fff5ee",
+        sienna: "a0522d",
+        silver: "c0c0c0",
+        skyblue: "87ceeb",
+        slateblue: "6a5acd",
+        slategray: "708090",
+        slategrey: "708090",
+        snow: "fffafa",
+        springgreen: "00ff7f",
+        steelblue: "4682b4",
+        tan: "d2b48c",
+        teal: "008080",
+        thistle: "d8bfd8",
+        tomato: "ff6347",
+        turquoise: "40e0d0",
+        violet: "ee82ee",
+        wheat: "f5deb3",
+        white: "fff",
+        whitesmoke: "f5f5f5",
+        yellow: "ff0",
+        yellowgreen: "9acd32"
+    };
+
+// Make it easy to access colors via `hexNames[hex]`
+    var hexNames = tinycolor.hexNames = flip(names);
+
+
+// Utilities
+// ---------
+
+// `{ 'name1': 'val1' }` becomes `{ 'val1': 'name1' }`
+    function flip(o) {
+        var flipped = { };
+        for (var i in o) {
+            if (o.hasOwnProperty(i)) {
+                flipped[o[i]] = i;
+            }
+        }
+        return flipped;
+    }
+
+// Return a valid alpha value [0,1] with all invalid values being set to 1
+    function boundAlpha(a) {
+        a = parseFloat(a);
+
+        if (isNaN(a) || a < 0 || a > 1) {
+            a = 1;
+        }
+
+        return a;
+    }
+
+// Take input from [0, n] and return it as [0, 1]
+    function bound01(n, max) {
+        if (isOnePointZero(n)) { n = "100%"; }
+
+        var processPercent = isPercentage(n);
+        n = mathMin(max, mathMax(0, parseFloat(n)));
+
+        // Automatically convert percentage into number
+        if (processPercent) {
+            n = parseInt(n * max, 10) / 100;
+        }
+
+        // Handle floating point rounding errors
+        if ((Math.abs(n - max) < 0.000001)) {
+            return 1;
+        }
+
+        // Convert into [0, 1] range if it isn't already
+        return (n % max) / parseFloat(max);
+    }
+
+// Force a number between 0 and 1
+    function clamp01(val) {
+        return mathMin(1, mathMax(0, val));
+    }
+
+// Parse a base-16 hex value into a base-10 integer
+    function parseIntFromHex(val) {
+        return parseInt(val, 16);
+    }
+
+// Need to handle 1.0 as 100%, since once it is a number, there is no difference between it and 1
+// <http://stackoverflow.com/questions/7422072/javascript-how-to-detect-number-as-a-decimal-including-1-0>
+    function isOnePointZero(n) {
+        return typeof n == "string" && n.indexOf('.') != -1 && parseFloat(n) === 1;
+    }
+
+// Check to see if string passed in is a percentage
+    function isPercentage(n) {
+        return typeof n === "string" && n.indexOf('%') != -1;
+    }
+
+// Force a hex value to have 2 characters
+    function pad2(c) {
+        return c.length == 1 ? '0' + c : '' + c;
+    }
+
+// Replace a decimal with it's percentage value
+    function convertToPercentage(n) {
+        if (n <= 1) {
+            n = (n * 100) + "%";
+        }
+
+        return n;
+    }
+
+// Converts a decimal to a hex value
+    function convertDecimalToHex(d) {
+        return Math.round(parseFloat(d) * 255).toString(16);
+    }
+// Converts a hex value to a decimal
+    function convertHexToDecimal(h) {
+        return (parseIntFromHex(h) / 255);
+    }
+
+    var matchers = (function() {
+
+        // <http://www.w3.org/TR/css3-values/#integers>
+        var CSS_INTEGER = "[-\\+]?\\d+%?";
+
+        // <http://www.w3.org/TR/css3-values/#number-value>
+        var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";
+
+        // Allow positive/negative integer/number.  Don't capture the either/or, just the entire outcome.
+        var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
+
+        // Actual matching.
+        // Parentheses and commas are optional, but not required.
+        // Whitespace can take the place of commas or opening paren
+        var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+        var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+
+        return {
+            CSS_UNIT: new RegExp(CSS_UNIT),
+            rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
+            rgba: new RegExp("rgba" + PERMISSIVE_MATCH4),
+            hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
+            hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
+            hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
+            hsva: new RegExp("hsva" + PERMISSIVE_MATCH4),
+            hex3: /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
+            hex6: /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,
+            hex4: /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
+            hex8: /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
+        };
+    })();
+
+// `isValidCSSUnit`
+// Take in a single string / number and check to see if it looks like a CSS unit
+// (see `matchers` above for definition).
+    function isValidCSSUnit(color) {
+        return !!matchers.CSS_UNIT.exec(color);
+    }
+
+// `stringInputToObject`
+// Permissive string parsing.  Take in a number of formats, and output an object
+// based on detected format.  Returns `{ r, g, b }` or `{ h, s, l }` or `{ h, s, v}`
+    function stringInputToObject(color) {
+
+        color = color.replace(trimLeft,'').replace(trimRight, '').toLowerCase();
+        var named = false;
+        if (names[color]) {
+            color = names[color];
+            named = true;
+        }
+        else if (color == 'transparent') {
+            return { r: 0, g: 0, b: 0, a: 0, format: "name" };
+        }
+
+        // Try to match string input using regular expressions.
+        // Keep most of the number bounding out of this function - don't worry about [0,1] or [0,100] or [0,360]
+        // Just return an object and let the conversion functions handle that.
+        // This way the result will be the same whether the tinycolor is initialized with string or object.
+        var match;
+        if ((match = matchers.rgb.exec(color))) {
+            return { r: match[1], g: match[2], b: match[3] };
+        }
+        if ((match = matchers.rgba.exec(color))) {
+            return { r: match[1], g: match[2], b: match[3], a: match[4] };
+        }
+        if ((match = matchers.hsl.exec(color))) {
+            return { h: match[1], s: match[2], l: match[3] };
+        }
+        if ((match = matchers.hsla.exec(color))) {
+            return { h: match[1], s: match[2], l: match[3], a: match[4] };
+        }
+        if ((match = matchers.hsv.exec(color))) {
+            return { h: match[1], s: match[2], v: match[3] };
+        }
+        if ((match = matchers.hsva.exec(color))) {
+            return { h: match[1], s: match[2], v: match[3], a: match[4] };
+        }
+        if ((match = matchers.hex8.exec(color))) {
+            return {
+                r: parseIntFromHex(match[1]),
+                g: parseIntFromHex(match[2]),
+                b: parseIntFromHex(match[3]),
+                a: convertHexToDecimal(match[4]),
+                format: named ? "name" : "hex8"
+            };
+        }
+        if ((match = matchers.hex6.exec(color))) {
+            return {
+                r: parseIntFromHex(match[1]),
+                g: parseIntFromHex(match[2]),
+                b: parseIntFromHex(match[3]),
+                format: named ? "name" : "hex"
+            };
+        }
+        if ((match = matchers.hex4.exec(color))) {
+            return {
+                r: parseIntFromHex(match[1] + '' + match[1]),
+                g: parseIntFromHex(match[2] + '' + match[2]),
+                b: parseIntFromHex(match[3] + '' + match[3]),
+                a: convertHexToDecimal(match[4] + '' + match[4]),
+                format: named ? "name" : "hex8"
+            };
+        }
+        if ((match = matchers.hex3.exec(color))) {
+            return {
+                r: parseIntFromHex(match[1] + '' + match[1]),
+                g: parseIntFromHex(match[2] + '' + match[2]),
+                b: parseIntFromHex(match[3] + '' + match[3]),
+                format: named ? "name" : "hex"
+            };
+        }
+
+        return false;
+    }
+
+    function validateWCAG2Parms(parms) {
+        // return valid WCAG2 parms for isReadable.
+        // If input parms are invalid, return {"level":"AA", "size":"small"}
+        var level, size;
+        parms = parms || {"level":"AA", "size":"small"};
+        level = (parms.level || "AA").toUpperCase();
+        size = (parms.size || "small").toLowerCase();
+        if (level !== "AA" && level !== "AAA") {
+            level = "AA";
+        }
+        if (size !== "small" && size !== "large") {
+            size = "small";
+        }
+        return {"level":level, "size":size};
+    }
+
+// Node: Export function
+    if (typeof module !== "undefined" && module.exports) {
+        module.exports = tinycolor;
+    }
+// AMD/requirejs: Define the module
+    else if (typeof define === 'function' && define.amd) {
+        define(function () {return tinycolor;});
+    }
+// Browser: Expose to window
+    else {
+        window.tinycolor = tinycolor;
+    }
+
+})(Math);
diff --git a/lib/web/legacy-build.min.js b/lib/web/legacy-build.min.js
index bc6cc996f8873..24e8c2429865f 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 lowercase 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/browser.js b/lib/web/mage/adminhtml/browser.js
index 232019d1b0916..09ceafc011d6f 100644
--- a/lib/web/mage/adminhtml/browser.js
+++ b/lib/web/mage/adminhtml/browser.js
@@ -265,6 +265,7 @@ define([
                     node: this.activeNode.id,
                     store: this.options.storeId,
                     'as_is': targetEl.is('textarea') ? 1 : 0,
+                    'force_static_path': targetEl.data('force_static_path') ? 1 : 0,
                     'form_key': FORM_KEY
                 },
                 context: this,
@@ -273,7 +274,11 @@ define([
                 if (targetEl.is('textarea')) {
                     this.insertAtCursor(targetEl.get(0), data);
                 } else {
-                    targetEl.val(data).trigger('change');
+                    targetEl
+                        .val(data)
+                        .data('size', fileRow.data('size'))
+                        .data('mime-type', fileRow.data('mime-type'))
+                        .trigger('change');
                 }
                 MediabrowserUtility.closeDialog();
                 targetEl.focus();
@@ -429,7 +434,11 @@ define([
                             showLoader: true
                         }).done($.proxy(function () {
                             self.reload();
-                            self.element.find('#delete_files').toggleClass(self.options.hidden, true);
+                            self.element.find('#delete_files, #insert_files').toggleClass(self.options.hidden, true);
+
+                            $(window).trigger('fileDeleted.mediabrowser', {
+                                ids: ids
+                            });
                         }, this));
                     },
 
@@ -472,4 +481,6 @@ define([
             breadcrumbs.insertAfter(this.element.find('#content_header'));
         }
     });
+
+    return window.MediabrowserUtility;
 });
diff --git a/lib/web/mage/adminhtml/events.js b/lib/web/mage/adminhtml/events.js
index e8c128d45c185..67e04c5ca9c15 100644
--- a/lib/web/mage/adminhtml/events.js
+++ b/lib/web/mage/adminhtml/events.js
@@ -79,6 +79,49 @@ define([
             this.arrEvents = {};
         },
 
+        /**
+         * Collect and modify value of arg synchronously in succession and return its new value.
+         * In order to use, call attachEventHandler and add function handlers with eventName.
+         * Then call fireEventReducer with eventName and any argument to have its value accumulatively modified.
+         * Event handlers will be applied to argument in order of first attached to last attached.
+         * @param {String} eventName
+         * @param {*} arg
+         */
+        fireEventReducer: function (eventName, arg) {
+            var evtName = eventName + this.eventPrefix,
+                result = arg,
+                len,
+                i;
+
+            if (!this.arrEvents[evtName]) {
+                return result;
+            }
+
+            len = this.arrEvents[evtName].length; //optimization
+
+            for (i = 0; i < len; i++) {
+                /* eslint-disable max-depth */
+                try {
+                    result = this.arrEvents[evtName][i].method(result);
+                } catch (e) {
+                    if (this.id) {
+                        alert({
+                            content: 'error: error in ' + this.id + '.fireEventReducer():\n\nevent name: ' +
+                            eventName + '\n\nerror message: ' + e.message
+                        });
+                    } else {
+                        alert({
+                            content: 'error: error in [unknown object].fireEventReducer():\n\nevent name: ' +
+                            eventName + '\n\nerror message: ' + e.message
+                        });
+                    }
+                }
+                /* eslint-disable max-depth */
+            }
+
+            return result;
+        },
+
         /**
         * Fires the event {eventName}, resulting in all registered handlers to be executed.
         * It also collects and returns results of all non-asynchronous handlers
@@ -145,4 +188,6 @@ define([
     };
 
     window.varienGlobalEvents = new varienEvents(); //jscs:ignore requireCapitalizedConstructors
+
+    return window.varienGlobalEvents;
 });
diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index 0053dce8207dd..487c71484e4c5 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -386,24 +386,35 @@ define([
          * @param {Object} config
          */
         initialize: function (elementsMap, config) {
-            var idTo, idFrom;
+            var idTo, idFrom, values, fromId, radioFrom;
 
             if (config) {
-                this._config = config;
+                this._config = jQuery.extend(this._config, config);
             }
 
             for (idTo in elementsMap) { //eslint-disable-line guard-for-in
-                for (idFrom in elementsMap[idTo]) {
+                for (idFrom in elementsMap[idTo]) { //eslint-disable-line guard-for-in
                     if ($(idFrom)) {
                         Event.observe(
                             $(idFrom),
                             'change',
                             this.trackChange.bindAsEventListener(this, idTo, elementsMap[idTo])
                         );
-                        this.trackChange(null, idTo, elementsMap[idTo]);
                     } else {
-                        this.trackChange(null, idTo, elementsMap[idTo]);
+                        // Check if radio button
+                        values = elementsMap[idTo][idFrom].values;
+                        fromId = $(idFrom + values[0]);
+                        radioFrom = fromId ? $$('[name="' + fromId.name + '"]') : false;
+
+                        if (radioFrom) {
+                            radioFrom.invoke(
+                                'on',
+                                'change',
+                                this.trackChange.bindAsEventListener(this, idTo, elementsMap[idTo])
+                            );
+                        }
                     }
+                    this.trackChange(null, idTo, elementsMap[idTo]);
                 }
             }
         },
@@ -428,7 +439,7 @@ define([
             // define whether the target should show up
             var shouldShowUp = true,
                 idFrom, from, values, isInArray, isNegative, headElement, isInheritCheckboxChecked, target, inputs,
-                isAnInputOrSelect, currentConfig,rowElement;
+                isAnInputOrSelect, currentConfig, rowElement, fromId, radioFrom;
 
             for (idFrom in valuesFrom) { //eslint-disable-line guard-for-in
                 from = $(idFrom);
@@ -441,6 +452,20 @@ define([
                     if (!from || isInArray && isNegative || !isInArray && !isNegative) {
                         shouldShowUp = false;
                     }
+                // Check if radio button
+                } else {
+                    values = valuesFrom[idFrom].values;
+                    fromId = $(idFrom + values[0]);
+
+                    if (fromId) {
+                        radioFrom = $$('[name="' + fromId.name + '"]:checked');
+                        isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1;
+                        isNegative = valuesFrom[idFrom].negative;
+
+                        if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) {
+                            shouldShowUp = false;
+                        }
+                    }
                 }
             }
 
diff --git a/lib/web/mage/adminhtml/tools.js b/lib/web/mage/adminhtml/tools.js
index f23a0193cb6b2..27f6efcfc5876 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';
 
@@ -354,7 +348,7 @@ var Fieldset = {
     },
     saveState: function (url, parameters) {
         new Ajax.Request(url, {
-            method: 'get',
+            method: 'post',
             parameters: Object.toQueryString(parameters),
             loaderArea: false
         });
diff --git a/lib/web/mage/adminhtml/wysiwyg/events.js b/lib/web/mage/adminhtml/wysiwyg/events.js
new file mode 100644
index 0000000000000..36c680a7ffe46
--- /dev/null
+++ b/lib/web/mage/adminhtml/wysiwyg/events.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        afterInitialization: 'afterInitialization',
+        afterChangeContent: 'afterChangeContent',
+        afterUndo: 'afterUndo',
+        afterPaste: 'afterPaste',
+        beforeSetContent: 'beforeSetContent',
+        afterSetContent: 'afterSetContent',
+        afterSave: 'afterSave',
+        afterOpenFileBrowser: 'afterOpenFileBrowser',
+        afterFormSubmit: 'afterFormSubmit',
+        afterBlur: 'afterBlur',
+        afterFocus: 'afterFocus'
+    };
+});
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
index 48960ed3403c0..98ce6a005db04 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
@@ -186,11 +186,19 @@ define([
         });
 
         _.each(compiled, function (node, nodeName) {
-            var attributes  = node.attributes.join('|'),
-                children    = node.children.join('|');
+            var filteredAttributes = [];
 
-            validElements.push(nodeName + '[' + attributes + ']');
-            validChildren.push(nodeName + '[' + children + ']');
+            _.each(node.attributes, function (attribute) { //eslint-disable-line max-nested-callbacks
+                // Disallowing usage of 'on*' attributes.
+                if (!/^on/.test(attribute)) {
+                    filteredAttributes.push(attribute);
+                }
+            });
+
+            node.attributes = filteredAttributes;
+
+            validElements.push(nodeName + '[' + node.attributes.join('|') + ']');
+            validChildren.push(nodeName + '[' + node.children.join('|') + ']');
         });
 
         return {
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
index 70dfefd902367..e6f12a2e51acf 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
@@ -3,95 +3,217 @@
  * See COPYING.txt for license details.
  */
 
-/* global tinymce, MagentovariablePlugin */
+/* global tinymce, MagentovariablePlugin, varienGlobalEvents, Base64 */
 /* eslint-disable strict */
+define([
+    'Magento_Variable/js/config-directive-generator',
+    'Magento_Variable/js/custom-directive-generator',
+    'wysiwygAdapter',
+    'jquery'
+], function (configDirectiveGenerator, customDirectiveGenerator, wysiwyg, jQuery) {
+    return function (config) {
+        tinymce.create('tinymce.plugins.magentovariable', {
 
-(function () {
-    tinymce.create('tinymce.plugins.magentoVariablesPlugin', {
+            /**
+             * Initialize editor plugin.
+             *
+             * @param {tinymce.editor} editor - Editor instance that the plugin is initialized in.
+             * @param {String} url - Absolute URL to where the plugin is located.
+             */
+            init: function (editor, url) {
+                var self = this;
 
-        /**
-         * Initialize editor plugin.
-         *
-         * @param {tinymce.editor} editor - Editor instance that the plugin is initialized in.
-         * @param {String} url - Absolute URL to where the plugin is located.
-         */
-        init: function (editor, url) {
+                /**
+                 * Add new command to open variables selector slideout.
+                 */
+                editor.addCommand('openVariablesSlideout', function (commandConfig) {
+                    var selectedElement;
+
+                    if (commandConfig) {
+                        selectedElement = commandConfig.selectedElement;
+                    } else {
+                        selectedElement = tinymce.activeEditor.selection.getNode();
+                    }
+                    MagentovariablePlugin.setEditor(editor);
+                    MagentovariablePlugin.loadChooser(
+                        config.url,
+                        wysiwyg.getId(),
+                        selectedElement
+                    );
+                });
+
+                /**
+                 * Add button to the editor toolbar.
+                 */
+                editor.addButton('magentovariable', {
+                    title: jQuery.mage.__('Insert Variable'),
+                    tooltip: jQuery.mage.__('Insert Variable'),
+                    cmd: 'openVariablesSlideout',
+                    image: url + '/img/icon.png',
+
+                    /**
+                     * Highlight or dismiss Insert Variable button when variable is selected or deselected.
+                     */
+                    onPostRender: function () {
+                        var _this = this,
+
+                        /**
+                         * Toggle active state of Insert Variable button.
+                         *
+                         * @param {Object} e
+                         */
+                        toggleVariableButton = function (e) {
+                            _this.active(false);
+
+                            if (jQuery(e.target).hasClass('magento-variable')) {
+                                _this.active(true);
+                            }
+                        };
+
+                        editor.on('click', toggleVariableButton);
+                        editor.on('change', toggleVariableButton);
+                    }
+                });
+
+                /**
+                 * Double click handler on the editor to handle dbl click on variable placeholder.
+                 */
+                editor.on('dblclick', function (evt) {
+                    if (jQuery(evt.target).hasClass('magento-variable')) {
+                        editor.selection.collapse(false);
+                        editor.execCommand('openVariablesSlideout', {
+                            ui: true,
+                            selectedElement: evt.target
+                        });
+                    }
+                });
+
+                /**
+                 * Attach event handler for when wysiwyg editor is about to encode its content
+                 */
+                varienGlobalEvents.attachEventHandler('wysiwygEncodeContent', function (content) {
+                    content = self.encodeVariables(content);
+
+                    return content;
+                });
+
+                /**
+                 * Attach event handler for when wysiwyg editor is about to decode its content
+                 */
+                varienGlobalEvents.attachEventHandler('wysiwygDecodeContent', function (content) {
+                    content = self.decodeVariables(content);
+
+                    return content;
+                });
+            },
 
             /**
-             * Add new command to open variables selector slideout.
+             * Encode variables in content
+             *
+             * @param {String} content
+             * @returns {*}
              */
-            editor.addCommand('openVariablesSlideout', function (commandConfig) {
-                var selectedElement;
-
-                if (commandConfig) {
-                    selectedElement = commandConfig.selectedElement;
-                } else {
-                    selectedElement = tinymce.activeEditor.selection.getNode();
-                }
-                MagentovariablePlugin.setEditor(editor);
-                MagentovariablePlugin.loadChooser(
-                    editor.settings.magentoPluginsOptions.magentovariable.url,
-                    this.settings.adapter.id,
-                    selectedElement
-                );
-            });
+            encodeVariables: function (content) {
+                content = content.gsub(/\{\{config path=\"([^\"]+)\"\}\}/i, function (match) {
+                    var path = match[1],
+                        magentoVariables,
+                        imageHtml;
+
+                    magentoVariables = JSON.parse(config.placeholders);
+
+                    if (magentoVariables[match[1]] && magentoVariables[match[1]]['variable_type'] === 'default') {
+                        imageHtml = '<span id="%id" class="magento-variable magento-placeholder mceNonEditable">' +
+                            '%s</span>';
+                        imageHtml = imageHtml.replace('%s', magentoVariables[match[1]]['variable_name']);
+                    } else {
+                        imageHtml = '<span id="%id" class="' +
+                            'magento-variable magento-placeholder magento-placeholder-error ' +
+                            'mceNonEditable' +
+                            '">' +
+                            'Not found' +
+                            '</span>';
+                    }
+
+                    return imageHtml.replace('%id', Base64.idEncode(path));
+                });
+
+                content = content.gsub(/\{\{customVar code=([^\}\"]+)\}\}/i, function (match) {
+                    var path = match[1],
+                        magentoVariables,
+                        imageHtml;
+
+                    magentoVariables = JSON.parse(config.placeholders);
+
+                    if (magentoVariables[match[1]] && magentoVariables[match[1]]['variable_type'] === 'custom') {
+                        imageHtml = '<span id="%id" class="magento-variable magento-custom-var magento-placeholder ' +
+                            'mceNonEditable">%s</span>';
+                        imageHtml = imageHtml.replace('%s', magentoVariables[match[1]]['variable_name']);
+                    } else {
+                        imageHtml = '<span id="%id" class="' +
+                            'magento-variable magento-custom-var magento-placeholder ' +
+                            'magento-placeholder-error mceNonEditable' +
+                            '">' +
+                            match[1] +
+                            '</span>';
+                    }
+
+                    return imageHtml.replace('%id', Base64.idEncode(path));
+                });
+
+                return content;
+            },
 
             /**
-             * Add button to the editor toolbar.
+             * Decode variables in content.
+             *
+             * @param {String} content
+             * @returns {String}
              */
-            editor.addButton('magentovariable', {
-                title: jQuery.mage.__('Insert Variable'),
-                tooltip: jQuery.mage.__('Insert Variable'),
-                cmd: 'openVariablesSlideout',
-                image: url + '/img/icon.png',
+            decodeVariables: function (content) {
+                var doc = (new DOMParser()).parseFromString(content.replace(/&quot;/g, '&amp;quot;'), 'text/html');
 
-                /**
-                 * Highlight or dismiss Insert Variable button when variable is selected or deselected.
-                 */
-                onPostRender: function () {
-                    var _this = this;
+                [].forEach.call(doc.querySelectorAll('span.magento-variable'), function (el) {
+                    var $el = jQuery(el);
 
-                    editor.on('click', function (e) {
-                        _this.active(false);
+                    if ($el.hasClass('magento-custom-var')) {
+                        $el.replaceWith(
+                            customDirectiveGenerator.processConfig(
+                                Base64.idDecode(
+                                    $el.attr('id')
+                                )
+                            )
+                        );
+                    } else {
+                        $el.replaceWith(
+                            configDirectiveGenerator.processConfig(
+                                Base64.idDecode(
+                                    $el.attr('id')
+                                )
+                            )
+                        );
+                    }
+                });
 
-                        if (jQuery(e.target).hasClass('magento-variable')) {
-                            _this.active(true);
-                        }
-                    });
-                }
-            });
+                return doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : content;
+            },
 
             /**
-             * Double click handler on the editor to handle dbl click on variable placeholder.
+             * @return {Object}
              */
-            editor.on('dblclick', function (evt) {
-
-                if (jQuery(evt.target).hasClass('magento-variable')) {
-                    editor.selection.collapse(false);
-                    editor.execCommand('openVariablesSlideout', {
-                        ui: true,
-                        selectedElement: evt.target
-                    });
-                }
-            });
-        },
+            getInfo: function () {
+                return {
+                    longname: 'Magento Variable Manager Plugin',
+                    author: 'Magento Core Team',
+                    authorurl: 'http://magentocommerce.com',
+                    infourl: 'http://magentocommerce.com',
+                    version: '1.0'
+                };
+            }
+        });
 
         /**
-         * @return {Object}
+         * Register plugin
          */
-        getInfo: function () {
-            return {
-                longname: 'Magento Variable Manager Plugin',
-                author: 'Magento Core Team',
-                authorurl: 'http://magentocommerce.com',
-                infourl: 'http://magentocommerce.com',
-                version: '1.0'
-            };
-        }
-    });
-
-    /**
-     * Register plugin
-     */
-    tinymce.PluginManager.add('magentovariable', tinymce.plugins.magentoVariablesPlugin);
-})();
+        tinymce.PluginManager.add('magentovariable', tinymce.plugins.magentovariable);
+    };
+});
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
index 13008de4e11c7..18d71aad2071a 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -3,99 +3,233 @@
  * See COPYING.txt for license details.
  */
 
-/* global tinymce, widgetTools */
+/* global tinymce, widgetTools, jQuery, Base64 */
 /* eslint-disable strict */
-(function () {
+define([
+    'wysiwygAdapter',
+    'mage/adminhtml/events',
+    'mage/adminhtml/wysiwyg/widget'
+], function (wysiwyg, varienGlobalEvents) {
+    return function (config) {
+        tinymce.create('tinymce.plugins.magentowidget', {
 
-    tinymce.create('tinymce.plugins.MagentoWidget', {
-        /**
-         * @param {tinymce.Editor} editor - Editor instance that the plugin is initialized in.
-         * @param {String} url - Absolute URL to where the plugin is located.
-         */
-        init: function (editor, url) {
-            var activePlaceholder;
+            /**
+             * @param {tinymce.Editor} editor - Editor instance that the plugin is initialized in.
+             * @param {String} url - Absolute URL to where the plugin is located.
+             */
+            init: function (editor, url) {
+                var self = this;
+
+                this.activePlaceholder = null;
+
+                editor.addCommand('mceMagentowidget', function (img) {
+                    if (self.activePlaceholder) {
+                        img = self.activePlaceholder;
+                    }
+
+                    widgetTools.setActiveSelectedNode(img);
+                    widgetTools.openDialog(
+                        config['window_url'] + 'widget_target_id/' + editor.getElement().id + '/'
+                    );
+                });
+
+                // Register Widget plugin button
+                editor.addButton('magentowidget', {
+                    title: jQuery.mage.__('Insert Widget'),
+                    cmd: 'mceMagentowidget',
+                    image: url + '/img/icon.png',
+
+                    /**
+                     * Fires after the rendering has completed. This ensures the editor will be instantiated
+                     */
+                    onPostRender: function () {
+                        var ctrl = this;
+
+                        // Add a node change handler, selects the button in the UI when a image is selected
+                        editor.on('nodeChange', function (e) {
+                            var placeholder = e.element;
+
+                            if (self.isWidgetPlaceholderSelected(placeholder)) {
+                                widgetTools.setEditMode(true);
+                                ctrl.active(true);
+                            } else {
+                                widgetTools.setEditMode(false);
+                                ctrl.active(false);
+                            }
+                        });
+                    }
+                });
+
+                // Add a widget placeholder image double click callback
+                editor.on('dblClick', function (e) {
+                    var placeholder = e.target;
+
+                    if (self.isWidgetPlaceholderSelected(placeholder)) {
+                        widgetTools.setEditMode(true);
+                        this.execCommand('mceMagentowidget', null);
+                    }
+                });
+
+                /**
+                 * Attach event handler for when wysiwyg editor is about to encode its content
+                 */
+                varienGlobalEvents.attachEventHandler('wysiwygEncodeContent', function (content) {
+                    content = self.encodeWidgets(self.decodeWidgets(content));
+                    content = self.removeDuplicateAncestorWidgetSpanElement(content);
+
+                    return content;
+                });
+
+                /**
+                 * Attach event handler for when wysiwyg editor is about to decode its content
+                 */
+                varienGlobalEvents.attachEventHandler('wysiwygDecodeContent', function (content) {
+                    content = self.decodeWidgets(content);
+
+                    return content;
+                });
+
+                /**
+                 * Attach event handler for when popups associated with wysiwyg are about to be closed
+                 */
+                varienGlobalEvents.attachEventHandler('wysiwygClosePopups', function () {
+                    wysiwyg.closeEditorPopup('widget_window' + wysiwyg.getId());
+                });
+            },
 
             /**
-             *
              * @param {Object} placeholder - Contains the selected node
              * @returns {Boolean}
              */
-            function isWidgetPlaceholderSelected(placeholder) {
+            isWidgetPlaceholderSelected: function (placeholder) {
                 var isSelected = false;
 
-                if (placeholder.nodeName && (placeholder.nodeName === 'SPAN' || placeholder.nodeName === 'IMG') &&
-                    placeholder.className && placeholder.className.indexOf('magento-widget') !== -1) {
-                    activePlaceholder = placeholder;
+                if (placeholder.nodeName &&
+                    (placeholder.nodeName === 'SPAN' || placeholder.nodeName === 'IMG') &&
+                    placeholder.className && placeholder.className.indexOf('magento-widget') !== -1
+                ) {
+                    this.activePlaceholder = placeholder;
                     isSelected = true;
                 } else {
-                    activePlaceholder = undefined;
+                    this.activePlaceholder = null;
                 }
 
                 return isSelected;
-            }
+            },
 
-            editor.addCommand('mceMagentowidget', function (img) {
-                if (activePlaceholder) {
-                    img = activePlaceholder;
-                }
-                widgetTools.setActiveSelectedNode(img);
-                widgetTools.openDialog(
-                    editor.settings['magentowidget_url'] + 'widget_target_id/' + editor.getElement().id + '/'
-                );
-            });
+            /**
+             * Convert {{widget}} style syntax to image placeholder HTML
+             * @param {String} content
+             * @return {*}
+             */
+            encodeWidgets: function (content) {
+                return content.gsub(/\{\{widget(.*?)\}\}/i, function (match) {
+                    var attributes = wysiwyg.parseAttributesString(match[1]),
+                        imageSrc,
+                        imageHtml = '';
 
-            // Register Widget plugin button
-            editor.addButton('magentowidget', {
-                title: jQuery.mage.__('Insert Widget'),
-                cmd: 'mceMagentowidget',
-                image: url + '/img/icon.png',
+                    if (attributes.type) {
+                        attributes.type = attributes.type.replace(/\\\\/g, '\\');
+                        imageSrc = config.placeholders[attributes.type];
 
-                /**
-                 * Fires after the rendering has completed. This ensures the editor will be instantiated
-                 */
-                onPostRender: function () {
-                    var ctrl = this;
+                        if (config.types.indexOf(attributes['type_name']) > -1) {
+                            imageHtml += '<span class="magento-placeholder magento-widget mceNonEditable" ' +
+                                'contenteditable="false">';
+                        } else {
+                            imageSrc = config['error_image_url'];
+                            imageHtml += '<span ' +
+                                'class="magento-placeholder magento-placeholder-error magento-widget mceNonEditable" ' +
+                                'contenteditable="false">';
+                        }
+
+                        imageHtml += '<img';
+                        imageHtml += ' id="' + Base64.idEncode(match[0]) + '"';
+                        imageHtml += ' src="' + imageSrc + '"';
+                        imageHtml += ' />';
+
+                        if (attributes['type_name']) {
+                            imageHtml += attributes['type_name'];
+                        }
+
+                        imageHtml += '</span>';
+
+                        return imageHtml;
+                    }
+                });
+            },
 
-                    // Add a node change handler, selects the button in the UI when a image is selected
-                    editor.on('nodeChange', function (e) {
-                        var placeholder = e.element;
+            /**
+             * Convert image placeholder HTML to {{widget}} style syntax
+             * @param {String} content
+             * @return {*}
+             */
+            decodeWidgets: function (content) {
+                return content.gsub(
+                    /(<span class="[^"]*magento-widget[^"]*"[^>]*>)?<img([^>]+id="[^>]+)>(([^>]*)<\/span>)?/i,
+                    function (match) {
+                        var attributes = wysiwyg.parseAttributesString(match[2]),
+                            widgetCode;
 
-                        widgetTools.setEditMode(false);
-                        ctrl.active(false);
+                        if (attributes.id) {
+                            widgetCode = Base64.idDecode(attributes.id);
 
-                        if (isWidgetPlaceholderSelected(placeholder)) {
-                            widgetTools.setEditMode(true);
-                            ctrl.active(true);
+                            if (widgetCode.indexOf('{{widget') !== -1) {
+                                return widgetCode;
+                            }
                         }
-                    });
-                }
-            });
 
-            // Add a widget placeholder image double click callback
-            editor.on('dblClick', function (e) {
-                var placeholder = e.target;
+                        return match[0];
+                    }
+                );
+            },
 
-                if (isWidgetPlaceholderSelected(placeholder)) {
-                    widgetTools.setEditMode(true);
-                    this.execCommand('mceMagentowidget', null);
+            /**
+             * Tinymce has strange behavior with html and this removes one of its side-effects
+             * @param {String} content
+             * @return {String}
+             */
+            removeDuplicateAncestorWidgetSpanElement: function (content) {
+                var parser, doc;
+
+                if (!window.DOMParser) {
+                    return content;
                 }
-            });
-        },
-
-        /**
-         * @return {Object}
-         */
-        getInfo: function () {
-            return {
-                longname: 'Magento Widget Manager Plugin',
-                author: 'Magento Core Team',
-                authorurl: 'http://magentocommerce.com',
-                infourl: 'http://magentocommerce.com',
-                version: '1.0'
-            };
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('magentowidget', tinymce.plugins.MagentoWidget);
-})();
+
+                parser = new DOMParser();
+                doc = parser.parseFromString(content.replace(/&quot;/g, '&amp;quot;'), 'text/html');
+
+                [].forEach.call(doc.querySelectorAll('.magento-widget'), function (widgetEl) {
+                    var widgetChildEl = widgetEl.querySelector('.magento-widget');
+
+                    if (!widgetChildEl) {
+                        return;
+                    }
+
+                    [].forEach.call(widgetEl.childNodes, function (el) {
+                        widgetEl.parentNode.insertBefore(el, widgetEl);
+                    });
+
+                    widgetEl.parentNode.removeChild(widgetEl);
+                });
+
+                return doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : content;
+            },
+
+            /**
+             * @return {Object}
+             */
+            getInfo: function () {
+                return {
+                    longname: 'Magento Widget Manager Plugin',
+                    author: 'Magento Core Team',
+                    authorurl: 'http://magentocommerce.com',
+                    infourl: 'http://magentocommerce.com',
+                    version: '1.0'
+                };
+            }
+        });
+
+        // Register plugin
+        tinymce.PluginManager.add('magentowidget', tinymce.plugins.magentowidget);
+    };
+});
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index d992947dca6e3..06943b25de55e 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -8,12 +8,14 @@ define([
     'jquery',
     'underscore',
     'wysiwygAdapter',
+    'module',
     'mage/translate',
     'prototype',
     'mage/adminhtml/events',
     'mage/adminhtml/browser'
-], function (jQuery, _, wysiwygAdapter) {
-    var wysiwygSetup = Class.create({
+], function (jQuery, _, wysiwygAdapter, module) {
+    var baseConfig = module.config().config || {},
+        wysiwygSetup = Class.create({
         wysiwygInstance: null
     });
 
@@ -27,7 +29,10 @@ define([
             var WysiwygInstancePrototype = new wysiwygAdapter.getAdapterPrototype();
 
             _.bindAll(this, 'openFileBrowser');
+
+            config = _.extend({}, baseConfig, config || {});
             this.wysiwygInstance = new WysiwygInstancePrototype(htmlId, config);
+            this.wysiwygInstance.eventBus = this.eventBus = new window.varienEvents();
         },
 
         /**
@@ -67,6 +72,9 @@ define([
         updateContent: function (content) {
             return this.wysiwygInstance.encodeContent(content);
         }
+
     };
     window.wysiwygSetup = wysiwygSetup;
+
+    return wysiwygSetup;
 });
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css
index 274dcc124a3a6..27373b2a5147b 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css
@@ -15,6 +15,8 @@
     font-style: normal;
     font-size: 14px;
     color: #000;
+    box-sizing: initial;
+    word-break: break-all;
 }
 
 .magento-placeholder-error {
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index 483f0aab7182b..9374bac405c46 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -3,20 +3,18 @@
  * See COPYING.txt for license details.
  */
 
-/* global varienGlobalEvents, popups, tinyMceEditors, MediabrowserUtility, Base64 */
+/* global popups, tinyMceEditors, MediabrowserUtility, Base64 */
 /* eslint-disable strict */
 define([
     'jquery',
     'underscore',
     'tinymce4',
-    'Magento_Variable/js/config-directive-generator',
-    'Magento_Variable/js/custom-directive-generator',
+    'mage/adminhtml/events',
+    'mage/adminhtml/wysiwyg/events',
     'mage/translate',
     'prototype',
-    'mage/adminhtml/events',
-    'jquery/ui',
-    'mage/translate'
-], function (jQuery, _, tinyMCE4, configDirectiveGenerator, customDirectiveGenerator) {
+    'jquery/ui'
+], function (jQuery, _, tinyMCE4, varienGlobalEvents, wysiwygEvents) {
     'use strict';
 
     var tinyMce4Wysiwyg = Class.create();
@@ -25,13 +23,13 @@ define([
         mediaBrowserOpener: null,
         mediaBrowserTargetElementId: null,
         magentoVariablesPlugin: null,
+        mode: 'exact',
 
         /**
          * @param {*} htmlId
          * @param {Object} config
          */
         initialize: function (htmlId, config) {
-
             this.id = htmlId;
             this.config = config;
 
@@ -42,7 +40,8 @@ define([
                 'onChangeContent',
                 'openFileBrowser',
                 'updateTextArea',
-                'onUndo'
+                'onUndo',
+                'removeEvents'
             );
 
             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
@@ -68,27 +67,72 @@ define([
         /**
          * Setup TinyMCE4 editor
          */
-        setup: function () {
+        setup: function (mode) {
+            var deferreds = [],
+                settings,
+                self = this;
 
-            if (this.config['add_widgets']) {
-                tinyMCE4.PluginManager.load('magentowidget', this.config['widget_plugin_src']);
-                this.addPluginToToolbar('magentowidget', '|');
-            }
-
-            if (this.config['add_variables']) {
-                this.addPluginToToolbar('magentovariable', '|');
-            }
+            this.turnOff();
 
             if (this.config.plugins) {
                 this.config.plugins.forEach(function (plugin) {
-                    tinyMCE4.PluginManager.load(plugin.name, plugin.src);
+                    var deferred;
+
+                    self.addPluginToToolbar(plugin.name, '|');
+
+                    if (!plugin.src) {
+                        return;
+                    }
+
+                    deferred = jQuery.Deferred();
+                    deferreds.push(deferred);
+
+                    require([plugin.src], function (factoryFn) {
+                        if (typeof factoryFn === 'function') {
+                            factoryFn(plugin.options);
+                        }
+
+                        tinyMCE4.PluginManager.load(plugin.name, plugin.src);
+                        deferred.resolve();
+                    });
                 });
             }
 
             if (jQuery.isReady) {
                 tinyMCE4.dom.Event.domLoaded = true;
             }
-            tinyMCE4.init(this.getSettings());
+
+            settings = this.getSettings();
+
+            if (mode === 'inline') {
+                settings.inline = true;
+
+                if (!isNaN(settings.toolbarZIndex)) {
+                    tinyMCE4.ui.FloatPanel.zIndex = settings.toolbarZIndex;
+                }
+
+                this.removeEvents(self.id);
+            }
+
+            jQuery.when.apply(jQuery, deferreds).done(function () {
+                tinyMCE4.init(settings);
+                this.getPluginButtons().hide();
+                this.eventBus.attachEventHandler('open_browser_callback', tinyMceEditors.get(self.id).openFileBrowser);
+            }.bind(this));
+        },
+
+        /**
+         * Remove events from instance.
+         *
+         * @param {String} wysiwygId
+         */
+        removeEvents: function (wysiwygId) {
+            var editor;
+
+            if (typeof tinyMceEditors !== 'undefined' && tinyMceEditors.get(wysiwygId)) {
+                editor = tinyMceEditors.get(wysiwygId);
+                varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
+            }
         },
 
         /**
@@ -101,25 +145,53 @@ define([
             var plugins = this.config.tinymce4.plugins.split(' '),
                 toolbar = this.config.tinymce4.toolbar.split(' ');
 
-            if (!plugins.includes(plugin)) {
+            if (plugins.indexOf(plugin) === -1) {
                 plugins.push(plugin);
             }
 
-            if (!toolbar.includes(plugin)) {
-                toolbar.push(separator ? separator : '', plugin);
+            if (toolbar.indexOf(plugin) === -1) {
+                toolbar.push(separator || '', plugin);
             }
+
             this.config.tinymce4.plugins = plugins.join(' ');
             this.config.tinymce4.toolbar = toolbar.join(' ');
         },
 
+        /**
+         * Set the status of the toolbar to disabled or enabled (true for enabled, false for disabled)
+         * @param {Boolean} enabled
+         */
+        setToolbarStatus: function (enabled) {
+            var controlIds = this.get(this.getId()).theme.panel.rootControl.controlIdLookup;
+
+            _.each(controlIds, function (controlId) {
+                controlId.disabled(!enabled);
+                controlId.canFocus = enabled;
+
+                if (controlId.tooltip) {
+                    controlId.tooltip().state.set('rendered', enabled);
+
+                    if (enabled) {
+                        jQuery(controlId.getEl()).children('button').andSelf().removeAttr('style');
+                    } else {
+                        jQuery(controlId.getEl()).children('button').andSelf().attr('style', 'color: inherit;' +
+                            'background-color: inherit;' +
+                            'border-color: transparent;'
+                        );
+                    }
+                }
+            });
+        },
+
         /**
          * @return {Object}
          */
         getSettings: function () {
-            var settings;
+            var settings,
+                eventBus = this.eventBus;
 
             settings = {
-                selector: 'textarea#' + this.id,
+                selector: '#' + this.getId(),
                 theme: 'modern',
                 'entity_encoding': 'raw',
                 'convert_urls': false,
@@ -138,22 +210,35 @@ define([
 
                     editor.on('BeforeSetContent', function (evt) {
                         varienGlobalEvents.fireEvent('tinymceBeforeSetContent', evt);
+                        eventBus.fireEvent(wysiwygEvents.beforeSetContent);
                     });
 
                     editor.on('SaveContent', function (evt) {
                         varienGlobalEvents.fireEvent('tinymceSaveContent', evt);
+                        eventBus.fireEvent(wysiwygEvents.afterSave);
                     });
 
                     editor.on('paste', function (evt) {
                         varienGlobalEvents.fireEvent('tinymcePaste', evt);
+                        eventBus.fireEvent(wysiwygEvents.afterPaste);
                     });
 
                     editor.on('PostProcess', function (evt) {
                         varienGlobalEvents.fireEvent('tinymceSaveContent', evt);
+                        eventBus.fireEvent(wysiwygEvents.afterSave);
                     });
 
                     editor.on('undo', function (evt) {
                         varienGlobalEvents.fireEvent('tinymceUndo', evt);
+                        eventBus.fireEvent(wysiwygEvents.afterUndo);
+                    });
+
+                    editor.on('focus', function () {
+                        eventBus.fireEvent(wysiwygEvents.afterFocus);
+                    });
+
+                    editor.on('blur', function () {
+                        eventBus.fireEvent(wysiwygEvents.afterBlur);
                     });
 
                     /**
@@ -161,6 +246,7 @@ define([
                      */
                     onChange = function (evt) {
                         varienGlobalEvents.fireEvent('tinymceChange', evt);
+                        eventBus.fireEvent(wysiwygEvents.afterChangeContent);
                     };
 
                     editor.on('Change', onChange);
@@ -169,13 +255,17 @@ define([
                     editor.on('ExecCommand', function (cmd) {
                         varienGlobalEvents.fireEvent('tinymceExecCommand', cmd);
                     });
+
+                    editor.on('init', function (args) {
+                        varienGlobalEvents.fireEvent('wysiwygEditorInitialized', args.target);
+                        eventBus.fireEvent(wysiwygEvents.afterInitialization);
+                    });
                 }
             };
 
             if (this.config.baseStaticUrl && this.config.baseStaticDefaultUrl) {
                 settings['document_base_url'] = this.config.baseStaticUrl;
             }
-
             // Set the document base URL
             if (this.config['document_base_url']) {
                 settings['document_base_url'] = this.config['document_base_url'];
@@ -189,16 +279,15 @@ define([
                  * @param {*} w
                  */
                 settings['file_browser_callback'] = function (fieldName, url, objectType, w) {
-                    varienGlobalEvents.fireEvent('open_browser_callback', {
+                    var payload = {
                         win: w,
                         type: objectType,
                         field: fieldName
-                    });
-                };
-            }
+                    };
 
-            if (this.config['widget_window_url']) {
-                settings['magentowidget_url'] = this.config['widget_window_url'];
+                    varienGlobalEvents.fireEvent('open_browser_callback', payload);
+                    this.eventBus.fireEvent('open_browser_callback', payload);
+                }.bind(this);
             }
 
             if (this.config.width) {
@@ -231,6 +320,13 @@ define([
             return tinyMCE4.get(id);
         },
 
+        /**
+         * @return {String|null}
+         */
+        getId: function () {
+            return this.id || (this.activeEditor() ? this.activeEditor().id : null) || tinyMceEditors.values()[0].id;
+        },
+
         /**
          * @return {Object}
          */
@@ -248,6 +344,15 @@ define([
             this.activeEditor().execCommand('mceInsertContent', typeof ui !== 'undefined' ? ui : false, content);
         },
 
+        /**
+         * Replace entire contents of wysiwyg with string content parameter
+         *
+         * @param {String} content
+         */
+        setContent: function (content) {
+            this.get(this.getId()).execCommand('mceSetContent', false, content);
+        },
+
         /**
          * Set caret location in WYSIWYG editor.
          *
@@ -266,7 +371,7 @@ define([
                 storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
                 frameDialog = jQuery('div.mce-container[role="dialog"]'),
                 wUrl = this.config['files_browser_window_url'] +
-                    'target_element_id/' + this.id + '/' +
+                    'target_element_id/' + this.getId() + '/' +
                     'store/' + storeId + '/';
 
             this.mediaBrowserOpener = o.win;
@@ -318,14 +423,14 @@ define([
          * @return {jQuery|*|HTMLElement}
          */
         getToggleButton: function () {
-            return $('toggle' + this.id);
+            return $('toggle' + this.getId());
         },
 
         /**
          * Get plugins button.
          */
         getPluginButtons: function () {
-            return $$('#buttons' + this.id + ' > button.plugin');
+            return jQuery('#buttons' + this.getId() + ' > button.plugin');
         },
 
         /**
@@ -337,11 +442,9 @@ define([
 
             this.setup(mode);
 
-            tinyMCE4.execCommand('mceAddControl', false, this.id);
+            this.getPluginButtons().hide();
 
-            this.getPluginButtons().each(function (e) {
-                e.hide();
-            });
+            tinyMCE4.execCommand('mceAddControl', false, this.getId());
 
             return this;
         },
@@ -361,11 +464,9 @@ define([
         turnOff: function () {
             this.closePopups();
 
-            tinyMCE4.execCommand('mceRemoveEditor', false, this.id);
+            this.getPluginButtons().show();
 
-            this.getPluginButtons().each(function (e) {
-                e.show();
-            });
+            tinyMCE4.execCommand('mceRemoveEditor', false, this.getId());
 
             return this;
         },
@@ -375,15 +476,15 @@ define([
          */
         closePopups: function () {
             // close all popups to avoid problems with updating parent content area
-            this.closeEditorPopup('widget_window' + this.id);
-            this.closeEditorPopup('browser_window' + this.id);
+            varienGlobalEvents.fireEvent('wysiwygClosePopups');
+            this.closeEditorPopup('browser_window' + this.getId());
         },
 
         /**
          * @return {Boolean}
          */
         toggle: function () {
-            if (!tinyMCE4.get(this.id)) {
+            if (!tinyMCE4.get(this.getId())) {
                 this.turnOn();
 
                 return true;
@@ -397,8 +498,8 @@ define([
          * On form validation.
          */
         onFormValidation: function () {
-            if (tinyMCE4.get(this.id)) {
-                $(this.id).value = tinyMCE4.get(this.id).getContent();
+            if (tinyMCE4.get(this.getId())) {
+                $(this.getId()).value = tinyMCE4.get(this.getId()).getContent();
             }
         },
 
@@ -440,7 +541,7 @@ define([
          * @return {String}
          */
         getContent: function (id) {
-            return id ? this.get(id).getContent() : this.activeEditor().getContent();
+            return id ? this.get(id).getContent() : this.get(this.getId()).getContent();
         },
 
         /**
@@ -476,10 +577,10 @@ define([
          * Update text area.
          */
         updateTextArea: function () {
-            var editor = tinyMCE4.get(this.id),
+            var editor = this.get(this.getId()),
                 content;
 
-            if (!editor) {
+            if (!editor || editor.id !== this.activeEditor().id) {
                 return;
             }
 
@@ -489,7 +590,33 @@ define([
             content = editor.getContent();
             content = this.decodeContent(content);
 
-            jQuery('#' + this.id).val(content).trigger('change');
+            this.getTextArea().val(content).trigger('change');
+        },
+
+        /**
+         * @return {Object} jQuery textarea element
+         */
+        getTextArea: function () {
+            return jQuery('#' + this.getId());
+        },
+
+        /**
+         * Set the status of the editor and toolbar
+         *
+         * @param {Boolean} enabled
+         */
+        setEnabledStatus: function (enabled) {
+            if (this.activeEditor()) {
+                this.activeEditor().getBody().setAttribute('contenteditable', enabled);
+                this.activeEditor().readonly = !enabled;
+                this.setToolbarStatus(enabled);
+            }
+
+            if (enabled) {
+                this.getTextArea().removeProp('disabled');
+            } else {
+                this.getTextArea().prop('disabled', 'disabled');
+            }
         },
 
         /**
@@ -498,108 +625,54 @@ define([
          * @param {String} directive
          */
         makeDirectiveUrl: function (directive) {
-            return this.config['directives_url'].replace('directive', 'directive/___directive/' + directive);
+            return this.config['directives_url']
+                .replace(/directive/, 'directive/___directive/' + directive)
+                .replace(/\/$/, '');
         },
 
         /**
+         * Convert {{directive}} style attributes syntax to absolute URLs
          * @param {Object} content
          * @return {*}
          */
         encodeDirectives: function (content) {
             // collect all HTML tags with attributes that contain directives
-            return content.gsub(/<([a-z0-9\-\_]+[^>]+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".*?)>/i, function (match) {
-                var attributesString = match[2];
+            return content.gsub(/<([a-z0-9\-\_]+[^>]+?)([a-z0-9\-\_]+="[^"]*?\{\{.+?\}\}.*?".*?)>/i, function (match) {
+                var attributesString = match[2],
+                    decodedDirectiveString;
 
                 // process tag attributes string
                 attributesString = attributesString.gsub(/([a-z0-9\-\_]+)="(.*?)(\{\{.+?\}\})(.*?)"/i, function (m) {
-                    return m[1] + '="' + m[2] + this.makeDirectiveUrl(Base64.mageEncode(m[3])) + m[4] + '"';
+                    decodedDirectiveString = encodeURIComponent(Base64.mageEncode(m[3].replace(/&quot;/g, '"')));
+
+                    return m[1] + '="' + m[2] + this.makeDirectiveUrl(decodedDirectiveString) + m[4] + '"';
                 }.bind(this));
 
                 return '<' + match[1] + attributesString + '>';
-
-            }.bind(this));
-        },
-
-        /**
-         * Convert {{widget}} style syntax to image placeholder HTML
-         * @param {Object} content
-         * @return {*}
-         */
-        encodeWidgets: function (content) {
-            return content.gsub(/\{\{widget(.*?)\}\}/i, function (match) {
-                var attributes = this.parseAttributesString(match[1]),
-                    imageSrc,
-                    imageHtml = '';
-
-                if (attributes.type) {
-                    attributes.type = attributes.type.replace(/\\\\/g, '\\');
-                    imageSrc = this.config['widget_placeholders'][attributes.type];
-
-                    if (this.config['widget_types'].indexOf(attributes['type_name']) > -1) {
-                        imageHtml += '<span class="magento-placeholder magento-widget mceNonEditable" ' +
-                            'contenteditable="false">';
-                    } else {
-                        imageSrc = this.config['widget_error_image_url'];
-                        imageHtml += '<span ' +
-                            'class="magento-placeholder magento-placeholder-error magento-widget mceNonEditable" ' +
-                            'contenteditable="false">';
-                    }
-
-                    imageHtml += '<img';
-                    imageHtml += ' id="' + Base64.idEncode(match[0]) + '"';
-                    imageHtml += ' src="' + imageSrc + '"';
-                    imageHtml += ' />';
-
-                    if (attributes['type_name']) {
-                        imageHtml += attributes['type_name'];
-                    }
-
-                    imageHtml += '</span>';
-
-                    return imageHtml;
-                }
             }.bind(this));
         },
 
         /**
+         * Convert absolute URLs to {{directive}} style attributes syntax
          * @param {Object} content
          * @return {*}
          */
         decodeDirectives: function (content) {
-            // escape special chars in directives url to use it in regular expression
-            var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
-                reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)'));
-
-            return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
-                return Base64.mageDecode(match[1]);
+            var directiveUrl = this.makeDirectiveUrl('%directive%').split('?')[0], // remove query string from directive
+                // escape special chars in directives url to use in regular expression
+                regexEscapedDirectiveUrl = directiveUrl.replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
+                regexDirectiveUrl = regexEscapedDirectiveUrl
+                    .replace(
+                        '%directive%',
+                        '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+\/?)(?:(?!").)*'
+                    ) + '/?(\\\\?[^"]*)?', // allow optional query string
+                reg = new RegExp(regexDirectiveUrl);
+
+            return content.gsub(reg, function (match) {
+                return Base64.mageDecode(decodeURIComponent(match[1]).replace(/\/$/, '')).replace(/"/g, '&quot;');
             });
         },
 
-        /**
-         * Convert image placeholder HTML to {{widget}} style syntax
-         * @param {Object} content
-         * @return {*}
-         */
-        decodeWidgets: function (content) {
-            return content.gsub(
-                /(<span class="[^"]*magento-widget[^"]*"[^>]*>)?<img([^>]+id="[^>]+)>(([^>]*)<\/span>)?/i,
-                function (match) {
-                    var attributes = this.parseAttributesString(match[2]),
-                        widgetCode;
-
-                    if (attributes.id) {
-                        widgetCode = Base64.idDecode(attributes.id);
-
-                        if (widgetCode.indexOf('{{widget') !== -1) {
-                            return widgetCode;
-                        }
-                    }
-
-                    return match[0];
-                }.bind(this)
-            );
-        },
-
         /**
          * @param {Object} attributes
          * @return {Object}
@@ -625,22 +698,13 @@ define([
          * @return {*}
          */
         decodeContent: function (content) {
-            var result = content;
-
-            if (this.config['add_widgets']) {
-                result = this.decodeWidgets(result);
-                result = this.decodeDirectives(result);
-            }
-
-            if (this.config['add_variables']) {
-                result = this.decodeVariables(result);
-            }
-
             if (this.config['add_directives']) {
-                result = this.decodeDirectives(result);
+                content = this.decodeDirectives(content);
             }
 
-            return result;
+            content = varienGlobalEvents.fireEventReducer('wysiwygDecodeContent', content);
+
+            return content;
         },
 
         /**
@@ -648,166 +712,20 @@ define([
          * @return {*}
          */
         encodeContent: function (content) {
-            var result = content;
-
-            if (this.config['add_widgets']) {
-                result = this.encodeWidgets(this.decodeWidgets(result));
-                result = this.removeDuplicateAncestorWidgetSpanElement(result);
-            }
-
-            if (this.config['add_variables']) {
-                result = this.encodeVariables(result);
-            }
-
             if (this.config['add_directives']) {
-                result = this.encodeDirectives(result);
+                content = this.encodeDirectives(content);
             }
 
-            return result;
-        },
-
-        /**
-         * Search by variables plugin and retrieve it
-         *
-         * @return {Object}
-         */
-        getVariablePluginData: function () {
-            return _.filter(this.config.plugins, function (plugin) {
-                return plugin.name === 'magentovariable';
-            })[0];
-        },
-
-        /**
-         * Encode variables in content
-         *
-         * @param {String} content
-         * @returns {*}
-         */
-        encodeVariables: function (content) {
-            content = content.gsub(/\{\{config path=\"([^\"]+)\"\}\}/i, function (match) {
-
-                var path = match[1],
-                    magentoVariables,
-                    imageHtml;
-
-                magentoVariables = JSON.parse(this.config['variable_placeholders']);
-
-                if (magentoVariables[match[1]] && magentoVariables[match[1]]['variable_type'] === 'default') {
-                    imageHtml = '<span id="%id" class="magento-variable magento-placeholder mceNonEditable">%s</span>';
-                    imageHtml = imageHtml.replace('%s', magentoVariables[match[1]]['variable_name']);
-                } else {
-                    imageHtml = '<span id="%id" class="' +
-                        'magento-variable magento-placeholder magento-placeholder-error ' +
-                        'mceNonEditable' +
-                        '">' +
-                        'Not found' +
-                        '</span>';
-                }
-
-                return imageHtml.replace('%id', Base64.idEncode(path));
-            }.bind(this));
-
-            content = content.gsub(/\{\{customVar code=([^\}\"]+)\}\}/i, function (match) {
-                var path = match[1],
-                    magentoVariables,
-                    imageHtml;
-
-                magentoVariables = JSON.parse(this.config['variable_placeholders']);
-
-                if (magentoVariables[match[1]] && magentoVariables[match[1]]['variable_type'] === 'custom') {
-                    imageHtml = '<span id="%id" class="magento-variable magento-custom-var magento-placeholder ' +
-                        'mceNonEditable">%s</span>';
-                    imageHtml = imageHtml.replace('%s', magentoVariables[match[1]]['variable_name']);
-                } else {
-                    imageHtml = '<span id="%id" class="' +
-                        'magento-variable magento-custom-var magento-placeholder ' +
-                        'magento-placeholder-error mceNonEditable' +
-                        '">' +
-                        match[1]  +
-                        '</span>';
-                }
-
-                return imageHtml.replace('%id', Base64.idEncode(path));
-            }.bind(this));
+            content = varienGlobalEvents.fireEventReducer('wysiwygEncodeContent', content);
 
             return content;
         },
 
         /**
-         * Decode variables in content.
-         *
-         * @param {String} content
-         * @returns {*}
-         */
-        decodeVariables: function (content) {
-            var i, el, spans, element = document.createElement('elem');
-
-            element.innerHTML = content;
-            spans = element.querySelectorAll('span.magento-variable');
-
-            for (i = 0; i < spans.length; i++) {
-                el = spans[i];
-
-                if (el.hasClassName('magento-custom-var')) {
-                    $(el).replaceWith(
-                        customDirectiveGenerator.processConfig(
-                            Base64.idDecode(
-                                $(el).getAttribute('id')
-                            )
-                        )
-                    );
-                } else {
-                    $(el).replaceWith(
-                        configDirectiveGenerator.processConfig(
-                            Base64.idDecode(
-                                $(el).getAttribute('id')
-                            )
-                        )
-                    );
-                }
-
-            }
-
-            return element.innerHTML;
-        },
-
-        /**
-         * Ensures the widget placeholder is not editable
+         * Reinstate contenteditable attributes on .mceNonEditable nodes
          */
         addContentEditableAttributeBackToNonEditableNodes: function () {
             jQuery('.mceNonEditable', this.activeEditor().getDoc()).attr('contenteditable', false);
-        },
-
-        /**
-         * Tinymce has strange behavior with html and this removes one of its side-effects
-         * @param {Object} content
-         * @returns string
-         */
-        removeDuplicateAncestorWidgetSpanElement: function (content) {
-            var parser, doc;
-
-            if (!window.DOMParser) {
-                return content;
-            }
-
-            parser = new DOMParser();
-            doc = parser.parseFromString(content, 'text/html');
-
-            [].forEach.call(doc.querySelectorAll('.magento-widget'), function (widgetEl) {
-                var widgetChildEl = widgetEl.querySelector('.magento-widget');
-
-                if (!widgetChildEl) {
-                    return;
-                }
-
-                [].forEach.call(widgetEl.childNodes, function (el) {
-                    widgetEl.parentNode.insertBefore(el, widgetEl);
-                });
-
-                widgetEl.parentNode.removeChild(widgetEl);
-            });
-
-            return doc.body.innerHTML;
         }
     };
 
diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js
index 00ad285702857..68206fdec6201 100644
--- a/lib/web/mage/adminhtml/wysiwyg/widget.js
+++ b/lib/web/mage/adminhtml/wysiwyg/widget.js
@@ -275,7 +275,12 @@ define([
             }
 
             if (e != undefined && e.id) { //eslint-disable-line eqeqeq
-                widgetCode = Base64.idDecode(e.id);
+                // attempt to Base64-decode id on selected node; exception is thrown if it is in fact not a widget node
+                try {
+                    widgetCode = Base64.idDecode(e.id);
+                } catch (ex) {
+                    return false;
+                }
 
                 if (widgetCode.indexOf('{{widget') !== -1) {
                     this.optionValues = new Hash({});
@@ -488,7 +493,7 @@ define([
             var textarea;
 
             if (this.wysiwygExists()) {
-                this.getWysiwyg().execCommand('mceInsertContent', false, content);
+                wysiwyg.insertContent(content, false);
             } else {
                 textarea = document.getElementById(this.widgetTargetId);
                 updateElementAtCursor(textarea, content);
diff --git a/lib/web/mage/apply/main.js b/lib/web/mage/apply/main.js
index 105629ec33eff..21255fbeb34d1 100644
--- a/lib/web/mage/apply/main.js
+++ b/lib/web/mage/apply/main.js
@@ -32,6 +32,12 @@ define([
             } else if ($(el)[component]) {
                 $(el)[component](config);
             }
+        }, function (error) {
+            if ('console' in window && typeof window.console.error === 'function') {
+                console.error(error);
+            }
+
+            return true;
         });
     }
 
diff --git a/lib/web/mage/apply/scripts.js b/lib/web/mage/apply/scripts.js
index f35e9a2140e67..bf211c38adba5 100644
--- a/lib/web/mage/apply/scripts.js
+++ b/lib/web/mage/apply/scripts.js
@@ -14,7 +14,7 @@ define([
         virtuals = [];
 
     /**
-     * Adds components to the virtula list.
+     * Adds components to the virtual list.
      *
      * @param {Object} components
      */
diff --git a/lib/web/mage/backend/suggest.js b/lib/web/mage/backend/suggest.js
index 81bde35f9e12a..d34be10420912 100644
--- a/lib/web/mage/backend/suggest.js
+++ b/lib/web/mage/backend/suggest.js
@@ -65,7 +65,8 @@
             inputWrapper: '<div class="mage-suggest"><div class="mage-suggest-inner"></div></div>',
             dropdownWrapper: '<div class="mage-suggest-dropdown"></div>',
             preventClickPropagation: true,
-            currentlySelected: null
+            currentlySelected: null,
+            submitInputOnEnter: true
         },
 
         /**
@@ -79,7 +80,6 @@
                 label: ''
             };
             this.templates = {};
-
             this._renderedContext = null;
             this._selectedItem = this._nonSelectedItem;
             this._control = this.options.controls || {};
@@ -245,6 +245,7 @@
 
                         case keyCode.ENTER:
                         case keyCode.NUMPAD_ENTER:
+                            this._toggleEnter(event);
 
                             if (this.isDropdownShown() && this._focused) {
                                 this._proxyEvents(event);
@@ -311,9 +312,48 @@
                 click: this.search
             }, this.options.events));
 
+            this._bindSubmit();
             this._bindDropdown();
         },
 
+        /**
+         * @param {Object} event
+         * @private
+         */
+        _toggleEnter: function (event) {
+            var suggestList,
+                activeItems,
+                selectedItem;
+
+            if (!this.options.submitInputOnEnter) {
+                event.preventDefault();
+            }
+
+            suggestList = $(event.currentTarget.parentNode).find('ul').first();
+            activeItems = suggestList.find('._active');
+
+            if (activeItems.length >= 0) {
+                selectedItem = activeItems.first();
+
+                if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) {
+                    window.location = selectedItem.find('a').attr('href');
+                    event.preventDefault();
+                }
+            }
+        },
+
+        /**
+         * Bind handlers for submit on enter
+         * @private
+         */
+        _bindSubmit: function () {
+            this.element.parents('form').on('submit', function (event) {
+                if (!this.submitInputOnEnter) {
+                    event.preventDefault();
+                }
+            });
+        },
+
         /**
          * @param {Object} e - event object
          * @private
@@ -440,8 +480,8 @@
             }
 
             if (this._trigger('beforeselect', e || null, {
-                item: this._focused
-            }) === false) {
+                    item: this._focused
+                }) === false) {
                 return;
             }
             this._selectItem(e);
@@ -676,9 +716,6 @@
             if ($.isArray(o.source)) {
                 response(this.filter(o.source, term));
             } else if ($.type(o.source) === 'string') {
-                if (this._xhr) {
-                    this._xhr.abort();
-                }
                 ajaxData = {};
                 ajaxData[this.options.termAjaxArgument] = term;
 
@@ -704,10 +741,6 @@
         _abortSearch: function () {
             this.element.removeClass(this.options.loadingClass);
             clearTimeout(this._searchTimeout);
-
-            if (this._xhr) {
-                this._xhr.abort();
-            }
         },
 
         /**
@@ -880,8 +913,8 @@
                 '<li class="mage-suggest-search-field" data-role="parent-choice-element"><' +
                 'label class="mage-suggest-search-label"></label></li></ul>',
             choiceTemplate: '<li class="mage-suggest-choice button"><div><%- text %></div>' +
-                '<span class="mage-suggest-choice-close" tabindex="-1" ' +
-                'data-mage-init=\'{"actionLink":{"event":"removeOption"}}\'></span></li>',
+            '<span class="mage-suggest-choice-close" tabindex="-1" ' +
+            'data-mage-init=\'{"actionLink":{"event":"removeOption"}}\'></span></li>',
             selectedClass: 'mage-suggest-selected'
         },
 
diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
index d3ab7dd086a43..1043f45a7402e 100644
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -171,6 +171,7 @@
                 this._submit();
             } else {
                 this._showErrors(response);
+                $(this.element[0]).trigger('afterValidate.error');
                 $('body').trigger('processStop');
             }
         },
@@ -223,6 +224,7 @@
          * @protected
          */
         _onError: function () {
+            $(this.element[0]).trigger('afterValidate.error');
             $('body').trigger('processStop');
 
             if (this.options.errorUrl) {
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index 51ee9b3a8891a..ac154b333801d 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -236,12 +236,14 @@
                 firstDay = parseInt(this._get(inst, 'firstDay'), 10);
                 firstDay = isNaN(firstDay) ? 0 : firstDay;
 
-                for (row; row < numMonths[0]; row++) {
+                for (row = 0; row < numMonths[0]; row++) {
                     this.maxRows = 4;
 
-                    for (col; col < numMonths[1]; col++) {
+                    for (col = 0; col < numMonths[1]; col++) {
                         selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
 
+                        calender = '';
+
                         if (isMultiMonth) {
                             calender += '<div class="ui-datepicker-group';
 
@@ -271,7 +273,7 @@
                         thead = showWeek ?
                             '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '';
 
-                        for (dow; dow < 7; dow++) { // days of the week
+                        for (dow = 0; dow < 7; dow++) { // days of the week
                             day = (dow + firstDay) % 7;
                             thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ?
                                 ' class="ui-datepicker-week-end"' : '') + '>' +
@@ -289,7 +291,7 @@
                         this.maxRows = numRows;
                         printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
 
-                        for (dRow; dRow < numRows; dRow++) { // create date picker rows
+                        for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
                             calender += '<tr>';
                             tbody = !showWeek ? '' : '<td class="ui-datepicker-week-col">' +
                             this._get(inst, 'calculateWeek')(printDate) + '</td>';
diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
index 0d8cf836c198e..3d283d102e323 100644
--- a/lib/web/mage/collapsible.js
+++ b/lib/web/mage/collapsible.js
@@ -63,6 +63,12 @@ define([
                 this.icons = true;
             }
 
+            this.element.on('dimensionsChanged', function (e) {
+                if (e.target && e.target.classList.contains('active')) {
+                    this._scrollToTopIfVisible(e.target);
+                }
+            }.bind(this));
+
             this._bind('click');
             this._trigger('created');
         },
@@ -110,7 +116,7 @@ define([
         _processState: function () {
             var anchor = window.location.hash,
                 isValid = $.mage.isValidSelector(anchor),
-                urlPath = window.location.pathname.replace('.', ''),
+                urlPath = window.location.pathname.replace(/\./g, ''),
                 state;
 
             this.stateKey = encodeURIComponent(urlPath + this.element.attr('id'));
@@ -243,7 +249,7 @@ define([
                 });
 
             // For collapsible widget only (not tabs or accordion)
-            if (this.header.parent().attr('role') != 'presentation') { //eslint-disable-line eqeqeq
+            if (this.header.parent().attr('role') !== 'presentation') {
                 this.header
                     .parent()
                     .attr('role', 'tablist');
@@ -316,9 +322,9 @@ define([
          * Disable.
          */
         disable: function () {
+            this.options.disabled = true;
             this._off(this.trigger);
             this.forceDeactivate();
-            this.options.disabled = true;
 
             if (this.options.disabledState) {
                 this.element.addClass(this.options.disabledState);
@@ -330,12 +336,14 @@ define([
          * Enable.
          */
         enable: function () {
-            this._on(this.trigger, this.events);
             this.options.disabled = false;
+            this._on(this.trigger, this.events);
+            this.forceActivate();
 
             if (this.options.disabledState) {
                 this.element.removeClass(this.options.disabledState);
             }
+            this.trigger.attr('tabIndex', 0);
         },
 
         /**
@@ -440,16 +448,20 @@ define([
 
         /**
          * Activate.
+         *
+         * @return void;
          */
         activate: function () {
-            if (!this.options.disabled) {
-                if (this.options.animate) {
-                    this._animate(showProps);
-                } else {
-                    this.content.show();
-                }
-                this._open();
+            if (this.options.disabled) {
+                return;
+            }
+
+            if (this.options.animate) {
+                this._animate(showProps);
+            } else {
+                this.content.show();
             }
+            this._open();
         },
 
         /**
@@ -517,7 +529,7 @@ define([
                 that = this;
 
             if (url) {
-                this.xhr = $.get({
+                that.xhr = $.get({
                     url: url,
                     dataType: 'html'
                 }, function () {
@@ -529,11 +541,12 @@ define([
                     that.element.addClass(that.options.loadingClass);
                 }
                 that.content.attr('aria-busy', 'true');
-                that.xhr.success(function (response) {
+                that.xhr.done(function (response) {
                     setTimeout(function () {
                         that.content.html(response);
                     }, 1);
-                }).complete(function (jqXHR, status) {
+                });
+                that.xhr.always(function (jqXHR, status) {
                     setTimeout(function () {
                         if (status === 'abort') {
                             that.content.stop(false, true);
@@ -550,6 +563,27 @@ define([
                     }, 1);
                 });
             }
+        },
+
+        /**
+         * @param {HTMLElement} elem
+         * @private
+         */
+        _scrollToTopIfVisible: function (elem) {
+            if (this._isElementOutOfViewport(elem)) {
+                elem.scrollIntoView();
+            }
+        },
+
+        /**
+         * @param {HTMLElement} elem
+         * @private
+         * @return {Boolean}
+         */
+        _isElementOutOfViewport: function (elem) {
+            var rect = elem.getBoundingClientRect();
+
+            return rect.bottom < 0 || rect.right < 0 || rect.left > window.innerWidth || rect.top > window.innerHeight;
         }
     });
 
diff --git a/lib/web/mage/common.js b/lib/web/mage/common.js
index a333277d9e3cd..01f696ec1b7fc 100644
--- a/lib/web/mage/common.js
+++ b/lib/web/mage/common.js
@@ -11,4 +11,24 @@ define([
 
     /* Form with auto submit feature */
     $('form[data-auto-submit="true"]').submit();
+
+    //Add form keys.
+    $(document).on(
+        'submit',
+        'form',
+        function (e) {
+            var formKeyElement,
+                form = $(e.target),
+                formKey = $('input[name="form_key"]').val();
+
+            if (formKey && !form.find('input[name="form_key"]').length && form[0].method !== 'get') {
+                formKeyElement = document.createElement('input');
+                formKeyElement.setAttribute('type', 'hidden');
+                formKeyElement.setAttribute('name', 'form_key');
+                formKeyElement.setAttribute('value', formKey);
+                formKeyElement.setAttribute('auto-added-form-key', '1');
+                form.get(0).appendChild(formKeyElement);
+            }
+        }
+    );
 });
diff --git a/lib/web/mage/dropdowns.js b/lib/web/mage/dropdowns.js
index 6c1389924a24b..1496a1c65d957 100644
--- a/lib/web/mage/dropdowns.js
+++ b/lib/web/mage/dropdowns.js
@@ -127,11 +127,9 @@ define([
             }
 
             elem.on('click.toggleDropdown', function () {
-                var el;
+                var el = actionElem;
 
                 if (options.autoclose === true) {
-                    el = actionElem;
-
                     actionElem = $();
                     $(document).trigger('click.hideDropdown');
                     actionElem = el;
diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index db98a1cc39a30..15c3d01cf2be3 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -472,8 +472,18 @@ define([
                      * @param {Array.<Object>} data - Set of gallery items to update.
                      */
                     updateData: function (data) {
+                        var mainImageIndex;
+
                         if (_.isArray(data)) {
                             settings.fotoramaApi.load(data);
+                            mainImageIndex = getMainImageIndex(data);
+
+                            if (mainImageIndex) {
+                                settings.fotoramaApi.show({
+                                    index: mainImageIndex,
+                                    time: 0
+                                });
+                            }
 
                             $.extend(false, settings, {
                                 data: data,
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index 24a5a2b4033d3..373708ac35a00 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -7,7 +7,6 @@
 @import '../../css/source/lib/_lib.less'; // Global lib
 @import '../../css/source/_theme.less'; // Theme overrides
 @import '../../css/source/_variables.less'; // Local theme variables
-@import '../../css/source/lib/_responsive.less';
 @import 'module/_mixins.less'; //Mixins in gallery
 @import 'module/_extends.less';
 @import 'module/_focus.less';
@@ -182,8 +181,8 @@
 
 .fotorama__active {
     .fotorama__dot {
-        background-color: @color-orange-red1;
-        border-color: @color-orange-red1;
+        background-color: @active__color;
+        border-color: @active__color;
     }
 }
 
@@ -238,7 +237,7 @@
     &:extend(.fotorama-print-background);
     backface-visibility: hidden;
     background-image: linear-gradient(to bottom right, rgba(255, 255, 255, 0.25), rgba(64, 64, 64, 0.1));
-    border: 1px solid @color-orange-red1;
+    border: 1px solid @active__color;
     left: 0;
     position: absolute;
     top: 0;
@@ -401,10 +400,6 @@
         .fotorama-abs-center();
         height: @size-fotorama-block;
         width: @size-fotorama-block;
-
-        .ie9 & {
-            margin: (-@size-fotorama-block/2) 0 0 (-@size-fotorama-block/2);
-        }
     }
 }
 
@@ -736,24 +731,30 @@
     text-align: center;
     top: 0;
     z-index: @z-index-10;
+    overflow: hidden;
+
+    .magnifier-large {
+        width: auto;
+        height: auto;
+        max-height: none;
+        max-width: none;
+        border: none;
+        position: absolute;
+        z-index: @z-index-1;
+    }
 }
 
 .magnifier-loader-text {
     margin-top: 10px;
 }
 
-.magnifier-large {
-    position: absolute;
-    width: 32%;
-    z-index: @z-index-1;
-}
-
 .magnifier-preview {
     bottom: 0;
     left: 58%;
     overflow: hidden;
     padding: 0;
     position: absolute;
+    z-index: 2;
     top: 215px;
     &:not(.hidden) {
         background-color: @color-white;
@@ -763,6 +764,7 @@
         max-width: inherit;
         position: absolute;
         top: 0;
+        object-fit: scale-down;
     }
 }
 
@@ -868,10 +870,6 @@
         .fotorama__thumb--icon {
             .fotorama-abs-center();
             width: 100%;
-
-            .ie9 & {
-                margin: (-@fotorama-thumb-arrow/2) 0 0 (-@fotorama-thumb-arrow/2);
-            }
         }
     }
     .fotorama__thumb__arr--left {
diff --git a/lib/web/mage/gallery/module/_extends.less b/lib/web/mage/gallery/module/_extends.less
index cfcec77603409..ab38cf40f63d9 100644
--- a/lib/web/mage/gallery/module/_extends.less
+++ b/lib/web/mage/gallery/module/_extends.less
@@ -42,7 +42,7 @@
 .fotorama-focus-overlay {
     &:after {
         &:extend(.fotorama-stretch);
-        background-color: @color-blue2;
+        background-color: @theme__color__primary-alt;
         border-radius: inherit;
         content: '';
     }
diff --git a/lib/web/mage/ie-class-fixer.js b/lib/web/mage/ie-class-fixer.js
index 6e89c0779f1a0..683090b1d1386 100644
--- a/lib/web/mage/ie-class-fixer.js
+++ b/lib/web/mage/ie-class-fixer.js
@@ -7,19 +7,12 @@
 (function () {
     var userAgent = navigator.userAgent, // user agent identifier
         html = document.documentElement, // html tag
-        version = 9, // minimal supported version of IE
         gap = ''; // gap between classes
 
     if (html.className) { // check if neighbour class exist in html tag
         gap = ' ';
     } // end if
 
-    for (version; version <= 10; version++) { // loop from minimal to 10 version of IE
-        if (userAgent.indexOf('MSIE ' + version) > -1) { // match IE individual name
-            html.className += gap + 'ie' + version;
-        } // end if
-    }
-
     if (userAgent.match(/Trident.*rv[ :]*11\./)) { // Special case for IE11
         html.className += gap + 'ie11';
     } // end if
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index a59ebbaf8badc..70501e5cac0c6 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -21,6 +21,7 @@ define([
             expanded: false,
             showDelay: 42,
             hideDelay: 300,
+            delay: 0,
             mediaBreakpoint: '(max-width: 768px)'
         },
 
@@ -30,6 +31,8 @@ define([
         _create: function () {
             var self = this;
 
+            this.delay = this.options.delay;
+
             this._super();
             $(window).on('resize', function () {
                 self.element.find('.submenu-reverse').removeClass('submenu-reverse');
@@ -82,12 +85,10 @@ define([
             var controls = this.controls,
                 toggle = this.toggle;
 
-            this._on(controls.toggleBtn, {
-                'click': toggle
-            });
-            this._on(controls.swipeArea, {
-                'swipeleft': toggle
-            });
+            controls.toggleBtn.off('click');
+            controls.toggleBtn.on('click', toggle.bind(this));
+            controls.swipeArea.off('swipeleft');
+            controls.swipeArea.on('swipeleft', toggle.bind(this));
         },
 
         /**
@@ -438,6 +439,7 @@ define([
 
                     event.preventDefault();
                     target = $(event.target).closest('.ui-menu-item');
+                    target.get(0).scrollIntoView();
 
                     if (!target.hasClass('level-top') || !target.has('.ui-menu').length) {
                         window.location.href = target.find('> a').attr('href');
@@ -586,7 +588,7 @@ define([
                 html.removeClass('nav-open');
                 setTimeout(function () {
                     html.removeClass('nav-before-open');
-                }, 300);
+                }, this.options.hideDelay);
             }
         },
 
@@ -626,6 +628,9 @@ define([
                     return;
                 }
 
+                // remove the active state class from the siblings
+                this.active.siblings().children('.ui-state-active').removeClass('ui-state-active');
+
                 this._open(newItem.parent());
 
                 // Delay so Firefox will not hide activedescendant change in expanding submenu from AT
diff --git a/lib/web/mage/polyfill.js b/lib/web/mage/polyfill.js
new file mode 100644
index 0000000000000..94232b29404fa
--- /dev/null
+++ b/lib/web/mage/polyfill.js
@@ -0,0 +1,176 @@
+try {
+    if (!window.localStorage || !window.sessionStorage) {
+        throw new Error();
+    }
+
+    localStorage.setItem('storage_test', 1);
+    localStorage.removeItem('storage_test');
+} catch (e) {
+    (function () {
+        'use strict';
+
+        /**
+         * Returns a storage object to shim local or sessionStorage
+         * @param {String} type - either 'local' or 'session'
+         */
+        var Storage = function (type) {
+            var data;
+
+            /**
+             * Creates a cookie
+             * @param {String} name
+             * @param {String} value
+             * @param {Integer} days
+             */
+            function createCookie(name, value, days) {
+                var date, expires;
+
+                if (days) {
+                    date = new Date();
+                    date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
+                    expires = '; expires=' + date.toGMTString();
+                } else {
+                    expires = '';
+                }
+                document.cookie = name + '=' + value + expires + '; path=/';
+            }
+
+            /**
+             * Reads value of a cookie
+             * @param {String} name
+             */
+            function readCookie(name) {
+                var nameEQ = name + '=',
+                    ca = document.cookie.split(';'),
+                    i = 0,
+                    c;
+
+                for (i = 0; i < ca.length; i++) {
+                    c = ca[i];
+
+                    while (c.charAt(0) === ' ') {
+                        c = c.substring(1, c.length);
+                    }
+
+                    if (c.indexOf(nameEQ) === 0) {
+                        return c.substring(nameEQ.length, c.length);
+                    }
+                }
+
+                return null;
+            }
+
+            /**
+             * Returns cookie name based upon the storage type.
+             * If this is session storage, the function returns a unique cookie per tab
+             */
+            function getCookieName() {
+
+                if (type !== 'session') {
+                    return 'localstorage';
+                }
+
+                if (!window.name) {
+                    window.name = new Date().getTime();
+                }
+
+                return 'sessionStorage' + window.name;
+            }
+
+            /**
+             * Sets storage cookie to a data object
+             * @param {Object} dataObject
+             */
+            function setData(dataObject) {
+                data = encodeURIComponent(JSON.stringify(dataObject));
+                createCookie(getCookieName(), data, 365);
+            }
+
+            /**
+             * Clears value of cookie data
+             */
+            function clearData() {
+                createCookie(getCookieName(), '', 365);
+            }
+
+            /**
+             * @returns value of cookie data
+             */
+            function getData() {
+                var dataResponse = readCookie(getCookieName());
+
+                return dataResponse ? JSON.parse(decodeURIComponent(dataResponse)) : {};
+            }
+
+            data = getData();
+
+            return {
+                length: 0,
+
+                /**
+                 * Clears data from storage
+                 */
+                clear: function () {
+                    data = {};
+                    this.length = 0;
+                    clearData();
+                },
+
+                /**
+                 * Gets an item from storage
+                 * @param {String} key
+                 */
+                getItem: function (key) {
+                    return data[key] === undefined ? null : data[key];
+                },
+
+                /**
+                 * Gets an item by index from storage
+                 * @param {Integer} i
+                 */
+                key: function (i) {
+                    var ctr = 0,
+                        k;
+
+                    for (k in data) {
+
+                        if (data.hasOwnProperty(k)) {
+
+                            // eslint-disable-next-line max-depth
+                            if (ctr.toString() === i.toString()) {
+                                return k;
+                            }
+                            ctr++;
+                        }
+                    }
+
+                    return null;
+                },
+
+                /**
+                 * Removes an item from storage
+                 * @param {String} key
+                 */
+                removeItem: function (key) {
+                    delete data[key];
+                    this.length--;
+                    setData(data);
+                },
+
+                /**
+                 * Sets an item from storage
+                 * @param {String} key
+                 * @param {String} value
+                 */
+                setItem: function (key, value) {
+                    data[key] = value.toString();
+                    this.length++;
+                    setData(data);
+                }
+            };
+        };
+
+        window.localStorage.prototype = window.localStorage = new Storage('local');
+        window.sessionStorage.prototype = window.sessionStorage = new Storage('session');
+    })();
+}
diff --git a/lib/web/mage/popup-window.js b/lib/web/mage/popup-window.js
index de150b1b9b0a4..37c3b27a45108 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/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
index f3d4b79216adb..5ba1f1351bcf6 100644
--- a/lib/web/mage/requirejs/resolver.js
+++ b/lib/web/mage/requirejs/resolver.js
@@ -8,11 +8,11 @@ define([
 ], function (_) {
     'use strict';
 
-    var context     = require.s.contexts._,
-        execCb      = context.execCb,
-        registry    = context.registry,
-        callbacks   = [],
-        retries     = 10,
+    var context = require.s.contexts._,
+        execCb = context.execCb,
+        registry = context.registry,
+        callbacks = [],
+        retries = 10,
         updateDelay = 1,
         ready,
         update;
@@ -27,6 +27,16 @@ define([
         return !!_.findWhere(callbacks, callback);
     }
 
+    /**
+     * Checks if provided module is rejected during load.
+     *
+     * @param {Object} module - Module to be checked.
+     * @return {Boolean}
+     */
+    function isRejected(module) {
+        return registry[module.id] && (registry[module.id].inited || registry[module.id].error);
+    }
+
     /**
      * Checks if provided module has unresolved dependencies.
      *
@@ -34,7 +44,11 @@ define([
      * @returns {Boolean}
      */
     function isPending(module) {
-        return !!module.depCount;
+        if (!module.depCount) {
+            return false;
+        }
+
+        return module.depCount > _.filter(module.depMaps, isRejected).length;
     }
 
     /**
diff --git a/lib/web/mage/requirejs/static.js b/lib/web/mage/requirejs/static.js
index 237aa0c6a8a63..898850cb2948b 100644
--- a/lib/web/mage/requirejs/static.js
+++ b/lib/web/mage/requirejs/static.js
@@ -13,7 +13,7 @@ define('buildTools', [
         isEnabled: storage.getItem(storeName) === null,
 
         /**
-         * Removes base url from the the provided string
+         * Removes base url from the provided string
          *
          * @param {String} url - Url to be processed.
          * @param {Object} config - RequiereJs config object.
diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
index e7e04a26b29c1..b441477ab8d8a 100644
--- a/lib/web/mage/tabs.js
+++ b/lib/web/mage/tabs.js
@@ -83,7 +83,7 @@ define([
 
         /**
          * When the widget gets instantiated, the first tab that is not disabled receive focusable property
-         * Updated: for accessibility all tabs receive tabIndex 0
+         * All tabs receive tabIndex 0
          * @private
          */
         _processTabIndex: function () {
@@ -91,17 +91,8 @@ define([
 
             self.triggers.attr('tabIndex', 0);
             $.each(this.collapsibles, function (i) {
-                if (!$(this).collapsible('option', 'disabled')) {
-                    self.triggers.eq(i).attr('tabIndex', 0);
-
-                    return false;
-                }
-            });
-            $.each(this.collapsibles, function (i) {
-                $(this).on('beforeOpen', function () {
-                    self.triggers.attr('tabIndex', 0);
-                    self.triggers.eq(i).attr('tabIndex', 0);
-                });
+                self.triggers.attr('tabIndex', 0);
+                self.triggers.eq(i).attr('tabIndex', 0);
             });
         },
 
diff --git a/lib/web/mage/translate-init.js b/lib/web/mage/translate-init.js
new file mode 100644
index 0000000000000..1b9defad5e397
--- /dev/null
+++ b/lib/web/mage/translate-init.js
@@ -0,0 +1,49 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/translate',
+    'jquery/jquery-storageapi'
+], function ($) {
+    'use strict';
+
+    return function (pageOptions) {
+        var dependencies = [],
+            versionObj;
+
+        $.initNamespaceStorage('mage-translation-storage');
+        $.initNamespaceStorage('mage-translation-file-version');
+        versionObj = $.localStorage.get('mage-translation-file-version');
+
+        if (versionObj.version !== pageOptions.version) {
+            dependencies.push(
+              pageOptions.dictionaryFile
+            );
+        }
+
+        require.config({
+            deps: dependencies,
+
+            /**
+             * @param {String} string
+             */
+            callback: function (string) {
+                if (typeof string === 'string') {
+                    $.mage.translate.add(JSON.parse(string));
+                    $.localStorage.set('mage-translation-storage', string);
+                    $.localStorage.set(
+                        'mage-translation-file-version',
+                        {
+                            version: pageOptions.version
+                        }
+                    );
+                } else {
+                    $.mage.translate.add($.localStorage.get('mage-translation-storage'));
+                }
+            }
+        });
+    };
+});
diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index bc3a190a9f712..141af6e141c39 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -200,32 +200,5 @@
         }
     });
 
-    $.widget('ui.button', $.ui.button, {
-        /**
-         * @private
-         */
-        _create: function () {
-            this._super();
-            // Decode HTML entities to prevent incorrect rendering of dialog button label
-            this.options.label = this.options.label ?
-                jQuery('<div/>').html(this.options.label).text() : this.options.label;
-            //Reset button to make decoded label visible
-            this._resetButton();
-        }
-    });
-
-    $.widget('ui.dialog', $.ui.dialog, {
-        /**
-         * Prevent rendering of dialog title as escaped HTML
-         */
-        _title: function (title) {
-            this._super(title);
-
-            if (this.options.title) {
-                title.html(this.options.title);
-            }
-        }
-    });
-
     return $.mage.translateInline;
 }));
diff --git a/lib/web/mage/trim-input.js b/lib/web/mage/trim-input.js
new file mode 100644
index 0000000000000..678192dcf61ac
--- /dev/null
+++ b/lib/web/mage/trim-input.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.trimInput', {
+        options: {
+            cache: {}
+        },
+
+        /**
+         * Widget initialization
+         * @private
+         */
+        _create: function () {
+            this.options.cache.input = $(this.element);
+            this._bind();
+        },
+
+        /**
+         * Event binding, will monitor change, keyup and paste events.
+         * @private
+         */
+        _bind: function () {
+            if (this.options.cache.input.length) {
+                this._on(this.options.cache.input, {
+                    'change': this._trimInput,
+                    'keyup': this._trimInput,
+                    'paste': this._trimInput
+                });
+            }
+        },
+
+        /**
+         * Trim value
+         * @private
+         */
+        _trimInput: function () {
+            var input = this._getInputValue().trim();
+
+            this.options.cache.input.val(input);
+        },
+
+        /**
+         * Get input value
+         * @returns {*}
+         * @private
+         */
+        _getInputValue: function () {
+            return this.options.cache.input.val();
+        }
+    });
+
+    return $.mage.trimInput;
+});
diff --git a/lib/web/mage/utils/misc.js b/lib/web/mage/utils/misc.js
index e86cec82ef990..801bd59d095a4 100644
--- a/lib/web/mage/utils/misc.js
+++ b/lib/web/mage/utils/misc.js
@@ -242,6 +242,26 @@ define([
             return data;
         },
 
+        /**
+         * Replaces symbol codes with their unescaped counterparts.
+         *
+         * @param {String} data
+         *
+         * @returns {String}
+         */
+        unescape: function (data) {
+            var unescaped = _.unescape(data),
+                mapCharacters = {
+                    '&#039;': '\''
+                };
+
+            _.each(mapCharacters, function (value, key) {
+                unescaped = unescaped.replace(key, value);
+            });
+
+            return unescaped;
+        },
+
         /**
          * Converts PHP IntlFormatter format to moment format.
          *
@@ -251,10 +271,42 @@ define([
         convertToMomentFormat: function (format) {
             var newFormat;
 
-            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
+            newFormat = format.replace(/yyyy|yy|y/, 'YYYY'); // replace the year
             newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the date
 
             return newFormat;
+        },
+
+        /**
+         * Get Url Parameters.
+         *
+         * @param {String} url - Url string
+         * @returns {Object}
+         */
+        getUrlParameters: function (url) {
+            var params = {},
+                queries = url.split('?'),
+                temp,
+                i,
+                l;
+
+            if (!queries[1]) {
+                return params;
+            }
+
+            queries = queries[1].split('&');
+
+            for (i = 0, l = queries.length; i < l; i++) {
+                temp = queries[i].split('=');
+
+                if (temp[1]) {
+                    params[temp[0]] = decodeURIComponent(temp[1].replace(/\+/g, '%20'));
+                } else {
+                    params[temp[0]] = '';
+                }
+            }
+
+            return params;
         }
     };
 });
diff --git a/lib/web/mage/utils/objects.js b/lib/web/mage/utils/objects.js
index d0b77aa4320e3..bd0e496339ace 100644
--- a/lib/web/mage/utils/objects.js
+++ b/lib/web/mage/utils/objects.js
@@ -83,7 +83,7 @@ define([
      * @private
      *
      * @param {Object} parent - Object from which to remove property.
-     * @param {Array} path - Splitted path to the propery.
+     * @param {Array} path - Splitted path to the property.
      */
     function removeNested(parent, path) {
         var field = path.pop();
diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js
index e29908b7c4e9c..7c50226d6aa3a 100644
--- a/lib/web/mage/utils/template.js
+++ b/lib/web/mage/utils/template.js
@@ -2,12 +2,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* eslint-disable no-shadow */
+
 define([
     'jquery',
     'underscore',
     'mage/utils/objects',
     'mage/utils/strings'
-], function (jQuery, _, utils, stringUtils) {
+], function ($, _, utils, stringUtils) {
     'use strict';
 
     var tmplSettings = _.templateSettings,
@@ -176,7 +179,7 @@ define([
 
                 if (isTemplate(value)) {
                     list[key] = render(value, tmpl, castString);
-                } else if (jQuery.isPlainObject(value) || Array.isArray(value)) {
+                } else if ($.isPlainObject(value) || Array.isArray(value)) {
                     _.each(value, iterate);
                 }
             });
diff --git a/lib/web/mage/utils/wrapper.js b/lib/web/mage/utils/wrapper.js
index c90d1a026b147..9d4bb045b5722 100644
--- a/lib/web/mage/utils/wrapper.js
+++ b/lib/web/mage/utils/wrapper.js
@@ -45,7 +45,7 @@ define([
     return {
 
         /**
-         * Wraps target function with a specified wrapper, which will recieve
+         * Wraps target function with a specified wrapper, which will receive
          * reference to the original function as a first argument.
          *
          * @param {Function} target - Function to be wrapped.
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index aaece677a485d..01ecaf7cf46c2 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -9,6 +9,7 @@
     if (typeof define === 'function' && define.amd) {
         define([
             'jquery',
+            'moment',
             'jquery/ui',
             'jquery/validate',
             'mage/translate'
@@ -16,7 +17,7 @@
     } else {
         factory(jQuery);
     }
-}(function ($) {
+}(function ($, moment) {
     'use strict';
 
     var creditCartTypes, rules, showLabel, originValidateDelegate;
@@ -194,7 +195,9 @@
         var empty = $(element).closest('table')
             .find('input.required-option:visible')
             .filter(function (i, el) {
-                return $.mage.isEmpty(el.value);
+                if ($(el).is('disabled')) {
+                    return $.mage.isEmpty(el.value);
+                }
             })
             .length;
 
@@ -250,6 +253,12 @@
             },
             $.mage.__('No white space please')
         ],
+        'no-marginal-whitespace': [
+            function (value, element) {
+                return this.optional(element) || !/^\s+|\s+$/i.test(value);
+            },
+            $.mage.__('No marginal white space please')
+        ],
         'zip-range': [
             function (value, element) {
                 return this.optional(element) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
@@ -361,7 +370,7 @@
         ],
         'time12h': [
             function (value, element) {
-                return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
+                return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\s[AP]M))$/i.test(value);
             },
             $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
         ],
@@ -395,6 +404,24 @@
             $.mage.__('Please enter at least {0} characters')
         ],
 
+        /* detect chars that would require more than 3 bytes */
+        'validate-no-utf8mb4-characters': [
+            function (value) {
+                var validator = this,
+                    message = $.mage.__('Please remove invalid characters: {0}.'),
+                    matches = value.match(/(?:[\uD800-\uDBFF][\uDC00-\uDFFF])/g),
+                    result = matches === null;
+
+                if (!result) {
+                    validator.charErrorMessage = message.replace('{0}', matches.join());
+                }
+
+                return result;
+            }, function () {
+                return this.charErrorMessage;
+            }
+        ],
+
         /* eslint-disable max-len */
         'email2': [
             function (value, element) {
@@ -826,11 +853,13 @@
                 result = true;
                 range = param;
 
-                if (typeof range === 'object') {
+                if (typeof range === 'string') {
                     m = dataAttrRange.exec(range);
 
                     if (m) {
                         result = result && $.mage.isBetween(numValue, m[1], m[2]);
+                    } else {
+                        result = false;
                     }
                 } else if (elm && elm.className) {
                     classes = elm.className.split(' ');
@@ -858,6 +887,27 @@
             },
             $.mage.__('Please enter a valid number in this field.')
         ],
+        'validate-forbidden-extensions': [
+            function (v, elem) {
+                var forbiddenExtensions = $(elem).attr('data-validation-params'),
+                    forbiddenExtensionsArray = forbiddenExtensions.split(','),
+                    extensionsArray = v.split(','),
+                    result = true;
+
+                this.validateExtensionsMessage = $.mage.__('Forbidden extensions has been used. Avoid usage of ') +
+                    forbiddenExtensions;
+
+                $.each(extensionsArray, function (key, extension) {
+                    if (forbiddenExtensionsArray.indexOf(extension) !== -1) {
+                        result = false;
+                    }
+                });
+
+                return result;
+            }, function () {
+                return this.validateExtensionsMessage;
+            }
+        ],
         'validate-digits-range': [
             function (v, elm, param) {
                 var numValue, dataAttrRange, classNameRange, result, range, m, classes, ii;
@@ -877,11 +927,13 @@
                 result = true;
                 range = param;
 
-                if (typeof range === 'object') {
+                if (typeof range === 'string') {
                     m = dataAttrRange.exec(range);
 
                     if (m) {
                         result = result && $.mage.isBetween(numValue, m[1], m[2]);
+                    } else {
+                        result = false;
                     }
                 } else if (elm && elm.className) {
                     classes = elm.className.split(' ');
@@ -955,9 +1007,9 @@
         ],
         'validate-code': [
             function (v) {
-                return $.mage.isEmptyNoTrim(v) || /^[a-z]+[a-z0-9_]+$/.test(v);
+                return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z]+[a-zA-Z0-9_]+$/.test(v);
             },
-            $.mage.__('Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.') //eslint-disable-line max-len
+            $.mage.__('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.') //eslint-disable-line max-len
         ],
         'validate-alphanum': [
             function (v) {
@@ -965,11 +1017,17 @@
             },
             $.mage.__('Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.') //eslint-disable-line max-len
         ],
+        'validate-not-number-first': [
+            function (value) {
+                return $.mage.isEmptyNoTrim(value) || /^[^0-9-\.].*$/.test(value.trim());
+            },
+            $.mage.__('First character must be letter.')
+        ],
         'validate-date': [
-            function (v) {
-                var test = new Date(v);
+            function (value, params, additionalParams) {
+                var test = moment(value, additionalParams.dateFormat);
 
-                return $.mage.isEmptyNoTrim(v) || !isNaN(test);
+                return $.mage.isEmptyNoTrim(value) || test.isValid();
             },
             $.mage.__('Please enter a valid date.')
 
@@ -1074,10 +1132,10 @@
                     ovId;
 
                 if (!result) {
-                    ovId = $(elm).attr('id') + '_value';
+                    ovId = $('#' + $(elm).attr('id') + '_value');
 
-                    if ($(ovId)) {
-                        result = !$.mage.isEmptyNoTrim($(ovId).val());
+                    if (ovId.length > 0) {
+                        result = !$.mage.isEmptyNoTrim(ovId.val());
                     }
                 }
 
@@ -1531,20 +1589,22 @@
         ],
         'required-text-swatch-entry': [
             tableSingleValidation,
-            $.mage.__('Admin is a required field in the each row.')
+            $.mage.__('Admin is a required field in each row.')
         ],
         'required-visual-swatch-entry': [
             tableSingleValidation,
-            $.mage.__('Admin is a required field in the each row.')
+            $.mage.__('Admin is a required field in each row.')
         ],
         'required-dropdown-attribute-entry': [
             tableSingleValidation,
-            $.mage.__('Admin is a required field in the each row.')
+            $.mage.__('Admin is a required field in each row.')
         ],
         'validate-item-quantity': [
             function (value, element, params) {
-                // obtain values for validation
-                var qty = $.mage.parseNumber(value),
+                var validator = this,
+                    result = false,
+                    // obtain values for validation
+                    qty = $.mage.parseNumber(value),
                     isMinAllowedValid = typeof params.minAllowed === 'undefined' ||
                         qty >= $.mage.parseNumber(params.minAllowed),
                     isMaxAllowedValid = typeof params.maxAllowed === 'undefined' ||
@@ -1552,9 +1612,42 @@
                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
                         qty % $.mage.parseNumber(params.qtyIncrements) === 0;
 
-                return isMaxAllowedValid && isMinAllowedValid && isQtyIncrementsValid && qty > 0;
-            },
-            ''
+                result = qty > 0;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('Please enter a quantity greater than 0.');//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMinAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The fewest you may purchase is %1.').replace('%1', params.minAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isMaxAllowedValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                result = isQtyIncrementsValid;
+
+                if (result === false) {
+                    validator.itemQtyErrorMessage = $.mage.__('You can buy this product only in quantities of %1 at a time.').replace('%1', params.qtyIncrements);//eslint-disable-line max-len
+
+                    return result;
+                }
+
+                return result;
+            }, function () {
+                return this.itemQtyErrorMessage;
+            }
         ],
         'password-not-equal-to-user-name': [
             function (value, element, params) {
@@ -1564,7 +1657,7 @@
 
                 return true;
             },
-            $.mage.__('Password cannot be the same as email address.')
+            $.mage.__('The password can\'t be the same as the email address. Create a new password and try again.')
         ]
     };
 
@@ -1857,6 +1950,9 @@
             }
 
             if (firstActive.length) {
+                $('html, body').animate({
+                    scrollTop: firstActive.offset().top
+                });
                 firstActive.focus();
             }
         }
diff --git a/lib/web/mage/validation/url.js b/lib/web/mage/validation/url.js
index 67e0e989d248e..00ac3fd4eb15d 100644
--- a/lib/web/mage/validation/url.js
+++ b/lib/web/mage/validation/url.js
@@ -42,7 +42,7 @@ define([], function () {
         /**
          * Sanitize url, replacing disallowed chars
          *
-         * @param {Sring} path - url to be normalized
+         * @param {String} path - url to be normalized
          * @returns {String}
          */
         sanitize: function (path) {
diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
index 7c082880d94bd..f3b36fa153c32 100644
--- a/lib/web/mage/validation/validation.js
+++ b/lib/web/mage/validation/validation.js
@@ -30,7 +30,7 @@
 
                     if (val && val.length > 0) {
                         result = true;
-                        valInt = parseInt(val, 10) || 0;
+                        valInt = parseFloat(val) || 0;
 
                         if (valInt >= 0) {
                             total += valInt;
diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index 958af0e96641b..06e41377ae33f 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -9,101 +9,100 @@
 
         var magnify = new Magnify($(this), options);
 
-        /*events must be tracked here*/
+        /* events must be tracked here */
 
         /**
          * Return that from _init function
          *
          */
         return magnify;
-
     };
 
     function Magnify(element, options) {
-        var gOptions = options || {},
+        var customUserOptions = options || {},
             $box = $(element),
             $thumb,
             that = this,
-            largeWrapper = options.largeWrapper ||  '.magnifier-preview',
-            $largeWrapper = $(largeWrapper);
+            largeWrapper = options.largeWrapper || '.magnifier-preview',
+            $magnifierPreview = $(largeWrapper);
 
         curThumb = null,
-            currentOpts = {
-                x: 0,
-                y: 0,
-                w: 0,
-                h: 0,
-                lensW: 0,
-                lensH: 0,
-                lensBgX: 0,
-                lensBgY: 0,
-                largeW: 0,
-                largeH: 0,
-                largeL: 0,
-                largeT: 0,
-                zoom: 2,
-                zoomMin: 1.1,
-                zoomMax: 5,
-                mode: 'outside',
-                eventType: 'click',
-                status: 0,
-                zoomAttached: false,
-                zoomable: gOptions.zoomable !== undefined ?
-                    gOptions.zoomable
-                    : false,
-                onthumbenter: gOptions.onthumbenter !== undefined ?
-                    gOptions.onthumbenter
-                    : null,
-                onthumbmove: gOptions.onthumbmove !== undefined ?
-                    gOptions.onthumbmove
-                    : null,
-                onthumbleave: gOptions.onthumbleave !== undefined ?
-                    gOptions.onthumbleave
-                    : null,
-                onzoom: gOptions.onzoom !== undefined ?
-                    gOptions.onzoom
-                    : null
-            },
-            pos = {
-                t: 0,
-                l: 0,
-                x: 0,
-                y: 0
-            },
-            gId = 0,
-            status = 0,
-            curIdx = '',
-            curLens = null,
-            curLarge = null,
-            lensbg = gOptions.bg !== undefined ? gOptions.lensbg : true,
-            gZoom = gOptions.zoom !== undefined ?
-                gOptions.zoom
-                : currentOpts.zoom,
-            gZoomMin = gOptions.zoomMin !== undefined ?
-                gOptions.zoomMin
-                : currentOpts.zoomMin,
-            gZoomMax = gOptions.zoomMax !== undefined ?
-                gOptions.zoomMax
-                : currentOpts.zoomMax,
-            gMode = gOptions.mode || currentOpts.mode,
-            gEventType = gOptions.eventType || currentOpts.eventType,
-            data = {},
-            inBounds = false,
-            isOverThumb = false,
-            rate = 1,
-            paddingX = 0,
-            paddingY = 0,
-            enabled = true,
-            showWrapper = true;
+        magnifierOptions = {
+            x: 0,
+            y: 0,
+            w: 0,
+            h: 0,
+            lensW: 0,
+            lensH: 0,
+            lensBgX: 0,
+            lensBgY: 0,
+            largeW: 0,
+            largeH: 0,
+            largeL: 0,
+            largeT: 0,
+            zoom: 2,
+            zoomMin: 1.1,
+            zoomMax: 5,
+            mode: 'outside',
+            eventType: 'click',
+            status: 0,
+            zoomAttached: false,
+            zoomable: customUserOptions.zoomable !== undefined ?
+                customUserOptions.zoomable
+                : false,
+            onthumbenter: customUserOptions.onthumbenter !== undefined ?
+                customUserOptions.onthumbenter
+                : null,
+            onthumbmove: customUserOptions.onthumbmove !== undefined ?
+                customUserOptions.onthumbmove
+                : null,
+            onthumbleave: customUserOptions.onthumbleave !== undefined ?
+                customUserOptions.onthumbleave
+                : null,
+            onzoom: customUserOptions.onzoom !== undefined ?
+                customUserOptions.onzoom
+                : null
+        },
+        pos = {
+            t: 0,
+            l: 0,
+            x: 0,
+            y: 0
+        },
+        gId = 0,
+        status = 0,
+        curIdx = '',
+        curLens = null,
+        curLarge = null,
+        lensbg = customUserOptions.bg !== undefined ?
+            customUserOptions.lensbg
+            : true,
+        gZoom = customUserOptions.zoom !== undefined ?
+            customUserOptions.zoom
+            : magnifierOptions.zoom,
+        gZoomMin = customUserOptions.zoomMin !== undefined ?
+            customUserOptions.zoomMin
+            : magnifierOptions.zoomMin,
+        gZoomMax = customUserOptions.zoomMax !== undefined ?
+            customUserOptions.zoomMax
+            : magnifierOptions.zoomMax,
+        gMode = customUserOptions.mode || magnifierOptions.mode,
+        gEventType = customUserOptions.eventType || magnifierOptions.eventType,
+        data = {},
+        inBounds = false,
+        isOverThumb = false,
+        rate = 1,
+        paddingX = 0,
+        paddingY = 0,
+        enabled = true,
+        showWrapper = true;
 
         var MagnifyCls = {
             magnifyHidden: 'magnify-hidden',
             magnifyOpaque: 'magnify-opaque',
             magnifyFull: 'magnify-fullimage'
-
         };
 
-
         /**
          * Update Lens positon on.
          *
@@ -143,105 +142,104 @@
             $(thumb).parent().append(lens);
         }
 
-        function updateLensOnLoad(idx, thumb, large, largeWrapper) {
-            var lens = $box.find('.magnify-lens'),
+        function updateLensOnLoad(idSelectorMainImg, thumb, largeImgInMagnifyLens, largeWrapper) {
+            var magnifyLensElement= $box.find('.magnify-lens'),
                 textWrapper;
 
-            if (data[idx].status === 1) {
+            if (data[idSelectorMainImg].status === 1) {
                 textWrapper = $('<div class="magnifier-loader-text"></div>');
-                lens.className = 'magnifier-loader magnify-hidden';
+                magnifyLensElement.className = 'magnifier-loader magnify-hidden';
                 textWrapper.html('Loading...');
-                lens.html('').append(textWrapper);
-            } else if (data[idx].status === 2) {
-                lens.addClass(MagnifyCls.magnifyHidden);
-                lens.html('');
-                large.id = idx + '-large';
-                large.style.width = data[idx].largeW * rate + 'px';
-                large.style.height = data[idx].largeH + 'px';
-                large.className = 'magnifier-large magnify-hidden';
-
-                if (data[idx].mode === 'inside') {
-                    lens.append(large);
+                magnifyLensElement.html('').append(textWrapper);
+            } else if (data[idSelectorMainImg].status === 2) {
+                magnifyLensElement.addClass(MagnifyCls.magnifyHidden);
+                magnifyLensElement.html('');
+
+                largeImgInMagnifyLens.id = idSelectorMainImg + '-large';
+                largeImgInMagnifyLens.style.width = data[idSelectorMainImg].largeImgInMagnifyLensWidth + 'px';
+                largeImgInMagnifyLens.style.height = data[idSelectorMainImg].largeImgInMagnifyLensHeight + 'px';
+                largeImgInMagnifyLens.className = 'magnifier-large magnify-hidden';
+
+                if (data[idSelectorMainImg].mode === 'inside') {
+                    magnifyLensElement.append(largeImgInMagnifyLens);
                 } else {
-                    largeWrapper.html('').append(large);
+                    largeWrapper.html('').append(largeImgInMagnifyLens);
                 }
             }
 
-            data[idx].lensH = data[idx].lensH > $thumb.height() ? $thumb.height() : data[idx].lensH;
+            data[idSelectorMainImg].lensH = data[idSelectorMainImg].lensH > $thumb.height() ? $thumb.height() : data[idSelectorMainImg].lensH;
 
-            if (Math.round(data[idx].lensW) === 0) {
-                lens.css('display', 'none');
+            if (Math.round(data[idSelectorMainImg].lensW) === 0) {
+                magnifyLensElement.css('display', 'none');
             } else {
-                lens.css({
-                    width: data[idx].lensW + 1 + 'px',
-                    height: data[idx].lensH - 1 + 'px',
+                magnifyLensElement.css({
+                    width: Math.round(data[idSelectorMainImg].lensW) + 'px',
+                    height: Math.round(data[idSelectorMainImg].lensH) + 'px',
                     display: ''
                 });
             }
         }
 
         function getMousePos() {
-            var xPos = pos.x - currentOpts.x,
-                yPos = pos.y - currentOpts.y,
+            var xPos = pos.x - magnifierOptions.x,
+                yPos = pos.y - magnifierOptions.y,
                 t,
                 l;
 
-            inBounds =  xPos < 0 || yPos < 0 || xPos > currentOpts.w || yPos > currentOpts.h  ? false : true;
+            inBounds =  xPos < 0 || yPos < 0 || xPos > magnifierOptions.w || yPos > magnifierOptions.h  ? false : true;
 
-            l = xPos - currentOpts.lensW / 2;
-            t = yPos - currentOpts.lensH / 2;
+            l = xPos - magnifierOptions.lensW / 2;
+            t = yPos - magnifierOptions.lensH / 2;
 
-            if (currentOpts.mode !== 'inside') {
-                if (xPos < currentOpts.lensW / 2) {
-                    l = 0;
-                }
+            if (xPos < magnifierOptions.lensW / 2) {
+                l = 0;
+            }
 
-                if (yPos < currentOpts.lensH / 2) {
-                    t = 0;
-                }
+            if (yPos < magnifierOptions.lensH / 2) {
+                t = 0;
+            }
 
-                if (xPos - currentOpts.w + Math.ceil(currentOpts.lensW / 2) > 0) {
-                    l = currentOpts.w - Math.ceil(currentOpts.lensW + 2);
-                }
+            if (xPos - magnifierOptions.w + Math.ceil(magnifierOptions.lensW / 2) > 0) {
+                l = magnifierOptions.w - Math.ceil(magnifierOptions.lensW + 2);
+            }
 
-                if (yPos - currentOpts.h + Math.ceil(currentOpts.lensH / 2) > 0) {
-                    t = currentOpts.h - Math.ceil(currentOpts.lensH);
-                }
+            if (yPos - magnifierOptions.h + Math.ceil(magnifierOptions.lensH / 2) > 0) {
+                t = magnifierOptions.h - Math.ceil(magnifierOptions.lensH);
+            }
 
-                pos.l = l;
-                pos.t = t;
+            pos.l = l;
+            pos.t = t;
 
-                currentOpts.lensBgX = pos.l;
-                currentOpts.lensBgY = pos.t;
+            magnifierOptions.lensBgX = pos.l;
+            magnifierOptions.lensBgY = pos.t;
 
-                if (currentOpts.mode === 'inside') {
-                    currentOpts.largeL = xPos * (currentOpts.zoom - currentOpts.lensW / currentOpts.w);
-                    currentOpts.largeT = yPos * (currentOpts.zoom - currentOpts.lensH / currentOpts.h);
-                } else {
-                    currentOpts.largeL = currentOpts.lensBgX * currentOpts.zoom * (currentOpts.largeWrapperW / currentOpts.w) * rate;
-                    currentOpts.largeT = currentOpts.lensBgY * currentOpts.zoom * (currentOpts.largeWrapperH / currentOpts.h);
-                }
+            if (magnifierOptions.mode === 'inside') {
+                magnifierOptions.largeL = Math.round(xPos * (magnifierOptions.zoom - magnifierOptions.lensW / magnifierOptions.w));
+                magnifierOptions.largeT = Math.round(yPos * (magnifierOptions.zoom - magnifierOptions.lensH / magnifierOptions.h));
+            } else {
+                magnifierOptions.largeL = Math.round(magnifierOptions.lensBgX * magnifierOptions.zoom * (magnifierOptions.largeWrapperW / magnifierOptions.w));
+                magnifierOptions.largeT = Math.round(magnifierOptions.lensBgY * magnifierOptions.zoom * (magnifierOptions.largeWrapperH / magnifierOptions.h));
             }
         }
 
         function onThumbEnter() {
             if (_toBoolean(enabled)) {
-                currentOpts = data[curIdx];
+                magnifierOptions = data[curIdx];
                 curLens = $box.find('.magnify-lens');
 
-                if (currentOpts.status === 2) {
+                if (magnifierOptions.status === 2) {
                     curLens.removeClass(MagnifyCls.magnifyOpaque);
                     curLarge = $('#' + curIdx + '-large');
                     curLarge.removeClass(MagnifyCls.magnifyHidden);
-                } else if (currentOpts.status === 1) {
+                } else if (magnifierOptions.status === 1) {
                     curLens.className = 'magnifier-loader';
                 }
             }
         }
 
         function onThumbLeave() {
-            if (currentOpts.status > 0) {
-                var handler = currentOpts.onthumbleave;
+            if (magnifierOptions.status > 0) {
+                var handler = magnifierOptions.onthumbleave;
 
                 if (handler !== null) {
                     handler({
@@ -266,28 +264,30 @@
 
         function move() {
             if (_toBoolean(enabled)) {
-                if (status !== currentOpts.status) {
+                if (status !== magnifierOptions.status) {
                     onThumbEnter();
                 }
 
-                if (currentOpts.status > 0) {
-                    curThumb.className = currentOpts.thumbCssClass + ' magnify-opaque';
+                if (magnifierOptions.status > 0) {
+                    curThumb.className = magnifierOptions.thumbCssClass + ' magnify-opaque';
 
-                    if (currentOpts.status === 1) {
+                    if (magnifierOptions.status === 1) {
                         curLens.className = 'magnifier-loader';
-                    } else if (currentOpts.status === 2) {
+                    } else if (magnifierOptions.status === 2) {
                         curLens.removeClass(MagnifyCls.magnifyHidden);
                         curLarge.removeClass(MagnifyCls.magnifyHidden);
                         curLarge.css({
-                            left: '-' + currentOpts.largeL + 'px',
-                            top: '-' + currentOpts.largeT + 'px'
+                            left: '-' + magnifierOptions.largeL + 'px',
+                            top: '-' + magnifierOptions.largeT + 'px'
                         });
                     }
 
-                    pos.t = pos.t <= 0 ? 0 : pos.t;
+                    var borderOffset = 2; // Offset for magnify-lens border
+                    pos.t = pos.t <= 0 ? 0 : pos.t - borderOffset;
+
                     curLens.css({
                         left: pos.l + paddingX + 'px',
-                        top: pos.t + 1 + paddingY + 'px'
+                        top: pos.t + paddingY + 'px'
                     });
 
                     if (lensbg) {
@@ -296,10 +296,10 @@
                         });
                     } else {
                         curLens.get(0).style.backgroundPosition = '-' +
-                        currentOpts.lensBgX + 'px -' +
-                        currentOpts.lensBgY + 'px';
+                        magnifierOptions.lensBgX + 'px -' +
+                        magnifierOptions.lensBgY + 'px';
                     }
-                    var handler = currentOpts.onthumbmove;
+                    var handler = magnifierOptions.onthumbmove;
 
                     if (handler !== null) {
                         handler({
@@ -312,33 +312,33 @@
                     }
                 }
 
-                status = currentOpts.status;
+                status = magnifierOptions.status;
             }
         }
 
-        function setThumbData(thumb, thumbData) {
-            var thumbBounds = thumb.getBoundingClientRect(),
+        function setThumbData(mainImage, mainImageData) {
+            var thumbBounds = mainImage.getBoundingClientRect(),
                 w = 0,
                 h = 0;
 
-            thumbData.x = thumbBounds.left;
-            thumbData.y = thumbBounds.top;
-            thumbData.w = thumbBounds.right - thumbData.x;
-            thumbData.h = thumbBounds.bottom - thumbData.y;
+            mainImageData.x = Math.round(thumbBounds.left);
+            mainImageData.y = Math.round(thumbBounds.top);
+            mainImageData.w = Math.round(thumbBounds.right - mainImageData.x);
+            mainImageData.h = Math.round(thumbBounds.bottom - mainImageData.y);
 
-            if (thumbData.mode === 'inside') {
-                w = thumbData.w;
-                h = thumbData.h;
+            if (mainImageData.mode === 'inside') {
+                w = mainImageData.w;
+                h = mainImageData.h;
             } else {
-                w = thumbData.largeWrapperW;
-                h = thumbData.largeWrapperH;
+                w = mainImageData.largeWrapperW;
+                h = mainImageData.largeWrapperH;
             }
 
-            thumbData.largeW = thumbData.zoom * w;
-            thumbData.largeH = thumbData.zoom * h;
+            mainImageData.largeImgInMagnifyLensWidth = Math.round(mainImageData.zoom * w);
+            mainImageData.largeImgInMagnifyLensHeight = Math.round(mainImageData.zoom * h);
 
-            thumbData.lensW = thumbData.w / thumbData.zoom / rate;
-            thumbData.lensH = thumbData.h / thumbData.zoom;
+            mainImageData.lensW = Math.round(mainImageData.w / mainImageData.zoom);
+            mainImageData.lensH = Math.round(mainImageData.h / mainImageData.zoom);
         }
 
         function _init($box, options) {
@@ -360,11 +360,11 @@
 
                 if (_toBoolean(enabled)) {
 
-                    $largeWrapper.show().css('display', '');
-                    $largeWrapper.addClass(MagnifyCls.magnifyHidden);
+                    $magnifierPreview.show().css('display', '');
+                    $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
                     set(opts);
                 } else {
-                    $largeWrapper.empty().hide();
+                    $magnifierPreview.empty().hide();
                 }
             }
 
@@ -376,7 +376,7 @@
 
                 if (showWrapper) {
 
-                    if (currentOpts.status !== 0) {
+                    if (magnifierOptions.status !== 0) {
                         onThumbLeave();
                     }
                     handleEvents(e);
@@ -390,7 +390,7 @@
 
                 if (showWrapper) {
                     if (!isOverThumb) {
-                        if (currentOpts.status !== 0) {
+                        if (magnifierOptions.status !== 0) {
                             onThumbLeave();
                         }
                         handleEvents(e);
@@ -420,7 +420,7 @@
 
             onThumbEnter(src);
 
-            setThumbData(curThumb, currentOpts);
+            setThumbData(curThumb, magnifierOptions);
 
             pos.x = e.clientX;
             pos.y = e.clientY;
@@ -428,7 +428,7 @@
             getMousePos();
             move();
 
-            var handler = currentOpts.onthumbenter;
+            var handler = magnifierOptions.onthumbenter;
 
             if (handler !== null) {
                 handler({
@@ -462,15 +462,15 @@
                 eventType = options.eventType || thumb.getAttribute('data-eventType') || gEventType,
                 onthumbenter = options.onthumbenter !== undefined ?
                     options.onthumbenter
-                    : currentOpts.onthumbenter,
+                    : magnifierOptions.onthumbenter,
                 onthumbleave = options.onthumbleave !== undefined ?
                     options.onthumbleave
-                    : currentOpts.onthumbleave,
+                    : magnifierOptions.onthumbleave,
                 onthumbmove = options.onthumbmove !== undefined ?
                     options.onthumbmove
-                    : currentOpts.onthumbmove;
+                    : magnifierOptions.onthumbmove;
 
-            largeUrl = $thumb.data('original') || gOptions.full || $thumb.attr('src');
+            largeUrl = $thumb.data('original') || customUserOptions.full || $thumb.attr('src');
 
             if (thumb.id === '') {
                 idx = thumb.id = 'magnifier-item-' + gId;
@@ -529,7 +529,6 @@
                 onthumbmove: onthumbmove
             };
 
-            rate = $thumb.width() / $thumb.height() / (data[idx].largeWrapperW / data[idx].largeWrapperH);
             paddingX = ($thumb.parent().width() - $thumb.width()) / 2;
             paddingY = ($thumb.parent().height() - $thumb.height()) / 2;
 
@@ -543,7 +542,11 @@
                         showWrapper = true;
                         bindEvents(eventType, thumb);
                         data[idx].status = 2;
-                        data[idx].zoom = largeObj.height / largeWrapper.height();
+                        if (largeObj.width > largeObj.height) {
+                            data[idx].zoom = largeObj.width / largeWrapper.width();
+                        } else {
+                            data[idx].zoom = largeObj.height / largeWrapper.height();
+                        }
                         setThumbData(thumb, data[idx]);
                         updateLensOnLoad(idx, thumb, largeObj, largeWrapper);
                     }
@@ -555,8 +558,16 @@
             thumbObj.src = thumb.src;
         }
 
-        function onMousemove(e) {
+        /**
+         * Hide magnifier when mouse exceeds image bounds.
+         */
+        function onMouseLeave() {
+            onThumbLeave();
+            isOverThumb = false;
+            $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
+        }
 
+        function onMousemove(e) {
             pos.x = e.clientX;
             pos.y = e.clientY;
 
@@ -566,30 +577,26 @@
                 isOverThumb = inBounds;
             }
 
-            if (inBounds && isOverThumb) {
-                $largeWrapper.removeClass(MagnifyCls.magnifyHidden);
+            if (inBounds && isOverThumb && gMode === 'outside') {
+                $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
                 move();
-            } else {
-                onThumbLeave();
-                isOverThumb = false;
-                $largeWrapper.addClass(MagnifyCls.magnifyHidden);
             }
         }
 
         function onScroll() {
-
             if (curThumb !== null) {
-                setThumbData(curThumb, currentOpts);
+                setThumbData(curThumb, magnifierOptions);
             }
         }
 
         $(window).on('scroll', onScroll);
         $(window).resize(function () {
-            _init($box, gOptions);
+            _init($box, customUserOptions);
         });
 
-        $(document).on('mousemove', onMousemove);
-        _init($box, gOptions);
+        $box.on('mousemove', onMousemove);
+        $box.on('mouseleave', onMouseLeave);
 
+        _init($box, customUserOptions);
     }
 }(jQuery));
diff --git a/lib/web/magnifier/magnify.js b/lib/web/magnifier/magnify.js
index 34ba6e8e24135..9d673092b806c 100644
--- a/lib/web/magnifier/magnify.js
+++ b/lib/web/magnifier/magnify.js
@@ -35,13 +35,6 @@ define([
             allowZoomOut = false,
             allowZoomIn = true;
 
-        if (isTouchEnabled) {
-            $(element).on('fotorama:showend fotorama:load', function () {
-                $(magnifierSelector).remove();
-                $(magnifierZoomSelector).remove();
-            });
-        }
-
         (function () {
             var style = document.documentElement.style,
                 transitionEnabled = style.transition !== undefined ||
@@ -53,21 +46,14 @@ define([
 
         /**
          * Return width and height of original image
-         * @param src path for original image
+         * @param img original image node
          * @returns {{rw: number, rh: number}}
          */
-        function getImageSize(src) {
-            var img = new Image(),
-                imgSize = {
-                    rw: 0,
-                    rh: 0
-                };
-
-            img.src = src;
-            imgSize.rw = img.width;
-            imgSize.rh = img.height;
-
-            return imgSize;
+        function getImageSize(img) {
+            return {
+                rw: img.naturalWidth,
+                rh: img.naturalHeight
+            };
         }
 
         /**
@@ -192,7 +178,7 @@ define([
             if (!e.data.$image || !e.data.$image.length)
                 return;
 
-            imageSize = getImageSize($(fullscreenImageSelector)[0].src);
+            imageSize = getImageSize($(fullscreenImageSelector)[0]);
             parentWidth = e.data.$image.parent().width();
             parentHeight = e.data.$image.parent().height();
             isImageSmall = parentWidth >= imageSize.rw && parentHeight >= imageSize.rh;
@@ -277,7 +263,6 @@ define([
 
                 settings = $.extend(dimentions, {
                     top: top,
-                    bottom: bottom,
                     left: left,
                     right: right
                 });
@@ -332,7 +317,7 @@ define([
             if (allowZoomIn && (!transitionEnabled || !transitionActive) && (isTouchEnabled ||
                 !$(zoomInButtonSelector).hasClass(zoomInDisabled))) {
                 $image = $(fullscreenImageSelector);
-                imgOriginalSize = getImageSize($image[0].src);
+                imgOriginalSize = getImageSize($image[0]);
                 imageWidth = $image.width();
                 imageHeight = $image.height();
                 ratio = imageWidth / imageHeight;
@@ -557,6 +542,16 @@ define([
                 trailing: false
             });
 
+            /**
+             * Returns top position value for passed jQuery object.
+             *
+             * @param $el
+             * @return {number}
+             */
+            function getTop($el) {
+                return parseInt($el.get(0).style.top);
+            }
+
             function shiftImage(dx, dy, e) {
                 var top = +imagePosY + dy,
                     left = +imagePosX + dx,
@@ -584,16 +579,13 @@ define([
                 }
 
                 if ($image.height() > $imageContainer.height()) {
-
-                    if ($imageContainer.offset().top + $imageContainer.height() > top + $image.height()) {
-                        top = $imageContainer.offset().top + $imageContainer.height() - $image.height();
+                    if ($imageContainer.height() > $image.height() + top) {
+                        $image.css('top', $imageContainer.height() - $image.height());
                     } else {
-                        top = $imageContainer.offset().top < top ? 0 : top;
+                        top = $image.height() - getTop($image) - $imageContainer.height();
+                        dy = dy < top ? dy : top;
+                        $image.css('top', getTop($image) + dy);
                     }
-                    $image.offset({
-                        'top': top
-                    });
-                    $image.css('bottom', '');
                 }
 
                 if ($image.width() > $imageContainer.width()) {
@@ -624,7 +616,7 @@ define([
              * @param e - event object
              */
             function dblClickHandler(e) {
-                var imgOriginalSize = getImageSize($image[0].src),
+                var imgOriginalSize = getImageSize($image[0]),
                     proportions;
 
                 if (imgOriginalSize.rh < $image.parent().height() && imgOriginalSize.rw < $image.parent().width()) {
@@ -690,7 +682,7 @@ define([
                 } else if (gallery.fullScreen && (!transitionEnabled || !transitionActive)) {
                     e.preventDefault();
 
-                    imagePosY = $image.offset().top;
+                    imagePosY = getTop($image);
                     imagePosX = $image.offset().left;
 
                     if (isTouchEnabled) {
@@ -746,6 +738,7 @@ define([
                         }
 
                         if (allowZoomOut) {
+                            imagePosY = getTop($(fullscreenImageSelector, $gallery));
                             shiftImage(clientX - startX, clientY - startY, e);
                         }
                     }
@@ -771,13 +764,13 @@ define([
                     isFullScreen = $(gallerySelector).data('fotorama').fullScreen,
                     initVars = function () {
                         imagePosX = $(fullscreenImageSelector, $gallery).offset().left;
-                        imagePosY = $(fullscreenImageSelector, $gallery).offset().top;
+                        imagePosY = getTop($(fullscreenImageSelector, $gallery));
                     };
 
                 if (($focus.attr('data-gallery-role') || !$focus.length) && allowZoomOut) {
                     if (isFullScreen) {
                         imagePosX = $(fullscreenImageSelector, $(gallerySelector)).offset().left;
-                        imagePosY = $(fullscreenImageSelector, $(gallerySelector)).offset().top;
+                        imagePosY = getTop($(fullscreenImageSelector, $(gallerySelector)));
                     }
 
                     if (e.keyCode === 39) {
diff --git a/lib/web/modernizr/modernizr.js b/lib/web/modernizr/modernizr.js
index 9b4f68aaaaaa9..8c826fa18c582 100644
--- a/lib/web/modernizr/modernizr.js
+++ b/lib/web/modernizr/modernizr.js
@@ -169,7 +169,7 @@ window.Modernizr = (function( window, document, undefined ) {
     // isEventSupported determines if a given element supports the given event
     // kangax.github.com/iseventsupported/
     //
-    // The following results are known incorrects:
+    // The following results are known incorrect:
     //   Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative
     //   Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333
     //   ...
@@ -910,7 +910,7 @@ window.Modernizr = (function( window, document, undefined ) {
                         bool = inputElem.checkValidity && inputElem.checkValidity() === false;
 
                     } else {
-                        // If the upgraded input compontent rejects the :) text, we got a winner
+                        // If the upgraded input component rejects the :) text, we got a winner
                         bool = inputElem.value != smile;
                     }
                 }
@@ -1013,7 +1013,7 @@ window.Modernizr = (function( window, document, undefined ) {
         /** Name of the expando, to work with multiple documents or to re-shiv one document */
         var expando = '_html5shiv';
 
-        /** The id for the the documents expando */
+        /** The id for the documents expando */
         var expanID = 0;
 
         /** Cached data for each document */
diff --git a/lib/web/prototype/validation.js b/lib/web/prototype/validation.js
index 616d49496e2a7..3cc0f6d8bc6ac 100644
--- a/lib/web/prototype/validation.js
+++ b/lib/web/prototype/validation.js
@@ -513,7 +513,7 @@ Validation.addAllThese([
     ['validate-alpha', 'Please use letters only (a-z or A-Z) in this field.', function (v) {
                 return Validation.get('IsEmpty').test(v) ||  /^[a-zA-Z]+$/.test(v)
             }],
-    ['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 (v) {
+    ['validate-code', 'Please use only lowercase letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.', function (v) {
                 return Validation.get('IsEmpty').test(v) ||  /^[a-z]+[a-z0-9_]+$/.test(v)
             }],
     ['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(v) {
diff --git a/lib/web/prototype/windows/README b/lib/web/prototype/windows/README
index e2cb960834593..44da88b6adec5 100644
--- a/lib/web/prototype/windows/README
+++ b/lib/web/prototype/windows/README
@@ -133,7 +133,7 @@ See samples/index.html for more details and go on my web page : http://prototype
             - Add Windows.focusedWindow and  Windows.closeAll
             - Add name to iframe in case of url window
             - Clean up code, use _ for private function (just name convention)
-            - Add Dialog.info function, usefull for for submit or notice info (in Rails)
+            - Add Dialog.info function, usefull for submit or notice info (in Rails)
             - Add minimize and maximize buttons
             - Add alert_lite.css without any images
             - Debug
diff --git a/lib/web/prototype/windows/themes/darkX.css b/lib/web/prototype/windows/themes/darkX.css
index 2f83cfd46addb..1d964b1376d53 100644
--- a/lib/web/prototype/windows/themes/darkX.css
+++ b/lib/web/prototype/windows/themes/darkX.css
@@ -99,23 +99,3 @@
 	font-size: 14px;
 	background:#5E5148;
 }
-
-
-/* FOR IE */
-* html .darkX_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
-}
-
-* html .darkX_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
-}
-
-* html .darkX_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
-}
diff --git a/lib/web/prototype/windows/themes/lighting.css b/lib/web/prototype/windows/themes/lighting.css
index 95ec287a9276f..60fed4aaa2d69 100644
--- a/lib/web/prototype/windows/themes/lighting.css
+++ b/lib/web/prototype/windows/themes/lighting.css
@@ -185,79 +185,6 @@
 	background:transparent url('lighting/spinner.gif') no-repeat center center
 }
 
-/* FOR IE */
-* html .bluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_se, * html .bluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_content {
-	background:#B8D7FF;
-}
-
-
-
 .overlay_greylighting {
 	background-color:#FFF;
 	filter:alpha(opacity=60);
@@ -419,79 +346,6 @@
 	background:transparent url('lighting/spinner.gif') no-repeat center center
 }
 
-/* FOR IE */
-* html .greylighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
-}
-
-* html greylighting_se, * html .greylighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_content {
-	background:#C7C7C7;
-}
-
-
-
 .overlay_greenlighting {
 	background-color:#FFF;
 	filter:alpha(opacity=60);
@@ -653,79 +507,6 @@
 	background:transparent url('lighting/spinner.gif') no-repeat center center
 }
 
-/* FOR IE */
-* html .greenlighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
-}
-
-* html greenlighting_se, * html .greenlighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_content {
-	background:#A4FCA7;
-}
-
-
-
 .overlay_darkbluelighting {
 	background-color:#FFF;
 	filter:alpha(opacity=60);
@@ -885,76 +666,4 @@
 	width:100%;
 	height:16px;
 	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .darkbluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html darkbluelighting_se, * html .darkbluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_content {
-	background:#020EBA;
-}
-
+}
\ No newline at end of file
diff --git a/lib/web/prototype/windows/themes/mac_os_x.css b/lib/web/prototype/windows/themes/mac_os_x.css
index 24751f8688833..d2f556b876e52 100644
--- a/lib/web/prototype/windows/themes/mac_os_x.css
+++ b/lib/web/prototype/windows/themes/mac_os_x.css
@@ -109,62 +109,6 @@
   padding-bottom:24px;
 }
 
-/* FOR IE */
-* html .mac_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-
 /* Focused windows */
 .overlay_blur_os_x {
 	background-color: #85BBEF;
@@ -275,59 +219,3 @@
 .blur_os_x_s .status_bar {
   padding-bottom:24px;
 }
-
-/* FOR IE */
-* html .blur_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
diff --git a/lib/web/prototype/windows/themes/mac_os_x_dialog.css b/lib/web/prototype/windows/themes/mac_os_x_dialog.css
index e663e3c5e2512..5aff20203d0f2 100644
--- a/lib/web/prototype/windows/themes/mac_os_x_dialog.css
+++ b/lib/web/prototype/windows/themes/mac_os_x_dialog.css
@@ -108,53 +108,3 @@
 .mac_os_x_dialog_buttons {
   text-align: center;
 }
-/* FOR IE */
-* html .mac_os_x_dialog_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-
-* html .mac_os_x_dialog_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
diff --git a/lib/web/prototype/windows/themes/nuncio.css b/lib/web/prototype/windows/themes/nuncio.css
index 2c439bd0019a9..275ba53436f40 100644
--- a/lib/web/prototype/windows/themes/nuncio.css
+++ b/lib/web/prototype/windows/themes/nuncio.css
@@ -95,70 +95,3 @@
 .top_draggable, .bottom_draggable {
   cursor:move
 }
-/* FOR IE */
-* html .nuncio_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
-}
-
-* html .nuncio_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
-}
-
-* html .nuncio_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
-}
-
-* html .nuncio_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
-}
-
diff --git a/lib/web/tiny_mce_4/plugins/lineheight/plugin.min.js b/lib/web/tiny_mce_4/plugins/lineheight/plugin.min.js
new file mode 100644
index 0000000000000..222e138f7a08d
--- /dev/null
+++ b/lib/web/tiny_mce_4/plugins/lineheight/plugin.min.js
@@ -0,0 +1 @@
+(function(e){e.PluginManager.add("lineheight",function(t,n,r){t.on("init",function(){t.formatter.register({lineheight:{inline:"span",styles:{"line-height":"%value"}}})});t.addButton("lineheightselect",function(){var n=[],r="8pt 10pt 12pt 14pt 18pt 24pt 36pt";var i=t.settings.lineheight_formats||r;i.split(" ").forEach(function(e){var t=e,r=e;var i=e.split("=");if(i.length>1){t=i[0];r=i[1]}n.push({text:t,value:r})});return{type:"listbox",text:"Line Height",tooltip:"Line Height",values:n,fixedWidth:true,onPostRender:function(){var e=this;t.on("nodeChange",function(r){var i="lineheight";var s=t.formatter;var o=null;r.parents.forEach(function(e){n.forEach(function(t){if(i){if(s.matchNode(e,i,{value:t.value})){o=t.value}}else{if(s.matchNode(e,t.value)){o=t.value}}if(o){return false}});if(o){return false}});e.value(o)})},onselect:function(t){e.activeEditor.formatter.apply("lineheight",{value:this.value()})}}})});e.PluginManager.requireLangPack("lineheight","de")})(tinymce)
\ No newline at end of file
diff --git a/lib/web/underscore.js b/lib/web/underscore.js
index e272fca43f7b6..efaaad38007b7 100644
--- a/lib/web/underscore.js
+++ b/lib/web/underscore.js
@@ -1327,7 +1327,8 @@
     '>': '&gt;',
     '"': '&quot;',
     "'": '&#x27;',
-    '`': '&#x60;'
+    '`': '&#x60;',
+    "'": '&#039;',
   };
   var unescapeMap = _.invert(escapeMap);
 
diff --git a/lib/web/varien/form.js b/lib/web/varien/form.js
deleted file mode 100644
index 02e5e82ecfe72..0000000000000
--- 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/lib/web/varien/js.js b/lib/web/varien/js.js
index 55e41a1652cb8..45032829f2fd8 100644
--- a/lib/web/varien/js.js
+++ b/lib/web/varien/js.js
@@ -607,17 +607,11 @@ if (!("console" in window) || !("firebug" in console))
  * @example fireEvent($('my-input', 'click'));
  */
 function fireEvent(element, event) {
-    if (document.createEvent) {
-        // dispatch for all browsers except IE before version 9
-        var evt = document.createEvent('HTMLEvents');
+    // dispatch event
+    var evt = document.createEvent('HTMLEvents');
 
-        evt.initEvent(event, true, true); // event type, bubbling, cancelable
-        return element.dispatchEvent(evt);
-    }
-    // dispatch for IE before version 9
-    var evt = document.createEventObject();
-
-    return element.fireEvent('on' + event, evt);
+    evt.initEvent(event, true, true); // event type, bubbling, cancelable
+    return element.dispatchEvent(evt);
 
 }
 
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 58c059657c070..90604808f6ec0 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -3,7 +3,6 @@
 #    # use tcp connection
 #    # server  127.0.0.1:9000;
 #    # or socket
-#    server   unix:/var/run/php5-fpm.sock;
 #    server   unix:/var/run/php/php7.0-fpm.sock;
 # }
 # server {
@@ -100,10 +99,10 @@ location /static/ {
 
     # Remove signature of the static files that is used to overcome the browser cache
     location ~ ^/static/version {
-        rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
+        rewrite ^/static/(version[^/]+/)?(.*)$ /static/$2 last;
     }
 
-    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$ {
         add_header Cache-Control "public";
         add_header X-Frame-Options "SAMEORIGIN";
         expires +1y;
@@ -162,7 +161,7 @@ location /media/import/ {
 }
 
 # PHP entry point for main application
-location ~ (index|get|static|report|404|503)\.php$ {
+location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)\.php$ {
     try_files $uri =404;
     fastcgi_pass   fastcgi_backend;
     fastcgi_buffers 1024 4k;
diff --git a/php.ini.sample b/php.ini.sample
deleted file mode 100644
index 8a7d13cf42b4e..0000000000000
--- a/php.ini.sample
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright © Magento, Inc. All rights reserved.
-; See COPYING.txt for license details.
-; This file is for CGI/FastCGI installations.
-; Try copying it to php5.ini, if it doesn't work
-
-; adjust memory limit
-
-memory_limit = 64M
-
-max_execution_time = 18000
-
-; disable automatic session start
-; before autoload was initialized
-
-flag session.auto_start = off
-
-; enable resulting html compression
-
-zlib.output_compression = on
-
-; disable user agent verification to not break multiple image upload
-
-suhosin.session.cryptua = off
-
-; PHP for some reason ignores this setting in system php.ini
-; and disables mcrypt if this line is missing in local php.ini
-
-extension=mcrypt.so
-
-; Disable PHP errors, notices and warnings output in production mode to prevent exposing sensitive information.
-
-display_errors = Off
diff --git a/phpserver/README.md b/phpserver/README.md
index 63436c8af7883..6bb814fe5f5f2 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ../phpserver/router.php```
 
 ### What exactly the script does
 
diff --git a/phpserver/router.php b/phpserver/router.php
index a12e9178ecad4..06c23ecdfe3cd 100644
--- a/phpserver/router.php
+++ b/phpserver/router.php
@@ -103,6 +103,7 @@
         } else {
             $debug('file does not exist');
             if (strpos($route, 'static/') === 0) {
+                $route = preg_replace('#static/#', '', $route, 1);
                 $_GET['resource'] = $route;
                 $debug("static: $route");
                 include($magentoPackagePubDir.'/static.php');
diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif
index f1f7fcaf4f020..0cca183e08da2 100644
Binary files a/pub/errors/default/images/logo.gif and b/pub/errors/default/images/logo.gif differ
diff --git a/pub/errors/default/report.phtml b/pub/errors/default/report.phtml
index f907e73149d41..546b96605ec1b 100644
--- a/pub/errors/default/report.phtml
+++ b/pub/errors/default/report.phtml
@@ -36,25 +36,25 @@
         </div>
         <div class="field lastname required">
             <label for="lastname" class="label">Last Name</label>
-            <div class=control">
+            <div class="control">
                 <input type="text" name="lastname" id="lastname" value="<?= $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
             </div>
         </div>
         <div class="field email required">
             <label for="email_address" class="label">Email Address</label>
-            <div class=control">
+            <div class="control">
                 <input type="text" name="email" id="email_address" value="<?= $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
             </div>
         </div>
         <div class="field telephone">
             <label for="telephone" class="label">Telephone</label>
-            <div class=control">
+            <div class="control">
                 <input type="text" name="telephone" id="telephone" value="<?= $this->postData['telephone'] ?>" title="Telephone" class="input-text" />
             </div>
         </div>
         <div class="field comment">
             <label for="comment" class="label">Comment</label>
-            <div class=control">
+            <div class="control">
                 <textarea name="comment" cols="5" rows="3" class="textarea"><?= $this->postData['comment'] ?></textarea>
             </div>
         </div>
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 0b9fefc8b441c..cff3a14921d38 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -215,7 +215,7 @@ public function process503()
     public function processReport()
     {
         $this->pageTitle = 'There has been an error processing your request';
-        $this->_response->setHttpResponseCode(503);
+        $this->_response->setHttpResponseCode(500);
 
         $this->showErrorMsg = false;
         $this->showSentMsg  = false;
@@ -257,25 +257,38 @@ public function getHostUrl()
         /**
          * Define server http host
          */
-        if (!empty($_SERVER['HTTP_HOST'])) {
-            $host = $_SERVER['HTTP_HOST'];
-        } elseif (!empty($_SERVER['SERVER_NAME'])) {
-            $host = $_SERVER['SERVER_NAME'];
-        } else {
-            $host = 'localhost';
-        }
+        $host = $this->resolveHostName();
 
-        $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] != 'off');
+        $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off')
+            || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');
         $url = ($isSecure ? 'https://' : 'http://') . $host;
 
-        if (!empty($_SERVER['SERVER_PORT']) && !in_array($_SERVER['SERVER_PORT'], [80, 443])
+        $port = explode(':', $host);
+        if (isset($port[1]) && !in_array($port[1], [80, 443])
             && !preg_match('/.*?\:[0-9]+$/', $url)
         ) {
-            $url .= ':' . $_SERVER['SERVER_PORT'];
+            $url .= ':' . $port[1];
         }
         return  $url;
     }
 
+    /**
+     * Resolve hostname
+     *
+     * @return string
+     */
+    private function resolveHostName() : string
+    {
+        if (!empty($_SERVER['HTTP_HOST'])) {
+            $host = $_SERVER['HTTP_HOST'];
+        } elseif (!empty($_SERVER['SERVER_NAME'])) {
+            $host = $_SERVER['SERVER_NAME'];
+        } else {
+            $host = 'localhost';
+        }
+        return $host;
+    }
+
     /**
      * Retrieve base URL
      *
@@ -379,6 +392,8 @@ protected function _loadXml($xmlFile)
     }
 
     /**
+     * Render page
+     *
      * @param string $template
      * @return string
      */
@@ -463,7 +478,7 @@ protected function _setReportData($reportData)
     public function saveReport($reportData)
     {
         $this->reportData = $reportData;
-        $this->reportId   = abs(intval(microtime(true) * rand(100, 1000)));
+        $this->reportId   = abs((int)(microtime(true) * random_int(100, 1000)));
         $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
         $this->_setReportData($reportData);
 
diff --git a/pub/index.php b/pub/index.php
index 457b83c529488..612e190719053 100644
--- a/pub/index.php
+++ b/pub/index.php
@@ -25,12 +25,15 @@
 }
 
 $params = $_SERVER;
-$params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = [
-    DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
-    DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],
-    DirectoryList::STATIC_VIEW => [DirectoryList::URL_PATH => 'static'],
-    DirectoryList::UPLOAD => [DirectoryList::URL_PATH => 'media/upload'],
-];
+$params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = array_replace_recursive(
+    $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] ?? [],
+    [
+        DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
+        DirectoryList::MEDIA => [DirectoryList::URL_PATH => 'media'],
+        DirectoryList::STATIC_VIEW => [DirectoryList::URL_PATH => 'static'],
+        DirectoryList::UPLOAD => [DirectoryList::URL_PATH => 'media/upload'],
+    ]
+);
 $bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $params);
 /** @var \Magento\Framework\App\Http $app */
 $app = $bootstrap->createApplication(\Magento\Framework\App\Http::class);
diff --git a/pub/static/.htaccess b/pub/static/.htaccess
index 21fe6a63e64ba..a5aa6fb0d5cfd 100644
--- a/pub/static/.htaccess
+++ b/pub/static/.htaccess
@@ -12,6 +12,9 @@ Options -MultiViews
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
+    ## you can put here your pub/static folder path relative to web root
+    #RewriteBase /magento/pub/static/
+
     # Remove signature of the static files that is used to overcome the browser cache
     RewriteRule ^version.+?/(.+)$ $1 [L]
 
@@ -19,6 +22,11 @@ Options -MultiViews
     RewriteCond %{REQUEST_FILENAME} !-l
 
     RewriteRule .* ../static.php?resource=$0 [L]
+    # Detects if moxieplayer request with uri params and redirects to uri without params
+    <Files moxieplayer.swf>
+     	RewriteCond %{QUERY_STRING} !^$
+     	RewriteRule ^(.*)$ %{REQUEST_URI}? [R=301,L]
+     </Files>
 </IfModule>
 
 ############################################
@@ -64,7 +72,7 @@ AddType application/xml xml
 
 <IfModule mod_headers.c>
 
-    <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$>
+    <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$>
         Header append Cache-Control public
     </FilesMatch>
 
@@ -94,12 +102,13 @@ AddType application/xml xml
     ExpiresByType application/x-bzip2 "access plus 0 seconds"
 
     # CSS, JavaScript, html
-    <FilesMatch \.(css|js|html)$>
+    <FilesMatch \.(css|js|html|json)$>
         ExpiresDefault "access plus 1 year"
     </FilesMatch>
     ExpiresByType text/css "access plus 1 year"
     ExpiresByType text/html "access plus 1 year"
     ExpiresByType application/javascript "access plus 1 year"
+    ExpiresByType application/json "access plus 1 year"
 
     # Favicon, images, flash
     <FilesMatch \.(ico|gif|png|jpg|jpeg|swf|svg)$>
diff --git a/setup/config/di.config.php b/setup/config/di.config.php
index d43a1e569c204..fbdebe7a96e18 100644
--- a/setup/config/di.config.php
+++ b/setup/config/di.config.php
@@ -6,45 +6,6 @@
 
 return [
     'di' => [
-        'allowed_controllers' => [
-            \Magento\Setup\Controller\Index::class,
-            \Magento\Setup\Controller\LandingInstaller::class,
-            \Magento\Setup\Controller\LandingUpdater::class,
-            \Magento\Setup\Controller\CreateBackup::class,
-            \Magento\Setup\Controller\CompleteBackup::class,
-            \Magento\Setup\Controller\Navigation::class,
-            \Magento\Setup\Controller\Home::class,
-            \Magento\Setup\Controller\SelectVersion::class,
-            \Magento\Setup\Controller\License::class,
-            \Magento\Setup\Controller\ReadinessCheckInstaller::class,
-            \Magento\Setup\Controller\ReadinessCheckUpdater::class,
-            \Magento\Setup\Controller\Environment::class,
-            \Magento\Setup\Controller\DependencyCheck::class,
-            \Magento\Setup\Controller\DatabaseCheck::class,
-            \Magento\Setup\Controller\UrlCheck::class,
-            \Magento\Setup\Controller\ValidateAdminCredentials::class,
-            \Magento\Setup\Controller\AddDatabase::class,
-            \Magento\Setup\Controller\WebConfiguration::class,
-            \Magento\Setup\Controller\CustomizeYourStore::class,
-            \Magento\Setup\Controller\CreateAdminAccount::class,
-            \Magento\Setup\Controller\Install::class,
-            \Magento\Setup\Controller\Success::class,
-            \Magento\Setup\Controller\Modules::class,
-            \Magento\Setup\Controller\ModuleGrid::class,
-            \Magento\Setup\Controller\ExtensionGrid::class,
-            \Magento\Setup\Controller\StartUpdater::class,
-            \Magento\Setup\Controller\UpdaterSuccess::class,
-            \Magento\Setup\Controller\BackupActionItems::class,
-            \Magento\Setup\Controller\Maintenance::class,
-            \Magento\Setup\Controller\OtherComponentsGrid::class,
-            \Magento\Setup\Controller\DataOption::class,
-            \Magento\Setup\Controller\Marketplace::class,
-            \Magento\Setup\Controller\SystemConfig::class,
-            \Magento\Setup\Controller\InstallExtensionGrid::class,
-            \Magento\Setup\Controller\UpdateExtensionGrid::class,
-            \Magento\Setup\Controller\MarketplaceCredentials::class,
-            \Magento\Setup\Controller\Session::class,
-        ],
         'instance' => [
             'preference' => [
                 \Zend\EventManager\EventManagerInterface::class => 'EventManager',
@@ -56,6 +17,15 @@
                 \Magento\Framework\Component\ComponentRegistrarInterface::class =>
                     \Magento\Framework\Component\ComponentRegistrar::class,
             ],
+            \Magento\Framework\Setup\Declaration\Schema\SchemaConfig::class => [
+                'parameters' => [
+                    'connectionScopes' => [
+                        'default',
+                        'checkout',
+                        'sales'
+                    ]
+                ]
+            ],
         ],
     ],
 ];
diff --git a/setup/config/module.config.php b/setup/config/module.config.php
index a2e5501ce3d8b..7816c8e3599f3 100644
--- a/setup/config/module.config.php
+++ b/setup/config/module.config.php
@@ -32,7 +32,12 @@
     ],
     'service_manager' => [
         'aliases' => [
-            'translator' => 'MvcTranslator',
+            'translator' => 'MvcTranslator'
+        ]
+    ],
+    'controllers' => [
+        'abstract_factories' => [
+            \Zend\Mvc\Controller\LazyControllerAbstractFactory::class,
         ],
     ],
 ];
diff --git a/setup/index.php b/setup/index.php
index 108069395e079..0653ed97b07fa 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 use Magento\Setup\Application;
+use Magento\Setup\Model\ObjectManagerProvider;
 
 if (PHP_SAPI == 'cli') {
     echo "You cannot run this from the command line." . PHP_EOL .
@@ -32,4 +33,7 @@
 $configuration = require __DIR__ . '/config/application.config.php';
 $bootstrap = new Application();
 $application = $bootstrap->bootstrap($configuration);
+$application->getServiceManager()
+    ->get(ObjectManagerProvider::class)
+    ->setObjectManager(\Magento\Framework\App\Bootstrap::create(BP, $_SERVER)->getObjectManager());
 $application->run();
diff --git a/setup/performance-toolkit/README.md b/setup/performance-toolkit/README.md
index 700f6cd0d775d..bb0a023ab8af1 100644
--- a/setup/performance-toolkit/README.md
+++ b/setup/performance-toolkit/README.md
@@ -116,7 +116,7 @@ To get more details about available JMeter options, read [Non-GUI Mode](http://j
 For example, you can run the B2C scenario via console with 90 threads for the Frontend Pool and 10 threads for the Admin Pool:
 
     cd {JMeter path}/bin/
-    jmeter -n -t {path to peformance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10
+    jmeter -n -t {path to performance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10
 
 As a result, you will get `jmeter.log` and `jmeter-results.jtl`. The`jmeter.log` contains information about the test run and can be helpful in determining the cause of an error.  The JTL file is a text file containing the results of a test run. It can be opened in the GUI mode to perform analysis of the results (see the *Output* section below).
 
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 92d096176e903..e7e3087419b55 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -214,6 +214,11 @@
             <stringProp name="Argument.value">${__P(admin_browse_product_filter_text,Product)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="admin_users_distribution_per_admin_pool" elementType="Argument">
+            <stringProp name="Argument.name">admin_users_distribution_per_admin_pool</stringProp>
+            <stringProp name="Argument.value">${__P(admin_users_distribution_per_admin_pool,1)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="apiBasePercentage" elementType="Argument">
             <stringProp name="Argument.name">apiBasePercentage</stringProp>
             <stringProp name="Argument.value">${__P(apiBasePercentage,0)}</stringProp>
@@ -264,6 +269,11 @@
             <stringProp name="Argument.value">${__P(browseProductGridPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="cache_hits_percentage" elementType="Argument">
+            <stringProp name="Argument.name">cache_hits_percentage</stringProp>
+            <stringProp name="Argument.value">${__P(cache_hits_percentage,100)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="catalogGraphQLPercentage" elementType="Argument">
             <stringProp name="Argument.name">catalogGraphQLPercentage</stringProp>
             <stringProp name="Argument.value">${__P(catalogGraphQLPercentage,0)}</stringProp>
@@ -291,7 +301,7 @@
           </elementProp>
           <elementProp name="configurable_products_count" elementType="Argument">
             <stringProp name="Argument.name">configurable_products_count</stringProp>
-            <stringProp name="Argument.value">${__P(configurable_products_count,30)}</stringProp>
+            <stringProp name="Argument.value">${__P(configurable_products_count,15)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="csrPoolUsers" elementType="Argument">
@@ -564,8 +574,8 @@
       </elementProp>
       <stringProp name="HTTPSampler.domain">${host}</stringProp>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding">utf-8</stringProp>
       <stringProp name="HTTPSampler.path"/>
@@ -643,7 +653,9 @@ props.remove("category_url_keys_list");
 props.remove("category_name");
 props.remove("category_names_list");
 props.remove("simple_products_list");
+props.remove("simple_products_list_for_edit");
 props.remove("configurable_products_list");
+props.remove("configurable_products_list_for_edit");
 props.remove("users");
 props.remove("customer_emails_list");
 
@@ -692,8 +704,8 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
@@ -772,8 +784,8 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -841,8 +853,8 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -933,8 +945,8 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}rest/V1/categories/list</stringProp>
@@ -1044,6 +1056,186 @@ props.put("category_name", vars.get("category_name"));</stringProp>
       <hashTree/>
     </hashTree>
   
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories id of last level" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Clear Admin Category Management properties" enabled="true">
+        <stringProp name="BeanShellSampler.query">props.remove("admin_category_ids_list");</stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Get categories of last level" enabled="true"/>
+      <hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Content-Type</stringProp>
+              <stringProp name="Header.value">application/json</stringProp>
+            </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Accept</stringProp>
+              <stringProp name="Header.value">*/*</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+            <stringProp name="VAR">admin_token</stringProp>
+            <stringProp name="JSONPATH">$</stringProp>
+            <stringProp name="DEFAULT"/>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">1</intProp>
+            <stringProp name="Assertion.scope">variable</stringProp>
+            <stringProp name="Scope.variable">admin_token</stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Authorization</stringProp>
+              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get categories" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">children_count</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">level</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][1][filters][0][conditionType]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">gt</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][conditionType]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">${adminCategoryCount}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/list</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">category_list_id</stringProp>
+            <stringProp name="RegexExtractor.regex">\{\"id\":(\d+),</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Category Id" enabled="true">
+          <stringProp name="ForeachController.inputVal">category_list_id</stringProp>
+          <stringProp name="ForeachController.returnVal">category_id</stringProp>
+          <boolProp name="ForeachController.useSeparator">true</boolProp>
+        </ForeachController>
+        <hashTree>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process categories ids" enabled="true">
+            <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
+
+adminCategoryIdsList = props.get("admin_category_ids_list");
+// If it is first iteration of cycle then recreate categories ids list
+if (adminCategoryIdsList == null) {
+    adminCategoryIdsList = new ArrayList();
+    props.put("admin_category_ids_list", adminCategoryIdsList);
+}
+adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  
     <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products" enabled="true">
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products.jmx</stringProp>
 </TestFragmentController>
@@ -1076,8 +1268,8 @@ props.put("category_name", vars.get("category_name"));</stringProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -1147,8 +1339,8 @@ props.put("category_name", vars.get("category_name"));</stringProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
@@ -1173,7 +1365,7 @@ props.put("category_name", vars.get("category_name"));</stringProp>
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
             <stringProp name="RegexExtractor.refname">configurable_product_ids</stringProp>
-            <stringProp name="RegexExtractor.regex">\"id\":(\d+),</stringProp>
+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"/>
             <stringProp name="RegexExtractor.match_number">-1</stringProp>
@@ -1247,11 +1439,11 @@ productList.add(productMap);</stringProp>
       </hashTree>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products.jmx</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products for edit" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products_for_edit.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products" enabled="true"/>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve configurable products for edit" enabled="true"/>
       <hashTree>
         <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
           <collectionProp name="HeaderManager.headers">
@@ -1279,8 +1471,8 @@ productList.add(productMap);</stringProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -1322,7 +1514,7 @@ productList.add(productMap);</stringProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products" enabled="true">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get configurable products for edit" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
@@ -1334,24 +1526,31 @@ productList.add(productMap);</stringProp>
               </elementProp>
               <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">simple</stringProp>
+                <stringProp name="Argument.value">configurable</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
                 <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
               </elementProp>
               <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">${simple_products_count}</stringProp>
+                <stringProp name="Argument.value">${configurable_products_count}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
                 <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
               </elementProp>
+              <elementProp name="searchCriteria[currentPage]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[currentPage]</stringProp>
+              </elementProp>
             </collectionProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
@@ -1366,7 +1565,7 @@ productList.add(productMap);</stringProp>
         <hashTree>
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp>
+            <stringProp name="RegexExtractor.refname">configurable_products_for_edit_url_keys</stringProp>
             <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"/>
@@ -1375,8 +1574,8 @@ productList.add(productMap);</stringProp>
           <hashTree/>
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_product_ids</stringProp>
-            <stringProp name="RegexExtractor.regex">\"id\":(\d+),</stringProp>
+            <stringProp name="RegexExtractor.refname">configurable_product_for_edit_ids</stringProp>
+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"/>
             <stringProp name="RegexExtractor.match_number">-1</stringProp>
@@ -1384,7 +1583,7 @@ productList.add(productMap);</stringProp>
           <hashTree/>
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_product_names</stringProp>
+            <stringProp name="RegexExtractor.refname">configurable_product_for_edit_names</stringProp>
             <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"/>
@@ -1393,7 +1592,7 @@ productList.add(productMap);</stringProp>
           <hashTree/>
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_product_skus</stringProp>
+            <stringProp name="RegexExtractor.refname">configurable_product_for_edit_skus</stringProp>
             <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"/>
@@ -1402,45 +1601,45 @@ productList.add(productMap);</stringProp>
           <hashTree/>
         </hashTree>
       </hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products" enabled="true">
-        <stringProp name="ForeachController.inputVal">simple_product_ids</stringProp>
-        <stringProp name="ForeachController.returnVal">simple_product_id</stringProp>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare configurable products for edit" enabled="true">
+        <stringProp name="ForeachController.inputVal">configurable_product_for_edit_ids</stringProp>
+        <stringProp name="ForeachController.returnVal">configurable_product_for_edit_id</stringProp>
         <boolProp name="ForeachController.useSeparator">true</boolProp>
       </ForeachController>
       <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter for edit" enabled="true">
           <stringProp name="CounterConfig.start">1</stringProp>
           <stringProp name="CounterConfig.end"/>
           <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">simple_products_counter</stringProp>
+          <stringProp name="CounterConfig.name">configurable_products_counter_for_edit</stringProp>
           <stringProp name="CounterConfig.format"/>
           <boolProp name="CounterConfig.per_user">false</boolProp>
         </CounterConfig>
         <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product" enabled="true">
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect configurable product for edit" enabled="true">
           <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
 import java.util.HashMap;
 import org.apache.commons.codec.binary.Base64;
 
-// If it is first iteration of cycle then recreate productList
-if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
-    productList = new ArrayList();
-    props.put("simple_products_list", productList);
+if (1 == Integer.parseInt(vars.get("configurable_products_counter_for_edit"))) {
+    editProductList = new ArrayList();
+    props.put("configurable_products_list_for_edit", editProductList);
 } else {
-    productList = props.get("simple_products_list");
+    productList = props.get("configurable_products_list_for_edit");
 }
-String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
+
+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("configurable_products_for_edit_url_keys_" + vars.get("configurable_products_counter_for_edit"))+ vars.get("url_suffix");
 encodedUrl = Base64.encodeBase64(productUrl.getBytes());
 // Create product map
-Map productMap = new HashMap();
-productMap.put("id", vars.get("simple_product_id"));
-productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
-productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
-productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
-productMap.put("uenc", new String(encodedUrl));
+Map editProductMap = new HashMap();
+editProductMap.put("id", vars.get("configurable_product_for_edit_id"));
+editProductMap.put("title", vars.get("configurable_product_for_edit_names_" + vars.get("configurable_products_counter_for_edit")));
+editProductMap.put("sku", vars.get("configurable_product_for_edit_skus_" + vars.get("configurable_products_counter_for_edit")));
+editProductMap.put("url_key", vars.get("configurable_products_for_edit_url_keys_" + vars.get("configurable_products_counter_for_edit")));
+editProductMap.put("uenc", new String(encodedUrl));
 
 // Collect products map in products list
-productList.add(productMap);</stringProp>
+editProductList.add(editProductMap);</stringProp>
           <stringProp name="BeanShellSampler.filename"/>
           <stringProp name="BeanShellSampler.parameters"/>
           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
@@ -1449,117 +1648,557 @@ productList.add(productMap);</stringProp>
       </hashTree>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract admin users" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_admin_users.jmx</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products for edit" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Admin Users" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="form_key" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products for edit" enabled="true"/>
+      <hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Content-Type</stringProp>
+              <stringProp name="Header.value">application/json</stringProp>
+            </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Accept</stringProp>
+              <stringProp name="Header.value">*/*</stringProp>
             </elementProp>
           </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&amp;isAjax=true</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+            <stringProp name="VAR">admin_token</stringProp>
+            <stringProp name="JSONPATH">$</stringProp>
+            <stringProp name="DEFAULT"/>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">1</intProp>
+            <stringProp name="Assertion.scope">variable</stringProp>
+            <stringProp name="Scope.variable">admin_token</stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Authorization</stringProp>
+              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products for edit" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">type_id</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">simple</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">${simple_products_count}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[currentPage]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">1</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[currentPage]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][1][filters][1][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">attribute_set_id</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][1][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][1][filters][1][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">4</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][1][value]</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_products_for_edit_url_keys</stringProp>
+            <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_for_edit_ids</stringProp>
+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_for_edit_names</stringProp>
+            <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_for_edit_skus</stringProp>
+            <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products for edit" enabled="true">
+        <stringProp name="ForeachController.inputVal">simple_product_for_edit_ids</stringProp>
+        <stringProp name="ForeachController.returnVal">simple_product_for_edit_id</stringProp>
+        <boolProp name="ForeachController.useSeparator">true</boolProp>
+      </ForeachController>
       <hashTree>
-        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
-          <stringProp name="filename"/>
-          <stringProp name="parameters"/>
-          <boolProp name="resetInterpreter">false</boolProp>
-          <stringProp name="script">import java.util.regex.Pattern;
-                    import java.util.regex.Matcher;
-                    import java.util.LinkedList;
+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter for edit" enabled="true">
+          <stringProp name="CounterConfig.start">1</stringProp>
+          <stringProp name="CounterConfig.end"/>
+          <stringProp name="CounterConfig.incr">1</stringProp>
+          <stringProp name="CounterConfig.name">simple_products_counter_for_edit</stringProp>
+          <stringProp name="CounterConfig.format"/>
+          <boolProp name="CounterConfig.per_user">false</boolProp>
+        </CounterConfig>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product for edit" enabled="true">
+          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
+import java.util.HashMap;
+import org.apache.commons.codec.binary.Base64;
 
-                    LinkedList adminUserList = new LinkedList();
-                    String response = new String(data);
-                    Pattern pattern = Pattern.compile("&lt;td\\W*?data-column=.username[^&gt;]*?&gt;\\W*?(\\w+)\\W*?&lt;");
-                    Matcher matcher = pattern.matcher(response);
+if (1 == Integer.parseInt(vars.get("simple_products_counter_for_edit"))) {
+    editProductList = new ArrayList();
+    props.put("simple_products_list_for_edit", editProductList);
+} else {
+    productList = props.get("simple_products_counter_for_edit");
+}
 
-                    while (matcher.find()) {
-                    adminUserList.add(matcher.group(1));
-                    }
+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_for_edit_url_keys_" + vars.get("simple_products_counter_for_edit"))+ vars.get("url_suffix");
+encodedUrl = Base64.encodeBase64(productUrl.getBytes());
+// Create product map
+Map editProductMap = new HashMap();
+editProductMap.put("id", vars.get("simple_product_for_edit_id"));
+editProductMap.put("title", vars.get("simple_product_for_edit_names_" + vars.get("simple_products_counter_for_edit")));
+editProductMap.put("sku", vars.get("simple_product_for_edit_skus_" + vars.get("simple_products_counter_for_edit")));
+editProductMap.put("url_key", vars.get("simple_products_for_edit_url_keys_" + vars.get("simple_products_counter_for_edit")));
+editProductMap.put("uenc", new String(encodedUrl));
 
-                    adminUserList.poll();
-                    props.put("adminUserList", adminUserList);
-                </stringProp>
-        </BeanShellPostProcessor>
+// Collect products map in products list
+editProductList.add(editProductMap);</stringProp>
+          <stringProp name="BeanShellSampler.filename"/>
+          <stringProp name="BeanShellSampler.parameters"/>
+          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+        </BeanShellSampler>
         <hashTree/>
       </hashTree>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract customers" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_customers.jmx</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Open Customer Grid" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products" enabled="true"/>
       <hashTree>
-        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
-          <stringProp name="filename"/>
-          <stringProp name="parameters"/>
-          <boolProp name="resetInterpreter">true</boolProp>
-          <stringProp name="script">import org.apache.jmeter.protocol.http.control.CookieManager;
-import org.apache.jmeter.protocol.http.control.Cookie;
-CookieManager manager = sampler.getCookieManager();
-Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
-manager.add(cookie); </stringProp>
-        </BeanShellPreProcessor>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="-679437259">Customers</stringProp>
-            <stringProp name="495525733">&lt;title&gt;Customers / Customers / Magento Admin&lt;/title&gt;</stringProp>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Content-Type</stringProp>
+              <stringProp name="Header.value">application/json</stringProp>
+            </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Accept</stringProp>
+              <stringProp name="Header.value">*/*</stringProp>
+            </elementProp>
           </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
+        </HeaderManager>
         <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Search Customers" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="namespace" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">customer_listing</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+            <stringProp name="VAR">admin_token</stringProp>
+            <stringProp name="JSONPATH">$</stringProp>
+            <stringProp name="DEFAULT"/>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">1</intProp>
+            <stringProp name="Assertion.scope">variable</stringProp>
+            <stringProp name="Scope.variable">admin_token</stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Authorization</stringProp>
+              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">type_id</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">simple</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">${simple_products_count}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">attribute_set_id</stringProp>
+                <stringProp name="Argument.metadata">!=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">4</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp>
+            <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_ids</stringProp>
+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_names</stringProp>
+            <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_skus</stringProp>
+            <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products" enabled="true">
+        <stringProp name="ForeachController.inputVal">simple_product_ids</stringProp>
+        <stringProp name="ForeachController.returnVal">simple_product_id</stringProp>
+        <boolProp name="ForeachController.useSeparator">true</boolProp>
+      </ForeachController>
+      <hashTree>
+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+          <stringProp name="CounterConfig.start">1</stringProp>
+          <stringProp name="CounterConfig.end"/>
+          <stringProp name="CounterConfig.incr">1</stringProp>
+          <stringProp name="CounterConfig.name">simple_products_counter</stringProp>
+          <stringProp name="CounterConfig.format"/>
+          <boolProp name="CounterConfig.per_user">false</boolProp>
+        </CounterConfig>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product" enabled="true">
+          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
+import java.util.HashMap;
+import org.apache.commons.codec.binary.Base64;
+
+// If it is first iteration of cycle then recreate productList
+if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
+    productList = new ArrayList();
+    props.put("simple_products_list", productList);
+} else {
+    productList = props.get("simple_products_list");
+}
+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
+encodedUrl = Base64.encodeBase64(productUrl.getBytes());
+// Create product map
+Map productMap = new HashMap();
+productMap.put("id", vars.get("simple_product_id"));
+productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
+productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
+productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
+productMap.put("uenc", new String(encodedUrl));
+
+// Collect products map in products list
+productList.add(productMap);</stringProp>
+          <stringProp name="BeanShellSampler.filename"/>
+          <stringProp name="BeanShellSampler.parameters"/>
+          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract admin users" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_admin_users.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Admin Users" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&amp;isAjax=true</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+          <stringProp name="filename"/>
+          <stringProp name="parameters"/>
+          <boolProp name="resetInterpreter">false</boolProp>
+          <stringProp name="script">import java.util.regex.Pattern;
+                    import java.util.regex.Matcher;
+                    import java.util.LinkedList;
+
+                    LinkedList adminUserList = new LinkedList();
+                    String response = new String(data);
+                    Pattern pattern = Pattern.compile("&lt;td\\W*?data-column=.username[^&gt;]*?&gt;\\W*?(\\w+)\\W*?&lt;");
+                    Matcher matcher = pattern.matcher(response);
+
+                    while (matcher.find()) {
+                    adminUserList.add(matcher.group(1));
+                    }
+
+                    adminUserList.poll();
+                    props.put("adminUserList", adminUserList);
+                    props.put("adminUserListIterator", adminUserList.descendingIterator());
+                </stringProp>
+        </BeanShellPostProcessor>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract customers" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_customers.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Open Customer Grid" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+          <stringProp name="filename"/>
+          <stringProp name="parameters"/>
+          <boolProp name="resetInterpreter">true</boolProp>
+          <stringProp name="script">import org.apache.jmeter.protocol.http.control.CookieManager;
+import org.apache.jmeter.protocol.http.control.Cookie;
+CookieManager manager = sampler.getCookieManager();
+Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
+manager.add(cookie); </stringProp>
+        </BeanShellPreProcessor>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-679437259">Customers</stringProp>
+            <stringProp name="495525733">&lt;title&gt;Customers / Customers / Magento Admin&lt;/title&gt;</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Search Customers" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="namespace" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">customer_listing</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
               <stringProp name="Argument.name">namespace</stringProp>
             </elementProp>
             <elementProp name="sorting[field]" elementType="HTTPArgument">
@@ -1590,6 +2229,13 @@ manager.add(cookie); </stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
               <stringProp name="Argument.name">filters[placeholder]</stringProp>
             </elementProp>
+            <elementProp name="filters[group_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">filters[group_id]</stringProp>
+            </elementProp>
             <elementProp name="filters[website_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
               <stringProp name="Argument.value">1</stringProp>
@@ -1636,8 +2282,8 @@ manager.add(cookie); </stringProp>
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -1751,6 +2397,59 @@ idsList.add(vars.get("customer_id"));</stringProp>
       </hashTree>
     </hashTree>
   
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract region ids" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_region_ids.jmx</stringProp>
+    </TestFragmentController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Region ids" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="parent" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">US</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">parent</stringProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/directory/json/countryRegion/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Parse and put region id into variables" enabled="true">
+          <stringProp name="scriptLanguage">groovy</stringProp>
+          <stringProp name="parameters"/>
+          <stringProp name="filename"/>
+          <stringProp name="cacheKey"/>
+          <stringProp name="script">import groovy.json.JsonSlurper
+def jsonSlurper = new JsonSlurper();
+def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
+
+regionResponse.each { region -&gt;
+	if (region.label.toString() == "Alabama") {
+		props.put("alabama_region_id", region.value.toString());
+	} else if (region.label.toString() == 'California') {
+		props.put("california_region_id", region.value.toString());
+	}
+}</stringProp>
+        </JSR223PostProcessor>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Validate properties and count users" enabled="true">
       <stringProp name="BeanShellSampler.query">Boolean stopTestOnError (String error) {
     log.error(error);
@@ -1762,9 +2461,15 @@ idsList.add(vars.get("customer_id"));</stringProp>
 if (props.get("simple_products_list") == null) {
     return stopTestOnError("Cannot find simple products. Test stopped.");
 }
+if (props.get("simple_products_list_for_edit") == null) {
+    return stopTestOnError("Cannot find simple products for edit. Test stopped.");
+}
 if (props.get("configurable_products_list") == null) {
     return stopTestOnError("Cannot find configurable products. Test stopped.");
 }
+if (props.get("configurable_products_list_for_edit") == null) {
+    return stopTestOnError("Cannot find configurable products for edit. Test stopped.");
+}
 if (props.get("customer_emails_list") == null) {
     return stopTestOnError("Cannot find customer emails. Test stopped.");
 }
@@ -1816,8 +2521,8 @@ if (props.get("category_names_list") == null) {
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp>
@@ -1873,8 +2578,8 @@ if (props.get("category_names_list") == null) {
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}page_cache/block/render/</stringProp>
@@ -1916,6 +2621,30 @@ if (props.get("category_names_list") == null) {
             <stringProp name="ThreadGroup.delay"/>
         <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
         <hashTree>
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Cache hit miss" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">var cacheHitPercent = vars.get("cache_hits_percentage");
+
+if (
+	cacheHitPercent &lt; 100 &amp;&amp;
+	sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+	doCache();
+}
+
+function doCache(){
+	var random = Math.random() * 100;
+	if (cacheHitPercent &lt; random) {
+		sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
+	}
+}
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/cache_hit_miss.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
+  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Catalog Browsing By Customer" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
@@ -2038,8 +2767,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
@@ -2098,8 +2827,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
@@ -2152,12 +2881,12 @@ vars.put("customer_email", customerUser);
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -2170,8 +2899,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -2191,8 +2920,8 @@ vars.put("customer_email", customerUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -2222,8 +2951,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -2310,8 +3039,8 @@ vars.put("product_sku", product.get("sku"));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -2378,8 +3107,8 @@ vars.put("product_sku", product.get("sku"));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -2410,8 +3139,8 @@ vars.put("product_sku", product.get("sku"));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
@@ -2544,8 +3273,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -2575,8 +3304,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -2663,8 +3392,8 @@ vars.put("product_sku", product.get("sku"));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -2731,8 +3460,8 @@ vars.put("product_sku", product.get("sku"));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -2802,6 +3531,30 @@ if (testLabel
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_terms.jmx</stringProp></CSVDataSet>
     <hashTree/>
   
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Cache hit miss" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">var cacheHitPercent = vars.get("cache_hits_percentage");
+
+if (
+	cacheHitPercent &lt; 100 &amp;&amp;
+	sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+	doCache();
+}
+
+function doCache(){
+	var random = Math.random() * 100;
+	if (cacheHitPercent &lt; random) {
+		sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
+	}
+}
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/cache_hit_miss.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
+  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Quick Search" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
@@ -2864,8 +3617,8 @@ if (testLabel
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -2903,8 +3656,8 @@ if (testLabel
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalogsearch/result/</stringProp>
@@ -2936,8 +3689,63 @@ if (testLabel
         <stringProp name="RegexExtractor.match_number">-1</stringProp>
       </RegexExtractor>
       <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: isPageCacheable" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">isPageCacheable</stringProp>
+        <stringProp name="RegexExtractor.regex">catalogsearch/searchTermsLog/save</stringProp>
+        <stringProp name="RegexExtractor.template">$0$</stringProp>
+        <stringProp name="RegexExtractor.default">0</stringProp>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
     </hashTree>
   
+      <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+        <stringProp name="IfController.condition">"${isPageCacheable}" != "0"</stringProp>
+        <boolProp name="IfController.evaluateAll">false</boolProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/if_page_cacheable_controller.jmx</stringProp></IfController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Terms Log" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="q" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">q</stringProp>
+              <stringProp name="Argument.value">${searchTerm}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}catalogsearch/searchTermsLog/save/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_terms_log_save.jmx</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-547797305">"success":true</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+  </hashTree>
+  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
       <stringProp name="BeanShellSampler.query">
 foundProducts = Integer.parseInt(vars.get("product_url_keys_matchNr"));
@@ -2990,8 +3798,8 @@ vars.put("product_url_key", product);
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -3080,8 +3888,8 @@ if (testLabel
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -3119,8 +3927,8 @@ if (testLabel
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol"/>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalogsearch/result/</stringProp>
@@ -3179,8 +3987,63 @@ if (testLabel
         <stringProp name="RegexExtractor.match_number">-1</stringProp>
       </RegexExtractor>
       <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: isPageCacheable" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">isPageCacheable</stringProp>
+        <stringProp name="RegexExtractor.regex">catalogsearch/searchTermsLog/save</stringProp>
+        <stringProp name="RegexExtractor.template">$0$</stringProp>
+        <stringProp name="RegexExtractor.default">0</stringProp>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
     </hashTree>
   
+      <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+        <stringProp name="IfController.condition">"${isPageCacheable}" != "0"</stringProp>
+        <boolProp name="IfController.evaluateAll">false</boolProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/if_page_cacheable_controller.jmx</stringProp></IfController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Terms Log" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="q" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">q</stringProp>
+              <stringProp name="Argument.value">${searchTerm}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}catalogsearch/searchTermsLog/save/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/search/search_terms_log_save.jmx</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion: Assert search result" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-547797305">"success":true</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+  </hashTree>
+  
     <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Attribute 1 present in layered navigation" enabled="true">
       <stringProp name="IfController.condition">${attribute_1_options_count} &gt; 0</stringProp>
       <boolProp name="IfController.evaluateAll">false</boolProp>
@@ -3199,8 +4062,8 @@ if (testLabel
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol"/>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${attribute_1_filter_url}</stringProp>
@@ -3271,8 +4134,8 @@ if (testLabel
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol"/>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${attribute_2_filter_url}</stringProp>
@@ -3359,8 +4222,8 @@ vars.put("product_url_key", product);
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -3449,8 +4312,8 @@ if (testLabel
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -3481,8 +4344,8 @@ if (testLabel
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol"/>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalogsearch/advanced/</stringProp>
@@ -3592,8 +4455,8 @@ if (testLabel
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalogsearch/advanced/result/</stringProp>
@@ -3678,8 +4541,8 @@ vars.put("product_url_key", product);
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -3815,8 +4678,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -3846,8 +4709,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -3948,8 +4811,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -4008,8 +4871,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -4043,12 +4906,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -4061,8 +4924,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -4077,7 +4940,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -4171,8 +5034,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -4227,8 +5090,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -4276,8 +5139,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
@@ -4344,8 +5207,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -4409,12 +5272,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -4427,8 +5290,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -4443,7 +5306,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -4589,8 +5452,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
@@ -4649,8 +5512,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
@@ -4703,12 +5566,12 @@ vars.put("customer_email", customerUser);
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -4721,8 +5584,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -4778,8 +5641,8 @@ vars.put("product_sku", product.get("sku"));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -4832,8 +5695,8 @@ vars.put("product_sku", product.get("sku"));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}wishlist/index/add/</stringProp>
@@ -4876,12 +5739,12 @@ vars.put("product_sku", product.get("sku"));
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
               <stringProp name="Argument.name">sections</stringProp>
             </elementProp>
-            <elementProp name="update_section_id" elementType="HTTPArgument">
+            <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
               <stringProp name="Argument.value">false</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">update_section_id</stringProp>
+              <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             </elementProp>
             <elementProp name="_" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -4894,8 +5757,8 @@ vars.put("product_sku", product.get("sku"));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -4963,8 +5826,8 @@ vars.put("product_sku", product.get("sku"));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}wishlist/index/remove/</stringProp>
@@ -4984,8 +5847,8 @@ vars.put("product_sku", product.get("sku"));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
@@ -5129,8 +5992,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -5230,8 +6093,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -5283,8 +6146,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/add/</stringProp>
@@ -5308,12 +6171,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -5326,8 +6189,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -5408,8 +6271,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -5461,8 +6324,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/add/</stringProp>
@@ -5486,12 +6349,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -5504,8 +6367,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -5536,8 +6399,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/index/</stringProp>
@@ -5572,8 +6435,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}catalog/product_compare/clear</stringProp>
@@ -5696,8 +6559,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -5727,8 +6590,8 @@ vars.put("category_name", props.get("category_names_list").get(number));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -5829,8 +6692,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -5889,8 +6752,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -5924,12 +6787,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -5942,8 +6805,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -5958,7 +6821,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -6052,8 +6915,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -6108,8 +6971,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -6157,8 +7020,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
@@ -6225,8 +7088,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -6290,12 +7153,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -6308,8 +7171,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -6324,7 +7187,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -6366,14 +7229,26 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
 </GenericController>
     <hashTree>
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">
+      vars.put("alabama_region_id", props.get("alabama_region_id"));
+      vars.put("california_region_id", props.get("california_region_id"));
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
+  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout start" enabled="true">
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
         <collectionProp name="Arguments.arguments"/>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/</stringProp>
@@ -6439,8 +7314,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/isEmailAvailable</stringProp>
@@ -6498,8 +7373,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/estimate-shipping-methods</stringProp>
@@ -6550,15 +7425,15 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"countryId":"US","regionId":"12","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
+            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"countryId":"US","regionId":"${california_region_id}","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/shipping-information</stringProp>
@@ -6609,15 +7484,15 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"cartId":"${cart_id}","email":"test@example.com","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"countryId":"US","regionId":"12","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"}}</stringProp>
+            <stringProp name="Argument.value">{"cartId":"${cart_id}","email":"test@example.com","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"countryId":"US","regionId":"${california_region_id}","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"}}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/payment-information</stringProp>
@@ -6687,8 +7562,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/success/</stringProp>
@@ -6849,8 +7724,8 @@ vars.put("customer_email", customerUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -6880,8 +7755,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
@@ -6940,8 +7815,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
@@ -6994,12 +7869,12 @@ vars.put("customer_email", customerUser);
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -7012,8 +7887,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -7033,8 +7908,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -7135,8 +8010,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -7195,8 +8070,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -7230,12 +8105,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -7248,8 +8123,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -7264,7 +8139,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -7358,8 +8233,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -7414,8 +8289,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -7463,8 +8338,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
@@ -7531,8 +8406,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -7596,12 +8471,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -7614,8 +8489,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -7630,7 +8505,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -7672,14 +8547,26 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
 </GenericController>
     <hashTree>
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">
+      vars.put("alabama_region_id", props.get("alabama_region_id"));
+      vars.put("california_region_id", props.get("california_region_id"));
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
+  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout start" enabled="true">
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
         <collectionProp name="Arguments.arguments"/>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/</stringProp>
@@ -7785,8 +8672,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/mine/estimate-shipping-methods-by-address-id</stringProp>
@@ -7837,15 +8724,15 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"customerAddressId":"${address_id}","countryId":"US","regionId":5,"regionCode":"AR","region":"Arkansas","customerId":"${customer_id}","street":["123 Freedom Blvd. #123"],"telephone":"022-333-4455","postcode":"123123","city":"Fayetteville","firstname":"Anthony","lastname":"Nealy"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
+            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"customerAddressId":"${address_id}","countryId":"US","regionId":"${alabama_region_id}","regionCode":"AL","region":"Alabama","customerId":"${customer_id}","street":["123 Freedom Blvd. #123"],"telephone":"022-333-4455","postcode":"123123","city":"Fayetteville","firstname":"Anthony","lastname":"Nealy"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/mine/shipping-information</stringProp>
@@ -7896,15 +8783,15 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"cartId":"${cart_id}","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"customerAddressId":"${address_id}","countryId":"US","regionId":5,"regionCode":"AR","region":"Arkansas","customerId":"${customer_id}","street":["123 Freedom Blvd. #123"],"telephone":"022-333-4455","postcode":"123123","city":"Fayetteville","firstname":"Anthony","lastname":"Nealy"}}</stringProp>
+            <stringProp name="Argument.value">{"cartId":"${cart_id}","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"customerAddressId":"${address_id}","countryId":"US","regionId":"${alabama_region_id}","regionCode":"AL","region":"Alabama","customerId":"${customer_id}","street":["123 Freedom Blvd. #123"],"telephone":"022-333-4455","postcode":"123123","city":"Fayetteville","firstname":"Anthony","lastname":"Nealy"}}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/mine/payment-information</stringProp>
@@ -7955,8 +8842,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/success/</stringProp>
@@ -7988,8 +8875,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
@@ -8145,8 +9032,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
@@ -8205,8 +9092,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
@@ -8259,12 +9146,12 @@ vars.put("customer_email", customerUser);
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -8277,8 +9164,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -8334,8 +9221,8 @@ vars.put("product_sku", product.get("sku"));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -8408,8 +9295,8 @@ vars.put("product_sku", product.get("sku"));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}review/product/post/id/${product_id}</stringProp>
@@ -8443,12 +9330,12 @@ vars.put("product_sku", product.get("sku"));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -8461,8 +9348,8 @@ vars.put("product_sku", product.get("sku"));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -8490,8 +9377,8 @@ vars.put("product_sku", product.get("sku"));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
@@ -8661,8 +9548,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
@@ -8721,8 +9608,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
@@ -8775,12 +9662,12 @@ vars.put("customer_email", customerUser);
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -8793,8 +9680,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -8814,8 +9701,8 @@ vars.put("customer_email", customerUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -8845,8 +9732,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${category_url_key}${url_suffix}</stringProp>
@@ -8947,8 +9834,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -9007,8 +9894,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -9042,12 +9929,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -9060,8 +9947,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -9076,7 +9963,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -9170,8 +10057,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${product_url_key}${url_suffix}</stringProp>
@@ -9226,8 +10113,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -9275,8 +10162,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${product_sku}/options/all</stringProp>
@@ -9343,8 +10230,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add/</stringProp>
@@ -9408,12 +10295,12 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -9426,8 +10313,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -9442,7 +10329,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="210217247">You added ${product_name} to your shopping cart.</stringProp>
+          <stringProp name="210217247">You added ${product_name} to your <a href="${base_path}checkout/cart/">shopping cart</a>.</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
@@ -9490,8 +10377,8 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded));
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol"/>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}checkout/cart/</stringProp>
@@ -9580,8 +10467,8 @@ vars.put("item_id", vars.get("cart_items_qty_inputs_" + id));
            </elementProp>
            <stringProp name="HTTPSampler.domain"/>
            <stringProp name="HTTPSampler.port"/>
-           <stringProp name="HTTPSampler.connect_timeout"/>
-           <stringProp name="HTTPSampler.response_timeout"/>
+           <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
            <stringProp name="HTTPSampler.protocol"/>
            <stringProp name="HTTPSampler.contentEncoding"/>
            <stringProp name="HTTPSampler.path">${base_path}checkout/cart/delete/</stringProp>
@@ -9605,12 +10492,12 @@ vars.put("item_id", vars.get("cart_items_qty_inputs_" + id));
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -9623,8 +10510,8 @@ vars.put("item_id", vars.get("cart_items_qty_inputs_" + id));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -9655,8 +10542,8 @@ vars.put("item_id", vars.get("cart_items_qty_inputs_" + id));
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
@@ -9781,8 +10668,8 @@ vars.put("customer_email", customerUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}</stringProp>
@@ -9812,8 +10699,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/login/</stringProp>
@@ -9872,8 +10759,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/loginPost/</stringProp>
@@ -9926,12 +10813,12 @@ vars.put("customer_email", customerUser);
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">false</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -9944,8 +10831,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/section/load/</stringProp>
@@ -9965,8 +10852,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}sales/order/history/</stringProp>
@@ -10011,8 +10898,8 @@ vars.put("customer_email", customerUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}sales/order/view/order_id/${orderId}</stringProp>
@@ -10056,8 +10943,8 @@ vars.put("customer_email", customerUser);
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}sales/order/shipment/order_id/${orderId}</stringProp>
@@ -10095,8 +10982,8 @@ vars.put("customer_email", customerUser);
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${popupLink}</stringProp>
@@ -10128,8 +11015,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}downloadable/customer/products</stringProp>
@@ -10183,8 +11070,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}sales/order/view/order_id/${orderId}</stringProp>
@@ -10214,8 +11101,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}downloadable/download/link/id/${linkId}</stringProp>
@@ -10236,8 +11123,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}wishlist</stringProp>
@@ -10292,8 +11179,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}wishlist/index/share/wishlist_id/${wishlistId}/</stringProp>
@@ -10346,8 +11233,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}wishlist/index/send/wishlist_id/${wishlistId}/</stringProp>
@@ -10378,8 +11265,8 @@ vars.put("customer_email", customerUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}customer/account/logout/</stringProp>
@@ -10531,7 +11418,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -10554,11 +11453,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -10635,8 +11534,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -10677,8 +11576,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/cms/page/</stringProp>
@@ -10697,8 +11596,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/cms/page/new</stringProp>
@@ -10830,8 +11729,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/cms/page/save/</stringProp>
@@ -10869,8 +11768,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -10889,8 +11788,11 @@ vars.put("admin_user", adminUser);
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
@@ -10996,7 +11898,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -11019,11 +11933,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -11100,8 +12014,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -11224,8 +12138,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -11341,8 +12255,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -11469,8 +12383,8 @@ vars.put("grid_pages_count_filtered", pageCount);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -11596,8 +12510,8 @@ vars.put("grid_pages_count_filtered", pageCount);
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -11631,8 +12545,8 @@ vars.put("grid_pages_count_filtered", pageCount);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -11651,8 +12565,11 @@ vars.put("grid_pages_count_filtered", pageCount);
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
@@ -11758,7 +12675,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -11781,11 +12710,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -11862,8 +12791,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -11986,8 +12915,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -12103,8 +13032,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -12231,8 +13160,8 @@ vars.put("grid_pages_count_filtered", pageCount);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -12358,8 +13287,8 @@ vars.put("grid_pages_count_filtered", pageCount);
             </elementProp>
             <stringProp name="HTTPSampler.domain"/>
             <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
             <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
             <stringProp name="HTTPSampler.contentEncoding"/>
             <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -12393,8 +13322,8 @@ vars.put("grid_pages_count_filtered", pageCount);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -12413,37 +13342,23 @@ vars.put("grid_pages_count_filtered", pageCount);
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
   </hashTree>
   </hashTree>
 
-  </hashTree>
-
-    
-        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="CSR Pool" enabled="true">
-            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-                <boolProp name="LoopController.continue_forever">false</boolProp>
-                <stringProp name="LoopController.loops">${loops}</stringProp>
-            </elementProp>
-            <stringProp name="ThreadGroup.num_threads">${csrPoolUsers}</stringProp>
-            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-            <boolProp name="ThreadGroup.scheduler">false</boolProp>
-            <stringProp name="ThreadGroup.duration"/>
-            <stringProp name="ThreadGroup.delay"/>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-        <hashTree>
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Returns Management" enabled="true">
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Create Product" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${adminReturnsManagementPercentage}</stringProp>
+      <stringProp name="ThroughputController.percentThroughput">${adminProductCreationPercentage}</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
@@ -12464,7 +13379,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Admin Returns Management");
+                vars.put("testLabel", "Admin Create Product");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -12537,7 +13452,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -12560,11 +13487,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -12641,8 +13568,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -12669,625 +13596,210 @@ vars.put("admin_user", adminUser);
     </hashTree>
   </hashTree>
   
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+    <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/once_only_controller.jmx</stringProp>
+</OnceOnlyController>
+    <hashTree>
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Related Product Id" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_related_product_id.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
+import java.util.Random;
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom});
+}
+relatedIndex = random.nextInt(props.get("simple_products_list").size());
+vars.put("related_product_id", props.get("simple_products_list").get(relatedIndex).get("id"));</stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Product Attributes" enabled="true">
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
 </GenericController>
     <hashTree>
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Orders page" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/orders_page.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1204796042">Create New Order</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Orders" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="namespace" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">sales_order_grid</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">namespace</stringProp>
-        </elementProp>
-        <elementProp name="search" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value"/>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">search</stringProp>
-        </elementProp>
-        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-        </elementProp>
-        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">200</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-        </elementProp>
-        <elementProp name="paging[current]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[current]</stringProp>
-        </elementProp>
-        <elementProp name="sorting[field]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">increment_id</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[field]</stringProp>
-        </elementProp>
-        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">desc</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[direction]</stringProp>
-        </elementProp>
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="filters[status]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">pending</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[status]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
         </elementProp>
-        <elementProp name="_" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">_</stringProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
         </elementProp>
       </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_orders.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1637639774">totalRecords</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
     <hashTree/>
-  </hashTree>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Pending Orders" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-        </elementProp>
-        <elementProp name="namespace" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">sales_order_grid</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">namespace</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="search" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value"/>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">search</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">200</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="paging[current]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[current]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="sorting[field]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">increment_id</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[field]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">asc</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[direction]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="filters[status]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">pending</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[status]</stringProp>
-        </elementProp>
-        <elementProp name="_" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">_</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/search_orders.jmx</stringProp></HTTPSamplerProxy>
-<hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="1637639774">totalRecords</stringProp>
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
       </ResponseAssertion>
       <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order numbers" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">order_numbers</stringProp>
-        <stringProp name="RegexExtractor.regex">\"increment_id\":\"(\d+)\"\,</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-        <stringProp name="Scope.variable">simple_products</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order ids" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">order_ids</stringProp>
-        <stringProp name="RegexExtractor.regex">\"entity_id\":\"(\d+)\"\,</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-        <stringProp name="Scope.variable">simple_products</stringProp>
-      </RegexExtractor>
-      <hashTree/>
     </hashTree>
-
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/setup.jmx</stringProp>
-        <stringProp name="BeanShellSampler.query">
-  import java.util.ArrayList;
-  import java.util.HashMap;
-  import org.apache.jmeter.protocol.http.util.Base64Encoder;
-  import java.util.Random;
-
-  // get count of "order_numbers" variable defined in "Search Pending Orders Limit"
-  int ordersCount = Integer.parseInt(vars.get("order_numbers_matchNr"));
-
-
-  int clusterLength;
-  int threadsNumber = ctx.getThreadGroup().getNumThreads();
-  if (threadsNumber == 0) {
-      //Number of orders for one thread
-      clusterLength = ordersCount;
-  } else {
-      clusterLength = Math.round(ordersCount / threadsNumber);
-      if (clusterLength == 0) {
-          clusterLength = 1;
-      }
-  }
-
-  //Current thread number starts from 0
-  int currentThreadNum = ctx.getThreadNum();
-
-  //Index of the current product from the cluster
-  Random random = new Random();
-  int iterator = random.nextInt(clusterLength);
-  if (iterator == 0) {
-  	iterator = 1;
-  }
-
-  int i = clusterLength * currentThreadNum + iterator;
-
-  orderNumber = vars.get("order_numbers_" + i.toString());
-  orderId = vars.get("order_ids_" + i.toString());
-  vars.put("order_number", orderNumber);
-  vars.put("order_id", orderId);
-
-  </stringProp>
-    <stringProp name="BeanShellSampler.filename"/>
-    <stringProp name="BeanShellSampler.parameters"/>
-    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-  </BeanShellSampler>
-  <hashTree/>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Order" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/view/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_order.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="2103620713">#${order_number}</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order status" enabled="true">
-      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-      <stringProp name="RegexExtractor.refname">order_status</stringProp>
-      <stringProp name="RegexExtractor.regex">&lt;span id="order_status"&gt;([^&lt;]+)&lt;/span&gt;</stringProp>
-      <stringProp name="RegexExtractor.template">$1$</stringProp>
-      <stringProp name="RegexExtractor.default"/>
-      <stringProp name="RegexExtractor.match_number">1</stringProp>
-      <stringProp name="Scope.variable">simple_products</stringProp>
-    </RegexExtractor>
-    <hashTree/>
-  </hashTree>
-
-    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
-      <stringProp name="IfController.condition">"${order_status}" == "Pending"</stringProp>
-      <boolProp name="IfController.evaluateAll">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/if_controller.jmx</stringProp></IfController>
-    <hashTree>
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Start" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/start/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_start.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="-1233850814">Invoice Totals</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract ordered items ids" enabled="true">
-      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-      <stringProp name="RegexExtractor.refname">item_ids</stringProp>
-      <stringProp name="RegexExtractor.regex">&lt;div id="order_item_(\d+)_title"\s*class="product-title"&gt;</stringProp>
-      <stringProp name="RegexExtractor.template">$1$</stringProp>
-      <stringProp name="RegexExtractor.default"/>
-      <stringProp name="RegexExtractor.match_number">-1</stringProp>
-      <stringProp name="Scope.variable">simple_products</stringProp>
-    </RegexExtractor>
-    <hashTree/>
-  </hashTree>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Submit" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="invoice[items][${item_ids_1}]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">invoice[items][${item_ids_1}]</stringProp>
-        </elementProp>
-        <elementProp name="invoice[items][${item_ids_2}]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">invoice[items][${item_ids_2}]</stringProp>
-        </elementProp>
-        <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">Invoiced</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">invoice[comment_text]</stringProp>
+  
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
         </elementProp>
       </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_submit.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1740524604">The invoice has been created</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
     <hashTree/>
-  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get product attributes" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">mycolor</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">attribute_code</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">mysize</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">attribute_code</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_product_attributes.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product attributes" enabled="true">
+        <stringProp name="VAR">product_attributes</stringProp>
+        <stringProp name="JSONPATH">$.items</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="SetUp - Prepare product attributes" enabled="true">
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="cacheKey"/>
+        <stringProp name="script">
+var attributesData = JSON.parse(vars.get("product_attributes")),
+maxOptions = 2;
 
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Credit Memo Start" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_creditmemo/start/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/credit_memo_start.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1382627322">New Memo</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
+attributes = [];
+for (i in attributesData) {
+    if (i &gt;= 2) {
+        break;
+    }
+    var data = attributesData[i],
+        attribute = {
+            "id": data.attribute_id,
+            "code": data.attribute_code,
+            "label": data.default_frontend_label,
+            "options": []
+        };
 
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Credit Memo Submit - Full Refund" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[items][${item_ids_1}][qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[items][${item_ids_1}][qty]</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[items][${item_ids_2}][qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[items][${item_ids_2}][qty]</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[do_offline]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[do_offline]</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[comment_text]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">Credit Memo added</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[comment_text]</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[shipping_amount]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">10</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[shipping_amount]</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[adjustment_positive]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">0</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[adjustment_positive]</stringProp>
-        </elementProp>
-        <elementProp name="creditmemo[adjustment_negative]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">0</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">creditmemo[adjustment_negative]</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_creditmemo/save/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/credit_memo_full_refund.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-515117447">You created the credit memo</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
+    var processedOptions = 0;
+    for (optionN in data.options) {
+        var option = data.options[optionN];
+        if (parseInt(option.value) &gt; 0 &amp;&amp; processedOptions &lt; maxOptions) {
+            processedOptions++;
+            attribute.options.push(option);
+        }
+    }
+    attributes.push(attribute);
+}
 
-    <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Create/Process Returns - Pause" enabled="true">
-      <intProp name="ActionProcessor.action">1</intProp>
-      <intProp name="ActionProcessor.target">0</intProp>
-      <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCreateProcessReturnsDelay}*1000))}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/pause.jmx</stringProp></TestAction>
-    <hashTree/>
-  </hashTree>
+vars.putObject("product_attributes", attributes);
+</stringProp>
+      </JSR223PostProcessor>
+      <hashTree/>
+    </hashTree>
   </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Attribute Set Id" enabled="true">
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
         <collectionProp name="Arguments.arguments"/>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_set/index/filter/${attribute_set_filter}</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -13295,1985 +13807,1027 @@ vars.put("admin_user", adminUser);
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_setup_attribute_set.jmx</stringProp>
+    </HTTPSamplerProxy>
     <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">attribute_set_id</stringProp>
+        <stringProp name="RegexExtractor.regex">catalog\/product_set\/edit\/id\/([\d]+)\/"[\D\d]*Attribute Set 1</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="SetUp - Set Attribute Set Filter" enabled="true">
         <boolProp name="resetInterpreter">false</boolProp>
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
+        <stringProp name="script">import org.apache.commons.codec.binary.Base64;
 
+byte[] encodedBytes = Base64.encodeBase64("set_name=Attribute Set 1".getBytes());
+vars.put("attribute_set_filter", new String(encodedBytes));
+</stringProp>
+      </BeanShellPreProcessor>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Browse Customer Grid" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${browseCustomerGridPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
     <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
+import java.util.Random;
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom});
 }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Browse Customer Grid");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
+number = random.nextInt(props.get("simple_products_list_for_edit").size());
+simpleList = props.get("simple_products_list_for_edit").get(number);
+vars.put("simple_product_1_id", simpleList.get("id"));
+vars.put("simple_product_1_name", simpleList.get("title"));
 
-        formKey = vars.get("form_key_storage");
+do {
+    number1 = random.nextInt(props.get("simple_products_list_for_edit").size());
+} while(number == number1);
+simpleList = props.get("simple_products_list_for_edit").get(number1);
+vars.put("simple_product_2_id", simpleList.get("id"));
+vars.put("simple_product_2_name", simpleList.get("title"));
 
-	   currentFormKey = getFormKeyFromResponse();
+number2 = random.nextInt(props.get("configurable_products_list").size());
+configurableList = props.get("configurable_products_list").get(number2);
+vars.put("configurable_product_1_id", configurableList.get("id"));
+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
+vars.put("configurable_product_1_name", configurableList.get("title"));
+
+//Additional category to be added
+//int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
+//vars.put("category_additional", (categoryId+1).toString());
+//New price
+vars.put("price_new", "9999");
+//New special price
+vars.put("special_price_new", "8888");
+//New quantity
+vars.put("quantity_new", "100600");
+vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNum}-${__Random(1,1000000)}");
 
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
       </stringProp>
       <stringProp name="BeanShellSampler.filename"/>
       <stringProp name="BeanShellSampler.parameters"/>
       <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/setup.jmx</stringProp></BeanShellSampler>
     <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Bundle Product" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/create_bundle_product.jmx</stringProp>
+</TestFragmentController>
     <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="1509986340">records found</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
         <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="script">
-        vars.put("gridEntityType" , "Customer");
-
-        pagesCount = parseInt(vars.get("customers_page_size")) || 20;
-        vars.put("grid_entity_page_size" , pagesCount);
-        vars.put("grid_namespace" , "customer_listing");
-        vars.put("grid_admin_browse_filter_text" , vars.get("admin_browse_customer_filter_text"));
-        vars.put("grid_filter_field", "name");
-
-        // set sort fields and sort directions
-        vars.put("grid_sort_field_1", "name");
-        vars.put("grid_sort_field_2", "group_id");
-        vars.put("grid_sort_field_3", "billing_country_id");
-        vars.put("grid_sort_order_1", "asc");
-        vars.put("grid_sort_order_2", "desc");
-      </stringProp>
-      <stringProp name="scriptLanguage">javascript</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_customers_grid/setup.jmx</stringProp></JSR223PostProcessor>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Pages Count" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_pages_count.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-        <stringProp name="EXPECTED_VALUE">0</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-        <stringProp name="VAR">entity_total_records</stringProp>
-        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} pages count" enabled="true">
-        <stringProp name="cacheKey"/>
-        <stringProp name="filename"/>
-        <stringProp name="parameters"/>
-        <stringProp name="script">
-          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-          var totalsRecord = parseInt(vars.get("entity_total_records"));
-          var pageCount = Math.round(totalsRecord/pageSize);
-
-          vars.put("grid_pages_count", pageCount);
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-      </JSR223PostProcessor>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Filtered Pages Count" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_filtered_pages_count.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-        <stringProp name="EXPECTED_VALUE">0</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">true</boolProp>
-        <boolProp name="ISREGEX">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-        <stringProp name="VAR">entity_total_records</stringProp>
-        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} filtered pages count" enabled="true">
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
-var totalsRecord = parseInt(vars.get("entity_total_records"));
-var pageCount = Math.round(totalsRecord/pageSize);
-
-vars.put("grid_pages_count_filtered", pageCount);
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-      </JSR223PostProcessor>
-      <hashTree/>
-    </hashTree>
-  
-    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select ${gridEntityType} Page Number" enabled="true">
-      <stringProp name="CounterConfig.start">1</stringProp>
-      <stringProp name="CounterConfig.end">${grid_pages_count}</stringProp>
-      <stringProp name="CounterConfig.incr">1</stringProp>
-      <stringProp name="CounterConfig.name">page_number</stringProp>
-      <stringProp name="CounterConfig.format"/>
-      <boolProp name="CounterConfig.per_user">true</boolProp>
-      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_page_number.jmx</stringProp></CounterConfig>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_namespace}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${page_number}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select Filtered ${gridEntityType} Page Number" enabled="true">
-      <stringProp name="CounterConfig.start">1</stringProp>
-      <stringProp name="CounterConfig.end">${grid_pages_count_filtered}</stringProp>
-      <stringProp name="CounterConfig.incr">1</stringProp>
-      <stringProp name="CounterConfig.name">page_number</stringProp>
-      <stringProp name="CounterConfig.format"/>
-      <boolProp name="CounterConfig.per_user">true</boolProp>
-      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_filtered_page_number.jmx</stringProp></CounterConfig>
-    <hashTree/>
-  
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="View ${gridEntityType} page - Filtering + Sorting" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid_sort_and_filter.jmx</stringProp>
-</TestFragmentController>
-    <hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Field Defined" enabled="true">
-        <stringProp name="ForeachController.inputVal">grid_sort_field</stringProp>
-        <stringProp name="ForeachController.returnVal">grid_sort_field</stringProp>
-        <boolProp name="ForeachController.useSeparator">true</boolProp>
-        <stringProp name="ForeachController.startIndex">0</stringProp>
-        <stringProp name="ForeachController.endIndex">3</stringProp>
-      </ForeachController>
-      <hashTree>
-        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Order Defined" enabled="true">
-          <stringProp name="ForeachController.inputVal">grid_sort_order</stringProp>
-          <stringProp name="ForeachController.returnVal">grid_sort_order</stringProp>
-          <boolProp name="ForeachController.useSeparator">true</boolProp>
-          <stringProp name="ForeachController.startIndex">0</stringProp>
-          <stringProp name="ForeachController.endIndex">2</stringProp>
-        </ForeachController>
-        <hashTree>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page - Filtering + Sort By ${grid_sort_field} ${grid_sort_order}" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-              <collectionProp name="Arguments.arguments">
-                <elementProp name="namespace" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">${grid_namespace}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">namespace</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="filters[${grid_filter_field}]" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">filters[${grid_filter_field}]</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">filters[placeholder]</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">paging[pageSize]</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="paging[current]" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">${page_number}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">paging[current]</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="sorting[field]" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">${grid_sort_field}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">sorting[field]</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="sorting[direction]" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">${grid_sort_order}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">sorting[direction]</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-                <elementProp name="isAjax" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                  <stringProp name="Argument.value">true</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">isAjax</stringProp>
-                  <stringProp name="Argument.desc">false</stringProp>
-                </elementProp>
-              </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"/>
-            <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
-            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"/>
-            <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-            <stringProp name="HTTPSampler.method">GET</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"/>
-          </HTTPSamplerProxy>
-          <hashTree>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-              <collectionProp name="Asserion.test_strings">
-                <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
-              </collectionProp>
-              <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-              <boolProp name="Assertion.assume_success">false</boolProp>
-              <intProp name="Assertion.test_type">2</intProp>
-            </ResponseAssertion>
-            <hashTree/>
-          </hashTree>
-        </hashTree>
       </hashTree>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Create Order" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${adminCreateOrderPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Admin Create Order");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/bundle/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-144461265">New Product</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
         <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
-    <hashTree>
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
-        <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
-import java.util.Random;
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-  random.setSeed(${seedForRandom});
-}
-number = random.nextInt(props.get("simple_products_list").size());
-simpleList = props.get("simple_products_list").get(number);
-vars.put("simple_product_1_url_key", simpleList.get("url_key"));
-vars.put("simple_product_1_name", simpleList.get("title"));
-vars.put("simple_product_1_id", simpleList.get("id"));
-
-do {
-    number1 = random.nextInt(props.get("simple_products_list").size());
-} while(number == number1);
-simpleList = props.get("simple_products_list").get(number1);
-vars.put("simple_product_2_url_key", simpleList.get("url_key"));
-vars.put("simple_product_2_name", simpleList.get("title"));
-vars.put("simple_product_2_id", simpleList.get("id"));
-
-number = random.nextInt(props.get("configurable_products_list").size());
-configurableList = props.get("configurable_products_list").get(number);
-vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
-vars.put("configurable_product_1_name", configurableList.get("title"));
-vars.put("configurable_product_1_id", configurableList.get("id"));
-vars.put("configurable_product_1_sku", configurableList.get("sku"));
-vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
-vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
-
-
-customers_index = 0;
-if (!props.containsKey("customer_ids_index")) {
-	props.put("customer_ids_index", customers_index);
-}
-
-try {
-	customers_index = props.get("customer_ids_index");
-	customers_list = props.get("customer_ids_list");
-
-	if (customers_index == customers_list.size()) {
-		customers_index=0;
-	}
-	vars.put("customer_id", customers_list.get(customers_index));
-	props.put("customer_ids_index", ++customers_index);
-}
-catch (java.lang.Exception e) {
-	   log.error("Caught Exception in 'Admin Create Order' thread.");
-	   SampleResult.setStopThread(true);
-}</stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Start Order" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/start/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-      </HTTPSamplerProxy>
-      <hashTree/>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Configurable Product Options" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Configurable Product Options" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${configurable_product_1_sku}/options/all</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract attribute_ids" enabled="true">
-            <stringProp name="VAR">attribute_ids</stringProp>
-            <stringProp name="JSONPATH">$.[*].attribute_id</stringProp>
-            <stringProp name="DEFAULT">NO_VALUE</stringProp>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract option_values" enabled="true">
-            <stringProp name="VAR">option_values</stringProp>
-            <stringProp name="JSONPATH">$.[*].values[0].value_index</stringProp>
-            <stringProp name="DEFAULT">NO_VALUE</stringProp>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-        </hashTree>
       </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Products" enabled="true">
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Validate" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
           <collectionProp name="Arguments.arguments">
-            <elementProp name="item[${simple_product_1_id}][qty]" elementType="HTTPArgument">
+            <elementProp name="ajax" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">item[${simple_product_1_id}][qty]</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">true</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">ajax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
             </elementProp>
-            <elementProp name="item[${simple_product_2_id}][qty]" elementType="HTTPArgument">
+            <elementProp name="isAjax" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">item[${simple_product_2_id}][qty]</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">true</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">isAjax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
             </elementProp>
-            <elementProp name="item[${configurable_product_1_id}][qty]" elementType="HTTPArgument">
+            <elementProp name="form_key" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">item[${configurable_product_1_id}][qty]</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
             </elementProp>
-            <elementProp name="customer_id" elementType="HTTPArgument">
+            <elementProp name="product[name]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">customer_id</stringProp>
-              <stringProp name="Argument.value">${customer_id}</stringProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[name]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
             </elementProp>
-            <elementProp name="store_id" elementType="HTTPArgument">
+            <elementProp name="product[sku]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">store_id</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">Bundle Product  ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[sku]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
             </elementProp>
-            <elementProp name="currency_id" elementType="HTTPArgument">
+            <elementProp name="product[price]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">currency_id</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">42</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[price]</stringProp>
             </elementProp>
-            <elementProp name="form_key" elementType="HTTPArgument">
+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.value">2</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
             </elementProp>
-            <elementProp name="payment[method]" elementType="HTTPArgument">
+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">payment[method]</stringProp>
-              <stringProp name="Argument.value">checkmo</stringProp>
+              <stringProp name="Argument.value">111</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
             </elementProp>
-            <elementProp name="reset_shipping" elementType="HTTPArgument">
+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">reset_shipping</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
             </elementProp>
-            <elementProp name="json" elementType="HTTPArgument">
+            <elementProp name="product[weight]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">json</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">1.0000</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[weight]</stringProp>
             </elementProp>
-            <elementProp name="as_js_varname" elementType="HTTPArgument">
+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">as_js_varname</stringProp>
-              <stringProp name="Argument.value">iFrameResponse</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
             </elementProp>
-            <elementProp name="form_key" elementType="HTTPArgument">
+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.value">2</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
             </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/loadBlock/block/search,items,shipping_method,totals,giftmessage,billing_method?isAjax=true</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
-          <boolProp name="resetInterpreter">false</boolProp>
-          <stringProp name="parameters"/>
-          <stringProp name="filename"/>
-          <stringProp name="script">try {
-	attribute_ids = vars.get("attribute_ids");
-	option_values = vars.get("option_values");
-	attribute_ids = attribute_ids.replace("[","").replace("]","").replace("\"", "");
-	option_values = option_values.replace("[","").replace("]","").replace("\"", "");
-	attribute_ids_array = attribute_ids.split(",");
-	option_values_array = option_values.split(",");
-	args = ctx.getCurrentSampler().getArguments();
-	it = args.iterator();
-	while (it.hasNext()) {
-	    argument = it.next();
-	    if (argument.getStringValue().contains("${")) {
-	        args.removeArgument(argument.getName());
-	    }
-	}
-	for (int i = 0; i &lt; attribute_ids_array.length; i++) {
-
-    ctx.getCurrentSampler().addArgument("item[" + vars.get("configurable_product_1_id") + "][super_attribute][" + attribute_ids_array[i] + "]", option_values_array[i]);
-	}
-} catch (Exception e) {
-    log.error("error???", e);
-}</stringProp>
-        </BeanShellPreProcessor>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Collect Shipping Rates" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="collect_shipping_rates" elementType="HTTPArgument">
+            <elementProp name="product[description]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">collect_shipping_rates</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">&lt;p&gt;Full bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[description]</stringProp>
             </elementProp>
-            <elementProp name="customer_id" elementType="HTTPArgument">
+            <elementProp name="product[short_description]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">customer_id</stringProp>
-              <stringProp name="Argument.value">${customer_id}</stringProp>
+              <stringProp name="Argument.value">&lt;p&gt;Short bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[short_description]</stringProp>
             </elementProp>
-            <elementProp name="store_id" elementType="HTTPArgument">
+            <elementProp name="product[status]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">store_id</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[status]</stringProp>
             </elementProp>
-            <elementProp name="currency_id" elementType="HTTPArgument">
+            <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">currency_id</stringProp>
-              <stringProp name="Argument.value">false</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[configurable_variations]</stringProp>
             </elementProp>
-            <elementProp name="form_key" elementType="HTTPArgument">
+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
             </elementProp>
-            <elementProp name="payment[method]" elementType="HTTPArgument">
+            <elementProp name="product[image]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">payment[method]</stringProp>
-              <stringProp name="Argument.value">checkmo</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[image]</stringProp>
             </elementProp>
-            <elementProp name="json" elementType="HTTPArgument">
+            <elementProp name="product[small_image]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">json</stringProp>
-              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[small_image]</stringProp>
             </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/loadBlock/block/shipping_method,totals?isAjax=true</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Shipping Method" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="-1987784558">shipping_method</stringProp>
-            <stringProp name="818779431">Flat Rate</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Order" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="form_key" elementType="HTTPArgument">
+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
             </elementProp>
-            <elementProp name="limit" elementType="HTTPArgument">
+            <elementProp name="product[url_key]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">limit</stringProp>
-              <stringProp name="Argument.value">20</stringProp>
+              <stringProp name="Argument.value">bundle-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[url_key]</stringProp>
             </elementProp>
-            <elementProp name="entity_id" elementType="HTTPArgument">
+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">entity_id</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_title]</stringProp>
             </elementProp>
-            <elementProp name="name" elementType="HTTPArgument">
+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">name</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
             </elementProp>
-            <elementProp name="email" elementType="HTTPArgument">
+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">email</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_description]</stringProp>
             </elementProp>
-            <elementProp name="Telephone" elementType="HTTPArgument">
+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">Telephone</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
             </elementProp>
-            <elementProp name="billing_postcode" elementType="HTTPArgument">
+            <elementProp name="product[special_price]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">billing_postcode</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">99</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_price]</stringProp>
             </elementProp>
-            <elementProp name="billing_country_id" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">billing_country_id</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
             </elementProp>
-            <elementProp name="billing_regione" elementType="HTTPArgument">
+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">billing_regione</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
             </elementProp>
-            <elementProp name="store_name" elementType="HTTPArgument">
+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">store_name</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
             </elementProp>
-            <elementProp name="page" elementType="HTTPArgument">
+            <elementProp name="product[cost]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">page</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[cost]</stringProp>
             </elementProp>
-            <elementProp name="order[currency]" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[currency]</stringProp>
-              <stringProp name="Argument.value">USD</stringProp>
+              <stringProp name="Argument.value">0</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
             </elementProp>
-            <elementProp name="sku" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">sku</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">32000</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
             </elementProp>
-            <elementProp name="qty" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">qty</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">100</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
             </elementProp>
-            <elementProp name="limit" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">limit</stringProp>
-              <stringProp name="Argument.value">20</stringProp>
+              <stringProp name="Argument.value">90</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
             </elementProp>
-            <elementProp name="entity_id" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">entity_id</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
             </elementProp>
-            <elementProp name="name" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">name</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">0</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
             </elementProp>
-            <elementProp name="sku" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">sku</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
             </elementProp>
-            <elementProp name="price[from]" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">price[from]</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">101</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
             </elementProp>
-            <elementProp name="price[to]" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">price[to]</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">99</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
             </elementProp>
-            <elementProp name="in_products" elementType="HTTPArgument">
+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">in_products</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
             </elementProp>
-            <elementProp name="page" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">page</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
             </elementProp>
-            <elementProp name="coupon_code" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">coupon_code</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">100500</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
             </elementProp>
-            <elementProp name="order[account][group_id]" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[account][group_id]</stringProp>
-              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.value">100500</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
             </elementProp>
-            <elementProp name="order[account][email]" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[account][email]</stringProp>
-              <stringProp name="Argument.value">user_${customer_id}@example.com</stringProp>
+              <stringProp name="Argument.value">0</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][customer_address_id]" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][customer_address_id]</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][prefix]" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][prefix]</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][firstname]" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][firstname]</stringProp>
-              <stringProp name="Argument.value">Anthony</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][middlename]" elementType="HTTPArgument">
+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">10000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][middlename]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][lastname]" elementType="HTTPArgument">
+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][lastname]</stringProp>
-              <stringProp name="Argument.value">Nealy</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][suffix]" elementType="HTTPArgument">
+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][suffix]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][company]" elementType="HTTPArgument">
+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][company]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][street][0]" elementType="HTTPArgument">
+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][street][0]</stringProp>
-              <stringProp name="Argument.value">123 Freedom Blvd. #123</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[page_layout]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][street][1]" elementType="HTTPArgument">
+            <elementProp name="product[options_container]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">container2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[options_container]</stringProp>
+            </elementProp>
+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][street][1]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][city]" elementType="HTTPArgument">
+            <elementProp name="product[shipment_type]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][city]</stringProp>
-              <stringProp name="Argument.value">Fayetteville</stringProp>
+              <stringProp name="Argument.value">0</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[shipment_type]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][country_id]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][title]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][country_id]</stringProp>
-              <stringProp name="Argument.value">US</stringProp>
+              <stringProp name="Argument.value">option title one</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][title]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][region]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][option_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][region]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][option_id]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][region_id]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][delete]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][region_id]</stringProp>
-              <stringProp name="Argument.value">5</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][delete]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][postcode]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][type]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][postcode]</stringProp>
-              <stringProp name="Argument.value">123123</stringProp>
+              <stringProp name="Argument.value">select</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][type]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][telephone]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][required]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][telephone]</stringProp>
-              <stringProp name="Argument.value">022-333-4455</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][required]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][fax]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][fax]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_id]</stringProp>
             </elementProp>
-            <elementProp name="order[billing_address][vat_id]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][option_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[billing_address][vat_id]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][option_id]</stringProp>
             </elementProp>
-            <elementProp name="shipping_same_as_billing" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][product_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">shipping_same_as_billing</stringProp>
-              <stringProp name="Argument.value">on</stringProp>
+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][product_id]</stringProp>
             </elementProp>
-            <elementProp name="payment[method]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][delete]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">payment[method]</stringProp>
-              <stringProp name="Argument.value">checkmo</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][delete]</stringProp>
             </elementProp>
-            <elementProp name="order[shipping_method]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[shipping_method]</stringProp>
-              <stringProp name="Argument.value">flatrate_flatrate</stringProp>
+              <stringProp name="Argument.value">25</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]</stringProp>
             </elementProp>
-            <elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[comment][customer_note]</stringProp>
-              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]</stringProp>
             </elementProp>
-            <elementProp name="order[comment][customer_note_notify]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[comment][customer_note_notify]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_qty]</stringProp>
             </elementProp>
-            <elementProp name="order[send_confirmation]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">order[send_confirmation]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]</stringProp>
             </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/save/</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Id" enabled="true">
-          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-          <stringProp name="RegexExtractor.refname">order_id</stringProp>
-          <stringProp name="RegexExtractor.regex">${host}${base_path}${admin_path}/sales/order/index/order_id/(\d+)/</stringProp>
-          <stringProp name="RegexExtractor.template">$1$</stringProp>
-          <stringProp name="RegexExtractor.default"/>
-          <stringProp name="RegexExtractor.match_number">1</stringProp>
-        </RegexExtractor>
-        <hashTree/>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 1" enabled="true">
-          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-          <stringProp name="RegexExtractor.refname">order_item_1</stringProp>
-          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
-          <stringProp name="RegexExtractor.template">$1$</stringProp>
-          <stringProp name="RegexExtractor.default"/>
-          <stringProp name="RegexExtractor.match_number">1</stringProp>
-        </RegexExtractor>
-        <hashTree/>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 2" enabled="true">
-          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-          <stringProp name="RegexExtractor.refname">order_item_2</stringProp>
-          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
-          <stringProp name="RegexExtractor.template">$1$</stringProp>
-          <stringProp name="RegexExtractor.default"/>
-          <stringProp name="RegexExtractor.match_number">2</stringProp>
-        </RegexExtractor>
-        <hashTree/>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 3" enabled="true">
-          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-          <stringProp name="RegexExtractor.refname">order_item_3</stringProp>
-          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
-          <stringProp name="RegexExtractor.template">$1$</stringProp>
-          <stringProp name="RegexExtractor.default"/>
-          <stringProp name="RegexExtractor.match_number">3</stringProp>
-        </RegexExtractor>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Id" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="89649215">^\d+$</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-          <stringProp name="Assertion.scope">variable</stringProp>
-          <stringProp name="Scope.variable">order_id</stringProp>
-        </ResponseAssertion>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 1" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="89649215">^\d+$</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-          <stringProp name="Assertion.scope">variable</stringProp>
-          <stringProp name="Scope.variable">order_item_1</stringProp>
-        </ResponseAssertion>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 2" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="89649215">^\d+$</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-          <stringProp name="Assertion.scope">variable</stringProp>
-          <stringProp name="Scope.variable">order_item_2</stringProp>
-        </ResponseAssertion>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 3" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="89649215">^\d+$</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-          <stringProp name="Assertion.scope">variable</stringProp>
-          <stringProp name="Scope.variable">order_item_3</stringProp>
-        </ResponseAssertion>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Created" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="563107624">You created the order.</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Invoice" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="form_key" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][position]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.value">0</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][position]</stringProp>
             </elementProp>
-            <elementProp name="invoice[items][${order_item_1}]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][option_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][product_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][delete]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">10.99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">invoice[items][${order_item_1}]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_qty]</stringProp>
             </elementProp>
-            <elementProp name="invoice[items][${order_item_2}]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">invoice[items][${order_item_2}]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]</stringProp>
             </elementProp>
-            <elementProp name="invoice[items][${order_item_3}]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][position]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">invoice[items][${order_item_3}]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][position]</stringProp>
             </elementProp>
-            <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][1][title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">option title two</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][title]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][option_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">invoice[comment_text]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][option_id]</stringProp>
             </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Invoice Created" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="-1878312078">The invoice has been created.</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Shipment" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="form_key" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][1][delete]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][delete]</stringProp>
             </elementProp>
-            <elementProp name="shipment[items][${order_item_1}]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][1][type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">select</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][required]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">shipment[items][${order_item_1}]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][required]</stringProp>
             </elementProp>
-            <elementProp name="shipment[items][${order_item_2}]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][1][position]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">shipment[items][${order_item_2}]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][position]</stringProp>
             </elementProp>
-            <elementProp name="shipment[items][${order_item_3}]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][option_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][product_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][delete]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">5.00</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">shipment[items][${order_item_3}]</stringProp>
               <stringProp name="Argument.value">1</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
             </elementProp>
-            <elementProp name="shipment[comment_text]" elementType="HTTPArgument">
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][position]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_id]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">shipment[comment_text]</stringProp>
               <stringProp name="Argument.value"/>
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
             </elementProp>
-          </collectionProp>
-        </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][option_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][product_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][delete]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">7.00</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][position]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="affect_bundle_product_selections" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">affect_bundle_product_selections</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/save/order_id/${order_id}/</stringProp>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/</stringProp>
         <stringProp name="HTTPSampler.method">POST</stringProp>
         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -15281,12 +14835,11 @@ catch (java.lang.Exception e) {
         <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
         <boolProp name="HTTPSampler.monitor">false</boolProp>
         <stringProp name="HTTPSampler.embedded_url_re"/>
-        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
       </HTTPSamplerProxy>
       <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Shipment Created" enabled="true">
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
           <collectionProp name="Asserion.test_strings">
-            <stringProp name="-348539683">The shipment has been created.</stringProp>
+            <stringProp name="1853918323">{"error":false}</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
           <boolProp name="Assertion.assume_success">false</boolProp>
@@ -15294,6817 +14847,16 @@ catch (java.lang.Exception e) {
         </ResponseAssertion>
         <hashTree/>
       </hashTree>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  </hashTree>
-
-    
-        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="API" enabled="true">
-            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-                <boolProp name="LoopController.continue_forever">false</boolProp>
-                <stringProp name="LoopController.loops">${loops}</stringProp>
-            </elementProp>
-            <stringProp name="ThreadGroup.num_threads">${apiPoolUsers}</stringProp>
-            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-            <boolProp name="ThreadGroup.scheduler">false</boolProp>
-            <stringProp name="ThreadGroup.duration"/>
-            <stringProp name="ThreadGroup.delay"/>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-        <hashTree>
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${apiBasePercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Content-Type</stringProp>
-          <stringProp name="Header.value">application/json</stringProp>
-        </elementProp>
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Accept</stringProp>
-          <stringProp name="Header.value">*/*</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-        <stringProp name="VAR">admin_token</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_token</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Authorization</stringProp>
-          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Create Customer" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Create Customer");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "customer": {&#xD;
-&#xD;
-        "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",&#xD;
-        "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "lastname": "Doe"&#xD;
-    },&#xD;
-    "password": "test@123"&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_customer.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer id" enabled="true">
-        <stringProp name="VAR">customer_id</stringProp>
-        <stringProp name="JSONPATH">$.id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">customer_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check customer" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/${customer_id}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_customer.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$.id</stringProp>
-        <stringProp name="EXPECTED_VALUE">${customer_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Catalog Browsing" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Catalog Browsing");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get categories" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/get_categories.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert results are present" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1294635157">errors</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">6</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable"/>
-      </ResponseAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract search category id" enabled="true">
-        <stringProp name="VAR">search_category_id</stringProp>
-        <stringProp name="JSONPATH">$.id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert search category id is not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">search_category_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get category" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/${search_category_id}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/get_category.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert results are present" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1294635157">errors</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">6</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable"/>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get products" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">20</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/get_products.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert results are present" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1294635157">errors</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">6</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable"/>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Search" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Search");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search for simple product on frontend" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="searchCriteria[request_name]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">quick_search_container</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[request_name]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[filter_groups][0][filters][0][field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">search_term</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][field]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[filter_groups][0][filters][0][value]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">Simple</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][value]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">20</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/search</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/search_for_product_frontend.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert results are present" enabled="true">
-        <stringProp name="JSON_PATH">$.total_count</stringProp>
-        <stringProp name="EXPECTED_VALUE">0</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract search product id" enabled="true">
-        <stringProp name="VAR">search_product_id</stringProp>
-        <stringProp name="JSONPATH">$.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert search product id is not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">search_product_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Checkout" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Checkout");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-    random.setSeed(${seedForRandom} + ${__threadNum});
-}
-
-vars.putObject("randomIntGenerator", random);
-        </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("simple_products_list").size());
-product = props.get("simple_products_list").get(number);
-
-vars.put("product_url_key", product.get("url_key"));
-vars.put("product_id", product.get("id"));
-vars.put("product_name", product.get("title"));
-vars.put("product_uenc", product.get("uenc"));
-vars.put("product_sku", product.get("sku"));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create quote" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_quote.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-        <stringProp name="VAR">quote_id</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">quote_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add product to quote" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-	"cartItem": {&#xD;
-		"sku": "${product_sku}",&#xD;
-		"qty":"1",&#xD;
-		"quote_id":"${quote_id}"&#xD;
-	}&#xD;
-}&#xD;
-</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/${quote_id}/items</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_product_to_quote_hardwired_sku.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$.sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check products in quote" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/${quote_id}/items</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_product_in_quote_hardwired_sku.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$[0].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Guest Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "storeId": 1&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_guest_cart.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-        <stringProp name="VAR">cart_id</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Guest Cart Id extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">cart_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add product to Guest Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-	"cartItem": {&#xD;
-		"sku": "${product_sku}",&#xD;
-		"qty":"1",&#xD;
-		"quote_id":"${cart_id}"&#xD;
-	}&#xD;
-}&#xD;
-</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/items</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_product_to_guest_cart_hardwired_sku.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$.quote_id</stringProp>
-        <stringProp name="EXPECTED_VALUE">^[a-z0-9-]+$</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Gift Message to Guest Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-	"sender": "John Doe",&#xD;
-	"recipient": "Jane Roe",&#xD;
-	"giftMessage": "Gift Message Text"&#xD;
-}&#xD;
-</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/gift-message</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_gift_message_to_guest_cart.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$</stringProp>
-        <stringProp name="EXPECTED_VALUE">true</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Estimate Shipping Methods" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"address":{"country_id":"US","postcode":"95630"}}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/estimate-shipping-methods</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_estimate_shipping_methods_with_postal_code.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-        <collectionProp name="HeaderManager.headers">
-          <elementProp name="" elementType="Header">
-            <stringProp name="Header.name">Referer</stringProp>
-            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-          </elementProp>
-          <elementProp name="Content-Type" elementType="Header">
-            <stringProp name="Header.name">Content-Type</stringProp>
-            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-          </elementProp>
-          <elementProp name="X-Requested-With" elementType="Header">
-            <stringProp name="Header.name">X-Requested-With</stringProp>
-            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-          </elementProp>
-          <elementProp name="Accept" elementType="Header">
-            <stringProp name="Header.name">Accept</stringProp>
-            <stringProp name="Header.value">application/json</stringProp>
-          </elementProp>
-        </collectionProp>
-      </HeaderManager>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1224567411">"available":true</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Billing/Shipping Information" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"countryId":"US","regionId":"12","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/shipping-information</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_billing_shipping_information.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-        <collectionProp name="HeaderManager.headers">
-          <elementProp name="" elementType="Header">
-            <stringProp name="Header.name">Referer</stringProp>
-            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-          </elementProp>
-          <elementProp name="Content-Type" elementType="Header">
-            <stringProp name="Header.name">Content-Type</stringProp>
-            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-          </elementProp>
-          <elementProp name="X-Requested-With" elementType="Header">
-            <stringProp name="Header.name">X-Requested-With</stringProp>
-            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-          </elementProp>
-          <elementProp name="Accept" elementType="Header">
-            <stringProp name="Header.name">Accept</stringProp>
-            <stringProp name="Header.value">application/json</stringProp>
-          </elementProp>
-        </collectionProp>
-      </HeaderManager>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1494218646">{"payment_methods":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Payment Info/Place Order" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"cartId":"${cart_id}","email":"test@example.com","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"countryId":"US","regionId":"12","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname","save_in_address_book":0}}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/payment-information</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/checkout_payment_info_place_order.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-        <collectionProp name="HeaderManager.headers">
-          <elementProp name="" elementType="Header">
-            <stringProp name="Header.name">Referer</stringProp>
-            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
-          </elementProp>
-          <elementProp name="Content-Type" elementType="Header">
-            <stringProp name="Header.name">Content-Type</stringProp>
-            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
-          </elementProp>
-          <elementProp name="X-Requested-With" elementType="Header">
-            <stringProp name="Header.name">X-Requested-With</stringProp>
-            <stringProp name="Header.value">XMLHttpRequest</stringProp>
-          </elementProp>
-          <elementProp name="Accept" elementType="Header">
-            <stringProp name="Header.name">Accept</stringProp>
-            <stringProp name="Header.value">application/json</stringProp>
-          </elementProp>
-        </collectionProp>
-      </HeaderManager>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-297987887">"[0-9]+"</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-        <stringProp name="VAR">order_id</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">order_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  </hashTree>
-
-  </hashTree>
-
-    
-        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="One Thread Scenarios (Vulnerable to deadlocks)" enabled="true">
-            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-                <boolProp name="LoopController.continue_forever">false</boolProp>
-                <stringProp name="LoopController.loops">${loops}</stringProp>
-            </elementProp>
-            <stringProp name="ThreadGroup.num_threads">${deadLocksPoolUsers}</stringProp>
-            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-            <boolProp name="ThreadGroup.scheduler">false</boolProp>
-            <stringProp name="ThreadGroup.duration"/>
-            <stringProp name="ThreadGroup.delay"/>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-        <hashTree>
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Product Grid Mass Actions" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${productGridMassActionPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Product Grid Mass Actions");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Pages Count" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">20</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/get_product_pages_count.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-        <stringProp name="EXPECTED_VALUE">0</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-        <stringProp name="VAR">products_number</stringProp>
-        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Calculate pages count" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
-var productsTotal = Integer.parseInt(vars.get("products_number"));
-var pageCountProducts = Math.round(productsTotal/productsPageSize);
-
-vars.put("pages_count_product", String.valueOf(pageCountProducts));</stringProp>
-      </BeanShellPostProcessor>
-      <hashTree/>
-    </hashTree>
-  
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-random.setSeed(${seedForRandom});
-}
-var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
-var totalNumberOfPages = Integer.parseInt(vars.get("pages_count_product"));
-
-// Randomly select a page.
-var randomProductsPage = random.nextInt(totalNumberOfPages) + 1;
-
-// Get the first and last product id on that page.
-var lastProductIdOnPage = randomProductsPage * productsPageSize;
-var firstProductIdOnPage = lastProductIdOnPage - productsPageSize + 1;
-
-var randomProductId1 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-var randomProductId2 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-var randomProductId3 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-
-vars.put("page_number", String.valueOf(randomProductsPage));
-vars.put("productId1", String.valueOf(randomProductId1));
-vars.put("productId2", String.valueOf(randomProductId2));
-vars.put("productId3", String.valueOf(randomProductId3));
-
-var randomQuantity = random.nextInt(1000) + 1;
-var randomPrice = random.nextInt(500) + 10;
-var randomVisibility = random.nextInt(4) + 1;
-
-vars.put("quantity", String.valueOf(randomQuantity));
-vars.put("price", String.valueOf(randomPrice));
-vars.put("visibility", String.valueOf(randomVisibility));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select Products and Update Attributes mass action" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${products_page_size}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${page_number}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_grid.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1637639774">totalRecords</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Display Update Attributes" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="selected[0]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId1}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[0]</stringProp>
-          </elementProp>
-          <elementProp name="selected[1]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId2}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[1]</stringProp>
-          </elementProp>
-          <elementProp name="selected[2]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId3}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[2]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/edit</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_update_attributes.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1862384910">Update Attributes</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Validate Attributes" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="inventory[qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${quantity}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">inventory[qty]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[price]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${price}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[price]</stringProp>
-        </elementProp>
-        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${visibility}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[visibility]</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/validate</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/change_attributes.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1853918323">{"error":false}</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Attributes" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="inventory[qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${quantity}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">inventory[qty]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_qty" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_price</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[price]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${price}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[price]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_price" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_price</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${visibility}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[visibility]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_visibility" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_visibility</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/save/store/0/active_tab/attributes</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  </HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1848809106">were updated.</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-</hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Products" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${importProductsPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Import Products");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">vars.put("entity", "catalog_product");
-String behavior = "${adminImportProductBehavior}";
-vars.put("adminImportBehavior", behavior);
-String filepath = "${files_folder}${adminImportProductFilePath}";
-vars.put("adminImportFilePath", filepath);  </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_products/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1723813687">Import Settings</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Validate" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="entity" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${entity}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">entity</stringProp>
-          </elementProp>
-          <elementProp name="behavior" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">behavior</stringProp>
-          </elementProp>
-          <elementProp name="validation_strategy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">validation_strategy</stringProp>
-          </elementProp>
-          <elementProp name="allowed_error_count" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">10</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">allowed_error_count</stringProp>
-          </elementProp>
-          <elementProp name="_import_field_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_field_separator</stringProp>
-          </elementProp>
-          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/validate</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-        <collectionProp name="HTTPFileArgs.files">
-          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
-            <stringProp name="File.path">${adminImportFilePath}</stringProp>
-            <stringProp name="File.paramname">import_file</stringProp>
-            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_validate.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="37280142">File is valid! To start import process</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">16</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Start" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="entity" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${entity}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">entity</stringProp>
-          </elementProp>
-          <elementProp name="behavior" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">behavior</stringProp>
-          </elementProp>
-          <elementProp name="validation_strategy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">validation_strategy</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="allowed_error_count" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">10</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">allowed_error_count</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="_import_field_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_field_separator</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/start</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-        <collectionProp name="HTTPFileArgs.files">
-          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
-            <stringProp name="File.path">${adminImportFilePath}</stringProp>
-            <stringProp name="File.paramname">import_file</stringProp>
-            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_save.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1731221824">Import successfully done</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">16</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Customers" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${importCustomersPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Import Customers");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">vars.put("entity", "customer");
-String behavior = "${adminImportCustomerBehavior}";
-vars.put("adminImportBehavior", behavior);
-String filepath = "${files_folder}${adminImportCustomerFilePath}";
-vars.put("adminImportFilePath", filepath);  </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_customers/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1723813687">Import Settings</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Validate" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="entity" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${entity}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">entity</stringProp>
-          </elementProp>
-          <elementProp name="behavior" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">behavior</stringProp>
-          </elementProp>
-          <elementProp name="validation_strategy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">validation_strategy</stringProp>
-          </elementProp>
-          <elementProp name="allowed_error_count" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">10</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">allowed_error_count</stringProp>
-          </elementProp>
-          <elementProp name="_import_field_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_field_separator</stringProp>
-          </elementProp>
-          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/validate</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-        <collectionProp name="HTTPFileArgs.files">
-          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
-            <stringProp name="File.path">${adminImportFilePath}</stringProp>
-            <stringProp name="File.paramname">import_file</stringProp>
-            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_validate.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="37280142">File is valid! To start import process</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">16</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Start" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="entity" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${entity}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">entity</stringProp>
-          </elementProp>
-          <elementProp name="behavior" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">behavior</stringProp>
-          </elementProp>
-          <elementProp name="validation_strategy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">validation_strategy</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="allowed_error_count" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">10</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">allowed_error_count</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="_import_field_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_field_separator</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/start</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
-      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
-        <collectionProp name="HTTPFileArgs.files">
-          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
-            <stringProp name="File.path">${adminImportFilePath}</stringProp>
-            <stringProp name="File.paramname">import_file</stringProp>
-            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_save.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1731221824">Import successfully done</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">16</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Export Products" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${exportProductsPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Export Products");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Page" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/export.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1723813687">Export Settings</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Products" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="attribute_code" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">attribute_code</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[allow_message][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[allow_message][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[allow_open_amount]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[allow_open_amount]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[category_ids]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[category_ids]</stringProp>
-            <stringProp name="Argument.value">24,25,26,27,28,29,30</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[configurable_variations]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[configurable_variations]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[cost][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[cost][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[country_of_manufacture]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[country_of_manufacture]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[created_at]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[created_at]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[custom_design]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[custom_design]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[custom_design_from][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[custom_design_from][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[custom_design_to][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[custom_design_to][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[custom_layout_update]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[custom_layout_update]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[description]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[description]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[email_template]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[email_template]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[gallery]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[gallery]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[gift_message_available]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[gift_message_available]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[gift_wrapping_available]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[gift_wrapping_available]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[gift_wrapping_price][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[gift_wrapping_price][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[group_price][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[group_price][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[has_options]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[has_options]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[image]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[image]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[image_label]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[image_label]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[is_redeemable][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[is_redeemable][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[is_returnable]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[is_returnable]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[lifetime][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[lifetime][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[links_exist][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[links_exist][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[links_purchased_separately][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[links_purchased_separately][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[links_title]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[links_title]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[media_gallery]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[media_gallery]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[meta_description]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[meta_description]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[meta_keyword]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[meta_keyword]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[meta_title]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[meta_title]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[minimal_price][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[minimal_price][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[msrp][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[msrp][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[msrp_display_actual_price_type]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[msrp_display_actual_price_type]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[name]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[name]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[news_from_date][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[news_from_date][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[news_to_date][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[news_to_date][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[old_id][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[old_id][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[open_amount_max][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[open_amount_max][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[open_amount_min][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[open_amount_min][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[options_container]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[options_container]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[page_layout]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[page_layout]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[price][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[price][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[price_type][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[price_type][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[price_view]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[price_view]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[quantity_and_stock_status]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[quantity_and_stock_status]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[related_tgtr_position_behavior][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[related_tgtr_position_behavior][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[related_tgtr_position_limit][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[related_tgtr_position_limit][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[required_options]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[required_options]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[samples_title]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[samples_title]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[shipment_type][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[shipment_type][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[short_description]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[short_description]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[sku]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[sku]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[sku_type][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[sku_type][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[small_image]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[small_image]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[small_image_label]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[small_image_label]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[special_from_date][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[special_from_date][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[special_price][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[special_price][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[special_to_date][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[special_to_date][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[status]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[status]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[tax_class_id]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[tax_class_id]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[thumbnail]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[thumbnail]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[thumbnail_label]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[thumbnail_label]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[tier_price][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[tier_price][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[updated_at]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[updated_at]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[upsell_tgtr_position_behavior][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[upsell_tgtr_position_behavior][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[upsell_tgtr_position_limit][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[upsell_tgtr_position_limit][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[url_key]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[url_key]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[url_path]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[url_path]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[use_config_allow_message][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[use_config_allow_message][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[use_config_email_template][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[use_config_email_template][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[use_config_is_redeemable][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[use_config_is_redeemable][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[use_config_lifetime][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[use_config_lifetime][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[visibility]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[visibility]</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[weight][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[weight][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="export_filter[weight_type][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">export_filter[weight_type][]</stringProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-          <elementProp name="frontend_label" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.name">frontend_label</stringProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/export/entity/catalog_product/file_format/csv</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/export_products/export_products.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-261088822">Simple Product 1</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">16</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Export Customers" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${exportCustomersPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Export Customers");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Page" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/export.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1723813687">Export Settings</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Customers" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="attribute_code" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">attribute_code</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[confirmation]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[confirmation]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[created_at]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[created_at]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[created_in]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[created_in]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[default_billing][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[default_billing][]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[default_shipping][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[default_shipping][]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[disable_auto_group_change]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[disable_auto_group_change]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[dob][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[dob][]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[email]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[email]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[firstname]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[firstname]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[gender]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[gender]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[group_id]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[group_id]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[lastname]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[lastname]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[middlename]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[middlename]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[password_hash]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[password_hash]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[prefix]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[prefix]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[reward_update_notification][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[reward_update_notification][]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[reward_warning_notification][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[reward_warning_notification][]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[rp_token]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[rp_token]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[rp_token_created_at][]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">,</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[rp_token_created_at][]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[store_id]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[store_id]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[suffix]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[suffix]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[taxvat]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[taxvat]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="export_filter[website_id]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">export_filter[website_id]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="frontend_label" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">frontend_label</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/export/entity/customer/file_format/csv</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/export_customers/export_customers.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-2040454917">user_1@example.com</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">16</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${apiBasePercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Content-Type</stringProp>
-          <stringProp name="Header.value">application/json</stringProp>
-        </elementProp>
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Accept</stringProp>
-          <stringProp name="Header.value">*/*</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-        <stringProp name="VAR">admin_token</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_token</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Authorization</stringProp>
-          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Process Orders" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Process Orders");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">// Each thread gets an equal number of orders, based on how many orders are available.
-
-      int apiProcessOrders = Integer.parseInt("${apiProcessOrders}");
-      if (apiProcessOrders &gt; 0) {
-      ordersPerThread = apiProcessOrders;
-      } else {
-      ordersPerThread = 1;
-      }
-
-
-      threadNum = ${__threadNum};
-      vars.put("ordersPerThread", String.valueOf(ordersPerThread));
-      vars.put("threadNum", String.valueOf(threadNum));
-
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Orders" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">status</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">Pending</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${ordersPerThread}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${threadNum}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/orders</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/get_orders.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract entity ids" enabled="true">
-        <stringProp name="VAR">entity_ids</stringProp>
-        <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-    </hashTree>
-  
-    <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Order" enabled="true">
-      <stringProp name="ForeachController.inputVal">entity_ids</stringProp>
-      <stringProp name="ForeachController.returnVal">order_id</stringProp>
-      <boolProp name="ForeachController.useSeparator">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/for_each_order.jmx</stringProp></ForeachController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Invoice" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/invoice</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_invoice.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="34237953">"\d+"</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Shipment" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/ship</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_shipment.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="34237953">"\d+"</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Product Management" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Product Management");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create product" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "product": {&#xD;
-        "sku": "psku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "name": "Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "attributeSetId": 4&#xD;
-    }&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_product_no_custom_attributes.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
-        <stringProp name="VAR">simple_product_id</stringProp>
-        <stringProp name="JSONPATH">$.id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
-        <stringProp name="VAR">simple_product_sku</stringProp>
-        <stringProp name="JSONPATH">$.sku</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
-        <stringProp name="VAR">simple_stock_item_id</stringProp>
-        <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">simple_product_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">simple_product_sku</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">simple_stock_item_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update product stock info" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-        "stock_item": {   &#xD;
-        	"manage_stock": true,    &#xD;
-        	"is_in_stock": true,&#xD;
-          "qty": ${simple_product_id}&#xD;
-        }&#xD;
-    }</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${simple_product_sku}/stockItems/${simple_stock_item_id}</stringProp>
-      <stringProp name="HTTPSampler.method">PUT</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/update_product_stock_info.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_stock_item_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check product" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${simple_product_sku}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_product.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-        <stringProp name="JSON_PATH">$.sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product id" enabled="true">
-        <stringProp name="JSON_PATH">$.id</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert stock item id" enabled="true">
-        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.item_id</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_stock_item_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert updated quantity" enabled="true">
-        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.qty</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create product with extensible data objects" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "product": {&#xD;
-        "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "visibility": "4",&#xD;
-        "type_id": "simple",&#xD;
-        "price": "3.62",&#xD;
-        "status": "1",&#xD;
-        "attribute_set_id": "4",&#xD;
-        "custom_attributes": [&#xD;
-            {&#xD;
-                "attribute_code": "cost",&#xD;
-                "value": ""&#xD;
-            },&#xD;
-            {&#xD;
-                "attribute_code": "description",&#xD;
-                "value": "Description"&#xD;
-            }&#xD;
-        ],&#xD;
-        "extension_attributes":{&#xD;
-		"stock_item":{&#xD;
-		"manage_stock": true,    &#xD;
-		"is_in_stock": true,&#xD;
-		"qty":"100"&#xD;
-		}&#xD;
-    	   }        ,&#xD;
-    	   "media_gallery_entries":&#xD;
-    	   	[{&#xD;
-    	   		"id": null,&#xD;
-    	   		"label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-    	   		"position":1,&#xD;
-    	   		"disabled":false,&#xD;
-    	   		"media_type":"image",&#xD;
-    	   		"types":["image"],&#xD;
-    	   		"content":{&#xD;
-    	   			"base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
-        "type": "image/jpeg",&#xD;
-        "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
-    	   			}&#xD;
-    	   	}&#xD;
-    	   	]&#xD;
-    }&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_product_with_extensible_data_objects.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
-        <stringProp name="VAR">simple_product_id</stringProp>
-        <stringProp name="JSONPATH">$.id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
-        <stringProp name="VAR">simple_product_sku</stringProp>
-        <stringProp name="JSONPATH">$.sku</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
-        <stringProp name="VAR">simple_stock_item_id</stringProp>
-        <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">simple_product_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">simple_product_sku</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">simple_stock_item_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check product with extensible data objects" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${simple_product_sku}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_product_with_extensible_data_objects.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-        <stringProp name="JSON_PATH">$.sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product id" enabled="true">
-        <stringProp name="JSON_PATH">$.id</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert stock item id" enabled="true">
-        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.item_id</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_stock_item_id}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert updated quantity" enabled="true">
-        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.qty</stringProp>
-        <stringProp name="EXPECTED_VALUE">100</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Product Attribute Management" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "API Product Attribute Management");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute set" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "attributeSet": {&#xD;
-        "attribute_set_name": "new_attribute_set_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "sort_order": 500&#xD;
-    },&#xD;
-    "skeletonId": "4"&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_set.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_set_id" enabled="true">
-        <stringProp name="VAR">attribute_set_id</stringProp>
-        <stringProp name="JSONPATH">$.attribute_set_id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_set_id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">attribute_set_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute group" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "group": {&#xD;
-        "attribute_group_name": "empty_attribute_group_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-        "attribute_set_id": ${attribute_set_id}&#xD;
-    }&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/groups</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_group.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_group_id" enabled="true">
-        <stringProp name="VAR">attribute_group_id</stringProp>
-        <stringProp name="JSONPATH">$.attribute_group_id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_group_id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">attribute_set_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "attribute": {&#xD;
-        "attribute_code": "attr_code_${__time()}",&#xD;
-        "frontend_labels": [&#xD;
-            {&#xD;
-                "store_id": 0,&#xD;
-                "label": "front_lbl_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}"&#xD;
-            }&#xD;
-        ],&#xD;
-        "default_value": "default value",&#xD;
-        "frontend_input": "textarea",&#xD;
-        "is_required": true&#xD;
-    }&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_id" enabled="true">
-        <stringProp name="VAR">attribute_id</stringProp>
-        <stringProp name="JSONPATH">$.attribute_id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_code" enabled="true">
-        <stringProp name="VAR">attribute_code</stringProp>
-        <stringProp name="JSONPATH">$.attribute_code</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_id not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="89649215">^\d+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">attribute_id</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_code not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2131456825">^[a-z0-9-_]+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">attribute_code</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add attribute to attribute set" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{&#xD;
-    "attributeSetId": "${attribute_set_id}",&#xD;
-    "attributeGroupId": "${attribute_group_id}",&#xD;
-    "attributeCode": "${attribute_code}",&#xD;
-    "sortOrder": 3&#xD;
-}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/attributes</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_attribute_to_attribute_set.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert response is not null" enabled="true">
-        <stringProp name="JSON_PATH">$</stringProp>
-        <stringProp name="EXPECTED_VALUE">(\d+)</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  </hashTree>
-
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Create Product" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${adminProductCreationPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Admin Create Product");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/once_only_controller.jmx</stringProp>
-</OnceOnlyController>
-    <hashTree>
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Related Product Id" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_related_product_id.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
-import java.util.Random;
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-    random.setSeed(${seedForRandom});
-}
-relatedIndex = random.nextInt(props.get("simple_products_list").size());
-vars.put("related_product_id", props.get("simple_products_list").get(relatedIndex).get("id"));</stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Product Attributes" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Content-Type</stringProp>
-          <stringProp name="Header.value">application/json</stringProp>
-        </elementProp>
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Accept</stringProp>
-          <stringProp name="Header.value">*/*</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-        <stringProp name="VAR">admin_token</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_token</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Authorization</stringProp>
-          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get product attributes" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">mycolor</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">attribute_code</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">mysize</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
-          </elementProp>
-          <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">attribute_code</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_product_attributes.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product attributes" enabled="true">
-        <stringProp name="VAR">product_attributes</stringProp>
-        <stringProp name="JSONPATH">$.items</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="SetUp - Prepare product attributes" enabled="true">
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="cacheKey"/>
-        <stringProp name="script">
-var attributesData = JSON.parse(vars.get("product_attributes")),
-maxOptions = 2;
-
-attributes = [];
-for (i in attributesData) {
-    if (i &gt;= 2) {
-        break;
-    }
-    var data = attributesData[i],
-        attribute = {
-            "id": data.attribute_id,
-            "code": data.attribute_code,
-            "label": data.default_frontend_label,
-            "options": []
-        };
-
-    var processedOptions = 0;
-    for (optionN in data.options) {
-        var option = data.options[optionN];
-        if (parseInt(option.value) &gt; 0 &amp;&amp; processedOptions &lt; maxOptions) {
-            processedOptions++;
-            attribute.options.push(option);
-        }
-    }
-    attributes.push(attribute);
-}
-
-vars.putObject("product_attributes", attributes);
-</stringProp>
-      </JSR223PostProcessor>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Attribute Set Id" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_set/index/filter/${attribute_set_filter}</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_setup_attribute_set.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">attribute_set_id</stringProp>
-        <stringProp name="RegexExtractor.regex">catalog\/product_set\/edit\/id\/([\d]+)\/"[\D\d]*Attribute Set 1</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="SetUp - Set Attribute Set Filter" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">import org.apache.commons.codec.binary.Base64;
-
-byte[] encodedBytes = Base64.encodeBase64("set_name=Attribute Set 1".getBytes());
-vars.put("attribute_set_filter", new String(encodedBytes));
-</stringProp>
-      </BeanShellPreProcessor>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
-import java.util.Random;
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-    random.setSeed(${seedForRandom});
-}
-number = random.nextInt(props.get("simple_products_list").size());
-simpleList = props.get("simple_products_list").get(number);
-vars.put("simple_product_1_id", simpleList.get("id"));
-vars.put("simple_product_1_name", simpleList.get("title"));
-
-do {
-    number1 = random.nextInt(props.get("simple_products_list").size());
-} while(number == number1);
-simpleList = props.get("simple_products_list").get(number1);
-vars.put("simple_product_2_id", simpleList.get("id"));
-vars.put("simple_product_2_name", simpleList.get("title"));
-
-number2 = random.nextInt(props.get("configurable_products_list").size());
-configurableList = props.get("configurable_products_list").get(number2);
-vars.put("configurable_product_1_id", configurableList.get("id"));
-vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
-vars.put("configurable_product_1_name", configurableList.get("title"));
-
-//Additional category to be added
-//int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
-//vars.put("category_additional", (categoryId+1).toString());
-//New price
-vars.put("price_new", "9999");
-//New special price
-vars.put("special_price_new", "8888");
-//New quantity
-vars.put("quantity_new", "100600");
-vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNum}-${__Random(1,1000000)}");
-
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Bundle Product" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/create_bundle_product.jmx</stringProp>
-</TestFragmentController>
-    <hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="1509986340">records found</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/bundle/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="-144461265">New Product</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Validate" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="ajax" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">ajax</stringProp>
-              <stringProp name="Argument.desc">false</stringProp>
-            </elementProp>
-            <elementProp name="isAjax" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">isAjax</stringProp>
-              <stringProp name="Argument.desc">false</stringProp>
-            </elementProp>
-            <elementProp name="form_key" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-              <stringProp name="Argument.desc">false</stringProp>
-            </elementProp>
-            <elementProp name="product[name]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[name]</stringProp>
-              <stringProp name="Argument.desc">false</stringProp>
-            </elementProp>
-            <elementProp name="product[sku]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Bundle Product  ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[sku]</stringProp>
-              <stringProp name="Argument.desc">false</stringProp>
-            </elementProp>
-            <elementProp name="product[price]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">42</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[price]</stringProp>
-            </elementProp>
-            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">2</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
-            </elementProp>
-            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">111</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-            </elementProp>
-            <elementProp name="product[weight]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1.0000</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[weight]</stringProp>
-            </elementProp>
-            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">2</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[category_ids][]</stringProp>
-            </elementProp>
-            <elementProp name="product[description]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">&lt;p&gt;Full bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[description]</stringProp>
-            </elementProp>
-            <elementProp name="product[short_description]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">&lt;p&gt;Short bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[short_description]</stringProp>
-            </elementProp>
-            <elementProp name="product[status]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[status]</stringProp>
-            </elementProp>
-            <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[configurable_variations]</stringProp>
-            </elementProp>
-            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
-            </elementProp>
-            <elementProp name="product[image]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[image]</stringProp>
-            </elementProp>
-            <elementProp name="product[small_image]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[small_image]</stringProp>
-            </elementProp>
-            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[thumbnail]</stringProp>
-            </elementProp>
-            <elementProp name="product[url_key]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">bundle-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[url_key]</stringProp>
-            </elementProp>
-            <elementProp name="product[meta_title]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[meta_title]</stringProp>
-            </elementProp>
-            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-            </elementProp>
-            <elementProp name="product[meta_description]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[meta_description]</stringProp>
-            </elementProp>
-            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[website_ids][]</stringProp>
-            </elementProp>
-            <elementProp name="product[special_price]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">99</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[special_price]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[special_from_date]</stringProp>
-            </elementProp>
-            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[special_to_date]</stringProp>
-            </elementProp>
-            <elementProp name="product[cost]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[cost]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">32000</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">100</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">90</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">101</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">99</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
-            </elementProp>
-            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">100500</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">100500</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">10000</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-            </elementProp>
-            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-            </elementProp>
-            <elementProp name="product[custom_design]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[custom_design]</stringProp>
-            </elementProp>
-            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-            </elementProp>
-            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-            </elementProp>
-            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-            </elementProp>
-            <elementProp name="product[page_layout]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[page_layout]</stringProp>
-            </elementProp>
-            <elementProp name="product[options_container]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">container2</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[options_container]</stringProp>
-            </elementProp>
-            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
-            </elementProp>
-            <elementProp name="product[shipment_type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">product[shipment_type]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][title]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">option title one</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][title]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][option_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][option_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][delete]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">select</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][type]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][required]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][required]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][position]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][option_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][option_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][product_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][product_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][delete]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">25</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_qty]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][position]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][option_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][option_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][product_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][product_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][delete]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">10.99</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_qty]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][position]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][title]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">option title two</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][title]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][option_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][option_id]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][delete]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">select</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][type]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][required]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][required]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][position]</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_id]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][option_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][option_id]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][product_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][product_id]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][delete]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">5.00</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_qty]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][position]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_id]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][option_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][option_id]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][product_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][product_id]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][delete]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][delete]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">7.00</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">0</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_qty]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][position]</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="affect_bundle_product_selections" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">2</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">affect_bundle_product_selections</stringProp>
-              <stringProp name="Argument.desc">true</stringProp>
-            </elementProp>
-            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${related_product_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">links[related][0][id]</stringProp>
-            </elementProp>
-            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">links[related][0][position]</stringProp>
-            </elementProp>
-            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${related_product_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
-            </elementProp>
-            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
-            </elementProp>
-            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${related_product_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
-            </elementProp>
-            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
-            </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="1853918323">{"error":false}</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Save" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="ajax" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">ajax</stringProp>
-              <stringProp name="Argument.desc">false</stringProp>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Save" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="ajax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">ajax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
             </elementProp>
             <elementProp name="isAjax" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
@@ -23005,8 +15757,8 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/bundle/back/edit/active_tab/product-details/</stringProp>
@@ -23046,8 +15798,8 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
@@ -23077,8 +15829,8 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/${attribute_set_id}/type/configurable/</stringProp>
@@ -23607,8 +16359,8 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/${attribute_set_id}/</stringProp>
@@ -23775,7 +16527,7 @@ function addConfigurableMatrix(attributes) {
           </elementProp>
           <elementProp name="product[category_ids][0]" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">4</stringProp>
+            <stringProp name="Argument.value">2</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">product[category_ids][0]</stringProp>
@@ -24219,8 +16971,8 @@ function addConfigurableMatrix(attributes) {
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/${attribute_set_id}/type/configurable/back/edit/active_tab/product-details/</stringProp>
@@ -24355,8 +17107,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
@@ -24385,8 +17137,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/downloadable/</stringProp>
@@ -24433,8 +17185,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/downloadable_file/upload/type/links/?isAjax=true</stringProp>
@@ -24480,8 +17232,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/downloadable_file/upload/type/samples/?isAjax=true</stringProp>
@@ -25213,8 +17965,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/type/downloadable/</stringProp>
@@ -25935,8 +18687,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/downloadable/back/edit/active_tab/product-details/</stringProp>
@@ -25980,8 +18732,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
@@ -26010,8 +18762,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/simple/</stringProp>
@@ -26739,8 +19491,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/</stringProp>
@@ -27450,8 +20202,8 @@ function addConfigurableMatrix(attributes) {
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/simple/back/edit/active_tab/product-details/</stringProp>
@@ -27492,8 +20244,8 @@ function addConfigurableMatrix(attributes) {
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -27512,8 +20264,11 @@ function addConfigurableMatrix(attributes) {
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
@@ -27619,7 +20374,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -27642,11 +20409,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -27723,8 +20490,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -27768,8 +20535,8 @@ vars.put("admin_user", adminUser);
     if (${seedForRandom} &gt; 0) {
       random.setSeed(${seedForRandom} + ${__threadNum});
     }
-    simpleCount = props.get("simple_products_list").size();
-    configCount = props.get("configurable_products_list").size();
+    simpleCount = props.get("simple_products_list_for_edit").size();
+    configCount = props.get("configurable_products_list_for_edit").size();
     productCount = 0;
     if (simpleCount &gt; configCount) {
     	productCount = configCount;
@@ -27805,14 +20572,14 @@ vars.put("admin_user", adminUser);
     i = productClusterLength * currentThreadNum + iterator;
 
     //ids of simple and configurable products to edit
-    vars.put("simple_product_id", props.get("simple_products_list").get(i).get("id"));
-    vars.put("configurable_product_id", props.get("configurable_products_list").get(i).get("id"));
+    vars.put("simple_product_id", props.get("simple_products_list_for_edit").get(i).get("id"));
+    vars.put("configurable_product_id", props.get("configurable_products_list_for_edit").get(i).get("id"));
 
     //id of related product
     do {
-    	relatedIndex = random.nextInt(props.get("simple_products_list").size());
+    	relatedIndex = random.nextInt(props.get("simple_products_list_for_edit").size());
     } while(i == relatedIndex);
-    vars.put("related_product_id", props.get("simple_products_list").get(relatedIndex).get("id"));
+    vars.put("related_product_id", props.get("simple_products_list_for_edit").get(relatedIndex).get("id"));
     } catch (Exception ex) {
     log.info("Script execution failed", ex);
 }</stringProp>
@@ -27827,8 +20594,8 @@ vars.put("admin_user", adminUser);
                   </elementProp>
                   <stringProp name="HTTPSampler.domain"/>
                   <stringProp name="HTTPSampler.port"/>
-                  <stringProp name="HTTPSampler.connect_timeout"/>
-                  <stringProp name="HTTPSampler.response_timeout"/>
+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
                   <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
                   <stringProp name="HTTPSampler.contentEncoding"/>
                   <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/edit/id/${simple_product_id}/</stringProp>
@@ -27881,20 +20648,32 @@ vars.put("admin_user", adminUser);
                 <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set updated values" enabled="true">
                   <stringProp name="TestPlan.comments">Passing arguments between threads</stringProp>
                   <stringProp name="BeanShellSampler.query">//Additional category to be added
+                    import java.util.Random;
 
-    int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
-    if (categoryId &gt; 4) {
-        categoryId = categoryId - 1;
-    } else {
-        categoryId = categoryId + 1;
-    }
-    vars.put("category_additional", categoryId.toString());
-    //New price
-    vars.put("price_new", "9999");
-    //New special price
-    vars.put("special_price_new", "8888");
-    //New quantity
-    vars.put("quantity_new", "100600");</stringProp>
+                        Random randomGenerator = new Random();
+                        if (${seedForRandom} &gt; 0) {
+                          randomGenerator.setSeed(${seedForRandom} + ${__threadNum});
+                        }
+
+                        int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
+                        categoryList = props.get("admin_category_ids_list");
+
+                        if (categoryList.size() &gt; 1) {
+	                        do {
+	                            int index = randomGenerator.nextInt(categoryList.size());
+	                            newCategoryId = categoryList.get(index);
+	                        } while (categoryId == newCategoryId);
+
+                            vars.put("category_additional", newCategoryId.toString());
+                        }
+
+                        //New price
+                        vars.put("price_new", "9999");
+                        //New special price
+                        vars.put("special_price_new", "8888");
+                        //New quantity
+                        vars.put("quantity_new", "100600");
+                  </stringProp>
                   <stringProp name="BeanShellSampler.filename"/>
                   <stringProp name="BeanShellSampler.parameters"/>
                   <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
@@ -28339,8 +21118,8 @@ vars.put("admin_user", adminUser);
                   </elementProp>
                   <stringProp name="HTTPSampler.domain"/>
                   <stringProp name="HTTPSampler.port"/>
-                  <stringProp name="HTTPSampler.connect_timeout"/>
-                  <stringProp name="HTTPSampler.response_timeout"/>
+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
                   <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
                   <stringProp name="HTTPSampler.contentEncoding"/>
                   <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/id/${simple_product_id}/?isAjax=true</stringProp>
@@ -28809,8 +21588,8 @@ vars.put("admin_user", adminUser);
                   </elementProp>
                   <stringProp name="HTTPSampler.domain"/>
                   <stringProp name="HTTPSampler.port"/>
-                  <stringProp name="HTTPSampler.connect_timeout"/>
-                  <stringProp name="HTTPSampler.response_timeout"/>
+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
                   <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
                   <stringProp name="HTTPSampler.contentEncoding"/>
                   <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/id/${simple_product_id}/back/edit/active_tab/product-details/</stringProp>
@@ -28839,8 +21618,8 @@ vars.put("admin_user", adminUser);
                   </elementProp>
                   <stringProp name="HTTPSampler.domain"/>
                   <stringProp name="HTTPSampler.port"/>
-                  <stringProp name="HTTPSampler.connect_timeout"/>
-                  <stringProp name="HTTPSampler.response_timeout"/>
+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
                   <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
                   <stringProp name="HTTPSampler.contentEncoding"/>
                   <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/edit/id/${configurable_product_id}/</stringProp>
@@ -28978,45 +21757,517 @@ vars.put("admin_user", adminUser);
                     <stringProp name="Scope.variable">configurable_attributes_data</stringProp>
                   </RegexExtractor>
                   <hashTree/>
-                </hashTree>
-                <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach configurable attribute id" enabled="true">
-                  <stringProp name="ForeachController.inputVal">configurable_attribute_ids</stringProp>
-                  <stringProp name="ForeachController.returnVal">configurable_attribute_id</stringProp>
-                  <boolProp name="ForeachController.useSeparator">true</boolProp>
-                </ForeachController>
-                <hashTree>
-                  <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-                    <stringProp name="CounterConfig.start">1</stringProp>
-                    <stringProp name="CounterConfig.end">${configurable_attribute_ids_matchNr}</stringProp>
-                    <stringProp name="CounterConfig.incr">1</stringProp>
-                    <stringProp name="CounterConfig.name">attribute_counter</stringProp>
-                    <stringProp name="CounterConfig.format"/>
-                    <boolProp name="CounterConfig.per_user">true</boolProp>
-                    <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
-                  </CounterConfig>
+                </hashTree>
+                <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach configurable attribute id" enabled="true">
+                  <stringProp name="ForeachController.inputVal">configurable_attribute_ids</stringProp>
+                  <stringProp name="ForeachController.returnVal">configurable_attribute_id</stringProp>
+                  <boolProp name="ForeachController.useSeparator">true</boolProp>
+                </ForeachController>
+                <hashTree>
+                  <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+                    <stringProp name="CounterConfig.start">1</stringProp>
+                    <stringProp name="CounterConfig.end">${configurable_attribute_ids_matchNr}</stringProp>
+                    <stringProp name="CounterConfig.incr">1</stringProp>
+                    <stringProp name="CounterConfig.name">attribute_counter</stringProp>
+                    <stringProp name="CounterConfig.format"/>
+                    <boolProp name="CounterConfig.per_user">true</boolProp>
+                    <boolProp name="CounterConfig.reset_on_tg_iteration">true</boolProp>
+                  </CounterConfig>
+                  <hashTree/>
+                  <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process configurable attribute values" enabled="true">
+                    <stringProp name="BeanShellSampler.query">return vars.get("configurable_attribute_values_" + vars.get("attribute_counter"));</stringProp>
+                    <stringProp name="BeanShellSampler.filename"/>
+                    <stringProp name="BeanShellSampler.parameters"/>
+                    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+                  </BeanShellSampler>
+                  <hashTree>
+                    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Exctract attribute values" enabled="true">
+                      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+                      <stringProp name="RegexExtractor.refname">attribute_${configurable_attribute_id}_values</stringProp>
+                      <stringProp name="RegexExtractor.regex">"value_index":"(\d+)"</stringProp>
+                      <stringProp name="RegexExtractor.template">$1$</stringProp>
+                      <stringProp name="RegexExtractor.default"/>
+                      <stringProp name="RegexExtractor.match_number">-1</stringProp>
+                      <stringProp name="Scope.variable">configurable_attribute_values_${attribute_counter}</stringProp>
+                    </RegexExtractor>
+                    <hashTree/>
+                  </hashTree>
+                </hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product Validate" enabled="true">
+                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+                    <collectionProp name="Arguments.arguments">
+                      <elementProp name="isAjax" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">true</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">isAjax</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="form_key" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${admin_form_key}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">form_key</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[name]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[name]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[sku]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_sku}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[sku]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[price]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${price_new}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[price]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">2</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[tax_class_id]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[weight]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">3</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[weight]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_category_id}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${category_additional}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[description]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">&lt;p&gt;Configurable product description ${configurable_product_id} Edited&lt;/p&gt;</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[description]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[status]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[status]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[meta_title]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_name} Meta Title Edited</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[meta_title]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_name} Meta Keyword Edited</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[meta_keyword]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[meta_description]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_name} Meta Description Edited</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[meta_description]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[website_ids][]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[website_ids][]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[special_price]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${special_price_new}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[special_price]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[special_from_date]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[special_from_date]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[special_to_date]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[special_to_date]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[cost]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[cost]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">0</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">0</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">0</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">0</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">0</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">0</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[custom_design]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[custom_design]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[custom_design_from]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[custom_design_to]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[page_layout]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value"/>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[page_layout]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[options_container]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">container2</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[options_container]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_attribute_id}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[configurable_variation]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[url_key]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[url_key]</stringProp>
+                      </elementProp>
+                      <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
+                      </elementProp>
+                      <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
+                      </elementProp>
+                      <elementProp name="product[visibility]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">4</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[visibility]</stringProp>
+                      </elementProp>
+                      <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">1</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[product_has_weight]</stringProp>
+                        <stringProp name="Argument.desc">true</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">50</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                      <elementProp name="product[stock_data][type_id]" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">configurable</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">product[stock_data][type_id]</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
+                    </collectionProp>
+                  </elementProp>
+                  <stringProp name="HTTPSampler.domain"/>
+                  <stringProp name="HTTPSampler.port"/>
+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                  <stringProp name="HTTPSampler.contentEncoding"/>
+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/id/${configurable_product_id}/</stringProp>
+                  <stringProp name="HTTPSampler.method">POST</stringProp>
+                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                  <boolProp name="HTTPSampler.monitor">false</boolProp>
+                  <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                  <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
+                    <boolProp name="resetInterpreter">false</boolProp>
+                    <stringProp name="parameters"/>
+                    <stringProp name="filename"/>
+                    <stringProp name="script">try {
+    	int attributesCount = Integer.parseInt(vars.get("configurable_attribute_ids_matchNr"));
+    	for (int i = 1; i &lt;= attributesCount; i++) {
+    		attributeId = vars.get("configurable_attribute_ids_" + i.toString());
+    		attributeCode = vars.get("configurable_attribute_codes_" + i.toString());
+    		attributeLabel = vars.get("configurable_attribute_labels_" + i.toString());
+    		ctx.getCurrentSampler().addArgument("attributes[" + (i - 1).toString() + "]", attributeId);
+    		ctx.getCurrentSampler().addArgument("attribute_codes[" + (i - 1).toString() + "]", attributeCode);
+    		ctx.getCurrentSampler().addArgument("product[" + attributeCode + "]", attributeId);
+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][attribute_id]", attributeId);
+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][position]", (i - 1).toString());
+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attributeCode);
+    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attributeLabel);
+
+    		int valuesCount = Integer.parseInt(vars.get("attribute_" + attributeId + "_values_matchNr"));
+    		for (int j = 1; j &lt;= valuesCount; j++) {
+    			attributeValue = vars.get("attribute_" + attributeId + "_values_" + j.toString());
+    			ctx.getCurrentSampler().addArgument(
+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][include]",
+    				"1"
+    			);
+    			ctx.getCurrentSampler().addArgument(
+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][value_index]",
+    				attributeValue
+    			);
+    		}
+    	}
+    	ctx.getCurrentSampler().addArgument("associated_product_ids_serialized", vars.get("associated_products_ids").toString());
+    } catch (Exception e) {
+        log.error("error???", e);
+    }</stringProp>
+                  </BeanShellPreProcessor>
+                  <hashTree/>
+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                      <stringProp name="1853918323">{"error":false}</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">2</intProp>
+                  </ResponseAssertion>
                   <hashTree/>
-                  <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process configurable attribute values" enabled="true">
-                    <stringProp name="BeanShellSampler.query">return vars.get("configurable_attribute_values_" + vars.get("attribute_counter"));</stringProp>
-                    <stringProp name="BeanShellSampler.filename"/>
-                    <stringProp name="BeanShellSampler.parameters"/>
-                    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-                  </BeanShellSampler>
-                  <hashTree>
-                    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Exctract attribute values" enabled="true">
-                      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-                      <stringProp name="RegexExtractor.refname">attribute_${configurable_attribute_id}_values</stringProp>
-                      <stringProp name="RegexExtractor.regex">"value_index":"(\d+)"</stringProp>
-                      <stringProp name="RegexExtractor.template">$1$</stringProp>
-                      <stringProp name="RegexExtractor.default"/>
-                      <stringProp name="RegexExtractor.match_number">-1</stringProp>
-                      <stringProp name="Scope.variable">configurable_attribute_values_${attribute_counter}</stringProp>
-                    </RegexExtractor>
-                    <hashTree/>
-                  </hashTree>
                 </hashTree>
-                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product Validate" enabled="true">
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product Save" enabled="true">
                   <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
                     <collectionProp name="Arguments.arguments">
+                      <elementProp name="ajax" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                        <stringProp name="Argument.value">true</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                        <stringProp name="Argument.name">ajax</stringProp>
+                        <stringProp name="Argument.desc">false</stringProp>
+                      </elementProp>
                       <elementProp name="isAjax" elementType="HTTPArgument">
                         <boolProp name="HTTPArgument.always_encode">true</boolProp>
                         <stringProp name="Argument.value">true</stringProp>
@@ -29057,12 +22308,12 @@ vars.put("admin_user", adminUser);
                         <stringProp name="Argument.name">product[price]</stringProp>
                         <stringProp name="Argument.desc">false</stringProp>
                       </elementProp>
-                      <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
+                      <elementProp name="product[tax_class_id]admin" elementType="HTTPArgument">
                         <boolProp name="HTTPArgument.always_encode">true</boolProp>
                         <stringProp name="Argument.value">2</stringProp>
                         <stringProp name="Argument.metadata">=</stringProp>
                         <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[tax_class_id]</stringProp>
+                        <stringProp name="Argument.name">product[tax_class_id]admin</stringProp>
                         <stringProp name="Argument.desc">false</stringProp>
                       </elementProp>
                       <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
@@ -29417,11 +22668,11 @@ vars.put("admin_user", adminUser);
                   </elementProp>
                   <stringProp name="HTTPSampler.domain"/>
                   <stringProp name="HTTPSampler.port"/>
-                  <stringProp name="HTTPSampler.connect_timeout"/>
-                  <stringProp name="HTTPSampler.response_timeout"/>
+                  <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+                  <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
                   <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
                   <stringProp name="HTTPSampler.contentEncoding"/>
-                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/id/${configurable_product_id}/</stringProp>
+                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/id/${configurable_product_id}/back/edit/active_tab/product-details/</stringProp>
                   <stringProp name="HTTPSampler.method">POST</stringProp>
                   <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
                   <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -29449,522 +22700,8095 @@ vars.put("admin_user", adminUser);
     		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attributeCode);
     		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attributeLabel);
 
-    		int valuesCount = Integer.parseInt(vars.get("attribute_" + attributeId + "_values_matchNr"));
-    		for (int j = 1; j &lt;= valuesCount; j++) {
-    			attributeValue = vars.get("attribute_" + attributeId + "_values_" + j.toString());
-    			ctx.getCurrentSampler().addArgument(
-    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][include]",
-    				"1"
-    			);
-    			ctx.getCurrentSampler().addArgument(
-    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][value_index]",
-    				attributeValue
-    			);
-    		}
-    	}
-    	ctx.getCurrentSampler().addArgument("associated_product_ids_serialized", vars.get("associated_products_ids").toString());
-    } catch (Exception e) {
-        log.error("error???", e);
-    }</stringProp>
-                  </BeanShellPreProcessor>
-                  <hashTree/>
-                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-                    <collectionProp name="Asserion.test_strings">
-                      <stringProp name="1853918323">{"error":false}</stringProp>
-                    </collectionProp>
-                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-                    <boolProp name="Assertion.assume_success">false</boolProp>
-                    <intProp name="Assertion.test_type">2</intProp>
-                  </ResponseAssertion>
-                  <hashTree/>
-                </hashTree>
-                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Edit Configurable Product Save" enabled="true">
-                  <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-                    <collectionProp name="Arguments.arguments">
-                      <elementProp name="ajax" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">true</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">ajax</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="isAjax" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">true</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">isAjax</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="form_key" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${admin_form_key}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">form_key</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[name]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[name]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[sku]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_sku}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[sku]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[price]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${price_new}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[price]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[tax_class_id]admin" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">2</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[tax_class_id]admin</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[weight]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">3</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[weight]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_category_id}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[category_ids][]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${category_additional}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[category_ids][]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[description]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">&lt;p&gt;Configurable product description ${configurable_product_id} Edited&lt;/p&gt;</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[description]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[status]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[status]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[meta_title]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_name} Meta Title Edited</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[meta_title]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_name} Meta Keyword Edited</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[meta_keyword]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[meta_description]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_name} Meta Description Edited</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[meta_description]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[website_ids][]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[website_ids][]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[special_price]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${special_price_new}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[special_price]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[special_from_date]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[special_from_date]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[special_to_date]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[special_to_date]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[cost]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[cost]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">0</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">0</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">0</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">0</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">0</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">0</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[custom_design]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[custom_design]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[custom_design_from]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[custom_design_to]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[page_layout]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value"/>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[page_layout]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[options_container]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">container2</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[options_container]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[configurable_variation]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_attribute_id}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[configurable_variation]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[url_key]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">${configurable_product_name}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[url_key]</stringProp>
-                      </elementProp>
-                      <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-                      </elementProp>
-                      <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-                      </elementProp>
-                      <elementProp name="product[visibility]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">4</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[visibility]</stringProp>
-                      </elementProp>
-                      <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-                        <stringProp name="Argument.desc">true</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">50</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                      <elementProp name="product[stock_data][type_id]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                        <stringProp name="Argument.value">configurable</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">product[stock_data][type_id]</stringProp>
-                        <stringProp name="Argument.desc">false</stringProp>
-                      </elementProp>
-                    </collectionProp>
-                  </elementProp>
-                  <stringProp name="HTTPSampler.domain"/>
-                  <stringProp name="HTTPSampler.port"/>
-                  <stringProp name="HTTPSampler.connect_timeout"/>
-                  <stringProp name="HTTPSampler.response_timeout"/>
-                  <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-                  <stringProp name="HTTPSampler.contentEncoding"/>
-                  <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/id/${configurable_product_id}/back/edit/active_tab/product-details/</stringProp>
-                  <stringProp name="HTTPSampler.method">POST</stringProp>
-                  <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-                  <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-                  <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-                  <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-                  <boolProp name="HTTPSampler.monitor">false</boolProp>
-                  <stringProp name="HTTPSampler.embedded_url_re"/>
-                </HTTPSamplerProxy>
-                <hashTree>
-                  <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
-                    <boolProp name="resetInterpreter">false</boolProp>
-                    <stringProp name="parameters"/>
-                    <stringProp name="filename"/>
-                    <stringProp name="script">try {
-    	int attributesCount = Integer.parseInt(vars.get("configurable_attribute_ids_matchNr"));
-    	for (int i = 1; i &lt;= attributesCount; i++) {
-    		attributeId = vars.get("configurable_attribute_ids_" + i.toString());
-    		attributeCode = vars.get("configurable_attribute_codes_" + i.toString());
-    		attributeLabel = vars.get("configurable_attribute_labels_" + i.toString());
-    		ctx.getCurrentSampler().addArgument("attributes[" + (i - 1).toString() + "]", attributeId);
-    		ctx.getCurrentSampler().addArgument("attribute_codes[" + (i - 1).toString() + "]", attributeCode);
-    		ctx.getCurrentSampler().addArgument("product[" + attributeCode + "]", attributeId);
-    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][attribute_id]", attributeId);
-    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][position]", (i - 1).toString());
-    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][code]", attributeCode);
-    		ctx.getCurrentSampler().addArgument("product[configurable_attributes_data][" + attributeId + "][label]", attributeLabel);
+    		int valuesCount = Integer.parseInt(vars.get("attribute_" + attributeId + "_values_matchNr"));
+    		for (int j = 1; j &lt;= valuesCount; j++) {
+    			attributeValue = vars.get("attribute_" + attributeId + "_values_" + j.toString());
+    			ctx.getCurrentSampler().addArgument(
+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][include]",
+    				"1"
+    			);
+    			ctx.getCurrentSampler().addArgument(
+    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][value_index]",
+    				attributeValue
+    			);
+    		}
+    	}
+    	ctx.getCurrentSampler().addArgument("associated_product_ids_serialized", vars.get("associated_products_ids").toString());
+    } catch (Exception e) {
+        log.error("error???", e);
+    }</stringProp>
+                  </BeanShellPreProcessor>
+                  <hashTree/>
+                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                      <stringProp name="-583471546">You saved the product</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">2</intProp>
+                    <stringProp name="TestPlan.comments"> if have trouble see messages-message-error </stringProp>
+                  </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  </hashTree>
+
+    
+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="CSR Pool" enabled="true">
+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+                <boolProp name="LoopController.continue_forever">false</boolProp>
+                <stringProp name="LoopController.loops">${loops}</stringProp>
+            </elementProp>
+            <stringProp name="ThreadGroup.num_threads">${csrPoolUsers}</stringProp>
+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
+            <stringProp name="ThreadGroup.duration"/>
+            <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
+        <hashTree>
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Returns Management" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${adminReturnsManagementPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Admin Returns Management");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Orders page" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/orders_page.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1204796042">Create New Order</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Orders" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="namespace" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">sales_order_grid</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">namespace</stringProp>
+        </elementProp>
+        <elementProp name="search" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value"/>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">search</stringProp>
+        </elementProp>
+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
+        </elementProp>
+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">200</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
+        </elementProp>
+        <elementProp name="paging[current]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[current]</stringProp>
+        </elementProp>
+        <elementProp name="sorting[field]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">increment_id</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[field]</stringProp>
+        </elementProp>
+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">desc</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[direction]</stringProp>
+        </elementProp>
+        <elementProp name="isAjax" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">isAjax</stringProp>
+        </elementProp>
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
+        </elementProp>
+        <elementProp name="filters[status]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">pending</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[status]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="_" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">_</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_orders.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1637639774">totalRecords</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Pending Orders" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+        </elementProp>
+        <elementProp name="namespace" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">sales_order_grid</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">namespace</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="search" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value"/>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">search</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">200</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="paging[current]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[current]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="sorting[field]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">increment_id</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[field]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">asc</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[direction]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="isAjax" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">isAjax</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="filters[status]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">pending</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[status]</stringProp>
+        </elementProp>
+        <elementProp name="_" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">_</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/search_orders.jmx</stringProp></HTTPSamplerProxy>
+<hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1637639774">totalRecords</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order numbers" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">order_numbers</stringProp>
+        <stringProp name="RegexExtractor.regex">\"increment_id\":\"(\d+)\"\,</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
+        <stringProp name="Scope.variable">simple_products</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order ids" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">order_ids</stringProp>
+        <stringProp name="RegexExtractor.regex">\"entity_id\":\"(\d+)\"\,</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
+        <stringProp name="Scope.variable">simple_products</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+    </hashTree>
+
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+  import java.util.ArrayList;
+  import java.util.HashMap;
+  import org.apache.jmeter.protocol.http.util.Base64Encoder;
+  import java.util.Random;
+
+  // get count of "order_numbers" variable defined in "Search Pending Orders Limit"
+  int ordersCount = Integer.parseInt(vars.get("order_numbers_matchNr"));
+
+
+  int clusterLength;
+  int threadsNumber = ctx.getThreadGroup().getNumThreads();
+  if (threadsNumber == 0) {
+      //Number of orders for one thread
+      clusterLength = ordersCount;
+  } else {
+      clusterLength = Math.round(ordersCount / threadsNumber);
+      if (clusterLength == 0) {
+          clusterLength = 1;
+      }
+  }
+
+  //Current thread number starts from 0
+  int currentThreadNum = ctx.getThreadNum();
+
+  //Index of the current product from the cluster
+  Random random = new Random();
+  if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+  }
+  int iterator = random.nextInt(clusterLength);
+  if (iterator == 0) {
+  	iterator = 1;
+  }
+
+  int i = clusterLength * currentThreadNum + iterator;
+
+  orderNumber = vars.get("order_numbers_" + i.toString());
+  orderId = vars.get("order_ids_" + i.toString());
+  vars.put("order_number", orderNumber);
+  vars.put("order_id", orderId);
+
+  </stringProp>
+    <stringProp name="BeanShellSampler.filename"/>
+    <stringProp name="BeanShellSampler.parameters"/>
+    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+  </BeanShellSampler>
+  <hashTree/>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Order" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/view/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_order.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="2103620713">#${order_number}</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order status" enabled="true">
+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+      <stringProp name="RegexExtractor.refname">order_status</stringProp>
+      <stringProp name="RegexExtractor.regex">&lt;span id="order_status"&gt;([^&lt;]+)&lt;/span&gt;</stringProp>
+      <stringProp name="RegexExtractor.template">$1$</stringProp>
+      <stringProp name="RegexExtractor.default"/>
+      <stringProp name="RegexExtractor.match_number">1</stringProp>
+      <stringProp name="Scope.variable">simple_products</stringProp>
+    </RegexExtractor>
+    <hashTree/>
+  </hashTree>
+
+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+      <stringProp name="IfController.condition">"${order_status}" == "Pending"</stringProp>
+      <boolProp name="IfController.evaluateAll">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/if_controller.jmx</stringProp></IfController>
+    <hashTree>
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Start" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/start/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_start.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="-1233850814">Invoice Totals</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract ordered items ids" enabled="true">
+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+      <stringProp name="RegexExtractor.refname">item_ids</stringProp>
+      <stringProp name="RegexExtractor.regex">&lt;div id="order_item_(\d+)_title"\s*class="product-title"&gt;</stringProp>
+      <stringProp name="RegexExtractor.template">$1$</stringProp>
+      <stringProp name="RegexExtractor.default"/>
+      <stringProp name="RegexExtractor.match_number">-1</stringProp>
+      <stringProp name="Scope.variable">simple_products</stringProp>
+    </RegexExtractor>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Submit" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
+        </elementProp>
+        <elementProp name="invoice[items][${item_ids_1}]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">invoice[items][${item_ids_1}]</stringProp>
+        </elementProp>
+        <elementProp name="invoice[items][${item_ids_2}]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">invoice[items][${item_ids_2}]</stringProp>
+        </elementProp>
+        <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">Invoiced</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">invoice[comment_text]</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">POST</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_submit.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1740524604">The invoice has been created</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Credit Memo Start" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_creditmemo/start/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/credit_memo_start.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1382627322">New Memo</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Credit Memo Submit - Full Refund" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[items][${item_ids_1}][qty]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[items][${item_ids_1}][qty]</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[items][${item_ids_2}][qty]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[items][${item_ids_2}][qty]</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[do_offline]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[do_offline]</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[comment_text]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">Credit Memo added</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[comment_text]</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[shipping_amount]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">10</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[shipping_amount]</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[adjustment_positive]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">0</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[adjustment_positive]</stringProp>
+        </elementProp>
+        <elementProp name="creditmemo[adjustment_negative]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">0</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">creditmemo[adjustment_negative]</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_creditmemo/save/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">POST</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/credit_memo_full_refund.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-515117447">You created the credit memo</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+    <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Create/Process Returns - Pause" enabled="true">
+      <intProp name="ActionProcessor.action">1</intProp>
+      <intProp name="ActionProcessor.target">0</intProp>
+      <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCreateProcessReturnsDelay}*1000))}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/pause.jmx</stringProp></TestAction>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Browse Customer Grid" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${browseCustomerGridPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Browse Customer Grid");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="script">
+        vars.put("gridEntityType" , "Customer");
+
+        pagesCount = parseInt(vars.get("customers_page_size")) || 20;
+        vars.put("grid_entity_page_size" , pagesCount);
+        vars.put("grid_namespace" , "customer_listing");
+        vars.put("grid_admin_browse_filter_text" , vars.get("admin_browse_customer_filter_text"));
+        vars.put("grid_filter_field", "name");
+
+        // set sort fields and sort directions
+        vars.put("grid_sort_field_1", "name");
+        vars.put("grid_sort_field_2", "group_id");
+        vars.put("grid_sort_field_3", "billing_country_id");
+        vars.put("grid_sort_order_1", "asc");
+        vars.put("grid_sort_order_2", "desc");
+      </stringProp>
+      <stringProp name="scriptLanguage">javascript</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_customers_grid/setup.jmx</stringProp></JSR223PostProcessor>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Pages Count" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="namespace" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">namespace</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="search" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">search</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[current]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[current]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">entity_id</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[field]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">asc</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[direction]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="isAjax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">isAjax</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_pages_count.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
+        <stringProp name="EXPECTED_VALUE">0</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
+        <stringProp name="VAR">entity_total_records</stringProp>
+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} pages count" enabled="true">
+        <stringProp name="cacheKey"/>
+        <stringProp name="filename"/>
+        <stringProp name="parameters"/>
+        <stringProp name="script">
+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
+          var totalsRecord = parseInt(vars.get("entity_total_records"));
+          var pageCount = Math.round(totalsRecord/pageSize);
+
+          vars.put("grid_pages_count", pageCount);
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+      </JSR223PostProcessor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Set ${gridEntityType} Filtered Pages Count" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="namespace" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">namespace</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="search" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">search</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[current]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[current]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">entity_id</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[field]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">asc</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[direction]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="isAjax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">isAjax</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/set_filtered_pages_count.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
+        <stringProp name="EXPECTED_VALUE">0</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">true</boolProp>
+        <boolProp name="ISREGEX">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
+        <stringProp name="VAR">entity_total_records</stringProp>
+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="SetUp - Calculate ${gridEntityType} filtered pages count" enabled="true">
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+          var pageSize = parseInt(vars.get("grid_entity_page_size")) || 20;
+var totalsRecord = parseInt(vars.get("entity_total_records"));
+var pageCount = Math.round(totalsRecord/pageSize);
+
+vars.put("grid_pages_count_filtered", pageCount);
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+      </JSR223PostProcessor>
+      <hashTree/>
+    </hashTree>
+  
+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select ${gridEntityType} Page Number" enabled="true">
+      <stringProp name="CounterConfig.start">1</stringProp>
+      <stringProp name="CounterConfig.end">${grid_pages_count}</stringProp>
+      <stringProp name="CounterConfig.incr">1</stringProp>
+      <stringProp name="CounterConfig.name">page_number</stringProp>
+      <stringProp name="CounterConfig.format"/>
+      <boolProp name="CounterConfig.per_user">true</boolProp>
+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_page_number.jmx</stringProp></CounterConfig>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="namespace" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_namespace}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">namespace</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="search" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">search</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[current]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${page_number}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[current]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">entity_id</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[field]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">asc</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[direction]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="isAjax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">isAjax</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="SetUp - Select Filtered ${gridEntityType} Page Number" enabled="true">
+      <stringProp name="CounterConfig.start">1</stringProp>
+      <stringProp name="CounterConfig.end">${grid_pages_count_filtered}</stringProp>
+      <stringProp name="CounterConfig.incr">1</stringProp>
+      <stringProp name="CounterConfig.name">page_number</stringProp>
+      <stringProp name="CounterConfig.format"/>
+      <boolProp name="CounterConfig.per_user">true</boolProp>
+      <boolProp name="CounterConfig.reset_on_tg_iteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/select_filtered_page_number.jmx</stringProp></CounterConfig>
+    <hashTree/>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="View ${gridEntityType} page - Filtering + Sorting" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_grid_browsing/admin_browse_grid_sort_and_filter.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Field Defined" enabled="true">
+        <stringProp name="ForeachController.inputVal">grid_sort_field</stringProp>
+        <stringProp name="ForeachController.returnVal">grid_sort_field</stringProp>
+        <boolProp name="ForeachController.useSeparator">true</boolProp>
+        <stringProp name="ForeachController.startIndex">0</stringProp>
+        <stringProp name="ForeachController.endIndex">3</stringProp>
+      </ForeachController>
+      <hashTree>
+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Sort Order Defined" enabled="true">
+          <stringProp name="ForeachController.inputVal">grid_sort_order</stringProp>
+          <stringProp name="ForeachController.returnVal">grid_sort_order</stringProp>
+          <boolProp name="ForeachController.useSeparator">true</boolProp>
+          <stringProp name="ForeachController.startIndex">0</stringProp>
+          <stringProp name="ForeachController.endIndex">2</stringProp>
+        </ForeachController>
+        <hashTree>
+          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View ${gridEntityType} page - Filtering + Sort By ${grid_sort_field} ${grid_sort_order}" enabled="true">
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="namespace" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">${grid_namespace}</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">namespace</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="filters[${grid_filter_field}]" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">${grid_admin_browse_filter_text}</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">filters[${grid_filter_field}]</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">filters[placeholder]</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">${grid_entity_page_size}</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">paging[pageSize]</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="paging[current]" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">${page_number}</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">paging[current]</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="sorting[field]" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">${grid_sort_field}</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">sorting[field]</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="sorting[direction]" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">${grid_sort_order}</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">sorting[direction]</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+                <elementProp name="isAjax" elementType="HTTPArgument">
+                  <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                  <stringProp name="Argument.value">true</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                  <stringProp name="Argument.name">isAjax</stringProp>
+                  <stringProp name="Argument.desc">false</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+            <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+            <stringProp name="HTTPSampler.method">GET</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+          </HTTPSamplerProxy>
+          <hashTree>
+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+              <collectionProp name="Asserion.test_strings">
+                <stringProp name="1637639774">\"totalRecords\":[^0]\d*</stringProp>
+              </collectionProp>
+              <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+              <boolProp name="Assertion.assume_success">false</boolProp>
+              <intProp name="Assertion.test_type">2</intProp>
+            </ResponseAssertion>
+            <hashTree/>
+          </hashTree>
+        </hashTree>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Create Order" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${adminCreateOrderPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Admin Create Order");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">
+      vars.put("alabama_region_id", props.get("alabama_region_id"));
+      vars.put("california_region_id", props.get("california_region_id"));
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
+    <hashTree>
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
+import java.util.Random;
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+  random.setSeed(${seedForRandom});
+}
+number = random.nextInt(props.get("simple_products_list").size());
+simpleList = props.get("simple_products_list").get(number);
+vars.put("simple_product_1_url_key", simpleList.get("url_key"));
+vars.put("simple_product_1_name", simpleList.get("title"));
+vars.put("simple_product_1_id", simpleList.get("id"));
+
+do {
+    number1 = random.nextInt(props.get("simple_products_list").size());
+} while(number == number1);
+simpleList = props.get("simple_products_list").get(number1);
+vars.put("simple_product_2_url_key", simpleList.get("url_key"));
+vars.put("simple_product_2_name", simpleList.get("title"));
+vars.put("simple_product_2_id", simpleList.get("id"));
+
+number = random.nextInt(props.get("configurable_products_list").size());
+configurableList = props.get("configurable_products_list").get(number);
+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
+vars.put("configurable_product_1_name", configurableList.get("title"));
+vars.put("configurable_product_1_id", configurableList.get("id"));
+vars.put("configurable_product_1_sku", configurableList.get("sku"));
+vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
+vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
+
+
+customers_index = 0;
+if (!props.containsKey("customer_ids_index")) {
+	props.put("customer_ids_index", customers_index);
+}
+
+try {
+	customers_index = props.get("customer_ids_index");
+	customers_list = props.get("customer_ids_list");
+
+	if (customers_index == customers_list.size()) {
+		customers_index=0;
+	}
+	vars.put("customer_id", customers_list.get(customers_index));
+	props.put("customer_ids_index", ++customers_index);
+}
+catch (java.lang.Exception e) {
+	   log.error("Caught Exception in 'Admin Create Order' thread.");
+	   SampleResult.setStopThread(true);
+}</stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Start Order" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/start/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree/>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Configurable Product Options" enabled="true"/>
+      <hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Content-Type</stringProp>
+              <stringProp name="Header.value">application/json</stringProp>
+            </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Accept</stringProp>
+              <stringProp name="Header.value">*/*</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+            <stringProp name="VAR">admin_token</stringProp>
+            <stringProp name="JSONPATH">$</stringProp>
+            <stringProp name="DEFAULT"/>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">1</intProp>
+            <stringProp name="Assertion.scope">variable</stringProp>
+            <stringProp name="Scope.variable">admin_token</stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Authorization</stringProp>
+              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Configurable Product Options" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"/>
+          <stringProp name="HTTPSampler.port"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"/>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/configurable-products/${configurable_product_1_sku}/options/all</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.monitor">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"/>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract attribute_ids" enabled="true">
+            <stringProp name="VAR">attribute_ids</stringProp>
+            <stringProp name="JSONPATH">$.[*].attribute_id</stringProp>
+            <stringProp name="DEFAULT">NO_VALUE</stringProp>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <hashTree/>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="JSON Path Extractor: Extract option_values" enabled="true">
+            <stringProp name="VAR">option_values</stringProp>
+            <stringProp name="JSONPATH">$.[*].values[0].value_index</stringProp>
+            <stringProp name="DEFAULT">NO_VALUE</stringProp>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Products" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="item[${simple_product_1_id}][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">item[${simple_product_1_id}][qty]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="item[${simple_product_2_id}][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">item[${simple_product_2_id}][qty]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="item[${configurable_product_1_id}][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">item[${configurable_product_1_id}][qty]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="customer_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">customer_id</stringProp>
+              <stringProp name="Argument.value">${customer_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="store_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">store_id</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="currency_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">currency_id</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="payment[method]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">payment[method]</stringProp>
+              <stringProp name="Argument.value">checkmo</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="reset_shipping" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">reset_shipping</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="json" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">json</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="as_js_varname" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">as_js_varname</stringProp>
+              <stringProp name="Argument.value">iFrameResponse</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/loadBlock/block/search,items,shipping_method,totals,giftmessage,billing_method?isAjax=true</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Configure product options" enabled="true">
+          <boolProp name="resetInterpreter">false</boolProp>
+          <stringProp name="parameters"/>
+          <stringProp name="filename"/>
+          <stringProp name="script">try {
+	attribute_ids = vars.get("attribute_ids");
+	option_values = vars.get("option_values");
+	attribute_ids = attribute_ids.replace("[","").replace("]","").replace("\"", "");
+	option_values = option_values.replace("[","").replace("]","").replace("\"", "");
+	attribute_ids_array = attribute_ids.split(",");
+	option_values_array = option_values.split(",");
+	args = ctx.getCurrentSampler().getArguments();
+	it = args.iterator();
+	while (it.hasNext()) {
+	    argument = it.next();
+	    if (argument.getStringValue().contains("${")) {
+	        args.removeArgument(argument.getName());
+	    }
+	}
+	for (int i = 0; i &lt; attribute_ids_array.length; i++) {
+
+    ctx.getCurrentSampler().addArgument("item[" + vars.get("configurable_product_1_id") + "][super_attribute][" + attribute_ids_array[i] + "]", option_values_array[i]);
+	}
+} catch (Exception e) {
+    log.error("error???", e);
+}</stringProp>
+        </BeanShellPreProcessor>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Collect Shipping Rates" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="collect_shipping_rates" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">collect_shipping_rates</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="customer_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">customer_id</stringProp>
+              <stringProp name="Argument.value">${customer_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="store_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">store_id</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="currency_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">currency_id</stringProp>
+              <stringProp name="Argument.value">false</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="payment[method]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">payment[method]</stringProp>
+              <stringProp name="Argument.value">checkmo</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="json" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">json</stringProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/loadBlock/block/shipping_method,totals?isAjax=true</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Shipping Method" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-1987784558">shipping_method</stringProp>
+            <stringProp name="818779431">Flat Rate</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Filled Order Page" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/index/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Filled Order Page" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-37823069">Select from existing customer addresses</stringProp>
+            <stringProp name="-13185722">Submit Order</stringProp>
+            <stringProp name="-209419315">Items Ordered</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Order" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="limit" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">limit</stringProp>
+              <stringProp name="Argument.value">20</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="entity_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">entity_id</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="name" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">name</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="email" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">email</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="Telephone" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">Telephone</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="billing_postcode" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">billing_postcode</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="billing_country_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">billing_country_id</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="billing_regione" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">billing_regione</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="store_name" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">store_name</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="page" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">page</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[currency]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[currency]</stringProp>
+              <stringProp name="Argument.value">USD</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="sku" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">sku</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="qty" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">qty</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="limit" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">limit</stringProp>
+              <stringProp name="Argument.value">20</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="entity_id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">entity_id</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="name" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">name</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="sku" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">sku</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="price[from]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">price[from]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="price[to]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">price[to]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="in_products" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">in_products</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="page" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">page</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="coupon_code" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">coupon_code</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[account][group_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[account][group_id]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[account][email]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[account][email]</stringProp>
+              <stringProp name="Argument.value">user_${customer_id}@example.com</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][customer_address_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][customer_address_id]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][prefix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][prefix]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][firstname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][firstname]</stringProp>
+              <stringProp name="Argument.value">Anthony</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][middlename]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][middlename]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][lastname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][lastname]</stringProp>
+              <stringProp name="Argument.value">Nealy</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][suffix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][suffix]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][company]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][company]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][street][0]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][street][0]</stringProp>
+              <stringProp name="Argument.value">123 Freedom Blvd. #123</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][street][1]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][street][1]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][city]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][city]</stringProp>
+              <stringProp name="Argument.value">Fayetteville</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][country_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][country_id]</stringProp>
+              <stringProp name="Argument.value">US</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][region]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][region]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][region_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][region_id]</stringProp>
+              <stringProp name="Argument.value">${alabama_region_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][postcode]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][postcode]</stringProp>
+              <stringProp name="Argument.value">123123</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][telephone]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][telephone]</stringProp>
+              <stringProp name="Argument.value">022-333-4455</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][fax]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][fax]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[billing_address][vat_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[billing_address][vat_id]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="shipping_same_as_billing" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">shipping_same_as_billing</stringProp>
+              <stringProp name="Argument.value">on</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="payment[method]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">payment[method]</stringProp>
+              <stringProp name="Argument.value">checkmo</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[shipping_method]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[shipping_method]</stringProp>
+              <stringProp name="Argument.value">flatrate_flatrate</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[comment][customer_note]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[comment][customer_note_notify]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[comment][customer_note_notify]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="order[send_confirmation]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">order[send_confirmation]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/save/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Id" enabled="true">
+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+          <stringProp name="RegexExtractor.refname">order_id</stringProp>
+          <stringProp name="RegexExtractor.regex">${host}${base_path}${admin_path}/sales/order/index/order_id/(\d+)/</stringProp>
+          <stringProp name="RegexExtractor.template">$1$</stringProp>
+          <stringProp name="RegexExtractor.default"/>
+          <stringProp name="RegexExtractor.match_number">1</stringProp>
+        </RegexExtractor>
+        <hashTree/>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 1" enabled="true">
+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+          <stringProp name="RegexExtractor.refname">order_item_1</stringProp>
+          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
+          <stringProp name="RegexExtractor.template">$1$</stringProp>
+          <stringProp name="RegexExtractor.default"/>
+          <stringProp name="RegexExtractor.match_number">1</stringProp>
+        </RegexExtractor>
+        <hashTree/>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 2" enabled="true">
+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+          <stringProp name="RegexExtractor.refname">order_item_2</stringProp>
+          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
+          <stringProp name="RegexExtractor.template">$1$</stringProp>
+          <stringProp name="RegexExtractor.default"/>
+          <stringProp name="RegexExtractor.match_number">2</stringProp>
+        </RegexExtractor>
+        <hashTree/>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract Order Item 3" enabled="true">
+          <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+          <stringProp name="RegexExtractor.refname">order_item_3</stringProp>
+          <stringProp name="RegexExtractor.regex">order_item_(\d+)_title</stringProp>
+          <stringProp name="RegexExtractor.template">$1$</stringProp>
+          <stringProp name="RegexExtractor.default"/>
+          <stringProp name="RegexExtractor.match_number">3</stringProp>
+        </RegexExtractor>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Id" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="89649215">^\d+$</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+          <stringProp name="Assertion.scope">variable</stringProp>
+          <stringProp name="Scope.variable">order_id</stringProp>
+        </ResponseAssertion>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 1" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="89649215">^\d+$</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+          <stringProp name="Assertion.scope">variable</stringProp>
+          <stringProp name="Scope.variable">order_item_1</stringProp>
+        </ResponseAssertion>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 2" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="89649215">^\d+$</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+          <stringProp name="Assertion.scope">variable</stringProp>
+          <stringProp name="Scope.variable">order_item_2</stringProp>
+        </ResponseAssertion>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Item 3" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="89649215">^\d+$</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+          <stringProp name="Assertion.scope">variable</stringProp>
+          <stringProp name="Scope.variable">order_item_3</stringProp>
+        </ResponseAssertion>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Order Created" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="563107624">You created the order.</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Invoice" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="invoice[items][${order_item_1}]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">invoice[items][${order_item_1}]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="invoice[items][${order_item_2}]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">invoice[items][${order_item_2}]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="invoice[items][${order_item_3}]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">invoice[items][${order_item_3}]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">invoice[comment_text]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Invoice Created" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-1878312078">The invoice has been created.</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Shipment" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="shipment[items][${order_item_1}]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">shipment[items][${order_item_1}]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="shipment[items][${order_item_2}]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">shipment[items][${order_item_2}]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="shipment[items][${order_item_3}]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">shipment[items][${order_item_3}]</stringProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+            <elementProp name="shipment[comment_text]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.name">shipment[comment_text]</stringProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/save/order_id/${order_id}/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Shipment Created" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-348539683">The shipment has been created.</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  </hashTree>
+
+    
+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="API" enabled="true">
+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+                <boolProp name="LoopController.continue_forever">false</boolProp>
+                <stringProp name="LoopController.loops">${loops}</stringProp>
+            </elementProp>
+            <stringProp name="ThreadGroup.num_threads">${apiPoolUsers}</stringProp>
+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
+            <stringProp name="ThreadGroup.duration"/>
+            <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
+        <hashTree>
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${apiBasePercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Create Customer" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Create Customer");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "customer": {&#xD;
+&#xD;
+        "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",&#xD;
+        "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "lastname": "Doe"&#xD;
+    },&#xD;
+    "password": "test@123"&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_customer.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer id" enabled="true">
+        <stringProp name="VAR">customer_id</stringProp>
+        <stringProp name="JSONPATH">$.id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">customer_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check customer" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/${customer_id}</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_customer.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$.id</stringProp>
+        <stringProp name="EXPECTED_VALUE">${customer_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Catalog Browsing" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Catalog Browsing");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get categories" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/get_categories.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert results are present" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1294635157">errors</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">6</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable"/>
+      </ResponseAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract search category id" enabled="true">
+        <stringProp name="VAR">search_category_id</stringProp>
+        <stringProp name="JSONPATH">$.id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert search category id is not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">search_category_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get category" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/${search_category_id}</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/get_category.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert results are present" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1294635157">errors</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">6</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable"/>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get products" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">20</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/get_products.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert results are present" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1294635157">errors</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">6</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable"/>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Search" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Search");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search for simple product on frontend" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="searchCriteria[request_name]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">quick_search_container</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[request_name]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filter_groups][0][filters][0][field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">search_term</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][field]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filter_groups][0][filters][0][value]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">Simple</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][value]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">20</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/search</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/search_for_product_frontend.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert results are present" enabled="true">
+        <stringProp name="JSON_PATH">$.total_count</stringProp>
+        <stringProp name="EXPECTED_VALUE">0</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract search product id" enabled="true">
+        <stringProp name="VAR">search_product_id</stringProp>
+        <stringProp name="JSONPATH">$.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert search product id is not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">search_product_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Checkout" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Checkout");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Get region data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">
+      vars.put("alabama_region_id", props.get("alabama_region_id"));
+      vars.put("california_region_id", props.get("california_region_id"));
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/get_region_data.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create quote" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_quote.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">quote_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add product to quote" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+	"cartItem": {&#xD;
+		"sku": "${product_sku}",&#xD;
+		"qty":"1",&#xD;
+		"quote_id":"${quote_id}"&#xD;
+	}&#xD;
+}&#xD;
+</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/${quote_id}/items</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_product_to_quote_hardwired_sku.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$.sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check products in quote" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/carts/${quote_id}/items</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_product_in_quote_hardwired_sku.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$[0].sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Guest Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "storeId": 1&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_guest_cart.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">cart_id</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Guest Cart Id extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">cart_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add product to Guest Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+	"cartItem": {&#xD;
+		"sku": "${product_sku}",&#xD;
+		"qty":"1",&#xD;
+		"quote_id":"${cart_id}"&#xD;
+	}&#xD;
+}&#xD;
+</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/items</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_product_to_guest_cart_hardwired_sku.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$.quote_id</stringProp>
+        <stringProp name="EXPECTED_VALUE">^[a-z0-9-]+$</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Gift Message to Guest Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+	"sender": "John Doe",&#xD;
+	"recipient": "Jane Roe",&#xD;
+	"giftMessage": "Gift Message Text"&#xD;
+}&#xD;
+</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/gift-message</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_gift_message_to_guest_cart.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$</stringProp>
+        <stringProp name="EXPECTED_VALUE">true</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Estimate Shipping Methods" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"address":{"country_id":"US","postcode":"95630"}}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/estimate-shipping-methods</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_estimate_shipping_methods_with_postal_code.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+        <collectionProp name="HeaderManager.headers">
+          <elementProp name="" elementType="Header">
+            <stringProp name="Header.name">Referer</stringProp>
+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
+          </elementProp>
+          <elementProp name="Content-Type" elementType="Header">
+            <stringProp name="Header.name">Content-Type</stringProp>
+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
+          </elementProp>
+          <elementProp name="X-Requested-With" elementType="Header">
+            <stringProp name="Header.name">X-Requested-With</stringProp>
+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
+          </elementProp>
+          <elementProp name="Accept" elementType="Header">
+            <stringProp name="Header.name">Accept</stringProp>
+            <stringProp name="Header.value">application/json</stringProp>
+          </elementProp>
+        </collectionProp>
+      </HeaderManager>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1224567411">"available":true</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Billing/Shipping Information" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"addressInformation":{"shipping_address":{"countryId":"US","regionId":"${california_region_id}","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname"},"shipping_method_code":"flatrate","shipping_carrier_code":"flatrate"}}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/shipping-information</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/guest_checkout/checkout_billing_shipping_information.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+        <collectionProp name="HeaderManager.headers">
+          <elementProp name="" elementType="Header">
+            <stringProp name="Header.name">Referer</stringProp>
+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
+          </elementProp>
+          <elementProp name="Content-Type" elementType="Header">
+            <stringProp name="Header.name">Content-Type</stringProp>
+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
+          </elementProp>
+          <elementProp name="X-Requested-With" elementType="Header">
+            <stringProp name="Header.name">X-Requested-With</stringProp>
+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
+          </elementProp>
+          <elementProp name="Accept" elementType="Header">
+            <stringProp name="Header.name">Accept</stringProp>
+            <stringProp name="Header.value">application/json</stringProp>
+          </elementProp>
+        </collectionProp>
+      </HeaderManager>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1494218646">{"payment_methods":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Checkout Payment Info/Place Order" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"cartId":"${cart_id}","email":"test@example.com","paymentMethod":{"method":"checkmo","po_number":null,"additional_data":null},"billingAddress":{"countryId":"US","regionId":"${california_region_id}","regionCode":"CA","region":"California","street":["10441 Jefferson Blvd ste 200"],"company":"","telephone":"3109450345","fax":"","postcode":"90232","city":"Culver City","firstname":"Name","lastname":"Lastname","save_in_address_book":0}}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/guest-carts/${cart_id}/payment-information</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/checkout_payment_info_place_order.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+        <collectionProp name="HeaderManager.headers">
+          <elementProp name="" elementType="Header">
+            <stringProp name="Header.name">Referer</stringProp>
+            <stringProp name="Header.value">${base_path}checkout/onepage/</stringProp>
+          </elementProp>
+          <elementProp name="Content-Type" elementType="Header">
+            <stringProp name="Header.name">Content-Type</stringProp>
+            <stringProp name="Header.value">application/json; charset=UTF-8</stringProp>
+          </elementProp>
+          <elementProp name="X-Requested-With" elementType="Header">
+            <stringProp name="Header.name">X-Requested-With</stringProp>
+            <stringProp name="Header.value">XMLHttpRequest</stringProp>
+          </elementProp>
+          <elementProp name="Accept" elementType="Header">
+            <stringProp name="Header.name">Accept</stringProp>
+            <stringProp name="Header.value">application/json</stringProp>
+          </elementProp>
+        </collectionProp>
+      </HeaderManager>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-297987887">"[0-9]+"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">order_id</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">order_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Product Management" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Product Management");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "product": {&#xD;
+        "sku": "psku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "name": "Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "attributeSetId": 4&#xD;
+    }&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_product_no_custom_attributes.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
+        <stringProp name="VAR">simple_product_id</stringProp>
+        <stringProp name="JSONPATH">$.id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
+        <stringProp name="VAR">simple_product_sku</stringProp>
+        <stringProp name="JSONPATH">$.sku</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
+        <stringProp name="VAR">simple_stock_item_id</stringProp>
+        <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">simple_product_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">simple_product_sku</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">simple_stock_item_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update product stock info" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+        "stock_item": {   &#xD;
+        	"manage_stock": 1,    &#xD;
+        	"is_in_stock": 1,&#xD;
+          "qty": ${simple_product_id}&#xD;
+        }&#xD;
+    }</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${simple_product_sku}/stockItems/${simple_stock_item_id}</stringProp>
+      <stringProp name="HTTPSampler.method">PUT</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/update_product_stock_info.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_stock_item_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${simple_product_sku}</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_product.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product id" enabled="true">
+        <stringProp name="JSON_PATH">$.id</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert stock item id" enabled="true">
+        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.item_id</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_stock_item_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert updated quantity" enabled="true">
+        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.qty</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create product with extensible data objects" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "product": {&#xD;
+        "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "visibility": "4",&#xD;
+        "type_id": "simple",&#xD;
+        "price": "3.62",&#xD;
+        "status": "1",&#xD;
+        "attribute_set_id": "4",&#xD;
+        "custom_attributes": [&#xD;
+            {&#xD;
+                "attribute_code": "cost",&#xD;
+                "value": ""&#xD;
+            },&#xD;
+            {&#xD;
+                "attribute_code": "description",&#xD;
+                "value": "Description"&#xD;
+            }&#xD;
+        ],&#xD;
+        "extension_attributes":{&#xD;
+		"stock_item":{&#xD;
+		"manage_stock": 1,    &#xD;
+		"is_in_stock": 1,&#xD;
+		"qty":"100"&#xD;
+		}&#xD;
+    	   }        ,&#xD;
+    	   "media_gallery_entries":&#xD;
+    	   	[{&#xD;
+    	   		"id": null,&#xD;
+    	   		"label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+    	   		"position":1,&#xD;
+    	   		"disabled":0,&#xD;
+    	   		"media_type":"image",&#xD;
+    	   		"types":["image"],&#xD;
+    	   		"content":{&#xD;
+    	   			"base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+        "type": "image/jpeg",&#xD;
+        "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+    	   			}&#xD;
+    	   	}&#xD;
+    	   	]&#xD;
+    }&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_product_with_extensible_data_objects.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
+        <stringProp name="VAR">simple_product_id</stringProp>
+        <stringProp name="JSONPATH">$.id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
+        <stringProp name="VAR">simple_product_sku</stringProp>
+        <stringProp name="JSONPATH">$.sku</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
+        <stringProp name="VAR">simple_stock_item_id</stringProp>
+        <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">simple_product_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">simple_product_sku</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">simple_stock_item_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check product with extensible data objects" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${simple_product_sku}</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_product_with_extensible_data_objects.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product id" enabled="true">
+        <stringProp name="JSON_PATH">$.id</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert stock item id" enabled="true">
+        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.item_id</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_stock_item_id}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert updated quantity" enabled="true">
+        <stringProp name="JSON_PATH">$.extension_attributes.stock_item.qty</stringProp>
+        <stringProp name="EXPECTED_VALUE">100</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  </hashTree>
+
+  </hashTree>
+
+    
+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="One Thread Scenarios (Vulnerable to deadlocks)" enabled="true">
+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+                <boolProp name="LoopController.continue_forever">false</boolProp>
+                <stringProp name="LoopController.loops">${loops}</stringProp>
+            </elementProp>
+            <stringProp name="ThreadGroup.num_threads">${deadLocksPoolUsers}</stringProp>
+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
+            <stringProp name="ThreadGroup.duration"/>
+            <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
+        <hashTree>
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Product Grid Mass Actions" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${productGridMassActionPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Product Grid Mass Actions");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Pages Count" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="namespace" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">product_listing</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">namespace</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="search" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">search</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">20</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[current]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[current]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">entity_id</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[field]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">asc</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[direction]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="isAjax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">isAjax</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/get_product_pages_count.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
+        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
+        <stringProp name="EXPECTED_VALUE">0</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
+        <stringProp name="VAR">products_number</stringProp>
+        <stringProp name="JSONPATH">$.totalRecords</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Calculate pages count" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
+var productsTotal = Integer.parseInt(vars.get("products_number"));
+var pageCountProducts = Math.round(productsTotal/productsPageSize);
+
+vars.put("pages_count_product", String.valueOf(pageCountProducts));</stringProp>
+      </BeanShellPostProcessor>
+      <hashTree/>
+    </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+random.setSeed(${seedForRandom});
+}
+var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
+var totalNumberOfPages = Integer.parseInt(vars.get("pages_count_product"));
+
+// Randomly select a page.
+var randomProductsPage = random.nextInt(totalNumberOfPages) + 1;
+
+// Get the first and last product id on that page.
+var lastProductIdOnPage = randomProductsPage * productsPageSize;
+var firstProductIdOnPage = lastProductIdOnPage - productsPageSize + 1;
+
+var randomProductId1 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
+var randomProductId2 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
+var randomProductId3 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
+
+vars.put("page_number", String.valueOf(randomProductsPage));
+vars.put("productId1", String.valueOf(randomProductId1));
+vars.put("productId2", String.valueOf(randomProductId2));
+vars.put("productId3", String.valueOf(randomProductId3));
+
+var randomQuantity = random.nextInt(1000) + 1;
+var randomPrice = random.nextInt(500) + 10;
+var randomVisibility = random.nextInt(4) + 1;
+
+vars.put("quantity", String.valueOf(randomQuantity));
+vars.put("price", String.valueOf(randomPrice));
+vars.put("visibility", String.valueOf(randomVisibility));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select Products and Update Attributes mass action" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="namespace" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">product_listing</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">namespace</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="search" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">search</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${products_page_size}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[pageSize]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="paging[current]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${page_number}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">paging[current]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">entity_id</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[field]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="sorting[direction]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">asc</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">sorting[direction]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="isAjax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">isAjax</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_grid.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1637639774">totalRecords</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Display Update Attributes" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="selected[0]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${productId1}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">selected[0]</stringProp>
+          </elementProp>
+          <elementProp name="selected[1]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${productId2}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">selected[1]</stringProp>
+          </elementProp>
+          <elementProp name="selected[2]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${productId3}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">selected[2]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="namespace" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">product_listing</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">namespace</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/edit</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_update_attributes.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1862384910">Update Attributes</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Validate Attributes" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="isAjax" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">isAjax</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="inventory[qty]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${quantity}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">inventory[qty]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="attributes[price]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${price}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">attributes[price]</stringProp>
+        </elementProp>
+        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${visibility}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">attributes[visibility]</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/validate</stringProp>
+    <stringProp name="HTTPSampler.method">POST</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/change_attributes.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1853918323">{"error":false}</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Attributes" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="isAjax" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">isAjax</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
+        </elementProp>
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
+        </elementProp>
+        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
+        </elementProp>
+        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="inventory[qty]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${quantity}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">inventory[qty]</stringProp>
+        </elementProp>
+        <elementProp name="toggle_qty" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">on</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">toggle_price</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="attributes[price]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${price}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">attributes[price]</stringProp>
+        </elementProp>
+        <elementProp name="toggle_price" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">on</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">toggle_price</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${visibility}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">attributes[visibility]</stringProp>
+        </elementProp>
+        <elementProp name="toggle_visibility" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">on</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">toggle_visibility</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/save/store/0/active_tab/attributes</stringProp>
+    <stringProp name="HTTPSampler.method">POST</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  </HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1848809106">were updated.</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+</hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Products" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${importProductsPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Import Products");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="BeanShellSampler.query">vars.put("entity", "catalog_product");
+String behavior = "${adminImportProductBehavior}";
+vars.put("adminImportBehavior", behavior);
+String filepath = "${files_folder}${adminImportProductFilePath}";
+vars.put("adminImportFilePath", filepath);  </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_products/setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1723813687">Import Settings</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Validate" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="entity" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${entity}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">entity</stringProp>
+          </elementProp>
+          <elementProp name="behavior" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">behavior</stringProp>
+          </elementProp>
+          <elementProp name="validation_strategy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">validation_strategy</stringProp>
+          </elementProp>
+          <elementProp name="allowed_error_count" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">10</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">allowed_error_count</stringProp>
+          </elementProp>
+          <elementProp name="_import_field_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_field_separator</stringProp>
+          </elementProp>
+          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/validate</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+        <collectionProp name="HTTPFileArgs.files">
+          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
+            <stringProp name="File.path">${adminImportFilePath}</stringProp>
+            <stringProp name="File.paramname">import_file</stringProp>
+            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_validate.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="37280142">File is valid! To start import process</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">16</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Start" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="entity" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${entity}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">entity</stringProp>
+          </elementProp>
+          <elementProp name="behavior" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">behavior</stringProp>
+          </elementProp>
+          <elementProp name="validation_strategy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">validation_strategy</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="allowed_error_count" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">10</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">allowed_error_count</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="_import_field_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_field_separator</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/start</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+        <collectionProp name="HTTPFileArgs.files">
+          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
+            <stringProp name="File.path">${adminImportFilePath}</stringProp>
+            <stringProp name="File.paramname">import_file</stringProp>
+            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_save.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1731221824">Import successfully done</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">16</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Customers" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${importCustomersPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Import Customers");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="BeanShellSampler.query">vars.put("entity", "customer");
+String behavior = "${adminImportCustomerBehavior}";
+vars.put("adminImportBehavior", behavior);
+String filepath = "${files_folder}${adminImportCustomerFilePath}";
+vars.put("adminImportFilePath", filepath);  </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/import_customers/setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Page" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1723813687">Import Settings</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Validate" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="entity" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${entity}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">entity</stringProp>
+          </elementProp>
+          <elementProp name="behavior" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">behavior</stringProp>
+          </elementProp>
+          <elementProp name="validation_strategy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">validation_strategy</stringProp>
+          </elementProp>
+          <elementProp name="allowed_error_count" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">10</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">allowed_error_count</stringProp>
+          </elementProp>
+          <elementProp name="_import_field_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_field_separator</stringProp>
+          </elementProp>
+          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/validate</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+        <collectionProp name="HTTPFileArgs.files">
+          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
+            <stringProp name="File.path">${adminImportFilePath}</stringProp>
+            <stringProp name="File.paramname">import_file</stringProp>
+            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_validate.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="37280142">File is valid! To start import process</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">16</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Import Start" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="entity" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${entity}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">entity</stringProp>
+          </elementProp>
+          <elementProp name="behavior" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${adminImportBehavior}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">behavior</stringProp>
+          </elementProp>
+          <elementProp name="validation_strategy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">validation-stop-on-errors</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">validation_strategy</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="allowed_error_count" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">10</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">allowed_error_count</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="_import_field_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_field_separator</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="_import_multiple_value_separator" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">_import_multiple_value_separator</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/import/start</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
+      <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">
+        <collectionProp name="HTTPFileArgs.files">
+          <elementProp name="${adminImportFilePath}" elementType="HTTPFileArg">
+            <stringProp name="File.path">${adminImportFilePath}</stringProp>
+            <stringProp name="File.paramname">import_file</stringProp>
+            <stringProp name="File.mimetype">application/vnd.ms-excel</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/import_save.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1731221824">Import successfully done</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">16</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Export Products" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${exportProductsPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Export Products");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Page" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/export.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1723813687">Export Settings</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Products" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="attribute_code" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">attribute_code</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[allow_message][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[allow_message][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[allow_open_amount]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[allow_open_amount]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[category_ids]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[category_ids]</stringProp>
+            <stringProp name="Argument.value">24,25,26,27,28,29,30</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[configurable_variations]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[configurable_variations]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[cost][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[cost][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[country_of_manufacture]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[country_of_manufacture]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[created_at]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[created_at]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[custom_design]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[custom_design]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[custom_design_from][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[custom_design_from][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[custom_design_to][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[custom_design_to][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[custom_layout_update]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[custom_layout_update]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[description]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[description]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[email_template]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[email_template]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[gallery]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[gallery]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[gift_message_available]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[gift_message_available]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[gift_wrapping_available]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[gift_wrapping_available]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[gift_wrapping_price][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[gift_wrapping_price][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[group_price][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[group_price][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[has_options]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[has_options]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[image]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[image]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[image_label]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[image_label]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[is_redeemable][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[is_redeemable][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[is_returnable]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[is_returnable]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[lifetime][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[lifetime][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[links_exist][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[links_exist][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[links_purchased_separately][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[links_purchased_separately][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[links_title]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[links_title]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[media_gallery]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[media_gallery]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[meta_description]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[meta_description]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[meta_keyword]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[meta_keyword]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[meta_title]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[meta_title]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[minimal_price][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[minimal_price][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[msrp][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[msrp][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[msrp_display_actual_price_type]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[msrp_display_actual_price_type]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[name]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[name]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[news_from_date][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[news_from_date][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[news_to_date][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[news_to_date][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[old_id][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[old_id][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[open_amount_max][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[open_amount_max][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[open_amount_min][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[open_amount_min][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[options_container]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[options_container]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[page_layout]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[page_layout]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[price][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[price][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[price_type][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[price_type][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[price_view]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[price_view]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[quantity_and_stock_status]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[quantity_and_stock_status]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[related_tgtr_position_behavior][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[related_tgtr_position_behavior][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[related_tgtr_position_limit][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[related_tgtr_position_limit][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[required_options]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[required_options]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[samples_title]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[samples_title]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[shipment_type][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[shipment_type][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[short_description]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[short_description]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[sku]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[sku]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[sku_type][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[sku_type][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[small_image]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[small_image]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[small_image_label]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[small_image_label]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[special_from_date][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[special_from_date][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[special_price][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[special_price][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[special_to_date][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[special_to_date][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[status]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[status]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[tax_class_id]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[tax_class_id]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[thumbnail]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[thumbnail]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[thumbnail_label]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[thumbnail_label]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[tier_price][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[tier_price][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[updated_at]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[updated_at]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[upsell_tgtr_position_behavior][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[upsell_tgtr_position_behavior][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[upsell_tgtr_position_limit][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[upsell_tgtr_position_limit][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[url_key]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[url_key]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[url_path]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[url_path]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[use_config_allow_message][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[use_config_allow_message][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[use_config_email_template][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[use_config_email_template][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[use_config_is_redeemable][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[use_config_is_redeemable][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[use_config_lifetime][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[use_config_lifetime][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[visibility]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[visibility]</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[weight][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[weight][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="export_filter[weight_type][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">export_filter[weight_type][]</stringProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+          <elementProp name="frontend_label" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.name">frontend_label</stringProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/export/entity/catalog_product/file_format/csv</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/export_products/export_products.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-261088822">Simple Product 1</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">16</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Export Customers" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${exportCustomersPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Export Customers");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
 
-    		int valuesCount = Integer.parseInt(vars.get("attribute_" + attributeId + "_values_matchNr"));
-    		for (int j = 1; j &lt;= valuesCount; j++) {
-    			attributeValue = vars.get("attribute_" + attributeId + "_values_" + j.toString());
-    			ctx.getCurrentSampler().addArgument(
-    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][include]",
-    				"1"
-    			);
-    			ctx.getCurrentSampler().addArgument(
-    				"product[configurable_attributes_data][" + attributeId + "][values][" + attributeValue + "][value_index]",
-    				attributeValue
-    			);
-    		}
-    	}
-    	ctx.getCurrentSampler().addArgument("associated_product_ids_serialized", vars.get("associated_products_ids").toString());
-    } catch (Exception e) {
-        log.error("error???", e);
-    }</stringProp>
-                  </BeanShellPreProcessor>
-                  <hashTree/>
-                  <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-                    <collectionProp name="Asserion.test_strings">
-                      <stringProp name="-583471546">You saved the product</stringProp>
-                    </collectionProp>
-                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-                    <boolProp name="Assertion.assume_success">false</boolProp>
-                    <intProp name="Assertion.test_type">2</intProp>
-                    <stringProp name="TestPlan.comments"> if have trouble see messages-message-error </stringProp>
-                  </ResponseAssertion>
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Page" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/export.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1723813687">Export Settings</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Export Customers" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="attribute_code" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">attribute_code</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[confirmation]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[confirmation]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[created_at]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[created_at]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[created_in]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[created_in]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[default_billing][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[default_billing][]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[default_shipping][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[default_shipping][]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[disable_auto_group_change]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[disable_auto_group_change]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[dob][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[dob][]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[email]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[email]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[firstname]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[firstname]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[gender]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[gender]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[group_id]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[group_id]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[lastname]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[lastname]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[middlename]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[middlename]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[password_hash]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[password_hash]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[prefix]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[prefix]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[reward_update_notification][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[reward_update_notification][]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[reward_warning_notification][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[reward_warning_notification][]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[rp_token]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[rp_token]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[rp_token_created_at][]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">,</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[rp_token_created_at][]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[store_id]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[store_id]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[suffix]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[suffix]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[taxvat]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[taxvat]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="export_filter[website_id]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">export_filter[website_id]</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+          <elementProp name="frontend_label" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">frontend_label</stringProp>
+            <stringProp name="Argument.desc">true</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/export/export/entity/customer/file_format/csv</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/export_customers/export_customers.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-2040454917">user_1@example.com</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">16</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${apiBasePercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
         <hashTree/>
-      </hashTree>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
     </hashTree>
-  </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Process Orders" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Process Orders");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="BeanShellSampler.query">// Each thread gets an equal number of orders, based on how many orders are available.
+
+      int apiProcessOrders = Integer.parseInt("${apiProcessOrders}");
+      if (apiProcessOrders &gt; 0) {
+      ordersPerThread = apiProcessOrders;
+      } else {
+      ordersPerThread = 1;
+      }
+
+
+      threadNum = ${__threadNum};
+      vars.put("ordersPerThread", String.valueOf(ordersPerThread));
+      vars.put("threadNum", String.valueOf(threadNum));
+
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Orders" enabled="true">
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">status</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">Pending</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${ordersPerThread}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${threadNum}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
+          </elementProp>
+        </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/orders</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -29972,20 +30796,350 @@ vars.put("admin_user", adminUser);
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/get_orders.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract entity ids" enabled="true">
+        <stringProp name="VAR">entity_ids</stringProp>
+        <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Order" enabled="true">
+      <stringProp name="ForeachController.inputVal">entity_ids</stringProp>
+      <stringProp name="ForeachController.returnVal">order_id</stringProp>
+      <boolProp name="ForeachController.useSeparator">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/for_each_order.jmx</stringProp></ForeachController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Invoice" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/invoice</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_invoice.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="34237953">"\d+"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Shipment" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/order/${order_id}/ship</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/process_orders/create_shipment.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="34237953">"\d+"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="API Product Attribute Management" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">100</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "API Product Attribute Management");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
     
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute set" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "attributeSet": {&#xD;
+        "attribute_set_name": "new_attribute_set_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "sort_order": 500&#xD;
+    },&#xD;
+    "skeletonId": "4"&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_set.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_set_id" enabled="true">
+        <stringProp name="VAR">attribute_set_id</stringProp>
+        <stringProp name="JSONPATH">$.attribute_set_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_set_id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">attribute_set_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute group" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "group": {&#xD;
+        "attribute_group_name": "empty_attribute_group_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+        "attribute_set_id": ${attribute_set_id}&#xD;
+    }&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/groups</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute_group.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_group_id" enabled="true">
+        <stringProp name="VAR">attribute_group_id</stringProp>
+        <stringProp name="JSONPATH">$.attribute_group_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_group_id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">attribute_set_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create attribute" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "attribute": {&#xD;
+        "attribute_code": "attr_code_${__time()}",&#xD;
+        "frontend_labels": [&#xD;
+            {&#xD;
+                "store_id": 0,&#xD;
+                "label": "front_lbl_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}"&#xD;
+            }&#xD;
+        ],&#xD;
+        "default_value": "default value",&#xD;
+        "frontend_input": "textarea",&#xD;
+        "is_required": 1&#xD;
+    }&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_attribute.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_id" enabled="true">
+        <stringProp name="VAR">attribute_id</stringProp>
+        <stringProp name="JSONPATH">$.attribute_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract attribute_code" enabled="true">
+        <stringProp name="VAR">attribute_code</stringProp>
+        <stringProp name="JSONPATH">$.attribute_code</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_id not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="89649215">^\d+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">attribute_id</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert attribute_code not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2131456825">^[a-z0-9-_]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">attribute_code</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add attribute to attribute set" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{&#xD;
+    "attributeSetId": "${attribute_set_id}",&#xD;
+    "attributeGroupId": "${attribute_group_id}",&#xD;
+    "attributeCode": "${attribute_code}",&#xD;
+    "sortOrder": 3&#xD;
+}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attribute-sets/attributes</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/add_attribute_to_attribute_set.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert response is not null" enabled="true">
+        <stringProp name="JSON_PATH">$</stringProp>
+        <stringProp name="EXPECTED_VALUE">(\d+)</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
   </hashTree>
+
   </hashTree>
 
   
@@ -30087,7 +31241,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -30110,11 +31276,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -30191,8 +31357,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -30219,191 +31385,6 @@ vars.put("admin_user", adminUser);
     </hashTree>
   </hashTree>
   
-    <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/once_only_controller.jmx</stringProp>
-</OnceOnlyController>
-    <hashTree>
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Admin Category Management" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/setup_admin_category_management.jmx</stringProp>
-</GenericController>
-    <hashTree>
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Clear Admin Category Management properties" enabled="true">
-        <stringProp name="BeanShellSampler.query">props.remove("admin_category_ids_list");</stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Get categories of last level" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get categories" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">children_count</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">0</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">level</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">2</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][conditionType]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">gt</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][conditionType]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">${adminCategoryCount}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/list</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">category_list_id</stringProp>
-            <stringProp name="RegexExtractor.regex">\{\"id\":(\d+),</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-        </hashTree>
-        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Category Id" enabled="true">
-          <stringProp name="ForeachController.inputVal">category_list_id</stringProp>
-          <stringProp name="ForeachController.returnVal">category_id</stringProp>
-          <boolProp name="ForeachController.useSeparator">true</boolProp>
-        </ForeachController>
-        <hashTree>
-          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process categories ids" enabled="true">
-            <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-
-adminCategoryIdsList = props.get("admin_category_ids_list");
-// If it is first iteration of cycle then recreate categories ids list
-if (adminCategoryIdsList == null) {
-    adminCategoryIdsList = new ArrayList();
-    props.put("admin_category_ids_list", adminCategoryIdsList);
-}
-adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
-            <stringProp name="BeanShellSampler.filename"/>
-            <stringProp name="BeanShellSampler.parameters"/>
-            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-          </BeanShellSampler>
-          <hashTree/>
-        </hashTree>
-      </hashTree>
-    </hashTree>
-  </hashTree>
-  
     <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
 </GenericController>
@@ -30435,13 +31416,13 @@ function getNextProductNumber(i) {
 }
 
 var productsVariationsSize = 5,
-    productsSize = props.get("simple_products_list").size();
+    productsSize = props.get("simple_products_list_for_edit").size();
 
 
 for (i = 1; i&lt;= productsVariationsSize; i++) {
     var productVariablePrefix = "simple_product_" + i + "_";
     number = getNextProductNumber(i);
-    simpleList = props.get("simple_products_list").get(number);
+    simpleList = props.get("simple_products_list_for_edit").get(number);
 
     vars.put(productVariablePrefix + "url_key", simpleList.get("url_key"));
     vars.put(productVariablePrefix + "id", simpleList.get("id"));
@@ -30462,8 +31443,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/</stringProp>
@@ -30513,8 +31494,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${parent_category_id}/</stringProp>
@@ -30555,8 +31536,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/add/store/0/parent/${parent_category_id}</stringProp>
@@ -30761,8 +31742,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/save/</stringProp>
@@ -30802,8 +31783,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/edit/id/${admin_category_id}/</stringProp>
@@ -31107,8 +32088,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/move/</stringProp>
@@ -31123,16 +32104,24 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
       <hashTree/>
       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete category" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+            </elementProp>
+          </collectionProp>
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/delete/id/${admin_category_id}/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
         <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
@@ -31166,8 +32155,8 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -31186,8 +32175,11 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
@@ -31293,7 +32285,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -31316,11 +32320,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -31397,8 +32401,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -31439,8 +32443,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/</stringProp>
@@ -31459,8 +32463,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/new</stringProp>
@@ -31509,8 +32513,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/newConditionHtml/form/sales_rule_formrule_conditions_fieldset_/form_namespace/sales_rule_form</stringProp>
@@ -31796,8 +32800,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales_rule/promo_quote/save/</stringProp>
@@ -31835,8 +32839,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -31855,8 +32859,11 @@ vars.put("admin_user", adminUser);
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
@@ -31962,7 +32969,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -31985,11 +33004,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -32066,8 +33085,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -32108,8 +33127,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index</stringProp>
@@ -32207,8 +33226,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -32294,8 +33313,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
@@ -32323,7 +33342,7 @@ vars.put("admin_user", adminUser);
           <stringProp name="RegexExtractor.regex">actions":\{"edit":\{"href":"(?:http|https):\\/\\/(.*?)\\/customer\\/index\\/edit\\/id\\/(\d+)\\/",</stringProp>
           <stringProp name="RegexExtractor.template">/customer/index/edit/id/$2$/</stringProp>
           <stringProp name="RegexExtractor.default"/>
-          <stringProp name="RegexExtractor.match_number">0</stringProp>
+          <stringProp name="RegexExtractor.match_number">1</stringProp>
         </RegexExtractor>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer edit url" enabled="true">
@@ -32344,8 +33363,8 @@ vars.put("admin_user", adminUser);
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}${customer_edit_url_path}</stringProp>
@@ -32523,7 +33542,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_entity_id" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_entity_id</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{"entity_id":"(\d+)".+?"parent_id":"${admin_customer_entity_id}"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32532,7 +33551,7 @@ vars.put("admin_user", adminUser);
        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_created_at" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_created_at</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"created_at":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32541,7 +33560,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_updated_at" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_updated_at</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"updated_at":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32550,7 +33569,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_is_active" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_is_active</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"is_active":"(\d+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32559,7 +33578,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_city" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_city</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"city":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32568,7 +33587,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_country_id" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_country_id</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"country_id":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32577,7 +33596,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_firstname" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_firstname</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"firstname":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32586,7 +33605,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_lastname" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_lastname</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"lastname":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32595,7 +33614,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_postcode" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_postcode</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"postcode":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32604,7 +33623,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_region" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_region</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32613,7 +33632,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_region_id" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_region_id</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"region_id":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32622,7 +33641,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address street" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_street</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"street":\["([^"]+)"\]</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32631,7 +33650,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_telephone" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_telephone</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"telephone":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32640,7 +33659,7 @@ vars.put("admin_user", adminUser);
         <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract address_customer_id" enabled="true">
           <stringProp name="RegexExtractor.useHeaders">false</stringProp>
           <stringProp name="RegexExtractor.refname">admin_customer_address_customer_id</stringProp>
-          <stringProp name="RegexExtractor.regex">"address":\{"\d+":{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"</stringProp>
+          <stringProp name="RegexExtractor.regex">_address":\{.+?"parent_id":"${admin_customer_entity_id}".+?"customer_id":"([^"]+)"</stringProp>
           <stringProp name="RegexExtractor.template">$1$</stringProp>
           <stringProp name="RegexExtractor.default"/>
           <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -32993,23 +34012,495 @@ vars.put("admin_user", adminUser);
               <stringProp name="Header.name">Accept-Language</stringProp>
               <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
             </elementProp>
-            <elementProp name="Accept" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+            <elementProp name="Accept" elementType="Header">
+              <stringProp name="Header.name">Accept</stringProp>
+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+            </elementProp>
+            <elementProp name="User-Agent" elementType="Header">
+              <stringProp name="Header.name">User-Agent</stringProp>
+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
+            </elementProp>
+            <elementProp name="Accept-Encoding" elementType="Header">
+              <stringProp name="Header.name">Accept-Encoding</stringProp>
+              <stringProp name="Header.value">gzip, deflate</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Customer Validate" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="isAjax   " elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">isAjax   </stringProp>
+            </elementProp>
+            <elementProp name="customer[entity_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_entity_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[entity_id]</stringProp>
+            </elementProp>
+            <elementProp name="customer[website_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_website_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[website_id]</stringProp>
+            </elementProp>
+            <elementProp name="customer[email]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_email}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[email]</stringProp>
+            </elementProp>
+            <elementProp name="customer[group_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_group_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[group_id]</stringProp>
+            </elementProp>
+            <elementProp name="customer[store_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[store_id]</stringProp>
+            </elementProp>
+            <elementProp name="customer[created_at]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_created_at}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[created_at]</stringProp>
+            </elementProp>
+            <elementProp name="customer[updated_at]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_updated_at}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[updated_at]</stringProp>
+            </elementProp>
+            <elementProp name="customer[is_active]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_is_active}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[is_active]</stringProp>
+            </elementProp>
+            <elementProp name="customer[disable_auto_group_change]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_disable_auto_group_change}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[disable_auto_group_change]</stringProp>
+            </elementProp>
+            <elementProp name="customer[created_in]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_created_in}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[created_in]</stringProp>
+            </elementProp>
+            <elementProp name="customer[prefix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[prefix]</stringProp>
+            </elementProp>
+            <elementProp name="customer[firstname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_firstname} 1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[firstname]</stringProp>
+            </elementProp>
+            <elementProp name="customer[middlename]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[middlename]</stringProp>
+            </elementProp>
+            <elementProp name="customer[lastname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_lastname} 1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[lastname]</stringProp>
+            </elementProp>
+            <elementProp name="customer[suffix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[suffix]</stringProp>
+            </elementProp>
+            <elementProp name="customer[dob]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_dob}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[dob]</stringProp>
+            </elementProp>
+            <elementProp name="customer[default_billing]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_default_billing}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[default_billing]</stringProp>
+            </elementProp>
+            <elementProp name="customer[default_shipping]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_default_shipping}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[default_shipping]</stringProp>
+            </elementProp>
+            <elementProp name="customer[taxvat]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[taxvat]</stringProp>
+            </elementProp>
+            <elementProp name="customer[gender]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_gender}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[gender]</stringProp>
+            </elementProp>
+            <elementProp name="customer[failures_num]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_failures_num}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[failures_num]</stringProp>
+            </elementProp>
+            <elementProp name="customer[sendemail_store_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">customer[sendemail_store_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][entity_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_entity_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][entity_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][created_at]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_created_at}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][created_at]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][updated_at]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_updated_at}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][updated_at]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][is_active]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_is_active}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][is_active]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][city]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_city}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][city]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][company]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][company]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][country_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_country_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][country_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][firstname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_firstname}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][firstname]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][lastname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_lastname}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][lastname]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][middlename]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][middlename]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][postcode]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_postcode}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][postcode]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][prefix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][prefix]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][region]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_region}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][region_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_region_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][street][0]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_street}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][0]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][street][1]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][1]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][suffix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][suffix]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][telephone]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_telephone}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][telephone]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][vat_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][vat_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][customer_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_customer_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][customer_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][default_billing]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_billing]</stringProp>
+            </elementProp>
+            <elementProp name="address[${admin_customer_address_entity_id}][default_shipping]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_shipping]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][prefix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][prefix]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][firstname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">John</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][firstname]</stringProp>
             </elementProp>
-            <elementProp name="User-Agent" elementType="Header">
-              <stringProp name="Header.name">User-Agent</stringProp>
-              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
+            <elementProp name="address[new_0][middlename]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][middlename]</stringProp>
             </elementProp>
-            <elementProp name="Accept-Encoding" elementType="Header">
-              <stringProp name="Header.name">Accept-Encoding</stringProp>
-              <stringProp name="Header.value">gzip, deflate</stringProp>
+            <elementProp name="address[new_0][lastname]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Doe</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][lastname]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][suffix]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][suffix]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][company]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Test Company</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][company]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][city]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Folsom</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][city]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][postcode]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">95630</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][postcode]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][telephone]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1234567890</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][telephone]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][vat_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][vat_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][default_billing]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">false</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][default_billing]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][default_shipping]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">false</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][default_shipping]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][street][0]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">123 Main</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][street][0]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][street][1]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][street][1]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][region]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][region]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][country_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">US</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][country_id]</stringProp>
+            </elementProp>
+            <elementProp name="address[new_0][region_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_customer_address_region_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">address[new_0][region_id]</stringProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
             </elementProp>
           </collectionProp>
-        </HeaderManager>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/validate/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="49586">200</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">16</intProp>
+        </ResponseAssertion>
         <hashTree/>
       </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Customer Validate" enabled="true">
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Customer Save" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
           <collectionProp name="Arguments.arguments">
             <elementProp name="isAjax   " elementType="HTTPArgument">
@@ -33180,6 +34671,7 @@ vars.put("admin_user", adminUser);
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
               <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][entity_id]</stringProp>
             </elementProp>
+
             <elementProp name="address[${admin_customer_address_entity_id}][created_at]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
               <stringProp name="Argument.value">${admin_customer_address_created_at}</stringProp>
@@ -33455,512 +34947,950 @@ vars.put("admin_user", adminUser);
             </elementProp>
           </collectionProp>
         </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/validate/</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="49586">200</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">16</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Customer Save" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="isAjax   " elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">isAjax   </stringProp>
-            </elementProp>
-            <elementProp name="customer[entity_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_entity_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[entity_id]</stringProp>
-            </elementProp>
-            <elementProp name="customer[website_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_website_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[website_id]</stringProp>
-            </elementProp>
-            <elementProp name="customer[email]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_email}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[email]</stringProp>
-            </elementProp>
-            <elementProp name="customer[group_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_group_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[group_id]</stringProp>
-            </elementProp>
-            <elementProp name="customer[store_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[store_id]</stringProp>
-            </elementProp>
-            <elementProp name="customer[created_at]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_created_at}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[created_at]</stringProp>
-            </elementProp>
-            <elementProp name="customer[updated_at]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_updated_at}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[updated_at]</stringProp>
-            </elementProp>
-            <elementProp name="customer[is_active]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_is_active}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[is_active]</stringProp>
-            </elementProp>
-            <elementProp name="customer[disable_auto_group_change]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_disable_auto_group_change}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[disable_auto_group_change]</stringProp>
-            </elementProp>
-            <elementProp name="customer[created_in]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_created_in}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[created_in]</stringProp>
-            </elementProp>
-            <elementProp name="customer[prefix]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[prefix]</stringProp>
-            </elementProp>
-            <elementProp name="customer[firstname]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_firstname} 1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[firstname]</stringProp>
-            </elementProp>
-            <elementProp name="customer[middlename]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[middlename]</stringProp>
-            </elementProp>
-            <elementProp name="customer[lastname]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_lastname} 1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[lastname]</stringProp>
-            </elementProp>
-            <elementProp name="customer[suffix]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[suffix]</stringProp>
-            </elementProp>
-            <elementProp name="customer[dob]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_dob}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[dob]</stringProp>
-            </elementProp>
-            <elementProp name="customer[default_billing]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_default_billing}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[default_billing]</stringProp>
-            </elementProp>
-            <elementProp name="customer[default_shipping]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_default_shipping}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[default_shipping]</stringProp>
-            </elementProp>
-            <elementProp name="customer[taxvat]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[taxvat]</stringProp>
-            </elementProp>
-            <elementProp name="customer[gender]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_gender}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[gender]</stringProp>
-            </elementProp>
-            <elementProp name="customer[failures_num]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_failures_num}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[failures_num]</stringProp>
-            </elementProp>
-            <elementProp name="customer[sendemail_store_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_store_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">customer[sendemail_store_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][entity_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_entity_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][entity_id]</stringProp>
-            </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/save/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer saved" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="292987815">You saved the customer.</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
+        <intProp name="ActionProcessor.action">1</intProp>
+        <intProp name="ActionProcessor.target">0</intProp>
+        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCustomerManagementDelay}*1000))}</stringProp>
+      </TestAction>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+    
+    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
+    <hashTree/>
+  </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Edit Order" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${adminEditOrderPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Admin Edit Order");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
+        <stringProp name="script">
+        function getFormKeyFromResponse()
+        {
+            var url = prev.getUrlAsString(),
+            responseCode =  prev.getResponseCode(),
+            formKey = null;
+            searchPattern = /var FORM_KEY = '(.+)'/;
+            if (responseCode == "200" &amp;&amp; url) {
+                response = prev.getResponseDataAsString();
+                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
+            }
+            return formKey;
+        }
+
+        formKey = vars.get("form_key_storage");
+
+	   currentFormKey = getFormKeyFromResponse();
+
+	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
+		  vars.put("form_key_storage", currentFormKey);
+	   }
+        </stringProp>
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
+        <hashTree/>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
+            <stringProp name="script">
+                formKey =  vars.get("form_key_storage");
+                if (formKey
+                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+                    &amp;&amp; sampler.getMethod() == "POST")
+                    {
+                        arguments = sampler.getArguments();
+                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
+                        {
+                            argument = arguments.getArgument(i);
+                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
+                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
+                            argument.setValue(formKey);
+                        }
+                    }
+                }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        </JSR223PreProcessor>
+        <hashTree/>
+    
+    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+      <collectionProp name="CookieManager.cookies"/>
+      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
+    <hashTree/>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
+        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
+    <hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">
+adminUserList = props.get("adminUserList");
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
+if (adminUser == null) {
+  SampleResult.setResponseMessage("adminUser list is empty");
+  SampleResult.setResponseData("adminUser list is empty","UTF-8");
+  IsSuccess=false;
+  SampleResult.setSuccessful(false);
+  SampleResult.setStopThread(true);
+}
+vars.put("admin_user", adminUser);
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1397214398">Welcome</stringProp>
+          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="2845929">^.+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_form_key</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="dummy" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">dummy</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+          <elementProp name="login[password]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_password}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[password]</stringProp>
+          </elementProp>
+          <elementProp name="login[username]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_user}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">login[username]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <stringProp name="HTTPSampler.implementation">Java</stringProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
+        <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Orders page" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/orders_page.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1204796042">Create New Order</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Orders" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="namespace" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">sales_order_grid</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">namespace</stringProp>
+        </elementProp>
+        <elementProp name="search" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value"/>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">search</stringProp>
+        </elementProp>
+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
+        </elementProp>
+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">200</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
+        </elementProp>
+        <elementProp name="paging[current]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[current]</stringProp>
+        </elementProp>
+        <elementProp name="sorting[field]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">increment_id</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[field]</stringProp>
+        </elementProp>
+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">desc</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[direction]</stringProp>
+        </elementProp>
+        <elementProp name="isAjax" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">isAjax</stringProp>
+        </elementProp>
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
+        </elementProp>
+        <elementProp name="filters[status]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">pending</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[status]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="_" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">_</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_orders.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1637639774">totalRecords</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Pending Orders" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+        </elementProp>
+        <elementProp name="namespace" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">sales_order_grid</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">namespace</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="search" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value"/>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">search</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[placeholder]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">200</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[pageSize]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="paging[current]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">paging[current]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="sorting[field]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">increment_id</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[field]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="sorting[direction]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">asc</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">sorting[direction]</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="isAjax" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">true</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">isAjax</stringProp>
+          <stringProp name="Argument.desc">true</stringProp>
+        </elementProp>
+        <elementProp name="filters[status]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">pending</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">filters[status]</stringProp>
+        </elementProp>
+        <elementProp name="_" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">_</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/search_orders.jmx</stringProp></HTTPSamplerProxy>
+<hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1637639774">totalRecords</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order numbers" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">order_numbers</stringProp>
+        <stringProp name="RegexExtractor.regex">\"increment_id\":\"(\d+)\"\,</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
+        <stringProp name="Scope.variable">simple_products</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order ids" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">order_ids</stringProp>
+        <stringProp name="RegexExtractor.regex">\"entity_id\":\"(\d+)\"\,</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">-1</stringProp>
+        <stringProp name="Scope.variable">simple_products</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+    </hashTree>
+
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+  import java.util.ArrayList;
+  import java.util.HashMap;
+  import org.apache.jmeter.protocol.http.util.Base64Encoder;
+  import java.util.Random;
+
+  // get count of "order_numbers" variable defined in "Search Pending Orders Limit"
+  int ordersCount = Integer.parseInt(vars.get("order_numbers_matchNr"));
+
+
+  int clusterLength;
+  int threadsNumber = ctx.getThreadGroup().getNumThreads();
+  if (threadsNumber == 0) {
+      //Number of orders for one thread
+      clusterLength = ordersCount;
+  } else {
+      clusterLength = Math.round(ordersCount / threadsNumber);
+      if (clusterLength == 0) {
+          clusterLength = 1;
+      }
+  }
+
+  //Current thread number starts from 0
+  int currentThreadNum = ctx.getThreadNum();
+
+  //Index of the current product from the cluster
+  Random random = new Random();
+  if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+  }
+  int iterator = random.nextInt(clusterLength);
+  if (iterator == 0) {
+  	iterator = 1;
+  }
+
+  int i = clusterLength * currentThreadNum + iterator;
+
+  orderNumber = vars.get("order_numbers_" + i.toString());
+  orderId = vars.get("order_ids_" + i.toString());
+  vars.put("order_number", orderNumber);
+  vars.put("order_id", orderId);
+
+  </stringProp>
+    <stringProp name="BeanShellSampler.filename"/>
+    <stringProp name="BeanShellSampler.parameters"/>
+    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+  </BeanShellSampler>
+  <hashTree/>
+
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Order" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/view/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_order.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="2103620713">#${order_number}</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order status" enabled="true">
+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+      <stringProp name="RegexExtractor.refname">order_status</stringProp>
+      <stringProp name="RegexExtractor.regex">&lt;span id="order_status"&gt;([^&lt;]+)&lt;/span&gt;</stringProp>
+      <stringProp name="RegexExtractor.template">$1$</stringProp>
+      <stringProp name="RegexExtractor.default"/>
+      <stringProp name="RegexExtractor.match_number">1</stringProp>
+      <stringProp name="Scope.variable">simple_products</stringProp>
+    </RegexExtractor>
+    <hashTree/>
+  </hashTree>
+
+    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
+      <stringProp name="IfController.condition">"${order_status}" == "Pending"</stringProp>
+      <boolProp name="IfController.evaluateAll">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/if_controller.jmx</stringProp></IfController>
+    <hashTree>
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Comment" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="history[status]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">pending</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">history[status]</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="history[comment]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">Some text</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">history[comment]</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/addComment/order_id/${order_id}/?isAjax=true</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/add_comment.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-2089278331">Not Notified</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Start" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments"/>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/start/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">GET</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_start.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="-1233850814">Invoice Totals</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract ordered items ids" enabled="true">
+      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+      <stringProp name="RegexExtractor.refname">item_ids</stringProp>
+      <stringProp name="RegexExtractor.regex">&lt;div id="order_item_(\d+)_title"\s*class="product-title"&gt;</stringProp>
+      <stringProp name="RegexExtractor.template">$1$</stringProp>
+      <stringProp name="RegexExtractor.default"/>
+      <stringProp name="RegexExtractor.match_number">-1</stringProp>
+      <stringProp name="Scope.variable">simple_products</stringProp>
+    </RegexExtractor>
+    <hashTree/>
+  </hashTree>
 
-            <elementProp name="address[${admin_customer_address_entity_id}][created_at]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_created_at}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][created_at]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][updated_at]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_updated_at}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][updated_at]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][is_active]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_is_active}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][is_active]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][city]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_city}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][city]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][company]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][company]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][country_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_country_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][country_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][firstname]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_firstname}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][firstname]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][lastname]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_lastname}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][lastname]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][middlename]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][middlename]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][postcode]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_postcode}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][postcode]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][prefix]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][prefix]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][region]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_region}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][region_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_region_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][region_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][street][0]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_street}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][0]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][street][1]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][street][1]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][suffix]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][suffix]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][telephone]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_telephone}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][telephone]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][vat_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][vat_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][customer_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_customer_address_customer_id}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][customer_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][default_billing]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_billing]</stringProp>
-            </elementProp>
-            <elementProp name="address[${admin_customer_address_entity_id}][default_shipping]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[${admin_customer_address_entity_id}][default_shipping]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][prefix]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][prefix]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][firstname]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">John</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][firstname]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][middlename]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][middlename]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][lastname]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Doe</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][lastname]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][suffix]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][suffix]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][company]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Test Company</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][company]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][city]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">Folsom</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][city]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][postcode]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">95630</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][postcode]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][telephone]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1234567890</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][telephone]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][vat_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][vat_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][default_billing]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">false</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][default_billing]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][default_shipping]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">false</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][default_shipping]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][street][0]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">123 Main</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][street][0]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][street][1]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][street][1]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][region]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][region]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][country_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">US</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][country_id]</stringProp>
-            </elementProp>
-            <elementProp name="address[new_0][region_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">12</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">address[new_0][region_id]</stringProp>
-            </elementProp>
-            <elementProp name="form_key" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
-            </elementProp>
-          </collectionProp>
+  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Submit" enabled="true">
+    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+      <collectionProp name="Arguments.arguments">
+        <elementProp name="form_key" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">form_key</stringProp>
+          <stringProp name="Argument.desc">false</stringProp>
         </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/save/</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer saved" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="292987815">You saved the customer.</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Pause" enabled="true">
-        <intProp name="ActionProcessor.action">1</intProp>
-        <intProp name="ActionProcessor.target">0</intProp>
-        <stringProp name="ActionProcessor.duration">${__javaScript(Math.round(${adminCustomerManagementDelay}*1000))}</stringProp>
-      </TestAction>
+        <elementProp name="invoice[items][${item_ids_1}]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">invoice[items][${item_ids_1}]</stringProp>
+        </elementProp>
+        <elementProp name="invoice[items][${item_ids_2}]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">1</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">invoice[items][${item_ids_2}]</stringProp>
+        </elementProp>
+        <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
+          <boolProp name="HTTPArgument.always_encode">true</boolProp>
+          <stringProp name="Argument.value">Invoiced</stringProp>
+          <stringProp name="Argument.metadata">=</stringProp>
+          <boolProp name="HTTPArgument.use_equals">true</boolProp>
+          <stringProp name="Argument.name">invoice[comment_text]</stringProp>
+        </elementProp>
+      </collectionProp>
+    </elementProp>
+    <stringProp name="HTTPSampler.domain"/>
+    <stringProp name="HTTPSampler.port"/>
+    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+    <stringProp name="HTTPSampler.contentEncoding"/>
+    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
+    <stringProp name="HTTPSampler.method">POST</stringProp>
+    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+    <boolProp name="HTTPSampler.monitor">false</boolProp>
+    <stringProp name="HTTPSampler.embedded_url_re"/>
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_submit.jmx</stringProp></HTTPSamplerProxy>
+  <hashTree>
+    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <collectionProp name="Asserion.test_strings">
+        <stringProp name="1740524604">The invoice has been created</stringProp>
+      </collectionProp>
+      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+      <boolProp name="Assertion.assume_success">false</boolProp>
+      <intProp name="Assertion.test_type">2</intProp>
+    </ResponseAssertion>
+    <hashTree/>
+  </hashTree>
+
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Shipment Start" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/start/order_id/${order_id}/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/shipment_start.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="304100442">New Shipment</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Shipment Submit" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+            <stringProp name="Argument.desc">false</stringProp>
+          </elementProp>
+          <elementProp name="shipment[items][${item_ids_1}]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">shipment[items][${item_ids_1}]</stringProp>
+          </elementProp>
+          <elementProp name="shipment[items][${item_ids_2}]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">shipment[items][${item_ids_2}]</stringProp>
+          </elementProp>
+          <elementProp name="shipment[comment_text]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">Shipped</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">shipment[comment_text]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/save/order_id/${order_id}/</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/shipment_submit.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-2089453199">The shipment has been created</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
       <hashTree/>
     </hashTree>
+  </hashTree>
   </hashTree>
   
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
@@ -33969,8 +35899,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -33989,8 +35919,11 @@ vars.put("admin_user", adminUser);
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
@@ -33998,11 +35931,11 @@ adminUserList.add(vars.get("admin_user"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Admin Edit Order" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Catalog GraphQL" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${adminEditOrderPercentage}</stringProp>
+      <stringProp name="ThroughputController.percentThroughput">${catalogGraphQLPercentage}</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
@@ -34023,12 +35956,16 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Admin Edit Order");
+                vars.put("testLabel", "Catalog GraphQL");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
         <hashTree/>
     
+    <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Admin Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/once_only_controller.jmx</stringProp>
+</OnceOnlyController>
+    <hashTree>
         <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
         <stringProp name="script">
         function getFormKeyFromResponse()
@@ -34096,7 +36033,19 @@ if (testLabel
       <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
       <stringProp name="BeanShellSampler.query">
 adminUserList = props.get("adminUserList");
-adminUser = adminUserList.poll();
+adminUserListIterator = props.get("adminUserListIterator");
+adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+
+if (adminUsersDistribution == 1) {
+    adminUser = adminUserList.poll();
+} else {
+    if (!adminUserListIterator.hasNext()) {
+        adminUserListIterator = adminUserList.descendingIterator();
+    }
+
+    adminUser = adminUserListIterator.next();
+}
+
 if (adminUser == null) {
   SampleResult.setResponseMessage("adminUser list is empty");
   SampleResult.setResponseData("adminUser list is empty","UTF-8");
@@ -34119,11 +36068,11 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
       <stringProp name="HTTPSampler.method">GET</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -34200,8 +36149,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
@@ -34228,418 +36177,162 @@ vars.put("admin_user", adminUser);
     </hashTree>
   </hashTree>
   
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Indexer Controller" enabled="true">
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
 </GenericController>
     <hashTree>
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Orders page" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/orders_page.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1204796042">Create New Order</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Orders" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="namespace" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">sales_order_grid</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">namespace</stringProp>
-        </elementProp>
-        <elementProp name="search" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value"/>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">search</stringProp>
-        </elementProp>
-        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-        </elementProp>
-        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">200</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-        </elementProp>
-        <elementProp name="paging[current]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[current]</stringProp>
-        </elementProp>
-        <elementProp name="sorting[field]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">increment_id</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[field]</stringProp>
-        </elementProp>
-        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">desc</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[direction]</stringProp>
-        </elementProp>
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="filters[status]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">pending</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[status]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="_" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">_</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_orders.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1637639774">totalRecords</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search Pending Orders" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-        </elementProp>
-        <elementProp name="namespace" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">sales_order_grid</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">namespace</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="search" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value"/>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">search</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[placeholder]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">200</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[pageSize]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="paging[current]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">paging[current]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="sorting[field]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">increment_id</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[field]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="sorting[direction]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">asc</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">sorting[direction]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="filters[status]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">pending</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">filters[status]</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Indexers Management Catalog Set On Save" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_indexers_management/admin_indexer_management_catalog_set_on_save.jmx</stringProp>
+    </TestFragmentController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Index Page" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
         </elementProp>
-        <elementProp name="_" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${__time()}${__Random(1,1000000)}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">_</stringProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/indexer/indexer/list/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+          <collectionProp name="HeaderManager.headers">
+            <elementProp name="Accept-Language" elementType="Header">
+              <stringProp name="Header.name">Accept-Language</stringProp>
+              <stringProp name="Header.value">en-US,en;q=0.5</stringProp>
+            </elementProp>
+            <elementProp name="Accept" elementType="Header">
+              <stringProp name="Header.name">Accept</stringProp>
+              <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+            </elementProp>
+            <elementProp name="User-Agent" elementType="Header">
+              <stringProp name="Header.name">User-Agent</stringProp>
+              <stringProp name="Header.value">Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0</stringProp>
+            </elementProp>
+            <elementProp name="Accept-Encoding" elementType="Header">
+              <stringProp name="Header.name">Accept-Encoding</stringProp>
+              <stringProp name="Header.value">gzip, deflate</stringProp>
+            </elementProp>
+          </collectionProp>
+        </HeaderManager>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Indexers on Save" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="indexer_ids" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">catalog_category_product,catalog_product_category,catalog_product_price,catalog_product_attribute,cataloginventory_stock,catalogsearch_fulltext</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">indexer_ids</stringProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+            </elementProp>
+            <elementProp name="massaction_prepare_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">indexer_ids</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">massaction_prepare_key</stringProp>
+            </elementProp>
+          </collectionProp>
         </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/search_orders.jmx</stringProp></HTTPSamplerProxy>
-<hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1637639774">totalRecords</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order numbers" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">order_numbers</stringProp>
-        <stringProp name="RegexExtractor.regex">\"increment_id\":\"(\d+)\"\,</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-        <stringProp name="Scope.variable">simple_products</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order ids" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">order_ids</stringProp>
-        <stringProp name="RegexExtractor.regex">\"entity_id\":\"(\d+)\"\,</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">-1</stringProp>
-        <stringProp name="Scope.variable">simple_products</stringProp>
-      </RegexExtractor>
-      <hashTree/>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/indexer/indexer/massOnTheFly/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="49586">200</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">16</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
     </hashTree>
-
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Generate Unique Ids for each Thread" enabled="true">
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/setup.jmx</stringProp>
-        <stringProp name="BeanShellSampler.query">
-  import java.util.ArrayList;
-  import java.util.HashMap;
-  import org.apache.jmeter.protocol.http.util.Base64Encoder;
-  import java.util.Random;
-
-  // get count of "order_numbers" variable defined in "Search Pending Orders Limit"
-  int ordersCount = Integer.parseInt(vars.get("order_numbers_matchNr"));
-
-
-  int clusterLength;
-  int threadsNumber = ctx.getThreadGroup().getNumThreads();
-  if (threadsNumber == 0) {
-      //Number of orders for one thread
-      clusterLength = ordersCount;
-  } else {
-      clusterLength = Math.round(ordersCount / threadsNumber);
-      if (clusterLength == 0) {
-          clusterLength = 1;
-      }
-  }
-
-  //Current thread number starts from 0
-  int currentThreadNum = ctx.getThreadNum();
-
-  //Index of the current product from the cluster
-  Random random = new Random();
-  int iterator = random.nextInt(clusterLength);
-  if (iterator == 0) {
-  	iterator = 1;
-  }
-
-  int i = clusterLength * currentThreadNum + iterator;
-
-  orderNumber = vars.get("order_numbers_" + i.toString());
-  orderId = vars.get("order_ids_" + i.toString());
-  vars.put("order_number", orderNumber);
-  vars.put("order_id", orderId);
-
-  </stringProp>
-    <stringProp name="BeanShellSampler.filename"/>
-    <stringProp name="BeanShellSampler.parameters"/>
-    <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-  </BeanShellSampler>
-  <hashTree/>
-
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Order" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/view/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/open_order.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="2103620713">#${order_number}</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Related Product Id" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_related_product_id.jmx</stringProp>
+      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
+import java.util.Random;
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom});
+}
+relatedIndex = random.nextInt(props.get("simple_products_list").size());
+vars.put("related_product_id", props.get("simple_products_list").get(relatedIndex).get("id"));</stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    </BeanShellSampler>
     <hashTree/>
-    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract order status" enabled="true">
-      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-      <stringProp name="RegexExtractor.refname">order_status</stringProp>
-      <stringProp name="RegexExtractor.regex">&lt;span id="order_status"&gt;([^&lt;]+)&lt;/span&gt;</stringProp>
-      <stringProp name="RegexExtractor.template">$1$</stringProp>
-      <stringProp name="RegexExtractor.default"/>
-      <stringProp name="RegexExtractor.match_number">1</stringProp>
-      <stringProp name="Scope.variable">simple_products</stringProp>
-    </RegexExtractor>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Get Product Attributes" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
     <hashTree/>
-  </hashTree>
-
-    <IfController guiclass="IfControllerPanel" testclass="IfController" testname="If Controller" enabled="true">
-      <stringProp name="IfController.condition">"${order_status}" == "Pending"</stringProp>
-      <boolProp name="IfController.evaluateAll">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/if_controller.jmx</stringProp></IfController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Comment" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
-          <elementProp name="history[status]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">pending</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">history[status]</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="history[comment]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">Some text</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">history[comment]</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order/addComment/order_id/${order_id}/?isAjax=true</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
       <stringProp name="HTTPSampler.method">POST</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -34647,213 +36340,2129 @@ vars.put("admin_user", adminUser);
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/add_comment.jmx</stringProp></HTTPSamplerProxy>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
     <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="-2089278331">Not Notified</stringProp>
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
   
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Start" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments"/>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/start/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">GET</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_start.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="-1233850814">Invoice Totals</stringProp>
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+        </elementProp>
       </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-    <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract ordered items ids" enabled="true">
-      <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-      <stringProp name="RegexExtractor.refname">item_ids</stringProp>
-      <stringProp name="RegexExtractor.regex">&lt;div id="order_item_(\d+)_title"\s*class="product-title"&gt;</stringProp>
-      <stringProp name="RegexExtractor.template">$1$</stringProp>
-      <stringProp name="RegexExtractor.default"/>
-      <stringProp name="RegexExtractor.match_number">-1</stringProp>
-      <stringProp name="Scope.variable">simple_products</stringProp>
-    </RegexExtractor>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
     <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get product attributes" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">mycolor</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">attribute_code</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">mysize</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
+          </elementProp>
+          <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">attribute_code</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/attributes</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/get_product_attributes.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product attributes" enabled="true">
+        <stringProp name="VAR">product_attributes</stringProp>
+        <stringProp name="JSONPATH">$.items</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="SetUp - Prepare product attributes" enabled="true">
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="cacheKey"/>
+        <stringProp name="script">
+var attributesData = JSON.parse(vars.get("product_attributes")),
+maxOptions = 2;
+
+attributes = [];
+for (i in attributesData) {
+    if (i &gt;= 2) {
+        break;
+    }
+    var data = attributesData[i],
+        attribute = {
+            "id": data.attribute_id,
+            "code": data.attribute_code,
+            "label": data.default_frontend_label,
+            "options": []
+        };
+
+    var processedOptions = 0;
+    for (optionN in data.options) {
+        var option = data.options[optionN];
+        if (parseInt(option.value) &gt; 0 &amp;&amp; processedOptions &lt; maxOptions) {
+            processedOptions++;
+            attribute.options.push(option);
+        }
+    }
+    attributes.push(attribute);
+}
+
+vars.putObject("product_attributes", attributes);
+</stringProp>
+      </JSR223PostProcessor>
+      <hashTree/>
+    </hashTree>
   </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Attribute Set Id" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_set/index/filter/${attribute_set_filter}</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/configurable_setup_attribute_set.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+        <stringProp name="RegexExtractor.refname">attribute_set_id</stringProp>
+        <stringProp name="RegexExtractor.regex">catalog\/product_set\/edit\/id\/([\d]+)\/"[\D\d]*Attribute Set 1</stringProp>
+        <stringProp name="RegexExtractor.template">$1$</stringProp>
+        <stringProp name="RegexExtractor.default"/>
+        <stringProp name="RegexExtractor.match_number">1</stringProp>
+      </RegexExtractor>
+      <hashTree/>
+      <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="SetUp - Set Attribute Set Filter" enabled="true">
+        <boolProp name="resetInterpreter">false</boolProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="script">import org.apache.commons.codec.binary.Base64;
 
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Invoice Submit" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
+byte[] encodedBytes = Base64.encodeBase64("set_name=Attribute Set 1".getBytes());
+vars.put("attribute_set_filter", new String(encodedBytes));
+</stringProp>
+      </BeanShellPreProcessor>
+      <hashTree/>
+    </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
+      <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
+import java.util.Random;
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom});
+}
+number = random.nextInt(props.get("simple_products_list_for_edit").size());
+simpleList = props.get("simple_products_list_for_edit").get(number);
+vars.put("simple_product_1_id", simpleList.get("id"));
+vars.put("simple_product_1_name", simpleList.get("title"));
+
+do {
+    number1 = random.nextInt(props.get("simple_products_list_for_edit").size());
+} while(number == number1);
+simpleList = props.get("simple_products_list_for_edit").get(number1);
+vars.put("simple_product_2_id", simpleList.get("id"));
+vars.put("simple_product_2_name", simpleList.get("title"));
+
+number2 = random.nextInt(props.get("configurable_products_list").size());
+configurableList = props.get("configurable_products_list").get(number2);
+vars.put("configurable_product_1_id", configurableList.get("id"));
+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
+vars.put("configurable_product_1_name", configurableList.get("title"));
+
+//Additional category to be added
+//int categoryId = Integer.parseInt(vars.get("simple_product_category_id"));
+//vars.put("category_additional", (categoryId+1).toString());
+//New price
+vars.put("price_new", "9999");
+//New special price
+vars.put("special_price_new", "8888");
+//New quantity
+vars.put("quantity_new", "100600");
+vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNum}-${__Random(1,1000000)}");
+
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Bundle Product" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_product/create_bundle_product.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Catalog Product" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
         </elementProp>
-        <elementProp name="invoice[items][${item_ids_1}]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">invoice[items][${item_ids_1}]</stringProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="1509986340">records found</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
         </elementProp>
-        <elementProp name="invoice[items][${item_ids_2}]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">invoice[items][${item_ids_2}]</stringProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/new/set/4/type/bundle/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-144461265">New Product</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Validate" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="ajax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">ajax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="isAjax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">isAjax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="product[name]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[name]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="product[sku]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product  ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[sku]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="product[price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">42</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[price]</stringProp>
+            </elementProp>
+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
+            </elementProp>
+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">111</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[weight]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1.0000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[weight]</stringProp>
+            </elementProp>
+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
+            </elementProp>
+            <elementProp name="product[description]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">&lt;p&gt;Full bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[description]</stringProp>
+            </elementProp>
+            <elementProp name="product[short_description]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">&lt;p&gt;Short bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[short_description]</stringProp>
+            </elementProp>
+            <elementProp name="product[status]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[status]</stringProp>
+            </elementProp>
+            <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[configurable_variations]</stringProp>
+            </elementProp>
+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
+            </elementProp>
+            <elementProp name="product[image]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[image]</stringProp>
+            </elementProp>
+            <elementProp name="product[small_image]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[small_image]</stringProp>
+            </elementProp>
+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
+            </elementProp>
+            <elementProp name="product[url_key]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">bundle-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[url_key]</stringProp>
+            </elementProp>
+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_title]</stringProp>
+            </elementProp>
+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
+            </elementProp>
+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_description]</stringProp>
+            </elementProp>
+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
+            </elementProp>
+            <elementProp name="product[special_price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_price]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
+            </elementProp>
+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
+            </elementProp>
+            <elementProp name="product[cost]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[cost]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">32000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">100</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">90</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">101</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">100500</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">100500</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">10000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
+            </elementProp>
+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[page_layout]</stringProp>
+            </elementProp>
+            <elementProp name="product[options_container]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">container2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[options_container]</stringProp>
+            </elementProp>
+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
+            </elementProp>
+            <elementProp name="product[shipment_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[shipment_type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">option title one</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][title]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][option_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][delete]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">select</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][required]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][required]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][option_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][product_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][delete]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">25</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_qty]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][option_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][product_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][delete]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">10.99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_qty]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][position]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">option title two</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][title]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][option_id]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][delete]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">select</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][type]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][required]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][required]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][position]</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][option_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][product_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][delete]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">5.00</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][position]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][option_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][product_id]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][delete]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">7.00</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][position]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="affect_bundle_product_selections" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">affect_bundle_product_selections</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
+            </elementProp>
+          </collectionProp>
         </elementProp>
-        <elementProp name="invoice[comment_text]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">Invoiced</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">invoice[comment_text]</stringProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/validate/set/4/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="1853918323">{"error":false}</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="New Bundle Product Save" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="ajax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">ajax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="isAjax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">isAjax</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="product[name]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[name]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="product[sku]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[sku]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="product[price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">42</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[price]</stringProp>
+            </elementProp>
+            <elementProp name="product[tax_class_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tax_class_id]</stringProp>
+            </elementProp>
+            <elementProp name="product[quantity_and_stock_status][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">111</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[quantity_and_stock_status][qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[quantity_and_stock_status][is_in_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[quantity_and_stock_status][is_in_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[weight]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1.0000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[weight]</stringProp>
+            </elementProp>
+            <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[product_has_weight]</stringProp>
+              <stringProp name="Argument.desc">true</stringProp>
+            </elementProp>
+            <elementProp name="product[category_ids][]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[category_ids][]</stringProp>
+            </elementProp>
+            <elementProp name="product[description]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">&lt;p&gt;Full bundle product Description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[description]</stringProp>
+            </elementProp>
+            <elementProp name="product[short_description]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">&lt;p&gt;Short bundle product description ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}&lt;/p&gt;</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[short_description]</stringProp>
+            </elementProp>
+            <elementProp name="product[status]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[status]</stringProp>
+            </elementProp>
+            <elementProp name="product[configurable_variations]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[configurable_variations]</stringProp>
+            </elementProp>
+            <elementProp name="affect_configurable_product_attributes" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">affect_configurable_product_attributes</stringProp>
+            </elementProp>
+            <elementProp name="product[image]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[image]</stringProp>
+            </elementProp>
+            <elementProp name="product[small_image]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[small_image]</stringProp>
+            </elementProp>
+            <elementProp name="product[thumbnail]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[thumbnail]</stringProp>
+            </elementProp>
+            <elementProp name="product[url_key]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">bundle-product-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[url_key]</stringProp>
+            </elementProp>
+            <elementProp name="product[meta_title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Title</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_title]</stringProp>
+            </elementProp>
+            <elementProp name="product[meta_keyword]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Keyword</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_keyword]</stringProp>
+            </elementProp>
+            <elementProp name="product[meta_description]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">Bundle Product ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)} Meta Description</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[meta_description]</stringProp>
+            </elementProp>
+            <elementProp name="product[website_ids][]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[website_ids][]</stringProp>
+            </elementProp>
+            <elementProp name="product[special_price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_price]</stringProp>
+            </elementProp>
+            <elementProp name="product[special_from_date]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_from_date]</stringProp>
+            </elementProp>
+            <elementProp name="product[special_to_date]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[special_to_date]</stringProp>
+            </elementProp>
+            <elementProp name="product[cost]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[cost]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][website_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][website_id]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][cust_group]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">32000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][cust_group]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][price_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">100</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][price_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">90</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][price]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][0][delete]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][website_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][website_id]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][cust_group]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][cust_group]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][price_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">101</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][price_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][price]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][price]</stringProp>
+            </elementProp>
+            <elementProp name="product[tier_price][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[tier_price][1][delete]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_manage_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_manage_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][original_inventory_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">100500</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][original_inventory_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">100500</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][min_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][min_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_min_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_min_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][min_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][min_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_min_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_min_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][max_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">10000</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][max_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_max_sale_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_max_sale_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_qty_decimal]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_qty_decimal]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_decimal_divided]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_decimal_divided]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][backorders]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][backorders]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_backorders]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_backorders]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][notify_stock_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][notify_stock_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_notify_stock_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_notify_stock_qty]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][enable_qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][enable_qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][use_config_qty_increments]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][use_config_qty_increments]</stringProp>
+            </elementProp>
+            <elementProp name="product[stock_data][is_in_stock]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[stock_data][is_in_stock]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design_from]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design_from]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_design_to]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_design_to]</stringProp>
+            </elementProp>
+            <elementProp name="product[custom_layout_update]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[custom_layout_update]</stringProp>
+            </elementProp>
+            <elementProp name="product[page_layout]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[page_layout]</stringProp>
+            </elementProp>
+            <elementProp name="product[options_container]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">container2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[options_container]</stringProp>
+            </elementProp>
+            <elementProp name="new-variations-attribute-set-id" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">new-variations-attribute-set-id</stringProp>
+            </elementProp>
+            <elementProp name="product[shipment_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">product[shipment_type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">option title one</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][title]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][option_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][delete]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">select</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][required]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][required]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][position]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][option_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][product_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][delete]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">25</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][0][position]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][option_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][product_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][delete]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">10.99</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][0][bundle_selections][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][0][bundle_selections][1][position]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][title]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">option title two</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][title]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][option_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][delete]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">select</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][required]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][required]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][position]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][option_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_1_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][product_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][delete]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">5.00</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][0][position]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][option_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][option_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][product_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${simple_product_2_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][product_id]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][delete]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value"/>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][delete]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">7.00</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_value]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">0</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_price_type]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][selection_can_change_qty]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="bundle_options[bundle_options][1][bundle_selections][1][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">bundle_options[bundle_options][1][bundle_selections][1][position]</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="affect_bundle_product_selections" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">affect_bundle_product_selections</stringProp>
+              <stringProp name="Argument.desc">false</stringProp>
+            </elementProp>
+            <elementProp name="links[related][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[related][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[related][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[related][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="links[upsell][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[upsell][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[upsell][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[upsell][0][position]</stringProp>
+            </elementProp>
+            <elementProp name="links[crosssell][0][id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${related_product_id}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[crosssell][0][id]</stringProp>
+            </elementProp>
+            <elementProp name="links[crosssell][0][position]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">links[crosssell][0][position]</stringProp>
+            </elementProp>
+          </collectionProp>
         </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout"/>
-    <stringProp name="HTTPSampler.response_timeout"/>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_invoice/save/order_id/${order_id}/</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_create_process_returns/invoice_submit.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1740524604">The invoice has been created</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product/save/set/4/type/bundle/back/edit/active_tab/product-details/</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-583471546">You saved the product</stringProp>
+            <stringProp name="-1534079309">option title one</stringProp>
+            <stringProp name="-1534074215">option title two</stringProp>
+            <stringProp name="1304788671">${simple_product_2_name}</stringProp>
+            <stringProp name="417284990">${simple_product_1_name}</stringProp>
+          </collectionProp>
 
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Shipment Start" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/start/order_id/${order_id}/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/shipment_start.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="304100442">New Shipment</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Shipment Submit" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="shipment[items][${item_ids_1}]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">shipment[items][${item_ids_1}]</stringProp>
-          </elementProp>
-          <elementProp name="shipment[items][${item_ids_2}]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">shipment[items][${item_ids_2}]</stringProp>
-          </elementProp>
-          <elementProp name="shipment[comment_text]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">Shipped</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">shipment[comment_text]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/order_shipment/save/order_id/${order_id}/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_edit_order/shipment_submit.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-2089453199">The shipment has been created</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
     </hashTree>
-  </hashTree>
   </hashTree>
   
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
@@ -34862,8 +38471,8 @@ vars.put("admin_user", adminUser);
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
@@ -34882,46 +38491,20 @@ vars.put("admin_user", adminUser);
         <stringProp name="parameters"/>
         <stringProp name="filename"/>
         <stringProp name="script">
-adminUserList = props.get("adminUserList");
-adminUserList.add(vars.get("admin_user"));
+        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
+        if (adminUsersDistribution == 1) {
+            adminUserList = props.get("adminUserList");
+            adminUserList.add(vars.get("admin_user"));
+        }
         </stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
     <hashTree/>
   </hashTree>
-  </hashTree>
-
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Catalog GraphQL" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${catalogGraphQLPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Product Fixtures Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
     <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Catalog GraphQL");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
     <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
       <collectionProp name="HeaderManager.headers">
         <elementProp name="" elementType="Header">
@@ -34949,8 +38532,8 @@ if (testLabel
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
@@ -34994,64 +38577,6 @@ if (testLabel
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
     <hashTree/>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query multiple products" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 200\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        custom_design\n        custom_design_from\n        custom_design_to\n        custom_layout\n        custom_layout_update\n        description\n        gallery\n        gift_message_available\n        has_options\n        image\n        image_label\n        links_exist\n        links_purchased_separately\n        links_title\n        media_gallery{\n               images\n                {\n                    file\n                }\n            }\n        meta_description\n        meta_keyword\n        meta_title\n        minimal_price\n        msrp\n        msrp_display_actual_price_type\n        name\n        news_from_date\n        news_to_date\n        old_id\n        options_container\n        page_layout\n        price\n        price_type\n        price_view\n        required_options\n        samples_title\n        shipment_type\n        short_description\n        sku\n        small_image\n        small_image_label\n        special_from_date\n        special_price\n        special_to_date\n        status\n        swatch_image\n        tax_class_id\n        thumbnail\n        thumbnail_label\n        tier_price\n        type_id\n        updated_at\n        url_key\n        url_path\n        visibility\n        website_ids\n        weight\n        weight_type\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n\n","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 300" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_products_query_total_count");
-
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) &lt; 300) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be greater than 300, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
-}
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create product with extensible data objects" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
@@ -35079,8 +38604,8 @@ if (totalCount == null) {
         ],&#xD;
         "extension_attributes":{&#xD;
 		"stock_item":{&#xD;
-		"manage_stock": true,    &#xD;
-		"is_in_stock": true,&#xD;
+		"manage_stock": 1,    &#xD;
+		"is_in_stock": 1,&#xD;
 		"qty":"100"&#xD;
 		}&#xD;
     	   }        ,&#xD;
@@ -35089,7 +38614,7 @@ if (totalCount == null) {
     	   		"id": null,&#xD;
     	   		"label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
     	   		"position":1,&#xD;
-    	   		"disabled":false,&#xD;
+    	   		"disabled":0,&#xD;
     	   		"media_type":"image",&#xD;
     	   		"types":["image"],&#xD;
     	   		"content":{&#xD;
@@ -35107,8 +38632,8 @@ if (totalCount == null) {
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
       <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
@@ -35180,73 +38705,6 @@ if (totalCount == null) {
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query simple product" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n    {\ntotal_count\n       items {\n            attribute_set_id\n            category_ids\n            category_links\n            {\n                category_id\n                position\n            }\n            cost\n            country_of_manufacture\n            created_at\n            custom_design\n            custom_design_from\n            custom_design_to\n            custom_layout\n            custom_layout_update\n            description\n            gallery\n            gift_message_available\n            has_options\n            id\n            image\n            image_label\n            links_exist\n            links_purchased_separately\n            links_title\n            media_gallery{\n               images\n                {\n                    file\n                }\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            minimal_price\n            msrp\n            msrp_display_actual_price_type\n            name\n            news_from_date\n            news_to_date\n            old_id\n            options_container\n            options\n            {\n                file_extension\n                image_size_x\n                image_size_y\n                is_require\n                max_characters\n                option_id\n                price\n                price_type\n                product_sku\n                sku\n                sort_order\n                title\n                type\n                values\n                {\n                    title\n                    sort_order\n                    price\n                    price_type\n                    sku\n                    option_type_id\n                }\n            }\n            page_layout\n            price\n            price_type\n            price_view\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                qty\n                sku\n            }\n            required_options\n            samples_title\n            shipment_type\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            status\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            visibility\n            website_ids\n            weight\n            weight_type\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_products_query_total_count");
-
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) != 1) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
-}
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create configurable product" enabled="true">
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_configurable_product_with_extensible_data_objects.jmx</stringProp>
 </OnceOnlyController>
@@ -35399,9 +38857,9 @@ if (totalCount == null) {
           <stringProp name="HTTPSampler.embedded_url_re"/>
         </HTTPSamplerProxy>
         <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Option Id" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="3569038">true</stringProp>
+              <stringProp name="89649215">^[a-z0-9_\"]+$</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
@@ -35473,9 +38931,9 @@ if (totalCount == null) {
           <stringProp name="HTTPSampler.embedded_url_re"/>
         </HTTPSamplerProxy>
         <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Option Id" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="3569038">true</stringProp>
+                <stringProp name="484395188">^[a-z0-9_\"]+$</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
@@ -35538,8 +38996,8 @@ if (totalCount == null) {
         ],&#xD;
         "extension_attributes":{&#xD;
 		"stock_item":{&#xD;
-		"manage_stock": true,    &#xD;
-		"is_in_stock": true,&#xD;
+		"manage_stock": 1,    &#xD;
+		"is_in_stock": 1,&#xD;
 		"qty":"100"&#xD;
 		}&#xD;
     	   }        ,&#xD;
@@ -35669,8 +39127,8 @@ if (totalCount == null) {
         ],&#xD;
         "extension_attributes":{&#xD;
 		"stock_item":{&#xD;
-		"manage_stock": true,    &#xD;
-		"is_in_stock": true,&#xD;
+		"manage_stock": 1,    &#xD;
+		"is_in_stock": 1,&#xD;
 		"qty":"100"&#xD;
 		}&#xD;
     	   }        ,&#xD;
@@ -35800,8 +39258,8 @@ if (totalCount == null) {
         ],&#xD;
         "extension_attributes":{&#xD;
 		"stock_item":{&#xD;
-		"manage_stock": true,    &#xD;
-		"is_in_stock": true,&#xD;
+		"manage_stock": 1,    &#xD;
+		"is_in_stock": 1,&#xD;
 		"qty":"100"&#xD;
 		}&#xD;
     	   }        ,&#xD;
@@ -35890,140 +39348,1579 @@ if (totalCount == null) {
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
           <collectionProp name="Asserion.test_strings">
-            <stringProp name="89649215">^\d+$</stringProp>
+            <stringProp name="89649215">^\d+$</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+          <stringProp name="Assertion.scope">variable</stringProp>
+          <stringProp name="Scope.variable">configurable_blue_stock_item_id</stringProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create color option for configurable product" enabled="true">
+        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">{&#xD;
+  "option": {&#xD;
+    "attribute_id": "93",&#xD;
+    "label": "Color",&#xD;
+    "position": 0,&#xD;
+    "is_use_default": 1,&#xD;
+    "values": [&#xD;
+      {&#xD;
+        "value_index": 0&#xD;
+      }&#xD;
+    ]&#xD;
+  }&#xD;
+}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/configurable-products/${configurable_product_sku}/options</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert option id" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="1865724479">^\"\d+\"$</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+          <stringProp name="Scope.variable"/>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create children from variation color #1" enabled="true">
+        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">{"childSku": "apsku-test-${configurable_product_attribute_color_1}"}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+            </elementProp>
+          </collectionProp>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/configurable-products/${configurable_product_sku}/child</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="3569038">true</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
           <boolProp name="Assertion.assume_success">false</boolProp>
           <intProp name="Assertion.test_type">1</intProp>
-          <stringProp name="Assertion.scope">variable</stringProp>
-          <stringProp name="Scope.variable">configurable_blue_stock_item_id</stringProp>
         </ResponseAssertion>
         <hashTree/>
       </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create color option for configurable product" enabled="true">
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create children from variation color #2" enabled="true">
         <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
           <collectionProp name="Arguments.arguments">
             <elementProp name="" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              <stringProp name="Argument.value">{&#xD;
-  "option": {&#xD;
-    "attribute_id": "93",&#xD;
-    "label": "Color",&#xD;
-    "position": 0,&#xD;
-    "is_use_default": true,&#xD;
-    "values": [&#xD;
-      {&#xD;
-        "value_index": 0&#xD;
-      }&#xD;
-    ]&#xD;
-  }&#xD;
-}</stringProp>
+              <stringProp name="Argument.value">{"childSku": "apsku-test-${configurable_product_attribute_color_2}"}</stringProp>
               <stringProp name="Argument.metadata">=</stringProp>
             </elementProp>
           </collectionProp>
         </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/configurable-products/${configurable_product_sku}/options</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert option id" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="1865724479">^\"\d+\"$</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-          <stringProp name="Scope.variable"/>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create children from variation color #1" enabled="true">
-        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              <stringProp name="Argument.value">{"childSku": "apsku-test-${configurable_product_attribute_color_1}"}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-            </elementProp>
-          </collectionProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/configurable-products/${configurable_product_sku}/child</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="3569038">true</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">1</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+    </hashTree>
+  
+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create bundle product" enabled="true">
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_bundle_product_with_extensible_data_objects.jmx</stringProp>
+        </OnceOnlyController>
+        <hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create bundle product with extensible data objects" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "bundle-apsku-test-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Bundle Extensible_Product_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "4",&#xD;
+                                "type_id": "bundle",&#xD;
+                                "price": "99",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "price_view",&#xD;
+                                "value": "0"&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "price_type",&#xD;
+                                "value": "0"&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "weight_type",&#xD;
+                                "value": "0"&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"bundle_test_label_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "bundle_test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract bundle product id" enabled="true">
+                    <stringProp name="VAR">bundle_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
+                    <stringProp name="VAR">bundle_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child product child simple 1" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "apsku-test-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Extensible_Product_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "1",&#xD;
+                                "type_id": "simple",&#xD;
+                                "price": "3.62",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"test_label_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
+                    <stringProp name="VAR">bundle_child_1_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
+                    <stringProp name="VAR">bundle_child_1_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
+                    <stringProp name="VAR">bundle_child_1_product_stock_item_id</stringProp>
+                    <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_child_1_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="-425311000">^[A-Za-z0-9-]+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_child_1_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_child_1_product_stock_item_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child product child simple 2" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "apsku-test-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Extensible_Product_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "1",&#xD;
+                                "type_id": "simple",&#xD;
+                                "price": "3.62",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"test_label_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
+                    <stringProp name="VAR">bundle_child_2_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
+                    <stringProp name="VAR">bundle_child_2_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
+                    <stringProp name="VAR">bundle_child_2_product_stock_item_id</stringProp>
+                    <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_child_2_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="-425311000">^[A-Za-z0-9-]+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_child_2_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">bundle_child_2_product_stock_item_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create option and values for bundle product" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "option": {&#xD;
+                                "title": "option-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "required": 1,&#xD;
+                                "type": "select",&#xD;
+                                "position": 0,&#xD;
+                                "sku": "${bundle_product_sku}",&#xD;
+                                "product_links": [&#xD;
+                                {&#xD;
+                                "sku": "${bundle_child_1_product_sku}",&#xD;
+                                "qty": 1,&#xD;
+                                "position": 0,&#xD;
+                                "is_default": 1,&#xD;
+                                "can_change_quantity": 0&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "sku": "${bundle_child_2_product_sku}",&#xD;
+                                "qty": 1,&#xD;
+                                "position": 0,&#xD;
+                                "is_default": 0,&#xD;
+                                "can_change_quantity": 0&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/bundle-products/options/add</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert option id" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="1865724479">^\"\d+\"$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Scope.variable"/>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+        </hashTree>
+    
+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create downloadable product" enabled="true">
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_downloadable_product_with_extensible_data_objects.jmx</stringProp>
+        </OnceOnlyController>
+        <hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create downloadable product with extensible data objects" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "4",&#xD;
+                                "type_id": "downloadable",&#xD;
+                                "price": "3.62",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product id" enabled="true">
+                    <stringProp name="VAR">downloadable_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product sku" enabled="true">
+                    <stringProp name="VAR">downloadable_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">downloadable_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">downloadable_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create Links and samples" enabled="true"/>
+            <hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create link 1" enabled="true">
+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                        <collectionProp name="Arguments.arguments">
+                            <elementProp name="" elementType="HTTPArgument">
+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                                <stringProp name="Argument.value">{&#xD;
+                                    "link": {&#xD;
+                                    "title": "link1",&#xD;
+                                    "sort_order": 0,&#xD;
+                                    "is_shareable": 1,&#xD;
+                                    "price": 10,&#xD;
+                                    "number_of_downloads": 10,&#xD;
+                                    "link_type": "file",&#xD;
+                                    "link_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file1.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "sample_type": "file",&#xD;
+                                    "sample_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file1.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "isGlobalScopeContent": 1&#xD;
+                                    }&#xD;
+                                </stringProp>
+                                <stringProp name="Argument.metadata">=</stringProp>
+                            </elementProp>
+                        </collectionProp>
+                    </elementProp>
+                    <stringProp name="HTTPSampler.domain"/>
+                    <stringProp name="HTTPSampler.port"/>
+                    <stringProp name="HTTPSampler.connect_timeout"/>
+                    <stringProp name="HTTPSampler.response_timeout"/>
+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                    <stringProp name="HTTPSampler.contentEncoding"/>
+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${downloadable_product_sku}/downloadable-links</stringProp>
+                    <stringProp name="HTTPSampler.method">POST</stringProp>
+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
+                    <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable link id" enabled="true">
+                        <stringProp name="VAR">downloadable_link_id</stringProp>
+                        <stringProp name="JSONPATH">$</stringProp>
+                        <stringProp name="DEFAULT"/>
+                        <stringProp name="VARIABLE"/>
+                        <stringProp name="SUBJECT">BODY</stringProp>
+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                    <hashTree/>
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert response id not null" enabled="true">
+                        <collectionProp name="Asserion.test_strings">
+                            <stringProp name="89649215">^\d+$</stringProp>
+                        </collectionProp>
+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                        <boolProp name="Assertion.assume_success">false</boolProp>
+                        <intProp name="Assertion.test_type">1</intProp>
+                        <stringProp name="Scope.variable">downloadable_link_id</stringProp>
+                        <stringProp name="Assertion.scope">variable</stringProp>
+                    </ResponseAssertion>
+                    <hashTree/>
+                </hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create link 2" enabled="true">
+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                        <collectionProp name="Arguments.arguments">
+                            <elementProp name="" elementType="HTTPArgument">
+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                                <stringProp name="Argument.value">{&#xD;
+                                    "link": {&#xD;
+                                    "title": "link2",&#xD;
+                                    "sort_order": 0,&#xD;
+                                    "is_shareable": 1,&#xD;
+                                    "price": 10,&#xD;
+                                    "number_of_downloads": 10,&#xD;
+                                    "link_type": "file",&#xD;
+                                    "link_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file1.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "sample_type": "file",&#xD;
+                                    "sample_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file1.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "isGlobalScopeContent": 1&#xD;
+                                    }&#xD;
+                                </stringProp>
+                                <stringProp name="Argument.metadata">=</stringProp>
+                            </elementProp>
+                        </collectionProp>
+                    </elementProp>
+                    <stringProp name="HTTPSampler.domain"/>
+                    <stringProp name="HTTPSampler.port"/>
+                    <stringProp name="HTTPSampler.connect_timeout"/>
+                    <stringProp name="HTTPSampler.response_timeout"/>
+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                    <stringProp name="HTTPSampler.contentEncoding"/>
+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${downloadable_product_sku}/downloadable-links</stringProp>
+                    <stringProp name="HTTPSampler.method">POST</stringProp>
+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
+                    <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable link id" enabled="true">
+                        <stringProp name="VAR">downloadable_link_id</stringProp>
+                        <stringProp name="JSONPATH">$</stringProp>
+                        <stringProp name="DEFAULT"/>
+                        <stringProp name="VARIABLE"/>
+                        <stringProp name="SUBJECT">BODY</stringProp>
+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                    <hashTree/>
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert response id not null" enabled="true">
+                        <collectionProp name="Asserion.test_strings">
+                            <stringProp name="89649215">^\d+$</stringProp>
+                        </collectionProp>
+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                        <boolProp name="Assertion.assume_success">false</boolProp>
+                        <intProp name="Assertion.test_type">1</intProp>
+                        <stringProp name="Scope.variable">downloadable_link_id</stringProp>
+                        <stringProp name="Assertion.scope">variable</stringProp>
+                    </ResponseAssertion>
+                    <hashTree/>
+                </hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create link 3" enabled="true">
+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                        <collectionProp name="Arguments.arguments">
+                            <elementProp name="" elementType="HTTPArgument">
+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                                <stringProp name="Argument.value">{&#xD;
+                                    "link": {&#xD;
+                                    "title": "link3",&#xD;
+                                    "sort_order": 0,&#xD;
+                                    "is_shareable": 1,&#xD;
+                                    "price": 10,&#xD;
+                                    "number_of_downloads": 10,&#xD;
+                                    "link_type": "file",&#xD;
+                                    "link_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file1.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "sample_type": "file",&#xD;
+                                    "sample_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file1.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "isGlobalScopeContent": 1&#xD;
+                                    }&#xD;
+                                </stringProp>
+                                <stringProp name="Argument.metadata">=</stringProp>
+                            </elementProp>
+                        </collectionProp>
+                    </elementProp>
+                    <stringProp name="HTTPSampler.domain"/>
+                    <stringProp name="HTTPSampler.port"/>
+                    <stringProp name="HTTPSampler.connect_timeout"/>
+                    <stringProp name="HTTPSampler.response_timeout"/>
+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                    <stringProp name="HTTPSampler.contentEncoding"/>
+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${downloadable_product_sku}/downloadable-links</stringProp>
+                    <stringProp name="HTTPSampler.method">POST</stringProp>
+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
+                    <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable link id" enabled="true">
+                        <stringProp name="VAR">downloadable_link_id</stringProp>
+                        <stringProp name="JSONPATH">$</stringProp>
+                        <stringProp name="DEFAULT"/>
+                        <stringProp name="VARIABLE"/>
+                        <stringProp name="SUBJECT">BODY</stringProp>
+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                    <hashTree/>
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert response id not null" enabled="true">
+                        <collectionProp name="Asserion.test_strings">
+                            <stringProp name="89649215">^\d+$</stringProp>
+                        </collectionProp>
+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                        <boolProp name="Assertion.assume_success">false</boolProp>
+                        <intProp name="Assertion.test_type">1</intProp>
+                        <stringProp name="Scope.variable">downloadable_link_id</stringProp>
+                        <stringProp name="Assertion.scope">variable</stringProp>
+                    </ResponseAssertion>
+                    <hashTree/>
+                </hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create sample 1" enabled="true">
+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                        <collectionProp name="Arguments.arguments">
+                            <elementProp name="" elementType="HTTPArgument">
+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                                <stringProp name="Argument.value">{&#xD;
+                                    "sample": {&#xD;
+                                    "title": "sample1",&#xD;
+                                    "sort_order": 0,&#xD;
+                                    "sample_type": "file",&#xD;
+                                    "sample_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file2.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "sample_url": "string",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "isGlobalScopeContent": 1&#xD;
+                                    }</stringProp>
+                                <stringProp name="Argument.metadata">=</stringProp>
+                            </elementProp>
+                        </collectionProp>
+                    </elementProp>
+                    <stringProp name="HTTPSampler.domain"/>
+                    <stringProp name="HTTPSampler.port"/>
+                    <stringProp name="HTTPSampler.connect_timeout"/>
+                    <stringProp name="HTTPSampler.response_timeout"/>
+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                    <stringProp name="HTTPSampler.contentEncoding"/>
+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${downloadable_product_sku}/downloadable-links/samples</stringProp>
+                    <stringProp name="HTTPSampler.method">POST</stringProp>
+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
+                    <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable sample id" enabled="true">
+                        <stringProp name="VAR">sample_link_id</stringProp>
+                        <stringProp name="JSONPATH">$</stringProp>
+                        <stringProp name="DEFAULT"/>
+                        <stringProp name="VARIABLE"/>
+                        <stringProp name="SUBJECT">BODY</stringProp>
+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                    <hashTree/>
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert response id not null" enabled="true">
+                        <collectionProp name="Asserion.test_strings">
+                            <stringProp name="89649215">^\d+$</stringProp>
+                        </collectionProp>
+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                        <boolProp name="Assertion.assume_success">false</boolProp>
+                        <intProp name="Assertion.test_type">1</intProp>
+                        <stringProp name="Assertion.scope">variable</stringProp>
+                        <stringProp name="Scope.variable">sample_link_id</stringProp>
+                    </ResponseAssertion>
+                    <hashTree/>
+                </hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create sample 2" enabled="true">
+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                        <collectionProp name="Arguments.arguments">
+                            <elementProp name="" elementType="HTTPArgument">
+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                                <stringProp name="Argument.value">{&#xD;
+                                    "sample": {&#xD;
+                                    "title": "sample2",&#xD;
+                                    "sort_order": 0,&#xD;
+                                    "sample_type": "file",&#xD;
+                                    "sample_file_content": {&#xD;
+                                    "file_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                    "name": "file2.jpeg",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "sample_url": "string",&#xD;
+                                    "extension_attributes": {}&#xD;
+                                    },&#xD;
+                                    "isGlobalScopeContent": 1&#xD;
+                                    }</stringProp>
+                                <stringProp name="Argument.metadata">=</stringProp>
+                            </elementProp>
+                        </collectionProp>
+                    </elementProp>
+                    <stringProp name="HTTPSampler.domain"/>
+                    <stringProp name="HTTPSampler.port"/>
+                    <stringProp name="HTTPSampler.connect_timeout"/>
+                    <stringProp name="HTTPSampler.response_timeout"/>
+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                    <stringProp name="HTTPSampler.contentEncoding"/>
+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${downloadable_product_sku}/downloadable-links/samples</stringProp>
+                    <stringProp name="HTTPSampler.method">POST</stringProp>
+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
+                    <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable sample id" enabled="true">
+                        <stringProp name="VAR">sample_link_id</stringProp>
+                        <stringProp name="JSONPATH">$</stringProp>
+                        <stringProp name="DEFAULT"/>
+                        <stringProp name="VARIABLE"/>
+                        <stringProp name="SUBJECT">BODY</stringProp>
+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                    <hashTree/>
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert response id not null" enabled="true">
+                        <collectionProp name="Asserion.test_strings">
+                            <stringProp name="89649215">^\d+$</stringProp>
+                        </collectionProp>
+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                        <boolProp name="Assertion.assume_success">false</boolProp>
+                        <intProp name="Assertion.test_type">1</intProp>
+                        <stringProp name="Assertion.scope">variable</stringProp>
+                        <stringProp name="Scope.variable">sample_link_id</stringProp>
+                    </ResponseAssertion>
+                    <hashTree/>
+                </hashTree>
+            </hashTree>
+        </hashTree>
+    
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create virtual product with extensible data objects" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{&#xD;
+                            "product": {&#xD;
+                            "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                            "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                            "visibility": "4",&#xD;
+                            "type_id": "virtual",&#xD;
+                            "price": "3.62",&#xD;
+                            "status": "1",&#xD;
+                            "attribute_set_id": "4",&#xD;
+                            "custom_attributes": [&#xD;
+                            {&#xD;
+                            "attribute_code": "cost",&#xD;
+                            "value": ""&#xD;
+                            },&#xD;
+                            {&#xD;
+                            "attribute_code": "description",&#xD;
+                            "value": "Description"&#xD;
+                            }&#xD;
+                            ],&#xD;
+                            "extension_attributes":{&#xD;
+                            "stock_item":{&#xD;
+                            "manage_stock": 1,    &#xD;
+                            "is_in_stock": 1,&#xD;
+                            "qty":"100"&#xD;
+                            }&#xD;
+                            }        ,&#xD;
+                            "media_gallery_entries":&#xD;
+                            [{&#xD;
+                            "id": null,&#xD;
+                            "label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                            "position":1,&#xD;
+                            "disabled":0,&#xD;
+                            "media_type":"image",&#xD;
+                            "types":["image"],&#xD;
+                            "content":{&#xD;
+                            "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                            "type": "image/jpeg",&#xD;
+                            "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                            }&#xD;
+                            }&#xD;
+                            ]&#xD;
+                            }&#xD;
+                            }</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_virtual_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
+                <stringProp name="VAR">virtual_product_id</stringProp>
+                <stringProp name="JSONPATH">$.id</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product sku" enabled="true">
+                <stringProp name="VAR">virtual_product_sku</stringProp>
+                <stringProp name="JSONPATH">$.sku</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract stock item id" enabled="true">
+                <stringProp name="VAR">virtual_stock_item_id</stringProp>
+                <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                <collectionProp name="Asserion.test_strings">
+                    <stringProp name="89649215">^\d+$</stringProp>
+                </collectionProp>
+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                <boolProp name="Assertion.assume_success">false</boolProp>
+                <intProp name="Assertion.test_type">1</intProp>
+                <stringProp name="Assertion.scope">variable</stringProp>
+                <stringProp name="Scope.variable">virtual_product_id</stringProp>
+            </ResponseAssertion>
+            <hashTree/>
+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                <collectionProp name="Asserion.test_strings">
+                    <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+                </collectionProp>
+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                <boolProp name="Assertion.assume_success">false</boolProp>
+                <intProp name="Assertion.test_type">1</intProp>
+                <stringProp name="Assertion.scope">variable</stringProp>
+                <stringProp name="Scope.variable">virtual_product_sku</stringProp>
+            </ResponseAssertion>
+            <hashTree/>
+            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+                <collectionProp name="Asserion.test_strings">
+                    <stringProp name="89649215">^\d+$</stringProp>
+                </collectionProp>
+                <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                <boolProp name="Assertion.assume_success">false</boolProp>
+                <intProp name="Assertion.test_type">1</intProp>
+                <stringProp name="Assertion.scope">variable</stringProp>
+                <stringProp name="Scope.variable">virtual_stock_item_id</stringProp>
+            </ResponseAssertion>
+            <hashTree/>
+        </hashTree>
+    
+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create grouped product" enabled="true">
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_grouped_product_with_extensible_data_objects.jmx</stringProp>
+        </OnceOnlyController>
+        <hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create grouped product with extensible data objects" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "apsku-test-${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Extensible_Product_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "4",&#xD;
+                                "type_id": "grouped",&#xD;
+                                "price": "3.62",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"test_label_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product id" enabled="true">
+                    <stringProp name="VAR">grouped_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract downloadable product sku" enabled="true">
+                    <stringProp name="VAR">grouped_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">grouped_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">grouped_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create Links" enabled="true"/>
+            <hashTree>
+                <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child bundle, configurable, simple, downloadable,  for grouped" enabled="true">
+                    <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                    <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                        <collectionProp name="Arguments.arguments">
+                            <elementProp name="" elementType="HTTPArgument">
+                                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                                <stringProp name="Argument.value">{&#xD;
+                                    "items": [&#xD;
+                                    {&#xD;
+                                    "sku": "${grouped_product_sku}",&#xD;
+                                    "link_type": "associated",&#xD;
+                                    "linked_product_sku": "${bundle_product_sku}",&#xD;
+                                    "linked_product_type": "bundle",&#xD;
+                                    "position": 1,&#xD;
+                                    "extension_attributes": {&#xD;
+                                    "qty": 1&#xD;
+                                    }&#xD;
+                                    },&#xD;
+                                    {&#xD;
+                                    "sku": "${grouped_product_sku}",&#xD;
+                                    "link_type": "associated",&#xD;
+                                    "linked_product_sku": "${configurable_product_sku}",&#xD;
+                                    "linked_product_type": "configurable",&#xD;
+                                    "position": 2,&#xD;
+                                    "extension_attributes": {&#xD;
+                                    "qty": 1&#xD;
+                                    }&#xD;
+                                    },&#xD;
+                                    {&#xD;
+                                    "sku": "${grouped_product_sku}",&#xD;
+                                    "link_type": "associated",&#xD;
+                                    "linked_product_sku": "${simple_product_sku}",&#xD;
+                                    "linked_product_type": "simple",&#xD;
+                                    "position": 3,&#xD;
+                                    "extension_attributes": {&#xD;
+                                    "qty": 1&#xD;
+                                    }&#xD;
+                                    },&#xD;
+                                    {&#xD;
+                                    "sku": "${grouped_product_sku}",&#xD;
+                                    "link_type": "associated",&#xD;
+                                    "linked_product_sku": "${downloadable_product_sku}",&#xD;
+                                    "linked_product_type": "downloadable",&#xD;
+                                    "position": 4,&#xD;
+                                    "extension_attributes": {&#xD;
+                                    "qty": 1&#xD;
+                                    }&#xD;
+                                    }&#xD;
+                                    ]&#xD;
+                                    }&#xD;
+                                </stringProp>
+                                <stringProp name="Argument.metadata">=</stringProp>
+                            </elementProp>
+                        </collectionProp>
+                    </elementProp>
+                    <stringProp name="HTTPSampler.domain"/>
+                    <stringProp name="HTTPSampler.port"/>
+                    <stringProp name="HTTPSampler.connect_timeout"/>
+                    <stringProp name="HTTPSampler.response_timeout"/>
+                    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                    <stringProp name="HTTPSampler.contentEncoding"/>
+                    <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products/${grouped_product_sku}/links</stringProp>
+                    <stringProp name="HTTPSampler.method">POST</stringProp>
+                    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                    <boolProp name="HTTPSampler.monitor">false</boolProp>
+                    <stringProp name="HTTPSampler.embedded_url_re"/>
+                </HTTPSamplerProxy>
+                <hashTree>
+                    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract product id" enabled="true">
+                        <stringProp name="VAR">grouped_product_response</stringProp>
+                        <stringProp name="JSONPATH">$</stringProp>
+                        <stringProp name="DEFAULT"/>
+                        <stringProp name="VARIABLE"/>
+                        <stringProp name="SUBJECT">BODY</stringProp>
+                    </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                    <hashTree/>
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert add true" enabled="true">
+                        <collectionProp name="Asserion.test_strings">
+                            <stringProp name="3569038">true</stringProp>
+                        </collectionProp>
+                        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                        <boolProp name="Assertion.assume_success">false</boolProp>
+                        <intProp name="Assertion.test_type">8</intProp>
+                        <stringProp name="Assertion.scope">variable</stringProp>
+                        <stringProp name="Scope.variable">grouped_product_response</stringProp>
+                    </ResponseAssertion>
+                    <hashTree/>
+                </hashTree>
+            </hashTree>
+        </hashTree>
+    </hashTree>
+  </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Graphql Query Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
         </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/configurable-products/${configurable_product_sku}/child</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="3569038">true</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create children from variation color #2" enabled="true">
-        <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              <stringProp name="Argument.value">{"childSku": "apsku-test-${configurable_product_attribute_color_2}"}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-            </elementProp>
-          </collectionProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
         </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/configurable-products/${configurable_product_sku}/child</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="3569038">true</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">1</intProp>
-        </ResponseAssertion>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query multiple products" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 200\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        description {\n            html\n        }\n        gift_message_available\n        image\n        {\n            url\n            label\n        }\n        meta_description\n        meta_keyword\n        meta_title\n        name\n        new_from_date\n        new_to_date\n        options_container\n        ... on CustomizableProductInterface {\n            options\n            {\n                title\n                required\n                sort_order\n            }\n        }\n        \n        price {\n            minimalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            maximalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            regularPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n        }\n        short_description {\n            html\n        }\n        sku\n        small_image {\n            url\n            label\n        }\n        special_from_date\n        special_price\n        special_to_date\n        swatch_image\n        thumbnail\n        {\n            url\n            label\n        }\n        tier_price\n        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_multiple_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 200" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_multiple_products_query_total_count");
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) &lt; 200) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+        </hashTree>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query simple product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_simple_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+
+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract response" enabled="true">
+            <stringProp name="VAR">graphql_multiple_products_query_response</stringProp>
+            <stringProp name="JSONPATH">$</stringProp>
+            <stringProp name="DEFAULT"/>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
         <hashTree/>
-      </hashTree>
+        <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_simple_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) != 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+        <boolProp name="ISREGEX">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
     </hashTree>
   
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query configurable product" enabled="true">
@@ -36032,7 +40929,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\ntotal_count\n        items {\n            attribute_set_id\n            category_ids\n            category_links\n            {\n                category_id\n                position\n            }\n            cost\n            country_of_manufacture\n            created_at\n            custom_design\n            custom_design_from\n            custom_design_to\n            custom_layout\n            custom_layout_update\n            description\n            gallery\n            gift_message_available\n            has_options\n            id\n            image\n            image_label\n            links_exist\n            links_purchased_separately\n            links_title\n            media_gallery{\n               images\n                {\n                    file\n                }\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            minimal_price\n            msrp\n            msrp_display_actual_price_type\n            name\n            news_from_date\n            news_to_date\n            old_id\n            options_container\n            options\n            {\n                file_extension\n                image_size_x\n                image_size_y\n                is_require\n                max_characters\n                option_id\n                price\n                price_type\n                product_sku\n                sku\n                sort_order\n                title\n                type\n                values\n                {\n                    title\n                    sort_order\n                    price\n                    price_type\n                    sku\n                    option_type_id\n                }\n            }\n            page_layout\n            price\n            price_type\n            price_view\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                qty\n                sku\n            }\n            required_options\n            samples_title\n            shipment_type\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            status\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            visibility\n            website_ids\n            weight\n            weight_type\n            ... on ConfigurableProduct {\n                configurable_product_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    is_use_default\n                    values {\n                        value_index\n                    }\n                    product_id\n                }\n                configurable_product_links {\n                    sku\n                    color\n                    attribute_set_id\n                    category_ids\n                    category_links\n                    {\n                        category_id\n                        position\n                    }\n                    cost\n                    country_of_manufacture\n                    created_at\n                    custom_design\n                    custom_design_from\n                    custom_design_to\n                    custom_layout\n                    custom_layout_update\n                    description\n                    gallery\n                    gift_message_available\n                    has_options\n                    id\n                    image\n                    image_label\n                    links_exist\n                    links_purchased_separately\n                    links_title\n                    media_gallery{\n               images\n                {\n                    file\n                }\n            }\n                    meta_description\n                    meta_keyword\n                    meta_title\n                    media_gallery_entries\n                    {\n                        disabled\n                        file\n                        id\n                        label\n                        media_type\n                        position\n                        types\n                        content\n                        {\n                            base64_encoded_data\n                            type\n                            name\n                        }\n                        video_content\n                        {\n                            media_type\n                            video_description\n                            video_metadata\n                            video_provider\n                            video_title\n                            video_url\n                        }\n                    }\n                    minimal_price\n                    msrp\n                    msrp_display_actual_price_type\n                    name\n                    news_from_date\n                    news_to_date\n                    old_id\n                    options_container\n                    options\n                    {\n                        file_extension\n                        image_size_x\n                        image_size_y\n                        is_require\n                        max_characters\n                        option_id\n                        price\n                        price_type\n                        product_sku\n                        sku\n                        sort_order\n                        title\n                        type\n                        values\n                        {\n                            title\n                            sort_order\n                            price\n                            price_type\n                            sku\n                            option_type_id\n                        }\n                    }\n                    page_layout\n                    price\n                    price_type\n                    price_view\n                    product_links\n                    {\n                        link_type\n                        linked_product_sku\n                        linked_product_type\n                        position\n                        qty\n                        sku\n                    }\n                    required_options\n                    samples_title\n                    shipment_type\n                    short_description\n                    sku\n                    small_image\n                    small_image_label\n                    special_from_date\n                    special_price\n                    special_to_date\n                    status\n                    swatch_image\n                    tax_class_id\n                    thumbnail\n                    thumbnail_label\n                    tier_price\n                    tier_prices\n                    {\n                        customer_group_id\n                        percentage_value\n                        qty\n                        value\n                        website_id\n                    }\n                    type_id\n                    updated_at\n                    url_key\n                    url_path\n                    visibility\n                    website_ids\n                    weight\n                    weight_type\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -36055,7 +40952,7 @@ if (totalCount == null) {
     </HTTPSamplerProxy>
     <hashTree>
       <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_products_query_total_count</stringProp>
+        <stringProp name="VAR">graphql_configurable_products_query_total_count</stringProp>
         <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
         <stringProp name="DEFAULT"/>
         <stringProp name="VARIABLE"/>
@@ -36063,7 +40960,7 @@ if (totalCount == null) {
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
       <hashTree/>
       <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_products_query_total_count");
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_configurable_products_query_total_count");
 
 if (totalCount == null) {
         Failure = true;
@@ -36093,24 +40990,6 @@ if (totalCount == null) {
         <boolProp name="ISREGEX">true</boolProp>
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
       <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert configurable child product sku #1" enabled="true">
-        <stringProp name="JSON_PATH">$.data.products.items[0].configurable_product_links[?(@.sku =~ /apsku-test-${configurable_product_attribute_color_1}/i)].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">["apsku-test-${configurable_product_attribute_color_1}"]</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert configurable child product sku #2" enabled="true">
-        <stringProp name="JSON_PATH">$.data.products.items[0].configurable_product_links[?(@.sku =~ /apsku-test-${configurable_product_attribute_color_2}/i)].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">["apsku-test-${configurable_product_attribute_color_2}"]</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
     </hashTree>
   
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filter" enabled="true">
@@ -36119,7 +40998,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\"\n  filter: {\n         price: {gt: \"10\"} } ) {\ntotal_count\n        items {\n            attribute_set_id\n            category_ids\n            category_links\n            {\n                category_id\n                position\n            }\n            cost\n            country_of_manufacture\n            created_at\n            custom_design\n            custom_design_from\n            custom_design_to\n            custom_layout\n            custom_layout_update\n            description\n            gallery\n            gift_message_available\n            has_options\n            id\n            image\n            image_label\n            links_exist\n            links_purchased_separately\n            links_title\n            media_gallery{\n               images\n                {\n                    file\n                }\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            minimal_price\n            msrp\n            msrp_display_actual_price_type\n            name\n            news_from_date\n            news_to_date\n            old_id\n            options_container\n            options\n            {\n                file_extension\n                image_size_x\n                image_size_y\n                is_require\n                max_characters\n                option_id\n                price\n                price_type\n                product_sku\n                sku\n                sort_order\n                title\n                type\n                values\n                {\n                    title\n                    sort_order\n                    price\n                    price_type\n                    sku\n                    option_type_id\n                }\n            }\n            page_layout\n            price\n            price_type\n            price_view\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                qty\n                sku\n            }\n            required_options\n            samples_title\n            shipment_type\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            status\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            visibility\n            website_ids\n            weight\n            weight_type\n            ... on ConfigurableProduct {\n                configurable_product_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    is_use_default\n                    values {\n                        value_index\n                    }\n                    product_id\n                }\n                configurable_product_links {\n                    sku\n                    color\n                    attribute_set_id\n                    category_ids\n                    category_links\n                    {\n                        category_id\n                        position\n                    }\n                    cost\n                    country_of_manufacture\n                    created_at\n                    custom_design\n                    custom_design_from\n                    custom_design_to\n                    custom_layout\n                    custom_layout_update\n                    description\n                    gallery\n                    gift_message_available\n                    has_options\n                    id\n                    image\n                    image_label\n                    links_exist\n                    links_purchased_separately\n                    links_title\n                    media_gallery{\n               images\n                {\n                    file\n                }\n            }\n                    meta_description\n                    meta_keyword\n                    meta_title\n                    media_gallery_entries\n                    {\n                        disabled\n                        file\n                        id\n                        label\n                        media_type\n                        position\n                        types\n                        content\n                        {\n                            base64_encoded_data\n                            type\n                            name\n                        }\n                        video_content\n                        {\n                            media_type\n                            video_description\n                            video_metadata\n                            video_provider\n                            video_title\n                            video_url\n                        }\n                    }\n                    minimal_price\n                    msrp\n                    msrp_display_actual_price_type\n                    name\n                    news_from_date\n                    news_to_date\n                    old_id\n                    options_container\n                    options\n                    {\n                        file_extension\n                        image_size_x\n                        image_size_y\n                        is_require\n                        max_characters\n                        option_id\n                        price\n                        price_type\n                        product_sku\n                        sku\n                        sort_order\n                        title\n                        type\n                        values\n                        {\n                            title\n                            sort_order\n                            price\n                            price_type\n                            sku\n                            option_type_id\n                        }\n                    }\n                    page_layout\n                    price\n                    price_type\n                    price_view\n                    product_links\n                    {\n                        link_type\n                        linked_product_sku\n                        linked_product_type\n                        position\n                        qty\n                        sku\n                    }\n                    required_options\n                    samples_title\n                    shipment_type\n                    short_description\n                    sku\n                    small_image\n                    small_image_label\n                    special_from_date\n                    special_price\n                    special_to_date\n                    status\n                    swatch_image\n                    tax_class_id\n                    thumbnail\n                    thumbnail_label\n                    tier_price\n                    tier_prices\n                    {\n                        customer_group_id\n                        percentage_value\n                        qty\n                        value\n                        website_id\n                    }\n                    type_id\n                    updated_at\n                    url_key\n                    url_path\n                    visibility\n                    website_ids\n                    weight\n                    weight_type\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n        search: \"configurable\"\n        filter: {price: {gteq: \"1\"} }\n    ) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -36179,7 +41058,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\") {\ntotal_count\n        items {\n            attribute_set_id\n            category_ids\n            category_links\n            {\n                category_id\n                position\n            }\n            cost\n            country_of_manufacture\n            created_at\n            custom_design\n            custom_design_from\n            custom_design_to\n            custom_layout\n            custom_layout_update\n            description\n            gallery\n            gift_message_available\n            has_options\n            id\n            image\n            image_label\n            links_exist\n            links_purchased_separately\n            links_title\n            media_gallery{\n               images\n                {\n                    file\n                }\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            minimal_price\n            msrp\n            msrp_display_actual_price_type\n            name\n            news_from_date\n            news_to_date\n            old_id\n            options_container\n            options\n            {\n                file_extension\n                image_size_x\n                image_size_y\n                is_require\n                max_characters\n                option_id\n                price\n                price_type\n                product_sku\n                sku\n                sort_order\n                title\n                type\n                values\n                {\n                    title\n                    sort_order\n                    price\n                    price_type\n                    sku\n                    option_type_id\n                }\n            }\n            page_layout\n            price\n            price_type\n            price_view\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                qty\n                sku\n            }\n            required_options\n            samples_title\n            shipment_type\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            status\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            visibility\n            website_ids\n            weight\n            weight_type\n            ... on ConfigurableProduct {\n                configurable_product_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    is_use_default\n                    values {\n                        value_index\n                    }\n                    product_id\n                }\n                configurable_product_links {\n                    sku\n                    color\n                    attribute_set_id\n                    category_ids\n                    category_links\n                    {\n                        category_id\n                        position\n                    }\n                    cost\n                    country_of_manufacture\n                    created_at\n                    custom_design\n                    custom_design_from\n                    custom_design_to\n                    custom_layout\n                    custom_layout_update\n                    description\n                    gallery\n                    gift_message_available\n                    has_options\n                    id\n                    image\n                    image_label\n                    links_exist\n                    links_purchased_separately\n                    links_title\n                    media_gallery{\n               images\n                {\n                    file\n                }\n            }\n                    meta_description\n                    meta_keyword\n                    meta_title\n                    media_gallery_entries\n                    {\n                        disabled\n                        file\n                        id\n                        label\n                        media_type\n                        position\n                        types\n                        content\n                        {\n                            base64_encoded_data\n                            type\n                            name\n                        }\n                        video_content\n                        {\n                            media_type\n                            video_description\n                            video_metadata\n                            video_provider\n                            video_title\n                            video_url\n                        }\n                    }\n                    minimal_price\n                    msrp\n                    msrp_display_actual_price_type\n                    name\n                    news_from_date\n                    news_to_date\n                    old_id\n                    options_container\n                    options\n                    {\n                        file_extension\n                        image_size_x\n                        image_size_y\n                        is_require\n                        max_characters\n                        option_id\n                        price\n                        price_type\n                        product_sku\n                        sku\n                        sort_order\n                        title\n                        type\n                        values\n                        {\n                            title\n                            sort_order\n                            price\n                            price_type\n                            sku\n                            option_type_id\n                        }\n                    }\n                    page_layout\n                    price\n                    price_type\n                    price_view\n                    product_links\n                    {\n                        link_type\n                        linked_product_sku\n                        linked_product_type\n                        position\n                        qty\n                        sku\n                    }\n                    required_options\n                    samples_title\n                    shipment_type\n                    short_description\n                    sku\n                    small_image\n                    small_image_label\n                    special_from_date\n                    special_price\n                    special_to_date\n                    status\n                    swatch_image\n                    tax_class_id\n                    thumbnail\n                    thumbnail_label\n                    tier_price\n                    tier_prices\n                    {\n                        customer_group_id\n                        percentage_value\n                        qty\n                        value\n                        website_id\n                    }\n                    type_id\n                    updated_at\n                    url_key\n                    url_path\n                    visibility\n                    website_ids\n                    weight\n                    weight_type\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\") {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -36233,6 +41112,358 @@ if (totalCount == null) {
       <hashTree/>
     </hashTree>
   
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filters" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(search: \"Option 1\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) &lt; 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+
+
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+    </hashTree>
+  
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n               url\n               label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                    }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_bundle_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_bundle_products_query_total_count");
+
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) != 1) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+
+
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert bundle product sku" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+                <stringProp name="EXPECTED_VALUE">${bundle_product_sku}</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">false</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+        </hashTree>
+    
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query downloadable product" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_downloadable_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_downloadable_products_query_total_count");
+
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) != 1) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+
+
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert downloadable product sku" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+                <stringProp name="EXPECTED_VALUE">${downloadable_product_sku}</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">true</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert link samples titles" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
+                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">false</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert sample titles" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
+                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">false</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+        </hashTree>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query virtual product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_virtual_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_virtual_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) != 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${virtual_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+        <boolProp name="ISREGEX">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query grouped product" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_grouped_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_grouped_products_query_total_count");
+
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) != 1) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+
+
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert grouped product sku" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+                <stringProp name="EXPECTED_VALUE">${grouped_product_sku}</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">true</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+        </hashTree>
+    
         <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Query Customer" enabled="true"/>
         <hashTree>
             <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
@@ -36421,7 +41652,65 @@ if (totalCount == null) {
                 <hashTree/>
             </hashTree>
         </hashTree>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query Category" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  category(id: 1) {\n      name\n      id\n      level\n      description\n      path\n      path_in_store\n      url_key\n      url_path\n      children {\n        id\n        description\n        default_sort_by\n        children {\n          id\n          description\n          level\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_root_category.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_category_query_name</stringProp>
+        <stringProp name="JSONPATH">$.data.category.name</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String name = vars.get("graphql_category_query_name");
+if (name == null) {
+	Failure = true;
+	FailureMessage = "Not Expected \"children\" to be null";
+} else {
+	if (!name.equals("Root Catalog")) {
+		Failure = true;
+		FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
     </hashTree>
+  </hashTree>
+  </hashTree>
 
   </hashTree>
 
@@ -36481,8 +41770,8 @@ if (totalCount == null) {
           </elementProp>
           <stringProp name="HTTPSampler.domain"/>
           <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout"/>
-          <stringProp name="HTTPSampler.response_timeout"/>
+          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
           <stringProp name="HTTPSampler.path">${base_path}DeploymentEvent.php</stringProp>
diff --git a/setup/performance-toolkit/benchmark_2015.jmx b/setup/performance-toolkit/benchmark_2015.jmx
index 8be7749a08bc4..e58e610304199 100644
--- a/setup/performance-toolkit/benchmark_2015.jmx
+++ b/setup/performance-toolkit/benchmark_2015.jmx
@@ -2981,12 +2981,12 @@ vars.put("loadType", "Guest");</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
@@ -3217,12 +3217,12 @@ vars.put("loadType", "Guest");</stringProp>
             <stringProp name="Argument.name">sections</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
@@ -3565,12 +3565,12 @@ vars.put("loadType", "Guest");</stringProp>
             <stringProp name="Argument.name">sections</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
@@ -4039,12 +4039,12 @@ vars.put("loadType", "Guest");</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
@@ -4275,12 +4275,12 @@ vars.put("loadType", "Guest");</stringProp>
             <stringProp name="Argument.name">sections</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
@@ -4623,12 +4623,12 @@ vars.put("loadType", "Guest");</stringProp>
             <stringProp name="Argument.name">sections</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
@@ -5637,12 +5637,12 @@ vars.put("loadType", "Customer");</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
             <stringProp name="Argument.name">sections</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
@@ -5873,12 +5873,12 @@ vars.put("loadType", "Customer");</stringProp>
             <stringProp name="Argument.name">sections</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
@@ -6221,12 +6221,12 @@ vars.put("loadType", "Customer");</stringProp>
             <stringProp name="Argument.name">sections</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
-          <elementProp name="update_section_id" elementType="HTTPArgument">
+          <elementProp name="force_new_section_timestamp" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">true</boolProp>
             <stringProp name="Argument.value">true</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
             <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">update_section_id</stringProp>
+            <stringProp name="Argument.name">force_new_section_timestamp</stringProp>
             <stringProp name="Argument.desc">true</stringProp>
           </elementProp>
           <elementProp name="_" elementType="HTTPArgument">
diff --git a/setup/performance-toolkit/config/description.xml b/setup/performance-toolkit/config/description.xml
index ae7e1e343b1da..06fa6a2618f68 100644
--- a/setup/performance-toolkit/config/description.xml
+++ b/setup/performance-toolkit/config/description.xml
@@ -7,16 +7,16 @@
 -->
 <description>
     <paragraphs>
-        <count-min>4</count-min>
-        <count-max>10</count-max>
+        <count-min>7</count-min>
+        <count-max>7</count-max>
 
         <sentences>
-            <count-min>10</count-min>
-            <count-max>15</count-max>
+            <count-min>12</count-min>
+            <count-max>12</count-max>
 
             <words>
-                <count-min>5</count-min>
-                <count-max>7</count-max>
+                <count-min>6</count-min>
+                <count-max>6</count-max>
             </words>
         </sentences>
     </paragraphs>
diff --git a/setup/performance-toolkit/profiles/ce/extra_large.xml b/setup/performance-toolkit/profiles/ce/extra_large.xml
index 44b3512090b12..390bf7fb12003 100644
--- a/setup/performance-toolkit/profiles/ce/extra_large.xml
+++ b/setup/performance-toolkit/profiles/ce/extra_large.xml
@@ -40,9 +40,9 @@
         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
         <cart_price_rules_floor>2</cart_price_rules_floor>
 
-        <product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
-        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
+        <product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
+        <product_attribute_sets_attributes>30</product_attribute_sets_attributes> <!-- Number of attributes per set -->
+        <product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
 
         <order_quotes_enable>true</order_quotes_enable>
         <order_simple_product_count_from>2</order_simple_product_count_from>
diff --git a/setup/performance-toolkit/profiles/ce/large.xml b/setup/performance-toolkit/profiles/ce/large.xml
index 606c854d27adc..ed91b22930af5 100644
--- a/setup/performance-toolkit/profiles/ce/large.xml
+++ b/setup/performance-toolkit/profiles/ce/large.xml
@@ -40,9 +40,9 @@
         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
         <cart_price_rules_floor>2</cart_price_rules_floor>
 
-        <product_attribute_sets>200</product_attribute_sets> <!-- Number of product attribute sets -->
-        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
+        <product_attribute_sets>50</product_attribute_sets> <!-- Number of product attribute sets -->
+        <product_attribute_sets_attributes>20</product_attribute_sets_attributes> <!-- Number of attributes per set -->
+        <product_attribute_sets_attributes_values>15</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
 
         <order_quotes_enable>true</order_quotes_enable>
         <order_simple_product_count_from>2</order_simple_product_count_from>
diff --git a/setup/performance-toolkit/profiles/ce/medium.xml b/setup/performance-toolkit/profiles/ce/medium.xml
index 4f735ae4ac2d4..f01eabb7898f3 100644
--- a/setup/performance-toolkit/profiles/ce/medium.xml
+++ b/setup/performance-toolkit/profiles/ce/medium.xml
@@ -40,9 +40,9 @@
         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
         <cart_price_rules_floor>2</cart_price_rules_floor>
 
-        <product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
-        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
+        <product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
+        <product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
+        <product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
 
         <order_quotes_enable>true</order_quotes_enable>
         <order_simple_product_count_from>2</order_simple_product_count_from>
diff --git a/setup/performance-toolkit/profiles/ce/medium_msite.xml b/setup/performance-toolkit/profiles/ce/medium_msite.xml
index 24d51d170fbc2..a57fcad0779fe 100644
--- a/setup/performance-toolkit/profiles/ce/medium_msite.xml
+++ b/setup/performance-toolkit/profiles/ce/medium_msite.xml
@@ -46,9 +46,9 @@
         <cart_price_rules>20</cart_price_rules> <!-- Number of cart price rules -->
         <cart_price_rules_floor>2</cart_price_rules_floor>
 
-        <product_attribute_sets>100</product_attribute_sets> <!-- Number of product attribute sets -->
-        <product_attribute_sets_attributes>50</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
+        <product_attribute_sets>30</product_attribute_sets> <!-- Number of product attribute sets -->
+        <product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
+        <product_attribute_sets_attributes_values>8</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
 
         <order_quotes_enable>true</order_quotes_enable>
         <order_simple_product_count_from>2</order_simple_product_count_from>
diff --git a/setup/performance-toolkit/profiles/ce/small.xml b/setup/performance-toolkit/profiles/ce/small.xml
index 270828c2a2c9d..60ae901d8f5e0 100644
--- a/setup/performance-toolkit/profiles/ce/small.xml
+++ b/setup/performance-toolkit/profiles/ce/small.xml
@@ -41,8 +41,8 @@
         <cart_price_rules_floor>2</cart_price_rules_floor>
 
         <product_attribute_sets>10</product_attribute_sets> <!-- Number of product attribute sets -->
-        <product_attribute_sets_attributes>10</product_attribute_sets_attributes> <!-- Number of attributes per set -->
-        <product_attribute_sets_attributes_values>2</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
+        <product_attribute_sets_attributes>5</product_attribute_sets_attributes> <!-- Number of attributes per set -->
+        <product_attribute_sets_attributes_values>5</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
 
         <order_quotes_enable>true</order_quotes_enable>
         <order_simple_product_count_from>2</order_simple_product_count_from>
diff --git a/setup/pub/angular-ng-storage/angular-ng-storage.min.js b/setup/pub/angular-ng-storage/angular-ng-storage.min.js
index f5526bbace8ef..54891ebb4087f 100644
--- a/setup/pub/angular-ng-storage/angular-ng-storage.min.js
+++ b/setup/pub/angular-ng-storage/angular-ng-storage.min.js
@@ -1 +1 @@
-/*! ngStorage 0.3.0 | Copyright (c) 2013 Gias Kay Lee | MIT License */"use strict";!function(){function a(a){return["$rootScope","$window",function(b,c){for(var d,e,f,g=c[a]||(console.warn("This browser does not support Web Storage!"),{}),h={$default:function(a){for(var b in a)angular.isDefined(h[b])||(h[b]=a[b]);return h},$reset:function(a){for(var b in h)"$"===b[0]||delete h[b];return h.$default(a)}},i=0;i<g.length;i++)(f=g.key(i))&&"ngStorage-"===f.slice(0,10)&&(h[f.slice(10)]=angular.fromJson(g.getItem(f)));return d=angular.copy(h),b.$watch(function(){e||(e=setTimeout(function(){if(e=null,!angular.equals(h,d)){angular.forEach(h,function(a,b){angular.isDefined(a)&&"$"!==b[0]&&g.setItem("ngStorage-"+b,angular.toJson(a)),delete d[b]});for(var a in d)g.removeItem("ngStorage-"+a);d=angular.copy(h)}},100))}),"localStorage"===a&&c.addEventListener&&c.addEventListener("storage",function(a){"ngStorage-"===a.key.slice(0,10)&&(a.newValue?h[a.key.slice(10)]=angular.fromJson(a.newValue):delete h[a.key.slice(10)],d=angular.copy(h),b.$apply())}),h}]}angular.module("ngStorage",[]).factory("$localStorage",a("localStorage")).factory("$sessionStorage",a("sessionStorage"))}();
\ No newline at end of file
+/*! ngstorage 0.3.10 | Copyright (c) 2016 Gias Kay Lee | MIT License */!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["angular"],b):a.hasOwnProperty("angular")?b(a.angular):"object"==typeof exports&&(module.exports=b(require("angular")))}(this,function(a){"use strict";function b(a,b){var c;try{c=a[b]}catch(d){c=!1}if(c){var e="__"+Math.round(1e7*Math.random());try{a[b].setItem(e,e),a[b].removeItem(e,e)}catch(d){c=!1}}return c}function c(c){var d=b(window,c);return function(){var e="ngStorage-";this.setKeyPrefix=function(a){if("string"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setKeyPrefix() expects a String.");e=a};var f=a.toJson,g=a.fromJson;this.setSerializer=function(a){if("function"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setSerializer expects a function.");f=a},this.setDeserializer=function(a){if("function"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setDeserializer expects a function.");g=a},this.supported=function(){return!!d},this.get=function(a){return d&&g(d.getItem(e+a))},this.set=function(a,b){return d&&d.setItem(e+a,f(b))},this.remove=function(a){d&&d.removeItem(e+a)},this.$get=["$rootScope","$window","$log","$timeout","$document",function(d,h,i,j,k){var l,m,n=e.length,o=b(h,c),p=o||(i.warn("This browser does not support Web Storage!"),{setItem:a.noop,getItem:a.noop,removeItem:a.noop}),q={$default:function(b){for(var c in b)a.isDefined(q[c])||(q[c]=a.copy(b[c]));return q.$sync(),q},$reset:function(a){for(var b in q)"$"===b[0]||delete q[b]&&p.removeItem(e+b);return q.$default(a)},$sync:function(){for(var a,b=0,c=p.length;c>b;b++)(a=p.key(b))&&e===a.slice(0,n)&&(q[a.slice(n)]=g(p.getItem(a)))},$apply:function(){var b;if(m=null,!a.equals(q,l)){b=a.copy(l),a.forEach(q,function(c,d){a.isDefined(c)&&"$"!==d[0]&&(p.setItem(e+d,f(c)),delete b[d])});for(var c in b)p.removeItem(e+c);l=a.copy(q)}},$supported:function(){return!!o}};return q.$sync(),l=a.copy(q),d.$watch(function(){m||(m=j(q.$apply,100,!1))}),h.addEventListener&&h.addEventListener("storage",function(b){if(b.key){var c=k[0];c.hasFocus&&c.hasFocus()||e!==b.key.slice(0,n)||(b.newValue?q[b.key.slice(n)]=g(b.newValue):delete q[b.key.slice(n)],l=a.copy(q),d.$apply())}}),h.addEventListener&&h.addEventListener("beforeunload",function(){q.$apply()}),q}]}}return a=a&&a.module?a:window.angular,a.module("ngStorage",[]).provider("$localStorage",c("localStorage")).provider("$sessionStorage",c("sessionStorage"))});
\ No newline at end of file
diff --git a/setup/pub/angular-sanitize/angular-sanitize.js b/setup/pub/angular-sanitize/angular-sanitize.js
index b7ec2820dd7fe..8faa84315009f 100644
--- a/setup/pub/angular-sanitize/angular-sanitize.js
+++ b/setup/pub/angular-sanitize/angular-sanitize.js
@@ -1,76 +1,79 @@
 /**
- * @license AngularJS v1.2.14
- * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.6.9
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular, undefined) {'use strict';
+(function(window, angular) {'use strict';
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+     *     Any commits to this file should be reviewed with security in mind.  *
+     *   Changes to this file can potentially create security vulnerabilities. *
+     *          An approval from 2 Core members with history of modifying      *
+     *                         this file is required.                          *
+     *                                                                         *
+     *  Does the change somehow allow for arbitrary javascript to be executed? *
+     *    Or allows for someone to change the prototype of built-in objects?   *
+     *     Or gives undesired access to variables likes document or window?    *
+     * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
     var $sanitizeMinErr = angular.$$minErr('$sanitize');
+    var bind;
+    var extend;
+    var forEach;
+    var isDefined;
+    var lowercase;
+    var noop;
+    var nodeContains;
+    var htmlParser;
+    var htmlSanitizeWriter;
 
     /**
      * @ngdoc module
      * @name ngSanitize
      * @description
      *
-     * # ngSanitize
-     *
      * The `ngSanitize` module provides functionality to sanitize HTML.
      *
-     *
-     * <div doc-module-components="ngSanitize"></div>
-     *
      * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
      */
 
-    /*
-     * HTML Parser By Misko Hevery (misko@hevery.com)
-     * based on:  HTML Parser By John Resig (ejohn.org)
-     * Original code by Erik Arvidsson, Mozilla Public License
-     * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
-     *
-     * // Use like so:
-     * htmlParser(htmlString, {
-     *     start: function(tag, attrs, unary) {},
-     *     end: function(tag) {},
-     *     chars: function(text) {},
-     *     comment: function(text) {}
-     * });
-     *
-     */
-
-
     /**
      * @ngdoc service
      * @name $sanitize
-     * @function
+     * @kind function
      *
      * @description
-     *   The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are
+     *   Sanitizes an html string by stripping all potentially dangerous tokens.
+     *
+     *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a whitelist) are
      *   then serialized back to properly escaped html string. This means that no unsafe input can make
-     *   it into the returned string, however, since our parser is more strict than a typical browser
-     *   parser, it's possible that some obscure input, which would be recognized as valid HTML by a
-     *   browser, won't make it through the sanitizer.
-     *   The whitelist is configured using the functions `aHrefSanitizationWhitelist` and
-     *   `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider `$compileProvider`}.
+     *   it into the returned string.
      *
-     * @param {string} html Html input.
-     * @returns {string} Sanitized html.
+     *   The whitelist for URL sanitization of attribute values is configured using the functions
+     *   `aHrefSanitizationWhitelist` and `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider
+ *   `$compileProvider`}.
+     *
+     *   The input may also contain SVG markup if this is enabled via {@link $sanitizeProvider}.
+     *
+     * @param {string} html HTML input.
+     * @returns {string} Sanitized HTML.
      *
      * @example
-     <example module="ngSanitize" deps="angular-sanitize.js">
+     <example module="sanitizeExample" deps="angular-sanitize.js" name="sanitize-service">
      <file name="index.html">
      <script>
-     function Ctrl($scope, $sce) {
-         $scope.snippet =
-           '<p style="color:blue">an html\n' +
-           '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
-           'snippet</p>';
-         $scope.deliberatelyTrustDangerousSnippet = function() {
-           return $sce.trustAsHtml($scope.snippet);
-         };
-       }
+     angular.module('sanitizeExample', ['ngSanitize'])
+     .controller('ExampleController', ['$scope', '$sce', function($scope, $sce) {
+             $scope.snippet =
+               '<p style="color:blue">an html\n' +
+               '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
+               'snippet</p>';
+             $scope.deliberatelyTrustDangerousSnippet = function() {
+               return $sce.trustAsHtml($scope.snippet);
+             };
+           }]);
      </script>
-     <div ng-controller="Ctrl">
+     <div ng-controller="ExampleController">
      Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
      <table>
      <tr>
@@ -105,410 +108,538 @@
      </file>
      <file name="protractor.js" type="protractor">
      it('should sanitize the html snippet by default', function() {
-       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
          toBe('<p>an html\n<em>click here</em>\nsnippet</p>');
      });
+
      it('should inline raw snippet if bound to a trusted value', function() {
-       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).
+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).
          toBe("<p style=\"color:blue\">an html\n" +
               "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" +
               "snippet</p>");
      });
+
      it('should escape snippet without any filter', function() {
-       expect(element(by.css('#bind-default div')).getInnerHtml()).
+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).
          toBe("&lt;p style=\"color:blue\"&gt;an html\n" +
               "&lt;em onmouseover=\"this.textContent='PWN3D!'\"&gt;click here&lt;/em&gt;\n" +
               "snippet&lt;/p&gt;");
      });
+
      it('should update', function() {
        element(by.model('snippet')).clear();
        element(by.model('snippet')).sendKeys('new <b onclick="alert(1)">text</b>');
-       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
          toBe('new <b>text</b>');
-       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).toBe(
+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).toBe(
          'new <b onclick="alert(1)">text</b>');
-       expect(element(by.css('#bind-default div')).getInnerHtml()).toBe(
+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).toBe(
          "new &lt;b onclick=\"alert(1)\"&gt;text&lt;/b&gt;");
      });
      </file>
      </example>
      */
+
+
+    /**
+     * @ngdoc provider
+     * @name $sanitizeProvider
+     * @this
+     *
+     * @description
+     * Creates and configures {@link $sanitize} instance.
+     */
     function $SanitizeProvider() {
+        var svgEnabled = false;
+
         this.$get = ['$$sanitizeUri', function($$sanitizeUri) {
+            if (svgEnabled) {
+                extend(validElements, svgElements);
+            }
             return function(html) {
                 var buf = [];
                 htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) {
-                    return !/^unsafe/.test($$sanitizeUri(uri, isImage));
+                    return !/^unsafe:/.test($$sanitizeUri(uri, isImage));
                 }));
                 return buf.join('');
             };
         }];
-    }
 
-    function sanitizeText(chars) {
-        var buf = [];
-        var writer = htmlSanitizeWriter(buf, angular.noop);
-        writer.chars(chars);
-        return buf.join('');
-    }
-
-
-// Regular Expressions for parsing tags and attributes
-    var START_TAG_REGEXP =
-            /^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,
-        END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/,
-        ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,
-        BEGIN_TAG_REGEXP = /^</,
-        BEGING_END_TAGE_REGEXP = /^<\s*\//,
-        COMMENT_REGEXP = /<!--(.*?)-->/g,
-        DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i,
-        CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g,
-        // Match everything outside of normal chars and " (quote character)
-        NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g;
-
-
-// Good source of info about elements and attributes
-// http://dev.w3.org/html5/spec/Overview.html#semantics
-// http://simon.html5.org/html-elements
-
-// Safe Void Elements - HTML5
-// http://dev.w3.org/html5/spec/Overview.html#void-elements
-    var voidElements = makeMap("area,br,col,hr,img,wbr");
-
-// Elements that you can, intentionally, leave open (and which close themselves)
-// http://dev.w3.org/html5/spec/Overview.html#optional-tags
-    var optionalEndTagBlockElements = makeMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),
-        optionalEndTagInlineElements = makeMap("rp,rt"),
-        optionalEndTagElements = angular.extend({},
-            optionalEndTagInlineElements,
-            optionalEndTagBlockElements);
-
-// Safe Block Elements - HTML5
-    var blockElements = angular.extend({}, optionalEndTagBlockElements, makeMap("address,article," +
-        "aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," +
-        "h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul"));
-
-// Inline Elements - HTML5
-    var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a,abbr,acronym,b," +
-        "bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," +
-        "samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
-
-
-// Special Elements (can contain anything)
-    var specialElements = makeMap("script,style");
-
-    var validElements = angular.extend({},
-        voidElements,
-        blockElements,
-        inlineElements,
-        optionalEndTagElements);
-
-//Attributes that have href and hence need to be sanitized
-    var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap");
-    var validAttrs = angular.extend({}, uriAttrs, makeMap(
-        'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,'+
-        'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,'+
-        'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,'+
-        'scope,scrolling,shape,size,span,start,summary,target,title,type,'+
-        'valign,value,vspace,width'));
-
-    function makeMap(str) {
-        var obj = {}, items = str.split(','), i;
-        for (i = 0; i < items.length; i++) obj[items[i]] = true;
-        return obj;
-    }
 
+        /**
+         * @ngdoc method
+         * @name $sanitizeProvider#enableSvg
+         * @kind function
+         *
+         * @description
+         * Enables a subset of svg to be supported by the sanitizer.
+         *
+         * <div class="alert alert-warning">
+         *   <p>By enabling this setting without taking other precautions, you might expose your
+         *   application to click-hijacking attacks. In these attacks, sanitized svg elements could be positioned
+         *   outside of the containing element and be rendered over other elements on the page (e.g. a login
+         *   link). Such behavior can then result in phishing incidents.</p>
+         *
+         *   <p>To protect against these, explicitly setup `overflow: hidden` css rule for all potential svg
+         *   tags within the sanitized content:</p>
+         *
+         *   <br>
+         *
+         *   <pre><code>
+         *   .rootOfTheIncludedContent svg {
+         *     overflow: hidden !important;
+         *   }
+         *   </code></pre>
+         * </div>
+         *
+         * @param {boolean=} flag Enable or disable SVG support in the sanitizer.
+         * @returns {boolean|ng.$sanitizeProvider} Returns the currently configured value if called
+         *    without an argument or self for chaining otherwise.
+         */
+        this.enableSvg = function(enableSvg) {
+            if (isDefined(enableSvg)) {
+                svgEnabled = enableSvg;
+                return this;
+            } else {
+                return svgEnabled;
+            }
+        };
 
-    /**
-     * @example
-     * htmlParser(htmlString, {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * });
-     *
-     * @param {string} html string
-     * @param {object} handler
-     */
-    function htmlParser( html, handler ) {
-        var index, chars, match, stack = [], last = html;
-        stack.last = function() { return stack[ stack.length - 1 ]; };
-
-        while ( html ) {
-            chars = true;
+        //////////////////////////////////////////////////////////////////////////////////////////////////
+        // Private stuff
+        //////////////////////////////////////////////////////////////////////////////////////////////////
 
-            // Make sure we're not in a script or style element
-            if ( !stack.last() || !specialElements[ stack.last() ] ) {
+        bind = angular.bind;
+        extend = angular.extend;
+        forEach = angular.forEach;
+        isDefined = angular.isDefined;
+        lowercase = angular.lowercase;
+        noop = angular.noop;
 
-                // Comment
-                if ( html.indexOf("<!--") === 0 ) {
-                    // comments containing -- are not allowed unless they terminate the comment
-                    index = html.indexOf("--", 4);
+        htmlParser = htmlParserImpl;
+        htmlSanitizeWriter = htmlSanitizeWriterImpl;
 
-                    if ( index >= 0 && html.lastIndexOf("-->", index) === index) {
-                        if (handler.comment) handler.comment( html.substring( 4, index ) );
-                        html = html.substring( index + 3 );
-                        chars = false;
-                    }
-                    // DOCTYPE
-                } else if ( DOCTYPE_REGEXP.test(html) ) {
-                    match = html.match( DOCTYPE_REGEXP );
+        nodeContains = window.Node.prototype.contains || /** @this */ function(arg) {
+            // eslint-disable-next-line no-bitwise
+            return !!(this.compareDocumentPosition(arg) & 16);
+        };
 
-                    if ( match ) {
-                        html = html.replace( match[0] , '');
-                        chars = false;
-                    }
-                    // end tag
-                } else if ( BEGING_END_TAGE_REGEXP.test(html) ) {
-                    match = html.match( END_TAG_REGEXP );
-
-                    if ( match ) {
-                        html = html.substring( match[0].length );
-                        match[0].replace( END_TAG_REGEXP, parseEndTag );
-                        chars = false;
-                    }
+        // Regular Expressions for parsing tags and attributes
+        var SURROGATE_PAIR_REGEXP = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+            // Match everything outside of normal chars and " (quote character)
+            NON_ALPHANUMERIC_REGEXP = /([^#-~ |!])/g;
+
+
+        // Good source of info about elements and attributes
+        // http://dev.w3.org/html5/spec/Overview.html#semantics
+        // http://simon.html5.org/html-elements
+
+        // Safe Void Elements - HTML5
+        // http://dev.w3.org/html5/spec/Overview.html#void-elements
+        var voidElements = toMap('area,br,col,hr,img,wbr');
+
+        // Elements that you can, intentionally, leave open (and which close themselves)
+        // http://dev.w3.org/html5/spec/Overview.html#optional-tags
+        var optionalEndTagBlockElements = toMap('colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr'),
+            optionalEndTagInlineElements = toMap('rp,rt'),
+            optionalEndTagElements = extend({},
+                optionalEndTagInlineElements,
+                optionalEndTagBlockElements);
+
+        // Safe Block Elements - HTML5
+        var blockElements = extend({}, optionalEndTagBlockElements, toMap('address,article,' +
+            'aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,' +
+            'h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul'));
+
+        // Inline Elements - HTML5
+        var inlineElements = extend({}, optionalEndTagInlineElements, toMap('a,abbr,acronym,b,' +
+            'bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,' +
+            'samp,small,span,strike,strong,sub,sup,time,tt,u,var'));
+
+        // SVG Elements
+        // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Elements
+        // Note: the elements animate,animateColor,animateMotion,animateTransform,set are intentionally omitted.
+        // They can potentially allow for arbitrary javascript to be executed. See #11290
+        var svgElements = toMap('circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,' +
+            'hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,' +
+            'radialGradient,rect,stop,svg,switch,text,title,tspan');
+
+        // Blocked Elements (will be stripped)
+        var blockedElements = toMap('script,style');
+
+        var validElements = extend({},
+            voidElements,
+            blockElements,
+            inlineElements,
+            optionalEndTagElements);
+
+        //Attributes that have href and hence need to be sanitized
+        var uriAttrs = toMap('background,cite,href,longdesc,src,xlink:href,xml:base');
+
+        var htmlAttrs = toMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
+            'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
+            'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
+            'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
+            'valign,value,vspace,width');
+
+        // SVG attributes (without "id" and "name" attributes)
+        // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Attributes
+        var svgAttrs = toMap('accent-height,accumulate,additive,alphabetic,arabic-form,ascent,' +
+            'baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,' +
+            'cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,' +
+            'font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,' +
+            'height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,' +
+            'marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,' +
+            'max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,' +
+            'path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,' +
+            'requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,' +
+            'stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,' +
+            'stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,' +
+            'stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,' +
+            'underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,' +
+            'width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,' +
+            'xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan', true);
+
+        var validAttrs = extend({},
+            uriAttrs,
+            svgAttrs,
+            htmlAttrs);
+
+        function toMap(str, lowercaseKeys) {
+            var obj = {}, items = str.split(','), i;
+            for (i = 0; i < items.length; i++) {
+                obj[lowercaseKeys ? lowercase(items[i]) : items[i]] = true;
+            }
+            return obj;
+        }
 
-                    // start tag
-                } else if ( BEGIN_TAG_REGEXP.test(html) ) {
-                    match = html.match( START_TAG_REGEXP );
+        /**
+         * Create an inert document that contains the dirty HTML that needs sanitizing
+         * Depending upon browser support we use one of three strategies for doing this.
+         * Support: Safari 10.x -> XHR strategy
+         * Support: Firefox -> DomParser strategy
+         */
+        var getInertBodyElement /* function(html: string): HTMLBodyElement */ = (function(window, document) {
+            var inertDocument;
+            if (document && document.implementation) {
+                inertDocument = document.implementation.createHTMLDocument('inert');
+            } else {
+                throw $sanitizeMinErr('noinert', 'Can\'t create an inert html document');
+            }
+            var inertBodyElement = (inertDocument.documentElement || inertDocument.getDocumentElement()).querySelector('body');
 
-                    if ( match ) {
-                        html = html.substring( match[0].length );
-                        match[0].replace( START_TAG_REGEXP, parseStartTag );
-                        chars = false;
-                    }
+            // Check for the Safari 10.1 bug - which allows JS to run inside the SVG G element
+            inertBodyElement.innerHTML = '<svg><g onload="this.parentNode.remove()"></g></svg>';
+            if (!inertBodyElement.querySelector('svg')) {
+                return getInertBodyElement_XHR;
+            } else {
+                // Check for the Firefox bug - which prevents the inner img JS from being sanitized
+                inertBodyElement.innerHTML = '<svg><p><style><img src="</style><img src=x onerror=alert(1)//">';
+                if (inertBodyElement.querySelector('svg img')) {
+                    return getInertBodyElement_DOMParser;
+                } else {
+                    return getInertBodyElement_InertDocument;
                 }
+            }
 
-                if ( chars ) {
-                    index = html.indexOf("<");
-
-                    var text = index < 0 ? html : html.substring( 0, index );
-                    html = index < 0 ? "" : html.substring( index );
-
-                    if (handler.chars) handler.chars( decodeEntities(text) );
+            function getInertBodyElement_XHR(html) {
+                // We add this dummy element to ensure that the rest of the content is parsed as expected
+                // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
+                html = '<remove></remove>' + html;
+                try {
+                    html = encodeURI(html);
+                } catch (e) {
+                    return undefined;
                 }
+                var xhr = new window.XMLHttpRequest();
+                xhr.responseType = 'document';
+                xhr.open('GET', 'data:text/html;charset=utf-8,' + html, false);
+                xhr.send(null);
+                var body = xhr.response.body;
+                body.firstChild.remove();
+                return body;
+            }
 
-            } else {
-                html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
-                    function(all, text){
-                        text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1");
+            function getInertBodyElement_DOMParser(html) {
+                // We add this dummy element to ensure that the rest of the content is parsed as expected
+                // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
+                html = '<remove></remove>' + html;
+                try {
+                    var body = new window.DOMParser().parseFromString(html, 'text/html').body;
+                    body.firstChild.remove();
+                    return body;
+                } catch (e) {
+                    return undefined;
+                }
+            }
 
-                        if (handler.chars) handler.chars( decodeEntities(text) );
+            function getInertBodyElement_InertDocument(html) {
+                inertBodyElement.innerHTML = html;
 
-                        return "";
-                    });
+                // Support: IE 9-11 only
+                // strip custom-namespaced attributes on IE<=11
+                if (document.documentMode) {
+                    stripCustomNsAttrs(inertBodyElement);
+                }
 
-                parseEndTag( "", stack.last() );
+                return inertBodyElement;
             }
-
-            if ( html == last ) {
-                throw $sanitizeMinErr('badparse', "The sanitizer was unable to parse the following block " +
-                    "of html: {0}", html);
+        })(window, window.document);
+
+        /**
+         * @example
+         * htmlParser(htmlString, {
+         *     start: function(tag, attrs) {},
+         *     end: function(tag) {},
+         *     chars: function(text) {},
+         *     comment: function(text) {}
+         * });
+         *
+         * @param {string} html string
+         * @param {object} handler
+         */
+        function htmlParserImpl(html, handler) {
+            if (html === null || html === undefined) {
+                html = '';
+            } else if (typeof html !== 'string') {
+                html = '' + html;
             }
-            last = html;
-        }
 
-        // Clean up any remaining tags
-        parseEndTag();
+            var inertBodyElement = getInertBodyElement(html);
+            if (!inertBodyElement) return '';
 
-        function parseStartTag( tag, tagName, rest, unary ) {
-            tagName = angular.lowercase(tagName);
-            if ( blockElements[ tagName ] ) {
-                while ( stack.last() && inlineElements[ stack.last() ] ) {
-                    parseEndTag( "", stack.last() );
+            //mXSS protection
+            var mXSSAttempts = 5;
+            do {
+                if (mXSSAttempts === 0) {
+                    throw $sanitizeMinErr('uinput', 'Failed to sanitize html because the input is unstable');
+                }
+                mXSSAttempts--;
+
+                // trigger mXSS if it is going to happen by reading and writing the innerHTML
+                html = inertBodyElement.innerHTML;
+                inertBodyElement = getInertBodyElement(html);
+            } while (html !== inertBodyElement.innerHTML);
+
+            var node = inertBodyElement.firstChild;
+            while (node) {
+                switch (node.nodeType) {
+                    case 1: // ELEMENT_NODE
+                        handler.start(node.nodeName.toLowerCase(), attrToMap(node.attributes));
+                        break;
+                    case 3: // TEXT NODE
+                        handler.chars(node.textContent);
+                        break;
                 }
-            }
 
-            if ( optionalEndTagElements[ tagName ] && stack.last() == tagName ) {
-                parseEndTag( "", tagName );
+                var nextNode;
+                if (!(nextNode = node.firstChild)) {
+                    if (node.nodeType === 1) {
+                        handler.end(node.nodeName.toLowerCase());
+                    }
+                    nextNode = getNonDescendant('nextSibling', node);
+                    if (!nextNode) {
+                        while (nextNode == null) {
+                            node = getNonDescendant('parentNode', node);
+                            if (node === inertBodyElement) break;
+                            nextNode = getNonDescendant('nextSibling', node);
+                            if (node.nodeType === 1) {
+                                handler.end(node.nodeName.toLowerCase());
+                            }
+                        }
+                    }
+                }
+                node = nextNode;
             }
 
-            unary = voidElements[ tagName ] || !!unary;
+            while ((node = inertBodyElement.firstChild)) {
+                inertBodyElement.removeChild(node);
+            }
+        }
 
-            if ( !unary )
-                stack.push( tagName );
+        function attrToMap(attrs) {
+            var map = {};
+            for (var i = 0, ii = attrs.length; i < ii; i++) {
+                var attr = attrs[i];
+                map[attr.name] = attr.value;
+            }
+            return map;
+        }
 
-            var attrs = {};
 
-            rest.replace(ATTR_REGEXP,
-                function(match, name, doubleQuotedValue, singleQuotedValue, unquotedValue) {
-                    var value = doubleQuotedValue
-                        || singleQuotedValue
-                        || unquotedValue
-                        || '';
+        /**
+         * Escapes all potentially dangerous characters, so that the
+         * resulting string can be safely inserted into attribute or
+         * element text.
+         * @param value
+         * @returns {string} escaped text
+         */
+        function encodeEntities(value) {
+            return value.
+            replace(/&/g, '&amp;').
+            replace(SURROGATE_PAIR_REGEXP, function(value) {
+                var hi = value.charCodeAt(0);
+                var low = value.charCodeAt(1);
+                return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';';
+            }).
+            replace(NON_ALPHANUMERIC_REGEXP, function(value) {
+                return '&#' + value.charCodeAt(0) + ';';
+            }).
+            replace(/</g, '&lt;').
+            replace(/>/g, '&gt;');
+        }
 
-                    attrs[name] = decodeEntities(value);
-                });
-            if (handler.start) handler.start( tagName, attrs, unary );
+        /**
+         * create an HTML/XML writer which writes to buffer
+         * @param {Array} buf use buf.join('') to get out sanitized html string
+         * @returns {object} in the form of {
+         *     start: function(tag, attrs) {},
+         *     end: function(tag) {},
+         *     chars: function(text) {},
+         *     comment: function(text) {}
+         * }
+         */
+        function htmlSanitizeWriterImpl(buf, uriValidator) {
+            var ignoreCurrentElement = false;
+            var out = bind(buf, buf.push);
+            return {
+                start: function(tag, attrs) {
+                    tag = lowercase(tag);
+                    if (!ignoreCurrentElement && blockedElements[tag]) {
+                        ignoreCurrentElement = tag;
+                    }
+                    if (!ignoreCurrentElement && validElements[tag] === true) {
+                        out('<');
+                        out(tag);
+                        forEach(attrs, function(value, key) {
+                            var lkey = lowercase(key);
+                            var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
+                            if (validAttrs[lkey] === true &&
+                                (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
+                                out(' ');
+                                out(key);
+                                out('="');
+                                out(encodeEntities(value));
+                                out('"');
+                            }
+                        });
+                        out('>');
+                    }
+                },
+                end: function(tag) {
+                    tag = lowercase(tag);
+                    if (!ignoreCurrentElement && validElements[tag] === true && voidElements[tag] !== true) {
+                        out('</');
+                        out(tag);
+                        out('>');
+                    }
+                    // eslint-disable-next-line eqeqeq
+                    if (tag == ignoreCurrentElement) {
+                        ignoreCurrentElement = false;
+                    }
+                },
+                chars: function(chars) {
+                    if (!ignoreCurrentElement) {
+                        out(encodeEntities(chars));
+                    }
+                }
+            };
         }
 
-        function parseEndTag( tag, tagName ) {
-            var pos = 0, i;
-            tagName = angular.lowercase(tagName);
-            if ( tagName )
-            // Find the closest opened tag of the same type
-                for ( pos = stack.length - 1; pos >= 0; pos-- )
-                    if ( stack[ pos ] == tagName )
-                        break;
 
-            if ( pos >= 0 ) {
-                // Close all the open elements, up the stack
-                for ( i = stack.length - 1; i >= pos; i-- )
-                    if (handler.end) handler.end( stack[ i ] );
+        /**
+         * When IE9-11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1' attribute to declare
+         * ns1 namespace and prefixes the attribute with 'ns1' (e.g. 'ns1:xlink:foo'). This is undesirable since we don't want
+         * to allow any of these custom attributes. This method strips them all.
+         *
+         * @param node Root element to process
+         */
+        function stripCustomNsAttrs(node) {
+            while (node) {
+                if (node.nodeType === window.Node.ELEMENT_NODE) {
+                    var attrs = node.attributes;
+                    for (var i = 0, l = attrs.length; i < l; i++) {
+                        var attrNode = attrs[i];
+                        var attrName = attrNode.name.toLowerCase();
+                        if (attrName === 'xmlns:ns1' || attrName.lastIndexOf('ns1:', 0) === 0) {
+                            node.removeAttributeNode(attrNode);
+                            i--;
+                            l--;
+                        }
+                    }
+                }
 
-                // Remove the open elements from the stack
-                stack.length = pos;
+                var nextNode = node.firstChild;
+                if (nextNode) {
+                    stripCustomNsAttrs(nextNode);
+                }
+
+                node = getNonDescendant('nextSibling', node);
             }
         }
-    }
 
-    var hiddenPre=document.createElement("pre");
-    var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
-    /**
-     * decodes all entities into regular string
-     * @param value
-     * @returns {string} A string with decoded entities.
-     */
-    function decodeEntities(value) {
-        if (!value) { return ''; }
-
-        // Note: IE8 does not preserve spaces at the start/end of innerHTML
-        // so we must capture them and reattach them afterward
-        var parts = spaceRe.exec(value);
-        var spaceBefore = parts[1];
-        var spaceAfter = parts[3];
-        var content = parts[2];
-        if (content) {
-            hiddenPre.innerHTML=content.replace(/</g,"&lt;");
-            // innerText depends on styling as it doesn't display hidden elements.
-            // Therefore, it's better to use textContent not to cause unnecessary
-            // reflows. However, IE<9 don't support textContent so the innerText
-            // fallback is necessary.
-            content = 'textContent' in hiddenPre ?
-                hiddenPre.textContent : hiddenPre.innerText;
+        function getNonDescendant(propName, node) {
+            // An element is clobbered if its `propName` property points to one of its descendants
+            var nextNode = node[propName];
+            if (nextNode && nodeContains.call(node, nextNode)) {
+                throw $sanitizeMinErr('elclob', 'Failed to sanitize html because the element is clobbered: {0}', node.outerHTML || node.outerText);
+            }
+            return nextNode;
         }
-        return spaceBefore + content + spaceAfter;
-    }
-
-    /**
-     * Escapes all potentially dangerous characters, so that the
-     * resulting string can be safely inserted into attribute or
-     * element text.
-     * @param value
-     * @returns {string} escaped text
-     */
-    function encodeEntities(value) {
-        return value.
-        replace(/&/g, '&amp;').
-        replace(NON_ALPHANUMERIC_REGEXP, function(value){
-            return '&#' + value.charCodeAt(0) + ';';
-        }).
-        replace(/</g, '&lt;').
-        replace(/>/g, '&gt;');
     }
 
-    /**
-     * create an HTML/XML writer which writes to buffer
-     * @param {Array} buf use buf.jain('') to get out sanitized html string
-     * @returns {object} in the form of {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * }
-     */
-    function htmlSanitizeWriter(buf, uriValidator){
-        var ignore = false;
-        var out = angular.bind(buf, buf.push);
-        return {
-            start: function(tag, attrs, unary){
-                tag = angular.lowercase(tag);
-                if (!ignore && specialElements[tag]) {
-                    ignore = tag;
-                }
-                if (!ignore && validElements[tag] === true) {
-                    out('<');
-                    out(tag);
-                    angular.forEach(attrs, function(value, key){
-                        var lkey=angular.lowercase(key);
-                        var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
-                        if (validAttrs[lkey] === true &&
-                            (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
-                            out(' ');
-                            out(key);
-                            out('="');
-                            out(encodeEntities(value));
-                            out('"');
-                        }
-                    });
-                    out(unary ? '/>' : '>');
-                }
-            },
-            end: function(tag){
-                tag = angular.lowercase(tag);
-                if (!ignore && validElements[tag] === true) {
-                    out('</');
-                    out(tag);
-                    out('>');
-                }
-                if (tag == ignore) {
-                    ignore = false;
-                }
-            },
-            chars: function(chars){
-                if (!ignore) {
-                    out(encodeEntities(chars));
-                }
-            }
-        };
+    function sanitizeText(chars) {
+        var buf = [];
+        var writer = htmlSanitizeWriter(buf, noop);
+        writer.chars(chars);
+        return buf.join('');
     }
 
 
 // define ngSanitize module and register $sanitize service
-    angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
-
-    /* global sanitizeText: false */
+    angular.module('ngSanitize', [])
+        .provider('$sanitize', $SanitizeProvider)
+        .info({ angularVersion: '1.6.9' });
 
     /**
      * @ngdoc filter
      * @name linky
-     * @function
+     * @kind function
      *
      * @description
-     * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and
+     * Finds links in text input and turns them into html links. Supports `http/https/ftp/sftp/mailto` and
      * plain email address links.
      *
      * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
      *
      * @param {string} text Input text.
-     * @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in.
-     * @returns {string} Html-linkified text.
+     * @param {string} [target] Window (`_blank|_self|_parent|_top`) or named frame to open links in.
+     * @param {object|function(url)} [attributes] Add custom attributes to the link element.
+     *
+     *    Can be one of:
+     *
+     *    - `object`: A map of attributes
+     *    - `function`: Takes the url as a parameter and returns a map of attributes
+     *
+     *    If the map of attributes contains a value for `target`, it overrides the value of
+     *    the target parameter.
+     *
+     *
+     * @returns {string} Html-linkified and {@link $sanitize sanitized} text.
      *
      * @usage
      <span ng-bind-html="linky_expression | linky"></span>
      *
      * @example
-     <example module="ngSanitize" deps="angular-sanitize.js">
+     <example module="linkyExample" deps="angular-sanitize.js" name="linky-filter">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.snippet =
-             'Pretty text with some links:\n'+
-             'http://angularjs.org/,\n'+
-             'mailto:us@somewhere.org,\n'+
-             'another@somewhere.org,\n'+
-             'and one more: ftp://127.0.0.1/.';
-           $scope.snippetWithTarget = 'http://angularjs.org/';
-         }
-     </script>
-     <div ng-controller="Ctrl">
+     <div ng-controller="ExampleController">
      Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
      <table>
      <tr>
-     <td>Filter</td>
-     <td>Source</td>
-     <td>Rendered</td>
+     <th>Filter</th>
+     <th>Source</th>
+     <th>Rendered</th>
      </tr>
      <tr id="linky-filter">
      <td>linky filter</td>
@@ -522,10 +653,19 @@
      <tr id="linky-target">
      <td>linky target</td>
      <td>
-     <pre>&lt;div ng-bind-html="snippetWithTarget | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
+     <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
      </td>
      <td>
-     <div ng-bind-html="snippetWithTarget | linky:'_blank'"></div>
+     <div ng-bind-html="snippetWithSingleURL | linky:'_blank'"></div>
+     </td>
+     </tr>
+     <tr id="linky-custom-attributes">
+     <td>linky custom attributes</td>
+     <td>
+     <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"&gt;<br>&lt;/div&gt;</pre>
+     </td>
+     <td>
+     <div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"></div>
      </td>
      </tr>
      <tr id="escaped-html">
@@ -535,6 +675,18 @@
      </tr>
      </table>
      </file>
+     <file name="script.js">
+     angular.module('linkyExample', ['ngSanitize'])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.snippet =
+             'Pretty text with some links:\n' +
+             'http://angularjs.org/,\n' +
+             'mailto:us@somewhere.org,\n' +
+             'another@somewhere.org,\n' +
+             'and one more: ftp://127.0.0.1/.';
+           $scope.snippetWithSingleURL = 'http://angularjs.org/';
+         }]);
+     </file>
      <file name="protractor.js" type="protractor">
      it('should linkify the snippet with urls', function() {
          expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
@@ -542,12 +694,14 @@
                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
          expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
        });
+
      it('should not linkify snippet without the linky filter', function() {
          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
              toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
          expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
        });
+
      it('should update', function() {
          element(by.model('snippet')).clear();
          element(by.model('snippet')).sendKeys('new http://link.');
@@ -557,22 +711,43 @@
          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText())
              .toBe('new http://link.');
        });
+
      it('should work with the target property', function() {
         expect(element(by.id('linky-target')).
-            element(by.binding("snippetWithTarget | linky:'_blank'")).getText()).
+            element(by.binding("snippetWithSingleURL | linky:'_blank'")).getText()).
             toBe('http://angularjs.org/');
         expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
        });
+
+     it('should optionally add custom attributes', function() {
+        expect(element(by.id('linky-custom-attributes')).
+            element(by.binding("snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}")).getText()).
+            toBe('http://angularjs.org/');
+        expect(element(by.css('#linky-custom-attributes a')).getAttribute('rel')).toEqual('nofollow');
+       });
      </file>
      </example>
      */
     angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
         var LINKY_URL_REGEXP =
-                /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,
-            MAILTO_REGEXP = /^mailto:/;
+                /((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+            MAILTO_REGEXP = /^mailto:/i;
+
+        var linkyMinErr = angular.$$minErr('linky');
+        var isDefined = angular.isDefined;
+        var isFunction = angular.isFunction;
+        var isObject = angular.isObject;
+        var isString = angular.isString;
+
+        return function(text, target, attributes) {
+            if (text == null || text === '') return text;
+            if (!isString(text)) throw linkyMinErr('notstring', 'Expected string but received: {0}', text);
+
+            var attributesFn =
+                isFunction(attributes) ? attributes :
+                    isObject(attributes) ? function getAttributesObject() {return attributes;} :
+                        function getEmptyAttributesObject() {return {};};
 
-        return function(text, target) {
-            if (!text) return text;
             var match;
             var raw = text;
             var html = [];
@@ -581,8 +756,10 @@
             while ((match = raw.match(LINKY_URL_REGEXP))) {
                 // We can not end in these as they are sometimes found at the end of the sentence
                 url = match[0];
-                // if we did not match ftp/http/mailto then assume mailto
-                if (match[2] == match[3]) url = 'mailto:' + url;
+                // if we did not match ftp/http/www/mailto then assume mailto
+                if (!match[2] && !match[4]) {
+                    url = (match[3] ? 'http://' : 'mailto:') + url;
+                }
                 i = match.index;
                 addText(raw.substr(0, i));
                 addLink(url, match[0].replace(MAILTO_REGEXP, ''));
@@ -599,15 +776,21 @@
             }
 
             function addLink(url, text) {
+                var key, linkAttributes = attributesFn(url);
                 html.push('<a ');
-                if (angular.isDefined(target)) {
-                    html.push('target="');
-                    html.push(target);
-                    html.push('" ');
+
+                for (key in linkAttributes) {
+                    html.push(key + '="' + linkAttributes[key] + '" ');
+                }
+
+                if (isDefined(target) && !('target' in linkAttributes)) {
+                    html.push('target="',
+                        target,
+                        '" ');
                 }
-                html.push('href="');
-                html.push(url);
-                html.push('">');
+                html.push('href="',
+                    url.replace(/"/g, '&quot;'),
+                    '">');
                 addText(text);
                 html.push('</a>');
             }
diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js b/setup/pub/angular-sanitize/angular-sanitize.min.js
index 4fc586065be2f..991dd00987a8c 100644
--- a/setup/pub/angular-sanitize/angular-sanitize.min.js
+++ b/setup/pub/angular-sanitize/angular-sanitize.min.js
@@ -1,14 +1,17 @@
 /*
- AngularJS v1.2.14
- (c) 2010-2014 Google, Inc. http://angularjs.org
+ AngularJS v1.6.9
+ (c) 2010-2018 Google, Inc. http://angularjs.org
  License: MIT
- */
-(function(p,h,q){'use strict';function E(a){var e=[];s(e,h.noop).chars(a);return e.join("")}function k(a){var e={};a=a.split(",");var d;for(d=0;d<a.length;d++)e[a[d]]=!0;return e}function F(a,e){function d(a,b,d,g){b=h.lowercase(b);if(t[b])for(;f.last()&&u[f.last()];)c("",f.last());v[b]&&f.last()==b&&c("",b);(g=w[b]||!!g)||f.push(b);var l={};d.replace(G,function(a,b,e,c,d){l[b]=r(e||c||d||"")});e.start&&e.start(b,l,g)}function c(a,b){var c=0,d;if(b=h.lowercase(b))for(c=f.length-1;0<=c&&f[c]!=b;c--);
-    if(0<=c){for(d=f.length-1;d>=c;d--)e.end&&e.end(f[d]);f.length=c}}var b,g,f=[],l=a;for(f.last=function(){return f[f.length-1]};a;){g=!0;if(f.last()&&x[f.last()])a=a.replace(RegExp("(.*)<\\s*\\/\\s*"+f.last()+"[^>]*>","i"),function(b,a){a=a.replace(H,"$1").replace(I,"$1");e.chars&&e.chars(r(a));return""}),c("",f.last());else{if(0===a.indexOf("\x3c!--"))b=a.indexOf("--",4),0<=b&&a.lastIndexOf("--\x3e",b)===b&&(e.comment&&e.comment(a.substring(4,b)),a=a.substring(b+3),g=!1);else if(y.test(a)){if(b=a.match(y))a=
-    a.replace(b[0],""),g=!1}else if(J.test(a)){if(b=a.match(z))a=a.substring(b[0].length),b[0].replace(z,c),g=!1}else K.test(a)&&(b=a.match(A))&&(a=a.substring(b[0].length),b[0].replace(A,d),g=!1);g&&(b=a.indexOf("<"),g=0>b?a:a.substring(0,b),a=0>b?"":a.substring(b),e.chars&&e.chars(r(g)))}if(a==l)throw L("badparse",a);l=a}c()}function r(a){if(!a)return"";var e=M.exec(a);a=e[1];var d=e[3];if(e=e[2])n.innerHTML=e.replace(/</g,"&lt;"),e="textContent"in n?n.textContent:n.innerText;return a+e+d}function B(a){return a.replace(/&/g,
-    "&amp;").replace(N,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function s(a,e){var d=!1,c=h.bind(a,a.push);return{start:function(a,g,f){a=h.lowercase(a);!d&&x[a]&&(d=a);d||!0!==C[a]||(c("<"),c(a),h.forEach(g,function(d,f){var g=h.lowercase(f),k="img"===a&&"src"===g||"background"===g;!0!==O[g]||!0===D[g]&&!e(d,k)||(c(" "),c(f),c('="'),c(B(d)),c('"'))}),c(f?"/>":">"))},end:function(a){a=h.lowercase(a);d||!0!==C[a]||(c("</"),c(a),c(">"));a==d&&(d=!1)},chars:function(a){d||
-c(B(a))}}}var L=h.$$minErr("$sanitize"),A=/^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,z=/^<\s*\/\s*([\w:-]+)[^>]*>/,G=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,K=/^</,J=/^<\s*\//,H=/\x3c!--(.*?)--\x3e/g,y=/<!DOCTYPE([^>]*?)>/i,I=/<!\[CDATA\[(.*?)]]\x3e/g,N=/([^\#-~| |!])/g,w=k("area,br,col,hr,img,wbr");p=k("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");q=k("rp,rt");var v=h.extend({},q,p),t=h.extend({},p,k("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),
-    u=h.extend({},q,k("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),x=k("script,style"),C=h.extend({},w,t,u,v),D=k("background,cite,href,longdesc,src,usemap"),O=h.extend({},D,k("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width")),
-    n=document.createElement("pre"),M=/^(\s*)([\s\S]*?)(\s*)$/;h.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(a){return function(e){var d=[];F(e,s(d,function(c,b){return!/^unsafe/.test(a(c,b))}));return d.join("")}}]});h.module("ngSanitize").filter("linky",["$sanitize",function(a){var e=/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,d=/^mailto:/;return function(c,b){function g(a){a&&m.push(E(a))}function f(a,c){m.push("<a ");h.isDefined(b)&&
-(m.push('target="'),m.push(b),m.push('" '));m.push('href="');m.push(a);m.push('">');g(c);m.push("</a>")}if(!c)return c;for(var l,k=c,m=[],n,p;l=k.match(e);)n=l[0],l[2]==l[3]&&(n="mailto:"+n),p=l.index,g(k.substr(0,p)),f(n,l[0].replace(d,"")),k=k.substring(p+l[0].length);g(k);return a(m.join(""))}}])})(window,window.angular);
+*/
+(function(s,d){'use strict';function J(d){var k=[];w(k,B).chars(d);return k.join("")}var x=d.$$minErr("$sanitize"),C,k,D,E,p,B,F,G,w;d.module("ngSanitize",[]).provider("$sanitize",function(){function g(a,e){var c={},b=a.split(","),f;for(f=0;f<b.length;f++)c[e?p(b[f]):b[f]]=!0;return c}function K(a){for(var e={},c=0,b=a.length;c<b;c++){var f=a[c];e[f.name]=f.value}return e}function H(a){return a.replace(/&/g,"&amp;").replace(L,function(a){var c=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(c-
+    55296)+(a-56320)+65536)+";"}).replace(M,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function I(a){for(;a;){if(a.nodeType===s.Node.ELEMENT_NODE)for(var e=a.attributes,c=0,b=e.length;c<b;c++){var f=e[c],h=f.name.toLowerCase();if("xmlns:ns1"===h||0===h.lastIndexOf("ns1:",0))a.removeAttributeNode(f),c--,b--}(e=a.firstChild)&&I(e);a=t("nextSibling",a)}}function t(a,e){var c=e[a];if(c&&F.call(e,c))throw x("elclob",e.outerHTML||e.outerText);return c}var y=!1;this.$get=
+    ["$$sanitizeUri",function(a){y&&k(n,z);return function(e){var c=[];G(e,w(c,function(b,c){return!/^unsafe:/.test(a(b,c))}));return c.join("")}}];this.enableSvg=function(a){return E(a)?(y=a,this):y};C=d.bind;k=d.extend;D=d.forEach;E=d.isDefined;p=d.lowercase;B=d.noop;G=function(a,e){null===a||void 0===a?a="":"string"!==typeof a&&(a=""+a);var c=u(a);if(!c)return"";var b=5;do{if(0===b)throw x("uinput");b--;a=c.innerHTML;c=u(a)}while(a!==c.innerHTML);for(b=c.firstChild;b;){switch(b.nodeType){case 1:e.start(b.nodeName.toLowerCase(),
+    K(b.attributes));break;case 3:e.chars(b.textContent)}var f;if(!(f=b.firstChild)&&(1===b.nodeType&&e.end(b.nodeName.toLowerCase()),f=t("nextSibling",b),!f))for(;null==f;){b=t("parentNode",b);if(b===c)break;f=t("nextSibling",b);1===b.nodeType&&e.end(b.nodeName.toLowerCase())}b=f}for(;b=c.firstChild;)c.removeChild(b)};w=function(a,e){var c=!1,b=C(a,a.push);return{start:function(a,h){a=p(a);!c&&A[a]&&(c=a);c||!0!==n[a]||(b("<"),b(a),D(h,function(c,h){var d=p(h),g="img"===a&&"src"===d||"background"===
+        d;!0!==v[d]||!0===m[d]&&!e(c,g)||(b(" "),b(h),b('="'),b(H(c)),b('"'))}),b(">"))},end:function(a){a=p(a);c||!0!==n[a]||!0===h[a]||(b("</"),b(a),b(">"));a==c&&(c=!1)},chars:function(a){c||b(H(a))}}};F=s.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)};var L=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,M=/([^#-~ |!])/g,h=g("area,br,col,hr,img,wbr"),q=g("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),l=g("rp,rt"),r=k({},l,q),q=k({},q,g("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul")),
+    l=k({},l,g("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),z=g("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan"),A=g("script,style"),n=k({},h,q,l,r),m=g("background,cite,href,longdesc,src,xlink:href,xml:base"),r=g("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,valign,value,vspace,width"),
+    l=g("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan",
+        !0),v=k({},m,l,r),u=function(a,e){function c(b){b="<remove></remove>"+b;try{var c=(new a.DOMParser).parseFromString(b,"text/html").body;c.firstChild.remove();return c}catch(e){}}function b(a){d.innerHTML=a;e.documentMode&&I(d);return d}var h;if(e&&e.implementation)h=e.implementation.createHTMLDocument("inert");else throw x("noinert");var d=(h.documentElement||h.getDocumentElement()).querySelector("body");d.innerHTML='<svg><g onload="this.parentNode.remove()"></g></svg>';return d.querySelector("svg")?
+        (d.innerHTML='<svg><p><style><img src="</style><img src=x onerror=alert(1)//">',d.querySelector("svg img")?c:b):function(b){b="<remove></remove>"+b;try{b=encodeURI(b)}catch(c){return}var e=new a.XMLHttpRequest;e.responseType="document";e.open("GET","data:text/html;charset=utf-8,"+b,!1);e.send(null);b=e.response.body;b.firstChild.remove();return b}}(s,s.document)}).info({angularVersion:"1.6.9"});d.module("ngSanitize").filter("linky",["$sanitize",function(g){var k=/((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+    p=/^mailto:/i,s=d.$$minErr("linky"),t=d.isDefined,y=d.isFunction,w=d.isObject,x=d.isString;return function(d,q,l){function r(a){a&&m.push(J(a))}function z(a,d){var c,b=A(a);m.push("<a ");for(c in b)m.push(c+'="'+b[c]+'" ');!t(q)||"target"in b||m.push('target="',q,'" ');m.push('href="',a.replace(/"/g,"&quot;"),'">');r(d);m.push("</a>")}if(null==d||""===d)return d;if(!x(d))throw s("notstring",d);for(var A=y(l)?l:w(l)?function(){return l}:function(){return{}},n=d,m=[],v,u;d=n.match(k);)v=d[0],d[2]||
+d[4]||(v=(d[3]?"http://":"mailto:")+v),u=d.index,r(n.substr(0,u)),z(v,d[0].replace(p,"")),n=n.substring(u+d[0].length);r(n);return g(m.join(""))}}])})(window,window.angular);
 //# sourceMappingURL=angular-sanitize.min.js.map
\ No newline at end of file
diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js.map b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
index 0c993a6ed2afb..8ce8290b2b387 100644
--- a/setup/pub/angular-sanitize/angular-sanitize.min.js.map
+++ b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
@@ -1,8 +1,8 @@
 {
-"version":3,
-"file":"angular-sanitize.min.js",
-"lineCount":13,
-"mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,CAAlB,CAA6B,CAiJtCC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBN,CAAAO,KAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CAmE7BC,QAASA,EAAO,CAACC,CAAD,CAAM,CAAA,IAChBC,EAAM,EAAIC,EAAAA,CAAQF,CAAAG,MAAA,CAAU,GAAV,CAAtB,KAAsCC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CAAmCH,CAAA,CAAIC,CAAA,CAAME,CAAN,CAAJ,CAAA,CAAgB,CAAA,CACnD,OAAOH,EAHa,CAmBtBK,QAASA,EAAU,CAAEC,CAAF,CAAQC,CAAR,CAAkB,CAiFnCC,QAASA,EAAa,CAAEC,CAAF,CAAOC,CAAP,CAAgBC,CAAhB,CAAsBC,CAAtB,CAA8B,CAClDF,CAAA,CAAUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,IAAKI,CAAA,CAAeJ,CAAf,CAAL,CACE,IAAA,CAAQK,CAAAC,KAAA,EAAR,EAAwBC,CAAA,CAAgBF,CAAAC,KAAA,EAAhB,CAAxB,CAAA,CACEE,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CAICG,EAAA,CAAwBT,CAAxB,CAAL,EAA0CK,CAAAC,KAAA,EAA1C,EAA0DN,CAA1D,EACEQ,CAAA,CAAa,EAAb,CAAiBR,CAAjB,CAKF,EAFAE,CAEA,CAFQQ,CAAA,CAAcV,CAAd,CAER,EAFmC,CAAC,CAACE,CAErC,GACEG,CAAAM,KAAA,CAAYX,CAAZ,CAEF,KAAIY,EAAQ,EAEZX,EAAAY,QAAA,CAAaC,CAAb,CACE,QAAQ,CAACC,CAAD,CAAQC,CAAR,CAAcC,CAAd,CAAiCC,CAAjC,CAAoDC,CAApD,CAAmE,CAMzEP,CAAA,CAAMI,CAAN,CAAA,CAAcI,CAAA,CALFH,CAKE,EAJTC,CAIS,EAHTC,CAGS,EAFT,EAES,CAN2D,CAD7E,CASItB,EAAAwB,MAAJ,EAAmBxB,CAAAwB,MAAA,CAAerB,CAAf,CAAwBY,CAAxB,CAA+BV,CAA/B,CA5B+B,CA+BpDM,QAASA,EAAW,CAAET,CAAF,CAAOC,CAAP,CAAiB,CAAA,IAC/BsB,EAAM,CADyB,CACtB7B,CAEb,IADAO,CACA,CADUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,CAEE,IAAMsB,CAAN,CAAYjB,CAAAX,OAAZ,CAA2B,CAA3B,CAAqC,CAArC,EAA8B4B,CAA9B,EACOjB,CAAA,CAAOiB,CAAP,CADP,EACuBtB,CADvB,CAAwCsB,CAAA,EAAxC;AAIF,GAAY,CAAZ,EAAKA,CAAL,CAAgB,CAEd,IAAM7B,CAAN,CAAUY,CAAAX,OAAV,CAAyB,CAAzB,CAA4BD,CAA5B,EAAiC6B,CAAjC,CAAsC7B,CAAA,EAAtC,CACMI,CAAA0B,IAAJ,EAAiB1B,CAAA0B,IAAA,CAAalB,CAAA,CAAOZ,CAAP,CAAb,CAGnBY,EAAAX,OAAA,CAAe4B,CAND,CATmB,CAhHF,IAC/BE,CAD+B,CACxB1C,CADwB,CACVuB,EAAQ,EADE,CACEC,EAAOV,CAG5C,KAFAS,CAAAC,KAEA,CAFamB,QAAQ,EAAG,CAAE,MAAOpB,EAAA,CAAOA,CAAAX,OAAP,CAAsB,CAAtB,CAAT,CAExB,CAAQE,CAAR,CAAA,CAAe,CACbd,CAAA,CAAQ,CAAA,CAGR,IAAMuB,CAAAC,KAAA,EAAN,EAAuBoB,CAAA,CAAiBrB,CAAAC,KAAA,EAAjB,CAAvB,CAmDEV,CASA,CATOA,CAAAiB,QAAA,CAAiBc,MAAJ,CAAW,kBAAX,CAAgCtB,CAAAC,KAAA,EAAhC,CAA+C,QAA/C,CAAyD,GAAzD,CAAb,CACL,QAAQ,CAACsB,CAAD,CAAMC,CAAN,CAAW,CACjBA,CAAA,CAAOA,CAAAhB,QAAA,CAAaiB,CAAb,CAA6B,IAA7B,CAAAjB,QAAA,CAA2CkB,CAA3C,CAAyD,IAAzD,CAEHlC,EAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CAEnB,OAAO,EALU,CADd,CASP,CAAArB,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CA5DF,KAAyD,CAGvD,GAA8B,CAA9B,GAAKV,CAAAoC,QAAA,CAAa,SAAb,CAAL,CAEER,CAEA,CAFQ5B,CAAAoC,QAAA,CAAa,IAAb,CAAmB,CAAnB,CAER,CAAc,CAAd,EAAKR,CAAL,EAAmB5B,CAAAqC,YAAA,CAAiB,QAAjB,CAAwBT,CAAxB,CAAnB,GAAsDA,CAAtD,GACM3B,CAAAqC,QAEJ,EAFqBrC,CAAAqC,QAAA,CAAiBtC,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAAjB,CAErB,CADA5B,CACA,CADOA,CAAAuC,UAAA,CAAgBX,CAAhB,CAAwB,CAAxB,CACP,CAAA1C,CAAA,CAAQ,CAAA,CAHV,CAJF,KAUO,IAAKsD,CAAAC,KAAA,CAAoBzC,CAApB,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYqB,CAAZ,CAER,CACExC,CACA;AADOA,CAAAiB,QAAA,CAAcE,CAAA,CAAM,CAAN,CAAd,CAAyB,EAAzB,CACP,CAAAjC,CAAA,CAAQ,CAAA,CAFV,CAHK,IAQA,IAAKwD,CAAAD,KAAA,CAA4BzC,CAA5B,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYwB,CAAZ,CAER,CACE3C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB0B,CAAlB,CAAkC/B,CAAlC,CACA,CAAA1B,CAAA,CAAQ,CAAA,CAHV,CAHK,IAUK0D,EAAAH,KAAA,CAAsBzC,CAAtB,CAAL,GACLmB,CADK,CACGnB,CAAAmB,MAAA,CAAY0B,CAAZ,CADH,IAIH7C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB4B,CAAlB,CAAoC3C,CAApC,CACA,CAAAhB,CAAA,CAAQ,CAAA,CANL,CAUFA,EAAL,GACE0C,CAKA,CALQ5B,CAAAoC,QAAA,CAAa,GAAb,CAKR,CAHIH,CAGJ,CAHmB,CAAR,CAAAL,CAAA,CAAY5B,CAAZ,CAAmBA,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAG9B,CAFA5B,CAEA,CAFe,CAAR,CAAA4B,CAAA,CAAY,EAAZ,CAAiB5B,CAAAuC,UAAA,CAAgBX,CAAhB,CAExB,CAAI3B,CAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CANrB,CAzCuD,CA+DzD,GAAKjC,CAAL,EAAaU,CAAb,CACE,KAAMoC,EAAA,CAAgB,UAAhB,CAC4C9C,CAD5C,CAAN,CAGFU,CAAA,CAAOV,CAvEM,CA2EfY,CAAA,EA/EmC,CA2IrCY,QAASA,EAAc,CAACuB,CAAD,CAAQ,CAC7B,GAAI,CAACA,CAAL,CAAc,MAAO,EAIrB,KAAIC,EAAQC,CAAAC,KAAA,CAAaH,CAAb,CACRI,EAAAA,CAAcH,CAAA,CAAM,CAAN,CAClB,KAAII,EAAaJ,CAAA,CAAM,CAAN,CAEjB,IADIK,CACJ,CADcL,CAAA,CAAM,CAAN,CACd,CACEM,CAAAC,UAKA,CALoBF,CAAApC,QAAA,CAAgB,IAAhB,CAAqB,MAArB,CAKpB,CAAAoC,CAAA,CAAU,aAAA,EAAiBC,EAAjB,CACRA,CAAAE,YADQ,CACgBF,CAAAG,UAE5B,OAAON,EAAP,CAAqBE,CAArB,CAA+BD,CAlBF,CA4B/BM,QAASA,EAAc,CAACX,CAAD,CAAQ,CAC7B,MAAOA,EAAA9B,QAAA,CACG,IADH;AACS,OADT,CAAAA,QAAA,CAEG0C,CAFH,CAE4B,QAAQ,CAACZ,CAAD,CAAO,CAC9C,MAAO,IAAP,CAAcA,CAAAa,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADU,CAF3C,CAAA3C,QAAA,CAKG,IALH,CAKS,MALT,CAAAA,QAAA,CAMG,IANH,CAMS,MANT,CADsB,CAoB/B7B,QAASA,EAAkB,CAACD,CAAD,CAAM0E,CAAN,CAAmB,CAC5C,IAAIC,EAAS,CAAA,CAAb,CACIC,EAAMhF,CAAAiF,KAAA,CAAa7E,CAAb,CAAkBA,CAAA4B,KAAlB,CACV,OAAO,OACEU,QAAQ,CAACtB,CAAD,CAAMa,CAAN,CAAaV,CAAb,CAAmB,CAChCH,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAAA,CAAL,EAAehC,CAAA,CAAgB3B,CAAhB,CAAf,GACE2D,CADF,CACW3D,CADX,CAGK2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAI5D,CAAJ,CAaA,CAZApB,CAAAmF,QAAA,CAAgBlD,CAAhB,CAAuB,QAAQ,CAAC+B,CAAD,CAAQoB,CAAR,CAAY,CACzC,IAAIC,EAAKrF,CAAAwB,UAAA,CAAkB4D,CAAlB,CAAT,CACIE,EAAmB,KAAnBA,GAAWlE,CAAXkE,EAAqC,KAArCA,GAA4BD,CAA5BC,EAAyD,YAAzDA,GAAgDD,CAC3B,EAAA,CAAzB,GAAIE,CAAA,CAAWF,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGG,CAAA,CAASH,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAad,CAAb,CAAoBsB,CAApB,CAD9B,GAEEN,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIL,CAAA,CAAeX,CAAf,CAAJ,CACA,CAAAgB,CAAA,CAAI,GAAJ,CANF,CAHyC,CAA3C,CAYA,CAAAA,CAAA,CAAIzD,CAAA,CAAQ,IAAR,CAAe,GAAnB,CAfF,CALgC,CAD7B,KAwBAqB,QAAQ,CAACxB,CAAD,CAAK,CACdA,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAI5D,CAAJ,CACA,CAAA4D,CAAA,CAAI,GAAJ,CAHF,CAKI5D,EAAJ,EAAW2D,CAAX,GACEA,CADF,CACW,CAAA,CADX,CAPc,CAxBb,OAmCE5E,QAAQ,CAACA,CAAD,CAAO,CACb4E,CAAL;AACEC,CAAA,CAAIL,CAAA,CAAexE,CAAf,CAAJ,CAFgB,CAnCjB,CAHqC,CAha9C,IAAI4D,EAAkB/D,CAAAyF,SAAA,CAAiB,WAAjB,CAAtB,CAwJI3B,EACG,4FAzJP,CA0JEF,EAAiB,2BA1JnB,CA2JEzB,EAAc,yEA3JhB,CA4JE0B,EAAmB,IA5JrB,CA6JEF,EAAyB,SA7J3B,CA8JER,EAAiB,qBA9JnB,CA+JEM,EAAiB,qBA/JnB,CAgKEL,EAAe,yBAhKjB,CAkKEwB,EAA0B,gBAlK5B,CA2KI7C,EAAetB,CAAA,CAAQ,wBAAR,CAIfiF,EAAAA,CAA8BjF,CAAA,CAAQ,gDAAR,CAC9BkF,EAAAA,CAA+BlF,CAAA,CAAQ,OAAR,CADnC,KAEIqB,EAAyB9B,CAAA4F,OAAA,CAAe,EAAf,CACeD,CADf,CAEeD,CAFf,CAF7B,CAOIjE,EAAgBzB,CAAA4F,OAAA,CAAe,EAAf,CAAmBF,CAAnB,CAAgDjF,CAAA,CAAQ,4KAAR,CAAhD,CAPpB;AAYImB,EAAiB5B,CAAA4F,OAAA,CAAe,EAAf,CAAmBD,CAAnB,CAAiDlF,CAAA,CAAQ,2JAAR,CAAjD,CAZrB,CAkBIsC,EAAkBtC,CAAA,CAAQ,cAAR,CAlBtB,CAoBIyE,EAAgBlF,CAAA4F,OAAA,CAAe,EAAf,CACe7D,CADf,CAEeN,CAFf,CAGeG,CAHf,CAIeE,CAJf,CApBpB,CA2BI0D,EAAW/E,CAAA,CAAQ,0CAAR,CA3Bf,CA4BI8E,EAAavF,CAAA4F,OAAA,CAAe,EAAf,CAAmBJ,CAAnB,CAA6B/E,CAAA,CAC1C,ySAD0C,CAA7B,CA5BjB;AA0LI8D,EAAUsB,QAAAC,cAAA,CAAuB,KAAvB,CA1Ld,CA2LI5B,EAAU,wBAsGdlE,EAAA+F,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CAA0C,WAA1C,CA7UAC,QAA0B,EAAG,CAC3B,IAAAC,KAAA,CAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CACpD,MAAO,SAAQ,CAAClF,CAAD,CAAO,CACpB,IAAIb,EAAM,EACVY,EAAA,CAAWC,CAAX,CAAiBZ,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgG,CAAD,CAAMd,CAAN,CAAe,CAC9D,MAAO,CAAC,SAAA5B,KAAA,CAAeyC,CAAA,CAAcC,CAAd,CAAmBd,CAAnB,CAAf,CADsD,CAA/C,CAAjB,CAGA,OAAOlF,EAAAI,KAAA,CAAS,EAAT,CALa,CAD8B,CAA1C,CADe,CA6U7B,CAuGAR,EAAA+F,OAAA,CAAe,YAAf,CAAAM,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,mEAFuE,CAGzEC,EAAgB,UAEpB,OAAO,SAAQ,CAACtD,CAAD,CAAOuD,CAAP,CAAe,CAoB5BC,QAASA,EAAO,CAACxD,CAAD,CAAO,CAChBA,CAAL,EAGAjC,CAAAe,KAAA,CAAU9B,CAAA,CAAagD,CAAb,CAAV,CAJqB,CAOvByD,QAASA,EAAO,CAACC,CAAD,CAAM1D,CAAN,CAAY,CAC1BjC,CAAAe,KAAA,CAAU,KAAV,CACIhC,EAAA6G,UAAA,CAAkBJ,CAAlB,CAAJ;CACExF,CAAAe,KAAA,CAAU,UAAV,CAEA,CADAf,CAAAe,KAAA,CAAUyE,CAAV,CACA,CAAAxF,CAAAe,KAAA,CAAU,IAAV,CAHF,CAKAf,EAAAe,KAAA,CAAU,QAAV,CACAf,EAAAe,KAAA,CAAU4E,CAAV,CACA3F,EAAAe,KAAA,CAAU,IAAV,CACA0E,EAAA,CAAQxD,CAAR,CACAjC,EAAAe,KAAA,CAAU,MAAV,CAX0B,CA1B5B,GAAI,CAACkB,CAAL,CAAW,MAAOA,EAMlB,KALA,IAAId,CAAJ,CACI0E,EAAM5D,CADV,CAEIjC,EAAO,EAFX,CAGI2F,CAHJ,CAII9F,CACJ,CAAQsB,CAAR,CAAgB0E,CAAA1E,MAAA,CAAUmE,CAAV,CAAhB,CAAA,CAEEK,CAMA,CANMxE,CAAA,CAAM,CAAN,CAMN,CAJIA,CAAA,CAAM,CAAN,CAIJ,EAJgBA,CAAA,CAAM,CAAN,CAIhB,GAJ0BwE,CAI1B,CAJgC,SAIhC,CAJ4CA,CAI5C,EAHA9F,CAGA,CAHIsB,CAAAS,MAGJ,CAFA6D,CAAA,CAAQI,CAAAC,OAAA,CAAW,CAAX,CAAcjG,CAAd,CAAR,CAEA,CADA6F,CAAA,CAAQC,CAAR,CAAaxE,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAiBsE,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAM,CAAA,CAAMA,CAAAtD,UAAA,CAAc1C,CAAd,CAAkBsB,CAAA,CAAM,CAAN,CAAArB,OAAlB,CAER2F,EAAA,CAAQI,CAAR,CACA,OAAOR,EAAA,CAAUrF,CAAAT,KAAA,CAAU,EAAV,CAAV,CAlBqB,CAL+C,CAAlC,CAA7C,CAzjBsC,CAArC,CAAA,CA0mBET,MA1mBF,CA0mBUA,MAAAC,QA1mBV;",
-"sources":["angular-sanitize.js"],
-"names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","makeMap","str","obj","items","split","i","length","htmlParser","html","handler","parseStartTag","tag","tagName","rest","unary","lowercase","blockElements","stack","last","inlineElements","parseEndTag","optionalEndTagElements","voidElements","push","attrs","replace","ATTR_REGEXP","match","name","doubleQuotedValue","singleQuotedValue","unquotedValue","decodeEntities","start","pos","end","index","stack.last","specialElements","RegExp","all","text","COMMENT_REGEXP","CDATA_REGEXP","indexOf","lastIndexOf","comment","substring","DOCTYPE_REGEXP","test","BEGING_END_TAGE_REGEXP","END_TAG_REGEXP","BEGIN_TAG_REGEXP","START_TAG_REGEXP","$sanitizeMinErr","value","parts","spaceRe","exec","spaceBefore","spaceAfter","content","hiddenPre","innerHTML","textContent","innerText","encodeEntities","NON_ALPHANUMERIC_REGEXP","charCodeAt","uriValidator","ignore","out","bind","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","extend","document","createElement","module","provider","$SanitizeProvider","$get","$$sanitizeUri","uri","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","target","addText","addLink","url","isDefined","raw","substr"]
+  "version":3,
+  "file":"angular-sanitize.min.js",
+  "lineCount":16,
+  "mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkB,CAykB3BC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBC,CAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CA5jB7B,IAAIC,EAAkBR,CAAAS,SAAA,CAAiB,WAAjB,CAAtB,CACIC,CADJ,CAEIC,CAFJ,CAGIC,CAHJ,CAIIC,CAJJ,CAKIC,CALJ,CAMIR,CANJ,CAOIS,CAPJ,CAQIC,CARJ,CASIZ,CA4jBJJ,EAAAiB,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CACY,WADZ,CAhcAC,QAA0B,EAAG,CA4J3BC,QAASA,EAAK,CAACC,CAAD,CAAMC,CAAN,CAAqB,CAAA,IAC7BC,EAAM,EADuB,CACnBC,EAAQH,CAAAI,MAAA,CAAU,GAAV,CADW,CACKC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CACEH,CAAA,CAAID,CAAA,CAAgBR,CAAA,CAAUU,CAAA,CAAME,CAAN,CAAV,CAAhB,CAAsCF,CAAA,CAAME,CAAN,CAA1C,CAAA,CAAsD,CAAA,CAExD,OAAOH,EAL0B,CAwJnCK,QAASA,EAAS,CAACC,CAAD,CAAQ,CAExB,IADA,IAAIC,EAAM,EAAV,CACSJ,EAAI,CADb,CACgBK,EAAKF,CAAAF,OAArB,CAAmCD,CAAnC,CAAuCK,CAAvC,CAA2CL,CAAA,EAA3C,CAAgD,CAC9C,IAAIM,EAAOH,CAAA,CAAMH,CAAN,CACXI,EAAA,CAAIE,CAAAC,KAAJ,CAAA,CAAiBD,CAAAE,MAF6B,CAIhD,MAAOJ,EANiB,CAiB1BK,QAASA,EAAc,CAACD,CAAD,CAAQ,CAC7B,MAAOA,EAAAE,QAAA,CACG,IADH,CACS,OADT,CAAAA,QAAA,CAEGC,CAFH,CAE0B,QAAQ,CAACH,CAAD,CAAQ,CAC7C,IAAII,EAAKJ,CAAAK,WAAA,CAAiB,CAAjB,CACLC,EAAAA,CAAMN,CAAAK,WAAA,CAAiB,CAAjB,CACV,OAAO,IAAP,EAAgC,IAAhC,EAAiBD,CAAjB;AAAsB,KAAtB,GAA0CE,CAA1C,CAAgD,KAAhD,EAA0D,KAA1D,EAAqE,GAHxB,CAF1C,CAAAJ,QAAA,CAOGK,CAPH,CAO4B,QAAQ,CAACP,CAAD,CAAQ,CAC/C,MAAO,IAAP,CAAcA,CAAAK,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADW,CAP5C,CAAAH,QAAA,CAUG,IAVH,CAUS,MAVT,CAAAA,QAAA,CAWG,IAXH,CAWS,MAXT,CADsB,CAgF/BM,QAASA,EAAkB,CAACC,CAAD,CAAO,CAChC,IAAA,CAAOA,CAAP,CAAA,CAAa,CACX,GAAIA,CAAAC,SAAJ,GAAsB7C,CAAA8C,KAAAC,aAAtB,CAEE,IADA,IAAIjB,EAAQc,CAAAI,WAAZ,CACSrB,EAAI,CADb,CACgBsB,EAAInB,CAAAF,OAApB,CAAkCD,CAAlC,CAAsCsB,CAAtC,CAAyCtB,CAAA,EAAzC,CAA8C,CAC5C,IAAIuB,EAAWpB,CAAA,CAAMH,CAAN,CAAf,CACIwB,EAAWD,CAAAhB,KAAAkB,YAAA,EACf,IAAiB,WAAjB,GAAID,CAAJ,EAAoE,CAApE,GAAgCA,CAAAE,YAAA,CAAqB,MAArB,CAA6B,CAA7B,CAAhC,CACET,CAAAU,oBAAA,CAAyBJ,CAAzB,CAEA,CADAvB,CAAA,EACA,CAAAsB,CAAA,EAN0C,CAYhD,CADIM,CACJ,CADeX,CAAAY,WACf,GACEb,CAAA,CAAmBY,CAAnB,CAGFX,EAAA,CAAOa,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CAnBI,CADmB,CAwBlCa,QAASA,EAAgB,CAACC,CAAD,CAAWd,CAAX,CAAiB,CAExC,IAAIW,EAAWX,CAAA,CAAKc,CAAL,CACf,IAAIH,CAAJ,EAAgBvC,CAAA2C,KAAA,CAAkBf,CAAlB,CAAwBW,CAAxB,CAAhB,CACE,KAAM9C,EAAA,CAAgB,QAAhB,CAA2FmC,CAAAgB,UAA3F,EAA6GhB,CAAAiB,UAA7G,CAAN,CAEF,MAAON,EANiC,CA5a1C,IAAIO,EAAa,CAAA,CAEjB,KAAAC,KAAA;AAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CAChDF,CAAJ,EACElD,CAAA,CAAOqD,CAAP,CAAsBC,CAAtB,CAEF,OAAO,SAAQ,CAACC,CAAD,CAAO,CACpB,IAAI/D,EAAM,EACVa,EAAA,CAAWkD,CAAX,CAAiB9D,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgE,CAAD,CAAMC,CAAN,CAAe,CAC9D,MAAO,CAAC,UAAAC,KAAA,CAAgBN,CAAA,CAAcI,CAAd,CAAmBC,CAAnB,CAAhB,CADsD,CAA/C,CAAjB,CAGA,OAAOjE,EAAAI,KAAA,CAAS,EAAT,CALa,CAJ8B,CAA1C,CA4CZ,KAAA+D,UAAA,CAAiBC,QAAQ,CAACD,CAAD,CAAY,CACnC,MAAIzD,EAAA,CAAUyD,CAAV,CAAJ,EACET,CACO,CADMS,CACN,CAAA,IAFT,EAIST,CAL0B,CAarCnD,EAAA,CAAOV,CAAAU,KACPC,EAAA,CAASX,CAAAW,OACTC,EAAA,CAAUZ,CAAAY,QACVC,EAAA,CAAYb,CAAAa,UACZC,EAAA,CAAYd,CAAAc,UACZR,EAAA,CAAON,CAAAM,KAEPU,EAAA,CAsLAwD,QAAuB,CAACN,CAAD,CAAOO,CAAP,CAAgB,CACxB,IAAb,GAAIP,CAAJ,EAA8BQ,IAAAA,EAA9B,GAAqBR,CAArB,CACEA,CADF,CACS,EADT,CAE2B,QAF3B,GAEW,MAAOA,EAFlB,GAGEA,CAHF,CAGS,EAHT,CAGcA,CAHd,CAMA,KAAIS,EAAmBC,CAAA,CAAoBV,CAApB,CACvB,IAAKS,CAAAA,CAAL,CAAuB,MAAO,EAG9B,KAAIE,EAAe,CACnB,GAAG,CACD,GAAqB,CAArB,GAAIA,CAAJ,CACE,KAAMrE,EAAA,CAAgB,QAAhB,CAAN,CAEFqE,CAAA,EAGAX,EAAA,CAAOS,CAAAG,UACPH,EAAA,CAAmBC,CAAA,CAAoBV,CAApB,CARlB,CAAH,MASSA,CATT,GASkBS,CAAAG,UATlB,CAYA,KADInC,CACJ,CADWgC,CAAApB,WACX,CAAOZ,CAAP,CAAA,CAAa,CACX,OAAQA,CAAAC,SAAR,EACE,KAAK,CAAL,CACE6B,CAAAM,MAAA,CAAcpC,CAAAqC,SAAA7B,YAAA,EAAd;AAA2CvB,CAAA,CAAUe,CAAAI,WAAV,CAA3C,CACA,MACF,MAAK,CAAL,CACE0B,CAAAvE,MAAA,CAAcyC,CAAAsC,YAAd,CALJ,CASA,IAAI3B,CACJ,IAAM,EAAAA,CAAA,CAAWX,CAAAY,WAAX,CAAN,GACwB,CAIjBD,GAJDX,CAAAC,SAICU,EAHHmB,CAAAS,IAAA,CAAYvC,CAAAqC,SAAA7B,YAAA,EAAZ,CAGGG,CADLA,CACKA,CADME,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CACNW,CAAAA,CAAAA,CALP,EAMI,IAAA,CAAmB,IAAnB,EAAOA,CAAP,CAAA,CAAyB,CACvBX,CAAA,CAAOa,CAAA,CAAiB,YAAjB,CAA+Bb,CAA/B,CACP,IAAIA,CAAJ,GAAagC,CAAb,CAA+B,KAC/BrB,EAAA,CAAWE,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CACW,EAAtB,GAAIA,CAAAC,SAAJ,EACE6B,CAAAS,IAAA,CAAYvC,CAAAqC,SAAA7B,YAAA,EAAZ,CALqB,CAU7BR,CAAA,CAAOW,CA3BI,CA8Bb,IAAA,CAAQX,CAAR,CAAegC,CAAApB,WAAf,CAAA,CACEoB,CAAAQ,YAAA,CAA6BxC,CAA7B,CAvDmC,CArLvCvC,EAAA,CA0RAgF,QAA+B,CAACjF,CAAD,CAAMkF,CAAN,CAAoB,CACjD,IAAIC,EAAuB,CAAA,CAA3B,CACIC,EAAM7E,CAAA,CAAKP,CAAL,CAAUA,CAAAqF,KAAV,CACV,OAAO,CACLT,MAAOA,QAAQ,CAACU,CAAD,CAAM5D,CAAN,CAAa,CAC1B4D,CAAA,CAAM3E,CAAA,CAAU2E,CAAV,CACDH,EAAAA,CAAL,EAA6BI,CAAA,CAAgBD,CAAhB,CAA7B,GACEH,CADF,CACyBG,CADzB,CAGKH,EAAL,EAAoD,CAAA,CAApD,GAA6BtB,CAAA,CAAcyB,CAAd,CAA7B,GACEF,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAIE,CAAJ,CAaA,CAZA7E,CAAA,CAAQiB,CAAR,CAAe,QAAQ,CAACK,CAAD,CAAQyD,CAAR,CAAa,CAClC,IAAIC,EAAO9E,CAAA,CAAU6E,CAAV,CAAX,CACIvB,EAAmB,KAAnBA,GAAWqB,CAAXrB,EAAqC,KAArCA,GAA4BwB,CAA5BxB,EAAyD,YAAzDA;AAAgDwB,CAC3B,EAAA,CAAzB,GAAIC,CAAA,CAAWD,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGE,CAAA,CAASF,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAanD,CAAb,CAAoBkC,CAApB,CAD9B,GAEEmB,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIpD,CAAA,CAAeD,CAAf,CAAJ,CACA,CAAAqD,CAAA,CAAI,GAAJ,CANF,CAHkC,CAApC,CAYA,CAAAA,CAAA,CAAI,GAAJ,CAfF,CAL0B,CADvB,CAwBLL,IAAKA,QAAQ,CAACO,CAAD,CAAM,CACjBA,CAAA,CAAM3E,CAAA,CAAU2E,CAAV,CACDH,EAAL,EAAoD,CAAA,CAApD,GAA6BtB,CAAA,CAAcyB,CAAd,CAA7B,EAAkF,CAAA,CAAlF,GAA4DM,CAAA,CAAaN,CAAb,CAA5D,GACEF,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIE,CAAJ,CACA,CAAAF,CAAA,CAAI,GAAJ,CAHF,CAMIE,EAAJ,EAAWH,CAAX,GACEA,CADF,CACyB,CAAA,CADzB,CARiB,CAxBd,CAoCLpF,MAAOA,QAAQ,CAACA,CAAD,CAAQ,CAChBoF,CAAL,EACEC,CAAA,CAAIpD,CAAA,CAAejC,CAAf,CAAJ,CAFmB,CApClB,CAH0C,CAxRnDa,EAAA,CAAehB,CAAA8C,KAAAmD,UAAAC,SAAf,EAA8D,QAAQ,CAACC,CAAD,CAAM,CAE1E,MAAO,CAAG,EAAA,IAAAC,wBAAA,CAA6BD,CAA7B,CAAA,CAAoC,EAApC,CAFgE,CAtEjD,KA4EvB7D,EAAwB,iCA5ED,CA8EzBI,EAA0B,cA9ED,CAuFvBsD,EAAe3E,CAAA,CAAM,wBAAN,CAvFQ,CA2FvBgF,EAA8BhF,CAAA,CAAM,gDAAN,CA3FP,CA4FvBiF,EAA+BjF,CAAA,CAAM,OAAN,CA5FR,CA6FvBkF,EAAyB3F,CAAA,CAAO,EAAP,CACe0F,CADf,CAEeD,CAFf,CA7FF,CAkGvBG,EAAgB5F,CAAA,CAAO,EAAP,CAAWyF,CAAX,CAAwChF,CAAA,CAAM,qKAAN,CAAxC,CAlGO;AAuGvBoF,EAAiB7F,CAAA,CAAO,EAAP,CAAW0F,CAAX,CAAyCjF,CAAA,CAAM,2JAAN,CAAzC,CAvGM,CA+GvB6C,EAAc7C,CAAA,CAAM,wNAAN,CA/GS,CAoHvBsE,EAAkBtE,CAAA,CAAM,cAAN,CApHK,CAsHvB4C,EAAgBrD,CAAA,CAAO,EAAP,CACeoF,CADf,CAEeQ,CAFf,CAGeC,CAHf,CAIeF,CAJf,CAtHO,CA6HvBR,EAAW1E,CAAA,CAAM,uDAAN,CA7HY,CA+HvBqF,EAAYrF,CAAA,CAAM,kTAAN,CA/HW;AAuIvBsF,EAAWtF,CAAA,CAAM,guCAAN;AAcoE,CAAA,CAdpE,CAvIY,CAuJvByE,EAAalF,CAAA,CAAO,EAAP,CACemF,CADf,CAEeY,CAFf,CAGeD,CAHf,CAvJU,CA0KvB7B,EAAqE,QAAQ,CAAC7E,CAAD,CAAS4G,CAAT,CAAmB,CAyClGC,QAASA,EAA6B,CAAC1C,CAAD,CAAO,CAG3CA,CAAA,CAAO,mBAAP,CAA6BA,CAC7B,IAAI,CACF,IAAI2C,EAAOC,CAAA,IAAI/G,CAAAgH,UAAJD,iBAAA,CAAuC5C,CAAvC,CAA6C,WAA7C,CAAA2C,KACXA,EAAAtD,WAAAyD,OAAA,EACA,OAAOH,EAHL,CAIF,MAAOI,CAAP,CAAU,EAR+B,CAa7CC,QAASA,EAAiC,CAAChD,CAAD,CAAO,CAC/CS,CAAAG,UAAA,CAA6BZ,CAIzByC,EAAAQ,aAAJ,EACEzE,CAAA,CAAmBiC,CAAnB,CAGF,OAAOA,EATwC,CArDjD,IAAIyC,CACJ,IAAIT,CAAJ,EAAgBA,CAAAU,eAAhB,CACED,CAAA,CAAgBT,CAAAU,eAAAC,mBAAA,CAA2C,OAA3C,CADlB,KAGE,MAAM9G,EAAA,CAAgB,SAAhB,CAAN,CAEF,IAAImE,EAAmB4C,CAACH,CAAAI,gBAADD,EAAkCH,CAAAK,mBAAA,EAAlCF,eAAA,CAAoF,MAApF,CAGvB5C,EAAAG,UAAA,CAA6B,sDAC7B,OAAKH,EAAA4C,cAAA,CAA+B,KAA/B,CAAL;CAIE5C,CAAAG,UACA,CAD6B,kEAC7B,CAAIH,CAAA4C,cAAA,CAA+B,SAA/B,CAAJ,CACSX,CADT,CAGSM,CARX,EAYAQ,QAAgC,CAACxD,CAAD,CAAO,CAGrCA,CAAA,CAAO,mBAAP,CAA6BA,CAC7B,IAAI,CACFA,CAAA,CAAOyD,SAAA,CAAUzD,CAAV,CADL,CAEF,MAAO+C,CAAP,CAAU,CACV,MADU,CAGZ,IAAIW,EAAM,IAAI7H,CAAA8H,eACdD,EAAAE,aAAA,CAAmB,UACnBF,EAAAG,KAAA,CAAS,KAAT,CAAgB,+BAAhB,CAAkD7D,CAAlD,CAAwD,CAAA,CAAxD,CACA0D,EAAAI,KAAA,CAAS,IAAT,CACInB,EAAAA,CAAOe,CAAAK,SAAApB,KACXA,EAAAtD,WAAAyD,OAAA,EACA,OAAOH,EAf8B,CAvB2D,CAA5B,CAiErE9G,CAjEqE,CAiE7DA,CAAA4G,SAjE6D,CA1K7C,CAgc7B,CAAAuB,KAAA,CAEQ,CAAEC,eAAgB,OAAlB,CAFR,CAmIAnI,EAAAiB,OAAA,CAAe,YAAf,CAAAmH,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,2FAFuE;AAGzEC,EAAgB,WAHyD,CAKzEC,EAAcxI,CAAAS,SAAA,CAAiB,OAAjB,CAL2D,CAMzEI,EAAYb,CAAAa,UAN6D,CAOzE4H,EAAazI,CAAAyI,WAP4D,CAQzEC,EAAW1I,CAAA0I,SAR8D,CASzEC,EAAW3I,CAAA2I,SAEf,OAAO,SAAQ,CAACC,CAAD,CAAOC,CAAP,CAAe9F,CAAf,CAA2B,CA6BxC+F,QAASA,EAAO,CAACF,CAAD,CAAO,CAChBA,CAAL,EAGA1E,CAAAsB,KAAA,CAAUvF,CAAA,CAAa2I,CAAb,CAAV,CAJqB,CAOvBG,QAASA,EAAO,CAACC,CAAD,CAAMJ,CAAN,CAAY,CAAA,IACtBjD,CADsB,CACjBsD,EAAiBC,CAAA,CAAaF,CAAb,CAC1B9E,EAAAsB,KAAA,CAAU,KAAV,CAEA,KAAKG,CAAL,GAAYsD,EAAZ,CACE/E,CAAAsB,KAAA,CAAUG,CAAV,CAAgB,IAAhB,CAAuBsD,CAAA,CAAetD,CAAf,CAAvB,CAA6C,IAA7C,CAGE,EAAA9E,CAAA,CAAUgI,CAAV,CAAJ,EAA2B,QAA3B,EAAuCI,EAAvC,EACE/E,CAAAsB,KAAA,CAAU,UAAV,CACUqD,CADV,CAEU,IAFV,CAIF3E,EAAAsB,KAAA,CAAU,QAAV,CACUwD,CAAA5G,QAAA,CAAY,IAAZ,CAAkB,QAAlB,CADV,CAEU,IAFV,CAGA0G,EAAA,CAAQF,CAAR,CACA1E,EAAAsB,KAAA,CAAU,MAAV,CAjB0B,CAnC5B,GAAY,IAAZ,EAAIoD,CAAJ,EAA6B,EAA7B,GAAoBA,CAApB,CAAiC,MAAOA,EACxC,IAAK,CAAAD,CAAA,CAASC,CAAT,CAAL,CAAqB,KAAMJ,EAAA,CAAY,WAAZ,CAA8DI,CAA9D,CAAN,CAYrB,IAVA,IAAIM,EACFT,CAAA,CAAW1F,CAAX,CAAA,CAAyBA,CAAzB,CACA2F,CAAA,CAAS3F,CAAT,CAAA,CAAuBoG,QAA4B,EAAG,CAAC,MAAOpG,EAAR,CAAtD,CACAqG,QAAiC,EAAG,CAAC,MAAO,EAAR,CAHtC,CAMIC,EAAMT,CANV,CAOI1E,EAAO,EAPX,CAQI8E,CARJ,CASItH,CACJ,CAAQ4H,CAAR,CAAgBD,CAAAC,MAAA,CAAUhB,CAAV,CAAhB,CAAA,CAEEU,CAQA,CARMM,CAAA,CAAM,CAAN,CAQN,CANKA,CAAA,CAAM,CAAN,CAML;AANkBA,CAAA,CAAM,CAAN,CAMlB,GALEN,CAKF,EALSM,CAAA,CAAM,CAAN,CAAA,CAAW,SAAX,CAAuB,SAKhC,EAL6CN,CAK7C,EAHAtH,CAGA,CAHI4H,CAAAC,MAGJ,CAFAT,CAAA,CAAQO,CAAAG,OAAA,CAAW,CAAX,CAAc9H,CAAd,CAAR,CAEA,CADAqH,CAAA,CAAQC,CAAR,CAAaM,CAAA,CAAM,CAAN,CAAAlH,QAAA,CAAiBmG,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAc,CAAA,CAAMA,CAAAI,UAAA,CAAc/H,CAAd,CAAkB4H,CAAA,CAAM,CAAN,CAAA3H,OAAlB,CAERmH,EAAA,CAAQO,CAAR,CACA,OAAOhB,EAAA,CAAUnE,CAAA3D,KAAA,CAAU,EAAV,CAAV,CA3BiC,CAXmC,CAAlC,CAA7C,CArtB2B,CAA1B,CAAD,CA2xBGR,MA3xBH,CA2xBWA,MAAAC,QA3xBX;",
+  "sources":["angular-sanitize.js"],
+  "names":["window","angular","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","$sanitizeMinErr","$$minErr","bind","extend","forEach","isDefined","lowercase","nodeContains","htmlParser","module","provider","$SanitizeProvider","toMap","str","lowercaseKeys","obj","items","split","i","length","attrToMap","attrs","map","ii","attr","name","value","encodeEntities","replace","SURROGATE_PAIR_REGEXP","hi","charCodeAt","low","NON_ALPHANUMERIC_REGEXP","stripCustomNsAttrs","node","nodeType","Node","ELEMENT_NODE","attributes","l","attrNode","attrName","toLowerCase","lastIndexOf","removeAttributeNode","nextNode","firstChild","getNonDescendant","propName","call","outerHTML","outerText","svgEnabled","$get","$$sanitizeUri","validElements","svgElements","html","uri","isImage","test","enableSvg","this.enableSvg","htmlParserImpl","handler","undefined","inertBodyElement","getInertBodyElement","mXSSAttempts","innerHTML","start","nodeName","textContent","end","removeChild","htmlSanitizeWriterImpl","uriValidator","ignoreCurrentElement","out","push","tag","blockedElements","key","lkey","validAttrs","uriAttrs","voidElements","prototype","contains","arg","compareDocumentPosition","optionalEndTagBlockElements","optionalEndTagInlineElements","optionalEndTagElements","blockElements","inlineElements","htmlAttrs","svgAttrs","document","getInertBodyElement_DOMParser","body","parseFromString","DOMParser","remove","e","getInertBodyElement_InertDocument","documentMode","inertDocument","implementation","createHTMLDocument","querySelector","documentElement","getDocumentElement","getInertBodyElement_XHR","encodeURI","xhr","XMLHttpRequest","responseType","open","send","response","info","angularVersion","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","linkyMinErr","isFunction","isObject","isString","text","target","addText","addLink","url","linkAttributes","attributesFn","getAttributesObject","getEmptyAttributesObject","raw","match","index","substr","substring"]
 }
\ No newline at end of file
diff --git a/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js b/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
index fa6a8613174cf..2676e0ae9dd18 100644
--- a/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
+++ b/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
@@ -6,5 +6,5 @@
  * License: MIT
  */
 angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.transition","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/day.html","template/datepicker/month.html","template/datepicker/popup.html","template/datepicker/year.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("ui.bootstrap.collapse",["ui.bootstrap.transition"]).directive("collapse",["$transition",function(a){return{link:function(b,c,d){function e(b){function d(){j===e&&(j=void 0)}var e=a(c,b);return j&&j.cancel(),j=e,e.then(d,d),e}function f(){k?(k=!1,g()):(c.removeClass("collapse").addClass("collapsing"),e({height:c[0].scrollHeight+"px"}).then(g))}function g(){c.removeClass("collapsing"),c.addClass("collapse in"),c.css({height:"auto"})}function h(){if(k)k=!1,i(),c.css({height:0});else{c.css({height:c[0].scrollHeight+"px"});{c[0].offsetWidth}c.removeClass("collapse in").addClass("collapsing"),e({height:0}).then(i)}}function i(){c.removeClass("collapsing"),c.addClass("collapse")}var j,k=!0;b.$watch(d.collapse,function(a){a?h():f()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.$watch("isOpen",function(b){b&&d.closeOthers(a)}),a.toggleOpen=function(){a.isDisabled||(a.isOpen=!a.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,function(){}))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}),angular.module("ui.bootstrap.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("ui.bootstrap.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){var d=b.hasClass(e.activeClass);(!d||angular.isDefined(c.uncheckable))&&a.$apply(function(){f.$setViewValue(d?null:a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",["ui.bootstrap.transition"]).controller("CarouselController",["$scope","$timeout","$transition",function(a,b,c){function d(){e();var c=+a.interval;!isNaN(c)&&c>=0&&(g=b(f,c))}function e(){g&&(b.cancel(g),g=null)}function f(){h?(a.next(),d()):a.pause()}var g,h,i=this,j=i.slides=a.slides=[],k=-1;i.currentSlide=null;var l=!1;i.select=a.select=function(e,f){function g(){if(!l){if(i.currentSlide&&angular.isString(f)&&!a.noTransition&&e.$element){e.$element.addClass(f);{e.$element[0].offsetWidth}angular.forEach(j,function(a){angular.extend(a,{direction:"",entering:!1,leaving:!1,active:!1})}),angular.extend(e,{direction:f,active:!0,entering:!0}),angular.extend(i.currentSlide||{},{direction:f,leaving:!0}),a.$currentTransition=c(e.$element,{}),function(b,c){a.$currentTransition.then(function(){h(b,c)},function(){h(b,c)})}(e,i.currentSlide)}else h(e,i.currentSlide);i.currentSlide=e,k=m,d()}}function h(b,c){angular.extend(b,{direction:"",active:!0,leaving:!1,entering:!1}),angular.extend(c||{},{direction:"",active:!1,leaving:!1,entering:!1}),a.$currentTransition=null}var m=j.indexOf(e);void 0===f&&(f=m>k?"next":"prev"),e&&e!==i.currentSlide&&(a.$currentTransition?(a.$currentTransition.cancel(),b(g)):g())},a.$on("$destroy",function(){l=!0}),i.indexOfSlide=function(a){return j.indexOf(a)},a.next=function(){var b=(k+1)%j.length;return a.$currentTransition?void 0:i.select(j[b],"next")},a.prev=function(){var b=0>k-1?j.length-1:k-1;return a.$currentTransition?void 0:i.select(j[b],"prev")},a.isActive=function(a){return i.currentSlide===a},a.$watch("interval",d),a.$on("$destroy",e),a.play=function(){h||(h=!0,d())},a.pause=function(){a.noPause||(h=!1,e())},i.addSlide=function(b,c){b.$element=c,j.push(b),1===j.length||b.active?(i.select(j[j.length-1]),1==j.length&&a.play()):b.active=!1},i.removeSlide=function(a){var b=j.indexOf(a);j.splice(b,1),j.length>0&&a.active?i.select(b>=j.length?j[b-1]:j[b]):k>b&&k--}}]).directive("carousel",[function(){return{restrict:"EA",transclude:!0,replace:!0,controller:"CarouselController",require:"carousel",templateUrl:"template/carousel/carousel.html",scope:{interval:"=",noTransition:"=",noPause:"="}}}]).directive("slide",function(){return{require:"^carousel",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/carousel/slide.html",scope:{active:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}),angular.module("ui.bootstrap.dateparser",[]).service("dateParser",["$locale","orderByFilter",function(a,b){function c(a,b,c){return 1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}this.parsers={};var d={yyyy:{regex:"\\d{4}",apply:function(a){this.year=+a}},yy:{regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},y:{regex:"\\d{1,4}",apply:function(a){this.year=+a}},MMMM:{regex:a.DATETIME_FORMATS.MONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.MONTH.indexOf(b)}},MMM:{regex:a.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)}},MM:{regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},M:{regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},dd:{regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},d:{regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},EEEE:{regex:a.DATETIME_FORMATS.DAY.join("|")},EEE:{regex:a.DATETIME_FORMATS.SHORTDAY.join("|")}};this.createParser=function(a){var c=[],e=a.split("");return angular.forEach(d,function(b,d){var f=a.indexOf(d);if(f>-1){a=a.split(""),e[f]="("+b.regex+")",a[f]="$";for(var g=f+1,h=f+d.length;h>g;g++)e[g]="",a[g]="$";a=a.join(""),c.push({index:f,apply:b.apply})}}),{regex:new RegExp("^"+e.join("")+"$"),map:b(c,"index")}},this.parse=function(b,d){if(!angular.isString(b))return b;d=a.DATETIME_FORMATS[d]||d,this.parsers[d]||(this.parsers[d]=this.createParser(d));var e=this.parsers[d],f=e.regex,g=e.map,h=b.match(f);if(h&&h.length){for(var i,j={year:1900,month:0,date:1,hours:0},k=1,l=h.length;l>k;k++){var m=g[k-1];m.apply&&m.apply.call(j,h[k])}return c(j.year,j.month,j.date)&&(i=new Date(j.year,j.month,j.date,j.hours)),i}}}]),angular.module("ui.bootstrap.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].documentElement.scrollLeft)}},positionElements:function(a,b,c,d){var e,f,g,h,i=c.split("-"),j=i[0],k=i[1]||"center";e=d?this.offset(a):this.position(a),f=b.prop("offsetWidth"),g=b.prop("offsetHeight");var l={center:function(){return e.left+e.width/2-f/2},left:function(){return e.left},right:function(){return e.left+e.width}},m={center:function(){return e.top+e.height/2-g/2},top:function(){return e.top},bottom:function(){return e.top+e.height}};switch(j){case"right":h={top:m[k](),left:l[j]()};break;case"left":h={top:m[k](),left:e.left-f};break;case"bottom":h={top:m[j](),left:l[k]()};break;default:h={top:e.top-g,left:l[k]()}}return h}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.position"]).constant("datepickerConfig",{formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",datepickerMode:"day",minMode:"day",maxMode:"year",showWeeks:!0,startingDay:0,yearRange:20,minDate:null,maxDate:null}).controller("DatepickerController",["$scope","$attrs","$parse","$interpolate","$timeout","$log","dateFilter","datepickerConfig",function(a,b,c,d,e,f,g,h){var i=this,j={$setViewValue:angular.noop};this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","minMode","maxMode","showWeeks","startingDay","yearRange"],function(c,e){i[c]=angular.isDefined(b[c])?8>e?d(b[c])(a.$parent):a.$parent.$eval(b[c]):h[c]}),angular.forEach(["minDate","maxDate"],function(d){b[d]?a.$parent.$watch(c(b[d]),function(a){i[d]=a?new Date(a):null,i.refreshView()}):i[d]=h[d]?new Date(h[d]):null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),this.activeDate=angular.isDefined(b.initDate)?a.$parent.$eval(b.initDate):new Date,a.isActive=function(b){return 0===i.compare(b.date,i.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){j=a,j.$render=function(){i.render()}},this.render=function(){if(j.$modelValue){var a=new Date(j.$modelValue),b=!isNaN(a);b?this.activeDate=a:f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'),j.$setValidity("date",b)}this.refreshView()},this.refreshView=function(){if(this.element){this._refreshView();var a=j.$modelValue?new Date(j.$modelValue):null;j.$setValidity("date-disabled",!a||this.element&&!this.isDisabled(a))}},this.createDateObject=function(a,b){var c=j.$modelValue?new Date(j.$modelValue):null;return{date:a,label:g(a,b),selected:c&&0===this.compare(a,c),disabled:this.isDisabled(a),current:0===this.compare(a,new Date)}},this.isDisabled=function(c){return this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===i.minMode){var c=j.$modelValue?new Date(j.$modelValue):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),j.$setViewValue(c),j.$render()}else i.activeDate=b,a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=i.activeDate.getFullYear()+a*(i.step.years||0),c=i.activeDate.getMonth()+a*(i.step.months||0);i.activeDate.setFullYear(b,c,1),i.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===i.maxMode&&1===b||a.datepickerMode===i.minMode&&-1===b||(a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var k=function(){e(function(){i.element[0].focus()},0,!1)};a.$on("datepicker.focus",k),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey)if(b.preventDefault(),b.stopPropagation(),"enter"===c||"space"===c){if(i.isDisabled(i.activeDate))return;a.select(i.activeDate),k()}else!b.ctrlKey||"up"!==c&&"down"!==c?(i.handleKeyDown(c,b),i.refreshView()):(a.toggleMode("up"===c?1:-1),k())}}]).directive("datepicker",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/datepicker.html",scope:{datepickerMode:"=?",dateDisabled:"&"},require:["datepicker","?^ngModel"],controller:"DatepickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}).directive("daypicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/day.html",require:"^datepicker",link:function(b,c,d,e){function f(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?i[b]:29}function g(a,b){var c=new Array(b),d=new Date(a),e=0;for(d.setHours(12);b>e;)c[e++]=new Date(d),d.setDate(d.getDate()+1);return c}function h(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}b.showWeeks=e.showWeeks,e.step={months:1},e.element=c;var i=[31,28,31,30,31,30,31,31,30,31,30,31];e._refreshView=function(){var c=e.activeDate.getFullYear(),d=e.activeDate.getMonth(),f=new Date(c,d,1),i=e.startingDay-f.getDay(),j=i>0?7-i:-i,k=new Date(f);j>0&&k.setDate(-j+1);for(var l=g(k,42),m=0;42>m;m++)l[m]=angular.extend(e.createDateObject(l[m],e.formatDay),{secondary:l[m].getMonth()!==d,uid:b.uniqueId+"-"+m});b.labels=new Array(7);for(var n=0;7>n;n++)b.labels[n]={abbr:a(l[n].date,e.formatDayHeader),full:a(l[n].date,"EEEE")};if(b.title=a(e.activeDate,e.formatDayTitle),b.rows=e.split(l,7),b.showWeeks){b.weekNumbers=[];for(var o=h(b.rows[0][0].date),p=b.rows.length;b.weekNumbers.push(o++)<p;);}},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},e.handleKeyDown=function(a){var b=e.activeDate.getDate();if("left"===a)b-=1;else if("up"===a)b-=7;else if("right"===a)b+=1;else if("down"===a)b+=7;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getMonth()+("pageup"===a?-1:1);e.activeDate.setMonth(c,1),b=Math.min(f(e.activeDate.getFullYear(),e.activeDate.getMonth()),b)}else"home"===a?b=1:"end"===a&&(b=f(e.activeDate.getFullYear(),e.activeDate.getMonth()));e.activeDate.setDate(b)},e.refreshView()}}}]).directive("monthpicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/month.html",require:"^datepicker",link:function(b,c,d,e){e.step={years:1},e.element=c,e._refreshView=function(){for(var c=new Array(12),d=e.activeDate.getFullYear(),f=0;12>f;f++)c[f]=angular.extend(e.createDateObject(new Date(d,f,1),e.formatMonth),{uid:b.uniqueId+"-"+f});b.title=a(e.activeDate,e.formatMonthTitle),b.rows=e.split(c,3)},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth())-new Date(b.getFullYear(),b.getMonth())},e.handleKeyDown=function(a){var b=e.activeDate.getMonth();if("left"===a)b-=1;else if("up"===a)b-=3;else if("right"===a)b+=1;else if("down"===a)b+=3;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getFullYear()+("pageup"===a?-1:1);e.activeDate.setFullYear(c)}else"home"===a?b=0:"end"===a&&(b=11);e.activeDate.setMonth(b)},e.refreshView()}}}]).directive("yearpicker",["dateFilter",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/year.html",require:"^datepicker",link:function(a,b,c,d){function e(a){return parseInt((a-1)/f,10)*f+1}var f=d.yearRange;d.step={years:f},d.element=b,d._refreshView=function(){for(var b=new Array(f),c=0,g=e(d.activeDate.getFullYear());f>c;c++)b[c]=angular.extend(d.createDateObject(new Date(g+c,0,1),d.formatYear),{uid:a.uniqueId+"-"+c});a.title=[b[0].label,b[f-1].label].join(" - "),a.rows=d.split(b,5)},d.compare=function(a,b){return a.getFullYear()-b.getFullYear()},d.handleKeyDown=function(a){var b=d.activeDate.getFullYear();"left"===a?b-=1:"up"===a?b-=5:"right"===a?b+=1:"down"===a?b+=5:"pageup"===a||"pagedown"===a?b+=("pageup"===a?-1:1)*d.step.years:"home"===a?b=e(d.activeDate.getFullYear()):"end"===a&&(b=e(d.activeDate.getFullYear())+f-1),d.activeDate.setFullYear(b)},d.refreshView()}}}]).constant("datepickerPopupConfig",{datepickerPopup:"yyyy-MM-dd",currentText:"Today",clearText:"Clear",closeText:"Done",closeOnDateSelection:!0,appendToBody:!1,showButtonBar:!0}).directive("datepickerPopup",["$compile","$parse","$document","$position","dateFilter","dateParser","datepickerPopupConfig",function(a,b,c,d,e,f,g){return{restrict:"EA",require:"ngModel",scope:{isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&"},link:function(h,i,j,k){function l(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function m(a){if(a){if(angular.isDate(a)&&!isNaN(a))return k.$setValidity("date",!0),a;if(angular.isString(a)){var b=f.parse(a,n)||new Date(a);return isNaN(b)?void k.$setValidity("date",!1):(k.$setValidity("date",!0),b)}return void k.$setValidity("date",!1)}return k.$setValidity("date",!0),null}var n,o=angular.isDefined(j.closeOnDateSelection)?h.$parent.$eval(j.closeOnDateSelection):g.closeOnDateSelection,p=angular.isDefined(j.datepickerAppendToBody)?h.$parent.$eval(j.datepickerAppendToBody):g.appendToBody;h.showButtonBar=angular.isDefined(j.showButtonBar)?h.$parent.$eval(j.showButtonBar):g.showButtonBar,h.getText=function(a){return h[a+"Text"]||g[a+"Text"]},j.$observe("datepickerPopup",function(a){n=a||g.datepickerPopup,k.$render()});var q=angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");q.attr({"ng-model":"date","ng-change":"dateSelection()"});var r=angular.element(q.children()[0]);j.datepickerOptions&&angular.forEach(h.$parent.$eval(j.datepickerOptions),function(a,b){r.attr(l(b),a)}),angular.forEach(["minDate","maxDate"],function(a){j[a]&&(h.$parent.$watch(b(j[a]),function(b){h[a]=b}),r.attr(l(a),a))}),j.dateDisabled&&r.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),k.$parsers.unshift(m),h.dateSelection=function(a){angular.isDefined(a)&&(h.date=a),k.$setViewValue(h.date),k.$render(),o&&(h.isOpen=!1,i[0].focus())},i.bind("input change keyup",function(){h.$apply(function(){h.date=k.$modelValue})}),k.$render=function(){var a=k.$viewValue?e(k.$viewValue,n):"";i.val(a),h.date=m(k.$modelValue)};var s=function(a){h.isOpen&&a.target!==i[0]&&h.$apply(function(){h.isOpen=!1})},t=function(a){h.keydown(a)};i.bind("keydown",t),h.keydown=function(a){27===a.which?(a.preventDefault(),a.stopPropagation(),h.close()):40!==a.which||h.isOpen||(h.isOpen=!0)},h.$watch("isOpen",function(a){a?(h.$broadcast("datepicker.focus"),h.position=p?d.offset(i):d.position(i),h.position.top=h.position.top+i.prop("offsetHeight"),c.bind("click",s)):c.unbind("click",s)}),h.select=function(a){if("today"===a){var b=new Date;angular.isDate(k.$modelValue)?(a=new Date(k.$modelValue),a.setFullYear(b.getFullYear(),b.getMonth(),b.getDate())):a=new Date(b.setHours(0,0,0,0))}h.dateSelection(a)},h.close=function(){h.isOpen=!1,i[0].focus()};var u=a(q)(h);p?c.find("body").append(u):i.after(u),h.$on("$destroy",function(){u.remove(),i.unbind("keydown",t),c.unbind("click",s)})}}}]).directive("datepickerPopupWrap",function(){return{restrict:"EA",replace:!0,transclude:!0,templateUrl:"template/datepicker/popup.html",link:function(a,b){b.bind("click",function(a){a.preventDefault(),a.stopPropagation()})}}}),angular.module("ui.bootstrap.dropdown",[]).constant("dropdownConfig",{openClass:"open"}).service("dropdownService",["$document",function(a){var b=null;this.open=function(e){b||(a.bind("click",c),a.bind("keydown",d)),b&&b!==e&&(b.isOpen=!1),b=e},this.close=function(e){b===e&&(b=null,a.unbind("click",c),a.unbind("keydown",d))};var c=function(a){a&&a.isDefaultPrevented()||b.$apply(function(){b.isOpen=!1})},d=function(a){27===a.which&&(b.focusToggleElement(),c())}}]).controller("DropdownController",["$scope","$attrs","$parse","dropdownConfig","dropdownService","$animate",function(a,b,c,d,e,f){var g,h=this,i=a.$new(),j=d.openClass,k=angular.noop,l=b.onToggle?c(b.onToggle):angular.noop;this.init=function(d){h.$element=d,b.isOpen&&(g=c(b.isOpen),k=g.assign,a.$watch(g,function(a){i.isOpen=!!a}))},this.toggle=function(a){return i.isOpen=arguments.length?!!a:!i.isOpen},this.isOpen=function(){return i.isOpen},i.focusToggleElement=function(){h.toggleElement&&h.toggleElement[0].focus()},i.$watch("isOpen",function(b,c){f[b?"addClass":"removeClass"](h.$element,j),b?(i.focusToggleElement(),e.open(i)):e.close(i),k(a,b),angular.isDefined(b)&&b!==c&&l(a,{open:!!b})}),a.$on("$locationChangeSuccess",function(){i.isOpen=!1}),a.$on("$destroy",function(){i.$destroy()})}]).directive("dropdown",function(){return{restrict:"CA",controller:"DropdownController",link:function(a,b,c,d){d.init(b)}}}).directive("dropdownToggle",function(){return{restrict:"CA",require:"?^dropdown",link:function(a,b,c,d){if(d){d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.modal",["ui.bootstrap.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",link:function(b){b.animate=!1,a(function(){b.animate=!0})}}}]).directive("modalWindow",["$modalStack","$timeout",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"template/modal/window.html"},link:function(c,d,e){d.addClass(e.windowClass||""),c.size=e.size,b(function(){c.animate=!0,d[0].focus()}),c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))}}}}]).factory("$modalStack",["$transition","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=n.keys(),c=0;c<b.length;c++)n.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=n.get(a).value;n.remove(a),j(d.modalDomEl,d.modalScope,300,function(){d.modalScope.$destroy(),b.toggleClass(m,n.length()>0),i()})}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&(a.preventDefault(),e.$apply(function(){o.dismiss(b.key,"escape key press")})))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("body").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("<div modal-backdrop></div>")(l),f.append(k));var i=angular.element("<div modal-window></div>");i.attr({"template-url":b.windowTemplateUrl,"window-class":b.windowClass,size:b.size,index:n.length()-1,animate:"animate"}).html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass,windowTemplateUrl:b.windowTemplateUrl,size:b.size})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("ui.bootstrap.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse",function(a,b,c){var d=this,e={$setViewValue:angular.noop},f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(f,g){e=f,this.config=g,e.$render=function(){d.render()},b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){d.itemsPerPage=parseInt(b,10),a.totalPages=d.calculateTotalPages()}):this.itemsPerPage=g.itemsPerPage},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.render=function(){a.page=parseInt(e.$viewValue,10)||1},a.selectPage=function(b){a.page!==b&&b>0&&b<=a.totalPages&&(e.$setViewValue(b),e.$render())},a.getText=function(b){return a[b+"Text"]||d.config[b+"Text"]},a.noPrevious=function(){return 1===a.page},a.noNext=function(){return a.page===a.totalPages},a.$watch("totalItems",function(){a.totalPages=d.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),a.page>b?a.selectPage(b):e.$render()})}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@"},require:["pagination","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c){return{number:a,text:b,active:c}}function h(a,b){var c=[],d=1,e=b,f=angular.isDefined(k)&&b>k;f&&(l?(d=Math.max(a-Math.floor(k/2),1),e=d+k-1,e>b&&(e=b,d=e-k+1)):(d=(Math.ceil(a/k)-1)*k+1,e=Math.min(d+k-1,b)));for(var h=d;e>=h;h++){var i=g(h,h,h===a);c.push(i)}if(f&&!l){if(d>1){var j=g(d-1,"...",!1);c.unshift(j)}if(b>e){var m=g(e+1,"...",!1);c.push(m)}}return c}var i=f[0],j=f[1];if(j){var k=angular.isDefined(e.maxSize)?c.$parent.$eval(e.maxSize):b.maxSize,l=angular.isDefined(e.rotate)?c.$parent.$eval(e.rotate):b.rotate;c.boundaryLinks=angular.isDefined(e.boundaryLinks)?c.$parent.$eval(e.boundaryLinks):b.boundaryLinks,c.directionLinks=angular.isDefined(e.directionLinks)?c.$parent.$eval(e.directionLinks):b.directionLinks,i.init(j,b),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){k=parseInt(a,10),i.render()});var m=i.render;i.render=function(){m(),c.page>0&&c.page<=c.totalPages&&(c.pages=h(c.page,c.totalPages))}}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{totalItems:"=",previousText:"@",nextText:"@"},require:["pager","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&(b.align=angular.isDefined(d.align)?b.$parent.$eval(d.align):a.align,f.init(g,a))}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";
-return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!y||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?v||(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return v=null,u&&(g.cancel(u),u=null),b.tt_content?(r(),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),z(),b.tt_isOpen=!0,b.$digest(),z):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),v=null,b.tt_animation?u||(u=g(s,500)):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){u=null,t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=angular.isDefined(d[l+"Enable"]),z=function(){var a=j.positionElements(c,t,b.tt_placement,w);a.top+="px",a.left+="px",t.css(a)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var A=function(){c.unbind(x.show,k),c.unbind(x.hide,m)};d.$observe(l+"Trigger",function(a){A(),x=n(a),x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m))});var B=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(B)?!!B:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),A(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length?a.active=!0:a.active&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){b.$watch("active",function(a){a&&f.select(b)}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),a.minutes="m"===b?d:i(d),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render;var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$modelValue?new Date(o.$modelValue):null;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=i.$new();i.$on("$destroy",function(){w.$destroy()});var x="typeahead-"+w.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":x});var y=angular.element("<div typeahead-popup></div>");y.attr({id:x,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&y.attr("template-url",k.typeaheadTemplateUrl);var z=function(){w.matches=[],w.activeIdx=-1,j.attr("aria-expanded",!1)},A=function(a){return x+"-option-"+a};w.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",A(a))});var B=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c.length>0){w.activeIdx=0,w.matches.length=0;for(var e=0;e<c.length;e++)b[v.itemName]=c[e],w.matches.push({id:A(e),label:v.viewMapper(w,b),model:c[e]});w.query=a,w.position=t?f.offset(j):f.position(j),w.position.top=w.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else z();d&&q(i,!1)},function(){z(),q(i,!1)})};z(),w.query=void 0;var C;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(C&&d.cancel(C),C=d(function(){B(a)},o)):B(a):(q(i,!1),z()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),w.select=function(a){var b,c,e={};e[v.itemName]=c=w.matches[a].model,b=v.modelMapper(i,e),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,e)}),z(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==w.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(w.activeIdx=(w.activeIdx+1)%w.matches.length,w.$digest()):38===a.which?(w.activeIdx=(w.activeIdx?w.activeIdx:w.matches.length)-1,w.$digest()):13===a.which||9===a.which?w.$apply(function(){w.select(w.activeIdx)}):27===a.which&&(a.stopPropagation(),z(),w.$digest()))}),j.bind("blur",function(){m=!1});var D=function(a){j[0]!==a.target&&(z(),w.$digest())};e.bind("click",D),i.$on("$destroy",function(){e.unbind("click",D)});var E=a(y)(w);t?e.find("body").append(E):j.after(E)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="{\'alert-{{type || \'warning\'}}\': true, \'alert-dismissable\': closeable}" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html","<div ng-class=\"{\n    'active': leaving || (active && !entering),\n    'prev': (next || active) && direction=='prev',\n    'next': (next || active) && direction=='next',\n    'right': direction=='prev',\n    'left': direction=='next'\n  }\" class=\"item text-center\" ng-transclude></div>\n")}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="{\'modal-sm\': size == \'sm\', \'modal-lg\': size == \'lg\'}"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>')
+    return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!y||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?v||(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return v=null,u&&(g.cancel(u),u=null),b.tt_content?(r(),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),z(),b.tt_isOpen=!0,b.$digest(),z):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),v=null,b.tt_animation?u||(u=g(s,500)):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){u=null,t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=angular.isDefined(d[l+"Enable"]),z=function(){var a=j.positionElements(c,t,b.tt_placement,w);a.top+="px",a.left+="px",t.css(a)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var A=function(){c.unbind(x.show,k),c.unbind(x.hide,m)};d.$observe(l+"Trigger",function(a){A(),x=n(a),x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m))});var B=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(B)?!!B:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),A(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length?a.active=!0:a.active&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){b.$watch("active",function(a){a&&f.select(b)}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),a.minutes="m"===b?d:i(d),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render;var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$modelValue?new Date(o.$modelValue):null;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=i.$new();i.$on("$destroy",function(){w.$destroy()});var x="typeahead-"+w.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":x});var y=angular.element("<div typeahead-popup></div>");y.attr({id:x,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&y.attr("template-url",k.typeaheadTemplateUrl);var z=function(){w.matches=[],w.activeIdx=-1,j.attr("aria-expanded",!1)},A=function(a){return x+"-option-"+a};w.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",A(a))});var B=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c.length>0){w.activeIdx=0,w.matches.length=0;for(var e=0;e<c.length;e++)b[v.itemName]=c[e],w.matches.push({id:A(e),label:v.viewMapper(w,b),model:c[e]});w.query=a,w.position=t?f.offset(j):f.position(j),w.position.top=w.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else z();d&&q(i,!1)},function(){z(),q(i,!1)})};z(),w.query=void 0;var C;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(C&&d.cancel(C),C=d(function(){B(a)},o)):B(a):(q(i,!1),z()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),w.select=function(a){var b,c,e={};e[v.itemName]=c=w.matches[a].model,b=v.modelMapper(i,e),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,e)}),z(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==w.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(w.activeIdx=(w.activeIdx+1)%w.matches.length,w.$digest()):38===a.which?(w.activeIdx=(w.activeIdx?w.activeIdx:w.matches.length)-1,w.$digest()):13===a.which||9===a.which?w.$apply(function(){w.select(w.activeIdx)}):27===a.which&&(a.stopPropagation(),z(),w.$digest()))}),j.bind("blur",function(){m=!1});var D=function(a){j[0]!==a.target&&(z(),w.$digest())};e.bind("click",D),i.$on("$destroy",function(){e.unbind("click",D)});var E=a(y)(w);t?e.find("body").append(E):j.after(E)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="{\'alert-{{type || \'warning\'}}\': true, \'alert-dismissable\': closeable}" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html","<div ng-class=\"{\n    'active': leaving || (active && !entering),\n    'prev': (next || active) && direction=='prev',\n    'next': (next || active) && direction=='next',\n    'right': direction=='prev',\n    'left': direction=='next'\n  }\" class=\"item text-center\" ng-transclude></div>\n")}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="{\'modal-sm\': size == \'sm\', \'modal-lg\': size == \'lg\'}"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>')
 }]);
\ No newline at end of file
diff --git a/setup/pub/angular-ui-router/angular-ui-router.min.js b/setup/pub/angular-ui-router/angular-ui-router.min.js
index f065ecc960684..66568f91192ec 100644
--- a/setup/pub/angular-ui-router/angular-ui-router.min.js
+++ b/setup/pub/angular-ui-router/angular-ui-router.min.js
@@ -1,7 +1,7 @@
 /**
  * State-based routing for AngularJS
- * @version v0.2.10
+ * @version v0.4.3
  * @link http://angular-ui.github.com/
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
-"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return I(new(I(function(){},{prototype:a})),b)}function e(a){return H(arguments,function(b){b!==a&&H(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=0>d?Math.ceil(d):Math.floor(d),0>d&&(d+=c);c>d;d++)if(d in a&&a[d]===b)return d;return-1}function h(a,b,c,d){var e,h=f(c,d),i={},j=[];for(var k in h)if(h[k].params&&h[k].params.length){e=h[k].params;for(var l in e)g(j,e[l])>=0||(j.push(e[l]),i[e[l]]=a[e[l]])}return I({},i,b)}function i(a,b){var c={};return H(a,function(a){var d=b[a];c[a]=null!=d?String(d):null}),c}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return H(a,function(a){c[a]=b[a]}),c}function l(a,b){var d=1,f=2,g={},h=[],i=g,j=I(a.when(g),{$$promises:g,$$values:g});this.study=function(g){function k(a,c){if(o[c]!==f){if(n.push(c),o[c]===d)throw n.splice(0,n.indexOf(c)),new Error("Cyclic dependency: "+n.join(" -> "));if(o[c]=d,E(a))m.push(c,[function(){return b.get(a)}],h);else{var e=b.annotate(a);H(e,function(a){a!==c&&g.hasOwnProperty(a)&&k(g[a],a)}),m.push(c,a,e)}n.pop(),o[c]=f}}function l(a){return F(a)&&a.then&&a.$$promises}if(!F(g))throw new Error("'invocables' must be an object");var m=[],n=[],o={};return H(g,k),g=n=o=null,function(d,f,g){function h(){--s||(t||e(r,f.$$values),p.$$values=r,p.$$promises=!0,o.resolve(r))}function k(a){p.$$failure=a,o.reject(a)}function n(c,e,f){function i(a){l.reject(a),k(a)}function j(){if(!C(p.$$failure))try{l.resolve(b.invoke(e,g,r)),l.promise.then(function(a){r[c]=a,h()},i)}catch(a){i(a)}}var l=a.defer(),m=0;H(f,function(a){q.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,q[a].then(function(b){r[a]=b,--m||j()},i))}),m||j(),q[c]=l.promise}if(l(d)&&g===c&&(g=f,f=d,d=null),d){if(!F(d))throw new Error("'locals' must be an object")}else d=i;if(f){if(!l(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=j;var o=a.defer(),p=o.promise,q=p.$$promises={},r=I({},d),s=1+m.length/3,t=!1;if(C(f.$$failure))return k(f.$$failure),p;f.$$values?(t=e(r,f.$$values),h()):(I(q,f.$$promises),f.then(h,k));for(var u=0,v=m.length;v>u;u+=3)d.hasOwnProperty(m[u])?h():n(m[u],m[u+1],m[u+2]);return p}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function m(a,b,c){this.fromConfig=function(a,b,c){return C(a.template)?this.fromString(a.template,b):C(a.templateUrl)?this.fromUrl(a.templateUrl,b):C(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return D(a)?a(b):a},this.fromUrl=function(c,d){return D(c)&&(c=c(d)),null==c?null:a.get(c,{cache:b}).then(function(a){return a.data})},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function n(a){function b(b){if(!/^\w+(-+\w+)*$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(f[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");f[b]=!0,j.push(b)}function c(a){return a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&")}var d,e=/([:*])(\w+)|\{(\w+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,f={},g="^",h=0,i=this.segments=[],j=this.params=[];this.source=a;for(var k,l,m;(d=e.exec(a))&&(k=d[2]||d[3],l=d[4]||("*"==d[1]?".*":"[^/]*"),m=a.substring(h,d.index),!(m.indexOf("?")>=0));)g+=c(m)+"("+l+")",b(k),i.push(m),h=e.lastIndex;m=a.substring(h);var n=m.indexOf("?");if(n>=0){var o=this.sourceSearch=m.substring(n);m=m.substring(0,n),this.sourcePath=a.substring(0,h+n),H(o.substring(1).split(/[&?]/),b)}else this.sourcePath=a,this.sourceSearch="";g+=c(m)+"$",i.push(m),this.regexp=new RegExp(g),this.prefix=i[0]}function o(){this.compile=function(a){return new n(a)},this.isMatcher=function(a){return F(a)&&D(a.exec)&&D(a.format)&&D(a.concat)},this.$get=function(){return this}}function p(a){function b(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function c(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function d(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return C(d)?d:!0}var e=[],f=null;this.rule=function(a){if(!D(a))throw new Error("'rule' must be a function");return e.push(a),this},this.otherwise=function(a){if(E(a)){var b=a;a=function(){return b}}else if(!D(a))throw new Error("'rule' must be a function");return f=a,this},this.when=function(e,f){var g,h=E(f);if(E(e)&&(e=a.compile(e)),!h&&!D(f)&&!G(f))throw new Error("invalid 'handler' in when()");var i={matcher:function(b,c){return h&&(g=a.compile(c),c=["$match",function(a){return g.format(a)}]),I(function(a,e){return d(a,c,b.exec(e.path(),e.search()))},{prefix:E(b.prefix)?b.prefix:""})},regex:function(a,e){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(g=e,e=["$match",function(a){return c(g,a)}]),I(function(b,c){return d(b,e,a.exec(c.path()))},{prefix:b(a)})}},j={matcher:a.isMatcher(e),regex:e instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](e,f));throw new Error("invalid 'what' in when()")},this.$get=["$location","$rootScope","$injector",function(a,b,c){function d(b){function d(b){var d=b(c,a);return d?(E(d)&&a.replace().url(d),!0):!1}if(!b||!b.defaultPrevented){var g,h=e.length;for(g=0;h>g;g++)if(d(e[g]))return;f&&d(f)}}return b.$on("$locationChangeSuccess",d),{sync:function(){d()}}}]}function q(a,e,f){function g(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function l(a,b){var d=E(a),e=d?a:a.name,f=g(e);if(f){if(!b)throw new Error("No reference point given for path '"+e+"'");for(var h=e.split("."),i=0,j=h.length,k=b;j>i;i++)if(""!==h[i]||0!==i){if("^"!==h[i])break;if(!k.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");k=k.parent}else k=b;h=h.slice(i).join("."),e=k.name+(k.name&&h?".":"")+h}var l=w[e];return!l||!d&&(d||l!==a&&l.self!==a)?c:l}function m(a,b){x[a]||(x[a]=[]),x[a].push(b)}function n(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!E(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(w.hasOwnProperty(c))throw new Error("State '"+c+"'' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):E(b.parent)?b.parent:"";if(e&&!w[e])return m(e,b.self);for(var f in z)D(z[f])&&(b[f]=z[f](b,z.$delegates[f]));if(w[c]=b,!b[y]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){v.$current.navigable==b&&j(a,c)||v.transitionTo(b,a,{location:!1})}]),x[c])for(var g=0;g<x[c].length;g++)n(x[c][g]);return b}function o(a){return a.indexOf("*")>-1}function p(a){var b=a.split("."),c=v.$current.name.split(".");if("**"===b[0]&&(c=c.slice(c.indexOf(b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(c.indexOf(b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length!=c.length)return!1;for(var d=0,e=b.length;e>d;d++)"*"===b[d]&&(c[d]="*");return c.join("")===b.join("")}function q(a,b){return E(a)&&!C(b)?z[a]:D(b)&&E(a)?(z[a]&&!z.$delegates[a]&&(z.$delegates[a]=z[a]),z[a]=b,this):this}function r(a,b){return F(a)?b=a:b.name=a,n(b),this}function s(a,e,g,m,n,q,r,s,x){function z(){r.url()!==M&&(r.url(M),r.replace())}function A(a,c,d,f,h){var i=d?c:k(a.params,c),j={$stateParams:i};h.resolve=n.resolve(a.resolve,j,h.resolve,a);var l=[h.resolve.then(function(a){h.globals=a})];return f&&l.push(f),H(a.views,function(c,d){var e=c.resolve&&c.resolve!==a.resolve?c.resolve:{};e.$template=[function(){return g.load(d,{view:c,locals:j,params:i,notify:!1})||""}],l.push(n.resolve(e,j,h.resolve,a).then(function(f){if(D(c.controllerProvider)||G(c.controllerProvider)){var g=b.extend({},e,j);f.$$controller=m.invoke(c.controllerProvider,null,g)}else f.$$controller=c.controller;f.$$state=a,f.$$controllerAs=c.controllerAs,h[d]=f}))}),e.all(l).then(function(){return h})}var B=e.reject(new Error("transition superseded")),F=e.reject(new Error("transition prevented")),K=e.reject(new Error("transition aborted")),L=e.reject(new Error("transition failed")),M=r.url(),N=x.baseHref();return u.locals={resolve:null,globals:{$stateParams:{}}},v={params:{},current:u.self,$current:u,transition:null},v.reload=function(){v.transitionTo(v.current,q,{reload:!0,inherit:!1,notify:!1})},v.go=function(a,b,c){return this.transitionTo(a,b,I({inherit:!0,relative:v.$current},c))},v.transitionTo=function(b,c,f){c=c||{},f=I({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,k=v.$current,n=v.params,o=k.path,p=l(b,f.relative);if(!C(p)){var s={to:b,toParams:c,options:f};if(g=a.$broadcast("$stateNotFound",s,k.self,n),g.defaultPrevented)return z(),K;if(g.retry){if(f.$retry)return z(),L;var w=v.transition=e.when(g.retry);return w.then(function(){return w!==v.transition?B:(s.options.$retry=!0,v.transitionTo(s.to,s.toParams,s.options))},function(){return K}),z(),w}if(b=s.to,c=s.toParams,f=s.options,p=l(b,f.relative),!C(p)){if(f.relative)throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'");throw new Error("No such state '"+b+"'")}}if(p[y])throw new Error("Cannot transition to abstract state '"+b+"'");f.inherit&&(c=h(q,c||{},v.$current,p)),b=p;var x,D,E=b.path,G=u.locals,H=[];for(x=0,D=E[x];D&&D===o[x]&&j(c,n,D.ownParams)&&!f.reload;x++,D=E[x])G=H[x]=D.locals;if(t(b,k,G,f))return b.self.reloadOnSearch!==!1&&z(),v.transition=null,e.when(v.current);if(c=i(b.params,c||{}),f.notify&&(g=a.$broadcast("$stateChangeStart",b.self,c,k.self,n),g.defaultPrevented))return z(),F;for(var N=e.when(G),O=x;O<E.length;O++,D=E[O])G=H[O]=d(G),N=A(D,c,D===b,N,G);var P=v.transition=N.then(function(){var d,e,g;if(v.transition!==P)return B;for(d=o.length-1;d>=x;d--)g=o[d],g.self.onExit&&m.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=x;d<E.length;d++)e=E[d],e.locals=H[d],e.self.onEnter&&m.invoke(e.self.onEnter,e.self,e.locals.globals);if(v.transition!==P)return B;v.$current=b,v.current=b.self,v.params=c,J(v.params,q),v.transition=null;var h=b.navigable;return f.location&&h&&(r.url(h.url.format(h.locals.globals.$stateParams)),"replace"===f.location&&r.replace()),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,k.self,n),M=r.url(),v.current},function(d){return v.transition!==P?B:(v.transition=null,a.$broadcast("$stateChangeError",b.self,c,k.self,n,d),z(),e.reject(d))});return P},v.is=function(a,d){var e=l(a);return C(e)?v.$current!==e?!1:C(d)&&null!==d?b.equals(q,d):!0:c},v.includes=function(a,d){if(E(a)&&o(a)){if(!p(a))return!1;a=v.$current.name}var e=l(a);if(!C(e))return c;if(!C(v.$current.includes[e.name]))return!1;var f=!0;return b.forEach(d,function(a,b){C(q[b])&&q[b]===a||(f=!1)}),f},v.href=function(a,b,c){c=I({lossy:!0,inherit:!1,absolute:!1,relative:v.$current},c||{});var d=l(a,c.relative);if(!C(d))return null;b=h(q,b||{},v.$current,d);var e=d&&c.lossy?d.navigable:d,g=e&&e.url?e.url.format(i(d.params,b||{})):null;return!f.html5Mode()&&g&&(g="#"+f.hashPrefix()+g),"/"!==N&&(f.html5Mode()?g=N.slice(0,-1)+g:c.absolute&&(g=N.slice(1)+g)),c.absolute&&g&&(g=r.protocol()+"://"+r.host()+(80==r.port()||443==r.port()?"":":"+r.port())+(!f.html5Mode()&&g?"/":"")+g),g},v.get=function(a,b){if(!C(a)){var c=[];return H(w,function(a){c.push(a.self)}),c}var d=l(a,b);return d&&d.self?d.self:null},v}function t(a,b,c,d){return a!==b||(c!==b.locals||d.reload)&&a.self.reloadOnSearch!==!1?void 0:!0}var u,v,w={},x={},y="abstract",z={parent:function(a){if(C(a.parent)&&a.parent)return l(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?l(b[1]):u},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=I({},a.parent.data,a.data)),a.data},url:function(a){var b=a.url;if(E(b))return"^"==b.charAt(0)?e.compile(b.substring(1)):(a.parent.navigable||u).url.concat(b);if(e.isMatcher(b)||null==b)return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},params:function(a){if(!a.params)return a.url?a.url.parameters():a.parent.params;if(!G(a.params))throw new Error("Invalid params in state '"+a+"'");if(a.url)throw new Error("Both params and url specicified in state '"+a+"'");return a.params},views:function(a){var b={};return H(C(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),b[d]=c}),b},ownParams:function(a){if(!a.parent)return a.params;var b={};H(a.params,function(a){b[a]=!0}),H(a.parent.params,function(c){if(!b[c])throw new Error("Missing required parameter '"+c+"' in state '"+a.name+"'");b[c]=!1});var c=[];return H(b,function(a,b){a&&c.push(b)}),c},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?I({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};u=n({name:"",url:"^",views:null,"abstract":!0}),u.navigable=null,this.decorator=q,this.state=r,this.$get=s,s.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$location","$urlRouter","$browser"]}function r(){function a(a,b){return{load:function(c,d){var e,f={template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}};return d=I(f,d),d.view&&(e=b.fromConfig(d.view,d.params,d.locals)),e&&d.notify&&a.$broadcast("$viewContentLoading",d),e}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function s(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){c(function(){a[0].scrollIntoView()},0,!1)}}]}function t(a,c,d){function e(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(b){return null}}}function f(a,b){var c=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(i)return{enter:function(a,b,c){i.enter(a,null,b,c)},leave:function(a,b){i.leave(a,b)}};if(h){var d=h&&h(b,a);return{enter:function(a,b,c){d.enter(a,null,b),c()},leave:function(a,b){d.leave(a),b()}}}return c()}var g=e(),h=g("$animator"),i=g("$animate"),j={restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,e,g){return function(c,e,h){function i(){k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),l&&(q.leave(l,function(){k=null}),k=l,l=null)}function j(f){var h=c.$new(),j=l&&l.data("$uiViewName"),k=j&&a.$current&&a.$current.locals[j];if(f||k!==n){var r=g(h,function(a){q.enter(a,e,function(){(b.isDefined(p)&&!p||c.$eval(p))&&d(a)}),i()});n=a.$current.locals[r.data("$uiViewName")],l=r,m=h,m.$emit("$viewContentLoaded"),m.$eval(o)}}var k,l,m,n,o=h.onload||"",p=h.autoscroll,q=f(h,c);c.$on("$stateChangeSuccess",function(){j(!1)}),c.$on("$viewContentLoading",function(){j(!1)}),j(!0)}}};return j}function u(a,b,c){return{restrict:"ECA",priority:-400,compile:function(d){var e=d.html();return function(d,f,g){var h=g.uiView||g.name||"",i=f.inheritedData("$uiView");h.indexOf("@")<0&&(h=h+"@"+(i?i.state.name:"")),f.data("$uiViewName",h);var j=c.$current,k=j&&j.locals[h];if(k){f.data("$uiView",{name:h,state:k.$$state}),f.html(k.$template?k.$template:e);var l=a(f.contents());if(k.$$controller){k.$scope=d;var m=b(k.$$controller,k);k.$$controllerAs&&(d[k.$$controllerAs]=m),f.data("$ngControllerController",m),f.children().data("$ngControllerController",m)}l(d)}}}}}function v(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function w(a){var b=a.parent().inheritedData("$uiView");return b&&b.state&&b.state.name?b.state:void 0}function x(a,c){var d=["location","inherit","reload"];return{restrict:"A",require:"?^uiSrefActive",link:function(e,f,g,h){var i=v(g.uiSref),j=null,k=w(f)||a.$current,l="FORM"===f[0].nodeName,m=l?"action":"href",n=!0,o={relative:k},p=e.$eval(g.uiSrefOpts)||{};b.forEach(d,function(a){a in p&&(o[a]=p[a])});var q=function(b){if(b&&(j=b),n){var c=a.href(i.state,j,o);return h&&h.$$setStateInfo(i.state,j),c?void(f[0][m]=c):(n=!1,!1)}};i.paramExpr&&(e.$watch(i.paramExpr,function(a){a!==j&&q(a)},!0),j=e.$eval(i.paramExpr)),q(),l||f.bind("click",function(b){var d=b.which||b.button;d>1||b.ctrlKey||b.metaKey||b.shiftKey||f.attr("target")||(c(function(){a.go(i.state,j,o)}),b.preventDefault())})}}}function y(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs",function(d,e,f){function g(){a.$current.self===i&&h()?e.addClass(l):e.removeClass(l)}function h(){return!k||j(k,b)}var i,k,l;l=c(f.uiSrefActive||"",!1)(d),this.$$setStateInfo=function(b,c){i=a.get(b,w(e)),k=c,g()},d.$on("$stateChangeSuccess",g)}]}}function z(a){return function(b){return a.is(b)}}function A(a){return function(b){return a.includes(b)}}function B(a,b){function e(a){this.locals=a.locals.globals,this.params=this.locals.$stateParams}function f(){this.locals=null,this.params=null}function g(c,g){if(null!=g.redirectTo){var h,j=g.redirectTo;if(E(j))h=j;else{if(!D(j))throw new Error("Invalid 'redirectTo' in when()");h=function(a,b){return j(a,b.path(),b.search())}}b.when(c,h)}else a.state(d(g,{parent:null,name:"route:"+encodeURIComponent(c),url:c,onEnter:e,onExit:f}));return i.push(g),this}function h(a,b,d){function e(a){return""!==a.name?a:c}var f={routes:i,params:d,current:c};return b.$on("$stateChangeStart",function(a,c,d,f){b.$broadcast("$routeChangeStart",e(c),e(f))}),b.$on("$stateChangeSuccess",function(a,c,d,g){f.current=e(c),b.$broadcast("$routeChangeSuccess",e(c),e(g)),J(d,f.params)}),b.$on("$stateChangeError",function(a,c,d,f,g,h){b.$broadcast("$routeChangeError",e(c),e(f),h)}),f}var i=[];e.$inject=["$$state"],this.when=g,this.$get=h,h.$inject=["$state","$rootScope","$routeParams"]}var C=b.isDefined,D=b.isFunction,E=b.isString,F=b.isObject,G=b.isArray,H=b.forEach,I=b.extend,J=b.copy;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),l.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",l),m.$inject=["$http","$templateCache","$injector"],b.module("ui.router.util").service("$templateFactory",m),n.prototype.concat=function(a){return new n(this.sourcePath+a+this.sourceSearch)},n.prototype.toString=function(){return this.source},n.prototype.exec=function(a,b){var c=this.regexp.exec(a);if(!c)return null;var d,e=this.params,f=e.length,g=this.segments.length-1,h={};if(g!==c.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");for(d=0;g>d;d++)h[e[d]]=c[d+1];for(;f>d;d++)h[e[d]]=b[e[d]];return h},n.prototype.parameters=function(){return this.params},n.prototype.format=function(a){var b=this.segments,c=this.params;if(!a)return b.join("");var d,e,f,g=b.length-1,h=c.length,i=b[0];for(d=0;g>d;d++)f=a[c[d]],null!=f&&(i+=encodeURIComponent(f)),i+=b[d+1];for(;h>d;d++)f=a[c[d]],null!=f&&(i+=(e?"&":"?")+c[d]+"="+encodeURIComponent(f),e=!0);return i},b.module("ui.router.util").provider("$urlMatcherFactory",o),p.$inject=["$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",p),q.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider","$locationProvider"],b.module("ui.router.state").value("$stateParams",{}).provider("$state",q),r.$inject=[],b.module("ui.router.state").provider("$view",r),b.module("ui.router.state").provider("$uiViewScroll",s),t.$inject=["$state","$injector","$uiViewScroll"],u.$inject=["$compile","$controller","$state"],b.module("ui.router.state").directive("uiView",t),b.module("ui.router.state").directive("uiView",u),x.$inject=["$state","$timeout"],y.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",x).directive("uiSrefActive",y),z.$inject=["$state"],A.$inject=["$state"],b.module("ui.router.state").filter("isState",z).filter("includedByState",A),B.$inject=["$stateProvider","$urlRouterProvider"],b.module("ui.router.compat").provider("$route",B).directive("ngView",t)}(window,window.angular);
\ No newline at end of file
+"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return T(new(T(function(){},{prototype:a})),b)}function e(a){return S(arguments,function(b){b!==a&&S(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a){if(Object.keys)return Object.keys(a);var b=[];return S(a,function(a,c){b.push(c)}),b}function h(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=d<0?Math.ceil(d):Math.floor(d),d<0&&(d+=c);d<c;d++)if(d in a&&a[d]===b)return d;return-1}function i(a,b,c,d){var e,i=f(c,d),j={},k=[];for(var l in i)if(i[l]&&i[l].params&&(e=g(i[l].params),e.length))for(var m in e)h(k,e[m])>=0||(k.push(e[m]),j[e[m]]=a[e[m]]);return T({},j,b)}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return S(a,function(a){c[a]=b[a]}),c}function l(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return S(c,function(c){c in a&&(b[c]=a[c])}),b}function m(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var d in a)-1==h(c,d)&&(b[d]=a[d]);return b}function n(a,b){var c=R(a),d=c?[]:{};return S(a,function(a,e){b(a,e)&&(d[c?d.length:e]=a)}),d}function o(a,b){var c=R(a)?[]:{};return S(a,function(a,d){c[d]=b(a,d)}),c}function p(a){return a.then(c,function(){})&&a}function q(a,b){var d=1,f=2,i={},j=[],k=i,l=T(a.when(i),{$$promises:i,$$values:i});this.study=function(i){function n(a,c){if(t[c]!==f){if(s.push(c),t[c]===d)throw s.splice(0,h(s,c)),new Error("Cyclic dependency: "+s.join(" -> "));if(t[c]=d,P(a))r.push(c,[function(){return b.get(a)}],j);else{var e=b.annotate(a);S(e,function(a){a!==c&&i.hasOwnProperty(a)&&n(i[a],a)}),r.push(c,a,e)}s.pop(),t[c]=f}}function o(a){return Q(a)&&a.then&&a.$$promises}if(!Q(i))throw new Error("'invocables' must be an object");var q=g(i||{}),r=[],s=[],t={};return S(i,n),i=s=t=null,function(d,f,g){function h(){--v||(w||e(u,f.$$values),s.$$values=u,s.$$promises=s.$$promises||!0,delete s.$$inheritedValues,n.resolve(u))}function i(a){s.$$failure=a,n.reject(a)}function j(c,e,f){function j(a){l.reject(a),i(a)}function k(){if(!N(s.$$failure))try{l.resolve(b.invoke(e,g,u)),l.promise.then(function(a){u[c]=a,h()},j)}catch(a){j(a)}}var l=a.defer(),m=0;S(f,function(a){t.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,t[a].then(function(b){u[a]=b,--m||k()},j))}),m||k(),t[c]=p(l.promise)}if(o(d)&&g===c&&(g=f,f=d,d=null),d){if(!Q(d))throw new Error("'locals' must be an object")}else d=k;if(f){if(!o(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=l;var n=a.defer(),s=p(n.promise),t=s.$$promises={},u=T({},d),v=1+r.length/3,w=!1;if(p(s),N(f.$$failure))return i(f.$$failure),s;f.$$inheritedValues&&e(u,m(f.$$inheritedValues,q)),T(t,f.$$promises),f.$$values?(w=e(u,m(f.$$values,q)),s.$$inheritedValues=m(f.$$values,q),h()):(f.$$inheritedValues&&(s.$$inheritedValues=m(f.$$inheritedValues,q)),f.then(h,i));for(var x=0,y=r.length;x<y;x+=3)d.hasOwnProperty(r[x])?h():j(r[x],r[x+1],r[x+2]);return s}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function r(){var a=b.version.minor<3;this.shouldUnsafelyUseHttp=function(b){a=!!b},this.$get=["$http","$templateCache","$injector",function(b,c,d){return new s(b,c,d,a)}]}function s(a,b,c,d){this.fromConfig=function(a,b,c){return N(a.template)?this.fromString(a.template,b):N(a.templateUrl)?this.fromUrl(a.templateUrl,b):N(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return O(a)?a(b):a},this.fromUrl=function(e,f){return O(e)&&(e=e(f)),null==e?null:d?a.get(e,{cache:b,headers:{Accept:"text/html"}}).then(function(a){return a.data}):c.get("$templateRequest")(e)},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function t(a,b,e){function f(b,c,d,e){if(q.push(b),o[b])return o[b];if(!/^\w+([-.]+\w+)*(?:\[\])?$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(p[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");return p[b]=new W.Param(b,c,d,e),p[b]}function g(a,b,c,d){var e=["",""],f=a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!b)return f;switch(c){case!1:e=["(",")"+(d?"?":"")];break;case!0:f=f.replace(/\/$/,""),e=["(?:/(",")|/)?"];break;default:e=["("+c+"|",")?"]}return f+e[0]+b+e[1]}function h(e,f){var g,h,i,j,k;return g=e[2]||e[3],k=b.params[g],i=a.substring(m,e.index),h=f?e[4]:e[4]||("*"==e[1]?".*":null),h&&(j=W.type(h)||d(W.type("string"),{pattern:new RegExp(h,b.caseInsensitive?"i":c)})),{id:g,regexp:h,segment:i,type:j,cfg:k}}b=T({params:{}},Q(b)?b:{});var i,j=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,k=/([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,l="^",m=0,n=this.segments=[],o=e?e.params:{},p=this.params=e?e.params.$$new():new W.ParamSet,q=[];this.source=a;for(var r,s,t;(i=j.exec(a))&&(r=h(i,!1),!(r.segment.indexOf("?")>=0));)s=f(r.id,r.type,r.cfg,"path"),l+=g(r.segment,s.type.pattern.source,s.squash,s.isOptional),n.push(r.segment),m=j.lastIndex;t=a.substring(m);var u=t.indexOf("?");if(u>=0){var v=this.sourceSearch=t.substring(u);if(t=t.substring(0,u),this.sourcePath=a.substring(0,m+u),v.length>0)for(m=0;i=k.exec(v);)r=h(i,!0),s=f(r.id,r.type,r.cfg,"search"),m=j.lastIndex}else this.sourcePath=a,this.sourceSearch="";l+=g(t)+(!1===b.strict?"/?":"")+"$",n.push(t),this.regexp=new RegExp(l,b.caseInsensitive?"i":c),this.prefix=n[0],this.$$paramNames=q}function u(a){T(this,a)}function v(){function a(a){return null!=a?a.toString().replace(/(~|\/)/g,function(a){return{"~":"~~","/":"~2F"}[a]}):a}function e(a){return null!=a?a.toString().replace(/(~~|~2F)/g,function(a){return{"~~":"~","~2F":"/"}[a]}):a}function f(){return{strict:p,caseInsensitive:m}}function i(a){return O(a)||R(a)&&O(a[a.length-1])}function j(){for(;w.length;){var a=w.shift();if(a.pattern)throw new Error("You cannot override a type's .pattern at runtime.");b.extend(r[a.name],l.invoke(a.def))}}function k(a){T(this,a||{})}W=this;var l,m=!1,p=!0,q=!1,r={},s=!0,w=[],x={string:{encode:a,decode:e,is:function(a){return null==a||!N(a)||"string"==typeof a},pattern:/[^\/]*/},int:{encode:a,decode:function(a){return parseInt(a,10)},is:function(a){return a!==c&&null!==a&&this.decode(a.toString())===a},pattern:/-?\d+/},bool:{encode:function(a){return a?1:0},decode:function(a){return 0!==parseInt(a,10)},is:function(a){return!0===a||!1===a},pattern:/0|1/},date:{encode:function(a){return this.is(a)?[a.getFullYear(),("0"+(a.getMonth()+1)).slice(-2),("0"+a.getDate()).slice(-2)].join("-"):c},decode:function(a){if(this.is(a))return a;var b=this.capture.exec(a);return b?new Date(b[1],b[2]-1,b[3]):c},is:function(a){return a instanceof Date&&!isNaN(a.valueOf())},equals:function(a,b){return this.is(a)&&this.is(b)&&a.toISOString()===b.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:b.toJson,decode:b.fromJson,is:b.isObject,equals:b.equals,pattern:/[^\/]*/},any:{encode:b.identity,decode:b.identity,equals:b.equals,pattern:/.*/}};v.$$getDefaultValue=function(a){if(!i(a.value))return a.value;if(!l)throw new Error("Injectable functions cannot be called at configuration time");return l.invoke(a.value)},this.caseInsensitive=function(a){return N(a)&&(m=a),m},this.strictMode=function(a){return N(a)&&(p=a),p},this.defaultSquashPolicy=function(a){if(!N(a))return q;if(!0!==a&&!1!==a&&!P(a))throw new Error("Invalid squash policy: "+a+". Valid policies: false, true, arbitrary-string");return q=a,a},this.compile=function(a,b){return new t(a,T(f(),b))},this.isMatcher=function(a){if(!Q(a))return!1;var b=!0;return S(t.prototype,function(c,d){O(c)&&(b=b&&N(a[d])&&O(a[d]))}),b},this.type=function(a,b,c){if(!N(b))return r[a];if(r.hasOwnProperty(a))throw new Error("A type named '"+a+"' has already been defined.");return r[a]=new u(T({name:a},b)),c&&(w.push({name:a,def:c}),s||j()),this},S(x,function(a,b){r[b]=new u(T({name:b},a))}),r=d(r,{}),this.$get=["$injector",function(a){return l=a,s=!1,j(),S(x,function(a,b){r[b]||(r[b]=new u(a))}),this}],this.Param=function(a,d,e,f){function j(a){var b=Q(a)?g(a):[];return-1===h(b,"value")&&-1===h(b,"type")&&-1===h(b,"squash")&&-1===h(b,"array")&&(a={value:a}),a.$$fn=i(a.value)?a.value:function(){return a.value},a}function k(c,d,e){if(c.type&&d)throw new Error("Param '"+a+"' has two type configurations.");return d||(c.type?b.isString(c.type)?r[c.type]:c.type instanceof u?c.type:new u(c.type):"config"===e?r.any:r.string)}function m(){var b={array:"search"===f&&"auto"},c=a.match(/\[\]$/)?{array:!0}:{};return T(b,c,e).array}function p(a,b){var c=a.squash;if(!b||!1===c)return!1;if(!N(c)||null==c)return q;if(!0===c||P(c))return c;throw new Error("Invalid squash policy: '"+c+"'. Valid policies: false, true, or arbitrary string")}function s(a,b,d,e){var f,g,i=[{from:"",to:d||b?c:""},{from:null,to:d||b?c:""}];return f=R(a.replace)?a.replace:[],P(e)&&f.push({from:e,to:c}),g=o(f,function(a){return a.from}),n(i,function(a){return-1===h(g,a.from)}).concat(f)}function t(){if(!l)throw new Error("Injectable functions cannot be called at configuration time");var a=l.invoke(e.$$fn);if(null!==a&&a!==c&&!x.type.is(a))throw new Error("Default value ("+a+") for parameter '"+x.id+"' is not an instance of Type ("+x.type.name+")");return a}function v(a){function b(a){return function(b){return b.from===a}}function c(a){var c=o(n(x.replace,b(a)),function(a){return a.to});return c.length?c[0]:a}return a=c(a),N(a)?x.type.$normalize(a):t()}function w(){return"{Param:"+a+" "+d+" squash: '"+A+"' optional: "+z+"}"}var x=this;e=j(e),d=k(e,d,f);var y=m();d=y?d.$asArray(y,"search"===f):d,"string"!==d.name||y||"path"!==f||e.value!==c||(e.value="");var z=e.value!==c,A=p(e,z),B=s(e,y,z,A);T(this,{id:a,type:d,location:f,array:y,squash:A,replace:B,isOptional:z,value:v,dynamic:c,config:e,toString:w})},k.prototype={$$new:function(){return d(this,T(new k,{$$parent:this}))},$$keys:function(){for(var a=[],b=[],c=this,d=g(k.prototype);c;)b.push(c),c=c.$$parent;return b.reverse(),S(b,function(b){S(g(b),function(b){-1===h(a,b)&&-1===h(d,b)&&a.push(b)})}),a},$$values:function(a){var b={},c=this;return S(c.$$keys(),function(d){b[d]=c[d].value(a&&a[d])}),b},$$equals:function(a,b){var c=!0,d=this;return S(d.$$keys(),function(e){var f=a&&a[e],g=b&&b[e];d[e].type.equals(f,g)||(c=!1)}),c},$$validates:function(a){var d,e,f,g,h,i=this.$$keys();for(d=0;d<i.length&&(e=this[i[d]],(f=a[i[d]])!==c&&null!==f||!e.isOptional);d++){if(g=e.type.$normalize(f),!e.type.is(g))return!1;if(h=e.type.encode(g),b.isString(h)&&!e.type.pattern.exec(h))return!1}return!0},$$parent:c},this.ParamSet=k}function w(a,d){function e(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function f(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function g(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return!N(d)||d}function h(d,e,f,g,h){function m(a,b,c){return"/"===q?a:b?q.slice(0,-1)+a:c?q.slice(1)+a:a}function n(a){function b(a){var b=a(f,d);return!!b&&(P(b)&&d.replace().url(b),!0)}if(!a||!a.defaultPrevented){p&&d.url();p=c;var e,g=j.length;for(e=0;e<g;e++)if(b(j[e]))return;k&&b(k)}}function o(){return i=i||e.$on("$locationChangeSuccess",n)}var p,q=g.baseHref(),r=d.url();return l||o(),{sync:function(){n()},listen:function(){return o()},update:function(a){if(a)return void(r=d.url());d.url()!==r&&(d.url(r),d.replace())},push:function(a,b,e){var f=a.format(b||{});null!==f&&b&&b["#"]&&(f+="#"+b["#"]),d.url(f),p=e&&e.$$avoidResync?d.url():c,e&&e.replace&&d.replace()},href:function(c,e,f){if(!c.validates(e))return null;var g=a.html5Mode();b.isObject(g)&&(g=g.enabled),g=g&&h.history;var i=c.format(e);if(f=f||{},g||null===i||(i="#"+a.hashPrefix()+i),null!==i&&e&&e["#"]&&(i+="#"+e["#"]),i=m(i,g,f.absolute),!f.absolute||!i)return i;var j=!g&&i?"/":"",k=d.port();return k=80===k||443===k?"":":"+k,[d.protocol(),"://",d.host(),k,j,i].join("")}}}var i,j=[],k=null,l=!1;this.rule=function(a){if(!O(a))throw new Error("'rule' must be a function");return j.push(a),this},this.otherwise=function(a){if(P(a)){var b=a;a=function(){return b}}else if(!O(a))throw new Error("'rule' must be a function");return k=a,this},this.when=function(a,b){var c,h=P(b);if(P(a)&&(a=d.compile(a)),!h&&!O(b)&&!R(b))throw new Error("invalid 'handler' in when()");var i={matcher:function(a,b){return h&&(c=d.compile(b),b=["$match",function(a){return c.format(a)}]),T(function(c,d){return g(c,b,a.exec(d.path(),d.search()))},{prefix:P(a.prefix)?a.prefix:""})},regex:function(a,b){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(c=b,b=["$match",function(a){return f(c,a)}]),T(function(c,d){return g(c,b,a.exec(d.path()))},{prefix:e(a)})}},j={matcher:d.isMatcher(a),regex:a instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](a,b));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(a){a===c&&(a=!0),l=a},this.$get=h,h.$inject=["$location","$rootScope","$injector","$browser","$sniffer"]}function x(a,e){function f(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function m(a,b){if(!a)return c;var d=P(a),e=d?a:a.name;if(f(e)){if(!b)throw new Error("No reference point given for path '"+e+"'");b=m(b);for(var g=e.split("."),h=0,i=g.length,j=b;h<i;h++)if(""!==g[h]||0!==h){if("^"!==g[h])break;if(!j.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");j=j.parent}else j=b;g=g.slice(h).join("."),e=j.name+(j.name&&g?".":"")+g}var k=A[e];return!k||!d&&(d||k!==a&&k.self!==a)?c:k}function n(a,b){B[a]||(B[a]=[]),B[a].push(b)}function q(a){for(var b=B[a]||[];b.length;)r(b.shift())}function r(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!P(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(A.hasOwnProperty(c))throw new Error("State '"+c+"' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):P(b.parent)?b.parent:Q(b.parent)&&P(b.parent.name)?b.parent.name:"";if(e&&!A[e])return n(e,b.self);for(var f in D)O(D[f])&&(b[f]=D[f](b,D.$delegates[f]));return A[c]=b,!b[C]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){z.$current.navigable==b&&j(a,c)||z.transitionTo(b,a,{inherit:!0,location:!1})}]),q(c),b}function s(a){return a.indexOf("*")>-1}function t(a){for(var b=a.split("."),c=z.$current.name.split("."),d=0,e=b.length;d<e;d++)"*"===b[d]&&(c[d]="*");return"**"===b[0]&&(c=c.slice(h(c,b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(h(c,b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length==c.length&&c.join("")===b.join("")}function u(a,b){return P(a)&&!N(b)?D[a]:O(b)&&P(a)?(D[a]&&!D.$delegates[a]&&(D.$delegates[a]=D[a]),D[a]=b,this):this}function v(a,b){return Q(a)?b=a:b.name=a,r(b),this}function w(a,e,f,h,j,l,n,q,r){function u(b,c,d,f){var g=a.$broadcast("$stateNotFound",b,c,d);if(g.defaultPrevented)return n.update(),E;if(!g.retry)return null;if(f.$retry)return n.update(),F;var h=z.transition=e.when(g.retry);return h.then(function(){return h!==z.transition?(a.$broadcast("$stateChangeCancel",b.to,b.toParams,c,d),B):(b.options.$retry=!0,z.transitionTo(b.to,b.toParams,b.options))},function(){return E}),n.update(),h}function v(a,c,d,g,i,l){function m(){var c=[];return S(a.views,function(d,e){var g=d.resolve&&d.resolve!==a.resolve?d.resolve:{};g.$template=[function(){return f.load(e,{view:d,locals:i.globals,params:n,notify:l.notify})||""}],c.push(j.resolve(g,i.globals,i.resolve,a).then(function(c){if(O(d.controllerProvider)||R(d.controllerProvider)){var f=b.extend({},g,i.globals);c.$$controller=h.invoke(d.controllerProvider,null,f)}else c.$$controller=d.controller;c.$$state=a,c.$$controllerAs=d.controllerAs,c.$$resolveAs=d.resolveAs,i[e]=c}))}),e.all(c).then(function(){return i.globals})}var n=d?c:k(a.params.$$keys(),c),o={$stateParams:n};i.resolve=j.resolve(a.resolve,o,i.resolve,a);var p=[i.resolve.then(function(a){i.globals=a})];return g&&p.push(g),e.all(p).then(m).then(function(a){return i})}var w=new Error("transition superseded"),B=p(e.reject(w)),D=p(e.reject(new Error("transition prevented"))),E=p(e.reject(new Error("transition aborted"))),F=p(e.reject(new Error("transition failed")));return y.locals={resolve:null,globals:{$stateParams:{}}},z={params:{},current:y.self,$current:y,transition:null},z.reload=function(a){return z.transitionTo(z.current,l,{reload:a||!0,inherit:!1,notify:!0})},z.go=function(a,b,c){return z.transitionTo(a,b,T({inherit:!0,relative:z.$current},c))},z.transitionTo=function(b,c,f){c=c||{},f=T({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,j=z.$current,o=z.params,q=j.path,r=m(b,f.relative),s=c["#"];if(!N(r)){var t={to:b,toParams:c,options:f},A=u(t,j.self,o,f);if(A)return A;if(b=t.to,c=t.toParams,f=t.options,r=m(b,f.relative),!N(r)){if(!f.relative)throw new Error("No such state '"+b+"'");throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'")}}if(r[C])throw new Error("Cannot transition to abstract state '"+b+"'");if(f.inherit&&(c=i(l,c||{},z.$current,r)),!r.params.$$validates(c))return F;c=r.params.$$values(c),b=r;var E=b.path,G=0,H=E[G],I=y.locals,J=[];if(f.reload){if(P(f.reload)||Q(f.reload)){if(Q(f.reload)&&!f.reload.name)throw new Error("Invalid reload state object");var K=!0===f.reload?q[0]:m(f.reload);if(f.reload&&!K)throw new Error("No such reload state '"+(P(f.reload)?f.reload:f.reload.name)+"'");for(;H&&H===q[G]&&H!==K;)I=J[G]=H.locals,G++,H=E[G]}}else for(;H&&H===q[G]&&H.ownParams.$$equals(c,o);)I=J[G]=H.locals,G++,H=E[G];if(x(b,c,j,o,I,f))return s&&(c["#"]=s),z.params=c,U(z.params,l),U(k(b.params.$$keys(),l),b.locals.globals.$stateParams),f.location&&b.navigable&&b.navigable.url&&(n.push(b.navigable.url,c,{$$avoidResync:!0,replace:"replace"===f.location}),n.update(!0)),z.transition=null,e.when(z.current);if(c=k(b.params.$$keys(),c||{}),s&&(c["#"]=s),f.notify&&a.$broadcast("$stateChangeStart",b.self,c,j.self,o,f).defaultPrevented)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),null==z.transition&&n.update(),D;for(var L=e.when(I),M=G;M<E.length;M++,H=E[M])I=J[M]=d(I),L=v(H,c,H===b,L,I,f);var O=z.transition=L.then(function(){var d,e,g;if(z.transition!==O)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B;for(d=q.length-1;d>=G;d--)g=q[d],g.self.onExit&&h.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=G;d<E.length;d++)e=E[d],e.locals=J[d],e.self.onEnter&&h.invoke(e.self.onEnter,e.self,e.locals.globals);return z.transition!==O?(a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B):(z.$current=b,z.current=b.self,z.params=c,U(z.params,l),z.transition=null,f.location&&b.navigable&&n.push(b.navigable.url,b.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===f.location}),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,j.self,o),n.update(!0),z.current)}).then(null,function(d){return d===w?B:z.transition!==O?(a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B):(z.transition=null,g=a.$broadcast("$stateChangeError",b.self,c,j.self,o,d),g.defaultPrevented||n.update(),e.reject(d))});return p(O),O},z.is=function(a,b,d){d=T({relative:z.$current},d||{});var e=m(a,d.relative);return N(e)?z.$current===e&&(!b||g(b).reduce(function(a,c){var d=e.params[c];return a&&(!d||d.type.equals(l[c],b[c]))},!0)):c},z.includes=function(a,b,d){if(d=T({relative:z.$current},d||{}),P(a)&&s(a)){if(!t(a))return!1;a=z.$current.name}var e=m(a,d.relative);if(!N(e))return c;if(!N(z.$current.includes[e.name]))return!1;if(!b)return!0;for(var f=g(b),h=0;h<f.length;h++){var i=f[h],j=e.params[i];if(j&&!j.type.equals(l[i],b[i]))return!1}return g(b).reduce(function(a,c){var d=e.params[c];return a&&!d||d.type.equals(l[c],b[c])},!0)},z.href=function(a,b,d){d=T({lossy:!0,inherit:!0,absolute:!1,relative:z.$current},d||{});var e=m(a,d.relative);if(!N(e))return null;d.inherit&&(b=i(l,b||{},z.$current,e));var f=e&&d.lossy?e.navigable:e;return f&&f.url!==c&&null!==f.url?n.href(f.url,k(e.params.$$keys().concat("#"),b||{}),{absolute:d.absolute}):null},z.get=function(a,b){if(0===arguments.length)return o(g(A),function(a){return A[a].self});var c=m(a,b||z.$current);return c&&c.self?c.self:null},z}function x(a,b,c,d,e,f){function g(a,b,c){function d(b){return"search"!=a.params[b].location}var e=a.params.$$keys().filter(d),f=l.apply({},[a.params].concat(e));return new W.ParamSet(f).$$equals(b,c)}if(!f.reload&&a===c&&(e===c.locals||!1===a.self.reloadOnSearch&&g(c,d,b)))return!0}var y,z,A={},B={},C="abstract",D={parent:function(a){if(N(a.parent)&&a.parent)return m(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?m(b[1]):y},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=d(a.parent.data,a.data)),a.data},url:function(a){var b=a.url,c={params:a.params||{}};if(P(b))return"^"==b.charAt(0)?e.compile(b.substring(1),c):(a.parent.navigable||y).url.concat(b,c);if(!b||e.isMatcher(b))return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},ownParams:function(a){var b=a.url&&a.url.params||new W.ParamSet;return S(a.params||{},function(a,c){b[c]||(b[c]=new W.Param(c,null,a,"config"))}),b},params:function(a){var b=l(a.ownParams,a.ownParams.$$keys());return a.parent&&a.parent.params?T(a.parent.params.$$new(),b):new W.ParamSet},views:function(a){var b={};return S(N(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),c.resolveAs=c.resolveAs||a.resolveAs||"$resolve",b[d]=c}),b},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?T({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};y=r({name:"",url:"^",views:null,abstract:!0}),y.navigable=null,this.decorator=u,this.state=v,this.$get=w,w.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function y(){function a(a,b){return{load:function(a,c){var d;return c=T({template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}},c),c.view&&(d=b.fromConfig(c.view,c.params,c.locals)),d}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function z(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){return c(function(){a[0].scrollIntoView()},0,!1)}}]}function A(a,c,d,e,f){function g(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(a){return null}}}function h(a,c){var d=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(k)return{enter:function(a,c,d){b.version.minor>2?k.enter(a,null,c).then(d):k.enter(a,null,c,d)},leave:function(a,c){b.version.minor>2?k.leave(a).then(c):k.leave(a,c)}};if(j){var e=j&&j(c,a);return{enter:function(a,b,c){e.enter(a,null,b),c()},leave:function(a,b){e.leave(a),b()}}}return d()}var i=g(),j=i("$animator"),k=i("$animate");return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,g,i){return function(c,g,j){function k(){if(m&&(m.remove(),m=null),o&&(o.$destroy(),o=null),n){var a=n.data("$uiViewAnim");s.leave(n,function(){a.$$animLeave.resolve(),m=null}),m=n,n=null}}function l(h){var l,m=C(c,j,g,e),t=m&&a.$current&&a.$current.locals[m];if(h||t!==p){l=c.$new(),p=a.$current.locals[m],l.$emit("$viewContentLoading",m);var u=i(l,function(a){var e=f.defer(),h=f.defer(),i={$animEnter:e.promise,$animLeave:h.promise,$$animLeave:h};a.data("$uiViewAnim",i),s.enter(a,g,function(){e.resolve(),o&&o.$emit("$viewContentAnimationEnded"),(b.isDefined(r)&&!r||c.$eval(r))&&d(a)}),k()});n=u,o=l,o.$emit("$viewContentLoaded",m),o.$eval(q)}}var m,n,o,p,q=j.onload||"",r=j.autoscroll,s=h(j,c);g.inheritedData("$uiView");c.$on("$stateChangeSuccess",function(){l(!1)}),l(!0)}}}}function B(a,c,d,e){return{restrict:"ECA",priority:-400,compile:function(f){var g=f.html();return f.empty?f.empty():f[0].innerHTML=null,function(f,h,i){var j=d.$current,k=C(f,i,h,e),l=j&&j.locals[k];if(!l)return h.html(g),void a(h.contents())(f);h.data("$uiView",{name:k,state:l.$$state}),h.html(l.$template?l.$template:g);var m=b.extend({},l);f[l.$$resolveAs]=m;var n=a(h.contents());if(l.$$controller){l.$scope=f,l.$element=h;var o=c(l.$$controller,l);l.$$controllerAs&&(f[l.$$controllerAs]=o,f[l.$$controllerAs][l.$$resolveAs]=m),O(o.$onInit)&&o.$onInit(),h.data("$ngControllerController",o),h.children().data("$ngControllerController",o)}n(f)}}}}function C(a,b,c,d){var e=d(b.uiView||b.name||"")(a),f=c.inheritedData("$uiView");return e.indexOf("@")>=0?e:e+"@"+(f?f.state.name:"")}function D(a,b){var c,d=a.match(/^\s*({[^}]*})\s*$/);if(d&&(a=b+"("+d[1]+")"),!(c=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/))||4!==c.length)throw new Error("Invalid state ref '"+a+"'");return{state:c[1],paramExpr:c[3]||null}}function E(a){var b=a.parent().inheritedData("$uiView");if(b&&b.state&&b.state.name)return b.state}function F(a){var b="[object SVGAnimatedString]"===Object.prototype.toString.call(a.prop("href")),c="FORM"===a[0].nodeName;return{attr:c?"action":b?"xlink:href":"href",isAnchor:"A"===a.prop("tagName").toUpperCase(),clickable:!c}}function G(a,b,c,d,e){return function(f){var g=f.which||f.button,h=e();if(!(g>1||f.ctrlKey||f.metaKey||f.shiftKey||a.attr("target"))){var i=c(function(){b.go(h.state,h.params,h.options)});f.preventDefault();var j=d.isAnchor&&!h.href?1:0;f.preventDefault=function(){j--<=0&&c.cancel(i)}}}}function H(a,b){return{relative:E(a)||b.$current,inherit:!0}}function I(a,c){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(d,e,f,g){var h,i=D(f.uiSref,a.current.name),j={state:i.state,href:null,params:null},k=F(e),l=g[1]||g[0],m=null;j.options=T(H(e,a),f.uiSrefOpts?d.$eval(f.uiSrefOpts):{});var n=function(c){c&&(j.params=b.copy(c)),j.href=a.href(i.state,j.params,j.options),m&&m(),l&&(m=l.$$addStateInfo(i.state,j.params)),null!==j.href&&f.$set(k.attr,j.href)};i.paramExpr&&(d.$watch(i.paramExpr,function(a){a!==j.params&&n(a)},!0),j.params=b.copy(d.$eval(i.paramExpr))),n(),k.clickable&&(h=G(e,a,c,k,function(){return j}),e[e.on?"on":"bind"]("click",h),d.$on("$destroy",function(){e[e.off?"off":"unbind"]("click",h)}))}}}function J(a,b){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(c,d,e,f){function g(b){m.state=b[0],m.params=b[1],m.options=b[2],m.href=a.href(m.state,m.params,m.options),n&&n(),j&&(n=j.$$addStateInfo(m.state,m.params)),m.href&&e.$set(i.attr,m.href)}var h,i=F(d),j=f[1]||f[0],k=[e.uiState,e.uiStateParams||null,e.uiStateOpts||null],l="["+k.map(function(a){return a||"null"}).join(", ")+"]",m={state:null,params:null,options:null,href:null},n=null;c.$watch(l,g,!0),g(c.$eval(l)),i.clickable&&(h=G(d,a,b,i,function(){return m}),d[d.on?"on":"bind"]("click",h),c.$on("$destroy",function(){d[d.off?"off":"unbind"]("click",h)}))}}}function K(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs","$timeout",function(b,d,e,f){function g(b,c,e){var f=a.get(b,E(d)),g=h(b,c),i={state:f||{name:b},params:c,hash:g};return p.push(i),q[g]=e,function(){var a=p.indexOf(i);-1!==a&&p.splice(a,1)}}function h(a,c){if(!P(a))throw new Error("state should be a string");return Q(c)?a+V(c):(c=b.$eval(c),Q(c)?a+V(c):a)}function i(){for(var a=0;a<p.length;a++)l(p[a].state,p[a].params)?j(d,q[p[a].hash]):k(d,q[p[a].hash]),m(p[a].state,p[a].params)?j(d,n):k(d,n)}function j(a,b){f(function(){a.addClass(b)})}function k(a,b){a.removeClass(b)}function l(b,c){return a.includes(b.name,c)}function m(b,c){return a.is(b.name,c)}var n,o,p=[],q={};n=c(e.uiSrefActiveEq||"",!1)(b);try{o=b.$eval(e.uiSrefActive)}catch(a){}o=o||c(e.uiSrefActive||"",!1)(b),Q(o)&&S(o,function(c,d){if(P(c)){var e=D(c,a.current.name);g(e.state,b.$eval(e.paramExpr),d)}}),this.$$addStateInfo=function(a,b){if(!(Q(o)&&p.length>0)){var c=g(a,b,o);return i(),c}},b.$on("$stateChangeSuccess",i),i()}]}}function L(a){var b=function(b,c){return a.is(b,c)};return b.$stateful=!0,b}function M(a){var b=function(b,c,d){return a.includes(b,c,d)};return b.$stateful=!0,b}var N=b.isDefined,O=b.isFunction,P=b.isString,Q=b.isObject,R=b.isArray,S=b.forEach,T=b.extend,U=b.copy,V=b.toJson;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),q.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",q),b.module("ui.router.util").provider("$templateFactory",r);var W;t.prototype.concat=function(a,b){var c={caseInsensitive:W.caseInsensitive(),strict:W.strictMode(),squash:W.defaultSquashPolicy()};return new t(this.sourcePath+a+this.sourceSearch,T(c,b),this)},t.prototype.toString=function(){return this.source},t.prototype.exec=function(a,b){function c(a){function b(a){return a.split("").reverse().join("")}function c(a){return a.replace(/\\-/g,"-")}return o(o(b(a).split(/-(?!\\)/),b),c).reverse()}var d=this.regexp.exec(a);if(!d)return null;b=b||{};var e,f,g,h=this.parameters(),i=h.length,j=this.segments.length-1,k={};if(j!==d.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");var l,m;for(e=0;e<j;e++){for(g=h[e],l=this.params[g],m=d[e+1],f=0;f<l.replace.length;f++)l.replace[f].from===m&&(m=l.replace[f].to);m&&!0===l.array&&(m=c(m)),N(m)&&(m=l.type.decode(m)),k[g]=l.value(m)}for(;e<i;e++){for(g=h[e],k[g]=this.params[g].value(b[g]),l=this.params[g],m=b[g],f=0;f<l.replace.length;f++)l.replace[f].from===m&&(m=l.replace[f].to);N(m)&&(m=l.type.decode(m)),k[g]=l.value(m)}return k},t.prototype.parameters=function(a){return N(a)?this.params[a]||null:this.$$paramNames},t.prototype.validates=function(a){return this.params.$$validates(a)},t.prototype.format=function(a){function b(a){return encodeURIComponent(a).replace(/-/g,function(a){return"%5C%"+a.charCodeAt(0).toString(16).toUpperCase()})}a=a||{};var c=this.segments,d=this.parameters(),e=this.params;if(!this.validates(a))return null;var f,g=!1,h=c.length-1,i=d.length,j=c[0];for(f=0;f<i;f++){var k=f<h,l=d[f],m=e[l],n=m.value(a[l]),p=m.isOptional&&m.type.equals(m.value(),n),q=!!p&&m.squash,r=m.type.encode(n);if(k){var s=c[f+1],t=f+1===h;if(!1===q)null!=r&&(R(r)?j+=o(r,b).join("-"):j+=encodeURIComponent(r)),j+=s;else if(!0===q){var u=j.match(/\/$/)?/\/?(.*)/:/(.*)/;j+=s.match(u)[1]}else P(q)&&(j+=q+s);t&&!0===m.squash&&"/"===j.slice(-1)&&(j=j.slice(0,-1))}else{if(null==r||p&&!1!==q)continue;if(R(r)||(r=[r]),0===r.length)continue;r=o(r,encodeURIComponent).join("&"+l+"="),j+=(g?"&":"?")+l+"="+r,g=!0}}return j},u.prototype.is=function(a,b){return!0},u.prototype.encode=function(a,b){return a},u.prototype.decode=function(a,b){return a},u.prototype.equals=function(a,b){return a==b},u.prototype.$subPattern=function(){var a=this.pattern.toString();return a.substr(1,a.length-2)},u.prototype.pattern=/.*/,u.prototype.toString=function(){return"{Type:"+this.name+"}"},u.prototype.$normalize=function(a){return this.is(a)?a:this.decode(a)},u.prototype.$asArray=function(a,b){function d(a,b){function d(a,b){return function(){return a[b].apply(a,arguments)}}function e(a){return R(a)?a:N(a)?[a]:[]}function f(a){switch(a.length){case 0:return c;case 1:return"auto"===b?a[0]:a;default:return a}}function g(a){return!a}function h(a,b){return function(c){if(R(c)&&0===c.length)return c;c=e(c);var d=o(c,a);return!0===b?0===n(d,g).length:f(d)}}function i(a){return function(b,c){var d=e(b),f=e(c);if(d.length!==f.length)return!1;for(var g=0;g<d.length;g++)if(!a(d[g],f[g]))return!1;return!0}}this.encode=h(d(a,"encode")),this.decode=h(d(a,"decode")),this.is=h(d(a,"is"),!0),this.equals=i(d(a,"equals")),this.pattern=a.pattern,this.$normalize=h(d(a,"$normalize")),this.name=a.name,this.$arrayMode=b}if(!a)return this;if("auto"===a&&!b)throw new Error("'auto' array mode is for query parameters only");return new d(this,a)},b.module("ui.router.util").provider("$urlMatcherFactory",v),b.module("ui.router.util").run(["$urlMatcherFactory",function(a){}]),w.$inject=["$locationProvider","$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",w),x.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],b.module("ui.router.state").factory("$stateParams",function(){return{}}).constant("$state.runtime",{autoinject:!0}).provider("$state",x).run(["$injector",function(a){a.get("$state.runtime").autoinject&&a.get("$state")}]),y.$inject=[],b.module("ui.router.state").provider("$view",y),b.module("ui.router.state").provider("$uiViewScroll",z),A.$inject=["$state","$injector","$uiViewScroll","$interpolate","$q"],B.$inject=["$compile","$controller","$state","$interpolate"],b.module("ui.router.state").directive("uiView",A),b.module("ui.router.state").directive("uiView",B),I.$inject=["$state","$timeout"],J.$inject=["$state","$timeout"],K.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",I).directive("uiSrefActive",K).directive("uiSrefActiveEq",K).directive("uiState",J),L.$inject=["$state"],M.$inject=["$state"],b.module("ui.router.state").filter("isState",L).filter("includedByState",M)}(window,window.angular);
\ No newline at end of file
diff --git a/setup/pub/angular/angular.js b/setup/pub/angular/angular.js
index f53b5280f8647..189ff16495b25 100644
--- a/setup/pub/angular/angular.js
+++ b/setup/pub/angular/angular.js
@@ -1,15 +1,65 @@
 /**
- * @license AngularJS v1.2.16
- * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.6.9
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, document, undefined) {'use strict';
+(function(window) {'use strict';
+
+    /* exported
+  minErrConfig,
+  errorHandlingConfig,
+  isValidObjectMaxDepth
+*/
+
+    var minErrConfig = {
+        objectMaxDepth: 5
+    };
+
+    /**
+     * @ngdoc function
+     * @name angular.errorHandlingConfig
+     * @module ng
+     * @kind function
+     *
+     * @description
+     * Configure several aspects of error handling in AngularJS if used as a setter or return the
+     * current configuration if used as a getter. The following options are supported:
+     *
+     * - **objectMaxDepth**: The maximum depth to which objects are traversed when stringified for error messages.
+     *
+     * Omitted or undefined options will leave the corresponding configuration values unchanged.
+     *
+     * @param {Object=} config - The configuration object. May only contain the options that need to be
+     *     updated. Supported keys:
+     *
+     * * `objectMaxDepth`  **{Number}** - The max depth for stringifying objects. Setting to a
+     *   non-positive or non-numeric value, removes the max depth limit.
+     *   Default: 5
+     */
+    function errorHandlingConfig(config) {
+        if (isObject(config)) {
+            if (isDefined(config.objectMaxDepth)) {
+                minErrConfig.objectMaxDepth = isValidObjectMaxDepth(config.objectMaxDepth) ? config.objectMaxDepth : NaN;
+            }
+        } else {
+            return minErrConfig;
+        }
+    }
+
+    /**
+     * @private
+     * @param {Number} maxDepth
+     * @return {boolean}
+     */
+    function isValidObjectMaxDepth(maxDepth) {
+        return isNumber(maxDepth) && maxDepth > 0;
+    }
 
     /**
      * @description
      *
      * This object provides a utility for producing rich Error messages within
-     * Angular. It can be called as follows:
+     * AngularJS. It can be called as follows:
      *
      * var exampleMinErr = minErr('example');
      * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
@@ -30,140 +80,145 @@
      * should all be static strings, not variables or general expressions.
      *
      * @param {string} module The namespace to use for the new minErr instance.
+     * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
+     *   error from returned function, for cases when a particular type of error is useful.
      * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
      */
 
-    function minErr(module) {
-        return function () {
+    function minErr(module, ErrorConstructor) {
+        ErrorConstructor = ErrorConstructor || Error;
+        return function() {
             var code = arguments[0],
-                prefix = '[' + (module ? module + ':' : '') + code + '] ',
                 template = arguments[1],
-                templateArgs = arguments,
-                stringify = function (obj) {
-                    if (typeof obj === 'function') {
-                        return obj.toString().replace(/ \{[\s\S]*$/, '');
-                    } else if (typeof obj === 'undefined') {
-                        return 'undefined';
-                    } else if (typeof obj !== 'string') {
-                        return JSON.stringify(obj);
-                    }
-                    return obj;
-                },
-                message, i;
+                message = '[' + (module ? module + ':' : '') + code + '] ',
+                templateArgs = sliceArgs(arguments, 2).map(function(arg) {
+                    return toDebugString(arg, minErrConfig.objectMaxDepth);
+                }),
+                paramPrefix, i;
 
-            message = prefix + template.replace(/\{\d+\}/g, function (match) {
-                var index = +match.slice(1, -1), arg;
+            message += template.replace(/\{\d+\}/g, function(match) {
+                var index = +match.slice(1, -1);
 
-                if (index + 2 < templateArgs.length) {
-                    arg = templateArgs[index + 2];
-                    if (typeof arg === 'function') {
-                        return arg.toString().replace(/ ?\{[\s\S]*$/, '');
-                    } else if (typeof arg === 'undefined') {
-                        return 'undefined';
-                    } else if (typeof arg !== 'string') {
-                        return toJson(arg);
-                    }
-                    return arg;
+                if (index < templateArgs.length) {
+                    return templateArgs[index];
                 }
+
                 return match;
             });
 
-            message = message + '\nhttp://errors.angularjs.org/1.2.16/' +
-            (module ? module + '/' : '') + code;
-            for (i = 2; i < arguments.length; i++) {
-                message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
-                encodeURIComponent(stringify(arguments[i]));
+            message += '\nhttp://errors.angularjs.org/1.6.9/' +
+                (module ? module + '/' : '') + code;
+
+            for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+                message += paramPrefix + 'p' + i + '=' + encodeURIComponent(templateArgs[i]);
             }
 
-            return new Error(message);
+            return new ErrorConstructor(message);
         };
     }
 
-    /* We need to tell jshint what variables are being exported */
-    /* global
-     -angular,
-     -msie,
-     -jqLite,
-     -jQuery,
-     -slice,
-     -push,
-     -toString,
-     -ngMinErr,
-     -_angular,
-     -angularModule,
-     -nodeName_,
-     -uid,
-
-     -lowercase,
-     -uppercase,
-     -manualLowercase,
-     -manualUppercase,
-     -nodeName_,
-     -isArrayLike,
-     -forEach,
-     -sortedKeys,
-     -forEachSorted,
-     -reverseParams,
-     -nextUid,
-     -setHashKey,
-     -extend,
-     -int,
-     -inherit,
-     -noop,
-     -identity,
-     -valueFn,
-     -isUndefined,
-     -isDefined,
-     -isObject,
-     -isString,
-     -isNumber,
-     -isDate,
-     -isArray,
-     -isFunction,
-     -isRegExp,
-     -isWindow,
-     -isScope,
-     -isFile,
-     -isBlob,
-     -isBoolean,
-     -trim,
-     -isElement,
-     -makeMap,
-     -map,
-     -size,
-     -includes,
-     -indexOf,
-     -arrayRemove,
-     -isLeafNode,
-     -copy,
-     -shallowCopy,
-     -equals,
-     -csp,
-     -concat,
-     -sliceArgs,
-     -bind,
-     -toJsonReplacer,
-     -toJson,
-     -fromJson,
-     -toBoolean,
-     -startingTag,
-     -tryDecodeURIComponent,
-     -parseKeyValue,
-     -toKeyValue,
-     -encodeUriSegment,
-     -encodeUriQuery,
-     -angularInit,
-     -bootstrap,
-     -snake_case,
-     -bindJQuery,
-     -assertArg,
-     -assertArgFn,
-     -assertNotHasOwnProperty,
-     -getter,
-     -getBlockElements,
-     -hasOwnProperty,
-
-     */
+    /* We need to tell ESLint what variables are being exported */
+    /* exported
+  angular,
+  msie,
+  jqLite,
+  jQuery,
+  slice,
+  splice,
+  push,
+  toString,
+  minErrConfig,
+  errorHandlingConfig,
+  isValidObjectMaxDepth,
+  ngMinErr,
+  angularModule,
+  uid,
+  REGEX_STRING_REGEXP,
+  VALIDITY_STATE_PROPERTY,
+
+  lowercase,
+  uppercase,
+  manualLowercase,
+  manualUppercase,
+  nodeName_,
+  isArrayLike,
+  forEach,
+  forEachSorted,
+  reverseParams,
+  nextUid,
+  setHashKey,
+  extend,
+  toInt,
+  inherit,
+  merge,
+  noop,
+  identity,
+  valueFn,
+  isUndefined,
+  isDefined,
+  isObject,
+  isBlankObject,
+  isString,
+  isNumber,
+  isNumberNaN,
+  isDate,
+  isError,
+  isArray,
+  isFunction,
+  isRegExp,
+  isWindow,
+  isScope,
+  isFile,
+  isFormData,
+  isBlob,
+  isBoolean,
+  isPromiseLike,
+  trim,
+  escapeForRegexp,
+  isElement,
+  makeMap,
+  includes,
+  arrayRemove,
+  copy,
+  simpleCompare,
+  equals,
+  csp,
+  jq,
+  concat,
+  sliceArgs,
+  bind,
+  toJsonReplacer,
+  toJson,
+  fromJson,
+  convertTimezoneToLocal,
+  timezoneToOffset,
+  startingTag,
+  tryDecodeURIComponent,
+  parseKeyValue,
+  toKeyValue,
+  encodeUriSegment,
+  encodeUriQuery,
+  angularInit,
+  bootstrap,
+  getTestability,
+  snake_case,
+  bindJQuery,
+  assertArg,
+  assertArgFn,
+  assertNotHasOwnProperty,
+  getter,
+  getBlockNodes,
+  hasOwnProperty,
+  createMap,
+  stringify,
+
+  NODE_TYPE_ELEMENT,
+  NODE_TYPE_ATTRIBUTE,
+  NODE_TYPE_TEXT,
+  NODE_TYPE_COMMENT,
+  NODE_TYPE_DOCUMENT,
+  NODE_TYPE_DOCUMENT_FRAGMENT
+*/
 
 ////////////////////////////////////
 
@@ -171,91 +226,107 @@
      * @ngdoc module
      * @name ng
      * @module ng
+     * @installation
      * @description
      *
-     * # ng (core module)
      * The ng module is loaded by default when an AngularJS application is started. The module itself
      * contains the essential components for an AngularJS application to function. The table below
      * lists a high level breakdown of each of the services/factories, filters, directives and testing
      * components available within this core module.
      *
-     * <div doc-module-components="ng"></div>
      */
 
+    var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
+
+// The name of a form control's ValidityState property.
+// This is used so that it's possible for internal tests to create mock ValidityStates.
+    var VALIDITY_STATE_PROPERTY = 'validity';
+
+
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+
     /**
      * @ngdoc function
      * @name angular.lowercase
      * @module ng
-     * @function
+     * @kind function
+     *
+     * @deprecated
+     * sinceVersion="1.5.0"
+     * removeVersion="1.7.0"
+     * Use [String.prototype.toLowerCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase) instead.
      *
      * @description Converts the specified string to lowercase.
      * @param {string} string String to be converted to lowercase.
      * @returns {string} Lowercased string.
      */
-    var lowercase = function(string){return isString(string) ? string.toLowerCase() : string;};
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
 
     /**
      * @ngdoc function
      * @name angular.uppercase
      * @module ng
-     * @function
+     * @kind function
+     *
+     * @deprecated
+     * sinceVersion="1.5.0"
+     * removeVersion="1.7.0"
+     * Use [String.prototype.toUpperCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase) instead.
      *
      * @description Converts the specified string to uppercase.
      * @param {string} string String to be converted to uppercase.
      * @returns {string} Uppercased string.
      */
-    var uppercase = function(string){return isString(string) ? string.toUpperCase() : string;};
+    var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
 
 
     var manualLowercase = function(s) {
-        /* jshint bitwise: false */
+        /* eslint-disable no-bitwise */
         return isString(s)
             ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
             : s;
+        /* eslint-enable */
     };
     var manualUppercase = function(s) {
-        /* jshint bitwise: false */
+        /* eslint-disable no-bitwise */
         return isString(s)
             ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
             : s;
+        /* eslint-enable */
     };
 
 
 // String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
 // locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
-// with correct but slower alternatives.
+// with correct but slower alternatives. See https://github.com/angular/angular.js/issues/11387
     if ('i' !== 'I'.toLowerCase()) {
         lowercase = manualLowercase;
         uppercase = manualUppercase;
     }
 
 
-    var /** holds major version number for IE or NaN for real browsers */
-        msie,
+    var
+        msie,             // holds major version number for IE, or NaN if UA is not IE.
         jqLite,           // delay binding since jQuery could be loaded after us.
         jQuery,           // delay binding
         slice             = [].slice,
+        splice            = [].splice,
         push              = [].push,
         toString          = Object.prototype.toString,
+        getPrototypeOf    = Object.getPrototypeOf,
         ngMinErr          = minErr('ng'),
 
-
-        _angular          = window.angular,
         /** @name angular */
         angular           = window.angular || (window.angular = {}),
         angularModule,
-        nodeName_,
-        uid               = ['0', '0', '0'];
+        uid               = 0;
 
+// Support: IE 9-11 only
     /**
-     * IE 11 changed the format of the UserAgent string.
-     * See http://msdn.microsoft.com/en-us/library/ms537503.aspx
+     * documentMode is an IE-only property
+     * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
      */
-    msie = int((/msie (\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
-    if (isNaN(msie)) {
-        msie = int((/trident\/.*; rv:(\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
-    }
+    msie = window.document.documentMode;
 
 
     /**
@@ -265,39 +336,51 @@
      *                   String ...)
      */
     function isArrayLike(obj) {
-        if (obj == null || isWindow(obj)) {
-            return false;
-        }
 
-        var length = obj.length;
+        // `null`, `undefined` and `window` are not array-like
+        if (obj == null || isWindow(obj)) return false;
 
-        if (obj.nodeType === 1 && length) {
-            return true;
-        }
+        // arrays, strings and jQuery/jqLite objects are array like
+        // * jqLite is either the jQuery or jqLite constructor function
+        // * we have to check the existence of jqLite first as this method is called
+        //   via the forEach method when constructing the jqLite object in the first place
+        if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true;
+
+        // Support: iOS 8.2 (not reproducible in simulator)
+        // "length" in obj used to prevent JIT error (gh-11508)
+        var length = 'length' in Object(obj) && obj.length;
+
+        // NodeList objects (with `item` method) and
+        // other objects with suitable length characteristics are array-like
+        return isNumber(length) &&
+            (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item === 'function');
 
-        return isString(obj) || isArray(obj) || length === 0 ||
-        typeof length === 'number' && length > 0 && (length - 1) in obj;
     }
 
     /**
      * @ngdoc function
      * @name angular.forEach
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Invokes the `iterator` function once for each item in `obj` collection, which can be either an
-     * object or an array. The `iterator` function is invoked with `iterator(value, key)`, where `value`
-     * is the value of an object property or an array element and `key` is the object property key or
-     * array element index. Specifying a `context` for the function is optional.
+     * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value`
+     * is the value of an object property or an array element, `key` is the object property key or
+     * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional.
      *
      * It is worth noting that `.forEach` does not iterate over inherited properties because it filters
      * using the `hasOwnProperty` method.
      *
+     * Unlike ES262's
+     * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18),
+     * providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just
+     * return the value provided.
+     *
      ```js
      var values = {name: 'misko', gender: 'male'};
      var log = [];
-     angular.forEach(values, function(value, key){
+     angular.forEach(values, function(value, key) {
        this.push(key + ': ' + value);
      }, log);
      expect(log).toEqual(['name: misko', 'gender: male']);
@@ -308,26 +391,42 @@
      * @param {Object=} context Object to become context (`this`) for the iterator function.
      * @returns {Object|Array} Reference to `obj`.
      */
+
     function forEach(obj, iterator, context) {
-        var key;
+        var key, length;
         if (obj) {
-            if (isFunction(obj)){
+            if (isFunction(obj)) {
                 for (key in obj) {
-                    // Need to check if hasOwnProperty exists,
-                    // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function
-                    if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) {
-                        iterator.call(context, obj[key], key);
+                    if (key !== 'prototype' && key !== 'length' && key !== 'name' && obj.hasOwnProperty(key)) {
+                        iterator.call(context, obj[key], key, obj);
+                    }
+                }
+            } else if (isArray(obj) || isArrayLike(obj)) {
+                var isPrimitive = typeof obj !== 'object';
+                for (key = 0, length = obj.length; key < length; key++) {
+                    if (isPrimitive || key in obj) {
+                        iterator.call(context, obj[key], key, obj);
                     }
                 }
             } else if (obj.forEach && obj.forEach !== forEach) {
-                obj.forEach(iterator, context);
-            } else if (isArrayLike(obj)) {
-                for (key = 0; key < obj.length; key++)
-                    iterator.call(context, obj[key], key);
-            } else {
+                obj.forEach(iterator, context, obj);
+            } else if (isBlankObject(obj)) {
+                // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+                for (key in obj) {
+                    iterator.call(context, obj[key], key, obj);
+                }
+            } else if (typeof obj.hasOwnProperty === 'function') {
+                // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
                 for (key in obj) {
                     if (obj.hasOwnProperty(key)) {
-                        iterator.call(context, obj[key], key);
+                        iterator.call(context, obj[key], key, obj);
+                    }
+                }
+            } else {
+                // Slow path for objects which do not have a method `hasOwnProperty`
+                for (key in obj) {
+                    if (hasOwnProperty.call(obj, key)) {
+                        iterator.call(context, obj[key], key, obj);
                     }
                 }
             }
@@ -335,19 +434,9 @@
         return obj;
     }
 
-    function sortedKeys(obj) {
-        var keys = [];
-        for (var key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                keys.push(key);
-            }
-        }
-        return keys.sort();
-    }
-
     function forEachSorted(obj, iterator, context) {
-        var keys = sortedKeys(obj);
-        for ( var i = 0; i < keys.length; i++) {
+        var keys = Object.keys(obj).sort();
+        for (var i = 0; i < keys.length; i++) {
             iterator.call(context, obj[keys[i]], keys[i]);
         }
         return keys;
@@ -360,37 +449,21 @@
      * @returns {function(*, string)}
      */
     function reverseParams(iteratorFn) {
-        return function(value, key) { iteratorFn(key, value); };
+        return function(value, key) {iteratorFn(key, value);};
     }
 
     /**
-     * A consistent way of creating unique IDs in angular. The ID is a sequence of alpha numeric
-     * characters such as '012ABC'. The reason why we are not using simply a number counter is that
-     * the number string gets longer over time, and it can also overflow, where as the nextId
-     * will grow much slower, it is a string, and it will never overflow.
+     * A consistent way of creating unique IDs in angular.
      *
-     * @returns {string} an unique alpha-numeric string
+     * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before
+     * we hit number precision issues in JavaScript.
+     *
+     * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M
+     *
+     * @returns {number} an unique alpha-numeric string
      */
     function nextUid() {
-        var index = uid.length;
-        var digit;
-
-        while(index) {
-            index--;
-            digit = uid[index].charCodeAt(0);
-            if (digit == 57 /*'9'*/) {
-                uid[index] = 'A';
-                return uid.join('');
-            }
-            if (digit == 90  /*'Z'*/) {
-                uid[index] = '0';
-            } else {
-                uid[index] = String.fromCharCode(digit + 1);
-                return uid.join('');
-            }
-        }
-        uid.unshift('0');
-        return uid.join('');
+        return ++uid;
     }
 
 
@@ -402,54 +475,126 @@
     function setHashKey(obj, h) {
         if (h) {
             obj.$$hashKey = h;
-        }
-        else {
+        } else {
             delete obj.$$hashKey;
         }
     }
 
+
+    function baseExtend(dst, objs, deep) {
+        var h = dst.$$hashKey;
+
+        for (var i = 0, ii = objs.length; i < ii; ++i) {
+            var obj = objs[i];
+            if (!isObject(obj) && !isFunction(obj)) continue;
+            var keys = Object.keys(obj);
+            for (var j = 0, jj = keys.length; j < jj; j++) {
+                var key = keys[j];
+                var src = obj[key];
+
+                if (deep && isObject(src)) {
+                    if (isDate(src)) {
+                        dst[key] = new Date(src.valueOf());
+                    } else if (isRegExp(src)) {
+                        dst[key] = new RegExp(src);
+                    } else if (src.nodeName) {
+                        dst[key] = src.cloneNode(true);
+                    } else if (isElement(src)) {
+                        dst[key] = src.clone();
+                    } else {
+                        if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
+                        baseExtend(dst[key], [src], true);
+                    }
+                } else {
+                    dst[key] = src;
+                }
+            }
+        }
+
+        setHashKey(dst, h);
+        return dst;
+    }
+
     /**
      * @ngdoc function
      * @name angular.extend
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
-     * Extends the destination object `dst` by copying all of the properties from the `src` object(s)
-     * to `dst`. You can specify multiple `src` objects.
+     * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+     * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+     * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
+     *
+     * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
+     * {@link angular.merge} for this.
      *
      * @param {Object} dst Destination object.
      * @param {...Object} src Source object(s).
      * @returns {Object} Reference to `dst`.
      */
     function extend(dst) {
-        var h = dst.$$hashKey;
-        forEach(arguments, function(obj){
-            if (obj !== dst) {
-                forEach(obj, function(value, key){
-                    dst[key] = value;
-                });
-            }
-        });
+        return baseExtend(dst, slice.call(arguments, 1), false);
+    }
 
-        setHashKey(dst,h);
-        return dst;
+
+    /**
+     * @ngdoc function
+     * @name angular.merge
+     * @module ng
+     * @kind function
+     *
+     * @description
+     * Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+     * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+     * by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
+     *
+     * Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
+     * objects, performing a deep copy.
+     *
+     * @deprecated
+     * sinceVersion="1.6.5"
+     * This function is deprecated, but will not be removed in the 1.x lifecycle.
+     * There are edge cases (see {@link angular.merge#known-issues known issues}) that are not
+     * supported by this function. We suggest
+     * using [lodash's merge()](https://lodash.com/docs/4.17.4#merge) instead.
+     *
+     * @knownIssue
+     * This is a list of (known) object types that are not handled correctly by this function:
+     * - [`Blob`](https://developer.mozilla.org/docs/Web/API/Blob)
+     * - [`MediaStream`](https://developer.mozilla.org/docs/Web/API/MediaStream)
+     * - [`CanvasGradient`](https://developer.mozilla.org/docs/Web/API/CanvasGradient)
+     * - AngularJS {@link $rootScope.Scope scopes};
+     *
+     * @param {Object} dst Destination object.
+     * @param {...Object} src Source object(s).
+     * @returns {Object} Reference to `dst`.
+     */
+    function merge(dst) {
+        return baseExtend(dst, slice.call(arguments, 1), true);
     }
 
-    function int(str) {
+
+
+    function toInt(str) {
         return parseInt(str, 10);
     }
 
+    var isNumberNaN = Number.isNaN || function isNumberNaN(num) {
+        // eslint-disable-next-line no-self-compare
+        return num !== num;
+    };
+
 
     function inherit(parent, extra) {
-        return extend(new (extend(function() {}, {prototype:parent}))(), extra);
+        return extend(Object.create(parent), extra);
     }
 
     /**
      * @ngdoc function
      * @name angular.noop
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * A function that performs no operations. This function can be useful when writing code in the
@@ -469,7 +614,7 @@
      * @ngdoc function
      * @name angular.identity
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * A function that returns its first argument. This function is useful when writing code in the
@@ -477,21 +622,38 @@
      *
      ```js
      function transformer(transformationFn, value) {
-       return (transformationFn || angular.identity)(value);
-     };
+     return (transformationFn || angular.identity)(value);
+   };
+
+     // E.g.
+     function getResult(fn, input) {
+     return (fn || angular.identity)(input);
+   };
+
+     getResult(function(n) { return n * 2; }, 21);   // returns 42
+     getResult(null, 21);                            // returns 21
+     getResult(undefined, 21);                       // returns 21
      ```
+     *
+     * @param {*} value to be returned.
+     * @returns {*} the value passed in.
      */
     function identity($) {return $;}
     identity.$inject = [];
 
 
-    function valueFn(value) {return function() {return value;};}
+    function valueFn(value) {return function valueRef() {return value;};}
+
+    function hasCustomToString(obj) {
+        return isFunction(obj.toString) && obj.toString !== toString;
+    }
+
 
     /**
      * @ngdoc function
      * @name angular.isUndefined
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is undefined.
@@ -499,14 +661,14 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is undefined.
      */
-    function isUndefined(value){return typeof value === 'undefined';}
+    function isUndefined(value) {return typeof value === 'undefined';}
 
 
     /**
      * @ngdoc function
      * @name angular.isDefined
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is defined.
@@ -514,14 +676,14 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is defined.
      */
-    function isDefined(value){return typeof value !== 'undefined';}
+    function isDefined(value) {return typeof value !== 'undefined';}
 
 
     /**
      * @ngdoc function
      * @name angular.isObject
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not
@@ -530,14 +692,27 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is an `Object` but not `null`.
      */
-    function isObject(value){return value != null && typeof value === 'object';}
+    function isObject(value) {
+        // http://jsperf.com/isobject4
+        return value !== null && typeof value === 'object';
+    }
+
+
+    /**
+     * Determine if a value is an object with a null prototype
+     *
+     * @returns {boolean} True if `value` is an `Object` with a null prototype
+     */
+    function isBlankObject(value) {
+        return value !== null && typeof value === 'object' && !getPrototypeOf(value);
+    }
 
 
     /**
      * @ngdoc function
      * @name angular.isString
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a `String`.
@@ -545,29 +720,35 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `String`.
      */
-    function isString(value){return typeof value === 'string';}
+    function isString(value) {return typeof value === 'string';}
 
 
     /**
      * @ngdoc function
      * @name angular.isNumber
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a `Number`.
      *
+     * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
+     *
+     * If you wish to exclude these then you can use the native
+     * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
+     * method.
+     *
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `Number`.
      */
-    function isNumber(value){return typeof value === 'number';}
+    function isNumber(value) {return typeof value === 'number';}
 
 
     /**
      * @ngdoc function
      * @name angular.isDate
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a value is a date.
@@ -575,7 +756,7 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `Date`.
      */
-    function isDate(value){
+    function isDate(value) {
         return toString.call(value) === '[object Date]';
     }
 
@@ -584,24 +765,39 @@
      * @ngdoc function
      * @name angular.isArray
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
-     * Determines if a reference is an `Array`.
+     * Determines if a reference is an `Array`. Alias of Array.isArray.
      *
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is an `Array`.
      */
-    function isArray(value) {
-        return toString.call(value) === '[object Array]';
-    }
+    var isArray = Array.isArray;
 
+    /**
+     * @description
+     * Determines if a reference is an `Error`.
+     * Loosely based on https://www.npmjs.com/package/iserror
+     *
+     * @param {*} value Reference to check.
+     * @returns {boolean} True if `value` is an `Error`.
+     */
+    function isError(value) {
+        var tag = toString.call(value);
+        switch (tag) {
+            case '[object Error]': return true;
+            case '[object Exception]': return true;
+            case '[object DOMException]': return true;
+            default: return value instanceof Error;
+        }
+    }
 
     /**
      * @ngdoc function
      * @name angular.isFunction
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a `Function`.
@@ -609,7 +805,7 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `Function`.
      */
-    function isFunction(value){return typeof value === 'function';}
+    function isFunction(value) {return typeof value === 'function';}
 
 
     /**
@@ -632,7 +828,7 @@
      * @returns {boolean} True if `obj` is a window obj.
      */
     function isWindow(obj) {
-        return obj && obj.document && obj.location && obj.alert && obj.setInterval;
+        return obj && obj.window === obj;
     }
 
 
@@ -646,6 +842,11 @@
     }
 
 
+    function isFormData(obj) {
+        return toString.call(obj) === '[object FormData]';
+    }
+
+
     function isBlob(obj) {
         return toString.call(obj) === '[object Blob]';
     }
@@ -656,26 +857,41 @@
     }
 
 
-    var trim = (function() {
-        // native trim is way faster: http://jsperf.com/angular-trim-test
-        // but IE doesn't have it... :-(
-        // TODO: we should move this into IE/ES5 polyfill
-        if (!String.prototype.trim) {
-            return function(value) {
-                return isString(value) ? value.replace(/^\s\s*/, '').replace(/\s\s*$/, '') : value;
-            };
-        }
-        return function(value) {
-            return isString(value) ? value.trim() : value;
-        };
-    })();
+    function isPromiseLike(obj) {
+        return obj && isFunction(obj.then);
+    }
+
+
+    var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/;
+    function isTypedArray(value) {
+        return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
+    }
+
+    function isArrayBuffer(obj) {
+        return toString.call(obj) === '[object ArrayBuffer]';
+    }
+
+
+    var trim = function(value) {
+        return isString(value) ? value.trim() : value;
+    };
+
+// Copied from:
+// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021
+// Prereq: s is a string.
+    var escapeForRegexp = function(s) {
+        return s
+            .replace(/([-()[\]{}+?*.$^|,:#<!\\])/g, '\\$1')
+            // eslint-disable-next-line no-control-regex
+            .replace(/\x08/g, '\\x08');
+    };
 
 
     /**
      * @ngdoc function
      * @name angular.isElement
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a DOM element (or wrapped jQuery element).
@@ -685,117 +901,59 @@
      */
     function isElement(node) {
         return !!(node &&
-        (node.nodeName  // we are a direct element
-        || (node.prop && node.attr && node.find)));  // we have an on and find method part of jQuery API
+            (node.nodeName  // We are a direct element.
+                || (node.prop && node.attr && node.find)));  // We have an on and find method part of jQuery API.
     }
 
     /**
      * @param str 'key1,key2,...'
      * @returns {object} in the form of {key1:true, key2:true, ...}
      */
-    function makeMap(str){
-        var obj = {}, items = str.split(","), i;
-        for ( i = 0; i < items.length; i++ )
-            obj[ items[i] ] = true;
+    function makeMap(str) {
+        var obj = {}, items = str.split(','), i;
+        for (i = 0; i < items.length; i++) {
+            obj[items[i]] = true;
+        }
         return obj;
     }
 
 
-    if (msie < 9) {
-        nodeName_ = function(element) {
-            element = element.nodeName ? element : element[0];
-            return (element.scopeName && element.scopeName != 'HTML')
-                ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName;
-        };
-    } else {
-        nodeName_ = function(element) {
-            return element.nodeName ? element.nodeName : element[0].nodeName;
-        };
-    }
-
-
-    function map(obj, iterator, context) {
-        var results = [];
-        forEach(obj, function(value, index, list) {
-            results.push(iterator.call(context, value, index, list));
-        });
-        return results;
-    }
-
-
-    /**
-     * @description
-     * Determines the number of elements in an array, the number of properties an object has, or
-     * the length of a string.
-     *
-     * Note: This function is used to augment the Object type in Angular expressions. See
-     * {@link angular.Object} for more information about Angular arrays.
-     *
-     * @param {Object|Array|string} obj Object, array, or string to inspect.
-     * @param {boolean} [ownPropsOnly=false] Count only "own" properties in an object
-     * @returns {number} The size of `obj` or `0` if `obj` is neither an object nor an array.
-     */
-    function size(obj, ownPropsOnly) {
-        var count = 0, key;
-
-        if (isArray(obj) || isString(obj)) {
-            return obj.length;
-        } else if (isObject(obj)){
-            for (key in obj)
-                if (!ownPropsOnly || obj.hasOwnProperty(key))
-                    count++;
-        }
-
-        return count;
+    function nodeName_(element) {
+        return lowercase(element.nodeName || (element[0] && element[0].nodeName));
     }
 
-
     function includes(array, obj) {
-        return indexOf(array, obj) != -1;
-    }
-
-    function indexOf(array, obj) {
-        if (array.indexOf) return array.indexOf(obj);
-
-        for (var i = 0; i < array.length; i++) {
-            if (obj === array[i]) return i;
-        }
-        return -1;
+        return Array.prototype.indexOf.call(array, obj) !== -1;
     }
 
     function arrayRemove(array, value) {
-        var index = indexOf(array, value);
-        if (index >=0)
+        var index = array.indexOf(value);
+        if (index >= 0) {
             array.splice(index, 1);
-        return value;
-    }
-
-    function isLeafNode (node) {
-        if (node) {
-            switch (node.nodeName) {
-                case "OPTION":
-                case "PRE":
-                case "TITLE":
-                    return true;
-            }
         }
-        return false;
+        return index;
     }
 
     /**
      * @ngdoc function
      * @name angular.copy
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Creates a deep copy of `source`, which should be an object or an array.
      *
      * * If no destination is supplied, a copy of the object or array is created.
-     * * If a destination is provided, all of its elements (for array) or properties (for objects)
+     * * If a destination is provided, all of its elements (for arrays) or properties (for objects)
      *   are deleted and then all elements/properties from the source are copied to it.
      * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
-     * * If `source` is identical to 'destination' an exception will be thrown.
+     * * If `source` is identical to `destination` an exception will be thrown.
+     *
+     * <br />
+     * <div class="alert alert-warning">
+     *   Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
+     *   and on `destination`) will be ignored.
+     * </div>
      *
      * @param {*} source The source that will be used to make a copy.
      *                   Can be any type, including primitives, `null`, and `undefined`.
@@ -804,105 +962,198 @@
      * @returns {*} The copy or updated `destination`, if `destination` was specified.
      *
      * @example
-     <example>
+     <example module="copyExample" name="angular-copy">
      <file name="index.html">
-     <div ng-controller="Controller">
+     <div ng-controller="ExampleController">
      <form novalidate class="simple-form">
-     Name: <input type="text" ng-model="user.name" /><br />
-     Email: <input type="email" ng-model="user.email" /><br />
-     Gender: <input type="radio" ng-model="user.gender" value="male" />male
-     <input type="radio" ng-model="user.gender" value="female" />female<br />
+     <label>Name: <input type="text" ng-model="user.name" /></label><br />
+     <label>Age:  <input type="number" ng-model="user.age" /></label><br />
+     Gender: <label><input type="radio" ng-model="user.gender" value="male" />male</label>
+     <label><input type="radio" ng-model="user.gender" value="female" />female</label><br />
      <button ng-click="reset()">RESET</button>
      <button ng-click="update(user)">SAVE</button>
      </form>
      <pre>form = {{user | json}}</pre>
-     <pre>master = {{master | json}}</pre>
+     <pre>leader = {{leader | json}}</pre>
      </div>
+     </file>
+     <file name="script.js">
+     // Module: copyExample
+     angular.
+     module('copyExample', []).
+     controller('ExampleController', ['$scope', function($scope) {
+          $scope.leader = {};
+
+          $scope.reset = function() {
+            // Example with 1 argument
+            $scope.user = angular.copy($scope.leader);
+          };
 
-     <script>
-     function Controller($scope) {
-    $scope.master= {};
-
-    $scope.update = function(user) {
-      // Example with 1 argument
-      $scope.master= angular.copy(user);
-    };
-
-    $scope.reset = function() {
-      // Example with 2 arguments
-      angular.copy($scope.master, $scope.user);
-    };
+          $scope.update = function(user) {
+            // Example with 2 arguments
+            angular.copy(user, $scope.leader);
+          };
 
-    $scope.reset();
-  }
-     </script>
+          $scope.reset();
+        }]);
      </file>
      </example>
      */
-    function copy(source, destination){
-        if (isWindow(source) || isScope(source)) {
-            throw ngMinErr('cpws',
-                "Can't copy! Making copies of Window or Scope instances is not supported.");
+    function copy(source, destination, maxDepth) {
+        var stackSource = [];
+        var stackDest = [];
+        maxDepth = isValidObjectMaxDepth(maxDepth) ? maxDepth : NaN;
+
+        if (destination) {
+            if (isTypedArray(destination) || isArrayBuffer(destination)) {
+                throw ngMinErr('cpta', 'Can\'t copy! TypedArray destination cannot be mutated.');
+            }
+            if (source === destination) {
+                throw ngMinErr('cpi', 'Can\'t copy! Source and destination are identical.');
+            }
+
+            // Empty the destination object
+            if (isArray(destination)) {
+                destination.length = 0;
+            } else {
+                forEach(destination, function(value, key) {
+                    if (key !== '$$hashKey') {
+                        delete destination[key];
+                    }
+                });
+            }
+
+            stackSource.push(source);
+            stackDest.push(destination);
+            return copyRecurse(source, destination, maxDepth);
         }
 
-        if (!destination) {
-            destination = source;
-            if (source) {
-                if (isArray(source)) {
-                    destination = copy(source, []);
-                } else if (isDate(source)) {
-                    destination = new Date(source.getTime());
-                } else if (isRegExp(source)) {
-                    destination = new RegExp(source.source);
-                } else if (isObject(source)) {
-                    destination = copy(source, {});
-                }
+        return copyElement(source, maxDepth);
+
+        function copyRecurse(source, destination, maxDepth) {
+            maxDepth--;
+            if (maxDepth < 0) {
+                return '...';
             }
-        } else {
-            if (source === destination) throw ngMinErr('cpi',
-                "Can't copy! Source and destination are identical.");
+            var h = destination.$$hashKey;
+            var key;
             if (isArray(source)) {
-                destination.length = 0;
-                for ( var i = 0; i < source.length; i++) {
-                    destination.push(copy(source[i]));
+                for (var i = 0, ii = source.length; i < ii; i++) {
+                    destination.push(copyElement(source[i], maxDepth));
+                }
+            } else if (isBlankObject(source)) {
+                // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+                for (key in source) {
+                    destination[key] = copyElement(source[key], maxDepth);
+                }
+            } else if (source && typeof source.hasOwnProperty === 'function') {
+                // Slow path, which must rely on hasOwnProperty
+                for (key in source) {
+                    if (source.hasOwnProperty(key)) {
+                        destination[key] = copyElement(source[key], maxDepth);
+                    }
                 }
             } else {
-                var h = destination.$$hashKey;
-                forEach(destination, function(value, key){
-                    delete destination[key];
-                });
-                for ( var key in source) {
-                    destination[key] = copy(source[key]);
+                // Slowest path --- hasOwnProperty can't be called as a method
+                for (key in source) {
+                    if (hasOwnProperty.call(source, key)) {
+                        destination[key] = copyElement(source[key], maxDepth);
+                    }
                 }
-                setHashKey(destination,h);
             }
+            setHashKey(destination, h);
+            return destination;
         }
-        return destination;
-    }
 
-    /**
-     * Create a shallow copy of an object
-     */
-    function shallowCopy(src, dst) {
-        dst = dst || {};
+        function copyElement(source, maxDepth) {
+            // Simple values
+            if (!isObject(source)) {
+                return source;
+            }
+
+            // Already copied values
+            var index = stackSource.indexOf(source);
+            if (index !== -1) {
+                return stackDest[index];
+            }
 
-        for(var key in src) {
-            // shallowCopy is only ever called by $compile nodeLinkFn, which has control over src
-            // so we don't need to worry about using our custom hasOwnProperty here
-            if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
-                dst[key] = src[key];
+            if (isWindow(source) || isScope(source)) {
+                throw ngMinErr('cpws',
+                    'Can\'t copy! Making copies of Window or Scope instances is not supported.');
             }
+
+            var needsRecurse = false;
+            var destination = copyType(source);
+
+            if (destination === undefined) {
+                destination = isArray(source) ? [] : Object.create(getPrototypeOf(source));
+                needsRecurse = true;
+            }
+
+            stackSource.push(source);
+            stackDest.push(destination);
+
+            return needsRecurse
+                ? copyRecurse(source, destination, maxDepth)
+                : destination;
         }
 
-        return dst;
+        function copyType(source) {
+            switch (toString.call(source)) {
+                case '[object Int8Array]':
+                case '[object Int16Array]':
+                case '[object Int32Array]':
+                case '[object Float32Array]':
+                case '[object Float64Array]':
+                case '[object Uint8Array]':
+                case '[object Uint8ClampedArray]':
+                case '[object Uint16Array]':
+                case '[object Uint32Array]':
+                    return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+
+                case '[object ArrayBuffer]':
+                    // Support: IE10
+                    if (!source.slice) {
+                        // If we're in this case we know the environment supports ArrayBuffer
+                        /* eslint-disable no-undef */
+                        var copied = new ArrayBuffer(source.byteLength);
+                        new Uint8Array(copied).set(new Uint8Array(source));
+                        /* eslint-enable */
+                        return copied;
+                    }
+                    return source.slice(0);
+
+                case '[object Boolean]':
+                case '[object Number]':
+                case '[object String]':
+                case '[object Date]':
+                    return new source.constructor(source.valueOf());
+
+                case '[object RegExp]':
+                    var re = new RegExp(source.source, source.toString().match(/[^/]*$/)[0]);
+                    re.lastIndex = source.lastIndex;
+                    return re;
+
+                case '[object Blob]':
+                    return new source.constructor([source], {type: source.type});
+            }
+
+            if (isFunction(source.cloneNode)) {
+                return source.cloneNode(true);
+            }
+        }
     }
 
 
+// eslint-disable-next-line no-self-compare
+    function simpleCompare(a, b) { return a === b || (a !== a && b !== b); }
+
+
     /**
      * @ngdoc function
      * @name angular.equals
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if two objects or two values are equivalent. Supports value types, regular
@@ -914,7 +1165,7 @@
      * * Both objects or values are of the same type and all of their properties are equal by
      *   comparing them with `angular.equals`.
      * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal)
-     * * Both values represent the same regular expression (In JavasScript,
+     * * Both values represent the same regular expression (In JavaScript,
      *   /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual
      *   representation matches).
      *
@@ -926,54 +1177,171 @@
      * @param {*} o1 Object or value to compare.
      * @param {*} o2 Object or value to compare.
      * @returns {boolean} True if arguments are equal.
-     */
-    function equals(o1, o2) {
-        if (o1 === o2) return true;
-        if (o1 === null || o2 === null) return false;
-        if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
-        var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
-        if (t1 == t2) {
-            if (t1 == 'object') {
-                if (isArray(o1)) {
-                    if (!isArray(o2)) return false;
-                    if ((length = o1.length) == o2.length) {
-                        for(key=0; key<length; key++) {
-                            if (!equals(o1[key], o2[key])) return false;
-                        }
-                        return true;
-                    }
-                } else if (isDate(o1)) {
-                    return isDate(o2) && o1.getTime() == o2.getTime();
-                } else if (isRegExp(o1) && isRegExp(o2)) {
-                    return o1.toString() == o2.toString();
-                } else {
-                    if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2)) return false;
-                    keySet = {};
-                    for(key in o1) {
-                        if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+     *
+     * @example
+     <example module="equalsExample" name="equalsExample">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <form novalidate>
+     <h3>User 1</h3>
+     Name: <input type="text" ng-model="user1.name">
+     Age: <input type="number" ng-model="user1.age">
+
+     <h3>User 2</h3>
+     Name: <input type="text" ng-model="user2.name">
+     Age: <input type="number" ng-model="user2.age">
+
+     <div>
+     <br/>
+     <input type="button" value="Compare" ng-click="compare()">
+     </div>
+     User 1: <pre>{{user1 | json}}</pre>
+     User 2: <pre>{{user2 | json}}</pre>
+     Equal: <pre>{{result}}</pre>
+     </form>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) {
+          $scope.user1 = {};
+          $scope.user2 = {};
+          $scope.compare = function() {
+            $scope.result = angular.equals($scope.user1, $scope.user2);
+          };
+        }]);
+     </file>
+     </example>
+     */
+    function equals(o1, o2) {
+        if (o1 === o2) return true;
+        if (o1 === null || o2 === null) return false;
+        // eslint-disable-next-line no-self-compare
+        if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
+        var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
+        if (t1 === t2 && t1 === 'object') {
+            if (isArray(o1)) {
+                if (!isArray(o2)) return false;
+                if ((length = o1.length) === o2.length) {
+                    for (key = 0; key < length; key++) {
                         if (!equals(o1[key], o2[key])) return false;
-                        keySet[key] = true;
-                    }
-                    for(key in o2) {
-                        if (!keySet.hasOwnProperty(key) &&
-                            key.charAt(0) !== '$' &&
-                            o2[key] !== undefined &&
-                            !isFunction(o2[key])) return false;
                     }
                     return true;
                 }
+            } else if (isDate(o1)) {
+                if (!isDate(o2)) return false;
+                return simpleCompare(o1.getTime(), o2.getTime());
+            } else if (isRegExp(o1)) {
+                if (!isRegExp(o2)) return false;
+                return o1.toString() === o2.toString();
+            } else {
+                if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+                    isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+                keySet = createMap();
+                for (key in o1) {
+                    if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+                    if (!equals(o1[key], o2[key])) return false;
+                    keySet[key] = true;
+                }
+                for (key in o2) {
+                    if (!(key in keySet) &&
+                        key.charAt(0) !== '$' &&
+                        isDefined(o2[key]) &&
+                        !isFunction(o2[key])) return false;
+                }
+                return true;
             }
         }
         return false;
     }
 
+    var csp = function() {
+        if (!isDefined(csp.rules)) {
 
-    function csp() {
-        return (document.securityPolicy && document.securityPolicy.isActive) ||
-        (document.querySelector &&
-        !!(document.querySelector('[ng-csp]') || document.querySelector('[data-ng-csp]')));
-    }
 
+            var ngCspElement = (window.document.querySelector('[ng-csp]') ||
+                window.document.querySelector('[data-ng-csp]'));
+
+            if (ngCspElement) {
+                var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
+                    ngCspElement.getAttribute('data-ng-csp');
+                csp.rules = {
+                    noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1),
+                    noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1)
+                };
+            } else {
+                csp.rules = {
+                    noUnsafeEval: noUnsafeEval(),
+                    noInlineStyle: false
+                };
+            }
+        }
+
+        return csp.rules;
+
+        function noUnsafeEval() {
+            try {
+                // eslint-disable-next-line no-new, no-new-func
+                new Function('');
+                return false;
+            } catch (e) {
+                return true;
+            }
+        }
+    };
+
+    /**
+     * @ngdoc directive
+     * @module ng
+     * @name ngJq
+     *
+     * @element ANY
+     * @param {string=} ngJq the name of the library available under `window`
+     * to be used for angular.element
+     * @description
+     * Use this directive to force the angular.element library.  This should be
+     * used to force either jqLite by leaving ng-jq blank or setting the name of
+     * the jquery variable under window (eg. jQuery).
+     *
+     * Since AngularJS looks for this directive when it is loaded (doesn't wait for the
+     * DOMContentLoaded event), it must be placed on an element that comes before the script
+     * which loads angular. Also, only the first instance of `ng-jq` will be used and all
+     * others ignored.
+     *
+     * @example
+     * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
+     ```html
+     <!doctype html>
+     <html ng-app ng-jq>
+     ...
+     ...
+     </html>
+     ```
+     * @example
+     * This example shows how to use a jQuery based library of a different name.
+     * The library name must be available at the top most 'window'.
+     ```html
+     <!doctype html>
+     <html ng-app ng-jq="jQueryLib">
+     ...
+     ...
+     </html>
+     ```
+     */
+    var jq = function() {
+        if (isDefined(jq.name_)) return jq.name_;
+        var el;
+        var i, ii = ngAttrPrefixes.length, prefix, name;
+        for (i = 0; i < ii; ++i) {
+            prefix = ngAttrPrefixes[i];
+            el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]');
+            if (el) {
+                name = el.getAttribute(prefix + 'jq');
+                break;
+            }
+        }
+
+        return (jq.name_ = name);
+    };
 
     function concat(array1, array2, index) {
         return array1.concat(slice.call(array2, index));
@@ -984,12 +1352,11 @@
     }
 
 
-    /* jshint -W101 */
     /**
      * @ngdoc function
      * @name angular.bind
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for
@@ -1002,23 +1369,22 @@
      * @param {...*} args Optional arguments to be prebound to the `fn` function call.
      * @returns {function()} Function that wraps the `fn` with all the specified bindings.
      */
-    /* jshint +W101 */
     function bind(self, fn) {
         var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : [];
         if (isFunction(fn) && !(fn instanceof RegExp)) {
             return curryArgs.length
                 ? function() {
-                return arguments.length
-                    ? fn.apply(self, curryArgs.concat(slice.call(arguments, 0)))
-                    : fn.apply(self, curryArgs);
-            }
+                    return arguments.length
+                        ? fn.apply(self, concat(curryArgs, arguments, 0))
+                        : fn.apply(self, curryArgs);
+                }
                 : function() {
-                return arguments.length
-                    ? fn.apply(self, arguments)
-                    : fn.call(self);
-            };
+                    return arguments.length
+                        ? fn.apply(self, arguments)
+                        : fn.call(self);
+                };
         } else {
-            // in IE, native methods are not functions so they cannot be bound (note: they don't need to be)
+            // In IE, native methods are not functions so they cannot be bound (note: they don't need to be).
             return fn;
         }
     }
@@ -1027,11 +1393,11 @@
     function toJsonReplacer(key, value) {
         var val = value;
 
-        if (typeof key === 'string' && key.charAt(0) === '$') {
+        if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
             val = undefined;
         } else if (isWindow(value)) {
             val = '$WINDOW';
-        } else if (value &&  document === value) {
+        } else if (value &&  window.document === value) {
             val = '$DOCUMENT';
         } else if (isScope(value)) {
             val = '$SCOPE';
@@ -1045,19 +1411,44 @@
      * @ngdoc function
      * @name angular.toJson
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
-     * Serializes input into a JSON-formatted string. Properties with leading $ characters will be
-     * stripped since angular uses this notation internally.
+     * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be
+     * stripped since AngularJS uses this notation internally.
      *
-     * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
-     * @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace.
+     * @param {Object|Array|Date|string|number|boolean} obj Input to be serialized into JSON.
+     * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
+     *    If set to an integer, the JSON output will contain that many spaces per indentation.
      * @returns {string|undefined} JSON-ified string representing `obj`.
+     * @knownIssue
+     *
+     * The Safari browser throws a `RangeError` instead of returning `null` when it tries to stringify a `Date`
+     * object with an invalid date value. The only reliable way to prevent this is to monkeypatch the
+     * `Date.prototype.toJSON` method as follows:
+     *
+     * ```
+     * var _DatetoJSON = Date.prototype.toJSON;
+     * Date.prototype.toJSON = function() {
+     *   try {
+     *     return _DatetoJSON.call(this);
+     *   } catch(e) {
+     *     if (e instanceof RangeError) {
+     *       return null;
+     *     }
+     *     throw e;
+     *   }
+     * };
+     * ```
+     *
+     * See https://github.com/angular/angular.js/pull/14221 for more information.
      */
     function toJson(obj, pretty) {
-        if (typeof obj === 'undefined') return undefined;
-        return JSON.stringify(obj, toJsonReplacer, pretty ? '  ' : null);
+        if (isUndefined(obj)) return undefined;
+        if (!isNumber(pretty)) {
+            pretty = pretty ? 2 : null;
+        }
+        return JSON.stringify(obj, toJsonReplacer, pretty);
     }
 
 
@@ -1065,13 +1456,13 @@
      * @ngdoc function
      * @name angular.fromJson
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Deserializes a JSON string.
      *
      * @param {string} json JSON string to deserialize.
-     * @returns {Object|Array|string|number} Deserialized thingy.
+     * @returns {Object|Array|string|number} Deserialized JSON string.
      */
     function fromJson(json) {
         return isString(json)
@@ -1080,37 +1471,43 @@
     }
 
 
-    function toBoolean(value) {
-        if (typeof value === 'function') {
-            value = true;
-        } else if (value && value.length !== 0) {
-            var v = lowercase("" + value);
-            value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]');
-        } else {
-            value = false;
-        }
-        return value;
+    var ALL_COLONS = /:/g;
+    function timezoneToOffset(timezone, fallback) {
+        // Support: IE 9-11 only, Edge 13-15+
+        // IE/Edge do not "understand" colon (`:`) in timezone
+        timezone = timezone.replace(ALL_COLONS, '');
+        var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+        return isNumberNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+    }
+
+
+    function addDateMinutes(date, minutes) {
+        date = new Date(date.getTime());
+        date.setMinutes(date.getMinutes() + minutes);
+        return date;
     }
 
+
+    function convertTimezoneToLocal(date, timezone, reverse) {
+        reverse = reverse ? -1 : 1;
+        var dateTimezoneOffset = date.getTimezoneOffset();
+        var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+        return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset));
+    }
+
+
     /**
      * @returns {string} Returns the string representation of the element.
      */
     function startingTag(element) {
-        element = jqLite(element).clone();
-        try {
-            // turns out IE does not let you set .html() on elements which
-            // are not allowed to have children. So we just ignore it.
-            element.empty();
-        } catch(e) {}
-        // As Per DOM Standards
-        var TEXT_NODE = 3;
+        element = jqLite(element).clone().empty();
         var elemHtml = jqLite('<div>').append(element).html();
         try {
-            return element[0].nodeType === TEXT_NODE ? lowercase(elemHtml) :
+            return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
                 elemHtml.
-                    match(/^(<[^>]+>)/)[1].
-                    replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
-        } catch(e) {
+                match(/^(<[^>]+>)/)[1].
+                replace(/^<([\w-]+)/, function(match, nodeName) {return '<' + lowercase(nodeName);});
+        } catch (e) {
             return lowercase(elemHtml);
         }
 
@@ -1130,8 +1527,8 @@
     function tryDecodeURIComponent(value) {
         try {
             return decodeURIComponent(value);
-        } catch(e) {
-            // Ignore any invalid uri component
+        } catch (e) {
+            // Ignore any invalid uri component.
         }
     }
 
@@ -1141,16 +1538,22 @@
      * @returns {Object.<string,boolean|Array>}
      */
     function parseKeyValue(/**string*/keyValue) {
-        var obj = {}, key_value, key;
-        forEach((keyValue || "").split('&'), function(keyValue){
-            if ( keyValue ) {
-                key_value = keyValue.split('=');
-                key = tryDecodeURIComponent(key_value[0]);
-                if ( isDefined(key) ) {
-                    var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
-                    if (!obj[key]) {
+        var obj = {};
+        forEach((keyValue || '').split('&'), function(keyValue) {
+            var splitPoint, key, val;
+            if (keyValue) {
+                key = keyValue = keyValue.replace(/\+/g,'%20');
+                splitPoint = keyValue.indexOf('=');
+                if (splitPoint !== -1) {
+                    key = keyValue.substring(0, splitPoint);
+                    val = keyValue.substring(splitPoint + 1);
+                }
+                key = tryDecodeURIComponent(key);
+                if (isDefined(key)) {
+                    val = isDefined(val) ? tryDecodeURIComponent(val) : true;
+                    if (!hasOwnProperty.call(obj, key)) {
                         obj[key] = val;
-                    } else if(isArray(obj[key])) {
+                    } else if (isArray(obj[key])) {
                         obj[key].push(val);
                     } else {
                         obj[key] = [obj[key],val];
@@ -1167,11 +1570,11 @@
             if (isArray(value)) {
                 forEach(value, function(arrayValue) {
                     parts.push(encodeUriQuery(key, true) +
-                    (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
+                        (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
                 });
             } else {
                 parts.push(encodeUriQuery(key, true) +
-                (value === true ? '' : '=' + encodeUriQuery(value, true)));
+                    (value === true ? '' : '=' + encodeUriQuery(value, true)));
             }
         });
         return parts.length ? parts.join('&') : '';
@@ -1191,9 +1594,9 @@
      */
     function encodeUriSegment(val) {
         return encodeUriQuery(val, true).
-            replace(/%26/gi, '&').
-            replace(/%3D/gi, '=').
-            replace(/%2B/gi, '+');
+        replace(/%26/gi, '&').
+        replace(/%3D/gi, '=').
+        replace(/%2B/gi, '+');
     }
 
 
@@ -1201,7 +1604,7 @@
      * This method is intended for encoding *key* or *value* parts of query component. We need a custom
      * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
      * encoded per http://tools.ietf.org/html/rfc3986:
-     *    query       = *( pchar / "/" / "?" )
+     *    query         = *( pchar / "/" / "?" )
      *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
      *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
      *    pct-encoded   = "%" HEXDIG HEXDIG
@@ -1210,13 +1613,78 @@
      */
     function encodeUriQuery(val, pctEncodeSpaces) {
         return encodeURIComponent(val).
-            replace(/%40/gi, '@').
-            replace(/%3A/gi, ':').
-            replace(/%24/g, '$').
-            replace(/%2C/gi, ',').
-            replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+        replace(/%40/gi, '@').
+        replace(/%3A/gi, ':').
+        replace(/%24/g, '$').
+        replace(/%2C/gi, ',').
+        replace(/%3B/gi, ';').
+        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+    }
+
+    var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
+
+    function getNgAttribute(element, ngAttr) {
+        var attr, i, ii = ngAttrPrefixes.length;
+        for (i = 0; i < ii; ++i) {
+            attr = ngAttrPrefixes[i] + ngAttr;
+            if (isString(attr = element.getAttribute(attr))) {
+                return attr;
+            }
+        }
+        return null;
+    }
+
+    function allowAutoBootstrap(document) {
+        var script = document.currentScript;
+
+        if (!script) {
+            // Support: IE 9-11 only
+            // IE does not have `document.currentScript`
+            return true;
+        }
+
+        // If the `currentScript` property has been clobbered just return false, since this indicates a probable attack
+        if (!(script instanceof window.HTMLScriptElement || script instanceof window.SVGScriptElement)) {
+            return false;
+        }
+
+        var attributes = script.attributes;
+        var srcs = [attributes.getNamedItem('src'), attributes.getNamedItem('href'), attributes.getNamedItem('xlink:href')];
+
+        return srcs.every(function(src) {
+            if (!src) {
+                return true;
+            }
+            if (!src.value) {
+                return false;
+            }
+
+            var link = document.createElement('a');
+            link.href = src.value;
+
+            if (document.location.origin === link.origin) {
+                // Same-origin resources are always allowed, even for non-whitelisted schemes.
+                return true;
+            }
+            // Disabled bootstrapping unless angular.js was loaded from a known scheme used on the web.
+            // This is to prevent angular.js bundled with browser extensions from being used to bypass the
+            // content security policy in web pages and other browser extensions.
+            switch (link.protocol) {
+                case 'http:':
+                case 'https:':
+                case 'ftp:':
+                case 'blob:':
+                case 'file:':
+                case 'data:':
+                    return true;
+                default:
+                    return false;
+            }
+        });
     }
 
+// Cached as it has to run during loading so that document.currentScript is available.
+    var isAutoBootstrapAllowed = allowAutoBootstrap(window.document);
 
     /**
      * @ngdoc directive
@@ -1226,6 +1694,11 @@
      * @element ANY
      * @param {angular.Module} ngApp an optional application
      *   {@link angular.module module} name to load.
+     * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be
+     *   created in "strict-di" mode. This means that the application will fail to invoke functions which
+     *   do not use explicit function annotation (and are thus unsuitable for minification), as described
+     *   in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in
+     *   tracking down the root of these bugs.
      *
      * @description
      *
@@ -1233,13 +1706,20 @@
      * designates the **root element** of the application and is typically placed near the root element
      * of the page - e.g. on the `<body>` or `<html>` tags.
      *
-     * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
-     * found in the document will be used to define the root element to auto-bootstrap as an
-     * application. To run multiple applications in an HTML document you must manually bootstrap them using
-     * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
+     * There are a few things to keep in mind when using `ngApp`:
+     * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
+     *   found in the document will be used to define the root element to auto-bootstrap as an
+     *   application. To run multiple applications in an HTML document you must manually bootstrap them using
+     *   {@link angular.bootstrap} instead.
+     * - AngularJS applications cannot be nested within each other.
+     * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`.
+     *   This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and
+     *   {@link ngRoute.ngView `ngView`}.
+     *   Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
+     *   causing animations to stop working and making the injector inaccessible from outside the app.
      *
      * You can specify an **AngularJS module** to be used as the root module for the application.  This
-     * module will be loaded into the {@link auto.$injector} when the application is bootstrapped and
+     * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
      * should contain the application code needed or have dependencies on other modules that will
      * contain the code. See {@link angular.module} for more information.
      *
@@ -1247,9 +1727,13 @@
      * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}`
      * would not be resolved to `3`.
      *
-     * `ngApp` is the easiest, and most common, way to bootstrap an application.
+     * @example
+     *
+     * ### Simple Usage
+     *
+     * `ngApp` is the easiest, and most common way to bootstrap an application.
      *
-     <example module="ngAppDemo">
+     <example module="ngAppDemo" name="ng-app">
      <file name="index.html">
      <div ng-controller="ngAppDemoController">
      I can add: {{a}} + {{b}} =  {{ a+b }}
@@ -1263,48 +1747,118 @@
      </file>
      </example>
      *
+     * @example
+     *
+     * ### With `ngStrictDi`
+     *
+     * Using `ngStrictDi`, you would see something like this:
+     *
+     <example ng-app-included="true" name="strict-di">
+     <file name="index.html">
+     <div ng-app="ngAppStrictDemo" ng-strict-di>
+     <div ng-controller="GoodController1">
+     I can add: {{a}} + {{b}} =  {{ a+b }}
+
+     <p>This renders because the controller does not fail to
+     instantiate, by using explicit annotation style (see
+     script.js for details)
+     </p>
+     </div>
+
+     <div ng-controller="GoodController2">
+     Name: <input ng-model="name"><br />
+     Hello, {{name}}!
+
+     <p>This renders because the controller does not fail to
+     instantiate, by using explicit annotation style
+     (see script.js for details)
+     </p>
+     </div>
+
+     <div ng-controller="BadController">
+     I can add: {{a}} + {{b}} =  {{ a+b }}
+
+     <p>The controller could not be instantiated, due to relying
+     on automatic function annotations (which are disabled in
+     strict mode). As such, the content of this section is not
+     interpolated, and there should be an error in your web console.
+     </p>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('ngAppStrictDemo', [])
+     // BadController will fail to instantiate, due to relying on automatic function annotation,
+     // rather than an explicit annotation
+     .controller('BadController', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     })
+     // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated,
+     // due to using explicit annotations using the array style and $inject property, respectively.
+     .controller('GoodController1', ['$scope', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     }])
+     .controller('GoodController2', GoodController2);
+     function GoodController2($scope) {
+       $scope.name = 'World';
+     }
+     GoodController2.$inject = ['$scope'];
+     </file>
+     <file name="style.css">
+     div[ng-controller] {
+       margin-bottom: 1em;
+       -webkit-border-radius: 4px;
+       border-radius: 4px;
+       border: 1px solid;
+       padding: .5em;
+   }
+     div[ng-controller^=Good] {
+       border-color: #d6e9c6;
+       background-color: #dff0d8;
+       color: #3c763d;
+   }
+     div[ng-controller^=Bad] {
+       border-color: #ebccd1;
+       background-color: #f2dede;
+       color: #a94442;
+       margin-bottom: 0;
+   }
+     </file>
+     </example>
      */
     function angularInit(element, bootstrap) {
-        var elements = [element],
-            appElement,
+        var appElement,
             module,
-            names = ['ng:app', 'ng-app', 'x-ng-app', 'data-ng-app'],
-            NG_APP_CLASS_REGEXP = /\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;
+            config = {};
 
-        function append(element) {
-            element && elements.push(element);
-        }
+        // The element `element` has priority over any other element.
+        forEach(ngAttrPrefixes, function(prefix) {
+            var name = prefix + 'app';
 
-        forEach(names, function(name) {
-            names[name] = true;
-            append(document.getElementById(name));
-            name = name.replace(':', '\\:');
-            if (element.querySelectorAll) {
-                forEach(element.querySelectorAll('.' + name), append);
-                forEach(element.querySelectorAll('.' + name + '\\:'), append);
-                forEach(element.querySelectorAll('[' + name + ']'), append);
+            if (!appElement && element.hasAttribute && element.hasAttribute(name)) {
+                appElement = element;
+                module = element.getAttribute(name);
             }
         });
+        forEach(ngAttrPrefixes, function(prefix) {
+            var name = prefix + 'app';
+            var candidate;
 
-        forEach(elements, function(element) {
-            if (!appElement) {
-                var className = ' ' + element.className + ' ';
-                var match = NG_APP_CLASS_REGEXP.exec(className);
-                if (match) {
-                    appElement = element;
-                    module = (match[2] || '').replace(/\s+/g, ',');
-                } else {
-                    forEach(element.attributes, function(attr) {
-                        if (!appElement && names[attr.name]) {
-                            appElement = element;
-                            module = attr.value;
-                        }
-                    });
-                }
+            if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) {
+                appElement = candidate;
+                module = candidate.getAttribute(name);
             }
         });
         if (appElement) {
-            bootstrap(appElement, module ? [module] : []);
+            if (!isAutoBootstrapAllowed) {
+                window.console.error('AngularJS: disabling automatic bootstrap. <script> protocol indicates ' +
+                    'an extension, document.location.href does not match.');
+                return;
+            }
+            config.strictDi = getNgAttribute(appElement, 'strict-di') !== null;
+            bootstrap(appElement, module ? [module] : [], config);
         }
     }
 
@@ -1313,83 +1867,111 @@
      * @name angular.bootstrap
      * @module ng
      * @description
-     * Use this function to manually start up angular application.
+     * Use this function to manually start up AngularJS application.
+     *
+     * For more information, see the {@link guide/bootstrap Bootstrap guide}.
      *
-     * See: {@link guide/bootstrap Bootstrap}
+     * AngularJS will detect if it has been loaded into the browser more than once and only allow the
+     * first loaded script to be bootstrapped and will report a warning to the browser console for
+     * each of the subsequent scripts. This prevents strange results in applications, where otherwise
+     * multiple instances of AngularJS try to work on the DOM.
      *
-     * Note that ngScenario-based end-to-end tests cannot use this function to bootstrap manually.
+     * <div class="alert alert-warning">
+     * **Note:** Protractor based end-to-end tests cannot use this function to bootstrap manually.
      * They must use {@link ng.directive:ngApp ngApp}.
+     * </div>
      *
-     * Angular will detect if it has been loaded into the browser more than once and only allow the
-     * first loaded script to be bootstrapped and will report a warning to the browser console for
-     * each of the subsequent scripts.   This prevents strange results in applications, where otherwise
-     * multiple instances of Angular try to work on the DOM.
+     * <div class="alert alert-warning">
+     * **Note:** Do not bootstrap the app on an element with a directive that uses {@link ng.$compile#transclusion transclusion},
+     * such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}.
+     * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
+     * causing animations to stop working and making the injector inaccessible from outside the app.
+     * </div>
      *
-     * <example name="multi-bootstrap" module="multi-bootstrap">
-     * <file name="index.html">
-     * <script src="../../../angular.js"></script>
-     * <div ng-controller="BrokenTable">
-     *   <table>
-     *   <tr>
-     *     <th ng-repeat="heading in headings">{{heading}}</th>
-     *   </tr>
-     *   <tr ng-repeat="filling in fillings">
-     *     <td ng-repeat="fill in filling">{{fill}}</td>
-     *   </tr>
-     * </table>
+     * ```html
+     * <!doctype html>
+     * <html>
+     * <body>
+     * <div ng-controller="WelcomeController">
+     *   {{greeting}}
      * </div>
-     * </file>
-     * <file name="controller.js">
-     * var app = angular.module('multi-bootstrap', [])
      *
-     * .controller('BrokenTable', function($scope) {
- *     $scope.headings = ['One', 'Two', 'Three'];
- *     $scope.fillings = [[1, 2, 3], ['A', 'B', 'C'], [7, 8, 9]];
- * });
-     * </file>
-     * <file name="protractor.js" type="protractor">
-     * it('should only insert one table cell for each item in $scope.fillings', function() {
- *  expect(element.all(by.css('td')).count())
- *      .toBe(9);
- * });
-     * </file>
-     * </example>
+     * <script src="angular.js"></script>
+     * <script>
+     *   var app = angular.module('demo', [])
+     *   .controller('WelcomeController', function($scope) {
+     *       $scope.greeting = 'Welcome!';
+     *   });
+     *   angular.bootstrap(document, ['demo']);
+     * </script>
+     * </body>
+     * </html>
+     * ```
      *
-     * @param {DOMElement} element DOM element which is the root of angular application.
+     * @param {DOMElement} element DOM element which is the root of AngularJS application.
      * @param {Array<String|Function|Array>=} modules an array of modules to load into the application.
      *     Each item in the array should be the name of a predefined module or a (DI annotated)
-     *     function that will be invoked by the injector as a run block.
+     *     function that will be invoked by the injector as a `config` block.
      *     See: {@link angular.module modules}
+     * @param {Object=} config an object for defining configuration options for the application. The
+     *     following keys are supported:
+     *
+     * * `strictDi` - disable automatic function annotation for the application. This is meant to
+     *   assist in finding bugs which break minified code. Defaults to `false`.
+     *
      * @returns {auto.$injector} Returns the newly created injector for this app.
      */
-    function bootstrap(element, modules) {
+    function bootstrap(element, modules, config) {
+        if (!isObject(config)) config = {};
+        var defaultConfig = {
+            strictDi: false
+        };
+        config = extend(defaultConfig, config);
         var doBootstrap = function() {
             element = jqLite(element);
 
             if (element.injector()) {
-                var tag = (element[0] === document) ? 'document' : startingTag(element);
-                throw ngMinErr('btstrpd', "App Already Bootstrapped with this Element '{0}'", tag);
+                var tag = (element[0] === window.document) ? 'document' : startingTag(element);
+                // Encode angle brackets to prevent input from being sanitized to empty string #8683.
+                throw ngMinErr(
+                    'btstrpd',
+                    'App already bootstrapped with this element \'{0}\'',
+                    tag.replace(/</,'&lt;').replace(/>/,'&gt;'));
             }
 
             modules = modules || [];
             modules.unshift(['$provide', function($provide) {
                 $provide.value('$rootElement', element);
             }]);
+
+            if (config.debugInfoEnabled) {
+                // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`.
+                modules.push(['$compileProvider', function($compileProvider) {
+                    $compileProvider.debugInfoEnabled(true);
+                }]);
+            }
+
             modules.unshift('ng');
-            var injector = createInjector(modules);
-            injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', '$animate',
-                    function(scope, element, compile, injector, animate) {
-                        scope.$apply(function() {
-                            element.data('$injector', injector);
-                            compile(element)(scope);
-                        });
-                    }]
+            var injector = createInjector(modules, config.strictDi);
+            injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
+                function bootstrapApply(scope, element, compile, injector) {
+                    scope.$apply(function() {
+                        element.data('$injector', injector);
+                        compile(element)(scope);
+                    });
+                }]
             );
             return injector;
         };
 
+        var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/;
         var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/;
 
+        if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) {
+            config.debugInfoEnabled = true;
+            window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, '');
+        }
+
         if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) {
             return doBootstrap();
         }
@@ -1399,40 +1981,104 @@
             forEach(extraModules, function(module) {
                 modules.push(module);
             });
-            doBootstrap();
+            return doBootstrap();
         };
+
+        if (isFunction(angular.resumeDeferredBootstrap)) {
+            angular.resumeDeferredBootstrap();
+        }
+    }
+
+    /**
+     * @ngdoc function
+     * @name angular.reloadWithDebugInfo
+     * @module ng
+     * @description
+     * Use this function to reload the current application with debug information turned on.
+     * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`.
+     *
+     * See {@link ng.$compileProvider#debugInfoEnabled} for more.
+     */
+    function reloadWithDebugInfo() {
+        window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name;
+        window.location.reload();
+    }
+
+    /**
+     * @name angular.getTestability
+     * @module ng
+     * @description
+     * Get the testability service for the instance of AngularJS on the given
+     * element.
+     * @param {DOMElement} element DOM element which is the root of AngularJS application.
+     */
+    function getTestability(rootElement) {
+        var injector = angular.element(rootElement).injector();
+        if (!injector) {
+            throw ngMinErr('test',
+                'no injector found for element argument to getTestability');
+        }
+        return injector.get('$$testability');
     }
 
     var SNAKE_CASE_REGEXP = /[A-Z]/g;
-    function snake_case(name, separator){
+    function snake_case(name, separator) {
         separator = separator || '_';
         return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
             return (pos ? separator : '') + letter.toLowerCase();
         });
     }
 
+    var bindJQueryFired = false;
     function bindJQuery() {
+        var originalCleanData;
+
+        if (bindJQueryFired) {
+            return;
+        }
+
         // bind to jQuery if present;
-        jQuery = window.jQuery;
-        // reset to jQuery or default to us.
-        if (jQuery) {
+        var jqName = jq();
+        jQuery = isUndefined(jqName) ? window.jQuery :   // use jQuery (if present)
+            !jqName             ? undefined     :   // use jqLite
+                window[jqName];   // use jQuery specified by `ngJq`
+
+        // Use jQuery if it exists with proper functionality, otherwise default to us.
+        // AngularJS 1.2+ requires jQuery 1.7+ for on()/off() support.
+        // AngularJS 1.3+ technically requires at least jQuery 2.1+ but it may work with older
+        // versions. It will not work for sure with jQuery <1.7, though.
+        if (jQuery && jQuery.fn.on) {
             jqLite = jQuery;
             extend(jQuery.fn, {
                 scope: JQLitePrototype.scope,
                 isolateScope: JQLitePrototype.isolateScope,
-                controller: JQLitePrototype.controller,
+                controller: /** @type {?} */ (JQLitePrototype).controller,
                 injector: JQLitePrototype.injector,
                 inheritedData: JQLitePrototype.inheritedData
             });
-            // Method signature:
-            //     jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments)
-            jqLitePatchJQueryRemove('remove', true, true, false);
-            jqLitePatchJQueryRemove('empty', false, false, false);
-            jqLitePatchJQueryRemove('html', false, false, true);
+
+            // All nodes removed from the DOM via various jQuery APIs like .remove()
+            // are passed through jQuery.cleanData. Monkey-patch this method to fire
+            // the $destroy event on all removed nodes.
+            originalCleanData = jQuery.cleanData;
+            jQuery.cleanData = function(elems) {
+                var events;
+                for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+                    events = jQuery._data(elem, 'events');
+                    if (events && events.$destroy) {
+                        jQuery(elem).triggerHandler('$destroy');
+                    }
+                }
+                originalCleanData(elems);
+            };
         } else {
             jqLite = JQLite;
         }
+
         angular.element = jqLite;
+
+        // Prevent double-proxying.
+        bindJQueryFired = true;
     }
 
     /**
@@ -1440,7 +2086,7 @@
      */
     function assertArg(arg, name, reason) {
         if (!arg) {
-            throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+            throw ngMinErr('areq', 'Argument \'{0}\' is {1}', (name || '?'), (reason || 'required'));
         }
         return arg;
     }
@@ -1451,7 +2097,7 @@
         }
 
         assertArg(isFunction(arg), name, 'not a function, got ' +
-        (arg && typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
+            (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg));
         return arg;
     }
 
@@ -1462,7 +2108,7 @@
      */
     function assertNotHasOwnProperty(name, context) {
         if (name === 'hasOwnProperty') {
-            throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context);
+            throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
         }
     }
 
@@ -1496,34 +2142,77 @@
     /**
      * Return the DOM siblings between the first and last node in the given array.
      * @param {Array} array like object
-     * @returns {DOMElement} object containing the elements
+     * @returns {Array} the inputted object or a jqLite collection containing the nodes
      */
-    function getBlockElements(nodes) {
-        var startNode = nodes[0],
-            endNode = nodes[nodes.length - 1];
-        if (startNode === endNode) {
-            return jqLite(startNode);
+    function getBlockNodes(nodes) {
+        // TODO(perf): update `nodes` instead of creating a new object?
+        var node = nodes[0];
+        var endNode = nodes[nodes.length - 1];
+        var blockNodes;
+
+        for (var i = 1; node !== endNode && (node = node.nextSibling); i++) {
+            if (blockNodes || nodes[i] !== node) {
+                if (!blockNodes) {
+                    blockNodes = jqLite(slice.call(nodes, 0, i));
+                }
+                blockNodes.push(node);
+            }
         }
 
-        var element = startNode;
-        var elements = [element];
+        return blockNodes || nodes;
+    }
+
+
+    /**
+     * Creates a new object without a prototype. This object is useful for lookup without having to
+     * guard against prototypically inherited properties via hasOwnProperty.
+     *
+     * Related micro-benchmarks:
+     * - http://jsperf.com/object-create2
+     * - http://jsperf.com/proto-map-lookup/2
+     * - http://jsperf.com/for-in-vs-object-keys2
+     *
+     * @returns {Object}
+     */
+    function createMap() {
+        return Object.create(null);
+    }
 
-        do {
-            element = element.nextSibling;
-            if (!element) break;
-            elements.push(element);
-        } while (element !== endNode);
+    function stringify(value) {
+        if (value == null) { // null || undefined
+            return '';
+        }
+        switch (typeof value) {
+            case 'string':
+                break;
+            case 'number':
+                value = '' + value;
+                break;
+            default:
+                if (hasCustomToString(value) && !isArray(value) && !isDate(value)) {
+                    value = value.toString();
+                } else {
+                    value = toJson(value);
+                }
+        }
 
-        return jqLite(elements);
+        return value;
     }
 
+    var NODE_TYPE_ELEMENT = 1;
+    var NODE_TYPE_ATTRIBUTE = 2;
+    var NODE_TYPE_TEXT = 3;
+    var NODE_TYPE_COMMENT = 8;
+    var NODE_TYPE_DOCUMENT = 9;
+    var NODE_TYPE_DOCUMENT_FRAGMENT = 11;
+
     /**
      * @ngdoc type
      * @name angular.Module
      * @module ng
      * @description
      *
-     * Interface for configuring angular {@link angular.module modules}.
+     * Interface for configuring AngularJS {@link angular.module modules}.
      */
 
     function setupModuleLoader(window) {
@@ -1550,18 +2239,18 @@
              * @module ng
              * @description
              *
-             * The `angular.module` is a global place for creating, registering and retrieving Angular
+             * The `angular.module` is a global place for creating, registering and retrieving AngularJS
              * modules.
-             * All modules (angular core or 3rd party) that should be available to an application must be
+             * All modules (AngularJS core or 3rd party) that should be available to an application must be
              * registered using this mechanism.
              *
-             * When passed two or more arguments, a new module is created.  If passed only one argument, an
-             * existing module (the name passed as the first argument to `module`) is retrieved.
+             * Passing one argument retrieves an existing {@link angular.Module},
+             * whereas passing more than one argument creates a new {@link angular.Module}
              *
              *
              * # Module
              *
-             * A module is a collection of services, directives, filters, and configuration information.
+             * A module is a collection of services, directives, controllers, filters, and configuration information.
              * `angular.module` is used to configure the {@link auto.$injector $injector}.
              *
              * ```js
@@ -1573,9 +2262,9 @@
              *
              * // configure existing services inside initialization blocks.
              * myModule.config(['$locationProvider', function($locationProvider) {
-     *   // Configure existing providers
-     *   $locationProvider.hashPrefix('!');
-     * }]);
+             *   // Configure existing providers
+             *   $locationProvider.hashPrefix('!');
+             * }]);
              * ```
              *
              * Then you can create an injector and load your modules like this:
@@ -1589,13 +2278,16 @@
              * {@link angular.bootstrap} to simplify this process for you.
              *
              * @param {!string} name The name of the module to create or retrieve.
-             <<<<<* @param {!Array.<string>=} requires If specified then new module is being created. If
-             >>>>>*        unspecified then the module is being retrieved for further configuration.
-             * @param {Function} configFn Optional configuration function for the module. Same as
+             * @param {!Array.<string>=} requires If specified then new module is being created. If
+             *        unspecified then the module is being retrieved for further configuration.
+             * @param {Function=} configFn Optional configuration function for the module. Same as
              *        {@link angular.Module#config Module#config()}.
-             * @returns {module} new module with the {@link angular.Module} api.
+             * @returns {angular.Module} new module with the {@link angular.Module} api.
              */
             return function module(name, requires, configFn) {
+
+                var info = {};
+
                 var assertNotHasOwnProperty = function(name, context) {
                     if (name === 'hasOwnProperty') {
                         throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
@@ -1608,42 +2300,86 @@
                 }
                 return ensure(modules, name, function() {
                     if (!requires) {
-                        throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
-                        "the module name or forgot to load it. If registering a module ensure that you " +
-                        "specify the dependencies as the second argument.", name);
+                        throw $injectorMinErr('nomod', 'Module \'{0}\' is not available! You either misspelled ' +
+                            'the module name or forgot to load it. If registering a module ensure that you ' +
+                            'specify the dependencies as the second argument.', name);
                     }
 
                     /** @type {!Array.<Array.<*>>} */
                     var invokeQueue = [];
 
+                    /** @type {!Array.<Function>} */
+                    var configBlocks = [];
+
                     /** @type {!Array.<Function>} */
                     var runBlocks = [];
 
-                    var config = invokeLater('$injector', 'invoke');
+                    var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
 
                     /** @type {angular.Module} */
                     var moduleInstance = {
                         // Private state
                         _invokeQueue: invokeQueue,
+                        _configBlocks: configBlocks,
                         _runBlocks: runBlocks,
 
                         /**
-                         * @ngdoc property
-                         * @name angular.Module#requires
+                         * @ngdoc method
+                         * @name angular.Module#info
                          * @module ng
-                         * @returns {Array.<string>} List of module names which must be loaded before this module.
+                         *
+                         * @param {Object=} info Information about the module
+                         * @returns {Object|Module} The current info object for this module if called as a getter,
+                         *                          or `this` if called as a setter.
+                         *
                          * @description
-                         * Holds the list of modules which the injector will load before the current module is
-                         * loaded.
+                         * Read and write custom information about this module.
+                         * For example you could put the version of the module in here.
+                         *
+                         * ```js
+                         * angular.module('myModule', []).info({ version: '1.0.0' });
+                         * ```
+                         *
+                         * The version could then be read back out by accessing the module elsewhere:
+                         *
+                         * ```
+                         * var version = angular.module('myModule').info().version;
+                         * ```
+                         *
+                         * You can also retrieve this information during runtime via the
+                         * {@link $injector#modules `$injector.modules`} property:
+                         *
+                         * ```js
+                         * var version = $injector.modules['myModule'].info().version;
+                         * ```
                          */
-                        requires: requires,
-
+                        info: function(value) {
+                            if (isDefined(value)) {
+                                if (!isObject(value)) throw ngMinErr('aobj', 'Argument \'{0}\' must be an object', 'value');
+                                info = value;
+                                return this;
+                            }
+                            return info;
+                        },
+
+                        /**
+                         * @ngdoc property
+                         * @name angular.Module#requires
+                         * @module ng
+                         *
+                         * @description
+                         * Holds the list of modules which the injector will load before the current module is
+                         * loaded.
+                         */
+                        requires: requires,
+
                         /**
                          * @ngdoc property
                          * @name angular.Module#name
                          * @module ng
-                         * @returns {string} Name of the module.
+                         *
                          * @description
+                         * Name of the module.
                          */
                         name: name,
 
@@ -1658,7 +2394,7 @@
                          * @description
                          * See {@link auto.$provide#provider $provide.provider()}.
                          */
-                        provider: invokeLater('$provide', 'provider'),
+                        provider: invokeLaterAndSetModuleName('$provide', 'provider'),
 
                         /**
                          * @ngdoc method
@@ -1669,7 +2405,7 @@
                          * @description
                          * See {@link auto.$provide#factory $provide.factory()}.
                          */
-                        factory: invokeLater('$provide', 'factory'),
+                        factory: invokeLaterAndSetModuleName('$provide', 'factory'),
 
                         /**
                          * @ngdoc method
@@ -1680,7 +2416,7 @@
                          * @description
                          * See {@link auto.$provide#service $provide.service()}.
                          */
-                        service: invokeLater('$provide', 'service'),
+                        service: invokeLaterAndSetModuleName('$provide', 'service'),
 
                         /**
                          * @ngdoc method
@@ -1700,11 +2436,23 @@
                          * @param {string} name constant name
                          * @param {*} object Constant value.
                          * @description
-                         * Because the constant are fixed, they get applied before other provide methods.
+                         * Because the constants are fixed, they get applied before other provide methods.
                          * See {@link auto.$provide#constant $provide.constant()}.
                          */
                         constant: invokeLater('$provide', 'constant', 'unshift'),
 
+                        /**
+                         * @ngdoc method
+                         * @name angular.Module#decorator
+                         * @module ng
+                         * @param {string} name The name of the service to decorate.
+                         * @param {Function} decorFn This function will be invoked when the service needs to be
+                         *                           instantiated and should return the decorated service instance.
+                         * @description
+                         * See {@link auto.$provide#decorator $provide.decorator()}.
+                         */
+                        decorator: invokeLaterAndSetModuleName('$provide', 'decorator', configBlocks),
+
                         /**
                          * @ngdoc method
                          * @name angular.Module#animation
@@ -1718,37 +2466,44 @@
                          *
                          *
                          * Defines an animation hook that can be later used with
-                         * {@link ngAnimate.$animate $animate} service and directives that use this service.
+                         * {@link $animate $animate} service and directives that use this service.
                          *
                          * ```js
                          * module.animation('.animation-name', function($inject1, $inject2) {
-           *   return {
-           *     eventName : function(element, done) {
-           *       //code to run the animation
-           *       //once complete, then run done()
-           *       return function cancellationFunction(element) {
-           *         //code to cancel the animation
-           *       }
-           *     }
-           *   }
-           * })
+                         *   return {
+                         *     eventName : function(element, done) {
+                         *       //code to run the animation
+                         *       //once complete, then run done()
+                         *       return function cancellationFunction(element) {
+                         *         //code to cancel the animation
+                         *       }
+                         *     }
+                         *   }
+                         * })
                          * ```
                          *
-                         * See {@link ngAnimate.$animateProvider#register $animateProvider.register()} and
+                         * See {@link ng.$animateProvider#register $animateProvider.register()} and
                          * {@link ngAnimate ngAnimate module} for more information.
                          */
-                        animation: invokeLater('$animateProvider', 'register'),
+                        animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
 
                         /**
                          * @ngdoc method
                          * @name angular.Module#filter
                          * @module ng
-                         * @param {string} name Filter name.
+                         * @param {string} name Filter name - this must be a valid AngularJS expression identifier
                          * @param {Function} filterFactory Factory function for creating new instance of filter.
                          * @description
                          * See {@link ng.$filterProvider#register $filterProvider.register()}.
+                         *
+                         * <div class="alert alert-warning">
+                         * **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+                         * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+                         * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+                         * (`myapp_subsection_filterx`).
+                         * </div>
                          */
-                        filter: invokeLater('$filterProvider', 'register'),
+                        filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
 
                         /**
                          * @ngdoc method
@@ -1760,7 +2515,7 @@
                          * @description
                          * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
                          */
-                        controller: invokeLater('$controllerProvider', 'register'),
+                        controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
 
                         /**
                          * @ngdoc method
@@ -1773,7 +2528,20 @@
                          * @description
                          * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
                          */
-                        directive: invokeLater('$compileProvider', 'directive'),
+                        directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
+
+                        /**
+                         * @ngdoc method
+                         * @name angular.Module#component
+                         * @module ng
+                         * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
+                         * @param {Object} options Component definition object (a simplified
+                         *    {@link ng.$compile#directive-definition-object directive definition object})
+                         *
+                         * @description
+                         * See {@link ng.$compileProvider#component $compileProvider.component()}.
+                         */
+                        component: invokeLaterAndSetModuleName('$compileProvider', 'component'),
 
                         /**
                          * @ngdoc method
@@ -1782,7 +2550,15 @@
                          * @param {Function} configFn Execute this function on module load. Useful for service
                          *    configuration.
                          * @description
-                         * Use this method to register work which needs to be performed on module loading.
+                         * Use this method to configure services by injecting their
+                         * {@link angular.Module#provider `providers`}, e.g. for adding routes to the
+                         * {@link ngRoute.$routeProvider $routeProvider}.
+                         *
+                         * Note that you can only inject {@link angular.Module#provider `providers`} and
+                         * {@link angular.Module#constant `constants`} into this function.
+                         *
+                         * For more about how to configure services, see
+                         * {@link providers#provider-recipe Provider Recipe}.
                          */
                         config: config,
 
@@ -1806,7 +2582,7 @@
                         config(configFn);
                     }
 
-                    return  moduleInstance;
+                    return moduleInstance;
 
                     /**
                      * @param {string} provider
@@ -1814,9 +2590,24 @@
                      * @param {String=} insertMethod
                      * @returns {angular.Module}
                      */
-                    function invokeLater(provider, method, insertMethod) {
+                    function invokeLater(provider, method, insertMethod, queue) {
+                        if (!queue) queue = invokeQueue;
                         return function() {
-                            invokeQueue[insertMethod || 'push']([provider, method, arguments]);
+                            queue[insertMethod || 'push']([provider, method, arguments]);
+                            return moduleInstance;
+                        };
+                    }
+
+                    /**
+                     * @param {string} provider
+                     * @param {string} method
+                     * @returns {angular.Module}
+                     */
+                    function invokeLaterAndSetModuleName(provider, method, queue) {
+                        if (!queue) queue = invokeQueue;
+                        return function(recipeName, factoryFunction) {
+                            if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
+                            queue.push([provider, method, arguments]);
                             return moduleInstance;
                         };
                     }
@@ -1826,82 +2617,165 @@
 
     }
 
-    /* global
-     angularModule: true,
-     version: true,
-
-     $LocaleProvider,
-     $CompileProvider,
-
-     htmlAnchorDirective,
-     inputDirective,
-     inputDirective,
-     formDirective,
-     scriptDirective,
-     selectDirective,
-     styleDirective,
-     optionDirective,
-     ngBindDirective,
-     ngBindHtmlDirective,
-     ngBindTemplateDirective,
-     ngClassDirective,
-     ngClassEvenDirective,
-     ngClassOddDirective,
-     ngCspDirective,
-     ngCloakDirective,
-     ngControllerDirective,
-     ngFormDirective,
-     ngHideDirective,
-     ngIfDirective,
-     ngIncludeDirective,
-     ngIncludeFillContentDirective,
-     ngInitDirective,
-     ngNonBindableDirective,
-     ngPluralizeDirective,
-     ngRepeatDirective,
-     ngShowDirective,
-     ngStyleDirective,
-     ngSwitchDirective,
-     ngSwitchWhenDirective,
-     ngSwitchDefaultDirective,
-     ngOptionsDirective,
-     ngTranscludeDirective,
-     ngModelDirective,
-     ngListDirective,
-     ngChangeDirective,
-     requiredDirective,
-     requiredDirective,
-     ngValueDirective,
-     ngAttributeAliasDirectives,
-     ngEventDirectives,
-
-     $AnchorScrollProvider,
-     $AnimateProvider,
-     $BrowserProvider,
-     $CacheFactoryProvider,
-     $ControllerProvider,
-     $DocumentProvider,
-     $ExceptionHandlerProvider,
-     $FilterProvider,
-     $InterpolateProvider,
-     $IntervalProvider,
-     $HttpProvider,
-     $HttpBackendProvider,
-     $LocationProvider,
-     $LogProvider,
-     $ParseProvider,
-     $RootScopeProvider,
-     $QProvider,
-     $$SanitizeUriProvider,
-     $SceProvider,
-     $SceDelegateProvider,
-     $SnifferProvider,
-     $TemplateCacheProvider,
-     $TimeoutProvider,
-     $$RAFProvider,
-     $$AsyncCallbackProvider,
-     $WindowProvider
+    /* global shallowCopy: true */
+
+    /**
+     * Creates a shallow copy of an object, an array or a primitive.
+     *
+     * Assumes that there are no proto properties for objects.
      */
+    function shallowCopy(src, dst) {
+        if (isArray(src)) {
+            dst = dst || [];
+
+            for (var i = 0, ii = src.length; i < ii; i++) {
+                dst[i] = src[i];
+            }
+        } else if (isObject(src)) {
+            dst = dst || {};
+
+            for (var key in src) {
+                if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+                    dst[key] = src[key];
+                }
+            }
+        }
+
+        return dst || src;
+    }
+
+    /* exported toDebugString */
+
+    function serializeObject(obj, maxDepth) {
+        var seen = [];
+
+        // There is no direct way to stringify object until reaching a specific depth
+        // and a very deep object can cause a performance issue, so we copy the object
+        // based on this specific depth and then stringify it.
+        if (isValidObjectMaxDepth(maxDepth)) {
+            // This file is also included in `angular-loader`, so `copy()` might not always be available in
+            // the closure. Therefore, it is lazily retrieved as `angular.copy()` when needed.
+            obj = angular.copy(obj, null, maxDepth);
+        }
+        return JSON.stringify(obj, function(key, val) {
+            val = toJsonReplacer(key, val);
+            if (isObject(val)) {
+
+                if (seen.indexOf(val) >= 0) return '...';
+
+                seen.push(val);
+            }
+            return val;
+        });
+    }
+
+    function toDebugString(obj, maxDepth) {
+        if (typeof obj === 'function') {
+            return obj.toString().replace(/ \{[\s\S]*$/, '');
+        } else if (isUndefined(obj)) {
+            return 'undefined';
+        } else if (typeof obj !== 'string') {
+            return serializeObject(obj, maxDepth);
+        }
+        return obj;
+    }
+
+    /* global angularModule: true,
+  version: true,
+
+  $CompileProvider,
+
+  htmlAnchorDirective,
+  inputDirective,
+  inputDirective,
+  formDirective,
+  scriptDirective,
+  selectDirective,
+  optionDirective,
+  ngBindDirective,
+  ngBindHtmlDirective,
+  ngBindTemplateDirective,
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective,
+  ngCloakDirective,
+  ngControllerDirective,
+  ngFormDirective,
+  ngHideDirective,
+  ngIfDirective,
+  ngIncludeDirective,
+  ngIncludeFillContentDirective,
+  ngInitDirective,
+  ngNonBindableDirective,
+  ngPluralizeDirective,
+  ngRepeatDirective,
+  ngShowDirective,
+  ngStyleDirective,
+  ngSwitchDirective,
+  ngSwitchWhenDirective,
+  ngSwitchDefaultDirective,
+  ngOptionsDirective,
+  ngTranscludeDirective,
+  ngModelDirective,
+  ngListDirective,
+  ngChangeDirective,
+  patternDirective,
+  patternDirective,
+  requiredDirective,
+  requiredDirective,
+  minlengthDirective,
+  minlengthDirective,
+  maxlengthDirective,
+  maxlengthDirective,
+  ngValueDirective,
+  ngModelOptionsDirective,
+  ngAttributeAliasDirectives,
+  ngEventDirectives,
+
+  $AnchorScrollProvider,
+  $AnimateProvider,
+  $CoreAnimateCssProvider,
+  $$CoreAnimateJsProvider,
+  $$CoreAnimateQueueProvider,
+  $$AnimateRunnerFactoryProvider,
+  $$AnimateAsyncRunFactoryProvider,
+  $BrowserProvider,
+  $CacheFactoryProvider,
+  $ControllerProvider,
+  $DateProvider,
+  $DocumentProvider,
+  $$IsDocumentHiddenProvider,
+  $ExceptionHandlerProvider,
+  $FilterProvider,
+  $$ForceReflowProvider,
+  $InterpolateProvider,
+  $IntervalProvider,
+  $HttpProvider,
+  $HttpParamSerializerProvider,
+  $HttpParamSerializerJQLikeProvider,
+  $HttpBackendProvider,
+  $xhrFactoryProvider,
+  $jsonpCallbacksProvider,
+  $LocationProvider,
+  $LogProvider,
+  $$MapProvider,
+  $ParseProvider,
+  $RootScopeProvider,
+  $QProvider,
+  $$QProvider,
+  $$SanitizeUriProvider,
+  $SceProvider,
+  $SceDelegateProvider,
+  $SnifferProvider,
+  $TemplateCacheProvider,
+  $TemplateRequestProvider,
+  $$TestabilityProvider,
+  $TimeoutProvider,
+  $$RAFProvider,
+  $WindowProvider,
+  $$jqLiteProvider,
+  $$CookieReaderProvider
+*/
 
 
     /**
@@ -1909,8 +2783,9 @@
      * @name angular.version
      * @module ng
      * @description
-     * An object that contains information about the current AngularJS version. This object has the
-     * following properties:
+     * An object that contains information about the current AngularJS version.
+     *
+     * This object has the following properties:
      *
      * - `full` – `{string}` – Full version string, such as "0.9.18".
      * - `major` – `{number}` – Major version number, such as "0".
@@ -1919,28 +2794,32 @@
      * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
      */
     var version = {
-        full: '1.2.16',    // all of these placeholder strings will be replaced by grunt's
-        major: 1,    // package task
-        minor: 2,
-        dot: 16,
-        codeName: 'badger-enumeration'
+        // These placeholder strings will be replaced by grunt's `build` task.
+        // They need to be double- or single-quoted.
+        full: '1.6.9',
+        major: 1,
+        minor: 6,
+        dot: 9,
+        codeName: 'fiery-basilisk'
     };
 
 
-    function publishExternalAPI(angular){
+    function publishExternalAPI(angular) {
         extend(angular, {
+            'errorHandlingConfig': errorHandlingConfig,
             'bootstrap': bootstrap,
             'copy': copy,
             'extend': extend,
+            'merge': merge,
             'equals': equals,
             'element': jqLite,
             'forEach': forEach,
             'injector': createInjector,
-            'noop':noop,
-            'bind':bind,
+            'noop': noop,
+            'bind': bind,
             'toJson': toJson,
             'fromJson': fromJson,
-            'identity':identity,
+            'identity': identity,
             'isUndefined': isUndefined,
             'isDefined': isDefined,
             'isString': isString,
@@ -1953,17 +2832,17 @@
             'isDate': isDate,
             'lowercase': lowercase,
             'uppercase': uppercase,
-            'callbacks': {counter: 0},
+            'callbacks': {$$counter: 0},
+            'getTestability': getTestability,
+            'reloadWithDebugInfo': reloadWithDebugInfo,
             '$$minErr': minErr,
-            '$$csp': csp
+            '$$csp': csp,
+            '$$encodeUriSegment': encodeUriSegment,
+            '$$encodeUriQuery': encodeUriQuery,
+            '$$stringify': stringify
         });
 
         angularModule = setupModuleLoader(window);
-        try {
-            angularModule('ngLocale');
-        } catch (e) {
-            angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
-        }
 
         angularModule('ng', ['ngLocale'], ['$provide',
             function ngModule($provide) {
@@ -1972,88 +2851,120 @@
                     $$sanitizeUri: $$SanitizeUriProvider
                 });
                 $provide.provider('$compile', $CompileProvider).
-                    directive({
-                        a: htmlAnchorDirective,
-                        input: inputDirective,
-                        textarea: inputDirective,
-                        form: formDirective,
-                        script: scriptDirective,
-                        select: selectDirective,
-                        style: styleDirective,
-                        option: optionDirective,
-                        ngBind: ngBindDirective,
-                        ngBindHtml: ngBindHtmlDirective,
-                        ngBindTemplate: ngBindTemplateDirective,
-                        ngClass: ngClassDirective,
-                        ngClassEven: ngClassEvenDirective,
-                        ngClassOdd: ngClassOddDirective,
-                        ngCloak: ngCloakDirective,
-                        ngController: ngControllerDirective,
-                        ngForm: ngFormDirective,
-                        ngHide: ngHideDirective,
-                        ngIf: ngIfDirective,
-                        ngInclude: ngIncludeDirective,
-                        ngInit: ngInitDirective,
-                        ngNonBindable: ngNonBindableDirective,
-                        ngPluralize: ngPluralizeDirective,
-                        ngRepeat: ngRepeatDirective,
-                        ngShow: ngShowDirective,
-                        ngStyle: ngStyleDirective,
-                        ngSwitch: ngSwitchDirective,
-                        ngSwitchWhen: ngSwitchWhenDirective,
-                        ngSwitchDefault: ngSwitchDefaultDirective,
-                        ngOptions: ngOptionsDirective,
-                        ngTransclude: ngTranscludeDirective,
-                        ngModel: ngModelDirective,
-                        ngList: ngListDirective,
-                        ngChange: ngChangeDirective,
-                        required: requiredDirective,
-                        ngRequired: requiredDirective,
-                        ngValue: ngValueDirective
-                    }).
-                    directive({
-                        ngInclude: ngIncludeFillContentDirective
-                    }).
-                    directive(ngAttributeAliasDirectives).
-                    directive(ngEventDirectives);
+                directive({
+                    a: htmlAnchorDirective,
+                    input: inputDirective,
+                    textarea: inputDirective,
+                    form: formDirective,
+                    script: scriptDirective,
+                    select: selectDirective,
+                    option: optionDirective,
+                    ngBind: ngBindDirective,
+                    ngBindHtml: ngBindHtmlDirective,
+                    ngBindTemplate: ngBindTemplateDirective,
+                    ngClass: ngClassDirective,
+                    ngClassEven: ngClassEvenDirective,
+                    ngClassOdd: ngClassOddDirective,
+                    ngCloak: ngCloakDirective,
+                    ngController: ngControllerDirective,
+                    ngForm: ngFormDirective,
+                    ngHide: ngHideDirective,
+                    ngIf: ngIfDirective,
+                    ngInclude: ngIncludeDirective,
+                    ngInit: ngInitDirective,
+                    ngNonBindable: ngNonBindableDirective,
+                    ngPluralize: ngPluralizeDirective,
+                    ngRepeat: ngRepeatDirective,
+                    ngShow: ngShowDirective,
+                    ngStyle: ngStyleDirective,
+                    ngSwitch: ngSwitchDirective,
+                    ngSwitchWhen: ngSwitchWhenDirective,
+                    ngSwitchDefault: ngSwitchDefaultDirective,
+                    ngOptions: ngOptionsDirective,
+                    ngTransclude: ngTranscludeDirective,
+                    ngModel: ngModelDirective,
+                    ngList: ngListDirective,
+                    ngChange: ngChangeDirective,
+                    pattern: patternDirective,
+                    ngPattern: patternDirective,
+                    required: requiredDirective,
+                    ngRequired: requiredDirective,
+                    minlength: minlengthDirective,
+                    ngMinlength: minlengthDirective,
+                    maxlength: maxlengthDirective,
+                    ngMaxlength: maxlengthDirective,
+                    ngValue: ngValueDirective,
+                    ngModelOptions: ngModelOptionsDirective
+                }).
+                directive({
+                    ngInclude: ngIncludeFillContentDirective
+                }).
+                directive(ngAttributeAliasDirectives).
+                directive(ngEventDirectives);
                 $provide.provider({
                     $anchorScroll: $AnchorScrollProvider,
                     $animate: $AnimateProvider,
+                    $animateCss: $CoreAnimateCssProvider,
+                    $$animateJs: $$CoreAnimateJsProvider,
+                    $$animateQueue: $$CoreAnimateQueueProvider,
+                    $$AnimateRunner: $$AnimateRunnerFactoryProvider,
+                    $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider,
                     $browser: $BrowserProvider,
                     $cacheFactory: $CacheFactoryProvider,
                     $controller: $ControllerProvider,
                     $document: $DocumentProvider,
+                    $$isDocumentHidden: $$IsDocumentHiddenProvider,
                     $exceptionHandler: $ExceptionHandlerProvider,
                     $filter: $FilterProvider,
+                    $$forceReflow: $$ForceReflowProvider,
                     $interpolate: $InterpolateProvider,
                     $interval: $IntervalProvider,
                     $http: $HttpProvider,
+                    $httpParamSerializer: $HttpParamSerializerProvider,
+                    $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
                     $httpBackend: $HttpBackendProvider,
+                    $xhrFactory: $xhrFactoryProvider,
+                    $jsonpCallbacks: $jsonpCallbacksProvider,
                     $location: $LocationProvider,
                     $log: $LogProvider,
                     $parse: $ParseProvider,
                     $rootScope: $RootScopeProvider,
                     $q: $QProvider,
+                    $$q: $$QProvider,
                     $sce: $SceProvider,
                     $sceDelegate: $SceDelegateProvider,
                     $sniffer: $SnifferProvider,
                     $templateCache: $TemplateCacheProvider,
+                    $templateRequest: $TemplateRequestProvider,
+                    $$testability: $$TestabilityProvider,
                     $timeout: $TimeoutProvider,
                     $window: $WindowProvider,
                     $$rAF: $$RAFProvider,
-                    $$asyncCallback : $$AsyncCallbackProvider
+                    $$jqLite: $$jqLiteProvider,
+                    $$Map: $$MapProvider,
+                    $$cookieReader: $$CookieReaderProvider
                 });
             }
-        ]);
+        ])
+            .info({ angularVersion: '1.6.9' });
     }
 
-    /* global
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-     -JQLitePrototype,
-     -addEventListenerFn,
-     -removeEventListenerFn,
-     -BOOLEAN_ATTR
-     */
+    /* global
+  JQLitePrototype: true,
+  BOOLEAN_ATTR: true,
+  ALIASED_ATTR: true
+*/
 
 //////////////////////////////////
 //JQLite
@@ -2063,37 +2974,45 @@
      * @ngdoc function
      * @name angular.element
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element.
      *
      * If jQuery is available, `angular.element` is an alias for the
      * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element`
-     * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
+     * delegates to AngularJS's built-in subset of jQuery, called "jQuery lite" or **jqLite**.
+     *
+     * jqLite is a tiny, API-compatible subset of jQuery that allows
+     * AngularJS to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most
+     * commonly needed functionality with the goal of having a very small footprint.
      *
-     * <div class="alert alert-success">jqLite is a tiny, API-compatible subset of jQuery that allows
-     * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most
-     * commonly needed functionality with the goal of having a very small footprint.</div>
+     * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the
+     * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a
+     * specific version of jQuery if multiple versions exist on the page.
      *
-     * To use jQuery, simply load it before `DOMContentLoaded` event fired.
+     * <div class="alert alert-info">**Note:** All element references in AngularJS are always wrapped with jQuery or
+     * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.</div>
      *
-     * <div class="alert">**Note:** all element references in Angular are always wrapped with jQuery or
-     * jqLite; they are never raw DOM references.</div>
+     * <div class="alert alert-warning">**Note:** Keep in mind that this function will not find elements
+     * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)`
+     * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.</div>
      *
-     * ## Angular's jqLite
+     * ## AngularJS's jqLite
      * jqLite provides only the following jQuery methods:
      *
-     * - [`addClass()`](http://api.jquery.com/addClass/)
+     * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
      * - [`after()`](http://api.jquery.com/after/)
      * - [`append()`](http://api.jquery.com/append/)
-     * - [`attr()`](http://api.jquery.com/attr/)
-     * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData
+     * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
+     * - [`bind()`](http://api.jquery.com/bind/) (_deprecated_, use [`on()`](http://api.jquery.com/on/)) - Does not support namespaces, selectors or eventData
      * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
      * - [`clone()`](http://api.jquery.com/clone/)
      * - [`contents()`](http://api.jquery.com/contents/)
-     * - [`css()`](http://api.jquery.com/css/)
+     * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`.
+     *   As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing.
      * - [`data()`](http://api.jquery.com/data/)
+     * - [`detach()`](http://api.jquery.com/detach/)
      * - [`empty()`](http://api.jquery.com/empty/)
      * - [`eq()`](http://api.jquery.com/eq/)
      * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
@@ -2101,26 +3020,26 @@
      * - [`html()`](http://api.jquery.com/html/)
      * - [`next()`](http://api.jquery.com/next/) - Does not support selectors
      * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
-     * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors
+     * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter
      * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors
      * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors
      * - [`prepend()`](http://api.jquery.com/prepend/)
      * - [`prop()`](http://api.jquery.com/prop/)
-     * - [`ready()`](http://api.jquery.com/ready/)
+     * - [`ready()`](http://api.jquery.com/ready/) (_deprecated_, use `angular.element(callback)` instead of `angular.element(document).ready(callback)`)
      * - [`remove()`](http://api.jquery.com/remove/)
-     * - [`removeAttr()`](http://api.jquery.com/removeAttr/)
-     * - [`removeClass()`](http://api.jquery.com/removeClass/)
+     * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - Does not support multiple attributes
+     * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
      * - [`removeData()`](http://api.jquery.com/removeData/)
      * - [`replaceWith()`](http://api.jquery.com/replaceWith/)
      * - [`text()`](http://api.jquery.com/text/)
-     * - [`toggleClass()`](http://api.jquery.com/toggleClass/)
-     * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers.
-     * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces
+     * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - Does not support a function as first argument
+     * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers
+     * - [`unbind()`](http://api.jquery.com/unbind/) (_deprecated_, use [`off()`](http://api.jquery.com/off/)) - Does not support namespaces or event object as parameter
      * - [`val()`](http://api.jquery.com/val/)
      * - [`wrap()`](http://api.jquery.com/wrap/)
      *
      * ## jQuery/jqLite Extras
-     * Angular also provides the following additional methods and events to both jQuery and jqLite:
+     * AngularJS also provides the following additional methods and events to both jQuery and jqLite:
      *
      * ### Events
      * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event
@@ -2134,31 +3053,31 @@
      *   `'ngModel'`).
      * - `injector()` - retrieves the injector of the current element or its parent.
      * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current
-     *   element or its parent.
+     *   element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to
+     *   be enabled.
      * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the
      *   current element. This getter should be used only on elements that contain a directive which starts a new isolate
      *   scope. Calling `scope()` on this element always returns the original non-isolate scope.
+     *   Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled.
      * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
      *   parent element is reached.
      *
+     * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See
+     * https://github.com/angular/angular.js/issues/14251 for more information.
+     *
      * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
      * @returns {Object} jQuery object.
      */
 
+    JQLite.expando = 'ng339';
+
     var jqCache = JQLite.cache = {},
-        jqName = JQLite.expando = 'ng-' + new Date().getTime(),
-        jqId = 1,
-        addEventListenerFn = (window.document.addEventListener
-            ? function(element, type, fn) {element.addEventListener(type, fn, false);}
-            : function(element, type, fn) {element.attachEvent('on' + type, fn);}),
-        removeEventListenerFn = (window.document.removeEventListener
-            ? function(element, type, fn) {element.removeEventListener(type, fn, false); }
-            : function(element, type, fn) {element.detachEvent('on' + type, fn); });
+        jqId = 1;
 
     /*
-     * !!! This is an undocumented "private" function !!!
-     */
-    var jqData = JQLite._data = function(node) {
+ * !!! This is an undocumented "private" function !!!
+ */
+    JQLite._data = function(node) {
         //jQuery always returns an object on cache miss
         return this.cache[node[this.expando]] || {};
     };
@@ -2166,70 +3085,37 @@
     function jqNextId() { return ++jqId; }
 
 
-    var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
-    var MOZ_HACK_REGEXP = /^moz([A-Z])/;
+    var DASH_LOWERCASE_REGEXP = /-([a-z])/g;
+    var MS_HACK_REGEXP = /^-ms-/;
+    var MOUSE_EVENT_MAP = { mouseleave: 'mouseout', mouseenter: 'mouseover' };
     var jqLiteMinErr = minErr('jqLite');
 
     /**
-     * Converts snake_case to camelCase.
-     * Also there is special case for Moz prefix starting with upper case letter.
+     * Converts kebab-case to camelCase.
+     * There is also a special case for the ms prefix starting with a lowercase letter.
      * @param name Name to normalize
      */
-    function camelCase(name) {
-        return name.
-            replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
-                return offset ? letter.toUpperCase() : letter;
-            }).
-            replace(MOZ_HACK_REGEXP, 'Moz$1');
+    function cssKebabToCamel(name) {
+        return kebabToCamel(name.replace(MS_HACK_REGEXP, 'ms-'));
     }
 
-/////////////////////////////////////////////
-// jQuery mutation patch
-//
-// In conjunction with bindJQuery intercepts all jQuery's DOM destruction apis and fires a
-// $destroy event on all DOM nodes being removed.
-//
-/////////////////////////////////////////////
+    function fnCamelCaseReplace(all, letter) {
+        return letter.toUpperCase();
+    }
 
-    function jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments) {
-        var originalJqFn = jQuery.fn[name];
-        originalJqFn = originalJqFn.$original || originalJqFn;
-        removePatch.$original = originalJqFn;
-        jQuery.fn[name] = removePatch;
-
-        function removePatch(param) {
-            // jshint -W040
-            var list = filterElems && param ? [this.filter(param)] : [this],
-                fireEvent = dispatchThis,
-                set, setIndex, setLength,
-                element, childIndex, childLength, children;
-
-            if (!getterIfNoArguments || param != null) {
-                while(list.length) {
-                    set = list.shift();
-                    for(setIndex = 0, setLength = set.length; setIndex < setLength; setIndex++) {
-                        element = jqLite(set[setIndex]);
-                        if (fireEvent) {
-                            element.triggerHandler('$destroy');
-                        } else {
-                            fireEvent = !fireEvent;
-                        }
-                        for(childIndex = 0, childLength = (children = element.children()).length;
-                            childIndex < childLength;
-                            childIndex++) {
-                            list.push(jQuery(children[childIndex]));
-                        }
-                    }
-                }
-            }
-            return originalJqFn.apply(this, arguments);
-        }
+    /**
+     * Converts kebab-case to camelCase.
+     * @param name Name to normalize
+     */
+    function kebabToCamel(name) {
+        return name
+            .replace(DASH_LOWERCASE_REGEXP, fnCamelCaseReplace);
     }
 
-    var SINGLE_TAG_REGEXP = /^<(\w+)\s*\/?>(?:<\/\1>|)$/;
+    var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/;
     var HTML_REGEXP = /<|&#?\w+;/;
-    var TAG_NAME_REGEXP = /<([\w:]+)/;
-    var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi;
+    var TAG_NAME_REGEXP = /<([\w:-]+)/;
+    var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi;
 
     var wrapMap = {
         'option': [1, '<select multiple="multiple">', '</select>'],
@@ -2238,33 +3124,46 @@
         'col': [2, '<table><colgroup>', '</colgroup></table>'],
         'tr': [2, '<table><tbody>', '</tbody></table>'],
         'td': [3, '<table><tbody><tr>', '</tr></tbody></table>'],
-        '_default': [0, "", ""]
+        '_default': [0, '', '']
     };
 
     wrapMap.optgroup = wrapMap.option;
     wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
     wrapMap.th = wrapMap.td;
 
+
     function jqLiteIsTextNode(html) {
         return !HTML_REGEXP.test(html);
     }
 
+    function jqLiteAcceptsData(node) {
+        // The window object can accept data but has no nodeType
+        // Otherwise we are only interested in elements (1) and documents (9)
+        var nodeType = node.nodeType;
+        return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
+    }
+
+    function jqLiteHasData(node) {
+        for (var key in jqCache[node.ng339]) {
+            return true;
+        }
+        return false;
+    }
+
     function jqLiteBuildFragment(html, context) {
-        var elem, tmp, tag, wrap,
+        var tmp, tag, wrap,
             fragment = context.createDocumentFragment(),
-            nodes = [], i, j, jj;
+            nodes = [], i;
 
         if (jqLiteIsTextNode(html)) {
             // Convert non-html into a text node
             nodes.push(context.createTextNode(html));
         } else {
-            tmp = fragment.appendChild(context.createElement('div'));
             // Convert html into DOM nodes
-            tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
+            tmp = fragment.appendChild(context.createElement('div'));
+            tag = (TAG_NAME_REGEXP.exec(html) || ['', ''])[1].toLowerCase();
             wrap = wrapMap[tag] || wrapMap._default;
-            tmp.innerHTML = '<div>&#160;</div>' +
-            wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1></$2>") + wrap[2];
-            tmp.removeChild(tmp.firstChild);
+            tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, '<$1></$2>') + wrap[2];
 
             // Descend through wrappers to the right content
             i = wrap[0];
@@ -2272,48 +3171,77 @@
                 tmp = tmp.lastChild;
             }
 
-            for (j=0, jj=tmp.childNodes.length; j<jj; ++j) nodes.push(tmp.childNodes[j]);
+            nodes = concat(nodes, tmp.childNodes);
 
             tmp = fragment.firstChild;
-            tmp.textContent = "";
+            tmp.textContent = '';
         }
 
         // Remove wrapper from fragment
-        fragment.textContent = "";
-        fragment.innerHTML = ""; // Clear inner HTML
-        return nodes;
+        fragment.textContent = '';
+        fragment.innerHTML = ''; // Clear inner HTML
+        forEach(nodes, function(node) {
+            fragment.appendChild(node);
+        });
+
+        return fragment;
     }
 
     function jqLiteParseHTML(html, context) {
-        context = context || document;
+        context = context || window.document;
         var parsed;
 
         if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
             return [context.createElement(parsed[1])];
         }
 
-        return jqLiteBuildFragment(html, context);
+        if ((parsed = jqLiteBuildFragment(html, context))) {
+            return parsed.childNodes;
+        }
+
+        return [];
+    }
+
+    function jqLiteWrapNode(node, wrapper) {
+        var parent = node.parentNode;
+
+        if (parent) {
+            parent.replaceChild(wrapper, node);
+        }
+
+        wrapper.appendChild(node);
     }
 
+
+// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
+    var jqLiteContains = window.Node.prototype.contains || /** @this */ function(arg) {
+        // eslint-disable-next-line no-bitwise
+        return !!(this.compareDocumentPosition(arg) & 16);
+    };
+
 /////////////////////////////////////////////
     function JQLite(element) {
         if (element instanceof JQLite) {
             return element;
         }
+
+        var argIsString;
+
         if (isString(element)) {
             element = trim(element);
+            argIsString = true;
         }
         if (!(this instanceof JQLite)) {
-            if (isString(element) && element.charAt(0) != '<') {
+            if (argIsString && element.charAt(0) !== '<') {
                 throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');
             }
             return new JQLite(element);
         }
 
-        if (isString(element)) {
+        if (argIsString) {
             jqLiteAddNodes(this, jqLiteParseHTML(element));
-            var fragment = jqLite(document.createDocumentFragment());
-            fragment.append(this);
+        } else if (isFunction(element)) {
+            jqLiteReady(element);
         } else {
             jqLiteAddNodes(this, element);
         }
@@ -2323,206 +3251,265 @@
         return element.cloneNode(true);
     }
 
-    function jqLiteDealoc(element){
-        jqLiteRemoveData(element);
-        for ( var i = 0, children = element.childNodes || []; i < children.length; i++) {
-            jqLiteDealoc(children[i]);
+    function jqLiteDealoc(element, onlyDescendants) {
+        if (!onlyDescendants && jqLiteAcceptsData(element)) jqLite.cleanData([element]);
+
+        if (element.querySelectorAll) {
+            jqLite.cleanData(element.querySelectorAll('*'));
         }
     }
 
     function jqLiteOff(element, type, fn, unsupported) {
         if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
 
-        var events = jqLiteExpandoStore(element, 'events'),
-            handle = jqLiteExpandoStore(element, 'handle');
+        var expandoStore = jqLiteExpandoStore(element);
+        var events = expandoStore && expandoStore.events;
+        var handle = expandoStore && expandoStore.handle;
 
         if (!handle) return; //no listeners registered
 
-        if (isUndefined(type)) {
-            forEach(events, function(eventHandler, type) {
-                removeEventListenerFn(element, type, eventHandler);
+        if (!type) {
+            for (type in events) {
+                if (type !== '$destroy') {
+                    element.removeEventListener(type, handle);
+                }
                 delete events[type];
-            });
+            }
         } else {
-            forEach(type.split(' '), function(type) {
-                if (isUndefined(fn)) {
-                    removeEventListenerFn(element, type, events[type]);
+
+            var removeHandler = function(type) {
+                var listenerFns = events[type];
+                if (isDefined(fn)) {
+                    arrayRemove(listenerFns || [], fn);
+                }
+                if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) {
+                    element.removeEventListener(type, handle);
                     delete events[type];
-                } else {
-                    arrayRemove(events[type] || [], fn);
+                }
+            };
+
+            forEach(type.split(' '), function(type) {
+                removeHandler(type);
+                if (MOUSE_EVENT_MAP[type]) {
+                    removeHandler(MOUSE_EVENT_MAP[type]);
                 }
             });
         }
     }
 
     function jqLiteRemoveData(element, name) {
-        var expandoId = element[jqName],
-            expandoStore = jqCache[expandoId];
+        var expandoId = element.ng339;
+        var expandoStore = expandoId && jqCache[expandoId];
 
         if (expandoStore) {
             if (name) {
-                delete jqCache[expandoId].data[name];
+                delete expandoStore.data[name];
                 return;
             }
 
             if (expandoStore.handle) {
-                expandoStore.events.$destroy && expandoStore.handle({}, '$destroy');
+                if (expandoStore.events.$destroy) {
+                    expandoStore.handle({}, '$destroy');
+                }
                 jqLiteOff(element);
             }
             delete jqCache[expandoId];
-            element[jqName] = undefined; // ie does not allow deletion of attributes on elements.
+            element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
         }
     }
 
-    function jqLiteExpandoStore(element, key, value) {
-        var expandoId = element[jqName],
-            expandoStore = jqCache[expandoId || -1];
 
-        if (isDefined(value)) {
-            if (!expandoStore) {
-                element[jqName] = expandoId = jqNextId();
-                expandoStore = jqCache[expandoId] = {};
-            }
-            expandoStore[key] = value;
-        } else {
-            return expandoStore && expandoStore[key];
+    function jqLiteExpandoStore(element, createIfNecessary) {
+        var expandoId = element.ng339,
+            expandoStore = expandoId && jqCache[expandoId];
+
+        if (createIfNecessary && !expandoStore) {
+            element.ng339 = expandoId = jqNextId();
+            expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined};
         }
+
+        return expandoStore;
     }
 
+
     function jqLiteData(element, key, value) {
-        var data = jqLiteExpandoStore(element, 'data'),
-            isSetter = isDefined(value),
-            keyDefined = !isSetter && isDefined(key),
-            isSimpleGetter = keyDefined && !isObject(key);
+        if (jqLiteAcceptsData(element)) {
+            var prop;
 
-        if (!data && !isSimpleGetter) {
-            jqLiteExpandoStore(element, 'data', data = {});
-        }
+            var isSimpleSetter = isDefined(value);
+            var isSimpleGetter = !isSimpleSetter && key && !isObject(key);
+            var massGetter = !key;
+            var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter);
+            var data = expandoStore && expandoStore.data;
 
-        if (isSetter) {
-            data[key] = value;
-        } else {
-            if (keyDefined) {
-                if (isSimpleGetter) {
-                    // don't create data in this case.
-                    return data && data[key];
+            if (isSimpleSetter) { // data('key', value)
+                data[kebabToCamel(key)] = value;
+            } else {
+                if (massGetter) {  // data()
+                    return data;
                 } else {
-                    extend(data, key);
+                    if (isSimpleGetter) { // data('key')
+                        // don't force creation of expandoStore if it doesn't exist yet
+                        return data && data[kebabToCamel(key)];
+                    } else { // mass-setter: data({key1: val1, key2: val2})
+                        for (prop in key) {
+                            data[kebabToCamel(prop)] = key[prop];
+                        }
+                    }
                 }
-            } else {
-                return data;
             }
         }
     }
 
     function jqLiteHasClass(element, selector) {
         if (!element.getAttribute) return false;
-        return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
-            indexOf( " " + selector + " " ) > -1);
+        return ((' ' + (element.getAttribute('class') || '') + ' ').replace(/[\n\t]/g, ' ').
+        indexOf(' ' + selector + ' ') > -1);
     }
 
     function jqLiteRemoveClass(element, cssClasses) {
         if (cssClasses && element.setAttribute) {
+            var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
+                .replace(/[\n\t]/g, ' ');
+            var newClasses = existingClasses;
+
             forEach(cssClasses.split(' '), function(cssClass) {
-                element.setAttribute('class', trim(
-                        (" " + (element.getAttribute('class') || '') + " ")
-                            .replace(/[\n\t]/g, " ")
-                            .replace(" " + trim(cssClass) + " ", " "))
-                );
+                cssClass = trim(cssClass);
+                newClasses = newClasses.replace(' ' + cssClass + ' ', ' ');
             });
+
+            if (newClasses !== existingClasses) {
+                element.setAttribute('class', trim(newClasses));
+            }
         }
     }
 
     function jqLiteAddClass(element, cssClasses) {
         if (cssClasses && element.setAttribute) {
             var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
-                .replace(/[\n\t]/g, " ");
+                .replace(/[\n\t]/g, ' ');
+            var newClasses = existingClasses;
 
             forEach(cssClasses.split(' '), function(cssClass) {
                 cssClass = trim(cssClass);
-                if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
-                    existingClasses += cssClass + ' ';
+                if (newClasses.indexOf(' ' + cssClass + ' ') === -1) {
+                    newClasses += cssClass + ' ';
                 }
             });
 
-            element.setAttribute('class', trim(existingClasses));
+            if (newClasses !== existingClasses) {
+                element.setAttribute('class', trim(newClasses));
+            }
         }
     }
 
+
     function jqLiteAddNodes(root, elements) {
+        // THIS CODE IS VERY HOT. Don't make changes without benchmarking.
+
         if (elements) {
-            elements = (!elements.nodeName && isDefined(elements.length) && !isWindow(elements))
-                ? elements
-                : [ elements ];
-            for(var i=0; i < elements.length; i++) {
-                root.push(elements[i]);
+
+            // if a Node (the most common case)
+            if (elements.nodeType) {
+                root[root.length++] = elements;
+            } else {
+                var length = elements.length;
+
+                // if an Array or NodeList and not a Window
+                if (typeof length === 'number' && elements.window !== elements) {
+                    if (length) {
+                        for (var i = 0; i < length; i++) {
+                            root[root.length++] = elements[i];
+                        }
+                    }
+                } else {
+                    root[root.length++] = elements;
+                }
             }
         }
     }
 
+
     function jqLiteController(element, name) {
-        return jqLiteInheritedData(element, '$' + (name || 'ngController' ) + 'Controller');
+        return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
     }
 
     function jqLiteInheritedData(element, name, value) {
-        element = jqLite(element);
-
         // if element is the document object work with the html element instead
         // this makes $(document).scope() possible
-        if(element[0].nodeType == 9) {
-            element = element.find('html');
+        if (element.nodeType === NODE_TYPE_DOCUMENT) {
+            element = element.documentElement;
         }
         var names = isArray(name) ? name : [name];
 
-        while (element.length) {
-            var node = element[0];
+        while (element) {
             for (var i = 0, ii = names.length; i < ii; i++) {
-                if ((value = element.data(names[i])) !== undefined) return value;
+                if (isDefined(value = jqLite.data(element, names[i]))) return value;
             }
 
             // If dealing with a document fragment node with a host element, and no parent, use the host
             // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
             // to lookup parent controllers.
-            element = jqLite(node.parentNode || (node.nodeType === 11 && node.host));
+            element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host);
         }
     }
 
     function jqLiteEmpty(element) {
-        for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
-            jqLiteDealoc(childNodes[i]);
-        }
+        jqLiteDealoc(element, true);
         while (element.firstChild) {
             element.removeChild(element.firstChild);
         }
     }
 
+    function jqLiteRemove(element, keepData) {
+        if (!keepData) jqLiteDealoc(element);
+        var parent = element.parentNode;
+        if (parent) parent.removeChild(element);
+    }
+
+
+    function jqLiteDocumentLoaded(action, win) {
+        win = win || window;
+        if (win.document.readyState === 'complete') {
+            // Force the action to be run async for consistent behavior
+            // from the action's point of view
+            // i.e. it will definitely not be in a $apply
+            win.setTimeout(action);
+        } else {
+            // No need to unbind this handler as load is only ever called once
+            jqLite(win).on('load', action);
+        }
+    }
+
+    function jqLiteReady(fn) {
+        function trigger() {
+            window.document.removeEventListener('DOMContentLoaded', trigger);
+            window.removeEventListener('load', trigger);
+            fn();
+        }
+
+        // check if document is already loaded
+        if (window.document.readyState === 'complete') {
+            window.setTimeout(fn);
+        } else {
+            // We can not use jqLite since we are not done loading and jQuery could be loaded later.
+
+            // Works for modern browsers and IE9
+            window.document.addEventListener('DOMContentLoaded', trigger);
+
+            // Fallback to window.onload for others
+            window.addEventListener('load', trigger);
+        }
+    }
+
 //////////////////////////////////////////
 // Functions which are declared directly.
 //////////////////////////////////////////
     var JQLitePrototype = JQLite.prototype = {
-        ready: function(fn) {
-            var fired = false;
-
-            function trigger() {
-                if (fired) return;
-                fired = true;
-                fn();
-            }
-
-            // check if document already is loaded
-            if (document.readyState === 'complete'){
-                setTimeout(trigger);
-            } else {
-                this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
-                // we can not use jqLite since we are not done loading and jQuery could be loaded later.
-                // jshint -W064
-                JQLite(window).on('load', trigger); // fallback to window.onload for others
-                // jshint +W064
-            }
-        },
+        ready: jqLiteReady,
         toString: function() {
             var value = [];
-            forEach(this, function(e){ value.push('' + e);});
+            forEach(this, function(e) { value.push('' + e);});
             return '[' + value.join(', ') + ']';
         },
 
@@ -2547,29 +3534,54 @@
     });
     var BOOLEAN_ELEMENTS = {};
     forEach('input,select,option,textarea,button,form,details'.split(','), function(value) {
-        BOOLEAN_ELEMENTS[uppercase(value)] = true;
+        BOOLEAN_ELEMENTS[value] = true;
     });
+    var ALIASED_ATTR = {
+        'ngMinlength': 'minlength',
+        'ngMaxlength': 'maxlength',
+        'ngMin': 'min',
+        'ngMax': 'max',
+        'ngPattern': 'pattern',
+        'ngStep': 'step'
+    };
 
     function getBooleanAttrName(element, name) {
         // check dom last since we will most likely fail on name
         var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
 
         // booleanAttr is here twice to minimize DOM access
-        return booleanAttr && BOOLEAN_ELEMENTS[element.nodeName] && booleanAttr;
+        return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
+    }
+
+    function getAliasedAttrName(name) {
+        return ALIASED_ATTR[name];
     }
 
+    forEach({
+        data: jqLiteData,
+        removeData: jqLiteRemoveData,
+        hasData: jqLiteHasData,
+        cleanData: function jqLiteCleanData(nodes) {
+            for (var i = 0, ii = nodes.length; i < ii; i++) {
+                jqLiteRemoveData(nodes[i]);
+            }
+        }
+    }, function(fn, name) {
+        JQLite[name] = fn;
+    });
+
     forEach({
         data: jqLiteData,
         inheritedData: jqLiteInheritedData,
 
         scope: function(element) {
             // Can't use jqLiteData here directly so we stay compatible with jQuery!
-            return jqLite(element).data('$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
+            return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
         },
 
         isolateScope: function(element) {
             // Can't use jqLiteData here directly so we stay compatible with jQuery!
-            return jqLite(element).data('$isolateScope') || jqLite(element).data('$isolateScopeNoTemplate');
+            return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
         },
 
         controller: jqLiteController,
@@ -2578,61 +3590,50 @@
             return jqLiteInheritedData(element, '$injector');
         },
 
-        removeAttr: function(element,name) {
+        removeAttr: function(element, name) {
             element.removeAttribute(name);
         },
 
         hasClass: jqLiteHasClass,
 
         css: function(element, name, value) {
-            name = camelCase(name);
+            name = cssKebabToCamel(name);
 
             if (isDefined(value)) {
                 element.style[name] = value;
             } else {
-                var val;
+                return element.style[name];
+            }
+        },
 
-                if (msie <= 8) {
-                    // this is some IE specific weirdness that jQuery 1.6.4 does not sure why
-                    val = element.currentStyle && element.currentStyle[name];
-                    if (val === '') val = 'auto';
-                }
+        attr: function(element, name, value) {
+            var ret;
+            var nodeType = element.nodeType;
+            if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT ||
+                !element.getAttribute) {
+                return;
+            }
 
-                val = val || element.style[name];
+            var lowercasedName = lowercase(name);
+            var isBooleanAttr = BOOLEAN_ATTR[lowercasedName];
+
+            if (isDefined(value)) {
+                // setter
 
-                if (msie <= 8) {
-                    // jquery weirdness :-/
-                    val = (val === '') ? undefined : val;
+                if (value === null || (value === false && isBooleanAttr)) {
+                    element.removeAttribute(name);
+                } else {
+                    element.setAttribute(name, isBooleanAttr ? lowercasedName : value);
                 }
+            } else {
+                // getter
 
-                return  val;
-            }
-        },
+                ret = element.getAttribute(name);
 
-        attr: function(element, name, value){
-            var lowercasedName = lowercase(name);
-            if (BOOLEAN_ATTR[lowercasedName]) {
-                if (isDefined(value)) {
-                    if (!!value) {
-                        element[name] = true;
-                        element.setAttribute(name, lowercasedName);
-                    } else {
-                        element[name] = false;
-                        element.removeAttribute(lowercasedName);
-                    }
-                } else {
-                    return (element[name] ||
-                    (element.attributes.getNamedItem(name)|| noop).specified)
-                        ? lowercasedName
-                        : undefined;
-                }
-            } else if (isDefined(value)) {
-                element.setAttribute(name, value);
-            } else if (element.getAttribute) {
-                // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code
-                // some elements (e.g. Document) don't have get attribute, so return undefined
-                var ret = element.getAttribute(name, 2);
-                // normalize non-existing attributes to undefined (as jQuery)
+                if (isBooleanAttr && ret !== null) {
+                    ret = lowercasedName;
+                }
+                // Normalize non-existing attributes to undefined (as jQuery).
                 return ret === null ? undefined : ret;
             }
         },
@@ -2646,36 +3647,28 @@
         },
 
         text: (function() {
-            var NODE_TYPE_TEXT_PROPERTY = [];
-            if (msie < 9) {
-                NODE_TYPE_TEXT_PROPERTY[1] = 'innerText';    /** Element **/
-                NODE_TYPE_TEXT_PROPERTY[3] = 'nodeValue';    /** Text **/
-            } else {
-                NODE_TYPE_TEXT_PROPERTY[1] =                 /** Element **/
-                    NODE_TYPE_TEXT_PROPERTY[3] = 'textContent';  /** Text **/
-            }
             getText.$dv = '';
             return getText;
 
             function getText(element, value) {
-                var textProp = NODE_TYPE_TEXT_PROPERTY[element.nodeType];
                 if (isUndefined(value)) {
-                    return textProp ? element[textProp] : '';
+                    var nodeType = element.nodeType;
+                    return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : '';
                 }
-                element[textProp] = value;
+                element.textContent = value;
             }
         })(),
 
         val: function(element, value) {
             if (isUndefined(value)) {
-                if (nodeName_(element) === 'SELECT' && element.multiple) {
+                if (element.multiple && nodeName_(element) === 'select') {
                     var result = [];
-                    forEach(element.options, function (option) {
+                    forEach(element.options, function(option) {
                         if (option.selected) {
                             result.push(option.value || option.text);
                         }
                     });
-                    return result.length === 0 ? null : result;
+                    return result;
                 }
                 return element.value;
             }
@@ -2686,29 +3679,28 @@
             if (isUndefined(value)) {
                 return element.innerHTML;
             }
-            for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
-                jqLiteDealoc(childNodes[i]);
-            }
+            jqLiteDealoc(element, true);
             element.innerHTML = value;
         },
 
         empty: jqLiteEmpty
-    }, function(fn, name){
+    }, function(fn, name) {
         /**
          * Properties: writes return selection, reads return first value
          */
         JQLite.prototype[name] = function(arg1, arg2) {
             var i, key;
+            var nodeCount = this.length;
 
             // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it
             // in a way that survives minification.
             // jqLiteEmpty takes no arguments but is a setter.
             if (fn !== jqLiteEmpty &&
-                (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) {
+                (isUndefined((fn.length === 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) {
                 if (isObject(arg1)) {
 
                     // we are a write, but the object properties are the key/values
-                    for (i = 0; i < this.length; i++) {
+                    for (i = 0; i < nodeCount; i++) {
                         if (fn === jqLiteData) {
                             // data() takes the whole object in jQuery
                             fn(this[i], arg1);
@@ -2722,9 +3714,10 @@
                     return this;
                 } else {
                     // we are a read, so read the first child.
+                    // TODO: do we still need this?
                     var value = fn.$dv;
                     // Only if we have $dv do we iterate over all, otherwise it is just the first element.
-                    var jj = (value === undefined) ? Math.min(this.length, 1) : this.length;
+                    var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount;
                     for (var j = 0; j < jj; j++) {
                         var nodeValue = fn(this[j], arg1, arg2);
                         value = value ? value + nodeValue : nodeValue;
@@ -2733,7 +3726,7 @@
                 }
             } else {
                 // we are a write, so apply to all children
-                for (i = 0; i < this.length; i++) {
+                for (i = 0; i < nodeCount; i++) {
                     fn(this[i], arg1, arg2);
                 }
                 // return self for chaining
@@ -2743,61 +3736,73 @@
     });
 
     function createEventHandler(element, events) {
-        var eventHandler = function (event, type) {
-            if (!event.preventDefault) {
-                event.preventDefault = function() {
-                    event.returnValue = false; //ie
-                };
-            }
+        var eventHandler = function(event, type) {
+            // jQuery specific api
+            event.isDefaultPrevented = function() {
+                return event.defaultPrevented;
+            };
 
-            if (!event.stopPropagation) {
-                event.stopPropagation = function() {
-                    event.cancelBubble = true; //ie
-                };
-            }
+            var eventFns = events[type || event.type];
+            var eventFnsLength = eventFns ? eventFns.length : 0;
 
-            if (!event.target) {
-                event.target = event.srcElement || document;
-            }
+            if (!eventFnsLength) return;
+
+            if (isUndefined(event.immediatePropagationStopped)) {
+                var originalStopImmediatePropagation = event.stopImmediatePropagation;
+                event.stopImmediatePropagation = function() {
+                    event.immediatePropagationStopped = true;
 
-            if (isUndefined(event.defaultPrevented)) {
-                var prevent = event.preventDefault;
-                event.preventDefault = function() {
-                    event.defaultPrevented = true;
-                    prevent.call(event);
+                    if (event.stopPropagation) {
+                        event.stopPropagation();
+                    }
+
+                    if (originalStopImmediatePropagation) {
+                        originalStopImmediatePropagation.call(event);
+                    }
                 };
-                event.defaultPrevented = false;
             }
 
-            event.isDefaultPrevented = function() {
-                return event.defaultPrevented || event.returnValue === false;
+            event.isImmediatePropagationStopped = function() {
+                return event.immediatePropagationStopped === true;
             };
 
-            // Copy event handlers in case event handlers array is modified during execution.
-            var eventHandlersCopy = shallowCopy(events[type || event.type] || []);
+            // Some events have special handlers that wrap the real handler
+            var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
 
-            forEach(eventHandlersCopy, function(fn) {
-                fn.call(element, event);
-            });
+            // Copy event handlers in case event handlers array is modified during execution.
+            if ((eventFnsLength > 1)) {
+                eventFns = shallowCopy(eventFns);
+            }
 
-            // Remove monkey-patched methods (IE),
-            // as they would cause memory leaks in IE8.
-            if (msie <= 8) {
-                // IE7/8 does not allow to delete property on native object
-                event.preventDefault = null;
-                event.stopPropagation = null;
-                event.isDefaultPrevented = null;
-            } else {
-                // It shouldn't affect normal browsers (native methods are defined on prototype).
-                delete event.preventDefault;
-                delete event.stopPropagation;
-                delete event.isDefaultPrevented;
+            for (var i = 0; i < eventFnsLength; i++) {
+                if (!event.isImmediatePropagationStopped()) {
+                    handlerWrapper(element, event, eventFns[i]);
+                }
             }
         };
+
+        // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all
+        //       events on `element`
         eventHandler.elem = element;
         return eventHandler;
     }
 
+    function defaultHandlerWrapper(element, event, handler) {
+        handler.call(element, event);
+    }
+
+    function specialMouseHandlerWrapper(target, event, handler) {
+        // Refer to jQuery's implementation of mouseenter & mouseleave
+        // Read about mouseenter and mouseleave:
+        // http://www.quirksmode.org/js/events_mouse.html#link8
+        var related = event.relatedTarget;
+        // For mousenter/leave call the handler if related is outside the target.
+        // NB: No relatedTarget if the mouse left/entered the browser window
+        if (!related || (related !== target && !jqLiteContains.call(target, related))) {
+            handler.call(target, event);
+        }
+    }
+
 //////////////////////////////////////////
 // Functions iterating traversal.
 // These functions chain results into a single
@@ -2806,68 +3811,49 @@
     forEach({
         removeData: jqLiteRemoveData,
 
-        dealoc: jqLiteDealoc,
-
-        on: function onFn(element, type, fn, unsupported){
+        on: function jqLiteOn(element, type, fn, unsupported) {
             if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters');
 
-            var events = jqLiteExpandoStore(element, 'events'),
-                handle = jqLiteExpandoStore(element, 'handle');
+            // Do not add event handlers to non-elements because they will not be cleaned up.
+            if (!jqLiteAcceptsData(element)) {
+                return;
+            }
+
+            var expandoStore = jqLiteExpandoStore(element, true);
+            var events = expandoStore.events;
+            var handle = expandoStore.handle;
 
-            if (!events) jqLiteExpandoStore(element, 'events', events = {});
-            if (!handle) jqLiteExpandoStore(element, 'handle', handle = createEventHandler(element, events));
+            if (!handle) {
+                handle = expandoStore.handle = createEventHandler(element, events);
+            }
+
+            // http://jsperf.com/string-indexof-vs-split
+            var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type];
+            var i = types.length;
 
-            forEach(type.split(' '), function(type){
+            var addHandler = function(type, specialHandlerWrapper, noEventListener) {
                 var eventFns = events[type];
 
                 if (!eventFns) {
-                    if (type == 'mouseenter' || type == 'mouseleave') {
-                        var contains = document.body.contains || document.body.compareDocumentPosition ?
-                            function( a, b ) {
-                                // jshint bitwise: false
-                                var adown = a.nodeType === 9 ? a.documentElement : a,
-                                    bup = b && b.parentNode;
-                                return a === bup || !!( bup && bup.nodeType === 1 && (
-                                    adown.contains ?
-                                        adown.contains( bup ) :
-                                    a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-                                ));
-                            } :
-                            function( a, b ) {
-                                if ( b ) {
-                                    while ( (b = b.parentNode) ) {
-                                        if ( b === a ) {
-                                            return true;
-                                        }
-                                    }
-                                }
-                                return false;
-                            };
-
-                        events[type] = [];
+                    eventFns = events[type] = [];
+                    eventFns.specialHandlerWrapper = specialHandlerWrapper;
+                    if (type !== '$destroy' && !noEventListener) {
+                        element.addEventListener(type, handle);
+                    }
+                }
 
-                        // Refer to jQuery's implementation of mouseenter & mouseleave
-                        // Read about mouseenter and mouseleave:
-                        // http://www.quirksmode.org/js/events_mouse.html#link8
-                        var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"};
+                eventFns.push(fn);
+            };
 
-                        onFn(element, eventmap[type], function(event) {
-                            var target = this, related = event.relatedTarget;
-                            // For mousenter/leave call the handler if related is outside the target.
-                            // NB: No relatedTarget if the mouse left/entered the browser window
-                            if ( !related || (related !== target && !contains(target, related)) ){
-                                handle(event, type);
-                            }
-                        });
-
-                    } else {
-                        addEventListenerFn(element, type, handle);
-                        events[type] = [];
-                    }
-                    eventFns = events[type];
+            while (i--) {
+                type = types[i];
+                if (MOUSE_EVENT_MAP[type]) {
+                    addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper);
+                    addHandler(type, undefined, true);
+                } else {
+                    addHandler(type);
                 }
-                eventFns.push(fn);
-            });
+            }
         },
 
         off: jqLiteOff,
@@ -2888,7 +3874,7 @@
         replaceWith: function(element, replaceNode) {
             var index, parent = element.parentNode;
             jqLiteDealoc(element);
-            forEach(new JQLite(replaceNode), function(node){
+            forEach(new JQLite(replaceNode), function(node) {
                 if (index) {
                     parent.insertBefore(node, index.nextSibling);
                 } else {
@@ -2900,9 +3886,10 @@
 
         children: function(element) {
             var children = [];
-            forEach(element.childNodes, function(element){
-                if (element.nodeType === 1)
+            forEach(element.childNodes, function(element) {
+                if (element.nodeType === NODE_TYPE_ELEMENT) {
                     children.push(element);
+                }
             });
             return children;
         },
@@ -2912,43 +3899,48 @@
         },
 
         append: function(element, node) {
-            forEach(new JQLite(node), function(child){
-                if (element.nodeType === 1 || element.nodeType === 11) {
-                    element.appendChild(child);
-                }
-            });
+            var nodeType = element.nodeType;
+            if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return;
+
+            node = new JQLite(node);
+
+            for (var i = 0, ii = node.length; i < ii; i++) {
+                var child = node[i];
+                element.appendChild(child);
+            }
         },
 
         prepend: function(element, node) {
-            if (element.nodeType === 1) {
+            if (element.nodeType === NODE_TYPE_ELEMENT) {
                 var index = element.firstChild;
-                forEach(new JQLite(node), function(child){
+                forEach(new JQLite(node), function(child) {
                     element.insertBefore(child, index);
                 });
             }
         },
 
         wrap: function(element, wrapNode) {
-            wrapNode = jqLite(wrapNode)[0];
-            var parent = element.parentNode;
-            if (parent) {
-                parent.replaceChild(wrapNode, element);
-            }
-            wrapNode.appendChild(element);
+            jqLiteWrapNode(element, jqLite(wrapNode).eq(0).clone()[0]);
         },
 
-        remove: function(element) {
-            jqLiteDealoc(element);
-            var parent = element.parentNode;
-            if (parent) parent.removeChild(element);
+        remove: jqLiteRemove,
+
+        detach: function(element) {
+            jqLiteRemove(element, true);
         },
 
         after: function(element, newElement) {
             var index = element, parent = element.parentNode;
-            forEach(new JQLite(newElement), function(node){
-                parent.insertBefore(node, index.nextSibling);
-                index = node;
-            });
+
+            if (parent) {
+                newElement = new JQLite(newElement);
+
+                for (var i = 0, ii = newElement.length; i < ii; i++) {
+                    var node = newElement[i];
+                    parent.insertBefore(node, index.nextSibling);
+                    index = node;
+                }
+            }
         },
 
         addClass: jqLiteAddClass,
@@ -2956,7 +3948,7 @@
 
         toggleClass: function(element, selector, condition) {
             if (selector) {
-                forEach(selector.split(' '), function(className){
+                forEach(selector.split(' '), function(className) {
                     var classCondition = condition;
                     if (isUndefined(classCondition)) {
                         classCondition = !jqLiteHasClass(element, className);
@@ -2968,20 +3960,11 @@
 
         parent: function(element) {
             var parent = element.parentNode;
-            return parent && parent.nodeType !== 11 ? parent : null;
+            return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null;
         },
 
         next: function(element) {
-            if (element.nextElementSibling) {
-                return element.nextElementSibling;
-            }
-
-            // IE8 doesn't have nextElementSibling
-            var elm = element.nextSibling;
-            while (elm != null && elm.nodeType !== 1) {
-                elm = elm.nextSibling;
-            }
-            return elm;
+            return element.nextElementSibling;
         },
 
         find: function(element, selector) {
@@ -2994,27 +3977,50 @@
 
         clone: jqLiteClone,
 
-        triggerHandler: function(element, eventName, eventData) {
-            var eventFns = (jqLiteExpandoStore(element, 'events') || {})[eventName];
+        triggerHandler: function(element, event, extraParameters) {
+
+            var dummyEvent, eventFnsCopy, handlerArgs;
+            var eventName = event.type || event;
+            var expandoStore = jqLiteExpandoStore(element);
+            var events = expandoStore && expandoStore.events;
+            var eventFns = events && events[eventName];
+
+            if (eventFns) {
+                // Create a dummy event to pass to the handlers
+                dummyEvent = {
+                    preventDefault: function() { this.defaultPrevented = true; },
+                    isDefaultPrevented: function() { return this.defaultPrevented === true; },
+                    stopImmediatePropagation: function() { this.immediatePropagationStopped = true; },
+                    isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; },
+                    stopPropagation: noop,
+                    type: eventName,
+                    target: element
+                };
 
-            eventData = eventData || [];
+                // If a custom event was provided then extend our dummy event with it
+                if (event.type) {
+                    dummyEvent = extend(dummyEvent, event);
+                }
 
-            var event = [{
-                preventDefault: noop,
-                stopPropagation: noop
-            }];
+                // Copy event handlers in case event handlers array is modified during execution.
+                eventFnsCopy = shallowCopy(eventFns);
+                handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
 
-            forEach(eventFns, function(fn) {
-                fn.apply(element, event.concat(eventData));
-            });
+                forEach(eventFnsCopy, function(fn) {
+                    if (!dummyEvent.isImmediatePropagationStopped()) {
+                        fn.apply(element, handlerArgs);
+                    }
+                });
+            }
         }
-    }, function(fn, name){
+    }, function(fn, name) {
         /**
          * chaining functions
          */
         JQLite.prototype[name] = function(arg1, arg2, arg3) {
             var value;
-            for(var i=0; i < this.length; i++) {
+
+            for (var i = 0, ii = this.length; i < ii; i++) {
                 if (isUndefined(value)) {
                     value = fn(this[i], arg1, arg2, arg3);
                     if (isDefined(value)) {
@@ -3027,12 +4033,34 @@
             }
             return isDefined(value) ? value : this;
         };
-
-        // bind legacy bind/unbind to on/off
-        JQLite.prototype.bind = JQLite.prototype.on;
-        JQLite.prototype.unbind = JQLite.prototype.off;
     });
 
+// bind legacy bind/unbind to on/off
+    JQLite.prototype.bind = JQLite.prototype.on;
+    JQLite.prototype.unbind = JQLite.prototype.off;
+
+
+// Provider for private $$jqLite service
+    /** @this */
+    function $$jqLiteProvider() {
+        this.$get = function $$jqLite() {
+            return extend(JQLite, {
+                hasClass: function(node, classes) {
+                    if (node.attr) node = node[0];
+                    return jqLiteHasClass(node, classes);
+                },
+                addClass: function(node, classes) {
+                    if (node.attr) node = node[0];
+                    return jqLiteAddClass(node, classes);
+                },
+                removeClass: function(node, classes) {
+                    if (node.attr) node = node[0];
+                    return jqLiteRemoveClass(node, classes);
+                }
+            });
+        };
+    }
+
     /**
      * Computes a hash of an 'obj'.
      * Hash of a:
@@ -3045,73 +4073,108 @@
      * @returns {string} hash string such that the same input will have the same hash string.
      *         The resulting string key is in 'type:hashKey' format.
      */
-    function hashKey(obj) {
-        var objType = typeof obj,
-            key;
+    function hashKey(obj, nextUidFn) {
+        var key = obj && obj.$$hashKey;
 
-        if (objType == 'object' && obj !== null) {
-            if (typeof (key = obj.$$hashKey) == 'function') {
-                // must invoke on object to keep the right this
+        if (key) {
+            if (typeof key === 'function') {
                 key = obj.$$hashKey();
-            } else if (key === undefined) {
-                key = obj.$$hashKey = nextUid();
             }
+            return key;
+        }
+
+        var objType = typeof obj;
+        if (objType === 'function' || (objType === 'object' && obj !== null)) {
+            key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)();
         } else {
-            key = obj;
+            key = objType + ':' + obj;
         }
 
-        return objType + ':' + key;
+        return key;
     }
 
-    /**
-     * HashMap which can use objects as keys
-     */
-    function HashMap(array){
-        forEach(array, this.put, this);
+// A minimal ES2015 Map implementation.
+// Should be bug/feature equivalent to the native implementations of supported browsers
+// (for the features required in Angular).
+// See https://kangax.github.io/compat-table/es6/#test-Map
+    var nanKey = Object.create(null);
+    function NgMapShim() {
+        this._keys = [];
+        this._values = [];
+        this._lastKey = NaN;
+        this._lastIndex = -1;
     }
-    HashMap.prototype = {
-        /**
-         * Store key value pair
-         * @param key key to store can be any type
-         * @param value value to store can be any type
-         */
-        put: function(key, value) {
-            this[hashKey(key)] = value;
+    NgMapShim.prototype = {
+        _idx: function(key) {
+            if (key === this._lastKey) {
+                return this._lastIndex;
+            }
+            this._lastKey = key;
+            this._lastIndex = this._keys.indexOf(key);
+            return this._lastIndex;
+        },
+        _transformKey: function(key) {
+            return isNumberNaN(key) ? nanKey : key;
         },
-
-        /**
-         * @param key
-         * @returns {Object} the value for the key
-         */
         get: function(key) {
-            return this[hashKey(key)];
+            key = this._transformKey(key);
+            var idx = this._idx(key);
+            if (idx !== -1) {
+                return this._values[idx];
+            }
         },
+        set: function(key, value) {
+            key = this._transformKey(key);
+            var idx = this._idx(key);
+            if (idx === -1) {
+                idx = this._lastIndex = this._keys.length;
+            }
+            this._keys[idx] = key;
+            this._values[idx] = value;
 
-        /**
-         * Remove the key/value pair
-         * @param key
-         */
-        remove: function(key) {
-            var value = this[key = hashKey(key)];
-            delete this[key];
-            return value;
+            // Support: IE11
+            // Do not `return this` to simulate the partial IE11 implementation
+        },
+        delete: function(key) {
+            key = this._transformKey(key);
+            var idx = this._idx(key);
+            if (idx === -1) {
+                return false;
+            }
+            this._keys.splice(idx, 1);
+            this._values.splice(idx, 1);
+            this._lastKey = NaN;
+            this._lastIndex = -1;
+            return true;
         }
     };
 
+// For now, always use `NgMapShim`, even if `window.Map` is available. Some native implementations
+// are still buggy (often in subtle ways) and can cause hard-to-debug failures. When native `Map`
+// implementations get more stable, we can reconsider switching to `window.Map` (when available).
+    var NgMap = NgMapShim;
+
+    var $$MapProvider = [/** @this */function() {
+        this.$get = [function() {
+            return NgMap;
+        }];
+    }];
+
     /**
      * @ngdoc function
      * @module ng
      * @name angular.injector
-     * @function
+     * @kind function
      *
      * @description
-     * Creates an injector function that can be used for retrieving services as well as for
+     * Creates an injector object that can be used for retrieving services as well as for
      * dependency injection (see {@link guide/di dependency injection}).
      *
-
      * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
-     *        {@link angular.module}. The `ng` module must be explicitly added.
-     * @returns {function()} Injector function. See {@link auto.$injector $injector}.
+     *     {@link angular.module}. The `ng` module must be explicitly added.
+     * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which
+     *     disallows argument name annotation inference.
+     * @returns {injector} Injector object. See {@link auto.$injector $injector}.
      *
      * @example
      * Typical usage
@@ -3121,15 +4184,15 @@
      *
      *   // use the injector to kick off your application
      *   // use the type inference to auto inject arguments, or use implicit injection
-     *   $injector.invoke(function($rootScope, $compile, $document){
- *     $compile($document)($rootScope);
- *     $rootScope.$digest();
- *   });
+     *   $injector.invoke(function($rootScope, $compile, $document) {
+     *     $compile($document)($rootScope);
+     *     $rootScope.$digest();
+     *   });
      * ```
      *
-     * Sometimes you want to get access to the injector of a currently running Angular app
-     * from outside Angular. Perhaps, you want to inject and compile some markup after the
-     * application has been bootstrapped. You can do this using extra `injector()` added
+     * Sometimes you want to get access to the injector of a currently running AngularJS app
+     * from outside AngularJS. Perhaps, you want to inject and compile some markup after the
+     * application has been bootstrapped. You can do this using the extra `injector()` added
      * to JQuery/jqLite elements. See {@link angular.element}.
      *
      * *This is fairly rare but could be the case if a third party library is injecting the
@@ -3144,9 +4207,9 @@
      * $(document.body).append($div);
      *
      * angular.element(document).injector().invoke(function($compile) {
- *   var scope = angular.element($div).scope();
- *   $compile($div)(scope);
- * });
+     *   var scope = angular.element($div).scope();
+     *   $compile($div)(scope);
+     * });
      * ```
      */
 
@@ -3154,30 +4217,58 @@
     /**
      * @ngdoc module
      * @name auto
+     * @installation
      * @description
      *
      * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
      */
 
-    var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m;
+    var ARROW_ARG = /^([^(]+?)=>/;
+    var FN_ARGS = /^[^(]*\(\s*([^)]*)\)/m;
     var FN_ARG_SPLIT = /,/;
     var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
     var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
     var $injectorMinErr = minErr('$injector');
-    function annotate(fn) {
+
+    function stringifyFn(fn) {
+        return Function.prototype.toString.call(fn);
+    }
+
+    function extractArgs(fn) {
+        var fnText = stringifyFn(fn).replace(STRIP_COMMENTS, ''),
+            args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS);
+        return args;
+    }
+
+    function anonFn(fn) {
+        // For anonymous functions, showing at the very least the function signature can help in
+        // debugging.
+        var args = extractArgs(fn);
+        if (args) {
+            return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
+        }
+        return 'fn';
+    }
+
+    function annotate(fn, strictDi, name) {
         var $inject,
-            fnText,
             argDecl,
             last;
 
-        if (typeof fn == 'function') {
+        if (typeof fn === 'function') {
             if (!($inject = fn.$inject)) {
                 $inject = [];
                 if (fn.length) {
-                    fnText = fn.toString().replace(STRIP_COMMENTS, '');
-                    argDecl = fnText.match(FN_ARGS);
-                    forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg){
-                        arg.replace(FN_ARG, function(all, underscore, name){
+                    if (strictDi) {
+                        if (!isString(name) || !name) {
+                            name = fn.name || anonFn(fn);
+                        }
+                        throw $injectorMinErr('strictdi',
+                            '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
+                    }
+                    argDecl = extractArgs(fn);
+                    forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
+                        arg.replace(FN_ARG, function(all, underscore, name) {
                             $inject.push(name);
                         });
                     });
@@ -3199,7 +4290,6 @@
     /**
      * @ngdoc service
      * @name $injector
-     * @function
      *
      * @description
      *
@@ -3212,12 +4302,12 @@
      * ```js
      *   var $injector = angular.injector();
      *   expect($injector.get('$injector')).toBe($injector);
-     *   expect($injector.invoke(function($injector){
- *     return $injector;
- *   }).toBe($injector);
+     *   expect($injector.invoke(function($injector) {
+     *     return $injector;
+     *   })).toBe($injector);
      * ```
      *
-     * # Injection Function Annotation
+     * ## Injection Function Annotation
      *
      * JavaScript does not have annotations, and annotations are needed for dependency injection. The
      * following are all valid ways of annotating function with injection arguments and are equivalent.
@@ -3235,19 +4325,43 @@
      *   $injector.invoke(['serviceA', function(serviceA){}]);
      * ```
      *
-     * ## Inference
+     * ### Inference
      *
      * In JavaScript calling `toString()` on a function returns the function definition. The definition
-     * can then be parsed and the function arguments can be extracted. *NOTE:* This does not work with
-     * minification, and obfuscation tools since these tools change the argument names.
+     * can then be parsed and the function arguments can be extracted. This method of discovering
+     * annotations is disallowed when the injector is in strict mode.
+     * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the
+     * argument names.
      *
-     * ## `$inject` Annotation
-     * By adding a `$inject` property onto a function the injection parameters can be specified.
+     * ### `$inject` Annotation
+     * By adding an `$inject` property onto a function the injection parameters can be specified.
      *
-     * ## Inline
+     * ### Inline
      * As an array of injection names, where the last item in the array is the function to call.
      */
 
+    /**
+     * @ngdoc property
+     * @name $injector#modules
+     * @type {Object}
+     * @description
+     * A hash containing all the modules that have been loaded into the
+     * $injector.
+     *
+     * You can use this property to find out information about a module via the
+     * {@link angular.Module#info `myModule.info(...)`} method.
+     *
+     * For example:
+     *
+     * ```
+     * var info = $injector.modules['ngAnimate'].info();
+     * ```
+     *
+     * **Do not use this property to attempt to modify the modules after the application
+     * has been bootstrapped.**
+     */
+
+
     /**
      * @ngdoc method
      * @name $injector#get
@@ -3256,6 +4370,7 @@
      * Return an instance of the service.
      *
      * @param {string} name The name of the instance to retrieve.
+     * @param {string=} caller An optional string to provide the origin of the function call for error messages.
      * @return {*} The instance.
      */
 
@@ -3266,8 +4381,8 @@
      * @description
      * Invoke the method and supply the method arguments from the `$injector`.
      *
-     * @param {!Function} fn The function to invoke. Function parameters are injected according to the
-     *   {@link guide/di $inject Annotation} rules.
+     * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
+     *   injected according to the {@link guide/di $inject Annotation} rules.
      * @param {Object=} self The `this` for the invoked method.
      * @param {Object=} locals Optional object. If preset then any argument names are read from this
      *                         object first, before the `$injector` is consulted.
@@ -3279,18 +4394,18 @@
      * @name $injector#has
      *
      * @description
-     * Allows the user to query if the particular service exist.
+     * Allows the user to query if the particular service exists.
      *
-     * @param {string} Name of the service to query.
-     * @returns {boolean} returns true if injector has given service.
+     * @param {string} name Name of the service to query.
+     * @returns {boolean} `true` if injector has given service.
      */
 
     /**
      * @ngdoc method
      * @name $injector#instantiate
      * @description
-     * Create a new instance of JS type. The method takes a constructor function invokes the new
-     * operator and supplies all of the arguments to the constructor function as specified by the
+     * Create a new instance of JS type. The method takes a constructor function, invokes the new
+     * operator, and supplies all of the arguments to the constructor function as specified by the
      * constructor annotation.
      *
      * @param {Function} Type Annotated constructor function.
@@ -3309,7 +4424,7 @@
      * function is invoked. There are three ways in which the function can be annotated with the needed
      * dependencies.
      *
-     * # Argument names
+     * #### Argument names
      *
      * The simplest form is to extract the dependencies from the arguments of the function. This is done
      * by converting the function into a string using `toString()` method and extracting the argument
@@ -3317,25 +4432,27 @@
      * ```js
      *   // Given
      *   function MyController($scope, $route) {
- *     // ...
- *   }
+     *     // ...
+     *   }
      *
      *   // Then
      *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
      * ```
      *
+     * You can disallow this method by using strict injection mode.
+     *
      * This method does not work with code minification / obfuscation. For this reason the following
      * annotation strategies are supported.
      *
-     * # The `$inject` property
+     * #### The `$inject` property
      *
      * If a function has an `$inject` property and its value is an array of strings, then the strings
      * represent names of services to be injected into the function.
      * ```js
      *   // Given
      *   var MyController = function(obfuscatedScope, obfuscatedRoute) {
- *     // ...
- *   }
+     *     // ...
+     *   }
      *   // Define function dependencies
      *   MyController['$inject'] = ['$scope', '$route'];
      *
@@ -3343,7 +4460,7 @@
      *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
      * ```
      *
-     * # The array notation
+     * #### The array notation
      *
      * It is often desirable to inline Injected functions and that's when setting the `$inject` property
      * is very inconvenient. In these situations using the array notation to specify the dependencies in
@@ -3352,20 +4469,20 @@
      * ```js
      *   // We wish to write this (not minification / obfuscation safe)
      *   injector.invoke(function($compile, $rootScope) {
- *     // ...
- *   });
+     *     // ...
+     *   });
      *
      *   // We are forced to write break inlining
      *   var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) {
- *     // ...
- *   };
+     *     // ...
+     *   };
      *   tmpFn.$inject = ['$compile', '$rootScope'];
      *   injector.invoke(tmpFn);
      *
      *   // To better support inline function the inline annotation is supported
      *   injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) {
- *     // ...
- *   }]);
+     *     // ...
+     *   }]);
      *
      *   // Therefore
      *   expect(injector.annotate(
@@ -3376,14 +4493,53 @@
      * @param {Function|Array.<string|Function>} fn Function for which dependent service names need to
      * be retrieved as described above.
      *
+     * @param {boolean=} [strictDi=false] Disallow argument name annotation inference.
+     *
      * @returns {Array.<string>} The names of the services which the function requires.
      */
-
-
+    /**
+     * @ngdoc method
+     * @name $injector#loadNewModules
+     *
+     * @description
+     *
+     * **This is a dangerous API, which you use at your own risk!**
+     *
+     * Add the specified modules to the current injector.
+     *
+     * This method will add each of the injectables to the injector and execute all of the config and run
+     * blocks for each module passed to the method.
+     *
+     * If a module has already been loaded into the injector then it will not be loaded again.
+     *
+     * * The application developer is responsible for loading the code containing the modules; and for
+     * ensuring that lazy scripts are not downloaded and executed more often that desired.
+     * * Previously compiled HTML will not be affected by newly loaded directives, filters and components.
+     * * Modules cannot be unloaded.
+     *
+     * You can use {@link $injector#modules `$injector.modules`} to check whether a module has been loaded
+     * into the injector, which may indicate whether the script has been executed already.
+     *
+     * @example
+     * Here is an example of loading a bundle of modules, with a utility method called `getScript`:
+     *
+     * ```javascript
+     * app.factory('loadModule', function($injector) {
+     *   return function loadModule(moduleName, bundleUrl) {
+     *     return getScript(bundleUrl).then(function() { $injector.loadNewModules([moduleName]); });
+     *   };
+     * })
+     * ```
+     *
+     * @param {Array<String|Function|Array>=} mods an array of modules to load into the application.
+     *     Each item in the array should be the name of a predefined module or a (DI annotated)
+     *     function that will be invoked by the injector as a `config` block.
+     *     See: {@link angular.module modules}
+     */
 
 
     /**
-     * @ngdoc object
+     * @ngdoc service
      * @name $provide
      *
      * @description
@@ -3392,7 +4548,7 @@
      * with the {@link auto.$injector $injector}. Many of these functions are also exposed on
      * {@link angular.Module}.
      *
-     * An Angular **service** is a singleton object created by a **service factory**.  These **service
+     * An AngularJS **service** is a singleton object created by a **service factory**.  These **service
      * factories** are functions which, in turn, are created by a **service provider**.
      * The **service providers** are constructor functions. When instantiated they must contain a
      * property called `$get`, which holds the **service factory** function.
@@ -3406,18 +4562,20 @@
      * these cases the {@link auto.$provide $provide} service has additional helper methods to register
      * services without specifying a provider.
      *
-     * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the
+     * * {@link auto.$provide#provider provider(name, provider)} - registers a **service provider** with the
      *     {@link auto.$injector $injector}
-     * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by
+     * * {@link auto.$provide#constant constant(name, obj)} - registers a value/object that can be accessed by
      *     providers and services.
-     * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by
+     * * {@link auto.$provide#value value(name, obj)} - registers a value/object that can only be accessed by
      *     services, not providers.
-     * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`,
+     * * {@link auto.$provide#factory factory(name, fn)} - registers a service **factory function**
      *     that will be wrapped in a **service provider** object, whose `$get` property will contain the
      *     given factory function.
-     * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class`
+     * * {@link auto.$provide#service service(name, Fn)} - registers a **constructor function**
      *     that will be wrapped in a **service provider** object, whose `$get` property will instantiate
      *      a new object using the given constructor function.
+     * * {@link auto.$provide#decorator decorator(name, decorFn)} - registers a **decorator function** that
+     *      will be able to modify or replace the implementation of another service.
      *
      * See the individual methods for more information and examples.
      */
@@ -3442,6 +4600,9 @@
      * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the
      * console or not.
      *
+     * It is possible to inject other providers into the provider function,
+     * but the injected provider must have been defined before the one that requires it.
+     *
      * @param {string} name The name of the instance. NOTE: the provider will be available under `name +
      'Provider'` key.
      * @param {(Object|function())} provider If the provider is:
@@ -3461,60 +4622,60 @@
      * ```js
      *  // Define the eventTracker provider
      *  function EventTrackerProvider() {
- *    var trackingUrl = '/track';
- *
- *    // A provider method for configuring where the tracked events should been saved
- *    this.setTrackingUrl = function(url) {
- *      trackingUrl = url;
- *    };
- *
- *    // The service factory function
- *    this.$get = ['$http', function($http) {
- *      var trackedEvents = {};
- *      return {
- *        // Call this to track an event
- *        event: function(event) {
- *          var count = trackedEvents[event] || 0;
- *          count += 1;
- *          trackedEvents[event] = count;
- *          return count;
- *        },
- *        // Call this to save the tracked events to the trackingUrl
- *        save: function() {
- *          $http.post(trackingUrl, trackedEvents);
- *        }
- *      };
- *    }];
- *  }
+     *    var trackingUrl = '/track';
+     *
+     *    // A provider method for configuring where the tracked events should been saved
+     *    this.setTrackingUrl = function(url) {
+     *      trackingUrl = url;
+     *    };
+     *
+     *    // The service factory function
+     *    this.$get = ['$http', function($http) {
+     *      var trackedEvents = {};
+     *      return {
+     *        // Call this to track an event
+     *        event: function(event) {
+     *          var count = trackedEvents[event] || 0;
+     *          count += 1;
+     *          trackedEvents[event] = count;
+     *          return count;
+     *        },
+     *        // Call this to save the tracked events to the trackingUrl
+     *        save: function() {
+     *          $http.post(trackingUrl, trackedEvents);
+     *        }
+     *      };
+     *    }];
+     *  }
      *
      *  describe('eventTracker', function() {
- *    var postSpy;
- *
- *    beforeEach(module(function($provide) {
- *      // Register the eventTracker provider
- *      $provide.provider('eventTracker', EventTrackerProvider);
- *    }));
- *
- *    beforeEach(module(function(eventTrackerProvider) {
- *      // Configure eventTracker provider
- *      eventTrackerProvider.setTrackingUrl('/custom-track');
- *    }));
- *
- *    it('tracks events', inject(function(eventTracker) {
- *      expect(eventTracker.event('login')).toEqual(1);
- *      expect(eventTracker.event('login')).toEqual(2);
- *    }));
- *
- *    it('saves to the tracking url', inject(function(eventTracker, $http) {
- *      postSpy = spyOn($http, 'post');
- *      eventTracker.event('login');
- *      eventTracker.save();
- *      expect(postSpy).toHaveBeenCalled();
- *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
- *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
- *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
- *    }));
- *  });
+     *    var postSpy;
+     *
+     *    beforeEach(module(function($provide) {
+     *      // Register the eventTracker provider
+     *      $provide.provider('eventTracker', EventTrackerProvider);
+     *    }));
+     *
+     *    beforeEach(module(function(eventTrackerProvider) {
+     *      // Configure eventTracker provider
+     *      eventTrackerProvider.setTrackingUrl('/custom-track');
+     *    }));
+     *
+     *    it('tracks events', inject(function(eventTracker) {
+     *      expect(eventTracker.event('login')).toEqual(1);
+     *      expect(eventTracker.event('login')).toEqual(2);
+     *    }));
+     *
+     *    it('saves to the tracking url', inject(function(eventTracker, $http) {
+     *      postSpy = spyOn($http, 'post');
+     *      eventTracker.event('login');
+     *      eventTracker.save();
+     *      expect(postSpy).toHaveBeenCalled();
+     *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
+     *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
+     *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
+     *    }));
+     *  });
      * ```
      */
 
@@ -3530,24 +4691,24 @@
      * configure your service in a provider.
      *
      * @param {string} name The name of the instance.
-     * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand
-     *                            for `$provide.provider(name, {$get: $getFn})`.
+     * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
+     *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
      * @returns {Object} registered provider instance
      *
      * @example
      * Here is an example of registering a service
      * ```js
      *   $provide.factory('ping', ['$http', function($http) {
- *     return function ping() {
- *       return $http.send('/ping');
- *     };
- *   }]);
+     *     return function ping() {
+     *       return $http.send('/ping');
+     *     };
+     *   }]);
      * ```
      * You would then inject and use this service like this:
      * ```js
      *   someModule.controller('Ctrl', ['ping', function(ping) {
- *     ping();
- *   }]);
+     *     ping();
+     *   }]);
      * ```
      */
 
@@ -3559,14 +4720,27 @@
      *
      * Register a **service constructor**, which will be invoked with `new` to create the service
      * instance.
-     * This is short for registering a service where its provider's `$get` property is the service
-     * constructor function that will be used to instantiate the service instance.
+     * This is short for registering a service where its provider's `$get` property is a factory
+     * function that returns an instance instantiated by the injector from the service constructor
+     * function.
+     *
+     * Internally it looks a bit like this:
+     *
+     * ```
+     * {
+     *   $get: function() {
+     *     return $injector.instantiate(constructor);
+     *   }
+     * }
+     * ```
+     *
      *
      * You should use {@link auto.$provide#service $provide.service(class)} if you define your service
      * as a type/class.
      *
      * @param {string} name The name of the instance.
-     * @param {Function} constructor A class (constructor function) that will be instantiated.
+     * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
+     *     that will be instantiated.
      * @returns {Object} registered provider instance
      *
      * @example
@@ -3574,21 +4748,21 @@
      * {@link auto.$provide#service $provide.service(class)}.
      * ```js
      *   var Ping = function($http) {
- *     this.$http = $http;
- *   };
+     *     this.$http = $http;
+     *   };
      *
      *   Ping.$inject = ['$http'];
      *
      *   Ping.prototype.send = function() {
- *     return this.$http.get('/ping');
- *   };
+     *     return this.$http.get('/ping');
+     *   };
      *   $provide.service('ping', Ping);
      * ```
      * You would then inject and use this service like this:
      * ```js
      *   someModule.controller('Ctrl', ['ping', function(ping) {
- *     ping.send();
- *   }]);
+     *     ping.send();
+     *   }]);
      * ```
      */
 
@@ -3599,14 +4773,13 @@
      * @description
      *
      * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a
-     * number, an array, an object or a function.  This is short for registering a service where its
+     * number, an array, an object or a function. This is short for registering a service where its
      * provider's `$get` property is a factory function that takes no arguments and returns the **value
-     * service**.
+     * service**. That also means it is not possible to inject other services into a value service.
      *
      * Value services are similar to constant services, except that they cannot be injected into a
      * module configuration function (see {@link angular.Module#config}) but they can be overridden by
-     * an Angular
-     * {@link auto.$provide#decorator decorator}.
+     * an AngularJS {@link auto.$provide#decorator decorator}.
      *
      * @param {string} name The name of the instance.
      * @param {*} value The value.
@@ -3620,8 +4793,8 @@
      *   $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 });
      *
      *   $provide.value('halfOf', function(value) {
- *     return value / 2;
- *   });
+     *     return value / 2;
+     *   });
      * ```
      */
 
@@ -3631,10 +4804,13 @@
      * @name $provide#constant
      * @description
      *
-     * Register a **constant service**, such as a string, a number, an array, an object or a function,
-     * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be
+     * Register a **constant service** with the {@link auto.$injector $injector}, such as a string,
+     * a number, an array, an object or a function. Like the {@link auto.$provide#value value}, it is not
+     * possible to inject other services into a constant.
+     *
+     * But unlike {@link auto.$provide#value value}, a constant can be
      * injected into a module configuration function (see {@link angular.Module#config}) and it cannot
-     * be overridden by an Angular {@link auto.$provide#decorator decorator}.
+     * be overridden by an AngularJS {@link auto.$provide#decorator decorator}.
      *
      * @param {string} name The name of the constant.
      * @param {*} value The constant value.
@@ -3648,8 +4824,8 @@
      *   $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']);
      *
      *   $provide.constant('double', function(value) {
- *     return value * 2;
- *   });
+     *     return value * 2;
+     *   });
      * ```
      */
 
@@ -3659,18 +4835,20 @@
      * @name $provide#decorator
      * @description
      *
-     * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator
-     * intercepts the creation of a service, allowing it to override or modify the behaviour of the
-     * service. The object returned by the decorator may be the original service, or a new service
-     * object which replaces or wraps and delegates to the original service.
+     * Register a **decorator function** with the {@link auto.$injector $injector}. A decorator function
+     * intercepts the creation of a service, allowing it to override or modify the behavior of the
+     * service. The return value of the decorator function may be the original service, or a new service
+     * that replaces (or wraps and delegates to) the original service.
+     *
+     * You can find out more about using decorators in the {@link guide/decorators} guide.
      *
      * @param {string} name The name of the service to decorate.
-     * @param {function()} decorator This function will be invoked when the service needs to be
-     *    instantiated and should return the decorated service instance. The function is called using
+     * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
+     *    provided and should return the decorated service instance. The function is called using
      *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
      *    Local injection arguments:
      *
-     *    * `$delegate` - The original service instance, which can be monkey patched, configured,
+     *    * `$delegate` - The original service instance, which can be replaced, monkey patched, configured,
      *      decorated or delegated to.
      *
      * @example
@@ -3678,18 +4856,19 @@
      * calls to {@link ng.$log#error $log.warn()}.
      * ```js
      *   $provide.decorator('$log', ['$delegate', function($delegate) {
- *     $delegate.warn = $delegate.error;
- *     return $delegate;
- *   }]);
+     *     $delegate.warn = $delegate.error;
+     *     return $delegate;
+     *   }]);
      * ```
      */
 
 
-    function createInjector(modulesToLoad) {
+    function createInjector(modulesToLoad, strictDi) {
+        strictDi = (strictDi === true);
         var INSTANTIATING = {},
             providerSuffix = 'Provider',
             path = [],
-            loadedModules = new HashMap(),
+            loadedModules = new NgMap(),
             providerCache = {
                 $provide: {
                     provider: supportObject(provider),
@@ -3701,18 +4880,32 @@
                 }
             },
             providerInjector = (providerCache.$injector =
-                createInternalInjector(providerCache, function() {
-                    throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
+                createInternalInjector(providerCache, function(serviceName, caller) {
+                    if (angular.isString(caller)) {
+                        path.push(caller);
+                    }
+                    throw $injectorMinErr('unpr', 'Unknown provider: {0}', path.join(' <- '));
                 })),
             instanceCache = {},
-            instanceInjector = (instanceCache.$injector =
-                createInternalInjector(instanceCache, function(servicename) {
-                    var provider = providerInjector.get(servicename + providerSuffix);
-                    return instanceInjector.invoke(provider.$get, provider);
-                }));
+            protoInstanceInjector =
+                createInternalInjector(instanceCache, function(serviceName, caller) {
+                    var provider = providerInjector.get(serviceName + providerSuffix, caller);
+                    return instanceInjector.invoke(
+                        provider.$get, provider, undefined, serviceName);
+                }),
+            instanceInjector = protoInstanceInjector;
+
+        providerCache['$injector' + providerSuffix] = { $get: valueFn(protoInstanceInjector) };
+        instanceInjector.modules = providerInjector.modules = createMap();
+        var runBlocks = loadModules(modulesToLoad);
+        instanceInjector = protoInstanceInjector.get('$injector');
+        instanceInjector.strictDi = strictDi;
+        forEach(runBlocks, function(fn) { if (fn) instanceInjector.invoke(fn); });
 
+        instanceInjector.loadNewModules = function(mods) {
+            forEach(loadModules(mods), function(fn) { if (fn) instanceInjector.invoke(fn); });
+        };
 
-        forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
 
         return instanceInjector;
 
@@ -3736,12 +4929,26 @@
                 provider_ = providerInjector.instantiate(provider_);
             }
             if (!provider_.$get) {
-                throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name);
+                throw $injectorMinErr('pget', 'Provider \'{0}\' must define $get factory method.', name);
             }
-            return providerCache[name + providerSuffix] = provider_;
+            return (providerCache[name + providerSuffix] = provider_);
+        }
+
+        function enforceReturnValue(name, factory) {
+            return /** @this */ function enforcedReturnValue() {
+                var result = instanceInjector.invoke(factory, this);
+                if (isUndefined(result)) {
+                    throw $injectorMinErr('undef', 'Provider \'{0}\' must return a value from $get factory method.', name);
+                }
+                return result;
+            };
         }
 
-        function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }
+        function factory(name, factoryFn, enforce) {
+            return provider(name, {
+                $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn
+            });
+        }
 
         function service(name, constructor) {
             return factory(name, ['$injector', function($injector) {
@@ -3749,7 +4956,7 @@
             }]);
         }
 
-        function value(name, val) { return factory(name, valueFn(val)); }
+        function value(name, val) { return factory(name, valueFn(val), false); }
 
         function constant(name, value) {
             assertNotHasOwnProperty(name, 'constant');
@@ -3770,23 +4977,30 @@
         ////////////////////////////////////
         // Module Loading
         ////////////////////////////////////
-        function loadModules(modulesToLoad){
-            var runBlocks = [], moduleFn, invokeQueue, i, ii;
+        function loadModules(modulesToLoad) {
+            assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array');
+            var runBlocks = [], moduleFn;
             forEach(modulesToLoad, function(module) {
                 if (loadedModules.get(module)) return;
-                loadedModules.put(module, true);
+                loadedModules.set(module, true);
+
+                function runInvokeQueue(queue) {
+                    var i, ii;
+                    for (i = 0, ii = queue.length; i < ii; i++) {
+                        var invokeArgs = queue[i],
+                            provider = providerInjector.get(invokeArgs[0]);
+
+                        provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
+                    }
+                }
 
                 try {
                     if (isString(module)) {
                         moduleFn = angularModule(module);
+                        instanceInjector.modules[module] = moduleFn;
                         runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
-
-                        for(invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) {
-                            var invokeArgs = invokeQueue[i],
-                                provider = providerInjector.get(invokeArgs[0]);
-
-                            provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
-                        }
+                        runInvokeQueue(moduleFn._invokeQueue);
+                        runInvokeQueue(moduleFn._configBlocks);
                     } else if (isFunction(module)) {
                         runBlocks.push(providerInjector.invoke(module));
                     } else if (isArray(module)) {
@@ -3798,15 +5012,15 @@
                     if (isArray(module)) {
                         module = module[module.length - 1];
                     }
-                    if (e.message && e.stack && e.stack.indexOf(e.message) == -1) {
+                    if (e.message && e.stack && e.stack.indexOf(e.message) === -1) {
                         // Safari & FF's stack traces don't contain error.message content
                         // unlike those of Chrome and IE
                         // So if stack doesn't contain message, we create a new string that contains both.
                         // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here.
-                        /* jshint -W022 */
+                        // eslint-disable-next-line no-ex-assign
                         e = e.message + '\n' + e.stack;
                     }
-                    throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}",
+                    throw $injectorMinErr('modulerr', 'Failed to instantiate module {0} due to:\n{1}',
                         module, e.stack || e.message || e);
                 }
             });
@@ -3819,17 +5033,19 @@
 
         function createInternalInjector(cache, factory) {
 
-            function getService(serviceName) {
+            function getService(serviceName, caller) {
                 if (cache.hasOwnProperty(serviceName)) {
                     if (cache[serviceName] === INSTANTIATING) {
-                        throw $injectorMinErr('cdep', 'Circular dependency found: {0}', path.join(' <- '));
+                        throw $injectorMinErr('cdep', 'Circular dependency found: {0}',
+                            serviceName + ' <- ' + path.join(' <- '));
                     }
                     return cache[serviceName];
                 } else {
                     try {
                         path.unshift(serviceName);
                         cache[serviceName] = INSTANTIATING;
-                        return cache[serviceName] = factory(serviceName);
+                        cache[serviceName] = factory(serviceName, caller);
+                        return cache[serviceName];
                     } catch (err) {
                         if (cache[serviceName] === INSTANTIATING) {
                             delete cache[serviceName];
@@ -3841,52 +5057,76 @@
                 }
             }
 
-            function invoke(fn, self, locals){
+
+            function injectionArgs(fn, locals, serviceName) {
                 var args = [],
-                    $inject = annotate(fn),
-                    length, i,
-                    key;
+                    $inject = createInjector.$$annotate(fn, strictDi, serviceName);
 
-                for(i = 0, length = $inject.length; i < length; i++) {
-                    key = $inject[i];
+                for (var i = 0, length = $inject.length; i < length; i++) {
+                    var key = $inject[i];
                     if (typeof key !== 'string') {
                         throw $injectorMinErr('itkn',
                             'Incorrect injection token! Expected service name as string, got {0}', key);
                     }
-                    args.push(
-                        locals && locals.hasOwnProperty(key)
-                            ? locals[key]
-                            : getService(key)
-                    );
+                    args.push(locals && locals.hasOwnProperty(key) ? locals[key] :
+                        getService(key, serviceName));
+                }
+                return args;
+            }
+
+            function isClass(func) {
+                // Support: IE 9-11 only
+                // IE 9-11 do not support classes and IE9 leaks with the code below.
+                if (msie || typeof func !== 'function') {
+                    return false;
+                }
+                var result = func.$$ngIsClass;
+                if (!isBoolean(result)) {
+                    // Support: Edge 12-13 only
+                    // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+                    result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func));
                 }
-                if (!fn.$inject) {
-                    // this means that we must be an array.
-                    fn = fn[length];
+                return result;
+            }
+
+            function invoke(fn, self, locals, serviceName) {
+                if (typeof locals === 'string') {
+                    serviceName = locals;
+                    locals = null;
+                }
+
+                var args = injectionArgs(fn, locals, serviceName);
+                if (isArray(fn)) {
+                    fn = fn[fn.length - 1];
                 }
 
-                // http://jsperf.com/angularjs-invoke-apply-vs-switch
-                // #5388
-                return fn.apply(self, args);
+                if (!isClass(fn)) {
+                    // http://jsperf.com/angularjs-invoke-apply-vs-switch
+                    // #5388
+                    return fn.apply(self, args);
+                } else {
+                    args.unshift(null);
+                    return new (Function.prototype.bind.apply(fn, args))();
+                }
             }
 
-            function instantiate(Type, locals) {
-                var Constructor = function() {},
-                    instance, returnedValue;
 
+            function instantiate(Type, locals, serviceName) {
                 // Check if Type is annotated and use just the given function at n-1 as parameter
                 // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
-                Constructor.prototype = (isArray(Type) ? Type[Type.length - 1] : Type).prototype;
-                instance = new Constructor();
-                returnedValue = invoke(Type, instance, locals);
-
-                return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
+                var ctor = (isArray(Type) ? Type[Type.length - 1] : Type);
+                var args = injectionArgs(Type, locals, serviceName);
+                // Empty object at position 0 is ignored for invocation with `new`, but required.
+                args.unshift(null);
+                return new (Function.prototype.bind.apply(ctor, args))();
             }
 
+
             return {
                 invoke: invoke,
                 instantiate: instantiate,
                 get: getService,
-                annotate: annotate,
+                annotate: createInjector.$$annotate,
                 has: function(name) {
                     return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
                 }
@@ -3894,108 +5134,445 @@
         }
     }
 
+    createInjector.$$annotate = annotate;
+
     /**
-     * @ngdoc service
-     * @name $anchorScroll
-     * @kind function
-     * @requires $window
-     * @requires $location
-     * @requires $rootScope
+     * @ngdoc provider
+     * @name $anchorScrollProvider
+     * @this
      *
      * @description
-     * When called, it checks current value of `$location.hash()` and scroll to related element,
-     * according to rules specified in
-     * [Html5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document).
-     *
-     * It also watches the `$location.hash()` and scrolls whenever it changes to match any anchor.
-     * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div id="scrollArea" ng-controller="ScrollCtrl">
-     <a ng-click="gotoBottom()">Go to bottom</a>
-     <a id="bottom"></a> You're at the bottom!
-     </div>
-     </file>
-     <file name="script.js">
-     function ScrollCtrl($scope, $location, $anchorScroll) {
-         $scope.gotoBottom = function (){
-           // set the location.hash to the id of
-           // the element you wish to scroll to.
-           $location.hash('bottom');
-
-           // call $anchorScroll()
-           $anchorScroll();
-         };
-       }
-     </file>
-     <file name="style.css">
-     #scrollArea {
-         height: 350px;
-         overflow: auto;
-       }
-
-     #bottom {
-         display: block;
-         margin-top: 2000px;
-       }
-     </file>
-     </example>
+     * Use `$anchorScrollProvider` to disable automatic scrolling whenever
+     * {@link ng.$location#hash $location.hash()} changes.
      */
     function $AnchorScrollProvider() {
 
         var autoScrollingEnabled = true;
 
+        /**
+         * @ngdoc method
+         * @name $anchorScrollProvider#disableAutoScrolling
+         *
+         * @description
+         * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
+         * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
+         * Use this method to disable automatic scrolling.
+         *
+         * If automatic scrolling is disabled, one must explicitly call
+         * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
+         * current hash.
+         */
         this.disableAutoScrolling = function() {
             autoScrollingEnabled = false;
         };
 
+        /**
+         * @ngdoc service
+         * @name $anchorScroll
+         * @kind function
+         * @requires $window
+         * @requires $location
+         * @requires $rootScope
+         *
+         * @description
+         * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
+         * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
+         * in the
+         * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#an-indicated-part-of-the-document).
+         *
+         * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
+         * match any anchor whenever it changes. This can be disabled by calling
+         * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}.
+         *
+         * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
+         * vertical scroll-offset (either fixed or dynamic).
+         *
+         * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
+         *                       {@link ng.$location#hash $location.hash()} will be used.
+         *
+         * @property {(number|function|jqLite)} yOffset
+         * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
+         * positioned elements at the top of the page, such as navbars, headers etc.
+         *
+         * `yOffset` can be specified in various ways:
+         * - **number**: A fixed number of pixels to be used as offset.<br /><br />
+         * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return
+         *   a number representing the offset (in pixels).<br /><br />
+         * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from
+         *   the top of the page to the element's bottom will be used as offset.<br />
+         *   **Note**: The element will be taken into account only as long as its `position` is set to
+         *   `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust
+         *   their height and/or positioning according to the viewport's size.
+         *
+         * <br />
+         * <div class="alert alert-warning">
+         * In order for `yOffset` to work properly, scrolling should take place on the document's root and
+         * not some child element.
+         * </div>
+         *
+         * @example
+         <example module="anchorScrollExample" name="anchor-scroll">
+         <file name="index.html">
+         <div id="scrollArea" ng-controller="ScrollController">
+         <a ng-click="gotoBottom()">Go to bottom</a>
+         <a id="bottom"></a> You're at the bottom!
+         </div>
+         </file>
+         <file name="script.js">
+         angular.module('anchorScrollExample', [])
+         .controller('ScrollController', ['$scope', '$location', '$anchorScroll',
+         function($scope, $location, $anchorScroll) {
+               $scope.gotoBottom = function() {
+                 // set the location.hash to the id of
+                 // the element you wish to scroll to.
+                 $location.hash('bottom');
+
+                 // call $anchorScroll()
+                 $anchorScroll();
+               };
+             }]);
+         </file>
+         <file name="style.css">
+         #scrollArea {
+           height: 280px;
+           overflow: auto;
+         }
+
+         #bottom {
+           display: block;
+           margin-top: 2000px;
+         }
+         </file>
+         </example>
+         *
+         * <hr />
+         * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value).
+         * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details.
+         *
+         * @example
+         <example module="anchorScrollOffsetExample" name="anchor-scroll-offset">
+         <file name="index.html">
+         <div class="fixed-header" ng-controller="headerCtrl">
+         <a href="" ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
+         Go to anchor {{x}}
+         </a>
+         </div>
+         <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
+         Anchor {{x}} of 5
+         </div>
+         </file>
+         <file name="script.js">
+         angular.module('anchorScrollOffsetExample', [])
+         .run(['$anchorScroll', function($anchorScroll) {
+             $anchorScroll.yOffset = 50;   // always scroll by 50 extra pixels
+           }])
+         .controller('headerCtrl', ['$anchorScroll', '$location', '$scope',
+         function($anchorScroll, $location, $scope) {
+               $scope.gotoAnchor = function(x) {
+                 var newHash = 'anchor' + x;
+                 if ($location.hash() !== newHash) {
+                   // set the $location.hash to `newHash` and
+                   // $anchorScroll will automatically scroll to it
+                   $location.hash('anchor' + x);
+                 } else {
+                   // call $anchorScroll() explicitly,
+                   // since $location.hash hasn't changed
+                   $anchorScroll();
+                 }
+               };
+             }
+         ]);
+         </file>
+         <file name="style.css">
+         body {
+           padding-top: 50px;
+         }
+
+         .anchor {
+           border: 2px dashed DarkOrchid;
+           padding: 10px 10px 200px 10px;
+         }
+
+         .fixed-header {
+           background-color: rgba(0, 0, 0, 0.2);
+           height: 50px;
+           position: fixed;
+           top: 0; left: 0; right: 0;
+         }
+
+         .fixed-header > a {
+           display: inline-block;
+           margin: 5px 15px;
+         }
+         </file>
+         </example>
+         */
         this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
             var document = $window.document;
 
-            // helper function to get first anchor from a NodeList
-            // can't use filter.filter, as it accepts only instances of Array
-            // and IE can't convert NodeList to an array using [].slice
-            // TODO(vojta): use filter if we change it to accept lists as well
+            // Helper function to get first anchor from a NodeList
+            // (using `Array#some()` instead of `angular#forEach()` since it's more performant
+            //  and working in all supported browsers.)
             function getFirstAnchor(list) {
                 var result = null;
-                forEach(list, function(element) {
-                    if (!result && lowercase(element.nodeName) === 'a') result = element;
+                Array.prototype.some.call(list, function(element) {
+                    if (nodeName_(element) === 'a') {
+                        result = element;
+                        return true;
+                    }
                 });
                 return result;
             }
 
-            function scroll() {
-                var hash = $location.hash(), elm;
-
-                // empty hash, scroll to the top of the page
-                if (!hash) $window.scrollTo(0, 0);
+            function getYOffset() {
 
-                // element with given id
-                else if ((elm = document.getElementById(hash))) elm.scrollIntoView();
+                var offset = scroll.yOffset;
 
-                // first anchor with given name :-D
-                else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) elm.scrollIntoView();
+                if (isFunction(offset)) {
+                    offset = offset();
+                } else if (isElement(offset)) {
+                    var elem = offset[0];
+                    var style = $window.getComputedStyle(elem);
+                    if (style.position !== 'fixed') {
+                        offset = 0;
+                    } else {
+                        offset = elem.getBoundingClientRect().bottom;
+                    }
+                } else if (!isNumber(offset)) {
+                    offset = 0;
+                }
 
-                // no element and hash == 'top', scroll to the top of the page
-                else if (hash === 'top') $window.scrollTo(0, 0);
+                return offset;
             }
 
-            // does not scroll when user clicks on anchor link that is currently on
-            // (no url change, no $location.hash() change), browser native does scroll
-            if (autoScrollingEnabled) {
-                $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
-                    function autoScrollWatchAction() {
-                        $rootScope.$evalAsync(scroll);
-                    });
-            }
+            function scrollTo(elem) {
+                if (elem) {
+                    elem.scrollIntoView();
 
-            return scroll;
+                    var offset = getYOffset();
+
+                    if (offset) {
+                        // `offset` is the number of pixels we should scroll UP in order to align `elem` properly.
+                        // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the
+                        // top of the viewport.
+                        //
+                        // IF the number of pixels from the top of `elem` to the end of the page's content is less
+                        // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some
+                        // way down the page.
+                        //
+                        // This is often the case for elements near the bottom of the page.
+                        //
+                        // In such cases we do not need to scroll the whole `offset` up, just the difference between
+                        // the top of the element and the offset, which is enough to align the top of `elem` at the
+                        // desired position.
+                        var elemTop = elem.getBoundingClientRect().top;
+                        $window.scrollBy(0, elemTop - offset);
+                    }
+                } else {
+                    $window.scrollTo(0, 0);
+                }
+            }
+
+            function scroll(hash) {
+                // Allow numeric hashes
+                hash = isString(hash) ? hash : isNumber(hash) ? hash.toString() : $location.hash();
+                var elm;
+
+                // empty hash, scroll to the top of the page
+                if (!hash) scrollTo(null);
+
+                // element with given id
+                else if ((elm = document.getElementById(hash))) scrollTo(elm);
+
+                // first anchor with given name :-D
+                else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm);
+
+                // no element and hash === 'top', scroll to the top of the page
+                else if (hash === 'top') scrollTo(null);
+            }
+
+            // does not scroll when user clicks on anchor link that is currently on
+            // (no url change, no $location.hash() change), browser native does scroll
+            if (autoScrollingEnabled) {
+                $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
+                    function autoScrollWatchAction(newVal, oldVal) {
+                        // skip the initial scroll if $location.hash is empty
+                        if (newVal === oldVal && newVal === '') return;
+
+                        jqLiteDocumentLoaded(function() {
+                            $rootScope.$evalAsync(scroll);
+                        });
+                    });
+            }
+
+            return scroll;
         }];
     }
 
     var $animateMinErr = minErr('$animate');
+    var ELEMENT_NODE = 1;
+    var NG_ANIMATE_CLASSNAME = 'ng-animate';
+
+    function mergeClasses(a,b) {
+        if (!a && !b) return '';
+        if (!a) return b;
+        if (!b) return a;
+        if (isArray(a)) a = a.join(' ');
+        if (isArray(b)) b = b.join(' ');
+        return a + ' ' + b;
+    }
+
+    function extractElementNode(element) {
+        for (var i = 0; i < element.length; i++) {
+            var elm = element[i];
+            if (elm.nodeType === ELEMENT_NODE) {
+                return elm;
+            }
+        }
+    }
+
+    function splitClasses(classes) {
+        if (isString(classes)) {
+            classes = classes.split(' ');
+        }
+
+        // Use createMap() to prevent class assumptions involving property names in
+        // Object.prototype
+        var obj = createMap();
+        forEach(classes, function(klass) {
+            // sometimes the split leaves empty string values
+            // incase extra spaces were applied to the options
+            if (klass.length) {
+                obj[klass] = true;
+            }
+        });
+        return obj;
+    }
+
+// if any other type of options value besides an Object value is
+// passed into the $animate.method() animation then this helper code
+// will be run which will ignore it. While this patch is not the
+// greatest solution to this, a lot of existing plugins depend on
+// $animate to either call the callback (< 1.2) or return a promise
+// that can be changed. This helper function ensures that the options
+// are wiped clean incase a callback function is provided.
+    function prepareAnimateOptions(options) {
+        return isObject(options)
+            ? options
+            : {};
+    }
+
+    var $$CoreAnimateJsProvider = /** @this */ function() {
+        this.$get = noop;
+    };
+
+// this is prefixed with Core since it conflicts with
+// the animateQueueProvider defined in ngAnimate/animateQueue.js
+    var $$CoreAnimateQueueProvider = /** @this */ function() {
+        var postDigestQueue = new NgMap();
+        var postDigestElements = [];
+
+        this.$get = ['$$AnimateRunner', '$rootScope',
+            function($$AnimateRunner,   $rootScope) {
+                return {
+                    enabled: noop,
+                    on: noop,
+                    off: noop,
+                    pin: noop,
+
+                    push: function(element, event, options, domOperation) {
+                        if (domOperation) {
+                            domOperation();
+                        }
+
+                        options = options || {};
+                        if (options.from) {
+                            element.css(options.from);
+                        }
+                        if (options.to) {
+                            element.css(options.to);
+                        }
+
+                        if (options.addClass || options.removeClass) {
+                            addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
+                        }
+
+                        var runner = new $$AnimateRunner();
+
+                        // since there are no animations to run the runner needs to be
+                        // notified that the animation call is complete.
+                        runner.complete();
+                        return runner;
+                    }
+                };
+
+
+                function updateData(data, classes, value) {
+                    var changed = false;
+                    if (classes) {
+                        classes = isString(classes) ? classes.split(' ') :
+                            isArray(classes) ? classes : [];
+                        forEach(classes, function(className) {
+                            if (className) {
+                                changed = true;
+                                data[className] = value;
+                            }
+                        });
+                    }
+                    return changed;
+                }
+
+                function handleCSSClassChanges() {
+                    forEach(postDigestElements, function(element) {
+                        var data = postDigestQueue.get(element);
+                        if (data) {
+                            var existing = splitClasses(element.attr('class'));
+                            var toAdd = '';
+                            var toRemove = '';
+                            forEach(data, function(status, className) {
+                                var hasClass = !!existing[className];
+                                if (status !== hasClass) {
+                                    if (status) {
+                                        toAdd += (toAdd.length ? ' ' : '') + className;
+                                    } else {
+                                        toRemove += (toRemove.length ? ' ' : '') + className;
+                                    }
+                                }
+                            });
+
+                            forEach(element, function(elm) {
+                                if (toAdd) {
+                                    jqLiteAddClass(elm, toAdd);
+                                }
+                                if (toRemove) {
+                                    jqLiteRemoveClass(elm, toRemove);
+                                }
+                            });
+                            postDigestQueue.delete(element);
+                        }
+                    });
+                    postDigestElements.length = 0;
+                }
+
+
+                function addRemoveClassesPostDigest(element, add, remove) {
+                    var data = postDigestQueue.get(element) || {};
+
+                    var classesAdded = updateData(data, add, true);
+                    var classesRemoved = updateData(data, remove, false);
+
+                    if (classesAdded || classesRemoved) {
+
+                        postDigestQueue.set(element, data);
+                        postDigestElements.push(element);
+
+                        if (postDigestElements.length === 1) {
+                            $rootScope.$$postDigest(handleCSSClassChanges);
+                        }
+                    }
+                }
+            }];
+    };
 
     /**
      * @ngdoc provider
@@ -4003,18 +5580,18 @@
      *
      * @description
      * Default implementation of $animate that doesn't perform any animations, instead just
-     * synchronously performs DOM
-     * updates and calls done() callbacks.
+     * synchronously performs DOM updates and resolves the returned runner promise.
      *
-     * In order to enable animations the ngAnimate module has to be loaded.
+     * In order to enable animations the `ngAnimate` module has to be loaded.
      *
-     * To see the functional implementation check out src/ngAnimate/animate.js
+     * To see the functional implementation check out `src/ngAnimate/animate.js`.
      */
-    var $AnimateProvider = ['$provide', function($provide) {
-
-
-        this.$$selectors = {};
+    var $AnimateProvider = ['$provide', /** @this */ function($provide) {
+        var provider = this;
+        var classNameFilter = null;
+        var customFilter = null;
 
+        this.$$registeredAnimations = Object.create(null);
 
         /**
          * @ngdoc method
@@ -4025,36 +5602,91 @@
          * animation object which contains callback functions for each event that is expected to be
          * animated.
          *
-         *   * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction`
-         *   must be called once the element animation is complete. If a function is returned then the
-         *   animation service will use this function to cancel the animation whenever a cancel event is
-         *   triggered.
+         *   * `eventFn`: `function(element, ... , doneFunction, options)`
+         *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
+         *   on the type of animation additional arguments will be injected into the animation function. The
+         *   list below explains the function signatures for the different animation methods:
          *
+         *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
+         *   - addClass: function(element, addedClasses, doneFunction, options)
+         *   - removeClass: function(element, removedClasses, doneFunction, options)
+         *   - enter, leave, move: function(element, doneFunction, options)
+         *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
+         *
+         *   Make sure to trigger the `doneFunction` once the animation is fully complete.
          *
          * ```js
          *   return {
-     *     eventFn : function(element, done) {
-     *       //code to run the animation
-     *       //once complete, then run done()
-     *       return function cancellationFunction() {
-     *         //code to cancel the animation
-     *       }
-     *     }
-     *   }
+         *     //enter, leave, move signature
+         *     eventFn : function(element, done, options) {
+         *       //code to run the animation
+         *       //once complete, then run done()
+         *       return function endFunction(wasCancelled) {
+         *         //code to cancel the animation
+         *       }
+         *     }
+         *   }
          * ```
          *
-         * @param {string} name The name of the animation.
+         * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
          * @param {Function} factory The factory function that will be executed to return the animation
          *                           object.
          */
         this.register = function(name, factory) {
+            if (name && name.charAt(0) !== '.') {
+                throw $animateMinErr('notcsel', 'Expecting class selector starting with \'.\' got \'{0}\'.', name);
+            }
+
             var key = name + '-animation';
-            if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel',
-                "Expecting class selector starting with '.' got '{0}'.", name);
-            this.$$selectors[name.substr(1)] = key;
+            provider.$$registeredAnimations[name.substr(1)] = key;
             $provide.factory(key, factory);
         };
 
+        /**
+         * @ngdoc method
+         * @name $animateProvider#customFilter
+         *
+         * @description
+         * Sets and/or returns the custom filter function that is used to "filter" animations, i.e.
+         * determine if an animation is allowed or not. When no filter is specified (the default), no
+         * animation will be blocked. Setting the `customFilter` value will only allow animations for
+         * which the filter function's return value is truthy.
+         *
+         * This allows to easily create arbitrarily complex rules for filtering animations, such as
+         * allowing specific events only, or enabling animations on specific subtrees of the DOM, etc.
+         * Filtering animations can also boost performance for low-powered devices, as well as
+         * applications containing a lot of structural operations.
+         *
+         * <div class="alert alert-success">
+         *   **Best Practice:**
+         *   Keep the filtering function as lean as possible, because it will be called for each DOM
+         *   action (e.g. insertion, removal, class change) performed by "animation-aware" directives.
+         *   See {@link guide/animations#which-directives-support-animations- here} for a list of built-in
+         *   directives that support animations.
+         *   Performing computationally expensive or time-consuming operations on each call of the
+         *   filtering function can make your animations sluggish.
+         * </div>
+         *
+         * **Note:** If present, `customFilter` will be checked before
+         * {@link $animateProvider#classNameFilter classNameFilter}.
+         *
+         * @param {Function=} filterFn - The filter function which will be used to filter all animations.
+         *   If a falsy value is returned, no animation will be performed. The function will be called
+         *   with the following arguments:
+         *   - **node** `{DOMElement}` - The DOM element to be animated.
+         *   - **event** `{String}` - The name of the animation event (e.g. `enter`, `leave`, `addClass`
+         *     etc).
+         *   - **options** `{Object}` - A collection of options/styles used for the animation.
+         * @return {Function} The current filter function or `null` if there is none set.
+         */
+        this.customFilter = function(filterFn) {
+            if (arguments.length === 1) {
+                customFilter = isFunction(filterFn) ? filterFn : null;
+            }
+
+            return customFilter;
+        };
+
         /**
          * @ngdoc method
          * @name $animateProvider#classNameFilter
@@ -4062,220 +5694,716 @@
          * @description
          * Sets and/or returns the CSS class regular expression that is checked when performing
          * an animation. Upon bootstrap the classNameFilter value is not set at all and will
-         * therefore enable $animate to attempt to perform an animation on any element.
-         * When setting the classNameFilter value, animations will only be performed on elements
+         * therefore enable $animate to attempt to perform an animation on any element that is triggered.
+         * When setting the `classNameFilter` value, animations will only be performed on elements
          * that successfully match the filter expression. This in turn can boost performance
          * for low-powered devices as well as applications containing a lot of structural operations.
+         *
+         * **Note:** If present, `classNameFilter` will be checked after
+         * {@link $animateProvider#customFilter customFilter}. If `customFilter` is present and returns
+         * false, `classNameFilter` will not be checked.
+         *
          * @param {RegExp=} expression The className expression which will be checked against all animations
          * @return {RegExp} The current CSS className expression value. If null then there is no expression value
          */
         this.classNameFilter = function(expression) {
-            if(arguments.length === 1) {
-                this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
+            if (arguments.length === 1) {
+                classNameFilter = (expression instanceof RegExp) ? expression : null;
+                if (classNameFilter) {
+                    var reservedRegex = new RegExp('[(\\s|\\/)]' + NG_ANIMATE_CLASSNAME + '[(\\s|\\/)]');
+                    if (reservedRegex.test(classNameFilter.toString())) {
+                        classNameFilter = null;
+                        throw $animateMinErr('nongcls', '$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
+                    }
+                }
             }
-            return this.$$classNameFilter;
+            return classNameFilter;
         };
 
-        this.$get = ['$timeout', '$$asyncCallback', function($timeout, $$asyncCallback) {
-
-            function async(fn) {
-                fn && $$asyncCallback(fn);
+        this.$get = ['$$animateQueue', function($$animateQueue) {
+            function domInsert(element, parentElement, afterElement) {
+                // if for some reason the previous element was removed
+                // from the dom sometime before this code runs then let's
+                // just stick to using the parent element as the anchor
+                if (afterElement) {
+                    var afterNode = extractElementNode(afterElement);
+                    if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
+                        afterElement = null;
+                    }
+                }
+                if (afterElement) {
+                    afterElement.after(element);
+                } else {
+                    parentElement.prepend(element);
+                }
             }
 
             /**
-             *
              * @ngdoc service
              * @name $animate
-             * @description The $animate service provides rudimentary DOM manipulation functions to
-             * insert, remove and move elements within the DOM, as well as adding and removing classes.
-             * This service is the core service used by the ngAnimate $animator service which provides
-             * high-level animation hooks for CSS and JavaScript.
+             * @description The $animate service exposes a series of DOM utility methods that provide support
+             * for animation hooks. The default behavior is the application of DOM operations, however,
+             * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
+             * to ensure that animation runs with the triggered DOM operation.
+             *
+             * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't
+             * included and only when it is active then the animation hooks that `$animate` triggers will be
+             * functional. Once active then all structural `ng-` directives will trigger animations as they perform
+             * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
+             * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
              *
-             * $animate is available in the AngularJS core, however, the ngAnimate module must be included
-             * to enable full out animation support. Otherwise, $animate will only perform simple DOM
-             * manipulation operations.
+             * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
              *
-             * To learn more about enabling animation support, click here to visit the {@link ngAnimate
-     * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service
-     * page}.
+             * To learn more about enabling animation support, click here to visit the
+             * {@link ngAnimate ngAnimate module page}.
              */
             return {
+                // we don't call it directly since non-existant arguments may
+                // be interpreted as null within the sub enabled function
 
                 /**
                  *
                  * @ngdoc method
-                 * @name $animate#enter
-                 * @function
-                 * @description Inserts the element into the DOM either after the `after` element or within
-                 *   the `parent` element. Once complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will be inserted into the DOM
-                 * @param {DOMElement} parent the parent element which will append the element as
-                 *   a child (if the after element is not present)
-                 * @param {DOMElement} after the sibling element which will append the element
-                 *   after itself
-                 * @param {Function=} done callback function that will be called after the element has been
-                 *   inserted into the DOM
+                 * @name $animate#on
+                 * @kind function
+                 * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
+                 *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
+                 *    is fired with the following params:
+                 *
+                 * ```js
+                 * $animate.on('enter', container,
+                 *    function callback(element, phase) {
+                 *      // cool we detected an enter animation within the container
+                 *    }
+                 * );
+                 * ```
+                 *
+                 * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
+                 * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
+                 *     as well as among its children
+                 * @param {Function} callback the callback function that will be fired when the listener is triggered
+                 *
+                 * The arguments present in the callback function are:
+                 * * `element` - The captured DOM element that the animation was fired on.
+                 * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
                  */
-                enter : function(element, parent, after, done) {
-                    if (after) {
-                        after.after(element);
-                    } else {
-                        if (!parent || !parent[0]) {
-                            parent = after.parent();
-                        }
-                        parent.append(element);
+                on: $$animateQueue.on,
+
+                /**
+                 *
+                 * @ngdoc method
+                 * @name $animate#off
+                 * @kind function
+                 * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
+                 * can be used in three different ways depending on the arguments:
+                 *
+                 * ```js
+                 * // remove all the animation event listeners listening for `enter`
+                 * $animate.off('enter');
+                 *
+                 * // remove listeners for all animation events from the container element
+                 * $animate.off(container);
+                 *
+                 * // remove all the animation event listeners listening for `enter` on the given element and its children
+                 * $animate.off('enter', container);
+                 *
+                 * // remove the event listener function provided by `callback` that is set
+                 * // to listen for `enter` on the given `container` as well as its children
+                 * $animate.off('enter', container, callback);
+                 * ```
+                 *
+                 * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move,
+                 * addClass, removeClass, etc...), or the container element. If it is the element, all other
+                 * arguments are ignored.
+                 * @param {DOMElement=} container the container element the event listener was placed on
+                 * @param {Function=} callback the callback function that was registered as the listener
+                 */
+                off: $$animateQueue.off,
+
+                /**
+                 * @ngdoc method
+                 * @name $animate#pin
+                 * @kind function
+                 * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
+                 *    outside of the DOM structure of the AngularJS application. By doing so, any animation triggered via `$animate` can be issued on the
+                 *    element despite being outside the realm of the application or within another application. Say for example if the application
+                 *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
+                 *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
+                 *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
+                 *
+                 *    Note that this feature is only active when the `ngAnimate` module is used.
+                 *
+                 * @param {DOMElement} element the external element that will be pinned
+                 * @param {DOMElement} parentElement the host parent element that will be associated with the external element
+                 */
+                pin: $$animateQueue.pin,
+
+                /**
+                 *
+                 * @ngdoc method
+                 * @name $animate#enabled
+                 * @kind function
+                 * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
+                 * function can be called in four ways:
+                 *
+                 * ```js
+                 * // returns true or false
+                 * $animate.enabled();
+                 *
+                 * // changes the enabled state for all animations
+                 * $animate.enabled(false);
+                 * $animate.enabled(true);
+                 *
+                 * // returns true or false if animations are enabled for an element
+                 * $animate.enabled(element);
+                 *
+                 * // changes the enabled state for an element and its children
+                 * $animate.enabled(element, true);
+                 * $animate.enabled(element, false);
+                 * ```
+                 *
+                 * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
+                 * @param {boolean=} enabled whether or not the animations will be enabled for the element
+                 *
+                 * @return {boolean} whether or not animations are enabled
+                 */
+                enabled: $$animateQueue.enabled,
+
+                /**
+                 * @ngdoc method
+                 * @name $animate#cancel
+                 * @kind function
+                 * @description Cancels the provided animation.
+                 *
+                 * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
+                 */
+                cancel: function(runner) {
+                    if (runner.end) {
+                        runner.end();
                     }
-                    async(done);
                 },
 
                 /**
                  *
                  * @ngdoc method
-                 * @name $animate#leave
-                 * @function
-                 * @description Removes the element from the DOM. Once complete, the done() callback will be
-                 *   fired (if provided).
-                 * @param {DOMElement} element the element which will be removed from the DOM
-                 * @param {Function=} done callback function that will be called after the element has been
-                 *   removed from the DOM
+                 * @name $animate#enter
+                 * @kind function
+                 * @description Inserts the element into the DOM either after the `after` element (if provided) or
+                 *   as the first child within the `parent` element and then triggers an animation.
+                 *   A promise is returned that will be resolved during the next digest once the animation
+                 *   has completed.
+                 *
+                 * @param {DOMElement} element the element which will be inserted into the DOM
+                 * @param {DOMElement} parent the parent element which will append the element as
+                 *   a child (so long as the after element is not present)
+                 * @param {DOMElement=} after the sibling element after which the element will be appended
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                leave : function(element, done) {
-                    element.remove();
-                    async(done);
+                enter: function(element, parent, after, options) {
+                    parent = parent && jqLite(parent);
+                    after = after && jqLite(after);
+                    parent = parent || after.parent();
+                    domInsert(element, parent, after);
+                    return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
                 },
 
                 /**
                  *
                  * @ngdoc method
                  * @name $animate#move
-                 * @function
-                 * @description Moves the position of the provided element within the DOM to be placed
-                 * either after the `after` element or inside of the `parent` element. Once complete, the
-                 * done() callback will be fired (if provided).
+                 * @kind function
+                 * @description Inserts (moves) the element into its new position in the DOM either after
+                 *   the `after` element (if provided) or as the first child within the `parent` element
+                 *   and then triggers an animation. A promise is returned that will be resolved
+                 *   during the next digest once the animation has completed.
+                 *
+                 * @param {DOMElement} element the element which will be moved into the new DOM position
+                 * @param {DOMElement} parent the parent element which will append the element as
+                 *   a child (so long as the after element is not present)
+                 * @param {DOMElement=} after the sibling element after which the element will be appended
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
                  *
-                 * @param {DOMElement} element the element which will be moved around within the
-                 *   DOM
-                 * @param {DOMElement} parent the parent element where the element will be
-                 *   inserted into (if the after element is not present)
-                 * @param {DOMElement} after the sibling element where the element will be
-                 *   positioned next to
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   element has been moved to its new position
+                 * @return {Promise} the animation callback promise
                  */
-                move : function(element, parent, after, done) {
-                    // Do not remove element before insert. Removing will cause data associated with the
-                    // element to be dropped. Insert will implicitly do the remove.
-                    this.enter(element, parent, after, done);
+                move: function(element, parent, after, options) {
+                    parent = parent && jqLite(parent);
+                    after = after && jqLite(after);
+                    parent = parent || after.parent();
+                    domInsert(element, parent, after);
+                    return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
                 },
 
                 /**
-                 *
                  * @ngdoc method
-                 * @name $animate#addClass
-                 * @function
-                 * @description Adds the provided className CSS class value to the provided element. Once
-                 * complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will have the className value
-                 *   added to it
-                 * @param {string} className the CSS class which will be added to the element
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   className value has been added to the element
+                 * @name $animate#leave
+                 * @kind function
+                 * @description Triggers an animation and then removes the element from the DOM.
+                 * When the function is called a promise is returned that will be resolved during the next
+                 * digest once the animation has completed.
+                 *
+                 * @param {DOMElement} element the element which will be removed from the DOM
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                addClass : function(element, className, done) {
-                    className = isString(className) ?
-                        className :
-                        isArray(className) ? className.join(' ') : '';
-                    forEach(element, function (element) {
-                        jqLiteAddClass(element, className);
+                leave: function(element, options) {
+                    return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
+                        element.remove();
                     });
-                    async(done);
                 },
 
                 /**
+                 * @ngdoc method
+                 * @name $animate#addClass
+                 * @kind function
+                 *
+                 * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
+                 *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
+                 *   animation if element already contains the CSS class or if the class is removed at a later step.
+                 *   Note that class-based animations are treated differently compared to structural animations
+                 *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+                 *   depending if CSS or JavaScript animations are used.
+                 *
+                 * @param {DOMElement} element the element which the CSS classes will be applied to
+                 * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
                  *
+                 * @return {Promise} the animation callback promise
+                 */
+                addClass: function(element, className, options) {
+                    options = prepareAnimateOptions(options);
+                    options.addClass = mergeClasses(options.addclass, className);
+                    return $$animateQueue.push(element, 'addClass', options);
+                },
+
+                /**
                  * @ngdoc method
                  * @name $animate#removeClass
-                 * @function
-                 * @description Removes the provided className CSS class value from the provided element.
-                 * Once complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will have the className value
-                 *   removed from it
-                 * @param {string} className the CSS class which will be removed from the element
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   className value has been removed from the element
+                 * @kind function
+                 *
+                 * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
+                 *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
+                 *   animation if element does not contain the CSS class or if the class is added at a later step.
+                 *   Note that class-based animations are treated differently compared to structural animations
+                 *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+                 *   depending if CSS or JavaScript animations are used.
+                 *
+                 * @param {DOMElement} element the element which the CSS classes will be applied to
+                 * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                removeClass : function(element, className, done) {
-                    className = isString(className) ?
-                        className :
-                        isArray(className) ? className.join(' ') : '';
-                    forEach(element, function (element) {
-                        jqLiteRemoveClass(element, className);
-                    });
-                    async(done);
+                removeClass: function(element, className, options) {
+                    options = prepareAnimateOptions(options);
+                    options.removeClass = mergeClasses(options.removeClass, className);
+                    return $$animateQueue.push(element, 'removeClass', options);
                 },
 
                 /**
-                 *
                  * @ngdoc method
                  * @name $animate#setClass
-                 * @function
-                 * @description Adds and/or removes the given CSS classes to and from the element.
-                 * Once complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will it's CSS classes changed
-                 *   removed from it
-                 * @param {string} add the CSS classes which will be added to the element
-                 * @param {string} remove the CSS class which will be removed from the element
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   CSS classes have been set on the element
+                 * @kind function
+                 *
+                 * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
+                 *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
+                 *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
+                 *    passed. Note that class-based animations are treated differently compared to structural animations
+                 *    (like enter, move and leave) since the CSS classes may be added/removed at different points
+                 *    depending if CSS or JavaScript animations are used.
+                 *
+                 * @param {DOMElement} element the element which the CSS classes will be applied to
+                 * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
+                 * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                setClass : function(element, add, remove, done) {
-                    forEach(element, function (element) {
-                        jqLiteAddClass(element, add);
-                        jqLiteRemoveClass(element, remove);
-                    });
-                    async(done);
+                setClass: function(element, add, remove, options) {
+                    options = prepareAnimateOptions(options);
+                    options.addClass = mergeClasses(options.addClass, add);
+                    options.removeClass = mergeClasses(options.removeClass, remove);
+                    return $$animateQueue.push(element, 'setClass', options);
                 },
 
-                enabled : noop
+                /**
+                 * @ngdoc method
+                 * @name $animate#animate
+                 * @kind function
+                 *
+                 * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
+                 * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take
+                 * on the provided styles. For example, if a transition animation is set for the given className, then the provided `from` and
+                 * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding
+                 * style in `to`, the style in `from` is applied immediately, and no animation is run.
+                 * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate`
+                 * method (or as part of the `options` parameter):
+                 *
+                 * ```js
+                 * ngModule.animation('.my-inline-animation', function() {
+                 *   return {
+                 *     animate : function(element, from, to, done, options) {
+                 *       //animation
+                 *       done();
+                 *     }
+                 *   }
+                 * });
+                 * ```
+                 *
+                 * @param {DOMElement} element the element which the CSS styles will be applied to
+                 * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
+                 * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
+                 * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
+                 *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
+                 *    (Note that if no animation is detected then this value will not be applied to the element.)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
+                 */
+                animate: function(element, from, to, className, options) {
+                    options = prepareAnimateOptions(options);
+                    options.from = options.from ? extend(options.from, from) : from;
+                    options.to   = options.to   ? extend(options.to, to)     : to;
+
+                    className = className || 'ng-inline-animate';
+                    options.tempClasses = mergeClasses(options.tempClasses, className);
+                    return $$animateQueue.push(element, 'animate', options);
+                }
             };
         }];
     }];
 
-    function $$AsyncCallbackProvider(){
-        this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) {
-            return $$rAF.supported
-                ? function(fn) { return $$rAF(fn); }
-                : function(fn) {
-                return $timeout(fn, 0, false);
+    var $$AnimateAsyncRunFactoryProvider = /** @this */ function() {
+        this.$get = ['$$rAF', function($$rAF) {
+            var waitQueue = [];
+
+            function waitForTick(fn) {
+                waitQueue.push(fn);
+                if (waitQueue.length > 1) return;
+                $$rAF(function() {
+                    for (var i = 0; i < waitQueue.length; i++) {
+                        waitQueue[i]();
+                    }
+                    waitQueue = [];
+                });
+            }
+
+            return function() {
+                var passed = false;
+                waitForTick(function() {
+                    passed = true;
+                });
+                return function(callback) {
+                    if (passed) {
+                        callback();
+                    } else {
+                        waitForTick(callback);
+                    }
+                };
             };
         }];
-    }
+    };
 
-    /**
-     * ! This is a private undocumented service !
-     *
-     * @name $browser
-     * @requires $log
-     * @description
-     * This object has two goals:
-     *
-     * - hide all the global state in the browser caused by the window object
-     * - abstract away all the browser specific features and inconsistencies
-     *
-     * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
-     * service, which can be used for convenient testing of the application without the interaction with
-     * the real browser apis.
-     */
-    /**
-     * @param {object} window The global window object.
-     * @param {object} document jQuery wrapped document.
-     * @param {function()} XHR XMLHttpRequest constructor.
-     * @param {object} $log console.log or an object with the same interface.
-     * @param {object} $sniffer $sniffer service
+    var $$AnimateRunnerFactoryProvider = /** @this */ function() {
+        this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$$isDocumentHidden', '$timeout',
+            function($q,   $sniffer,   $$animateAsyncRun,   $$isDocumentHidden,   $timeout) {
+
+                var INITIAL_STATE = 0;
+                var DONE_PENDING_STATE = 1;
+                var DONE_COMPLETE_STATE = 2;
+
+                AnimateRunner.chain = function(chain, callback) {
+                    var index = 0;
+
+                    next();
+                    function next() {
+                        if (index === chain.length) {
+                            callback(true);
+                            return;
+                        }
+
+                        chain[index](function(response) {
+                            if (response === false) {
+                                callback(false);
+                                return;
+                            }
+                            index++;
+                            next();
+                        });
+                    }
+                };
+
+                AnimateRunner.all = function(runners, callback) {
+                    var count = 0;
+                    var status = true;
+                    forEach(runners, function(runner) {
+                        runner.done(onProgress);
+                    });
+
+                    function onProgress(response) {
+                        status = status && response;
+                        if (++count === runners.length) {
+                            callback(status);
+                        }
+                    }
+                };
+
+                function AnimateRunner(host) {
+                    this.setHost(host);
+
+                    var rafTick = $$animateAsyncRun();
+                    var timeoutTick = function(fn) {
+                        $timeout(fn, 0, false);
+                    };
+
+                    this._doneCallbacks = [];
+                    this._tick = function(fn) {
+                        if ($$isDocumentHidden()) {
+                            timeoutTick(fn);
+                        } else {
+                            rafTick(fn);
+                        }
+                    };
+                    this._state = 0;
+                }
+
+                AnimateRunner.prototype = {
+                    setHost: function(host) {
+                        this.host = host || {};
+                    },
+
+                    done: function(fn) {
+                        if (this._state === DONE_COMPLETE_STATE) {
+                            fn();
+                        } else {
+                            this._doneCallbacks.push(fn);
+                        }
+                    },
+
+                    progress: noop,
+
+                    getPromise: function() {
+                        if (!this.promise) {
+                            var self = this;
+                            this.promise = $q(function(resolve, reject) {
+                                self.done(function(status) {
+                                    if (status === false) {
+                                        reject();
+                                    } else {
+                                        resolve();
+                                    }
+                                });
+                            });
+                        }
+                        return this.promise;
+                    },
+
+                    then: function(resolveHandler, rejectHandler) {
+                        return this.getPromise().then(resolveHandler, rejectHandler);
+                    },
+
+                    'catch': function(handler) {
+                        return this.getPromise()['catch'](handler);
+                    },
+
+                    'finally': function(handler) {
+                        return this.getPromise()['finally'](handler);
+                    },
+
+                    pause: function() {
+                        if (this.host.pause) {
+                            this.host.pause();
+                        }
+                    },
+
+                    resume: function() {
+                        if (this.host.resume) {
+                            this.host.resume();
+                        }
+                    },
+
+                    end: function() {
+                        if (this.host.end) {
+                            this.host.end();
+                        }
+                        this._resolve(true);
+                    },
+
+                    cancel: function() {
+                        if (this.host.cancel) {
+                            this.host.cancel();
+                        }
+                        this._resolve(false);
+                    },
+
+                    complete: function(response) {
+                        var self = this;
+                        if (self._state === INITIAL_STATE) {
+                            self._state = DONE_PENDING_STATE;
+                            self._tick(function() {
+                                self._resolve(response);
+                            });
+                        }
+                    },
+
+                    _resolve: function(response) {
+                        if (this._state !== DONE_COMPLETE_STATE) {
+                            forEach(this._doneCallbacks, function(fn) {
+                                fn(response);
+                            });
+                            this._doneCallbacks.length = 0;
+                            this._state = DONE_COMPLETE_STATE;
+                        }
+                    }
+                };
+
+                return AnimateRunner;
+            }];
+    };
+
+    /* exported $CoreAnimateCssProvider */
+
+    /**
+     * @ngdoc service
+     * @name $animateCss
+     * @kind object
+     * @this
+     *
+     * @description
+     * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included,
+     * then the `$animateCss` service will actually perform animations.
+     *
+     * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}.
+     */
+    var $CoreAnimateCssProvider = function() {
+        this.$get = ['$$rAF', '$q', '$$AnimateRunner', function($$rAF, $q, $$AnimateRunner) {
+
+            return function(element, initialOptions) {
+                // all of the animation functions should create
+                // a copy of the options data, however, if a
+                // parent service has already created a copy then
+                // we should stick to using that
+                var options = initialOptions || {};
+                if (!options.$$prepared) {
+                    options = copy(options);
+                }
+
+                // there is no point in applying the styles since
+                // there is no animation that goes on at all in
+                // this version of $animateCss.
+                if (options.cleanupStyles) {
+                    options.from = options.to = null;
+                }
+
+                if (options.from) {
+                    element.css(options.from);
+                    options.from = null;
+                }
+
+                var closed, runner = new $$AnimateRunner();
+                return {
+                    start: run,
+                    end: run
+                };
+
+                function run() {
+                    $$rAF(function() {
+                        applyAnimationContents();
+                        if (!closed) {
+                            runner.complete();
+                        }
+                        closed = true;
+                    });
+                    return runner;
+                }
+
+                function applyAnimationContents() {
+                    if (options.addClass) {
+                        element.addClass(options.addClass);
+                        options.addClass = null;
+                    }
+                    if (options.removeClass) {
+                        element.removeClass(options.removeClass);
+                        options.removeClass = null;
+                    }
+                    if (options.to) {
+                        element.css(options.to);
+                        options.to = null;
+                    }
+                }
+            };
+        }];
+    };
+
+    /* global stripHash: true */
+
+    /**
+     * ! This is a private undocumented service !
+     *
+     * @name $browser
+     * @requires $log
+     * @description
+     * This object has two goals:
+     *
+     * - hide all the global state in the browser caused by the window object
+     * - abstract away all the browser specific features and inconsistencies
+     *
+     * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
+     * service, which can be used for convenient testing of the application without the interaction with
+     * the real browser apis.
+     */
+    /**
+     * @param {object} window The global window object.
+     * @param {object} document jQuery wrapped document.
+     * @param {object} $log window.console or an object with the same interface.
+     * @param {object} $sniffer $sniffer service
      */
     function Browser(window, document, $log, $sniffer) {
         var self = this,
-            rawDocument = document[0],
             location = window.location,
             history = window.history,
             setTimeout = window.setTimeout,
@@ -4301,7 +6429,7 @@
             } finally {
                 outstandingRequestCount--;
                 if (outstandingRequestCount === 0) {
-                    while(outstandingRequestCallbacks.length) {
+                    while (outstandingRequestCallbacks.length) {
                         try {
                             outstandingRequestCallbacks.pop()();
                         } catch (e) {
@@ -4312,18 +6440,17 @@
             }
         }
 
+        function getHash(url) {
+            var index = url.indexOf('#');
+            return index === -1 ? '' : url.substr(index);
+        }
+
         /**
          * @private
-         * Note: this method is used only by scenario runner
          * TODO(vojta): prefix this method with $$ ?
          * @param {function()} callback Function that will be called when no outstanding request
          */
         self.notifyWhenNoOutstandingRequests = function(callback) {
-            // force browser to execute all pollFns - this is needed so that cookies and other pollers fire
-            // at some deterministic time in respect to the test runner's actions. Leaving things up to the
-            // regular poller would result in flaky tests.
-            forEach(pollFns, function(pollFn){ pollFn(); });
-
             if (outstandingRequestCount === 0) {
                 callback();
             } else {
@@ -4331,51 +6458,23 @@
             }
         };
 
-        //////////////////////////////////////////////////////////////
-        // Poll Watcher API
-        //////////////////////////////////////////////////////////////
-        var pollFns = [],
-            pollTimeout;
-
-        /**
-         * @name $browser#addPollFn
-         *
-         * @param {function()} fn Poll function to add
-         *
-         * @description
-         * Adds a function to the list of functions that poller periodically executes,
-         * and starts polling if not started yet.
-         *
-         * @returns {function()} the added function
-         */
-        self.addPollFn = function(fn) {
-            if (isUndefined(pollTimeout)) startPoller(100, setTimeout);
-            pollFns.push(fn);
-            return fn;
-        };
-
-        /**
-         * @param {number} interval How often should browser call poll functions (ms)
-         * @param {function()} setTimeout Reference to a real or fake `setTimeout` function.
-         *
-         * @description
-         * Configures the poller to run in the specified intervals, using the specified
-         * setTimeout fn and kicks it off.
-         */
-        function startPoller(interval, setTimeout) {
-            (function check() {
-                forEach(pollFns, function(pollFn){ pollFn(); });
-                pollTimeout = setTimeout(check, interval);
-            })();
-        }
-
         //////////////////////////////////////////////////////////////
         // URL API
         //////////////////////////////////////////////////////////////
 
-        var lastBrowserUrl = location.href,
+        var cachedState, lastHistoryState,
+            lastBrowserUrl = location.href,
             baseElement = document.find('base'),
-            newLocation = null;
+            pendingLocation = null,
+            getCurrentState = !$sniffer.history ? noop : function getCurrentState() {
+                try {
+                    return history.state;
+                } catch (e) {
+                    // MSIE can reportedly throw when there is no state (UNCONFIRMED).
+                }
+            };
+
+        cacheState();
 
         /**
          * @name $browser#url
@@ -4394,52 +6493,120 @@
          * {@link ng.$location $location service} to change url.
          *
          * @param {string} url New url (when used as setter)
-         * @param {boolean=} replace Should new url replace current history record ?
+         * @param {boolean=} replace Should new url replace current history record?
+         * @param {object=} state object to use with pushState/replaceState
          */
-        self.url = function(url, replace) {
+        self.url = function(url, replace, state) {
+            // In modern browsers `history.state` is `null` by default; treating it separately
+            // from `undefined` would cause `$browser.url('/foo')` to change `history.state`
+            // to undefined via `pushState`. Instead, let's change `undefined` to `null` here.
+            if (isUndefined(state)) {
+                state = null;
+            }
+
             // Android Browser BFCache causes location, history reference to become stale.
             if (location !== window.location) location = window.location;
             if (history !== window.history) history = window.history;
 
             // setter
             if (url) {
-                if (lastBrowserUrl == url) return;
+                var sameState = lastHistoryState === state;
+
+                // Don't change anything if previous and current URLs and states match. This also prevents
+                // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
+                // See https://github.com/angular/angular.js/commit/ffb2701
+                if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
+                    return self;
+                }
+                var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
                 lastBrowserUrl = url;
-                if ($sniffer.history) {
-                    if (replace) history.replaceState(null, '', url);
-                    else {
-                        history.pushState(null, '', url);
-                        // Crazy Opera Bug: http://my.opera.com/community/forums/topic.dml?id=1185462
-                        baseElement.attr('href', baseElement.attr('href'));
-                    }
+                lastHistoryState = state;
+                // Don't use history API if only the hash changed
+                // due to a bug in IE10/IE11 which leads
+                // to not firing a `hashchange` nor `popstate` event
+                // in some cases (see #9143).
+                if ($sniffer.history && (!sameBase || !sameState)) {
+                    history[replace ? 'replaceState' : 'pushState'](state, '', url);
+                    cacheState();
                 } else {
-                    newLocation = url;
+                    if (!sameBase) {
+                        pendingLocation = url;
+                    }
                     if (replace) {
                         location.replace(url);
-                    } else {
+                    } else if (!sameBase) {
                         location.href = url;
+                    } else {
+                        location.hash = getHash(url);
                     }
+                    if (location.href !== url) {
+                        pendingLocation = url;
+                    }
+                }
+                if (pendingLocation) {
+                    pendingLocation = url;
                 }
                 return self;
                 // getter
             } else {
-                // - newLocation is a workaround for an IE7-9 issue with location.replace and location.href
-                //   methods not updating location.href synchronously.
+                // - pendingLocation is needed as browsers don't allow to read out
+                //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
+                //   https://openradar.appspot.com/22186109).
                 // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
-                return newLocation || location.href.replace(/%27/g,"'");
+                return pendingLocation || location.href.replace(/%27/g,'\'');
             }
         };
 
+        /**
+         * @name $browser#state
+         *
+         * @description
+         * This method is a getter.
+         *
+         * Return history.state or null if history.state is undefined.
+         *
+         * @returns {object} state
+         */
+        self.state = function() {
+            return cachedState;
+        };
+
         var urlChangeListeners = [],
             urlChangeInit = false;
 
-        function fireUrlChange() {
-            newLocation = null;
-            if (lastBrowserUrl == self.url()) return;
+        function cacheStateAndFireUrlChange() {
+            pendingLocation = null;
+            fireStateOrUrlChange();
+        }
+
+        // This variable should be used *only* inside the cacheState function.
+        var lastCachedState = null;
+        function cacheState() {
+            // This should be the only place in $browser where `history.state` is read.
+            cachedState = getCurrentState();
+            cachedState = isUndefined(cachedState) ? null : cachedState;
+
+            // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
+            if (equals(cachedState, lastCachedState)) {
+                cachedState = lastCachedState;
+            }
+
+            lastCachedState = cachedState;
+            lastHistoryState = cachedState;
+        }
+
+        function fireStateOrUrlChange() {
+            var prevLastHistoryState = lastHistoryState;
+            cacheState();
+
+            if (lastBrowserUrl === self.url() && prevLastHistoryState === cachedState) {
+                return;
+            }
 
             lastBrowserUrl = self.url();
+            lastHistoryState = cachedState;
             forEach(urlChangeListeners, function(listener) {
-                listener(self.url());
+                listener(self.url(), cachedState);
             });
         }
 
@@ -4449,7 +6616,7 @@
          * @description
          * Register callback function that will be called, when url changes.
          *
-         * It's only called when the url is changed from outside of angular:
+         * It's only called when the url is changed from outside of AngularJS:
          * - user types different url into address bar
          * - user clicks on history (forward/back) button
          * - user clicks on a link
@@ -4459,7 +6626,7 @@
          * The listener gets called with new url as parameter.
          *
          * NOTE: this api is intended for use only by the $location service. Please use the
-         * {@link ng.$location $location service} to monitor url changes in angular apps.
+         * {@link ng.$location $location service} to monitor url changes in AngularJS apps.
          *
          * @param {function(string)} listener Listener function to be called when url changes.
          * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous.
@@ -4467,16 +6634,14 @@
         self.onUrlChange = function(callback) {
             // TODO(vojta): refactor to use node's syntax for events
             if (!urlChangeInit) {
-                // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera)
-                // don't fire popstate when user change the address bar and don't fire hashchange when url
+                // We listen on both (hashchange/popstate) when available, as some browsers don't
+                // fire popstate when user changes the address bar and don't fire hashchange when url
                 // changed by push/replaceState
 
                 // html5 history api - popstate event
-                if ($sniffer.history) jqLite(window).on('popstate', fireUrlChange);
+                if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange);
                 // hashchange event
-                if ($sniffer.hashchange) jqLite(window).on('hashchange', fireUrlChange);
-                // polling
-                else self.addPollFn(fireUrlChange);
+                jqLite(window).on('hashchange', cacheStateAndFireUrlChange);
 
                 urlChangeInit = true;
             }
@@ -4485,6 +6650,23 @@
             return callback;
         };
 
+        /**
+         * @private
+         * Remove popstate and hashchange handler from window.
+         *
+         * NOTE: this api is intended for use only by $rootScope.
+         */
+        self.$$applicationDestroyed = function() {
+            jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
+        };
+
+        /**
+         * Checks whether the url has changed outside of AngularJS.
+         * Needs to be exported to be able to check for changes that have been done in sync,
+         * as hashchange/popstate events fire in async.
+         */
+        self.$$checkUrlChange = fireStateOrUrlChange;
+
         //////////////////////////////////////////////////////////////
         // Misc API
         //////////////////////////////////////////////////////////////
@@ -4500,85 +6682,9 @@
          */
         self.baseHref = function() {
             var href = baseElement.attr('href');
-            return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
-        };
-
-        //////////////////////////////////////////////////////////////
-        // Cookies API
-        //////////////////////////////////////////////////////////////
-        var lastCookies = {};
-        var lastCookieString = '';
-        var cookiePath = self.baseHref();
-
-        /**
-         * @name $browser#cookies
-         *
-         * @param {string=} name Cookie name
-         * @param {string=} value Cookie value
-         *
-         * @description
-         * The cookies method provides a 'private' low level access to browser cookies.
-         * It is not meant to be used directly, use the $cookie service instead.
-         *
-         * The return values vary depending on the arguments that the method was called with as follows:
-         *
-         * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify
-         *   it
-         * - cookies(name, value) -> set name to value, if value is undefined delete the cookie
-         * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that
-         *   way)
-         *
-         * @returns {Object} Hash of all cookies (if called without any parameter)
-         */
-        self.cookies = function(name, value) {
-            /* global escape: false, unescape: false */
-            var cookieLength, cookieArray, cookie, i, index;
-
-            if (name) {
-                if (value === undefined) {
-                    rawDocument.cookie = escape(name) + "=;path=" + cookiePath +
-                    ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
-                } else {
-                    if (isString(value)) {
-                        cookieLength = (rawDocument.cookie = escape(name) + '=' + escape(value) +
-                        ';path=' + cookiePath).length + 1;
-
-                        // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
-                        // - 300 cookies
-                        // - 20 cookies per unique domain
-                        // - 4096 bytes per cookie
-                        if (cookieLength > 4096) {
-                            $log.warn("Cookie '"+ name +
-                            "' possibly not set or overflowed because it was too large ("+
-                            cookieLength + " > 4096 bytes)!");
-                        }
-                    }
-                }
-            } else {
-                if (rawDocument.cookie !== lastCookieString) {
-                    lastCookieString = rawDocument.cookie;
-                    cookieArray = lastCookieString.split("; ");
-                    lastCookies = {};
-
-                    for (i = 0; i < cookieArray.length; i++) {
-                        cookie = cookieArray[i];
-                        index = cookie.indexOf('=');
-                        if (index > 0) { //ignore nameless cookies
-                            name = unescape(cookie.substring(0, index));
-                            // the first value that is seen for a cookie is the most
-                            // specific one.  values for the same cookie name that
-                            // follow are for less specific paths.
-                            if (lastCookies[name] === undefined) {
-                                lastCookies[name] = unescape(cookie.substring(index + 1));
-                            }
-                        }
-                    }
-                }
-                return lastCookies;
-            }
+            return href ? href.replace(/^(https?:)?\/\/[^/]*/, '') : '';
         };
 
-
         /**
          * @name $browser#defer
          * @param {function()} fn A function, who's execution should be deferred.
@@ -4627,9 +6733,10 @@
 
     }
 
-    function $BrowserProvider(){
+    /** @this */
+    function $BrowserProvider() {
         this.$get = ['$window', '$log', '$sniffer', '$document',
-            function( $window,   $log,   $sniffer,   $document){
+            function($window, $log, $sniffer, $document) {
                 return new Browser($window, $document, $log, $sniffer);
             }];
     }
@@ -4637,6 +6744,7 @@
     /**
      * @ngdoc service
      * @name $cacheFactory
+     * @this
      *
      * @description
      * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to
@@ -4673,7 +6781,7 @@
      * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory.
      *
      * @example
-     <example module="cacheExampleApp">
+     <example module="cacheExampleApp" name="cache-factory">
      <file name="index.html">
      <div ng-controller="CacheController">
      <input ng-model="newCacheKey" placeholder="Key">
@@ -4701,8 +6809,10 @@
            $scope.keys = [];
            $scope.cache = $cacheFactory('cacheId');
            $scope.put = function(key, value) {
-             $scope.cache.put(key, value);
-             $scope.keys.push(key);
+             if (angular.isUndefined($scope.cache.get(key))) {
+               $scope.keys.push(key);
+             }
+             $scope.cache.put(key, angular.isUndefined(value) ? null : value);
            };
          }]);
      </file>
@@ -4720,14 +6830,14 @@
 
             function cacheFactory(cacheId, options) {
                 if (cacheId in caches) {
-                    throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId);
+                    throw minErr('$cacheFactory')('iid', 'CacheId \'{0}\' is already taken!', cacheId);
                 }
 
                 var size = 0,
                     stats = extend({}, options, {id: cacheId}),
-                    data = {},
+                    data = createMap(),
                     capacity = (options && options.capacity) || Number.MAX_VALUE,
-                    lruHash = {},
+                    lruHash = createMap(),
                     freshEnd = null,
                     staleEnd = null;
 
@@ -4737,45 +6847,45 @@
                  *
                  * @description
                  * A cache object used to store and retrieve data, primarily used by
-                 * {@link $http $http} and the {@link ng.directive:script script} directive to cache
-                 * templates and other data.
+                 * {@link $templateRequest $templateRequest} and the {@link ng.directive:script script}
+                 * directive to cache templates and other data.
                  *
                  * ```js
                  *  angular.module('superCache')
                  *    .factory('superCache', ['$cacheFactory', function($cacheFactory) {
-       *      return $cacheFactory('super-cache');
-       *    }]);
+                 *      return $cacheFactory('super-cache');
+                 *    }]);
                  * ```
                  *
                  * Example test:
                  *
                  * ```js
                  *  it('should behave like a cache', inject(function(superCache) {
-       *    superCache.put('key', 'value');
-       *    superCache.put('another key', 'another value');
-       *
-       *    expect(superCache.info()).toEqual({
-       *      id: 'super-cache',
-       *      size: 2
-       *    });
-       *
-       *    superCache.remove('another key');
-       *    expect(superCache.get('another key')).toBeUndefined();
-       *
-       *    superCache.removeAll();
-       *    expect(superCache.info()).toEqual({
-       *      id: 'super-cache',
-       *      size: 0
-       *    });
-       *  }));
+                 *    superCache.put('key', 'value');
+                 *    superCache.put('another key', 'another value');
+                 *
+                 *    expect(superCache.info()).toEqual({
+                 *      id: 'super-cache',
+                 *      size: 2
+                 *    });
+                 *
+                 *    superCache.remove('another key');
+                 *    expect(superCache.get('another key')).toBeUndefined();
+                 *
+                 *    superCache.removeAll();
+                 *    expect(superCache.info()).toEqual({
+                 *      id: 'super-cache',
+                 *      size: 0
+                 *    });
+                 *  }));
                  * ```
                  */
-                return caches[cacheId] = {
+                return (caches[cacheId] = {
 
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#put
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be
@@ -4791,13 +6901,13 @@
                      * @returns {*} the value stored.
                      */
                     put: function(key, value) {
+                        if (isUndefined(value)) return;
                         if (capacity < Number.MAX_VALUE) {
                             var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
 
                             refresh(lruEntry);
                         }
 
-                        if (isUndefined(value)) return;
                         if (!(key in data)) size++;
                         data[key] = value;
 
@@ -4811,7 +6921,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#get
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object.
@@ -4835,7 +6945,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#remove
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Removes an entry from the {@link $cacheFactory.Cache Cache} object.
@@ -4848,13 +6958,15 @@
 
                             if (!lruEntry) return;
 
-                            if (lruEntry == freshEnd) freshEnd = lruEntry.p;
-                            if (lruEntry == staleEnd) staleEnd = lruEntry.n;
+                            if (lruEntry === freshEnd) freshEnd = lruEntry.p;
+                            if (lruEntry === staleEnd) staleEnd = lruEntry.n;
                             link(lruEntry.n,lruEntry.p);
 
                             delete lruHash[key];
                         }
 
+                        if (!(key in data)) return;
+
                         delete data[key];
                         size--;
                     },
@@ -4863,15 +6975,15 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#removeAll
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Clears the cache object of any entries.
                      */
                     removeAll: function() {
-                        data = {};
+                        data = createMap();
                         size = 0;
-                        lruHash = {};
+                        lruHash = createMap();
                         freshEnd = staleEnd = null;
                     },
 
@@ -4879,7 +6991,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#destroy
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Destroys the {@link $cacheFactory.Cache Cache} object entirely,
@@ -4896,7 +7008,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#info
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}.
@@ -4912,17 +7024,17 @@
                     info: function() {
                         return extend({}, stats, {size: size});
                     }
-                };
+                });
 
 
                 /**
                  * makes the `entry` the freshEnd of the LRU linked list
                  */
                 function refresh(entry) {
-                    if (entry != freshEnd) {
+                    if (entry !== freshEnd) {
                         if (!staleEnd) {
                             staleEnd = entry;
-                        } else if (staleEnd == entry) {
+                        } else if (staleEnd === entry) {
                             staleEnd = entry.n;
                         }
 
@@ -4938,7 +7050,7 @@
                  * bidirectionally links two entries of the LRU linked list
                  */
                 function link(nextEntry, prevEntry) {
-                    if (nextEntry != prevEntry) {
+                    if (nextEntry !== prevEntry) {
                         if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify
                         if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify
                     }
@@ -4951,7 +7063,7 @@
              * @name $cacheFactory#info
              *
              * @description
-             * Get information about all the of the caches that have been created
+             * Get information about all the caches that have been created
              *
              * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info`
              */
@@ -4986,11 +7098,15 @@
     /**
      * @ngdoc service
      * @name $templateCache
+     * @this
      *
      * @description
+     * `$templateCache` is a {@link $cacheFactory.Cache Cache object} created by the
+     * {@link ng.$cacheFactory $cacheFactory}.
+     *
      * The first time a template is used, it is loaded in the template cache for quick retrieval. You
-     * can load templates directly into the cache in a `script` tag, or by consuming the
-     * `$templateCache` service directly.
+     * can load templates directly into the cache in a `script` tag, by using {@link $templateRequest},
+     * or by consuming the `$templateCache` service directly.
      *
      * Adding via the `script` tag:
      *
@@ -5001,29 +7117,30 @@
      * ```
      *
      * **Note:** the `script` tag containing the template does not need to be included in the `head` of
-     * the document, but it must be below the `ng-app` definition.
+     * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (e.g.
+     * element with {@link ngApp} attribute), otherwise the template will be ignored.
      *
-     * Adding via the $templateCache service:
+     * Adding via the `$templateCache` service:
      *
      * ```js
      * var myApp = angular.module('myApp', []);
      * myApp.run(function($templateCache) {
- *   $templateCache.put('templateId.html', 'This is the content of the template');
- * });
+     *   $templateCache.put('templateId.html', 'This is the content of the template');
+     * });
      * ```
      *
-     * To retrieve the template later, simply use it in your HTML:
-     * ```html
-     * <div ng-include=" 'templateId.html' "></div>
+     * To retrieve the template later, simply use it in your component:
+     * ```js
+     * myApp.component('myComponent', {
+     *    templateUrl: 'templateId.html'
+     * });
      * ```
      *
-     * or get it via Javascript:
+     * or get it via the `$templateCache` service:
      * ```js
      * $templateCache.get('templateId.html')
      * ```
      *
-     * See {@link ng.$cacheFactory $cacheFactory}.
-     *
      */
     function $TemplateCacheProvider() {
         this.$get = ['$cacheFactory', function($cacheFactory) {
@@ -5031,28 +7148,39 @@
         }];
     }
 
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables like document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
     /* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
-     *
-     * DOM-related variables:
-     *
-     * - "node" - DOM Node
-     * - "element" - DOM Element or Node
-     * - "$node" or "$element" - jqLite-wrapped node or element
-     *
-     *
-     * Compiler related stuff:
-     *
-     * - "linkFn" - linking fn of a single directive
-     * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
-     * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
-     * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
-     */
+ *
+ * DOM-related variables:
+ *
+ * - "node" - DOM Node
+ * - "element" - DOM Element or Node
+ * - "$node" or "$element" - jqLite-wrapped node or element
+ *
+ *
+ * Compiler related stuff:
+ *
+ * - "linkFn" - linking fn of a single directive
+ * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
+ * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
+ * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
+ */
 
 
     /**
      * @ngdoc service
      * @name $compile
-     * @function
+     * @kind function
      *
      * @description
      * Compiles an HTML string or DOM into a template and produces a template function, which
@@ -5072,8 +7200,9 @@
      * There are many different options for a directive.
      *
      * The difference resides in the return value of the factory function.
-     * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
-     * or just the `postLink` function (all other properties will have the default values).
+     * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
+     * that defines the directive properties, or just the `postLink` function (all other properties will have
+     * the default values).
      *
      * <div class="alert alert-success">
      * **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -5085,36 +7214,38 @@
      *   var myModule = angular.module(...);
      *
      *   myModule.directive('directiveName', function factory(injectables) {
- *     var directiveDefinitionObject = {
- *       priority: 0,
- *       template: '<div></div>', // or // function(tElement, tAttrs) { ... },
- *       // or
- *       // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... },
- *       replace: false,
- *       transclude: false,
- *       restrict: 'A',
- *       scope: false,
- *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
- *       controllerAs: 'stringAlias',
- *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
- *       compile: function compile(tElement, tAttrs, transclude) {
- *         return {
- *           pre: function preLink(scope, iElement, iAttrs, controller) { ... },
- *           post: function postLink(scope, iElement, iAttrs, controller) { ... }
- *         }
- *         // or
- *         // return function postLink( ... ) { ... }
- *       },
- *       // or
- *       // link: {
- *       //  pre: function preLink(scope, iElement, iAttrs, controller) { ... },
- *       //  post: function postLink(scope, iElement, iAttrs, controller) { ... }
- *       // }
- *       // or
- *       // link: function postLink( ... ) { ... }
- *     };
- *     return directiveDefinitionObject;
- *   });
+     *     var directiveDefinitionObject = {
+     *       {@link $compile#-priority- priority}: 0,
+     *       {@link $compile#-template- template}: '<div></div>', // or // function(tElement, tAttrs) { ... },
+     *       // or
+     *       // {@link $compile#-templateurl- templateUrl}: 'directive.html', // or // function(tElement, tAttrs) { ... },
+     *       {@link $compile#-transclude- transclude}: false,
+     *       {@link $compile#-restrict- restrict}: 'A',
+     *       {@link $compile#-templatenamespace- templateNamespace}: 'html',
+     *       {@link $compile#-scope- scope}: false,
+     *       {@link $compile#-controller- controller}: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
+     *       {@link $compile#-controlleras- controllerAs}: 'stringIdentifier',
+     *       {@link $compile#-bindtocontroller- bindToController}: false,
+     *       {@link $compile#-require- require}: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
+     *       {@link $compile#-multielement- multiElement}: false,
+     *       {@link $compile#-compile- compile}: function compile(tElement, tAttrs, transclude) {
+     *         return {
+     *            {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
+     *            {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
+     *         }
+     *         // or
+     *         // return function postLink( ... ) { ... }
+     *       },
+     *       // or
+     *       // {@link $compile#-link- link}: {
+     *       //  {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
+     *       //  {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
+     *       // }
+     *       // or
+     *       // {@link $compile#-link- link}: function postLink( ... ) { ... }
+     *     };
+     *     return directiveDefinitionObject;
+     *   });
      * ```
      *
      * <div class="alert alert-warning">
@@ -5127,21 +7258,148 @@
      *   var myModule = angular.module(...);
      *
      *   myModule.directive('directiveName', function factory(injectables) {
- *     var directiveDefinitionObject = {
- *       link: function postLink(scope, iElement, iAttrs) { ... }
- *     };
- *     return directiveDefinitionObject;
- *     // or
- *     // return function postLink(scope, iElement, iAttrs) { ... }
- *   });
+     *     var directiveDefinitionObject = {
+     *       link: function postLink(scope, iElement, iAttrs) { ... }
+     *     };
+     *     return directiveDefinitionObject;
+     *     // or
+     *     // return function postLink(scope, iElement, iAttrs) { ... }
+     *   });
      * ```
      *
+     * ### Life-cycle hooks
+     * Directive controllers can provide the following methods that are called by AngularJS at points in the life-cycle of the
+     * directive:
+     * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+     *   had their bindings initialized (and before the pre &amp; post linking functions for the directives on
+     *   this element). This is a good place to put initialization code for your controller.
+     * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+     *   `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+     *   object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+     *   component such as cloning the bound value to prevent accidental mutation of the outer value. Note that this will
+     *   also be called when your bindings are initialized.
+     * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
+     *   changes. Any actions that you wish to take in response to the changes that you detect must be
+     *   invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
+     *   could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
+     *   be detected by AngularJS's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
+     *   if detecting changes, you must store the previous value(s) for comparison to the current values.
+     * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+     *   external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+     *   the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+     *   components will have their `$onDestroy()` hook called before child components.
+     * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+     *   function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+     *   Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+     *   they are waiting for their template to load asynchronously and their own compilation and linking has been
+     *   suspended until that occurs.
+     *
+     * #### Comparison with life-cycle hooks in the new Angular
+     * The new Angular also uses life-cycle hooks for its components. While the AngularJS life-cycle hooks are similar there are
+     * some differences that you should be aware of, especially when it comes to moving your code from AngularJS to Angular:
+     *
+     * * AngularJS hooks are prefixed with `$`, such as `$onInit`. Angular hooks are prefixed with `ng`, such as `ngOnInit`.
+     * * AngularJS hooks can be defined on the controller prototype or added to the controller inside its constructor.
+     *   In Angular you can only define hooks on the prototype of the Component class.
+     * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in AngularJS than you would to
+     *   `ngDoCheck` in Angular.
+     * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
+     *   propagated throughout the application.
+     *   Angular does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
+     *   error or do nothing depending upon the state of `enableProdMode()`.
+     *
+     * #### Life-cycle hook examples
+     *
+     * This example shows how you can check for mutations to a Date object even though the identity of the object
+     * has not changed.
+     *
+     * <example name="doCheckDateExample" module="do-check-module">
+     *   <file name="app.js">
+     *     angular.module('do-check-module', [])
+     *       .component('app', {
+     *         template:
+     *           'Month: <input ng-model="$ctrl.month" ng-change="$ctrl.updateDate()">' +
+     *           'Date: {{ $ctrl.date }}' +
+     *           '<test date="$ctrl.date"></test>',
+     *         controller: function() {
+     *           this.date = new Date();
+     *           this.month = this.date.getMonth();
+     *           this.updateDate = function() {
+     *             this.date.setMonth(this.month);
+     *           };
+     *         }
+     *       })
+     *       .component('test', {
+     *         bindings: { date: '<' },
+     *         template:
+     *           '<pre>{{ $ctrl.log | json }}</pre>',
+     *         controller: function() {
+     *           var previousValue;
+     *           this.log = [];
+     *           this.$doCheck = function() {
+     *             var currentValue = this.date && this.date.valueOf();
+     *             if (previousValue !== currentValue) {
+     *               this.log.push('doCheck: date mutated: ' + this.date);
+     *               previousValue = currentValue;
+     *             }
+     *           };
+     *         }
+     *       });
+     *   </file>
+     *   <file name="index.html">
+     *     <app></app>
+     *   </file>
+     * </example>
      *
+     * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
+     * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
+     * arrays or objects can have a negative impact on your application performance)
      *
-     * ### Directive Definition Object
-     *
-     * The directive definition object provides instructions to the {@link ng.$compile
- * compiler}. The attributes are:
+     * <example name="doCheckArrayExample" module="do-check-module">
+     *   <file name="index.html">
+     *     <div ng-init="items = []">
+     *       <button ng-click="items.push(items.length)">Add Item</button>
+     *       <button ng-click="items = []">Reset Items</button>
+     *       <pre>{{ items }}</pre>
+     *       <test items="items"></test>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *      angular.module('do-check-module', [])
+     *        .component('test', {
+     *          bindings: { items: '<' },
+     *          template:
+     *            '<pre>{{ $ctrl.log | json }}</pre>',
+     *          controller: function() {
+     *            this.log = [];
+     *
+     *            this.$doCheck = function() {
+     *              if (this.items_ref !== this.items) {
+     *                this.log.push('doCheck: items changed');
+     *                this.items_ref = this.items;
+     *              }
+     *              if (!angular.equals(this.items_clone, this.items)) {
+     *                this.log.push('doCheck: items mutated');
+     *                this.items_clone = angular.copy(this.items);
+     *              }
+     *            };
+     *          }
+     *        });
+     *   </file>
+     * </example>
+     *
+     *
+     * ### Directive Definition Object
+     *
+     * The directive definition object provides instructions to the {@link ng.$compile
+ * compiler}. The attributes are:
+     *
+     * #### `multiElement`
+     * When this property is set to true (default is `false`), the HTML compiler will collect DOM nodes between
+     * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them
+     * together as the directive elements. It is recommended that this feature be used on directives
+     * which are not strictly behavioral (such as {@link ngClick}), and which
+     * do not manipulate or replace child nodes (such as {@link ngInclude}).
      *
      * #### `priority`
      * When there are multiple directives defined on a single DOM element, sometimes it
@@ -5154,136 +7412,269 @@
      * #### `terminal`
      * If set to true then the current `priority` will be the last set of directives
      * which will execute (any directives at the current priority will still execute
-     * as the order of execution on same `priority` is undefined).
+     * as the order of execution on same `priority` is undefined). Note that expressions
+     * and other directives used in the directive's template will also be excluded from execution.
      *
      * #### `scope`
-     * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the
-     * same element request a new scope, only one new scope is created. The new scope rule does not
-     * apply for the root of the template since the root of the template always gets a new scope.
+     * The scope property can be `false`, `true`, or an object:
      *
-     * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from
-     * normal scope in that it does not prototypically inherit from the parent scope. This is useful
-     * when creating reusable components, which should not accidentally read or modify data in the
-     * parent scope.
+     * * **`false` (default):** No scope will be created for the directive. The directive will use its
+     * parent's scope.
      *
-     * The 'isolate' scope takes an object hash which defines a set of local scope properties
-     * derived from the parent scope. These local properties are useful for aliasing values for
-     * templates. Locals definition is a hash of local scope property to its source:
+     * * **`true`:** A new child scope that prototypically inherits from its parent will be created for
+     * the directive's element. If multiple directives on the same element request a new scope,
+     * only one new scope is created.
+     *
+     * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's template.
+     * The 'isolate' scope differs from normal scope in that it does not prototypically
+     * inherit from its parent scope. This is useful when creating reusable components, which should not
+     * accidentally read or modify data in the parent scope. Note that an isolate scope
+     * directive without a `template` or `templateUrl` will not apply the isolate scope
+     * to its children elements.
+     *
+     * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the
+     * directive's element. These local properties are useful for aliasing values for templates. The keys in
+     * the object hash map to the name of the property on the isolate scope; the values define how the property
+     * is bound to the parent scope, via matching attributes on the directive's element:
      *
      * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is
-     *   always a string since DOM attributes are strings. If no `attr` name is specified  then the
-     *   attribute name is assumed to be the same as the local name.
-     *   Given `<widget my-attr="hello {{name}}">` and widget definition
-     *   of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect
-     *   the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the
-     *   `localName` property on the widget scope. The `name` is read from the parent scope (not
-     *   component scope).
-     *
-     * * `=` or `=attr` - set up bi-directional binding between a local scope property and the
-     *   parent scope property of name defined via the value of the `attr` attribute. If no `attr`
-     *   name is specified then the attribute name is assumed to be the same as the local name.
-     *   Given `<widget my-attr="parentModel">` and widget definition of
-     *   `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the
+     *   always a string since DOM attributes are strings. If no `attr` name is specified then the
+     *   attribute name is assumed to be the same as the local name. Given `<my-component
+     *   my-attr="hello {{name}}">` and the isolate scope definition `scope: { localName:'@myAttr' }`,
+     *   the directive's scope property `localName` will reflect the interpolated value of `hello
+     *   {{name}}`. As the `name` attribute changes so will the `localName` property on the directive's
+     *   scope. The `name` is read from the parent scope (not the directive's scope).
+     *
+     * * `=` or `=attr` - set up a bidirectional binding between a local scope property and an expression
+     *   passed via the attribute `attr`. The expression is evaluated in the context of the parent scope.
+     *   If no `attr` name is specified then the attribute name is assumed to be the same as the local
+     *   name. Given `<my-component my-attr="parentModel">` and the isolate scope definition `scope: {
+     *   localModel: '=myAttr' }`, the property `localModel` on the directive's scope will reflect the
+     *   value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in
+     *   `localModel` and vice versa. Optional attributes should be marked as such with a question mark:
+     *   `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't
+     *   optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`})
+     *   will be thrown upon discovering changes to the local value, since it will be impossible to sync
+     *   them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
+     *   method is used for tracking changes, and the equality check is based on object identity.
+     *   However, if an object literal or an array literal is passed as the binding expression, the
+     *   equality check is done by value (using the {@link angular.equals} function). It's also possible
+     *   to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection
+ *   `$watchCollection`}: use `=*` or `=*attr` (`=*?` or `=*?attr` if the attribute is optional).
+     *
+     * * `<` or `<attr` - set up a one-way (one-directional) binding between a local scope property and an
+     *   expression passed via the attribute `attr`. The expression is evaluated in the context of the
+     *   parent scope. If no `attr` name is specified then the attribute name is assumed to be the same as the
+     *   local name. You can also make the binding optional by adding `?`: `<?` or `<?attr`.
+     *
+     *   For example, given `<my-component my-attr="parentModel">` and directive definition of
+     *   `scope: { localModel:'<myAttr' }`, then the isolated scope property `localModel` will reflect the
      *   value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected
-     *   in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent
-     *   scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You
-     *   can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional.
+     *   in `localModel`, but changes in `localModel` will not reflect in `parentModel`. There are however
+     *   two caveats:
+     *     1. one-way binding does not copy the value from the parent to the isolate scope, it simply
+     *     sets the same value. That means if your bound value is an object, changes to its properties
+     *     in the isolated scope will be reflected in the parent scope (because both reference the same object).
+     *     2. one-way binding watches changes to the **identity** of the parent value. That means the
+     *     {@link ng.$rootScope.Scope#$watch `$watch`} on the parent value only fires if the reference
+     *     to the value has changed. In most cases, this should not be of concern, but can be important
+     *     to know if you one-way bind to an object, and then replace that object in the isolated scope.
+     *     If you now change a property of the object in your parent scope, the change will not be
+     *     propagated to the isolated scope, because the identity of the object on the parent scope
+     *     has not changed. Instead you must assign a new object.
+     *
+     *   One-way binding is useful if you do not plan to propagate changes to your isolated scope bindings
+     *   back to the parent. However, it does not make this completely impossible.
+     *
+     * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. If
+     *   no `attr` name is specified then the attribute name is assumed to be the same as the local name.
+     *   Given `<my-component my-attr="count = count + value">` and the isolate scope definition `scope: {
+     *   localFn:'&myAttr' }`, the isolate scope property `localFn` will point to a function wrapper for
+     *   the `count = count + value` expression. Often it's desirable to pass data from the isolated scope
+     *   via an expression to the parent scope. This can be done by passing a map of local variable names
+     *   and values into the expression wrapper fn. For example, if the expression is `increment(amount)`
+     *   then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`.
+     *
+     * In general it's possible to apply more than one directive to one element, but there might be limitations
+     * depending on the type of scope required by the directives. The following points will help explain these limitations.
+     * For simplicity only two directives are taken into account, but it is also applicable for several directives:
+     *
+     * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope
+     * * **child scope** + **no scope** =>  Both directives will share one single child scope
+     * * **child scope** + **child scope** =>  Both directives will share one single child scope
+     * * **isolated scope** + **no scope** =>  The isolated directive will use it's own created isolated scope. The other directive will use
+     * its parent's scope
+     * * **isolated scope** + **child scope** =>  **Won't work!** Only one scope can be related to one element. Therefore these directives cannot
+     * be applied to the same element.
+     * * **isolated scope** + **isolated scope**  =>  **Won't work!** Only one scope can be related to one element. Therefore these directives
+     * cannot be applied to the same element.
+     *
+     *
+     * #### `bindToController`
+     * This property is used to bind scope properties directly to the controller. It can be either
+     * `true` or an object hash with the same format as the `scope` property.
+     *
+     * When an isolate scope is used for a directive (see above), `bindToController: true` will
+     * allow a component to have its properties bound to the controller, rather than to scope.
+     *
+     * After the controller is instantiated, the initial values of the isolate scope bindings will be bound to the controller
+     * properties. You can access these bindings once they have been initialized by providing a controller method called
+     * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings
+     * initialized.
+     *
+     * <div class="alert alert-warning">
+     * **Deprecation warning:** if `$compileProcvider.preAssignBindingsEnabled(true)` was called, bindings for non-ES6 class
+     * controllers are bound to `this` before the controller constructor is called but this use is now deprecated. Please
+     * place initialization code that relies upon bindings inside a `$onInit` method on the controller, instead.
+     * </div>
      *
-     * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope.
-     *   If no `attr` name is specified then the attribute name is assumed to be the same as the
-     *   local name. Given `<widget my-attr="count = count + value">` and widget definition of
-     *   `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to
-     *   a function wrapper for the `count = count + value` expression. Often it's desirable to
-     *   pass data from the isolated scope via an expression and to the parent scope, this can be
-     *   done by passing a map of local variable names and values into the expression wrapper fn.
-     *   For example, if the expression is `increment(amount)` then we can specify the amount value
-     *   by calling the `localFn` as `localFn({amount: 22})`.
+     * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
+     * This will set up the scope bindings to the controller directly. Note that `scope` can still be used
+     * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate
+     * scope (useful for component directives).
      *
+     * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`.
      *
      *
      * #### `controller`
      * Controller constructor function. The controller is instantiated before the
-     * pre-linking phase and it is shared with other directives (see
+     * pre-linking phase and can be accessed by other directives (see
      * `require` attribute). This allows the directives to communicate with each other and augment
      * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals:
      *
      * * `$scope` - Current scope associated with the element
      * * `$element` - Current element
      * * `$attrs` - Current attributes object for the element
-     * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope.
-     *    The scope can be overridden by an optional first argument.
-     *   `function([scope], cloneLinkingFn)`.
-     *
+     * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope:
+     *   `function([scope], cloneLinkingFn, futureParentElement, slotName)`:
+     *    * `scope`: (optional) override the scope.
+     *    * `cloneLinkingFn`: (optional) argument to create clones of the original transcluded content.
+     *    * `futureParentElement` (optional):
+     *        * defines the parent to which the `cloneLinkingFn` will add the cloned elements.
+     *        * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`.
+     *        * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements)
+     *          and when the `cloneLinkingFn` is passed,
+     *          as those elements need to created and cloned in a special way when they are defined outside their
+     *          usual containers (e.g. like `<svg>`).
+     *        * See also the `directive.templateNamespace` property.
+     *    * `slotName`: (optional) the name of the slot to transclude. If falsy (e.g. `null`, `undefined` or `''`)
+     *      then the default transclusion is provided.
+     *    The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
+     *    `true` if the specified slot contains content (i.e. one or more DOM nodes).
      *
      * #### `require`
      * Require another directive and inject its controller as the fourth argument to the linking function. The
-     * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
-     * injected argument will be an array in corresponding order. If no such directive can be
-     * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with:
+     * `require` property can be a string, an array or an object:
+     * * a **string** containing the name of the directive to pass to the linking function
+     * * an **array** containing the names of directives to pass to the linking function. The argument passed to the
+     * linking function will be an array of controllers in the same order as the names in the `require` property
+     * * an **object** whose property values are the names of the directives to pass to the linking function. The argument
+     * passed to the linking function will also be an object with matching keys, whose values will hold the corresponding
+     * controllers.
+     *
+     * If the `require` property is an object and `bindToController` is truthy, then the required controllers are
+     * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers
+     * have been constructed but before `$onInit` is called.
+     * If the name of the required controller is the same as the local name (the key), the name can be
+     * omitted. For example, `{parentDir: '^^'}` is equivalent to `{parentDir: '^^parentDir'}`.
+     * See the {@link $compileProvider#component} helper for an example of how this can be used.
+     * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is
+     * raised (unless no link function is specified and the required controllers are not being bound to the directive
+     * controller, in which case error checking is skipped). The name can be prefixed with:
      *
      * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
      * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
-     * * `^` - Locate the required controller by searching the element's parents. Throw an error if not found.
-     * * `?^` - Attempt to locate the required controller by searching the element's parents or pass `null` to the
-     *   `link` fn if not found.
+     * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found.
+     * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found.
+     * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass
+     *   `null` to the `link` fn if not found.
+     * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass
+     *   `null` to the `link` fn if not found.
      *
      *
      * #### `controllerAs`
-     * Controller alias at the directive scope. An alias for the controller so it
-     * can be referenced at the directive template. The directive needs to define a scope for this
-     * configuration to be used. Useful in the case when directive is used as component.
+     * Identifier name for a reference to the controller in the directive's scope.
+     * This allows the controller to be referenced from the directive template. This is especially
+     * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible
+     * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the
+     * `controllerAs` reference might overwrite a property that already exists on the parent scope.
      *
      *
      * #### `restrict`
      * String of subset of `EACM` which restricts the directive to a specific directive
-     * declaration style. If omitted, the default (attributes only) is used.
+     * declaration style. If omitted, the defaults (elements and attributes) are used.
      *
-     * * `E` - Element name: `<my-directive></my-directive>`
+     * * `E` - Element name (default): `<my-directive></my-directive>`
      * * `A` - Attribute (default): `<div my-directive="exp"></div>`
      * * `C` - Class: `<div class="my-directive: exp;"></div>`
      * * `M` - Comment: `<!-- directive: my-directive exp -->`
      *
      *
+     * #### `templateNamespace`
+     * String representing the document type used by the markup in the template.
+     * AngularJS needs this information as those elements need to be created and cloned
+     * in a special way when they are defined outside their usual containers like `<svg>` and `<math>`.
+     *
+     * * `html` - All root nodes in the template are HTML. Root nodes may also be
+     *   top-level elements such as `<svg>` or `<math>`.
+     * * `svg` - The root nodes in the template are SVG elements (excluding `<math>`).
+     * * `math` - The root nodes in the template are MathML elements (excluding `<svg>`).
+     *
+     * If no `templateNamespace` is specified, then the namespace is considered to be `html`.
+     *
      * #### `template`
-     * replace the current element with the contents of the HTML. The replacement process
-     * migrates all of the attributes / classes from the old element to the new one. See the
-     * {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive
- * Directives Guide} for an example.
+     * HTML markup that may:
+     * * Replace the contents of the directive's element (default).
+     * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
+     * * Wrap the contents of the directive's element (if `transclude` is true).
      *
-     * You can specify `template` as a string representing the template or as a function which takes
-     * two arguments `tElement` and `tAttrs` (described in the `compile` function api below) and
-     * returns a string value representing the template.
+     * Value may be:
+     *
+     * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
+     * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
+     *   function api below) and returns a string value.
      *
      *
      * #### `templateUrl`
-     * Same as `template` but the template is loaded from the specified URL. Because
-     * the template loading is asynchronous the compilation/linking is suspended until the template
-     * is loaded.
+     * This is similar to `template` but the template is loaded from the specified URL, asynchronously.
+     *
+     * Because template loading is asynchronous the compiler will suspend compilation of directives on that element
+     * for later when the template has been resolved.  In the meantime it will continue to compile and link
+     * sibling and parent elements as though this element had not contained any directives.
+     *
+     * The compiler does not suspend the entire compilation to wait for templates to be loaded because this
+     * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the
+     * case when only one deeply nested directive has `templateUrl`.
+     *
+     * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache}
      *
      * You can specify `templateUrl` as a string representing the URL or as a function which takes two
      * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns
      * a string value representing the url.  In either case, the template URL is passed through {@link
-        * api/ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
+        * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
      *
      *
-     * #### `replace`
-     * specify where the template should be inserted. Defaults to `false`.
+     * #### `replace` (*DEPRECATED*)
      *
-     * * `true` - the template will replace the current element.
-     * * `false` - the template will replace the contents of the current element.
+     * `replace` will be removed in next major release - i.e. v2.0).
      *
+     * Specifies what the template should replace. Defaults to `false`.
      *
-     * #### `transclude`
-     * compile the content of the element and make it available to the directive.
-     * Typically used with {@link ng.directive:ngTransclude
- * ngTransclude}. The advantage of transclusion is that the linking function receives a
-     * transclusion function which is pre-bound to the correct scope. In a typical setup the widget
-     * creates an `isolate` scope, but the transclusion is not a child, but a sibling of the `isolate`
-     * scope. This makes it possible for the widget to have private state, and the transclusion to
-     * be bound to the parent (pre-`isolate`) scope.
+     * * `true` - the template will replace the directive's element.
+     * * `false` - the template will replace the contents of the directive's element.
+     *
+     * The replacement process migrates all of the attributes / classes from the old element to the new
+     * one. See the {@link guide/directive#template-expanding-directive
+ * Directives Guide} for an example.
+     *
+     * There are very few scenarios where element replacement is required for the application function,
+     * the main one being reusable custom components that are used within SVG contexts
+     * (because SVG doesn't work with custom elements in the DOM tree).
      *
-     * * `true` - transclude the content of the directive.
-     * * `'element'` - transclude the whole element including any directives defined at lower priority.
+     * #### `transclude`
+     * Extract the contents of the element where the directive appears and make it available to the directive.
+     * The contents are compiled and provided to the directive as a **transclusion function**. See the
+     * {@link $compile#transclusion Transclusion} section below.
      *
      *
      * #### `compile`
@@ -5293,11 +7684,7 @@
      * ```
      *
      * The compile function deals with transforming the template DOM. Since most directives do not do
-     * template transformation, it is not used often. Examples that require compile functions are
-     * directives that transform template DOM, such as {@link
-        * api/ng.directive:ngRepeat ngRepeat}, or load the contents
-     * asynchronously, such as {@link ngRoute.directive:ngView ngView}. The
-     * compile function takes the following arguments.
+     * template transformation, it is not used often. The compile function takes the following arguments:
      *
      *   * `tElement` - template element - The element where the directive has been declared. It is
      *     safe to do template transformation on the element and child elements only.
@@ -5316,7 +7703,7 @@
 
      * <div class="alert alert-warning">
      * **Note:** The compile function cannot handle directives that recursively use themselves in their
-     * own templates or compile functions. Compiling these directives results in an infinite loop and a
+     * own templates or compile functions. Compiling these directives results in an infinite loop and
      * stack overflow errors.
      *
      * This can be avoided by manually using $compile in the postLink function to imperatively compile
@@ -5324,7 +7711,7 @@
      * `templateUrl` declaration or manual compilation inside the compile function.
      * </div>
      *
-     * <div class="alert alert-error">
+     * <div class="alert alert-danger">
      * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
      *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
      *   to the link function instead.
@@ -5361,15 +7748,23 @@
      *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
      *     between all directive linking functions.
      *
-     *   * `controller` - a controller instance - A controller instance if at least one directive on the
-     *     element defines a controller. The controller is shared among all the directives, which allows
-     *     the directives to use the controllers as a communication channel.
+     *   * `controller` - the directive's required controller instance(s) - Instances are shared
+     *     among all directives, which allows the directives to use the controllers as a communication
+     *     channel. The exact value depends on the directive's `require` property:
+     *       * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one
+     *       * `string`: the controller instance
+     *       * `array`: array of controller instances
      *
-     *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
-     *     The scope can be overridden by an optional first argument. This is the same as the `$transclude`
-     *     parameter of directive controllers.
-     *     `function([scope], cloneLinkingFn)`.
+     *     If a required controller cannot be found, and it is optional, the instance is `null`,
+     *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
      *
+     *     Note that you can also require the directive's own controller - it will be made available like
+     *     any other controller.
+     *
+     *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
+     *     This is the same as the `$transclude` parameter of directive controllers,
+     *     see {@link ng.$compile#-controller- the controller section for details}.
+     *     `function([scope], cloneLinkingFn, futureParentElement)`.
      *
      * #### Pre-linking function
      *
@@ -5378,18 +7773,166 @@
      *
      * #### Post-linking function
      *
-     * Executed after the child elements are linked. It is safe to do DOM transformation in the post-linking function.
+     * Executed after the child elements are linked.
+     *
+     * Note that child elements that contain `templateUrl` directives will not have been compiled
+     * and linked since they are waiting for their template to load asynchronously and their own
+     * compilation and linking has been suspended until that occurs.
+     *
+     * It is safe to do DOM transformation in the post-linking function on elements that are not waiting
+     * for their async templates to be resolved.
+     *
+     *
+     * ### Transclusion
+     *
+     * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and
+     * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
+     * scope from where they were taken.
+     *
+     * Transclusion is used (often with {@link ngTransclude}) to insert the
+     * original contents of a directive's element into a specified place in the template of the directive.
+     * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded
+     * content has access to the properties on the scope from which it was taken, even if the directive
+     * has isolated scope.
+     * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}.
+     *
+     * This makes it possible for the widget to have private state for its template, while the transcluded
+     * content has access to its originating scope.
+     *
+     * <div class="alert alert-warning">
+     * **Note:** When testing an element transclude directive you must not place the directive at the root of the
+     * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
+ * Testing Transclusion Directives}.
+     * </div>
+     *
+     * There are three kinds of transclusion depending upon whether you want to transclude just the contents of the
+     * directive's element, the entire element or multiple parts of the element contents:
+     *
+     * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
+     * * `'element'` - transclude the whole of the directive's element including any directives on this
+     *   element that defined at a lower priority than this directive. When used, the `template`
+     *   property is ignored.
+     * * **`{...}` (an object hash):** - map elements of the content onto transclusion "slots" in the template.
+     *
+     * **Mult-slot transclusion** is declared by providing an object for the `transclude` property.
+     *
+     * This object is a map where the keys are the name of the slot to fill and the value is an element selector
+     * used to match the HTML to the slot. The element selector should be in normalized form (e.g. `myElement`)
+     * and will match the standard element variants (e.g. `my-element`, `my:element`, `data-my-element`, etc).
+     *
+     * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+     *
+     * If the element selector is prefixed with a `?` then that slot is optional.
+     *
+     * For example, the transclude object `{ slotA: '?myCustomElement' }` maps `<my-custom-element>` elements to
+     * the `slotA` slot, which can be accessed via the `$transclude` function or via the {@link ngTransclude} directive.
+     *
+     * Slots that are not marked as optional (`?`) will trigger a compile time error if there are no matching elements
+     * in the transclude content. If you wish to know if an optional slot was filled with content, then you can call
+     * `$transclude.isSlotFilled(slotName)` on the transclude function passed to the directive's link function and
+     * injectable into the directive's controller.
+     *
+     *
+     * #### Transclusion Functions
+     *
+     * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion
+     * function** to the directive's `link` function and `controller`. This transclusion function is a special
+     * **linking function** that will return the compiled contents linked to a new transclusion scope.
+     *
+     * <div class="alert alert-info">
+     * If you are just using {@link ngTransclude} then you don't need to worry about this function, since
+     * ngTransclude will deal with it for us.
+     * </div>
+     *
+     * If you want to manually control the insertion and removal of the transcluded content in your directive
+     * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery
+     * object that contains the compiled DOM, which is linked to the correct transclusion scope.
+     *
+     * When you call a transclusion function you can pass in a **clone attach function**. This function accepts
+     * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded
+     * content and the `scope` is the newly created transclusion scope, which the clone will be linked to.
+     *
+     * <div class="alert alert-info">
+     * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function
+     * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope.
+     * </div>
+     *
+     * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone
+     * attach function**:
+     *
+     * ```js
+     * var transcludedContent, transclusionScope;
+     *
+     * $transclude(function(clone, scope) {
+     *   element.append(clone);
+     *   transcludedContent = clone;
+     *   transclusionScope = scope;
+     * });
+     * ```
+     *
+     * Later, if you want to remove the transcluded content from your DOM then you should also destroy the
+     * associated transclusion scope:
+     *
+     * ```js
+     * transcludedContent.remove();
+     * transclusionScope.$destroy();
+     * ```
+     *
+     * <div class="alert alert-info">
+     * **Best Practice**: if you intend to add and remove transcluded content manually in your directive
+     * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it),
+     * then you are also responsible for calling `$destroy` on the transclusion scope.
+     * </div>
+     *
+     * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat}
+     * automatically destroy their transcluded clones as necessary so you do not need to worry about this if
+     * you are simply using {@link ngTransclude} to inject the transclusion into your directive.
+     *
+     *
+     * #### Transclusion Scopes
+     *
+     * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion
+     * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed
+     * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it
+     * was taken.
+     *
+     * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look
+     * like this:
+     *
+     * ```html
+     * <div ng-app>
+     *   <div isolate>
+     *     <div transclusion>
+     *     </div>
+     *   </div>
+     * </div>
+     * ```
+     *
+     * The `$parent` scope hierarchy will look like this:
+     *
+     ```
+     - $rootScope
+     - isolate
+     - transclusion
+     ```
+     *
+     * but the scopes will inherit prototypically from different scopes to their `$parent`.
+     *
+     ```
+     - $rootScope
+     - transclusion
+     - isolate
+     ```
+     *
      *
-     * <a name="Attributes"></a>
      * ### Attributes
      *
      * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
      * `link()` or `compile()` functions. It has a variety of uses.
      *
-     * accessing *Normalized attribute names:*
-     * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'.
-     * the attributes object allows for normalized access to
-     *   the attributes.
+     * * *Accessing normalized attribute names:* Directives like 'ngBind' can be expressed in many ways:
+     *   'ng:bind', `data-ng-bind`, or 'x-ng-bind'. The attributes object allows for normalized access
+     *   to the attributes.
      *
      * * *Directive inter-communication:* All directives share the same instance of the attributes
      *   object which allows the directives to use the attributes object as inter directive
@@ -5405,30 +7948,30 @@
      *
      * ```js
      * function linkingFn(scope, elm, attrs, ctrl) {
- *   // get the attribute value
- *   console.log(attrs.ngModel);
- *
- *   // change the attribute
- *   attrs.$set('ngModel', 'new value');
- *
- *   // observe changes to interpolated attribute
- *   attrs.$observe('ngModel', function(value) {
- *     console.log('ngModel has changed value to ' + value);
- *   });
- * }
+     *   // get the attribute value
+     *   console.log(attrs.ngModel);
+     *
+     *   // change the attribute
+     *   attrs.$set('ngModel', 'new value');
+     *
+     *   // observe changes to interpolated attribute
+     *   attrs.$observe('ngModel', function(value) {
+     *     console.log('ngModel has changed value to ' + value);
+     *   });
+     * }
      * ```
      *
-     * Below is an example using `$compileProvider`.
+     * ## Example
      *
      * <div class="alert alert-warning">
      * **Note**: Typically directives are registered with `module.directive`. The example below is
      * to illustrate how `$compile` works.
      * </div>
      *
-     <example module="compile">
+     <example module="compileExample" name="compile">
      <file name="index.html">
      <script>
-     angular.module('compile', [], function($compileProvider) {
+     angular.module('compileExample', [], function($compileProvider) {
         // configure new 'compile' directive by passing a directive
         // factory function. The factory function injects the '$compile'
         $compileProvider.directive('compile', function($compile) {
@@ -5452,17 +7995,16 @@
               }
             );
           };
-        })
-      });
-
-     function Ctrl($scope) {
-        $scope.name = 'Angular';
+        });
+      })
+     .controller('GreeterController', ['$scope', function($scope) {
+        $scope.name = 'AngularJS';
         $scope.html = 'Hello {{name}}';
-      }
+      }]);
      </script>
-     <div ng-controller="Ctrl">
-     <input ng-model="name"> <br>
-     <textarea ng-model="html"></textarea> <br>
+     <div ng-controller="GreeterController">
+     <input ng-model="name"> <br/>
+     <textarea ng-model="html"></textarea> <br/>
      <div compile="html"></div>
      </div>
      </file>
@@ -5470,11 +8012,11 @@
      it('should auto compile', function() {
        var textarea = $('textarea');
        var output = $('div[compile]');
-       // The initial state reads 'Hello Angular'.
-       expect(output.getText()).toBe('Hello Angular');
+       // The initial state reads 'Hello AngularJS'.
+       expect(output.getText()).toBe('Hello AngularJS');
        textarea.clear();
        textarea.sendKeys('{{name}}!');
-       expect(output.getText()).toBe('Angular!');
+       expect(output.getText()).toBe('AngularJS!');
      });
      </file>
      </example>
@@ -5482,26 +8024,53 @@
      *
      *
      * @param {string|DOMElement} element Element or HTML string to compile into a template function.
-     * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives.
+     * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
+     *
+     * <div class="alert alert-danger">
+     * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
+     *   e.g. will not use the right outer scope. Please pass the transclude function as a
+     *   `parentBoundTranscludeFn` to the link function instead.
+     * </div>
+     *
      * @param {number} maxPriority only apply directives lower than given priority (Only effects the
      *                 root element(s), not their children)
-     * @returns {function(scope, cloneAttachFn=)} a link function which is used to bind template
+     * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template
      * (a DOM element/tree) to a scope. Where:
      *
      *  * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to.
      *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
      *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
      *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
-     *  called as: <br> `cloneAttachFn(clonedElement, scope)` where:
+     *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
      *
      *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
      *      * `scope` - is the current scope with which the linking function is working with.
      *
+     *  * `options` - An optional object hash with linking options. If `options` is provided, then the following
+     *  keys may be used to control linking behavior:
+     *
+     *      * `parentBoundTranscludeFn` - the transclude function made available to
+     *        directives; if given, it will be passed through to the link functions of
+     *        directives found in `element` during compilation.
+     *      * `transcludeControllers` - an object hash with keys that map controller names
+     *        to a hash with the key `instance`, which maps to the controller instance;
+     *        if given, it will make the controllers available to directives on the compileNode:
+     *        ```
+     *        {
+     *          parent: {
+     *            instance: parentControllerInstance
+     *          }
+     *        }
+     *        ```
+     *      * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add
+     *        the cloned elements; only needed for transcludes that are allowed to contain non html
+     *        elements (e.g. SVG elements). See also the directive.controller property.
+     *
      * Calling the linking function returns the element of the template. It is either the original
      * element passed in, or the clone of the element if the `cloneAttachFn` is provided.
      *
      * After linking the view is not updated until after a call to $digest which typically is done by
-     * Angular automatically.
+     * AngularJS automatically.
      *
      * If you need access to the bound view, there are two ways to do it:
      *
@@ -5519,42 +8088,158 @@
      *         scope = ....;
      *
      *     var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) {
- *       //attach the clone to DOM document at the right place
- *     });
+     *       //attach the clone to DOM document at the right place
+     *     });
      *
      *     //now we have reference to the cloned DOM via `clonedElement`
      *   ```
      *
      *
      * For information on how the compiler works, see the
-     * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide.
+     * {@link guide/compiler AngularJS HTML Compiler} section of the Developer Guide.
+     *
+     * @knownIssue
+     *
+     * ### Double Compilation
+     *
+     Double compilation occurs when an already compiled part of the DOM gets
+     compiled again. This is an undesired effect and can lead to misbehaving directives, performance issues,
+     and memory leaks. Refer to the Compiler Guide {@link guide/compiler#double-compilation-and-how-to-avoid-it
+   section on double compilation} for an in-depth explanation and ways to avoid it.
+     *
      */
 
     var $compileMinErr = minErr('$compile');
 
+    function UNINITIALIZED_VALUE() {}
+    var _UNINITIALIZED_VALUE = new UNINITIALIZED_VALUE();
+
     /**
      * @ngdoc provider
      * @name $compileProvider
-     * @function
      *
      * @description
      */
     $CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider'];
+    /** @this */
     function $CompileProvider($provide, $$sanitizeUriProvider) {
         var hasDirectives = {},
             Suffix = 'Directive',
-            COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\d\w\-_]+)\s+(.*)$/,
-            CLASS_DIRECTIVE_REGEXP = /(([\d\w\-_]+)(?:\:([^;]+))?;?)/;
+            COMMENT_DIRECTIVE_REGEXP = /^\s*directive:\s*([\w-]+)\s+(.*)$/,
+            CLASS_DIRECTIVE_REGEXP = /(([\w-]+)(?::([^;]+))?;?)/,
+            ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'),
+            REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/;
 
         // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes
         // The assumption is that future DOM event attribute names will begin with
         // 'on' and be composed of only English letters.
         var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/;
+        var bindingCache = createMap();
+
+        function parseIsolateBindings(scope, directiveName, isController) {
+            var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/;
+
+            var bindings = createMap();
+
+            forEach(scope, function(definition, scopeName) {
+                if (definition in bindingCache) {
+                    bindings[scopeName] = bindingCache[definition];
+                    return;
+                }
+                var match = definition.match(LOCAL_REGEXP);
+
+                if (!match) {
+                    throw $compileMinErr('iscp',
+                        'Invalid {3} for directive \'{0}\'.' +
+                        ' Definition: {... {1}: \'{2}\' ...}',
+                        directiveName, scopeName, definition,
+                        (isController ? 'controller bindings definition' :
+                            'isolate scope definition'));
+                }
+
+                bindings[scopeName] = {
+                    mode: match[1][0],
+                    collection: match[2] === '*',
+                    optional: match[3] === '?',
+                    attrName: match[4] || scopeName
+                };
+                if (match[4]) {
+                    bindingCache[definition] = bindings[scopeName];
+                }
+            });
+
+            return bindings;
+        }
+
+        function parseDirectiveBindings(directive, directiveName) {
+            var bindings = {
+                isolateScope: null,
+                bindToController: null
+            };
+            if (isObject(directive.scope)) {
+                if (directive.bindToController === true) {
+                    bindings.bindToController = parseIsolateBindings(directive.scope,
+                        directiveName, true);
+                    bindings.isolateScope = {};
+                } else {
+                    bindings.isolateScope = parseIsolateBindings(directive.scope,
+                        directiveName, false);
+                }
+            }
+            if (isObject(directive.bindToController)) {
+                bindings.bindToController =
+                    parseIsolateBindings(directive.bindToController, directiveName, true);
+            }
+            if (bindings.bindToController && !directive.controller) {
+                // There is no controller
+                throw $compileMinErr('noctrl',
+                    'Cannot bind to controller without directive \'{0}\'s controller.',
+                    directiveName);
+            }
+            return bindings;
+        }
+
+        function assertValidDirectiveName(name) {
+            var letter = name.charAt(0);
+            if (!letter || letter !== lowercase(letter)) {
+                throw $compileMinErr('baddir', 'Directive/Component name \'{0}\' is invalid. The first character must be a lowercase letter', name);
+            }
+            if (name !== name.trim()) {
+                throw $compileMinErr('baddir',
+                    'Directive/Component name \'{0}\' is invalid. The name should not contain leading or trailing whitespaces',
+                    name);
+            }
+        }
+
+        function getDirectiveRequire(directive) {
+            var require = directive.require || (directive.controller && directive.name);
+
+            if (!isArray(require) && isObject(require)) {
+                forEach(require, function(value, key) {
+                    var match = value.match(REQUIRE_PREFIX_REGEXP);
+                    var name = value.substring(match[0].length);
+                    if (!name) require[key] = match[0] + key;
+                });
+            }
+
+            return require;
+        }
+
+        function getDirectiveRestrict(restrict, name) {
+            if (restrict && !(isString(restrict) && /[EACM]/.test(restrict))) {
+                throw $compileMinErr('badrestrict',
+                    'Restrict property \'{0}\' of directive \'{1}\' is invalid',
+                    restrict,
+                    name);
+            }
+
+            return restrict || 'EA';
+        }
 
         /**
          * @ngdoc method
          * @name $compileProvider#directive
-         * @function
+         * @kind function
          *
          * @description
          * Register a new directive with the compiler.
@@ -5562,13 +8247,15 @@
          * @param {string|Object} name Name of the directive in camel-case (i.e. <code>ngBind</code> which
          *    will match as <code>ng-bind</code>), or an object map of directives where the keys are the
          *    names and the values are the factories.
-         * @param {Function|Array} directiveFactory An injectable directive factory function. See
-         *    {@link guide/directive} for more info.
+         * @param {Function|Array} directiveFactory An injectable directive factory function. See the
+         *    {@link guide/directive directive guide} and the {@link $compile compile API} for more info.
          * @returns {ng.$compileProvider} Self for chaining.
          */
         this.directive = function registerDirective(name, directiveFactory) {
+            assertArg(name, 'name');
             assertNotHasOwnProperty(name, 'directive');
             if (isString(name)) {
+                assertValidDirectiveName(name);
                 assertArg(directiveFactory, 'directiveFactory');
                 if (!hasDirectives.hasOwnProperty(name)) {
                     hasDirectives[name] = [];
@@ -5586,8 +8273,9 @@
                                     directive.priority = directive.priority || 0;
                                     directive.index = index;
                                     directive.name = directive.name || name;
-                                    directive.require = directive.require || (directive.controller && directive.name);
-                                    directive.restrict = directive.restrict || 'A';
+                                    directive.require = getDirectiveRequire(directive);
+                                    directive.restrict = getDirectiveRestrict(directive.restrict, name);
+                                    directive.$$moduleName = directiveFactory.$$moduleName;
                                     directives.push(directive);
                                 } catch (e) {
                                     $exceptionHandler(e);
@@ -5603,17 +8291,164 @@
             return this;
         };
 
+        /**
+         * @ngdoc method
+         * @name $compileProvider#component
+         * @module ng
+         * @param {string|Object} name Name of the component in camelCase (i.e. `myComp` which will match `<my-comp>`),
+         *    or an object map of components where the keys are the names and the values are the component definition objects.
+         * @param {Object} options Component definition object (a simplified
+         *    {@link ng.$compile#directive-definition-object directive definition object}),
+         *    with the following properties (all optional):
+         *
+         *    - `controller` – `{(string|function()=}` – controller constructor function that should be
+         *      associated with newly created scope or the name of a {@link ng.$compile#-controller-
+   *      registered controller} if passed as a string. An empty `noop` function by default.
+         *    - `controllerAs` – `{string=}` – identifier name for to reference the controller in the component's scope.
+         *      If present, the controller will be published to scope under the `controllerAs` name.
+         *      If not present, this will default to be `$ctrl`.
+         *    - `template` – `{string=|function()=}` – html template as a string or a function that
+         *      returns an html template as a string which should be used as the contents of this component.
+         *      Empty string by default.
+         *
+         *      If `template` is a function, then it is {@link auto.$injector#invoke injected} with
+         *      the following locals:
+         *
+         *      - `$element` - Current element
+         *      - `$attrs` - Current attributes object for the element
+         *
+         *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
+         *      template that should be used  as the contents of this component.
+         *
+         *      If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with
+         *      the following locals:
+         *
+         *      - `$element` - Current element
+         *      - `$attrs` - Current attributes object for the element
+         *
+         *    - `bindings` – `{object=}` – defines bindings between DOM attributes and component properties.
+         *      Component properties are always bound to the component controller and not to the scope.
+         *      See {@link ng.$compile#-bindtocontroller- `bindToController`}.
+         *    - `transclude` – `{boolean=}` – whether {@link $compile#transclusion content transclusion} is enabled.
+         *      Disabled by default.
+         *    - `require` - `{Object<string, string>=}` - requires the controllers of other directives and binds them to
+         *      this component's controller. The object keys specify the property names under which the required
+         *      controllers (object values) will be bound. See {@link ng.$compile#-require- `require`}.
+         *    - `$...` – additional properties to attach to the directive factory function and the controller
+         *      constructor function. (This is used by the component router to annotate)
+         *
+         * @returns {ng.$compileProvider} the compile provider itself, for chaining of function calls.
+         * @description
+         * Register a **component definition** with the compiler. This is a shorthand for registering a special
+         * type of directive, which represents a self-contained UI component in your application. Such components
+         * are always isolated (i.e. `scope: {}`) and are always restricted to elements (i.e. `restrict: 'E'`).
+         *
+         * Component definitions are very simple and do not require as much configuration as defining general
+         * directives. Component definitions usually consist only of a template and a controller backing it.
+         *
+         * In order to make the definition easier, components enforce best practices like use of `controllerAs`,
+         * `bindToController`. They always have **isolate scope** and are restricted to elements.
+         *
+         * Here are a few examples of how you would usually define components:
+         *
+         * ```js
+         *   var myMod = angular.module(...);
+         *   myMod.component('myComp', {
+         *     template: '<div>My name is {{$ctrl.name}}</div>',
+         *     controller: function() {
+         *       this.name = 'shahar';
+         *     }
+         *   });
+         *
+         *   myMod.component('myComp', {
+         *     template: '<div>My name is {{$ctrl.name}}</div>',
+         *     bindings: {name: '@'}
+         *   });
+         *
+         *   myMod.component('myComp', {
+         *     templateUrl: 'views/my-comp.html',
+         *     controller: 'MyCtrl',
+         *     controllerAs: 'ctrl',
+         *     bindings: {name: '@'}
+         *   });
+         *
+         * ```
+         * For more examples, and an in-depth guide, see the {@link guide/component component guide}.
+         *
+         * <br />
+         * See also {@link ng.$compileProvider#directive $compileProvider.directive()}.
+         */
+        this.component = function registerComponent(name, options) {
+            if (!isString(name)) {
+                forEach(name, reverseParams(bind(this, registerComponent)));
+                return this;
+            }
+
+            var controller = options.controller || function() {};
+
+            function factory($injector) {
+                function makeInjectable(fn) {
+                    if (isFunction(fn) || isArray(fn)) {
+                        return /** @this */ function(tElement, tAttrs) {
+                            return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs});
+                        };
+                    } else {
+                        return fn;
+                    }
+                }
+
+                var template = (!options.template && !options.templateUrl ? '' : options.template);
+                var ddo = {
+                    controller: controller,
+                    controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
+                    template: makeInjectable(template),
+                    templateUrl: makeInjectable(options.templateUrl),
+                    transclude: options.transclude,
+                    scope: {},
+                    bindToController: options.bindings || {},
+                    restrict: 'E',
+                    require: options.require
+                };
+
+                // Copy annotations (starting with $) over to the DDO
+                forEach(options, function(val, key) {
+                    if (key.charAt(0) === '$') ddo[key] = val;
+                });
+
+                return ddo;
+            }
+
+            // TODO(pete) remove the following `forEach` before we release 1.6.0
+            // The component-router@0.2.0 looks for the annotations on the controller constructor
+            // Nothing in AngularJS looks for annotations on the factory function but we can't remove
+            // it from 1.5.x yet.
+
+            // Copy any annotation properties (starting with $) over to the factory and controller constructor functions
+            // These could be used by libraries such as the new component router
+            forEach(options, function(val, key) {
+                if (key.charAt(0) === '$') {
+                    factory[key] = val;
+                    // Don't try to copy over annotations to named controller
+                    if (isFunction(controller)) controller[key] = val;
+                }
+            });
+
+            factory.$inject = ['$injector'];
+
+            return this.directive(name, factory);
+        };
+
 
         /**
          * @ngdoc method
          * @name $compileProvider#aHrefSanitizationWhitelist
-         * @function
+         * @kind function
          *
          * @description
          * Retrieves or overrides the default regular expression that is used for whitelisting of safe
          * urls during a[href] sanitization.
          *
-         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+         * The sanitization is a security measure aimed at preventing XSS attacks via html links.
          *
          * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
          * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
@@ -5637,7 +8472,7 @@
         /**
          * @ngdoc method
          * @name $compileProvider#imgSrcSanitizationWhitelist
-         * @function
+         * @kind function
          *
          * @description
          * Retrieves or overrides the default regular expression that is used for whitelisting of safe
@@ -5663,42 +8498,295 @@
             }
         };
 
-        this.$get = [
-            '$injector', '$interpolate', '$exceptionHandler', '$http', '$templateCache', '$parse',
-            '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri',
-            function($injector,   $interpolate,   $exceptionHandler,   $http,   $templateCache,   $parse,
-                     $controller,   $rootScope,   $document,   $sce,   $animate,   $$sanitizeUri) {
-
-                var Attributes = function(element, attr) {
-                    this.$$element = element;
-                    this.$attr = attr || {};
-                };
+        /**
+         * @ngdoc method
+         * @name  $compileProvider#debugInfoEnabled
+         *
+         * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the
+         * current debugInfoEnabled state
+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         *
+         * @kind function
+         *
+         * @description
+         * Call this method to enable/disable various debug runtime information in the compiler such as adding
+         * binding information and a reference to the current scope on to DOM elements.
+         * If enabled, the compiler will add the following to DOM elements that have been bound to the scope
+         * * `ng-binding` CSS class
+         * * `ng-scope` and `ng-isolated-scope` CSS classes
+         * * `$binding` data property containing an array of the binding expressions
+         * * Data properties used by the {@link angular.element#methods `scope()`/`isolateScope()` methods} to return
+         *   the element's scope.
+         * * Placeholder comments will contain information about what directive and binding caused the placeholder.
+         *   E.g. `<!-- ngIf: shouldShow() -->`.
+         *
+         * You may want to disable this in production for a significant performance boost. See
+         * {@link guide/production#disabling-debug-data Disabling Debug Data} for more.
+         *
+         * The default value is true.
+         */
+        var debugInfoEnabled = true;
+        this.debugInfoEnabled = function(enabled) {
+            if (isDefined(enabled)) {
+                debugInfoEnabled = enabled;
+                return this;
+            }
+            return debugInfoEnabled;
+        };
 
-                Attributes.prototype = {
-                    $normalize: directiveNormalize,
+        /**
+         * @ngdoc method
+         * @name  $compileProvider#preAssignBindingsEnabled
+         *
+         * @param {boolean=} enabled update the preAssignBindingsEnabled state if provided, otherwise just return the
+         * current preAssignBindingsEnabled state
+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         *
+         * @kind function
+         *
+         * @description
+         * Call this method to enable/disable whether directive controllers are assigned bindings before
+         * calling the controller's constructor.
+         * If enabled (true), the compiler assigns the value of each of the bindings to the
+         * properties of the controller object before the constructor of this object is called.
+         *
+         * If disabled (false), the compiler calls the constructor first before assigning bindings.
+         *
+         * The default value is false.
+         *
+         * @deprecated
+         * sinceVersion="1.6.0"
+         * removeVersion="1.7.0"
+         *
+         * This method and the option to assign the bindings before calling the controller's constructor
+         * will be removed in v1.7.0.
+         */
+        var preAssignBindingsEnabled = false;
+        this.preAssignBindingsEnabled = function(enabled) {
+            if (isDefined(enabled)) {
+                preAssignBindingsEnabled = enabled;
+                return this;
+            }
+            return preAssignBindingsEnabled;
+        };
 
+        /**
+         * @ngdoc method
+         * @name  $compileProvider#strictComponentBindingsEnabled
+         *
+         * @param {boolean=} enabled update the strictComponentBindingsEnabled state if provided, otherwise just return the
+         * current strictComponentBindingsEnabled state
+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         *
+         * @kind function
+         *
+         * @description
+         * Call this method to enable/disable strict component bindings check. If enabled, the compiler will enforce that
+         * for all bindings of a component that are not set as optional with `?`, an attribute needs to be provided
+         * on the component's HTML tag.
+         *
+         * The default value is false.
+         */
+        var strictComponentBindingsEnabled = false;
+        this.strictComponentBindingsEnabled = function(enabled) {
+            if (isDefined(enabled)) {
+                strictComponentBindingsEnabled = enabled;
+                return this;
+            }
+            return strictComponentBindingsEnabled;
+        };
 
-                    /**
-                     * @ngdoc method
-                     * @name $compile.directive.Attributes#$addClass
-                     * @function
-                     *
-                     * @description
-                     * Adds the CSS class value specified by the classVal parameter to the element. If animations
-                     * are enabled then an animation will be triggered for the class addition.
-                     *
-                     * @param {string} classVal The className value that will be added to the element
-                     */
-                    $addClass : function(classVal) {
-                        if(classVal && classVal.length > 0) {
-                            $animate.addClass(this.$$element, classVal);
+        var TTL = 10;
+        /**
+         * @ngdoc method
+         * @name $compileProvider#onChangesTtl
+         * @description
+         *
+         * Sets the number of times `$onChanges` hooks can trigger new changes before giving up and
+         * assuming that the model is unstable.
+         *
+         * The current default is 10 iterations.
+         *
+         * In complex applications it's possible that dependencies between `$onChanges` hooks and bindings will result
+         * in several iterations of calls to these hooks. However if an application needs more than the default 10
+         * iterations to stabilize then you should investigate what is causing the model to continuously change during
+         * the `$onChanges` hook execution.
+         *
+         * Increasing the TTL could have performance implications, so you should not change it without proper justification.
+         *
+         * @param {number} limit The number of `$onChanges` hook iterations.
+         * @returns {number|object} the current limit (or `this` if called as a setter for chaining)
+         */
+        this.onChangesTtl = function(value) {
+            if (arguments.length) {
+                TTL = value;
+                return this;
+            }
+            return TTL;
+        };
+
+        var commentDirectivesEnabledConfig = true;
+        /**
+         * @ngdoc method
+         * @name $compileProvider#commentDirectivesEnabled
+         * @description
+         *
+         * It indicates to the compiler
+         * whether or not directives on comments should be compiled.
+         * Defaults to `true`.
+         *
+         * Calling this function with false disables the compilation of directives
+         * on comments for the whole application.
+         * This results in a compilation performance gain,
+         * as the compiler doesn't have to check comments when looking for directives.
+         * This should however only be used if you are sure that no comment directives are used in
+         * the application (including any 3rd party directives).
+         *
+         * @param {boolean} enabled `false` if the compiler may ignore directives on comments
+         * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
+         */
+        this.commentDirectivesEnabled = function(value) {
+            if (arguments.length) {
+                commentDirectivesEnabledConfig = value;
+                return this;
+            }
+            return commentDirectivesEnabledConfig;
+        };
+
+
+        var cssClassDirectivesEnabledConfig = true;
+        /**
+         * @ngdoc method
+         * @name $compileProvider#cssClassDirectivesEnabled
+         * @description
+         *
+         * It indicates to the compiler
+         * whether or not directives on element classes should be compiled.
+         * Defaults to `true`.
+         *
+         * Calling this function with false disables the compilation of directives
+         * on element classes for the whole application.
+         * This results in a compilation performance gain,
+         * as the compiler doesn't have to check element classes when looking for directives.
+         * This should however only be used if you are sure that no class directives are used in
+         * the application (including any 3rd party directives).
+         *
+         * @param {boolean} enabled `false` if the compiler may ignore directives on element classes
+         * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
+         */
+        this.cssClassDirectivesEnabled = function(value) {
+            if (arguments.length) {
+                cssClassDirectivesEnabledConfig = value;
+                return this;
+            }
+            return cssClassDirectivesEnabledConfig;
+        };
+
+        this.$get = [
+            '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
+            '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri',
+            function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
+                     $controller,   $rootScope,   $sce,   $animate,   $$sanitizeUri) {
+
+                var SIMPLE_ATTR_NAME = /^\w/;
+                var specialAttrHolder = window.document.createElement('div');
+
+
+                var commentDirectivesEnabled = commentDirectivesEnabledConfig;
+                var cssClassDirectivesEnabled = cssClassDirectivesEnabledConfig;
+
+
+                var onChangesTtl = TTL;
+                // The onChanges hooks should all be run together in a single digest
+                // When changes occur, the call to trigger their hooks will be added to this queue
+                var onChangesQueue;
+
+                // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest
+                function flushOnChangesQueue() {
+                    try {
+                        if (!(--onChangesTtl)) {
+                            // We have hit the TTL limit so reset everything
+                            onChangesQueue = undefined;
+                            throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL);
+                        }
+                        // We must run this hook in an apply since the $$postDigest runs outside apply
+                        $rootScope.$apply(function() {
+                            var errors = [];
+                            for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
+                                try {
+                                    onChangesQueue[i]();
+                                } catch (e) {
+                                    errors.push(e);
+                                }
+                            }
+                            // Reset the queue to trigger a new schedule next time there is a change
+                            onChangesQueue = undefined;
+                            if (errors.length) {
+                                throw errors;
+                            }
+                        });
+                    } finally {
+                        onChangesTtl++;
+                    }
+                }
+
+
+                function Attributes(element, attributesToCopy) {
+                    if (attributesToCopy) {
+                        var keys = Object.keys(attributesToCopy);
+                        var i, l, key;
+
+                        for (i = 0, l = keys.length; i < l; i++) {
+                            key = keys[i];
+                            this[key] = attributesToCopy[key];
+                        }
+                    } else {
+                        this.$attr = {};
+                    }
+
+                    this.$$element = element;
+                }
+
+                Attributes.prototype = {
+                    /**
+                     * @ngdoc method
+                     * @name $compile.directive.Attributes#$normalize
+                     * @kind function
+                     *
+                     * @description
+                     * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
+                     * `data-`) to its normalized, camelCase form.
+                     *
+                     * Also there is special case for Moz prefix starting with upper case letter.
+                     *
+                     * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+                     *
+                     * @param {string} name Name to normalize
+                     */
+                    $normalize: directiveNormalize,
+
+
+                    /**
+                     * @ngdoc method
+                     * @name $compile.directive.Attributes#$addClass
+                     * @kind function
+                     *
+                     * @description
+                     * Adds the CSS class value specified by the classVal parameter to the element. If animations
+                     * are enabled then an animation will be triggered for the class addition.
+                     *
+                     * @param {string} classVal The className value that will be added to the element
+                     */
+                    $addClass: function(classVal) {
+                        if (classVal && classVal.length > 0) {
+                            $animate.addClass(this.$$element, classVal);
                         }
                     },
 
                     /**
                      * @ngdoc method
                      * @name $compile.directive.Attributes#$removeClass
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Removes the CSS class value specified by the classVal parameter from the element. If
@@ -5706,8 +8794,8 @@
                      *
                      * @param {string} classVal The className value that will be removed from the element
                      */
-                    $removeClass : function(classVal) {
-                        if(classVal && classVal.length > 0) {
+                    $removeClass: function(classVal) {
+                        if (classVal && classVal.length > 0) {
                             $animate.removeClass(this.$$element, classVal);
                         }
                     },
@@ -5715,7 +8803,7 @@
                     /**
                      * @ngdoc method
                      * @name $compile.directive.Attributes#$updateClass
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Adds and removes the appropriate CSS class values to the element based on the difference
@@ -5724,16 +8812,15 @@
                      * @param {string} newClasses The current CSS className value
                      * @param {string} oldClasses The former CSS className value
                      */
-                    $updateClass : function(newClasses, oldClasses) {
+                    $updateClass: function(newClasses, oldClasses) {
                         var toAdd = tokenDifference(newClasses, oldClasses);
-                        var toRemove = tokenDifference(oldClasses, newClasses);
+                        if (toAdd && toAdd.length) {
+                            $animate.addClass(this.$$element, toAdd);
+                        }
 
-                        if(toAdd.length === 0) {
+                        var toRemove = tokenDifference(oldClasses, newClasses);
+                        if (toRemove && toRemove.length) {
                             $animate.removeClass(this.$$element, toRemove);
-                        } else if(toRemove.length === 0) {
-                            $animate.addClass(this.$$element, toAdd);
-                        } else {
-                            $animate.setClass(this.$$element, toAdd, toRemove);
                         }
                     },
 
@@ -5751,13 +8838,18 @@
                         //is set through this function since it may cause $updateClass to
                         //become unstable.
 
-                        var booleanKey = getBooleanAttrName(this.$$element[0], key),
-                            normalizedVal,
+                        var node = this.$$element[0],
+                            booleanKey = getBooleanAttrName(node, key),
+                            aliasedKey = getAliasedAttrName(key),
+                            observer = key,
                             nodeName;
 
                         if (booleanKey) {
                             this.$$element.prop(key, value);
                             attrName = booleanKey;
+                        } else if (aliasedKey) {
+                            this[aliasedKey] = value;
+                            observer = aliasedKey;
                         }
 
                         this[key] = value;
@@ -5774,36 +8866,76 @@
 
                         nodeName = nodeName_(this.$$element);
 
-                        // sanitize a[href] and img[src] values
-                        if ((nodeName === 'A' && key === 'href') ||
-                            (nodeName === 'IMG' && key === 'src')) {
+                        if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) ||
+                            (nodeName === 'img' && key === 'src')) {
+                            // sanitize a[href] and img[src] values
                             this[key] = value = $$sanitizeUri(value, key === 'src');
+                        } else if (nodeName === 'img' && key === 'srcset' && isDefined(value)) {
+                            // sanitize img[srcset] values
+                            var result = '';
+
+                            // first check if there are spaces because it's not the same pattern
+                            var trimmedSrcset = trim(value);
+                            //                (   999x   ,|   999w   ,|   ,|,   )
+                            var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/;
+                            var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/;
+
+                            // split srcset into tuple of uri and descriptor except for the last item
+                            var rawUris = trimmedSrcset.split(pattern);
+
+                            // for each tuples
+                            var nbrUrisWith2parts = Math.floor(rawUris.length / 2);
+                            for (var i = 0; i < nbrUrisWith2parts; i++) {
+                                var innerIdx = i * 2;
+                                // sanitize the uri
+                                result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
+                                // add the descriptor
+                                result += (' ' + trim(rawUris[innerIdx + 1]));
+                            }
+
+                            // split the last item into uri and descriptor
+                            var lastTuple = trim(rawUris[i * 2]).split(/\s/);
+
+                            // sanitize the last uri
+                            result += $$sanitizeUri(trim(lastTuple[0]), true);
+
+                            // and add the last descriptor if any
+                            if (lastTuple.length === 2) {
+                                result += (' ' + trim(lastTuple[1]));
+                            }
+                            this[key] = value = result;
                         }
 
                         if (writeAttr !== false) {
-                            if (value === null || value === undefined) {
+                            if (value === null || isUndefined(value)) {
                                 this.$$element.removeAttr(attrName);
                             } else {
-                                this.$$element.attr(attrName, value);
+                                if (SIMPLE_ATTR_NAME.test(attrName)) {
+                                    this.$$element.attr(attrName, value);
+                                } else {
+                                    setSpecialAttr(this.$$element[0], attrName, value);
+                                }
                             }
                         }
 
                         // fire observers
                         var $$observers = this.$$observers;
-                        $$observers && forEach($$observers[key], function(fn) {
-                            try {
-                                fn(value);
-                            } catch (e) {
-                                $exceptionHandler(e);
-                            }
-                        });
+                        if ($$observers) {
+                            forEach($$observers[observer], function(fn) {
+                                try {
+                                    fn(value);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            });
+                        }
                     },
 
 
                     /**
                      * @ngdoc method
                      * @name $compile.directive.Attributes#$observe
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Observes an interpolated attribute.
@@ -5815,34 +8947,95 @@
                      * @param {string} key Normalized key. (ie ngAttribute) .
                      * @param {function(interpolatedValue)} fn Function that will be called whenever
                      the interpolated value of the attribute changes.
-                     *        See the {@link guide/directive#Attributes Directives} guide for more info.
-                     * @returns {function()} the `fn` parameter.
+                     *        See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation
+       *        guide} for more info.
+                     * @returns {function()} Returns a deregistration function for this observer.
                      */
                     $observe: function(key, fn) {
                         var attrs = this,
-                            $$observers = (attrs.$$observers || (attrs.$$observers = {})),
+                            $$observers = (attrs.$$observers || (attrs.$$observers = createMap())),
                             listeners = ($$observers[key] || ($$observers[key] = []));
 
                         listeners.push(fn);
                         $rootScope.$evalAsync(function() {
-                            if (!listeners.$$inter) {
+                            if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) {
                                 // no one registered attribute interpolation function, so lets call it manually
                                 fn(attrs[key]);
                             }
                         });
-                        return fn;
+
+                        return function() {
+                            arrayRemove(listeners, fn);
+                        };
                     }
                 };
 
+                function setSpecialAttr(element, attrName, value) {
+                    // Attributes names that do not start with letters (such as `(click)`) cannot be set using `setAttribute`
+                    // so we have to jump through some hoops to get such an attribute
+                    // https://github.com/angular/angular.js/pull/13318
+                    specialAttrHolder.innerHTML = '<span ' + attrName + '>';
+                    var attributes = specialAttrHolder.firstChild.attributes;
+                    var attribute = attributes[0];
+                    // We have to remove the attribute from its container element before we can add it to the destination element
+                    attributes.removeNamedItem(attribute.name);
+                    attribute.value = value;
+                    element.attributes.setNamedItem(attribute);
+                }
+
+                function safeAddClass($element, className) {
+                    try {
+                        $element.addClass(className);
+                    } catch (e) {
+                        // ignore, since it means that we are trying to set class on
+                        // SVG element, where class name is read-only.
+                    }
+                }
+
+
                 var startSymbol = $interpolate.startSymbol(),
                     endSymbol = $interpolate.endSymbol(),
-                    denormalizeTemplate = (startSymbol == '{{' || endSymbol  == '}}')
+                    denormalizeTemplate = (startSymbol === '{{' && endSymbol  === '}}')
                         ? identity
                         : function denormalizeTemplate(template) {
-                        return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
-                    },
+                            return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
+                        },
                     NG_ATTR_BINDING = /^ngAttr[A-Z]/;
+                var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/;
+
+                compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) {
+                    var bindings = $element.data('$binding') || [];
 
+                    if (isArray(binding)) {
+                        bindings = bindings.concat(binding);
+                    } else {
+                        bindings.push(binding);
+                    }
+
+                    $element.data('$binding', bindings);
+                } : noop;
+
+                compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) {
+                    safeAddClass($element, 'ng-binding');
+                } : noop;
+
+                compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) {
+                    var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope';
+                    $element.data(dataName, scope);
+                } : noop;
+
+                compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) {
+                    safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope');
+                } : noop;
+
+                compile.$$createComment = function(directiveName, comment) {
+                    var content = '';
+                    if (debugInfoEnabled) {
+                        content = ' ' + (directiveName || '') + ': ';
+                        if (comment) content += comment + ' ';
+                    }
+                    return window.document.createComment(content);
+                };
 
                 return compile;
 
@@ -5855,50 +9048,84 @@
                         // modify it.
                         $compileNodes = jqLite($compileNodes);
                     }
-                    // We can not compile top level text elements since text nodes can be merged and we will
-                    // not be able to attach scope data to them, so we will wrap them in <span>
-                    forEach($compileNodes, function(node, index){
-                        if (node.nodeType == 3 /* text node */ && node.nodeValue.match(/\S+/) /* non-empty */ ) {
-                            $compileNodes[index] = node = jqLite(node).wrap('<span></span>').parent()[0];
-                        }
-                    });
                     var compositeLinkFn =
                         compileNodes($compileNodes, transcludeFn, $compileNodes,
                             maxPriority, ignoreDirective, previousCompileContext);
-                    safeAddClass($compileNodes, 'ng-scope');
-                    return function publicLinkFn(scope, cloneConnectFn, transcludeControllers){
+                    compile.$$addScopeClass($compileNodes);
+                    var namespace = null;
+                    return function publicLinkFn(scope, cloneConnectFn, options) {
+                        if (!$compileNodes) {
+                            throw $compileMinErr('multilink', 'This element has already been linked.');
+                        }
                         assertArg(scope, 'scope');
-                        // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
-                        // and sometimes changes the structure of the DOM.
-                        var $linkNode = cloneConnectFn
-                            ? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!!
-                            : $compileNodes;
-
-                        forEach(transcludeControllers, function(instance, name) {
-                            $linkNode.data('$' + name + 'Controller', instance);
-                        });
 
-                        // Attach scope only to non-text nodes.
-                        for(var i = 0, ii = $linkNode.length; i<ii; i++) {
-                            var node = $linkNode[i],
-                                nodeType = node.nodeType;
-                            if (nodeType === 1 /* element */ || nodeType === 9 /* document */) {
-                                $linkNode.eq(i).data('$scope', scope);
+                        if (previousCompileContext && previousCompileContext.needsNewScope) {
+                            // A parent directive did a replace and a directive on this element asked
+                            // for transclusion, which caused us to lose a layer of element on which
+                            // we could hold the new transclusion scope, so we will create it manually
+                            // here.
+                            scope = scope.$parent.$new();
+                        }
+
+                        options = options || {};
+                        var parentBoundTranscludeFn = options.parentBoundTranscludeFn,
+                            transcludeControllers = options.transcludeControllers,
+                            futureParentElement = options.futureParentElement;
+
+                        // When `parentBoundTranscludeFn` is passed, it is a
+                        // `controllersBoundTransclude` function (it was previously passed
+                        // as `transclude` to directive.link) so we must unwrap it to get
+                        // its `boundTranscludeFn`
+                        if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) {
+                            parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude;
+                        }
+
+                        if (!namespace) {
+                            namespace = detectNamespaceForChildElements(futureParentElement);
+                        }
+                        var $linkNode;
+                        if (namespace !== 'html') {
+                            // When using a directive with replace:true and templateUrl the $compileNodes
+                            // (or a child element inside of them)
+                            // might change, so we need to recreate the namespace adapted compileNodes
+                            // for call to the link function.
+                            // Note: This will already clone the nodes...
+                            $linkNode = jqLite(
+                                wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
+                            );
+                        } else if (cloneConnectFn) {
+                            // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
+                            // and sometimes changes the structure of the DOM.
+                            $linkNode = JQLitePrototype.clone.call($compileNodes);
+                        } else {
+                            $linkNode = $compileNodes;
+                        }
+
+                        if (transcludeControllers) {
+                            for (var controllerName in transcludeControllers) {
+                                $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance);
                             }
                         }
 
+                        compile.$$addScopeInfo($linkNode, scope);
+
                         if (cloneConnectFn) cloneConnectFn($linkNode, scope);
-                        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode);
+                        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
+
+                        if (!cloneConnectFn) {
+                            $compileNodes = compositeLinkFn = null;
+                        }
                         return $linkNode;
                     };
                 }
 
-                function safeAddClass($element, className) {
-                    try {
-                        $element.addClass(className);
-                    } catch(e) {
-                        // ignore, since it means that we are trying to set class on
-                        // SVG element, where class name is read-only.
+                function detectNamespaceForChildElements(parentElement) {
+                    // TODO: Make this detect MathML as well...
+                    var node = parentElement && parentElement[0];
+                    if (!node) {
+                        return 'html';
+                    } else {
+                        return nodeName_(node) !== 'foreignobject' && toString.call(node).match(/SVG/) ? 'svg' : 'html';
                     }
                 }
 
@@ -5920,33 +9147,50 @@
                 function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective,
                                       previousCompileContext) {
                     var linkFns = [],
-                        attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound;
+                        // `nodeList` can be either an element's `.childNodes` (live NodeList)
+                        // or a jqLite/jQuery collection or an array
+                        notLiveList = isArray(nodeList) || (nodeList instanceof jqLite),
+                        attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound;
+
 
                     for (var i = 0; i < nodeList.length; i++) {
                         attrs = new Attributes();
 
-                        // we must always refer to nodeList[i] since the nodes can be replaced underneath us.
+                        // Support: IE 11 only
+                        // Workaround for #11781 and #14924
+                        if (msie === 11) {
+                            mergeConsecutiveTextNodes(nodeList, i, notLiveList);
+                        }
+
+                        // We must always refer to `nodeList[i]` hereafter,
+                        // since the nodes can be replaced underneath us.
                         directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined,
                             ignoreDirective);
 
                         nodeLinkFn = (directives.length)
                             ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
-                            null, [], [], previousCompileContext)
+                                null, [], [], previousCompileContext)
                             : null;
 
                         if (nodeLinkFn && nodeLinkFn.scope) {
-                            safeAddClass(jqLite(nodeList[i]), 'ng-scope');
+                            compile.$$addScopeClass(attrs.$$element);
                         }
 
                         childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
-                        !(childNodes = nodeList[i].childNodes) ||
-                        !childNodes.length)
+                            !(childNodes = nodeList[i].childNodes) ||
+                            !childNodes.length)
                             ? null
                             : compileNodes(childNodes,
-                            nodeLinkFn ? nodeLinkFn.transclude : transcludeFn);
+                                nodeLinkFn ? (
+                                    (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement)
+                                    && nodeLinkFn.transclude) : transcludeFn);
+
+                        if (nodeLinkFn || childLinkFn) {
+                            linkFns.push(i, nodeLinkFn, childLinkFn);
+                            linkFnFound = true;
+                            nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn;
+                        }
 
-                        linkFns.push(nodeLinkFn, childLinkFn);
-                        linkFnFound = linkFnFound || nodeLinkFn || childLinkFn;
                         //use the previous context only for the first element in the virtual group
                         previousCompileContext = null;
                     }
@@ -5954,60 +9198,115 @@
                     // return a linking function if we have found anything, null otherwise
                     return linkFnFound ? compositeLinkFn : null;
 
-                    function compositeLinkFn(scope, nodeList, $rootElement, boundTranscludeFn) {
-                        var nodeLinkFn, childLinkFn, node, $node, childScope, childTranscludeFn, i, ii, n;
+                    function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
+                        var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn;
+                        var stableNodeList;
 
-                        // copy nodeList so that linking doesn't break due to live list updates.
-                        var nodeListLength = nodeList.length,
+
+                        if (nodeLinkFnFound) {
+                            // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our
+                            // offsets don't get screwed up
+                            var nodeListLength = nodeList.length;
                             stableNodeList = new Array(nodeListLength);
-                        for (i = 0; i < nodeListLength; i++) {
-                            stableNodeList[i] = nodeList[i];
+
+                            // create a sparse array by only copying the elements which have a linkFn
+                            for (i = 0; i < linkFns.length; i += 3) {
+                                idx = linkFns[i];
+                                stableNodeList[idx] = nodeList[idx];
+                            }
+                        } else {
+                            stableNodeList = nodeList;
                         }
 
-                        for(i = 0, n = 0, ii = linkFns.length; i < ii; n++) {
-                            node = stableNodeList[n];
+                        for (i = 0, ii = linkFns.length; i < ii;) {
+                            node = stableNodeList[linkFns[i++]];
                             nodeLinkFn = linkFns[i++];
                             childLinkFn = linkFns[i++];
-                            $node = jqLite(node);
 
                             if (nodeLinkFn) {
                                 if (nodeLinkFn.scope) {
                                     childScope = scope.$new();
-                                    $node.data('$scope', childScope);
+                                    compile.$$addScopeInfo(jqLite(node), childScope);
                                 } else {
                                     childScope = scope;
                                 }
-                                childTranscludeFn = nodeLinkFn.transclude;
-                                if (childTranscludeFn || (!boundTranscludeFn && transcludeFn)) {
-                                    nodeLinkFn(childLinkFn, childScope, node, $rootElement,
-                                        createBoundTranscludeFn(scope, childTranscludeFn || transcludeFn)
-                                    );
+
+                                if (nodeLinkFn.transcludeOnThisElement) {
+                                    childBoundTranscludeFn = createBoundTranscludeFn(
+                                        scope, nodeLinkFn.transclude, parentBoundTranscludeFn);
+
+                                } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
+                                    childBoundTranscludeFn = parentBoundTranscludeFn;
+
+                                } else if (!parentBoundTranscludeFn && transcludeFn) {
+                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn);
+
                                 } else {
-                                    nodeLinkFn(childLinkFn, childScope, node, $rootElement, boundTranscludeFn);
+                                    childBoundTranscludeFn = null;
                                 }
+
+                                nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn);
+
                             } else if (childLinkFn) {
-                                childLinkFn(scope, node.childNodes, undefined, boundTranscludeFn);
+                                childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn);
                             }
                         }
                     }
                 }
 
-                function createBoundTranscludeFn(scope, transcludeFn) {
-                    return function boundTranscludeFn(transcludedScope, cloneFn, controllers) {
-                        var scopeCreated = false;
+                function mergeConsecutiveTextNodes(nodeList, idx, notLiveList) {
+                    var node = nodeList[idx];
+                    var parent = node.parentNode;
+                    var sibling;
+
+                    if (node.nodeType !== NODE_TYPE_TEXT) {
+                        return;
+                    }
+
+                    while (true) {
+                        sibling = parent ? node.nextSibling : nodeList[idx + 1];
+                        if (!sibling || sibling.nodeType !== NODE_TYPE_TEXT) {
+                            break;
+                        }
+
+                        node.nodeValue = node.nodeValue + sibling.nodeValue;
+
+                        if (sibling.parentNode) {
+                            sibling.parentNode.removeChild(sibling);
+                        }
+                        if (notLiveList && sibling === nodeList[idx + 1]) {
+                            nodeList.splice(idx + 1, 1);
+                        }
+                    }
+                }
+
+                function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
+                    function boundTranscludeFn(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
 
                         if (!transcludedScope) {
-                            transcludedScope = scope.$new();
+                            transcludedScope = scope.$new(false, containingScope);
                             transcludedScope.$$transcluded = true;
-                            scopeCreated = true;
                         }
 
-                        var clone = transcludeFn(transcludedScope, cloneFn, controllers);
-                        if (scopeCreated) {
-                            clone.on('$destroy', bind(transcludedScope, transcludedScope.$destroy));
+                        return transcludeFn(transcludedScope, cloneFn, {
+                            parentBoundTranscludeFn: previousBoundTranscludeFn,
+                            transcludeControllers: controllers,
+                            futureParentElement: futureParentElement
+                        });
+                    }
+
+                    // We need  to attach the transclusion slots onto the `boundTranscludeFn`
+                    // so that they are available inside the `controllersBoundTransclude` function
+                    var boundSlots = boundTranscludeFn.$$slots = createMap();
+                    for (var slotName in transcludeFn.$$slots) {
+                        if (transcludeFn.$$slots[slotName]) {
+                            boundSlots[slotName] = createBoundTranscludeFn(scope, transcludeFn.$$slots[slotName], previousBoundTranscludeFn);
+                        } else {
+                            boundSlots[slotName] = null;
                         }
-                        return clone;
-                    };
+                    }
+
+                    return boundTranscludeFn;
                 }
 
                 /**
@@ -6024,52 +9323,73 @@
                     var nodeType = node.nodeType,
                         attrsMap = attrs.$attr,
                         match,
+                        nodeName,
                         className;
 
-                    switch(nodeType) {
-                        case 1: /* Element */
+                    switch (nodeType) {
+                        case NODE_TYPE_ELEMENT: /* Element */
+
+                            nodeName = nodeName_(node);
+
                             // use the node name: <directive>
                             addDirective(directives,
-                                directiveNormalize(nodeName_(node).toLowerCase()), 'E', maxPriority, ignoreDirective);
+                                directiveNormalize(nodeName), 'E', maxPriority, ignoreDirective);
 
                             // iterate over the attributes
-                            for (var attr, name, nName, ngAttrName, value, nAttrs = node.attributes,
+                            for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes,
                                      j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
                                 var attrStartName = false;
                                 var attrEndName = false;
 
                                 attr = nAttrs[j];
-                                if (!msie || msie >= 8 || attr.specified) {
-                                    name = attr.name;
-                                    // support ngAttr attribute binding
-                                    ngAttrName = directiveNormalize(name);
-                                    if (NG_ATTR_BINDING.test(ngAttrName)) {
-                                        name = snake_case(ngAttrName.substr(6), '-');
-                                    }
+                                name = attr.name;
+                                value = attr.value;
+
+                                // support ngAttr attribute binding
+                                ngAttrName = directiveNormalize(name);
+                                isNgAttr = NG_ATTR_BINDING.test(ngAttrName);
+                                if (isNgAttr) {
+                                    name = name.replace(PREFIX_REGEXP, '')
+                                        .substr(8).replace(/_(.)/g, function(match, letter) {
+                                            return letter.toUpperCase();
+                                        });
+                                }
 
-                                    var directiveNName = ngAttrName.replace(/(Start|End)$/, '');
-                                    if (ngAttrName === directiveNName + 'Start') {
-                                        attrStartName = name;
-                                        attrEndName = name.substr(0, name.length - 5) + 'end';
-                                        name = name.substr(0, name.length - 6);
-                                    }
+                                var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE);
+                                if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) {
+                                    attrStartName = name;
+                                    attrEndName = name.substr(0, name.length - 5) + 'end';
+                                    name = name.substr(0, name.length - 6);
+                                }
 
-                                    nName = directiveNormalize(name.toLowerCase());
-                                    attrsMap[nName] = name;
-                                    attrs[nName] = value = trim(attr.value);
+                                nName = directiveNormalize(name.toLowerCase());
+                                attrsMap[nName] = name;
+                                if (isNgAttr || !attrs.hasOwnProperty(nName)) {
+                                    attrs[nName] = value;
                                     if (getBooleanAttrName(node, nName)) {
                                         attrs[nName] = true; // presence means true
                                     }
-                                    addAttrInterpolateDirective(node, directives, value, nName);
-                                    addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
-                                        attrEndName);
                                 }
+                                addAttrInterpolateDirective(node, directives, value, nName, isNgAttr);
+                                addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
+                                    attrEndName);
+                            }
+
+                            if (nodeName === 'input' && node.getAttribute('type') === 'hidden') {
+                                // Hidden input elements can have strange behaviour when navigating back to the page
+                                // This tells the browser not to try to cache and reinstate previous values
+                                node.setAttribute('autocomplete', 'off');
                             }
 
                             // use class as directive
+                            if (!cssClassDirectivesEnabled) break;
                             className = node.className;
+                            if (isObject(className)) {
+                                // Maybe SVGAnimatedString
+                                className = className.animVal;
+                            }
                             if (isString(className) && className !== '') {
-                                while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
+                                while ((match = CLASS_DIRECTIVE_REGEXP.exec(className))) {
                                     nName = directiveNormalize(match[2]);
                                     if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) {
                                         attrs[nName] = trim(match[3]);
@@ -6078,23 +9398,12 @@
                                 }
                             }
                             break;
-                        case 3: /* Text Node */
+                        case NODE_TYPE_TEXT: /* Text Node */
                             addTextInterpolateDirective(directives, node.nodeValue);
                             break;
-                        case 8: /* Comment */
-                            try {
-                                match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
-                                if (match) {
-                                    nName = directiveNormalize(match[1]);
-                                    if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
-                                        attrs[nName] = trim(match[2]);
-                                    }
-                                }
-                            } catch (e) {
-                                // turns out that under some circumstances IE9 throws errors when one attempts to read
-                                // comment's node value.
-                                // Just ignore it and continue. (Can't seem to reproduce in test case.)
-                            }
+                        case NODE_TYPE_COMMENT: /* Comment */
+                            if (!commentDirectivesEnabled) break;
+                            collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
                             break;
                     }
 
@@ -6102,8 +9411,26 @@
                     return directives;
                 }
 
+                function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
+                    // function created because of performance, try/catch disables
+                    // the optimization of the whole function #14848
+                    try {
+                        var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+                        if (match) {
+                            var nName = directiveNormalize(match[1]);
+                            if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+                                attrs[nName] = trim(match[2]);
+                            }
+                        }
+                    } catch (e) {
+                        // turns out that under some circumstances IE9 throws errors when one attempts to read
+                        // comment's node value.
+                        // Just ignore it and continue. (Can't seem to reproduce in test case.)
+                    }
+                }
+
                 /**
-                 * Given a node with an directive-start it collects all of the siblings until it finds
+                 * Given a node with a directive-start it collects all of the siblings until it finds
                  * directive-end.
                  * @param node
                  * @param attrStart
@@ -6114,14 +9441,13 @@
                     var nodes = [];
                     var depth = 0;
                     if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) {
-                        var startNode = node;
                         do {
                             if (!node) {
                                 throw $compileMinErr('uterdir',
-                                    "Unterminated attribute, found '{0}' but no matching '{1}' found.",
+                                    'Unterminated attribute, found \'{0}\' but no matching \'{1}\' found.',
                                     attrStart, attrEnd);
                             }
-                            if (node.nodeType == 1 /** Element **/) {
+                            if (node.nodeType === NODE_TYPE_ELEMENT) {
                                 if (node.hasAttribute(attrStart)) depth++;
                                 if (node.hasAttribute(attrEnd)) depth--;
                             }
@@ -6144,12 +9470,41 @@
                  * @returns {Function}
                  */
                 function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) {
-                    return function(scope, element, attrs, controllers, transcludeFn) {
+                    return function groupedElementsLink(scope, element, attrs, controllers, transcludeFn) {
                         element = groupScan(element[0], attrStart, attrEnd);
                         return linkFn(scope, element, attrs, controllers, transcludeFn);
                     };
                 }
 
+                /**
+                 * A function generator that is used to support both eager and lazy compilation
+                 * linking function.
+                 * @param eager
+                 * @param $compileNodes
+                 * @param transcludeFn
+                 * @param maxPriority
+                 * @param ignoreDirective
+                 * @param previousCompileContext
+                 * @returns {Function}
+                 */
+                function compilationGenerator(eager, $compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext) {
+                    var compiled;
+
+                    if (eager) {
+                        return compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
+                    }
+                    return /** @this */ function lazyCompilation() {
+                        if (!compiled) {
+                            compiled = compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
+
+                            // Null out all of these references in order to make them eligible for garbage collection
+                            // since this is a potentially long lived closure
+                            $compileNodes = transcludeFn = previousCompileContext = null;
+                        }
+                        return compiled.apply(this, arguments);
+                    };
+                }
+
                 /**
                  * Once the directives have been collected, their compile functions are executed. This method
                  * is responsible for inlining directive templates as well as terminating the application
@@ -6179,12 +9534,13 @@
                     previousCompileContext = previousCompileContext || {};
 
                     var terminalPriority = -Number.MAX_VALUE,
-                        newScopeDirective,
+                        newScopeDirective = previousCompileContext.newScopeDirective,
                         controllerDirectives = previousCompileContext.controllerDirectives,
                         newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
                         templateDirective = previousCompileContext.templateDirective,
                         nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
                         hasTranscludeDirective = false,
+                        hasTemplate = false,
                         hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective,
                         $compileNode = templateAttrs.$$element = jqLite(compileNode),
                         directive,
@@ -6193,10 +9549,12 @@
                         replaceDirective = originalReplaceDirective,
                         childTranscludeFn = transcludeFn,
                         linkFn,
+                        didScanForMultipleTransclusion = false,
+                        mightHaveMultipleTransclusionError = false,
                         directiveValue;
 
                     // executes all directives on the current element
-                    for(var i = 0, ii = directives.length; i < ii; i++) {
+                    for (var i = 0, ii = directives.length; i < ii; i++) {
                         directive = directives[i];
                         var attrStart = directive.$$start;
                         var attrEnd = directive.$$end;
@@ -6211,31 +9569,63 @@
                             break; // prevent further processing of directives
                         }
 
-                        if (directiveValue = directive.scope) {
-                            newScopeDirective = newScopeDirective || directive;
+                        directiveValue = directive.scope;
+
+                        if (directiveValue) {
 
                             // skip the check for directives with async templates, we'll check the derived sync
                             // directive when the template arrives
                             if (!directive.templateUrl) {
-                                assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
-                                    $compileNode);
                                 if (isObject(directiveValue)) {
+                                    // This directive is trying to add an isolated scope.
+                                    // Check that there is no scope of any kind already
+                                    assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective,
+                                        directive, $compileNode);
                                     newIsolateScopeDirective = directive;
+                                } else {
+                                    // This directive is trying to add a child scope.
+                                    // Check that there is no isolated scope already
+                                    assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
+                                        $compileNode);
                                 }
                             }
+
+                            newScopeDirective = newScopeDirective || directive;
                         }
 
                         directiveName = directive.name;
 
+                        // If we encounter a condition that can result in transclusion on the directive,
+                        // then scan ahead in the remaining directives for others that may cause a multiple
+                        // transclusion error to be thrown during the compilation process.  If a matching directive
+                        // is found, then we know that when we encounter a transcluded directive, we need to eagerly
+                        // compile the `transclude` function rather than doing it lazily in order to throw
+                        // exceptions at the correct time
+                        if (!didScanForMultipleTransclusion && ((directive.replace && (directive.templateUrl || directive.template))
+                            || (directive.transclude && !directive.$$tlb))) {
+                            var candidateDirective;
+
+                            for (var scanningIndex = i + 1; (candidateDirective = directives[scanningIndex++]);) {
+                                if ((candidateDirective.transclude && !candidateDirective.$$tlb)
+                                    || (candidateDirective.replace && (candidateDirective.templateUrl || candidateDirective.template))) {
+                                    mightHaveMultipleTransclusionError = true;
+                                    break;
+                                }
+                            }
+
+                            didScanForMultipleTransclusion = true;
+                        }
+
                         if (!directive.templateUrl && directive.controller) {
-                            directiveValue = directive.controller;
-                            controllerDirectives = controllerDirectives || {};
-                            assertNoDuplicate("'" + directiveName + "' controller",
+                            controllerDirectives = controllerDirectives || createMap();
+                            assertNoDuplicate('\'' + directiveName + '\' controller',
                                 controllerDirectives[directiveName], directive, $compileNode);
                             controllerDirectives[directiveName] = directive;
                         }
 
-                        if (directiveValue = directive.transclude) {
+                        directiveValue = directive.transclude;
+
+                        if (directiveValue) {
                             hasTranscludeDirective = true;
 
                             // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
@@ -6246,17 +9636,27 @@
                                 nonTlbTranscludeDirective = directive;
                             }
 
-                            if (directiveValue == 'element') {
+                            if (directiveValue === 'element') {
                                 hasElementTranscludeDirective = true;
                                 terminalPriority = directive.priority;
-                                $template = groupScan(compileNode, attrStart, attrEnd);
+                                $template = $compileNode;
                                 $compileNode = templateAttrs.$$element =
-                                    jqLite(document.createComment(' ' + directiveName + ': ' +
-                                    templateAttrs[directiveName] + ' '));
+                                    jqLite(compile.$$createComment(directiveName, templateAttrs[directiveName]));
                                 compileNode = $compileNode[0];
-                                replaceWith(jqCollection, jqLite(sliceArgs($template)), compileNode);
+                                replaceWith(jqCollection, sliceArgs($template), compileNode);
 
-                                childTranscludeFn = compile($template, transcludeFn, terminalPriority,
+                                // Support: Chrome < 50
+                                // https://github.com/angular/angular.js/issues/14041
+
+                                // In the versions of V8 prior to Chrome 50, the document fragment that is created
+                                // in the `replaceWith` function is improperly garbage collected despite still
+                                // being referenced by the `parentNode` property of all of the child nodes.  By adding
+                                // a reference to the fragment via a different property, we can avoid that incorrect
+                                // behavior.
+                                // TODO: remove this line after Chrome 50 has been released
+                                $template[0].$$parentNode = $template[0].parentNode;
+
+                                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority,
                                     replaceDirective && replaceDirective.name, {
                                         // Don't pass in:
                                         // - controllerDirectives - otherwise we'll create duplicates controllers
@@ -6268,19 +9668,80 @@
                                         nonTlbTranscludeDirective: nonTlbTranscludeDirective
                                     });
                             } else {
-                                $template = jqLite(jqLiteClone(compileNode)).contents();
-                                $compileNode.empty(); // clear contents
-                                childTranscludeFn = compile($template, transcludeFn);
-                            }
-                        }
 
-                        if (directive.template) {
-                            assertNoDuplicate('template', templateDirective, directive, $compileNode);
-                            templateDirective = directive;
+                                var slots = createMap();
 
-                            directiveValue = (isFunction(directive.template))
-                                ? directive.template($compileNode, templateAttrs)
-                                : directive.template;
+                                if (!isObject(directiveValue)) {
+                                    $template = jqLite(jqLiteClone(compileNode)).contents();
+                                } else {
+
+                                    // We have transclusion slots,
+                                    // collect them up, compile them and store their transclusion functions
+                                    $template = [];
+
+                                    var slotMap = createMap();
+                                    var filledSlots = createMap();
+
+                                    // Parse the element selectors
+                                    forEach(directiveValue, function(elementSelector, slotName) {
+                                        // If an element selector starts with a ? then it is optional
+                                        var optional = (elementSelector.charAt(0) === '?');
+                                        elementSelector = optional ? elementSelector.substring(1) : elementSelector;
+
+                                        slotMap[elementSelector] = slotName;
+
+                                        // We explicitly assign `null` since this implies that a slot was defined but not filled.
+                                        // Later when calling boundTransclusion functions with a slot name we only error if the
+                                        // slot is `undefined`
+                                        slots[slotName] = null;
+
+                                        // filledSlots contains `true` for all slots that are either optional or have been
+                                        // filled. This is used to check that we have not missed any required slots
+                                        filledSlots[slotName] = optional;
+                                    });
+
+                                    // Add the matching elements into their slot
+                                    forEach($compileNode.contents(), function(node) {
+                                        var slotName = slotMap[directiveNormalize(nodeName_(node))];
+                                        if (slotName) {
+                                            filledSlots[slotName] = true;
+                                            slots[slotName] = slots[slotName] || [];
+                                            slots[slotName].push(node);
+                                        } else {
+                                            $template.push(node);
+                                        }
+                                    });
+
+                                    // Check for required slots that were not filled
+                                    forEach(filledSlots, function(filled, slotName) {
+                                        if (!filled) {
+                                            throw $compileMinErr('reqslot', 'Required transclusion slot `{0}` was not filled.', slotName);
+                                        }
+                                    });
+
+                                    for (var slotName in slots) {
+                                        if (slots[slotName]) {
+                                            // Only define a transclusion function if the slot was filled
+                                            slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn);
+                                        }
+                                    }
+                                }
+
+                                $compileNode.empty(); // clear contents
+                                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, undefined,
+                                    undefined, { needsNewScope: directive.$$isolateScope || directive.$$newScope});
+                                childTranscludeFn.$$slots = slots;
+                            }
+                        }
+
+                        if (directive.template) {
+                            hasTemplate = true;
+                            assertNoDuplicate('template', templateDirective, directive, $compileNode);
+                            templateDirective = directive;
+
+                            directiveValue = (isFunction(directive.template))
+                                ? directive.template($compileNode, templateAttrs)
+                                : directive.template;
 
                             directiveValue = denormalizeTemplate(directiveValue);
 
@@ -6289,13 +9750,13 @@
                                 if (jqLiteIsTextNode(directiveValue)) {
                                     $template = [];
                                 } else {
-                                    $template = jqLite(directiveValue);
+                                    $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue)));
                                 }
                                 compileNode = $template[0];
 
-                                if ($template.length != 1 || compileNode.nodeType !== 1) {
+                                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
                                     throw $compileMinErr('tplrt',
-                                        "Template for directive '{0}' must have exactly one root element. {1}",
+                                        'Template for directive \'{0}\' must have exactly one root element. {1}',
                                         directiveName, '');
                                 }
 
@@ -6311,8 +9772,11 @@
                                 var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs);
                                 var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1));
 
-                                if (newIsolateScopeDirective) {
-                                    markDirectivesAsIsolate(templateDirectives);
+                                if (newIsolateScopeDirective || newScopeDirective) {
+                                    // The original directive caused the current element to be replaced but this element
+                                    // also needs to have a new scope, so we need to tell the template directives
+                                    // that they would need to get their scope from further up, if they require transclusion
+                                    markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective);
                                 }
                                 directives = directives.concat(templateDirectives).concat(unprocessedDirectives);
                                 mergeTemplateAttributes(templateAttrs, newTemplateAttrs);
@@ -6324,6 +9788,7 @@
                         }
 
                         if (directive.templateUrl) {
+                            hasTemplate = true;
                             assertNoDuplicate('template', templateDirective, directive, $compileNode);
                             templateDirective = directive;
 
@@ -6331,9 +9796,11 @@
                                 replaceDirective = directive;
                             }
 
+                            // eslint-disable-next-line no-func-assign
                             nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
-                                templateAttrs, jqCollection, childTranscludeFn, preLinkFns, postLinkFns, {
+                                templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
                                     controllerDirectives: controllerDirectives,
+                                    newScopeDirective: (newScopeDirective !== directive) && newScopeDirective,
                                     newIsolateScopeDirective: newIsolateScopeDirective,
                                     templateDirective: templateDirective,
                                     nonTlbTranscludeDirective: nonTlbTranscludeDirective
@@ -6342,10 +9809,11 @@
                         } else if (directive.compile) {
                             try {
                                 linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn);
+                                var context = directive.$$originalDirective || directive;
                                 if (isFunction(linkFn)) {
-                                    addLinkFns(null, linkFn, attrStart, attrEnd);
+                                    addLinkFns(null, bind(context, linkFn), attrStart, attrEnd);
                                 } else if (linkFn) {
-                                    addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd);
+                                    addLinkFns(bind(context, linkFn.pre), bind(context, linkFn.post), attrStart, attrEnd);
                                 }
                             } catch (e) {
                                 $exceptionHandler(e, startingTag($compileNode));
@@ -6360,7 +9828,10 @@
                     }
 
                     nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
-                    nodeLinkFn.transclude = hasTranscludeDirective && childTranscludeFn;
+                    nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
+                    nodeLinkFn.templateOnThisElement = hasTemplate;
+                    nodeLinkFn.transclude = childTranscludeFn;
+
                     previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
 
                     // might be normal or delayed nodeLinkFn depending on if templateUrl is present
@@ -6372,6 +9843,7 @@
                         if (pre) {
                             if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
                             pre.require = directive.require;
+                            pre.directiveName = directiveName;
                             if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
                                 pre = cloneAndAnnotateFn(pre, {isolateScope: true});
                             }
@@ -6380,6 +9852,7 @@
                         if (post) {
                             if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
                             post.require = directive.require;
+                            post.directiveName = directiveName;
                             if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
                                 post = cloneAndAnnotateFn(post, {isolateScope: true});
                             }
@@ -6387,180 +9860,135 @@
                         }
                     }
 
-
-                    function getControllers(require, $element, elementControllers) {
-                        var value, retrievalMethod = 'data', optional = false;
-                        if (isString(require)) {
-                            while((value = require.charAt(0)) == '^' || value == '?') {
-                                require = require.substr(1);
-                                if (value == '^') {
-                                    retrievalMethod = 'inheritedData';
-                                }
-                                optional = optional || value == '?';
-                            }
-                            value = null;
-
-                            if (elementControllers && retrievalMethod === 'data') {
-                                value = elementControllers[require];
-                            }
-                            value = value || $element[retrievalMethod]('$' + require + 'Controller');
-
-                            if (!value && !optional) {
-                                throw $compileMinErr('ctreq',
-                                    "Controller '{0}', required by directive '{1}', can't be found!",
-                                    require, directiveName);
-                            }
-                            return value;
-                        } else if (isArray(require)) {
-                            value = [];
-                            forEach(require, function(require) {
-                                value.push(getControllers(require, $element, elementControllers));
-                            });
-                        }
-                        return value;
-                    }
-
-
                     function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
-                        var attrs, $element, i, ii, linkFn, controller, isolateScope, elementControllers = {}, transcludeFn;
+                        var i, ii, linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element,
+                            attrs, scopeBindingInfo;
 
                         if (compileNode === linkNode) {
                             attrs = templateAttrs;
+                            $element = templateAttrs.$$element;
                         } else {
-                            attrs = shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr));
+                            $element = jqLite(linkNode);
+                            attrs = new Attributes($element, templateAttrs);
                         }
-                        $element = attrs.$$element;
 
+                        controllerScope = scope;
                         if (newIsolateScopeDirective) {
-                            var LOCAL_REGEXP = /^\s*([@=&])(\??)\s*(\w*)\s*$/;
-                            var $linkNode = jqLite(linkNode);
-
                             isolateScope = scope.$new(true);
+                        } else if (newScopeDirective) {
+                            controllerScope = scope.$parent;
+                        }
 
-                            if (templateDirective && (templateDirective === newIsolateScopeDirective.$$originalDirective)) {
-                                $linkNode.data('$isolateScope', isolateScope) ;
-                            } else {
-                                $linkNode.data('$isolateScopeNoTemplate', isolateScope);
-                            }
-
-
-
-                            safeAddClass($linkNode, 'ng-isolate-scope');
+                        if (boundTranscludeFn) {
+                            // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn`
+                            // is later passed as `parentBoundTranscludeFn` to `publicLinkFn`
+                            transcludeFn = controllersBoundTransclude;
+                            transcludeFn.$$boundTransclude = boundTranscludeFn;
+                            // expose the slots on the `$transclude` function
+                            transcludeFn.isSlotFilled = function(slotName) {
+                                return !!boundTranscludeFn.$$slots[slotName];
+                            };
+                        }
 
-                            forEach(newIsolateScopeDirective.scope, function(definition, scopeName) {
-                                var match = definition.match(LOCAL_REGEXP) || [],
-                                    attrName = match[3] || scopeName,
-                                    optional = (match[2] == '?'),
-                                    mode = match[1], // @, =, or &
-                                    lastValue,
-                                    parentGet, parentSet, compare;
+                        if (controllerDirectives) {
+                            elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective);
+                        }
 
-                                isolateScope.$$isolateBindings[scopeName] = mode + attrName;
+                        if (newIsolateScopeDirective) {
+                            // Initialize isolate scope bindings for new isolate scope directive.
+                            compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective ||
+                                templateDirective === newIsolateScopeDirective.$$originalDirective)));
+                            compile.$$addScopeClass($element, true);
+                            isolateScope.$$isolateBindings =
+                                newIsolateScopeDirective.$$isolateBindings;
+                            scopeBindingInfo = initializeDirectiveBindings(scope, attrs, isolateScope,
+                                isolateScope.$$isolateBindings,
+                                newIsolateScopeDirective);
+                            if (scopeBindingInfo.removeWatches) {
+                                isolateScope.$on('$destroy', scopeBindingInfo.removeWatches);
+                            }
+                        }
 
-                                switch (mode) {
+                        // Initialize bindToController bindings
+                        for (var name in elementControllers) {
+                            var controllerDirective = controllerDirectives[name];
+                            var controller = elementControllers[name];
+                            var bindings = controllerDirective.$$bindings.bindToController;
 
-                                    case '@':
-                                        attrs.$observe(attrName, function(value) {
-                                            isolateScope[scopeName] = value;
-                                        });
-                                        attrs.$$observers[attrName].$$scope = scope;
-                                        if( attrs[attrName] ) {
-                                            // If the attribute has been provided then we trigger an interpolation to ensure
-                                            // the value is there for use in the link fn
-                                            isolateScope[scopeName] = $interpolate(attrs[attrName])(scope);
-                                        }
-                                        break;
+                            if (preAssignBindingsEnabled) {
+                                if (bindings) {
+                                    controller.bindingInfo =
+                                        initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+                                } else {
+                                    controller.bindingInfo = {};
+                                }
 
-                                    case '=':
-                                        if (optional && !attrs[attrName]) {
-                                            return;
-                                        }
-                                        parentGet = $parse(attrs[attrName]);
-                                        if (parentGet.literal) {
-                                            compare = equals;
-                                        } else {
-                                            compare = function(a,b) { return a === b; };
-                                        }
-                                        parentSet = parentGet.assign || function() {
-                                            // reset the change, or we will throw this exception on every $digest
-                                            lastValue = isolateScope[scopeName] = parentGet(scope);
-                                            throw $compileMinErr('nonassign',
-                                                "Expression '{0}' used with directive '{1}' is non-assignable!",
-                                                attrs[attrName], newIsolateScopeDirective.name);
-                                        };
-                                        lastValue = isolateScope[scopeName] = parentGet(scope);
-                                        isolateScope.$watch(function parentValueWatch() {
-                                            var parentValue = parentGet(scope);
-                                            if (!compare(parentValue, isolateScope[scopeName])) {
-                                                // we are out of sync and need to copy
-                                                if (!compare(parentValue, lastValue)) {
-                                                    // parent changed and it has precedence
-                                                    isolateScope[scopeName] = parentValue;
-                                                } else {
-                                                    // if the parent can be assigned then do so
-                                                    parentSet(scope, parentValue = isolateScope[scopeName]);
-                                                }
-                                            }
-                                            return lastValue = parentValue;
-                                        }, null, parentGet.literal);
-                                        break;
-
-                                    case '&':
-                                        parentGet = $parse(attrs[attrName]);
-                                        isolateScope[scopeName] = function(locals) {
-                                            return parentGet(scope, locals);
-                                        };
-                                        break;
-
-                                    default:
-                                        throw $compileMinErr('iscp',
-                                            "Invalid isolate scope definition for directive '{0}'." +
-                                            " Definition: {... {1}: '{2}' ...}",
-                                            newIsolateScopeDirective.name, scopeName, definition);
+                                var controllerResult = controller();
+                                if (controllerResult !== controller.instance) {
+                                    // If the controller constructor has a return value, overwrite the instance
+                                    // from setupControllers
+                                    controller.instance = controllerResult;
+                                    $element.data('$' + controllerDirective.name + 'Controller', controllerResult);
+                                    if (controller.bindingInfo.removeWatches) {
+                                        controller.bindingInfo.removeWatches();
+                                    }
+                                    controller.bindingInfo =
+                                        initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
                                 }
-                            });
+                            } else {
+                                controller.instance = controller();
+                                $element.data('$' + controllerDirective.name + 'Controller', controller.instance);
+                                controller.bindingInfo =
+                                    initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+                            }
                         }
-                        transcludeFn = boundTranscludeFn && controllersBoundTransclude;
-                        if (controllerDirectives) {
-                            forEach(controllerDirectives, function(directive) {
-                                var locals = {
-                                    $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
-                                    $element: $element,
-                                    $attrs: attrs,
-                                    $transclude: transcludeFn
-                                }, controllerInstance;
-
-                                controller = directive.controller;
-                                if (controller == '@') {
-                                    controller = attrs[directive.name];
-                                }
 
-                                controllerInstance = $controller(controller, locals);
-                                // For directives with element transclusion the element is a comment,
-                                // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
-                                // clean up (http://bugs.jquery.com/ticket/8335).
-                                // Instead, we save the controllers for the element in a local hash and attach to .data
-                                // later, once we have the actual element.
-                                elementControllers[directive.name] = controllerInstance;
-                                if (!hasElementTranscludeDirective) {
-                                    $element.data('$' + directive.name + 'Controller', controllerInstance);
-                                }
+                        // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy
+                        forEach(controllerDirectives, function(controllerDirective, name) {
+                            var require = controllerDirective.require;
+                            if (controllerDirective.bindToController && !isArray(require) && isObject(require)) {
+                                extend(elementControllers[name].instance, getControllers(name, require, $element, elementControllers));
+                            }
+                        });
 
-                                if (directive.controllerAs) {
-                                    locals.$scope[directive.controllerAs] = controllerInstance;
+                        // Handle the init and destroy lifecycle hooks on all controllers that have them
+                        forEach(elementControllers, function(controller) {
+                            var controllerInstance = controller.instance;
+                            if (isFunction(controllerInstance.$onChanges)) {
+                                try {
+                                    controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
+                                } catch (e) {
+                                    $exceptionHandler(e);
                                 }
-                            });
-                        }
+                            }
+                            if (isFunction(controllerInstance.$onInit)) {
+                                try {
+                                    controllerInstance.$onInit();
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            }
+                            if (isFunction(controllerInstance.$doCheck)) {
+                                controllerScope.$watch(function() { controllerInstance.$doCheck(); });
+                                controllerInstance.$doCheck();
+                            }
+                            if (isFunction(controllerInstance.$onDestroy)) {
+                                controllerScope.$on('$destroy', function callOnDestroyHook() {
+                                    controllerInstance.$onDestroy();
+                                });
+                            }
+                        });
 
                         // PRELINKING
-                        for(i = 0, ii = preLinkFns.length; i < ii; i++) {
-                            try {
-                                linkFn = preLinkFns[i];
-                                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
-                                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
-                            } catch (e) {
-                                $exceptionHandler(e, startingTag($element));
-                            }
+                        for (i = 0, ii = preLinkFns.length; i < ii; i++) {
+                            linkFn = preLinkFns[i];
+                            invokeLinkFn(linkFn,
+                                linkFn.isolateScope ? isolateScope : scope,
+                                $element,
+                                attrs,
+                                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+                                transcludeFn
+                            );
                         }
 
                         // RECURSION
@@ -6570,25 +9998,38 @@
                         if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) {
                             scopeToChild = isolateScope;
                         }
-                        childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
+                        if (childLinkFn) {
+                            childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
+                        }
 
                         // POSTLINKING
-                        for(i = postLinkFns.length - 1; i >= 0; i--) {
-                            try {
-                                linkFn = postLinkFns[i];
-                                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
-                                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
-                            } catch (e) {
-                                $exceptionHandler(e, startingTag($element));
-                            }
+                        for (i = postLinkFns.length - 1; i >= 0; i--) {
+                            linkFn = postLinkFns[i];
+                            invokeLinkFn(linkFn,
+                                linkFn.isolateScope ? isolateScope : scope,
+                                $element,
+                                attrs,
+                                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+                                transcludeFn
+                            );
                         }
 
+                        // Trigger $postLink lifecycle hooks
+                        forEach(elementControllers, function(controller) {
+                            var controllerInstance = controller.instance;
+                            if (isFunction(controllerInstance.$postLink)) {
+                                controllerInstance.$postLink();
+                            }
+                        });
+
                         // This is the function that is injected as `$transclude`.
-                        function controllersBoundTransclude(scope, cloneAttachFn) {
+                        // Note: all arguments are optional!
+                        function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement, slotName) {
                             var transcludeControllers;
-
-                            // no scope passed
-                            if (arguments.length < 2) {
+                            // No scope passed in:
+                            if (!isScope(scope)) {
+                                slotName = futureParentElement;
+                                futureParentElement = cloneAttachFn;
                                 cloneAttachFn = scope;
                                 scope = undefined;
                             }
@@ -6596,16 +10037,111 @@
                             if (hasElementTranscludeDirective) {
                                 transcludeControllers = elementControllers;
                             }
+                            if (!futureParentElement) {
+                                futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element;
+                            }
+                            if (slotName) {
+                                // slotTranscludeFn can be one of three things:
+                                //  * a transclude function - a filled slot
+                                //  * `null` - an optional slot that was not filled
+                                //  * `undefined` - a slot that was not declared (i.e. invalid)
+                                var slotTranscludeFn = boundTranscludeFn.$$slots[slotName];
+                                if (slotTranscludeFn) {
+                                    return slotTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+                                } else if (isUndefined(slotTranscludeFn)) {
+                                    throw $compileMinErr('noslot',
+                                        'No parent directive that requires a transclusion with slot name "{0}". ' +
+                                        'Element: {1}',
+                                        slotName, startingTag($element));
+                                }
+                            } else {
+                                return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+                            }
+                        }
+                    }
+                }
+
+                function getControllers(directiveName, require, $element, elementControllers) {
+                    var value;
 
-                            return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers);
+                    if (isString(require)) {
+                        var match = require.match(REQUIRE_PREFIX_REGEXP);
+                        var name = require.substring(match[0].length);
+                        var inheritType = match[1] || match[3];
+                        var optional = match[2] === '?';
+
+                        //If only parents then start at the parent element
+                        if (inheritType === '^^') {
+                            $element = $element.parent();
+                            //Otherwise attempt getting the controller from elementControllers in case
+                            //the element is transcluded (and has no data) and to avoid .data if possible
+                        } else {
+                            value = elementControllers && elementControllers[name];
+                            value = value && value.instance;
+                        }
+
+                        if (!value) {
+                            var dataName = '$' + name + 'Controller';
+                            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+                        }
+
+                        if (!value && !optional) {
+                            throw $compileMinErr('ctreq',
+                                'Controller \'{0}\', required by directive \'{1}\', can\'t be found!',
+                                name, directiveName);
+                        }
+                    } else if (isArray(require)) {
+                        value = [];
+                        for (var i = 0, ii = require.length; i < ii; i++) {
+                            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+                        }
+                    } else if (isObject(require)) {
+                        value = {};
+                        forEach(require, function(controller, property) {
+                            value[property] = getControllers(directiveName, controller, $element, elementControllers);
+                        });
+                    }
+
+                    return value || null;
+                }
+
+                function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective) {
+                    var elementControllers = createMap();
+                    for (var controllerKey in controllerDirectives) {
+                        var directive = controllerDirectives[controllerKey];
+                        var locals = {
+                            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+                            $element: $element,
+                            $attrs: attrs,
+                            $transclude: transcludeFn
+                        };
+
+                        var controller = directive.controller;
+                        if (controller === '@') {
+                            controller = attrs[directive.name];
                         }
+
+                        var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+                        // For directives with element transclusion the element is a comment.
+                        // In this case .data will not attach any data.
+                        // Instead, we save the controllers for the element in a local hash and attach to .data
+                        // later, once we have the actual element.
+                        elementControllers[directive.name] = controllerInstance;
+                        $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
                     }
+                    return elementControllers;
                 }
 
-                function markDirectivesAsIsolate(directives) {
-                    // mark all directives as needing isolate scope.
+                // Depending upon the context in which a directive finds itself it might need to have a new isolated
+                // or child scope created. For instance:
+                // * if the directive has been pulled into a template because another directive with a higher priority
+                // asked for element transclusion
+                // * if the directive itself asks for transclusion but it is at the root of a template and the original
+                // element was replaced. See https://github.com/angular/angular.js/issues/12936
+                function markDirectiveScope(directives, isolateScope, newScope) {
                     for (var j = 0, jj = directives.length; j < jj; j++) {
-                        directives[j] = inherit(directives[j], {$$isolateScope: true});
+                        directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope});
                     }
                 }
 
@@ -6628,25 +10164,51 @@
                     if (name === ignoreDirective) return null;
                     var match = null;
                     if (hasDirectives.hasOwnProperty(name)) {
-                        for(var directive, directives = $injector.get(name + Suffix),
-                                i = 0, ii = directives.length; i<ii; i++) {
-                            try {
-                                directive = directives[i];
-                                if ( (maxPriority === undefined || maxPriority > directive.priority) &&
-                                    directive.restrict.indexOf(location) != -1) {
-                                    if (startAttrName) {
-                                        directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
+                        for (var directive, directives = $injector.get(name + Suffix),
+                                 i = 0, ii = directives.length; i < ii; i++) {
+                            directive = directives[i];
+                            if ((isUndefined(maxPriority) || maxPriority > directive.priority) &&
+                                directive.restrict.indexOf(location) !== -1) {
+                                if (startAttrName) {
+                                    directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
+                                }
+                                if (!directive.$$bindings) {
+                                    var bindings = directive.$$bindings =
+                                        parseDirectiveBindings(directive, directive.name);
+                                    if (isObject(bindings.isolateScope)) {
+                                        directive.$$isolateBindings = bindings.isolateScope;
                                     }
-                                    tDirectives.push(directive);
-                                    match = directive;
                                 }
-                            } catch(e) { $exceptionHandler(e); }
+                                tDirectives.push(directive);
+                                match = directive;
+                            }
                         }
                     }
                     return match;
                 }
 
 
+                /**
+                 * looks up the directive and returns true if it is a multi-element directive,
+                 * and therefore requires DOM nodes between -start and -end markers to be grouped
+                 * together.
+                 *
+                 * @param {string} name name of the directive to look up.
+                 * @returns true if directive was registered as multi-element.
+                 */
+                function directiveIsMultiElement(name) {
+                    if (hasDirectives.hasOwnProperty(name)) {
+                        for (var directive, directives = $injector.get(name + Suffix),
+                                 i = 0, ii = directives.length; i < ii; i++) {
+                            directive = directives[i];
+                            if (directive.multiElement) {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }
+
                 /**
                  * When the element is replaced with HTML template then the new attributes
                  * on the template need to be merged with the existing attributes in the DOM.
@@ -6657,14 +10219,17 @@
                  */
                 function mergeTemplateAttributes(dst, src) {
                     var srcAttr = src.$attr,
-                        dstAttr = dst.$attr,
-                        $element = dst.$$element;
+                        dstAttr = dst.$attr;
 
                     // reapply the old attributes to the new element
                     forEach(dst, function(value, key) {
-                        if (key.charAt(0) != '$') {
-                            if (src[key]) {
-                                value += (key === 'style' ? ';' : ' ') + src[key];
+                        if (key.charAt(0) !== '$') {
+                            if (src[key] && src[key] !== value) {
+                                if (value.length) {
+                                    value += (key === 'style' ? ';' : ' ') + src[key];
+                                } else {
+                                    value = src[key];
+                                }
                             }
                             dst.$set(key, value, true, srcAttr[key]);
                         }
@@ -6672,18 +10237,16 @@
 
                     // copy the new attributes on the old attrs object
                     forEach(src, function(value, key) {
-                        if (key == 'class') {
-                            safeAddClass($element, value);
-                            dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
-                        } else if (key == 'style') {
-                            $element.attr('style', $element.attr('style') + ';' + value);
-                            dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
-                            // `dst` will never contain hasOwnProperty as DOM parser won't let it.
-                            // You will get an "InvalidCharacterError: DOM Exception 5" error if you
-                            // have an attribute like "has-own-property" or "data-has-own-property", etc.
-                        } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
+                        // Check if we already set this attribute in the loop above.
+                        // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+                        // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+                        // have an attribute like "has-own-property" or "data-has-own-property", etc.
+                        if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
                             dst[key] = value;
-                            dstAttr[key] = srcAttr[key];
+
+                            if (key !== 'class' && key !== 'style') {
+                                dstAttr[key] = srcAttr[key];
+                            }
                         }
                     });
                 }
@@ -6696,18 +10259,18 @@
                         afterTemplateChildLinkFn,
                         beforeTemplateCompileNode = $compileNode[0],
                         origAsyncDirective = directives.shift(),
-                    // The fact that we have to copy and patch the directive seems wrong!
-                        derivedSyncDirective = extend({}, origAsyncDirective, {
+                        derivedSyncDirective = inherit(origAsyncDirective, {
                             templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
                         }),
                         templateUrl = (isFunction(origAsyncDirective.templateUrl))
                             ? origAsyncDirective.templateUrl($compileNode, tAttrs)
-                            : origAsyncDirective.templateUrl;
+                            : origAsyncDirective.templateUrl,
+                        templateNamespace = origAsyncDirective.templateNamespace;
 
                     $compileNode.empty();
 
-                    $http.get($sce.getTrustedResourceUrl(templateUrl), {cache: $templateCache}).
-                        success(function(content) {
+                    $templateRequest(templateUrl)
+                        .then(function(content) {
                             var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
 
                             content = denormalizeTemplate(content);
@@ -6716,13 +10279,13 @@
                                 if (jqLiteIsTextNode(content)) {
                                     $template = [];
                                 } else {
-                                    $template = jqLite(content);
+                                    $template = removeComments(wrapTemplate(templateNamespace, trim(content)));
                                 }
                                 compileNode = $template[0];
 
-                                if ($template.length != 1 || compileNode.nodeType !== 1) {
+                                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
                                     throw $compileMinErr('tplrt',
-                                        "Template for directive '{0}' must have exactly one root element. {1}",
+                                        'Template for directive \'{0}\' must have exactly one root element. {1}',
                                         origAsyncDirective.name, templateUrl);
                                 }
 
@@ -6731,7 +10294,9 @@
                                 var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
 
                                 if (isObject(origAsyncDirective.scope)) {
-                                    markDirectivesAsIsolate(templateDirectives);
+                                    // the original directive that caused the template to be loaded async required
+                                    // an isolate scope
+                                    markDirectiveScope(templateDirectives, true);
                                 }
                                 directives = templateDirectives.concat(directives);
                                 mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
@@ -6746,20 +10311,21 @@
                                 childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
                                 previousCompileContext);
                             forEach($rootElement, function(node, i) {
-                                if (node == compileNode) {
+                                if (node === compileNode) {
                                     $rootElement[i] = $compileNode[0];
                                 }
                             });
                             afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
 
-
-                            while(linkQueue.length) {
+                            while (linkQueue.length) {
                                 var scope = linkQueue.shift(),
                                     beforeTemplateLinkNode = linkQueue.shift(),
                                     linkRootElement = linkQueue.shift(),
                                     boundTranscludeFn = linkQueue.shift(),
                                     linkNode = $compileNode[0];
 
+                                if (scope.$$destroyed) continue;
+
                                 if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
                                     var oldClasses = beforeTemplateLinkNode.className;
 
@@ -6768,14 +10334,13 @@
                                         // it was cloned therefore we have to clone as well.
                                         linkNode = jqLiteClone(compileNode);
                                     }
-
                                     replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
 
                                     // Copy in CSS classes from original node
                                     safeAddClass(jqLite(linkNode), oldClasses);
                                 }
-                                if (afterTemplateNodeLinkFn.transclude) {
-                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude);
+                                if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
                                 } else {
                                     childBoundTranscludeFn = boundTranscludeFn;
                                 }
@@ -6783,19 +10348,25 @@
                                     childBoundTranscludeFn);
                             }
                             linkQueue = null;
-                        }).
-                        error(function(response, code, headers, config) {
-                            throw $compileMinErr('tpload', 'Failed to load template: {0}', config.url);
-                        });
+                        }).catch(function(error) {
+                        if (isError(error)) {
+                            $exceptionHandler(error);
+                        }
+                    });
 
                     return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
+                        var childBoundTranscludeFn = boundTranscludeFn;
+                        if (scope.$$destroyed) return;
                         if (linkQueue) {
-                            linkQueue.push(scope);
-                            linkQueue.push(node);
-                            linkQueue.push(rootElement);
-                            linkQueue.push(boundTranscludeFn);
+                            linkQueue.push(scope,
+                                node,
+                                rootElement,
+                                childBoundTranscludeFn);
                         } else {
-                            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, boundTranscludeFn);
+                            if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+                                childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+                            }
+                            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn);
                         }
                     };
                 }
@@ -6811,11 +10382,18 @@
                     return a.index - b.index;
                 }
 
-
                 function assertNoDuplicate(what, previousDirective, directive, element) {
+
+                    function wrapModuleNameIfDefined(moduleName) {
+                        return moduleName ?
+                            (' (module: ' + moduleName + ')') :
+                            '';
+                    }
+
                     if (previousDirective) {
-                        throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
-                            previousDirective.name, directive.name, what, startingTag(element));
+                        throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
+                            previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName),
+                            directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element));
                     }
                 }
 
@@ -6825,87 +10403,127 @@
                     if (interpolateFn) {
                         directives.push({
                             priority: 0,
-                            compile: valueFn(function textInterpolateLinkFn(scope, node) {
-                                var parent = node.parent(),
-                                    bindings = parent.data('$binding') || [];
-                                bindings.push(interpolateFn);
-                                safeAddClass(parent.data('$binding', bindings), 'ng-binding');
-                                scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
-                                    node[0].nodeValue = value;
-                                });
-                            })
+                            compile: function textInterpolateCompileFn(templateNode) {
+                                var templateNodeParent = templateNode.parent(),
+                                    hasCompileParent = !!templateNodeParent.length;
+
+                                // When transcluding a template that has bindings in the root
+                                // we don't have a parent and thus need to add the class during linking fn.
+                                if (hasCompileParent) compile.$$addBindingClass(templateNodeParent);
+
+                                return function textInterpolateLinkFn(scope, node) {
+                                    var parent = node.parent();
+                                    if (!hasCompileParent) compile.$$addBindingClass(parent);
+                                    compile.$$addBindingInfo(parent, interpolateFn.expressions);
+                                    scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
+                                        node[0].nodeValue = value;
+                                    });
+                                };
+                            }
                         });
                     }
                 }
 
 
+                function wrapTemplate(type, template) {
+                    type = lowercase(type || 'html');
+                    switch (type) {
+                        case 'svg':
+                        case 'math':
+                            var wrapper = window.document.createElement('div');
+                            wrapper.innerHTML = '<' + type + '>' + template + '</' + type + '>';
+                            return wrapper.childNodes[0].childNodes;
+                        default:
+                            return template;
+                    }
+                }
+
+
                 function getTrustedContext(node, attrNormalizedName) {
-                    if (attrNormalizedName == "srcdoc") {
+                    if (attrNormalizedName === 'srcdoc') {
                         return $sce.HTML;
                     }
                     var tag = nodeName_(node);
-                    // maction[xlink:href] can source SVG.  It's not limited to <maction>.
-                    if (attrNormalizedName == "xlinkHref" ||
-                        (tag == "FORM" && attrNormalizedName == "action") ||
-                        (tag != "IMG" && (attrNormalizedName == "src" ||
-                        attrNormalizedName == "ngSrc"))) {
+                    // All tags with src attributes require a RESOURCE_URL value, except for
+                    // img and various html5 media tags.
+                    if (attrNormalizedName === 'src' || attrNormalizedName === 'ngSrc') {
+                        if (['img', 'video', 'audio', 'source', 'track'].indexOf(tag) === -1) {
+                            return $sce.RESOURCE_URL;
+                        }
+                        // maction[xlink:href] can source SVG.  It's not limited to <maction>.
+                    } else if (attrNormalizedName === 'xlinkHref' ||
+                        (tag === 'form' && attrNormalizedName === 'action') ||
+                        // links can be stylesheets or imports, which can run script in the current origin
+                        (tag === 'link' && attrNormalizedName === 'href')
+                    ) {
                         return $sce.RESOURCE_URL;
                     }
                 }
 
 
-                function addAttrInterpolateDirective(node, directives, value, name) {
-                    var interpolateFn = $interpolate(value, true);
+                function addAttrInterpolateDirective(node, directives, value, name, isNgAttr) {
+                    var trustedContext = getTrustedContext(node, name);
+                    var mustHaveExpression = !isNgAttr;
+                    var allOrNothing = ALL_OR_NOTHING_ATTRS[name] || isNgAttr;
+
+                    var interpolateFn = $interpolate(value, mustHaveExpression, trustedContext, allOrNothing);
 
                     // no interpolation found -> ignore
                     if (!interpolateFn) return;
 
-
-                    if (name === "multiple" && nodeName_(node) === "SELECT") {
-                        throw $compileMinErr("selmulti",
-                            "Binding to the 'multiple' attribute is not supported. Element: {0}",
+                    if (name === 'multiple' && nodeName_(node) === 'select') {
+                        throw $compileMinErr('selmulti',
+                            'Binding to the \'multiple\' attribute is not supported. Element: {0}',
                             startingTag(node));
                     }
 
+                    if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
+                        throw $compileMinErr('nodomevents',
+                            'Interpolations for HTML DOM event attributes are disallowed.  Please use the ' +
+                            'ng- versions (such as ng-click instead of onclick) instead.');
+                    }
+
                     directives.push({
                         priority: 100,
                         compile: function() {
                             return {
                                 pre: function attrInterpolatePreLinkFn(scope, element, attr) {
-                                    var $$observers = (attr.$$observers || (attr.$$observers = {}));
-
-                                    if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
-                                        throw $compileMinErr('nodomevents',
-                                            "Interpolations for HTML DOM event attributes are disallowed.  Please use the " +
-                                            "ng- versions (such as ng-click instead of onclick) instead.");
+                                    var $$observers = (attr.$$observers || (attr.$$observers = createMap()));
+
+                                    // If the attribute has changed since last $interpolate()ed
+                                    var newValue = attr[name];
+                                    if (newValue !== value) {
+                                        // we need to interpolate again since the attribute value has been updated
+                                        // (e.g. by another directive's compile function)
+                                        // ensure unset/empty values make interpolateFn falsy
+                                        interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing);
+                                        value = newValue;
                                     }
 
-                                    // we need to interpolate again, in case the attribute value has been updated
-                                    // (e.g. by another directive's compile function)
-                                    interpolateFn = $interpolate(attr[name], true, getTrustedContext(node, name));
-
                                     // if attribute was updated so that there is no interpolation going on we don't want to
                                     // register any observers
                                     if (!interpolateFn) return;
 
-                                    // TODO(i): this should likely be attr.$set(name, iterpolateFn(scope) so that we reset the
-                                    // actual attr value
+                                    // initialize attr object so that it's ready in case we need the value for isolate
+                                    // scope initialization, otherwise the value would not be available from isolate
+                                    // directive's linking fn during linking phase
                                     attr[name] = interpolateFn(scope);
+
                                     ($$observers[name] || ($$observers[name] = [])).$$inter = true;
                                     (attr.$$observers && attr.$$observers[name].$$scope || scope).
-                                        $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
-                                            //special case for class attribute addition + removal
-                                            //so that class changes can tap into the animation
-                                            //hooks provided by the $animate service. Be sure to
-                                            //skip animations when the first digest occurs (when
-                                            //both the new and the old values are the same) since
-                                            //the CSS classes are the non-interpolated values
-                                            if(name === 'class' && newValue != oldValue) {
-                                                attr.$updateClass(newValue, oldValue);
-                                            } else {
-                                                attr.$set(name, newValue);
-                                            }
-                                        });
+                                    $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
+                                        //special case for class attribute addition + removal
+                                        //so that class changes can tap into the animation
+                                        //hooks provided by the $animate service. Be sure to
+                                        //skip animations when the first digest occurs (when
+                                        //both the new and the old values are the same) since
+                                        //the CSS classes are the non-interpolated values
+                                        if (name === 'class' && newValue !== oldValue) {
+                                            attr.$updateClass(newValue, oldValue);
+                                        } else {
+                                            attr.$set(name, newValue);
+                                        }
+                                    });
                                 }
                             };
                         }
@@ -6930,8 +10548,8 @@
                         i, ii;
 
                     if ($rootElement) {
-                        for(i = 0, ii = $rootElement.length; i < ii; i++) {
-                            if ($rootElement[i] == firstElementToRemove) {
+                        for (i = 0, ii = $rootElement.length; i < ii; i++) {
+                            if ($rootElement[i] === firstElementToRemove) {
                                 $rootElement[i++] = newNode;
                                 for (var j = i, j2 = j + removeCount - 1,
                                          jj = $rootElement.length;
@@ -6943,6 +10561,13 @@
                                     }
                                 }
                                 $rootElement.length -= removeCount - 1;
+
+                                // If the replaced element is also the jQuery .context then replace it
+                                // .context is a deprecated jQuery api, so we should set it only when jQuery set it
+                                // http://api.jquery.com/context/
+                                if ($rootElement.context === firstElementToRemove) {
+                                    $rootElement.context = newNode;
+                                }
                                 break;
                             }
                         }
@@ -6951,16 +10576,34 @@
                     if (parent) {
                         parent.replaceChild(newNode, firstElementToRemove);
                     }
-                    var fragment = document.createDocumentFragment();
-                    fragment.appendChild(firstElementToRemove);
-                    newNode[jqLite.expando] = firstElementToRemove[jqLite.expando];
-                    for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
-                        var element = elementsToRemove[k];
-                        jqLite(element).remove(); // must do this way to clean up expando
-                        fragment.appendChild(element);
-                        delete elementsToRemove[k];
+
+                    // Append all the `elementsToRemove` to a fragment. This will...
+                    // - remove them from the DOM
+                    // - allow them to still be traversed with .nextSibling
+                    // - allow a single fragment.qSA to fetch all elements being removed
+                    var fragment = window.document.createDocumentFragment();
+                    for (i = 0; i < removeCount; i++) {
+                        fragment.appendChild(elementsToRemove[i]);
+                    }
+
+                    if (jqLite.hasData(firstElementToRemove)) {
+                        // Copy over user data (that includes AngularJS's $scope etc.). Don't copy private
+                        // data here because there's no public interface in jQuery to do that and copying over
+                        // event listeners (which is the main use of private data) wouldn't work anyway.
+                        jqLite.data(newNode, jqLite.data(firstElementToRemove));
+
+                        // Remove $destroy event listeners from `firstElementToRemove`
+                        jqLite(firstElementToRemove).off('$destroy');
                     }
 
+                    // Cleanup any data/listeners on the elements and children.
+                    // This includes invoking the $destroy event on any elements with listeners.
+                    jqLite.cleanData(fragment.querySelectorAll('*'));
+
+                    // Update the jqLite collection to only contain the `newNode`
+                    for (i = 1; i < removeCount; i++) {
+                        delete elementsToRemove[i];
+                    }
                     elementsToRemove[0] = newNode;
                     elementsToRemove.length = 1;
                 }
@@ -6969,102 +10612,332 @@
                 function cloneAndAnnotateFn(fn, annotation) {
                     return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
                 }
-            }];
-    }
-
-    var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i;
-    /**
-     * Converts all accepted directives format into proper directive name.
-     * All of these will become 'myDirective':
-     *   my:Directive
-     *   my-directive
-     *   x-my-directive
-     *   data-my:directive
-     *
-     * Also there is special case for Moz prefix starting with upper case letter.
-     * @param name Name to normalize
-     */
-    function directiveNormalize(name) {
-        return camelCase(name.replace(PREFIX_REGEXP, ''));
-    }
 
-    /**
-     * @ngdoc type
-     * @name $compile.directive.Attributes
-     *
-     * @description
-     * A shared object between directive compile / linking functions which contains normalized DOM
-     * element attributes. The values reflect current binding state `{{ }}`. The normalization is
-     * needed since all of these are treated as equivalent in Angular:
-     *
-     *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
-     */
 
-    /**
-     * @ngdoc property
-     * @name $compile.directive.Attributes#$attr
-     * @returns {object} A map of DOM element attribute names to the normalized name. This is
-     *                   needed to do reverse lookup from normalized name back to actual name.
-     */
+                function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) {
+                    try {
+                        linkFn(scope, $element, attrs, controllers, transcludeFn);
+                    } catch (e) {
+                        $exceptionHandler(e, startingTag($element));
+                    }
+                }
 
+                function strictBindingsCheck(attrName, directiveName) {
+                    if (strictComponentBindingsEnabled) {
+                        throw $compileMinErr('missingattr',
+                            'Attribute \'{0}\' of \'{1}\' is non-optional and must be set!',
+                            attrName, directiveName);
+                    }
+                }
 
-    /**
-     * @ngdoc method
-     * @name $compile.directive.Attributes#$set
-     * @function
-     *
-     * @description
-     * Set DOM element attribute value.
-     *
-     *
-     * @param {string} name Normalized element attribute name of the property to modify. The name is
-     *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
-     *          property to the original name.
-     * @param {string} value Value to set the attribute to. The value can be an interpolated string.
-     */
+                // Set up $watches for isolate scope and controller bindings.
+                function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) {
+                    var removeWatchCollection = [];
+                    var initialChanges = {};
+                    var changes;
 
+                    forEach(bindings, function initializeBinding(definition, scopeName) {
+                        var attrName = definition.attrName,
+                            optional = definition.optional,
+                            mode = definition.mode, // @, =, <, or &
+                            lastValue,
+                            parentGet, parentSet, compare, removeWatch;
 
+                        switch (mode) {
 
-    /**
-     * Closure compiler type information
-     */
+                            case '@':
+                                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+                                    strictBindingsCheck(attrName, directive.name);
+                                    destination[scopeName] = attrs[attrName] = undefined;
 
-    function nodesetLinkingFn(
-        /* angular.Scope */ scope,
-        /* NodeList */ nodeList,
-        /* Element */ rootElement,
-        /* function(Function) */ boundTranscludeFn
-        ){}
+                                }
+                                removeWatch = attrs.$observe(attrName, function(value) {
+                                    if (isString(value) || isBoolean(value)) {
+                                        var oldValue = destination[scopeName];
+                                        recordChanges(scopeName, value, oldValue);
+                                        destination[scopeName] = value;
+                                    }
+                                });
+                                attrs.$$observers[attrName].$$scope = scope;
+                                lastValue = attrs[attrName];
+                                if (isString(lastValue)) {
+                                    // If the attribute has been provided then we trigger an interpolation to ensure
+                                    // the value is there for use in the link fn
+                                    destination[scopeName] = $interpolate(lastValue)(scope);
+                                } else if (isBoolean(lastValue)) {
+                                    // If the attributes is one of the BOOLEAN_ATTR then AngularJS will have converted
+                                    // the value to boolean rather than a string, so we special case this situation
+                                    destination[scopeName] = lastValue;
+                                }
+                                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
+                                removeWatchCollection.push(removeWatch);
+                                break;
 
-    function directiveLinkingFn(
-        /* nodesetLinkingFn */ nodesetLinkingFn,
-        /* angular.Scope */ scope,
-        /* Node */ node,
-        /* Element */ rootElement,
-        /* function(Function) */ boundTranscludeFn
-        ){}
+                            case '=':
+                                if (!hasOwnProperty.call(attrs, attrName)) {
+                                    if (optional) break;
+                                    strictBindingsCheck(attrName, directive.name);
+                                    attrs[attrName] = undefined;
+                                }
+                                if (optional && !attrs[attrName]) break;
 
-    function tokenDifference(str1, str2) {
-        var values = '',
-            tokens1 = str1.split(/\s+/),
-            tokens2 = str2.split(/\s+/);
+                                parentGet = $parse(attrs[attrName]);
+                                if (parentGet.literal) {
+                                    compare = equals;
+                                } else {
+                                    compare = simpleCompare;
+                                }
+                                parentSet = parentGet.assign || function() {
+                                    // reset the change, or we will throw this exception on every $digest
+                                    lastValue = destination[scopeName] = parentGet(scope);
+                                    throw $compileMinErr('nonassign',
+                                        'Expression \'{0}\' in attribute \'{1}\' used with directive \'{2}\' is non-assignable!',
+                                        attrs[attrName], attrName, directive.name);
+                                };
+                                lastValue = destination[scopeName] = parentGet(scope);
+                                var parentValueWatch = function parentValueWatch(parentValue) {
+                                    if (!compare(parentValue, destination[scopeName])) {
+                                        // we are out of sync and need to copy
+                                        if (!compare(parentValue, lastValue)) {
+                                            // parent changed and it has precedence
+                                            destination[scopeName] = parentValue;
+                                        } else {
+                                            // if the parent can be assigned then do so
+                                            parentSet(scope, parentValue = destination[scopeName]);
+                                        }
+                                    }
+                                    lastValue = parentValue;
+                                    return lastValue;
+                                };
+                                parentValueWatch.$stateful = true;
+                                if (definition.collection) {
+                                    removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch);
+                                } else {
+                                    removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
+                                }
+                                removeWatchCollection.push(removeWatch);
+                                break;
+
+                            case '<':
+                                if (!hasOwnProperty.call(attrs, attrName)) {
+                                    if (optional) break;
+                                    strictBindingsCheck(attrName, directive.name);
+                                    attrs[attrName] = undefined;
+                                }
+                                if (optional && !attrs[attrName]) break;
+
+                                parentGet = $parse(attrs[attrName]);
+                                var deepWatch = parentGet.literal;
+
+                                var initialValue = destination[scopeName] = parentGet(scope);
+                                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
+
+                                removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) {
+                                    if (oldValue === newValue) {
+                                        if (oldValue === initialValue || (deepWatch && equals(oldValue, initialValue))) {
+                                            return;
+                                        }
+                                        oldValue = initialValue;
+                                    }
+                                    recordChanges(scopeName, newValue, oldValue);
+                                    destination[scopeName] = newValue;
+                                }, deepWatch);
+
+                                removeWatchCollection.push(removeWatch);
+                                break;
+
+                            case '&':
+                                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+                                    strictBindingsCheck(attrName, directive.name);
+                                }
+                                // Don't assign Object.prototype method to scope
+                                parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop;
+
+                                // Don't assign noop to destination if expression is not valid
+                                if (parentGet === noop && optional) break;
+
+                                destination[scopeName] = function(locals) {
+                                    return parentGet(scope, locals);
+                                };
+                                break;
+                        }
+                    });
+
+                    function recordChanges(key, currentValue, previousValue) {
+                        if (isFunction(destination.$onChanges) && !simpleCompare(currentValue, previousValue)) {
+                            // If we have not already scheduled the top level onChangesQueue handler then do so now
+                            if (!onChangesQueue) {
+                                scope.$$postDigest(flushOnChangesQueue);
+                                onChangesQueue = [];
+                            }
+                            // If we have not already queued a trigger of onChanges for this controller then do so now
+                            if (!changes) {
+                                changes = {};
+                                onChangesQueue.push(triggerOnChangesHook);
+                            }
+                            // If the has been a change on this property already then we need to reuse the previous value
+                            if (changes[key]) {
+                                previousValue = changes[key].previousValue;
+                            }
+                            // Store this change
+                            changes[key] = new SimpleChange(previousValue, currentValue);
+                        }
+                    }
+
+                    function triggerOnChangesHook() {
+                        destination.$onChanges(changes);
+                        // Now clear the changes so that we schedule onChanges when more changes arrive
+                        changes = undefined;
+                    }
+
+                    return {
+                        initialChanges: initialChanges,
+                        removeWatches: removeWatchCollection.length && function removeWatches() {
+                            for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) {
+                                removeWatchCollection[i]();
+                            }
+                        }
+                    };
+                }
+            }];
+    }
+
+    function SimpleChange(previous, current) {
+        this.previousValue = previous;
+        this.currentValue = current;
+    }
+    SimpleChange.prototype.isFirstChange = function() { return this.previousValue === _UNINITIALIZED_VALUE; };
+
+
+    var PREFIX_REGEXP = /^((?:x|data)[:\-_])/i;
+    var SPECIAL_CHARS_REGEXP = /[:\-_]+(.)/g;
+
+    /**
+     * Converts all accepted directives format into proper directive name.
+     * @param name Name to normalize
+     */
+    function directiveNormalize(name) {
+        return name
+            .replace(PREFIX_REGEXP, '')
+            .replace(SPECIAL_CHARS_REGEXP, function(_, letter, offset) {
+                return offset ? letter.toUpperCase() : letter;
+            });
+    }
+
+    /**
+     * @ngdoc type
+     * @name $compile.directive.Attributes
+     *
+     * @description
+     * A shared object between directive compile / linking functions which contains normalized DOM
+     * element attributes. The values reflect current binding state `{{ }}`. The normalization is
+     * needed since all of these are treated as equivalent in AngularJS:
+     *
+     * ```
+     *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
+     * ```
+     */
+
+    /**
+     * @ngdoc property
+     * @name $compile.directive.Attributes#$attr
+     *
+     * @description
+     * A map of DOM element attribute names to the normalized name. This is
+     * needed to do reverse lookup from normalized name back to actual name.
+     */
+
+
+    /**
+     * @ngdoc method
+     * @name $compile.directive.Attributes#$set
+     * @kind function
+     *
+     * @description
+     * Set DOM element attribute value.
+     *
+     *
+     * @param {string} name Normalized element attribute name of the property to modify. The name is
+     *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
+     *          property to the original name.
+     * @param {string} value Value to set the attribute to. The value can be an interpolated string.
+     */
+
+
+
+    /**
+     * Closure compiler type information
+     */
+
+    function nodesetLinkingFn(
+        /* angular.Scope */ scope,
+        /* NodeList */ nodeList,
+        /* Element */ rootElement,
+        /* function(Function) */ boundTranscludeFn
+    ) {}
+
+    function directiveLinkingFn(
+        /* nodesetLinkingFn */ nodesetLinkingFn,
+        /* angular.Scope */ scope,
+        /* Node */ node,
+        /* Element */ rootElement,
+        /* function(Function) */ boundTranscludeFn
+    ) {}
+
+    function tokenDifference(str1, str2) {
+        var values = '',
+            tokens1 = str1.split(/\s+/),
+            tokens2 = str2.split(/\s+/);
 
         outer:
-            for(var i = 0; i < tokens1.length; i++) {
+            for (var i = 0; i < tokens1.length; i++) {
                 var token = tokens1[i];
-                for(var j = 0; j < tokens2.length; j++) {
-                    if(token == tokens2[j]) continue outer;
+                for (var j = 0; j < tokens2.length; j++) {
+                    if (token === tokens2[j]) continue outer;
                 }
                 values += (values.length > 0 ? ' ' : '') + token;
             }
         return values;
     }
 
+    function removeComments(jqNodes) {
+        jqNodes = jqLite(jqNodes);
+        var i = jqNodes.length;
+
+        if (i <= 1) {
+            return jqNodes;
+        }
+
+        while (i--) {
+            var node = jqNodes[i];
+            if (node.nodeType === NODE_TYPE_COMMENT ||
+                (node.nodeType === NODE_TYPE_TEXT && node.nodeValue.trim() === '')) {
+                splice.call(jqNodes, i, 1);
+            }
+        }
+        return jqNodes;
+    }
+
+    var $controllerMinErr = minErr('$controller');
+
+
+    var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/;
+    function identifierForController(controller, ident) {
+        if (ident && isString(ident)) return ident;
+        if (isString(controller)) {
+            var match = CNTRL_REG.exec(controller);
+            if (match) return match[3];
+        }
+    }
+
+
     /**
      * @ngdoc provider
      * @name $controllerProvider
+     * @this
+     *
      * @description
-     * The {@link ng.$controller $controller service} is used by Angular to create new
+     * The {@link ng.$controller $controller service} is used by AngularJS to create new
      * controllers.
      *
      * This provider allows controller registration via the
@@ -7072,8 +10945,16 @@
      */
     function $ControllerProvider() {
         var controllers = {},
-            CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/;
+            globals = false;
 
+        /**
+         * @ngdoc method
+         * @name $controllerProvider#has
+         * @param {string} name Controller name to check.
+         */
+        this.has = function(name) {
+            return controllers.hasOwnProperty(name);
+        };
 
         /**
          * @ngdoc method
@@ -7092,6 +10973,20 @@
             }
         };
 
+        /**
+         * @ngdoc method
+         * @name $controllerProvider#allowGlobals
+         * @description If called, allows `$controller` to find controller constructors on `window`
+         *
+         * @deprecated
+         * sinceVersion="v1.3.0"
+         * removeVersion="v1.7.0"
+         * This method of finding controllers has been deprecated.
+         */
+        this.allowGlobals = function() {
+            globals = true;
+        };
+
 
         this.$get = ['$injector', '$window', function($injector, $window) {
 
@@ -7106,7 +11001,12 @@
              *
              *    * check if a controller with given name is registered via `$controllerProvider`
              *    * check if evaluating the string on the current scope returns a constructor
-             *    * check `window[constructor]` on the global `window` object
+             *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+             *      `window` object (deprecated, not recommended)
+             *
+             *    The string can use the `controller as property` syntax, where the controller instance is published
+             *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
+             *    to work correctly.
              *
              * @param {Object} locals Injection locals for Controller.
              * @return {Object} Instance of given controller.
@@ -7117,34 +11017,95 @@
              * It's just a simple call to {@link auto.$injector $injector}, but extracted into
              * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
              */
-            return function(expression, locals) {
+            return function $controller(expression, locals, later, ident) {
+                // PRIVATE API:
+                //   param `later` --- indicates that the controller's constructor is invoked at a later time.
+                //                     If true, $controller will allocate the object with the correct
+                //                     prototype chain, but will not invoke the controller until a returned
+                //                     callback is invoked.
+                //   param `ident` --- An optional label which overrides the label parsed from the controller
+                //                     expression, if any.
                 var instance, match, constructor, identifier;
+                later = later === true;
+                if (ident && isString(ident)) {
+                    identifier = ident;
+                }
 
-                if(isString(expression)) {
-                    match = expression.match(CNTRL_REG),
-                        constructor = match[1],
-                        identifier = match[3];
+                if (isString(expression)) {
+                    match = expression.match(CNTRL_REG);
+                    if (!match) {
+                        throw $controllerMinErr('ctrlfmt',
+                            'Badly formed controller string \'{0}\'. ' +
+                            'Must match `__name__ as __id__` or `__name__`.', expression);
+                    }
+                    constructor = match[1];
+                    identifier = identifier || match[3];
                     expression = controllers.hasOwnProperty(constructor)
                         ? controllers[constructor]
-                        : getter(locals.$scope, constructor, true) || getter($window, constructor, true);
+                        : getter(locals.$scope, constructor, true) ||
+                        (globals ? getter($window, constructor, true) : undefined);
+
+                    if (!expression) {
+                        throw $controllerMinErr('ctrlreg',
+                            'The controller with the name \'{0}\' is not registered.', constructor);
+                    }
 
                     assertArgFn(expression, constructor, true);
                 }
 
-                instance = $injector.instantiate(expression, locals);
-
-                if (identifier) {
-                    if (!(locals && typeof locals.$scope == 'object')) {
-                        throw minErr('$controller')('noscp',
-                            "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",
-                            constructor || expression.name, identifier);
+                if (later) {
+                    // Instantiate controller later:
+                    // This machinery is used to create an instance of the object before calling the
+                    // controller's constructor itself.
+                    //
+                    // This allows properties to be added to the controller before the constructor is
+                    // invoked. Primarily, this is used for isolate scope bindings in $compile.
+                    //
+                    // This feature is not intended for use by applications, and is thus not documented
+                    // publicly.
+                    // Object creation: http://jsperf.com/create-constructor/2
+                    var controllerPrototype = (isArray(expression) ?
+                        expression[expression.length - 1] : expression).prototype;
+                    instance = Object.create(controllerPrototype || null);
+
+                    if (identifier) {
+                        addIdentifier(locals, identifier, instance, constructor || expression.name);
                     }
 
-                    locals.$scope[identifier] = instance;
+                    return extend(function $controllerInit() {
+                        var result = $injector.invoke(expression, instance, locals, constructor);
+                        if (result !== instance && (isObject(result) || isFunction(result))) {
+                            instance = result;
+                            if (identifier) {
+                                // If result changed, re-assign controllerAs value to scope.
+                                addIdentifier(locals, identifier, instance, constructor || expression.name);
+                            }
+                        }
+                        return instance;
+                    }, {
+                        instance: instance,
+                        identifier: identifier
+                    });
+                }
+
+                instance = $injector.instantiate(expression, locals, constructor);
+
+                if (identifier) {
+                    addIdentifier(locals, identifier, instance, constructor || expression.name);
                 }
 
                 return instance;
             };
+
+            function addIdentifier(locals, identifier, instance, name) {
+                if (!(locals && isObject(locals.$scope))) {
+                    throw minErr('$controller')('noscp',
+                        'Cannot export controller \'{0}\' as \'{1}\'! No $scope object provided via `locals`.',
+                        name, identifier);
+                }
+
+                locals.$scope[identifier] = instance;
+            }
         }];
     }
 
@@ -7152,39 +11113,69 @@
      * @ngdoc service
      * @name $document
      * @requires $window
+     * @this
      *
      * @description
      * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
      *
      * @example
-     <example>
+     <example module="documentExample" name="document">
      <file name="index.html">
-     <div ng-controller="MainCtrl">
+     <div ng-controller="ExampleController">
      <p>$document title: <b ng-bind="title"></b></p>
      <p>window.document title: <b ng-bind="windowTitle"></b></p>
      </div>
      </file>
      <file name="script.js">
-     function MainCtrl($scope, $document) {
-         $scope.title = $document[0].title;
-         $scope.windowTitle = angular.element(window.document)[0].title;
-       }
+     angular.module('documentExample', [])
+     .controller('ExampleController', ['$scope', '$document', function($scope, $document) {
+           $scope.title = $document[0].title;
+           $scope.windowTitle = angular.element(window.document)[0].title;
+         }]);
      </file>
      </example>
      */
-    function $DocumentProvider(){
-        this.$get = ['$window', function(window){
+    function $DocumentProvider() {
+        this.$get = ['$window', function(window) {
             return jqLite(window.document);
         }];
     }
 
+
+    /**
+     * @private
+     * @this
+     * Listens for document visibility change and makes the current status accessible.
+     */
+    function $$IsDocumentHiddenProvider() {
+        this.$get = ['$document', '$rootScope', function($document, $rootScope) {
+            var doc = $document[0];
+            var hidden = doc && doc.hidden;
+
+            $document.on('visibilitychange', changeListener);
+
+            $rootScope.$on('$destroy', function() {
+                $document.off('visibilitychange', changeListener);
+            });
+
+            function changeListener() {
+                hidden = doc.hidden;
+            }
+
+            return function() {
+                return hidden;
+            };
+        }];
+    }
+
     /**
      * @ngdoc service
      * @name $exceptionHandler
      * @requires ng.$log
+     * @this
      *
      * @description
-     * Any uncaught exception in angular expressions is delegated to this service.
+     * Any uncaught exception in AngularJS expressions is delegated to this service.
      * The default implementation simply delegates to `$log.error` which logs it into
      * the browser console.
      *
@@ -7193,20 +11184,31 @@
      *
      * ## Example:
      *
+     * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
+     * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
+     * of `$log.error()`.
+     *
      * ```js
-     *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function () {
- *     return function (exception, cause) {
- *       exception.message += ' (caused by "' + cause + '")';
- *       throw exception;
- *     };
- *   });
+     *   angular.
+     *     module('exceptionOverwrite', []).
+     *     factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
+     *       return function myExceptionHandler(exception, cause) {
+     *         logErrorsToBackend(exception, cause);
+     *         $log.warn(exception, cause);
+     *       };
+     *     }]);
      * ```
      *
-     * This example will override the normal action of `$exceptionHandler`, to make angular
-     * exceptions fail hard when they happen, instead of just logging to the console.
+     * <hr />
+     * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
+     * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
+     * (unless executed during a digest).
+     *
+     * If you wish, you can manually delegate exceptions, e.g.
+     * `try { ... } catch(e) { $exceptionHandler(e); }`
      *
      * @param {Error} exception Exception associated with the error.
-     * @param {string=} cause optional information about the context in which
+     * @param {string=} cause Optional information about the context in which
      *       the error was thrown.
      *
      */
@@ -7218,110 +11220,349 @@
         }];
     }
 
-    /**
-     * Parse headers into key value object
-     *
-     * @param {string} headers Raw headers as a string
-     * @returns {Object} Parsed headers as key value object
-     */
-    function parseHeaders(headers) {
-        var parsed = {}, key, val, i;
-
-        if (!headers) return parsed;
-
-        forEach(headers.split('\n'), function(line) {
-            i = line.indexOf(':');
-            key = lowercase(trim(line.substr(0, i)));
-            val = trim(line.substr(i + 1));
-
-            if (key) {
-                if (parsed[key]) {
-                    parsed[key] += ', ' + val;
+    var $$ForceReflowProvider = /** @this */ function() {
+        this.$get = ['$document', function($document) {
+            return function(domNode) {
+                //the line below will force the browser to perform a repaint so
+                //that all the animated elements within the animation frame will
+                //be properly updated and drawn on screen. This is required to
+                //ensure that the preparation animation is properly flushed so that
+                //the active state picks up from there. DO NOT REMOVE THIS LINE.
+                //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
+                //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
+                //WILL TAKE YEARS AWAY FROM YOUR LIFE.
+                if (domNode) {
+                    if (!domNode.nodeType && domNode instanceof jqLite) {
+                        domNode = domNode[0];
+                    }
                 } else {
-                    parsed[key] = val;
+                    domNode = $document[0].body;
                 }
-            }
-        });
-
-        return parsed;
-    }
-
-
-    /**
-     * Returns a function that provides access to parsed headers.
-     *
-     * Headers are lazy parsed when first requested.
-     * @see parseHeaders
-     *
-     * @param {(string|Object)} headers Headers to provide access to.
-     * @returns {function(string=)} Returns a getter function which if called with:
-     *
-     *   - if called with single an argument returns a single header value or null
-     *   - if called with no arguments returns an object containing all headers.
-     */
-    function headersGetter(headers) {
-        var headersObj = isObject(headers) ? headers : undefined;
-
-        return function(name) {
-            if (!headersObj) headersObj =  parseHeaders(headers);
+                return domNode.offsetWidth + 1;
+            };
+        }];
+    };
 
-            if (name) {
-                return headersObj[lowercase(name)] || null;
-            }
+    var APPLICATION_JSON = 'application/json';
+    var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'};
+    var JSON_START = /^\[|^\{(?!\{)/;
+    var JSON_ENDS = {
+        '[': /]$/,
+        '{': /}$/
+    };
+    var JSON_PROTECTION_PREFIX = /^\)]\}',?\n/;
+    var $httpMinErr = minErr('$http');
 
-            return headersObj;
-        };
+    function serializeValue(v) {
+        if (isObject(v)) {
+            return isDate(v) ? v.toISOString() : toJson(v);
+        }
+        return v;
     }
 
 
-    /**
-     * Chain all given functions
-     *
-     * This function is used for both request and response transforming
-     *
-     * @param {*} data Data to transform.
-     * @param {function(string=)} headers Http headers getter fn.
-     * @param {(Function|Array.<Function>)} fns Function or an array of functions.
-     * @returns {*} Transformed data.
-     */
-    function transformData(data, headers, fns) {
-        if (isFunction(fns))
-            return fns(data, headers);
-
-        forEach(fns, function(fn) {
-            data = fn(data, headers);
-        });
-
-        return data;
-    }
+    /** @this */
+    function $HttpParamSerializerProvider() {
+        /**
+         * @ngdoc service
+         * @name $httpParamSerializer
+         * @description
+         *
+         * Default {@link $http `$http`} params serializer that converts objects to strings
+         * according to the following rules:
+         *
+         * * `{'foo': 'bar'}` results in `foo=bar`
+         * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
+         * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
+         * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+         *
+         * Note that serializer will sort the request parameters alphabetically.
+         * */
 
+        this.$get = function() {
+            return function ngParamSerializer(params) {
+                if (!params) return '';
+                var parts = [];
+                forEachSorted(params, function(value, key) {
+                    if (value === null || isUndefined(value) || isFunction(value)) return;
+                    if (isArray(value)) {
+                        forEach(value, function(v) {
+                            parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
+                        });
+                    } else {
+                        parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
+                    }
+                });
 
-    function isSuccess(status) {
-        return 200 <= status && status < 300;
+                return parts.join('&');
+            };
+        };
     }
 
+    /** @this */
+    function $HttpParamSerializerJQLikeProvider() {
+        /**
+         * @ngdoc service
+         * @name $httpParamSerializerJQLike
+         *
+         * @description
+         *
+         * Alternative {@link $http `$http`} params serializer that follows
+         * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
+         * The serializer will also sort the params alphabetically.
+         *
+         * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
+         *
+         * ```js
+         * $http({
+         *   url: myUrl,
+         *   method: 'GET',
+         *   params: myParams,
+         *   paramSerializer: '$httpParamSerializerJQLike'
+         * });
+         * ```
+         *
+         * It is also possible to set it as the default `paramSerializer` in the
+         * {@link $httpProvider#defaults `$httpProvider`}.
+         *
+         * Additionally, you can inject the serializer and use it explicitly, for example to serialize
+         * form data for submission:
+         *
+         * ```js
+         * .controller(function($http, $httpParamSerializerJQLike) {
+         *   //...
+         *
+         *   $http({
+         *     url: myUrl,
+         *     method: 'POST',
+         *     data: $httpParamSerializerJQLike(myData),
+         *     headers: {
+         *       'Content-Type': 'application/x-www-form-urlencoded'
+         *     }
+         *   });
+         *
+         * });
+         * ```
+         *
+         * */
+        this.$get = function() {
+            return function jQueryLikeParamSerializer(params) {
+                if (!params) return '';
+                var parts = [];
+                serialize(params, '', true);
+                return parts.join('&');
+
+                function serialize(toSerialize, prefix, topLevel) {
+                    if (toSerialize === null || isUndefined(toSerialize)) return;
+                    if (isArray(toSerialize)) {
+                        forEach(toSerialize, function(value, index) {
+                            serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
+                        });
+                    } else if (isObject(toSerialize) && !isDate(toSerialize)) {
+                        forEachSorted(toSerialize, function(value, key) {
+                            serialize(value, prefix +
+                                (topLevel ? '' : '[') +
+                                key +
+                                (topLevel ? '' : ']'));
+                        });
+                    } else {
+                        parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+                    }
+                }
+            };
+        };
+    }
+
+    function defaultHttpResponseTransform(data, headers) {
+        if (isString(data)) {
+            // Strip json vulnerability protection prefix and trim whitespace
+            var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
+
+            if (tempData) {
+                var contentType = headers('Content-Type');
+                var hasJsonContentType = contentType && (contentType.indexOf(APPLICATION_JSON) === 0);
+
+                if (hasJsonContentType || isJsonLike(tempData)) {
+                    try {
+                        data = fromJson(tempData);
+                    } catch (e) {
+                        if (!hasJsonContentType) {
+                            return data;
+                        }
+                        throw $httpMinErr('baddata', 'Data must be a valid JSON object. Received: "{0}". ' +
+                            'Parse error: "{1}"', data, e);
+                    }
+                }
+            }
+        }
+
+        return data;
+    }
+
+    function isJsonLike(str) {
+        var jsonStart = str.match(JSON_START);
+        return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
+    }
+
+    /**
+     * Parse headers into key value object
+     *
+     * @param {string} headers Raw headers as a string
+     * @returns {Object} Parsed headers as key value object
+     */
+    function parseHeaders(headers) {
+        var parsed = createMap(), i;
+
+        function fillInParsed(key, val) {
+            if (key) {
+                parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+            }
+        }
+
+        if (isString(headers)) {
+            forEach(headers.split('\n'), function(line) {
+                i = line.indexOf(':');
+                fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
+            });
+        } else if (isObject(headers)) {
+            forEach(headers, function(headerVal, headerKey) {
+                fillInParsed(lowercase(headerKey), trim(headerVal));
+            });
+        }
+
+        return parsed;
+    }
+
+
+    /**
+     * Returns a function that provides access to parsed headers.
+     *
+     * Headers are lazy parsed when first requested.
+     * @see parseHeaders
+     *
+     * @param {(string|Object)} headers Headers to provide access to.
+     * @returns {function(string=)} Returns a getter function which if called with:
+     *
+     *   - if called with an argument returns a single header value or null
+     *   - if called with no arguments returns an object containing all headers.
+     */
+    function headersGetter(headers) {
+        var headersObj;
+
+        return function(name) {
+            if (!headersObj) headersObj =  parseHeaders(headers);
+
+            if (name) {
+                var value = headersObj[lowercase(name)];
+                if (value === undefined) {
+                    value = null;
+                }
+                return value;
+            }
+
+            return headersObj;
+        };
+    }
+
+
+    /**
+     * Chain all given functions
+     *
+     * This function is used for both request and response transforming
+     *
+     * @param {*} data Data to transform.
+     * @param {function(string=)} headers HTTP headers getter fn.
+     * @param {number} status HTTP status code of the response.
+     * @param {(Function|Array.<Function>)} fns Function or an array of functions.
+     * @returns {*} Transformed data.
+     */
+    function transformData(data, headers, status, fns) {
+        if (isFunction(fns)) {
+            return fns(data, headers, status);
+        }
+
+        forEach(fns, function(fn) {
+            data = fn(data, headers, status);
+        });
+
+        return data;
+    }
+
+
+    function isSuccess(status) {
+        return 200 <= status && status < 300;
+    }
 
-    function $HttpProvider() {
-        var JSON_START = /^\s*(\[|\{[^\{])/,
-            JSON_END = /[\}\]]\s*$/,
-            PROTECTION_PREFIX = /^\)\]\}',?\n/,
-            CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': 'application/json;charset=utf-8'};
-
+
+    /**
+     * @ngdoc provider
+     * @name $httpProvider
+     * @this
+     *
+     * @description
+     * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
+     * */
+    function $HttpProvider() {
+        /**
+         * @ngdoc property
+         * @name $httpProvider#defaults
+         * @description
+         *
+         * Object containing default values for all {@link ng.$http $http} requests.
+         *
+         * - **`defaults.cache`** - {boolean|Object} - A boolean value or object created with
+         * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of HTTP responses
+         * by default. See {@link $http#caching $http Caching} for more information.
+         *
+         * - **`defaults.headers`** - {Object} - Default headers for all $http requests.
+         * Refer to {@link ng.$http#setting-http-headers $http} for documentation on
+         * setting default headers.
+         *     - **`defaults.headers.common`**
+         *     - **`defaults.headers.post`**
+         *     - **`defaults.headers.put`**
+         *     - **`defaults.headers.patch`**
+         *
+         * - **`defaults.jsonpCallbackParam`** - `{string}` - the name of the query parameter that passes the name of the
+         * callback in a JSONP request. The value of this parameter will be replaced with the expression generated by the
+         * {@link $jsonpCallbacks} service. Defaults to `'callback'`.
+         *
+         * - **`defaults.paramSerializer`** - `{string|function(Object<string,string>):string}` - A function
+         *  used to the prepare string representation of request parameters (specified as an object).
+         *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
+         *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
+         *
+         * - **`defaults.transformRequest`** -
+         * `{Array<function(data, headersGetter)>|function(data, headersGetter)}` -
+         * An array of functions (or a single function) which are applied to the request data.
+         * By default, this is an array with one request transformation function:
+         *
+         *   - If the `data` property of the request configuration object contains an object, serialize it
+         *     into JSON format.
+         *
+         * - **`defaults.transformResponse`** -
+         * `{Array<function(data, headersGetter, status)>|function(data, headersGetter, status)}` -
+         * An array of functions (or a single function) which are applied to the response data. By default,
+         * this is an array which applies one response transformation function that does two things:
+         *
+         *  - If XSRF prefix is detected, strip it
+         *    (see {@link ng.$http#security-considerations Security Considerations in the $http docs}).
+         *  - If the `Content-Type` is `application/json` or the response looks like JSON,
+         *    deserialize it using a JSON parser.
+         *
+         * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
+         * Defaults value is `'XSRF-TOKEN'`.
+         *
+         * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the
+         * XSRF token. Defaults value is `'X-XSRF-TOKEN'`.
+         *
+         **/
         var defaults = this.defaults = {
             // transform incoming response data
-            transformResponse: [function(data) {
-                if (isString(data)) {
-                    // strip json vulnerability protection prefix
-                    data = data.replace(PROTECTION_PREFIX, '');
-                    if (JSON_START.test(data) && JSON_END.test(data))
-                        data = fromJson(data);
-                }
-                return data;
-            }],
+            transformResponse: [defaultHttpResponseTransform],
 
             // transform outgoing request data
             transformRequest: [function(d) {
-                return isObject(d) && !isFile(d) && !isBlob(d) ? toJson(d) : d;
+                return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d;
             }],
 
             // default headers
@@ -7329,32 +11570,73 @@
                 common: {
                     'Accept': 'application/json, text/plain, */*'
                 },
-                post:   copy(CONTENT_TYPE_APPLICATION_JSON),
-                put:    copy(CONTENT_TYPE_APPLICATION_JSON),
-                patch:  copy(CONTENT_TYPE_APPLICATION_JSON)
+                post:   shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+                put:    shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+                patch:  shallowCopy(CONTENT_TYPE_APPLICATION_JSON)
             },
 
             xsrfCookieName: 'XSRF-TOKEN',
-            xsrfHeaderName: 'X-XSRF-TOKEN'
+            xsrfHeaderName: 'X-XSRF-TOKEN',
+
+            paramSerializer: '$httpParamSerializer',
+
+            jsonpCallbackParam: 'callback'
         };
 
+        var useApplyAsync = false;
         /**
-         * Are ordered by request, i.e. they are applied in the same order as the
-         * array, on request, but reverse order, on response.
-         */
-        var interceptorFactories = this.interceptors = [];
+         * @ngdoc method
+         * @name $httpProvider#useApplyAsync
+         * @description
+         *
+         * Configure $http service to combine processing of multiple http responses received at around
+         * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in
+         * significant performance improvement for bigger applications that make many HTTP requests
+         * concurrently (common during application bootstrap).
+         *
+         * Defaults to false. If no value is specified, returns the current configured value.
+         *
+         * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
+         *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
+         *    to load and share the same digest cycle.
+         *
+         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+         *    otherwise, returns the current configured value.
+         **/
+        this.useApplyAsync = function(value) {
+            if (isDefined(value)) {
+                useApplyAsync = !!value;
+                return this;
+            }
+            return useApplyAsync;
+        };
 
         /**
-         * For historical reasons, response interceptors are ordered by the order in which
-         * they are applied to the response. (This is the opposite of interceptorFactories)
-         */
-        var responseInterceptorFactories = this.responseInterceptors = [];
+         * @ngdoc property
+         * @name $httpProvider#interceptors
+         * @description
+         *
+         * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
+         * pre-processing of request or postprocessing of responses.
+         *
+         * These service factories are ordered by request, i.e. they are applied in the same order as the
+         * array, on request, but reverse order, on response.
+         *
+         * {@link ng.$http#interceptors Interceptors detailed info}
+         **/
+        var interceptorFactories = this.interceptors = [];
 
-        this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector',
-            function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) {
+        this.$get = ['$browser', '$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector', '$sce',
+            function($browser, $httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector, $sce) {
 
                 var defaultCache = $cacheFactory('$http');
 
+                /**
+                 * Make sure that default param serializer is exposed as a function
+                 */
+                defaults.paramSerializer = isString(defaults.paramSerializer) ?
+                    $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
+
                 /**
                  * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
                  * The reversal is needed so that we can build up the interception chain around the
@@ -7367,27 +11649,6 @@
                         ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
                 });
 
-                forEach(responseInterceptorFactories, function(interceptorFactory, index) {
-                    var responseFn = isString(interceptorFactory)
-                        ? $injector.get(interceptorFactory)
-                        : $injector.invoke(interceptorFactory);
-
-                    /**
-                     * Response interceptors go before "around" interceptors (no real reason, just
-                     * had to pick one.) But they are already reversed, so we can't use unshift, hence
-                     * the splice.
-                     */
-                    reversedInterceptors.splice(index, 0, {
-                        response: function(response) {
-                            return responseFn($q.when(response));
-                        },
-                        responseError: function(response) {
-                            return responseFn($q.reject(response));
-                        }
-                    });
-                });
-
-
                 /**
                  * @ngdoc service
                  * @kind function
@@ -7399,7 +11660,7 @@
                  * @requires $injector
                  *
                  * @description
-                 * The `$http` service is a core Angular service that facilitates communication with the remote
+                 * The `$http` service is a core AngularJS service that facilitates communication with the remote
                  * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest)
                  * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP).
                  *
@@ -7414,52 +11675,52 @@
                  * it is important to familiarize yourself with these APIs and the guarantees they provide.
                  *
                  *
-                 * # General usage
-                 * The `$http` service is a function which takes a single argument — a configuration object —
-                 * that is used to generate an HTTP request and returns  a {@link ng.$q promise}
-                 * with two $http specific methods: `success` and `error`.
+                 * ## General usage
+                 * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} —
+                 * that is used to generate an HTTP request and returns  a {@link ng.$q promise}.
                  *
                  * ```js
-                 *   $http({method: 'GET', url: '/someUrl'}).
-                 *     success(function(data, status, headers, config) {
-     *       // this callback will be called asynchronously
-     *       // when the response is available
-     *     }).
-                 *     error(function(data, status, headers, config) {
-     *       // called asynchronously if an error occurs
-     *       // or server returns response with an error status.
-     *     });
+                 *   // Simple GET request example:
+                 *   $http({
+                 *     method: 'GET',
+                 *     url: '/someUrl'
+                 *   }).then(function successCallback(response) {
+                 *       // this callback will be called asynchronously
+                 *       // when the response is available
+                 *     }, function errorCallback(response) {
+                 *       // called asynchronously if an error occurs
+                 *       // or server returns response with an error status.
+                 *     });
                  * ```
                  *
-                 * Since the returned value of calling the $http function is a `promise`, you can also use
-                 * the `then` method to register callbacks, and these callbacks will receive a single argument –
-                 * an object representing the response. See the API signature and type info below for more
-                 * details.
+                 * The response object has these properties:
                  *
-                 * A response status code between 200 and 299 is considered a success status and
-                 * will result in the success callback being called. Note that if the response is a redirect,
-                 * XMLHttpRequest will transparently follow it, meaning that the error callback will not be
-                 * called for such responses.
+                 *   - **data** – `{string|Object}` – The response body transformed with the transform
+                 *     functions.
+                 *   - **status** – `{number}` – HTTP status code of the response.
+                 *   - **headers** – `{function([headerName])}` – Header getter function.
+                 *   - **config** – `{Object}` – The configuration object that was used to generate the request.
+                 *   - **statusText** – `{string}` – HTTP status text of the response.
+                 *   - **xhrStatus** – `{string}` – Status of the XMLHttpRequest (`complete`, `error`, `timeout` or `abort`).
                  *
-                 * # Writing Unit Tests that use $http
-                 * When unit testing (using {@link ngMock ngMock}), it is necessary to call
-                 * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
-                 * request using trained responses.
+                 * A response status code between 200 and 299 is considered a success status and will result in
+                 * the success callback being called. Any response status code outside of that range is
+                 * considered an error status and will result in the error callback being called.
+                 * Also, status codes less than -1 are normalized to zero. -1 usually means the request was
+                 * aborted, e.g. using a `config.timeout`.
+                 * Note that if the response is a redirect, XMLHttpRequest will transparently follow it, meaning
+                 * that the outcome (success or error) will be determined by the final response status code.
                  *
-                 * ```
-                 * $httpBackend.expectGET(...);
-                 * $http.get(...);
-                 * $httpBackend.flush();
-                 * ```
                  *
-                 * # Shortcut methods
+                 * ## Shortcut methods
                  *
                  * Shortcut methods are also available. All shortcut methods require passing in the URL, and
-                 * request data must be passed in for POST/PUT requests.
+                 * request data must be passed in for POST/PUT requests. An optional config can be passed as the
+                 * last argument.
                  *
                  * ```js
-                 *   $http.get('/someUrl').success(successCallback);
-                 *   $http.post('/someUrl', data).success(successCallback);
+                 *   $http.get('/someUrl', config).then(successCallback, errorCallback);
+                 *   $http.post('/someUrl', data, config).then(successCallback, errorCallback);
                  * ```
                  *
                  * Complete list of shortcut methods:
@@ -7470,16 +11731,28 @@
                  * - {@link ng.$http#put $http.put}
                  * - {@link ng.$http#delete $http.delete}
                  * - {@link ng.$http#jsonp $http.jsonp}
+                 * - {@link ng.$http#patch $http.patch}
+                 *
                  *
+                 * ## Writing Unit Tests that use $http
+                 * When unit testing (using {@link ngMock ngMock}), it is necessary to call
+                 * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
+                 * request using trained responses.
+                 *
+                 * ```
+                 * $httpBackend.expectGET(...);
+                 * $http.get(...);
+                 * $httpBackend.flush();
+                 * ```
                  *
-                 * # Setting HTTP Headers
+                 * ## Setting HTTP Headers
                  *
                  * The $http service will automatically add certain HTTP headers to all requests. These defaults
                  * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration
                  * object, which currently contains this default configuration:
                  *
                  * - `$httpProvider.defaults.headers.common` (headers that are common for all requests):
-                 *   - `Accept: application/json, text/plain, * / *`
+                 *   - <code>Accept: application/json, text/plain, \*&#65279;/&#65279;\*</code>
                  * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests)
                  *   - `Content-Type: application/json`
                  * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests)
@@ -7488,74 +11761,143 @@
                  * To add or overwrite these defaults, simply add or remove a property from these configuration
                  * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object
                  * with the lowercased HTTP method name as the key, e.g.
-                 * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }.
+                 * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`.
                  *
                  * The defaults can also be set at runtime via the `$http.defaults` object in the same
                  * fashion. For example:
                  *
                  * ```
                  * module.run(function($http) {
-     *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'
-     * });
+                 *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w';
+                 * });
                  * ```
                  *
                  * In addition, you can supply a `headers` property in the config object passed when
                  * calling `$http(config)`, which overrides the defaults without changing them globally.
                  *
+                 * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
+                 * Use the `headers` property, setting the desired header to `undefined`. For example:
+                 *
+                 * ```js
+                 * var req = {
+                 *  method: 'POST',
+                 *  url: 'http://example.com',
+                 *  headers: {
+                 *    'Content-Type': undefined
+                 *  },
+                 *  data: { test: 'test' }
+                 * }
+                 *
+                 * $http(req).then(function(){...}, function(){...});
+                 * ```
+                 *
+                 * ## Transforming Requests and Responses
+                 *
+                 * Both requests and responses can be transformed using transformation functions: `transformRequest`
+                 * and `transformResponse`. These properties can be a single function that returns
+                 * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions,
+                 * which allows you to `push` or `unshift` a new transformation function into the transformation chain.
                  *
-                 * # Transforming Requests and Responses
+                 * <div class="alert alert-warning">
+                 * **Note:** AngularJS does not make a copy of the `data` parameter before it is passed into the `transformRequest` pipeline.
+                 * That means changes to the properties of `data` are not local to the transform function (since Javascript passes objects by reference).
+                 * For example, when calling `$http.get(url, $scope.myObject)`, modifications to the object's properties in a transformRequest
+                 * function will be reflected on the scope and in any templates where the object is data-bound.
+                 * To prevent this, transform functions should have no side-effects.
+                 * If you need to modify properties, it is recommended to make a copy of the data, or create new object to return.
+                 * </div>
+                 *
+                 * ### Default Transformations
+                 *
+                 * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
+                 * `defaults.transformResponse` properties. If a request does not provide its own transformations
+                 * then these will be applied.
                  *
-                 * Both requests and responses can be transformed using transform functions. By default, Angular
-                 * applies these transformations:
+                 * You can augment or replace the default transformations by modifying these properties by adding to or
+                 * replacing the array.
                  *
-                 * Request transformations:
+                 * AngularJS provides the following default transformations:
+                 *
+                 * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`) is
+                 * an array with one function that does the following:
                  *
                  * - If the `data` property of the request configuration object contains an object, serialize it
                  *   into JSON format.
                  *
-                 * Response transformations:
+                 * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`) is
+                 * an array with one function that does the following:
                  *
                  *  - If XSRF prefix is detected, strip it (see Security Considerations section below).
-                 *  - If JSON response is detected, deserialize it using a JSON parser.
+                 *  - If the `Content-Type` is `application/json` or the response looks like JSON,
+                 *      deserialize it using a JSON parser.
+                 *
                  *
-                 * To globally augment or override the default transforms, modify the
-                 * `$httpProvider.defaults.transformRequest` and `$httpProvider.defaults.transformResponse`
-                 * properties. These properties are by default an array of transform functions, which allows you
-                 * to `push` or `unshift` a new transformation function into the transformation chain. You can
-                 * also decide to completely override any default transformations by assigning your
-                 * transformation functions to these properties directly without the array wrapper.  These defaults
-                 * are again available on the $http factory at run-time, which may be useful if you have run-time
-                 * services you wish to be involved in your transformations.
+                 * ### Overriding the Default Transformations Per Request
                  *
-                 * Similarly, to locally override the request/response transforms, augment the
-                 * `transformRequest` and/or `transformResponse` properties of the configuration object passed
+                 * If you wish to override the request/response transformations only for a single request then provide
+                 * `transformRequest` and/or `transformResponse` properties on the configuration object passed
                  * into `$http`.
                  *
+                 * Note that if you provide these properties on the config object the default transformations will be
+                 * overwritten. If you wish to augment the default transformations then you must include them in your
+                 * local transformation array.
+                 *
+                 * The following code demonstrates adding a new response transformation to be run after the default response
+                 * transformations have been run.
+                 *
+                 * ```js
+                 * function appendTransform(defaults, transform) {
+                 *
+                 *   // We can't guarantee that the default transformation is an array
+                 *   defaults = angular.isArray(defaults) ? defaults : [defaults];
+                 *
+                 *   // Append the new transformation to the defaults
+                 *   return defaults.concat(transform);
+                 * }
+                 *
+                 * $http({
+                 *   url: '...',
+                 *   method: 'GET',
+                 *   transformResponse: appendTransform($http.defaults.transformResponse, function(value) {
+                 *     return doTransform(value);
+                 *   })
+                 * });
+                 * ```
+                 *
+                 *
+                 * ## Caching
+                 *
+                 * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must
+                 * set the config.cache value or the default cache value to TRUE or to a cache object (created
+                 * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes
+                 * precedence over the default cache value.
                  *
-                 * # Caching
+                 * In order to:
+                 *   * cache all responses - set the default cache value to TRUE or to a cache object
+                 *   * cache a specific response - set config.cache value to TRUE or to a cache object
                  *
-                 * To enable caching, set the request configuration `cache` property to `true` (to use default
-                 * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
-                 * When the cache is enabled, `$http` stores the response from the server in the specified
-                 * cache. The next time the same request is made, the response is served from the cache without
-                 * sending a request to the server.
+                 * If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
+                 * then the default `$cacheFactory("$http")` object is used.
                  *
-                 * Note that even if the response is served from cache, delivery of the data is asynchronous in
-                 * the same way that real requests are.
+                 * The default cache value can be set by updating the
+                 * {@link ng.$http#defaults `$http.defaults.cache`} property or the
+                 * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property.
                  *
-                 * If there are multiple GET requests for the same URL that should be cached using the same
-                 * cache, but the cache is not populated yet, only one request to the server will be made and
-                 * the remaining requests will be fulfilled using the response from the first request.
+                 * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using
+                 * the relevant cache object. The next time the same request is made, the response is returned
+                 * from the cache without sending a request to the server.
                  *
-                 * You can change the default cache to a new object (built with
-                 * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
-                 * {@link ng.$http#properties_defaults `$http.defaults.cache`} property. All requests who set
-                 * their `cache` property to `true` will now use this cache object.
+                 * Take note that:
                  *
-                 * If you set the default cache to `false` then only requests that specify their own custom
-                 * cache object will be cached.
+                 *   * Only GET and JSONP requests are cached.
+                 *   * The cache key is the request URL including search parameters; headers are not considered.
+                 *   * Cached responses are returned asynchronously, in the same way as responses from the server.
+                 *   * If multiple identical requests are made using the same cache, which is not yet populated,
+                 *     one request will be made to the server and remaining requests will return the same response.
+                 *   * A cache-control header on the response does not affect if or how responses are cached.
                  *
-                 * # Interceptors
+                 *
+                 * ## Interceptors
                  *
                  * Before you start creating interceptors, be sure to understand the
                  * {@link ng.$q $q and deferred/promise APIs}.
@@ -7573,14 +11915,14 @@
                  *
                  * There are two kinds of interceptors (and two kinds of rejection interceptors):
                  *
-                 *   * `request`: interceptors get called with http `config` object. The function is free to
-                 *     modify the `config` or create a new one. The function needs to return the `config`
-                 *     directly or as a promise.
+                 *   * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to
+                 *     modify the `config` object or create a new one. The function needs to return the `config`
+                 *     object directly, or a promise containing the `config` or a new `config` object.
                  *   * `requestError`: interceptor gets called when a previous interceptor threw an error or
                  *     resolved with a rejection.
                  *   * `response`: interceptors get called with http `response` object. The function is free to
-                 *     modify the `response` or create a new one. The function needs to return the `response`
-                 *     directly or as a promise.
+                 *     modify the `response` object or create a new one. The function needs to return the `response`
+                 *     object directly, or as a promise containing the `response` or a new `response` object.
                  *   * `responseError`: interceptor gets called when a previous interceptor threw an error or
                  *     resolved with a rejection.
                  *
@@ -7588,121 +11930,76 @@
                  * ```js
                  *   // register the interceptor as a service
                  *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
-     *     return {
-     *       // optional method
-     *       'request': function(config) {
-     *         // do something on success
-     *         return config || $q.when(config);
-     *       },
-     *
-     *       // optional method
-     *      'requestError': function(rejection) {
-     *         // do something on error
-     *         if (canRecover(rejection)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(rejection);
-     *       },
-     *
-     *
-     *
-     *       // optional method
-     *       'response': function(response) {
-     *         // do something on success
-     *         return response || $q.when(response);
-     *       },
-     *
-     *       // optional method
-     *      'responseError': function(rejection) {
-     *         // do something on error
-     *         if (canRecover(rejection)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(rejection);
-     *       }
-     *     };
-     *   });
+                 *     return {
+                 *       // optional method
+                 *       'request': function(config) {
+                 *         // do something on success
+                 *         return config;
+                 *       },
+                 *
+                 *       // optional method
+                 *      'requestError': function(rejection) {
+                 *         // do something on error
+                 *         if (canRecover(rejection)) {
+                 *           return responseOrNewPromise
+                 *         }
+                 *         return $q.reject(rejection);
+                 *       },
+                 *
+                 *
+                 *
+                 *       // optional method
+                 *       'response': function(response) {
+                 *         // do something on success
+                 *         return response;
+                 *       },
+                 *
+                 *       // optional method
+                 *      'responseError': function(rejection) {
+                 *         // do something on error
+                 *         if (canRecover(rejection)) {
+                 *           return responseOrNewPromise
+                 *         }
+                 *         return $q.reject(rejection);
+                 *       }
+                 *     };
+                 *   });
                  *
                  *   $httpProvider.interceptors.push('myHttpInterceptor');
                  *
                  *
                  *   // alternatively, register the interceptor via an anonymous factory
                  *   $httpProvider.interceptors.push(function($q, dependency1, dependency2) {
-     *     return {
-     *      'request': function(config) {
-     *          // same as above
-     *       },
-     *
-     *       'response': function(response) {
-     *          // same as above
-     *       }
-     *     };
-     *   });
+                 *     return {
+                 *      'request': function(config) {
+                 *          // same as above
+                 *       },
+                 *
+                 *       'response': function(response) {
+                 *          // same as above
+                 *       }
+                 *     };
+                 *   });
                  * ```
                  *
-                 * # Response interceptors (DEPRECATED)
+                 * ## Security Considerations
                  *
-                 * Before you start creating interceptors, be sure to understand the
-                 * {@link ng.$q $q and deferred/promise APIs}.
+                 * When designing web applications, consider security threats from:
                  *
-                 * For purposes of global error handling, authentication or any kind of synchronous or
-                 * asynchronous preprocessing of received responses, it is desirable to be able to intercept
-                 * responses for http requests before they are handed over to the application code that
-                 * initiated these requests. The response interceptors leverage the {@link ng.$q
-     * promise apis} to fulfil this need for both synchronous and asynchronous preprocessing.
+                 * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+                 * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
                  *
-                 * The interceptors are service factories that are registered with the $httpProvider by
-                 * adding them to the `$httpProvider.responseInterceptors` array. The factory is called and
-                 * injected with dependencies (if specified) and returns the interceptor  — a function that
-                 * takes a {@link ng.$q promise} and returns the original or a new promise.
+                 * Both server and the client must cooperate in order to eliminate these threats. AngularJS comes
+                 * pre-configured with strategies that address these issues, but for this to work backend server
+                 * cooperation is required.
                  *
-                 * ```js
-                 *   // register the interceptor as a service
-                 *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
-     *     return function(promise) {
-     *       return promise.then(function(response) {
-     *         // do something on success
-     *         return response;
-     *       }, function(response) {
-     *         // do something on error
-     *         if (canRecover(response)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(response);
-     *       });
-     *     }
-     *   });
-                 *
-                 *   $httpProvider.responseInterceptors.push('myHttpInterceptor');
-                 *
-                 *
-                 *   // register the interceptor via an anonymous factory
-                 *   $httpProvider.responseInterceptors.push(function($q, dependency1, dependency2) {
-     *     return function(promise) {
-     *       // same as above
-     *     }
-     *   });
-                 * ```
-                 *
-                 *
-                 * # Security Considerations
-                 *
-                 * When designing web applications, consider security threats from:
-                 *
-                 * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
-                 * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
-                 *
-                 * Both server and the client must cooperate in order to eliminate these threats. Angular comes
-                 * pre-configured with strategies that address these issues, but for this to work backend server
-                 * cooperation is required.
-                 *
-                 * ## JSON Vulnerability Protection
+                 * ### JSON Vulnerability Protection
                  *
                  * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
                  * allows third party website to turn your JSON resource URL into
                  * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To
                  * counter this your server can prefix all JSON requests with following string `")]}',\n"`.
-                 * Angular will automatically strip the prefix before processing it as JSON.
+                 * AngularJS will automatically strip the prefix before processing it as JSON.
                  *
                  * For example if your server needs to return:
                  * ```js
@@ -7715,18 +12012,18 @@
                  * ['one','two']
                  * ```
                  *
-                 * Angular will strip the prefix, before processing the JSON.
+                 * AngularJS will strip the prefix, before processing the JSON.
                  *
                  *
-                 * ## Cross Site Request Forgery (XSRF) Protection
+                 * ### Cross Site Request Forgery (XSRF) Protection
                  *
-                 * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which
-                 * an unauthorized site can gain your user's private data. Angular provides a mechanism
-                 * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie
-                 * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only
-                 * JavaScript that runs on your domain could read the cookie, your server can be assured that
-                 * the XHR came from JavaScript running on your domain. The header will not be set for
-                 * cross-domain requests.
+                 * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is an attack technique by
+                 * which the attacker can trick an authenticated user into unknowingly executing actions on your
+                 * website. AngularJS provides a mechanism to counter XSRF. When performing XHR requests, the
+                 * $http service reads a token from a cookie (by default, `XSRF-TOKEN`) and sets it as an HTTP
+                 * header (`X-XSRF-TOKEN`). Since only JavaScript that runs on your domain could read the
+                 * cookie, your server can be assured that the XHR came from JavaScript running on your domain.
+                 * The header will not be set for cross-domain requests.
                  *
                  * To take advantage of this, your server needs to set a token in a JavaScript readable session
                  * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the
@@ -7734,85 +12031,92 @@
                  * that only JavaScript running on your domain could have sent the request. The token must be
                  * unique for each user and must be verifiable by the server (to prevent the JavaScript from
                  * making up its own tokens). We recommend that the token is a digest of your site's
-                 * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography))
+                 * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography&#41;)
                  * for added security.
                  *
                  * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName
                  * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
                  * or the per-request config object.
                  *
+                 * In order to prevent collisions in environments where multiple AngularJS apps share the
+                 * same domain or subdomain, we recommend that each application uses unique cookie name.
                  *
                  * @param {object} config Object describing the request to be made and how it should be
                  *    processed. The object has following properties:
                  *
                  *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
-                 *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
-                 *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be turned
-                 *      to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be
-                 *      JSONified.
+                 *    - **url** – `{string|TrustedObject}` – Absolute or relative URL of the resource that is being requested;
+                 *      or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be serialized
+                 *      with the `paramSerializer` and appended as GET parameters.
                  *    - **data** – `{string|Object}` – Data to be sent as the request message data.
                  *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
                  *      HTTP headers to send to the server. If the return value of a function is null, the
-                 *      header will not be sent.
+                 *      header will not be sent. Functions accept a config object as an argument.
+                 *    - **eventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest object.
+                 *      To bind events to the XMLHttpRequest upload object, use `uploadEventHandlers`.
+                 *      The handler will be called in the context of a `$apply` block.
+                 *    - **uploadEventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest upload
+                 *      object. To bind events to the XMLHttpRequest object, use `eventHandlers`.
+                 *      The handler will be called in the context of a `$apply` block.
                  *    - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
                  *    - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
                  *    - **transformRequest** –
                  *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
                  *      transform function or an array of such functions. The transform function takes the http
                  *      request body and headers and returns its transformed (typically serialized) version.
+                 *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
                  *    - **transformResponse** –
-                 *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+                 *      `{function(data, headersGetter, status)|Array.<function(data, headersGetter, status)>}` –
                  *      transform function or an array of such functions. The transform function takes the http
-                 *      response body and headers and returns its transformed (typically deserialized) version.
-                 *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
-                 *      GET request, otherwise if a cache instance built with
-                 *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
-                 *      caching.
+                 *      response body, headers and status and returns its transformed (typically deserialized) version.
+                 *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
+                 *    - **paramSerializer** - `{string|function(Object<string,string>):string}` - A function used to
+                 *      prepare the string representation of request parameters (specified as an object).
+                 *      If specified as string, it is interpreted as function registered with the
+                 *      {@link $injector $injector}, which means you can create your own serializer
+                 *      by registering it as a {@link auto.$provide#service service}.
+                 *      The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
+                 *      alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
+                 *    - **cache** – `{boolean|Object}` – A boolean value or object created with
+                 *      {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response.
+                 *      See {@link $http#caching $http Caching} for more information.
                  *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
                  *      that should abort the request when resolved.
-                 *    - **withCredentials** - `{boolean}` - whether to to set the `withCredentials` flag on the
-                 *      XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
+                 *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
+                 *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
                  *      for more information.
                  *    - **responseType** - `{string}` - see
-                 *      [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
+                 *      [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype).
                  *
-                 * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the
-                 *   standard `then` method and two http specific methods: `success` and `error`. The `then`
-                 *   method takes two arguments a success and an error callback which will be called with a
-                 *   response object. The `success` and `error` methods take a single argument - a function that
-                 *   will be called when the request succeeds or fails respectively. The arguments passed into
-                 *   these functions are destructured representation of the response object passed into the
-                 *   `then` method. The response object has these properties:
+                 * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object
+                 *                        when the request succeeds or fails.
                  *
-                 *   - **data** – `{string|Object}` – The response body transformed with the transform
-                 *     functions.
-                 *   - **status** – `{number}` – HTTP status code of the response.
-                 *   - **headers** – `{function([headerName])}` – Header getter function.
-                 *   - **config** – `{Object}` – The configuration object that was used to generate the request.
-                 *   - **statusText** – `{string}` – HTTP status text of the response.
                  *
                  * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
                  *   requests. This is primarily meant to be used for debugging purposes.
                  *
                  *
                  * @example
-                 <example>
+                 <example module="httpExample" name="http-service">
                  <file name="index.html">
-                 <div ng-controller="FetchCtrl">
-                 <select ng-model="method">
+                 <div ng-controller="FetchController">
+                 <select ng-model="method" aria-label="Request method">
                  <option>GET</option>
                  <option>JSONP</option>
                  </select>
-                 <input type="text" ng-model="url" size="80"/>
+                 <input type="text" ng-model="url" size="80" aria-label="URL" />
                  <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
                  <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
                  <button id="samplejsonpbtn"
                  ng-click="updateModel('JSONP',
-                 'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">
+                 'https://angularjs.org/greet.php?name=Super%20Hero')">
                  Sample JSONP
                  </button>
                  <button id="invalidjsonpbtn"
-                 ng-click="updateModel('JSONP', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">
+                 ng-click="updateModel('JSONP', 'https://angularjs.org/doesntexist')">
                  Invalid JSONP
                  </button>
                  <pre>http status code: {{status}}</pre>
@@ -7820,30 +12124,38 @@
                  </div>
                  </file>
                  <file name="script.js">
-                 function FetchCtrl($scope, $http, $templateCache) {
-    $scope.method = 'GET';
-    $scope.url = 'http-hello.html';
-
-    $scope.fetch = function() {
-      $scope.code = null;
-      $scope.response = null;
-
-      $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
-        success(function(data, status) {
-          $scope.status = status;
-          $scope.data = data;
-        }).
-        error(function(data, status) {
-          $scope.data = data || "Request failed";
-          $scope.status = status;
-      });
-    };
+                 angular.module('httpExample', [])
+                 .config(['$sceDelegateProvider', function($sceDelegateProvider) {
+      // We must whitelist the JSONP endpoint that we are using to show that we trust it
+      $sceDelegateProvider.resourceUrlWhitelist([
+        'self',
+        'https://angularjs.org/**'
+      ]);
+    }])
+                 .controller('FetchController', ['$scope', '$http', '$templateCache',
+                 function($scope, $http, $templateCache) {
+        $scope.method = 'GET';
+        $scope.url = 'http-hello.html';
+
+        $scope.fetch = function() {
+          $scope.code = null;
+          $scope.response = null;
+
+          $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
+            then(function(response) {
+              $scope.status = response.status;
+              $scope.data = response.data;
+            }, function(response) {
+              $scope.data = response.data || 'Request failed';
+              $scope.status = response.status;
+          });
+        };
 
-    $scope.updateModel = function(method, url) {
-      $scope.method = method;
-      $scope.url = url;
-    };
-  }
+        $scope.updateModel = function(method, url) {
+          $scope.method = method;
+          $scope.url = url;
+        };
+      }]);
                  </file>
                  <file name="http-hello.html">
                  Hello, $http!
@@ -7853,7 +12165,6 @@
                  var data = element(by.binding('data'));
                  var fetchBtn = element(by.id('fetchbtn'));
                  var sampleGetBtn = element(by.id('samplegetbtn'));
-                 var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
                  var invalidJsonpBtn = element(by.id('invalidjsonpbtn'));
 
                  it('should make an xhr GET request', function() {
@@ -7863,12 +12174,14 @@
     expect(data.getText()).toMatch(/Hello, \$http!/);
   });
 
-                 it('should make a JSONP request to angularjs.org', function() {
-    sampleJsonpBtn.click();
-    fetchBtn.click();
-    expect(status.getText()).toMatch('200');
-    expect(data.getText()).toMatch(/Super Hero!/);
-  });
+                 // Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185
+                 // it('should make a JSONP request to angularjs.org', function() {
+//   var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
+//   sampleJsonpBtn.click();
+//   fetchBtn.click();
+//   expect(status.getText()).toMatch('200');
+//   expect(data.getText()).toMatch(/Super Hero!/);
+// });
 
                  it('should make JSONP request to invalid URL and invoke the error handler',
                  function() {
@@ -7881,90 +12194,84 @@
                  </example>
                  */
                 function $http(requestConfig) {
-                    var config = {
-                        method: 'get',
-                        transformRequest: defaults.transformRequest,
-                        transformResponse: defaults.transformResponse
-                    };
-                    var headers = mergeHeaders(requestConfig);
-
-                    extend(config, requestConfig);
-                    config.headers = headers;
-                    config.method = uppercase(config.method);
 
-                    var xsrfValue = urlIsSameOrigin(config.url)
-                        ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName]
-                        : undefined;
-                    if (xsrfValue) {
-                        headers[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+                    if (!isObject(requestConfig)) {
+                        throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
                     }
 
+                    if (!isString($sce.valueOf(requestConfig.url))) {
+                        throw minErr('$http')('badreq', 'Http request configuration url must be a string or a $sce trusted object.  Received: {0}', requestConfig.url);
+                    }
 
-                    var serverRequest = function(config) {
-                        headers = config.headers;
-                        var reqData = transformData(config.data, headersGetter(headers), config.transformRequest);
-
-                        // strip content-type if data is undefined
-                        if (isUndefined(config.data)) {
-                            forEach(headers, function(value, header) {
-                                if (lowercase(header) === 'content-type') {
-                                    delete headers[header];
-                                }
-                            });
-                        }
+                    var config = extend({
+                        method: 'get',
+                        transformRequest: defaults.transformRequest,
+                        transformResponse: defaults.transformResponse,
+                        paramSerializer: defaults.paramSerializer,
+                        jsonpCallbackParam: defaults.jsonpCallbackParam
+                    }, requestConfig);
 
-                        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
-                            config.withCredentials = defaults.withCredentials;
-                        }
+                    config.headers = mergeHeaders(requestConfig);
+                    config.method = uppercase(config.method);
+                    config.paramSerializer = isString(config.paramSerializer) ?
+                        $injector.get(config.paramSerializer) : config.paramSerializer;
 
-                        // send request
-                        return sendReq(config, reqData, headers).then(transformResponse, transformResponse);
-                    };
+                    $browser.$$incOutstandingRequestCount();
 
-                    var chain = [serverRequest, undefined];
-                    var promise = $q.when(config);
+                    var requestInterceptors = [];
+                    var responseInterceptors = [];
+                    var promise = $q.resolve(config);
 
                     // apply interceptors
                     forEach(reversedInterceptors, function(interceptor) {
                         if (interceptor.request || interceptor.requestError) {
-                            chain.unshift(interceptor.request, interceptor.requestError);
+                            requestInterceptors.unshift(interceptor.request, interceptor.requestError);
                         }
                         if (interceptor.response || interceptor.responseError) {
-                            chain.push(interceptor.response, interceptor.responseError);
+                            responseInterceptors.push(interceptor.response, interceptor.responseError);
                         }
                     });
 
-                    while(chain.length) {
-                        var thenFn = chain.shift();
-                        var rejectFn = chain.shift();
+                    promise = chainInterceptors(promise, requestInterceptors);
+                    promise = promise.then(serverRequest);
+                    promise = chainInterceptors(promise, responseInterceptors);
+                    promise = promise.finally(completeOutstandingRequest);
 
-                        promise = promise.then(thenFn, rejectFn);
-                    }
+                    return promise;
 
-                    promise.success = function(fn) {
-                        promise.then(function(response) {
-                            fn(response.data, response.status, response.headers, config);
-                        });
-                        return promise;
-                    };
 
-                    promise.error = function(fn) {
-                        promise.then(null, function(response) {
-                            fn(response.data, response.status, response.headers, config);
-                        });
+                    function chainInterceptors(promise, interceptors) {
+                        for (var i = 0, ii = interceptors.length; i < ii;) {
+                            var thenFn = interceptors[i++];
+                            var rejectFn = interceptors[i++];
+
+                            promise = promise.then(thenFn, rejectFn);
+                        }
+
+                        interceptors.length = 0;
+
                         return promise;
-                    };
+                    }
 
-                    return promise;
+                    function completeOutstandingRequest() {
+                        $browser.$$completeOutstandingRequest(noop);
+                    }
 
-                    function transformResponse(response) {
-                        // make a copy since the response must be cacheable
-                        var resp = extend({}, response, {
-                            data: transformData(response.data, response.headers, config.transformResponse)
+                    function executeHeaderFns(headers, config) {
+                        var headerContent, processedHeaders = {};
+
+                        forEach(headers, function(headerFn, header) {
+                            if (isFunction(headerFn)) {
+                                headerContent = headerFn(config);
+                                if (headerContent != null) {
+                                    processedHeaders[header] = headerContent;
+                                }
+                            } else {
+                                processedHeaders[header] = headerFn;
+                            }
                         });
-                        return (isSuccess(response.status))
-                            ? resp
-                            : $q.reject(resp);
+
+                        return processedHeaders;
                     }
 
                     function mergeHeaders(config) {
@@ -7974,11 +12281,7 @@
 
                         defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
 
-                        // execute if header value is function
-                        execHeaders(defHeaders);
-                        execHeaders(reqHeaders);
-
-                        // using for-in instead of forEach to avoid unecessary iteration after header has been found
+                        // using for-in instead of forEach to avoid unnecessary iteration after header has been found
                         defaultHeadersIteration:
                             for (defHeaderName in defHeaders) {
                                 lowercaseDefHeaderName = lowercase(defHeaderName);
@@ -7992,22 +12295,39 @@
                                 reqHeaders[defHeaderName] = defHeaders[defHeaderName];
                             }
 
-                        return reqHeaders;
+                        // execute if header value is a function for merged headers
+                        return executeHeaderFns(reqHeaders, shallowCopy(config));
+                    }
 
-                        function execHeaders(headers) {
-                            var headerContent;
+                    function serverRequest(config) {
+                        var headers = config.headers;
+                        var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
 
-                            forEach(headers, function(headerFn, header) {
-                                if (isFunction(headerFn)) {
-                                    headerContent = headerFn();
-                                    if (headerContent != null) {
-                                        headers[header] = headerContent;
-                                    } else {
-                                        delete headers[header];
-                                    }
+                        // strip content-type if data is undefined
+                        if (isUndefined(reqData)) {
+                            forEach(headers, function(value, header) {
+                                if (lowercase(header) === 'content-type') {
+                                    delete headers[header];
                                 }
                             });
                         }
+
+                        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+                            config.withCredentials = defaults.withCredentials;
+                        }
+
+                        // send request
+                        return sendReq(config, reqData).then(transformResponse, transformResponse);
+                    }
+
+                    function transformResponse(response) {
+                        // make a copy since the response must be cacheable
+                        var resp = extend({}, response);
+                        resp.data = transformData(response.data, response.headers, response.status,
+                            config.transformResponse);
+                        return (isSuccess(response.status))
+                            ? resp
+                            : $q.reject(resp);
                     }
                 }
 
@@ -8020,8 +12340,9 @@
                  * @description
                  * Shortcut method to perform `GET` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request
-                 * @param {Object=} config Optional configuration object
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8032,8 +12353,9 @@
                  * @description
                  * Shortcut method to perform `DELETE` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request
-                 * @param {Object=} config Optional configuration object
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8044,8 +12366,9 @@
                  * @description
                  * Shortcut method to perform `HEAD` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request
-                 * @param {Object=} config Optional configuration object
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8056,9 +12379,38 @@
                  * @description
                  * Shortcut method to perform `JSONP` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request.
-                 *                     Should contain `JSON_CALLBACK` string.
-                 * @param {Object=} config Optional configuration object
+                 * Note that, since JSONP requests are sensitive because the response is given full access to the browser,
+                 * the url must be declared, via {@link $sce} as a trusted resource URL.
+                 * You can trust a URL by adding it to the whitelist via
+                 * {@link $sceDelegateProvider#resourceUrlWhitelist  `$sceDelegateProvider.resourceUrlWhitelist`} or
+                 * by explicitly trusting the URL via {@link $sce#trustAsResourceUrl `$sce.trustAsResourceUrl(url)`}.
+                 *
+                 * You should avoid generating the URL for the JSONP request from user provided data.
+                 * Provide additional query parameters via `params` property of the `config` parameter, rather than
+                 * modifying the URL itself.
+                 *
+                 * JSONP requests must specify a callback to be used in the response from the server. This callback
+                 * is passed as a query parameter in the request. You must specify the name of this parameter by
+                 * setting the `jsonpCallbackParam` property on the request config object.
+                 *
+                 * ```
+                 * $http.jsonp('some/trusted/url', {jsonpCallbackParam: 'callback'})
+                 * ```
+                 *
+                 * You can also specify a default callback parameter name in `$http.defaults.jsonpCallbackParam`.
+                 * Initially this is set to `'callback'`.
+                 *
+                 * <div class="alert alert-danger">
+                 * You can no longer use the `JSON_CALLBACK` string as a placeholder for specifying where the callback
+                 * parameter value should go.
+                 * </div>
+                 *
+                 * If you would like to customise where and how the callbacks are stored then try overriding
+                 * or decorating the {@link $jsonpCallbacks} service.
+                 *
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
                 createShortMethods('get', 'delete', 'head', 'jsonp');
@@ -8072,7 +12424,7 @@
                  *
                  * @param {string} url Relative or absolute URL specifying the destination of the request
                  * @param {*} data Request content
-                 * @param {Object=} config Optional configuration object
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8085,10 +12437,23 @@
                  *
                  * @param {string} url Relative or absolute URL specifying the destination of the request
                  * @param {*} data Request content
-                 * @param {Object=} config Optional configuration object
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
+                 * @returns {HttpPromise} Future object
+                 */
+
+                /**
+                 * @ngdoc method
+                 * @name $http#patch
+                 *
+                 * @description
+                 * Shortcut method to perform `PATCH` request.
+                 *
+                 * @param {string} url Relative or absolute URL specifying the destination of the request
+                 * @param {*} data Request content
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
-                createShortMethodsWithData('post', 'put');
+                createShortMethodsWithData('post', 'put', 'patch');
 
                 /**
                  * @ngdoc property
@@ -8109,7 +12474,7 @@
                 function createShortMethods(names) {
                     forEach(arguments, function(name) {
                         $http[name] = function(url, config) {
-                            return $http(extend(config || {}, {
+                            return $http(extend({}, config || {}, {
                                 method: name,
                                 url: url
                             }));
@@ -8121,7 +12486,7 @@
                 function createShortMethodsWithData(name) {
                     forEach(arguments, function(name) {
                         $http[name] = function(url, data, config) {
-                            return $http(extend(config || {}, {
+                            return $http(extend({}, config || {}, {
                                 method: name,
                                 url: url,
                                 data: data
@@ -8137,36 +12502,54 @@
                  * !!! ACCESSES CLOSURE VARS:
                  * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
                  */
-                function sendReq(config, reqData, reqHeaders) {
+                function sendReq(config, reqData) {
                     var deferred = $q.defer(),
                         promise = deferred.promise,
                         cache,
                         cachedResp,
-                        url = buildUrl(config.url, config.params);
+                        reqHeaders = config.headers,
+                        isJsonp = lowercase(config.method) === 'jsonp',
+                        url = config.url;
+
+                    if (isJsonp) {
+                        // JSONP is a pretty sensitive operation where we're allowing a script to have full access to
+                        // our DOM and JS space.  So we require that the URL satisfies SCE.RESOURCE_URL.
+                        url = $sce.getTrustedResourceUrl(url);
+                    } else if (!isString(url)) {
+                        // If it is not a string then the URL must be a $sce trusted object
+                        url = $sce.valueOf(url);
+                    }
+
+                    url = buildUrl(url, config.paramSerializer(config.params));
+
+                    if (isJsonp) {
+                        // Check the url and add the JSONP callback placeholder
+                        url = sanitizeJsonpCallbackParam(url, config.jsonpCallbackParam);
+                    }
 
                     $http.pendingRequests.push(config);
                     promise.then(removePendingReq, removePendingReq);
 
-
-                    if ((config.cache || defaults.cache) && config.cache !== false && config.method == 'GET') {
+                    if ((config.cache || defaults.cache) && config.cache !== false &&
+                        (config.method === 'GET' || config.method === 'JSONP')) {
                         cache = isObject(config.cache) ? config.cache
-                            : isObject(defaults.cache) ? defaults.cache
-                            : defaultCache;
+                            : isObject(/** @type {?} */ (defaults).cache)
+                                ? /** @type {?} */ (defaults).cache
+                                : defaultCache;
                     }
 
                     if (cache) {
                         cachedResp = cache.get(url);
                         if (isDefined(cachedResp)) {
-                            if (cachedResp.then) {
+                            if (isPromiseLike(cachedResp)) {
                                 // cached request has already been sent, but there is no response yet
-                                cachedResp.then(removePendingReq, removePendingReq);
-                                return cachedResp;
+                                cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult);
                             } else {
                                 // serving from cache
                                 if (isArray(cachedResp)) {
-                                    resolvePromise(cachedResp[1], cachedResp[0], copy(cachedResp[2]), cachedResp[3]);
+                                    resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3], cachedResp[4]);
                                 } else {
-                                    resolvePromise(cachedResp, 200, {}, 'OK');
+                                    resolvePromise(cachedResp, 200, {}, 'OK', 'complete');
                                 }
                             }
                         } else {
@@ -8175,14 +12558,47 @@
                         }
                     }
 
-                    // if we won't have the response in cache, send the request to the backend
+
+                    // if we won't have the response in cache, set the xsrf headers and
+                    // send the request to the backend
                     if (isUndefined(cachedResp)) {
+                        var xsrfValue = urlIsSameOrigin(config.url)
+                            ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
+                            : undefined;
+                        if (xsrfValue) {
+                            reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+                        }
+
                         $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
-                            config.withCredentials, config.responseType);
+                            config.withCredentials, config.responseType,
+                            createApplyHandlers(config.eventHandlers),
+                            createApplyHandlers(config.uploadEventHandlers));
                     }
 
                     return promise;
 
+                    function createApplyHandlers(eventHandlers) {
+                        if (eventHandlers) {
+                            var applyHandlers = {};
+                            forEach(eventHandlers, function(eventHandler, key) {
+                                applyHandlers[key] = function(event) {
+                                    if (useApplyAsync) {
+                                        $rootScope.$applyAsync(callEventHandler);
+                                    } else if ($rootScope.$$phase) {
+                                        callEventHandler();
+                                    } else {
+                                        $rootScope.$apply(callEventHandler);
+                                    }
+
+                                    function callEventHandler() {
+                                        eventHandler(event);
+                                    }
+                                };
+                            });
+                            return applyHandlers;
+                        }
+                    }
+
 
                     /**
                      * Callback registered to $httpBackend():
@@ -8190,89 +12606,127 @@
                      *  - resolves the raw $http promise
                      *  - calls $apply
                      */
-                    function done(status, response, headersString, statusText) {
+                    function done(status, response, headersString, statusText, xhrStatus) {
                         if (cache) {
                             if (isSuccess(status)) {
-                                cache.put(url, [status, response, parseHeaders(headersString), statusText]);
+                                cache.put(url, [status, response, parseHeaders(headersString), statusText, xhrStatus]);
                             } else {
                                 // remove promise from the cache
                                 cache.remove(url);
                             }
                         }
 
-                        resolvePromise(response, status, headersString, statusText);
-                        if (!$rootScope.$$phase) $rootScope.$apply();
+                        function resolveHttpPromise() {
+                            resolvePromise(response, status, headersString, statusText, xhrStatus);
+                        }
+
+                        if (useApplyAsync) {
+                            $rootScope.$applyAsync(resolveHttpPromise);
+                        } else {
+                            resolveHttpPromise();
+                            if (!$rootScope.$$phase) $rootScope.$apply();
+                        }
                     }
 
 
                     /**
                      * Resolves the raw $http promise.
                      */
-                    function resolvePromise(response, status, headers, statusText) {
-                        // normalize internal statuses to 0
-                        status = Math.max(status, 0);
+                    function resolvePromise(response, status, headers, statusText, xhrStatus) {
+                        //status: HTTP response status code, 0, -1 (aborted by timeout / promise)
+                        status = status >= -1 ? status : 0;
 
                         (isSuccess(status) ? deferred.resolve : deferred.reject)({
                             data: response,
                             status: status,
                             headers: headersGetter(headers),
                             config: config,
-                            statusText : statusText
+                            statusText: statusText,
+                            xhrStatus: xhrStatus
                         });
                     }
 
+                    function resolvePromiseWithResult(result) {
+                        resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText, result.xhrStatus);
+                    }
 
                     function removePendingReq() {
-                        var idx = indexOf($http.pendingRequests, config);
+                        var idx = $http.pendingRequests.indexOf(config);
                         if (idx !== -1) $http.pendingRequests.splice(idx, 1);
                     }
                 }
 
 
-                function buildUrl(url, params) {
-                    if (!params) return url;
-                    var parts = [];
-                    forEachSorted(params, function(value, key) {
-                        if (value === null || isUndefined(value)) return;
-                        if (!isArray(value)) value = [value];
-
-                        forEach(value, function(v) {
-                            if (isObject(v)) {
-                                v = toJson(v);
-                            }
-                            parts.push(encodeUriQuery(key) + '=' +
-                            encodeUriQuery(v));
-                        });
-                    });
-                    if(parts.length > 0) {
-                        url += ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&');
+                function buildUrl(url, serializedParams) {
+                    if (serializedParams.length > 0) {
+                        url += ((url.indexOf('?') === -1) ? '?' : '&') + serializedParams;
                     }
                     return url;
                 }
 
+                function sanitizeJsonpCallbackParam(url, cbKey) {
+                    var parts = url.split('?');
+                    if (parts.length > 2) {
+                        // Throw if the url contains more than one `?` query indicator
+                        throw $httpMinErr('badjsonp', 'Illegal use more than one "?", in url, "{1}"', url);
+                    }
+                    var params = parseKeyValue(parts[1]);
+                    forEach(params, function(value, key) {
+                        if (value === 'JSON_CALLBACK') {
+                            // Throw if the url already contains a reference to JSON_CALLBACK
+                            throw $httpMinErr('badjsonp', 'Illegal use of JSON_CALLBACK in url, "{0}"', url);
+                        }
+                        if (key === cbKey) {
+                            // Throw if the callback param was already provided
+                            throw $httpMinErr('badjsonp', 'Illegal use of callback param, "{0}", in url, "{1}"', cbKey, url);
+                        }
+                    });
+
+                    // Add in the JSON_CALLBACK callback param value
+                    url += ((url.indexOf('?') === -1) ? '?' : '&') + cbKey + '=JSON_CALLBACK';
 
+                    return url;
+                }
             }];
     }
 
-    function createXhr(method) {
-        //if IE and the method is not RFC2616 compliant, or if XMLHttpRequest
-        //is not available, try getting an ActiveXObject. Otherwise, use XMLHttpRequest
-        //if it is available
-        if (msie <= 8 && (!method.match(/^(get|post|head|put|delete|options)$/i) ||
-            !window.XMLHttpRequest)) {
-            return new window.ActiveXObject("Microsoft.XMLHTTP");
-        } else if (window.XMLHttpRequest) {
-            return new window.XMLHttpRequest();
-        }
-
-        throw minErr('$httpBackend')('noxhr', "This browser does not support XMLHttpRequest.");
+    /**
+     * @ngdoc service
+     * @name $xhrFactory
+     * @this
+     *
+     * @description
+     * Factory function used to create XMLHttpRequest objects.
+     *
+     * Replace or decorate this service to create your own custom XMLHttpRequest objects.
+     *
+     * ```
+     * angular.module('myApp', [])
+     * .factory('$xhrFactory', function() {
+     *   return function createXhr(method, url) {
+     *     return new window.XMLHttpRequest({mozSystem: true});
+     *   };
+     * });
+     * ```
+     *
+     * @param {string} method HTTP method of the request (GET, POST, PUT, ..)
+     * @param {string} url URL of the request.
+     */
+    function $xhrFactoryProvider() {
+        this.$get = function() {
+            return function createXhr() {
+                return new window.XMLHttpRequest();
+            };
+        };
     }
 
     /**
      * @ngdoc service
      * @name $httpBackend
-     * @requires $window
+     * @requires $jsonpCallbacks
      * @requires $document
+     * @requires $xhrFactory
+     * @this
      *
      * @description
      * HTTP backend used by the {@link ng.$http service} that delegates to
@@ -8285,38 +12739,27 @@
  * $httpBackend} which can be trained with responses.
      */
     function $HttpBackendProvider() {
-        this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) {
-            return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]);
+        this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
+            return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
         }];
     }
 
     function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) {
-        var ABORTED = -1;
-
         // TODO(vojta): fix the signature
-        return function(method, url, post, callback, headers, timeout, withCredentials, responseType) {
-            var status;
-            $browser.$$incOutstandingRequestCount();
+        return function(method, url, post, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) {
             url = url || $browser.url();
 
-            if (lowercase(method) == 'jsonp') {
-                var callbackId = '_' + (callbacks.counter++).toString(36);
-                callbacks[callbackId] = function(data) {
-                    callbacks[callbackId].data = data;
-                };
-
-                var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
-                    function() {
-                        if (callbacks[callbackId].data) {
-                            completeRequest(callback, 200, callbacks[callbackId].data);
-                        } else {
-                            completeRequest(callback, status || -2);
-                        }
-                        callbacks[callbackId] = angular.noop;
-                    });
+            if (lowercase(method) === 'jsonp') {
+                var callbackPath = callbacks.createCallback(url);
+                var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
+                    // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
+                    var response = (status === 200) && callbacks.getResponse(callbackPath);
+                    completeRequest(callback, status, response, '', text, 'complete');
+                    callbacks.removeCallback(callbackPath);
+                });
             } else {
 
-                var xhr = createXhr(method);
+                var xhr = createXhr(method, url);
 
                 xhr.open(method, url, true);
                 forEach(headers, function(value, key) {
@@ -8325,37 +12768,59 @@
                     }
                 });
 
-                // In IE6 and 7, this might be called synchronously when xhr.send below is called and the
-                // response is in the cache. the promise api will ensure that to the app code the api is
-                // always async
-                xhr.onreadystatechange = function() {
-                    // onreadystatechange might get called multiple times with readyState === 4 on mobile webkit caused by
-                    // xhrs that are resolved while the app is in the background (see #5426).
-                    // since calling completeRequest sets the `xhr` variable to null, we just check if it's not null before
-                    // continuing
-                    //
-                    // we can't set xhr.onreadystatechange to undefined or delete it because that breaks IE8 (method=PATCH) and
-                    // Safari respectively.
-                    if (xhr && xhr.readyState == 4) {
-                        var responseHeaders = null,
-                            response = null;
-
-                        if(status !== ABORTED) {
-                            responseHeaders = xhr.getAllResponseHeaders();
-
-                            // responseText is the old-school way of retrieving response (supported by IE8 & 9)
-                            // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
-                            response = ('response' in xhr) ? xhr.response : xhr.responseText;
-                        }
+                xhr.onload = function requestLoaded() {
+                    var statusText = xhr.statusText || '';
 
-                        completeRequest(callback,
-                            status || xhr.status,
-                            response,
-                            responseHeaders,
-                            xhr.statusText || '');
+                    // responseText is the old-school way of retrieving response (supported by IE9)
+                    // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
+                    var response = ('response' in xhr) ? xhr.response : xhr.responseText;
+
+                    // normalize IE9 bug (http://bugs.jquery.com/ticket/1450)
+                    var status = xhr.status === 1223 ? 204 : xhr.status;
+
+                    // fix status code when it is 0 (0 status is undocumented).
+                    // Occurs when accessing file resources or on Android 4.1 stock browser
+                    // while retrieving files from application cache.
+                    if (status === 0) {
+                        status = response ? 200 : urlResolve(url).protocol === 'file' ? 404 : 0;
                     }
+
+                    completeRequest(callback,
+                        status,
+                        response,
+                        xhr.getAllResponseHeaders(),
+                        statusText,
+                        'complete');
+                };
+
+                var requestError = function() {
+                    // The response is always empty
+                    // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+                    completeRequest(callback, -1, null, null, '', 'error');
+                };
+
+                var requestAborted = function() {
+                    completeRequest(callback, -1, null, null, '', 'abort');
+                };
+
+                var requestTimeout = function() {
+                    // The response is always empty
+                    // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+                    completeRequest(callback, -1, null, null, '', 'timeout');
                 };
 
+                xhr.onerror = requestError;
+                xhr.onabort = requestAborted;
+                xhr.ontimeout = requestTimeout;
+
+                forEach(eventHandlers, function(value, key) {
+                    xhr.addEventListener(key, value);
+                });
+
+                forEach(uploadEventHandlers, function(value, key) {
+                    xhr.upload.addEventListener(key, value);
+                });
+
                 if (withCredentials) {
                     xhr.withCredentials = true;
                 }
@@ -8377,87 +12842,105 @@
                     }
                 }
 
-                xhr.send(post || null);
+                xhr.send(isUndefined(post) ? null : post);
             }
 
             if (timeout > 0) {
                 var timeoutId = $browserDefer(timeoutRequest, timeout);
-            } else if (timeout && timeout.then) {
+            } else if (isPromiseLike(timeout)) {
                 timeout.then(timeoutRequest);
             }
 
 
             function timeoutRequest() {
-                status = ABORTED;
-                jsonpDone && jsonpDone();
-                xhr && xhr.abort();
+                if (jsonpDone) {
+                    jsonpDone();
+                }
+                if (xhr) {
+                    xhr.abort();
+                }
             }
 
-            function completeRequest(callback, status, response, headersString, statusText) {
+            function completeRequest(callback, status, response, headersString, statusText, xhrStatus) {
                 // cancel timeout and subsequent timeout promise resolution
-                timeoutId && $browserDefer.cancel(timeoutId);
-                jsonpDone = xhr = null;
-
-                // fix status code when it is 0 (0 status is undocumented).
-                // Occurs when accessing file resources or on Android 4.1 stock browser
-                // while retrieving files from application cache.
-                if (status === 0) {
-                    status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0;
+                if (isDefined(timeoutId)) {
+                    $browserDefer.cancel(timeoutId);
                 }
+                jsonpDone = xhr = null;
 
-                // normalize IE bug (http://bugs.jquery.com/ticket/1450)
-                status = status === 1223 ? 204 : status;
-                statusText = statusText || '';
-
-                callback(status, response, headersString, statusText);
-                $browser.$$completeOutstandingRequest(noop);
+                callback(status, response, headersString, statusText, xhrStatus);
             }
         };
 
-        function jsonpReq(url, done) {
-            // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.:
+        function jsonpReq(url, callbackPath, done) {
+            url = url.replace('JSON_CALLBACK', callbackPath);
+            // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
             // - fetches local scripts via XHR and evals them
             // - adds and immediately removes script elements from the document
-            var script = rawDocument.createElement('script'),
-                doneWrapper = function() {
-                    script.onreadystatechange = script.onload = script.onerror = null;
-                    rawDocument.body.removeChild(script);
-                    if (done) done();
-                };
-
+            var script = rawDocument.createElement('script'), callback = null;
             script.type = 'text/javascript';
             script.src = url;
-
-            if (msie && msie <= 8) {
-                script.onreadystatechange = function() {
-                    if (/loaded|complete/.test(script.readyState)) {
-                        doneWrapper();
+            script.async = true;
+
+            callback = function(event) {
+                script.removeEventListener('load', callback);
+                script.removeEventListener('error', callback);
+                rawDocument.body.removeChild(script);
+                script = null;
+                var status = -1;
+                var text = 'unknown';
+
+                if (event) {
+                    if (event.type === 'load' && !callbacks.wasCalled(callbackPath)) {
+                        event = { type: 'error' };
                     }
-                };
-            } else {
-                script.onload = script.onerror = function() {
-                    doneWrapper();
-                };
-            }
+                    text = event.type;
+                    status = event.type === 'error' ? 404 : 200;
+                }
 
+                if (done) {
+                    done(status, text);
+                }
+            };
+
+            script.addEventListener('load', callback);
+            script.addEventListener('error', callback);
             rawDocument.body.appendChild(script);
-            return doneWrapper;
+            return callback;
         }
     }
 
-    var $interpolateMinErr = minErr('$interpolate');
+    var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
+    $interpolateMinErr.throwNoconcat = function(text) {
+        throw $interpolateMinErr('noconcat',
+            'Error while interpolating: {0}\nStrict Contextual Escaping disallows ' +
+            'interpolations that concatenate multiple expressions when a trusted value is ' +
+            'required.  See http://docs.angularjs.org/api/ng.$sce', text);
+    };
+
+    $interpolateMinErr.interr = function(text, err) {
+        return $interpolateMinErr('interr', 'Can\'t interpolate: {0}\n{1}', text, err.toString());
+    };
 
     /**
      * @ngdoc provider
      * @name $interpolateProvider
-     * @function
+     * @this
      *
      * @description
      *
      * Used for configuring the interpolation markup. Defaults to `{{` and `}}`.
      *
+     * <div class="alert alert-danger">
+     * This feature is sometimes used to mix different markup languages, e.g. to wrap an AngularJS
+     * template within a Python Jinja template (or any other template language). Mixing templating
+     * languages is **very dangerous**. The embedding template language will not safely escape AngularJS
+     * expressions, so any user-controlled values in the template will cause Cross Site Scripting (XSS)
+     * security bugs!
+     * </div>
+     *
      * @example
-     <example module="customInterpolationApp">
+     <example name="custom-interpolation-markup" module="customInterpolationApp">
      <file name="index.html">
      <script>
      var customInterpolationApp = angular.module('customInterpolationApp', []);
@@ -8468,11 +12951,11 @@
   });
 
 
-     customInterpolationApp.controller('DemoController', function DemoController() {
+     customInterpolationApp.controller('DemoController', function() {
       this.label = "This binding is brought you by // interpolation symbols.";
   });
      </script>
-     <div ng-app="App" ng-controller="DemoController as demo">
+     <div ng-controller="DemoController as demo">
      //demo.label//
      </div>
      </file>
@@ -8492,11 +12975,11 @@
          * @name $interpolateProvider#startSymbol
          * @description
          * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
-   *
-   * @param {string=} value new value to set the starting symbol to.
+         *
+         * @param {string=} value new value to set the starting symbol to.
          * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
          */
-        this.startSymbol = function(value){
+        this.startSymbol = function(value) {
             if (value) {
                 startSymbol = value;
                 return this;
@@ -8514,7 +12997,7 @@
          * @param {string=} value new value to set the ending symbol to.
          * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
          */
-        this.endSymbol = function(value){
+        this.endSymbol = function(value) {
             if (value) {
                 endSymbol = value;
                 return this;
@@ -8526,12 +13009,32 @@
 
         this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
             var startSymbolLength = startSymbol.length,
-                endSymbolLength = endSymbol.length;
+                endSymbolLength = endSymbol.length,
+                escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
+                escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g');
+
+            function escape(ch) {
+                return '\\\\\\' + ch;
+            }
+
+            function unescapeText(text) {
+                return text.replace(escapedStartRegexp, startSymbol).
+                replace(escapedEndRegexp, endSymbol);
+            }
+
+            // TODO: this is the same as the constantWatchDelegate in parse.js
+            function constantWatchDelegate(scope, listener, objectEquality, constantInterp) {
+                var unwatch = scope.$watch(function constantInterpolateWatch(scope) {
+                    unwatch();
+                    return constantInterp(scope);
+                }, listener, objectEquality);
+                return unwatch;
+            }
 
             /**
              * @ngdoc service
              * @name $interpolate
-             * @function
+             * @kind function
              *
              * @requires $parse
              * @requires $sce
@@ -8547,9 +13050,89 @@
              * ```js
              *   var $interpolate = ...; // injected
              *   var exp = $interpolate('Hello {{name | uppercase}}!');
-             *   expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!');
+             *   expect(exp({name:'AngularJS'})).toEqual('Hello ANGULAR!');
+             * ```
+             *
+             * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is
+             * `true`, the interpolation function will return `undefined` unless all embedded expressions
+             * evaluate to a value other than `undefined`.
+             *
+             * ```js
+             *   var $interpolate = ...; // injected
+             *   var context = {greeting: 'Hello', name: undefined };
+             *
+             *   // default "forgiving" mode
+             *   var exp = $interpolate('{{greeting}} {{name}}!');
+             *   expect(exp(context)).toEqual('Hello !');
+             *
+             *   // "allOrNothing" mode
+             *   exp = $interpolate('{{greeting}} {{name}}!', false, null, true);
+             *   expect(exp(context)).toBeUndefined();
+             *   context.name = 'AngularJS';
+             *   expect(exp(context)).toEqual('Hello AngularJS!');
+             * ```
+             *
+             * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
+             *
+             * #### Escaped Interpolation
+             * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
+             * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
+             * It will be rendered as a regular start/end marker, and will not be interpreted as an expression
+             * or binding.
+             *
+             * This enables web-servers to prevent script injection attacks and defacing attacks, to some
+             * degree, while also enabling code examples to work without relying on the
+             * {@link ng.directive:ngNonBindable ngNonBindable} directive.
+             *
+             * **For security purposes, it is strongly encouraged that web servers escape user-supplied data,
+             * replacing angle brackets (&lt;, &gt;) with &amp;lt; and &amp;gt; respectively, and replacing all
+             * interpolation start/end markers with their escaped counterparts.**
+             *
+             * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered
+             * output when the $interpolate service processes the text. So, for HTML elements interpolated
+             * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter
+             * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such,
+             * this is typically useful only when user-data is used in rendering a template from the server, or
+             * when otherwise untrusted data is used by a directive.
+             *
+             * <example name="interpolation">
+             *  <file name="index.html">
+             *    <div ng-init="username='A user'">
+             *      <p ng-init="apptitle='Escaping demo'">{{apptitle}}: \{\{ username = "defaced value"; \}\}
+             *        </p>
+             *      <p><strong>{{username}}</strong> attempts to inject code which will deface the
+             *        application, but fails to accomplish their task, because the server has correctly
+             *        escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash)
+             *        characters.</p>
+             *      <p>Instead, the result of the attempted script injection is visible, and can be removed
+             *        from the database by an administrator.</p>
+             *    </div>
+             *  </file>
+             * </example>
+             *
+             * @knownIssue
+             * It is currently not possible for an interpolated expression to contain the interpolation end
+             * symbol. For example, `{{ '}}' }}` will be incorrectly interpreted as `{{ ' }}` + `' }}`, i.e.
+             * an interpolated expression consisting of a single-quote (`'`) and the `' }}` string.
+             *
+             * @knownIssue
+             * All directives and components must use the standard `{{` `}}` interpolation symbols
+             * in their templates. If you change the application interpolation symbols the {@link $compile}
+             * service will attempt to denormalize the standard symbols to the custom symbols.
+             * The denormalization process is not clever enough to know not to replace instances of the standard
+             * symbols where they would not normally be treated as interpolation symbols. For example in the following
+             * code snippet the closing braces of the literal object will get incorrectly denormalized:
+             *
+             * ```
+             * <div data-context='{"context":{"id":3,"type":"page"}}">
+             * ```
+             *
+             * The workaround is to ensure that such instances are separated by whitespace:
+             * ```
+             * <div data-context='{"context":{"id":3,"type":"page"} }">
              * ```
              *
+             * See https://github.com/angular/angular.js/pull/14610#issuecomment-219401099 for more information.
              *
              * @param {string} text The text with markup to interpolate.
              * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have
@@ -8559,43 +13142,57 @@
              *    result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult,
      *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
              *    provides Strict Contextual Escaping for details.
+             * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined
+             *    unless all embedded expressions evaluate to a value other than `undefined`.
              * @returns {function(context)} an interpolation function which is used to compute the
              *    interpolated string. The function has these parameters:
              *
-             *    * `context`: an object against which any expressions embedded in the strings are evaluated
-             *      against.
-             *
+             * - `context`: evaluation context for all expressions embedded in the interpolated text
              */
-            function $interpolate(text, mustHaveExpression, trustedContext) {
+            function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
+                // Provide a quick exit and simplified result function for text with no interpolation
+                if (!text.length || text.indexOf(startSymbol) === -1) {
+                    var constantInterp;
+                    if (!mustHaveExpression) {
+                        var unescapedText = unescapeText(text);
+                        constantInterp = valueFn(unescapedText);
+                        constantInterp.exp = text;
+                        constantInterp.expressions = [];
+                        constantInterp.$$watchDelegate = constantWatchDelegate;
+                    }
+                    return constantInterp;
+                }
+
+                allOrNothing = !!allOrNothing;
                 var startIndex,
                     endIndex,
                     index = 0,
-                    parts = [],
-                    length = text.length,
-                    hasInterpolation = false,
-                    fn,
+                    expressions = [],
+                    parseFns = [],
+                    textLength = text.length,
                     exp,
-                    concat = [];
-
-                while(index < length) {
-                    if ( ((startIndex = text.indexOf(startSymbol, index)) != -1) &&
-                        ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1) ) {
-                        (index != startIndex) && parts.push(text.substring(index, startIndex));
-                        parts.push(fn = $parse(exp = text.substring(startIndex + startSymbolLength, endIndex)));
-                        fn.exp = exp;
+                    concat = [],
+                    expressionPositions = [];
+
+                while (index < textLength) {
+                    if (((startIndex = text.indexOf(startSymbol, index)) !== -1) &&
+                        ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) !== -1)) {
+                        if (index !== startIndex) {
+                            concat.push(unescapeText(text.substring(index, startIndex)));
+                        }
+                        exp = text.substring(startIndex + startSymbolLength, endIndex);
+                        expressions.push(exp);
+                        parseFns.push($parse(exp, parseStringifyInterceptor));
                         index = endIndex + endSymbolLength;
-                        hasInterpolation = true;
+                        expressionPositions.push(concat.length);
+                        concat.push('');
                     } else {
-                        // we did not find anything, so we have to add the remainder to the parts array
-                        (index != length) && parts.push(text.substring(index));
-                        index = length;
-                    }
-                }
-
-                if (!(length = parts.length)) {
-                    // we added, nothing, must have been an empty string.
-                    parts.push('');
-                    length = 1;
+                        // we did not find an interpolation, so we have to add the remainder to the separators array
+                        if (index !== textLength) {
+                            concat.push(unescapeText(text.substring(index)));
+                        }
+                        break;
+                    }
                 }
 
                 // Concatenating expressions makes it hard to reason about whether some combination of
@@ -8604,44 +13201,62 @@
                 // that's used is assigned or constructed by some JS code somewhere that is more testable or
                 // make it obvious that you bound the value to some user controlled value.  This helps reduce
                 // the load when auditing for XSS issues.
-                if (trustedContext && parts.length > 1) {
-                    throw $interpolateMinErr('noconcat',
-                        "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
-                        "interpolations that concatenate multiple expressions when a trusted value is " +
-                        "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+                if (trustedContext && concat.length > 1) {
+                    $interpolateMinErr.throwNoconcat(text);
                 }
 
-                if (!mustHaveExpression  || hasInterpolation) {
-                    concat.length = length;
-                    fn = function(context) {
+                if (!mustHaveExpression || expressions.length) {
+                    var compute = function(values) {
+                        for (var i = 0, ii = expressions.length; i < ii; i++) {
+                            if (allOrNothing && isUndefined(values[i])) return;
+                            concat[expressionPositions[i]] = values[i];
+                        }
+                        return concat.join('');
+                    };
+
+                    var getValue = function(value) {
+                        return trustedContext ?
+                            $sce.getTrusted(trustedContext, value) :
+                            $sce.valueOf(value);
+                    };
+
+                    return extend(function interpolationFn(context) {
+                        var i = 0;
+                        var ii = expressions.length;
+                        var values = new Array(ii);
+
                         try {
-                            for(var i = 0, ii = length, part; i<ii; i++) {
-                                if (typeof (part = parts[i]) == 'function') {
-                                    part = part(context);
-                                    if (trustedContext) {
-                                        part = $sce.getTrusted(trustedContext, part);
-                                    } else {
-                                        part = $sce.valueOf(part);
-                                    }
-                                    if (part === null || isUndefined(part)) {
-                                        part = '';
-                                    } else if (typeof part != 'string') {
-                                        part = toJson(part);
-                                    }
-                                }
-                                concat[i] = part;
+                            for (; i < ii; i++) {
+                                values[i] = parseFns[i](context);
                             }
-                            return concat.join('');
+
+                            return compute(values);
+                        } catch (err) {
+                            $exceptionHandler($interpolateMinErr.interr(text, err));
                         }
-                        catch(err) {
-                            var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text,
-                                err.toString());
-                            $exceptionHandler(newErr);
+
+                    }, {
+                        // all of these properties are undocumented for now
+                        exp: text, //just for compatibility with regular watchers created via $watch
+                        expressions: expressions,
+                        $$watchDelegate: function(scope, listener) {
+                            var lastValue;
+                            return scope.$watchGroup(parseFns, /** @this */ function interpolateFnWatcher(values, oldValues) {
+                                var currValue = compute(values);
+                                listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
+                                lastValue = currValue;
+                            });
                         }
-                    };
-                    fn.exp = text;
-                    fn.parts = parts;
-                    return fn;
+                    });
+                }
+
+                function parseStringifyInterceptor(value) {
+                    try {
+                        value = getValue(value);
+                        return allOrNothing && !isDefined(value) ? value : stringify(value);
+                    } catch (err) {
+                        $exceptionHandler($interpolateMinErr.interr(text, err));
+                    }
                 }
             }
 
@@ -8651,8 +13266,8 @@
              * @name $interpolate#startSymbol
              * @description
              * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
-     *
-     * Use {@link ng.$interpolateProvider#startSymbol $interpolateProvider#startSymbol} to change
+             *
+             * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
              * the symbol.
              *
              * @returns {string} start symbol.
@@ -8668,7 +13283,7 @@
              * @description
              * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
              *
-             * Use {@link ng.$interpolateProvider#endSymbol $interpolateProvider#endSymbol} to change
+             * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
              * the symbol.
              *
              * @returns {string} end symbol.
@@ -8681,9 +13296,10 @@
         }];
     }
 
+    /** @this */
     function $IntervalProvider() {
-        this.$get = ['$rootScope', '$window', '$q',
-            function($rootScope,   $window,   $q) {
+        this.$get = ['$rootScope', '$window', '$q', '$$q', '$browser',
+            function($rootScope,   $window,   $q,   $$q,   $browser) {
                 var intervals = {};
 
 
@@ -8692,7 +13308,7 @@
                  * @name $interval
                  *
                  * @description
-                 * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
+                 * AngularJS's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
                  * milliseconds.
                  *
                  * The return value of registering an interval function is a promise. This promise will be
@@ -8713,116 +13329,124 @@
                  * appropriate moment.  See the example below for more details on how and when to do this.
                  * </div>
                  *
-                 * @param {function()} fn A function that should be called repeatedly.
+                 * @param {function()} fn A function that should be called repeatedly. If no additional arguments
+                 *   are passed (see below), the function is called with the current iteration count.
                  * @param {number} delay Number of milliseconds between each function call.
                  * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
                  *   indefinitely.
                  * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
                  *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
-                 * @returns {promise} A promise which will be notified on each iteration.
+                 * @param {...*=} Pass additional parameters to the executed function.
+                 * @returns {promise} A promise which will be notified on each iteration. It will resolve once all iterations of the interval complete.
                  *
                  * @example
-                 * <example module="time">
-                 *   <file name="index.html">
-                 *     <script>
-                 *       function Ctrl2($scope,$interval) {
-      *         $scope.format = 'M/d/yy h:mm:ss a';
-      *         $scope.blood_1 = 100;
-      *         $scope.blood_2 = 120;
-      *
-      *         var stop;
-      *         $scope.fight = function() {
-      *           // Don't start a new fight if we are already fighting
-      *           if ( angular.isDefined(stop) ) return;
-      *
-      *           stop = $interval(function() {
-      *             if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
-      *                 $scope.blood_1 = $scope.blood_1 - 3;
-      *                 $scope.blood_2 = $scope.blood_2 - 4;
-      *             } else {
-      *                 $scope.stopFight();
-      *             }
-      *           }, 100);
-      *         };
-      *
-      *         $scope.stopFight = function() {
-      *           if (angular.isDefined(stop)) {
-      *             $interval.cancel(stop);
-      *             stop = undefined;
-      *           }
-      *         };
-      *
-      *         $scope.resetFight = function() {
-      *           $scope.blood_1 = 100;
-      *           $scope.blood_2 = 120;
-      *         }
-      *
-      *         $scope.$on('$destroy', function() {
-      *           // Make sure that the interval is destroyed too
-      *           $scope.stopFight();
-      *         });
-      *       }
+                 * <example module="intervalExample" name="interval-service">
+                 * <file name="index.html">
+                 *   <script>
+                 *     angular.module('intervalExample', [])
+                 *       .controller('ExampleController', ['$scope', '$interval',
+                 *         function($scope, $interval) {
+                 *           $scope.format = 'M/d/yy h:mm:ss a';
+                 *           $scope.blood_1 = 100;
+                 *           $scope.blood_2 = 120;
+                 *
+                 *           var stop;
+                 *           $scope.fight = function() {
+                 *             // Don't start a new fight if we are already fighting
+                 *             if ( angular.isDefined(stop) ) return;
+                 *
+                 *             stop = $interval(function() {
+                 *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
+                 *                 $scope.blood_1 = $scope.blood_1 - 3;
+                 *                 $scope.blood_2 = $scope.blood_2 - 4;
+                 *               } else {
+                 *                 $scope.stopFight();
+                 *               }
+                 *             }, 100);
+                 *           };
+                 *
+                 *           $scope.stopFight = function() {
+                 *             if (angular.isDefined(stop)) {
+                 *               $interval.cancel(stop);
+                 *               stop = undefined;
+                 *             }
+                 *           };
+                 *
+                 *           $scope.resetFight = function() {
+                 *             $scope.blood_1 = 100;
+                 *             $scope.blood_2 = 120;
+                 *           };
+                 *
+                 *           $scope.$on('$destroy', function() {
+                 *             // Make sure that the interval is destroyed too
+                 *             $scope.stopFight();
+                 *           });
+                 *         }])
+                 *       // Register the 'myCurrentTime' directive factory method.
+                 *       // We inject $interval and dateFilter service since the factory method is DI.
+                 *       .directive('myCurrentTime', ['$interval', 'dateFilter',
+                 *         function($interval, dateFilter) {
+                 *           // return the directive link function. (compile function not needed)
+                 *           return function(scope, element, attrs) {
+                 *             var format,  // date format
+                 *                 stopTime; // so that we can cancel the time updates
                  *
-                 *       angular.module('time', [])
-                 *         // Register the 'myCurrentTime' directive factory method.
-                 *         // We inject $interval and dateFilter service since the factory method is DI.
-                 *         .directive('myCurrentTime', function($interval, dateFilter) {
-      *           // return the directive link function. (compile function not needed)
-      *           return function(scope, element, attrs) {
-      *             var format,  // date format
-      *             stopTime; // so that we can cancel the time updates
-      *
-      *             // used to update the UI
-      *             function updateTime() {
-      *               element.text(dateFilter(new Date(), format));
-      *             }
-      *
-      *             // watch the expression, and update the UI on change.
-      *             scope.$watch(attrs.myCurrentTime, function(value) {
-      *               format = value;
-      *               updateTime();
-      *             });
-      *
-      *             stopTime = $interval(updateTime, 1000);
-      *
-      *             // listen on DOM destroy (removal) event, and cancel the next UI update
-      *             // to prevent updating time ofter the DOM element was removed.
-      *             element.bind('$destroy', function() {
-      *               $interval.cancel(stopTime);
-      *             });
-      *           }
-      *         });
-                 *     </script>
+                 *             // used to update the UI
+                 *             function updateTime() {
+                 *               element.text(dateFilter(new Date(), format));
+                 *             }
                  *
-                 *     <div>
-                 *       <div ng-controller="Ctrl2">
-                 *         Date format: <input ng-model="format"> <hr/>
-                 *         Current time is: <span my-current-time="format"></span>
-                 *         <hr/>
-                 *         Blood 1 : <font color='red'>{{blood_1}}</font>
-                 *         Blood 2 : <font color='red'>{{blood_2}}</font>
-                 *         <button type="button" data-ng-click="fight()">Fight</button>
-                 *         <button type="button" data-ng-click="stopFight()">StopFight</button>
-                 *         <button type="button" data-ng-click="resetFight()">resetFight</button>
-                 *       </div>
+                 *             // watch the expression, and update the UI on change.
+                 *             scope.$watch(attrs.myCurrentTime, function(value) {
+                 *               format = value;
+                 *               updateTime();
+                 *             });
+                 *
+                 *             stopTime = $interval(updateTime, 1000);
+                 *
+                 *             // listen on DOM destroy (removal) event, and cancel the next UI update
+                 *             // to prevent updating time after the DOM element was removed.
+                 *             element.on('$destroy', function() {
+                 *               $interval.cancel(stopTime);
+                 *             });
+                 *           }
+                 *         }]);
+                 *   </script>
+                 *
+                 *   <div>
+                 *     <div ng-controller="ExampleController">
+                 *       <label>Date format: <input ng-model="format"></label> <hr/>
+                 *       Current time is: <span my-current-time="format"></span>
+                 *       <hr/>
+                 *       Blood 1 : <font color='red'>{{blood_1}}</font>
+                 *       Blood 2 : <font color='red'>{{blood_2}}</font>
+                 *       <button type="button" data-ng-click="fight()">Fight</button>
+                 *       <button type="button" data-ng-click="stopFight()">StopFight</button>
+                 *       <button type="button" data-ng-click="resetFight()">resetFight</button>
                  *     </div>
+                 *   </div>
                  *
-                 *   </file>
+                 * </file>
                  * </example>
                  */
                 function interval(fn, delay, count, invokeApply) {
-                    var setInterval = $window.setInterval,
+                    var hasParams = arguments.length > 4,
+                        args = hasParams ? sliceArgs(arguments, 4) : [],
+                        setInterval = $window.setInterval,
                         clearInterval = $window.clearInterval,
-                        deferred = $q.defer(),
-                        promise = deferred.promise,
                         iteration = 0,
-                        skipApply = (isDefined(invokeApply) && !invokeApply);
+                        skipApply = (isDefined(invokeApply) && !invokeApply),
+                        deferred = (skipApply ? $$q : $q).defer(),
+                        promise = deferred.promise;
 
                     count = isDefined(count) ? count : 0;
 
-                    promise.then(null, null, fn);
-
                     promise.$$intervalId = setInterval(function tick() {
+                        if (skipApply) {
+                            $browser.defer(callback);
+                        } else {
+                            $rootScope.$evalAsync(callback);
+                        }
                         deferred.notify(iteration++);
 
                         if (count > 0 && iteration >= count) {
@@ -8838,6 +13462,14 @@
                     intervals[promise.$$intervalId] = deferred;
 
                     return promise;
+
+                    function callback() {
+                        if (!hasParams) {
+                            fn(iteration);
+                        } else {
+                            fn.apply(null, args);
+                        }
+                    }
                 }
 
 
@@ -8848,13 +13480,15 @@
                  * @description
                  * Cancels a task associated with the `promise`.
                  *
-                 * @param {promise} promise returned by the `$interval` function.
+                 * @param {Promise=} promise returned by the `$interval` function.
                  * @returns {boolean} Returns `true` if the task was successfully canceled.
                  */
                 interval.cancel = function(promise) {
                     if (promise && promise.$$intervalId in intervals) {
+                        // Interval cancels should not report as unhandled promise.
+                        markQExceptionHandled(intervals[promise.$$intervalId].promise);
                         intervals[promise.$$intervalId].reject('canceled');
-                        clearInterval(promise.$$intervalId);
+                        $window.clearInterval(promise.$$intervalId);
                         delete intervals[promise.$$intervalId];
                         return true;
                     }
@@ -8867,77 +13501,97 @@
 
     /**
      * @ngdoc service
-     * @name $locale
-     *
+     * @name $jsonpCallbacks
+     * @requires $window
      * @description
-     * $locale service provides localization rules for various Angular components. As of right now the
-     * only public api is:
-     *
-     * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+     * This service handles the lifecycle of callbacks to handle JSONP requests.
+     * Override this service if you wish to customise where the callbacks are stored and
+     * how they vary compared to the requested url.
      */
-    function $LocaleProvider(){
+    var $jsonpCallbacksProvider = /** @this */ function() {
         this.$get = function() {
+            var callbacks = angular.callbacks;
+            var callbackMap = {};
+
+            function createCallback(callbackId) {
+                var callback = function(data) {
+                    callback.data = data;
+                    callback.called = true;
+                };
+                callback.id = callbackId;
+                return callback;
+            }
+
             return {
-                id: 'en-us',
-
-                NUMBER_FORMATS: {
-                    DECIMAL_SEP: '.',
-                    GROUP_SEP: ',',
-                    PATTERNS: [
-                        { // Decimal Pattern
-                            minInt: 1,
-                            minFrac: 0,
-                            maxFrac: 3,
-                            posPre: '',
-                            posSuf: '',
-                            negPre: '-',
-                            negSuf: '',
-                            gSize: 3,
-                            lgSize: 3
-                        },{ //Currency Pattern
-                            minInt: 1,
-                            minFrac: 2,
-                            maxFrac: 2,
-                            posPre: '\u00A4',
-                            posSuf: '',
-                            negPre: '(\u00A4',
-                            negSuf: ')',
-                            gSize: 3,
-                            lgSize: 3
-                        }
-                    ],
-                    CURRENCY_SYM: '$'
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#createCallback
+                 * @param {string} url the url of the JSONP request
+                 * @returns {string} the callback path to send to the server as part of the JSONP request
+                 * @description
+                 * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
+                 * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
+                 */
+                createCallback: function(url) {
+                    var callbackId = '_' + (callbacks.$$counter++).toString(36);
+                    var callbackPath = 'angular.callbacks.' + callbackId;
+                    var callback = createCallback(callbackId);
+                    callbackMap[callbackPath] = callbacks[callbackId] = callback;
+                    return callbackPath;
                 },
-
-                DATETIME_FORMATS: {
-                    MONTH:
-                        'January,February,March,April,May,June,July,August,September,October,November,December'
-                            .split(','),
-                    SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
-                    DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
-                    SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
-                    AMPMS: ['AM','PM'],
-                    medium: 'MMM d, y h:mm:ss a',
-                    short: 'M/d/yy h:mm a',
-                    fullDate: 'EEEE, MMMM d, y',
-                    longDate: 'MMMM d, y',
-                    mediumDate: 'MMM d, y',
-                    shortDate: 'M/d/yy',
-                    mediumTime: 'h:mm:ss a',
-                    shortTime: 'h:mm a'
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#wasCalled
+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+                 * @returns {boolean} whether the callback has been called, as a result of the JSONP response
+                 * @description
+                 * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
+                 * callback that was passed in the request.
+                 */
+                wasCalled: function(callbackPath) {
+                    return callbackMap[callbackPath].called;
                 },
-
-                pluralCat: function(num) {
-                    if (num === 1) {
-                        return 'one';
-                    }
-                    return 'other';
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#getResponse
+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+                 * @returns {*} the data received from the response via the registered callback
+                 * @description
+                 * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
+                 * in the JSONP response.
+                 */
+                getResponse: function(callbackPath) {
+                    return callbackMap[callbackPath].data;
+                },
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#removeCallback
+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+                 * @description
+                 * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
+                 * completed or timed-out.
+                 */
+                removeCallback: function(callbackPath) {
+                    var callback = callbackMap[callbackPath];
+                    delete callbacks[callback.id];
+                    delete callbackMap[callbackPath];
                 }
             };
         };
-    }
+    };
+
+    /**
+     * @ngdoc service
+     * @name $locale
+     *
+     * @description
+     * $locale service provides localization rules for various AngularJS components. As of right now the
+     * only public api is:
+     *
+     * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+     */
 
-    var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
+    var PATH_MATCH = /^([^?#]*)(\?([^#]*))?(#(.*))?$/,
         DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
     var $locationMinErr = minErr('$location');
 
@@ -8953,56 +13607,84 @@
             i = segments.length;
 
         while (i--) {
-            segments[i] = encodeUriSegment(segments[i]);
+            // decode forward slashes to prevent them from being double encoded
+            segments[i] = encodeUriSegment(segments[i].replace(/%2F/g, '/'));
+        }
+
+        return segments.join('/');
+    }
+
+    function decodePath(path, html5Mode) {
+        var segments = path.split('/'),
+            i = segments.length;
+
+        while (i--) {
+            segments[i] = decodeURIComponent(segments[i]);
+            if (html5Mode) {
+                // encode forward slashes to prevent them from being mistaken for path separators
+                segments[i] = segments[i].replace(/\//g, '%2F');
+            }
         }
 
         return segments.join('/');
     }
 
-    function parseAbsoluteUrl(absoluteUrl, locationObj, appBase) {
-        var parsedUrl = urlResolve(absoluteUrl, appBase);
+    function parseAbsoluteUrl(absoluteUrl, locationObj) {
+        var parsedUrl = urlResolve(absoluteUrl);
 
         locationObj.$$protocol = parsedUrl.protocol;
         locationObj.$$host = parsedUrl.hostname;
-        locationObj.$$port = int(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
+        locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
     }
 
+    var DOUBLE_SLASH_REGEX = /^\s*[\\/]{2,}/;
+    function parseAppUrl(url, locationObj, html5Mode) {
+
+        if (DOUBLE_SLASH_REGEX.test(url)) {
+            throw $locationMinErr('badpath', 'Invalid url "{0}".', url);
+        }
 
-    function parseAppUrl(relativeUrl, locationObj, appBase) {
-        var prefixed = (relativeUrl.charAt(0) !== '/');
+        var prefixed = (url.charAt(0) !== '/');
         if (prefixed) {
-            relativeUrl = '/' + relativeUrl;
+            url = '/' + url;
         }
-        var match = urlResolve(relativeUrl, appBase);
-        locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
-            match.pathname.substring(1) : match.pathname);
+        var match = urlResolve(url);
+        var path = prefixed && match.pathname.charAt(0) === '/' ? match.pathname.substring(1) : match.pathname;
+        locationObj.$$path = decodePath(path, html5Mode);
         locationObj.$$search = parseKeyValue(match.search);
         locationObj.$$hash = decodeURIComponent(match.hash);
 
         // make sure path starts with '/';
-        if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
+        if (locationObj.$$path && locationObj.$$path.charAt(0) !== '/') {
             locationObj.$$path = '/' + locationObj.$$path;
         }
     }
 
+    function startsWith(str, search) {
+        return str.slice(0, search.length) === search;
+    }
 
     /**
      *
-     * @param {string} begin
-     * @param {string} whole
-     * @returns {string} returns text from whole after begin or undefined if it does not begin with
-     *                   expected string.
+     * @param {string} base
+     * @param {string} url
+     * @returns {string} returns text from `url` after `base` or `undefined` if it does not begin with
+     *                   the expected string.
      */
-    function beginsWith(begin, whole) {
-        if (whole.indexOf(begin) === 0) {
-            return whole.substr(begin.length);
+    function stripBaseUrl(base, url) {
+        if (startsWith(url, base)) {
+            return url.substr(base.length);
         }
     }
 
 
     function stripHash(url) {
         var index = url.indexOf('#');
-        return index == -1 ? url : url.substr(0, index);
+        return index === -1 ? url : url.substr(0, index);
+    }
+
+    function trimEmptyHash(url) {
+        return url.replace(/(#.+)|#$/, '$1');
     }
 
 
@@ -9017,33 +13699,33 @@
 
 
     /**
-     * LocationHtml5Url represents an url
+     * LocationHtml5Url represents a URL
      * This object is exposed as $location service when HTML5 mode is enabled and supported
      *
      * @constructor
      * @param {string} appBase application base URL
-     * @param {string} basePrefix url path prefix
+     * @param {string} appBaseNoFile application base URL stripped of any filename
+     * @param {string} basePrefix URL path prefix
      */
-    function LocationHtml5Url(appBase, basePrefix) {
+    function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) {
         this.$$html5 = true;
         basePrefix = basePrefix || '';
-        var appBaseNoFile = stripFile(appBase);
-        parseAbsoluteUrl(appBase, this, appBase);
+        parseAbsoluteUrl(appBase, this);
 
 
         /**
-         * Parse given html5 (regular) url string into properties
-         * @param {string} newAbsoluteUrl HTML5 url
+         * Parse given HTML5 (regular) URL string into properties
+         * @param {string} url HTML5 URL
          * @private
          */
         this.$$parse = function(url) {
-            var pathUrl = beginsWith(appBaseNoFile, url);
+            var pathUrl = stripBaseUrl(appBaseNoFile, url);
             if (!isString(pathUrl)) {
                 throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url,
                     appBaseNoFile);
             }
 
-            parseAppUrl(pathUrl, this, appBase);
+            parseAppUrl(pathUrl, this, true);
 
             if (!this.$$path) {
                 this.$$path = '/';
@@ -9062,94 +13744,122 @@
 
             this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
             this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
+
+            this.$$urlUpdatedByLocation = true;
         };
 
-        this.$$rewrite = function(url) {
+        this.$$parseLinkUrl = function(url, relHref) {
+            if (relHref && relHref[0] === '#') {
+                // special case for links to hash fragments:
+                // keep the old url and only replace the hash fragment
+                this.hash(relHref.slice(1));
+                return true;
+            }
             var appUrl, prevAppUrl;
+            var rewrittenUrl;
+
 
-            if ( (appUrl = beginsWith(appBase, url)) !== undefined ) {
+            if (isDefined(appUrl = stripBaseUrl(appBase, url))) {
                 prevAppUrl = appUrl;
-                if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) {
-                    return appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
+                if (basePrefix && isDefined(appUrl = stripBaseUrl(basePrefix, appUrl))) {
+                    rewrittenUrl = appBaseNoFile + (stripBaseUrl('/', appUrl) || appUrl);
                 } else {
-                    return appBase + prevAppUrl;
+                    rewrittenUrl = appBase + prevAppUrl;
                 }
-            } else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) {
-                return appBaseNoFile + appUrl;
-            } else if (appBaseNoFile == url + '/') {
-                return appBaseNoFile;
+            } else if (isDefined(appUrl = stripBaseUrl(appBaseNoFile, url))) {
+                rewrittenUrl = appBaseNoFile + appUrl;
+            } else if (appBaseNoFile === url + '/') {
+                rewrittenUrl = appBaseNoFile;
             }
+            if (rewrittenUrl) {
+                this.$$parse(rewrittenUrl);
+            }
+            return !!rewrittenUrl;
         };
     }
 
 
     /**
-     * LocationHashbangUrl represents url
+     * LocationHashbangUrl represents URL
      * This object is exposed as $location service when developer doesn't opt into html5 mode.
      * It also serves as the base class for html5 mode fallback on legacy browsers.
      *
      * @constructor
      * @param {string} appBase application base URL
+     * @param {string} appBaseNoFile application base URL stripped of any filename
      * @param {string} hashPrefix hashbang prefix
      */
-    function LocationHashbangUrl(appBase, hashPrefix) {
-        var appBaseNoFile = stripFile(appBase);
+    function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) {
 
-        parseAbsoluteUrl(appBase, this, appBase);
+        parseAbsoluteUrl(appBase, this);
 
 
         /**
-         * Parse given hashbang url into properties
-         * @param {string} url Hashbang url
+         * Parse given hashbang URL into properties
+         * @param {string} url Hashbang URL
          * @private
          */
         this.$$parse = function(url) {
-            var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
-            var withoutHashUrl = withoutBaseUrl.charAt(0) == '#'
-                ? beginsWith(hashPrefix, withoutBaseUrl)
-                : (this.$$html5)
-                ? withoutBaseUrl
-                : '';
+            var withoutBaseUrl = stripBaseUrl(appBase, url) || stripBaseUrl(appBaseNoFile, url);
+            var withoutHashUrl;
+
+            if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') {
 
-            if (!isString(withoutHashUrl)) {
-                throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url,
-                    hashPrefix);
+                // The rest of the URL starts with a hash so we have
+                // got either a hashbang path or a plain hash fragment
+                withoutHashUrl = stripBaseUrl(hashPrefix, withoutBaseUrl);
+                if (isUndefined(withoutHashUrl)) {
+                    // There was no hashbang prefix so we just have a hash fragment
+                    withoutHashUrl = withoutBaseUrl;
+                }
+
+            } else {
+                // There was no hashbang path nor hash fragment:
+                // If we are in HTML5 mode we use what is left as the path;
+                // Otherwise we ignore what is left
+                if (this.$$html5) {
+                    withoutHashUrl = withoutBaseUrl;
+                } else {
+                    withoutHashUrl = '';
+                    if (isUndefined(withoutBaseUrl)) {
+                        appBase = url;
+                        /** @type {?} */ (this).replace();
+                    }
+                }
             }
-            parseAppUrl(withoutHashUrl, this, appBase);
+
+            parseAppUrl(withoutHashUrl, this, false);
 
             this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase);
 
             this.$$compose();
 
             /*
-             * In Windows, on an anchor node on documents loaded from
-             * the filesystem, the browser will return a pathname
-             * prefixed with the drive name ('/C:/path') when a
-             * pathname without a drive is set:
-             *  * a.setAttribute('href', '/foo')
-             *   * a.pathname === '/C:/foo' //true
-             *
-             * Inside of Angular, we're always using pathnames that
-             * do not include drive names for routing.
-             */
-            function removeWindowsDriveName (path, url, base) {
+     * In Windows, on an anchor node on documents loaded from
+     * the filesystem, the browser will return a pathname
+     * prefixed with the drive name ('/C:/path') when a
+     * pathname without a drive is set:
+     *  * a.setAttribute('href', '/foo')
+     *   * a.pathname === '/C:/foo' //true
+     *
+     * Inside of AngularJS, we're always using pathnames that
+     * do not include drive names for routing.
+     */
+            function removeWindowsDriveName(path, url, base) {
                 /*
-                 Matches paths for file protocol on windows,
-                 such as /C:/foo/bar, and captures only /foo/bar.
-                 */
-                var windowsFilePathExp = /^\/?.*?:(\/.*)/;
+      Matches paths for file protocol on windows,
+      such as /C:/foo/bar, and captures only /foo/bar.
+      */
+                var windowsFilePathExp = /^\/[A-Z]:(\/.*)/;
 
                 var firstPathSegmentMatch;
 
                 //Get the relative path from the input URL.
-                if (url.indexOf(base) === 0) {
+                if (startsWith(url, base)) {
                     url = url.replace(base, '');
                 }
 
-                /*
-                 * The input URL intentionally contains a
-                 * first path segment that ends with a colon.
-                 */
+                // The input URL intentionally contains a first path segment that ends with a colon.
                 if (windowsFilePathExp.exec(url)) {
                     return path;
                 }
@@ -9160,7 +13870,7 @@
         };
 
         /**
-         * Compose hashbang url and update `absUrl` property
+         * Compose hashbang URL and update `absUrl` property
          * @private
          */
         this.$$compose = function() {
@@ -9169,250 +13879,415 @@
 
             this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
             this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
+
+            this.$$urlUpdatedByLocation = true;
         };
 
-        this.$$rewrite = function(url) {
-            if(stripHash(appBase) == stripHash(url)) {
-                return url;
+        this.$$parseLinkUrl = function(url, relHref) {
+            if (stripHash(appBase) === stripHash(url)) {
+                this.$$parse(url);
+                return true;
             }
+            return false;
         };
     }
 
 
     /**
-     * LocationHashbangUrl represents url
+     * LocationHashbangUrl represents URL
      * This object is exposed as $location service when html5 history api is enabled but the browser
      * does not support it.
      *
      * @constructor
      * @param {string} appBase application base URL
+     * @param {string} appBaseNoFile application base URL stripped of any filename
      * @param {string} hashPrefix hashbang prefix
      */
-    function LocationHashbangInHtml5Url(appBase, hashPrefix) {
+    function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
         this.$$html5 = true;
         LocationHashbangUrl.apply(this, arguments);
 
-        var appBaseNoFile = stripFile(appBase);
+        this.$$parseLinkUrl = function(url, relHref) {
+            if (relHref && relHref[0] === '#') {
+                // special case for links to hash fragments:
+                // keep the old url and only replace the hash fragment
+                this.hash(relHref.slice(1));
+                return true;
+            }
 
-        this.$$rewrite = function(url) {
+            var rewrittenUrl;
             var appUrl;
 
-            if ( appBase == stripHash(url) ) {
-                return url;
-            } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
-                return appBase + hashPrefix + appUrl;
-            } else if ( appBaseNoFile === url + '/') {
-                return appBaseNoFile;
+            if (appBase === stripHash(url)) {
+                rewrittenUrl = url;
+            } else if ((appUrl = stripBaseUrl(appBaseNoFile, url))) {
+                rewrittenUrl = appBase + hashPrefix + appUrl;
+            } else if (appBaseNoFile === url + '/') {
+                rewrittenUrl = appBaseNoFile;
             }
+            if (rewrittenUrl) {
+                this.$$parse(rewrittenUrl);
+            }
+            return !!rewrittenUrl;
         };
-    }
 
+        this.$$compose = function() {
+            var search = toKeyValue(this.$$search),
+                hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
-    LocationHashbangInHtml5Url.prototype =
-        LocationHashbangUrl.prototype =
-            LocationHtml5Url.prototype = {
+            this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+            // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#'
+            this.$$absUrl = appBase + hashPrefix + this.$$url;
 
-                /**
-                 * Are we in html5 mode?
-                 * @private
-                 */
-                $$html5: false,
+            this.$$urlUpdatedByLocation = true;
+        };
 
-                /**
-                 * Has any change been replacing ?
-                 * @private
-                 */
-                $$replace: false,
+    }
 
-                /**
-                 * @ngdoc method
-                 * @name $location#absUrl
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return full url representation with all segments encoded according to rules specified in
-                 * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
-                 *
-                 * @return {string} full url
-                 */
-                absUrl: locationGetter('$$absUrl'),
 
-                /**
-                 * @ngdoc method
-                 * @name $location#url
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return url (e.g. `/path?a=b#hash`) when called without any parameter.
-                 *
-                 * Change path, search and hash, when called with parameter and return `$location`.
-                 *
-                 * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
-                 * @param {string=} replace The path that will be changed
-                 * @return {string} url
-                 */
-                url: function(url, replace) {
-                    if (isUndefined(url))
-                        return this.$$url;
+    var locationPrototype = {
 
-                    var match = PATH_MATCH.exec(url);
-                    if (match[1]) this.path(decodeURIComponent(match[1]));
-                    if (match[2] || match[1]) this.search(match[3] || '');
-                    this.hash(match[5] || '', replace);
+        /**
+         * Ensure absolute URL is initialized.
+         * @private
+         */
+        $$absUrl:'',
 
-                    return this;
-                },
+        /**
+         * Are we in html5 mode?
+         * @private
+         */
+        $$html5: false,
 
-                /**
-                 * @ngdoc method
-                 * @name $location#protocol
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return protocol of current url.
-                 *
-                 * @return {string} protocol of current url
-                 */
-                protocol: locationGetter('$$protocol'),
+        /**
+         * Has any change been replacing?
+         * @private
+         */
+        $$replace: false,
 
-                /**
-                 * @ngdoc method
-                 * @name $location#host
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return host of current url.
-                 *
-                 * @return {string} host of current url.
-                 */
-                host: locationGetter('$$host'),
+        /**
+         * @ngdoc method
+         * @name $location#absUrl
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return full URL representation with all segments encoded according to rules specified in
+         * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var absUrl = $location.absUrl();
+         * // => "http://example.com/#/some/path?foo=bar&baz=xoxo"
+         * ```
+         *
+         * @return {string} full URL
+         */
+        absUrl: locationGetter('$$absUrl'),
 
-                /**
-                 * @ngdoc method
-                 * @name $location#port
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return port of current url.
-                 *
-                 * @return {Number} port
-                 */
-                port: locationGetter('$$port'),
+        /**
+         * @ngdoc method
+         * @name $location#url
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return URL (e.g. `/path?a=b#hash`) when called without any parameter.
+         *
+         * Change path, search and hash, when called with parameter and return `$location`.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var url = $location.url();
+         * // => "/some/path?foo=bar&baz=xoxo"
+         * ```
+         *
+         * @param {string=} url New URL without base prefix (e.g. `/path?a=b#hash`)
+         * @return {string} url
+         */
+        url: function(url) {
+            if (isUndefined(url)) {
+                return this.$$url;
+            }
 
-                /**
-                 * @ngdoc method
-                 * @name $location#path
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return path of current url when called without any parameter.
-                 *
-                 * Change path when called with parameter and return `$location`.
-                 *
-                 * Note: Path should always begin with forward slash (/), this method will add the forward slash
-                 * if it is missing.
-                 *
-                 * @param {string=} path New path
-                 * @return {string} path
-                 */
-                path: locationGetterSetter('$$path', function(path) {
-                    return path.charAt(0) == '/' ? path : '/' + path;
-                }),
+            var match = PATH_MATCH.exec(url);
+            if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
+            if (match[2] || match[1] || url === '') this.search(match[3] || '');
+            this.hash(match[5] || '');
 
-                /**
-                 * @ngdoc method
-                 * @name $location#search
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return search part (as object) of current url when called without any parameter.
-                 *
-                 * Change search part when called with parameter and return `$location`.
-                 *
-                 * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
-                 * hash object. Hash object may contain an array of values, which will be decoded as duplicates in
-                 * the url.
-                 *
-                 * @param {(string|Array<string>)=} paramValue If `search` is a string, then `paramValue` will override only a
-                 * single search parameter. If `paramValue` is an array, it will set the parameter as a
-                 * comma-separated value. If `paramValue` is `null`, the parameter will be deleted.
-                 *
-                 * @return {string} search
-                 */
-                search: function(search, paramValue) {
-                    switch (arguments.length) {
-                        case 0:
-                            return this.$$search;
-                        case 1:
-                            if (isString(search)) {
-                                this.$$search = parseKeyValue(search);
-                            } else if (isObject(search)) {
-                                this.$$search = search;
-                            } else {
-                                throw $locationMinErr('isrcharg',
-                                    'The first argument of the `$location#search()` call must be a string or an object.');
-                            }
-                            break;
-                        default:
-                            if (isUndefined(paramValue) || paramValue === null) {
-                                delete this.$$search[search];
-                            } else {
-                                this.$$search[search] = paramValue;
-                            }
-                    }
+            return this;
+        },
 
-                    this.$$compose();
-                    return this;
-                },
+        /**
+         * @ngdoc method
+         * @name $location#protocol
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return protocol of current URL.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var protocol = $location.protocol();
+         * // => "http"
+         * ```
+         *
+         * @return {string} protocol of current URL
+         */
+        protocol: locationGetter('$$protocol'),
 
-                /**
-                 * @ngdoc method
-                 * @name $location#hash
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return hash fragment when called without any parameter.
-                 *
-                 * Change hash fragment when called with parameter and return `$location`.
-                 *
-                 * @param {string=} hash New hash fragment
-                 * @return {string} hash
-                 */
-                hash: locationGetterSetter('$$hash', identity),
+        /**
+         * @ngdoc method
+         * @name $location#host
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return host of current URL.
+         *
+         * Note: compared to the non-AngularJS version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var host = $location.host();
+         * // => "example.com"
+         *
+         * // given URL http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
+         * host = $location.host();
+         * // => "example.com"
+         * host = location.host;
+         * // => "example.com:8080"
+         * ```
+         *
+         * @return {string} host of current URL.
+         */
+        host: locationGetter('$$host'),
+
+        /**
+         * @ngdoc method
+         * @name $location#port
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return port of current URL.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var port = $location.port();
+         * // => 80
+         * ```
+         *
+         * @return {Number} port
+         */
+        port: locationGetter('$$port'),
+
+        /**
+         * @ngdoc method
+         * @name $location#path
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return path of current URL when called without any parameter.
+         *
+         * Change path when called with parameter and return `$location`.
+         *
+         * Note: Path should always begin with forward slash (/), this method will add the forward slash
+         * if it is missing.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var path = $location.path();
+         * // => "/some/path"
+         * ```
+         *
+         * @param {(string|number)=} path New path
+         * @return {(string|object)} path if called with no parameters, or `$location` if called with a parameter
+         */
+        path: locationGetterSetter('$$path', function(path) {
+            path = path !== null ? path.toString() : '';
+            return path.charAt(0) === '/' ? path : '/' + path;
+        }),
+
+        /**
+         * @ngdoc method
+         * @name $location#search
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return search part (as object) of current URL when called without any parameter.
+         *
+         * Change search part when called with parameter and return `$location`.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var searchObject = $location.search();
+         * // => {foo: 'bar', baz: 'xoxo'}
+         *
+         * // set foo to 'yipee'
+         * $location.search('foo', 'yipee');
+         * // $location.search() => {foo: 'yipee', baz: 'xoxo'}
+         * ```
+         *
+         * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
+         * hash object.
+         *
+         * When called with a single argument the method acts as a setter, setting the `search` component
+         * of `$location` to the specified value.
+         *
+         * If the argument is a hash object containing an array of values, these values will be encoded
+         * as duplicate search parameters in the URL.
+         *
+         * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
+         * will override only a single search property.
+         *
+         * If `paramValue` is an array, it will override the property of the `search` component of
+         * `$location` specified via the first argument.
+         *
+         * If `paramValue` is `null`, the property specified via the first argument will be deleted.
+         *
+         * If `paramValue` is `true`, the property specified via the first argument will be added with no
+         * value nor trailing equal sign.
+         *
+         * @return {Object} If called with no arguments returns the parsed `search` object. If called with
+         * one or more arguments returns `$location` object itself.
+         */
+        search: function(search, paramValue) {
+            switch (arguments.length) {
+                case 0:
+                    return this.$$search;
+                case 1:
+                    if (isString(search) || isNumber(search)) {
+                        search = search.toString();
+                        this.$$search = parseKeyValue(search);
+                    } else if (isObject(search)) {
+                        search = copy(search, {});
+                        // remove object undefined or null properties
+                        forEach(search, function(value, key) {
+                            if (value == null) delete search[key];
+                        });
+
+                        this.$$search = search;
+                    } else {
+                        throw $locationMinErr('isrcharg',
+                            'The first argument of the `$location#search()` call must be a string or an object.');
+                    }
+                    break;
+                default:
+                    if (isUndefined(paramValue) || paramValue === null) {
+                        delete this.$$search[search];
+                    } else {
+                        this.$$search[search] = paramValue;
+                    }
+            }
+
+            this.$$compose();
+            return this;
+        },
+
+        /**
+         * @ngdoc method
+         * @name $location#hash
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Returns the hash fragment when called without any parameters.
+         *
+         * Changes the hash fragment when called with a parameter and returns `$location`.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
+         * var hash = $location.hash();
+         * // => "hashValue"
+         * ```
+         *
+         * @param {(string|number)=} hash New hash fragment
+         * @return {string} hash
+         */
+        hash: locationGetterSetter('$$hash', function(hash) {
+            return hash !== null ? hash.toString() : '';
+        }),
+
+        /**
+         * @ngdoc method
+         * @name $location#replace
+         *
+         * @description
+         * If called, all changes to $location during the current `$digest` will replace the current history
+         * record, instead of adding a new one.
+         */
+        replace: function() {
+            this.$$replace = true;
+            return this;
+        }
+    };
+
+    forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) {
+        Location.prototype = Object.create(locationPrototype);
+
+        /**
+         * @ngdoc method
+         * @name $location#state
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return the history state object when called without any parameter.
+         *
+         * Change the history state object when called with one parameter and return `$location`.
+         * The state object is later passed to `pushState` or `replaceState`.
+         *
+         * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
+         * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
+         * older browsers (like IE9 or Android < 4.0), don't use this method.
+         *
+         * @param {object=} state State object for pushState or replaceState
+         * @return {object} state
+         */
+        Location.prototype.state = function(state) {
+            if (!arguments.length) {
+                return this.$$state;
+            }
+
+            if (Location !== LocationHtml5Url || !this.$$html5) {
+                throw $locationMinErr('nostate', 'History API state support is available only ' +
+                    'in HTML5 mode and only in browsers supporting HTML5 History API');
+            }
+            // The user might modify `stateObject` after invoking `$location.state(stateObject)`
+            // but we're changing the $$state reference to $browser.state() during the $digest
+            // so the modification window is narrow.
+            this.$$state = isUndefined(state) ? null : state;
+            this.$$urlUpdatedByLocation = true;
+
+            return this;
+        };
+    });
 
-                /**
-                 * @ngdoc method
-                 * @name $location#replace
-                 *
-                 * @description
-                 * If called, all changes to $location during current `$digest` will be replacing current history
-                 * record, instead of adding new one.
-                 */
-                replace: function() {
-                    this.$$replace = true;
-                    return this;
-                }
-            };
 
     function locationGetter(property) {
-        return function() {
+        return /** @this */ function() {
             return this[property];
         };
     }
 
 
     function locationGetterSetter(property, preprocess) {
-        return function(value) {
-            if (isUndefined(value))
+        return /** @this */ function(value) {
+            if (isUndefined(value)) {
                 return this[property];
+            }
 
             this[property] = preprocess(value);
             this.$$compose();
@@ -9451,17 +14326,24 @@
     /**
      * @ngdoc provider
      * @name $locationProvider
+     * @this
+     *
      * @description
      * Use the `$locationProvider` to configure how the application deep linking paths are stored.
      */
-    function $LocationProvider(){
-        var hashPrefix = '',
-            html5Mode = false;
+    function $LocationProvider() {
+        var hashPrefix = '!',
+            html5Mode = {
+                enabled: false,
+                requireBase: true,
+                rewriteLinks: true
+            };
 
         /**
-         * @ngdoc property
+         * @ngdoc method
          * @name $locationProvider#hashPrefix
          * @description
+         * The default value for the prefix is `'!'`.
          * @param {string=} prefix Prefix for hash part (containing path and search)
          * @returns {*} current value if used as getter or itself (chaining) if used as setter
          */
@@ -9475,15 +14357,46 @@
         };
 
         /**
-         * @ngdoc property
+         * @ngdoc method
          * @name $locationProvider#html5Mode
          * @description
-         * @param {boolean=} mode Use HTML5 strategy if available.
-         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
+         *   If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported
+         *   properties:
+         *   - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to
+         *     change urls where supported. Will fall back to hash-prefixed paths in browsers that do not
+         *     support `pushState`.
+         *   - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies
+         *     whether or not a <base> tag is required to be present. If `enabled` and `requireBase` are
+         *     true, and a base tag is not present, an error will be thrown when `$location` is injected.
+         *     See the {@link guide/$location $location guide for more information}
+         *   - **rewriteLinks** - `{boolean|string}` - (default: `true`) When html5Mode is enabled,
+         *     enables/disables URL rewriting for relative links. If set to a string, URL rewriting will
+         *     only happen on links with an attribute that matches the given string. For example, if set
+         *     to `'internal-link'`, then the URL will only be rewritten for `<a internal-link>` links.
+         *     Note that [attribute name normalization](guide/directive#normalization) does not apply
+         *     here, so `'internalLink'` will **not** match `'internal-link'`.
+         *
+         * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
          */
         this.html5Mode = function(mode) {
-            if (isDefined(mode)) {
-                html5Mode = mode;
+            if (isBoolean(mode)) {
+                html5Mode.enabled = mode;
+                return this;
+            } else if (isObject(mode)) {
+
+                if (isBoolean(mode.enabled)) {
+                    html5Mode.enabled = mode.enabled;
+                }
+
+                if (isBoolean(mode.requireBase)) {
+                    html5Mode.requireBase = mode.requireBase;
+                }
+
+                if (isBoolean(mode.rewriteLinks) || isString(mode.rewriteLinks)) {
+                    html5Mode.rewriteLinks = mode.rewriteLinks;
+                }
+
                 return this;
             } else {
                 return html5Mode;
@@ -9495,14 +14408,21 @@
          * @name $location#$locationChangeStart
          * @eventType broadcast on root scope
          * @description
-         * Broadcasted before a URL will change. This change can be prevented by calling
+         * Broadcasted before a URL will change.
+         *
+         * This change can be prevented by calling
          * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more
          * details about event object. Upon successful change
-         * {@link ng.$location#events_$locationChangeSuccess $locationChangeSuccess} is fired.
+         * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired.
+         *
+         * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+         * the browser supports the HTML5 History API.
          *
          * @param {Object} angularEvent Synthetic event object.
          * @param {string} newUrl New URL
          * @param {string=} oldUrl URL that was before it was changed.
+         * @param {string=} newState New history state object
+         * @param {string=} oldState History state object that was before it was changed.
          */
 
         /**
@@ -9512,44 +14432,84 @@
          * @description
          * Broadcasted after a URL was changed.
          *
+         * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+         * the browser supports the HTML5 History API.
+         *
          * @param {Object} angularEvent Synthetic event object.
          * @param {string} newUrl New URL
          * @param {string=} oldUrl URL that was before it was changed.
+         * @param {string=} newState New history state object
+         * @param {string=} oldState History state object that was before it was changed.
          */
 
-        this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement',
-            function( $rootScope,   $browser,   $sniffer,   $rootElement) {
+        this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window',
+            function($rootScope, $browser, $sniffer, $rootElement, $window) {
                 var $location,
                     LocationMode,
                     baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
                     initialUrl = $browser.url(),
                     appBase;
 
-                if (html5Mode) {
+                if (html5Mode.enabled) {
+                    if (!baseHref && html5Mode.requireBase) {
+                        throw $locationMinErr('nobase',
+                            '$location in HTML5 mode requires a <base> tag to be present!');
+                    }
                     appBase = serverBase(initialUrl) + (baseHref || '/');
                     LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url;
                 } else {
                     appBase = stripHash(initialUrl);
                     LocationMode = LocationHashbangUrl;
                 }
-                $location = new LocationMode(appBase, '#' + hashPrefix);
-                $location.$$parse($location.$$rewrite(initialUrl));
+                var appBaseNoFile = stripFile(appBase);
+
+                $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix);
+                $location.$$parseLinkUrl(initialUrl, initialUrl);
+
+                $location.$$state = $browser.state();
+
+                var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
+
+                function setBrowserUrlWithFallback(url, replace, state) {
+                    var oldUrl = $location.url();
+                    var oldState = $location.$$state;
+                    try {
+                        $browser.url(url, replace, state);
+
+                        // Make sure $location.state() returns referentially identical (not just deeply equal)
+                        // state object; this makes possible quick checking if the state changed in the digest
+                        // loop. Checking deep equality would be too expensive.
+                        $location.$$state = $browser.state();
+                    } catch (e) {
+                        // Restore old values if pushState fails
+                        $location.url(oldUrl);
+                        $location.$$state = oldState;
+
+                        throw e;
+                    }
+                }
 
                 $rootElement.on('click', function(event) {
+                    var rewriteLinks = html5Mode.rewriteLinks;
                     // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
                     // currently we open nice url link and redirect then
 
-                    if (event.ctrlKey || event.metaKey || event.which == 2) return;
+                    if (!rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which === 2 || event.button === 2) return;
 
                     var elm = jqLite(event.target);
 
                     // traverse the DOM up to find first A tag
-                    while (lowercase(elm[0].nodeName) !== 'a') {
+                    while (nodeName_(elm[0]) !== 'a') {
                         // ignore rewriting if no A tag (reached root element, or no parent - removed from document)
                         if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return;
                     }
 
+                    if (isString(rewriteLinks) && isUndefined(elm.attr(rewriteLinks))) return;
+
                     var absHref = elm.prop('href');
+                    // get the actual href attribute - see
+                    // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
+                    var relHref = elm.attr('href') || elm.attr('xlink:href');
 
                     if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
                         // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
@@ -9557,72 +14517,118 @@
                         absHref = urlResolve(absHref.animVal).href;
                     }
 
-                    var rewrittenUrl = $location.$$rewrite(absHref);
+                    // Ignore when url is started with javascript: or mailto:
+                    if (IGNORE_URI_REGEXP.test(absHref)) return;
 
-                    if (absHref && !elm.attr('target') && rewrittenUrl && !event.isDefaultPrevented()) {
-                        event.preventDefault();
-                        if (rewrittenUrl != $browser.url()) {
+                    if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
+                        if ($location.$$parseLinkUrl(absHref, relHref)) {
+                            // We do a preventDefault for all urls that are part of the AngularJS application,
+                            // in html5mode and also without, so that we are able to abort navigation without
+                            // getting double entries in the location history.
+                            event.preventDefault();
                             // update location manually
-                            $location.$$parse(rewrittenUrl);
-                            $rootScope.$apply();
-                            // hack to work around FF6 bug 684208 when scenario runner clicks on links
-                            window.angular['ff-684208-preventDefault'] = true;
+                            if ($location.absUrl() !== $browser.url()) {
+                                $rootScope.$apply();
+                                // hack to work around FF6 bug 684208 when scenario runner clicks on links
+                                $window.angular['ff-684208-preventDefault'] = true;
+                            }
                         }
                     }
                 });
 
 
                 // rewrite hashbang url <> html5 url
-                if ($location.absUrl() != initialUrl) {
+                if (trimEmptyHash($location.absUrl()) !== trimEmptyHash(initialUrl)) {
                     $browser.url($location.absUrl(), true);
                 }
 
+                var initializing = true;
+
                 // update $location when $browser url changes
-                $browser.onUrlChange(function(newUrl) {
-                    if ($location.absUrl() != newUrl) {
-                        $rootScope.$evalAsync(function() {
-                            var oldUrl = $location.absUrl();
+                $browser.onUrlChange(function(newUrl, newState) {
 
-                            $location.$$parse(newUrl);
-                            if ($rootScope.$broadcast('$locationChangeStart', newUrl,
-                                    oldUrl).defaultPrevented) {
-                                $location.$$parse(oldUrl);
-                                $browser.url(oldUrl);
-                            } else {
-                                afterLocationChange(oldUrl);
-                            }
-                        });
-                        if (!$rootScope.$$phase) $rootScope.$digest();
+                    if (!startsWith(newUrl, appBaseNoFile)) {
+                        // If we are navigating outside of the app then force a reload
+                        $window.location.href = newUrl;
+                        return;
                     }
+
+                    $rootScope.$evalAsync(function() {
+                        var oldUrl = $location.absUrl();
+                        var oldState = $location.$$state;
+                        var defaultPrevented;
+                        newUrl = trimEmptyHash(newUrl);
+                        $location.$$parse(newUrl);
+                        $location.$$state = newState;
+
+                        defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+                            newState, oldState).defaultPrevented;
+
+                        // if the location was changed by a `$locationChangeStart` handler then stop
+                        // processing this location change
+                        if ($location.absUrl() !== newUrl) return;
+
+                        if (defaultPrevented) {
+                            $location.$$parse(oldUrl);
+                            $location.$$state = oldState;
+                            setBrowserUrlWithFallback(oldUrl, false, oldState);
+                        } else {
+                            initializing = false;
+                            afterLocationChange(oldUrl, oldState);
+                        }
+                    });
+                    if (!$rootScope.$$phase) $rootScope.$digest();
                 });
 
                 // update browser
-                var changeCounter = 0;
                 $rootScope.$watch(function $locationWatch() {
-                    var oldUrl = $browser.url();
-                    var currentReplace = $location.$$replace;
-
-                    if (!changeCounter || oldUrl != $location.absUrl()) {
-                        changeCounter++;
-                        $rootScope.$evalAsync(function() {
-                            if ($rootScope.$broadcast('$locationChangeStart', $location.absUrl(), oldUrl).
-                                    defaultPrevented) {
-                                $location.$$parse(oldUrl);
-                            } else {
-                                $browser.url($location.absUrl(), currentReplace);
-                                afterLocationChange(oldUrl);
-                            }
-                        });
+                    if (initializing || $location.$$urlUpdatedByLocation) {
+                        $location.$$urlUpdatedByLocation = false;
+
+                        var oldUrl = trimEmptyHash($browser.url());
+                        var newUrl = trimEmptyHash($location.absUrl());
+                        var oldState = $browser.state();
+                        var currentReplace = $location.$$replace;
+                        var urlOrStateChanged = oldUrl !== newUrl ||
+                            ($location.$$html5 && $sniffer.history && oldState !== $location.$$state);
+
+                        if (initializing || urlOrStateChanged) {
+                            initializing = false;
+
+                            $rootScope.$evalAsync(function() {
+                                var newUrl = $location.absUrl();
+                                var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+                                    $location.$$state, oldState).defaultPrevented;
+
+                                // if the location was changed by a `$locationChangeStart` handler then stop
+                                // processing this location change
+                                if ($location.absUrl() !== newUrl) return;
+
+                                if (defaultPrevented) {
+                                    $location.$$parse(oldUrl);
+                                    $location.$$state = oldState;
+                                } else {
+                                    if (urlOrStateChanged) {
+                                        setBrowserUrlWithFallback(newUrl, currentReplace,
+                                            oldState === $location.$$state ? null : $location.$$state);
+                                    }
+                                    afterLocationChange(oldUrl, oldState);
+                                }
+                            });
+                        }
                     }
+
                     $location.$$replace = false;
 
-                    return changeCounter;
+                    // we don't need to return anything because $evalAsync will make the digest loop dirty when
+                    // there is a change
                 });
 
                 return $location;
 
-                function afterLocationChange(oldUrl) {
-                    $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl);
+                function afterLocationChange(oldUrl, oldState) {
+                    $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl,
+                        $location.$$state, oldState);
                 }
             }];
     }
@@ -9638,26 +14644,36 @@
      *
      * The main purpose of this service is to simplify debugging and troubleshooting.
      *
+     * To reveal the location of the calls to `$log` in the JavaScript console,
+     * you can "blackbox" the AngularJS source in your browser:
+     *
+     * [Mozilla description of blackboxing](https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Black_box_a_source).
+     * [Chrome description of blackboxing](https://developer.chrome.com/devtools/docs/blackboxing).
+     *
+     * Note: Not all browsers support blackboxing.
+     *
      * The default is to log `debug` messages. You can use
      * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this.
      *
      * @example
-     <example>
+     <example module="logExample" name="log-service">
      <file name="script.js">
-     function LogCtrl($scope, $log) {
-         $scope.$log = $log;
-         $scope.message = 'Hello World!';
-       }
+     angular.module('logExample', [])
+     .controller('LogController', ['$scope', '$log', function($scope, $log) {
+           $scope.$log = $log;
+           $scope.message = 'Hello World!';
+         }]);
      </file>
      <file name="index.html">
-     <div ng-controller="LogCtrl">
+     <div ng-controller="LogController">
      <p>Reload this page with open console, enter text and hit the log button...</p>
-     Message:
-     <input type="text" ng-model="message"/>
+     <label>Message:
+     <input type="text" ng-model="message" /></label>
      <button ng-click="$log.log(message)">log</button>
      <button ng-click="$log.warn(message)">warn</button>
      <button ng-click="$log.info(message)">info</button>
      <button ng-click="$log.error(message)">error</button>
+     <button ng-click="$log.debug(message)">debug</button>
      </div>
      </file>
      </example>
@@ -9666,15 +14682,17 @@
     /**
      * @ngdoc provider
      * @name $logProvider
+     * @this
+     *
      * @description
      * Use the `$logProvider` to configure how the application logs messages
      */
-    function $LogProvider(){
+    function $LogProvider() {
         var debug = true,
             self = this;
 
         /**
-         * @ngdoc property
+         * @ngdoc method
          * @name $logProvider#debugEnabled
          * @description
          * @param {boolean=} flag enable or disable debug level messages
@@ -9689,7 +14707,16 @@
             }
         };
 
-        this.$get = ['$window', function($window){
+        this.$get = ['$window', function($window) {
+            // Support: IE 9-11, Edge 12-14+
+            // IE/Edge display errors in such a way that it requires the user to click in 4 places
+            // to see the stack trace. There is no way to feature-detect it so there's a chance
+            // of the user agent sniffing to go wrong but since it's only about logging, this shouldn't
+            // break apps. Other browsers display errors in a sensible way and some of them map stack
+            // traces along source maps if available so it makes sense to let browsers display it
+            // as they want.
+            var formatStackTrace = msie || /\bEdge\//.test($window.navigator && $window.navigator.userAgent);
+
             return {
                 /**
                  * @ngdoc method
@@ -9734,7 +14761,7 @@
                  * @description
                  * Write a debug message
                  */
-                debug: (function () {
+                debug: (function() {
                     var fn = consoleLog('debug');
 
                     return function() {
@@ -9742,12 +14769,12 @@
                             fn.apply(self, arguments);
                         }
                     };
-                }())
+                })()
             };
 
             function formatError(arg) {
-                if (arg instanceof Error) {
-                    if (arg.stack) {
+                if (isError(arg)) {
+                    if (arg.stack && formatStackTrace) {
                         arg = (arg.message && arg.stack.indexOf(arg.message) === -1)
                             ? 'Error: ' + arg.message + '\n' + arg.stack
                             : arg.stack;
@@ -9760,139 +14787,74 @@
 
             function consoleLog(type) {
                 var console = $window.console || {},
-                    logFn = console[type] || console.log || noop,
-                    hasApply = false;
-
-                // Note: reading logFn.apply throws an error in IE11 in IE8 document mode.
-                // The reason behind this is that console.log has type "object" in IE8...
-                try {
-                    hasApply = !!logFn.apply;
-                } catch (e) {}
+                    logFn = console[type] || console.log || noop;
 
-                if (hasApply) {
-                    return function() {
-                        var args = [];
-                        forEach(arguments, function(arg) {
-                            args.push(formatError(arg));
-                        });
-                        return logFn.apply(console, args);
-                    };
-                }
-
-                // we are IE which either doesn't have window.console => this is noop and we do nothing,
-                // or we are IE where console.log doesn't have apply so we log at least first 2 args
-                return function(arg1, arg2) {
-                    logFn(arg1, arg2 == null ? '' : arg2);
+                return function() {
+                    var args = [];
+                    forEach(arguments, function(arg) {
+                        args.push(formatError(arg));
+                    });
+                    // Support: IE 9 only
+                    // console methods don't inherit from Function.prototype in IE 9 so we can't
+                    // call `logFn.apply(console, args)` directly.
+                    return Function.prototype.apply.call(logFn, console, args);
                 };
             }
         }];
     }
 
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
     var $parseMinErr = minErr('$parse');
-    var promiseWarningCache = {};
-    var promiseWarning;
 
-// Sandboxing Angular Expressions
+    var objectValueOf = {}.constructor.prototype.valueOf;
+
+// Sandboxing AngularJS Expressions
 // ------------------------------
-// Angular expressions are generally considered safe because these expressions only have direct
-// access to $scope and locals. However, one can obtain the ability to execute arbitrary JS code by
-// obtaining a reference to native JS functions such as the Function constructor.
-//
-// As an example, consider the following Angular expression:
-//
-//   {}.toString.constructor(alert("evil JS code"))
-//
-// We want to prevent this type of access. For the sake of performance, during the lexing phase we
-// disallow any "dotted" access to any member named "constructor".
+// AngularJS expressions are no longer sandboxed. So it is now even easier to access arbitrary JS code by
+// various means such as obtaining a reference to native JS functions like the Function constructor.
 //
-// For reflective calls (a[b]) we check that the value of the lookup is not the Function constructor
-// while evaluating the expression, which is a stronger but more expensive test. Since reflective
-// calls are expensive anyway, this is not such a big deal compared to static dereferencing.
+// As an example, consider the following AngularJS expression:
 //
-// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
-// against the expression language, but not to prevent exploits that were enabled by exposing
-// sensitive JavaScript or browser apis on Scope. Exposing such objects on a Scope is never a good
-// practice and therefore we are not even trying to protect against interaction with an object
-// explicitly exposed in this way.
+//   {}.toString.constructor('alert("evil JS code")')
 //
-// A developer could foil the name check by aliasing the Function constructor under a different
-// name on the scope.
+// It is important to realize that if you create an expression from a string that contains user provided
+// content then it is possible that your application contains a security vulnerability to an XSS style attack.
 //
-// In general, it is not possible to access a Window object from an angular expression unless a
-// window or some DOM object that has a reference to window is published onto a Scope.
-
-    function ensureSafeMemberName(name, fullExpression) {
-        if (name === "constructor") {
-            throw $parseMinErr('isecfld',
-                'Referencing "constructor" field in Angular expressions is disallowed! Expression: {0}',
-                fullExpression);
-        }
-        return name;
+// See https://docs.angularjs.org/guide/security
+
+
+    function getStringValue(name) {
+        // Property names must be strings. This means that non-string objects cannot be used
+        // as keys in an object. Any non-string object, including a number, is typecasted
+        // into a string via the toString method.
+        // -- MDN, https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Property_accessors#Property_names
+        //
+        // So, to ensure that we are checking the same `name` that JavaScript would use, we cast it
+        // to a string. It's not always possible. If `name` is an object and its `toString` method is
+        // 'broken' (doesn't return a string, isn't a function, etc.), an error will be thrown:
+        //
+        // TypeError: Cannot convert object to primitive value
+        //
+        // For performance reasons, we don't catch this error here and allow it to propagate up the call
+        // stack. Note that you'll get the same error in JavaScript if you try to access a property using
+        // such a 'broken' object as a key.
+        return name + '';
     }
 
-    function ensureSafeObject(obj, fullExpression) {
-        // nifty check if obj is Function that is fast and works across iframes and other contexts
-        if (obj) {
-            if (obj.constructor === obj) {
-                throw $parseMinErr('isecfn',
-                    'Referencing Function in Angular expressions is disallowed! Expression: {0}',
-                    fullExpression);
-            } else if (// isWindow(obj)
-            obj.document && obj.location && obj.alert && obj.setInterval) {
-                throw $parseMinErr('isecwindow',
-                    'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
-                    fullExpression);
-            } else if (// isElement(obj)
-            obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) {
-                throw $parseMinErr('isecdom',
-                    'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
-                    fullExpression);
-            }
-        }
-        return obj;
-    }
 
-    var OPERATORS = {
-        /* jshint bitwise : false */
-        'null':function(){return null;},
-        'true':function(){return true;},
-        'false':function(){return false;},
-        undefined:noop,
-        '+':function(self, locals, a,b){
-            a=a(self, locals); b=b(self, locals);
-            if (isDefined(a)) {
-                if (isDefined(b)) {
-                    return a + b;
-                }
-                return a;
-            }
-            return isDefined(b)?b:undefined;},
-        '-':function(self, locals, a,b){
-            a=a(self, locals); b=b(self, locals);
-            return (isDefined(a)?a:0)-(isDefined(b)?b:0);
-        },
-        '*':function(self, locals, a,b){return a(self, locals)*b(self, locals);},
-        '/':function(self, locals, a,b){return a(self, locals)/b(self, locals);},
-        '%':function(self, locals, a,b){return a(self, locals)%b(self, locals);},
-        '^':function(self, locals, a,b){return a(self, locals)^b(self, locals);},
-        '=':noop,
-        '===':function(self, locals, a, b){return a(self, locals)===b(self, locals);},
-        '!==':function(self, locals, a, b){return a(self, locals)!==b(self, locals);},
-        '==':function(self, locals, a,b){return a(self, locals)==b(self, locals);},
-        '!=':function(self, locals, a,b){return a(self, locals)!=b(self, locals);},
-        '<':function(self, locals, a,b){return a(self, locals)<b(self, locals);},
-        '>':function(self, locals, a,b){return a(self, locals)>b(self, locals);},
-        '<=':function(self, locals, a,b){return a(self, locals)<=b(self, locals);},
-        '>=':function(self, locals, a,b){return a(self, locals)>=b(self, locals);},
-        '&&':function(self, locals, a,b){return a(self, locals)&&b(self, locals);},
-        '||':function(self, locals, a,b){return a(self, locals)||b(self, locals);},
-        '&':function(self, locals, a,b){return a(self, locals)&b(self, locals);},
-//    '|':function(self, locals, a,b){return a|b;},
-        '|':function(self, locals, a,b){return b(self, locals)(self, locals, a(self, locals));},
-        '!':function(self, locals, a){return !a(self, locals);}
-    };
-    /* jshint bitwise: true */
-    var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
+    var OPERATORS = createMap();
+    forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
+    var ESCAPE = {'n':'\n', 'f':'\f', 'r':'\r', 't':'\t', 'v':'\v', '\'':'\'', '"':'"'};
 
 
 /////////////////////////////////////////
@@ -9901,85 +14863,51 @@
     /**
      * @constructor
      */
-    var Lexer = function (options) {
+    var Lexer = function Lexer(options) {
         this.options = options;
     };
 
     Lexer.prototype = {
         constructor: Lexer,
 
-        lex: function (text) {
+        lex: function(text) {
             this.text = text;
-
             this.index = 0;
-            this.ch = undefined;
-            this.lastCh = ':'; // can start regexp
-
             this.tokens = [];
 
-            var token;
-            var json = [];
-
             while (this.index < this.text.length) {
-                this.ch = this.text.charAt(this.index);
-                if (this.is('"\'')) {
-                    this.readString(this.ch);
-                } else if (this.isNumber(this.ch) || this.is('.') && this.isNumber(this.peek())) {
+                var ch = this.text.charAt(this.index);
+                if (ch === '"' || ch === '\'') {
+                    this.readString(ch);
+                } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) {
                     this.readNumber();
-                } else if (this.isIdent(this.ch)) {
+                } else if (this.isIdentifierStart(this.peekMultichar())) {
                     this.readIdent();
-                    // identifiers can only be if the preceding char was a { or ,
-                    if (this.was('{,') && json[0] === '{' &&
-                        (token = this.tokens[this.tokens.length - 1])) {
-                        token.json = token.text.indexOf('.') === -1;
-                    }
-                } else if (this.is('(){}[].,;:?')) {
-                    this.tokens.push({
-                        index: this.index,
-                        text: this.ch,
-                        json: (this.was(':[,') && this.is('{[')) || this.is('}]:,')
-                    });
-                    if (this.is('{[')) json.unshift(this.ch);
-                    if (this.is('}]')) json.shift();
+                } else if (this.is(ch, '(){}[].,;:?')) {
+                    this.tokens.push({index: this.index, text: ch});
                     this.index++;
-                } else if (this.isWhitespace(this.ch)) {
+                } else if (this.isWhitespace(ch)) {
                     this.index++;
-                    continue;
                 } else {
-                    var ch2 = this.ch + this.peek();
+                    var ch2 = ch + this.peek();
                     var ch3 = ch2 + this.peek(2);
-                    var fn = OPERATORS[this.ch];
-                    var fn2 = OPERATORS[ch2];
-                    var fn3 = OPERATORS[ch3];
-                    if (fn3) {
-                        this.tokens.push({index: this.index, text: ch3, fn: fn3});
-                        this.index += 3;
-                    } else if (fn2) {
-                        this.tokens.push({index: this.index, text: ch2, fn: fn2});
-                        this.index += 2;
-                    } else if (fn) {
-                        this.tokens.push({
-                            index: this.index,
-                            text: this.ch,
-                            fn: fn,
-                            json: (this.was('[,:') && this.is('+-'))
-                        });
-                        this.index += 1;
+                    var op1 = OPERATORS[ch];
+                    var op2 = OPERATORS[ch2];
+                    var op3 = OPERATORS[ch3];
+                    if (op1 || op2 || op3) {
+                        var token = op3 ? ch3 : (op2 ? ch2 : ch);
+                        this.tokens.push({index: this.index, text: token, operator: true});
+                        this.index += token.length;
                     } else {
                         this.throwError('Unexpected next character ', this.index, this.index + 1);
                     }
                 }
-                this.lastCh = this.ch;
             }
             return this.tokens;
         },
 
-        is: function(chars) {
-            return chars.indexOf(this.ch) !== -1;
-        },
-
-        was: function(chars) {
-            return chars.indexOf(this.lastCh) !== -1;
+        is: function(ch, chars) {
+            return chars.indexOf(ch) !== -1;
         },
 
         peek: function(i) {
@@ -9988,19 +14916,55 @@
         },
 
         isNumber: function(ch) {
-            return ('0' <= ch && ch <= '9');
+            return ('0' <= ch && ch <= '9') && typeof ch === 'string';
         },
 
         isWhitespace: function(ch) {
             // IE treats non-breaking space as \u00A0
             return (ch === ' ' || ch === '\r' || ch === '\t' ||
-            ch === '\n' || ch === '\v' || ch === '\u00A0');
+                ch === '\n' || ch === '\v' || ch === '\u00A0');
+        },
+
+        isIdentifierStart: function(ch) {
+            return this.options.isIdentifierStart ?
+                this.options.isIdentifierStart(ch, this.codePointAt(ch)) :
+                this.isValidIdentifierStart(ch);
         },
 
-        isIdent: function(ch) {
+        isValidIdentifierStart: function(ch) {
             return ('a' <= ch && ch <= 'z' ||
-            'A' <= ch && ch <= 'Z' ||
-            '_' === ch || ch === '$');
+                'A' <= ch && ch <= 'Z' ||
+                '_' === ch || ch === '$');
+        },
+
+        isIdentifierContinue: function(ch) {
+            return this.options.isIdentifierContinue ?
+                this.options.isIdentifierContinue(ch, this.codePointAt(ch)) :
+                this.isValidIdentifierContinue(ch);
+        },
+
+        isValidIdentifierContinue: function(ch, cp) {
+            return this.isValidIdentifierStart(ch, cp) || this.isNumber(ch);
+        },
+
+        codePointAt: function(ch) {
+            if (ch.length === 1) return ch.charCodeAt(0);
+            // eslint-disable-next-line no-bitwise
+            return (ch.charCodeAt(0) << 10) + ch.charCodeAt(1) - 0x35FDC00;
+        },
+
+        peekMultichar: function() {
+            var ch = this.text.charAt(this.index);
+            var peek = this.peek();
+            if (!peek) {
+                return ch;
+            }
+            var cp1 = ch.charCodeAt(0);
+            var cp2 = peek.charCodeAt(0);
+            if (cp1 >= 0xD800 && cp1 <= 0xDBFF && cp2 >= 0xDC00 && cp2 <= 0xDFFF) {
+                return ch + peek;
+            }
+            return ch;
         },
 
         isExpOperator: function(ch) {
@@ -10021,19 +14985,19 @@
             var start = this.index;
             while (this.index < this.text.length) {
                 var ch = lowercase(this.text.charAt(this.index));
-                if (ch == '.' || this.isNumber(ch)) {
+                if (ch === '.' || this.isNumber(ch)) {
                     number += ch;
                 } else {
                     var peekCh = this.peek();
-                    if (ch == 'e' && this.isExpOperator(peekCh)) {
+                    if (ch === 'e' && this.isExpOperator(peekCh)) {
                         number += ch;
                     } else if (this.isExpOperator(ch) &&
                         peekCh && this.isNumber(peekCh) &&
-                        number.charAt(number.length - 1) == 'e') {
+                        number.charAt(number.length - 1) === 'e') {
                         number += ch;
                     } else if (this.isExpOperator(ch) &&
                         (!peekCh || !this.isNumber(peekCh)) &&
-                        number.charAt(number.length - 1) == 'e') {
+                        number.charAt(number.length - 1) === 'e') {
                         this.throwError('Invalid exponent');
                     } else {
                         break;
@@ -10041,89 +15005,30 @@
                 }
                 this.index++;
             }
-            number = 1 * number;
             this.tokens.push({
                 index: start,
                 text: number,
-                json: true,
-                fn: function() { return number; }
+                constant: true,
+                value: Number(number)
             });
         },
 
         readIdent: function() {
-            var parser = this;
-
-            var ident = '';
             var start = this.index;
-
-            var lastDot, peekIndex, methodName, ch;
-
+            this.index += this.peekMultichar().length;
             while (this.index < this.text.length) {
-                ch = this.text.charAt(this.index);
-                if (ch === '.' || this.isIdent(ch) || this.isNumber(ch)) {
-                    if (ch === '.') lastDot = this.index;
-                    ident += ch;
-                } else {
+                var ch = this.peekMultichar();
+                if (!this.isIdentifierContinue(ch)) {
                     break;
                 }
-                this.index++;
-            }
-
-            //check if this is not a method invocation and if it is back out to last dot
-            if (lastDot) {
-                peekIndex = this.index;
-                while (peekIndex < this.text.length) {
-                    ch = this.text.charAt(peekIndex);
-                    if (ch === '(') {
-                        methodName = ident.substr(lastDot - start + 1);
-                        ident = ident.substr(0, lastDot - start);
-                        this.index = peekIndex;
-                        break;
-                    }
-                    if (this.isWhitespace(ch)) {
-                        peekIndex++;
-                    } else {
-                        break;
-                    }
-                }
+                this.index += ch.length;
             }
-
-
-            var token = {
+            this.tokens.push({
                 index: start,
-                text: ident
-            };
-
-            // OPERATORS is our own object so we don't need to use special hasOwnPropertyFn
-            if (OPERATORS.hasOwnProperty(ident)) {
-                token.fn = OPERATORS[ident];
-                token.json = OPERATORS[ident];
-            } else {
-                var getter = getterFn(ident, this.options, this.text);
-                token.fn = extend(function(self, locals) {
-                    return (getter(self, locals));
-                }, {
-                    assign: function(self, value) {
-                        return setter(self, ident, value, parser.text, parser.options);
-                    }
-                });
-            }
-
-            this.tokens.push(token);
-
-            if (methodName) {
-                this.tokens.push({
-                    index:lastDot,
-                    text: '.',
-                    json: false
-                });
-                this.tokens.push({
-                    index: lastDot + 1,
-                    text: methodName,
-                    json: false
-                });
-            }
-        },
+                text: this.text.slice(start, this.index),
+                identifier: true
+            });
+        },
 
         readString: function(quote) {
             var start = this.index;
@@ -10137,17 +15042,14 @@
                 if (escape) {
                     if (ch === 'u') {
                         var hex = this.text.substring(this.index + 1, this.index + 5);
-                        if (!hex.match(/[\da-f]{4}/i))
+                        if (!hex.match(/[\da-f]{4}/i)) {
                             this.throwError('Invalid unicode escape [\\u' + hex + ']');
+                        }
                         this.index += 4;
                         string += String.fromCharCode(parseInt(hex, 16));
                     } else {
                         var rep = ESCAPE[ch];
-                        if (rep) {
-                            string += rep;
-                        } else {
-                            string += ch;
-                        }
+                        string = string + (rep || ch);
                     }
                     escape = false;
                 } else if (ch === '\\') {
@@ -10157,9 +15059,8 @@
                     this.tokens.push({
                         index: start,
                         text: rawString,
-                        string: string,
-                        json: true,
-                        fn: function() { return string; }
+                        constant: true,
+                        value: string
                     });
                     return;
                 } else {
@@ -10171,219 +15072,66 @@
         }
     };
 
-
-    /**
-     * @constructor
-     */
-    var Parser = function (lexer, $filter, options) {
+    var AST = function AST(lexer, options) {
         this.lexer = lexer;
-        this.$filter = $filter;
         this.options = options;
     };
 
-    Parser.ZERO = extend(function () {
-        return 0;
-    }, {
-        constant: true
-    });
-
-    Parser.prototype = {
-        constructor: Parser,
-
-        parse: function (text, json) {
+    AST.Program = 'Program';
+    AST.ExpressionStatement = 'ExpressionStatement';
+    AST.AssignmentExpression = 'AssignmentExpression';
+    AST.ConditionalExpression = 'ConditionalExpression';
+    AST.LogicalExpression = 'LogicalExpression';
+    AST.BinaryExpression = 'BinaryExpression';
+    AST.UnaryExpression = 'UnaryExpression';
+    AST.CallExpression = 'CallExpression';
+    AST.MemberExpression = 'MemberExpression';
+    AST.Identifier = 'Identifier';
+    AST.Literal = 'Literal';
+    AST.ArrayExpression = 'ArrayExpression';
+    AST.Property = 'Property';
+    AST.ObjectExpression = 'ObjectExpression';
+    AST.ThisExpression = 'ThisExpression';
+    AST.LocalsExpression = 'LocalsExpression';
+
+// Internal use only
+    AST.NGValueParameter = 'NGValueParameter';
+
+    AST.prototype = {
+        ast: function(text) {
             this.text = text;
-
-            //TODO(i): strip all the obsolte json stuff from this file
-            this.json = json;
-
             this.tokens = this.lexer.lex(text);
 
-            if (json) {
-                // The extra level of aliasing is here, just in case the lexer misses something, so that
-                // we prevent any accidental execution in JSON.
-                this.assignment = this.logicalOR;
-
-                this.functionCall =
-                    this.fieldAccess =
-                        this.objectIndex =
-                            this.filterChain = function() {
-                                this.throwError('is not valid json', {text: text, index: 0});
-                            };
-            }
-
-            var value = json ? this.primary() : this.statements();
+            var value = this.program();
 
             if (this.tokens.length !== 0) {
                 this.throwError('is an unexpected token', this.tokens[0]);
             }
 
-            value.literal = !!value.literal;
-            value.constant = !!value.constant;
-
             return value;
         },
 
-        primary: function () {
-            var primary;
-            if (this.expect('(')) {
-                primary = this.filterChain();
-                this.consume(')');
-            } else if (this.expect('[')) {
-                primary = this.arrayDeclaration();
-            } else if (this.expect('{')) {
-                primary = this.object();
-            } else {
-                var token = this.expect();
-                primary = token.fn;
-                if (!primary) {
-                    this.throwError('not a primary expression', token);
-                }
-                if (token.json) {
-                    primary.constant = true;
-                    primary.literal = true;
-                }
-            }
-
-            var next, context;
-            while ((next = this.expect('(', '[', '.'))) {
-                if (next.text === '(') {
-                    primary = this.functionCall(primary, context);
-                    context = null;
-                } else if (next.text === '[') {
-                    context = primary;
-                    primary = this.objectIndex(primary);
-                } else if (next.text === '.') {
-                    context = primary;
-                    primary = this.fieldAccess(primary);
-                } else {
-                    this.throwError('IMPOSSIBLE');
-                }
-            }
-            return primary;
-        },
-
-        throwError: function(msg, token) {
-            throw $parseMinErr('syntax',
-                'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
-                token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
-        },
-
-        peekToken: function() {
-            if (this.tokens.length === 0)
-                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
-            return this.tokens[0];
-        },
-
-        peek: function(e1, e2, e3, e4) {
-            if (this.tokens.length > 0) {
-                var token = this.tokens[0];
-                var t = token.text;
-                if (t === e1 || t === e2 || t === e3 || t === e4 ||
-                    (!e1 && !e2 && !e3 && !e4)) {
-                    return token;
-                }
-            }
-            return false;
-        },
-
-        expect: function(e1, e2, e3, e4){
-            var token = this.peek(e1, e2, e3, e4);
-            if (token) {
-                if (this.json && !token.json) {
-                    this.throwError('is not valid json', token);
-                }
-                this.tokens.shift();
-                return token;
-            }
-            return false;
-        },
-
-        consume: function(e1){
-            if (!this.expect(e1)) {
-                this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
-            }
-        },
-
-        unaryFn: function(fn, right) {
-            return extend(function(self, locals) {
-                return fn(self, locals, right);
-            }, {
-                constant:right.constant
-            });
-        },
-
-        ternaryFn: function(left, middle, right){
-            return extend(function(self, locals){
-                return left(self, locals) ? middle(self, locals) : right(self, locals);
-            }, {
-                constant: left.constant && middle.constant && right.constant
-            });
-        },
-
-        binaryFn: function(left, fn, right) {
-            return extend(function(self, locals) {
-                return fn(self, locals, left, right);
-            }, {
-                constant:left.constant && right.constant
-            });
-        },
-
-        statements: function() {
-            var statements = [];
+        program: function() {
+            var body = [];
             while (true) {
                 if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
-                    statements.push(this.filterChain());
+                    body.push(this.expressionStatement());
                 if (!this.expect(';')) {
-                    // optimize for the common case where there is only one statement.
-                    // TODO(size): maybe we should not support multiple statements?
-                    return (statements.length === 1)
-                        ? statements[0]
-                        : function(self, locals) {
-                        var value;
-                        for (var i = 0; i < statements.length; i++) {
-                            var statement = statements[i];
-                            if (statement) {
-                                value = statement(self, locals);
-                            }
-                        }
-                        return value;
-                    };
+                    return { type: AST.Program, body: body};
                 }
             }
         },
 
-        filterChain: function() {
-            var left = this.expression();
-            var token;
-            while (true) {
-                if ((token = this.expect('|'))) {
-                    left = this.binaryFn(left, token.fn, this.filter());
-                } else {
-                    return left;
-                }
-            }
+        expressionStatement: function() {
+            return { type: AST.ExpressionStatement, expression: this.filterChain() };
         },
 
-        filter: function() {
-            var token = this.expect();
-            var fn = this.$filter(token.text);
-            var argsFn = [];
-            while (true) {
-                if ((token = this.expect(':'))) {
-                    argsFn.push(this.expression());
-                } else {
-                    var fnInvoke = function(self, locals, input) {
-                        var args = [input];
-                        for (var i = 0; i < argsFn.length; i++) {
-                            args.push(argsFn[i](self, locals));
-                        }
-                        return fn.apply(self, args);
-                    };
-                    return function() {
-                        return fnInvoke;
-                    };
-                }
+        filterChain: function() {
+            var left = this.expression();
+            while (this.expect('|')) {
+                left = this.filter(left);
             }
+            return left;
         },
 
         expression: function() {
@@ -10391,55 +15139,43 @@
         },
 
         assignment: function() {
-            var left = this.ternary();
-            var right;
-            var token;
-            if ((token = this.expect('='))) {
-                if (!left.assign) {
-                    this.throwError('implies assignment but [' +
-                    this.text.substring(0, token.index) + '] can not be assigned to', token);
-                }
-                right = this.ternary();
-                return function(scope, locals) {
-                    return left.assign(scope, right(scope, locals), locals);
-                };
+            var result = this.ternary();
+            if (this.expect('=')) {
+                if (!isAssignable(result)) {
+                    throw $parseMinErr('lval', 'Trying to assign a value to a non l-value');
+                }
+
+                result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='};
             }
-            return left;
+            return result;
         },
 
         ternary: function() {
-            var left = this.logicalOR();
-            var middle;
-            var token;
-            if ((token = this.expect('?'))) {
-                middle = this.ternary();
-                if ((token = this.expect(':'))) {
-                    return this.ternaryFn(left, middle, this.ternary());
-                } else {
-                    this.throwError('expected :', token);
+            var test = this.logicalOR();
+            var alternate;
+            var consequent;
+            if (this.expect('?')) {
+                alternate = this.expression();
+                if (this.consume(':')) {
+                    consequent = this.expression();
+                    return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent};
                 }
-            } else {
-                return left;
             }
+            return test;
         },
 
         logicalOR: function() {
             var left = this.logicalAND();
-            var token;
-            while (true) {
-                if ((token = this.expect('||'))) {
-                    left = this.binaryFn(left, token.fn, this.logicalAND());
-                } else {
-                    return left;
-                }
+            while (this.expect('||')) {
+                left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() };
             }
+            return left;
         },
 
         logicalAND: function() {
             var left = this.equality();
-            var token;
-            if ((token = this.expect('&&'))) {
-                left = this.binaryFn(left, token.fn, this.logicalAND());
+            while (this.expect('&&')) {
+                left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()};
             }
             return left;
         },
@@ -10447,8 +15183,8 @@
         equality: function() {
             var left = this.relational();
             var token;
-            if ((token = this.expect('==','!=','===','!=='))) {
-                left = this.binaryFn(left, token.fn, this.equality());
+            while ((token = this.expect('==','!=','===','!=='))) {
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() };
             }
             return left;
         },
@@ -10456,8 +15192,8 @@
         relational: function() {
             var left = this.additive();
             var token;
-            if ((token = this.expect('<', '>', '<=', '>='))) {
-                left = this.binaryFn(left, token.fn, this.relational());
+            while ((token = this.expect('<', '>', '<=', '>='))) {
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() };
             }
             return left;
         },
@@ -10466,7 +15202,7 @@
             var left = this.multiplicative();
             var token;
             while ((token = this.expect('+','-'))) {
-                left = this.binaryFn(left, token.fn, this.multiplicative());
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() };
             }
             return left;
         },
@@ -10475,9029 +15211,15853 @@
             var left = this.unary();
             var token;
             while ((token = this.expect('*','/','%'))) {
-                left = this.binaryFn(left, token.fn, this.unary());
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() };
             }
             return left;
         },
 
         unary: function() {
             var token;
-            if (this.expect('+')) {
-                return this.primary();
-            } else if ((token = this.expect('-'))) {
-                return this.binaryFn(Parser.ZERO, token.fn, this.unary());
-            } else if ((token = this.expect('!'))) {
-                return this.unaryFn(token.fn, this.unary());
+            if ((token = this.expect('+', '-', '!'))) {
+                return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() };
             } else {
                 return this.primary();
             }
         },
 
-        fieldAccess: function(object) {
-            var parser = this;
-            var field = this.expect().text;
-            var getter = getterFn(field, this.options, this.text);
+        primary: function() {
+            var primary;
+            if (this.expect('(')) {
+                primary = this.filterChain();
+                this.consume(')');
+            } else if (this.expect('[')) {
+                primary = this.arrayDeclaration();
+            } else if (this.expect('{')) {
+                primary = this.object();
+            } else if (this.selfReferential.hasOwnProperty(this.peek().text)) {
+                primary = copy(this.selfReferential[this.consume().text]);
+            } else if (this.options.literals.hasOwnProperty(this.peek().text)) {
+                primary = { type: AST.Literal, value: this.options.literals[this.consume().text]};
+            } else if (this.peek().identifier) {
+                primary = this.identifier();
+            } else if (this.peek().constant) {
+                primary = this.constant();
+            } else {
+                this.throwError('not a primary expression', this.peek());
+            }
 
-            return extend(function(scope, locals, self) {
-                return getter(self || object(scope, locals));
-            }, {
-                assign: function(scope, value, locals) {
-                    return setter(object(scope, locals), field, value, parser.text, parser.options);
+            var next;
+            while ((next = this.expect('(', '[', '.'))) {
+                if (next.text === '(') {
+                    primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() };
+                    this.consume(')');
+                } else if (next.text === '[') {
+                    primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true };
+                    this.consume(']');
+                } else if (next.text === '.') {
+                    primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false };
+                } else {
+                    this.throwError('IMPOSSIBLE');
                 }
-            });
+            }
+            return primary;
         },
 
-        objectIndex: function(obj) {
-            var parser = this;
+        filter: function(baseExpression) {
+            var args = [baseExpression];
+            var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true};
 
-            var indexFn = this.expression();
-            this.consume(']');
+            while (this.expect(':')) {
+                args.push(this.expression());
+            }
 
-            return extend(function(self, locals) {
-                var o = obj(self, locals),
-                    i = indexFn(self, locals),
-                    v, p;
-
-                if (!o) return undefined;
-                v = ensureSafeObject(o[i], parser.text);
-                if (v && v.then && parser.options.unwrapPromises) {
-                    p = v;
-                    if (!('$$v' in v)) {
-                        p.$$v = undefined;
-                        p.then(function(val) { p.$$v = val; });
-                    }
-                    v = v.$$v;
-                }
-                return v;
-            }, {
-                assign: function(self, value, locals) {
-                    var key = indexFn(self, locals);
-                    // prevent overwriting of Function.constructor which would break ensureSafeObject check
-                    var safe = ensureSafeObject(obj(self, locals), parser.text);
-                    return safe[key] = value;
-                }
-            });
+            return result;
         },
 
-        functionCall: function(fn, contextGetter) {
-            var argsFn = [];
+        parseArguments: function() {
+            var args = [];
             if (this.peekToken().text !== ')') {
                 do {
-                    argsFn.push(this.expression());
+                    args.push(this.filterChain());
                 } while (this.expect(','));
             }
-            this.consume(')');
-
-            var parser = this;
-
-            return function(scope, locals) {
-                var args = [];
-                var context = contextGetter ? contextGetter(scope, locals) : scope;
-
-                for (var i = 0; i < argsFn.length; i++) {
-                    args.push(argsFn[i](scope, locals));
-                }
-                var fnPtr = fn(scope, locals, context) || noop;
-
-                ensureSafeObject(context, parser.text);
-                ensureSafeObject(fnPtr, parser.text);
+            return args;
+        },
 
-                // IE stupidity! (IE doesn't have apply for some native functions)
-                var v = fnPtr.apply
-                    ? fnPtr.apply(context, args)
-                    : fnPtr(args[0], args[1], args[2], args[3], args[4]);
+        identifier: function() {
+            var token = this.consume();
+            if (!token.identifier) {
+                this.throwError('is not a valid identifier', token);
+            }
+            return { type: AST.Identifier, name: token.text };
+        },
 
-                return ensureSafeObject(v, parser.text);
-            };
+        constant: function() {
+            // TODO check that it is a constant
+            return { type: AST.Literal, value: this.consume().value };
         },
 
-        // This is used with json array declaration
-        arrayDeclaration: function () {
-            var elementFns = [];
-            var allConstant = true;
+        arrayDeclaration: function() {
+            var elements = [];
             if (this.peekToken().text !== ']') {
                 do {
                     if (this.peek(']')) {
                         // Support trailing commas per ES5.1.
                         break;
                     }
-                    var elementFn = this.expression();
-                    elementFns.push(elementFn);
-                    if (!elementFn.constant) {
-                        allConstant = false;
-                    }
+                    elements.push(this.expression());
                 } while (this.expect(','));
             }
             this.consume(']');
 
-            return extend(function(self, locals) {
-                var array = [];
-                for (var i = 0; i < elementFns.length; i++) {
-                    array.push(elementFns[i](self, locals));
-                }
-                return array;
-            }, {
-                literal: true,
-                constant: allConstant
-            });
+            return { type: AST.ArrayExpression, elements: elements };
         },
 
-        object: function () {
-            var keyValues = [];
-            var allConstant = true;
+        object: function() {
+            var properties = [], property;
             if (this.peekToken().text !== '}') {
                 do {
                     if (this.peek('}')) {
                         // Support trailing commas per ES5.1.
                         break;
                     }
-                    var token = this.expect(),
-                        key = token.string || token.text;
-                    this.consume(':');
-                    var value = this.expression();
-                    keyValues.push({key: key, value: value});
-                    if (!value.constant) {
-                        allConstant = false;
+                    property = {type: AST.Property, kind: 'init'};
+                    if (this.peek().constant) {
+                        property.key = this.constant();
+                        property.computed = false;
+                        this.consume(':');
+                        property.value = this.expression();
+                    } else if (this.peek().identifier) {
+                        property.key = this.identifier();
+                        property.computed = false;
+                        if (this.peek(':')) {
+                            this.consume(':');
+                            property.value = this.expression();
+                        } else {
+                            property.value = property.key;
+                        }
+                    } else if (this.peek('[')) {
+                        this.consume('[');
+                        property.key = this.expression();
+                        this.consume(']');
+                        property.computed = true;
+                        this.consume(':');
+                        property.value = this.expression();
+                    } else {
+                        this.throwError('invalid key', this.peek());
                     }
+                    properties.push(property);
                 } while (this.expect(','));
             }
             this.consume('}');
 
-            return extend(function(self, locals) {
-                var object = {};
-                for (var i = 0; i < keyValues.length; i++) {
-                    var keyValue = keyValues[i];
-                    object[keyValue.key] = keyValue.value(self, locals);
-                }
-                return object;
-            }, {
-                literal: true,
-                constant: allConstant
-            });
-        }
-    };
+            return {type: AST.ObjectExpression, properties: properties };
+        },
 
+        throwError: function(msg, token) {
+            throw $parseMinErr('syntax',
+                'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
+                token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
+        },
 
-//////////////////////////////////////////////////
-// Parser helper functions
-//////////////////////////////////////////////////
+        consume: function(e1) {
+            if (this.tokens.length === 0) {
+                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+            }
 
-    function setter(obj, path, setValue, fullExp, options) {
-        //needed?
-        options = options || {};
+            var token = this.expect(e1);
+            if (!token) {
+                this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
+            }
+            return token;
+        },
 
-        var element = path.split('.'), key;
-        for (var i = 0; element.length > 1; i++) {
-            key = ensureSafeMemberName(element.shift(), fullExp);
-            var propertyObj = obj[key];
-            if (!propertyObj) {
-                propertyObj = {};
-                obj[key] = propertyObj;
+        peekToken: function() {
+            if (this.tokens.length === 0) {
+                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
             }
-            obj = propertyObj;
-            if (obj.then && options.unwrapPromises) {
-                promiseWarning(fullExp);
-                if (!("$$v" in obj)) {
-                    (function(promise) {
-                        promise.then(function(val) { promise.$$v = val; }); }
-                    )(obj);
-                }
-                if (obj.$$v === undefined) {
-                    obj.$$v = {};
+            return this.tokens[0];
+        },
+
+        peek: function(e1, e2, e3, e4) {
+            return this.peekAhead(0, e1, e2, e3, e4);
+        },
+
+        peekAhead: function(i, e1, e2, e3, e4) {
+            if (this.tokens.length > i) {
+                var token = this.tokens[i];
+                var t = token.text;
+                if (t === e1 || t === e2 || t === e3 || t === e4 ||
+                    (!e1 && !e2 && !e3 && !e4)) {
+                    return token;
                 }
-                obj = obj.$$v;
             }
+            return false;
+        },
+
+        expect: function(e1, e2, e3, e4) {
+            var token = this.peek(e1, e2, e3, e4);
+            if (token) {
+                this.tokens.shift();
+                return token;
+            }
+            return false;
+        },
+
+        selfReferential: {
+            'this': {type: AST.ThisExpression },
+            '$locals': {type: AST.LocalsExpression }
         }
-        key = ensureSafeMemberName(element.shift(), fullExp);
-        obj[key] = setValue;
-        return setValue;
+    };
+
+    function ifDefined(v, d) {
+        return typeof v !== 'undefined' ? v : d;
+    }
+
+    function plusFn(l, r) {
+        if (typeof l === 'undefined') return r;
+        if (typeof r === 'undefined') return l;
+        return l + r;
     }
 
-    var getterFnCache = {};
+    function isStateless($filter, filterName) {
+        var fn = $filter(filterName);
+        return !fn.$stateful;
+    }
 
-    /**
-     * Implementation of the "Black Hole" variant from:
-     * - http://jsperf.com/angularjs-parse-getter/4
-     * - http://jsperf.com/path-evaluation-simplified/7
-     */
-    function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) {
-        ensureSafeMemberName(key0, fullExp);
-        ensureSafeMemberName(key1, fullExp);
-        ensureSafeMemberName(key2, fullExp);
-        ensureSafeMemberName(key3, fullExp);
-        ensureSafeMemberName(key4, fullExp);
+    var PURITY_ABSOLUTE = 1;
+    var PURITY_RELATIVE = 2;
 
-        return !options.unwrapPromises
-            ? function cspSafeGetter(scope, locals) {
-            var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope;
+// Detect nodes which could depend on non-shallow state of objects
+    function isPure(node, parentIsPure) {
+        switch (node.type) {
+            // Computed members might invoke a stateful toString()
+            case AST.MemberExpression:
+                if (node.computed) {
+                    return false;
+                }
+                break;
 
-            if (pathVal == null) return pathVal;
-            pathVal = pathVal[key0];
+            // Unary always convert to primative
+            case AST.UnaryExpression:
+                return PURITY_ABSOLUTE;
 
-            if (!key1) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key1];
+            // The binary + operator can invoke a stateful toString().
+            case AST.BinaryExpression:
+                return node.operator !== '+' ? PURITY_ABSOLUTE : false;
+
+            // Functions / filters probably read state from within objects
+            case AST.CallExpression:
+                return false;
+        }
 
-            if (!key2) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key2];
+        return (undefined === parentIsPure) ? PURITY_RELATIVE : parentIsPure;
+    }
 
-            if (!key3) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key3];
+    function findConstantAndWatchExpressions(ast, $filter, parentIsPure) {
+        var allConstants;
+        var argsToWatch;
+        var isStatelessFilter;
 
-            if (!key4) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key4];
+        var astIsPure = ast.isPure = isPure(ast, parentIsPure);
 
-            return pathVal;
+        switch (ast.type) {
+            case AST.Program:
+                allConstants = true;
+                forEach(ast.body, function(expr) {
+                    findConstantAndWatchExpressions(expr.expression, $filter, astIsPure);
+                    allConstants = allConstants && expr.expression.constant;
+                });
+                ast.constant = allConstants;
+                break;
+            case AST.Literal:
+                ast.constant = true;
+                ast.toWatch = [];
+                break;
+            case AST.UnaryExpression:
+                findConstantAndWatchExpressions(ast.argument, $filter, astIsPure);
+                ast.constant = ast.argument.constant;
+                ast.toWatch = ast.argument.toWatch;
+                break;
+            case AST.BinaryExpression:
+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+                ast.constant = ast.left.constant && ast.right.constant;
+                ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch);
+                break;
+            case AST.LogicalExpression:
+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+                ast.constant = ast.left.constant && ast.right.constant;
+                ast.toWatch = ast.constant ? [] : [ast];
+                break;
+            case AST.ConditionalExpression:
+                findConstantAndWatchExpressions(ast.test, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.alternate, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.consequent, $filter, astIsPure);
+                ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant;
+                ast.toWatch = ast.constant ? [] : [ast];
+                break;
+            case AST.Identifier:
+                ast.constant = false;
+                ast.toWatch = [ast];
+                break;
+            case AST.MemberExpression:
+                findConstantAndWatchExpressions(ast.object, $filter, astIsPure);
+                if (ast.computed) {
+                    findConstantAndWatchExpressions(ast.property, $filter, astIsPure);
+                }
+                ast.constant = ast.object.constant && (!ast.computed || ast.property.constant);
+                ast.toWatch = ast.constant ? [] : [ast];
+                break;
+            case AST.CallExpression:
+                isStatelessFilter = ast.filter ? isStateless($filter, ast.callee.name) : false;
+                allConstants = isStatelessFilter;
+                argsToWatch = [];
+                forEach(ast.arguments, function(expr) {
+                    findConstantAndWatchExpressions(expr, $filter, astIsPure);
+                    allConstants = allConstants && expr.constant;
+                    argsToWatch.push.apply(argsToWatch, expr.toWatch);
+                });
+                ast.constant = allConstants;
+                ast.toWatch = isStatelessFilter ? argsToWatch : [ast];
+                break;
+            case AST.AssignmentExpression:
+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+                ast.constant = ast.left.constant && ast.right.constant;
+                ast.toWatch = [ast];
+                break;
+            case AST.ArrayExpression:
+                allConstants = true;
+                argsToWatch = [];
+                forEach(ast.elements, function(expr) {
+                    findConstantAndWatchExpressions(expr, $filter, astIsPure);
+                    allConstants = allConstants && expr.constant;
+                    argsToWatch.push.apply(argsToWatch, expr.toWatch);
+                });
+                ast.constant = allConstants;
+                ast.toWatch = argsToWatch;
+                break;
+            case AST.ObjectExpression:
+                allConstants = true;
+                argsToWatch = [];
+                forEach(ast.properties, function(property) {
+                    findConstantAndWatchExpressions(property.value, $filter, astIsPure);
+                    allConstants = allConstants && property.value.constant;
+                    argsToWatch.push.apply(argsToWatch, property.value.toWatch);
+                    if (property.computed) {
+                        //`{[key]: value}` implicitly does `key.toString()` which may be non-pure
+                        findConstantAndWatchExpressions(property.key, $filter, /*parentIsPure=*/false);
+                        allConstants = allConstants && property.key.constant;
+                        argsToWatch.push.apply(argsToWatch, property.key.toWatch);
+                    }
+                });
+                ast.constant = allConstants;
+                ast.toWatch = argsToWatch;
+                break;
+            case AST.ThisExpression:
+                ast.constant = false;
+                ast.toWatch = [];
+                break;
+            case AST.LocalsExpression:
+                ast.constant = false;
+                ast.toWatch = [];
+                break;
         }
-            : function cspSafePromiseEnabledGetter(scope, locals) {
-            var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope,
-                promise;
-
-            if (pathVal == null) return pathVal;
-
-            pathVal = pathVal[key0];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key1) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key1];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key2) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key2];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key3) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key3];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key4) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key4];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-            return pathVal;
-        };
     }
 
-    function simpleGetterFn1(key0, fullExp) {
-        ensureSafeMemberName(key0, fullExp);
+    function getInputs(body) {
+        if (body.length !== 1) return;
+        var lastExpression = body[0].expression;
+        var candidate = lastExpression.toWatch;
+        if (candidate.length !== 1) return candidate;
+        return candidate[0] !== lastExpression ? candidate : undefined;
+    }
 
-        return function simpleGetterFn1(scope, locals) {
-            if (scope == null) return undefined;
-            return ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
-        };
+    function isAssignable(ast) {
+        return ast.type === AST.Identifier || ast.type === AST.MemberExpression;
     }
 
-    function simpleGetterFn2(key0, key1, fullExp) {
-        ensureSafeMemberName(key0, fullExp);
-        ensureSafeMemberName(key1, fullExp);
+    function assignableAST(ast) {
+        if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) {
+            return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='};
+        }
+    }
 
-        return function simpleGetterFn2(scope, locals) {
-            if (scope == null) return undefined;
-            scope = ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
-            return scope == null ? undefined : scope[key1];
-        };
+    function isLiteral(ast) {
+        return ast.body.length === 0 ||
+            ast.body.length === 1 && (
+                ast.body[0].expression.type === AST.Literal ||
+                ast.body[0].expression.type === AST.ArrayExpression ||
+                ast.body[0].expression.type === AST.ObjectExpression);
     }
 
-    function getterFn(path, options, fullExp) {
-        // Check whether the cache has this getter already.
-        // We can use hasOwnProperty directly on the cache because we ensure,
-        // see below, that the cache never stores a path called 'hasOwnProperty'
-        if (getterFnCache.hasOwnProperty(path)) {
-            return getterFnCache[path];
-        }
+    function isConstant(ast) {
+        return ast.constant;
+    }
 
-        var pathKeys = path.split('.'),
-            pathKeysLength = pathKeys.length,
-            fn;
-
-        // When we have only 1 or 2 tokens, use optimized special case closures.
-        // http://jsperf.com/angularjs-parse-getter/6
-        if (!options.unwrapPromises && pathKeysLength === 1) {
-            fn = simpleGetterFn1(pathKeys[0], fullExp);
-        } else if (!options.unwrapPromises && pathKeysLength === 2) {
-            fn = simpleGetterFn2(pathKeys[0], pathKeys[1], fullExp);
-        } else if (options.csp) {
-            if (pathKeysLength < 6) {
-                fn = cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4], fullExp,
-                    options);
-            } else {
-                fn = function(scope, locals) {
-                    var i = 0, val;
-                    do {
-                        val = cspSafeGetterFn(pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++],
-                            pathKeys[i++], fullExp, options)(scope, locals);
+    function ASTCompiler($filter) {
+        this.$filter = $filter;
+    }
 
-                        locals = undefined; // clear after first iteration
-                        scope = val;
-                    } while (i < pathKeysLength);
-                    return val;
-                };
+    ASTCompiler.prototype = {
+        compile: function(ast) {
+            var self = this;
+            this.state = {
+                nextId: 0,
+                filters: {},
+                fn: {vars: [], body: [], own: {}},
+                assign: {vars: [], body: [], own: {}},
+                inputs: []
+            };
+            findConstantAndWatchExpressions(ast, self.$filter);
+            var extra = '';
+            var assignable;
+            this.stage = 'assign';
+            if ((assignable = assignableAST(ast))) {
+                this.state.computing = 'assign';
+                var result = this.nextId();
+                this.recurse(assignable, result);
+                this.return_(result);
+                extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l');
             }
-        } else {
-            var code = 'var p;\n';
-            forEach(pathKeys, function(key, index) {
-                ensureSafeMemberName(key, fullExp);
-                code += 'if(s == null) return undefined;\n' +
-                's='+ (index
-                    // we simply dereference 's' on any .dot notation
-                    ? 's'
-                    // but if we are first then we check locals first, and if so read it first
-                    : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
-                (options.unwrapPromises
-                    ? 'if (s && s.then) {\n' +
-                ' pw("' + fullExp.replace(/(["\r\n])/g, '\\$1') + '");\n' +
-                ' if (!("$$v" in s)) {\n' +
-                ' p=s;\n' +
-                ' p.$$v = undefined;\n' +
-                ' p.then(function(v) {p.$$v=v;});\n' +
-                '}\n' +
-                ' s=s.$$v\n' +
-                '}\n'
-                    : '');
+            var toWatch = getInputs(ast.body);
+            self.stage = 'inputs';
+            forEach(toWatch, function(watch, key) {
+                var fnKey = 'fn' + key;
+                self.state[fnKey] = {vars: [], body: [], own: {}};
+                self.state.computing = fnKey;
+                var intoId = self.nextId();
+                self.recurse(watch, intoId);
+                self.return_(intoId);
+                self.state.inputs.push({name: fnKey, isPure: watch.isPure});
+                watch.watchId = key;
             });
-            code += 'return s;';
-
-            /* jshint -W054 */
-            var evaledFnGetter = new Function('s', 'k', 'pw', code); // s=scope, k=locals, pw=promiseWarning
-            /* jshint +W054 */
-            evaledFnGetter.toString = valueFn(code);
-            fn = options.unwrapPromises ? function(scope, locals) {
-                return evaledFnGetter(scope, locals, promiseWarning);
-            } : evaledFnGetter;
-        }
+            this.state.computing = 'fn';
+            this.stage = 'main';
+            this.recurse(ast);
+            var fnString =
+                // The build and minification steps remove the string "use strict" from the code, but this is done using a regex.
+                // This is a workaround for this until we do a better job at only removing the prefix only when we should.
+                '"' + this.USE + ' ' + this.STRICT + '";\n' +
+                this.filterPrefix() +
+                'var fn=' + this.generateFunction('fn', 's,l,a,i') +
+                extra +
+                this.watchFns() +
+                'return fn;';
+
+            // eslint-disable-next-line no-new-func
+            var fn = (new Function('$filter',
+                'getStringValue',
+                'ifDefined',
+                'plus',
+                fnString))(
+                this.$filter,
+                getStringValue,
+                ifDefined,
+                plusFn);
+            this.state = this.stage = undefined;
+            return fn;
+        },
 
-        // Only cache the value if it's not going to mess up the cache object
-        // This is more performant that using Object.prototype.hasOwnProperty.call
-        if (path !== 'hasOwnProperty') {
-            getterFnCache[path] = fn;
-        }
-        return fn;
-    }
+        USE: 'use',
 
-///////////////////////////////////
+        STRICT: 'strict',
 
-    /**
-     * @ngdoc service
-     * @name $parse
-     * @kind function
-     *
-     * @description
-     *
-     * Converts Angular {@link guide/expression expression} into a function.
-     *
-     * ```js
-     *   var getter = $parse('user.name');
-     *   var setter = getter.assign;
-     *   var context = {user:{name:'angular'}};
-     *   var locals = {user:{name:'local'}};
-     *
-     *   expect(getter(context)).toEqual('angular');
-     *   setter(context, 'newValue');
-     *   expect(context.user.name).toEqual('newValue');
-     *   expect(getter(context, locals)).toEqual('local');
-     * ```
-     *
-     *
-     * @param {string} expression String expression to compile.
-     * @returns {function(context, locals)} a function which represents the compiled expression:
-     *
-     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-     *      are evaluated against (typically a scope object).
-     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-     *      `context`.
-     *
-     *    The returned function also has the following properties:
-     *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
-     *        literal.
-     *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
-     *        constant literals.
-     *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
-     *        set to a function to change its value on the given context.
-     *
-     */
+        watchFns: function() {
+            var result = [];
+            var inputs = this.state.inputs;
+            var self = this;
+            forEach(inputs, function(input) {
+                result.push('var ' + input.name + '=' + self.generateFunction(input.name, 's'));
+                if (input.isPure) {
+                    result.push(input.name, '.isPure=' + JSON.stringify(input.isPure) + ';');
+                }
+            });
+            if (inputs.length) {
+                result.push('fn.inputs=[' + inputs.map(function(i) { return i.name; }).join(',') + '];');
+            }
+            return result.join('');
+        },
 
+        generateFunction: function(name, params) {
+            return 'function(' + params + '){' +
+                this.varsPrefix(name) +
+                this.body(name) +
+                '};';
+        },
 
-    /**
-     * @ngdoc provider
-     * @name $parseProvider
-     * @function
-     *
-     * @description
-     * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
-     *  service.
-     */
-    function $ParseProvider() {
-        var cache = {};
+        filterPrefix: function() {
+            var parts = [];
+            var self = this;
+            forEach(this.state.filters, function(id, filter) {
+                parts.push(id + '=$filter(' + self.escape(filter) + ')');
+            });
+            if (parts.length) return 'var ' + parts.join(',') + ';';
+            return '';
+        },
 
-        var $parseOptions = {
-            csp: false,
-            unwrapPromises: false,
-            logPromiseWarnings: true
-        };
+        varsPrefix: function(section) {
+            return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : '';
+        },
 
+        body: function(section) {
+            return this.state[section].body.join('');
+        },
 
-        /**
-         * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
-         *
-         * @ngdoc method
-         * @name $parseProvider#unwrapPromises
-         * @description
-         *
-         * **This feature is deprecated, see deprecation notes below for more info**
-         *
-         * If set to true (default is false), $parse will unwrap promises automatically when a promise is
-         * found at any part of the expression. In other words, if set to true, the expression will always
-         * result in a non-promise value.
-         *
-         * While the promise is unresolved, it's treated as undefined, but once resolved and fulfilled,
-         * the fulfillment value is used in place of the promise while evaluating the expression.
-         *
-         * **Deprecation notice**
-         *
-         * This is a feature that didn't prove to be wildly useful or popular, primarily because of the
-         * dichotomy between data access in templates (accessed as raw values) and controller code
-         * (accessed as promises).
-         *
-         * In most code we ended up resolving promises manually in controllers anyway and thus unifying
-         * the model access there.
-         *
-         * Other downsides of automatic promise unwrapping:
-         *
-         * - when building components it's often desirable to receive the raw promises
-         * - adds complexity and slows down expression evaluation
-         * - makes expression code pre-generation unattractive due to the amount of code that needs to be
-         *   generated
-         * - makes IDE auto-completion and tool support hard
-         *
-         * **Warning Logs**
-         *
-         * If the unwrapping is enabled, Angular will log a warning about each expression that unwraps a
-         * promise (to reduce the noise, each expression is logged only once). To disable this logging use
-         * `$parseProvider.logPromiseWarnings(false)` api.
-         *
-         *
-         * @param {boolean=} value New value.
-         * @returns {boolean|self} Returns the current setting when used as getter and self if used as
-         *                         setter.
-         */
-        this.unwrapPromises = function(value) {
-            if (isDefined(value)) {
-                $parseOptions.unwrapPromises = !!value;
-                return this;
+        recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+            var left, right, self = this, args, expression, computed;
+            recursionFn = recursionFn || noop;
+            if (!skipWatchIdCheck && isDefined(ast.watchId)) {
+                intoId = intoId || this.nextId();
+                this.if_('i',
+                    this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
+                    this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
+                );
+                return;
+            }
+            switch (ast.type) {
+                case AST.Program:
+                    forEach(ast.body, function(expression, pos) {
+                        self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; });
+                        if (pos !== ast.body.length - 1) {
+                            self.current().body.push(right, ';');
+                        } else {
+                            self.return_(right);
+                        }
+                    });
+                    break;
+                case AST.Literal:
+                    expression = this.escape(ast.value);
+                    this.assign(intoId, expression);
+                    recursionFn(intoId || expression);
+                    break;
+                case AST.UnaryExpression:
+                    this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; });
+                    expression = ast.operator + '(' + this.ifDefined(right, 0) + ')';
+                    this.assign(intoId, expression);
+                    recursionFn(expression);
+                    break;
+                case AST.BinaryExpression:
+                    this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; });
+                    this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; });
+                    if (ast.operator === '+') {
+                        expression = this.plus(left, right);
+                    } else if (ast.operator === '-') {
+                        expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0);
+                    } else {
+                        expression = '(' + left + ')' + ast.operator + '(' + right + ')';
+                    }
+                    this.assign(intoId, expression);
+                    recursionFn(expression);
+                    break;
+                case AST.LogicalExpression:
+                    intoId = intoId || this.nextId();
+                    self.recurse(ast.left, intoId);
+                    self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
+                    recursionFn(intoId);
+                    break;
+                case AST.ConditionalExpression:
+                    intoId = intoId || this.nextId();
+                    self.recurse(ast.test, intoId);
+                    self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
+                    recursionFn(intoId);
+                    break;
+                case AST.Identifier:
+                    intoId = intoId || this.nextId();
+                    if (nameId) {
+                        nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s');
+                        nameId.computed = false;
+                        nameId.name = ast.name;
+                    }
+                    self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
+                        function() {
+                            self.if_(self.stage === 'inputs' || 's', function() {
+                                if (create && create !== 1) {
+                                    self.if_(
+                                        self.isNull(self.nonComputedMember('s', ast.name)),
+                                        self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
+                                }
+                                self.assign(intoId, self.nonComputedMember('s', ast.name));
+                            });
+                        }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name))
+                    );
+                    recursionFn(intoId);
+                    break;
+                case AST.MemberExpression:
+                    left = nameId && (nameId.context = this.nextId()) || this.nextId();
+                    intoId = intoId || this.nextId();
+                    self.recurse(ast.object, left, undefined, function() {
+                        self.if_(self.notNull(left), function() {
+                            if (ast.computed) {
+                                right = self.nextId();
+                                self.recurse(ast.property, right);
+                                self.getStringValue(right);
+                                if (create && create !== 1) {
+                                    self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
+                                }
+                                expression = self.computedMember(left, right);
+                                self.assign(intoId, expression);
+                                if (nameId) {
+                                    nameId.computed = true;
+                                    nameId.name = right;
+                                }
+                            } else {
+                                if (create && create !== 1) {
+                                    self.if_(self.isNull(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+                                }
+                                expression = self.nonComputedMember(left, ast.property.name);
+                                self.assign(intoId, expression);
+                                if (nameId) {
+                                    nameId.computed = false;
+                                    nameId.name = ast.property.name;
+                                }
+                            }
+                        }, function() {
+                            self.assign(intoId, 'undefined');
+                        });
+                        recursionFn(intoId);
+                    }, !!create);
+                    break;
+                case AST.CallExpression:
+                    intoId = intoId || this.nextId();
+                    if (ast.filter) {
+                        right = self.filter(ast.callee.name);
+                        args = [];
+                        forEach(ast.arguments, function(expr) {
+                            var argument = self.nextId();
+                            self.recurse(expr, argument);
+                            args.push(argument);
+                        });
+                        expression = right + '(' + args.join(',') + ')';
+                        self.assign(intoId, expression);
+                        recursionFn(intoId);
+                    } else {
+                        right = self.nextId();
+                        left = {};
+                        args = [];
+                        self.recurse(ast.callee, right, left, function() {
+                            self.if_(self.notNull(right), function() {
+                                forEach(ast.arguments, function(expr) {
+                                    self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
+                                        args.push(argument);
+                                    });
+                                });
+                                if (left.name) {
+                                    expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')';
+                                } else {
+                                    expression = right + '(' + args.join(',') + ')';
+                                }
+                                self.assign(intoId, expression);
+                            }, function() {
+                                self.assign(intoId, 'undefined');
+                            });
+                            recursionFn(intoId);
+                        });
+                    }
+                    break;
+                case AST.AssignmentExpression:
+                    right = this.nextId();
+                    left = {};
+                    this.recurse(ast.left, undefined, left, function() {
+                        self.if_(self.notNull(left.context), function() {
+                            self.recurse(ast.right, right);
+                            expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
+                            self.assign(intoId, expression);
+                            recursionFn(intoId || expression);
+                        });
+                    }, 1);
+                    break;
+                case AST.ArrayExpression:
+                    args = [];
+                    forEach(ast.elements, function(expr) {
+                        self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
+                            args.push(argument);
+                        });
+                    });
+                    expression = '[' + args.join(',') + ']';
+                    this.assign(intoId, expression);
+                    recursionFn(intoId || expression);
+                    break;
+                case AST.ObjectExpression:
+                    args = [];
+                    computed = false;
+                    forEach(ast.properties, function(property) {
+                        if (property.computed) {
+                            computed = true;
+                        }
+                    });
+                    if (computed) {
+                        intoId = intoId || this.nextId();
+                        this.assign(intoId, '{}');
+                        forEach(ast.properties, function(property) {
+                            if (property.computed) {
+                                left = self.nextId();
+                                self.recurse(property.key, left);
+                            } else {
+                                left = property.key.type === AST.Identifier ?
+                                    property.key.name :
+                                    ('' + property.key.value);
+                            }
+                            right = self.nextId();
+                            self.recurse(property.value, right);
+                            self.assign(self.member(intoId, left, property.computed), right);
+                        });
+                    } else {
+                        forEach(ast.properties, function(property) {
+                            self.recurse(property.value, ast.constant ? undefined : self.nextId(), undefined, function(expr) {
+                                args.push(self.escape(
+                                    property.key.type === AST.Identifier ? property.key.name :
+                                        ('' + property.key.value)) +
+                                    ':' + expr);
+                            });
+                        });
+                        expression = '{' + args.join(',') + '}';
+                        this.assign(intoId, expression);
+                    }
+                    recursionFn(intoId || expression);
+                    break;
+                case AST.ThisExpression:
+                    this.assign(intoId, 's');
+                    recursionFn(intoId || 's');
+                    break;
+                case AST.LocalsExpression:
+                    this.assign(intoId, 'l');
+                    recursionFn(intoId || 'l');
+                    break;
+                case AST.NGValueParameter:
+                    this.assign(intoId, 'v');
+                    recursionFn(intoId || 'v');
+                    break;
+            }
+        },
+
+        getHasOwnProperty: function(element, property) {
+            var key = element + '.' + property;
+            var own = this.current().own;
+            if (!own.hasOwnProperty(key)) {
+                own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')');
+            }
+            return own[key];
+        },
+
+        assign: function(id, value) {
+            if (!id) return;
+            this.current().body.push(id, '=', value, ';');
+            return id;
+        },
+
+        filter: function(filterName) {
+            if (!this.state.filters.hasOwnProperty(filterName)) {
+                this.state.filters[filterName] = this.nextId(true);
+            }
+            return this.state.filters[filterName];
+        },
+
+        ifDefined: function(id, defaultValue) {
+            return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')';
+        },
+
+        plus: function(left, right) {
+            return 'plus(' + left + ',' + right + ')';
+        },
+
+        return_: function(id) {
+            this.current().body.push('return ', id, ';');
+        },
+
+        if_: function(test, alternate, consequent) {
+            if (test === true) {
+                alternate();
             } else {
-                return $parseOptions.unwrapPromises;
+                var body = this.current().body;
+                body.push('if(', test, '){');
+                alternate();
+                body.push('}');
+                if (consequent) {
+                    body.push('else{');
+                    consequent();
+                    body.push('}');
+                }
             }
-        };
+        },
 
+        not: function(expression) {
+            return '!(' + expression + ')';
+        },
 
-        /**
-         * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
-         *
-         * @ngdoc method
-         * @name $parseProvider#logPromiseWarnings
-         * @description
-         *
-         * Controls whether Angular should log a warning on any encounter of a promise in an expression.
-         *
-         * The default is set to `true`.
-         *
-         * This setting applies only if `$parseProvider.unwrapPromises` setting is set to true as well.
-         *
-         * @param {boolean=} value New value.
-         * @returns {boolean|self} Returns the current setting when used as getter and self if used as
-         *                         setter.
-         */
-        this.logPromiseWarnings = function(value) {
-            if (isDefined(value)) {
-                $parseOptions.logPromiseWarnings = value;
-                return this;
+        isNull: function(expression) {
+            return expression + '==null';
+        },
+
+        notNull: function(expression) {
+            return expression + '!=null';
+        },
+
+        nonComputedMember: function(left, right) {
+            var SAFE_IDENTIFIER = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/;
+            var UNSAFE_CHARACTERS = /[^$_a-zA-Z0-9]/g;
+            if (SAFE_IDENTIFIER.test(right)) {
+                return left + '.' + right;
             } else {
-                return $parseOptions.logPromiseWarnings;
+                return left  + '["' + right.replace(UNSAFE_CHARACTERS, this.stringEscapeFn) + '"]';
             }
-        };
+        },
+
+        computedMember: function(left, right) {
+            return left + '[' + right + ']';
+        },
 
+        member: function(left, right, computed) {
+            if (computed) return this.computedMember(left, right);
+            return this.nonComputedMember(left, right);
+        },
 
-        this.$get = ['$filter', '$sniffer', '$log', function($filter, $sniffer, $log) {
-            $parseOptions.csp = $sniffer.csp;
+        getStringValue: function(item) {
+            this.assign(item, 'getStringValue(' + item + ')');
+        },
 
-            promiseWarning = function promiseWarningFn(fullExp) {
-                if (!$parseOptions.logPromiseWarnings || promiseWarningCache.hasOwnProperty(fullExp)) return;
-                promiseWarningCache[fullExp] = true;
-                $log.warn('[$parse] Promise found in the expression `' + fullExp + '`. ' +
-                'Automatic unwrapping of promises in Angular expressions is deprecated.');
+        lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+            var self = this;
+            return function() {
+                self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck);
             };
+        },
 
-            return function(exp) {
-                var parsedExpression;
+        lazyAssign: function(id, value) {
+            var self = this;
+            return function() {
+                self.assign(id, value);
+            };
+        },
 
-                switch (typeof exp) {
-                    case 'string':
+        stringEscapeRegex: /[^ a-zA-Z0-9]/g,
 
-                        if (cache.hasOwnProperty(exp)) {
-                            return cache[exp];
-                        }
+        stringEscapeFn: function(c) {
+            return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
+        },
 
-                        var lexer = new Lexer($parseOptions);
-                        var parser = new Parser(lexer, $filter, $parseOptions);
-                        parsedExpression = parser.parse(exp, false);
+        escape: function(value) {
+            if (isString(value)) return '\'' + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + '\'';
+            if (isNumber(value)) return value.toString();
+            if (value === true) return 'true';
+            if (value === false) return 'false';
+            if (value === null) return 'null';
+            if (typeof value === 'undefined') return 'undefined';
 
-                        if (exp !== 'hasOwnProperty') {
-                            // Only cache the value if it's not going to mess up the cache object
-                            // This is more performant that using Object.prototype.hasOwnProperty.call
-                            cache[exp] = parsedExpression;
-                        }
+            throw $parseMinErr('esc', 'IMPOSSIBLE');
+        },
 
-                        return parsedExpression;
+        nextId: function(skip, init) {
+            var id = 'v' + (this.state.nextId++);
+            if (!skip) {
+                this.current().vars.push(id + (init ? '=' + init : ''));
+            }
+            return id;
+        },
 
-                    case 'function':
-                        return exp;
+        current: function() {
+            return this.state[this.state.computing];
+        }
+    };
 
-                    default:
-                        return noop;
-                }
-            };
-        }];
+
+    function ASTInterpreter($filter) {
+        this.$filter = $filter;
     }
 
-    /**
-     * @ngdoc service
-     * @name $q
-     * @requires $rootScope
-     *
-     * @description
-     * A promise/deferred implementation inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
-     *
-     * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
-     * interface for interacting with an object that represents the result of an action that is
-     * performed asynchronously, and may or may not be finished at any given point in time.
-     *
-     * From the perspective of dealing with error handling, deferred and promise APIs are to
-     * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
-     *
-     * ```js
-     *   // for the purpose of this example let's assume that variables `$q`, `scope` and `okToGreet`
-     *   // are available in the current lexical scope (they could have been injected or passed in).
-     *
-     *   function asyncGreet(name) {
- *     var deferred = $q.defer();
- *
- *     setTimeout(function() {
- *       // since this fn executes async in a future turn of the event loop, we need to wrap
- *       // our code into an $apply call so that the model changes are properly observed.
- *       scope.$apply(function() {
- *         deferred.notify('About to greet ' + name + '.');
- *
- *         if (okToGreet(name)) {
- *           deferred.resolve('Hello, ' + name + '!');
- *         } else {
- *           deferred.reject('Greeting ' + name + ' is not allowed.');
- *         }
- *       });
- *     }, 1000);
- *
- *     return deferred.promise;
- *   }
-     *
-     *   var promise = asyncGreet('Robin Hood');
-     *   promise.then(function(greeting) {
- *     alert('Success: ' + greeting);
- *   }, function(reason) {
- *     alert('Failed: ' + reason);
- *   }, function(update) {
- *     alert('Got notification: ' + update);
- *   });
-     * ```
-     *
-     * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
-     * comes in the way of guarantees that promise and deferred APIs make, see
-     * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
-     *
-     * Additionally the promise api allows for composition that is very hard to do with the
-     * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
-     * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
-     * section on serial or parallel joining of promises.
-     *
-     *
-     * # The Deferred API
-     *
-     * A new instance of deferred is constructed by calling `$q.defer()`.
-     *
-     * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
-     * that can be used for signaling the successful or unsuccessful completion, as well as the status
-     * of the task.
-     *
-     * **Methods**
-     *
-     * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
-     *   constructed via `$q.reject`, the promise will be rejected instead.
-     * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
-     *   resolving it with a rejection constructed via `$q.reject`.
-     * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
-     *   multiple times before the promise is either resolved or rejected.
-     *
-     * **Properties**
-     *
-     * - promise – `{Promise}` – promise object associated with this deferred.
-     *
-     *
-     * # The Promise API
-     *
-     * A new promise instance is created when a deferred instance is created and can be retrieved by
-     * calling `deferred.promise`.
-     *
-     * The purpose of the promise object is to allow for interested parties to get access to the result
-     * of the deferred task when it completes.
-     *
-     * **Methods**
-     *
-     * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
-     *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
-     *   as soon as the result is available. The callbacks are called with a single argument: the result
-     *   or rejection reason. Additionally, the notify callback may be called zero or more times to
-     *   provide a progress indication, before the promise is resolved or rejected.
-     *
-     *   This method *returns a new promise* which is resolved or rejected via the return value of the
-     *   `successCallback`, `errorCallback`. It also notifies via the return value of the
-     *   `notifyCallback` method. The promise can not be resolved or rejected from the notifyCallback
-     *   method.
-     *
-     * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
-     *
-     * - `finally(callback)` – allows you to observe either the fulfillment or rejection of a promise,
-     *   but to do so without modifying the final value. This is useful to release resources or do some
-     *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
-     *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
-     *   more information.
-     *
-     *   Because `finally` is a reserved word in JavaScript and reserved keywords are not supported as
-     *   property names by ES3, you'll need to invoke the method like `promise['finally'](callback)` to
-     *   make your code IE8 and Android 2.x compatible.
+    ASTInterpreter.prototype = {
+        compile: function(ast) {
+            var self = this;
+            findConstantAndWatchExpressions(ast, self.$filter);
+            var assignable;
+            var assign;
+            if ((assignable = assignableAST(ast))) {
+                assign = this.recurse(assignable);
+            }
+            var toWatch = getInputs(ast.body);
+            var inputs;
+            if (toWatch) {
+                inputs = [];
+                forEach(toWatch, function(watch, key) {
+                    var input = self.recurse(watch);
+                    input.isPure = watch.isPure;
+                    watch.input = input;
+                    inputs.push(input);
+                    watch.watchId = key;
+                });
+            }
+            var expressions = [];
+            forEach(ast.body, function(expression) {
+                expressions.push(self.recurse(expression.expression));
+            });
+            var fn = ast.body.length === 0 ? noop :
+                ast.body.length === 1 ? expressions[0] :
+                    function(scope, locals) {
+                        var lastValue;
+                        forEach(expressions, function(exp) {
+                            lastValue = exp(scope, locals);
+                        });
+                        return lastValue;
+                    };
+            if (assign) {
+                fn.assign = function(scope, value, locals) {
+                    return assign(scope, locals, value);
+                };
+            }
+            if (inputs) {
+                fn.inputs = inputs;
+            }
+            return fn;
+        },
+
+        recurse: function(ast, context, create) {
+            var left, right, self = this, args;
+            if (ast.input) {
+                return this.inputs(ast.input, ast.watchId);
+            }
+            switch (ast.type) {
+                case AST.Literal:
+                    return this.value(ast.value, context);
+                case AST.UnaryExpression:
+                    right = this.recurse(ast.argument);
+                    return this['unary' + ast.operator](right, context);
+                case AST.BinaryExpression:
+                    left = this.recurse(ast.left);
+                    right = this.recurse(ast.right);
+                    return this['binary' + ast.operator](left, right, context);
+                case AST.LogicalExpression:
+                    left = this.recurse(ast.left);
+                    right = this.recurse(ast.right);
+                    return this['binary' + ast.operator](left, right, context);
+                case AST.ConditionalExpression:
+                    return this['ternary?:'](
+                        this.recurse(ast.test),
+                        this.recurse(ast.alternate),
+                        this.recurse(ast.consequent),
+                        context
+                    );
+                case AST.Identifier:
+                    return self.identifier(ast.name, context, create);
+                case AST.MemberExpression:
+                    left = this.recurse(ast.object, false, !!create);
+                    if (!ast.computed) {
+                        right = ast.property.name;
+                    }
+                    if (ast.computed) right = this.recurse(ast.property);
+                    return ast.computed ?
+                        this.computedMember(left, right, context, create) :
+                        this.nonComputedMember(left, right, context, create);
+                case AST.CallExpression:
+                    args = [];
+                    forEach(ast.arguments, function(expr) {
+                        args.push(self.recurse(expr));
+                    });
+                    if (ast.filter) right = this.$filter(ast.callee.name);
+                    if (!ast.filter) right = this.recurse(ast.callee, true);
+                    return ast.filter ?
+                        function(scope, locals, assign, inputs) {
+                            var values = [];
+                            for (var i = 0; i < args.length; ++i) {
+                                values.push(args[i](scope, locals, assign, inputs));
+                            }
+                            var value = right.apply(undefined, values, inputs);
+                            return context ? {context: undefined, name: undefined, value: value} : value;
+                        } :
+                        function(scope, locals, assign, inputs) {
+                            var rhs = right(scope, locals, assign, inputs);
+                            var value;
+                            if (rhs.value != null) {
+                                var values = [];
+                                for (var i = 0; i < args.length; ++i) {
+                                    values.push(args[i](scope, locals, assign, inputs));
+                                }
+                                value = rhs.value.apply(rhs.context, values);
+                            }
+                            return context ? {value: value} : value;
+                        };
+                case AST.AssignmentExpression:
+                    left = this.recurse(ast.left, true, 1);
+                    right = this.recurse(ast.right);
+                    return function(scope, locals, assign, inputs) {
+                        var lhs = left(scope, locals, assign, inputs);
+                        var rhs = right(scope, locals, assign, inputs);
+                        lhs.context[lhs.name] = rhs;
+                        return context ? {value: rhs} : rhs;
+                    };
+                case AST.ArrayExpression:
+                    args = [];
+                    forEach(ast.elements, function(expr) {
+                        args.push(self.recurse(expr));
+                    });
+                    return function(scope, locals, assign, inputs) {
+                        var value = [];
+                        for (var i = 0; i < args.length; ++i) {
+                            value.push(args[i](scope, locals, assign, inputs));
+                        }
+                        return context ? {value: value} : value;
+                    };
+                case AST.ObjectExpression:
+                    args = [];
+                    forEach(ast.properties, function(property) {
+                        if (property.computed) {
+                            args.push({key: self.recurse(property.key),
+                                computed: true,
+                                value: self.recurse(property.value)
+                            });
+                        } else {
+                            args.push({key: property.key.type === AST.Identifier ?
+                                    property.key.name :
+                                    ('' + property.key.value),
+                                computed: false,
+                                value: self.recurse(property.value)
+                            });
+                        }
+                    });
+                    return function(scope, locals, assign, inputs) {
+                        var value = {};
+                        for (var i = 0; i < args.length; ++i) {
+                            if (args[i].computed) {
+                                value[args[i].key(scope, locals, assign, inputs)] = args[i].value(scope, locals, assign, inputs);
+                            } else {
+                                value[args[i].key] = args[i].value(scope, locals, assign, inputs);
+                            }
+                        }
+                        return context ? {value: value} : value;
+                    };
+                case AST.ThisExpression:
+                    return function(scope) {
+                        return context ? {value: scope} : scope;
+                    };
+                case AST.LocalsExpression:
+                    return function(scope, locals) {
+                        return context ? {value: locals} : locals;
+                    };
+                case AST.NGValueParameter:
+                    return function(scope, locals, assign) {
+                        return context ? {value: assign} : assign;
+                    };
+            }
+        },
+
+        'unary+': function(argument, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = argument(scope, locals, assign, inputs);
+                if (isDefined(arg)) {
+                    arg = +arg;
+                } else {
+                    arg = 0;
+                }
+                return context ? {value: arg} : arg;
+            };
+        },
+        'unary-': function(argument, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = argument(scope, locals, assign, inputs);
+                if (isDefined(arg)) {
+                    arg = -arg;
+                } else {
+                    arg = -0;
+                }
+                return context ? {value: arg} : arg;
+            };
+        },
+        'unary!': function(argument, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = !argument(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary+': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                var rhs = right(scope, locals, assign, inputs);
+                var arg = plusFn(lhs, rhs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary-': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                var rhs = right(scope, locals, assign, inputs);
+                var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary*': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary/': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary%': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary===': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary!==': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary==': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                // eslint-disable-next-line eqeqeq
+                var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary!=': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                // eslint-disable-next-line eqeqeq
+                var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary<': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary>': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary<=': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary>=': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary&&': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary||': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'ternary?:': function(test, alternate, consequent, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        value: function(value, context) {
+            return function() { return context ? {context: undefined, name: undefined, value: value} : value; };
+        },
+        identifier: function(name, context, create) {
+            return function(scope, locals, assign, inputs) {
+                var base = locals && (name in locals) ? locals : scope;
+                if (create && create !== 1 && base && base[name] == null) {
+                    base[name] = {};
+                }
+                var value = base ? base[name] : undefined;
+                if (context) {
+                    return {context: base, name: name, value: value};
+                } else {
+                    return value;
+                }
+            };
+        },
+        computedMember: function(left, right, context, create) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                var rhs;
+                var value;
+                if (lhs != null) {
+                    rhs = right(scope, locals, assign, inputs);
+                    rhs = getStringValue(rhs);
+                    if (create && create !== 1) {
+                        if (lhs && !(lhs[rhs])) {
+                            lhs[rhs] = {};
+                        }
+                    }
+                    value = lhs[rhs];
+                }
+                if (context) {
+                    return {context: lhs, name: rhs, value: value};
+                } else {
+                    return value;
+                }
+            };
+        },
+        nonComputedMember: function(left, right, context, create) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                if (create && create !== 1) {
+                    if (lhs && lhs[right] == null) {
+                        lhs[right] = {};
+                    }
+                }
+                var value = lhs != null ? lhs[right] : undefined;
+                if (context) {
+                    return {context: lhs, name: right, value: value};
+                } else {
+                    return value;
+                }
+            };
+        },
+        inputs: function(input, watchId) {
+            return function(scope, value, locals, inputs) {
+                if (inputs) return inputs[watchId];
+                return input(scope, value, locals);
+            };
+        }
+    };
+
+    /**
+     * @constructor
+     */
+    function Parser(lexer, $filter, options) {
+        this.ast = new AST(lexer, options);
+        this.astCompiler = options.csp ? new ASTInterpreter($filter) :
+            new ASTCompiler($filter);
+    }
+
+    Parser.prototype = {
+        constructor: Parser,
+
+        parse: function(text) {
+            var ast = this.getAst(text);
+            var fn = this.astCompiler.compile(ast.ast);
+            fn.literal = isLiteral(ast.ast);
+            fn.constant = isConstant(ast.ast);
+            fn.oneTime = ast.oneTime;
+            return fn;
+        },
+
+        getAst: function(exp) {
+            var oneTime = false;
+            exp = exp.trim();
+
+            if (exp.charAt(0) === ':' && exp.charAt(1) === ':') {
+                oneTime = true;
+                exp = exp.substring(2);
+            }
+            return {
+                ast: this.ast.ast(exp),
+                oneTime: oneTime
+            };
+        }
+    };
+
+    function getValueOf(value) {
+        return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value);
+    }
+
+///////////////////////////////////
+
+    /**
+     * @ngdoc service
+     * @name $parse
+     * @kind function
      *
-     * # Chaining promises
+     * @description
      *
-     * Because calling the `then` method of a promise returns a new derived promise, it is easily
-     * possible to create a chain of promises:
+     * Converts AngularJS {@link guide/expression expression} into a function.
      *
      * ```js
-     *   promiseB = promiseA.then(function(result) {
- *     return result + 1;
- *   });
+     *   var getter = $parse('user.name');
+     *   var setter = getter.assign;
+     *   var context = {user:{name:'AngularJS'}};
+     *   var locals = {user:{name:'local'}};
      *
-     *   // promiseB will be resolved immediately after promiseA is resolved and its value
-     *   // will be the result of promiseA incremented by 1
+     *   expect(getter(context)).toEqual('AngularJS');
+     *   setter(context, 'newValue');
+     *   expect(context.user.name).toEqual('newValue');
+     *   expect(getter(context, locals)).toEqual('local');
      * ```
      *
-     * It is possible to create chains of any length and since a promise can be resolved with another
-     * promise (which will defer its resolution further), it is possible to pause/defer resolution of
-     * the promises at any point in the chain. This makes it possible to implement powerful APIs like
-     * $http's response interceptors.
      *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
      *
-     * # Differences between Kris Kowal's Q and $q
-     *
-     *  There are two main differences:
-     *
-     * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
-     *   mechanism in angular, which means faster propagation of resolution or rejection into your
-     *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
-     * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
-     *   all the important functionality needed for common async tasks.
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
      *
-     *  # Testing
+     *    The returned function also has the following properties:
+     *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
+     *        literal.
+     *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
+     *        constant literals.
+     *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
+     *        set to a function to change its value on the given context.
      *
-     *  ```js
-     *    it('should simulate promise', inject(function($q, $rootScope) {
- *      var deferred = $q.defer();
- *      var promise = deferred.promise;
- *      var resolvedValue;
- *
- *      promise.then(function(value) { resolvedValue = value; });
- *      expect(resolvedValue).toBeUndefined();
- *
- *      // Simulate resolving of promise
- *      deferred.resolve(123);
- *      // Note that the 'then' function does not get called synchronously.
- *      // This is because we want the promise API to always be async, whether or not
- *      // it got called synchronously or asynchronously.
- *      expect(resolvedValue).toBeUndefined();
- *
- *      // Propagate promise resolution to 'then' functions using $apply().
- *      $rootScope.$apply();
- *      expect(resolvedValue).toEqual(123);
- *    }));
-     *  ```
      */
-    function $QProvider() {
-
-        this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
-            return qFactory(function(callback) {
-                $rootScope.$evalAsync(callback);
-            }, $exceptionHandler);
-        }];
-    }
 
 
     /**
-     * Constructs a promise manager.
+     * @ngdoc provider
+     * @name $parseProvider
+     * @this
      *
-     * @param {function(Function)} nextTick Function for executing functions in the next turn.
-     * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
-     *     debugging purposes.
-     * @returns {object} Promise manager.
+     * @description
+     * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
+     *  service.
      */
-    function qFactory(nextTick, exceptionHandler) {
+    function $ParseProvider() {
+        var cache = createMap();
+        var literals = {
+            'true': true,
+            'false': false,
+            'null': null,
+            'undefined': undefined
+        };
+        var identStart, identContinue;
+
+        /**
+         * @ngdoc method
+         * @name $parseProvider#addLiteral
+         * @description
+         *
+         * Configure $parse service to add literal values that will be present as literal at expressions.
+         *
+         * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name.
+         * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`.
+         *
+         **/
+        this.addLiteral = function(literalName, literalValue) {
+            literals[literalName] = literalValue;
+        };
 
         /**
          * @ngdoc method
-         * @name $q#defer
-         * @function
+         * @name $parseProvider#setIdentifierFns
          *
          * @description
-         * Creates a `Deferred` object which represents a task which will finish in the future.
          *
-         * @returns {Deferred} Returns a new instance of deferred.
+         * Allows defining the set of characters that are allowed in AngularJS expressions. The function
+         * `identifierStart` will get called to know if a given character is a valid character to be the
+         * first character for an identifier. The function `identifierContinue` will get called to know if
+         * a given character is a valid character to be a follow-up identifier character. The functions
+         * `identifierStart` and `identifierContinue` will receive as arguments the single character to be
+         * identifier and the character code point. These arguments will be `string` and `numeric`. Keep in
+         * mind that the `string` parameter can be two characters long depending on the character
+         * representation. It is expected for the function to return `true` or `false`, whether that
+         * character is allowed or not.
+         *
+         * Since this function will be called extensively, keep the implementation of these functions fast,
+         * as the performance of these functions have a direct impact on the expressions parsing speed.
+         *
+         * @param {function=} identifierStart The function that will decide whether the given character is
+         *   a valid identifier start character.
+         * @param {function=} identifierContinue The function that will decide whether the given character is
+         *   a valid identifier continue character.
          */
-        var defer = function() {
-            var pending = [],
-                value, deferred;
-
-            deferred = {
-
-                resolve: function(val) {
-                    if (pending) {
-                        var callbacks = pending;
-                        pending = undefined;
-                        value = ref(val);
-
-                        if (callbacks.length) {
-                            nextTick(function() {
-                                var callback;
-                                for (var i = 0, ii = callbacks.length; i < ii; i++) {
-                                    callback = callbacks[i];
-                                    value.then(callback[0], callback[1], callback[2]);
-                                }
-                            });
+        this.setIdentifierFns = function(identifierStart, identifierContinue) {
+            identStart = identifierStart;
+            identContinue = identifierContinue;
+            return this;
+        };
+
+        this.$get = ['$filter', function($filter) {
+            var noUnsafeEval = csp().noUnsafeEval;
+            var $parseOptions = {
+                csp: noUnsafeEval,
+                literals: copy(literals),
+                isIdentifierStart: isFunction(identStart) && identStart,
+                isIdentifierContinue: isFunction(identContinue) && identContinue
+            };
+            $parse.$$getAst = $$getAst;
+            return $parse;
+
+            function $parse(exp, interceptorFn) {
+                var parsedExpression, cacheKey;
+
+                switch (typeof exp) {
+                    case 'string':
+                        exp = exp.trim();
+                        cacheKey = exp;
+
+                        parsedExpression = cache[cacheKey];
+
+                        if (!parsedExpression) {
+                            var lexer = new Lexer($parseOptions);
+                            var parser = new Parser(lexer, $filter, $parseOptions);
+                            parsedExpression = parser.parse(exp);
+                            if (parsedExpression.constant) {
+                                parsedExpression.$$watchDelegate = constantWatchDelegate;
+                            } else if (parsedExpression.oneTime) {
+                                parsedExpression.$$watchDelegate = parsedExpression.literal ?
+                                    oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
+                            } else if (parsedExpression.inputs) {
+                                parsedExpression.$$watchDelegate = inputsWatchDelegate;
+                            }
+                            cache[cacheKey] = parsedExpression;
                         }
-                    }
-                },
+                        return addInterceptor(parsedExpression, interceptorFn);
 
+                    case 'function':
+                        return addInterceptor(exp, interceptorFn);
 
-                reject: function(reason) {
-                    deferred.resolve(createInternalRejectedPromise(reason));
-                },
+                    default:
+                        return addInterceptor(noop, interceptorFn);
+                }
+            }
 
+            function $$getAst(exp) {
+                var lexer = new Lexer($parseOptions);
+                var parser = new Parser(lexer, $filter, $parseOptions);
+                return parser.getAst(exp).ast;
+            }
 
-                notify: function(progress) {
-                    if (pending) {
-                        var callbacks = pending;
+            function expressionInputDirtyCheck(newValue, oldValueOfValue, compareObjectIdentity) {
 
-                        if (pending.length) {
-                            nextTick(function() {
-                                var callback;
-                                for (var i = 0, ii = callbacks.length; i < ii; i++) {
-                                    callback = callbacks[i];
-                                    callback[2](progress);
-                                }
-                            });
-                        }
-                    }
-                },
+                if (newValue == null || oldValueOfValue == null) { // null/undefined
+                    return newValue === oldValueOfValue;
+                }
 
+                if (typeof newValue === 'object') {
 
-                promise: {
-                    then: function(callback, errback, progressback) {
-                        var result = defer();
+                    // attempt to convert the value to a primitive type
+                    // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
+                    //             be cheaply dirty-checked
+                    newValue = getValueOf(newValue);
 
-                        var wrappedCallback = function(value) {
-                            try {
-                                result.resolve((isFunction(callback) ? callback : defaultCallback)(value));
-                            } catch(e) {
-                                result.reject(e);
-                                exceptionHandler(e);
-                            }
-                        };
+                    if (typeof newValue === 'object' && !compareObjectIdentity) {
+                        // objects/arrays are not supported - deep-watching them would be too expensive
+                        return false;
+                    }
 
-                        var wrappedErrback = function(reason) {
-                            try {
-                                result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
-                            } catch(e) {
-                                result.reject(e);
-                                exceptionHandler(e);
-                            }
-                        };
+                    // fall-through to the primitive equality check
+                }
 
-                        var wrappedProgressback = function(progress) {
-                            try {
-                                result.notify((isFunction(progressback) ? progressback : defaultCallback)(progress));
-                            } catch(e) {
-                                exceptionHandler(e);
-                            }
-                        };
+                //Primitive or NaN
+                // eslint-disable-next-line no-self-compare
+                return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
+            }
 
-                        if (pending) {
-                            pending.push([wrappedCallback, wrappedErrback, wrappedProgressback]);
-                        } else {
-                            value.then(wrappedCallback, wrappedErrback, wrappedProgressback);
+            function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+                var inputExpressions = parsedExpression.inputs;
+                var lastResult;
+
+                if (inputExpressions.length === 1) {
+                    var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails
+                    inputExpressions = inputExpressions[0];
+                    return scope.$watch(function expressionInputWatch(scope) {
+                        var newInputValue = inputExpressions(scope);
+                        if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf, inputExpressions.isPure)) {
+                            lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]);
+                            oldInputValueOf = newInputValue && getValueOf(newInputValue);
                         }
+                        return lastResult;
+                    }, listener, objectEquality, prettyPrintExpression);
+                }
 
-                        return result.promise;
-                    },
-
-                    "catch": function(callback) {
-                        return this.then(null, callback);
-                    },
+                var oldInputValueOfValues = [];
+                var oldInputValues = [];
+                for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+                    oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
+                    oldInputValues[i] = null;
+                }
 
-                    "finally": function(callback) {
+                return scope.$watch(function expressionInputsWatch(scope) {
+                    var changed = false;
 
-                        function makePromise(value, resolved) {
-                            var result = defer();
-                            if (resolved) {
-                                result.resolve(value);
-                            } else {
-                                result.reject(value);
-                            }
-                            return result.promise;
-                        }
-
-                        function handleCallback(value, isResolved) {
-                            var callbackOutput = null;
-                            try {
-                                callbackOutput = (callback ||defaultCallback)();
-                            } catch(e) {
-                                return makePromise(e, false);
-                            }
-                            if (callbackOutput && isFunction(callbackOutput.then)) {
-                                return callbackOutput.then(function() {
-                                    return makePromise(value, isResolved);
-                                }, function(error) {
-                                    return makePromise(error, false);
-                                });
-                            } else {
-                                return makePromise(value, isResolved);
-                            }
+                    for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+                        var newInputValue = inputExpressions[i](scope);
+                        if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i], inputExpressions[i].isPure))) {
+                            oldInputValues[i] = newInputValue;
+                            oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue);
                         }
+                    }
 
-                        return this.then(function(value) {
-                            return handleCallback(value, true);
-                        }, function(error) {
-                            return handleCallback(error, false);
-                        });
+                    if (changed) {
+                        lastResult = parsedExpression(scope, undefined, undefined, oldInputValues);
                     }
-                }
-            };
 
-            return deferred;
-        };
+                    return lastResult;
+                }, listener, objectEquality, prettyPrintExpression);
+            }
 
+            function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+                var unwatch, lastValue;
+                if (parsedExpression.inputs) {
+                    unwatch = inputsWatchDelegate(scope, oneTimeListener, objectEquality, parsedExpression, prettyPrintExpression);
+                } else {
+                    unwatch = scope.$watch(oneTimeWatch, oneTimeListener, objectEquality);
+                }
+                return unwatch;
 
-        var ref = function(value) {
-            if (value && isFunction(value.then)) return value;
-            return {
-                then: function(callback) {
-                    var result = defer();
-                    nextTick(function() {
-                        result.resolve(callback(value));
-                    });
-                    return result.promise;
+                function oneTimeWatch(scope) {
+                    return parsedExpression(scope);
                 }
-            };
-        };
+                function oneTimeListener(value, old, scope) {
+                    lastValue = value;
+                    if (isFunction(listener)) {
+                        listener(value, old, scope);
+                    }
+                    if (isDefined(value)) {
+                        scope.$$postDigest(function() {
+                            if (isDefined(lastValue)) {
+                                unwatch();
+                            }
+                        });
+                    }
+                }
+            }
 
+            function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+                var unwatch, lastValue;
+                unwatch = scope.$watch(function oneTimeWatch(scope) {
+                    return parsedExpression(scope);
+                }, function oneTimeListener(value, old, scope) {
+                    lastValue = value;
+                    if (isFunction(listener)) {
+                        listener(value, old, scope);
+                    }
+                    if (isAllDefined(value)) {
+                        scope.$$postDigest(function() {
+                            if (isAllDefined(lastValue)) unwatch();
+                        });
+                    }
+                }, objectEquality);
 
-        /**
-         * @ngdoc method
-         * @name $q#reject
-         * @function
-         *
-         * @description
-         * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
-         * used to forward rejection in a chain of promises. If you are dealing with the last promise in
-         * a promise chain, you don't need to worry about it.
-         *
-         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
-         * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
-         * a promise error callback and you want to forward the error to the promise derived from the
-         * current promise, you have to "rethrow" the error by returning a rejection constructed via
-         * `reject`.
-         *
-         * ```js
-         *   promiseB = promiseA.then(function(result) {
-   *     // success: do something and resolve promiseB
-   *     //          with the old or a new result
-   *     return result;
-   *   }, function(reason) {
-   *     // error: handle the error if possible and
-   *     //        resolve promiseB with newPromiseOrValue,
-   *     //        otherwise forward the rejection to promiseB
-   *     if (canHandle(reason)) {
-   *      // handle the error and recover
-   *      return newPromiseOrValue;
-   *     }
-   *     return $q.reject(reason);
-   *   });
-         * ```
-         *
-         * @param {*} reason Constant, message, exception or an object representing the rejection reason.
-         * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
-         */
-        var reject = function(reason) {
-            var result = defer();
-            result.reject(reason);
-            return result.promise;
-        };
+                return unwatch;
 
-        var createInternalRejectedPromise = function(reason) {
-            return {
-                then: function(callback, errback) {
-                    var result = defer();
-                    nextTick(function() {
-                        try {
-                            result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
-                        } catch(e) {
-                            result.reject(e);
-                            exceptionHandler(e);
-                        }
+                function isAllDefined(value) {
+                    var allDefined = true;
+                    forEach(value, function(val) {
+                        if (!isDefined(val)) allDefined = false;
                     });
-                    return result.promise;
+                    return allDefined;
                 }
-            };
-        };
-
+            }
 
-        /**
-         * @ngdoc method
-         * @name $q#when
-         * @function
-         *
-         * @description
-         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
-         * This is useful when you are dealing with an object that might or might not be a promise, or if
-         * the promise comes from a source that can't be trusted.
-         *
-         * @param {*} value Value or a promise
-         * @returns {Promise} Returns a promise of the passed value or promise
-         */
-        var when = function(value, callback, errback, progressback) {
-            var result = defer(),
-                done;
+            function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+                var unwatch = scope.$watch(function constantWatch(scope) {
+                    unwatch();
+                    return parsedExpression(scope);
+                }, listener, objectEquality);
+                return unwatch;
+            }
 
-            var wrappedCallback = function(value) {
-                try {
-                    return (isFunction(callback) ? callback : defaultCallback)(value);
-                } catch (e) {
-                    exceptionHandler(e);
-                    return reject(e);
-                }
-            };
+            function addInterceptor(parsedExpression, interceptorFn) {
+                if (!interceptorFn) return parsedExpression;
+                var watchDelegate = parsedExpression.$$watchDelegate;
+                var useInputs = false;
+
+                var regularWatch =
+                    watchDelegate !== oneTimeLiteralWatchDelegate &&
+                    watchDelegate !== oneTimeWatchDelegate;
+
+                var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) {
+                    var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs);
+                    return interceptorFn(value, scope, locals);
+                } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) {
+                    var value = parsedExpression(scope, locals, assign, inputs);
+                    var result = interceptorFn(value, scope, locals);
+                    // we only return the interceptor's result if the
+                    // initial value is defined (for bind-once)
+                    return isDefined(value) ? result : value;
+                };
 
-            var wrappedErrback = function(reason) {
-                try {
-                    return (isFunction(errback) ? errback : defaultErrback)(reason);
-                } catch (e) {
-                    exceptionHandler(e);
-                    return reject(e);
+                // Propagate $$watchDelegates other then inputsWatchDelegate
+                useInputs = !parsedExpression.inputs;
+                if (watchDelegate && watchDelegate !== inputsWatchDelegate) {
+                    fn.$$watchDelegate = watchDelegate;
+                    fn.inputs = parsedExpression.inputs;
+                } else if (!interceptorFn.$stateful) {
+                    // Treat interceptor like filters - assume non-stateful by default and use the inputsWatchDelegate
+                    fn.$$watchDelegate = inputsWatchDelegate;
+                    fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression];
                 }
-            };
 
-            var wrappedProgressback = function(progress) {
-                try {
-                    return (isFunction(progressback) ? progressback : defaultCallback)(progress);
-                } catch (e) {
-                    exceptionHandler(e);
+                if (fn.inputs) {
+                    fn.inputs = fn.inputs.map(function(e) {
+                        // Remove the isPure flag of inputs when it is not absolute because they are now wrapped in a
+                        // potentially non-pure interceptor function.
+                        if (e.isPure === PURITY_RELATIVE) {
+                            return function depurifier(s) { return e(s); };
+                        }
+                        return e;
+                    });
                 }
-            };
-
-            nextTick(function() {
-                ref(value).then(function(value) {
-                    if (done) return;
-                    done = true;
-                    result.resolve(ref(value).then(wrappedCallback, wrappedErrback, wrappedProgressback));
-                }, function(reason) {
-                    if (done) return;
-                    done = true;
-                    result.resolve(wrappedErrback(reason));
-                }, function(progress) {
-                    if (done) return;
-                    result.notify(wrappedProgressback(progress));
-                });
-            });
-
-            return result.promise;
-        };
-
-
-        function defaultCallback(value) {
-            return value;
-        }
-
-
-        function defaultErrback(reason) {
-            return reject(reason);
-        }
-
-
-        /**
-         * @ngdoc method
-         * @name $q#all
-         * @function
-         *
-         * @description
-         * Combines multiple promises into a single promise that is resolved when all of the input
-         * promises are resolved.
-         *
-         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
-         * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
-         *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
-         *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
-         *   with the same rejection value.
-         */
-        function all(promises) {
-            var deferred = defer(),
-                counter = 0,
-                results = isArray(promises) ? [] : {};
-
-            forEach(promises, function(promise, key) {
-                counter++;
-                ref(promise).then(function(value) {
-                    if (results.hasOwnProperty(key)) return;
-                    results[key] = value;
-                    if (!(--counter)) deferred.resolve(results);
-                }, function(reason) {
-                    if (results.hasOwnProperty(key)) return;
-                    deferred.reject(reason);
-                });
-            });
-
-            if (counter === 0) {
-                deferred.resolve(results);
-            }
-
-            return deferred.promise;
-        }
-
-        return {
-            defer: defer,
-            reject: reject,
-            when: when,
-            all: all
-        };
-    }
-
-    function $$RAFProvider(){ //rAF
-        this.$get = ['$window', '$timeout', function($window, $timeout) {
-            var requestAnimationFrame = $window.requestAnimationFrame ||
-                $window.webkitRequestAnimationFrame ||
-                $window.mozRequestAnimationFrame;
-
-            var cancelAnimationFrame = $window.cancelAnimationFrame ||
-                $window.webkitCancelAnimationFrame ||
-                $window.mozCancelAnimationFrame ||
-                $window.webkitCancelRequestAnimationFrame;
 
-            var rafSupported = !!requestAnimationFrame;
-            var raf = rafSupported
-                ? function(fn) {
-                var id = requestAnimationFrame(fn);
-                return function() {
-                    cancelAnimationFrame(id);
-                };
+                return fn;
             }
-                : function(fn) {
-                var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
-                return function() {
-                    $timeout.cancel(timer);
-                };
-            };
-
-            raf.supported = rafSupported;
-
-            return raf;
         }];
     }
 
     /**
-     * DESIGN NOTES
+     * @ngdoc service
+     * @name $q
+     * @requires $rootScope
      *
-     * The design decisions behind the scope are heavily favored for speed and memory consumption.
+     * @description
+     * A service that helps you run functions asynchronously, and use their return values (or exceptions)
+     * when they are done processing.
      *
-     * The typical use of scope is to watch the expressions, which most of the time return the same
-     * value as last time so we optimize the operation.
+     * This is a [Promises/A+](https://promisesaplus.com/)-compliant implementation of promises/deferred
+     * objects inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
      *
-     * Closures construction is expensive in terms of speed as well as memory:
-     *   - No closures, instead use prototypical inheritance for API
-     *   - Internal state needs to be stored on scope directly, which means that private state is
-     *     exposed as $$____ properties
+     * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
+     * implementations, and the other which resembles ES6 (ES2015) promises to some degree.
      *
-     * Loop operations are optimized by using while(count--) { ... }
-     *   - this means that in order to keep the same order of execution as addition we have to add
-     *     items to the array at the beginning (shift) instead of at the end (push)
+     * ## $q constructor
      *
-     * Child scopes are created and removed often
-     *   - Using an array would be slow since inserts in middle are expensive so we use linked list
+     * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
+     * function as the first argument. This is similar to the native Promise implementation from ES6,
+     * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
      *
-     * There are few watches then a lot of observers. This is why you don't want the observer to be
-     * implemented in the same way as watch. Watch requires return of initialization function which
-     * are expensive to construct.
-     */
-
-
-    /**
-     * @ngdoc provider
-     * @name $rootScopeProvider
-     * @description
+     * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are
+     * available yet.
      *
-     * Provider for the $rootScope service.
-     */
-
-    /**
-     * @ngdoc method
-     * @name $rootScopeProvider#digestTtl
-     * @description
+     * It can be used like so:
      *
-     * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
-     * assuming that the model is unstable.
+     * ```js
+     *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+     *   // are available in the current lexical scope (they could have been injected or passed in).
      *
-     * The current default is 10 iterations.
+     *   function asyncGreet(name) {
+     *     // perform some asynchronous operation, resolve or reject the promise when appropriate.
+     *     return $q(function(resolve, reject) {
+     *       setTimeout(function() {
+     *         if (okToGreet(name)) {
+     *           resolve('Hello, ' + name + '!');
+     *         } else {
+     *           reject('Greeting ' + name + ' is not allowed.');
+     *         }
+     *       }, 1000);
+     *     });
+     *   }
      *
-     * In complex applications it's possible that the dependencies between `$watch`s will result in
-     * several digest iterations. However if an application needs more than the default 10 digest
-     * iterations for its model to stabilize then you should investigate what is causing the model to
-     * continuously change during the digest.
+     *   var promise = asyncGreet('Robin Hood');
+     *   promise.then(function(greeting) {
+     *     alert('Success: ' + greeting);
+     *   }, function(reason) {
+     *     alert('Failed: ' + reason);
+     *   });
+     * ```
      *
-     * Increasing the TTL could have performance implications, so you should not change it without
-     * proper justification.
+     * Note: progress/notify callbacks are not currently supported via the ES6-style interface.
      *
-     * @param {number} limit The number of digest iterations.
-     */
-
-
-    /**
-     * @ngdoc service
-     * @name $rootScope
-     * @description
+     * Note: unlike ES6 behavior, an exception thrown in the constructor function will NOT implicitly reject the promise.
      *
-     * Every application has a single root {@link ng.$rootScope.Scope scope}.
-     * All other scopes are descendant scopes of the root scope. Scopes provide separation
-     * between the model and the view, via a mechanism for watching the model for changes.
-     * They also provide an event emission/broadcast and subscription facility. See the
-     * {@link guide/scope developer guide on scopes}.
-     */
-    function $RootScopeProvider(){
-        var TTL = 10;
-        var $rootScopeMinErr = minErr('$rootScope');
-        var lastDirtyWatch = null;
-
-        this.digestTtl = function(value) {
-            if (arguments.length) {
-                TTL = value;
-            }
-            return TTL;
-        };
-
-        this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
-            function( $injector,   $exceptionHandler,   $parse,   $browser) {
-
-                /**
-                 * @ngdoc type
-                 * @name $rootScope.Scope
-                 *
-                 * @description
-                 * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
-                 * {@link auto.$injector $injector}. Child scopes are created using the
-                 * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
-                 * compiled HTML template is executed.)
-                 *
-                 * Here is a simple scope snippet to show how you can interact with the scope.
-                 * ```html
-                 * <file src="./test/ng/rootScopeSpec.js" tag="docs1" />
-                 * ```
-                 *
-                 * # Inheritance
-                 * A scope can inherit from a parent scope, as in this example:
-                 * ```js
-                 var parent = $rootScope;
-                 var child = parent.$new();
-
-                 parent.salutation = "Hello";
-                 child.name = "World";
-                 expect(child.salutation).toEqual('Hello');
-
-                 child.salutation = "Welcome";
-                 expect(child.salutation).toEqual('Welcome');
-                 expect(parent.salutation).toEqual('Hello');
-                 * ```
-                 *
-                 *
-                 * @param {Object.<string, function()>=} providers Map of service factory which need to be
-                 *                                       provided for the current scope. Defaults to {@link ng}.
-                 * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
-                 *                              append/override services provided by `providers`. This is handy
-                 *                              when unit-testing and having the need to override a default
-                 *                              service.
-                 * @returns {Object} Newly created scope.
-                 *
-                 */
-                function Scope() {
-                    this.$id = nextUid();
-                    this.$$phase = this.$parent = this.$$watchers =
-                        this.$$nextSibling = this.$$prevSibling =
-                            this.$$childHead = this.$$childTail = null;
-                    this['this'] = this.$root =  this;
-                    this.$$destroyed = false;
-                    this.$$asyncQueue = [];
-                    this.$$postDigestQueue = [];
-                    this.$$listeners = {};
-                    this.$$listenerCount = {};
-                    this.$$isolateBindings = {};
-                }
+     * However, the more traditional CommonJS-style usage is still available, and documented below.
+     *
+     * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
+     * interface for interacting with an object that represents the result of an action that is
+     * performed asynchronously, and may or may not be finished at any given point in time.
+     *
+     * From the perspective of dealing with error handling, deferred and promise APIs are to
+     * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
+     *
+     * ```js
+     *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+     *   // are available in the current lexical scope (they could have been injected or passed in).
+     *
+     *   function asyncGreet(name) {
+     *     var deferred = $q.defer();
+     *
+     *     setTimeout(function() {
+     *       deferred.notify('About to greet ' + name + '.');
+     *
+     *       if (okToGreet(name)) {
+     *         deferred.resolve('Hello, ' + name + '!');
+     *       } else {
+     *         deferred.reject('Greeting ' + name + ' is not allowed.');
+     *       }
+     *     }, 1000);
+     *
+     *     return deferred.promise;
+     *   }
+     *
+     *   var promise = asyncGreet('Robin Hood');
+     *   promise.then(function(greeting) {
+     *     alert('Success: ' + greeting);
+     *   }, function(reason) {
+     *     alert('Failed: ' + reason);
+     *   }, function(update) {
+     *     alert('Got notification: ' + update);
+     *   });
+     * ```
+     *
+     * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
+     * comes in the way of guarantees that promise and deferred APIs make, see
+     * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
+     *
+     * Additionally the promise api allows for composition that is very hard to do with the
+     * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
+     * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
+     * section on serial or parallel joining of promises.
+     *
+     * ## The Deferred API
+     *
+     * A new instance of deferred is constructed by calling `$q.defer()`.
+     *
+     * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
+     * that can be used for signaling the successful or unsuccessful completion, as well as the status
+     * of the task.
+     *
+     * **Methods**
+     *
+     * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
+     *   constructed via `$q.reject`, the promise will be rejected instead.
+     * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
+     *   resolving it with a rejection constructed via `$q.reject`.
+     * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
+     *   multiple times before the promise is either resolved or rejected.
+     *
+     * **Properties**
+     *
+     * - promise – `{Promise}` – promise object associated with this deferred.
+     *
+     *
+     * ## The Promise API
+     *
+     * A new promise instance is created when a deferred instance is created and can be retrieved by
+     * calling `deferred.promise`.
+     *
+     * The purpose of the promise object is to allow for interested parties to get access to the result
+     * of the deferred task when it completes.
+     *
+     * **Methods**
+     *
+     * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
+     *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
+     *   as soon as the result is available. The callbacks are called with a single argument: the result
+     *   or rejection reason. Additionally, the notify callback may be called zero or more times to
+     *   provide a progress indication, before the promise is resolved or rejected.
+     *
+     *   This method *returns a new promise* which is resolved or rejected via the return value of the
+     *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
+     *   with the value which is resolved in that promise using
+     *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
+     *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
+     *   resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
+     *   arguments are optional.
+     *
+     * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
+     *
+     * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise,
+     *   but to do so without modifying the final value. This is useful to release resources or do some
+     *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
+     *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
+     *   more information.
+     *
+     * ## Chaining promises
+     *
+     * Because calling the `then` method of a promise returns a new derived promise, it is easily
+     * possible to create a chain of promises:
+     *
+     * ```js
+     *   promiseB = promiseA.then(function(result) {
+     *     return result + 1;
+     *   });
+     *
+     *   // promiseB will be resolved immediately after promiseA is resolved and its value
+     *   // will be the result of promiseA incremented by 1
+     * ```
+     *
+     * It is possible to create chains of any length and since a promise can be resolved with another
+     * promise (which will defer its resolution further), it is possible to pause/defer resolution of
+     * the promises at any point in the chain. This makes it possible to implement powerful APIs like
+     * $http's response interceptors.
+     *
+     *
+     * ## Differences between Kris Kowal's Q and $q
+     *
+     *  There are two main differences:
+     *
+     * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
+     *   mechanism in AngularJS, which means faster propagation of resolution or rejection into your
+     *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
+     * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
+     *   all the important functionality needed for common async tasks.
+     *
+     * ## Testing
+     *
+     *  ```js
+     *    it('should simulate promise', inject(function($q, $rootScope) {
+     *      var deferred = $q.defer();
+     *      var promise = deferred.promise;
+     *      var resolvedValue;
+     *
+     *      promise.then(function(value) { resolvedValue = value; });
+     *      expect(resolvedValue).toBeUndefined();
+     *
+     *      // Simulate resolving of promise
+     *      deferred.resolve(123);
+     *      // Note that the 'then' function does not get called synchronously.
+     *      // This is because we want the promise API to always be async, whether or not
+     *      // it got called synchronously or asynchronously.
+     *      expect(resolvedValue).toBeUndefined();
+     *
+     *      // Propagate promise resolution to 'then' functions using $apply().
+     *      $rootScope.$apply();
+     *      expect(resolvedValue).toEqual(123);
+     *    }));
+     *  ```
+     *
+     * @param {function(function, function)} resolver Function which is responsible for resolving or
+     *   rejecting the newly created promise. The first parameter is a function which resolves the
+     *   promise, the second parameter is a function which rejects the promise.
+     *
+     * @returns {Promise} The newly created promise.
+     */
+    /**
+     * @ngdoc provider
+     * @name $qProvider
+     * @this
+     *
+     * @description
+     */
+    function $QProvider() {
+        var errorOnUnhandledRejections = true;
+        this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
+            return qFactory(function(callback) {
+                $rootScope.$evalAsync(callback);
+            }, $exceptionHandler, errorOnUnhandledRejections);
+        }];
 
-                /**
-                 * @ngdoc property
-                 * @name $rootScope.Scope#$id
-                 * @returns {number} Unique scope ID (monotonically increasing alphanumeric sequence) useful for
-                 *   debugging.
-                 */
+        /**
+         * @ngdoc method
+         * @name $qProvider#errorOnUnhandledRejections
+         * @kind function
+         *
+         * @description
+         * Retrieves or overrides whether to generate an error when a rejected promise is not handled.
+         * This feature is enabled by default.
+         *
+         * @param {boolean=} value Whether to generate an error when a rejected promise is not handled.
+         * @returns {boolean|ng.$qProvider} Current value when called without a new value or self for
+         *    chaining otherwise.
+         */
+        this.errorOnUnhandledRejections = function(value) {
+            if (isDefined(value)) {
+                errorOnUnhandledRejections = value;
+                return this;
+            } else {
+                return errorOnUnhandledRejections;
+            }
+        };
+    }
 
+    /** @this */
+    function $$QProvider() {
+        var errorOnUnhandledRejections = true;
+        this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
+            return qFactory(function(callback) {
+                $browser.defer(callback);
+            }, $exceptionHandler, errorOnUnhandledRejections);
+        }];
 
-                Scope.prototype = {
-                    constructor: Scope,
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$new
-                     * @function
-                     *
-                     * @description
-                     * Creates a new child {@link ng.$rootScope.Scope scope}.
-                     *
-                     * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} and
-                     * {@link ng.$rootScope.Scope#$digest $digest()} events. The scope can be removed from the
-                     * scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
-                     *
-                     * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
-                     * desired for the scope and its child scopes to be permanently detached from the parent and
-                     * thus stop participating in model change detection and listener notification by invoking.
-                     *
-                     * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
-                     *         parent scope. The scope is isolated, as it can not see parent scope properties.
-                     *         When creating widgets, it is useful for the widget to not accidentally read parent
-                     *         state.
-                     *
-                     * @returns {Object} The newly created child scope.
-                     *
-                     */
-                    $new: function(isolate) {
-                        var ChildScope,
-                            child;
+        this.errorOnUnhandledRejections = function(value) {
+            if (isDefined(value)) {
+                errorOnUnhandledRejections = value;
+                return this;
+            } else {
+                return errorOnUnhandledRejections;
+            }
+        };
+    }
 
-                        if (isolate) {
-                            child = new Scope();
-                            child.$root = this.$root;
-                            // ensure that there is just one async queue per $rootScope and its children
-                            child.$$asyncQueue = this.$$asyncQueue;
-                            child.$$postDigestQueue = this.$$postDigestQueue;
-                        } else {
-                            ChildScope = function() {}; // should be anonymous; This is so that when the minifier munges
-                            // the name it does not become random set of chars. This will then show up as class
-                            // name in the web inspector.
-                            ChildScope.prototype = this;
-                            child = new ChildScope();
-                            child.$id = nextUid();
-                        }
-                        child['this'] = child;
-                        child.$$listeners = {};
-                        child.$$listenerCount = {};
-                        child.$parent = this;
-                        child.$$watchers = child.$$nextSibling = child.$$childHead = child.$$childTail = null;
-                        child.$$prevSibling = this.$$childTail;
-                        if (this.$$childHead) {
-                            this.$$childTail.$$nextSibling = child;
-                            this.$$childTail = child;
-                        } else {
-                            this.$$childHead = this.$$childTail = child;
-                        }
-                        return child;
-                    },
+    /**
+     * Constructs a promise manager.
+     *
+     * @param {function(function)} nextTick Function for executing functions in the next turn.
+     * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
+     *     debugging purposes.
+     * @param {boolean=} errorOnUnhandledRejections Whether an error should be generated on unhandled
+     *     promises rejections.
+     * @returns {object} Promise manager.
+     */
+    function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
+        var $qMinErr = minErr('$q', TypeError);
+        var queueSize = 0;
+        var checkQueue = [];
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$watch
-                     * @function
-                     *
-                     * @description
-                     * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
-                     *
-                     * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
-       *   $digest()} and should return the value that will be watched. (Since
-                     *   {@link ng.$rootScope.Scope#$digest $digest()} reruns when it detects changes the
-                     *   `watchExpression` can execute multiple times per
-                     *   {@link ng.$rootScope.Scope#$digest $digest()} and should be idempotent.)
-                     * - The `listener` is called only when the value from the current `watchExpression` and the
-                     *   previous call to `watchExpression` are not equal (with the exception of the initial run,
-                     *   see below). The inequality is determined according to
-                     *   {@link angular.equals} function. To save the value of the object for later comparison,
-                     *   the {@link angular.copy} function is used. It also means that watching complex options
-                     *   will have adverse memory and performance implications.
-                     * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
-                     *   This is achieved by rerunning the watchers until no changes are detected. The rerun
-                     *   iteration limit is 10 to prevent an infinite loop deadlock.
-                     *
-                     *
-                     * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
-                     * you can register a `watchExpression` function with no `listener`. (Since `watchExpression`
-                     * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a
-                     * change is detected, be prepared for multiple calls to your listener.)
-                     *
-                     * After a watcher is registered with the scope, the `listener` fn is called asynchronously
-                     * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
-                     * watcher. In rare cases, this is undesirable because the listener is called when the result
-                     * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
-                     * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
-                     * listener was called due to initialization.
-                     *
-                     * The example below contains an illustration of using a function as your $watch listener
-                     *
-                     *
-                     * # Example
-                     * ```js
-                     // let's assume that scope was dependency injected as the $rootScope
-                     var scope = $rootScope;
-                     scope.name = 'misko';
-                     scope.counter = 0;
+        /**
+         * @ngdoc method
+         * @name ng.$q#defer
+         * @kind function
+         *
+         * @description
+         * Creates a `Deferred` object which represents a task which will finish in the future.
+         *
+         * @returns {Deferred} Returns a new instance of deferred.
+         */
+        function defer() {
+            return new Deferred();
+        }
 
-                     expect(scope.counter).toEqual(0);
-                     scope.$watch('name', function(newValue, oldValue) {
-             scope.counter = scope.counter + 1;
-           });
-                     expect(scope.counter).toEqual(0);
+        function Deferred() {
+            var promise = this.promise = new Promise();
+            //Non prototype methods necessary to support unbound execution :/
+            this.resolve = function(val) { resolvePromise(promise, val); };
+            this.reject = function(reason) { rejectPromise(promise, reason); };
+            this.notify = function(progress) { notifyPromise(promise, progress); };
+        }
 
-                     scope.$digest();
-                     // no variable change
-                     expect(scope.counter).toEqual(0);
 
-                     scope.name = 'adam';
-                     scope.$digest();
-                     expect(scope.counter).toEqual(1);
+        function Promise() {
+            this.$$state = { status: 0 };
+        }
 
+        extend(Promise.prototype, {
+            then: function(onFulfilled, onRejected, progressBack) {
+                if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) {
+                    return this;
+                }
+                var result = new Promise();
 
+                this.$$state.pending = this.$$state.pending || [];
+                this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]);
+                if (this.$$state.status > 0) scheduleProcessQueue(this.$$state);
 
-                     // Using a listener function
-                     var food;
-                     scope.foodCounter = 0;
-                     expect(scope.foodCounter).toEqual(0);
-                     scope.$watch(
-                     // This is the listener function
-                     function() { return food; },
-                     // This is the change handler
-                     function(newValue, oldValue) {
-               if ( newValue !== oldValue ) {
-                 // Only increment the counter if the value changed
-                 scope.foodCounter = scope.foodCounter + 1;
-               }
-             }
-                     );
-                     // No digest has been run so the counter will be zero
-                     expect(scope.foodCounter).toEqual(0);
-
-                     // Run the digest but since food has not changed count will still be zero
-                     scope.$digest();
-                     expect(scope.foodCounter).toEqual(0);
+                return result;
+            },
 
-                     // Update food and run digest.  Now the counter will increment
-                     food = 'cheeseburger';
-                     scope.$digest();
-                     expect(scope.foodCounter).toEqual(1);
+            'catch': function(callback) {
+                return this.then(null, callback);
+            },
 
-                     * ```
-                     *
-                     *
-                     *
-                     * @param {(function()|string)} watchExpression Expression that is evaluated on each
-                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
-                     *    a call to the `listener`.
-                     *
-                     *    - `string`: Evaluated as {@link guide/expression expression}
-                     *    - `function(scope)`: called with current `scope` as a parameter.
-                     * @param {(function()|string)=} listener Callback called whenever the return value of
-                     *   the `watchExpression` changes.
-                     *
-                     *    - `string`: Evaluated as {@link guide/expression expression}
-                     *    - `function(newValue, oldValue, scope)`: called with current and previous values as
-                     *      parameters.
-                     *
-                     * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of
-                     *     comparing for reference equality.
-                     * @returns {function()} Returns a deregistration function for this listener.
-                     */
-                    $watch: function(watchExp, listener, objectEquality) {
-                        var scope = this,
-                            get = compileToFn(watchExp, 'watch'),
-                            array = scope.$$watchers,
-                            watcher = {
-                                fn: listener,
-                                last: initWatchVal,
-                                get: get,
-                                exp: watchExp,
-                                eq: !!objectEquality
-                            };
+            'finally': function(callback, progressBack) {
+                return this.then(function(value) {
+                    return handleCallback(value, resolve, callback);
+                }, function(error) {
+                    return handleCallback(error, reject, callback);
+                }, progressBack);
+            }
+        });
 
-                        lastDirtyWatch = null;
+        function processQueue(state) {
+            var fn, promise, pending;
 
-                        // in the case user pass string, we need to compile it, do we really need this ?
-                        if (!isFunction(listener)) {
-                            var listenFn = compileToFn(listener || noop, 'listener');
-                            watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);};
+            pending = state.pending;
+            state.processScheduled = false;
+            state.pending = undefined;
+            try {
+                for (var i = 0, ii = pending.length; i < ii; ++i) {
+                    markQStateExceptionHandled(state);
+                    promise = pending[i][0];
+                    fn = pending[i][state.status];
+                    try {
+                        if (isFunction(fn)) {
+                            resolvePromise(promise, fn(state.value));
+                        } else if (state.status === 1) {
+                            resolvePromise(promise, state.value);
+                        } else {
+                            rejectPromise(promise, state.value);
                         }
-
-                        if (typeof watchExp == 'string' && get.constant) {
-                            var originalFn = watcher.fn;
-                            watcher.fn = function(newVal, oldVal, scope) {
-                                originalFn.call(this, newVal, oldVal, scope);
-                                arrayRemove(array, watcher);
-                            };
+                    } catch (e) {
+                        rejectPromise(promise, e);
+                        // This error is explicitly marked for being passed to the $exceptionHandler
+                        if (e && e.$$passToExceptionHandler === true) {
+                            exceptionHandler(e);
                         }
+                    }
+                }
+            } finally {
+                --queueSize;
+                if (errorOnUnhandledRejections && queueSize === 0) {
+                    nextTick(processChecks);
+                }
+            }
+        }
 
-                        if (!array) {
-                            array = scope.$$watchers = [];
-                        }
-                        // we use unshift since we use a while loop in $digest for speed.
-                        // the while loop reads in reverse order.
-                        array.unshift(watcher);
+        function processChecks() {
+            // eslint-disable-next-line no-unmodified-loop-condition
+            while (!queueSize && checkQueue.length) {
+                var toCheck = checkQueue.shift();
+                if (!isStateExceptionHandled(toCheck)) {
+                    markQStateExceptionHandled(toCheck);
+                    var errorMessage = 'Possibly unhandled rejection: ' + toDebugString(toCheck.value);
+                    if (isError(toCheck.value)) {
+                        exceptionHandler(toCheck.value, errorMessage);
+                    } else {
+                        exceptionHandler(errorMessage);
+                    }
+                }
+            }
+        }
 
-                        return function() {
-                            arrayRemove(array, watcher);
-                            lastDirtyWatch = null;
-                        };
-                    },
+        function scheduleProcessQueue(state) {
+            if (errorOnUnhandledRejections && !state.pending && state.status === 2 && !isStateExceptionHandled(state)) {
+                if (queueSize === 0 && checkQueue.length === 0) {
+                    nextTick(processChecks);
+                }
+                checkQueue.push(state);
+            }
+            if (state.processScheduled || !state.pending) return;
+            state.processScheduled = true;
+            ++queueSize;
+            nextTick(function() { processQueue(state); });
+        }
 
+        function resolvePromise(promise, val) {
+            if (promise.$$state.status) return;
+            if (val === promise) {
+                $$reject(promise, $qMinErr(
+                    'qcycle',
+                    'Expected promise to be resolved with value other than itself \'{0}\'',
+                    val));
+            } else {
+                $$resolve(promise, val);
+            }
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$watchCollection
-                     * @function
-                     *
-                     * @description
-                     * Shallow watches the properties of an object and fires whenever any of the properties change
-                     * (for arrays, this implies watching the array items; for object maps, this implies watching
-                     * the properties). If a change is detected, the `listener` callback is fired.
-                     *
-                     * - The `obj` collection is observed via standard $watch operation and is examined on every
-                     *   call to $digest() to see if any items have been added, removed, or moved.
-                     * - The `listener` is called whenever anything within the `obj` has changed. Examples include
-                     *   adding, removing, and moving items belonging to an object or array.
-                     *
-                     *
-                     * # Example
-                     * ```js
-                     $scope.names = ['igor', 'matias', 'misko', 'james'];
-                     $scope.dataCount = 4;
+        }
 
-                     $scope.$watchCollection('names', function(newNames, oldNames) {
-            $scope.dataCount = newNames.length;
-          });
+        function $$resolve(promise, val) {
+            var then;
+            var done = false;
+            try {
+                if (isObject(val) || isFunction(val)) then = val.then;
+                if (isFunction(then)) {
+                    promise.$$state.status = -1;
+                    then.call(val, doResolve, doReject, doNotify);
+                } else {
+                    promise.$$state.value = val;
+                    promise.$$state.status = 1;
+                    scheduleProcessQueue(promise.$$state);
+                }
+            } catch (e) {
+                doReject(e);
+            }
 
-                     expect($scope.dataCount).toEqual(4);
-                     $scope.$digest();
+            function doResolve(val) {
+                if (done) return;
+                done = true;
+                $$resolve(promise, val);
+            }
+            function doReject(val) {
+                if (done) return;
+                done = true;
+                $$reject(promise, val);
+            }
+            function doNotify(progress) {
+                notifyPromise(promise, progress);
+            }
+        }
 
-                     //still at 4 ... no changes
-                     expect($scope.dataCount).toEqual(4);
+        function rejectPromise(promise, reason) {
+            if (promise.$$state.status) return;
+            $$reject(promise, reason);
+        }
 
-                     $scope.names.pop();
-                     $scope.$digest();
+        function $$reject(promise, reason) {
+            promise.$$state.value = reason;
+            promise.$$state.status = 2;
+            scheduleProcessQueue(promise.$$state);
+        }
 
-                     //now there's been a change
-                     expect($scope.dataCount).toEqual(3);
-                     * ```
-                     *
-                     *
-                     * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
-                     *    expression value should evaluate to an object or an array which is observed on each
-                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
-                     *    collection will trigger a call to the `listener`.
-                     *
-                     * @param {function(newCollection, oldCollection, scope)} listener a callback function called
-                     *    when a change is detected.
-                     *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
-                     *    - The `oldCollection` object is a copy of the former collection data.
-                     *      Due to performance considerations, the`oldCollection` value is computed only if the
-                     *      `listener` function declares two or more arguments.
-                     *    - The `scope` argument refers to the current scope.
-                     *
-                     * @returns {function()} Returns a de-registration function for this listener. When the
-                     *    de-registration function is executed, the internal watch operation is terminated.
-                     */
-                    $watchCollection: function(obj, listener) {
-                        var self = this;
-                        // the current value, updated on each dirty-check run
-                        var newValue;
-                        // a shallow copy of the newValue from the last dirty-check run,
-                        // updated to match newValue during dirty-check run
-                        var oldValue;
-                        // a shallow copy of the newValue from when the last change happened
-                        var veryOldValue;
-                        // only track veryOldValue if the listener is asking for it
-                        var trackVeryOldValue = (listener.length > 1);
-                        var changeDetected = 0;
-                        var objGetter = $parse(obj);
-                        var internalArray = [];
-                        var internalObject = {};
-                        var initRun = true;
-                        var oldLength = 0;
+        function notifyPromise(promise, progress) {
+            var callbacks = promise.$$state.pending;
 
-                        function $watchCollectionWatch() {
-                            newValue = objGetter(self);
-                            var newLength, key;
+            if ((promise.$$state.status <= 0) && callbacks && callbacks.length) {
+                nextTick(function() {
+                    var callback, result;
+                    for (var i = 0, ii = callbacks.length; i < ii; i++) {
+                        result = callbacks[i][0];
+                        callback = callbacks[i][3];
+                        try {
+                            notifyPromise(result, isFunction(callback) ? callback(progress) : progress);
+                        } catch (e) {
+                            exceptionHandler(e);
+                        }
+                    }
+                });
+            }
+        }
 
-                            if (!isObject(newValue)) { // if primitive
-                                if (oldValue !== newValue) {
-                                    oldValue = newValue;
-                                    changeDetected++;
-                                }
-                            } else if (isArrayLike(newValue)) {
-                                if (oldValue !== internalArray) {
-                                    // we are transitioning from something which was not an array into array.
-                                    oldValue = internalArray;
-                                    oldLength = oldValue.length = 0;
-                                    changeDetected++;
-                                }
+        /**
+         * @ngdoc method
+         * @name $q#reject
+         * @kind function
+         *
+         * @description
+         * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
+         * used to forward rejection in a chain of promises. If you are dealing with the last promise in
+         * a promise chain, you don't need to worry about it.
+         *
+         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
+         * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
+         * a promise error callback and you want to forward the error to the promise derived from the
+         * current promise, you have to "rethrow" the error by returning a rejection constructed via
+         * `reject`.
+         *
+         * ```js
+         *   promiseB = promiseA.then(function(result) {
+         *     // success: do something and resolve promiseB
+         *     //          with the old or a new result
+         *     return result;
+         *   }, function(reason) {
+         *     // error: handle the error if possible and
+         *     //        resolve promiseB with newPromiseOrValue,
+         *     //        otherwise forward the rejection to promiseB
+         *     if (canHandle(reason)) {
+         *      // handle the error and recover
+         *      return newPromiseOrValue;
+         *     }
+         *     return $q.reject(reason);
+         *   });
+         * ```
+         *
+         * @param {*} reason Constant, message, exception or an object representing the rejection reason.
+         * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
+         */
+        function reject(reason) {
+            var result = new Promise();
+            rejectPromise(result, reason);
+            return result;
+        }
 
-                                newLength = newValue.length;
+        function handleCallback(value, resolver, callback) {
+            var callbackOutput = null;
+            try {
+                if (isFunction(callback)) callbackOutput = callback();
+            } catch (e) {
+                return reject(e);
+            }
+            if (isPromiseLike(callbackOutput)) {
+                return callbackOutput.then(function() {
+                    return resolver(value);
+                }, reject);
+            } else {
+                return resolver(value);
+            }
+        }
 
-                                if (oldLength !== newLength) {
-                                    // if lengths do not match we need to trigger change notification
-                                    changeDetected++;
-                                    oldValue.length = oldLength = newLength;
-                                }
-                                // copy the items to oldValue and look for changes.
-                                for (var i = 0; i < newLength; i++) {
-                                    var bothNaN = (oldValue[i] !== oldValue[i]) &&
-                                        (newValue[i] !== newValue[i]);
-                                    if (!bothNaN && (oldValue[i] !== newValue[i])) {
-                                        changeDetected++;
-                                        oldValue[i] = newValue[i];
-                                    }
-                                }
-                            } else {
-                                if (oldValue !== internalObject) {
-                                    // we are transitioning from something which was not an object into object.
-                                    oldValue = internalObject = {};
-                                    oldLength = 0;
-                                    changeDetected++;
-                                }
-                                // copy the items to oldValue and look for changes.
-                                newLength = 0;
-                                for (key in newValue) {
-                                    if (newValue.hasOwnProperty(key)) {
-                                        newLength++;
-                                        if (oldValue.hasOwnProperty(key)) {
-                                            if (oldValue[key] !== newValue[key]) {
-                                                changeDetected++;
-                                                oldValue[key] = newValue[key];
-                                            }
-                                        } else {
-                                            oldLength++;
-                                            oldValue[key] = newValue[key];
-                                            changeDetected++;
-                                        }
-                                    }
-                                }
-                                if (oldLength > newLength) {
-                                    // we used to have more keys, need to find them and destroy them.
-                                    changeDetected++;
-                                    for(key in oldValue) {
-                                        if (oldValue.hasOwnProperty(key) && !newValue.hasOwnProperty(key)) {
-                                            oldLength--;
-                                            delete oldValue[key];
-                                        }
-                                    }
-                                }
-                            }
-                            return changeDetected;
-                        }
+        /**
+         * @ngdoc method
+         * @name $q#when
+         * @kind function
+         *
+         * @description
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
+         * This is useful when you are dealing with an object that might or might not be a promise, or if
+         * the promise comes from a source that can't be trusted.
+         *
+         * @param {*} value Value or a promise
+         * @param {Function=} successCallback
+         * @param {Function=} errorCallback
+         * @param {Function=} progressCallback
+         * @returns {Promise} Returns a promise of the passed value or promise
+         */
 
-                        function $watchCollectionAction() {
-                            if (initRun) {
-                                initRun = false;
-                                listener(newValue, newValue, self);
-                            } else {
-                                listener(newValue, veryOldValue, self);
-                            }
-
-                            // make a copy for the next time a collection is changed
-                            if (trackVeryOldValue) {
-                                if (!isObject(newValue)) {
-                                    //primitive
-                                    veryOldValue = newValue;
-                                } else if (isArrayLike(newValue)) {
-                                    veryOldValue = new Array(newValue.length);
-                                    for (var i = 0; i < newValue.length; i++) {
-                                        veryOldValue[i] = newValue[i];
-                                    }
-                                } else { // if object
-                                    veryOldValue = {};
-                                    for (var key in newValue) {
-                                        if (hasOwnProperty.call(newValue, key)) {
-                                            veryOldValue[key] = newValue[key];
-                                        }
-                                    }
-                                }
-                            }
-                        }
 
-                        return this.$watch($watchCollectionWatch, $watchCollectionAction);
-                    },
-
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$digest
-                     * @function
-                     *
-                     * @description
-                     * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
-                     * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
-                     * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
-                     * until no more listeners are firing. This means that it is possible to get into an infinite
-                     * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
-                     * iterations exceeds 10.
-                     *
-                     * Usually, you don't call `$digest()` directly in
-                     * {@link ng.directive:ngController controllers} or in
-                     * {@link ng.$compileProvider#directive directives}.
-                     * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
-                     * a {@link ng.$compileProvider#directive directives}), which will force a `$digest()`.
-                     *
-                     * If you want to be notified whenever `$digest()` is called,
-                     * you can register a `watchExpression` function with
-                     * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
-                     *
-                     * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
-                     *
-                     * # Example
-                     * ```js
-                     var scope = ...;
-                     scope.name = 'misko';
-                     scope.counter = 0;
+        function when(value, callback, errback, progressBack) {
+            var result = new Promise();
+            resolvePromise(result, value);
+            return result.then(callback, errback, progressBack);
+        }
 
-                     expect(scope.counter).toEqual(0);
-                     scope.$watch('name', function(newValue, oldValue) {
-             scope.counter = scope.counter + 1;
-           });
-                     expect(scope.counter).toEqual(0);
+        /**
+         * @ngdoc method
+         * @name $q#resolve
+         * @kind function
+         *
+         * @description
+         * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
+         *
+         * @param {*} value Value or a promise
+         * @param {Function=} successCallback
+         * @param {Function=} errorCallback
+         * @param {Function=} progressCallback
+         * @returns {Promise} Returns a promise of the passed value or promise
+         */
+        var resolve = when;
 
-                     scope.$digest();
-                     // no variable change
-                     expect(scope.counter).toEqual(0);
+        /**
+         * @ngdoc method
+         * @name $q#all
+         * @kind function
+         *
+         * @description
+         * Combines multiple promises into a single promise that is resolved when all of the input
+         * promises are resolved.
+         *
+         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+         * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
+         *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
+         *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
+         *   with the same rejection value.
+         */
 
-                     scope.name = 'adam';
-                     scope.$digest();
-                     expect(scope.counter).toEqual(1);
-                     * ```
-                     *
-                     */
-                    $digest: function() {
-                        var watch, value, last,
-                            watchers,
-                            asyncQueue = this.$$asyncQueue,
-                            postDigestQueue = this.$$postDigestQueue,
-                            length,
-                            dirty, ttl = TTL,
-                            next, current, target = this,
-                            watchLog = [],
-                            logIdx, logMsg, asyncTask;
+        function all(promises) {
+            var result = new Promise(),
+                counter = 0,
+                results = isArray(promises) ? [] : {};
 
-                        beginPhase('$digest');
+            forEach(promises, function(promise, key) {
+                counter++;
+                when(promise).then(function(value) {
+                    results[key] = value;
+                    if (!(--counter)) resolvePromise(result, results);
+                }, function(reason) {
+                    rejectPromise(result, reason);
+                });
+            });
 
-                        lastDirtyWatch = null;
+            if (counter === 0) {
+                resolvePromise(result, results);
+            }
 
-                        do { // "while dirty" loop
-                            dirty = false;
-                            current = target;
+            return result;
+        }
 
-                            while(asyncQueue.length) {
-                                try {
-                                    asyncTask = asyncQueue.shift();
-                                    asyncTask.scope.$eval(asyncTask.expression);
-                                } catch (e) {
-                                    clearPhase();
-                                    $exceptionHandler(e);
-                                }
-                                lastDirtyWatch = null;
-                            }
+        /**
+         * @ngdoc method
+         * @name $q#race
+         * @kind function
+         *
+         * @description
+         * Returns a promise that resolves or rejects as soon as one of those promises
+         * resolves or rejects, with the value or reason from that promise.
+         *
+         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+         * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
+         * resolves or rejects, with the value or reason from that promise.
+         */
 
-                            traverseScopesLoop:
-                                do { // "traverse the scopes" loop
-                                    if ((watchers = current.$$watchers)) {
-                                        // process our watches
-                                        length = watchers.length;
-                                        while (length--) {
-                                            try {
-                                                watch = watchers[length];
-                                                // Most common watches are on primitives, in which case we can short
-                                                // circuit it with === operator, only when === fails do we use .equals
-                                                if (watch) {
-                                                    if ((value = watch.get(current)) !== (last = watch.last) &&
-                                                        !(watch.eq
-                                                            ? equals(value, last)
-                                                            : (typeof value == 'number' && typeof last == 'number'
-                                                        && isNaN(value) && isNaN(last)))) {
-                                                        dirty = true;
-                                                        lastDirtyWatch = watch;
-                                                        watch.last = watch.eq ? copy(value) : value;
-                                                        watch.fn(value, ((last === initWatchVal) ? value : last), current);
-                                                        if (ttl < 5) {
-                                                            logIdx = 4 - ttl;
-                                                            if (!watchLog[logIdx]) watchLog[logIdx] = [];
-                                                            logMsg = (isFunction(watch.exp))
-                                                                ? 'fn: ' + (watch.exp.name || watch.exp.toString())
-                                                                : watch.exp;
-                                                            logMsg += '; newVal: ' + toJson(value) + '; oldVal: ' + toJson(last);
-                                                            watchLog[logIdx].push(logMsg);
-                                                        }
-                                                    } else if (watch === lastDirtyWatch) {
-                                                        // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
-                                                        // have already been tested.
-                                                        dirty = false;
-                                                        break traverseScopesLoop;
-                                                    }
-                                                }
-                                            } catch (e) {
-                                                clearPhase();
-                                                $exceptionHandler(e);
-                                            }
-                                        }
-                                    }
+        function race(promises) {
+            var deferred = defer();
 
-                                    // Insanity Warning: scope depth-first traversal
-                                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
-                                    // this piece should be kept in sync with the traversal in $broadcast
-                                    if (!(next = (current.$$childHead ||
-                                        (current !== target && current.$$nextSibling)))) {
-                                        while(current !== target && !(next = current.$$nextSibling)) {
-                                            current = current.$parent;
-                                        }
-                                    }
-                                } while ((current = next));
+            forEach(promises, function(promise) {
+                when(promise).then(deferred.resolve, deferred.reject);
+            });
 
-                            // `break traverseScopesLoop;` takes us to here
+            return deferred.promise;
+        }
 
-                            if((dirty || asyncQueue.length) && !(ttl--)) {
-                                clearPhase();
-                                throw $rootScopeMinErr('infdig',
-                                    '{0} $digest() iterations reached. Aborting!\n' +
-                                    'Watchers fired in the last 5 iterations: {1}',
-                                    TTL, toJson(watchLog));
-                            }
+        function $Q(resolver) {
+            if (!isFunction(resolver)) {
+                throw $qMinErr('norslvr', 'Expected resolverFn, got \'{0}\'', resolver);
+            }
 
-                        } while (dirty || asyncQueue.length);
+            var promise = new Promise();
 
-                        clearPhase();
+            function resolveFn(value) {
+                resolvePromise(promise, value);
+            }
 
-                        while(postDigestQueue.length) {
-                            try {
-                                postDigestQueue.shift()();
-                            } catch (e) {
-                                $exceptionHandler(e);
-                            }
-                        }
-                    },
+            function rejectFn(reason) {
+                rejectPromise(promise, reason);
+            }
 
+            resolver(resolveFn, rejectFn);
 
-                    /**
-                     * @ngdoc event
-                     * @name $rootScope.Scope#$destroy
-                     * @eventType broadcast on scope being destroyed
-                     *
-                     * @description
-                     * Broadcasted when a scope and its children are being destroyed.
-                     *
-                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
-                     * clean up DOM bindings before an element is removed from the DOM.
-                     */
+            return promise;
+        }
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$destroy
-                     * @function
-                     *
-                     * @description
-                     * Removes the current scope (and all of its children) from the parent scope. Removal implies
-                     * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
-                     * propagate to the current scope and its children. Removal also implies that the current
-                     * scope is eligible for garbage collection.
-                     *
-                     * The `$destroy()` is usually used by directives such as
-                     * {@link ng.directive:ngRepeat ngRepeat} for managing the
-                     * unrolling of the loop.
-                     *
-                     * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
-                     * Application code can register a `$destroy` event handler that will give it a chance to
-                     * perform any necessary cleanup.
-                     *
-                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
-                     * clean up DOM bindings before an element is removed from the DOM.
-                     */
-                    $destroy: function() {
-                        // we can't destroy the root scope or a scope that has been already destroyed
-                        if (this.$$destroyed) return;
-                        var parent = this.$parent;
+        // Let's make the instanceof operator work for promises, so that
+        // `new $q(fn) instanceof $q` would evaluate to true.
+        $Q.prototype = Promise.prototype;
 
-                        this.$broadcast('$destroy');
-                        this.$$destroyed = true;
-                        if (this === $rootScope) return;
+        $Q.defer = defer;
+        $Q.reject = reject;
+        $Q.when = when;
+        $Q.resolve = resolve;
+        $Q.all = all;
+        $Q.race = race;
 
-                        forEach(this.$$listenerCount, bind(null, decrementListenerCount, this));
+        return $Q;
+    }
 
-                        // sever all the references to parent scopes (after this cleanup, the current scope should
-                        // not be retained by any of our references and should be eligible for garbage collection)
-                        if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
-                        if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
-                        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
-                        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
+    function isStateExceptionHandled(state) {
+        return !!state.pur;
+    }
+    function markQStateExceptionHandled(state) {
+        state.pur = true;
+    }
+    function markQExceptionHandled(q) {
+        markQStateExceptionHandled(q.$$state);
+    }
 
+    /** @this */
+    function $$RAFProvider() { //rAF
+        this.$get = ['$window', '$timeout', function($window, $timeout) {
+            var requestAnimationFrame = $window.requestAnimationFrame ||
+                $window.webkitRequestAnimationFrame;
 
-                        // All of the code below is bogus code that works around V8's memory leak via optimized code
-                        // and inline caches.
-                        //
-                        // see:
-                        // - https://code.google.com/p/v8/issues/detail?id=2073#c26
-                        // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
-                        // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+            var cancelAnimationFrame = $window.cancelAnimationFrame ||
+                $window.webkitCancelAnimationFrame ||
+                $window.webkitCancelRequestAnimationFrame;
 
-                        this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead =
-                            this.$$childTail = this.$root = null;
+            var rafSupported = !!requestAnimationFrame;
+            var raf = rafSupported
+                ? function(fn) {
+                    var id = requestAnimationFrame(fn);
+                    return function() {
+                        cancelAnimationFrame(id);
+                    };
+                }
+                : function(fn) {
+                    var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
+                    return function() {
+                        $timeout.cancel(timer);
+                    };
+                };
 
-                        // don't reset these to null in case some async task tries to register a listener/watch/task
-                        this.$$listeners = {};
-                        this.$$watchers = this.$$asyncQueue = this.$$postDigestQueue = [];
+            raf.supported = rafSupported;
 
-                        // prevent NPEs since these methods have references to properties we nulled out
-                        this.$destroy = this.$digest = this.$apply = noop;
-                        this.$on = this.$watch = function() { return noop; };
-                    },
+            return raf;
+        }];
+    }
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$eval
-                     * @function
-                     *
-                     * @description
-                     * Executes the `expression` on the current scope and returns the result. Any exceptions in
-                     * the expression are propagated (uncaught). This is useful when evaluating Angular
-                     * expressions.
-                     *
-                     * # Example
-                     * ```js
-                     var scope = ng.$rootScope.Scope();
-                     scope.a = 1;
-                     scope.b = 2;
+    /**
+     * DESIGN NOTES
+     *
+     * The design decisions behind the scope are heavily favored for speed and memory consumption.
+     *
+     * The typical use of scope is to watch the expressions, which most of the time return the same
+     * value as last time so we optimize the operation.
+     *
+     * Closures construction is expensive in terms of speed as well as memory:
+     *   - No closures, instead use prototypical inheritance for API
+     *   - Internal state needs to be stored on scope directly, which means that private state is
+     *     exposed as $$____ properties
+     *
+     * Loop operations are optimized by using while(count--) { ... }
+     *   - This means that in order to keep the same order of execution as addition we have to add
+     *     items to the array at the beginning (unshift) instead of at the end (push)
+     *
+     * Child scopes are created and removed often
+     *   - Using an array would be slow since inserts in the middle are expensive; so we use linked lists
+     *
+     * There are fewer watches than observers. This is why you don't want the observer to be implemented
+     * in the same way as watch. Watch requires return of the initialization function which is expensive
+     * to construct.
+     */
 
-                     expect(scope.$eval('a+b')).toEqual(3);
-                     expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
-                     * ```
-                     *
-                     * @param {(string|function())=} expression An angular expression to be executed.
-                     *
-                     *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
-                     *    - `function(scope)`: execute the function with the current `scope` parameter.
-                     *
-                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
-                     * @returns {*} The result of evaluating the expression.
-                     */
-                    $eval: function(expr, locals) {
-                        return $parse(expr)(this, locals);
-                    },
 
+    /**
+     * @ngdoc provider
+     * @name $rootScopeProvider
+     * @description
+     *
+     * Provider for the $rootScope service.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $rootScopeProvider#digestTtl
+     * @description
+     *
+     * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
+     * assuming that the model is unstable.
+     *
+     * The current default is 10 iterations.
+     *
+     * In complex applications it's possible that the dependencies between `$watch`s will result in
+     * several digest iterations. However if an application needs more than the default 10 digest
+     * iterations for its model to stabilize then you should investigate what is causing the model to
+     * continuously change during the digest.
+     *
+     * Increasing the TTL could have performance implications, so you should not change it without
+     * proper justification.
+     *
+     * @param {number} limit The number of digest iterations.
+     */
+
+
+    /**
+     * @ngdoc service
+     * @name $rootScope
+     * @this
+     *
+     * @description
+     *
+     * Every application has a single root {@link ng.$rootScope.Scope scope}.
+     * All other scopes are descendant scopes of the root scope. Scopes provide separation
+     * between the model and the view, via a mechanism for watching the model for changes.
+     * They also provide event emission/broadcast and subscription facility. See the
+     * {@link guide/scope developer guide on scopes}.
+     */
+    function $RootScopeProvider() {
+        var TTL = 10;
+        var $rootScopeMinErr = minErr('$rootScope');
+        var lastDirtyWatch = null;
+        var applyAsyncId = null;
+
+        this.digestTtl = function(value) {
+            if (arguments.length) {
+                TTL = value;
+            }
+            return TTL;
+        };
+
+        function createChildScopeClass(parent) {
+            function ChildScope() {
+                this.$$watchers = this.$$nextSibling =
+                    this.$$childHead = this.$$childTail = null;
+                this.$$listeners = {};
+                this.$$listenerCount = {};
+                this.$$watchersCount = 0;
+                this.$id = nextUid();
+                this.$$ChildScope = null;
+            }
+            ChildScope.prototype = parent;
+            return ChildScope;
+        }
+
+        this.$get = ['$exceptionHandler', '$parse', '$browser',
+            function($exceptionHandler, $parse, $browser) {
+
+                function destroyChildScope($event) {
+                    $event.currentScope.$$destroyed = true;
+                }
+
+                function cleanUpScope($scope) {
+
+                    // Support: IE 9 only
+                    if (msie === 9) {
+                        // There is a memory leak in IE9 if all child scopes are not disconnected
+                        // completely when a scope is destroyed. So this code will recurse up through
+                        // all this scopes children
+                        //
+                        // See issue https://github.com/angular/angular.js/issues/10706
+                        if ($scope.$$childHead) {
+                            cleanUpScope($scope.$$childHead);
+                        }
+                        if ($scope.$$nextSibling) {
+                            cleanUpScope($scope.$$nextSibling);
+                        }
+                    }
+
+                    // The code below works around IE9 and V8's memory leaks
+                    //
+                    // See:
+                    // - https://code.google.com/p/v8/issues/detail?id=2073#c26
+                    // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
+                    // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+
+                    $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead =
+                        $scope.$$childTail = $scope.$root = $scope.$$watchers = null;
+                }
+
+                /**
+                 * @ngdoc type
+                 * @name $rootScope.Scope
+                 *
+                 * @description
+                 * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
+                 * {@link auto.$injector $injector}. Child scopes are created using the
+                 * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
+                 * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
+                 * an in-depth introduction and usage examples.
+                 *
+                 *
+                 * ## Inheritance
+                 * A scope can inherit from a parent scope, as in this example:
+                 * ```js
+                 var parent = $rootScope;
+                 var child = parent.$new();
+
+                 parent.salutation = "Hello";
+                 expect(child.salutation).toEqual('Hello');
+
+                 child.salutation = "Welcome";
+                 expect(child.salutation).toEqual('Welcome');
+                 expect(parent.salutation).toEqual('Hello');
+                 * ```
+                 *
+                 * When interacting with `Scope` in tests, additional helper methods are available on the
+                 * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional
+                 * details.
+                 *
+                 *
+                 * @param {Object.<string, function()>=} providers Map of service factory which need to be
+                 *                                       provided for the current scope. Defaults to {@link ng}.
+                 * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
+                 *                              append/override services provided by `providers`. This is handy
+                 *                              when unit-testing and having the need to override a default
+                 *                              service.
+                 * @returns {Object} Newly created scope.
+                 *
+                 */
+                function Scope() {
+                    this.$id = nextUid();
+                    this.$$phase = this.$parent = this.$$watchers =
+                        this.$$nextSibling = this.$$prevSibling =
+                            this.$$childHead = this.$$childTail = null;
+                    this.$root = this;
+                    this.$$destroyed = false;
+                    this.$$listeners = {};
+                    this.$$listenerCount = {};
+                    this.$$watchersCount = 0;
+                    this.$$isolateBindings = null;
+                }
+
+                /**
+                 * @ngdoc property
+                 * @name $rootScope.Scope#$id
+                 *
+                 * @description
+                 * Unique scope ID (monotonically increasing) useful for debugging.
+                 */
+
+                /**
+                 * @ngdoc property
+                 * @name $rootScope.Scope#$parent
+                 *
+                 * @description
+                 * Reference to the parent scope.
+                 */
+
+                /**
+                 * @ngdoc property
+                 * @name $rootScope.Scope#$root
+                 *
+                 * @description
+                 * Reference to the root scope.
+                 */
+
+                Scope.prototype = {
+                    constructor: Scope,
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$evalAsync
-                     * @function
+                     * @name $rootScope.Scope#$new
+                     * @kind function
                      *
                      * @description
-                     * Executes the expression on the current scope at a later point in time.
-                     *
-                     * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
-                     * that:
+                     * Creates a new child {@link ng.$rootScope.Scope scope}.
                      *
-                     *   - it will execute after the function that scheduled the evaluation (preferably before DOM
-                     *     rendering).
-                     *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
-                     *     `expression` execution.
+                     * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
+                     * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
                      *
-                     * Any exceptions from the execution of the expression are forwarded to the
-                     * {@link ng.$exceptionHandler $exceptionHandler} service.
+                     * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
+                     * desired for the scope and its child scopes to be permanently detached from the parent and
+                     * thus stop participating in model change detection and listener notification by invoking.
                      *
-                     * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
-                     * will be scheduled. However, it is encouraged to always call code that changes the model
-                     * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
+                     * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
+                     *         parent scope. The scope is isolated, as it can not see parent scope properties.
+                     *         When creating widgets, it is useful for the widget to not accidentally read parent
+                     *         state.
                      *
-                     * @param {(string|function())=} expression An angular expression to be executed.
+                     * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent`
+                     *                              of the newly created scope. Defaults to `this` scope if not provided.
+                     *                              This is used when creating a transclude scope to correctly place it
+                     *                              in the scope hierarchy while maintaining the correct prototypical
+                     *                              inheritance.
                      *
-                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-                     *    - `function(scope)`: execute the function with the current `scope` parameter.
+                     * @returns {Object} The newly created child scope.
                      *
                      */
-                    $evalAsync: function(expr) {
-                        // if we are outside of an $digest loop and this is the first time we are scheduling async
-                        // task also schedule async auto-flush
-                        if (!$rootScope.$$phase && !$rootScope.$$asyncQueue.length) {
-                            $browser.defer(function() {
-                                if ($rootScope.$$asyncQueue.length) {
-                                    $rootScope.$digest();
-                                }
-                            });
+                    $new: function(isolate, parent) {
+                        var child;
+
+                        parent = parent || this;
+
+                        if (isolate) {
+                            child = new Scope();
+                            child.$root = this.$root;
+                        } else {
+                            // Only create a child scope class if somebody asks for one,
+                            // but cache it to allow the VM to optimize lookups.
+                            if (!this.$$ChildScope) {
+                                this.$$ChildScope = createChildScopeClass(this);
+                            }
+                            child = new this.$$ChildScope();
+                        }
+                        child.$parent = parent;
+                        child.$$prevSibling = parent.$$childTail;
+                        if (parent.$$childHead) {
+                            parent.$$childTail.$$nextSibling = child;
+                            parent.$$childTail = child;
+                        } else {
+                            parent.$$childHead = parent.$$childTail = child;
                         }
 
-                        this.$$asyncQueue.push({scope: this, expression: expr});
-                    },
+                        // When the new scope is not isolated or we inherit from `this`, and
+                        // the parent scope is destroyed, the property `$$destroyed` is inherited
+                        // prototypically. In all other cases, this property needs to be set
+                        // when the parent scope is destroyed.
+                        // The listener needs to be added after the parent is set
+                        if (isolate || parent !== this) child.$on('$destroy', destroyChildScope);
 
-                    $$postDigest : function(fn) {
-                        this.$$postDigestQueue.push(fn);
+                        return child;
                     },
 
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$apply
-                     * @function
+                     * @name $rootScope.Scope#$watch
+                     * @kind function
                      *
                      * @description
-                     * `$apply()` is used to execute an expression in angular from outside of the angular
-                     * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
-                     * Because we are calling into the angular framework we need to perform proper scope life
-                     * cycle of {@link ng.$exceptionHandler exception handling},
-                     * {@link ng.$rootScope.Scope#$digest executing watches}.
-                     *
-                     * ## Life cycle
+                     * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
                      *
-                     * # Pseudo-Code of `$apply()`
-                     * ```js
-                     function $apply(expr) {
-             try {
-               return $eval(expr);
-             } catch (e) {
-               $exceptionHandler(e);
-             } finally {
-               $root.$digest();
-             }
-           }
-                     * ```
+                     * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
+       *   $digest()} and should return the value that will be watched. (`watchExpression` should not change
+                     *   its value when executed multiple times with the same input because it may be executed multiple
+                     *   times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be
+                     *   [idempotent](http://en.wikipedia.org/wiki/Idempotence).)
+                     * - The `listener` is called only when the value from the current `watchExpression` and the
+                     *   previous call to `watchExpression` are not equal (with the exception of the initial run,
+                     *   see below). Inequality is determined according to reference inequality,
+                     *   [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators)
+                     *    via the `!==` Javascript operator, unless `objectEquality == true`
+                     *   (see next point)
+                     * - When `objectEquality == true`, inequality of the `watchExpression` is determined
+                     *   according to the {@link angular.equals} function. To save the value of the object for
+                     *   later comparison, the {@link angular.copy} function is used. This therefore means that
+                     *   watching complex objects will have adverse memory and performance implications.
+                     * - This should not be used to watch for changes in objects that are
+                     *   or contain [File](https://developer.mozilla.org/docs/Web/API/File) objects due to limitations with {@link angular.copy `angular.copy`}.
+                     * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
+                     *   This is achieved by rerunning the watchers until no changes are detected. The rerun
+                     *   iteration limit is 10 to prevent an infinite loop deadlock.
                      *
                      *
-                     * Scope's `$apply()` method transitions through the following stages:
+                     * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
+                     * you can register a `watchExpression` function with no `listener`. (Be prepared for
+                     * multiple calls to your `watchExpression` because it will execute multiple times in a
+                     * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.)
                      *
-                     * 1. The {@link guide/expression expression} is executed using the
-                     *    {@link ng.$rootScope.Scope#$eval $eval()} method.
-                     * 2. Any exceptions from the execution of the expression are forwarded to the
-                     *    {@link ng.$exceptionHandler $exceptionHandler} service.
-                     * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
-                     *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
+                     * After a watcher is registered with the scope, the `listener` fn is called asynchronously
+                     * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
+                     * watcher. In rare cases, this is undesirable because the listener is called when the result
+                     * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
+                     * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
+                     * listener was called due to initialization.
                      *
                      *
-                     * @param {(string|function())=} exp An angular expression to be executed.
                      *
-                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-                     *    - `function(scope)`: execute the function with current `scope` parameter.
-                     *
-                     * @returns {*} The result of evaluating the expression.
-                     */
-                    $apply: function(expr) {
-                        try {
-                            beginPhase('$apply');
-                            return this.$eval(expr);
-                        } catch (e) {
-                            $exceptionHandler(e);
-                        } finally {
-                            clearPhase();
-                            try {
-                                $rootScope.$digest();
-                            } catch (e) {
-                                $exceptionHandler(e);
-                                throw e;
-                            }
-                        }
-                    },
+                     * @example
+                     * ```js
+                     // let's assume that scope was dependency injected as the $rootScope
+                     var scope = $rootScope;
+                     scope.name = 'misko';
+                     scope.counter = 0;
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$on
-                     * @function
+                     expect(scope.counter).toEqual(0);
+                     scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+                     expect(scope.counter).toEqual(0);
+
+                     scope.$digest();
+                     // the listener is always called during the first $digest loop after it was registered
+                     expect(scope.counter).toEqual(1);
+
+                     scope.$digest();
+                     // but now it will not be called unless the value changes
+                     expect(scope.counter).toEqual(1);
+
+                     scope.name = 'adam';
+                     scope.$digest();
+                     expect(scope.counter).toEqual(2);
+
+
+
+                     // Using a function as a watchExpression
+                     var food;
+                     scope.foodCounter = 0;
+                     expect(scope.foodCounter).toEqual(0);
+                     scope.$watch(
+                     // This function returns the value being watched. It is called for each turn of the $digest loop
+                     function() { return food; },
+                     // This is the change listener, called when the value returned from the above function changes
+                     function(newValue, oldValue) {
+               if ( newValue !== oldValue ) {
+                 // Only increment the counter if the value changed
+                 scope.foodCounter = scope.foodCounter + 1;
+               }
+             }
+                     );
+                     // No digest has been run so the counter will be zero
+                     expect(scope.foodCounter).toEqual(0);
+
+                     // Run the digest but since food has not changed count will still be zero
+                     scope.$digest();
+                     expect(scope.foodCounter).toEqual(0);
+
+                     // Update food and run digest.  Now the counter will increment
+                     food = 'cheeseburger';
+                     scope.$digest();
+                     expect(scope.foodCounter).toEqual(1);
+
+                     * ```
                      *
-                     * @description
-                     * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
-                     * discussion of event life cycle.
                      *
-                     * The event listener function format is: `function(event, args...)`. The `event` object
-                     * passed into the listener has the following attributes:
                      *
-                     *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
-                     *     `$broadcast`-ed.
-                     *   - `currentScope` - `{Scope}`: the current scope which is handling the event.
-                     *   - `name` - `{string}`: name of the event.
-                     *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
-                     *     further event propagation (available only for events that were `$emit`-ed).
-                     *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
-                     *     to true.
-                     *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
+                     * @param {(function()|string)} watchExpression Expression that is evaluated on each
+                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
+                     *    a call to the `listener`.
                      *
-                     * @param {string} name Event name to listen on.
-                     * @param {function(event, ...args)} listener Function to call when the event is emitted.
+                     *    - `string`: Evaluated as {@link guide/expression expression}
+                     *    - `function(scope)`: called with current `scope` as a parameter.
+                     * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value
+                     *    of `watchExpression` changes.
+                     *
+                     *    - `newVal` contains the current value of the `watchExpression`
+                     *    - `oldVal` contains the previous value of the `watchExpression`
+                     *    - `scope` refers to the current scope
+                     * @param {boolean=} [objectEquality=false] Compare for object equality using {@link angular.equals} instead of
+                     *     comparing for reference equality.
                      * @returns {function()} Returns a deregistration function for this listener.
                      */
-                    $on: function(name, listener) {
-                        var namedListeners = this.$$listeners[name];
-                        if (!namedListeners) {
-                            this.$$listeners[name] = namedListeners = [];
+                    $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) {
+                        var get = $parse(watchExp);
+                        var fn = isFunction(listener) ? listener : noop;
+
+                        if (get.$$watchDelegate) {
+                            return get.$$watchDelegate(this, fn, objectEquality, get, watchExp);
                         }
-                        namedListeners.push(listener);
+                        var scope = this,
+                            array = scope.$$watchers,
+                            watcher = {
+                                fn: fn,
+                                last: initWatchVal,
+                                get: get,
+                                exp: prettyPrintExpression || watchExp,
+                                eq: !!objectEquality
+                            };
 
-                        var current = this;
-                        do {
-                            if (!current.$$listenerCount[name]) {
-                                current.$$listenerCount[name] = 0;
-                            }
-                            current.$$listenerCount[name]++;
-                        } while ((current = current.$parent));
+                        lastDirtyWatch = null;
 
-                        var self = this;
-                        return function() {
-                            namedListeners[indexOf(namedListeners, listener)] = null;
-                            decrementListenerCount(self, 1, name);
+                        if (!array) {
+                            array = scope.$$watchers = [];
+                            array.$$digestWatchIndex = -1;
+                        }
+                        // we use unshift since we use a while loop in $digest for speed.
+                        // the while loop reads in reverse order.
+                        array.unshift(watcher);
+                        array.$$digestWatchIndex++;
+                        incrementWatchersCount(this, 1);
+
+                        return function deregisterWatch() {
+                            var index = arrayRemove(array, watcher);
+                            if (index >= 0) {
+                                incrementWatchersCount(scope, -1);
+                                if (index < array.$$digestWatchIndex) {
+                                    array.$$digestWatchIndex--;
+                                }
+                            }
+                            lastDirtyWatch = null;
                         };
                     },
 
-
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$emit
-                     * @function
+                     * @name $rootScope.Scope#$watchGroup
+                     * @kind function
                      *
                      * @description
-                     * Dispatches an event `name` upwards through the scope hierarchy notifying the
-                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`.
+                     * If any one expression in the collection changes the `listener` is executed.
                      *
-                     * The event life cycle starts at the scope on which `$emit` was called. All
-                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
-                     * notified. Afterwards, the event traverses upwards toward the root scope and calls all
-                     * registered listeners along the way. The event will stop propagating if one of the listeners
-                     * cancels it.
+                     * - The items in the `watchExpressions` array are observed via the standard `$watch` operation. Their return
+                     *   values are examined for changes on every call to `$digest`.
+                     * - The `listener` is called whenever any expression in the `watchExpressions` array changes.
                      *
-                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
-                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+                     * `$watchGroup` is more performant than watching each expression individually, and should be
+                     * used when the listener does not need to know which expression has changed.
+                     * If the listener needs to know which expression has changed,
+                     * {@link ng.$rootScope.Scope#$watch $watch()} or
+                     * {@link ng.$rootScope.Scope#$watchCollection $watchCollection()} should be used.
                      *
-                     * @param {string} name Event name to emit.
-                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
-                     * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
+                     * @param {Array.<string|Function(scope)>} watchExpressions Array of expressions that will be individually
+                     * watched using {@link ng.$rootScope.Scope#$watch $watch()}
+                     *
+                     * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any
+                     *    expression in `watchExpressions` changes
+                     *    The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching
+                     *    those of `watchExpression`
+                     *    and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching
+                     *    those of `watchExpression`.
+                     *
+                     *    Note that `newValues` and `oldValues` reflect the differences in each **individual**
+                     *    expression, and not the difference of the values between each call of the listener.
+                     *    That means the difference between `newValues` and `oldValues` cannot be used to determine
+                     *    which expression has changed / remained stable:
+                     *
+                     *    ```js
+                     *
+                     *    $scope.$watchGroup(['v1', 'v2'], function(newValues, oldValues) {
+                     *      console.log(newValues, oldValues);
+                     *    });
+                     *
+                     *    // newValues, oldValues initially
+                     *    // [undefined, undefined], [undefined, undefined]
+                     *
+                     *    $scope.v1 = 'a';
+                     *    $scope.v2 = 'a';
+                     *
+                     *    // ['a', 'a'], [undefined, undefined]
+                     *
+                     *    $scope.v2 = 'b'
+                     *
+                     *    // v1 hasn't changed since it became `'a'`, therefore its oldValue is still `undefined`
+                     *    // ['a', 'b'], [undefined, 'a']
+                     *
+                     *    ```
+                     *
+                     *    The `scope` refers to the current scope.
+                     * @returns {function()} Returns a de-registration function for all listeners.
                      */
-                    $emit: function(name, args) {
-                        var empty = [],
-                            namedListeners,
-                            scope = this,
-                            stopPropagation = false,
-                            event = {
-                                name: name,
-                                targetScope: scope,
-                                stopPropagation: function() {stopPropagation = true;},
-                                preventDefault: function() {
-                                    event.defaultPrevented = true;
-                                },
-                                defaultPrevented: false
-                            },
-                            listenerArgs = concat([event], arguments, 1),
-                            i, length;
+                    $watchGroup: function(watchExpressions, listener) {
+                        var oldValues = new Array(watchExpressions.length);
+                        var newValues = new Array(watchExpressions.length);
+                        var deregisterFns = [];
+                        var self = this;
+                        var changeReactionScheduled = false;
+                        var firstRun = true;
+
+                        if (!watchExpressions.length) {
+                            // No expressions means we call the listener ASAP
+                            var shouldCall = true;
+                            self.$evalAsync(function() {
+                                if (shouldCall) listener(newValues, newValues, self);
+                            });
+                            return function deregisterWatchGroup() {
+                                shouldCall = false;
+                            };
+                        }
 
-                        do {
-                            namedListeners = scope.$$listeners[name] || empty;
-                            event.currentScope = scope;
-                            for (i=0, length=namedListeners.length; i<length; i++) {
+                        if (watchExpressions.length === 1) {
+                            // Special case size of one
+                            return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) {
+                                newValues[0] = value;
+                                oldValues[0] = oldValue;
+                                listener(newValues, (value === oldValue) ? newValues : oldValues, scope);
+                            });
+                        }
 
-                                // if listeners were deregistered, defragment the array
-                                if (!namedListeners[i]) {
-                                    namedListeners.splice(i, 1);
-                                    i--;
-                                    length--;
-                                    continue;
-                                }
-                                try {
-                                    //allow all listeners attached to the current scope to run
-                                    namedListeners[i].apply(null, listenerArgs);
-                                } catch (e) {
-                                    $exceptionHandler(e);
+                        forEach(watchExpressions, function(expr, i) {
+                            var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) {
+                                newValues[i] = value;
+                                oldValues[i] = oldValue;
+                                if (!changeReactionScheduled) {
+                                    changeReactionScheduled = true;
+                                    self.$evalAsync(watchGroupAction);
                                 }
+                            });
+                            deregisterFns.push(unwatchFn);
+                        });
+
+                        function watchGroupAction() {
+                            changeReactionScheduled = false;
+
+                            if (firstRun) {
+                                firstRun = false;
+                                listener(newValues, newValues, self);
+                            } else {
+                                listener(newValues, oldValues, self);
                             }
-                            //if any listener on the current scope stops propagation, prevent bubbling
-                            if (stopPropagation) return event;
-                            //traverse upwards
-                            scope = scope.$parent;
-                        } while (scope);
+                        }
 
-                        return event;
+                        return function deregisterWatchGroup() {
+                            while (deregisterFns.length) {
+                                deregisterFns.shift()();
+                            }
+                        };
                     },
 
 
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$broadcast
-                     * @function
+                     * @name $rootScope.Scope#$watchCollection
+                     * @kind function
                      *
                      * @description
-                     * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
-                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     * Shallow watches the properties of an object and fires whenever any of the properties change
+                     * (for arrays, this implies watching the array items; for object maps, this implies watching
+                     * the properties). If a change is detected, the `listener` callback is fired.
                      *
-                     * The event life cycle starts at the scope on which `$broadcast` was called. All
-                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
-                     * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
-                     * scope and calls all registered listeners along the way. The event cannot be canceled.
+                     * - The `obj` collection is observed via standard $watch operation and is examined on every
+                     *   call to $digest() to see if any items have been added, removed, or moved.
+                     * - The `listener` is called whenever anything within the `obj` has changed. Examples include
+                     *   adding, removing, and moving items belonging to an object or array.
                      *
-                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
-                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
                      *
-                     * @param {string} name Event name to broadcast.
-                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
-                     * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
-                     */
-                    $broadcast: function(name, args) {
-                        console.debug(name);
-                        var target = this,
-                            current = target,
-                            next = target,
-                            event = {
-                                name: name,
-                                targetScope: target,
-                                preventDefault: function() {
-                                    event.defaultPrevented = true;
-                                },
-                                defaultPrevented: false
-                            },
-                            listenerArgs = concat([event], arguments, 1),
-                            listeners, i, length;
+                     * @example
+                     * ```js
+                     $scope.names = ['igor', 'matias', 'misko', 'james'];
+                     $scope.dataCount = 4;
 
-                        //down while you can, then up and next sibling or up and next sibling until back at root
-                        while ((current = next)) {
-                            event.currentScope = current;
-                            listeners = current.$$listeners[name] || [];
-                            for (i=0, length = listeners.length; i<length; i++) {
-                                // if listeners were deregistered, defragment the array
-                                if (!listeners[i]) {
-                                    listeners.splice(i, 1);
-                                    i--;
-                                    length--;
-                                    continue;
-                                }
+                     $scope.$watchCollection('names', function(newNames, oldNames) {
+            $scope.dataCount = newNames.length;
+          });
 
-                                try {
-                                    listeners[i].apply(null, listenerArgs);
-                                } catch(e) {
-                                    $exceptionHandler(e);
-                                }
-                            }
+                     expect($scope.dataCount).toEqual(4);
+                     $scope.$digest();
 
-                            // Insanity Warning: scope depth-first traversal
-                            // yes, this code is a bit crazy, but it works and we have tests to prove it!
-                            // this piece should be kept in sync with the traversal in $digest
-                            // (though it differs due to having the extra check for $$listenerCount)
-                            if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
-                                (current !== target && current.$$nextSibling)))) {
-                                while(current !== target && !(next = current.$$nextSibling)) {
-                                    current = current.$parent;
-                                }
-                            }
-                        }
+                     //still at 4 ... no changes
+                     expect($scope.dataCount).toEqual(4);
 
-                        return event;
-                    }
-                };
+                     $scope.names.pop();
+                     $scope.$digest();
 
-                var $rootScope = new Scope();
+                     //now there's been a change
+                     expect($scope.dataCount).toEqual(3);
+                     * ```
+                     *
+                     *
+                     * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
+                     *    expression value should evaluate to an object or an array which is observed on each
+                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
+                     *    collection will trigger a call to the `listener`.
+                     *
+                     * @param {function(newCollection, oldCollection, scope)} listener a callback function called
+                     *    when a change is detected.
+                     *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
+                     *    - The `oldCollection` object is a copy of the former collection data.
+                     *      Due to performance considerations, the`oldCollection` value is computed only if the
+                     *      `listener` function declares two or more arguments.
+                     *    - The `scope` argument refers to the current scope.
+                     *
+                     * @returns {function()} Returns a de-registration function for this listener. When the
+                     *    de-registration function is executed, the internal watch operation is terminated.
+                     */
+                    $watchCollection: function(obj, listener) {
+                        $watchCollectionInterceptor.$stateful = true;
 
-                return $rootScope;
+                        var self = this;
+                        // the current value, updated on each dirty-check run
+                        var newValue;
+                        // a shallow copy of the newValue from the last dirty-check run,
+                        // updated to match newValue during dirty-check run
+                        var oldValue;
+                        // a shallow copy of the newValue from when the last change happened
+                        var veryOldValue;
+                        // only track veryOldValue if the listener is asking for it
+                        var trackVeryOldValue = (listener.length > 1);
+                        var changeDetected = 0;
+                        var changeDetector = $parse(obj, $watchCollectionInterceptor);
+                        var internalArray = [];
+                        var internalObject = {};
+                        var initRun = true;
+                        var oldLength = 0;
 
+                        function $watchCollectionInterceptor(_value) {
+                            newValue = _value;
+                            var newLength, key, bothNaN, newItem, oldItem;
 
-                function beginPhase(phase) {
-                    if ($rootScope.$$phase) {
-                        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
-                    }
+                            // If the new value is undefined, then return undefined as the watch may be a one-time watch
+                            if (isUndefined(newValue)) return;
 
-                    $rootScope.$$phase = phase;
-                }
+                            if (!isObject(newValue)) { // if primitive
+                                if (oldValue !== newValue) {
+                                    oldValue = newValue;
+                                    changeDetected++;
+                                }
+                            } else if (isArrayLike(newValue)) {
+                                if (oldValue !== internalArray) {
+                                    // we are transitioning from something which was not an array into array.
+                                    oldValue = internalArray;
+                                    oldLength = oldValue.length = 0;
+                                    changeDetected++;
+                                }
 
-                function clearPhase() {
-                    $rootScope.$$phase = null;
-                }
+                                newLength = newValue.length;
 
-                function compileToFn(exp, name) {
-                    var fn = $parse(exp);
-                    assertArgFn(fn, name);
-                    return fn;
-                }
+                                if (oldLength !== newLength) {
+                                    // if lengths do not match we need to trigger change notification
+                                    changeDetected++;
+                                    oldValue.length = oldLength = newLength;
+                                }
+                                // copy the items to oldValue and look for changes.
+                                for (var i = 0; i < newLength; i++) {
+                                    oldItem = oldValue[i];
+                                    newItem = newValue[i];
 
-                function decrementListenerCount(current, count, name) {
-                    do {
-                        current.$$listenerCount[name] -= count;
+                                    // eslint-disable-next-line no-self-compare
+                                    bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                                    if (!bothNaN && (oldItem !== newItem)) {
+                                        changeDetected++;
+                                        oldValue[i] = newItem;
+                                    }
+                                }
+                            } else {
+                                if (oldValue !== internalObject) {
+                                    // we are transitioning from something which was not an object into object.
+                                    oldValue = internalObject = {};
+                                    oldLength = 0;
+                                    changeDetected++;
+                                }
+                                // copy the items to oldValue and look for changes.
+                                newLength = 0;
+                                for (key in newValue) {
+                                    if (hasOwnProperty.call(newValue, key)) {
+                                        newLength++;
+                                        newItem = newValue[key];
+                                        oldItem = oldValue[key];
 
-                        if (current.$$listenerCount[name] === 0) {
-                            delete current.$$listenerCount[name];
+                                        if (key in oldValue) {
+                                            // eslint-disable-next-line no-self-compare
+                                            bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                                            if (!bothNaN && (oldItem !== newItem)) {
+                                                changeDetected++;
+                                                oldValue[key] = newItem;
+                                            }
+                                        } else {
+                                            oldLength++;
+                                            oldValue[key] = newItem;
+                                            changeDetected++;
+                                        }
+                                    }
+                                }
+                                if (oldLength > newLength) {
+                                    // we used to have more keys, need to find them and destroy them.
+                                    changeDetected++;
+                                    for (key in oldValue) {
+                                        if (!hasOwnProperty.call(newValue, key)) {
+                                            oldLength--;
+                                            delete oldValue[key];
+                                        }
+                                    }
+                                }
+                            }
+                            return changeDetected;
                         }
-                    } while ((current = current.$parent));
-                }
 
-                /**
-                 * function used as an initial value for watchers.
-                 * because it's unique we can easily tell it apart from other values
-                 */
-                function initWatchVal() {}
-            }];
-    }
+                        function $watchCollectionAction() {
+                            if (initRun) {
+                                initRun = false;
+                                listener(newValue, newValue, self);
+                            } else {
+                                listener(newValue, veryOldValue, self);
+                            }
 
-    /**
-     * @description
-     * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
-     */
-    function $$SanitizeUriProvider() {
-        var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/,
-            imgSrcSanitizationWhitelist = /^\s*(https?|ftp|file):|data:image\//;
+                            // make a copy for the next time a collection is changed
+                            if (trackVeryOldValue) {
+                                if (!isObject(newValue)) {
+                                    //primitive
+                                    veryOldValue = newValue;
+                                } else if (isArrayLike(newValue)) {
+                                    veryOldValue = new Array(newValue.length);
+                                    for (var i = 0; i < newValue.length; i++) {
+                                        veryOldValue[i] = newValue[i];
+                                    }
+                                } else { // if object
+                                    veryOldValue = {};
+                                    for (var key in newValue) {
+                                        if (hasOwnProperty.call(newValue, key)) {
+                                            veryOldValue[key] = newValue[key];
+                                        }
+                                    }
+                                }
+                            }
+                        }
 
-        /**
-         * @description
-         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-         * urls during a[href] sanitization.
-         *
-         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-         *
-         * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
-         * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
-         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
-         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
-         *
-         * @param {RegExp=} regexp New regexp to whitelist urls with.
-         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
-         *    chaining otherwise.
-         */
-        this.aHrefSanitizationWhitelist = function(regexp) {
-            if (isDefined(regexp)) {
-                aHrefSanitizationWhitelist = regexp;
-                return this;
-            }
-            return aHrefSanitizationWhitelist;
-        };
+                        return this.$watch(changeDetector, $watchCollectionAction);
+                    },
 
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$digest
+                     * @kind function
+                     *
+                     * @description
+                     * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
+                     * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
+                     * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
+                     * until no more listeners are firing. This means that it is possible to get into an infinite
+                     * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
+                     * iterations exceeds 10.
+                     *
+                     * Usually, you don't call `$digest()` directly in
+                     * {@link ng.directive:ngController controllers} or in
+                     * {@link ng.$compileProvider#directive directives}.
+                     * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
+                     * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`.
+                     *
+                     * If you want to be notified whenever `$digest()` is called,
+                     * you can register a `watchExpression` function with
+                     * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
+                     *
+                     * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
+                     *
+                     * @example
+                     * ```js
+                     var scope = ...;
+                     scope.name = 'misko';
+                     scope.counter = 0;
 
-        /**
-         * @description
-         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-         * urls during img[src] sanitization.
-         *
-         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-         *
-         * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
-         * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
-         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
-         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
-         *
-         * @param {RegExp=} regexp New regexp to whitelist urls with.
-         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
-         *    chaining otherwise.
-         */
-        this.imgSrcSanitizationWhitelist = function(regexp) {
-            if (isDefined(regexp)) {
-                imgSrcSanitizationWhitelist = regexp;
-                return this;
-            }
-            return imgSrcSanitizationWhitelist;
-        };
+                     expect(scope.counter).toEqual(0);
+                     scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+                     expect(scope.counter).toEqual(0);
 
-        this.$get = function() {
-            return function sanitizeUri(uri, isImage) {
-                var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
-                var normalizedVal;
-                // NOTE: urlResolve() doesn't support IE < 8 so we don't sanitize for that case.
-                if (!msie || msie >= 8 ) {
-                    normalizedVal = urlResolve(uri).href;
-                    if (normalizedVal !== '' && !normalizedVal.match(regex)) {
-                        return 'unsafe:'+normalizedVal;
-                    }
-                }
-                return uri;
-            };
-        };
-    }
+                     scope.$digest();
+                     // the listener is always called during the first $digest loop after it was registered
+                     expect(scope.counter).toEqual(1);
 
-    var $sceMinErr = minErr('$sce');
-
-    var SCE_CONTEXTS = {
-        HTML: 'html',
-        CSS: 'css',
-        URL: 'url',
-        // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a
-        // url.  (e.g. ng-include, script src, templateUrl)
-        RESOURCE_URL: 'resourceUrl',
-        JS: 'js'
-    };
-
-// Helper functions follow.
-
-// Copied from:
-// http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962
-// Prereq: s is a string.
-    function escapeForRegexp(s) {
-        return s.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g, '\\$1').
-            replace(/\x08/g, '\\x08');
-    }
-
-
-    function adjustMatcher(matcher) {
-        if (matcher === 'self') {
-            return matcher;
-        } else if (isString(matcher)) {
-            // Strings match exactly except for 2 wildcards - '*' and '**'.
-            // '*' matches any character except those from the set ':/.?&'.
-            // '**' matches any character (like .* in a RegExp).
-            // More than 2 *'s raises an error as it's ill defined.
-            if (matcher.indexOf('***') > -1) {
-                throw $sceMinErr('iwcard',
-                    'Illegal sequence *** in string matcher.  String: {0}', matcher);
-            }
-            matcher = escapeForRegexp(matcher).
-                replace('\\*\\*', '.*').
-                replace('\\*', '[^:/.?&;]*');
-            return new RegExp('^' + matcher + '$');
-        } else if (isRegExp(matcher)) {
-            // The only other type of matcher allowed is a Regexp.
-            // Match entire URL / disallow partial matches.
-            // Flags are reset (i.e. no global, ignoreCase or multiline)
-            return new RegExp('^' + matcher.source + '$');
-        } else {
-            throw $sceMinErr('imatcher',
-                'Matchers may only be "self", string patterns or RegExp objects');
-        }
-    }
+                     scope.$digest();
+                     // but now it will not be called unless the value changes
+                     expect(scope.counter).toEqual(1);
 
+                     scope.name = 'adam';
+                     scope.$digest();
+                     expect(scope.counter).toEqual(2);
+                     * ```
+                     *
+                     */
+                    $digest: function() {
+                        var watch, value, last, fn, get,
+                            watchers,
+                            dirty, ttl = TTL,
+                            next, current, target = this,
+                            watchLog = [],
+                            logIdx, asyncTask;
 
-    function adjustMatchers(matchers) {
-        var adjustedMatchers = [];
-        if (isDefined(matchers)) {
-            forEach(matchers, function(matcher) {
-                adjustedMatchers.push(adjustMatcher(matcher));
-            });
-        }
-        return adjustedMatchers;
-    }
+                        beginPhase('$digest');
+                        // Check for changes to browser url that happened in sync before the call to $digest
+                        $browser.$$checkUrlChange();
+
+                        if (this === $rootScope && applyAsyncId !== null) {
+                            // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then
+                            // cancel the scheduled $apply and flush the queue of expressions to be evaluated.
+                            $browser.defer.cancel(applyAsyncId);
+                            flushApplyAsync();
+                        }
 
+                        lastDirtyWatch = null;
 
-    /**
-     * @ngdoc service
-     * @name $sceDelegate
-     * @function
-     *
-     * @description
-     *
-     * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
- * Contextual Escaping (SCE)} services to AngularJS.
-     *
-     * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
-     * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
-     * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
-     * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
-     * work because `$sce` delegates to `$sceDelegate` for these operations.
-     *
-     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
-     *
-     * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
-     * can override it completely to change the behavior of `$sce`, the common case would
-     * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
-     * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
-     * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
- * $sceDelegateProvider.resourceUrlWhitelist} and {@link
-        * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
-     */
+                        do { // "while dirty" loop
+                            dirty = false;
+                            current = target;
 
-    /**
-     * @ngdoc provider
-     * @name $sceDelegateProvider
-     * @description
-     *
-     * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
- * $sceDelegate} service.  This allows one to get/set the whitelists and blacklists used to ensure
-     * that the URLs used for sourcing Angular templates are safe.  Refer {@link
-        * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and
-     * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
-     *
-     * For the general details about this service in Angular, read the main page for {@link ng.$sce
- * Strict Contextual Escaping (SCE)}.
-     *
-     * **Example**:  Consider the following case. <a name="example"></a>
-     *
-     * - your app is hosted at url `http://myapp.example.com/`
-     * - but some of your templates are hosted on other domains you control such as
-     *   `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc.
-     * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
-     *
-     * Here is what a secure configuration for this scenario might look like:
-     *
-     * <pre class="prettyprint">
-     *    angular.module('myApp', []).config(function($sceDelegateProvider) {
- *      $sceDelegateProvider.resourceUrlWhitelist([
- *        // Allow same origin resource loads.
- *        'self',
- *        // Allow loading from our assets domain.  Notice the difference between * and **.
- *        'http://srv*.assets.example.com/**']);
- *
- *      // The blacklist overrides the whitelist so the open redirect here is blocked.
- *      $sceDelegateProvider.resourceUrlBlacklist([
- *        'http://myapp.example.com/clickThru**']);
- *      });
-     * </pre>
-     */
+                            // It's safe for asyncQueuePosition to be a local variable here because this loop can't
+                            // be reentered recursively. Calling $digest from a function passed to $evalAsync would
+                            // lead to a '$digest already in progress' error.
+                            for (var asyncQueuePosition = 0; asyncQueuePosition < asyncQueue.length; asyncQueuePosition++) {
+                                try {
+                                    asyncTask = asyncQueue[asyncQueuePosition];
+                                    fn = asyncTask.fn;
+                                    fn(asyncTask.scope, asyncTask.locals);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                                lastDirtyWatch = null;
+                            }
+                            asyncQueue.length = 0;
 
-    function $SceDelegateProvider() {
-        this.SCE_CONTEXTS = SCE_CONTEXTS;
+                            traverseScopesLoop:
+                                do { // "traverse the scopes" loop
+                                    if ((watchers = current.$$watchers)) {
+                                        // process our watches
+                                        watchers.$$digestWatchIndex = watchers.length;
+                                        while (watchers.$$digestWatchIndex--) {
+                                            try {
+                                                watch = watchers[watchers.$$digestWatchIndex];
+                                                // Most common watches are on primitives, in which case we can short
+                                                // circuit it with === operator, only when === fails do we use .equals
+                                                if (watch) {
+                                                    get = watch.get;
+                                                    if ((value = get(current)) !== (last = watch.last) &&
+                                                        !(watch.eq
+                                                            ? equals(value, last)
+                                                            : (isNumberNaN(value) && isNumberNaN(last)))) {
+                                                        dirty = true;
+                                                        lastDirtyWatch = watch;
+                                                        watch.last = watch.eq ? copy(value, null) : value;
+                                                        fn = watch.fn;
+                                                        fn(value, ((last === initWatchVal) ? value : last), current);
+                                                        if (ttl < 5) {
+                                                            logIdx = 4 - ttl;
+                                                            if (!watchLog[logIdx]) watchLog[logIdx] = [];
+                                                            watchLog[logIdx].push({
+                                                                msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp,
+                                                                newVal: value,
+                                                                oldVal: last
+                                                            });
+                                                        }
+                                                    } else if (watch === lastDirtyWatch) {
+                                                        // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
+                                                        // have already been tested.
+                                                        dirty = false;
+                                                        break traverseScopesLoop;
+                                                    }
+                                                }
+                                            } catch (e) {
+                                                $exceptionHandler(e);
+                                            }
+                                        }
+                                    }
 
-        // Resource URLs can also be trusted by policy.
-        var resourceUrlWhitelist = ['self'],
-            resourceUrlBlacklist = [];
+                                    // Insanity Warning: scope depth-first traversal
+                                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
+                                    // this piece should be kept in sync with the traversal in $broadcast
+                                    if (!(next = ((current.$$watchersCount && current.$$childHead) ||
+                                        (current !== target && current.$$nextSibling)))) {
+                                        while (current !== target && !(next = current.$$nextSibling)) {
+                                            current = current.$parent;
+                                        }
+                                    }
+                                } while ((current = next));
 
-        /**
-         * @ngdoc method
-         * @name $sceDelegateProvider#resourceUrlWhitelist
-         * @function
-         *
-         * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
-         *     provided.  This must be an array or null.  A snapshot of this array is used so further
-         *     changes to the array are ignored.
-         *
-         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-         *     allowed in this array.
-         *
-         *     Note: **an empty whitelist array will block all URLs**!
-         *
-         * @return {Array} the currently set whitelist array.
-         *
-         * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
-         * same origin resource requests.
-         *
-         * @description
-         * Sets/Gets the whitelist of trusted resource URLs.
-         */
-        this.resourceUrlWhitelist = function (value) {
-            if (arguments.length) {
-                resourceUrlWhitelist = adjustMatchers(value);
-            }
-            return resourceUrlWhitelist;
-        };
+                            // `break traverseScopesLoop;` takes us to here
 
-        /**
-         * @ngdoc method
-         * @name $sceDelegateProvider#resourceUrlBlacklist
-         * @function
-         *
-         * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
-         *     provided.  This must be an array or null.  A snapshot of this array is used so further
-         *     changes to the array are ignored.
-         *
-         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-         *     allowed in this array.
-         *
-         *     The typical usage for the blacklist is to **block
-         *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
-         *     these would otherwise be trusted but actually return content from the redirected domain.
-         *
-         *     Finally, **the blacklist overrides the whitelist** and has the final say.
-         *
-         * @return {Array} the currently set blacklist array.
-         *
-         * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
-         * is no blacklist.)
-         *
-         * @description
-         * Sets/Gets the blacklist of trusted resource URLs.
-         */
+                            if ((dirty || asyncQueue.length) && !(ttl--)) {
+                                clearPhase();
+                                throw $rootScopeMinErr('infdig',
+                                    '{0} $digest() iterations reached. Aborting!\n' +
+                                    'Watchers fired in the last 5 iterations: {1}',
+                                    TTL, watchLog);
+                            }
 
-        this.resourceUrlBlacklist = function (value) {
-            if (arguments.length) {
-                resourceUrlBlacklist = adjustMatchers(value);
-            }
-            return resourceUrlBlacklist;
-        };
+                        } while (dirty || asyncQueue.length);
 
-        this.$get = ['$injector', function($injector) {
+                        clearPhase();
 
-            var htmlSanitizer = function htmlSanitizer(html) {
-                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
-            };
+                        // postDigestQueuePosition isn't local here because this loop can be reentered recursively.
+                        while (postDigestQueuePosition < postDigestQueue.length) {
+                            try {
+                                postDigestQueue[postDigestQueuePosition++]();
+                            } catch (e) {
+                                $exceptionHandler(e);
+                            }
+                        }
+                        postDigestQueue.length = postDigestQueuePosition = 0;
 
-            if ($injector.has('$sanitize')) {
-                htmlSanitizer = $injector.get('$sanitize');
-            }
+                        // Check for changes to browser url that happened during the $digest
+                        // (for which no event is fired; e.g. via `history.pushState()`)
+                        $browser.$$checkUrlChange();
+                    },
 
 
-            function matchUrl(matcher, parsedUrl) {
-                if (matcher === 'self') {
-                    return urlIsSameOrigin(parsedUrl);
-                } else {
-                    // definitely a regex.  See adjustMatchers()
-                    return !!matcher.exec(parsedUrl.href);
-                }
-            }
+                    /**
+                     * @ngdoc event
+                     * @name $rootScope.Scope#$destroy
+                     * @eventType broadcast on scope being destroyed
+                     *
+                     * @description
+                     * Broadcasted when a scope and its children are being destroyed.
+                     *
+                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+                     * clean up DOM bindings before an element is removed from the DOM.
+                     */
 
-            function isResourceUrlAllowedByPolicy(url) {
-                var parsedUrl = urlResolve(url.toString());
-                var i, n, allowed = false;
-                // Ensure that at least one item from the whitelist allows this url.
-                for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
-                    if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
-                        allowed = true;
-                        break;
-                    }
-                }
-                if (allowed) {
-                    // Ensure that no item from the blacklist blocked this url.
-                    for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
-                        if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
-                            allowed = false;
-                            break;
-                        }
-                    }
-                }
-                return allowed;
-            }
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$destroy
+                     * @kind function
+                     *
+                     * @description
+                     * Removes the current scope (and all of its children) from the parent scope. Removal implies
+                     * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
+                     * propagate to the current scope and its children. Removal also implies that the current
+                     * scope is eligible for garbage collection.
+                     *
+                     * The `$destroy()` is usually used by directives such as
+                     * {@link ng.directive:ngRepeat ngRepeat} for managing the
+                     * unrolling of the loop.
+                     *
+                     * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
+                     * Application code can register a `$destroy` event handler that will give it a chance to
+                     * perform any necessary cleanup.
+                     *
+                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+                     * clean up DOM bindings before an element is removed from the DOM.
+                     */
+                    $destroy: function() {
+                        // We can't destroy a scope that has been already destroyed.
+                        if (this.$$destroyed) return;
+                        var parent = this.$parent;
 
-            function generateHolderType(Base) {
-                var holderType = function TrustedValueHolderType(trustedValue) {
-                    this.$$unwrapTrustedValue = function() {
-                        return trustedValue;
-                    };
-                };
-                if (Base) {
-                    holderType.prototype = new Base();
-                }
-                holderType.prototype.valueOf = function sceValueOf() {
-                    return this.$$unwrapTrustedValue();
-                };
-                holderType.prototype.toString = function sceToString() {
-                    return this.$$unwrapTrustedValue().toString();
-                };
-                return holderType;
-            }
+                        this.$broadcast('$destroy');
+                        this.$$destroyed = true;
 
-            var trustedValueHolderBase = generateHolderType(),
-                byType = {};
+                        if (this === $rootScope) {
+                            //Remove handlers attached to window when $rootScope is removed
+                            $browser.$$applicationDestroyed();
+                        }
 
-            byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
+                        incrementWatchersCount(this, -this.$$watchersCount);
+                        for (var eventName in this.$$listenerCount) {
+                            decrementListenerCount(this, this.$$listenerCount[eventName], eventName);
+                        }
 
-            /**
-             * @ngdoc method
-             * @name $sceDelegate#trustAs
-             *
-             * @description
-             * Returns an object that is trusted by angular for use in specified strict
-             * contextual escaping contexts (such as ng-bind-html, ng-include, any src
-             * attribute interpolation, any dom event binding attribute interpolation
-             * such as for onclick,  etc.) that uses the provided value.
-             * See {@link ng.$sce $sce} for enabling strict contextual escaping.
-             *
-             * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-             *   resourceUrl, html, js and css.
-             * @param {*} value The value that that should be considered trusted/safe.
-             * @returns {*} A value that can be used to stand in for the provided `value` in places
-             * where Angular expects a $sce.trustAs() return value.
-             */
-            function trustAs(type, trustedValue) {
-                var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
-                if (!Constructor) {
-                    throw $sceMinErr('icontext',
-                        'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
-                        type, trustedValue);
-                }
-                if (trustedValue === null || trustedValue === undefined || trustedValue === '') {
-                    return trustedValue;
-                }
-                // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
-                // mutable objects, we ensure here that the value passed in is actually a string.
-                if (typeof trustedValue !== 'string') {
-                    throw $sceMinErr('itype',
-                        'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
-                        type);
-                }
-                return new Constructor(trustedValue);
-            }
+                        // sever all the references to parent scopes (after this cleanup, the current scope should
+                        // not be retained by any of our references and should be eligible for garbage collection)
+                        if (parent && parent.$$childHead === this) parent.$$childHead = this.$$nextSibling;
+                        if (parent && parent.$$childTail === this) parent.$$childTail = this.$$prevSibling;
+                        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
+                        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
 
-            /**
-             * @ngdoc method
-             * @name $sceDelegate#valueOf
-             *
-             * @description
-             * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
-     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
-                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
-             *
-             * If the passed parameter is not a value that had been returned by {@link
-                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is.
-             *
-             * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
-             *      call or anything else.
-             * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
-     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
-             *     `value` unchanged.
-             */
-            function valueOf(maybeTrusted) {
-                if (maybeTrusted instanceof trustedValueHolderBase) {
-                    return maybeTrusted.$$unwrapTrustedValue();
-                } else {
-                    return maybeTrusted;
-                }
-            }
+                        // Disable listeners, watchers and apply/digest methods
+                        this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop;
+                        this.$on = this.$watch = this.$watchGroup = function() { return noop; };
+                        this.$$listeners = {};
 
-            /**
-             * @ngdoc method
-             * @name $sceDelegate#getTrusted
-             *
-             * @description
-             * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and
-             * returns the originally supplied value if the queried context type is a supertype of the
-             * created type.  If this condition isn't satisfied, throws an exception.
-             *
-             * @param {string} type The kind of context in which this value is to be used.
-             * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
-     *     `$sceDelegate.trustAs`} call.
-             * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs
-     *     `$sceDelegate.trustAs`} if valid in this context.  Otherwise, throws an exception.
-             */
-            function getTrusted(type, maybeTrusted) {
-                if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') {
-                    return maybeTrusted;
-                }
-                var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
-                if (constructor && maybeTrusted instanceof constructor) {
-                    return maybeTrusted.$$unwrapTrustedValue();
-                }
-                // If we get here, then we may only take one of two actions.
-                // 1. sanitize the value for the requested type, or
-                // 2. throw an exception.
-                if (type === SCE_CONTEXTS.RESOURCE_URL) {
-                    if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
-                        return maybeTrusted;
-                    } else {
-                        throw $sceMinErr('insecurl',
-                            'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
-                            maybeTrusted.toString());
-                    }
-                } else if (type === SCE_CONTEXTS.HTML) {
-                    return htmlSanitizer(maybeTrusted);
-                }
-                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
-            }
+                        // Disconnect the next sibling to prevent `cleanUpScope` destroying those too
+                        this.$$nextSibling = null;
+                        cleanUpScope(this);
+                    },
 
-            return { trustAs: trustAs,
-                getTrusted: getTrusted,
-                valueOf: valueOf };
-        }];
-    }
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$eval
+                     * @kind function
+                     *
+                     * @description
+                     * Executes the `expression` on the current scope and returns the result. Any exceptions in
+                     * the expression are propagated (uncaught). This is useful when evaluating AngularJS
+                     * expressions.
+                     *
+                     * @example
+                     * ```js
+                     var scope = ng.$rootScope.Scope();
+                     scope.a = 1;
+                     scope.b = 2;
 
+                     expect(scope.$eval('a+b')).toEqual(3);
+                     expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
+                     * ```
+                     *
+                     * @param {(string|function())=} expression An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with the current `scope` parameter.
+                     *
+                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+                     * @returns {*} The result of evaluating the expression.
+                     */
+                    $eval: function(expr, locals) {
+                        return $parse(expr)(this, locals);
+                    },
 
-    /**
-     * @ngdoc provider
-     * @name $sceProvider
-     * @description
-     *
-     * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
-     * -   enable/disable Strict Contextual Escaping (SCE) in a module
-     * -   override the default implementation with a custom delegate
-     *
-     * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
-     */
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$evalAsync
+                     * @kind function
+                     *
+                     * @description
+                     * Executes the expression on the current scope at a later point in time.
+                     *
+                     * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
+                     * that:
+                     *
+                     *   - it will execute after the function that scheduled the evaluation (preferably before DOM
+                     *     rendering).
+                     *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
+                     *     `expression` execution.
+                     *
+                     * Any exceptions from the execution of the expression are forwarded to the
+                     * {@link ng.$exceptionHandler $exceptionHandler} service.
+                     *
+                     * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
+                     * will be scheduled. However, it is encouraged to always call code that changes the model
+                     * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
+                     *
+                     * @param {(string|function())=} expression An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with the current `scope` parameter.
+                     *
+                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+                     */
+                    $evalAsync: function(expr, locals) {
+                        // if we are outside of an $digest loop and this is the first time we are scheduling async
+                        // task also schedule async auto-flush
+                        if (!$rootScope.$$phase && !asyncQueue.length) {
+                            $browser.defer(function() {
+                                if (asyncQueue.length) {
+                                    $rootScope.$digest();
+                                }
+                            });
+                        }
 
-    /* jshint maxlen: false*/
+                        asyncQueue.push({scope: this, fn: $parse(expr), locals: locals});
+                    },
 
-    /**
-     * @ngdoc service
-     * @name $sce
-     * @function
-     *
-     * @description
-     *
-     * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
-     *
-     * # Strict Contextual Escaping
-     *
-     * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain
-     * contexts to result in a value that is marked as safe to use for that context.  One example of
-     * such a context is binding arbitrary html controlled by the user via `ng-bind-html`.  We refer
-     * to these contexts as privileged or SCE contexts.
-     *
-     * As of version 1.2, Angular ships with SCE enabled by default.
-     *
-     * Note:  When enabled (the default), IE8 in quirks mode is not supported.  In this mode, IE8 allows
-     * one to execute arbitrary javascript by the use of the expression() syntax.  Refer
-     * <http://blogs.msdn.com/b/ie/archive/2008/10/16/ending-expressions.aspx> to learn more about them.
-     * You can ensure your document is in standards mode and not quirks mode by adding `<!doctype html>`
-     * to the top of your HTML document.
-     *
-     * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for
-     * security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
-     *
-     * Here's an example of a binding in a privileged context:
-     *
-     * <pre class="prettyprint">
-     *     <input ng-model="userHtml">
-     *     <div ng-bind-html="userHtml">
-     * </pre>
-     *
-     * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
-     * disabled, this application allows the user to render arbitrary HTML into the DIV.
-     * In a more realistic example, one may be rendering user comments, blog articles, etc. via
-     * bindings.  (HTML is just one example of a context where rendering user controlled input creates
-     * security vulnerabilities.)
-     *
-     * For the case of HTML, you might use a library, either on the client side, or on the server side,
-     * to sanitize unsafe HTML before binding to the value and rendering it in the document.
-     *
-     * How would you ensure that every place that used these types of bindings was bound to a value that
-     * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
-     * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
-     * properties/fields and forgot to update the binding to the sanitized value?
+                    $$postDigest: function(fn) {
+                        postDigestQueue.push(fn);
+                    },
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$apply
+                     * @kind function
+                     *
+                     * @description
+                     * `$apply()` is used to execute an expression in AngularJS from outside of the AngularJS
+                     * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
+                     * Because we are calling into the AngularJS framework we need to perform proper scope life
+                     * cycle of {@link ng.$exceptionHandler exception handling},
+                     * {@link ng.$rootScope.Scope#$digest executing watches}.
+                     *
+                     * **Life cycle: Pseudo-Code of `$apply()`**
+                     *
+                     * ```js
+                     function $apply(expr) {
+             try {
+               return $eval(expr);
+             } catch (e) {
+               $exceptionHandler(e);
+             } finally {
+               $root.$digest();
+             }
+           }
+                     * ```
+                     *
+                     *
+                     * Scope's `$apply()` method transitions through the following stages:
+                     *
+                     * 1. The {@link guide/expression expression} is executed using the
+                     *    {@link ng.$rootScope.Scope#$eval $eval()} method.
+                     * 2. Any exceptions from the execution of the expression are forwarded to the
+                     *    {@link ng.$exceptionHandler $exceptionHandler} service.
+                     * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
+                     *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
+                     *
+                     *
+                     * @param {(string|function())=} exp An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with current `scope` parameter.
+                     *
+                     * @returns {*} The result of evaluating the expression.
+                     */
+                    $apply: function(expr) {
+                        try {
+                            beginPhase('$apply');
+                            try {
+                                return this.$eval(expr);
+                            } finally {
+                                clearPhase();
+                            }
+                        } catch (e) {
+                            $exceptionHandler(e);
+                        } finally {
+                            try {
+                                $rootScope.$digest();
+                            } catch (e) {
+                                $exceptionHandler(e);
+                                // eslint-disable-next-line no-unsafe-finally
+                                throw e;
+                            }
+                        }
+                    },
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$applyAsync
+                     * @kind function
+                     *
+                     * @description
+                     * Schedule the invocation of $apply to occur at a later time. The actual time difference
+                     * varies across browsers, but is typically around ~10 milliseconds.
+                     *
+                     * This can be used to queue up multiple expressions which need to be evaluated in the same
+                     * digest.
+                     *
+                     * @param {(string|function())=} exp An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with current `scope` parameter.
+                     */
+                    $applyAsync: function(expr) {
+                        var scope = this;
+                        if (expr) {
+                            applyAsyncQueue.push($applyAsyncExpression);
+                        }
+                        expr = $parse(expr);
+                        scheduleApplyAsync();
+
+                        function $applyAsyncExpression() {
+                            scope.$eval(expr);
+                        }
+                    },
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$on
+                     * @kind function
+                     *
+                     * @description
+                     * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
+                     * discussion of event life cycle.
+                     *
+                     * The event listener function format is: `function(event, args...)`. The `event` object
+                     * passed into the listener has the following attributes:
+                     *
+                     *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
+                     *     `$broadcast`-ed.
+                     *   - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the
+                     *     event propagates through the scope hierarchy, this property is set to null.
+                     *   - `name` - `{string}`: name of the event.
+                     *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
+                     *     further event propagation (available only for events that were `$emit`-ed).
+                     *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
+                     *     to true.
+                     *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
+                     *
+                     * @param {string} name Event name to listen on.
+                     * @param {function(event, ...args)} listener Function to call when the event is emitted.
+                     * @returns {function()} Returns a deregistration function for this listener.
+                     */
+                    $on: function(name, listener) {
+                        var namedListeners = this.$$listeners[name];
+                        if (!namedListeners) {
+                            this.$$listeners[name] = namedListeners = [];
+                        }
+                        namedListeners.push(listener);
+
+                        var current = this;
+                        do {
+                            if (!current.$$listenerCount[name]) {
+                                current.$$listenerCount[name] = 0;
+                            }
+                            current.$$listenerCount[name]++;
+                        } while ((current = current.$parent));
+
+                        var self = this;
+                        return function() {
+                            var indexOfListener = namedListeners.indexOf(listener);
+                            if (indexOfListener !== -1) {
+                                // Use delete in the hope of the browser deallocating the memory for the array entry,
+                                // while not shifting the array indexes of other listeners.
+                                // See issue https://github.com/angular/angular.js/issues/16135
+                                delete namedListeners[indexOfListener];
+                                decrementListenerCount(self, 1, name);
+                            }
+                        };
+                    },
+
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$emit
+                     * @kind function
+                     *
+                     * @description
+                     * Dispatches an event `name` upwards through the scope hierarchy notifying the
+                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     *
+                     * The event life cycle starts at the scope on which `$emit` was called. All
+                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+                     * notified. Afterwards, the event traverses upwards toward the root scope and calls all
+                     * registered listeners along the way. The event will stop propagating if one of the listeners
+                     * cancels it.
+                     *
+                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+                     *
+                     * @param {string} name Event name to emit.
+                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+                     * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
+                     */
+                    $emit: function(name, args) {
+                        var empty = [],
+                            namedListeners,
+                            scope = this,
+                            stopPropagation = false,
+                            event = {
+                                name: name,
+                                targetScope: scope,
+                                stopPropagation: function() {stopPropagation = true;},
+                                preventDefault: function() {
+                                    event.defaultPrevented = true;
+                                },
+                                defaultPrevented: false
+                            },
+                            listenerArgs = concat([event], arguments, 1),
+                            i, length;
+
+                        do {
+                            namedListeners = scope.$$listeners[name] || empty;
+                            event.currentScope = scope;
+                            for (i = 0, length = namedListeners.length; i < length; i++) {
+
+                                // if listeners were deregistered, defragment the array
+                                if (!namedListeners[i]) {
+                                    namedListeners.splice(i, 1);
+                                    i--;
+                                    length--;
+                                    continue;
+                                }
+                                try {
+                                    //allow all listeners attached to the current scope to run
+                                    namedListeners[i].apply(null, listenerArgs);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            }
+                            //if any listener on the current scope stops propagation, prevent bubbling
+                            if (stopPropagation) {
+                                break;
+                            }
+                            //traverse upwards
+                            scope = scope.$parent;
+                        } while (scope);
+
+                        event.currentScope = null;
+
+                        return event;
+                    },
+
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$broadcast
+                     * @kind function
+                     *
+                     * @description
+                     * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
+                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     *
+                     * The event life cycle starts at the scope on which `$broadcast` was called. All
+                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+                     * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
+                     * scope and calls all registered listeners along the way. The event cannot be canceled.
+                     *
+                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+                     *
+                     * @param {string} name Event name to broadcast.
+                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+                     * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
+                     */
+                    $broadcast: function(name, args) {
+                        var target = this,
+                            current = target,
+                            next = target,
+                            event = {
+                                name: name,
+                                targetScope: target,
+                                preventDefault: function() {
+                                    event.defaultPrevented = true;
+                                },
+                                defaultPrevented: false
+                            };
+
+                        if (!target.$$listenerCount[name]) return event;
+
+                        var listenerArgs = concat([event], arguments, 1),
+                            listeners, i, length;
+
+                        //down while you can, then up and next sibling or up and next sibling until back at root
+                        while ((current = next)) {
+                            event.currentScope = current;
+                            listeners = current.$$listeners[name] || [];
+                            for (i = 0, length = listeners.length; i < length; i++) {
+                                // if listeners were deregistered, defragment the array
+                                if (!listeners[i]) {
+                                    listeners.splice(i, 1);
+                                    i--;
+                                    length--;
+                                    continue;
+                                }
+
+                                try {
+                                    listeners[i].apply(null, listenerArgs);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            }
+
+                            // Insanity Warning: scope depth-first traversal
+                            // yes, this code is a bit crazy, but it works and we have tests to prove it!
+                            // this piece should be kept in sync with the traversal in $digest
+                            // (though it differs due to having the extra check for $$listenerCount)
+                            if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
+                                (current !== target && current.$$nextSibling)))) {
+                                while (current !== target && !(next = current.$$nextSibling)) {
+                                    current = current.$parent;
+                                }
+                            }
+                        }
+
+                        event.currentScope = null;
+                        return event;
+                    }
+                };
+
+                var $rootScope = new Scope();
+
+                //The internal queues. Expose them on the $rootScope for debugging/testing purposes.
+                var asyncQueue = $rootScope.$$asyncQueue = [];
+                var postDigestQueue = $rootScope.$$postDigestQueue = [];
+                var applyAsyncQueue = $rootScope.$$applyAsyncQueue = [];
+
+                var postDigestQueuePosition = 0;
+
+                return $rootScope;
+
+
+                function beginPhase(phase) {
+                    if ($rootScope.$$phase) {
+                        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
+                    }
+
+                    $rootScope.$$phase = phase;
+                }
+
+                function clearPhase() {
+                    $rootScope.$$phase = null;
+                }
+
+                function incrementWatchersCount(current, count) {
+                    do {
+                        current.$$watchersCount += count;
+                    } while ((current = current.$parent));
+                }
+
+                function decrementListenerCount(current, count, name) {
+                    do {
+                        current.$$listenerCount[name] -= count;
+
+                        if (current.$$listenerCount[name] === 0) {
+                            delete current.$$listenerCount[name];
+                        }
+                    } while ((current = current.$parent));
+                }
+
+                /**
+                 * function used as an initial value for watchers.
+                 * because it's unique we can easily tell it apart from other values
+                 */
+                function initWatchVal() {}
+
+                function flushApplyAsync() {
+                    while (applyAsyncQueue.length) {
+                        try {
+                            applyAsyncQueue.shift()();
+                        } catch (e) {
+                            $exceptionHandler(e);
+                        }
+                    }
+                    applyAsyncId = null;
+                }
+
+                function scheduleApplyAsync() {
+                    if (applyAsyncId === null) {
+                        applyAsyncId = $browser.defer(function() {
+                            $rootScope.$apply(flushApplyAsync);
+                        });
+                    }
+                }
+            }];
+    }
+
+    /**
+     * @ngdoc service
+     * @name $rootElement
+     *
+     * @description
+     * The root element of AngularJS application. This is either the element where {@link
+        * ng.directive:ngApp ngApp} was declared or the element passed into
+     * {@link angular.bootstrap}. The element represents the root element of application. It is also the
+     * location where the application's {@link auto.$injector $injector} service gets
+     * published, and can be retrieved using `$rootElement.injector()`.
+     */
+
+
+// the implementation is in angular.bootstrap
+
+    /**
+     * @this
+     * @description
+     * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
+     */
+    function $$SanitizeUriProvider() {
+        var aHrefSanitizationWhitelist = /^\s*(https?|s?ftp|mailto|tel|file):/,
+            imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/;
+
+        /**
+         * @description
+         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+         * urls during a[href] sanitization.
+         *
+         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+         *
+         * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
+         * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
+         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+         *
+         * @param {RegExp=} regexp New regexp to whitelist urls with.
+         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+         *    chaining otherwise.
+         */
+        this.aHrefSanitizationWhitelist = function(regexp) {
+            if (isDefined(regexp)) {
+                aHrefSanitizationWhitelist = regexp;
+                return this;
+            }
+            return aHrefSanitizationWhitelist;
+        };
+
+
+        /**
+         * @description
+         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+         * urls during img[src] sanitization.
+         *
+         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+         *
+         * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
+         * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
+         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+         *
+         * @param {RegExp=} regexp New regexp to whitelist urls with.
+         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+         *    chaining otherwise.
+         */
+        this.imgSrcSanitizationWhitelist = function(regexp) {
+            if (isDefined(regexp)) {
+                imgSrcSanitizationWhitelist = regexp;
+                return this;
+            }
+            return imgSrcSanitizationWhitelist;
+        };
+
+        this.$get = function() {
+            return function sanitizeUri(uri, isImage) {
+                var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
+                var normalizedVal;
+                normalizedVal = urlResolve(uri && uri.trim()).href;
+                if (normalizedVal !== '' && !normalizedVal.match(regex)) {
+                    return 'unsafe:' + normalizedVal;
+                }
+                return uri;
+            };
+        };
+    }
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /* exported $SceProvider, $SceDelegateProvider */
+
+    var $sceMinErr = minErr('$sce');
+
+    var SCE_CONTEXTS = {
+        // HTML is used when there's HTML rendered (e.g. ng-bind-html, iframe srcdoc binding).
+        HTML: 'html',
+
+        // Style statements or stylesheets. Currently unused in AngularJS.
+        CSS: 'css',
+
+        // An URL used in a context where it does not refer to a resource that loads code. Currently
+        // unused in AngularJS.
+        URL: 'url',
+
+        // RESOURCE_URL is a subtype of URL used where the referred-to resource could be interpreted as
+        // code. (e.g. ng-include, script src binding, templateUrl)
+        RESOURCE_URL: 'resourceUrl',
+
+        // Script. Currently unused in AngularJS.
+        JS: 'js'
+    };
+
+// Helper functions follow.
+
+    var UNDERSCORE_LOWERCASE_REGEXP = /_([a-z])/g;
+
+    function snakeToCamel(name) {
+        return name
+            .replace(UNDERSCORE_LOWERCASE_REGEXP, fnCamelCaseReplace);
+    }
+
+    function adjustMatcher(matcher) {
+        if (matcher === 'self') {
+            return matcher;
+        } else if (isString(matcher)) {
+            // Strings match exactly except for 2 wildcards - '*' and '**'.
+            // '*' matches any character except those from the set ':/.?&'.
+            // '**' matches any character (like .* in a RegExp).
+            // More than 2 *'s raises an error as it's ill defined.
+            if (matcher.indexOf('***') > -1) {
+                throw $sceMinErr('iwcard',
+                    'Illegal sequence *** in string matcher.  String: {0}', matcher);
+            }
+            matcher = escapeForRegexp(matcher).
+            replace(/\\\*\\\*/g, '.*').
+            replace(/\\\*/g, '[^:/.?&;]*');
+            return new RegExp('^' + matcher + '$');
+        } else if (isRegExp(matcher)) {
+            // The only other type of matcher allowed is a Regexp.
+            // Match entire URL / disallow partial matches.
+            // Flags are reset (i.e. no global, ignoreCase or multiline)
+            return new RegExp('^' + matcher.source + '$');
+        } else {
+            throw $sceMinErr('imatcher',
+                'Matchers may only be "self", string patterns or RegExp objects');
+        }
+    }
+
+
+    function adjustMatchers(matchers) {
+        var adjustedMatchers = [];
+        if (isDefined(matchers)) {
+            forEach(matchers, function(matcher) {
+                adjustedMatchers.push(adjustMatcher(matcher));
+            });
+        }
+        return adjustedMatchers;
+    }
+
+
+    /**
+     * @ngdoc service
+     * @name $sceDelegate
+     * @kind function
+     *
+     * @description
+     *
+     * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
+ * Contextual Escaping (SCE)} services to AngularJS.
+     *
+     * For an overview of this service and the functionnality it provides in AngularJS, see the main
+     * page for {@link ng.$sce SCE}. The current page is targeted for developers who need to alter how
+     * SCE works in their application, which shouldn't be needed in most cases.
+     *
+     * <div class="alert alert-danger">
+     * AngularJS strongly relies on contextual escaping for the security of bindings: disabling or
+     * modifying this might cause cross site scripting (XSS) vulnerabilities. For libraries owners,
+     * changes to this service will also influence users, so be extra careful and document your changes.
+     * </div>
+     *
+     * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
+     * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
+     * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
+     * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
+     * work because `$sce` delegates to `$sceDelegate` for these operations.
+     *
+     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
+     *
+     * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
+     * can override it completely to change the behavior of `$sce`, the common case would
+     * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
+     * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
+     * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
+ * $sceDelegateProvider.resourceUrlWhitelist} and {@link
+        * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+     */
+
+    /**
+     * @ngdoc provider
+     * @name $sceDelegateProvider
+     * @this
+     *
+     * @description
+     *
+     * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
+ * $sceDelegate service}, used as a delegate for {@link ng.$sce Strict Contextual Escaping (SCE)}.
+     *
+     * The `$sceDelegateProvider` allows one to get/set the whitelists and blacklists used to ensure
+     * that the URLs used for sourcing AngularJS templates and other script-running URLs are safe (all
+     * places that use the `$sce.RESOURCE_URL` context). See
+     * {@link ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist}
+     * and
+     * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist},
+     *
+     * For the general details about this service in AngularJS, read the main page for {@link ng.$sce
+ * Strict Contextual Escaping (SCE)}.
+     *
+     * **Example**:  Consider the following case. <a name="example"></a>
+     *
+     * - your app is hosted at url `http://myapp.example.com/`
+     * - but some of your templates are hosted on other domains you control such as
+     *   `http://srv01.assets.example.com/`, `http://srv02.assets.example.com/`, etc.
+     * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
+     *
+     * Here is what a secure configuration for this scenario might look like:
+     *
+     * ```
+     *  angular.module('myApp', []).config(function($sceDelegateProvider) {
+     *    $sceDelegateProvider.resourceUrlWhitelist([
+     *      // Allow same origin resource loads.
+     *      'self',
+     *      // Allow loading from our assets domain.  Notice the difference between * and **.
+     *      'http://srv*.assets.example.com/**'
+     *    ]);
+     *
+     *    // The blacklist overrides the whitelist so the open redirect here is blocked.
+     *    $sceDelegateProvider.resourceUrlBlacklist([
+     *      'http://myapp.example.com/clickThru**'
+     *    ]);
+     *  });
+     * ```
+     * Note that an empty whitelist will block every resource URL from being loaded, and will require
+     * you to manually mark each one as trusted with `$sce.trustAsResourceUrl`. However, templates
+     * requested by {@link ng.$templateRequest $templateRequest} that are present in
+     * {@link ng.$templateCache $templateCache} will not go through this check. If you have a mechanism
+     * to populate your templates in that cache at config time, then it is a good idea to remove 'self'
+     * from that whitelist. This helps to mitigate the security impact of certain types of issues, like
+     * for instance attacker-controlled `ng-includes`.
+     */
+
+    function $SceDelegateProvider() {
+        this.SCE_CONTEXTS = SCE_CONTEXTS;
+
+        // Resource URLs can also be trusted by policy.
+        var resourceUrlWhitelist = ['self'],
+            resourceUrlBlacklist = [];
+
+        /**
+         * @ngdoc method
+         * @name $sceDelegateProvider#resourceUrlWhitelist
+         * @kind function
+         *
+         * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
+         *     provided.  This must be an array or null.  A snapshot of this array is used so further
+         *     changes to the array are ignored.
+         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+         *     allowed in this array.
+         *
+         * @return {Array} The currently set whitelist array.
+         *
+         * @description
+         * Sets/Gets the whitelist of trusted resource URLs.
+         *
+         * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
+         * same origin resource requests.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** the default whitelist of 'self' is not recommended if your app shares its origin
+         * with other apps! It is a good idea to limit it to only your application's directory.
+         * </div>
+         */
+        this.resourceUrlWhitelist = function(value) {
+            if (arguments.length) {
+                resourceUrlWhitelist = adjustMatchers(value);
+            }
+            return resourceUrlWhitelist;
+        };
+
+        /**
+         * @ngdoc method
+         * @name $sceDelegateProvider#resourceUrlBlacklist
+         * @kind function
+         *
+         * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
+         *     provided.  This must be an array or null.  A snapshot of this array is used so further
+         *     changes to the array are ignored.</p><p>
+         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+         *     allowed in this array.</p><p>
+         *     The typical usage for the blacklist is to **block
+         *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
+         *     these would otherwise be trusted but actually return content from the redirected domain.
+         *     </p><p>
+         *     Finally, **the blacklist overrides the whitelist** and has the final say.
+         *
+         * @return {Array} The currently set blacklist array.
+         *
+         * @description
+         * Sets/Gets the blacklist of trusted resource URLs.
+         *
+         * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
+         * is no blacklist.)
+         */
+
+        this.resourceUrlBlacklist = function(value) {
+            if (arguments.length) {
+                resourceUrlBlacklist = adjustMatchers(value);
+            }
+            return resourceUrlBlacklist;
+        };
+
+        this.$get = ['$injector', function($injector) {
+
+            var htmlSanitizer = function htmlSanitizer(html) {
+                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+            };
+
+            if ($injector.has('$sanitize')) {
+                htmlSanitizer = $injector.get('$sanitize');
+            }
+
+
+            function matchUrl(matcher, parsedUrl) {
+                if (matcher === 'self') {
+                    return urlIsSameOrigin(parsedUrl);
+                } else {
+                    // definitely a regex.  See adjustMatchers()
+                    return !!matcher.exec(parsedUrl.href);
+                }
+            }
+
+            function isResourceUrlAllowedByPolicy(url) {
+                var parsedUrl = urlResolve(url.toString());
+                var i, n, allowed = false;
+                // Ensure that at least one item from the whitelist allows this url.
+                for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
+                    if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
+                        allowed = true;
+                        break;
+                    }
+                }
+                if (allowed) {
+                    // Ensure that no item from the blacklist blocked this url.
+                    for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
+                        if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
+                            allowed = false;
+                            break;
+                        }
+                    }
+                }
+                return allowed;
+            }
+
+            function generateHolderType(Base) {
+                var holderType = function TrustedValueHolderType(trustedValue) {
+                    this.$$unwrapTrustedValue = function() {
+                        return trustedValue;
+                    };
+                };
+                if (Base) {
+                    holderType.prototype = new Base();
+                }
+                holderType.prototype.valueOf = function sceValueOf() {
+                    return this.$$unwrapTrustedValue();
+                };
+                holderType.prototype.toString = function sceToString() {
+                    return this.$$unwrapTrustedValue().toString();
+                };
+                return holderType;
+            }
+
+            var trustedValueHolderBase = generateHolderType(),
+                byType = {};
+
+            byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
+
+            /**
+             * @ngdoc method
+             * @name $sceDelegate#trustAs
+             *
+             * @description
+             * Returns a trusted representation of the parameter for the specified context. This trusted
+             * object will later on be used as-is, without any security check, by bindings or directives
+             * that require this security context.
+             * For instance, marking a string as trusted for the `$sce.HTML` context will entirely bypass
+             * the potential `$sanitize` call in corresponding `$sce.HTML` bindings or directives, such as
+             * `ng-bind-html`. Note that in most cases you won't need to call this function: if you have the
+             * sanitizer loaded, passing the value itself will render all the HTML that does not pose a
+             * security risk.
+             *
+             * See {@link ng.$sceDelegate#getTrusted getTrusted} for the function that will consume those
+             * trusted values, and {@link ng.$sce $sce} for general documentation about strict contextual
+             * escaping.
+             *
+             * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
+             *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
+             *
+             * @param {*} value The value that should be considered trusted.
+             * @return {*} A trusted representation of value, that can be used in the given context.
+             */
+            function trustAs(type, trustedValue) {
+                var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+                if (!Constructor) {
+                    throw $sceMinErr('icontext',
+                        'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
+                        type, trustedValue);
+                }
+                if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') {
+                    return trustedValue;
+                }
+                // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
+                // mutable objects, we ensure here that the value passed in is actually a string.
+                if (typeof trustedValue !== 'string') {
+                    throw $sceMinErr('itype',
+                        'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
+                        type);
+                }
+                return new Constructor(trustedValue);
+            }
+
+            /**
+             * @ngdoc method
+             * @name $sceDelegate#valueOf
+             *
+             * @description
+             * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
+     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
+             *
+             * If the passed parameter is not a value that had been returned by {@link
+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, it must be returned as-is.
+             *
+             * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
+             *     call or anything else.
+             * @return {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
+             *     `value` unchanged.
+             */
+            function valueOf(maybeTrusted) {
+                if (maybeTrusted instanceof trustedValueHolderBase) {
+                    return maybeTrusted.$$unwrapTrustedValue();
+                } else {
+                    return maybeTrusted;
+                }
+            }
+
+            /**
+             * @ngdoc method
+             * @name $sceDelegate#getTrusted
+             *
+             * @description
+             * Takes any input, and either returns a value that's safe to use in the specified context, or
+             * throws an exception.
+             *
+             * In practice, there are several cases. When given a string, this function runs checks
+             * and sanitization to make it safe without prior assumptions. When given the result of a {@link
+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call, it returns the originally supplied
+             * value if that value's context is valid for this call's context. Finally, this function can
+             * also throw when there is no way to turn `maybeTrusted` in a safe value (e.g., no sanitization
+             * is available or possible.)
+             *
+             * @param {string} type The context in which this value is to be used (such as `$sce.HTML`).
+             * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} call, or anything else (which will not be considered trusted.)
+             * @return {*} A version of the value that's safe to use in the given context, or throws an
+             *     exception if this is impossible.
+             */
+            function getTrusted(type, maybeTrusted) {
+                if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') {
+                    return maybeTrusted;
+                }
+                var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+                // If maybeTrusted is a trusted class instance or subclass instance, then unwrap and return
+                // as-is.
+                if (constructor && maybeTrusted instanceof constructor) {
+                    return maybeTrusted.$$unwrapTrustedValue();
+                }
+                // Otherwise, if we get here, then we may either make it safe, or throw an exception. This
+                // depends on the context: some are sanitizatible (HTML), some use whitelists (RESOURCE_URL),
+                // some are impossible to do (JS). This step isn't implemented for CSS and URL, as AngularJS
+                // has no corresponding sinks.
+                if (type === SCE_CONTEXTS.RESOURCE_URL) {
+                    // RESOURCE_URL uses a whitelist.
+                    if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
+                        return maybeTrusted;
+                    } else {
+                        throw $sceMinErr('insecurl',
+                            'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
+                            maybeTrusted.toString());
+                    }
+                } else if (type === SCE_CONTEXTS.HTML) {
+                    // htmlSanitizer throws its own error when no sanitizer is available.
+                    return htmlSanitizer(maybeTrusted);
+                }
+                // Default error when the $sce service has no way to make the input safe.
+                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+            }
+
+            return { trustAs: trustAs,
+                getTrusted: getTrusted,
+                valueOf: valueOf };
+        }];
+    }
+
+
+    /**
+     * @ngdoc provider
+     * @name $sceProvider
+     * @this
+     *
+     * @description
+     *
+     * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
+     * -   enable/disable Strict Contextual Escaping (SCE) in a module
+     * -   override the default implementation with a custom delegate
+     *
+     * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
+     */
+
+    /**
+     * @ngdoc service
+     * @name $sce
+     * @kind function
+     *
+     * @description
+     *
+     * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
+     *
+     * ## Strict Contextual Escaping
+     *
+     * Strict Contextual Escaping (SCE) is a mode in which AngularJS constrains bindings to only render
+     * trusted values. Its goal is to assist in writing code in a way that (a) is secure by default, and
+     * (b) makes auditing for security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
+     *
+     * ### Overview
+     *
+     * To systematically block XSS security bugs, AngularJS treats all values as untrusted by default in
+     * HTML or sensitive URL bindings. When binding untrusted values, AngularJS will automatically
+     * run security checks on them (sanitizations, whitelists, depending on context), or throw when it
+     * cannot guarantee the security of the result. That behavior depends strongly on contexts: HTML
+     * can be sanitized, but template URLs cannot, for instance.
+     *
+     * To illustrate this, consider the `ng-bind-html` directive. It renders its value directly as HTML:
+     * we call that the *context*. When given an untrusted input, AngularJS will attempt to sanitize it
+     * before rendering if a sanitizer is available, and throw otherwise. To bypass sanitization and
+     * render the input as-is, you will need to mark it as trusted for that context before attempting
+     * to bind it.
+     *
+     * As of version 1.2, AngularJS ships with SCE enabled by default.
+     *
+     * ### In practice
+     *
+     * Here's an example of a binding in a privileged context:
+     *
+     * ```
+     * <input ng-model="userHtml" aria-label="User input">
+     * <div ng-bind-html="userHtml"></div>
+     * ```
+     *
+     * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
+     * disabled, this application allows the user to render arbitrary HTML into the DIV, which would
+     * be an XSS security bug. In a more realistic example, one may be rendering user comments, blog
+     * articles, etc. via bindings. (HTML is just one example of a context where rendering user
+     * controlled input creates security vulnerabilities.)
+     *
+     * For the case of HTML, you might use a library, either on the client side, or on the server side,
+     * to sanitize unsafe HTML before binding to the value and rendering it in the document.
+     *
+     * How would you ensure that every place that used these types of bindings was bound to a value that
+     * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
+     * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
+     * properties/fields and forgot to update the binding to the sanitized value?
+     *
+     * To be secure by default, AngularJS makes sure bindings go through that sanitization, or
+     * any similar validation process, unless there's a good reason to trust the given value in this
+     * context.  That trust is formalized with a function call. This means that as a developer, you
+     * can assume all untrusted bindings are safe. Then, to audit your code for binding security issues,
+     * you just need to ensure the values you mark as trusted indeed are safe - because they were
+     * received from your server, sanitized by your library, etc. You can organize your codebase to
+     * help with this - perhaps allowing only the files in a specific directory to do this.
+     * Ensuring that the internal API exposed by that code doesn't markup arbitrary values as safe then
+     * becomes a more manageable task.
+     *
+     * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
+     * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
+     * build the trusted versions of your values.
+     *
+     * ### How does it work?
+     *
+     * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
+ * $sce.getTrusted(context, value)} rather than to the value directly.  Think of this function as
+     * a way to enforce the required security context in your data sink. Directives use {@link
+        * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs
+     * the {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. Also,
+     * when binding without directives, AngularJS will understand the context of your bindings
+     * automatically.
+     *
+     * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
+        * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
+     * simplified):
+     *
+     * ```
+     * var ngBindHtmlDirective = ['$sce', function($sce) {
+     *   return function(scope, element, attr) {
+     *     scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
+     *       element.html(value || '');
+     *     });
+     *   };
+     * }];
+     * ```
+     *
+     * ### Impact on loading templates
+     *
+     * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
+     * `templateUrl`'s specified by {@link guide/directive directives}.
+     *
+     * By default, AngularJS only loads templates from the same domain and protocol as the application
+     * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
+     * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
+ * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
+     *
+     * *Please note*:
+     * The browser's
+     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+     * policy apply in addition to this and may further restrict whether the template is successfully
+     * loaded.  This means that without the right CORS policy, loading templates from a different domain
+     * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
+     * browsers.
+     *
+     * ### This feels like too much overhead
+     *
+     * It's important to remember that SCE only applies to interpolation expressions.
+     *
+     * If your expressions are constant literals, they're automatically trusted and you don't need to
+     * call `$sce.trustAs` on them (e.g.
+     * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works. The `$sceDelegate` will
+     * also use the `$sanitize` service if it is available when binding untrusted values to
+     * `$sce.HTML` context. AngularJS provides an implementation in `angular-sanitize.js`, and if you
+     * wish to use it, you will also need to depend on the {@link ngSanitize `ngSanitize`} module in
+     * your application.
+     *
+     * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
+     * templates in `ng-include` from your application's domain without having to even know about SCE.
+     * It blocks loading templates from other domains or loading templates over http from an https
+     * served document.  You can change these by setting your own custom {@link
+        * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
+        * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
+     *
+     * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
+     * application that's secure and can be audited to verify that with much more ease than bolting
+     * security onto an application later.
+     *
+     * <a name="contexts"></a>
+     * ### What trusted context types are supported?
+     *
+     * | Context             | Notes          |
+     * |---------------------|----------------|
+     * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered, and the {@link ngSanitize.$sanitize $sanitize} service is available (implemented by the {@link ngSanitize ngSanitize} module) this will sanitize the value instead of throwing an error. |
+     * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently, no bindings require this context. Feel free to use it in your own directives. |
+     * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=`, `<img src=`, and some others sanitize their urls and don't constitute an SCE context.) |
+     * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG`, `VIDEO`, `AUDIO`, `SOURCE`, and `TRACK` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does (it's not just the URL that matters, but also what is at the end of it), and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
+     * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently, no bindings require this context.  Feel free to use it in your own directives. |
+     *
+     *
+     * Be aware that `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
+     * through {@link ng.$sce#getTrusted $sce.getTrusted}. There's no CSS-, URL-, or JS-context bindings
+     * in AngularJS currently, so their corresponding `$sce.trustAs` functions aren't useful yet. This
+     * might evolve.
+     *
+     * ### Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+     *
+     *  Each element in these arrays must be one of the following:
+     *
+     *  - **'self'**
+     *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
+     *      domain** as the application document using the **same protocol**.
+     *  - **String** (except the special value `'self'`)
+     *    - The string is matched against the full *normalized / absolute URL* of the resource
+     *      being tested (substring matches are not good enough.)
+     *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
+     *      match themselves.
+     *    - `*`: matches zero or more occurrences of any character other than one of the following 6
+     *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'.  It's a useful wildcard for use
+     *      in a whitelist.
+     *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
+     *      appropriate for use in a scheme, domain, etc. as it would match too much.  (e.g.
+     *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
+     *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
+     *      http://foo.example.com/templates/**).
+     *  - **RegExp** (*see caveat below*)
+     *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
+     *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
+     *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
+     *      have good test coverage).  For instance, the use of `.` in the regex is correct only in a
+     *      small number of cases.  A `.` character in the regex used when matching the scheme or a
+     *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
+     *      is highly recommended to use the string patterns and only fall back to regular expressions
+     *      as a last resort.
+     *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
+     *      matched against the **entire** *normalized / absolute URL* of the resource being tested
+     *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
+     *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
+     *    - If you are generating your JavaScript from some other templating engine (not
+     *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
+     *      remember to escape your regular expression (and be aware that you might need more than
+     *      one level of escaping depending on your templating engine and the way you interpolated
+     *      the value.)  Do make use of your platform's escaping mechanism as it might be good
+     *      enough before coding your own.  E.g. Ruby has
+     *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
+     *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
+     *      Javascript lacks a similar built in function for escaping.  Take a look at Google
+     *      Closure library's [goog.string.regExpEscape(s)](
+     *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
+     *
+     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
+     *
+     * ### Show me an example using SCE.
+     *
+     * <example module="mySceApp" deps="angular-sanitize.js" name="sce-service">
+     * <file name="index.html">
+     *   <div ng-controller="AppController as myCtrl">
+     *     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
+     *     <b>User comments</b><br>
+     *     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
+     *     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
+     *     exploit.
+     *     <div class="well">
+     *       <div ng-repeat="userComment in myCtrl.userComments">
+     *         <b>{{userComment.name}}</b>:
+     *         <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
+     *         <br>
+     *       </div>
+     *     </div>
+     *   </div>
+     * </file>
+     *
+     * <file name="script.js">
+     *   angular.module('mySceApp', ['ngSanitize'])
+     *     .controller('AppController', ['$http', '$templateCache', '$sce',
+     *       function AppController($http, $templateCache, $sce) {
+     *         var self = this;
+     *         $http.get('test_data.json', {cache: $templateCache}).then(function(response) {
+     *           self.userComments = response.data;
+     *         });
+     *         self.explicitlyTrustedHtml = $sce.trustAsHtml(
+     *             '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+     *             'sanitization.&quot;">Hover over this text.</span>');
+     *       }]);
+     * </file>
+     *
+     * <file name="test_data.json">
+     * [
+     *   { "name": "Alice",
+     *     "htmlComment":
+     *         "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
+     *   },
+     *   { "name": "Bob",
+     *     "htmlComment": "<i>Yes!</i>  Am I the only other one?"
+     *   }
+     * ]
+     * </file>
+     *
+     * <file name="protractor.js" type="protractor">
+     *   describe('SCE doc demo', function() {
+     *     it('should sanitize untrusted values', function() {
+     *       expect(element.all(by.css('.htmlComment')).first().getAttribute('innerHTML'))
+     *           .toBe('<span>Is <i>anyone</i> reading this?</span>');
+     *     });
+     *
+     *     it('should NOT sanitize explicitly trusted values', function() {
+     *       expect(element(by.id('explicitlyTrustedHtml')).getAttribute('innerHTML')).toBe(
+     *           '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+     *           'sanitization.&quot;">Hover over this text.</span>');
+     *     });
+     *   });
+     * </file>
+     * </example>
+     *
+     *
+     *
+     * ## Can I disable SCE completely?
+     *
+     * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
+     * for little coding overhead.  It will be much harder to take an SCE disabled application and
+     * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
+     * for cases where you have a lot of existing code that was written before SCE was introduced and
+     * you're migrating them a module at a time. Also do note that this is an app-wide setting, so if
+     * you are writing a library, you will cause security bugs applications using it.
+     *
+     * That said, here's how you can completely disable SCE:
+     *
+     * ```
+     * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
+     *   // Completely disable SCE.  For demonstration purposes only!
+     *   // Do not use in new projects or libraries.
+     *   $sceProvider.enabled(false);
+     * });
+     * ```
+     *
+     */
+
+    function $SceProvider() {
+        var enabled = true;
+
+        /**
+         * @ngdoc method
+         * @name $sceProvider#enabled
+         * @kind function
+         *
+         * @param {boolean=} value If provided, then enables/disables SCE application-wide.
+         * @return {boolean} True if SCE is enabled, false otherwise.
+         *
+         * @description
+         * Enables/disables SCE and returns the current value.
+         */
+        this.enabled = function(value) {
+            if (arguments.length) {
+                enabled = !!value;
+            }
+            return enabled;
+        };
+
+
+        /* Design notes on the default implementation for SCE.
+   *
+   * The API contract for the SCE delegate
+   * -------------------------------------
+   * The SCE delegate object must provide the following 3 methods:
+   *
+   * - trustAs(contextEnum, value)
+   *     This method is used to tell the SCE service that the provided value is OK to use in the
+   *     contexts specified by contextEnum.  It must return an object that will be accepted by
+   *     getTrusted() for a compatible contextEnum and return this value.
+   *
+   * - valueOf(value)
+   *     For values that were not produced by trustAs(), return them as is.  For values that were
+   *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
+   *     trustAs is wrapping the given values into some type, this operation unwraps it when given
+   *     such a value.
+   *
+   * - getTrusted(contextEnum, value)
+   *     This function should return the a value that is safe to use in the context specified by
+   *     contextEnum or throw and exception otherwise.
+   *
+   * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
+   * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
+   * instance, an implementation could maintain a registry of all trusted objects by context.  In
+   * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
+   * return the same object passed in if it was found in the registry under a compatible context or
+   * throw an exception otherwise.  An implementation might only wrap values some of the time based
+   * on some criteria.  getTrusted() might return a value and not throw an exception for special
+   * constants or objects even if not wrapped.  All such implementations fulfill this contract.
+   *
+   *
+   * A note on the inheritance model for SCE contexts
+   * ------------------------------------------------
+   * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
+   * is purely an implementation details.
+   *
+   * The contract is simply this:
+   *
+   *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
+   *     will also succeed.
+   *
+   * Inheritance happens to capture this in a natural way. In some future, we may not use
+   * inheritance anymore. That is OK because no code outside of sce.js and sceSpecs.js would need to
+   * be aware of this detail.
+   */
+
+        this.$get = ['$parse', '$sceDelegate', function(
+            $parse,   $sceDelegate) {
+            // Support: IE 9-11 only
+            // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allow
+            // the "expression(javascript expression)" syntax which is insecure.
+            if (enabled && msie < 8) {
+                throw $sceMinErr('iequirks',
+                    'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
+                    'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
+                    'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
+            }
+
+            var sce = shallowCopy(SCE_CONTEXTS);
+
+            /**
+             * @ngdoc method
+             * @name $sce#isEnabled
+             * @kind function
+             *
+             * @return {Boolean} True if SCE is enabled, false otherwise.  If you want to set the value, you
+             *     have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
+             *
+             * @description
+             * Returns a boolean indicating if SCE is enabled.
+             */
+            sce.isEnabled = function() {
+                return enabled;
+            };
+            sce.trustAs = $sceDelegate.trustAs;
+            sce.getTrusted = $sceDelegate.getTrusted;
+            sce.valueOf = $sceDelegate.valueOf;
+
+            if (!enabled) {
+                sce.trustAs = sce.getTrusted = function(type, value) { return value; };
+                sce.valueOf = identity;
+            }
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAs
+             *
+             * @description
+             * Converts AngularJS {@link guide/expression expression} into a function.  This is like {@link
+                * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
+             * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
+     * *result*)}
+             *
+             * @param {string} type The SCE context in which this result will be used.
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+            sce.parseAs = function sceParseAs(type, expr) {
+                var parsed = $parse(expr);
+                if (parsed.literal && parsed.constant) {
+                    return parsed;
+                } else {
+                    return $parse(expr, function(value) {
+                        return sce.getTrusted(type, value);
+                    });
+                }
+            };
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAs
+             *
+             * @description
+             * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, returns a
+             * wrapped object that represents your value, and the trust you have in its safety for the given
+             * context. AngularJS can then use that value as-is in bindings of the specified secure context.
+             * This is used in bindings for `ng-bind-html`, `ng-include`, and most `src` attribute
+             * interpolations. See {@link ng.$sce $sce} for strict contextual escaping.
+             *
+             * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
+             *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
+             *
+             * @param {*} value The value that that should be considered trusted.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in the context you specified.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsHtml
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsHtml(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.HTML` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.HTML` context (like `ng-bind-html`).
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsCss
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsCss(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.CSS, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.CSS` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant
+             *     of your `value` in `$sce.CSS` context. This context is currently unused, so there are
+             *     almost no reasons to use this function so far.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsUrl(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.URL` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.URL` context. That context is currently unused, so there are almost no reasons
+             *     to use this function so far.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsResourceUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.RESOURCE_URL` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.RESOURCE_URL` context (template URLs in `ng-include`, most `src` attribute
+             *     bindings, ...)
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsJs
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsJs(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.JS` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.JS` context. That context is currently unused, so there are almost no reasons to
+             *     use this function so far.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrusted
+             *
+             * @description
+             * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
+             * takes any input, and either returns a value that's safe to use in the specified context,
+             * or throws an exception. This function is aware of trusted values created by the `trustAs`
+             * function and its shorthands, and when contexts are appropriate, returns the unwrapped value
+             * as-is. Finally, this function can also throw when there is no way to turn `maybeTrusted` in a
+             * safe value (e.g., no sanitization is available or possible.)
+             *
+             * @param {string} type The context in which this value is to be used.
+             * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs
+     *     `$sce.trustAs`} call, or anything else (which will not be considered trusted.)
+             * @return {*} A version of the value that's safe to use in the given context, or throws an
+             *     exception if this is impossible.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedHtml
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedHtml(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.HTML, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedCss
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedCss(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.CSS, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedUrl(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.URL, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedResourceUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
+             *
+             * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedJs
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedJs(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.JS, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsHtml
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsHtml(expression string)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsCss
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsCss(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsUrl(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsResourceUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsJs
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsJs(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+                // Shorthand delegations.
+            var parse = sce.parseAs,
+                getTrusted = sce.getTrusted,
+                trustAs = sce.trustAs;
+
+            forEach(SCE_CONTEXTS, function(enumValue, name) {
+                var lName = lowercase(name);
+                sce[snakeToCamel('parse_as_' + lName)] = function(expr) {
+                    return parse(enumValue, expr);
+                };
+                sce[snakeToCamel('get_trusted_' + lName)] = function(value) {
+                    return getTrusted(enumValue, value);
+                };
+                sce[snakeToCamel('trust_as_' + lName)] = function(value) {
+                    return trustAs(enumValue, value);
+                };
+            });
+
+            return sce;
+        }];
+    }
+
+    /* exported $SnifferProvider */
+
+    /**
+     * !!! This is an undocumented "private" service !!!
+     *
+     * @name $sniffer
+     * @requires $window
+     * @requires $document
+     * @this
+     *
+     * @property {boolean} history Does the browser support html5 history api ?
+     * @property {boolean} transitions Does the browser support CSS transition events ?
+     * @property {boolean} animations Does the browser support CSS animation events ?
+     *
+     * @description
+     * This is very simple implementation of testing browser's features.
+     */
+    function $SnifferProvider() {
+        this.$get = ['$window', '$document', function($window, $document) {
+            var eventSupport = {},
+                // Chrome Packaged Apps are not allowed to access `history.pushState`.
+                // If not sandboxed, they can be detected by the presence of `chrome.app.runtime`
+                // (see https://developer.chrome.com/apps/api_index). If sandboxed, they can be detected by
+                // the presence of an extension runtime ID and the absence of other Chrome runtime APIs
+                // (see https://developer.chrome.com/apps/manifest/sandbox).
+                // (NW.js apps have access to Chrome APIs, but do support `history`.)
+                isNw = $window.nw && $window.nw.process,
+                isChromePackagedApp =
+                    !isNw &&
+                    $window.chrome &&
+                    ($window.chrome.app && $window.chrome.app.runtime ||
+                        !$window.chrome.app && $window.chrome.runtime && $window.chrome.runtime.id),
+                hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState,
+                android =
+                    toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
+                boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
+                document = $document[0] || {},
+                bodyStyle = document.body && document.body.style,
+                transitions = false,
+                animations = false;
+
+            if (bodyStyle) {
+                // Support: Android <5, Blackberry Browser 10, default Chrome in Android 4.4.x
+                // Mentioned browsers need a -webkit- prefix for transitions & animations.
+                transitions = !!('transition' in bodyStyle || 'webkitTransition' in bodyStyle);
+                animations = !!('animation' in bodyStyle || 'webkitAnimation' in bodyStyle);
+            }
+
+
+            return {
+                // Android has history.pushState, but it does not update location correctly
+                // so let's not use the history API at all.
+                // http://code.google.com/p/android/issues/detail?id=17471
+                // https://github.com/angular/angular.js/issues/904
+
+                // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
+                // so let's not use the history API also
+                // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
+                history: !!(hasHistoryPushState && !(android < 4) && !boxee),
+                hasEvent: function(event) {
+                    // Support: IE 9-11 only
+                    // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
+                    // it. In particular the event is not fired when backspace or delete key are pressed or
+                    // when cut operation is performed.
+                    // IE10+ implements 'input' event but it erroneously fires under various situations,
+                    // e.g. when placeholder changes, or a form is focused.
+                    if (event === 'input' && msie) return false;
+
+                    if (isUndefined(eventSupport[event])) {
+                        var divElm = document.createElement('div');
+                        eventSupport[event] = 'on' + event in divElm;
+                    }
+
+                    return eventSupport[event];
+                },
+                csp: csp(),
+                transitions: transitions,
+                animations: animations,
+                android: android
+            };
+        }];
+    }
+
+    var $templateRequestMinErr = minErr('$compile');
+
+    /**
+     * @ngdoc provider
+     * @name $templateRequestProvider
+     * @this
+     *
+     * @description
+     * Used to configure the options passed to the {@link $http} service when making a template request.
+     *
+     * For example, it can be used for specifying the "Accept" header that is sent to the server, when
+     * requesting a template.
+     */
+    function $TemplateRequestProvider() {
+
+        var httpOptions;
+
+        /**
+         * @ngdoc method
+         * @name $templateRequestProvider#httpOptions
+         * @description
+         * The options to be passed to the {@link $http} service when making the request.
+         * You can use this to override options such as the "Accept" header for template requests.
+         *
+         * The {@link $templateRequest} will set the `cache` and the `transformResponse` properties of the
+         * options if not overridden here.
+         *
+         * @param {string=} value new value for the {@link $http} options.
+         * @returns {string|self} Returns the {@link $http} options when used as getter and self if used as setter.
+         */
+        this.httpOptions = function(val) {
+            if (val) {
+                httpOptions = val;
+                return this;
+            }
+            return httpOptions;
+        };
+
+        /**
+         * @ngdoc service
+         * @name $templateRequest
+         *
+         * @description
+         * The `$templateRequest` service runs security checks then downloads the provided template using
+         * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request
+         * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the
+         * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the
+         * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted
+         * when `tpl` is of type string and `$templateCache` has the matching entry.
+         *
+         * If you want to pass custom options to the `$http` service, such as setting the Accept header you
+         * can configure this via {@link $templateRequestProvider#httpOptions}.
+         *
+         * `$templateRequest` is used internally by {@link $compile}, {@link ngRoute.$route}, and directives such
+         * as {@link ngInclude} to download and cache templates.
+         *
+         * 3rd party modules should use `$templateRequest` if their services or directives are loading
+         * templates.
+         *
+         * @param {string|TrustedResourceUrl} tpl The HTTP request template URL
+         * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
+         *
+         * @return {Promise} a promise for the HTTP response data of the given URL.
+         *
+         * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
+         */
+        this.$get = ['$exceptionHandler', '$templateCache', '$http', '$q', '$sce',
+            function($exceptionHandler, $templateCache, $http, $q, $sce) {
+
+                function handleRequestFn(tpl, ignoreRequestError) {
+                    handleRequestFn.totalPendingRequests++;
+
+                    // We consider the template cache holds only trusted templates, so
+                    // there's no need to go through whitelisting again for keys that already
+                    // are included in there. This also makes AngularJS accept any script
+                    // directive, no matter its name. However, we still need to unwrap trusted
+                    // types.
+                    if (!isString(tpl) || isUndefined($templateCache.get(tpl))) {
+                        tpl = $sce.getTrustedResourceUrl(tpl);
+                    }
+
+                    var transformResponse = $http.defaults && $http.defaults.transformResponse;
+
+                    if (isArray(transformResponse)) {
+                        transformResponse = transformResponse.filter(function(transformer) {
+                            return transformer !== defaultHttpResponseTransform;
+                        });
+                    } else if (transformResponse === defaultHttpResponseTransform) {
+                        transformResponse = null;
+                    }
+
+                    return $http.get(tpl, extend({
+                        cache: $templateCache,
+                        transformResponse: transformResponse
+                    }, httpOptions))
+                        .finally(function() {
+                            handleRequestFn.totalPendingRequests--;
+                        })
+                        .then(function(response) {
+                            $templateCache.put(tpl, response.data);
+                            return response.data;
+                        }, handleError);
+
+                    function handleError(resp) {
+                        if (!ignoreRequestError) {
+                            resp = $templateRequestMinErr('tpload',
+                                'Failed to load template: {0} (HTTP status: {1} {2})',
+                                tpl, resp.status, resp.statusText);
+
+                            $exceptionHandler(resp);
+                        }
+
+                        return $q.reject(resp);
+                    }
+                }
+
+                handleRequestFn.totalPendingRequests = 0;
+
+                return handleRequestFn;
+            }
+        ];
+    }
+
+    /** @this */
+    function $$TestabilityProvider() {
+        this.$get = ['$rootScope', '$browser', '$location',
+            function($rootScope,   $browser,   $location) {
+
+                /**
+                 * @name $testability
+                 *
+                 * @description
+                 * The private $$testability service provides a collection of methods for use when debugging
+                 * or by automated test and debugging tools.
+                 */
+                var testability = {};
+
+                /**
+                 * @name $$testability#findBindings
+                 *
+                 * @description
+                 * Returns an array of elements that are bound (via ng-bind or {{}})
+                 * to expressions matching the input.
+                 *
+                 * @param {Element} element The element root to search from.
+                 * @param {string} expression The binding expression to match.
+                 * @param {boolean} opt_exactMatch If true, only returns exact matches
+                 *     for the expression. Filters and whitespace are ignored.
+                 */
+                testability.findBindings = function(element, expression, opt_exactMatch) {
+                    var bindings = element.getElementsByClassName('ng-binding');
+                    var matches = [];
+                    forEach(bindings, function(binding) {
+                        var dataBinding = angular.element(binding).data('$binding');
+                        if (dataBinding) {
+                            forEach(dataBinding, function(bindingName) {
+                                if (opt_exactMatch) {
+                                    var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)');
+                                    if (matcher.test(bindingName)) {
+                                        matches.push(binding);
+                                    }
+                                } else {
+                                    if (bindingName.indexOf(expression) !== -1) {
+                                        matches.push(binding);
+                                    }
+                                }
+                            });
+                        }
+                    });
+                    return matches;
+                };
+
+                /**
+                 * @name $$testability#findModels
+                 *
+                 * @description
+                 * Returns an array of elements that are two-way found via ng-model to
+                 * expressions matching the input.
+                 *
+                 * @param {Element} element The element root to search from.
+                 * @param {string} expression The model expression to match.
+                 * @param {boolean} opt_exactMatch If true, only returns exact matches
+                 *     for the expression.
+                 */
+                testability.findModels = function(element, expression, opt_exactMatch) {
+                    var prefixes = ['ng-', 'data-ng-', 'ng\\:'];
+                    for (var p = 0; p < prefixes.length; ++p) {
+                        var attributeEquals = opt_exactMatch ? '=' : '*=';
+                        var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]';
+                        var elements = element.querySelectorAll(selector);
+                        if (elements.length) {
+                            return elements;
+                        }
+                    }
+                };
+
+                /**
+                 * @name $$testability#getLocation
+                 *
+                 * @description
+                 * Shortcut for getting the location in a browser agnostic way. Returns
+                 *     the path, search, and hash. (e.g. /path?a=b#hash)
+                 */
+                testability.getLocation = function() {
+                    return $location.url();
+                };
+
+                /**
+                 * @name $$testability#setLocation
+                 *
+                 * @description
+                 * Shortcut for navigating to a location without doing a full page reload.
+                 *
+                 * @param {string} url The location url (path, search and hash,
+                 *     e.g. /path?a=b#hash) to go to.
+                 */
+                testability.setLocation = function(url) {
+                    if (url !== $location.url()) {
+                        $location.url(url);
+                        $rootScope.$digest();
+                    }
+                };
+
+                /**
+                 * @name $$testability#whenStable
+                 *
+                 * @description
+                 * Calls the callback when $timeout and $http requests are completed.
+                 *
+                 * @param {function} callback
+                 */
+                testability.whenStable = function(callback) {
+                    $browser.notifyWhenNoOutstandingRequests(callback);
+                };
+
+                return testability;
+            }];
+    }
+
+    /** @this */
+    function $TimeoutProvider() {
+        this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
+            function($rootScope,   $browser,   $q,   $$q,   $exceptionHandler) {
+
+                var deferreds = {};
+
+
+                /**
+                 * @ngdoc service
+                 * @name $timeout
+                 *
+                 * @description
+                 * AngularJS's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
+                 * block and delegates any exceptions to
+                 * {@link ng.$exceptionHandler $exceptionHandler} service.
+                 *
+                 * The return value of calling `$timeout` is a promise, which will be resolved when
+                 * the delay has passed and the timeout function, if provided, is executed.
+                 *
+                 * To cancel a timeout request, call `$timeout.cancel(promise)`.
+                 *
+                 * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
+                 * synchronously flush the queue of deferred functions.
+                 *
+                 * If you only want a promise that will be resolved after some specified delay
+                 * then you can call `$timeout` without the `fn` function.
+                 *
+                 * @param {function()=} fn A function, whose execution should be delayed.
+                 * @param {number=} [delay=0] Delay in milliseconds.
+                 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+                 *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+                 * @param {...*=} Pass additional parameters to the executed function.
+                 * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise
+                 *   will be resolved with the return value of the `fn` function.
+                 *
+                 */
+                function timeout(fn, delay, invokeApply) {
+                    if (!isFunction(fn)) {
+                        invokeApply = delay;
+                        delay = fn;
+                        fn = noop;
+                    }
+
+                    var args = sliceArgs(arguments, 3),
+                        skipApply = (isDefined(invokeApply) && !invokeApply),
+                        deferred = (skipApply ? $$q : $q).defer(),
+                        promise = deferred.promise,
+                        timeoutId;
+
+                    timeoutId = $browser.defer(function() {
+                        try {
+                            deferred.resolve(fn.apply(null, args));
+                        } catch (e) {
+                            deferred.reject(e);
+                            $exceptionHandler(e);
+                        } finally {
+                            delete deferreds[promise.$$timeoutId];
+                        }
+
+                        if (!skipApply) $rootScope.$apply();
+                    }, delay);
+
+                    promise.$$timeoutId = timeoutId;
+                    deferreds[timeoutId] = deferred;
+
+                    return promise;
+                }
+
+
+                /**
+                 * @ngdoc method
+                 * @name $timeout#cancel
+                 *
+                 * @description
+                 * Cancels a task associated with the `promise`. As a result of this, the promise will be
+                 * resolved with a rejection.
+                 *
+                 * @param {Promise=} promise Promise returned by the `$timeout` function.
+                 * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
+                 *   canceled.
+                 */
+                timeout.cancel = function(promise) {
+                    if (promise && promise.$$timeoutId in deferreds) {
+                        // Timeout cancels should not report an unhandled promise.
+                        markQExceptionHandled(deferreds[promise.$$timeoutId].promise);
+                        deferreds[promise.$$timeoutId].reject('canceled');
+                        delete deferreds[promise.$$timeoutId];
+                        return $browser.defer.cancel(promise.$$timeoutId);
+                    }
+                    return false;
+                };
+
+                return timeout;
+            }];
+    }
+
+// NOTE:  The usage of window and document instead of $window and $document here is
+// deliberate.  This service depends on the specific behavior of anchor nodes created by the
+// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
+// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
+// doesn't know about mocked locations and resolves URLs to the real document - which is
+// exactly the behavior needed here.  There is little value is mocking these out for this
+// service.
+    var urlParsingNode = window.document.createElement('a');
+    var originUrl = urlResolve(window.location.href);
+
+
+    /**
+     *
+     * Implementation Notes for non-IE browsers
+     * ----------------------------------------
+     * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
+     * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
+     * URL will be resolved into an absolute URL in the context of the application document.
+     * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
+     * properties are all populated to reflect the normalized URL.  This approach has wide
+     * compatibility - Safari 1+, Mozilla 1+ etc.  See
+     * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+     *
+     * Implementation Notes for IE
+     * ---------------------------
+     * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other
+     * browsers.  However, the parsed components will not be set if the URL assigned did not specify
+     * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
+     * work around that by performing the parsing in a 2nd step by taking a previously normalized
+     * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
+     * properties such as protocol, hostname, port, etc.
+     *
+     * References:
+     *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
+     *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+     *   http://url.spec.whatwg.org/#urlutils
+     *   https://github.com/angular/angular.js/pull/2902
+     *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+     *
+     * @kind function
+     * @param {string} url The URL to be parsed.
+     * @description Normalizes and parses a URL.
+     * @returns {object} Returns the normalized URL as a dictionary.
+     *
+     *   | member name   | Description    |
+     *   |---------------|----------------|
+     *   | href          | A normalized version of the provided URL if it was not an absolute URL |
+     *   | protocol      | The protocol including the trailing colon                              |
+     *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
+     *   | search        | The search params, minus the question mark                             |
+     *   | hash          | The hash string, minus the hash symbol
+     *   | hostname      | The hostname
+     *   | port          | The port, without ":"
+     *   | pathname      | The pathname, beginning with "/"
+     *
+     */
+    function urlResolve(url) {
+        var href = url;
+
+        // Support: IE 9-11 only
+        if (msie) {
+            // Normalize before parse.  Refer Implementation Notes on why this is
+            // done in two steps on IE.
+            urlParsingNode.setAttribute('href', href);
+            href = urlParsingNode.href;
+        }
+
+        urlParsingNode.setAttribute('href', href);
+
+        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+        return {
+            href: urlParsingNode.href,
+            protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+            host: urlParsingNode.host,
+            search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+            hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+            hostname: urlParsingNode.hostname,
+            port: urlParsingNode.port,
+            pathname: (urlParsingNode.pathname.charAt(0) === '/')
+                ? urlParsingNode.pathname
+                : '/' + urlParsingNode.pathname
+        };
+    }
+
+    /**
+     * Parse a request URL and determine whether this is a same-origin request as the application document.
+     *
+     * @param {string|object} requestUrl The url of the request as a string that will be resolved
+     * or a parsed URL object.
+     * @returns {boolean} Whether the request is for the same origin as the application document.
+     */
+    function urlIsSameOrigin(requestUrl) {
+        var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
+        return (parsed.protocol === originUrl.protocol &&
+            parsed.host === originUrl.host);
+    }
+
+    /**
+     * @ngdoc service
+     * @name $window
+     * @this
+     *
+     * @description
+     * A reference to the browser's `window` object. While `window`
+     * is globally available in JavaScript, it causes testability problems, because
+     * it is a global variable. In AngularJS we always refer to it through the
+     * `$window` service, so it may be overridden, removed or mocked for testing.
+     *
+     * Expressions, like the one defined for the `ngClick` directive in the example
+     * below, are evaluated with respect to the current scope.  Therefore, there is
+     * no risk of inadvertently coding in a dependency on a global value in such an
+     * expression.
+     *
+     * @example
+     <example module="windowExample" name="window-service">
+     <file name="index.html">
+     <script>
+     angular.module('windowExample', [])
+     .controller('ExampleController', ['$scope', '$window', function($scope, $window) {
+             $scope.greeting = 'Hello, World!';
+             $scope.doGreeting = function(greeting) {
+               $window.alert(greeting);
+             };
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <input type="text" ng-model="greeting" aria-label="greeting" />
+     <button ng-click="doGreeting(greeting)">ALERT</button>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should display the greeting in the input box', function() {
+       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
+       // If we click the button it will block the test runner
+       // element(':button').click();
+      });
+     </file>
+     </example>
+     */
+    function $WindowProvider() {
+        this.$get = valueFn(window);
+    }
+
+    /**
+     * @name $$cookieReader
+     * @requires $document
+     *
+     * @description
+     * This is a private service for reading cookies used by $http and ngCookies
+     *
+     * @return {Object} a key/value map of the current cookies
+     */
+    function $$CookieReader($document) {
+        var rawDocument = $document[0] || {};
+        var lastCookies = {};
+        var lastCookieString = '';
+
+        function safeGetCookie(rawDocument) {
+            try {
+                return rawDocument.cookie || '';
+            } catch (e) {
+                return '';
+            }
+        }
+
+        function safeDecodeURIComponent(str) {
+            try {
+                return decodeURIComponent(str);
+            } catch (e) {
+                return str;
+            }
+        }
+
+        return function() {
+            var cookieArray, cookie, i, index, name;
+            var currentCookieString = safeGetCookie(rawDocument);
+
+            if (currentCookieString !== lastCookieString) {
+                lastCookieString = currentCookieString;
+                cookieArray = lastCookieString.split('; ');
+                lastCookies = {};
+
+                for (i = 0; i < cookieArray.length; i++) {
+                    cookie = cookieArray[i];
+                    index = cookie.indexOf('=');
+                    if (index > 0) { //ignore nameless cookies
+                        name = safeDecodeURIComponent(cookie.substring(0, index));
+                        // the first value that is seen for a cookie is the most
+                        // specific one.  values for the same cookie name that
+                        // follow are for less specific paths.
+                        if (isUndefined(lastCookies[name])) {
+                            lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
+                        }
+                    }
+                }
+            }
+            return lastCookies;
+        };
+    }
+
+    $$CookieReader.$inject = ['$document'];
+
+    /** @this */
+    function $$CookieReaderProvider() {
+        this.$get = $$CookieReader;
+    }
+
+    /* global currencyFilter: true,
+ dateFilter: true,
+ filterFilter: true,
+ jsonFilter: true,
+ limitToFilter: true,
+ lowercaseFilter: true,
+ numberFilter: true,
+ orderByFilter: true,
+ uppercaseFilter: true,
+ */
+
+    /**
+     * @ngdoc provider
+     * @name $filterProvider
+     * @description
+     *
+     * Filters are just functions which transform input to an output. However filters need to be
+     * Dependency Injected. To achieve this a filter definition consists of a factory function which is
+     * annotated with dependencies and is responsible for creating a filter function.
+     *
+     * <div class="alert alert-warning">
+     * **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+     * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+     * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+     * (`myapp_subsection_filterx`).
+     * </div>
+     *
+     * ```js
+     *   // Filter registration
+     *   function MyModule($provide, $filterProvider) {
+     *     // create a service to demonstrate injection (not always needed)
+     *     $provide.value('greet', function(name){
+     *       return 'Hello ' + name + '!';
+     *     });
+     *
+     *     // register a filter factory which uses the
+     *     // greet service to demonstrate DI.
+     *     $filterProvider.register('greet', function(greet){
+     *       // return the filter function which uses the greet service
+     *       // to generate salutation
+     *       return function(text) {
+     *         // filters need to be forgiving so check input validity
+     *         return text && greet(text) || text;
+     *       };
+     *     });
+     *   }
+     * ```
+     *
+     * The filter function is registered with the `$injector` under the filter name suffix with
+     * `Filter`.
+     *
+     * ```js
+     *   it('should be the same instance', inject(
+     *     function($filterProvider) {
+     *       $filterProvider.register('reverse', function(){
+     *         return ...;
+     *       });
+     *     },
+     *     function($filter, reverseFilter) {
+     *       expect($filter('reverse')).toBe(reverseFilter);
+     *     });
+     * ```
+     *
+     *
+     * For more information about how AngularJS filters work, and how to create your own filters, see
+     * {@link guide/filter Filters} in the AngularJS Developer Guide.
+     */
+
+    /**
+     * @ngdoc service
+     * @name $filter
+     * @kind function
+     * @description
+     * Filters are used for formatting data displayed to the user.
+     *
+     * They can be used in view templates, controllers or services. AngularJS comes
+     * with a collection of [built-in filters](api/ng/filter), but it is easy to
+     * define your own as well.
+     *
+     * The general syntax in templates is as follows:
+     *
+     * ```html
+     * {{ expression [| filter_name[:parameter_value] ... ] }}
+     * ```
+     *
+     * @param {String} name Name of the filter function to retrieve
+     * @return {Function} the filter function
+     * @example
+     <example name="$filter" module="filterExample">
+     <file name="index.html">
+     <div ng-controller="MainCtrl">
+     <h3>{{ originalText }}</h3>
+     <h3>{{ filteredText }}</h3>
+     </div>
+     </file>
+
+     <file name="script.js">
+     angular.module('filterExample', [])
+     .controller('MainCtrl', function($scope, $filter) {
+        $scope.originalText = 'hello';
+        $scope.filteredText = $filter('uppercase')($scope.originalText);
+      });
+     </file>
+     </example>
+     */
+    $FilterProvider.$inject = ['$provide'];
+    /** @this */
+    function $FilterProvider($provide) {
+        var suffix = 'Filter';
+
+        /**
+         * @ngdoc method
+         * @name $filterProvider#register
+         * @param {string|Object} name Name of the filter function, or an object map of filters where
+         *    the keys are the filter names and the values are the filter factories.
+         *
+         *    <div class="alert alert-warning">
+         *    **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+         *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+         *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+         *    (`myapp_subsection_filterx`).
+         *    </div>
+         * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered.
+         * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
+         *    of the registered filter instances.
+         */
+        function register(name, factory) {
+            if (isObject(name)) {
+                var filters = {};
+                forEach(name, function(filter, key) {
+                    filters[key] = register(key, filter);
+                });
+                return filters;
+            } else {
+                return $provide.factory(name + suffix, factory);
+            }
+        }
+        this.register = register;
+
+        this.$get = ['$injector', function($injector) {
+            return function(name) {
+                return $injector.get(name + suffix);
+            };
+        }];
+
+        ////////////////////////////////////////
+
+        /* global
+    currencyFilter: false,
+    dateFilter: false,
+    filterFilter: false,
+    jsonFilter: false,
+    limitToFilter: false,
+    lowercaseFilter: false,
+    numberFilter: false,
+    orderByFilter: false,
+    uppercaseFilter: false
+  */
+
+        register('currency', currencyFilter);
+        register('date', dateFilter);
+        register('filter', filterFilter);
+        register('json', jsonFilter);
+        register('limitTo', limitToFilter);
+        register('lowercase', lowercaseFilter);
+        register('number', numberFilter);
+        register('orderBy', orderByFilter);
+        register('uppercase', uppercaseFilter);
+    }
+
+    /**
+     * @ngdoc filter
+     * @name filter
+     * @kind function
+     *
+     * @description
+     * Selects a subset of items from `array` and returns it as a new array.
+     *
+     * @param {Array} array The source array.
+     * <div class="alert alert-info">
+     *   **Note**: If the array contains objects that reference themselves, filtering is not possible.
+     * </div>
+     * @param {string|Object|function()} expression The predicate to be used for selecting items from
+     *   `array`.
+     *
+     *   Can be one of:
+     *
+     *   - `string`: The string is used for matching against the contents of the `array`. All strings or
+     *     objects with string properties in `array` that match this string will be returned. This also
+     *     applies to nested object properties.
+     *     The predicate can be negated by prefixing the string with `!`.
+     *
+     *   - `Object`: A pattern object can be used to filter specific properties on objects contained
+     *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
+     *     which have property `name` containing "M" and property `phone` containing "1". A special
+     *     property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
+     *     against any property of the object or its nested object properties. That's equivalent to the
+     *     simple substring match with a `string` as described above. The special property name can be
+     *     overwritten, using the `anyPropertyKey` parameter.
+     *     The predicate can be negated by prefixing the string with `!`.
+     *     For example `{name: "!M"}` predicate will return an array of items which have property `name`
+     *     not containing "M".
+     *
+     *     Note that a named property will match properties on the same level only, while the special
+     *     `$` property will match properties on the same level or deeper. E.g. an array item like
+     *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
+     *     **will** be matched by `{$: 'John'}`.
+     *
+     *   - `function(value, index, array)`: A predicate function can be used to write arbitrary filters.
+     *     The function is called for each element of the array, with the element, its index, and
+     *     the entire array itself as arguments.
+     *
+     *     The final result is an array of those elements that the predicate returned true for.
+     *
+     * @param {function(actual, expected)|true|false} [comparator] Comparator which is used in
+     *     determining if values retrieved using `expression` (when it is not a function) should be
+     *     considered a match based on the expected value (from the filter expression) and actual
+     *     value (from the object in the array).
+     *
+     *   Can be one of:
+     *
+     *   - `function(actual, expected)`:
+     *     The function will be given the object value and the predicate value to compare and
+     *     should return true if both values should be considered equal.
+     *
+     *   - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`.
+     *     This is essentially strict comparison of expected and actual.
+     *
+     *   - `false`: A short hand for a function which will look for a substring match in a case
+     *     insensitive way. Primitive values are converted to strings. Objects are not compared against
+     *     primitives, unless they have a custom `toString` method (e.g. `Date` objects).
+     *
+     *
+     *   Defaults to `false`.
+     *
+     * @param {string} [anyPropertyKey] The special property name that matches against any property.
+     *     By default `$`.
+     *
+     * @example
+     <example name="filter-filter">
+     <file name="index.html">
+     <div ng-init="friends = [{name:'John', phone:'555-1276'},
+     {name:'Mary', phone:'800-BIG-MARY'},
+     {name:'Mike', phone:'555-4321'},
+     {name:'Adam', phone:'555-5678'},
+     {name:'Julie', phone:'555-8765'},
+     {name:'Juliette', phone:'555-5678'}]"></div>
+
+     <label>Search: <input ng-model="searchText"></label>
+     <table id="searchTextResults">
+     <tr><th>Name</th><th>Phone</th></tr>
+     <tr ng-repeat="friend in friends | filter:searchText">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     </tr>
+     </table>
+     <hr>
+     <label>Any: <input ng-model="search.$"></label> <br>
+     <label>Name only <input ng-model="search.name"></label><br>
+     <label>Phone only <input ng-model="search.phone"></label><br>
+     <label>Equality <input type="checkbox" ng-model="strict"></label><br>
+     <table id="searchObjResults">
+     <tr><th>Name</th><th>Phone</th></tr>
+     <tr ng-repeat="friendObj in friends | filter:search:strict">
+     <td>{{friendObj.name}}</td>
+     <td>{{friendObj.phone}}</td>
+     </tr>
+     </table>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var expectFriendNames = function(expectedNames, key) {
+         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
+           arr.forEach(function(wd, i) {
+             expect(wd.getText()).toMatch(expectedNames[i]);
+           });
+         });
+       };
+
+     it('should search across all fields when filtering with a string', function() {
+         var searchText = element(by.model('searchText'));
+         searchText.clear();
+         searchText.sendKeys('m');
+         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+
+         searchText.clear();
+         searchText.sendKeys('76');
+         expectFriendNames(['John', 'Julie'], 'friend');
+       });
+
+     it('should search in specific fields when filtering with a predicate object', function() {
+         var searchAny = element(by.model('search.$'));
+         searchAny.clear();
+         searchAny.sendKeys('i');
+         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
+       });
+     it('should use a equal comparison when comparator is true', function() {
+         var searchName = element(by.model('search.name'));
+         var strict = element(by.model('strict'));
+         searchName.clear();
+         searchName.sendKeys('Julie');
+         strict.click();
+         expectFriendNames(['Julie'], 'friendObj');
+       });
+     </file>
+     </example>
+     */
+
+    function filterFilter() {
+        return function(array, expression, comparator, anyPropertyKey) {
+            if (!isArrayLike(array)) {
+                if (array == null) {
+                    return array;
+                } else {
+                    throw minErr('filter')('notarray', 'Expected array but received: {0}', array);
+                }
+            }
+
+            anyPropertyKey = anyPropertyKey || '$';
+            var expressionType = getTypeForFilter(expression);
+            var predicateFn;
+            var matchAgainstAnyProp;
+
+            switch (expressionType) {
+                case 'function':
+                    predicateFn = expression;
+                    break;
+                case 'boolean':
+                case 'null':
+                case 'number':
+                case 'string':
+                    matchAgainstAnyProp = true;
+                // falls through
+                case 'object':
+                    predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+                    break;
+                default:
+                    return array;
+            }
+
+            return Array.prototype.filter.call(array, predicateFn);
+        };
+    }
+
+// Helper functions for `filterFilter`
+    function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
+        var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+        var predicateFn;
+
+        if (comparator === true) {
+            comparator = equals;
+        } else if (!isFunction(comparator)) {
+            comparator = function(actual, expected) {
+                if (isUndefined(actual)) {
+                    // No substring matching against `undefined`
+                    return false;
+                }
+                if ((actual === null) || (expected === null)) {
+                    // No substring matching against `null`; only match against `null`
+                    return actual === expected;
+                }
+                if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
+                    // Should not compare primitives against objects, unless they have custom `toString` method
+                    return false;
+                }
+
+                actual = lowercase('' + actual);
+                expected = lowercase('' + expected);
+                return actual.indexOf(expected) !== -1;
+            };
+        }
+
+        predicateFn = function(item) {
+            if (shouldMatchPrimitives && !isObject(item)) {
+                return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+            }
+            return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+        };
+
+        return predicateFn;
+    }
+
+    function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+        var actualType = getTypeForFilter(actual);
+        var expectedType = getTypeForFilter(expected);
+
+        if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
+            return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+        } else if (isArray(actual)) {
+            // In case `actual` is an array, consider it a match
+            // if ANY of it's items matches `expected`
+            return actual.some(function(item) {
+                return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+            });
+        }
+
+        switch (actualType) {
+            case 'object':
+                var key;
+                if (matchAgainstAnyProp) {
+                    for (key in actual) {
+                        // Under certain, rare, circumstances, key may not be a string and `charAt` will be undefined
+                        // See: https://github.com/angular/angular.js/issues/15644
+                        if (key.charAt && (key.charAt(0) !== '$') &&
+                            deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+                            return true;
+                        }
+                    }
+                    return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+                } else if (expectedType === 'object') {
+                    for (key in expected) {
+                        var expectedVal = expected[key];
+                        if (isFunction(expectedVal) || isUndefined(expectedVal)) {
+                            continue;
+                        }
+
+                        var matchAnyProperty = key === anyPropertyKey;
+                        var actualVal = matchAnyProperty ? actual : actual[key];
+                        if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                } else {
+                    return comparator(actual, expected);
+                }
+            case 'function':
+                return false;
+            default:
+                return comparator(actual, expected);
+        }
+    }
+
+// Used for easily differentiating between `null` and actual `object`
+    function getTypeForFilter(val) {
+        return (val === null) ? 'null' : typeof val;
+    }
+
+    var MAX_DIGITS = 22;
+    var DECIMAL_SEP = '.';
+    var ZERO_CHAR = '0';
+
+    /**
+     * @ngdoc filter
+     * @name currency
+     * @kind function
+     *
+     * @description
+     * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
+     * symbol for current locale is used.
+     *
+     * @param {number} amount Input to filter.
+     * @param {string=} symbol Currency symbol or identifier to be displayed.
+     * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
+     * @returns {string} Formatted number.
+     *
+     *
+     * @example
+     <example module="currencyExample" name="currency-filter">
+     <file name="index.html">
+     <script>
+     angular.module('currencyExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.amount = 1234.56;
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <input type="number" ng-model="amount" aria-label="amount"> <br>
+     default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
+     custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span><br>
+     no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should init with 1234.56', function() {
+         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
+         expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235');
+       });
+     it('should update', function() {
+         if (browser.params.browser === 'safari') {
+           // Safari does not understand the minus key. See
+           // https://github.com/angular/protractor/issues/481
+           return;
+         }
+         element(by.model('amount')).clear();
+         element(by.model('amount')).sendKeys('-1234');
+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
+       });
+     </file>
+     </example>
+     */
+    currencyFilter.$inject = ['$locale'];
+    function currencyFilter($locale) {
+        var formats = $locale.NUMBER_FORMATS;
+        return function(amount, currencySymbol, fractionSize) {
+            if (isUndefined(currencySymbol)) {
+                currencySymbol = formats.CURRENCY_SYM;
+            }
+
+            if (isUndefined(fractionSize)) {
+                fractionSize = formats.PATTERNS[1].maxFrac;
+            }
+
+            // If the currency symbol is empty, trim whitespace around the symbol
+            var currencySymbolRe = !currencySymbol ? /\s*\u00A4\s*/g : /\u00A4/g;
+
+            // if null or undefined pass it through
+            return (amount == null)
+                ? amount
+                : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).
+                replace(currencySymbolRe, currencySymbol);
+        };
+    }
+
+    /**
+     * @ngdoc filter
+     * @name number
+     * @kind function
+     *
+     * @description
+     * Formats a number as text.
+     *
+     * If the input is null or undefined, it will just be returned.
+     * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively.
+     * If the input is not a number an empty string is returned.
+     *
+     *
+     * @param {number|string} number Number to format.
+     * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
+     * If this is not provided then the fraction size is computed from the current locale's number
+     * formatting pattern. In the case of the default locale, it will be 3.
+     * @returns {string} Number rounded to `fractionSize` appropriately formatted based on the current
+     *                   locale (e.g., in the en_US locale it will have "." as the decimal separator and
+     *                   include "," group separators after each third digit).
+     *
+     * @example
+     <example module="numberFilterExample" name="number-filter">
+     <file name="index.html">
+     <script>
+     angular.module('numberFilterExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.val = 1234.56789;
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <label>Enter number: <input ng-model='val'></label><br>
+     Default formatting: <span id='number-default'>{{val | number}}</span><br>
+     No fractions: <span>{{val | number:0}}</span><br>
+     Negative number: <span>{{-val | number:4}}</span>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should format numbers', function() {
+         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
+         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
+       });
+
+     it('should update', function() {
+         element(by.model('val')).clear();
+         element(by.model('val')).sendKeys('3374.333');
+         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
+         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+      });
+     </file>
+     </example>
+     */
+    numberFilter.$inject = ['$locale'];
+    function numberFilter($locale) {
+        var formats = $locale.NUMBER_FORMATS;
+        return function(number, fractionSize) {
+
+            // if null or undefined pass it through
+            return (number == null)
+                ? number
+                : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
+                    fractionSize);
+        };
+    }
+
+    /**
+     * Parse a number (as a string) into three components that can be used
+     * for formatting the number.
+     *
+     * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/)
+     *
+     * @param  {string} numStr The number to parse
+     * @return {object} An object describing this number, containing the following keys:
+     *  - d : an array of digits containing leading zeros as necessary
+     *  - i : the number of the digits in `d` that are to the left of the decimal point
+     *  - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d`
+     *
+     */
+    function parse(numStr) {
+        var exponent = 0, digits, numberOfIntegerDigits;
+        var i, j, zeros;
+
+        // Decimal point?
+        if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) {
+            numStr = numStr.replace(DECIMAL_SEP, '');
+        }
+
+        // Exponential form?
+        if ((i = numStr.search(/e/i)) > 0) {
+            // Work out the exponent.
+            if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i;
+            numberOfIntegerDigits += +numStr.slice(i + 1);
+            numStr = numStr.substring(0, i);
+        } else if (numberOfIntegerDigits < 0) {
+            // There was no decimal point or exponent so it is an integer.
+            numberOfIntegerDigits = numStr.length;
+        }
+
+        // Count the number of leading zeros.
+        for (i = 0; numStr.charAt(i) === ZERO_CHAR; i++) { /* empty */ }
+
+        if (i === (zeros = numStr.length)) {
+            // The digits are all zero.
+            digits = [0];
+            numberOfIntegerDigits = 1;
+        } else {
+            // Count the number of trailing zeros
+            zeros--;
+            while (numStr.charAt(zeros) === ZERO_CHAR) zeros--;
+
+            // Trailing zeros are insignificant so ignore them
+            numberOfIntegerDigits -= i;
+            digits = [];
+            // Convert string to array of digits without leading/trailing zeros.
+            for (j = 0; i <= zeros; i++, j++) {
+                digits[j] = +numStr.charAt(i);
+            }
+        }
+
+        // If the number overflows the maximum allowed digits then use an exponent.
+        if (numberOfIntegerDigits > MAX_DIGITS) {
+            digits = digits.splice(0, MAX_DIGITS - 1);
+            exponent = numberOfIntegerDigits - 1;
+            numberOfIntegerDigits = 1;
+        }
+
+        return { d: digits, e: exponent, i: numberOfIntegerDigits };
+    }
+
+    /**
+     * Round the parsed number to the specified number of decimal places
+     * This function changed the parsedNumber in-place
+     */
+    function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) {
+        var digits = parsedNumber.d;
+        var fractionLen = digits.length - parsedNumber.i;
+
+        // determine fractionSize if it is not specified; `+fractionSize` converts it to a number
+        fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize;
+
+        // The index of the digit to where rounding is to occur
+        var roundAt = fractionSize + parsedNumber.i;
+        var digit = digits[roundAt];
+
+        if (roundAt > 0) {
+            // Drop fractional digits beyond `roundAt`
+            digits.splice(Math.max(parsedNumber.i, roundAt));
+
+            // Set non-fractional digits beyond `roundAt` to 0
+            for (var j = roundAt; j < digits.length; j++) {
+                digits[j] = 0;
+            }
+        } else {
+            // We rounded to zero so reset the parsedNumber
+            fractionLen = Math.max(0, fractionLen);
+            parsedNumber.i = 1;
+            digits.length = Math.max(1, roundAt = fractionSize + 1);
+            digits[0] = 0;
+            for (var i = 1; i < roundAt; i++) digits[i] = 0;
+        }
+
+        if (digit >= 5) {
+            if (roundAt - 1 < 0) {
+                for (var k = 0; k > roundAt; k--) {
+                    digits.unshift(0);
+                    parsedNumber.i++;
+                }
+                digits.unshift(1);
+                parsedNumber.i++;
+            } else {
+                digits[roundAt - 1]++;
+            }
+        }
+
+        // Pad out with zeros to get the required fraction length
+        for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0);
+
+
+        // Do any carrying, e.g. a digit was rounded up to 10
+        var carry = digits.reduceRight(function(carry, d, i, digits) {
+            d = d + carry;
+            digits[i] = d % 10;
+            return Math.floor(d / 10);
+        }, 0);
+        if (carry) {
+            digits.unshift(carry);
+            parsedNumber.i++;
+        }
+    }
+
+    /**
+     * Format a number into a string
+     * @param  {number} number       The number to format
+     * @param  {{
+     *           minFrac, // the minimum number of digits required in the fraction part of the number
+     *           maxFrac, // the maximum number of digits required in the fraction part of the number
+     *           gSize,   // number of digits in each group of separated digits
+     *           lgSize,  // number of digits in the last group of digits before the decimal separator
+     *           negPre,  // the string to go in front of a negative number (e.g. `-` or `(`))
+     *           posPre,  // the string to go in front of a positive number
+     *           negSuf,  // the string to go after a negative number (e.g. `)`)
+     *           posSuf   // the string to go after a positive number
+     *         }} pattern
+     * @param  {string} groupSep     The string to separate groups of number (e.g. `,`)
+     * @param  {string} decimalSep   The string to act as the decimal separator (e.g. `.`)
+     * @param  {[type]} fractionSize The size of the fractional part of the number
+     * @return {string}              The number formatted as a string
+     */
+    function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
+
+        if (!(isString(number) || isNumber(number)) || isNaN(number)) return '';
+
+        var isInfinity = !isFinite(number);
+        var isZero = false;
+        var numStr = Math.abs(number) + '',
+            formattedText = '',
+            parsedNumber;
+
+        if (isInfinity) {
+            formattedText = '\u221e';
+        } else {
+            parsedNumber = parse(numStr);
+
+            roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac);
+
+            var digits = parsedNumber.d;
+            var integerLen = parsedNumber.i;
+            var exponent = parsedNumber.e;
+            var decimals = [];
+            isZero = digits.reduce(function(isZero, d) { return isZero && !d; }, true);
+
+            // pad zeros for small numbers
+            while (integerLen < 0) {
+                digits.unshift(0);
+                integerLen++;
+            }
+
+            // extract decimals digits
+            if (integerLen > 0) {
+                decimals = digits.splice(integerLen, digits.length);
+            } else {
+                decimals = digits;
+                digits = [0];
+            }
+
+            // format the integer digits with grouping separators
+            var groups = [];
+            if (digits.length >= pattern.lgSize) {
+                groups.unshift(digits.splice(-pattern.lgSize, digits.length).join(''));
+            }
+            while (digits.length > pattern.gSize) {
+                groups.unshift(digits.splice(-pattern.gSize, digits.length).join(''));
+            }
+            if (digits.length) {
+                groups.unshift(digits.join(''));
+            }
+            formattedText = groups.join(groupSep);
+
+            // append the decimal digits
+            if (decimals.length) {
+                formattedText += decimalSep + decimals.join('');
+            }
+
+            if (exponent) {
+                formattedText += 'e+' + exponent;
+            }
+        }
+        if (number < 0 && !isZero) {
+            return pattern.negPre + formattedText + pattern.negSuf;
+        } else {
+            return pattern.posPre + formattedText + pattern.posSuf;
+        }
+    }
+
+    function padNumber(num, digits, trim, negWrap) {
+        var neg = '';
+        if (num < 0 || (negWrap && num <= 0)) {
+            if (negWrap) {
+                num = -num + 1;
+            } else {
+                num = -num;
+                neg = '-';
+            }
+        }
+        num = '' + num;
+        while (num.length < digits) num = ZERO_CHAR + num;
+        if (trim) {
+            num = num.substr(num.length - digits);
+        }
+        return neg + num;
+    }
+
+
+    function dateGetter(name, size, offset, trim, negWrap) {
+        offset = offset || 0;
+        return function(date) {
+            var value = date['get' + name]();
+            if (offset > 0 || value > -offset) {
+                value += offset;
+            }
+            if (value === 0 && offset === -12) value = 12;
+            return padNumber(value, size, trim, negWrap);
+        };
+    }
+
+    function dateStrGetter(name, shortForm, standAlone) {
+        return function(date, formats) {
+            var value = date['get' + name]();
+            var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : '');
+            var get = uppercase(propPrefix + name);
+
+            return formats[get][value];
+        };
+    }
+
+    function timeZoneGetter(date, formats, offset) {
+        var zone = -1 * offset;
+        var paddedZone = (zone >= 0) ? '+' : '';
+
+        paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
+            padNumber(Math.abs(zone % 60), 2);
+
+        return paddedZone;
+    }
+
+    function getFirstThursdayOfYear(year) {
+        // 0 = index of January
+        var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay();
+        // 4 = index of Thursday (+1 to account for 1st = 5)
+        // 11 = index of *next* Thursday (+1 account for 1st = 12)
+        return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst);
+    }
+
+    function getThursdayThisWeek(datetime) {
+        return new Date(datetime.getFullYear(), datetime.getMonth(),
+            // 4 = index of Thursday
+            datetime.getDate() + (4 - datetime.getDay()));
+    }
+
+    function weekGetter(size) {
+        return function(date) {
+            var firstThurs = getFirstThursdayOfYear(date.getFullYear()),
+                thisThurs = getThursdayThisWeek(date);
+
+            var diff = +thisThurs - +firstThurs,
+                result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week
+
+            return padNumber(result, size);
+        };
+    }
+
+    function ampmGetter(date, formats) {
+        return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
+    }
+
+    function eraGetter(date, formats) {
+        return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+    }
+
+    function longEraGetter(date, formats) {
+        return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+    }
+
+    var DATE_FORMATS = {
+        yyyy: dateGetter('FullYear', 4, 0, false, true),
+        yy: dateGetter('FullYear', 2, 0, true, true),
+        y: dateGetter('FullYear', 1, 0, false, true),
+        MMMM: dateStrGetter('Month'),
+        MMM: dateStrGetter('Month', true),
+        MM: dateGetter('Month', 2, 1),
+        M: dateGetter('Month', 1, 1),
+        LLLL: dateStrGetter('Month', false, true),
+        dd: dateGetter('Date', 2),
+        d: dateGetter('Date', 1),
+        HH: dateGetter('Hours', 2),
+        H: dateGetter('Hours', 1),
+        hh: dateGetter('Hours', 2, -12),
+        h: dateGetter('Hours', 1, -12),
+        mm: dateGetter('Minutes', 2),
+        m: dateGetter('Minutes', 1),
+        ss: dateGetter('Seconds', 2),
+        s: dateGetter('Seconds', 1),
+        // while ISO 8601 requires fractions to be prefixed with `.` or `,`
+        // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
+        sss: dateGetter('Milliseconds', 3),
+        EEEE: dateStrGetter('Day'),
+        EEE: dateStrGetter('Day', true),
+        a: ampmGetter,
+        Z: timeZoneGetter,
+        ww: weekGetter(2),
+        w: weekGetter(1),
+        G: eraGetter,
+        GG: eraGetter,
+        GGG: eraGetter,
+        GGGG: longEraGetter
+    };
+
+    var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,
+        NUMBER_STRING = /^-?\d+$/;
+
+    /**
+     * @ngdoc filter
+     * @name date
+     * @kind function
+     *
+     * @description
+     *   Formats `date` to a string based on the requested `format`.
+     *
+     *   `format` string can be composed of the following elements:
+     *
+     *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
+     *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
+     *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
+     *   * `'MMMM'`: Month in year (January-December)
+     *   * `'MMM'`: Month in year (Jan-Dec)
+     *   * `'MM'`: Month in year, padded (01-12)
+     *   * `'M'`: Month in year (1-12)
+     *   * `'LLLL'`: Stand-alone month in year (January-December)
+     *   * `'dd'`: Day in month, padded (01-31)
+     *   * `'d'`: Day in month (1-31)
+     *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
+     *   * `'EEE'`: Day in Week, (Sun-Sat)
+     *   * `'HH'`: Hour in day, padded (00-23)
+     *   * `'H'`: Hour in day (0-23)
+     *   * `'hh'`: Hour in AM/PM, padded (01-12)
+     *   * `'h'`: Hour in AM/PM, (1-12)
+     *   * `'mm'`: Minute in hour, padded (00-59)
+     *   * `'m'`: Minute in hour (0-59)
+     *   * `'ss'`: Second in minute, padded (00-59)
+     *   * `'s'`: Second in minute (0-59)
+     *   * `'sss'`: Millisecond in second, padded (000-999)
+     *   * `'a'`: AM/PM marker
+     *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
+     *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
+     *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+     *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+     *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
+     *
+     *   `format` string can also be one of the following predefined
+     *   {@link guide/i18n localizable formats}:
+     *
+     *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
+     *     (e.g. Sep 3, 2010 12:05:08 PM)
+     *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 PM)
+     *   * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US  locale
+     *     (e.g. Friday, September 3, 2010)
+     *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
+     *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
+     *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
+     *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM)
+     *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM)
+     *
+     *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
+     *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
+     *   (e.g. `"h 'o''clock'"`).
+     *
+     *   Any other characters in the `format` string will be output as-is.
+     *
+     * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
+     *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
+     *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
+     *    specified in the string input, the time is considered to be in the local timezone.
+     * @param {string=} format Formatting rules (see Description). If not specified,
+     *    `mediumDate` is used.
+     * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
+     *    continental US time zone abbreviations, but for general use, use a time zone offset, for
+     *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+     *    If not specified, the timezone of the browser will be used.
+     * @returns {string} Formatted string or the input if input is not recognized as date/millis.
+     *
+     * @example
+     <example name="filter-date">
+     <file name="index.html">
+     <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
+     <span>{{1288323623006 | date:'medium'}}</span><br>
+     <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
+     <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
+     <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
+     <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
+     <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
+     <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should format date', function() {
+         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
+            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
+         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
+            toMatch(/2010-10-2\d \d{2}:\d{2}:\d{2} (-|\+)?\d{4}/);
+         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
+            toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
+       });
+     </file>
+     </example>
+     */
+    dateFilter.$inject = ['$locale'];
+    function dateFilter($locale) {
+
+
+        var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
+        // 1        2       3         4          5          6          7          8  9     10      11
+        function jsonStringToDate(string) {
+            var match;
+            if ((match = string.match(R_ISO8601_STR))) {
+                var date = new Date(0),
+                    tzHour = 0,
+                    tzMin  = 0,
+                    dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
+                    timeSetter = match[8] ? date.setUTCHours : date.setHours;
+
+                if (match[9]) {
+                    tzHour = toInt(match[9] + match[10]);
+                    tzMin = toInt(match[9] + match[11]);
+                }
+                dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
+                var h = toInt(match[4] || 0) - tzHour;
+                var m = toInt(match[5] || 0) - tzMin;
+                var s = toInt(match[6] || 0);
+                var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
+                timeSetter.call(date, h, m, s, ms);
+                return date;
+            }
+            return string;
+        }
+
+
+        return function(date, format, timezone) {
+            var text = '',
+                parts = [],
+                fn, match;
+
+            format = format || 'mediumDate';
+            format = $locale.DATETIME_FORMATS[format] || format;
+            if (isString(date)) {
+                date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date);
+            }
+
+            if (isNumber(date)) {
+                date = new Date(date);
+            }
+
+            if (!isDate(date) || !isFinite(date.getTime())) {
+                return date;
+            }
+
+            while (format) {
+                match = DATE_FORMATS_SPLIT.exec(format);
+                if (match) {
+                    parts = concat(parts, match, 1);
+                    format = parts.pop();
+                } else {
+                    parts.push(format);
+                    format = null;
+                }
+            }
+
+            var dateTimezoneOffset = date.getTimezoneOffset();
+            if (timezone) {
+                dateTimezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+                date = convertTimezoneToLocal(date, timezone, true);
+            }
+            forEach(parts, function(value) {
+                fn = DATE_FORMATS[value];
+                text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
+                    : value === '\'\'' ? '\'' : value.replace(/(^'|'$)/g, '').replace(/''/g, '\'');
+            });
+
+            return text;
+        };
+    }
+
+
+    /**
+     * @ngdoc filter
+     * @name json
+     * @kind function
+     *
+     * @description
+     *   Allows you to convert a JavaScript object into JSON string.
+     *
+     *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
+     *   the binding is automatically converted to JSON.
+     *
+     * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
+     * @param {number=} spacing The number of spaces to use per indentation, defaults to 2.
+     * @returns {string} JSON string.
+     *
+     *
+     * @example
+     <example name="filter-json">
+     <file name="index.html">
+     <pre id="default-spacing">{{ {'name':'value'} | json }}</pre>
+     <pre id="custom-spacing">{{ {'name':'value'} | json:4 }}</pre>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should jsonify filtered objects', function() {
+         expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n {2}"name": ?"value"\n}/);
+         expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n {4}"name": ?"value"\n}/);
+       });
+     </file>
+     </example>
+     *
+     */
+    function jsonFilter() {
+        return function(object, spacing) {
+            if (isUndefined(spacing)) {
+                spacing = 2;
+            }
+            return toJson(object, spacing);
+        };
+    }
+
+
+    /**
+     * @ngdoc filter
+     * @name lowercase
+     * @kind function
+     * @description
+     * Converts string to lowercase.
+     *
+     * See the {@link ng.uppercase uppercase filter documentation} for a functionally identical example.
+     *
+     * @see angular.lowercase
+     */
+    var lowercaseFilter = valueFn(lowercase);
+
+
+    /**
+     * @ngdoc filter
+     * @name uppercase
+     * @kind function
+     * @description
+     * Converts string to uppercase.
+     * @example
+     <example module="uppercaseFilterExample" name="filter-uppercase">
+     <file name="index.html">
+     <script>
+     angular.module('uppercaseFilterExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.title = 'This is a title';
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <!-- This title should be formatted normally -->
+     <h1>{{title}}</h1>
+     <!-- This title should be capitalized -->
+     <h1>{{title | uppercase}}</h1>
+     </div>
+     </file>
+     </example>
+     */
+    var uppercaseFilter = valueFn(uppercase);
+
+    /**
+     * @ngdoc filter
+     * @name limitTo
+     * @kind function
+     *
+     * @description
+     * Creates a new array or string containing only a specified number of elements. The elements are
+     * taken from either the beginning or the end of the source array, string or number, as specified by
+     * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
+     * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
+     * it is converted to a string.
+     *
+     * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
+     * @param {string|number} limit - The length of the returned array or string. If the `limit` number
+     *     is positive, `limit` number of items from the beginning of the source array/string are copied.
+     *     If the number is negative, `limit` number  of items from the end of the source array/string
+     *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
+     *     the input will be returned unchanged.
+     * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
+     *     `begin` indicates an offset from the end of `input`. Defaults to `0`.
+     * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
+     *     less than `limit` elements.
+     *
+     * @example
+     <example module="limitToExample" name="limit-to-filter">
+     <file name="index.html">
+     <script>
+     angular.module('limitToExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.numbers = [1,2,3,4,5,6,7,8,9];
+             $scope.letters = "abcdefghi";
+             $scope.longNumber = 2345432342;
+             $scope.numLimit = 3;
+             $scope.letterLimit = 3;
+             $scope.longNumberLimit = 3;
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <label>
+     Limit {{numbers}} to:
+     <input type="number" step="1" ng-model="numLimit">
+     </label>
+     <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
+     <label>
+     Limit {{letters}} to:
+     <input type="number" step="1" ng-model="letterLimit">
+     </label>
+     <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
+     <label>
+     Limit {{longNumber}} to:
+     <input type="number" step="1" ng-model="longNumberLimit">
+     </label>
+     <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var numLimitInput = element(by.model('numLimit'));
+     var letterLimitInput = element(by.model('letterLimit'));
+     var longNumberLimitInput = element(by.model('longNumberLimit'));
+     var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
+     var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+     var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit'));
+
+     it('should limit the number array to first three items', function() {
+         expect(numLimitInput.getAttribute('value')).toBe('3');
+         expect(letterLimitInput.getAttribute('value')).toBe('3');
+         expect(longNumberLimitInput.getAttribute('value')).toBe('3');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abc');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 234');
+       });
+
+     // There is a bug in safari and protractor that doesn't like the minus key
+     // it('should update the output when -3 is entered', function() {
+       //   numLimitInput.clear();
+       //   numLimitInput.sendKeys('-3');
+       //   letterLimitInput.clear();
+       //   letterLimitInput.sendKeys('-3');
+       //   longNumberLimitInput.clear();
+       //   longNumberLimitInput.sendKeys('-3');
+       //   expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
+       //   expect(limitedLetters.getText()).toEqual('Output letters: ghi');
+       //   expect(limitedLongNumber.getText()).toEqual('Output long number: 342');
+       // });
+
+     it('should not exceed the maximum size of input array', function() {
+         numLimitInput.clear();
+         numLimitInput.sendKeys('100');
+         letterLimitInput.clear();
+         letterLimitInput.sendKeys('100');
+         longNumberLimitInput.clear();
+         longNumberLimitInput.sendKeys('100');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342');
+       });
+     </file>
+     </example>
+     */
+    function limitToFilter() {
+        return function(input, limit, begin) {
+            if (Math.abs(Number(limit)) === Infinity) {
+                limit = Number(limit);
+            } else {
+                limit = toInt(limit);
+            }
+            if (isNumberNaN(limit)) return input;
+
+            if (isNumber(input)) input = input.toString();
+            if (!isArrayLike(input)) return input;
+
+            begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
+            begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
+
+            if (limit >= 0) {
+                return sliceFn(input, begin, begin + limit);
+            } else {
+                if (begin === 0) {
+                    return sliceFn(input, limit, input.length);
+                } else {
+                    return sliceFn(input, Math.max(0, begin + limit), begin);
+                }
+            }
+        };
+    }
+
+    function sliceFn(input, begin, end) {
+        if (isString(input)) return input.slice(begin, end);
+
+        return slice.call(input, begin, end);
+    }
+
+    /**
+     * @ngdoc filter
+     * @name orderBy
+     * @kind function
+     *
+     * @description
+     * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
+     * function based on the values computed using the `expression` predicate.
+     *
+     * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
+     * `[{id: 'bar'}, {id: 'foo'}]`.
+     *
+     * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
+     * String, etc).
+     *
+     * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
+     * for the preceding one. The `expression` is evaluated against each item and the output is used
+     * for comparing with other items.
+     *
+     * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
+     * ascending order.
+     *
+     * The comparison is done using the `comparator` function. If none is specified, a default, built-in
+     * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
+     * strings alphabetically).
+     *
+     * ### Under the hood
+     *
+     * Ordering the specified `collection` happens in two phases:
+     *
+     * 1. All items are passed through the predicate (or predicates), and the returned values are saved
+     *    along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
+     *    through a predicate that extracts the value of the `label` property, would be transformed to:
+     *    ```
+     *    {
+     *      value: 'foo',
+     *      type: 'string',
+     *      index: ...
+     *    }
+     *    ```
+     * 2. The comparator function is used to sort the items, based on the derived values, types and
+     *    indices.
+     *
+     * If you use a custom comparator, it will be called with pairs of objects of the form
+     * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
+     * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
+     * second, or `1` otherwise.
+     *
+     * In order to ensure that the sorting will be deterministic across platforms, if none of the
+     * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
+     * dummy predicate that returns the item's index as `value`.
+     * (If you are using a custom comparator, make sure it can handle this predicate as well.)
+     *
+     * If a custom comparator still can't distinguish between two items, then they will be sorted based
+     * on their index using the built-in comparator.
+     *
+     * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
+     * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
+     * it to the comparator. The following rules govern the conversion:
+     *
+     * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
+     *    used instead.<br />
+     *    (If the object has a `valueOf()` method that returns another object, then the returned object
+     *    will be used in subsequent steps.)
+     * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
+     *    returns a primitive, its return value will be used instead.<br />
+     *    (If the object has a `toString()` method that returns another object, then the returned object
+     *    will be used in subsequent steps.)
+     * 3. No conversion; the object itself is used.
+     *
+     * ### The default comparator
+     *
+     * The default, built-in comparator should be sufficient for most usecases. In short, it compares
+     * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
+     * using their index in the original collection, and sorts values of different types by type.
+     *
+     * More specifically, it follows these steps to determine the relative order of items:
+     *
+     * 1. If the compared values are of different types, compare the types themselves alphabetically.
+     * 2. If both values are of type `string`, compare them alphabetically in a case- and
+     *    locale-insensitive way.
+     * 3. If both values are objects, compare their indices instead.
+     * 4. Otherwise, return:
+     *    -  `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
+     *    - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
+     *    -  `1`, otherwise.
+     *
+     * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
+     *           saved as numbers and not strings.
+     * **Note:** For the purpose of sorting, `null` values are treated as the string `'null'` (i.e.
+     *           `type: 'string'`, `value: 'null'`). This may cause unexpected sort order relative to
+     *           other values.
+     *
+     * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
+     * @param {(Function|string|Array.<Function|string>)=} expression - A predicate (or list of
+     *    predicates) to be used by the comparator to determine the order of elements.
+     *
+     *    Can be one of:
+     *
+     *    - `Function`: A getter function. This function will be called with each item as argument and
+     *      the return value will be used for sorting.
+     *    - `string`: An AngularJS expression. This expression will be evaluated against each item and the
+     *      result will be used for sorting. For example, use `'label'` to sort by a property called
+     *      `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
+     *      property.<br />
+     *      (The result of a constant expression is interpreted as a property name to be used for
+     *      comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
+     *      property called `special name`.)<br />
+     *      An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
+     *      ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
+     *      (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
+     *    - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
+     *      relative order of two items, the next predicate is used as a tie-breaker.
+     *
+     * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+     *
+     * @param {boolean=} reverse - If `true`, reverse the sorting order.
+     * @param {(Function)=} comparator - The comparator function used to determine the relative order of
+     *    value pairs. If omitted, the built-in comparator will be used.
+     *
+     * @returns {Array} - The sorted array.
+     *
+     *
+     * @example
+     * ### Ordering a table with `ngRepeat`
+     *
+     * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
+     * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
+     * it defaults to the built-in comparator.
+     *
+     <example name="orderBy-static" module="orderByExample1">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <table class="friends">
+     <tr>
+     <th>Name</th>
+     <th>Phone Number</th>
+     <th>Age</th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:'-age'">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     <td>{{friend.age}}</td>
+     </tr>
+     </table>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample1', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+         }]);
+     </file>
+     <file name="style.css">
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var names = element.all(by.repeater('friends').column('friend.name'));
+
+     it('should sort friends by age in reverse order', function() {
+         expect(names.get(0).getText()).toBe('Adam');
+         expect(names.get(1).getText()).toBe('Julie');
+         expect(names.get(2).getText()).toBe('Mike');
+         expect(names.get(3).getText()).toBe('Mary');
+         expect(names.get(4).getText()).toBe('John');
+       });
+     </file>
+     </example>
+     * <hr />
      *
-     * To be secure by default, you want to ensure that any such bindings are disallowed unless you can
-     * determine that something explicitly says it's safe to use a value for binding in that
-     * context.  You can then audit your code (a simple grep would do) to ensure that this is only done
-     * for those values that you can easily tell are safe - because they were received from your server,
-     * sanitized by your library, etc.  You can organize your codebase to help with this - perhaps
-     * allowing only the files in a specific directory to do this.  Ensuring that the internal API
-     * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task.
+     * @example
+     * ### Changing parameters dynamically
      *
-     * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
-     * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
-     * obtain values that will be accepted by SCE / privileged contexts.
+     * All parameters can be changed dynamically. The next example shows how you can make the columns of
+     * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
+     *
+     <example name="orderBy-dynamic" module="orderByExample2">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
+     <hr/>
+     <button ng-click="propertyName = null; reverse = false">Set to unsorted</button>
+     <hr/>
+     <table class="friends">
+     <tr>
+     <th>
+     <button ng-click="sortBy('name')">Name</button>
+     <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('phone')">Phone Number</button>
+     <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('age')">Age</button>
+     <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
+     </th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:propertyName:reverse">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     <td>{{friend.age}}</td>
+     </tr>
+     </table>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample2', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           var friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+
+           $scope.propertyName = 'age';
+           $scope.reverse = true;
+           $scope.friends = friends;
+
+           $scope.sortBy = function(propertyName) {
+             $scope.reverse = ($scope.propertyName === propertyName) ? !$scope.reverse : false;
+             $scope.propertyName = propertyName;
+           };
+         }]);
+     </file>
+     <file name="style.css">
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+
+     .sortorder:after {
+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
+       }
+     .sortorder.reverse:after {
+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var unsortButton = element(by.partialButtonText('unsorted'));
+     var nameHeader = element(by.partialButtonText('Name'));
+     var phoneHeader = element(by.partialButtonText('Phone'));
+     var ageHeader = element(by.partialButtonText('Age'));
+     var firstName = element(by.repeater('friends').column('friend.name').row(0));
+     var lastName = element(by.repeater('friends').column('friend.name').row(4));
+
+     it('should sort friends by some property, when clicking on the column header', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         phoneHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Mary');
+
+         nameHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('Mike');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+       });
+
+     it('should sort friends in reverse order, when clicking on the same column', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+       });
+
+     it('should restore the original order, when clicking "Set to unsorted"', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         unsortButton.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Julie');
+       });
+     </file>
+     </example>
+     * <hr />
+     *
+     * @example
+     * ### Using `orderBy` inside a controller
+     *
+     * It is also possible to call the `orderBy` filter manually, by injecting `orderByFilter`, and
+     * calling it with the desired parameters. (Alternatively, you could inject the `$filter` factory
+     * and retrieve the `orderBy` filter with `$filter('orderBy')`.)
+     *
+     <example name="orderBy-call-manually" module="orderByExample3">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
+     <hr/>
+     <button ng-click="sortBy(null)">Set to unsorted</button>
+     <hr/>
+     <table class="friends">
+     <tr>
+     <th>
+     <button ng-click="sortBy('name')">Name</button>
+     <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('phone')">Phone Number</button>
+     <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('age')">Age</button>
+     <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
+     </th>
+     </tr>
+     <tr ng-repeat="friend in friends">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     <td>{{friend.age}}</td>
+     </tr>
+     </table>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample3', [])
+     .controller('ExampleController', ['$scope', 'orderByFilter', function($scope, orderBy) {
+           var friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+
+           $scope.propertyName = 'age';
+           $scope.reverse = true;
+           $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
+
+           $scope.sortBy = function(propertyName) {
+             $scope.reverse = (propertyName !== null && $scope.propertyName === propertyName)
+                 ? !$scope.reverse : false;
+             $scope.propertyName = propertyName;
+             $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
+           };
+         }]);
+     </file>
+     <file name="style.css">
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+
+     .sortorder:after {
+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
+       }
+     .sortorder.reverse:after {
+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var unsortButton = element(by.partialButtonText('unsorted'));
+     var nameHeader = element(by.partialButtonText('Name'));
+     var phoneHeader = element(by.partialButtonText('Phone'));
+     var ageHeader = element(by.partialButtonText('Age'));
+     var firstName = element(by.repeater('friends').column('friend.name').row(0));
+     var lastName = element(by.repeater('friends').column('friend.name').row(4));
+
+     it('should sort friends by some property, when clicking on the column header', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         phoneHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Mary');
+
+         nameHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('Mike');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+       });
+
+     it('should sort friends in reverse order, when clicking on the same column', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+       });
+
+     it('should restore the original order, when clicking "Set to unsorted"', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         unsortButton.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Julie');
+       });
+     </file>
+     </example>
+     * <hr />
+     *
+     * @example
+     * ### Using a custom comparator
+     *
+     * If you have very specific requirements about the way items are sorted, you can pass your own
+     * comparator function. For example, you might need to compare some strings in a locale-sensitive
+     * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
+     * argument - passing `false` retains the default sorting order, i.e. ascending.)
+     *
+     <example name="orderBy-custom-comparator" module="orderByExample4">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <div class="friends-container custom-comparator">
+     <h3>Locale-sensitive Comparator</h3>
+     <table class="friends">
+     <tr>
+     <th>Name</th>
+     <th>Favorite Letter</th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:'favoriteLetter':false:localeSensitiveComparator">
+     <td>{{friend.name}}</td>
+     <td>{{friend.favoriteLetter}}</td>
+     </tr>
+     </table>
+     </div>
+     <div class="friends-container default-comparator">
+     <h3>Default Comparator</h3>
+     <table class="friends">
+     <tr>
+     <th>Name</th>
+     <th>Favorite Letter</th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:'favoriteLetter'">
+     <td>{{friend.name}}</td>
+     <td>{{friend.favoriteLetter}}</td>
+     </tr>
+     </table>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample4', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends = [
+             {name: 'John',   favoriteLetter: 'Ä'},
+             {name: 'Mary',   favoriteLetter: 'Ü'},
+             {name: 'Mike',   favoriteLetter: 'Ö'},
+             {name: 'Adam',   favoriteLetter: 'H'},
+             {name: 'Julie',  favoriteLetter: 'Z'}
+           ];
+
+           $scope.localeSensitiveComparator = function(v1, v2) {
+             // If we don't get strings, just compare by index
+             if (v1.type !== 'string' || v2.type !== 'string') {
+               return (v1.index < v2.index) ? -1 : 1;
+             }
+
+             // Compare strings alphabetically, taking locale into account
+             return v1.value.localeCompare(v2.value);
+           };
+         }]);
+     </file>
+     <file name="style.css">
+     .friends-container {
+         display: inline-block;
+         margin: 0 30px;
+       }
+
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var container = element(by.css('.custom-comparator'));
+     var names = container.all(by.repeater('friends').column('friend.name'));
+
+     it('should sort friends by favorite letter (in correct alphabetical order)', function() {
+         expect(names.get(0).getText()).toBe('John');
+         expect(names.get(1).getText()).toBe('Adam');
+         expect(names.get(2).getText()).toBe('Mike');
+         expect(names.get(3).getText()).toBe('Mary');
+         expect(names.get(4).getText()).toBe('Julie');
+       });
+     </file>
+     </example>
      *
+     */
+    orderByFilter.$inject = ['$parse'];
+    function orderByFilter($parse) {
+        return function(array, sortPredicate, reverseOrder, compareFn) {
+
+            if (array == null) return array;
+            if (!isArrayLike(array)) {
+                throw minErr('orderBy')('notarray', 'Expected array but received: {0}', array);
+            }
+
+            if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
+            if (sortPredicate.length === 0) { sortPredicate = ['+']; }
+
+            var predicates = processPredicates(sortPredicate);
+
+            var descending = reverseOrder ? -1 : 1;
+
+            // Define the `compare()` function. Use a default comparator if none is specified.
+            var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+
+            // The next three lines are a version of a Swartzian Transform idiom from Perl
+            // (sometimes called the Decorate-Sort-Undecorate idiom)
+            // See https://en.wikipedia.org/wiki/Schwartzian_transform
+            var compareValues = Array.prototype.map.call(array, getComparisonObject);
+            compareValues.sort(doComparison);
+            array = compareValues.map(function(item) { return item.value; });
+
+            return array;
+
+            function getComparisonObject(value, index) {
+                // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
+                // This will be used to keep the sort stable when none of the input predicates can
+                // distinguish between two elements.
+                return {
+                    value: value,
+                    tieBreaker: {value: index, type: 'number', index: index},
+                    predicateValues: predicates.map(function(predicate) {
+                        return getPredicateValue(predicate.get(value), index);
+                    })
+                };
+            }
+
+            function doComparison(v1, v2) {
+                for (var i = 0, ii = predicates.length; i < ii; i++) {
+                    var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
+                    if (result) {
+                        return result * predicates[i].descending * descending;
+                    }
+                }
+
+                return (compare(v1.tieBreaker, v2.tieBreaker) || defaultCompare(v1.tieBreaker, v2.tieBreaker)) * descending;
+            }
+        };
+
+        function processPredicates(sortPredicates) {
+            return sortPredicates.map(function(predicate) {
+                var descending = 1, get = identity;
+
+                if (isFunction(predicate)) {
+                    get = predicate;
+                } else if (isString(predicate)) {
+                    if ((predicate.charAt(0) === '+' || predicate.charAt(0) === '-')) {
+                        descending = predicate.charAt(0) === '-' ? -1 : 1;
+                        predicate = predicate.substring(1);
+                    }
+                    if (predicate !== '') {
+                        get = $parse(predicate);
+                        if (get.constant) {
+                            var key = get();
+                            get = function(value) { return value[key]; };
+                        }
+                    }
+                }
+                return {get: get, descending: descending};
+            });
+        }
+
+        function isPrimitive(value) {
+            switch (typeof value) {
+                case 'number': /* falls through */
+                case 'boolean': /* falls through */
+                case 'string':
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        function objectValue(value) {
+            // If `valueOf` is a valid function use that
+            if (isFunction(value.valueOf)) {
+                value = value.valueOf();
+                if (isPrimitive(value)) return value;
+            }
+            // If `toString` is a valid function and not the one from `Object.prototype` use that
+            if (hasCustomToString(value)) {
+                value = value.toString();
+                if (isPrimitive(value)) return value;
+            }
+
+            return value;
+        }
+
+        function getPredicateValue(value, index) {
+            var type = typeof value;
+            if (value === null) {
+                type = 'string';
+                value = 'null';
+            } else if (type === 'object') {
+                value = objectValue(value);
+            }
+            return {value: value, type: type, index: index};
+        }
+
+        function defaultCompare(v1, v2) {
+            var result = 0;
+            var type1 = v1.type;
+            var type2 = v2.type;
+
+            if (type1 === type2) {
+                var value1 = v1.value;
+                var value2 = v2.value;
+
+                if (type1 === 'string') {
+                    // Compare strings case-insensitively
+                    value1 = value1.toLowerCase();
+                    value2 = value2.toLowerCase();
+                } else if (type1 === 'object') {
+                    // For basic objects, use the position of the object
+                    // in the collection instead of the value
+                    if (isObject(value1)) value1 = v1.index;
+                    if (isObject(value2)) value2 = v2.index;
+                }
+
+                if (value1 !== value2) {
+                    result = value1 < value2 ? -1 : 1;
+                }
+            } else {
+                result = type1 < type2 ? -1 : 1;
+            }
+
+            return result;
+        }
+    }
+
+    function ngDirective(directive) {
+        if (isFunction(directive)) {
+            directive = {
+                link: directive
+            };
+        }
+        directive.restrict = directive.restrict || 'AC';
+        return valueFn(directive);
+    }
+
+    /**
+     * @ngdoc directive
+     * @name a
+     * @restrict E
+     *
+     * @description
+     * Modifies the default behavior of the html a tag so that the default action is prevented when
+     * the href attribute is empty.
+     *
+     * For dynamically creating `href` attributes for a tags, see the {@link ng.ngHref `ngHref`} directive.
+     */
+    var htmlAnchorDirective = valueFn({
+        restrict: 'E',
+        compile: function(element, attr) {
+            if (!attr.href && !attr.xlinkHref) {
+                return function(scope, element) {
+                    // If the linked element is not an anchor tag anymore, do nothing
+                    if (element[0].nodeName.toLowerCase() !== 'a') return;
+
+                    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
+                    var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
+                        'xlink:href' : 'href';
+                    element.on('click', function(event) {
+                        // if we have no href url, then don't navigate anywhere.
+                        if (!element.attr(href)) {
+                            event.preventDefault();
+                        }
+                    });
+                };
+            }
+        }
+    });
+
+    /**
+     * @ngdoc directive
+     * @name ngHref
+     * @restrict A
+     * @priority 99
+     *
+     * @description
+     * Using AngularJS markup like `{{hash}}` in an href attribute will
+     * make the link go to the wrong URL if the user clicks it before
+     * AngularJS has a chance to replace the `{{hash}}` markup with its
+     * value. Until AngularJS replaces the markup the link will be broken
+     * and will most likely return a 404 error. The `ngHref` directive
+     * solves this problem.
+     *
+     * The wrong way to write it:
+     * ```html
+     * <a href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+     * ```
+     *
+     * The correct way to write it:
+     * ```html
+     * <a ng-href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+     * ```
+     *
+     * @element A
+     * @param {template} ngHref any string which can contain `{{}}` markup.
+     *
+     * @example
+     * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
+     * in links and their different behaviors:
+     <example name="ng-href">
+     <file name="index.html">
+     <input ng-model="value" /><br />
+     <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
+     <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
+     <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
+     <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
+     <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
+     <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should execute ng-click but not reload when href without value', function() {
+          element(by.id('link-1')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
+          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
+        });
+
+     it('should execute ng-click but not reload when href empty string', function() {
+          element(by.id('link-2')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
+          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
+        });
+
+     it('should execute ng-click and change url when ng-href specified', function() {
+          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
+
+          element(by.id('link-3')).click();
+
+          // At this point, we navigate away from an AngularJS page, so we need
+          // to use browser.driver to get the base webdriver.
+
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/123$/);
+            });
+          }, 5000, 'page should navigate to /123');
+        });
+
+     it('should execute ng-click but not reload when href empty string and name specified', function() {
+          element(by.id('link-4')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
+          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
+        });
+
+     it('should execute ng-click but not reload when no href but name specified', function() {
+          element(by.id('link-5')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
+          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
+        });
+
+     it('should only change url when only ng-href', function() {
+          element(by.model('value')).clear();
+          element(by.model('value')).sendKeys('6');
+          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
+
+          element(by.id('link-6')).click();
+
+          // At this point, we navigate away from an AngularJS page, so we need
+          // to use browser.driver to get the base webdriver.
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/6$/);
+            });
+          }, 5000, 'page should navigate to /6');
+        });
+     </file>
+     </example>
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngSrc
+     * @restrict A
+     * @priority 99
      *
-     * ## How does it work?
+     * @description
+     * Using AngularJS markup like `{{hash}}` in a `src` attribute doesn't
+     * work right: The browser will fetch from the URL with the literal
+     * text `{{hash}}` until AngularJS replaces the expression inside
+     * `{{hash}}`. The `ngSrc` directive solves this problem.
      *
-     * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
- * $sce.getTrusted(context, value)} rather than to the value directly.  Directives use {@link
-        * ng.$sce#parse $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the
-     * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals.
+     * The buggy way to write it:
+     * ```html
+     * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
+     * ```
      *
-     * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
-        * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
-     * simplified):
+     * The correct way to write it:
+     * ```html
+     * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
+     * ```
      *
-     * <pre class="prettyprint">
-     *   var ngBindHtmlDirective = ['$sce', function($sce) {
- *     return function(scope, element, attr) {
- *       scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
- *         element.html(value || '');
- *       });
- *     };
- *   }];
-     * </pre>
+     * @element IMG
+     * @param {template} ngSrc any string which can contain `{{}}` markup.
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngSrcset
+     * @restrict A
+     * @priority 99
      *
-     * ## Impact on loading templates
+     * @description
+     * Using AngularJS markup like `{{hash}}` in a `srcset` attribute doesn't
+     * work right: The browser will fetch from the URL with the literal
+     * text `{{hash}}` until AngularJS replaces the expression inside
+     * `{{hash}}`. The `ngSrcset` directive solves this problem.
      *
-     * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
-     * `templateUrl`'s specified by {@link guide/directive directives}.
+     * The buggy way to write it:
+     * ```html
+     * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
+     * ```
      *
-     * By default, Angular only loads templates from the same domain and protocol as the application
-     * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
- * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
-     * protocols, you may either either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
- * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
+     * The correct way to write it:
+     * ```html
+     * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
+     * ```
      *
-     * *Please note*:
-     * The browser's
-     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
-     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
-     * policy apply in addition to this and may further restrict whether the template is successfully
-     * loaded.  This means that without the right CORS policy, loading templates from a different domain
-     * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
-     * browsers.
+     * @element IMG
+     * @param {template} ngSrcset any string which can contain `{{}}` markup.
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngDisabled
+     * @restrict A
+     * @priority 100
      *
-     * ## This feels like too much overhead for the developer?
+     * @description
      *
-     * It's important to remember that SCE only applies to interpolation expressions.
+     * This directive sets the `disabled` attribute on the element (typically a form control,
+     * e.g. `input`, `button`, `select` etc.) if the
+     * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
      *
-     * If your expressions are constant literals, they're automatically trusted and you don't need to
-     * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g.
-     * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works.
+     * A special directive is necessary because we cannot use interpolation inside the `disabled`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
-     * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
-     * through {@link ng.$sce#getTrusted $sce.getTrusted}.  SCE doesn't play a role here.
+     * @example
+     <example name="ng-disabled">
+     <file name="index.html">
+     <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
+     <button ng-model="button" ng-disabled="checked">Button</button>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should toggle button', function() {
+          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
+        });
+     </file>
+     </example>
      *
-     * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
-     * templates in `ng-include` from your application's domain without having to even know about SCE.
-     * It blocks loading templates from other domains or loading templates over http from an https
-     * served document.  You can change these by setting your own custom {@link
-        * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
-        * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
+     * @element INPUT
+     * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
+     *     then the `disabled` attribute will be set on the element
+     */
+
+
+    /**
+     * @ngdoc directive
+     * @name ngChecked
+     * @restrict A
+     * @priority 100
      *
-     * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
-     * application that's secure and can be audited to verify that with much more ease than bolting
-     * security onto an application later.
+     * @description
+     * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy.
      *
-     * <a name="contexts"></a>
-     * ## What trusted context types are supported?
+     * Note that this directive should not be used together with {@link ngModel `ngModel`},
+     * as this can lead to unexpected behavior.
      *
-     * | Context             | Notes          |
-     * |---------------------|----------------|
-     * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. |
-     * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently unused.  Feel free to use it in your own directives. |
-     * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=` and `<img src=` sanitize their urls and don't constitute an SCE context. |
-     * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
-     * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently unused.  Feel free to use it in your own directives. |
+     * A special directive is necessary because we cannot use interpolation inside the `checked`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
-     * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+     * @example
+     <example name="ng-checked">
+     <file name="index.html">
+     <label>Check me to check both: <input type="checkbox" ng-model="leader"></label><br/>
+     <input id="checkFollower" type="checkbox" ng-checked="leader" aria-label="Follower input">
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check both checkBoxes', function() {
+          expect(element(by.id('checkFollower')).getAttribute('checked')).toBeFalsy();
+          element(by.model('leader')).click();
+          expect(element(by.id('checkFollower')).getAttribute('checked')).toBeTruthy();
+        });
+     </file>
+     </example>
      *
-     *  Each element in these arrays must be one of the following:
+     * @element INPUT
+     * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
+     *     then the `checked` attribute will be set on the element
+     */
+
+
+    /**
+     * @ngdoc directive
+     * @name ngReadonly
+     * @restrict A
+     * @priority 100
      *
-     *  - **'self'**
-     *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
-     *      domain** as the application document using the **same protocol**.
-     *  - **String** (except the special value `'self'`)
-     *    - The string is matched against the full *normalized / absolute URL* of the resource
-     *      being tested (substring matches are not good enough.)
-     *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
-     *      match themselves.
-     *    - `*`: matches zero or more occurrences of any character other than one of the following 6
-     *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'.  It's a useful wildcard for use
-     *      in a whitelist.
-     *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
-     *      not appropriate to use in for a scheme, domain, etc. as it would match too much.  (e.g.
-     *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
-     *      not have been the intention.)  It's usage at the very end of the path is ok.  (e.g.
-     *      http://foo.example.com/templates/**).
-     *  - **RegExp** (*see caveat below*)
-     *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
-     *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
-     *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
-     *      have good test coverage.).  For instance, the use of `.` in the regex is correct only in a
-     *      small number of cases.  A `.` character in the regex used when matching the scheme or a
-     *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
-     *      is highly recommended to use the string patterns and only fall back to regular expressions
-     *      if they as a last resort.
-     *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
-     *      matched against the **entire** *normalized / absolute URL* of the resource being tested
-     *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
-     *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
-     *    - If you are generating your JavaScript from some other templating engine (not
-     *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
-     *      remember to escape your regular expression (and be aware that you might need more than
-     *      one level of escaping depending on your templating engine and the way you interpolated
-     *      the value.)  Do make use of your platform's escaping mechanism as it might be good
-     *      enough before coding your own.  e.g. Ruby has
-     *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
-     *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
-     *      Javascript lacks a similar built in function for escaping.  Take a look at Google
-     *      Closure library's [goog.string.regExpEscape(s)](
-     *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
+     * @description
      *
-     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
+     * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
+     * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
+     * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
      *
-     * ## Show me an example using SCE.
+     * A special directive is necessary because we cannot use interpolation inside the `readonly`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
      * @example
-     <example module="mySceApp" deps="angular-sanitize.js">
+     <example name="ng-readonly">
      <file name="index.html">
-     <div ng-controller="myAppController as myCtrl">
-     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
-     <b>User comments</b><br>
-     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
-     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
-     exploit.
-     <div class="well">
-     <div ng-repeat="userComment in myCtrl.userComments">
-     <b>{{userComment.name}}</b>:
-     <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
-     <br>
-     </div>
-     </div>
-     </div>
+     <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
+     <input type="text" ng-readonly="checked" value="I'm AngularJS" aria-label="Readonly field" />
      </file>
-
-     <file name="script.js">
-     var mySceApp = angular.module('mySceApp', ['ngSanitize']);
-
-     mySceApp.controller("myAppController", function myAppController($http, $templateCache, $sce) {
-    var self = this;
-    $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) {
-      self.userComments = userComments;
-    });
-    self.explicitlyTrustedHtml = $sce.trustAsHtml(
-        '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-        'sanitization.&quot;">Hover over this text.</span>');
-  });
+     <file name="protractor.js" type="protractor">
+     it('should toggle readonly attr', function() {
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
+        });
      </file>
+     </example>
+     *
+     * @element INPUT
+     * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
+     *     then special attribute "readonly" will be set on the element
+     */
 
-     <file name="test_data.json">
-     [
-     { "name": "Alice",
-    "htmlComment":
-        "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
-  },
-     { "name": "Bob",
-    "htmlComment": "<i>Yes!</i>  Am I the only other one?"
-  }
-     ]
-     </file>
 
+    /**
+     * @ngdoc directive
+     * @name ngSelected
+     * @restrict A
+     * @priority 100
+     *
+     * @description
+     *
+     * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy.
+     *
+     * A special directive is necessary because we cannot use interpolation inside the `selected`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+     *
+     * <div class="alert alert-warning">
+     *   **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
+     *   sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
+     *   should not use `ngSelected` on the options, as `ngModel` will set the select value and
+     *   selected options.
+     * </div>
+     *
+     * @example
+     <example name="ng-selected">
+     <file name="index.html">
+     <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
+     <select aria-label="ngSelected demo">
+     <option>Hello!</option>
+     <option id="greet" ng-selected="selected">Greetings!</option>
+     </select>
+     </file>
      <file name="protractor.js" type="protractor">
-     describe('SCE doc demo', function() {
-    it('should sanitize untrusted values', function() {
-      expect(element(by.css('.htmlComment')).getInnerHtml())
-          .toBe('<span>Is <i>anyone</i> reading this?</span>');
-    });
-
-    it('should NOT sanitize explicitly trusted values', function() {
-      expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe(
-          '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-          'sanitization.&quot;">Hover over this text.</span>');
-    });
-  });
+     it('should select Greetings!', function() {
+          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
+          element(by.model('selected')).click();
+          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
+        });
      </file>
      </example>
      *
+     * @element OPTION
+     * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
+     *     then special attribute "selected" will be set on the element
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngOpen
+     * @restrict A
+     * @priority 100
+     *
+     * @description
      *
+     * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy.
      *
-     * ## Can I disable SCE completely?
+     * A special directive is necessary because we cannot use interpolation inside the `open`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
-     * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
-     * for little coding overhead.  It will be much harder to take an SCE disabled application and
-     * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
-     * for cases where you have a lot of existing code that was written before SCE was introduced and
-     * you're migrating them a module at a time.
+     * ## A note about browser compatibility
      *
-     * That said, here's how you can completely disable SCE:
+     * Internet Explorer and Edge do not support the `details` element, it is
+     * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
      *
-     * <pre class="prettyprint">
-     *   angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
- *     // Completely disable SCE.  For demonstration purposes only!
- *     // Do not use in new projects.
- *     $sceProvider.enabled(false);
- *   });
-     * </pre>
+     * @example
+     <example name="ng-open">
+     <file name="index.html">
+     <label>Toggle details: <input type="checkbox" ng-model="open"></label><br/>
+     <details id="details" ng-open="open">
+     <summary>List</summary>
+     <ul>
+     <li>Apple</li>
+     <li>Orange</li>
+     <li>Durian</li>
+     </ul>
+     </details>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should toggle open', function() {
+           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
+           element(by.model('open')).click();
+           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
+         });
+     </file>
+     </example>
      *
+     * @element DETAILS
+     * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
+     *     then special attribute "open" will be set on the element
      */
-    /* jshint maxlen: 100 */
-
-    function $SceProvider() {
-        var enabled = true;
-
-        /**
-         * @ngdoc method
-         * @name $sceProvider#enabled
-         * @function
-         *
-         * @param {boolean=} value If provided, then enables/disables SCE.
-         * @return {boolean} true if SCE is enabled, false otherwise.
-         *
-         * @description
-         * Enables/disables SCE and returns the current value.
-         */
-        this.enabled = function (value) {
-            if (arguments.length) {
-                enabled = !!value;
-            }
-            return enabled;
-        };
-
-
-        /* Design notes on the default implementation for SCE.
-         *
-         * The API contract for the SCE delegate
-         * -------------------------------------
-         * The SCE delegate object must provide the following 3 methods:
-         *
-         * - trustAs(contextEnum, value)
-         *     This method is used to tell the SCE service that the provided value is OK to use in the
-         *     contexts specified by contextEnum.  It must return an object that will be accepted by
-         *     getTrusted() for a compatible contextEnum and return this value.
-         *
-         * - valueOf(value)
-         *     For values that were not produced by trustAs(), return them as is.  For values that were
-         *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
-         *     trustAs is wrapping the given values into some type, this operation unwraps it when given
-         *     such a value.
-         *
-         * - getTrusted(contextEnum, value)
-         *     This function should return the a value that is safe to use in the context specified by
-         *     contextEnum or throw and exception otherwise.
-         *
-         * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
-         * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
-         * instance, an implementation could maintain a registry of all trusted objects by context.  In
-         * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
-         * return the same object passed in if it was found in the registry under a compatible context or
-         * throw an exception otherwise.  An implementation might only wrap values some of the time based
-         * on some criteria.  getTrusted() might return a value and not throw an exception for special
-         * constants or objects even if not wrapped.  All such implementations fulfill this contract.
-         *
-         *
-         * A note on the inheritance model for SCE contexts
-         * ------------------------------------------------
-         * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
-         * is purely an implementation details.
-         *
-         * The contract is simply this:
-         *
-         *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
-         *     will also succeed.
-         *
-         * Inheritance happens to capture this in a natural way.  In some future, we
-         * may not use inheritance anymore.  That is OK because no code outside of
-         * sce.js and sceSpecs.js would need to be aware of this detail.
-         */
 
-        this.$get = ['$parse', '$sniffer', '$sceDelegate', function(
-            $parse,   $sniffer,   $sceDelegate) {
-            // Prereq: Ensure that we're not running in IE8 quirks mode.  In that mode, IE allows
-            // the "expression(javascript expression)" syntax which is insecure.
-            if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) {
-                throw $sceMinErr('iequirks',
-                    'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' +
-                    'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
-                    'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
-            }
+    var ngAttributeAliasDirectives = {};
 
-            var sce = copy(SCE_CONTEXTS);
+// boolean attrs are evaluated
+    forEach(BOOLEAN_ATTR, function(propName, attrName) {
+        // binding to multiple is not supported
+        if (propName === 'multiple') return;
 
-            /**
-             * @ngdoc method
-             * @name $sce#isEnabled
-             * @function
-             *
-             * @return {Boolean} true if SCE is enabled, false otherwise.  If you want to set the value, you
-             * have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
-             *
-             * @description
-             * Returns a boolean indicating if SCE is enabled.
-             */
-            sce.isEnabled = function () {
-                return enabled;
-            };
-            sce.trustAs = $sceDelegate.trustAs;
-            sce.getTrusted = $sceDelegate.getTrusted;
-            sce.valueOf = $sceDelegate.valueOf;
+        function defaultLinkFn(scope, element, attr) {
+            scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
+                attr.$set(attrName, !!value);
+            });
+        }
 
-            if (!enabled) {
-                sce.trustAs = sce.getTrusted = function(type, value) { return value; };
-                sce.valueOf = identity;
-            }
+        var normalized = directiveNormalize('ng-' + attrName);
+        var linkFn = defaultLinkFn;
 
-            /**
-             * @ngdoc method
-             * @name $sce#parse
-             *
-             * @description
-             * Converts Angular {@link guide/expression expression} into a function.  This is like {@link
-                * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
-             * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
-     * *result*)}
-             *
-             * @param {string} type The kind of SCE context in which this result will be used.
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
-            sce.parseAs = function sceParseAs(type, expr) {
-                var parsed = $parse(expr);
-                if (parsed.literal && parsed.constant) {
-                    return parsed;
-                } else {
-                    return function sceParseAsTrusted(self, locals) {
-                        return sce.getTrusted(type, parsed(self, locals));
-                    };
+        if (propName === 'checked') {
+            linkFn = function(scope, element, attr) {
+                // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input
+                if (attr.ngModel !== attr[normalized]) {
+                    defaultLinkFn(scope, element, attr);
                 }
             };
+        }
 
-            /**
-             * @ngdoc method
-             * @name $sce#trustAs
-             *
-             * @description
-             * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.  As such,
-             * returns an object that is trusted by angular for use in specified strict contextual
-             * escaping contexts (such as ng-bind-html, ng-include, any src attribute
-             * interpolation, any dom event binding attribute interpolation such as for onclick,  etc.)
-             * that uses the provided value.  See * {@link ng.$sce $sce} for enabling strict contextual
-             * escaping.
-             *
-             * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-             *   resource_url, html, js and css.
-             * @param {*} value The value that that should be considered trusted/safe.
-             * @returns {*} A value that can be used to stand in for the provided `value` in places
-             * where Angular expects a $sce.trustAs() return value.
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsHtml
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsHtml(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml
-     *     $sce.getTrustedHtml(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the
-             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsUrl(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl
-     *     $sce.getTrustedUrl(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the
-             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsResourceUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl
-     *     $sce.getTrustedResourceUrl(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the return
-             *     value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsJs
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsJs(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs
-     *     $sce.getTrustedJs(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the
-             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrusted
-             *
-             * @description
-             * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
-             * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the
-             * originally supplied value if the queried context type is a supertype of the created type.
-             * If this condition isn't satisfied, throws an exception.
-             *
-             * @param {string} type The kind of context in which this value is to be used.
-             * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`}
-             *                         call.
-             * @returns {*} The value the was originally provided to
-             *              {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context.
-             *              Otherwise, throws an exception.
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedHtml
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedHtml(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedCss
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedCss(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedUrl(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedResourceUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
-             *
-             * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedJs
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedJs(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)`
-             */
+        ngAttributeAliasDirectives[normalized] = function() {
+            return {
+                restrict: 'A',
+                priority: 100,
+                link: linkFn
+            };
+        };
+    });
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsHtml
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsHtml(expression string)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.HTML, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+// aliased input attrs are evaluated
+    forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) {
+        ngAttributeAliasDirectives[ngAttr] = function() {
+            return {
+                priority: 100,
+                link: function(scope, element, attr) {
+                    //special case ngPattern when a literal regular expression value
+                    //is used as the expression (this way we don't have to watch anything).
+                    if (ngAttr === 'ngPattern' && attr.ngPattern.charAt(0) === '/') {
+                        var match = attr.ngPattern.match(REGEX_STRING_REGEXP);
+                        if (match) {
+                            attr.$set('ngPattern', new RegExp(match[1], match[2]));
+                            return;
+                        }
+                    }
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsCss
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsCss(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.CSS, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+                    scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) {
+                        attr.$set(ngAttr, value);
+                    });
+                }
+            };
+        };
+    });
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsUrl(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.URL, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+// ng-src, ng-srcset, ng-href are interpolated
+    forEach(['src', 'srcset', 'href'], function(attrName) {
+        var normalized = directiveNormalize('ng-' + attrName);
+        ngAttributeAliasDirectives[normalized] = function() {
+            return {
+                priority: 99, // it needs to run after the attributes are interpolated
+                link: function(scope, element, attr) {
+                    var propName = attrName,
+                        name = attrName;
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsResourceUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.RESOURCE_URL, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+                    if (attrName === 'href' &&
+                        toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
+                        name = 'xlinkHref';
+                        attr.$attr[name] = 'xlink:href';
+                        propName = null;
+                    }
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsJs
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsJs(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.JS, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+                    attr.$observe(normalized, function(value) {
+                        if (!value) {
+                            if (attrName === 'href') {
+                                attr.$set(name, null);
+                            }
+                            return;
+                        }
 
-            // Shorthand delegations.
-            var parse = sce.parseAs,
-                getTrusted = sce.getTrusted,
-                trustAs = sce.trustAs;
+                        attr.$set(name, value);
 
-            forEach(SCE_CONTEXTS, function (enumValue, name) {
-                var lName = lowercase(name);
-                sce[camelCase("parse_as_" + lName)] = function (expr) {
-                    return parse(enumValue, expr);
-                };
-                sce[camelCase("get_trusted_" + lName)] = function (value) {
-                    return getTrusted(enumValue, value);
-                };
-                sce[camelCase("trust_as_" + lName)] = function (value) {
-                    return trustAs(enumValue, value);
-                };
-            });
+                        // Support: IE 9-11 only
+                        // On IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
+                        // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
+                        // to set the property as well to achieve the desired effect.
+                        // We use attr[attrName] value since $set can sanitize the url.
+                        if (msie && propName) element.prop(propName, attr[name]);
+                    });
+                }
+            };
+        };
+    });
 
-            return sce;
-        }];
+    /* global -nullFormCtrl, -PENDING_CLASS, -SUBMITTED_CLASS
+ */
+    var nullFormCtrl = {
+            $addControl: noop,
+            $$renameControl: nullFormRenameControl,
+            $removeControl: noop,
+            $setValidity: noop,
+            $setDirty: noop,
+            $setPristine: noop,
+            $setSubmitted: noop
+        },
+        PENDING_CLASS = 'ng-pending',
+        SUBMITTED_CLASS = 'ng-submitted';
+
+    function nullFormRenameControl(control, name) {
+        control.$name = name;
     }
 
     /**
-     * !!! This is an undocumented "private" service !!!
+     * @ngdoc type
+     * @name form.FormController
      *
-     * @name $sniffer
-     * @requires $window
-     * @requires $document
+     * @property {boolean} $pristine True if user has not interacted with the form yet.
+     * @property {boolean} $dirty True if user has already interacted with the form.
+     * @property {boolean} $valid True if all of the containing forms and controls are valid.
+     * @property {boolean} $invalid True if at least one containing control or form is invalid.
+     * @property {boolean} $submitted True if user has submitted the form even if its invalid.
      *
-     * @property {boolean} history Does the browser support html5 history api ?
-     * @property {boolean} hashchange Does the browser support hashchange event ?
-     * @property {boolean} transitions Does the browser support CSS transition events ?
-     * @property {boolean} animations Does the browser support CSS animation events ?
+     * @property {Object} $pending An object hash, containing references to controls or forms with
+     *  pending validators, where:
+     *
+     *  - keys are validations tokens (error names).
+     *  - values are arrays of controls or forms that have a pending validator for the given error name.
+     *
+     * See {@link form.FormController#$error $error} for a list of built-in validation tokens.
+     *
+     * @property {Object} $error An object hash, containing references to controls or forms with failing
+     *  validators, where:
+     *
+     *  - keys are validation tokens (error names),
+     *  - values are arrays of controls or forms that have a failing validator for the given error name.
+     *
+     *  Built-in validation tokens:
+     *  - `email`
+     *  - `max`
+     *  - `maxlength`
+     *  - `min`
+     *  - `minlength`
+     *  - `number`
+     *  - `pattern`
+     *  - `required`
+     *  - `url`
+     *  - `date`
+     *  - `datetimelocal`
+     *  - `time`
+     *  - `week`
+     *  - `month`
      *
      * @description
-     * This is very simple implementation of testing browser's features.
+     * `FormController` keeps track of all its controls and nested forms as well as the state of them,
+     * such as being valid/invalid or dirty/pristine.
+     *
+     * Each {@link ng.directive:form form} directive creates an instance
+     * of `FormController`.
+     *
      */
-    function $SnifferProvider() {
-        this.$get = ['$window', '$document', function($window, $document) {
-            var eventSupport = {},
-                android =
-                    int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
-                boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
-                document = $document[0] || {},
-                documentMode = document.documentMode,
-                vendorPrefix,
-                vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/,
-                bodyStyle = document.body && document.body.style,
-                transitions = false,
-                animations = false,
-                match;
-
-            if (bodyStyle) {
-                for(var prop in bodyStyle) {
-                    if(match = vendorRegex.exec(prop)) {
-                        vendorPrefix = match[0];
-                        vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1);
-                        break;
-                    }
-                }
-
-                if(!vendorPrefix) {
-                    vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit';
-                }
+//asks for $scope to fool the BC controller module
+    FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate'];
+    function FormController($element, $attrs, $scope, $animate, $interpolate) {
+        this.$$controls = [];
 
-                transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle));
-                animations  = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle));
+        // init state
+        this.$error = {};
+        this.$$success = {};
+        this.$pending = undefined;
+        this.$name = $interpolate($attrs.name || $attrs.ngForm || '')($scope);
+        this.$dirty = false;
+        this.$pristine = true;
+        this.$valid = true;
+        this.$invalid = false;
+        this.$submitted = false;
+        this.$$parentForm = nullFormCtrl;
+
+        this.$$element = $element;
+        this.$$animate = $animate;
+
+        setupValidity(this);
+    }
 
-                if (android && (!transitions||!animations)) {
-                    transitions = isString(document.body.style.webkitTransition);
-                    animations = isString(document.body.style.webkitAnimation);
-                }
-            }
+    FormController.prototype = {
+        /**
+         * @ngdoc method
+         * @name form.FormController#$rollbackViewValue
+         *
+         * @description
+         * Rollback all form controls pending updates to the `$modelValue`.
+         *
+         * Updates may be pending by a debounced event or because the input is waiting for a some future
+         * event defined in `ng-model-options`. This method is typically needed by the reset button of
+         * a form that uses `ng-model-options` to pend updates.
+         */
+        $rollbackViewValue: function() {
+            forEach(this.$$controls, function(control) {
+                control.$rollbackViewValue();
+            });
+        },
 
+        /**
+         * @ngdoc method
+         * @name form.FormController#$commitViewValue
+         *
+         * @description
+         * Commit all form controls pending updates to the `$modelValue`.
+         *
+         * Updates may be pending by a debounced event or because the input is waiting for a some future
+         * event defined in `ng-model-options`. This method is rarely needed as `NgModelController`
+         * usually handles calling this in response to input events.
+         */
+        $commitViewValue: function() {
+            forEach(this.$$controls, function(control) {
+                control.$commitViewValue();
+            });
+        },
 
-            return {
-                // Android has history.pushState, but it does not update location correctly
-                // so let's not use the history API at all.
-                // http://code.google.com/p/android/issues/detail?id=17471
-                // https://github.com/angular/angular.js/issues/904
+        /**
+         * @ngdoc method
+         * @name form.FormController#$addControl
+         * @param {object} control control object, either a {@link form.FormController} or an
+         * {@link ngModel.NgModelController}
+         *
+         * @description
+         * Register a control with the form. Input elements using ngModelController do this automatically
+         * when they are linked.
+         *
+         * Note that the current state of the control will not be reflected on the new parent form. This
+         * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine`
+         * state.
+         *
+         * However, if the method is used programmatically, for example by adding dynamically created controls,
+         * or controls that have been previously removed without destroying their corresponding DOM element,
+         * it's the developers responsibility to make sure the current state propagates to the parent form.
+         *
+         * For example, if an input control is added that is already `$dirty` and has `$error` properties,
+         * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form.
+         */
+        $addControl: function(control) {
+            // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
+            // and not added to the scope.  Now we throw an error.
+            assertNotHasOwnProperty(control.$name, 'input');
+            this.$$controls.push(control);
 
-                // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
-                // so let's not use the history API also
-                // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
-                // jshint -W018
-                history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
-                // jshint +W018
-                hashchange: 'onhashchange' in $window &&
-                    // IE8 compatible mode lies
-                (!documentMode || documentMode > 7),
-                hasEvent: function(event) {
-                    // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
-                    // it. In particular the event is not fired when backspace or delete key are pressed or
-                    // when cut operation is performed.
-                    if (event == 'input' && msie == 9) return false;
+            if (control.$name) {
+                this[control.$name] = control;
+            }
 
-                    if (isUndefined(eventSupport[event])) {
-                        var divElm = document.createElement('div');
-                        eventSupport[event] = 'on' + event in divElm;
-                    }
+            control.$$parentForm = this;
+        },
 
-                    return eventSupport[event];
-                },
-                csp: csp(),
-                vendorPrefix: vendorPrefix,
-                transitions : transitions,
-                animations : animations,
-                android: android,
-                msie : msie,
-                msieDocumentMode: documentMode
-            };
-        }];
-    }
+        // Private API: rename a form control
+        $$renameControl: function(control, newName) {
+            var oldName = control.$name;
 
-    function $TimeoutProvider() {
-        this.$get = ['$rootScope', '$browser', '$q', '$exceptionHandler',
-            function($rootScope,   $browser,   $q,   $exceptionHandler) {
-                var deferreds = {};
+            if (this[oldName] === control) {
+                delete this[oldName];
+            }
+            this[newName] = control;
+            control.$name = newName;
+        },
 
+        /**
+         * @ngdoc method
+         * @name form.FormController#$removeControl
+         * @param {object} control control object, either a {@link form.FormController} or an
+         * {@link ngModel.NgModelController}
+         *
+         * @description
+         * Deregister a control from the form.
+         *
+         * Input elements using ngModelController do this automatically when they are destroyed.
+         *
+         * Note that only the removed control's validation state (`$errors`etc.) will be removed from the
+         * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be
+         * different from case to case. For example, removing the only `$dirty` control from a form may or
+         * may not mean that the form is still `$dirty`.
+         */
+        $removeControl: function(control) {
+            if (control.$name && this[control.$name] === control) {
+                delete this[control.$name];
+            }
+            forEach(this.$pending, function(value, name) {
+                // eslint-disable-next-line no-invalid-this
+                this.$setValidity(name, null, control);
+            }, this);
+            forEach(this.$error, function(value, name) {
+                // eslint-disable-next-line no-invalid-this
+                this.$setValidity(name, null, control);
+            }, this);
+            forEach(this.$$success, function(value, name) {
+                // eslint-disable-next-line no-invalid-this
+                this.$setValidity(name, null, control);
+            }, this);
+
+            arrayRemove(this.$$controls, control);
+            control.$$parentForm = nullFormCtrl;
+        },
 
-                /**
-                 * @ngdoc service
-                 * @name $timeout
-                 *
-                 * @description
-                 * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
-                 * block and delegates any exceptions to
-                 * {@link ng.$exceptionHandler $exceptionHandler} service.
-                 *
-                 * The return value of registering a timeout function is a promise, which will be resolved when
-                 * the timeout is reached and the timeout function is executed.
-                 *
-                 * To cancel a timeout request, call `$timeout.cancel(promise)`.
-                 *
-                 * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
-                 * synchronously flush the queue of deferred functions.
-                 *
-                 * @param {function()} fn A function, whose execution should be delayed.
-                 * @param {number=} [delay=0] Delay in milliseconds.
-                 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
-                 *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
-                 * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this
-                 *   promise will be resolved with is the return value of the `fn` function.
-                 *
-                 */
-                function timeout(fn, delay, invokeApply) {
-                    var deferred = $q.defer(),
-                        promise = deferred.promise,
-                        skipApply = (isDefined(invokeApply) && !invokeApply),
-                        timeoutId;
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setDirty
+         *
+         * @description
+         * Sets the form to a dirty state.
+         *
+         * This method can be called to add the 'ng-dirty' class and set the form to a dirty
+         * state (ng-dirty class). This method will also propagate to parent forms.
+         */
+        $setDirty: function() {
+            this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
+            this.$$animate.addClass(this.$$element, DIRTY_CLASS);
+            this.$dirty = true;
+            this.$pristine = false;
+            this.$$parentForm.$setDirty();
+        },
 
-                    timeoutId = $browser.defer(function() {
-                        try {
-                            deferred.resolve(fn());
-                        } catch(e) {
-                            deferred.reject(e);
-                            $exceptionHandler(e);
-                        }
-                        finally {
-                            delete deferreds[promise.$$timeoutId];
-                        }
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setPristine
+         *
+         * @description
+         * Sets the form to its pristine state.
+         *
+         * This method sets the form's `$pristine` state to true, the `$dirty` state to false, removes
+         * the `ng-dirty` class and adds the `ng-pristine` class. Additionally, it sets the `$submitted`
+         * state to false.
+         *
+         * This method will also propagate to all the controls contained in this form.
+         *
+         * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
+         * saving or resetting it.
+         */
+        $setPristine: function() {
+            this.$$animate.setClass(this.$$element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS);
+            this.$dirty = false;
+            this.$pristine = true;
+            this.$submitted = false;
+            forEach(this.$$controls, function(control) {
+                control.$setPristine();
+            });
+        },
 
-                        if (!skipApply) $rootScope.$apply();
-                    }, delay);
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setUntouched
+         *
+         * @description
+         * Sets the form to its untouched state.
+         *
+         * This method can be called to remove the 'ng-touched' class and set the form controls to their
+         * untouched state (ng-untouched class).
+         *
+         * Setting a form controls back to their untouched state is often useful when setting the form
+         * back to its pristine state.
+         */
+        $setUntouched: function() {
+            forEach(this.$$controls, function(control) {
+                control.$setUntouched();
+            });
+        },
 
-                    promise.$$timeoutId = timeoutId;
-                    deferreds[timeoutId] = deferred;
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setSubmitted
+         *
+         * @description
+         * Sets the form to its submitted state.
+         */
+        $setSubmitted: function() {
+            this.$$animate.addClass(this.$$element, SUBMITTED_CLASS);
+            this.$submitted = true;
+            this.$$parentForm.$setSubmitted();
+        }
+    };
 
-                    return promise;
+    /**
+     * @ngdoc method
+     * @name form.FormController#$setValidity
+     *
+     * @description
+     * Change the validity state of the form, and notify the parent form (if any).
+     *
+     * Application developers will rarely need to call this method directly. It is used internally, by
+     * {@link ngModel.NgModelController#$setValidity NgModelController.$setValidity()}, to propagate a
+     * control's validity state to the parent `FormController`.
+     *
+     * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be
+     *        assigned to either `$error[validationErrorKey]` or `$pending[validationErrorKey]` (for
+     *        unfulfilled `$asyncValidators`), so that it is available for data-binding. The
+     *        `validationErrorKey` should be in camelCase and will get converted into dash-case for
+     *        class name. Example: `myError` will result in `ng-valid-my-error` and
+     *        `ng-invalid-my-error` classes and can be bound to as `{{ someForm.$error.myError }}`.
+     * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending
+     *        (undefined),  or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+     *        Skipped is used by AngularJS when validators do not run because of parse errors and when
+     *        `$asyncValidators` do not run because any of the `$validators` failed.
+     * @param {NgModelController | FormController} controller - The controller whose validity state is
+     *        triggering the change.
+     */
+    addSetValidityMethod({
+        clazz: FormController,
+        set: function(object, property, controller) {
+            var list = object[property];
+            if (!list) {
+                object[property] = [controller];
+            } else {
+                var index = list.indexOf(controller);
+                if (index === -1) {
+                    list.push(controller);
                 }
+            }
+        },
+        unset: function(object, property, controller) {
+            var list = object[property];
+            if (!list) {
+                return;
+            }
+            arrayRemove(list, controller);
+            if (list.length === 0) {
+                delete object[property];
+            }
+        }
+    });
 
-
-                /**
-                 * @ngdoc method
-                 * @name $timeout#cancel
-                 *
-                 * @description
-                 * Cancels a task associated with the `promise`. As a result of this, the promise will be
-                 * resolved with a rejection.
-                 *
-                 * @param {Promise=} promise Promise returned by the `$timeout` function.
-                 * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
-                 *   canceled.
-                 */
-                timeout.cancel = function(promise) {
-                    if (promise && promise.$$timeoutId in deferreds) {
-                        deferreds[promise.$$timeoutId].reject('canceled');
-                        delete deferreds[promise.$$timeoutId];
-                        return $browser.defer.cancel(promise.$$timeoutId);
-                    }
-                    return false;
-                };
-
-                return timeout;
-            }];
-    }
-
-// NOTE:  The usage of window and document instead of $window and $document here is
-// deliberate.  This service depends on the specific behavior of anchor nodes created by the
-// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
-// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
-// doesn't know about mocked locations and resolves URLs to the real document - which is
-// exactly the behavior needed here.  There is little value is mocking these out for this
-// service.
-    var urlParsingNode = document.createElement("a");
-    var originUrl = urlResolve(window.location.href, true);
-
+    /**
+     * @ngdoc directive
+     * @name ngForm
+     * @restrict EAC
+     *
+     * @description
+     * Nestable alias of {@link ng.directive:form `form`} directive. HTML
+     * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
+     * sub-group of controls needs to be determined.
+     *
+     * Note: the purpose of `ngForm` is to group controls,
+     * but not to be a replacement for the `<form>` tag with all of its capabilities
+     * (e.g. posting to the server, ...).
+     *
+     * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
+     *                       related scope, under this name.
+     *
+     */
 
     /**
+     * @ngdoc directive
+     * @name form
+     * @restrict E
      *
-     * Implementation Notes for non-IE browsers
-     * ----------------------------------------
-     * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
-     * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
-     * URL will be resolved into an absolute URL in the context of the application document.
-     * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
-     * properties are all populated to reflect the normalized URL.  This approach has wide
-     * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc.  See
-     * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+     * @description
+     * Directive that instantiates
+     * {@link form.FormController FormController}.
      *
-     * Implementation Notes for IE
-     * ---------------------------
-     * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other
-     * browsers.  However, the parsed components will not be set if the URL assigned did not specify
-     * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
-     * work around that by performing the parsing in a 2nd step by taking a previously normalized
-     * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
-     * properties such as protocol, hostname, port, etc.
+     * If the `name` attribute is specified, the form controller is published onto the current scope under
+     * this name.
      *
-     * IE7 does not normalize the URL when assigned to an anchor node.  (Apparently, it does, if one
-     * uses the inner HTML approach to assign the URL as part of an HTML snippet -
-     * http://stackoverflow.com/a/472729)  However, setting img[src] does normalize the URL.
-     * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception.
-     * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that
-     * method and IE < 8 is unsupported.
+     * ## Alias: {@link ng.directive:ngForm `ngForm`}
      *
-     * References:
-     *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
-     *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
-     *   http://url.spec.whatwg.org/#urlutils
-     *   https://github.com/angular/angular.js/pull/2902
-     *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+     * In AngularJS, forms can be nested. This means that the outer form is valid when all of the child
+     * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
+     * AngularJS provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to
+     * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group
+     * of controls needs to be determined.
      *
-     * @function
-     * @param {string} url The URL to be parsed.
-     * @description Normalizes and parses a URL.
-     * @returns {object} Returns the normalized URL as a dictionary.
+     * ## CSS classes
+     *  - `ng-valid` is set if the form is valid.
+     *  - `ng-invalid` is set if the form is invalid.
+     *  - `ng-pending` is set if the form is pending.
+     *  - `ng-pristine` is set if the form is pristine.
+     *  - `ng-dirty` is set if the form is dirty.
+     *  - `ng-submitted` is set if the form was submitted.
      *
-     *   | member name   | Description    |
-     *   |---------------|----------------|
-     *   | href          | A normalized version of the provided URL if it was not an absolute URL |
-     *   | protocol      | The protocol including the trailing colon                              |
-     *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
-     *   | search        | The search params, minus the question mark                             |
-     *   | hash          | The hash string, minus the hash symbol
-     *   | hostname      | The hostname
-     *   | port          | The port, without ":"
-     *   | pathname      | The pathname, beginning with "/"
+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     *
+     *
+     * ## Submitting a form and preventing the default action
+     *
+     * Since the role of forms in client-side AngularJS applications is different than in classical
+     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
+     * page reload that sends the data to the server. Instead some javascript logic should be triggered
+     * to handle the form submission in an application-specific way.
+     *
+     * For this reason, AngularJS prevents the default action (form submission to the server) unless the
+     * `<form>` element has an `action` attribute specified.
+     *
+     * You can use one of the following two ways to specify what javascript method should be called when
+     * a form is submitted:
+     *
+     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
+     * - {@link ng.directive:ngClick ngClick} directive on the first
+     *  button or input field of type submit (input[type=submit])
+     *
+     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
+     * or {@link ng.directive:ngClick ngClick} directives.
+     * This is because of the following form submission rules in the HTML specification:
+     *
+     * - If a form has only one input field then hitting enter in this field triggers form submit
+     * (`ngSubmit`)
+     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
+     * doesn't trigger submit
+     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
+     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
+     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+     *
+     * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
+     * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+     * to have access to the updated model.
+     *
+     * @animations
+     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
+     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
+     * other validations that are performed within the form. Animations in ngForm are similar to how
+     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
+     * as JS animations.
+     *
+     * The following example shows a simple way to utilize CSS transitions to style a form element
+     * that has been rendered as invalid after it has been validated:
+     *
+     * <pre>
+     * //be sure to include ngAnimate as a module to hook into more
+     * //advanced animations
+     * .my-form {
+     *   transition:0.5s linear all;
+     *   background: white;
+     * }
+     * .my-form.ng-invalid {
+     *   background: red;
+     *   color:white;
+     * }
+     * </pre>
+     *
+     * @example
+     <example name="ng-form" deps="angular-animate.js" animations="true" fixBase="true" module="formExample">
+     <file name="index.html">
+     <script>
+     angular.module('formExample', [])
+     .controller('FormController', ['$scope', function($scope) {
+             $scope.userType = 'guest';
+           }]);
+     </script>
+     <style>
+     .my-form {
+          transition:all linear 0.5s;
+          background: transparent;
+        }
+     .my-form.ng-invalid {
+          background: red;
+        }
+     </style>
+     <form name="myForm" ng-controller="FormController" class="my-form">
+     userType: <input name="input" ng-model="userType" required>
+     <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
+     <code>userType = {{userType}}</code><br>
+     <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
+     <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
+     <code>myForm.$valid = {{myForm.$valid}}</code><br>
+     <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should initialize to model', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+
+          expect(userType.getText()).toContain('guest');
+          expect(valid.getText()).toContain('true');
+        });
+
+     it('should be invalid if empty', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var userInput = element(by.model('userType'));
+
+          userInput.clear();
+          userInput.sendKeys('');
+
+          expect(userType.getText()).toEqual('userType =');
+          expect(valid.getText()).toContain('false');
+        });
+     </file>
+     </example>
      *
+     * @param {string=} name Name of the form. If specified, the form controller will be published into
+     *                       related scope, under this name.
      */
-    function urlResolve(url, base) {
-        var href = url;
+    var formDirectiveFactory = function(isNgForm) {
+        return ['$timeout', '$parse', function($timeout, $parse) {
+            var formDirective = {
+                name: 'form',
+                restrict: isNgForm ? 'EAC' : 'E',
+                require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
+                controller: FormController,
+                compile: function ngFormCompile(formElement, attr) {
+                    // Setup initial state of the control
+                    formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
+
+                    var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
+                    return {
+                        pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
+                            var controller = ctrls[0];
+
+                            // if `action` attr is not present on the form, prevent the default action (submission)
+                            if (!('action' in attr)) {
+                                // we can't use jq events because if a form is destroyed during submission the default
+                                // action is not prevented. see #1238
+                                //
+                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
+                                // page reload if the form was destroyed by submission of the form via a click handler
+                                // on a button in the form. Looks like an IE9 specific bug.
+                                var handleFormSubmission = function(event) {
+                                    scope.$apply(function() {
+                                        controller.$commitViewValue();
+                                        controller.$setSubmitted();
+                                    });
+
+                                    event.preventDefault();
+                                };
+
+                                formElement[0].addEventListener('submit', handleFormSubmission);
+
+                                // unregister the preventDefault listener so that we don't not leak memory but in a
+                                // way that will achieve the prevention of the default action.
+                                formElement.on('$destroy', function() {
+                                    $timeout(function() {
+                                        formElement[0].removeEventListener('submit', handleFormSubmission);
+                                    }, 0, false);
+                                });
+                            }
 
-        if (msie) {
-            // Normalize before parse.  Refer Implementation Notes on why this is
-            // done in two steps on IE.
-            urlParsingNode.setAttribute("href", href);
-            href = urlParsingNode.href;
-        }
+                            var parentFormCtrl = ctrls[1] || controller.$$parentForm;
+                            parentFormCtrl.$addControl(controller);
 
-        urlParsingNode.setAttribute('href', href);
+                            var setter = nameAttr ? getSetter(controller.$name) : noop;
 
-        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
-        return {
-            href: urlParsingNode.href,
-            protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
-            host: urlParsingNode.host,
-            search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
-            hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
-            hostname: urlParsingNode.hostname,
-            port: urlParsingNode.port,
-            pathname: (urlParsingNode.pathname.charAt(0) === '/')
-                ? urlParsingNode.pathname
-                : '/' + urlParsingNode.pathname
-        };
-    }
+                            if (nameAttr) {
+                                setter(scope, controller);
+                                attr.$observe(nameAttr, function(newValue) {
+                                    if (controller.$name === newValue) return;
+                                    setter(scope, undefined);
+                                    controller.$$parentForm.$$renameControl(controller, newValue);
+                                    setter = getSetter(controller.$name);
+                                    setter(scope, controller);
+                                });
+                            }
+                            formElement.on('$destroy', function() {
+                                controller.$$parentForm.$removeControl(controller);
+                                setter(scope, undefined);
+                                extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+                            });
+                        }
+                    };
+                }
+            };
 
-    /**
-     * Parse a request URL and determine whether this is a same-origin request as the application document.
-     *
-     * @param {string|object} requestUrl The url of the request as a string that will be resolved
-     * or a parsed URL object.
-     * @returns {boolean} Whether the request is for the same origin as the application document.
-     */
-    function urlIsSameOrigin(requestUrl) {
-        var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
-        return (parsed.protocol === originUrl.protocol &&
-        parsed.host === originUrl.host);
+            return formDirective;
+
+            function getSetter(expression) {
+                if (expression === '') {
+                    //create an assignable expression, so forms with an empty name can be renamed later
+                    return $parse('this[""]').assign;
+                }
+                return $parse(expression).assign || noop;
+            }
+        }];
+    };
+
+    var formDirective = formDirectiveFactory();
+    var ngFormDirective = formDirectiveFactory(true);
+
+
+
+// helper methods
+    function setupValidity(instance) {
+        instance.$$classCache = {};
+        instance.$$classCache[INVALID_CLASS] = !(instance.$$classCache[VALID_CLASS] = instance.$$element.hasClass(VALID_CLASS));
     }
+    function addSetValidityMethod(context) {
+        var clazz = context.clazz,
+            set = context.set,
+            unset = context.unset;
+
+        clazz.prototype.$setValidity = function(validationErrorKey, state, controller) {
+            if (isUndefined(state)) {
+                createAndSet(this, '$pending', validationErrorKey, controller);
+            } else {
+                unsetAndCleanup(this, '$pending', validationErrorKey, controller);
+            }
+            if (!isBoolean(state)) {
+                unset(this.$error, validationErrorKey, controller);
+                unset(this.$$success, validationErrorKey, controller);
+            } else {
+                if (state) {
+                    unset(this.$error, validationErrorKey, controller);
+                    set(this.$$success, validationErrorKey, controller);
+                } else {
+                    set(this.$error, validationErrorKey, controller);
+                    unset(this.$$success, validationErrorKey, controller);
+                }
+            }
+            if (this.$pending) {
+                cachedToggleClass(this, PENDING_CLASS, true);
+                this.$valid = this.$invalid = undefined;
+                toggleValidationCss(this, '', null);
+            } else {
+                cachedToggleClass(this, PENDING_CLASS, false);
+                this.$valid = isObjectEmpty(this.$error);
+                this.$invalid = !this.$valid;
+                toggleValidationCss(this, '', this.$valid);
+            }
 
-    /**
-     * @ngdoc service
-     * @name $window
-     *
-     * @description
-     * A reference to the browser's `window` object. While `window`
-     * is globally available in JavaScript, it causes testability problems, because
-     * it is a global variable. In angular we always refer to it through the
-     * `$window` service, so it may be overridden, removed or mocked for testing.
-     *
-     * Expressions, like the one defined for the `ngClick` directive in the example
-     * below, are evaluated with respect to the current scope.  Therefore, there is
-     * no risk of inadvertently coding in a dependency on a global value in such an
-     * expression.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope, $window) {
-           $scope.greeting = 'Hello, World!';
-           $scope.doGreeting = function(greeting) {
-               $window.alert(greeting);
-           };
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <input type="text" ng-model="greeting" />
-     <button ng-click="doGreeting(greeting)">ALERT</button>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should display the greeting in the input box', function() {
-       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
-       // If we click the button it will block the test runner
-       // element(':button').click();
-      });
-     </file>
-     </example>
-     */
-    function $WindowProvider(){
-        this.$get = valueFn(window);
+            // re-read the state as the set/unset methods could have
+            // combined state in this.$error[validationError] (used for forms),
+            // where setting/unsetting only increments/decrements the value,
+            // and does not replace it.
+            var combinedState;
+            if (this.$pending && this.$pending[validationErrorKey]) {
+                combinedState = undefined;
+            } else if (this.$error[validationErrorKey]) {
+                combinedState = false;
+            } else if (this.$$success[validationErrorKey]) {
+                combinedState = true;
+            } else {
+                combinedState = null;
+            }
+
+            toggleValidationCss(this, validationErrorKey, combinedState);
+            this.$$parentForm.$setValidity(validationErrorKey, combinedState, this);
+        };
+
+        function createAndSet(ctrl, name, value, controller) {
+            if (!ctrl[name]) {
+                ctrl[name] = {};
+            }
+            set(ctrl[name], value, controller);
+        }
+
+        function unsetAndCleanup(ctrl, name, value, controller) {
+            if (ctrl[name]) {
+                unset(ctrl[name], value, controller);
+            }
+            if (isObjectEmpty(ctrl[name])) {
+                ctrl[name] = undefined;
+            }
+        }
+
+        function cachedToggleClass(ctrl, className, switchValue) {
+            if (switchValue && !ctrl.$$classCache[className]) {
+                ctrl.$$animate.addClass(ctrl.$$element, className);
+                ctrl.$$classCache[className] = true;
+            } else if (!switchValue && ctrl.$$classCache[className]) {
+                ctrl.$$animate.removeClass(ctrl.$$element, className);
+                ctrl.$$classCache[className] = false;
+            }
+        }
+
+        function toggleValidationCss(ctrl, validationErrorKey, isValid) {
+            validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
+
+            cachedToggleClass(ctrl, VALID_CLASS + validationErrorKey, isValid === true);
+            cachedToggleClass(ctrl, INVALID_CLASS + validationErrorKey, isValid === false);
+        }
     }
 
-    /**
-     * @ngdoc provider
-     * @name $filterProvider
-     * @description
-     *
-     * Filters are just functions which transform input to an output. However filters need to be
-     * Dependency Injected. To achieve this a filter definition consists of a factory function which is
-     * annotated with dependencies and is responsible for creating a filter function.
-     *
-     * ```js
-     *   // Filter registration
-     *   function MyModule($provide, $filterProvider) {
- *     // create a service to demonstrate injection (not always needed)
- *     $provide.value('greet', function(name){
- *       return 'Hello ' + name + '!';
- *     });
- *
- *     // register a filter factory which uses the
- *     // greet service to demonstrate DI.
- *     $filterProvider.register('greet', function(greet){
- *       // return the filter function which uses the greet service
- *       // to generate salutation
- *       return function(text) {
- *         // filters need to be forgiving so check input validity
- *         return text && greet(text) || text;
- *       };
- *     });
- *   }
-     * ```
-     *
-     * The filter function is registered with the `$injector` under the filter name suffix with
-     * `Filter`.
-     *
-     * ```js
-     *   it('should be the same instance', inject(
-     *     function($filterProvider) {
- *       $filterProvider.register('reverse', function(){
- *         return ...;
- *       });
- *     },
-     *     function($filter, reverseFilter) {
- *       expect($filter('reverse')).toBe(reverseFilter);
- *     });
-     * ```
-     *
-     *
-     * For more information about how angular filters work, and how to create your own filters, see
-     * {@link guide/filter Filters} in the Angular Developer Guide.
-     */
-    /**
-     * @ngdoc method
-     * @name $filterProvider#register
-     * @description
-     * Register filter factory function.
-     *
-     * @param {String} name Name of the filter.
-     * @param {Function} fn The filter factory function which is injectable.
-     */
+    function isObjectEmpty(obj) {
+        if (obj) {
+            for (var prop in obj) {
+                if (obj.hasOwnProperty(prop)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 
+    /* global
+  VALID_CLASS: false,
+  INVALID_CLASS: false,
+  PRISTINE_CLASS: false,
+  DIRTY_CLASS: false,
+  ngModelMinErr: false
+*/
+
+// Regex code was initially obtained from SO prior to modification: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
+    var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
+// See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
+// Note: We are being more lenient, because browsers are too.
+//   1. Scheme
+//   2. Slashes
+//   3. Username
+//   4. Password
+//   5. Hostname
+//   6. Port
+//   7. Path
+//   8. Query
+//   9. Fragment
+//                 1111111111111111 222   333333    44444        55555555555555555555555     666     77777777     8888888     999
+    var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
+// eslint-disable-next-line max-len
+    var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
+    var NUMBER_REGEXP = /^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
+    var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
+    var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+    var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
+    var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
+    var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+
+    var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
+    var PARTIAL_VALIDATION_TYPES = createMap();
+    forEach('date,datetime-local,month,time,week'.split(','), function(type) {
+        PARTIAL_VALIDATION_TYPES[type] = true;
+    });
 
-    /**
-     * @ngdoc service
-     * @name $filter
-     * @function
-     * @description
-     * Filters are used for formatting data displayed to the user.
-     *
-     * The general syntax in templates is as follows:
-     *
-     *         {{ expression [| filter_name[:parameter_value] ... ] }}
-     *
-     * @param {String} name Name of the filter function to retrieve
-     * @return {Function} the filter function
-     */
-    $FilterProvider.$inject = ['$provide'];
-    function $FilterProvider($provide) {
-        var suffix = 'Filter';
+    var inputType = {
 
         /**
-         * @ngdoc method
-         * @name $controllerProvider#register
-         * @param {string|Object} name Name of the filter function, or an object map of filters where
-         *    the keys are the filter names and the values are the filter factories.
-         * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
-         *    of the registered filter instances.
+         * @ngdoc input
+         * @name input[text]
+         *
+         * @description
+         * Standard HTML text input with AngularJS data binding, inherited by most of the `input` elements.
+         *
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Adds `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
+         *    This parameter is ignored for input[type=password] controls, which will never trim the
+         *    input.
+         *
+         * @example
+         <example name="text-input-directive" module="textInputExample">
+         <file name="index.html">
+         <script>
+         angular.module('textInputExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 text: 'guest',
+                 word: /^\s*\w*\s*$/
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Single word:
+         <input type="text" name="input" ng-model="example.text"
+         ng-pattern="example.word" required ng-trim="false">
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.pattern">
+         Single word only!</span>
+         </div>
+         <code>text = {{example.text}}</code><br/>
+         <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br/>
+         <code>myForm.input.$error = {{myForm.input.$error}}</code><br/>
+         <code>myForm.$valid = {{myForm.$valid}}</code><br/>
+         <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var text = element(by.binding('example.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.text'));
+
+         it('should initialize to model', function() {
+            expect(text.getText()).toContain('guest');
+            expect(valid.getText()).toContain('true');
+          });
+
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+         it('should be invalid if multi word', function() {
+            input.clear();
+            input.sendKeys('hello world');
+
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
          */
-        function register(name, factory) {
-            if(isObject(name)) {
-                var filters = {};
-                forEach(name, function(filter, key) {
-                    filters[key] = register(key, filter);
-                });
-                return filters;
-            } else {
-                return $provide.factory(name + suffix, factory);
-            }
+        'text': textInputType,
+
+        /**
+         * @ngdoc input
+         * @name input[date]
+         *
+         * @description
+         * Input with date validation and transformation. In browsers that do not yet support
+         * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
+         * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
+         * modern browsers do not yet support this input type, it is important to provide cues to users on the
+         * expected input format via a placeholder or label.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+         *   valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+         *   (e.g. `min="{{minDate | date:'yyyy-MM-dd'}}"`). Note that `min` will also add native HTML5
+         *   constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+         *   a valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+         *   (e.g. `max="{{maxDate | date:'yyyy-MM-dd'}}"`). Note that `max` will also add native HTML5
+         *   constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO date string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO date string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="date-input-directive" module="dateInputExample">
+         <file name="index.html">
+         <script>
+         angular.module('dateInputExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+              $scope.example = {
+                value: new Date(2013, 9, 22)
+              };
+            }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a date in 2013:</label>
+         <input type="date" id="exampleInput" name="input" ng-model="example.value"
+         placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.date">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (see https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+          // set the value of the element and force validation.
+          var scr = "var ipt = document.getElementById('exampleInput'); " +
+          "ipt.value = '" + val + "';" +
+          "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+          browser.executeScript(scr);
         }
-        this.register = register;
 
-        this.$get = ['$injector', function($injector) {
-            return function(name) {
-                return $injector.get(name + suffix);
-            };
-        }];
+         it('should initialize to model', function() {
+          expect(value.getText()).toContain('2013-10-22');
+          expect(valid.getText()).toContain('myForm.input.$valid = true');
+        });
 
-        ////////////////////////////////////////
+         it('should be invalid if empty', function() {
+          setInput('');
+          expect(value.getText()).toEqual('value =');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
 
-        /* global
-         currencyFilter: false,
-         dateFilter: false,
-         filterFilter: false,
-         jsonFilter: false,
-         limitToFilter: false,
-         lowercaseFilter: false,
-         numberFilter: false,
-         orderByFilter: false,
-         uppercaseFilter: false,
+         it('should be invalid if over max', function() {
+          setInput('2015-01-01');
+          expect(value.getText()).toContain('');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+         </file>
+         </example>
          */
+        'date': createDateInputType('date', DATE_REGEXP,
+            createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
+            'yyyy-MM-dd'),
 
-        register('currency', currencyFilter);
-        register('date', dateFilter);
-        register('filter', filterFilter);
-        register('json', jsonFilter);
-        register('limitTo', limitToFilter);
-        register('lowercase', lowercaseFilter);
-        register('number', numberFilter);
-        register('orderBy', orderByFilter);
-        register('uppercase', uppercaseFilter);
-    }
+        /**
+         * @ngdoc input
+         * @name input[datetime-local]
+         *
+         * @description
+         * Input with datetime validation and transformation. In browsers that do not yet support
+         * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+         *   inside this attribute (e.g. `min="{{minDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+         *   Note that `min` will also add native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+         *   inside this attribute (e.g. `max="{{maxDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+         *   Note that `max` will also add native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation error key to the Date / ISO datetime string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation error key to the Date / ISO datetime string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="datetimelocal-input-directive" module="dateExample">
+         <file name="index.html">
+         <script>
+         angular.module('dateExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+            $scope.example = {
+              value: new Date(2010, 11, 28, 14, 57)
+            };
+          }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a date between in 2013:</label>
+         <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
+         placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.datetimelocal">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-    /**
-     * @ngdoc filter
-     * @name filter
-     * @function
-     *
-     * @description
-     * Selects a subset of items from `array` and returns it as a new array.
-     *
-     * @param {Array} array The source array.
-     * @param {string|Object|function()} expression The predicate to be used for selecting items from
-     *   `array`.
-     *
-     *   Can be one of:
-     *
-     *   - `string`: The string is evaluated as an expression and the resulting value is used for substring match against
-     *     the contents of the `array`. All strings or objects with string properties in `array` that contain this string
-     *     will be returned. The predicate can be negated by prefixing the string with `!`.
-     *
-     *   - `Object`: A pattern object can be used to filter specific properties on objects contained
-     *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
-     *     which have property `name` containing "M" and property `phone` containing "1". A special
-     *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
-     *     property of the object. That's equivalent to the simple substring match with a `string`
-     *     as described above.
-     *
-     *   - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
-     *     called for each element of `array`. The final result is an array of those elements that
-     *     the predicate returned true for.
-     *
-     * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
-     *     determining if the expected value (from the filter expression) and actual value (from
-     *     the object in the array) should be considered a match.
-     *
-     *   Can be one of:
-     *
-     *     - `function(actual, expected)`:
-     *       The function will be given the object value and the predicate value to compare and
-     *       should return true if the item should be included in filtered result.
-     *
-     *     - `true`: A shorthand for `function(actual, expected) { return angular.equals(expected, actual)}`.
-     *       this is essentially strict comparison of expected and actual.
-     *
-     *     - `false|undefined`: A short hand for a function which will look for a substring match in case
-     *       insensitive way.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div ng-init="friends = [{name:'John', phone:'555-1276'},
-     {name:'Mary', phone:'800-BIG-MARY'},
-     {name:'Mike', phone:'555-4321'},
-     {name:'Adam', phone:'555-5678'},
-     {name:'Julie', phone:'555-8765'},
-     {name:'Juliette', phone:'555-5678'}]"></div>
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-     Search: <input ng-model="searchText">
-     <table id="searchTextResults">
-     <tr><th>Name</th><th>Phone</th></tr>
-     <tr ng-repeat="friend in friends | filter:searchText">
-     <td>{{friend.name}}</td>
-     <td>{{friend.phone}}</td>
-     </tr>
-     </table>
-     <hr>
-     Any: <input ng-model="search.$"> <br>
-     Name only <input ng-model="search.name"><br>
-     Phone only <input ng-model="search.phone"><br>
-     Equality <input type="checkbox" ng-model="strict"><br>
-     <table id="searchObjResults">
-     <tr><th>Name</th><th>Phone</th></tr>
-     <tr ng-repeat="friendObj in friends | filter:search:strict">
-     <td>{{friendObj.name}}</td>
-     <td>{{friendObj.phone}}</td>
-     </tr>
-     </table>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var expectFriendNames = function(expectedNames, key) {
-         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
-           arr.forEach(function(wd, i) {
-             expect(wd.getText()).toMatch(expectedNames[i]);
-           });
-         });
-       };
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('2010-12-28T14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-     it('should search across all fields when filtering with a string', function() {
-         var searchText = element(by.model('searchText'));
-         searchText.clear();
-         searchText.sendKeys('m');
-         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
 
-         searchText.clear();
-         searchText.sendKeys('76');
-         expectFriendNames(['John', 'Julie'], 'friend');
-       });
+         it('should be invalid if over max', function() {
+        setInput('2015-01-01T23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
+            createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
+            'yyyy-MM-ddTHH:mm:ss.sss'),
 
-     it('should search in specific fields when filtering with a predicate object', function() {
-         var searchAny = element(by.model('search.$'));
-         searchAny.clear();
-         searchAny.sendKeys('i');
-         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
-       });
-     it('should use a equal comparison when comparator is true', function() {
-         var searchName = element(by.model('search.name'));
-         var strict = element(by.model('strict'));
-         searchName.clear();
-         searchName.sendKeys('Julie');
-         strict.click();
-         expectFriendNames(['Julie'], 'friendObj');
-       });
-     </file>
-     </example>
-     */
-    function filterFilter() {
-        return function(array, expression, comparator) {
-            if (!isArray(array)) return array;
+        /**
+         * @ngdoc input
+         * @name input[time]
+         *
+         * @description
+         * Input with time validation and transformation. In browsers that do not yet support
+         * the HTML5 time input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
+         * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+         *   attribute (e.g. `min="{{minTime | date:'HH:mm:ss'}}"`). Note that `min` will also add
+         *   native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+         *   attribute (e.g. `max="{{maxTime | date:'HH:mm:ss'}}"`). Note that `max` will also add
+         *   native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO time string the
+         *   `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO time string the
+         *   `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="time-input-directive" module="timeExample">
+         <file name="index.html">
+         <script>
+         angular.module('timeExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(1970, 0, 1, 14, 57, 0)
+          };
+        }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a time between 8am and 5pm:</label>
+         <input type="time" id="exampleInput" name="input" ng-model="example.value"
+         placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.time">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "HH:mm:ss"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-            var comparatorType = typeof(comparator),
-                predicates = [];
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-            predicates.check = function(value) {
-                for (var j = 0; j < predicates.length; j++) {
-                    if(!predicates[j](value)) {
-                        return false;
-                    }
-                }
-                return true;
-            };
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-            if (comparatorType !== 'function') {
-                if (comparatorType === 'boolean' && comparator) {
-                    comparator = function(obj, text) {
-                        return angular.equals(obj, text);
-                    };
-                } else {
-                    comparator = function(obj, text) {
-                        if (obj && text && typeof obj === 'object' && typeof text === 'object') {
-                            for (var objKey in obj) {
-                                if (objKey.charAt(0) !== '$' && hasOwnProperty.call(obj, objKey) &&
-                                    comparator(obj[objKey], text[objKey])) {
-                                    return true;
-                                }
-                            }
-                            return false;
-                        }
-                        text = (''+text).toLowerCase();
-                        return (''+obj).toLowerCase().indexOf(text) > -1;
-                    };
-                }
-            }
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
 
-            var search = function(obj, text){
-                if (typeof text == 'string' && text.charAt(0) === '!') {
-                    return !search(obj, text.substr(1));
-                }
-                switch (typeof obj) {
-                    case "boolean":
-                    case "number":
-                    case "string":
-                        return comparator(obj, text);
-                    case "object":
-                        switch (typeof text) {
-                            case "object":
-                                return comparator(obj, text);
-                            default:
-                                for ( var objKey in obj) {
-                                    if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
-                                        return true;
-                                    }
-                                }
-                                break;
-                        }
-                        return false;
-                    case "array":
-                        for ( var i = 0; i < obj.length; i++) {
-                            if (search(obj[i], text)) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    default:
-                        return false;
-                }
-            };
-            switch (typeof expression) {
-                case "boolean":
-                case "number":
-                case "string":
-                    // Set up expression object and fall through
-                    expression = {$:expression};
-                // jshint -W086
-                case "object":
-                    // jshint +W086
-                    for (var key in expression) {
-                        (function(path) {
-                            if (typeof expression[path] == 'undefined') return;
-                            predicates.push(function(value) {
-                                return search(path == '$' ? value : (value && value[path]), expression[path]);
-                            });
-                        })(key);
-                    }
-                    break;
-                case 'function':
-                    predicates.push(expression);
-                    break;
-                default:
-                    return array;
-            }
-            var filtered = [];
-            for ( var j = 0; j < array.length; j++) {
-                var value = array[j];
-                if (predicates.check(value)) {
-                    filtered.push(value);
-                }
-            }
-            return filtered;
-        };
-    }
+         it('should be invalid if over max', function() {
+        setInput('23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'time': createDateInputType('time', TIME_REGEXP,
+            createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
+            'HH:mm:ss.sss'),
+
+        /**
+         * @ngdoc input
+         * @name input[week]
+         *
+         * @description
+         * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
+         * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * week format (yyyy-W##), for example: `2013-W02`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+         *   attribute (e.g. `min="{{minWeek | date:'yyyy-Www'}}"`). Note that `min` will also add
+         *   native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+         *   attribute (e.g. `max="{{maxWeek | date:'yyyy-Www'}}"`). Note that `max` will also add
+         *   native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="week-input-directive" module="weekExample">
+         <file name="index.html">
+         <script>
+         angular.module('weekExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 0, 3)
+          };
+        }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label>Pick a date between in 2013:
+         <input id="exampleInput" type="week" name="input" ng-model="example.value"
+         placeholder="YYYY-W##" min="2012-W32"
+         max="2013-W52" required />
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.week">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-Www"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-    /**
-     * @ngdoc filter
-     * @name currency
-     * @function
-     *
-     * @description
-     * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
-     * symbol for current locale is used.
-     *
-     * @param {number} amount Input to filter.
-     * @param {string=} symbol Currency symbol or identifier to be displayed.
-     * @returns {string} Formatted number.
-     *
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.amount = 1234.56;
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <input type="number" ng-model="amount"> <br>
-     default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
-     custom currency identifier (USD$): <span>{{amount | currency:"USD$"}}</span>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should init with 1234.56', function() {
-         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
-         expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('USD$1,234.56');
-       });
-     it('should update', function() {
-         if (browser.params.browser == 'safari') {
-           // Safari does not understand the minus key. See
-           // https://github.com/angular/protractor/issues/481
-           return;
-         }
-         element(by.model('amount')).clear();
-         element(by.model('amount')).sendKeys('-1234');
-         expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)');
-         expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('(USD$1,234.00)');
-       });
-     </file>
-     </example>
-     */
-    currencyFilter.$inject = ['$locale'];
-    function currencyFilter($locale) {
-        var formats = $locale.NUMBER_FORMATS;
-        return function(amount, currencySymbol){
-            if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM;
-            return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2).
-                replace(/\u00A4/g, currencySymbol);
-        };
-    }
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-    /**
-     * @ngdoc filter
-     * @name number
-     * @function
-     *
-     * @description
-     * Formats a number as text.
-     *
-     * If the input is not a number an empty string is returned.
-     *
-     * @param {number|string} number Number to format.
-     * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
-     * If this is not provided then the fraction size is computed from the current locale's number
-     * formatting pattern. In the case of the default locale, it will be 3.
-     * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.val = 1234.56789;
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     Enter number: <input ng-model='val'><br>
-     Default formatting: <span id='number-default'>{{val | number}}</span><br>
-     No fractions: <span>{{val | number:0}}</span><br>
-     Negative number: <span>{{-val | number:4}}</span>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should format numbers', function() {
-         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
-         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
-         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
-       });
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-W01');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-     it('should update', function() {
-         element(by.model('val')).clear();
-         element(by.model('val')).sendKeys('3374.333');
-         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
-         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
-         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
-     </file>
-     </example>
-     */
 
+         it('should be invalid if over max', function() {
+        setInput('2015-W01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
 
-    numberFilter.$inject = ['$locale'];
-    function numberFilter($locale) {
-        var formats = $locale.NUMBER_FORMATS;
-        return function(number, fractionSize) {
-            return formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
-                fractionSize);
-        };
-    }
+        /**
+         * @ngdoc input
+         * @name input[month]
+         *
+         * @description
+         * Input with month validation and transformation. In browsers that do not yet support
+         * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * month format (yyyy-MM), for example: `2009-01`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         * If the model is not set to the first of the month, the next view to model update will set it
+         * to the first of the month.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+         *   attribute (e.g. `min="{{minMonth | date:'yyyy-MM'}}"`). Note that `min` will also add
+         *   native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+         *   attribute (e.g. `max="{{maxMonth | date:'yyyy-MM'}}"`). Note that `max` will also add
+         *   native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
 
-    var DECIMAL_SEP = '.';
-    function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
-        if (number == null || !isFinite(number) || isObject(number)) return '';
-
-        var isNegative = number < 0;
-        number = Math.abs(number);
-        var numStr = number + '',
-            formatedText = '',
-            parts = [];
-
-        var hasExponent = false;
-        if (numStr.indexOf('e') !== -1) {
-            var match = numStr.match(/([\d\.]+)e(-?)(\d+)/);
-            if (match && match[2] == '-' && match[3] > fractionSize + 1) {
-                numStr = '0';
-            } else {
-                formatedText = numStr;
-                hasExponent = true;
-            }
-        }
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="month-input-directive" module="monthExample">
+         <file name="index.html">
+         <script>
+         angular.module('monthExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 9, 1)
+          };
+        }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a month in 2013:</label>
+         <input id="exampleInput" type="month" name="input" ng-model="example.value"
+         placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.month">
+         Not a valid month!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-MM"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-        if (!hasExponent) {
-            var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length;
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-            // determine fractionSize if it is not specified
-            if (isUndefined(fractionSize)) {
-                fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac);
-            }
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-10');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-            var pow = Math.pow(10, fractionSize);
-            number = Math.round(number * pow) / pow;
-            var fraction = ('' + number).split(DECIMAL_SEP);
-            var whole = fraction[0];
-            fraction = fraction[1] || '';
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
 
-            var i, pos = 0,
-                lgroup = pattern.lgSize,
-                group = pattern.gSize;
+         it('should be invalid if over max', function() {
+        setInput('2015-01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'month': createDateInputType('month', MONTH_REGEXP,
+            createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
+            'yyyy-MM'),
 
-            if (whole.length >= (lgroup + group)) {
-                pos = whole.length - lgroup;
-                for (i = 0; i < pos; i++) {
-                    if ((pos - i)%group === 0 && i !== 0) {
-                        formatedText += groupSep;
-                    }
-                    formatedText += whole.charAt(i);
-                }
-            }
+        /**
+         * @ngdoc input
+         * @name input[number]
+         *
+         * @description
+         * Text input with number validation and transformation. Sets the `number` validation
+         * error if not a valid number.
+         *
+         * <div class="alert alert-warning">
+         * The model must always be of type `number` otherwise AngularJS will throw an error.
+         * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+         * error docs for more information and an example of how to convert your model if necessary.
+         * </div>
+         *
+         * ## Issues with HTML5 constraint validation
+         *
+         * In browsers that follow the
+         * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
+         * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
+         * If a non-number is entered in the input, the browser will report the value as an empty string,
+         * which means the view / model values in `ngModel` and subsequently the scope value
+         * will also be an empty string.
+         *
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *    Can be interpolated.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *    Can be interpolated.
+         * @param {string=} ngMin Like `min`, sets the `min` validation error key if the value entered is less than `ngMin`,
+         *    but does not trigger HTML5 native validation. Takes an expression.
+         * @param {string=} ngMax Like `max`, sets the `max` validation error key if the value entered is greater than `ngMax`,
+         *    but does not trigger HTML5 native validation. Takes an expression.
+         * @param {string=} step Sets the `step` validation error key if the value entered does not fit the `step` constraint.
+         *    Can be interpolated.
+         * @param {string=} ngStep Like `step`, sets the `step` validation error key if the value entered does not fit the `ngStep` constraint,
+         *    but does not trigger HTML5 native validation. Takes an expression.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="number-input-directive" module="numberExample">
+         <file name="index.html">
+         <script>
+         angular.module('numberExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 value: 12
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Number:
+         <input type="number" name="input" ng-model="example.value"
+         min="0" max="99" required>
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.number">
+         Not valid number!</span>
+         </div>
+         <tt>value = {{example.value}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
 
-            for (i = pos; i < whole.length; i++) {
-                if ((whole.length - i)%lgroup === 0 && i !== 0) {
-                    formatedText += groupSep;
-                }
-                formatedText += whole.charAt(i);
-            }
+         it('should initialize to model', function() {
+            expect(value.getText()).toContain('12');
+            expect(valid.getText()).toContain('true');
+          });
 
-            // format fraction part.
-            while(fraction.length < fractionSize) {
-                fraction += '0';
-            }
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
 
-            if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize);
-        } else {
+         it('should be invalid if over max', function() {
+            input.clear();
+            input.sendKeys('123');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
+         */
+        'number': numberInputType,
 
-            if (fractionSize > 0 && number > -1 && number < 1) {
-                formatedText = number.toFixed(fractionSize);
-            }
-        }
 
-        parts.push(isNegative ? pattern.negPre : pattern.posPre);
-        parts.push(formatedText);
-        parts.push(isNegative ? pattern.negSuf : pattern.posSuf);
-        return parts.join('');
-    }
+        /**
+         * @ngdoc input
+         * @name input[url]
+         *
+         * @description
+         * Text input with URL validation. Sets the `url` validation error key if the content is not a
+         * valid URL.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
+         * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
+         * the built-in validators (see the {@link guide/forms Forms guide})
+         * </div>
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="url-input-directive" module="urlExample">
+         <file name="index.html">
+         <script>
+         angular.module('urlExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.url = {
+                 text: 'http://google.com'
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>URL:
+         <input type="url" name="input" ng-model="url.text" required>
+         <label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.url">
+         Not valid url!</span>
+         </div>
+         <tt>text = {{url.text}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var text = element(by.binding('url.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('url.text'));
+
+         it('should initialize to model', function() {
+            expect(text.getText()).toContain('http://google.com');
+            expect(valid.getText()).toContain('true');
+          });
 
-    function padNumber(num, digits, trim) {
-        var neg = '';
-        if (num < 0) {
-            neg =  '-';
-            num = -num;
-        }
-        num = '' + num;
-        while(num.length < digits) num = '0' + num;
-        if (trim)
-            num = num.substr(num.length - digits);
-        return neg + num;
-    }
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
 
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
 
-    function dateGetter(name, size, offset, trim) {
-        offset = offset || 0;
-        return function(date) {
-            var value = date['get' + name]();
-            if (offset > 0 || value > -offset)
-                value += offset;
-            if (value === 0 && offset == -12 ) value = 12;
-            return padNumber(value, size, trim);
-        };
-    }
+         it('should be invalid if not url', function() {
+            input.clear();
+            input.sendKeys('box');
 
-    function dateStrGetter(name, shortForm) {
-        return function(date, formats) {
-            var value = date['get' + name]();
-            var get = uppercase(shortForm ? ('SHORT' + name) : name);
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
+         */
+        'url': urlInputType,
 
-            return formats[get][value];
-        };
-    }
 
-    function timeZoneGetter(date) {
-        var zone = -1 * date.getTimezoneOffset();
-        var paddedZone = (zone >= 0) ? "+" : "";
+        /**
+         * @ngdoc input
+         * @name input[email]
+         *
+         * @description
+         * Text input with email validation. Sets the `email` validation error key if not a valid email
+         * address.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
+         * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
+         * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
+         * </div>
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="email-input-directive" module="emailExample">
+         <file name="index.html">
+         <script>
+         angular.module('emailExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.email = {
+                 text: 'me@example.com'
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Email:
+         <input type="email" name="input" ng-model="email.text" required>
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.email">
+         Not valid email!</span>
+         </div>
+         <tt>text = {{email.text}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var text = element(by.binding('email.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('email.text'));
 
-        paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
-        padNumber(Math.abs(zone % 60), 2);
+         it('should initialize to model', function() {
+            expect(text.getText()).toContain('me@example.com');
+            expect(valid.getText()).toContain('true');
+          });
 
-        return paddedZone;
-    }
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
 
-    function ampmGetter(date, formats) {
-        return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
-    }
+         it('should be invalid if not email', function() {
+            input.clear();
+            input.sendKeys('xxx');
 
-    var DATE_FORMATS = {
-        yyyy: dateGetter('FullYear', 4),
-        yy: dateGetter('FullYear', 2, 0, true),
-        y: dateGetter('FullYear', 1),
-        MMMM: dateStrGetter('Month'),
-        MMM: dateStrGetter('Month', true),
-        MM: dateGetter('Month', 2, 1),
-        M: dateGetter('Month', 1, 1),
-        dd: dateGetter('Date', 2),
-        d: dateGetter('Date', 1),
-        HH: dateGetter('Hours', 2),
-        H: dateGetter('Hours', 1),
-        hh: dateGetter('Hours', 2, -12),
-        h: dateGetter('Hours', 1, -12),
-        mm: dateGetter('Minutes', 2),
-        m: dateGetter('Minutes', 1),
-        ss: dateGetter('Seconds', 2),
-        s: dateGetter('Seconds', 1),
-        // while ISO 8601 requires fractions to be prefixed with `.` or `,`
-        // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
-        sss: dateGetter('Milliseconds', 3),
-        EEEE: dateStrGetter('Day'),
-        EEE: dateStrGetter('Day', true),
-        a: ampmGetter,
-        Z: timeZoneGetter
-    };
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
+         */
+        'email': emailInputType,
 
-    var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,
-        NUMBER_STRING = /^\-?\d+$/;
 
-    /**
-     * @ngdoc filter
-     * @name date
-     * @function
-     *
-     * @description
-     *   Formats `date` to a string based on the requested `format`.
-     *
-     *   `format` string can be composed of the following elements:
-     *
-     *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
-     *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
-     *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
-     *   * `'MMMM'`: Month in year (January-December)
-     *   * `'MMM'`: Month in year (Jan-Dec)
-     *   * `'MM'`: Month in year, padded (01-12)
-     *   * `'M'`: Month in year (1-12)
-     *   * `'dd'`: Day in month, padded (01-31)
-     *   * `'d'`: Day in month (1-31)
-     *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
-     *   * `'EEE'`: Day in Week, (Sun-Sat)
-     *   * `'HH'`: Hour in day, padded (00-23)
-     *   * `'H'`: Hour in day (0-23)
-     *   * `'hh'`: Hour in am/pm, padded (01-12)
-     *   * `'h'`: Hour in am/pm, (1-12)
-     *   * `'mm'`: Minute in hour, padded (00-59)
-     *   * `'m'`: Minute in hour (0-59)
-     *   * `'ss'`: Second in minute, padded (00-59)
-     *   * `'s'`: Second in minute (0-59)
-     *   * `'.sss' or ',sss'`: Millisecond in second, padded (000-999)
-     *   * `'a'`: am/pm marker
-     *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
-     *
-     *   `format` string can also be one of the following predefined
-     *   {@link guide/i18n localizable formats}:
-     *
-     *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
-     *     (e.g. Sep 3, 2010 12:05:08 pm)
-     *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 pm)
-     *   * `'fullDate'`: equivalent to `'EEEE, MMMM d,y'` for en_US  locale
-     *     (e.g. Friday, September 3, 2010)
-     *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
-     *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
-     *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
-     *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm)
-     *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm)
-     *
-     *   `format` string can contain literal values. These need to be quoted with single quotes (e.g.
-     *   `"h 'in the morning'"`). In order to output single quote, use two single quotes in a sequence
-     *   (e.g. `"h 'o''clock'"`).
-     *
-     * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
-     *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.SSSZ and its
-     *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
-     *    specified in the string input, the time is considered to be in the local timezone.
-     * @param {string=} format Formatting rules (see Description). If not specified,
-     *    `mediumDate` is used.
-     * @returns {string} Formatted string or the input if input is not recognized as date/millis.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
-     <span>{{1288323623006 | date:'medium'}}</span><br>
-     <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
-     <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
-     <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
-     <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should format date', function() {
-         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
-            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
-         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
-            toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
-         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
-     toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
-     });
-     </file>
-     </example>
-     */
-    dateFilter.$inject = ['$locale'];
-    function dateFilter($locale) {
+        /**
+         * @ngdoc input
+         * @name input[radio]
+         *
+         * @description
+         * HTML radio button.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string} value The value to which the `ngModel` expression should be set when selected.
+         *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
+         *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         * @param {string} ngValue AngularJS expression to which `ngModel` will be be set when the radio
+         *    is selected. Should be used instead of the `value` attribute if you need
+         *    a non-string `ngModel` (`boolean`, `array`, ...).
+         *
+         * @example
+         <example name="radio-input-directive" module="radioExample">
+         <file name="index.html">
+         <script>
+         angular.module('radioExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.color = {
+                 name: 'blue'
+               };
+               $scope.specialValue = {
+                 "id": "12345",
+                 "value": "green"
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>
+         <input type="radio" ng-model="color.name" value="red">
+         Red
+         </label><br/>
+         <label>
+         <input type="radio" ng-model="color.name" ng-value="specialValue">
+         Green
+         </label><br/>
+         <label>
+         <input type="radio" ng-model="color.name" value="blue">
+         Blue
+         </label><br/>
+         <tt>color = {{color.name | json}}</tt><br/>
+         </form>
+         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
+         </file>
+         <file name="protractor.js" type="protractor">
+         it('should change state', function() {
+            var inputs = element.all(by.model('color.name'));
+            var color = element(by.binding('color.name'));
 
+            expect(color.getText()).toContain('blue');
 
-        var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
-        // 1        2       3         4          5          6          7          8  9     10      11
-        function jsonStringToDate(string) {
-            var match;
-            if (match = string.match(R_ISO8601_STR)) {
-                var date = new Date(0),
-                    tzHour = 0,
-                    tzMin  = 0,
-                    dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
-                    timeSetter = match[8] ? date.setUTCHours : date.setHours;
+            inputs.get(0).click();
+            expect(color.getText()).toContain('red');
 
-                if (match[9]) {
-                    tzHour = int(match[9] + match[10]);
-                    tzMin = int(match[9] + match[11]);
-                }
-                dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3]));
-                var h = int(match[4]||0) - tzHour;
-                var m = int(match[5]||0) - tzMin;
-                var s = int(match[6]||0);
-                var ms = Math.round(parseFloat('0.' + (match[7]||0)) * 1000);
-                timeSetter.call(date, h, m, s, ms);
-                return date;
-            }
-            return string;
-        }
+            inputs.get(1).click();
+            expect(color.getText()).toContain('green');
+          });
+         </file>
+         </example>
+         */
+        'radio': radioInputType,
 
+        /**
+         * @ngdoc input
+         * @name input[range]
+         *
+         * @description
+         * Native range input with validation and transformation.
+         *
+         * The model for the range input must always be a `Number`.
+         *
+         * IE9 and other browsers that do not support the `range` type fall back
+         * to a text input without any default values for `min`, `max` and `step`. Model binding,
+         * validation and number parsing are nevertheless supported.
+         *
+         * Browsers that support range (latest Chrome, Safari, Firefox, Edge) treat `input[range]`
+         * in a way that never allows the input to hold an invalid value. That means:
+         * - any non-numerical value is set to `(max + min) / 2`.
+         * - any numerical value that is less than the current min val, or greater than the current max val
+         * is set to the min / max val respectively.
+         * - additionally, the current `step` is respected, so the nearest value that satisfies a step
+         * is used.
+         *
+         * See the [HTML Spec on input[type=range]](https://www.w3.org/TR/html5/forms.html#range-state-(type=range))
+         * for more info.
+         *
+         * This has the following consequences for AngularJS:
+         *
+         * Since the element value should always reflect the current model value, a range input
+         * will set the bound ngModel expression to the value that the browser has set for the
+         * input element. For example, in the following input `<input type="range" ng-model="model.value">`,
+         * if the application sets `model.value = null`, the browser will set the input to `'50'`.
+         * AngularJS will then set the model to `50`, to prevent input and model value being out of sync.
+         *
+         * That means the model for range will immediately be set to `50` after `ngModel` has been
+         * initialized. It also means a range input can never have the required error.
+         *
+         * This does not only affect changes to the model value, but also to the values of the `min`,
+         * `max`, and `step` attributes. When these change in a way that will cause the browser to modify
+         * the input value, AngularJS will also update the model value.
+         *
+         * Automatic value adjustment also means that a range input element can never have the `required`,
+         * `min`, or `max` errors.
+         *
+         * However, `step` is currently only fully implemented by Firefox. Other browsers have problems
+         * when the step value changes dynamically - they do not adjust the element value correctly, but
+         * instead may set the `stepMismatch` error. If that's the case, the AngularJS will set the `step`
+         * error on the input, and set the model to `undefined`.
+         *
+         * Note that `input[range]` is not compatible with`ngMax`, `ngMin`, and `ngStep`, because they do
+         * not set the `min` and `max` attributes, which means that the browser won't automatically adjust
+         * the input value based on their values, and will always assume min = 0, max = 100, and step = 1.
+         *
+         * @param {string}  ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation to ensure that the value entered is greater
+         *                  than `min`. Can be interpolated.
+         * @param {string=} max Sets the `max` validation to ensure that the value entered is less than `max`.
+         *                  Can be interpolated.
+         * @param {string=} step Sets the `step` validation to ensure that the value entered matches the `step`
+         *                  Can be interpolated.
+         * @param {string=} ngChange AngularJS expression to be executed when the ngModel value changes due
+         *                  to user interaction with the input element.
+         * @param {expression=} ngChecked If the expression is truthy, then the `checked` attribute will be set on the
+         *                      element. **Note** : `ngChecked` should not be used alongside `ngModel`.
+         *                      Checkout {@link ng.directive:ngChecked ngChecked} for usage.
+         *
+         * @example
+         <example name="range-input-directive" module="rangeExample">
+         <file name="index.html">
+         <script>
+         angular.module('rangeExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+
+         Model as range: <input type="range" name="range" ng-model="value" min="{{min}}"  max="{{max}}">
+         <hr>
+         Model as number: <input type="number" ng-model="value"><br>
+         Min: <input type="number" ng-model="min"><br>
+         Max: <input type="number" ng-model="max"><br>
+         value = <code>{{value}}</code><br/>
+         myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+         myForm.range.$error = <code>{{myForm.range.$error}}</code>
+         </form>
+         </file>
+         </example>
 
-        return function(date, format) {
-            var text = '',
-                parts = [],
-                fn, match;
+         * ## Range Input with ngMin & ngMax attributes
 
-            format = format || 'mediumDate';
-            format = $locale.DATETIME_FORMATS[format] || format;
-            if (isString(date)) {
-                if (NUMBER_STRING.test(date)) {
-                    date = int(date);
-                } else {
-                    date = jsonStringToDate(date);
-                }
-            }
+         * @example
+         <example name="range-input-directive-ng" module="rangeExample">
+         <file name="index.html">
+         <script>
+         angular.module('rangeExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         Model as range: <input type="range" name="range" ng-model="value" ng-min="min" ng-max="max">
+         <hr>
+         Model as number: <input type="number" ng-model="value"><br>
+         Min: <input type="number" ng-model="min"><br>
+         Max: <input type="number" ng-model="max"><br>
+         value = <code>{{value}}</code><br/>
+         myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+         myForm.range.$error = <code>{{myForm.range.$error}}</code>
+         </form>
+         </file>
+         </example>
 
-            if (isNumber(date)) {
-                date = new Date(date);
-            }
+         */
+        'range': rangeInputType,
 
-            if (!isDate(date)) {
-                return date;
-            }
+        /**
+         * @ngdoc input
+         * @name input[checkbox]
+         *
+         * @description
+         * HTML checkbox.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
+         * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="checkbox-input-directive" module="checkboxExample">
+         <file name="index.html">
+         <script>
+         angular.module('checkboxExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.checkboxModel = {
+                value1 : true,
+                value2 : 'YES'
+              };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Value1:
+         <input type="checkbox" ng-model="checkboxModel.value1">
+         </label><br/>
+         <label>Value2:
+         <input type="checkbox" ng-model="checkboxModel.value2"
+         ng-true-value="'YES'" ng-false-value="'NO'">
+         </label><br/>
+         <tt>value1 = {{checkboxModel.value1}}</tt><br/>
+         <tt>value2 = {{checkboxModel.value2}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         it('should change state', function() {
+            var value1 = element(by.binding('checkboxModel.value1'));
+            var value2 = element(by.binding('checkboxModel.value2'));
 
-            while(format) {
-                match = DATE_FORMATS_SPLIT.exec(format);
-                if (match) {
-                    parts = concat(parts, match, 1);
-                    format = parts.pop();
-                } else {
-                    parts.push(format);
-                    format = null;
-                }
-            }
+            expect(value1.getText()).toContain('true');
+            expect(value2.getText()).toContain('YES');
 
-            forEach(parts, function(value){
-                fn = DATE_FORMATS[value];
-                text += fn ? fn(date, $locale.DATETIME_FORMATS)
-                    : value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
-            });
+            element(by.model('checkboxModel.value1')).click();
+            element(by.model('checkboxModel.value2')).click();
 
-            return text;
-        };
-    }
+            expect(value1.getText()).toContain('false');
+            expect(value2.getText()).toContain('NO');
+          });
+         </file>
+         </example>
+         */
+        'checkbox': checkboxInputType,
 
+        'hidden': noop,
+        'button': noop,
+        'submit': noop,
+        'reset': noop,
+        'file': noop
+    };
 
-    /**
-     * @ngdoc filter
-     * @name json
-     * @function
-     *
-     * @description
-     *   Allows you to convert a JavaScript object into JSON string.
-     *
-     *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
-     *   the binding is automatically converted to JSON.
-     *
-     * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
-     * @returns {string} JSON string.
-     *
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <pre>{{ {'name':'value'} | json }}</pre>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should jsonify filtered objects', function() {
-         expect(element(by.binding("{'name':'value'}")).getText()).toMatch(/\{\n  "name": ?"value"\n}/);
-       });
-     </file>
-     </example>
-     *
-     */
-    function jsonFilter() {
-        return function(object) {
-            return toJson(object, true);
-        };
+    function stringBasedInputType(ctrl) {
+        ctrl.$formatters.push(function(value) {
+            return ctrl.$isEmpty(value) ? value : value.toString();
+        });
     }
 
+    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+    }
 
-    /**
-     * @ngdoc filter
-     * @name lowercase
-     * @function
-     * @description
-     * Converts string to lowercase.
-     * @see angular.lowercase
-     */
-    var lowercaseFilter = valueFn(lowercase);
-
-
-    /**
-     * @ngdoc filter
-     * @name uppercase
-     * @function
-     * @description
-     * Converts string to uppercase.
-     * @see angular.uppercase
-     */
-    var uppercaseFilter = valueFn(uppercase);
-
-    /**
-     * @ngdoc filter
-     * @name limitTo
-     * @function
-     *
-     * @description
-     * Creates a new array or string containing only a specified number of elements. The elements
-     * are taken from either the beginning or the end of the source array or string, as specified by
-     * the value and sign (positive or negative) of `limit`.
-     *
-     * @param {Array|string} input Source array or string to be limited.
-     * @param {string|number} limit The length of the returned array or string. If the `limit` number
-     *     is positive, `limit` number of items from the beginning of the source array/string are copied.
-     *     If the number is negative, `limit` number  of items from the end of the source array/string
-     *     are copied. The `limit` will be trimmed if it exceeds `array.length`
-     * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
-     *     had less than `limit` elements.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.numbers = [1,2,3,4,5,6,7,8,9];
-           $scope.letters = "abcdefghi";
-           $scope.numLimit = 3;
-           $scope.letterLimit = 3;
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     Limit {{numbers}} to: <input type="integer" ng-model="numLimit">
-     <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
-     Limit {{letters}} to: <input type="integer" ng-model="letterLimit">
-     <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var numLimitInput = element(by.model('numLimit'));
-     var letterLimitInput = element(by.model('letterLimit'));
-     var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
-     var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+    function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        var type = lowercase(element[0].type);
 
-     it('should limit the number array to first three items', function() {
-         expect(numLimitInput.getAttribute('value')).toBe('3');
-         expect(letterLimitInput.getAttribute('value')).toBe('3');
-         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
-         expect(limitedLetters.getText()).toEqual('Output letters: abc');
-       });
+        // In composition mode, users are still inputting intermediate text buffer,
+        // hold the listener until composition is done.
+        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
+        if (!$sniffer.android) {
+            var composing = false;
 
-     it('should update the output when -3 is entered', function() {
-         numLimitInput.clear();
-         numLimitInput.sendKeys('-3');
-         letterLimitInput.clear();
-         letterLimitInput.sendKeys('-3');
-         expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
-         expect(limitedLetters.getText()).toEqual('Output letters: ghi');
-       });
+            element.on('compositionstart', function() {
+                composing = true;
+            });
 
-     it('should not exceed the maximum size of input array', function() {
-         numLimitInput.clear();
-         numLimitInput.sendKeys('100');
-         letterLimitInput.clear();
-         letterLimitInput.sendKeys('100');
-         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
-         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
-       });
-     </file>
-     </example>
-     */
-    function limitToFilter(){
-        return function(input, limit) {
-            if (!isArray(input) && !isString(input)) return input;
+            element.on('compositionend', function() {
+                composing = false;
+                listener();
+            });
+        }
 
-            limit = int(limit);
+        var timeout;
 
-            if (isString(input)) {
-                //NaN check on limit
-                if (limit) {
-                    return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length);
-                } else {
-                    return "";
-                }
+        var listener = function(ev) {
+            if (timeout) {
+                $browser.defer.cancel(timeout);
+                timeout = null;
             }
+            if (composing) return;
+            var value = element.val(),
+                event = ev && ev.type;
 
-            var out = [],
-                i, n;
-
-            // if abs(limit) exceeds maximum length, trim it
-            if (limit > input.length)
-                limit = input.length;
-            else if (limit < -input.length)
-                limit = -input.length;
-
-            if (limit > 0) {
-                i = 0;
-                n = limit;
-            } else {
-                i = input.length + limit;
-                n = input.length;
+            // By default we will trim the value
+            // If the attribute ng-trim exists we will avoid trimming
+            // If input type is 'password', the value is never trimmed
+            if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
+                value = trim(value);
             }
 
-            for (; i<n; i++) {
-                out.push(input[i]);
+            // If a control is suffering from bad input (due to native validators), browsers discard its
+            // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
+            // control's value is the same empty value twice in a row.
+            if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
+                ctrl.$setViewValue(value, event);
             }
-
-            return out;
         };
-    }
 
-    /**
-     * @ngdoc filter
-     * @name orderBy
-     * @function
-     *
-     * @description
-     * Orders a specified `array` by the `expression` predicate.
-     *
-     * @param {Array} array The array to sort.
-     * @param {function(*)|string|Array.<(function(*)|string)>} expression A predicate to be
-     *    used by the comparator to determine the order of elements.
-     *
-     *    Can be one of:
-     *
-     *    - `function`: Getter function. The result of this function will be sorted using the
-     *      `<`, `=`, `>` operator.
-     *    - `string`: An Angular expression which evaluates to an object to order by, such as 'name'
-     *      to sort by a property called 'name'. Optionally prefixed with `+` or `-` to control
-     *      ascending or descending sort order (for example, +name or -name).
-     *    - `Array`: An array of function or string predicates. The first predicate in the array
-     *      is used for sorting, but when two items are equivalent, the next predicate is used.
-     *
-     * @param {boolean=} reverse Reverse the order of the array.
-     * @returns {Array} Sorted copy of the source array.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.friends =
-               [{name:'John', phone:'555-1212', age:10},
-                {name:'Mary', phone:'555-9876', age:19},
-                {name:'Mike', phone:'555-4321', age:21},
-                {name:'Adam', phone:'555-5678', age:35},
-                {name:'Julie', phone:'555-8765', age:29}]
-           $scope.predicate = '-age';
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
-     <hr/>
-     [ <a href="" ng-click="predicate=''">unsorted</a> ]
-     <table class="friend">
-     <tr>
-     <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
-     (<a href="" ng-click="predicate = '-name'; reverse=false">^</a>)</th>
-     <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
-     <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
-     </tr>
-     <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
-     <td>{{friend.name}}</td>
-     <td>{{friend.phone}}</td>
-     <td>{{friend.age}}</td>
-     </tr>
-     </table>
-     </div>
-     </file>
-     </example>
-     */
-    orderByFilter.$inject = ['$parse'];
-    function orderByFilter($parse){
-        return function(array, sortPredicate, reverseOrder) {
-            if (!isArray(array)) return array;
-            if (!sortPredicate) return array;
-            sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
-            sortPredicate = map(sortPredicate, function(predicate){
-                var descending = false, get = predicate || identity;
-                if (isString(predicate)) {
-                    if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
-                        descending = predicate.charAt(0) == '-';
-                        predicate = predicate.substring(1);
-                    }
-                    get = $parse(predicate);
-                    if (get.constant) {
-                        var key = get();
-                        return reverseComparator(function(a,b) {
-                            return compare(a[key], b[key]);
-                        }, descending);
-                    }
-                }
-                return reverseComparator(function(a,b){
-                    return compare(get(a),get(b));
-                }, descending);
-            });
-            var arrayCopy = [];
-            for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
-            return arrayCopy.sort(reverseComparator(comparator, reverseOrder));
-
-            function comparator(o1, o2){
-                for ( var i = 0; i < sortPredicate.length; i++) {
-                    var comp = sortPredicate[i](o1, o2);
-                    if (comp !== 0) return comp;
-                }
-                return 0;
-            }
-            function reverseComparator(comp, descending) {
-                return toBoolean(descending)
-                    ? function(a,b){return comp(b,a);}
-                    : comp;
-            }
-            function compare(v1, v2){
-                var t1 = typeof v1;
-                var t2 = typeof v2;
-                if (t1 == t2) {
-                    if (t1 == "string") {
-                        v1 = v1.toLowerCase();
-                        v2 = v2.toLowerCase();
-                    }
-                    if (v1 === v2) return 0;
-                    return v1 < v2 ? -1 : 1;
-                } else {
-                    return t1 < t2 ? -1 : 1;
+        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
+        // input event on backspace, delete or cut
+        if ($sniffer.hasEvent('input')) {
+            element.on('input', listener);
+        } else {
+            var deferListener = function(ev, input, origValue) {
+                if (!timeout) {
+                    timeout = $browser.defer(function() {
+                        timeout = null;
+                        if (!input || input.value !== origValue) {
+                            listener(ev);
+                        }
+                    });
                 }
-            }
-        };
-    }
-
-    function ngDirective(directive) {
-        if (isFunction(directive)) {
-            directive = {
-                link: directive
             };
-        }
-        directive.restrict = directive.restrict || 'AC';
-        return valueFn(directive);
-    }
 
-    /**
-     * @ngdoc directive
-     * @name a
-     * @restrict E
-     *
-     * @description
-     * Modifies the default behavior of the html A tag so that the default action is prevented when
-     * the href attribute is empty.
-     *
-     * This change permits the easy creation of action links with the `ngClick` directive
-     * without changing the location or causing page reloads, e.g.:
-     * `<a href="" ng-click="list.addItem()">Add Item</a>`
-     */
-    var htmlAnchorDirective = valueFn({
-        restrict: 'E',
-        compile: function(element, attr) {
+            element.on('keydown', /** @this */ function(event) {
+                var key = event.keyCode;
 
-            if (msie <= 8) {
+                // ignore
+                //    command            modifiers                   arrows
+                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
 
-                // turn <a href ng-click="..">link</a> into a stylable link in IE
-                // but only if it doesn't have name attribute, in which case it's an anchor
-                if (!attr.href && !attr.name) {
-                    attr.$set('href', '');
-                }
+                deferListener(event, this, this.value);
+            });
 
-                // add a comment node to anchors to workaround IE bug that causes element content to be reset
-                // to new attribute content if attribute is updated with value containing @ and element also
-                // contains value with @
-                // see issue #1949
-                element.append(document.createComment('IE fix'));
+            // if user modifies input value using context menu in IE, we need "paste", "cut" and "drop" events to catch it
+            if ($sniffer.hasEvent('paste')) {
+                element.on('paste cut drop', deferListener);
             }
+        }
 
-            if (!attr.href && !attr.xlinkHref && !attr.name) {
-                return function(scope, element) {
-                    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
-                    var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
-                        'xlink:href' : 'href';
-                    element.on('click', function(event){
-                        // if we have no href url, then don't navigate anywhere.
-                        if (!element.attr(href)) {
-                            event.preventDefault();
+        // if user paste into input using mouse on older browser
+        // or form autocomplete on newer browser, we need "change" event to catch it
+        element.on('change', listener);
+
+        // Some native input types (date-family) have the ability to change validity without
+        // firing any input/change events.
+        // For these event types, when native validators are present and the browser supports the type,
+        // check for validity changes on various DOM events.
+        if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) {
+            element.on(PARTIAL_VALIDATION_EVENTS, /** @this */ function(ev) {
+                if (!timeout) {
+                    var validity = this[VALIDITY_STATE_PROPERTY];
+                    var origBadInput = validity.badInput;
+                    var origTypeMismatch = validity.typeMismatch;
+                    timeout = $browser.defer(function() {
+                        timeout = null;
+                        if (validity.badInput !== origBadInput || validity.typeMismatch !== origTypeMismatch) {
+                            listener(ev);
                         }
                     });
-                };
-            }
+                }
+            });
         }
-    });
 
-    /**
-     * @ngdoc directive
-     * @name ngHref
-     * @restrict A
-     * @priority 99
-     *
-     * @description
-     * Using Angular markup like `{{hash}}` in an href attribute will
-     * make the link go to the wrong URL if the user clicks it before
-     * Angular has a chance to replace the `{{hash}}` markup with its
-     * value. Until Angular replaces the markup the link will be broken
-     * and will most likely return a 404 error.
-     *
-     * The `ngHref` directive solves this problem.
-     *
-     * The wrong way to write it:
-     * ```html
-     * <a href="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * The correct way to write it:
-     * ```html
-     * <a ng-href="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * @element A
-     * @param {template} ngHref any string which can contain `{{}}` markup.
-     *
-     * @example
-     * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
-     * in links and their different behaviors:
-     <example>
-     <file name="index.html">
-     <input ng-model="value" /><br />
-     <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
-     <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
-     <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
-     <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
-     <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
-     <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should execute ng-click but not reload when href without value', function() {
-          element(by.id('link-1')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
-          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
-        });
+        ctrl.$render = function() {
+            // Workaround for Firefox validation #12102.
+            var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
+            if (element.val() !== value) {
+                element.val(value);
+            }
+        };
+    }
 
-     it('should execute ng-click but not reload when href empty string', function() {
-          element(by.id('link-2')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
-          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
-        });
+    function weekParser(isoWeek, existingDate) {
+        if (isDate(isoWeek)) {
+            return isoWeek;
+        }
 
-     it('should execute ng-click and change url when ng-href specified', function() {
-          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
+        if (isString(isoWeek)) {
+            WEEK_REGEXP.lastIndex = 0;
+            var parts = WEEK_REGEXP.exec(isoWeek);
+            if (parts) {
+                var year = +parts[1],
+                    week = +parts[2],
+                    hours = 0,
+                    minutes = 0,
+                    seconds = 0,
+                    milliseconds = 0,
+                    firstThurs = getFirstThursdayOfYear(year),
+                    addDays = (week - 1) * 7;
+
+                if (existingDate) {
+                    hours = existingDate.getHours();
+                    minutes = existingDate.getMinutes();
+                    seconds = existingDate.getSeconds();
+                    milliseconds = existingDate.getMilliseconds();
+                }
 
-          element(by.id('link-3')).click();
+                return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+            }
+        }
 
-          // At this point, we navigate away from an Angular page, so we need
-          // to use browser.driver to get the base webdriver.
+        return NaN;
+    }
 
-          browser.wait(function() {
-            return browser.driver.getCurrentUrl().then(function(url) {
-              return url.match(/\/123$/);
-            });
-          }, 1000, 'page should navigate to /123');
-        });
+    function createDateParser(regexp, mapping) {
+        return function(iso, date) {
+            var parts, map;
 
-     xit('should execute ng-click but not reload when href empty string and name specified', function() {
-          element(by.id('link-4')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
-          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
-        });
+            if (isDate(iso)) {
+                return iso;
+            }
 
-     it('should execute ng-click but not reload when no href but name specified', function() {
-          element(by.id('link-5')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
-          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
-        });
+            if (isString(iso)) {
+                // When a date is JSON'ified to wraps itself inside of an extra
+                // set of double quotes. This makes the date parsing code unable
+                // to match the date string and parse it as a date.
+                if (iso.charAt(0) === '"' && iso.charAt(iso.length - 1) === '"') {
+                    iso = iso.substring(1, iso.length - 1);
+                }
+                if (ISO_DATE_REGEXP.test(iso)) {
+                    return new Date(iso);
+                }
+                regexp.lastIndex = 0;
+                parts = regexp.exec(iso);
+
+                if (parts) {
+                    parts.shift();
+                    if (date) {
+                        map = {
+                            yyyy: date.getFullYear(),
+                            MM: date.getMonth() + 1,
+                            dd: date.getDate(),
+                            HH: date.getHours(),
+                            mm: date.getMinutes(),
+                            ss: date.getSeconds(),
+                            sss: date.getMilliseconds() / 1000
+                        };
+                    } else {
+                        map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
+                    }
 
-     it('should only change url when only ng-href', function() {
-          element(by.model('value')).clear();
-          element(by.model('value')).sendKeys('6');
-          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
+                    forEach(parts, function(part, index) {
+                        if (index < mapping.length) {
+                            map[mapping[index]] = +part;
+                        }
+                    });
+                    return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
+                }
+            }
 
-          element(by.id('link-6')).click();
+            return NaN;
+        };
+    }
 
-          // At this point, we navigate away from an Angular page, so we need
-          // to use browser.driver to get the base webdriver.
-          browser.wait(function() {
-            return browser.driver.getCurrentUrl().then(function(url) {
-              return url.match(/\/6$/);
+    function createDateInputType(type, regexp, parseDate, format) {
+        return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
+            badInputChecker(scope, element, attr, ctrl);
+            baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+            var timezone = ctrl && ctrl.$options.getOption('timezone');
+            var previousDate;
+
+            ctrl.$$parserName = type;
+            ctrl.$parsers.push(function(value) {
+                if (ctrl.$isEmpty(value)) return null;
+                if (regexp.test(value)) {
+                    // Note: We cannot read ctrl.$modelValue, as there might be a different
+                    // parser/formatter in the processing chain so that the model
+                    // contains some different data format!
+                    var parsedDate = parseDate(value, previousDate);
+                    if (timezone) {
+                        parsedDate = convertTimezoneToLocal(parsedDate, timezone);
+                    }
+                    return parsedDate;
+                }
+                return undefined;
             });
-          }, 1000, 'page should navigate to /6');
-        });
-     </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngSrc
-     * @restrict A
-     * @priority 99
-     *
-     * @description
-     * Using Angular markup like `{{hash}}` in a `src` attribute doesn't
-     * work right: The browser will fetch from the URL with the literal
-     * text `{{hash}}` until Angular replaces the expression inside
-     * `{{hash}}`. The `ngSrc` directive solves this problem.
-     *
-     * The buggy way to write it:
-     * ```html
-     * <img src="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * The correct way to write it:
-     * ```html
-     * <img ng-src="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * @element IMG
-     * @param {template} ngSrc any string which can contain `{{}}` markup.
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngSrcset
-     * @restrict A
-     * @priority 99
-     *
-     * @description
-     * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't
-     * work right: The browser will fetch from the URL with the literal
-     * text `{{hash}}` until Angular replaces the expression inside
-     * `{{hash}}`. The `ngSrcset` directive solves this problem.
-     *
-     * The buggy way to write it:
-     * ```html
-     * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
-     * ```
-     *
-     * The correct way to write it:
-     * ```html
-     * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
-     * ```
-     *
-     * @element IMG
-     * @param {template} ngSrcset any string which can contain `{{}}` markup.
-     */
 
-    /**
-     * @ngdoc directive
-     * @name ngDisabled
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     *
-     * The following markup will make the button enabled on Chrome/Firefox but not on IE8 and older IEs:
-     * ```html
-     * <div ng-init="scope = { isDisabled: false }">
-     *  <button disabled="{{scope.isDisabled}}">Disabled</button>
-     * </div>
-     * ```
-     *
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as disabled. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngDisabled` directive solves this problem for the `disabled` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     Click me to toggle: <input type="checkbox" ng-model="checked"><br/>
-     <button ng-model="button" ng-disabled="checked">Button</button>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should toggle button', function() {
-          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
-          element(by.model('checked')).click();
-          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
-        });
-     </file>
-     </example>
-     *
-     * @element INPUT
-     * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
-     *     then special attribute "disabled" will be set on the element
-     */
+            ctrl.$formatters.push(function(value) {
+                if (value && !isDate(value)) {
+                    throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
+                }
+                if (isValidDate(value)) {
+                    previousDate = value;
+                    if (previousDate && timezone) {
+                        previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+                    }
+                    return $filter('date')(value, format, timezone);
+                } else {
+                    previousDate = null;
+                    return '';
+                }
+            });
 
+            if (isDefined(attr.min) || attr.ngMin) {
+                var minVal;
+                ctrl.$validators.min = function(value) {
+                    return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
+                };
+                attr.$observe('min', function(val) {
+                    minVal = parseObservedDateValue(val);
+                    ctrl.$validate();
+                });
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngChecked
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as checked. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngChecked` directive solves this problem for the `checked` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     * @example
-     <example>
-     <file name="index.html">
-     Check me to check both: <input type="checkbox" ng-model="master"><br/>
-     <input id="checkSlave" type="checkbox" ng-checked="master">
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check both checkBoxes', function() {
-          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
-          element(by.model('master')).click();
-          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
-        });
-     </file>
-     </example>
-     *
-     * @element INPUT
-     * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
-     *     then special attribute "checked" will be set on the element
-     */
+            if (isDefined(attr.max) || attr.ngMax) {
+                var maxVal;
+                ctrl.$validators.max = function(value) {
+                    return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
+                };
+                attr.$observe('max', function(val) {
+                    maxVal = parseObservedDateValue(val);
+                    ctrl.$validate();
+                });
+            }
 
+            function isValidDate(value) {
+                // Invalid Date: getTime() returns NaN
+                return value && !(value.getTime && value.getTime() !== value.getTime());
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngReadonly
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as readonly. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngReadonly` directive solves this problem for the `readonly` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     * @example
-     <example>
-     <file name="index.html">
-     Check me to make text readonly: <input type="checkbox" ng-model="checked"><br/>
-     <input type="text" ng-readonly="checked" value="I'm Angular"/>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should toggle readonly attr', function() {
-          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
-          element(by.model('checked')).click();
-          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
-        });
-     </file>
-     </example>
-     *
-     * @element INPUT
-     * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
-     *     then special attribute "readonly" will be set on the element
-     */
+            function parseObservedDateValue(val) {
+                return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
+            }
+        };
+    }
 
+    function badInputChecker(scope, element, attr, ctrl) {
+        var node = element[0];
+        var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
+        if (nativeValidation) {
+            ctrl.$parsers.push(function(value) {
+                var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
+                return validity.badInput || validity.typeMismatch ? undefined : value;
+            });
+        }
+    }
 
-    /**
-     * @ngdoc directive
-     * @name ngSelected
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as selected. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngSelected` directive solves this problem for the `selected` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     Check me to select: <input type="checkbox" ng-model="selected"><br/>
-     <select>
-     <option>Hello!</option>
-     <option id="greet" ng-selected="selected">Greetings!</option>
-     </select>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should select Greetings!', function() {
-          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
-          element(by.model('selected')).click();
-          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
+    function numberFormatterParser(ctrl) {
+        ctrl.$$parserName = 'number';
+        ctrl.$parsers.push(function(value) {
+            if (ctrl.$isEmpty(value))      return null;
+            if (NUMBER_REGEXP.test(value)) return parseFloat(value);
+            return undefined;
         });
-     </file>
-     </example>
-     *
-     * @element OPTION
-     * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
-     *     then special attribute "selected" will be set on the element
-     */
 
-    /**
-     * @ngdoc directive
-     * @name ngOpen
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as open. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngOpen` directive solves this problem for the `open` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     * @example
-     <example>
-     <file name="index.html">
-     Check me check multiple: <input type="checkbox" ng-model="open"><br/>
-     <details id="details" ng-open="open">
-     <summary>Show/Hide me</summary>
-     </details>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should toggle open', function() {
-           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
-           element(by.model('open')).click();
-           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
-         });
-     </file>
-     </example>
-     *
-     * @element DETAILS
-     * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
-     *     then special attribute "open" will be set on the element
-     */
+        ctrl.$formatters.push(function(value) {
+            if (!ctrl.$isEmpty(value)) {
+                if (!isNumber(value)) {
+                    throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
+                }
+                value = value.toString();
+            }
+            return value;
+        });
+    }
 
-    var ngAttributeAliasDirectives = {};
+    function parseNumberAttrVal(val) {
+        if (isDefined(val) && !isNumber(val)) {
+            val = parseFloat(val);
+        }
+        return !isNumberNaN(val) ? val : undefined;
+    }
 
+    function isNumberInteger(num) {
+        // See http://stackoverflow.com/questions/14636536/how-to-check-if-a-variable-is-an-integer-in-javascript#14794066
+        // (minus the assumption that `num` is a number)
 
-// boolean attrs are evaluated
-    forEach(BOOLEAN_ATTR, function(propName, attrName) {
-        // binding to multiple is not supported
-        if (propName == "multiple") return;
+        // eslint-disable-next-line no-bitwise
+        return (num | 0) === num;
+    }
 
-        var normalized = directiveNormalize('ng-' + attrName);
-        ngAttributeAliasDirectives[normalized] = function() {
-            return {
-                priority: 100,
-                link: function(scope, element, attr) {
-                    scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
-                        attr.$set(attrName, !!value);
-                    });
+    function countDecimals(num) {
+        var numString = num.toString();
+        var decimalSymbolIndex = numString.indexOf('.');
+
+        if (decimalSymbolIndex === -1) {
+            if (-1 < num && num < 1) {
+                // It may be in the exponential notation format (`1e-X`)
+                var match = /e-(\d+)$/.exec(numString);
+
+                if (match) {
+                    return Number(match[1]);
                 }
-            };
-        };
-    });
+            }
 
+            return 0;
+        }
 
-// ng-src, ng-srcset, ng-href are interpolated
-    forEach(['src', 'srcset', 'href'], function(attrName) {
-        var normalized = directiveNormalize('ng-' + attrName);
-        ngAttributeAliasDirectives[normalized] = function() {
-            return {
-                priority: 99, // it needs to run after the attributes are interpolated
-                link: function(scope, element, attr) {
-                    var propName = attrName,
-                        name = attrName;
+        return numString.length - decimalSymbolIndex - 1;
+    }
 
-                    if (attrName === 'href' &&
-                        toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
-                        name = 'xlinkHref';
-                        attr.$attr[name] = 'xlink:href';
-                        propName = null;
-                    }
+    function isValidForStep(viewValue, stepBase, step) {
+        // At this point `stepBase` and `step` are expected to be non-NaN values
+        // and `viewValue` is expected to be a valid stringified number.
+        var value = Number(viewValue);
 
-                    attr.$observe(normalized, function(value) {
-                        if (!value)
-                            return;
+        var isNonIntegerValue = !isNumberInteger(value);
+        var isNonIntegerStepBase = !isNumberInteger(stepBase);
+        var isNonIntegerStep = !isNumberInteger(step);
 
-                        attr.$set(name, value);
+        // Due to limitations in Floating Point Arithmetic (e.g. `0.3 - 0.2 !== 0.1` or
+        // `0.5 % 0.1 !== 0`), we need to convert all numbers to integers.
+        if (isNonIntegerValue || isNonIntegerStepBase || isNonIntegerStep) {
+            var valueDecimals = isNonIntegerValue ? countDecimals(value) : 0;
+            var stepBaseDecimals = isNonIntegerStepBase ? countDecimals(stepBase) : 0;
+            var stepDecimals = isNonIntegerStep ? countDecimals(step) : 0;
 
-                        // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
-                        // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
-                        // to set the property as well to achieve the desired effect.
-                        // we use attr[attrName] value since $set can sanitize the url.
-                        if (msie && propName) element.prop(propName, attr[name]);
-                    });
-                }
+            var decimalCount = Math.max(valueDecimals, stepBaseDecimals, stepDecimals);
+            var multiplier = Math.pow(10, decimalCount);
+
+            value = value * multiplier;
+            stepBase = stepBase * multiplier;
+            step = step * multiplier;
+
+            if (isNonIntegerValue) value = Math.round(value);
+            if (isNonIntegerStepBase) stepBase = Math.round(stepBase);
+            if (isNonIntegerStep) step = Math.round(step);
+        }
+
+        return (value - stepBase) % step === 0;
+    }
+
+    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        badInputChecker(scope, element, attr, ctrl);
+        numberFormatterParser(ctrl);
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+        var minVal;
+        var maxVal;
+
+        if (isDefined(attr.min) || attr.ngMin) {
+            ctrl.$validators.min = function(value) {
+                return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
             };
-        };
-    });
 
-    /* global -nullFormCtrl */
-    var nullFormCtrl = {
-        $addControl: noop,
-        $removeControl: noop,
-        $setValidity: noop,
-        $setDirty: noop,
-        $setPristine: noop
-    };
+            attr.$observe('min', function(val) {
+                minVal = parseNumberAttrVal(val);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
 
-    /**
-     * @ngdoc type
-     * @name form.FormController
-     *
-     * @property {boolean} $pristine True if user has not interacted with the form yet.
-     * @property {boolean} $dirty True if user has already interacted with the form.
-     * @property {boolean} $valid True if all of the containing forms and controls are valid.
-     * @property {boolean} $invalid True if at least one containing control or form is invalid.
-     *
-     * @property {Object} $error Is an object hash, containing references to all invalid controls or
-     *  forms, where:
-     *
-     *  - keys are validation tokens (error names),
-     *  - values are arrays of controls or forms that are invalid for given error name.
-     *
-     *
-     *  Built-in validation tokens:
-     *
-     *  - `email`
-     *  - `max`
-     *  - `maxlength`
-     *  - `min`
-     *  - `minlength`
-     *  - `number`
-     *  - `pattern`
-     *  - `required`
-     *  - `url`
-     *
-     * @description
-     * `FormController` keeps track of all its controls and nested forms as well as state of them,
-     * such as being valid/invalid or dirty/pristine.
-     *
-     * Each {@link ng.directive:form form} directive creates an instance
-     * of `FormController`.
-     *
-     */
-//asks for $scope to fool the BC controller module
-    FormController.$inject = ['$element', '$attrs', '$scope', '$animate'];
-    function FormController(element, attrs, $scope, $animate) {
-        var form = this,
-            parentForm = element.parent().controller('form') || nullFormCtrl,
-            invalidCount = 0, // used to easily determine if we are valid
-            errors = form.$error = {},
-            controls = [];
+        if (isDefined(attr.max) || attr.ngMax) {
+            ctrl.$validators.max = function(value) {
+                return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
+            };
 
-        // init state
-        form.$name = attrs.name || attrs.ngForm;
-        form.$dirty = false;
-        form.$pristine = true;
-        form.$valid = true;
-        form.$invalid = false;
+            attr.$observe('max', function(val) {
+                maxVal = parseNumberAttrVal(val);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
+
+        if (isDefined(attr.step) || attr.ngStep) {
+            var stepVal;
+            ctrl.$validators.step = function(modelValue, viewValue) {
+                return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
+                    isValidForStep(viewValue, minVal || 0, stepVal);
+            };
 
-        parentForm.$addControl(form);
+            attr.$observe('step', function(val) {
+                stepVal = parseNumberAttrVal(val);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
+    }
 
-        // Setup initial state of the control
-        element.addClass(PRISTINE_CLASS);
-        toggleValidCss(true);
+    function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        badInputChecker(scope, element, attr, ctrl);
+        numberFormatterParser(ctrl);
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+        var supportsRange = ctrl.$$hasNativeValidators && element[0].type === 'range',
+            minVal = supportsRange ? 0 : undefined,
+            maxVal = supportsRange ? 100 : undefined,
+            stepVal = supportsRange ? 1 : undefined,
+            validity = element[0].validity,
+            hasMinAttr = isDefined(attr.min),
+            hasMaxAttr = isDefined(attr.max),
+            hasStepAttr = isDefined(attr.step);
+
+        var originalRender = ctrl.$render;
+
+        ctrl.$render = supportsRange && isDefined(validity.rangeUnderflow) && isDefined(validity.rangeOverflow) ?
+            //Browsers that implement range will set these values automatically, but reading the adjusted values after
+            //$render would cause the min / max validators to be applied with the wrong value
+            function rangeRender() {
+                originalRender();
+                ctrl.$setViewValue(element.val());
+            } :
+            originalRender;
+
+        if (hasMinAttr) {
+            ctrl.$validators.min = supportsRange ?
+                // Since all browsers set the input to a valid value, we don't need to check validity
+                function noopMinValidator() { return true; } :
+                // non-support browsers validate the min val
+                function minValidator(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal;
+                };
 
-        // convenience method for easy toggling of classes
-        function toggleValidCss(isValid, validationErrorKey) {
-            validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-            $animate.removeClass(element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
-            $animate.addClass(element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
+            setInitialValueAndObserver('min', minChange);
         }
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$addControl
-         *
-         * @description
-         * Register a control with the form.
-         *
-         * Input elements using ngModelController do this automatically when they are linked.
-         */
-        form.$addControl = function(control) {
-            // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
-            // and not added to the scope.  Now we throw an error.
-            assertNotHasOwnProperty(control.$name, 'input');
-            controls.push(control);
+        if (hasMaxAttr) {
+            ctrl.$validators.max = supportsRange ?
+                // Since all browsers set the input to a valid value, we don't need to check validity
+                function noopMaxValidator() { return true; } :
+                // non-support browsers validate the max val
+                function maxValidator(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal;
+                };
 
-            if (control.$name) {
-                form[control.$name] = control;
+            setInitialValueAndObserver('max', maxChange);
+        }
+
+        if (hasStepAttr) {
+            ctrl.$validators.step = supportsRange ?
+                function nativeStepValidator() {
+                    // Currently, only FF implements the spec on step change correctly (i.e. adjusting the
+                    // input element value to a valid value). It's possible that other browsers set the stepMismatch
+                    // validity error instead, so we can at least report an error in that case.
+                    return !validity.stepMismatch;
+                } :
+                // ngStep doesn't set the setp attr, so the browser doesn't adjust the input value as setting step would
+                function stepValidator(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
+                        isValidForStep(viewValue, minVal || 0, stepVal);
+                };
+
+            setInitialValueAndObserver('step', stepChange);
+        }
+
+        function setInitialValueAndObserver(htmlAttrName, changeFn) {
+            // interpolated attributes set the attribute value only after a digest, but we need the
+            // attribute value when the input is first rendered, so that the browser can adjust the
+            // input value based on the min/max value
+            element.attr(htmlAttrName, attr[htmlAttrName]);
+            attr.$observe(htmlAttrName, changeFn);
+        }
+
+        function minChange(val) {
+            minVal = parseNumberAttrVal(val);
+            // ignore changes before model is initialized
+            if (isNumberNaN(ctrl.$modelValue)) {
+                return;
             }
-        };
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$removeControl
-         *
-         * @description
-         * Deregister a control from the form.
-         *
-         * Input elements using ngModelController do this automatically when they are destroyed.
-         */
-        form.$removeControl = function(control) {
-            if (control.$name && form[control.$name] === control) {
-                delete form[control.$name];
+            if (supportsRange) {
+                var elVal = element.val();
+                // IE11 doesn't set the el val correctly if the minVal is greater than the element value
+                if (minVal > elVal) {
+                    elVal = minVal;
+                    element.val(elVal);
+                }
+                ctrl.$setViewValue(elVal);
+            } else {
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
             }
-            forEach(errors, function(queue, validationToken) {
-                form.$setValidity(validationToken, true, control);
-            });
+        }
 
-            arrayRemove(controls, control);
-        };
+        function maxChange(val) {
+            maxVal = parseNumberAttrVal(val);
+            // ignore changes before model is initialized
+            if (isNumberNaN(ctrl.$modelValue)) {
+                return;
+            }
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$setValidity
-         *
-         * @description
-         * Sets the validity of a form control.
-         *
-         * This method will also propagate to parent forms.
-         */
-        form.$setValidity = function(validationToken, isValid, control) {
-            var queue = errors[validationToken];
-
-            if (isValid) {
-                if (queue) {
-                    arrayRemove(queue, control);
-                    if (!queue.length) {
-                        invalidCount--;
-                        if (!invalidCount) {
-                            toggleValidCss(isValid);
-                            form.$valid = true;
-                            form.$invalid = false;
-                        }
-                        errors[validationToken] = false;
-                        toggleValidCss(true, validationToken);
-                        parentForm.$setValidity(validationToken, true, form);
-                    }
+            if (supportsRange) {
+                var elVal = element.val();
+                // IE11 doesn't set the el val correctly if the maxVal is less than the element value
+                if (maxVal < elVal) {
+                    element.val(maxVal);
+                    // IE11 and Chrome don't set the value to the minVal when max < min
+                    elVal = maxVal < minVal ? minVal : maxVal;
                 }
+                ctrl.$setViewValue(elVal);
+            } else {
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            }
+        }
+
+        function stepChange(val) {
+            stepVal = parseNumberAttrVal(val);
+            // ignore changes before model is initialized
+            if (isNumberNaN(ctrl.$modelValue)) {
+                return;
+            }
 
+            // Some browsers don't adjust the input value correctly, but set the stepMismatch error
+            if (supportsRange && ctrl.$viewValue !== element.val()) {
+                ctrl.$setViewValue(element.val());
             } else {
-                if (!invalidCount) {
-                    toggleValidCss(isValid);
-                }
-                if (queue) {
-                    if (includes(queue, control)) return;
-                } else {
-                    errors[validationToken] = queue = [];
-                    invalidCount++;
-                    toggleValidCss(false, validationToken);
-                    parentForm.$setValidity(validationToken, false, form);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            }
+        }
+    }
+
+    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        // Note: no badInputChecker here by purpose as `url` is only a validation
+        // in browsers, i.e. we can always read out input.value even if it is not valid!
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+
+        ctrl.$$parserName = 'url';
+        ctrl.$validators.url = function(modelValue, viewValue) {
+            var value = modelValue || viewValue;
+            return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
+        };
+    }
+
+    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        // Note: no badInputChecker here by purpose as `url` is only a validation
+        // in browsers, i.e. we can always read out input.value even if it is not valid!
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+
+        ctrl.$$parserName = 'email';
+        ctrl.$validators.email = function(modelValue, viewValue) {
+            var value = modelValue || viewValue;
+            return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
+        };
+    }
+
+    function radioInputType(scope, element, attr, ctrl) {
+        var doTrim = !attr.ngTrim || trim(attr.ngTrim) !== 'false';
+        // make the name unique, if not defined
+        if (isUndefined(attr.name)) {
+            element.attr('name', nextUid());
+        }
+
+        var listener = function(ev) {
+            var value;
+            if (element[0].checked) {
+                value = attr.value;
+                if (doTrim) {
+                    value = trim(value);
                 }
-                queue.push(control);
+                ctrl.$setViewValue(value, ev && ev.type);
+            }
+        };
+
+        element.on('click', listener);
+
+        ctrl.$render = function() {
+            var value = attr.value;
+            if (doTrim) {
+                value = trim(value);
+            }
+            element[0].checked = (value === ctrl.$viewValue);
+        };
 
-                form.$valid = false;
-                form.$invalid = true;
+        attr.$observe('value', ctrl.$render);
+    }
+
+    function parseConstantExpr($parse, context, name, expression, fallback) {
+        var parseFn;
+        if (isDefined(expression)) {
+            parseFn = $parse(expression);
+            if (!parseFn.constant) {
+                throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
+                    '`{1}`.', name, expression);
             }
+            return parseFn(context);
+        }
+        return fallback;
+    }
+
+    function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
+        var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
+        var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
+
+        var listener = function(ev) {
+            ctrl.$setViewValue(element[0].checked, ev && ev.type);
         };
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$setDirty
-         *
-         * @description
-         * Sets the form to a dirty state.
-         *
-         * This method can be called to add the 'ng-dirty' class and set the form to a dirty
-         * state (ng-dirty class). This method will also propagate to parent forms.
-         */
-        form.$setDirty = function() {
-            $animate.removeClass(element, PRISTINE_CLASS);
-            $animate.addClass(element, DIRTY_CLASS);
-            form.$dirty = true;
-            form.$pristine = false;
-            parentForm.$setDirty();
+        element.on('click', listener);
+
+        ctrl.$render = function() {
+            element[0].checked = ctrl.$viewValue;
         };
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$setPristine
-         *
-         * @description
-         * Sets the form to its pristine state.
-         *
-         * This method can be called to remove the 'ng-dirty' class and set the form to its pristine
-         * state (ng-pristine class). This method will also propagate to all the controls contained
-         * in this form.
-         *
-         * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
-         * saving or resetting it.
-         */
-        form.$setPristine = function () {
-            $animate.removeClass(element, DIRTY_CLASS);
-            $animate.addClass(element, PRISTINE_CLASS);
-            form.$dirty = false;
-            form.$pristine = true;
-            forEach(controls, function(control) {
-                control.$setPristine();
-            });
+        // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
+        // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
+        // it to a boolean.
+        ctrl.$isEmpty = function(value) {
+            return value === false;
         };
+
+        ctrl.$formatters.push(function(value) {
+            return equals(value, trueValue);
+        });
+
+        ctrl.$parsers.push(function(value) {
+            return value ? trueValue : falseValue;
+        });
     }
 
 
     /**
      * @ngdoc directive
-     * @name ngForm
-     * @restrict EAC
+     * @name textarea
+     * @restrict E
      *
      * @description
-     * Nestable alias of {@link ng.directive:form `form`} directive. HTML
-     * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
-     * sub-group of controls needs to be determined.
+     * HTML textarea element control with AngularJS data-binding. The data-binding and validation
+     * properties of this element are exactly the same as those of the
+     * {@link ng.directive:input input element}.
      *
-     * Note: the purpose of `ngForm` is to group controls,
-     * but not to be a replacement for the `<form>` tag with all of its capabilities
-     * (e.g. posting to the server, ...).
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+     *    minlength.
+     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+     *    length.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
+     * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+     *    interaction with the input element.
+     * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
      *
-     * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
-     *                       related scope, under this name.
+     * @knownIssue
      *
+     * When specifying the `placeholder` attribute of `<textarea>`, Internet Explorer will temporarily
+     * insert the placeholder value as the textarea's content. If the placeholder value contains
+     * interpolation (`{{ ... }}`), an error will be logged in the console when AngularJS tries to update
+     * the value of the by-then-removed text node. This doesn't affect the functionality of the
+     * textarea, but can be undesirable.
+     *
+     * You can work around this Internet Explorer issue by using `ng-attr-placeholder` instead of
+     * `placeholder` on textareas, whenever you need interpolation in the placeholder value. You can
+     * find more details on `ngAttr` in the
+     * [Interpolation](guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes) section of the
+     * Developer Guide.
      */
 
+
     /**
      * @ngdoc directive
-     * @name form
+     * @name input
      * @restrict E
      *
      * @description
-     * Directive that instantiates
-     * {@link form.FormController FormController}.
-     *
-     * If the `name` attribute is specified, the form controller is published onto the current scope under
-     * this name.
-     *
-     * # Alias: {@link ng.directive:ngForm `ngForm`}
-     *
-     * In Angular forms can be nested. This means that the outer form is valid when all of the child
-     * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
-     * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to
-     * `<form>` but can be nested.  This allows you to have nested forms, which is very useful when
-     * using Angular validation directives in forms that are dynamically generated using the
-     * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name`
-     * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an
-     * `ngForm` directive and nest these in an outer `form` element.
-     *
-     *
-     * # CSS classes
-     *  - `ng-valid` is set if the form is valid.
-     *  - `ng-invalid` is set if the form is invalid.
-     *  - `ng-pristine` is set if the form is pristine.
-     *  - `ng-dirty` is set if the form is dirty.
+     * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
+     * input state control, and validation.
+     * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
      *
-     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     * <div class="alert alert-warning">
+     * **Note:** Not every feature offered is available for all input types.
+     * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
+     * </div>
      *
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {boolean=} ngRequired Sets `required` attribute if set to true
+     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+     *    minlength.
+     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+     *    length.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    value does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
+     * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+     *    interaction with the input element.
+     * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
+     *    This parameter is ignored for input[type=password] controls, which will never trim the
+     *    input.
      *
-     * # Submitting a form and preventing the default action
+     * @example
+     <example name="input-directive" module="inputExample">
+     <file name="index.html">
+     <script>
+     angular.module('inputExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+              $scope.user = {name: 'guest', last: 'visitor'};
+            }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <form name="myForm">
+     <label>
+     User name:
+     <input type="text" name="userName" ng-model="user.name" required>
+     </label>
+     <div role="alert">
+     <span class="error" ng-show="myForm.userName.$error.required">
+     Required!</span>
+     </div>
+     <label>
+     Last name:
+     <input type="text" name="lastName" ng-model="user.last"
+     ng-minlength="3" ng-maxlength="10">
+     </label>
+     <div role="alert">
+     <span class="error" ng-show="myForm.lastName.$error.minlength">
+     Too short!</span>
+     <span class="error" ng-show="myForm.lastName.$error.maxlength">
+     Too long!</span>
+     </div>
+     </form>
+     <hr>
+     <tt>user = {{user}}</tt><br/>
+     <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
+     <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
+     <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
+     <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
+     <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var user = element(by.exactBinding('user'));
+     var userNameValid = element(by.binding('myForm.userName.$valid'));
+     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
+     var lastNameError = element(by.binding('myForm.lastName.$error'));
+     var formValid = element(by.binding('myForm.$valid'));
+     var userNameInput = element(by.model('user.name'));
+     var userLastInput = element(by.model('user.last'));
+
+     it('should initialize to model', function() {
+          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
+          expect(userNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+     it('should be invalid if empty when required', function() {
+          userNameInput.clear();
+          userNameInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"last":"visitor"}');
+          expect(userNameValid.getText()).toContain('false');
+          expect(formValid.getText()).toContain('false');
+        });
+
+     it('should be valid if empty when min length is set', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"name":"guest","last":""}');
+          expect(lastNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+     it('should be invalid if less than required min length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('xx');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('minlength');
+          expect(formValid.getText()).toContain('false');
+        });
+
+     it('should be invalid if longer than max length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('some ridiculously long name');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('maxlength');
+          expect(formValid.getText()).toContain('false');
+        });
+     </file>
+     </example>
+     */
+    var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
+        function($browser, $sniffer, $filter, $parse) {
+            return {
+                restrict: 'E',
+                require: ['?ngModel'],
+                link: {
+                    pre: function(scope, element, attr, ctrls) {
+                        if (ctrls[0]) {
+                            (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
+                                $browser, $filter, $parse);
+                        }
+                    }
+                }
+            };
+        }];
+
+
+
+    var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
+    /**
+     * @ngdoc directive
+     * @name ngValue
+     * @restrict A
+     * @priority 100
      *
-     * Since the role of forms in client-side Angular applications is different than in classical
-     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
-     * page reload that sends the data to the server. Instead some javascript logic should be triggered
-     * to handle the form submission in an application-specific way.
+     * @description
+     * Binds the given expression to the value of the element.
      *
-     * For this reason, Angular prevents the default action (form submission to the server) unless the
-     * `<form>` element has an `action` attribute specified.
+     * It is mainly used on {@link input[radio] `input[radio]`} and option elements,
+     * so that when the element is selected, the {@link ngModel `ngModel`} of that element (or its
+     * {@link select `select`} parent element) is set to the bound value. It is especially useful
+     * for dynamically generated lists using {@link ngRepeat `ngRepeat`}, as shown below.
      *
-     * You can use one of the following two ways to specify what javascript method should be called when
-     * a form is submitted:
+     * It can also be used to achieve one-way binding of a given expression to an input element
+     * such as an `input[text]` or a `textarea`, when that element does not use ngModel.
      *
-     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
-     * - {@link ng.directive:ngClick ngClick} directive on the first
-     *  button or input field of type submit (input[type=submit])
+     * @element ANY
+     * @param {string=} ngValue AngularJS expression, whose value will be bound to the `value` attribute
+     * and `value` property of the element.
      *
-     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
-     * or {@link ng.directive:ngClick ngClick} directives.
-     * This is because of the following form submission rules in the HTML specification:
+     * @example
+     <example name="ngValue-directive" module="valueExample">
+     <file name="index.html">
+     <script>
+     angular.module('valueExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+              $scope.names = ['pizza', 'unicorns', 'robots'];
+              $scope.my = { favorite: 'unicorns' };
+            }]);
+     </script>
+     <form ng-controller="ExampleController">
+     <h2>Which is your favorite?</h2>
+     <label ng-repeat="name in names" for="{{name}}">
+     {{name}}
+     <input type="radio"
+     ng-model="my.favorite"
+     ng-value="name"
+     id="{{name}}"
+     name="favorite">
+     </label>
+     <div>You chose {{my.favorite}}</div>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var favorite = element(by.binding('my.favorite'));
+
+     it('should initialize to model', function() {
+          expect(favorite.getText()).toContain('unicorns');
+        });
+     it('should bind the values to the inputs', function() {
+          element.all(by.model('my.favorite')).get(0).click();
+          expect(favorite.getText()).toContain('pizza');
+        });
+     </file>
+     </example>
+     */
+    var ngValueDirective = function() {
+        /**
+         *  inputs use the value attribute as their default value if the value property is not set.
+         *  Once the value property has been set (by adding input), it will not react to changes to
+         *  the value attribute anymore. Setting both attribute and property fixes this behavior, and
+         *  makes it possible to use ngValue as a sort of one-way bind.
+         */
+        function updateElementValue(element, attr, value) {
+            // Support: IE9 only
+            // In IE9 values are converted to string (e.g. `input.value = null` results in `input.value === 'null'`).
+            var propValue = isDefined(value) ? value : (msie === 9) ? '' : null;
+            element.prop('value', propValue);
+            attr.$set('value', value);
+        }
+
+        return {
+            restrict: 'A',
+            priority: 100,
+            compile: function(tpl, tplAttr) {
+                if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
+                    return function ngValueConstantLink(scope, elm, attr) {
+                        var value = scope.$eval(attr.ngValue);
+                        updateElementValue(elm, attr, value);
+                    };
+                } else {
+                    return function ngValueLink(scope, elm, attr) {
+                        scope.$watch(attr.ngValue, function valueWatchAction(value) {
+                            updateElementValue(elm, attr, value);
+                        });
+                    };
+                }
+            }
+        };
+    };
+
+    /**
+     * @ngdoc directive
+     * @name ngBind
+     * @restrict AC
      *
-     * - If a form has only one input field then hitting enter in this field triggers form submit
-     * (`ngSubmit`)
-     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
-     * doesn't trigger submit
-     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
-     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
-     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+     * @description
+     * The `ngBind` attribute tells AngularJS to replace the text content of the specified HTML element
+     * with the value of a given expression, and to update the text content when the value of that
+     * expression changes.
      *
-     * @param {string=} name Name of the form. If specified, the form controller will be published into
-     *                       related scope, under this name.
+     * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
+     * `{{ expression }}` which is similar but less verbose.
      *
-     * ## Animation Hooks
+     * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
+     * displayed by the browser in its raw state before AngularJS compiles it. Since `ngBind` is an
+     * element attribute, it makes the bindings invisible to the user while the page is loading.
      *
-     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
-     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
-     * other validations that are performed within the form. Animations in ngForm are similar to how
-     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
-     * as JS animations.
+     * An alternative solution to this problem would be using the
+     * {@link ng.directive:ngCloak ngCloak} directive.
      *
-     * The following example shows a simple way to utilize CSS transitions to style a form element
-     * that has been rendered as invalid after it has been validated:
      *
-     * <pre>
-     * //be sure to include ngAnimate as a module to hook into more
-     * //advanced animations
-     * .my-form {
- *   transition:0.5s linear all;
- *   background: white;
- * }
-     * .my-form.ng-invalid {
- *   background: red;
- *   color:white;
- * }
-     * </pre>
+     * @element ANY
+     * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
      *
      * @example
-     <example deps="angular-animate.js" animations="true" fixBase="true">
+     * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
+     <example module="bindExample" name="ng-bind">
      <file name="index.html">
      <script>
-     function Ctrl($scope) {
-           $scope.userType = 'guest';
-         }
+     angular.module('bindExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.name = 'Whirled';
+           }]);
      </script>
-     <style>
-     .my-form {
-          -webkit-transition:all linear 0.5s;
-          transition:all linear 0.5s;
-          background: transparent;
-        }
-     .my-form.ng-invalid {
-          background: red;
-        }
-     </style>
-     <form name="myForm" ng-controller="Ctrl" class="my-form">
-     userType: <input name="input" ng-model="userType" required>
-     <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
-     <tt>userType = {{userType}}</tt><br>
-     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br>
-     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br>
-     <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
-     </form>
+     <div ng-controller="ExampleController">
+     <label>Enter name: <input type="text" ng-model="name"></label><br>
+     Hello <span ng-bind="name"></span>!
+     </div>
      </file>
      <file name="protractor.js" type="protractor">
-     it('should initialize to model', function() {
-          var userType = element(by.binding('userType'));
-          var valid = element(by.binding('myForm.input.$valid'));
-
-          expect(userType.getText()).toContain('guest');
-          expect(valid.getText()).toContain('true');
-        });
-
-     it('should be invalid if empty', function() {
-          var userType = element(by.binding('userType'));
-          var valid = element(by.binding('myForm.input.$valid'));
-          var userInput = element(by.model('userType'));
-
-          userInput.clear();
-          userInput.sendKeys('');
+     it('should check ng-bind', function() {
+         var nameInput = element(by.model('name'));
 
-          expect(userType.getText()).toEqual('userType =');
-          expect(valid.getText()).toContain('false');
-        });
+         expect(element(by.binding('name')).getText()).toBe('Whirled');
+         nameInput.clear();
+         nameInput.sendKeys('world');
+         expect(element(by.binding('name')).getText()).toBe('world');
+       });
      </file>
      </example>
-     *
      */
-    var formDirectiveFactory = function(isNgForm) {
-        return ['$timeout', function($timeout) {
-            var formDirective = {
-                name: 'form',
-                restrict: isNgForm ? 'EAC' : 'E',
-                controller: FormController,
-                compile: function() {
-                    return {
-                        pre: function(scope, formElement, attr, controller) {
-                            if (!attr.action) {
-                                // we can't use jq events because if a form is destroyed during submission the default
-                                // action is not prevented. see #1238
-                                //
-                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
-                                // page reload if the form was destroyed by submission of the form via a click handler
-                                // on a button in the form. Looks like an IE9 specific bug.
-                                var preventDefaultListener = function(event) {
-                                    event.preventDefault
-                                        ? event.preventDefault()
-                                        : event.returnValue = false; // IE
-                                };
-
-                                addEventListenerFn(formElement[0], 'submit', preventDefaultListener);
-
-                                // unregister the preventDefault listener so that we don't not leak memory but in a
-                                // way that will achieve the prevention of the default action.
-                                formElement.on('$destroy', function() {
-                                    $timeout(function() {
-                                        removeEventListenerFn(formElement[0], 'submit', preventDefaultListener);
-                                    }, 0, false);
-                                });
-                            }
-
-                            var parentFormCtrl = formElement.parent().controller('form'),
-                                alias = attr.name || attr.ngForm;
+    var ngBindDirective = ['$compile', function($compile) {
+        return {
+            restrict: 'AC',
+            compile: function ngBindCompile(templateElement) {
+                $compile.$$addBindingClass(templateElement);
+                return function ngBindLink(scope, element, attr) {
+                    $compile.$$addBindingInfo(element, attr.ngBind);
+                    element = element[0];
+                    scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
+                        element.textContent = stringify(value);
+                    });
+                };
+            }
+        };
+    }];
 
-                            if (alias) {
-                                setter(scope, alias, controller, alias);
-                            }
-                            if (parentFormCtrl) {
-                                formElement.on('$destroy', function() {
-                                    parentFormCtrl.$removeControl(controller);
-                                    if (alias) {
-                                        setter(scope, alias, undefined, alias);
-                                    }
-                                    extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
-                                });
-                            }
-                        }
-                    };
-                }
-            };
 
-            return formDirective;
-        }];
-    };
+    /**
+     * @ngdoc directive
+     * @name ngBindTemplate
+     *
+     * @description
+     * The `ngBindTemplate` directive specifies that the element
+     * text content should be replaced with the interpolation of the template
+     * in the `ngBindTemplate` attribute.
+     * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
+     * expressions. This directive is needed since some HTML elements
+     * (such as TITLE and OPTION) cannot contain SPAN elements.
+     *
+     * @element ANY
+     * @param {string} ngBindTemplate template of form
+     *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
+     *
+     * @example
+     * Try it here: enter text in text box and watch the greeting change.
+     <example module="bindExample" name="ng-bind-template">
+     <file name="index.html">
+     <script>
+     angular.module('bindExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.salutation = 'Hello';
+             $scope.name = 'World';
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <label>Salutation: <input type="text" ng-model="salutation"></label><br>
+     <label>Name: <input type="text" ng-model="name"></label><br>
+     <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-bind', function() {
+         var salutationElem = element(by.binding('salutation'));
+         var salutationInput = element(by.model('salutation'));
+         var nameInput = element(by.model('name'));
 
-    var formDirective = formDirectiveFactory();
-    var ngFormDirective = formDirectiveFactory(true);
+         expect(salutationElem.getText()).toBe('Hello World!');
 
-    /* global
+         salutationInput.clear();
+         salutationInput.sendKeys('Greetings');
+         nameInput.clear();
+         nameInput.sendKeys('user');
 
-     -VALID_CLASS,
-     -INVALID_CLASS,
-     -PRISTINE_CLASS,
-     -DIRTY_CLASS
+         expect(salutationElem.getText()).toBe('Greetings user!');
+       });
+     </file>
+     </example>
      */
+    var ngBindTemplateDirective = ['$interpolate', '$compile', function($interpolate, $compile) {
+        return {
+            compile: function ngBindTemplateCompile(templateElement) {
+                $compile.$$addBindingClass(templateElement);
+                return function ngBindTemplateLink(scope, element, attr) {
+                    var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
+                    $compile.$$addBindingInfo(element, interpolateFn.expressions);
+                    element = element[0];
+                    attr.$observe('ngBindTemplate', function(value) {
+                        element.textContent = isUndefined(value) ? '' : value;
+                    });
+                };
+            }
+        };
+    }];
 
-    var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
-    var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i;
-    var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
 
-    var inputType = {
+    /**
+     * @ngdoc directive
+     * @name ngBindHtml
+     *
+     * @description
+     * Evaluates the expression and inserts the resulting HTML into the element in a secure way. By default,
+     * the resulting HTML content will be sanitized using the {@link ngSanitize.$sanitize $sanitize} service.
+     * To utilize this functionality, ensure that `$sanitize` is available, for example, by including {@link
+        * ngSanitize} in your module's dependencies (not in core AngularJS). In order to use {@link ngSanitize}
+     * in your module's dependencies, you need to include "angular-sanitize.js" in your application.
+     *
+     * You may also bypass sanitization for values you know are safe. To do so, bind to
+     * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
+     * under {@link ng.$sce#show-me-an-example-using-sce- Strict Contextual Escaping (SCE)}.
+     *
+     * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
+     * will have an exception (instead of an exploit.)
+     *
+     * @element ANY
+     * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+     *
+     * @example
 
-        /**
-         * @ngdoc input
-         * @name input[text]
-         *
-         * @description
-         * Standard HTML text input with angular data binding.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} required Adds `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
-         *
-         * @example
-         <example name="text-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.text = 'guest';
-             $scope.word = /^\s*\w*\s*$/;
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Single word: <input type="text" name="input" ng-model="text"
-         ng-pattern="word" required ng-trim="false">
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.pattern">
-         Single word only!</span>
+     <example module="bindHtmlExample" deps="angular-sanitize.js" name="ng-bind-html">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <p ng-bind-html="myHTML"></p>
+     </div>
+     </file>
 
-         <tt>text = {{text}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var text = element(by.binding('text'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('text'));
+     <file name="script.js">
+     angular.module('bindHtmlExample', ['ngSanitize'])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.myHTML =
+              'I am an <code>HTML</code>string with ' +
+              '<a href="#">links!</a> and other <em>stuff</em>';
+         }]);
+     </file>
 
-         it('should initialize to model', function() {
-            expect(text.getText()).toContain('guest');
-            expect(valid.getText()).toContain('true');
-          });
+     <file name="protractor.js" type="protractor">
+     it('should check ng-bind-html', function() {
+         expect(element(by.binding('myHTML')).getText()).toBe(
+             'I am an HTMLstring with links! and other stuff');
+       });
+     </file>
+     </example>
+     */
+    var ngBindHtmlDirective = ['$sce', '$parse', '$compile', function($sce, $parse, $compile) {
+        return {
+            restrict: 'A',
+            compile: function ngBindHtmlCompile(tElement, tAttrs) {
+                var ngBindHtmlGetter = $parse(tAttrs.ngBindHtml);
+                var ngBindHtmlWatch = $parse(tAttrs.ngBindHtml, function sceValueOf(val) {
+                    // Unwrap the value to compare the actual inner safe value, not the wrapper object.
+                    return $sce.valueOf(val);
+                });
+                $compile.$$addBindingClass(tElement);
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
+                return function ngBindHtmlLink(scope, element, attr) {
+                    $compile.$$addBindingInfo(element, attr.ngBindHtml);
 
-            expect(text.getText()).toEqual('text =');
-            expect(valid.getText()).toContain('false');
-          });
+                    scope.$watch(ngBindHtmlWatch, function ngBindHtmlWatchAction() {
+                        // The watched value is the unwrapped value. To avoid re-escaping, use the direct getter.
+                        var value = ngBindHtmlGetter(scope);
+                        element.html($sce.getTrustedHtml(value) || '');
+                    });
+                };
+            }
+        };
+    }];
+
+    /**
+     * @ngdoc directive
+     * @name ngChange
+     * @restrict A
+     *
+     * @description
+     * Evaluate the given expression when the user changes the input.
+     * The expression is evaluated immediately, unlike the JavaScript onchange event
+     * which only triggers at the end of a change (usually, when the user leaves the
+     * form element or presses the return key).
+     *
+     * The `ngChange` expression is only evaluated when a change in the input value causes
+     * a new value to be committed to the model.
+     *
+     * It will not be evaluated:
+     * * if the value returned from the `$parsers` transformation pipeline has not changed
+     * * if the input has continued to be invalid since the model will stay `null`
+     * * if the model is changed programmatically and not by a change to the input value
+     *
+     *
+     * Note, this directive requires `ngModel` to be present.
+     *
+     * @element ANY
+     * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
+     * in input value.
+     *
+     * @example
+     * <example name="ngChange-directive" module="changeExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('changeExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.counter = 0;
+     *           $scope.change = function() {
+     *             $scope.counter++;
+     *           };
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
+     *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
+     *       <label for="ng-change-example2">Confirmed</label><br />
+     *       <tt>debug = {{confirmed}}</tt><br/>
+     *       <tt>counter = {{counter}}</tt><br/>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     var counter = element(by.binding('counter'));
+     *     var debug = element(by.binding('confirmed'));
+     *
+     *     it('should evaluate the expression if changing from view', function() {
+     *       expect(counter.getText()).toContain('0');
+     *
+     *       element(by.id('ng-change-example1')).click();
+     *
+     *       expect(counter.getText()).toContain('1');
+     *       expect(debug.getText()).toContain('true');
+     *     });
+     *
+     *     it('should not evaluate the expression if changing from model', function() {
+     *       element(by.id('ng-change-example2')).click();
 
-         it('should be invalid if multi word', function() {
-            input.clear();
-            input.sendKeys('hello world');
+     *       expect(counter.getText()).toContain('0');
+     *       expect(debug.getText()).toContain('true');
+     *     });
+     *   </file>
+     * </example>
+     */
+    var ngChangeDirective = valueFn({
+        restrict: 'A',
+        require: 'ngModel',
+        link: function(scope, element, attr, ctrl) {
+            ctrl.$viewChangeListeners.push(function() {
+                scope.$eval(attr.ngChange);
+            });
+        }
+    });
 
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'text': textInputType,
+    /* exported
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective
+*/
 
+    function classDirective(name, selector) {
+        name = 'ngClass' + name;
+        var indexWatchExpression;
 
-        /**
-         * @ngdoc input
-         * @name input[number]
-         *
-         * @description
-         * Text input with number validation and transformation. Sets the `number` validation
-         * error if not a valid number.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-         * @param {string=} required Sets `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="number-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.value = 12;
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Number: <input type="number" name="input" ng-model="value"
-         min="0" max="99" required>
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.number">
-         Not valid number!</span>
-         <tt>value = {{value}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var value = element(by.binding('value'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('value'));
+        return ['$parse', function($parse) {
+            return {
+                restrict: 'AC',
+                link: function(scope, element, attr) {
+                    var expression = attr[name].trim();
+                    var isOneTime = (expression.charAt(0) === ':') && (expression.charAt(1) === ':');
 
-         it('should initialize to model', function() {
-            expect(value.getText()).toContain('12');
-            expect(valid.getText()).toContain('true');
-          });
+                    var watchInterceptor = isOneTime ? toFlatValue : toClassString;
+                    var watchExpression = $parse(expression, watchInterceptor);
+                    var watchAction = isOneTime ? ngClassOneTimeWatchAction : ngClassWatchAction;
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
-            expect(value.getText()).toEqual('value =');
-            expect(valid.getText()).toContain('false');
-          });
+                    var classCounts = element.data('$classCounts');
+                    var oldModulo = true;
+                    var oldClassString;
 
-         it('should be invalid if over max', function() {
-            input.clear();
-            input.sendKeys('123');
-            expect(value.getText()).toEqual('value =');
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'number': numberInputType,
+                    if (!classCounts) {
+                        // Use createMap() to prevent class assumptions involving property
+                        // names in Object.prototype
+                        classCounts = createMap();
+                        element.data('$classCounts', classCounts);
+                    }
 
+                    if (name !== 'ngClass') {
+                        if (!indexWatchExpression) {
+                            indexWatchExpression = $parse('$index', function moduloTwo($index) {
+                                // eslint-disable-next-line no-bitwise
+                                return $index & 1;
+                            });
+                        }
 
-        /**
-         * @ngdoc input
-         * @name input[url]
-         *
-         * @description
-         * Text input with URL validation. Sets the `url` validation error key if the content is not a
-         * valid URL.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} required Sets `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="url-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.text = 'http://google.com';
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         URL: <input type="url" name="input" ng-model="text" required>
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.url">
-         Not valid url!</span>
-         <tt>text = {{text}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var text = element(by.binding('text'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('text'));
+                        scope.$watch(indexWatchExpression, ngClassIndexWatchAction);
+                    }
 
-         it('should initialize to model', function() {
-            expect(text.getText()).toContain('http://google.com');
-            expect(valid.getText()).toContain('true');
-          });
+                    scope.$watch(watchExpression, watchAction, isOneTime);
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
+                    function addClasses(classString) {
+                        classString = digestClassCounts(split(classString), 1);
+                        attr.$addClass(classString);
+                    }
 
-            expect(text.getText()).toEqual('text =');
-            expect(valid.getText()).toContain('false');
-          });
+                    function removeClasses(classString) {
+                        classString = digestClassCounts(split(classString), -1);
+                        attr.$removeClass(classString);
+                    }
 
-         it('should be invalid if not url', function() {
-            input.clear();
-            input.sendKeys('box');
+                    function updateClasses(oldClassString, newClassString) {
+                        var oldClassArray = split(oldClassString);
+                        var newClassArray = split(newClassString);
 
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'url': urlInputType,
+                        var toRemoveArray = arrayDifference(oldClassArray, newClassArray);
+                        var toAddArray = arrayDifference(newClassArray, oldClassArray);
 
+                        var toRemoveString = digestClassCounts(toRemoveArray, -1);
+                        var toAddString = digestClassCounts(toAddArray, 1);
 
-        /**
-         * @ngdoc input
-         * @name input[email]
-         *
-         * @description
-         * Text input with email validation. Sets the `email` validation error key if not a valid email
-         * address.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} required Sets `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="email-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.text = 'me@example.com';
-         }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Email: <input type="email" name="input" ng-model="text" required>
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.email">
-         Not valid email!</span>
-         <tt>text = {{text}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var text = element(by.binding('text'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('text'));
+                        attr.$addClass(toAddString);
+                        attr.$removeClass(toRemoveString);
+                    }
 
-         it('should initialize to model', function() {
-            expect(text.getText()).toContain('me@example.com');
-         expect(valid.getText()).toContain('true');
-         });
+                    function digestClassCounts(classArray, count) {
+                        var classesToUpdate = [];
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
-            expect(text.getText()).toEqual('text =');
-            expect(valid.getText()).toContain('false');
-          });
+                        forEach(classArray, function(className) {
+                            if (count > 0 || classCounts[className]) {
+                                classCounts[className] = (classCounts[className] || 0) + count;
+                                if (classCounts[className] === +(count > 0)) {
+                                    classesToUpdate.push(className);
+                                }
+                            }
+                        });
 
-         it('should be invalid if not email', function() {
-            input.clear();
-            input.sendKeys('xxx');
+                        return classesToUpdate.join(' ');
+                    }
 
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'email': emailInputType,
+                    function ngClassIndexWatchAction(newModulo) {
+                        // This watch-action should run before the `ngClass[OneTime]WatchAction()`, thus it
+                        // adds/removes `oldClassString`. If the `ngClass` expression has changed as well, the
+                        // `ngClass[OneTime]WatchAction()` will update the classes.
+                        if (newModulo === selector) {
+                            addClasses(oldClassString);
+                        } else {
+                            removeClasses(oldClassString);
+                        }
 
+                        oldModulo = newModulo;
+                    }
 
-        /**
-         * @ngdoc input
-         * @name input[radio]
-         *
-         * @description
-         * HTML radio button.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string} value The value to which the expression should be set when selected.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         * @param {string} ngValue Angular expression which sets the value to which the expression should
-         *    be set when selected.
-         *
-         * @example
-         <example name="radio-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.color = 'blue';
-             $scope.specialValue = {
-               "id": "12345",
-               "value": "green"
-             };
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         <input type="radio" ng-model="color" value="red">  Red <br/>
-         <input type="radio" ng-model="color" ng-value="specialValue"> Green <br/>
-         <input type="radio" ng-model="color" value="blue"> Blue <br/>
-         <tt>color = {{color | json}}</tt><br/>
-         </form>
-         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
-         </file>
-         <file name="protractor.js" type="protractor">
-         it('should change state', function() {
-            var color = element(by.binding('color'));
+                    function ngClassOneTimeWatchAction(newClassValue) {
+                        var newClassString = toClassString(newClassValue);
 
-            expect(color.getText()).toContain('blue');
+                        if (newClassString !== oldClassString) {
+                            ngClassWatchAction(newClassString);
+                        }
+                    }
 
-            element.all(by.model('color')).get(0).click();
+                    function ngClassWatchAction(newClassString) {
+                        if (oldModulo === selector) {
+                            updateClasses(oldClassString, newClassString);
+                        }
 
-            expect(color.getText()).toContain('red');
-          });
-         </file>
-         </example>
-         */
-        'radio': radioInputType,
+                        oldClassString = newClassString;
+                    }
+                }
+            };
+        }];
 
+        // Helpers
+        function arrayDifference(tokens1, tokens2) {
+            if (!tokens1 || !tokens1.length) return [];
+            if (!tokens2 || !tokens2.length) return tokens1;
 
-        /**
-         * @ngdoc input
-         * @name input[checkbox]
-         *
-         * @description
-         * HTML checkbox.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} ngTrueValue The value to which the expression should be set when selected.
-         * @param {string=} ngFalseValue The value to which the expression should be set when not selected.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="checkbox-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.value1 = true;
-             $scope.value2 = 'YES'
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Value1: <input type="checkbox" ng-model="value1"> <br/>
-         Value2: <input type="checkbox" ng-model="value2"
-         ng-true-value="YES" ng-false-value="NO"> <br/>
-         <tt>value1 = {{value1}}</tt><br/>
-         <tt>value2 = {{value2}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         it('should change state', function() {
-            var value1 = element(by.binding('value1'));
-            var value2 = element(by.binding('value2'));
+            var values = [];
 
-            expect(value1.getText()).toContain('true');
-            expect(value2.getText()).toContain('YES');
+            outer:
+                for (var i = 0; i < tokens1.length; i++) {
+                    var token = tokens1[i];
+                    for (var j = 0; j < tokens2.length; j++) {
+                        if (token === tokens2[j]) continue outer;
+                    }
+                    values.push(token);
+                }
 
-            element(by.model('value1')).click();
-            element(by.model('value2')).click();
+            return values;
+        }
 
-            expect(value1.getText()).toContain('false');
-            expect(value2.getText()).toContain('NO');
-          });
-         </file>
-         </example>
-         */
-        'checkbox': checkboxInputType,
+        function split(classString) {
+            return classString && classString.split(' ');
+        }
 
-        'hidden': noop,
-        'button': noop,
-        'submit': noop,
-        'reset': noop,
-        'file': noop
-    };
+        function toClassString(classValue) {
+            var classString = classValue;
 
-// A helper function to call $setValidity and return the value / undefined,
-// a pattern that is repeated a lot in the input validation logic.
-    function validate(ctrl, validatorName, validity, value){
-        ctrl.$setValidity(validatorName, validity);
-        return validity ? value : undefined;
-    }
+            if (isArray(classValue)) {
+                classString = classValue.map(toClassString).join(' ');
+            } else if (isObject(classValue)) {
+                classString = Object.keys(classValue).
+                filter(function(key) { return classValue[key]; }).
+                join(' ');
+            }
 
+            return classString;
+        }
 
-    function addNativeHtml5Validators(ctrl, validatorName, element) {
-        var validity = element.prop('validity');
-        if (isObject(validity)) {
-            var validator = function(value) {
-                // Don't overwrite previous validation, don't consider valueMissing to apply (ng-required can
-                // perform the required validation)
-                if (!ctrl.$error[validatorName] && (validity.badInput || validity.customError ||
-                    validity.typeMismatch) && !validity.valueMissing) {
-                    ctrl.$setValidity(validatorName, false);
-                    return;
+        function toFlatValue(classValue) {
+            var flatValue = classValue;
+
+            if (isArray(classValue)) {
+                flatValue = classValue.map(toFlatValue);
+            } else if (isObject(classValue)) {
+                var hasUndefined = false;
+
+                flatValue = Object.keys(classValue).filter(function(key) {
+                    var value = classValue[key];
+
+                    if (!hasUndefined && isUndefined(value)) {
+                        hasUndefined = true;
+                    }
+
+                    return value;
+                });
+
+                if (hasUndefined) {
+                    // Prevent the `oneTimeLiteralWatchInterceptor` from unregistering
+                    // the watcher, by including at least one `undefined` value.
+                    flatValue.push(undefined);
                 }
-                return value;
-            };
-            ctrl.$parsers.push(validator);
+            }
+
+            return flatValue;
         }
     }
 
-    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        var validity = element.prop('validity');
-        // In composition mode, users are still inputing intermediate text buffer,
-        // hold the listener until composition is done.
-        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
-        if (!$sniffer.android) {
-            var composing = false;
+    /**
+     * @ngdoc directive
+     * @name ngClass
+     * @restrict AC
+     * @element ANY
+     *
+     * @description
+     * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
+     * an expression that represents all classes to be added.
+     *
+     * The directive operates in three different ways, depending on which of three types the expression
+     * evaluates to:
+     *
+     * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
+     * names.
+     *
+     * 2. If the expression evaluates to an object, then for each key-value pair of the
+     * object with a truthy value the corresponding key is used as a class name.
+     *
+     * 3. If the expression evaluates to an array, each element of the array should either be a string as in
+     * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
+     * to give you more control over what CSS classes appear. See the code below for an example of this.
+     *
+     *
+     * The directive won't add duplicate classes if a particular class was already set.
+     *
+     * When the expression changes, the previously added classes are removed and only then are the
+     * new classes added.
+     *
+     * @knownIssue
+     * You should not use {@link guide/interpolation interpolation} in the value of the `class`
+     * attribute, when using the `ngClass` directive on the same element.
+     * See {@link guide/interpolation#known-issues here} for more info.
+     *
+     * @animations
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#addClass addClass}       | just before the class is applied to the element   |
+     * | {@link ng.$animate#removeClass removeClass} | just before the class is removed from the element |
+     *
+     * ### ngClass and pre-existing CSS3 Transitions/Animations
+     The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
+     Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
+     any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
+     to view the step by step details of {@link $animate#addClass $animate.addClass} and
+     {@link $animate#removeClass $animate.removeClass}.
+     *
+     * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
+     *   of the evaluation can be a string representing space delimited class
+     *   names, an array, or a map of class names to boolean values. In the case of a map, the
+     *   names of the properties whose values are truthy will be added as css classes to the
+     *   element.
+     *
+     * @example
+     * ### Basic
+     <example name="ng-class">
+     <file name="index.html">
+     <p ng-class="{strike: deleted, bold: important, 'has-error': error}">Map Syntax Example</p>
+     <label>
+     <input type="checkbox" ng-model="deleted">
+     deleted (apply "strike" class)
+     </label><br>
+     <label>
+     <input type="checkbox" ng-model="important">
+     important (apply "bold" class)
+     </label><br>
+     <label>
+     <input type="checkbox" ng-model="error">
+     error (apply "has-error" class)
+     </label>
+     <hr>
+     <p ng-class="style">Using String Syntax</p>
+     <input type="text" ng-model="style"
+     placeholder="Type: bold strike red" aria-label="Type: bold strike red">
+     <hr>
+     <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
+     <input ng-model="style1"
+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
+     <input ng-model="style2"
+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
+     <input ng-model="style3"
+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
+     <hr>
+     <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
+     <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
+     <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
+     </file>
+     <file name="style.css">
+     .strike {
+           text-decoration: line-through;
+       }
+     .bold {
+           font-weight: bold;
+       }
+     .red {
+           color: red;
+       }
+     .has-error {
+           color: red;
+           background-color: yellow;
+       }
+     .orange {
+           color: orange;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     var ps = element.all(by.css('p'));
 
-            element.on('compositionstart', function(data) {
-                composing = true;
-            });
+     it('should let you toggle the class', function() {
 
-            element.on('compositionend', function() {
-                composing = false;
-                listener();
-            });
-        }
+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/has-error/);
 
-        var listener = function() {
-            if (composing) return;
-            var value = element.val();
+         element(by.model('important')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
 
-            // By default we will trim the value
-            // If the attribute ng-trim exists we will avoid trimming
-            // e.g. <input ng-model="foo" ng-trim="false">
-            if (toBoolean(attr.ngTrim || 'T')) {
-                value = trim(value);
-            }
+         element(by.model('error')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/has-error/);
+       });
 
-            if (ctrl.$viewValue !== value ||
-                    // If the value is still empty/falsy, and there is no `required` error, run validators
-                    // again. This enables HTML5 constraint validation errors to affect Angular validation
-                    // even when the first character entered causes an error.
-                (validity && value === '' && !validity.valueMissing)) {
-                if (scope.$$phase) {
-                    ctrl.$setViewValue(value);
-                } else {
-                    scope.$apply(function() {
-                        ctrl.$setViewValue(value);
-                    });
-                }
-            }
-        };
+     it('should let you toggle string example', function() {
+         expect(ps.get(1).getAttribute('class')).toBe('');
+         element(by.model('style')).clear();
+         element(by.model('style')).sendKeys('red');
+         expect(ps.get(1).getAttribute('class')).toBe('red');
+       });
 
-        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
-        // input event on backspace, delete or cut
-        if ($sniffer.hasEvent('input')) {
-            element.on('input', listener);
-        } else {
-            var timeout;
+     it('array example should have 3 classes', function() {
+         expect(ps.get(2).getAttribute('class')).toBe('');
+         element(by.model('style1')).sendKeys('bold');
+         element(by.model('style2')).sendKeys('strike');
+         element(by.model('style3')).sendKeys('red');
+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
+       });
 
-            var deferListener = function() {
-                if (!timeout) {
-                    timeout = $browser.defer(function() {
-                        listener();
-                        timeout = null;
-                    });
-                }
-            };
+     it('array with map example should have 2 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style4')).sendKeys('bold');
+         element(by.model('warning')).click();
+         expect(ps.last().getAttribute('class')).toBe('bold orange');
+       });
+     </file>
+     </example>
 
-            element.on('keydown', function(event) {
-                var key = event.keyCode;
+     @example
+     ### Animations
 
-                // ignore
-                //    command            modifiers                   arrows
-                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
+     The example below demonstrates how to perform animations using ngClass.
+
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-class">
+     <file name="index.html">
+     <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
+     <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
+     <br>
+     <span class="base-class" ng-class="myVar">Sample Text</span>
+     </file>
+     <file name="style.css">
+     .base-class {
+         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+       }
+
+     .base-class.my-class {
+         color: red;
+         font-size:3em;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-class', function() {
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+
+         element(by.id('setbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).
+           toMatch(/my-class/);
+
+         element(by.id('clearbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+       });
+     </file>
+     </example>
+     */
+    var ngClassDirective = classDirective('', true);
+
+    /**
+     * @ngdoc directive
+     * @name ngClassOdd
+     * @restrict AC
+     *
+     * @description
+     * The `ngClassOdd` and `ngClassEven` directives work exactly as
+     * {@link ng.directive:ngClass ngClass}, except they work in
+     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+     *
+     * This directive can be applied only within the scope of an
+     * {@link ng.directive:ngRepeat ngRepeat}.
+     *
+     * @element ANY
+     * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
+     *   of the evaluation can be a string representing space delimited class names or an array.
+     *
+     * @example
+     <example name="ng-class-odd">
+     <file name="index.html">
+     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+     <li ng-repeat="name in names">
+     <span ng-class-odd="'odd'" ng-class-even="'even'">
+     {{name}}
+     </span>
+     </li>
+     </ol>
+     </file>
+     <file name="style.css">
+     .odd {
+         color: red;
+       }
+     .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+     </example>
+     */
+    var ngClassOddDirective = classDirective('Odd', 0);
 
-                deferListener();
-            });
+    /**
+     * @ngdoc directive
+     * @name ngClassEven
+     * @restrict AC
+     *
+     * @description
+     * The `ngClassOdd` and `ngClassEven` directives work exactly as
+     * {@link ng.directive:ngClass ngClass}, except they work in
+     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+     *
+     * This directive can be applied only within the scope of an
+     * {@link ng.directive:ngRepeat ngRepeat}.
+     *
+     * @element ANY
+     * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
+     *   result of the evaluation can be a string representing space delimited class names or an array.
+     *
+     * @example
+     <example name="ng-class-even">
+     <file name="index.html">
+     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+     <li ng-repeat="name in names">
+     <span ng-class-odd="'odd'" ng-class-even="'even'">
+     {{name}} &nbsp; &nbsp; &nbsp;
+     </span>
+     </li>
+     </ol>
+     </file>
+     <file name="style.css">
+     .odd {
+         color: red;
+       }
+     .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+     </example>
+     */
+    var ngClassEvenDirective = classDirective('Even', 1);
 
-            // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
-            if ($sniffer.hasEvent('paste')) {
-                element.on('paste cut', deferListener);
-            }
+    /**
+     * @ngdoc directive
+     * @name ngCloak
+     * @restrict AC
+     *
+     * @description
+     * The `ngCloak` directive is used to prevent the AngularJS html template from being briefly
+     * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
+     * directive to avoid the undesirable flicker effect caused by the html template display.
+     *
+     * The directive can be applied to the `<body>` element, but the preferred usage is to apply
+     * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
+     * of the browser view.
+     *
+     * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
+     * `angular.min.js`.
+     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+     *
+     * ```css
+     * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+     *   display: none !important;
+     * }
+     * ```
+     *
+     * When this css rule is loaded by the browser, all html elements (including their children) that
+     * are tagged with the `ngCloak` directive are hidden. When AngularJS encounters this directive
+     * during the compilation of the template it deletes the `ngCloak` element attribute, making
+     * the compiled element visible.
+     *
+     * For the best result, the `angular.js` script must be loaded in the head section of the html
+     * document; alternatively, the css rule above must be included in the external stylesheet of the
+     * application.
+     *
+     * @element ANY
+     *
+     * @example
+     <example name="ng-cloak">
+     <file name="index.html">
+     <div id="template1" ng-cloak>{{ 'hello' }}</div>
+     <div id="template2" class="ng-cloak">{{ 'world' }}</div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should remove the template directive and css class', function() {
+         expect($('#template1').getAttribute('ng-cloak')).
+           toBeNull();
+         expect($('#template2').getAttribute('ng-cloak')).
+           toBeNull();
+       });
+     </file>
+     </example>
+     *
+     */
+    var ngCloakDirective = ngDirective({
+        compile: function(element, attr) {
+            attr.$set('ngCloak', undefined);
+            element.removeClass('ng-cloak');
         }
+    });
 
-        // if user paste into input using mouse on older browser
-        // or form autocomplete on newer browser, we need "change" event to catch it
-        element.on('change', listener);
+    /**
+     * @ngdoc directive
+     * @name ngController
+     *
+     * @description
+     * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
+     * supports the principles behind the Model-View-Controller design pattern.
+     *
+     * MVC components in angular:
+     *
+     * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
+     *   are accessed through bindings.
+     * * View — The template (HTML with data bindings) that is rendered into the View.
+     * * Controller — The `ngController` directive specifies a Controller class; the class contains business
+     *   logic behind the application to decorate the scope with functions and values
+     *
+     * Note that you can also attach controllers to the DOM by declaring it in a route definition
+     * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
+     * again using `ng-controller` in the template itself.  This will cause the controller to be attached
+     * and executed twice.
+     *
+     * @element ANY
+     * @scope
+     * @priority 500
+     * @param {expression} ngController Name of a constructor function registered with the current
+     * {@link ng.$controllerProvider $controllerProvider} or an {@link guide/expression expression}
+     * that on the current scope evaluates to a constructor function.
+     *
+     * The controller instance can be published into a scope property by specifying
+     * `ng-controller="as propertyName"`.
+     *
+     * If the current `$controllerProvider` is configured to use globals (via
+     * {@link ng.$controllerProvider#allowGlobals `$controllerProvider.allowGlobals()` }), this may
+     * also be the name of a globally accessible constructor function (deprecated, not recommended).
+     *
+     * @example
+     * Here is a simple form for editing user contact information. Adding, removing, clearing, and
+     * greeting are methods declared on the controller (see source tab). These methods can
+     * easily be called from the AngularJS markup. Any changes to the data are automatically reflected
+     * in the View without the need for a manual update.
+     *
+     * Two different declaration styles are included below:
+     *
+     * * one binds methods and properties directly onto the controller using `this`:
+     * `ng-controller="SettingsController1 as settings"`
+     * * one injects `$scope` into the controller:
+     * `ng-controller="SettingsController2"`
+     *
+     * The second option is more common in the AngularJS community, and is generally used in boilerplates
+     * and in this guide. However, there are advantages to binding properties directly to the controller
+     * and avoiding scope.
+     *
+     * * Using `controller as` makes it obvious which controller you are accessing in the template when
+     * multiple controllers apply to an element.
+     * * If you are writing your controllers as classes you have easier access to the properties and
+     * methods, which will appear on the scope, from inside the controller code.
+     * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
+     * inheritance masking primitives.
+     *
+     * This example demonstrates the `controller as` syntax.
+     *
+     * <example name="ngControllerAs" module="controllerAsExample">
+     *   <file name="index.html">
+     *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
+     *      <label>Name: <input type="text" ng-model="settings.name"/></label>
+     *      <button ng-click="settings.greet()">greet</button><br/>
+     *      Contact:
+     *      <ul>
+     *        <li ng-repeat="contact in settings.contacts">
+     *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
+     *             <option>phone</option>
+     *             <option>email</option>
+     *          </select>
+     *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+     *          <button ng-click="settings.clearContact(contact)">clear</button>
+     *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
+     *        </li>
+     *        <li><button ng-click="settings.addContact()">add</button></li>
+     *     </ul>
+     *    </div>
+     *   </file>
+     *   <file name="app.js">
+     *    angular.module('controllerAsExample', [])
+     *      .controller('SettingsController1', SettingsController1);
+     *
+     *    function SettingsController1() {
+     *      this.name = 'John Smith';
+     *      this.contacts = [
+     *        {type: 'phone', value: '408 555 1212'},
+     *        {type: 'email', value: 'john.smith@example.org'}
+     *      ];
+     *    }
+     *
+     *    SettingsController1.prototype.greet = function() {
+     *      alert(this.name);
+     *    };
+     *
+     *    SettingsController1.prototype.addContact = function() {
+     *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
+     *    };
+     *
+     *    SettingsController1.prototype.removeContact = function(contactToRemove) {
+     *     var index = this.contacts.indexOf(contactToRemove);
+     *      this.contacts.splice(index, 1);
+     *    };
+     *
+     *    SettingsController1.prototype.clearContact = function(contact) {
+     *      contact.type = 'phone';
+     *      contact.value = '';
+     *    };
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     it('should check controller as', function() {
+     *       var container = element(by.id('ctrl-as-exmpl'));
+     *         expect(container.element(by.model('settings.name'))
+     *           .getAttribute('value')).toBe('John Smith');
+     *
+     *       var firstRepeat =
+     *           container.element(by.repeater('contact in settings.contacts').row(0));
+     *       var secondRepeat =
+     *           container.element(by.repeater('contact in settings.contacts').row(1));
+     *
+     *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *           .toBe('408 555 1212');
+     *
+     *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *           .toBe('john.smith@example.org');
+     *
+     *       firstRepeat.element(by.buttonText('clear')).click();
+     *
+     *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *           .toBe('');
+     *
+     *       container.element(by.buttonText('add')).click();
+     *
+     *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
+     *           .element(by.model('contact.value'))
+     *           .getAttribute('value'))
+     *           .toBe('yourname@example.org');
+     *     });
+     *   </file>
+     * </example>
+     *
+     * This example demonstrates the "attach to `$scope`" style of controller.
+     *
+     * <example name="ngController" module="controllerExample">
+     *  <file name="index.html">
+     *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
+     *     <label>Name: <input type="text" ng-model="name"/></label>
+     *     <button ng-click="greet()">greet</button><br/>
+     *     Contact:
+     *     <ul>
+     *       <li ng-repeat="contact in contacts">
+     *         <select ng-model="contact.type" id="select_{{$index}}">
+     *            <option>phone</option>
+     *            <option>email</option>
+     *         </select>
+     *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+     *         <button ng-click="clearContact(contact)">clear</button>
+     *         <button ng-click="removeContact(contact)">X</button>
+     *       </li>
+     *       <li>[ <button ng-click="addContact()">add</button> ]</li>
+     *    </ul>
+     *   </div>
+     *  </file>
+     *  <file name="app.js">
+     *   angular.module('controllerExample', [])
+     *     .controller('SettingsController2', ['$scope', SettingsController2]);
+     *
+     *   function SettingsController2($scope) {
+     *     $scope.name = 'John Smith';
+     *     $scope.contacts = [
+     *       {type:'phone', value:'408 555 1212'},
+     *       {type:'email', value:'john.smith@example.org'}
+     *     ];
+     *
+     *     $scope.greet = function() {
+     *       alert($scope.name);
+     *     };
+     *
+     *     $scope.addContact = function() {
+     *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
+     *     };
+     *
+     *     $scope.removeContact = function(contactToRemove) {
+     *       var index = $scope.contacts.indexOf(contactToRemove);
+     *       $scope.contacts.splice(index, 1);
+     *     };
+     *
+     *     $scope.clearContact = function(contact) {
+     *       contact.type = 'phone';
+     *       contact.value = '';
+     *     };
+     *   }
+     *  </file>
+     *  <file name="protractor.js" type="protractor">
+     *    it('should check controller', function() {
+     *      var container = element(by.id('ctrl-exmpl'));
+     *
+     *      expect(container.element(by.model('name'))
+     *          .getAttribute('value')).toBe('John Smith');
+     *
+     *      var firstRepeat =
+     *          container.element(by.repeater('contact in contacts').row(0));
+     *      var secondRepeat =
+     *          container.element(by.repeater('contact in contacts').row(1));
+     *
+     *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *          .toBe('408 555 1212');
+     *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *          .toBe('john.smith@example.org');
+     *
+     *      firstRepeat.element(by.buttonText('clear')).click();
+     *
+     *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *          .toBe('');
+     *
+     *      container.element(by.buttonText('add')).click();
+     *
+     *      expect(container.element(by.repeater('contact in contacts').row(2))
+     *          .element(by.model('contact.value'))
+     *          .getAttribute('value'))
+     *          .toBe('yourname@example.org');
+     *    });
+     *  </file>
+     *</example>
 
-        ctrl.$render = function() {
-            element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue);
+     */
+    var ngControllerDirective = [function() {
+        return {
+            restrict: 'A',
+            scope: true,
+            controller: '@',
+            priority: 500
         };
+    }];
 
-        // pattern validator
-        var pattern = attr.ngPattern,
-            patternValidator,
-            match;
-
-        if (pattern) {
-            var validateRegex = function(regexp, value) {
-                return validate(ctrl, 'pattern', ctrl.$isEmpty(value) || regexp.test(value), value);
-            };
-            match = pattern.match(/^\/(.*)\/([gim]*)$/);
-            if (match) {
-                pattern = new RegExp(match[1], match[2]);
-                patternValidator = function(value) {
-                    return validateRegex(pattern, value);
-                };
-            } else {
-                patternValidator = function(value) {
-                    var patternObj = scope.$eval(pattern);
-
-                    if (!patternObj || !patternObj.test) {
-                        throw minErr('ngPattern')('noregexp',
-                            'Expected {0} to be a RegExp but was {1}. Element: {2}', pattern,
-                            patternObj, startingTag(element));
-                    }
-                    return validateRegex(patternObj, value);
-                };
-            }
-
-            ctrl.$formatters.push(patternValidator);
-            ctrl.$parsers.push(patternValidator);
-        }
-
-        // min length validator
-        if (attr.ngMinlength) {
-            var minlength = int(attr.ngMinlength);
-            var minLengthValidator = function(value) {
-                return validate(ctrl, 'minlength', ctrl.$isEmpty(value) || value.length >= minlength, value);
-            };
-
-            ctrl.$parsers.push(minLengthValidator);
-            ctrl.$formatters.push(minLengthValidator);
-        }
-
-        // max length validator
-        if (attr.ngMaxlength) {
-            var maxlength = int(attr.ngMaxlength);
-            var maxLengthValidator = function(value) {
-                return validate(ctrl, 'maxlength', ctrl.$isEmpty(value) || value.length <= maxlength, value);
-            };
-
-            ctrl.$parsers.push(maxLengthValidator);
-            ctrl.$formatters.push(maxLengthValidator);
-        }
-    }
-
-    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-        ctrl.$parsers.push(function(value) {
-            var empty = ctrl.$isEmpty(value);
-            if (empty || NUMBER_REGEXP.test(value)) {
-                ctrl.$setValidity('number', true);
-                return value === '' ? null : (empty ? value : parseFloat(value));
-            } else {
-                ctrl.$setValidity('number', false);
-                return undefined;
-            }
-        });
-
-        addNativeHtml5Validators(ctrl, 'number', element);
+    /**
+     * @ngdoc directive
+     * @name ngCsp
+     *
+     * @restrict A
+     * @element ANY
+     * @description
+     *
+     * AngularJS has some features that can conflict with certain restrictions that are applied when using
+     * [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) rules.
+     *
+     * If you intend to implement CSP with these rules then you must tell AngularJS not to use these
+     * features.
+     *
+     * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
+     *
+     *
+     * The following default rules in CSP affect AngularJS:
+     *
+     * * The use of `eval()`, `Function(string)` and similar functions to dynamically create and execute
+     * code from strings is forbidden. AngularJS makes use of this in the {@link $parse} service to
+     * provide a 30% increase in the speed of evaluating AngularJS expressions. (This CSP rule can be
+     * disabled with the CSP keyword `unsafe-eval`, but it is generally not recommended as it would
+     * weaken the protections offered by CSP.)
+     *
+     * * The use of inline resources, such as inline `<script>` and `<style>` elements, are forbidden.
+     * This prevents apps from injecting custom styles directly into the document. AngularJS makes use of
+     * this to include some CSS rules (e.g. {@link ngCloak} and {@link ngHide}). To make these
+     * directives work when a CSP rule is blocking inline styles, you must link to the `angular-csp.css`
+     * in your HTML manually. (This CSP rule can be disabled with the CSP keyword `unsafe-inline`, but
+     * it is generally not recommended as it would weaken the protections offered by CSP.)
+     *
+     * If you do not provide `ngCsp` then AngularJS tries to autodetect if CSP is blocking dynamic code
+     * creation from strings (e.g., `unsafe-eval` not specified in CSP header) and automatically
+     * deactivates this feature in the {@link $parse} service. This autodetection, however, triggers a
+     * CSP error to be logged in the console:
+     *
+     * ```
+     * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+     * script in the following Content Security Policy directive: "default-src 'self'". Note that
+     * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+     * ```
+     *
+     * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+     * directive on an element of the HTML document that appears before the `<script>` tag that loads
+     * the `angular.js` file.
+     *
+     * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+     *
+     * You can specify which of the CSP related AngularJS features should be deactivated by providing
+     * a value for the `ng-csp` attribute. The options are as follows:
+     *
+     * * no-inline-style: this stops AngularJS from injecting CSS styles into the DOM
+     *
+     * * no-unsafe-eval: this stops AngularJS from optimizing $parse with unsafe eval of strings
+     *
+     * You can use these values in the following combinations:
+     *
+     *
+     * * No declaration means that AngularJS will assume that you can do inline styles, but it will do
+     * a runtime check for unsafe-eval. E.g. `<body>`. This is backwardly compatible with previous
+     * versions of AngularJS.
+     *
+     * * A simple `ng-csp` (or `data-ng-csp`) attribute will tell AngularJS to deactivate both inline
+     * styles and unsafe eval. E.g. `<body ng-csp>`. This is backwardly compatible with previous
+     * versions of AngularJS.
+     *
+     * * Specifying only `no-unsafe-eval` tells AngularJS that we must not use eval, but that we can
+     * inject inline styles. E.g. `<body ng-csp="no-unsafe-eval">`.
+     *
+     * * Specifying only `no-inline-style` tells AngularJS that we must not inject styles, but that we can
+     * run eval - no automatic check for unsafe eval will occur. E.g. `<body ng-csp="no-inline-style">`
+     *
+     * * Specifying both `no-unsafe-eval` and `no-inline-style` tells AngularJS that we must not inject
+     * styles nor use eval, which is the same as an empty: ng-csp.
+     * E.g.`<body ng-csp="no-inline-style;no-unsafe-eval">`
+     *
+     * @example
+     *
+     * This example shows how to apply the `ngCsp` directive to the `html` tag.
+     ```html
+     <!doctype html>
+     <html ng-app ng-csp>
+     ...
+     ...
+     </html>
+     ```
 
-        ctrl.$formatters.push(function(value) {
-            return ctrl.$isEmpty(value) ? '' : '' + value;
-        });
+     <!-- Note: the `.csp` suffix in the example name triggers CSP mode in our http server! -->
+     <example name="example.csp" module="cspExample" ng-csp="true">
+     <file name="index.html">
+     <div ng-controller="MainController as ctrl">
+     <div>
+     <button ng-click="ctrl.inc()" id="inc">Increment</button>
+     <span id="counter">
+     {{ctrl.counter}}
+     </span>
+     </div>
 
-        if (attr.min) {
-            var minValidator = function(value) {
-                var min = parseFloat(attr.min);
-                return validate(ctrl, 'min', ctrl.$isEmpty(value) || value >= min, value);
+     <div>
+     <button ng-click="ctrl.evil()" id="evil">Evil</button>
+     <span id="evilError">
+     {{ctrl.evilError}}
+     </span>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('cspExample', [])
+     .controller('MainController', function MainController() {
+            this.counter = 0;
+            this.inc = function() {
+              this.counter++;
             };
-
-            ctrl.$parsers.push(minValidator);
-            ctrl.$formatters.push(minValidator);
-        }
-
-        if (attr.max) {
-            var maxValidator = function(value) {
-                var max = parseFloat(attr.max);
-                return validate(ctrl, 'max', ctrl.$isEmpty(value) || value <= max, value);
+            this.evil = function() {
+              try {
+                eval('1+2'); // eslint-disable-line no-eval
+              } catch (e) {
+                this.evilError = e.message;
+              }
             };
+          });
+     </file>
+     <file name="protractor.js" type="protractor">
+     var util, webdriver;
 
-            ctrl.$parsers.push(maxValidator);
-            ctrl.$formatters.push(maxValidator);
-        }
+     var incBtn = element(by.id('inc'));
+     var counter = element(by.id('counter'));
+     var evilBtn = element(by.id('evil'));
+     var evilError = element(by.id('evilError'));
 
-        ctrl.$formatters.push(function(value) {
-            return validate(ctrl, 'number', ctrl.$isEmpty(value) || isNumber(value), value);
+     function getAndClearSevereErrors() {
+        return browser.manage().logs().get('browser').then(function(browserLog) {
+          return browserLog.filter(function(logEntry) {
+            return logEntry.level.value > webdriver.logging.Level.WARNING.value;
+          });
         });
-    }
-
-    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-        var urlValidator = function(value) {
-            return validate(ctrl, 'url', ctrl.$isEmpty(value) || URL_REGEXP.test(value), value);
-        };
-
-        ctrl.$formatters.push(urlValidator);
-        ctrl.$parsers.push(urlValidator);
-    }
-
-    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-        var emailValidator = function(value) {
-            return validate(ctrl, 'email', ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value), value);
-        };
+      }
 
-        ctrl.$formatters.push(emailValidator);
-        ctrl.$parsers.push(emailValidator);
-    }
+     function clearErrors() {
+        getAndClearSevereErrors();
+      }
 
-    function radioInputType(scope, element, attr, ctrl) {
-        // make the name unique, if not defined
-        if (isUndefined(attr.name)) {
-            element.attr('name', nextUid());
-        }
+     function expectNoErrors() {
+        getAndClearSevereErrors().then(function(filteredLog) {
+          expect(filteredLog.length).toEqual(0);
+          if (filteredLog.length) {
+            console.log('browser console errors: ' + util.inspect(filteredLog));
+          }
+        });
+      }
 
-        element.on('click', function() {
-            if (element[0].checked) {
-                scope.$apply(function() {
-                    ctrl.$setViewValue(attr.value);
-                });
+     function expectError(regex) {
+        getAndClearSevereErrors().then(function(filteredLog) {
+          var found = false;
+          filteredLog.forEach(function(log) {
+            if (log.message.match(regex)) {
+              found = true;
             }
+          });
+          if (!found) {
+            throw new Error('expected an error that matches ' + regex);
+          }
         });
+      }
 
-        ctrl.$render = function() {
-            var value = attr.value;
-            element[0].checked = (value == ctrl.$viewValue);
-        };
-
-        attr.$observe('value', ctrl.$render);
-    }
-
-    function checkboxInputType(scope, element, attr, ctrl) {
-        var trueValue = attr.ngTrueValue,
-            falseValue = attr.ngFalseValue;
+     beforeEach(function() {
+        util = require('util');
+        webdriver = require('selenium-webdriver');
+      });
 
-        if (!isString(trueValue)) trueValue = true;
-        if (!isString(falseValue)) falseValue = false;
+     // For now, we only test on Chrome,
+     // as Safari does not load the page with Protractor's injected scripts,
+     // and Firefox webdriver always disables content security policy (#6358)
+     if (browser.params.browser !== 'chrome') {
+        return;
+      }
 
-        element.on('click', function() {
-            scope.$apply(function() {
-                ctrl.$setViewValue(element[0].checked);
-            });
+     it('should not report errors when the page is loaded', function() {
+        // clear errors so we are not dependent on previous tests
+        clearErrors();
+        // Need to reload the page as the page is already loaded when
+        // we come here
+        browser.driver.getCurrentUrl().then(function(url) {
+          browser.get(url);
         });
+        expectNoErrors();
+      });
 
-        ctrl.$render = function() {
-            element[0].checked = ctrl.$viewValue;
-        };
-
-        // Override the standard `$isEmpty` because a value of `false` means empty in a checkbox.
-        ctrl.$isEmpty = function(value) {
-            return value !== trueValue;
-        };
-
-        ctrl.$formatters.push(function(value) {
-            return value === trueValue;
-        });
+     it('should evaluate expressions', function() {
+        expect(counter.getText()).toEqual('0');
+        incBtn.click();
+        expect(counter.getText()).toEqual('1');
+        expectNoErrors();
+      });
 
-        ctrl.$parsers.push(function(value) {
-            return value ? trueValue : falseValue;
-        });
-    }
+     it('should throw and report an error when using "eval"', function() {
+        evilBtn.click();
+        expect(evilError.getText()).toMatch(/Content Security Policy/);
+        expectError(/Content Security Policy/);
+      });
+     </file>
+     </example>
+     */
 
+// `ngCsp` is not implemented as a proper directive any more, because we need it be processed while
+// we bootstrap the app (before `$parse` is instantiated). For this reason, we just have the `csp()`
+// fn that looks for the `ng-csp` attribute anywhere in the current doc.
 
     /**
      * @ngdoc directive
-     * @name textarea
-     * @restrict E
+     * @name ngClick
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
      * @description
-     * HTML textarea element control with angular data-binding. The data-binding and validation
-     * properties of this element are exactly the same as those of the
-     * {@link ng.directive:input input element}.
+     * The ngClick directive allows you to specify custom behavior when
+     * an element is clicked.
      *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} required Sets `required` validation error key if the value is not entered.
-     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-     *    `required` when you want to data-bind to the `required` attribute.
-     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-     *    minlength.
-     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
-     * @param {string=} ngChange Angular expression to be executed when input changes due to user
-     *    interaction with the input element.
+     * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
+     * click. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-click">
+     <file name="index.html">
+     <button ng-click="count = count + 1" ng-init="count=0">
+     Increment
+     </button>
+     <span>
+     count: {{count}}
+     </span>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-click', function() {
+         expect(element(by.binding('count')).getText()).toMatch('0');
+         element(by.css('button')).click();
+         expect(element(by.binding('count')).getText()).toMatch('1');
+       });
+     </file>
+     </example>
      */
+    /*
+ * A collection of directives that allows creation of custom event handlers that are defined as
+ * AngularJS expressions and are compiled and executed within the current scope.
+ */
+    var ngEventDirectives = {};
 
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+    var forceAsyncEvents = {
+        'blur': true,
+        'focus': true
+    };
+    forEach(
+        'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+        function(eventName) {
+            var directiveName = directiveNormalize('ng-' + eventName);
+            ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+                return {
+                    restrict: 'A',
+                    compile: function($element, attr) {
+                        // NOTE:
+                        // We expose the powerful `$event` object on the scope that provides access to the Window,
+                        // etc. This is OK, because expressions are not sandboxed any more (and the expression
+                        // sandbox was never meant to be a security feature anyway).
+                        var fn = $parse(attr[directiveName]);
+                        return function ngEventHandler(scope, element) {
+                            element.on(eventName, function(event) {
+                                var callback = function() {
+                                    fn(scope, {$event: event});
+                                };
+                                if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                                    scope.$evalAsync(callback);
+                                } else {
+                                    scope.$apply(callback);
+                                }
+                            });
+                        };
+                    }
+                };
+            }];
+        }
+    );
 
     /**
      * @ngdoc directive
-     * @name input
-     * @restrict E
+     * @name ngDblclick
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
      * @description
-     * HTML input element control with angular data-binding. Input control follows HTML5 input types
-     * and polyfills the HTML5 validation behavior for older browsers.
+     * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
      *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} required Sets `required` validation error key if the value is not entered.
-     * @param {boolean=} ngRequired Sets `required` attribute if set to true
-     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-     *    minlength.
-     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
-     * @param {string=} ngChange Angular expression to be executed when input changes due to user
-     *    interaction with the input element.
+     * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
+     * a dblclick. (The Event object is available as `$event`)
      *
      * @example
-     <example name="input-directive">
+     <example name="ng-dblclick">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.user = {name: 'guest', last: 'visitor'};
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <form name="myForm">
-     User name: <input type="text" name="userName" ng-model="user.name" required>
-     <span class="error" ng-show="myForm.userName.$error.required">
-     Required!</span><br>
-     Last name: <input type="text" name="lastName" ng-model="user.last"
-     ng-minlength="3" ng-maxlength="10">
-     <span class="error" ng-show="myForm.lastName.$error.minlength">
-     Too short!</span>
-     <span class="error" ng-show="myForm.lastName.$error.maxlength">
-     Too long!</span><br>
-     </form>
-     <hr>
-     <tt>user = {{user}}</tt><br/>
-     <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br>
-     <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br>
-     <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br>
-     <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br>
-     <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
-     <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br>
-     <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var user = element(by.binding('{{user}}'));
-     var userNameValid = element(by.binding('myForm.userName.$valid'));
-     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
-     var lastNameError = element(by.binding('myForm.lastName.$error'));
-     var formValid = element(by.binding('myForm.$valid'));
-     var userNameInput = element(by.model('user.name'));
-     var userLastInput = element(by.model('user.last'));
-
-     it('should initialize to model', function() {
-          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
-          expect(userNameValid.getText()).toContain('true');
-          expect(formValid.getText()).toContain('true');
-        });
-
-     it('should be invalid if empty when required', function() {
-          userNameInput.clear();
-          userNameInput.sendKeys('');
-
-          expect(user.getText()).toContain('{"last":"visitor"}');
-          expect(userNameValid.getText()).toContain('false');
-          expect(formValid.getText()).toContain('false');
-        });
-
-     it('should be valid if empty when min length is set', function() {
-          userLastInput.clear();
-          userLastInput.sendKeys('');
-
-          expect(user.getText()).toContain('{"name":"guest","last":""}');
-          expect(lastNameValid.getText()).toContain('true');
-          expect(formValid.getText()).toContain('true');
-        });
-
-     it('should be invalid if less than required min length', function() {
-          userLastInput.clear();
-          userLastInput.sendKeys('xx');
-
-          expect(user.getText()).toContain('{"name":"guest"}');
-          expect(lastNameValid.getText()).toContain('false');
-          expect(lastNameError.getText()).toContain('minlength');
-          expect(formValid.getText()).toContain('false');
-        });
-
-     it('should be invalid if longer than max length', function() {
-          userLastInput.clear();
-          userLastInput.sendKeys('some ridiculously long name');
-
-          expect(user.getText()).toContain('{"name":"guest"}');
-          expect(lastNameValid.getText()).toContain('false');
-          expect(lastNameError.getText()).toContain('maxlength');
-          expect(formValid.getText()).toContain('false');
-        });
+     <button ng-dblclick="count = count + 1" ng-init="count=0">
+     Increment (on double click)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
+     */
+
+
+    /**
+     * @ngdoc directive
+     * @name ngMousedown
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+     *
+     * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
+     * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-mousedown">
+     <file name="index.html">
+     <button ng-mousedown="count = count + 1" ng-init="count=0">
+     Increment (on mouse down)
+     </button>
+     count: {{count}}
      </file>
      </example>
      */
-    var inputDirective = ['$browser', '$sniffer', function($browser, $sniffer) {
-        return {
-            restrict: 'E',
-            require: '?ngModel',
-            link: function(scope, element, attr, ctrl) {
-                if (ctrl) {
-                    (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrl, $sniffer,
-                        $browser);
-                }
-            }
-        };
-    }];
 
-    var VALID_CLASS = 'ng-valid',
-        INVALID_CLASS = 'ng-invalid',
-        PRISTINE_CLASS = 'ng-pristine',
-        DIRTY_CLASS = 'ng-dirty';
 
     /**
-     * @ngdoc type
-     * @name ngModel.NgModelController
-     *
-     * @property {string} $viewValue Actual string value in the view.
-     * @property {*} $modelValue The value in the model, that the control is bound to.
-     * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
-     the control reads value from the DOM.  Each function is called, in turn, passing the value
-     through to the next. The last return value is used to populate the model.
-     Used to sanitize / convert the value as well as validation. For validation,
-     the parsers should update the validity state using
-     {@link ngModel.NgModelController#$setValidity $setValidity()},
-     and return `undefined` for invalid values.
-
+     * @ngdoc directive
+     * @name ngMouseup
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
-     * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
-     the model value changes. Each function is called, in turn, passing the value through to the
-     next. Used to format / convert values for display in the control and validation.
-     *      ```js
-     *      function formatter(value) {
- *        if (value) {
- *          return value.toUpperCase();
- *        }
- *      }
-     *      ngModel.$formatters.push(formatter);
-     *      ```
-     *
-     * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
-     *     view value has changed. It is called with no arguments, and its return value is ignored.
-     *     This can be used in place of additional $watches against the model value.
+     * @description
+     * Specify custom behavior on mouseup event.
      *
-     * @property {Object} $error An object hash with all errors as keys.
+     * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
+     * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * @property {boolean} $pristine True if user has not interacted with the control yet.
-     * @property {boolean} $dirty True if user has already interacted with the control.
-     * @property {boolean} $valid True if there is no error.
-     * @property {boolean} $invalid True if at least one error on the control.
+     * @example
+     <example name="ng-mouseup">
+     <file name="index.html">
+     <button ng-mouseup="count = count + 1" ng-init="count=0">
+     Increment (on mouse up)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngMouseover
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
      * @description
+     * Specify custom behavior on mouseover event.
      *
-     * `NgModelController` provides API for the `ng-model` directive. The controller contains
-     * services for data-binding, validation, CSS updates, and value formatting and parsing. It
-     * purposefully does not contain any logic which deals with DOM rendering or listening to
-     * DOM events. Such DOM related logic should be provided by other directives which make use of
-     * `NgModelController` for data-binding.
-     *
-     * ## Custom Control Example
-     * This example shows how to use `NgModelController` with a custom control to achieve
-     * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
-     * collaborate together to achieve the desired result.
-     *
-     * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element
-     * contents be edited in place by the user.  This will not work on older browsers.
+     * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
+     * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * <example name="NgModelController" module="customControl">
-     <file name="style.css">
-     [contenteditable] {
-        border: 1px solid black;
-        background-color: white;
-        min-height: 20px;
-      }
-
-     .ng-invalid {
-        border: 1px solid red;
-      }
-
+     * @example
+     <example name="ng-mouseover">
+     <file name="index.html">
+     <button ng-mouseover="count = count + 1" ng-init="count=0">
+     Increment (when mouse is over)
+     </button>
+     count: {{count}}
      </file>
-     <file name="script.js">
-     angular.module('customControl', []).
-     directive('contenteditable', function() {
-          return {
-            restrict: 'A', // only activate on element attribute
-            require: '?ngModel', // get a hold of NgModelController
-            link: function(scope, element, attrs, ngModel) {
-              if(!ngModel) return; // do nothing if no ng-model
-
-              // Specify how UI should be updated
-              ngModel.$render = function() {
-                element.html(ngModel.$viewValue || '');
-              };
+     </example>
+     */
 
-              // Listen for change events to enable binding
-              element.on('blur keyup change', function() {
-                scope.$apply(read);
-              });
-              read(); // initialize
 
-              // Write data to the model
-              function read() {
-                var html = element.html();
-                // When we clear the content editable the browser leaves a <br> behind
-                // If strip-br attribute is provided then we strip this out
-                if( attrs.stripBr && html == '<br>' ) {
-                  html = '';
-                }
-                ngModel.$setViewValue(html);
-              }
-            }
-          };
-        });
-     </file>
+    /**
+     * @ngdoc directive
+     * @name ngMouseenter
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on mouseenter event.
+     *
+     * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
+     * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-mouseenter">
      <file name="index.html">
-     <form name="myForm">
-     <div contenteditable
-     name="myWidget" ng-model="userContent"
-     strip-br="true"
-     required>Change me!</div>
-     <span ng-show="myForm.myWidget.$error.required">Required!</span>
-     <hr>
-     <textarea ng-model="userContent"></textarea>
-     </form>
+     <button ng-mouseenter="count = count + 1" ng-init="count=0">
+     Increment (when mouse enters)
+     </button>
+     count: {{count}}
      </file>
-     <file name="protractor.js" type="protractor">
-     it('should data-bind and become invalid', function() {
-      if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') {
-        // SafariDriver can't handle contenteditable
-        // and Firefox driver can't clear contenteditables very well
-        return;
-      }
-      var contentEditable = element(by.css('[contenteditable]'));
-      var content = 'Change me!';
+     </example>
+     */
 
-      expect(contentEditable.getText()).toEqual(content);
 
-      contentEditable.clear();
-      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
-      expect(contentEditable.getText()).toEqual('');
-      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
-    });
-     </file>
-     * </example>
+    /**
+     * @ngdoc directive
+     * @name ngMouseleave
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on mouseleave event.
      *
+     * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
+     * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
      *
+     * @example
+     <example name="ng-mouseleave">
+     <file name="index.html">
+     <button ng-mouseleave="count = count + 1" ng-init="count=0">
+     Increment (when mouse leaves)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
      */
-    var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate',
-        function($scope, $exceptionHandler, $attr, $element, $parse, $animate) {
-            this.$viewValue = Number.NaN;
-            this.$modelValue = Number.NaN;
-            this.$parsers = [];
-            this.$formatters = [];
-            this.$viewChangeListeners = [];
-            this.$pristine = true;
-            this.$dirty = false;
-            this.$valid = true;
-            this.$invalid = false;
-            this.$name = $attr.name;
-
-            var ngModelGet = $parse($attr.ngModel),
-                ngModelSet = ngModelGet.assign;
-
-            if (!ngModelSet) {
-                throw minErr('ngModel')('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
-                    $attr.ngModel, startingTag($element));
-            }
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$render
-             *
-             * @description
-             * Called when the view needs to be updated. It is expected that the user of the ng-model
-             * directive will implement this method.
-             */
-            this.$render = noop;
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$isEmpty
-             *
-             * @description
-             * This is called when we need to determine if the value of the input is empty.
-             *
-             * For instance, the required directive does this to work out if the input has data or not.
-             * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
-             *
-             * You can override this for input directives whose concept of being empty is different to the
-             * default. The `checkboxInputType` directive does this because in its case a value of `false`
-             * implies empty.
-             *
-             * @param {*} value Reference to check.
-             * @returns {boolean} True if `value` is empty.
-             */
-            this.$isEmpty = function(value) {
-                return isUndefined(value) || value === '' || value === null || value !== value;
-            };
-
-            var parentForm = $element.inheritedData('$formController') || nullFormCtrl,
-                invalidCount = 0, // used to easily determine if we are valid
-                $error = this.$error = {}; // keep invalid keys here
-
-
-            // Setup initial state of the control
-            $element.addClass(PRISTINE_CLASS);
-            toggleValidCss(true);
-
-            // convenience method for easy toggling of classes
-            function toggleValidCss(isValid, validationErrorKey) {
-                validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-                $animate.removeClass($element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
-                $animate.addClass($element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
-            }
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$setValidity
-             *
-             * @description
-             * Change the validity state, and notifies the form when the control changes validity. (i.e. it
-             * does not notify form if given validator is already marked as invalid).
-             *
-             * This method should be called by validators - i.e. the parser or formatter functions.
-             *
-             * @param {string} validationErrorKey Name of the validator. the `validationErrorKey` will assign
-             *        to `$error[validationErrorKey]=isValid` so that it is available for data-binding.
-             *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
-             *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
-             *        class and can be bound to as  `{{someForm.someControl.$error.myError}}` .
-             * @param {boolean} isValid Whether the current state is valid (true) or invalid (false).
-             */
-            this.$setValidity = function(validationErrorKey, isValid) {
-                // Purposeful use of ! here to cast isValid to boolean in case it is undefined
-                // jshint -W018
-                if ($error[validationErrorKey] === !isValid) return;
-                // jshint +W018
-
-                if (isValid) {
-                    if ($error[validationErrorKey]) invalidCount--;
-                    if (!invalidCount) {
-                        toggleValidCss(true);
-                        this.$valid = true;
-                        this.$invalid = false;
-                    }
-                } else {
-                    toggleValidCss(false);
-                    this.$invalid = true;
-                    this.$valid = false;
-                    invalidCount++;
-                }
-
-                $error[validationErrorKey] = !isValid;
-                toggleValidCss(isValid, validationErrorKey);
-
-                parentForm.$setValidity(validationErrorKey, isValid, this);
-            };
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$setPristine
-             *
-             * @description
-             * Sets the control to its pristine state.
-             *
-             * This method can be called to remove the 'ng-dirty' class and set the control to its pristine
-             * state (ng-pristine class).
-             */
-            this.$setPristine = function () {
-                this.$dirty = false;
-                this.$pristine = true;
-                $animate.removeClass($element, DIRTY_CLASS);
-                $animate.addClass($element, PRISTINE_CLASS);
-            };
 
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$setViewValue
-             *
-             * @description
-             * Update the view value.
-             *
-             * This method should be called when the view value changes, typically from within a DOM event handler.
-             * For example {@link ng.directive:input input} and
-             * {@link ng.directive:select select} directives call it.
-             *
-             * It will update the $viewValue, then pass this value through each of the functions in `$parsers`,
-             * which includes any validators. The value that comes out of this `$parsers` pipeline, be applied to
-             * `$modelValue` and the **expression** specified in the `ng-model` attribute.
-             *
-             * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called.
-             *
-             * Note that calling this function does not trigger a `$digest`.
-             *
-             * @param {string} value Value from the view.
-             */
-            this.$setViewValue = function(value) {
-                this.$viewValue = value;
-
-                // change to dirty
-                if (this.$pristine) {
-                    this.$dirty = true;
-                    this.$pristine = false;
-                    $animate.removeClass($element, PRISTINE_CLASS);
-                    $animate.addClass($element, DIRTY_CLASS);
-                    parentForm.$setDirty();
-                }
 
-                forEach(this.$parsers, function(fn) {
-                    value = fn(value);
-                });
-
-                if (this.$modelValue !== value) {
-                    this.$modelValue = value;
-                    ngModelSet($scope, value);
-                    forEach(this.$viewChangeListeners, function(listener) {
-                        try {
-                            listener();
-                        } catch(e) {
-                            $exceptionHandler(e);
-                        }
-                    });
-                }
-            };
+    /**
+     * @ngdoc directive
+     * @name ngMousemove
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on mousemove event.
+     *
+     * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
+     * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-mousemove">
+     <file name="index.html">
+     <button ng-mousemove="count = count + 1" ng-init="count=0">
+     Increment (when mouse moves)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
+     */
 
-            // model -> value
-            var ctrl = this;
 
-            $scope.$watch(function ngModelWatch() {
-                var value = ngModelGet($scope);
+    /**
+     * @ngdoc directive
+     * @name ngKeydown
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on keydown event.
+     *
+     * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
+     * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     *
+     * @example
+     <example name="ng-keydown">
+     <file name="index.html">
+     <input ng-keydown="count = count + 1" ng-init="count=0">
+     key down count: {{count}}
+     </file>
+     </example>
+     */
 
-                // if scope model value and ngModel value are out of sync
-                if (ctrl.$modelValue !== value) {
 
-                    var formatters = ctrl.$formatters,
-                        idx = formatters.length;
+    /**
+     * @ngdoc directive
+     * @name ngKeyup
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on keyup event.
+     *
+     * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
+     * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     *
+     * @example
+     <example name="ng-keyup">
+     <file name="index.html">
+     <p>Typing in the input box below updates the key count</p>
+     <input ng-keyup="count = count + 1" ng-init="count=0"> key up count: {{count}}
 
-                    ctrl.$modelValue = value;
-                    while(idx--) {
-                        value = formatters[idx](value);
-                    }
+     <p>Typing in the input box below updates the keycode</p>
+     <input ng-keyup="event=$event">
+     <p>event keyCode: {{ event.keyCode }}</p>
+     <p>event altKey: {{ event.altKey }}</p>
+     </file>
+     </example>
+     */
 
-                    if (ctrl.$viewValue !== value) {
-                        ctrl.$viewValue = value;
-                        ctrl.$render();
-                    }
-                }
 
-                return value;
-            });
-        }];
+    /**
+     * @ngdoc directive
+     * @name ngKeypress
+     * @restrict A
+     * @element ANY
+     *
+     * @description
+     * Specify custom behavior on keypress event.
+     *
+     * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
+     * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
+     * and can be interrogated for keyCode, altKey, etc.)
+     *
+     * @example
+     <example name="ng-keypress">
+     <file name="index.html">
+     <input ng-keypress="count = count + 1" ng-init="count=0">
+     key press count: {{count}}
+     </file>
+     </example>
+     */
 
 
     /**
      * @ngdoc directive
-     * @name ngModel
-     *
-     * @element input
+     * @name ngSubmit
+     * @restrict A
+     * @element form
+     * @priority 0
      *
      * @description
-     * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
-     * property on the scope using {@link ngModel.NgModelController NgModelController},
-     * which is created and exposed by this directive.
+     * Enables binding AngularJS expressions to onsubmit events.
      *
-     * `ngModel` is responsible for:
+     * Additionally it prevents the default action (which for form means sending the request to the
+     * server and reloading the current page), but only if the form does not contain `action`,
+     * `data-action`, or `x-action` attributes.
      *
-     * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
-     *   require.
-     * - Providing validation behavior (i.e. required, number, email, url).
-     * - Keeping the state of the control (valid/invalid, dirty/pristine, validation errors).
-     * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`) including animations.
-     * - Registering the control with its parent {@link ng.directive:form form}.
+     * <div class="alert alert-warning">
+     * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+     * `ngSubmit` handlers together. See the
+     * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+     * for a detailed discussion of when `ngSubmit` may be triggered.
+     * </div>
      *
-     * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
-     * current scope. If the property doesn't already exist on this scope, it will be created
-     * implicitly and added to the scope.
+     * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
+     * ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * For best practices on using `ngModel`, see:
+     * @example
+     <example module="submitExample" name="ng-submit">
+     <file name="index.html">
+     <script>
+     angular.module('submitExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+            $scope.list = [];
+            $scope.text = 'hello';
+            $scope.submit = function() {
+              if ($scope.text) {
+                $scope.list.push(this.text);
+                $scope.text = '';
+              }
+            };
+          }]);
+     </script>
+     <form ng-submit="submit()" ng-controller="ExampleController">
+     Enter text and hit enter:
+     <input type="text" ng-model="text" name="text" />
+     <input type="submit" id="submit" value="Submit" />
+     <pre>list={{list}}</pre>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-submit', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+         expect(element(by.model('text')).getAttribute('value')).toBe('');
+       });
+     it('should ignore empty strings', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+        });
+     </file>
+     </example>
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngFocus
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
      *
-     *  - [https://github.com/angular/angular.js/wiki/Understanding-Scopes]
+     * @description
+     * Specify custom behavior on focus event.
      *
-     * For basic examples, how to use `ngModel`, see:
+     * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+     * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+     * during an `$apply` to ensure a consistent state.
      *
-     *  - {@link ng.directive:input input}
-     *    - {@link input[text] text}
-     *    - {@link input[checkbox] checkbox}
-     *    - {@link input[radio] radio}
-     *    - {@link input[number] number}
-     *    - {@link input[email] email}
-     *    - {@link input[url] url}
-     *  - {@link ng.directive:select select}
-     *  - {@link ng.directive:textarea textarea}
+     * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
+     * focus. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * # CSS classes
-     * The following CSS classes are added and removed on the associated input/select/textarea element
-     * depending on the validity of the model.
+     * @example
+     * See {@link ng.directive:ngClick ngClick}
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngBlur
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
      *
-     *  - `ng-valid` is set if the model is valid.
-     *  - `ng-invalid` is set if the model is invalid.
-     *  - `ng-pristine` is set if the model is pristine.
-     *  - `ng-dirty` is set if the model is dirty.
+     * @description
+     * Specify custom behavior on blur event.
      *
-     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+     * an element has lost focus.
      *
-     * ## Animation Hooks
+     * Note: As the `blur` event is executed synchronously also during DOM manipulations
+     * (e.g. removing a focussed input),
+     * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+     * during an `$apply` to ensure a consistent state.
      *
-     * Animations within models are triggered when any of the associated CSS classes are added and removed
-     * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`,
-     * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
-     * The animations that are triggered within ngModel are similar to how they work in ngClass and
-     * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+     * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
+     * blur. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * The following example shows a simple way to utilize CSS transitions to style an input element
-     * that has been rendered as invalid after it has been validated:
+     * @example
+     * See {@link ng.directive:ngClick ngClick}
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngCopy
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
      *
-     * <pre>
-     * //be sure to include ngAnimate as a module to hook into more
-     * //advanced animations
-     * .my-input {
- *   transition:0.5s linear all;
- *   background: white;
- * }
-     * .my-input.ng-invalid {
- *   background: red;
- *   color:white;
- * }
-     * </pre>
+     * @description
+     * Specify custom behavior on copy event.
+     *
+     * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
+     * copy. ({@link guide/expression#-event- Event object is available as `$event`})
      *
      * @example
-     * <example deps="angular-animate.js" animations="true" fixBase="true">
+     <example name="ng-copy">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-          $scope.val = '1';
-        }
-     </script>
-     <style>
-     .my-input {
-           -webkit-transition:all linear 0.5s;
-           transition:all linear 0.5s;
-           background: transparent;
-         }
-     .my-input.ng-invalid {
-           color:white;
-           background: red;
-         }
-     </style>
-     Update input to see transitions when valid/invalid.
-     Integer is a valid value.
-     <form name="testForm" ng-controller="Ctrl">
-     <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input" />
-     </form>
+     <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
+     copied: {{copied}}
      </file>
-     * </example>
+     </example>
      */
-    var ngModelDirective = function() {
-        return {
-            require: ['ngModel', '^?form'],
-            controller: NgModelController,
-            link: function(scope, element, attr, ctrls) {
-                // notify others, especially parent forms
-
-                var modelCtrl = ctrls[0],
-                    formCtrl = ctrls[1] || nullFormCtrl;
 
-                formCtrl.$addControl(modelCtrl);
-
-                scope.$on('$destroy', function() {
-                    formCtrl.$removeControl(modelCtrl);
-                });
-            }
-        };
-    };
+    /**
+     * @ngdoc directive
+     * @name ngCut
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on cut event.
+     *
+     * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
+     * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-cut">
+     <file name="index.html">
+     <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
+     cut: {{cut}}
+     </file>
+     </example>
+     */
 
+    /**
+     * @ngdoc directive
+     * @name ngPaste
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on paste event.
+     *
+     * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
+     * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-paste">
+     <file name="index.html">
+     <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
+     pasted: {{paste}}
+     </file>
+     </example>
+     */
 
     /**
      * @ngdoc directive
-     * @name ngChange
+     * @name ngIf
+     * @restrict A
+     * @multiElement
      *
      * @description
-     * Evaluate the given expression when the user changes the input.
-     * The expression is evaluated immediately, unlike the JavaScript onchange event
-     * which only triggers at the end of a change (usually, when the user leaves the
-     * form element or presses the return key).
-     * The expression is not evaluated when the value change is coming from the model.
+     * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
+     * {expression}. If the expression assigned to `ngIf` evaluates to a false
+     * value then the element is removed from the DOM, otherwise a clone of the
+     * element is reinserted into the DOM.
+     *
+     * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
+     * element in the DOM rather than changing its visibility via the `display` css property.  A common
+     * case when this difference is significant is when using css selectors that rely on an element's
+     * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
      *
-     * Note, this directive requires `ngModel` to be present.
+     * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
+     * is created when the element is restored.  The scope created within `ngIf` inherits from
+     * its parent scope using
+     * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
+     * An important implication of this is if `ngModel` is used within `ngIf` to bind to
+     * a javascript primitive defined in the parent scope. In this case any modifications made to the
+     * variable within the child scope will override (hide) the value in the parent scope.
      *
-     * @element input
-     * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
-     * in input value.
+     * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
+     * is if an element's class attribute is directly modified after it's compiled, using something like
+     * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
+     * the added class will be lost because the original compiled state is used to regenerate the element.
      *
-     * @example
-     * <example name="ngChange-directive">
-     *   <file name="index.html">
-     *     <script>
-     *       function Controller($scope) {
- *         $scope.counter = 0;
- *         $scope.change = function() {
- *           $scope.counter++;
- *         };
- *       }
-     *     </script>
-     *     <div ng-controller="Controller">
-     *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
-     *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
-     *       <label for="ng-change-example2">Confirmed</label><br />
-     *       <tt>debug = {{confirmed}}</tt><br/>
-     *       <tt>counter = {{counter}}</tt><br/>
-     *     </div>
-     *   </file>
-     *   <file name="protractor.js" type="protractor">
-     *     var counter = element(by.binding('counter'));
-     *     var debug = element(by.binding('confirmed'));
+     * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
+     * and `leave` effects.
      *
-     *     it('should evaluate the expression if changing from view', function() {
- *       expect(counter.getText()).toContain('0');
- *
- *       element(by.id('ng-change-example1')).click();
- *
- *       expect(counter.getText()).toContain('1');
- *       expect(debug.getText()).toContain('true');
- *     });
+     * @animations
+     * | Animation                        | Occurs                               |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter}  | just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container |
+     * | {@link ng.$animate#leave leave}  | just before the `ngIf` contents are removed from the DOM |
      *
-     *     it('should not evaluate the expression if changing from model', function() {
- *       element(by.id('ng-change-example2')).click();
+     * @element ANY
+     * @scope
+     * @priority 600
+     * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
+     *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
+     *     element is added to the DOM tree.
+     *
+     * @example
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-if">
+     <file name="index.html">
+     <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
+     Show when checked:
+     <span ng-if="checked" class="animate-if">
+     This is removed when the checkbox is unchecked.
+     </span>
+     </file>
+     <file name="animations.css">
+     .animate-if {
+        background:white;
+        border:1px solid black;
+        padding:10px;
+      }
 
- *       expect(counter.getText()).toContain('0');
- *       expect(debug.getText()).toContain('true');
- *     });
-     *   </file>
-     * </example>
-     */
-    var ngChangeDirective = valueFn({
-        require: 'ngModel',
-        link: function(scope, element, attr, ctrl) {
-            ctrl.$viewChangeListeners.push(function() {
-                scope.$eval(attr.ngChange);
-            });
-        }
-    });
+     .animate-if.ng-enter, .animate-if.ng-leave {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+      }
 
+     .animate-if.ng-enter,
+     .animate-if.ng-leave.ng-leave-active {
+        opacity:0;
+      }
 
-    var requiredDirective = function() {
+     .animate-if.ng-leave,
+     .animate-if.ng-enter.ng-enter-active {
+        opacity:1;
+      }
+     </file>
+     </example>
+     */
+    var ngIfDirective = ['$animate', '$compile', function($animate, $compile) {
         return {
-            require: '?ngModel',
-            link: function(scope, elm, attr, ctrl) {
-                if (!ctrl) return;
-                attr.required = true; // force truthy in case we are on non input element
+            multiElement: true,
+            transclude: 'element',
+            priority: 600,
+            terminal: true,
+            restrict: 'A',
+            $$tlb: true,
+            link: function($scope, $element, $attr, ctrl, $transclude) {
+                var block, childScope, previousElements;
+                $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
 
-                var validator = function(value) {
-                    if (attr.required && ctrl.$isEmpty(value)) {
-                        ctrl.$setValidity('required', false);
-                        return;
+                    if (value) {
+                        if (!childScope) {
+                            $transclude(function(clone, newScope) {
+                                childScope = newScope;
+                                clone[clone.length++] = $compile.$$createComment('end ngIf', $attr.ngIf);
+                                // Note: We only need the first/last node of the cloned nodes.
+                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                                // by a directive with templateUrl when its template arrives.
+                                block = {
+                                    clone: clone
+                                };
+                                $animate.enter(clone, $element.parent(), $element);
+                            });
+                        }
                     } else {
-                        ctrl.$setValidity('required', true);
-                        return value;
+                        if (previousElements) {
+                            previousElements.remove();
+                            previousElements = null;
+                        }
+                        if (childScope) {
+                            childScope.$destroy();
+                            childScope = null;
+                        }
+                        if (block) {
+                            previousElements = getBlockNodes(block.clone);
+                            $animate.leave(previousElements).done(function(response) {
+                                if (response !== false) previousElements = null;
+                            });
+                            block = null;
+                        }
                     }
-                };
-
-                ctrl.$formatters.push(validator);
-                ctrl.$parsers.unshift(validator);
-
-                attr.$observe('required', function() {
-                    validator(ctrl.$viewValue);
                 });
             }
         };
-    };
-
+    }];
 
     /**
      * @ngdoc directive
-     * @name ngList
+     * @name ngInclude
+     * @restrict ECA
+     * @scope
+     * @priority -400
      *
      * @description
-     * Text input that converts between a delimited string and an array of strings. The delimiter
-     * can be a fixed string (by default a comma) or a regular expression.
+     * Fetches, compiles and includes an external HTML fragment.
+     *
+     * By default, the template URL is restricted to the same domain and protocol as the
+     * application document. This is done by calling {@link $sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
+     * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
+     * {@link $sce#trustAsResourceUrl wrap them} as trusted values. Refer to AngularJS's {@link
+        * ng.$sce Strict Contextual Escaping}.
+     *
+     * In addition, the browser's
+     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+     * policy may further restrict whether the template is successfully loaded.
+     * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
+     * access on some browsers.
+     *
+     * @animations
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter}  | when the expression changes, on the new include |
+     * | {@link ng.$animate#leave leave}  | when the expression changes, on the old include |
+     *
+     * The enter and leave animation occur concurrently.
+     *
+     * @param {string} ngInclude|src AngularJS expression evaluating to URL. If the source is a string constant,
+     *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
+     * @param {string=} onload Expression to evaluate when a new partial is loaded.
+     *                  <div class="alert alert-warning">
+     *                  **Note:** When using onload on SVG elements in IE11, the browser will try to call
+     *                  a function with the name on the window element, which will usually throw a
+     *                  "function is undefined" error. To fix this, you can instead use `data-onload` or a
+     *                  different form that {@link guide/directive#normalization matches} `onload`.
+     *                  </div>
      *
-     * @element input
-     * @param {string=} ngList optional delimiter that should be used to split the value. If
-     *   specified in form `/something/` then the value will be converted into a regular expression.
+     * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
+     *
+     *                  - If the attribute is not set, disable scrolling.
+     *                  - If the attribute is set without value, enable scrolling.
+     *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
      *
      * @example
-     <example name="ngList-directive">
+     <example module="includeExample" deps="angular-animate.js" animations="true" name="ng-include">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.names = ['igor', 'misko', 'vojta'];
-         }
-     </script>
-     <form name="myForm" ng-controller="Ctrl">
-     List: <input name="namesInput" ng-model="names" ng-list required>
-     <span class="error" ng-show="myForm.namesInput.$error.required">
-     Required!</span>
-     <br>
-     <tt>names = {{names}}</tt><br/>
-     <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
-     <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
-     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-     </form>
+     <div ng-controller="ExampleController">
+     <select ng-model="template" ng-options="t.name for t in templates">
+     <option value="">(blank)</option>
+     </select>
+     url of the template: <code>{{template.url}}</code>
+     <hr/>
+     <div class="slide-animate-container">
+     <div class="slide-animate" ng-include="template.url"></div>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('includeExample', ['ngAnimate'])
+     .controller('ExampleController', ['$scope', function($scope) {
+          $scope.templates =
+            [{ name: 'template1.html', url: 'template1.html'},
+             { name: 'template2.html', url: 'template2.html'}];
+          $scope.template = $scope.templates[0];
+        }]);
+     </file>
+     <file name="template1.html">
+     Content of template1.html
+     </file>
+     <file name="template2.html">
+     Content of template2.html
+     </file>
+     <file name="animations.css">
+     .slide-animate-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+     .slide-animate {
+        padding:10px;
+      }
+
+     .slide-animate.ng-enter, .slide-animate.ng-leave {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+        display:block;
+        padding:10px;
+      }
+
+     .slide-animate.ng-enter {
+        top:-50px;
+      }
+     .slide-animate.ng-enter.ng-enter-active {
+        top:0;
+      }
+
+     .slide-animate.ng-leave {
+        top:0;
+      }
+     .slide-animate.ng-leave.ng-leave-active {
+        top:50px;
+      }
      </file>
      <file name="protractor.js" type="protractor">
-     var listInput = element(by.model('names'));
-     var names = element(by.binding('{{names}}'));
-     var valid = element(by.binding('myForm.namesInput.$valid'));
-     var error = element(by.css('span.error'));
+     var templateSelect = element(by.model('template'));
+     var includeElem = element(by.css('[ng-include]'));
 
-     it('should initialize to model', function() {
-          expect(names.getText()).toContain('["igor","misko","vojta"]');
-          expect(valid.getText()).toContain('true');
-          expect(error.getCssValue('display')).toBe('none');
-        });
+     it('should load template1.html', function() {
+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
+      });
 
-     it('should be invalid if empty', function() {
-          listInput.clear();
-          listInput.sendKeys('');
+     it('should load template2.html', function() {
+        if (browser.params.browser === 'firefox') {
+          // Firefox can't handle using selects
+          // See https://github.com/angular/protractor/issues/480
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(2).click();
+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
+      });
 
-          expect(names.getText()).toContain('');
-          expect(valid.getText()).toContain('false');
-          expect(error.getCssValue('display')).not.toBe('none');        });
+     it('should change to blank', function() {
+        if (browser.params.browser === 'firefox') {
+          // Firefox can't handle using selects
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(0).click();
+        expect(includeElem.isPresent()).toBe(false);
+      });
      </file>
      </example>
      */
-    var ngListDirective = function() {
-        return {
-            require: 'ngModel',
-            link: function(scope, element, attr, ctrl) {
-                var match = /\/(.*)\//.exec(attr.ngList),
-                    separator = match && new RegExp(match[1]) || attr.ngList || ',';
 
-                var parse = function(viewValue) {
-                    // If the viewValue is invalid (say required but empty) it will be `undefined`
-                    if (isUndefined(viewValue)) return;
 
-                    var list = [];
+    /**
+     * @ngdoc event
+     * @name ngInclude#$includeContentRequested
+     * @eventType emit on the scope ngInclude was declared in
+     * @description
+     * Emitted every time the ngInclude content is requested.
+     *
+     * @param {Object} angularEvent Synthetic event object.
+     * @param {String} src URL of content to load.
+     */
+
+
+    /**
+     * @ngdoc event
+     * @name ngInclude#$includeContentLoaded
+     * @eventType emit on the current ngInclude scope
+     * @description
+     * Emitted every time the ngInclude content is reloaded.
+     *
+     * @param {Object} angularEvent Synthetic event object.
+     * @param {String} src URL of content to load.
+     */
+
+
+    /**
+     * @ngdoc event
+     * @name ngInclude#$includeContentError
+     * @eventType emit on the scope ngInclude was declared in
+     * @description
+     * Emitted when a template HTTP request yields an erroneous response (status < 200 || status > 299)
+     *
+     * @param {Object} angularEvent Synthetic event object.
+     * @param {String} src URL of content to load.
+     */
+    var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate',
+        function($templateRequest,   $anchorScroll,   $animate) {
+            return {
+                restrict: 'ECA',
+                priority: 400,
+                terminal: true,
+                transclude: 'element',
+                controller: angular.noop,
+                compile: function(element, attr) {
+                    var srcExp = attr.ngInclude || attr.src,
+                        onloadExp = attr.onload || '',
+                        autoScrollExp = attr.autoscroll;
 
-                    if (viewValue) {
-                        forEach(viewValue.split(separator), function(value) {
-                            if (value) list.push(trim(value));
-                        });
-                    }
+                    return function(scope, $element, $attr, ctrl, $transclude) {
+                        var changeCounter = 0,
+                            currentScope,
+                            previousElement,
+                            currentElement;
 
-                    return list;
-                };
+                        var cleanupLastIncludeContent = function() {
+                            if (previousElement) {
+                                previousElement.remove();
+                                previousElement = null;
+                            }
+                            if (currentScope) {
+                                currentScope.$destroy();
+                                currentScope = null;
+                            }
+                            if (currentElement) {
+                                $animate.leave(currentElement).done(function(response) {
+                                    if (response !== false) previousElement = null;
+                                });
+                                previousElement = currentElement;
+                                currentElement = null;
+                            }
+                        };
 
-                ctrl.$parsers.push(parse);
-                ctrl.$formatters.push(function(value) {
-                    if (isArray(value)) {
-                        return value.join(', ');
-                    }
+                        scope.$watch(srcExp, function ngIncludeWatchAction(src) {
+                            var afterAnimation = function(response) {
+                                if (response !== false && isDefined(autoScrollExp) &&
+                                    (!autoScrollExp || scope.$eval(autoScrollExp))) {
+                                    $anchorScroll();
+                                }
+                            };
+                            var thisChangeId = ++changeCounter;
 
-                    return undefined;
-                });
+                            if (src) {
+                                //set the 2nd param to true to ignore the template request error so that the inner
+                                //contents and scope can be cleaned up.
+                                $templateRequest(src, true).then(function(response) {
+                                    if (scope.$$destroyed) return;
 
-                // Override the standard $isEmpty because an empty array means the input is empty.
-                ctrl.$isEmpty = function(value) {
-                    return !value || !value.length;
-                };
-            }
-        };
-    };
+                                    if (thisChangeId !== changeCounter) return;
+                                    var newScope = scope.$new();
+                                    ctrl.template = response;
 
+                                    // Note: This will also link all children of ng-include that were contained in the original
+                                    // html. If that content contains controllers, ... they could pollute/change the scope.
+                                    // However, using ng-include on an element with additional content does not make sense...
+                                    // Note: We can't remove them in the cloneAttchFn of $transclude as that
+                                    // function is called before linking the content, which would apply child
+                                    // directives to non existing elements.
+                                    var clone = $transclude(newScope, function(clone) {
+                                        cleanupLastIncludeContent();
+                                        $animate.enter(clone, null, $element).done(afterAnimation);
+                                    });
 
-    var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
-    /**
-     * @ngdoc directive
-     * @name ngValue
-     *
-     * @description
-     * Binds the given expression to the value of `input[select]` or `input[radio]`, so
-     * that when the element is selected, the `ngModel` of that element is set to the
-     * bound value.
-     *
-     * `ngValue` is useful when dynamically generating lists of radio buttons using `ng-repeat`, as
-     * shown below.
-     *
-     * @element input
-     * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute
-     *   of the `input` element
-     *
-     * @example
-     <example name="ngValue-directive">
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-            $scope.names = ['pizza', 'unicorns', 'robots'];
-            $scope.my = { favorite: 'unicorns' };
-          }
-     </script>
-     <form ng-controller="Ctrl">
-     <h2>Which is your favorite?</h2>
-     <label ng-repeat="name in names" for="{{name}}">
-     {{name}}
-     <input type="radio"
-     ng-model="my.favorite"
-     ng-value="name"
-     id="{{name}}"
-     name="favorite">
-     </label>
-     <div>You chose {{my.favorite}}</div>
-     </form>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var favorite = element(by.binding('my.favorite'));
+                                    currentScope = newScope;
+                                    currentElement = clone;
 
-     it('should initialize to model', function() {
-          expect(favorite.getText()).toContain('unicorns');
-        });
-     it('should bind the values to the inputs', function() {
-          element.all(by.model('my.favorite')).get(0).click();
-          expect(favorite.getText()).toContain('pizza');
-        });
-     </file>
-     </example>
-     */
-    var ngValueDirective = function() {
-        return {
-            priority: 100,
-            compile: function(tpl, tplAttr) {
-                if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
-                    return function ngValueConstantLink(scope, elm, attr) {
-                        attr.$set('value', scope.$eval(attr.ngValue));
-                    };
-                } else {
-                    return function ngValueLink(scope, elm, attr) {
-                        scope.$watch(attr.ngValue, function valueWatchAction(value) {
-                            attr.$set('value', value);
+                                    currentScope.$emit('$includeContentLoaded', src);
+                                    scope.$eval(onloadExp);
+                                }, function() {
+                                    if (scope.$$destroyed) return;
+
+                                    if (thisChangeId === changeCounter) {
+                                        cleanupLastIncludeContent();
+                                        scope.$emit('$includeContentError', src);
+                                    }
+                                });
+                                scope.$emit('$includeContentRequested', src);
+                            } else {
+                                cleanupLastIncludeContent();
+                                ctrl.template = null;
+                            }
                         });
                     };
                 }
-            }
-        };
-    };
+            };
+        }];
+
+// This directive is called during the $transclude call of the first `ngInclude` directive.
+// It will replace and compile the content of the element with the loaded template.
+// We need this directive so that the element content is already filled when
+// the link function of another directive on the same element as ngInclude
+// is called.
+    var ngIncludeFillContentDirective = ['$compile',
+        function($compile) {
+            return {
+                restrict: 'ECA',
+                priority: -400,
+                require: 'ngInclude',
+                link: function(scope, $element, $attr, ctrl) {
+                    if (toString.call($element[0]).match(/SVG/)) {
+                        // WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not
+                        // support innerHTML, so detect this here and try to generate the contents
+                        // specially.
+                        $element.empty();
+                        $compile(jqLiteBuildFragment(ctrl.template, window.document).childNodes)(scope,
+                            function namespaceAdaptedClone(clone) {
+                                $element.append(clone);
+                            }, {futureParentElement: $element});
+                        return;
+                    }
+
+                    $element.html(ctrl.template);
+                    $compile($element.contents())(scope);
+                }
+            };
+        }];
 
     /**
      * @ngdoc directive
-     * @name ngBind
+     * @name ngInit
      * @restrict AC
-     *
-     * @description
-     * The `ngBind` attribute tells Angular to replace the text content of the specified HTML element
-     * with the value of a given expression, and to update the text content when the value of that
-     * expression changes.
-     *
-     * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
-     * `{{ expression }}` which is similar but less verbose.
-     *
-     * It is preferable to use `ngBind` instead of `{{ expression }}` when a template is momentarily
-     * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
-     * element attribute, it makes the bindings invisible to the user while the page is loading.
-     *
-     * An alternative solution to this problem would be using the
-     * {@link ng.directive:ngCloak ngCloak} directive.
-     *
-     *
+     * @priority 450
      * @element ANY
-     * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
      *
-     * @example
-     * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.name = 'Whirled';
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     Enter name: <input type="text" ng-model="name"><br>
-     Hello <span ng-bind="name"></span>!
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-bind', function() {
-         var nameInput = element(by.model('name'));
-
-         expect(element(by.binding('name')).getText()).toBe('Whirled');
-         nameInput.clear();
-         nameInput.sendKeys('world');
-         expect(element(by.binding('name')).getText()).toBe('world');
-       });
-     </file>
-     </example>
-     */
-    var ngBindDirective = ngDirective(function(scope, element, attr) {
-        element.addClass('ng-binding').data('$binding', attr.ngBind);
-        scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
-            // We are purposefully using == here rather than === because we want to
-            // catch when value is "null or undefined"
-            // jshint -W041
-            element.text(value == undefined ? '' : value);
-        });
-    });
-
-
-    /**
-     * @ngdoc directive
-     * @name ngBindTemplate
+     * @param {expression} ngInit {@link guide/expression Expression} to eval.
      *
      * @description
-     * The `ngBindTemplate` directive specifies that the element
-     * text content should be replaced with the interpolation of the template
-     * in the `ngBindTemplate` attribute.
-     * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
-     * expressions. This directive is needed since some HTML elements
-     * (such as TITLE and OPTION) cannot contain SPAN elements.
+     * The `ngInit` directive allows you to evaluate an expression in the
+     * current scope.
      *
-     * @element ANY
-     * @param {string} ngBindTemplate template of form
-     *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
+     * <div class="alert alert-danger">
+     * This directive can be abused to add unnecessary amounts of logic into your templates.
+     * There are only a few appropriate uses of `ngInit`:
+     * <ul>
+     *   <li>aliasing special properties of {@link ng.directive:ngRepeat `ngRepeat`},
+     *     as seen in the demo below.</li>
+     *   <li>initializing data during development, or for examples, as seen throughout these docs.</li>
+     *   <li>injecting data via server side scripting.</li>
+     * </ul>
+     *
+     * Besides these few cases, you should use {@link guide/component Components} or
+     * {@link guide/controller Controllers} rather than `ngInit` to initialize values on a scope.
+     * </div>
+     *
+     * <div class="alert alert-warning">
+     * **Note**: If you have assignment in `ngInit` along with a {@link ng.$filter `filter`}, make
+     * sure you have parentheses to ensure correct operator precedence:
+     * <pre class="prettyprint">
+     * `<div ng-init="test1 = ($index | toString)"></div>`
+     * </pre>
+     * </div>
      *
      * @example
-     * Try it here: enter text in text box and watch the greeting change.
-     <example>
+     <example module="initExample" name="ng-init">
      <file name="index.html">
      <script>
-     function Ctrl($scope) {
-           $scope.salutation = 'Hello';
-           $scope.name = 'World';
-         }
+     angular.module('initExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+         $scope.list = [['a', 'b'], ['c', 'd']];
+       }]);
      </script>
-     <div ng-controller="Ctrl">
-     Salutation: <input type="text" ng-model="salutation"><br>
-     Name: <input type="text" ng-model="name"><br>
-     <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
+     <div ng-controller="ExampleController">
+     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
+     <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
+     <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
+     </div>
+     </div>
      </div>
      </file>
      <file name="protractor.js" type="protractor">
-     it('should check ng-bind', function() {
-         var salutationElem = element(by.binding('salutation'));
-         var salutationInput = element(by.model('salutation'));
-         var nameInput = element(by.model('name'));
-
-         expect(salutationElem.getText()).toBe('Hello World!');
-
-         salutationInput.clear();
-         salutationInput.sendKeys('Greetings');
-         nameInput.clear();
-         nameInput.sendKeys('user');
-
-         expect(salutationElem.getText()).toBe('Greetings user!');
+     it('should alias index positions', function() {
+         var elements = element.all(by.css('.example-init'));
+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
        });
      </file>
      </example>
      */
-    var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
-        return function(scope, element, attr) {
-            // TODO: move this to scenario runner
-            var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
-            element.addClass('ng-binding').data('$binding', interpolateFn);
-            attr.$observe('ngBindTemplate', function(value) {
-                element.text(value);
-            });
-        };
-    }];
-
+    var ngInitDirective = ngDirective({
+        priority: 450,
+        compile: function() {
+            return {
+                pre: function(scope, element, attrs) {
+                    scope.$eval(attrs.ngInit);
+                }
+            };
+        }
+    });
 
     /**
      * @ngdoc directive
-     * @name ngBindHtml
+     * @name ngList
+     * @restrict A
+     * @priority 100
+     *
+     * @param {string=} ngList optional delimiter that should be used to split the value.
      *
      * @description
-     * Creates a binding that will innerHTML the result of evaluating the `expression` into the current
-     * element in a secure way.  By default, the innerHTML-ed content will be sanitized using the {@link
-        * ngSanitize.$sanitize $sanitize} service.  To utilize this functionality, ensure that `$sanitize`
-     * is available, for example, by including {@link ngSanitize} in your module's dependencies (not in
-     * core Angular.)  You may also bypass sanitization for values you know are safe. To do so, bind to
-     * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
-     * under {@link ng.$sce#Example Strict Contextual Escaping (SCE)}.
+     * Text input that converts between a delimited string and an array of strings. The default
+     * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom
+     * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`.
+     *
+     * The behaviour of the directive is affected by the use of the `ngTrim` attribute.
+     * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each
+     *   list item is respected. This implies that the user of the directive is responsible for
+     *   dealing with whitespace but also allows you to use whitespace as a delimiter, such as a
+     *   tab or newline character.
+     * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected
+     *   when joining the list items back together) and whitespace around each list item is stripped
+     *   before it is added to the model.
      *
-     * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
-     * will have an exception (instead of an exploit.)
+     * @example
+     * ### Validation
+     *
+     * <example name="ngList-directive" module="listExample">
+     *   <file name="app.js">
+     *      angular.module('listExample', [])
+     *        .controller('ExampleController', ['$scope', function($scope) {
+     *          $scope.names = ['morpheus', 'neo', 'trinity'];
+     *        }]);
+     *   </file>
+     *   <file name="index.html">
+     *    <form name="myForm" ng-controller="ExampleController">
+     *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
+     *      <span role="alert">
+     *        <span class="error" ng-show="myForm.namesInput.$error.required">
+     *        Required!</span>
+     *      </span>
+     *      <br>
+     *      <tt>names = {{names}}</tt><br/>
+     *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
+     *      <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
+     *      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     *      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     *     </form>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     var listInput = element(by.model('names'));
+     *     var names = element(by.exactBinding('names'));
+     *     var valid = element(by.binding('myForm.namesInput.$valid'));
+     *     var error = element(by.css('span.error'));
+     *
+     *     it('should initialize to model', function() {
+     *       expect(names.getText()).toContain('["morpheus","neo","trinity"]');
+     *       expect(valid.getText()).toContain('true');
+     *       expect(error.getCssValue('display')).toBe('none');
+     *     });
      *
-     * @element ANY
-     * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+     *     it('should be invalid if empty', function() {
+     *       listInput.clear();
+     *       listInput.sendKeys('');
+     *
+     *       expect(names.getText()).toContain('');
+     *       expect(valid.getText()).toContain('false');
+     *       expect(error.getCssValue('display')).not.toBe('none');
+     *     });
+     *   </file>
+     * </example>
      *
      * @example
-     Try it here: enter text in text box and watch the greeting change.
+     * ### Splitting on newline
+     *
+     * <example name="ngList-directive-newlines">
+     *   <file name="index.html">
+     *    <textarea ng-model="list" ng-list="&#10;" ng-trim="false"></textarea>
+     *    <pre>{{ list | json }}</pre>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     it("should split the text by newlines", function() {
+     *       var listInput = element(by.model('list'));
+     *       var output = element(by.binding('list | json'));
+     *       listInput.sendKeys('abc\ndef\nghi');
+     *       expect(output.getText()).toContain('[\n  "abc",\n  "def",\n  "ghi"\n]');
+     *     });
+     *   </file>
+     * </example>
+     *
+     */
+    var ngListDirective = function() {
+        return {
+            restrict: 'A',
+            priority: 100,
+            require: 'ngModel',
+            link: function(scope, element, attr, ctrl) {
+                var ngList = attr.ngList || ', ';
+                var trimValues = attr.ngTrim !== 'false';
+                var separator = trimValues ? trim(ngList) : ngList;
 
-     <example module="ngBindHtmlExample" deps="angular-sanitize.js">
-     <file name="index.html">
-     <div ng-controller="ngBindHtmlCtrl">
-     <p ng-bind-html="myHTML"></p>
-     </div>
-     </file>
+                var parse = function(viewValue) {
+                    // If the viewValue is invalid (say required but empty) it will be `undefined`
+                    if (isUndefined(viewValue)) return;
 
-     <file name="script.js">
-     angular.module('ngBindHtmlExample', ['ngSanitize'])
+                    var list = [];
 
-     .controller('ngBindHtmlCtrl', ['$scope', function ngBindHtmlCtrl($scope) {
-         $scope.myHTML =
-            'I am an <code>HTML</code>string with <a href="#">links!</a> and other <em>stuff</em>';
-       }]);
-     </file>
+                    if (viewValue) {
+                        forEach(viewValue.split(separator), function(value) {
+                            if (value) list.push(trimValues ? trim(value) : value);
+                        });
+                    }
 
-     <file name="protractor.js" type="protractor">
-     it('should check ng-bind-html', function() {
-         expect(element(by.binding('myHTML')).getText()).toBe(
-             'I am an HTMLstring with links! and other stuff');
-       });
-     </file>
-     </example>
-     */
-    var ngBindHtmlDirective = ['$sce', '$parse', function($sce, $parse) {
-        return function(scope, element, attr) {
-            element.addClass('ng-binding').data('$binding', attr.ngBindHtml);
+                    return list;
+                };
 
-            var parsed = $parse(attr.ngBindHtml);
-            function getStringValue() { return (parsed(scope) || '').toString(); }
+                ctrl.$parsers.push(parse);
+                ctrl.$formatters.push(function(value) {
+                    if (isArray(value)) {
+                        return value.join(ngList);
+                    }
 
-            scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
-                element.html($sce.getTrustedHtml(parsed(scope)) || '');
-            });
-        };
-    }];
+                    return undefined;
+                });
 
-    function classDirective(name, selector) {
-        name = 'ngClass' + name;
-        return ['$animate', function($animate) {
-            return {
-                restrict: 'AC',
-                link: function(scope, element, attr) {
-                    var oldVal;
+                // Override the standard $isEmpty because an empty array means the input is empty.
+                ctrl.$isEmpty = function(value) {
+                    return !value || !value.length;
+                };
+            }
+        };
+    };
 
-                    scope.$watch(attr[name], ngClassWatchAction, true);
+    /* global VALID_CLASS: true,
+  INVALID_CLASS: true,
+  PRISTINE_CLASS: true,
+  DIRTY_CLASS: true,
+  UNTOUCHED_CLASS: true,
+  TOUCHED_CLASS: true,
+  PENDING_CLASS: true,
+  addSetValidityMethod: true,
+  setupValidity: true,
+  defaultModelOptions: false
+*/
 
-                    attr.$observe('class', function(value) {
-                        ngClassWatchAction(scope.$eval(attr[name]));
-                    });
 
+    var VALID_CLASS = 'ng-valid',
+        INVALID_CLASS = 'ng-invalid',
+        PRISTINE_CLASS = 'ng-pristine',
+        DIRTY_CLASS = 'ng-dirty',
+        UNTOUCHED_CLASS = 'ng-untouched',
+        TOUCHED_CLASS = 'ng-touched',
+        EMPTY_CLASS = 'ng-empty',
+        NOT_EMPTY_CLASS = 'ng-not-empty';
 
-                    if (name !== 'ngClass') {
-                        scope.$watch('$index', function($index, old$index) {
-                            // jshint bitwise: false
-                            var mod = $index & 1;
-                            if (mod !== old$index & 1) {
-                                var classes = arrayClasses(scope.$eval(attr[name]));
-                                mod === selector ?
-                                    addClasses(classes) :
-                                    removeClasses(classes);
-                            }
-                        });
-                    }
+    var ngModelMinErr = minErr('ngModel');
 
-                    function addClasses(classes) {
-                        var newClasses = digestClassCounts(classes, 1);
-                        attr.$addClass(newClasses);
-                    }
+    /**
+     * @ngdoc type
+     * @name ngModel.NgModelController
+     * @property {*} $viewValue The actual value from the control's view. For `input` elements, this is a
+     * String. See {@link ngModel.NgModelController#$setViewValue} for information about when the $viewValue
+     * is set.
+     *
+     * @property {*} $modelValue The value in the model that the control is bound to.
+     *
+     * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
+     *  the control updates the ngModelController with a new {@link ngModel.NgModelController#$viewValue
+    `$viewValue`} from the DOM, usually via user input.
+     See {@link ngModel.NgModelController#$setViewValue `$setViewValue()`} for a detailed lifecycle explanation.
+     Note that the `$parsers` are not called when the bound ngModel expression changes programmatically.
 
-                    function removeClasses(classes) {
-                        var newClasses = digestClassCounts(classes, -1);
-                        attr.$removeClass(newClasses);
-                    }
+     The functions are called in array order, each passing
+     its return value through to the next. The last return value is forwarded to the
+     {@link ngModel.NgModelController#$validators `$validators`} collection.
 
-                    function digestClassCounts (classes, count) {
-                        var classCounts = element.data('$classCounts') || {};
-                        var classesToUpdate = [];
-                        forEach(classes, function (className) {
-                            if (count > 0 || classCounts[className]) {
-                                classCounts[className] = (classCounts[className] || 0) + count;
-                                if (classCounts[className] === +(count > 0)) {
-                                    classesToUpdate.push(className);
-                                }
-                            }
-                        });
-                        element.data('$classCounts', classCounts);
-                        return classesToUpdate.join(' ');
-                    }
+     Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue
+    `$viewValue`}.
 
-                    function updateClasses (oldClasses, newClasses) {
-                        var toAdd = arrayDifference(newClasses, oldClasses);
-                        var toRemove = arrayDifference(oldClasses, newClasses);
-                        toRemove = digestClassCounts(toRemove, -1);
-                        toAdd = digestClassCounts(toAdd, 1);
+     Returning `undefined` from a parser means a parse error occurred. In that case,
+     no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel`
+     will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`}
+     is set to `true`. The parse error is stored in `ngModel.$error.parse`.
 
-                        if (toAdd.length === 0) {
-                            $animate.removeClass(element, toRemove);
-                        } else if (toRemove.length === 0) {
-                            $animate.addClass(element, toAdd);
-                        } else {
-                            $animate.setClass(element, toAdd, toRemove);
-                        }
-                    }
+     This simple example shows a parser that would convert text input value to lowercase:
+     * ```js
+     * function parse(value) {
+     *   if (value) {
+     *     return value.toLowerCase();
+     *   }
+     * }
+     * ngModelController.$parsers.push(parse);
+     * ```
 
-                    function ngClassWatchAction(newVal) {
-                        if (selector === true || scope.$index % 2 === selector) {
-                            var newClasses = arrayClasses(newVal || []);
-                            if (!oldVal) {
-                                addClasses(newClasses);
-                            } else if (!equals(newVal,oldVal)) {
-                                var oldClasses = arrayClasses(oldVal);
-                                updateClasses(oldClasses, newClasses);
-                            }
-                        }
-                        oldVal = copy(newVal);
-                    }
-                }
-            };
+     *
+     * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
+     the bound ngModel expression changes programmatically. The `$formatters` are not called when the
+     value of the control is changed by user interaction.
 
-            function arrayDifference(tokens1, tokens2) {
-                var values = [];
+     Formatters are used to format / convert the {@link ngModel.NgModelController#$modelValue
+    `$modelValue`} for display in the control.
 
-                outer:
-                    for(var i = 0; i < tokens1.length; i++) {
-                        var token = tokens1[i];
-                        for(var j = 0; j < tokens2.length; j++) {
-                            if(token == tokens2[j]) continue outer;
-                        }
-                        values.push(token);
-                    }
-                return values;
-            }
+     The functions are called in reverse array order, each passing the value through to the
+     next. The last return value is used as the actual DOM value.
 
-            function arrayClasses (classVal) {
-                if (isArray(classVal)) {
-                    return classVal;
-                } else if (isString(classVal)) {
-                    return classVal.split(' ');
-                } else if (isObject(classVal)) {
-                    var classes = [], i = 0;
-                    forEach(classVal, function(v, k) {
-                        if (v) {
-                            classes.push(k);
-                        }
-                    });
-                    return classes;
-                }
-                return classVal;
-            }
-        }];
-    }
+     This simple example shows a formatter that would convert the model value to uppercase:
 
-    /**
-     * @ngdoc directive
-     * @name ngClass
-     * @restrict AC
+     * ```js
+     * function format(value) {
+     *   if (value) {
+     *     return value.toUpperCase();
+     *   }
+     * }
+     * ngModel.$formatters.push(format);
+     * ```
      *
-     * @description
-     * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
-     * an expression that represents all classes to be added.
+     * @property {Object.<string, function>} $validators A collection of validators that are applied
+     *      whenever the model value changes. The key value within the object refers to the name of the
+     *      validator while the function refers to the validation operation. The validation operation is
+     *      provided with the model value as an argument and must return a true or false value depending
+     *      on the response of that validation.
      *
-     * The directive operates in three different ways, depending on which of three types the expression
-     * evaluates to:
+     * ```js
+     * ngModel.$validators.validCharacters = function(modelValue, viewValue) {
+     *   var value = modelValue || viewValue;
+     *   return /[0-9]+/.test(value) &&
+     *          /[a-z]+/.test(value) &&
+     *          /[A-Z]+/.test(value) &&
+     *          /\W+/.test(value);
+     * };
+     * ```
      *
-     * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
-     * names.
+     * @property {Object.<string, function>} $asyncValidators A collection of validations that are expected to
+     *      perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided
+     *      is expected to return a promise when it is run during the model validation process. Once the promise
+     *      is delivered then the validation status will be set to true when fulfilled and false when rejected.
+     *      When the asynchronous validators are triggered, each of the validators will run in parallel and the model
+     *      value will only be updated once all validators have been fulfilled. As long as an asynchronous validator
+     *      is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators
+     *      will only run once all synchronous validators have passed.
      *
-     * 2. If the expression evaluates to an array, each element of the array should be a string that is
-     * one or more space-delimited class names.
+     * Please note that if $http is used then it is important that the server returns a success HTTP response code
+     * in order to fulfill the validation and a status level of `4xx` in order to reject the validation.
      *
-     * 3. If the expression evaluates to an object, then for each key-value pair of the
-     * object with a truthy value the corresponding key is used as a class name.
+     * ```js
+     * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) {
+     *   var value = modelValue || viewValue;
+     *
+     *   // Lookup user by username
+     *   return $http.get('/api/users/' + value).
+     *      then(function resolved() {
+     *        //username exists, this means validation fails
+     *        return $q.reject('exists');
+     *      }, function rejected() {
+     *        //username does not exist, therefore this validation passes
+     *        return true;
+     *      });
+     * };
+     * ```
      *
-     * The directive won't add duplicate classes if a particular class was already set.
+     * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever
+     *     a change to {@link ngModel.NgModelController#$viewValue `$viewValue`} has caused a change
+     *     to {@link ngModel.NgModelController#$modelValue `$modelValue`}.
+     *     It is called with no arguments, and its return value is ignored.
+     *     This can be used in place of additional $watches against the model value.
      *
-     * When the expression changes, the previously added classes are removed and only then the
-     * new classes are added.
+     * @property {Object} $error An object hash with all failing validator ids as keys.
+     * @property {Object} $pending An object hash with all pending validator ids as keys.
      *
-     * @animations
-     * add - happens just before the class is applied to the element
-     * remove - happens just before the class is removed from the element
+     * @property {boolean} $untouched True if control has not lost focus yet.
+     * @property {boolean} $touched True if control has lost focus.
+     * @property {boolean} $pristine True if user has not interacted with the control yet.
+     * @property {boolean} $dirty True if user has already interacted with the control.
+     * @property {boolean} $valid True if there is no error.
+     * @property {boolean} $invalid True if at least one error on the control.
+     * @property {string} $name The name attribute of the control.
      *
-     * @element ANY
-     * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
-     *   of the evaluation can be a string representing space delimited class
-     *   names, an array, or a map of class names to boolean values. In the case of a map, the
-     *   names of the properties whose values are truthy will be added as css classes to the
-     *   element.
+     * @description
+     *
+     * `NgModelController` provides API for the {@link ngModel `ngModel`} directive.
+     * The controller contains services for data-binding, validation, CSS updates, and value formatting
+     * and parsing. It purposefully does not contain any logic which deals with DOM rendering or
+     * listening to DOM events.
+     * Such DOM related logic should be provided by other directives which make use of
+     * `NgModelController` for data-binding to control elements.
+     * AngularJS provides this DOM logic for most {@link input `input`} elements.
+     * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example
+ * custom control example} that uses `ngModelController` to bind to `contenteditable` elements.
+     *
+     * @example
+     * ### Custom Control Example
+     * This example shows how to use `NgModelController` with a custom control to achieve
+     * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
+     * collaborate together to achieve the desired result.
+     *
+     * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
+     * contents be edited in place by the user.
      *
-     * @example Example that demonstrates basic bindings via ngClass directive.
-     <example>
+     * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
+     * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
+     * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
+     * that content using the `$sce` service.
+     *
+     * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
+     <file name="style.css">
+     [contenteditable] {
+        border: 1px solid black;
+        background-color: white;
+        min-height: 20px;
+      }
+
+     .ng-invalid {
+        border: 1px solid red;
+      }
+
+     </file>
+     <file name="script.js">
+     angular.module('customControl', ['ngSanitize']).
+     directive('contenteditable', ['$sce', function($sce) {
+          return {
+            restrict: 'A', // only activate on element attribute
+            require: '?ngModel', // get a hold of NgModelController
+            link: function(scope, element, attrs, ngModel) {
+              if (!ngModel) return; // do nothing if no ng-model
+
+              // Specify how UI should be updated
+              ngModel.$render = function() {
+                element.html($sce.getTrustedHtml(ngModel.$viewValue || ''));
+              };
+
+              // Listen for change events to enable binding
+              element.on('blur keyup change', function() {
+                scope.$evalAsync(read);
+              });
+              read(); // initialize
+
+              // Write data to the model
+              function read() {
+                var html = element.html();
+                // When we clear the content editable the browser leaves a <br> behind
+                // If strip-br attribute is provided then we strip this out
+                if (attrs.stripBr && html === '<br>') {
+                  html = '';
+                }
+                ngModel.$setViewValue(html);
+              }
+            }
+          };
+        }]);
+     </file>
      <file name="index.html">
-     <p ng-class="{strike: deleted, bold: important, red: error}">Map Syntax Example</p>
-     <input type="checkbox" ng-model="deleted"> deleted (apply "strike" class)<br>
-     <input type="checkbox" ng-model="important"> important (apply "bold" class)<br>
-     <input type="checkbox" ng-model="error"> error (apply "red" class)
-     <hr>
-     <p ng-class="style">Using String Syntax</p>
-     <input type="text" ng-model="style" placeholder="Type: bold strike red">
+     <form name="myForm">
+     <div contenteditable
+     name="myWidget" ng-model="userContent"
+     strip-br="true"
+     required>Change me!</div>
+     <span ng-show="myForm.myWidget.$error.required">Required!</span>
      <hr>
-     <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
-     <input ng-model="style1" placeholder="Type: bold, strike or red"><br>
-     <input ng-model="style2" placeholder="Type: bold, strike or red"><br>
-     <input ng-model="style3" placeholder="Type: bold, strike or red"><br>
+     <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
+     </form>
      </file>
-     <file name="style.css">
-     .strike {
-         text-decoration: line-through;
-       }
-     .bold {
-           font-weight: bold;
-       }
-     .red {
-           color: red;
-       }
+     <file name="protractor.js" type="protractor">
+     it('should data-bind and become invalid', function() {
+      if (browser.params.browser === 'safari' || browser.params.browser === 'firefox') {
+        // SafariDriver can't handle contenteditable
+        // and Firefox driver can't clear contenteditables very well
+        return;
+      }
+      var contentEditable = element(by.css('[contenteditable]'));
+      var content = 'Change me!';
+
+      expect(contentEditable.getText()).toEqual(content);
+
+      contentEditable.clear();
+      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
+      expect(contentEditable.getText()).toEqual('');
+      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
+    });
      </file>
-     <file name="protractor.js" type="protractor">
-     var ps = element.all(by.css('p'));
+     * </example>
+     *
+     *
+     */
+    NgModelController.$inject = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$q', '$interpolate'];
+    function NgModelController($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $q, $interpolate) {
+        this.$viewValue = Number.NaN;
+        this.$modelValue = Number.NaN;
+        this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
+        this.$validators = {};
+        this.$asyncValidators = {};
+        this.$parsers = [];
+        this.$formatters = [];
+        this.$viewChangeListeners = [];
+        this.$untouched = true;
+        this.$touched = false;
+        this.$pristine = true;
+        this.$dirty = false;
+        this.$valid = true;
+        this.$invalid = false;
+        this.$error = {}; // keep invalid keys here
+        this.$$success = {}; // keep valid keys here
+        this.$pending = undefined; // keep pending keys here
+        this.$name = $interpolate($attr.name || '', false)($scope);
+        this.$$parentForm = nullFormCtrl;
+        this.$options = defaultModelOptions;
+        this.$$updateEvents = '';
+        // Attach the correct context to the event handler function for updateOn
+        this.$$updateEventHandler = this.$$updateEventHandler.bind(this);
+
+        this.$$parsedNgModel = $parse($attr.ngModel);
+        this.$$parsedNgModelAssign = this.$$parsedNgModel.assign;
+        this.$$ngModelGet = this.$$parsedNgModel;
+        this.$$ngModelSet = this.$$parsedNgModelAssign;
+        this.$$pendingDebounce = null;
+        this.$$parserValid = undefined;
+
+        this.$$currentValidationRunId = 0;
+
+        // https://github.com/angular/angular.js/issues/15833
+        // Prevent `$$scope` from being iterated over by `copy` when NgModelController is deep watched
+        Object.defineProperty(this, '$$scope', {value: $scope});
+        this.$$attr = $attr;
+        this.$$element = $element;
+        this.$$animate = $animate;
+        this.$$timeout = $timeout;
+        this.$$parse = $parse;
+        this.$$q = $q;
+        this.$$exceptionHandler = $exceptionHandler;
+
+        setupValidity(this);
+        setupModelWatcher(this);
+    }
 
-     it('should let you toggle the class', function() {
+    NgModelController.prototype = {
+        $$initGetterSetters: function() {
+            if (this.$options.getOption('getterSetter')) {
+                var invokeModelGetter = this.$$parse(this.$$attr.ngModel + '()'),
+                    invokeModelSetter = this.$$parse(this.$$attr.ngModel + '($$$p)');
 
-         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
-         expect(ps.first().getAttribute('class')).not.toMatch(/red/);
+                this.$$ngModelGet = function($scope) {
+                    var modelValue = this.$$parsedNgModel($scope);
+                    if (isFunction(modelValue)) {
+                        modelValue = invokeModelGetter($scope);
+                    }
+                    return modelValue;
+                };
+                this.$$ngModelSet = function($scope, newValue) {
+                    if (isFunction(this.$$parsedNgModel($scope))) {
+                        invokeModelSetter($scope, {$$$p: newValue});
+                    } else {
+                        this.$$parsedNgModelAssign($scope, newValue);
+                    }
+                };
+            } else if (!this.$$parsedNgModel.assign) {
+                throw ngModelMinErr('nonassign', 'Expression \'{0}\' is non-assignable. Element: {1}',
+                    this.$$attr.ngModel, startingTag(this.$$element));
+            }
+        },
 
-         element(by.model('important')).click();
-         expect(ps.first().getAttribute('class')).toMatch(/bold/);
 
-         element(by.model('error')).click();
-         expect(ps.first().getAttribute('class')).toMatch(/red/);
-       });
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$render
+         *
+         * @description
+         * Called when the view needs to be updated. It is expected that the user of the ng-model
+         * directive will implement this method.
+         *
+         * The `$render()` method is invoked in the following situations:
+         *
+         * * `$rollbackViewValue()` is called.  If we are rolling back the view value to the last
+         *   committed value then `$render()` is called to update the input control.
+         * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
+         *   the `$viewValue` are different from last time.
+         *
+         * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
+         * `$modelValue` and `$viewValue` are actually different from their previous values. If `$modelValue`
+         * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
+         * invoked if you only change a property on the objects.
+         */
+        $render: noop,
 
-     it('should let you toggle string example', function() {
-         expect(ps.get(1).getAttribute('class')).toBe('');
-         element(by.model('style')).clear();
-         element(by.model('style')).sendKeys('red');
-         expect(ps.get(1).getAttribute('class')).toBe('red');
-       });
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$isEmpty
+         *
+         * @description
+         * This is called when we need to determine if the value of an input is empty.
+         *
+         * For instance, the required directive does this to work out if the input has data or not.
+         *
+         * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
+         *
+         * You can override this for input directives whose concept of being empty is different from the
+         * default. The `checkboxInputType` directive does this because in its case a value of `false`
+         * implies empty.
+         *
+         * @param {*} value The value of the input to check for emptiness.
+         * @returns {boolean} True if `value` is "empty".
+         */
+        $isEmpty: function(value) {
+            // eslint-disable-next-line no-self-compare
+            return isUndefined(value) || value === '' || value === null || value !== value;
+        },
 
-     it('array example should have 3 classes', function() {
-         expect(ps.last().getAttribute('class')).toBe('');
-         element(by.model('style1')).sendKeys('bold');
-         element(by.model('style2')).sendKeys('strike');
-         element(by.model('style3')).sendKeys('red');
-         expect(ps.last().getAttribute('class')).toBe('bold strike red');
-       });
-     </file>
-     </example>
+        $$updateEmptyClasses: function(value) {
+            if (this.$isEmpty(value)) {
+                this.$$animate.removeClass(this.$$element, NOT_EMPTY_CLASS);
+                this.$$animate.addClass(this.$$element, EMPTY_CLASS);
+            } else {
+                this.$$animate.removeClass(this.$$element, EMPTY_CLASS);
+                this.$$animate.addClass(this.$$element, NOT_EMPTY_CLASS);
+            }
+        },
 
-     ## Animations
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setPristine
+         *
+         * @description
+         * Sets the control to its pristine state.
+         *
+         * This method can be called to remove the `ng-dirty` class and set the control to its pristine
+         * state (`ng-pristine` class). A model is considered to be pristine when the control
+         * has not been changed from when first compiled.
+         */
+        $setPristine: function() {
+            this.$dirty = false;
+            this.$pristine = true;
+            this.$$animate.removeClass(this.$$element, DIRTY_CLASS);
+            this.$$animate.addClass(this.$$element, PRISTINE_CLASS);
+        },
 
-     The example below demonstrates how to perform animations using ngClass.
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setDirty
+         *
+         * @description
+         * Sets the control to its dirty state.
+         *
+         * This method can be called to remove the `ng-pristine` class and set the control to its dirty
+         * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed
+         * from when first compiled.
+         */
+        $setDirty: function() {
+            this.$dirty = true;
+            this.$pristine = false;
+            this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
+            this.$$animate.addClass(this.$$element, DIRTY_CLASS);
+            this.$$parentForm.$setDirty();
+        },
 
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-     <file name="index.html">
-     <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
-     <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
-     <br>
-     <span class="base-class" ng-class="myVar">Sample Text</span>
-     </file>
-     <file name="style.css">
-     .base-class {
-         -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-       }
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setUntouched
+         *
+         * @description
+         * Sets the control to its untouched state.
+         *
+         * This method can be called to remove the `ng-touched` class and set the control to its
+         * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched
+         * by default, however this function can be used to restore that state if the model has
+         * already been touched by the user.
+         */
+        $setUntouched: function() {
+            this.$touched = false;
+            this.$untouched = true;
+            this.$$animate.setClass(this.$$element, UNTOUCHED_CLASS, TOUCHED_CLASS);
+        },
 
-     .base-class.my-class {
-         color: red;
-         font-size:3em;
-       }
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-class', function() {
-         expect(element(by.css('.base-class')).getAttribute('class')).not.
-           toMatch(/my-class/);
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setTouched
+         *
+         * @description
+         * Sets the control to its touched state.
+         *
+         * This method can be called to remove the `ng-untouched` class and set the control to its
+         * touched state (`ng-touched` class). A model is considered to be touched when the user has
+         * first focused the control element and then shifted focus away from the control (blur event).
+         */
+        $setTouched: function() {
+            this.$touched = true;
+            this.$untouched = false;
+            this.$$animate.setClass(this.$$element, TOUCHED_CLASS, UNTOUCHED_CLASS);
+        },
 
-         element(by.id('setbtn')).click();
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$rollbackViewValue
+         *
+         * @description
+         * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`,
+         * which may be caused by a pending debounced event or because the input is waiting for some
+         * future event.
+         *
+         * If you have an input that uses `ng-model-options` to set up debounced updates or updates that
+         * depend on special events such as `blur`, there can be a period when the `$viewValue` is out of
+         * sync with the ngModel's `$modelValue`.
+         *
+         * In this case, you can use `$rollbackViewValue()` to manually cancel the debounced / future update
+         * and reset the input to the last committed view value.
+         *
+         * It is also possible that you run into difficulties if you try to update the ngModel's `$modelValue`
+         * programmatically before these debounced/future events have resolved/occurred, because AngularJS's
+         * dirty checking mechanism is not able to tell whether the model has actually changed or not.
+         *
+         * The `$rollbackViewValue()` method should be called before programmatically changing the model of an
+         * input which may have such events pending. This is important in order to make sure that the
+         * input field will be updated with the new model value and any pending operations are cancelled.
+         *
+         * @example
+         * <example name="ng-model-cancel-update" module="cancel-update-example">
+         *   <file name="app.js">
+         *     angular.module('cancel-update-example', [])
+         *
+         *     .controller('CancelUpdateController', ['$scope', function($scope) {
+         *       $scope.model = {value1: '', value2: ''};
+         *
+         *       $scope.setEmpty = function(e, value, rollback) {
+         *         if (e.keyCode === 27) {
+         *           e.preventDefault();
+         *           if (rollback) {
+         *             $scope.myForm[value].$rollbackViewValue();
+         *           }
+         *           $scope.model[value] = '';
+         *         }
+         *       };
+         *     }]);
+         *   </file>
+         *   <file name="index.html">
+         *     <div ng-controller="CancelUpdateController">
+         *       <p>Both of these inputs are only updated if they are blurred. Hitting escape should
+         *       empty them. Follow these steps and observe the difference:</p>
+         *       <ol>
+         *         <li>Type something in the input. You will see that the model is not yet updated</li>
+         *         <li>Press the Escape key.
+         *           <ol>
+         *             <li> In the first example, nothing happens, because the model is already '', and no
+         *             update is detected. If you blur the input, the model will be set to the current view.
+         *             </li>
+         *             <li> In the second example, the pending update is cancelled, and the input is set back
+         *             to the last committed view value (''). Blurring the input does nothing.
+         *             </li>
+         *           </ol>
+         *         </li>
+         *       </ol>
+         *
+         *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
+         *         <div>
+         *           <p id="inputDescription1">Without $rollbackViewValue():</p>
+         *           <input name="value1" aria-describedby="inputDescription1" ng-model="model.value1"
+         *                  ng-keydown="setEmpty($event, 'value1')">
+         *           value1: "{{ model.value1 }}"
+         *         </div>
+         *
+         *         <div>
+         *           <p id="inputDescription2">With $rollbackViewValue():</p>
+         *           <input name="value2" aria-describedby="inputDescription2" ng-model="model.value2"
+         *                  ng-keydown="setEmpty($event, 'value2', true)">
+         *           value2: "{{ model.value2 }}"
+         *         </div>
+         *       </form>
+         *     </div>
+         *   </file>
+         <file name="style.css">
+         div {
+            display: table-cell;
+          }
+         div:nth-child(1) {
+            padding-right: 30px;
+          }
 
-         expect(element(by.css('.base-class')).getAttribute('class')).
-           toMatch(/my-class/);
+         </file>
+         * </example>
+         */
+        $rollbackViewValue: function() {
+            this.$$timeout.cancel(this.$$pendingDebounce);
+            this.$viewValue = this.$$lastCommittedViewValue;
+            this.$render();
+        },
 
-         element(by.id('clearbtn')).click();
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$validate
+         *
+         * @description
+         * Runs each of the registered validators (first synchronous validators and then
+         * asynchronous validators).
+         * If the validity changes to invalid, the model will be set to `undefined`,
+         * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
+         * If the validity changes to valid, it will set the model to the last available valid
+         * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
+         */
+        $validate: function() {
+            // ignore $validate before model is initialized
+            if (isNumberNaN(this.$modelValue)) {
+                return;
+            }
 
-         expect(element(by.css('.base-class')).getAttribute('class')).not.
-           toMatch(/my-class/);
-       });
-     </file>
-     </example>
+            var viewValue = this.$$lastCommittedViewValue;
+            // Note: we use the $$rawModelValue as $modelValue might have been
+            // set to undefined during a view -> model update that found validation
+            // errors. We can't parse the view here, since that could change
+            // the model although neither viewValue nor the model on the scope changed
+            var modelValue = this.$$rawModelValue;
+
+            var prevValid = this.$valid;
+            var prevModelValue = this.$modelValue;
+
+            var allowInvalid = this.$options.getOption('allowInvalid');
+
+            var that = this;
+            this.$$runValidators(modelValue, viewValue, function(allValid) {
+                // If there was no change in validity, don't update the model
+                // This prevents changing an invalid modelValue to undefined
+                if (!allowInvalid && prevValid !== allValid) {
+                    // Note: Don't check this.$valid here, as we could have
+                    // external validators (e.g. calculated on the server),
+                    // that just call $setValidity and need the model value
+                    // to calculate their validity.
+                    that.$modelValue = allValid ? modelValue : undefined;
+
+                    if (that.$modelValue !== prevModelValue) {
+                        that.$$writeModelToScope();
+                    }
+                }
+            });
+        },
 
+        $$runValidators: function(modelValue, viewValue, doneCallback) {
+            this.$$currentValidationRunId++;
+            var localValidationRunId = this.$$currentValidationRunId;
+            var that = this;
 
-     ## ngClass and pre-existing CSS3 Transitions/Animations
-     The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
-     Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
-     any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
-     to view the step by step details of {@link ngAnimate.$animate#addclass $animate.addClass} and
-     {@link ngAnimate.$animate#removeclass $animate.removeClass}.
-     */
-    var ngClassDirective = classDirective('', true);
+            // check parser error
+            if (!processParseErrors()) {
+                validationDone(false);
+                return;
+            }
+            if (!processSyncValidators()) {
+                validationDone(false);
+                return;
+            }
+            processAsyncValidators();
 
-    /**
-     * @ngdoc directive
-     * @name ngClassOdd
-     * @restrict AC
-     *
-     * @description
-     * The `ngClassOdd` and `ngClassEven` directives work exactly as
-     * {@link ng.directive:ngClass ngClass}, except they work in
-     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
-     *
-     * This directive can be applied only within the scope of an
-     * {@link ng.directive:ngRepeat ngRepeat}.
-     *
-     * @element ANY
-     * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
-     *   of the evaluation can be a string representing space delimited class names or an array.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
-     <li ng-repeat="name in names">
-     <span ng-class-odd="'odd'" ng-class-even="'even'">
-     {{name}}
-     </span>
-     </li>
-     </ol>
-     </file>
-     <file name="style.css">
-     .odd {
-         color: red;
-       }
-     .even {
-         color: blue;
-       }
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-class-odd and ng-class-even', function() {
-         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
-           toMatch(/odd/);
-         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
-           toMatch(/even/);
-       });
-     </file>
-     </example>
-     */
-    var ngClassOddDirective = classDirective('Odd', 0);
+            function processParseErrors() {
+                var errorKey = that.$$parserName || 'parse';
+                if (isUndefined(that.$$parserValid)) {
+                    setValidity(errorKey, null);
+                } else {
+                    if (!that.$$parserValid) {
+                        forEach(that.$validators, function(v, name) {
+                            setValidity(name, null);
+                        });
+                        forEach(that.$asyncValidators, function(v, name) {
+                            setValidity(name, null);
+                        });
+                    }
+                    // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
+                    setValidity(errorKey, that.$$parserValid);
+                    return that.$$parserValid;
+                }
+                return true;
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngClassEven
-     * @restrict AC
-     *
-     * @description
-     * The `ngClassOdd` and `ngClassEven` directives work exactly as
-     * {@link ng.directive:ngClass ngClass}, except they work in
-     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
-     *
-     * This directive can be applied only within the scope of an
-     * {@link ng.directive:ngRepeat ngRepeat}.
-     *
-     * @element ANY
-     * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
-     *   result of the evaluation can be a string representing space delimited class names or an array.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
-     <li ng-repeat="name in names">
-     <span ng-class-odd="'odd'" ng-class-even="'even'">
-     {{name}} &nbsp; &nbsp; &nbsp;
-     </span>
-     </li>
-     </ol>
-     </file>
-     <file name="style.css">
-     .odd {
-         color: red;
-       }
-     .even {
-         color: blue;
-       }
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-class-odd and ng-class-even', function() {
-         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
-           toMatch(/odd/);
-         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
-           toMatch(/even/);
-       });
-     </file>
-     </example>
-     */
-    var ngClassEvenDirective = classDirective('Even', 1);
+            function processSyncValidators() {
+                var syncValidatorsValid = true;
+                forEach(that.$validators, function(validator, name) {
+                    var result = Boolean(validator(modelValue, viewValue));
+                    syncValidatorsValid = syncValidatorsValid && result;
+                    setValidity(name, result);
+                });
+                if (!syncValidatorsValid) {
+                    forEach(that.$asyncValidators, function(v, name) {
+                        setValidity(name, null);
+                    });
+                    return false;
+                }
+                return true;
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngCloak
-     * @restrict AC
-     *
-     * @description
-     * The `ngCloak` directive is used to prevent the Angular html template from being briefly
-     * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
-     * directive to avoid the undesirable flicker effect caused by the html template display.
-     *
-     * The directive can be applied to the `<body>` element, but the preferred usage is to apply
-     * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
-     * of the browser view.
-     *
-     * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
-     * `angular.min.js`.
-     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
-     *
-     * ```css
-     * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
- *   display: none !important;
- * }
-     * ```
-     *
-     * When this css rule is loaded by the browser, all html elements (including their children) that
-     * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
-     * during the compilation of the template it deletes the `ngCloak` element attribute, making
-     * the compiled element visible.
-     *
-     * For the best result, the `angular.js` script must be loaded in the head section of the html
-     * document; alternatively, the css rule above must be included in the external stylesheet of the
-     * application.
-     *
-     * Legacy browsers, like IE7, do not provide attribute selector support (added in CSS 2.1) so they
-     * cannot match the `[ng\:cloak]` selector. To work around this limitation, you must add the css
-     * class `ng-cloak` in addition to the `ngCloak` directive as shown in the example below.
-     *
-     * @element ANY
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div id="template1" ng-cloak>{{ 'hello' }}</div>
-     <div id="template2" ng-cloak class="ng-cloak">{{ 'hello IE7' }}</div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should remove the template directive and css class', function() {
-         expect($('#template1').getAttribute('ng-cloak')).
-           toBeNull();
-         expect($('#template2').getAttribute('ng-cloak')).
-           toBeNull();
-       });
-     </file>
-     </example>
-     *
-     */
-    var ngCloakDirective = ngDirective({
-        compile: function(element, attr) {
-            attr.$set('ngCloak', undefined);
-            element.removeClass('ng-cloak');
-        }
-    });
+            function processAsyncValidators() {
+                var validatorPromises = [];
+                var allValid = true;
+                forEach(that.$asyncValidators, function(validator, name) {
+                    var promise = validator(modelValue, viewValue);
+                    if (!isPromiseLike(promise)) {
+                        throw ngModelMinErr('nopromise',
+                            'Expected asynchronous validator to return a promise but got \'{0}\' instead.', promise);
+                    }
+                    setValidity(name, undefined);
+                    validatorPromises.push(promise.then(function() {
+                        setValidity(name, true);
+                    }, function() {
+                        allValid = false;
+                        setValidity(name, false);
+                    }));
+                });
+                if (!validatorPromises.length) {
+                    validationDone(true);
+                } else {
+                    that.$$q.all(validatorPromises).then(function() {
+                        validationDone(allValid);
+                    }, noop);
+                }
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngController
-     *
-     * @description
-     * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
-     * supports the principles behind the Model-View-Controller design pattern.
-     *
-     * MVC components in angular:
-     *
-     * * Model — The Model is scope properties; scopes are attached to the DOM where scope properties
-     *   are accessed through bindings.
-     * * View — The template (HTML with data bindings) that is rendered into the View.
-     * * Controller — The `ngController` directive specifies a Controller class; the class contains business
-     *   logic behind the application to decorate the scope with functions and values
-     *
-     * Note that you can also attach controllers to the DOM by declaring it in a route definition
-     * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
-     * again using `ng-controller` in the template itself.  This will cause the controller to be attached
-     * and executed twice.
-     *
-     * @element ANY
-     * @scope
-     * @param {expression} ngController Name of a globally accessible constructor function or an
-     *     {@link guide/expression expression} that on the current scope evaluates to a
-     *     constructor function. The controller instance can be published into a scope property
-     *     by specifying `as propertyName`.
-     *
-     * @example
-     * Here is a simple form for editing user contact information. Adding, removing, clearing, and
-     * greeting are methods declared on the controller (see source tab). These methods can
-     * easily be called from the angular markup. Notice that the scope becomes the `this` for the
-     * controller's instance. This allows for easy access to the view data from the controller. Also
-     * notice that any changes to the data are automatically reflected in the View without the need
-     * for a manual update. The example is shown in two different declaration styles you may use
-     * according to preference.
-     <example>
-     <file name="index.html">
-     <script>
-     function SettingsController1() {
-          this.name = "John Smith";
-          this.contacts = [
-            {type: 'phone', value: '408 555 1212'},
-            {type: 'email', value: 'john.smith@example.org'} ];
-     };
-
-     SettingsController1.prototype.greet = function() {
-          alert(this.name);
-        };
+            function setValidity(name, isValid) {
+                if (localValidationRunId === that.$$currentValidationRunId) {
+                    that.$setValidity(name, isValid);
+                }
+            }
 
-     SettingsController1.prototype.addContact = function() {
-          this.contacts.push({type: 'email', value: 'yourname@example.org'});
-     };
+            function validationDone(allValid) {
+                if (localValidationRunId === that.$$currentValidationRunId) {
 
-     SettingsController1.prototype.removeContact = function(contactToRemove) {
-         var index = this.contacts.indexOf(contactToRemove);
-          this.contacts.splice(index, 1);
-        };
+                    doneCallback(allValid);
+                }
+            }
+        },
 
-     SettingsController1.prototype.clearContact = function(contact) {
-          contact.type = 'phone';
-          contact.value = '';
-        };
-     </script>
-     <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
-     Name: <input type="text" ng-model="settings.name"/>
-     [ <a href="" ng-click="settings.greet()">greet</a> ]<br/>
-     Contact:
-     <ul>
-     <li ng-repeat="contact in settings.contacts">
-     <select ng-model="contact.type">
-     <option>phone</option>
-     <option>email</option>
-     </select>
-     <input type="text" ng-model="contact.value"/>
-     [ <a href="" ng-click="settings.clearContact(contact)">clear</a>
-     | <a href="" ng-click="settings.removeContact(contact)">X</a> ]
-     </li>
-     <li>[ <a href="" ng-click="settings.addContact()">add</a> ]</li>
-     </ul>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check controller as', function() {
-         var container = element(by.id('ctrl-as-exmpl'));
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$commitViewValue
+         *
+         * @description
+         * Commit a pending update to the `$modelValue`.
+         *
+         * Updates may be pending by a debounced event or because the input is waiting for a some future
+         * event defined in `ng-model-options`. this method is rarely needed as `NgModelController`
+         * usually handles calling this in response to input events.
+         */
+        $commitViewValue: function() {
+            var viewValue = this.$viewValue;
 
-         expect(container.findElement(by.model('settings.name'))
-             .getAttribute('value')).toBe('John Smith');
+            this.$$timeout.cancel(this.$$pendingDebounce);
 
-         var firstRepeat =
-             container.findElement(by.repeater('contact in settings.contacts').row(0));
-         var secondRepeat =
-             container.findElement(by.repeater('contact in settings.contacts').row(1));
+            // If the view value has not changed then we should just exit, except in the case where there is
+            // a native validator on the element. In this case the validation state may have changed even though
+            // the viewValue has stayed empty.
+            if (this.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !this.$$hasNativeValidators)) {
+                return;
+            }
+            this.$$updateEmptyClasses(viewValue);
+            this.$$lastCommittedViewValue = viewValue;
 
-         expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('408 555 1212');
-         expect(secondRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('john.smith@example.org');
+            // change to dirty
+            if (this.$pristine) {
+                this.$setDirty();
+            }
+            this.$$parseAndValidate();
+        },
 
-     firstRepeat.findElement(by.linkText('clear')).click();
+        $$parseAndValidate: function() {
+            var viewValue = this.$$lastCommittedViewValue;
+            var modelValue = viewValue;
+            var that = this;
 
-     expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-     .toBe('');
+            this.$$parserValid = isUndefined(modelValue) ? undefined : true;
 
-     container.findElement(by.linkText('add')).click();
+            if (this.$$parserValid) {
+                for (var i = 0; i < this.$parsers.length; i++) {
+                    modelValue = this.$parsers[i](modelValue);
+                    if (isUndefined(modelValue)) {
+                        this.$$parserValid = false;
+                        break;
+                    }
+                }
+            }
+            if (isNumberNaN(this.$modelValue)) {
+                // this.$modelValue has not been touched yet...
+                this.$modelValue = this.$$ngModelGet(this.$$scope);
+            }
+            var prevModelValue = this.$modelValue;
+            var allowInvalid = this.$options.getOption('allowInvalid');
+            this.$$rawModelValue = modelValue;
 
-     expect(container.findElement(by.repeater('contact in settings.contacts').row(2))
-     .findElement(by.model('contact.value'))
-     .getAttribute('value'))
-     .toBe('yourname@example.org');
-     });
-     </file>
-     </example>
-     <example>
-     <file name="index.html">
-     <script>
-     function SettingsController2($scope) {
-          $scope.name = "John Smith";
-          $scope.contacts = [
-            {type:'phone', value:'408 555 1212'},
-            {type:'email', value:'john.smith@example.org'} ];
-
-     $scope.greet = function() {
-           alert(this.name);
-          };
+            if (allowInvalid) {
+                this.$modelValue = modelValue;
+                writeToModelIfNeeded();
+            }
 
-     $scope.addContact = function() {
-           this.contacts.push({type:'email', value:'yourname@example.org'});
-     };
+            // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
+            // This can happen if e.g. $setViewValue is called from inside a parser
+            this.$$runValidators(modelValue, this.$$lastCommittedViewValue, function(allValid) {
+                if (!allowInvalid) {
+                    // Note: Don't check this.$valid here, as we could have
+                    // external validators (e.g. calculated on the server),
+                    // that just call $setValidity and need the model value
+                    // to calculate their validity.
+                    that.$modelValue = allValid ? modelValue : undefined;
+                    writeToModelIfNeeded();
+                }
+            });
 
-     $scope.removeContact = function(contactToRemove) {
-           var index = this.contacts.indexOf(contactToRemove);
-           this.contacts.splice(index, 1);
-          };
+            function writeToModelIfNeeded() {
+                if (that.$modelValue !== prevModelValue) {
+                    that.$$writeModelToScope();
+                }
+            }
+        },
 
-     $scope.clearContact = function(contact) {
-           contact.type = 'phone';
-           contact.value = '';
-          };
-     }
-     </script>
-     <div id="ctrl-exmpl" ng-controller="SettingsController2">
-     Name: <input type="text" ng-model="name"/>
-     [ <a href="" ng-click="greet()">greet</a> ]<br/>
-     Contact:
-     <ul>
-     <li ng-repeat="contact in contacts">
-     <select ng-model="contact.type">
-     <option>phone</option>
-     <option>email</option>
-     </select>
-     <input type="text" ng-model="contact.value"/>
-     [ <a href="" ng-click="clearContact(contact)">clear</a>
-     | <a href="" ng-click="removeContact(contact)">X</a> ]
-     </li>
-     <li>[ <a href="" ng-click="addContact()">add</a> ]</li>
-     </ul>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check controller', function() {
-         var container = element(by.id('ctrl-exmpl'));
+        $$writeModelToScope: function() {
+            this.$$ngModelSet(this.$$scope, this.$modelValue);
+            forEach(this.$viewChangeListeners, function(listener) {
+                try {
+                    listener();
+                } catch (e) {
+                    // eslint-disable-next-line no-invalid-this
+                    this.$$exceptionHandler(e);
+                }
+            }, this);
+        },
 
-         expect(container.findElement(by.model('name'))
-             .getAttribute('value')).toBe('John Smith');
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setViewValue
+         *
+         * @description
+         * Update the view value.
+         *
+         * This method should be called when a control wants to change the view value; typically,
+         * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
+         * directive calls it when the value of the input changes and {@link ng.directive:select select}
+         * calls it when an option is selected.
+         *
+         * When `$setViewValue` is called, the new `value` will be staged for committing through the `$parsers`
+         * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged
+         * value is sent directly for processing through the `$parsers` pipeline. After this, the `$validators` and
+         * `$asyncValidators` are called and the value is applied to `$modelValue`.
+         * Finally, the value is set to the **expression** specified in the `ng-model` attribute and
+         * all the registered change listeners, in the `$viewChangeListeners` list are called.
+         *
+         * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn`
+         * and the `default` trigger is not listed, all those actions will remain pending until one of the
+         * `updateOn` events is triggered on the DOM element.
+         * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions}
+         * directive is used with a custom debounce for this particular event.
+         * Note that a `$digest` is only triggered once the `updateOn` events are fired, or if `debounce`
+         * is specified, once the timer runs out.
+         *
+         * When used with standard inputs, the view value will always be a string (which is in some cases
+         * parsed into another type, such as a `Date` object for `input[date]`.)
+         * However, custom controls might also pass objects to this method. In this case, we should make
+         * a copy of the object before passing it to `$setViewValue`. This is because `ngModel` does not
+         * perform a deep watch of objects, it only looks for a change of identity. If you only change
+         * the property of the object then ngModel will not realize that the object has changed and
+         * will not invoke the `$parsers` and `$validators` pipelines. For this reason, you should
+         * not change properties of the copy once it has been passed to `$setViewValue`.
+         * Otherwise you may cause the model value on the scope to change incorrectly.
+         *
+         * <div class="alert alert-info">
+         * In any case, the value passed to the method should always reflect the current value
+         * of the control. For example, if you are calling `$setViewValue` for an input element,
+         * you should pass the input DOM value. Otherwise, the control and the scope model become
+         * out of sync. It's also important to note that `$setViewValue` does not call `$render` or change
+         * the control's DOM value in any way. If we want to change the control's DOM value
+         * programmatically, we should update the `ngModel` scope expression. Its new value will be
+         * picked up by the model controller, which will run it through the `$formatters`, `$render` it
+         * to update the DOM, and finally call `$validate` on it.
+         * </div>
+         *
+         * @param {*} value value from the view.
+         * @param {string} trigger Event that triggered the update.
+         */
+        $setViewValue: function(value, trigger) {
+            this.$viewValue = value;
+            if (this.$options.getOption('updateOnDefault')) {
+                this.$$debounceViewValueCommit(trigger);
+            }
+        },
 
-         var firstRepeat =
-             container.findElement(by.repeater('contact in contacts').row(0));
-         var secondRepeat =
-             container.findElement(by.repeater('contact in contacts').row(1));
+        $$debounceViewValueCommit: function(trigger) {
+            var debounceDelay = this.$options.getOption('debounce');
 
-         expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('408 555 1212');
-         expect(secondRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('john.smith@example.org');
+            if (isNumber(debounceDelay[trigger])) {
+                debounceDelay = debounceDelay[trigger];
+            } else if (isNumber(debounceDelay['default'])) {
+                debounceDelay = debounceDelay['default'];
+            }
 
-     firstRepeat.findElement(by.linkText('clear')).click();
+            this.$$timeout.cancel(this.$$pendingDebounce);
+            var that = this;
+            if (debounceDelay > 0) { // this fails if debounceDelay is an object
+                this.$$pendingDebounce = this.$$timeout(function() {
+                    that.$commitViewValue();
+                }, debounceDelay);
+            } else if (this.$$scope.$root.$$phase) {
+                this.$commitViewValue();
+            } else {
+                this.$$scope.$apply(function() {
+                    that.$commitViewValue();
+                });
+            }
+        },
 
-     expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-     .toBe('');
+        /**
+         * @ngdoc method
+         *
+         * @name ngModel.NgModelController#$overrideModelOptions
+         *
+         * @description
+         *
+         * Override the current model options settings programmatically.
+         *
+         * The previous `ModelOptions` value will not be modified. Instead, a
+         * new `ModelOptions` object will inherit from the previous one overriding
+         * or inheriting settings that are defined in the given parameter.
+         *
+         * See {@link ngModelOptions} for information about what options can be specified
+         * and how model option inheritance works.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** this function only affects the options set on the `ngModelController`,
+         * and not the options on the {@link ngModelOptions} directive from which they might have been
+         * obtained initially.
+         * </div>
+         *
+         * <div class="alert alert-danger">
+         * **Note:** it is not possible to override the `getterSetter` option.
+         * </div>
+         *
+         * @param {Object} options a hash of settings to override the previous options
+         *
+         */
+        $overrideModelOptions: function(options) {
+            this.$options = this.$options.createChild(options);
+            this.$$setUpdateOnEvents();
+        },
 
-     container.findElement(by.linkText('add')).click();
+        /**
+         * @ngdoc method
+         *
+         * @name  ngModel.NgModelController#$processModelValue
 
-     expect(container.findElement(by.repeater('contact in contacts').row(2))
-     .findElement(by.model('contact.value'))
-     .getAttribute('value'))
-     .toBe('yourname@example.org');
-     });
-     </file>
-     </example>
+         * @description
+         *
+         * Runs the model -> view pipeline on the current
+         * {@link ngModel.NgModelController#$modelValue $modelValue}.
+         *
+         * The following actions are performed by this method:
+         *
+         * - the `$modelValue` is run through the {@link ngModel.NgModelController#$formatters $formatters}
+         * and the result is set to the {@link ngModel.NgModelController#$viewValue $viewValue}
+         * - the `ng-empty` or `ng-not-empty` class is set on the element
+         * - if the `$viewValue` has changed:
+         *   - {@link ngModel.NgModelController#$render $render} is called on the control
+         *   - the {@link ngModel.NgModelController#$validators $validators} are run and
+         *   the validation status is set.
+         *
+         * This method is called by ngModel internally when the bound scope value changes.
+         * Application developers usually do not have to call this function themselves.
+         *
+         * This function can be used when the `$viewValue` or the rendered DOM value are not correctly
+         * formatted and the `$modelValue` must be run through the `$formatters` again.
+         *
+         * @example
+         * Consider a text input with an autocomplete list (for fruit), where the items are
+         * objects with a name and an id.
+         * A user enters `ap` and then selects `Apricot` from the list.
+         * Based on this, the autocomplete widget will call `$setViewValue({name: 'Apricot', id: 443})`,
+         * but the rendered value will still be `ap`.
+         * The widget can then call `ctrl.$processModelValue()` to run the model -> view
+         * pipeline again, which formats the object to the string `Apricot`,
+         * then updates the `$viewValue`, and finally renders it in the DOM.
+         *
+         * <example module="inputExample" name="ng-model-process">
+         <file name="index.html">
+         <div ng-controller="inputController" style="display: flex;">
+         <div style="margin-right: 30px;">
+         Search Fruit:
+         <basic-autocomplete items="items" on-select="selectedFruit = item"></basic-autocomplete>
+         </div>
+         <div>
+         Model:<br>
+         <pre>{{selectedFruit | json}}</pre>
+         </div>
+         </div>
+         </file>
+         <file name="app.js">
+         angular.module('inputExample', [])
+         .controller('inputController', function($scope) {
+          $scope.items = [
+            {name: 'Apricot', id: 443},
+            {name: 'Clementine', id: 972},
+            {name: 'Durian', id: 169},
+            {name: 'Jackfruit', id: 982},
+            {name: 'Strawberry', id: 863}
+          ];
+        })
+         .component('basicAutocomplete', {
+          bindings: {
+            items: '<',
+            onSelect: '&'
+          },
+          templateUrl: 'autocomplete.html',
+          controller: function($element, $scope) {
+            var that = this;
+            var ngModel;
+
+            that.$postLink = function() {
+              ngModel = $element.find('input').controller('ngModel');
+
+              ngModel.$formatters.push(function(value) {
+                return (value && value.name) || value;
+              });
+
+              ngModel.$parsers.push(function(value) {
+                var match = value;
+                for (var i = 0; i < that.items.length; i++) {
+                  if (that.items[i].name === value) {
+                    match = that.items[i];
+                    break;
+                  }
+                }
+
+                return match;
+              });
+            };
+
+            that.selectItem = function(item) {
+              ngModel.$setViewValue(item);
+              ngModel.$processModelValue();
+              that.onSelect({item: item});
+            };
+          }
+        });
+         </file>
+         <file name="autocomplete.html">
+         <div>
+         <input type="search" ng-model="$ctrl.searchTerm" />
+         <ul>
+         <li ng-repeat="item in $ctrl.items | filter:$ctrl.searchTerm">
+         <button ng-click="$ctrl.selectItem(item)">{{ item.name }}</button>
+         </li>
+         </ul>
+         </div>
+         </file>
+         * </example>
+         *
+         */
+        $processModelValue: function() {
+            var viewValue = this.$$format();
+
+            if (this.$viewValue !== viewValue) {
+                this.$$updateEmptyClasses(viewValue);
+                this.$viewValue = this.$$lastCommittedViewValue = viewValue;
+                this.$render();
+                // It is possible that model and view value have been updated during render
+                this.$$runValidators(this.$modelValue, this.$viewValue, noop);
+            }
+        },
+
+        /**
+         * This method is called internally to run the $formatters on the $modelValue
+         */
+        $$format: function() {
+            var formatters = this.$formatters,
+                idx = formatters.length;
+
+            var viewValue = this.$modelValue;
+            while (idx--) {
+                viewValue = formatters[idx](viewValue);
+            }
+
+            return viewValue;
+        },
+
+        /**
+         * This method is called internally when the bound scope value changes.
+         */
+        $$setModelValue: function(modelValue) {
+            this.$modelValue = this.$$rawModelValue = modelValue;
+            this.$$parserValid = undefined;
+            this.$processModelValue();
+        },
+
+        $$setUpdateOnEvents: function() {
+            if (this.$$updateEvents) {
+                this.$$element.off(this.$$updateEvents, this.$$updateEventHandler);
+            }
+
+            this.$$updateEvents = this.$options.getOption('updateOn');
+            if (this.$$updateEvents) {
+                this.$$element.on(this.$$updateEvents, this.$$updateEventHandler);
+            }
+        },
+
+        $$updateEventHandler: function(ev) {
+            this.$$debounceViewValueCommit(ev && ev.type);
+        }
+    };
+
+    function setupModelWatcher(ctrl) {
+        // model -> value
+        // Note: we cannot use a normal scope.$watch as we want to detect the following:
+        // 1. scope value is 'a'
+        // 2. user enters 'b'
+        // 3. ng-change kicks in and reverts scope value to 'a'
+        //    -> scope value did not change since the last digest as
+        //       ng-change executes in apply phase
+        // 4. view should be changed back to 'a'
+        ctrl.$$scope.$watch(function ngModelWatch(scope) {
+            var modelValue = ctrl.$$ngModelGet(scope);
+
+            // if scope model value and ngModel value are out of sync
+            // This cannot be moved to the action function, because it would not catch the
+            // case where the model is changed in the ngChange function or the model setter
+            if (modelValue !== ctrl.$modelValue &&
+                // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
+                // eslint-disable-next-line no-self-compare
+                (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
+            ) {
+                ctrl.$$setModelValue(modelValue);
+            }
+
+            return modelValue;
+        });
+    }
 
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setValidity
+     *
+     * @description
+     * Change the validity state, and notify the form.
+     *
+     * This method can be called within $parsers/$formatters or a custom validation implementation.
+     * However, in most cases it should be sufficient to use the `ngModel.$validators` and
+     * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically.
+     *
+     * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned
+     *        to either `$error[validationErrorKey]` or `$pending[validationErrorKey]`
+     *        (for unfulfilled `$asyncValidators`), so that it is available for data-binding.
+     *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
+     *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
+     *        classes and can be bound to as `{{ someForm.someControl.$error.myError }}`.
+     * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined),
+     *                          or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+     *                          Skipped is used by AngularJS when validators do not run because of parse errors and
+     *                          when `$asyncValidators` do not run because any of the `$validators` failed.
      */
-    var ngControllerDirective = [function() {
-        return {
-            scope: true,
-            controller: '@',
-            priority: 500
-        };
-    }];
+    addSetValidityMethod({
+        clazz: NgModelController,
+        set: function(object, property) {
+            object[property] = true;
+        },
+        unset: function(object, property) {
+            delete object[property];
+        }
+    });
+
 
     /**
      * @ngdoc directive
-     * @name ngCsp
+     * @name ngModel
+     * @restrict A
+     * @priority 1
+     * @param {expression} ngModel assignable {@link guide/expression Expression} to bind to.
      *
-     * @element html
      * @description
-     * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
+     * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
+     * property on the scope using {@link ngModel.NgModelController NgModelController},
+     * which is created and exposed by this directive.
      *
-     * This is necessary when developing things like Google Chrome Extensions.
+     * `ngModel` is responsible for:
      *
-     * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
-     * For us to be compatible, we just need to implement the "getterFn" in $parse without violating
-     * any of these restrictions.
+     * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
+     *   require.
+     * - Providing validation behavior (i.e. required, number, email, url).
+     * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors).
+     * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`,
+     *   `ng-untouched`, `ng-empty`, `ng-not-empty`) including animations.
+     * - Registering the control with its parent {@link ng.directive:form form}.
      *
-     * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
-     * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
-     * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
-     * be raised.
+     * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
+     * current scope. If the property doesn't already exist on this scope, it will be created
+     * implicitly and added to the scope.
      *
-     * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
-     * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
-     * To make those directives work in CSP mode, include the `angular-csp.css` manually.
+     * For best practices on using `ngModel`, see:
      *
-     * In order to use this feature put the `ngCsp` directive on the root element of the application.
+     *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
      *
-     * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+     * For basic examples, how to use `ngModel`, see:
      *
-     * @example
-     * This example shows how to apply the `ngCsp` directive to the `html` tag.
-     ```html
-     <!doctype html>
-     <html ng-app ng-csp>
-     ...
-     ...
-     </html>
-     ```
-     */
-
-// ngCsp is not implemented as a proper directive any more, because we need it be processed while we bootstrap
-// the system (before $parse is instantiated), for this reason we just have a csp() fn that looks for ng-csp attribute
-// anywhere in the current doc
-
-    /**
-     * @ngdoc directive
-     * @name ngClick
+     *  - {@link ng.directive:input input}
+     *    - {@link input[text] text}
+     *    - {@link input[checkbox] checkbox}
+     *    - {@link input[radio] radio}
+     *    - {@link input[number] number}
+     *    - {@link input[email] email}
+     *    - {@link input[url] url}
+     *    - {@link input[date] date}
+     *    - {@link input[datetime-local] datetime-local}
+     *    - {@link input[time] time}
+     *    - {@link input[month] month}
+     *    - {@link input[week] week}
+     *  - {@link ng.directive:select select}
+     *  - {@link ng.directive:textarea textarea}
      *
-     * @description
-     * The ngClick directive allows you to specify custom behavior when
-     * an element is clicked.
+     * ## Complex Models (objects or collections)
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
-     * click. ({@link guide/expression#-event- Event object is available as `$event`})
+     * By default, `ngModel` watches the model by reference, not value. This is important to know when
+     * binding inputs to models that are objects (e.g. `Date`) or collections (e.g. arrays). If only properties of the
+     * object or collection change, `ngModel` will not be notified and so the input will not be  re-rendered.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-click="count = count + 1" ng-init="count=0">
-     Increment
-     </button>
-     count: {{count}}
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-click', function() {
-         expect(element(by.binding('count')).getText()).toMatch('0');
-         element(by.css('button')).click();
-         expect(element(by.binding('count')).getText()).toMatch('1');
-       });
-     </file>
-     </example>
-     */
-    /*
-     * A directive that allows creation of custom onclick handlers that are defined as angular
-     * expressions and are compiled and executed within the current scope.
+     * The model must be assigned an entirely new object or collection before a re-rendering will occur.
      *
-     * Events that are handled via these handler are always configured not to propagate further.
-     */
-    var ngEventDirectives = {};
-    forEach(
-        'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
-        function(name) {
-            var directiveName = directiveNormalize('ng-' + name);
-            ngEventDirectives[directiveName] = ['$parse', function($parse) {
-                return {
-                    compile: function($element, attr) {
-                        var fn = $parse(attr[directiveName]);
-                        return function(scope, element, attr) {
-                            element.on(lowercase(name), function(event) {
-                                scope.$apply(function() {
-                                    fn(scope, {$event:event});
-                                });
-                            });
-                        };
-                    }
-                };
-            }];
-        }
-    );
-
-    /**
-     * @ngdoc directive
-     * @name ngDblclick
+     * Some directives have options that will cause them to use a custom `$watchCollection` on the model expression
+     * - for example, `ngOptions` will do so when a `track by` clause is included in the comprehension expression or
+     * if the select is given the `multiple` attribute.
      *
-     * @description
-     * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
+     * The `$watchCollection()` method only does a shallow comparison, meaning that changing properties deeper than the
+     * first level of the object (or only changing the properties of an item in the collection if it's an array) will still
+     * not trigger a re-rendering of the model.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
-     * a dblclick. (The Event object is available as `$event`)
+     * ## CSS classes
+     * The following CSS classes are added and removed on the associated input/select/textarea element
+     * depending on the validity of the model.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-dblclick="count = count + 1" ng-init="count=0">
-     Increment (on double click)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMousedown
+     *  - `ng-valid`: the model is valid
+     *  - `ng-invalid`: the model is invalid
+     *  - `ng-valid-[key]`: for each valid key added by `$setValidity`
+     *  - `ng-invalid-[key]`: for each invalid key added by `$setValidity`
+     *  - `ng-pristine`: the control hasn't been interacted with yet
+     *  - `ng-dirty`: the control has been interacted with
+     *  - `ng-touched`: the control has been blurred
+     *  - `ng-untouched`: the control hasn't been blurred
+     *  - `ng-pending`: any `$asyncValidators` are unfulfilled
+     *  - `ng-empty`: the view does not contain a value or the value is deemed "empty", as defined
+     *     by the {@link ngModel.NgModelController#$isEmpty} method
+     *  - `ng-not-empty`: the view contains a non-empty value
      *
-     * @description
-     * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
-     * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+     * @animations
+     * Animations within models are triggered when any of the associated CSS classes are added and removed
+     * on the input element which is attached to the model. These classes include: `.ng-pristine`, `.ng-dirty`,
+     * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
+     * The animations that are triggered within ngModel are similar to how they work in ngClass and
+     * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+     *
+     * The following example shows a simple way to utilize CSS transitions to style an input element
+     * that has been rendered as invalid after it has been validated:
+     *
+     * <pre>
+     * //be sure to include ngAnimate as a module to hook into more
+     * //advanced animations
+     * .my-input {
+     *   transition:0.5s linear all;
+     *   background: white;
+     * }
+     * .my-input.ng-invalid {
+     *   background: red;
+     *   color:white;
+     * }
+     * </pre>
      *
      * @example
-     <example>
+     * ### Basic Usage
+     * <example deps="angular-animate.js" animations="true" fixBase="true" module="inputExample" name="ng-model">
      <file name="index.html">
-     <button ng-mousedown="count = count + 1" ng-init="count=0">
-     Increment (on mouse down)
-     </button>
-     count: {{count}}
+     <script>
+     angular.module('inputExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+            $scope.val = '1';
+          }]);
+     </script>
+     <style>
+     .my-input {
+           transition:all linear 0.5s;
+           background: transparent;
+         }
+     .my-input.ng-invalid {
+           color:white;
+           background: red;
+         }
+     </style>
+     <p id="inputDescription">
+     Update input to see transitions when valid/invalid.
+     Integer is a valid value.
+     </p>
+     <form name="testForm" ng-controller="ExampleController">
+     <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
+     aria-describedby="inputDescription" />
+     </form>
      </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMouseup
+     * </example>
      *
-     * @description
-     * Specify custom behavior on mouseup event.
+     * @example
+     * ### Binding to a getter/setter
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
-     * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
+     * Sometimes it's helpful to bind `ngModel` to a getter/setter function.  A getter/setter is a
+     * function that returns a representation of the model when called with zero arguments, and sets
+     * the internal state of a model when called with an argument. It's sometimes useful to use this
+     * for models that have an internal representation that's different from what the model exposes
+     * to the view.
+     *
+     * <div class="alert alert-success">
+     * **Best Practice:** It's best to keep getters fast because AngularJS is likely to call them more
+     * frequently than other parts of your code.
+     * </div>
+     *
+     * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that
+     * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to
+     * a `<form>`, which will enable this behavior for all `<input>`s within it. See
+     * {@link ng.directive:ngModelOptions `ngModelOptions`} for more.
+     *
+     * The following example shows how to use `ngModel` with a getter/setter:
      *
      * @example
-     <example>
+     * <example name="ngModel-getter-setter" module="getterSetterExample">
      <file name="index.html">
-     <button ng-mouseup="count = count + 1" ng-init="count=0">
-     Increment (on mouse up)
-     </button>
-     count: {{count}}
+     <div ng-controller="ExampleController">
+     <form name="userForm">
+     <label>Name:
+     <input type="text" name="userName"
+     ng-model="user.name"
+     ng-model-options="{ getterSetter: true }" />
+     </label>
+     </form>
+     <pre>user.name = <span ng-bind="user.name()"></span></pre>
+     </div>
      </file>
-     </example>
+     <file name="app.js">
+     angular.module('getterSetterExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           var _name = 'Brian';
+           $scope.user = {
+             name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+             }
+           };
+         }]);
+     </file>
+     * </example>
      */
+    var ngModelDirective = ['$rootScope', function($rootScope) {
+        return {
+            restrict: 'A',
+            require: ['ngModel', '^?form', '^?ngModelOptions'],
+            controller: NgModelController,
+            // Prelink needs to run before any input directive
+            // so that we can set the NgModelOptions in NgModelController
+            // before anyone else uses it.
+            priority: 1,
+            compile: function ngModelCompile(element) {
+                // Setup initial state of the control
+                element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS);
+
+                return {
+                    pre: function ngModelPreLink(scope, element, attr, ctrls) {
+                        var modelCtrl = ctrls[0],
+                            formCtrl = ctrls[1] || modelCtrl.$$parentForm,
+                            optionsCtrl = ctrls[2];
+
+                        if (optionsCtrl) {
+                            modelCtrl.$options = optionsCtrl.$options;
+                        }
+
+                        modelCtrl.$$initGetterSetters();
+
+                        // notify others, especially parent forms
+                        formCtrl.$addControl(modelCtrl);
+
+                        attr.$observe('name', function(newValue) {
+                            if (modelCtrl.$name !== newValue) {
+                                modelCtrl.$$parentForm.$$renameControl(modelCtrl, newValue);
+                            }
+                        });
+
+                        scope.$on('$destroy', function() {
+                            modelCtrl.$$parentForm.$removeControl(modelCtrl);
+                        });
+                    },
+                    post: function ngModelPostLink(scope, element, attr, ctrls) {
+                        var modelCtrl = ctrls[0];
+                        modelCtrl.$$setUpdateOnEvents();
+
+                        function setTouched() {
+                            modelCtrl.$setTouched();
+                        }
+
+                        element.on('blur', function() {
+                            if (modelCtrl.$touched) return;
+
+                            if ($rootScope.$$phase) {
+                                scope.$evalAsync(setTouched);
+                            } else {
+                                scope.$apply(setTouched);
+                            }
+                        });
+                    }
+                };
+            }
+        };
+    }];
+
+    /* exported defaultModelOptions */
+    var defaultModelOptions;
+    var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
 
     /**
-     * @ngdoc directive
-     * @name ngMouseover
-     *
+     * @ngdoc type
+     * @name ModelOptions
      * @description
-     * Specify custom behavior on mouseover event.
-     *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
-     * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mouseover="count = count + 1" ng-init="count=0">
-     Increment (when mouse is over)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
+     * A container for the options set by the {@link ngModelOptions} directive
      */
+    function ModelOptions(options) {
+        this.$$options = options;
+    }
+
+    ModelOptions.prototype = {
+
+        /**
+         * @ngdoc method
+         * @name ModelOptions#getOption
+         * @param {string} name the name of the option to retrieve
+         * @returns {*} the value of the option
+         * @description
+         * Returns the value of the given option
+         */
+        getOption: function(name) {
+            return this.$$options[name];
+        },
+
+        /**
+         * @ngdoc method
+         * @name ModelOptions#createChild
+         * @param {Object} options a hash of options for the new child that will override the parent's options
+         * @return {ModelOptions} a new `ModelOptions` object initialized with the given options.
+         */
+        createChild: function(options) {
+            var inheritAll = false;
+
+            // make a shallow copy
+            options = extend({}, options);
+
+            // Inherit options from the parent if specified by the value `"$inherit"`
+            forEach(options, /* @this */ function(option, key) {
+                if (option === '$inherit') {
+                    if (key === '*') {
+                        inheritAll = true;
+                    } else {
+                        options[key] = this.$$options[key];
+                        // `updateOn` is special so we must also inherit the `updateOnDefault` option
+                        if (key === 'updateOn') {
+                            options.updateOnDefault = this.$$options.updateOnDefault;
+                        }
+                    }
+                } else {
+                    if (key === 'updateOn') {
+                        // If the `updateOn` property contains the `default` event then we have to remove
+                        // it from the event list and set the `updateOnDefault` flag.
+                        options.updateOnDefault = false;
+                        options[key] = trim(option.replace(DEFAULT_REGEXP, function() {
+                            options.updateOnDefault = true;
+                            return ' ';
+                        }));
+                    }
+                }
+            }, this);
+
+            if (inheritAll) {
+                // We have a property of the form: `"*": "$inherit"`
+                delete options['*'];
+                defaults(options, this.$$options);
+            }
+
+            // Finally add in any missing defaults
+            defaults(options, defaultModelOptions.$$options);
+
+            return new ModelOptions(options);
+        }
+    };
+
+
+    defaultModelOptions = new ModelOptions({
+        updateOn: '',
+        updateOnDefault: true,
+        debounce: 0,
+        getterSetter: false,
+        allowInvalid: false,
+        timezone: null
+    });
 
 
     /**
      * @ngdoc directive
-     * @name ngMouseenter
+     * @name ngModelOptions
+     * @restrict A
+     * @priority 10
      *
      * @description
-     * Specify custom behavior on mouseenter event.
+     * This directive allows you to modify the behaviour of {@link ngModel} directives within your
+     * application. You can specify an `ngModelOptions` directive on any element. All {@link ngModel}
+     * directives will use the options of their nearest `ngModelOptions` ancestor.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
-     * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `ngModelOptions` settings are found by evaluating the value of the attribute directive as
+     * an AngularJS expression. This expression should evaluate to an object, whose properties contain
+     * the settings. For example: `<div ng-model-options="{ debounce: 100 }"`.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mouseenter="count = count + 1" ng-init="count=0">
-     Increment (when mouse enters)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMouseleave
+     * ## Inheriting Options
      *
-     * @description
-     * Specify custom behavior on mouseleave event.
+     * You can specify that an `ngModelOptions` setting should be inherited from a parent `ngModelOptions`
+     * directive by giving it the value of `"$inherit"`.
+     * Then it will inherit that setting from the first `ngModelOptions` directive found by traversing up the
+     * DOM tree. If there is no ancestor element containing an `ngModelOptions` directive then default settings
+     * will be used.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
-     * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
+     * For example given the following fragment of HTML
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mouseleave="count = count + 1" ng-init="count=0">
-     Increment (when mouse leaves)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMousemove
      *
-     * @description
-     * Specify custom behavior on mousemove event.
+     * ```html
+     * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
+     *   <form ng-model-options="{ updateOn: 'blur', allowInvalid: '$inherit' }">
+     *     <input ng-model-options="{ updateOn: 'default', allowInvalid: '$inherit' }" />
+     *   </form>
+     * </div>
+     * ```
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
-     * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+     * the `input` element will have the following settings
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mousemove="count = count + 1" ng-init="count=0">
-     Increment (when mouse moves)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngKeydown
+     * ```js
+     * { allowInvalid: true, updateOn: 'default', debounce: 0 }
+     * ```
      *
-     * @description
-     * Specify custom behavior on keydown event.
+     * Notice that the `debounce` setting was not inherited and used the default value instead.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
-     * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     * You can specify that all undefined settings are automatically inherited from an ancestor by
+     * including a property with key of `"*"` and value of `"$inherit"`.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-keydown="count = count + 1" ng-init="count=0">
-     key down count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngKeyup
+     * For example given the following fragment of HTML
      *
-     * @description
-     * Specify custom behavior on keyup event.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
-     * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     * ```html
+     * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
+     *   <form ng-model-options="{ updateOn: 'blur', "*": '$inherit' }">
+     *     <input ng-model-options="{ updateOn: 'default', "*": '$inherit' }" />
+     *   </form>
+     * </div>
+     * ```
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-keyup="count = count + 1" ng-init="count=0">
-     key up count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngKeypress
+     * the `input` element will have the following settings
      *
-     * @description
-     * Specify custom behavior on keypress event.
+     * ```js
+     * { allowInvalid: true, updateOn: 'default', debounce: 200 }
+     * ```
      *
-     * @element ANY
-     * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
-     * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
-     * and can be interrogated for keyCode, altKey, etc.)
+     * Notice that the `debounce` setting now inherits the value from the outer `<div>` element.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-keypress="count = count + 1" ng-init="count=0">
-     key press count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngSubmit
+     * If you are creating a reusable component then you should be careful when using `"*": "$inherit"`
+     * since you may inadvertently inherit a setting in the future that changes the behavior of your component.
      *
-     * @description
-     * Enables binding angular expressions to onsubmit events.
      *
-     * Additionally it prevents the default action (which for form means sending the request to the
-     * server and reloading the current page), but only if the form does not contain `action`,
-     * `data-action`, or `x-action` attributes.
+     * ## Triggering and debouncing model updates
      *
-     * @element form
-     * @priority 0
-     * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
-     * ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `updateOn` and `debounce` properties allow you to specify a custom list of events that will
+     * trigger a model update and/or a debouncing delay so that the actual update only takes place when
+     * a timer expires; this timer will be reset after another change takes place.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-          $scope.list = [];
-          $scope.text = 'hello';
-          $scope.submit = function() {
-            if ($scope.text) {
-              $scope.list.push(this.text);
-              $scope.text = '';
-            }
-          };
-        }
-     </script>
-     <form ng-submit="submit()" ng-controller="Ctrl">
-     Enter text and hit enter:
-     <input type="text" ng-model="text" name="text" />
-     <input type="submit" id="submit" value="Submit" />
-     <pre>list={{list}}</pre>
-     </form>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-submit', function() {
-         expect(element(by.binding('list')).getText()).toBe('list=[]');
-         element(by.css('#submit')).click();
-         expect(element(by.binding('list')).getText()).toContain('hello');
-         expect(element(by.input('text')).getAttribute('value')).toBe('');
-       });
-     it('should ignore empty strings', function() {
-         expect(element(by.binding('list')).getText()).toBe('list=[]');
-         element(by.css('#submit')).click();
-         element(by.css('#submit')).click();
-         expect(element(by.binding('list')).getText()).toContain('hello');
-        });
-     </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngFocus
+     * Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
+     * be different from the value in the actual model. This means that if you update the model you
+     * should also invoke {@link ngModel.NgModelController#$rollbackViewValue} on the relevant input field in
+     * order to make sure it is synchronized with the model and that any debounced action is canceled.
      *
-     * @description
-     * Specify custom behavior on focus event.
+     * The easiest way to reference the control's {@link ngModel.NgModelController#$rollbackViewValue}
+     * method is by making sure the input is placed inside a form that has a `name` attribute. This is
+     * important because `form` controllers are published to the related scope under the name in their
+     * `name` attribute.
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
-     * focus. ({@link guide/expression#-event- Event object is available as `$event`})
+     * Any pending changes will take place immediately when an enclosing form is submitted via the
+     * `submit` event. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+     * to have access to the updated model.
      *
-     * @example
-     * See {@link ng.directive:ngClick ngClick}
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngBlur
+     * ### Overriding immediate updates
      *
-     * @description
-     * Specify custom behavior on blur event.
+     * The following example shows how to override immediate updates. Changes on the inputs within the
+     * form will update the model only when the control loses focus (blur event). If `escape` key is
+     * pressed while the input field is focused, the value is reset to the value in the current model.
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
-     * blur. ({@link guide/expression#-event- Event object is available as `$event`})
+     * <example name="ngModelOptions-directive-blur" module="optionsExample">
+     *   <file name="index.html">
+     *     <div ng-controller="ExampleController">
+     *       <form name="userForm">
+     *         <label>
+     *           Name:
+     *           <input type="text" name="userName"
+     *                  ng-model="user.name"
+     *                  ng-model-options="{ updateOn: 'blur' }"
+     *                  ng-keyup="cancel($event)" />
+     *         </label><br />
+     *         <label>
+     *           Other data:
+     *           <input type="text" ng-model="user.data" />
+     *         </label><br />
+     *       </form>
+     *       <pre>user.name = <span ng-bind="user.name"></span></pre>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('optionsExample', [])
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         $scope.user = { name: 'say', data: '' };
+     *
+     *         $scope.cancel = function(e) {
+     *           if (e.keyCode === 27) {
+     *             $scope.userForm.userName.$rollbackViewValue();
+     *           }
+     *         };
+     *       }]);
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     var model = element(by.binding('user.name'));
+     *     var input = element(by.model('user.name'));
+     *     var other = element(by.model('user.data'));
+     *
+     *     it('should allow custom events', function() {
+     *       input.sendKeys(' hello');
+     *       input.click();
+     *       expect(model.getText()).toEqual('say');
+     *       other.click();
+     *       expect(model.getText()).toEqual('say hello');
+     *     });
      *
-     * @example
-     * See {@link ng.directive:ngClick ngClick}
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngCopy
+     *     it('should $rollbackViewValue when model changes', function() {
+     *       input.sendKeys(' hello');
+     *       expect(input.getAttribute('value')).toEqual('say hello');
+     *       input.sendKeys(protractor.Key.ESCAPE);
+     *       expect(input.getAttribute('value')).toEqual('say');
+     *       other.click();
+     *       expect(model.getText()).toEqual('say');
+     *     });
+     *   </file>
+     * </example>
      *
-     * @description
-     * Specify custom behavior on copy event.
+     * ### Debouncing updates
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
-     * copy. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The next example shows how to debounce model changes. Model will be updated only 1 sec after last change.
+     * If the `Clear` button is pressed, any debounced action is canceled and the value becomes empty.
+     *
+     * <example name="ngModelOptions-directive-debounce" module="optionsExample">
+     *   <file name="index.html">
+     *     <div ng-controller="ExampleController">
+     *       <form name="userForm">
+     *         Name:
+     *         <input type="text" name="userName"
+     *                ng-model="user.name"
+     *                ng-model-options="{ debounce: 1000 }" />
+     *         <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button><br />
+     *       </form>
+     *       <pre>user.name = <span ng-bind="user.name"></span></pre>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('optionsExample', [])
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         $scope.user = { name: 'say' };
+     *       }]);
+     *   </file>
+     * </example>
+     *
+     *
+     * ## Model updates and validation
+     *
+     * The default behaviour in `ngModel` is that the model value is set to `undefined` when the
+     * validation determines that the value is invalid. By setting the `allowInvalid` property to true,
+     * the model will still be updated even if the value is invalid.
+     *
+     *
+     * ## Connecting to the scope
+     *
+     * By setting the `getterSetter` property to true you are telling ngModel that the `ngModel` expression
+     * on the scope refers to a "getter/setter" function rather than the value itself.
+     *
+     * The following example shows how to bind to getter/setters:
+     *
+     * <example name="ngModelOptions-directive-getter-setter" module="getterSetterExample">
+     *   <file name="index.html">
+     *     <div ng-controller="ExampleController">
+     *       <form name="userForm">
+     *         <label>
+     *           Name:
+     *           <input type="text" name="userName"
+     *                  ng-model="user.name"
+     *                  ng-model-options="{ getterSetter: true }" />
+     *         </label>
+     *       </form>
+     *       <pre>user.name = <span ng-bind="user.name()"></span></pre>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('getterSetterExample', [])
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         var _name = 'Brian';
+     *         $scope.user = {
+     *           name: function(newName) {
+     *             return angular.isDefined(newName) ? (_name = newName) : _name;
+     *           }
+     *         };
+     *       }]);
+     *   </file>
+     * </example>
+     *
+     *
+     * ## Specifying timezones
+     *
+     * You can specify the timezone that date/time input directives expect by providing its name in the
+     * `timezone` property.
+     *
+     *
+     * ## Programmatically changing options
+     *
+     * The `ngModelOptions` expression is only evaluated once when the directive is linked; it is not
+     * watched for changes. However, it is possible to override the options on a single
+     * {@link ngModel.NgModelController} instance with
+     * {@link ngModel.NgModelController#$overrideModelOptions `NgModelController#$overrideModelOptions()`}.
+     *
+     *
+     * @param {Object} ngModelOptions options to apply to {@link ngModel} directives on this element and
+     *   and its descendents. Valid keys are:
+     *   - `updateOn`: string specifying which event should the input be bound to. You can set several
+     *     events using an space delimited list. There is a special event called `default` that
+     *     matches the default events belonging to the control. These are the events that are bound to
+     *     the control, and when fired, update the `$viewValue` via `$setViewValue`.
+     *
+     *     `ngModelOptions` considers every event that is not listed in `updateOn` a "default" event,
+     *     since different control types use different default events.
+     *
+     *     See also the section {@link ngModelOptions#triggering-and-debouncing-model-updates
+ *     Triggering and debouncing model updates}.
+     *
+     *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
+     *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
+     *     custom value for each event. For example:
+     *     ```
+     *     ng-model-options="{
+     *       updateOn: 'default blur click',
+     *       debounce: { 'default': 500, 'blur': 0 }
+     *     }"
+     *     ```
+     *
+     *     "default" also applies to all events that are listed in `updateOn` but are not
+     *     listed in `debounce`, i.e. "click" would also be debounced by 500 milliseconds.
+     *
+     *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
+     *     not validate correctly instead of the default behavior of setting the model to undefined.
+     *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
+     *     `ngModel` as getters/setters.
+     *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
+     *     `<input type="date" />`, `<input type="time" />`, ... . It understands UTC/GMT and the
+     *     continental US time zone abbreviations, but for general use, use a time zone offset, for
+     *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+     *     If not specified, the timezone of the browser will be used.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
-     copied: {{copied}}
-     </file>
-     </example>
      */
+    var ngModelOptionsDirective = function() {
+        NgModelOptionsController.$inject = ['$attrs', '$scope'];
+        function NgModelOptionsController($attrs, $scope) {
+            this.$$attrs = $attrs;
+            this.$$scope = $scope;
+        }
+        NgModelOptionsController.prototype = {
+            $onInit: function() {
+                var parentOptions = this.parentCtrl ? this.parentCtrl.$options : defaultModelOptions;
+                var modelOptionsDefinition = this.$$scope.$eval(this.$$attrs.ngModelOptions);
+
+                this.$options = parentOptions.createChild(modelOptionsDefinition);
+            }
+        };
+
+        return {
+            restrict: 'A',
+            // ngModelOptions needs to run before ngModel and input directives
+            priority: 10,
+            require: {parentCtrl: '?^^ngModelOptions'},
+            bindToController: true,
+            controller: NgModelOptionsController
+        };
+    };
+
+
+// shallow copy over values from `src` that are not already specified on `dst`
+    function defaults(dst, src) {
+        forEach(src, function(value, key) {
+            if (!isDefined(dst[key])) {
+                dst[key] = value;
+            }
+        });
+    }
 
     /**
      * @ngdoc directive
-     * @name ngCut
+     * @name ngNonBindable
+     * @restrict AC
+     * @priority 1000
+     * @element ANY
      *
      * @description
-     * Specify custom behavior on cut event.
-     *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
-     * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `ngNonBindable` directive tells AngularJS not to compile or bind the contents of the current
+     * DOM element, including directives on the element itself that have a lower priority than
+     * `ngNonBindable`. This is useful if the element contains what appears to be AngularJS directives
+     * and bindings but which should be ignored by AngularJS. This could be the case if you have a site
+     * that displays snippets of code, for instance.
      *
      * @example
-     <example>
+     * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
+     * but the one wrapped in `ngNonBindable` is left alone.
+     *
+     <example name="ng-non-bindable">
      <file name="index.html">
-     <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
-     cut: {{cut}}
+     <div>Normal: {{1 + 2}}</div>
+     <div ng-non-bindable>Ignored: {{1 + 2}}</div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-non-bindable', function() {
+       expect(element(by.binding('1 + 2')).getText()).toContain('3');
+       expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
+     });
      </file>
      </example>
      */
+    var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+
+    /* exported ngOptionsDirective */
+
+    /* global jqLiteRemove */
+
+    var ngOptionsMinErr = minErr('ngOptions');
 
     /**
      * @ngdoc directive
-     * @name ngPaste
+     * @name ngOptions
+     * @restrict A
      *
      * @description
-     * Specify custom behavior on paste event.
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
-     * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
+     * elements for the `<select>` element using the array or object obtained by evaluating the
+     * `ngOptions` comprehension expression.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
-     pasted: {{paste}}
-     </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngIf
-     * @restrict A
+     * In many cases, {@link ng.directive:ngRepeat ngRepeat} can be used on `<option>` elements instead of
+     * `ngOptions` to achieve a similar result. However, `ngOptions` provides some benefits:
+     * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+     * comprehension expression
+     * - reduced memory consumption by not creating a new scope for each repeated instance
+     * - increased render speed by creating the options in a documentFragment instead of individually
      *
-     * @description
-     * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
-     * {expression}. If the expression assigned to `ngIf` evaluates to a false
-     * value then the element is removed from the DOM, otherwise a clone of the
-     * element is reinserted into the DOM.
+     * When an item in the `<select>` menu is selected, the array element or object property
+     * represented by the selected option will be bound to the model identified by the `ngModel`
+     * directive.
      *
-     * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
-     * element in the DOM rather than changing its visibility via the `display` css property.  A common
-     * case when this difference is significant is when using css selectors that rely on an element's
-     * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
+     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+     * option. See example below for demonstration.
      *
-     * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
-     * is created when the element is restored.  The scope created within `ngIf` inherits from
-     * its parent scope using
-     * [prototypal inheritance](https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-Prototypal-Inheritance).
-     * An important implication of this is if `ngModel` is used within `ngIf` to bind to
-     * a javascript primitive defined in the parent scope. In this case any modifications made to the
-     * variable within the child scope will override (hide) the value in the parent scope.
+     * ## Complex Models (objects or collections)
      *
-     * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
-     * is if an element's class attribute is directly modified after it's compiled, using something like
-     * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
-     * the added class will be lost because the original compiled state is used to regenerate the element.
+     * By default, `ngModel` watches the model by reference, not value. This is important to know when
+     * binding the select to a model that is an object or a collection.
      *
-     * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
-     * and `leave` effects.
+     * One issue occurs if you want to preselect an option. For example, if you set
+     * the model to an object that is equal to an object in your collection, `ngOptions` won't be able to set the selection,
+     * because the objects are not identical. So by default, you should always reference the item in your collection
+     * for preselections, e.g.: `$scope.selected = $scope.collection[3]`.
      *
-     * @animations
-     * enter - happens just after the ngIf contents change and a new DOM element is created and injected into the ngIf container
-     * leave - happens just before the ngIf contents are removed from the DOM
+     * Another solution is to use a `track by` clause, because then `ngOptions` will track the identity
+     * of the item not by reference, but by the result of the `track by` expression. For example, if your
+     * collection items have an id property, you would `track by item.id`.
      *
-     * @element ANY
-     * @scope
-     * @priority 600
-     * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
-     *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
-     *     element is added to the DOM tree.
+     * A different issue with objects or collections is that ngModel won't detect if an object property or
+     * a collection item changes. For that reason, `ngOptions` additionally watches the model using
+     * `$watchCollection`, when the expression contains a `track by` clause or the the select has the `multiple` attribute.
+     * This allows ngOptions to trigger a re-rendering of the options even if the actual object/collection
+     * has not changed identity, but only a property on the object or an item in the collection changes.
      *
-     * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-     <file name="index.html">
-     Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /><br/>
-     Show when checked:
-     <span ng-if="checked" class="animate-if">
-     I'm removed when the checkbox is unchecked.
-     </span>
-     </file>
-     <file name="animations.css">
-     .animate-if {
-        background:white;
-        border:1px solid black;
-        padding:10px;
-      }
-
-     .animate-if.ng-enter, .animate-if.ng-leave {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-      }
-
-     .animate-if.ng-enter,
-     .animate-if.ng-leave.ng-leave-active {
-        opacity:0;
-      }
-
-     .animate-if.ng-leave,
-     .animate-if.ng-enter.ng-enter-active {
-        opacity:1;
-      }
-     </file>
-     </example>
-     */
-    var ngIfDirective = ['$animate', function($animate) {
-        return {
-            transclude: 'element',
-            priority: 600,
-            terminal: true,
-            restrict: 'A',
-            $$tlb: true,
-            link: function ($scope, $element, $attr, ctrl, $transclude) {
-                var block, childScope, previousElements;
-                $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
-
-                    if (toBoolean(value)) {
-                        if (!childScope) {
-                            childScope = $scope.$new();
-                            $transclude(childScope, function (clone) {
-                                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
-                                // Note: We only need the first/last node of the cloned nodes.
-                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-                                // by a directive with templateUrl when it's template arrives.
-                                block = {
-                                    clone: clone
-                                };
-                                $animate.enter(clone, $element.parent(), $element);
-                            });
-                        }
-                    } else {
-                        if(previousElements) {
-                            previousElements.remove();
-                            previousElements = null;
-                        }
-                        if(childScope) {
-                            childScope.$destroy();
-                            childScope = null;
-                        }
-                        if(block) {
-                            previousElements = getBlockElements(block.clone);
-                            $animate.leave(previousElements, function() {
-                                previousElements = null;
-                            });
-                            block = null;
-                        }
-                    }
-                });
-            }
-        };
-    }];
-
-    /**
-     * @ngdoc directive
-     * @name ngInclude
-     * @restrict ECA
+     * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
+     * if the model is an array). This means that changing a property deeper than the first level inside the
+     * object/collection will not trigger a re-rendering.
      *
-     * @description
-     * Fetches, compiles and includes an external HTML fragment.
+     * ## `select` **`as`**
      *
-     * By default, the template URL is restricted to the same domain and protocol as the
-     * application document. This is done by calling {@link ng.$sce#getTrustedResourceUrl
- * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
-     * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
-     * [wrap them](ng.$sce#trustAsResourceUrl) as trusted values. Refer to Angular's {@link
-        * ng.$sce Strict Contextual Escaping}.
+     * Using `select` **`as`** will bind the result of the `select` expression to the model, but
+     * the value of the `<select>` and `<option>` html elements will be either the index (for array data sources)
+     * or property name (for object data sources) of the value within the collection. If a **`track by`** expression
+     * is used, the result of that expression will be set as the value of the `option` and `select` elements.
      *
-     * In addition, the browser's
-     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
-     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
-     * policy may further restrict whether the template is successfully loaded.
-     * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
-     * access on some browsers.
      *
-     * @animations
-     * enter - animation is used to bring new content into the browser.
-     * leave - animation is used to animate existing content away.
+     * ### `select` **`as`** and **`track by`**
      *
-     * The enter and leave animation occur concurrently.
+     * <div class="alert alert-warning">
+     * Be careful when using `select` **`as`** and **`track by`** in the same expression.
+     * </div>
      *
-     * @scope
-     * @priority 400
+     * Given this array of items on the $scope:
      *
-     * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
-     *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
-     * @param {string=} onload Expression to evaluate when a new partial is loaded.
+     * ```js
+     * $scope.items = [{
+     *   id: 1,
+     *   label: 'aLabel',
+     *   subItem: { name: 'aSubItem' }
+     * }, {
+     *   id: 2,
+     *   label: 'bLabel',
+     *   subItem: { name: 'bSubItem' }
+     * }];
+     * ```
      *
-     * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
- *                  $anchorScroll} to scroll the viewport after the content is loaded.
+     * This will work:
      *
-     *                  - If the attribute is not set, disable scrolling.
-     *                  - If the attribute is set without value, enable scrolling.
-     *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
+     * ```html
+     * <select ng-options="item as item.label for item in items track by item.id" ng-model="selected"></select>
+     * ```
+     * ```js
+     * $scope.selected = $scope.items[0];
+     * ```
+     *
+     * but this will not work:
+     *
+     * ```html
+     * <select ng-options="item.subItem as item.label for item in items track by item.id" ng-model="selected"></select>
+     * ```
+     * ```js
+     * $scope.selected = $scope.items[0].subItem;
+     * ```
+     *
+     * In both examples, the **`track by`** expression is applied successfully to each `item` in the
+     * `items` array. Because the selected option has been set programmatically in the controller, the
+     * **`track by`** expression is also applied to the `ngModel` value. In the first example, the
+     * `ngModel` value is `items[0]` and the **`track by`** expression evaluates to `items[0].id` with
+     * no issue. In the second example, the `ngModel` value is `items[0].subItem` and the **`track by`**
+     * expression evaluates to `items[0].subItem.id` (which is undefined). As a result, the model value
+     * is not matched against any `<option>` and the `<select>` appears as having no selected value.
+     *
+     *
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {comprehension_expression} ngOptions in one of the following forms:
+     *
+     *   * for array data sources:
+     *     * `label` **`for`** `value` **`in`** `array`
+     *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
+     *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
+     *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
+     *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+     *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+     *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
+     *        (for including a filter with `track by`)
+     *   * for object data sources:
+     *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+     *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+     *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
+     *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
+     *     * `select` **`as`** `label` **`group by`** `group`
+     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+     *     * `select` **`as`** `label` **`disable when`** `disable`
+     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+     *
+     * Where:
+     *
+     *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
+     *   * `value`: local variable which will refer to each item in the `array` or each property value
+     *      of `object` during iteration.
+     *   * `key`: local variable which will refer to a property name in `object` during iteration.
+     *   * `label`: The result of this expression will be the label for `<option>` element. The
+     *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
+     *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
+     *      element. If not specified, `select` expression will default to `value`.
+     *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
+     *      DOM element.
+     *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
+     *      element. Return `true` to disable.
+     *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
+     *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
+     *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
+     *      even when the options are recreated (e.g. reloaded from the server).
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} required The control is considered valid only if value is entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
+     * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     <example module="selectExample" name="select">
      <file name="index.html">
-     <div ng-controller="Ctrl">
-     <select ng-model="template" ng-options="t.name for t in templates">
-     <option value="">(blank)</option>
-     </select>
-     url of the template: <tt>{{template.url}}</tt>
+     <script>
+     angular.module('selectExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+            $scope.colors = [
+              {name:'black', shade:'dark'},
+              {name:'white', shade:'light', notAnOption: true},
+              {name:'red', shade:'dark'},
+              {name:'blue', shade:'dark', notAnOption: true},
+              {name:'yellow', shade:'light', notAnOption: false}
+            ];
+            $scope.myColor = $scope.colors[2]; // red
+          }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <ul>
+     <li ng-repeat="color in colors">
+     <label>Name: <input ng-model="color.name"></label>
+     <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
+     <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
+     </li>
+     <li>
+     <button ng-click="colors.push({})">add</button>
+     </li>
+     </ul>
      <hr/>
-     <div class="slide-animate-container">
-     <div class="slide-animate" ng-include="template.url"></div>
-     </div>
-     </div>
-     </file>
-     <file name="script.js">
-     function Ctrl($scope) {
-        $scope.templates =
-          [ { name: 'template1.html', url: 'template1.html'},
-            { name: 'template2.html', url: 'template2.html'} ];
-        $scope.template = $scope.templates[0];
-      }
-     </file>
-     <file name="template1.html">
-     Content of template1.html
-     </file>
-     <file name="template2.html">
-     Content of template2.html
-     </file>
-     <file name="animations.css">
-     .slide-animate-container {
-        position:relative;
-        background:white;
-        border:1px solid black;
-        height:40px;
-        overflow:hidden;
-      }
+     <label>Color (null not allowed):
+     <select ng-model="myColor" ng-options="color.name for color in colors"></select>
+     </label><br/>
+     <label>Color (null allowed):
+     <span  class="nullable">
+     <select ng-model="myColor" ng-options="color.name for color in colors">
+     <option value="">-- choose color --</option>
+     </select>
+     </span></label><br/>
 
-     .slide-animate {
-        padding:10px;
-      }
+     <label>Color grouped by shade:
+     <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
+     </select>
+     </label><br/>
 
-     .slide-animate.ng-enter, .slide-animate.ng-leave {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+     <label>Color grouped by shade, with some disabled:
+     <select ng-model="myColor"
+     ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
+     </select>
+     </label><br/>
 
-        position:absolute;
-        top:0;
-        left:0;
-        right:0;
-        bottom:0;
-        display:block;
-        padding:10px;
-      }
 
-     .slide-animate.ng-enter {
-        top:-50px;
-      }
-     .slide-animate.ng-enter.ng-enter-active {
-        top:0;
-      }
 
-     .slide-animate.ng-leave {
-        top:0;
-      }
-     .slide-animate.ng-leave.ng-leave-active {
-        top:50px;
-      }
+     Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
+     <br/>
+     <hr/>
+     Currently selected: {{ {selected_color:myColor} }}
+     <div style="border:solid 1px black; height:20px"
+     ng-style="{'background-color':myColor.name}">
+     </div>
+     </div>
      </file>
      <file name="protractor.js" type="protractor">
-     var templateSelect = element(by.model('template'));
-     var includeElem = element(by.css('[ng-include]'));
-
-     it('should load template1.html', function() {
-        expect(includeElem.getText()).toMatch(/Content of template1.html/);
-      });
-
-     it('should load template2.html', function() {
-        if (browser.params.browser == 'firefox') {
-          // Firefox can't handle using selects
-          // See https://github.com/angular/protractor/issues/480
-          return;
-        }
-        templateSelect.click();
-        templateSelect.element.all(by.css('option')).get(2).click();
-        expect(includeElem.getText()).toMatch(/Content of template2.html/);
-      });
-
-     it('should change to blank', function() {
-        if (browser.params.browser == 'firefox') {
-          // Firefox can't handle using selects
-          return;
-        }
-        templateSelect.click();
-        templateSelect.element.all(by.css('option')).get(0).click();
-        expect(includeElem.isPresent()).toBe(false);
-      });
+     it('should check ng-options', function() {
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
+           element.all(by.model('myColor')).first().click();
+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
+           element(by.css('.nullable select[ng-model="myColor"]')).click();
+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
+         });
      </file>
      </example>
      */
 
+    /* eslint-disable max-len */
+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555000000000666666666666600000007777777777777000000000000000888888888800000000000000000009999999999
+    var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
+    // 1: value expression (valueFn)
+    // 2: label expression (displayFn)
+    // 3: group by expression (groupByFn)
+    // 4: disable when expression (disableWhenFn)
+    // 5: array item variable name
+    // 6: object item key variable name
+    // 7: object item value variable name
+    // 8: collection expression
+    // 9: track by expression
+    /* eslint-enable */
+
+
+    var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile, $document, $parse) {
+
+        function parseOptionsExpression(optionsExp, selectElement, scope) {
+
+            var match = optionsExp.match(NG_OPTIONS_REGEXP);
+            if (!(match)) {
+                throw ngOptionsMinErr('iexp',
+                    'Expected expression in form of ' +
+                    '\'_select_ (as _label_)? for (_key_,)?_value_ in _collection_\'' +
+                    ' but got \'{0}\'. Element: {1}',
+                    optionsExp, startingTag(selectElement));
+            }
 
-    /**
-     * @ngdoc event
-     * @name ngInclude#$includeContentRequested
-     * @eventType emit on the scope ngInclude was declared in
-     * @description
-     * Emitted every time the ngInclude content is requested.
-     */
+            // Extract the parts from the ngOptions expression
+
+            // The variable name for the value of the item in the collection
+            var valueName = match[5] || match[7];
+            // The variable name for the key of the item in the collection
+            var keyName = match[6];
+
+            // An expression that generates the viewValue for an option if there is a label expression
+            var selectAs = / as /.test(match[0]) && match[1];
+            // An expression that is used to track the id of each object in the options collection
+            var trackBy = match[9];
+            // An expression that generates the viewValue for an option if there is no label expression
+            var valueFn = $parse(match[2] ? match[1] : valueName);
+            var selectAsFn = selectAs && $parse(selectAs);
+            var viewValueFn = selectAsFn || valueFn;
+            var trackByFn = trackBy && $parse(trackBy);
+
+            // Get the value by which we are going to track the option
+            // if we have a trackFn then use that (passing scope and locals)
+            // otherwise just hash the given viewValue
+            var getTrackByValueFn = trackBy ?
+                function(value, locals) { return trackByFn(scope, locals); } :
+                function getHashOfValue(value) { return hashKey(value); };
+            var getTrackByValue = function(value, key) {
+                return getTrackByValueFn(value, getLocals(value, key));
+            };
 
+            var displayFn = $parse(match[2] || match[1]);
+            var groupByFn = $parse(match[3] || '');
+            var disableWhenFn = $parse(match[4] || '');
+            var valuesFn = $parse(match[8]);
+
+            var locals = {};
+            var getLocals = keyName ? function(value, key) {
+                locals[keyName] = key;
+                locals[valueName] = value;
+                return locals;
+            } : function(value) {
+                locals[valueName] = value;
+                return locals;
+            };
 
-    /**
-     * @ngdoc event
-     * @name ngInclude#$includeContentLoaded
-     * @eventType emit on the current ngInclude scope
-     * @description
-     * Emitted every time the ngInclude content is reloaded.
-     */
-    var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$animate', '$sce',
-        function($http,   $templateCache,   $anchorScroll,   $animate,   $sce) {
-            return {
-                restrict: 'ECA',
-                priority: 400,
-                terminal: true,
-                transclude: 'element',
-                controller: angular.noop,
-                compile: function(element, attr) {
-                    var srcExp = attr.ngInclude || attr.src,
-                        onloadExp = attr.onload || '',
-                        autoScrollExp = attr.autoscroll;
 
-                    return function(scope, $element, $attr, ctrl, $transclude) {
-                        var changeCounter = 0,
-                            currentScope,
-                            previousElement,
-                            currentElement;
+            function Option(selectValue, viewValue, label, group, disabled) {
+                this.selectValue = selectValue;
+                this.viewValue = viewValue;
+                this.label = label;
+                this.group = group;
+                this.disabled = disabled;
+            }
 
-                        var cleanupLastIncludeContent = function() {
-                            if(previousElement) {
-                                previousElement.remove();
-                                previousElement = null;
-                            }
-                            if(currentScope) {
-                                currentScope.$destroy();
-                                currentScope = null;
-                            }
-                            if(currentElement) {
-                                $animate.leave(currentElement, function() {
-                                    previousElement = null;
-                                });
-                                previousElement = currentElement;
-                                currentElement = null;
-                            }
-                        };
+            function getOptionValuesKeys(optionValues) {
+                var optionValuesKeys;
 
-                        scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
-                            var afterAnimation = function() {
-                                if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
-                                    $anchorScroll();
-                                }
-                            };
-                            var thisChangeId = ++changeCounter;
+                if (!keyName && isArrayLike(optionValues)) {
+                    optionValuesKeys = optionValues;
+                } else {
+                    // if object, extract keys, in enumeration order, unsorted
+                    optionValuesKeys = [];
+                    for (var itemKey in optionValues) {
+                        if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+                            optionValuesKeys.push(itemKey);
+                        }
+                    }
+                }
+                return optionValuesKeys;
+            }
 
-                            if (src) {
-                                $http.get(src, {cache: $templateCache}).success(function(response) {
-                                    if (thisChangeId !== changeCounter) return;
-                                    var newScope = scope.$new();
-                                    ctrl.template = response;
+            return {
+                trackBy: trackBy,
+                getTrackByValue: getTrackByValue,
+                getWatchables: $parse(valuesFn, function(optionValues) {
+                    // Create a collection of things that we would like to watch (watchedArray)
+                    // so that they can all be watched using a single $watchCollection
+                    // that only runs the handler once if anything changes
+                    var watchedArray = [];
+                    optionValues = optionValues || [];
+
+                    var optionValuesKeys = getOptionValuesKeys(optionValues);
+                    var optionValuesLength = optionValuesKeys.length;
+                    for (var index = 0; index < optionValuesLength; index++) {
+                        var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+                        var value = optionValues[key];
+
+                        var locals = getLocals(value, key);
+                        var selectValue = getTrackByValueFn(value, locals);
+                        watchedArray.push(selectValue);
+
+                        // Only need to watch the displayFn if there is a specific label expression
+                        if (match[2] || match[1]) {
+                            var label = displayFn(scope, locals);
+                            watchedArray.push(label);
+                        }
 
-                                    // Note: This will also link all children of ng-include that were contained in the original
-                                    // html. If that content contains controllers, ... they could pollute/change the scope.
-                                    // However, using ng-include on an element with additional content does not make sense...
-                                    // Note: We can't remove them in the cloneAttchFn of $transclude as that
-                                    // function is called before linking the content, which would apply child
-                                    // directives to non existing elements.
-                                    var clone = $transclude(newScope, function(clone) {
-                                        cleanupLastIncludeContent();
-                                        $animate.enter(clone, null, $element, afterAnimation);
-                                    });
+                        // Only need to watch the disableWhenFn if there is a specific disable expression
+                        if (match[4]) {
+                            var disableWhen = disableWhenFn(scope, locals);
+                            watchedArray.push(disableWhen);
+                        }
+                    }
+                    return watchedArray;
+                }),
 
-                                    currentScope = newScope;
-                                    currentElement = clone;
+                getOptions: function() {
+
+                    var optionItems = [];
+                    var selectValueMap = {};
+
+                    // The option values were already computed in the `getWatchables` fn,
+                    // which must have been called to trigger `getOptions`
+                    var optionValues = valuesFn(scope) || [];
+                    var optionValuesKeys = getOptionValuesKeys(optionValues);
+                    var optionValuesLength = optionValuesKeys.length;
+
+                    for (var index = 0; index < optionValuesLength; index++) {
+                        var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+                        var value = optionValues[key];
+                        var locals = getLocals(value, key);
+                        var viewValue = viewValueFn(scope, locals);
+                        var selectValue = getTrackByValueFn(viewValue, locals);
+                        var label = displayFn(scope, locals);
+                        var group = groupByFn(scope, locals);
+                        var disabled = disableWhenFn(scope, locals);
+                        var optionItem = new Option(selectValue, viewValue, label, group, disabled);
+
+                        optionItems.push(optionItem);
+                        selectValueMap[selectValue] = optionItem;
+                    }
 
-                                    currentScope.$emit('$includeContentLoaded');
-                                    scope.$eval(onloadExp);
-                                }).error(function() {
-                                    if (thisChangeId === changeCounter) cleanupLastIncludeContent();
-                                });
-                                scope.$emit('$includeContentRequested');
-                            } else {
-                                cleanupLastIncludeContent();
-                                ctrl.template = null;
-                            }
-                        });
+                    return {
+                        items: optionItems,
+                        selectValueMap: selectValueMap,
+                        getOptionFromViewValue: function(value) {
+                            return selectValueMap[getTrackByValue(value)];
+                        },
+                        getViewValueFromOption: function(option) {
+                            // If the viewValue could be an object that may be mutated by the application,
+                            // we need to make a copy and not return the reference to the value on the option.
+                            return trackBy ? copy(option.viewValue) : option.viewValue;
+                        }
                     };
                 }
             };
-        }];
+        }
 
-// This directive is called during the $transclude call of the first `ngInclude` directive.
-// It will replace and compile the content of the element with the loaded template.
-// We need this directive so that the element content is already filled when
-// the link function of another directive on the same element as ngInclude
-// is called.
-    var ngIncludeFillContentDirective = ['$compile',
-        function($compile) {
-            return {
-                restrict: 'ECA',
-                priority: -400,
-                require: 'ngInclude',
-                link: function(scope, $element, $attr, ctrl) {
-                    $element.html(ctrl.template);
-                    $compile($element.contents())(scope);
+
+        // Support: IE 9 only
+        // We can't just jqLite('<option>') since jqLite is not smart enough
+        // to create it in <select> and IE barfs otherwise.
+        var optionTemplate = window.document.createElement('option'),
+            optGroupTemplate = window.document.createElement('optgroup');
+
+        function ngOptionsPostLink(scope, selectElement, attr, ctrls) {
+
+            var selectCtrl = ctrls[0];
+            var ngModelCtrl = ctrls[1];
+            var multiple = attr.multiple;
+
+            // The emptyOption allows the application developer to provide their own custom "empty"
+            // option when the viewValue does not match any of the option values.
+            for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
+                if (children[i].value === '') {
+                    selectCtrl.hasEmptyOption = true;
+                    selectCtrl.emptyOption = children.eq(i);
+                    break;
                 }
+            }
+
+            // The empty option will be compiled and rendered before we first generate the options
+            selectElement.empty();
+
+            var providedEmptyOption = !!selectCtrl.emptyOption;
+
+            var unknownOption = jqLite(optionTemplate.cloneNode(false));
+            unknownOption.val('?');
+
+            var options;
+            var ngOptions = parseOptionsExpression(attr.ngOptions, selectElement, scope);
+            // This stores the newly created options before they are appended to the select.
+            // Since the contents are removed from the fragment when it is appended,
+            // we only need to create it once.
+            var listFragment = $document[0].createDocumentFragment();
+
+            // Overwrite the implementation. ngOptions doesn't use hashes
+            selectCtrl.generateUnknownOptionValue = function(val) {
+                return '?';
             };
-        }];
 
-    /**
-     * @ngdoc directive
-     * @name ngInit
-     * @restrict AC
-     *
-     * @description
-     * The `ngInit` directive allows you to evaluate an expression in the
-     * current scope.
-     *
-     * <div class="alert alert-error">
-     * The only appropriate use of `ngInit` is for aliasing special properties of
-     * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
-     * should use {@link guide/controller controllers} rather than `ngInit`
-     * to initialize values on a scope.
-     * </div>
-     * <div class="alert alert-warning">
-     * **Note**: If you have assignment in `ngInit` along with {@link ng.$filter `$filter`}, make
-     * sure you have parenthesis for correct precedence:
-     * <pre class="prettyprint">
-     *   <div ng-init="test1 = (data | orderBy:'name')"></div>
-     * </pre>
-     * </div>
-     *
-     * @priority 450
-     *
-     * @element ANY
-     * @param {expression} ngInit {@link guide/expression Expression} to eval.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-       $scope.list = [['a', 'b'], ['c', 'd']];
-     }
-     </script>
-     <div ng-controller="Ctrl">
-     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
-     <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
-     <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
-     </div>
-     </div>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should alias index positions', function() {
-         var elements = element.all(by.css('.example-init'));
-         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
-         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
-         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
-         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
-       });
-     </file>
-     </example>
-     */
-    var ngInitDirective = ngDirective({
-        priority: 450,
-        compile: function() {
-            return {
-                pre: function(scope, element, attrs) {
-                    scope.$eval(attrs.ngInit);
+            // Update the controller methods for multiple selectable options
+            if (!multiple) {
+
+                selectCtrl.writeValue = function writeNgOptionsValue(value) {
+                    // The options might not be defined yet when ngModel tries to render
+                    if (!options) return;
+
+                    var selectedOption = selectElement[0].options[selectElement[0].selectedIndex];
+                    var option = options.getOptionFromViewValue(value);
+
+                    // Make sure to remove the selected attribute from the previously selected option
+                    // Otherwise, screen readers might get confused
+                    if (selectedOption) selectedOption.removeAttribute('selected');
+
+                    if (option) {
+                        // Don't update the option when it is already selected.
+                        // For example, the browser will select the first option by default. In that case,
+                        // most properties are set automatically - except the `selected` attribute, which we
+                        // set always
+
+                        if (selectElement[0].value !== option.selectValue) {
+                            selectCtrl.removeUnknownOption();
+
+                            selectElement[0].value = option.selectValue;
+                            option.element.selected = true;
+                        }
+
+                        option.element.setAttribute('selected', 'selected');
+                    } else {
+                        selectCtrl.selectUnknownOrEmptyOption(value);
+                    }
+                };
+
+                selectCtrl.readValue = function readNgOptionsValue() {
+
+                    var selectedOption = options.selectValueMap[selectElement.val()];
+
+                    if (selectedOption && !selectedOption.disabled) {
+                        selectCtrl.unselectEmptyOption();
+                        selectCtrl.removeUnknownOption();
+                        return options.getViewValueFromOption(selectedOption);
+                    }
+                    return null;
+                };
+
+                // If we are using `track by` then we must watch the tracked value on the model
+                // since ngModel only watches for object identity change
+                // FIXME: When a user selects an option, this watch will fire needlessly
+                if (ngOptions.trackBy) {
+                    scope.$watch(
+                        function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
+                        function() { ngModelCtrl.$render(); }
+                    );
+                }
+
+            } else {
+
+                selectCtrl.writeValue = function writeNgOptionsMultiple(values) {
+                    // The options might not be defined yet when ngModel tries to render
+                    if (!options) return;
+
+                    // Only set `<option>.selected` if necessary, in order to prevent some browsers from
+                    // scrolling to `<option>` elements that are outside the `<select>` element's viewport.
+                    var selectedOptions = values && values.map(getAndUpdateSelectedOption) || [];
+
+                    options.items.forEach(function(option) {
+                        if (option.element.selected && !includes(selectedOptions, option)) {
+                            option.element.selected = false;
+                        }
+                    });
+                };
+
+
+                selectCtrl.readValue = function readNgOptionsMultiple() {
+                    var selectedValues = selectElement.val() || [],
+                        selections = [];
+
+                    forEach(selectedValues, function(value) {
+                        var option = options.selectValueMap[value];
+                        if (option && !option.disabled) selections.push(options.getViewValueFromOption(option));
+                    });
+
+                    return selections;
+                };
+
+                // If we are using `track by` then we must watch these tracked values on the model
+                // since ngModel only watches for object identity change
+                if (ngOptions.trackBy) {
+
+                    scope.$watchCollection(function() {
+                        if (isArray(ngModelCtrl.$viewValue)) {
+                            return ngModelCtrl.$viewValue.map(function(value) {
+                                return ngOptions.getTrackByValue(value);
+                            });
+                        }
+                    }, function() {
+                        ngModelCtrl.$render();
+                    });
+
+                }
+            }
+
+            if (providedEmptyOption) {
+
+                // compile the element since there might be bindings in it
+                $compile(selectCtrl.emptyOption)(scope);
+
+                selectElement.prepend(selectCtrl.emptyOption);
+
+                if (selectCtrl.emptyOption[0].nodeType === NODE_TYPE_COMMENT) {
+                    // This means the empty option has currently no actual DOM node, probably because
+                    // it has been modified by a transclusion directive.
+                    selectCtrl.hasEmptyOption = false;
+
+                    // Redefine the registerOption function, which will catch
+                    // options that are added by ngIf etc. (rendering of the node is async because of
+                    // lazy transclusion)
+                    selectCtrl.registerOption = function(optionScope, optionEl) {
+                        if (optionEl.val() === '') {
+                            selectCtrl.hasEmptyOption = true;
+                            selectCtrl.emptyOption = optionEl;
+                            selectCtrl.emptyOption.removeClass('ng-scope');
+                            // This ensures the new empty option is selected if previously no option was selected
+                            ngModelCtrl.$render();
+
+                            optionEl.on('$destroy', function() {
+                                var needsRerender = selectCtrl.$isEmptyOptionSelected();
+
+                                selectCtrl.hasEmptyOption = false;
+                                selectCtrl.emptyOption = undefined;
+
+                                if (needsRerender) ngModelCtrl.$render();
+                            });
+                        }
+                    };
+
+                } else {
+                    // remove the class, which is added automatically because we recompile the element and it
+                    // becomes the compilation root
+                    selectCtrl.emptyOption.removeClass('ng-scope');
+                }
+
+            }
+
+            // We will re-render the option elements if the option values or labels change
+            scope.$watchCollection(ngOptions.getWatchables, updateOptions);
+
+            // ------------------------------------------------------------------ //
+
+            function addOptionElement(option, parent) {
+                var optionElement = optionTemplate.cloneNode(false);
+                parent.appendChild(optionElement);
+                updateOptionElement(option, optionElement);
+            }
+
+            function getAndUpdateSelectedOption(viewValue) {
+                var option = options.getOptionFromViewValue(viewValue);
+                var element = option && option.element;
+
+                if (element && !element.selected) element.selected = true;
+
+                return option;
+            }
+
+            function updateOptionElement(option, element) {
+                option.element = element;
+                element.disabled = option.disabled;
+                // Support: IE 11 only, Edge 12-13 only
+                // NOTE: The label must be set before the value, otherwise IE 11 & Edge create unresponsive
+                // selects in certain circumstances when multiple selects are next to each other and display
+                // the option list in listbox style, i.e. the select is [multiple], or specifies a [size].
+                // See https://github.com/angular/angular.js/issues/11314 for more info.
+                // This is unfortunately untestable with unit / e2e tests
+                if (option.label !== element.label) {
+                    element.label = option.label;
+                    element.textContent = option.label;
+                }
+                element.value = option.selectValue;
+            }
+
+            function updateOptions() {
+                var previousValue = options && selectCtrl.readValue();
+
+                // We must remove all current options, but cannot simply set innerHTML = null
+                // since the providedEmptyOption might have an ngIf on it that inserts comments which we
+                // must preserve.
+                // Instead, iterate over the current option elements and remove them or their optgroup
+                // parents
+                if (options) {
+
+                    for (var i = options.items.length - 1; i >= 0; i--) {
+                        var option = options.items[i];
+                        if (isDefined(option.group)) {
+                            jqLiteRemove(option.element.parentNode);
+                        } else {
+                            jqLiteRemove(option.element);
+                        }
+                    }
+                }
+
+                options = ngOptions.getOptions();
+
+                var groupElementMap = {};
+
+                options.items.forEach(function addOption(option) {
+                    var groupElement;
+
+                    if (isDefined(option.group)) {
+
+                        // This option is to live in a group
+                        // See if we have already created this group
+                        groupElement = groupElementMap[option.group];
+
+                        if (!groupElement) {
+
+                            groupElement = optGroupTemplate.cloneNode(false);
+                            listFragment.appendChild(groupElement);
+
+                            // Update the label on the group element
+                            // "null" is special cased because of Safari
+                            groupElement.label = option.group === null ? 'null' : option.group;
+
+                            // Store it for use later
+                            groupElementMap[option.group] = groupElement;
+                        }
+
+                        addOptionElement(option, groupElement);
+
+                    } else {
+
+                        // This option is not in a group
+                        addOptionElement(option, listFragment);
+                    }
+                });
+
+                selectElement[0].appendChild(listFragment);
+
+                ngModelCtrl.$render();
+
+                // Check to see if the value has changed due to the update to the options
+                if (!ngModelCtrl.$isEmpty(previousValue)) {
+                    var nextValue = selectCtrl.readValue();
+                    var isNotPrimitive = ngOptions.trackBy || multiple;
+                    if (isNotPrimitive ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
+                        ngModelCtrl.$setViewValue(nextValue);
+                        ngModelCtrl.$render();
+                    }
                 }
-            };
+            }
         }
-    });
 
-    /**
-     * @ngdoc directive
-     * @name ngNonBindable
-     * @restrict AC
-     * @priority 1000
-     *
-     * @description
-     * The `ngNonBindable` directive tells Angular not to compile or bind the contents of the current
-     * DOM element. This is useful if the element contains what appears to be Angular directives and
-     * bindings but which should be ignored by Angular. This could be the case if you have a site that
-     * displays snippets of code, for instance.
-     *
-     * @element ANY
-     *
-     * @example
-     * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
-     * but the one wrapped in `ngNonBindable` is left alone.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div>Normal: {{1 + 2}}</div>
-     <div ng-non-bindable>Ignored: {{1 + 2}}</div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-non-bindable', function() {
-         expect(element(by.binding('1 + 2')).getText()).toContain('3');
-         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
-       });
-     </file>
-     </example>
-     */
-    var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+        return {
+            restrict: 'A',
+            terminal: true,
+            require: ['select', 'ngModel'],
+            link: {
+                pre: function ngOptionsPreLink(scope, selectElement, attr, ctrls) {
+                    // Deactivate the SelectController.register method to prevent
+                    // option directives from accidentally registering themselves
+                    // (and unwanted $destroy handlers etc.)
+                    ctrls[0].registerOption = noop;
+                },
+                post: ngOptionsPostLink
+            }
+        };
+    }];
 
     /**
      * @ngdoc directive
@@ -19507,27 +31067,27 @@
      * @description
      * `ngPluralize` is a directive that displays messages according to en-US localization rules.
      * These rules are bundled with angular.js, but can be overridden
-     * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
+     * (see {@link guide/i18n AngularJS i18n} dev guide). You configure ngPluralize directive
      * by specifying the mappings between
      * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
      * and the strings to be displayed.
      *
-     * # Plural categories and explicit number rules
+     * ## Plural categories and explicit number rules
      * There are two
      * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
-     * in Angular's default en-US locale: "one" and "other".
+     * in AngularJS's default en-US locale: "one" and "other".
      *
      * While a plural category may match many numbers (for example, in en-US locale, "other" can match
      * any number that is not 1), an explicit number rule can only match one number. For example, the
      * explicit number rule for "3" matches the number 3. There are examples of plural categories
      * and explicit number rules throughout the rest of this documentation.
      *
-     * # Configuring ngPluralize
+     * ## Configuring ngPluralize
      * You configure ngPluralize by providing 2 attributes: `count` and `when`.
      * You can also provide an optional attribute, `offset`.
      *
      * The value of the `count` attribute can be either a string or an {@link guide/expression
- * Angular expression}; these are evaluated on the current scope for its bound value.
+ * AngularJS expression}; these are evaluated on the current scope for its bound value.
      *
      * The `when` attribute specifies the mappings between plural categories and the actual
      * string to be displayed. The value of the attribute should be a JSON object.
@@ -19537,8 +31097,8 @@
      * ```html
      * <ng-pluralize count="personCount"
      when="{'0': 'Nobody is viewing.',
- *                      'one': '1 person is viewing.',
- *                      'other': '{} people are viewing.'}">
+     *                      'one': '1 person is viewing.',
+     *                      'other': '{} people are viewing.'}">
      * </ng-pluralize>
      *```
      *
@@ -19549,11 +31109,14 @@
      * show "a dozen people are viewing".
      *
      * You can use a set of closed braces (`{}`) as a placeholder for the number that you want substituted
-     * into pluralized strings. In the previous example, Angular will replace `{}` with
+     * into pluralized strings. In the previous example, AngularJS will replace `{}` with
      * <span ng-non-bindable>`{{personCount}}`</span>. The closed braces `{}` is a placeholder
      * for <span ng-non-bindable>{{numberExpression}}</span>.
      *
-     * # Configuring ngPluralize with offset
+     * If no rule is defined for a category, then an empty string is displayed and a warning is generated.
+     * Note that some locales define more categories than `one` and `other`. For example, fr-fr defines `few` and `many`.
+     *
+     * ## Configuring ngPluralize with offset
      * The `offset` attribute allows further customization of pluralized text, which can result in
      * a better user experience. For example, instead of the message "4 people are viewing this document",
      * you might display "John, Kate and 2 others are viewing this document".
@@ -19563,10 +31126,10 @@
      * ```html
      * <ng-pluralize count="personCount" offset=2
      *               when="{'0': 'Nobody is viewing.',
- *                      '1': '{{person1}} is viewing.',
- *                      '2': '{{person1}} and {{person2}} are viewing.',
- *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
- *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
+     *                      '1': '{{person1}} is viewing.',
+     *                      '2': '{{person1}} and {{person2}} are viewing.',
+     *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
+     *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
      * </ng-pluralize>
      * ```
      *
@@ -19574,8 +31137,8 @@
      * three explicit number rules 0, 1 and 2.
      * When one person, perhaps John, views the document, "John is viewing" will be shown.
      * When three people view the document, no explicit number rule is found, so
-     * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
-     * In this case, plural category 'one' is matched and "John, Marry and one other person are viewing"
+     * an offset of 2 is taken off 3, and AngularJS uses 1 to decide the plural category.
+     * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
      * is shown.
      *
      * Note that when you specify offsets, you must provide explicit number rules for
@@ -19588,19 +31151,20 @@
      * @param {number=} offset Offset to deduct from the total number.
      *
      * @example
-     <example>
+     <example module="pluralizeExample" name="ng-pluralize">
      <file name="index.html">
      <script>
-     function Ctrl($scope) {
-            $scope.person1 = 'Igor';
-            $scope.person2 = 'Misko';
-            $scope.personCount = 1;
-          }
+     angular.module('pluralizeExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+              $scope.person1 = 'Igor';
+              $scope.person2 = 'Misko';
+              $scope.personCount = 1;
+            }]);
      </script>
-     <div ng-controller="Ctrl">
-     Person 1:<input type="text" ng-model="person1" value="Igor" /><br/>
-     Person 2:<input type="text" ng-model="person2" value="Misko" /><br/>
-     Number of People:<input type="text" ng-model="personCount" value="1" /><br/>
+     <div ng-controller="ExampleController">
+     <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
+     <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
+     <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
 
      <!--- Example with simple pluralization rules for en locale --->
      Without Offset:
@@ -19670,10 +31234,11 @@
      </file>
      </example>
      */
-    var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interpolate) {
-        var BRACE = /{}/g;
+    var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale, $interpolate, $log) {
+        var BRACE = /{}/g,
+            IS_WHEN = /^when(Minus)?(.+)$/;
+
         return {
-            restrict: 'EA',
             link: function(scope, element, attr) {
                 var numberExp = attr.count,
                     whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
@@ -19682,41 +31247,64 @@
                     whensExpFns = {},
                     startSymbol = $interpolate.startSymbol(),
                     endSymbol = $interpolate.endSymbol(),
-                    isWhen = /^when(Minus)?(.+)$/;
+                    braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
+                    watchRemover = angular.noop,
+                    lastCount;
 
                 forEach(attr, function(expression, attributeName) {
-                    if (isWhen.test(attributeName)) {
-                        whens[lowercase(attributeName.replace('when', '').replace('Minus', '-'))] =
-                            element.attr(attr.$attr[attributeName]);
+                    var tmpMatch = IS_WHEN.exec(attributeName);
+                    if (tmpMatch) {
+                        var whenKey = (tmpMatch[1] ? '-' : '') + lowercase(tmpMatch[2]);
+                        whens[whenKey] = element.attr(attr.$attr[attributeName]);
                     }
                 });
                 forEach(whens, function(expression, key) {
-                    whensExpFns[key] =
-                        $interpolate(expression.replace(BRACE, startSymbol + numberExp + '-' +
-                        offset + endSymbol));
+                    whensExpFns[key] = $interpolate(expression.replace(BRACE, braceReplacement));
+
                 });
 
-                scope.$watch(function ngPluralizeWatch() {
-                    var value = parseFloat(scope.$eval(numberExp));
+                scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
+                    var count = parseFloat(newVal);
+                    var countIsNaN = isNumberNaN(count);
 
-                    if (!isNaN(value)) {
-                        //if explicit number rule such as 1, 2, 3... is defined, just use it. Otherwise,
-                        //check it against pluralization rules in $locale service
-                        if (!(value in whens)) value = $locale.pluralCat(value - offset);
-                        return whensExpFns[value](scope, element, true);
-                    } else {
-                        return '';
+                    if (!countIsNaN && !(count in whens)) {
+                        // If an explicit number rule such as 1, 2, 3... is defined, just use it.
+                        // Otherwise, check it against pluralization rules in $locale service.
+                        count = $locale.pluralCat(count - offset);
+                    }
+
+                    // If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
+                    // In JS `NaN !== NaN`, so we have to explicitly check.
+                    if ((count !== lastCount) && !(countIsNaN && isNumberNaN(lastCount))) {
+                        watchRemover();
+                        var whenExpFn = whensExpFns[count];
+                        if (isUndefined(whenExpFn)) {
+                            if (newVal != null) {
+                                $log.debug('ngPluralize: no rule defined for \'' + count + '\' in ' + whenExp);
+                            }
+                            watchRemover = noop;
+                            updateElementText();
+                        } else {
+                            watchRemover = scope.$watch(whenExpFn, updateElementText);
+                        }
+                        lastCount = count;
                     }
-                }, function ngPluralizeWatchAction(newVal) {
-                    element.text(newVal);
                 });
+
+                function updateElementText(newText) {
+                    element.text(newText || '');
+                }
             }
         };
     }];
 
+    /* exported ngRepeatDirective */
+
     /**
      * @ngdoc directive
      * @name ngRepeat
+     * @multiElement
+     * @restrict A
      *
      * @description
      * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
@@ -19734,10 +31322,200 @@
      * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
      * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
      *
-     * Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
-     * This may be useful when, for instance, nesting ngRepeats.
+     * <div class="alert alert-info">
+     *   Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
+     *   This may be useful when, for instance, nesting ngRepeats.
+     * </div>
+     *
+     *
+     * ## Iterating over object properties
+     *
+     * It is possible to get `ngRepeat` to iterate over the properties of an object using the following
+     * syntax:
+     *
+     * ```js
+     * <div ng-repeat="(key, value) in myObj"> ... </div>
+     * ```
+     *
+     * However, there are a few limitations compared to array iteration:
+     *
+     * - The JavaScript specification does not define the order of keys
+     *   returned for an object, so AngularJS relies on the order returned by the browser
+     *   when running `for key in myObj`. Browsers generally follow the strategy of providing
+     *   keys in the order in which they were defined, although there are exceptions when keys are deleted
+     *   and reinstated. See the
+     *   [MDN page on `delete` for more info](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_notes).
+     *
+     * - `ngRepeat` will silently *ignore* object keys starting with `$`, because
+     *   it's a prefix used by AngularJS for public (`$`) and private (`$$`) properties.
+     *
+     * - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
+     *   objects, and will throw an error if used with one.
+     *
+     * If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
+     * that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
+     * do this with a filter such as [toArrayFilter](http://ngmodules.org/modules/angular-toArrayFilter)
+     * or implement a `$watch` on the object yourself.
+     *
+     *
+     * ## Tracking and Duplicates
+     *
+     * `ngRepeat` uses {@link $rootScope.Scope#$watchCollection $watchCollection} to detect changes in
+     * the collection. When a change happens, `ngRepeat` then makes the corresponding changes to the DOM:
+     *
+     * * When an item is added, a new instance of the template is added to the DOM.
+     * * When an item is removed, its template instance is removed from the DOM.
+     * * When items are reordered, their respective templates are reordered in the DOM.
+     *
+     * To minimize creation of DOM elements, `ngRepeat` uses a function
+     * to "keep track" of all items in the collection and their corresponding DOM elements.
+     * For example, if an item is added to the collection, `ngRepeat` will know that all other items
+     * already have DOM elements, and will not re-render them.
+     *
+     * All different types of tracking functions, their syntax, and and their support for duplicate
+     * items in collections can be found in the
+     * {@link ngRepeat#ngRepeat-arguments ngRepeat expression description}.
      *
-     * # Special repeat start and end points
+     * <div class="alert alert-success">
+     * **Best Practice:** If you are working with objects that have a unique identifier property, you
+     * should track by this identifier instead of the object instance,
+     * e.g. `item in items track by item.id`.
+     * Should you reload your data later, `ngRepeat` will not have to rebuild the DOM elements for items
+     * it has already rendered, even if the JavaScript objects in the collection have been substituted
+     * for new ones. For large collections, this significantly improves rendering performance.
+     * </div>
+     *
+     * ### Effects of DOM Element re-use
+     *
+     * When DOM elements are re-used, ngRepeat updates the scope for the element, which will
+     * automatically update any active bindings on the template. However, other
+     * functionality will not be updated, because the element is not re-created:
+     *
+     * - Directives are not re-compiled
+     * - {@link guide/expression#one-time-binding one-time expressions} on the repeated template are not
+     * updated if they have stabilized.
+     *
+     * The above affects all kinds of element re-use due to tracking, but may be especially visible
+     * when tracking by `$index` due to the way ngRepeat re-uses elements.
+     *
+     * The following example shows the effects of different actions with tracking:
+
+     <example module="ngRepeat" name="ngRepeat-tracking" deps="angular-animate.js" animations="true">
+     <file name="script.js">
+     angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
+        var friends = [
+          {name:'John', age:25},
+          {name:'Mary', age:40},
+          {name:'Peter', age:85}
+        ];
+
+        $scope.removeFirst = function() {
+          $scope.friends.shift();
+        };
+
+        $scope.updateAge = function() {
+          $scope.friends.forEach(function(el) {
+            el.age = el.age + 5;
+          });
+        };
+
+        $scope.copy = function() {
+          $scope.friends = angular.copy($scope.friends);
+        };
+
+        $scope.reset = function() {
+          $scope.friends = angular.copy(friends);
+        };
+
+        $scope.reset();
+      });
+     </file>
+     <file name="index.html">
+     <div ng-controller="repeatController">
+     <ol>
+     <li>When you click "Update Age", only the first list updates the age, because all others have
+     a one-time binding on the age property. If you then click "Copy", the current friend list
+     is copied, and now the second list updates the age, because the identity of the collection items
+     has changed and the list must be re-rendered. The 3rd and 4th list stay the same, because all the
+     items are already known according to their tracking functions.
+     </li>
+     <li>When you click "Remove First", the 4th list has the wrong age on both remaining items. This is
+     due to tracking by $index: when the first collection item is removed, ngRepeat reuses the first
+     DOM element for the new first collection item, and so on. Since the age property is one-time
+     bound, the value remains from the collection item which was previously at this index.
+     </li>
+     </ol>
+
+     <button ng-click="removeFirst()">Remove First</button>
+     <button ng-click="updateAge()">Update Age</button>
+     <button ng-click="copy()">Copy</button>
+     <br><button ng-click="reset()">Reset List</button>
+     <br>
+     <code>track by $id(friend)</code> (default):
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends">
+     {{friend.name}} is {{friend.age}} years old.
+     </li>
+     </ul>
+     <code>track by $id(friend)</code> (default), with age one-time binding:
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends">
+     {{friend.name}} is {{::friend.age}} years old.
+     </li>
+     </ul>
+     <code>track by friend.name</code>, with age one-time binding:
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends track by friend.name">
+     {{friend.name}}  is {{::friend.age}} years old.
+     </li>
+     </ul>
+     <code>track by $index</code>, with age one-time binding:
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends track by $index">
+     {{friend.name}} is {{::friend.age}} years old.
+     </li>
+     </ul>
+     </div>
+     </file>
+     <file name="animations.css">
+     .example-animate-container {
+        background:white;
+        border:1px solid black;
+        list-style:none;
+        margin:0;
+        padding:0 10px;
+      }
+
+     .animate-repeat {
+        line-height:30px;
+        list-style:none;
+        box-sizing:border-box;
+      }
+
+     .animate-repeat.ng-move,
+     .animate-repeat.ng-enter,
+     .animate-repeat.ng-leave {
+        transition:all linear 0.5s;
+      }
+
+     .animate-repeat.ng-leave.ng-leave-active,
+     .animate-repeat.ng-move,
+     .animate-repeat.ng-enter {
+        opacity:0;
+        max-height:0;
+      }
+
+     .animate-repeat.ng-leave,
+     .animate-repeat.ng-move.ng-move-active,
+     .animate-repeat.ng-enter.ng-enter-active {
+        opacity:1;
+        max-height:30px;
+      }
+     </file>
+     </example>
+
+     *
+     * ## Special repeat start and end points
      * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
      * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
      * The **ng-repeat-start** directive works the same as **ng-repeat**, but will repeat all the HTML code (including the tag it's defined on)
@@ -19782,11 +31560,13 @@
      * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
      *
      * @animations
-     * **.enter** - when a new item is added to the list or when an item is revealed after a filter
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter} | when a new item is added to the list or when an item is revealed after a filter |
+     * | {@link ng.$animate#leave leave} | when an item is removed from the list or when an item is filtered out |
+     * | {@link ng.$animate#move move } | when an adjacent item is filtered out causing a reorder or when the item contents are reordered |
      *
-     * **.leave** - when an item is removed from the list or when an item is filtered out
-     *
-     * **.move** - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
+     * See the example below for defining CSS animations with ngRepeat.
      *
      * @element ANY
      * @scope
@@ -19804,54 +31584,91 @@
      *
      *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
      *
-     *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking function
-     *     which can be used to associate the objects in the collection with the DOM elements. If no tracking function
-     *     is specified the ng-repeat associates elements by identity in the collection. It is an error to have
-     *     more than one tracking function to resolve to the same key. (This would mean that two distinct objects are
-     *     mapped to the same DOM element, which is not possible.)  Filters should be applied to the expression,
-     *     before specifying a tracking expression.
+     *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
+     *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
+     *     is specified, ng-repeat associates elements by identity. It is an error to have
+     *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
+     *     mapped to the same DOM element, which is not possible.)
+     *
+     *     *Default tracking: $id()*: `item in items` is equivalent to `item in items track by $id(item)`.
+     *     This implies that the DOM elements will be associated by item identity in the collection.
+     *
+     *     The built-in `$id()` function can be used to assign a unique
+     *     `$$hashKey` property to each item in the collection. This property is then used as a key to associated DOM elements
+     *     with the corresponding item in the collection by identity. Moving the same object would move
+     *     the DOM element in the same way in the DOM.
+     *     Note that the default id function does not support duplicate primitive values (`number`, `string`),
+     *     but supports duplictae non-primitive values (`object`) that are *equal* in shape.
+     *
+     *     *Custom Expression*: It is possible to use any AngularJS expression to compute the tracking
+     *     id, for example with a function, or using a property on the collection items.
+     *     `item in items track by item.id` is a typical pattern when the items have a unique identifier,
+     *     e.g. database id. In this case the object identity does not matter. Two objects are considered
+     *     equivalent as long as their `id` property is same.
+     *     Tracking by unique identifier is the most performant way and should be used whenever possible.
+     *
+     *     *$index*: This special property tracks the collection items by their index, and
+     *     re-uses the DOM elements that match that index, e.g. `item in items track by $index`. This can
+     *     be used for a performance improvement if no unique identfier is available and the identity of
+     *     the collection items cannot be easily computed. It also allows duplicates.
+     *
+     *     <div class="alert alert-warning">
+     *       <strong>Note:</strong> Re-using DOM elements can have unforeseen effects. Read the
+     *       {@link ngRepeat#tracking-and-duplicates section on tracking and duplicates} for
+     *       more info.
+     *     </div>
+     *
+     *     <div class="alert alert-warning">
+     *       <strong>Note:</strong> the `track by` expression must come last - after any filters, and the alias expression:
+     *       `item in items | filter:searchText as results  track by item.id`
+     *     </div>
      *
-     *     For example: `item in items` is equivalent to `item in items track by $id(item)'. This implies that the DOM elements
-     *     will be associated by item identity in the array.
+     *   * `variable in expression as alias_expression` – You can also provide an optional alias expression which will then store the
+     *     intermediate results of the repeater after the filters have been applied. Typically this is used to render a special message
+     *     when a filter is active on the repeater, but the filtered result set is empty.
      *
-     *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
-     *     `$$hashKey` property to each item in the array. This property is then used as a key to associated DOM elements
-     *     with the corresponding item in the array by identity. Moving the same object in array would move the DOM
-     *     element in the same way in the DOM.
+     *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
+     *     the items have been processed through the filter.
      *
-     *     For example: `item in items track by item.id` is a typical pattern when the items come from the database. In this
-     *     case the object identity does not matter. Two objects are considered equivalent as long as their `id`
-     *     property is same.
+     *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat
+     *     micro-syntax so it can be used only after all filters (and not as operator, inside an expression).
      *
-     *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
-     *     to items in conjunction with a tracking expression.
+     *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results track by item.id` .
      *
      * @example
-     * This example initializes the scope to a list of names and
-     * then uses `ngRepeat` to display every person:
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     * This example uses `ngRepeat` to display a list of people. A filter is used to restrict the displayed
+     * results by name or by age. New (entering) and removed (leaving) items are animated.
+     <example module="ngRepeat" name="ngRepeat" deps="angular-animate.js" animations="true">
      <file name="index.html">
-     <div ng-init="friends = [
-     {name:'John', age:25, gender:'boy'},
-     {name:'Jessie', age:30, gender:'girl'},
-     {name:'Johanna', age:28, gender:'girl'},
-     {name:'Joy', age:15, gender:'girl'},
-     {name:'Mary', age:28, gender:'girl'},
-     {name:'Peter', age:95, gender:'boy'},
-     {name:'Sebastian', age:50, gender:'boy'},
-     {name:'Erika', age:27, gender:'girl'},
-     {name:'Patrick', age:40, gender:'boy'},
-     {name:'Samantha', age:60, gender:'girl'}
-     ]">
+     <div ng-controller="repeatController">
      I have {{friends.length}} friends. They are:
-     <input type="search" ng-model="q" placeholder="filter friends..." />
+     <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
      <ul class="example-animate-container">
-     <li class="animate-repeat" ng-repeat="friend in friends | filter:q">
+     <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results track by friend.name">
      [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
      </li>
+     <li class="animate-repeat" ng-if="results.length === 0">
+     <strong>No results found...</strong>
+     </li>
      </ul>
      </div>
      </file>
+     <file name="script.js">
+     angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
+        $scope.friends = [
+          {name:'John', age:25, gender:'boy'},
+          {name:'Jessie', age:30, gender:'girl'},
+          {name:'Johanna', age:28, gender:'girl'},
+          {name:'Joy', age:15, gender:'girl'},
+          {name:'Mary', age:28, gender:'girl'},
+          {name:'Peter', age:95, gender:'boy'},
+          {name:'Sebastian', age:50, gender:'boy'},
+          {name:'Erika', age:27, gender:'girl'},
+          {name:'Patrick', age:40, gender:'boy'},
+          {name:'Samantha', age:60, gender:'girl'}
+        ];
+      });
+     </file>
      <file name="animations.css">
      .example-animate-container {
         background:white;
@@ -19862,7 +31679,7 @@
       }
 
      .animate-repeat {
-        line-height:40px;
+        line-height:30px;
         list-style:none;
         box-sizing:border-box;
       }
@@ -19870,7 +31687,6 @@
      .animate-repeat.ng-move,
      .animate-repeat.ng-enter,
      .animate-repeat.ng-leave {
-        -webkit-transition:all linear 0.5s;
         transition:all linear 0.5s;
       }
 
@@ -19885,7 +31701,7 @@
      .animate-repeat.ng-move.ng-move-active,
      .animate-repeat.ng-enter.ng-enter-active {
         opacity:1;
-        max-height:40px;
+        max-height:30px;
       }
      </file>
      <file name="protractor.js" type="protractor">
@@ -19912,39 +31728,74 @@
      </file>
      </example>
      */
-    var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
+    var ngRepeatDirective = ['$parse', '$animate', '$compile', function($parse, $animate, $compile) {
         var NG_REMOVED = '$$NG_REMOVED';
         var ngRepeatMinErr = minErr('ngRepeat');
+
+        var updateScope = function(scope, index, valueIdentifier, value, keyIdentifier, key, arrayLength) {
+            // TODO(perf): generate setters to shave off ~40ms or 1-1.5%
+            scope[valueIdentifier] = value;
+            if (keyIdentifier) scope[keyIdentifier] = key;
+            scope.$index = index;
+            scope.$first = (index === 0);
+            scope.$last = (index === (arrayLength - 1));
+            scope.$middle = !(scope.$first || scope.$last);
+            // eslint-disable-next-line no-bitwise
+            scope.$odd = !(scope.$even = (index & 1) === 0);
+        };
+
+        var getBlockStart = function(block) {
+            return block.clone[0];
+        };
+
+        var getBlockEnd = function(block) {
+            return block.clone[block.clone.length - 1];
+        };
+
+
         return {
+            restrict: 'A',
+            multiElement: true,
             transclude: 'element',
             priority: 1000,
             terminal: true,
             $$tlb: true,
-            link: function($scope, $element, $attr, ctrl, $transclude){
+            compile: function ngRepeatCompile($element, $attr) {
                 var expression = $attr.ngRepeat;
-                var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),
-                    trackByExp, trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn,
-                    lhs, rhs, valueIdentifier, keyIdentifier,
-                    hashFnLocals = {$id: hashKey};
+                var ngRepeatEndComment = $compile.$$createComment('end ngRepeat', expression);
+
+                var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
 
                 if (!match) {
-                    throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
+                    throw ngRepeatMinErr('iexp', 'Expected expression in form of \'_item_ in _collection_[ track by _id_]\' but got \'{0}\'.',
                         expression);
                 }
 
-                lhs = match[1];
-                rhs = match[2];
-                trackByExp = match[3];
+                var lhs = match[1];
+                var rhs = match[2];
+                var aliasAs = match[3];
+                var trackByExp = match[4];
+
+                match = lhs.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);
+
+                if (!match) {
+                    throw ngRepeatMinErr('iidexp', '\'_item_\' in \'_item_ in _collection_\' should be an identifier or \'(_key_, _value_)\' expression, but got \'{0}\'.',
+                        lhs);
+                }
+                var valueIdentifier = match[3] || match[1];
+                var keyIdentifier = match[2];
+
+                if (aliasAs && (!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(aliasAs) ||
+                    /^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(aliasAs))) {
+                    throw ngRepeatMinErr('badident', 'alias \'{0}\' is invalid --- must be a valid JS identifier which is not a reserved name.',
+                        aliasAs);
+                }
+
+                var trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn;
+                var hashFnLocals = {$id: hashKey};
 
                 if (trackByExp) {
                     trackByExpGetter = $parse(trackByExp);
-                    trackByIdExpFn = function(key, value, index) {
-                        // assign key, value, and $index to the locals so that they can be used in hash functions
-                        if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
-                        hashFnLocals[valueIdentifier] = value;
-                        hashFnLocals.$index = index;
-                        return trackByExpGetter($scope, hashFnLocals);
-                    };
                 } else {
                     trackByIdArrayFn = function(key, value) {
                         return hashKey(value);
@@ -19954,171 +31805,172 @@
                     };
                 }
 
-                match = lhs.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);
-                if (!match) {
-                    throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
-                        lhs);
-                }
-                valueIdentifier = match[3] || match[1];
-                keyIdentifier = match[2];
-
-                // Store a list of elements from previous run. This is a hash where key is the item from the
-                // iterator, and the value is objects with following properties.
-                //   - scope: bound scope
-                //   - element: previous element.
-                //   - index: position
-                var lastBlockMap = {};
-
-                //watch props
-                $scope.$watchCollection(rhs, function ngRepeatAction(collection){
-                    var index, length,
-                        previousNode = $element[0],     // current position of the node
-                        nextNode,
-                    // Same as lastBlockMap but it has the current state. It will become the
-                    // lastBlockMap on the next iteration.
-                        nextBlockMap = {},
-                        arrayLength,
-                        childScope,
-                        key, value, // key/value of iteration
-                        trackById,
-                        trackByIdFn,
-                        collectionKeys,
-                        block,       // last object information {scope, element, id}
-                        nextBlockOrder = [],
-                        elementsToRemove;
-
-
-                    if (isArrayLike(collection)) {
-                        collectionKeys = collection;
-                        trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
-                    } else {
-                        trackByIdFn = trackByIdExpFn || trackByIdObjFn;
-                        // if object, extract keys, sort them and use to determine order of iteration over obj props
-                        collectionKeys = [];
-                        for (key in collection) {
-                            if (collection.hasOwnProperty(key) && key.charAt(0) != '$') {
-                                collectionKeys.push(key);
-                            }
+                return function ngRepeatLink($scope, $element, $attr, ctrl, $transclude) {
+
+                    if (trackByExpGetter) {
+                        trackByIdExpFn = function(key, value, index) {
+                            // assign key, value, and $index to the locals so that they can be used in hash functions
+                            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
+                            hashFnLocals[valueIdentifier] = value;
+                            hashFnLocals.$index = index;
+                            return trackByExpGetter($scope, hashFnLocals);
+                        };
+                    }
+
+                    // Store a list of elements from previous run. This is a hash where key is the item from the
+                    // iterator, and the value is objects with following properties.
+                    //   - scope: bound scope
+                    //   - clone: previous element.
+                    //   - index: position
+                    //
+                    // We are using no-proto object so that we don't need to guard against inherited props via
+                    // hasOwnProperty.
+                    var lastBlockMap = createMap();
+
+                    //watch props
+                    $scope.$watchCollection(rhs, function ngRepeatAction(collection) {
+                        var index, length,
+                            previousNode = $element[0],     // node that cloned nodes should be inserted after
+                                                            // initialized to the comment node anchor
+                            nextNode,
+                            // Same as lastBlockMap but it has the current state. It will become the
+                            // lastBlockMap on the next iteration.
+                            nextBlockMap = createMap(),
+                            collectionLength,
+                            key, value, // key/value of iteration
+                            trackById,
+                            trackByIdFn,
+                            collectionKeys,
+                            block,       // last object information {scope, element, id}
+                            nextBlockOrder,
+                            elementsToRemove;
+
+                        if (aliasAs) {
+                            $scope[aliasAs] = collection;
                         }
-                        collectionKeys.sort();
-                    }
-
-                    arrayLength = collectionKeys.length;
-
-                    // locate existing items
-                    length = nextBlockOrder.length = collectionKeys.length;
-                    for(index = 0; index < length; index++) {
-                        key = (collection === collectionKeys) ? index : collectionKeys[index];
-                        value = collection[key];
-                        trackById = trackByIdFn(key, value, index);
-                        assertNotHasOwnProperty(trackById, '`track by` id');
-                        if(lastBlockMap.hasOwnProperty(trackById)) {
-                            block = lastBlockMap[trackById];
-                            delete lastBlockMap[trackById];
-                            nextBlockMap[trackById] = block;
-                            nextBlockOrder[index] = block;
-                        } else if (nextBlockMap.hasOwnProperty(trackById)) {
-                            // restore lastBlockMap
-                            forEach(nextBlockOrder, function(block) {
-                                if (block && block.scope) lastBlockMap[block.id] = block;
-                            });
-                            // This is a duplicate and we need to throw an error
-                            throw ngRepeatMinErr('dupes', "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}",
-                                expression,       trackById);
+
+                        if (isArrayLike(collection)) {
+                            collectionKeys = collection;
+                            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
                         } else {
-                            // new never before seen block
-                            nextBlockOrder[index] = { id: trackById };
-                            nextBlockMap[trackById] = false;
+                            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
+                            // if object, extract keys, in enumeration order, unsorted
+                            collectionKeys = [];
+                            for (var itemKey in collection) {
+                                if (hasOwnProperty.call(collection, itemKey) && itemKey.charAt(0) !== '$') {
+                                    collectionKeys.push(itemKey);
+                                }
+                            }
                         }
-                    }
 
-                    // remove existing items
-                    for (key in lastBlockMap) {
-                        // lastBlockMap is our own object so we don't need to use special hasOwnPropertyFn
-                        if (lastBlockMap.hasOwnProperty(key)) {
-                            block = lastBlockMap[key];
-                            elementsToRemove = getBlockElements(block.clone);
+                        collectionLength = collectionKeys.length;
+                        nextBlockOrder = new Array(collectionLength);
+
+                        // locate existing items
+                        for (index = 0; index < collectionLength; index++) {
+                            key = (collection === collectionKeys) ? index : collectionKeys[index];
+                            value = collection[key];
+                            trackById = trackByIdFn(key, value, index);
+                            if (lastBlockMap[trackById]) {
+                                // found previously seen block
+                                block = lastBlockMap[trackById];
+                                delete lastBlockMap[trackById];
+                                nextBlockMap[trackById] = block;
+                                nextBlockOrder[index] = block;
+                            } else if (nextBlockMap[trackById]) {
+                                // if collision detected. restore lastBlockMap and throw an error
+                                forEach(nextBlockOrder, function(block) {
+                                    if (block && block.scope) lastBlockMap[block.id] = block;
+                                });
+                                throw ngRepeatMinErr('dupes',
+                                    'Duplicates in a repeater are not allowed. Use \'track by\' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}',
+                                    expression, trackById, value);
+                            } else {
+                                // new never before seen block
+                                nextBlockOrder[index] = {id: trackById, scope: undefined, clone: undefined};
+                                nextBlockMap[trackById] = true;
+                            }
+                        }
+
+                        // remove leftover items
+                        for (var blockKey in lastBlockMap) {
+                            block = lastBlockMap[blockKey];
+                            elementsToRemove = getBlockNodes(block.clone);
                             $animate.leave(elementsToRemove);
-                            forEach(elementsToRemove, function(element) { element[NG_REMOVED] = true; });
+                            if (elementsToRemove[0].parentNode) {
+                                // if the element was not removed yet because of pending animation, mark it as deleted
+                                // so that we can ignore it later
+                                for (index = 0, length = elementsToRemove.length; index < length; index++) {
+                                    elementsToRemove[index][NG_REMOVED] = true;
+                                }
+                            }
                             block.scope.$destroy();
                         }
-                    }
 
-                    // we are not using forEach for perf reasons (trying to avoid #call)
-                    for (index = 0, length = collectionKeys.length; index < length; index++) {
-                        key = (collection === collectionKeys) ? index : collectionKeys[index];
-                        value = collection[key];
-                        block = nextBlockOrder[index];
-                        if (nextBlockOrder[index - 1]) previousNode = getBlockEnd(nextBlockOrder[index - 1]);
+                        // we are not using forEach for perf reasons (trying to avoid #call)
+                        for (index = 0; index < collectionLength; index++) {
+                            key = (collection === collectionKeys) ? index : collectionKeys[index];
+                            value = collection[key];
+                            block = nextBlockOrder[index];
 
-                        if (block.scope) {
-                            // if we have already seen this object, then we need to reuse the
-                            // associated scope/element
-                            childScope = block.scope;
+                            if (block.scope) {
+                                // if we have already seen this object, then we need to reuse the
+                                // associated scope/element
 
-                            nextNode = previousNode;
-                            do {
-                                nextNode = nextNode.nextSibling;
-                            } while(nextNode && nextNode[NG_REMOVED]);
+                                nextNode = previousNode;
 
-                            if (getBlockStart(block) != nextNode) {
-                                // existing item which got moved
-                                $animate.move(getBlockElements(block.clone), null, jqLite(previousNode));
-                            }
-                            previousNode = getBlockEnd(block);
-                        } else {
-                            // new item which we don't know about
-                            childScope = $scope.$new();
-                        }
+                                // skip nodes that are already pending removal via leave animation
+                                do {
+                                    nextNode = nextNode.nextSibling;
+                                } while (nextNode && nextNode[NG_REMOVED]);
 
-                        childScope[valueIdentifier] = value;
-                        if (keyIdentifier) childScope[keyIdentifier] = key;
-                        childScope.$index = index;
-                        childScope.$first = (index === 0);
-                        childScope.$last = (index === (arrayLength - 1));
-                        childScope.$middle = !(childScope.$first || childScope.$last);
-                        // jshint bitwise: false
-                        childScope.$odd = !(childScope.$even = (index&1) === 0);
-                        // jshint bitwise: true
-
-                        if (!block.scope) {
-                            $transclude(childScope, function(clone) {
-                                clone[clone.length++] = document.createComment(' end ngRepeat: ' + expression + ' ');
-                                $animate.enter(clone, null, jqLite(previousNode));
-                                previousNode = clone;
-                                block.scope = childScope;
-                                // Note: We only need the first/last node of the cloned nodes.
-                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-                                // by a directive with templateUrl when it's template arrives.
-                                block.clone = clone;
-                                nextBlockMap[block.id] = block;
-                            });
+                                if (getBlockStart(block) !== nextNode) {
+                                    // existing item which got moved
+                                    $animate.move(getBlockNodes(block.clone), null, previousNode);
+                                }
+                                previousNode = getBlockEnd(block);
+                                updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+                            } else {
+                                // new item which we don't know about
+                                $transclude(function ngRepeatTransclude(clone, scope) {
+                                    block.scope = scope;
+                                    // http://jsperf.com/clone-vs-createcomment
+                                    var endNode = ngRepeatEndComment.cloneNode(false);
+                                    clone[clone.length++] = endNode;
+
+                                    $animate.enter(clone, null, previousNode);
+                                    previousNode = endNode;
+                                    // Note: We only need the first/last node of the cloned nodes.
+                                    // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                                    // by a directive with templateUrl when its template arrives.
+                                    block.clone = clone;
+                                    nextBlockMap[block.id] = block;
+                                    updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+                                });
+                            }
                         }
-                    }
-                    lastBlockMap = nextBlockMap;
-                });
+                        lastBlockMap = nextBlockMap;
+                    });
+                };
             }
         };
-
-        function getBlockStart(block) {
-            return block.clone[0];
-        }
-
-        function getBlockEnd(block) {
-            return block.clone[block.clone.length - 1];
-        }
     }];
 
+    var NG_HIDE_CLASS = 'ng-hide';
+    var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
     /**
      * @ngdoc directive
      * @name ngShow
+     * @multiElement
      *
      * @description
-     * The `ngShow` directive shows or hides the given HTML element based on the expression
-     * provided to the ngShow attribute. The element is shown or hidden by removing or adding
-     * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
-     * in AngularJS and sets the display style to none (using an !important flag).
-     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+     * The `ngShow` directive shows or hides the given HTML element based on the expression provided to
+     * the `ngShow` attribute.
+     *
+     * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
+     * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
+     * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
+     * {@link ng.directive:ngCsp ngCsp}).
      *
      * ```html
      * <!-- when $scope.myValue is truthy (element is visible) -->
@@ -20128,59 +31980,58 @@
      * <div ng-show="myValue" class="ng-hide"></div>
      * ```
      *
-     * When the ngShow expression evaluates to false then the ng-hide CSS class is added to the class attribute
-     * on the element causing it to become hidden. When true, the ng-hide CSS class is removed
-     * from the element causing the element not to appear hidden.
+     * When the `ngShow` expression evaluates to a falsy value then the `.ng-hide` CSS class is added
+     * to the class attribute on the element causing it to become hidden. When truthy, the `.ng-hide`
+     * CSS class is removed from the element causing the element not to appear hidden.
      *
-     * ## Why is !important used?
+     * ## Why is `!important` used?
      *
-     * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
-     * can be easily overridden by heavier selectors. For example, something as simple
-     * as changing the display style on a HTML list item would make hidden elements appear visible.
-     * This also becomes a bigger issue when dealing with CSS frameworks.
+     * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
+     * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
+     * simple as changing the display style on a HTML list item would make hidden elements appear
+     * visible. This also becomes a bigger issue when dealing with CSS frameworks.
      *
-     * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
-     * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
-     * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+     * By using `!important`, the show and hide behavior will work as expected despite any clash between
+     * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
+     * developer chooses to override the styling to change how to hide an element then it is just a
+     * matter of using `!important` in their own CSS code.
      *
-     * ### Overriding .ng-hide
+     * ### Overriding `.ng-hide`
+     *
+     * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
+     * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
+     * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
+     * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
      *
-     * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
-     * restating the styles for the .ng-hide class in CSS:
      * ```css
-     * .ng-hide {
- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
- *   display:block!important;
- *
- *   //this is just another form of hiding an element
- *   position:absolute;
- *   top:-9999px;
- *   left:-9999px;
- * }
+     * .ng-hide:not(.ng-hide-animate) {
+     *   /&#42; These are just alternative ways of hiding an element &#42;/
+     *   display: block!important;
+     *   position: absolute;
+     *   top: -9999px;
+     *   left: -9999px;
+     * }
      * ```
      *
-     * Just remember to include the important flag so the CSS override will function.
+     * By default you don't need to override anything in CSS and the animations will work around the
+     * display style.
      *
-     * <div class="alert alert-warning">
-     * **Note:** Here is a list of values that ngShow will consider as a falsy value (case insensitive):<br />
-     * "f" / "0" / "false" / "no" / "n" / "[]"
-     * </div>
-     *
-     * ## A note about animations with ngShow
+     * @animations
+     * | Animation                                           | Occurs                                                                                                        |
+     * |-----------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
+     * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden. |
+     * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngShow` expression evaluates to a truthy value and just before contents are set to visible.        |
      *
-     * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
-     * is true and false. This system works like the animation system present with ngClass except that
-     * you must also include the !important flag to override the display property
-     * so that you can perform an animation when the element is hidden during the time of the animation.
+     * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
+     * directive expression is true and false. This system works like the animation system present with
+     * `ngClass` except that you must also include the `!important` flag to override the display
+     * property so that the elements are not actually hidden during the animation.
      *
      * ```css
-     * //
-     * //a working example can be found at the bottom of this page
-     * //
+     * /&#42; A working example can be found at the bottom of this page. &#42;/
      * .my-element.ng-hide-add, .my-element.ng-hide-remove {
- *   transition:0.5s linear all;
- *   display:block!important;
- * }
+     *   transition: all 0.5s linear;
+     * }
      *
      * .my-element.ng-hide-add { ... }
      * .my-element.ng-hide-add.ng-hide-add-active { ... }
@@ -20188,83 +32039,121 @@
      * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
      * ```
      *
-     * @animations
-     * addClass: .ng-hide - happens after the ngShow expression evaluates to a truthy value and the just before contents are set to visible
-     * removeClass: .ng-hide - happens after the ngShow expression evaluates to a non truthy value and just before the contents are set to hidden
+     * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
+     * to block during animation states - ngAnimate will automatically handle the style toggling for you.
      *
      * @element ANY
-     * @param {expression} ngShow If the {@link guide/expression expression} is truthy
-     *     then the element is shown or hidden respectively.
+     * @param {expression} ngShow If the {@link guide/expression expression} is truthy/falsy then the
+     *                            element is shown/hidden respectively.
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     * A simple example, animating the element's opacity:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-simple">
      <file name="index.html">
-     Click me: <input type="checkbox" ng-model="checked"><br/>
-     <div>
-     Show:
-     <div class="check-element animate-show" ng-show="checked">
-     <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
-     </div>
-     </div>
-     <div>
-     Hide:
-     <div class="check-element animate-show" ng-hide="checked">
-     <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
-     </div>
+     Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
+     <div class="check-element animate-show-hide" ng-show="checked">
+     I show up when your checkbox is checked.
      </div>
      </file>
-     <file name="glyphicons.css">
-     @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
+     <file name="animations.css">
+     .animate-show-hide.ng-hide {
+        opacity: 0;
+      }
+
+     .animate-show-hide.ng-hide-add,
+     .animate-show-hide.ng-hide-remove {
+        transition: all linear 0.5s;
+      }
+
+     .check-element {
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
+      }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ngShow', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
+
+        expect(checkElem.isDisplayed()).toBe(false);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(true);
+      });
+     </file>
+     </example>
+     *
+     * <hr />
+     * @example
+     * A more complex example, featuring different show/hide animations:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-complex">
+     <file name="index.html">
+     Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
+     <div class="check-element funky-show-hide" ng-show="checked">
+     I show up when your checkbox is checked.
+     </div>
      </file>
      <file name="animations.css">
-     .animate-show {
-        -webkit-transition:all linear 0.5s;
-        transition:all linear 0.5s;
-        line-height:20px;
-        opacity:1;
-        padding:10px;
-        border:1px solid black;
-        background:white;
+     body {
+        overflow: hidden;
+        perspective: 1000px;
       }
 
-     .animate-show.ng-hide-add,
-     .animate-show.ng-hide-remove {
-        display:block!important;
+     .funky-show-hide.ng-hide-add {
+        transform: rotateZ(0);
+        transform-origin: right;
+        transition: all 0.5s ease-in-out;
       }
 
-     .animate-show.ng-hide {
-        line-height:0;
-        opacity:0;
-        padding:0 10px;
+     .funky-show-hide.ng-hide-add.ng-hide-add-active {
+        transform: rotateZ(-135deg);
+      }
+
+     .funky-show-hide.ng-hide-remove {
+        transform: rotateY(90deg);
+        transform-origin: left;
+        transition: all 0.5s ease;
+      }
+
+     .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
+        transform: rotateY(0);
       }
 
      .check-element {
-        padding:10px;
-        border:1px solid black;
-        background:white;
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
       }
      </file>
      <file name="protractor.js" type="protractor">
-     var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
-     var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
-
-     it('should check ng-show / ng-hide', function() {
-        expect(thumbsUp.isDisplayed()).toBeFalsy();
-        expect(thumbsDown.isDisplayed()).toBeTruthy();
+     it('should check ngShow', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
 
-        element(by.model('checked')).click();
-
-        expect(thumbsUp.isDisplayed()).toBeTruthy();
-        expect(thumbsDown.isDisplayed()).toBeFalsy();
+        expect(checkElem.isDisplayed()).toBe(false);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(true);
       });
      </file>
      </example>
      */
     var ngShowDirective = ['$animate', function($animate) {
-        return function(scope, element, attr) {
-            scope.$watch(attr.ngShow, function ngShowWatchAction(value){
-                $animate[toBoolean(value) ? 'removeClass' : 'addClass'](element, 'ng-hide');
-            });
+        return {
+            restrict: 'A',
+            multiElement: true,
+            link: function(scope, element, attr) {
+                scope.$watch(attr.ngShow, function ngShowWatchAction(value) {
+                    // we're adding a temporary, animation-specific class for ng-hide since this way
+                    // we can control when the element is actually displayed on screen without having
+                    // to have a global/greedy CSS selector that breaks when other animations are run.
+                    // Read: https://github.com/angular/angular.js/issues/9103#issuecomment-58335845
+                    $animate[value ? 'removeClass' : 'addClass'](element, NG_HIDE_CLASS, {
+                        tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+                    });
+                });
+            }
         };
     }];
 
@@ -20272,75 +32161,77 @@
     /**
      * @ngdoc directive
      * @name ngHide
+     * @multiElement
      *
      * @description
-     * The `ngHide` directive shows or hides the given HTML element based on the expression
-     * provided to the ngHide attribute. The element is shown or hidden by removing or adding
-     * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
-     * in AngularJS and sets the display style to none (using an !important flag).
-     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+     * The `ngHide` directive shows or hides the given HTML element based on the expression provided to
+     * the `ngHide` attribute.
+     *
+     * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
+     * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
+     * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
+     * {@link ng.directive:ngCsp ngCsp}).
      *
      * ```html
      * <!-- when $scope.myValue is truthy (element is hidden) -->
-     * <div ng-hide="myValue"></div>
+     * <div ng-hide="myValue" class="ng-hide"></div>
      *
      * <!-- when $scope.myValue is falsy (element is visible) -->
-     * <div ng-hide="myValue" class="ng-hide"></div>
+     * <div ng-hide="myValue"></div>
      * ```
      *
-     * When the ngHide expression evaluates to true then the .ng-hide CSS class is added to the class attribute
-     * on the element causing it to become hidden. When false, the ng-hide CSS class is removed
-     * from the element causing the element not to appear hidden.
+     * When the `ngHide` expression evaluates to a truthy value then the `.ng-hide` CSS class is added
+     * to the class attribute on the element causing it to become hidden. When falsy, the `.ng-hide`
+     * CSS class is removed from the element causing the element not to appear hidden.
      *
-     * ## Why is !important used?
+     * ## Why is `!important` used?
      *
-     * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
-     * can be easily overridden by heavier selectors. For example, something as simple
-     * as changing the display style on a HTML list item would make hidden elements appear visible.
-     * This also becomes a bigger issue when dealing with CSS frameworks.
+     * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
+     * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
+     * simple as changing the display style on a HTML list item would make hidden elements appear
+     * visible. This also becomes a bigger issue when dealing with CSS frameworks.
      *
-     * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
-     * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
-     * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+     * By using `!important`, the show and hide behavior will work as expected despite any clash between
+     * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
+     * developer chooses to override the styling to change how to hide an element then it is just a
+     * matter of using `!important` in their own CSS code.
      *
-     * ### Overriding .ng-hide
+     * ### Overriding `.ng-hide`
+     *
+     * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
+     * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
+     * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
+     * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
      *
-     * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
-     * restating the styles for the .ng-hide class in CSS:
      * ```css
-     * .ng-hide {
- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
- *   display:block!important;
- *
- *   //this is just another form of hiding an element
- *   position:absolute;
- *   top:-9999px;
- *   left:-9999px;
- * }
+     * .ng-hide:not(.ng-hide-animate) {
+     *   /&#42; These are just alternative ways of hiding an element &#42;/
+     *   display: block!important;
+     *   position: absolute;
+     *   top: -9999px;
+     *   left: -9999px;
+     * }
      * ```
      *
-     * Just remember to include the important flag so the CSS override will function.
-     *
-     * <div class="alert alert-warning">
-     * **Note:** Here is a list of values that ngHide will consider as a falsy value (case insensitive):<br />
-     * "f" / "0" / "false" / "no" / "n" / "[]"
-     * </div>
+     * By default you don't need to override in CSS anything and the animations will work around the
+     * display style.
      *
-     * ## A note about animations with ngHide
+     * @animations
+     * | Animation                                           | Occurs                                                                                                     |
+     * |-----------------------------------------------------|------------------------------------------------------------------------------------------------------------|
+     * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden.  |
+     * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngHide` expression evaluates to a non truthy value and just before contents are set to visible. |
      *
-     * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
-     * is true and false. This system works like the animation system present with ngClass, except that
-     * you must also include the !important flag to override the display property so
-     * that you can perform an animation when the element is hidden during the time of the animation.
+     * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
+     * directive expression is true and false. This system works like the animation system present with
+     * `ngClass` except that you must also include the `!important` flag to override the display
+     * property so that the elements are not actually hidden during the animation.
      *
      * ```css
-     * //
-     * //a working example can be found at the bottom of this page
-     * //
+     * /&#42; A working example can be found at the bottom of this page. &#42;/
      * .my-element.ng-hide-add, .my-element.ng-hide-remove {
- *   transition:0.5s linear all;
- *   display:block!important;
- * }
+     *   transition: all 0.5s linear;
+     * }
      *
      * .my-element.ng-hide-add { ... }
      * .my-element.ng-hide-add.ng-hide-add-active { ... }
@@ -20348,83 +32239,119 @@
      * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
      * ```
      *
-     * @animations
-     * removeClass: .ng-hide - happens after the ngHide expression evaluates to a truthy value and just before the contents are set to hidden
-     * addClass: .ng-hide - happens after the ngHide expression evaluates to a non truthy value and just before the contents are set to visible
+     * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
+     * to block during animation states - ngAnimate will automatically handle the style toggling for you.
      *
      * @element ANY
-     * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
-     *     the element is shown or hidden respectively.
+     * @param {expression} ngHide If the {@link guide/expression expression} is truthy/falsy then the
+     *                            element is hidden/shown respectively.
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     * A simple example, animating the element's opacity:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-simple">
      <file name="index.html">
-     Click me: <input type="checkbox" ng-model="checked"><br/>
-     <div>
-     Show:
-     <div class="check-element animate-hide" ng-show="checked">
-     <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
-     </div>
-     </div>
-     <div>
-     Hide:
-     <div class="check-element animate-hide" ng-hide="checked">
-     <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
-     </div>
+     Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
+     <div class="check-element animate-show-hide" ng-hide="checked">
+     I hide when your checkbox is checked.
      </div>
      </file>
-     <file name="glyphicons.css">
-     @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
+     <file name="animations.css">
+     .animate-show-hide.ng-hide {
+        opacity: 0;
+      }
+
+     .animate-show-hide.ng-hide-add,
+     .animate-show-hide.ng-hide-remove {
+        transition: all linear 0.5s;
+      }
+
+     .check-element {
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
+      }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ngHide', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
+
+        expect(checkElem.isDisplayed()).toBe(true);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(false);
+      });
+     </file>
+     </example>
+     *
+     * <hr />
+     * @example
+     * A more complex example, featuring different show/hide animations:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-complex">
+     <file name="index.html">
+     Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
+     <div class="check-element funky-show-hide" ng-hide="checked">
+     I hide when your checkbox is checked.
+     </div>
      </file>
      <file name="animations.css">
-     .animate-hide {
-        -webkit-transition:all linear 0.5s;
-        transition:all linear 0.5s;
-        line-height:20px;
-        opacity:1;
-        padding:10px;
-        border:1px solid black;
-        background:white;
+     body {
+        overflow: hidden;
+        perspective: 1000px;
       }
 
-     .animate-hide.ng-hide-add,
-     .animate-hide.ng-hide-remove {
-        display:block!important;
+     .funky-show-hide.ng-hide-add {
+        transform: rotateZ(0);
+        transform-origin: right;
+        transition: all 0.5s ease-in-out;
       }
 
-     .animate-hide.ng-hide {
-        line-height:0;
-        opacity:0;
-        padding:0 10px;
+     .funky-show-hide.ng-hide-add.ng-hide-add-active {
+        transform: rotateZ(-135deg);
+      }
+
+     .funky-show-hide.ng-hide-remove {
+        transform: rotateY(90deg);
+        transform-origin: left;
+        transition: all 0.5s ease;
+      }
+
+     .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
+        transform: rotateY(0);
       }
 
      .check-element {
-        padding:10px;
-        border:1px solid black;
-        background:white;
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
       }
      </file>
      <file name="protractor.js" type="protractor">
-     var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
-     var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
-
-     it('should check ng-show / ng-hide', function() {
-        expect(thumbsUp.isDisplayed()).toBeFalsy();
-        expect(thumbsDown.isDisplayed()).toBeTruthy();
+     it('should check ngHide', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
 
-        element(by.model('checked')).click();
-
-        expect(thumbsUp.isDisplayed()).toBeTruthy();
-        expect(thumbsDown.isDisplayed()).toBeFalsy();
+        expect(checkElem.isDisplayed()).toBe(true);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(false);
       });
      </file>
      </example>
      */
     var ngHideDirective = ['$animate', function($animate) {
-        return function(scope, element, attr) {
-            scope.$watch(attr.ngHide, function ngHideWatchAction(value){
-                $animate[toBoolean(value) ? 'addClass' : 'removeClass'](element, 'ng-hide');
-            });
+        return {
+            restrict: 'A',
+            multiElement: true,
+            link: function(scope, element, attr) {
+                scope.$watch(attr.ngHide, function ngHideWatchAction(value) {
+                    // The comment inside of the ngShowDirective explains why we add and
+                    // remove a temporary class for the show/hide animation
+                    $animate[value ? 'addClass' : 'removeClass'](element,NG_HIDE_CLASS, {
+                        tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+                    });
+                });
+            }
         };
     }];
 
@@ -20436,15 +32363,26 @@
      * @description
      * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
      *
+     * @knownIssue
+     * You should not use {@link guide/interpolation interpolation} in the value of the `style`
+     * attribute, when using the `ngStyle` directive on the same element.
+     * See {@link guide/interpolation#known-issues here} for more info.
+     *
      * @element ANY
-     * @param {expression} ngStyle {@link guide/expression Expression} which evals to an
-     *      object whose keys are CSS style names and values are corresponding values for those CSS
-     *      keys.
+     * @param {expression} ngStyle
+     *
+     * {@link guide/expression Expression} which evals to an
+     * object whose keys are CSS style names and values are corresponding values for those CSS
+     * keys.
+     *
+     * Since some CSS style names are not valid keys for an object, they must be quoted.
+     * See the 'background-color' style in the example below.
      *
      * @example
-     <example>
+     <example name="ng-style">
      <file name="index.html">
-     <input type="button" value="set" ng-click="myStyle={color:'red'}">
+     <input type="button" value="set color" ng-click="myStyle={color:'red'}">
+     <input type="button" value="set background" ng-click="myStyle={'background-color':'blue'}">
      <input type="button" value="clear" ng-click="myStyle={}">
      <br/>
      <span ng-style="myStyle">Sample Text</span>
@@ -20460,7 +32398,7 @@
 
      it('should check ng-style', function() {
          expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
-         element(by.css('input[value=set]')).click();
+         element(by.css('input[value=\'set color\']')).click();
          expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
          element(by.css('input[value=clear]')).click();
          expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
@@ -20504,51 +32442,61 @@
      * </div>
 
      * @animations
-     * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
-     * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter}  | after the ngSwitch contents change and the matched child element is placed inside the container |
+     * | {@link ng.$animate#leave leave}  | after the ngSwitch contents change and just before the former contents are removed from the DOM |
      *
      * @usage
+     *
+     * ```
      * <ANY ng-switch="expression">
      *   <ANY ng-switch-when="matchValue1">...</ANY>
      *   <ANY ng-switch-when="matchValue2">...</ANY>
      *   <ANY ng-switch-default>...</ANY>
      * </ANY>
+     * ```
      *
      *
      * @scope
-     * @priority 800
-     * @param {*} ngSwitch|on expression to match against <tt>ng-switch-when</tt>.
+     * @priority 1200
+     * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
      * On child elements add:
      *
      * * `ngSwitchWhen`: the case statement to match against. If match then this
      *   case will be displayed. If the same match appears multiple times, all the
-     *   elements will be displayed.
+     *   elements will be displayed. It is possible to associate multiple values to
+     *   the same `ngSwitchWhen` by defining the optional attribute
+     *   `ngSwitchWhenSeparator`. The separator will be used to split the value of
+     *   the `ngSwitchWhen` attribute into multiple tokens, and the element will show
+     *   if any of the `ngSwitch` evaluates to any of these tokens.
      * * `ngSwitchDefault`: the default case when no other case match. If there
      *   are multiple default cases, all of them will be displayed when no other
      *   case match.
      *
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     <example module="switchExample" deps="angular-animate.js" animations="true" name="ng-switch">
      <file name="index.html">
-     <div ng-controller="Ctrl">
+     <div ng-controller="ExampleController">
      <select ng-model="selection" ng-options="item for item in items">
      </select>
-     <tt>selection={{selection}}</tt>
+     <code>selection={{selection}}</code>
      <hr/>
      <div class="animate-switch-container"
      ng-switch on="selection">
-     <div class="animate-switch" ng-switch-when="settings">Settings Div</div>
+     <div class="animate-switch" ng-switch-when="settings|options" ng-switch-when-separator="|">Settings Div</div>
      <div class="animate-switch" ng-switch-when="home">Home Span</div>
      <div class="animate-switch" ng-switch-default>default</div>
      </div>
      </div>
      </file>
      <file name="script.js">
-     function Ctrl($scope) {
-        $scope.items = ['settings', 'home', 'other'];
-        $scope.selection = $scope.items[0];
-      }
+     angular.module('switchExample', ['ngAnimate'])
+     .controller('ExampleController', ['$scope', function($scope) {
+          $scope.items = ['settings', 'home', 'options', 'other'];
+          $scope.selection = $scope.items[0];
+        }]);
      </file>
      <file name="animations.css">
      .animate-switch-container {
@@ -20564,7 +32512,6 @@
       }
 
      .animate-switch.ng-animate {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
 
         position:absolute;
@@ -20591,68 +32538,68 @@
         expect(switchElem.getText()).toMatch(/Settings Div/);
       });
      it('should change to home', function() {
-        select.element.all(by.css('option')).get(1).click();
+        select.all(by.css('option')).get(1).click();
         expect(switchElem.getText()).toMatch(/Home Span/);
       });
+     it('should change to settings via "options"', function() {
+        select.all(by.css('option')).get(2).click();
+        expect(switchElem.getText()).toMatch(/Settings Div/);
+      });
      it('should select default', function() {
-        select.element.all(by.css('option')).get(2).click();
+        select.all(by.css('option')).get(3).click();
         expect(switchElem.getText()).toMatch(/default/);
       });
      </file>
      </example>
      */
-    var ngSwitchDirective = ['$animate', function($animate) {
+    var ngSwitchDirective = ['$animate', '$compile', function($animate, $compile) {
         return {
-            restrict: 'EA',
             require: 'ngSwitch',
 
             // asks for $scope to fool the BC controller module
-            controller: ['$scope', function ngSwitchController() {
+            controller: ['$scope', function NgSwitchController() {
                 this.cases = {};
             }],
             link: function(scope, element, attr, ngSwitchController) {
                 var watchExpr = attr.ngSwitch || attr.on,
-                    selectedTranscludes,
-                    selectedElements,
-                    previousElements,
+                    selectedTranscludes = [],
+                    selectedElements = [],
+                    previousLeaveAnimations = [],
                     selectedScopes = [];
 
+                var spliceFactory = function(array, index) {
+                    return function(response) {
+                        if (response !== false) array.splice(index, 1);
+                    };
+                };
+
                 scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
-                    var i, ii = selectedScopes.length;
-                    if(ii > 0) {
-                        if(previousElements) {
-                            for (i = 0; i < ii; i++) {
-                                previousElements[i].remove();
-                            }
-                            previousElements = null;
-                        }
+                    var i, ii;
 
-                        previousElements = [];
-                        for (i= 0; i<ii; i++) {
-                            var selected = selectedElements[i];
-                            selectedScopes[i].$destroy();
-                            previousElements[i] = selected;
-                            $animate.leave(selected, function() {
-                                previousElements.splice(i, 1);
-                                if(previousElements.length === 0) {
-                                    previousElements = null;
-                                }
-                            });
-                        }
+                    // Start with the last, in case the array is modified during the loop
+                    while (previousLeaveAnimations.length) {
+                        $animate.cancel(previousLeaveAnimations.pop());
                     }
 
-                    selectedElements = [];
-                    selectedScopes = [];
+                    for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
+                        var selected = getBlockNodes(selectedElements[i].clone);
+                        selectedScopes[i].$destroy();
+                        var runner = previousLeaveAnimations[i] = $animate.leave(selected);
+                        runner.done(spliceFactory(previousLeaveAnimations, i));
+                    }
+
+                    selectedElements.length = 0;
+                    selectedScopes.length = 0;
 
                     if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
-                        scope.$eval(attr.change);
                         forEach(selectedTranscludes, function(selectedTransclude) {
-                            var selectedScope = scope.$new();
-                            selectedScopes.push(selectedScope);
-                            selectedTransclude.transclude(selectedScope, function(caseElement) {
+                            selectedTransclude.transclude(function(caseElement, selectedScope) {
+                                selectedScopes.push(selectedScope);
                                 var anchor = selectedTransclude.element;
+                                caseElement[caseElement.length++] = $compile.$$createComment('end ngSwitchWhen');
+                                var block = { clone: caseElement };
 
-                                selectedElements.push(caseElement);
+                                selectedElements.push(block);
                                 $animate.enter(caseElement, anchor.parent(), anchor);
                             });
                         });
@@ -20664,18 +32611,28 @@
 
     var ngSwitchWhenDirective = ngDirective({
         transclude: 'element',
-        priority: 800,
+        priority: 1200,
         require: '^ngSwitch',
+        multiElement: true,
         link: function(scope, element, attrs, ctrl, $transclude) {
-            ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
-            ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
+
+            var cases = attrs.ngSwitchWhen.split(attrs.ngSwitchWhenSeparator).sort().filter(
+                // Filter duplicate cases
+                function(element, index, array) { return array[index - 1] !== element; }
+            );
+
+            forEach(cases, function(whenCase) {
+                ctrl.cases['!' + whenCase] = (ctrl.cases['!' + whenCase] || []);
+                ctrl.cases['!' + whenCase].push({ transclude: $transclude, element: element });
+            });
         }
     });
 
     var ngSwitchDefaultDirective = ngDirective({
         transclude: 'element',
-        priority: 800,
+        priority: 1200,
         require: '^ngSwitch',
+        multiElement: true,
         link: function(scope, element, attr, ctrl, $transclude) {
             ctrl.cases['?'] = (ctrl.cases['?'] || []);
             ctrl.cases['?'].push({ transclude: $transclude, element: element });
@@ -20685,74 +32642,227 @@
     /**
      * @ngdoc directive
      * @name ngTransclude
-     * @restrict AC
+     * @restrict EAC
      *
      * @description
      * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
      *
-     * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
+     * You can specify that you want to insert a named transclusion slot, instead of the default slot, by providing the slot name
+     * as the value of the `ng-transclude` or `ng-transclude-slot` attribute.
+     *
+     * If the transcluded content is not empty (i.e. contains one or more DOM nodes, including whitespace text nodes), any existing
+     * content of this element will be removed before the transcluded content is inserted.
+     * If the transcluded content is empty (or only whitespace), the existing content is left intact. This lets you provide fallback
+     * content in the case that no transcluded content is provided.
      *
      * @element ANY
      *
+     * @param {string} ngTransclude|ngTranscludeSlot the name of the slot to insert at this point. If this is not provided, is empty
+     *                                               or its value is the same as the name of the attribute then the default slot is used.
+     *
      * @example
-     <example module="transclude">
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.title = 'Lorem Ipsum';
-           $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
-         }
-
-     angular.module('transclude', [])
-     .directive('pane', function(){
-             return {
-               restrict: 'E',
-               transclude: true,
-               scope: { title:'@' },
-     template: '<div style="border: 1px solid black;">' +
-     '<div style="background-color: gray">{{title}}</div>' +
-     '<div ng-transclude></div>' +
-     '</div>'
-     };
-     });
-     </script>
-     <div ng-controller="Ctrl">
-     <input ng-model="title"><br>
-     <textarea ng-model="text"></textarea> <br/>
-     <pane title="{{title}}">{{text}}</pane>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should have transcluded', function() {
-          var titleElement = element(by.model('title'));
-          titleElement.clear();
-          titleElement.sendKeys('TITLE');
-          var textElement = element(by.model('text'));
-          textElement.clear();
-          textElement.sendKeys('TEXT');
-          expect(element(by.binding('title')).getText()).toEqual('TITLE');
-          expect(element(by.binding('text')).getText()).toEqual('TEXT');
-        });
-     </file>
-     </example>
+     * ### Basic transclusion
+     * This example demonstrates basic transclusion of content into a component directive.
+     * <example name="simpleTranscludeExample" module="transcludeExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('transcludeExample', [])
+     *        .directive('pane', function(){
+     *           return {
+     *             restrict: 'E',
+     *             transclude: true,
+     *             scope: { title:'@' },
+     *             template: '<div style="border: 1px solid black;">' +
+     *                         '<div style="background-color: gray">{{title}}</div>' +
+     *                         '<ng-transclude></ng-transclude>' +
+     *                       '</div>'
+     *           };
+     *       })
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         $scope.title = 'Lorem Ipsum';
+     *         $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+     *       }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <input ng-model="title" aria-label="title"> <br/>
+     *       <textarea ng-model="text" aria-label="text"></textarea> <br/>
+     *       <pane title="{{title}}"><span>{{text}}</span></pane>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *      it('should have transcluded', function() {
+     *        var titleElement = element(by.model('title'));
+     *        titleElement.clear();
+     *        titleElement.sendKeys('TITLE');
+     *        var textElement = element(by.model('text'));
+     *        textElement.clear();
+     *        textElement.sendKeys('TEXT');
+     *        expect(element(by.binding('title')).getText()).toEqual('TITLE');
+     *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
+     *      });
+     *   </file>
+     * </example>
+     *
+     * @example
+     * ### Transclude fallback content
+     * This example shows how to use `NgTransclude` with fallback content, that
+     * is displayed if no transcluded content is provided.
+     *
+     * <example module="transcludeFallbackContentExample" name="ng-transclude">
+     * <file name="index.html">
+     * <script>
+     * angular.module('transcludeFallbackContentExample', [])
+     * .directive('myButton', function(){
+     *             return {
+     *               restrict: 'E',
+     *               transclude: true,
+     *               scope: true,
+     *               template: '<button style="cursor: pointer;">' +
+     *                           '<ng-transclude>' +
+     *                             '<b style="color: red;">Button1</b>' +
+     *                           '</ng-transclude>' +
+     *                         '</button>'
+     *             };
+     *         });
+     * </script>
+     * <!-- fallback button content -->
+     * <my-button id="fallback"></my-button>
+     * <!-- modified button content -->
+     * <my-button id="modified">
+     *   <i style="color: green;">Button2</i>
+     * </my-button>
+     * </file>
+     * <file name="protractor.js" type="protractor">
+     * it('should have different transclude element content', function() {
+     *          expect(element(by.id('fallback')).getText()).toBe('Button1');
+     *          expect(element(by.id('modified')).getText()).toBe('Button2');
+     *        });
+     * </file>
+     * </example>
      *
+     * @example
+     * ### Multi-slot transclusion
+     * This example demonstrates using multi-slot transclusion in a component directive.
+     * <example name="multiSlotTranscludeExample" module="multiSlotTranscludeExample">
+     *   <file name="index.html">
+     *    <style>
+     *      .title, .footer {
+     *        background-color: gray
+     *      }
+     *    </style>
+     *    <div ng-controller="ExampleController">
+     *      <input ng-model="title" aria-label="title"> <br/>
+     *      <textarea ng-model="text" aria-label="text"></textarea> <br/>
+     *      <pane>
+     *        <pane-title><a ng-href="{{link}}">{{title}}</a></pane-title>
+     *        <pane-body><p>{{text}}</p></pane-body>
+     *      </pane>
+     *    </div>
+     *   </file>
+     *   <file name="app.js">
+     *    angular.module('multiSlotTranscludeExample', [])
+     *     .directive('pane', function() {
+     *        return {
+     *          restrict: 'E',
+     *          transclude: {
+     *            'title': '?paneTitle',
+     *            'body': 'paneBody',
+     *            'footer': '?paneFooter'
+     *          },
+     *          template: '<div style="border: 1px solid black;">' +
+     *                      '<div class="title" ng-transclude="title">Fallback Title</div>' +
+     *                      '<div ng-transclude="body"></div>' +
+     *                      '<div class="footer" ng-transclude="footer">Fallback Footer</div>' +
+     *                    '</div>'
+     *        };
+     *    })
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.title = 'Lorem Ipsum';
+     *      $scope.link = 'https://google.com';
+     *      $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+     *    }]);
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *      it('should have transcluded the title and the body', function() {
+     *        var titleElement = element(by.model('title'));
+     *        titleElement.clear();
+     *        titleElement.sendKeys('TITLE');
+     *        var textElement = element(by.model('text'));
+     *        textElement.clear();
+     *        textElement.sendKeys('TEXT');
+     *        expect(element(by.css('.title')).getText()).toEqual('TITLE');
+     *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
+     *        expect(element(by.css('.footer')).getText()).toEqual('Fallback Footer');
+     *      });
+     *   </file>
+     * </example>
      */
-    var ngTranscludeDirective = ngDirective({
-        link: function($scope, $element, $attrs, controller, $transclude) {
-            if (!$transclude) {
-                throw minErr('ngTransclude')('orphan',
-                    'Illegal use of ngTransclude directive in the template! ' +
-                    'No parent directive that requires a transclusion found. ' +
-                    'Element: {0}',
-                    startingTag($element));
-            }
-
-            $transclude(function(clone) {
-                $element.empty();
-                $element.append(clone);
-            });
-        }
-    });
+    var ngTranscludeMinErr = minErr('ngTransclude');
+    var ngTranscludeDirective = ['$compile', function($compile) {
+        return {
+            restrict: 'EAC',
+            compile: function ngTranscludeCompile(tElement) {
+
+                // Remove and cache any original content to act as a fallback
+                var fallbackLinkFn = $compile(tElement.contents());
+                tElement.empty();
+
+                return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
+
+                    if (!$transclude) {
+                        throw ngTranscludeMinErr('orphan',
+                            'Illegal use of ngTransclude directive in the template! ' +
+                            'No parent directive that requires a transclusion found. ' +
+                            'Element: {0}',
+                            startingTag($element));
+                    }
+
+
+                    // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
+                    if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+                        $attrs.ngTransclude = '';
+                    }
+                    var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+
+                    // If the slot is required and no transclusion content is provided then this call will throw an error
+                    $transclude(ngTranscludeCloneAttachFn, null, slotName);
+
+                    // If the slot is optional and no transclusion content is provided then use the fallback content
+                    if (slotName && !$transclude.isSlotFilled(slotName)) {
+                        useFallbackContent();
+                    }
+
+                    function ngTranscludeCloneAttachFn(clone, transcludedScope) {
+                        if (clone.length && notWhitespace(clone)) {
+                            $element.append(clone);
+                        } else {
+                            useFallbackContent();
+                            // There is nothing linked against the transcluded scope since no content was available,
+                            // so it should be safe to clean up the generated scope.
+                            transcludedScope.$destroy();
+                        }
+                    }
+
+                    function useFallbackContent() {
+                        // Since this is the fallback content rather than the transcluded content,
+                        // we link against the scope of this directive rather than the transcluded scope
+                        fallbackLinkFn($scope, function(clone) {
+                            $element.append(clone);
+                        });
+                    }
+
+                    function notWhitespace(nodes) {
+                        for (var i = 0, ii = nodes.length; i < ii; i++) {
+                            var node = nodes[i];
+                            if (node.nodeType !== NODE_TYPE_TEXT || node.nodeValue.trim()) {
+                                return true;
+                            }
+                        }
+                    }
+                };
+            }
+        };
+    }];
 
     /**
      * @ngdoc directive
@@ -20770,7 +32880,7 @@
      * @param {string} id Cache name of the template.
      *
      * @example
-     <example>
+     <example  name="script-tag">
      <file name="index.html">
      <script type="text/ng-template" id="/tpl.html">
      Content of the template.
@@ -20792,9 +32902,8 @@
             restrict: 'E',
             terminal: true,
             compile: function(element, attr) {
-                if (attr.type == 'text/ng-template') {
+                if (attr.type === 'text/ng-template') {
                     var templateUrl = attr.id,
-                    // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent
                         text = element[0].text;
 
                     $templateCache.put(templateUrl, text);
@@ -20803,663 +32912,1448 @@
         };
     }];
 
-    var ngOptionsMinErr = minErr('ngOptions');
+    /* exported selectDirective, optionDirective */
+
+    var noopNgModelController = { $setViewValue: noop, $render: noop };
+
+    function setOptionSelectedStatus(optionEl, value) {
+        optionEl.prop('selected', value);
+        /**
+         * When unselecting an option, setting the property to null / false should be enough
+         * However, screenreaders might react to the selected attribute instead, see
+         * https://github.com/angular/angular.js/issues/14419
+         * Note: "selected" is a boolean attr and will be removed when the "value" arg in attr() is false
+         * or null
+         */
+        optionEl.attr('selected', value);
+    }
+
     /**
-     * @ngdoc directive
-     * @name select
-     * @restrict E
+     * @ngdoc type
+     * @name  select.SelectController
      *
      * @description
-     * HTML `SELECT` element with angular data-binding.
+     * The controller for the {@link ng.select select} directive. The controller exposes
+     * a few utility methods that can be used to augment the behavior of a regular or an
+     * {@link ng.ngOptions ngOptions} select element.
      *
-     * # `ngOptions`
+     * @example
+     * ### Set a custom error when the unknown option is selected
      *
-     * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
-     * elements for the `<select>` element using the array or object obtained by evaluating the
-     * `ngOptions` comprehension_expression.
+     * This example sets a custom error "unknownValue" on the ngModelController
+     * when the select element's unknown option is selected, i.e. when the model is set to a value
+     * that is not matched by any option.
+     *
+     * <example name="select-unknown-value-error" module="staticSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="testSelect"> Single select: </label><br>
+     *     <select name="testSelect" ng-model="selected" unknown-value-error>
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *     <span class="error" ng-if="myForm.testSelect.$error.unknownValue">
+     *       Error: The current model doesn't match any option</span><br>
+     *
+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+     *   </form>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('staticSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.selected = null;
+     *
+     *      $scope.forceUnknownOption = function() {
+     *        $scope.selected = 'nonsense';
+     *      };
+     *   }])
+     *   .directive('unknownValueError', function() {
+     *     return {
+     *       require: ['ngModel', 'select'],
+     *       link: function(scope, element, attrs, ctrls) {
+     *         var ngModelCtrl = ctrls[0];
+     *         var selectCtrl = ctrls[1];
+     *
+     *         ngModelCtrl.$validators.unknownValue = function(modelValue, viewValue) {
+     *           if (selectCtrl.$isUnknownOptionSelected()) {
+     *             return false;
+     *           }
+     *
+     *           return true;
+     *         };
+     *       }
+     *
+     *     };
+     *   });
+     * </file>
+     *</example>
      *
-     * When an item in the `<select>` menu is selected, the array element or object property
-     * represented by the selected option will be bound to the model identified by the `ngModel`
-     * directive.
      *
-     * <div class="alert alert-warning">
-     * **Note:** `ngModel` compares by reference, not value. This is important when binding to an
-     * array of objects. See an example [in this jsfiddle](http://jsfiddle.net/qWzTb/).
-     * </div>
+     * @example
+     * ### Set the "required" error when the unknown option is selected.
      *
-     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
-     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
-     * option. See example below for demonstration.
+     * By default, the "required" error on the ngModelController is only set on a required select
+     * when the empty option is selected. This example adds a custom directive that also sets the
+     * error when the unknown option is selected.
      *
-     * <div class="alert alert-warning">
-     * **Note:** `ngOptions` provides an iterator facility for the `<option>` element which should be used instead
-     * of {@link ng.directive:ngRepeat ngRepeat} when you want the
-     * `select` model to be bound to a non-string value. This is because an option element can only
-     * be bound to string values at present.
+     * <example name="select-unknown-value-required" module="staticSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="testSelect"> Select: </label><br>
+     *     <select name="testSelect" ng-model="selected" required unknown-value-required>
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *     <span class="error" ng-if="myForm.testSelect.$error.required">Error: Please select a value</span><br>
+     *
+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+     *   </form>
      * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('staticSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.selected = null;
+     *
+     *      $scope.forceUnknownOption = function() {
+     *        $scope.selected = 'nonsense';
+     *      };
+     *   }])
+     *   .directive('unknownValueRequired', function() {
+     *     return {
+     *       priority: 1, // This directive must run after the required directive has added its validator
+     *       require: ['ngModel', 'select'],
+     *       link: function(scope, element, attrs, ctrls) {
+     *         var ngModelCtrl = ctrls[0];
+     *         var selectCtrl = ctrls[1];
      *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} required The control is considered valid only if value is entered.
-     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-     *    `required` when you want to data-bind to the `required` attribute.
-     * @param {comprehension_expression=} ngOptions in one of the following forms:
+     *         var originalRequiredValidator = ngModelCtrl.$validators.required;
      *
-     *   * for array data sources:
-     *     * `label` **`for`** `value` **`in`** `array`
-     *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
-     *     * `label`  **`group by`** `group` **`for`** `value` **`in`** `array`
-     *     * `select` **`as`** `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
-     *   * for object data sources:
-     *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-     *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-     *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
-     *     * `select` **`as`** `label` **`group by`** `group`
-     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+     *         ngModelCtrl.$validators.required = function() {
+     *           if (attrs.required && selectCtrl.$isUnknownOptionSelected()) {
+     *             return false;
+     *           }
      *
-     * Where:
+     *           return originalRequiredValidator.apply(this, arguments);
+     *         };
+     *       }
+     *     };
+     *   });
+     * </file>
+     * <file name="protractor.js" type="protractor">
+     *  it('should show the error message when the unknown option is selected', function() {
+
+      var error = element(by.className('error'));
+
+      expect(error.getText()).toBe('Error: Please select a value');
+
+      element(by.cssContainingText('option', 'Option 1')).click();
+
+      expect(error.isPresent()).toBe(false);
+
+      element(by.tagName('button')).click();
+
+      expect(error.getText()).toBe('Error: Please select a value');
+    });
+     * </file>
+     *</example>
      *
-     *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
-     *   * `value`: local variable which will refer to each item in the `array` or each property value
-     *      of `object` during iteration.
-     *   * `key`: local variable which will refer to a property name in `object` during iteration.
-     *   * `label`: The result of this expression will be the label for `<option>` element. The
-     *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
-     *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
-     *      element. If not specified, `select` expression will default to `value`.
-     *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
-     *      DOM element.
-     *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
-     *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
-     *     `value` variable (e.g. `value.propertyName`).
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function MyCntrl($scope) {
-          $scope.colors = [
-            {name:'black', shade:'dark'},
-            {name:'white', shade:'light'},
-            {name:'red', shade:'dark'},
-            {name:'blue', shade:'dark'},
-            {name:'yellow', shade:'light'}
-          ];
-          $scope.color = $scope.colors[2]; // red
-        }
-     </script>
-     <div ng-controller="MyCntrl">
-     <ul>
-     <li ng-repeat="color in colors">
-     Name: <input ng-model="color.name">
-     [<a href ng-click="colors.splice($index, 1)">X</a>]
-     </li>
-     <li>
-     [<a href ng-click="colors.push({})">add</a>]
-     </li>
-     </ul>
-     <hr/>
-     Color (null not allowed):
-     <select ng-model="color" ng-options="c.name for c in colors"></select><br>
+     */
+    var SelectController =
+        ['$element', '$scope', /** @this */ function($element, $scope) {
+
+            var self = this,
+                optionsMap = new NgMap();
+
+            self.selectValueMap = {}; // Keys are the hashed values, values the original values
+
+            // If the ngModel doesn't get provided then provide a dummy noop version to prevent errors
+            self.ngModelCtrl = noopNgModelController;
+            self.multiple = false;
+
+            // The "unknown" option is one that is prepended to the list if the viewValue
+            // does not match any of the options. When it is rendered the value of the unknown
+            // option is '? XXX ?' where XXX is the hashKey of the value that is not known.
+            //
+            // Support: IE 9 only
+            // We can't just jqLite('<option>') since jqLite is not smart enough
+            // to create it in <select> and IE barfs otherwise.
+            self.unknownOption = jqLite(window.document.createElement('option'));
+
+            // The empty option is an option with the value '' that the application developer can
+            // provide inside the select. It is always selectable and indicates that a "null" selection has
+            // been made by the user.
+            // If the select has an empty option, and the model of the select is set to "undefined" or "null",
+            // the empty option is selected.
+            // If the model is set to a different unmatched value, the unknown option is rendered and
+            // selected, i.e both are present, because a "null" selection and an unknown value are different.
+            self.hasEmptyOption = false;
+            self.emptyOption = undefined;
+
+            self.renderUnknownOption = function(val) {
+                var unknownVal = self.generateUnknownOptionValue(val);
+                self.unknownOption.val(unknownVal);
+                $element.prepend(self.unknownOption);
+                setOptionSelectedStatus(self.unknownOption, true);
+                $element.val(unknownVal);
+            };
 
-     Color (null allowed):
-     <span  class="nullable">
-     <select ng-model="color" ng-options="c.name for c in colors">
-     <option value="">-- choose color --</option>
-     </select>
-     </span><br/>
+            self.updateUnknownOption = function(val) {
+                var unknownVal = self.generateUnknownOptionValue(val);
+                self.unknownOption.val(unknownVal);
+                setOptionSelectedStatus(self.unknownOption, true);
+                $element.val(unknownVal);
+            };
 
-     Color grouped by shade:
-     <select ng-model="color" ng-options="c.name group by c.shade for c in colors">
-     </select><br/>
+            self.generateUnknownOptionValue = function(val) {
+                return '? ' + hashKey(val) + ' ?';
+            };
 
+            self.removeUnknownOption = function() {
+                if (self.unknownOption.parent()) self.unknownOption.remove();
+            };
 
-     Select <a href ng-click="color={name:'not in list'}">bogus</a>.<br>
-     <hr/>
-     Currently selected: {{ {selected_color:color}  }}
-     <div style="border:solid 1px black; height:20px"
-     ng-style="{'background-color':color.name}">
-     </div>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-options', function() {
-           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('red');
-           element.all(by.select('color')).first().click();
-           element.all(by.css('select[ng-model="color"] option')).first().click();
-           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('black');
-           element(by.css('.nullable select[ng-model="color"]')).click();
-           element.all(by.css('.nullable select[ng-model="color"] option')).first().click();
-           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('null');
-         });
-     </file>
-     </example>
-     */
+            self.selectEmptyOption = function() {
+                if (self.emptyOption) {
+                    $element.val('');
+                    setOptionSelectedStatus(self.emptyOption, true);
+                }
+            };
 
-    var ngOptionsDirective = valueFn({ terminal: true });
-// jshint maxlen: false
-    var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
-        //000011111111110000000000022222222220000000000000000000003333333333000000000000004444444444444440000000005555555555555550000000666666666666666000000000000000777777777700000000000000000008888888888
-        var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
-            nullModelCtrl = {$setViewValue: noop};
-// jshint maxlen: 100
+            self.unselectEmptyOption = function() {
+                if (self.hasEmptyOption) {
+                    setOptionSelectedStatus(self.emptyOption, false);
+                }
+            };
 
-        return {
-            restrict: 'E',
-            require: ['select', '?ngModel'],
-            controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
-                var self = this,
-                    optionsMap = {},
-                    ngModelCtrl = nullModelCtrl,
-                    nullOption,
-                    unknownOption;
+            $scope.$on('$destroy', function() {
+                // disable unknown option so that we don't do work when the whole select is being destroyed
+                self.renderUnknownOption = noop;
+            });
+
+            // Read the value of the select control, the implementation of this changes depending
+            // upon whether the select can have multiple values and whether ngOptions is at work.
+            self.readValue = function readSingleValue() {
+                var val = $element.val();
+                // ngValue added option values are stored in the selectValueMap, normal interpolations are not
+                var realVal = val in self.selectValueMap ? self.selectValueMap[val] : val;
 
+                if (self.hasOption(realVal)) {
+                    return realVal;
+                }
 
-                self.databound = $attrs.ngModel;
+                return null;
+            };
 
 
-                self.init = function(ngModelCtrl_, nullOption_, unknownOption_) {
-                    ngModelCtrl = ngModelCtrl_;
-                    nullOption = nullOption_;
-                    unknownOption = unknownOption_;
-                };
+            // Write the value to the select control, the implementation of this changes depending
+            // upon whether the select can have multiple values and whether ngOptions is at work.
+            self.writeValue = function writeSingleValue(value) {
+                // Make sure to remove the selected attribute from the previously selected option
+                // Otherwise, screen readers might get confused
+                var currentlySelectedOption = $element[0].options[$element[0].selectedIndex];
+                if (currentlySelectedOption) setOptionSelectedStatus(jqLite(currentlySelectedOption), false);
 
+                if (self.hasOption(value)) {
+                    self.removeUnknownOption();
 
-                self.addOption = function(value) {
-                    assertNotHasOwnProperty(value, '"option value"');
-                    optionsMap[value] = true;
+                    var hashedVal = hashKey(value);
+                    $element.val(hashedVal in self.selectValueMap ? hashedVal : value);
 
-                    if (ngModelCtrl.$viewValue == value) {
-                        $element.val(value);
-                        if (unknownOption.parent()) unknownOption.remove();
-                    }
-                };
+                    // Set selected attribute and property on selected option for screen readers
+                    var selectedOption = $element[0].options[$element[0].selectedIndex];
+                    setOptionSelectedStatus(jqLite(selectedOption), true);
+                } else {
+                    self.selectUnknownOrEmptyOption(value);
+                }
+            };
 
 
-                self.removeOption = function(value) {
-                    if (this.hasOption(value)) {
-                        delete optionsMap[value];
-                        if (ngModelCtrl.$viewValue == value) {
-                            this.renderUnknownOption(value);
+            // Tell the select control that an option, with the given value, has been added
+            self.addOption = function(value, element) {
+                // Skip comment nodes, as they only pollute the `optionsMap`
+                if (element[0].nodeType === NODE_TYPE_COMMENT) return;
+
+                assertNotHasOwnProperty(value, '"option value"');
+                if (value === '') {
+                    self.hasEmptyOption = true;
+                    self.emptyOption = element;
+                }
+                var count = optionsMap.get(value) || 0;
+                optionsMap.set(value, count + 1);
+                // Only render at the end of a digest. This improves render performance when many options
+                // are added during a digest and ensures all relevant options are correctly marked as selected
+                scheduleRender();
+            };
+
+            // Tell the select control that an option, with the given value, has been removed
+            self.removeOption = function(value) {
+                var count = optionsMap.get(value);
+                if (count) {
+                    if (count === 1) {
+                        optionsMap.delete(value);
+                        if (value === '') {
+                            self.hasEmptyOption = false;
+                            self.emptyOption = undefined;
                         }
+                    } else {
+                        optionsMap.set(value, count - 1);
                     }
-                };
+                }
+            };
 
+            // Check whether the select control has an option matching the given value
+            self.hasOption = function(value) {
+                return !!optionsMap.get(value);
+            };
 
-                self.renderUnknownOption = function(val) {
-                    var unknownVal = '? ' + hashKey(val) + ' ?';
-                    unknownOption.val(unknownVal);
-                    $element.prepend(unknownOption);
-                    $element.val(unknownVal);
-                    unknownOption.prop('selected', true); // needed for IE
-                };
+            /**
+             * @ngdoc method
+             * @name select.SelectController#$hasEmptyOption
+             *
+             * @description
+             *
+             * Returns `true` if the select element currently has an empty option
+             * element, i.e. an option that signifies that the select is empty / the selection is null.
+             *
+             */
+            self.$hasEmptyOption = function() {
+                return self.hasEmptyOption;
+            };
+
+            /**
+             * @ngdoc method
+             * @name select.SelectController#$isUnknownOptionSelected
+             *
+             * @description
+             *
+             * Returns `true` if the select element's unknown option is selected. The unknown option is added
+             * and automatically selected whenever the select model doesn't match any option.
+             *
+             */
+            self.$isUnknownOptionSelected = function() {
+                // Presence of the unknown option means it is selected
+                return $element[0].options[0] === self.unknownOption[0];
+            };
 
+            /**
+             * @ngdoc method
+             * @name select.SelectController#$isEmptyOptionSelected
+             *
+             * @description
+             *
+             * Returns `true` if the select element has an empty option and this empty option is currently
+             * selected. Returns `false` if the select element has no empty option or it is not selected.
+             *
+             */
+            self.$isEmptyOptionSelected = function() {
+                return self.hasEmptyOption && $element[0].options[$element[0].selectedIndex] === self.emptyOption[0];
+            };
 
-                self.hasOption = function(value) {
-                    return optionsMap.hasOwnProperty(value);
-                };
+            self.selectUnknownOrEmptyOption = function(value) {
+                if (value == null && self.emptyOption) {
+                    self.removeUnknownOption();
+                    self.selectEmptyOption();
+                } else if (self.unknownOption.parent().length) {
+                    self.updateUnknownOption(value);
+                } else {
+                    self.renderUnknownOption(value);
+                }
+            };
 
-                $scope.$on('$destroy', function() {
-                    // disable unknown option so that we don't do work when the whole select is being destroyed
-                    self.renderUnknownOption = noop;
+            var renderScheduled = false;
+            function scheduleRender() {
+                if (renderScheduled) return;
+                renderScheduled = true;
+                $scope.$$postDigest(function() {
+                    renderScheduled = false;
+                    self.ngModelCtrl.$render();
                 });
-            }],
+            }
 
-            link: function(scope, element, attr, ctrls) {
-                // if ngModel is not defined, we don't need to do anything
-                if (!ctrls[1]) return;
-
-                var selectCtrl = ctrls[0],
-                    ngModelCtrl = ctrls[1],
-                    multiple = attr.multiple,
-                    optionsExp = attr.ngOptions,
-                    nullOption = false, // if false, user will not be able to select it (used by ngOptions)
-                    emptyOption,
-                // we can't just jqLite('<option>') since jqLite is not smart enough
-                // to create it in <select> and IE barfs otherwise.
-                    optionTemplate = jqLite(document.createElement('option')),
-                    optGroupTemplate =jqLite(document.createElement('optgroup')),
-                    unknownOption = optionTemplate.clone();
-
-                // find "null" option
-                for(var i = 0, children = element.children(), ii = children.length; i < ii; i++) {
-                    if (children[i].value === '') {
-                        emptyOption = nullOption = children.eq(i);
-                        break;
-                    }
-                }
+            var updateScheduled = false;
+            function scheduleViewValueUpdate(renderAfter) {
+                if (updateScheduled) return;
 
-                selectCtrl.init(ngModelCtrl, nullOption, unknownOption);
+                updateScheduled = true;
 
-                // required validator
-                if (multiple) {
-                    ngModelCtrl.$isEmpty = function(value) {
-                        return !value || value.length === 0;
-                    };
-                }
+                $scope.$$postDigest(function() {
+                    if ($scope.$$destroyed) return;
 
-                if (optionsExp) setupAsOptions(scope, element, ngModelCtrl);
-                else if (multiple) setupAsMultiple(scope, element, ngModelCtrl);
-                else setupAsSingle(scope, element, ngModelCtrl, selectCtrl);
+                    updateScheduled = false;
+                    self.ngModelCtrl.$setViewValue(self.readValue());
+                    if (renderAfter) self.ngModelCtrl.$render();
+                });
+            }
 
 
-                ////////////////////////////
+            self.registerOption = function(optionScope, optionElement, optionAttrs, interpolateValueFn, interpolateTextFn) {
 
+                if (optionAttrs.$attr.ngValue) {
+                    // The value attribute is set by ngValue
+                    var oldVal, hashedVal = NaN;
+                    optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
 
+                        var removal;
+                        var previouslySelected = optionElement.prop('selected');
 
-                function setupAsSingle(scope, selectElement, ngModelCtrl, selectCtrl) {
-                    ngModelCtrl.$render = function() {
-                        var viewValue = ngModelCtrl.$viewValue;
+                        if (isDefined(hashedVal)) {
+                            self.removeOption(oldVal);
+                            delete self.selectValueMap[hashedVal];
+                            removal = true;
+                        }
 
-                        if (selectCtrl.hasOption(viewValue)) {
-                            if (unknownOption.parent()) unknownOption.remove();
-                            selectElement.val(viewValue);
-                            if (viewValue === '') emptyOption.prop('selected', true); // to make IE9 happy
-                        } else {
-                            if (isUndefined(viewValue) && emptyOption) {
-                                selectElement.val('');
-                            } else {
-                                selectCtrl.renderUnknownOption(viewValue);
-                            }
+                        hashedVal = hashKey(newVal);
+                        oldVal = newVal;
+                        self.selectValueMap[hashedVal] = newVal;
+                        self.addOption(newVal, optionElement);
+                        // Set the attribute directly instead of using optionAttrs.$set - this stops the observer
+                        // from firing a second time. Other $observers on value will also get the result of the
+                        // ngValue expression, not the hashed value
+                        optionElement.attr('value', hashedVal);
+
+                        if (removal && previouslySelected) {
+                            scheduleViewValueUpdate();
                         }
-                    };
 
-                    selectElement.on('change', function() {
-                        scope.$apply(function() {
-                            if (unknownOption.parent()) unknownOption.remove();
-                            ngModelCtrl.$setViewValue(selectElement.val());
-                        });
                     });
-                }
-
-                function setupAsMultiple(scope, selectElement, ctrl) {
-                    var lastView;
-                    ctrl.$render = function() {
-                        var items = new HashMap(ctrl.$viewValue);
-                        forEach(selectElement.find('option'), function(option) {
-                            option.selected = isDefined(items.get(option.value));
-                        });
-                    };
+                } else if (interpolateValueFn) {
+                    // The value attribute is interpolated
+                    optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
+                        // This method is overwritten in ngOptions and has side-effects!
+                        self.readValue();
+
+                        var removal;
+                        var previouslySelected = optionElement.prop('selected');
+
+                        if (isDefined(oldVal)) {
+                            self.removeOption(oldVal);
+                            removal = true;
+                        }
+                        oldVal = newVal;
+                        self.addOption(newVal, optionElement);
 
-                    // we have to do it on each watch since ngModel watches reference, but
-                    // we need to work of an array, so we need to see if anything was inserted/removed
-                    scope.$watch(function selectMultipleWatch() {
-                        if (!equals(lastView, ctrl.$viewValue)) {
-                            lastView = copy(ctrl.$viewValue);
-                            ctrl.$render();
+                        if (removal && previouslySelected) {
+                            scheduleViewValueUpdate();
                         }
                     });
+                } else if (interpolateTextFn) {
+                    // The text content is interpolated
+                    optionScope.$watch(interpolateTextFn, function interpolateWatchAction(newVal, oldVal) {
+                        optionAttrs.$set('value', newVal);
+                        var previouslySelected = optionElement.prop('selected');
+                        if (oldVal !== newVal) {
+                            self.removeOption(oldVal);
+                        }
+                        self.addOption(newVal, optionElement);
 
-                    selectElement.on('change', function() {
-                        scope.$apply(function() {
-                            var array = [];
-                            forEach(selectElement.find('option'), function(option) {
-                                if (option.selected) {
-                                    array.push(option.value);
-                                }
-                            });
-                            ctrl.$setViewValue(array);
-                        });
+                        if (oldVal && previouslySelected) {
+                            scheduleViewValueUpdate();
+                        }
                     });
+                } else {
+                    // The value attribute is static
+                    self.addOption(optionAttrs.value, optionElement);
                 }
 
-                function setupAsOptions(scope, selectElement, ctrl) {
-                    var match;
-
-                    if (!(match = optionsExp.match(NG_OPTIONS_REGEXP))) {
-                        throw ngOptionsMinErr('iexp',
-                            "Expected expression in form of " +
-                            "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
-                            " but got '{0}'. Element: {1}",
-                            optionsExp, startingTag(selectElement));
-                    }
-
-                    var displayFn = $parse(match[2] || match[1]),
-                        valueName = match[4] || match[6],
-                        keyName = match[5],
-                        groupByFn = $parse(match[3] || ''),
-                        valueFn = $parse(match[2] ? match[1] : valueName),
-                        valuesFn = $parse(match[7]),
-                        track = match[8],
-                        trackFn = track ? $parse(match[8]) : null,
-                    // This is an array of array of existing option groups in DOM.
-                    // We try to reuse these if possible
-                    // - optionGroupsCache[0] is the options with no option group
-                    // - optionGroupsCache[?][0] is the parent: either the SELECT or OPTGROUP element
-                        optionGroupsCache = [[{element: selectElement, label:''}]];
-
-                    if (nullOption) {
-                        // compile the element since there might be bindings in it
-                        $compile(nullOption)(scope);
-
-                        // remove the class, which is added automatically because we recompile the element and it
-                        // becomes the compilation root
-                        nullOption.removeClass('ng-scope');
-
-                        // we need to remove it before calling selectElement.empty() because otherwise IE will
-                        // remove the label from the element. wtf?
-                        nullOption.remove();
-                    }
-
-                    // clear contents, we'll add what's needed based on the model
-                    selectElement.empty();
-
-                    selectElement.on('change', function() {
-                        scope.$apply(function() {
-                            var optionGroup,
-                                collection = valuesFn(scope) || [],
-                                locals = {},
-                                key, value, optionElement, index, groupIndex, length, groupLength, trackIndex;
-
-                            if (multiple) {
-                                value = [];
-                                for (groupIndex = 0, groupLength = optionGroupsCache.length;
-                                     groupIndex < groupLength;
-                                     groupIndex++) {
-                                    // list of options for that group. (first item has the parent)
-                                    optionGroup = optionGroupsCache[groupIndex];
-
-                                    for(index = 1, length = optionGroup.length; index < length; index++) {
-                                        if ((optionElement = optionGroup[index].element)[0].selected) {
-                                            key = optionElement.val();
-                                            if (keyName) locals[keyName] = key;
-                                            if (trackFn) {
-                                                for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                                                    locals[valueName] = collection[trackIndex];
-                                                    if (trackFn(scope, locals) == key) break;
-                                                }
-                                            } else {
-                                                locals[valueName] = collection[key];
-                                            }
-                                            value.push(valueFn(scope, locals));
-                                        }
-                                    }
-                                }
-                            } else {
-                                key = selectElement.val();
-                                if (key == '?') {
-                                    value = undefined;
-                                } else if (key === ''){
-                                    value = null;
-                                } else {
-                                    if (trackFn) {
-                                        for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                                            locals[valueName] = collection[trackIndex];
-                                            if (trackFn(scope, locals) == key) {
-                                                value = valueFn(scope, locals);
-                                                break;
-                                            }
-                                        }
-                                    } else {
-                                        locals[valueName] = collection[key];
-                                        if (keyName) locals[keyName] = key;
-                                        value = valueFn(scope, locals);
-                                    }
-                                }
-                                // Update the null option's selected property here so $render cleans it up correctly
-                                if (optionGroupsCache[0].length > 1) {
-                                    if (optionGroupsCache[0][1].id !== key) {
-                                        optionGroupsCache[0][1].selected = false;
-                                    }
-                                }
-                            }
-                            ctrl.$setViewValue(value);
-                        });
-                    });
 
-                    ctrl.$render = render;
-
-                    // TODO(vojta): can't we optimize this ?
-                    scope.$watch(render);
-
-                    function render() {
-                        // Temporary location for the option groups before we render them
-                        var optionGroups = {'':[]},
-                            optionGroupNames = [''],
-                            optionGroupName,
-                            optionGroup,
-                            option,
-                            existingParent, existingOptions, existingOption,
-                            modelValue = ctrl.$modelValue,
-                            values = valuesFn(scope) || [],
-                            keys = keyName ? sortedKeys(values) : values,
-                            key,
-                            groupLength, length,
-                            groupIndex, index,
-                            locals = {},
-                            selected,
-                            selectedSet = false, // nothing is selected yet
-                            lastElement,
-                            element,
-                            label;
-
-                        if (multiple) {
-                            if (trackFn && isArray(modelValue)) {
-                                selectedSet = new HashMap([]);
-                                for (var trackIndex = 0; trackIndex < modelValue.length; trackIndex++) {
-                                    locals[valueName] = modelValue[trackIndex];
-                                    selectedSet.put(trackFn(scope, locals), modelValue[trackIndex]);
-                                }
-                            } else {
-                                selectedSet = new HashMap(modelValue);
-                            }
+                optionAttrs.$observe('disabled', function(newVal) {
+
+                    // Since model updates will also select disabled options (like ngOptions),
+                    // we only have to handle options becoming disabled, not enabled
+
+                    if (newVal === 'true' || newVal && optionElement.prop('selected')) {
+                        if (self.multiple) {
+                            scheduleViewValueUpdate(true);
+                        } else {
+                            self.ngModelCtrl.$setViewValue(null);
+                            self.ngModelCtrl.$render();
                         }
+                    }
+                });
+
+                optionElement.on('$destroy', function() {
+                    var currentValue = self.readValue();
+                    var removeValue = optionAttrs.value;
+
+                    self.removeOption(removeValue);
+                    scheduleRender();
+
+                    if (self.multiple && currentValue && currentValue.indexOf(removeValue) !== -1 ||
+                        currentValue === removeValue
+                    ) {
+                        // When multiple (selected) options are destroyed at the same time, we don't want
+                        // to run a model update for each of them. Instead, run a single update in the $$postDigest
+                        scheduleViewValueUpdate(true);
+                    }
+                });
+            };
+        }];
 
-                        // We now build up the list of options we need (we merge later)
-                        for (index = 0; length = keys.length, index < length; index++) {
+    /**
+     * @ngdoc directive
+     * @name select
+     * @restrict E
+     *
+     * @description
+     * HTML `select` element with AngularJS data-binding.
+     *
+     * The `select` directive is used together with {@link ngModel `ngModel`} to provide data-binding
+     * between the scope and the `<select>` control (including setting default values).
+     * It also handles dynamic `<option>` elements, which can be added using the {@link ngRepeat `ngRepeat}` or
+     * {@link ngOptions `ngOptions`} directives.
+     *
+     * When an item in the `<select>` menu is selected, the value of the selected option will be bound
+     * to the model identified by the `ngModel` directive. With static or repeated options, this is
+     * the content of the `value` attribute or the textContent of the `<option>`, if the value attribute is missing.
+     * Value and textContent can be interpolated.
+     *
+     * The {@link select.SelectController select controller} exposes utility functions that can be used
+     * to manipulate the select's behavior.
+     *
+     * ## Matching model and option values
+     *
+     * In general, the match between the model and an option is evaluated by strictly comparing the model
+     * value against the value of the available options.
+     *
+     * If you are setting the option value with the option's `value` attribute, or textContent, the
+     * value will always be a `string` which means that the model value must also be a string.
+     * Otherwise the `select` directive cannot match them correctly.
+     *
+     * To bind the model to a non-string value, you can use one of the following strategies:
+     * - the {@link ng.ngOptions `ngOptions`} directive
+     *   ({@link ng.select#using-select-with-ngoptions-and-setting-a-default-value})
+     * - the {@link ng.ngValue `ngValue`} directive, which allows arbitrary expressions to be
+     *   option values ({@link ng.select#using-ngvalue-to-bind-the-model-to-an-array-of-objects Example})
+     * - model $parsers / $formatters to convert the string value
+     *   ({@link ng.select#binding-select-to-a-non-string-value-via-ngmodel-parsing-formatting Example})
+     *
+     * If the viewValue of `ngModel` does not match any of the options, then the control
+     * will automatically add an "unknown" option, which it then removes when the mismatch is resolved.
+     *
+     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+     * option. See example below for demonstration.
+     *
+     * ## Choosing between `ngRepeat` and `ngOptions`
+     *
+     * In many cases, `ngRepeat` can be used on `<option>` elements instead of {@link ng.directive:ngOptions
+ * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits:
+     * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+     * comprehension expression
+     * - reduced memory consumption by not creating a new scope for each repeated instance
+     * - increased render speed by creating the options in a documentFragment instead of individually
+     *
+     * Specifically, select with repeated options slows down significantly starting at 2000 options in
+     * Chrome and Internet Explorer / Edge.
+     *
+     *
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} multiple Allows multiple options to be selected. The selected values will be
+     *     bound to the model as an array.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds required attribute and required validation constraint to
+     * the element when the ngRequired expression evaluates to true. Use ngRequired instead of required
+     * when you want to data-bind to the required attribute.
+     * @param {string=} ngChange AngularJS expression to be executed when selected option(s) changes due to user
+     *    interaction with the select element.
+     * @param {string=} ngOptions sets the options that the select is populated with and defines what is
+     * set on the model on selection. See {@link ngOptions `ngOptions`}.
+     * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
+     * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
+     *
+     *
+     * @knownIssue
+     *
+     * In Firefox, the select model is only updated when the select element is blurred. For example,
+     * when switching between options with the keyboard, the select model is only set to the
+     * currently selected option when the select is blurred, e.g via tab key or clicking the mouse
+     * outside the select.
+     *
+     * This is due to an ambiguity in the select element specification. See the
+     * [issue on the Firefox bug tracker](https://bugzilla.mozilla.org/show_bug.cgi?id=126379)
+     * for more information, and this
+     * [Github comment for a workaround](https://github.com/angular/angular.js/issues/9134#issuecomment-130800488)
+     *
+     * @example
+     * ### Simple `select` elements with static options
+     *
+     * <example name="static-select" module="staticSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="singleSelect"> Single select: </label><br>
+     *     <select name="singleSelect" ng-model="data.singleSelect">
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *
+     *     <label for="singleSelect"> Single select with "not selected" option and dynamic option values: </label><br>
+     *     <select name="singleSelect" id="singleSelect" ng-model="data.singleSelect">
+     *       <option value="">---Please select---</option> <!-- not selected / blank option -->
+     *       <option value="{{data.option1}}">Option 1</option> <!-- interpolation -->
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+     *     <tt>singleSelect = {{data.singleSelect}}</tt>
+     *
+     *     <hr>
+     *     <label for="multipleSelect"> Multiple select: </label><br>
+     *     <select name="multipleSelect" id="multipleSelect" ng-model="data.multipleSelect" multiple>
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *       <option value="option-3">Option 3</option>
+     *     </select><br>
+     *     <tt>multipleSelect = {{data.multipleSelect}}</tt><br/>
+     *   </form>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('staticSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       singleSelect: null,
+     *       multipleSelect: [],
+     *       option1: 'option-1'
+     *      };
+     *
+     *      $scope.forceUnknownOption = function() {
+     *        $scope.data.singleSelect = 'nonsense';
+     *      };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Using `ngRepeat` to generate `select` options
+     * <example name="select-ngrepeat" module="ngrepeatSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="repeatSelect"> Repeat select: </label>
+     *     <select name="repeatSelect" id="repeatSelect" ng-model="data.model">
+     *       <option ng-repeat="option in data.availableOptions" value="{{option.id}}">{{option.name}}</option>
+     *     </select>
+     *   </form>
+     *   <hr>
+     *   <tt>model = {{data.model}}</tt><br/>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('ngrepeatSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       model: null,
+     *       availableOptions: [
+     *         {id: '1', name: 'Option A'},
+     *         {id: '2', name: 'Option B'},
+     *         {id: '3', name: 'Option C'}
+     *       ]
+     *      };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Using `ngValue` to bind the model to an array of objects
+     * <example name="select-ngvalue" module="ngvalueSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="ngvalueselect"> ngvalue select: </label>
+     *     <select size="6" name="ngvalueselect" ng-model="data.model" multiple>
+     *       <option ng-repeat="option in data.availableOptions" ng-value="option.value">{{option.name}}</option>
+     *     </select>
+     *   </form>
+     *   <hr>
+     *   <pre>model = {{data.model | json}}</pre><br/>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('ngvalueSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       model: null,
+     *       availableOptions: [
+           {value: 'myString', name: 'string'},
+           {value: 1, name: 'integer'},
+           {value: true, name: 'boolean'},
+           {value: null, name: 'null'},
+           {value: {prop: 'value'}, name: 'object'},
+           {value: ['a'], name: 'array'}
+     *       ]
+     *      };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Using `select` with `ngOptions` and setting a default value
+     * See the {@link ngOptions ngOptions documentation} for more `ngOptions` usage examples.
+     *
+     * <example name="select-with-default-values" module="defaultValueSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="mySelect">Make a choice:</label>
+     *     <select name="mySelect" id="mySelect"
+     *       ng-options="option.name for option in data.availableOptions track by option.id"
+     *       ng-model="data.selectedOption"></select>
+     *   </form>
+     *   <hr>
+     *   <tt>option = {{data.selectedOption}}</tt><br/>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('defaultValueSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       availableOptions: [
+     *         {id: '1', name: 'Option A'},
+     *         {id: '2', name: 'Option B'},
+     *         {id: '3', name: 'Option C'}
+     *       ],
+     *       selectedOption: {id: '3', name: 'Option C'} //This sets the default value of the select in the ui
+     *       };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Binding `select` to a non-string value via `ngModel` parsing / formatting
+     *
+     * <example name="select-with-non-string-options" module="nonStringSelect">
+     *   <file name="index.html">
+     *     <select ng-model="model.id" convert-to-number>
+     *       <option value="0">Zero</option>
+     *       <option value="1">One</option>
+     *       <option value="2">Two</option>
+     *     </select>
+     *     {{ model }}
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('nonStringSelect', [])
+     *       .run(function($rootScope) {
+     *         $rootScope.model = { id: 2 };
+     *       })
+     *       .directive('convertToNumber', function() {
+     *         return {
+     *           require: 'ngModel',
+     *           link: function(scope, element, attrs, ngModel) {
+     *             ngModel.$parsers.push(function(val) {
+     *               return parseInt(val, 10);
+     *             });
+     *             ngModel.$formatters.push(function(val) {
+     *               return '' + val;
+     *             });
+     *           }
+     *         };
+     *       });
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     it('should initialize to model', function() {
+     *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
+     *     });
+     *   </file>
+     * </example>
+     *
+     */
+    var selectDirective = function() {
 
-                            key = index;
-                            if (keyName) {
-                                key = keys[index];
-                                if ( key.charAt(0) === '$' ) continue;
-                                locals[keyName] = key;
-                            }
+        return {
+            restrict: 'E',
+            require: ['select', '?ngModel'],
+            controller: SelectController,
+            priority: 1,
+            link: {
+                pre: selectPreLink,
+                post: selectPostLink
+            }
+        };
 
-                            locals[valueName] = values[key];
+        function selectPreLink(scope, element, attr, ctrls) {
 
-                            optionGroupName = groupByFn(scope, locals) || '';
-                            if (!(optionGroup = optionGroups[optionGroupName])) {
-                                optionGroup = optionGroups[optionGroupName] = [];
-                                optionGroupNames.push(optionGroupName);
-                            }
-                            if (multiple) {
-                                selected = isDefined(
-                                    selectedSet.remove(trackFn ? trackFn(scope, locals) : valueFn(scope, locals))
-                                );
-                            } else {
-                                if (trackFn) {
-                                    var modelCast = {};
-                                    modelCast[valueName] = modelValue;
-                                    selected = trackFn(scope, modelCast) === trackFn(scope, locals);
-                                } else {
-                                    selected = modelValue === valueFn(scope, locals);
-                                }
-                                selectedSet = selectedSet || selected; // see if at least one item is selected
-                            }
-                            label = displayFn(scope, locals); // what will be seen by the user
-
-                            // doing displayFn(scope, locals) || '' overwrites zero values
-                            label = isDefined(label) ? label : '';
-                            optionGroup.push({
-                                // either the index into array or key from object
-                                id: trackFn ? trackFn(scope, locals) : (keyName ? keys[index] : index),
-                                label: label,
-                                selected: selected                   // determine if we should be selected
-                            });
-                        }
-                        if (!multiple) {
-                            if (nullOption || modelValue === null) {
-                                // insert null option if we have a placeholder, or the model is null
-                                optionGroups[''].unshift({id:'', label:'', selected:!selectedSet});
-                            } else if (!selectedSet) {
-                                // option could not be found, we have to insert the undefined item
-                                optionGroups[''].unshift({id:'?', label:'', selected:true});
-                            }
-                        }
+            var selectCtrl = ctrls[0];
+            var ngModelCtrl = ctrls[1];
 
-                        // Now we need to update the list of DOM nodes to match the optionGroups we computed above
-                        for (groupIndex = 0, groupLength = optionGroupNames.length;
-                             groupIndex < groupLength;
-                             groupIndex++) {
-                            // current option group name or '' if no group
-                            optionGroupName = optionGroupNames[groupIndex];
-
-                            // list of options for that group. (first item has the parent)
-                            optionGroup = optionGroups[optionGroupName];
-
-                            if (optionGroupsCache.length <= groupIndex) {
-                                // we need to grow the optionGroups
-                                existingParent = {
-                                    element: optGroupTemplate.clone().attr('label', optionGroupName),
-                                    label: optionGroup.label
-                                };
-                                existingOptions = [existingParent];
-                                optionGroupsCache.push(existingOptions);
-                                selectElement.append(existingParent.element);
-                            } else {
-                                existingOptions = optionGroupsCache[groupIndex];
-                                existingParent = existingOptions[0];  // either SELECT (no group) or OPTGROUP element
+            // if ngModel is not defined, we don't need to do anything but set the registerOption
+            // function to noop, so options don't get added internally
+            if (!ngModelCtrl) {
+                selectCtrl.registerOption = noop;
+                return;
+            }
 
-                                // update the OPTGROUP label if not the same.
-                                if (existingParent.label != optionGroupName) {
-                                    existingParent.element.attr('label', existingParent.label = optionGroupName);
-                                }
-                            }
 
-                            lastElement = null;  // start at the beginning
-                            for(index = 0, length = optionGroup.length; index < length; index++) {
-                                option = optionGroup[index];
-                                if ((existingOption = existingOptions[index+1])) {
-                                    // reuse elements
-                                    lastElement = existingOption.element;
-                                    if (existingOption.label !== option.label) {
-                                        lastElement.text(existingOption.label = option.label);
-                                    }
-                                    if (existingOption.id !== option.id) {
-                                        lastElement.val(existingOption.id = option.id);
-                                    }
-                                    // lastElement.prop('selected') provided by jQuery has side-effects
-                                    if (existingOption.selected !== option.selected) {
-                                        lastElement.prop('selected', (existingOption.selected = option.selected));
-                                    }
-                                } else {
-                                    // grow elements
+            selectCtrl.ngModelCtrl = ngModelCtrl;
 
-                                    // if it's a null option
-                                    if (option.id === '' && nullOption) {
-                                        // put back the pre-compiled element
-                                        element = nullOption;
-                                    } else {
-                                        // jQuery(v1.4.2) Bug: We should be able to chain the method calls, but
-                                        // in this version of jQuery on some browser the .text() returns a string
-                                        // rather then the element.
-                                        (element = optionTemplate.clone())
-                                            .val(option.id)
-                                            .attr('selected', option.selected)
-                                            .text(option.label);
-                                    }
+            // When the selected item(s) changes we delegate getting the value of the select control
+            // to the `readValue` method, which can be changed if the select can have multiple
+            // selected values or if the options are being generated by `ngOptions`
+            element.on('change', function() {
+                selectCtrl.removeUnknownOption();
+                scope.$apply(function() {
+                    ngModelCtrl.$setViewValue(selectCtrl.readValue());
+                });
+            });
 
-                                    existingOptions.push(existingOption = {
-                                        element: element,
-                                        label: option.label,
-                                        id: option.id,
-                                        selected: option.selected
-                                    });
-                                    if (lastElement) {
-                                        lastElement.after(element);
-                                    } else {
-                                        existingParent.element.append(element);
-                                    }
-                                    lastElement = element;
-                                }
-                            }
-                            // remove any excessive OPTIONs in a group
-                            index++; // increment since the existingOptions[0] is parent element not OPTION
-                            while(existingOptions.length > index) {
-                                existingOptions.pop().element.remove();
-                            }
+            // If the select allows multiple values then we need to modify how we read and write
+            // values from and to the control; also what it means for the value to be empty and
+            // we have to add an extra watch since ngModel doesn't work well with arrays - it
+            // doesn't trigger rendering if only an item in the array changes.
+            if (attr.multiple) {
+                selectCtrl.multiple = true;
+
+                // Read value now needs to check each option to see if it is selected
+                selectCtrl.readValue = function readMultipleValue() {
+                    var array = [];
+                    forEach(element.find('option'), function(option) {
+                        if (option.selected && !option.disabled) {
+                            var val = option.value;
+                            array.push(val in selectCtrl.selectValueMap ? selectCtrl.selectValueMap[val] : val);
                         }
-                        // remove any excessive OPTGROUPs from select
-                        while(optionGroupsCache.length > groupIndex) {
-                            optionGroupsCache.pop()[0].element.remove();
+                    });
+                    return array;
+                };
+
+                // Write value now needs to set the selected property of each matching option
+                selectCtrl.writeValue = function writeMultipleValue(value) {
+                    forEach(element.find('option'), function(option) {
+                        var shouldBeSelected = !!value && (includes(value, option.value) ||
+                            includes(value, selectCtrl.selectValueMap[option.value]));
+                        var currentlySelected = option.selected;
+
+                        // Support: IE 9-11 only, Edge 12-15+
+                        // In IE and Edge adding options to the selection via shift+click/UP/DOWN
+                        // will de-select already selected options if "selected" on those options was set
+                        // more than once (i.e. when the options were already selected)
+                        // So we only modify the selected property if necessary.
+                        // Note: this behavior cannot be replicated via unit tests because it only shows in the
+                        // actual user interface.
+                        if (shouldBeSelected !== currentlySelected) {
+                            setOptionSelectedStatus(jqLite(option), shouldBeSelected);
                         }
+
+                    });
+                };
+
+                // we have to do it on each watch since ngModel watches reference, but
+                // we need to work of an array, so we need to see if anything was inserted/removed
+                var lastView, lastViewRef = NaN;
+                scope.$watch(function selectMultipleWatch() {
+                    if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
+                        lastView = shallowCopy(ngModelCtrl.$viewValue);
+                        ngModelCtrl.$render();
                     }
-                }
+                    lastViewRef = ngModelCtrl.$viewValue;
+                });
+
+                // If we are a multiple select then value is now a collection
+                // so the meaning of $isEmpty changes
+                ngModelCtrl.$isEmpty = function(value) {
+                    return !value || value.length === 0;
+                };
+
             }
-        };
-    }];
+        }
 
-    var optionDirective = ['$interpolate', function($interpolate) {
-        var nullSelectCtrl = {
-            addOption: noop,
-            removeOption: noop
-        };
+        function selectPostLink(scope, element, attrs, ctrls) {
+            // if ngModel is not defined, we don't need to do anything
+            var ngModelCtrl = ctrls[1];
+            if (!ngModelCtrl) return;
+
+            var selectCtrl = ctrls[0];
+
+            // We delegate rendering to the `writeValue` method, which can be changed
+            // if the select can have multiple selected values or if the options are being
+            // generated by `ngOptions`.
+            // This must be done in the postLink fn to prevent $render to be called before
+            // all nodes have been linked correctly.
+            ngModelCtrl.$render = function() {
+                selectCtrl.writeValue(ngModelCtrl.$viewValue);
+            };
+        }
+    };
 
+
+// The option directive is purely designed to communicate the existence (or lack of)
+// of dynamically created (and destroyed) option elements to their containing select
+// directive via its controller.
+    var optionDirective = ['$interpolate', function($interpolate) {
         return {
             restrict: 'E',
             priority: 100,
             compile: function(element, attr) {
-                if (isUndefined(attr.value)) {
-                    var interpolateFn = $interpolate(element.text(), true);
-                    if (!interpolateFn) {
+                var interpolateValueFn, interpolateTextFn;
+
+                if (isDefined(attr.ngValue)) {
+                    // Will be handled by registerOption
+                } else if (isDefined(attr.value)) {
+                    // If the value attribute is defined, check if it contains an interpolation
+                    interpolateValueFn = $interpolate(attr.value, true);
+                } else {
+                    // If the value attribute is not defined then we fall back to the
+                    // text content of the option element, which may be interpolated
+                    interpolateTextFn = $interpolate(element.text(), true);
+                    if (!interpolateTextFn) {
                         attr.$set('value', element.text());
                     }
                 }
 
-                return function (scope, element, attr) {
+                return function(scope, element, attr) {
+                    // This is an optimization over using ^^ since we don't want to have to search
+                    // all the way to the root of the DOM for every single option element
                     var selectCtrlName = '$selectController',
                         parent = element.parent(),
                         selectCtrl = parent.data(selectCtrlName) ||
                             parent.parent().data(selectCtrlName); // in case we are in optgroup
 
-                    if (selectCtrl && selectCtrl.databound) {
-                        // For some reason Opera defaults to true and if not overridden this messes up the repeater.
-                        // We don't want the view to drive the initialization of the model anyway.
-                        element.prop('selected', false);
-                    } else {
-                        selectCtrl = nullSelectCtrl;
+                    if (selectCtrl) {
+                        selectCtrl.registerOption(scope, element, attr, interpolateValueFn, interpolateTextFn);
                     }
+                };
+            }
+        };
+    }];
 
-                    if (interpolateFn) {
-                        scope.$watch(interpolateFn, function interpolateWatchAction(newVal, oldVal) {
-                            attr.$set('value', newVal);
-                            if (newVal !== oldVal) selectCtrl.removeOption(oldVal);
-                            selectCtrl.addOption(newVal);
-                        });
-                    } else {
-                        selectCtrl.addOption(attr.value);
+    /**
+     * @ngdoc directive
+     * @name ngRequired
+     * @restrict A
+     *
+     * @param {expression} ngRequired AngularJS expression. If it evaluates to `true`, it sets the
+     *                                `required` attribute to the element and adds the `required`
+     *                                {@link ngModel.NgModelController#$validators `validator`}.
+     *
+     * @description
+     *
+     * ngRequired adds the required {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for {@link input `input`} and {@link select `select`} controls, but can also be
+     * applied to custom controls.
+     *
+     * The directive sets the `required` attribute on the element if the AngularJS expression inside
+     * `ngRequired` evaluates to true. A special directive for setting `required` is necessary because we
+     * cannot use interpolation inside `required`. See the {@link guide/interpolation interpolation guide}
+     * for more info.
+     *
+     * The validator will set the `required` error key to true if the `required` attribute is set and
+     * calling {@link ngModel.NgModelController#$isEmpty `NgModelController.$isEmpty`} with the
+     * {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`} returns `true`. For example, the
+     * `$isEmpty()` implementation for `input[text]` checks the length of the `$viewValue`. When developing
+     * custom controls, `$isEmpty()` can be overwritten to account for a $viewValue that is not string-based.
+     *
+     * @example
+     * <example name="ngRequiredDirective" module="ngRequiredExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngRequiredExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.required = true;
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="required">Toggle required: </label>
+     *         <input type="checkbox" ng-model="required" id="required" />
+     *         <br>
+     *         <label for="input">This input must be filled if `required` is true: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-required="required" /><br>
+     *         <hr>
+     *         required error set? = <code>{{form.input.$error.required}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var required = element(by.binding('form.input.$error.required'));
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should set the required error', function() {
+         expect(required.getText()).toContain('true');
+
+         input.sendKeys('123');
+         expect(required.getText()).not.toContain('true');
+         expect(model.getText()).toContain('123');
+       });
+     *   </file>
+     * </example>
+     */
+    var requiredDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+                attr.required = true; // force truthy in case we are on non input element
+
+                ctrl.$validators.required = function(modelValue, viewValue) {
+                    return !attr.required || !ctrl.$isEmpty(viewValue);
+                };
+
+                attr.$observe('required', function() {
+                    ctrl.$validate();
+                });
+            }
+        };
+    };
+
+    /**
+     * @ngdoc directive
+     * @name ngPattern
+     * @restrict A
+     *
+     * @param {expression|RegExp} ngPattern AngularJS expression that must evaluate to a `RegExp` or a `String`
+     *                                      parsable into a `RegExp`, or a `RegExp` literal. See above for
+     *                                      more details.
+     *
+     * @description
+     *
+     * ngPattern adds the pattern {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+     *
+     * The validator sets the `pattern` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+     * does not match a RegExp which is obtained from the `ngPattern` attribute value:
+     * - the value is an AngularJS expression:
+     *   - If the expression evaluates to a RegExp object, then this is used directly.
+     *   - If the expression evaluates to a string, then it will be converted to a RegExp after wrapping it
+     *     in `^` and `$` characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+     * - If the value is a RegExp literal, e.g. `ngPattern="/^\d+$/"`, it is used directly.
+     *
+     * <div class="alert alert-info">
+     * **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     * start at the index of the last search's match, thus not taking the whole input value into
+     * account.
+     * </div>
+     *
+     * <div class="alert alert-info">
+     * **Note:** This directive is also added when the plain `pattern` attribute is used, with two
+     * differences:
+     * <ol>
+     *   <li>
+     *     `ngPattern` does not set the `pattern` attribute and therefore HTML5 constraint validation is
+     *     not available.
+     *   </li>
+     *   <li>
+     *     The `ngPattern` attribute must be an expression, while the `pattern` value must be
+     *     interpolated.
+     *   </li>
+     * </ol>
+     * </div>
+     *
+     * @example
+     * <example name="ngPatternDirective" module="ngPatternExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngPatternExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.regex = '\\d+';
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="regex">Set a pattern (regex string): </label>
+     *         <input type="text" ng-model="regex" id="regex" />
+     *         <br>
+     *         <label for="input">This input is restricted by the current pattern: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-pattern="regex" /><br>
+     *         <hr>
+     *         input valid? = <code>{{form.input.$valid}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should validate the input with the default pattern', function() {
+         input.sendKeys('aaa');
+         expect(model.getText()).not.toContain('aaa');
+
+         input.clear().then(function() {
+           input.sendKeys('123');
+           expect(model.getText()).toContain('123');
+         });
+       });
+     *   </file>
+     * </example>
+     */
+    var patternDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+
+                var regexp, patternExp = attr.ngPattern || attr.pattern;
+                attr.$observe('pattern', function(regex) {
+                    if (isString(regex) && regex.length > 0) {
+                        regex = new RegExp('^' + regex + '$');
                     }
 
-                    element.on('$destroy', function() {
-                        selectCtrl.removeOption(attr.value);
-                    });
+                    if (regex && !regex.test) {
+                        throw minErr('ngPattern')('noregexp',
+                            'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
+                            regex, startingTag(elm));
+                    }
+
+                    regexp = regex || undefined;
+                    ctrl.$validate();
+                });
+
+                ctrl.$validators.pattern = function(modelValue, viewValue) {
+                    // HTML5 pattern constraint validates the input value, so we validate the viewValue
+                    return ctrl.$isEmpty(viewValue) || isUndefined(regexp) || regexp.test(viewValue);
                 };
             }
         };
-    }];
+    };
 
-    var styleDirective = valueFn({
-        restrict: 'E',
-        terminal: true
-    });
+    /**
+     * @ngdoc directive
+     * @name ngMaxlength
+     * @restrict A
+     *
+     * @param {expression} ngMaxlength AngularJS expression that must evaluate to a `Number` or `String`
+     *                                 parsable into a `Number`. Used as value for the `maxlength`
+     *                                 {@link ngModel.NgModelController#$validators validator}.
+     *
+     * @description
+     *
+     * ngMaxlength adds the maxlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+     *
+     * The validator sets the `maxlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+     * is longer than the integer obtained by evaluating the AngularJS expression given in the
+     * `ngMaxlength` attribute value.
+     *
+     * <div class="alert alert-info">
+     * **Note:** This directive is also added when the plain `maxlength` attribute is used, with two
+     * differences:
+     * <ol>
+     *   <li>
+     *     `ngMaxlength` does not set the `maxlength` attribute and therefore HTML5 constraint
+     *     validation is not available.
+     *   </li>
+     *   <li>
+     *     The `ngMaxlength` attribute must be an expression, while the `maxlength` value must be
+     *     interpolated.
+     *   </li>
+     * </ol>
+     * </div>
+     *
+     * @example
+     * <example name="ngMaxlengthDirective" module="ngMaxlengthExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngMaxlengthExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.maxlength = 5;
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="maxlength">Set a maxlength: </label>
+     *         <input type="number" ng-model="maxlength" id="maxlength" />
+     *         <br>
+     *         <label for="input">This input is restricted by the current maxlength: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-maxlength="maxlength" /><br>
+     *         <hr>
+     *         input valid? = <code>{{form.input.$valid}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should validate the input with the default maxlength', function() {
+         input.sendKeys('abcdef');
+         expect(model.getText()).not.toContain('abcdef');
+
+         input.clear().then(function() {
+           input.sendKeys('abcde');
+           expect(model.getText()).toContain('abcde');
+         });
+       });
+     *   </file>
+     * </example>
+     */
+    var maxlengthDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+
+                var maxlength = -1;
+                attr.$observe('maxlength', function(value) {
+                    var intVal = toInt(value);
+                    maxlength = isNumberNaN(intVal) ? -1 : intVal;
+                    ctrl.$validate();
+                });
+                ctrl.$validators.maxlength = function(modelValue, viewValue) {
+                    return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
+                };
+            }
+        };
+    };
+
+    /**
+     * @ngdoc directive
+     * @name ngMinlength
+     * @restrict A
+     *
+     * @param {expression} ngMinlength AngularJS expression that must evaluate to a `Number` or `String`
+     *                                 parsable into a `Number`. Used as value for the `minlength`
+     *                                 {@link ngModel.NgModelController#$validators validator}.
+     *
+     * @description
+     *
+     * ngMinlength adds the minlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+     *
+     * The validator sets the `minlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+     * is shorter than the integer obtained by evaluating the AngularJS expression given in the
+     * `ngMinlength` attribute value.
+     *
+     * <div class="alert alert-info">
+     * **Note:** This directive is also added when the plain `minlength` attribute is used, with two
+     * differences:
+     * <ol>
+     *   <li>
+     *     `ngMinlength` does not set the `minlength` attribute and therefore HTML5 constraint
+     *     validation is not available.
+     *   </li>
+     *   <li>
+     *     The `ngMinlength` value must be an expression, while the `minlength` value must be
+     *     interpolated.
+     *   </li>
+     * </ol>
+     * </div>
+     *
+     * @example
+     * <example name="ngMinlengthDirective" module="ngMinlengthExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngMinlengthExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.minlength = 3;
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="minlength">Set a minlength: </label>
+     *         <input type="number" ng-model="minlength" id="minlength" />
+     *         <br>
+     *         <label for="input">This input is restricted by the current minlength: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-minlength="minlength" /><br>
+     *         <hr>
+     *         input valid? = <code>{{form.input.$valid}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should validate the input with the default minlength', function() {
+         input.sendKeys('ab');
+         expect(model.getText()).not.toContain('ab');
+
+         input.sendKeys('abc');
+         expect(model.getText()).toContain('abc');
+       });
+     *   </file>
+     * </example>
+     */
+    var minlengthDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+
+                var minlength = 0;
+                attr.$observe('minlength', function(value) {
+                    minlength = toInt(value) || 0;
+                    ctrl.$validate();
+                });
+                ctrl.$validators.minlength = function(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength;
+                };
+            }
+        };
+    };
 
     if (window.angular.bootstrap) {
-        //AngularJS is already loaded, so we can return here...
-        console.log('WARNING: Tried to load angular more than once.');
+        // AngularJS is already loaded, so we can return here...
+        if (window.console) {
+            console.log('WARNING: Tried to load AngularJS more than once.');
+        }
         return;
     }
 
-    //try to bind to jquery now so that one can write angular.element().read()
-    //but we will rebind on bootstrap again.
+// try to bind to jquery now so that one can write jqLite(fn)
+// but we will rebind on bootstrap again.
     bindJQuery();
 
     publishExternalAPI(angular);
 
-    jqLite(document).ready(function() {
-        angularInit(document, bootstrap);
+    angular.module("ngLocale", [], ["$provide", function($provide) {
+        var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+        function getDecimals(n) {
+            n = n + '';
+            var i = n.indexOf('.');
+            return (i == -1) ? 0 : n.length - i - 1;
+        }
+
+        function getVF(n, opt_precision) {
+            var v = opt_precision;
+
+            if (undefined === v) {
+                v = Math.min(getDecimals(n), 3);
+            }
+
+            var base = Math.pow(10, v);
+            var f = ((n * base) | 0) % base;
+            return {v: v, f: f};
+        }
+
+        $provide.value("$locale", {
+            "DATETIME_FORMATS": {
+                "AMPMS": [
+                    "AM",
+                    "PM"
+                ],
+                "DAY": [
+                    "Sunday",
+                    "Monday",
+                    "Tuesday",
+                    "Wednesday",
+                    "Thursday",
+                    "Friday",
+                    "Saturday"
+                ],
+                "ERANAMES": [
+                    "Before Christ",
+                    "Anno Domini"
+                ],
+                "ERAS": [
+                    "BC",
+                    "AD"
+                ],
+                "FIRSTDAYOFWEEK": 6,
+                "MONTH": [
+                    "January",
+                    "February",
+                    "March",
+                    "April",
+                    "May",
+                    "June",
+                    "July",
+                    "August",
+                    "September",
+                    "October",
+                    "November",
+                    "December"
+                ],
+                "SHORTDAY": [
+                    "Sun",
+                    "Mon",
+                    "Tue",
+                    "Wed",
+                    "Thu",
+                    "Fri",
+                    "Sat"
+                ],
+                "SHORTMONTH": [
+                    "Jan",
+                    "Feb",
+                    "Mar",
+                    "Apr",
+                    "May",
+                    "Jun",
+                    "Jul",
+                    "Aug",
+                    "Sep",
+                    "Oct",
+                    "Nov",
+                    "Dec"
+                ],
+                "STANDALONEMONTH": [
+                    "January",
+                    "February",
+                    "March",
+                    "April",
+                    "May",
+                    "June",
+                    "July",
+                    "August",
+                    "September",
+                    "October",
+                    "November",
+                    "December"
+                ],
+                "WEEKENDRANGE": [
+                    5,
+                    6
+                ],
+                "fullDate": "EEEE, MMMM d, y",
+                "longDate": "MMMM d, y",
+                "medium": "MMM d, y h:mm:ss a",
+                "mediumDate": "MMM d, y",
+                "mediumTime": "h:mm:ss a",
+                "short": "M/d/yy h:mm a",
+                "shortDate": "M/d/yy",
+                "shortTime": "h:mm a"
+            },
+            "NUMBER_FORMATS": {
+                "CURRENCY_SYM": "$",
+                "DECIMAL_SEP": ".",
+                "GROUP_SEP": ",",
+                "PATTERNS": [
+                    {
+                        "gSize": 3,
+                        "lgSize": 3,
+                        "maxFrac": 3,
+                        "minFrac": 0,
+                        "minInt": 1,
+                        "negPre": "-",
+                        "negSuf": "",
+                        "posPre": "",
+                        "posSuf": ""
+                    },
+                    {
+                        "gSize": 3,
+                        "lgSize": 3,
+                        "maxFrac": 2,
+                        "minFrac": 2,
+                        "minInt": 1,
+                        "negPre": "-\u00a4",
+                        "negSuf": "",
+                        "posPre": "\u00a4",
+                        "posSuf": ""
+                    }
+                ]
+            },
+            "id": "en-us",
+            "localeID": "en_US",
+            "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+        });
+    }]);
+
+    jqLite(function() {
+        angularInit(window.document, bootstrap);
     });
 
-})(window, document);
+})(window);
 
-!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}</style>');
\ No newline at end of file
+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
diff --git a/setup/pub/angular/angular.min.js b/setup/pub/angular/angular.min.js
index c7d2ea7388e33..4c57937335798 100644
--- a/setup/pub/angular/angular.min.js
+++ b/setup/pub/angular/angular.min.js
@@ -1,212 +1,337 @@
 /*
- AngularJS v1.2.17-build.178+sha.2406084
- (c) 2010-2014 Google, Inc. http://angularjs.org
+ AngularJS v1.6.9
+ (c) 2010-2018 Google, Inc. http://angularjs.org
  License: MIT
 */
-(function(P,U,s){'use strict';function u(b){return function(){var a=arguments[0],c,a="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.2.17-build.178+sha.2406084/"+(b?b+"/":"")+a;for(c=1;c<arguments.length;c++)a=a+(1==c?"?":"&")+"p"+(c-1)+"="+encodeURIComponent("function"==typeof arguments[c]?arguments[c].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[c]?"undefined":"string"!=typeof arguments[c]?JSON.stringify(arguments[c]):arguments[c]);return Error(a)}}function bb(b){if(null==
-b||Da(b))return!1;var a=b.length;return 1===b.nodeType&&a?!0:C(b)||L(b)||0===a||"number"===typeof a&&0<a&&a-1 in b}function q(b,a,c){var d;if(b)if(Q(b))for(d in b)"prototype"==d||("length"==d||"name"==d||b.hasOwnProperty&&!b.hasOwnProperty(d))||a.call(c,b[d],d);else if(b.forEach&&b.forEach!==q)b.forEach(a,c);else if(bb(b))for(d=0;d<b.length;d++)a.call(c,b[d],d);else for(d in b)b.hasOwnProperty(d)&&a.call(c,b[d],d);return b}function Ub(b){var a=[],c;for(c in b)b.hasOwnProperty(c)&&a.push(c);return a.sort()}
-function Sc(b,a,c){for(var d=Ub(b),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}function Vb(b){return function(a,c){b(c,a)}}function cb(){for(var b=ka.length,a;b;){b--;a=ka[b].charCodeAt(0);if(57==a)return ka[b]="A",ka.join("");if(90==a)ka[b]="0";else return ka[b]=String.fromCharCode(a+1),ka.join("")}ka.unshift("0");return ka.join("")}function Wb(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function E(b){var a=b.$$hashKey;q(arguments,function(a){a!==b&&q(a,function(a,c){b[c]=a})});Wb(b,a);return b}
-function Y(b){return parseInt(b,10)}function Xb(b,a){return E(new (E(function(){},{prototype:b})),a)}function w(){}function Ea(b){return b}function aa(b){return function(){return b}}function H(b){return"undefined"===typeof b}function z(b){return"undefined"!==typeof b}function X(b){return null!=b&&"object"===typeof b}function C(b){return"string"===typeof b}function yb(b){return"number"===typeof b}function Ma(b){return"[object Date]"===wa.call(b)}function L(b){return"[object Array]"===wa.call(b)}function Q(b){return"function"===
-typeof b}function db(b){return"[object RegExp]"===wa.call(b)}function Da(b){return b&&b.document&&b.location&&b.alert&&b.setInterval}function Tc(b){return!(!b||!(b.nodeName||b.prop&&b.attr&&b.find))}function Uc(b,a,c){var d=[];q(b,function(b,g,f){d.push(a.call(c,b,g,f))});return d}function eb(b,a){if(b.indexOf)return b.indexOf(a);for(var c=0;c<b.length;c++)if(a===b[c])return c;return-1}function Na(b,a){var c=eb(b,a);0<=c&&b.splice(c,1);return a}function ca(b,a){if(Da(b)||b&&b.$evalAsync&&b.$watch)throw Oa("cpws");
-if(a){if(b===a)throw Oa("cpi");if(L(b))for(var c=a.length=0;c<b.length;c++)a.push(ca(b[c]));else{c=a.$$hashKey;q(a,function(b,c){delete a[c]});for(var d in b)a[d]=ca(b[d]);Wb(a,c)}}else(a=b)&&(L(b)?a=ca(b,[]):Ma(b)?a=new Date(b.getTime()):db(b)?a=RegExp(b.source):X(b)&&(a=ca(b,{})));return a}function Yb(b,a){a=a||{};for(var c in b)!b.hasOwnProperty(c)||"$"===c.charAt(0)&&"$"===c.charAt(1)||(a[c]=b[c]);return a}function xa(b,a){if(b===a)return!0;if(null===b||null===a)return!1;if(b!==b&&a!==a)return!0;
-var c=typeof b,d;if(c==typeof a&&"object"==c)if(L(b)){if(!L(a))return!1;if((c=b.length)==a.length){for(d=0;d<c;d++)if(!xa(b[d],a[d]))return!1;return!0}}else{if(Ma(b))return Ma(a)&&b.getTime()==a.getTime();if(db(b)&&db(a))return b.toString()==a.toString();if(b&&b.$evalAsync&&b.$watch||a&&a.$evalAsync&&a.$watch||Da(b)||Da(a)||L(a))return!1;c={};for(d in b)if("$"!==d.charAt(0)&&!Q(b[d])){if(!xa(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!c.hasOwnProperty(d)&&"$"!==d.charAt(0)&&a[d]!==s&&!Q(a[d]))return!1;
-return!0}return!1}function Zb(){return U.securityPolicy&&U.securityPolicy.isActive||U.querySelector&&!(!U.querySelector("[ng-csp]")&&!U.querySelector("[data-ng-csp]"))}function fb(b,a){var c=2<arguments.length?ya.call(arguments,2):[];return!Q(a)||a instanceof RegExp?a:c.length?function(){return arguments.length?a.apply(b,c.concat(ya.call(arguments,0))):a.apply(b,c)}:function(){return arguments.length?a.apply(b,arguments):a.call(b)}}function Vc(b,a){var c=a;"string"===typeof b&&"$"===b.charAt(0)?c=
-s:Da(a)?c="$WINDOW":a&&U===a?c="$DOCUMENT":a&&(a.$evalAsync&&a.$watch)&&(c="$SCOPE");return c}function qa(b,a){return"undefined"===typeof b?s:JSON.stringify(b,Vc,a?"  ":null)}function $b(b){return C(b)?JSON.parse(b):b}function Pa(b){"function"===typeof b?b=!0:b&&0!==b.length?(b=J(""+b),b=!("f"==b||"0"==b||"false"==b||"no"==b||"n"==b||"[]"==b)):b=!1;return b}function ia(b){b=y(b).clone();try{b.empty()}catch(a){}var c=y("<div>").append(b).html();try{return 3===b[0].nodeType?J(c):c.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,
-function(a,b){return"<"+J(b)})}catch(d){return J(c)}}function ac(b){try{return decodeURIComponent(b)}catch(a){}}function bc(b){var a={},c,d;q((b||"").split("&"),function(b){b&&(c=b.split("="),d=ac(c[0]),z(d)&&(b=z(c[1])?ac(c[1]):!0,a[d]?L(a[d])?a[d].push(b):a[d]=[a[d],b]:a[d]=b))});return a}function zb(b){var a=[];q(b,function(b,d){L(b)?q(b,function(b){a.push(za(d,!0)+(!0===b?"":"="+za(b,!0)))}):a.push(za(d,!0)+(!0===b?"":"="+za(b,!0)))});return a.length?a.join("&"):""}function gb(b){return za(b,
-!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function za(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,a?"%20":"+")}function Wc(b,a){function c(a){a&&d.push(a)}var d=[b],e,g,f=["ng:app","ng-app","x-ng-app","data-ng-app"],h=/\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;q(f,function(a){f[a]=!0;c(U.getElementById(a));a=a.replace(":","\\:");b.querySelectorAll&&(q(b.querySelectorAll("."+a),c),q(b.querySelectorAll("."+
-a+"\\:"),c),q(b.querySelectorAll("["+a+"]"),c))});q(d,function(a){if(!e){var b=h.exec(" "+a.className+" ");b?(e=a,g=(b[2]||"").replace(/\s+/g,",")):q(a.attributes,function(b){!e&&f[b.name]&&(e=a,g=b.value)})}});e&&a(e,g?[g]:[])}function cc(b,a){var c=function(){b=y(b);if(b.injector()){var c=b[0]===U?"document":ia(b);throw Oa("btstrpd",c);}a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);a.unshift("ng");c=dc(a);c.invoke(["$rootScope","$rootElement","$compile","$injector","$animate",
-function(a,b,c,d,e){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},d=/^NG_DEFER_BOOTSTRAP!/;if(P&&!d.test(P.name))return c();P.name=P.name.replace(d,"");Qa.resumeBootstrap=function(b){q(b,function(b){a.push(b)});c()}}function hb(b,a){a=a||"_";return b.replace(Xc,function(b,d){return(d?a:"")+b.toLowerCase()})}function Ab(b,a,c){if(!b)throw Oa("areq",a||"?",c||"required");return b}function Ra(b,a,c){c&&L(b)&&(b=b[b.length-1]);Ab(Q(b),a,"not a function, got "+(b&&"object"==typeof b?
-b.constructor.name||"Object":typeof b));return b}function Aa(b,a){if("hasOwnProperty"===b)throw Oa("badname",a);}function ec(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,g=a.length,f=0;f<g;f++)d=a[f],b&&(b=(e=b)[d]);return!c&&Q(b)?fb(e,b):b}function Bb(b){var a=b[0];b=b[b.length-1];if(a===b)return y(a);var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return y(c)}function Yc(b){var a=u("$injector"),c=u("ng");b=b.angular||(b.angular={});b.$$minErr=b.$$minErr||u;return b.module||
-(b.module=function(){var b={};return function(e,g,f){if("hasOwnProperty"===e)throw c("badname","module");g&&b.hasOwnProperty(e)&&(b[e]=null);return b[e]||(b[e]=function(){function b(a,d,e){return function(){c[e||"push"]([a,d,arguments]);return n}}if(!g)throw a("nomod",e);var c=[],d=[],l=b("$injector","invoke"),n={_invokeQueue:c,_runBlocks:d,requires:g,name:e,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:b("$provide","value"),constant:b("$provide",
-"constant","unshift"),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),config:l,run:function(a){d.push(a);return this}};f&&l(f);return n}())}}())}function Zc(b){E(b,{bootstrap:cc,copy:ca,extend:E,equals:xa,element:y,forEach:q,injector:dc,noop:w,bind:fb,toJson:qa,fromJson:$b,identity:Ea,isUndefined:H,isDefined:z,isString:C,isFunction:Q,isObject:X,isNumber:yb,isElement:Tc,isArray:L,
-version:$c,isDate:Ma,lowercase:J,uppercase:Fa,callbacks:{counter:0},$$minErr:u,$$csp:Zb});Sa=Yc(P);try{Sa("ngLocale")}catch(a){Sa("ngLocale",[]).provider("$locale",ad)}Sa("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:bd});a.provider("$compile",fc).directive({a:cd,input:gc,textarea:gc,form:dd,script:ed,select:fd,style:gd,option:hd,ngBind:id,ngBindHtml:jd,ngBindTemplate:kd,ngClass:ld,ngClassEven:md,ngClassOdd:nd,ngCloak:od,ngController:pd,ngForm:qd,ngHide:rd,ngIf:sd,ngInclude:td,
-ngInit:ud,ngNonBindable:vd,ngPluralize:wd,ngRepeat:xd,ngShow:yd,ngStyle:zd,ngSwitch:Ad,ngSwitchWhen:Bd,ngSwitchDefault:Cd,ngOptions:Dd,ngTransclude:Ed,ngModel:Fd,ngList:Gd,ngChange:Hd,required:hc,ngRequired:hc,ngValue:Id}).directive({ngInclude:Jd}).directive(Cb).directive(ic);a.provider({$anchorScroll:Kd,$animate:Ld,$browser:Md,$cacheFactory:Nd,$controller:Od,$document:Pd,$exceptionHandler:Qd,$filter:jc,$interpolate:Rd,$interval:Sd,$http:Td,$httpBackend:Ud,$location:Vd,$log:Wd,$parse:Xd,$rootScope:Yd,
-$q:Zd,$sce:$d,$sceDelegate:ae,$sniffer:be,$templateCache:ce,$timeout:de,$window:ee,$$rAF:fe,$$asyncCallback:ge})}])}function Ta(b){return b.replace(he,function(a,b,d,e){return e?d.toUpperCase():d}).replace(ie,"Moz$1")}function Db(b,a,c,d){function e(b){var e=c&&b?[this.filter(b)]:[this],m=a,k,l,n,p,r,A;if(!d||null!=b)for(;e.length;)for(k=e.shift(),l=0,n=k.length;l<n;l++)for(p=y(k[l]),m?p.triggerHandler("$destroy"):m=!m,r=0,p=(A=p.children()).length;r<p;r++)e.push(Ba(A[r]));return g.apply(this,arguments)}
-var g=Ba.fn[b],g=g.$original||g;e.$original=g;Ba.fn[b]=e}function M(b){if(b instanceof M)return b;C(b)&&(b=ba(b));if(!(this instanceof M)){if(C(b)&&"<"!=b.charAt(0))throw Eb("nosel");return new M(b)}if(C(b)){var a=b;b=U;var c;if(c=je.exec(a))b=[b.createElement(c[1])];else{var d=b,e;b=d.createDocumentFragment();c=[];if(Fb.test(a)){d=b.appendChild(d.createElement("div"));e=(ke.exec(a)||["",""])[1].toLowerCase();e=ea[e]||ea._default;d.innerHTML="<div>&#160;</div>"+e[1]+a.replace(le,"<$1></$2>")+e[2];
-d.removeChild(d.firstChild);for(a=e[0];a--;)d=d.lastChild;a=0;for(e=d.childNodes.length;a<e;++a)c.push(d.childNodes[a]);d=b.firstChild;d.textContent=""}else c.push(d.createTextNode(a));b.textContent="";b.innerHTML="";b=c}Gb(this,b);y(U.createDocumentFragment()).append(this)}else Gb(this,b)}function Hb(b){return b.cloneNode(!0)}function Ga(b){kc(b);var a=0;for(b=b.childNodes||[];a<b.length;a++)Ga(b[a])}function lc(b,a,c,d){if(z(d))throw Eb("offargs");var e=la(b,"events");la(b,"handle")&&(H(a)?q(e,
-function(a,c){Ua(b,c,a);delete e[c]}):q(a.split(" "),function(a){H(c)?(Ua(b,a,e[a]),delete e[a]):Na(e[a]||[],c)}))}function kc(b,a){var c=b[ib],d=Va[c];d&&(a?delete Va[c].data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),lc(b)),delete Va[c],b[ib]=s))}function la(b,a,c){var d=b[ib],d=Va[d||-1];if(z(c))d||(b[ib]=d=++me,d=Va[d]={}),d[a]=c;else return d&&d[a]}function mc(b,a,c){var d=la(b,"data"),e=z(c),g=!e&&z(a),f=g&&!X(a);d||f||la(b,"data",d={});if(e)d[a]=c;else if(g){if(f)return d&&d[a];
-E(d,a)}else return d}function Ib(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function jb(b,a){a&&b.setAttribute&&q(a.split(" "),function(a){b.setAttribute("class",ba((" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+ba(a)+" "," ")))})}function kb(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");q(a.split(" "),function(a){a=ba(a);-1===c.indexOf(" "+a+" ")&&
-(c+=a+" ")});b.setAttribute("class",ba(c))}}function Gb(b,a){if(a){a=a.nodeName||!z(a.length)||Da(a)?[a]:a;for(var c=0;c<a.length;c++)b.push(a[c])}}function nc(b,a){return lb(b,"$"+(a||"ngController")+"Controller")}function lb(b,a,c){b=y(b);9==b[0].nodeType&&(b=b.find("html"));for(a=L(a)?a:[a];b.length;){for(var d=b[0],e=0,g=a.length;e<g;e++)if((c=b.data(a[e]))!==s)return c;b=y(d.parentNode||11===d.nodeType&&d.host)}}function oc(b){for(var a=0,c=b.childNodes;a<c.length;a++)Ga(c[a]);for(;b.firstChild;)b.removeChild(b.firstChild)}
-function pc(b,a){var c=mb[a.toLowerCase()];return c&&qc[b.nodeName]&&c}function ne(b,a){var c=function(c,e){c.preventDefault||(c.preventDefault=function(){c.returnValue=!1});c.stopPropagation||(c.stopPropagation=function(){c.cancelBubble=!0});c.target||(c.target=c.srcElement||U);if(H(c.defaultPrevented)){var g=c.preventDefault;c.preventDefault=function(){c.defaultPrevented=!0;g.call(c)};c.defaultPrevented=!1}c.isDefaultPrevented=function(){return c.defaultPrevented||!1===c.returnValue};var f=Yb(a[e||
-c.type]||[]);q(f,function(a){a.call(b,c)});8>=S?(c.preventDefault=null,c.stopPropagation=null,c.isDefaultPrevented=null):(delete c.preventDefault,delete c.stopPropagation,delete c.isDefaultPrevented)};c.elem=b;return c}function Ha(b){var a=typeof b,c;"object"==a&&null!==b?"function"==typeof(c=b.$$hashKey)?c=b.$$hashKey():c===s&&(c=b.$$hashKey=cb()):c=b;return a+":"+c}function Wa(b){q(b,this.put,this)}function rc(b){var a,c;"function"==typeof b?(a=b.$inject)||(a=[],b.length&&(c=b.toString().replace(oe,
-""),c=c.match(pe),q(c[1].split(qe),function(b){b.replace(re,function(b,c,d){a.push(d)})})),b.$inject=a):L(b)?(c=b.length-1,Ra(b[c],"fn"),a=b.slice(0,c)):Ra(b,"fn",!0);return a}function dc(b){function a(a){return function(b,c){if(X(b))q(b,Vb(a));else return a(b,c)}}function c(a,b){Aa(a,"service");if(Q(b)||L(b))b=n.instantiate(b);if(!b.$get)throw Xa("pget",a);return l[a+h]=b}function d(a,b){return c(a,{$get:b})}function e(a){var b=[],c,d,g,h;q(a,function(a){if(!k.get(a)){k.put(a,!0);try{if(C(a))for(c=
-Sa(a),b=b.concat(e(c.requires)).concat(c._runBlocks),d=c._invokeQueue,g=0,h=d.length;g<h;g++){var f=d[g],m=n.get(f[0]);m[f[1]].apply(m,f[2])}else Q(a)?b.push(n.invoke(a)):L(a)?b.push(n.invoke(a)):Ra(a,"module")}catch(l){throw L(a)&&(a=a[a.length-1]),l.message&&(l.stack&&-1==l.stack.indexOf(l.message))&&(l=l.message+"\n"+l.stack),Xa("modulerr",a,l.stack||l.message||l);}}});return b}function g(a,b){function c(d){if(a.hasOwnProperty(d)){if(a[d]===f)throw Xa("cdep",m.join(" <- "));return a[d]}try{return m.unshift(d),
-a[d]=f,a[d]=b(d)}catch(e){throw a[d]===f&&delete a[d],e;}finally{m.shift()}}function d(a,b,e){var g=[],h=rc(a),f,m,k;m=0;for(f=h.length;m<f;m++){k=h[m];if("string"!==typeof k)throw Xa("itkn",k);g.push(e&&e.hasOwnProperty(k)?e[k]:c(k))}a.$inject||(a=a[f]);return a.apply(b,g)}return{invoke:d,instantiate:function(a,b){var c=function(){},e;c.prototype=(L(a)?a[a.length-1]:a).prototype;c=new c;e=d(a,c,b);return X(e)||Q(e)?e:c},get:c,annotate:rc,has:function(b){return l.hasOwnProperty(b+h)||a.hasOwnProperty(b)}}}
-var f={},h="Provider",m=[],k=new Wa,l={$provide:{provider:a(c),factory:a(d),service:a(function(a,b){return d(a,["$injector",function(a){return a.instantiate(b)}])}),value:a(function(a,b){return d(a,aa(b))}),constant:a(function(a,b){Aa(a,"constant");l[a]=b;p[a]=b}),decorator:function(a,b){var c=n.get(a+h),d=c.$get;c.$get=function(){var a=r.invoke(d,c);return r.invoke(b,null,{$delegate:a})}}}},n=l.$injector=g(l,function(){throw Xa("unpr",m.join(" <- "));}),p={},r=p.$injector=g(p,function(a){a=n.get(a+
-h);return r.invoke(a.$get,a)});q(e(b),function(a){r.invoke(a||w)});return r}function Kd(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=null;q(a,function(a){b||"a"!==J(a.nodeName)||(b=a)});return b}function g(){var b=c.hash(),d;b?(d=f.getElementById(b))?d.scrollIntoView():(d=e(f.getElementsByName(b)))?d.scrollIntoView():"top"===b&&a.scrollTo(0,0):a.scrollTo(0,0)}var f=a.document;b&&d.$watch(function(){return c.hash()},
-function(){d.$evalAsync(g)});return g}]}function ge(){this.$get=["$$rAF","$timeout",function(b,a){return b.supported?function(a){return b(a)}:function(b){return a(b,0,!1)}}]}function se(b,a,c,d){function e(a){try{a.apply(null,ya.call(arguments,1))}finally{if(A--,0===A)for(;D.length;)try{D.pop()()}catch(b){c.error(b)}}}function g(a,b){(function T(){q(x,function(a){a()});t=b(T,a)})()}function f(){v=null;N!=h.url()&&(N=h.url(),q(ma,function(a){a(h.url())}))}var h=this,m=a[0],k=b.location,l=b.history,
-n=b.setTimeout,p=b.clearTimeout,r={};h.isMock=!1;var A=0,D=[];h.$$completeOutstandingRequest=e;h.$$incOutstandingRequestCount=function(){A++};h.notifyWhenNoOutstandingRequests=function(a){q(x,function(a){a()});0===A?a():D.push(a)};var x=[],t;h.addPollFn=function(a){H(t)&&g(100,n);x.push(a);return a};var N=k.href,B=a.find("base"),v=null;h.url=function(a,c){k!==b.location&&(k=b.location);l!==b.history&&(l=b.history);if(a){if(N!=a)return N=a,d.history?c?l.replaceState(null,"",a):(l.pushState(null,"",
-a),B.attr("href",B.attr("href"))):(v=a,c?k.replace(a):k.href=a),h}else return v||k.href.replace(/%27/g,"'")};var ma=[],K=!1;h.onUrlChange=function(a){if(!K){if(d.history)y(b).on("popstate",f);if(d.hashchange)y(b).on("hashchange",f);else h.addPollFn(f);K=!0}ma.push(a);return a};h.baseHref=function(){var a=B.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var O={},da="",F=h.baseHref();h.cookies=function(a,b){var d,e,g,h;if(a)b===s?m.cookie=escape(a)+"=;path="+F+";expires=Thu, 01 Jan 1970 00:00:00 GMT":
-C(b)&&(d=(m.cookie=escape(a)+"="+escape(b)+";path="+F).length+1,4096<d&&c.warn("Cookie '"+a+"' possibly not set or overflowed because it was too large ("+d+" > 4096 bytes)!"));else{if(m.cookie!==da)for(da=m.cookie,d=da.split("; "),O={},g=0;g<d.length;g++)e=d[g],h=e.indexOf("="),0<h&&(a=unescape(e.substring(0,h)),O[a]===s&&(O[a]=unescape(e.substring(h+1))));return O}};h.defer=function(a,b){var c;A++;c=n(function(){delete r[c];e(a)},b||0);r[c]=!0;return c};h.defer.cancel=function(a){return r[a]?(delete r[a],
-p(a),e(w),!0):!1}}function Md(){this.$get=["$window","$log","$sniffer","$document",function(b,a,c,d){return new se(b,d,a,c)}]}function Nd(){this.$get=function(){function b(b,d){function e(a){a!=n&&(p?p==a&&(p=a.n):p=a,g(a.n,a.p),g(a,n),n=a,n.n=null)}function g(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(b in a)throw u("$cacheFactory")("iid",b);var f=0,h=E({},d,{id:b}),m={},k=d&&d.capacity||Number.MAX_VALUE,l={},n=null,p=null;return a[b]={put:function(a,b){if(k<Number.MAX_VALUE){var c=l[a]||(l[a]={key:a});
-e(c)}if(!H(b))return a in m||f++,m[a]=b,f>k&&this.remove(p.key),b},get:function(a){if(k<Number.MAX_VALUE){var b=l[a];if(!b)return;e(b)}return m[a]},remove:function(a){if(k<Number.MAX_VALUE){var b=l[a];if(!b)return;b==n&&(n=b.p);b==p&&(p=b.n);g(b.n,b.p);delete l[a]}delete m[a];f--},removeAll:function(){m={};f=0;l={};n=p=null},destroy:function(){l=h=m=null;delete a[b]},info:function(){return E({},h,{size:f})}}}var a={};b.info=function(){var b={};q(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};
-return b}}function ce(){this.$get=["$cacheFactory",function(b){return b("templates")}]}function fc(b,a){var c={},d="Directive",e=/^\s*directive\:\s*([\d\w_\-]+)\s+(.*)$/,g=/(([\d\w_\-]+)(?:\:([^;]+))?;?)/,f=/^(on[a-z]+|formaction)$/;this.directive=function m(a,e){Aa(a,"directive");C(a)?(Ab(e,"directiveFactory"),c.hasOwnProperty(a)||(c[a]=[],b.factory(a+d,["$injector","$exceptionHandler",function(b,d){var e=[];q(c[a],function(c,g){try{var f=b.invoke(c);Q(f)?f={compile:aa(f)}:!f.compile&&f.link&&(f.compile=
-aa(f.link));f.priority=f.priority||0;f.index=g;f.name=f.name||a;f.require=f.require||f.controller&&f.name;f.restrict=f.restrict||"A";e.push(f)}catch(m){d(m)}});return e}])),c[a].push(e)):q(a,Vb(m));return this};this.aHrefSanitizationWhitelist=function(b){return z(b)?(a.aHrefSanitizationWhitelist(b),this):a.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(b){return z(b)?(a.imgSrcSanitizationWhitelist(b),this):a.imgSrcSanitizationWhitelist()};this.$get=["$injector","$interpolate",
-"$exceptionHandler","$http","$templateCache","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(a,b,l,n,p,r,A,D,x,t,N,B){function v(a,b,c,d,e){a instanceof y||(a=y(a));q(a,function(b,c){3==b.nodeType&&b.nodeValue.match(/\S+/)&&(a[c]=y(b).wrap("<span></span>").parent()[0])});var g=K(a,b,a,c,d,e);ma(a,"ng-scope");return function(b,c,d){Ab(b,"scope");var e=c?Ia.clone.call(a):a;q(d,function(a,b){e.data("$"+b+"Controller",a)});d=0;for(var f=e.length;d<f;d++){var m=
-e[d].nodeType;1!==m&&9!==m||e.eq(d).data("$scope",b)}c&&c(e,b);g&&g(b,e,e);return e}}function ma(a,b){try{a.addClass(b)}catch(c){}}function K(a,b,c,d,e,g){function f(a,c,d,e){var g,k,l,r,n,p,A;g=c.length;var I=Array(g);for(n=0;n<g;n++)I[n]=c[n];A=n=0;for(p=m.length;n<p;A++)k=I[A],c=m[n++],g=m[n++],l=y(k),c?(c.scope?(r=a.$new(),l.data("$scope",r)):r=a,(l=c.transclude)||!e&&b?c(g,r,k,d,O(a,l||b)):c(g,r,k,d,e)):g&&g(a,k.childNodes,s,e)}for(var m=[],k,l,r,n,p=0;p<a.length;p++)k=new Jb,l=da(a[p],[],k,
-0===p?d:s,e),(g=l.length?fa(l,a[p],k,b,c,null,[],[],g):null)&&g.scope&&ma(y(a[p]),"ng-scope"),k=g&&g.terminal||!(r=a[p].childNodes)||!r.length?null:K(r,g?g.transclude:b),m.push(g,k),n=n||g||k,g=null;return n?f:null}function O(a,b){return function(c,d,e){var g=!1;c||(c=a.$new(),g=c.$$transcluded=!0);d=b(c,d,e);if(g)d.on("$destroy",fb(c,c.$destroy));return d}}function da(a,b,c,d,f){var m=c.$attr,k;switch(a.nodeType){case 1:T(b,na(Ja(a).toLowerCase()),"E",d,f);var l,r,n;k=a.attributes;for(var p=0,A=
-k&&k.length;p<A;p++){var x=!1,D=!1;l=k[p];if(!S||8<=S||l.specified){r=l.name;n=na(r);W.test(n)&&(r=hb(n.substr(6),"-"));var N=n.replace(/(Start|End)$/,"");n===N+"Start"&&(x=r,D=r.substr(0,r.length-5)+"end",r=r.substr(0,r.length-6));n=na(r.toLowerCase());m[n]=r;c[n]=l=ba(l.value);pc(a,n)&&(c[n]=!0);M(a,b,l,n);T(b,n,"A",d,f,x,D)}}a=a.className;if(C(a)&&""!==a)for(;k=g.exec(a);)n=na(k[2]),T(b,n,"C",d,f)&&(c[n]=ba(k[3])),a=a.substr(k.index+k[0].length);break;case 3:u(b,a.nodeValue);break;case 8:try{if(k=
-e.exec(a.nodeValue))n=na(k[1]),T(b,n,"M",d,f)&&(c[n]=ba(k[2]))}catch(t){}}b.sort(H);return b}function F(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ja("uterdir",b,c);1==a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return y(d)}function R(a,b,c){return function(d,e,g,f,k){e=F(e[0],b,c);return a(d,e,g,f,k)}}function fa(a,c,d,e,g,f,m,n,p){function x(a,b,c,d){if(a){c&&(a=R(a,c,d));a.require=G.require;a.directiveName=
-u;if(O===G||G.$$isolateScope)a=tc(a,{isolateScope:!0});m.push(a)}if(b){c&&(b=R(b,c,d));b.require=G.require;b.directiveName=u;if(O===G||G.$$isolateScope)b=tc(b,{isolateScope:!0});n.push(b)}}function D(a,b,c,d){var e,g="data",f=!1;if(C(b)){for(;"^"==(e=b.charAt(0))||"?"==e;)b=b.substr(1),"^"==e&&(g="inheritedData"),f=f||"?"==e;e=null;d&&"data"===g&&(e=d[b]);e=e||c[g]("$"+b+"Controller");if(!e&&!f)throw ja("ctreq",b,a);}else L(b)&&(e=[],q(b,function(b){e.push(D(a,b,c,d))}));return e}function N(a,e,g,
-f,p){function x(a,b){var c;2>arguments.length&&(b=a,a=s);E&&(c=da);return p(a,b,c)}var t,I,v,B,R,F,da={},nb;t=c===g?d:Yb(d,new Jb(y(g),d.$attr));I=t.$$element;if(O){var T=/^\s*([@=&])(\??)\s*(\w*)\s*$/;f=y(g);F=e.$new(!0);!fa||fa!==O&&fa!==O.$$originalDirective?f.data("$isolateScopeNoTemplate",F):f.data("$isolateScope",F);ma(f,"ng-isolate-scope");q(O.scope,function(a,c){var d=a.match(T)||[],g=d[3]||c,f="?"==d[2],d=d[1],m,l,n,p;F.$$isolateBindings[c]=d+g;switch(d){case "@":t.$observe(g,function(a){F[c]=
-a});t.$$observers[g].$$scope=e;t[g]&&(F[c]=b(t[g])(e));break;case "=":if(f&&!t[g])break;l=r(t[g]);p=l.literal?xa:function(a,b){return a===b};n=l.assign||function(){m=F[c]=l(e);throw ja("nonassign",t[g],O.name);};m=F[c]=l(e);F.$watch(function(){var a=l(e);p(a,F[c])||(p(a,m)?n(e,a=F[c]):F[c]=a);return m=a},null,l.literal);break;case "&":l=r(t[g]);F[c]=function(a){return l(e,a)};break;default:throw ja("iscp",O.name,c,a);}})}nb=p&&x;K&&q(K,function(a){var b={$scope:a===O||a.$$isolateScope?F:e,$element:I,
-$attrs:t,$transclude:nb},c;R=a.controller;"@"==R&&(R=t[a.name]);c=A(R,b);da[a.name]=c;E||I.data("$"+a.name+"Controller",c);a.controllerAs&&(b.$scope[a.controllerAs]=c)});f=0;for(v=m.length;f<v;f++)try{B=m[f],B(B.isolateScope?F:e,I,t,B.require&&D(B.directiveName,B.require,I,da),nb)}catch(G){l(G,ia(I))}f=e;O&&(O.template||null===O.templateUrl)&&(f=F);a&&a(f,g.childNodes,s,p);for(f=n.length-1;0<=f;f--)try{B=n[f],B(B.isolateScope?F:e,I,t,B.require&&D(B.directiveName,B.require,I,da),nb)}catch(z){l(z,ia(I))}}
-p=p||{};for(var t=-Number.MAX_VALUE,B,K=p.controllerDirectives,O=p.newIsolateScopeDirective,fa=p.templateDirective,T=p.nonTlbTranscludeDirective,H=!1,E=p.hasElementTranscludeDirective,Z=d.$$element=y(c),G,u,V,Ya=e,P,M=0,S=a.length;M<S;M++){G=a[M];var ra=G.$$start,W=G.$$end;ra&&(Z=F(c,ra,W));V=s;if(t>G.priority)break;if(V=G.scope)B=B||G,G.templateUrl||(J("new/isolated scope",O,G,Z),X(V)&&(O=G));u=G.name;!G.templateUrl&&G.controller&&(V=G.controller,K=K||{},J("'"+u+"' controller",K[u],G,Z),K[u]=G);
-if(V=G.transclude)H=!0,G.$$tlb||(J("transclusion",T,G,Z),T=G),"element"==V?(E=!0,t=G.priority,V=F(c,ra,W),Z=d.$$element=y(U.createComment(" "+u+": "+d[u]+" ")),c=Z[0],ob(g,y(ya.call(V,0)),c),Ya=v(V,e,t,f&&f.name,{nonTlbTranscludeDirective:T})):(V=y(Hb(c)).contents(),Z.empty(),Ya=v(V,e));if(G.template)if(J("template",fa,G,Z),fa=G,V=Q(G.template)?G.template(Z,d):G.template,V=Y(V),G.replace){f=G;V=Fb.test(V)?y(ba(V)):[];c=V[0];if(1!=V.length||1!==c.nodeType)throw ja("tplrt",u,"");ob(g,Z,c);S={$attr:{}};
-V=da(c,[],S);var $=a.splice(M+1,a.length-(M+1));O&&sc(V);a=a.concat(V).concat($);z(d,S);S=a.length}else Z.html(V);if(G.templateUrl)J("template",fa,G,Z),fa=G,G.replace&&(f=G),N=w(a.splice(M,a.length-M),Z,d,g,Ya,m,n,{controllerDirectives:K,newIsolateScopeDirective:O,templateDirective:fa,nonTlbTranscludeDirective:T}),S=a.length;else if(G.compile)try{P=G.compile(Z,d,Ya),Q(P)?x(null,P,ra,W):P&&x(P.pre,P.post,ra,W)}catch(aa){l(aa,ia(Z))}G.terminal&&(N.terminal=!0,t=Math.max(t,G.priority))}N.scope=B&&!0===
-B.scope;N.transclude=H&&Ya;p.hasElementTranscludeDirective=E;return N}function sc(a){for(var b=0,c=a.length;b<c;b++)a[b]=Xb(a[b],{$$isolateScope:!0})}function T(b,e,g,f,k,r,n){if(e===k)return null;k=null;if(c.hasOwnProperty(e)){var p;e=a.get(e+d);for(var A=0,x=e.length;A<x;A++)try{p=e[A],(f===s||f>p.priority)&&-1!=p.restrict.indexOf(g)&&(r&&(p=Xb(p,{$$start:r,$$end:n})),b.push(p),k=p)}catch(D){l(D)}}return k}function z(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;q(a,function(d,e){"$"!=e.charAt(0)&&
-(b[e]&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});q(b,function(b,g){"class"==g?(ma(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==g?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==g.charAt(0)||a.hasOwnProperty(g)||(a[g]=b,d[g]=c[g])})}function w(a,b,c,d,e,g,f,k){var m=[],l,r,A=b[0],x=a.shift(),D=E({},x,{templateUrl:null,transclude:null,replace:null,$$originalDirective:x}),N=Q(x.templateUrl)?x.templateUrl(b,c):x.templateUrl;b.empty();n.get(t.getTrustedResourceUrl(N),
-{cache:p}).success(function(n){var p,t;n=Y(n);if(x.replace){n=Fb.test(n)?y(ba(n)):[];p=n[0];if(1!=n.length||1!==p.nodeType)throw ja("tplrt",x.name,N);n={$attr:{}};ob(d,b,p);var v=da(p,[],n);X(x.scope)&&sc(v);a=v.concat(a);z(c,n)}else p=A,b.html(n);a.unshift(D);l=fa(a,p,c,e,b,x,g,f,k);q(d,function(a,c){a==p&&(d[c]=b[0])});for(r=K(b[0].childNodes,e);m.length;){n=m.shift();t=m.shift();var B=m.shift(),R=m.shift(),v=b[0];if(t!==A){var F=t.className;k.hasElementTranscludeDirective&&x.replace||(v=Hb(p));
-ob(B,y(t),v);ma(y(v),F)}t=l.transclude?O(n,l.transclude):R;l(r,n,v,d,t)}m=null}).error(function(a,b,c,d){throw ja("tpload",d.url);});return function(a,b,c,d,e){m?(m.push(b),m.push(c),m.push(d),m.push(e)):l(r,b,c,d,e)}}function H(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function J(a,b,c,d){if(b)throw ja("multidir",b.name,c.name,a,ia(d));}function u(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:aa(function(a,b){var c=b.parent(),e=c.data("$binding")||
-[];e.push(d);ma(c.data("$binding",e),"ng-binding");a.$watch(d,function(a){b[0].nodeValue=a})})})}function P(a,b){if("srcdoc"==b)return t.HTML;var c=Ja(a);if("xlinkHref"==b||"FORM"==c&&"action"==b||"IMG"!=c&&("src"==b||"ngSrc"==b))return t.RESOURCE_URL}function M(a,c,d,e){var g=b(d,!0);if(g){if("multiple"===e&&"SELECT"===Ja(a))throw ja("selmulti",ia(a));c.push({priority:100,compile:function(){return{pre:function(c,d,m){d=m.$$observers||(m.$$observers={});if(f.test(e))throw ja("nodomevents");if(g=b(m[e],
-!0,P(a,e)))m[e]=g(c),(d[e]||(d[e]=[])).$$inter=!0,(m.$$observers&&m.$$observers[e].$$scope||c).$watch(g,function(a,b){"class"===e&&a!=b?m.$updateClass(a,b):m.$set(e,a)})}}}})}}function ob(a,b,c){var d=b[0],e=b.length,g=d.parentNode,f,m;if(a)for(f=0,m=a.length;f<m;f++)if(a[f]==d){a[f++]=c;m=f+e-1;for(var k=a.length;f<k;f++,m++)m<k?a[f]=a[m]:delete a[f];a.length-=e-1;break}g&&g.replaceChild(c,d);a=U.createDocumentFragment();a.appendChild(d);c[y.expando]=d[y.expando];d=1;for(e=b.length;d<e;d++)g=b[d],
-y(g).remove(),a.appendChild(g),delete b[d];b[0]=c;b.length=1}function tc(a,b){return E(function(){return a.apply(null,arguments)},a,b)}var Jb=function(a,b){this.$$element=a;this.$attr=b||{}};Jb.prototype={$normalize:na,$addClass:function(a){a&&0<a.length&&N.addClass(this.$$element,a)},$removeClass:function(a){a&&0<a.length&&N.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=uc(a,b),d=uc(b,a);0===c.length?N.removeClass(this.$$element,d):0===d.length?N.addClass(this.$$element,c):N.setClass(this.$$element,
-c,d)},$set:function(a,b,c,d){var e=pc(this.$$element[0],a);e&&(this.$$element.prop(a,b),d=e);this[a]=b;d?this.$attr[a]=d:(d=this.$attr[a])||(this.$attr[a]=d=hb(a,"-"));e=Ja(this.$$element);if("A"===e&&"href"===a||"IMG"===e&&"src"===a)this[a]=b=B(b,"src"===a);!1!==c&&(null===b||b===s?this.$$element.removeAttr(d):this.$$element.attr(d,b));(c=this.$$observers)&&q(c[a],function(a){try{a(b)}catch(c){l(c)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers={}),e=d[a]||(d[a]=[]);e.push(b);
-D.$evalAsync(function(){e.$$inter||b(c[a])});return b}};var Z=b.startSymbol(),ra=b.endSymbol(),Y="{{"==Z||"}}"==ra?Ea:function(a){return a.replace(/\{\{/g,Z).replace(/}}/g,ra)},W=/^ngAttr[A-Z]/;return v}]}function na(b){return Ta(b.replace(te,""))}function uc(b,a){var c="",d=b.split(/\s+/),e=a.split(/\s+/),g=0;a:for(;g<d.length;g++){for(var f=d[g],h=0;h<e.length;h++)if(f==e[h])continue a;c+=(0<c.length?" ":"")+f}return c}function Od(){var b={},a=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(a,
-d){Aa(a,"controller");X(a)?E(b,a):b[a]=d};this.$get=["$injector","$window",function(c,d){return function(e,g){var f,h,m;C(e)&&(f=e.match(a),h=f[1],m=f[3],e=b.hasOwnProperty(h)?b[h]:ec(g.$scope,h,!0)||ec(d,h,!0),Ra(e,h,!0));f=c.instantiate(e,g);if(m){if(!g||"object"!=typeof g.$scope)throw u("$controller")("noscp",h||e.name,m);g.$scope[m]=f}return f}}]}function Pd(){this.$get=["$window",function(b){return y(b.document)}]}function Qd(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,
-arguments)}}]}function vc(b){var a={},c,d,e;if(!b)return a;q(b.split("\n"),function(b){e=b.indexOf(":");c=J(ba(b.substr(0,e)));d=ba(b.substr(e+1));c&&(a[c]=a[c]?a[c]+(", "+d):d)});return a}function wc(b){var a=X(b)?b:s;return function(c){a||(a=vc(b));return c?a[J(c)]||null:a}}function xc(b,a,c){if(Q(c))return c(b,a);q(c,function(c){b=c(b,a)});return b}function Td(){var b=/^\s*(\[|\{[^\{])/,a=/[\}\]]\s*$/,c=/^\)\]\}',?\n/,d={"Content-Type":"application/json;charset=utf-8"},e=this.defaults={transformResponse:[function(d){C(d)&&
-(d=d.replace(c,""),b.test(d)&&a.test(d)&&(d=$b(d)));return d}],transformRequest:[function(a){return X(a)&&"[object File]"!==wa.call(a)&&"[object Blob]"!==wa.call(a)?qa(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ca(d),put:ca(d),patch:ca(d)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"},g=this.interceptors=[],f=this.responseInterceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(a,b,c,d,n,p){function r(a){function c(a){var b=
-E({},a,{data:xc(a.data,a.headers,d.transformResponse)});return 200<=a.status&&300>a.status?b:n.reject(b)}var d={method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},g=function(a){function b(a){var c;q(a,function(b,d){Q(b)&&(c=b(),null!=c?a[d]=c:delete a[d])})}var c=e.headers,d=E({},a.headers),g,f,c=E({},c.common,c[J(a.method)]);b(c);b(d);a:for(g in c){a=J(g);for(f in d)if(J(f)===a)continue a;d[g]=c[g]}return d}(a);E(d,a);d.headers=g;d.method=Fa(d.method);(a=Kb(d.url)?
-b.cookies()[d.xsrfCookieName||e.xsrfCookieName]:s)&&(g[d.xsrfHeaderName||e.xsrfHeaderName]=a);var f=[function(a){g=a.headers;var b=xc(a.data,wc(g),a.transformRequest);H(a.data)&&q(g,function(a,b){"content-type"===J(b)&&delete g[b]});H(a.withCredentials)&&!H(e.withCredentials)&&(a.withCredentials=e.withCredentials);return A(a,b,g).then(c,c)},s],h=n.when(d);for(q(t,function(a){(a.request||a.requestError)&&f.unshift(a.request,a.requestError);(a.response||a.responseError)&&f.push(a.response,a.responseError)});f.length;){a=
-f.shift();var k=f.shift(),h=h.then(a,k)}h.success=function(a){h.then(function(b){a(b.data,b.status,b.headers,d)});return h};h.error=function(a){h.then(null,function(b){a(b.data,b.status,b.headers,d)});return h};return h}function A(b,c,g){function f(a,b,c,e){t&&(200<=a&&300>a?t.put(s,[a,b,vc(c),e]):t.remove(s));m(b,a,c,e);d.$$phase||d.$apply()}function m(a,c,d,e){c=Math.max(c,0);(200<=c&&300>c?p.resolve:p.reject)({data:a,status:c,headers:wc(d),config:b,statusText:e})}function k(){var a=eb(r.pendingRequests,
-b);-1!==a&&r.pendingRequests.splice(a,1)}var p=n.defer(),A=p.promise,t,q,s=D(b.url,b.params);r.pendingRequests.push(b);A.then(k,k);(b.cache||e.cache)&&(!1!==b.cache&&"GET"==b.method)&&(t=X(b.cache)?b.cache:X(e.cache)?e.cache:x);if(t)if(q=t.get(s),z(q)){if(q.then)return q.then(k,k),q;L(q)?m(q[1],q[0],ca(q[2]),q[3]):m(q,200,{},"OK")}else t.put(s,A);H(q)&&a(b.method,s,c,f,g,b.timeout,b.withCredentials,b.responseType);return A}function D(a,b){if(!b)return a;var c=[];Sc(b,function(a,b){null===a||H(a)||
-(L(a)||(a=[a]),q(a,function(a){X(a)&&(a=qa(a));c.push(za(b)+"="+za(a))}))});0<c.length&&(a+=(-1==a.indexOf("?")?"?":"&")+c.join("&"));return a}var x=c("$http"),t=[];q(g,function(a){t.unshift(C(a)?p.get(a):p.invoke(a))});q(f,function(a,b){var c=C(a)?p.get(a):p.invoke(a);t.splice(b,0,{response:function(a){return c(n.when(a))},responseError:function(a){return c(n.reject(a))}})});r.pendingRequests=[];(function(a){q(arguments,function(a){r[a]=function(b,c){return r(E(c||{},{method:a,url:b}))}})})("get",
-"delete","head","jsonp");(function(a){q(arguments,function(a){r[a]=function(b,c,d){return r(E(d||{},{method:a,url:b,data:c}))}})})("post","put");r.defaults=e;return r}]}function ue(b){if(8>=S&&(!b.match(/^(get|post|head|put|delete|options)$/i)||!P.XMLHttpRequest))return new P.ActiveXObject("Microsoft.XMLHTTP");if(P.XMLHttpRequest)return new P.XMLHttpRequest;throw u("$httpBackend")("noxhr");}function Ud(){this.$get=["$browser","$window","$document",function(b,a,c){return ve(b,ue,b.defer,a.angular.callbacks,
-c[0])}]}function ve(b,a,c,d,e){function g(a,b,c){var g=e.createElement("script"),f=null;g.type="text/javascript";g.src=a;g.async=!0;f=function(a){Ua(g,"load",f);Ua(g,"error",f);e.body.removeChild(g);g=null;var h=-1,A="unknown";a&&("load"!==a.type||d[b].called||(a={type:"error"}),A=a.type,h="error"===a.type?404:200);c&&c(h,A)};pb(g,"load",f);pb(g,"error",f);8>=S&&(g.onreadystatechange=function(){C(g.readyState)&&/loaded|complete/.test(g.readyState)&&(g.onreadystatechange=null,f({type:"load"}))});e.body.appendChild(g);
-return f}var f=-1;return function(e,m,k,l,n,p,r,A){function D(){t=f;B&&B();v&&v.abort()}function x(a,d,e,g,f){K&&c.cancel(K);B=v=null;0===d&&(d=e?200:"file"==sa(m).protocol?404:0);a(1223===d?204:d,e,g,f||"");b.$$completeOutstandingRequest(w)}var t;b.$$incOutstandingRequestCount();m=m||b.url();if("jsonp"==J(e)){var N="_"+(d.counter++).toString(36);d[N]=function(a){d[N].data=a;d[N].called=!0};var B=g(m.replace("JSON_CALLBACK","angular.callbacks."+N),N,function(a,b){x(l,a,d[N].data,"",b);d[N]=w})}else{var v=
-a(e);v.open(e,m,!0);q(n,function(a,b){z(a)&&v.setRequestHeader(b,a)});v.onreadystatechange=function(){if(v&&4==v.readyState){var a=null,b=null;t!==f&&(a=v.getAllResponseHeaders(),b="response"in v?v.response:v.responseText);x(l,t||v.status,b,a,v.statusText||"")}};r&&(v.withCredentials=!0);if(A)try{v.responseType=A}catch(s){if("json"!==A)throw s;}v.send(k||null)}if(0<p)var K=c(D,p);else p&&p.then&&p.then(D)}}function Rd(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=
-function(b){return b?(a=b,this):a};this.$get=["$parse","$exceptionHandler","$sce",function(c,d,e){function g(g,k,l){for(var n,p,r=0,A=[],D=g.length,x=!1,t=[];r<D;)-1!=(n=g.indexOf(b,r))&&-1!=(p=g.indexOf(a,n+f))?(r!=n&&A.push(g.substring(r,n)),A.push(r=c(x=g.substring(n+f,p))),r.exp=x,r=p+h,x=!0):(r!=D&&A.push(g.substring(r)),r=D);(D=A.length)||(A.push(""),D=1);if(l&&1<A.length)throw yc("noconcat",g);if(!k||x)return t.length=D,r=function(a){try{for(var b=0,c=D,f;b<c;b++){if("function"==typeof(f=A[b]))if(f=
-f(a),f=l?e.getTrusted(l,f):e.valueOf(f),null==f)f="";else switch(typeof f){case "string":break;case "number":f=""+f;break;default:f=qa(f)}t[b]=f}return t.join("")}catch(h){a=yc("interr",g,h.toString()),d(a)}},r.exp=g,r.parts=A,r}var f=b.length,h=a.length;g.startSymbol=function(){return b};g.endSymbol=function(){return a};return g}]}function Sd(){this.$get=["$rootScope","$window","$q",function(b,a,c){function d(d,f,h,m){var k=a.setInterval,l=a.clearInterval,n=c.defer(),p=n.promise,r=0,A=z(m)&&!m;h=
-z(h)?h:0;p.then(null,null,d);p.$$intervalId=k(function(){n.notify(r++);0<h&&r>=h&&(n.resolve(r),l(p.$$intervalId),delete e[p.$$intervalId]);A||b.$apply()},f);e[p.$$intervalId]=n;return p}var e={};d.cancel=function(a){return a&&a.$$intervalId in e?(e[a.$$intervalId].reject("canceled"),clearInterval(a.$$intervalId),delete e[a.$$intervalId],!0):!1};return d}]}function ad(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",
-posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January February March April May June July August September October November December".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),AMPMS:["AM",
-"PM"],medium:"MMM d, y h:mm:ss a","short":"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a"},pluralCat:function(b){return 1===b?"one":"other"}}}}function Lb(b){b=b.split("/");for(var a=b.length;a--;)b[a]=gb(b[a]);return b.join("/")}function zc(b,a,c){b=sa(b,c);a.$$protocol=b.protocol;a.$$host=b.hostname;a.$$port=Y(b.port)||we[b.protocol]||null}function Ac(b,a,c){var d="/"!==b.charAt(0);d&&(b="/"+b);b=
-sa(b,c);a.$$path=decodeURIComponent(d&&"/"===b.pathname.charAt(0)?b.pathname.substring(1):b.pathname);a.$$search=bc(b.search);a.$$hash=decodeURIComponent(b.hash);a.$$path&&"/"!=a.$$path.charAt(0)&&(a.$$path="/"+a.$$path)}function oa(b,a){if(0===a.indexOf(b))return a.substr(b.length)}function Za(b){var a=b.indexOf("#");return-1==a?b:b.substr(0,a)}function Mb(b){return b.substr(0,Za(b).lastIndexOf("/")+1)}function Bc(b,a){this.$$html5=!0;a=a||"";var c=Mb(b);zc(b,this,b);this.$$parse=function(a){var e=
-oa(c,a);if(!C(e))throw Nb("ipthprfx",a,c);Ac(e,this,b);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=zb(this.$$search),b=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(a?"?"+a:"")+b;this.$$absUrl=c+this.$$url.substr(1)};this.$$rewrite=function(d){var e;if((e=oa(b,d))!==s)return d=e,(e=oa(a,e))!==s?c+(oa("/",e)||e):b+d;if((e=oa(c,d))!==s)return c+e;if(c==d+"/")return c}}function Ob(b,a){var c=Mb(b);zc(b,this,b);this.$$parse=function(d){var e=oa(b,
-d)||oa(c,d),e="#"==e.charAt(0)?oa(a,e):this.$$html5?e:"";if(!C(e))throw Nb("ihshprfx",d,a);Ac(e,this,b);d=this.$$path;var g=/^\/[A-Z]:(\/.*)/;0===e.indexOf(b)&&(e=e.replace(b,""));g.exec(e)||(d=(e=g.exec(d))?e[1]:d);this.$$path=d;this.$$compose()};this.$$compose=function(){var c=zb(this.$$search),e=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+(this.$$url?a+this.$$url:"")};this.$$rewrite=function(a){if(Za(b)==Za(a))return a}}function Pb(b,a){this.$$html5=
-!0;Ob.apply(this,arguments);var c=Mb(b);this.$$rewrite=function(d){var e;if(b==Za(d))return d;if(e=oa(c,d))return b+a+e;if(c===d+"/")return c};this.$$compose=function(){var c=zb(this.$$search),e=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+a+this.$$url}}function qb(b){return function(){return this[b]}}function Cc(b,a){return function(c){if(H(c))return this[b];this[b]=a(c);this.$$compose();return this}}function Vd(){var b="",a=!1;this.hashPrefix=function(a){return z(a)?
-(b=a,this):b};this.html5Mode=function(b){return z(b)?(a=b,this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement",function(c,d,e,g){function f(a){c.$broadcast("$locationChangeSuccess",h.absUrl(),a)}var h,m,k=d.baseHref(),l=d.url(),n;a?(n=l.substring(0,l.indexOf("/",l.indexOf("//")+2))+(k||"/"),m=e.history?Bc:Pb):(n=Za(l),m=Ob);h=new m(n,"#"+b);h.$$parse(h.$$rewrite(l));g.on("click",function(a){if(!a.ctrlKey&&!a.metaKey&&2!=a.which){for(var e=y(a.target);"a"!==J(e[0].nodeName);)if(e[0]===
-g[0]||!(e=e.parent())[0])return;var f=e.prop("href");X(f)&&"[object SVGAnimatedString]"===f.toString()&&(f=sa(f.animVal).href);if(m===Pb){var k=e.attr("href")||e.attr("xlink:href");if(0>k.indexOf("://"))if(f="#"+b,"/"==k[0])f=n+f+k;else if("#"==k[0])f=n+f+(h.path()||"/")+k;else{for(var l=h.path().split("/"),k=k.split("/"),p=0;p<k.length;p++)"."!=k[p]&&(".."==k[p]?l.pop():k[p].length&&l.push(k[p]));f=n+f+l.join("/")}}l=h.$$rewrite(f);f&&(!e.attr("target")&&l&&!a.isDefaultPrevented())&&(a.preventDefault(),
-l!=d.url()&&(h.$$parse(l),c.$apply(),P.angular["ff-684208-preventDefault"]=!0))}});h.absUrl()!=l&&d.url(h.absUrl(),!0);d.onUrlChange(function(a){h.absUrl()!=a&&(c.$evalAsync(function(){var b=h.absUrl();h.$$parse(a);c.$broadcast("$locationChangeStart",a,b).defaultPrevented?(h.$$parse(b),d.url(b)):f(b)}),c.$$phase||c.$digest())});var p=0;c.$watch(function(){var a=d.url(),b=h.$$replace;p&&a==h.absUrl()||(p++,c.$evalAsync(function(){c.$broadcast("$locationChangeStart",h.absUrl(),a).defaultPrevented?h.$$parse(a):
-(d.url(h.absUrl(),b),f(a))}));h.$$replace=!1;return p});return h}]}function Wd(){var b=!0,a=this;this.debugEnabled=function(a){return z(a)?(b=a,this):b};this.$get=["$window",function(c){function d(a){a instanceof Error&&(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=c.console||{},e=b[a]||b.log||w;a=!1;try{a=!!e.apply}catch(m){}return a?function(){var a=[];q(arguments,
-function(b){a.push(d(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){b&&c.apply(a,arguments)}}()}}]}function ga(b,a){if("constructor"===b)throw Ca("isecfld",a);return b}function $a(b,a){if(b){if(b.constructor===b)throw Ca("isecfn",a);if(b.document&&b.location&&b.alert&&b.setInterval)throw Ca("isecwindow",a);if(b.children&&(b.nodeName||b.prop&&b.attr&&b.find))throw Ca("isecdom",
-a);}return b}function rb(b,a,c,d,e){e=e||{};a=a.split(".");for(var g,f=0;1<a.length;f++){g=ga(a.shift(),d);var h=b[g];h||(h={},b[g]=h);b=h;b.then&&e.unwrapPromises&&(ta(d),"$$v"in b||function(a){a.then(function(b){a.$$v=b})}(b),b.$$v===s&&(b.$$v={}),b=b.$$v)}g=ga(a.shift(),d);return b[g]=c}function Dc(b,a,c,d,e,g,f){ga(b,g);ga(a,g);ga(c,g);ga(d,g);ga(e,g);return f.unwrapPromises?function(f,m){var k=m&&m.hasOwnProperty(b)?m:f,l;if(null==k)return k;(k=k[b])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=
-a})),k=k.$$v);if(!a)return k;if(null==k)return s;(k=k[a])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!c)return k;if(null==k)return s;(k=k[c])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!d)return k;if(null==k)return s;(k=k[d])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!e)return k;if(null==k)return s;(k=k[e])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);
-return k}:function(g,f){var k=f&&f.hasOwnProperty(b)?f:g;if(null==k)return k;k=k[b];if(!a)return k;if(null==k)return s;k=k[a];if(!c)return k;if(null==k)return s;k=k[c];if(!d)return k;if(null==k)return s;k=k[d];return e?null==k?s:k=k[e]:k}}function xe(b,a){ga(b,a);return function(a,d){return null==a?s:(d&&d.hasOwnProperty(b)?d:a)[b]}}function ye(b,a,c){ga(b,c);ga(a,c);return function(c,e){if(null==c)return s;c=(e&&e.hasOwnProperty(b)?e:c)[b];return null==c?s:c[a]}}function Ec(b,a,c){if(Qb.hasOwnProperty(b))return Qb[b];
-var d=b.split("."),e=d.length,g;if(a.unwrapPromises||1!==e)if(a.unwrapPromises||2!==e)if(a.csp)g=6>e?Dc(d[0],d[1],d[2],d[3],d[4],c,a):function(b,g){var f=0,h;do h=Dc(d[f++],d[f++],d[f++],d[f++],d[f++],c,a)(b,g),g=s,b=h;while(f<e);return h};else{var f="var p;\n";q(d,function(b,d){ga(b,c);f+="if(s == null) return undefined;\ns="+(d?"s":'((k&&k.hasOwnProperty("'+b+'"))?k:s)')+'["'+b+'"];\n'+(a.unwrapPromises?'if (s && s.then) {\n pw("'+c.replace(/(["\r\n])/g,"\\$1")+'");\n if (!("$$v" in s)) {\n p=s;\n p.$$v = undefined;\n p.then(function(v) {p.$$v=v;});\n}\n s=s.$$v\n}\n':
-"")});var f=f+"return s;",h=new Function("s","k","pw",f);h.toString=aa(f);g=a.unwrapPromises?function(a,b){return h(a,b,ta)}:h}else g=ye(d[0],d[1],c);else g=xe(d[0],c);"hasOwnProperty"!==b&&(Qb[b]=g);return g}function Xd(){var b={},a={csp:!1,unwrapPromises:!1,logPromiseWarnings:!0};this.unwrapPromises=function(b){return z(b)?(a.unwrapPromises=!!b,this):a.unwrapPromises};this.logPromiseWarnings=function(b){return z(b)?(a.logPromiseWarnings=b,this):a.logPromiseWarnings};this.$get=["$filter","$sniffer",
-"$log",function(c,d,e){a.csp=d.csp;ta=function(b){a.logPromiseWarnings&&!Fc.hasOwnProperty(b)&&(Fc[b]=!0,e.warn("[$parse] Promise found in the expression `"+b+"`. Automatic unwrapping of promises in Angular expressions is deprecated."))};return function(d){var e;switch(typeof d){case "string":if(b.hasOwnProperty(d))return b[d];e=new Rb(a);e=(new ab(e,c,a)).parse(d,!1);"hasOwnProperty"!==d&&(b[d]=e);return e;case "function":return d;default:return w}}}]}function Zd(){this.$get=["$rootScope","$exceptionHandler",
-function(b,a){return ze(function(a){b.$evalAsync(a)},a)}]}function ze(b,a){function c(a){return a}function d(a){return f(a)}var e=function(){var f=[],k,l;return l={resolve:function(a){if(f){var c=f;f=s;k=g(a);c.length&&b(function(){for(var a,b=0,d=c.length;b<d;b++)a=c[b],k.then(a[0],a[1],a[2])})}},reject:function(a){l.resolve(h(a))},notify:function(a){if(f){var c=f;f.length&&b(function(){for(var b,d=0,e=c.length;d<e;d++)b=c[d],b[2](a)})}},promise:{then:function(b,g,h){var l=e(),D=function(d){try{l.resolve((Q(b)?
-b:c)(d))}catch(e){l.reject(e),a(e)}},x=function(b){try{l.resolve((Q(g)?g:d)(b))}catch(c){l.reject(c),a(c)}},t=function(b){try{l.notify((Q(h)?h:c)(b))}catch(d){a(d)}};f?f.push([D,x,t]):k.then(D,x,t);return l.promise},"catch":function(a){return this.then(null,a)},"finally":function(a){function b(a,c){var d=e();c?d.resolve(a):d.reject(a);return d.promise}function d(e,g){var f=null;try{f=(a||c)()}catch(h){return b(h,!1)}return f&&Q(f.then)?f.then(function(){return b(e,g)},function(a){return b(a,!1)}):
-b(e,g)}return this.then(function(a){return d(a,!0)},function(a){return d(a,!1)})}}}},g=function(a){return a&&Q(a.then)?a:{then:function(c){var d=e();b(function(){d.resolve(c(a))});return d.promise}}},f=function(a){var b=e();b.reject(a);return b.promise},h=function(c){return{then:function(g,f){var h=e();b(function(){try{h.resolve((Q(f)?f:d)(c))}catch(b){h.reject(b),a(b)}});return h.promise}}};return{defer:e,reject:f,when:function(h,k,l,n){var p=e(),r,A=function(b){try{return(Q(k)?k:c)(b)}catch(d){return a(d),
-f(d)}},D=function(b){try{return(Q(l)?l:d)(b)}catch(c){return a(c),f(c)}},x=function(b){try{return(Q(n)?n:c)(b)}catch(d){a(d)}};b(function(){g(h).then(function(a){r||(r=!0,p.resolve(g(a).then(A,D,x)))},function(a){r||(r=!0,p.resolve(D(a)))},function(a){r||p.notify(x(a))})});return p.promise},all:function(a){var b=e(),c=0,d=L(a)?[]:{};q(a,function(a,e){c++;g(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise}}}
-function fe(){this.$get=["$window","$timeout",function(b,a){var c=b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame,d=b.cancelAnimationFrame||b.webkitCancelAnimationFrame||b.mozCancelAnimationFrame||b.webkitCancelRequestAnimationFrame,e=!!c,g=e?function(a){var b=c(a);return function(){d(b)}}:function(b){var c=a(b,16.66,!1);return function(){a.cancel(c)}};g.supported=e;return g}]}function Yd(){var b=10,a=u("$rootScope"),c=null;this.digestTtl=function(a){arguments.length&&
-(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(d,e,g,f){function h(){this.$id=cb();this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this["this"]=this.$root=this;this.$$destroyed=!1;this.$$asyncQueue=[];this.$$postDigestQueue=[];this.$$listeners={};this.$$listenerCount={};this.$$isolateBindings={}}function m(b){if(p.$$phase)throw a("inprog",p.$$phase);p.$$phase=b}function k(a,b){var c=g(a);
-Ra(c,b);return c}function l(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function n(){}h.prototype={constructor:h,$new:function(a){a?(a=new h,a.$root=this.$root,a.$$asyncQueue=this.$$asyncQueue,a.$$postDigestQueue=this.$$postDigestQueue):(this.$$childScopeClass||(this.$$childScopeClass=function(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$id=cb();this.$$childScopeClass=
-null},this.$$childScopeClass.prototype=this),a=new this.$$childScopeClass);a["this"]=a;a.$parent=this;a.$$prevSibling=this.$$childTail;this.$$childHead?this.$$childTail=this.$$childTail.$$nextSibling=a:this.$$childHead=this.$$childTail=a;return a},$watch:function(a,b,d){var e=k(a,"watch"),g=this.$$watchers,f={fn:b,last:n,get:e,exp:a,eq:!!d};c=null;if(!Q(b)){var h=k(b||w,"listener");f.fn=function(a,b,c){h(c)}}if("string"==typeof a&&e.constant){var m=f.fn;f.fn=function(a,b,c){m.call(this,a,b,c);Na(g,
-f)}}g||(g=this.$$watchers=[]);g.unshift(f);return function(){Na(g,f);c=null}},$watchCollection:function(a,b){var c=this,d,e,f,h=1<b.length,k=0,m=g(a),l=[],n={},p=!0,q=0;return this.$watch(function(){d=m(c);var a,b;if(X(d))if(bb(d))for(e!==l&&(e=l,q=e.length=0,k++),a=d.length,q!==a&&(k++,e.length=q=a),b=0;b<a;b++)e[b]!==e[b]&&d[b]!==d[b]||e[b]===d[b]||(k++,e[b]=d[b]);else{e!==n&&(e=n={},q=0,k++);a=0;for(b in d)d.hasOwnProperty(b)&&(a++,e.hasOwnProperty(b)?e[b]!==d[b]&&(k++,e[b]=d[b]):(q++,e[b]=d[b],
-k++));if(q>a)for(b in k++,e)e.hasOwnProperty(b)&&!d.hasOwnProperty(b)&&(q--,delete e[b])}else e!==d&&(e=d,k++);return k},function(){p?(p=!1,b(d,d,c)):b(d,f,c);if(h)if(X(d))if(bb(d)){f=Array(d.length);for(var a=0;a<d.length;a++)f[a]=d[a]}else for(a in f={},d)Gc.call(d,a)&&(f[a]=d[a]);else f=d})},$digest:function(){var d,g,f,h,k=this.$$asyncQueue,l=this.$$postDigestQueue,q,v,s=b,K,O=[],y,F,R;m("$digest");c=null;do{v=!1;for(K=this;k.length;){try{R=k.shift(),R.scope.$eval(R.expression)}catch(z){p.$$phase=
-null,e(z)}c=null}a:do{if(h=K.$$watchers)for(q=h.length;q--;)try{if(d=h[q])if((g=d.get(K))!==(f=d.last)&&!(d.eq?xa(g,f):"number"==typeof g&&"number"==typeof f&&isNaN(g)&&isNaN(f)))v=!0,c=d,d.last=d.eq?ca(g):g,d.fn(g,f===n?g:f,K),5>s&&(y=4-s,O[y]||(O[y]=[]),F=Q(d.exp)?"fn: "+(d.exp.name||d.exp.toString()):d.exp,F+="; newVal: "+qa(g)+"; oldVal: "+qa(f),O[y].push(F));else if(d===c){v=!1;break a}}catch(C){p.$$phase=null,e(C)}if(!(h=K.$$childHead||K!==this&&K.$$nextSibling))for(;K!==this&&!(h=K.$$nextSibling);)K=
-K.$parent}while(K=h);if((v||k.length)&&!s--)throw p.$$phase=null,a("infdig",b,qa(O));}while(v||k.length);for(p.$$phase=null;l.length;)try{l.shift()()}catch(T){e(T)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this!==p&&(q(this.$$listenerCount,fb(null,l,this)),a.$$childHead==this&&(a.$$childHead=this.$$nextSibling),a.$$childTail==this&&(a.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),
-this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=null,this.$$listeners={},this.$$watchers=this.$$asyncQueue=this.$$postDigestQueue=[],this.$destroy=this.$digest=this.$apply=w,this.$on=this.$watch=function(){return w})}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a){p.$$phase||p.$$asyncQueue.length||f.defer(function(){p.$$asyncQueue.length&&p.$digest()});this.$$asyncQueue.push({scope:this,
-expression:a})},$$postDigest:function(a){this.$$postDigestQueue.push(a)},$apply:function(a){try{return m("$apply"),this.$eval(a)}catch(b){e(b)}finally{p.$$phase=null;try{p.$digest()}catch(c){throw e(c),c;}}},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){c[eb(c,b)]=null;l(e,1,a)}},$emit:function(a,b){var c=[],d,g=this,f=!1,h={name:a,
-targetScope:g,stopPropagation:function(){f=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=[h].concat(ya.call(arguments,1)),m,l;do{d=g.$$listeners[a]||c;h.currentScope=g;m=0;for(l=d.length;m<l;m++)if(d[m])try{d[m].apply(null,k)}catch(n){e(n)}else d.splice(m,1),m--,l--;if(f)break;g=g.$parent}while(g);return h},$broadcast:function(a,b){for(var c=this,d=this,g={name:a,targetScope:this,preventDefault:function(){g.defaultPrevented=!0},defaultPrevented:!1},f=[g].concat(ya.call(arguments,
-1)),h,k;c=d;){g.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,f)}catch(m){e(m)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}return g}};var p=new h;return p}]}function bd(){var b=/^\s*(https?|ftp|mailto|tel|file):/,a=/^\s*(https?|ftp|file):|data:image\//;this.aHrefSanitizationWhitelist=function(a){return z(a)?(b=a,this):b};this.imgSrcSanitizationWhitelist=
-function(b){return z(b)?(a=b,this):a};this.$get=function(){return function(c,d){var e=d?a:b,g;if(!S||8<=S)if(g=sa(c).href,""!==g&&!g.match(e))return"unsafe:"+g;return c}}}function Ae(b){if("self"===b)return b;if(C(b)){if(-1<b.indexOf("***"))throw ua("iwcard",b);b=b.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08").replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return RegExp("^"+b+"$")}if(db(b))return RegExp("^"+b.source+"$");throw ua("imatcher");}function Hc(b){var a=[];
-z(b)&&q(b,function(b){a.push(Ae(b))});return a}function ae(){this.SCE_CONTEXTS=ha;var b=["self"],a=[];this.resourceUrlWhitelist=function(a){arguments.length&&(b=Hc(a));return b};this.resourceUrlBlacklist=function(b){arguments.length&&(a=Hc(b));return a};this.$get=["$injector",function(c){function d(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};
-return b}var e=function(a){throw ua("unsafe");};c.has("$sanitize")&&(e=c.get("$sanitize"));var g=d(),f={};f[ha.HTML]=d(g);f[ha.CSS]=d(g);f[ha.URL]=d(g);f[ha.JS]=d(g);f[ha.RESOURCE_URL]=d(f[ha.URL]);return{trustAs:function(a,b){var c=f.hasOwnProperty(a)?f[a]:null;if(!c)throw ua("icontext",a,b);if(null===b||b===s||""===b)return b;if("string"!==typeof b)throw ua("itype",a);return new c(b)},getTrusted:function(c,d){if(null===d||d===s||""===d)return d;var g=f.hasOwnProperty(c)?f[c]:null;if(g&&d instanceof
-g)return d.$$unwrapTrustedValue();if(c===ha.RESOURCE_URL){var g=sa(d.toString()),l,n,p=!1;l=0;for(n=b.length;l<n;l++)if("self"===b[l]?Kb(g):b[l].exec(g.href)){p=!0;break}if(p)for(l=0,n=a.length;l<n;l++)if("self"===a[l]?Kb(g):a[l].exec(g.href)){p=!1;break}if(p)return d;throw ua("insecurl",d.toString());}if(c===ha.HTML)return e(d);throw ua("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function $d(){var b=!0;this.enabled=function(a){arguments.length&&(b=!!a);return b};
-this.$get=["$parse","$sniffer","$sceDelegate",function(a,c,d){if(b&&c.msie&&8>c.msieDocumentMode)throw ua("iequirks");var e=ca(ha);e.isEnabled=function(){return b};e.trustAs=d.trustAs;e.getTrusted=d.getTrusted;e.valueOf=d.valueOf;b||(e.trustAs=e.getTrusted=function(a,b){return b},e.valueOf=Ea);e.parseAs=function(b,c){var d=a(c);return d.literal&&d.constant?d:function(a,c){return e.getTrusted(b,d(a,c))}};var g=e.parseAs,f=e.getTrusted,h=e.trustAs;q(ha,function(a,b){var c=J(b);e[Ta("parse_as_"+c)]=
-function(b){return g(a,b)};e[Ta("get_trusted_"+c)]=function(b){return f(a,b)};e[Ta("trust_as_"+c)]=function(b){return h(a,b)}});return e}]}function be(){this.$get=["$window","$document",function(b,a){var c={},d=Y((/android (\d+)/.exec(J((b.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((b.navigator||{}).userAgent),g=a[0]||{},f=g.documentMode,h,m=/^(Moz|webkit|O|ms)(?=[A-Z])/,k=g.body&&g.body.style,l=!1,n=!1;if(k){for(var p in k)if(l=m.exec(p)){h=l[0];h=h.substr(0,1).toUpperCase()+h.substr(1);
-break}h||(h="WebkitOpacity"in k&&"webkit");l=!!("transition"in k||h+"Transition"in k);n=!!("animation"in k||h+"Animation"in k);!d||l&&n||(l=C(g.body.style.webkitTransition),n=C(g.body.style.webkitAnimation))}return{history:!(!b.history||!b.history.pushState||4>d||e),hashchange:"onhashchange"in b&&(!f||7<f),hasEvent:function(a){if("input"==a&&9==S)return!1;if(H(c[a])){var b=g.createElement("div");c[a]="on"+a in b}return c[a]},csp:Zb(),vendorPrefix:h,transitions:l,animations:n,android:d,msie:S,msieDocumentMode:f}}]}
-function de(){this.$get=["$rootScope","$browser","$q","$exceptionHandler",function(b,a,c,d){function e(e,h,m){var k=c.defer(),l=k.promise,n=z(m)&&!m;h=a.defer(function(){try{k.resolve(e())}catch(a){k.reject(a),d(a)}finally{delete g[l.$$timeoutId]}n||b.$apply()},h);l.$$timeoutId=h;g[h]=k;return l}var g={};e.cancel=function(b){return b&&b.$$timeoutId in g?(g[b.$$timeoutId].reject("canceled"),delete g[b.$$timeoutId],a.defer.cancel(b.$$timeoutId)):!1};return e}]}function sa(b,a){var c=b;S&&(W.setAttribute("href",
-c),c=W.href);W.setAttribute("href",c);return{href:W.href,protocol:W.protocol?W.protocol.replace(/:$/,""):"",host:W.host,search:W.search?W.search.replace(/^\?/,""):"",hash:W.hash?W.hash.replace(/^#/,""):"",hostname:W.hostname,port:W.port,pathname:"/"===W.pathname.charAt(0)?W.pathname:"/"+W.pathname}}function Kb(b){b=C(b)?sa(b):b;return b.protocol===Ic.protocol&&b.host===Ic.host}function ee(){this.$get=aa(P)}function jc(b){function a(d,e){if(X(d)){var g={};q(d,function(b,c){g[c]=a(c,b)});return g}return b.factory(d+
-c,e)}var c="Filter";this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+c)}}];a("currency",Jc);a("date",Kc);a("filter",Be);a("json",Ce);a("limitTo",De);a("lowercase",Ee);a("number",Lc);a("orderBy",Mc);a("uppercase",Fe)}function Be(){return function(b,a,c){if(!L(b))return b;var d=typeof c,e=[];e.check=function(a){for(var b=0;b<e.length;b++)if(!e[b](a))return!1;return!0};"function"!==d&&(c="boolean"===d&&c?function(a,b){return Qa.equals(a,b)}:function(a,b){if(a&&b&&
-"object"===typeof a&&"object"===typeof b){for(var d in a)if("$"!==d.charAt(0)&&Gc.call(a,d)&&c(a[d],b[d]))return!0;return!1}b=(""+b).toLowerCase();return-1<(""+a).toLowerCase().indexOf(b)});var g=function(a,b){if("string"==typeof b&&"!"===b.charAt(0))return!g(a,b.substr(1));switch(typeof a){case "boolean":case "number":case "string":return c(a,b);case "object":switch(typeof b){case "object":return c(a,b);default:for(var d in a)if("$"!==d.charAt(0)&&g(a[d],b))return!0}return!1;case "array":for(d=0;d<
-a.length;d++)if(g(a[d],b))return!0;return!1;default:return!1}};switch(typeof a){case "boolean":case "number":case "string":a={$:a};case "object":for(var f in a)(function(b){"undefined"!=typeof a[b]&&e.push(function(c){return g("$"==b?c:c&&c[b],a[b])})})(f);break;case "function":e.push(a);break;default:return b}d=[];for(f=0;f<b.length;f++){var h=b[f];e.check(h)&&d.push(h)}return d}}function Jc(b){var a=b.NUMBER_FORMATS;return function(b,d){H(d)&&(d=a.CURRENCY_SYM);return Nc(b,a.PATTERNS[1],a.GROUP_SEP,
-a.DECIMAL_SEP,2).replace(/\u00A4/g,d)}}function Lc(b){var a=b.NUMBER_FORMATS;return function(b,d){return Nc(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Nc(b,a,c,d,e){if(null==b||!isFinite(b)||X(b))return"";var g=0>b;b=Math.abs(b);var f=b+"",h="",m=[],k=!1;if(-1!==f.indexOf("e")){var l=f.match(/([\d\.]+)e(-?)(\d+)/);l&&"-"==l[2]&&l[3]>e+1?f="0":(h=f,k=!0)}if(k)0<e&&(-1<b&&1>b)&&(h=b.toFixed(e));else{f=(f.split(Oc)[1]||"").length;H(e)&&(e=Math.min(Math.max(a.minFrac,f),a.maxFrac));f=Math.pow(10,
-e+1);b=Math.floor(b*f+5)/f;b=(""+b).split(Oc);f=b[0];b=b[1]||"";var l=0,n=a.lgSize,p=a.gSize;if(f.length>=n+p)for(l=f.length-n,k=0;k<l;k++)0===(l-k)%p&&0!==k&&(h+=c),h+=f.charAt(k);for(k=l;k<f.length;k++)0===(f.length-k)%n&&0!==k&&(h+=c),h+=f.charAt(k);for(;b.length<e;)b+="0";e&&"0"!==e&&(h+=d+b.substr(0,e))}m.push(g?a.negPre:a.posPre);m.push(h);m.push(g?a.negSuf:a.posSuf);return m.join("")}function Sb(b,a,c){var d="";0>b&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+
-b}function $(b,a,c,d){c=c||0;return function(e){e=e["get"+b]();if(0<c||e>-c)e+=c;0===e&&-12==c&&(e=12);return Sb(e,a,d)}}function sb(b,a){return function(c,d){var e=c["get"+b](),g=Fa(a?"SHORT"+b:b);return d[g][e]}}function Kc(b){function a(a){var b;if(b=a.match(c)){a=new Date(0);var g=0,f=0,h=b[8]?a.setUTCFullYear:a.setFullYear,m=b[8]?a.setUTCHours:a.setHours;b[9]&&(g=Y(b[9]+b[10]),f=Y(b[9]+b[11]));h.call(a,Y(b[1]),Y(b[2])-1,Y(b[3]));g=Y(b[4]||0)-g;f=Y(b[5]||0)-f;h=Y(b[6]||0);b=Math.round(1E3*parseFloat("0."+
-(b[7]||0)));m.call(a,g,f,h,b)}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,e){var g="",f=[],h,m;e=e||"mediumDate";e=b.DATETIME_FORMATS[e]||e;C(c)&&(c=Ge.test(c)?Y(c):a(c));yb(c)&&(c=new Date(c));if(!Ma(c))return c;for(;e;)(m=He.exec(e))?(f=f.concat(ya.call(m,1)),e=f.pop()):(f.push(e),e=null);q(f,function(a){h=Ie[a];g+=h?h(c,b.DATETIME_FORMATS):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Ce(){return function(b){return qa(b,
-!0)}}function De(){return function(b,a){if(!L(b)&&!C(b))return b;a=Infinity===Math.abs(Number(a))?Number(a):Y(a);if(C(b))return a?0<=a?b.slice(0,a):b.slice(a,b.length):"";var c=[],d,e;a>b.length?a=b.length:a<-b.length&&(a=-b.length);0<a?(d=0,e=a):(d=b.length+a,e=b.length);for(;d<e;d++)c.push(b[d]);return c}}function Mc(b){return function(a,c,d){function e(a,b){return Pa(b)?function(b,c){return a(c,b)}:a}function g(a,b){var c=typeof a,d=typeof b;return c==d?("string"==c&&(a=a.toLowerCase(),b=b.toLowerCase()),
-a===b?0:a<b?-1:1):c<d?-1:1}if(!L(a)||!c)return a;c=L(c)?c:[c];c=Uc(c,function(a){var c=!1,d=a||Ea;if(C(a)){if("+"==a.charAt(0)||"-"==a.charAt(0))c="-"==a.charAt(0),a=a.substring(1);d=b(a);if(d.constant){var f=d();return e(function(a,b){return g(a[f],b[f])},c)}}return e(function(a,b){return g(d(a),d(b))},c)});for(var f=[],h=0;h<a.length;h++)f.push(a[h]);return f.sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=c[d](a,b);if(0!==e)return e}return 0},d))}}function va(b){Q(b)&&(b={link:b});b.restrict=
-b.restrict||"AC";return aa(b)}function Pc(b,a,c,d){function e(a,c){c=c?"-"+hb(c,"-"):"";d.removeClass(b,(a?tb:ub)+c);d.addClass(b,(a?ub:tb)+c)}var g=this,f=b.parent().controller("form")||vb,h=0,m=g.$error={},k=[];g.$name=a.name||a.ngForm;g.$dirty=!1;g.$pristine=!0;g.$valid=!0;g.$invalid=!1;f.$addControl(g);b.addClass(Ka);e(!0);g.$addControl=function(a){Aa(a.$name,"input");k.push(a);a.$name&&(g[a.$name]=a)};g.$removeControl=function(a){a.$name&&g[a.$name]===a&&delete g[a.$name];q(m,function(b,c){g.$setValidity(c,
-!0,a)});Na(k,a)};g.$setValidity=function(a,b,c){var d=m[a];if(b)d&&(Na(d,c),d.length||(h--,h||(e(b),g.$valid=!0,g.$invalid=!1),m[a]=!1,e(!0,a),f.$setValidity(a,!0,g)));else{h||e(b);if(d){if(-1!=eb(d,c))return}else m[a]=d=[],h++,e(!1,a),f.$setValidity(a,!1,g);d.push(c);g.$valid=!1;g.$invalid=!0}};g.$setDirty=function(){d.removeClass(b,Ka);d.addClass(b,wb);g.$dirty=!0;g.$pristine=!1;f.$setDirty()};g.$setPristine=function(){d.removeClass(b,wb);d.addClass(b,Ka);g.$dirty=!1;g.$pristine=!0;q(k,function(a){a.$setPristine()})}}
-function pa(b,a,c,d){b.$setValidity(a,c);return c?d:s}function Je(b,a,c){var d=c.prop("validity");X(d)&&b.$parsers.push(function(c){if(b.$error[a]||!(d.badInput||d.customError||d.typeMismatch)||d.valueMissing)return c;b.$setValidity(a,!1)})}function xb(b,a,c,d,e,g){var f=a.prop("validity"),h=a[0].placeholder,m={};if(!e.android){var k=!1;a.on("compositionstart",function(a){k=!0});a.on("compositionend",function(){k=!1;l()})}var l=function(e){if(!k){var g=a.val();if(S&&"input"===(e||m).type&&a[0].placeholder!==
-h)h=a[0].placeholder;else if(Pa(c.ngTrim||"T")&&(g=ba(g)),d.$viewValue!==g||f&&""===g&&!f.valueMissing)b.$$phase?d.$setViewValue(g):b.$apply(function(){d.$setViewValue(g)})}};if(e.hasEvent("input"))a.on("input",l);else{var n,p=function(){n||(n=g.defer(function(){l();n=null}))};a.on("keydown",function(a){a=a.keyCode;91===a||(15<a&&19>a||37<=a&&40>=a)||p()});if(e.hasEvent("paste"))a.on("paste cut",p)}a.on("change",l);d.$render=function(){a.val(d.$isEmpty(d.$viewValue)?"":d.$viewValue)};var r=c.ngPattern;
-r&&((e=r.match(/^\/(.*)\/([gim]*)$/))?(r=RegExp(e[1],e[2]),e=function(a){return pa(d,"pattern",d.$isEmpty(a)||r.test(a),a)}):e=function(c){var e=b.$eval(r);if(!e||!e.test)throw u("ngPattern")("noregexp",r,e,ia(a));return pa(d,"pattern",d.$isEmpty(c)||e.test(c),c)},d.$formatters.push(e),d.$parsers.push(e));if(c.ngMinlength){var q=Y(c.ngMinlength);e=function(a){return pa(d,"minlength",d.$isEmpty(a)||a.length>=q,a)};d.$parsers.push(e);d.$formatters.push(e)}if(c.ngMaxlength){var D=Y(c.ngMaxlength);e=
-function(a){return pa(d,"maxlength",d.$isEmpty(a)||a.length<=D,a)};d.$parsers.push(e);d.$formatters.push(e)}}function Tb(b,a){b="ngClass"+b;return["$animate",function(c){function d(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],l=0;l<b.length;l++)if(e==b[l])continue a;c.push(e)}return c}function e(a){if(!L(a)){if(C(a))return a.split(" ");if(X(a)){var b=[];q(a,function(a,c){a&&b.push(c)});return b}}return a}return{restrict:"AC",link:function(g,f,h){function m(a,b){var c=f.data("$classCounts")||
-{},d=[];q(a,function(a){if(0<b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<b)&&d.push(a)});f.data("$classCounts",c);return d.join(" ")}function k(b){if(!0===a||g.$index%2===a){var k=e(b||[]);if(!l){var r=m(k,1);h.$addClass(r)}else if(!xa(b,l)){var q=e(l),r=d(k,q),k=d(q,k),k=m(k,-1),r=m(r,1);0===r.length?c.removeClass(f,k):0===k.length?c.addClass(f,r):c.setClass(f,r,k)}}l=ca(b)}var l;g.$watch(h[b],k,!0);h.$observe("class",function(a){k(g.$eval(h[b]))});"ngClass"!==b&&g.$watch("$index",function(c,d){var f=c&
-1;if(f!==(d&1)){var k=e(g.$eval(h[b]));f===a?(f=m(k,1),h.$addClass(f)):(f=m(k,-1),h.$removeClass(f))}})}}}]}var J=function(b){return C(b)?b.toLowerCase():b},Gc=Object.prototype.hasOwnProperty,Fa=function(b){return C(b)?b.toUpperCase():b},S,y,Ba,ya=[].slice,Ke=[].push,wa=Object.prototype.toString,Oa=u("ng"),Qa=P.angular||(P.angular={}),Sa,Ja,ka=["0","0","0"];S=Y((/msie (\d+)/.exec(J(navigator.userAgent))||[])[1]);isNaN(S)&&(S=Y((/trident\/.*; rv:(\d+)/.exec(J(navigator.userAgent))||[])[1]));w.$inject=
-[];Ea.$inject=[];var ba=function(){return String.prototype.trim?function(b){return C(b)?b.trim():b}:function(b){return C(b)?b.replace(/^\s\s*/,"").replace(/\s\s*$/,""):b}}();Ja=9>S?function(b){b=b.nodeName?b:b[0];return b.scopeName&&"HTML"!=b.scopeName?Fa(b.scopeName+":"+b.nodeName):b.nodeName}:function(b){return b.nodeName?b.nodeName:b[0].nodeName};var Xc=/[A-Z]/g,$c={full:"1.2.17-build.178+sha.2406084",major:1,minor:2,dot:17,codeName:"snapshot"},Va=M.cache={},ib=M.expando="ng-"+(new Date).getTime(),
-me=1,pb=P.document.addEventListener?function(b,a,c){b.addEventListener(a,c,!1)}:function(b,a,c){b.attachEvent("on"+a,c)},Ua=P.document.removeEventListener?function(b,a,c){b.removeEventListener(a,c,!1)}:function(b,a,c){b.detachEvent("on"+a,c)};M._data=function(b){return this.cache[b[this.expando]]||{}};var he=/([\:\-\_]+(.))/g,ie=/^moz([A-Z])/,Eb=u("jqLite"),je=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,Fb=/<|&#?\w+;/,ke=/<([\w:]+)/,le=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ea=
-{option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ea.optgroup=ea.option;ea.tbody=ea.tfoot=ea.colgroup=ea.caption=ea.thead;ea.th=ea.td;var Ia=M.prototype={ready:function(b){function a(){c||(c=!0,b())}var c=!1;"complete"===U.readyState?setTimeout(a):(this.on("DOMContentLoaded",a),M(P).on("load",a))},toString:function(){var b=
-[];q(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return 0<=b?y(this[b]):y(this[this.length+b])},length:0,push:Ke,sort:[].sort,splice:[].splice},mb={};q("multiple selected checked disabled readOnly required open".split(" "),function(b){mb[J(b)]=b});var qc={};q("input select option textarea button form details".split(" "),function(b){qc[Fa(b)]=!0});q({data:mc,inheritedData:lb,scope:function(b){return y(b).data("$scope")||lb(b.parentNode||b,["$isolateScope","$scope"])},
-isolateScope:function(b){return y(b).data("$isolateScope")||y(b).data("$isolateScopeNoTemplate")},controller:nc,injector:function(b){return lb(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:Ib,css:function(b,a,c){a=Ta(a);if(z(c))b.style[a]=c;else{var d;8>=S&&(d=b.currentStyle&&b.currentStyle[a],""===d&&(d="auto"));d=d||b.style[a];8>=S&&(d=""===d?s:d);return d}},attr:function(b,a,c){var d=J(a);if(mb[d])if(z(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));
-else return b[a]||(b.attributes.getNamedItem(a)||w).specified?d:s;else if(z(c))b.setAttribute(a,c);else if(b.getAttribute)return b=b.getAttribute(a,2),null===b?s:b},prop:function(b,a,c){if(z(c))b[a]=c;else return b[a]},text:function(){function b(b,d){var e=a[b.nodeType];if(H(d))return e?b[e]:"";b[e]=d}var a=[];9>S?(a[1]="innerText",a[3]="nodeValue"):a[1]=a[3]="textContent";b.$dv="";return b}(),val:function(b,a){if(H(a)){if("SELECT"===Ja(b)&&b.multiple){var c=[];q(b.options,function(a){a.selected&&
-c.push(a.value||a.text)});return 0===c.length?null:c}return b.value}b.value=a},html:function(b,a){if(H(a))return b.innerHTML;for(var c=0,d=b.childNodes;c<d.length;c++)Ga(d[c]);b.innerHTML=a},empty:oc},function(b,a){M.prototype[a]=function(a,d){var e,g;if(b!==oc&&(2==b.length&&b!==Ib&&b!==nc?a:d)===s){if(X(a)){for(e=0;e<this.length;e++)if(b===mc)b(this[e],a);else for(g in a)b(this[e],g,a[g]);return this}e=b.$dv;g=e===s?Math.min(this.length,1):this.length;for(var f=0;f<g;f++){var h=b(this[f],a,d);e=
-e?e+h:h}return e}for(e=0;e<this.length;e++)b(this[e],a,d);return this}});q({removeData:kc,dealoc:Ga,on:function a(c,d,e,g){if(z(g))throw Eb("onargs");var f=la(c,"events"),h=la(c,"handle");f||la(c,"events",f={});h||la(c,"handle",h=ne(c,f));q(d.split(" "),function(d){var g=f[d];if(!g){if("mouseenter"==d||"mouseleave"==d){var l=U.body.contains||U.body.compareDocumentPosition?function(a,c){var d=9===a.nodeType?a.documentElement:a,e=c&&c.parentNode;return a===e||!!(e&&1===e.nodeType&&(d.contains?d.contains(e):
-a.compareDocumentPosition&&a.compareDocumentPosition(e)&16))}:function(a,c){if(c)for(;c=c.parentNode;)if(c===a)return!0;return!1};f[d]=[];a(c,{mouseleave:"mouseout",mouseenter:"mouseover"}[d],function(a){var c=a.relatedTarget;c&&(c===this||l(this,c))||h(a,d)})}else pb(c,d,h),f[d]=[];g=f[d]}g.push(e)})},off:lc,one:function(a,c,d){a=y(a);a.on(c,function g(){a.off(c,d);a.off(c,g)});a.on(c,d)},replaceWith:function(a,c){var d,e=a.parentNode;Ga(a);q(new M(c),function(c){d?e.insertBefore(c,d.nextSibling):
-e.replaceChild(c,a);d=c})},children:function(a){var c=[];q(a.childNodes,function(a){1===a.nodeType&&c.push(a)});return c},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,c){q(new M(c),function(c){1!==a.nodeType&&11!==a.nodeType||a.appendChild(c)})},prepend:function(a,c){if(1===a.nodeType){var d=a.firstChild;q(new M(c),function(c){a.insertBefore(c,d)})}},wrap:function(a,c){c=y(c)[0];var d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:function(a){Ga(a);
-var c=a.parentNode;c&&c.removeChild(a)},after:function(a,c){var d=a,e=a.parentNode;q(new M(c),function(a){e.insertBefore(a,d.nextSibling);d=a})},addClass:kb,removeClass:jb,toggleClass:function(a,c,d){c&&q(c.split(" "),function(c){var g=d;H(g)&&(g=!Ib(a,c));(g?kb:jb)(a,c)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){if(a.nextElementSibling)return a.nextElementSibling;for(a=a.nextSibling;null!=a&&1!==a.nodeType;)a=a.nextSibling;return a},find:function(a,c){return a.getElementsByTagName?
-a.getElementsByTagName(c):[]},clone:Hb,triggerHandler:function(a,c,d){c=(la(a,"events")||{})[c];d=d||[];var e=[{preventDefault:w,stopPropagation:w}];q(c,function(c){c.apply(a,e.concat(d))})}},function(a,c){M.prototype[c]=function(c,e,g){for(var f,h=0;h<this.length;h++)H(f)?(f=a(this[h],c,e,g),z(f)&&(f=y(f))):Gb(f,a(this[h],c,e,g));return z(f)?f:this};M.prototype.bind=M.prototype.on;M.prototype.unbind=M.prototype.off});Wa.prototype={put:function(a,c){this[Ha(a)]=c},get:function(a){return this[Ha(a)]},
-remove:function(a){var c=this[a=Ha(a)];delete this[a];return c}};var pe=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,qe=/,/,re=/^\s*(_?)(\S+?)\1\s*$/,oe=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Xa=u("$injector"),Le=u("$animate"),Ld=["$provide",function(a){this.$$selectors={};this.register=function(c,d){var e=c+"-animation";if(c&&"."!=c.charAt(0))throw Le("notcsel",c);this.$$selectors[c.substr(1)]=e;a.factory(e,d)};this.classNameFilter=function(a){1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?
-a:null);return this.$$classNameFilter};this.$get=["$timeout","$$asyncCallback",function(a,d){return{enter:function(a,c,f,h){f?f.after(a):(c&&c[0]||(c=f.parent()),c.append(a));h&&d(h)},leave:function(a,c){a.remove();c&&d(c)},move:function(a,c,d,h){this.enter(a,c,d,h)},addClass:function(a,c,f){c=C(c)?c:L(c)?c.join(" "):"";q(a,function(a){kb(a,c)});f&&d(f)},removeClass:function(a,c,f){c=C(c)?c:L(c)?c.join(" "):"";q(a,function(a){jb(a,c)});f&&d(f)},setClass:function(a,c,f,h){q(a,function(a){kb(a,c);jb(a,
-f)});h&&d(h)},enabled:w}}]}],ja=u("$compile");fc.$inject=["$provide","$$sanitizeUriProvider"];var te=/^(x[\:\-_]|data[\:\-_])/i,yc=u("$interpolate"),Me=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,we={http:80,https:443,ftp:21},Nb=u("$location");Pb.prototype=Ob.prototype=Bc.prototype={$$html5:!1,$$replace:!1,absUrl:qb("$$absUrl"),url:function(a,c){if(H(a))return this.$$url;var d=Me.exec(a);d[1]&&this.path(decodeURIComponent(d[1]));(d[2]||d[1])&&this.search(d[3]||"");this.hash(d[5]||"",c);return this},protocol:qb("$$protocol"),
-host:qb("$$host"),port:qb("$$port"),path:Cc("$$path",function(a){return"/"==a.charAt(0)?a:"/"+a}),search:function(a,c){switch(arguments.length){case 0:return this.$$search;case 1:if(C(a))this.$$search=bc(a);else if(X(a))this.$$search=a;else throw Nb("isrcharg");break;default:H(c)||null===c?delete this.$$search[a]:this.$$search[a]=c}this.$$compose();return this},hash:Cc("$$hash",Ea),replace:function(){this.$$replace=!0;return this}};var Ca=u("$parse"),Fc={},ta,La={"null":function(){return null},"true":function(){return!0},
-"false":function(){return!1},undefined:w,"+":function(a,c,d,e){d=d(a,c);e=e(a,c);return z(d)?z(e)?d+e:d:z(e)?e:s},"-":function(a,c,d,e){d=d(a,c);e=e(a,c);return(z(d)?d:0)-(z(e)?e:0)},"*":function(a,c,d,e){return d(a,c)*e(a,c)},"/":function(a,c,d,e){return d(a,c)/e(a,c)},"%":function(a,c,d,e){return d(a,c)%e(a,c)},"^":function(a,c,d,e){return d(a,c)^e(a,c)},"=":w,"===":function(a,c,d,e){return d(a,c)===e(a,c)},"!==":function(a,c,d,e){return d(a,c)!==e(a,c)},"==":function(a,c,d,e){return d(a,c)==e(a,
-c)},"!=":function(a,c,d,e){return d(a,c)!=e(a,c)},"<":function(a,c,d,e){return d(a,c)<e(a,c)},">":function(a,c,d,e){return d(a,c)>e(a,c)},"<=":function(a,c,d,e){return d(a,c)<=e(a,c)},">=":function(a,c,d,e){return d(a,c)>=e(a,c)},"&&":function(a,c,d,e){return d(a,c)&&e(a,c)},"||":function(a,c,d,e){return d(a,c)||e(a,c)},"&":function(a,c,d,e){return d(a,c)&e(a,c)},"|":function(a,c,d,e){return e(a,c)(a,c,d(a,c))},"!":function(a,c,d){return!d(a,c)}},Ne={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},
-Rb=function(a){this.options=a};Rb.prototype={constructor:Rb,lex:function(a){this.text=a;this.index=0;this.ch=s;this.lastCh=":";this.tokens=[];var c;for(a=[];this.index<this.text.length;){this.ch=this.text.charAt(this.index);if(this.is("\"'"))this.readString(this.ch);else if(this.isNumber(this.ch)||this.is(".")&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(this.ch))this.readIdent(),this.was("{,")&&("{"===a[0]&&(c=this.tokens[this.tokens.length-1]))&&(c.json=-1===c.text.indexOf("."));
-else if(this.is("(){}[].,;:?"))this.tokens.push({index:this.index,text:this.ch,json:this.was(":[,")&&this.is("{[")||this.is("}]:,")}),this.is("{[")&&a.unshift(this.ch),this.is("}]")&&a.shift(),this.index++;else if(this.isWhitespace(this.ch)){this.index++;continue}else{var d=this.ch+this.peek(),e=d+this.peek(2),g=La[this.ch],f=La[d],h=La[e];h?(this.tokens.push({index:this.index,text:e,fn:h}),this.index+=3):f?(this.tokens.push({index:this.index,text:d,fn:f}),this.index+=2):g?(this.tokens.push({index:this.index,
-text:this.ch,fn:g,json:this.was("[,:")&&this.is("+-")}),this.index+=1):this.throwError("Unexpected next character ",this.index,this.index+1)}this.lastCh=this.ch}return this.tokens},is:function(a){return-1!==a.indexOf(this.ch)},was:function(a){return-1!==a.indexOf(this.lastCh)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===
-a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===a||"+"===a||this.isNumber(a)},throwError:function(a,c,d){d=d||this.index;c=z(c)?"s "+c+"-"+this.index+" ["+this.text.substring(c,d)+"]":" "+d;throw Ca("lexerr",a,c,this.text);},readNumber:function(){for(var a="",c=this.index;this.index<this.text.length;){var d=J(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var e=this.peek();if("e"==d&&this.isExpOperator(e))a+=
-d;else if(this.isExpOperator(d)&&e&&this.isNumber(e)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||e&&this.isNumber(e)||"e"!=a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}a*=1;this.tokens.push({index:c,text:a,json:!0,fn:function(){return a}})},readIdent:function(){for(var a=this,c="",d=this.index,e,g,f,h;this.index<this.text.length;){h=this.text.charAt(this.index);if("."===h||this.isIdent(h)||this.isNumber(h))"."===h&&(e=this.index),c+=h;else break;
-this.index++}if(e)for(g=this.index;g<this.text.length;){h=this.text.charAt(g);if("("===h){f=c.substr(e-d+1);c=c.substr(0,e-d);this.index=g;break}if(this.isWhitespace(h))g++;else break}d={index:d,text:c};if(La.hasOwnProperty(c))d.fn=La[c],d.json=La[c];else{var m=Ec(c,this.options,this.text);d.fn=E(function(a,c){return m(a,c)},{assign:function(d,e){return rb(d,c,e,a.text,a.options)}})}this.tokens.push(d);f&&(this.tokens.push({index:e,text:".",json:!1}),this.tokens.push({index:e+1,text:f,json:!1}))},
-readString:function(a){var c=this.index;this.index++;for(var d="",e=a,g=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),e=e+f;if(g)"u"===f?(f=this.text.substring(this.index+1,this.index+5),f.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+f+"]"),this.index+=4,d+=String.fromCharCode(parseInt(f,16))):d=(g=Ne[f])?d+g:d+f,g=!1;else if("\\"===f)g=!0;else{if(f===a){this.index++;this.tokens.push({index:c,text:e,string:d,json:!0,fn:function(){return d}});return}d+=
-f}this.index++}this.throwError("Unterminated quote",c)}};var ab=function(a,c,d){this.lexer=a;this.$filter=c;this.options=d};ab.ZERO=E(function(){return 0},{constant:!0});ab.prototype={constructor:ab,parse:function(a,c){this.text=a;this.json=c;this.tokens=this.lexer.lex(a);c&&(this.assignment=this.logicalOR,this.functionCall=this.fieldAccess=this.objectIndex=this.filterChain=function(){this.throwError("is not valid json",{text:a,index:0})});var d=c?this.primary():this.statements();0!==this.tokens.length&&
-this.throwError("is an unexpected token",this.tokens[0]);d.literal=!!d.literal;d.constant=!!d.constant;return d},primary:function(){var a;if(this.expect("("))a=this.filterChain(),this.consume(")");else if(this.expect("["))a=this.arrayDeclaration();else if(this.expect("{"))a=this.object();else{var c=this.expect();(a=c.fn)||this.throwError("not a primary expression",c);c.json&&(a.constant=!0,a.literal=!0)}for(var d;c=this.expect("(","[",".");)"("===c.text?(a=this.functionCall(a,d),d=null):"["===c.text?
-(d=a,a=this.objectIndex(a)):"."===c.text?(d=a,a=this.fieldAccess(a)):this.throwError("IMPOSSIBLE");return a},throwError:function(a,c){throw Ca("syntax",c.text,a,c.index+1,this.text,this.text.substring(c.index));},peekToken:function(){if(0===this.tokens.length)throw Ca("ueoe",this.text);return this.tokens[0]},peek:function(a,c,d,e){if(0<this.tokens.length){var g=this.tokens[0],f=g.text;if(f===a||f===c||f===d||f===e||!(a||c||d||e))return g}return!1},expect:function(a,c,d,e){return(a=this.peek(a,c,d,
-e))?(this.json&&!a.json&&this.throwError("is not valid json",a),this.tokens.shift(),a):!1},consume:function(a){this.expect(a)||this.throwError("is unexpected, expecting ["+a+"]",this.peek())},unaryFn:function(a,c){return E(function(d,e){return a(d,e,c)},{constant:c.constant})},ternaryFn:function(a,c,d){return E(function(e,g){return a(e,g)?c(e,g):d(e,g)},{constant:a.constant&&c.constant&&d.constant})},binaryFn:function(a,c,d){return E(function(e,g){return c(e,g,a,d)},{constant:a.constant&&d.constant})},
-statements:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.filterChain()),!this.expect(";"))return 1===a.length?a[0]:function(c,d){for(var e,g=0;g<a.length;g++){var f=a[g];f&&(e=f(c,d))}return e}},filterChain:function(){for(var a=this.expression(),c;;)if(c=this.expect("|"))a=this.binaryFn(a,c.fn,this.filter());else return a},filter:function(){for(var a=this.expect(),c=this.$filter(a.text),d=[];;)if(a=this.expect(":"))d.push(this.expression());else{var e=
-function(a,e,h){h=[h];for(var m=0;m<d.length;m++)h.push(d[m](a,e));return c.apply(a,h)};return function(){return e}}},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary(),c,d;return(d=this.expect("="))?(a.assign||this.throwError("implies assignment but ["+this.text.substring(0,d.index)+"] can not be assigned to",d),c=this.ternary(),function(d,g){return a.assign(d,c(d,g),g)}):a},ternary:function(){var a=this.logicalOR(),c,d;if(this.expect("?")){c=this.ternary();
-if(d=this.expect(":"))return this.ternaryFn(a,c,this.ternary());this.throwError("expected :",d)}else return a},logicalOR:function(){for(var a=this.logicalAND(),c;;)if(c=this.expect("||"))a=this.binaryFn(a,c.fn,this.logicalAND());else return a},logicalAND:function(){var a=this.equality(),c;if(c=this.expect("&&"))a=this.binaryFn(a,c.fn,this.logicalAND());return a},equality:function(){var a=this.relational(),c;if(c=this.expect("==","!=","===","!=="))a=this.binaryFn(a,c.fn,this.equality());return a},
-relational:function(){var a=this.additive(),c;if(c=this.expect("<",">","<=",">="))a=this.binaryFn(a,c.fn,this.relational());return a},additive:function(){for(var a=this.multiplicative(),c;c=this.expect("+","-");)a=this.binaryFn(a,c.fn,this.multiplicative());return a},multiplicative:function(){for(var a=this.unary(),c;c=this.expect("*","/","%");)a=this.binaryFn(a,c.fn,this.unary());return a},unary:function(){var a;return this.expect("+")?this.primary():(a=this.expect("-"))?this.binaryFn(ab.ZERO,a.fn,
-this.unary()):(a=this.expect("!"))?this.unaryFn(a.fn,this.unary()):this.primary()},fieldAccess:function(a){var c=this,d=this.expect().text,e=Ec(d,this.options,this.text);return E(function(c,d,h){return e(h||a(c,d))},{assign:function(e,f,h){return rb(a(e,h),d,f,c.text,c.options)}})},objectIndex:function(a){var c=this,d=this.expression();this.consume("]");return E(function(e,g){var f=a(e,g),h=d(e,g),m;if(!f)return s;(f=$a(f[h],c.text))&&(f.then&&c.options.unwrapPromises)&&(m=f,"$$v"in f||(m.$$v=s,m.then(function(a){m.$$v=
-a})),f=f.$$v);return f},{assign:function(e,g,f){var h=d(e,f);return $a(a(e,f),c.text)[h]=g}})},functionCall:function(a,c){var d=[];if(")"!==this.peekToken().text){do d.push(this.expression());while(this.expect(","))}this.consume(")");var e=this;return function(g,f){for(var h=[],m=c?c(g,f):g,k=0;k<d.length;k++)h.push(d[k](g,f));k=a(g,f,m)||w;$a(m,e.text);$a(k,e.text);h=k.apply?k.apply(m,h):k(h[0],h[1],h[2],h[3],h[4]);return $a(h,e.text)}},arrayDeclaration:function(){var a=[],c=!0;if("]"!==this.peekToken().text){do{if(this.peek("]"))break;
-var d=this.expression();a.push(d);d.constant||(c=!1)}while(this.expect(","))}this.consume("]");return E(function(c,d){for(var f=[],h=0;h<a.length;h++)f.push(a[h](c,d));return f},{literal:!0,constant:c})},object:function(){var a=[],c=!0;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;var d=this.expect(),d=d.string||d.text;this.consume(":");var e=this.expression();a.push({key:d,value:e});e.constant||(c=!1)}while(this.expect(","))}this.consume("}");return E(function(c,d){for(var e={},m=0;m<
-a.length;m++){var k=a[m];e[k.key]=k.value(c,d)}return e},{literal:!0,constant:c})}};var Qb={},ua=u("$sce"),ha={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},W=U.createElement("a"),Ic=sa(P.location.href,!0);jc.$inject=["$provide"];Jc.$inject=["$locale"];Lc.$inject=["$locale"];var Oc=".",Ie={yyyy:$("FullYear",4),yy:$("FullYear",2,0,!0),y:$("FullYear",1),MMMM:sb("Month"),MMM:sb("Month",!0),MM:$("Month",2,1),M:$("Month",1,1),dd:$("Date",2),d:$("Date",1),HH:$("Hours",2),H:$("Hours",
-1),hh:$("Hours",2,-12),h:$("Hours",1,-12),mm:$("Minutes",2),m:$("Minutes",1),ss:$("Seconds",2),s:$("Seconds",1),sss:$("Milliseconds",3),EEEE:sb("Day"),EEE:sb("Day",!0),a:function(a,c){return 12>a.getHours()?c.AMPMS[0]:c.AMPMS[1]},Z:function(a){a=-1*a.getTimezoneOffset();return a=(0<=a?"+":"")+(Sb(Math[0<a?"floor":"ceil"](a/60),2)+Sb(Math.abs(a%60),2))}},He=/((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,Ge=/^\-?\d+$/;Kc.$inject=["$locale"];var Ee=aa(J),Fe=aa(Fa);Mc.$inject=
-["$parse"];var cd=aa({restrict:"E",compile:function(a,c){8>=S&&(c.href||c.name||c.$set("href",""),a.append(U.createComment("IE fix")));if(!c.href&&!c.xlinkHref&&!c.name)return function(a,c){var g="[object SVGAnimatedString]"===wa.call(c.prop("href"))?"xlink:href":"href";c.on("click",function(a){c.attr(g)||a.preventDefault()})}}}),Cb={};q(mb,function(a,c){if("multiple"!=a){var d=na("ng-"+c);Cb[d]=function(){return{priority:100,link:function(a,g,f){a.$watch(f[d],function(a){f.$set(c,!!a)})}}}}});q(["src",
-"srcset","href"],function(a){var c=na("ng-"+a);Cb[c]=function(){return{priority:99,link:function(d,e,g){var f=a,h=a;"href"===a&&"[object SVGAnimatedString]"===wa.call(e.prop("href"))&&(h="xlinkHref",g.$attr[h]="xlink:href",f=null);g.$observe(c,function(a){a&&(g.$set(h,a),S&&f&&e.prop(f,g[h]))})}}}});var vb={$addControl:w,$removeControl:w,$setValidity:w,$setDirty:w,$setPristine:w};Pc.$inject=["$element","$attrs","$scope","$animate"];var Qc=function(a){return["$timeout",function(c){return{name:"form",
-restrict:a?"EAC":"E",controller:Pc,compile:function(){return{pre:function(a,e,g,f){if(!g.action){var h=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1};pb(e[0],"submit",h);e.on("$destroy",function(){c(function(){Ua(e[0],"submit",h)},0,!1)})}var m=e.parent().controller("form"),k=g.name||g.ngForm;k&&rb(a,k,f,k);if(m)e.on("$destroy",function(){m.$removeControl(f);k&&rb(a,k,s,k);E(f,vb)})}}}}}]},dd=Qc(),qd=Qc(!0),Oe=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,
-Pe=/^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i,Qe=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Rc={text:xb,number:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);e.$parsers.push(function(a){var c=e.$isEmpty(a);if(c||Qe.test(a))return e.$setValidity("number",!0),""===a?null:c?a:parseFloat(a);e.$setValidity("number",!1);return s});Je(e,"number",c);e.$formatters.push(function(a){return e.$isEmpty(a)?"":""+a});d.min&&(a=function(a){var c=parseFloat(d.min);return pa(e,"min",e.$isEmpty(a)||a>=c,a)},e.$parsers.push(a),
-e.$formatters.push(a));d.max&&(a=function(a){var c=parseFloat(d.max);return pa(e,"max",e.$isEmpty(a)||a<=c,a)},e.$parsers.push(a),e.$formatters.push(a));e.$formatters.push(function(a){return pa(e,"number",e.$isEmpty(a)||yb(a),a)})},url:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);a=function(a){return pa(e,"url",e.$isEmpty(a)||Oe.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},email:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);a=function(a){return pa(e,"email",e.$isEmpty(a)||Pe.test(a),a)};e.$formatters.push(a);
-e.$parsers.push(a)},radio:function(a,c,d,e){H(d.name)&&c.attr("name",cb());c.on("click",function(){c[0].checked&&a.$apply(function(){e.$setViewValue(d.value)})});e.$render=function(){c[0].checked=d.value==e.$viewValue};d.$observe("value",e.$render)},checkbox:function(a,c,d,e){var g=d.ngTrueValue,f=d.ngFalseValue;C(g)||(g=!0);C(f)||(f=!1);c.on("click",function(){a.$apply(function(){e.$setViewValue(c[0].checked)})});e.$render=function(){c[0].checked=e.$viewValue};e.$isEmpty=function(a){return a!==g};
-e.$formatters.push(function(a){return a===g});e.$parsers.push(function(a){return a?g:f})},hidden:w,button:w,submit:w,reset:w,file:w},gc=["$browser","$sniffer",function(a,c){return{restrict:"E",require:"?ngModel",link:function(d,e,g,f){f&&(Rc[J(g.type)]||Rc.text)(d,e,g,f,c,a)}}}],ub="ng-valid",tb="ng-invalid",Ka="ng-pristine",wb="ng-dirty",Re=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate",function(a,c,d,e,g,f){function h(a,c){c=c?"-"+hb(c,"-"):"";f.removeClass(e,(a?tb:ub)+c);
-f.addClass(e,(a?ub:tb)+c)}this.$modelValue=this.$viewValue=Number.NaN;this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$name=d.name;var m=g(d.ngModel),k=m.assign;if(!k)throw u("ngModel")("nonassign",d.ngModel,ia(e));this.$render=w;this.$isEmpty=function(a){return H(a)||""===a||null===a||a!==a};var l=e.inheritedData("$formController")||vb,n=0,p=this.$error={};e.addClass(Ka);h(!0);this.$setValidity=function(a,c){p[a]!==
-!c&&(c?(p[a]&&n--,n||(h(!0),this.$valid=!0,this.$invalid=!1)):(h(!1),this.$invalid=!0,this.$valid=!1,n++),p[a]=!c,h(c,a),l.$setValidity(a,c,this))};this.$setPristine=function(){this.$dirty=!1;this.$pristine=!0;f.removeClass(e,wb);f.addClass(e,Ka)};this.$setViewValue=function(d){this.$viewValue=d;this.$pristine&&(this.$dirty=!0,this.$pristine=!1,f.removeClass(e,Ka),f.addClass(e,wb),l.$setDirty());q(this.$parsers,function(a){d=a(d)});this.$modelValue!==d&&(this.$modelValue=d,k(a,d),q(this.$viewChangeListeners,
-function(a){try{a()}catch(d){c(d)}}))};var r=this;a.$watch(function(){var c=m(a);if(r.$modelValue!==c){var d=r.$formatters,e=d.length;for(r.$modelValue=c;e--;)c=d[e](c);r.$viewValue!==c&&(r.$viewValue=c,r.$render())}return c})}],Fd=function(){return{require:["ngModel","^?form"],controller:Re,link:function(a,c,d,e){var g=e[0],f=e[1]||vb;f.$addControl(g);a.$on("$destroy",function(){f.$removeControl(g)})}}},Hd=aa({require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),
-hc=function(){return{require:"?ngModel",link:function(a,c,d,e){if(e){d.required=!0;var g=function(a){if(d.required&&e.$isEmpty(a))e.$setValidity("required",!1);else return e.$setValidity("required",!0),a};e.$formatters.push(g);e.$parsers.unshift(g);d.$observe("required",function(){g(e.$viewValue)})}}}},Gd=function(){return{require:"ngModel",link:function(a,c,d,e){var g=(a=/\/(.*)\//.exec(d.ngList))&&RegExp(a[1])||d.ngList||",";e.$parsers.push(function(a){if(!H(a)){var c=[];a&&q(a.split(g),function(a){a&&
-c.push(ba(a))});return c}});e.$formatters.push(function(a){return L(a)?a.join(", "):s});e.$isEmpty=function(a){return!a||!a.length}}}},Se=/^(true|false|\d+)$/,Id=function(){return{priority:100,compile:function(a,c){return Se.test(c.ngValue)?function(a,c,g){g.$set("value",a.$eval(g.ngValue))}:function(a,c,g){a.$watch(g.ngValue,function(a){g.$set("value",a)})}}}},id=va(function(a,c,d){c.addClass("ng-binding").data("$binding",d.ngBind);a.$watch(d.ngBind,function(a){c.text(a==s?"":a)})}),kd=["$interpolate",
-function(a){return function(c,d,e){c=a(d.attr(e.$attr.ngBindTemplate));d.addClass("ng-binding").data("$binding",c);e.$observe("ngBindTemplate",function(a){d.text(a)})}}],jd=["$sce","$parse",function(a,c){return function(d,e,g){e.addClass("ng-binding").data("$binding",g.ngBindHtml);var f=c(g.ngBindHtml);d.$watch(function(){return(f(d)||"").toString()},function(c){e.html(a.getTrustedHtml(f(d))||"")})}}],ld=Tb("",!0),nd=Tb("Odd",0),md=Tb("Even",1),od=va({compile:function(a,c){c.$set("ngCloak",s);a.removeClass("ng-cloak")}}),
-pd=[function(){return{scope:!0,controller:"@",priority:500}}],ic={};q("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var c=na("ng-"+a);ic[c]=["$parse",function(d){return{compile:function(e,g){var f=d(g[c]);return function(c,d,e){d.on(J(a),function(a){c.$apply(function(){f(c,{$event:a})})})}}}}]});var sd=["$animate",function(a){return{transclude:"element",priority:600,terminal:!0,restrict:"A",
-$$tlb:!0,link:function(c,d,e,g,f){var h,m,k;c.$watch(e.ngIf,function(g){Pa(g)?m||(m=c.$new(),f(m,function(c){c[c.length++]=U.createComment(" end ngIf: "+e.ngIf+" ");h={clone:c};a.enter(c,d.parent(),d)})):(k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),h&&(k=Bb(h.clone),a.leave(k,function(){k=null}),h=null))})}}}],td=["$http","$templateCache","$anchorScroll","$animate","$sce",function(a,c,d,e,g){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:Qa.noop,compile:function(f,
-h){var m=h.ngInclude||h.src,k=h.onload||"",l=h.autoscroll;return function(f,h,q,s,D){var x=0,t,y,B,v=function(){y&&(y.remove(),y=null);t&&(t.$destroy(),t=null);B&&(e.leave(B,function(){y=null}),y=B,B=null)};f.$watch(g.parseAsResourceUrl(m),function(g){var m=function(){!z(l)||l&&!f.$eval(l)||d()},q=++x;g?(a.get(g,{cache:c}).success(function(a){if(q===x){var c=f.$new();s.template=a;a=D(c,function(a){v();e.enter(a,null,h,m)});t=c;B=a;t.$emit("$includeContentLoaded");f.$eval(k)}}).error(function(){q===
-x&&v()}),f.$emit("$includeContentRequested")):(v(),s.template=null)})}}}}],Jd=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(c,d,e,g){d.html(g.template);a(d.contents())(c)}}}],ud=va({priority:450,compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),vd=va({terminal:!0,priority:1E3}),wd=["$locale","$interpolate",function(a,c){var d=/{}/g;return{restrict:"EA",link:function(e,g,f){var h=f.count,m=f.$attr.when&&g.attr(f.$attr.when),k=f.offset||
-0,l=e.$eval(m)||{},n={},p=c.startSymbol(),r=c.endSymbol(),s=/^when(Minus)?(.+)$/;q(f,function(a,c){s.test(c)&&(l[J(c.replace("when","").replace("Minus","-"))]=g.attr(f.$attr[c]))});q(l,function(a,e){n[e]=c(a.replace(d,p+h+"-"+k+r))});e.$watch(function(){var c=parseFloat(e.$eval(h));if(isNaN(c))return"";c in l||(c=a.pluralCat(c-k));return n[c](e,g,!0)},function(a){g.text(a)})}}}],xd=["$parse","$animate",function(a,c){var d=u("ngRepeat");return{transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,
-link:function(e,g,f,h,m){var k=f.ngRepeat,l=k.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),n,p,r,s,D,x,t={$id:Ha};if(!l)throw d("iexp",k);f=l[1];h=l[2];(l=l[3])?(n=a(l),p=function(a,c,d){x&&(t[x]=a);t[D]=c;t.$index=d;return n(e,t)}):(r=function(a,c){return Ha(c)},s=function(a){return a});l=f.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);if(!l)throw d("iidexp",f);D=l[3]||l[1];x=l[2];var z={};e.$watchCollection(h,function(a){var f,h,l=g[0],n,t={},F,R,C,w,T,u,
-E=[];if(bb(a))T=a,n=p||r;else{n=p||s;T=[];for(C in a)a.hasOwnProperty(C)&&"$"!=C.charAt(0)&&T.push(C);T.sort()}F=T.length;h=E.length=T.length;for(f=0;f<h;f++)if(C=a===T?f:T[f],w=a[C],w=n(C,w,f),Aa(w,"`track by` id"),z.hasOwnProperty(w))u=z[w],delete z[w],t[w]=u,E[f]=u;else{if(t.hasOwnProperty(w))throw q(E,function(a){a&&a.scope&&(z[a.id]=a)}),d("dupes",k,w);E[f]={id:w};t[w]=!1}for(C in z)z.hasOwnProperty(C)&&(u=z[C],f=Bb(u.clone),c.leave(f),q(f,function(a){a.$$NG_REMOVED=!0}),u.scope.$destroy());
-f=0;for(h=T.length;f<h;f++){C=a===T?f:T[f];w=a[C];u=E[f];E[f-1]&&(l=E[f-1].clone[E[f-1].clone.length-1]);if(u.scope){R=u.scope;n=l;do n=n.nextSibling;while(n&&n.$$NG_REMOVED);u.clone[0]!=n&&c.move(Bb(u.clone),null,y(l));l=u.clone[u.clone.length-1]}else R=e.$new();R[D]=w;x&&(R[x]=C);R.$index=f;R.$first=0===f;R.$last=f===F-1;R.$middle=!(R.$first||R.$last);R.$odd=!(R.$even=0===(f&1));u.scope||m(R,function(a){a[a.length++]=U.createComment(" end ngRepeat: "+k+" ");c.enter(a,null,y(l));l=a;u.scope=R;u.clone=
-a;t[u.id]=u})}z=t})}}}],yd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngShow,function(c){a[Pa(c)?"removeClass":"addClass"](d,"ng-hide")})}}],rd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngHide,function(c){a[Pa(c)?"addClass":"removeClass"](d,"ng-hide")})}}],zd=va(function(a,c,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&q(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Ad=["$animate",function(a){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases=
-{}}],link:function(c,d,e,g){var f=[],h=[],m=[],k=[];c.$watch(e.ngSwitch||e.on,function(d){var n,p;n=0;for(p=m.length;n<p;++n)m[n].remove();n=m.length=0;for(p=k.length;n<p;++n){var r=h[n];k[n].$destroy();m[n]=r;a.leave(r,function(){m.splice(n,1)})}h.length=0;k.length=0;if(f=g.cases["!"+d]||g.cases["?"])c.$eval(e.change),q(f,function(d){var e=c.$new();k.push(e);d.transclude(e,function(c){var e=d.element;h.push(c);a.enter(c,e.parent(),e)})})})}}}],Bd=va({transclude:"element",priority:800,require:"^ngSwitch",
-link:function(a,c,d,e,g){e.cases["!"+d.ngSwitchWhen]=e.cases["!"+d.ngSwitchWhen]||[];e.cases["!"+d.ngSwitchWhen].push({transclude:g,element:c})}}),Cd=va({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,g){e.cases["?"]=e.cases["?"]||[];e.cases["?"].push({transclude:g,element:c})}}),Ed=va({link:function(a,c,d,e,g){if(!g)throw u("ngTransclude")("orphan",ia(c));g(function(a){c.empty();c.append(a)})}}),ed=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(c,
-d){"text/ng-template"==d.type&&a.put(d.id,c[0].text)}}}],Te=u("ngOptions"),Dd=aa({terminal:!0}),fd=["$compile","$parse",function(a,c){var d=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,e={$setViewValue:w};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(a,c,d){var m=this,k={},l=e,n;m.databound=
-d.ngModel;m.init=function(a,c,d){l=a;n=d};m.addOption=function(c){Aa(c,'"option value"');k[c]=!0;l.$viewValue==c&&(a.val(c),n.parent()&&n.remove())};m.removeOption=function(a){this.hasOption(a)&&(delete k[a],l.$viewValue==a&&this.renderUnknownOption(a))};m.renderUnknownOption=function(c){c="? "+Ha(c)+" ?";n.val(c);a.prepend(n);a.val(c);n.prop("selected",!0)};m.hasOption=function(a){return k.hasOwnProperty(a)};c.$on("$destroy",function(){m.renderUnknownOption=w})}],link:function(e,f,h,m){function k(a,
-c,d,e){d.$render=function(){var a=d.$viewValue;e.hasOption(a)?(w.parent()&&w.remove(),c.val(a),""===a&&x.prop("selected",!0)):H(a)&&x?c.val(""):e.renderUnknownOption(a)};c.on("change",function(){a.$apply(function(){w.parent()&&w.remove();d.$setViewValue(c.val())})})}function l(a,c,d){var e;d.$render=function(){var a=new Wa(d.$viewValue);q(c.find("option"),function(c){c.selected=z(a.get(c.value))})};a.$watch(function(){xa(e,d.$viewValue)||(e=ca(d.$viewValue),d.$render())});c.on("change",function(){a.$apply(function(){var a=
-[];q(c.find("option"),function(c){c.selected&&a.push(c.value)});d.$setViewValue(a)})})}function n(e,f,g){function h(){var a={"":[]},c=[""],d,k,s,u,v;u=g.$modelValue;v=y(e)||[];var A=n?Ub(v):v,E,I,B;I={};s=!1;var F,H;if(r)if(w&&L(u))for(s=new Wa([]),B=0;B<u.length;B++)I[m]=u[B],s.put(w(e,I),u[B]);else s=new Wa(u);for(B=0;E=A.length,B<E;B++){k=B;if(n){k=A[B];if("$"===k.charAt(0))continue;I[n]=k}I[m]=v[k];d=p(e,I)||"";(k=a[d])||(k=a[d]=[],c.push(d));r?d=z(s.remove(w?w(e,I):q(e,I))):(w?(d={},d[m]=u,d=
-w(e,d)===w(e,I)):d=u===q(e,I),s=s||d);F=l(e,I);F=z(F)?F:"";k.push({id:w?w(e,I):n?A[B]:B,label:F,selected:d})}r||(D||null===u?a[""].unshift({id:"",label:"",selected:!s}):s||a[""].unshift({id:"?",label:"",selected:!0}));I=0;for(A=c.length;I<A;I++){d=c[I];k=a[d];x.length<=I?(u={element:C.clone().attr("label",d),label:k.label},v=[u],x.push(v),f.append(u.element)):(v=x[I],u=v[0],u.label!=d&&u.element.attr("label",u.label=d));F=null;B=0;for(E=k.length;B<E;B++)s=k[B],(d=v[B+1])?(F=d.element,d.label!==s.label&&
-F.text(d.label=s.label),d.id!==s.id&&F.val(d.id=s.id),d.selected!==s.selected&&F.prop("selected",d.selected=s.selected)):(""===s.id&&D?H=D:(H=t.clone()).val(s.id).attr("selected",s.selected).text(s.label),v.push({element:H,label:s.label,id:s.id,selected:s.selected}),F?F.after(H):u.element.append(H),F=H);for(B++;v.length>B;)v.pop().element.remove()}for(;x.length>I;)x.pop()[0].element.remove()}var k;if(!(k=u.match(d)))throw Te("iexp",u,ia(f));var l=c(k[2]||k[1]),m=k[4]||k[6],n=k[5],p=c(k[3]||""),q=
-c(k[2]?k[1]:m),y=c(k[7]),w=k[8]?c(k[8]):null,x=[[{element:f,label:""}]];D&&(a(D)(e),D.removeClass("ng-scope"),D.remove());f.empty();f.on("change",function(){e.$apply(function(){var a,c=y(e)||[],d={},h,k,l,p,t,u,v;if(r)for(k=[],p=0,u=x.length;p<u;p++)for(a=x[p],l=1,t=a.length;l<t;l++){if((h=a[l].element)[0].selected){h=h.val();n&&(d[n]=h);if(w)for(v=0;v<c.length&&(d[m]=c[v],w(e,d)!=h);v++);else d[m]=c[h];k.push(q(e,d))}}else{h=f.val();if("?"==h)k=s;else if(""===h)k=null;else if(w)for(v=0;v<c.length;v++){if(d[m]=
-c[v],w(e,d)==h){k=q(e,d);break}}else d[m]=c[h],n&&(d[n]=h),k=q(e,d);1<x[0].length&&x[0][1].id!==h&&(x[0][1].selected=!1)}g.$setViewValue(k)})});g.$render=h;e.$watch(h)}if(m[1]){var p=m[0];m=m[1];var r=h.multiple,u=h.ngOptions,D=!1,x,t=y(U.createElement("option")),C=y(U.createElement("optgroup")),w=t.clone();h=0;for(var v=f.children(),E=v.length;h<E;h++)if(""===v[h].value){x=D=v.eq(h);break}p.init(m,D,w);r&&(m.$isEmpty=function(a){return!a||0===a.length});u?n(e,f,m):r?l(e,f,m):k(e,f,m,p)}}}}],hd=["$interpolate",
-function(a){var c={addOption:w,removeOption:w};return{restrict:"E",priority:100,compile:function(d,e){if(H(e.value)){var g=a(d.text(),!0);g||e.$set("value",d.text())}return function(a,d,e){var k=d.parent(),l=k.data("$selectController")||k.parent().data("$selectController");l&&l.databound?d.prop("selected",!1):l=c;g?a.$watch(g,function(a,c){e.$set("value",a);a!==c&&l.removeOption(c);l.addOption(a)}):l.addOption(e.value);d.on("$destroy",function(){l.removeOption(e.value)})}}}}],gd=aa({restrict:"E",
-terminal:!0});P.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):((Ba=P.jQuery)&&Ba.fn.on?(y=Ba,E(Ba.fn,{scope:Ia.scope,isolateScope:Ia.isolateScope,controller:Ia.controller,injector:Ia.injector,inheritedData:Ia.inheritedData}),Db("remove",!0,!0,!1),Db("empty",!1,!1,!1),Db("html",!1,!1,!0)):y=M,Qa.element=y,Zc(Qa),y(U).ready(function(){Wc(U,cc)}))})(window,document);!window.angular.$$csp()&&window.angular.element(document).find("head").prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}</style>');
-//# sourceMappingURL=angular.min.js.map
+(function(w){'use strict';function oe(a){if(B(a))u(a.objectMaxDepth)&&(Mc.objectMaxDepth=Wb(a.objectMaxDepth)?a.objectMaxDepth:NaN);else return Mc}function Wb(a){return Y(a)&&0<a}function K(a,b){b=b||Error;return function(){var d=arguments[0],c;c="["+(a?a+":":"")+d+"] http://errors.angularjs.org/1.6.9/"+(a?a+"/":"")+d;for(d=1;d<arguments.length;d++){c=c+(1==d?"?":"&")+"p"+(d-1)+"=";var e=encodeURIComponent,f;f=arguments[d];f="function"==typeof f?f.toString().replace(/ \{[\s\S]*$/,""):"undefined"==
+typeof f?"undefined":"string"!=typeof f?JSON.stringify(f):f;c+=e(f)}return new b(c)}}function wa(a){if(null==a||Za(a))return!1;if(I(a)||E(a)||z&&a instanceof z)return!0;var b="length"in Object(a)&&a.length;return Y(b)&&(0<=b&&(b-1 in a||a instanceof Array)||"function"===typeof a.item)}function r(a,b,d){var c,e;if(a)if(C(a))for(c in a)"prototype"!==c&&"length"!==c&&"name"!==c&&a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else if(I(a)||wa(a)){var f="object"!==typeof a;c=0;for(e=a.length;c<e;c++)(f||c in
+    a)&&b.call(d,a[c],c,a)}else if(a.forEach&&a.forEach!==r)a.forEach(b,d,a);else if(Nc(a))for(c in a)b.call(d,a[c],c,a);else if("function"===typeof a.hasOwnProperty)for(c in a)a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else for(c in a)ra.call(a,c)&&b.call(d,a[c],c,a);return a}function Oc(a,b,d){for(var c=Object.keys(a).sort(),e=0;e<c.length;e++)b.call(d,a[c[e]],c[e]);return c}function Xb(a){return function(b,d){a(d,b)}}function pe(){return++qb}function Yb(a,b,d){for(var c=a.$$hashKey,e=0,f=b.length;e<f;++e){var g=
+    b[e];if(B(g)||C(g))for(var h=Object.keys(g),k=0,l=h.length;k<l;k++){var m=h[k],p=g[m];d&&B(p)?fa(p)?a[m]=new Date(p.valueOf()):$a(p)?a[m]=new RegExp(p):p.nodeName?a[m]=p.cloneNode(!0):Zb(p)?a[m]=p.clone():(B(a[m])||(a[m]=I(p)?[]:{}),Yb(a[m],[p],!0)):a[m]=p}}c?a.$$hashKey=c:delete a.$$hashKey;return a}function O(a){return Yb(a,xa.call(arguments,1),!1)}function qe(a){return Yb(a,xa.call(arguments,1),!0)}function Z(a){return parseInt(a,10)}function $b(a,b){return O(Object.create(a),b)}function D(){}
+    function ab(a){return a}function la(a){return function(){return a}}function ac(a){return C(a.toString)&&a.toString!==ia}function x(a){return"undefined"===typeof a}function u(a){return"undefined"!==typeof a}function B(a){return null!==a&&"object"===typeof a}function Nc(a){return null!==a&&"object"===typeof a&&!Pc(a)}function E(a){return"string"===typeof a}function Y(a){return"number"===typeof a}function fa(a){return"[object Date]"===ia.call(a)}function bc(a){switch(ia.call(a)){case "[object Error]":return!0;
+        case "[object Exception]":return!0;case "[object DOMException]":return!0;default:return a instanceof Error}}function C(a){return"function"===typeof a}function $a(a){return"[object RegExp]"===ia.call(a)}function Za(a){return a&&a.window===a}function bb(a){return a&&a.$evalAsync&&a.$watch}function Na(a){return"boolean"===typeof a}function re(a){return a&&Y(a.length)&&se.test(ia.call(a))}function Zb(a){return!(!a||!(a.nodeName||a.prop&&a.attr&&a.find))}function te(a){var b={};a=a.split(",");var d;for(d=
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   0;d<a.length;d++)b[a[d]]=!0;return b}function ya(a){return L(a.nodeName||a[0]&&a[0].nodeName)}function cb(a,b){var d=a.indexOf(b);0<=d&&a.splice(d,1);return d}function pa(a,b,d){function c(a,b,c){c--;if(0>c)return"...";var d=b.$$hashKey,g;if(I(a)){g=0;for(var f=a.length;g<f;g++)b.push(e(a[g],c))}else if(Nc(a))for(g in a)b[g]=e(a[g],c);else if(a&&"function"===typeof a.hasOwnProperty)for(g in a)a.hasOwnProperty(g)&&(b[g]=e(a[g],c));else for(g in a)ra.call(a,g)&&(b[g]=e(a[g],c));d?b.$$hashKey=d:delete b.$$hashKey;
+        return b}function e(a,b){if(!B(a))return a;var d=g.indexOf(a);if(-1!==d)return h[d];if(Za(a)||bb(a))throw qa("cpws");var d=!1,e=f(a);void 0===e&&(e=I(a)?[]:Object.create(Pc(a)),d=!0);g.push(a);h.push(e);return d?c(a,e,b):e}function f(a){switch(ia.call(a)){case "[object Int8Array]":case "[object Int16Array]":case "[object Int32Array]":case "[object Float32Array]":case "[object Float64Array]":case "[object Uint8Array]":case "[object Uint8ClampedArray]":case "[object Uint16Array]":case "[object Uint32Array]":return new a.constructor(e(a.buffer),
+        a.byteOffset,a.length);case "[object ArrayBuffer]":if(!a.slice){var b=new ArrayBuffer(a.byteLength);(new Uint8Array(b)).set(new Uint8Array(a));return b}return a.slice(0);case "[object Boolean]":case "[object Number]":case "[object String]":case "[object Date]":return new a.constructor(a.valueOf());case "[object RegExp]":return b=new RegExp(a.source,a.toString().match(/[^/]*$/)[0]),b.lastIndex=a.lastIndex,b;case "[object Blob]":return new a.constructor([a],{type:a.type})}if(C(a.cloneNode))return a.cloneNode(!0)}
+        var g=[],h=[];d=Wb(d)?d:NaN;if(b){if(re(b)||"[object ArrayBuffer]"===ia.call(b))throw qa("cpta");if(a===b)throw qa("cpi");I(b)?b.length=0:r(b,function(a,c){"$$hashKey"!==c&&delete b[c]});g.push(a);h.push(b);return c(a,b,d)}return e(a,d)}function cc(a,b){return a===b||a!==a&&b!==b}function sa(a,b){if(a===b)return!0;if(null===a||null===b)return!1;if(a!==a&&b!==b)return!0;var d=typeof a,c;if(d===typeof b&&"object"===d)if(I(a)){if(!I(b))return!1;if((d=a.length)===b.length){for(c=0;c<d;c++)if(!sa(a[c],
+        b[c]))return!1;return!0}}else{if(fa(a))return fa(b)?cc(a.getTime(),b.getTime()):!1;if($a(a))return $a(b)?a.toString()===b.toString():!1;if(bb(a)||bb(b)||Za(a)||Za(b)||I(b)||fa(b)||$a(b))return!1;d=S();for(c in a)if("$"!==c.charAt(0)&&!C(a[c])){if(!sa(a[c],b[c]))return!1;d[c]=!0}for(c in b)if(!(c in d)&&"$"!==c.charAt(0)&&u(b[c])&&!C(b[c]))return!1;return!0}return!1}function db(a,b,d){return a.concat(xa.call(b,d))}function Ra(a,b){var d=2<arguments.length?xa.call(arguments,2):[];return!C(b)||b instanceof
+    RegExp?b:d.length?function(){return arguments.length?b.apply(a,db(d,arguments,0)):b.apply(a,d)}:function(){return arguments.length?b.apply(a,arguments):b.call(a)}}function Qc(a,b){var d=b;"string"===typeof a&&"$"===a.charAt(0)&&"$"===a.charAt(1)?d=void 0:Za(b)?d="$WINDOW":b&&w.document===b?d="$DOCUMENT":bb(b)&&(d="$SCOPE");return d}function eb(a,b){if(!x(a))return Y(b)||(b=b?2:null),JSON.stringify(a,Qc,b)}function Rc(a){return E(a)?JSON.parse(a):a}function Sc(a,b){a=a.replace(ue,"");var d=Date.parse("Jan 01, 1970 00:00:00 "+
+        a)/6E4;return U(d)?b:d}function dc(a,b,d){d=d?-1:1;var c=a.getTimezoneOffset();b=Sc(b,c);d*=b-c;a=new Date(a.getTime());a.setMinutes(a.getMinutes()+d);return a}function za(a){a=z(a).clone().empty();var b=z("<div>").append(a).html();try{return a[0].nodeType===Oa?L(b):b.match(/^(<[^>]+>)/)[1].replace(/^<([\w-]+)/,function(a,b){return"<"+L(b)})}catch(d){return L(b)}}function Tc(a){try{return decodeURIComponent(a)}catch(b){}}function ec(a){var b={};r((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,
+        "%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=Tc(e),u(e)&&(f=u(f)?Tc(f):!0,ra.call(b,e)?I(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function fc(a){var b=[];r(a,function(a,c){I(a)?r(a,function(a){b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))}):b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))});return b.length?b.join("&"):""}function fb(a){return ja(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function ja(a,b){return encodeURIComponent(a).replace(/%40/gi,
+        "@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,b?"%20":"+")}function ve(a,b){var d,c,e=Ha.length;for(c=0;c<e;++c)if(d=Ha[c]+b,E(d=a.getAttribute(d)))return d;return null}function we(a,b){var d,c,e={};r(Ha,function(b){b+="app";!d&&a.hasAttribute&&a.hasAttribute(b)&&(d=a,c=a.getAttribute(b))});r(Ha,function(b){b+="app";var e;!d&&(e=a.querySelector("["+b.replace(":","\\:")+"]"))&&(d=e,c=e.getAttribute(b))});d&&(xe?(e.strictDi=null!==ve(d,"strict-di"),
+        b(d,c?[c]:[],e)):w.console.error("AngularJS: disabling automatic bootstrap. <script> protocol indicates an extension, document.location.href does not match."))}function Uc(a,b,d){B(d)||(d={});d=O({strictDi:!1},d);var c=function(){a=z(a);if(a.injector()){var c=a[0]===w.document?"document":za(a);throw qa("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);
+        b.unshift("ng");c=gb(b,d.strictDi);c.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;w&&e.test(w.name)&&(d.debugInfoEnabled=!0,w.name=w.name.replace(e,""));if(w&&!f.test(w.name))return c();w.name=w.name.replace(f,"");$.resumeBootstrap=function(a){r(a,function(a){b.push(a)});return c()};C($.resumeDeferredBootstrap)&&$.resumeDeferredBootstrap()}function ye(){w.name=
+        "NG_ENABLE_DEBUG_INFO!"+w.name;w.location.reload()}function ze(a){a=$.element(a).injector();if(!a)throw qa("test");return a.get("$$testability")}function Vc(a,b){b=b||"_";return a.replace(Ae,function(a,c){return(c?b:"")+a.toLowerCase()})}function Be(){var a;if(!Wc){var b=rb();(ma=x(b)?w.jQuery:b?w[b]:void 0)&&ma.fn.on?(z=ma,O(ma.fn,{scope:Sa.scope,isolateScope:Sa.isolateScope,controller:Sa.controller,injector:Sa.injector,inheritedData:Sa.inheritedData}),a=ma.cleanData,ma.cleanData=function(b){for(var c,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  e=0,f;null!=(f=b[e]);e++)(c=ma._data(f,"events"))&&c.$destroy&&ma(f).triggerHandler("$destroy");a(b)}):z=V;$.element=z;Wc=!0}}function hb(a,b,d){if(!a)throw qa("areq",b||"?",d||"required");return a}function sb(a,b,d){d&&I(a)&&(a=a[a.length-1]);hb(C(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ia(a,b){if("hasOwnProperty"===a)throw qa("badname",b);}function Xc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g<f;g++)c=
+        b[g],a&&(a=(e=a)[c]);return!d&&C(a)?Ra(e,a):a}function tb(a){for(var b=a[0],d=a[a.length-1],c,e=1;b!==d&&(b=b.nextSibling);e++)if(c||a[e]!==b)c||(c=z(xa.call(a,0,e))),c.push(b);return c||a}function S(){return Object.create(null)}function gc(a){if(null==a)return"";switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=!ac(a)||I(a)||fa(a)?eb(a):a.toString()}return a}function Ce(a){function b(a,b,c){return a[b]||(a[b]=c())}var d=K("$injector"),c=K("ng");a=b(a,"angular",Object);a.$$minErr=
+        a.$$minErr||K;return b(a,"module",function(){var a={};return function(f,g,h){var k={};if("hasOwnProperty"===f)throw c("badname","module");g&&a.hasOwnProperty(f)&&(a[f]=null);return b(a,f,function(){function a(b,c,d,g){g||(g=e);return function(){g[d||"push"]([b,c,arguments]);return v}}function b(a,c,d){d||(d=e);return function(b,e){e&&C(e)&&(e.$$moduleName=f);d.push([a,c,arguments]);return v}}if(!g)throw d("nomod",f);var e=[],n=[],F=[],s=a("$injector","invoke","push",n),v={_invokeQueue:e,_configBlocks:n,
+        _runBlocks:F,info:function(a){if(u(a)){if(!B(a))throw c("aobj","value");k=a;return this}return k},requires:g,name:f,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:b("$provide","decorator",n),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),component:b("$compileProvider",
+            "component"),config:s,run:function(a){F.push(a);return this}};h&&s(h);return v})}})}function ka(a,b){if(I(a)){b=b||[];for(var d=0,c=a.length;d<c;d++)b[d]=a[d]}else if(B(a))for(d in b=b||{},a)if("$"!==d.charAt(0)||"$"!==d.charAt(1))b[d]=a[d];return b||a}function De(a,b){var d=[];Wb(b)&&(a=$.copy(a,null,b));return JSON.stringify(a,function(a,b){b=Qc(a,b);if(B(b)){if(0<=d.indexOf(b))return"...";d.push(b)}return b})}function Ee(a){O(a,{errorHandlingConfig:oe,bootstrap:Uc,copy:pa,extend:O,merge:qe,equals:sa,
+        element:z,forEach:r,injector:gb,noop:D,bind:Ra,toJson:eb,fromJson:Rc,identity:ab,isUndefined:x,isDefined:u,isString:E,isFunction:C,isObject:B,isNumber:Y,isElement:Zb,isArray:I,version:Fe,isDate:fa,lowercase:L,uppercase:ub,callbacks:{$$counter:0},getTestability:ze,reloadWithDebugInfo:ye,$$minErr:K,$$csp:Ja,$$encodeUriSegment:fb,$$encodeUriQuery:ja,$$stringify:gc});ic=Ce(w);ic("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:Ge});a.provider("$compile",Yc).directive({a:He,input:Zc,
+        textarea:Zc,form:Ie,script:Je,select:Ke,option:Le,ngBind:Me,ngBindHtml:Ne,ngBindTemplate:Oe,ngClass:Pe,ngClassEven:Qe,ngClassOdd:Re,ngCloak:Se,ngController:Te,ngForm:Ue,ngHide:Ve,ngIf:We,ngInclude:Xe,ngInit:Ye,ngNonBindable:Ze,ngPluralize:$e,ngRepeat:af,ngShow:bf,ngStyle:cf,ngSwitch:df,ngSwitchWhen:ef,ngSwitchDefault:ff,ngOptions:gf,ngTransclude:hf,ngModel:jf,ngList:kf,ngChange:lf,pattern:$c,ngPattern:$c,required:ad,ngRequired:ad,minlength:bd,ngMinlength:bd,maxlength:cd,ngMaxlength:cd,ngValue:mf,
+        ngModelOptions:nf}).directive({ngInclude:of}).directive(vb).directive(dd);a.provider({$anchorScroll:pf,$animate:qf,$animateCss:rf,$$animateJs:sf,$$animateQueue:tf,$$AnimateRunner:uf,$$animateAsyncRun:vf,$browser:wf,$cacheFactory:xf,$controller:yf,$document:zf,$$isDocumentHidden:Af,$exceptionHandler:Bf,$filter:ed,$$forceReflow:Cf,$interpolate:Df,$interval:Ef,$http:Ff,$httpParamSerializer:Gf,$httpParamSerializerJQLike:Hf,$httpBackend:If,$xhrFactory:Jf,$jsonpCallbacks:Kf,$location:Lf,$log:Mf,$parse:Nf,
+        $rootScope:Of,$q:Pf,$$q:Qf,$sce:Rf,$sceDelegate:Sf,$sniffer:Tf,$templateCache:Uf,$templateRequest:Vf,$$testability:Wf,$timeout:Xf,$window:Yf,$$rAF:Zf,$$jqLite:$f,$$Map:ag,$$cookieReader:bg})}]).info({angularVersion:"1.6.9"})}function wb(a,b){return b.toUpperCase()}function xb(a){return a.replace(cg,wb)}function jc(a){a=a.nodeType;return 1===a||!a||9===a}function fd(a,b){var d,c,e=b.createDocumentFragment(),f=[];if(kc.test(a)){d=e.appendChild(b.createElement("div"));c=(dg.exec(a)||["",""])[1].toLowerCase();
+        c=aa[c]||aa._default;d.innerHTML=c[1]+a.replace(eg,"<$1></$2>")+c[2];for(c=c[0];c--;)d=d.lastChild;f=db(f,d.childNodes);d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";r(f,function(a){e.appendChild(a)});return e}function V(a){if(a instanceof V)return a;var b;E(a)&&(a=Q(a),b=!0);if(!(this instanceof V)){if(b&&"<"!==a.charAt(0))throw lc("nosel");return new V(a)}if(b){b=w.document;var d;a=(d=fg.exec(a))?[b.createElement(d[1])]:(d=fd(a,b))?d.childNodes:
+        [];mc(this,a)}else C(a)?gd(a):mc(this,a)}function nc(a){return a.cloneNode(!0)}function yb(a,b){!b&&jc(a)&&z.cleanData([a]);a.querySelectorAll&&z.cleanData(a.querySelectorAll("*"))}function hd(a,b,d,c){if(u(c))throw lc("offargs");var e=(c=zb(a))&&c.events,f=c&&c.handle;if(f)if(b){var g=function(b){var c=e[b];u(d)&&cb(c||[],d);u(d)&&c&&0<c.length||(a.removeEventListener(b,f),delete e[b])};r(b.split(" "),function(a){g(a);Ab[a]&&g(Ab[a])})}else for(b in e)"$destroy"!==b&&a.removeEventListener(b,f),delete e[b]}
+    function oc(a,b){var d=a.ng339,c=d&&ib[d];c&&(b?delete c.data[b]:(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),hd(a)),delete ib[d],a.ng339=void 0))}function zb(a,b){var d=a.ng339,d=d&&ib[d];b&&!d&&(a.ng339=d=++gg,d=ib[d]={events:{},data:{},handle:void 0});return d}function pc(a,b,d){if(jc(a)){var c,e=u(d),f=!e&&b&&!B(b),g=!b;a=(a=zb(a,!f))&&a.data;if(e)a[xb(b)]=d;else{if(g)return a;if(f)return a&&a[xb(b)];for(c in b)a[xb(c)]=b[c]}}}function Bb(a,b){return a.getAttribute?-1<(" "+(a.getAttribute("class")||
+        "")+" ").replace(/[\n\t]/g," ").indexOf(" "+b+" "):!1}function Cb(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," "),c=d;r(b.split(" "),function(a){a=Q(a);c=c.replace(" "+a+" "," ")});c!==d&&a.setAttribute("class",Q(c))}}function Db(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," "),c=d;r(b.split(" "),function(a){a=Q(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});c!==d&&a.setAttribute("class",Q(c))}}function mc(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             b){if(b)if(b.nodeType)a[a.length++]=b;else{var d=b.length;if("number"===typeof d&&b.window!==b){if(d)for(var c=0;c<d;c++)a[a.length++]=b[c]}else a[a.length++]=b}}function id(a,b){return Eb(a,"$"+(b||"ngController")+"Controller")}function Eb(a,b,d){9===a.nodeType&&(a=a.documentElement);for(b=I(b)?b:[b];a;){for(var c=0,e=b.length;c<e;c++)if(u(d=z.data(a,b[c])))return d;a=a.parentNode||11===a.nodeType&&a.host}}function jd(a){for(yb(a,!0);a.firstChild;)a.removeChild(a.firstChild)}function Fb(a,b){b||
+    yb(a);var d=a.parentNode;d&&d.removeChild(a)}function hg(a,b){b=b||w;if("complete"===b.document.readyState)b.setTimeout(a);else z(b).on("load",a)}function gd(a){function b(){w.document.removeEventListener("DOMContentLoaded",b);w.removeEventListener("load",b);a()}"complete"===w.document.readyState?w.setTimeout(a):(w.document.addEventListener("DOMContentLoaded",b),w.addEventListener("load",b))}function kd(a,b){var d=Gb[b.toLowerCase()];return d&&ld[ya(a)]&&d}function ig(a,b){var d=function(c,d){c.isDefaultPrevented=
+        function(){return c.defaultPrevented};var f=b[d||c.type],g=f?f.length:0;if(g){if(x(c.immediatePropagationStopped)){var h=c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};var k=f.specialHandlerWrapper||jg;1<g&&(f=ka(f));for(var l=0;l<g;l++)c.isImmediatePropagationStopped()||k(a,c,f[l])}};d.elem=a;return d}function jg(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b,d){d.call(a,b)}function kg(a,b,d){var c=b.relatedTarget;c&&(c===a||lg.call(a,c))||d.call(a,b)}function $f(){this.$get=function(){return O(V,{hasClass:function(a,b){a.attr&&(a=a[0]);return Bb(a,b)},addClass:function(a,b){a.attr&&(a=a[0]);return Db(a,b)},removeClass:function(a,b){a.attr&&(a=a[0]);return Cb(a,b)}})}}function Pa(a,b){var d=a&&a.$$hashKey;if(d)return"function"===typeof d&&(d=a.$$hashKey()),d;d=typeof a;return d="function"===d||"object"===d&&null!==a?a.$$hashKey=d+":"+(b||pe)():d+":"+
+        a}function md(){this._keys=[];this._values=[];this._lastKey=NaN;this._lastIndex=-1}function nd(a){a=Function.prototype.toString.call(a).replace(mg,"");return a.match(ng)||a.match(og)}function pg(a){return(a=nd(a))?"function("+(a[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function gb(a,b){function d(a){return function(b,c){if(B(b))r(b,Xb(a));else return a(b,c)}}function c(a,b){Ia(a,"service");if(C(b)||I(b))b=n.instantiate(b);if(!b.$get)throw Ba("pget",a);return p[a+"Provider"]=b}function e(a,b){return function(){var c=
+        v.invoke(b,this);if(x(c))throw Ba("undef",a);return c}}function f(a,b,d){return c(a,{$get:!1!==d?e(a,b):b})}function g(a){hb(x(a)||I(a),"modulesToLoad","not an array");var b=[],c;r(a,function(a){function d(a){var b,c;b=0;for(c=a.length;b<c;b++){var e=a[b],g=n.get(e[0]);g[e[1]].apply(g,e[2])}}if(!m.get(a)){m.set(a,!0);try{E(a)?(c=ic(a),v.modules[a]=c,b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):C(a)?b.push(n.invoke(a)):I(a)?b.push(n.invoke(a)):sb(a,"module")}catch(e){throw I(a)&&
+    (a=a[a.length-1]),e.message&&e.stack&&-1===e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),Ba("modulerr",a,e.stack||e.message||e);}}});return b}function h(a,c){function d(b,e){if(a.hasOwnProperty(b)){if(a[b]===k)throw Ba("cdep",b+" <- "+l.join(" <- "));return a[b]}try{return l.unshift(b),a[b]=k,a[b]=c(b,e),a[b]}catch(g){throw a[b]===k&&delete a[b],g;}finally{l.shift()}}function e(a,c,g){var f=[];a=gb.$$annotate(a,b,g);for(var k=0,h=a.length;k<h;k++){var l=a[k];if("string"!==typeof l)throw Ba("itkn",
+        l);f.push(c&&c.hasOwnProperty(l)?c[l]:d(l,g))}return f}return{invoke:function(a,b,c,d){"string"===typeof c&&(d=c,c=null);c=e(a,c,d);I(a)&&(a=a[a.length-1]);d=a;if(Ca||"function"!==typeof d)d=!1;else{var g=d.$$ngIsClass;Na(g)||(g=d.$$ngIsClass=/^(?:class\b|constructor\()/.test(Function.prototype.toString.call(d)));d=g}return d?(c.unshift(null),new (Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var d=I(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new (Function.prototype.bind.apply(d,
+            a))},get:d,annotate:gb.$$annotate,has:function(b){return p.hasOwnProperty(b+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Hb,p={$provide:{provider:d(c),factory:d(f),service:d(function(a,b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,la(b),!1)}),constant:d(function(a,b){Ia(a,"constant");p[a]=b;F[a]=b}),decorator:function(a,b){var c=n.get(a+"Provider"),d=c.$get;c.$get=function(){var a=v.invoke(d,c);return v.invoke(b,null,{$delegate:a})}}}},
+        n=p.$injector=h(p,function(a,b){$.isString(b)&&l.push(b);throw Ba("unpr",l.join(" <- "));}),F={},s=h(F,function(a,b){var c=n.get(a+"Provider",b);return v.invoke(c.$get,c,void 0,a)}),v=s;p.$injectorProvider={$get:la(s)};v.modules=n.modules=S();var y=g(a),v=s.get("$injector");v.strictDi=b;r(y,function(a){a&&v.invoke(a)});v.loadNewModules=function(a){r(g(a),function(a){a&&v.invoke(a)})};return v}function pf(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",
+        function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===ya(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();var c;c=g.yOffset;C(c)?c=c():Zb(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):Y(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=E(a)?a:Y(a)?a.toString():d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&
+            f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||hg(function(){c.$evalAsync(g)})});return g}]}function jb(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;I(a)&&(a=a.join(" "));I(b)&&(b=b.join(" "));return a+" "+b}function qg(a){E(a)&&(a=a.split(" "));var b=S();r(a,function(a){a.length&&(b[a]=!0)});return b}function Ka(a){return B(a)?a:{}}function rg(a,b,d,c){function e(a){try{a.apply(null,xa.call(arguments,1))}finally{if(s--,0===s)for(;v.length;)try{v.pop()()}catch(b){d.error(b)}}}
+        function f(){A=null;h()}function g(){y=H();y=x(y)?null:y;sa(y,J)&&(y=J);t=J=y}function h(){var a=t;g();if(Aa!==k.url()||a!==y)Aa=k.url(),t=y,r(G,function(a){a(k.url(),y)})}var k=this,l=a.location,m=a.history,p=a.setTimeout,n=a.clearTimeout,F={};k.isMock=!1;var s=0,v=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){s++};k.notifyWhenNoOutstandingRequests=function(a){0===s?a():v.push(a)};var y,t,Aa=l.href,hc=b.find("base"),A=null,H=c.history?function(){try{return m.state}catch(a){}}:
+            D;g();k.url=function(b,d,e){x(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=t===e;if(Aa===b&&(!c.history||f))return k;var h=Aa&&La(Aa)===La(b);Aa=b;t=e;!c.history||h&&f?(h||(A=b),d?l.replace(b):h?(d=l,e=b.indexOf("#"),e=-1===e?"":b.substr(e),d.hash=e):l.href=b,l.href!==b&&(A=b)):(m[d?"replaceState":"pushState"](e,"",b),g());A&&(A=b);return k}return A||l.href.replace(/%27/g,"'")};k.state=function(){return y};var G=[],ba=!1,J=null;k.onUrlChange=function(b){if(!ba){if(c.history)z(a).on("popstate",
+            f);z(a).on("hashchange",f);ba=!0}G.push(b);return b};k.$$applicationDestroyed=function(){z(a).off("hashchange popstate",f)};k.$$checkUrlChange=h;k.baseHref=function(){var a=hc.attr("href");return a?a.replace(/^(https?:)?\/\/[^/]*/,""):""};k.defer=function(a,b){var c;s++;c=p(function(){delete F[c];e(a)},b||0);F[c]=!0;return c};k.defer.cancel=function(a){return F[a]?(delete F[a],n(a),e(D),!0):!1}}function wf(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new rg(a,c,b,
+        d)}]}function xf(){this.$get=function(){function a(a,c){function e(a){a!==p&&(n?n===a&&(n=a.n):n=a,f(a.n,a.p),f(a,p),p=a,p.n=null)}function f(a,b){a!==b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw K("$cacheFactory")("iid",a);var g=0,h=O({},c,{id:a}),k=S(),l=c&&c.capacity||Number.MAX_VALUE,m=S(),p=null,n=null;return b[a]={put:function(a,b){if(!x(b)){if(l<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in k||g++;k[a]=b;g>l&&this.remove(n.key);return b}},get:function(a){if(l<Number.MAX_VALUE){var b=
+            m[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;b===p&&(p=b.p);b===n&&(n=b.n);f(b.n,b.p);delete m[a]}a in k&&(delete k[a],g--)},removeAll:function(){k=S();g=0;m=S();p=n=null},destroy:function(){m=h=k=null;delete b[a]},info:function(){return O({},h,{size:g})}}}var b={};a.info=function(){var a={};r(b,function(b,e){a[e]=b.info()});return a};a.get=function(a){return b[a]};return a}}function Uf(){this.$get=["$cacheFactory",function(a){return a("templates")}]}
+    function Yc(a,b){function d(a,b,c){var d=/^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/,e=S();r(a,function(a,g){if(a in p)e[g]=p[a];else{var f=a.match(d);if(!f)throw ca("iscp",b,g,a,c?"controller bindings definition":"isolate scope definition");e[g]={mode:f[1][0],collection:"*"===f[2],optional:"?"===f[3],attrName:f[4]||g};f[4]&&(p[a]=e[g])}});return e}function c(a){var b=a.charAt(0);if(!b||b!==L(b))throw ca("baddir",a);if(a!==a.trim())throw ca("baddir",a);}function e(a){var b=a.require||a.controller&&a.name;
+        !I(b)&&B(b)&&r(b,function(a,c){var d=a.match(l);a.substring(d[0].length)||(b[c]=d[0]+c)});return b}var f={},g=/^\s*directive:\s*([\w-]+)\s+(.*)$/,h=/(([\w-]+)(?::([^;]+))?;?)/,k=te("ngSrc,ngSrcset,src,srcset"),l=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,m=/^(on[a-z]+|formaction)$/,p=S();this.directive=function hc(b,d){hb(b,"name");Ia(b,"directive");E(b)?(c(b),hb(d,"directiveFactory"),f.hasOwnProperty(b)||(f[b]=[],a.factory(b+"Directive",["$injector","$exceptionHandler",function(a,c){var d=[];r(f[b],function(g,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             f){try{var h=a.invoke(g);C(h)?h={compile:la(h)}:!h.compile&&h.link&&(h.compile=la(h.link));h.priority=h.priority||0;h.index=f;h.name=h.name||b;h.require=e(h);var k=h,l=h.restrict;if(l&&(!E(l)||!/[EACM]/.test(l)))throw ca("badrestrict",l,b);k.restrict=l||"EA";h.$$moduleName=g.$$moduleName;d.push(h)}catch(m){c(m)}});return d}])),f[b].push(d)):r(b,Xb(hc));return this};this.component=function A(a,b){function c(a){function e(b){return C(b)||I(b)?function(c,d){return a.invoke(b,this,{$element:c,$attrs:d})}:
+        b}var g=b.template||b.templateUrl?b.template:"",f={controller:d,controllerAs:sg(b.controller)||b.controllerAs||"$ctrl",template:e(g),templateUrl:e(b.templateUrl),transclude:b.transclude,scope:{},bindToController:b.bindings||{},restrict:"E",require:b.require};r(b,function(a,b){"$"===b.charAt(0)&&(f[b]=a)});return f}if(!E(a))return r(a,Xb(Ra(this,A))),this;var d=b.controller||function(){};r(b,function(a,b){"$"===b.charAt(0)&&(c[b]=a,C(d)&&(d[b]=a))});c.$inject=["$injector"];return this.directive(a,
+        c)};this.aHrefSanitizationWhitelist=function(a){return u(a)?(b.aHrefSanitizationWhitelist(a),this):b.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b.imgSrcSanitizationWhitelist(a),this):b.imgSrcSanitizationWhitelist()};var n=!0;this.debugInfoEnabled=function(a){return u(a)?(n=a,this):n};var F=!1;this.preAssignBindingsEnabled=function(a){return u(a)?(F=a,this):F};var s=!1;this.strictComponentBindingsEnabled=function(a){return u(a)?(s=a,this):s};var v=10;this.onChangesTtl=
+        function(a){return arguments.length?(v=a,this):v};var y=!0;this.commentDirectivesEnabled=function(a){return arguments.length?(y=a,this):y};var t=!0;this.cssClassDirectivesEnabled=function(a){return arguments.length?(t=a,this):t};this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$sce","$animate","$$sanitizeUri",function(a,b,c,e,p,R,M,T,P,q){function N(){try{if(!--Fa)throw ha=void 0,ca("infchng",v);M.$apply(function(){for(var a=[],b=0,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c=ha.length;b<c;++b)try{ha[b]()}catch(d){a.push(d)}ha=void 0;if(a.length)throw a;})}finally{Fa++}}function qc(a,b){if(b){var c=Object.keys(b),d,e,g;d=0;for(e=c.length;d<e;d++)g=c[d],this[g]=b[g]}else this.$attr={};this.$$element=a}function Ta(a,b,c){Ba.innerHTML="<span "+b+">";b=Ba.firstChild.attributes;var d=b[0];b.removeNamedItem(d.name);d.value=c;a.attributes.setNamedItem(d)}function na(a,b){try{a.addClass(b)}catch(c){}}function da(a,b,c,d,e){a instanceof z||(a=z(a));var g=Ua(a,b,a,c,d,e);da.$$addScopeClass(a);
+        var f=null;return function(b,c,d){if(!a)throw ca("multilink");hb(b,"scope");e&&e.needsNewScope&&(b=b.$parent.$new());d=d||{};var h=d.parentBoundTranscludeFn,k=d.transcludeControllers;d=d.futureParentElement;h&&h.$$boundTransclude&&(h=h.$$boundTransclude);f||(f=(d=d&&d[0])?"foreignobject"!==ya(d)&&ia.call(d).match(/SVG/)?"svg":"html":"html");d="html"!==f?z(ka(f,z("<div>").append(a).html())):c?Sa.clone.call(a):a;if(k)for(var l in k)d.data("$"+l+"Controller",k[l].instance);da.$$addScopeInfo(d,b);c&&
+        c(d,b);g&&g(b,d,d,h);c||(a=g=null);return d}}function Ua(a,b,c,d,e,g){function f(a,c,d,e){var g,k,l,m,p,n,G;if(t)for(G=Array(c.length),m=0;m<h.length;m+=3)g=h[m],G[g]=c[g];else G=c;m=0;for(p=h.length;m<p;)k=G[h[m++]],c=h[m++],g=h[m++],c?(c.scope?(l=a.$new(),da.$$addScopeInfo(z(k),l)):l=a,n=c.transcludeOnThisElement?Ma(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?Ma(a,b):null,c(g,l,k,d,n)):g&&g(a,k.childNodes,void 0,e)}for(var h=[],k=I(a)||a instanceof z,l,m,p,n,t,G=0;G<a.length;G++){l=new qc;
+        11===Ca&&Da(a,G,k);m=K(a[G],[],l,0===G?d:void 0,e);(g=m.length?Y(m,a[G],l,b,c,null,[],[],g):null)&&g.scope&&da.$$addScopeClass(l.$$element);l=g&&g.terminal||!(p=a[G].childNodes)||!p.length?null:Ua(p,g?(g.transcludeOnThisElement||!g.templateOnThisElement)&&g.transclude:b);if(g||l)h.push(G,g,l),n=!0,t=t||g;g=null}return n?f:null}function Da(a,b,c){var d=a[b],e=d.parentNode,g;if(d.nodeType===Oa)for(;;){g=e?d.nextSibling:a[b+1];if(!g||g.nodeType!==Oa)break;d.nodeValue+=g.nodeValue;g.parentNode&&g.parentNode.removeChild(g);
+        c&&g===a[b+1]&&a.splice(b+1,1)}}function Ma(a,b,c){function d(e,g,f,h,k){e||(e=a.$new(!1,k),e.$$transcluded=!0);return b(e,g,{parentBoundTranscludeFn:c,transcludeControllers:f,futureParentElement:h})}var e=d.$$slots=S(),g;for(g in b.$$slots)e[g]=b.$$slots[g]?Ma(a,b.$$slots[g],c):null;return d}function K(a,b,c,d,e){var g=c.$attr,f;switch(a.nodeType){case 1:f=ya(a);U(b,Ea(f),"E",d,e);for(var k,l,m,p,n=a.attributes,t=0,G=n&&n.length;t<G;t++){var H=!1,F=!1;k=n[t];l=k.name;m=k.value;k=Ea(l);(p=Pa.test(k))&&
+    (l=l.replace(od,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()}));(k=k.match(Qa))&&$(k[1])&&(H=l,F=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6));k=Ea(l.toLowerCase());g[k]=l;if(p||!c.hasOwnProperty(k))c[k]=m,kd(a,k)&&(c[k]=!0);wa(a,b,m,k,p);U(b,k,"A",d,e,H,F)}"input"===f&&"hidden"===a.getAttribute("type")&&a.setAttribute("autocomplete","off");if(!La)break;g=a.className;B(g)&&(g=g.animVal);if(E(g)&&""!==g)for(;a=h.exec(g);)k=Ea(a[2]),U(b,k,"C",d,e)&&(c[k]=Q(a[3])),g=g.substr(a.index+
+        a[0].length);break;case Oa:oa(b,a.nodeValue);break;case 8:if(!Ka)break;rc(a,b,c,d,e)}b.sort(la);return b}function rc(a,b,c,d,e){try{var f=g.exec(a.nodeValue);if(f){var h=Ea(f[1]);U(b,h,"M",d,e)&&(c[h]=Q(f[2]))}}catch(k){}}function pd(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ca("uterdir",b,c);1===a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return z(d)}function V(a,b,c){return function(d,e,g,f,h){e=
+        pd(e[0],b,c);return a(d,e,g,f,h)}}function W(a,b,c,d,e,g){var f;return a?da(b,c,d,e,g):function(){f||(f=da(b,c,d,e,g),b=c=g=null);return f.apply(this,arguments)}}function Y(a,b,d,e,g,f,h,k,l){function m(a,b,c,d){if(a){c&&(a=V(a,c,d));a.require=s.require;a.directiveName=R;if(J===s||s.$$isolateScope)a=ta(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=V(b,c,d));b.require=s.require;b.directiveName=R;if(J===s||s.$$isolateScope)b=ta(b,{isolateScope:!0});k.push(b)}}function p(a,e,g,f,l){function m(a,b,c,d){var e;
+        bb(a)||(d=c,c=b,b=a,a=void 0);T&&(e=M);c||(c=T?ga.parent():ga);if(d){var g=l.$$slots[d];if(g)return g(a,b,e,c,N);if(x(g))throw ca("noslot",d,za(ga));}else return l(a,b,e,c,N)}var n,s,v,y,ba,M,R,ga;b===g?(f=d,ga=d.$$element):(ga=z(g),f=new qc(ga,d));ba=e;J?y=e.$new(!0):t&&(ba=e.$parent);l&&(R=m,R.$$boundTransclude=l,R.isSlotFilled=function(a){return!!l.$$slots[a]});H&&(M=ea(ga,f,R,H,y,e,J));J&&(da.$$addScopeInfo(ga,y,!0,!(A&&(A===J||A===J.$$originalDirective))),da.$$addScopeClass(ga,!0),y.$$isolateBindings=
+        J.$$isolateBindings,s=qa(e,f,y,y.$$isolateBindings,J),s.removeWatches&&y.$on("$destroy",s.removeWatches));for(n in M){s=H[n];v=M[n];var P=s.$$bindings.bindToController;if(F){v.bindingInfo=P?qa(ba,f,v.instance,P,s):{};var q=v();q!==v.instance&&(v.instance=q,ga.data("$"+s.name+"Controller",q),v.bindingInfo.removeWatches&&v.bindingInfo.removeWatches(),v.bindingInfo=qa(ba,f,v.instance,P,s))}else v.instance=v(),ga.data("$"+s.name+"Controller",v.instance),v.bindingInfo=qa(ba,f,v.instance,P,s)}r(H,function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b){var c=a.require;a.bindToController&&!I(c)&&B(c)&&O(M[b].instance,X(b,c,ga,M))});r(M,function(a){var b=a.instance;if(C(b.$onChanges))try{b.$onChanges(a.bindingInfo.initialChanges)}catch(d){c(d)}if(C(b.$onInit))try{b.$onInit()}catch(e){c(e)}C(b.$doCheck)&&(ba.$watch(function(){b.$doCheck()}),b.$doCheck());C(b.$onDestroy)&&ba.$on("$destroy",function(){b.$onDestroy()})});n=0;for(s=h.length;n<s;n++)v=h[n],va(v,v.isolateScope?y:e,ga,f,v.require&&X(v.directiveName,v.require,ga,M),R);var N=e;J&&(J.template||
+        null===J.templateUrl)&&(N=y);a&&a(N,g.childNodes,void 0,l);for(n=k.length-1;0<=n;n--)v=k[n],va(v,v.isolateScope?y:e,ga,f,v.require&&X(v.directiveName,v.require,ga,M),R);r(M,function(a){a=a.instance;C(a.$postLink)&&a.$postLink()})}l=l||{};for(var n=-Number.MAX_VALUE,t=l.newScopeDirective,H=l.controllerDirectives,J=l.newIsolateScopeDirective,A=l.templateDirective,y=l.nonTlbTranscludeDirective,ba=!1,M=!1,T=l.hasElementTranscludeDirective,v=d.$$element=z(b),s,R,P,q=e,N,u=!1,Ib=!1,w,Da=0,D=a.length;Da<
+    D;Da++){s=a[Da];var Ta=s.$$start,E=s.$$end;Ta&&(v=pd(b,Ta,E));P=void 0;if(n>s.priority)break;if(w=s.scope)s.templateUrl||(B(w)?(aa("new/isolated scope",J||t,s,v),J=s):aa("new/isolated scope",J,s,v)),t=t||s;R=s.name;if(!u&&(s.replace&&(s.templateUrl||s.template)||s.transclude&&!s.$$tlb)){for(w=Da+1;u=a[w++];)if(u.transclude&&!u.$$tlb||u.replace&&(u.templateUrl||u.template)){Ib=!0;break}u=!0}!s.templateUrl&&s.controller&&(H=H||S(),aa("'"+R+"' controller",H[R],s,v),H[R]=s);if(w=s.transclude)if(ba=!0,
+    s.$$tlb||(aa("transclusion",y,s,v),y=s),"element"===w)T=!0,n=s.priority,P=v,v=d.$$element=z(da.$$createComment(R,d[R])),b=v[0],ma(g,xa.call(P,0),b),P[0].$$parentNode=P[0].parentNode,q=W(Ib,P,e,n,f&&f.name,{nonTlbTranscludeDirective:y});else{var na=S();if(B(w)){P=[];var Ua=S(),Ma=S();r(w,function(a,b){var c="?"===a.charAt(0);a=c?a.substring(1):a;Ua[a]=b;na[b]=null;Ma[b]=c});r(v.contents(),function(a){var b=Ua[Ea(ya(a))];b?(Ma[b]=!0,na[b]=na[b]||[],na[b].push(a)):P.push(a)});r(Ma,function(a,b){if(!a)throw ca("reqslot",
+        b);});for(var L in na)na[L]&&(na[L]=W(Ib,na[L],e))}else P=z(nc(b)).contents();v.empty();q=W(Ib,P,e,void 0,void 0,{needsNewScope:s.$$isolateScope||s.$$newScope});q.$$slots=na}if(s.template)if(M=!0,aa("template",A,s,v),A=s,w=C(s.template)?s.template(v,d):s.template,w=Ia(w),s.replace){f=s;P=kc.test(w)?qd(ka(s.templateNamespace,Q(w))):[];b=P[0];if(1!==P.length||1!==b.nodeType)throw ca("tplrt",R,"");ma(g,v,b);D={$attr:{}};w=K(b,[],D);var rc=a.splice(Da+1,a.length-(Da+1));(J||t)&&Z(w,J,t);a=a.concat(w).concat(rc);
+        fa(d,D);D=a.length}else v.html(w);if(s.templateUrl)M=!0,aa("template",A,s,v),A=s,s.replace&&(f=s),p=ja(a.splice(Da,a.length-Da),v,d,g,ba&&q,h,k,{controllerDirectives:H,newScopeDirective:t!==s&&t,newIsolateScopeDirective:J,templateDirective:A,nonTlbTranscludeDirective:y}),D=a.length;else if(s.compile)try{N=s.compile(v,d,q);var U=s.$$originalDirective||s;C(N)?m(null,Ra(U,N),Ta,E):N&&m(Ra(U,N.pre),Ra(U,N.post),Ta,E)}catch($){c($,za(v))}s.terminal&&(p.terminal=!0,n=Math.max(n,s.priority))}p.scope=t&&
+        !0===t.scope;p.transcludeOnThisElement=ba;p.templateOnThisElement=M;p.transclude=q;l.hasElementTranscludeDirective=T;return p}function X(a,b,c,d){var e;if(E(b)){var g=b.match(l);b=b.substring(g[0].length);var f=g[1]||g[3],g="?"===g[2];"^^"===f?c=c.parent():e=(e=d&&d[b])&&e.instance;if(!e){var h="$"+b+"Controller";e=f?c.inheritedData(h):c.data(h)}if(!e&&!g)throw ca("ctreq",b,a);}else if(I(b))for(e=[],f=0,g=b.length;f<g;f++)e[f]=X(a,b[f],c,d);else B(b)&&(e={},r(b,function(b,g){e[g]=X(a,b,c,d)}));return e||
+        null}function ea(a,b,c,d,e,g,f){var h=S(),k;for(k in d){var l=d[k],m={$scope:l===f||l.$$isolateScope?e:g,$element:a,$attrs:b,$transclude:c},p=l.controller;"@"===p&&(p=b[l.name]);m=R(p,m,!0,l.controllerAs);h[l.name]=m;a.data("$"+l.name+"Controller",m.instance)}return h}function Z(a,b,c){for(var d=0,e=a.length;d<e;d++)a[d]=$b(a[d],{$$isolateScope:b,$$newScope:c})}function U(b,c,e,g,h,k,l){if(c===h)return null;var m=null;if(f.hasOwnProperty(c)){h=a.get(c+"Directive");for(var p=0,n=h.length;p<n;p++)if(c=
+        h[p],(x(g)||g>c.priority)&&-1!==c.restrict.indexOf(e)){k&&(c=$b(c,{$$start:k,$$end:l}));if(!c.$$bindings){var t=m=c,G=c.name,H={isolateScope:null,bindToController:null};B(t.scope)&&(!0===t.bindToController?(H.bindToController=d(t.scope,G,!0),H.isolateScope={}):H.isolateScope=d(t.scope,G,!1));B(t.bindToController)&&(H.bindToController=d(t.bindToController,G,!0));if(H.bindToController&&!t.controller)throw ca("noctrl",G);m=m.$$bindings=H;B(m.isolateScope)&&(c.$$isolateBindings=m.isolateScope)}b.push(c);
+        m=c}}return m}function $(b){if(f.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,e=c.length;d<e;d++)if(b=c[d],b.multiElement)return!0;return!1}function fa(a,b){var c=b.$attr,d=a.$attr;r(a,function(d,e){"$"!==e.charAt(0)&&(b[e]&&b[e]!==d&&(d=d.length?d+(("style"===e?";":" ")+b[e]):b[e]),a.$set(e,d,!0,c[e]))});r(b,function(b,e){a.hasOwnProperty(e)||"$"===e.charAt(0)||(a[e]=b,"class"!==e&&"style"!==e&&(d[e]=c[e]))})}function ja(a,b,d,g,f,h,k,l){var m=[],p,n,t=b[0],H=a.shift(),s=$b(H,{templateUrl:null,
+        transclude:null,replace:null,$$originalDirective:H}),F=C(H.templateUrl)?H.templateUrl(b,d):H.templateUrl,v=H.templateNamespace;b.empty();e(F).then(function(c){var e,G;c=Ia(c);if(H.replace){c=kc.test(c)?qd(ka(v,Q(c))):[];e=c[0];if(1!==c.length||1!==e.nodeType)throw ca("tplrt",H.name,F);c={$attr:{}};ma(g,b,e);var J=K(e,[],c);B(H.scope)&&Z(J,!0);a=J.concat(a);fa(d,c)}else e=t,b.html(c);a.unshift(s);p=Y(a,e,d,f,b,H,h,k,l);r(g,function(a,c){a===e&&(g[c]=b[0])});for(n=Ua(b[0].childNodes,f);m.length;){c=
+        m.shift();G=m.shift();var y=m.shift(),A=m.shift(),J=b[0];if(!c.$$destroyed){if(G!==t){var M=G.className;l.hasElementTranscludeDirective&&H.replace||(J=nc(e));ma(y,z(G),J);na(z(J),M)}G=p.transcludeOnThisElement?Ma(c,p.transclude,A):A;p(n,c,J,g,G)}}m=null}).catch(function(a){bc(a)&&c(a)});return function(a,b,c,d,e){a=e;b.$$destroyed||(m?m.push(b,c,d,a):(p.transcludeOnThisElement&&(a=Ma(b,p.transclude,e)),p(n,b,c,d,a)))}}function la(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<
+    b.name?-1:1:a.index-b.index}function aa(a,b,c,d){function e(a){return a?" (module: "+a+")":""}if(b)throw ca("multidir",b.name,e(b.$$moduleName),c.name,e(c.$$moduleName),a,za(d));}function oa(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&da.$$addBindingClass(a);return function(a,c){var e=c.parent();b||da.$$addBindingClass(e);da.$$addBindingInfo(e,d.expressions);a.$watch(d,function(a){c[0].nodeValue=a})}}})}function ka(a,b){a=L(a||"html");switch(a){case "svg":case "math":var c=
+        w.document.createElement("div");c.innerHTML="<"+a+">"+b+"</"+a+">";return c.childNodes[0].childNodes;default:return b}}function ua(a,b){if("srcdoc"===b)return T.HTML;var c=ya(a);if("src"===b||"ngSrc"===b){if(-1===["img","video","audio","source","track"].indexOf(c))return T.RESOURCE_URL}else if("xlinkHref"===b||"form"===c&&"action"===b||"link"===c&&"href"===b)return T.RESOURCE_URL}function wa(a,c,d,e,g){var f=ua(a,e),h=k[e]||g,l=b(d,!g,f,h);if(l){if("multiple"===e&&"select"===ya(a))throw ca("selmulti",
+        za(a));if(m.test(e))throw ca("nodomevents");c.push({priority:100,compile:function(){return{pre:function(a,c,g){c=g.$$observers||(g.$$observers=S());var k=g[e];k!==d&&(l=k&&b(k,!0,f,h),d=k);l&&(g[e]=l(a),(c[e]||(c[e]=[])).$$inter=!0,(g.$$observers&&g.$$observers[e].$$scope||a).$watch(l,function(a,b){"class"===e&&a!==b?g.$updateClass(a,b):g.$set(e,a)}))}}}})}}function ma(a,b,c){var d=b[0],e=b.length,g=d.parentNode,f,h;if(a)for(f=0,h=a.length;f<h;f++)if(a[f]===d){a[f++]=c;h=f+e-1;for(var k=a.length;f<
+    k;f++,h++)h<k?a[f]=a[h]:delete a[f];a.length-=e-1;a.context===d&&(a.context=c);break}g&&g.replaceChild(c,d);a=w.document.createDocumentFragment();for(f=0;f<e;f++)a.appendChild(b[f]);z.hasData(d)&&(z.data(c,z.data(d)),z(d).off("$destroy"));z.cleanData(a.querySelectorAll("*"));for(f=1;f<e;f++)delete b[f];b[0]=c;b.length=1}function ta(a,b){return O(function(){return a.apply(null,arguments)},a,b)}function va(a,b,d,e,g,f){try{a(b,d,e,g,f)}catch(h){c(h,za(d))}}function pa(a,b){if(s)throw ca("missingattr",
+        a,b);}function qa(a,c,d,e,g){function f(b,c,e){C(d.$onChanges)&&!cc(c,e)&&(ha||(a.$$postDigest(N),ha=[]),m||(m={},ha.push(h)),m[b]&&(e=m[b].previousValue),m[b]=new Jb(e,c))}function h(){d.$onChanges(m);m=void 0}var k=[],l={},m;r(e,function(e,h){var m=e.attrName,n=e.optional,t,G,s,F;switch(e.mode){case "@":n||ra.call(c,m)||(pa(m,g.name),d[h]=c[m]=void 0);n=c.$observe(m,function(a){if(E(a)||Na(a))f(h,a,d[h]),d[h]=a});c.$$observers[m].$$scope=a;t=c[m];E(t)?d[h]=b(t)(a):Na(t)&&(d[h]=t);l[h]=new Jb(sc,
+        d[h]);k.push(n);break;case "=":if(!ra.call(c,m)){if(n)break;pa(m,g.name);c[m]=void 0}if(n&&!c[m])break;G=p(c[m]);F=G.literal?sa:cc;s=G.assign||function(){t=d[h]=G(a);throw ca("nonassign",c[m],m,g.name);};t=d[h]=G(a);n=function(b){F(b,d[h])||(F(b,t)?s(a,b=d[h]):d[h]=b);return t=b};n.$stateful=!0;n=e.collection?a.$watchCollection(c[m],n):a.$watch(p(c[m],n),null,G.literal);k.push(n);break;case "<":if(!ra.call(c,m)){if(n)break;pa(m,g.name);c[m]=void 0}if(n&&!c[m])break;G=p(c[m]);var v=G.literal,y=d[h]=
+        G(a);l[h]=new Jb(sc,d[h]);n=a.$watch(G,function(a,b){if(b===a){if(b===y||v&&sa(b,y))return;b=y}f(h,a,b);d[h]=a},v);k.push(n);break;case "&":n||ra.call(c,m)||pa(m,g.name);G=c.hasOwnProperty(m)?p(c[m]):D;if(G===D&&n)break;d[h]=function(b){return G(a,b)}}});return{initialChanges:l,removeWatches:k.length&&function(){for(var a=0,b=k.length;a<b;++a)k[a]()}}}var Ja=/^\w/,Ba=w.document.createElement("div"),Ka=y,La=t,Fa=v,ha;qc.prototype={$normalize:Ea,$addClass:function(a){a&&0<a.length&&P.addClass(this.$$element,
+            a)},$removeClass:function(a){a&&0<a.length&&P.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=rd(a,b);c&&c.length&&P.addClass(this.$$element,c);(c=rd(b,a))&&c.length&&P.removeClass(this.$$element,c)},$set:function(a,b,d,e){var g=kd(this.$$element[0],a),f=sd[a],h=a;g?(this.$$element.prop(a,b),e=g):f&&(this[f]=b,h=f);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Vc(a,"-"));g=ya(this.$$element);if("a"===g&&("href"===a||"xlinkHref"===a)||"img"===g&&"src"===a)this[a]=
+            b=q(b,"src"===a);else if("img"===g&&"srcset"===a&&u(b)){for(var g="",f=Q(b),k=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,k=/\s/.test(f)?k:/(,)/,f=f.split(k),k=Math.floor(f.length/2),l=0;l<k;l++)var m=2*l,g=g+q(Q(f[m]),!0),g=g+(" "+Q(f[m+1]));f=Q(f[2*l]).split(/\s/);g+=q(Q(f[0]),!0);2===f.length&&(g+=" "+Q(f[1]));this[a]=b=g}!1!==d&&(null===b||x(b)?this.$$element.removeAttr(e):Ja.test(e)?this.$$element.attr(e,b):Ta(this.$$element[0],e,b));(a=this.$$observers)&&r(a[h],function(a){try{a(b)}catch(d){c(d)}})},
+        $observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=S()),e=d[a]||(d[a]=[]);e.push(b);M.$evalAsync(function(){e.$$inter||!c.hasOwnProperty(a)||x(c[a])||b(c[a])});return function(){cb(e,b)}}};var Ga=b.startSymbol(),Ha=b.endSymbol(),Ia="{{"===Ga&&"}}"===Ha?ab:function(a){return a.replace(/\{\{/g,Ga).replace(/}}/g,Ha)},Pa=/^ngAttr[A-Z]/,Qa=/^(.+)Start$/;da.$$addBindingInfo=n?function(a,b){var c=a.data("$binding")||[];I(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:D;da.$$addBindingClass=
+        n?function(a){na(a,"ng-binding")}:D;da.$$addScopeInfo=n?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:D;da.$$addScopeClass=n?function(a,b){na(a,b?"ng-isolate-scope":"ng-scope")}:D;da.$$createComment=function(a,b){var c="";n&&(c=" "+(a||"")+": ",b&&(c+=b+" "));return w.document.createComment(c)};return da}]}function Jb(a,b){this.previousValue=a;this.currentValue=b}function Ea(a){return a.replace(od,"").replace(tg,function(a,d,c){return c?d.toUpperCase():d})}function rd(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       b){var d="",c=a.split(/\s+/),e=b.split(/\s+/),f=0;a:for(;f<c.length;f++){for(var g=c[f],h=0;h<e.length;h++)if(g===e[h])continue a;d+=(0<d.length?" ":"")+g}return d}function qd(a){a=z(a);var b=a.length;if(1>=b)return a;for(;b--;){var d=a[b];(8===d.nodeType||d.nodeType===Oa&&""===d.nodeValue.trim())&&ug.call(a,b,1)}return a}function sg(a,b){if(b&&E(b))return b;if(E(a)){var d=td.exec(a);if(d)return d[3]}}function yf(){var a={},b=!1;this.has=function(b){return a.hasOwnProperty(b)};this.register=function(b,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c){Ia(b,"controller");B(b)?O(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!B(a.$scope))throw K("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,p;h=!0===h;k&&E(k)&&(p=k);if(E(f)){k=f.match(td);if(!k)throw ud("ctrlfmt",f);m=k[1];p=p||k[3];f=a.hasOwnProperty(m)?a[m]:Xc(g.$scope,m,!0)||(b?Xc(c,m,!0):void 0);if(!f)throw ud("ctrlreg",m);sb(f,m,!0)}if(h)return h=(I(f)?f[f.length-1]:f).prototype,l=Object.create(h||
+        null),p&&e(g,p,l,m||f.name),O(function(){var a=d.invoke(f,l,g,m);a!==l&&(B(a)||C(a))&&(l=a,p&&e(g,p,l,m||f.name));return l},{instance:l,identifier:p});l=d.instantiate(f,g,m);p&&e(g,p,l,m||f.name);return l}}]}function zf(){this.$get=["$window",function(a){return z(a.document)}]}function Af(){this.$get=["$document","$rootScope",function(a,b){function d(){e=c.hidden}var c=a[0],e=c&&c.hidden;a.on("visibilitychange",d);b.$on("$destroy",function(){a.off("visibilitychange",d)});return function(){return e}}]}
+    function Bf(){this.$get=["$log",function(a){return function(b,d){a.error.apply(a,arguments)}}]}function tc(a){return B(a)?fa(a)?a.toISOString():eb(a):a}function Gf(){this.$get=function(){return function(a){if(!a)return"";var b=[];Oc(a,function(a,c){null===a||x(a)||C(a)||(I(a)?r(a,function(a){b.push(ja(c)+"="+ja(tc(a)))}):b.push(ja(c)+"="+ja(tc(a))))});return b.join("&")}}}function Hf(){this.$get=function(){return function(a){function b(a,e,f){null===a||x(a)||(I(a)?r(a,function(a,c){b(a,e+"["+(B(a)?
+        c:"")+"]")}):B(a)&&!fa(a)?Oc(a,function(a,c){b(a,e+(f?"":"[")+c+(f?"":"]"))}):d.push(ja(e)+"="+ja(tc(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function uc(a,b){if(E(a)){var d=a.replace(vg,"").trim();if(d){var c=b("Content-Type"),c=c&&0===c.indexOf(vd),e;(e=c)||(e=(e=d.match(wg))&&xg[e[0]].test(d));if(e)try{a=Rc(d)}catch(f){if(!c)return a;throw Kb("baddata",a,f);}}}return a}function wd(a){var b=S(),d;E(a)?r(a.split("\n"),function(a){d=a.indexOf(":");var e=L(Q(a.substr(0,d)));a=
+        Q(a.substr(d+1));e&&(b[e]=b[e]?b[e]+", "+a:a)}):B(a)&&r(a,function(a,d){var f=L(d),g=Q(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}function xd(a){var b;return function(d){b||(b=wd(a));return d?(d=b[L(d)],void 0===d&&(d=null),d):b}}function yd(a,b,d,c){if(C(c))return c(a,b,d);r(c,function(c){a=c(a,b,d)});return a}function Ff(){var a=this.defaults={transformResponse:[uc],transformRequest:[function(a){return B(a)&&"[object File]"!==ia.call(a)&&"[object Blob]"!==ia.call(a)&&"[object FormData]"!==ia.call(a)?
+            eb(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ka(vc),put:ka(vc),patch:ka(vc)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer",jsonpCallbackParam:"callback"},b=!1;this.useApplyAsync=function(a){return u(a)?(b=!!a,this):b};var d=this.interceptors=[];this.$get=["$browser","$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector","$sce",function(c,e,f,g,h,k,l,m){function p(b){function d(a,b){for(var c=0,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              e=b.length;c<e;){var g=b[c++],f=b[c++];a=a.then(g,f)}b.length=0;return a}function e(a,b){var c,d={};r(a,function(a,e){C(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}function g(a){var b=O({},a);b.data=yd(a.data,a.headers,a.status,f.transformResponse);a=a.status;return 200<=a&&300>a?b:k.reject(b)}if(!B(b))throw K("$http")("badreq",b);if(!E(m.valueOf(b.url)))throw K("$http")("badreq",b.url);var f=O({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer,
+        jsonpCallbackParam:a.jsonpCallbackParam},b);f.headers=function(b){var c=a.headers,d=O({},b.headers),g,f,h,c=O({},c.common,c[L(b.method)]);a:for(g in c){f=L(g);for(h in d)if(L(h)===f)continue a;d[g]=c[g]}return e(d,ka(b))}(b);f.method=ub(f.method);f.paramSerializer=E(f.paramSerializer)?l.get(f.paramSerializer):f.paramSerializer;c.$$incOutstandingRequestCount();var h=[],p=[];b=k.resolve(f);r(y,function(a){(a.request||a.requestError)&&h.unshift(a.request,a.requestError);(a.response||a.responseError)&&
+    p.push(a.response,a.responseError)});b=d(b,h);b=b.then(function(b){var c=b.headers,d=yd(b.data,xd(c),void 0,b.transformRequest);x(d)&&r(c,function(a,b){"content-type"===L(b)&&delete c[b]});x(b.withCredentials)&&!x(a.withCredentials)&&(b.withCredentials=a.withCredentials);return n(b,d).then(g,g)});b=d(b,p);return b=b.finally(function(){c.$$completeOutstandingRequest(D)})}function n(c,d){function g(a){if(a){var c={};r(a,function(a,d){c[d]=function(c){function d(){a(c)}b?h.$applyAsync(d):h.$$phase?d():
+        h.$apply(d)}});return c}}function l(a,c,d,e,g){function f(){n(c,a,d,e,g)}M&&(200<=a&&300>a?M.put(N,[a,c,wd(d),e,g]):M.remove(N));b?h.$applyAsync(f):(f(),h.$$phase||h.$apply())}function n(a,b,d,e,g){b=-1<=b?b:0;(200<=b&&300>b?J.resolve:J.reject)({data:a,status:b,headers:xd(d),config:c,statusText:e,xhrStatus:g})}function G(a){n(a.data,a.status,ka(a.headers()),a.statusText,a.xhrStatus)}function y(){var a=p.pendingRequests.indexOf(c);-1!==a&&p.pendingRequests.splice(a,1)}var J=k.defer(),R=J.promise,M,
+        T,P=c.headers,q="jsonp"===L(c.method),N=c.url;q?N=m.getTrustedResourceUrl(N):E(N)||(N=m.valueOf(N));N=F(N,c.paramSerializer(c.params));q&&(N=s(N,c.jsonpCallbackParam));p.pendingRequests.push(c);R.then(y,y);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(M=B(c.cache)?c.cache:B(a.cache)?a.cache:v);M&&(T=M.get(N),u(T)?T&&C(T.then)?T.then(G,G):I(T)?n(T[1],T[0],ka(T[2]),T[3],T[4]):n(T,200,{},"OK","complete"):M.put(N,R));x(T)&&((T=zd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:
+        void 0)&&(P[c.xsrfHeaderName||a.xsrfHeaderName]=T),e(c.method,N,d,l,P,c.timeout,c.withCredentials,c.responseType,g(c.eventHandlers),g(c.uploadEventHandlers)));return R}function F(a,b){0<b.length&&(a+=(-1===a.indexOf("?")?"?":"&")+b);return a}function s(a,b){var c=a.split("?");if(2<c.length)throw Kb("badjsonp",a);c=ec(c[1]);r(c,function(c,d){if("JSON_CALLBACK"===c)throw Kb("badjsonp",a);if(d===b)throw Kb("badjsonp",b,a);});return a+=(-1===a.indexOf("?")?"?":"&")+b+"=JSON_CALLBACK"}var v=g("$http");
+        a.paramSerializer=E(a.paramSerializer)?l.get(a.paramSerializer):a.paramSerializer;var y=[];r(d,function(a){y.unshift(E(a)?l.get(a):l.invoke(a))});p.pendingRequests=[];(function(a){r(arguments,function(a){p[a]=function(b,c){return p(O({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){r(arguments,function(a){p[a]=function(b,c,d){return p(O({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");p.defaults=a;return p}]}function Jf(){this.$get=function(){return function(){return new w.XMLHttpRequest}}}
+    function If(){this.$get=["$browser","$jsonpCallbacks","$document","$xhrFactory",function(a,b,d,c){return yg(a,c,a.defer,b,d[0])}]}function yg(a,b,d,c,e){function f(a,b,d){a=a.replace("JSON_CALLBACK",b);var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m);f.removeEventListener("error",m);e.body.removeChild(f);f=null;var g=-1,F="unknown";a&&("load"!==a.type||c.wasCalled(b)||(a={type:"error"}),F=a.type,g="error"===a.type?404:
+        200);d&&d(g,F)};f.addEventListener("load",m);f.addEventListener("error",m);e.body.appendChild(f);return m}return function(e,h,k,l,m,p,n,F,s,v){function y(){q&&q();A&&A.abort()}function t(a,b,c,e,g,f){u(G)&&d.cancel(G);q=A=null;a(b,c,e,g,f)}h=h||a.url();if("jsonp"===L(e))var Aa=c.createCallback(h),q=f(h,Aa,function(a,b){var d=200===a&&c.getResponse(Aa);t(l,a,d,"",b,"complete");c.removeCallback(Aa)});else{var A=b(e,h);A.open(e,h,!0);r(m,function(a,b){u(a)&&A.setRequestHeader(b,a)});A.onload=function(){var a=
+        A.statusText||"",b="response"in A?A.response:A.responseText,c=1223===A.status?204:A.status;0===c&&(c=b?200:"file"===ta(h).protocol?404:0);t(l,c,b,A.getAllResponseHeaders(),a,"complete")};A.onerror=function(){t(l,-1,null,null,"","error")};A.onabort=function(){t(l,-1,null,null,"","abort")};A.ontimeout=function(){t(l,-1,null,null,"","timeout")};r(s,function(a,b){A.addEventListener(b,a)});r(v,function(a,b){A.upload.addEventListener(b,a)});n&&(A.withCredentials=!0);if(F)try{A.responseType=F}catch(H){if("json"!==
+        F)throw H;}A.send(x(k)?null:k)}if(0<p)var G=d(y,p);else p&&C(p.then)&&p.then(y)}}function Df(){var a="{{",b="}}";this.startSymbol=function(b){return b?(a=b,this):a};this.endSymbol=function(a){return a?(b=a,this):b};this.$get=["$parse","$exceptionHandler","$sce",function(d,c,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(p,a).replace(n,b)}function h(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function k(f,k,p,n){function t(a){try{var b=a;a=p?e.getTrusted(p,
+        b):e.valueOf(b);return n&&!u(a)?a:gc(a)}catch(d){c(Fa.interr(f,d))}}if(!f.length||-1===f.indexOf(a)){var r;k||(k=g(f),r=la(k),r.exp=f,r.expressions=[],r.$$watchDelegate=h);return r}n=!!n;var q,A,H=0,G=[],ba=[];r=f.length;for(var J=[],R=[];H<r;)if(-1!==(q=f.indexOf(a,H))&&-1!==(A=f.indexOf(b,q+l)))H!==q&&J.push(g(f.substring(H,q))),H=f.substring(q+l,A),G.push(H),ba.push(d(H,t)),H=A+m,R.push(J.length),J.push("");else{H!==r&&J.push(g(f.substring(H)));break}p&&1<J.length&&Fa.throwNoconcat(f);if(!k||G.length){var M=
+        function(a){for(var b=0,c=G.length;b<c;b++){if(n&&x(a[b]))return;J[R[b]]=a[b]}return J.join("")};return O(function(a){var b=0,d=G.length,e=Array(d);try{for(;b<d;b++)e[b]=ba[b](a);return M(e)}catch(g){c(Fa.interr(f,g))}},{exp:f,expressions:G,$$watchDelegate:function(a,b){var c;return a.$watchGroup(ba,function(d,e){var g=M(d);b.call(this,g,d!==e?c:g,a);c=g})}})}}var l=a.length,m=b.length,p=new RegExp(a.replace(/./g,f),"g"),n=new RegExp(b.replace(/./g,f),"g");k.startSymbol=function(){return a};k.endSymbol=
+        function(){return b};return k}]}function Ef(){this.$get=["$rootScope","$window","$q","$$q","$browser",function(a,b,d,c,e){function f(f,k,l,m){function p(){n?f.apply(null,F):f(y)}var n=4<arguments.length,F=n?xa.call(arguments,4):[],s=b.setInterval,v=b.clearInterval,y=0,t=u(m)&&!m,r=(t?c:d).defer(),q=r.promise;l=u(l)?l:0;q.$$intervalId=s(function(){t?e.defer(p):a.$evalAsync(p);r.notify(y++);0<l&&y>=l&&(r.resolve(y),v(q.$$intervalId),delete g[q.$$intervalId]);t||a.$apply()},k);g[q.$$intervalId]=r;return q}
+        var g={};f.cancel=function(a){return a&&a.$$intervalId in g?(g[a.$$intervalId].promise.$$state.pur=!0,g[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),delete g[a.$$intervalId],!0):!1};return f}]}function wc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=fb(a[b].replace(/%2F/g,"/"));return a.join("/")}function Ad(a,b){var d=ta(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Z(d.port)||zg[d.protocol]||null}function Bd(a,b,d){if(Ag.test(a))throw kb("badpath",a);var c="/"!==
+        a.charAt(0);c&&(a="/"+a);a=ta(a);for(var c=(c&&"/"===a.pathname.charAt(0)?a.pathname.substring(1):a.pathname).split("/"),e=c.length;e--;)c[e]=decodeURIComponent(c[e]),d&&(c[e]=c[e].replace(/\//g,"%2F"));d=c.join("/");b.$$path=d;b.$$search=ec(a.search);b.$$hash=decodeURIComponent(a.hash);b.$$path&&"/"!==b.$$path.charAt(0)&&(b.$$path="/"+b.$$path)}function xc(a,b){return a.slice(0,b.length)===b}function ua(a,b){if(xc(b,a))return b.substr(a.length)}function La(a){var b=a.indexOf("#");return-1===b?a:
+        a.substr(0,b)}function lb(a){return a.replace(/(#.+)|#$/,"$1")}function yc(a,b,d){this.$$html5=!0;d=d||"";Ad(a,this);this.$$parse=function(a){var d=ua(b,a);if(!E(d))throw kb("ipthprfx",a,b);Bd(d,this,!0);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=fc(this.$$search),d=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(a?"?"+a:"")+d;this.$$absUrl=b+this.$$url.substr(1);this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),
+        !0;var f,g;u(f=ua(a,c))?(g=f,g=d&&u(f=ua(d,f))?b+(ua("/",f)||f):a+g):u(f=ua(b,c))?g=b+f:b===c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function zc(a,b,d){Ad(a,this);this.$$parse=function(c){var e=ua(a,c)||ua(b,c),f;x(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",x(e)&&(a=c,this.replace())):(f=ua(d,e),x(f)&&(f=e));Bd(f,this,!1);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;xc(f,e)&&(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=fc(this.$$search),
+        e=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"");this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(b,d){return La(a)===La(b)?(this.$$parse(b),!0):!1}}function Cd(a,b,d){this.$$html5=!0;zc.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;a===La(c)?f=c:(g=ua(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=fc(this.$$search),
+        e=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url;this.$$urlUpdatedByLocation=!0}}function Lb(a){return function(){return this[a]}}function Dd(a,b){return function(d){if(x(d))return this[a];this[a]=b(d);this.$$compose();return this}}function Lf(){var a="!",b={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(b){return u(b)?(a=b,this):a};this.html5Mode=function(a){if(Na(a))return b.enabled=a,this;if(B(a)){Na(a.enabled)&&(b.enabled=
+        a.enabled);Na(a.requireBase)&&(b.requireBase=a.requireBase);if(Na(a.rewriteLinks)||E(a.rewriteLinks))b.rewriteLinks=a.rewriteLinks;return this}return b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),g=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(f){throw l.url(e),l.$$state=g,f;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,b)}var l,m;m=c.baseHref();var p=c.url(),n;if(b.enabled){if(!m&&
+        b.requireBase)throw kb("nobase");n=p.substring(0,p.indexOf("/",p.indexOf("//")+2))+(m||"/");m=e.history?yc:Cd}else n=La(p),m=zc;var F=n.substr(0,La(n).lastIndexOf("/")+1);l=new m(n,F,"#"+a);l.$$parseLinkUrl(p,p);l.$$state=c.state();var s=/^\s*(javascript|mailto):/i;f.on("click",function(a){var e=b.rewriteLinks;if(e&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&2!==a.which&&2!==a.button){for(var h=z(a.target);"a"!==ya(h[0]);)if(h[0]===f[0]||!(h=h.parent())[0])return;if(!E(e)||!x(h.attr(e))){var e=h.prop("href"),
+        k=h.attr("href")||h.attr("xlink:href");B(e)&&"[object SVGAnimatedString]"===e.toString()&&(e=ta(e.animVal).href);s.test(e)||!e||h.attr("target")||a.isDefaultPrevented()||!l.$$parseLinkUrl(e,k)||(a.preventDefault(),l.absUrl()!==c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}}});lb(l.absUrl())!==lb(p)&&c.url(l.absUrl(),!0);var v=!0;c.onUrlChange(function(a,b){xc(a,F)?(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,g;a=lb(a);l.$$parse(a);l.$$state=b;g=d.$broadcast("$locationChangeStart",
+        a,c,b,e).defaultPrevented;l.absUrl()===a&&(g?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(v=!1,k(c,e)))}),d.$$phase||d.$digest()):g.location.href=a});d.$watch(function(){if(v||l.$$urlUpdatedByLocation){l.$$urlUpdatedByLocation=!1;var a=lb(c.url()),b=lb(l.absUrl()),g=c.state(),f=l.$$replace,m=a!==b||l.$$html5&&e.history&&g!==l.$$state;if(v||m)v=!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,g).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=g):
+        (m&&h(b,f,g===l.$$state?null:l.$$state),k(a,g)))})}l.$$replace=!1});return l}]}function Mf(){var a=!0,b=this;this.debugEnabled=function(b){return u(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){bc(a)&&(a.stack&&f?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||D;return function(){var a=[];r(arguments,function(b){a.push(c(b))});return Function.prototype.apply.call(e,
+        b,a)}}var f=Ca||/\bEdge\//.test(d.navigator&&d.navigator.userAgent);return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}function Bg(a){return a+""}function Cg(a,b){return"undefined"!==typeof a?a:b}function Ed(a,b){return"undefined"===typeof a?b:"undefined"===typeof b?a:a+b}function Dg(a,b){switch(a.type){case q.MemberExpression:if(a.computed)return!1;break;case q.UnaryExpression:return 1;case q.BinaryExpression:return"+"!==
+    a.operator?1:!1;case q.CallExpression:return!1}return void 0===b?Fd:b}function W(a,b,d){var c,e,f=a.isPure=Dg(a,d);switch(a.type){case q.Program:c=!0;r(a.body,function(a){W(a.expression,b,f);c=c&&a.expression.constant});a.constant=c;break;case q.Literal:a.constant=!0;a.toWatch=[];break;case q.UnaryExpression:W(a.argument,b,f);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case q.BinaryExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=
+        a.left.toWatch.concat(a.right.toWatch);break;case q.LogicalExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case q.ConditionalExpression:W(a.test,b,f);W(a.alternate,b,f);W(a.consequent,b,f);a.constant=a.test.constant&&a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case q.Identifier:a.constant=!1;a.toWatch=[a];break;case q.MemberExpression:W(a.object,b,f);a.computed&&W(a.property,b,f);a.constant=a.object.constant&&
+        (!a.computed||a.property.constant);a.toWatch=a.constant?[]:[a];break;case q.CallExpression:c=d=a.filter?!b(a.callee.name).$stateful:!1;e=[];r(a.arguments,function(a){W(a,b,f);c=c&&a.constant;e.push.apply(e,a.toWatch)});a.constant=c;a.toWatch=d?e:[a];break;case q.AssignmentExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case q.ArrayExpression:c=!0;e=[];r(a.elements,function(a){W(a,b,f);c=c&&a.constant;e.push.apply(e,a.toWatch)});a.constant=c;
+        a.toWatch=e;break;case q.ObjectExpression:c=!0;e=[];r(a.properties,function(a){W(a.value,b,f);c=c&&a.value.constant;e.push.apply(e,a.value.toWatch);a.computed&&(W(a.key,b,!1),c=c&&a.key.constant,e.push.apply(e,a.key.toWatch))});a.constant=c;a.toWatch=e;break;case q.ThisExpression:a.constant=!1;a.toWatch=[];break;case q.LocalsExpression:a.constant=!1,a.toWatch=[]}}function Gd(a){if(1===a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:void 0}}function Hd(a){return a.type===
+        q.Identifier||a.type===q.MemberExpression}function Id(a){if(1===a.body.length&&Hd(a.body[0].expression))return{type:q.AssignmentExpression,left:a.body[0].expression,right:{type:q.NGValueParameter},operator:"="}}function Jd(a){this.$filter=a}function Kd(a){this.$filter=a}function Mb(a,b,d){this.ast=new q(a,d);this.astCompiler=d.csp?new Kd(b):new Jd(b)}function Ac(a){return C(a.valueOf)?a.valueOf():Eg.call(a)}function Nf(){var a=S(),b={"true":!0,"false":!1,"null":null,undefined:void 0},d,c;this.addLiteral=
+        function(a,c){b[a]=c};this.setIdentifierFns=function(a,b){d=a;c=b;return this};this.$get=["$filter",function(e){function f(b,c){var d,g;switch(typeof b){case "string":return g=b=b.trim(),d=a[g],d||(d=new Nb(n),d=(new Mb(d,e,n)).parse(b),d.constant?d.$$watchDelegate=m:d.oneTime?d.$$watchDelegate=d.literal?l:k:d.inputs&&(d.$$watchDelegate=h),a[g]=d),p(d,c);case "function":return p(b,c);default:return p(D,c)}}function g(a,b,c){return null==a||null==b?a===b:"object"!==typeof a||(a=Ac(a),"object"!==typeof a||
+    c)?a===b||a!==a&&b!==b:!1}function h(a,b,c,d,e){var f=d.inputs,h;if(1===f.length){var k=g,f=f[0];return a.$watch(function(a){var b=f(a);g(b,k,f.isPure)||(h=d(a,void 0,void 0,[b]),k=b&&Ac(b));return h},b,c,e)}for(var l=[],m=[],p=0,n=f.length;p<n;p++)l[p]=g,m[p]=null;return a.$watch(function(a){for(var b=!1,c=0,e=f.length;c<e;c++){var k=f[c](a);if(b||(b=!g(k,l[c],f[c].isPure)))m[c]=k,l[c]=k&&Ac(k)}b&&(h=d(a,void 0,void 0,m));return h},b,c,e)}function k(a,b,c,d,e){function g(a){return d(a)}function f(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c,d){l=a;C(b)&&b(a,c,d);u(a)&&d.$$postDigest(function(){u(l)&&k()})}var k,l;return k=d.inputs?h(a,f,c,d,e):a.$watch(g,f,c)}function l(a,b,c,d){function e(a){var b=!0;r(a,function(a){u(a)||(b=!1)});return b}var g,f;return g=a.$watch(function(a){return d(a)},function(a,c,d){f=a;C(b)&&b(a,c,d);e(a)&&d.$$postDigest(function(){e(f)&&g()})},c)}function m(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function p(a,b){if(!b)return a;var c=a.$$watchDelegate,d=!1,e=c!==l&&c!==k?function(c,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 e,g,f){g=d&&f?f[0]:a(c,e,g,f);return b(g,c,e)}:function(c,d,e,g){e=a(c,d,e,g);c=b(e,c,d);return u(e)?c:e},d=!a.inputs;c&&c!==h?(e.$$watchDelegate=c,e.inputs=a.inputs):b.$stateful||(e.$$watchDelegate=h,e.inputs=a.inputs?a.inputs:[a]);e.inputs&&(e.inputs=e.inputs.map(function(a){return a.isPure===Fd?function(b){return a(b)}:a}));return e}var n={csp:Ja().noUnsafeEval,literals:pa(b),isIdentifierStart:C(d)&&d,isIdentifierContinue:C(c)&&c};f.$$getAst=function(a){var b=new Nb(n);return(new Mb(b,e,n)).getAst(a).ast};
+        return f}]}function Pf(){var a=!0;this.$get=["$rootScope","$exceptionHandler",function(b,d){return Ld(function(a){b.$evalAsync(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Qf(){var a=!0;this.$get=["$browser","$exceptionHandler",function(b,d){return Ld(function(a){b.defer(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Ld(a,b,d){function c(){return new e}function e(){var a=this.promise=new f;this.resolve=function(b){k(a,
+        b)};this.reject=function(b){m(a,b)};this.notify=function(b){n(a,b)}}function f(){this.$$state={status:0}}function g(){for(;!u&&w.length;){var a=w.shift();if(!a.pur){a.pur=!0;var c=a.value,c="Possibly unhandled rejection: "+("function"===typeof c?c.toString().replace(/ \{[\s\S]*$/,""):x(c)?"undefined":"string"!==typeof c?De(c,void 0):c);bc(a.value)?b(a.value,c):b(c)}}}function h(c){!d||c.pending||2!==c.status||c.pur||(0===u&&0===w.length&&a(g),w.push(c));!c.processScheduled&&c.pending&&(c.processScheduled=
+        !0,++u,a(function(){var e,f,h;h=c.pending;c.processScheduled=!1;c.pending=void 0;try{for(var l=0,p=h.length;l<p;++l){c.pur=!0;f=h[l][0];e=h[l][c.status];try{C(e)?k(f,e(c.value)):1===c.status?k(f,c.value):m(f,c.value)}catch(n){m(f,n),n&&!0===n.$$passToExceptionHandler&&b(n)}}}finally{--u,d&&0===u&&a(g)}}))}function k(a,b){a.$$state.status||(b===a?p(a,t("qcycle",b)):l(a,b))}function l(a,b){function c(b){g||(g=!0,l(a,b))}function d(b){g||(g=!0,p(a,b))}function e(b){n(a,b)}var f,g=!1;try{if(B(b)||C(b))f=
+        b.then;C(f)?(a.$$state.status=-1,f.call(b,c,d,e)):(a.$$state.value=b,a.$$state.status=1,h(a.$$state))}catch(k){d(k)}}function m(a,b){a.$$state.status||p(a,b)}function p(a,b){a.$$state.value=b;a.$$state.status=2;h(a.$$state)}function n(c,d){var e=c.$$state.pending;0>=c.$$state.status&&e&&e.length&&a(function(){for(var a,c,g=0,f=e.length;g<f;g++){c=e[g][0];a=e[g][3];try{n(c,C(a)?a(d):d)}catch(h){b(h)}}})}function F(a){var b=new f;m(b,a);return b}function s(a,b,c){var d=null;try{C(c)&&(d=c())}catch(e){return F(e)}return d&&
+    C(d.then)?d.then(function(){return b(a)},F):b(a)}function v(a,b,c,d){var e=new f;k(e,a);return e.then(b,c,d)}function q(a){if(!C(a))throw t("norslvr",a);var b=new f;a(function(a){k(b,a)},function(a){m(b,a)});return b}var t=K("$q",TypeError),u=0,w=[];O(f.prototype,{then:function(a,b,c){if(x(a)&&x(b)&&x(c))return this;var d=new f;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&h(this.$$state);return d},"catch":function(a){return this.then(null,
+            a)},"finally":function(a,b){return this.then(function(b){return s(b,A,a)},function(b){return s(b,F,a)},b)}});var A=v;q.prototype=f.prototype;q.defer=c;q.reject=F;q.when=v;q.resolve=A;q.all=function(a){var b=new f,c=0,d=I(a)?[]:{};r(a,function(a,e){c++;v(a).then(function(a){d[e]=a;--c||k(b,d)},function(a){m(b,a)})});0===c&&k(b,d);return b};q.race=function(a){var b=c();r(a,function(a){v(a).then(b.resolve,b.reject)});return b.promise};return q}function Zf(){this.$get=["$window","$timeout",function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                b){var d=a.requestAnimationFrame||a.webkitRequestAnimationFrame,c=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.webkitCancelRequestAnimationFrame,e=!!d,f=e?function(a){var b=d(a);return function(){c(b)}}:function(a){var c=b(a,16.66,!1);return function(){b.cancel(c)}};f.supported=e;return f}]}function Of(){function a(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++qb;this.$$ChildScope=
+        null}b.prototype=a;return b}var b=10,d=K("$rootScope"),c=null,e=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$exceptionHandler","$parse","$browser",function(f,g,h){function k(a){a.currentScope.$$destroyed=!0}function l(a){9===Ca&&(a.$$childHead&&l(a.$$childHead),a.$$nextSibling&&l(a.$$nextSibling));a.$parent=a.$$nextSibling=a.$$prevSibling=a.$$childHead=a.$$childTail=a.$root=a.$$watchers=null}function m(){this.$id=++qb;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=
+        this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function p(a){if(t.$$phase)throw d("inprog",t.$$phase);t.$$phase=a}function n(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function F(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function s(){}function v(){for(;A.length;)try{A.shift()()}catch(a){f(a)}e=
+        null}function q(){null===e&&(e=h.defer(function(){t.$apply(v)}))}m.prototype={constructor:m,$new:function(b,c){var d;c=c||this;b?(d=new m,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=a(this)),d=new this.$$ChildScope);d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(b||c!==this)&&d.$on("$destroy",k);return d},$watch:function(a,b,d,e){var f=g(a);b=C(b)?b:D;if(f.$$watchDelegate)return f.$$watchDelegate(this,
+            b,d,f,a);var h=this,k=h.$$watchers,l={fn:b,last:s,get:f,exp:e||a,eq:!!d};c=null;k||(k=h.$$watchers=[],k.$$digestWatchIndex=-1);k.unshift(l);k.$$digestWatchIndex++;n(this,1);return function(){var a=cb(k,l);0<=a&&(n(h,-1),a<k.$$digestWatchIndex&&k.$$digestWatchIndex--);c=null}},$watchGroup:function(a,b){function c(){h=!1;k?(k=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,k=!0;if(!a.length){var l=!0;g.$evalAsync(function(){l&&b(e,e,g)});return function(){l=!1}}if(1===
+            a.length)return this.$watch(a[0],function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});r(a,function(a,b){var k=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(k)});return function(){for(;f.length;)f.shift()()}},$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!x(e)){if(B(e))if(wa(e))for(f!==p&&(f=p,t=f.length=0,l++),a=e.length,t!==a&&(l++,f.length=t=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(l++,f[b]=g);else{f!==n&&(f=n={},t=0,l++);a=0;for(b in e)ra.call(e,
+            b)&&(a++,g=e[b],h=f[b],b in f?(d=h!==h&&g!==g,d||h===g||(l++,f[b]=g)):(t++,f[b]=g,l++));if(t>a)for(b in l++,f)ra.call(e,b)||(t--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,h,k=1<b.length,l=0,m=g(a,c),p=[],n={},s=!0,t=0;return this.$watch(m,function(){s?(s=!1,b(e,e,d)):b(e,h,d);if(k)if(B(e))if(wa(e)){h=Array(e.length);for(var a=0;a<e.length;a++)h[a]=e[a]}else for(a in h={},e)ra.call(e,a)&&(h[a]=e[a]);else h=e})},$digest:function(){var a,g,k,l,m,n,r,F=b,q,A=[],y,x;p("$digest");
+            h.$$checkUrlChange();this===t&&null!==e&&(h.defer.cancel(e),v());c=null;do{r=!1;q=this;for(n=0;n<u.length;n++){try{x=u[n],l=x.fn,l(x.scope,x.locals)}catch(z){f(z)}c=null}u.length=0;a:do{if(n=q.$$watchers)for(n.$$digestWatchIndex=n.length;n.$$digestWatchIndex--;)try{if(a=n[n.$$digestWatchIndex])if(m=a.get,(g=m(q))!==(k=a.last)&&!(a.eq?sa(g,k):U(g)&&U(k)))r=!0,c=a,a.last=a.eq?pa(g,null):g,l=a.fn,l(g,k===s?g:k,q),5>F&&(y=4-F,A[y]||(A[y]=[]),A[y].push({msg:C(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):
+                    a.exp,newVal:g,oldVal:k}));else if(a===c){r=!1;break a}}catch(D){f(D)}if(!(n=q.$$watchersCount&&q.$$childHead||q!==this&&q.$$nextSibling))for(;q!==this&&!(n=q.$$nextSibling);)q=q.$parent}while(q=n);if((r||u.length)&&!F--)throw t.$$phase=null,d("infdig",b,A);}while(r||u.length);for(t.$$phase=null;H<w.length;)try{w[H++]()}catch(B){f(B)}w.length=H=0;h.$$checkUrlChange()},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===t&&h.$$applicationDestroyed();
+            n(this,-this.$$watchersCount);for(var b in this.$$listenerCount)F(this,this.$$listenerCount[b],b);a&&a.$$childHead===this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail===this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=D;this.$on=this.$watch=this.$watchGroup=function(){return D};this.$$listeners=
+                {};this.$$nextSibling=null;l(this)}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a,b){t.$$phase||u.length||h.defer(function(){u.length&&t.$digest()});u.push({scope:this,fn:g(a),locals:b})},$$postDigest:function(a){w.push(a)},$apply:function(a){try{p("$apply");try{return this.$eval(a)}finally{t.$$phase=null}}catch(b){f(b)}finally{try{t.$digest()}catch(c){throw f(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&A.push(b);a=g(a);q()},$on:function(a,b){var c=this.$$listeners[a];
+            c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(delete c[d],F(e,1,a))}},$emit:function(a,b){var c=[],d,e=this,g=!1,h={name:a,targetScope:e,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=db([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,
+            k)}catch(n){f(n)}else d.splice(l,1),l--,m--;if(g)break;e=e.$parent}while(e);h.currentScope=null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var g=db([e],arguments,1),h,k;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,g)}catch(l){f(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||
+            c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=null;return e}};var t=new m,u=t.$$asyncQueue=[],w=t.$$postDigestQueue=[],A=t.$$applyAsyncQueue=[],H=0;return t}]}function Ge(){var a=/^\s*(https?|s?ftp|mailto|tel|file):/,b=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(b){return u(b)?(a=b,this):a};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b=a,this):b};this.$get=function(){return function(d,c){var e=c?b:
+        a,f;f=ta(d&&d.trim()).href;return""===f||f.match(e)?d:"unsafe:"+f}}}function Fg(a){if("self"===a)return a;if(E(a)){if(-1<a.indexOf("***"))throw va("iwcard",a);a=Md(a).replace(/\\\*\\\*/g,".*").replace(/\\\*/g,"[^:/.?&;]*");return new RegExp("^"+a+"$")}if($a(a))return new RegExp("^"+a.source+"$");throw va("imatcher");}function Nd(a){var b=[];u(a)&&r(a,function(a){b.push(Fg(a))});return b}function Sf(){this.SCE_CONTEXTS=oa;var a=["self"],b=[];this.resourceUrlWhitelist=function(b){arguments.length&&
+    (a=Nd(b));return a};this.resourceUrlBlacklist=function(a){arguments.length&&(b=Nd(a));return b};this.$get=["$injector",function(d){function c(a,b){return"self"===a?zd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw va("unsafe");};d.has("$sanitize")&&
+    (f=d.get("$sanitize"));var g=e(),h={};h[oa.HTML]=e(g);h[oa.CSS]=e(g);h[oa.URL]=e(g);h[oa.JS]=e(g);h[oa.RESOURCE_URL]=e(h[oa.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw va("icontext",a,b);if(null===b||x(b)||""===b)return b;if("string"!==typeof b)throw va("itype",a);return new c(b)},getTrusted:function(d,e){if(null===e||x(e)||""===e)return e;var g=h.hasOwnProperty(d)?h[d]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(d===oa.RESOURCE_URL){var g=ta(e.toString()),
+            p,n,r=!1;p=0;for(n=a.length;p<n;p++)if(c(a[p],g)){r=!0;break}if(r)for(p=0,n=b.length;p<n;p++)if(c(b[p],g)){r=!1;break}if(r)return e;throw va("insecurl",e.toString());}if(d===oa.HTML)return f(e);throw va("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function Rf(){var a=!0;this.enabled=function(b){arguments.length&&(a=!!b);return a};this.$get=["$parse","$sceDelegate",function(b,d){if(a&&8>Ca)throw va("iequirks");var c=ka(oa);c.isEnabled=function(){return a};c.trustAs=
+        d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},c.valueOf=ab);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,f=c.getTrusted,g=c.trustAs;r(oa,function(a,b){var d=L(b);c[("parse_as_"+d).replace(Bc,wb)]=function(b){return e(a,b)};c[("get_trusted_"+d).replace(Bc,wb)]=function(b){return f(a,b)};c[("trust_as_"+d).replace(Bc,wb)]=function(b){return g(a,b)}});return c}]}
+    function Tf(){this.$get=["$window","$document",function(a,b){var d={},c=!((!a.nw||!a.nw.process)&&a.chrome&&(a.chrome.app&&a.chrome.app.runtime||!a.chrome.app&&a.chrome.runtime&&a.chrome.runtime.id))&&a.history&&a.history.pushState,e=Z((/android (\d+)/.exec(L((a.navigator||{}).userAgent))||[])[1]),f=/Boxee/i.test((a.navigator||{}).userAgent),g=b[0]||{},h=g.body&&g.body.style,k=!1,l=!1;h&&(k=!!("transition"in h||"webkitTransition"in h),l=!!("animation"in h||"webkitAnimation"in h));return{history:!(!c||
+            4>e||f),hasEvent:function(a){if("input"===a&&Ca)return!1;if(x(d[a])){var b=g.createElement("div");d[a]="on"+a in b}return d[a]},csp:Ja(),transitions:k,animations:l,android:e}}]}function Vf(){var a;this.httpOptions=function(b){return b?(a=b,this):a};this.$get=["$exceptionHandler","$templateCache","$http","$q","$sce",function(b,d,c,e,f){function g(h,k){g.totalPendingRequests++;if(!E(h)||x(d.get(h)))h=f.getTrustedResourceUrl(h);var l=c.defaults&&c.defaults.transformResponse;I(l)?l=l.filter(function(a){return a!==
+        uc}):l===uc&&(l=null);return c.get(h,O({cache:d,transformResponse:l},a)).finally(function(){g.totalPendingRequests--}).then(function(a){d.put(h,a.data);return a.data},function(a){k||(a=Gg("tpload",h,a.status,a.statusText),b(a));return e.reject(a)})}g.totalPendingRequests=0;return g}]}function Wf(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];r(a,function(a){var c=$.element(a).data("$binding");c&&
+        r(c,function(c){d?(new RegExp("(^|\\s)"+Md(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!==c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-","data-ng-","ng\\:"],h=0;h<g.length;++h){var k=a.querySelectorAll("["+g[h]+"model"+(d?"=":"*=")+'"'+b+'"]');if(k.length)return k}},getLocation:function(){return d.url()},setLocation:function(b){b!==d.url()&&(d.url(b),a.$digest())},whenStable:function(a){b.notifyWhenNoOutstandingRequests(a)}}}]}function Xf(){this.$get=["$rootScope","$browser",
+        "$q","$$q","$exceptionHandler",function(a,b,d,c,e){function f(f,k,l){C(f)||(l=k,k=f,f=D);var m=xa.call(arguments,3),p=u(l)&&!l,n=(p?c:d).defer(),r=n.promise,s;s=b.defer(function(){try{n.resolve(f.apply(null,m))}catch(b){n.reject(b),e(b)}finally{delete g[r.$$timeoutId]}p||a.$apply()},k);r.$$timeoutId=s;g[s]=n;return r}var g={};f.cancel=function(a){return a&&a.$$timeoutId in g?(g[a.$$timeoutId].promise.$$state.pur=!0,g[a.$$timeoutId].reject("canceled"),delete g[a.$$timeoutId],b.defer.cancel(a.$$timeoutId)):
+            !1};return f}]}function ta(a){Ca&&(X.setAttribute("href",a),a=X.href);X.setAttribute("href",a);return{href:X.href,protocol:X.protocol?X.protocol.replace(/:$/,""):"",host:X.host,search:X.search?X.search.replace(/^\?/,""):"",hash:X.hash?X.hash.replace(/^#/,""):"",hostname:X.hostname,port:X.port,pathname:"/"===X.pathname.charAt(0)?X.pathname:"/"+X.pathname}}function zd(a){a=E(a)?ta(a):a;return a.protocol===Od.protocol&&a.host===Od.host}function Yf(){this.$get=la(w)}function Pd(a){function b(a){try{return decodeURIComponent(a)}catch(b){return a}}
+        var d=a[0]||{},c={},e="";return function(){var a,g,h,k,l;try{a=d.cookie||""}catch(m){a=""}if(a!==e)for(e=a,a=e.split("; "),c={},h=0;h<a.length;h++)g=a[h],k=g.indexOf("="),0<k&&(l=b(g.substring(0,k)),x(c[l])&&(c[l]=b(g.substring(k+1))));return c}}function bg(){this.$get=Pd}function ed(a){function b(d,c){if(B(d)){var e={};r(d,function(a,c){e[c]=b(c,a)});return e}return a.factory(d+"Filter",c)}this.register=b;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];b("currency",
+        Qd);b("date",Rd);b("filter",Hg);b("json",Ig);b("limitTo",Jg);b("lowercase",Kg);b("number",Sd);b("orderBy",Td);b("uppercase",Lg)}function Hg(){return function(a,b,d,c){if(!wa(a)){if(null==a)return a;throw K("filter")("notarray",a);}c=c||"$";var e;switch(Cc(b)){case "function":break;case "boolean":case "null":case "number":case "string":e=!0;case "object":b=Mg(b,d,c,e);break;default:return a}return Array.prototype.filter.call(a,b)}}function Mg(a,b,d,c){var e=B(a)&&d in a;!0===b?b=sa:C(b)||(b=function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                b){if(x(a))return!1;if(null===a||null===b)return a===b;if(B(b)||B(a)&&!ac(a))return!1;a=L(""+a);b=L(""+b);return-1!==a.indexOf(b)});return function(f){return e&&!B(f)?ha(f,a[d],b,d,!1):ha(f,a,b,d,c)}}function ha(a,b,d,c,e,f){var g=Cc(a),h=Cc(b);if("string"===h&&"!"===b.charAt(0))return!ha(a,b.substring(1),d,c,e);if(I(a))return a.some(function(a){return ha(a,b,d,c,e)});switch(g){case "object":var k;if(e){for(k in a)if(k.charAt&&"$"!==k.charAt(0)&&ha(a[k],b,d,c,!0))return!0;return f?!1:ha(a,b,d,c,!1)}if("object"===
+        h){for(k in b)if(f=b[k],!C(f)&&!x(f)&&(g=k===c,!ha(g?a:a[k],f,d,c,g,g)))return!1;return!0}return d(a,b);case "function":return!1;default:return d(a,b)}}function Cc(a){return null===a?"null":typeof a}function Qd(a){var b=a.NUMBER_FORMATS;return function(a,c,e){x(c)&&(c=b.CURRENCY_SYM);x(e)&&(e=b.PATTERNS[1].maxFrac);var f=c?/\u00A4/g:/\s*\u00A4\s*/g;return null==a?a:Ud(a,b.PATTERNS[1],b.GROUP_SEP,b.DECIMAL_SEP,e).replace(f,c)}}function Sd(a){var b=a.NUMBER_FORMATS;return function(a,c){return null==
+    a?a:Ud(a,b.PATTERNS[0],b.GROUP_SEP,b.DECIMAL_SEP,c)}}function Ng(a){var b=0,d,c,e,f,g;-1<(c=a.indexOf(Vd))&&(a=a.replace(Vd,""));0<(e=a.search(/e/i))?(0>c&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=a.length);for(e=0;a.charAt(e)===Dc;e++);if(e===(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)===Dc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Wd&&(d=d.splice(0,Wd-1),b=c-1,c=1);return{d:d,e:b,i:c}}function Og(a,b,d,c){var e=a.d,f=e.length-a.i;b=x(b)?Math.min(Math.max(d,f),c):+b;d=
+        b+a.i;c=e[d];if(0<d){e.splice(Math.max(a.i,d));for(var g=d;g<e.length;g++)e[g]=0}else for(f=Math.max(0,f),a.i=1,e.length=Math.max(1,d=b+1),e[0]=0,g=1;g<d;g++)e[g]=0;if(5<=c)if(0>d-1){for(c=0;c>d;c--)e.unshift(0),a.i++;e.unshift(1);a.i++}else e[d-1]++;for(;f<Math.max(0,b);f++)e.push(0);if(b=e.reduceRight(function(a,b,c,d){b+=a;d[c]=b%10;return Math.floor(b/10)},0))e.unshift(b),a.i++}function Ud(a,b,d,c,e){if(!E(a)&&!Y(a)||isNaN(a))return"";var f=!isFinite(a),g=!1,h=Math.abs(a)+"",k="";if(f)k="\u221e";
+    else{g=Ng(h);Og(g,e,b.minFrac,b.maxFrac);k=g.d;h=g.i;e=g.e;f=[];for(g=k.reduce(function(a,b){return a&&!b},!0);0>h;)k.unshift(0),h++;0<h?f=k.splice(h,k.length):(f=k,k=[0]);h=[];for(k.length>=b.lgSize&&h.unshift(k.splice(-b.lgSize,k.length).join(""));k.length>b.gSize;)h.unshift(k.splice(-b.gSize,k.length).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Ob(a,b,d,c){var e="";if(0>a||c&&0>=
+        a)c?a=-a+1:(a=-a,e="-");for(a=""+a;a.length<b;)a=Dc+a;d&&(a=a.substr(a.length-b));return e+a}function ea(a,b,d,c,e){d=d||0;return function(f){f=f["get"+a]();if(0<d||f>-d)f+=d;0===f&&-12===d&&(f=12);return Ob(f,b,c,e)}}function mb(a,b,d){return function(c,e){var f=c["get"+a](),g=ub((d?"STANDALONE":"")+(b?"SHORT":"")+a);return e[g][f]}}function Xd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Yd(a){return function(b){var d=Xd(b.getFullYear());b=+new Date(b.getFullYear(),
+        b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Ob(b,a)}}function Ec(a,b){return 0>=a.getFullYear()?b.ERAS[0]:b.ERAS[1]}function Rd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Z(b[9]+b[10]),g=Z(b[9]+b[11]));h.call(a,Z(b[1]),Z(b[2])-1,Z(b[3]));f=Z(b[4]||0)-f;g=Z(b[5]||0)-g;h=Z(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
+        return function(c,d,f){var g="",h=[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;E(c)&&(c=Pg.test(c)?Z(c):b(c));Y(c)&&(c=new Date(c));if(!fa(c)||!isFinite(c.getTime()))return c;for(;d;)(l=Qg.exec(d))?(h=db(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=Sc(f,m),c=dc(c,f,!0));r(h,function(b){k=Rg[b];g+=k?k(c,a.DATETIME_FORMATS,m):"''"===b?"'":b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Ig(){return function(a,b){x(b)&&(b=2);return eb(a,b)}}function Jg(){return function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b,d){b=Infinity===Math.abs(Number(b))?Number(b):Z(b);if(U(b))return a;Y(a)&&(a=a.toString());if(!wa(a))return a;d=!d||isNaN(d)?0:Z(d);d=0>d?Math.max(0,a.length+d):d;return 0<=b?Fc(a,d,d+b):0===d?Fc(a,b,a.length):Fc(a,Math.max(0,d+b),d)}}function Fc(a,b,d){return E(a)?a.slice(b,d):xa.call(a,b,d)}function Td(a){function b(b){return b.map(function(b){var c=1,d=ab;if(C(b))d=b;else if(E(b)){if("+"===b.charAt(0)||"-"===b.charAt(0))c="-"===b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(d=a(b),d.constant))var e=
+        d(),d=function(a){return a[e]}}return{get:d,descending:c}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}function c(a,b){var c=0,d=a.type,k=b.type;if(d===k){var k=a.value,l=b.value;"string"===d?(k=k.toLowerCase(),l=l.toLowerCase()):"object"===d&&(B(k)&&(k=a.index),B(l)&&(l=b.index));k!==l&&(c=k<l?-1:1)}else c=d<k?-1:1;return c}return function(a,f,g,h){if(null==a)return a;if(!wa(a))throw K("orderBy")("notarray",a);I(f)||(f=[f]);0===f.length&&
+    (f=["+"]);var k=b(f),l=g?-1:1,m=C(h)?h:c;a=Array.prototype.map.call(a,function(a,b){return{value:a,tieBreaker:{value:b,type:"number",index:b},predicateValues:k.map(function(c){var e=c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("object"===c)a:{if(C(e.valueOf)&&(e=e.valueOf(),d(e)))break a;ac(e)&&(e=e.toString(),d(e))}return{value:e,type:c,index:b}})}});a.sort(function(a,b){for(var d=0,e=k.length;d<e;d++){var g=m(a.predicateValues[d],b.predicateValues[d]);if(g)return g*k[d].descending*
+        l}return(m(a.tieBreaker,b.tieBreaker)||c(a.tieBreaker,b.tieBreaker))*l});return a=a.map(function(a){return a.value})}}function Qa(a){C(a)&&(a={link:a});a.restrict=a.restrict||"AC";return la(a)}function Pb(a,b,d,c,e){this.$$controls=[];this.$error={};this.$$success={};this.$pending=void 0;this.$name=e(b.name||b.ngForm||"")(d);this.$dirty=!1;this.$valid=this.$pristine=!0;this.$submitted=this.$invalid=!1;this.$$parentForm=Qb;this.$$element=a;this.$$animate=c;Zd(this)}function Zd(a){a.$$classCache={};
+        a.$$classCache[$d]=!(a.$$classCache[nb]=a.$$element.hasClass(nb))}function ae(a){function b(a,b,c){c&&!a.$$classCache[b]?(a.$$animate.addClass(a.$$element,b),a.$$classCache[b]=!0):!c&&a.$$classCache[b]&&(a.$$animate.removeClass(a.$$element,b),a.$$classCache[b]=!1)}function d(a,c,d){c=c?"-"+Vc(c,"-"):"";b(a,nb+c,!0===d);b(a,$d+c,!1===d)}var c=a.set,e=a.unset;a.clazz.prototype.$setValidity=function(a,g,h){x(g)?(this.$pending||(this.$pending={}),c(this.$pending,a,h)):(this.$pending&&e(this.$pending,
+        a,h),be(this.$pending)&&(this.$pending=void 0));Na(g)?g?(e(this.$error,a,h),c(this.$$success,a,h)):(c(this.$error,a,h),e(this.$$success,a,h)):(e(this.$error,a,h),e(this.$$success,a,h));this.$pending?(b(this,"ng-pending",!0),this.$valid=this.$invalid=void 0,d(this,"",null)):(b(this,"ng-pending",!1),this.$valid=be(this.$error),this.$invalid=!this.$valid,d(this,"",this.$valid));g=this.$pending&&this.$pending[a]?void 0:this.$error[a]?!1:this.$$success[a]?!0:null;d(this,a,g);this.$$parentForm.$setValidity(a,
+        g,this)}}function be(a){if(a)for(var b in a)if(a.hasOwnProperty(b))return!1;return!0}function Gc(a){a.$formatters.push(function(b){return a.$isEmpty(b)?b:b.toString()})}function Va(a,b,d,c,e,f){var g=L(b[0].type);if(!e.android){var h=!1;b.on("compositionstart",function(){h=!0});b.on("compositionend",function(){h=!1;l()})}var k,l=function(a){k&&(f.defer.cancel(k),k=null);if(!h){var e=b.val();a=a&&a.type;"password"===g||d.ngTrim&&"false"===d.ngTrim||(e=Q(e));(c.$viewValue!==e||""===e&&c.$$hasNativeValidators)&&
+    c.$setViewValue(e,a)}};if(e.hasEvent("input"))b.on("input",l);else{var m=function(a,b,c){k||(k=f.defer(function(){k=null;b&&b.value===c||l(a)}))};b.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut drop",m)}b.on("change",l);if(ce[g]&&c.$$hasNativeValidators&&g===d.type)b.on("keydown wheel mousedown",function(a){if(!k){var b=this.validity,c=b.badInput,d=b.typeMismatch;k=f.defer(function(){k=null;b.badInput===c&&
+    b.typeMismatch===d||l(a)})}});c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Rb(a,b){return function(d,c){var e,f;if(fa(d))return d;if(E(d)){'"'===d.charAt(0)&&'"'===d.charAt(d.length-1)&&(d=d.substring(1,d.length-1));if(Sg.test(d))return new Date(d);a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,
+        MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},r(e,function(a,c){c<b.length&&(f[b[c]]=+a)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function ob(a,b,d,c){return function(e,f,g,h,k,l,m){function p(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function n(a){return u(a)&&!fa(a)?d(a)||void 0:a}Hc(e,f,g,h);Va(e,f,g,h,k,l);var r=h&&h.$options.getOption("timezone"),s;h.$$parserName=a;h.$parsers.push(function(a){if(h.$isEmpty(a))return null;if(b.test(a))return a=d(a,s),r&&(a=dc(a,r)),
+        a});h.$formatters.push(function(a){if(a&&!fa(a))throw pb("datefmt",a);if(p(a))return(s=a)&&r&&(s=dc(s,r,!0)),m("date")(a,c,r);s=null;return""});if(u(g.min)||g.ngMin){var q;h.$validators.min=function(a){return!p(a)||x(q)||d(a)>=q};g.$observe("min",function(a){q=n(a);h.$validate()})}if(u(g.max)||g.ngMax){var y;h.$validators.max=function(a){return!p(a)||x(y)||d(a)<=y};g.$observe("max",function(a){y=n(a);h.$validate()})}}}function Hc(a,b,d,c){(c.$$hasNativeValidators=B(b[0].validity))&&c.$parsers.push(function(a){var c=
+        b.prop("validity")||{};return c.badInput||c.typeMismatch?void 0:a})}function de(a){a.$$parserName="number";a.$parsers.push(function(b){if(a.$isEmpty(b))return null;if(Tg.test(b))return parseFloat(b)});a.$formatters.push(function(b){if(!a.$isEmpty(b)){if(!Y(b))throw pb("numfmt",b);b=b.toString()}return b})}function Wa(a){u(a)&&!Y(a)&&(a=parseFloat(a));return U(a)?void 0:a}function Ic(a){var b=a.toString(),d=b.indexOf(".");return-1===d?-1<a&&1>a&&(a=/e-(\d+)$/.exec(b))?Number(a[1]):0:b.length-d-1}function ee(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        b,d){a=Number(a);var c=(a|0)!==a,e=(b|0)!==b,f=(d|0)!==d;if(c||e||f){var g=c?Ic(a):0,h=e?Ic(b):0,k=f?Ic(d):0,g=Math.max(g,h,k),g=Math.pow(10,g);a*=g;b*=g;d*=g;c&&(a=Math.round(a));e&&(b=Math.round(b));f&&(d=Math.round(d))}return 0===(a-b)%d}function fe(a,b,d,c,e){if(u(c)){a=a(c);if(!a.constant)throw pb("constexpr",d,c);return a(b)}return e}function Jc(a,b){function d(a,b){if(!a||!a.length)return[];if(!b||!b.length)return a;var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],f=0;f<b.length;f++)if(e===
+        b[f])continue a;c.push(e)}return c}function c(a){var b=a;I(a)?b=a.map(c).join(" "):B(a)&&(b=Object.keys(a).filter(function(b){return a[b]}).join(" "));return b}function e(a){var b=a;if(I(a))b=a.map(e);else if(B(a)){var c=!1,b=Object.keys(a).filter(function(b){b=a[b];!c&&x(b)&&(c=!0);return b});c&&b.push(void 0)}return b}a="ngClass"+a;var f;return["$parse",function(g){return{restrict:"AC",link:function(h,k,l){function m(a,b){var c=[];r(a,function(a){if(0<b||t[a])t[a]=(t[a]||0)+b,t[a]===+(0<b)&&c.push(a)});
+            return c.join(" ")}function p(a){if(a===b){var c=w,c=m(c&&c.split(" "),1);l.$addClass(c)}else c=w,c=m(c&&c.split(" "),-1),l.$removeClass(c);u=a}function n(a){a=c(a);a!==w&&q(a)}function q(a){if(u===b){var c=w&&w.split(" "),e=a&&a.split(" "),g=d(c,e),c=d(e,c),g=m(g,-1),c=m(c,1);l.$addClass(c);l.$removeClass(g)}w=a}var s=l[a].trim(),v=":"===s.charAt(0)&&":"===s.charAt(1),s=g(s,v?e:c),y=v?n:q,t=k.data("$classCounts"),u=!0,w;t||(t=S(),k.data("$classCounts",t));"ngClass"!==a&&(f||(f=g("$index",function(a){return a&
+            1})),h.$watch(f,p));h.$watch(s,y,v)}}}]}function Sb(a,b,d,c,e,f,g,h,k){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=void 0;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=void 0;this.$name=k(d.name||"",!1)(a);this.$$parentForm=Qb;this.$options=Tb;this.$$updateEvents="";
+        this.$$updateEventHandler=this.$$updateEventHandler.bind(this);this.$$parsedNgModel=e(d.ngModel);this.$$parsedNgModelAssign=this.$$parsedNgModel.assign;this.$$ngModelGet=this.$$parsedNgModel;this.$$ngModelSet=this.$$parsedNgModelAssign;this.$$pendingDebounce=null;this.$$parserValid=void 0;this.$$currentValidationRunId=0;Object.defineProperty(this,"$$scope",{value:a});this.$$attr=d;this.$$element=c;this.$$animate=f;this.$$timeout=g;this.$$parse=e;this.$$q=h;this.$$exceptionHandler=b;Zd(this);Ug(this)}
+    function Ug(a){a.$$scope.$watch(function(b){b=a.$$ngModelGet(b);b===a.$modelValue||a.$modelValue!==a.$modelValue&&b!==b||a.$$setModelValue(b);return b})}function Kc(a){this.$$options=a}function ge(a,b){r(b,function(b,c){u(a[c])||(a[c]=b)})}function Ga(a,b){a.prop("selected",b);a.attr("selected",b)}var Mc={objectMaxDepth:5},Vg=/^\/(.+)\/([a-z]*)$/,ra=Object.prototype.hasOwnProperty,L=function(a){return E(a)?a.toLowerCase():a},ub=function(a){return E(a)?a.toUpperCase():a},Ca,z,ma,xa=[].slice,ug=[].splice,
+        Wg=[].push,ia=Object.prototype.toString,Pc=Object.getPrototypeOf,qa=K("ng"),$=w.angular||(w.angular={}),ic,qb=0;Ca=w.document.documentMode;var U=Number.isNaN||function(a){return a!==a};D.$inject=[];ab.$inject=[];var I=Array.isArray,se=/^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/,Q=function(a){return E(a)?a.trim():a},Md=function(a){return a.replace(/([-()[\]{}+?*.$^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},Ja=function(){if(!u(Ja.rules)){var a=w.document.querySelector("[ng-csp]")||
+        w.document.querySelector("[data-ng-csp]");if(a){var b=a.getAttribute("ng-csp")||a.getAttribute("data-ng-csp");Ja.rules={noUnsafeEval:!b||-1!==b.indexOf("no-unsafe-eval"),noInlineStyle:!b||-1!==b.indexOf("no-inline-style")}}else{a=Ja;try{new Function(""),b=!1}catch(d){b=!0}a.rules={noUnsafeEval:b,noInlineStyle:!1}}}return Ja.rules},rb=function(){if(u(rb.name_))return rb.name_;var a,b,d=Ha.length,c,e;for(b=0;b<d;++b)if(c=Ha[b],a=w.document.querySelector("["+c.replace(":","\\:")+"jq]")){e=a.getAttribute(c+
+        "jq");break}return rb.name_=e},ue=/:/g,Ha=["ng-","data-ng-","ng:","x-ng-"],xe=function(a){var b=a.currentScript;if(!b)return!0;if(!(b instanceof w.HTMLScriptElement||b instanceof w.SVGScriptElement))return!1;b=b.attributes;return[b.getNamedItem("src"),b.getNamedItem("href"),b.getNamedItem("xlink:href")].every(function(b){if(!b)return!0;if(!b.value)return!1;var c=a.createElement("a");c.href=b.value;if(a.location.origin===c.origin)return!0;switch(c.protocol){case "http:":case "https:":case "ftp:":case "blob:":case "file:":case "data:":return!0;
+        default:return!1}})}(w.document),Ae=/[A-Z]/g,Wc=!1,Oa=3,Fe={full:"1.6.9",major:1,minor:6,dot:9,codeName:"fiery-basilisk"};V.expando="ng339";var ib=V.cache={},gg=1;V._data=function(a){return this.cache[a[this.expando]]||{}};var cg=/-([a-z])/g,Xg=/^-ms-/,Ab={mouseleave:"mouseout",mouseenter:"mouseover"},lc=K("jqLite"),fg=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,kc=/<|&#?\w+;/,dg=/<([\w:-]+)/,eg=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,aa={option:[1,'<select multiple="multiple">',
+            "</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};aa.optgroup=aa.option;aa.tbody=aa.tfoot=aa.colgroup=aa.caption=aa.thead;aa.th=aa.td;var lg=w.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)},Sa=V.prototype={ready:gd,toString:function(){var a=[];r(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},
+        eq:function(a){return 0<=a?z(this[a]):z(this[this.length+a])},length:0,push:Wg,sort:[].sort,splice:[].splice},Gb={};r("multiple selected checked disabled readOnly required open".split(" "),function(a){Gb[L(a)]=a});var ld={};r("input select option textarea button form details".split(" "),function(a){ld[a]=!0});var sd={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern",ngStep:"step"};r({data:pc,removeData:oc,hasData:function(a){for(var b in ib[a.ng339])return!0;
+            return!1},cleanData:function(a){for(var b=0,d=a.length;b<d;b++)oc(a[b])}},function(a,b){V[b]=a});r({data:pc,inheritedData:Eb,scope:function(a){return z.data(a,"$scope")||Eb(a.parentNode||a,["$isolateScope","$scope"])},isolateScope:function(a){return z.data(a,"$isolateScope")||z.data(a,"$isolateScopeNoTemplate")},controller:id,injector:function(a){return Eb(a,"$injector")},removeAttr:function(a,b){a.removeAttribute(b)},hasClass:Bb,css:function(a,b,d){b=xb(b.replace(Xg,"ms-"));if(u(d))a.style[b]=d;
+        else return a.style[b]},attr:function(a,b,d){var c=a.nodeType;if(c!==Oa&&2!==c&&8!==c&&a.getAttribute){var c=L(b),e=Gb[c];if(u(d))null===d||!1===d&&e?a.removeAttribute(b):a.setAttribute(b,e?c:d);else return a=a.getAttribute(b),e&&null!==a&&(a=c),null===a?void 0:a}},prop:function(a,b,d){if(u(d))a[b]=d;else return a[b]},text:function(){function a(a,d){if(x(d)){var c=a.nodeType;return 1===c||c===Oa?a.textContent:""}a.textContent=d}a.$dv="";return a}(),val:function(a,b){if(x(b)){if(a.multiple&&"select"===
+            ya(a)){var d=[];r(a.options,function(a){a.selected&&d.push(a.value||a.text)});return d}return a.value}a.value=b},html:function(a,b){if(x(b))return a.innerHTML;yb(a,!0);a.innerHTML=b},empty:jd},function(a,b){V.prototype[b]=function(b,c){var e,f,g=this.length;if(a!==jd&&x(2===a.length&&a!==Bb&&a!==id?b:c)){if(B(b)){for(e=0;e<g;e++)if(a===pc)a(this[e],b);else for(f in b)a(this[e],f,b[f]);return this}e=a.$dv;g=x(e)?Math.min(g,1):g;for(f=0;f<g;f++){var h=a(this[f],b,c);e=e?e+h:h}return e}for(e=0;e<g;e++)a(this[e],
+        b,c);return this}});r({removeData:oc,on:function(a,b,d,c){if(u(c))throw lc("onargs");if(jc(a)){c=zb(a,!0);var e=c.events,f=c.handle;f||(f=c.handle=ig(a,e));c=0<=b.indexOf(" ")?b.split(" "):[b];for(var g=c.length,h=function(b,c,g){var h=e[b];h||(h=e[b]=[],h.specialHandlerWrapper=c,"$destroy"===b||g||a.addEventListener(b,f));h.push(d)};g--;)b=c[g],Ab[b]?(h(Ab[b],kg),h(b,void 0,!0)):h(b)}},off:hd,one:function(a,b,d){a=z(a);a.on(b,function e(){a.off(b,d);a.off(b,e)});a.on(b,d)},replaceWith:function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            b){var d,c=a.parentNode;yb(a);r(new V(b),function(b){d?c.insertBefore(b,d.nextSibling):c.replaceChild(b,a);d=b})},children:function(a){var b=[];r(a.childNodes,function(a){1===a.nodeType&&b.push(a)});return b},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,b){var d=a.nodeType;if(1===d||11===d){b=new V(b);for(var d=0,c=b.length;d<c;d++)a.appendChild(b[d])}},prepend:function(a,b){if(1===a.nodeType){var d=a.firstChild;r(new V(b),function(b){a.insertBefore(b,d)})}},
+        wrap:function(a,b){var d=z(b).eq(0).clone()[0],c=a.parentNode;c&&c.replaceChild(d,a);d.appendChild(a)},remove:Fb,detach:function(a){Fb(a,!0)},after:function(a,b){var d=a,c=a.parentNode;if(c){b=new V(b);for(var e=0,f=b.length;e<f;e++){var g=b[e];c.insertBefore(g,d.nextSibling);d=g}}},addClass:Db,removeClass:Cb,toggleClass:function(a,b,d){b&&r(b.split(" "),function(b){var e=d;x(e)&&(e=!Bb(a,b));(e?Db:Cb)(a,b)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},
+        find:function(a,b){return a.getElementsByTagName?a.getElementsByTagName(b):[]},clone:nc,triggerHandler:function(a,b,d){var c,e,f=b.type||b,g=zb(a);if(g=(g=g&&g.events)&&g[f])c={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:D,type:f,target:a},b.type&&(c=O(c,
+            b)),b=ka(g),e=d?[c].concat(d):[c],r(b,function(b){c.isImmediatePropagationStopped()||b.apply(a,e)})}},function(a,b){V.prototype[b]=function(b,c,e){for(var f,g=0,h=this.length;g<h;g++)x(f)?(f=a(this[g],b,c,e),u(f)&&(f=z(f))):mc(f,a(this[g],b,c,e));return u(f)?f:this}});V.prototype.bind=V.prototype.on;V.prototype.unbind=V.prototype.off;var Yg=Object.create(null);md.prototype={_idx:function(a){if(a===this._lastKey)return this._lastIndex;this._lastKey=a;return this._lastIndex=this._keys.indexOf(a)},_transformKey:function(a){return U(a)?
+            Yg:a},get:function(a){a=this._transformKey(a);a=this._idx(a);if(-1!==a)return this._values[a]},set:function(a,b){a=this._transformKey(a);var d=this._idx(a);-1===d&&(d=this._lastIndex=this._keys.length);this._keys[d]=a;this._values[d]=b},delete:function(a){a=this._transformKey(a);a=this._idx(a);if(-1===a)return!1;this._keys.splice(a,1);this._values.splice(a,1);this._lastKey=NaN;this._lastIndex=-1;return!0}};var Hb=md,ag=[function(){this.$get=[function(){return Hb}]}],ng=/^([^(]+?)=>/,og=/^[^(]*\(\s*([^)]*)\)/m,
+        Zg=/,/,$g=/^\s*(_?)(\S+?)\1\s*$/,mg=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Ba=K("$injector");gb.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw E(d)&&d||(d=a.name||pg(a)),Ba("strictdi",d);b=nd(a);r(b[1].split(Zg),function(a){a.replace($g,function(a,b,d){c.push(d)})})}a.$inject=c}}else I(a)?(b=a.length-1,sb(a[b],"fn"),c=a.slice(0,b)):sb(a,"fn",!0);return c};var he=K("$animate"),sf=function(){this.$get=D},tf=function(){var a=new Hb,b=[];this.$get=
+        ["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=E(b)?b.split(" "):I(b)?b:[],r(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){r(b,function(b){var c=a.get(b);if(c){var d=qg(b.attr("class")),e="",f="";r(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});r(b,function(a){e&&Db(a,e);f&&Cb(a,f)});a.delete(b)}});b.length=0}return{enabled:D,on:D,off:D,pin:D,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||
+                k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.set(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();return g}}}]},qf=["$provide",function(a){var b=this,d=null,c=null;this.$$registeredAnimations=Object.create(null);this.register=function(c,d){if(c&&"."!==c.charAt(0))throw he("notcsel",c);var g=c+"-animation";b.$$registeredAnimations[c.substr(1)]=g;a.factory(g,d)};this.customFilter=function(a){1===arguments.length&&(c=C(a)?a:null);return c};
+        this.classNameFilter=function(a){if(1===arguments.length&&(d=a instanceof RegExp?a:null)&&/[(\s|\/)]ng-animate[(\s|\/)]/.test(d.toString()))throw d=null,he("nongcls","ng-animate");return d};this.$get=["$$animateQueue",function(a){function b(a,c,d){if(d){var e;a:{for(e=0;e<d.length;e++){var f=d[e];if(1===f.nodeType){e=f;break a}}e=void 0}!e||e.parentNode||e.previousElementSibling||(d=null)}d?d.after(a):c.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&a.end()},
+            enter:function(c,d,k,l){d=d&&z(d);k=k&&z(k);d=d||k.parent();b(c,d,k);return a.push(c,"enter",Ka(l))},move:function(c,d,k,l){d=d&&z(d);k=k&&z(k);d=d||k.parent();b(c,d,k);return a.push(c,"move",Ka(l))},leave:function(b,c){return a.push(b,"leave",Ka(c),function(){b.remove()})},addClass:function(b,c,d){d=Ka(d);d.addClass=jb(d.addclass,c);return a.push(b,"addClass",d)},removeClass:function(b,c,d){d=Ka(d);d.removeClass=jb(d.removeClass,c);return a.push(b,"removeClass",d)},setClass:function(b,c,d,f){f=Ka(f);
+                f.addClass=jb(f.addClass,c);f.removeClass=jb(f.removeClass,d);return a.push(b,"setClass",f)},animate:function(b,c,d,f,m){m=Ka(m);m.from=m.from?O(m.from,c):c;m.to=m.to?O(m.to,d):d;m.tempClasses=jb(m.tempClasses,f||"ng-inline-animate");return a.push(b,"animate",m)}}}]}],vf=function(){this.$get=["$$rAF",function(a){function b(b){d.push(b);1<d.length||a(function(){for(var a=0;a<d.length;a++)d[a]();d=[]})}var d=[];return function(){var a=!1;b(function(){a=!0});return function(d){a?d():b(d)}}}]},uf=function(){this.$get=
+        ["$q","$sniffer","$$animateAsyncRun","$$isDocumentHidden","$timeout",function(a,b,d,c,e){function f(a){this.setHost(a);var b=d();this._doneCallbacks=[];this._tick=function(a){c()?e(a,0,!1):b(a)};this._state=0}f.chain=function(a,b){function c(){if(d===a.length)b(!0);else a[d](function(a){!1===a?b(!1):(d++,c())})}var d=0;c()};f.all=function(a,b){function c(f){e=e&&f;++d===a.length&&b(e)}var d=0,e=!0;r(a,function(a){a.done(c)})};f.prototype={setHost:function(a){this.host=a||{}},done:function(a){2===
+            this._state?a():this._doneCallbacks.push(a)},progress:D,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&
+            this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._tick(function(){b._resolve(a)}))},_resolve:function(a){2!==this._state&&(r(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return f}]},rf=function(){this.$get=["$$rAF","$q","$$AnimateRunner",function(a,b,d){return function(b,e){function f(){a(function(){g.addClass&&(b.addClass(g.addClass),g.addClass=
+        null);g.removeClass&&(b.removeClass(g.removeClass),g.removeClass=null);g.to&&(b.css(g.to),g.to=null);h||k.complete();h=!0});return k}var g=e||{};g.$$prepared||(g=pa(g));g.cleanupStyles&&(g.from=g.to=null);g.from&&(b.css(g.from),g.from=null);var h,k=new d;return{start:f,end:f}}}]},ca=K("$compile"),sc=new function(){};Yc.$inject=["$provide","$$sanitizeUriProvider"];Jb.prototype.isFirstChange=function(){return this.previousValue===sc};var od=/^((?:x|data)[:\-_])/i,tg=/[:\-_]+(.)/g,ud=K("$controller"),
+        td=/^(\S+)(\s+as\s+([\w$]+))?$/,Cf=function(){this.$get=["$document",function(a){return function(b){b?!b.nodeType&&b instanceof z&&(b=b[0]):b=a[0].body;return b.offsetWidth+1}}]},vd="application/json",vc={"Content-Type":vd+";charset=utf-8"},wg=/^\[|^\{(?!\{)/,xg={"[":/]$/,"{":/}$/},vg=/^\)]\}',?\n/,Kb=K("$http"),Fa=$.$interpolateMinErr=K("$interpolate");Fa.throwNoconcat=function(a){throw Fa("noconcat",a);};Fa.interr=function(a,b){return Fa("interr",a,b.toString())};var Kf=function(){this.$get=function(){function a(a){var b=
+        function(a){b.data=a;b.called=!0};b.id=a;return b}var b=$.callbacks,d={};return{createCallback:function(c){c="_"+(b.$$counter++).toString(36);var e="angular.callbacks."+c,f=a(c);d[e]=b[c]=f;return e},wasCalled:function(a){return d[a].called},getResponse:function(a){return d[a].data},removeCallback:function(a){delete b[d[a].id];delete d[a]}}}},ah=/^([^?#]*)(\?([^#]*))?(#(.*))?$/,zg={http:80,https:443,ftp:21},kb=K("$location"),Ag=/^\s*[\\/]{2,}/,bh={$$absUrl:"",$$html5:!1,$$replace:!1,absUrl:Lb("$$absUrl"),
+        url:function(a){if(x(a))return this.$$url;var b=ah.exec(a);(b[1]||""===a)&&this.path(decodeURIComponent(b[1]));(b[2]||b[1]||""===a)&&this.search(b[3]||"");this.hash(b[5]||"");return this},protocol:Lb("$$protocol"),host:Lb("$$host"),port:Lb("$$port"),path:Dd("$$path",function(a){a=null!==a?a.toString():"";return"/"===a.charAt(0)?a:"/"+a}),search:function(a,b){switch(arguments.length){case 0:return this.$$search;case 1:if(E(a)||Y(a))a=a.toString(),this.$$search=ec(a);else if(B(a))a=pa(a,{}),r(a,function(b,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c){null==b&&delete a[c]}),this.$$search=a;else throw kb("isrcharg");break;default:x(b)||null===b?delete this.$$search[a]:this.$$search[a]=b}this.$$compose();return this},hash:Dd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};r([Cd,zc,yc],function(a){a.prototype=Object.create(bh);a.prototype.state=function(b){if(!arguments.length)return this.$$state;if(a!==yc||!this.$$html5)throw kb("nostate");this.$$state=x(b)?null:b;this.$$urlUpdatedByLocation=
+        !0;return this}});var Xa=K("$parse"),Eg={}.constructor.prototype.valueOf,Ub=S();r("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(a){Ub[a]=!0});var ch={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},Nb=function(a){this.options=a};Nb.prototype={constructor:Nb,lex:function(a){this.text=a;this.index=0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();
+        else if(this.isIdentifierStart(this.peekMultichar()))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;else if(this.isWhitespace(a))this.index++;else{var b=a+this.peek(),d=b+this.peek(2),c=Ub[b],e=Ub[d];Ub[a]||c||e?(a=e?d:c?b:a,this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,b){return-1!==b.indexOf(a)},peek:function(a){a=
+            a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdentifierStart:function(a){return this.options.isIdentifierStart?this.options.isIdentifierStart(a,this.codePointAt(a)):this.isValidIdentifierStart(a)},isValidIdentifierStart:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isIdentifierContinue:function(a){return this.options.isIdentifierContinue?
+            this.options.isIdentifierContinue(a,this.codePointAt(a)):this.isValidIdentifierContinue(a)},isValidIdentifierContinue:function(a,b){return this.isValidIdentifierStart(a,b)||this.isNumber(a)},codePointAt:function(a){return 1===a.length?a.charCodeAt(0):(a.charCodeAt(0)<<10)+a.charCodeAt(1)-56613888},peekMultichar:function(){var a=this.text.charAt(this.index),b=this.peek();if(!b)return a;var d=a.charCodeAt(0),c=b.charCodeAt(0);return 55296<=d&&56319>=d&&56320<=c&&57343>=c?a+b:a},isExpOperator:function(a){return"-"===
+            a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=u(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw Xa("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index<this.text.length;){var d=L(this.text.charAt(this.index));if("."===d||this.isNumber(d))a+=d;else{var c=this.peek();if("e"===d&&this.isExpOperator(c))a+=d;else if(this.isExpOperator(d)&&c&&this.isNumber(c)&&"e"===a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||
+            c&&this.isNumber(c)||"e"!==a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:b,text:a,constant:!0,value:Number(a)})},readIdent:function(){var a=this.index;for(this.index+=this.peekMultichar().length;this.index<this.text.length;){var b=this.peekMultichar();if(!this.isIdentifierContinue(b))break;this.index+=b.length}this.tokens.push({index:a,text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var b=this.index;this.index++;
+            for(var d="",c=a,e=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),c=c+f;if(e)"u"===f?(e=this.text.substring(this.index+1,this.index+5),e.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+e+"]"),this.index+=4,d+=String.fromCharCode(parseInt(e,16))):d+=ch[f]||f,e=!1;else if("\\"===f)e=!0;else{if(f===a){this.index++;this.tokens.push({index:b,text:c,constant:!0,value:d});return}d+=f}this.index++}this.throwError("Unterminated quote",b)}};var q=function(a,b){this.lexer=
+        a;this.options=b};q.Program="Program";q.ExpressionStatement="ExpressionStatement";q.AssignmentExpression="AssignmentExpression";q.ConditionalExpression="ConditionalExpression";q.LogicalExpression="LogicalExpression";q.BinaryExpression="BinaryExpression";q.UnaryExpression="UnaryExpression";q.CallExpression="CallExpression";q.MemberExpression="MemberExpression";q.Identifier="Identifier";q.Literal="Literal";q.ArrayExpression="ArrayExpression";q.Property="Property";q.ObjectExpression="ObjectExpression";
+    q.ThisExpression="ThisExpression";q.LocalsExpression="LocalsExpression";q.NGValueParameter="NGValueParameter";q.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:q.Program,body:a}},expressionStatement:function(){return{type:q.ExpressionStatement,
+            expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();if(this.expect("=")){if(!Hd(a))throw Xa("lval");a={type:q.AssignmentExpression,left:a,right:this.assignment(),operator:"="}}return a},ternary:function(){var a=this.logicalOR(),b,d;return this.expect("?")&&(b=this.expression(),this.consume(":"))?(d=this.expression(),{type:q.ConditionalExpression,
+            test:a,alternate:b,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:q.LogicalExpression,operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:q.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),b;b=this.expect("==","!=","===","!==");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.relational()};
+            return a},relational:function(){for(var a=this.additive(),b;b=this.expect("<",">","<=",">=");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.unary()};return a},
+        unary:function(){var a;return(a=this.expect("+","-","!"))?{type:q.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.selfReferential.hasOwnProperty(this.peek().text)?a=pa(this.selfReferential[this.consume().text]):this.options.literals.hasOwnProperty(this.peek().text)?a={type:q.Literal,value:this.options.literals[this.consume().text]}:
+            this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:q.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:q.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:q.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");
+            return a},filter:function(a){a=[a];for(var b={type:q.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.filterChain());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:q.Identifier,name:a.text}},constant:function(){return{type:q.Literal,value:this.consume().value}},
+        arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:q.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:q.Property,kind:"init"};this.peek().constant?(b.key=this.constant(),b.computed=!1,this.consume(":"),b.value=this.expression()):this.peek().identifier?(b.key=this.identifier(),b.computed=!1,this.peek(":")?
+            (this.consume(":"),b.value=this.expression()):b.value=b.key):this.peek("[")?(this.consume("["),b.key=this.expression(),this.consume("]"),b.computed=!0,this.consume(":"),b.value=this.expression()):this.throwError("invalid key",this.peek());a.push(b)}while(this.expect(","))}this.consume("}");return{type:q.ObjectExpression,properties:a}},throwError:function(a,b){throw Xa("syntax",b.text,a,b.index+1,this.text,this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw Xa("ueoe",
+            this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw Xa("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},selfReferential:{"this":{type:q.ThisExpression},
+            $locals:{type:q.LocalsExpression}}};var Fd=2;Jd.prototype={compile:function(a){var b=this;this.state={nextId:0,filters:{},fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};W(a,b.$filter);var d="",c;this.stage="assign";if(c=Id(a))this.state.computing="assign",d=this.nextId(),this.recurse(c,d),this.return_(d),d="fn.assign="+this.generateFunction("assign","s,v,l");c=Gd(a.body);b.stage="inputs";r(c,function(a,c){var d="fn"+c;b.state[d]={vars:[],body:[],own:{}};b.state.computing=d;
+            var h=b.nextId();b.recurse(a,h);b.return_(h);b.state.inputs.push({name:d,isPure:a.isPure});a.watchId=c});this.state.computing="fn";this.stage="main";this.recurse(a);a='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+d+this.watchFns()+"return fn;";a=(new Function("$filter","getStringValue","ifDefined","plus",a))(this.$filter,Bg,Cg,Ed);this.state=this.stage=void 0;return a},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,
+            d=this;r(b,function(b){a.push("var "+b.name+"="+d.generateFunction(b.name,"s"));b.isPure&&a.push(b.name,".isPure="+JSON.stringify(b.isPure)+";")});b.length&&a.push("fn.inputs=["+b.map(function(a){return a.name}).join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],b=this;r(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?
+            "var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},recurse:function(a,b,d,c,e,f){var g,h,k=this,l,m,p;c=c||D;if(!f&&u(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,c,e,!0));else switch(a.type){case q.Program:r(a.body,function(b,c){k.recurse(b.expression,void 0,void 0,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case q.Literal:m=this.escape(a.value);
+            this.assign(b,m);c(b||m);break;case q.UnaryExpression:this.recurse(a.argument,void 0,void 0,function(a){h=a});m=a.operator+"("+this.ifDefined(h,0)+")";this.assign(b,m);c(m);break;case q.BinaryExpression:this.recurse(a.left,void 0,void 0,function(a){g=a});this.recurse(a.right,void 0,void 0,function(a){h=a});m="+"===a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case q.LogicalExpression:b=b||this.nextId();
+            k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,b));c(b);break;case q.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case q.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===
+            k.stage||"s",function(){e&&1!==e&&k.if_(k.isNull(k.nonComputedMember("s",a.name)),k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));c(b);break;case q.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,void 0,function(){k.if_(k.notNull(g),function(){a.computed?(h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,
+            h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.computedMember(g,h),k.assign(b,m),d&&(d.computed=!0,d.name=h)):(e&&1!==e&&k.if_(k.isNull(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}")),m=k.nonComputedMember(g,a.property.name),k.assign(b,m),d&&(d.computed=!1,d.name=a.property.name))},function(){k.assign(b,"undefined")});c(b)},!!e);break;case q.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],r(a.arguments,function(a){var b=
+            k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+l.join(",")+")",k.assign(b,m),c(b)):(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){r(a.arguments,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m=g.name?k.member(g.context,g.name,g.computed)+"("+l.join(",")+")":h+"("+l.join(",")+")";k.assign(b,m)},function(){k.assign(b,"undefined")});c(b)}));break;case q.AssignmentExpression:h=this.nextId();g={};this.recurse(a.left,void 0,
+            g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);m=k.member(g.context,g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case q.ArrayExpression:l=[];r(a.elements,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m="["+l.join(",")+"]";this.assign(b,m);c(b||m);break;case q.ObjectExpression:l=[];p=!1;r(a.properties,function(a){a.computed&&(p=!0)});p?(b=b||this.nextId(),this.assign(b,"{}"),r(a.properties,function(a){a.computed?
+            (g=k.nextId(),k.recurse(a.key,g)):g=a.key.type===q.Identifier?a.key.name:""+a.key.value;h=k.nextId();k.recurse(a.value,h);k.assign(k.member(b,g,a.computed),h)})):(r(a.properties,function(b){k.recurse(b.value,a.constant?void 0:k.nextId(),void 0,function(a){l.push(k.escape(b.key.type===q.Identifier?b.key.name:""+b.key.value)+":"+a)})}),m="{"+l.join(",")+"}",this.assign(b,m));c(b||m);break;case q.ThisExpression:this.assign(b,"s");c(b||"s");break;case q.LocalsExpression:this.assign(b,"l");c(b||"l");break;
+            case q.NGValueParameter:this.assign(b,"v"),c(b||"v")}},getHasOwnProperty:function(a,b){var d=a+"."+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+this.escape(b)+" in "+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,"){");b();c.push("}");d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},isNull:function(a){return a+"==null"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){var d=/[^$_a-zA-Z0-9]/g;return/^[$_a-zA-Z][$_a-zA-Z0-9]*$/.test(b)?a+"."+b:a+'["'+b.replace(d,this.stringEscapeFn)+'"]'},computedMember:function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,b)},getStringValue:function(a){this.assign(a,"getStringValue("+a+")")},lazyRecurse:function(a,b,d,c,e,f){var g=this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(E(a))return"'"+a.replace(this.stringEscapeRegex,
+            this.stringEscapeFn)+"'";if(Y(a))return a.toString();if(!0===a)return"true";if(!1===a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw Xa("esc");},nextId:function(a,b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};Kd.prototype={compile:function(a){var b=this;W(a,b.$filter);var d,c;if(d=Id(a))c=this.recurse(d);d=Gd(a.body);var e;d&&(e=[],r(d,function(a,c){var d=
+            b.recurse(a);d.isPure=a.isPure;a.input=d;e.push(d);a.watchId=c}));var f=[];r(a.body,function(a){f.push(b.recurse(a.expression))});a=0===a.body.length?D:1===a.body.length?f[0]:function(a,b){var c;r(f,function(d){c=d(a,b)});return c};c&&(a.assign=function(a,b,d){return c(a,d,b)});e&&(a.inputs=e);return a},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case q.Literal:return this.value(a.value,b);case q.UnaryExpression:return e=this.recurse(a.argument),
+            this["unary"+a.operator](e,b);case q.BinaryExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case q.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case q.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case q.Identifier:return f.identifier(a.name,b,d);case q.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||
+        (e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d):this.nonComputedMember(c,e,b,d);case q.CallExpression:return g=[],r(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var p=[],n=0;n<g.length;++n)p.push(g[n](a,c,d,f));a=e.apply(void 0,p,f);return b?{context:void 0,name:void 0,value:a}:a}:function(a,c,d,f){var p=e(a,c,d,f),n;if(null!=p.value){n=
+            [];for(var r=0;r<g.length;++r)n.push(g[r](a,c,d,f));n=p.value.apply(p.context,n)}return b?{value:n}:n};case q.AssignmentExpression:return c=this.recurse(a.left,!0,1),e=this.recurse(a.right),function(a,d,f,g){var p=c(a,d,f,g);a=e(a,d,f,g);p.context[p.name]=a;return b?{value:a}:a};case q.ArrayExpression:return g=[],r(a.elements,function(a){g.push(f.recurse(a))}),function(a,c,d,e){for(var f=[],n=0;n<g.length;++n)f.push(g[n](a,c,d,e));return b?{value:f}:f};case q.ObjectExpression:return g=[],r(a.properties,
+            function(a){a.computed?g.push({key:f.recurse(a.key),computed:!0,value:f.recurse(a.value)}):g.push({key:a.key.type===q.Identifier?a.key.name:""+a.key.value,computed:!1,value:f.recurse(a.value)})}),function(a,c,d,e){for(var f={},n=0;n<g.length;++n)g[n].computed?f[g[n].key(a,c,d,e)]=g[n].value(a,c,d,e):f[g[n].key]=g[n].value(a,c,d,e);return b?{value:f}:f};case q.ThisExpression:return function(a){return b?{value:a}:a};case q.LocalsExpression:return function(a,c){return b?{value:c}:c};case q.NGValueParameter:return function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         c,d){return b?{value:d}:d}}},"unary+":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?+d:0;return b?{value:d}:d}},"unary-":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?-d:-0;return b?{value:d}:d}},"unary!":function(a,b){return function(d,c,e,f){d=!a(d,c,e,f);return b?{value:d}:d}},"binary+":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=Ed(h,c);return d?{value:h}:h}},"binary-":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);
+            h=(u(h)?h:0)-(u(c)?c:0);return d?{value:h}:h}},"binary*":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)*b(c,e,f,g);return d?{value:c}:c}},"binary/":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)/b(c,e,f,g);return d?{value:c}:c}},"binary%":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)%b(c,e,f,g);return d?{value:c}:c}},"binary===":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)===b(c,e,f,g);return d?{value:c}:c}},"binary!==":function(a,b,d){return function(c,e,f,g){c=a(c,
+            e,f,g)!==b(c,e,f,g);return d?{value:c}:c}},"binary==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)==b(c,e,f,g);return d?{value:c}:c}},"binary!=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!=b(c,e,f,g);return d?{value:c}:c}},"binary<":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<b(c,e,f,g);return d?{value:c}:c}},"binary>":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,
+            g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:void 0,
+            name:void 0,value:a}:a}},identifier:function(a,b,d){return function(c,e,f,g){c=e&&a in e?e:c;d&&1!==d&&c&&null==c[a]&&(c[a]={});e=c?c[a]:void 0;return b?{context:c,name:a,value:e}:e}},computedMember:function(a,b,d,c){return function(e,f,g,h){var k=a(e,f,g,h),l,m;null!=k&&(l=b(e,f,g,h),l+="",c&&1!==c&&k&&!k[l]&&(k[l]={}),m=k[l]);return d?{context:k,name:l,value:m}:m}},nonComputedMember:function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h);c&&1!==c&&e&&null==e[b]&&(e[b]={});f=null!=e?e[b]:void 0;
+            return d?{context:e,name:b,value:f}:f}},inputs:function(a,b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};Mb.prototype={constructor:Mb,parse:function(a){a=this.getAst(a);var b=this.astCompiler.compile(a.ast),d=a.ast;b.literal=0===d.body.length||1===d.body.length&&(d.body[0].expression.type===q.Literal||d.body[0].expression.type===q.ArrayExpression||d.body[0].expression.type===q.ObjectExpression);b.constant=a.ast.constant;b.oneTime=a.oneTime;return b},getAst:function(a){var b=!1;a=a.trim();":"===
+        a.charAt(0)&&":"===a.charAt(1)&&(b=!0,a=a.substring(2));return{ast:this.ast.ast(a),oneTime:b}}};var va=K("$sce"),oa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Bc=/_([a-z])/g,Gg=K("$compile"),X=w.document.createElement("a"),Od=ta(w.location.href);Pd.$inject=["$document"];ed.$inject=["$provide"];var Wd=22,Vd=".",Dc="0";Qd.$inject=["$locale"];Sd.$inject=["$locale"];var Rg={yyyy:ea("FullYear",4,0,!1,!0),yy:ea("FullYear",2,0,!0,!0),y:ea("FullYear",1,0,!1,!0),MMMM:mb("Month"),
+        MMM:mb("Month",!0),MM:ea("Month",2,1),M:ea("Month",1,1),LLLL:mb("Month",!1,!0),dd:ea("Date",2),d:ea("Date",1),HH:ea("Hours",2),H:ea("Hours",1),hh:ea("Hours",2,-12),h:ea("Hours",1,-12),mm:ea("Minutes",2),m:ea("Minutes",1),ss:ea("Seconds",2),s:ea("Seconds",1),sss:ea("Milliseconds",3),EEEE:mb("Day"),EEE:mb("Day",!0),a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Ob(Math[0<a?"floor":"ceil"](a/60),2)+Ob(Math.abs(a%60),2))},ww:Yd(2),w:Yd(1),
+        G:Ec,GG:Ec,GGG:Ec,GGGG:function(a,b){return 0>=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},Qg=/((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,Pg=/^-?\d+$/;Rd.$inject=["$locale"];var Kg=la(L),Lg=la(ub);Td.$inject=["$parse"];var He=la({restrict:"E",compile:function(a,b){if(!b.href&&!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ia.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||
+        a.preventDefault()})}}}}),vb={};r(Gb,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!==a){var c=Ea("ng-"+b),e=d;"checked"===a&&(e=function(a,b,e){e.ngModel!==e[c]&&d(a,b,e)});vb[c]=function(){return{restrict:"A",priority:100,link:e}}}});r(sd,function(a,b){vb[b]=function(){return{priority:100,link:function(a,c,e){if("ngPattern"===b&&"/"===e.ngPattern.charAt(0)&&(c=e.ngPattern.match(Vg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,
+            a)})}}}});r(["src","srcset","href"],function(a){var b=Ea("ng-"+a);vb[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===ia.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),Ca&&f&&c.prop(f,e[g])):"href"===a&&e.$set(g,null)})}}}});var Qb={$addControl:D,$$renameControl:function(a,b){a.$name=b},$removeControl:D,$setValidity:D,$setDirty:D,$setPristine:D,$setSubmitted:D};Pb.$inject=["$element",
+        "$attrs","$scope","$animate","$interpolate"];Pb.prototype={$rollbackViewValue:function(){r(this.$$controls,function(a){a.$rollbackViewValue()})},$commitViewValue:function(){r(this.$$controls,function(a){a.$commitViewValue()})},$addControl:function(a){Ia(a.$name,"input");this.$$controls.push(a);a.$name&&(this[a.$name]=a);a.$$parentForm=this},$$renameControl:function(a,b){var d=a.$name;this[d]===a&&delete this[d];this[b]=a;a.$name=b},$removeControl:function(a){a.$name&&this[a.$name]===a&&delete this[a.$name];
+            r(this.$pending,function(b,d){this.$setValidity(d,null,a)},this);r(this.$error,function(b,d){this.$setValidity(d,null,a)},this);r(this.$$success,function(b,d){this.$setValidity(d,null,a)},this);cb(this.$$controls,a);a.$$parentForm=Qb},$setDirty:function(){this.$$animate.removeClass(this.$$element,Ya);this.$$animate.addClass(this.$$element,Vb);this.$dirty=!0;this.$pristine=!1;this.$$parentForm.$setDirty()},$setPristine:function(){this.$$animate.setClass(this.$$element,Ya,Vb+" ng-submitted");this.$dirty=
+            !1;this.$pristine=!0;this.$submitted=!1;r(this.$$controls,function(a){a.$setPristine()})},$setUntouched:function(){r(this.$$controls,function(a){a.$setUntouched()})},$setSubmitted:function(){this.$$animate.addClass(this.$$element,"ng-submitted");this.$submitted=!0;this.$$parentForm.$setSubmitted()}};ae({clazz:Pb,set:function(a,b,d){var c=a[b];c?-1===c.indexOf(d)&&c.push(d):a[b]=[d]},unset:function(a,b,d){var c=a[b];c&&(cb(c,d),0===c.length&&delete a[b])}});var ie=function(a){return["$timeout","$parse",
+            function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||D}return{name:"form",restrict:a?"EAC":"E",require:["form","^^?form"],controller:Pb,compile:function(d,f){d.addClass(Ya).addClass(nb);var g=f.name?"name":a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var p=f[0];if(!("action"in e)){var n=function(b){a.$apply(function(){p.$commitViewValue();p.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",n);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",
+                        n)},0,!1)})}(f[1]||p.$$parentForm).$addControl(p);var r=g?c(p.$name):D;g&&(r(a,p),e.$observe(g,function(b){p.$name!==b&&(r(a,void 0),p.$$parentForm.$$renameControl(p,b),r=c(p.$name),r(a,p))}));d.on("$destroy",function(){p.$$parentForm.$removeControl(p);r(a,void 0);O(p,Qb)})}}}}}]},Ie=ie(),Ue=ie(!0),Sg=/^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/,dh=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,
+        eh=/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/,Tg=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,je=/^(\d{4,})-(\d{2})-(\d{2})$/,ke=/^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Lc=/^(\d{4,})-W(\d\d)$/,le=/^(\d{4,})-(\d\d)$/,me=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,ce=S();r(["date","datetime-local","month","time","week"],function(a){ce[a]=
+        !0});var ne={text:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c)},date:ob("date",je,Rb(je,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":ob("datetimelocal",ke,Rb(ke,"yyyy MM dd HH mm ss sss".split(" ")),"yyyy-MM-ddTHH:mm:ss.sss"),time:ob("time",me,Rb(me,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:ob("week",Lc,function(a,b){if(fa(a))return a;if(E(a)){Lc.lastIndex=0;var d=Lc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=0,h=0,k=Xd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());
+                return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:ob("month",le,Rb(le,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Hc(a,b,d,c);de(c);Va(a,b,d,c,e,f);var g,h;if(u(d.min)||d.ngMin)c.$validators.min=function(a){return c.$isEmpty(a)||x(g)||a>=g},d.$observe("min",function(a){g=Wa(a);c.$validate()});if(u(d.max)||d.ngMax)c.$validators.max=function(a){return c.$isEmpty(a)||x(h)||a<=h},d.$observe("max",function(a){h=Wa(a);c.$validate()});if(u(d.step)||d.ngStep){var k;c.$validators.step=
+                function(a,b){return c.$isEmpty(b)||x(k)||ee(b,g||0,k)};d.$observe("step",function(a){k=Wa(a);c.$validate()})}},url:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||dh.test(d)}},email:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c);c.$$parserName="email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||eh.test(d)}},radio:function(a,b,d,c){var e=!d.ngTrim||"false"!==Q(d.ngTrim);x(d.name)&&b.attr("name",++qb);
+                b.on("click",function(a){var g;b[0].checked&&(g=d.value,e&&(g=Q(g)),c.$setViewValue(g,a&&a.type))});c.$render=function(){var a=d.value;e&&(a=Q(a));b[0].checked=a===c.$viewValue};d.$observe("value",c.$render)},range:function(a,b,d,c,e,f){function g(a,c){b.attr(a,d[a]);d.$observe(a,c)}function h(a){p=Wa(a);U(c.$modelValue)||(m?(a=b.val(),p>a&&(a=p,b.val(a)),c.$setViewValue(a)):c.$validate())}function k(a){n=Wa(a);U(c.$modelValue)||(m?(a=b.val(),n<a&&(b.val(n),a=n<p?p:n),c.$setViewValue(a)):c.$validate())}
+                function l(a){r=Wa(a);U(c.$modelValue)||(m&&c.$viewValue!==b.val()?c.$setViewValue(b.val()):c.$validate())}Hc(a,b,d,c);de(c);Va(a,b,d,c,e,f);var m=c.$$hasNativeValidators&&"range"===b[0].type,p=m?0:void 0,n=m?100:void 0,r=m?1:void 0,q=b[0].validity;a=u(d.min);e=u(d.max);f=u(d.step);var v=c.$render;c.$render=m&&u(q.rangeUnderflow)&&u(q.rangeOverflow)?function(){v();c.$setViewValue(b.val())}:v;a&&(c.$validators.min=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||x(p)||b>=p},g("min",h));e&&
+                (c.$validators.max=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||x(n)||b<=n},g("max",k));f&&(c.$validators.step=m?function(){return!q.stepMismatch}:function(a,b){return c.$isEmpty(b)||x(r)||ee(b,p||0,r)},g("step",l))},checkbox:function(a,b,d,c,e,f,g,h){var k=fe(h,a,"ngTrueValue",d.ngTrueValue,!0),l=fe(h,a,"ngFalseValue",d.ngFalseValue,!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===
+            a};c.$formatters.push(function(a){return sa(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:D,button:D,submit:D,reset:D,file:D},Zc=["$browser","$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(ne[L(g.type)]||ne.text)(e,f,g,h[0],b,a,d,c)}}}}],fh=/^(true|false|\d+)$/,mf=function(){function a(a,d,c){var e=u(c)?c:9===Ca?"":null;a.prop("value",e);d.$set("value",c)}return{restrict:"A",priority:100,compile:function(b,d){return fh.test(d.ngValue)?
+            function(b,d,f){b=b.$eval(f.ngValue);a(d,f,b)}:function(b,d,f){b.$watch(f.ngValue,function(b){a(d,f,b)})}}}},Me=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=gc(a)})}}}}],Oe=["$interpolate","$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);
+                d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=x(a)?"":a})}}}}],Ne=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=b(e.ngBindHtml,function(b){return a.valueOf(b)});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,function(){var d=f(b);c.html(a.getTrustedHtml(d)||"")})}}}}],lf=la({restrict:"A",require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),
+        Pe=Jc("",!0),Re=Jc("Odd",0),Qe=Jc("Even",1),Se=Qa({compile:function(a,b){b.$set("ngCloak",void 0);a.removeClass("ng-cloak")}}),Te=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],dd={},gh={blur:!0,focus:!0};r("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var b=Ea("ng-"+a);dd[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=
+            d(f[b]);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};gh[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var We=["$animate","$compile",function(a,b){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(d,c,e,f,g){var h,k,l;d.$watch(e.ngIf,function(d){d?k||g(function(d,f){k=f;d[d.length++]=b.$$createComment("end ngIf",e.ngIf);h={clone:d};a.enter(d,c.parent(),c)}):(l&&(l.remove(),l=null),k&&(k.$destroy(),k=null),h&&(l=
+            tb(h.clone),a.leave(l).done(function(a){!1!==a&&(l=null)}),h=null))})}}}],Xe=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:$.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,p,n){var r=0,q,v,y,t=function(){v&&(v.remove(),v=null);q&&(q.$destroy(),q=null);y&&(d.leave(y).done(function(a){!1!==a&&(v=null)}),v=y,y=null)};c.$watch(f,function(f){var m=function(a){!1===
+        a||!u(h)||h&&!c.$eval(h)||b()},v=++r;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&v===r){var b=c.$new();p.template=a;a=n(b,function(a){t();d.enter(a,null,e).done(m)});q=b;y=a;q.$emit("$includeContentLoaded",f);c.$eval(g)}},function(){c.$$destroyed||v!==r||(t(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(t(),p.template=null)})}}}}],of=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(b,d,c,e){ia.call(d[0]).match(/SVG/)?
+            (d.empty(),a(fd(e.template,w.document).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],Ye=Qa({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),kf=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=d.ngList||", ",f="false"!==d.ngTrim,g=f?Q(e):e;c.$parsers.push(function(a){if(!x(a)){var b=[];a&&r(a.split(g),function(a){a&&b.push(f?Q(a):a)});return b}});c.$formatters.push(function(a){if(I(a))return a.join(e)});
+            c.$isEmpty=function(a){return!a||!a.length}}}},nb="ng-valid",$d="ng-invalid",Ya="ng-pristine",Vb="ng-dirty",pb=K("ngModel");Sb.$inject="$scope $exceptionHandler $attrs $element $parse $animate $timeout $q $interpolate".split(" ");Sb.prototype={$$initGetterSetters:function(){if(this.$options.getOption("getterSetter")){var a=this.$$parse(this.$$attr.ngModel+"()"),b=this.$$parse(this.$$attr.ngModel+"($$$p)");this.$$ngModelGet=function(b){var c=this.$$parsedNgModel(b);C(c)&&(c=a(b));return c};this.$$ngModelSet=
+            function(a,c){C(this.$$parsedNgModel(a))?b(a,{$$$p:c}):this.$$parsedNgModelAssign(a,c)}}else if(!this.$$parsedNgModel.assign)throw pb("nonassign",this.$$attr.ngModel,za(this.$$element));},$render:D,$isEmpty:function(a){return x(a)||""===a||null===a||a!==a},$$updateEmptyClasses:function(a){this.$isEmpty(a)?(this.$$animate.removeClass(this.$$element,"ng-not-empty"),this.$$animate.addClass(this.$$element,"ng-empty")):(this.$$animate.removeClass(this.$$element,"ng-empty"),this.$$animate.addClass(this.$$element,
+            "ng-not-empty"))},$setPristine:function(){this.$dirty=!1;this.$pristine=!0;this.$$animate.removeClass(this.$$element,Vb);this.$$animate.addClass(this.$$element,Ya)},$setDirty:function(){this.$dirty=!0;this.$pristine=!1;this.$$animate.removeClass(this.$$element,Ya);this.$$animate.addClass(this.$$element,Vb);this.$$parentForm.$setDirty()},$setUntouched:function(){this.$touched=!1;this.$untouched=!0;this.$$animate.setClass(this.$$element,"ng-untouched","ng-touched")},$setTouched:function(){this.$touched=
+            !0;this.$untouched=!1;this.$$animate.setClass(this.$$element,"ng-touched","ng-untouched")},$rollbackViewValue:function(){this.$$timeout.cancel(this.$$pendingDebounce);this.$viewValue=this.$$lastCommittedViewValue;this.$render()},$validate:function(){if(!U(this.$modelValue)){var a=this.$$lastCommittedViewValue,b=this.$$rawModelValue,d=this.$valid,c=this.$modelValue,e=this.$options.getOption("allowInvalid"),f=this;this.$$runValidators(b,a,function(a){e||d===a||(f.$modelValue=a?b:void 0,f.$modelValue!==
+        c&&f.$$writeModelToScope())})}},$$runValidators:function(a,b,d){function c(){var c=!0;r(k.$validators,function(d,e){var g=Boolean(d(a,b));c=c&&g;f(e,g)});return c?!0:(r(k.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;r(k.$asyncValidators,function(e,g){var k=e(a,b);if(!k||!C(k.then))throw pb("nopromise",k);f(g,void 0);c.push(k.then(function(){f(g,!0)},function(){d=!1;f(g,!1)}))});c.length?k.$$q.all(c).then(function(){g(d)},D):g(!0)}function f(a,b){h===k.$$currentValidationRunId&&
+        k.$setValidity(a,b)}function g(a){h===k.$$currentValidationRunId&&d(a)}this.$$currentValidationRunId++;var h=this.$$currentValidationRunId,k=this;(function(){var a=k.$$parserName||"parse";if(x(k.$$parserValid))f(a,null);else return k.$$parserValid||(r(k.$validators,function(a,b){f(b,null)}),r(k.$asyncValidators,function(a,b){f(b,null)})),f(a,k.$$parserValid),k.$$parserValid;return!0})()?c()?e():g(!1):g(!1)},$commitViewValue:function(){var a=this.$viewValue;this.$$timeout.cancel(this.$$pendingDebounce);
+            if(this.$$lastCommittedViewValue!==a||""===a&&this.$$hasNativeValidators)this.$$updateEmptyClasses(a),this.$$lastCommittedViewValue=a,this.$pristine&&this.$setDirty(),this.$$parseAndValidate()},$$parseAndValidate:function(){var a=this.$$lastCommittedViewValue,b=this;if(this.$$parserValid=x(a)?void 0:!0)for(var d=0;d<this.$parsers.length;d++)if(a=this.$parsers[d](a),x(a)){this.$$parserValid=!1;break}U(this.$modelValue)&&(this.$modelValue=this.$$ngModelGet(this.$$scope));var c=this.$modelValue,e=this.$options.getOption("allowInvalid");
+            this.$$rawModelValue=a;e&&(this.$modelValue=a,b.$modelValue!==c&&b.$$writeModelToScope());this.$$runValidators(a,this.$$lastCommittedViewValue,function(d){e||(b.$modelValue=d?a:void 0,b.$modelValue!==c&&b.$$writeModelToScope())})},$$writeModelToScope:function(){this.$$ngModelSet(this.$$scope,this.$modelValue);r(this.$viewChangeListeners,function(a){try{a()}catch(b){this.$$exceptionHandler(b)}},this)},$setViewValue:function(a,b){this.$viewValue=a;this.$options.getOption("updateOnDefault")&&this.$$debounceViewValueCommit(b)},
+        $$debounceViewValueCommit:function(a){var b=this.$options.getOption("debounce");Y(b[a])?b=b[a]:Y(b["default"])&&(b=b["default"]);this.$$timeout.cancel(this.$$pendingDebounce);var d=this;0<b?this.$$pendingDebounce=this.$$timeout(function(){d.$commitViewValue()},b):this.$$scope.$root.$$phase?this.$commitViewValue():this.$$scope.$apply(function(){d.$commitViewValue()})},$overrideModelOptions:function(a){this.$options=this.$options.createChild(a);this.$$setUpdateOnEvents()},$processModelValue:function(){var a=
+            this.$$format();this.$viewValue!==a&&(this.$$updateEmptyClasses(a),this.$viewValue=this.$$lastCommittedViewValue=a,this.$render(),this.$$runValidators(this.$modelValue,this.$viewValue,D))},$$format:function(){for(var a=this.$formatters,b=a.length,d=this.$modelValue;b--;)d=a[b](d);return d},$$setModelValue:function(a){this.$modelValue=this.$$rawModelValue=a;this.$$parserValid=void 0;this.$processModelValue()},$$setUpdateOnEvents:function(){this.$$updateEvents&&this.$$element.off(this.$$updateEvents,
+            this.$$updateEventHandler);if(this.$$updateEvents=this.$options.getOption("updateOn"))this.$$element.on(this.$$updateEvents,this.$$updateEventHandler)},$$updateEventHandler:function(a){this.$$debounceViewValueCommit(a&&a.type)}};ae({clazz:Sb,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]}});var jf=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Sb,priority:1,compile:function(b){b.addClass(Ya).addClass("ng-untouched").addClass(nb);
+            return{pre:function(a,b,e,f){var g=f[0];b=f[1]||g.$$parentForm;if(f=f[2])g.$options=f.$options;g.$$initGetterSetters();b.$addControl(g);e.$observe("name",function(a){g.$name!==a&&g.$$parentForm.$$renameControl(g,a)});a.$on("$destroy",function(){g.$$parentForm.$removeControl(g)})},post:function(b,c,e,f){function g(){h.$setTouched()}var h=f[0];h.$$setUpdateOnEvents();c.on("blur",function(){h.$touched||(a.$$phase?b.$evalAsync(g):b.$apply(g))})}}}}}],Tb,hh=/(\s+|^)default(\s+|$)/;Kc.prototype={getOption:function(a){return this.$$options[a]},
+        createChild:function(a){var b=!1;a=O({},a);r(a,function(d,c){"$inherit"===d?"*"===c?b=!0:(a[c]=this.$$options[c],"updateOn"===c&&(a.updateOnDefault=this.$$options.updateOnDefault)):"updateOn"===c&&(a.updateOnDefault=!1,a[c]=Q(d.replace(hh,function(){a.updateOnDefault=!0;return" "})))},this);b&&(delete a["*"],ge(a,this.$$options));ge(a,Tb.$$options);return new Kc(a)}};Tb=new Kc({updateOn:"",updateOnDefault:!0,debounce:0,getterSetter:!1,allowInvalid:!1,timezone:null});var nf=function(){function a(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            d){this.$$attrs=a;this.$$scope=d}a.$inject=["$attrs","$scope"];a.prototype={$onInit:function(){var a=this.parentCtrl?this.parentCtrl.$options:Tb,d=this.$$scope.$eval(this.$$attrs.ngModelOptions);this.$options=a.createChild(d)}};return{restrict:"A",priority:10,require:{parentCtrl:"?^^ngModelOptions"},bindToController:!0,controller:a}},Ze=Qa({terminal:!0,priority:1E3}),ih=K("ngOptions"),jh=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
+        gf=["$compile","$document","$parse",function(a,b,d){function c(a,b,c){function e(a,b,c,d,f){this.selectValue=a;this.viewValue=b;this.label=c;this.group=d;this.disabled=f}function f(a){var b;if(!r&&wa(a))b=a;else{b=[];for(var c in a)a.hasOwnProperty(c)&&"$"!==c.charAt(0)&&b.push(c)}return b}var p=a.match(jh);if(!p)throw ih("iexp",a,za(b));var n=p[5]||p[7],r=p[6];a=/ as /.test(p[0])&&p[1];var q=p[9];b=d(p[2]?p[1]:n);var v=a&&d(a)||b,u=q&&d(q),t=q?function(a,b){return u(c,b)}:function(a){return Pa(a)},
+            w=function(a,b){return t(a,C(a,b))},x=d(p[2]||p[1]),A=d(p[3]||""),H=d(p[4]||""),G=d(p[8]),z={},C=r?function(a,b){z[r]=b;z[n]=a;return z}:function(a){z[n]=a;return z};return{trackBy:q,getTrackByValue:w,getWatchables:d(G,function(a){var b=[];a=a||[];for(var d=f(a),e=d.length,g=0;g<e;g++){var h=a===d?g:d[g],l=a[h],h=C(l,h),l=t(l,h);b.push(l);if(p[2]||p[1])l=x(c,h),b.push(l);p[4]&&(h=H(c,h),b.push(h))}return b}),getOptions:function(){for(var a=[],b={},d=G(c)||[],g=f(d),h=g.length,n=0;n<h;n++){var p=d===
+            g?n:g[n],r=C(d[p],p),u=v(c,r),p=t(u,r),y=x(c,r),F=A(c,r),r=H(c,r),u=new e(p,u,y,F,r);a.push(u);b[p]=u}return{items:a,selectValueMap:b,getOptionFromViewValue:function(a){return b[w(a)]},getViewValueFromOption:function(a){return q?pa(a.viewValue):a.viewValue}}}}}var e=w.document.createElement("option"),f=w.document.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","ngModel"],link:{pre:function(a,b,c,d){d[0].registerOption=D},post:function(d,h,k,l){function m(a){var b=(a=t.getOptionFromViewValue(a))&&
+                    a.element;b&&!b.selected&&(b.selected=!0);return a}function p(a,b){a.element=b;b.disabled=a.disabled;a.label!==b.label&&(b.label=a.label,b.textContent=a.label);b.value=a.selectValue}var n=l[0],q=l[1],s=k.multiple;l=0;for(var v=h.children(),y=v.length;l<y;l++)if(""===v[l].value){n.hasEmptyOption=!0;n.emptyOption=v.eq(l);break}h.empty();l=!!n.emptyOption;z(e.cloneNode(!1)).val("?");var t,w=c(k.ngOptions,h,d),x=b[0].createDocumentFragment();n.generateUnknownOptionValue=function(a){return"?"};s?(n.writeValue=
+                    function(a){if(t){var b=a&&a.map(m)||[];t.items.forEach(function(a){a.element.selected&&-1===Array.prototype.indexOf.call(b,a)&&(a.element.selected=!1)})}},n.readValue=function(){var a=h.val()||[],b=[];r(a,function(a){(a=t.selectValueMap[a])&&!a.disabled&&b.push(t.getViewValueFromOption(a))});return b},w.trackBy&&d.$watchCollection(function(){if(I(q.$viewValue))return q.$viewValue.map(function(a){return w.getTrackByValue(a)})},function(){q.$render()})):(n.writeValue=function(a){if(t){var b=h[0].options[h[0].selectedIndex],
+                    c=t.getOptionFromViewValue(a);b&&b.removeAttribute("selected");c?(h[0].value!==c.selectValue&&(n.removeUnknownOption(),h[0].value=c.selectValue,c.element.selected=!0),c.element.setAttribute("selected","selected")):n.selectUnknownOrEmptyOption(a)}},n.readValue=function(){var a=t.selectValueMap[h.val()];return a&&!a.disabled?(n.unselectEmptyOption(),n.removeUnknownOption(),t.getViewValueFromOption(a)):null},w.trackBy&&d.$watch(function(){return w.getTrackByValue(q.$viewValue)},function(){q.$render()}));
+                    l&&(a(n.emptyOption)(d),h.prepend(n.emptyOption),8===n.emptyOption[0].nodeType?(n.hasEmptyOption=!1,n.registerOption=function(a,b){""===b.val()&&(n.hasEmptyOption=!0,n.emptyOption=b,n.emptyOption.removeClass("ng-scope"),q.$render(),b.on("$destroy",function(){var a=n.$isEmptyOptionSelected();n.hasEmptyOption=!1;n.emptyOption=void 0;a&&q.$render()}))}):n.emptyOption.removeClass("ng-scope"));d.$watchCollection(w.getWatchables,function(){var a=t&&n.readValue();if(t)for(var b=t.items.length-1;0<=b;b--){var c=
+                        t.items[b];u(c.group)?Fb(c.element.parentNode):Fb(c.element)}t=w.getOptions();var d={};t.items.forEach(function(a){var b;if(u(a.group)){b=d[a.group];b||(b=f.cloneNode(!1),x.appendChild(b),b.label=null===a.group?"null":a.group,d[a.group]=b);var c=e.cloneNode(!1);b.appendChild(c);p(a,c)}else b=e.cloneNode(!1),x.appendChild(b),p(a,b)});h[0].appendChild(x);q.$render();q.$isEmpty(a)||(b=n.readValue(),(w.trackBy||s?sa(a,b):a===b)||(q.$setViewValue(b),q.$render()))})}}}}],$e=["$locale","$interpolate","$log",
+            function(a,b,d){var c=/{}/g,e=/^when(Minus)?(.+)$/;return{link:function(f,g,h){function k(a){g.text(a||"")}var l=h.count,m=h.$attr.when&&g.attr(h.$attr.when),p=h.offset||0,n=f.$eval(m)||{},q={},s=b.startSymbol(),v=b.endSymbol(),u=s+l+"-"+p+v,t=$.noop,w;r(h,function(a,b){var c=e.exec(b);c&&(c=(c[1]?"-":"")+L(c[2]),n[c]=g.attr(h.$attr[b]))});r(n,function(a,d){q[d]=b(a.replace(c,u))});f.$watch(l,function(b){var c=parseFloat(b),e=U(c);e||c in n||(c=a.pluralCat(c-p));c===w||e&&U(w)||(t(),e=q[c],x(e)?(null!=
+                b&&d.debug("ngPluralize: no rule defined for '"+c+"' in "+m),t=D,k()):t=f.$watch(e,k),w=c)})}}}],af=["$parse","$animate","$compile",function(a,b,d){var c=K("ngRepeat"),e=function(a,b,c,d,e,m,p){a[c]=d;e&&(a[e]=m);a.$index=b;a.$first=0===b;a.$last=b===p-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(b&1))};return{restrict:"A",multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(f,g){var h=g.ngRepeat,k=d.$$createComment("end ngRepeat",h),l=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
+                if(!l)throw c("iexp",h);var m=l[1],p=l[2],n=l[3],q=l[4],l=m.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);if(!l)throw c("iidexp",m);var s=l[3]||l[1],v=l[2];if(n&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(n)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(n)))throw c("badident",n);var u,t,w,x,z={$id:Pa};q?u=a(q):(w=function(a,b){return Pa(b)},x=function(a){return a});return function(a,d,f,g,l){u&&(t=function(b,c,d){v&&(z[v]=b);z[s]=c;z.$index=
+                    d;return u(a,z)});var m=S();a.$watchCollection(p,function(f){var g,p,q=d[0],u,y=S(),z,F,C,A,D,B,E;n&&(a[n]=f);if(wa(f))D=f,p=t||w;else for(E in p=t||x,D=[],f)ra.call(f,E)&&"$"!==E.charAt(0)&&D.push(E);z=D.length;E=Array(z);for(g=0;g<z;g++)if(F=f===D?g:D[g],C=f[F],A=p(F,C,g),m[A])B=m[A],delete m[A],y[A]=B,E[g]=B;else{if(y[A])throw r(E,function(a){a&&a.scope&&(m[a.id]=a)}),c("dupes",h,A,C);E[g]={id:A,scope:void 0,clone:void 0};y[A]=!0}for(u in m){B=m[u];A=tb(B.clone);b.leave(A);if(A[0].parentNode)for(g=
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                0,p=A.length;g<p;g++)A[g].$$NG_REMOVED=!0;B.scope.$destroy()}for(g=0;g<z;g++)if(F=f===D?g:D[g],C=f[F],B=E[g],B.scope){u=q;do u=u.nextSibling;while(u&&u.$$NG_REMOVED);B.clone[0]!==u&&b.move(tb(B.clone),null,q);q=B.clone[B.clone.length-1];e(B.scope,g,s,C,v,F,z)}else l(function(a,c){B.scope=c;var d=k.cloneNode(!1);a[a.length++]=d;b.enter(a,null,q);q=d;B.clone=a;y[B.id]=B;e(B.scope,g,s,C,v,F,z)});m=y})}}}}],bf=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngShow,
+                function(b){a[b?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Ve=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngHide,function(b){a[b?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],cf=Qa(function(a,b,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&r(d,function(a,c){b.css(c,"")});a&&b.css(a)},!0)}),df=["$animate","$compile",function(a,b){return{require:"ngSwitch",controller:["$scope",function(){this.cases=
+                {}}],link:function(d,c,e,f){var g=[],h=[],k=[],l=[],m=function(a,b){return function(c){!1!==c&&a.splice(b,1)}};d.$watch(e.ngSwitch||e.on,function(c){for(var d,e;k.length;)a.cancel(k.pop());d=0;for(e=l.length;d<e;++d){var q=tb(h[d].clone);l[d].$destroy();(k[d]=a.leave(q)).done(m(k,d))}h.length=0;l.length=0;(g=f.cases["!"+c]||f.cases["?"])&&r(g,function(c){c.transclude(function(d,e){l.push(e);var f=c.element;d[d.length++]=b.$$createComment("end ngSwitchWhen");h.push({clone:d});a.enter(d,f.parent(),
+                f)})})})}}}],ef=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){a=d.ngSwitchWhen.split(d.ngSwitchWhenSeparator).sort().filter(function(a,b,c){return c[b-1]!==a});r(a,function(a){c.cases["!"+a]=c.cases["!"+a]||[];c.cases["!"+a].push({transclude:e,element:b})})}}),ff=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){c.cases["?"]=c.cases["?"]||[];c.cases["?"].push({transclude:e,element:b})}}),kh=K("ngTransclude"),
+        hf=["$compile",function(a){return{restrict:"EAC",compile:function(b){var d=a(b.contents());b.empty();return function(a,b,f,g,h){function k(){d(a,function(a){b.append(a)})}if(!h)throw kh("orphan",za(b));f.ngTransclude===f.$attr.ngTransclude&&(f.ngTransclude="");f=f.ngTransclude||f.ngTranscludeSlot;h(function(a,c){var d;if(d=a.length)a:{d=0;for(var f=a.length;d<f;d++){var g=a[d];if(g.nodeType!==Oa||g.nodeValue.trim()){d=!0;break a}}d=void 0}d?b.append(a):(k(),c.$destroy())},null,f);f&&!h.isSlotFilled(f)&&
+            k()}}}}],Je=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(b,d){"text/ng-template"===d.type&&a.put(d.id,b[0].text)}}}],lh={$setViewValue:D,$render:D},mh=["$element","$scope",function(a,b){function d(){g||(g=!0,b.$$postDigest(function(){g=!1;e.ngModelCtrl.$render()}))}function c(a){h||(h=!0,b.$$postDigest(function(){b.$$destroyed||(h=!1,e.ngModelCtrl.$setViewValue(e.readValue()),a&&e.ngModelCtrl.$render())}))}var e=this,f=new Hb;e.selectValueMap={};e.ngModelCtrl=lh;
+            e.multiple=!1;e.unknownOption=z(w.document.createElement("option"));e.hasEmptyOption=!1;e.emptyOption=void 0;e.renderUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);a.prepend(e.unknownOption);Ga(e.unknownOption,!0);a.val(b)};e.updateUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);Ga(e.unknownOption,!0);a.val(b)};e.generateUnknownOptionValue=function(a){return"? "+Pa(a)+" ?"};e.removeUnknownOption=function(){e.unknownOption.parent()&&
+            e.unknownOption.remove()};e.selectEmptyOption=function(){e.emptyOption&&(a.val(""),Ga(e.emptyOption,!0))};e.unselectEmptyOption=function(){e.hasEmptyOption&&Ga(e.emptyOption,!1)};b.$on("$destroy",function(){e.renderUnknownOption=D});e.readValue=function(){var b=a.val(),b=b in e.selectValueMap?e.selectValueMap[b]:b;return e.hasOption(b)?b:null};e.writeValue=function(b){var c=a[0].options[a[0].selectedIndex];c&&Ga(z(c),!1);e.hasOption(b)?(e.removeUnknownOption(),c=Pa(b),a.val(c in e.selectValueMap?
+                c:b),Ga(z(a[0].options[a[0].selectedIndex]),!0)):e.selectUnknownOrEmptyOption(b)};e.addOption=function(a,b){if(8!==b[0].nodeType){Ia(a,'"option value"');""===a&&(e.hasEmptyOption=!0,e.emptyOption=b);var c=f.get(a)||0;f.set(a,c+1);d()}};e.removeOption=function(a){var b=f.get(a);b&&(1===b?(f.delete(a),""===a&&(e.hasEmptyOption=!1,e.emptyOption=void 0)):f.set(a,b-1))};e.hasOption=function(a){return!!f.get(a)};e.$hasEmptyOption=function(){return e.hasEmptyOption};e.$isUnknownOptionSelected=function(){return a[0].options[0]===
+                e.unknownOption[0]};e.$isEmptyOptionSelected=function(){return e.hasEmptyOption&&a[0].options[a[0].selectedIndex]===e.emptyOption[0]};e.selectUnknownOrEmptyOption=function(a){null==a&&e.emptyOption?(e.removeUnknownOption(),e.selectEmptyOption()):e.unknownOption.parent().length?e.updateUnknownOption(a):e.renderUnknownOption(a)};var g=!1,h=!1;e.registerOption=function(a,b,f,g,h){if(f.$attr.ngValue){var q,r=NaN;f.$observe("value",function(a){var d,f=b.prop("selected");u(r)&&(e.removeOption(q),delete e.selectValueMap[r],
+                d=!0);r=Pa(a);q=a;e.selectValueMap[r]=a;e.addOption(a,b);b.attr("value",r);d&&f&&c()})}else g?f.$observe("value",function(a){e.readValue();var d,f=b.prop("selected");u(q)&&(e.removeOption(q),d=!0);q=a;e.addOption(a,b);d&&f&&c()}):h?a.$watch(h,function(a,d){f.$set("value",a);var g=b.prop("selected");d!==a&&e.removeOption(d);e.addOption(a,b);d&&g&&c()}):e.addOption(f.value,b);f.$observe("disabled",function(a){if("true"===a||a&&b.prop("selected"))e.multiple?c(!0):(e.ngModelCtrl.$setViewValue(null),e.ngModelCtrl.$render())});
+                b.on("$destroy",function(){var a=e.readValue(),b=f.value;e.removeOption(b);d();(e.multiple&&a&&-1!==a.indexOf(b)||a===b)&&c(!0)})}}],Ke=function(){return{restrict:"E",require:["select","?ngModel"],controller:mh,priority:1,link:{pre:function(a,b,d,c){var e=c[0],f=c[1];if(f){if(e.ngModelCtrl=f,b.on("change",function(){e.removeUnknownOption();a.$apply(function(){f.$setViewValue(e.readValue())})}),d.multiple){e.multiple=!0;e.readValue=function(){var a=[];r(b.find("option"),function(b){b.selected&&!b.disabled&&
+                (b=b.value,a.push(b in e.selectValueMap?e.selectValueMap[b]:b))});return a};e.writeValue=function(a){r(b.find("option"),function(b){var c=!!a&&(-1!==Array.prototype.indexOf.call(a,b.value)||-1!==Array.prototype.indexOf.call(a,e.selectValueMap[b.value]));c!==b.selected&&Ga(z(b),c)})};var g,h=NaN;a.$watch(function(){h!==f.$viewValue||sa(g,f.$viewValue)||(g=ka(f.$viewValue),f.$render());h=f.$viewValue});f.$isEmpty=function(a){return!a||0===a.length}}}else e.registerOption=D},post:function(a,b,d,c){var e=
+                    c[1];if(e){var f=c[0];e.$render=function(){f.writeValue(e.$viewValue)}}}}}},Le=["$interpolate",function(a){return{restrict:"E",priority:100,compile:function(b,d){var c,e;u(d.ngValue)||(u(d.value)?c=a(d.value,!0):(e=a(b.text(),!0))||d.$set("value",b.text()));return function(a,b,d){var k=b.parent();(k=k.data("$selectController")||k.parent().data("$selectController"))&&k.registerOption(a,b,d,c,e)}}}}],ad=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){c&&(d.required=!0,c.$validators.required=
+                function(a,b){return!d.required||!c.$isEmpty(b)},d.$observe("required",function(){c.$validate()}))}}},$c=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e,f=d.ngPattern||d.pattern;d.$observe("pattern",function(a){E(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw K("ngPattern")("noregexp",f,a,za(b));e=a||void 0;c.$validate()});c.$validators.pattern=function(a,b){return c.$isEmpty(b)||x(e)||e.test(b)}}}}},cd=function(){return{restrict:"A",require:"?ngModel",
+            link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);e=U(a)?-1:a;c.$validate()});c.$validators.maxlength=function(a,b){return 0>e||c.$isEmpty(b)||b.length<=e}}}}},bd=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Z(a)||0;c.$validate()});c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};w.angular.bootstrap?w.console&&console.log("WARNING: Tried to load AngularJS more than once."):
+        (Be(),Ee($),$.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),
+                STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,
+                    minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),z(function(){we(w.document,Uc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+//# sourceMappingURL=angular.min.js.map
\ No newline at end of file
diff --git a/setup/pub/images/magento-logo.svg b/setup/pub/images/magento-logo.svg
index 6dcc79d33b294..e4f627809b627 100644
--- a/setup/pub/images/magento-logo.svg
+++ b/setup/pub/images/magento-logo.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/>
-	<path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/>
-	<path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/>
-	<path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/>
-	<path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/>
-	<path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/>
-	<path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/>
-		<path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/>
-	<g fill="#E85D22">
-		<path d="m26.845 8.857"/>
-		<polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/>
-		<polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.07329 60.13148"><defs><style>.a{fill:#f26322;}.b{fill:#4d4d4d;}</style></defs><title>Magento-an-Adobe-Company-logo-horizontal</title><polygon class="a" points="21.432 0 0 12.373 0 37.086 6.117 40.619 6.076 15.906 21.391 7.064 36.704 15.906 36.704 40.612 42.822 37.086 42.822 12.35 21.432 0"/><polygon class="a" points="24.47 40.618 21.412 42.39 18.341 40.631 18.341 15.906 12.225 19.438 12.235 44.15 21.407 49.448 30.587 44.15 30.587 19.438 24.47 15.906 24.47 40.618"/><path class="b" d="M56.83813,12.5216l8.41451,21.258h.06808L73.531,12.5216h3.20261V36.87914h-2.2145v-21.223H74.451q-.17069.57915-.37444,1.15831-.17213.477-.39291,1.05522c-.14685.38707-.27814.74983-.391,1.09023l-7.052,17.91925H64.23049L57.11044,18.95989q-.20422-.477-.40847-1.03869t-.3754-1.07272q-.20424-.61417-.40848-1.19235H55.85v21.223H53.73763V12.5216Z"/><path class="b" d="M83.16956,36.98155a5.18444,5.18444,0,0,1-1.82256-.92,4.32686,4.32686,0,0,1-1.20888-1.53274,4.88654,4.88654,0,0,1-.44348-2.14545,5.01721,5.01721,0,0,1,.57867-2.55586,4.4721,4.4721,0,0,1,1.56775-1.58429,7.91353,7.91353,0,0,1,2.29911-.90253,24.63306,24.63306,0,0,1,2.81067-.47655q1.29545-.13713,2.198-.28982a6.67488,6.67488,0,0,0,1.46466-.39194,1.74967,1.74967,0,0,0,.81694-.63021,1.93855,1.93855,0,0,0,.25578-1.07272V24.139A3.21282,3.21282,0,0,0,90.596,21.4645,4.92377,4.92377,0,0,0,87.4624,20.595q-4.7018,0-4.94056,3.91841H80.44447a5.74847,5.74847,0,0,1,1.89064-4.08861A7.50173,7.50173,0,0,1,87.4624,18.8921,7.336,7.336,0,0,1,92.02659,20.17a4.92221,4.92221,0,0,1,1.66986,4.17322v9.57282a1.80589,1.80589,0,0,0,.28983,1.1408,1.14194,1.14194,0,0,0,.86848.39194,2.038,2.038,0,0,0,.3579-.034c.12449-.02237.26648-.05738.425-.10212h.10309v1.53274a3.99429,3.99429,0,0,1-.57964.18771,3.60124,3.60124,0,0,1-.852.08558,2.69449,2.69449,0,0,1-1.8391-.59714,2.57739,2.57739,0,0,1-.74983-1.89064v-.37444h-.10212a10.28754,10.28754,0,0,1-.90252,1.05619,6.08059,6.08059,0,0,1-1.27794.98812,7.1451,7.1451,0,0,1-1.737.71482,8.46792,8.46792,0,0,1-2.24853.27232,8.161,8.161,0,0,1-2.28258-.30636m5.19537-1.8566a5.975,5.975,0,0,0,1.8566-1.17484,4.76767,4.76767,0,0,0,1.4987-3.44089V27.34065a7.29273,7.29273,0,0,1-2.06084.73233q-1.20936.2553-2.50432.426-1.12329.17068-2.07737.3579a5.243,5.243,0,0,0-1.65236.59617,3.05235,3.05235,0,0,0-1.10773,1.10677,3.58626,3.58626,0,0,0-.40847,1.82353,3.2604,3.2604,0,0,0,.32386,1.53274,2.77919,2.77919,0,0,0,.851.98714,3.34368,3.34368,0,0,0,1.24389.52907,7.139,7.139,0,0,0,1.4987.15269,6.55762,6.55762,0,0,0,2.53836-.46"/><path class="b" d="M99.3499,41.73412a4.68909,4.68909,0,0,1-2.0093-3.28722h2.04334a2.86247,2.86247,0,0,0,1.65236,2.197,7.52105,7.52105,0,0,0,3.28819.66425,5.69284,5.69284,0,0,0,4.17322-1.345,4.99842,4.99842,0,0,0,1.345-3.69667V33.47327h-.10212a7.27781,7.27781,0,0,1-2.28258,2.2816,6.2891,6.2891,0,0,1-3.30375.78388,7.37745,7.37745,0,0,1-3.13453-.64675,6.92683,6.92683,0,0,1-2.3847-1.806,8.09694,8.09694,0,0,1-1.51621-2.77664,11.4194,11.4194,0,0,1-.52809-3.55954,10.89083,10.89083,0,0,1,.6127-3.79878,8.46783,8.46783,0,0,1,1.63583-2.77663,6.74456,6.74456,0,0,1,2.40221-1.70294,7.447,7.447,0,0,1,2.91279-.57964,6.23565,6.23565,0,0,1,3.37183.83542,6.92287,6.92287,0,0,1,2.2145,2.26507h.10212V19.26721h2.07834V36.19836a6.77964,6.77964,0,0,1-1.63583,4.73535,7.75455,7.75455,0,0,1-5.89269,2.11238,8.36019,8.36019,0,0,1-5.04267-1.312m9.23243-8.90857a8.55521,8.55521,0,0,0,1.39658-5.10978,11.225,11.225,0,0,0-.34039-2.86222,6.23339,6.23339,0,0,0-1.05619-2.231,4.8341,4.8341,0,0,0-1.78853-1.44812,5.76685,5.76685,0,0,0-2.50334-.51059,4.78168,4.78168,0,0,0-4.07111,1.94121,8.46075,8.46075,0,0,0-1.44812,5.17883,10.779,10.779,0,0,0,.34039,2.77664,6.6521,6.6521,0,0,0,1.02215,2.2145,4.81441,4.81441,0,0,0,1.70294,1.46466,5.20818,5.20818,0,0,0,2.4197.52809,4.969,4.969,0,0,0,4.32592-1.94218"/><path class="b" d="M119.24391,36.62385a7.17983,7.17983,0,0,1-2.57239-1.94121,8.67267,8.67267,0,0,1-1.58331-2.9303,11.83376,11.83376,0,0,1-.54561-3.66166,11.20538,11.20538,0,0,1,.57964-3.66262,9.15057,9.15057,0,0,1,1.61736-2.92933,7.3041,7.3041,0,0,1,2.52182-1.94218,7.68893,7.68893,0,0,1,3.32126-.6983,7.26371,7.26371,0,0,1,3.55953.80041,6.669,6.669,0,0,1,2.35067,2.14643,8.80226,8.80226,0,0,1,1.27793,3.083,16.91087,16.91087,0,0,1,.37442,3.57705H116.72307a10.20565,10.20565,0,0,0,.426,2.77663,6.97713,6.97713,0,0,0,1.12427,2.231,5.10411,5.10411,0,0,0,1.8566,1.4987,5.94442,5.94442,0,0,0,2.623.5456,4.98891,4.98891,0,0,0,3.42434-1.07369,5.88046,5.88046,0,0,0,1.71948-2.87778H129.941a7.5058,7.5058,0,0,1-2.3847,4.18975,7.07155,7.07155,0,0,1-4.80343,1.56678,8.37716,8.37716,0,0,1-3.509-.69829M127.55631,24.36a5.98459,5.98459,0,0,0-.98811-1.97623,4.52056,4.52056,0,0,0-1.63486-1.311,5.35765,5.35765,0,0,0-2.35066-.47752,5.61864,5.61864,0,0,0-2.36816.47752,5.06368,5.06368,0,0,0-1.75448,1.311,6.54337,6.54337,0,0,0-1.1408,1.95969,9.6597,9.6597,0,0,0-.56214,2.45278h11.17364a9.30557,9.30557,0,0,0-.37443-2.43624"/><path class="b" d="M134.87924,19.26682v2.69105h.06807a7.23505,7.23505,0,0,1,2.33315-2.197,6.8045,6.8045,0,0,1,3.56051-.86849,5.8368,5.8368,0,0,1,4.03706,1.41312,5.17343,5.17343,0,0,1,1.58428,4.0711V36.87973h-2.11238V24.58084a3.71719,3.71719,0,0,0-1.07272-2.94683,4.33224,4.33224,0,0,0-2.94781-.93656,5.90068,5.90068,0,0,0-2.1114.3754,5.56743,5.56743,0,0,0-1.73795,1.03869,4.77387,4.77387,0,0,0-1.17485,1.58428,4.72061,4.72061,0,0,0-.426,2.00929V36.87973h-2.1124V19.26682Z"/><path class="b" d="M151.91191,36.28355a2.93417,2.93417,0,0,1-.92-2.43624V21.00477h-2.657v-1.738h2.657V13.85069h2.11239v5.41613h3.27068v1.738h-3.27068V33.50692a1.65111,1.65111,0,0,0,.426,1.312,1.94949,1.94949,0,0,0,1.277.35693,3.61925,3.61925,0,0,0,.76638-.08462,3.514,3.514,0,0,0,.63021-.1877h.10309v1.806a5.90754,5.90754,0,0,1-1.94219.30635,3.82424,3.82424,0,0,1-2.45277-.73233"/><path class="b" d="M162.625,36.62424a7.37783,7.37783,0,0,1-2.57142-1.94219,8.72758,8.72758,0,0,1-1.61833-2.92932,12.21028,12.21028,0,0,1,0-7.32429,8.74174,8.74174,0,0,1,1.61833-2.93029A7.38946,7.38946,0,0,1,162.625,19.556a8.10343,8.10343,0,0,1,3.42436-.69829,7.98376,7.98376,0,0,1,3.40588.69829,7.43133,7.43133,0,0,1,2.55585,1.94219,8.50888,8.50888,0,0,1,1.60083,2.93029,12.56344,12.56344,0,0,1,0,7.32429,8.51161,8.51161,0,0,1-1.60083,2.92932,7.4195,7.4195,0,0,1-2.55585,1.94219,7.96929,7.96929,0,0,1-3.40588.69829,8.08867,8.08867,0,0,1-3.42436-.69829m6.0133-1.65237a5.30977,5.30977,0,0,0,1.87312-1.60082,7.23411,7.23411,0,0,0,1.12426-2.38469,11.35618,11.35618,0,0,0,0-5.79155,7.21572,7.21572,0,0,0-1.12426-2.38469,5.29013,5.29013,0,0,0-1.87312-1.60082,6.11061,6.11061,0,0,0-5.19538,0,5.5025,5.5025,0,0,0-1.87411,1.60082,7.037,7.037,0,0,0-1.14079,2.38469,11.38462,11.38462,0,0,0,0,5.79155,7.05452,7.05452,0,0,0,1.14079,2.38469,5.81691,5.81691,0,0,0,7.06949,1.60082"/><path class="b" d="M176.85586,22.19069a2.1284,2.1284,0,0,1-2.21371-2.26492,2.21634,2.21634,0,1,1,4.43114,0,2.14565,2.14565,0,0,1-2.21743,2.26492m0-4.2762a1.8463,1.8463,0,0,0-1.8928,2.01128,1.90119,1.90119,0,1,0,3.79717,0,1.85428,1.85428,0,0,0-1.90437-2.01128m.65338,3.22135-.751-1.07325h-.24266v1.03463h-.4296V18.58836h.76256c.52629,0,.8771.26363.8771.73238a.6799.6799,0,0,1-.50839.69275l.72373,1.02463Zm-.66074-2.15649h-.333v.741h.312c.28255,0,.46008-.11708.46008-.371,0-.24422-.15811-.37-.43911-.37"/><path class="b" d="M56.01605,53.8,54.9537,56.78168a.11575.11575,0,0,1-.11831.08828h-1.0035c-.07867,0-.10809-.039-.08828-.1183l3.21708-8.95821c.01982-.05945.039-.12551.05885-.19938a2.24879,2.24879,0,0,0,.04444-.406.06529.06529,0,0,1,.07387-.07387h1.44669a.08244.08244,0,0,1,.08828.07387l3.4681,9.57856c.03.06906.00961.10329-.05885.10329H60.96026a.13273.13273,0,0,1-.1177-.07386L59.7652,53.8Zm3.40924-1.13622q-.118-.354-.33209-.97407-.2135-.61975-.44981-1.28395-.236-.66479-.44259-1.28394c-.13813-.41377-.24142-.74767-.31048-1.0041h-.01441q-.08828.35491-.25823.87858-.17025.52338-.38375,1.13622-.21438.61255-.44259,1.26954-.22971.65668-.43539,1.26172Z"/><path class="b" d="M63.39544,51.36484c0-.12791-.0024-.27024-.0072-.42818-.00481-.15674-.00961-.30988-.015-.457-.0048-.14773-.00961-.28525-.01441-.41377a2.64678,2.64678,0,0,0-.02222-.27985.07822.07822,0,0,1,.08828-.08888h.91522a.14145.14145,0,0,1,.13271.08888,1.53405,1.53405,0,0,1,.04444.29486q.01441.19188.04444.4426a3.09954,3.09954,0,0,1,2.258-.97407,3.028,3.028,0,0,1,.81913.1183,1.9399,1.9399,0,0,1,.7747.43539,2.34944,2.34944,0,0,1,.58312.87078,3.76544,3.76544,0,0,1,.2288,1.42388v4.3689a.09138.09138,0,0,1-.10329.10329H68.08864c-.06846,0-.1033-.039-.1033-.1183V52.51607a2.28923,2.28923,0,0,0-.36873-1.35781,1.31944,1.31944,0,0,0-1.15122-.51646,2.232,2.232,0,0,0-1.02572.236,2.5679,2.5679,0,0,0-.81913.66419v5.22467c0,.06906-.02943.10329-.08828.10329H63.48432c-.05945,0-.08888-.03423-.08888-.10329Z"/><path class="b" d="M76.05776,53.8l-1.06235,2.98166a.11574.11574,0,0,1-.11831.08828H73.87361c-.07867,0-.1081-.039-.08828-.1183l3.21707-8.95821c.01982-.05945.039-.12551.05886-.19938a2.24974,2.24974,0,0,0,.04444-.406.06529.06529,0,0,1,.07386-.07387h1.4467a.08242.08242,0,0,1,.08827.07387l3.4681,9.57856c.03.06906.00961.10329-.05885.10329H81.002a.13274.13274,0,0,1-.11771-.07386L79.80691,53.8ZM79.467,52.6638q-.118-.354-.3321-.97407-.2135-.61975-.4498-1.28395-.236-.66479-.4426-1.28394c-.13812-.41377-.24141-.74767-.31048-1.0041h-.01441q-.08827.35491-.25823.87858-.17025.52338-.38374,1.13622-.21439.61255-.4426,1.26954-.2297.65668-.43539,1.26172Z"/><path class="b" d="M86.52211,57.01769a4.36237,4.36237,0,0,1-1.43108-.2288,3.18223,3.18223,0,0,1-1.159-.69362,3.22815,3.22815,0,0,1-.77469-1.15123,4.21828,4.21828,0,0,1-.28046-1.60163,3.89269,3.89269,0,0,1,.28766-1.505,3.51871,3.51871,0,0,1,.81913-1.20287,3.79829,3.79829,0,0,1,1.26954-.79691,4.4664,4.4664,0,0,1,1.63826-.28826,3.83172,3.83172,0,0,1,.51646.02943q.20629.02971.41317.05945V46.37618A.07822.07822,0,0,1,87.91,46.2879H88.9723c.05886,0,.08888.02463.08888.07387v9.63741a2.39778,2.39778,0,0,0,.02943.36873.1037.1037,0,0,1-.07387.1033,5.609,5.609,0,0,1-1.25452.421A6.24619,6.24619,0,0,1,86.52211,57.01769Zm1.299-6.25759a1.79213,1.79213,0,0,0-.42818-.1111,3.72916,3.72916,0,0,0-.53087-.03663,3.04975,3.04975,0,0,0-1.13682.19938,2.44176,2.44176,0,0,0-.85576.5603,2.51242,2.51242,0,0,0-.54589.84916,2.85873,2.85873,0,0,0-.19217,1.06235,3.225,3.225,0,0,0,.20658,1.22509,2.20392,2.20392,0,0,0,.5609.81913,2.238,2.238,0,0,0,.80412.46482,2.98757,2.98757,0,0,0,.93744.14773,5.30729,5.30729,0,0,0,.61255-.03723,1.79256,1.79256,0,0,0,.5681-.15494Z"/><path class="b" d="M94.0048,49.54942a3.367,3.367,0,0,1,1.40165.28045,3.04715,3.04715,0,0,1,1.05575.7825,3.57864,3.57864,0,0,1,.6714,1.18065,4.775,4.775,0,0,1-.015,3.0105,3.49229,3.49229,0,0,1-.69362,1.18065,3.1081,3.1081,0,0,1-1.06235.76028A3.63586,3.63586,0,0,1,92.477,56.6928a3.05685,3.05685,0,0,1-1.05515-.85576,3.61278,3.61278,0,0,1-.61255-1.20288,4.7316,4.7316,0,0,1-.19937-1.3506,4.4214,4.4214,0,0,1,.236-1.46111,3.57928,3.57928,0,0,1,.6792-1.18786,3.11326,3.11326,0,0,1,1.07016-.79691A3.33517,3.33517,0,0,1,94.0048,49.54942Zm-.05945,1.063a1.89444,1.89444,0,0,0-.85577.19157,1.92937,1.92937,0,0,0-.657.53868,2.61525,2.61525,0,0,0-.42759.83415,3.54279,3.54279,0,0,0-.15493,1.07736,3.66655,3.66655,0,0,0,.14713,1.05514,2.76175,2.76175,0,0,0,.421.86358,1.91175,1.91175,0,0,0,.67861.57531,2.035,2.035,0,0,0,.93744.20658,1.96491,1.96491,0,0,0,.76748-.15493,1.84307,1.84307,0,0,0,.6642-.487,2.49873,2.49873,0,0,0,.472-.82634,3.52827,3.52827,0,0,0,.17716-1.18786,3.92545,3.92545,0,0,0-.12551-.99629,2.7098,2.7098,0,0,0-.38375-.85637,1.95032,1.95032,0,0,0-.6714-.60474A2.01331,2.01331,0,0,0,93.94535,50.61237Z"/><path class="b" d="M100.0408,46.2879a.306.306,0,0,1,.08107.00721c.01441.00541.02222.03243.02222.08107v3.4687a4.173,4.173,0,0,1,1.59382-.29546,3.58246,3.58246,0,0,1,1.38724.25823,3.09666,3.09666,0,0,1,1.063.72365,3.20021,3.20021,0,0,1,.67861,1.09177,3.89335,3.89335,0,0,1,.236,1.38,4.117,4.117,0,0,1-.34651,1.74876,3.82231,3.82231,0,0,1-.91522,1.25452,3.7297,3.7297,0,0,1-1.30616.76028,4.69867,4.69867,0,0,1-1.52.251,7.89894,7.89894,0,0,1-1.05515-.06665,4.98849,4.98849,0,0,1-.96686-.22881c-.05945-.00961-.08888-.05405-.08888-.13272V46.37618c0-.05885.03483-.08828.10329-.08828Zm3.8074,6.8185a2.56051,2.56051,0,0,0-.61975-1.80762,2.17677,2.17677,0,0,0-1.68271-.672,4.04312,4.04312,0,0,0-.79691.06666,3.23058,3.23058,0,0,0-.60474.18437V55.837a1.79408,1.79408,0,0,0,.44259.09548q.236.02253.53148.02222a3.01325,3.01325,0,0,0,1.02572-.17715,2.47409,2.47409,0,0,0,.87077-.53088,2.606,2.606,0,0,0,.60474-.893A3.168,3.168,0,0,0,103.8482,53.1064Z"/><path class="b" d="M107.49406,53.43129a3.19549,3.19549,0,0,0,.14713.98848,2.09051,2.09051,0,0,0,1.2323,1.32839,2.83109,2.83109,0,0,0,1.08517.19217,4.67893,4.67893,0,0,0,.95185-.09608,3.80289,3.80289,0,0,0,.893-.30267c.04924-.02943.07387-.00961.07387.05885v.84135a.15833.15833,0,0,1-.07387.14773,4.09138,4.09138,0,0,1-.87859.30988,5.25576,5.25576,0,0,1-1.20227.1183A3.73874,3.73874,0,0,1,108.0988,56.7a2.91958,2.91958,0,0,1-1.07016-.84075,3.42439,3.42439,0,0,1-.59033-1.18126,4.90632,4.90632,0,0,1-.18436-1.33559,4.77784,4.77784,0,0,1,.2216-1.46111,3.65843,3.65843,0,0,1,.642-1.21008,3.08964,3.08964,0,0,1,1.02572-.81913,3.02553,3.02553,0,0,1,1.37223-.30267,2.85068,2.85068,0,0,1,1.3434.28826,2.69551,2.69551,0,0,1,.88519.723,2.872,2.872,0,0,1,.49484.95906,3.5172,3.5172,0,0,1,.15494.99629c0,.18737-.00541.34471-.015.47262a1.534,1.534,0,0,1-.04444.29487c0,.05885-.03423.08828-.10329.08828a4.6844,4.6844,0,0,1-.59753.04444q-.43509.0153-.92243.015Zm2.75946-.91522q.5459,0,.73086-.00721a.87793.87793,0,0,0,.21379-.02222.18758.18758,0,0,0,.015-.08107V52.3245a2.183,2.183,0,0,0-.07386-.49484,1.6987,1.6987,0,0,0-.81193-1.06235,1.67106,1.67106,0,0,0-.85576-.19938,1.8819,1.8819,0,0,0-.80472.16214,1.81914,1.81914,0,0,0-.59033.43539,2.10609,2.10609,0,0,0-.38374.62756,2.88327,2.88327,0,0,0-.18437.72305Z"/><path class="b" d="M123.90493,56.58951q0,.13332-.07387.14773a3.03678,3.03678,0,0,1-.87018.221,9.606,9.606,0,0,1-1.1218.05945,6.05385,6.05385,0,0,1-1.82263-.28045,4.34791,4.34791,0,0,1-2.73064-2.45019,5.58386,5.58386,0,0,1-.43539-2.31687,5.42272,5.42272,0,0,1,.36873-2.02921,4.53276,4.53276,0,0,1,1.04073-1.57941,4.72052,4.72052,0,0,1,1.63106-1.02572,5.9251,5.9251,0,0,1,2.13971-.36873,7.70183,7.70183,0,0,1,1.19567.07327,2.76709,2.76709,0,0,1,.69362.19217.11466.11466,0,0,1,.07387.1177v.98909c0,.06906-.03483.09368-.1033.07386a4.12534,4.12534,0,0,0-1.88928-.3393,4.42133,4.42133,0,0,0-1.58662.27264,3.57637,3.57637,0,0,0-1.2323.7753,3.397,3.397,0,0,0-.79692,1.21729,4.36453,4.36453,0,0,0-.28045,1.60163,4.26707,4.26707,0,0,0,.38375,1.91811,3.45094,3.45094,0,0,0,.96686,1.21789,3.5879,3.5879,0,0,0,1.26173.63477,4.80043,4.80043,0,0,0,1.25452.18436,8.46656,8.46656,0,0,0,.99629-.05164,3.41056,3.41056,0,0,0,.84856-.2138c.05885-.0102.08828.00961.08828.05886Z"/><path class="b" d="M128.24441,49.54942a3.367,3.367,0,0,1,1.40165.28045,3.04711,3.04711,0,0,1,1.05574.7825,3.57864,3.57864,0,0,1,.6714,1.18065,4.77506,4.77506,0,0,1-.015,3.0105,3.49245,3.49245,0,0,1-.69362,1.18065,3.1081,3.1081,0,0,1-1.06235.76028,3.63588,3.63588,0,0,1-2.88558-.05165,3.05681,3.05681,0,0,1-1.05514-.85576,3.61259,3.61259,0,0,1-.61255-1.20288,4.73127,4.73127,0,0,1-.19938-1.3506,4.4214,4.4214,0,0,1,.236-1.46111,3.57931,3.57931,0,0,1,.67921-1.18786,3.11307,3.11307,0,0,1,1.07016-.79691A3.33517,3.33517,0,0,1,128.24441,49.54942Zm-.05946,1.063a1.8944,1.8944,0,0,0-.85576.19157,1.9294,1.9294,0,0,0-.657.53868,2.61523,2.61523,0,0,0-.42758.83415,3.54279,3.54279,0,0,0-.15494,1.07736,3.66655,3.66655,0,0,0,.14713,1.05514,2.76176,2.76176,0,0,0,.421.86358,1.91163,1.91163,0,0,0,.6786.57531,2.03506,2.03506,0,0,0,.93744.20658,1.96492,1.96492,0,0,0,.76749-.15493,1.843,1.843,0,0,0,.66419-.487,2.49838,2.49838,0,0,0,.472-.82634,3.528,3.528,0,0,0,.17716-1.18786,3.92545,3.92545,0,0,0-.12551-.99629,2.70978,2.70978,0,0,0-.38374-.85637,1.9505,1.9505,0,0,0-.6714-.60474A2.01335,2.01335,0,0,0,128.18495,50.61237Z"/><path class="b" d="M133.23306,56.87c-.05945,0-.08887-.03423-.08887-.10329V51.24714q0-.48734-.01442-.87078c-.01021-.25583-.02462-.45281-.04444-.59033a.07822.07822,0,0,1,.08828-.08888h.93023a.13273.13273,0,0,1,.11771.07387,2.41793,2.41793,0,0,1,.05164.32489c.015.13752.027.26543.03724.38374a3.15175,3.15175,0,0,1,2.21358-.93023,2.08207,2.08207,0,0,1,1.96315,1.07736,4.58846,4.58846,0,0,1,1.06235-.76748,2.97888,2.97888,0,0,1,1.40225-.30988,2.91332,2.91332,0,0,1,.83415.12551,1.96871,1.96871,0,0,1,.76749.4426,2.35258,2.35258,0,0,1,.5681.86357,3.73571,3.73571,0,0,1,.221,1.38724v4.41334c0,.05886-.03423.08828-.10329.08828H142.2213a.09114.09114,0,0,1-.10329-.10329V52.45722a2.22321,2.22321,0,0,0-.36213-1.28395,1.28407,1.28407,0,0,0-1.14342-.53147,2.20014,2.20014,0,0,0-1.0113.2288,2.71959,2.71959,0,0,0-.80412.627,3.28749,3.28749,0,0,1,.05164.406c.015.18257.02222.36153.02222.53868v4.32447a.09138.09138,0,0,1-.10329.10329h-1.03352a.09138.09138,0,0,1-.10329-.10329V52.41278a2.02372,2.02372,0,0,0-.37594-1.30617,1.33264,1.33264,0,0,0-1.09958-.46481,2.16377,2.16377,0,0,0-.93744.19937,3.1054,3.1054,0,0,0-.84856.627v5.31355a.078.078,0,0,1-.08828.08828Z"/><path class="b" d="M148.16841,49.54942a3.7728,3.7728,0,0,1,1.4539.266,3.12905,3.12905,0,0,1,1.08517.73025,3.17548,3.17548,0,0,1,.67861,1.10679,3.97,3.97,0,0,1,.236,1.38,4.01744,4.01744,0,0,1-.36152,1.75657,3.63794,3.63794,0,0,1-.95906,1.24672,4.03655,4.03655,0,0,1-1.35781.73806,5.01586,5.01586,0,0,1-1.54218.24381c-.16755,0-.30808-.0054-.421-.015s-.224-.02462-.33209-.04444v2.95224a.09123.09123,0,0,1-.07387.10329c-.08828.00961-.18917.01922-.30267.02943-.1129.00961-.2264.02222-.3393.03663-.11291.015-.21139.027-.29487.03723q-.1261.01441-.14052.01442-.07387,0-.07387-.08828V50.84838c0-.06846-.0024-.17-.00721-.30267s-.01261-.248-.02222-.34651a.05974.05974,0,0,1,.02943-.05945q.38375-.14684,1.09238-.36873A5.54961,5.54961,0,0,1,148.16841,49.54942Zm-.14713,1.07736a4.19213,4.19213,0,0,0-.72364.05946,3.48071,3.48071,0,0,0-.64918.17715v5.00308a1.81449,1.81449,0,0,0,.41316.07386c.14774.00961.29006.01441.42819.01441a3.34545,3.34545,0,0,0,1.04793-.16935,2.70564,2.70564,0,0,0,.92243-.51646,2.57376,2.57376,0,0,0,.65639-.88579,2.99471,2.99471,0,0,0,.251-1.27674,2.579,2.579,0,0,0-.61255-1.80762A2.22666,2.22666,0,0,0,148.02128,50.62678Z"/><path class="b" d="M158.234,55.61544V55.977a2.09429,2.09429,0,0,0,.02943.34711.05979.05979,0,0,1-.02943.05886,6.00124,6.00124,0,0,1-1.4539.50925,6.9604,6.9604,0,0,1-1.30617.12551,3.85578,3.85578,0,0,1-1.09237-.14773,2.59513,2.59513,0,0,1-.87078-.43539,1.97765,1.97765,0,0,1-.57531-.723,2.32883,2.32883,0,0,1-.20659-1.01131,1.89323,1.89323,0,0,1,.25823-1.0107,2.16417,2.16417,0,0,1,.70083-.70083,3.24349,3.24349,0,0,1,1.04073-.41377,5.96124,5.96124,0,0,1,1.29115-.13272q.41347,0,.657.00721.24321.00811.36152.02222v-.35371a1.93718,1.93718,0,0,0-.05885-.42819,1.25647,1.25647,0,0,0-.236-.47983,1.50152,1.50152,0,0,0-.502-.39815,1.88625,1.88625,0,0,0-.87078-.17,4.21382,4.21382,0,0,0-1.0107.1183,3.662,3.662,0,0,0-.86357.32429c-.06907.01982-.1033-.0048-.1033-.07386v-.90021a.13163.13163,0,0,1,.07387-.1177,4.345,4.345,0,0,1,.96626-.3249,5.26451,5.26451,0,0,1,1.129-.1183,3.03846,3.03846,0,0,1,1.21789.2216,2.21246,2.21246,0,0,1,.82634.59753,2.48678,2.48678,0,0,1,.47262.87859,3.633,3.633,0,0,1,.15494,1.07736Zm-1.19567-2.16974a3.56574,3.56574,0,0,0-.39875-.04384c-.15734-.00961-.34892-.015-.57532-.015a2.94006,2.94006,0,0,0-1.601.34711,1.09634,1.09634,0,0,0-.52427.96626,1.36586,1.36586,0,0,0,.08888.487,1.03106,1.03106,0,0,0,.30207.421,1.60324,1.60324,0,0,0,.54649.29487,2.61144,2.61144,0,0,0,.81913.1111,3.469,3.469,0,0,0,1.3428-.251Z"/><path class="b" d="M160.29986,51.36484c0-.12791-.0024-.27024-.00721-.42818-.0048-.15674-.00961-.30988-.015-.457-.00481-.14773-.00961-.28525-.01441-.41377a2.64953,2.64953,0,0,0-.02222-.27985.07821.07821,0,0,1,.08827-.08888h.91522a.14147.14147,0,0,1,.13272.08888,1.53485,1.53485,0,0,1,.04444.29486q.01442.19188.04444.4426a3.09953,3.09953,0,0,1,2.258-.97407,3.028,3.028,0,0,1,.81913.1183,1.93993,1.93993,0,0,1,.77469.43539,2.34932,2.34932,0,0,1,.58312.87078,3.76523,3.76523,0,0,1,.22881,1.42388v4.3689a.09138.09138,0,0,1-.10329.10329h-1.03353c-.06846,0-.10329-.039-.10329-.1183V52.51607a2.28923,2.28923,0,0,0-.36873-1.35781,1.31945,1.31945,0,0,0-1.15123-.51646,2.23206,2.23206,0,0,0-1.02572.236,2.568,2.568,0,0,0-.81913.66419v5.22467c0,.06906-.02942.10329-.08828.10329h-1.04793c-.05946,0-.08888-.03423-.08888-.10329Z"/><path class="b" d="M168.35846,49.69715a.10467.10467,0,0,1,.10329.07387q.45762,1.2251.80412,2.15472.34681.92964.59814,1.60884.25042.67921.40536,1.129.15493.4504.2288.70083.35492-1.01792.83415-2.35411.47922-1.335,1.15843-3.23929a.1336.1336,0,0,1,.11831-.07387H173.657c.06846,0,.08828.03483.05885.10329q-.41347,1.19538-.893,2.48683-.48012,1.29176-.99629,2.59792t-1.05514,2.59011q-.53868,1.28366-1.07016,2.46461a.19465.19465,0,0,1-.16214.10329l-1.10679.08828c-.05946,0-.07387-.039-.04444-.11771q.32429-.6792.70863-1.52776.38285-.84857.75247-1.73435a.21629.21629,0,0,0,0-.19157q-.08827-.22161-.26543-.64918-.17747-.42789-.406-.98909-.2288-.56029-.49424-1.21789-.26574-.65579-.53928-1.33559-.27294-.67831-.53868-1.3428-.26484-.6639-.487-1.23951c-.02942-.05945-.0048-.08888.07387-.08888Z"/></svg>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 125b67f950f1c..229c13d11e279 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -20,14 +20,14 @@ angular.module('add-database', ['ngStorage'])
 
         $scope.testConnection = function () {
             $http.post('index.php/database-check', $scope.db)
-                .success(function (data) {
-                    $scope.testConnection.result = data;
+                .then(function successCallback(resp) {
+                    $scope.testConnection.result = resp.data;
+
                     if ($scope.testConnection.result.success) {
                         $scope.nextState();
                     }
-                })
-                .error(function (data) {
-                    $scope.testConnection.failed = data;
+                }, function errorCallback(resp) {
+                    $scope.testConnection.failed = resp.data;
                 });
         };
 
diff --git a/setup/pub/magento/setup/app.js b/setup/pub/magento/setup/app.js
index e6514ea41c0bd..f0abd15d106c2 100644
--- a/setup/pub/magento/setup/app.js
+++ b/setup/pub/magento/setup/app.js
@@ -31,7 +31,8 @@ var app = angular.module(
         'home',
         'auth-dialog',
         'system-config',
-        'marketplace-credentials'
+        'marketplace-credentials',
+        'ngSanitize'
     ]);
 
 app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $stateProvider) {
@@ -55,6 +56,9 @@ app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $statePr
             return $delegate;
         });
     })
+    .config(['$locationProvider', function($locationProvider) {
+        $locationProvider.hashPrefix('');
+    }])
     .run(function ($rootScope, $state) {
         $rootScope.$state = $state;
     });
diff --git a/setup/pub/magento/setup/complete-backup.js b/setup/pub/magento/setup/complete-backup.js
index 9c3dd09798dac..db7f6fdf8a176 100644
--- a/setup/pub/magento/setup/complete-backup.js
+++ b/setup/pub/magento/setup/complete-backup.js
@@ -121,8 +121,7 @@ angular.module('complete-backup', ['ngStorage'])
         };
 
         $scope.disableMeintenanceMode = function() {
-            $http.post('index.php/maintenance/index', {'disable' : true}).success(function(data) {
-            });
+            $http.post('index.php/maintenance/index', {'disable' : true});
         };
         
         $scope.isCompleted = function() {
@@ -149,8 +148,9 @@ angular.module('complete-backup', ['ngStorage'])
         $scope.query = function(item) {
             if (!$rootScope.hasErrors) {
                 return $http.post(item.url, $scope.backupInfoPassed, {timeout: 3000000})
-                    .success(function(data) { item.process(data) })
-                    .error(function(data, status) {
+                    .then(function successCallback(resp) {
+                        item.process(resp.data);
+                    }, function errorCallback() {
                         item.fail();
                     });
             } else {
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index f6cbd154edfec..6e8807bb7a2ae 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -51,14 +51,14 @@ angular.module('create-admin-account', ['ngStorage'])
             $scope.validate();
             if ($scope.valid) {
                 $http.post('index.php/validate-admin-credentials', data)
-                    .success(function (data) {
-                        $scope.validateCredentials.result = data;
+                    .then(function successCallback(resp) {
+                        $scope.validateCredentials.result = resp.data;
+
                         if ($scope.validateCredentials.result.success) {
                             $scope.nextState();
                         }
-                    })
-                    .error(function (data) {
-                        $scope.validateCredentials.failed = data;
+                    }, function errorCallback(resp) {
+                        $scope.validateCredentials.failed = resp.data;
                     });
             }
         };
diff --git a/setup/pub/magento/setup/customize-your-store.js b/setup/pub/magento/setup/customize-your-store.js
index 7404ef67765e8..d15c07c58ef16 100644
--- a/setup/pub/magento/setup/customize-your-store.js
+++ b/setup/pub/magento/setup/customize-your-store.js
@@ -31,10 +31,9 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
 
         if (!$localStorage.store) {
             $http.get('index.php/customize-your-store/default-time-zone',{'responseType' : 'json'})
-                .success(function (data) {
-                    $scope.store.timezone = data.defaultTimeZone;
-                })
-                .error(function (data) {
+                .then(function successCallback(resp) {
+                    $scope.store.timezone = resp.data.defaultTimeZone;
+                }, function errorCallback() {
                     $scope.store.timezone = 'UTC';
                 });
         }
@@ -48,9 +47,12 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
             $localStorage.store = $scope.store;
             $scope.loading = true;
             $http.post('index.php/modules/all-modules-valid', $scope.store)
-                .success(function (data) {
-                    $scope.checkModuleConstraints.result = data;
-                    if (($scope.checkModuleConstraints.result !== undefined) && ($scope.checkModuleConstraints.result.success)) {
+                .then(function successCallback(resp) {
+                    $scope.checkModuleConstraints.result = resp.data;
+
+                    if ($scope.checkModuleConstraints.result !== undefined &&
+                        $scope.checkModuleConstraints.result.success
+                    ) {
                         $scope.loading = false;
                         $scope.nextState();
                     } else {
@@ -61,17 +63,18 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
         };
 
         if (!$scope.store.loadedAllModules) {
-            $http.get('index.php/modules').success(function (data) {
-                $state.loadedModules = data;
+            $http.get('index.php/modules').then(function successCallback(resp) {
+                $state.loadedModules = resp.data;
                 $scope.store.showModulesControl = true;
-                if (data.error) {
+
+                if (resp.data.error) {
                     $scope.updateOnExpand($scope.store.advanced);
-                    $scope.store.errorMessage = $sce.trustAsHtml(data.error);
+                    $scope.store.errorMessage = $sce.trustAsHtml(resp.data.error);
                 }
             });
         }
 
-        $state.loadModules = function(){
+        $state.loadModules = function () {
             if(!$scope.store.loadedAllModules) {
                 var allModules = $scope.$state.loadedModules.modules;
                 for (var eachModule in allModules) {
@@ -120,8 +123,9 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
             var allParameters = {'allModules' : $scope.store.allModules, 'selectedModules' : $scope.store.selectedModules, 'module' : module, 'status' : moduleStatus};
 
             $http.post('index.php/modules/validate', allParameters)
-                .success(function (data) {
-                    $scope.checkModuleConstraints.result = data;
+                .then(function successCallback(resp) {
+                    $scope.checkModuleConstraints.result = resp.data;
+
                     if ((($scope.checkModuleConstraints.result.error !== undefined) && (!$scope.checkModuleConstraints.result.success))) {
                         $scope.store.errorMessage = $sce.trustAsHtml($scope.checkModuleConstraints.result.error);
                         if (moduleStatus) {
@@ -130,7 +134,7 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
                             $scope.store.selectedModules.push(module);
                         }
                     } else {
-                        $state.loadedModules = data;
+                        $state.loadedModules = resp.data;
                         $scope.store.errorMessage = false;
                         $scope.store.showError = false;
                         $scope.store.errorFlag = false;
diff --git a/setup/pub/magento/setup/data-option.js b/setup/pub/magento/setup/data-option.js
index 5eed528ec0993..16bde5d32fdea 100644
--- a/setup/pub/magento/setup/data-option.js
+++ b/setup/pub/magento/setup/data-option.js
@@ -13,9 +13,9 @@ angular.module('data-option', ['ngStorage'])
 
         if ($localStorage.componentType === 'magento2-module') {
             $http.post('index.php/data-option/hasUninstall', {'moduleName' : $localStorage.moduleName})
-                .success(function(data) {
-                    $scope.component.hasUninstall = data.hasUninstall;
-            });
+                .then(function successCallback(resp) {
+                    $scope.component.hasUninstall = resp.data.hasUninstall;
+                });
         }
 
         if ($localStorage.dataOption) {
diff --git a/setup/pub/magento/setup/extension-grid.js b/setup/pub/magento/setup/extension-grid.js
index 4f73304282bb0..416a767a483fa 100644
--- a/setup/pub/magento/setup/extension-grid.js
+++ b/setup/pub/magento/setup/extension-grid.js
@@ -14,7 +14,9 @@ angular.module('extension-grid', ['ngStorage'])
             $scope.syncError = false;
             $scope.currentPage = 1;
 
-            $http.get('index.php/extensionGrid/extensions').success(function (data) {
+            $http.get('index.php/extensionGrid/extensions').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
 
@@ -37,7 +39,7 @@ angular.module('extension-grid', ['ngStorage'])
                 }
                 $scope.availableUpdatePackages = data.lastSyncData.packages;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
                 $rootScope.extensionsProcessed = true;
             });
@@ -78,7 +80,9 @@ angular.module('extension-grid', ['ngStorage'])
 
             $scope.sync = function() {
                 $scope.isHiddenSpinner = false;
-                $http.get('index.php/extensionGrid/sync').success(function(data) {
+                $http.get('index.php/extensionGrid/sync').then(function successCallback(resp) {
+                    var data = resp.data;
+
                     if (typeof data.lastSyncData.lastSyncDate !== 'undefined') {
                         $scope.lastSyncDate = data.lastSyncData.lastSyncDate.date;
                         $scope.lastSyncTime = data.lastSyncData.lastSyncDate.time;
diff --git a/setup/pub/magento/setup/install-extension-grid.js b/setup/pub/magento/setup/install-extension-grid.js
index 46feae60aeb26..6a94d99df372d 100644
--- a/setup/pub/magento/setup/install-extension-grid.js
+++ b/setup/pub/magento/setup/install-extension-grid.js
@@ -8,7 +8,9 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
     .controller('installExtensionGridController', ['$scope', '$http', '$localStorage', 'authService', 'paginationService', 'multipleChoiceService',
         function ($scope, $http, $localStorage, authService, paginationService, multipleChoiceService) {
 
-            $http.get('index.php/installExtensionGrid/extensions').success(function(data) {
+            $http.get('index.php/installExtensionGrid/extensions').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.error = false;
                 $scope.errorMessage = '';
                 $scope.multipleChoiceService = multipleChoiceService;
@@ -19,7 +21,7 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
             });
 
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index 942e0a1d25443..5b847761d2b0c 100644
--- a/setup/pub/magento/setup/install.js
+++ b/setup/pub/magento/setup/install.js
@@ -75,13 +75,16 @@ angular.module('install', ['ngStorage'])
             $scope.isStarted = true;
             $scope.isInProgress = true;
             progress.post(data, function (response) {
+                response = response.data;
                 $scope.isInProgress = false;
+
                 if (response.success) {
                     $localStorage.config.encrypt.key = response.key;
                     $localStorage.messages = response.messages;
                     $scope.nextState();
                 } else {
                     $scope.displayFailure();
+
                     if (response.isSampleDataError) {
                         $scope.isSampleDataError = true;
                     }
@@ -105,10 +108,10 @@ angular.module('install', ['ngStorage'])
     .service('progress', ['$http', function ($http) {
         return {
             get: function (callback) {
-                $http.post('index.php/install/progress').then(callback);
+                $http.post('index.php/install/progress').then(callback, function errorCallback() {});
             },
             post: function (data, callback) {
-                $http.post('index.php/install/start', data).success(callback);
+                $http.post('index.php/install/start', data).then(callback, function errorCallback() {});
             }
         };
     }]);
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index f92011f39522a..fa9291e9a8507 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -40,11 +40,10 @@ main.controller('navigationController',
     function ($scope, $state, navigationService, $localStorage, $interval, $http) {
         $interval(
             function () {
-                $http.post('index.php/session/prolong')
-                    .success(function (result) {
-                    })
-                    .error(function (result) {
-                    });
+                $http.post('index.php/session/prolong').then(
+                    function successCallback() {},
+                    function errorCallback() {}
+                );
             },
             25000
         );
@@ -93,10 +92,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');
         };
@@ -121,9 +116,12 @@ main.controller('navigationController',
         isLoadedStates: false,
         load: function () {
             var self = this;
-            return $http.get('index.php/navigation').success(function (data) {
-                var currentState = $location.path().replace('/', '');
-                var isCurrentStateFound = false;
+
+            return $http.get('index.php/navigation').then(function successCallback(resp) {
+                var data = resp.data,
+                    currentState = $location.path().replace('/', ''),
+                    isCurrentStateFound = false;
+
                 self.states = data.nav;
                 $localStorage.menu = data.menu;
                 self.titlesWithModuleName.forEach(function (value) {
@@ -188,34 +186,35 @@ main.controller('navigationController',
             },
             reset: function (context) {
                 return $http.post('index.php/marketplace/remove-credentials', [])
-                    .success(function (response) {
-                        if (response.success) {
+                    .then(function successCallback(response) {
+                        if (response.data.success) {
                             $localStorage.isMarketplaceAuthorized = $rootScope.isMarketplaceAuthorized = false;
                             context.success();
                         }
-                    })
-                    .error(function (data) {
                     });
             },
             checkAuth: function(context) {
                 return $http.post('index.php/marketplace/check-auth', [])
-                    .success(function (response) {
-                        if (response.success) {
+                    .then(function successCallback(response) {
+                        var data = response.data;
+
+                        if (data.success) {
                             $rootScope.isMarketplaceAuthorized  = $localStorage.isMarketplaceAuthorized = true;
-                            $localStorage.marketplaceUsername = response.data.username;
-                            context.success(response);
+                            $localStorage.marketplaceUsername = data.username;
+                            context.success(data);
                         } else {
                             $rootScope.isMarketplaceAuthorized  = $localStorage.isMarketplaceAuthorized = false;
-                            context.fail(response);
+                            context.fail(data);
                         }
-                    })
-                    .error(function() {
+                    }, function errorCallback() {
                         $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = false;
                         context.error();
                     });
             },
             openAuthDialog: function(scope) {
-                return $http.get('index.php/marketplace/popup-auth').success(function (data) {
+                return $http.get('index.php/marketplace/popup-auth').then(function successCallback(resp) {
+                    var data = resp.data;
+
                     scope.isHiddenSpinner = true;
                     ngDialog.open({
                         scope: scope,
@@ -231,21 +230,22 @@ main.controller('navigationController',
             },
             saveAuthJson: function (context) {
                 return $http.post('index.php/marketplace/save-auth-json', context.user)
-                    .success(function (response) {
-                        $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = response.success;
+                    .then(function successCallback(response) {
+                        var data = response.data;
+
+                        $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = data.success;
                         $localStorage.marketplaceUsername = context.user.username;
-                        if (response.success) {
-                            context.success(response);
+                        if (data.success) {
+                            context.success(data);
                         } else {
-                            context.fail(response);
+                            context.fail(data);
                         }
-                    })
-                    .error(function (data) {
+                    }, function errorCallback(resp) {
                         $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = false;
-                        context.error(data);
+                        context.error(resp.data);
                     });
             }
-    };
+        };
     }]
 )
 .service('titleService', ['$localStorage', '$rootScope',
diff --git a/setup/pub/magento/setup/marketplace-credentials.js b/setup/pub/magento/setup/marketplace-credentials.js
index c94fec1c563c9..a0d17c14d2a2a 100644
--- a/setup/pub/magento/setup/marketplace-credentials.js
+++ b/setup/pub/magento/setup/marketplace-credentials.js
@@ -41,16 +41,21 @@ angular.module('marketplace-credentials', ['ngStorage'])
 
             $scope.upgradeProcessError = false;
             if ($state.current.type == 'upgrade') {
+                $scope.isHiddenSpinner = false;
                 $http.get('index.php/select-version/installedSystemPackage', {'responseType' : 'json'})
-                    .success(function (data) {
+                    .then(function successCallback(resp) {
+                        var data = resp.data;
+
+                        $scope.isHiddenSpinner = true;
+
                         if (data.responseType == 'error') {
                             $scope.upgradeProcessError = true;
                             $scope.upgradeProcessErrorMessage = $sce.trustAsHtml(data.error);
                         } else {
                             $scope.checkAuth();
                         }
-                    })
-                    .error(function (data) {
+                    }, function errorCallback() {
+                        $scope.isHiddenSpinner = true;
                         $scope.upgradeProcessError = true;
                     });
             } else {
diff --git a/setup/pub/magento/setup/module-grid.js b/setup/pub/magento/setup/module-grid.js
index 694781a303303..3866c41716aee 100644
--- a/setup/pub/magento/setup/module-grid.js
+++ b/setup/pub/magento/setup/module-grid.js
@@ -8,11 +8,13 @@ angular.module('module-grid', ['ngStorage'])
     .controller('moduleGridController', ['$rootScope', '$scope', '$http', '$localStorage', '$state', 'titleService', 'paginationService',
         function ($rootScope, $scope, $http, $localStorage, $state, titleService, paginationService) {
             $rootScope.modulesProcessed = false;
-            $http.get('index.php/moduleGrid/modules').success(function(data) {
+            $http.get('index.php/moduleGrid/modules').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.modules = data.modules;
                 $scope.total = data.total;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total/$scope.rowLimit);
                 $rootScope.modulesProcessed = true;
             });
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index 23b5dac650a9a..d32d640cab48b 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -313,18 +313,18 @@ angular.module('readiness-check', ['remove-dialog'])
                     item.url = item.url + '?type=' + item.params;
                 } else {
                     return $http.post(item.url, item.params)
-                        .success(function (data) {
-                            item.process(data)
-                        })
-                        .error(function (data, status) {
+                        .then(function successCallback(resp) {
+                            item.process(resp.data);
+                        }, function successCallback() {
                             item.fail();
                         });
                 }
             }
             // setting 1 minute timeout to prevent system from timing out
-            return $http.get(item.url, {timeout: 60000})
-                .success(function(data) { item.process(data) })
-                .error(function(data, status) {
+            return $http.get(item.url, { timeout: 60000 })
+                .then(function successCallback(resp) {
+                    item.process(resp.data);
+                }, function errorCallback() {
                     item.fail();
                 });
         };
diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
index d9d4f7518ad1f..52c1f4284a22d 100644
--- a/setup/pub/magento/setup/select-version.js
+++ b/setup/pub/magento/setup/select-version.js
@@ -13,6 +13,7 @@ angular.module('select-version', ['ngStorage'])
         $scope.upgradeReadyForNext = false;
         $scope.upgradeProcessed = false;
         $scope.upgradeProcessError = false;
+        $scope.upgradeAlreadyLatestVersion = false;
         $scope.upgradeProcessErrorMessage = '';
         $scope.componentsReadyForNext = true;
         $scope.componentsProcessed = false;
@@ -27,7 +28,9 @@ angular.module('select-version', ['ngStorage'])
         };
 
         $http.get('index.php/select-version/systemPackage', {'responseType' : 'json'})
-            .success(function (data) {
+            .then(function successCallback(resp) {
+                var data = resp.data;
+
                 if (data.responseType != 'error') {
                     $scope.upgradeProcessError = true;
 
@@ -39,6 +42,7 @@ angular.module('select-version', ['ngStorage'])
 
                     if ($scope.upgradeProcessError) {
                         $scope.upgradeProcessErrorMessage = "You're already using the latest version, there's nothing for us to do.";
+                        $scope.upgradeAlreadyLatestVersion = true;
                     } else {
                         $scope.selectedOption = [];
                         $scope.versions = [];
@@ -68,8 +72,7 @@ angular.module('select-version', ['ngStorage'])
                     $scope.upgradeProcessErrorMessage = $sce.trustAsHtml(data.error);
                 }
                 $scope.upgradeProcessed = true;
-            })
-            .error(function (data) {
+            }, function errorCallback() {
                 $scope.upgradeProcessError = true;
             });
 
@@ -102,14 +105,16 @@ angular.module('select-version', ['ngStorage'])
                 if (!$scope.componentsProcessed && !$scope.componentsProcessError) {
                     $scope.componentsReadyForNext = false;
                     $http.get('index.php/other-components-grid/components', {'responseType': 'json'}).
-                        success(function (data) {
+                        then(function successCallback(resp) {
+                            var data = resp.data;
+
                             if (data.responseType != 'error') {
                                 $scope.components = data.components;
                                 $scope.displayComponents = data.components;
                                 $scope.totalForGrid = data.total;
                                 $scope.total = data.total;
                                 $scope.currentPage = 1;
-                                $scope.rowLimit = 20;
+                                $scope.rowLimit = '20';
                                 $scope.numberOfPages = Math.ceil(data.total/$scope.rowLimit);
                                 for (var i = 0; i < $scope.totalForGrid; i++) {
                                     $scope.packages.push({
@@ -122,8 +127,7 @@ angular.module('select-version', ['ngStorage'])
                                 $scope.componentsProcessError = true;
                             }
                             $scope.componentsProcessed = true;
-                        })
-                        .error(function (data) {
+                        }, function errorCallback() {
                             $scope.componentsProcessError = true;
                         });
                 }
diff --git a/setup/pub/magento/setup/start-updater.js b/setup/pub/magento/setup/start-updater.js
index 3633da066187d..1b6e2e515bf72 100644
--- a/setup/pub/magento/setup/start-updater.js
+++ b/setup/pub/magento/setup/start-updater.js
@@ -35,14 +35,15 @@ angular.module('start-updater', ['ngStorage'])
                 'dataOption': $localStorage.dataOption
             };
             $http.post('index.php/start-updater/update', payLoad)
-                .success(function (data) {
-                    if (data['success']) {
+                .then(function successCallback(resp) {
+                    var data = resp.data;
+
+                    if (data.success) {
                         $window.location.href = '../update/index.php';
                     } else {
-                        $scope.errorMessage = data['message'];
+                        $scope.errorMessage = data.message;
                     }
-                })
-                .error(function (data) {
+                }, function errorCallback() {
                     $scope.errorMessage = 'Something went wrong. Please try again.';
                 });
         };
diff --git a/setup/pub/magento/setup/system-config.js b/setup/pub/magento/setup/system-config.js
index 2956c837ee543..40b155076bc8f 100644
--- a/setup/pub/magento/setup/system-config.js
+++ b/setup/pub/magento/setup/system-config.js
@@ -7,6 +7,7 @@
 angular.module('system-config', ['ngStorage'])
     .controller('systemConfigController', ['$scope', '$state', '$http', '$localStorage', '$rootScope', 'authService',
         function ($scope, $state, $http, $localStorage, $rootScope, authService) {
+        $scope.isHiddenSpinner = false;
         $scope.user = {
             username : $localStorage.marketplaceUsername ? $localStorage.marketplaceUsername : '',
             password : '',
@@ -27,6 +28,8 @@ angular.module('system-config', ['ngStorage'])
                     $scope.isHiddenSpinner = true;
                 }
             });
+        } else {
+            $scope.isHiddenSpinner = true;
         }
 
         $scope.saveAuthJson = function () {
diff --git a/setup/pub/magento/setup/update-extension-grid.js b/setup/pub/magento/setup/update-extension-grid.js
index 71d8fbad5de3e..78af0d7faf31d 100644
--- a/setup/pub/magento/setup/update-extension-grid.js
+++ b/setup/pub/magento/setup/update-extension-grid.js
@@ -9,7 +9,9 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
         function ($scope, $http, $localStorage, titleService, authService, paginationService, multipleChoiceService) {
             $scope.isHiddenSpinner = false;
 
-            $http.get('index.php/updateExtensionGrid/extensions').success(function(data) {
+            $http.get('index.php/updateExtensionGrid/extensions').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.error = false;
                 $scope.errorMessage = '';
                 $scope.extensionsVersions = {};
@@ -26,7 +28,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
                 $scope.isHiddenSpinner = true;
                 $localStorage.extensionsVersions = $scope.extensionsVersions;
@@ -36,7 +38,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
 
             $scope.predicate = 'name';
             $scope.reverse = false;
-            $scope.order = function(predicate) {
+            $scope.order = function (predicate) {
                 $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
                 $scope.predicate = predicate;
             };
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 1ad09ea986216..8464a5d615f75 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -124,22 +124,24 @@ angular.module('web-configuration', ['ngStorage'])
         $scope.validateUrl = function () {
             if (!$scope.webconfig.submitted) {
                 $http.post('index.php/url-check', $scope.config)
-                    .success(function (data) {
-                        $scope.validateUrl.result = data;
+                    .then(function successCallback(resp) {
+                        $scope.validateUrl.result = resp.data;
+
                         if ($scope.validateUrl.result.successUrl && $scope.validateUrl.result.successSecureUrl) {
                             $scope.nextState();
                         }
+
                         if (!$scope.validateUrl.result.successUrl) {
                             $scope.webconfig.submitted = true;
                             $scope.webconfig.base_url.$setValidity('url', false);
                         }
+
                         if (!$scope.validateUrl.result.successSecureUrl) {
                             $scope.webconfig.submitted = true;
                             $scope.webconfig.https.$setValidity('url', false);
                         }
-                    })
-                    .error(function (data) {
-                        $scope.validateUrl.failed = data;
+                    }, function errorCallback(resp) {
+                        $scope.validateUrl.failed = resp.data;
                     });
             }
         };
diff --git a/setup/src/Magento/Setup/Application.php b/setup/src/Magento/Setup/Application.php
index c5b0d3afbc217..4366727e080c8 100644
--- a/setup/src/Magento/Setup/Application.php
+++ b/setup/src/Magento/Setup/Application.php
@@ -40,7 +40,13 @@ public function bootstrap(array $configuration)
         }
 
         $listeners = $this->getListeners($serviceManager, $configuration);
-        $application = new ZendApplication($configuration, $serviceManager);
+        $application = new ZendApplication(
+            $configuration,
+            $serviceManager,
+            $serviceManager->get('EventManager'),
+            $serviceManager->get('Request'),
+            $serviceManager->get('Response')
+        );
         $application->bootstrap($listeners);
         return $application;
     }
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
index f115277654fae..2c91d2d2f37c3 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
@@ -107,5 +107,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
index ae6611273cb6b..85ae008adf366 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php
@@ -99,6 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 . '</info>'
             );
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
index eab1ce79f5b3d..5d7eedfa66c2a 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractModuleManageCommand.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Module\Status;
+use Magento\Framework\Console\Cli;
 
 abstract class AbstractModuleManageCommand extends AbstractModuleCommand
 {
@@ -77,14 +78,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!empty($messages)) {
             $output->writeln(implode(PHP_EOL, $messages));
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
         try {
             $modulesToChange = $this->getStatus()->getModulesToChange($isEnable, $modules);
         } catch (\LogicException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
         if (!empty($modulesToChange)) {
             $force = $input->getOption(self::INPUT_KEY_FORCE);
@@ -96,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     );
                     $output->writeln('<error>' . implode("</error>\n<error>", $constraints) . '</error>');
                     // we must have an exit code higher than zero to indicate something was wrong
-                    return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+                    return Cli::RETURN_FAILURE;
                 }
             }
             $this->setIsEnabled($isEnable, $modulesToChange, $output);
@@ -111,6 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln('<info>No modules were changed.</info>');
         }
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
index 940bcbbd6d7f1..173ea9e49a8a4 100644
--- a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
@@ -6,14 +6,18 @@
 
 namespace Magento\Setup\Console\Command;
 
-use Magento\Setup\Model\AdminAccount;
 use Magento\Framework\Setup\ConsoleLogger;
+use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\User\Model\UserValidationRules;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
 
+/**
+ * Command to create an admin user.
+ */
 class AdminUserCreateCommand extends AbstractSetupCommand
 {
     /**
@@ -51,13 +55,109 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * Creation admin user in interaction mode.
+     *
+     * @param \Symfony\Component\Console\Input\InputInterface $input
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        /** @var \Symfony\Component\Console\Helper\QuestionHelper $questionHelper */
+        $questionHelper = $this->getHelper('question');
+
+        if (!$input->getOption(AdminAccount::KEY_USER)) {
+            $question = new Question('<question>Admin user:</question> ', '');
+            $this->addNotEmptyValidator($question);
+
+            $input->setOption(
+                AdminAccount::KEY_USER,
+                $questionHelper->ask($input, $output, $question)
+            );
+        }
+
+        if (!$input->getOption(AdminAccount::KEY_PASSWORD)) {
+            $question = new Question('<question>Admin password:</question> ', '');
+            $question->setHidden(true);
+
+            $question->setValidator(function ($value) use ($output) {
+                $user = new \Magento\Framework\DataObject();
+                $user->setPassword($value);
+
+                $validator = new \Magento\Framework\Validator\DataObject();
+                $this->validationRules->addPasswordRules($validator);
+
+                $validator->isValid($user);
+                foreach ($validator->getMessages() as $message) {
+                    throw new \Exception($message);
+                }
+
+                return $value;
+            });
+
+            $input->setOption(
+                AdminAccount::KEY_PASSWORD,
+                $questionHelper->ask($input, $output, $question)
+            );
+        }
+
+        if (!$input->getOption(AdminAccount::KEY_EMAIL)) {
+            $question = new Question('<question>Admin email:</question> ', '');
+            $this->addNotEmptyValidator($question);
+
+            $input->setOption(
+                AdminAccount::KEY_EMAIL,
+                $questionHelper->ask($input, $output, $question)
+            );
+        }
+
+        if (!$input->getOption(AdminAccount::KEY_FIRST_NAME)) {
+            $question = new Question('<question>Admin first name:</question> ', '');
+            $this->addNotEmptyValidator($question);
+
+            $input->setOption(
+                AdminAccount::KEY_FIRST_NAME,
+                $questionHelper->ask($input, $output, $question)
+            );
+        }
+
+        if (!$input->getOption(AdminAccount::KEY_LAST_NAME)) {
+            $question = new Question('<question>Admin last name:</question> ', '');
+            $this->addNotEmptyValidator($question);
+
+            $input->setOption(
+                AdminAccount::KEY_LAST_NAME,
+                $questionHelper->ask($input, $output, $question)
+            );
+        }
+    }
+
+    /**
+     * Add not empty validator.
+     *
+     * @param \Symfony\Component\Console\Question\Question $question
+     * @return void
+     */
+    private function addNotEmptyValidator(Question $question)
+    {
+        $question->setValidator(function ($value) {
+            if (trim($value) == '') {
+                throw new \Exception('The value cannot be empty');
+            }
+
+            return $value;
+        });
+    }
+
+    /**
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $errors = $this->validate($input);
         if ($errors) {
-            $output->writeln('<error>' . implode('</error>' . PHP_EOL .  '<error>', $errors) . '</error>');
+            $output->writeln('<error>' . implode('</error>' . PHP_EOL . '<error>', $errors) . '</error>');
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
@@ -66,30 +166,49 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln(
             '<info>Created Magento administrator user named ' . $input->getOption(AdminAccount::KEY_USER) . '</info>'
         );
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
      * Get list of arguments for the command
      *
+     * @param int $mode The mode of options.
      * @return InputOption[]
      */
-    public function getOptionsList()
+    public function getOptionsList($mode = InputOption::VALUE_REQUIRED)
     {
+        $requiredStr = ($mode === InputOption::VALUE_REQUIRED ? '(Required) ' : '');
+
         return [
-            new InputOption(AdminAccount::KEY_USER, null, InputOption::VALUE_REQUIRED, '(Required) Admin user'),
-            new InputOption(AdminAccount::KEY_PASSWORD, null, InputOption::VALUE_REQUIRED, '(Required) Admin password'),
-            new InputOption(AdminAccount::KEY_EMAIL, null, InputOption::VALUE_REQUIRED, '(Required) Admin email'),
+            new InputOption(
+                AdminAccount::KEY_USER,
+                null,
+                $mode,
+                $requiredStr . 'Admin user'
+            ),
+            new InputOption(
+                AdminAccount::KEY_PASSWORD,
+                null,
+                $mode,
+                $requiredStr . 'Admin password'
+            ),
+            new InputOption(
+                AdminAccount::KEY_EMAIL,
+                null,
+                $mode,
+                $requiredStr . 'Admin email'
+            ),
             new InputOption(
                 AdminAccount::KEY_FIRST_NAME,
                 null,
-                InputOption::VALUE_REQUIRED,
-                '(Required) Admin first name'
+                $mode,
+                $requiredStr . 'Admin first name'
             ),
             new InputOption(
                 AdminAccount::KEY_LAST_NAME,
                 null,
-                InputOption::VALUE_REQUIRED,
-                '(Required) Admin last name'
+                $mode,
+                $requiredStr . 'Admin last name'
             ),
         ];
     }
@@ -113,7 +232,7 @@ public function validate(InputInterface $input)
                 ? '' : $input->getOption(AdminAccount::KEY_PASSWORD)
             );
 
-        $validator = new \Magento\Framework\Validator\DataObject;
+        $validator = new \Magento\Framework\Validator\DataObject();
         $this->validationRules->addUserInfoRules($validator);
         $this->validationRules->addPasswordRules($validator);
 
diff --git a/setup/src/Magento/Setup/Console/Command/BackupCommand.php b/setup/src/Magento/Setup/Console/Command/BackupCommand.php
index fafa47296d304..ebfcab5a18417 100644
--- a/setup/src/Magento/Setup/Console/Command/BackupCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/BackupCommand.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\Backup\Factory;
@@ -36,13 +37,6 @@ class BackupCommand extends AbstractSetupCommand
      */
     private $objectManager;
 
-    /**
-     * Handler for maintenance mode
-     *
-     * @var MaintenanceMode
-     */
-    private $maintenanceMode;
-
     /**
      * Factory for BackupRollback
      *
@@ -57,22 +51,32 @@ class BackupCommand extends AbstractSetupCommand
      */
     private $deploymentConfig;
 
+    /**
+     * @var MaintenanceModeEnabler
+     */
+    private $maintenanceModeEnabler;
+
     /**
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @param MaintenanceMode $maintenanceMode
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param DeploymentConfig $deploymentConfig
+     * @param MaintenanceModeEnabler $maintenanceModeEnabler
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
         MaintenanceMode $maintenanceMode,
-        DeploymentConfig $deploymentConfig
+        DeploymentConfig $deploymentConfig,
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         $this->objectManager = $objectManagerProvider->get();
-        $this->maintenanceMode = $maintenanceMode;
         $this->backupRollbackFactory = $this->objectManager->get(\Magento\Framework\Setup\BackupRollbackFactory::class);
         $this->deploymentConfig = $deploymentConfig;
+        $this->maintenanceModeEnabler =
+            $maintenanceModeEnabler ?: $this->objectManager->get(MaintenanceModeEnabler::class);
         parent::__construct();
     }
 
@@ -118,38 +122,40 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // We need exit code higher than 0 here as an indication
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
-        $returnValue = \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-        try {
-            $inputOptionProvided = false;
-            $output->writeln('<info>Enabling maintenance mode</info>');
-            $this->maintenanceMode->set(true);
-            $time = time();
-            $backupHandler = $this->backupRollbackFactory->create($output);
-            if ($input->getOption(self::INPUT_KEY_CODE)) {
-                $backupHandler->codeBackup($time);
-                $inputOptionProvided = true;
-            }
-            if ($input->getOption(self::INPUT_KEY_MEDIA)) {
-                $backupHandler->codeBackup($time, Factory::TYPE_MEDIA);
-                $inputOptionProvided = true;
-            }
-            if ($input->getOption(self::INPUT_KEY_DB)) {
-                $this->setAreaCode();
-                $backupHandler->dbBackup($time);
-                $inputOptionProvided = true;
-            }
-            if (!$inputOptionProvided) {
-                throw new \InvalidArgumentException(
-                    'Not enough information provided to take backup.'
-                );
-            }
-        } catch (\Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $returnValue =  \Magento\Framework\Console\Cli::RETURN_FAILURE;
-        } finally {
-            $output->writeln('<info>Disabling maintenance mode</info>');
-            $this->maintenanceMode->set(false);
-        }
+        $returnValue = $this->maintenanceModeEnabler->executeInMaintenanceMode(
+            function () use ($input, $output) {
+                try {
+                    $inputOptionProvided = false;
+                    $time = time();
+                    $backupHandler = $this->backupRollbackFactory->create($output);
+                    if ($input->getOption(self::INPUT_KEY_CODE)) {
+                        $backupHandler->codeBackup($time);
+                        $inputOptionProvided = true;
+                    }
+                    if ($input->getOption(self::INPUT_KEY_MEDIA)) {
+                        $backupHandler->codeBackup($time, Factory::TYPE_MEDIA);
+                        $inputOptionProvided = true;
+                    }
+                    if ($input->getOption(self::INPUT_KEY_DB)) {
+                        $this->setAreaCode();
+                        $backupHandler->dbBackup($time);
+                        $inputOptionProvided = true;
+                    }
+                    if (!$inputOptionProvided) {
+                        throw new \InvalidArgumentException(
+                            'Not enough information provided to take backup.'
+                        );
+                    }
+                    return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+                } catch (\Exception $e) {
+                    $output->writeln('<error>' . $e->getMessage() . '</error>');
+                    return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+                }
+            },
+            $output,
+            false
+        );
+        
         return $returnValue;
     }
 
diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
index 4192d22524ad1..e8ff8f09c345e 100644
--- a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php
@@ -12,7 +12,11 @@
 use Magento\Setup\Model\ConfigModel;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
 
+/**
+ * Config Set Command
+ */
 class ConfigSetCommand extends AbstractSetupCommand
 {
     /**
@@ -67,7 +71,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -81,11 +85,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $currentValue = $this->deploymentConfig->get($option->getConfigPath());
             if (($currentValue !== null) && ($inputOptions[$option->getName()] !== null)) {
-                $dialog = $this->getHelperSet()->get('dialog');
-                if (!$dialog->askConfirmation(
-                    $output,
-                    '<question>Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]</question>'
-                )) {
+                $dialog = $this->getHelperSet()->get('question');
+                $question = new Question(
+                    '<question>Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]</question>',
+                    'y'
+                );
+                if (strtolower($dialog->ask($input, $output, $question)) !== 'y') {
                     $inputOptions[$option->getName()] = null;
                 }
             }
@@ -126,10 +131,11 @@ function ($value) {
                 $output->writeln('<info>You made no changes to the configuration.</info>');
             }
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
diff --git a/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
index 36b010d6d1e38..ae0c2f5c4e27f 100644
--- a/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DbDataUpgradeCommand.php
@@ -67,5 +67,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $installer = $this->installFactory->create(new ConsoleLogger($output));
         $installer->installDataFixtures();
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
index fbe1843e7e606..3ef9a441b868f 100644
--- a/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DbSchemaUpgradeCommand.php
@@ -10,29 +10,30 @@
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Framework\Setup\ConsoleLogger;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command for install and update of DB schema
+ * Command for install and update of DB schema.
  */
 class DbSchemaUpgradeCommand extends AbstractSetupCommand
 {
     /**
-     * Factory to create installer
+     * Factory to create installer.
      *
      * @var InstallerFactory
      */
     private $installFactory;
 
     /**
-     * Deployment configuration
+     * Deployment configuration.
      *
      * @var DeploymentConfig
      */
     private $deploymentConfig;
 
     /**
-     * Inject dependencies
+     * Inject dependencies.
      *
      * @param InstallerFactory $installFactory
      * @param DeploymentConfig $deploymentConfig
@@ -45,13 +46,26 @@ public function __construct(InstallerFactory $installFactory, DeploymentConfig $
     }
 
     /**
-     * Initialization of the command
+     * Initialization of the command.
      *
      * @return void
      */
     protected function configure()
     {
-        $this->setName('setup:db-schema:upgrade')->setDescription('Installs and upgrades the DB schema');
+        $this
+            ->setName('setup:db-schema:upgrade')
+            ->setDefinition(
+                [
+                    new InputOption(
+                        InstallCommand::CONVERT_OLD_SCRIPTS_KEY,
+                        null,
+                        InputOption::VALUE_OPTIONAL,
+                        'Allows to convert old scripts (InstallSchema, UpgradeSchema) to db_schema.xml format',
+                        false
+                    )
+                ]
+            )
+            ->setDescription('Installs and upgrades the DB schema');
         parent::configure();
     }
 
@@ -66,6 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
         $installer = $this->installFactory->create(new ConsoleLogger($output));
-        $installer->installSchema();
+        $installer->installSchema($input->getOptions());
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php b/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php
index 138986590e3e3..be18bd58037ea 100644
--- a/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DbStatusCommand.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\Setup\Console\Command;
 
-use Composer\Package\Version\VersionParser;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Console\Cli;
-use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Setup\Declaration\Schema\UpToDateDeclarativeSchema;
+use Magento\Framework\Setup\OldDbValidator;
+use Magento\Framework\Setup\Patch\UpToDateData;
+use Magento\Framework\Setup\Patch\UpToDateSchema;
+use Magento\Framework\Setup\UpToDateValidatorInterface;
 use Magento\Setup\Model\ObjectManagerProvider;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -37,6 +40,11 @@ class DbStatusCommand extends AbstractSetupCommand
      */
     private $deploymentConfig;
 
+    /**
+     * @var UpToDateValidatorInterface[]
+     */
+    private $upToDateValidators = [];
+
     /**
      * Inject dependencies
      *
@@ -47,6 +55,16 @@ public function __construct(ObjectManagerProvider $objectManagerProvider, Deploy
     {
         $this->objectManagerProvider = $objectManagerProvider;
         $this->deploymentConfig = $deploymentConfig;
+        /**
+         * As DbStatucCommand is in setup and all validators are part of the framework, we can`t configure
+         * this command with dependency injection and we need to inject each validator manually
+         */
+        $this->upToDateValidators = [
+            $this->objectManagerProvider->get()->get(UpToDateDeclarativeSchema::class),
+            $this->objectManagerProvider->get()->get(UpToDateSchema::class),
+            $this->objectManagerProvider->get()->get(UpToDateData::class),
+            $this->objectManagerProvider->get()->get(OldDbValidator::class),
+        ];
         parent::__construct();
     }
 
@@ -71,43 +89,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
             return Cli::RETURN_FAILURE;
         }
-        /** @var DbVersionInfo $dbVersionInfo */
-        $dbVersionInfo = $this->objectManagerProvider->get()
-            ->get(\Magento\Framework\Module\DbVersionInfo::class);
-        $outdated = $dbVersionInfo->getDbVersionErrors();
-        if (!empty($outdated)) {
-            $output->writeln("<info>The module code base doesn't match the DB schema and data.</info>");
-            $versionParser = new VersionParser();
-            $codebaseUpdateNeeded = false;
-            foreach ($outdated as $row) {
-                if (!$codebaseUpdateNeeded && $row[DbVersionInfo::KEY_CURRENT] !== 'none') {
-                    // check if module code base update is needed
-                    $currentVersion = $versionParser->parseConstraints($row[DbVersionInfo::KEY_CURRENT]);
-                    $requiredVersion = $versionParser->parseConstraints('>' . $row[DbVersionInfo::KEY_REQUIRED]);
-                    if ($requiredVersion->matches($currentVersion)) {
-                        $codebaseUpdateNeeded = true;
-                    };
-                }
-                $output->writeln(sprintf(
-                    "<info>%20s %10s: %11s  ->  %-11s</info>",
-                    $row[DbVersionInfo::KEY_MODULE],
-                    $row[DbVersionInfo::KEY_TYPE],
-                    $row[DbVersionInfo::KEY_CURRENT],
-                    $row[DbVersionInfo::KEY_REQUIRED]
-                ));
-            }
-            if ($codebaseUpdateNeeded) {
-                $output->writeln(
-                    '<info>Some modules use code versions newer or older than the database. ' .
-                    "First update the module code, then run 'setup:upgrade'.</info>"
-                );
-                return Cli::RETURN_FAILURE;
+
+        $outDated = false;
+
+        foreach ($this->upToDateValidators as $validator) {
+            if (!$validator->isUpToDate()) {
+                $output->writeln(sprintf('<info>%s</info>', $validator->getNotUpToDateMessage()));
+                $outDated = true;
             }
+        }
 
-            $output->writeln(
-                "<info>Run 'setup:upgrade' to update your DB schema and data.</info>"
-            );
-            return static::EXIT_CODE_UPGRADE_REQUIRED;
+        if ($outDated) {
+            $output->writeln('<info>Run \'setup:upgrade\' to update your DB schema and data.</info>');
+            return self::EXIT_CODE_UPGRADE_REQUIRED;
         }
 
         $output->writeln(
diff --git a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
index 4217c9ea5c650..6a4231259a1ca 100644
--- a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
@@ -127,7 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $logger = $this->consoleLoggerFactory->getLogger($output, $verbose);
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
+            $logger->notice(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
         }
 
         $this->mockCache();
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $deployService->deploy($options);
 
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Execution time: " . (microtime(true) - $time));
+            $logger->notice(PHP_EOL . "Execution time: " . (microtime(true) - $time));
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
index 904840869fdeb..014d699cb239d 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -21,6 +21,7 @@
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
+use Magento\Framework\Console\Cli;
 
 /**
  * Command to run compile in single-tenant mode
@@ -102,7 +103,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -131,7 +132,7 @@ private function checkEnvironment()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -141,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($line);
             }
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
 
         $modulePaths = $this->componentRegistrar->getPaths(ComponentRegistrar::MODULE);
@@ -211,8 +212,9 @@ function (OperationInterface $operation) use ($progressBar) {
         } catch (OperationException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
@@ -239,7 +241,7 @@ private function getExcludedModulePaths(array $modulePaths)
                 $vendorPathsRegExps[] = $vendorDir
                     . '/(?:' . join('|', $vendorModules) . ')';
             }
-            $basePathsRegExps[] = $basePath
+            $basePathsRegExps[] = preg_quote($basePath, '#')
                 . '/(?:' . join('|', $vendorPathsRegExps) . ')';
         }
 
@@ -258,6 +260,10 @@ private function getExcludedModulePaths(array $modulePaths)
      */
     private function getExcludedLibraryPaths(array $libraryPaths)
     {
+        $libraryPaths = array_map(function ($libraryPath) {
+            return preg_quote($libraryPath, '#');
+        }, $libraryPaths);
+
         $excludedLibraryPaths = [
             '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?Test#',
             '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?tests#',
@@ -274,7 +280,7 @@ private function getExcludedLibraryPaths(array $libraryPaths)
     private function getExcludedSetupPaths($setupPath)
     {
         return [
-            '#^(?:' . $setupPath . ')(/[\\w]+)*/Test#'
+            '#^(?:' . preg_quote($setupPath, '#') . ')(/[\\w]+)*/Test#'
         ];
     }
 
@@ -301,8 +307,8 @@ private function configureObjectManager(OutputInterface $output)
     {
         $this->objectManager->configure(
             [
-                'preferences' => [\Magento\Setup\Module\Di\Compiler\Config\WriterInterface::class =>
-                    \Magento\Setup\Module\Di\Compiler\Config\Writer\Filesystem::class,
+                'preferences' => [\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class =>
+                    \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem::class,
                 ], \Magento\Setup\Module\Di\Compiler\Config\ModificationChain::class => [
                     'arguments' => [
                         'modificationsList' => [
diff --git a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
index c817d2e07660a..03b74f637a7da 100644
--- a/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php
@@ -96,8 +96,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $indexerRegistry = $fixtureModel->getObjectManager()
                 ->create(\Magento\Framework\Indexer\IndexerRegistry::class);
 
+            $indexersState = [];
             foreach ($indexerListIds as $indexerId) {
                 $indexer = $indexerRegistry->get($indexerId['indexer_id']);
+                $indexersState[$indexerId['indexer_id']] = $indexer->isScheduled();
                 $indexer->setScheduled(true);
             }
 
@@ -107,6 +109,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $this->clearChangelog();
 
+            foreach ($indexerListIds as $indexerId) {
+                /** @var $indexer \Magento\Indexer\Model\Indexer */
+                $indexer = $indexerRegistry->get($indexerId['indexer_id']);
+                $indexer->setScheduled($indexersState[$indexerId['indexer_id']]);
+            }
+
             /** @var \Magento\Setup\Fixtures\IndexersStatesApplyFixture $indexerFixture */
             $indexerFixture = $fixtureModel
                 ->getFixtureByName(\Magento\Setup\Fixtures\IndexersStatesApplyFixture::class);
@@ -125,6 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
@@ -148,6 +157,10 @@ private function clearChangelog()
         }
     }
 
+    /**
+     * @param \Magento\Setup\Fixtures\Fixture $fixture
+     * @param OutputInterface $output
+     */
     private function executeFixture(\Magento\Setup\Fixtures\Fixture $fixture, OutputInterface $output)
     {
         $output->write('<info>' . $fixture->getActionTitle() . '... </info>');
diff --git a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
index 1151ba7630d5d..bb8ab4e4cc49a 100644
--- a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
@@ -77,5 +77,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $input->getOption(self::INPUT_KEY_MAGENTO)
         );
         $output->writeln('<info>Dictionary successfully processed.</info>');
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php b/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
index 0fa3f474500db..7c5cc89387dcf 100644
--- a/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/I18nPackCommand.php
@@ -91,5 +91,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $input->getOption(self::INPUT_KEY_ALLOW_DUPLICATES)
         );
         $output->writeln("<info>Successfully saved $locale language package.</info>");
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php b/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
index 290a62d661cac..006afc27a0826 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoAdminUriCommand.php
@@ -53,5 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             . $this->deploymentConfig->get(BackendConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             . "\n"
         );
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
index c22367bded29a..94337dd0742e3 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
@@ -11,8 +11,10 @@
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Setup\BackupRollback;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\TableFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Command prints list of available backup files
@@ -33,16 +35,24 @@ class InfoBackupsListCommand extends Command
      */
     private $directoryList;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param DirectoryList $directoryList
      * @param File $file
+     * @param TableFactory $tableHelperFactory
      */
     public function __construct(
         DirectoryList $directoryList,
-        File $file
+        File $file,
+        TableFactory $tableHelperFactory = null
     ) {
         $this->directoryList = $directoryList;
         $this->file = $file;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -87,19 +97,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             if (empty($tempTable)) {
                 $output->writeln('<info>No backup files found.</info>');
-                return;
+                return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
             }
             $output->writeln("<info>Showing backup files in $backupsDir.</info>");
-            /** @var \Symfony\Component\Console\Helper\Table $table */
-            $table = $this->getHelperSet()->get('table');
-            $table->setHeaders(['Backup Filename', 'Backup Type']);
+            /** @var \Symfony\Component\Console\Helper\Table $tableHelper */
+            $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+            $tableHelper->setHeaders(['Backup Filename', 'Backup Type']);
             asort($tempTable);
             foreach ($tempTable as $key => $value) {
-                $table->addRow([$key, $value]);
+                $tableHelper->addRow([$key, $value]);
             }
-            $table->render($output);
+            $tableHelper->render();
         } else {
             $output->writeln('<info>No backup files found.</info>');
         }
+
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
index b9734807e3522..91cfb5e7f6b5c 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Setup\Console\Command;
 
+use Symfony\Component\Console\Helper\TableFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 use Magento\Framework\Setup\Lists;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Command prints list of available currencies
@@ -23,12 +25,19 @@ class InfoCurrencyListCommand extends Command
      */
     private $lists;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param Lists $lists
+     * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -48,13 +57,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
-        $table->setHeaders(['Currency', 'Code']);
+        $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+        $tableHelper->setHeaders(['Currency', 'Code']);
 
         foreach ($this->lists->getCurrencyList() as $key => $currency) {
-            $table->addRow([$currency, $key]);
+            $tableHelper->addRow([$currency, $key]);
         }
 
-        $table->render($output);
+        $tableHelper->render();
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
index 171ee32266a7f..8950bd5edb2fa 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
@@ -6,8 +6,10 @@
 
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Setup\Lists;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\TableFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -23,12 +25,19 @@ class InfoLanguageListCommand extends Command
      */
     private $lists;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param Lists $lists
+     * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -48,13 +57,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
-        $table->setHeaders(['Language', 'Code']);
+        $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+        $tableHelper->setHeaders(['Language', 'Code']);
 
         foreach ($this->lists->getLocaleList() as $key => $locale) {
-            $table->addRow([$locale, $key]);
+            $tableHelper->addRow([$locale, $key]);
         }
 
-        $table->render($output);
+        $tableHelper->render();
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
index 587334a7e1dfd..2ff1d228dfe24 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 use Magento\Framework\Setup\Lists;
+use Symfony\Component\Console\Helper\TableFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Command prints list of available timezones
@@ -23,12 +25,19 @@ class InfoTimezoneListCommand extends Command
      */
     private $lists;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param Lists $lists
+     * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -48,13 +57,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
-        $table->setHeaders(['Timezone', 'Code']);
+        $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+        $tableHelper->setHeaders(['Timezone', 'Code']);
 
         foreach ($this->lists->getTimezoneList() as $key => $timezone) {
-            $table->addRow([$timezone, $key]);
+            $tableHelper->addRow([$timezone, $key]);
         }
 
-        $table->render($output);
+        $tableHelper->render();
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index b0ccbba8c296f..74c2e3b24234c 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -3,16 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Setup\Console\Command;
 
 use Magento\Deploy\Console\Command\App\ConfigImportCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
+use Magento\Framework\Setup\Declaration\Schema\Request;
+use Magento\Setup\Model\AdminAccount;
+use Magento\Setup\Model\ConfigModel;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Framework\Setup\ConsoleLogger;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Magento\Setup\Model\ConfigModel;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Helper\QuestionHelper;
 
 /**
  * Command to install Magento application
@@ -35,6 +44,45 @@ class InstallCommand extends AbstractSetupCommand
      */
     const INPUT_KEY_USE_SAMPLE_DATA = 'use-sample-data';
 
+    /**
+     * List of comma-separated module names. That must be enabled during installation.
+     * Available magic param all.
+     */
+    const INPUT_KEY_ENABLE_MODULES = 'enable-modules';
+
+    /**
+     * List of comma-separated module names. That must be avoided during installation.
+     * List of comma-separated module names. That must be avoided during installation.
+     * Available magic param all.
+     */
+    const INPUT_KEY_DISABLE_MODULES = 'disable-modules';
+
+    /**
+     * If this flag is enabled, than all your old scripts with format:
+     * InstallSchema, UpgradeSchema will be converted to new db_schema.xml format.
+     */
+    const CONVERT_OLD_SCRIPTS_KEY = 'convert-old-scripts';
+
+    /**
+     * Parameter indicating command for interactive setup
+     */
+    const INPUT_KEY_INTERACTIVE_SETUP = 'interactive';
+
+    /**
+     * Parameter indicating command shortcut for interactive setup
+     */
+    const INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT = 'i';
+
+    /**
+     * Parameter says that in this mode all destructive operations, like column removal will be dumped
+     */
+    const INPUT_KEY_SAFE_INSTALLER_MODE = 'safe-mode';
+
+    /**
+     * Parameter allows to restore data, that was dumped with safe mode before
+     */
+    const INPUT_KEY_DATA_RESTORE = 'data-restore';
+
     /**
      * Regex for sales_order_increment_prefix validation.
      */
@@ -84,13 +132,13 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
         $inputOptions = $this->configModel->getAvailableOptions();
         $inputOptions = array_merge($inputOptions, $this->userConfig->getOptionsList());
-        $inputOptions = array_merge($inputOptions, $this->adminUser->getOptionsList());
+        $inputOptions = array_merge($inputOptions, $this->adminUser->getOptionsList(InputOption::VALUE_OPTIONAL));
         $inputOptions = array_merge($inputOptions, [
             new InputOption(
                 self::INPUT_KEY_CLEANUP_DB,
@@ -109,7 +157,53 @@ protected function configure()
                 null,
                 InputOption::VALUE_NONE,
                 'Use sample data'
-            )
+            ),
+            new InputOption(
+                self::INPUT_KEY_ENABLE_MODULES,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'List of comma-separated module names. That must be included during installation. '
+                . 'Available magic param "all".'
+            ),
+            new InputOption(
+                self::INPUT_KEY_DISABLE_MODULES,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'List of comma-separated module names. That must be avoided during installation. '
+                . 'Available magic param "all".'
+            ),
+            new InputOption(
+                self::CONVERT_OLD_SCRIPTS_KEY,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Allows to convert old scripts (InstallSchema, UpgradeSchema) to db_schema.xml format',
+                false
+            ),
+            new InputOption(
+                self::INPUT_KEY_INTERACTIVE_SETUP,
+                self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
+                InputOption::VALUE_NONE,
+                'Interactive Magento instalation'
+            ),
+            new InputOption(
+                OperationsExecutor::KEY_SAFE_MODE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Safe installation of Magento with dumps on destructive operations, like column removal'
+            ),
+            new InputOption(
+                OperationsExecutor::KEY_DATA_RESTORE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Restore removed data from dumps'
+            ),
+            new InputOption(
+                DryRunLogger::INPUT_KEY_DRY_RUN_MODE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Magento Installation will be run in dry-run mode',
+                false
+            ),
         ]);
         $this->setName('setup:install')
             ->setDescription('Installs the Magento application')
@@ -118,7 +212,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -133,20 +227,33 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
         $inputOptions = $input->getOptions();
 
-        $configOptionsToValidate = [];
-        foreach ($this->configModel->getAvailableOptions() as $option) {
-            if (array_key_exists($option->getName(), $inputOptions)) {
-                $configOptionsToValidate[$option->getName()] = $inputOptions[$option->getName()];
+        if ($inputOptions['interactive']) {
+            $configOptionsToValidate = $this->interactiveQuestions($input, $output);
+        } else {
+            $configOptionsToValidate = [];
+            foreach ($this->configModel->getAvailableOptions() as $option) {
+                if (array_key_exists($option->getName(), $inputOptions)) {
+                    $configOptionsToValidate[$option->getName()] = $inputOptions[$option->getName()];
+                }
             }
         }
+
+        if ($inputOptions['interactive']) {
+            $command = '';
+            foreach ($configOptionsToValidate as $key => $value) {
+                $command .= " --{$key}={$value}";
+            }
+            $output->writeln("<comment>Try re-running command: php bin/magento setup:install{$command}</comment>");
+        }
+
         $errors = $this->configModel->validate($configOptionsToValidate);
-        $errors = array_merge($errors, $this->adminUser->validate($input));
+        $errors = array_merge($errors, $this->validateAdmin($input));
         $errors = array_merge($errors, $this->validate($input));
         $errors = array_merge($errors, $this->userConfig->validate($input));
 
@@ -167,14 +274,163 @@ protected function initialize(InputInterface $input, OutputInterface $output)
      * @param InputInterface $input
      * @return string[] Array of error messages
      */
-    public function validate(InputInterface $input)
+    public function validate(InputInterface $input) : array
     {
         $errors = [];
         $value = $input->getOption(self::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX);
-        if (preg_match(self::SALES_ORDER_INCREMENT_PREFIX_RULE, $value) != 1) {
+        if (preg_match(self::SALES_ORDER_INCREMENT_PREFIX_RULE, (string) $value) != 1) {
             $errors[] = 'Validation failed, ' . self::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX
                 . ' must be 20 characters or less';
         }
         return $errors;
     }
+
+    /**
+     * Runs interactive questions
+     *
+     * It will ask users for interactive questionst regarding setup configuration.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return string[] Array of inputs
+     */
+    private function interactiveQuestions(InputInterface $input, OutputInterface $output) : array
+    {
+        $helper = $this->getHelper('question');
+        $configOptionsToValidate = [];
+
+        foreach ($this->configModel->getAvailableOptions() as $option) {
+            $configOptionsToValidate[$option->getName()] = $this->askQuestion(
+                $input,
+                $output,
+                $helper,
+                $option,
+                true
+            );
+        }
+
+        $output->writeln("");
+
+        foreach ($this->userConfig->getOptionsList() as $option) {
+            $configOptionsToValidate[$option->getName()] = $this->askQuestion(
+                $input,
+                $output,
+                $helper,
+                $option
+            );
+        }
+
+        $output->writeln("");
+
+        foreach ($this->adminUser->getOptionsList(InputOption::VALUE_OPTIONAL) as $option) {
+            $configOptionsToValidate[$option->getName()] = $this->askQuestion(
+                $input,
+                $output,
+                $helper,
+                $option
+            );
+        }
+
+        $output->writeln("");
+
+        $returnConfigOptionsToValidate = [];
+        foreach ($configOptionsToValidate as $key => $value) {
+            if ($value != '') {
+                $returnConfigOptionsToValidate[$key] = $value;
+            }
+        }
+
+        return $returnConfigOptionsToValidate;
+    }
+
+    /**
+     * Runs interactive questions
+     *
+     * It will ask users for interactive questionst regarding setup configuration.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param QuestionHelper $helper
+     * @param TextConfigOption|FlagConfigOption\SelectConfigOption $option
+     * @param Boolean $validateInline
+     * @return string[] Array of inputs
+     */
+    private function askQuestion(
+        InputInterface $input,
+        OutputInterface $output,
+        QuestionHelper $helper,
+        $option,
+        $validateInline = false
+    ) {
+        if ($option instanceof \Magento\Framework\Setup\Option\SelectConfigOption) {
+            if ($option->isValueRequired()) {
+                $question = new ChoiceQuestion(
+                    $option->getDescription() . '? ',
+                    $option->getSelectOptions(),
+                    $option->getDefault()
+                );
+            } else {
+                $question = new ChoiceQuestion(
+                    $option->getDescription() . ' [optional]? ',
+                    $option->getSelectOptions(),
+                    $option->getDefault()
+                );
+            }
+        } else {
+            if ($option->isValueRequired()) {
+                $question = new Question(
+                    $option->getDescription() . '? ',
+                    $option->getDefault()
+                );
+            } else {
+                $question = new Question(
+                    $option->getDescription() . ' [optional]? ',
+                    $option->getDefault()
+                );
+            }
+        }
+
+        $question->setValidator(function ($answer) use ($option, $validateInline) {
+
+            if ($option instanceof \Magento\Framework\Setup\Option\SelectConfigOption) {
+                $answer = $option->getSelectOptions()[$answer];
+            }
+
+            if ($answer == null) {
+                $answer = '';
+            } else {
+                $answer = trim($answer);
+            }
+
+            if ($validateInline) {
+                $option->validate($answer);
+            }
+
+            return $answer;
+        });
+
+        $value = $helper->ask($input, $output, $question);
+
+        return $value;
+    }
+
+    /**
+     * Performs validation of admin options if at least one of them was set.
+     *
+     * @param InputInterface $input
+     * @return array
+     */
+    private function validateAdmin(InputInterface $input): array
+    {
+        if ($input->getOption(AdminAccount::KEY_FIRST_NAME)
+            || $input->getOption(AdminAccount::KEY_LAST_NAME)
+            || $input->getOption(AdminAccount::KEY_EMAIL)
+            || $input->getOption(AdminAccount::KEY_USER)
+            || $input->getOption(AdminAccount::KEY_PASSWORD)
+        ) {
+            return $this->adminUser->validate($input);
+        }
+
+        return [];
+    }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php b/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
index fdfd0af451aa2..7eb8aec274888 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallStoreConfigurationCommand.php
@@ -127,6 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $installer = $this->installerFactory->create(new ConsoleLogger($output));
         $installer->installUserConfig($input->getOptions());
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
index 3df2825dfec1d..09f33cf85062c 100644
--- a/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
@@ -24,6 +24,7 @@ class MaintenanceAllowIpsCommand extends AbstractSetupCommand
      */
     const INPUT_KEY_IP = 'ip';
     const INPUT_KEY_NONE = 'none';
+    const INPUT_KEY_ADD = 'add';
 
     /**
      * @var MaintenanceMode
@@ -69,6 +70,12 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Clear allowed IP addresses'
             ),
+            new InputOption(
+                self::INPUT_KEY_ADD,
+                null,
+                InputOption::VALUE_NONE,
+                'Add the IP address to existing list'
+            ),
         ];
         $this->setName('maintenance:allow-ips')
             ->setDescription('Sets maintenance mode exempt IPs')
@@ -91,9 +98,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             if (!empty($addresses)) {
+                if ($input->getOption(self::INPUT_KEY_ADD)) {
+                    $addresses = array_unique(array_merge($this->maintenanceMode->getAddressInfo(), $addresses));
+                }
                 $this->maintenanceMode->setAddresses(implode(',', $addresses));
                 $output->writeln(
-                    '<info>Set exempt IP-addresses: ' . implode(', ', $this->maintenanceMode->getAddressInfo()) .
+                    '<info>Set exempt IP-addresses: ' . implode(' ', $this->maintenanceMode->getAddressInfo()) .
                     '</info>'
                 );
             }
@@ -101,6 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->maintenanceMode->setAddresses('');
             $output->writeln('<info>Set exempt IP-addresses: none</info>');
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php b/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
index 9162cc47f6bd9..f2d3d2bf30caa 100644
--- a/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
@@ -54,7 +54,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ($this->maintenanceMode->isOn() ? 'active' : 'not active') . '</info>'
         );
         $addressInfo = $this->maintenanceMode->getAddressInfo();
-        $addresses = implode(', ', $addressInfo);
+        $addresses = implode(' ', $addressInfo);
         $output->writeln('<info>List of exempt IP-addresses: ' . ($addresses ? $addresses : 'none') . '</info>');
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index d4305c9572a66..65fc265a64ec8 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -3,11 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\Module\FullModuleList;
+use Magento\Framework\Module\ModuleList;
 use Magento\Setup\Model\ObjectManagerProvider;
+use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Command for displaying status of modules
@@ -38,7 +45,10 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
     protected function configure()
     {
         $this->setName('module:status')
-            ->setDescription('Displays status of modules');
+            ->setDescription('Displays status of modules')
+            ->addArgument('module', InputArgument::OPTIONAL, 'Optional module name')
+            ->addOption('enabled', null, null, 'Print only enabled modules')
+            ->addOption('disabled', null, null, 'Print only disabled modules');
         parent::configure();
     }
 
@@ -47,23 +57,106 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $moduleList = $this->objectManagerProvider->get()->create(\Magento\Framework\Module\ModuleList::class);
-        $output->writeln('<info>List of enabled modules:</info>');
-        $enabledModules = $moduleList->getNames();
-        if (count($enabledModules) === 0) {
-            $output->writeln('None');
-        } else {
-            $output->writeln(join("\n", $enabledModules));
+        $moduleName = (string)$input->getArgument('module');
+        if ($moduleName) {
+            return $this->showSpecificModule($moduleName, $output);
         }
+
+        $onlyEnabled = $input->getOption('enabled');
+        if ($onlyEnabled) {
+            return $this->showEnabledModules($output);
+        }
+
+        $onlyDisabled = $input->getOption('disabled');
+        if ($onlyDisabled) {
+            return $this->showDisabledModules($output);
+        }
+
+        $output->writeln('<info>List of enabled modules:</info>');
+        $this->showEnabledModules($output);
         $output->writeln('');
 
-        $fullModuleList = $this->objectManagerProvider->get()->create(\Magento\Framework\Module\FullModuleList::class);
         $output->writeln("<info>List of disabled modules:</info>");
-        $disabledModules = array_diff($fullModuleList->getNames(), $enabledModules);
-        if (count($disabledModules) === 0) {
+        $this->showDisabledModules($output);
+        $output->writeln('');
+    }
+
+    /**
+     * @param string $moduleName
+     * @param OutputInterface $output
+     */
+    private function showSpecificModule(string $moduleName, OutputInterface $output)
+    {
+        $allModules = $this->getAllModules();
+        if (!in_array($moduleName, $allModules->getNames())) {
+            $output->writeln('<error>Module does not exist</error>');
+            return Cli::RETURN_FAILURE;
+        }
+
+        $enabledModules = $this->getEnabledModules();
+        if (in_array($moduleName, $enabledModules->getNames())) {
+            $output->writeln('<info>Module is enabled</info>');
+            return Cli::RETURN_FAILURE;
+        }
+
+        $output->writeln('<info>Module is disabled</info>');
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * @param OutputInterface $output
+     */
+    private function showEnabledModules(OutputInterface $output)
+    {
+        $enabledModules = $this->getEnabledModules();
+        $enabledModuleNames = $enabledModules->getNames();
+        if (count($enabledModuleNames) === 0) {
             $output->writeln('None');
-        } else {
-            $output->writeln(join("\n", $disabledModules));
+            return Cli::RETURN_FAILURE;
         }
+
+        $output->writeln(join("\n", $enabledModuleNames));
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * @param OutputInterface $output
+     */
+    private function showDisabledModules(OutputInterface $output)
+    {
+        $disabledModuleNames = $this->getDisabledModuleNames();
+        if (count($disabledModuleNames) === 0) {
+            $output->writeln('None');
+            return Cli::RETURN_FAILURE;
+        }
+
+        $output->writeln(join("\n", $disabledModuleNames));
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * @return FullModuleList
+     */
+    private function getAllModules(): FullModuleList
+    {
+        return $this->objectManagerProvider->get()->create(FullModuleList::class);
+    }
+
+    /**
+     * @return ModuleList
+     */
+    private function getEnabledModules(): ModuleList
+    {
+        return $this->objectManagerProvider->get()->create(ModuleList::class);
+    }
+
+    /**
+     * @return array
+     */
+    private function getDisabledModuleNames(): array
+    {
+        $fullModuleList = $this->getAllModules();
+        $enabledModules = $this->getEnabledModules();
+        return array_diff($fullModuleList->getNames(), $enabledModules->getNames());
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
index 4e25cf60a56d3..5754bbca986c8 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\Backup\Factory;
 use Magento\Framework\Composer\ComposerInformation;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Module\DependencyChecker;
 use Magento\Framework\Module\FullModuleList;
 use Magento\Framework\Module\PackageInfo;
@@ -16,6 +18,7 @@
 use Magento\Setup\Model\ModuleRegistryUninstaller;
 use Magento\Setup\Model\ModuleUninstaller;
 use Magento\Setup\Model\ObjectManagerProvider;
+use Magento\Framework\Setup\Patch\PatchApplier;
 use Magento\Setup\Model\UninstallCollector;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -37,13 +40,7 @@ class ModuleUninstallCommand extends AbstractModuleCommand
     const INPUT_KEY_BACKUP_CODE = 'backup-code';
     const INPUT_KEY_BACKUP_MEDIA = 'backup-media';
     const INPUT_KEY_BACKUP_DB = 'backup-db';
-
-    /**
-     * Maintenance mode
-     *
-     * @var MaintenanceMode
-     */
-    private $maintenanceMode;
+    const INPUT_KEY_NON_COMPOSER_MODULE = 'non-composer';
 
     /**
      * Deployment Configuration
@@ -108,17 +105,30 @@ class ModuleUninstallCommand extends AbstractModuleCommand
      */
     private $moduleRegistryUninstaller;
 
+    /**
+     * @var MaintenanceModeEnabler
+     */
+    private $maintenanceModeEnabler;
+
+    /**
+     * @var PatchApplier
+     */
+    private $patchApplier;
+
     /**
      * Constructor
      *
      * @param ComposerInformation $composer
      * @param DeploymentConfig $deploymentConfig
      * @param FullModuleList $fullModuleList
-     * @param MaintenanceMode $maintenanceMode
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param ObjectManagerProvider $objectManagerProvider
      * @param UninstallCollector $collector
      * @param ModuleUninstaller $moduleUninstaller
      * @param ModuleRegistryUninstaller $moduleRegistryUninstaller
+     * @param MaintenanceModeEnabler $maintenanceModeEnabler
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ComposerInformation $composer,
@@ -128,12 +138,12 @@ public function __construct(
         ObjectManagerProvider $objectManagerProvider,
         UninstallCollector $collector,
         ModuleUninstaller $moduleUninstaller,
-        ModuleRegistryUninstaller $moduleRegistryUninstaller
+        ModuleRegistryUninstaller $moduleRegistryUninstaller,
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         parent::__construct($objectManagerProvider);
         $this->composer = $composer;
         $this->deploymentConfig = $deploymentConfig;
-        $this->maintenanceMode = $maintenanceMode;
         $this->fullModuleList = $fullModuleList;
         $this->packageInfo = $this->objectManager->get(\Magento\Framework\Module\PackageInfoFactory::class)->create();
         $this->collector = $collector;
@@ -141,6 +151,21 @@ public function __construct(
         $this->backupRollbackFactory = $this->objectManager->get(\Magento\Framework\Setup\BackupRollbackFactory::class);
         $this->moduleUninstaller = $moduleUninstaller;
         $this->moduleRegistryUninstaller = $moduleRegistryUninstaller;
+        $this->maintenanceModeEnabler =
+            $maintenanceModeEnabler ?: $this->objectManager->get(MaintenanceModeEnabler::class);
+    }
+
+    /**
+     * @return PatchApplier
+     */
+    private function getPatchApplier()
+    {
+        if (!$this->patchApplier) {
+            $this->patchApplier = $this
+                ->objectManager->get(PatchApplier::class);
+        }
+
+        return $this->patchApplier;
     }
 
     /**
@@ -173,6 +198,12 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Take complete database backup'
             ),
+            new InputOption(
+                self::INPUT_KEY_NON_COMPOSER_MODULE,
+                null,
+                InputOption::VALUE_NONE,
+                'All modules, that will be past here will be non composer based'
+            )
         ];
         $this->setName('module:uninstall')
             ->setDescription('Uninstalls modules installed by composer')
@@ -191,6 +222,7 @@ protected function isModuleRequired()
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -199,16 +231,25 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 '<error>You cannot run this command because the Magento application is not installed.</error>'
             );
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
 
         $modules = $input->getArgument(self::INPUT_KEY_MODULES);
+
+        if ($input->getOption(self::INPUT_KEY_NON_COMPOSER_MODULE)) {
+            foreach ($modules as $moduleName) {
+                $this->getPatchApplier()->revertDataPatches($moduleName);
+            }
+
+            return Cli::RETURN_SUCCESS;
+        }
+
         // validate modules input
         $messages = $this->validate($modules);
         if (!empty($messages)) {
             $output->writeln($messages);
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
 
         // check dependencies
@@ -216,7 +257,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!empty($dependencyMessages)) {
             $output->writeln($dependencyMessages);
             // we must have an exit code higher than zero to indicate something was wrong
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
 
         $helper = $this->getHelper('question');
@@ -225,43 +266,50 @@ protected function execute(InputInterface $input, OutputInterface $output)
             false
         );
         if (!$helper->ask($input, $output, $question) && $input->isInteractive()) {
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
-        try {
-            $output->writeln('<info>Enabling maintenance mode</info>');
-            $this->maintenanceMode->set(true);
-            $this->takeBackup($input, $output);
-            $dbBackupOption = $input->getOption(self::INPUT_KEY_BACKUP_DB);
-            if ($input->getOption(self::INPUT_KEY_REMOVE_DATA)) {
-                $this->removeData($modules, $output, $dbBackupOption);
-            } else {
-                if (!empty($this->collector->collectUninstall())) {
-                    $question = new ConfirmationQuestion(
-                        'You are about to remove a module(s) that might have database data. '
-                        . 'Do you want to remove the data from database?[y/N]',
-                        false
-                    );
-                    if ($helper->ask($input, $output, $question) || !$input->isInteractive()) {
+
+        $result = $this->maintenanceModeEnabler->executeInMaintenanceMode(
+            function () use ($input, $output, $modules, $helper) {
+                try {
+                    $this->takeBackup($input, $output);
+                    $dbBackupOption = $input->getOption(self::INPUT_KEY_BACKUP_DB);
+                    if ($input->getOption(self::INPUT_KEY_REMOVE_DATA)) {
                         $this->removeData($modules, $output, $dbBackupOption);
+                    } else {
+                        if (!empty($this->collector->collectUninstall())) {
+                            $question = new ConfirmationQuestion(
+                                'You are about to remove a module(s) that might have database data. '
+                                . 'Do you want to remove the data from database?[y/N]',
+                                false
+                            );
+                            if ($helper->ask($input, $output, $question) || !$input->isInteractive()) {
+                                $this->removeData($modules, $output, $dbBackupOption);
+                            }
+                        } else {
+                            $output->writeln(
+                                '<info>You are about to remove a module(s) that might have database data. '
+                                . 'Remove the database data manually after uninstalling, if desired.</info>'
+                            );
+                        }
                     }
-                } else {
-                    $output->writeln(
-                        '<info>You are about to remove a module(s) that might have database data. '
-                        . 'Remove the database data manually after uninstalling, if desired.</info>'
-                    );
+                    $this->moduleRegistryUninstaller->removeModulesFromDb($output, $modules);
+                    $this->moduleRegistryUninstaller->removeModulesFromDeploymentConfig($output, $modules);
+                    $this->moduleUninstaller->uninstallCode($output, $modules);
+                    $this->cleanup($input, $output);
+
+                    return Cli::RETURN_SUCCESS;
+                } catch (\Exception $e) {
+                    $output->writeln('<error>' . $e->getMessage() . '</error>');
+                    $output->writeln('<error>Please disable maintenance mode after you resolved above issues</error>');
+                    return Cli::RETURN_FAILURE;
                 }
-            }
-            $this->moduleRegistryUninstaller->removeModulesFromDb($output, $modules);
-            $this->moduleRegistryUninstaller->removeModulesFromDeploymentConfig($output, $modules);
-            $this->moduleUninstaller->uninstallCode($output, $modules);
-            $this->cleanup($input, $output);
-            $output->writeln('<info>Disabling maintenance mode</info>');
-            $this->maintenanceMode->set(false);
-        } catch (\Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $output->writeln('<error>Please disable maintenance mode after you resolved above issues</error>');
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-        }
+            },
+            $output,
+            true
+        );
+
+        return $result;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
index 26f0890ad49de..a9138b9faefa1 100644
--- a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\Backup\Factory;
@@ -37,11 +38,6 @@ class RollbackCommand extends AbstractSetupCommand
      */
     private $objectManager;
 
-    /**
-     * @var MaintenanceMode
-     */
-    private $maintenanceMode;
-
     /**
      * @var BackupRollbackFactory
      */
@@ -54,22 +50,32 @@ class RollbackCommand extends AbstractSetupCommand
      */
     private $deploymentConfig;
 
+    /**
+     * @var MaintenanceModeEnabler
+     */
+    private $maintenanceModeEnabler;
+
     /**
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
-     * @param MaintenanceMode $maintenanceMode
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param DeploymentConfig $deploymentConfig
+     * @param MaintenanceModeEnabler $maintenanceModeEnabler
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
         MaintenanceMode $maintenanceMode,
-        DeploymentConfig $deploymentConfig
+        DeploymentConfig $deploymentConfig,
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         $this->objectManager = $objectManagerProvider->get();
-        $this->maintenanceMode = $maintenanceMode;
         $this->backupRollbackFactory = $this->objectManager->get(\Magento\Framework\Setup\BackupRollbackFactory::class);
         $this->deploymentConfig = $deploymentConfig;
+        $this->maintenanceModeEnabler =
+            $maintenanceModeEnabler ?: $this->objectManager->get(MaintenanceModeEnabler::class);
         parent::__construct();
     }
 
@@ -110,39 +116,42 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         if (!$this->deploymentConfig->isAvailable() && ($input->getOption(self::INPUT_KEY_MEDIA_BACKUP_FILE)
-                || $input->getOption(self::INPUT_KEY_DB_BACKUP_FILE))) {
+                || $input->getOption(self::INPUT_KEY_DB_BACKUP_FILE))
+        ) {
             $output->writeln("<info>No information is available: the Magento application is not installed.</info>");
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
-        $returnValue = \Magento\Framework\Console\Cli::RETURN_SUCCESS;
-        try {
-            $output->writeln('<info>Enabling maintenance mode</info>');
-            $this->maintenanceMode->set(true);
-            $helper = $this->getHelper('question');
-            $question = new ConfirmationQuestion(
-                '<info>You are about to remove current code and/or database tables. Are you sure?[y/N]<info>',
-                false
-            );
-            if (!$helper->ask($input, $output, $question) && $input->isInteractive()) {
-                return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-            }
-            $questionKeep = new ConfirmationQuestion(
-                '<info>Do you want to keep the backups?[y/N]<info>',
-                false
-            );
-            $keepSourceFile = $helper->ask($input, $output, $questionKeep);
+        $returnValue = $this->maintenanceModeEnabler->executeInMaintenanceMode(
+            function () use ($input, $output, &$returnValue) {
+                try {
+                    $helper = $this->getHelper('question');
+                    $question = new ConfirmationQuestion(
+                        '<info>You are about to remove current code and/or database tables. Are you sure?[y/N]<info>',
+                        false
+                    );
+                    if (!$helper->ask($input, $output, $question) && $input->isInteractive()) {
+                        return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+                    }
+                    $questionKeep = new ConfirmationQuestion(
+                        '<info>Do you want to keep the backups?[y/N]<info>',
+                        false
+                    );
+                    $keepSourceFile = $helper->ask($input, $output, $questionKeep);
 
-            $this->doRollback($input, $output, $keepSourceFile);
-            $output->writeln('<info>Please set file permission of bin/magento to executable</info>');
-        } catch (\Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-            // we must have an exit code higher than zero to indicate something was wrong
-            $returnValue = \Magento\Framework\Console\Cli::RETURN_FAILURE;
-        } finally {
-            $output->writeln('<info>Disabling maintenance mode</info>');
-            $this->maintenanceMode->set(false);
-        }
+                    $this->doRollback($input, $output, $keepSourceFile);
+                    $output->writeln('<info>Please set file permission of bin/magento to executable</info>');
+
+                    return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+                } catch (\Exception $e) {
+                    $output->writeln('<error>' . $e->getMessage() . '</error>');
+                    // we must have an exit code higher than zero to indicate something was wrong
+                    return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+                }
+            },
+            $output,
+            false
+        );
         return $returnValue;
     }
 
diff --git a/setup/src/Magento/Setup/Console/Command/UninstallCommand.php b/setup/src/Magento/Setup/Console/Command/UninstallCommand.php
index f321117422adf..0163ef3846c83 100644
--- a/setup/src/Magento/Setup/Console/Command/UninstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UninstallCommand.php
@@ -50,5 +50,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->uninstall();
         }
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index e2d032da9b196..2df8cde086553 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -10,6 +10,8 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Setup\ConsoleLogger;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
 use Magento\Setup\Model\InstallerFactory;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
@@ -17,17 +19,18 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command for updating installed application after the code base has changed
+ * Command for updating installed application after the code base has changed.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UpgradeCommand extends AbstractSetupCommand
 {
     /**
-     * Option to skip deletion of generated/code directory
+     * Option to skip deletion of generated/code directory.
      */
     const INPUT_KEY_KEEP_GENERATED = 'keep-generated';
 
     /**
-     * Installer service factory
+     * Installer service factory.
      *
      * @var InstallerFactory
      */
@@ -44,10 +47,9 @@ class UpgradeCommand extends AbstractSetupCommand
     private $appState;
 
     /**
-     * Constructor
-     *
      * @param InstallerFactory $installerFactory
      * @param DeploymentConfig $deploymentConfig
+     * @param AppState|null $appState
      */
     public function __construct(
         InstallerFactory $installerFactory,
@@ -73,6 +75,32 @@ protected function configure()
                 'Prevents generated files from being deleted. ' . PHP_EOL .
                 'We discourage using this option except when deploying to production. ' . PHP_EOL .
                 'Consult your system integrator or administrator for more information.'
+            ),
+            new InputOption(
+                InstallCommand::CONVERT_OLD_SCRIPTS_KEY,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Allows to convert old scripts (InstallSchema, UpgradeSchema) to db_schema.xml format',
+                false
+            ),
+            new InputOption(
+                OperationsExecutor::KEY_SAFE_MODE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Safe installation of Magento with dumps on destructive operations, like column removal'
+            ),
+            new InputOption(
+                OperationsExecutor::KEY_DATA_RESTORE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Restore removed data from dumps'
+            ),
+            new InputOption(
+                DryRunLogger::INPUT_KEY_DRY_RUN_MODE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Magento Installation will be run in dry-run mode',
+                false
             )
         ];
         $this->setName('setup:upgrade')
@@ -87,11 +115,12 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
+            $request = $input->getOptions();
             $keepGenerated = $input->getOption(self::INPUT_KEY_KEEP_GENERATED);
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->updateModulesSequence($keepGenerated);
-            $installer->installSchema();
-            $installer->installDataFixtures();
+            $installer->installSchema($request);
+            $installer->installDataFixtures($request);
 
             if ($this->deploymentConfig->isAvailable()) {
                 $importConfigCommand = $this->getApplication()->find(ConfigImportCommand::COMMAND_NAME);
diff --git a/setup/src/Magento/Setup/Console/CommandList.php b/setup/src/Magento/Setup/Console/CommandList.php
index 39f383806c6c4..08befdca2221d 100644
--- a/setup/src/Magento/Setup/Console/CommandList.php
+++ b/setup/src/Magento/Setup/Console/CommandList.php
@@ -6,10 +6,11 @@
 
 namespace Magento\Setup\Console;
 
+use Magento\Setup\Console\Command\TablesWhitelistGenerateCommand;
 use Zend\ServiceManager\ServiceManager;
 
 /**
- * Class CommandList contains predefined list of commands for Setup
+ * Class CommandList contains predefined list of commands for Setup.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -72,12 +73,12 @@ protected function getCommandsClasses()
             \Magento\Setup\Console\Command\RollbackCommand::class,
             \Magento\Setup\Console\Command\UpgradeCommand::class,
             \Magento\Setup\Console\Command\UninstallCommand::class,
-            \Magento\Setup\Console\Command\DeployStaticContentCommand::class,
+            \Magento\Setup\Console\Command\DeployStaticContentCommand::class
         ];
     }
 
     /**
-     * Gets list of command instances
+     * Gets list of command instances.
      *
      * @return \Symfony\Component\Console\Command\Command[]
      * @throws \Exception
diff --git a/setup/src/Magento/Setup/Console/CompilerPreparation.php b/setup/src/Magento/Setup/Console/CompilerPreparation.php
index 9ea938d51fb37..c39c721b61716 100644
--- a/setup/src/Magento/Setup/Console/CompilerPreparation.php
+++ b/setup/src/Magento/Setup/Console/CompilerPreparation.php
@@ -105,7 +105,6 @@ private function getCompilerInvalidationCommands()
             'module:disable',
             'module:enable',
             'module:uninstall',
-            'deploy:mode:set'
         ];
     }
 
diff --git a/setup/src/Magento/Setup/Console/InputValidationException.php b/setup/src/Magento/Setup/Console/InputValidationException.php
new file mode 100755
index 0000000000000..efa8a03bcfe49
--- /dev/null
+++ b/setup/src/Magento/Setup/Console/InputValidationException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Console;
+
+use Symfony\Component\Console\Exception\RuntimeException;
+
+class InputValidationException extends RuntimeException
+{
+
+}
diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
new file mode 100755
index 0000000000000..cd2d4a77db65a
--- /dev/null
+++ b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
@@ -0,0 +1,606 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Console\Style;
+
+use Magento\Setup\Console\InputValidationException;
+use Symfony\Component\Console\Exception\RuntimeException;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Style\OutputStyle;
+use Symfony\Component\Console\Terminal;
+
+/**
+ * Magento console output decorator.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MagentoStyle extends OutputStyle implements MagentoStyleInterface
+{
+    /**
+     * Default console line max length(use for limitation in case terminal width greater than 120 characters).
+     */
+    const MAX_LINE_LENGTH = 120;
+
+    /**
+     * Console input provider.
+     *
+     * @var InputInterface
+     */
+    private $input;
+
+    /**
+     * Style Guide compliant question helper.
+     *
+     * @var SymfonyQuestionHelper
+     */
+    private $questionHelper;
+
+    /**
+     * Progress output provider.
+     *
+     * @var ProgressBar
+     */
+    private $progressBar;
+
+    /**
+     * Calculated output line length.
+     *
+     * @var int
+     */
+    private $lineLength;
+
+    /**
+     * Console output buffer provider.
+     *
+     * @var BufferedOutput
+     */
+    private $bufferedOutput;
+
+    /**
+     * MagentoStyle constructor.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function __construct(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->bufferedOutput = new BufferedOutput($output->getVerbosity(), false, clone $output->getFormatter());
+        // Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
+        $currentLength = $this->getTerminalWidth() - (int)(DIRECTORY_SEPARATOR === '\\');
+        $this->lineLength = min($currentLength, self::MAX_LINE_LENGTH);
+        parent::__construct($output);
+    }
+
+    /**
+     * Formats a message as a block of text.
+     *
+     * @param string|array $messages The message to write in the block
+     * @param string|null $type The block type (added in [] on first line)
+     * @param string|null $style The style to apply to the whole block
+     * @param string $prefix The prefix for the block
+     * @param bool $padding Whether to add vertical padding
+     * @return void
+     */
+    public function block(
+        $messages,
+        string $type = null,
+        string $style = null,
+        string $prefix = ' ',
+        bool $padding = false
+    ) {
+        $messages = is_array($messages) ? array_values($messages) : [$messages];
+        $this->autoPrependBlock();
+        $this->writeln($this->createBlock($messages, $type, $style, $prefix, $padding));
+        $this->newLine();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function title($message)
+    {
+        $this->autoPrependBlock();
+        $bar = str_repeat('=', Helper::strlenWithoutDecoration($this->getFormatter(), $message));
+        $this->writeln([
+            sprintf(' <options=bold>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
+            sprintf(' <options=bold>%s</>', $bar),
+        ]);
+        $this->newLine();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function section($message)
+    {
+        $this->autoPrependBlock();
+        $bar = str_repeat('-', Helper::strlenWithoutDecoration($this->getFormatter(), $message));
+        $this->writeln([
+            sprintf(' <fg=white>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
+            sprintf(' <fg=white>%s</>', $bar),
+        ]);
+        $this->newLine();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function listing(array $elements)
+    {
+        $this->autoPrependText();
+        $elements = array_map(function ($element) {
+            return sprintf(' * %s', $element);
+        }, $elements);
+
+        $this->writeln($elements);
+        $this->newLine();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function text($message)
+    {
+        $this->autoPrependText();
+        $messages = is_array($message) ? array_values($message) : [$message];
+        foreach ($messages as $singleMessage) {
+            $this->writeln(sprintf(' %s', $singleMessage));
+        }
+    }
+
+    /**
+     * Formats a command comment.
+     *
+     * @param string|array $message
+     * @param bool $padding
+     * @return void
+     */
+    public function comment($message, $padding = false)
+    {
+        $this->block($message, null, 'comment', ' ', $padding);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function success($message, $padding = true)
+    {
+        $this->block($message, 'SUCCESS', 'fg=black;bg=green', ' ', $padding);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function error($message, $padding = true)
+    {
+        $this->block($message, 'ERROR', 'fg=white;bg=red', ' ', $padding);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function warning($message, $padding = true)
+    {
+        $this->block($message, 'WARNING', 'fg=black;bg=yellow', ' ', $padding);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function note($message, $padding = false)
+    {
+        $this->block($message, 'NOTE', 'fg=yellow', ' ', $padding);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function caution($message, $padding = true)
+    {
+        $this->block($message, 'CAUTION', 'fg=black;bg=yellow', ' ! ', $padding);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function table(array $headers, array $rows)
+    {
+        $style = clone Table::getStyleDefinition('symfony-style-guide');
+        $style->setCellHeaderFormat('<info>%s</info>');
+
+        $table = new Table($this);
+        $table->setHeaders($headers);
+        $table->setRows($rows);
+        $table->setStyle($style);
+
+        $table->render();
+        $this->newLine();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \Symfony\Component\Console\Exception\InvalidArgumentException
+     */
+    public function ask($question, $default = null, $validator = null, $maxAttempts = null)
+    {
+        $question = new Question($question, $default);
+        $question->setValidator($validator);
+        $question->setMaxAttempts($maxAttempts);
+
+        return $this->askQuestion($question);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \Symfony\Component\Console\Exception\LogicException
+     */
+    public function askHidden($question, $validator = null)
+    {
+        $question = new Question($question);
+
+        $question->setHidden(true);
+        $question->setValidator($validator);
+
+        return $this->askQuestion($question);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function confirm($question, $default = true)
+    {
+        return $this->askQuestion(new ConfirmationQuestion($question, $default));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function choice($question, array $choices, $default = null)
+    {
+        if (null !== $default) {
+            $values = array_flip($choices);
+            $default = $values[$default];
+        }
+
+        return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function progressStart($max = 0)
+    {
+        $this->progressBar = $this->createProgressBar($max);
+        $this->progressBar->start();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \Symfony\Component\Console\Exception\LogicException
+     * @throws \Symfony\Component\Console\Exception\RuntimeException
+     */
+    public function progressAdvance($step = 1)
+    {
+        $this->getProgressBar()->advance($step);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \Symfony\Component\Console\Exception\RuntimeException
+     */
+    public function progressFinish()
+    {
+        $this->getProgressBar()->finish();
+        $this->newLine(2);
+        $this->progressBar = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createProgressBar($max = 0)
+    {
+        $progressBar = parent::createProgressBar($max);
+        $progressBar->setEmptyBarCharacter(' ');
+        $progressBar->setProgressCharacter('>');
+        $progressBar->setBarCharacter('=');
+
+        return $progressBar;
+    }
+
+    /**
+     * Ask user question.
+     *
+     * @param Question $question
+     *
+     * @return string
+     */
+    public function askQuestion(Question $question)
+    {
+        if ($this->input->isInteractive()) {
+            $this->autoPrependBlock();
+        }
+
+        if (!$this->questionHelper) {
+            $this->questionHelper = new SymfonyQuestionHelper();
+        }
+
+        $answer = $this->questionHelper->ask($this->input, $this, $question);
+
+        if ($this->input->isInteractive()) {
+            $this->newLine();
+            $this->bufferedOutput->write(PHP_EOL);
+        }
+
+        return $answer;
+    }
+
+    /**
+     * Ask for an missing argument.
+     *
+     * @param string $argument
+     * @param string $question
+     * @param string|null $default
+     * @param callable|null $validator
+     * @param int|null $maxAttempts
+     * @param bool $comment
+     * @param string $commentFormat
+     * @throws \Symfony\Component\Console\Exception\InvalidArgumentException
+     */
+    public function askForMissingArgument(
+        string $argument,
+        string $question,
+        string $default = null,
+        callable $validator = null,
+        int $maxAttempts = null,
+        bool $comment = null,
+        string $commentFormat = 'Argument [%s] set to: %s'
+    ) {
+        try {
+            if ($this->input->getArgument($argument) === null) {
+                $this->input->setArgument($argument, $this->ask($question, $default, $validator, $maxAttempts));
+            }
+            $argumentValue = $this->input->getArgument($argument);
+            $validated = (is_callable($validator) ? $validator($argumentValue) : $argumentValue);
+            if ((bool)($comment ?? $this->isDebug())) {
+                $this->comment(sprintf($commentFormat, $argument, $validated));
+            }
+        } catch (InputValidationException $e) {
+            $this->error('Validation Error: ' . $e->getMessage());
+            $this->askForMissingArgument(
+                $argument,
+                $question,
+                $default,
+                $validator,
+                $maxAttempts,
+                $comment,
+                $commentFormat
+            );
+        }
+    }
+
+    /**
+     * Ask for an missing option.
+     *
+     * @param string $option
+     * @param string $question
+     * @param string|null $default
+     * @param callable|null $validator
+     * @param int|null $maxAttempts
+     * @param bool $comment
+     * @param string $commentFormat
+     * @throws \Symfony\Component\Console\Exception\InvalidArgumentException
+     */
+    public function askForMissingOption(
+        string $option,
+        string $question,
+        string $default = null,
+        callable $validator = null,
+        int $maxAttempts = null,
+        bool $comment = null,
+        string $commentFormat = 'Option [%s] set to: %s'
+    ) {
+        try {
+            if (null === $this->input->getOption($option)) {
+                $this->input->setOption($option, $this->ask($question, $default, $validator, $maxAttempts));
+            }
+            $optionValue = $this->input->getOption($option);
+            $validated = (is_callable($validator) ? $validator($optionValue) : $optionValue);
+            if ((bool)($comment ?? $this->isDebug())) {
+                $this->comment(sprintf($commentFormat, $option, $validated));
+            }
+        } catch (InputValidationException $e) {
+            $this->error('Validation Error: ' . $e->getMessage());
+            $this->askForMissingOption(
+                $option,
+                $question,
+                $default,
+                $validator,
+                $maxAttempts,
+                $comment,
+                $commentFormat
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeln($messages, $type = self::OUTPUT_NORMAL)
+    {
+        parent::writeln($messages, $type);
+        $this->bufferedOutput->writeln($this->reduceBuffer($messages), $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
+    {
+        parent::write($messages, $newline, $type);
+        $this->bufferedOutput->write($this->reduceBuffer($messages), $newline, $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function newLine($count = 1)
+    {
+        parent::newLine($count);
+        $this->bufferedOutput->write(str_repeat(PHP_EOL, $count));
+    }
+
+    /**
+     * Get progress bar instance.
+     *
+     * @return ProgressBar
+     * @throws RuntimeException in case progress bar hasn't been instantiated yet.
+     */
+    private function getProgressBar()
+    {
+        if (!$this->progressBar) {
+            throw new RuntimeException('The ProgressBar is not started.');
+        }
+
+        return $this->progressBar;
+    }
+
+    /**
+     * @return int
+     */
+    private function getTerminalWidth()
+    {
+        $terminal = new Terminal();
+        $width = $terminal->getWidth();
+
+        return $width ?: self::MAX_LINE_LENGTH;
+    }
+
+    /**
+     * Add empty line before output element in case there were no empty lines before.
+     *
+     * @return void
+     */
+    private function autoPrependBlock()
+    {
+        $chars = substr($this->bufferedOutput->fetch(), -2);
+        if (!isset($chars[0])) {
+            $this->newLine(); //empty history, so we should start with a new line.
+        }
+        //Prepend new line for each non LF chars (This means no blank line was output before)
+        $this->newLine(2 - substr_count($chars, PHP_EOL));
+    }
+
+    /**
+     * Add empty line before text(listing) output element.
+     *
+     * @return void
+     */
+    private function autoPrependText()
+    {
+        $fetched = $this->bufferedOutput->fetch();
+        //Prepend new line if last char isn't EOL:
+        if (PHP_EOL !== substr($fetched, -1)) {
+            $this->newLine();
+        }
+    }
+
+    /**
+     * @param array $messages
+     * @return array
+     */
+    private function reduceBuffer($messages)
+    {
+        // We need to know if the two last chars are PHP_EOL
+        // Preserve the last 4 chars inserted (PHP_EOL on windows is two chars) in the history buffer
+        return array_map(function ($value) {
+            return substr($value, -4);
+        }, array_merge([$this->bufferedOutput->fetch()], (array)$messages));
+    }
+
+    /**
+     * Build output in block style.
+     *
+     * @param array $messages
+     * @param string|null $type
+     * @param string|null $style
+     * @param string $prefix
+     * @param bool $padding
+     * @return array
+     */
+    private function createBlock(
+        array $messages,
+        string $type = null,
+        string $style = null,
+        string $prefix = ' ',
+        bool $padding = false
+    ) {
+        $indentLength = 0;
+        $prefixLength = Helper::strlenWithoutDecoration($this->getFormatter(), $prefix);
+        if (null !== $type) {
+            $type = sprintf('[%s] ', $type);
+            $indentLength = strlen($type);
+            $lineIndentation = str_repeat(' ', $indentLength);
+        }
+        $lines = $this->getBlockLines($messages, $prefixLength, $indentLength);
+        $firstLineIndex = 0;
+        if ($padding && $this->isDecorated()) {
+            $firstLineIndex = 1;
+            array_unshift($lines, '');
+            $lines[] = '';
+        }
+        foreach ($lines as $i => &$line) {
+            if (null !== $type) {
+                $line = $firstLineIndex === $i ? $type . $line : $lineIndentation . $line;
+            }
+            $line = $prefix . $line;
+            $multiplier = $this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line);
+            $line .= str_repeat(' ', $multiplier);
+            if ($style) {
+                $line = sprintf('<%s>%s</>', $style, $line);
+            }
+        }
+
+        return $lines;
+    }
+
+    /**
+     * Wrap and add new lines for each element.
+     *
+     * @param array $messages
+     * @param int $prefixLength
+     * @param int $indentLength
+     * @return array
+     */
+    private function getBlockLines(
+        array $messages,
+        int $prefixLength,
+        int $indentLength
+    ) {
+        $lines = [[]];
+        foreach ($messages as $key => $message) {
+            $message = OutputFormatter::escape($message);
+            $wordwrap = wordwrap($message, $this->lineLength - $prefixLength - $indentLength, PHP_EOL, true);
+            $lines[] = explode(PHP_EOL, $wordwrap);
+            if (count($messages) > 1 && $key < count($messages) - 1) {
+                $lines[][] = '';
+            }
+        }
+        $lines = array_merge(...$lines);
+
+        return $lines;
+    }
+}
diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyleInterface.php b/setup/src/Magento/Setup/Console/Style/MagentoStyleInterface.php
new file mode 100755
index 0000000000000..a7aba31549699
--- /dev/null
+++ b/setup/src/Magento/Setup/Console/Style/MagentoStyleInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Console\Style;
+
+use Symfony\Component\Console\Style\StyleInterface;
+
+/**
+ * Interface for output decorator.
+ */
+interface MagentoStyleInterface extends StyleInterface
+{
+
+}
diff --git a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
index 420149c79e29a..00c60a2a8a6a5 100644
--- a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
@@ -552,7 +552,7 @@ private function getConfigurableProductConfig()
 
         if (count($skuPull) !== count(array_unique($skuPull))) {
             throw new ValidatorException(
-                __('Sku pattern for configurable product must be unique per attribute set')
+                __("The configurable product's SKU pattern must be unique in an attribute set.")
             );
         }
 
@@ -591,7 +591,9 @@ private function prepareConfigurableConfig($defaultAttributeSets)
                 }
             }
         } else {
-            throw new ValidatorException(__('Configurable product config is invalid'));
+            throw new ValidatorException(
+                __('The configurable product config is invalid. Verify the product and try again.')
+            );
         }
 
         return $configurableConfigs;
@@ -720,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;
     }
@@ -843,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)
                     )
                 );
@@ -856,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/Fixtures/FixtureModel.php b/setup/src/Magento/Setup/Fixtures/FixtureModel.php
index 104c9cb343216..99237e48748fb 100644
--- a/setup/src/Magento/Setup/Fixtures/FixtureModel.php
+++ b/setup/src/Magento/Setup/Fixtures/FixtureModel.php
@@ -105,7 +105,7 @@ public function reindex(OutputInterface $output)
      */
     public function loadFixtures()
     {
-        $files = glob(__DIR__ . DIRECTORY_SEPARATOR . self::FIXTURE_PATTERN);
+        $files = glob(__DIR__ . DIRECTORY_SEPARATOR . self::FIXTURE_PATTERN, GLOB_NOSORT);
 
         foreach ($files as $file) {
             $file = basename($file, '.php');
diff --git a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
index 0d8cb7493ff84..1878a48977156 100644
--- a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
@@ -184,13 +184,13 @@ public function printInfo(OutputInterface $output)
 
         if (!isset($config['images-count'])) {
             throw new ValidatorException(
-                __('Please, specify amount of images to generate')
+                __("The amount of images to generate wasn't specified. Enter the amount and try again.")
             );
         }
 
         if (!isset($config['images-per-product'])) {
             throw new ValidatorException(
-                __('Please, specify amount of images per product')
+                __("The amount of images per product wasn't specified. Enter the amount and try again.")
             );
         }
 
@@ -417,7 +417,7 @@ private function getImagesToGenerate()
     {
         $config = $this->fixtureModel->getValue('product-images', []);
 
-        return isset($config['images-count']) ? $config['images-count'] : null;
+        return $config['images-count'] ?? null;
     }
 
     /**
@@ -429,7 +429,7 @@ private function getImagesPerProduct()
     {
         $config = $this->fixtureModel->getValue('product-images', []);
 
-        return isset($config['images-per-product']) ? $config['images-per-product'] : null;
+        return $config['images-per-product'] ?? null;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
index 74ff84189f557..9fbec3b3741b2 100644
--- a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
@@ -14,7 +14,7 @@
  * Optionally generates inactive quotes for generated orders.
  *
  * Support the following format:
- * <!-- Is is nescessary to enable quotes for orders -->
+ * <!-- It is necessary to enable quotes for orders -->
  * <order_quotes_enable>{bool}</order_quotes_enable>
  *
  * <!-- Min number of simple products per each order -->
@@ -232,6 +232,12 @@ public function execute()
             return;
         }
 
+        $ruleId = $this->getMaxEntityId(
+            'salesrule',
+            \Magento\SalesRule\Model\ResourceModel\Rule::class,
+            'rule_id'
+        );
+
         $maxItemId = $this->getMaxEntityId(
             'sales_order_item',
             \Magento\Sales\Model\ResourceModel\Order\Item::class,
@@ -330,6 +336,7 @@ public function execute()
                 '%productStoreId%' => $productStoreId($entityId),
                 '%productStoreName%' => $productStoreName($entityId),
                 '%entityId%' => $entityId,
+                '%ruleId%' => $ruleId,
             ];
             $shippingAddress = ['%orderAddressId%' => $entityId * 2 - 1, '%addressType%' => 'shipping'];
             $billingAddress = ['%orderAddressId%' => $entityId * 2, '%addressType%' => 'billing'];
diff --git a/setup/src/Magento/Setup/Fixtures/StoresFixture.php b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
index fb8679b5c879a..17b83e627ab9c 100644
--- a/setup/src/Magento/Setup/Fixtures/StoresFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
@@ -211,9 +211,6 @@ public function execute()
         $this->generateWebsites();
         $this->generateStoreGroups();
         $this->generateStoreViews();
-
-        //clean cache
-        $this->storeManager->reinitStores();
     }
 
     /**
@@ -305,7 +302,6 @@ private function generateStoreViews()
                     'code' => $storeCode
                 ]
             )->save();
-            $this->eventManager->dispatch('store_add', ['store' => $store]);
 
             $this->saveStoreLocale($store->getId(), $localesList[$existedStoreViewsCount % $localesListCount]);
         }
diff --git a/setup/src/Magento/Setup/Fixtures/_files/orders_fixture_data.json b/setup/src/Magento/Setup/Fixtures/_files/orders_fixture_data.json
index 864ad45533afe..d323246cf6d34 100644
--- a/setup/src/Magento/Setup/Fixtures/_files/orders_fixture_data.json
+++ b/setup/src/Magento/Setup/Fixtures/_files/orders_fixture_data.json
@@ -102,7 +102,7 @@
     "weight": 2.0000,
     "customer_dob": "NULL",
     "increment_id": "'%orderNumber%'",
-    "applied_rule_ids": 1,
+    "applied_rule_ids": "%ruleId%",
     "base_currency_code": "'USD'",
     "customer_email": "'%email%'",
     "customer_firstname": "NULL",
@@ -208,7 +208,7 @@
     "sku": "'%sku%'",
     "name": "'%name%'",
     "description": "NULL",
-    "applied_rule_ids": "'1'",
+    "applied_rule_ids": "'%ruleId%'",
     "additional_data": "NULL",
     "is_qty_decimal": "'0'",
     "no_discount": "'0'",
@@ -374,7 +374,7 @@
     "customer_note_notify": 1,
     "customer_is_guest": 1,
     "remote_ip": "'127.0.0.1'",
-    "applied_rule_ids": "'1'",
+    "applied_rule_ids": "'%ruleId%'",
     "reserved_order_id": "NULL",
     "password_hash": "NULL",
     "coupon_code": "NULL",
@@ -512,7 +512,7 @@
     "sku": "'%sku%'",
     "name": "'%name%'",
     "description": "NULL",
-    "applied_rule_ids": "'1'",
+    "applied_rule_ids": "'%ruleId%'",
     "additional_data": "NULL",
     "is_qty_decimal": "0",
     "no_discount": "0",
diff --git a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
index 2d450a4374c5e..1bbd152f2ba4e 100644
--- a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
+++ b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
@@ -18,7 +18,7 @@ class AddressDataGenerator
     public function generateAddress()
     {
         return [
-            'postcode' => mt_rand(10000, 99999)
+            'postcode' => random_int(10000, 99999)
         ];
     }
 }
diff --git a/setup/src/Magento/Setup/Model/AdminAccount.php b/setup/src/Magento/Setup/Model/AdminAccount.php
index 0fe08794f6a2a..87b113a2c4b34 100644
--- a/setup/src/Magento/Setup/Model/AdminAccount.php
+++ b/setup/src/Magento/Setup/Model/AdminAccount.php
@@ -165,7 +165,7 @@ public function validateUserMatches()
     {
         if (empty($this->data[self::KEY_PASSWORD])) {
             throw new \Exception(
-                'Password is a required field.'
+                '"Password" is required. Enter and try again.'
             );
         }
 
diff --git a/setup/src/Magento/Setup/Model/ConfigGenerator.php b/setup/src/Magento/Setup/Model/ConfigGenerator.php
index 00ed16db74d8a..7e5b0c162a393 100644
--- a/setup/src/Magento/Setup/Model/ConfigGenerator.php
+++ b/setup/src/Magento/Setup/Model/ConfigGenerator.php
@@ -6,13 +6,14 @@
 
 namespace Magento\Setup\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\Data\ConfigDataFactory;
 use Magento\Framework\Config\File\ConfigFilePool;
-use Magento\Framework\Math\Random;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\State;
-use Magento\Framework\App\ObjectManagerFactory;
+use Magento\Framework\Math\Random;
 
 /**
  * Creates deployment config data based on user input array
@@ -26,39 +27,58 @@ class ConfigGenerator
      * @var array
      */
     private static $paramMap = [
-        ConfigOptionsListConstants::INPUT_KEY_DB_HOST => ConfigOptionsListConstants::KEY_HOST,
-        ConfigOptionsListConstants::INPUT_KEY_DB_NAME => ConfigOptionsListConstants::KEY_NAME,
-        ConfigOptionsListConstants::INPUT_KEY_DB_USER => ConfigOptionsListConstants::KEY_USER,
-        ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => ConfigOptionsListConstants::KEY_PASSWORD,
-        ConfigOptionsListConstants::INPUT_KEY_DB_PREFIX => ConfigOptionsListConstants::KEY_PREFIX,
-        ConfigOptionsListConstants::INPUT_KEY_DB_MODEL => ConfigOptionsListConstants::KEY_MODEL,
-        ConfigOptionsListConstants::INPUT_KEY_DB_ENGINE => ConfigOptionsListConstants::KEY_ENGINE,
+        ConfigOptionsListConstants::INPUT_KEY_DB_HOST            => ConfigOptionsListConstants::KEY_HOST,
+        ConfigOptionsListConstants::INPUT_KEY_DB_NAME            => ConfigOptionsListConstants::KEY_NAME,
+        ConfigOptionsListConstants::INPUT_KEY_DB_USER            => ConfigOptionsListConstants::KEY_USER,
+        ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD        => ConfigOptionsListConstants::KEY_PASSWORD,
+        ConfigOptionsListConstants::INPUT_KEY_DB_PREFIX          => ConfigOptionsListConstants::KEY_PREFIX,
+        ConfigOptionsListConstants::INPUT_KEY_DB_MODEL           => ConfigOptionsListConstants::KEY_MODEL,
+        ConfigOptionsListConstants::INPUT_KEY_DB_ENGINE          => ConfigOptionsListConstants::KEY_ENGINE,
         ConfigOptionsListConstants::INPUT_KEY_DB_INIT_STATEMENTS => ConfigOptionsListConstants::KEY_INIT_STATEMENTS,
-        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => ConfigOptionsListConstants::KEY_ENCRYPTION_KEY,
-        ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE => ConfigOptionsListConstants::KEY_SAVE,
-        ConfigOptionsListConstants::INPUT_KEY_RESOURCE => ConfigOptionsListConstants::KEY_RESOURCE,
+        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY     => ConfigOptionsListConstants::KEY_ENCRYPTION_KEY,
+        ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE       => ConfigOptionsListConstants::KEY_SAVE,
+        ConfigOptionsListConstants::INPUT_KEY_RESOURCE           => ConfigOptionsListConstants::KEY_RESOURCE,
     ];
 
+    /**
+     * @var DeploymentConfig
+     */
+    protected $deploymentConfig;
+
     /**
      * @var Random
+     * @deprecated 100.2.0
      */
     protected $random;
 
     /**
-     * @var DeploymentConfig
+     * @var ConfigDataFactory
      */
-    protected $deploymentConfig;
+    private $configDataFactory;
+
+    /**
+     * @var CryptKeyGeneratorInterface
+     */
+    private $cryptKeyGenerator;
 
     /**
      * Constructor
      *
-     * @param Random $random
+     * @param Random $random Deprecated since 100.2.0
      * @param DeploymentConfig $deploymentConfig
+     * @param ConfigDataFactory|null $configDataFactory
+     * @param CryptKeyGeneratorInterface|null $cryptKeyGenerator
      */
-    public function __construct(Random $random, DeploymentConfig $deploymentConfig)
-    {
+    public function __construct(
+        Random $random,
+        DeploymentConfig $deploymentConfig,
+        ConfigDataFactory $configDataFactory = null,
+        CryptKeyGeneratorInterface $cryptKeyGenerator = null
+    ) {
         $this->random = $random;
         $this->deploymentConfig = $deploymentConfig;
+        $this->configDataFactory = $configDataFactory ?? ObjectManager::getInstance()->get(ConfigDataFactory::class);
+        $this->cryptKeyGenerator = $cryptKeyGenerator ?? ObjectManager::getInstance()->get(CryptKeyGenerator::class);
     }
 
     /**
@@ -70,23 +90,17 @@ public function createCryptConfig(array $data)
     {
         $currentKey = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
 
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
-        if (isset($data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY])) {
-            if ($currentKey !== null) {
-                $key = $currentKey . "\n" . $data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY];
-            } else {
-                $key = $data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY];
-            }
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
-            $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, $key);
-        } else {
-            if ($currentKey === null) {
-                $configData->set(
-                    ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY,
-                    md5($this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE))
-                );
-            }
-        }
+        // Use given key if set, else use current
+        $key = $data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY] ?? $currentKey;
+
+        // If there is no key given or currently set, generate a new one
+        $key = $key ?? $this->cryptKeyGenerator->generate();
+
+        // Chaining of ".. ?? .." is not used to keep it simpler to understand
+
+        $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, $key);
 
         return $configData;
     }
@@ -99,7 +113,7 @@ public function createCryptConfig(array $data)
      */
     public function createSessionConfig(array $data)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         if (isset($data[ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE])) {
             $configData->set(
@@ -132,7 +146,7 @@ public function createDefinitionsConfig(array $data)
      */
     public function createDbConfig(array $data)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         $optional = [
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST,
@@ -151,25 +165,18 @@ public function createDbConfig(array $data)
             );
         }
 
+        $dbConnectionPrefix = ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/';
+
         foreach ($optional as $key) {
             if (isset($data[$key])) {
-                $configData->set(
-                    ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/' . self::$paramMap[$key],
-                    $data[$key]
-                );
+                $configData->set($dbConnectionPrefix . self::$paramMap[$key], $data[$key]);
             }
         }
 
-        $currentStatus = $this->deploymentConfig->get(
-            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/' . ConfigOptionsListConstants::KEY_ACTIVE
-        );
+        $currentStatus = $this->deploymentConfig->get($dbConnectionPrefix . ConfigOptionsListConstants::KEY_ACTIVE);
 
         if ($currentStatus === null) {
-            $configData->set(
-                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT
-                . '/' . ConfigOptionsListConstants::KEY_ACTIVE,
-                '1'
-            );
+            $configData->set($dbConnectionPrefix . ConfigOptionsListConstants::KEY_ACTIVE, '1');
         }
 
         return $configData;
@@ -182,7 +189,7 @@ public function createDbConfig(array $data)
      */
     public function createResourceConfig()
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         if ($this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_RESOURCE_DEFAULT_SETUP) === null) {
             $configData->set(ConfigOptionsListConstants::CONFIG_PATH_RESOURCE_DEFAULT_SETUP, 'default');
@@ -198,10 +205,12 @@ public function createResourceConfig()
      */
     public function createXFrameConfig()
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+
         if ($this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT) === null) {
             $configData->set(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT, 'SAMEORIGIN');
         }
+
         return $configData;
     }
 
@@ -212,10 +221,12 @@ public function createXFrameConfig()
      */
     public function createModeConfig()
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+
         if ($this->deploymentConfig->get(State::PARAM_MODE) === null) {
             $configData->set(State::PARAM_MODE, State::MODE_DEFAULT);
         }
+
         return $configData;
     }
 
@@ -227,21 +238,29 @@ public function createModeConfig()
      */
     public function createCacheHostsConfig(array $data)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+
         if (isset($data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS])) {
-            $hostData = explode(',', $data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS]);
-            $hosts = [];
-            foreach ($hostData as $data) {
-                $dataArray = explode(':', trim($data));
-                $host = [];
-                $host['host'] = $dataArray[0];
-                if (isset($dataArray[1])) {
-                    $host['port'] = $dataArray[1];
-                }
-                $hosts[] = $host;
-            }
+            $hosts = explode(',', $data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS]);
+
+            $hosts = array_map(
+                function ($hostData) {
+                    $hostDataParts = explode(':', trim($hostData));
+
+                    $tmp = ['host' => $hostDataParts[0]];
+
+                    if (isset($hostDataParts[1])) {
+                        $tmp['port'] = $hostDataParts[1];
+                    }
+
+                    return $tmp;
+                },
+                $hosts
+            );
+
             $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS, $hosts);
         }
+
         $configData->setOverrideWhenSave(true);
         return $configData;
     }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
index 1ec9d486a5a22..173064b472217 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
@@ -26,11 +26,15 @@ class Cache implements ConfigOptionsListInterface
     const INPUT_KEY_CACHE_BACKEND_REDIS_SERVER = 'cache-backend-redis-server';
     const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
+    const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
+    const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
 
     const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
     const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
     const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
     const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
+    const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
+    const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
 
     /**
      * @var array
@@ -38,7 +42,8 @@ class Cache implements ConfigOptionsListInterface
     private $defaultConfigValues = [
         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => '0',
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379'
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => ''
     ];
 
     /**
@@ -55,6 +60,7 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_CACHE_BACKEND_SERVER,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_CACHE_BACKEND_PORT,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD
     ];
 
     /**
@@ -73,7 +79,7 @@ public function __construct(RedisConnectionValidator $redisValidator)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOptions()
     {
@@ -102,16 +108,33 @@ public function getOptions()
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_CACHE_BACKEND_PORT,
                 'Redis server listen port'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
+                'Redis server password'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_ID_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_ID_PREFIX,
+                'ID prefix for cache keys'
             )
         ];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        if (isset($options[self::INPUT_KEY_CACHE_ID_PREFIX])) {
+            $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $options[self::INPUT_KEY_CACHE_ID_PREFIX]);
+        } else {
+            $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $this->generateCachePrefix());
+        }
 
         if (isset($options[self::INPUT_KEY_CACHE_BACKEND])) {
             if ($options[self::INPUT_KEY_CACHE_BACKEND] == self::INPUT_VALUE_CACHE_REDIS) {
@@ -131,7 +154,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -190,6 +213,13 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
                 $this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE)
             );
+        
+        $config['password'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD])
+            ? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD]
+            : $deploymentConfig->get(
+                self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
+                $this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD)
+            );
 
         return $this->redisValidator->isValidConnection($config);
     }
@@ -224,4 +254,14 @@ private function getDefaultConfigValue($inputKey)
             return '';
         }
     }
+
+    /**
+     * Generate default cache ID prefix based on installation dir
+     *
+     * @return string
+     */
+    private function generateCachePrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
index be1cc5b010185..7451b59356828 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
@@ -27,12 +27,16 @@ class PageCache implements ConfigOptionsListInterface
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE = 'page-cache-redis-db';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
+    const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
 
     const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE = 'cache/frontend/page_cache/backend_options/database';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
+    const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
+    const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
 
     /**
      * @var array
@@ -41,7 +45,8 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => '1',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => '6379',
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0'
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => ''
     ];
 
     /**
@@ -58,7 +63,8 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD
     ];
 
     /**
@@ -77,7 +83,7 @@ public function __construct(RedisConnectionValidator $redisValidator)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOptions()
     {
@@ -112,16 +118,33 @@ public function getOptions()
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
                 'Set to 1 to compress the full page cache (use 0 to disable)'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
+                'Redis server password'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_PAGE_CACHE_ID_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX,
+                'ID prefix for cache keys'
             )
         ];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        if (isset($options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX])) {
+            $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX]);
+        } else {
+            $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $this->generateCachePrefix());
+        }
 
         if (isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND])) {
             if ($options[self::INPUT_KEY_PAGE_CACHE_BACKEND] == self::INPUT_VALUE_PAGE_CACHE_REDIS) {
@@ -142,7 +165,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -201,6 +224,13 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
                 $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE)
             );
+        
+        $config['password'] = isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD])
+            ? $options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD]
+            : $deploymentConfig->get(
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
+                $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD)
+            );
 
         return $this->redisValidator->isValidConnection($config);
     }
@@ -235,4 +265,14 @@ private function getDefaultConfigValue($inputKey)
             return '';
         }
     }
+
+    /**
+     * Generate default cache ID prefix based on installation dir
+     *
+     * @return string
+     */
+    private function generateCachePrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
index 3b3fbf33a02e2..c0ec78f046e23 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
@@ -37,6 +37,10 @@ class Session implements ConfigOptionsListInterface
     const INPUT_KEY_SESSION_REDIS_DISABLE_LOCKING = 'session-save-redis-disable-locking';
     const INPUT_KEY_SESSION_REDIS_MIN_LIFETIME = 'session-save-redis-min-lifetime';
     const INPUT_KEY_SESSION_REDIS_MAX_LIFETIME = 'session-save-redis-max-lifetime';
+    const INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS = 'session-save-redis-sentinel-servers';
+    const INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER = 'session-save-redis-sentinel-master';
+    const INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER = 'session-save-redis-sentinel-verify-master';
+    const INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES = 'session-save-redis-sentinel-connect-retires';
 
     const CONFIG_PATH_SESSION_REDIS = 'session/redis';
     const CONFIG_PATH_SESSION_REDIS_HOST = 'session/redis/host';
@@ -57,6 +61,10 @@ class Session implements ConfigOptionsListInterface
     const CONFIG_PATH_SESSION_REDIS_DISABLE_LOCKING = 'session/redis/disable_locking';
     const CONFIG_PATH_SESSION_REDIS_MIN_LIFETIME = 'session/redis/min_lifetime';
     const CONFIG_PATH_SESSION_REDIS_MAX_LIFETIME = 'session/redis/max_lifetime';
+    const CONFIG_PATH_SESSION_REDIS_SENTINEL_SERVERS = 'session/redis/sentinel_servers';
+    const CONFIG_PATH_SESSION_REDIS_SENTINEL_MASTER = 'session/redis/sentinel_master';
+    const CONFIG_PATH_SESSION_REDIS_SENTINEL_VERIFY_MASTER = 'session/redis/sentinel_verify_master';
+    const CONFIG_PATH_SESSION_REDIS_SENTINEL_CONNECT_RETRIES = 'session/redis/sentinel_connect_retries';
 
     /**
      * @var array
@@ -80,7 +88,9 @@ class Session implements ConfigOptionsListInterface
         self::INPUT_KEY_SESSION_REDIS_BOT_LIFETIME => '7200',
         self::INPUT_KEY_SESSION_REDIS_DISABLE_LOCKING => '0',
         self::INPUT_KEY_SESSION_REDIS_MIN_LIFETIME => '60',
-        self::INPUT_KEY_SESSION_REDIS_MAX_LIFETIME => '2592000'
+        self::INPUT_KEY_SESSION_REDIS_MAX_LIFETIME => '2592000',
+        self::INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER => '0',
+        self::INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES => '5',
     ];
 
     /**
@@ -121,6 +131,11 @@ class Session implements ConfigOptionsListInterface
         self::INPUT_KEY_SESSION_REDIS_DISABLE_LOCKING => self::CONFIG_PATH_SESSION_REDIS_DISABLE_LOCKING,
         self::INPUT_KEY_SESSION_REDIS_MIN_LIFETIME => self::CONFIG_PATH_SESSION_REDIS_MIN_LIFETIME,
         self::INPUT_KEY_SESSION_REDIS_MAX_LIFETIME => self::CONFIG_PATH_SESSION_REDIS_MAX_LIFETIME,
+        self::INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER => self::CONFIG_PATH_SESSION_REDIS_SENTINEL_MASTER,
+        self::INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS => self::CONFIG_PATH_SESSION_REDIS_SENTINEL_SERVERS,
+        self::INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES =>
+            self::CONFIG_PATH_SESSION_REDIS_SENTINEL_CONNECT_RETRIES,
+        self::INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER => self::CONFIG_PATH_SESSION_REDIS_SENTINEL_VERIFY_MASTER,
     ];
 
     /**
@@ -246,6 +261,30 @@ public function getOptions()
                 self::CONFIG_PATH_SESSION_REDIS_MAX_LIFETIME,
                 'Redis max session lifetime, in seconds'
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_SESSION_REDIS_SENTINEL_MASTER,
+                'Redis Sentinel master'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS,
+                'Redis Sentinel servers, comma separated'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_SESSION_REDIS_SENTINEL_VERIFY_MASTER,
+                'Redis Sentinel verify master. Values: false (default), true'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_SESSION_REDIS_SENTINEL_CONNECT_RETRIES,
+                'Redis Sentinel connect retries.'
+            ),
         ];
     }
 
diff --git a/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php b/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php
index 29392daecb8fd..1823d3aea720b 100644
--- a/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php
+++ b/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php
@@ -29,7 +29,7 @@ class MultipleStreamOutput extends Output
     public function __construct(
         array $streams,
         $verbosity = self::VERBOSITY_NORMAL,
-        $decorated = null,
+        $decorated = false,
         OutputFormatterInterface $formatter = null
     ) {
         foreach ($streams as $stream) {
diff --git a/setup/src/Magento/Setup/Model/CryptKeyGenerator.php b/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
new file mode 100644
index 0000000000000..df72dc4c6b8bb
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Model;
+
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Math\Random;
+
+/**
+ * Generates a crypt.
+ */
+class CryptKeyGenerator implements CryptKeyGeneratorInterface
+{
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * CryptKeyGenerator constructor.
+     *
+     * @param Random $random
+     */
+    public function __construct(Random $random)
+    {
+        $this->random = $random;
+    }
+
+    /**
+     * Generates & returns a string to be used as crypt key.
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function generate()
+    {
+        return md5($this->getRandomString());
+    }
+
+    /**
+     * Returns a random string.
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getRandomString()
+    {
+        return $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php b/setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php
new file mode 100644
index 0000000000000..f96f9b37ac9a7
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Model;
+
+/**
+ * Interface for crypt key generators.
+ */
+interface CryptKeyGeneratorInterface
+{
+    /**
+     * Generates & returns a string to be used as crypt key.
+     *
+     * The key length is not a parameter, but an implementation detail.
+     *
+     * @return string
+     */
+    public function generate();
+}
diff --git a/setup/src/Magento/Setup/Model/DataGenerator.php b/setup/src/Magento/Setup/Model/DataGenerator.php
index 7a039388180a1..540433e5aa3ec 100644
--- a/setup/src/Magento/Setup/Model/DataGenerator.php
+++ b/setup/src/Magento/Setup/Model/DataGenerator.php
@@ -67,12 +67,12 @@ protected function readData()
      */
     public function generate($minAmountOfWords, $maxAmountOfWords, $key = null)
     {
-        $numberOfWords = mt_rand($minAmountOfWords, $maxAmountOfWords);
+        $numberOfWords = random_int($minAmountOfWords, $maxAmountOfWords);
         $result = '';
 
         if ($key === null || !array_key_exists($key, $this->generatedValues)) {
             for ($i = 0; $i < $numberOfWords; $i++) {
-                $result .= ' ' . $this->dictionaryData[mt_rand(0, count($this->dictionaryData) - 1)];
+                $result .= ' ' . $this->dictionaryData[random_int(0, count($this->dictionaryData) - 1)];
             }
             $result = trim($result);
 
diff --git a/setup/src/Magento/Setup/Model/DeclarationInstaller.php b/setup/src/Magento/Setup/Model/DeclarationInstaller.php
new file mode 100644
index 0000000000000..4313b031a1626
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/DeclarationInstaller.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Model;
+
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+
+/**
+ * Declaration Installer is facade for installation and upgrade db in declaration mode.
+ */
+class DeclarationInstaller
+{
+    /**
+     * @var OperationsExecutor
+     */
+    private $operationsExecutor;
+
+    /**
+     * @var SchemaDiff
+     */
+    private $schemaDiff;
+
+    /**
+     * @var SchemaConfigInterface
+     */
+    private $schemaConfig;
+
+    /**
+     * Constructor.
+     *
+     * @param SchemaConfigInterface $schemaConfig
+     * @param SchemaDiff $schemaDiff
+     * @param OperationsExecutor $operationsExecutor
+     */
+    public function __construct(
+        SchemaConfigInterface $schemaConfig,
+        SchemaDiff $schemaDiff,
+        OperationsExecutor $operationsExecutor
+    ) {
+        $this->operationsExecutor = $operationsExecutor;
+        $this->schemaConfig = $schemaConfig;
+        $this->schemaDiff = $schemaDiff;
+    }
+
+    /**
+     * Install Schema in declarative way.
+     *
+     * @param array $requestData -> Data params which comes from UI or from CLI.
+     * @return void
+     */
+    public function installSchema(array $requestData)
+    {
+        $declarativeSchema = $this->schemaConfig->getDeclarationConfig();
+        $dbSchema = $this->schemaConfig->getDbConfig();
+        $diff = $this->schemaDiff->diff($declarativeSchema, $dbSchema);
+        $this->operationsExecutor->execute($diff, $requestData);
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
index 807e1fde7d90d..a790bfdbe608d 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
@@ -63,7 +63,7 @@ public function generate()
      */
     private function generateRawDescription()
     {
-        $paragraphsCount = mt_rand(
+        $paragraphsCount = random_int(
             $this->descriptionConfig['paragraphs']['count-min'],
             $this->descriptionConfig['paragraphs']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
index 50544e6ea9726..57ece1f9558c3 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function generate()
     {
-        $sentencesCount = mt_rand(
+        $sentencesCount = random_int(
             $this->paragraphConfig['sentences']['count-min'],
             $this->paragraphConfig['sentences']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
index 299b4b50bed0f..10b07e7e1c7a2 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function generate()
     {
-        $sentenceWordsCount = mt_rand(
+        $sentenceWordsCount = random_int(
             $this->sentenceConfig['words']['count-min'],
             $this->sentenceConfig['words']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
index db208adc67de8..927759c4bfa7c 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<b>%s</b>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
index 0598db218728f..c7efcc7f12e0f 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
@@ -27,7 +27,7 @@ public function getRandomWords($source, $count)
         $randWords = [];
         $wordsSize = count($words);
         while ($count) {
-            $randWords[] = $words[mt_rand(0, $wordsSize - 1)];
+            $randWords[] = $words[random_int(0, $wordsSize - 1)];
             $count--;
         }
 
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
index 87e033be330cf..7621bccf08773 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<i>%s</i>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
index ed5a836129460..fe53ebef535a8 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<span>%s</span>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Dictionary.php b/setup/src/Magento/Setup/Model/Dictionary.php
index 630d35092d0fc..52f7cc1bb5148 100644
--- a/setup/src/Magento/Setup/Model/Dictionary.php
+++ b/setup/src/Magento/Setup/Model/Dictionary.php
@@ -40,7 +40,7 @@ public function getRandWord()
             $this->readDictionary();
         }
 
-        $randIndex = mt_rand(0, count($this->dictionary) - 1);
+        $randIndex = random_int(0, count($this->dictionary) - 1);
         return trim($this->dictionary[$randIndex]);
     }
 
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductTemplateGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductTemplateGenerator.php
index 6bdb3b761c97b..791ced0886da2 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 2d82c64d1cada..d70c21d655377 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/EntityGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/EntityGenerator.php
index c52cee9f5c184..cd9fd76077fb0 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/EntityGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/EntityGenerator.php
@@ -335,7 +335,9 @@ function ($ddl) use ($primaryTable) {
                 }
             }
             if (!$foreignKey) {
-                throw new ValidatorException(__('Cannot find entity id field for table "%1"', $table));
+                throw new ValidatorException(
+                    __('The entity ID field for the "%1" table wasn\'t found. Verify the field and try again.', $table)
+                );
             }
             $this->tableToEntityIdMap[$table] = current($foreignKey)['COLUMN_NAME'];
         }
@@ -374,7 +376,9 @@ function ($data) {
                     }
                 );
                 if (!$ddl) {
-                    throw new ValidatorException(__('Cannot find primary key for table "%1"', $table));
+                    throw new ValidatorException(
+                        __('The primary key for the "%1" table wasn\'t found. Verify the key and try again.', $table)
+                    );
                 }
                 $this->tableToEntityIdMap[$table] = current($ddl)['COLUMN_NAME'];
             }
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
index baeeec92a29c8..661d6bfc94048 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) {
             // 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 5e0c60e47dc8f..662bd4c5ca3a2 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/Model/FixtureGenerator/SqlCollector.php b/setup/src/Magento/Setup/Model/FixtureGenerator/SqlCollector.php
index 6101e475cd50e..5e34db4dfdfb5 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/SqlCollector.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/SqlCollector.php
@@ -44,7 +44,7 @@ public function __construct(ResourceConnection $resourceConnection)
      */
     private function addSql($sql, $bind)
     {
-        preg_match('~INSERT INTO `(.*)` \((.*)\) VALUES (\(.*\))+~', $sql, $queryMatches);
+        preg_match('~(?:INSERT|REPLACE)\s+(?:IGNORE)?\s*INTO `(.*)` \((.*)\) VALUES (\(.*\))+~', $sql, $queryMatches);
         if ($queryMatches) {
             $table = $queryMatches[1];
             $fields = preg_replace('~[\s+`]+~', '', $queryMatches[2]);
@@ -121,12 +121,25 @@ public function disable()
         $this->getProfiler()->setEnabled(false);
         $queries = $this->getProfiler()->getQueryProfiles() ?: [];
         foreach ($queries as $query) {
-            if ($query->getQueryType() === Profiler::INSERT) {
+            if ($query->getQueryType() === Profiler::INSERT || $this->isReplaceQuery($query)) {
+                // For generator we do not care about REPLACE query and can use INSERT instead
+                // due to it's not support parallel execution
                 $this->addSql($query->getQuery(), $query->getQueryParams());
             }
         }
     }
 
+    /**
+     * Detect "REPLACE INTO ..." query.
+     *
+     * @param Profiler $query
+     * @return bool
+     */
+    private function isReplaceQuery($query)
+    {
+        return $query->getQueryType() === Profiler::QUERY && 0 === stripos(ltrim($query->getQuery()), 'replace');
+    }
+
     /**
      * @return \Zend_Db_Profiler
      */
diff --git a/setup/src/Magento/Setup/Model/Grid/Module.php b/setup/src/Magento/Setup/Model/Grid/Module.php
index c5e7c514df57c..fd9dc3285de3e 100644
--- a/setup/src/Magento/Setup/Model/Grid/Module.php
+++ b/setup/src/Magento/Setup/Model/Grid/Module.php
@@ -178,7 +178,7 @@ private function getModulesInfo(array $moduleList)
     private function addGeneralInfo(array $items)
     {
         foreach ($items as &$item) {
-            $item['moduleName'] = $item['moduleName'] ?: $this->packageInfo->getModuleName($item['name']);
+            $item['moduleName'] = $item['moduleName'] ?? $this->packageInfo->getModuleName($item['name']);
             $item['enable'] = $this->moduleList->has($item['moduleName']);
             $vendorSource = $item['name'] == self::UNKNOWN_PACKAGE_NAME ? $item['moduleName'] : $item['name'];
             $item['vendor'] = ucfirst(current(preg_split('%[/_]%', $vendorSource)));
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 4a9bfd9063656..ad24307ac18b9 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -11,31 +11,35 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\MaintenanceMode;
-use Magento\Framework\App\ResourceConnection\Config;
 use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\LoggerInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\PatchApplierInterface;
+use Magento\Framework\Setup\SchemaPersistor;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Setup\Console\Command\InstallCommand;
 use Magento\Setup\Controller\ResponseTypeInterface;
 use Magento\Setup\Model\ConfigModel as SetupConfigModel;
+use Magento\Framework\Setup\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplierFactory;
 use Magento\Setup\Module\ConnectionFactory;
 use Magento\Setup\Module\DataSetupFactory;
-use Magento\Setup\Module\Setup;
 use Magento\Setup\Module\SetupFactory;
 use Magento\Setup\Validator\DbValidator;
 use Magento\Store\Model\Store;
@@ -52,8 +56,8 @@ class Installer
     /**#@+
      * Parameters for enabling/disabling modules
      */
-    const ENABLE_MODULES = 'enable_modules';
-    const DISABLE_MODULES = 'disable_modules';
+    const ENABLE_MODULES = 'enable-modules';
+    const DISABLE_MODULES = 'disable-modules';
     /**#@- */
 
     /**#@+
@@ -224,6 +228,21 @@ class Installer
      */
     private $phpReadinessCheck;
 
+    /**
+     * @var DeclarationInstaller
+     */
+    private $declarationInstaller;
+
+    /**
+     * @var SchemaPersistor
+     */
+    private $schemaPersistor;
+
+    /**
+     * @var PatchApplierFactory
+     */
+    private $patchApplierFactory;
+
     /**
      * Constructor
      *
@@ -248,7 +267,7 @@ class Installer
      * @param \Magento\Framework\Setup\SampleData\State $sampleDataState
      * @param ComponentRegistrar $componentRegistrar
      * @param PhpReadinessCheck $phpReadinessCheck
-     *
+     * @throws \Magento\Setup\Exception
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -296,6 +315,7 @@ public function __construct(
         $this->sampleDataState = $sampleDataState;
         $this->componentRegistrar = $componentRegistrar;
         $this->phpReadinessCheck = $phpReadinessCheck;
+        $this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
     }
 
     /**
@@ -314,10 +334,10 @@ public function install($request)
         if (!empty($request[InstallCommand::INPUT_KEY_CLEANUP_DB])) {
             $script[] = ['Cleaning up database...', 'cleanupDb', []];
         }
-        $script[] = ['Installing database schema:', 'installSchema', []];
+        $script[] = ['Installing database schema:', 'installSchema', [$request]];
         $script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
         $script[] = ['Enabling caches:', 'enableCaches', []];
-        $script[] = ['Installing data...', 'installDataFixtures', []];
+        $script[] = ['Installing data...', 'installDataFixtures', [$request]];
         if (!empty($request[InstallCommand::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX])) {
             $script[] = [
                 'Creating sales order increment prefix...',
@@ -325,24 +345,28 @@ public function install($request)
                 [$request[InstallCommand::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX]],
             ];
         }
-        $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
-        $script[] = ['Caches clearing:', 'cleanCaches', []];
+        if ($this->isAdminDataSet($request)) {
+            $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
+        }
+
+        if (!$this->isDryRun($request)) {
+            $script[] = ['Caches clearing:', 'cleanCaches', [$request]];
+        }
         $script[] = ['Disabling Maintenance Mode:', 'setMaintenanceMode', [0]];
         $script[] = ['Post installation file permissions check...', 'checkApplicationFilePermissions', []];
         $script[] = ['Write installation date...', 'writeInstallationDate', []];
-
         $estimatedModules = $this->createModulesConfig($request, true);
         $total = count($script) + 4 * count(array_filter($estimatedModules));
         $this->progress = new Installer\Progress($total, 0);
 
         $this->log->log('Starting Magento installation:');
 
-        while (list(, list($message, $method, $params)) = each($script)) {
+        foreach ($script as $item) {
+            list($message, $method, $params) = $item;
             $this->log->log($message);
             call_user_func_array([$this, $method], $params);
             $this->logProgress();
         }
-
         $this->log->logSuccess('Magento installation complete.');
         $this->log->logSuccess(
             'Magento Admin URI: /'
@@ -357,6 +381,21 @@ public function install($request)
         }
     }
 
+    /**
+     * Get declaration installer. For upgrade process it must be created after deployment config update.
+     *
+     * @return DeclarationInstaller
+     */
+    private function getDeclarationInstaller()
+    {
+        if (!$this->declarationInstaller) {
+            $this->declarationInstaller = $this->objectManagerProvider->get()->get(
+                DeclarationInstaller::class
+            );
+        }
+        return $this->declarationInstaller;
+    }
+
     /**
      * Writes installation date to the configuration
      *
@@ -372,7 +411,7 @@ private function writeInstallationDate()
     }
 
     /**
-     * Creates modules deployment configuration segment
+     * Create modules deployment configuration segment
      *
      * @param \ArrayObject|array $request
      * @param bool $dryRun
@@ -385,8 +424,8 @@ private function createModulesConfig($request, $dryRun = false)
         $deploymentConfig = $this->deploymentConfigReader->load();
         $currentModules = isset($deploymentConfig[ConfigOptionsListConstants::KEY_MODULES])
             ? $deploymentConfig[ConfigOptionsListConstants::KEY_MODULES] : [];
-        $enable = $this->readListOfModules($all, $request, self::ENABLE_MODULES);
-        $disable = $this->readListOfModules($all, $request, self::DISABLE_MODULES);
+        $enable = $this->readListOfModules($all, $request, InstallCommand::INPUT_KEY_ENABLE_MODULES);
+        $disable = $this->readListOfModules($all, $request, InstallCommand::INPUT_KEY_DISABLE_MODULES);
         $result = [];
         foreach ($all as $module) {
             if ((isset($currentModules[$module]) && !$currentModules[$module])) {
@@ -565,7 +604,6 @@ private function setupCoreTables(SchemaSetupInterface $setup)
     {
         /* @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */
         $connection = $setup->getConnection();
-
         $setup->startSetup();
 
         $this->setupSessionTable($setup, $connection);
@@ -759,36 +797,83 @@ private function setupFlagTable(
         }
     }
 
+    /**
+     * Install Magento if declaration mode was enabled.
+     *
+     * @param array $request
+     * @return void
+     */
+    public function declarativeInstallSchema(array $request)
+    {
+        $this->getDeclarationInstaller()->installSchema($request);
+    }
+
     /**
      * Installs DB schema
      *
+     * @param array $request
      * @return void
      */
-    public function installSchema()
+    public function installSchema(array $request)
     {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+        //For backward compatibility in install and upgrade scripts with enabled parallelization.
+        $registry->register('setup-mode-enabled', true);
+
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->setupFactory->create($this->context->getResources());
         $this->setupModuleRegistry($setup);
         $this->setupCoreTables($setup);
         $this->log->log('Schema creation/updates:');
-        $this->handleDBSchemaData($setup, 'schema');
+        $this->declarativeInstallSchema($request);
+        $this->handleDBSchemaData($setup, 'schema', $request);
+        /** @var Mysql $adapter */
+        $adapter = $setup->getConnection();
+        $schemaListener = $adapter->getSchemaListener();
+
+        if ($this->convertationOfOldScriptsIsAllowed($request)) {
+            $schemaListener->setResource('default');
+            $this->schemaPersistor->persist($schemaListener);
+        }
+
+        $registry->unregister('setup-mode-enabled');
+    }
+
+    /**
+     * Check whether all scripts will converted or not
+     *
+     * @param array $request
+     * @return bool
+     */
+    private function convertationOfOldScriptsIsAllowed(array $request)
+    {
+        return isset($request[InstallCommand::CONVERT_OLD_SCRIPTS_KEY]) &&
+            $request[InstallCommand::CONVERT_OLD_SCRIPTS_KEY];
     }
 
     /**
      * Installs data fixtures
      *
+     * @param array $request
      * @return void
-     * @throws \Exception
      */
-    public function installDataFixtures()
+    public function installDataFixtures(array $request = [])
     {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+        //For backward compatibility in install and upgrade scripts with enabled parallelization.
+        $registry->register('setup-mode-enabled', true);
+
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->dataSetupFactory->create();
         $this->checkFilePermissionsForDbUpgrade();
         $this->log->log('Data install/update:');
-        $this->handleDBSchemaData($setup, 'data');
+        $this->handleDBSchemaData($setup, 'data', $request);
+
+        $registry->unregister('setup-mode-enabled');
     }
 
     /**
@@ -820,17 +905,19 @@ private function throwExceptionForNotWritablePaths(array $paths)
     }
 
     /**
-     * Handles database schema and data (install/upgrade/backup/uninstall etc)
+     * Handle database schema and data (install/upgrade/backup/uninstall etc)
      *
-     * @param SchemaSetupInterface | ModuleDataSetupInterface $setup
+     * @param SchemaSetupInterface|ModuleDataSetupInterface $setup
      * @param string $type
+     * @param array $request
      * @return void
-     * @throws \Exception
-     *
+     * @throws \Magento\Framework\Setup\Exception
+     * @throws \Magento\Setup\Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    private function handleDBSchemaData($setup, $type)
+    private function handleDBSchemaData($setup, $type, array $request)
     {
         if (!(($type === 'schema') || ($type === 'data'))) {
             throw  new \Magento\Setup\Exception("Unsupported operation type $type is requested");
@@ -841,7 +928,32 @@ private function handleDBSchemaData($setup, $type)
         $upgradeType = $type . '-upgrade';
         $moduleNames = $this->moduleList->getNames();
         $moduleContextList = $this->generateListOfModuleContext($resource, $verType);
+        /** @var Mysql $adapter */
+        $adapter = $setup->getConnection();
+        $schemaListener = $adapter->getSchemaListener();
+        $this->patchApplierFactory = $this->objectManagerProvider->get()->create(
+            PatchApplierFactory::class,
+            [
+                'objectManager' => $this->objectManagerProvider->get()
+            ]
+        );
+        /** @var PatchApplier $patchApplier */
+        if ($type === 'schema') {
+            $patchApplier = $this->patchApplierFactory->create(['schemaSetup' => $setup]);
+        } elseif ($type === 'data') {
+            $patchApplier = $this->patchApplierFactory->create([
+                'moduleDataSetup' => $setup,
+                'objectManager' => $this->objectManagerProvider->get()
+            ]);
+        }
+
         foreach ($moduleNames as $moduleName) {
+            if ($this->isDryRun($request)) {
+                $this->log->log("Module '{$moduleName}':");
+                $this->logProgress();
+                continue;
+            }
+            $schemaListener->setModuleName($moduleName);
             $this->log->log("Module '{$moduleName}':");
             $configVer = $this->moduleList->getOne($moduleName)['setup_version'];
             $currentVersion = $moduleContextList[$moduleName]->getVersion();
@@ -853,11 +965,11 @@ private function handleDBSchemaData($setup, $type)
                     if ($upgrader) {
                         $this->log->logInline("Upgrading $type.. ");
                         $upgrader->upgrade($setup, $moduleContextList[$moduleName]);
-                    }
-                    if ($type === 'schema') {
-                        $resource->setDbVersion($moduleName, $configVer);
-                    } elseif ($type === 'data') {
-                        $resource->setDataVersion($moduleName, $configVer);
+                        if ($type === 'schema') {
+                            $resource->setDbVersion($moduleName, $configVer);
+                        } elseif ($type === 'data') {
+                            $resource->setDataVersion($moduleName, $configVer);
+                        }
                     }
                 }
             } elseif ($configVer) {
@@ -871,12 +983,25 @@ private function handleDBSchemaData($setup, $type)
                     $this->log->logInline("Upgrading $type... ");
                     $upgrader->upgrade($setup, $moduleContextList[$moduleName]);
                 }
+            }
+
+            if ($configVer) {
                 if ($type === 'schema') {
                     $resource->setDbVersion($moduleName, $configVer);
                 } elseif ($type === 'data') {
                     $resource->setDataVersion($moduleName, $configVer);
                 }
             }
+
+            /**
+             * Applying data patches after old upgrade data scripts
+             */
+            if ($type === 'schema') {
+                $patchApplier->applySchemaPatch($moduleName);
+            } elseif ($type === 'data') {
+                $patchApplier->applyDataPatch($moduleName);
+            }
+
             $this->logProgress();
         }
 
@@ -888,6 +1013,11 @@ private function handleDBSchemaData($setup, $type)
             $handlerType = 'data-recurring';
         }
         foreach ($moduleNames as $moduleName) {
+            if ($this->isDryRun($request)) {
+                $this->log->log("Module '{$moduleName}':");
+                $this->logProgress();
+                continue;
+            }
             $this->log->log("Module '{$moduleName}':");
             $modulePostUpdater = $this->getSchemaDataHandler($moduleName, $handlerType);
             if ($modulePostUpdater) {
@@ -899,6 +1029,8 @@ private function handleDBSchemaData($setup, $type)
     }
 
     /**
+     * Assert DbConfigExists
+     *
      * @return void
      * @throws \Magento\Setup\Exception
      */
@@ -912,6 +1044,18 @@ private function assertDbConfigExists()
         }
     }
 
+    /**
+     * Check whether Magento setup is run in dry-run mode
+     *
+     * @param array $request
+     * @return bool
+     */
+    private function isDryRun(array $request)
+    {
+        return isset($request[DryRunLogger::INPUT_KEY_DRY_RUN_MODE]) &&
+            $request[DryRunLogger::INPUT_KEY_DRY_RUN_MODE];
+    }
+
     /**
      * Installs user configuration
      *
@@ -920,6 +1064,9 @@ private function assertDbConfigExists()
      */
     public function installUserConfig($data)
     {
+        if ($this->isDryRun($data)) {
+            return;
+        }
         $userConfig = new StoreConfigurationDataMapper();
         /** @var \Magento\Framework\App\State $appState */
         $appState = $this->objectManagerProvider->get()->get(\Magento\Framework\App\State::class);
@@ -939,7 +1086,8 @@ public function installUserConfig($data)
     }
 
     /**
-     * Creates data handler
+     * Create data handler
+     *
      * @param string $className
      * @param string $interfaceName
      * @return mixed|null
@@ -958,7 +1106,7 @@ protected function createSchemaDataHandler($className, $interfaceName)
     }
 
     /**
-     * Creates store order increment prefix configuration
+     * Create store order increment prefix configuration
      *
      * @param string $orderIncrementPrefix Value to use for order increment prefix
      * @return void
@@ -1002,17 +1150,26 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
     }
 
     /**
-     * Creates admin account
+     * Create admin account
      *
      * @param \ArrayObject|array $data
      * @return void
      */
     public function installAdminUser($data)
     {
-        $this->assertDbConfigExists();
-        $setup = $this->setupFactory->create($this->context->getResources());
-        $adminAccount = $this->adminAccountFactory->create($setup->getConnection(), (array)$data);
-        $adminAccount->save();
+        if ($this->isDryRun($data)) {
+            return;
+        }
+
+        $adminUserModuleIsInstalled = (bool)$this->deploymentConfig->get('modules/Magento_User');
+        //Admin user data is not system data, so we need to install it only if schema for admin user was installed
+        if ($adminUserModuleIsInstalled) {
+            $this->assertDbConfigExists();
+            $data += ['db-prefix' => $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX)];
+            $setup = $this->setupFactory->create($this->context->getResources());
+            $adminAccount = $this->adminAccountFactory->create($setup->getConnection(), (array)$data);
+            $adminAccount->save();
+        }
     }
 
     /**
@@ -1136,8 +1293,10 @@ public function getInstallInfo()
      */
     public function cleanupDb()
     {
-        $config = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT);
-        if ($config) {
+        $cleanedUpDatabases = [];
+        $connections = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS, []);
+        //Do database cleanup for all shards
+        foreach ($connections as $config) {
             try {
                 $connection = $this->connectionFactory->create($config);
                 if (!$connection) {
@@ -1147,11 +1306,18 @@ public function cleanupDb()
                 $this->log->log($e->getMessage() . ' - skipping database cleanup');
                 return;
             }
+
             $dbName = $connection->quoteIdentifier($config[ConfigOptionsListConstants::KEY_NAME]);
-            $this->log->log("Cleaning up database {$dbName}");
-            $connection->query("DROP DATABASE IF EXISTS {$dbName}");
-            $connection->query("CREATE DATABASE IF NOT EXISTS {$dbName}");
-        } else {
+            //If for different shards one database was specified - no need to clean it few times
+            if (!in_array($dbName, $cleanedUpDatabases)) {
+                $this->log->log("Cleaning up database {$dbName}");
+                $connection->query("DROP DATABASE IF EXISTS {$dbName}");
+                $connection->query("CREATE DATABASE IF NOT EXISTS {$dbName}");
+                $cleanedUpDatabases[] = $dbName;
+            }
+        }
+
+        if (empty($config)) {
             $this->log->log('No database connection defined - skipping database cleanup');
         }
     }
@@ -1310,4 +1476,28 @@ private function cleanupGeneratedFiles()
             $this->log->log($message);
         }
     }
+
+    /**
+     * Checks that admin data is not empty in request array
+     *
+     * @param \ArrayObject|array $request
+     * @return bool
+     */
+    private function isAdminDataSet($request)
+    {
+        $adminData = array_filter($request, function ($value, $key) {
+            return in_array(
+                $key,
+                [
+                    AdminAccount::KEY_EMAIL,
+                    AdminAccount::KEY_FIRST_NAME,
+                    AdminAccount::KEY_LAST_NAME,
+                    AdminAccount::KEY_USER,
+                    AdminAccount::KEY_PASSWORD,
+                ]
+            ) && $value !== null;
+        }, ARRAY_FILTER_USE_BOTH);
+
+        return !empty($adminData);
+    }
 }
diff --git a/setup/src/Magento/Setup/Model/InstallerFactory.php b/setup/src/Magento/Setup/Model/InstallerFactory.php
index c8d8017386b9a..0fb933dd46cb4 100644
--- a/setup/src/Magento/Setup/Model/InstallerFactory.php
+++ b/setup/src/Magento/Setup/Model/InstallerFactory.php
@@ -9,7 +9,6 @@
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Magento\Setup\Module\ResourceFactory;
 use Magento\Framework\App\ErrorHandler;
-use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Setup\LoggerInterface;
 
 /**
@@ -35,8 +34,10 @@ class InstallerFactory
      * @param ServiceLocatorInterface $serviceLocator
      * @param ResourceFactory $resourceFactory
      */
-    public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFactory $resourceFactory)
-    {
+    public function __construct(
+        ServiceLocatorInterface $serviceLocator,
+        ResourceFactory $resourceFactory
+    ) {
         $this->serviceLocator = $serviceLocator;
         $this->resourceFactory = $resourceFactory;
         // For Setup Wizard we are using our customized error handler
diff --git a/setup/src/Magento/Setup/Model/ModuleUninstaller.php b/setup/src/Magento/Setup/Model/ModuleUninstaller.php
index b7d26b09a3754..55b866640b74e 100644
--- a/setup/src/Magento/Setup/Model/ModuleUninstaller.php
+++ b/setup/src/Magento/Setup/Model/ModuleUninstaller.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Setup\Model;
 
+use Magento\Framework\Setup\Patch\PatchApplier;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -31,6 +32,10 @@ class ModuleUninstaller
      * @var \Magento\Setup\Module\SetupFactory
      */
     private $setupFactory;
+    /**
+     * @var PatchApplier
+     */
+    private $patchApplier;
 
     /**
      * Constructor
@@ -39,6 +44,7 @@ class ModuleUninstaller
      * @param \Magento\Framework\Composer\Remove $remove
      * @param UninstallCollector $collector
      * @param \Magento\Setup\Module\SetupFactory $setupFactory
+     * @param PatchApplier $patchApplier
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
@@ -52,6 +58,18 @@ public function __construct(
         $this->setupFactory = $setupFactory;
     }
 
+    /**
+     * @return PatchApplier
+     */
+    private function getPatchApplier()
+    {
+        if (!$this->patchApplier) {
+            $this->patchApplier = $this->objectManager->get(PatchApplier::class);
+        }
+
+        return $this->patchApplier;
+    }
+
     /**
      * Invoke remove data routine in each specified module
      *
@@ -71,9 +89,9 @@ public function uninstallData(OutputInterface $output, array $modules)
                     $setupModel,
                     new ModuleContext($resource->getDbVersion($module) ?: '')
                 );
-            } else {
-                $output->writeln("<info>No data to clear in $module</info>");
             }
+
+            $this->getPatchApplier()->revertDataPatches($module);
         }
     }
 
diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
index c2bdafa8df82e..86a377c8edc62 100644
--- a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
@@ -179,6 +179,7 @@ public function checkPhpExtensions()
 
     /**
      * Checks php memory limit
+     *
      * @return array
      */
     public function checkMemoryLimit()
@@ -192,7 +193,7 @@ public function checkMemoryLimit()
 
         $currentMemoryLimit = ini_get('memory_limit');
 
-        $currentMemoryInteger = intval($currentMemoryLimit);
+        $currentMemoryInteger = (int)$currentMemoryLimit;
 
         if ($currentMemoryInteger > 0
             && $this->dataSize->convertSizeToBytes($currentMemoryLimit)
@@ -235,6 +236,7 @@ public function checkMemoryLimit()
 
     /**
      * Checks if xdebug.max_nesting_level is set 200 or more
+     *
      * @return array
      */
     private function checkXDebugNestedLevel()
@@ -244,7 +246,7 @@ private function checkXDebugNestedLevel()
 
         $currentExtensions = $this->phpInformation->getCurrent();
         if (in_array('xdebug', $currentExtensions)) {
-            $currentXDebugNestingLevel = intval(ini_get('xdebug.max_nesting_level'));
+            $currentXDebugNestingLevel = (int)ini_get('xdebug.max_nesting_level');
             $minimumRequiredXDebugNestedLevel = $this->phpInformation->getRequiredMinimumXDebugNestedLevel();
 
             if ($minimumRequiredXDebugNestedLevel > $currentXDebugNestingLevel) {
@@ -286,7 +288,7 @@ private function checkPopulateRawPostSetting()
 
         $data = [];
         $error = false;
-        $iniSetting = intVal(ini_get('always_populate_raw_post_data'));
+        $iniSetting = (int)ini_get('always_populate_raw_post_data');
 
         $checkVersionConstraint = $this->versionParser->parseConstraints('~5.6.0');
         $normalizedPhpVersion = $this->getNormalizedCurrentPhpVersion(PHP_VERSION);
@@ -302,7 +304,7 @@ private function checkPopulateRawPostSetting()
 	        Please open your php.ini file and set always_populate_raw_post_data to -1.
  	        If you need more help please call your hosting provider.',
             PHP_VERSION,
-            intVal(ini_get('always_populate_raw_post_data'))
+            (int)ini_get('always_populate_raw_post_data')
         );
 
         $data['always_populate_raw_post_data'] = [
diff --git a/setup/src/Magento/Setup/Module/Dependency/Circular.php b/setup/src/Magento/Setup/Module/Dependency/Circular.php
index 8f5bd8716f650..a10d2752fa410 100644
--- a/setup/src/Magento/Setup/Module/Dependency/Circular.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Circular.php
@@ -118,7 +118,7 @@ protected function buildCircular($modules)
             return;
         }
         $this->circularDependencies[$path] = $modules;
-        array_push($modules, array_shift($modules));
+        $modules[] = array_shift($modules);
         $this->buildCircular($modules);
     }
 
@@ -133,7 +133,7 @@ protected function divideByModules($circularDependencies)
         $dependenciesByModule = [];
         foreach ($circularDependencies as $circularDependency) {
             $module = $circularDependency[0];
-            array_push($circularDependency, $module);
+            $circularDependency[] = $module;
             $dependenciesByModule[$module][] = $circularDependency;
         }
 
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
index ec5fb3f94e4b4..edc2a485278a6 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php
@@ -10,6 +10,9 @@
 use Magento\Setup\Module\Di\Compiler\Config;
 use Magento\Setup\Module\Di\Definition\Collection as DefinitionsCollection;
 
+/**
+ * Area configuration aggregation
+ */
 class Area implements OperationInterface
 {
     /**
@@ -28,7 +31,7 @@ class Area implements OperationInterface
     private $configReader;
 
     /**
-     * @var Config\WriterInterface
+     * @var \Magento\Framework\App\ObjectManager\ConfigWriterInterface
      */
     private $configWriter;
 
@@ -46,7 +49,7 @@ class Area implements OperationInterface
      * @param App\AreaList $areaList
      * @param \Magento\Setup\Module\Di\Code\Reader\Decorator\Area $areaInstancesNamesList
      * @param Config\Reader $configReader
-     * @param Config\WriterInterface $configWriter
+     * @param \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter
      * @param \Magento\Setup\Module\Di\Compiler\Config\ModificationChain $modificationChain
      * @param array $data
      */
@@ -54,7 +57,7 @@ public function __construct(
         App\AreaList $areaList,
         \Magento\Setup\Module\Di\Code\Reader\Decorator\Area $areaInstancesNamesList,
         Config\Reader $configReader,
-        Config\WriterInterface $configWriter,
+        \Magento\Framework\App\ObjectManager\ConfigWriterInterface $configWriter,
         Config\ModificationChain $modificationChain,
         $data = []
     ) {
@@ -67,7 +70,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function doOperation()
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
index 5cd9c6ad3f719..d78e259ec06e0 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Module\Di\Code\Reader;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -69,7 +70,9 @@ public function getList($path)
             return $this->fileResults[$realPath];
         }
         if (!(bool)$realPath) {
-            throw new FileSystemException(new \Magento\Framework\Phrase('Invalid path: %1', [$path]));
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase('The "%1" path is invalid. Verify the path and try again.', [$path])
+            );
         }
         $recursiveIterator = new \RecursiveIteratorIterator(
             new \RecursiveDirectoryIterator($realPath, \FilesystemIterator::FOLLOW_SYMLINKS),
@@ -114,7 +117,7 @@ private function extract(\RecursiveIteratorIterator $recursiveIterator)
     /**
      * @param array $classNames
      * @param string $fileItemPath
-     * @return bool Whether the clas is included or not
+     * @return bool Whether the class is included or not
      */
     private function includeClasses(array $classNames, $fileItemPath)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
index fac5b1b4aec98..747865f7cfef9 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
@@ -28,7 +28,7 @@ public function __construct(
      *
      * @param string $fileName
      *
-     * @return array array of paths to the configuration files
+     * @return array of paths to the configuration files
      */
     public function scan($fileName)
     {
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
index e88ca9197096a..75c6e1144e8d2 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
@@ -42,9 +42,9 @@ protected function _collectEntitiesFromString($content)
             $attributes = $entityNode->attributes;
             $type = $attributes->getNamedItem('type');
             if ($type !== null) {
-                array_push($output, $type->nodeValue);
+                $output[] = $type->nodeValue;
             } else {
-                array_push($output, $attributes->getNamedItem('name')->nodeValue);
+                $output[] = $attributes->getNamedItem('name')->nodeValue;
             }
         }
         return $output;
@@ -80,7 +80,7 @@ protected function _filterEntities(array $output)
                 $this->_handleControllerClassName($entityName);
             }
             if (class_exists($entityName) || interface_exists($entityName)) {
-                array_push($filteredEntities, $entityName . '\\Interceptor');
+                $filteredEntities[] = $entityName . '\\Interceptor';
             }
         }
         return $filteredEntities;
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
index 6a798f3226570..a606c266d3827 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
@@ -30,13 +30,21 @@ public function __construct(\Magento\Setup\Module\Di\Compiler\Log\Log $log)
      */
     public function collectEntities(array $files)
     {
+        $virtualTypes = [];
         $output = [];
+        $factoriesOutput = [];
         foreach ($files as $file) {
             $dom = new \DOMDocument();
             $dom->load($file);
             $xpath = new \DOMXPath($dom);
             $xpath->registerNamespace("php", "http://php.net/xpath");
             $xpath->registerPhpFunctions('preg_match');
+            $virtualTypeQuery = "//virtualType/@name";
+
+            foreach ($xpath->query($virtualTypeQuery) as $virtualNode) {
+                $virtualTypes[] = $virtualNode->nodeValue;
+            }
+
             $regex = '/^(.*)\\\(.*)Proxy$/';
             $query = "/config/preference[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type | " .
                 "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
@@ -46,9 +54,33 @@ public function collectEntities(array $files)
             foreach ($xpath->query($query) as $node) {
                 $output[] = $node->nodeValue;
             }
+
+            $factoriesOutput = array_merge($factoriesOutput, $this->scanFactories($xpath));
         }
+
         $output = array_unique($output);
-        return $this->_filterEntities($output);
+        $factoriesOutput = array_unique($factoriesOutput);
+        $factoriesOutput = array_diff($factoriesOutput, $virtualTypes);
+        return array_merge($this->_filterEntities($output), $factoriesOutput);
+    }
+
+    /**
+     * Scan factories from all di.xml and retrieve non virtual one
+     *
+     * @param \DOMXPath $domXpath
+     * @return array
+     */
+    private function scanFactories(\DOMXPath $domXpath)
+    {
+        $output = [];
+        $regex = '/^(.*)Factory$/';
+        $query = "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
+            "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0]";
+        foreach ($domXpath->query($query) as $node) {
+            $output[] = $node->nodeValue;
+        }
+
+        return $output;
     }
 
     /**
@@ -72,7 +104,7 @@ protected function _filterEntities(array $output)
             }
             if (false === $isClassExists) {
                 if (class_exists($entityName) || interface_exists($entityName)) {
-                    array_push($filteredEntities, $className);
+                    $filteredEntities[] = $className;
                 } else {
                     $this->_log->add(
                         \Magento\Setup\Module\Di\Compiler\Log\Log::CONFIGURATION_ERROR,
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
index b4601a970de87..953dc04f4cd32 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Writer/Filesystem.php
@@ -10,6 +10,12 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Setup\Module\Di\Compiler\Config\WriterInterface;
 
+/**
+ * Class for writing DI Compiler Configuration
+ *
+ * @deprecated Moved to Framework to allow broader reuse
+ * @see \Magento\Framework\App\ObjectManager\ConfigWriter\Filesystem
+ */
 class Filesystem implements WriterInterface
 {
     /**
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
index 9e6a3008283dc..1ff5524529cc4 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/WriterInterface.php
@@ -9,7 +9,8 @@
 
 /**
  * Interface \Magento\Setup\Module\Di\Compiler\Config\WriterInterface
- *
+ * @deprecated Moved to Framework to allow broader reuse
+ * @see \Magento\Framework\App\ObjectManager\ConfigWriterInterface
  */
 interface WriterInterface
 {
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
index 720fc351bea00..d1da0a16487a3 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/Module/I18n/Parser/Adapter/Html.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
index a4e3063abece4..cf38fd70884f3 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
@@ -20,7 +20,7 @@ class Html extends AbstractAdapter
     const HTML_FILTER = "/i18n:\s?'(?<value>[^'\\\\]*(?:\\\\.[^'\\\\]*)*)'/i";
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _parse()
     {
@@ -31,7 +31,7 @@ protected function _parse()
 
         $results = [];
         preg_match_all(Filter::CONSTRUCTION_PATTERN, $data, $results, PREG_SET_ORDER);
-        for ($i = 0; $i < count($results); $i++) {
+        for ($i = 0, $count = count($results); $i < $count; $i++) {
             if ($results[$i][1] === Filter::TRANS_DIRECTIVE_NAME) {
                 $directive = [];
                 if (preg_match(Filter::TRANS_DIRECTIVE_REGEX, $results[$i][2], $directive) !== 1) {
@@ -43,7 +43,7 @@ protected function _parse()
         }
 
         preg_match_all(self::HTML_FILTER, $data, $results, PREG_SET_ORDER);
-        for ($i = 0; $i < count($results); $i++) {
+        for ($i = 0, $count = count($results); $i < $count; $i++) {
             if (!empty($results[$i]['value'])) {
                 $this->_addPhrase($results[$i]['value']);
             }
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
index 4095b12c9a6c6..4678af60d63f0 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php
@@ -11,7 +11,7 @@
 class Js extends AbstractAdapter
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _parse()
     {
@@ -22,7 +22,7 @@ protected function _parse()
             $fileRow = fgets($fileHandle, 4096);
             $results = [];
             preg_match_all('/mage\.__\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
-            for ($i = 0; $i < count($results); $i++) {
+            for ($i = 0, $count = count($results); $i < $count; $i++) {
                 if (isset($results[$i][2])) {
                     $quote = $results[$i][1];
                     $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
@@ -30,7 +30,7 @@ protected function _parse()
             }
 
             preg_match_all('/\\$t\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
-            for ($i = 0; $i < count($results); $i++) {
+            for ($i = 0, $count = count($results); $i < $count; $i++) {
                 if (isset($results[$i][2])) {
                     $quote = $results[$i][1];
                     $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
diff --git a/setup/src/Magento/Setup/Module/Setup/SetupCache.php b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
index 8de00c6cb6ffb..645290994b367 100644
--- a/setup/src/Magento/Setup/Module/Setup/SetupCache.php
+++ b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
@@ -41,13 +41,9 @@ public function setField($table, $parentId, $rowId, $field, $value)
     public function get($table, $parentId, $rowId, $field = null)
     {
         if (null === $field) {
-            return isset($this->data[$table][$parentId][$rowId]) ?
-                $this->data[$table][$parentId][$rowId] :
-                false;
+            return $this->data[$table][$parentId][$rowId] ?? false;
         } else {
-            return isset($this->data[$table][$parentId][$rowId][$field]) ?
-                $this->data[$table][$parentId][$rowId][$field] :
-                false;
+            return $this->data[$table][$parentId][$rowId][$field] ?? false;
         }
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
index 1cfd0c9494a51..b90fa66b3d450 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
@@ -5,14 +5,25 @@
  */
 namespace Magento\Setup\Test\Unit\Console\Command;
 
-use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Console\Command\AdminUserCreateCommand;
+use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 use Magento\User\Model\UserValidationRules;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Tester\CommandTester;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class AdminUserCreateCommandTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\Console\Helper\QuestionHelper
+     */
+    private $questionHelperMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\InstallerFactory
      */
@@ -27,6 +38,10 @@ public function setUp()
     {
         $this->installerFactoryMock = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
         $this->command = new AdminUserCreateCommand($this->installerFactoryMock, new UserValidationRules());
+
+        $this->questionHelperMock = $this->getMockBuilder(QuestionHelper::class)
+            ->setMethods(['ask'])
+            ->getMock();
     }
 
     public function testExecute()
@@ -50,15 +65,98 @@ public function testExecute()
         $installerMock = $this->createMock(\Magento\Setup\Model\Installer::class);
         $installerMock->expects($this->once())->method('installAdminUser')->with($data);
         $this->installerFactoryMock->expects($this->once())->method('create')->willReturn($installerMock);
-        $commandTester->execute($options);
+        $commandTester->execute($options, ['interactive' => false]);
         $this->assertEquals('Created Magento administrator user named user' . PHP_EOL, $commandTester->getDisplay());
     }
 
-    public function testGetOptionsList()
+    public function testInteraction()
+    {
+        $application = new Application();
+        $application->add($this->command);
+
+        $this->questionHelperMock->expects($this->at(0))
+            ->method('ask')
+            ->will($this->returnValue('admin'));
+
+        $this->questionHelperMock->expects($this->at(1))
+            ->method('ask')
+            ->will($this->returnValue('Password123'));
+
+        $this->questionHelperMock->expects($this->at(2))
+            ->method('ask')
+            ->will($this->returnValue('john.doe@example.com'));
+
+        $this->questionHelperMock->expects($this->at(3))
+            ->method('ask')
+            ->will($this->returnValue('John'));
+
+        $this->questionHelperMock->expects($this->at(4))
+            ->method('ask')
+            ->will($this->returnValue('Doe'));
+
+        // We override the standard helper with our mock
+        $this->command->getHelperSet()->set($this->questionHelperMock, 'question');
+
+        $installerMock = $this->createMock(\Magento\Setup\Model\Installer::class);
+
+        $expectedData = [
+            'admin-user' => 'admin',
+            'admin-password' => 'Password123',
+            'admin-email' => 'john.doe@example.com',
+            'admin-firstname' => 'John',
+            'admin-lastname' => 'Doe',
+            'magento-init-params' => null,
+            'help' => false,
+            'quiet' => false,
+            'verbose' => false,
+            'version' => false,
+            'ansi' => false,
+            'no-ansi' => false,
+            'no-interaction' => false,
+        ];
+
+        $installerMock->expects($this->once())->method('installAdminUser')->with($expectedData);
+        $this->installerFactoryMock->expects($this->once())->method('create')->willReturn($installerMock);
+
+        $commandTester = new CommandTester($this->command);
+        $commandTester->execute([
+            'command' => $this->command->getName(),
+        ]);
+
+        $this->assertEquals(
+            'Created Magento administrator user named admin' . PHP_EOL,
+            $commandTester->getDisplay()
+        );
+    }
+
+    /**
+     * @param int $mode
+     * @param string $description
+     * @dataProvider getOptionListDataProvider
+     */
+    public function testGetOptionsList($mode, $description)
     {
         /* @var $argsList \Symfony\Component\Console\Input\InputArgument[] */
-        $argsList = $this->command->getOptionsList();
+        $argsList = $this->command->getOptionsList($mode);
         $this->assertEquals(AdminAccount::KEY_EMAIL, $argsList[2]->getName());
+        $this->assertEquals($description, $argsList[2]->getDescription());
+    }
+
+    /**
+     * @return array
+     */
+    public function getOptionListDataProvider()
+    {
+        return [
+            [
+                'mode' => InputOption::VALUE_REQUIRED,
+                'description' => '(Required) Admin email',
+            ],
+            [
+                'mode' => InputOption::VALUE_OPTIONAL,
+                'description' => 'Admin email',
+            ],
+        ];
     }
 
     /**
@@ -87,10 +185,13 @@ public function testValidate(array $options, array $errors)
     public function validateDataProvider()
     {
         return [
-            [[null, 'Doe', 'admin', 'test@test.com', '123123q', '123123q'], ['First Name is a required field.']],
+            [
+                [null, 'Doe', 'admin', 'test@test.com', '123123q', '123123q'],
+                ['"First Name" is required. Enter and try again.']
+            ],
             [
                 ['John', null, null, 'test@test.com', '123123q', '123123q'],
-                ['User Name is a required field.', 'Last Name is a required field.'],
+                ['"User Name" is required. Enter and try again.', '"Last Name" is required. Enter and try again.'],
             ],
             [['John', 'Doe', 'admin', null, '123123q', '123123q'], ['Please enter a valid email.']],
             [
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/BackupCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/BackupCommandTest.php
index b44dcb123632e..e8179cff4a94e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/BackupCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/BackupCommandTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Setup\Test\Unit\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Setup\Console\Command\BackupCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -73,7 +74,8 @@ public function setUp()
         $command = new BackupCommand(
             $objectManagerProvider,
             $maintenanceMode,
-            $this->deploymentConfig
+            $this->deploymentConfig,
+            new MaintenanceModeEnabler($maintenanceMode)
         );
         $this->tester = new CommandTester($command);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php
index 3c89cc0f04bf8..19d2873b54586 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php
@@ -72,7 +72,7 @@ public function testExecuteInteractiveWithYes()
             ->expects($this->once())
             ->method('process')
             ->with(['db-host' => 'host']);
-        $this->checkInteraction(true);
+        $this->checkInteraction('Y');
     }
 
     public function testExecuteInteractiveWithNo()
@@ -85,21 +85,21 @@ public function testExecuteInteractiveWithNo()
             ->expects($this->once())
             ->method('process')
             ->with([]);
-        $this->checkInteraction(false);
+        $this->checkInteraction('n');
     }
 
     /**
      * Checks interaction with users on CLI
      *
-     * @param bool $interactionType
+     * @param string $interactionType
      * @return void
      */
     private function checkInteraction($interactionType)
     {
-        $dialog = $this->createMock(\Symfony\Component\Console\Helper\DialogHelper::class);
+        $dialog = $this->createMock(\Symfony\Component\Console\Helper\QuestionHelper::class);
         $dialog
             ->expects($this->once())
-            ->method('askConfirmation')
+            ->method('ask')
             ->will($this->returnValue($interactionType));
 
         /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
@@ -107,13 +107,13 @@ private function checkInteraction($interactionType)
         $helperSet
             ->expects($this->once())
             ->method('get')
-            ->with('dialog')
+            ->with('question')
             ->will($this->returnValue($dialog));
         $this->command->setHelperSet($helperSet);
 
         $commandTester = new CommandTester($this->command);
         $commandTester->execute(['--db-host' => 'host']);
-        if ($interactionType) {
+        if (strtolower($interactionType) === 'y') {
             $message = 'You saved the new configuration.' . PHP_EOL;
         } else {
             $message = 'You made no changes to the configuration.'.PHP_EOL;
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php
index b171438349e4b..61c004c2e0b5f 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbSchemaUpgradeCommandTest.php
@@ -3,26 +3,69 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Setup\Test\Unit\Console\Command;
 
-use Magento\Framework\Module\ModuleList;
 use Magento\Setup\Console\Command\DbSchemaUpgradeCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class DbSchemaUpgradeCommandTest extends DbDataUpgradeCommandTest
+class DbSchemaUpgradeCommandTest extends \PHPUnit\Framework\TestCase
 {
-    public function testExecute()
+    /**
+     * @var \Magento\Setup\Model\InstallerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $installerFactory;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfig;
+
+    protected function setUp()
+    {
+        $this->installerFactory = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
+        $this->deploymentConfig = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+    }
+
+    /**
+     * @dataProvider executeDataProvider
+     * @param $options
+     * @param $expectedOptions
+     */
+    public function testExecute($options, $expectedOptions)
     {
         $this->deploymentConfig->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
         $installer = $this->createMock(\Magento\Setup\Model\Installer::class);
         $this->installerFactory->expects($this->once())->method('create')->will($this->returnValue($installer));
-        $installer->expects($this->once())->method('installSchema');
+        $installer
+            ->expects($this->once())
+            ->method('installSchema')
+            ->with($expectedOptions);
 
         $commandTester = new CommandTester(
             new DbSchemaUpgradeCommand($this->installerFactory, $this->deploymentConfig)
         );
-        $commandTester->execute([]);
+        $commandTester->execute($options);
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                'options' => [
+                    '--magento-init-params' => '',
+                    '--convert-old-scripts' => false
+                ],
+                'expectedOptions' => [
+                    'convert-old-scripts' => false,
+                    'magento-init-params' => '',
+                ]
+            ],
+        ];
     }
 
     public function testExecuteNoConfig()
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php
index 9c28c2be04262..b769012ea81df 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DbStatusCommandTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Setup\UpToDateValidatorInterface;
 use Magento\Setup\Console\Command\DbStatusCommand;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Setup\Model\ObjectManagerProvider;
@@ -34,6 +35,11 @@ class DbStatusCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $command;
 
+    /**
+     * @var array | Mock[]
+     */
+    private $validators;
+
     /**
      * @inheritdoc
      */
@@ -51,95 +57,48 @@ protected function setUp()
         $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->validators = [
+            'declarative_schema' => $this->getMockBuilder(UpToDateValidatorInterface::class)->getMock(),
+            'up_to_date_schema' => $this->getMockBuilder(UpToDateValidatorInterface::class)->getMock(),
+            'up_to_date_data' => $this->getMockBuilder(UpToDateValidatorInterface::class)->getMock(),
+            'old_validator' => $this->getMockBuilder(UpToDateValidatorInterface::class)->getMock(),
+        ];
 
         $objectManagerProvider->expects($this->any())
             ->method('get')
             ->will($this->returnValue($objectManager));
-        $objectManager->expects($this->any())
+        $objectManager->expects(self::exactly(4))
             ->method('get')
-            ->will($this->returnValue($this->dbVersionInfo));
-
+            ->willReturnOnConsecutiveCalls(
+                $this->validators['declarative_schema'],
+                $this->validators['up_to_date_schema'],
+                $this->validators['up_to_date_data'],
+                $this->validators['old_validator']
+            );
         $this->command = new DbStatusCommand($objectManagerProvider, $this->deploymentConfig);
     }
 
-    /**
-     * @param array $outdatedInfo
-     * @param string $expectedMessage
-     * @param int $expectedCode
-     *
-     * @dataProvider executeDataProvider
-     */
-    public function testExecute(array $outdatedInfo, $expectedMessage, $expectedCode)
+    public function testExecute()
     {
+        $this->validators['old_validator']->expects(self::once())
+            ->method('isUpToDate')
+            ->willReturn(true);
+        $this->validators['up_to_date_schema']->expects(self::once())
+            ->method('isUpToDate')
+            ->willReturn(true);
+        $this->validators['up_to_date_data']->expects(self::once())
+            ->method('isUpToDate')
+            ->willReturn(true);
+        $this->validators['declarative_schema']->expects(self::once())
+            ->method('isUpToDate')
+            ->willReturn(true);
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
             ->will($this->returnValue(true));
-        $this->dbVersionInfo->expects($this->once())
-            ->method('getDbVersionErrors')
-            ->will($this->returnValue($outdatedInfo));
-
         $tester = new CommandTester($this->command);
         $tester->execute([]);
-
-        $this->assertStringMatchesFormat($expectedMessage, $tester->getDisplay());
-        $this->assertSame($expectedCode, $tester->getStatusCode());
-    }
-
-    public function executeDataProvider()
-    {
-        return [
-            'DB is up to date' => [
-                [],
-                'All modules are up to date%a',
-                Cli::RETURN_SUCCESS
-            ],
-            'DB is outdated' => [
-                [
-                    [
-                        DbVersionInfo::KEY_MODULE => 'module_a',
-                        DbVersionInfo::KEY_TYPE => 'schema',
-                        DbVersionInfo::KEY_CURRENT => '1.0.0',
-                        DbVersionInfo::KEY_REQUIRED => '2.0.0'
-                    ]
-                ],
-                '%amodule_a%aschema%a1%a->%a2'
-                . "%aRun 'setup:upgrade' to update your DB schema and data%a",
-                DbStatusCommand::EXIT_CODE_UPGRADE_REQUIRED,
-            ],
-            'code is outdated' => [
-                [
-                    [
-                        DbVersionInfo::KEY_MODULE => 'module_a',
-                        DbVersionInfo::KEY_TYPE => 'data',
-                        DbVersionInfo::KEY_CURRENT => '2.0.0',
-                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-                    ]
-                ],
-                '%amodule_a%adata%a2.0.0%a->%a1.0.0'
-                . '%aSome modules use code versions newer or older than the database%a',
-                Cli::RETURN_FAILURE,
-            ],
-            'both DB and code is outdated' => [
-                [
-                    [
-                        DbVersionInfo::KEY_MODULE => 'module_a',
-                        DbVersionInfo::KEY_TYPE => 'schema',
-                        DbVersionInfo::KEY_CURRENT => '1.0.0',
-                        DbVersionInfo::KEY_REQUIRED => '2.0.0'
-                    ],
-                    [
-                        DbVersionInfo::KEY_MODULE => 'module_b',
-                        DbVersionInfo::KEY_TYPE => 'data',
-                        DbVersionInfo::KEY_CURRENT => '2.0.0',
-                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-                    ]
-                ],
-                '%amodule_a%aschema%a1.0.0%a->%a2.0.0'
-                . '%amodule_b%adata%a2.0.0%a->%a1.0.0'
-                . '%aSome modules use code versions newer or older than the database%a',
-                Cli::RETURN_FAILURE,
-            ],
-        ];
+        $this->assertStringMatchesFormat('All modules are up to date.', $tester->getDisplay());
+        $this->assertSame(0, $tester->getStatusCode());
     }
 
     public function testExecuteNotInstalled()
@@ -147,9 +106,6 @@ public function testExecuteNotInstalled()
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
             ->will($this->returnValue(false));
-        $this->dbVersionInfo->expects($this->never())
-            ->method('getDbVersionErrors');
-
         $tester = new CommandTester($this->command);
         $tester->execute([]);
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
index 772098627fa89..c3f79d92ec560 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -102,7 +102,7 @@ public function testExecute($input)
 
         $this->consoleLoggerFactory->expects($this->once())
             ->method('getLogger')->willReturn($this->logger);
-        $this->logger->expects($this->exactly(2))->method('alert');
+        $this->logger->expects($this->exactly(2))->method('notice');
 
         $this->objectManager->expects($this->once())->method('create')->willReturn($this->deployService);
         $this->deployService->expects($this->once())->method('deploy');
@@ -111,6 +111,9 @@ public function testExecute($input)
         $tester->execute($input);
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
index 388aa0670e069..ca94a1b6fd559 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Setup\Console\Command\DiCompileCommand;
+use Magento\Setup\Module\Di\App\Task\OperationFactory;
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
@@ -41,6 +42,12 @@ class DiCompileCommandTest extends \PHPUnit\Framework\TestCase
     /** @var  \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject */
     private $componentRegistrarMock;
 
+    /** @var  \Symfony\Component\Console\Output\OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $outputMock;
+
+    /** @var \Symfony\Component\Console\Formatter\OutputFormatterInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $outputFormatterMock;
+
     public function setUp()
     {
         $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
@@ -61,6 +68,10 @@ public function setUp()
         $this->managerMock = $this->createMock(\Magento\Setup\Module\Di\App\Task\Manager::class);
         $this->directoryListMock =
             $this->createMock(\Magento\Framework\App\Filesystem\DirectoryList::class);
+        $this->directoryListMock->expects($this->any())->method('getPath')->willReturnMap([
+            [\Magento\Framework\App\Filesystem\DirectoryList::SETUP, '/path (1)/to/setup/'],
+        ]);
+
         $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -70,10 +81,17 @@ public function setUp()
             ->getMock();
         $this->componentRegistrarMock = $this->createMock(\Magento\Framework\Component\ComponentRegistrar::class);
         $this->componentRegistrarMock->expects($this->any())->method('getPaths')->willReturnMap([
-            [ComponentRegistrar::MODULE, ['/path/to/module/one', '/path/to/module/two']],
-            [ComponentRegistrar::LIBRARY, ['/path/to/library/one', '/path/to/library/two']],
+            [ComponentRegistrar::MODULE, ['/path/to/module/one', '/path (1)/to/module/two']],
+            [ComponentRegistrar::LIBRARY, ['/path/to/library/one', '/path (1)/to/library/two']],
         ]);
 
+        $this->outputFormatterMock = $this->createMock(
+            \Symfony\Component\Console\Formatter\OutputFormatterInterface::class
+        );
+        $this->outputMock = $this->createMock(\Symfony\Component\Console\Output\OutputInterface::class);
+        $this->outputMock->method('getFormatter')
+            ->willReturn($this->outputFormatterMock);
+
         $this->command = new DiCompileCommand(
             $this->deploymentConfigMock,
             $this->directoryListMock,
@@ -116,11 +134,7 @@ public function testExecute()
             ->method('get')
             ->with(\Magento\Framework\Config\ConfigOptionsListConstants::KEY_MODULES)
             ->willReturn(['Magento_Catalog' => 1]);
-        $progressBar = $this->getMockBuilder(
-            \Symfony\Component\Console\Helper\ProgressBar::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
+        $progressBar = new \Symfony\Component\Console\Helper\ProgressBar($this->outputMock);
 
         $this->objectManagerMock->expects($this->once())->method('configure');
         $this->objectManagerMock
@@ -128,7 +142,28 @@ public function testExecute()
             ->method('create')
             ->with(\Symfony\Component\Console\Helper\ProgressBar::class)
             ->willReturn($progressBar);
-        $this->managerMock->expects($this->exactly(7))->method('addOperation');
+
+        $this->managerMock->expects($this->exactly(7))->method('addOperation')
+            ->withConsecutive(
+                [OperationFactory::PROXY_GENERATOR, []],
+                [OperationFactory::REPOSITORY_GENERATOR, $this->anything()],
+                [OperationFactory::DATA_ATTRIBUTES_GENERATOR, []],
+                [OperationFactory::APPLICATION_CODE_GENERATOR, $this->callback(function ($subject) {
+                    $this->assertEmpty(array_diff($subject['excludePatterns'], [
+                        "#^(?:/path \(1\)/to/setup/)(/[\w]+)*/Test#",
+                        "#^(?:/path/to/library/one|/path \(1\)/to/library/two)/([\w]+/)?Test#",
+                        "#^(?:/path/to/library/one|/path \(1\)/to/library/two)/([\w]+/)?tests#",
+                        "#^(?:/path/to/(?:module/(?:one))|/path \(1\)/to/(?:module/(?:two)))/Test#",
+                        "#^(?:/path/to/(?:module/(?:one))|/path \(1\)/to/(?:module/(?:two)))/tests#"
+                    ]));
+                    return true;
+                })],
+                [OperationFactory::INTERCEPTION, $this->anything()],
+                [OperationFactory::AREA_CONFIG_GENERATOR, $this->anything()],
+                [OperationFactory::INTERCEPTION_CACHE, $this->anything()]
+            )
+        ;
+
         $this->managerMock->expects($this->once())->method('process');
         $tester = new CommandTester($this->command);
         $tester->execute([]);
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
index ff4722ca0fd4a..1329324b74015 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
@@ -16,9 +16,9 @@ public function testExecute()
         $table = $this->createMock(\Symfony\Component\Console\Helper\Table::class);
         $table->expects($this->once())->method('setHeaders')->with(['Backup Filename', 'Backup Type']);
         $table->expects($this->once())->method('addRow')->with(['backupFile_media.tgz', 'media']);
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
         /** @var \Magento\Framework\App\Filesystem\DirectoryList
          * |\PHPUnit_Framework_MockObject_MockObject $directoryList
          */
@@ -29,8 +29,7 @@ public function testExecute()
         $file->expects($this->once())
             ->method('readDirectoryRecursively')
             ->will($this->returnValue(['backupFile_media.tgz']));
-        $command = new InfoBackupsListCommand($directoryList, $file);
-        $command->setHelperSet($helperSet);
+        $command = new InfoBackupsListCommand($directoryList, $file, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
         $expected = 'Showing backup files in ';
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
index e3e0a1de71727..caee4af9c7fc4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
         $table->expects($this->once())->method('setHeaders')->with(['Currency', 'Code']);
         $table->expects($this->once())->method('addRow')->with(['Currency description', 'CUR']);
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
 
         /** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
         $list = $this->createMock(\Magento\Framework\Setup\Lists::class);
         $list->expects($this->once())->method('getCurrencyList')->will($this->returnValue($currencies));
-        $command = new InfoCurrencyListCommand($list);
-        $command->setHelperSet($helperSet);
+        $command = new InfoCurrencyListCommand($list, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
index f1622b59c4593..d9c899b178c37 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
         $table->expects($this->once())->method('setHeaders')->with(['Language', 'Code']);
         $table->expects($this->once())->method('addRow')->with(['Language description', 'LNG']);
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
 
         /** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
         $list = $this->createMock(\Magento\Framework\Setup\Lists::class);
         $list->expects($this->once())->method('getLocaleList')->will($this->returnValue($languages));
-        $command = new InfoLanguageListCommand($list);
-        $command->setHelperSet($helperSet);
+        $command = new InfoLanguageListCommand($list, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
index 860862f304971..80871ecf634ed 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
         $table->expects($this->once())->method('setHeaders')->with(['Timezone', 'Code']);
         $table->expects($this->once())->method('addRow')->with(['timezone description', 'timezone']);
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
 
         /** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
         $list = $this->createMock(\Magento\Framework\Setup\Lists::class);
         $list->expects($this->once())->method('getTimezoneList')->will($this->returnValue($timezones));
-        $command = new InfoTimezoneListCommand($list);
-        $command->setHelperSet($helperSet);
+        $command = new InfoTimezoneListCommand($list, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
index 5b7b6c1626911..3c3a875a278e8 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
@@ -16,6 +16,7 @@
 use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
 use Magento\Framework\Config\ConfigOptionsListConstants as SetupConfigOptionsList;
 use Magento\Setup\Model\StoreConfigurationDataMapper;
+use Magento\Setup\Console\Command\AdminUserCreateCommand;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,6 +63,11 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $configImportMock;
 
+    /**
+     * @var AdminUserCreateCommand|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adminUserMock;
+
     public function setUp()
     {
         $this->input = [
@@ -73,11 +79,6 @@ public function setUp()
             '--' . StoreConfigurationDataMapper::KEY_LANGUAGE => 'en_US',
             '--' . StoreConfigurationDataMapper::KEY_TIMEZONE => 'America/Chicago',
             '--' . StoreConfigurationDataMapper::KEY_CURRENCY => 'USD',
-            '--' . AdminAccount::KEY_USER => 'user',
-            '--' . AdminAccount::KEY_PASSWORD => '123123q',
-            '--' . AdminAccount::KEY_EMAIL => 'test@test.com',
-            '--' . AdminAccount::KEY_FIRST_NAME => 'John',
-            '--' . AdminAccount::KEY_LAST_NAME => 'Doe',
         ];
 
         $configModel = $this->createMock(\Magento\Setup\Model\ConfigModel::class);
@@ -100,15 +101,11 @@ public function setUp()
             ->method('validate')
             ->will($this->returnValue([]));
 
-        $adminUser = $this->createMock(\Magento\Setup\Console\Command\AdminUserCreateCommand::class);
-        $adminUser
+        $this->adminUserMock = $this->createMock(AdminUserCreateCommand::class);
+        $this->adminUserMock
             ->expects($this->once())
             ->method('getOptionsList')
             ->will($this->returnValue($this->getOptionsListAdminUser()));
-        $adminUser
-            ->expects($this->once())
-            ->method('validate')
-            ->will($this->returnValue([]));
 
         $this->installerFactory = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
         $this->installer = $this->createMock(\Magento\Setup\Model\Installer::class);
@@ -143,7 +140,7 @@ public function setUp()
             $this->installerFactory,
             $configModel,
             $userConfig,
-            $adminUser
+            $this->adminUserMock
         );
         $this->command->setApplication(
             $this->applicationMock
@@ -152,6 +149,16 @@ public function setUp()
 
     public function testExecute()
     {
+        $this->input['--' . AdminAccount::KEY_USER] = 'user';
+        $this->input['--' . AdminAccount::KEY_PASSWORD] = '123123q';
+        $this->input['--' . AdminAccount::KEY_EMAIL] = 'test@test.com';
+        $this->input['--' . AdminAccount::KEY_FIRST_NAME] = 'John';
+        $this->input['--' . AdminAccount::KEY_LAST_NAME] = 'Doe';
+
+        $this->adminUserMock
+            ->expects($this->once())
+            ->method('validate')
+            ->willReturn([]);
         $this->installerFactory->expects($this->once())
             ->method('create')
             ->will($this->returnValue($this->installer));
@@ -269,6 +276,9 @@ private function getOptionsListAdminUser()
      */
     public function testValidate($prefixValue)
     {
+        $this->adminUserMock
+            ->expects($this->never())
+            ->method('validate');
         $this->installerFactory->expects($this->once())
             ->method('create')
             ->will($this->returnValue($this->installer));
@@ -288,6 +298,9 @@ public function testValidate($prefixValue)
      */
     public function testValidateWithException($prefixValue)
     {
+        $this->adminUserMock
+            ->expects($this->never())
+            ->method('validate');
         $this->installerFactory->expects($this->never())
             ->method('create')
             ->will($this->returnValue($this->installer));
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
index 88038c2e817c1..cce7a2e39adfc 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
@@ -66,6 +66,33 @@ public function testExecute(array $input, array $validatorMessages, $expectedMes
         $this->assertEquals($expectedMessage, $tester->getDisplay());
     }
 
+    /**
+     * @param array $addressInfo
+     * @param array $input
+     * @param array $validatorMessages
+     * @param string $expectedMessage
+     * @dataProvider executeWithAddDataProvider
+     */
+    public function testExecuteWithAdd(array $addressInfo, array $input, array $validatorMessages, $expectedMessage)
+    {
+        $newAddressInfo = array_unique(array_merge($addressInfo, $input['ip']));
+
+        $this->ipValidator->expects($this->once())->method('validateIps')->willReturn($validatorMessages);
+        $this->maintenanceMode
+            ->expects($this->once())
+            ->method('setAddresses')
+            ->with(implode(',', $newAddressInfo));
+
+        $this->maintenanceMode
+            ->expects($this->exactly(2))
+            ->method('getAddressInfo')
+            ->willReturnOnConsecutiveCalls($addressInfo, $newAddressInfo);
+
+        $tester = new CommandTester($this->command);
+        $tester->execute($input);
+        $this->assertEquals($expectedMessage, $tester->getDisplay());
+    }
+
     /**
      * return array
      */
@@ -75,7 +102,7 @@ public function executeDataProvider()
             [
                 ['ip' => ['127.0.0.1', '127.0.0.2'], '--none' => false],
                 [],
-                'Set exempt IP-addresses: 127.0.0.1, 127.0.0.2' . PHP_EOL
+                'Set exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
             ],
             [
                 ['--none' => true],
@@ -99,4 +126,31 @@ public function executeDataProvider()
             ]
         ];
     }
+
+    /**
+     * return array
+     */
+    public function executeWithAddDataProvider()
+    {
+        return [
+            [
+                [],
+                ['ip' => ['127.0.0.1'], '--add' => true],
+                [],
+                'Set exempt IP-addresses: 127.0.0.1' . PHP_EOL,
+            ],
+            [
+                ['127.0.0.1'],
+                ['ip' => ['127.0.0.1'], '--add' => true],
+                [],
+                'Set exempt IP-addresses: 127.0.0.1' . PHP_EOL,
+            ],
+            [
+                ['127.0.0.1'],
+                ['ip' => ['127.0.0.2'], '--add' => true],
+                [],
+                'Set exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL,
+            ],
+        ];
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
index 07f9990a0bb6f..0b36c86cf8ada 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
@@ -50,7 +50,7 @@ public function executeDataProvider()
             [
                 [true, ['127.0.0.1', '127.0.0.2']],
                 'Status: maintenance mode is active' . PHP_EOL .
-                'List of exempt IP-addresses: 127.0.0.1, 127.0.0.2' . PHP_EOL
+                'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
             ],
             [
                 [true, []],
@@ -63,7 +63,7 @@ public function executeDataProvider()
             [
                 [false, ['127.0.0.1', '127.0.0.2']],
                 'Status: maintenance mode is not active' . PHP_EOL .
-                'List of exempt IP-addresses: 127.0.0.1, 127.0.0.2' . PHP_EOL
+                'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
             ],
         ];
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
index affff69d83544..c00d66eaed134 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Setup\Test\Unit\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Setup\Console\Command\ModuleUninstallCommand;
 use Magento\Setup\Model\ModuleUninstaller;
+use Magento\Framework\Setup\Patch\PatchApplier;
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
@@ -95,6 +97,11 @@ class ModuleUninstallCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $tester;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchApplierMock;
+
     /**
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -129,6 +136,9 @@ public function setUp()
             '',
             false
         );
+        $this->patchApplierMock = $this->getMockBuilder(PatchApplier::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $configLoader->expects($this->any())->method('load')->willReturn([]);
         $objectManager->expects($this->any())
             ->method('get')
@@ -142,6 +152,7 @@ public function setUp()
                     $this->createMock(\Magento\Framework\App\State::class)
                 ],
                 [\Magento\Framework\Setup\BackupRollbackFactory::class, $this->backupRollbackFactory],
+                [PatchApplier::class, $this->patchApplierMock],
                 [\Magento\Framework\ObjectManager\ConfigLoaderInterface::class, $configLoader],
             ]));
         $composer = $this->createMock(\Magento\Framework\Composer\ComposerInformation::class);
@@ -158,7 +169,8 @@ public function setUp()
             $objectManagerProvider,
             $this->uninstallCollector,
             $this->moduleUninstaller,
-            $this->moduleRegistryUninstaller
+            $this->moduleRegistryUninstaller,
+            new MaintenanceModeEnabler($this->maintenanceMode)
         );
         $this->question = $this->createMock(\Symfony\Component\Console\Helper\QuestionHelper::class);
         $this->question
@@ -435,6 +447,18 @@ public function testExecuteRemoveData()
         $this->tester->execute($input);
     }
 
+    public function testExecuteNonComposerModules()
+    {
+        $this->deploymentConfig->expects(self::once())
+            ->method('isAvailable')
+            ->willReturn(true);
+        $input = ['module' => ['Magento_A'], '-c' => true, '-r' => true, '--non-composer' => true];
+        $this->patchApplierMock->expects(self::once())
+            ->method('revertDataPatches')
+            ->with('Magento_A');
+        self::assertEquals(0, $this->tester->execute($input));
+    }
+
     public function testExecuteAll()
     {
         $input = ['module' => ['Magento_A', 'Magento_B'], '-c' => true, '-r' => true];
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/RollbackCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/RollbackCommandTest.php
index 41595ee19f43d..c58f883f61d3c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/RollbackCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/RollbackCommandTest.php
@@ -5,9 +5,13 @@
  */
 namespace Magento\Setup\Test\Unit\Console\Command;
 
+use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Setup\Console\Command\RollbackCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class RollbackCommandTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -96,7 +100,8 @@ public function setUp()
         $this->command = new RollbackCommand(
             $objectManagerProvider,
             $maintenanceMode,
-            $this->deploymentConfig
+            $this->deploymentConfig,
+            new MaintenanceModeEnabler($maintenanceMode)
         );
         $this->command->setHelperSet($this->helperSet);
         $this->tester = new CommandTester($this->command);
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php
index 8bcee84d049b3..1ef3830636657 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php
@@ -51,6 +51,9 @@ public function testExecuteInteractionNo()
         $this->checkInteraction(false);
     }
 
+    /**
+     * @param $answer
+     */
     public function checkInteraction($answer)
     {
         $question = $this->createMock(\Symfony\Component\Console\Helper\QuestionHelper::class);
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
index fb81c6677274e..3d46736e449c4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
@@ -75,14 +75,19 @@ protected function setUp()
 
     /**
      * @dataProvider executeDataProvider
+     * @param array $options
+     * @param string $deployMode
+     * @param string $expectedString
+     * @param array $expectedOptions
      */
-    public function testExecute($options, $deployMode, $expectedString = '')
+    public function testExecute($options, $deployMode, $expectedString, $expectedOptions)
     {
         $this->appStateMock->method('getMode')->willReturn($deployMode);
         $this->installerMock->expects($this->at(0))
             ->method('updateModulesSequence');
-        $this->installerMock->expects($this->at(1))
-            ->method('installSchema');
+        $this->installerMock->expects($this->once())
+            ->method('installSchema')
+            ->with($expectedOptions);
         $this->installerMock->expects($this->at(2))
             ->method('installDataFixtures');
 
@@ -97,25 +102,64 @@ public function executeDataProvider()
     {
         return [
             [
-                'options' => [],
+                'options' => [
+                    '--magento-init-params' => '',
+                    '--convert-old-scripts' => false,
+                ],
                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
                 'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
-                    . PHP_EOL
+                    . PHP_EOL,
+                'expectedOptions' => [
+                    'keep-generated' => false,
+                    'convert-old-scripts' => false,
+                    'safe-mode' => false,
+                    'data-restore' => false,
+                    'dry-run' => false,
+                    'magento-init-params' => '',
+                ]
             ],
             [
-                'options' => ['--keep-generated' => true],
+                'options' => [
+                    '--magento-init-params' => '',
+                    '--convert-old-scripts' => false,
+                    '--keep-generated' => true,
+                ],
                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
-                'expectedString' => ''
+                'expectedString' => '',
+                'expectedOptions' => [
+                    'keep-generated' => true,
+                    'convert-old-scripts' => false,
+                    'safe-mode' => false,
+                    'data-restore' => false,
+                    'dry-run' => false,
+                    'magento-init-params' => '',
+                ]
             ],
             [
-                'options' => [],
+                'options' => ['--magento-init-params' => '', '--convert-old-scripts' => false],
                 'deployMode' => \Magento\Framework\App\State::MODE_DEVELOPER,
-                'expectedString' => ''
+                'expectedString' => '',
+                'expectedOptions' => [
+                    'keep-generated' => false,
+                    'convert-old-scripts' => false,
+                    'safe-mode' => false,
+                    'data-restore' => false,
+                    'dry-run' => false,
+                    'magento-init-params' => '',
+                ]
             ],
             [
-                'options' => [],
+                'options' => ['--magento-init-params' => '', '--convert-old-scripts' => false],
                 'deployMode' => \Magento\Framework\App\State::MODE_DEFAULT,
-                'expectedString' => ''
+                'expectedString' => '',
+                'expectedOptions' => [
+                    'keep-generated' => false,
+                    'convert-old-scripts' => false,
+                    'safe-mode' => false,
+                    'data-restore' => false,
+                    'dry-run' => false,
+                    'magento-init-params' => '',
+                ]
             ],
         ];
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Style/MagentoStyleTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Style/MagentoStyleTest.php
new file mode 100755
index 0000000000000..92aa43251ba26
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Style/MagentoStyleTest.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Test\Unit\Console\Style;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Setup\Console\Style\MagentoStyle;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
+use Symfony\Component\Console\Helper\TableCell;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Provide tests for MagentoStyle output decorator.
+ */
+class MagentoStyleTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var MagentoStyle
+     */
+    private $magentoStyle;
+
+    /**
+     * Auxiliary class replacing console output.
+     *
+     * @var TestOutput
+     */
+    private $testOutput;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
+        $this->testOutput = new TestOutput();
+        $this->magentoStyle = new MagentoStyle($input, $this->testOutput);
+    }
+
+    /**
+     * Test style decorator will output block with correct style.
+     *
+     * @return void
+     */
+    public function testBlockStyle()
+    {
+        $this->magentoStyle->block(
+            ['test first message', 'test second message'],
+            'testBlockType',
+            'testBlockStyle',
+            'testBlockPrefix'
+        );
+        // @codingStandardsIgnoreStart
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL .
+            '\<testBlockStyle\>testBlockPrefix\[testBlockType\] test first message\s+'
+            . PHP_EOL . '\<testBlockStyle\>testBlockPrefix\s+'
+            . PHP_EOL . '\<testBlockStyle\>testBlockPrefix \s+ test second message\s+'
+            . PHP_EOL . PHP_EOL;
+        // @codingStandardsIgnoreEnd
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Block does not match output');
+    }
+
+    /**
+     * Test style decorator will add title with correct style.
+     *
+     * @return void
+     */
+    public function testTitleStyle()
+    {
+        $this->magentoStyle->title('My Title');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . ' My Title' . PHP_EOL . ' ========' . PHP_EOL . PHP_EOL;
+        $this->assertEquals($expected, $this->testOutput->output, 'Title does not match output');
+    }
+
+    /**
+     * Test style decorator will output section with correct style.
+     *
+     * @return void
+     */
+    public function testSectionStyle()
+    {
+        $this->magentoStyle->section('My Section');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . ' My Section' . PHP_EOL . ' ----------' . PHP_EOL . PHP_EOL;
+        $this->assertEquals($expected, $this->testOutput->output, 'Section does not match output');
+    }
+
+    /**
+     * Test style decorator will output listing with proper style.
+     *
+     * @return void
+     */
+    public function testListingStyle()
+    {
+        $this->magentoStyle->listing(['test first element', 'test second element']);
+        $expected = PHP_EOL . ' * test first element' . PHP_EOL . ' * test second element' . PHP_EOL . PHP_EOL;
+        $this->assertEquals($expected, $this->testOutput->output, 'Listing does not match output');
+    }
+
+    /**
+     * Test style decorator will output text with proper style.
+     *
+     * @return void
+     */
+    public function testTextStyle()
+    {
+        $this->magentoStyle->text('test message');
+        $expected = PHP_EOL . ' test message' . PHP_EOL;
+
+        $this->assertEquals($expected, $this->testOutput->output, 'Text does not match output');
+    }
+
+    /**
+     * Test style decorator will output comment with proper style.
+     *
+     * @return void
+     */
+    public function testCommentStyle()
+    {
+        $this->magentoStyle->comment('test comment');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . '\s+test comment\s+' . PHP_EOL . PHP_EOL;
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Comment does not match output');
+    }
+
+    /**
+     * Test style decorator will output success message with proper style.
+     *
+     * @return void
+     */
+    public function testSuccessStyle()
+    {
+        $this->magentoStyle->success('test success message');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . ' \[SUCCESS\] test success message\s+' . PHP_EOL . PHP_EOL;
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Success message does not match output');
+    }
+
+    /**
+     * Test style decorator will output error message with proper style.
+     *
+     * @return void
+     */
+    public function testErrorStyle()
+    {
+        $this->magentoStyle->error('test error message');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . '\s+\[ERROR\] test error message\s+' . PHP_EOL . PHP_EOL;
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Error message does not match output');
+    }
+
+    /**
+     * Test style decorator will output warning message with proper style.
+     *
+     * @return void
+     */
+    public function testWarningStyle()
+    {
+        $this->magentoStyle->warning('test warning message');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . '\s+\[WARNING\] test warning message\s+' . PHP_EOL . PHP_EOL;
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Warning message does not match output');
+    }
+
+    /**
+     * Test style decorator will output note message with proper style.
+     *
+     * @return void
+     */
+    public function testNoteStyle()
+    {
+        $this->magentoStyle->note('test note message');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . '\s+\[NOTE\] test note message\s+' . PHP_EOL . PHP_EOL;
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Note message does not match output');
+    }
+
+    /**
+     * Test style decorator will output caution message with proper style.
+     *
+     * @return void
+     */
+    public function testCautionStyle()
+    {
+        $this->magentoStyle->caution('test caution message');
+        $expected = PHP_EOL . PHP_EOL . PHP_EOL . '\s+! \[CAUTION\] test caution message\s+' . PHP_EOL . PHP_EOL;
+        $this->assertRegExp('/' . $expected . '/', $this->testOutput->output, 'Caution message does not match output');
+    }
+
+    /**
+     * Test style decorator will output table with proper style.
+     *
+     * @return void
+     */
+    public function testTableStyle()
+    {
+        $headers = [
+            [new TableCell('Main table title', ['colspan' => 2])],
+            ['testHeader1', 'testHeader2', 'testHeader3'],
+        ];
+        $rows = [
+            [
+                'testValue1',
+                'testValue2',
+                new TableCell('testValue3', ['rowspan' => 2]),
+            ],
+            ['testValue4', 'testValue5'],
+        ];
+        $this->magentoStyle->table($headers, $rows);
+        $expected = ' ------------- ------------- ------------- ' . PHP_EOL .
+            '  Main table title                         ' . PHP_EOL .
+            ' ------------- ------------- ------------- ' . PHP_EOL .
+            '  testHeader1   testHeader2   testHeader3  ' . PHP_EOL .
+            ' ------------- ------------- ------------- ' . PHP_EOL .
+            '  testValue1    testValue2    testValue3   ' . PHP_EOL .
+            '  testValue4    testValue5                 ' . PHP_EOL .
+            ' ------------- ------------- ------------- ' . PHP_EOL . PHP_EOL;
+
+        $this->assertEquals($expected, $this->testOutput->output, 'Table does not match output');
+    }
+
+    /**
+     * @return void
+     */
+    public function testAsk()
+    {
+        $objectManager = new ObjectManager($this);
+        $formatter = $this->getMockBuilder(OutputFormatter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $input = $this->getMockBuilder(InputInterface::class)
+            ->setMethods(['isInteractive'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $input->expects($this->exactly(2))
+            ->method('isInteractive')
+            ->willReturn(false);
+        $output = $this->getMockBuilder(OutputInterface::class)
+            ->setMethods(['getVerbosity', 'getFormatter'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $output->expects($this->once())
+            ->method('getVerbosity')
+            ->willReturn(32);
+        $output->expects($this->once())
+            ->method('getFormatter')
+            ->willReturn($formatter);
+        $magentoStyle = $objectManager->getObject(
+            MagentoStyle::class,
+            [
+                'input' => $input,
+                'output' => $output,
+            ]
+        );
+        $questionHelper = $this->getMockBuilder(SymfonyQuestionHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $questionHelper->expects($this->once())
+            ->method('ask')
+            ->willReturn('test Answer');
+        $objectManager->setBackwardCompatibleProperty($magentoStyle, 'questionHelper', $questionHelper);
+
+        $this->assertEquals(
+            'test Answer',
+            $magentoStyle->ask('test question?', 'test default')
+        );
+    }
+
+    /**
+     * Test style decorator will output progress with proper style.
+     *
+     * @return void
+     */
+    public function testProgress()
+    {
+        $this->magentoStyle->progressStart(2);
+        $this->magentoStyle->progressAdvance(3);
+        $this->magentoStyle->progressFinish();
+        $expected = ' 0/2 [>                           ]   0%' . PHP_EOL .
+            ' 3/3 [============================] 100%' . PHP_EOL . PHP_EOL;
+        $this->assertEquals($expected, $this->testOutput->output, 'Progress does not match output');
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php b/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php
new file mode 100644
index 0000000000000..183f659c42f23
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Style/TestOutput.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Test\Unit\Console\Style;
+
+use Symfony\Component\Console\Output\Output;
+
+/**
+ * Auxiliary class for MagentoStyleTest.
+ */
+class TestOutput extends Output
+{
+    public $output = '';
+
+    public function clear()
+    {
+        $this->output = '';
+    }
+
+    /**
+     * @param string $message
+     * @param bool $newline
+     */
+    protected function doWrite($message, $newline)
+    {
+        $this->output .= $message . ($newline ? "\n" : '');
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
index e69bf229c4e69..febcbd1f8dbd4 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/Fixtures/StoresFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php
index 1bedfd4b6b975..9fc74066e618c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Fixtures/StoresFixtureTest.php
@@ -75,7 +75,6 @@ public function testExecute()
                     'getDefaultStoreView',
                     'getStore',
                     'getStores',
-                    'reinitStores'
                 ]
             )->getMock();
 
@@ -250,10 +249,6 @@ public function testExecute()
             )
             ->willReturn($storeGroupMock);
 
-        $this->storeManagerMock->expects($this->once())
-            ->method('reinitStores')
-            ->willReturn('void');
-
         $this->storeManagerMock->expects($this->once())
             ->method('getGroups')
             ->willReturn([$storeGroupMock]);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php b/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
index e7b1c5ade1bcf..cf8a578fdb579 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
@@ -365,7 +365,7 @@ public function testSaveExceptionSpecialAdminRoleNotFound()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Password is a required field
+     * @expectedExceptionMessage "Password" is required. Enter and try again.
      */
     public function testSaveExceptionPasswordEmpty()
     {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php
index 49c39c87b9d21..ab361e46c4a7e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php
@@ -48,8 +48,8 @@ public function testBaseComposerJsonFileNotFound()
         $this->readerMock->expects($this->once())->method('isExist')->willReturn(false);
         $this->readerMock->expects($this->never())->method('isReadable');
         $this->readerMock->expects($this->never())->method('readFile');
-        $this->expectException(
-            \Magento\Setup\Exception::class,
+        $this->expectException(\Magento\Setup\Exception::class);
+        $this->expectExceptionMessage(
             sprintf('Could not locate %s file.', BasePackageInfo::MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE)
         );
         $this->basePackageInfo->getPaths();
@@ -61,8 +61,8 @@ public function testBaseComposerJsonFileNotReadable()
         $this->readerMock->expects($this->once())->method('isExist')->willReturn(true);
         $this->readerMock->expects($this->once())->method('isReadable')->willReturn(false);
         $this->readerMock->expects($this->never())->method('readFile');
-        $this->expectException(
-            \Magento\Setup\Exception::class,
+        $this->expectException(\Magento\Setup\Exception::class);
+        $this->expectExceptionMessage(
             sprintf('Could not read %s file.', BasePackageInfo::MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE)
         );
         $this->basePackageInfo->getPaths();
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
index d5bce391f4cd8..be68be8bd8c2d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
@@ -5,27 +5,57 @@
  */
 namespace Magento\Setup\Test\Unit\Model;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\State;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\Data\ConfigDataFactory;
+use Magento\Setup\Model\ConfigGenerator;
 
 class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var  \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject
+     */
     private $deploymentConfigMock;
 
-    /** @var  \Magento\Setup\Model\ConfigGenerator | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var ConfigGenerator | \PHPUnit_Framework_MockObject_MockObject
+     */
     private $model;
 
+    /**
+     * @var ConfigData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configDataMock;
+
     public function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configDataMock = $this->getMockBuilder(ConfigData::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['set'])
+            ->getMock();
+
+        $configDataFactoryMock = $this->getMockBuilder(ConfigDataFactory::class)
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
+
+        $configDataFactoryMock->method('create')
+            ->willReturn($this->configDataMock);
+
         $this->model = $objectManager->getObject(
-            \Magento\Setup\Model\ConfigGenerator::class,
-            ['deploymentConfig' => $this->deploymentConfigMock]
+            ConfigGenerator::class,
+            [
+                'deploymentConfig'  => $this->deploymentConfigMock,
+                'configDataFactory' => $configDataFactoryMock,
+            ]
         );
     }
 
@@ -35,8 +65,13 @@ public function testCreateXFrameConfig()
             ->method('get')
             ->with(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT)
             ->willReturn(null);
-        $configData = $this->model->createXFrameConfig();
-        $this->assertSame('SAMEORIGIN', $configData->getData()[ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT]);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT, 'SAMEORIGIN');
+
+        $this->model->createXFrameConfig();
     }
 
     public function testCreateCacheHostsConfig()
@@ -55,8 +90,13 @@ public function testCreateCacheHostsConfig()
                 'port' => '90',
             ],
         ];
-        $configData = $this->model->createCacheHostsConfig($data);
-        $this->assertEquals($expectedData, $configData->getData()[ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS]);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS, $expectedData);
+
+        $this->model->createCacheHostsConfig($data);
     }
 
     public function testCreateModeConfig()
@@ -65,8 +105,13 @@ public function testCreateModeConfig()
             ->method('get')
             ->with(State::PARAM_MODE)
             ->willReturn(null);
-        $configData = $this->model->createModeConfig();
-        $this->assertSame(State::MODE_DEFAULT, $configData->getData()[State::PARAM_MODE]);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(State::PARAM_MODE, State::MODE_DEFAULT);
+
+        $this->model->createModeConfig();
     }
 
     public function testCreateModeConfigIfAlreadySet()
@@ -78,4 +123,22 @@ public function testCreateModeConfigIfAlreadySet()
         $configData = $this->model->createModeConfig();
         $this->assertSame([], $configData->getData());
     }
+
+    public function testCreateCryptKeyConfig()
+    {
+        $key = 'my-new-key';
+        $data = [ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => $key];
+
+        $this->deploymentConfigMock
+            ->method('get')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY)
+            ->willReturn(null);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, $key);
+
+        $this->model->createCryptConfig($data);
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index ef0ea3e988364..9c123fcb330dd 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -28,6 +28,9 @@ class CacheTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * Tests setup
+     */
     protected function setUp()
     {
         $this->validatorMock = $this->createMock(RedisConnectionValidator::class);
@@ -36,10 +39,13 @@ protected function setUp()
         $this->configOptionsList = new CacheConfigOptionsList($this->validatorMock);
     }
 
+    /**
+     * testGetOptions
+     */
     public function testGetOptions()
     {
         $options = $this->configOptionsList->getOptions();
-        $this->assertCount(4, $options);
+        $this->assertCount(6, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -56,8 +62,19 @@ public function testGetOptions()
         $this->assertArrayHasKey(3, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[3]);
         $this->assertEquals('cache-backend-redis-port', $options[3]->getName());
+
+        $this->assertArrayHasKey(4, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[4]);
+        $this->assertEquals('cache-backend-redis-password', $options[4]->getName());
+
+        $this->assertArrayHasKey(5, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
+        $this->assertEquals('cache-id-prefix', $options[5]->getName());
     }
 
+    /**
+     * testCreateConfigCacheRedis
+     */
     public function testCreateConfigCacheRedis()
     {
         $this->deploymentConfigMock->method('get')->willReturn('');
@@ -70,8 +87,10 @@ public function testCreateConfigCacheRedis()
                         'backend_options' => [
                             'server' => '',
                             'port' => '',
-                            'database' => ''
-                        ]
+                            'database' => '',
+                            'password' => ''
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -82,6 +101,9 @@ public function testCreateConfigCacheRedis()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
+    /**
+     * testCreateConfigWithRedisConfig
+     */
     public function testCreateConfigWithRedisConfig()
     {
         $expectedConfigData = [
@@ -92,8 +114,10 @@ public function testCreateConfigWithRedisConfig()
                         'backend_options' => [
                             'server' => 'localhost',
                             'port' => '1234',
-                            'database' => '5'
-                        ]
+                            'database' => '5',
+                            'password' => ''
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -110,6 +134,57 @@ public function testCreateConfigWithRedisConfig()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
+    /**
+     * testCreateConfigCacheRedis
+     */
+    public function testCreateConfigWithFileCache()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'default' => [
+                        'id_prefix' => $this->expectedIdPrefix(),
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configOptionsList->createConfig([], $this->deploymentConfigMock);
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    /**
+     * testCreateConfigCacheRedis
+     */
+    public function testCreateConfigWithIdPrefix()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $explicitPrefix = 'XXX_';
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'default' => [
+                        'id_prefix' => $explicitPrefix,
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configOptionsList->createConfig(
+            ['cache-id-prefix' => $explicitPrefix],
+            $this->deploymentConfigMock
+        );
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    /**
+     * testValidateWithValidInput
+     */
     public function testValidateWithValidInput()
     {
         $options = [
@@ -118,7 +193,7 @@ public function testValidateWithValidInput()
         ];
         $this->validatorMock->expects($this->once())
             ->method('isValidConnection')
-            ->with(['host'=>'localhost', 'db'=>'', 'port'=>''])
+            ->with(['host'=>'localhost', 'db'=>'', 'port'=>'', 'password'=>''])
             ->willReturn(true);
 
         $errors = $this->configOptionsList->validate($options, $this->deploymentConfigMock);
@@ -126,6 +201,9 @@ public function testValidateWithValidInput()
         $this->assertEmpty($errors);
     }
 
+    /**
+     * testValidateWithInvalidInput
+     */
     public function testValidateWithInvalidInput()
     {
         $invalidCacheOption = 'clay-tablet';
@@ -136,4 +214,14 @@ public function testValidateWithInvalidInput()
         $this->assertCount(1, $errors);
         $this->assertEquals("Invalid cache handler 'clay-tablet'", $errors[0]);
     }
+
+    /**
+     * The default ID prefix, based on installation directory
+     *
+     * @return string
+     */
+    private function expectedIdPrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 8)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index e654bea9ac1c5..1cf3937f98684 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -28,6 +28,9 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * Test setup
+     */
     protected function setUp()
     {
         $this->validatorMock = $this->createMock(RedisConnectionValidator::class, [], [], '', false);
@@ -36,10 +39,13 @@ protected function setUp()
         $this->configList = new PageCache($this->validatorMock);
     }
 
+    /**
+     * testGetOptions
+     */
     public function testGetOptions()
     {
         $options = $this->configList->getOptions();
-        $this->assertCount(5, $options);
+        $this->assertCount(7, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -60,8 +66,19 @@ public function testGetOptions()
         $this->assertArrayHasKey(4, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[4]);
         $this->assertEquals('page-cache-redis-compress-data', $options[4]->getName());
+
+        $this->assertArrayHasKey(5, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
+        $this->assertEquals('page-cache-redis-password', $options[5]->getName());
+
+        $this->assertArrayHasKey(6, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
+        $this->assertEquals('page-cache-id-prefix', $options[6]->getName());
     }
 
+    /**
+     * testCreateConfigWithRedis
+     */
     public function testCreateConfigWithRedis()
     {
         $this->deploymentConfigMock->method('get')->willReturn('');
@@ -75,8 +92,10 @@ public function testCreateConfigWithRedis()
                             'server'=> '',
                             'port' => '',
                             'database' => '',
-                            'compress_data' => ''
-                        ]
+                            'compress_data' => '',
+                            'password' => ''
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -87,6 +106,9 @@ public function testCreateConfigWithRedis()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
+    /**
+     * testCreateConfigWithRedisConfiguration
+     */
     public function testCreateConfigWithRedisConfiguration()
     {
         $expectedConfigData = [
@@ -98,8 +120,10 @@ public function testCreateConfigWithRedisConfiguration()
                             'server' => 'foo.bar',
                             'port' => '9000',
                             'database' => '6',
-                            'compress_data' => '1'
-                        ]
+                            'compress_data' => '1',
+                            'password' => ''
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -118,6 +142,57 @@ public function testCreateConfigWithRedisConfiguration()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
+    /**
+     * testCreateConfigWithRedis
+     */
+    public function testCreateConfigWithFileCache()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'page_cache' => [
+                        'id_prefix' => $this->expectedIdPrefix(),
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configList->createConfig([], $this->deploymentConfigMock);
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    /**
+     * testCreateConfigCacheRedis
+     */
+    public function testCreateConfigWithIdPrefix()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $explicitPrefix = 'XXX_';
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'page_cache' => [
+                        'id_prefix' => $explicitPrefix,
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configList->createConfig(
+            ['page-cache-id-prefix' => $explicitPrefix],
+            $this->deploymentConfigMock
+        );
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    /**
+     * testValidationWithValidData
+     */
     public function testValidationWithValidData()
     {
         $this->validatorMock->expects($this->once())
@@ -134,6 +209,9 @@ public function testValidationWithValidData()
         $this->assertEmpty($errors);
     }
 
+    /**
+     * testValidationWithInvalidData
+     */
     public function testValidationWithInvalidData()
     {
         $options = [
@@ -145,4 +223,14 @@ public function testValidationWithInvalidData()
         $this->assertCount(1, $errors);
         $this->assertEquals('Invalid cache handler \'foobar\'', $errors[0]);
     }
+
+    /**
+     * The default ID prefix, based on installation directory
+     *
+     * @return string
+     */
+    private function expectedIdPrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 8)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php
index d37c07e715482..e4c7449f1f9b6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php
@@ -32,7 +32,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configList->getOptions();
-        $this->assertCount(19, $options);
+        $this->assertCount(23, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -156,7 +156,11 @@ public function testCreateConfigWithSessionSaveRedis()
                     'bot_lifetime' => '',
                     'disable_locking' => '',
                     'min_lifetime' => '',
-                    'max_lifetime' => ''
+                    'max_lifetime' => '',
+                    'sentinel_master' => '',
+                    'sentinel_servers' => '',
+                    'sentinel_connect_retries' => '',
+                    'sentinel_verify_master' => '',
                 ]
 
             ]
@@ -209,7 +213,11 @@ public function testCreateConfigWithRedisInput()
                     'bot_lifetime' => '',
                     'disable_locking' => '',
                     'min_lifetime' => '60',
-                    'max_lifetime' => '3600'
+                    'max_lifetime' => '3600',
+                    'sentinel_master' => '',
+                    'sentinel_servers' => '',
+                    'sentinel_connect_retries' => '',
+                    'sentinel_verify_master' => '',
                 ]
             ],
 
@@ -262,6 +270,9 @@ public function testValidationWithInvalidOptions($option, $invalidInput, $errorM
         $this->assertSame($errorMessage, $errors[0]);
     }
 
+    /**
+     * @return array
+     */
     public function redisOptionProvider()
     {
         return [
@@ -286,6 +297,9 @@ public function redisOptionProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function invalidOptionsProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index 1bb60517d5e67..f342a11493498 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -178,6 +178,9 @@ public function testValidateCacheHosts($hosts, $expectedError)
         }
     }
 
+    /**
+     * @return array
+     */
     public function validateCacheHostsDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php
index b3e88272d13e8..59210df4f7bcf 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobComponentUninstallTest.php
@@ -264,6 +264,9 @@ public function testExecuteWrongFormat(array $params)
         $this->job->execute();
     }
 
+    /**
+     * @return array
+     */
     public function executeWrongFormatDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
index f96882c30136a..1f8a3fea16da2 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
@@ -206,16 +206,25 @@ public function testMaintenanceModeDisable()
 // functions to override native php functions
 namespace Magento\Setup\Model\Cron;
 
+/**
+ * @return string
+ */
 function fopen()
 {
     return 'filestream';
 }
 
+/**
+ * @return bool
+ */
 function is_resource()
 {
     return true;
 }
 
+/**
+ * @return string
+ */
 function get_resource_type()
 {
     return 'stream';
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobStaticRegenerateTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobStaticRegenerateTest.php
index f2d7d3daa0de7..9dfb1c57e48c6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobStaticRegenerateTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobStaticRegenerateTest.php
@@ -76,7 +76,7 @@ public function testExecuteDevelopernMode()
             ->method('getModeObject')
             ->will($this->returnValue($modeObjectMock));
 
-        $statusObject = $this->getStatucObjectMock(['add']);
+        $statusObject = $this->getStatusObjectMock(['add']);
         $statusObject
             ->expects($this->exactly(3))
             ->method('add');
@@ -124,7 +124,7 @@ public function testExecuteWithException()
             ->method('getModeObject')
             ->will($this->returnValue($modeObjectMock));
 
-        $statusObject = $this->getStatucObjectMock(['toggleUpdateError']);
+        $statusObject = $this->getStatusObjectMock(['toggleUpdateError']);
         $statusObject
             ->expects($this->once())
             ->method('toggleUpdateError');
@@ -161,7 +161,7 @@ protected function getFilesystemObjectMock($methods = null)
      *
      * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\Cron\Status
      */
-    protected function getStatucObjectMock($methods = null)
+    protected function getStatusObjectMock($methods = null)
     {
         return $this->createPartialMock(\Magento\Setup\Model\Cron\Status::class, $methods);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php
index f8f1d8542c38c..4a4ff2cb81e8d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php
@@ -201,6 +201,9 @@ public function testRunReadinessCheckLastTimestamp()
 
 namespace Magento\Setup\Model\Cron;
 
+/**
+ * @return int
+ */
 function time()
 {
     return 100;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php
new file mode 100644
index 0000000000000..d7a4d477de7b0
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php
@@ -0,0 +1,59 @@
+<?php
+/***
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Test\Unit\Model;
+
+use Magento\Framework\Math\Random;
+use Magento\Setup\Model\CryptKeyGenerator;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Testcase for CryptKeyGenerator
+ */
+class CryptKeyGeneratorTest extends TestCase
+{
+    /**
+     * @var Random|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $randomMock;
+
+    /**
+     * @var CryptKeyGenerator
+     */
+    private $cryptKeyGenerator;
+
+    public function setUp()
+    {
+        $this->randomMock = $this->getMockBuilder(Random::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cryptKeyGenerator = new CryptKeyGenerator($this->randomMock);
+    }
+
+    public function testStringForHashingIsReadFromRandom()
+    {
+        $this->randomMock
+            ->expects($this->once())
+            ->method('getRandomString')
+            ->willReturn('');
+        
+        $this->cryptKeyGenerator->generate();
+    }
+
+    public function testReturnsMd5OfRandomString()
+    {
+        $expected = 'fdb7594e77f1ad5fbb8e6c917b6012ce'; // == 'magento2'
+
+        $this->randomMock
+            ->method('getRandomString')
+            ->willReturn('magento2');
+
+        $actual = $this->cryptKeyGenerator->generate();
+
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php
index e6c7b420b661d..dfa001f44bc66 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/BrakeMixinTest.php
@@ -25,6 +25,9 @@ public function testApply($subject, $expectedResult)
         $this->assertEquals($expectedResult, $this->mixin->apply($subject));
     }
 
+    /**
+     * @return array
+     */
     public function getTestData()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php
index 48280e9c6f543..bf915fecf4701 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/HeaderMixinTest.php
@@ -25,6 +25,9 @@ public function testApply($subject, $expectedResult)
         $this->assertEquals($expectedResult, $this->mixin->apply($subject));
     }
 
+    /**
+     * @return array
+     */
     public function getTestData()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php
index b21c687a30960..c24fa49fcac24 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/RandomWordSelectorTest.php
@@ -34,6 +34,9 @@ public function testRandomSelector($fixtureSource, $fixtureCount)
         }
     }
 
+    /**
+     * @return array
+     */
     public function getTestData()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php
index 58e07df7391fc..7d3cbcdd00c71 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/Helper/WordWrapperTest.php
@@ -30,6 +30,9 @@ public function testWrapping($inputData, $expectedResult)
         );
     }
 
+    /**
+     * @return array
+     */
     public function getTestData()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php
index a522963d212ef..4fdb3090992bb 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Description/Mixin/ParagraphMixinTest.php
@@ -25,6 +25,9 @@ public function testApply($subject, $expectedResult)
         $this->assertEquals($expectedResult, $this->mixin->apply($subject));
     }
 
+    /**
+     * @return array
+     */
     public function getTestData()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/FixtureGenerator/SqlCollectorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/FixtureGenerator/SqlCollectorTest.php
index 3898f1d76105c..167f774cbd7a0 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/FixtureGenerator/SqlCollectorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/FixtureGenerator/SqlCollectorTest.php
@@ -65,7 +65,7 @@ public function testGetEmptySqlWhenSelectQueryProcessed()
         $this->resourceConnection->expects($this->once())->method('getConnection')->willReturn($connection);
 
         $query = $this->getMockBuilder(\Zend_Db_Profiler_Query::class)->disableOriginalConstructor()->getMock();
-        $query->expects($this->once())->method('getQueryType')->willReturn(\Zend_Db_Profiler::SELECT);
+        $query->expects($this->exactly(2))->method('getQueryType')->willReturn(\Zend_Db_Profiler::SELECT);
         $profiler->expects($this->once())->method('getQueryProfiles')->willReturn([$query]);
 
         $this->unit->disable();
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php
index 90c26b5632d21..11dca34763a05 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Grid/TypeMapperTest.php
@@ -39,6 +39,9 @@ public function testMap($packageType, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function mapDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
index a2e5ff1702b74..0ef30b9ab4d6f 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
@@ -6,24 +6,58 @@
 
 namespace Magento\Setup\Test\Unit\Model;
 
-use \Magento\Setup\Model\InstallerFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Setup\LoggerInterface;
+use Magento\Framework\Setup\SchemaPersistor;
+use Magento\Setup\Model\DeclarationInstaller;
+use Magento\Setup\Model\InstallerFactory;
+use Magento\Setup\Module\ResourceFactory;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class InstallerFactoryTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Setup\Model\ObjectManagerProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerProviderMock;
+
     public function testCreate()
     {
+        $this->objectManagerProviderMock = $this->getMockBuilder(\Magento\Setup\Model\ObjectManagerProvider::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMock();
+
+        $objectManagerMock = $this->getMockBuilder(ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMock();
+        $objectManagerMock->expects($this->any())
+            ->method('get')
+            ->willReturnMap(
+                [
+                    [DeclarationInstaller::class, $this->createMock(DeclarationInstaller::class)],
+                    [SchemaPersistor::class, $this->createMock(SchemaPersistor::class)],
+                ]
+            );
+        $this->objectManagerProviderMock->expects($this->any())
+            ->method('get')
+            ->willReturn($objectManagerMock);
+        /** @var ServiceLocatorInterface|\PHPUnit_Framework_MockObject_MockObject $serviceLocatorMock */
         $serviceLocatorMock = $this->getMockForAbstractClass(
-            \Zend\ServiceManager\ServiceLocatorInterface::class,
+            ServiceLocatorInterface::class,
             ['get']
         );
         $serviceLocatorMock->expects($this->any())->method('get')
             ->will($this->returnValueMap($this->getReturnValueMap()));
 
-        $log = $this->getMockForAbstractClass(\Magento\Framework\Setup\LoggerInterface::class);
-        $resourceFactoryMock = $this->createMock(\Magento\Setup\Module\ResourceFactory::class);
+        /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject $log */
+        $log = $this->getMockForAbstractClass(LoggerInterface::class);
+        /** @var ResourceFactory|\PHPUnit_Framework_MockObject_MockObject $resourceFactoryMock */
+        $resourceFactoryMock = $this->createMock(ResourceFactory::class);
         $resourceFactoryMock
             ->expects($this->any())
             ->method('create')
@@ -81,7 +115,7 @@ private function getReturnValueMap()
             ],
             [
                 \Magento\Setup\Model\ObjectManagerProvider::class,
-                $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class),
+                $this->objectManagerProviderMock
             ],
             [
                 \Magento\Framework\Model\ResourceModel\Db\TransactionManager::class,
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
index 34b60b3d4ec9e..e600002d53560 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
@@ -4,569 +4,709 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model;
-
-use Magento\Backend\Setup\ConfigOptionsList;
-use Magento\Framework\Config\ConfigOptionsListConstants;
-use \Magento\Setup\Model\Installer;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\DriverPool;
-use Magento\Framework\Config\File\ConfigFilePool;
-use Magento\Framework\App\State\CleanupFiles;
-use Magento\Setup\Validator\DbValidator;
-
-/**
- * @SuppressWarnings(PHPMD.TooManyFields)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class InstallerTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Setup\Model\Installer
-     */
-    private $object;
-
-    /**
-     * @var \Magento\Framework\Setup\FilePermissions|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $filePermissions;
-
-    /**
-     * @var \Magento\Framework\App\DeploymentConfig\Writer|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $configWriter;
-
-    /**
-     * @var \Magento\Framework\App\DeploymentConfig\Reader|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $configReader;
+namespace Magento\Setup\Test\Unit\Model {
+
+    use Magento\Backend\Setup\ConfigOptionsList;
+    use Magento\Framework\Config\ConfigOptionsListConstants;
+    use Magento\Framework\Setup\SchemaListener;
+    use Magento\Setup\Model\AdminAccount;
+    use Magento\Setup\Model\DeclarationInstaller;
+    use Magento\Setup\Model\Installer;
+    use Magento\Framework\App\Filesystem\DirectoryList;
+    use Magento\Framework\Filesystem\DriverPool;
+    use Magento\Framework\Config\File\ConfigFilePool;
+    use Magento\Framework\App\State\CleanupFiles;
+    use Magento\Framework\Setup\Patch\PatchApplier;
+    use Magento\Framework\Setup\Patch\PatchApplierFactory;
+    use Magento\Setup\Validator\DbValidator;
 
     /**
-     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     * @SuppressWarnings(PHPMD.TooManyFields)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
-    private $config;
-
-    /**
-     * @var \Magento\Framework\Module\ModuleListInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $moduleList;
-
-    /**
-     * @var \Magento\Framework\Module\ModuleList\Loader|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $moduleLoader;
-
-    /**
-     * @var \Magento\Framework\App\Filesystem\DirectoryList|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $directoryList;
-
-    /**
-     * @var \Magento\Setup\Model\AdminAccountFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $adminFactory;
-
-    /**
-     * @var \Magento\Framework\Setup\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $logger;
-
-    /**
-     * @var \Magento\Framework\Math\Random|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $random;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $connection;
-
-    /**
-     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $maintenanceMode;
-
-    /**
-     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $filesystem;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $objectManager;
-
-    /**
-     * @var \Magento\Setup\Model\ConfigModel|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $configModel;
-
-    /**
-     * @var CleanupFiles|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cleanupFiles;
-
-    /**
-     * @var DbValidator|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $dbValidator;
-
-    /**
-     * @var \Magento\Setup\Module\SetupFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $setupFactory;
-
-    /**
-     * @var \Magento\Setup\Module\DataSetupFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $dataSetupFactory;
-
-    /**
-     * @var \Magento\Framework\Setup\SampleData\State|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $sampleDataState;
-
-    /**
-     * @var \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $componentRegistrar;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\PhpReadinessCheck
-     */
-    private $phpReadinessCheck;
-
-    /**
-     * Sample DB configuration segment
-     *
-     * @var array
-     */
-    private static $dbConfig = [
-        ConfigOptionsListConstants::KEY_HOST => '127.0.0.1',
-        ConfigOptionsListConstants::KEY_NAME => 'magento',
-        ConfigOptionsListConstants::KEY_USER => 'magento',
-        ConfigOptionsListConstants::KEY_PASSWORD => '',
-    ];
-
-    /**
-     * @var \Magento\Framework\Model\ResourceModel\Db\Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $contextMock;
-
-    protected function setUp()
+    class InstallerTest extends \PHPUnit\Framework\TestCase
     {
-        $this->filePermissions = $this->createMock(\Magento\Framework\Setup\FilePermissions::class);
-        $this->configWriter = $this->createMock(\Magento\Framework\App\DeploymentConfig\Writer::class);
-        $this->configReader = $this->createMock(\Magento\Framework\App\DeploymentConfig\Reader::class);
-        $this->config = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-
-        $this->moduleList = $this->getMockForAbstractClass(\Magento\Framework\Module\ModuleListInterface::class);
-        $this->moduleList->expects($this->any())->method('getOne')->willReturn(
-            ['setup_version' => '2.0.0']
-        );
-        $this->moduleList->expects($this->any())->method('getNames')->willReturn(
-            ['Foo_One', 'Bar_Two']
-        );
-        $this->moduleLoader = $this->createMock(\Magento\Framework\Module\ModuleList\Loader::class);
-        $this->directoryList =
-            $this->createMock(\Magento\Framework\App\Filesystem\DirectoryList::class);
-        $this->adminFactory = $this->createMock(\Magento\Setup\Model\AdminAccountFactory::class);
-        $this->logger = $this->getMockForAbstractClass(\Magento\Framework\Setup\LoggerInterface::class);
-        $this->random = $this->createMock(\Magento\Framework\Math\Random::class);
-        $this->connection = $this->getMockForAbstractClass(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $this->maintenanceMode = $this->createMock(\Magento\Framework\App\MaintenanceMode::class);
-        $this->filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
-        $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
-        $this->contextMock =
-            $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
-        $this->configModel = $this->createMock(\Magento\Setup\Model\ConfigModel::class);
-        $this->cleanupFiles = $this->createMock(\Magento\Framework\App\State\CleanupFiles::class);
-        $this->dbValidator = $this->createMock(\Magento\Setup\Validator\DbValidator::class);
-        $this->setupFactory = $this->createMock(\Magento\Setup\Module\SetupFactory::class);
-        $this->dataSetupFactory = $this->createMock(\Magento\Setup\Module\DataSetupFactory::class);
-        $this->sampleDataState = $this->createMock(\Magento\Framework\Setup\SampleData\State::class);
-        $this->componentRegistrar =
-            $this->createMock(\Magento\Framework\Component\ComponentRegistrar::class);
-        $this->phpReadinessCheck = $this->createMock(\Magento\Setup\Model\PhpReadinessCheck::class);
-        $this->object = $this->createObject();
-    }
+        /**
+         * @var \Magento\Setup\Model\Installer
+         */
+        private $object;
+
+        /**
+         * @var \Magento\Framework\Setup\FilePermissions|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $filePermissions;
+
+        /**
+         * @var \Magento\Framework\App\DeploymentConfig\Writer|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $configWriter;
+
+        /**
+         * @var \Magento\Framework\App\DeploymentConfig\Reader|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $configReader;
+
+        /**
+         * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $config;
+
+        /**
+         * @var \Magento\Framework\Module\ModuleListInterface|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $moduleList;
+
+        /**
+         * @var \Magento\Framework\Module\ModuleList\Loader|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $moduleLoader;
+
+        /**
+         * @var \Magento\Framework\App\Filesystem\DirectoryList|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $directoryList;
+
+        /**
+         * @var \Magento\Setup\Model\AdminAccountFactory|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $adminFactory;
+
+        /**
+         * @var \Magento\Framework\Setup\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $logger;
+
+        /**
+         * @var \Magento\Framework\Math\Random|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $random;
+
+        /**
+         * @var \PHPUnit_Framework_MockObject_MockObject
+         */
+        private $connection;
+
+        /**
+         * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $maintenanceMode;
+
+        /**
+         * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $filesystem;
+
+        /**
+         * @var \PHPUnit_Framework_MockObject_MockObject
+         */
+        private $objectManager;
+
+        /**
+         * @var \Magento\Setup\Model\ConfigModel|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $configModel;
+
+        /**
+         * @var CleanupFiles|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $cleanupFiles;
+
+        /**
+         * @var DbValidator|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $dbValidator;
+
+        /**
+         * @var \Magento\Setup\Module\SetupFactory|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $setupFactory;
+
+        /**
+         * @var \Magento\Setup\Module\DataSetupFactory|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $dataSetupFactory;
+
+        /**
+         * @var \Magento\Framework\Setup\SampleData\State|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $sampleDataState;
+
+        /**
+         * @var \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $componentRegistrar;
+
+        /**
+         * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\PhpReadinessCheck
+         */
+        private $phpReadinessCheck;
+
+        /**
+         * @var \Magento\Framework\Setup\DeclarationInstaller|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $declarationInstallerMock;
+
+        /**
+         * @var SchemaListener|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $schemaListenerMock;
+
+        /**
+         * Sample DB configuration segment
+         * @var array
+         */
+        private static $dbConfig = [
+            'default' => [
+                ConfigOptionsListConstants::KEY_HOST => '127.0.0.1',
+                ConfigOptionsListConstants::KEY_NAME => 'magento',
+                ConfigOptionsListConstants::KEY_USER => 'magento',
+                ConfigOptionsListConstants::KEY_PASSWORD => '',
+            ]
+        ];
 
-    /**
-     * Instantiates the object with mocks
-     *
-     * @param \PHPUnit_Framework_MockObject_MockObject|bool $connectionFactory
-     * @param \PHPUnit_Framework_MockObject_MockObject|bool $objectManagerProvider
-     * @return Installer
-     */
-    private function createObject($connectionFactory = false, $objectManagerProvider = false)
-    {
-        if (!$connectionFactory) {
-            $connectionFactory = $this->createMock(\Magento\Setup\Module\ConnectionFactory::class);
-            $connectionFactory->expects($this->any())->method('create')->willReturn($this->connection);
-        }
-        if (!$objectManagerProvider) {
-            $objectManagerProvider =
-                $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class);
-            $objectManagerProvider->expects($this->any())->method('get')->willReturn($this->objectManager);
+        /**
+         * @var \Magento\Framework\Model\ResourceModel\Db\Context|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $contextMock;
+
+        /**
+         * @var PatchApplier|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $patchApplierMock;
+
+        /**
+         * @var PatchApplierFactory|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $patchApplierFactoryMock;
+
+        protected function setUp()
+        {
+            $this->filePermissions = $this->createMock(\Magento\Framework\Setup\FilePermissions::class);
+            $this->configWriter = $this->createMock(\Magento\Framework\App\DeploymentConfig\Writer::class);
+            $this->configReader = $this->createMock(\Magento\Framework\App\DeploymentConfig\Reader::class);
+            $this->config = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+
+            $this->moduleList = $this->getMockForAbstractClass(\Magento\Framework\Module\ModuleListInterface::class);
+            $this->moduleList->expects($this->any())->method('getOne')->willReturn(
+                ['setup_version' => '2.0.0']
+            );
+            $this->moduleList->expects($this->any())->method('getNames')->willReturn(
+                ['Foo_One', 'Bar_Two']
+            );
+            $this->moduleLoader = $this->createMock(\Magento\Framework\Module\ModuleList\Loader::class);
+            $this->directoryList =
+                $this->createMock(\Magento\Framework\App\Filesystem\DirectoryList::class);
+            $this->adminFactory = $this->createMock(\Magento\Setup\Model\AdminAccountFactory::class);
+            $this->logger = $this->getMockForAbstractClass(\Magento\Framework\Setup\LoggerInterface::class);
+            $this->random = $this->createMock(\Magento\Framework\Math\Random::class);
+            $this->connection = $this->getMockForAbstractClass(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+            $this->maintenanceMode = $this->createMock(\Magento\Framework\App\MaintenanceMode::class);
+            $this->filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
+            $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
+            $this->contextMock =
+                $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
+            $this->configModel = $this->createMock(\Magento\Setup\Model\ConfigModel::class);
+            $this->cleanupFiles = $this->createMock(\Magento\Framework\App\State\CleanupFiles::class);
+            $this->dbValidator = $this->createMock(\Magento\Setup\Validator\DbValidator::class);
+            $this->setupFactory = $this->createMock(\Magento\Setup\Module\SetupFactory::class);
+            $this->dataSetupFactory = $this->createMock(\Magento\Setup\Module\DataSetupFactory::class);
+            $this->sampleDataState = $this->createMock(\Magento\Framework\Setup\SampleData\State::class);
+            $this->componentRegistrar =
+                $this->createMock(\Magento\Framework\Component\ComponentRegistrar::class);
+            $this->phpReadinessCheck = $this->createMock(\Magento\Setup\Model\PhpReadinessCheck::class);
+            $this->declarationInstallerMock = $this->createMock(DeclarationInstaller::class);
+            $this->schemaListenerMock = $this->createMock(SchemaListener::class);
+            $this->patchApplierFactoryMock = $this->createMock(PatchApplierFactory::class);
+            $this->patchApplierMock = $this->createMock(PatchApplier::class);
+            $this->patchApplierFactoryMock->expects($this->any())->method('create')->willReturn(
+                $this->patchApplierMock
+            );
+            $this->object = $this->createObject();
         }
 
-        return new Installer(
-            $this->filePermissions,
-            $this->configWriter,
-            $this->configReader,
-            $this->config,
-            $this->moduleList,
-            $this->moduleLoader,
-            $this->adminFactory,
-            $this->logger,
-            $connectionFactory,
-            $this->maintenanceMode,
-            $this->filesystem,
-            $objectManagerProvider,
-            $this->contextMock,
-            $this->configModel,
-            $this->cleanupFiles,
-            $this->dbValidator,
-            $this->setupFactory,
-            $this->dataSetupFactory,
-            $this->sampleDataState,
-            $this->componentRegistrar,
-            $this->phpReadinessCheck
-        );
-    }
+        /**
+         * Instantiates the object with mocks
+         * @param \PHPUnit_Framework_MockObject_MockObject|bool $connectionFactory
+         * @param \PHPUnit_Framework_MockObject_MockObject|bool $objectManagerProvider
+         * @return Installer
+         */
+        private function createObject($connectionFactory = false, $objectManagerProvider = false)
+        {
+            if (!$connectionFactory) {
+                $connectionFactory = $this->createMock(\Magento\Setup\Module\ConnectionFactory::class);
+                $connectionFactory->expects($this->any())->method('create')->willReturn($this->connection);
+            }
+            if (!$objectManagerProvider) {
+                $objectManagerProvider =
+                    $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class);
+                $objectManagerProvider->expects($this->any())->method('get')->willReturn($this->objectManager);
+            }
+
+            return new Installer(
+                $this->filePermissions,
+                $this->configWriter,
+                $this->configReader,
+                $this->config,
+                $this->moduleList,
+                $this->moduleLoader,
+                $this->adminFactory,
+                $this->logger,
+                $connectionFactory,
+                $this->maintenanceMode,
+                $this->filesystem,
+                $objectManagerProvider,
+                $this->contextMock,
+                $this->configModel,
+                $this->cleanupFiles,
+                $this->dbValidator,
+                $this->setupFactory,
+                $this->dataSetupFactory,
+                $this->sampleDataState,
+                $this->componentRegistrar,
+                $this->phpReadinessCheck,
+                $this->declarationInstallerMock
+            );
+        }
 
-    public function testInstall()
-    {
-        $request = [
-            ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
-            ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
-            ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
-            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
-            ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
-        ];
-        $this->config->expects($this->atLeastOnce())
-            ->method('get')
-            ->willReturnMap(
+        /**
+         * @param array $request
+         * @param array $logMessages
+         * @dataProvider installDataProvider
+         * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+         */
+        public function testInstall(array $request, array $logMessages)
+        {
+            $this->config->expects($this->atLeastOnce())
+                ->method('get')
+                ->willReturnMap(
+                    [
+                        [ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT, null, true],
+                        [ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, null, true],
+                        ['modules/Magento_User', null, '1']
+                    ]
+                );
+            $allModules = ['Foo_One' => [], 'Bar_Two' => []];
+
+            $this->declarationInstallerMock->expects($this->once())->method('installSchema');
+            $this->moduleLoader->expects($this->any())->method('load')->willReturn($allModules);
+            $setup = $this->createMock(\Magento\Setup\Module\Setup::class);
+            $table = $this->createMock(\Magento\Framework\DB\Ddl\Table::class);
+            $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+                ->setMethods(['getSchemaListener', 'newTable'])
+                ->getMockForAbstractClass();
+            $connection->expects($this->any())->method('getSchemaListener')->willReturn($this->schemaListenerMock);
+            $setup->expects($this->any())->method('getConnection')->willReturn($connection);
+            $table->expects($this->any())->method('addColumn')->willReturn($table);
+            $table->expects($this->any())->method('setComment')->willReturn($table);
+            $table->expects($this->any())->method('addIndex')->willReturn($table);
+            $connection->expects($this->any())->method('newTable')->willReturn($table);
+            $resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+            $this->contextMock->expects($this->any())->method('getResources')->willReturn($resource);
+            $resource->expects($this->any())->method('getConnection')->will($this->returnValue($connection));
+            $dataSetup = $this->createMock(\Magento\Setup\Module\DataSetup::class);
+            $dataSetup->expects($this->any())->method('getConnection')->willReturn($connection);
+            $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
+            $cacheManager->expects($this->any())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
+            $cacheManager->expects($this->once())->method('setEnabled')->willReturn(['foo', 'bar']);
+            $cacheManager->expects($this->any())->method('clean');
+            $appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
+                ->disableOriginalConstructor()
+                ->disableArgumentCloning()
+                ->getMock();
+            $appState->expects($this->once())
+                ->method('setAreaCode')
+                ->with(\Magento\Framework\App\Area::AREA_GLOBAL);
+            $registry = $this->createMock(\Magento\Framework\Registry::class);
+            $this->setupFactory->expects($this->atLeastOnce())->method('create')->with($resource)->willReturn($setup);
+            $this->dataSetupFactory->expects($this->atLeastOnce())->method('create')->willReturn($dataSetup);
+            $this->objectManager->expects($this->any())
+                ->method('create')
+                ->will($this->returnValueMap([
+                    [\Magento\Framework\App\Cache\Manager::class, [], $cacheManager],
+                    [\Magento\Framework\App\State::class, [], $appState],
+                    [
+                        PatchApplierFactory::class,
+                        ['objectManager' => $this->objectManager],
+                        $this->patchApplierFactoryMock
+                    ],
+                ]));
+            $this->patchApplierMock->expects($this->exactly(2))->method('applySchemaPatch')->willReturnMap(
                 [
-                    [ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT, null, true],
-                    [ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, null, true],
+                    ['Bar_Two'],
+                    ['Foo_One'],
                 ]
             );
-        $allModules = ['Foo_One' => [], 'Bar_Two' => []];
-        $this->moduleLoader->expects($this->any())->method('load')->willReturn($allModules);
-        $setup = $this->createMock(\Magento\Setup\Module\Setup::class);
-        $table = $this->createMock(\Magento\Framework\DB\Ddl\Table::class);
-        $connection = $this->getMockForAbstractClass(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $setup->expects($this->any())->method('getConnection')->willReturn($connection);
-        $table->expects($this->any())->method('addColumn')->willReturn($table);
-        $table->expects($this->any())->method('setComment')->willReturn($table);
-        $table->expects($this->any())->method('addIndex')->willReturn($table);
-        $connection->expects($this->any())->method('newTable')->willReturn($table);
-        $resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
-        $this->contextMock->expects($this->any())->method('getResources')->willReturn($resource);
-        $resource->expects($this->any())->method('getConnection')->will($this->returnValue($connection));
-        $dataSetup = $this->createMock(\Magento\Setup\Module\DataSetup::class);
-        $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
-        $cacheManager->expects($this->any())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
-        $cacheManager->expects($this->once())->method('setEnabled')->willReturn(['foo', 'bar']);
-        $cacheManager->expects($this->any())->method('clean');
-        $appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
-            ->disableOriginalConstructor()
-            ->disableArgumentCloning()
-            ->getMock();
-        $appState->expects($this->once())
-            ->method('setAreaCode')
-            ->with(\Magento\Framework\App\Area::AREA_GLOBAL);
-        $this->setupFactory->expects($this->atLeastOnce())->method('create')->with($resource)->willReturn($setup);
-        $this->dataSetupFactory->expects($this->atLeastOnce())->method('create')->willReturn($dataSetup);
-        $this->objectManager->expects($this->any())
-            ->method('create')
-            ->will($this->returnValueMap([
-                [\Magento\Framework\App\Cache\Manager::class, [], $cacheManager],
-                [\Magento\Framework\App\State::class, [], $appState],
-            ]));
-        $this->objectManager->expects($this->any())
-            ->method('get')
-            ->will($this->returnValueMap([
-                [\Magento\Framework\App\State::class, $appState],
-                [\Magento\Framework\App\Cache\Manager::class, $cacheManager]
-            ]));
-        $this->adminFactory->expects($this->once())->method('create')->willReturn(
-            $this->createMock(\Magento\Setup\Model\AdminAccount::class)
-        );
-        $this->sampleDataState->expects($this->once())->method('hasError')->willReturn(true);
-        $this->phpReadinessCheck->expects($this->once())->method('checkPhpExtensions')->willReturn(
-            ['responseType' => \Magento\Setup\Controller\ResponseTypeInterface::RESPONSE_TYPE_SUCCESS]
-        );
-        $this->filePermissions->expects($this->any())
-            ->method('getMissingWritablePathsForInstallation')
-            ->willReturn([]);
-        $this->filePermissions->expects($this->once())
-            ->method('getMissingWritableDirectoriesForDbUpgrade')
-            ->willReturn([]);
-        $this->setupLoggerExpectsForInstall();
-
-        $this->object->install($request);
-    }
-
-    public function testCheckInstallationFilePermissions()
-    {
-        $this->filePermissions
-            ->expects($this->once())
-            ->method('getMissingWritablePathsForInstallation')
-            ->willReturn([]);
-        $this->object->checkInstallationFilePermissions();
-    }
+            $this->patchApplierMock->expects($this->exactly(2))->method('applyDataPatch')->willReturnMap(
+                [
+                    ['Bar_Two'],
+                    ['Foo_One'],
+                ]
+            );
+            $this->objectManager->expects($this->any())
+                ->method('get')
+                ->will($this->returnValueMap([
+                    [\Magento\Framework\App\State::class, $appState],
+                    [\Magento\Framework\App\Cache\Manager::class, $cacheManager],
+                    [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock],
+                    [\Magento\Framework\Registry::class, $registry]
+                ]));
+            $this->adminFactory->expects($this->any())->method('create')->willReturn(
+                $this->createMock(\Magento\Setup\Model\AdminAccount::class)
+            );
+            $this->sampleDataState->expects($this->once())->method('hasError')->willReturn(true);
+            $this->phpReadinessCheck->expects($this->once())->method('checkPhpExtensions')->willReturn(
+                ['responseType' => \Magento\Setup\Controller\ResponseTypeInterface::RESPONSE_TYPE_SUCCESS]
+            );
+            $this->filePermissions->expects($this->any())
+                ->method('getMissingWritablePathsForInstallation')
+                ->willReturn([]);
+            $this->filePermissions->expects($this->once())
+                ->method('getMissingWritableDirectoriesForDbUpgrade')
+                ->willReturn([]);
+            call_user_func_array(
+                [
+                    $this->logger->expects($this->exactly(count($logMessages)))->method('log'),
+                    'withConsecutive'
+                ],
+                $logMessages
+            );
+            $this->logger->expects($this->exactly(2))
+                ->method('logSuccess')
+                ->withConsecutive(
+                    ['Magento installation complete.'],
+                    ['Magento Admin URI: /']
+                );
+
+            $this->object->install($request);
+        }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Missing write permissions to the following paths:
-     */
-    public function testCheckInstallationFilePermissionsError()
-    {
-        $this->filePermissions
-            ->expects($this->once())
-            ->method('getMissingWritablePathsForInstallation')
-            ->willReturn(['foo', 'bar']);
-        $this->object->checkInstallationFilePermissions();
-    }
+        /**
+         * @return array
+         */
+        public function installDataProvider()
+        {
+            return [
+                [
+                    'request' => [
+                        ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
+                        ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
+                        ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
+                        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
+                        ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
+                    ],
+                    'logMessages' => [
+                        ['Starting Magento installation:'],
+                        ['File permissions check...'],
+                        ['Required extensions check...'],
+                        ['Enabling Maintenance Mode...'],
+                        ['Installing deployment configuration...'],
+                        ['Installing database schema:'],
+                        ['Schema creation/updates:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Schema post-updates:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Installing user configuration...'],
+                        ['Enabling caches:'],
+                        ['Current status:'],
+                        [''],
+                        ['Installing data...'],
+                        ['Data install/update:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Data post-updates:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        //['Installing admin user...'],
+                        ['Caches clearing:'],
+                        ['Cache cleared successfully'],
+                        ['Disabling Maintenance Mode:'],
+                        ['Post installation file permissions check...'],
+                        ['Write installation date...'],
+                        ['Sample Data is installed with errors. See log file for details']
+                    ],
+                ],
+                [
+                    'request' => [
+                        ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
+                        ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
+                        ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
+                        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
+                        ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
+                        AdminAccount::KEY_USER => 'admin',
+                        AdminAccount::KEY_PASSWORD => '123',
+                        AdminAccount::KEY_EMAIL => 'admin@example.com',
+                        AdminAccount::KEY_FIRST_NAME => 'John',
+                        AdminAccount::KEY_LAST_NAME => 'Doe',
+                    ],
+                    'logMessages' => [
+                        ['Starting Magento installation:'],
+                        ['File permissions check...'],
+                        ['Required extensions check...'],
+                        ['Enabling Maintenance Mode...'],
+                        ['Installing deployment configuration...'],
+                        ['Installing database schema:'],
+                        ['Schema creation/updates:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Schema post-updates:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Installing user configuration...'],
+                        ['Enabling caches:'],
+                        ['Current status:'],
+                        [''],
+                        ['Installing data...'],
+                        ['Data install/update:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Data post-updates:'],
+                        ['Module \'Foo_One\':'],
+                        ['Module \'Bar_Two\':'],
+                        ['Installing admin user...'],
+                        ['Caches clearing:'],
+                        ['Cache cleared successfully'],
+                        ['Disabling Maintenance Mode:'],
+                        ['Post installation file permissions check...'],
+                        ['Write installation date...'],
+                        ['Sample Data is installed with errors. See log file for details']
+                    ],
+                ],
+            ];
+        }
 
-    public function testCheckExtensions()
-    {
-        $this->phpReadinessCheck->expects($this->once())->method('checkPhpExtensions')->willReturn(
-            ['responseType' => \Magento\Setup\Controller\ResponseTypeInterface::RESPONSE_TYPE_SUCCESS]
-        );
-        $this->object->checkExtensions();
-    }
+        public function testCheckInstallationFilePermissions()
+        {
+            $this->filePermissions
+                ->expects($this->once())
+                ->method('getMissingWritablePathsForInstallation')
+                ->willReturn([]);
+            $this->object->checkInstallationFilePermissions();
+        }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Missing following extensions: 'foo'
-     */
-    public function testCheckExtensionsError()
-    {
-        $this->phpReadinessCheck->expects($this->once())->method('checkPhpExtensions')->willReturn(
-            ['responseType' => \Magento\Setup\Controller\ResponseTypeInterface::RESPONSE_TYPE_ERROR,
-            'data'=>['required'=>['foo', 'bar'], 'missing'=>['foo']]]
-        );
-        $this->object->checkExtensions();
-    }
+        /**
+         * @expectedException \Exception
+         * @expectedExceptionMessage Missing write permissions to the following paths:
+         */
+        public function testCheckInstallationFilePermissionsError()
+        {
+            $this->filePermissions
+                ->expects($this->once())
+                ->method('getMissingWritablePathsForInstallation')
+                ->willReturn(['foo', 'bar']);
+            $this->object->checkInstallationFilePermissions();
+        }
 
-    public function testCheckApplicationFilePermissions()
-    {
-        $this->filePermissions
-            ->expects($this->once())
-            ->method('getUnnecessaryWritableDirectoriesForApplication')
-            ->willReturn(['foo', 'bar']);
-        $expectedMessage = "For security, remove write permissions from these directories: 'foo' 'bar'";
-        $this->logger->expects($this->once())->method('log')->with($expectedMessage);
-        $this->object->checkApplicationFilePermissions();
-        $this->assertSame(['message' => [$expectedMessage]], $this->object->getInstallInfo());
-    }
+        public function testCheckExtensions()
+        {
+            $this->phpReadinessCheck->expects($this->once())->method('checkPhpExtensions')->willReturn(
+                ['responseType' => \Magento\Setup\Controller\ResponseTypeInterface::RESPONSE_TYPE_SUCCESS]
+            );
+            $this->object->checkExtensions();
+        }
 
-    public function testUpdateModulesSequence()
-    {
-        $this->cleanupFiles->expects($this->once())->method('clearCodeGeneratedFiles')->will(
-            $this->returnValue(
+        /**
+         * @expectedException \Exception
+         * @expectedExceptionMessage Missing following extensions: 'foo'
+         */
+        public function testCheckExtensionsError()
+        {
+            $this->phpReadinessCheck->expects($this->once())->method('checkPhpExtensions')->willReturn(
                 [
-                    "The directory '/generation' doesn't exist - skipping cleanup",
+                    'responseType' => \Magento\Setup\Controller\ResponseTypeInterface::RESPONSE_TYPE_ERROR,
+                    'data' => ['required' => ['foo', 'bar'], 'missing' => ['foo']]
                 ]
-            )
-        );
-        $installer = $this->prepareForUpdateModulesTests();
-
-        $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
-        $this->logger->expects($this->at(1))->method('log')->with('File system cleanup:');
-        $this->logger->expects($this->at(2))->method('log')
-            ->with('The directory \'/generation\' doesn\'t exist - skipping cleanup');
-        $this->logger->expects($this->at(3))->method('log')->with('Updating modules:');
-        $installer->updateModulesSequence(false);
-    }
+            );
+            $this->object->checkExtensions();
+        }
 
-    public function testUpdateModulesSequenceKeepGenerated()
-    {
-        $this->cleanupFiles->expects($this->never())->method('clearCodeGeneratedClasses');
+        public function testCheckApplicationFilePermissions()
+        {
+            $this->filePermissions
+                ->expects($this->once())
+                ->method('getUnnecessaryWritableDirectoriesForApplication')
+                ->willReturn(['foo', 'bar']);
+            $expectedMessage = "For security, remove write permissions from these directories: 'foo' 'bar'";
+            $this->logger->expects($this->once())->method('log')->with($expectedMessage);
+            $this->object->checkApplicationFilePermissions();
+            $this->assertSame(['message' => [$expectedMessage]], $this->object->getInstallInfo());
+        }
 
-        $installer = $this->prepareForUpdateModulesTests();
+        public function testUpdateModulesSequence()
+        {
+            $this->cleanupFiles->expects($this->once())->method('clearCodeGeneratedFiles')->will(
+                $this->returnValue(
+                    [
+                        "The directory '/generation' doesn't exist - skipping cleanup",
+                    ]
+                )
+            );
+            $installer = $this->prepareForUpdateModulesTests();
+
+            $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(1))->method('log')->with('File system cleanup:');
+            $this->logger->expects($this->at(2))->method('log')
+                ->with('The directory \'/generation\' doesn\'t exist - skipping cleanup');
+            $this->logger->expects($this->at(3))->method('log')->with('Updating modules:');
+            $installer->updateModulesSequence(false);
+        }
 
-        $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
-        $this->logger->expects($this->at(1))->method('log')->with('Updating modules:');
-        $installer->updateModulesSequence(true);
-    }
+        public function testUpdateModulesSequenceKeepGenerated()
+        {
+            $this->cleanupFiles->expects($this->never())->method('clearCodeGeneratedClasses');
 
-    public function testUninstall()
-    {
-        $this->configReader->expects($this->once())->method('getFiles')->willReturn(['ConfigOne.php', 'ConfigTwo.php']);
-        $configDir = $this->getMockForAbstractClass(
-            \Magento\Framework\Filesystem\Directory\WriteInterface::class
-        );
-        $configDir
-            ->expects($this->exactly(2))
-            ->method('getAbsolutePath')
-            ->will(
-                $this->returnValueMap(
+            $installer = $this->prepareForUpdateModulesTests();
+
+            $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(1))->method('log')->with('Updating modules:');
+            $installer->updateModulesSequence(true);
+        }
+
+        public function testUninstall()
+        {
+            $this->config->expects($this->once())
+                ->method('get')
+                ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS)
+                ->willReturn([]);
+            $this->configReader->expects($this->once())->method('getFiles')->willReturn([
+                'ConfigOne.php',
+                'ConfigTwo.php'
+            ]);
+            $configDir = $this->getMockForAbstractClass(
+                \Magento\Framework\Filesystem\Directory\WriteInterface::class
+            );
+            $configDir
+                ->expects($this->exactly(2))
+                ->method('getAbsolutePath')
+                ->will(
+                    $this->returnValueMap(
+                        [
+                            ['ConfigOne.php', '/config/ConfigOne.php'],
+                            ['ConfigTwo.php', '/config/ConfigTwo.php']
+                        ]
+                    )
+                );
+            $this->filesystem
+                ->expects($this->any())
+                ->method('getDirectoryWrite')
+                ->will($this->returnValueMap([
+                    [DirectoryList::CONFIG, DriverPool::FILE, $configDir],
+                ]));
+            $this->logger->expects($this->at(0))->method('log')->with('Starting Magento uninstallation:');
+            $this->logger
+                ->expects($this->at(2))
+                ->method('log')
+                ->with('No database connection defined - skipping database cleanup');
+            $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
+            $cacheManager->expects($this->once())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
+            $cacheManager->expects($this->once())->method('clean');
+            $this->objectManager->expects($this->any())
+                ->method('get')
+                ->with(\Magento\Framework\App\Cache\Manager::class)
+                ->willReturn($cacheManager);
+            $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(3))->method('log')->with('File system cleanup:');
+            $this->logger
+                ->expects($this->at(4))
+                ->method('log')
+                ->with("The directory '/var' doesn't exist - skipping cleanup");
+            $this->logger
+                ->expects($this->at(5))
+                ->method('log')
+                ->with("The directory '/static' doesn't exist - skipping cleanup");
+            $this->logger
+                ->expects($this->at(6))
+                ->method('log')
+                ->with("The file '/config/ConfigOne.php' doesn't exist - skipping cleanup");
+            $this->logger
+                ->expects($this->at(7))
+                ->method('log')
+                ->with("The file '/config/ConfigTwo.php' doesn't exist - skipping cleanup");
+            $this->logger->expects($this->once())->method('logSuccess')->with('Magento uninstallation complete.');
+            $this->cleanupFiles->expects($this->once())->method('clearAllFiles')->will(
+                $this->returnValue(
                     [
-                        ['ConfigOne.php', '/config/ConfigOne.php'],
-                        ['ConfigTwo.php', '/config/ConfigTwo.php']
+                        "The directory '/var' doesn't exist - skipping cleanup",
+                        "The directory '/static' doesn't exist - skipping cleanup"
                     ]
                 )
             );
-        $this->filesystem
-            ->expects($this->any())
-            ->method('getDirectoryWrite')
-            ->will($this->returnValueMap([
-                [DirectoryList::CONFIG, DriverPool::FILE, $configDir],
-            ]));
-        $this->logger->expects($this->at(0))->method('log')->with('Starting Magento uninstallation:');
-        $this->logger
-            ->expects($this->at(2))
-            ->method('log')
-            ->with('No database connection defined - skipping database cleanup');
-        $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
-        $cacheManager->expects($this->once())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
-        $cacheManager->expects($this->once())->method('clean');
-        $this->objectManager->expects($this->any())
-            ->method('get')
-            ->with(\Magento\Framework\App\Cache\Manager::class)
-            ->willReturn($cacheManager);
-        $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
-        $this->logger->expects($this->at(3))->method('log')->with('File system cleanup:');
-        $this->logger
-            ->expects($this->at(4))
-            ->method('log')
-            ->with("The directory '/var' doesn't exist - skipping cleanup");
-        $this->logger
-            ->expects($this->at(5))
-            ->method('log')
-            ->with("The directory '/static' doesn't exist - skipping cleanup");
-        $this->logger
-            ->expects($this->at(6))
-            ->method('log')
-            ->with("The file '/config/ConfigOne.php' doesn't exist - skipping cleanup");
-        $this->logger
-            ->expects($this->at(7))
-            ->method('log')
-            ->with("The file '/config/ConfigTwo.php' doesn't exist - skipping cleanup");
-        $this->logger->expects($this->once())->method('logSuccess')->with('Magento uninstallation complete.');
-        $this->cleanupFiles->expects($this->once())->method('clearAllFiles')->will(
-            $this->returnValue(
-                [
-                    "The directory '/var' doesn't exist - skipping cleanup",
-                    "The directory '/static' doesn't exist - skipping cleanup"
-                ]
-            )
-        );
-
-        $this->object->uninstall();
-    }
 
-    public function testCleanupDb()
-    {
-        $this->config->expects($this->once())
-            ->method('get')
-            ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT)
-            ->willReturn(self::$dbConfig);
-        $this->connection->expects($this->at(0))->method('quoteIdentifier')->with('magento')->willReturn('`magento`');
-        $this->connection->expects($this->at(1))->method('query')->with('DROP DATABASE IF EXISTS `magento`');
-        $this->connection->expects($this->at(2))->method('query')->with('CREATE DATABASE IF NOT EXISTS `magento`');
-        $this->logger->expects($this->once())->method('log')->with('Cleaning up database `magento`');
-        $this->object->cleanupDb();
-    }
+            $this->object->uninstall();
+        }
 
-    /**
-     * Prepare mocks for update modules tests and returns the installer to use
-     *
-     * @return Installer
-     */
-    private function prepareForUpdateModulesTests()
-    {
-        $allModules = [
-            'Foo_One' => [],
-            'Bar_Two' => [],
-            'New_Module' => [],
-        ];
+        public function testCleanupDb()
+        {
+            $this->config->expects($this->once())
+                ->method('get')
+                ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS)
+                ->willReturn(self::$dbConfig);
+            $this->connection->expects($this->at(0))->method('quoteIdentifier')->with('magento')->willReturn(
+                '`magento`'
+            );
+            $this->connection->expects($this->at(1))->method('query')->with('DROP DATABASE IF EXISTS `magento`');
+            $this->connection->expects($this->at(2))->method('query')->with('CREATE DATABASE IF NOT EXISTS `magento`');
+            $this->logger->expects($this->once())->method('log')->with('Cleaning up database `magento`');
+            $this->object->cleanupDb();
+        }
 
-        $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
-        $cacheManager->expects($this->once())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
-        $cacheManager->expects($this->once())->method('clean');
-        $this->objectManager->expects($this->any())
-            ->method('get')
-            ->will($this->returnValueMap([
-                [\Magento\Framework\App\Cache\Manager::class, $cacheManager]
-            ]));
-        $this->moduleLoader->expects($this->once())->method('load')->willReturn($allModules);
-
-        $expectedModules = [
-            ConfigFilePool::APP_CONFIG => [
-                'modules' => [
-                    'Bar_Two' => 0,
-                    'Foo_One' => 1,
-                    'New_Module' => 1
+        /**
+         * Prepare mocks for update modules tests and returns the installer to use
+         * @return Installer
+         */
+        private function prepareForUpdateModulesTests()
+        {
+            $allModules = [
+                'Foo_One' => [],
+                'Bar_Two' => [],
+                'New_Module' => [],
+            ];
+
+            $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
+            $cacheManager->expects($this->once())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
+            $cacheManager->expects($this->once())->method('clean');
+            $this->objectManager->expects($this->any())
+                ->method('get')
+                ->will($this->returnValueMap([
+                    [\Magento\Framework\App\Cache\Manager::class, $cacheManager]
+                ]));
+            $this->moduleLoader->expects($this->once())->method('load')->willReturn($allModules);
+
+            $expectedModules = [
+                ConfigFilePool::APP_CONFIG => [
+                    'modules' => [
+                        'Bar_Two' => 0,
+                        'Foo_One' => 1,
+                        'New_Module' => 1
+                    ]
                 ]
-            ]
-        ];
+            ];
 
-        $this->config->expects($this->atLeastOnce())
-            ->method('get')
-            ->with(ConfigOptionsListConstants::KEY_MODULES)
-            ->willReturn(true);
+            $this->config->expects($this->atLeastOnce())
+                ->method('get')
+                ->with(ConfigOptionsListConstants::KEY_MODULES)
+                ->willReturn(true);
 
-        $newObject = $this->createObject(false, false);
-        $this->configReader->expects($this->once())->method('load')
-            ->willReturn(['modules' => ['Bar_Two' => 0, 'Foo_One' => 1, 'Old_Module' => 0] ]);
-        $this->configWriter->expects($this->once())->method('saveConfig')->with($expectedModules);
+            $newObject = $this->createObject(false, false);
+            $this->configReader->expects($this->once())->method('load')
+                ->willReturn(['modules' => ['Bar_Two' => 0, 'Foo_One' => 1, 'Old_Module' => 0]]);
+            $this->configWriter->expects($this->once())->method('saveConfig')->with($expectedModules);
 
-        return $newObject;
+            return $newObject;
+        }
     }
+}
+
+namespace Magento\Setup\Model {
 
     /**
-     * Set up logger expectations for install method
+     * Mocking autoload function
      *
-     * @return void
+     * @returns array
      */
-    private function setupLoggerExpectsForInstall()
+    function spl_autoload_functions()
     {
-        $this->logger->expects($this->at(0))->method('log')->with('Starting Magento installation:');
-        $this->logger->expects($this->at(1))->method('log')->with('File permissions check...');
-        $this->logger->expects($this->at(3))->method('log')->with('Required extensions check...');
-        // at(2) invokes logMeta()
-        $this->logger->expects($this->at(5))->method('log')->with('Enabling Maintenance Mode...');
-        // at(4) - logMeta and so on...
-        $this->logger->expects($this->at(7))->method('log')->with('Installing deployment configuration...');
-        $this->logger->expects($this->at(9))->method('log')->with('Installing database schema:');
-        $this->logger->expects($this->at(11))->method('log')->with("Module 'Foo_One':");
-        $this->logger->expects($this->at(13))->method('log')->with("Module 'Bar_Two':");
-        $this->logger->expects($this->at(15))->method('log')->with('Schema post-updates:');
-        $this->logger->expects($this->at(16))->method('log')->with("Module 'Foo_One':");
-        $this->logger->expects($this->at(18))->method('log')->with("Module 'Bar_Two':");
-        $this->logger->expects($this->at(21))->method('log')->with('Installing user configuration...');
-        $this->logger->expects($this->at(23))->method('log')->with('Enabling caches:');
-        $this->logger->expects($this->at(27))->method('log')->with('Installing data...');
-        $this->logger->expects($this->at(28))->method('log')->with('Data install/update:');
-        $this->logger->expects($this->at(29))->method('log')->with("Module 'Foo_One':");
-        $this->logger->expects($this->at(31))->method('log')->with("Module 'Bar_Two':");
-        $this->logger->expects($this->at(33))->method('log')->with('Data post-updates:');
-        $this->logger->expects($this->at(34))->method('log')->with("Module 'Foo_One':");
-        $this->logger->expects($this->at(36))->method('log')->with("Module 'Bar_Two':");
-        $this->logger->expects($this->at(39))->method('log')->with('Installing admin user...');
-        $this->logger->expects($this->at(41))->method('log')->with('Caches clearing:');
-        $this->logger->expects($this->at(44))->method('log')->with('Disabling Maintenance Mode:');
-        $this->logger->expects($this->at(46))->method('log')->with('Post installation file permissions check...');
-        $this->logger->expects($this->at(48))->method('log')->with('Write installation date...');
-        $this->logger->expects($this->at(50))->method('logSuccess')->with('Magento installation complete.');
-        $this->logger->expects($this->at(52))->method('log')
-            ->with('Sample Data is installed with errors. See log file for details');
+        return ['mock_function_one', 'mock_function_two'];
     }
 }
-
-namespace Magento\Setup\Model;
-
-/**
- * Mocking autoload function
- *
- * @returns array
- */
-function spl_autoload_functions()
-{
-    return ['mock_function_one', 'mock_function_two'];
-}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
index 89f7956332aac..73202fdd2b9a4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Setup\Model\ModuleUninstaller;
+use Magento\Framework\Setup\Patch\PatchApplier;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -47,6 +48,11 @@ class ModuleUninstallerTest extends \PHPUnit\Framework\TestCase
      */
     private $moduleRegistryUninstaller;
 
+    /**
+     * @var PatchApplier|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $patchApplierMock;
+
     public function setUp()
     {
         $this->moduleRegistryUninstaller = $this->createMock(\Magento\Setup\Model\ModuleRegistryUninstaller::class);
@@ -63,6 +69,7 @@ public function setUp()
         $this->collector = $this->createMock(\Magento\Setup\Model\UninstallCollector::class);
 
         $this->setup = $this->createMock(\Magento\Setup\Module\Setup::class);
+        $this->patchApplierMock = $this->createMock(PatchApplier::class);
         $setupFactory = $this->createMock(\Magento\Setup\Module\SetupFactory::class);
         $setupFactory->expects($this->any())->method('create')->willReturn($this->setup);
 
@@ -93,10 +100,20 @@ public function testUninstallRemoveData()
 
         $this->output->expects($this->atLeastOnce())->method('writeln');
 
-        $this->objectManager->expects($this->once())
+        $this->objectManager->expects($this->any())
             ->method('get')
-            ->with(\Magento\Framework\Module\ModuleResource::class)
-            ->willReturn($resource);
+            ->willReturnMap(
+                [
+                    [\Magento\Framework\Module\ModuleResource::class, $resource],
+                    [PatchApplier::class, $this->patchApplierMock]
+                ]
+            );
+        $this->patchApplierMock->expects($this->exactly(2))->method('revertDataPatches')->willReturnMap(
+            [
+                ['moduleA'],
+                ['moduleB']
+            ]
+        );
         $this->uninstaller->uninstallData($this->output, ['moduleA', 'moduleB']);
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
index 9f59479ef0f0d..9d40b053e394e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
@@ -83,6 +83,9 @@ public function testGet()
         $this->assertInstanceOf(ObjectManagerInterface::class, $this->model->get());
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
     private function getCommandListMock()
     {
         $commandMock = $this->getMockBuilder(Command::class)->disableOriginalConstructor()->getMock();
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php
index 192717e1d319b..2d7685c2021cc 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/PayloadValidatorTest.php
@@ -38,6 +38,9 @@ public function testValidatePayLoad($type, $has, $moduleExists)
         $this->assertEquals('', $this->model->validatePayload($type));
     }
 
+    /**
+     * @return array
+     */
     public function validatePayLoadDataProvider()
     {
         return [
@@ -61,6 +64,9 @@ public function testValidatePayLoadNegativeCases($type, $has, $moduleExists, $er
         $this->assertStringStartsWith($errorMessage, $this->model->validatePayload($type));
     }
 
+    /**
+     * @return array
+     */
     public function validatePayLoadNegativeCasesDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php b/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php
index f543e77787f9d..2334cb19a5b4f 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/PhpReadinessCheckTest.php
@@ -411,6 +411,10 @@ protected function isPhp7OrHhvm()
 
 namespace Magento\Setup\Model;
 
+/**
+ * @param $param
+ * @return int|string
+ */
 function ini_get($param)
 {
     if ($param === 'xdebug.max_nesting_level') {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php
index b3ac6ad286e44..a55c50eeaa736 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/WebLoggerTest.php
@@ -184,6 +184,9 @@ public function testClearNotExist()
         $this->webLogger->clear();
     }
 
+    /**
+     * @return string
+     */
     public static function readLog()
     {
         return self::$log;
@@ -202,6 +205,9 @@ public static function deleteLog()
         self::$log = '';
     }
 
+    /**
+     * @return bool
+     */
     public static function isExist()
     {
         return self::$log != '';
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
index 69f320bccd5ce..65fe4a5f47711 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
@@ -5,11 +5,18 @@
  */
 namespace Magento\Setup\Test\Unit\Module;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\Data\ConfigDataFactory;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Math\Random;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Setup\Model\ConfigGenerator;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Setup\Model\CryptKeyGenerator;
+use PHPUnit\Framework\TestCase;
 
-class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
+class ConfigGeneratorTest extends TestCase
 {
     /**
      * @var ConfigGenerator
@@ -18,11 +25,31 @@ class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $random = $this->createMock(\Magento\Framework\Math\Random::class);
-        $random->expects($this->any())->method('getRandomString')->willReturn('key');
-        $deployConfig= $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+        /** @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject $deployConfig */
+        $deployConfig = $this->createMock(DeploymentConfig::class);
         $deployConfig->expects($this->any())->method('isAvailable')->willReturn(false);
-        $this->configGeneratorObject = new ConfigGenerator($random, $deployConfig);
+
+        /** @var Random|\PHPUnit_Framework_MockObject_MockObject $randomMock */
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->expects($this->any())->method('getRandomString')->willReturn('key');
+
+        $cryptKeyGenerator = new CryptKeyGenerator($randomMock);
+
+        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\App\ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerMock->method('create')->willReturn(new ConfigData('app_env'));
+
+        $configDataFactoryMock = (new ObjectManager($this))
+            ->getObject(ConfigDataFactory::class, ['objectManager' => $objectManagerMock]);
+
+        $this->configGeneratorObject = new ConfigGenerator(
+            $randomMock,
+            $deployConfig,
+            $configDataFactoryMock,
+            $cryptKeyGenerator
+        );
     }
 
     public function testCreateCryptConfigWithInput()
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
index 39e67401760b7..69de120cca49e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
@@ -48,7 +48,8 @@ protected function setUp()
         $this->configReaderMock = $this->getMockBuilder(\Magento\Setup\Module\Di\Compiler\Config\Reader::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->configWriterMock = $this->getMockBuilder(\Magento\Setup\Module\Di\Compiler\Config\WriterInterface::class)
+        $this->configWriterMock =
+            $this->getMockBuilder(\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->configChain = $this->getMockBuilder(\Magento\Setup\Module\Di\Compiler\Config\ModificationChain::class)
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
index d15bd2fd80c67..515badda91720 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
@@ -54,8 +54,8 @@ public function testCreateSuccess($alias, $arguments, $instanceName)
     public function testCreateException()
     {
         $notRegisteredOperation = 'coffee';
-        $this->expectException(
-            \Magento\Setup\Module\Di\App\Task\OperationException::class,
+        $this->expectException(\Magento\Setup\Module\Di\App\Task\OperationException::class);
+        $this->expectExceptionMessage(
             sprintf('Unrecognized operation "%s"', $notRegisteredOperation),
             OperationException::UNAVAILABLE_OPERATION
         );
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
index 7d8ce3ac564b3..ebb6560f9337d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
@@ -46,6 +46,9 @@ public function testGetConstructor($expectation, $className, $willReturn)
         );
     }
 
+    /**
+     * @return array
+     */
     public function getConstructorDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/FileClassScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/FileClassScannerTest.php
index 72a9bcdc4df72..5bc7fd82b3251 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/FileClassScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/FileClassScannerTest.php
@@ -204,13 +204,38 @@ class ThisIsNotMyTest
         self::assertContains('This\Is\Not\My\Ns\ThisIsNotMyTest', $result);
     }
 
-    public function testClassKeywordInMiddleOfFile()
+    public function testMultipleClassKeywordsInMiddleOfFileWithStringVariableParsing()
     {
-        $filename = __DIR__
-            . '/../../../../../../../../../..'
-            . '/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php';
-        $filename = realpath($filename);
-        $scanner = new FileClassScanner($filename);
+        $scanner = $this->getMockBuilder(FileClassScanner::class)->disableOriginalConstructor()->setMethods([
+            'getFileContents'
+        ])->getMock();
+        $scanner->expects(self::once())->method('getFileContents')->willReturn(<<<'PHP'
+<?php
+
+namespace This\Is\My\Ns;
+
+use stdClass;
+
+class ThisIsMyTest
+{
+    protected function firstMethod()
+    {
+        $test = 1;
+        $testString = "foo {$test}";
+        $className = stdClass::class;
+        $testString2 = "bar {$test}";
+    }
+
+    protected function secondMethod()
+    {
+        $this->doMethod(stdClass::class)->runAction();
+    }
+}
+
+PHP
+        );
+
+        /* @var $scanner FileClassScanner */
         $result = $scanner->getClassNames();
 
         self::assertCount(1, $result);
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
index ca3fe64f6d153..5f8cd7643e87c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
@@ -69,7 +69,7 @@ public function testCollectEntities()
         );
 
         $this->assertEquals(
-            ['\Magento\Eav\Api\Data\AttributeExtensionInterface'],
+            ['\\' . \Magento\Eav\Api\Data\AttributeExtensionInterface::class],
             $this->_model->collectEntities($this->_testFiles)
         );
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php
index dbe566f9a1c7a..7f0553034b4f9 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php
@@ -25,7 +25,8 @@ public function testConstructor()
 
     public function testConstructorException()
     {
-        $this->expectException('InvalidArgumentException', 'Wrong modifier provided');
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Wrong modifier provided');
         $modificationsList = [];
         $modificationsList[] = $this->getMockBuilder(
             \Magento\Setup\Module\Di\Compiler\Config\ModificationInterface::class
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
index 68d76980e1057..69f8fd224f7a8 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
@@ -25,6 +25,12 @@ class Test
      */
     protected $_newElementFactory;
 
+    /**
+     * Test constructor.
+     * @param \Magento\SomeModule\Module\Factory $factory
+     * @param \Magento\SomeModule\Element\Factory $elementFactory
+     * @param \Magento\SomeModule\ElementFactory $rightElementFactory
+     */
     public function __construct(
         \Magento\SomeModule\Module\Factory $factory,
         \Magento\SomeModule\Element\Factory $elementFactory,
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php
index cb49c3a33a5c5..331b2b8705c5b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php
@@ -136,7 +136,8 @@ public function testGetOptionsWrongDir($directory, $withContext, $message)
                 'directoryList' => $directoryList
             ]
         );
-        $this->expectException('\InvalidArgumentException', $message);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($message);
         $resolver->getOptions();
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php
index e87a716ffdb62..b76cc4a0b1f1a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php
@@ -55,7 +55,8 @@ public function dataProviderPhraseCreation()
      */
     public function testWrongParametersWhilePhraseCreation($constructArguments, $message)
     {
-        $this->expectException('DomainException', $message);
+        $this->expectException('DomainException');
+        $this->expectExceptionMessage($message);
 
         new Phrase(...array_values($constructArguments));
     }
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 3395596f399a3..ae507e8985c1b 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);
     }
@@ -111,7 +114,8 @@ public function testGenerateWithNotAllowedDuplicatesAndDuplicatesExist()
         $error = "Duplicated translation is found, but it is not allowed.\n"
             . "The phrase \"phrase1\" is translated in 1 places.\n"
             . "The phrase \"phrase2\" is translated in 1 places.\n";
-        $this->expectException('\RuntimeException', $error);
+        $this->expectException('\RuntimeException');
+        $this->expectExceptionMessage($error);
 
         $allowDuplicates = false;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php
index e68a1c624376b..c698d4c344df8 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php
@@ -29,7 +29,8 @@ protected function setUp()
      */
     public function testValidateOptions($options, $message)
     {
-        $this->expectException('InvalidArgumentException', $message);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($message);
 
         $this->_parserMock->addAdapter(
             'php',
@@ -38,6 +39,9 @@ public function testValidateOptions($options, $message)
         $this->_parserMock->parse($options);
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForValidateOptions()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
index 76c5a6d031399..d429d0a0c9953 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
@@ -39,7 +39,7 @@ protected function setUp()
      * @param array $jsFiles
      * @param array $phpMap
      * @param array $jsMap
-     * @paran array $phraseFactoryMap
+     * @param array $phraseFactoryMap
      * @param array $expectedResult
      * @dataProvider addPhraseDataProvider
      */
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php
index 15a55bd23b164..573c8b132ca41 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Setup/SetupCacheTest.php
@@ -88,6 +88,9 @@ public function testHas($table, $parentId, $rowId, $field, $expected)
         $this->assertSame($expected, $this->object->has($table, $parentId, $rowId, $field));
     }
 
+    /**
+     * @return array
+     */
     public function hasDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
index a35007189a9ca..f0a9d5316b3a6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
@@ -144,6 +144,9 @@ public function testCreateService($zfAppConfig, $env, $cliParam, $expectedArray)
         $this->assertEquals($expectedArray, $listener->createService($serviceLocator));
     }
 
+    /**
+     * @return array
+     */
     public function createServiceDataProvider()
     {
         return [
diff --git a/setup/src/Magento/Setup/registration.php b/setup/src/Magento/Setup/registration.php
new file mode 100644
index 0000000000000..e78c32a7f193b
--- /dev/null
+++ b/setup/src/Magento/Setup/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::SETUP, 'magento/setup', __DIR__);
diff --git a/setup/src/Zend/Mvc/Controller/LazyControllerAbstractFactory.php b/setup/src/Zend/Mvc/Controller/LazyControllerAbstractFactory.php
new file mode 100644
index 0000000000000..acd7e07fd13aa
--- /dev/null
+++ b/setup/src/Zend/Mvc/Controller/LazyControllerAbstractFactory.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-mvc/blob/master/LICENSE.md New BSD License
+ * @SuppressWarnings(PHPMD)
+ */
+
+declare(strict_types=1);
+
+namespace Zend\Mvc\Controller;
+
+use Interop\Container\ContainerInterface;
+use ReflectionClass;
+use ReflectionParameter;
+use Zend\Console\Adapter\AdapterInterface as ConsoleAdapterInterface;
+use Zend\Filter\FilterPluginManager;
+use Zend\Hydrator\HydratorPluginManager;
+use Zend\InputFilter\InputFilterPluginManager;
+use Zend\Log\FilterPluginManager as LogFilterManager;
+use Zend\Log\FormatterPluginManager as LogFormatterManager;
+use Zend\Log\ProcessorPluginManager as LogProcessorManager;
+use Zend\Log\WriterPluginManager as LogWriterManager;
+use Zend\Serializer\AdapterPluginManager as SerializerAdapterManager;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Stdlib\DispatchableInterface;
+use Zend\Validator\ValidatorPluginManager;
+
+/**
+ * Reflection-based factory for controllers.
+ *
+ * To ease development, this factory may be used for controllers with
+ * type-hinted arguments that resolve to services in the application
+ * container; this allows omitting the step of writing a factory for
+ * each controller.
+ *
+ * You may use it as either an abstract factory:
+ *
+ * <code>
+ * 'controllers' => [
+ *     'abstract_factories' => [
+ *         LazyControllerAbstractFactory::class,
+ *     ],
+ * ],
+ * </code>
+ *
+ * Or as a factory, mapping a controller class name to it:
+ *
+ * <code>
+ * 'controllers' => [
+ *     'factories' => [
+ *         MyControllerWithDependencies::class => LazyControllerAbstractFactory::class,
+ *     ],
+ * ],
+ * </code>
+ *
+ * The latter approach is more explicit, and also more performant.
+ *
+ * The factory has the following constraints/features:
+ *
+ * - A parameter named `$config` typehinted as an array will receive the
+ *   application "config" service (i.e., the merged configuration).
+ * - Parameters type-hinted against array, but not named `$config` will
+ *   be injected with an empty array.
+ * - Scalar parameters will be resolved as null values.
+ * - If a service cannot be found for a given typehint, the factory will
+ *   raise an exception detailing this.
+ * - Some services provided by Zend Framework components do not have
+ *   entries based on their class name (for historical reasons); the
+ *   factory contains a map of these class/interface names to the
+ *   corresponding service name to allow them to resolve.
+ *
+ * `$options` passed to the factory are ignored in all cases, as we cannot
+ * make assumptions about which argument(s) they might replace.
+ */
+class LazyControllerAbstractFactory implements AbstractFactoryInterface
+{
+    /**
+     * Maps known classes/interfaces to the service that provides them; only
+     * required for those services with no entry based on the class/interface
+     * name.
+     *
+     * Extend the class if you wish to add to the list.
+     *
+     * @var string[]
+     */
+    protected $aliases = [
+        ConsoleAdapterInterface::class  => 'ConsoleAdapter',
+        FilterPluginManager::class      => 'FilterManager',
+        HydratorPluginManager::class    => 'HydratorManager',
+        InputFilterPluginManager::class => 'InputFilterManager',
+        LogFilterManager::class         => 'LogFilterManager',
+        LogFormatterManager::class      => 'LogFormatterManager',
+        LogProcessorManager::class      => 'LogProcessorManager',
+        LogWriterManager::class         => 'LogWriterManager',
+        SerializerAdapterManager::class => 'SerializerAdapterManager',
+        ValidatorPluginManager::class   => 'ValidatorManager',
+    ];
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return DispatchableInterface
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        $reflectionClass = new ReflectionClass($requestedName);
+
+        if (null === ($constructor = $reflectionClass->getConstructor())) {
+            return new $requestedName();
+        }
+
+        $reflectionParameters = $constructor->getParameters();
+
+        if (empty($reflectionParameters)) {
+            return new $requestedName();
+        }
+
+        $parameters = array_map(
+            $this->resolveParameter($container->getServiceLocator(), $requestedName),
+            $reflectionParameters
+        );
+
+        return new $requestedName(...$parameters);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canCreate(ContainerInterface $container, $requestedName)
+    {
+        if (! class_exists($requestedName)) {
+            return false;
+        }
+
+        return in_array(DispatchableInterface::class, class_implements($requestedName), true);
+    }
+
+    /**
+     * Resolve a parameter to a value.
+     *
+     * Returns a callback for resolving a parameter to a value.
+     *
+     * @param ContainerInterface $container
+     * @param string $requestedName
+     * @return callable
+     */
+    private function resolveParameter(ContainerInterface $container, $requestedName)
+    {
+        /**
+         * @param ReflectionClass $parameter
+         * @return mixed
+         * @throws ServiceNotFoundException If type-hinted parameter cannot be
+         *   resolved to a service in the container.
+         */
+        return function (ReflectionParameter $parameter) use ($container, $requestedName) {
+            if ($parameter->isArray()
+                && $parameter->getName() === 'config'
+                && $container->has('config')
+            ) {
+                return $container->get('config');
+            }
+
+            if ($parameter->isArray()) {
+                return [];
+            }
+
+            if (! $parameter->getClass()) {
+                return;
+            }
+
+            $type = $parameter->getClass()->getName();
+            $type = isset($this->aliases[$type]) ? $this->aliases[$type] : $type;
+
+            if (! $container->has($type)) {
+                throw new ServiceNotFoundException(sprintf(
+                    'Unable to create controller "%s"; unable to resolve parameter "%s" using type hint "%s"',
+                    $requestedName,
+                    $parameter->getName(),
+                    $type
+                ));
+            }
+
+            return $container->get($type);
+        };
+    }
+
+    /**
+     * Determine if we can create a service with name
+     *
+     * @param ServiceLocatorInterface $serviceLocator
+     * @param $name
+     * @param $requestedName
+     * @return bool
+     * @SuppressWarnings("unused")
+     */
+    public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        return $this->canCreate($serviceLocator, $requestedName);
+    }
+
+    /**
+     * Create service with name
+     *
+     * @param ServiceLocatorInterface $serviceLocator
+     * @param $name
+     * @param $requestedName
+     * @return mixed
+     * @SuppressWarnings("unused")
+     */
+    public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        return $this($serviceLocator, $requestedName);
+    }
+}
diff --git a/setup/view/layout/layout.phtml b/setup/view/layout/layout.phtml
index 613ff391a8fff..0415aff91fc7b 100644
--- a/setup/view/layout/layout.phtml
+++ b/setup/view/layout/layout.phtml
@@ -5,8 +5,6 @@
  */
 ?>
 <?= $this->doctype() ?>
-<!--[if IE 9]>
-<html class="ie9" lang="en" ng-app="magentoSetup"><![endif]-->
 <!--[if !IE]><!-->
 <html lang="en" ng-app="magentoSetup">
 <!--<![endif]-->
diff --git a/setup/view/magento/setup/customize-your-store.phtml b/setup/view/magento/setup/customize-your-store.phtml
index 15cd53ca26cfd..97ecf38d5f490 100644
--- a/setup/view/magento/setup/customize-your-store.phtml
+++ b/setup/view/magento/setup/customize-your-store.phtml
@@ -178,7 +178,7 @@
             <p class="advanced-modules-select">
                 <input id="selectAll" type="checkbox"
                    class="form-el-checkbox"
-                   ng-model="store.selectAll"
+                   ng-checked="store.selectAll"
                    ng-click="toggleAllModules()">
                 <label class="form-label" for="selectAll">
                    Select All
diff --git a/setup/view/magento/setup/data-option.phtml b/setup/view/magento/setup/data-option.phtml
index cb31d96013f24..656b04876c414 100644
--- a/setup/view/magento/setup/data-option.phtml
+++ b/setup/view/magento/setup/data-option.phtml
@@ -43,7 +43,7 @@
                 value="false"
                 >
             <label class="form-label" for="keepData">
-                <b>Keep data</b>
+                <strong>Keep data</strong>
                 <br/><br/>
                 Note: You can see the associated data in your database,
                 however your customer will not see this in your online store.
@@ -59,7 +59,7 @@
                 value="true"
                 >
             <label class="form-label" for="removeData">
-                <b>Remove data</b>
+                <strong>Remove data</strong>
                 <br/><br/>
                 Did you back up first? Choosing to remove data means the data is unavailable unless you
                 recover it from a backup in the preceding step.
diff --git a/setup/view/magento/setup/extension-grid.phtml b/setup/view/magento/setup/extension-grid.phtml
index 47e5f7eec309b..4800d45e12d4f 100644
--- a/setup/view/magento/setup/extension-grid.phtml
+++ b/setup/view/magento/setup/extension-grid.phtml
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
+
 ?>
 <h2 class="page-title">{{$state.current.header}}</h2>
 
@@ -66,8 +69,8 @@
 
 <div class="row" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total == 0">
     <label class="form-label not-found">
-        <b>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> 
-            for purchasing extensions.</b><br/>
+        <strong>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> 
+            for purchasing extensions.</strong><br/>
     </label>
 </div>
 <div class="admin__data-grid-outer-wrap"
diff --git a/setup/view/magento/setup/marketplace-credentials.phtml b/setup/view/magento/setup/marketplace-credentials.phtml
index 32ae512313610..8bd0bb0438d61 100644
--- a/setup/view/magento/setup/marketplace-credentials.phtml
+++ b/setup/view/magento/setup/marketplace-credentials.phtml
@@ -7,7 +7,7 @@
     <div class="sync-login-wrap">
         <div class="login-header" ng-show="showCredsForm || upgradeProcessError">
             <img class="logo-img"
-                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
+                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento" width="214"/>
             <span>Marketplace</span>
         </div>
         <div class="messages">
diff --git a/setup/view/magento/setup/module-grid.phtml b/setup/view/magento/setup/module-grid.phtml
index 5fe0447b7c791..3bf9377104df1 100644
--- a/setup/view/magento/setup/module-grid.phtml
+++ b/setup/view/magento/setup/module-grid.phtml
@@ -8,7 +8,7 @@
 
 <div class="row" ng-show="modulesProcessed && total == 0">
     <label class="form-label">
-        <b>We didn't find any modules at this time. Please try later.</b><br/>
+        <strong>We didn't find any modules at this time. Please try later.</strong><br/>
     </label>
 </div>
 <div class="admin__data-grid-outer-wrap" ng-show="modulesProcessed && total > 0">
diff --git a/setup/view/magento/setup/navigation/side-menu.phtml b/setup/view/magento/setup/navigation/side-menu.phtml
index 58d12a4de448a..f34a6c7c72e69 100644
--- a/setup/view/magento/setup/navigation/side-menu.phtml
+++ b/setup/view/magento/setup/navigation/side-menu.phtml
@@ -20,12 +20,8 @@
     ng-show="<?= implode( '&&', $expressions) ?>"
     >
 <nav class="admin__menu" ng-controller="mainController">
-    <span
-        class="logo logo-static"
-        data-edition="Community Edition">
-        <img class="logo-img"
-             src="./pub/images/logo.svg"
-             alt="Magento Admin Panel">
+    <span class="logo logo-static" data-edition="Community Edition">
+        <img class="logo-img" src="<?= $this->basePath() ?>/pub/images/logo.svg" alt="Magento Admin Panel">
     </span>
     <ul id="nav" role="menubar">
         <li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
diff --git a/setup/view/magento/setup/popupauth.phtml b/setup/view/magento/setup/popupauth.phtml
index 8b074abaa5f12..3ffca7ba49bab 100644
--- a/setup/view/magento/setup/popupauth.phtml
+++ b/setup/view/magento/setup/popupauth.phtml
@@ -17,7 +17,9 @@
                 <div class="sync-login-wrap">
                     <div class="login-header">
                         <img class="logo-img"
-                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
+                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg"
+                             alt="Magento"
+                             width="214"/>
                         <span>Marketplace</span>
                     </div>
                     <div class="messages">
diff --git a/setup/view/magento/setup/readiness-check.phtml b/setup/view/magento/setup/readiness-check.phtml
index 6c6c2fbc39fc7..71044ab371888 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"
diff --git a/setup/view/magento/setup/readiness-check/progress.phtml b/setup/view/magento/setup/readiness-check/progress.phtml
index c1ac41c6b5f2e..eb9dd0ce9d1aa 100755
--- a/setup/view/magento/setup/readiness-check/progress.phtml
+++ b/setup/view/magento/setup/readiness-check/progress.phtml
@@ -336,7 +336,7 @@
                 </div>
 
                 <p ng-show="componentDependency.expanded">For additional assistance, see
-                    <a href="http://devdocs.magento.com/guides/v2.0/install-gde/trouble/php/tshoot_php-set.html"
+                    <a href="http://devdocs.magento.com/guides/v2.2/install-gde/trouble/php/tshoot_php-set.html"
                        target="_blank">PHP settings check help
                     </a>.
                 </p>
@@ -392,7 +392,7 @@
 
                 <div class="readiness-check-side">
                     <p class="side-title">Need Help?</p>
-                    <a href="http://devdocs.magento.com/guides/v2.0/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
+                    <a href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
                 </div>
 
                 <span class="readiness-check-icon icon-failed-round"></span>
@@ -413,7 +413,7 @@
                         <p>
                             The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.
                             <br>
-                            Our <a href="http://devdocs.magento.com/guides/v2.0/install-gde/system-requirements.html" target="_blank">PHP extension help</a> can get you started.
+                            Our <a href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP extension help</a> can get you started.
                         </p>
                         <p>
                             For additional assistance, contact your hosting provider.
@@ -477,7 +477,7 @@
 
             <div class="readiness-check-side">
                 <p class="side-title">Need Help?</p>
-                <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/file-system-perms.html" target="_blank">File Permission Help</a>
+                <a href="http://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a>
             </div>
 
             <span class="readiness-check-icon icon-failed-round"></span>
@@ -500,7 +500,7 @@
                         The best way to resolve this is to allow write permissions for files in the following Magento directories and subdirectories. The exact fix depends on your server, your host,
                         and other system variables.
                         <br>
-                        For help, see our <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/file-system-perms.html" target="_blank">File Permission Help</a> or call your hosting provider.
+                        For help, see our <a href="http://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a> or call your hosting provider.
                     </p>
                     <ul class="list" ng-show="permissions.expanded" ng-init="showDetails=false">
                         <li
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
index 4c61837d975a0..66264e46d50ad 100644
--- a/setup/view/magento/setup/select-version.phtml
+++ b/setup/view/magento/setup/select-version.phtml
@@ -38,7 +38,10 @@
         </span>
         <span class="message-text">Checking for a new version...</span>
     </div>
-    <div class="message message-error" ng-show="upgradeProcessError">
+    <div
+        class="message"
+        ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'"
+        ng-show="upgradeProcessError">
             <span class="message-text" ng-bind-html="upgradeProcessErrorMessage"></span>
     </div>
     <div class="message" ng-show="upgradeProcessed && !upgradeProcessError && currentVersion">
@@ -125,7 +128,7 @@
     </div>
     <div class="row" ng-show="componentsProcessed && total == 0">
         <label class="form-label">
-            <b>We didn't find any components to upgrade. Click "Next" to continue.<br/>
+            <strong>We didn't find any components to upgrade. Click "Next" to continue.</strong><br/>
         </label>
     </div>
     <div class="admin__data-grid-outer-wrap" ng-show="componentsProcessed && total > 0">